Adding upstream version 2.10.34.upstream/2.10.34upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2296 files changed, 753242 insertions, 0 deletions

diff --git a/app/Makefile.am b/app/Makefile.am
new file mode 100644
index 0000000..45d948d
--- /dev/null
+++ b/app/Makefile.am
@@ -0,0 +1,290 @@
+## Process this file with automake to produce Makefile.in
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+xobjective_cxx = "-xobjective-c++"
+xnone = "-xnone"
+endif
+
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+
+# Sort this by architectural dependencies, lowest level at the top,
+# so that when e.g. changing a header-file the subdirs are built in
+# the right order
+SUBDIRS = \
+	config		\
+	core		\
+	operations	\
+	gegl		\
+	text		\
+	vectors		\
+	paint		\
+	plug-in		\
+	xcf		\
+	file		\
+	file-data	\
+	pdb		\
+	widgets		\
+	propgui		\
+	display		\
+	tools		\
+	dialogs		\
+	actions		\
+	menus		\
+	gui		\
+	.		\
+	tests
+
+# Put the GIMP core in a lib so we can conveniently link against that
+# in test cases
+noinst_LIBRARIES = libapp.a
+
+if ENABLE_GIMP_CONSOLE
+bin_PROGRAMS = gimp-@GIMP_APP_VERSION@ gimp-console-@GIMP_APP_VERSION@
+else
+bin_PROGRAMS = gimp-@GIMP_APP_VERSION@
+endif
+
+libapp_sources = \
+	about.h			\
+	app.c			\
+	app.h			\
+	errors.c		\
+	errors.h		\
+	language.c		\
+	language.h		\
+	sanity.c		\
+	sanity.h		\
+	signals.c		\
+	signals.h		\
+	tests.c			\
+	tests.h			\
+	unique.c		\
+	unique.h		\
+	gimp-debug.c		\
+	gimp-debug.h		\
+	gimp-intl.h		\
+	gimp-log.c		\
+	gimp-log.h		\
+	gimp-priorities.h	\
+	gimp-update.c		\
+	gimp-update.h		\
+	gimp-version.c		\
+	gimp-version.h
+
+libapp_a_SOURCES = $(libapp_sources)
+
+gimp_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
+
+
+if PLATFORM_LINUX
+libdl = -ldl
+endif
+
+if PLATFORM_OSX
+framework_cocoa = -framework Cocoa
+endif
+
+if OS_WIN32
+win32_ldflags = -mwindows -Wl,--tsaware $(WIN32_LARGE_ADDRESS_AWARE)
+
+# for GimpDashboard and GimpBacktrace
+psapi_cflags = -DPSAPI_VERSION=1
+libpsapi = -lpsapi
+
+# for GimpBacktrace
+libdbghelp = -ldbghelp
+
+# for I_RpcExceptionFilter()
+librpcrt4 = -lrpcrt4
+
+if HAVE_EXCHNDL
+exchndl = -lexchndl
+endif
+
+else
+libm = -lm
+endif
+
+if ENABLE_RELOCATABLE_RESOURCES
+munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
+endif
+
+if HAVE_WINDRES
+include $(top_srcdir)/build/windows/gimprc.rule
+GIMPRC = gimp-$(GIMP_APP_VERSION).rc.o
+GIMPCONSOLERC = gimp-console-$(GIMP_APP_VERSION).rc.o
+endif
+
+AM_CPPFLAGS = \
+	-DGIMPDIR=\""$(gimpdir)"\"			\
+	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+	-DGIMP_USER_VERSION=\"$(GIMP_USER_VERSION)\"	\
+	-DGIMP_TOOL_VERSION=\"$(GIMP_TOOL_VERSION)\"	\
+	-DG_LOG_DOMAIN=\"Gimp\"				\
+	-DGIMP_APP_GLUE_COMPILATION			\
+	-DCC_VERSION=\""$(CC_VERSION)"\"		\
+	-I$(top_srcdir)					\
+	$(GTK_CFLAGS)					\
+	$(PANGOCAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)					\
+	$(LCMS_CFLAGS)					\
+	$(GEXIV2_CFLAGS)				\
+	$(psapi_cflags)					\
+	$(xobjective_c)					\
+	-I$(includedir)					\
+	-I$(builddir)/gui
+
+# We need this due to circular dependencies
+AM_LDFLAGS = \
+	$(munix)						\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_param_spec_duplicate		\
+	-Wl,-u,$(SYMPREFIX)gimp_operations_init			\
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
+	-Wl,-u,$(SYMPREFIX)gimp_parallel_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_async_set_new			\
+	-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new
+
+gimpconsoleldadd = \
+	xcf/libappxcf.a						\
+	pdb/libappinternal-procs.a				\
+	pdb/libapppdb.a						\
+	plug-in/libappplug-in.a					\
+	vectors/libappvectors.a					\
+	core/libappcore.a					\
+	file/libappfile.a					\
+	file-data/libappfile-data.a				\
+	text/libapptext.a					\
+	paint/libapppaint.a					\
+	operations/libappoperations.a				\
+	operations/layer-modes/libapplayermodes.a		\
+	operations/layer-modes-legacy/libapplayermodeslegacy.a	\
+	gegl/libappgegl.a					\
+	config/libappconfig.a					\
+	$(libgimpconfig)					\
+	$(libgimpmath)						\
+	$(libgimpthumb)						\
+	$(libgimpcolor)						\
+	$(libgimpmodule)					\
+	$(libgimpbase)						\
+	$(GDK_PIXBUF_LIBS)					\
+	$(FREETYPE_LIBS)					\
+	$(FONTCONFIG_LIBS)					\
+	$(PANGOCAIRO_LIBS)					\
+	$(HARFBUZZ_LIBS)					\
+	$(CAIRO_LIBS)						\
+	$(GIO_UNIX_LIBS)					\
+	$(GIO_WINDOWS_LIBS)					\
+	$(GEGL_LIBS)						\
+	$(GLIB_LIBS)						\
+	$(LCMS_LIBS)						\
+	$(GEXIV2_LIBS)						\
+	$(Z_LIBS)						\
+	$(JSON_C_LIBS)						\
+	$(LIBMYPAINT_LIBS)					\
+	$(LIBBACKTRACE_LIBS)					\
+	$(LIBUNWIND_LIBS)					\
+	$(INTLLIBS)						\
+	$(RT_LIBS)						\
+	$(libm)							\
+	$(libdl)						\
+	$(libpsapi)						\
+	$(libdbghelp)						\
+	$(librpcrt4)
+
+gimp_@GIMP_APP_VERSION@_LDFLAGS = \
+	$(AM_LDFLAGS)		\
+	$(win32_ldflags)	\
+	$(framework_cocoa)	\
+	-Wl,-u,$(SYMPREFIX)gimp_lebl_dialog
+
+gimp_@GIMP_APP_VERSION@_LDADD = \
+	gui/libappgui.a			\
+	menus/libappmenus.a		\
+	actions/libappactions.a		\
+	dialogs/libappdialogs.a		\
+	tools/libapptools.a		\
+	display/libappdisplay.a		\
+	propgui/libapppropgui.a		\
+	widgets/libappwidgets.a		\
+	$(libgimpwidgets)		\
+	$(GTK_LIBS)			\
+	$(GTK_MAC_INTEGRATION_LIBS)	\
+	$(gimpconsoleldadd)		\
+	$(exchndl)			\
+	$(GIMPRC)
+
+
+if ENABLE_GIMP_CONSOLE
+
+gimp_console_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
+
+gimp_console_@GIMP_APP_VERSION@_CPPFLAGS = \
+	$(AM_CPPFLAGS)			\
+	-DGIMP_CONSOLE_COMPILATION
+
+gimp_console_@GIMP_APP_VERSION@_LDADD = \
+	$(gimpconsoleldadd) \
+	$(GIMPCONSOLERC)
+
+endif
+
+
+install-exec-hook:
+if DEFAULT_BINARY
+	cd $(DESTDIR)$(bindir) \
+	&& rm -f gimp$(EXEEXT) \
+	&& $(LN_S) gimp-$(GIMP_APP_VERSION)$(EXEEXT) gimp$(EXEEXT)
+if ENABLE_GIMP_CONSOLE
+	cd $(DESTDIR)$(bindir) \
+	&& rm -f gimp-console$(EXEEXT) \
+	&& $(LN_S) gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) gimp-console$(EXEEXT)
+endif
+endif
+
+uninstall-local:
+if DEFAULT_BINARY
+	rm -f $(DESTDIR)$(bindir)/gimp$(EXEEXT)
+if ENABLE_GIMP_CONSOLE
+	rm -f $(DESTDIR)$(bindir)/gimp-console$(EXEEXT)
+endif
+endif
+
+
+# require gimp-console when making dist
+#
+if ENABLE_GIMP_CONSOLE
+dist-check-gimp-console:
+else
+dist-check-gimp-console:
+	@echo "*** gimp-console must be enabled in order to make dist"
+	@false
+endif
+
+
+# hook to assure that the system gimprc and the gimprc manpage are
+# uptodate when a release is made
+#
+dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
+	./$< --dump-gimprc-system > gimprc.tmp	\
+		&& (cmp -s gimprc.tmp $(top_srcdir)/etc/gimprc.in ||	\
+		    cp gimprc.tmp $(top_srcdir)/etc/gimprc.in)		\
+		&& rm gimprc.tmp
+	./$< --dump-gimprc-manpage > gimprc.tmp	\
+		&& (cmp -s gimprc.tmp $(top_srcdir)/docs/gimprc.5.in ||\
+		    cp gimprc.tmp $(top_srcdir)/docs/gimprc.5.in)	\
+		&& rm gimprc.tmp
+
+dist-hook: dist-check-gimp-console dist-dump-gimprc
diff --git a/app/Makefile.in b/app/Makefile.in
new file mode 100644
index 0000000..e34e997
--- /dev/null
+++ b/app/Makefile.in
@@ -0,0 +1,1664 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Version resources for Microsoft Windows
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@ENABLE_GIMP_CONSOLE_FALSE@bin_PROGRAMS =  \
+@ENABLE_GIMP_CONSOLE_FALSE@	gimp-@GIMP_APP_VERSION@$(EXEEXT)
+@ENABLE_GIMP_CONSOLE_TRUE@bin_PROGRAMS =  \
+@ENABLE_GIMP_CONSOLE_TRUE@	gimp-@GIMP_APP_VERSION@$(EXEEXT) \
+@ENABLE_GIMP_CONSOLE_TRUE@	gimp-console-@GIMP_APP_VERSION@$(EXEEXT)
+subdir = app
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapp_a_AR = $(AR) $(ARFLAGS)
+libapp_a_LIBADD =
+am__objects_1 = app.$(OBJEXT) errors.$(OBJEXT) language.$(OBJEXT) \
+	sanity.$(OBJEXT) signals.$(OBJEXT) tests.$(OBJEXT) \
+	unique.$(OBJEXT) gimp-debug.$(OBJEXT) gimp-log.$(OBJEXT) \
+	gimp-update.$(OBJEXT) gimp-version.$(OBJEXT)
+am_libapp_a_OBJECTS = $(am__objects_1)
+libapp_a_OBJECTS = $(am_libapp_a_OBJECTS)
+am_gimp_@GIMP_APP_VERSION@_OBJECTS = $(am__objects_1) main.$(OBJEXT)
+gimp_@GIMP_APP_VERSION@_OBJECTS =  \
+	$(am_gimp_@GIMP_APP_VERSION@_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = xcf/libappxcf.a pdb/libappinternal-procs.a \
+	pdb/libapppdb.a plug-in/libappplug-in.a \
+	vectors/libappvectors.a core/libappcore.a file/libappfile.a \
+	file-data/libappfile-data.a text/libapptext.a \
+	paint/libapppaint.a operations/libappoperations.a \
+	operations/layer-modes/libapplayermodes.a \
+	operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	gegl/libappgegl.a config/libappconfig.a $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+gimp_@GIMP_APP_VERSION@_DEPENDENCIES = gui/libappgui.a \
+	menus/libappmenus.a actions/libappactions.a \
+	dialogs/libappdialogs.a tools/libapptools.a \
+	display/libappdisplay.a propgui/libapppropgui.a \
+	widgets/libappwidgets.a $(libgimpwidgets) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) $(GIMPRC)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+gimp_@GIMP_APP_VERSION@_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(gimp_@GIMP_APP_VERSION@_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am__gimp_console_@GIMP_APP_VERSION@_SOURCES_DIST = about.h app.c app.h \
+	errors.c errors.h language.c language.h sanity.c sanity.h \
+	signals.c signals.h tests.c tests.h unique.c unique.h \
+	gimp-debug.c gimp-debug.h gimp-intl.h gimp-log.c gimp-log.h \
+	gimp-priorities.h gimp-update.c gimp-update.h gimp-version.c \
+	gimp-version.h main.c
+am__objects_2 = gimp_console_@GIMP_APP_VERSION@-app.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-errors.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-language.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-sanity.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-signals.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-tests.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-unique.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-gimp-debug.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-gimp-log.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-gimp-update.$(OBJEXT) \
+	gimp_console_@GIMP_APP_VERSION@-gimp-version.$(OBJEXT)
+@ENABLE_GIMP_CONSOLE_TRUE@am_gimp_console_@GIMP_APP_VERSION@_OBJECTS =  \
+@ENABLE_GIMP_CONSOLE_TRUE@	$(am__objects_2) \
+@ENABLE_GIMP_CONSOLE_TRUE@	gimp_console_@GIMP_APP_VERSION@-main.$(OBJEXT)
+gimp_console_@GIMP_APP_VERSION@_OBJECTS =  \
+	$(am_gimp_console_@GIMP_APP_VERSION@_OBJECTS)
+@ENABLE_GIMP_CONSOLE_TRUE@gimp_console_@GIMP_APP_VERSION@_DEPENDENCIES =  \
+@ENABLE_GIMP_CONSOLE_TRUE@	$(am__DEPENDENCIES_2) \
+@ENABLE_GIMP_CONSOLE_TRUE@	$(GIMPCONSOLERC)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/app.Po ./$(DEPDIR)/errors.Po \
+	./$(DEPDIR)/gimp-debug.Po ./$(DEPDIR)/gimp-log.Po \
+	./$(DEPDIR)/gimp-update.Po ./$(DEPDIR)/gimp-version.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po \
+	./$(DEPDIR)/language.Po ./$(DEPDIR)/main.Po \
+	./$(DEPDIR)/sanity.Po ./$(DEPDIR)/signals.Po \
+	./$(DEPDIR)/tests.Po ./$(DEPDIR)/unique.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapp_a_SOURCES) $(gimp_@GIMP_APP_VERSION@_SOURCES) \
+	$(gimp_console_@GIMP_APP_VERSION@_SOURCES)
+DIST_SOURCES = $(libapp_a_SOURCES) $(gimp_@GIMP_APP_VERSION@_SOURCES) \
+	$(am__gimp_console_@GIMP_APP_VERSION@_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build/windows/gimprc.rule $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
+@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
+@PLATFORM_OSX_TRUE@xnone = "-xnone"
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+
+# Sort this by architectural dependencies, lowest level at the top,
+# so that when e.g. changing a header-file the subdirs are built in
+# the right order
+SUBDIRS = \
+	config		\
+	core		\
+	operations	\
+	gegl		\
+	text		\
+	vectors		\
+	paint		\
+	plug-in		\
+	xcf		\
+	file		\
+	file-data	\
+	pdb		\
+	widgets		\
+	propgui		\
+	display		\
+	tools		\
+	dialogs		\
+	actions		\
+	menus		\
+	gui		\
+	.		\
+	tests
+
+
+# Put the GIMP core in a lib so we can conveniently link against that
+# in test cases
+noinst_LIBRARIES = libapp.a
+libapp_sources = \
+	about.h			\
+	app.c			\
+	app.h			\
+	errors.c		\
+	errors.h		\
+	language.c		\
+	language.h		\
+	sanity.c		\
+	sanity.h		\
+	signals.c		\
+	signals.h		\
+	tests.c			\
+	tests.h			\
+	unique.c		\
+	unique.h		\
+	gimp-debug.c		\
+	gimp-debug.h		\
+	gimp-intl.h		\
+	gimp-log.c		\
+	gimp-log.h		\
+	gimp-priorities.h	\
+	gimp-update.c		\
+	gimp-update.h		\
+	gimp-version.c		\
+	gimp-version.h
+
+libapp_a_SOURCES = $(libapp_sources)
+gimp_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
+@PLATFORM_LINUX_TRUE@libdl = -ldl
+@PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa
+@OS_WIN32_TRUE@win32_ldflags = -mwindows -Wl,--tsaware $(WIN32_LARGE_ADDRESS_AWARE)
+
+# for GimpDashboard and GimpBacktrace
+@OS_WIN32_TRUE@psapi_cflags = -DPSAPI_VERSION=1
+@OS_WIN32_TRUE@libpsapi = -lpsapi
+
+# for GimpBacktrace
+@OS_WIN32_TRUE@libdbghelp = -ldbghelp
+
+# for I_RpcExceptionFilter()
+@OS_WIN32_TRUE@librpcrt4 = -lrpcrt4
+@HAVE_EXCHNDL_TRUE@@OS_WIN32_TRUE@exchndl = -lexchndl
+@OS_WIN32_FALSE@libm = -lm
+@ENABLE_RELOCATABLE_RESOURCES_TRUE@munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
+@HAVE_WINDRES_TRUE@GIMPAPPRC = $(top_builddir)/build/windows/gimp.rc
+@HAVE_WINDRES_TRUE@GIMPRC = gimp-$(GIMP_APP_VERSION).rc.o
+@HAVE_WINDRES_TRUE@GIMPCONSOLERC = gimp-console-$(GIMP_APP_VERSION).rc.o
+AM_CPPFLAGS = \
+	-DGIMPDIR=\""$(gimpdir)"\"			\
+	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+	-DGIMP_USER_VERSION=\"$(GIMP_USER_VERSION)\"	\
+	-DGIMP_TOOL_VERSION=\"$(GIMP_TOOL_VERSION)\"	\
+	-DG_LOG_DOMAIN=\"Gimp\"				\
+	-DGIMP_APP_GLUE_COMPILATION			\
+	-DCC_VERSION=\""$(CC_VERSION)"\"		\
+	-I$(top_srcdir)					\
+	$(GTK_CFLAGS)					\
+	$(PANGOCAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)					\
+	$(LCMS_CFLAGS)					\
+	$(GEXIV2_CFLAGS)				\
+	$(psapi_cflags)					\
+	$(xobjective_c)					\
+	-I$(includedir)					\
+	-I$(builddir)/gui
+
+
+# We need this due to circular dependencies
+AM_LDFLAGS = \
+	$(munix)						\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_param_spec_duplicate		\
+	-Wl,-u,$(SYMPREFIX)gimp_operations_init			\
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
+	-Wl,-u,$(SYMPREFIX)gimp_parallel_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_async_set_new			\
+	-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new
+
+gimpconsoleldadd = \
+	xcf/libappxcf.a						\
+	pdb/libappinternal-procs.a				\
+	pdb/libapppdb.a						\
+	plug-in/libappplug-in.a					\
+	vectors/libappvectors.a					\
+	core/libappcore.a					\
+	file/libappfile.a					\
+	file-data/libappfile-data.a				\
+	text/libapptext.a					\
+	paint/libapppaint.a					\
+	operations/libappoperations.a				\
+	operations/layer-modes/libapplayermodes.a		\
+	operations/layer-modes-legacy/libapplayermodeslegacy.a	\
+	gegl/libappgegl.a					\
+	config/libappconfig.a					\
+	$(libgimpconfig)					\
+	$(libgimpmath)						\
+	$(libgimpthumb)						\
+	$(libgimpcolor)						\
+	$(libgimpmodule)					\
+	$(libgimpbase)						\
+	$(GDK_PIXBUF_LIBS)					\
+	$(FREETYPE_LIBS)					\
+	$(FONTCONFIG_LIBS)					\
+	$(PANGOCAIRO_LIBS)					\
+	$(HARFBUZZ_LIBS)					\
+	$(CAIRO_LIBS)						\
+	$(GIO_UNIX_LIBS)					\
+	$(GIO_WINDOWS_LIBS)					\
+	$(GEGL_LIBS)						\
+	$(GLIB_LIBS)						\
+	$(LCMS_LIBS)						\
+	$(GEXIV2_LIBS)						\
+	$(Z_LIBS)						\
+	$(JSON_C_LIBS)						\
+	$(LIBMYPAINT_LIBS)					\
+	$(LIBBACKTRACE_LIBS)					\
+	$(LIBUNWIND_LIBS)					\
+	$(INTLLIBS)						\
+	$(RT_LIBS)						\
+	$(libm)							\
+	$(libdl)						\
+	$(libpsapi)						\
+	$(libdbghelp)						\
+	$(librpcrt4)
+
+gimp_@GIMP_APP_VERSION@_LDFLAGS = \
+	$(AM_LDFLAGS)		\
+	$(win32_ldflags)	\
+	$(framework_cocoa)	\
+	-Wl,-u,$(SYMPREFIX)gimp_lebl_dialog
+
+gimp_@GIMP_APP_VERSION@_LDADD = \
+	gui/libappgui.a			\
+	menus/libappmenus.a		\
+	actions/libappactions.a		\
+	dialogs/libappdialogs.a		\
+	tools/libapptools.a		\
+	display/libappdisplay.a		\
+	propgui/libapppropgui.a		\
+	widgets/libappwidgets.a		\
+	$(libgimpwidgets)		\
+	$(GTK_LIBS)			\
+	$(GTK_MAC_INTEGRATION_LIBS)	\
+	$(gimpconsoleldadd)		\
+	$(exchndl)			\
+	$(GIMPRC)
+
+@ENABLE_GIMP_CONSOLE_TRUE@gimp_console_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
+@ENABLE_GIMP_CONSOLE_TRUE@gimp_console_@GIMP_APP_VERSION@_CPPFLAGS = \
+@ENABLE_GIMP_CONSOLE_TRUE@	$(AM_CPPFLAGS)			\
+@ENABLE_GIMP_CONSOLE_TRUE@	-DGIMP_CONSOLE_COMPILATION
+
+@ENABLE_GIMP_CONSOLE_TRUE@gimp_console_@GIMP_APP_VERSION@_LDADD = \
+@ENABLE_GIMP_CONSOLE_TRUE@	$(gimpconsoleldadd) \
+@ENABLE_GIMP_CONSOLE_TRUE@	$(GIMPCONSOLERC)
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/windows/gimprc.rule $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+$(top_srcdir)/build/windows/gimprc.rule $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapp.a: $(libapp_a_OBJECTS) $(libapp_a_DEPENDENCIES) $(EXTRA_libapp_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapp.a
+	$(AM_V_AR)$(libapp_a_AR) libapp.a $(libapp_a_OBJECTS) $(libapp_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapp.a
+
+gimp-@GIMP_APP_VERSION@$(EXEEXT): $(gimp_@GIMP_APP_VERSION@_OBJECTS) $(gimp_@GIMP_APP_VERSION@_DEPENDENCIES) $(EXTRA_gimp_@GIMP_APP_VERSION@_DEPENDENCIES) 
+	@rm -f gimp-@GIMP_APP_VERSION@$(EXEEXT)
+	$(AM_V_CCLD)$(gimp_@GIMP_APP_VERSION@_LINK) $(gimp_@GIMP_APP_VERSION@_OBJECTS) $(gimp_@GIMP_APP_VERSION@_LDADD) $(LIBS)
+
+gimp-console-@GIMP_APP_VERSION@$(EXEEXT): $(gimp_console_@GIMP_APP_VERSION@_OBJECTS) $(gimp_console_@GIMP_APP_VERSION@_DEPENDENCIES) $(EXTRA_gimp_console_@GIMP_APP_VERSION@_DEPENDENCIES) 
+	@rm -f gimp-console-@GIMP_APP_VERSION@$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(gimp_console_@GIMP_APP_VERSION@_OBJECTS) $(gimp_console_@GIMP_APP_VERSION@_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/app.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-debug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-log.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-update.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-version.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/language.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanity.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unique.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+gimp_console_@GIMP_APP_VERSION@-app.o: app.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-app.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-app.o `test -f 'app.c' || echo '$(srcdir)/'`app.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='app.c' object='gimp_console_@GIMP_APP_VERSION@-app.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-app.o `test -f 'app.c' || echo '$(srcdir)/'`app.c
+
+gimp_console_@GIMP_APP_VERSION@-app.obj: app.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-app.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-app.obj `if test -f 'app.c'; then $(CYGPATH_W) 'app.c'; else $(CYGPATH_W) '$(srcdir)/app.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='app.c' object='gimp_console_@GIMP_APP_VERSION@-app.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-app.obj `if test -f 'app.c'; then $(CYGPATH_W) 'app.c'; else $(CYGPATH_W) '$(srcdir)/app.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-errors.o: errors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-errors.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-errors.o `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='errors.c' object='gimp_console_@GIMP_APP_VERSION@-errors.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-errors.o `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
+
+gimp_console_@GIMP_APP_VERSION@-errors.obj: errors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-errors.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-errors.obj `if test -f 'errors.c'; then $(CYGPATH_W) 'errors.c'; else $(CYGPATH_W) '$(srcdir)/errors.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='errors.c' object='gimp_console_@GIMP_APP_VERSION@-errors.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-errors.obj `if test -f 'errors.c'; then $(CYGPATH_W) 'errors.c'; else $(CYGPATH_W) '$(srcdir)/errors.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-language.o: language.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-language.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-language.o `test -f 'language.c' || echo '$(srcdir)/'`language.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='language.c' object='gimp_console_@GIMP_APP_VERSION@-language.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-language.o `test -f 'language.c' || echo '$(srcdir)/'`language.c
+
+gimp_console_@GIMP_APP_VERSION@-language.obj: language.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-language.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-language.obj `if test -f 'language.c'; then $(CYGPATH_W) 'language.c'; else $(CYGPATH_W) '$(srcdir)/language.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='language.c' object='gimp_console_@GIMP_APP_VERSION@-language.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-language.obj `if test -f 'language.c'; then $(CYGPATH_W) 'language.c'; else $(CYGPATH_W) '$(srcdir)/language.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-sanity.o: sanity.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-sanity.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-sanity.o `test -f 'sanity.c' || echo '$(srcdir)/'`sanity.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sanity.c' object='gimp_console_@GIMP_APP_VERSION@-sanity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-sanity.o `test -f 'sanity.c' || echo '$(srcdir)/'`sanity.c
+
+gimp_console_@GIMP_APP_VERSION@-sanity.obj: sanity.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-sanity.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-sanity.obj `if test -f 'sanity.c'; then $(CYGPATH_W) 'sanity.c'; else $(CYGPATH_W) '$(srcdir)/sanity.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sanity.c' object='gimp_console_@GIMP_APP_VERSION@-sanity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-sanity.obj `if test -f 'sanity.c'; then $(CYGPATH_W) 'sanity.c'; else $(CYGPATH_W) '$(srcdir)/sanity.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-signals.o: signals.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-signals.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='signals.c' object='gimp_console_@GIMP_APP_VERSION@-signals.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
+
+gimp_console_@GIMP_APP_VERSION@-signals.obj: signals.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-signals.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='signals.c' object='gimp_console_@GIMP_APP_VERSION@-signals.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-tests.o: tests.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-tests.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-tests.o `test -f 'tests.c' || echo '$(srcdir)/'`tests.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests.c' object='gimp_console_@GIMP_APP_VERSION@-tests.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-tests.o `test -f 'tests.c' || echo '$(srcdir)/'`tests.c
+
+gimp_console_@GIMP_APP_VERSION@-tests.obj: tests.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-tests.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-tests.obj `if test -f 'tests.c'; then $(CYGPATH_W) 'tests.c'; else $(CYGPATH_W) '$(srcdir)/tests.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests.c' object='gimp_console_@GIMP_APP_VERSION@-tests.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-tests.obj `if test -f 'tests.c'; then $(CYGPATH_W) 'tests.c'; else $(CYGPATH_W) '$(srcdir)/tests.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-unique.o: unique.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-unique.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-unique.o `test -f 'unique.c' || echo '$(srcdir)/'`unique.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='unique.c' object='gimp_console_@GIMP_APP_VERSION@-unique.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-unique.o `test -f 'unique.c' || echo '$(srcdir)/'`unique.c
+
+gimp_console_@GIMP_APP_VERSION@-unique.obj: unique.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-unique.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-unique.obj `if test -f 'unique.c'; then $(CYGPATH_W) 'unique.c'; else $(CYGPATH_W) '$(srcdir)/unique.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='unique.c' object='gimp_console_@GIMP_APP_VERSION@-unique.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-unique.obj `if test -f 'unique.c'; then $(CYGPATH_W) 'unique.c'; else $(CYGPATH_W) '$(srcdir)/unique.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-gimp-debug.o: gimp-debug.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-debug.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-debug.o `test -f 'gimp-debug.c' || echo '$(srcdir)/'`gimp-debug.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-debug.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-debug.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-debug.o `test -f 'gimp-debug.c' || echo '$(srcdir)/'`gimp-debug.c
+
+gimp_console_@GIMP_APP_VERSION@-gimp-debug.obj: gimp-debug.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-debug.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-debug.obj `if test -f 'gimp-debug.c'; then $(CYGPATH_W) 'gimp-debug.c'; else $(CYGPATH_W) '$(srcdir)/gimp-debug.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-debug.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-debug.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-debug.obj `if test -f 'gimp-debug.c'; then $(CYGPATH_W) 'gimp-debug.c'; else $(CYGPATH_W) '$(srcdir)/gimp-debug.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-gimp-log.o: gimp-log.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-log.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-log.o `test -f 'gimp-log.c' || echo '$(srcdir)/'`gimp-log.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-log.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-log.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-log.o `test -f 'gimp-log.c' || echo '$(srcdir)/'`gimp-log.c
+
+gimp_console_@GIMP_APP_VERSION@-gimp-log.obj: gimp-log.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-log.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-log.obj `if test -f 'gimp-log.c'; then $(CYGPATH_W) 'gimp-log.c'; else $(CYGPATH_W) '$(srcdir)/gimp-log.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-log.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-log.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-log.obj `if test -f 'gimp-log.c'; then $(CYGPATH_W) 'gimp-log.c'; else $(CYGPATH_W) '$(srcdir)/gimp-log.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-gimp-update.o: gimp-update.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-update.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-update.o `test -f 'gimp-update.c' || echo '$(srcdir)/'`gimp-update.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-update.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-update.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-update.o `test -f 'gimp-update.c' || echo '$(srcdir)/'`gimp-update.c
+
+gimp_console_@GIMP_APP_VERSION@-gimp-update.obj: gimp-update.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-update.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-update.obj `if test -f 'gimp-update.c'; then $(CYGPATH_W) 'gimp-update.c'; else $(CYGPATH_W) '$(srcdir)/gimp-update.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-update.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-update.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-update.obj `if test -f 'gimp-update.c'; then $(CYGPATH_W) 'gimp-update.c'; else $(CYGPATH_W) '$(srcdir)/gimp-update.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-gimp-version.o: gimp-version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-version.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-version.o `test -f 'gimp-version.c' || echo '$(srcdir)/'`gimp-version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-version.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-version.o `test -f 'gimp-version.c' || echo '$(srcdir)/'`gimp-version.c
+
+gimp_console_@GIMP_APP_VERSION@-gimp-version.obj: gimp-version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-gimp-version.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-gimp-version.obj `if test -f 'gimp-version.c'; then $(CYGPATH_W) 'gimp-version.c'; else $(CYGPATH_W) '$(srcdir)/gimp-version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-version.c' object='gimp_console_@GIMP_APP_VERSION@-gimp-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-gimp-version.obj `if test -f 'gimp-version.c'; then $(CYGPATH_W) 'gimp-version.c'; else $(CYGPATH_W) '$(srcdir)/gimp-version.c'; fi`
+
+gimp_console_@GIMP_APP_VERSION@-main.o: main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-main.o -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='gimp_console_@GIMP_APP_VERSION@-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+gimp_console_@GIMP_APP_VERSION@-main.obj: main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_@GIMP_APP_VERSION@-main.obj -MD -MP -MF $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Tpo -c -o gimp_console_@GIMP_APP_VERSION@-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Tpo $(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='gimp_console_@GIMP_APP_VERSION@-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_@GIMP_APP_VERSION@_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_@GIMP_APP_VERSION@-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(LIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+		-rm -f ./$(DEPDIR)/app.Po
+	-rm -f ./$(DEPDIR)/errors.Po
+	-rm -f ./$(DEPDIR)/gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp-update.Po
+	-rm -f ./$(DEPDIR)/gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po
+	-rm -f ./$(DEPDIR)/language.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/sanity.Po
+	-rm -f ./$(DEPDIR)/signals.Po
+	-rm -f ./$(DEPDIR)/tests.Po
+	-rm -f ./$(DEPDIR)/unique.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+		-rm -f ./$(DEPDIR)/app.Po
+	-rm -f ./$(DEPDIR)/errors.Po
+	-rm -f ./$(DEPDIR)/gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp-update.Po
+	-rm -f ./$(DEPDIR)/gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-update.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po
+	-rm -f ./$(DEPDIR)/language.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/sanity.Po
+	-rm -f ./$(DEPDIR)/signals.Po
+	-rm -f ./$(DEPDIR)/tests.Po
+	-rm -f ./$(DEPDIR)/unique.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-local
+
+.MAKE: $(am__recursive_targets) install-am install-exec-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am dist-hook distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-local
+
+.PRECIOUS: Makefile
+
+
+# `windres` seems a very stupid tool and it breaks with double shlashes
+# in parameter paths. Strengthen the rule a little.
+@HAVE_WINDRES_TRUE@%.rc.o:
+@HAVE_WINDRES_TRUE@	$(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \
+@HAVE_WINDRES_TRUE@		--define INTERNALNAME_STR="$*" \
+@HAVE_WINDRES_TRUE@		--define TOP_SRCDIR="`echo $(top_srcdir) | sed 's*//*/*'`" \
+@HAVE_WINDRES_TRUE@		-I"`echo $(top_srcdir)/app | sed 's%/\+%/%'`" \
+@HAVE_WINDRES_TRUE@		-I"`echo $(top_builddir)/app | sed 's%/\+%/%'`"\
+@HAVE_WINDRES_TRUE@		-I"`echo $(top_builddir) | sed 's%/\+%/%'`"\
+@HAVE_WINDRES_TRUE@		$(GIMPAPPRC) $@
+
+install-exec-hook:
+@DEFAULT_BINARY_TRUE@	cd $(DESTDIR)$(bindir) \
+@DEFAULT_BINARY_TRUE@	&& rm -f gimp$(EXEEXT) \
+@DEFAULT_BINARY_TRUE@	&& $(LN_S) gimp-$(GIMP_APP_VERSION)$(EXEEXT) gimp$(EXEEXT)
+@DEFAULT_BINARY_TRUE@@ENABLE_GIMP_CONSOLE_TRUE@	cd $(DESTDIR)$(bindir) \
+@DEFAULT_BINARY_TRUE@@ENABLE_GIMP_CONSOLE_TRUE@	&& rm -f gimp-console$(EXEEXT) \
+@DEFAULT_BINARY_TRUE@@ENABLE_GIMP_CONSOLE_TRUE@	&& $(LN_S) gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) gimp-console$(EXEEXT)
+
+uninstall-local:
+@DEFAULT_BINARY_TRUE@	rm -f $(DESTDIR)$(bindir)/gimp$(EXEEXT)
+@DEFAULT_BINARY_TRUE@@ENABLE_GIMP_CONSOLE_TRUE@	rm -f $(DESTDIR)$(bindir)/gimp-console$(EXEEXT)
+
+# require gimp-console when making dist
+#
+@ENABLE_GIMP_CONSOLE_TRUE@dist-check-gimp-console:
+@ENABLE_GIMP_CONSOLE_FALSE@dist-check-gimp-console:
+@ENABLE_GIMP_CONSOLE_FALSE@	@echo "*** gimp-console must be enabled in order to make dist"
+@ENABLE_GIMP_CONSOLE_FALSE@	@false
+
+# hook to assure that the system gimprc and the gimprc manpage are
+# uptodate when a release is made
+#
+dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
+	./$< --dump-gimprc-system > gimprc.tmp	\
+		&& (cmp -s gimprc.tmp $(top_srcdir)/etc/gimprc.in ||	\
+		    cp gimprc.tmp $(top_srcdir)/etc/gimprc.in)		\
+		&& rm gimprc.tmp
+	./$< --dump-gimprc-manpage > gimprc.tmp	\
+		&& (cmp -s gimprc.tmp $(top_srcdir)/docs/gimprc.5.in ||\
+		    cp gimprc.tmp $(top_srcdir)/docs/gimprc.5.in)	\
+		&& rm gimprc.tmp
+
+dist-hook: dist-check-gimp-console dist-dump-gimprc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/about.h b/app/about.h
new file mode 100644
index 0000000..c0dac07
--- /dev/null
+++ b/app/about.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ABOUT_H__
+#define __ABOUT_H__
+
+
+#define GIMP_ACRONYM \
+  _("GIMP")
+
+#define GIMP_NAME \
+  _("GNU Image Manipulation Program")
+
+/* The year of the last commit (UTC) will be inserted into this string. */
+#define GIMP_COPYRIGHT \
+  _("Copyright © 1995-%s\n" \
+    "Spencer Kimball, Peter Mattis and the GIMP Development Team")
+
+/* TRANSLATORS: do not end the license URL with a dot, because it would
+ * be in the link. Because of technical limitations, make sure the URL
+ * ends with a space, a newline or is end of text.
+ * Cf. bug 762282.
+ */
+#define GIMP_LICENSE \
+  _("GIMP is free software: you can redistribute it and/or modify it "   \
+    "under the terms of the GNU General Public License as published by " \
+    "the Free Software Foundation; either version 3 of the License, or " \
+    "(at your option) any later version."                                \
+    "\n\n"                                                               \
+    "GIMP is distributed in the hope that it will be useful, "           \
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of "    \
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "     \
+    "GNU General Public License for more details."                       \
+    "\n\n"                                                               \
+    "You should have received a copy of the GNU General Public License " \
+    "along with GIMP. If not, see: https://www.gnu.org/licenses/")
+
+
+#endif /* __ABOUT_H__ */
diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am
new file mode 100644
index 0000000..fd80ce2
--- /dev/null
+++ b/app/actions/Makefile.am
@@ -0,0 +1,202 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Actions\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappactions.a
+
+libappactions_a_SOURCES = \
+	actions-types.h			\
+	actions.c			\
+	actions.h			\
+	\
+	gimpgeglprocedure.c		\
+	gimpgeglprocedure.h		\
+	\
+	brush-editor-actions.c		\
+	brush-editor-actions.h		\
+	brushes-actions.c		\
+	brushes-actions.h		\
+	buffers-actions.c		\
+	buffers-actions.h		\
+	buffers-commands.c		\
+	buffers-commands.h		\
+	channels-actions.c		\
+	channels-actions.h		\
+	channels-commands.c		\
+	channels-commands.h		\
+	colormap-actions.c		\
+	colormap-actions.h		\
+	colormap-commands.c		\
+	colormap-commands.h		\
+	context-actions.c		\
+	context-actions.h		\
+	context-commands.c		\
+	context-commands.h		\
+	cursor-info-actions.c		\
+	cursor-info-actions.h		\
+	cursor-info-commands.c		\
+	cursor-info-commands.h		\
+	dashboard-actions.c		\
+	dashboard-actions.h		\
+	dashboard-commands.c		\
+	dashboard-commands.h		\
+	data-commands.c			\
+	data-commands.h			\
+	data-editor-commands.c		\
+	data-editor-commands.h		\
+	debug-actions.c			\
+	debug-actions.h			\
+	debug-commands.c		\
+	debug-commands.h		\
+	dialogs-actions.c		\
+	dialogs-actions.h		\
+	dialogs-commands.c		\
+	dialogs-commands.h		\
+	dock-actions.c			\
+	dock-actions.h			\
+	dock-commands.c			\
+	dock-commands.h			\
+	dockable-actions.c		\
+	dockable-actions.h		\
+	dockable-commands.c		\
+	dockable-commands.h		\
+	documents-actions.c		\
+	documents-actions.h		\
+	documents-commands.c		\
+	documents-commands.h		\
+	drawable-actions.c		\
+	drawable-actions.h		\
+	drawable-commands.c		\
+	drawable-commands.h		\
+	dynamics-actions.c		\
+	dynamics-actions.h		\
+	dynamics-editor-actions.c	\
+	dynamics-editor-actions.h	\
+	edit-actions.c			\
+	edit-actions.h			\
+	edit-commands.c			\
+	edit-commands.h			\
+	error-console-actions.c		\
+	error-console-actions.h		\
+	error-console-commands.c	\
+	error-console-commands.h	\
+	file-actions.c			\
+	file-actions.h			\
+	file-commands.c			\
+	file-commands.h			\
+	filters-actions.c		\
+	filters-actions.h		\
+	filters-commands.c		\
+	filters-commands.h		\
+	fonts-actions.c			\
+	fonts-actions.h			\
+	gradient-editor-actions.c	\
+	gradient-editor-actions.h	\
+	gradient-editor-commands.c	\
+	gradient-editor-commands.h	\
+	gradients-actions.c		\
+	gradients-actions.h		\
+	gradients-commands.c		\
+	gradients-commands.h		\
+	help-actions.c			\
+	help-actions.h			\
+	help-commands.c			\
+	help-commands.h			\
+	image-actions.c			\
+	image-actions.h			\
+	image-commands.c		\
+	image-commands.h		\
+	images-actions.c		\
+	images-actions.h		\
+	images-commands.c		\
+	images-commands.h		\
+	items-commands.c		\
+	items-commands.h		\
+	items-actions.c			\
+	items-actions.h			\
+	layers-actions.c		\
+	layers-actions.h		\
+	layers-commands.c		\
+	layers-commands.h		\
+	mypaint-brushes-actions.c	\
+	mypaint-brushes-actions.h	\
+	palette-editor-actions.c	\
+	palette-editor-actions.h	\
+	palette-editor-commands.c	\
+	palette-editor-commands.h	\
+	palettes-actions.c		\
+	palettes-actions.h		\
+	palettes-commands.c		\
+	palettes-commands.h		\
+	patterns-actions.c		\
+	patterns-actions.h		\
+	plug-in-actions.c		\
+	plug-in-actions.h		\
+	plug-in-commands.c		\
+	plug-in-commands.h		\
+	procedure-commands.c		\
+	procedure-commands.h		\
+	quick-mask-actions.c		\
+	quick-mask-actions.h		\
+	quick-mask-commands.c		\
+	quick-mask-commands.h		\
+	sample-points-actions.c		\
+	sample-points-actions.h		\
+	sample-points-commands.c	\
+	sample-points-commands.h	\
+	select-actions.c		\
+	select-actions.h		\
+	select-commands.c		\
+	select-commands.h		\
+	templates-actions.c		\
+	templates-actions.h		\
+	templates-commands.c		\
+	templates-commands.h		\
+	text-editor-actions.c		\
+	text-editor-actions.h		\
+	text-editor-commands.c		\
+	text-editor-commands.h		\
+	text-tool-actions.c		\
+	text-tool-actions.h		\
+	text-tool-commands.c		\
+	text-tool-commands.h		\
+	tool-options-actions.c		\
+	tool-options-actions.h		\
+	tool-options-commands.c		\
+	tool-options-commands.h		\
+	tool-presets-actions.c		\
+	tool-presets-actions.h		\
+	tool-presets-commands.c		\
+	tool-presets-commands.h		\
+	tool-preset-editor-actions.c	\
+	tool-preset-editor-actions.h	\
+	tool-preset-editor-commands.c	\
+	tool-preset-editor-commands.h	\
+	tools-actions.c			\
+	tools-actions.h			\
+	tools-commands.c		\
+	tools-commands.h		\
+	vectors-actions.c		\
+	vectors-actions.h		\
+	vectors-commands.c		\
+	vectors-commands.h		\
+	view-actions.c			\
+	view-actions.h			\
+	view-commands.c			\
+	view-commands.h			\
+	window-actions.c		\
+	window-actions.h		\
+	window-commands.c		\
+	window-commands.h		\
+	windows-actions.c		\
+	windows-actions.h		\
+	windows-commands.c		\
+	windows-commands.h
diff --git a/app/actions/Makefile.in b/app/actions/Makefile.in
new file mode 100644
index 0000000..0ca776d
--- /dev/null
+++ b/app/actions/Makefile.in
@@ -0,0 +1,1489 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/actions
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappactions_a_AR = $(AR) $(ARFLAGS)
+libappactions_a_LIBADD =
+am_libappactions_a_OBJECTS = actions.$(OBJEXT) \
+	gimpgeglprocedure.$(OBJEXT) brush-editor-actions.$(OBJEXT) \
+	brushes-actions.$(OBJEXT) buffers-actions.$(OBJEXT) \
+	buffers-commands.$(OBJEXT) channels-actions.$(OBJEXT) \
+	channels-commands.$(OBJEXT) colormap-actions.$(OBJEXT) \
+	colormap-commands.$(OBJEXT) context-actions.$(OBJEXT) \
+	context-commands.$(OBJEXT) cursor-info-actions.$(OBJEXT) \
+	cursor-info-commands.$(OBJEXT) dashboard-actions.$(OBJEXT) \
+	dashboard-commands.$(OBJEXT) data-commands.$(OBJEXT) \
+	data-editor-commands.$(OBJEXT) debug-actions.$(OBJEXT) \
+	debug-commands.$(OBJEXT) dialogs-actions.$(OBJEXT) \
+	dialogs-commands.$(OBJEXT) dock-actions.$(OBJEXT) \
+	dock-commands.$(OBJEXT) dockable-actions.$(OBJEXT) \
+	dockable-commands.$(OBJEXT) documents-actions.$(OBJEXT) \
+	documents-commands.$(OBJEXT) drawable-actions.$(OBJEXT) \
+	drawable-commands.$(OBJEXT) dynamics-actions.$(OBJEXT) \
+	dynamics-editor-actions.$(OBJEXT) edit-actions.$(OBJEXT) \
+	edit-commands.$(OBJEXT) error-console-actions.$(OBJEXT) \
+	error-console-commands.$(OBJEXT) file-actions.$(OBJEXT) \
+	file-commands.$(OBJEXT) filters-actions.$(OBJEXT) \
+	filters-commands.$(OBJEXT) fonts-actions.$(OBJEXT) \
+	gradient-editor-actions.$(OBJEXT) \
+	gradient-editor-commands.$(OBJEXT) gradients-actions.$(OBJEXT) \
+	gradients-commands.$(OBJEXT) help-actions.$(OBJEXT) \
+	help-commands.$(OBJEXT) image-actions.$(OBJEXT) \
+	image-commands.$(OBJEXT) images-actions.$(OBJEXT) \
+	images-commands.$(OBJEXT) items-commands.$(OBJEXT) \
+	items-actions.$(OBJEXT) layers-actions.$(OBJEXT) \
+	layers-commands.$(OBJEXT) mypaint-brushes-actions.$(OBJEXT) \
+	palette-editor-actions.$(OBJEXT) \
+	palette-editor-commands.$(OBJEXT) palettes-actions.$(OBJEXT) \
+	palettes-commands.$(OBJEXT) patterns-actions.$(OBJEXT) \
+	plug-in-actions.$(OBJEXT) plug-in-commands.$(OBJEXT) \
+	procedure-commands.$(OBJEXT) quick-mask-actions.$(OBJEXT) \
+	quick-mask-commands.$(OBJEXT) sample-points-actions.$(OBJEXT) \
+	sample-points-commands.$(OBJEXT) select-actions.$(OBJEXT) \
+	select-commands.$(OBJEXT) templates-actions.$(OBJEXT) \
+	templates-commands.$(OBJEXT) text-editor-actions.$(OBJEXT) \
+	text-editor-commands.$(OBJEXT) text-tool-actions.$(OBJEXT) \
+	text-tool-commands.$(OBJEXT) tool-options-actions.$(OBJEXT) \
+	tool-options-commands.$(OBJEXT) tool-presets-actions.$(OBJEXT) \
+	tool-presets-commands.$(OBJEXT) \
+	tool-preset-editor-actions.$(OBJEXT) \
+	tool-preset-editor-commands.$(OBJEXT) tools-actions.$(OBJEXT) \
+	tools-commands.$(OBJEXT) vectors-actions.$(OBJEXT) \
+	vectors-commands.$(OBJEXT) view-actions.$(OBJEXT) \
+	view-commands.$(OBJEXT) window-actions.$(OBJEXT) \
+	window-commands.$(OBJEXT) windows-actions.$(OBJEXT) \
+	windows-commands.$(OBJEXT)
+libappactions_a_OBJECTS = $(am_libappactions_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/actions.Po \
+	./$(DEPDIR)/brush-editor-actions.Po \
+	./$(DEPDIR)/brushes-actions.Po ./$(DEPDIR)/buffers-actions.Po \
+	./$(DEPDIR)/buffers-commands.Po \
+	./$(DEPDIR)/channels-actions.Po \
+	./$(DEPDIR)/channels-commands.Po \
+	./$(DEPDIR)/colormap-actions.Po \
+	./$(DEPDIR)/colormap-commands.Po \
+	./$(DEPDIR)/context-actions.Po ./$(DEPDIR)/context-commands.Po \
+	./$(DEPDIR)/cursor-info-actions.Po \
+	./$(DEPDIR)/cursor-info-commands.Po \
+	./$(DEPDIR)/dashboard-actions.Po \
+	./$(DEPDIR)/dashboard-commands.Po ./$(DEPDIR)/data-commands.Po \
+	./$(DEPDIR)/data-editor-commands.Po \
+	./$(DEPDIR)/debug-actions.Po ./$(DEPDIR)/debug-commands.Po \
+	./$(DEPDIR)/dialogs-actions.Po ./$(DEPDIR)/dialogs-commands.Po \
+	./$(DEPDIR)/dock-actions.Po ./$(DEPDIR)/dock-commands.Po \
+	./$(DEPDIR)/dockable-actions.Po \
+	./$(DEPDIR)/dockable-commands.Po \
+	./$(DEPDIR)/documents-actions.Po \
+	./$(DEPDIR)/documents-commands.Po \
+	./$(DEPDIR)/drawable-actions.Po \
+	./$(DEPDIR)/drawable-commands.Po \
+	./$(DEPDIR)/dynamics-actions.Po \
+	./$(DEPDIR)/dynamics-editor-actions.Po \
+	./$(DEPDIR)/edit-actions.Po ./$(DEPDIR)/edit-commands.Po \
+	./$(DEPDIR)/error-console-actions.Po \
+	./$(DEPDIR)/error-console-commands.Po \
+	./$(DEPDIR)/file-actions.Po ./$(DEPDIR)/file-commands.Po \
+	./$(DEPDIR)/filters-actions.Po ./$(DEPDIR)/filters-commands.Po \
+	./$(DEPDIR)/fonts-actions.Po ./$(DEPDIR)/gimpgeglprocedure.Po \
+	./$(DEPDIR)/gradient-editor-actions.Po \
+	./$(DEPDIR)/gradient-editor-commands.Po \
+	./$(DEPDIR)/gradients-actions.Po \
+	./$(DEPDIR)/gradients-commands.Po ./$(DEPDIR)/help-actions.Po \
+	./$(DEPDIR)/help-commands.Po ./$(DEPDIR)/image-actions.Po \
+	./$(DEPDIR)/image-commands.Po ./$(DEPDIR)/images-actions.Po \
+	./$(DEPDIR)/images-commands.Po ./$(DEPDIR)/items-actions.Po \
+	./$(DEPDIR)/items-commands.Po ./$(DEPDIR)/layers-actions.Po \
+	./$(DEPDIR)/layers-commands.Po \
+	./$(DEPDIR)/mypaint-brushes-actions.Po \
+	./$(DEPDIR)/palette-editor-actions.Po \
+	./$(DEPDIR)/palette-editor-commands.Po \
+	./$(DEPDIR)/palettes-actions.Po \
+	./$(DEPDIR)/palettes-commands.Po \
+	./$(DEPDIR)/patterns-actions.Po ./$(DEPDIR)/plug-in-actions.Po \
+	./$(DEPDIR)/plug-in-commands.Po \
+	./$(DEPDIR)/procedure-commands.Po \
+	./$(DEPDIR)/quick-mask-actions.Po \
+	./$(DEPDIR)/quick-mask-commands.Po \
+	./$(DEPDIR)/sample-points-actions.Po \
+	./$(DEPDIR)/sample-points-commands.Po \
+	./$(DEPDIR)/select-actions.Po ./$(DEPDIR)/select-commands.Po \
+	./$(DEPDIR)/templates-actions.Po \
+	./$(DEPDIR)/templates-commands.Po \
+	./$(DEPDIR)/text-editor-actions.Po \
+	./$(DEPDIR)/text-editor-commands.Po \
+	./$(DEPDIR)/text-tool-actions.Po \
+	./$(DEPDIR)/text-tool-commands.Po \
+	./$(DEPDIR)/tool-options-actions.Po \
+	./$(DEPDIR)/tool-options-commands.Po \
+	./$(DEPDIR)/tool-preset-editor-actions.Po \
+	./$(DEPDIR)/tool-preset-editor-commands.Po \
+	./$(DEPDIR)/tool-presets-actions.Po \
+	./$(DEPDIR)/tool-presets-commands.Po \
+	./$(DEPDIR)/tools-actions.Po ./$(DEPDIR)/tools-commands.Po \
+	./$(DEPDIR)/vectors-actions.Po ./$(DEPDIR)/vectors-commands.Po \
+	./$(DEPDIR)/view-actions.Po ./$(DEPDIR)/view-commands.Po \
+	./$(DEPDIR)/window-actions.Po ./$(DEPDIR)/window-commands.Po \
+	./$(DEPDIR)/windows-actions.Po ./$(DEPDIR)/windows-commands.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappactions_a_SOURCES)
+DIST_SOURCES = $(libappactions_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Actions\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappactions.a
+libappactions_a_SOURCES = \
+	actions-types.h			\
+	actions.c			\
+	actions.h			\
+	\
+	gimpgeglprocedure.c		\
+	gimpgeglprocedure.h		\
+	\
+	brush-editor-actions.c		\
+	brush-editor-actions.h		\
+	brushes-actions.c		\
+	brushes-actions.h		\
+	buffers-actions.c		\
+	buffers-actions.h		\
+	buffers-commands.c		\
+	buffers-commands.h		\
+	channels-actions.c		\
+	channels-actions.h		\
+	channels-commands.c		\
+	channels-commands.h		\
+	colormap-actions.c		\
+	colormap-actions.h		\
+	colormap-commands.c		\
+	colormap-commands.h		\
+	context-actions.c		\
+	context-actions.h		\
+	context-commands.c		\
+	context-commands.h		\
+	cursor-info-actions.c		\
+	cursor-info-actions.h		\
+	cursor-info-commands.c		\
+	cursor-info-commands.h		\
+	dashboard-actions.c		\
+	dashboard-actions.h		\
+	dashboard-commands.c		\
+	dashboard-commands.h		\
+	data-commands.c			\
+	data-commands.h			\
+	data-editor-commands.c		\
+	data-editor-commands.h		\
+	debug-actions.c			\
+	debug-actions.h			\
+	debug-commands.c		\
+	debug-commands.h		\
+	dialogs-actions.c		\
+	dialogs-actions.h		\
+	dialogs-commands.c		\
+	dialogs-commands.h		\
+	dock-actions.c			\
+	dock-actions.h			\
+	dock-commands.c			\
+	dock-commands.h			\
+	dockable-actions.c		\
+	dockable-actions.h		\
+	dockable-commands.c		\
+	dockable-commands.h		\
+	documents-actions.c		\
+	documents-actions.h		\
+	documents-commands.c		\
+	documents-commands.h		\
+	drawable-actions.c		\
+	drawable-actions.h		\
+	drawable-commands.c		\
+	drawable-commands.h		\
+	dynamics-actions.c		\
+	dynamics-actions.h		\
+	dynamics-editor-actions.c	\
+	dynamics-editor-actions.h	\
+	edit-actions.c			\
+	edit-actions.h			\
+	edit-commands.c			\
+	edit-commands.h			\
+	error-console-actions.c		\
+	error-console-actions.h		\
+	error-console-commands.c	\
+	error-console-commands.h	\
+	file-actions.c			\
+	file-actions.h			\
+	file-commands.c			\
+	file-commands.h			\
+	filters-actions.c		\
+	filters-actions.h		\
+	filters-commands.c		\
+	filters-commands.h		\
+	fonts-actions.c			\
+	fonts-actions.h			\
+	gradient-editor-actions.c	\
+	gradient-editor-actions.h	\
+	gradient-editor-commands.c	\
+	gradient-editor-commands.h	\
+	gradients-actions.c		\
+	gradients-actions.h		\
+	gradients-commands.c		\
+	gradients-commands.h		\
+	help-actions.c			\
+	help-actions.h			\
+	help-commands.c			\
+	help-commands.h			\
+	image-actions.c			\
+	image-actions.h			\
+	image-commands.c		\
+	image-commands.h		\
+	images-actions.c		\
+	images-actions.h		\
+	images-commands.c		\
+	images-commands.h		\
+	items-commands.c		\
+	items-commands.h		\
+	items-actions.c			\
+	items-actions.h			\
+	layers-actions.c		\
+	layers-actions.h		\
+	layers-commands.c		\
+	layers-commands.h		\
+	mypaint-brushes-actions.c	\
+	mypaint-brushes-actions.h	\
+	palette-editor-actions.c	\
+	palette-editor-actions.h	\
+	palette-editor-commands.c	\
+	palette-editor-commands.h	\
+	palettes-actions.c		\
+	palettes-actions.h		\
+	palettes-commands.c		\
+	palettes-commands.h		\
+	patterns-actions.c		\
+	patterns-actions.h		\
+	plug-in-actions.c		\
+	plug-in-actions.h		\
+	plug-in-commands.c		\
+	plug-in-commands.h		\
+	procedure-commands.c		\
+	procedure-commands.h		\
+	quick-mask-actions.c		\
+	quick-mask-actions.h		\
+	quick-mask-commands.c		\
+	quick-mask-commands.h		\
+	sample-points-actions.c		\
+	sample-points-actions.h		\
+	sample-points-commands.c	\
+	sample-points-commands.h	\
+	select-actions.c		\
+	select-actions.h		\
+	select-commands.c		\
+	select-commands.h		\
+	templates-actions.c		\
+	templates-actions.h		\
+	templates-commands.c		\
+	templates-commands.h		\
+	text-editor-actions.c		\
+	text-editor-actions.h		\
+	text-editor-commands.c		\
+	text-editor-commands.h		\
+	text-tool-actions.c		\
+	text-tool-actions.h		\
+	text-tool-commands.c		\
+	text-tool-commands.h		\
+	tool-options-actions.c		\
+	tool-options-actions.h		\
+	tool-options-commands.c		\
+	tool-options-commands.h		\
+	tool-presets-actions.c		\
+	tool-presets-actions.h		\
+	tool-presets-commands.c		\
+	tool-presets-commands.h		\
+	tool-preset-editor-actions.c	\
+	tool-preset-editor-actions.h	\
+	tool-preset-editor-commands.c	\
+	tool-preset-editor-commands.h	\
+	tools-actions.c			\
+	tools-actions.h			\
+	tools-commands.c		\
+	tools-commands.h		\
+	vectors-actions.c		\
+	vectors-actions.h		\
+	vectors-commands.c		\
+	vectors-commands.h		\
+	view-actions.c			\
+	view-actions.h			\
+	view-commands.c			\
+	view-commands.h			\
+	window-actions.c		\
+	window-actions.h		\
+	window-commands.c		\
+	window-commands.h		\
+	windows-actions.c		\
+	windows-actions.h		\
+	windows-commands.c		\
+	windows-commands.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/actions/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/actions/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappactions.a: $(libappactions_a_OBJECTS) $(libappactions_a_DEPENDENCIES) $(EXTRA_libappactions_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappactions.a
+	$(AM_V_AR)$(libappactions_a_AR) libappactions.a $(libappactions_a_OBJECTS) $(libappactions_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappactions.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brush-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brushes-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channels-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channels-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor-info-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor-info-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dashboard-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dashboard-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dock-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dock-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documents-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documents-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-console-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-console-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgeglprocedure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/images-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/images-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypaint-brushes-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterns-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procedure-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick-mask-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick-mask-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample-points-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample-points-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-preset-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-preset-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-presets-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-presets-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-commands.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/actions.Po
+	-rm -f ./$(DEPDIR)/brush-editor-actions.Po
+	-rm -f ./$(DEPDIR)/brushes-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-commands.Po
+	-rm -f ./$(DEPDIR)/channels-actions.Po
+	-rm -f ./$(DEPDIR)/channels-commands.Po
+	-rm -f ./$(DEPDIR)/colormap-actions.Po
+	-rm -f ./$(DEPDIR)/colormap-commands.Po
+	-rm -f ./$(DEPDIR)/context-actions.Po
+	-rm -f ./$(DEPDIR)/context-commands.Po
+	-rm -f ./$(DEPDIR)/cursor-info-actions.Po
+	-rm -f ./$(DEPDIR)/cursor-info-commands.Po
+	-rm -f ./$(DEPDIR)/dashboard-actions.Po
+	-rm -f ./$(DEPDIR)/dashboard-commands.Po
+	-rm -f ./$(DEPDIR)/data-commands.Po
+	-rm -f ./$(DEPDIR)/data-editor-commands.Po
+	-rm -f ./$(DEPDIR)/debug-actions.Po
+	-rm -f ./$(DEPDIR)/debug-commands.Po
+	-rm -f ./$(DEPDIR)/dialogs-actions.Po
+	-rm -f ./$(DEPDIR)/dialogs-commands.Po
+	-rm -f ./$(DEPDIR)/dock-actions.Po
+	-rm -f ./$(DEPDIR)/dock-commands.Po
+	-rm -f ./$(DEPDIR)/dockable-actions.Po
+	-rm -f ./$(DEPDIR)/dockable-commands.Po
+	-rm -f ./$(DEPDIR)/documents-actions.Po
+	-rm -f ./$(DEPDIR)/documents-commands.Po
+	-rm -f ./$(DEPDIR)/drawable-actions.Po
+	-rm -f ./$(DEPDIR)/drawable-commands.Po
+	-rm -f ./$(DEPDIR)/dynamics-actions.Po
+	-rm -f ./$(DEPDIR)/dynamics-editor-actions.Po
+	-rm -f ./$(DEPDIR)/edit-actions.Po
+	-rm -f ./$(DEPDIR)/edit-commands.Po
+	-rm -f ./$(DEPDIR)/error-console-actions.Po
+	-rm -f ./$(DEPDIR)/error-console-commands.Po
+	-rm -f ./$(DEPDIR)/file-actions.Po
+	-rm -f ./$(DEPDIR)/file-commands.Po
+	-rm -f ./$(DEPDIR)/filters-actions.Po
+	-rm -f ./$(DEPDIR)/filters-commands.Po
+	-rm -f ./$(DEPDIR)/fonts-actions.Po
+	-rm -f ./$(DEPDIR)/gimpgeglprocedure.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-actions.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-commands.Po
+	-rm -f ./$(DEPDIR)/gradients-actions.Po
+	-rm -f ./$(DEPDIR)/gradients-commands.Po
+	-rm -f ./$(DEPDIR)/help-actions.Po
+	-rm -f ./$(DEPDIR)/help-commands.Po
+	-rm -f ./$(DEPDIR)/image-actions.Po
+	-rm -f ./$(DEPDIR)/image-commands.Po
+	-rm -f ./$(DEPDIR)/images-actions.Po
+	-rm -f ./$(DEPDIR)/images-commands.Po
+	-rm -f ./$(DEPDIR)/items-actions.Po
+	-rm -f ./$(DEPDIR)/items-commands.Po
+	-rm -f ./$(DEPDIR)/layers-actions.Po
+	-rm -f ./$(DEPDIR)/layers-commands.Po
+	-rm -f ./$(DEPDIR)/mypaint-brushes-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-commands.Po
+	-rm -f ./$(DEPDIR)/palettes-actions.Po
+	-rm -f ./$(DEPDIR)/palettes-commands.Po
+	-rm -f ./$(DEPDIR)/patterns-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-commands.Po
+	-rm -f ./$(DEPDIR)/procedure-commands.Po
+	-rm -f ./$(DEPDIR)/quick-mask-actions.Po
+	-rm -f ./$(DEPDIR)/quick-mask-commands.Po
+	-rm -f ./$(DEPDIR)/sample-points-actions.Po
+	-rm -f ./$(DEPDIR)/sample-points-commands.Po
+	-rm -f ./$(DEPDIR)/select-actions.Po
+	-rm -f ./$(DEPDIR)/select-commands.Po
+	-rm -f ./$(DEPDIR)/templates-actions.Po
+	-rm -f ./$(DEPDIR)/templates-commands.Po
+	-rm -f ./$(DEPDIR)/text-editor-actions.Po
+	-rm -f ./$(DEPDIR)/text-editor-commands.Po
+	-rm -f ./$(DEPDIR)/text-tool-actions.Po
+	-rm -f ./$(DEPDIR)/text-tool-commands.Po
+	-rm -f ./$(DEPDIR)/tool-options-actions.Po
+	-rm -f ./$(DEPDIR)/tool-options-commands.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-actions.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-commands.Po
+	-rm -f ./$(DEPDIR)/tool-presets-actions.Po
+	-rm -f ./$(DEPDIR)/tool-presets-commands.Po
+	-rm -f ./$(DEPDIR)/tools-actions.Po
+	-rm -f ./$(DEPDIR)/tools-commands.Po
+	-rm -f ./$(DEPDIR)/vectors-actions.Po
+	-rm -f ./$(DEPDIR)/vectors-commands.Po
+	-rm -f ./$(DEPDIR)/view-actions.Po
+	-rm -f ./$(DEPDIR)/view-commands.Po
+	-rm -f ./$(DEPDIR)/window-actions.Po
+	-rm -f ./$(DEPDIR)/window-commands.Po
+	-rm -f ./$(DEPDIR)/windows-actions.Po
+	-rm -f ./$(DEPDIR)/windows-commands.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/actions.Po
+	-rm -f ./$(DEPDIR)/brush-editor-actions.Po
+	-rm -f ./$(DEPDIR)/brushes-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-commands.Po
+	-rm -f ./$(DEPDIR)/channels-actions.Po
+	-rm -f ./$(DEPDIR)/channels-commands.Po
+	-rm -f ./$(DEPDIR)/colormap-actions.Po
+	-rm -f ./$(DEPDIR)/colormap-commands.Po
+	-rm -f ./$(DEPDIR)/context-actions.Po
+	-rm -f ./$(DEPDIR)/context-commands.Po
+	-rm -f ./$(DEPDIR)/cursor-info-actions.Po
+	-rm -f ./$(DEPDIR)/cursor-info-commands.Po
+	-rm -f ./$(DEPDIR)/dashboard-actions.Po
+	-rm -f ./$(DEPDIR)/dashboard-commands.Po
+	-rm -f ./$(DEPDIR)/data-commands.Po
+	-rm -f ./$(DEPDIR)/data-editor-commands.Po
+	-rm -f ./$(DEPDIR)/debug-actions.Po
+	-rm -f ./$(DEPDIR)/debug-commands.Po
+	-rm -f ./$(DEPDIR)/dialogs-actions.Po
+	-rm -f ./$(DEPDIR)/dialogs-commands.Po
+	-rm -f ./$(DEPDIR)/dock-actions.Po
+	-rm -f ./$(DEPDIR)/dock-commands.Po
+	-rm -f ./$(DEPDIR)/dockable-actions.Po
+	-rm -f ./$(DEPDIR)/dockable-commands.Po
+	-rm -f ./$(DEPDIR)/documents-actions.Po
+	-rm -f ./$(DEPDIR)/documents-commands.Po
+	-rm -f ./$(DEPDIR)/drawable-actions.Po
+	-rm -f ./$(DEPDIR)/drawable-commands.Po
+	-rm -f ./$(DEPDIR)/dynamics-actions.Po
+	-rm -f ./$(DEPDIR)/dynamics-editor-actions.Po
+	-rm -f ./$(DEPDIR)/edit-actions.Po
+	-rm -f ./$(DEPDIR)/edit-commands.Po
+	-rm -f ./$(DEPDIR)/error-console-actions.Po
+	-rm -f ./$(DEPDIR)/error-console-commands.Po
+	-rm -f ./$(DEPDIR)/file-actions.Po
+	-rm -f ./$(DEPDIR)/file-commands.Po
+	-rm -f ./$(DEPDIR)/filters-actions.Po
+	-rm -f ./$(DEPDIR)/filters-commands.Po
+	-rm -f ./$(DEPDIR)/fonts-actions.Po
+	-rm -f ./$(DEPDIR)/gimpgeglprocedure.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-actions.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-commands.Po
+	-rm -f ./$(DEPDIR)/gradients-actions.Po
+	-rm -f ./$(DEPDIR)/gradients-commands.Po
+	-rm -f ./$(DEPDIR)/help-actions.Po
+	-rm -f ./$(DEPDIR)/help-commands.Po
+	-rm -f ./$(DEPDIR)/image-actions.Po
+	-rm -f ./$(DEPDIR)/image-commands.Po
+	-rm -f ./$(DEPDIR)/images-actions.Po
+	-rm -f ./$(DEPDIR)/images-commands.Po
+	-rm -f ./$(DEPDIR)/items-actions.Po
+	-rm -f ./$(DEPDIR)/items-commands.Po
+	-rm -f ./$(DEPDIR)/layers-actions.Po
+	-rm -f ./$(DEPDIR)/layers-commands.Po
+	-rm -f ./$(DEPDIR)/mypaint-brushes-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-commands.Po
+	-rm -f ./$(DEPDIR)/palettes-actions.Po
+	-rm -f ./$(DEPDIR)/palettes-commands.Po
+	-rm -f ./$(DEPDIR)/patterns-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-commands.Po
+	-rm -f ./$(DEPDIR)/procedure-commands.Po
+	-rm -f ./$(DEPDIR)/quick-mask-actions.Po
+	-rm -f ./$(DEPDIR)/quick-mask-commands.Po
+	-rm -f ./$(DEPDIR)/sample-points-actions.Po
+	-rm -f ./$(DEPDIR)/sample-points-commands.Po
+	-rm -f ./$(DEPDIR)/select-actions.Po
+	-rm -f ./$(DEPDIR)/select-commands.Po
+	-rm -f ./$(DEPDIR)/templates-actions.Po
+	-rm -f ./$(DEPDIR)/templates-commands.Po
+	-rm -f ./$(DEPDIR)/text-editor-actions.Po
+	-rm -f ./$(DEPDIR)/text-editor-commands.Po
+	-rm -f ./$(DEPDIR)/text-tool-actions.Po
+	-rm -f ./$(DEPDIR)/text-tool-commands.Po
+	-rm -f ./$(DEPDIR)/tool-options-actions.Po
+	-rm -f ./$(DEPDIR)/tool-options-commands.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-actions.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-commands.Po
+	-rm -f ./$(DEPDIR)/tool-presets-actions.Po
+	-rm -f ./$(DEPDIR)/tool-presets-commands.Po
+	-rm -f ./$(DEPDIR)/tools-actions.Po
+	-rm -f ./$(DEPDIR)/tools-commands.Po
+	-rm -f ./$(DEPDIR)/vectors-actions.Po
+	-rm -f ./$(DEPDIR)/vectors-commands.Po
+	-rm -f ./$(DEPDIR)/view-actions.Po
+	-rm -f ./$(DEPDIR)/view-commands.Po
+	-rm -f ./$(DEPDIR)/window-actions.Po
+	-rm -f ./$(DEPDIR)/window-commands.Po
+	-rm -f ./$(DEPDIR)/windows-actions.Po
+	-rm -f ./$(DEPDIR)/windows-commands.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/actions/actions-types.h b/app/actions/actions-types.h
new file mode 100644
index 0000000..383aada
--- /dev/null
+++ b/app/actions/actions-types.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ACTIONS_TYPES_H__
+#define __ACTIONS_TYPES_H__
+
+
+#include "dialogs/dialogs-types.h"
+#include "tools/tools-types.h"
+
+
+typedef enum
+{
+  GIMP_ACTION_SELECT_SET              =  0,
+  GIMP_ACTION_SELECT_SET_TO_DEFAULT   = -1,
+  GIMP_ACTION_SELECT_FIRST            = -2,
+  GIMP_ACTION_SELECT_LAST             = -3,
+  GIMP_ACTION_SELECT_SMALL_PREVIOUS   = -4,
+  GIMP_ACTION_SELECT_SMALL_NEXT       = -5,
+  GIMP_ACTION_SELECT_PREVIOUS         = -6,
+  GIMP_ACTION_SELECT_NEXT             = -7,
+  GIMP_ACTION_SELECT_SKIP_PREVIOUS    = -8,
+  GIMP_ACTION_SELECT_SKIP_NEXT        = -9,
+  GIMP_ACTION_SELECT_PERCENT_PREVIOUS = -10,
+  GIMP_ACTION_SELECT_PERCENT_NEXT     = -11
+} GimpActionSelectType;
+
+typedef enum
+{
+  GIMP_SAVE_MODE_SAVE,
+  GIMP_SAVE_MODE_SAVE_AS,
+  GIMP_SAVE_MODE_SAVE_A_COPY,
+  GIMP_SAVE_MODE_SAVE_AND_CLOSE,
+  GIMP_SAVE_MODE_EXPORT,
+  GIMP_SAVE_MODE_EXPORT_AS,
+  GIMP_SAVE_MODE_OVERWRITE
+} GimpSaveMode;
+
+
+#endif /* __ACTIONS_TYPES_H__ */
diff --git a/app/actions/actions.c b/app/actions/actions.c
new file mode 100644
index 0000000..cf8d6dc
--- /dev/null
+++ b/app/actions/actions.c
@@ -0,0 +1,737 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimptooloptions.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpactionfactory.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpcontainereditor.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimpimageeditor.h"
+#include "widgets/gimpitemtreeview.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
+#include "display/gimpnavigationeditor.h"
+#include "display/gimpstatusbar.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "brush-editor-actions.h"
+#include "brushes-actions.h"
+#include "buffers-actions.h"
+#include "channels-actions.h"
+#include "colormap-actions.h"
+#include "context-actions.h"
+#include "cursor-info-actions.h"
+#include "dashboard-actions.h"
+#include "debug-actions.h"
+#include "dialogs-actions.h"
+#include "dock-actions.h"
+#include "dockable-actions.h"
+#include "documents-actions.h"
+#include "drawable-actions.h"
+#include "dynamics-actions.h"
+#include "dynamics-editor-actions.h"
+#include "edit-actions.h"
+#include "error-console-actions.h"
+#include "file-actions.h"
+#include "filters-actions.h"
+#include "fonts-actions.h"
+#include "gradient-editor-actions.h"
+#include "gradients-actions.h"
+#include "help-actions.h"
+#include "image-actions.h"
+#include "images-actions.h"
+#include "layers-actions.h"
+#include "mypaint-brushes-actions.h"
+#include "palette-editor-actions.h"
+#include "palettes-actions.h"
+#include "patterns-actions.h"
+#include "plug-in-actions.h"
+#include "quick-mask-actions.h"
+#include "sample-points-actions.h"
+#include "select-actions.h"
+#include "templates-actions.h"
+#include "text-editor-actions.h"
+#include "text-tool-actions.h"
+#include "tool-options-actions.h"
+#include "tool-presets-actions.h"
+#include "tool-preset-editor-actions.h"
+#include "tools-actions.h"
+#include "vectors-actions.h"
+#include "view-actions.h"
+#include "windows-actions.h"
+
+#include "gimp-intl.h"
+
+
+/*  global variables  */
+
+GimpActionFactory *global_action_factory = NULL;
+
+
+/*  private variables  */
+
+static const GimpActionFactoryEntry action_groups[] =
+{
+  { "brush-editor", N_("Brush Editor"), GIMP_ICON_BRUSH,
+    brush_editor_actions_setup,
+    brush_editor_actions_update },
+  { "brushes", N_("Brushes"), GIMP_ICON_BRUSH,
+    brushes_actions_setup,
+    brushes_actions_update },
+  { "buffers", N_("Buffers"), GIMP_ICON_BUFFER,
+    buffers_actions_setup,
+    buffers_actions_update },
+  { "channels", N_("Channels"), GIMP_ICON_CHANNEL,
+    channels_actions_setup,
+    channels_actions_update },
+  { "colormap", N_("Colormap"), GIMP_ICON_COLORMAP,
+    colormap_actions_setup,
+    colormap_actions_update },
+  { "context", N_("Context"), GIMP_ICON_DIALOG_TOOL_OPTIONS /* well... */,
+    context_actions_setup,
+    context_actions_update },
+  { "cursor-info", N_("Pointer Information"), NULL,
+    cursor_info_actions_setup,
+    cursor_info_actions_update },
+  { "dashboard", N_("Dashboard"), GIMP_ICON_DIALOG_DASHBOARD,
+    dashboard_actions_setup,
+    dashboard_actions_update },
+  { "debug", N_("Debug"), NULL,
+    debug_actions_setup,
+    debug_actions_update },
+  { "dialogs", N_("Dialogs"), NULL,
+    dialogs_actions_setup,
+    dialogs_actions_update },
+  { "dock", N_("Dock"), NULL,
+    dock_actions_setup,
+    dock_actions_update },
+  { "dockable", N_("Dockable"), NULL,
+    dockable_actions_setup,
+    dockable_actions_update },
+  { "documents", N_("Document History"), NULL,
+    documents_actions_setup,
+    documents_actions_update },
+  { "drawable", N_("Drawable"), GIMP_ICON_LAYER,
+    drawable_actions_setup,
+    drawable_actions_update },
+  { "dynamics", N_("Paint Dynamics"), GIMP_ICON_DYNAMICS,
+    dynamics_actions_setup,
+    dynamics_actions_update },
+  { "dynamics-editor", N_("Paint Dynamics Editor"), GIMP_ICON_DYNAMICS,
+    dynamics_editor_actions_setup,
+    dynamics_editor_actions_update },
+  { "edit", N_("Edit"), GIMP_ICON_EDIT,
+    edit_actions_setup,
+    edit_actions_update },
+  { "error-console", N_("Error Console"), GIMP_ICON_DIALOG_WARNING,
+    error_console_actions_setup,
+    error_console_actions_update },
+  { "file", N_("File"), "text-x-generic",
+    file_actions_setup,
+    file_actions_update },
+  { "filters", N_("Filters"), GIMP_ICON_GEGL,
+    filters_actions_setup,
+    filters_actions_update },
+  { "fonts", N_("Fonts"), GIMP_ICON_FONT,
+    fonts_actions_setup,
+    fonts_actions_update },
+  { "gradient-editor", N_("Gradient Editor"), GIMP_ICON_GRADIENT,
+    gradient_editor_actions_setup,
+    gradient_editor_actions_update },
+  { "gradients", N_("Gradients"), GIMP_ICON_GRADIENT,
+    gradients_actions_setup,
+    gradients_actions_update },
+  { "tool-presets", N_("Tool Presets"), GIMP_ICON_TOOL_PRESET,
+    tool_presets_actions_setup,
+    tool_presets_actions_update },
+  { "tool-preset-editor", N_("Tool Preset Editor"), GIMP_ICON_TOOL_PRESET,
+    tool_preset_editor_actions_setup,
+    tool_preset_editor_actions_update },
+  { "help", N_("Help"), "help-browser",
+    help_actions_setup,
+    help_actions_update },
+  { "image", N_("Image"), GIMP_ICON_IMAGE,
+    image_actions_setup,
+    image_actions_update },
+  { "images", N_("Images"), GIMP_ICON_IMAGE,
+    images_actions_setup,
+    images_actions_update },
+  { "layers", N_("Layers"), GIMP_ICON_LAYER,
+    layers_actions_setup,
+    layers_actions_update },
+  { "mypaint-brushes", N_("MyPaint Brushes"), GIMP_ICON_MYPAINT_BRUSH,
+    mypaint_brushes_actions_setup,
+    mypaint_brushes_actions_update },
+  { "palette-editor", N_("Palette Editor"), GIMP_ICON_PALETTE,
+    palette_editor_actions_setup,
+    palette_editor_actions_update },
+  { "palettes", N_("Palettes"), GIMP_ICON_PALETTE,
+    palettes_actions_setup,
+    palettes_actions_update },
+  { "patterns", N_("Patterns"), GIMP_ICON_PATTERN,
+    patterns_actions_setup,
+    patterns_actions_update },
+  { "plug-in", N_("Plug-ins"), GIMP_ICON_PLUGIN,
+    plug_in_actions_setup,
+    plug_in_actions_update },
+  { "quick-mask", N_("Quick Mask"), GIMP_ICON_QUICK_MASK_ON,
+    quick_mask_actions_setup,
+    quick_mask_actions_update },
+  { "sample-points", N_("Sample Points"), GIMP_ICON_SAMPLE_POINT,
+    sample_points_actions_setup,
+    sample_points_actions_update },
+  { "select", N_("Select"), GIMP_ICON_SELECTION,
+    select_actions_setup,
+    select_actions_update },
+  { "templates", N_("Templates"), GIMP_ICON_TEMPLATE,
+    templates_actions_setup,
+    templates_actions_update },
+  { "text-tool", N_("Text Tool"), GIMP_ICON_EDIT,
+    text_tool_actions_setup,
+    text_tool_actions_update },
+  { "text-editor", N_("Text Editor"), GIMP_ICON_EDIT,
+    text_editor_actions_setup,
+    text_editor_actions_update },
+  { "tool-options", N_("Tool Options"), GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    tool_options_actions_setup,
+    tool_options_actions_update },
+  { "tools", N_("Tools"), GIMP_ICON_DIALOG_TOOLS,
+    tools_actions_setup,
+    tools_actions_update },
+  { "vectors", N_("Paths"), GIMP_ICON_PATH,
+    vectors_actions_setup,
+    vectors_actions_update },
+  { "view", N_("View"), GIMP_ICON_VISIBLE,
+    view_actions_setup,
+    view_actions_update },
+  { "windows", N_("Windows"), NULL,
+    windows_actions_setup,
+    windows_actions_update }
+};
+
+
+/*  public functions  */
+
+void
+actions_init (Gimp *gimp)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (global_action_factory == NULL);
+
+  global_action_factory = gimp_action_factory_new (gimp);
+
+  for (i = 0; i < G_N_ELEMENTS (action_groups); i++)
+    gimp_action_factory_group_register (global_action_factory,
+                                        action_groups[i].identifier,
+                                        gettext (action_groups[i].label),
+                                        action_groups[i].icon_name,
+                                        action_groups[i].setup_func,
+                                        action_groups[i].update_func);
+}
+
+void
+actions_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (global_action_factory != NULL);
+  g_return_if_fail (global_action_factory->gimp == gimp);
+
+  g_clear_object (&global_action_factory);
+}
+
+Gimp *
+action_data_get_gimp (gpointer data)
+{
+  Gimp            *result    = NULL;
+  static gboolean  recursion = FALSE;
+
+  if (! data || recursion)
+    return NULL;
+
+  recursion = TRUE;
+
+  if (GIMP_IS_GIMP (data))
+    result = data;
+
+  if (! result)
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        result = display->gimp;
+    }
+
+  if (! result)
+    {
+      GimpContext *context = action_data_get_context (data);
+
+      if (context)
+        result = context->gimp;
+    }
+
+  recursion = FALSE;
+
+  return result;
+}
+
+GimpContext *
+action_data_get_context (gpointer data)
+{
+  GimpContext     *result    = NULL;
+  static gboolean  recursion = FALSE;
+
+  if (! data || recursion)
+    return NULL;
+
+  recursion = TRUE;
+
+  if (GIMP_IS_DOCK (data))
+    result = gimp_dock_get_context ((GimpDock *) data);
+  else if (GIMP_IS_DOCK_WINDOW (data))
+    result = gimp_dock_window_get_context (((GimpDockWindow *) data));
+  else if (GIMP_IS_CONTAINER_VIEW (data))
+    result = gimp_container_view_get_context ((GimpContainerView *) data);
+  else if (GIMP_IS_CONTAINER_EDITOR (data))
+    result = gimp_container_view_get_context (((GimpContainerEditor *) data)->view);
+  else if (GIMP_IS_IMAGE_EDITOR (data))
+    result = ((GimpImageEditor *) data)->context;
+  else if (GIMP_IS_NAVIGATION_EDITOR (data))
+    result = ((GimpNavigationEditor *) data)->context;
+
+  if (! result)
+    {
+      Gimp *gimp = action_data_get_gimp (data);
+
+      if (gimp)
+        result = gimp_get_user_context (gimp);
+    }
+
+  recursion = FALSE;
+
+  return result;
+}
+
+GimpImage *
+action_data_get_image (gpointer data)
+{
+  GimpImage       *result    = NULL;
+  static gboolean  recursion = FALSE;
+
+  if (! data || recursion)
+    return NULL;
+
+  recursion = TRUE;
+
+  if (GIMP_IS_ITEM_TREE_VIEW (data))
+    result = gimp_item_tree_view_get_image ((GimpItemTreeView *) data);
+  else if (GIMP_IS_IMAGE_EDITOR (data))
+    result = ((GimpImageEditor *) data)->image;
+
+  if (! result)
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        result = gimp_display_get_image (display);
+    }
+
+  if (! result)
+    {
+      GimpContext *context = action_data_get_context (data);
+
+      if (context)
+        result = gimp_context_get_image (context);
+    }
+
+  recursion = FALSE;
+
+  return result;
+}
+
+GimpDisplay *
+action_data_get_display (gpointer data)
+{
+  GimpDisplay     *result    = NULL;
+  static gboolean  recursion = FALSE;
+
+  if (! data || recursion)
+    return NULL;
+
+  recursion = TRUE;
+
+  if (GIMP_IS_DISPLAY (data))
+    result = data;
+  else if (GIMP_IS_IMAGE_WINDOW (data))
+    {
+      GimpDisplayShell *shell = gimp_image_window_get_active_shell (data);
+      result = shell ? shell->display : NULL;
+    }
+
+  if (! result)
+    {
+      GimpContext *context = action_data_get_context (data);
+
+      if (context)
+        result = gimp_context_get_display (context);
+    }
+
+  recursion = FALSE;
+
+  return result;
+}
+
+GimpDisplayShell *
+action_data_get_shell (gpointer data)
+{
+  GimpDisplayShell *result    = NULL;
+  static gboolean   recursion = FALSE;
+
+  if (! data || recursion)
+    return NULL;
+
+  recursion = TRUE;
+
+  if (! result)
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        result = gimp_display_get_shell (display);
+    }
+
+  recursion = FALSE;
+
+  return result;
+}
+
+GtkWidget *
+action_data_get_widget (gpointer data)
+{
+  GtkWidget       *result    = NULL;
+  static gboolean  recursion = FALSE;
+
+  if (! data || recursion)
+    return NULL;
+
+  recursion = TRUE;
+
+  if (GTK_IS_WIDGET (data))
+    result = data;
+
+  if (! result)
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        result = GTK_WIDGET (gimp_display_get_shell (display));
+    }
+
+  if (! result)
+    result = dialogs_get_toolbox ();
+
+  recursion = FALSE;
+
+  return result;
+}
+
+gint
+action_data_sel_count (gpointer data)
+{
+  if (GIMP_IS_CONTAINER_EDITOR (data))
+    {
+      GimpContainerEditor  *editor;
+
+      editor = GIMP_CONTAINER_EDITOR (data);
+      return gimp_container_view_get_selected (editor->view, NULL);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+gdouble
+action_select_value (GimpActionSelectType  select_type,
+                     gdouble               value,
+                     gdouble               min,
+                     gdouble               max,
+                     gdouble               def,
+                     gdouble               small_inc,
+                     gdouble               inc,
+                     gdouble               skip_inc,
+                     gdouble               delta_factor,
+                     gboolean              wrap)
+{
+  switch (select_type)
+    {
+    case GIMP_ACTION_SELECT_SET_TO_DEFAULT:
+      value = def;
+      break;
+
+    case GIMP_ACTION_SELECT_FIRST:
+      value = min;
+      break;
+
+    case GIMP_ACTION_SELECT_LAST:
+      value = max;
+      break;
+
+    case GIMP_ACTION_SELECT_SMALL_PREVIOUS:
+      value -= small_inc;
+      break;
+
+    case GIMP_ACTION_SELECT_SMALL_NEXT:
+      value += small_inc;
+      break;
+
+    case GIMP_ACTION_SELECT_PREVIOUS:
+      value -= inc;
+      break;
+
+    case GIMP_ACTION_SELECT_NEXT:
+      value += inc;
+      break;
+
+    case GIMP_ACTION_SELECT_SKIP_PREVIOUS:
+      value -= skip_inc;
+      break;
+
+    case GIMP_ACTION_SELECT_SKIP_NEXT:
+      value += skip_inc;
+      break;
+
+    case GIMP_ACTION_SELECT_PERCENT_PREVIOUS:
+      g_return_val_if_fail (delta_factor >= 0.0, value);
+      value /= (1.0 + delta_factor);
+      break;
+
+    case GIMP_ACTION_SELECT_PERCENT_NEXT:
+      g_return_val_if_fail (delta_factor >= 0.0, value);
+      value *= (1.0 + delta_factor);
+      break;
+
+    default:
+      if ((gint) select_type >= 0)
+        value = (gdouble) select_type * (max - min) / 1000.0 + min;
+      else
+        g_return_val_if_reached (value);
+      break;
+    }
+
+  if (wrap)
+    {
+      while (value < min)
+        value = max - (min - value);
+
+      while (value > max)
+        value = min + (value - max);
+    }
+  else
+    {
+      value = CLAMP (value, min, max);
+    }
+
+  return value;
+}
+
+void
+action_select_property (GimpActionSelectType  select_type,
+                        GimpDisplay          *display,
+                        GObject              *object,
+                        const gchar          *property_name,
+                        gdouble               small_inc,
+                        gdouble               inc,
+                        gdouble               skip_inc,
+                        gdouble               delta_factor,
+                        gboolean              wrap)
+{
+  GParamSpec *pspec;
+
+  g_return_if_fail (display == NULL || GIMP_IS_DISPLAY (display));
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (property_name != NULL);
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object),
+                                        property_name);
+
+  if (G_IS_PARAM_SPEC_DOUBLE (pspec))
+    {
+      gdouble value;
+
+      g_object_get (object, property_name, &value, NULL);
+
+      value = action_select_value (select_type,
+                                   value,
+                                   G_PARAM_SPEC_DOUBLE (pspec)->minimum,
+                                   G_PARAM_SPEC_DOUBLE (pspec)->maximum,
+                                   G_PARAM_SPEC_DOUBLE (pspec)->default_value,
+                                   small_inc, inc, skip_inc, delta_factor, wrap);
+
+      g_object_set (object, property_name, value, NULL);
+
+      if (display)
+        {
+          const gchar *blurb = g_param_spec_get_blurb (pspec);
+
+          if (blurb)
+            {
+              /*  value description and new value shown in the status bar  */
+              action_message (display, object, _("%s: %.2f"), blurb, value);
+            }
+        }
+    }
+  else if (G_IS_PARAM_SPEC_INT (pspec))
+    {
+      gint value;
+
+      g_object_get (object, property_name, &value, NULL);
+
+      value = action_select_value (select_type,
+                                   value,
+                                   G_PARAM_SPEC_INT (pspec)->minimum,
+                                   G_PARAM_SPEC_INT (pspec)->maximum,
+                                   G_PARAM_SPEC_INT (pspec)->default_value,
+                                   small_inc, inc, skip_inc, delta_factor, wrap);
+
+      g_object_set (object, property_name, value, NULL);
+
+      if (display)
+        {
+          const gchar *blurb = g_param_spec_get_blurb (pspec);
+
+          if (blurb)
+            {
+              /*  value description and new value shown in the status bar  */
+              action_message (display, object, _("%s: %d"), blurb, value);
+            }
+        }
+    }
+  else
+    {
+      g_return_if_reached ();
+    }
+}
+
+GimpObject *
+action_select_object (GimpActionSelectType  select_type,
+                      GimpContainer        *container,
+                      GimpObject           *current)
+{
+  gint select_index;
+  gint n_children;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (current == NULL || GIMP_IS_OBJECT (current), NULL);
+
+  if (! current)
+    return NULL;
+
+  n_children = gimp_container_get_n_children (container);
+
+  if (n_children == 0)
+    return NULL;
+
+  switch (select_type)
+    {
+    case GIMP_ACTION_SELECT_FIRST:
+      select_index = 0;
+      break;
+
+    case GIMP_ACTION_SELECT_LAST:
+      select_index = n_children - 1;
+      break;
+
+    case GIMP_ACTION_SELECT_PREVIOUS:
+      select_index = gimp_container_get_child_index (container, current) - 1;
+      break;
+
+    case GIMP_ACTION_SELECT_NEXT:
+      select_index = gimp_container_get_child_index (container, current) + 1;
+      break;
+
+    case GIMP_ACTION_SELECT_SKIP_PREVIOUS:
+      select_index = gimp_container_get_child_index (container, current) - 10;
+      break;
+
+    case GIMP_ACTION_SELECT_SKIP_NEXT:
+      select_index = gimp_container_get_child_index (container, current) + 10;
+      break;
+
+    default:
+      if ((gint) select_type >= 0)
+        select_index = (gint) select_type;
+      else
+        g_return_val_if_reached (current);
+      break;
+    }
+
+  select_index = CLAMP (select_index, 0, n_children - 1);
+
+  return gimp_container_get_child_by_index (container, select_index);
+}
+
+void
+action_message (GimpDisplay *display,
+                GObject     *object,
+                const gchar *format,
+                ...)
+{
+  GimpDisplayShell *shell     = gimp_display_get_shell (display);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+  const gchar      *icon_name = NULL;
+  va_list           args;
+
+  if (GIMP_IS_TOOL_OPTIONS (object))
+    {
+      GimpToolInfo *tool_info = GIMP_TOOL_OPTIONS (object)->tool_info;
+
+      icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+    }
+  else if (GIMP_IS_VIEWABLE (object))
+    {
+      icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (object));
+    }
+
+  va_start (args, format);
+  gimp_statusbar_push_temp_valist (statusbar, GIMP_MESSAGE_INFO,
+                                   icon_name, format, args);
+  va_end (args);
+}
diff --git a/app/actions/actions.h b/app/actions/actions.h
new file mode 100644
index 0000000..10e1e22
--- /dev/null
+++ b/app/actions/actions.h
@@ -0,0 +1,120 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ACTIONS_H__
+#define __ACTIONS_H__
+
+
+extern GimpActionFactory *global_action_factory;
+
+
+void               actions_init            (Gimp                 *gimp);
+void               actions_exit            (Gimp                 *gimp);
+
+Gimp             * action_data_get_gimp    (gpointer              data);
+GimpContext      * action_data_get_context (gpointer              data);
+GimpImage        * action_data_get_image   (gpointer              data);
+GimpDisplay      * action_data_get_display (gpointer              data);
+GimpDisplayShell * action_data_get_shell   (gpointer              data);
+GtkWidget        * action_data_get_widget  (gpointer              data);
+gint               action_data_sel_count   (gpointer              data);
+
+gdouble            action_select_value     (GimpActionSelectType  select_type,
+                                            gdouble               value,
+                                            gdouble               min,
+                                            gdouble               max,
+                                            gdouble               def,
+                                            gdouble               small_inc,
+                                            gdouble               inc,
+                                            gdouble               skip_inc,
+                                            gdouble               delta_factor,
+                                            gboolean              wrap);
+void               action_select_property  (GimpActionSelectType  select_type,
+                                            GimpDisplay          *display,
+                                            GObject              *object,
+                                            const gchar          *property_name,
+                                            gdouble               small_inc,
+                                            gdouble               inc,
+                                            gdouble               skip_inc,
+                                            gdouble               delta_factor,
+                                            gboolean              wrap);
+GimpObject       * action_select_object    (GimpActionSelectType  select_type,
+                                            GimpContainer        *container,
+                                            GimpObject           *current);
+void               action_message          (GimpDisplay          *display,
+                                            GObject              *object,
+                                            const gchar          *format,
+                                            ...) G_GNUC_PRINTF(3,4);
+
+
+#define return_if_no_gimp(gimp,data) \
+  gimp = action_data_get_gimp (data); \
+  if (! gimp) \
+    return
+
+#define return_if_no_context(context,data) \
+  context = action_data_get_context (data); \
+  if (! context) \
+    return
+
+#define return_if_no_image(image,data) \
+  image = action_data_get_image (data); \
+  if (! image) \
+    return
+
+#define return_if_no_display(display,data) \
+  display = action_data_get_display (data); \
+  if (! display) \
+    return
+
+#define return_if_no_shell(shell,data) \
+  shell = action_data_get_shell (data); \
+  if (! shell) \
+    return
+
+#define return_if_no_widget(widget,data) \
+  widget = action_data_get_widget (data); \
+  if (! widget) \
+    return
+
+
+#define return_if_no_drawable(image,drawable,data) \
+  return_if_no_image (image,data); \
+  drawable = gimp_image_get_active_drawable (image); \
+  if (! drawable) \
+    return
+
+#define return_if_no_layer(image,layer,data) \
+  return_if_no_image (image,data); \
+  layer = gimp_image_get_active_layer (image); \
+  if (! layer) \
+    return
+
+#define return_if_no_channel(image,channel,data) \
+  return_if_no_image (image,data); \
+  channel = gimp_image_get_active_channel (image); \
+  if (! channel) \
+    return
+
+#define return_if_no_vectors(image,vectors,data) \
+  return_if_no_image (image,data); \
+  vectors = gimp_image_get_active_vectors (image); \
+  if (! vectors) \
+    return
+
+
+#endif /* __ACTIONS_H__ */
diff --git a/app/actions/brush-editor-actions.c b/app/actions/brush-editor-actions.c
new file mode 100644
index 0000000..f90de3a
--- /dev/null
+++ b/app/actions/brush-editor-actions.c
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpbrusheditor.h"
+
+#include "brush-editor-actions.h"
+#include "data-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry brush_editor_actions[] =
+{
+  { "brush-editor-popup", GIMP_ICON_BRUSH,
+    NC_("brush-editor-action", "Brush Editor Menu"), NULL, NULL, NULL,
+    GIMP_HELP_BRUSH_EDITOR_DIALOG }
+};
+
+static const GimpToggleActionEntry brush_editor_toggle_actions[] =
+{
+  { "brush-editor-edit-active", GIMP_ICON_LINKED,
+    NC_("brush-editor-action", "Edit Active Brush"), NULL, NULL,
+    data_editor_edit_active_cmd_callback,
+    FALSE,
+    GIMP_HELP_BRUSH_EDITOR_EDIT_ACTIVE }
+};
+
+
+void
+brush_editor_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "brush-editor-action",
+                                 brush_editor_actions,
+                                 G_N_ELEMENTS (brush_editor_actions));
+
+  gimp_action_group_add_toggle_actions (group, "brush-editor-action",
+                                        brush_editor_toggle_actions,
+                                        G_N_ELEMENTS (brush_editor_toggle_actions));
+}
+
+void
+brush_editor_actions_update (GimpActionGroup *group,
+                             gpointer         user_data)
+{
+  GimpDataEditor  *data_editor = GIMP_DATA_EDITOR (user_data);
+  gboolean         edit_active = FALSE;
+
+  edit_active = gimp_data_editor_get_edit_active (data_editor);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_ACTIVE ("brush-editor-edit-active", edit_active);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+}
diff --git a/app/actions/brush-editor-actions.h b/app/actions/brush-editor-actions.h
new file mode 100644
index 0000000..9b4eb6f
--- /dev/null
+++ b/app/actions/brush-editor-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __BRUSH_EDITOR_ACTIONS_H__
+#define __BRUSH_EDITOR_ACTIONS_H__
+
+
+void   brush_editor_actions_setup  (GimpActionGroup *group);
+void   brush_editor_actions_update (GimpActionGroup *group,
+                                    gpointer         data);
+
+
+#endif /* __BRUSH_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
new file mode 100644
index 0000000..87daed6
--- /dev/null
+++ b/app/actions/brushes-actions.c
@@ -0,0 +1,149 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "brushes-actions.h"
+#include "data-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry brushes_actions[] =
+{
+  { "brushes-popup", GIMP_ICON_BRUSH,
+    NC_("brushes-action", "Brushes Menu"), NULL, NULL, NULL,
+    GIMP_HELP_BRUSH_DIALOG },
+
+  { "brushes-open-as-image", GIMP_ICON_DOCUMENT_OPEN,
+    NC_("brushes-action", "_Open Brush as Image"), NULL,
+    NC_("brushes-action", "Open brush as image"),
+    data_open_as_image_cmd_callback,
+    GIMP_HELP_BRUSH_OPEN_AS_IMAGE },
+
+  { "brushes-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("brushes-action", "_New Brush"), NULL,
+    NC_("brushes-action", "Create a new brush"),
+    data_new_cmd_callback,
+    GIMP_HELP_BRUSH_NEW },
+
+  { "brushes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("brushes-action", "D_uplicate Brush"), NULL,
+    NC_("brushes-action", "Duplicate this brush"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_BRUSH_DUPLICATE },
+
+  { "brushes-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("brushes-action", "Copy Brush _Location"), NULL,
+    NC_("brushes-action", "Copy brush file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_BRUSH_COPY_LOCATION },
+
+  { "brushes-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("brushes-action", "Show in _File Manager"), NULL,
+    NC_("brushes-action", "Show brush file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_BRUSH_SHOW_IN_FILE_MANAGER },
+
+  { "brushes-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("brushes-action", "_Delete Brush"), NULL,
+    NC_("brushes-action", "Delete this brush"),
+    data_delete_cmd_callback,
+    GIMP_HELP_BRUSH_DELETE },
+
+  { "brushes-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("brushes-action", "_Refresh Brushes"), NULL,
+    NC_("brushes-action", "Refresh brushes"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_BRUSH_REFRESH }
+};
+
+static const GimpStringActionEntry brushes_edit_actions[] =
+{
+  { "brushes-edit", GIMP_ICON_EDIT,
+    NC_("brushes-action", "_Edit Brush..."), NULL,
+    NC_("brushes-action", "Edit this brush"),
+    "gimp-brush-editor",
+    GIMP_HELP_BRUSH_EDIT }
+};
+
+
+void
+brushes_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "brushes-action",
+                                 brushes_actions,
+                                 G_N_ELEMENTS (brushes_actions));
+
+  gimp_action_group_add_string_actions (group, "brushes-action",
+                                        brushes_edit_actions,
+                                        G_N_ELEMENTS (brushes_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+brushes_actions_update (GimpActionGroup *group,
+                        gpointer         user_data)
+{
+  GimpContext *context = action_data_get_context (user_data);
+  GimpBrush   *brush   = NULL;
+  GimpData    *data    = NULL;
+  GFile       *file    = NULL;
+
+  if (context)
+    {
+      brush = gimp_context_get_brush (context);
+
+      if (action_data_sel_count (user_data) > 1)
+        {
+          brush = NULL;
+        }
+
+      if (brush)
+        {
+          data = GIMP_DATA (brush);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("brushes-edit",                 brush);
+  SET_SENSITIVE ("brushes-open-as-image",        file && ! GIMP_IS_BRUSH_GENERATED (brush));
+  SET_SENSITIVE ("brushes-duplicate",            brush && gimp_data_is_duplicatable (data));
+  SET_SENSITIVE ("brushes-copy-location",        file);
+  SET_SENSITIVE ("brushes-show-in-file-manager", file);
+  SET_SENSITIVE ("brushes-delete",               brush && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/brushes-actions.h b/app/actions/brushes-actions.h
new file mode 100644
index 0000000..1d292a2
--- /dev/null
+++ b/app/actions/brushes-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __BRUSHES_ACTIONS_H__
+#define __BRUSHES_ACTIONS_H__
+
+
+void   brushes_actions_setup  (GimpActionGroup *group);
+void   brushes_actions_update (GimpActionGroup *group,
+                               gpointer         data);
+
+
+#endif /* __BRUSHES_ACTIONS_H__ */
diff --git a/app/actions/buffers-actions.c b/app/actions/buffers-actions.c
new file mode 100644
index 0000000..6fbd2c1
--- /dev/null
+++ b/app/actions/buffers-actions.c
@@ -0,0 +1,136 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "buffers-actions.h"
+#include "buffers-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry buffers_actions[] =
+{
+  { "buffers-popup", GIMP_ICON_BUFFER,
+    NC_("buffers-action", "Buffers Menu"), NULL, NULL, NULL,
+    GIMP_HELP_BUFFER_DIALOG },
+
+  { "buffers-paste-as-new-image", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("buffers-action", "Paste Buffer as _New Image"), NULL,
+    NC_("buffers-action", "Paste the selected buffer as a new image"),
+    buffers_paste_as_new_image_cmd_callback,
+    GIMP_HELP_BUFFER_PASTE_AS_NEW_IMAGE },
+
+  { "buffers-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("buffers-action", "_Delete Buffer"), NULL,
+    NC_("buffers-action", "Delete the selected buffer"),
+    buffers_delete_cmd_callback,
+    GIMP_HELP_BUFFER_DELETE }
+};
+
+static const GimpEnumActionEntry buffers_paste_actions[] =
+{
+  { "buffers-paste", GIMP_ICON_EDIT_PASTE,
+    NC_("buffers-action", "_Paste Buffer"), NULL,
+    NC_("buffers-action", "Paste the selected buffer"),
+    GIMP_PASTE_TYPE_FLOATING, FALSE,
+    GIMP_HELP_BUFFER_PASTE },
+
+  { "buffers-paste-in-place", GIMP_ICON_EDIT_PASTE,
+    NC_("buffers-action", "Paste Buffer In Pl_ace"), NULL,
+    NC_("buffers-action", "Paste the selected buffer at its original position"),
+    GIMP_PASTE_TYPE_FLOATING_IN_PLACE, FALSE,
+    GIMP_HELP_BUFFER_PASTE_IN_PLACE },
+
+  { "buffers-paste-into", GIMP_ICON_EDIT_PASTE_INTO,
+    NC_("buffers-action", "Paste Buffer _Into The Selection"), NULL,
+    NC_("buffers-action", "Paste the selected buffer into the selection"),
+    GIMP_PASTE_TYPE_FLOATING_INTO, FALSE,
+    GIMP_HELP_BUFFER_PASTE_INTO },
+
+  { "buffers-paste-into-in-place", GIMP_ICON_EDIT_PASTE_INTO,
+    NC_("buffers-action", "Paste Buffer Into The Selection In Place"), NULL,
+    NC_("buffers-action",
+        "Paste the selected buffer into the selection at its original position"),
+    GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE, FALSE,
+    GIMP_HELP_BUFFER_PASTE_INTO_IN_PLACE },
+
+  { "buffers-paste-as-new-layer", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("buffers-action", "Paste Buffer as New _Layer"), NULL,
+    NC_("buffers-action", "Paste the selected buffer as a new layer"),
+    GIMP_PASTE_TYPE_NEW_LAYER, FALSE,
+    GIMP_HELP_BUFFER_PASTE_AS_NEW_LAYER },
+
+  { "buffers-paste-as-new-layer-in-place", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("buffers-action", "Paste Buffer as New Layer in Place"), NULL,
+    NC_("buffers-action",
+        "Paste the selected buffer as a new layer at its original position"),
+    GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE, FALSE,
+    GIMP_HELP_BUFFER_PASTE_AS_NEW_LAYER_IN_PLACE },
+};
+
+
+void
+buffers_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "buffers-action",
+                                 buffers_actions,
+                                 G_N_ELEMENTS (buffers_actions));
+
+  gimp_action_group_add_enum_actions (group, "buffers-action",
+                                      buffers_paste_actions,
+                                      G_N_ELEMENTS (buffers_paste_actions),
+                                      buffers_paste_cmd_callback);
+}
+
+void
+buffers_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+  GimpContext *context = action_data_get_context (data);
+  GimpBuffer  *buffer  = NULL;
+
+  if (context)
+    buffer = gimp_context_get_buffer (context);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("buffers-paste",                       buffer);
+  SET_SENSITIVE ("buffers-paste-in-place",              buffer);
+  SET_SENSITIVE ("buffers-paste-into",                  buffer);
+  SET_SENSITIVE ("buffers-paste-into-in-place",         buffer);
+  SET_SENSITIVE ("buffers-paste-as-new-layer",          buffer);
+  SET_SENSITIVE ("buffers-paste-as-new-layer-in-place", buffer);
+  SET_SENSITIVE ("buffers-paste-as-new-image",          buffer);
+  SET_SENSITIVE ("buffers-delete",                      buffer);
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/buffers-actions.h b/app/actions/buffers-actions.h
new file mode 100644
index 0000000..6a02344
--- /dev/null
+++ b/app/actions/buffers-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __BUFFERS_ACTIONS_H__
+#define __BUFFERS_ACTIONS_H__
+
+
+void   buffers_actions_setup  (GimpActionGroup *group);
+void   buffers_actions_update (GimpActionGroup *group,
+                               gpointer         data);
+
+
+#endif /* __BUFFERS_ACTIONS_H__ */
diff --git a/app/actions/buffers-commands.c b/app/actions/buffers-commands.c
new file mode 100644
index 0000000..d3398df
--- /dev/null
+++ b/app/actions/buffers-commands.c
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-edit.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpcontainereditor.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpcontainerview-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "buffers-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions */
+
+void
+buffers_paste_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpBuffer          *buffer;
+  GimpPasteType        paste_type = (GimpPasteType) g_variant_get_int32 (value);
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  buffer = gimp_context_get_buffer (context);
+
+  if (buffer && gimp_container_have (container, GIMP_OBJECT (buffer)))
+    {
+      GimpDisplay *display = gimp_context_get_display (context);
+      GimpImage   *image   = NULL;
+      gint         x       = -1;
+      gint         y       = -1;
+      gint         width   = -1;
+      gint         height  = -1;
+
+      if (display)
+        {
+          GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+          gimp_display_shell_untransform_viewport (
+            shell,
+            ! gimp_display_shell_get_infinite_canvas (shell),
+            &x, &y, &width, &height);
+
+          image = gimp_display_get_image (display);
+        }
+      else
+        {
+          image = gimp_context_get_image (context);
+        }
+
+      if (image)
+        {
+          gimp_edit_paste (image, gimp_image_get_active_drawable (image),
+                           GIMP_OBJECT (buffer), paste_type,
+                           x, y, width, height);
+
+          gimp_image_flush (image);
+        }
+    }
+}
+
+void
+buffers_paste_as_new_image_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpBuffer          *buffer;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  buffer = gimp_context_get_buffer (context);
+
+  if (buffer && gimp_container_have (container, GIMP_OBJECT (buffer)))
+    {
+      GtkWidget *widget = GTK_WIDGET (editor);
+      GimpImage *new_image;
+
+      new_image = gimp_edit_paste_as_new_image (context->gimp,
+                                                GIMP_OBJECT (buffer));
+      gimp_create_display (context->gimp, new_image,
+                           GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (new_image);
+    }
+}
+
+void
+buffers_delete_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+
+  gimp_container_view_remove_active (editor->view);
+}
diff --git a/app/actions/buffers-commands.h b/app/actions/buffers-commands.h
new file mode 100644
index 0000000..a5e7339
--- /dev/null
+++ b/app/actions/buffers-commands.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __BUFFERS_COMMANDS_H__
+#define __BUFFERS_COMMANDS_H__
+
+
+void   buffers_paste_cmd_callback              (GimpAction *action,
+                                                GVariant   *value,
+                                                gpointer    data);
+void   buffers_paste_as_new_image_cmd_callback (GimpAction *action,
+                                                GVariant   *value,
+                                                gpointer    data);
+void   buffers_delete_cmd_callback             (GimpAction *action,
+                                                GVariant   *value,
+                                                gpointer    data);
+
+
+#endif /* __BUFFERS_COMMANDS_H__ */
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
new file mode 100644
index 0000000..533e794
--- /dev/null
+++ b/app/actions/channels-actions.c
@@ -0,0 +1,348 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpcomponenteditor.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "channels-actions.h"
+#include "channels-commands.h"
+#include "items-actions.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry channels_actions[] =
+{
+  { "channels-popup", GIMP_ICON_DIALOG_CHANNELS,
+    NC_("channels-action", "Channels Menu"), NULL, NULL, NULL,
+    GIMP_HELP_CHANNEL_DIALOG },
+
+  { "channels-color-tag-menu", NULL,
+    NC_("channels-action", "Color Tag"), NULL, NULL, NULL,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-edit-attributes", GIMP_ICON_EDIT,
+    NC_("channels-action", "_Edit Channel Attributes..."), NULL,
+    NC_("channels-action", "Edit the channel's name, color and opacity"),
+    channels_edit_attributes_cmd_callback,
+    GIMP_HELP_CHANNEL_EDIT },
+
+  { "channels-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("channels-action", "_New Channel..."), NULL,
+    NC_("channels-action", "Create a new channel"),
+    channels_new_cmd_callback,
+    GIMP_HELP_CHANNEL_NEW },
+
+  { "channels-new-last-values", GIMP_ICON_DOCUMENT_NEW,
+    NC_("channels-action", "_New Channel"), NULL,
+    NC_("channels-action", "Create a new channel with last used values"),
+    channels_new_last_vals_cmd_callback,
+    GIMP_HELP_CHANNEL_NEW },
+
+  { "channels-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("channels-action", "D_uplicate Channel"), NULL,
+    NC_("channels-action",
+        "Create a duplicate of this channel and add it to the image"),
+    channels_duplicate_cmd_callback,
+    GIMP_HELP_CHANNEL_DUPLICATE },
+
+  { "channels-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("channels-action", "_Delete Channel"), NULL,
+    NC_("channels-action", "Delete this channel"),
+    channels_delete_cmd_callback,
+    GIMP_HELP_CHANNEL_DELETE },
+
+  { "channels-raise", GIMP_ICON_GO_UP,
+    NC_("channels-action", "_Raise Channel"), NULL,
+    NC_("channels-action", "Raise this channel one step in the channel stack"),
+    channels_raise_cmd_callback,
+    GIMP_HELP_CHANNEL_RAISE },
+
+  { "channels-raise-to-top", GIMP_ICON_GO_TOP,
+    NC_("channels-action", "Raise Channel to _Top"), NULL,
+    NC_("channels-action",
+        "Raise this channel to the top of the channel stack"),
+    channels_raise_to_top_cmd_callback,
+    GIMP_HELP_CHANNEL_RAISE_TO_TOP },
+
+  { "channels-lower", GIMP_ICON_GO_DOWN,
+    NC_("channels-action", "_Lower Channel"), NULL,
+    NC_("channels-action", "Lower this channel one step in the channel stack"),
+    channels_lower_cmd_callback,
+    GIMP_HELP_CHANNEL_LOWER },
+
+  { "channels-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
+    NC_("channels-action", "Lower Channel to _Bottom"), NULL,
+    NC_("channels-action",
+        "Lower this channel to the bottom of the channel stack"),
+    channels_lower_to_bottom_cmd_callback,
+    GIMP_HELP_CHANNEL_LOWER_TO_BOTTOM }
+};
+
+static const GimpToggleActionEntry channels_toggle_actions[] =
+{
+  { "channels-visible", GIMP_ICON_VISIBLE,
+    NC_("channels-action", "Toggle Channel _Visibility"), NULL, NULL,
+    channels_visible_cmd_callback,
+    FALSE,
+    GIMP_HELP_CHANNEL_VISIBLE },
+
+  { "channels-linked", GIMP_ICON_LINKED,
+    NC_("channels-action", "Toggle Channel _Linked State"), NULL, NULL,
+    channels_linked_cmd_callback,
+    FALSE,
+    GIMP_HELP_CHANNEL_LINKED },
+
+  { "channels-lock-content", NULL /* GIMP_ICON_LOCK */,
+    NC_("channels-action", "L_ock Pixels of Channel"), NULL, NULL,
+    channels_lock_content_cmd_callback,
+    FALSE,
+    GIMP_HELP_CHANNEL_LOCK_PIXELS },
+
+  { "channels-lock-position", GIMP_ICON_TOOL_MOVE,
+    NC_("channels-action", "L_ock Position of Channel"), NULL, NULL,
+    channels_lock_position_cmd_callback,
+    FALSE,
+    GIMP_HELP_CHANNEL_LOCK_POSITION }
+};
+
+static const GimpEnumActionEntry channels_color_tag_actions[] =
+{
+  { "channels-color-tag-none", GIMP_ICON_EDIT_CLEAR,
+    NC_("channels-action", "None"), NULL,
+    NC_("channels-action", "Channel Color Tag: Clear"),
+    GIMP_COLOR_TAG_NONE, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-blue", NULL,
+    NC_("channels-action", "Blue"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Blue"),
+    GIMP_COLOR_TAG_BLUE, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-green", NULL,
+    NC_("channels-action", "Green"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Green"),
+    GIMP_COLOR_TAG_GREEN, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-yellow", NULL,
+    NC_("channels-action", "Yellow"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Yellow"),
+    GIMP_COLOR_TAG_YELLOW, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-orange", NULL,
+    NC_("channels-action", "Orange"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Orange"),
+    GIMP_COLOR_TAG_ORANGE, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-brown", NULL,
+    NC_("channels-action", "Brown"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Brown"),
+    GIMP_COLOR_TAG_BROWN, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-red", NULL,
+    NC_("channels-action", "Red"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Red"),
+    GIMP_COLOR_TAG_RED, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-violet", NULL,
+    NC_("channels-action", "Violet"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Violet"),
+    GIMP_COLOR_TAG_VIOLET, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG },
+
+  { "channels-color-tag-gray", NULL,
+    NC_("channels-action", "Gray"), NULL,
+    NC_("channels-action", "Channel Color Tag: Set to Gray"),
+    GIMP_COLOR_TAG_GRAY, FALSE,
+    GIMP_HELP_CHANNEL_COLOR_TAG }
+};
+
+static const GimpEnumActionEntry channels_to_selection_actions[] =
+{
+  { "channels-selection-replace", GIMP_ICON_SELECTION_REPLACE,
+    NC_("channels-action", "Channel to Sele_ction"), NULL,
+    NC_("channels-action", "Replace the selection with this channel"),
+    GIMP_CHANNEL_OP_REPLACE, FALSE,
+    GIMP_HELP_CHANNEL_SELECTION_REPLACE },
+
+  { "channels-selection-add", GIMP_ICON_SELECTION_ADD,
+    NC_("channels-action", "_Add to Selection"), NULL,
+    NC_("channels-action", "Add this channel to the current selection"),
+    GIMP_CHANNEL_OP_ADD, FALSE,
+    GIMP_HELP_CHANNEL_SELECTION_ADD },
+
+  { "channels-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
+    NC_("channels-action", "_Subtract from Selection"), NULL,
+    NC_("channels-action", "Subtract this channel from the current selection"),
+    GIMP_CHANNEL_OP_SUBTRACT, FALSE,
+    GIMP_HELP_CHANNEL_SELECTION_SUBTRACT },
+
+  { "channels-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
+    NC_("channels-action", "_Intersect with Selection"), NULL,
+    NC_("channels-action", "Intersect this channel with the current selection"),
+    GIMP_CHANNEL_OP_INTERSECT, FALSE,
+    GIMP_HELP_CHANNEL_SELECTION_INTERSECT }
+};
+
+static const GimpEnumActionEntry channels_select_actions[] =
+{
+  { "channels-select-top", NULL,
+    NC_("channels-action", "Select _Top Channel"), NULL,
+    NC_("channels-action", "Select the topmost channel"),
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    GIMP_HELP_CHANNEL_TOP },
+
+  { "channels-select-bottom", NULL,
+    NC_("channels-action", "Select _Bottom Channel"), NULL,
+    NC_("channels-action", "Select the bottommost channel"),
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_CHANNEL_BOTTOM },
+
+  { "channels-select-previous", NULL,
+    NC_("channels-action", "Select _Previous Channel"), NULL,
+    NC_("channels-action", "Select the channel above the current channel"),
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_CHANNEL_PREVIOUS },
+
+  { "channels-select-next", NULL,
+    NC_("channels-action", "Select _Next Channel"), NULL,
+    NC_("channels-action", "Select the channel below the current channel"),
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_CHANNEL_NEXT }
+};
+
+
+void
+channels_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "channels-action",
+                                 channels_actions,
+                                 G_N_ELEMENTS (channels_actions));
+
+  gimp_action_group_add_toggle_actions (group, "channels-action",
+                                        channels_toggle_actions,
+                                        G_N_ELEMENTS (channels_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "channels-action",
+                                      channels_color_tag_actions,
+                                      G_N_ELEMENTS (channels_color_tag_actions),
+                                      channels_color_tag_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "channels-action",
+                                      channels_to_selection_actions,
+                                      G_N_ELEMENTS (channels_to_selection_actions),
+                                      channels_to_selection_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "channels-action",
+                                      channels_select_actions,
+                                      G_N_ELEMENTS (channels_select_actions),
+                                      channels_select_cmd_callback);
+
+  items_actions_setup (group, "channels");
+}
+
+void
+channels_actions_update (GimpActionGroup *group,
+                         gpointer         data)
+{
+  GimpImage   *image     = action_data_get_image (data);
+  GimpChannel *channel   = NULL;
+  gboolean     fs        = FALSE;
+  gboolean     component = FALSE;
+  GList       *next      = NULL;
+  GList       *prev      = NULL;
+
+  if (image)
+    {
+      fs = (gimp_image_get_floating_selection (image) != NULL);
+
+      if (GIMP_IS_COMPONENT_EDITOR (data))
+        {
+          if (GIMP_COMPONENT_EDITOR (data)->clicked_component != -1)
+            component = TRUE;
+        }
+      else
+        {
+          channel = gimp_image_get_active_channel (image);
+
+          if (channel)
+            {
+              GList *channel_list;
+              GList *list;
+
+              channel_list = gimp_item_get_container_iter (GIMP_ITEM (channel));
+
+              list = g_list_find (channel_list, channel);
+
+              if (list)
+                {
+                  prev = g_list_previous (list);
+                  next = g_list_next (list);
+                }
+            }
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("channels-edit-attributes", !fs && channel);
+
+  SET_SENSITIVE ("channels-new",             !fs && image);
+  SET_SENSITIVE ("channels-new-last-values", !fs && image);
+  SET_SENSITIVE ("channels-duplicate",       !fs && (channel || component));
+  SET_SENSITIVE ("channels-delete",          !fs && channel);
+
+  SET_SENSITIVE ("channels-raise",           !fs && channel && prev);
+  SET_SENSITIVE ("channels-raise-to-top",    !fs && channel && prev);
+  SET_SENSITIVE ("channels-lower",           !fs && channel && next);
+  SET_SENSITIVE ("channels-lower-to-bottom", !fs && channel && next);
+
+  SET_SENSITIVE ("channels-selection-replace",   !fs && (channel || component));
+  SET_SENSITIVE ("channels-selection-add",       !fs && (channel || component));
+  SET_SENSITIVE ("channels-selection-subtract",  !fs && (channel || component));
+  SET_SENSITIVE ("channels-selection-intersect", !fs && (channel || component));
+
+  SET_SENSITIVE ("channels-select-top",      !fs && channel && prev);
+  SET_SENSITIVE ("channels-select-bottom",   !fs && channel && next);
+  SET_SENSITIVE ("channels-select-previous", !fs && channel && prev);
+  SET_SENSITIVE ("channels-select-next",     !fs && channel && next);
+
+#undef SET_SENSITIVE
+
+  items_actions_update (group, "channels", GIMP_ITEM (channel));
+}
diff --git a/app/actions/channels-actions.h b/app/actions/channels-actions.h
new file mode 100644
index 0000000..382eae1
--- /dev/null
+++ b/app/actions/channels-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CHANNELS_ACTIONS_H__
+#define __CHANNELS_ACTIONS_H__
+
+
+void   channels_actions_setup  (GimpActionGroup *group);
+void   channels_actions_update (GimpActionGroup *group,
+                                gpointer         data);
+
+
+#endif /* __CHANNELS_ACTIONS_H__ */
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
new file mode 100644
index 0000000..6701242
--- /dev/null
+++ b/app/actions/channels-commands.c
@@ -0,0 +1,567 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable-fill.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpcomponenteditor.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/channel-options-dialog.h"
+
+#include "actions.h"
+#include "channels-commands.h"
+#include "items-commands.h"
+
+#include "gimp-intl.h"
+
+
+#define RGBA_EPSILON 1e-6
+
+
+/*  local function prototypes  */
+
+static void   channels_new_callback             (GtkWidget     *dialog,
+                                                 GimpImage     *image,
+                                                 GimpChannel   *channel,
+                                                 GimpContext   *context,
+                                                 const gchar   *channel_name,
+                                                 const GimpRGB *channel_color,
+                                                 gboolean       save_selection,
+                                                 gboolean       channel_visible,
+                                                 gboolean       channel_linked,
+                                                 GimpColorTag   channel_color_tag,
+                                                 gboolean       channel_lock_content,
+                                                 gboolean       channel_lock_position,
+                                                 gpointer       user_data);
+static void   channels_edit_attributes_callback (GtkWidget     *dialog,
+                                                 GimpImage     *image,
+                                                 GimpChannel   *channel,
+                                                 GimpContext   *context,
+                                                 const gchar   *channel_name,
+                                                 const GimpRGB *channel_color,
+                                                 gboolean       save_selection,
+                                                 gboolean       channel_visible,
+                                                 gboolean       channel_linked,
+                                                 GimpColorTag   channel_color_tag,
+                                                 gboolean       channel_lock_content,
+                                                 gboolean       channel_lock_position,
+                                                 gpointer       user_data);
+
+
+/*  public functions  */
+
+void
+channels_edit_attributes_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_channel (image, channel, data);
+  return_if_no_widget (widget, data);
+
+#define EDIT_DIALOG_KEY "gimp-channel-edit-attributes-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (channel), EDIT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpItem *item = GIMP_ITEM (channel);
+
+      dialog = channel_options_dialog_new (image, channel,
+                                           action_data_get_context (data),
+                                           widget,
+                                           _("Channel Attributes"),
+                                           "gimp-channel-edit",
+                                           GIMP_ICON_EDIT,
+                                           _("Edit Channel Attributes"),
+                                           GIMP_HELP_CHANNEL_EDIT,
+                                           _("Edit Channel Color"),
+                                           _("_Fill opacity:"),
+                                           FALSE,
+                                           gimp_object_get_name (channel),
+                                           &channel->color,
+                                           gimp_item_get_visible (item),
+                                           gimp_item_get_linked (item),
+                                           gimp_item_get_color_tag (item),
+                                           gimp_item_get_lock_content (item),
+                                           gimp_item_get_lock_position (item),
+                                           channels_edit_attributes_callback,
+                                           NULL);
+
+      dialogs_attach_dialog (G_OBJECT (channel), EDIT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+channels_new_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+#define NEW_DIALOG_KEY "gimp-channel-new-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), NEW_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      dialog = channel_options_dialog_new (image, NULL,
+                                           action_data_get_context (data),
+                                           widget,
+                                           _("New Channel"),
+                                           "gimp-channel-new",
+                                           GIMP_ICON_CHANNEL,
+                                           _("Create a New Channel"),
+                                           GIMP_HELP_CHANNEL_NEW,
+                                           _("New Channel Color"),
+                                           _("_Fill opacity:"),
+                                           TRUE,
+                                           config->channel_new_name,
+                                           &config->channel_new_color,
+                                           TRUE,
+                                           FALSE,
+                                           GIMP_COLOR_TAG_NONE,
+                                           FALSE,
+                                           FALSE,
+                                           channels_new_callback,
+                                           NULL);
+
+      dialogs_attach_dialog (G_OBJECT (image), NEW_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+channels_new_last_vals_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage        *image;
+  GimpChannel      *channel;
+  GimpDialogConfig *config;
+  return_if_no_image (image, data);
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  channel = gimp_channel_new (image,
+                              gimp_image_get_width (image),
+                              gimp_image_get_height (image),
+                              config->channel_new_name,
+                              &config->channel_new_color);
+
+  gimp_drawable_fill (GIMP_DRAWABLE (channel),
+                      action_data_get_context (data),
+                      GIMP_FILL_TRANSPARENT);
+
+  gimp_image_add_channel (image, channel,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+channels_raise_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  gimp_image_raise_item (image, GIMP_ITEM (channel), NULL);
+  gimp_image_flush (image);
+}
+
+void
+channels_raise_to_top_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  gimp_image_raise_item_to_top (image, GIMP_ITEM (channel));
+  gimp_image_flush (image);
+}
+
+void
+channels_lower_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  gimp_image_lower_item (image, GIMP_ITEM (channel), NULL);
+  gimp_image_flush (image);
+}
+
+void
+channels_lower_to_bottom_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  gimp_image_lower_item_to_bottom (image, GIMP_ITEM (channel));
+  gimp_image_flush (image);
+}
+
+void
+channels_duplicate_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *new_channel;
+  GimpChannel *parent = GIMP_IMAGE_ACTIVE_PARENT;
+
+  if (GIMP_IS_COMPONENT_EDITOR (data))
+    {
+      GimpChannelType  component;
+      const gchar     *desc;
+      gchar           *name;
+      return_if_no_image (image, data);
+
+      component = GIMP_COMPONENT_EDITOR (data)->clicked_component;
+
+      gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
+                           NULL, NULL, &desc, NULL);
+
+      name = g_strdup_printf (_("%s Channel Copy"), desc);
+
+      new_channel = gimp_channel_new_from_component (image, component,
+                                                     name, NULL);
+
+      /*  copied components are invisible by default so subsequent copies
+       *  of components don't affect each other
+       */
+      gimp_item_set_visible (GIMP_ITEM (new_channel), FALSE, FALSE);
+
+      g_free (name);
+    }
+  else
+    {
+      GimpChannel *channel;
+      return_if_no_channel (image, channel, data);
+
+      new_channel =
+        GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (channel),
+                                           G_TYPE_FROM_INSTANCE (channel)));
+
+      /*  use the actual parent here, not GIMP_IMAGE_ACTIVE_PARENT because
+       *  the latter would add a duplicated group inside itself instead of
+       *  above it
+       */
+      parent = gimp_channel_get_parent (channel);
+    }
+
+  gimp_image_add_channel (image, new_channel, parent, -1, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+channels_delete_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  gimp_image_remove_channel (image, channel, TRUE, NULL);
+  gimp_image_flush (image);
+}
+
+void
+channels_to_selection_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpChannelOps  op;
+  GimpImage      *image;
+
+  op = (GimpChannelOps) g_variant_get_int32 (value);
+
+  if (GIMP_IS_COMPONENT_EDITOR (data))
+    {
+      GimpChannelType component;
+      return_if_no_image (image, data);
+
+      component = GIMP_COMPONENT_EDITOR (data)->clicked_component;
+
+      gimp_channel_select_component (gimp_image_get_mask (image), component,
+                                     op, FALSE, 0.0, 0.0);
+    }
+  else
+    {
+      GimpChannel *channel;
+      return_if_no_channel (image, channel, data);
+
+      gimp_item_to_selection (GIMP_ITEM (channel),
+                              op, TRUE, FALSE, 0.0, 0.0);
+    }
+
+  gimp_image_flush (image);
+}
+
+void
+channels_visible_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  items_visible_cmd_callback (action, value, image, GIMP_ITEM (channel));
+}
+
+void
+channels_linked_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  items_linked_cmd_callback (action, value, image, GIMP_ITEM (channel));
+}
+
+void
+channels_lock_content_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  items_lock_content_cmd_callback (action, value, image, GIMP_ITEM (channel));
+}
+
+void
+channels_lock_position_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  return_if_no_channel (image, channel, data);
+
+  items_lock_position_cmd_callback (action, value, image, GIMP_ITEM (channel));
+}
+
+void
+channels_color_tag_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpImage    *image;
+  GimpChannel  *channel;
+  GimpColorTag  color_tag;
+  return_if_no_channel (image, channel, data);
+
+  color_tag = (GimpColorTag) g_variant_get_int32 (value);
+
+  items_color_tag_cmd_callback (action, image, GIMP_ITEM (channel),
+                                color_tag);
+}
+
+void
+channels_select_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage            *image;
+  GimpChannel          *channel;
+  GimpChannel          *channel2;
+  GimpContainer        *container;
+  GimpActionSelectType  select_type;
+  return_if_no_channel (image, channel, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  container = gimp_image_get_channels (image);
+  channel2 = (GimpChannel *) action_select_object (select_type, container,
+                                                   (GimpObject *) channel);
+
+  if (channel2 && channel2 != channel)
+    {
+      gimp_image_set_active_channel (image, channel2);
+      gimp_image_flush (image);
+    }
+}
+
+/*  private functions  */
+
+static void
+channels_new_callback (GtkWidget     *dialog,
+                       GimpImage     *image,
+                       GimpChannel   *channel,
+                       GimpContext   *context,
+                       const gchar   *channel_name,
+                       const GimpRGB *channel_color,
+                       gboolean       save_selection,
+                       gboolean       channel_visible,
+                       gboolean       channel_linked,
+                       GimpColorTag   channel_color_tag,
+                       gboolean       channel_lock_content,
+                       gboolean       channel_lock_position,
+                       gpointer       user_data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  g_object_set (config,
+                "channel-new-name",  channel_name,
+                "channel-new-color", channel_color,
+                NULL);
+
+  if (save_selection)
+    {
+      GimpChannel *selection = gimp_image_get_mask (image);
+
+      channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection),
+                                                   GIMP_TYPE_CHANNEL));
+
+      gimp_object_set_name (GIMP_OBJECT (channel),
+                            config->channel_new_name);
+      gimp_channel_set_color (channel, &config->channel_new_color, FALSE);
+    }
+  else
+    {
+      channel = gimp_channel_new (image,
+                                  gimp_image_get_width  (image),
+                                  gimp_image_get_height (image),
+                                  config->channel_new_name,
+                                  &config->channel_new_color);
+
+      gimp_drawable_fill (GIMP_DRAWABLE (channel), context,
+                          GIMP_FILL_TRANSPARENT);
+    }
+
+  gimp_item_set_visible (GIMP_ITEM (channel), channel_visible, FALSE);
+  gimp_item_set_linked (GIMP_ITEM (channel), channel_linked, FALSE);
+  gimp_item_set_color_tag (GIMP_ITEM (channel), channel_color_tag, FALSE);
+  gimp_item_set_lock_content (GIMP_ITEM (channel), channel_lock_content, FALSE);
+  gimp_item_set_lock_position (GIMP_ITEM (channel), channel_lock_position, FALSE);
+
+  gimp_image_add_channel (image, channel,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+channels_edit_attributes_callback (GtkWidget     *dialog,
+                                   GimpImage     *image,
+                                   GimpChannel   *channel,
+                                   GimpContext   *context,
+                                   const gchar   *channel_name,
+                                   const GimpRGB *channel_color,
+                                   gboolean       save_selection,
+                                   gboolean       channel_visible,
+                                   gboolean       channel_linked,
+                                   GimpColorTag   channel_color_tag,
+                                   gboolean       channel_lock_content,
+                                   gboolean       channel_lock_position,
+                                   gpointer       user_data)
+{
+  GimpItem *item = GIMP_ITEM (channel);
+
+  if (strcmp (channel_name, gimp_object_get_name (channel))              ||
+      gimp_rgba_distance (channel_color, &channel->color) > RGBA_EPSILON ||
+      channel_visible       != gimp_item_get_visible (item)              ||
+      channel_linked        != gimp_item_get_linked (item)               ||
+      channel_color_tag     != gimp_item_get_color_tag (item)            ||
+      channel_lock_content  != gimp_item_get_lock_content (item)         ||
+      channel_lock_position != gimp_item_get_lock_position (item))
+    {
+      gimp_image_undo_group_start (image,
+                                   GIMP_UNDO_GROUP_ITEM_PROPERTIES,
+                                   _("Channel Attributes"));
+
+      if (strcmp (channel_name, gimp_object_get_name (channel)))
+        gimp_item_rename (GIMP_ITEM (channel), channel_name, NULL);
+
+      if (gimp_rgba_distance (channel_color, &channel->color) > RGBA_EPSILON)
+        gimp_channel_set_color (channel, channel_color, TRUE);
+
+      if (channel_visible != gimp_item_get_visible (item))
+        gimp_item_set_visible (item, channel_visible, TRUE);
+
+      if (channel_linked != gimp_item_get_linked (item))
+        gimp_item_set_linked (item, channel_linked, TRUE);
+
+      if (channel_color_tag != gimp_item_get_color_tag (item))
+        gimp_item_set_color_tag (item, channel_color_tag, TRUE);
+
+      if (channel_lock_content != gimp_item_get_lock_content (item))
+        gimp_item_set_lock_content (item, channel_lock_content, TRUE);
+
+      if (channel_lock_position != gimp_item_get_lock_position (item))
+        gimp_item_set_lock_position (item, channel_lock_position, TRUE);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/actions/channels-commands.h b/app/actions/channels-commands.h
new file mode 100644
index 0000000..6dd7d79
--- /dev/null
+++ b/app/actions/channels-commands.h
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CHANNELS_COMMANDS_H__
+#define __CHANNELS_COMMANDS_H__
+
+
+void   channels_edit_attributes_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_new_cmd_callback             (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_new_last_vals_cmd_callback   (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+void   channels_raise_cmd_callback           (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_raise_to_top_cmd_callback    (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_lower_cmd_callback           (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_lower_to_bottom_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+void   channels_duplicate_cmd_callback       (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_delete_cmd_callback          (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_to_selection_cmd_callback    (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+void   channels_visible_cmd_callback         (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_linked_cmd_callback          (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_lock_content_cmd_callback    (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   channels_lock_position_cmd_callback   (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+void   channels_color_tag_cmd_callback       (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+void   channels_select_cmd_callback          (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+
+#endif /* __CHANNELS_COMMANDS_H__ */
diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c
new file mode 100644
index 0000000..1c5d59f
--- /dev/null
+++ b/app/actions/colormap-actions.c
@@ -0,0 +1,173 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "colormap-actions.h"
+#include "colormap-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry colormap_actions[] =
+{
+  { "colormap-popup", GIMP_ICON_COLORMAP,
+    NC_("colormap-action", "Colormap Menu"), NULL, NULL, NULL,
+    GIMP_HELP_INDEXED_PALETTE_DIALOG },
+
+  { "colormap-edit-color", GIMP_ICON_EDIT,
+    NC_("colormap-action", "_Edit Color..."), NULL,
+    NC_("colormap-action", "Edit this color"),
+    colormap_edit_color_cmd_callback,
+    GIMP_HELP_INDEXED_PALETTE_EDIT }
+};
+
+static const GimpEnumActionEntry colormap_add_color_actions[] =
+{
+  { "colormap-add-color-from-fg", GIMP_ICON_LIST_ADD,
+    NC_("colormap-action", "_Add Color from FG"), "",
+    NC_("colormap-action", "Add current foreground color"),
+    FALSE, FALSE,
+    GIMP_HELP_INDEXED_PALETTE_ADD },
+
+  { "colormap-add-color-from-bg", GIMP_ICON_LIST_ADD,
+    NC_("colormap-action", "_Add Color from BG"), "",
+    NC_("colormap-action", "Add current background color"),
+    TRUE, FALSE,
+    GIMP_HELP_INDEXED_PALETTE_ADD }
+};
+
+static const GimpEnumActionEntry colormap_to_selection_actions[] =
+{
+  { "colormap-selection-replace", GIMP_ICON_SELECTION_REPLACE,
+    NC_("colormap-action", "_Select this Color"), NULL,
+    NC_("colormap-action", "Select all pixels with this color"),
+    GIMP_CHANNEL_OP_REPLACE, FALSE,
+    GIMP_HELP_INDEXED_PALETTE_SELECTION_REPLACE },
+
+  { "colormap-selection-add", GIMP_ICON_SELECTION_ADD,
+    NC_("colormap-action", "_Add to Selection"), NULL,
+    NC_("colormap-action", "Add all pixels with this color to the current selection"),
+    GIMP_CHANNEL_OP_ADD, FALSE,
+    GIMP_HELP_INDEXED_PALETTE_SELECTION_ADD },
+
+  { "colormap-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
+    NC_("colormap-action", "_Subtract from Selection"), NULL,
+    NC_("colormap-action", "Subtract all pixels with this color from the current selection"),
+    GIMP_CHANNEL_OP_SUBTRACT, FALSE,
+    GIMP_HELP_INDEXED_PALETTE_SELECTION_SUBTRACT },
+
+  { "colormap-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
+    NC_("colormap-action", "_Intersect with Selection"), NULL,
+    NC_("colormap-action", "Intersect all pixels with this color with the current selection"),
+    GIMP_CHANNEL_OP_INTERSECT, FALSE,
+    GIMP_HELP_INDEXED_PALETTE_SELECTION_INTERSECT }
+};
+
+void
+colormap_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "colormap-action",
+                                 colormap_actions,
+                                 G_N_ELEMENTS (colormap_actions));
+
+  gimp_action_group_add_enum_actions (group, "colormap-action",
+                                      colormap_add_color_actions,
+                                      G_N_ELEMENTS (colormap_add_color_actions),
+                                      colormap_add_color_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "colormap-action",
+                                      colormap_to_selection_actions,
+                                      G_N_ELEMENTS (colormap_to_selection_actions),
+                                      colormap_to_selection_cmd_callback);
+}
+
+void
+colormap_actions_update (GimpActionGroup *group,
+                         gpointer         data)
+{
+  GimpImage   *image            = action_data_get_image (data);
+  GimpContext *context          = action_data_get_context (data);
+  gboolean     indexed          = FALSE;
+  gboolean     drawable_indexed = FALSE;
+  gint         num_colors       = 0;
+  GimpRGB      fg;
+  GimpRGB      bg;
+
+  if (image)
+    {
+      indexed = (gimp_image_get_base_type (image) == GIMP_INDEXED);
+
+      if (indexed)
+        {
+          GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+          num_colors       = gimp_image_get_colormap_size (image);
+          drawable_indexed = gimp_drawable_is_indexed (drawable);
+        }
+    }
+
+  if (context)
+    {
+      gimp_context_get_foreground (context, &fg);
+      gimp_context_get_background (context, &bg);
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_COLOR(action,color) \
+        gimp_action_group_set_action_color (group, action, color, FALSE);
+
+  SET_SENSITIVE ("colormap-edit-color",
+                 indexed && num_colors > 0);
+
+  SET_SENSITIVE ("colormap-add-color-from-fg",
+                 indexed && num_colors < 256);
+  SET_SENSITIVE ("colormap-add-color-from-bg",
+                 indexed && num_colors < 256);
+
+  SET_COLOR ("colormap-add-color-from-fg", context ? &fg : NULL);
+  SET_COLOR ("colormap-add-color-from-bg", context ? &bg : NULL);
+
+  SET_SENSITIVE ("colormap-selection-replace",
+                 drawable_indexed && num_colors > 0);
+  SET_SENSITIVE ("colormap-selection-add",
+                 drawable_indexed && num_colors > 0);
+  SET_SENSITIVE ("colormap-selection-subtract",
+                 drawable_indexed && num_colors > 0);
+  SET_SENSITIVE ("colormap-selection-intersect",
+                 drawable_indexed && num_colors > 0);
+
+#undef SET_SENSITIVE
+#undef SET_COLOR
+}
diff --git a/app/actions/colormap-actions.h b/app/actions/colormap-actions.h
new file mode 100644
index 0000000..0451632
--- /dev/null
+++ b/app/actions/colormap-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __COLORMAP_ACTIONS_H__
+#define __COLORMAP_ACTIONS_H__
+
+
+void   colormap_actions_setup  (GimpActionGroup *group);
+void   colormap_actions_update (GimpActionGroup *group,
+                                gpointer         data);
+
+
+#endif /* __COLORMAP_ACTIONS_H__ */
diff --git a/app/actions/colormap-commands.c b/app/actions/colormap-commands.c
new file mode 100644
index 0000000..226197f
--- /dev/null
+++ b/app/actions/colormap-commands.c
@@ -0,0 +1,96 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "actions-types.h"
+
+#include "core/gimpchannel-select.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+
+#include "widgets/gimpcolormapeditor.h"
+
+#include "actions.h"
+#include "colormap-commands.h"
+
+
+/*  public functions  */
+
+void
+colormap_edit_color_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (data);
+
+  gimp_colormap_editor_edit_color (editor);
+}
+
+void
+colormap_add_color_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpContext *context;
+  GimpImage   *image;
+  gboolean     background;
+  return_if_no_context (context, data);
+  return_if_no_image (image, data);
+
+  background = (gboolean) g_variant_get_int32 (value);
+
+  if (gimp_image_get_colormap_size (image) < 256)
+    {
+      GimpRGB color;
+
+      if (background)
+        gimp_context_get_background (context, &color);
+      else
+        gimp_context_get_foreground (context, &color);
+
+      gimp_image_add_colormap_entry (image, &color);
+      gimp_image_flush (image);
+    }
+}
+
+void
+colormap_to_selection_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpColormapEditor *editor;
+  GimpImage          *image;
+  GimpChannelOps      op;
+  return_if_no_image (image, data);
+
+  editor = GIMP_COLORMAP_EDITOR (data);
+
+  op = (GimpChannelOps) g_variant_get_int32 (value);
+
+  gimp_channel_select_by_index (gimp_image_get_mask (image),
+                                gimp_image_get_active_drawable (image),
+                                editor->col_index,
+                                op,
+                                FALSE, 0.0, 0.0);
+
+  gimp_image_flush (image);
+}
diff --git a/app/actions/colormap-commands.h b/app/actions/colormap-commands.h
new file mode 100644
index 0000000..8aa4e52
--- /dev/null
+++ b/app/actions/colormap-commands.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __COLORMAP_COMMANDS_H__
+#define __COLORMAP_COMMANDS_H__
+
+
+void   colormap_edit_color_cmd_callback   (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+void   colormap_add_color_cmd_callback    (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+void   colormap_to_selection_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+
+
+#endif /* __COLORMAP_COMMANDS_H__ */
diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c
new file mode 100644
index 0000000..aef16ab
--- /dev/null
+++ b/app/actions/context-actions.c
@@ -0,0 +1,1294 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "context-actions.h"
+#include "context-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static const GimpActionEntry context_actions[] =
+{
+  { "context-menu",            NULL,                     NC_("context-action",
+                                                             "_Context")    },
+  { "context-colors-menu",     GIMP_ICON_COLORS_DEFAULT, NC_("context-action",
+                                                             "_Colors")     },
+  { "context-opacity-menu",    GIMP_ICON_TRANSPARENCY,   NC_("context-action",
+                                                             "_Opacity")    },
+  { "context-paint-mode-menu", GIMP_ICON_TOOL_PENCIL,    NC_("context-action",
+                                                             "Paint _Mode") },
+  { "context-tool-menu",       GIMP_ICON_DIALOG_TOOLS,   NC_("context-action",
+                                                             "_Tool")       },
+  { "context-brush-menu",      GIMP_ICON_BRUSH,          NC_("context-action",
+                                                             "_Brush")      },
+  { "context-pattern-menu",    GIMP_ICON_PATTERN,        NC_("context-action",
+                                                             "_Pattern")    },
+  { "context-palette-menu",    GIMP_ICON_PALETTE,        NC_("context-action",
+                                                             "_Palette")    },
+  { "context-gradient-menu",   GIMP_ICON_GRADIENT,       NC_("context-action",
+                                                             "_Gradient")   },
+  { "context-font-menu",       GIMP_ICON_FONT,           NC_("context-action",
+                                                             "_Font")       },
+
+  { "context-brush-shape-menu",    NULL,                 NC_("context-action",
+                                                             "_Shape")      },
+  { "context-brush-radius-menu",   NULL,                 NC_("context-action",
+                                                             "_Radius")     },
+  { "context-brush-spikes-menu",   NULL,                 NC_("context-action",
+                                                             "S_pikes")     },
+  { "context-brush-hardness-menu", NULL,                 NC_("context-action",
+                                                             "_Hardness")   },
+  { "context-brush-aspect-menu",   NULL,                 NC_("context-action",
+                                                             "_Aspect Ratio")},
+  { "context-brush-angle-menu",    NULL,                 NC_("context-action",
+                                                             "A_ngle")      },
+
+  { "context-colors-default", GIMP_ICON_COLORS_DEFAULT,
+    NC_("context-action", "_Default Colors"), "D",
+    NC_("context-action",
+        "Set foreground color to black, background color to white"),
+    context_colors_default_cmd_callback,
+    GIMP_HELP_TOOLBOX_DEFAULT_COLORS },
+
+  { "context-colors-swap", GIMP_ICON_COLORS_SWAP,
+    NC_("context-action", "S_wap Colors"), "X",
+    NC_("context-action", "Exchange foreground and background colors"),
+    context_colors_swap_cmd_callback,
+    GIMP_HELP_TOOLBOX_SWAP_COLORS }
+};
+
+static GimpEnumActionEntry context_palette_foreground_actions[] =
+{
+  { "context-palette-foreground-set", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Set Color From Palette"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, FALSE,
+    NULL },
+  { "context-palette-foreground-first", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use First Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-palette-foreground-last", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use Last Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-palette-foreground-previous", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use Previous Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-palette-foreground-next", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use Next Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-palette-foreground-previous-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Skip Back Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-palette-foreground-next-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Skip Forward Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static GimpEnumActionEntry context_palette_background_actions[] =
+{
+  { "context-palette-background-set", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Set Color From Palette"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, FALSE,
+    NULL },
+  { "context-palette-background-first", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use First Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-palette-background-last", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use Last Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-palette-background-previous", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use Previous Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-palette-background-next", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use Next Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-palette-background-previous-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Skip Back Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-palette-background-next-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Skip Forward Palette Color"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static GimpEnumActionEntry context_colormap_foreground_actions[] =
+{
+  { "context-colormap-foreground-set", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Set Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, FALSE,
+    NULL },
+  { "context-colormap-foreground-first", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Use First Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-colormap-foreground-last", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Use Last Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-colormap-foreground-previous", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Use Previous Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-colormap-foreground-next", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Use Next Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-colormap-foreground-previous-skip", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Skip Back Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-colormap-foreground-next-skip", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Foreground: Skip Forward Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static GimpEnumActionEntry context_colormap_background_actions[] =
+{
+  { "context-colormap-background-set", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Set Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, FALSE,
+    NULL },
+  { "context-colormap-background-first", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Use First Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-colormap-background-last", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Use Last Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-colormap-background-previous", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Use Previous Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-colormap-background-next", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Use Next Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-colormap-background-previous-skip", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Skip Back Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-colormap-background-next-skip", GIMP_ICON_COLORMAP,
+    NC_("context-action", "Background: Skip Forward Color From Colormap"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static GimpEnumActionEntry context_swatch_foreground_actions[] =
+{
+  { "context-swatch-foreground-set", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Set Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, FALSE,
+    NULL },
+  { "context-swatch-foreground-first", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use First Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-swatch-foreground-last", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use Last Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-swatch-foreground-previous", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use Previous Color From Swatch"), "9", NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-swatch-foreground-next", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Use Next Color From Swatch"), "0", NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-swatch-foreground-previous-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Skip Back Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-swatch-foreground-next-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Foreground: Skip Forward Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static GimpEnumActionEntry context_swatch_background_actions[] =
+{
+  { "context-swatch-background-set", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Set Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, FALSE,
+    NULL },
+  { "context-swatch-background-first", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use First Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-swatch-background-last", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use Last Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-swatch-background-previous", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use Previous Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-swatch-background-next", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Use Next Color From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-swatch-background-previous-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Skip Color Back From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-swatch-background-next-skip", GIMP_ICON_PALETTE,
+    NC_("context-action", "Background: Skip Color Forward From Swatch"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_foreground_red_actions[] =
+{
+  { "context-foreground-red-set", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-foreground-red-minimum", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-foreground-red-maximum", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-foreground-red-decrease", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-red-increase", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-foreground-red-decrease-skip", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-red-increase-skip", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Foreground Red: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_foreground_green_actions[] =
+{
+  { "context-foreground-green-set", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-foreground-green-minimum", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-foreground-green-maximum", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-foreground-green-decrease", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-green-increase", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-foreground-green-decrease-skip", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-green-increase-skip", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Foreground Green: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_foreground_blue_actions[] =
+{
+  { "context-foreground-blue-set", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-foreground-blue-minimum", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-foreground-blue-maximum", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-foreground-blue-decrease", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-blue-increase", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-foreground-blue-decrease-skip", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-blue-increase-skip", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Foreground Blue: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_background_red_actions[] =
+{
+  { "context-background-red-set", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-background-red-minimum", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-background-red-maximum", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-background-red-decrease", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-red-increase", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-background-red-decrease-skip", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-red-increase-skip", GIMP_ICON_CHANNEL_RED,
+    NC_("context-action", "Background Red: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_background_green_actions[] =
+{
+  { "context-background-green-set", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-background-green-minimum", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-background-green-maximum", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-background-green-decrease", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-green-increase", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-background-green-decrease-skip", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-green-increase-skip", GIMP_ICON_CHANNEL_GREEN,
+    NC_("context-action", "Background Green: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_background_blue_actions[] =
+{
+  { "context-background-blue-set", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-background-blue-minimum", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-background-blue-maximum", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-background-blue-decrease", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-blue-increase", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-background-blue-decrease-skip", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-blue-increase-skip", GIMP_ICON_CHANNEL_BLUE,
+    NC_("context-action", "Background Blue: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_foreground_hue_actions[] =
+{
+  { "context-foreground-hue-set", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-foreground-hue-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-foreground-hue-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-foreground-hue-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-hue-increase", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-foreground-hue-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-hue-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Hue: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_foreground_saturation_actions[] =
+{
+  { "context-foreground-saturation-set", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-foreground-saturation-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-foreground-saturation-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-foreground-saturation-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-saturation-increase", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-foreground-saturation-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-saturation-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Saturation: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_foreground_value_actions[] =
+{
+  { "context-foreground-value-set", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-foreground-value-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-foreground-value-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-foreground-value-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-value-increase", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-foreground-value-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-foreground-value-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Foreground Value: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_background_hue_actions[] =
+{
+  { "context-background-hue-set", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-background-hue-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-background-hue-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-background-hue-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-hue-increase", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-background-hue-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-hue-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Hue: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_background_saturation_actions[] =
+{
+  { "context-background-saturation-set", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-background-saturation-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-background-saturation-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-background-saturation-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-saturation-increase", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-background-saturation-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-saturation-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Saturation: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_background_value_actions[] =
+{
+  { "context-background-value-set", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-background-value-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-background-value-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-background-value-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Decrease by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-value-increase", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Increase by 1%"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-background-value-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Decrease by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-background-value-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("context-action", "Background Value: Increase by 10%"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_opacity_actions[] =
+{
+  { "context-opacity-set", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Set Transparency"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-opacity-transparent", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Make Completely Transparent"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-opacity-opaque", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Make Completely Opaque"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-opacity-decrease", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Make 1% More Transparent"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-opacity-increase", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Make 1% More Opaque"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-opacity-decrease-skip", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Make 10% More Transparent"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-opacity-increase-skip", GIMP_ICON_TRANSPARENCY,
+    NC_("context-action", "Tool Opacity: Make 10% More Opaque"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_paint_mode_actions[] =
+{
+  { "context-paint-mode-first", GIMP_ICON_TOOL_PENCIL,
+    NC_("context-action", "Tool Paint Mode: Select First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-paint-mode-last", GIMP_ICON_TOOL_PENCIL,
+    NC_("context-action", "Tool Paint Mode: Select Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-paint-mode-previous", GIMP_ICON_TOOL_PENCIL,
+    NC_("context-action", "Tool Paint Mode: Select Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-paint-mode-next", GIMP_ICON_TOOL_PENCIL,
+    NC_("context-action", "Tool Paint Mode: Select Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_tool_select_actions[] =
+{
+  { "context-tool-select-set", GIMP_ICON_DIALOG_TOOLS,
+    NC_("context-action", "Tool Selection: Choose by Index"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-tool-select-first", GIMP_ICON_DIALOG_TOOLS,
+    NC_("context-action", "Tool Selection: Switch to First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-tool-select-last", GIMP_ICON_DIALOG_TOOLS,
+    NC_("context-action", "Tool Selection: Switch to Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-tool-select-previous", GIMP_ICON_DIALOG_TOOLS,
+    NC_("context-action", "Tool Selection: Switch to Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-tool-select-next", GIMP_ICON_DIALOG_TOOLS,
+    NC_("context-action", "Tool Selection: Switch to Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_select_actions[] =
+{
+  { "context-brush-select-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Selection: Select by Index"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-select-first", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Selection: Switch to First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-select-last", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Selection: Switch to Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-select-previous", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Selection: Switch to Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-select-next", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Selection: Switch to Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_pattern_select_actions[] =
+{
+  { "context-pattern-select-set", GIMP_ICON_PATTERN,
+    NC_("context-action", "Pattern Selection: Select by Index"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-pattern-select-first", GIMP_ICON_PATTERN,
+    NC_("context-action", "Pattern Selection: Switch to First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-pattern-select-last", GIMP_ICON_PATTERN,
+    NC_("context-action", "Pattern Selection: Switch to Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-pattern-select-previous", GIMP_ICON_PATTERN,
+    NC_("context-action", "Pattern Selection: Switch to Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-pattern-select-next", GIMP_ICON_PATTERN,
+    NC_("context-action", "Pattern Selection: Switch to Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_palette_select_actions[] =
+{
+  { "context-palette-select-set", GIMP_ICON_PALETTE,
+    NC_("context-action", "Palette Selection: Select by Index"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-palette-select-first", GIMP_ICON_PALETTE,
+    NC_("context-action", "Palette Selection: Switch to First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-palette-select-last", GIMP_ICON_PALETTE,
+    NC_("context-action", "Palette Selection: Switch to Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-palette-select-previous", GIMP_ICON_PALETTE,
+    NC_("context-action", "Palette Selection: Switch to Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-palette-select-next", GIMP_ICON_PALETTE,
+    NC_("context-action", "Palette Selection: Switch to Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_gradient_select_actions[] =
+{
+  { "context-gradient-select-set", GIMP_ICON_GRADIENT,
+    NC_("context-action", "Gradient Selection: Select by Index"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-gradient-select-first", GIMP_ICON_GRADIENT,
+    NC_("context-action", "Gradient Selection: Switch to First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-gradient-select-last", GIMP_ICON_GRADIENT,
+    NC_("context-action", "Gradient Selection: Switch to Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-gradient-select-previous", GIMP_ICON_GRADIENT,
+    NC_("context-action", "Gradient Selection: Switch to Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-gradient-select-next", GIMP_ICON_GRADIENT,
+    NC_("context-action", "Gradient Selection: Switch to Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_font_select_actions[] =
+{
+  { "context-font-select-set", GIMP_ICON_FONT,
+    NC_("context-action", "Font Selection: Select by Index"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-font-select-first", GIMP_ICON_FONT,
+    NC_("context-action", "Font Selection: Switch to First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-font-select-last", GIMP_ICON_FONT,
+    NC_("context-action", "Font Selection: Switch to Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-font-select-previous", GIMP_ICON_FONT,
+    NC_("context-action", "Font Selection: Switch to Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-font-select-next", GIMP_ICON_FONT,
+    NC_("context-action", "Font Selection: Switch to Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_spacing_actions[] =
+{
+  { "context-brush-spacing-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-spacing-minimum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-spacing-maximum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-spacing-decrease", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-spacing-increase", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-brush-spacing-decrease-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-spacing-increase-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spacing (Editor): Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_shape_actions[] =
+{
+  { "context-brush-shape-circle", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Shape (Editor): Use Circular"), NULL, NULL,
+    GIMP_BRUSH_GENERATED_CIRCLE, FALSE,
+    NULL },
+  { "context-brush-shape-square", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Shape (Editor): Use Square"), NULL, NULL,
+    GIMP_BRUSH_GENERATED_SQUARE, FALSE,
+    NULL },
+  { "context-brush-shape-diamond", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Shape (Editor): Use Diamond"), NULL, NULL,
+    GIMP_BRUSH_GENERATED_DIAMOND, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_radius_actions[] =
+{
+  { "context-brush-radius-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-radius-minimum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-radius-maximum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-radius-decrease-less", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Decrease by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SMALL_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-radius-increase-less", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Increase by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SMALL_NEXT, FALSE,
+    NULL },
+  { "context-brush-radius-decrease", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-radius-increase", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-brush-radius-decrease-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-radius-increase-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "context-brush-radius-decrease-percent", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-radius-increase-percent", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Radius (Editor): Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_spikes_actions[] =
+{
+  { "context-brush-spikes-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-spikes-minimum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-spikes-maximum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-spikes-decrease", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-spikes-increase", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-brush-spikes-decrease-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Decrease by 4"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-spikes-increase-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Spikes (Editor): Increase by 4"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_hardness_actions[] =
+{
+  { "context-brush-hardness-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-hardness-minimum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-hardness-maximum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-hardness-decrease", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Decrease by 0.01"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-hardness-increase", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Increase by 0.01"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-brush-hardness-decrease-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Decrease by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-hardness-increase-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Hardness (Editor): Increase by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_aspect_actions[] =
+{
+  { "context-brush-aspect-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-aspect-minimum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-aspect-maximum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-aspect-decrease", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Decrease by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-aspect-increase", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Increase by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-brush-aspect-decrease-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-aspect-increase-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry context_brush_angle_actions[] =
+{
+  { "context-brush-angle-set", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "context-brush-angle-minimum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Make Horizontal"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "context-brush-angle-maximum", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Make Vertical"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "context-brush-angle-decrease", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Rotate Right by 1°"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-angle-increase", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Rotate Left by 1°"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "context-brush-angle-decrease-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Rotate Right by 15°"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "context-brush-angle-increase-skip", GIMP_ICON_BRUSH,
+    NC_("context-action", "Brush Angle (Editor): Rotate Left by 15°"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+
+void
+context_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "context-action",
+                                 context_actions,
+                                 G_N_ELEMENTS (context_actions));
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_palette_foreground_actions,
+                                      G_N_ELEMENTS (context_palette_foreground_actions),
+                                      context_palette_foreground_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_palette_background_actions,
+                                      G_N_ELEMENTS (context_palette_background_actions),
+                                      context_palette_background_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_colormap_foreground_actions,
+                                      G_N_ELEMENTS (context_colormap_foreground_actions),
+                                      context_colormap_foreground_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_colormap_background_actions,
+                                      G_N_ELEMENTS (context_colormap_background_actions),
+                                      context_colormap_background_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_swatch_foreground_actions,
+                                      G_N_ELEMENTS (context_swatch_foreground_actions),
+                                      context_swatch_foreground_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_swatch_background_actions,
+                                      G_N_ELEMENTS (context_swatch_background_actions),
+                                      context_swatch_background_cmd_callback);
+
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_foreground_red_actions,
+                                      G_N_ELEMENTS (context_foreground_red_actions),
+                                      context_foreground_red_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_foreground_green_actions,
+                                      G_N_ELEMENTS (context_foreground_green_actions),
+                                      context_foreground_green_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_foreground_blue_actions,
+                                      G_N_ELEMENTS (context_foreground_blue_actions),
+                                      context_foreground_blue_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_foreground_hue_actions,
+                                      G_N_ELEMENTS (context_foreground_hue_actions),
+                                      context_foreground_hue_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_foreground_saturation_actions,
+                                      G_N_ELEMENTS (context_foreground_saturation_actions),
+                                      context_foreground_saturation_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_foreground_value_actions,
+                                      G_N_ELEMENTS (context_foreground_value_actions),
+                                      context_foreground_value_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_background_red_actions,
+                                      G_N_ELEMENTS (context_background_red_actions),
+                                      context_background_red_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_background_green_actions,
+                                      G_N_ELEMENTS (context_background_green_actions),
+                                      context_background_green_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_background_blue_actions,
+                                      G_N_ELEMENTS (context_background_blue_actions),
+                                      context_background_blue_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_background_hue_actions,
+                                      G_N_ELEMENTS (context_background_hue_actions),
+                                      context_background_hue_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_background_saturation_actions,
+                                      G_N_ELEMENTS (context_background_saturation_actions),
+                                      context_background_saturation_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_background_value_actions,
+                                      G_N_ELEMENTS (context_background_value_actions),
+                                      context_background_value_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_opacity_actions,
+                                      G_N_ELEMENTS (context_opacity_actions),
+                                      context_opacity_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_paint_mode_actions,
+                                      G_N_ELEMENTS (context_paint_mode_actions),
+                                      context_paint_mode_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_tool_select_actions,
+                                      G_N_ELEMENTS (context_tool_select_actions),
+                                      context_tool_select_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_select_actions,
+                                      G_N_ELEMENTS (context_brush_select_actions),
+                                      context_brush_select_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_pattern_select_actions,
+                                      G_N_ELEMENTS (context_pattern_select_actions),
+                                      context_pattern_select_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_palette_select_actions,
+                                      G_N_ELEMENTS (context_palette_select_actions),
+                                      context_palette_select_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_gradient_select_actions,
+                                      G_N_ELEMENTS (context_gradient_select_actions),
+                                      context_gradient_select_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_font_select_actions,
+                                      G_N_ELEMENTS (context_font_select_actions),
+                                      context_font_select_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_spacing_actions,
+                                      G_N_ELEMENTS (context_brush_spacing_actions),
+                                      context_brush_spacing_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_shape_actions,
+                                      G_N_ELEMENTS (context_brush_shape_actions),
+                                      context_brush_shape_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_radius_actions,
+                                      G_N_ELEMENTS (context_brush_radius_actions),
+                                      context_brush_radius_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_spikes_actions,
+                                      G_N_ELEMENTS (context_brush_spikes_actions),
+                                      context_brush_spikes_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_hardness_actions,
+                                      G_N_ELEMENTS (context_brush_hardness_actions),
+                                      context_brush_hardness_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_aspect_actions,
+                                      G_N_ELEMENTS (context_brush_aspect_actions),
+                                      context_brush_aspect_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "context-action",
+                                      context_brush_angle_actions,
+                                      G_N_ELEMENTS (context_brush_angle_actions),
+                                      context_brush_angle_cmd_callback);
+}
+
+void
+context_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+#if 0
+  GimpContext *context   = action_data_get_context (data);
+  gboolean     generated = FALSE;
+  gdouble      radius    = 0.0;
+  gint         spikes    = 0;
+  gdouble      hardness  = 0.0;
+  gdouble      aspect    = 0.0;
+  gdouble      angle     = 0.0;
+
+  if (context)
+    {
+      GimpBrush *brush = gimp_context_get_brush (context);
+
+      if (GIMP_IS_BRUSH_GENERATED (brush))
+        {
+          GimpBrushGenerated *gen = GIMP_BRUSH_GENERATED (brush);
+
+          generated = TRUE;
+
+          radius   = gimp_brush_generated_get_radius       (gen);
+          spikes   = gimp_brush_generated_get_spikes       (gen);
+          hardness = gimp_brush_generated_get_hardness     (gen);
+          aspect   = gimp_brush_generated_get_aspect_ratio (gen);
+          angle    = gimp_brush_generated_get_angle        (gen);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, "context-" action, (condition) != 0)
+
+  SET_SENSITIVE ("brush-radius-minimum",       generated && radius > 1.0);
+  SET_SENSITIVE ("brush-radius-decrease",      generated && radius > 1.0);
+  SET_SENSITIVE ("brush-radius-decrease-skip", generated && radius > 1.0);
+
+  SET_SENSITIVE ("brush-radius-maximum",       generated && radius < 4000.0);
+  SET_SENSITIVE ("brush-radius-increase",      generated && radius < 4000.0);
+  SET_SENSITIVE ("brush-radius-increase-skip", generated && radius < 4000.0);
+
+  SET_SENSITIVE ("brush-angle-minimum",       generated);
+  SET_SENSITIVE ("brush-angle-decrease",      generated);
+  SET_SENSITIVE ("brush-angle-decrease-skip", generated);
+
+  SET_SENSITIVE ("brush-angle-maximum",       generated);
+  SET_SENSITIVE ("brush-angle-increase",      generated);
+  SET_SENSITIVE ("brush-angle-increase-skip", generated);
+#undef SET_SENSITIVE
+
+#endif
+}
diff --git a/app/actions/context-actions.h b/app/actions/context-actions.h
new file mode 100644
index 0000000..f2ad085
--- /dev/null
+++ b/app/actions/context-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONTEXT_ACTIONS_H__
+#define __CONTEXT_ACTIONS_H__
+
+
+void   context_actions_setup  (GimpActionGroup *group);
+void   context_actions_update (GimpActionGroup *group,
+                               gpointer         data);
+
+
+#endif /* __CONTEXT_ACTIONS_H__ */
diff --git a/app/actions/context-commands.c b/app/actions/context-commands.c
new file mode 100644
index 0000000..61d9e90
--- /dev/null
+++ b/app/actions/context-commands.c
@@ -0,0 +1,975 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimplist.h"
+#include "core/gimptoolinfo.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimppaletteeditor.h"
+#include "widgets/gimpcolormapeditor.h"
+
+#include "actions.h"
+#include "context-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void     context_select_object    (GimpActionSelectType  select_type,
+                                          GimpContext          *context,
+                                          GimpContainer        *container);
+static gint     context_paint_mode_index (GimpLayerMode         paint_mode,
+                                          const GimpLayerMode  *modes,
+                                          gint                  n_modes);
+
+static void     context_select_color     (GimpActionSelectType  select_type,
+                                          GimpRGB              *color,
+                                          gboolean              use_colormap,
+                                          gboolean              use_palette);
+
+static gint     context_get_color_index  (gboolean              use_colormap,
+                                          gboolean              use_palette,
+                                          const GimpRGB        *color);
+static gint     context_max_color_index  (gboolean              use_colormap,
+                                          gboolean              use_palette);
+static gboolean context_set_color_index  (gint                  index,
+                                          gboolean              use_colormap,
+                                          gboolean              use_palette,
+                                          GimpRGB              *color);
+
+static GimpPaletteEditor  * context_get_palette_editor  (void);
+static GimpColormapEditor * context_get_colormap_editor (void);
+
+
+/*  public functions  */
+
+void
+context_colors_default_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext *context;
+  return_if_no_context (context, data);
+
+  gimp_context_set_default_colors (context);
+}
+
+void
+context_colors_swap_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext *context;
+  return_if_no_context (context, data);
+
+  gimp_context_swap_colors (context);
+}
+
+#define SELECT_COLOR_CMD_CALLBACK(name, fgbg, use_colormap, use_palette) \
+void \
+context_##name##_##fgbg##ground_cmd_callback (GimpAction *action, \
+                                              GVariant   *value, \
+                                              gpointer    data) \
+{ \
+  GimpContext          *context; \
+  GimpRGB               color; \
+  GimpActionSelectType  select_type; \
+  return_if_no_context (context, data); \
+  \
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value); \
+  \
+  gimp_context_get_##fgbg##ground (context, &color); \
+  context_select_color (select_type, &color, \
+                        use_colormap, use_palette); \
+  gimp_context_set_##fgbg##ground (context, &color); \
+}
+
+SELECT_COLOR_CMD_CALLBACK (palette,  fore, FALSE, TRUE)
+SELECT_COLOR_CMD_CALLBACK (palette,  back, FALSE, TRUE)
+SELECT_COLOR_CMD_CALLBACK (colormap, fore, TRUE,  FALSE)
+SELECT_COLOR_CMD_CALLBACK (colormap, back, TRUE,  FALSE)
+SELECT_COLOR_CMD_CALLBACK (swatch,   fore, TRUE,  TRUE)
+SELECT_COLOR_CMD_CALLBACK (swatch,   back, TRUE,  TRUE)
+
+void
+context_foreground_red_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_foreground (context, &color);
+  color.r = action_select_value (select_type,
+                                 color.r,
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_context_set_foreground (context, &color);
+}
+
+void
+context_foreground_green_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_foreground (context, &color);
+  color.g = action_select_value (select_type,
+                                 color.g,
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_context_set_foreground (context, &color);
+}
+
+void
+context_foreground_blue_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_foreground (context, &color);
+  color.b = action_select_value (select_type,
+                                 color.b,
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_context_set_foreground (context, &color);
+}
+
+void
+context_background_red_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_background (context, &color);
+  color.r = action_select_value (select_type,
+                                 color.r,
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_context_set_background (context, &color);
+}
+
+void
+context_background_green_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_background (context, &color);
+  color.g = action_select_value (select_type,
+                                 color.g,
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_context_set_background (context, &color);
+}
+
+void
+context_background_blue_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_background (context, &color);
+  color.b = action_select_value (select_type,
+                                 color.b,
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_context_set_background (context, &color);
+}
+
+void
+context_foreground_hue_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpHSV               hsv;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_foreground (context, &color);
+  gimp_rgb_to_hsv (&color, &hsv);
+  hsv.h = action_select_value (select_type,
+                               hsv.h,
+                               0.0, 1.0, 1.0,
+                               1.0 / 360.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_hsv_to_rgb (&hsv, &color);
+  gimp_context_set_foreground (context, &color);
+}
+
+void
+context_foreground_saturation_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpHSV               hsv;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_foreground (context, &color);
+  gimp_rgb_to_hsv (&color, &hsv);
+  hsv.s = action_select_value (select_type,
+                               hsv.s,
+                               0.0, 1.0, 1.0,
+                               0.01, 0.01, 0.1, 0.0, FALSE);
+  gimp_hsv_to_rgb (&hsv, &color);
+  gimp_context_set_foreground (context, &color);
+}
+
+void
+context_foreground_value_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpHSV               hsv;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_foreground (context, &color);
+  gimp_rgb_to_hsv (&color, &hsv);
+  hsv.v = action_select_value (select_type,
+                               hsv.v,
+                               0.0, 1.0, 1.0,
+                               0.01, 0.01, 0.1, 0.0, FALSE);
+  gimp_hsv_to_rgb (&hsv, &color);
+  gimp_context_set_foreground (context, &color);
+}
+
+void
+context_background_hue_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpHSV               hsv;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_background (context, &color);
+  gimp_rgb_to_hsv (&color, &hsv);
+  hsv.h = action_select_value (select_type,
+                               hsv.h,
+                               0.0, 1.0, 1.0,
+                               1.0 / 360.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_hsv_to_rgb (&hsv, &color);
+  gimp_context_set_background (context, &color);
+}
+
+void
+context_background_saturation_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpHSV               hsv;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_background (context, &color);
+  gimp_rgb_to_hsv (&color, &hsv);
+  hsv.s = action_select_value (select_type,
+                               hsv.s,
+                               0.0, 1.0, 1.0,
+                               0.01, 0.01, 0.1, 0.0, FALSE);
+  gimp_hsv_to_rgb (&hsv, &color);
+  gimp_context_set_background (context, &color);
+}
+
+void
+context_background_value_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpContext          *context;
+  GimpRGB               color;
+  GimpHSV               hsv;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  gimp_context_get_background (context, &color);
+  gimp_rgb_to_hsv (&color, &hsv);
+  hsv.v = action_select_value (select_type,
+                               hsv.v,
+                               0.0, 1.0, 1.0,
+                               0.01, 0.01, 0.1, 0.0, FALSE);
+  gimp_hsv_to_rgb (&hsv, &color);
+  gimp_context_set_background (context, &color);
+}
+
+void
+context_opacity_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_TOOL_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "opacity",
+                              1.0 / 255.0, 0.01, 0.1, 0.1, FALSE);
+    }
+}
+
+void
+context_paint_mode_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpLayerMode        *modes;
+  gint                  n_modes;
+  GimpLayerMode         paint_mode;
+  gint                  index;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  paint_mode = gimp_context_get_paint_mode (context);
+
+  modes = gimp_layer_mode_get_context_array (paint_mode,
+                                             GIMP_LAYER_MODE_CONTEXT_PAINT,
+                                             &n_modes);
+  index = context_paint_mode_index (paint_mode, modes, n_modes);
+  index = action_select_value (select_type,
+                               index, 0, n_modes - 1, 0,
+                               0.0, 1.0, 1.0, 0.0, FALSE);
+  paint_mode = modes[index];
+  g_free (modes);
+
+  gimp_context_set_paint_mode (context, paint_mode);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_TOOL_OPTIONS (tool_info->tool_options))
+    {
+      GimpDisplay *display;
+      const char  *value_desc;
+
+      gimp_enum_get_value (GIMP_TYPE_LAYER_MODE, paint_mode,
+                           NULL, NULL, &value_desc, NULL);
+
+      display = action_data_get_display (data);
+
+      if (value_desc && display)
+        {
+          action_message (display, G_OBJECT (tool_info->tool_options),
+                          _("Paint Mode: %s"), value_desc);
+        }
+    }
+}
+
+void
+context_tool_select_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext          *context;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  context_select_object (select_type,
+                         context, context->gimp->tool_info_list);
+}
+
+void
+context_brush_select_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContext          *context;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  context_select_object (select_type,
+                         context,
+                         gimp_data_factory_get_container (context->gimp->brush_factory));
+}
+
+void
+context_pattern_select_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  context_select_object (select_type,
+                         context,
+                         gimp_data_factory_get_container (context->gimp->pattern_factory));
+}
+
+void
+context_palette_select_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  context_select_object (select_type,
+                         context,
+                         gimp_data_factory_get_container (context->gimp->palette_factory));
+}
+
+void
+context_gradient_select_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpContext          *context;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  context_select_object (select_type,
+                         context,
+                         gimp_data_factory_get_container (context->gimp->gradient_factory));
+}
+
+void
+context_font_select_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext          *context;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  context_select_object (select_type,
+                         context,
+                         gimp_data_factory_get_container (context->gimp->font_factory));
+}
+
+void
+context_brush_spacing_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpContext          *context;
+  GimpBrush            *brush;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH (brush) && gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (brush),
+                              "spacing",
+                              1.0, 5.0, 20.0, 0.1, FALSE);
+    }
+}
+
+void
+context_brush_shape_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext             *context;
+  GimpBrush               *brush;
+  GimpBrushGeneratedShape  shape;
+  return_if_no_context (context, data);
+
+  shape = (GimpBrushGeneratedShape) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH_GENERATED (brush) &&
+      gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      GimpBrushGenerated *generated = GIMP_BRUSH_GENERATED (brush);
+      GimpDisplay        *display;
+      const char         *value_desc;
+
+      gimp_brush_generated_set_shape (generated, shape);
+
+      gimp_enum_get_value (GIMP_TYPE_BRUSH_GENERATED_SHAPE, shape,
+                           NULL, NULL, &value_desc, NULL);
+      display = action_data_get_display (data);
+
+      if (value_desc && display)
+        {
+          action_message (display, G_OBJECT (brush),
+                          _("Brush Shape: %s"), value_desc);
+        }
+    }
+}
+
+void
+context_brush_radius_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContext          *context;
+  GimpBrush            *brush;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH_GENERATED (brush) &&
+      gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      GimpBrushGenerated *generated = GIMP_BRUSH_GENERATED (brush);
+      GimpDisplay        *display;
+      gdouble             radius;
+      gdouble             min_radius;
+
+      radius = gimp_brush_generated_get_radius (generated);
+
+      /* If the user uses a high precision radius adjustment command
+       * then we allow a minimum radius of 0.1 px, otherwise we set the
+       * minimum radius to 1.0 px and adjust the radius to 1.0 px if it
+       * is less than 1.0 px. This prevents irritating 0.1, 1.1, 2.1 etc
+       * radius sequences when 1.0 px steps are used.
+       */
+      switch (select_type)
+        {
+        case GIMP_ACTION_SELECT_SMALL_PREVIOUS:
+        case GIMP_ACTION_SELECT_SMALL_NEXT:
+        case GIMP_ACTION_SELECT_PERCENT_PREVIOUS:
+        case GIMP_ACTION_SELECT_PERCENT_NEXT:
+          min_radius = 0.1;
+          break;
+
+        default:
+          min_radius = 1.0;
+
+          if (radius < 1.0)
+            radius = 1.0;
+          break;
+        }
+
+      radius = action_select_value (select_type,
+                                    radius,
+                                    min_radius, 4000.0, min_radius,
+                                    0.1, 1.0, 10.0, 0.05, FALSE);
+      gimp_brush_generated_set_radius (generated, radius);
+
+      display = action_data_get_display (data);
+
+      if (display)
+        {
+          action_message (action_data_get_display (data), G_OBJECT (brush),
+                          _("Brush Radius: %2.2f"), radius);
+        }
+    }
+}
+
+void
+context_brush_spikes_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContext          *context;
+  GimpBrush            *brush;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH_GENERATED (brush) &&
+      gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (brush),
+                              "spikes",
+                              0.0, 1.0, 4.0, 0.1, FALSE);
+    }
+}
+
+void
+context_brush_hardness_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpBrush            *brush;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH_GENERATED (brush) &&
+      gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (brush),
+                              "hardness",
+                              0.001, 0.01, 0.1, 0.1, FALSE);
+    }
+}
+
+void
+context_brush_aspect_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContext          *context;
+  GimpBrush            *brush;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH_GENERATED (brush) &&
+      gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (brush),
+                              "aspect-ratio",
+                              0.1, 1.0, 4.0, 0.1, FALSE);
+    }
+}
+
+void
+context_brush_angle_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext          *context;
+  GimpBrush            *brush;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  brush = gimp_context_get_brush (context);
+
+  if (GIMP_IS_BRUSH_GENERATED (brush) &&
+      gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      GimpBrushGenerated *generated = GIMP_BRUSH_GENERATED (brush);
+      GimpDisplay        *display;
+      gdouble             angle;
+
+      angle = gimp_brush_generated_get_angle (generated);
+
+      if (select_type == GIMP_ACTION_SELECT_FIRST)
+        angle = 0.0;
+      else if (select_type == GIMP_ACTION_SELECT_LAST)
+        angle = 90.0;
+      else
+        angle = action_select_value (select_type,
+                                     angle,
+                                     0.0, 180.0, 0.0,
+                                     0.1, 1.0, 15.0, 0.1, TRUE);
+
+      gimp_brush_generated_set_angle (generated, angle);
+
+      display = action_data_get_display (data);
+
+      if (display)
+        {
+          action_message (action_data_get_display (data), G_OBJECT (brush),
+                          _("Brush Angle: %2.2f"), angle);
+        }
+    }
+}
+
+
+/*  private functions  */
+
+static void
+context_select_object (GimpActionSelectType  select_type,
+                       GimpContext          *context,
+                       GimpContainer        *container)
+{
+  GimpObject *current;
+
+  current =
+    gimp_context_get_by_type (context,
+                              gimp_container_get_children_type (container));
+
+  current = action_select_object (select_type, container, current);
+
+  if (current)
+    gimp_context_set_by_type (context,
+                              gimp_container_get_children_type (container),
+                              current);
+}
+
+static gint
+context_paint_mode_index (GimpLayerMode        paint_mode,
+                          const GimpLayerMode *modes,
+                          gint                 n_modes)
+{
+  gint i = 0;
+
+  while (i < (n_modes - 1) && modes[i] != paint_mode)
+    i++;
+
+  return i;
+}
+
+static void
+context_select_color (GimpActionSelectType  select_type,
+                      GimpRGB              *color,
+                      gboolean              use_colormap,
+                      gboolean              use_palette)
+{
+  gint index;
+  gint max;
+
+  index = context_get_color_index (use_colormap, use_palette, color);
+  max   = context_max_color_index (use_colormap, use_palette);
+
+  index = action_select_value (select_type,
+                               index,
+                               0, max, 0,
+                               0, 1, 4, 0, FALSE);
+
+  context_set_color_index (index, use_colormap, use_palette, color);
+}
+
+static gint
+context_get_color_index (gboolean       use_colormap,
+                         gboolean       use_palette,
+                         const GimpRGB *color)
+{
+  if (use_colormap)
+    {
+      GimpColormapEditor *editor = context_get_colormap_editor ();
+
+      if (editor)
+        {
+          gint index = gimp_colormap_editor_get_index (editor, color);
+
+          if (index != -1)
+            return index;
+        }
+    }
+
+  if (use_palette)
+    {
+      GimpPaletteEditor *editor = context_get_palette_editor ();
+
+      if (editor)
+        {
+          gint index = gimp_palette_editor_get_index (editor, color);
+
+          if (index != -1)
+            return index;
+        }
+    }
+
+  return 0;
+}
+
+static gint
+context_max_color_index (gboolean use_colormap,
+                         gboolean use_palette)
+{
+  if (use_colormap)
+    {
+      GimpColormapEditor *editor = context_get_colormap_editor ();
+
+      if (editor)
+        {
+          gint index = gimp_colormap_editor_max_index (editor);
+
+          if (index != -1)
+            return index;
+        }
+    }
+
+  if (use_palette)
+    {
+      GimpPaletteEditor *editor = context_get_palette_editor ();
+
+      if (editor)
+        {
+          gint index = gimp_palette_editor_max_index (editor);
+
+          if (index != -1)
+            return index;
+        }
+    }
+
+  return 0;
+}
+
+static gboolean
+context_set_color_index (gint      index,
+                         gboolean  use_colormap,
+                         gboolean  use_palette,
+                         GimpRGB  *color)
+{
+  if (use_colormap)
+    {
+      GimpColormapEditor *editor = context_get_colormap_editor ();
+
+      if (editor && gimp_colormap_editor_set_index (editor, index, color))
+        return TRUE;
+    }
+
+  if (use_palette)
+    {
+      GimpPaletteEditor *editor = context_get_palette_editor ();
+
+      if (editor && gimp_palette_editor_set_index (editor, index, color))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GimpPaletteEditor *
+context_get_palette_editor (void)
+{
+  GtkWidget *widget;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (gimp_dialog_factory_get_singleton ()), NULL);
+
+  widget = gimp_dialog_factory_find_widget (gimp_dialog_factory_get_singleton (),
+                                            "gimp-palette-editor");
+  if (widget)
+    return GIMP_PALETTE_EDITOR (gtk_bin_get_child (GTK_BIN (widget)));
+
+  return NULL;
+}
+
+static GimpColormapEditor *
+context_get_colormap_editor (void)
+{
+  GtkWidget *widget;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (gimp_dialog_factory_get_singleton ()), NULL);
+
+  widget = gimp_dialog_factory_find_widget (gimp_dialog_factory_get_singleton (),
+                                            "gimp-indexed-palette");
+  if (widget)
+    return GIMP_COLORMAP_EDITOR (gtk_bin_get_child (GTK_BIN (widget)));
+
+  return NULL;
+}
diff --git a/app/actions/context-commands.h b/app/actions/context-commands.h
new file mode 100644
index 0000000..76fe716
--- /dev/null
+++ b/app/actions/context-commands.h
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONTEXT_COMMANDS_H__
+#define __CONTEXT_COMMANDS_H__
+
+
+
+void   context_colors_default_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_colors_swap_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_palette_foreground_cmd_callback    (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_palette_background_cmd_callback    (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_colormap_foreground_cmd_callback   (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_colormap_background_cmd_callback   (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_swatch_foreground_cmd_callback     (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_swatch_background_cmd_callback     (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_foreground_red_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_foreground_green_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_foreground_blue_cmd_callback       (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_background_red_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_background_green_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_background_blue_cmd_callback       (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_foreground_hue_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_foreground_saturation_cmd_callback (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_foreground_value_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_background_hue_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_background_saturation_cmd_callback (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_background_value_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_opacity_cmd_callback               (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_paint_mode_cmd_callback            (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_tool_select_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_select_cmd_callback          (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_pattern_select_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_palette_select_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_gradient_select_cmd_callback       (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_font_select_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void   context_brush_spacing_cmd_callback         (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_shape_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_radius_cmd_callback          (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_spikes_cmd_callback          (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_hardness_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_aspect_cmd_callback          (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   context_brush_angle_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+
+#endif /* __CONTEXT_COMMANDS_H__ */
diff --git a/app/actions/cursor-info-actions.c b/app/actions/cursor-info-actions.c
new file mode 100644
index 0000000..bef1106
--- /dev/null
+++ b/app/actions/cursor-info-actions.c
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpcursorview.h"
+
+#include "cursor-info-actions.h"
+#include "cursor-info-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry cursor_info_actions[] =
+{
+  { "cursor-info-popup", GIMP_ICON_CURSOR,
+    NC_("cursor-info-action", "Pointer Information Menu"), NULL, NULL, NULL,
+    GIMP_HELP_POINTER_INFO_DIALOG }
+};
+
+static const GimpToggleActionEntry cursor_info_toggle_actions[] =
+{
+  { "cursor-info-sample-merged", NULL,
+    NC_("cursor-info-action", "_Sample Merged"), "",
+    NC_("cursor-info-action", "Use the composite color of all visible layers"),
+    cursor_info_sample_merged_cmd_callback,
+    TRUE,
+    GIMP_HELP_POINTER_INFO_SAMPLE_MERGED }
+};
+
+
+void
+cursor_info_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "cursor-info-action",
+                                 cursor_info_actions,
+                                 G_N_ELEMENTS (cursor_info_actions));
+
+  gimp_action_group_add_toggle_actions (group, "cursor-info-action",
+                                        cursor_info_toggle_actions,
+                                        G_N_ELEMENTS (cursor_info_toggle_actions));
+}
+
+void
+cursor_info_actions_update (GimpActionGroup *group,
+                            gpointer         data)
+{
+  GimpCursorView *view = GIMP_CURSOR_VIEW (data);
+
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_ACTIVE ("cursor-info-sample-merged",
+              gimp_cursor_view_get_sample_merged (view));
+
+#undef SET_ACTIVE
+}
diff --git a/app/actions/cursor-info-actions.h b/app/actions/cursor-info-actions.h
new file mode 100644
index 0000000..58b3f71
--- /dev/null
+++ b/app/actions/cursor-info-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CURSOR_INFO_ACIONS_H__
+#define __CURSOR_INFO_ACIONS_H__
+
+
+void   cursor_info_actions_setup  (GimpActionGroup *group);
+void   cursor_info_actions_update (GimpActionGroup *group,
+                                   gpointer         data);
+
+
+#endif /* __CURSOR_INFO_ACTIONS_H__ */
diff --git a/app/actions/cursor-info-commands.c b/app/actions/cursor-info-commands.c
new file mode 100644
index 0000000..b5f760b
--- /dev/null
+++ b/app/actions/cursor-info-commands.c
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "actions-types.h"
+
+#include "display/gimpcursorview.h"
+
+#include "cursor-info-commands.h"
+
+
+/*  public functions  */
+
+void
+cursor_info_sample_merged_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpCursorView *view   = GIMP_CURSOR_VIEW (data);
+  gboolean        active = g_variant_get_boolean (value);
+
+  gimp_cursor_view_set_sample_merged (view, active);
+}
diff --git a/app/actions/cursor-info-commands.h b/app/actions/cursor-info-commands.h
new file mode 100644
index 0000000..3562e15
--- /dev/null
+++ b/app/actions/cursor-info-commands.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CURSOR_INFO_COMMANDS_H__
+#define __CURSOR_INFO_COMMANDS_H__
+
+
+void   cursor_info_sample_merged_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+
+#endif /* __CURSOR_INFO_COMMANDS_H__ */
diff --git a/app/actions/dashboard-actions.c b/app/actions/dashboard-actions.c
new file mode 100644
index 0000000..e471307
--- /dev/null
+++ b/app/actions/dashboard-actions.c
@@ -0,0 +1,230 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdashboard.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "dashboard-actions.h"
+#include "dashboard-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry dashboard_actions[] =
+{
+  { "dashboard-popup", GIMP_ICON_DIALOG_DASHBOARD,
+    NC_("dashboard-action", "Dashboard Menu"), NULL, NULL, NULL,
+    GIMP_HELP_DASHBOARD_DIALOG },
+
+  { "dashboard-groups", NULL,
+    NC_("dashboard-action", "_Groups") },
+  { "dashboard-update-interval", NULL,
+    NC_("dashboard-action", "_Update Interval") },
+  { "dashboard-history-duration", NULL,
+    NC_("dashboard-action", "_History Duration") },
+
+  { "dashboard-log-record", GIMP_ICON_RECORD,
+    NC_("dashboard-action", "_Start/Stop Recording..."), NULL,
+    NC_("dashboard-action", "Start/stop recording performance log"),
+    dashboard_log_record_cmd_callback,
+    GIMP_HELP_DASHBOARD_LOG_RECORD },
+  { "dashboard-log-add-marker", GIMP_ICON_MARKER,
+    NC_("dashboard-action", "_Add Marker..."), NULL,
+    NC_("dashboard-action", "Add an event marker "
+                            "to the performance log"),
+    dashboard_log_add_marker_cmd_callback,
+    GIMP_HELP_DASHBOARD_LOG_ADD_MARKER },
+  { "dashboard-log-add-empty-marker", GIMP_ICON_MARKER,
+    NC_("dashboard-action", "Add _Empty Marker"), NULL,
+    NC_("dashboard-action", "Add an empty event marker "
+                            "to the performance log"),
+    dashboard_log_add_empty_marker_cmd_callback,
+    GIMP_HELP_DASHBOARD_LOG_ADD_EMPTY_MARKER },
+
+  { "dashboard-reset", GIMP_ICON_RESET,
+    NC_("dashboard-action", "_Reset"), NULL,
+    NC_("dashboard-action", "Reset cumulative data"),
+    dashboard_reset_cmd_callback,
+    GIMP_HELP_DASHBOARD_RESET },
+};
+
+static const GimpToggleActionEntry dashboard_toggle_actions[] =
+{
+  { "dashboard-low-swap-space-warning", NULL,
+    NC_("dashboard-action", "_Low Swap Space Warning"), NULL,
+    NC_("dashboard-action", "Raise the dashboard when "
+                            "the swap size approaches its limit"),
+    dashboard_low_swap_space_warning_cmd_callback,
+    FALSE,
+    GIMP_HELP_DASHBOARD_LOW_SWAP_SPACE_WARNING }
+};
+
+static const GimpRadioActionEntry dashboard_update_interval_actions[] =
+{
+  { "dashboard-update-interval-0-25-sec", NULL,
+    NC_("dashboard-update-interval", "0.25 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC,
+    GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
+
+  { "dashboard-update-interval-0-5-sec", NULL,
+    NC_("dashboard-update-interval", "0.5 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_UPDATE_INTERVAL_0_5_SEC,
+    GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
+
+  { "dashboard-update-interval-1-sec", NULL,
+    NC_("dashboard-update-interval", "1 Second"), NULL, NULL,
+    GIMP_DASHBOARD_UPDATE_INTERVAL_1_SEC,
+    GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
+
+  { "dashboard-update-interval-2-sec", NULL,
+    NC_("dashboard-update-interval", "2 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_UPDATE_INTERVAL_2_SEC,
+    GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
+
+  { "dashboard-update-interval-4-sec", NULL,
+    NC_("dashboard-update-interval", "4 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_UPDATE_INTERVAL_4_SEC,
+    GIMP_HELP_DASHBOARD_UPDATE_INTERVAL }
+};
+
+static const GimpRadioActionEntry dashboard_history_duration_actions[] =
+{
+  { "dashboard-history-duration-15-sec", NULL,
+    NC_("dashboard-history-duration", "15 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_HISTORY_DURATION_15_SEC,
+    GIMP_HELP_DASHBOARD_HISTORY_DURATION },
+
+  { "dashboard-history-duration-30-sec", NULL,
+    NC_("dashboard-history-duration", "30 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_HISTORY_DURATION_30_SEC,
+    GIMP_HELP_DASHBOARD_HISTORY_DURATION },
+
+  { "dashboard-history-duration-60-sec", NULL,
+    NC_("dashboard-history-duration", "60 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_HISTORY_DURATION_60_SEC,
+    GIMP_HELP_DASHBOARD_HISTORY_DURATION },
+
+  { "dashboard-history-duration-120-sec", NULL,
+    NC_("dashboard-history-duration", "120 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_HISTORY_DURATION_120_SEC,
+    GIMP_HELP_DASHBOARD_HISTORY_DURATION },
+
+  { "dashboard-history-duration-240-sec", NULL,
+    NC_("dashboard-history-duration", "240 Seconds"), NULL, NULL,
+    GIMP_DASHBOARD_HISTORY_DURATION_240_SEC,
+    GIMP_HELP_DASHBOARD_HISTORY_DURATION }
+};
+
+
+void
+dashboard_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "dashboard-action",
+                                 dashboard_actions,
+                                 G_N_ELEMENTS (dashboard_actions));
+
+  gimp_action_group_add_toggle_actions (group, "dashboard-action",
+                                        dashboard_toggle_actions,
+                                        G_N_ELEMENTS (dashboard_toggle_actions));
+
+  gimp_action_group_add_radio_actions (group, "dashboard-update-interval",
+                                       dashboard_update_interval_actions,
+                                       G_N_ELEMENTS (dashboard_update_interval_actions),
+                                       NULL,
+                                       0,
+                                       dashboard_update_interval_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "dashboard-history-duration",
+                                       dashboard_history_duration_actions,
+                                       G_N_ELEMENTS (dashboard_history_duration_actions),
+                                       NULL,
+                                       0,
+                                       dashboard_history_duration_cmd_callback);
+}
+
+void
+dashboard_actions_update (GimpActionGroup *group,
+                          gpointer         data)
+{
+  GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+  gboolean       recording;
+
+  recording = gimp_dashboard_log_is_recording (dashboard);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  switch (gimp_dashboard_get_update_interval (dashboard))
+    {
+    case GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC:
+      SET_ACTIVE ("dashboard-update-interval-0-25-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_UPDATE_INTERVAL_0_5_SEC:
+      SET_ACTIVE ("dashboard-update-interval-0-5-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_UPDATE_INTERVAL_1_SEC:
+      SET_ACTIVE ("dashboard-update-interval-1-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_UPDATE_INTERVAL_2_SEC:
+      SET_ACTIVE ("dashboard-update-interval-2-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_UPDATE_INTERVAL_4_SEC:
+      SET_ACTIVE ("dashboard-update-interval-4-sec", TRUE);
+      break;
+    }
+
+  switch (gimp_dashboard_get_history_duration (dashboard))
+    {
+    case GIMP_DASHBOARD_HISTORY_DURATION_15_SEC:
+      SET_ACTIVE ("dashboard-history-duration-15-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_HISTORY_DURATION_30_SEC:
+      SET_ACTIVE ("dashboard-history-duration-30-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_HISTORY_DURATION_60_SEC:
+      SET_ACTIVE ("dashboard-history-duration-60-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_HISTORY_DURATION_120_SEC:
+      SET_ACTIVE ("dashboard-history-duration-120-sec", TRUE);
+      break;
+    case GIMP_DASHBOARD_HISTORY_DURATION_240_SEC:
+      SET_ACTIVE ("dashboard-history-duration-240-sec", TRUE);
+      break;
+    }
+
+  SET_SENSITIVE ("dashboard-log-add-marker",       recording);
+  SET_SENSITIVE ("dashboard-log-add-empty-marker", recording);
+  SET_SENSITIVE ("dashboard-reset",                !recording);
+
+  SET_ACTIVE ("dashboard-low-swap-space-warning",
+              gimp_dashboard_get_low_swap_space_warning (dashboard));
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+}
diff --git a/app/actions/dashboard-actions.h b/app/actions/dashboard-actions.h
new file mode 100644
index 0000000..b2f8342
--- /dev/null
+++ b/app/actions/dashboard-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DASHBOARD_ACTIONS_H__
+#define __DASHBOARD_ACTIONS_H__
+
+
+void   dashboard_actions_setup  (GimpActionGroup *group);
+void   dashboard_actions_update (GimpActionGroup *group,
+                                 gpointer         data);
+
+
+#endif /* __DASHBOARD_ACTIONS_H__ */
diff --git a/app/actions/dashboard-commands.c b/app/actions/dashboard-commands.c
new file mode 100644
index 0000000..c1112aa
--- /dev/null
+++ b/app/actions/dashboard-commands.c
@@ -0,0 +1,406 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpdashboard.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+
+#include "dialogs/dialogs.h"
+
+#include "dashboard-commands.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  GFile                  *folder;
+  GimpDashboardLogParams  params;
+} DashboardLogDialogInfo;
+
+
+/*  local function prototypes  */
+
+static void                     dashboard_log_record_response      (GtkWidget              *dialog,
+                                                                    int                     response_id,
+                                                                    GimpDashboard          *dashboard);
+
+static void                     dashboard_log_add_marker_response  (GtkWidget              *dialog,
+                                                                    const gchar            *description,
+                                                                    GimpDashboard          *dashboard);
+
+static DashboardLogDialogInfo * dashboard_log_dialog_info_new      (GimpDashboard          *dashboard);
+static void                     dashboard_log_dialog_info_free     (DashboardLogDialogInfo *info);
+
+
+/*  public functions */
+
+
+void
+dashboard_update_interval_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpDashboard              *dashboard = GIMP_DASHBOARD (data);
+  GimpDashboardUpdateInteval  update_interval;
+
+  update_interval = g_variant_get_int32 (value);
+
+  gimp_dashboard_set_update_interval (dashboard, update_interval);
+}
+
+void
+dashboard_history_duration_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpDashboard                *dashboard = GIMP_DASHBOARD (data);
+  GimpDashboardHistoryDuration  history_duration;
+
+  history_duration = g_variant_get_int32 (value);
+
+  gimp_dashboard_set_history_duration (dashboard, history_duration);
+}
+
+void
+dashboard_log_record_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+
+  if (! gimp_dashboard_log_is_recording (dashboard))
+    {
+      GtkWidget *dialog;
+
+      #define LOG_RECORD_KEY "gimp-dashboard-log-record-dialog"
+
+      dialog = dialogs_get_dialog (G_OBJECT (dashboard), LOG_RECORD_KEY);
+
+      if (! dialog)
+        {
+          GtkFileFilter          *filter;
+          DashboardLogDialogInfo *info;
+          GtkWidget              *hbox;
+          GtkWidget              *hbox2;
+          GtkWidget              *label;
+          GtkWidget              *spinbutton;
+          GtkWidget              *toggle;
+
+          dialog = gtk_file_chooser_dialog_new (
+            "Record Performance Log", NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+
+            _("_Cancel"), GTK_RESPONSE_CANCEL,
+            _("_Record"), GTK_RESPONSE_OK,
+
+            NULL);
+
+          gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK);
+          gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                                   GTK_RESPONSE_OK,
+                                                   GTK_RESPONSE_CANCEL,
+                                                   -1);
+
+          gtk_window_set_screen (
+            GTK_WINDOW (dialog),
+            gtk_widget_get_screen (GTK_WIDGET (dashboard)));
+          gtk_window_set_role (GTK_WINDOW (dialog),
+                               "gimp-dashboard-log-record");
+          gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+
+          gtk_file_chooser_set_do_overwrite_confirmation (
+            GTK_FILE_CHOOSER (dialog), TRUE);
+
+          filter = gtk_file_filter_new ();
+          gtk_file_filter_set_name (filter, _("All Files"));
+          gtk_file_filter_add_pattern (filter, "*");
+          gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+          filter = gtk_file_filter_new ();
+          gtk_file_filter_set_name (filter, _("Log Files (*.log)"));
+          gtk_file_filter_add_pattern (filter, "*.log");
+          gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+          gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+          info = g_object_get_data (G_OBJECT (dashboard),
+                                    "gimp-dashboard-log-dialog-info");
+
+          if (! info)
+            {
+              info = dashboard_log_dialog_info_new (dashboard);
+
+              g_object_set_data_full (
+                G_OBJECT (dashboard),
+                "gimp-dashboard-log-dialog-info", info,
+                (GDestroyNotify) dashboard_log_dialog_info_free);
+            }
+
+          if (info->folder)
+            {
+              gtk_file_chooser_set_current_folder_file (
+                GTK_FILE_CHOOSER (dialog), info->folder, NULL);
+            }
+
+          gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
+                                             "gimp-performance.log");
+
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+          gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), hbox);
+          gtk_widget_show (hbox);
+
+          hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+          gimp_help_set_help_data (hbox2, _("Log samples per second"), NULL);
+          gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+          gtk_widget_show (hbox2);
+
+          label = gtk_label_new_with_mnemonic (_("Sample fre_quency:"));
+          gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+          gtk_widget_show (label);
+
+          spinbutton = gimp_spin_button_new_with_range (1, 1000, 1);
+          gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
+          gtk_widget_show (spinbutton);
+
+          gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton),
+                                     info->params.sample_frequency);
+
+          g_signal_connect (gtk_spin_button_get_adjustment (
+                              GTK_SPIN_BUTTON (spinbutton)),
+                            "value-changed",
+                            G_CALLBACK (gimp_int_adjustment_update),
+                            &info->params.sample_frequency);
+
+          gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton);
+
+          toggle = gtk_check_button_new_with_mnemonic (_("_Backtrace"));
+          gimp_help_set_help_data (toggle, _("Include backtraces in log"),
+                                   NULL);
+          gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
+          gtk_widget_show (toggle);
+
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
+                                        info->params.backtrace);
+
+          g_signal_connect (toggle, "toggled",
+                            G_CALLBACK (gimp_toggle_button_update),
+                            &info->params.backtrace);
+
+          toggle = gtk_check_button_new_with_mnemonic (_("_Messages"));
+          gimp_help_set_help_data (toggle,
+                                   _("Include diagnostic messages in log"),
+                                   NULL);
+          gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
+          gtk_widget_show (toggle);
+
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
+                                        info->params.messages);
+
+          g_signal_connect (toggle, "toggled",
+                            G_CALLBACK (gimp_toggle_button_update),
+                            &info->params.messages);
+
+          toggle = gtk_check_button_new_with_mnemonic (_("Progressi_ve"));
+          gimp_help_set_help_data (toggle,
+                                   _("Produce complete log "
+                                     "even if not properly terminated"),
+                                   NULL);
+          gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
+          gtk_widget_show (toggle);
+
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
+                                        info->params.progressive);
+
+          g_signal_connect (toggle, "toggled",
+                            G_CALLBACK (gimp_toggle_button_update),
+                            &info->params.progressive);
+
+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (dashboard_log_record_response),
+                            dashboard);
+          g_signal_connect (dialog, "delete-event",
+                            G_CALLBACK (gtk_true),
+                            NULL);
+
+          gimp_help_connect (dialog, gimp_standard_help_func,
+                             GIMP_HELP_DASHBOARD_LOG_RECORD, NULL);
+
+          dialogs_attach_dialog (G_OBJECT (dashboard), LOG_RECORD_KEY, dialog);
+
+          g_signal_connect_object (dashboard, "destroy",
+                                   G_CALLBACK (gtk_widget_destroy),
+                                   dialog,
+                                   G_CONNECT_SWAPPED);
+
+          #undef LOG_RECORD_KEY
+        }
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+  else
+    {
+      GError *error = NULL;
+
+      if (! gimp_dashboard_log_stop_recording (dashboard, &error))
+        {
+          gimp_message_literal (
+            gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard))->gimp,
+            NULL, GIMP_MESSAGE_ERROR, error->message);
+        }
+    }
+}
+
+void
+dashboard_log_add_marker_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+  GtkWidget     *dialog;
+
+  #define LOG_ADD_MARKER_KEY "gimp-dashboard-log-add-marker-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (dashboard), LOG_ADD_MARKER_KEY);
+
+  if (! dialog)
+    {
+      dialog = gimp_query_string_box (
+        _("Add Marker"), GTK_WIDGET (dashboard),
+        gimp_standard_help_func, GIMP_HELP_DASHBOARD_LOG_ADD_MARKER,
+        _("Enter a description for the marker"),
+        NULL,
+        G_OBJECT (dashboard), "destroy",
+        (GimpQueryStringCallback) dashboard_log_add_marker_response,
+        dashboard);
+
+      dialogs_attach_dialog (G_OBJECT (dashboard), LOG_ADD_MARKER_KEY, dialog);
+
+      #undef LOG_ADD_MARKER_KEY
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+dashboard_log_add_empty_marker_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data)
+{
+  GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+
+  gimp_dashboard_log_add_marker (dashboard, NULL);
+}
+
+void
+dashboard_reset_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+
+  gimp_dashboard_reset (dashboard);
+}
+
+void
+dashboard_low_swap_space_warning_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data)
+{
+  GimpDashboard *dashboard              = GIMP_DASHBOARD (data);
+  gboolean       low_swap_space_warning = g_variant_get_boolean (value);
+
+  gimp_dashboard_set_low_swap_space_warning (dashboard, low_swap_space_warning);
+}
+
+
+/*  private functions  */
+
+static void
+dashboard_log_record_response (GtkWidget     *dialog,
+                               int            response_id,
+                               GimpDashboard *dashboard)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GFile                  *file;
+      DashboardLogDialogInfo *info;
+      GError                 *error = NULL;
+
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+
+      info = g_object_get_data (G_OBJECT (dashboard),
+                                "gimp-dashboard-log-dialog-info");
+
+      g_return_if_fail (info != NULL);
+
+      g_set_object (&info->folder, g_file_get_parent (file));
+
+      if (! gimp_dashboard_log_start_recording (dashboard,
+                                                file, &info->params,
+                                                &error))
+        {
+          gimp_message_literal (
+            gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard))->gimp,
+            NULL, GIMP_MESSAGE_ERROR, error->message);
+
+          g_clear_error (&error);
+        }
+
+      g_object_unref (file);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+dashboard_log_add_marker_response (GtkWidget     *dialog,
+                                   const gchar   *description,
+                                   GimpDashboard *dashboard)
+{
+  gimp_dashboard_log_add_marker (dashboard, description);
+}
+
+static DashboardLogDialogInfo *
+dashboard_log_dialog_info_new (GimpDashboard *dashboard)
+{
+  DashboardLogDialogInfo *info = g_slice_new (DashboardLogDialogInfo);
+
+  info->folder = NULL;
+  info->params = *gimp_dashboard_log_get_default_params (dashboard);
+
+  return info;
+}
+
+static void
+dashboard_log_dialog_info_free (DashboardLogDialogInfo *info)
+{
+  g_clear_object (&info->folder);
+
+  g_slice_free (DashboardLogDialogInfo, info);
+}
diff --git a/app/actions/dashboard-commands.h b/app/actions/dashboard-commands.h
new file mode 100644
index 0000000..a97b7f1
--- /dev/null
+++ b/app/actions/dashboard-commands.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DASHBOARD_COMMANDS_H__
+#define __DASHBOARD_COMMANDS_H__
+
+
+void   dashboard_update_interval_cmd_callback        (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   dashboard_history_duration_cmd_callback       (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   dashboard_log_record_cmd_callback             (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   dashboard_log_add_marker_cmd_callback         (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   dashboard_log_add_empty_marker_cmd_callback   (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   dashboard_reset_cmd_callback                  (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   dashboard_low_swap_space_warning_cmd_callback (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+
+#endif /* __DASHBOARD_COMMANDS_H__ */
diff --git a/app/actions/data-commands.c b/app/actions/data-commands.c
new file mode 100644
index 0000000..9d71bda
--- /dev/null
+++ b/app/actions/data-commands.c
@@ -0,0 +1,304 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+#include "core/gimpdatafactory.h"
+
+#include "file/file-open.h"
+
+#include "widgets/gimpclipboard.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpdataeditor.h"
+#include "widgets/gimpdatafactoryview.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "dialogs/data-delete-dialog.h"
+
+#include "actions.h"
+#include "data-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+data_open_as_image_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  GimpContext         *context;
+  GimpData            *data;
+
+  context =
+    gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+  data = (GimpData *)
+    gimp_context_get_by_type (context,
+                              gimp_data_factory_view_get_children_type (view));
+
+  if (data && gimp_data_get_file (data))
+    {
+      GFile             *file   = gimp_data_get_file (data);
+      GtkWidget         *widget = GTK_WIDGET (view);
+      GimpImage         *image;
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+
+      image = file_open_with_display (context->gimp, context, NULL,
+                                      file, FALSE,
+                                      G_OBJECT (gtk_widget_get_screen (widget)),
+                                      gimp_widget_get_monitor (widget),
+                                      &status, &error);
+
+      if (! image && status != GIMP_PDB_CANCEL)
+        {
+          gimp_message (context->gimp, G_OBJECT (view),
+                        GIMP_MESSAGE_ERROR,
+                        _("Opening '%s' failed:\n\n%s"),
+                        gimp_file_get_utf8_name (file), error->message);
+          g_clear_error (&error);
+        }
+    }
+}
+
+void
+data_new_cmd_callback (GimpAction *action,
+                       GVariant   *value,
+                       gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+
+  if (gimp_data_factory_view_has_data_new_func (view))
+    {
+      GimpDataFactory *factory;
+      GimpContext     *context;
+      GimpData        *data;
+
+      factory = gimp_data_factory_view_get_data_factory (view);
+
+      context =
+        gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+      data = gimp_data_factory_data_new (factory, context, _("Untitled"));
+
+      if (data)
+        {
+          gimp_context_set_by_type (context,
+                                    gimp_data_factory_view_get_children_type (view),
+                                    GIMP_OBJECT (data));
+
+          gtk_button_clicked (GTK_BUTTON (gimp_data_factory_view_get_edit_button (view)));
+        }
+    }
+}
+
+void
+data_duplicate_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  GimpContext         *context;
+  GimpData            *data;
+
+  context = gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+  data = (GimpData *)
+    gimp_context_get_by_type (context,
+                              gimp_data_factory_view_get_children_type (view));
+
+  if (data && gimp_data_factory_view_have (view, GIMP_OBJECT (data)))
+    {
+      GimpData *new_data;
+
+      new_data = gimp_data_factory_data_duplicate (gimp_data_factory_view_get_data_factory (view), data);
+
+      if (new_data)
+        {
+          gimp_context_set_by_type (context,
+                                    gimp_data_factory_view_get_children_type (view),
+                                    GIMP_OBJECT (new_data));
+
+          gtk_button_clicked (GTK_BUTTON (gimp_data_factory_view_get_edit_button (view)));
+        }
+    }
+}
+
+void
+data_copy_location_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  GimpContext         *context;
+  GimpData            *data;
+
+  context = gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+  data = (GimpData *)
+    gimp_context_get_by_type (context,
+                              gimp_data_factory_view_get_children_type (view));
+
+  if (data)
+    {
+      GFile *file = gimp_data_get_file (data);
+
+      if (file)
+        {
+          gchar *uri = g_file_get_uri (file);
+
+          gimp_clipboard_set_text (context->gimp, uri);
+          g_free (uri);
+        }
+    }
+}
+
+void
+data_show_in_file_manager_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  GimpContext         *context;
+  GimpData            *data;
+
+  context = gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+  data = (GimpData *)
+    gimp_context_get_by_type (context,
+                              gimp_data_factory_view_get_children_type (view));
+
+  if (data)
+    {
+      GFile *file = gimp_data_get_file (data);
+
+      if (file)
+        {
+          GError *error = NULL;
+
+          if (! gimp_file_show_in_file_manager (file, &error))
+            {
+              gimp_message (context->gimp, G_OBJECT (view),
+                            GIMP_MESSAGE_ERROR,
+                            _("Can't show file in file manager: %s"),
+                            error->message);
+              g_clear_error (&error);
+            }
+        }
+    }
+}
+
+void
+data_delete_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  GimpContext         *context;
+  GimpData            *data;
+
+  context =
+    gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+  data = (GimpData *)
+    gimp_context_get_by_type (context,
+                              gimp_data_factory_view_get_children_type (view));
+
+  if (data                          &&
+      gimp_data_is_deletable (data) &&
+      gimp_data_factory_view_have (view, GIMP_OBJECT (data)))
+    {
+      GimpDataFactory *factory;
+      GtkWidget       *dialog;
+
+      factory = gimp_data_factory_view_get_data_factory (view);
+
+      dialog = data_delete_dialog_new (factory, data, context,
+                                       GTK_WIDGET (view));
+      gtk_widget_show (dialog);
+    }
+}
+
+void
+data_refresh_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  Gimp                *gimp;
+  return_if_no_gimp (gimp, user_data);
+
+  gimp_set_busy (gimp);
+  gimp_data_factory_data_refresh (gimp_data_factory_view_get_data_factory (view),
+                                  action_data_get_context (user_data));
+  gimp_unset_busy (gimp);
+}
+
+void
+data_edit_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    user_data)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
+  GimpContext         *context;
+  GimpData            *data;
+
+  context = gimp_container_view_get_context (GIMP_CONTAINER_EDITOR (view)->view);
+
+  data = (GimpData *)
+    gimp_context_get_by_type (context,
+                              gimp_data_factory_view_get_children_type (view));
+
+  if (data && gimp_data_factory_view_have (view, GIMP_OBJECT (data)))
+    {
+      GdkScreen *screen  = gtk_widget_get_screen (GTK_WIDGET (view));
+      gint       monitor = gimp_widget_get_monitor (GTK_WIDGET (view));
+      GtkWidget *dockable;
+
+      dockable =
+        gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
+                                                   context->gimp,
+                                                   gimp_dialog_factory_get_singleton (),
+                                                   screen,
+                                                   monitor,
+                                                   g_variant_get_string (value,
+                                                                         NULL));
+
+      gimp_data_editor_set_data (GIMP_DATA_EDITOR (gtk_bin_get_child (GTK_BIN (dockable))),
+                                 data);
+    }
+}
diff --git a/app/actions/data-commands.h b/app/actions/data-commands.h
new file mode 100644
index 0000000..a9bb4af
--- /dev/null
+++ b/app/actions/data-commands.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DATA_COMMANDS_H__
+#define __DATA_COMMANDS_H__
+
+
+void   data_open_as_image_cmd_callback        (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_new_cmd_callback                  (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_duplicate_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_copy_location_cmd_callback        (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_show_in_file_manager_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_delete_cmd_callback               (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_refresh_cmd_callback              (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   data_edit_cmd_callback                 (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+
+#endif /* __DATA_COMMANDS_H__ */
diff --git a/app/actions/data-editor-commands.c b/app/actions/data-editor-commands.c
new file mode 100644
index 0000000..0c8383c
--- /dev/null
+++ b/app/actions/data-editor-commands.c
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "actions-types.h"
+
+#include "widgets/gimpdataeditor.h"
+
+#include "data-editor-commands.h"
+
+
+/*  public functions */
+
+void
+data_editor_edit_active_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (data);
+  gboolean        edit_active;
+
+  edit_active = g_variant_get_boolean (value);
+
+  gimp_data_editor_set_edit_active (editor, edit_active);
+}
diff --git a/app/actions/data-editor-commands.h b/app/actions/data-editor-commands.h
new file mode 100644
index 0000000..c70743d
--- /dev/null
+++ b/app/actions/data-editor-commands.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DATA_EDITOR_COMMANDS_H__
+#define __DATA_EDITOR_COMMANDS_H__
+
+
+void   data_editor_edit_active_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+
+#endif /* __DATA_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c
new file mode 100644
index 0000000..70ceb0d
--- /dev/null
+++ b/app/actions/debug-actions.c
@@ -0,0 +1,107 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpactiongroup.h"
+
+#include "debug-actions.h"
+#include "debug-commands.h"
+
+
+static const GimpActionEntry debug_actions[] =
+{
+  { "debug-menu", NULL, "_Debug" },
+
+  { "debug-mem-profile", NULL,
+    "_Memory Profile", NULL, NULL,
+    debug_mem_profile_cmd_callback,
+    NULL },
+
+  { "debug-benchmark-projection", NULL,
+    "Benchmark _Projection", NULL,
+    "Invalidates the entire projection, measures the time it takes to "
+    "validate (render) the part that is visible in the active display, "
+    "and print the result to stdout.",
+    debug_benchmark_projection_cmd_callback,
+    NULL },
+
+  { "debug-show-image-graph", NULL,
+    "Show Image _Graph", NULL,
+    "Creates a new image showing the GEGL graph of this image",
+    debug_show_image_graph_cmd_callback,
+    NULL },
+
+  { "debug-dump-items", NULL,
+    "_Dump Items", NULL, NULL,
+    debug_dump_menus_cmd_callback,
+    NULL },
+
+  { "debug-dump-managers", NULL,
+    "Dump _UI Managers", NULL, NULL,
+    debug_dump_managers_cmd_callback,
+    NULL },
+
+  { "debug-dump-keyboard-shortcuts", NULL,
+    "Dump _Keyboard Shortcuts", NULL, NULL,
+    debug_dump_keyboard_shortcuts_cmd_callback,
+    NULL },
+
+  { "debug-dump-attached-data", NULL,
+    "Dump Attached Data", NULL, NULL,
+    debug_dump_attached_data_cmd_callback,
+    NULL }
+};
+
+void
+debug_actions_setup (GimpActionGroup *group)
+{
+  gint i;
+
+  gimp_action_group_add_actions (group, NULL,
+                                 debug_actions,
+                                 G_N_ELEMENTS (debug_actions));
+
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+
+  for (i = 0; i < G_N_ELEMENTS (debug_actions); i++)
+    SET_VISIBLE (debug_actions[i].name, group->gimp->show_debug_menu);
+
+#undef SET_VISIBLE
+}
+
+void
+debug_actions_update (GimpActionGroup *group,
+                      gpointer         data)
+{
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("debug-show-image-graph", gegl_has_operation ("gegl:introspect"));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/debug-actions.h b/app/actions/debug-actions.h
new file mode 100644
index 0000000..c00780c
--- /dev/null
+++ b/app/actions/debug-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DEBUG_ACTIONS_H__
+#define __DEBUG_ACTIONS_H__
+
+
+void   debug_actions_setup  (GimpActionGroup *group);
+void   debug_actions_update (GimpActionGroup *group,
+                             gpointer         data);
+
+
+#endif /* __DEBUG_ACTIONS_H__ */
diff --git a/app/actions/debug-commands.c b/app/actions/debug-commands.c
new file mode 100644
index 0000000..c00c1fe
--- /dev/null
+++ b/app/actions/debug-commands.c
@@ -0,0 +1,430 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpprojectable.h"
+#include "core/gimpprojection.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpuimanager.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
+
+#include "menus/menus.h"
+
+#include "actions.h"
+#include "debug-commands.h"
+
+
+/*  local function prototypes  */
+
+static gboolean  debug_benchmark_projection    (GimpDisplay *display);
+static gboolean  debug_show_image_graph        (GimpImage   *source_image);
+
+static void      debug_dump_menus_recurse_menu (GtkWidget   *menu,
+                                                gint         depth,
+                                                gchar       *path);
+
+static void      debug_print_qdata             (GimpObject  *object);
+static void      debug_print_qdata_foreach     (GQuark       key_id,
+                                                gpointer     data,
+                                                gpointer     user_data);
+
+static gboolean  debug_accel_find_func         (GtkAccelKey *key,
+                                                GClosure    *closure,
+                                                gpointer     data);
+
+
+/*  public functions  */
+
+void
+debug_mem_profile_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  extern gboolean  gimp_debug_memsize;
+  Gimp            *gimp;
+  return_if_no_gimp (gimp, data);
+
+  gimp_debug_memsize = TRUE;
+
+  gimp_object_get_memsize (GIMP_OBJECT (gimp), NULL);
+
+  gimp_debug_memsize = FALSE;
+}
+
+void
+debug_benchmark_projection_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpDisplay *display;
+  return_if_no_display (display, data);
+
+  g_idle_add ((GSourceFunc) debug_benchmark_projection, g_object_ref (display));
+}
+
+void
+debug_show_image_graph_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage *source_image = NULL;
+  return_if_no_image (source_image, data);
+
+  g_idle_add ((GSourceFunc) debug_show_image_graph, g_object_ref (source_image));
+}
+
+void
+debug_dump_menus_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GList *list;
+
+  for (list = gimp_menu_factory_get_registered_menus (global_menu_factory);
+       list;
+       list = g_list_next (list))
+    {
+      GimpMenuFactoryEntry *entry = list->data;
+      GList                *managers;
+
+      managers = gimp_ui_managers_from_name (entry->identifier);
+
+      if (managers)
+        {
+          GimpUIManager *manager = managers->data;
+          GList         *list;
+
+          for (list = manager->registered_uis; list; list = g_list_next (list))
+            {
+              GimpUIManagerUIEntry *ui_entry = list->data;
+
+              if (GTK_IS_MENU_SHELL (ui_entry->widget))
+                {
+                  g_print ("\n\n"
+                           "========================================\n"
+                           "Menu: %s%s\n"
+                           "========================================\n\n",
+                           entry->identifier, ui_entry->ui_path);
+
+                  debug_dump_menus_recurse_menu (ui_entry->widget, 1,
+                                                 entry->identifier);
+                  g_print ("\n");
+                }
+            }
+        }
+    }
+}
+
+void
+debug_dump_managers_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GList *list;
+
+  for (list = gimp_menu_factory_get_registered_menus (global_menu_factory);
+       list;
+       list = g_list_next (list))
+    {
+      GimpMenuFactoryEntry *entry = list->data;
+      GList                *managers;
+
+      managers = gimp_ui_managers_from_name (entry->identifier);
+
+      if (managers)
+        {
+          g_print ("\n\n"
+                   "========================================\n"
+                   "UI Manager: %s\n"
+                   "========================================\n\n",
+                   entry->identifier);
+
+          g_print ("%s\n", gimp_ui_manager_get_ui (managers->data));
+        }
+    }
+}
+
+void
+debug_dump_keyboard_shortcuts_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpImageWindow  *window;
+  GimpUIManager    *manager;
+  GtkAccelGroup    *accel_group;
+  GList            *group_it;
+  GList            *strings = NULL;
+  return_if_no_display (display, data);
+
+  window  = gimp_display_shell_get_window (gimp_display_get_shell (display));
+  manager = gimp_image_window_get_ui_manager (window);
+
+  accel_group = gimp_ui_manager_get_accel_group (manager);
+
+  /* Gather formatted strings of keyboard shortcuts */
+  for (group_it = gimp_ui_manager_get_action_groups (manager);
+       group_it;
+       group_it = g_list_next (group_it))
+    {
+      GimpActionGroup *group     = group_it->data;
+      GList           *actions   = NULL;
+      GList           *action_it = NULL;
+
+      actions = gimp_action_group_list_actions (group);
+      actions = g_list_sort (actions, (GCompareFunc) gimp_action_name_compare);
+
+      for (action_it = actions; action_it; action_it = g_list_next (action_it))
+        {
+          GimpAction  *action        = action_it->data;
+          const gchar *name          = gimp_action_get_name (action);
+          GClosure    *accel_closure = NULL;
+
+          if (strstr (name, "-menu")  ||
+              strstr (name, "-popup") ||
+              name[0] == '<')
+              continue;
+
+          accel_closure = gimp_action_get_accel_closure (action);
+
+          if (accel_closure)
+            {
+              GtkAccelKey *key = gtk_accel_group_find (accel_group,
+                                                       debug_accel_find_func,
+                                                       accel_closure);
+              if (key            &&
+                  key->accel_key &&
+                  key->accel_flags & GTK_ACCEL_VISIBLE)
+                {
+                  const gchar *label_tmp;
+                  gchar       *label;
+                  gchar       *key_string;
+
+                  label_tmp  = gimp_action_get_label (action);
+                  label      = gimp_strip_uline (label_tmp);
+                  key_string = gtk_accelerator_get_label (key->accel_key,
+                                                          key->accel_mods);
+
+                  strings = g_list_prepend (strings,
+                                            g_strdup_printf ("%-20s %s",
+                                                             key_string, label));
+
+                  g_free (key_string);
+                  g_free (label);
+                }
+            }
+        }
+
+      g_list_free (actions);
+    }
+
+  /* Sort and prints the strings */
+  {
+    GList *string_it = NULL;
+
+    strings = g_list_sort (strings, (GCompareFunc) strcmp);
+
+    for (string_it = strings; string_it; string_it = g_list_next (string_it))
+      {
+        g_print ("%s\n", (gchar *) string_it->data);
+        g_free (string_it->data);
+      }
+
+    g_list_free (strings);
+  }
+}
+
+void
+debug_dump_attached_data_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  Gimp        *gimp         = action_data_get_gimp (data);
+  GimpContext *user_context = gimp_get_user_context (gimp);
+
+  debug_print_qdata (GIMP_OBJECT (gimp));
+  debug_print_qdata (GIMP_OBJECT (user_context));
+}
+
+
+/*  private functions  */
+
+static gboolean
+debug_benchmark_projection (GimpDisplay *display)
+{
+  GimpImage *image = gimp_display_get_image (display);
+
+  if (image)
+    {
+      GimpProjection *projection = gimp_image_get_projection (image);
+
+      gimp_projection_stop_rendering (projection);
+
+      GIMP_TIMER_START ();
+
+      gimp_image_invalidate_all (image);
+      gimp_projection_flush_now (projection, TRUE);
+
+      GIMP_TIMER_END ("Validation of the entire projection");
+
+      g_object_unref (display);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+debug_show_image_graph (GimpImage *source_image)
+{
+  GeglNode   *image_graph;
+  GeglNode   *output_node;
+  GimpImage  *new_image;
+  GeglNode   *introspect;
+  GeglNode   *sink;
+  GeglBuffer *buffer;
+  gchar      *new_name;
+
+  image_graph = gimp_projectable_get_graph (GIMP_PROJECTABLE (source_image));
+
+  output_node = gegl_node_get_output_proxy (image_graph, "output");
+
+  introspect = gegl_node_new_child (NULL,
+                                    "operation", "gegl:introspect",
+                                    "node",      output_node,
+                                    NULL);
+  sink = gegl_node_new_child (NULL,
+                              "operation", "gegl:buffer-sink",
+                              "buffer",    &buffer,
+                              NULL);
+
+  gegl_node_link_many (introspect, sink, NULL);
+  gegl_node_process (sink);
+
+  new_name = g_strdup_printf ("%s GEGL graph",
+                              gimp_image_get_display_name (source_image));
+
+  new_image = gimp_create_image_from_buffer (source_image->gimp,
+                                             buffer, new_name);
+  gimp_image_set_file (new_image, g_file_new_for_uri (new_name));
+
+  g_free (new_name);
+
+  g_object_unref (buffer);
+
+  g_object_unref (sink);
+  g_object_unref (introspect);
+
+  g_object_unref (source_image);
+
+  return FALSE;
+}
+
+static void
+debug_dump_menus_recurse_menu (GtkWidget *menu,
+                               gint       depth,
+                               gchar     *path)
+{
+  GList *children;
+  GList *list;
+
+  children = gtk_container_get_children (GTK_CONTAINER (menu));
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      GtkWidget *menu_item = GTK_WIDGET (list->data);
+      GtkWidget *child     = gtk_bin_get_child (GTK_BIN (menu_item));
+
+      if (GTK_IS_LABEL (child))
+        {
+          GtkWidget   *submenu;
+          const gchar *label;
+          gchar       *full_path;
+          gchar       *help_page;
+          gchar       *format_str;
+
+          label = gtk_label_get_text (GTK_LABEL (child));
+          full_path = g_strconcat (path, "/", label, NULL);
+
+          help_page = g_object_get_data (G_OBJECT (menu_item), "gimp-help-id");
+          help_page = g_strdup (help_page);
+
+          format_str = g_strdup_printf ("%%%ds%%%ds %%-20s %%s\n",
+                                        depth * 2, depth * 2 - 40);
+          g_print (format_str,
+                   "", label, "", help_page ? help_page : "");
+          g_free (format_str);
+          g_free (help_page);
+
+          submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+
+          if (submenu)
+            debug_dump_menus_recurse_menu (submenu, depth + 1, full_path);
+
+          g_free (full_path);
+        }
+    }
+
+  g_list_free (children);
+}
+
+static void
+debug_print_qdata (GimpObject *object)
+{
+  g_print ("\nData attached to '%s':\n\n", gimp_object_get_name (object));
+  g_datalist_foreach (&G_OBJECT (object)->qdata,
+                      debug_print_qdata_foreach,
+                      NULL);
+  g_print ("\n");
+}
+
+static void
+debug_print_qdata_foreach (GQuark   key_id,
+                           gpointer data,
+                           gpointer user_data)
+{
+  g_print ("%s: %p\n", g_quark_to_string (key_id), data);
+}
+
+static gboolean
+debug_accel_find_func (GtkAccelKey *key,
+                       GClosure    *closure,
+                       gpointer     data)
+{
+  return (GClosure *) data == closure;
+}
diff --git a/app/actions/debug-commands.h b/app/actions/debug-commands.h
new file mode 100644
index 0000000..12c7dd2
--- /dev/null
+++ b/app/actions/debug-commands.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DEBUG_COMMANDS_H__
+#define __DEBUG_COMMANDS_H__
+
+
+void   debug_mem_profile_cmd_callback             (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   debug_benchmark_projection_cmd_callback    (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   debug_show_image_graph_cmd_callback        (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   debug_dump_menus_cmd_callback              (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   debug_dump_managers_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   debug_dump_keyboard_shortcuts_cmd_callback (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void   debug_dump_attached_data_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+
+
+#endif /* __DEBUG_COMMANDS_H__ */
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
new file mode 100644
index 0000000..188752b
--- /dev/null
+++ b/app/actions/dialogs-actions.c
@@ -0,0 +1,368 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimptoolbox.h"
+
+#include "display/gimpimagewindow.h"
+
+#include "actions.h"
+#include "dialogs-actions.h"
+#include "dialogs-commands.h"
+
+#include "gimp-intl.h"
+
+
+const GimpStringActionEntry dialogs_dockable_actions[] =
+{
+  { "dialogs-toolbox", NULL,
+    NC_("windows-action", "Tool_box"), "<primary>B",
+    NULL /* set in dialogs_actions_update() */,
+    "gimp-toolbox",
+    GIMP_HELP_TOOLBOX },
+
+  { "dialogs-tool-options", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("dialogs-action", "Tool _Options"), NULL,
+    NC_("dialogs-action", "Open the tool options dialog"),
+    "gimp-tool-options",
+    GIMP_HELP_TOOL_OPTIONS_DIALOG },
+
+  { "dialogs-device-status", GIMP_ICON_DIALOG_DEVICE_STATUS,
+    NC_("dialogs-action", "_Device Status"), NULL,
+    NC_("dialogs-action", "Open the device status dialog"),
+    "gimp-device-status",
+    GIMP_HELP_DEVICE_STATUS_DIALOG },
+
+  { "dialogs-symmetry", GIMP_ICON_SYMMETRY,
+    NC_("dialogs-action", "_Symmetry Painting"), NULL,
+    NC_("dialogs-action", "Open the symmetry dialog"),
+    "gimp-symmetry-editor",
+    GIMP_HELP_SYMMETRY_DIALOG },
+
+  { "dialogs-layers", GIMP_ICON_DIALOG_LAYERS,
+    NC_("dialogs-action", "_Layers"), "<primary>L",
+    NC_("dialogs-action", "Open the layers dialog"),
+    "gimp-layer-list",
+    GIMP_HELP_LAYER_DIALOG },
+
+  { "dialogs-channels", GIMP_ICON_DIALOG_CHANNELS,
+    NC_("dialogs-action", "_Channels"), NULL,
+    NC_("dialogs-action", "Open the channels dialog"),
+    "gimp-channel-list",
+    GIMP_HELP_CHANNEL_DIALOG },
+
+  { "dialogs-vectors", GIMP_ICON_DIALOG_PATHS,
+    NC_("dialogs-action", "_Paths"), NULL,
+    NC_("dialogs-action", "Open the paths dialog"),
+    "gimp-vectors-list",
+    GIMP_HELP_PATH_DIALOG },
+
+  { "dialogs-indexed-palette", GIMP_ICON_COLORMAP,
+    NC_("dialogs-action", "Color_map"), NULL,
+    NC_("dialogs-action", "Open the colormap dialog"),
+    "gimp-indexed-palette",
+    GIMP_HELP_INDEXED_PALETTE_DIALOG },
+
+  { "dialogs-histogram", GIMP_ICON_HISTOGRAM,
+    NC_("dialogs-action", "Histogra_m"), NULL,
+    NC_("dialogs-action", "Open the histogram dialog"),
+    "gimp-histogram-editor",
+    GIMP_HELP_HISTOGRAM_DIALOG },
+
+  { "dialogs-selection-editor", GIMP_ICON_SELECTION,
+    NC_("dialogs-action", "_Selection Editor"), NULL,
+    NC_("dialogs-action", "Open the selection editor"),
+    "gimp-selection-editor",
+    GIMP_HELP_SELECTION_DIALOG },
+
+  { "dialogs-navigation", GIMP_ICON_DIALOG_NAVIGATION,
+    NC_("dialogs-action", "Na_vigation"), NULL,
+    NC_("dialogs-action", "Open the display navigation dialog"),
+    "gimp-navigation-view",
+    GIMP_HELP_NAVIGATION_DIALOG },
+
+  { "dialogs-undo-history", GIMP_ICON_DIALOG_UNDO_HISTORY,
+    NC_("dialogs-action", "Undo _History"), NULL,
+    NC_("dialogs-action", "Open the undo history dialog"),
+    "gimp-undo-history",
+    GIMP_HELP_UNDO_DIALOG },
+
+  { "dialogs-cursor", GIMP_ICON_CURSOR,
+    NC_("dialogs-action", "_Pointer"), NULL,
+    NC_("dialogs-action", "Open the pointer information dialog"),
+    "gimp-cursor-view",
+    GIMP_HELP_POINTER_INFO_DIALOG },
+
+  { "dialogs-sample-points", GIMP_ICON_SAMPLE_POINT,
+    NC_("dialogs-action", "_Sample Points"), NULL,
+    NC_("dialogs-action", "Open the sample points dialog"),
+    "gimp-sample-point-editor",
+    GIMP_HELP_SAMPLE_POINT_DIALOG },
+
+  { "dialogs-colors", GIMP_ICON_COLORS_DEFAULT,
+    NC_("dialogs-action", "Colo_rs"), NULL,
+    NC_("dialogs-action", "Open the FG/BG color dialog"),
+    "gimp-color-editor",
+    GIMP_HELP_COLOR_DIALOG },
+
+  { "dialogs-brushes", GIMP_ICON_BRUSH,
+    NC_("dialogs-action", "_Brushes"), "<primary><shift>B",
+    NC_("dialogs-action", "Open the brushes dialog"),
+    "gimp-brush-grid|gimp-brush-list",
+    GIMP_HELP_BRUSH_DIALOG },
+
+  { "dialogs-brush-editor", GIMP_ICON_BRUSH,
+    NC_("dialogs-action", "Brush Editor"), NULL,
+    NC_("dialogs-action", "Open the brush editor"),
+    "gimp-brush-editor",
+    GIMP_HELP_BRUSH_EDIT },
+
+  { "dialogs-dynamics", GIMP_ICON_DYNAMICS,
+    NC_("dialogs-action", "Paint D_ynamics"), NULL,
+    NC_("dialogs-action", "Open paint dynamics dialog"),
+    "gimp-dynamics-list|gimp-dynamics-grid",
+    GIMP_HELP_DYNAMICS_DIALOG },
+
+  { "dialogs-dynamics-editor", GIMP_ICON_DYNAMICS,
+    NC_("dialogs-action", "Paint Dynamics Editor"), NULL,
+    NC_("dialogs-action", "Open the paint dynamics editor"),
+    "gimp-dynamics-editor",
+    GIMP_HELP_DYNAMICS_EDITOR_DIALOG },
+
+  { "dialogs-mypaint-brushes", GIMP_ICON_MYPAINT_BRUSH,
+    NC_("dialogs-action", "_MyPaint Brushes"), NULL,
+    NC_("dialogs-action", "Open the mypaint brushes dialog"),
+    "gimp-mypaint-brush-grid|gimp-mapyint-brush-list",
+    GIMP_HELP_MYPAINT_BRUSH_DIALOG },
+
+  { "dialogs-patterns", GIMP_ICON_PATTERN,
+    NC_("dialogs-action", "P_atterns"), "<primary><shift>P",
+    NC_("dialogs-action", "Open the patterns dialog"),
+    "gimp-pattern-grid|gimp-pattern-list",
+    GIMP_HELP_PATTERN_DIALOG },
+
+  { "dialogs-gradients", GIMP_ICON_GRADIENT,
+    NC_("dialogs-action", "_Gradients"), "<primary>G",
+    NC_("dialogs-action", "Open the gradients dialog"),
+    "gimp-gradient-list|gimp-gradient-grid",
+    GIMP_HELP_GRADIENT_DIALOG },
+
+  { "dialogs-gradient-editor", GIMP_ICON_GRADIENT,
+    NC_("dialogs-action", "Gradient Editor"), NULL,
+    NC_("dialogs-action", "Open the gradient editor"),
+    "gimp-gradient-editor",
+    GIMP_HELP_GRADIENT_EDIT },
+
+  { "dialogs-palettes", GIMP_ICON_PALETTE,
+    NC_("dialogs-action", "Pal_ettes"), NULL,
+    NC_("dialogs-action", "Open the palettes dialog"),
+    "gimp-palette-list|gimp-palette-grid",
+    GIMP_HELP_PALETTE_DIALOG },
+
+  { "dialogs-palette-editor", GIMP_ICON_PALETTE,
+    NC_("dialogs-action", "Palette _Editor"), NULL,
+    NC_("dialogs-action", "Open the palette editor"),
+    "gimp-palette-editor",
+    GIMP_HELP_PALETTE_EDIT },
+
+  { "dialogs-tool-presets", GIMP_ICON_TOOL_PRESET,
+    NC_("dialogs-action", "Tool Pre_sets"), NULL,
+    NC_("dialogs-action", "Open tool presets dialog"),
+    "gimp-tool-preset-list|gimp-tool-preset-grid",
+    GIMP_HELP_TOOL_PRESET_DIALOG },
+
+  { "dialogs-fonts", GIMP_ICON_FONT,
+    NC_("dialogs-action", "_Fonts"), NULL,
+    NC_("dialogs-action", "Open the fonts dialog"),
+    "gimp-font-list|gimp-font-grid",
+    GIMP_HELP_FONT_DIALOG },
+
+  { "dialogs-buffers", GIMP_ICON_BUFFER,
+    NC_("dialogs-action", "B_uffers"), "",
+    NC_("dialogs-action", "Open the named buffers dialog"),
+    "gimp-buffer-list|gimp-buffer-grid",
+    GIMP_HELP_BUFFER_DIALOG },
+
+  { "dialogs-images", GIMP_ICON_DIALOG_IMAGES,
+    NC_("dialogs-action", "_Images"), NULL,
+    NC_("dialogs-action", "Open the images dialog"),
+    "gimp-image-list|gimp-image-grid",
+    GIMP_HELP_IMAGE_DIALOG },
+
+  { "dialogs-document-history", GIMP_ICON_DOCUMENT_OPEN_RECENT,
+    NC_("dialogs-action", "Document Histor_y"), "",
+    NC_("dialogs-action", "Open the document history dialog"),
+    "gimp-document-list|gimp-document-grid",
+    GIMP_HELP_DOCUMENT_DIALOG },
+
+  { "dialogs-templates", GIMP_ICON_TEMPLATE,
+    NC_("dialogs-action", "_Templates"), "",
+    NC_("dialogs-action", "Open the image templates dialog"),
+    "gimp-template-list|gimp-template-grid",
+    GIMP_HELP_TEMPLATE_DIALOG },
+
+  { "dialogs-error-console", GIMP_ICON_DIALOG_WARNING,
+    NC_("dialogs-action", "Error Co_nsole"), NULL,
+    NC_("dialogs-action", "Open the error console"),
+    "gimp-error-console",
+    GIMP_HELP_ERRORS_DIALOG },
+
+  { "dialogs-dashboard", GIMP_ICON_DIALOG_DASHBOARD,
+    NC_("dialogs-action", "_Dashboard"), NULL,
+    NC_("dialogs-action", "Open the dashboard"),
+    "gimp-dashboard",
+    GIMP_HELP_ERRORS_DIALOG }
+};
+
+gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
+
+static const GimpStringActionEntry dialogs_toplevel_actions[] =
+{
+  { "dialogs-preferences", GIMP_ICON_PREFERENCES_SYSTEM,
+    NC_("dialogs-action", "_Preferences"), NULL,
+    NC_("dialogs-action", "Open the preferences dialog"),
+    "gimp-preferences-dialog",
+    GIMP_HELP_PREFS_DIALOG },
+
+  { "dialogs-input-devices", GIMP_ICON_INPUT_DEVICE,
+    NC_("dialogs-action", "_Input Devices"), NULL,
+    NC_("dialogs-action", "Open the input devices editor"),
+    "gimp-input-devices-dialog",
+    GIMP_HELP_INPUT_DEVICES },
+
+  { "dialogs-keyboard-shortcuts", GIMP_ICON_CHAR_PICKER,
+    NC_("dialogs-action", "_Keyboard Shortcuts"), NULL,
+    NC_("dialogs-action", "Open the keyboard shortcuts editor"),
+    "gimp-keyboard-shortcuts-dialog",
+    GIMP_HELP_KEYBOARD_SHORTCUTS },
+
+  { "dialogs-module-dialog", GIMP_ICON_SYSTEM_RUN,
+    NC_("dialogs-action", "_Modules"), NULL,
+    NC_("dialogs-action", "Open the module manager dialog"),
+    "gimp-module-dialog",
+    GIMP_HELP_MODULE_DIALOG },
+
+  { "dialogs-tips", GIMP_ICON_DIALOG_INFORMATION,
+    NC_("dialogs-action", "_Tip of the Day"), NULL,
+    NC_("dialogs-action", "Show some helpful tips on using GIMP"),
+    "gimp-tips-dialog",
+    GIMP_HELP_TIPS_DIALOG },
+
+  { "dialogs-about", GIMP_ICON_HELP_ABOUT,
+#if defined(G_OS_WIN32)
+    NC_("dialogs-action", "About GIMP"),
+#elif defined(PLATFORM_OSX)
+    NC_("dialogs-action", "About"),
+#else /* UNIX: use GNOME HIG */
+    NC_("dialogs-action", "_About"),
+#endif
+    NULL,
+    NC_("dialogs-action", "About GIMP"),
+    "gimp-about-dialog",
+      GIMP_HELP_ABOUT_DIALOG },
+
+  { "dialogs-action-search", GIMP_ICON_TOOL_ZOOM,
+    NC_("dialogs-action", "_Search and Run a Command"), "slash",
+    NC_("dialogs-action", "Search commands by keyword, and run them"),
+    "gimp-action-search-dialog",
+    GIMP_HELP_ACTION_SEARCH_DIALOG }
+};
+
+
+gboolean
+dialogs_actions_toolbox_exists (Gimp *gimp)
+{
+  GimpDialogFactory *factory       = gimp_dialog_factory_get_singleton ();
+  gboolean           toolbox_found = FALSE;
+  GList             *iter;
+
+  /* First look in session managed windows */
+  toolbox_found =
+    gimp_dialog_factory_find_widget (factory, "gimp-toolbox-window") != NULL;
+
+  /* Then in image windows */
+  if (! toolbox_found)
+    {
+      GList *windows = gimp ? gimp_get_image_windows (gimp) : NULL;
+
+      for (iter = windows; iter; iter = g_list_next (iter))
+        {
+          GimpImageWindow *window = GIMP_IMAGE_WINDOW (windows->data);
+
+          if (gimp_image_window_has_toolbox (window))
+            {
+              toolbox_found = TRUE;
+              break;
+            }
+        }
+
+      g_list_free (windows);
+    }
+
+  return toolbox_found;
+}
+
+void
+dialogs_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_string_actions (group, "dialogs-action",
+                                        dialogs_dockable_actions,
+                                        G_N_ELEMENTS (dialogs_dockable_actions),
+                                        dialogs_create_dockable_cmd_callback);
+
+  gimp_action_group_add_string_actions (group, "dialogs-action",
+                                        dialogs_toplevel_actions,
+                                        G_N_ELEMENTS (dialogs_toplevel_actions),
+                                        dialogs_create_toplevel_cmd_callback);
+}
+
+void
+dialogs_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+  Gimp        *gimp            = action_data_get_gimp (data);
+  const gchar *toolbox_label   = NULL;
+  const gchar *toolbox_tooltip = NULL;
+
+  if (dialogs_actions_toolbox_exists (gimp))
+    {
+      toolbox_label   = _("Tool_box");
+      toolbox_tooltip = _("Raise the toolbox");
+    }
+  else
+    {
+      toolbox_label   = _("New Tool_box");
+      toolbox_tooltip = _("Create a new toolbox");
+    }
+
+  gimp_action_group_set_action_label (group, "dialogs-toolbox", toolbox_label);
+  gimp_action_group_set_action_tooltip (group, "dialogs-toolbox", toolbox_tooltip);
+}
diff --git a/app/actions/dialogs-actions.h b/app/actions/dialogs-actions.h
new file mode 100644
index 0000000..b424bdd
--- /dev/null
+++ b/app/actions/dialogs-actions.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DIALOGS_ACTIONS_H__
+#define __DIALOGS_ACTIONS_H__
+
+
+/*  this check is needed for the extern declaration below to be correct  */
+#ifndef __GIMP_ACTION_GROUP_H__
+#error "widgets/gimpactiongroup.h must be included prior to dialogs-actions.h"
+#endif
+
+extern const GimpStringActionEntry dialogs_dockable_actions[];
+extern gint                        n_dialogs_dockable_actions;
+
+
+void       dialogs_actions_setup          (GimpActionGroup *group);
+void       dialogs_actions_update         (GimpActionGroup *group,
+                                           gpointer         data);
+
+gboolean   dialogs_actions_toolbox_exists (Gimp            *gimp);
+
+
+#endif /* __DIALOGS_ACTIONS_H__ */
diff --git a/app/actions/dialogs-commands.c b/app/actions/dialogs-commands.c
new file mode 100644
index 0000000..5804bcc
--- /dev/null
+++ b/app/actions/dialogs-commands.c
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "actions.h"
+#include "dialogs-commands.h"
+
+
+/*  public functions  */
+
+void
+dialogs_create_toplevel_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GtkWidget   *widget;
+  const gchar *identifier;
+  return_if_no_widget (widget, data);
+
+  identifier = g_variant_get_string (value, NULL);
+
+  if (identifier)
+    gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                    gtk_widget_get_screen (widget),
+                                    gimp_widget_get_monitor (widget),
+                                    NULL /*ui_manager*/,
+                                    identifier, -1, TRUE);
+}
+
+void
+dialogs_create_dockable_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  Gimp        *gimp;
+  GtkWidget   *widget;
+  const gchar *identifier;
+  return_if_no_gimp   (gimp, data);
+  return_if_no_widget (widget, data);
+
+  identifier = g_variant_get_string (value, NULL);
+
+  if (identifier)
+    gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)),
+                                               gimp,
+                                               gimp_dialog_factory_get_singleton (),
+                                               gtk_widget_get_screen (widget),
+                                               gimp_widget_get_monitor (widget),
+                                               identifier);
+}
diff --git a/app/actions/dialogs-commands.h b/app/actions/dialogs-commands.h
new file mode 100644
index 0000000..22abafc
--- /dev/null
+++ b/app/actions/dialogs-commands.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DIALOGS_COMMANDS_H__
+#define __DIALOGS_COMMANDS_H__
+
+
+void   dialogs_create_toplevel_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   dialogs_create_dockable_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+
+#endif /* __DIALOGS_COMMANDS_H__ */
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
new file mode 100644
index 0000000..1f7dc38
--- /dev/null
+++ b/app/actions/dock-actions.c
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenudock.h"
+
+#include "display/gimpimagewindow.h"
+
+#include "actions.h"
+#include "dock-actions.h"
+#include "dock-commands.h"
+#include "window-actions.h"
+#include "window-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry dock_actions[] =
+{
+  { "dock-move-to-screen-menu", GIMP_ICON_WINDOW_MOVE_TO_SCREEN,
+    NC_("dock-action", "M_ove to Screen"), NULL, NULL, NULL,
+    GIMP_HELP_DOCK_CHANGE_SCREEN },
+
+  { "dock-close", GIMP_ICON_WINDOW_CLOSE,
+    NC_("dock-action", "Close Dock"), "", NULL,
+    window_close_cmd_callback,
+    GIMP_HELP_DOCK_CLOSE },
+
+  { "dock-open-display", NULL,
+    NC_("dock-action", "_Open Display..."), NULL,
+    NC_("dock-action", "Connect to another display"),
+    window_open_display_cmd_callback,
+    NULL }
+};
+
+static const GimpToggleActionEntry dock_toggle_actions[] =
+{
+  { "dock-show-image-menu", NULL,
+    NC_("dock-action", "_Show Image Selection"), NULL, NULL,
+    dock_toggle_image_menu_cmd_callback,
+    TRUE,
+    GIMP_HELP_DOCK_IMAGE_MENU },
+
+  { "dock-auto-follow-active", NULL,
+    NC_("dock-action", "Auto _Follow Active Image"), NULL, NULL,
+    dock_toggle_auto_cmd_callback,
+    TRUE,
+    GIMP_HELP_DOCK_AUTO_BUTTON }
+};
+
+
+void
+dock_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "dock-action",
+                                 dock_actions,
+                                 G_N_ELEMENTS (dock_actions));
+
+  gimp_action_group_add_toggle_actions (group, "dock-action",
+                                        dock_toggle_actions,
+                                        G_N_ELEMENTS (dock_toggle_actions));
+
+  window_actions_setup (group, GIMP_HELP_DOCK_CHANGE_SCREEN);
+}
+
+void
+dock_actions_update (GimpActionGroup *group,
+                     gpointer         data)
+{
+  GtkWidget *widget   = action_data_get_widget (data);
+  GtkWidget *toplevel = NULL;
+
+  if (widget)
+    toplevel = gtk_widget_get_toplevel (widget);
+
+#define SET_ACTIVE(action,active) \
+        gimp_action_group_set_action_active (group, action, (active) != 0)
+#define SET_VISIBLE(action,active) \
+        gimp_action_group_set_action_visible (group, action, (active) != 0)
+
+  if (GIMP_IS_DOCK_WINDOW (toplevel))
+    {
+      GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (toplevel);
+      gboolean show_image_menu = ! gimp_dock_window_has_toolbox (dock_window);
+
+      if (show_image_menu)
+        {
+          SET_VISIBLE ("dock-show-image-menu",    TRUE);
+          SET_VISIBLE ("dock-auto-follow-active", TRUE);
+
+          SET_ACTIVE ("dock-show-image-menu",
+                      gimp_dock_window_get_show_image_menu (dock_window));
+          SET_ACTIVE ("dock-auto-follow-active",
+                      gimp_dock_window_get_auto_follow_active (dock_window));
+        }
+      else
+        {
+          SET_VISIBLE ("dock-show-image-menu",    FALSE);
+          SET_VISIBLE ("dock-auto-follow-active", FALSE);
+        }
+
+      /*  update the window actions only in the context of their
+       *  own window (not in the context of some display or NULL)
+       *  (see view-actions.c)
+       */
+      window_actions_update (group, toplevel);
+    }
+  else if (GIMP_IS_IMAGE_WINDOW (toplevel))
+    {
+      SET_VISIBLE ("dock-show-image-menu",    FALSE);
+      SET_VISIBLE ("dock-auto-follow-active", FALSE);
+    }
+
+#undef SET_ACTIVE
+#undef SET_VISIBLE
+}
diff --git a/app/actions/dock-actions.h b/app/actions/dock-actions.h
new file mode 100644
index 0000000..9e26c36
--- /dev/null
+++ b/app/actions/dock-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCK_ACTIONS_H__
+#define __DOCK_ACTIONS_H__
+
+
+void   dock_actions_setup  (GimpActionGroup *group);
+void   dock_actions_update (GimpActionGroup *group,
+                            gpointer         data);
+
+
+#endif /* __DOCK_ACTIONS_H__ */
diff --git a/app/actions/dock-commands.c b/app/actions/dock-commands.c
new file mode 100644
index 0000000..35508d5
--- /dev/null
+++ b/app/actions/dock-commands.c
@@ -0,0 +1,85 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimpdockwindow.h"
+
+#include "actions.h"
+#include "dock-commands.h"
+
+
+static GimpDockWindow *
+dock_commands_get_dock_window_from_widget (GtkWidget *widget)
+{
+  GtkWidget      *toplevel    = gtk_widget_get_toplevel (widget);
+  GimpDockWindow *dock_window = NULL;
+
+  if (GIMP_IS_DOCK_WINDOW (toplevel))
+    dock_window = GIMP_DOCK_WINDOW (toplevel);
+
+  return dock_window;
+}
+
+
+/*  public functions  */
+
+void
+dock_toggle_image_menu_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GtkWidget      *widget      = NULL;
+  GimpDockWindow *dock_window = NULL;
+  return_if_no_widget (widget, data);
+
+  dock_window = dock_commands_get_dock_window_from_widget (widget);
+
+  if (dock_window)
+    {
+      gboolean active = g_variant_get_boolean (value);
+
+      gimp_dock_window_set_show_image_menu (dock_window, active);
+    }
+}
+
+void
+dock_toggle_auto_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GtkWidget      *widget      = NULL;
+  GimpDockWindow *dock_window = NULL;
+  return_if_no_widget (widget, data);
+
+  dock_window = dock_commands_get_dock_window_from_widget (widget);
+
+  if (dock_window)
+    {
+      gboolean active = g_variant_get_boolean (value);
+
+      gimp_dock_window_set_auto_follow_active (dock_window, active);
+    }
+}
diff --git a/app/actions/dock-commands.h b/app/actions/dock-commands.h
new file mode 100644
index 0000000..73120de
--- /dev/null
+++ b/app/actions/dock-commands.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCK_COMMANDS_H__
+#define __DOCK_COMMANDS_H__
+
+
+void   dock_toggle_image_menu_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+void   dock_toggle_auto_cmd_callback       (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+
+
+#endif /* __DOCK_COMMANDS_H__ */
diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c
new file mode 100644
index 0000000..d80ca33
--- /dev/null
+++ b/app/actions/dockable-actions.c
@@ -0,0 +1,375 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpcontainerview-utils.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "dialogs-actions.h"
+#include "dockable-actions.h"
+#include "dockable-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry dockable_actions[] =
+{
+  { "dockable-popup", NULL,
+    NC_("dockable-action", "Dialogs Menu"), NULL, NULL, NULL,
+    GIMP_HELP_DOCK },
+
+  { "dockable-menu",              "image-missing", ""           },
+  { "dockable-add-tab-menu",      NULL, NC_("dockable-action",
+                                            "_Add Tab")        },
+  { "dockable-preview-size-menu", NULL, NC_("dockable-action",
+                                            "_Preview Size")   },
+  { "dockable-tab-style-menu",    NULL, NC_("dockable-action",
+                                            "_Tab Style")      },
+
+  { "dockable-close-tab", "window-close",
+    NC_("dockable-action", "_Close Tab"), "", NULL,
+    dockable_close_tab_cmd_callback,
+    GIMP_HELP_DOCK_TAB_CLOSE },
+
+  { "dockable-detach-tab", GIMP_ICON_DETACH,
+    NC_("dockable-action", "_Detach Tab"), "", NULL,
+    dockable_detach_tab_cmd_callback,
+    GIMP_HELP_DOCK_TAB_DETACH }
+};
+
+#define VIEW_SIZE(action,label,size) \
+  { "dockable-preview-size-" action, NULL, \
+    (label), NULL, NULL, \
+    (size), \
+    GIMP_HELP_DOCK_PREVIEW_SIZE }
+#define TAB_STYLE(action,label,style) \
+  { "dockable-tab-style-" action, NULL, \
+    (label), NULL, NULL, \
+    (style), \
+    GIMP_HELP_DOCK_TAB_STYLE }
+
+static const GimpRadioActionEntry dockable_view_size_actions[] =
+{
+  VIEW_SIZE ("tiny",
+             NC_("preview-size", "_Tiny"),        GIMP_VIEW_SIZE_TINY),
+  VIEW_SIZE ("extra-small",
+             NC_("preview-size", "E_xtra Small"), GIMP_VIEW_SIZE_EXTRA_SMALL),
+  VIEW_SIZE ("small",
+             NC_("preview-size", "_Small"),       GIMP_VIEW_SIZE_SMALL),
+  VIEW_SIZE ("medium",
+             NC_("preview-size", "_Medium"),      GIMP_VIEW_SIZE_MEDIUM),
+  VIEW_SIZE ("large",
+             NC_("preview-size", "_Large"),       GIMP_VIEW_SIZE_LARGE),
+  VIEW_SIZE ("extra-large",
+             NC_("preview-size", "Ex_tra Large"), GIMP_VIEW_SIZE_EXTRA_LARGE),
+  VIEW_SIZE ("huge",
+             NC_("preview-size", "_Huge"),        GIMP_VIEW_SIZE_HUGE),
+  VIEW_SIZE ("enormous",
+             NC_("preview-size", "_Enormous"),    GIMP_VIEW_SIZE_ENORMOUS),
+  VIEW_SIZE ("gigantic",
+             NC_("preview-size", "_Gigantic"),    GIMP_VIEW_SIZE_GIGANTIC)
+};
+
+static const GimpRadioActionEntry dockable_tab_style_actions[] =
+{
+  TAB_STYLE ("icon",
+             NC_("tab-style", "_Icon"),           GIMP_TAB_STYLE_ICON),
+  TAB_STYLE ("preview",
+             NC_("tab-style", "Current _Status"), GIMP_TAB_STYLE_PREVIEW),
+  TAB_STYLE ("name",
+             NC_("tab-style", "_Text"),           GIMP_TAB_STYLE_NAME),
+  TAB_STYLE ("icon-name",
+             NC_("tab-style", "I_con & Text"),    GIMP_TAB_STYLE_ICON_NAME),
+  TAB_STYLE ("preview-name",
+             NC_("tab-style", "St_atus & Text"),  GIMP_TAB_STYLE_PREVIEW_NAME),
+  TAB_STYLE ("automatic",
+             NC_("tab-style", "Automatic"),       GIMP_TAB_STYLE_AUTOMATIC)
+};
+
+#undef VIEW_SIZE
+#undef TAB_STYLE
+
+
+static const GimpToggleActionEntry dockable_toggle_actions[] =
+{
+  { "dockable-lock-tab", NULL,
+    NC_("dockable-action", "Loc_k Tab to Dock"), NULL,
+    NC_("dockable-action",
+        "Protect this tab from being dragged with the mouse pointer"),
+    dockable_lock_tab_cmd_callback,
+    FALSE,
+    GIMP_HELP_DOCK_TAB_LOCK },
+
+  { "dockable-show-button-bar", NULL,
+    NC_("dockable-action", "Show _Button Bar"), NULL, NULL,
+    dockable_show_button_bar_cmd_callback,
+    TRUE,
+    GIMP_HELP_DOCK_SHOW_BUTTON_BAR }
+};
+
+static const GimpRadioActionEntry dockable_view_type_actions[] =
+{
+  { "dockable-view-type-list", NULL,
+    NC_("dockable-action", "View as _List"), NULL, NULL,
+    GIMP_VIEW_TYPE_LIST,
+    GIMP_HELP_DOCK_VIEW_AS_LIST },
+
+  { "dockable-view-type-grid", NULL,
+    NC_("dockable-action", "View as _Grid"), NULL, NULL,
+    GIMP_VIEW_TYPE_GRID,
+    GIMP_HELP_DOCK_VIEW_AS_GRID }
+};
+
+
+void
+dockable_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "dockable-action",
+                                 dockable_actions,
+                                 G_N_ELEMENTS (dockable_actions));
+
+  gimp_action_group_add_toggle_actions (group, "dockable-action",
+                                        dockable_toggle_actions,
+                                        G_N_ELEMENTS (dockable_toggle_actions));
+
+  gimp_action_group_add_string_actions (group, "dialogs-action",
+                                        dialogs_dockable_actions,
+                                        n_dialogs_dockable_actions,
+                                        dockable_add_tab_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "preview-size",
+                                       dockable_view_size_actions,
+                                       G_N_ELEMENTS (dockable_view_size_actions),
+                                       NULL,
+                                       GIMP_VIEW_SIZE_MEDIUM,
+                                       dockable_view_size_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "tab-style",
+                                       dockable_tab_style_actions,
+                                       G_N_ELEMENTS (dockable_tab_style_actions),
+                                       NULL,
+                                       GIMP_TAB_STYLE_AUTOMATIC,
+                                       dockable_tab_style_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "dockable-action",
+                                       dockable_view_type_actions,
+                                       G_N_ELEMENTS (dockable_view_type_actions),
+                                       NULL,
+                                       GIMP_VIEW_TYPE_LIST,
+                                       dockable_toggle_view_cmd_callback);
+}
+
+void
+dockable_actions_update (GimpActionGroup *group,
+                         gpointer         data)
+{
+  GimpDockable           *dockable;
+  GimpDockbook           *dockbook;
+  GimpDocked             *docked;
+  GimpDock               *dock;
+  GimpDialogFactoryEntry *entry;
+  GimpContainerView      *view;
+  GimpViewType            view_type           = -1;
+  gboolean                list_view_available = FALSE;
+  gboolean                grid_view_available = FALSE;
+  gboolean                locked              = FALSE;
+  GimpViewSize            view_size           = -1;
+  GimpTabStyle            tab_style           = -1;
+  gint                    n_pages             = 0;
+  gint                    n_books             = 0;
+  GimpDockedInterface     *docked_iface       = NULL;
+
+  if (GIMP_IS_DOCKBOOK (data))
+    {
+      gint page_num;
+
+      dockbook = GIMP_DOCKBOOK (data);
+
+      page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+
+      dockable = (GimpDockable *)
+        gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
+    }
+  else if (GIMP_IS_DOCKABLE (data))
+    {
+      dockable = GIMP_DOCKABLE (data);
+      dockbook = gimp_dockable_get_dockbook (dockable);
+    }
+  else
+    {
+      return;
+    }
+
+  docked = GIMP_DOCKED (gtk_bin_get_child (GTK_BIN (dockable)));
+  dock   = gimp_dockbook_get_dock (dockbook);
+
+
+  gimp_dialog_factory_from_widget (GTK_WIDGET (dockable), &entry);
+
+  if (entry)
+    {
+      gchar *identifier;
+      gchar *substring = NULL;
+
+      identifier = g_strdup (entry->identifier);
+
+      if ((substring = strstr (identifier, "grid")))
+        view_type = GIMP_VIEW_TYPE_GRID;
+      else if ((substring = strstr (identifier, "list")))
+        view_type = GIMP_VIEW_TYPE_LIST;
+
+      if (substring)
+        {
+          memcpy (substring, "list", 4);
+          if (gimp_dialog_factory_find_entry (gimp_dock_get_dialog_factory (dock),
+                                              identifier))
+            list_view_available = TRUE;
+
+          memcpy (substring, "grid", 4);
+          if (gimp_dialog_factory_find_entry (gimp_dock_get_dialog_factory (dock),
+                                              identifier))
+            grid_view_available = TRUE;
+        }
+
+      g_free (identifier);
+    }
+
+  view = gimp_container_view_get_by_dockable (dockable);
+
+  if (view)
+    view_size = gimp_container_view_get_view_size (view, NULL);
+
+  tab_style = gimp_dockable_get_tab_style (dockable);
+
+  n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (dockbook));
+  n_books = g_list_length (gimp_dock_get_dockbooks (dock));
+
+#define SET_ACTIVE(action,active) \
+        gimp_action_group_set_action_active (group, action, (active) != 0)
+#define SET_VISIBLE(action,active) \
+        gimp_action_group_set_action_visible (group, action, (active) != 0)
+#define SET_SENSITIVE(action,sensitive) \
+        gimp_action_group_set_action_sensitive (group, action, (sensitive) != 0)
+
+
+  locked = gimp_dockable_is_locked (dockable);
+
+  SET_SENSITIVE ("dockable-detach-tab", (! locked &&
+                                         (n_pages > 1 || n_books > 1)));
+
+  SET_ACTIVE ("dockable-lock-tab", locked);
+
+  SET_VISIBLE ("dockable-preview-size-menu", view_size != -1);
+
+  if (view_size != -1)
+    {
+      if (view_size >= GIMP_VIEW_SIZE_GIGANTIC)
+        {
+          SET_ACTIVE ("dockable-preview-size-gigantic", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_ENORMOUS)
+        {
+          SET_ACTIVE ("dockable-preview-size-enormous", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_HUGE)
+        {
+          SET_ACTIVE ("dockable-preview-size-huge", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_EXTRA_LARGE)
+        {
+          SET_ACTIVE ("dockable-preview-size-extra-large", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_LARGE)
+        {
+          SET_ACTIVE ("dockable-preview-size-large", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_MEDIUM)
+        {
+          SET_ACTIVE ("dockable-preview-size-medium", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_SMALL)
+        {
+          SET_ACTIVE ("dockable-preview-size-small", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_EXTRA_SMALL)
+        {
+          SET_ACTIVE ("dockable-preview-size-extra-small", TRUE);
+        }
+      else if (view_size >= GIMP_VIEW_SIZE_TINY)
+        {
+          SET_ACTIVE ("dockable-preview-size-tiny", TRUE);
+        }
+    }
+
+  if (tab_style == GIMP_TAB_STYLE_ICON)
+    SET_ACTIVE ("dockable-tab-style-icon", TRUE);
+  else if (tab_style == GIMP_TAB_STYLE_PREVIEW)
+    SET_ACTIVE ("dockable-tab-style-preview", TRUE);
+  else if (tab_style == GIMP_TAB_STYLE_NAME)
+    SET_ACTIVE ("dockable-tab-style-name", TRUE);
+  else if (tab_style == GIMP_TAB_STYLE_ICON_NAME)
+    SET_ACTIVE ("dockable-tab-style-icon-name", TRUE);
+  else if (tab_style == GIMP_TAB_STYLE_PREVIEW_NAME)
+    SET_ACTIVE ("dockable-tab-style-preview-name", TRUE);
+  else if (tab_style == GIMP_TAB_STYLE_AUTOMATIC)
+    SET_ACTIVE ("dockable-tab-style-automatic", TRUE);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+  SET_SENSITIVE ("dockable-tab-style-preview",
+                 docked_iface->get_preview);
+  SET_SENSITIVE ("dockable-tab-style-preview-name",
+                 docked_iface->get_preview);
+
+  SET_VISIBLE ("dockable-view-type-grid", view_type != -1);
+  SET_VISIBLE ("dockable-view-type-list", view_type != -1);
+
+  if (view_type != -1)
+    {
+      if (view_type == GIMP_VIEW_TYPE_LIST)
+        SET_ACTIVE ("dockable-view-type-list", TRUE);
+      else
+        SET_ACTIVE ("dockable-view-type-grid", TRUE);
+
+      SET_SENSITIVE ("dockable-view-type-grid", grid_view_available);
+      SET_SENSITIVE ("dockable-view-type-list", list_view_available);
+    }
+
+  SET_VISIBLE ("dockable-show-button-bar", gimp_docked_has_button_bar (docked));
+  SET_ACTIVE ("dockable-show-button-bar",
+              gimp_docked_get_show_button_bar (docked));
+
+#undef SET_ACTIVE
+#undef SET_VISIBLE
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/dockable-actions.h b/app/actions/dockable-actions.h
new file mode 100644
index 0000000..d70872d
--- /dev/null
+++ b/app/actions/dockable-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCKABLE_ACTIONS_H__
+#define __DOCKABLE_ACTIONS_H__
+
+
+void   dockable_actions_setup  (GimpActionGroup *group);
+void   dockable_actions_update (GimpActionGroup *group,
+                                gpointer         data);
+
+
+#endif /* __DOCKABLE_ACTIONS_H__ */
diff --git a/app/actions/dockable-commands.c b/app/actions/dockable-commands.c
new file mode 100644
index 0000000..60229e3
--- /dev/null
+++ b/app/actions/dockable-commands.c
@@ -0,0 +1,298 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpcontainerview-utils.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpsessioninfo.h"
+
+#include "dockable-commands.h"
+
+
+static GimpDockable * dockable_get_current (GimpDockbook *dockbook);
+
+
+/*  public functions  */
+
+void
+dockable_add_tab_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+
+  gimp_dockbook_add_from_dialog_factory (dockbook,
+                                         g_variant_get_string (value, NULL),
+                                         -1);
+}
+
+void
+dockable_close_tab_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable = dockable_get_current (dockbook);
+
+  if (dockable)
+    {
+      g_object_ref (dockable);
+      gimp_dockbook_remove (dockbook, dockable);
+      gtk_widget_destroy (GTK_WIDGET (dockable));
+      g_object_unref (dockable);
+    }
+}
+
+void
+dockable_detach_tab_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable = dockable_get_current (dockbook);
+
+  if (dockable)
+    gimp_dockable_detach (dockable);
+}
+
+void
+dockable_lock_tab_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable = dockable_get_current (dockbook);
+
+  if (dockable)
+    {
+      gboolean lock = g_variant_get_boolean (value);
+
+      gimp_dockable_set_locked (dockable, lock);
+    }
+}
+
+void
+dockable_toggle_view_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable;
+  GimpViewType  view_type;
+  gint          page_num;
+
+  view_type = (GimpViewType) g_variant_get_int32 (value);
+
+  page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+
+  dockable = (GimpDockable *)
+    gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
+
+  if (dockable)
+    {
+      GimpDialogFactoryEntry *entry;
+
+      gimp_dialog_factory_from_widget (GTK_WIDGET (dockable), &entry);
+
+      if (entry)
+        {
+          gchar *identifier;
+          gchar *substring = NULL;
+
+          identifier = g_strdup (entry->identifier);
+
+          substring = strstr (identifier, "grid");
+
+          if (substring && view_type == GIMP_VIEW_TYPE_GRID)
+            {
+              g_free (identifier);
+              return;
+            }
+
+          if (! substring)
+            {
+              substring = strstr (identifier, "list");
+
+              if (substring && view_type == GIMP_VIEW_TYPE_LIST)
+                {
+                  g_free (identifier);
+                  return;
+                }
+            }
+
+          if (substring)
+            {
+              GimpContainerView *old_view;
+              GtkWidget         *new_dockable;
+              GimpDock          *dock;
+              gint               view_size = -1;
+
+              if (view_type == GIMP_VIEW_TYPE_LIST)
+                memcpy (substring, "list", 4);
+              else if (view_type == GIMP_VIEW_TYPE_GRID)
+                memcpy (substring, "grid", 4);
+
+              old_view = gimp_container_view_get_by_dockable (dockable);
+
+              if (old_view)
+                view_size = gimp_container_view_get_view_size (old_view, NULL);
+
+              dock         = gimp_dockbook_get_dock (dockbook);
+              new_dockable = gimp_dialog_factory_dockable_new (gimp_dock_get_dialog_factory (dock),
+                                                               dock,
+                                                               identifier,
+                                                               view_size);
+
+              if (new_dockable)
+                {
+                  GimpDocked *old;
+                  GimpDocked *new;
+                  gboolean    show;
+
+                  gimp_dockable_set_locked (GIMP_DOCKABLE (new_dockable),
+                                            gimp_dockable_is_locked (dockable));
+
+                  old = GIMP_DOCKED (gtk_bin_get_child (GTK_BIN (dockable)));
+                  new = GIMP_DOCKED (gtk_bin_get_child (GTK_BIN (new_dockable)));
+
+                  show = gimp_docked_get_show_button_bar (old);
+                  gimp_docked_set_show_button_bar (new, show);
+
+                  /*  Maybe gimp_dialog_factory_dockable_new() returned
+                   *  an already existing singleton dockable, so check
+                   *  if it already is attached to a dockbook.
+                   */
+                  if (! gimp_dockable_get_dockbook (GIMP_DOCKABLE (new_dockable)))
+                    {
+                      gimp_dockbook_add (dockbook, GIMP_DOCKABLE (new_dockable),
+                                         page_num);
+
+                      g_object_ref (dockable);
+                      gimp_dockbook_remove (dockbook, dockable);
+                      gtk_widget_destroy (GTK_WIDGET (dockable));
+                      g_object_unref (dockable);
+
+                      gtk_notebook_set_current_page (GTK_NOTEBOOK (dockbook),
+                                                     page_num);
+                    }
+                }
+            }
+
+          g_free (identifier);
+        }
+    }
+}
+
+void
+dockable_view_size_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable = dockable_get_current (dockbook);
+  gint          view_size;
+
+  view_size = g_variant_get_int32 (value);
+
+  if (dockable)
+    {
+      GimpContainerView *view = gimp_container_view_get_by_dockable (dockable);
+
+      if (view)
+        {
+          gint old_size;
+          gint border_width;
+
+          old_size = gimp_container_view_get_view_size (view, &border_width);
+
+          if (old_size != view_size)
+            gimp_container_view_set_view_size (view, view_size, border_width);
+        }
+    }
+}
+
+void
+dockable_tab_style_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable = dockable_get_current (dockbook);
+  GimpTabStyle  tab_style;
+
+  tab_style = (GimpTabStyle) g_variant_get_int32 (value);
+
+  if (dockable && gimp_dockable_get_tab_style (dockable) != tab_style)
+    {
+      GtkWidget *tab_widget;
+
+      gimp_dockable_set_tab_style (dockable, tab_style);
+
+      tab_widget = gimp_dockbook_create_tab_widget (dockbook, dockable);
+
+      gtk_notebook_set_tab_label (GTK_NOTEBOOK (dockbook),
+                                  GTK_WIDGET (dockable),
+                                  tab_widget);
+    }
+}
+
+void
+dockable_show_button_bar_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+  GimpDockable *dockable = dockable_get_current (dockbook);
+
+  if (dockable)
+    {
+      GimpDocked *docked;
+      gboolean    show;
+
+      docked = GIMP_DOCKED (gtk_bin_get_child (GTK_BIN (dockable)));
+      show   = g_variant_get_boolean (value);
+
+      gimp_docked_set_show_button_bar (docked, show);
+    }
+}
+
+
+/*  private functions  */
+
+static GimpDockable *
+dockable_get_current (GimpDockbook *dockbook)
+{
+  gint page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+
+  return (GimpDockable *) gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook),
+                                                     page_num);
+}
diff --git a/app/actions/dockable-commands.h b/app/actions/dockable-commands.h
new file mode 100644
index 0000000..3ffb848
--- /dev/null
+++ b/app/actions/dockable-commands.h
@@ -0,0 +1,49 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCKABLE_COMMANDS_H__
+#define __DOCKABLE_COMMANDS_H__
+
+
+void   dockable_add_tab_cmd_callback         (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   dockable_close_tab_cmd_callback       (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   dockable_detach_tab_cmd_callback      (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   dockable_lock_tab_cmd_callback        (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+void   dockable_toggle_view_cmd_callback     (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   dockable_view_size_cmd_callback       (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   dockable_tab_style_cmd_callback       (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+void   dockable_show_button_bar_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data);
+
+
+#endif /* __DOCKABLE_COMMANDS_H__ */
diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c
new file mode 100644
index 0000000..80c0371
--- /dev/null
+++ b/app/actions/documents-actions.c
@@ -0,0 +1,143 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "documents-actions.h"
+#include "documents-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry documents_actions[] =
+{
+  { "documents-popup", GIMP_ICON_DOCUMENT_OPEN_RECENT,
+    NC_("documents-action", "Documents Menu"), NULL, NULL, NULL,
+    GIMP_HELP_DOCUMENT_DIALOG },
+
+  { "documents-open", GIMP_ICON_DOCUMENT_OPEN,
+    NC_("documents-action", "_Open Image"), NULL,
+    NC_("documents-action", "Open the selected entry"),
+    documents_open_cmd_callback,
+    GIMP_HELP_DOCUMENT_OPEN },
+
+  { "documents-raise-or-open", NULL,
+    NC_("documents-action", "_Raise or Open Image"), NULL,
+    NC_("documents-action", "Raise window if already open"),
+    documents_raise_or_open_cmd_callback,
+    GIMP_HELP_DOCUMENT_OPEN },
+
+  { "documents-file-open-dialog", NULL,
+    NC_("documents-action", "File Open _Dialog"), NULL,
+    NC_("documents-action", "Open image dialog"),
+    documents_file_open_dialog_cmd_callback,
+    GIMP_HELP_DOCUMENT_OPEN },
+
+  { "documents-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("documents-action", "Copy Image _Location"), NULL,
+    NC_("documents-action", "Copy image location to clipboard"),
+    documents_copy_location_cmd_callback,
+    GIMP_HELP_DOCUMENT_COPY_LOCATION },
+
+  { "documents-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("documents-action", "Show in _File Manager"), NULL,
+    NC_("documents-action", "Show image location in the file manager"),
+    documents_show_in_file_manager_cmd_callback,
+    GIMP_HELP_DOCUMENT_SHOW_IN_FILE_MANAGER },
+
+  { "documents-remove", GIMP_ICON_LIST_REMOVE,
+    NC_("documents-action", "Remove _Entry"), NULL,
+    NC_("documents-action", "Remove the selected entry"),
+    documents_remove_cmd_callback,
+    GIMP_HELP_DOCUMENT_REMOVE },
+
+  { "documents-clear", GIMP_ICON_SHRED,
+    NC_("documents-action", "_Clear History"), NULL,
+    NC_("documents-action", "Clear the entire document history"),
+    documents_clear_cmd_callback,
+    GIMP_HELP_DOCUMENT_CLEAR },
+
+  { "documents-recreate-preview", GIMP_ICON_VIEW_REFRESH,
+    NC_("documents-action", "Recreate _Preview"), NULL,
+    NC_("documents-action", "Recreate preview"),
+    documents_recreate_preview_cmd_callback,
+    GIMP_HELP_DOCUMENT_REFRESH },
+
+  { "documents-reload-previews", NULL,
+    NC_("documents-action", "Reload _all Previews"), NULL,
+    NC_("documents-action", "Reload all previews"),
+    documents_reload_previews_cmd_callback,
+    GIMP_HELP_DOCUMENT_REFRESH },
+
+  { "documents-remove-dangling", NULL,
+    NC_("documents-action", "Remove Dangling E_ntries"), NULL,
+    NC_("documents-action",
+        "Remove entries for which the corresponding file is not available"),
+    documents_remove_dangling_cmd_callback,
+    GIMP_HELP_DOCUMENT_REFRESH }
+};
+
+
+void
+documents_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "documents-action",
+                                 documents_actions,
+                                 G_N_ELEMENTS (documents_actions));
+}
+
+void
+documents_actions_update (GimpActionGroup *group,
+                          gpointer         data)
+{
+  GimpContext   *context;
+  GimpImagefile *imagefile = NULL;
+
+  context = action_data_get_context (data);
+
+  if (context)
+    imagefile = gimp_context_get_imagefile (context);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("documents-open",                 imagefile);
+  SET_SENSITIVE ("documents-raise-or-open",        imagefile);
+  SET_SENSITIVE ("documents-file-open-dialog",     TRUE);
+  SET_SENSITIVE ("documents-copy-location",        imagefile);
+  SET_SENSITIVE ("documents-show-in-file-manager", imagefile);
+  SET_SENSITIVE ("documents-remove",               imagefile);
+  SET_SENSITIVE ("documents-clear",                TRUE);
+  SET_SENSITIVE ("documents-recreate-preview",     imagefile);
+  SET_SENSITIVE ("documents-reload-previews",      imagefile);
+  SET_SENSITIVE ("documents-remove-dangling",      imagefile);
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/documents-actions.h b/app/actions/documents-actions.h
new file mode 100644
index 0000000..3d31f27
--- /dev/null
+++ b/app/actions/documents-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCUMENTS_ACTIONS_H__
+#define __DOCUMENTS_ACTIONS_H__
+
+
+void   documents_actions_setup  (GimpActionGroup *group);
+void   documents_actions_update (GimpActionGroup *group,
+                                 gpointer         data);
+
+
+#endif /* __DOCUMENTS_ACTIONS_H__ */
diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c
new file mode 100644
index 0000000..b85d065
--- /dev/null
+++ b/app/actions/documents-commands.c
@@ -0,0 +1,410 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpthumb/gimpthumb.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimagefile.h"
+
+#include "file/file-open.h"
+
+#include "widgets/gimpclipboard.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpcontainerview-utils.h"
+#include "widgets/gimpdocumentview.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplay-foreach.h"
+#include "display/gimpdisplayshell.h"
+
+#include "documents-commands.h"
+#include "file-commands.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  const gchar *name;
+  gboolean     found;
+} RaiseClosure;
+
+
+/*  local function prototypes  */
+
+static void   documents_open_image    (GtkWidget     *editor,
+                                       GimpContext   *context,
+                                       GimpImagefile *imagefile);
+static void   documents_raise_display (GimpDisplay   *display,
+                                       RaiseClosure  *closure);
+
+
+
+/*  public functions */
+
+void
+documents_open_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpContainer       *container;
+  GimpImagefile       *imagefile;
+
+  context   = gimp_container_view_get_context (editor->view);
+  container = gimp_container_view_get_container (editor->view);
+
+  imagefile = gimp_context_get_imagefile (context);
+
+  if (imagefile && gimp_container_have (container, GIMP_OBJECT (imagefile)))
+    {
+      documents_open_image (GTK_WIDGET (editor), context, imagefile);
+    }
+  else
+    {
+      file_file_open_dialog (context->gimp, NULL, GTK_WIDGET (editor));
+    }
+}
+
+void
+documents_raise_or_open_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpContainer       *container;
+  GimpImagefile       *imagefile;
+
+  context   = gimp_container_view_get_context (editor->view);
+  container = gimp_container_view_get_container (editor->view);
+
+  imagefile = gimp_context_get_imagefile (context);
+
+  if (imagefile && gimp_container_have (container, GIMP_OBJECT (imagefile)))
+    {
+      RaiseClosure closure;
+
+      closure.name  = gimp_object_get_name (imagefile);
+      closure.found = FALSE;
+
+      gimp_container_foreach (context->gimp->displays,
+                              (GFunc) documents_raise_display,
+                              &closure);
+
+      if (! closure.found)
+        documents_open_image (GTK_WIDGET (editor), context, imagefile);
+    }
+}
+
+void
+documents_file_open_dialog_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpContainer       *container;
+  GimpImagefile       *imagefile;
+
+  context   = gimp_container_view_get_context (editor->view);
+  container = gimp_container_view_get_container (editor->view);
+
+  imagefile = gimp_context_get_imagefile (context);
+
+  if (imagefile && gimp_container_have (container, GIMP_OBJECT (imagefile)))
+    {
+      file_file_open_dialog (context->gimp,
+                             gimp_imagefile_get_file (imagefile),
+                             GTK_WIDGET (editor));
+    }
+}
+
+void
+documents_copy_location_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpImagefile       *imagefile;
+
+  context   = gimp_container_view_get_context (editor->view);
+  imagefile = gimp_context_get_imagefile (context);
+
+  if (imagefile)
+    gimp_clipboard_set_text (context->gimp,
+                             gimp_object_get_name (imagefile));
+}
+
+void
+documents_show_in_file_manager_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpImagefile       *imagefile;
+
+  context   = gimp_container_view_get_context (editor->view);
+  imagefile = gimp_context_get_imagefile (context);
+
+  if (imagefile)
+    {
+      GFile  *file  = g_file_new_for_uri (gimp_object_get_name (imagefile));
+      GError *error = NULL;
+
+      if (! gimp_file_show_in_file_manager (file, &error))
+        {
+          gimp_message (context->gimp, G_OBJECT (editor),
+                        GIMP_MESSAGE_ERROR,
+                        _("Can't show file in file manager: %s"),
+                        error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (file);
+    }
+}
+
+void
+documents_remove_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpContainerEditor *editor  = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context = gimp_container_view_get_context (editor->view);
+  GimpImagefile       *imagefile = gimp_context_get_imagefile (context);
+  const gchar         *uri;
+
+  uri = gimp_object_get_name (imagefile);
+
+  gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri, NULL);
+
+  gimp_container_view_remove_active (editor->view);
+}
+
+void
+documents_clear_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpContainerEditor *editor  = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context = gimp_container_view_get_context (editor->view);
+  Gimp                *gimp    = context->gimp;
+  GtkWidget           *dialog;
+
+  dialog = gimp_message_dialog_new (_("Clear Document History"),
+                                    GIMP_ICON_SHRED,
+                                    GTK_WIDGET (editor),
+                                    GTK_DIALOG_MODAL |
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("Cl_ear"),  GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect_object (gtk_widget_get_toplevel (GTK_WIDGET (editor)),
+                           "unmap",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, G_CONNECT_SWAPPED);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Clear the Recent Documents list?"));
+
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("Clearing the document history will "
+                               "permanently remove all images from "
+                               "the recent documents list."));
+
+  if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      GtkRecentManager *manager = gtk_recent_manager_get_default ();
+      GList            *items;
+      GList            *list;
+
+      items = gtk_recent_manager_get_items (manager);
+
+      for (list = items; list; list = list->next)
+        {
+          GtkRecentInfo *info = list->data;
+
+          if (gtk_recent_info_has_application (info,
+                                               "GNU Image Manipulation Program"))
+            {
+              gtk_recent_manager_remove_item (manager,
+                                              gtk_recent_info_get_uri (info),
+                                              NULL);
+            }
+
+          gtk_recent_info_unref (info);
+        }
+
+      g_list_free (items);
+
+      gimp_container_clear (gimp->documents);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+void
+documents_recreate_preview_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpContainer       *container;
+  GimpImagefile       *imagefile;
+
+  context   = gimp_container_view_get_context (editor->view);
+  container = gimp_container_view_get_container (editor->view);
+
+  imagefile = gimp_context_get_imagefile (context);
+
+  if (imagefile && gimp_container_have (container, GIMP_OBJECT (imagefile)))
+    {
+      GError *error = NULL;
+
+      if (! gimp_imagefile_create_thumbnail (imagefile,
+                                             context, NULL,
+                                             context->gimp->config->thumbnail_size,
+                                             FALSE, &error))
+        {
+          gimp_message_literal (context->gimp,
+                                NULL , GIMP_MESSAGE_ERROR,
+                                error->message);
+          g_clear_error (&error);
+        }
+    }
+}
+
+void
+documents_reload_previews_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+
+  container = gimp_container_view_get_container (editor->view);
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_imagefile_update,
+                          editor->view);
+}
+
+static void
+documents_remove_dangling_foreach (GimpImagefile *imagefile,
+                                   GimpContainer *container)
+{
+  GimpThumbnail *thumbnail = gimp_imagefile_get_thumbnail (imagefile);
+
+  if (gimp_thumbnail_peek_image (thumbnail) == GIMP_THUMB_STATE_NOT_FOUND)
+    {
+      const gchar *uri = gimp_object_get_name (imagefile);
+
+      gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri,
+                                      NULL);
+
+      gimp_container_remove (container, GIMP_OBJECT (imagefile));
+    }
+}
+
+void
+documents_remove_dangling_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+
+  container = gimp_container_view_get_container (editor->view);
+
+  gimp_container_foreach (container,
+                          (GFunc) documents_remove_dangling_foreach,
+                          container);
+}
+
+
+/*  private functions  */
+
+static void
+documents_open_image (GtkWidget     *editor,
+                      GimpContext   *context,
+                      GimpImagefile *imagefile)
+{
+  GFile              *file;
+  GimpImage          *image;
+  GimpPDBStatusType   status;
+  GError             *error = NULL;
+
+  file = gimp_imagefile_get_file (imagefile);
+
+  image = file_open_with_display (context->gimp, context, NULL, file, FALSE,
+                                  G_OBJECT (gtk_widget_get_screen (editor)),
+                                  gimp_widget_get_monitor (editor),
+                                  &status, &error);
+
+  if (! image && status != GIMP_PDB_CANCEL)
+    {
+      gimp_message (context->gimp, G_OBJECT (editor), GIMP_MESSAGE_ERROR,
+                    _("Opening '%s' failed:\n\n%s"),
+                    gimp_file_get_utf8_name (file), error->message);
+      g_clear_error (&error);
+    }
+}
+
+static void
+documents_raise_display (GimpDisplay  *display,
+                         RaiseClosure *closure)
+{
+  const gchar *uri = gimp_object_get_name (gimp_display_get_image (display));
+
+  if (! g_strcmp0 (closure->name, uri))
+    {
+      closure->found = TRUE;
+      gimp_display_shell_present (gimp_display_get_shell (display));
+    }
+}
diff --git a/app/actions/documents-commands.h b/app/actions/documents-commands.h
new file mode 100644
index 0000000..6db47c5
--- /dev/null
+++ b/app/actions/documents-commands.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCUMENTS_COMMANDS_H__
+#define __DOCUMENTS_COMMANDS_H__
+
+
+void   documents_open_cmd_callback                 (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_raise_or_open_cmd_callback        (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_file_open_dialog_cmd_callback     (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_copy_location_cmd_callback        (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_show_in_file_manager_cmd_callback (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_remove_cmd_callback               (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_clear_cmd_callback                (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_recreate_preview_cmd_callback     (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_reload_previews_cmd_callback      (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   documents_remove_dangling_cmd_callback      (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+
+#endif /* __DOCUMENTS_COMMANDS_H__ */
diff --git a/app/actions/drawable-actions.c b/app/actions/drawable-actions.c
new file mode 100644
index 0000000..a4b6233
--- /dev/null
+++ b/app/actions/drawable-actions.c
@@ -0,0 +1,231 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayermask.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "drawable-actions.h"
+#include "drawable-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry drawable_actions[] =
+{
+  { "drawable-equalize", NULL,
+    NC_("drawable-action", "_Equalize"), NULL,
+    NC_("drawable-action", "Automatic contrast enhancement"),
+    drawable_equalize_cmd_callback,
+    GIMP_HELP_LAYER_EQUALIZE },
+
+  { "drawable-levels-stretch", NULL,
+    NC_("drawable-action", "_White Balance"), NULL,
+    NC_("drawable-action", "Automatic white balance correction"),
+    drawable_levels_stretch_cmd_callback,
+    GIMP_HELP_LAYER_WHITE_BALANCE }
+};
+
+static const GimpToggleActionEntry drawable_toggle_actions[] =
+{
+  { "drawable-visible", GIMP_ICON_VISIBLE,
+    NC_("drawable-action", "Toggle Drawable _Visibility"), NULL, NULL,
+    drawable_visible_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_VISIBLE },
+
+  { "drawable-linked", GIMP_ICON_LINKED,
+    NC_("drawable-action", "Toggle Drawable _Linked State"), NULL, NULL,
+    drawable_linked_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LINKED },
+
+  { "drawable-lock-content", NULL /* GIMP_ICON_LOCK */,
+    NC_("drawable-action", "L_ock Pixels of Drawable"), NULL,
+    NC_("drawable-action",
+        "Keep the pixels on this drawable from being modified"),
+    drawable_lock_content_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LOCK_PIXELS },
+
+  { "drawable-lock-position", GIMP_ICON_TOOL_MOVE,
+    NC_("drawable-action", "L_ock Position of Drawable"), NULL,
+    NC_("drawable-action",
+        "Keep the position on this drawable from being modified"),
+    drawable_lock_position_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LOCK_POSITION },
+};
+
+static const GimpEnumActionEntry drawable_flip_actions[] =
+{
+  { "drawable-flip-horizontal", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
+    NC_("drawable-action", "Flip _Horizontally"), NULL,
+    NC_("drawable-action", "Flip drawable horizontally"),
+    GIMP_ORIENTATION_HORIZONTAL, FALSE,
+    GIMP_HELP_LAYER_FLIP_HORIZONTAL },
+
+  { "drawable-flip-vertical", GIMP_ICON_OBJECT_FLIP_VERTICAL,
+    NC_("drawable-action", "Flip _Vertically"), NULL,
+    NC_("drawable-action", "Flip drawable vertically"),
+    GIMP_ORIENTATION_VERTICAL, FALSE,
+    GIMP_HELP_LAYER_FLIP_VERTICAL }
+};
+
+static const GimpEnumActionEntry drawable_rotate_actions[] =
+{
+  { "drawable-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
+    NC_("drawable-action", "Rotate 90° _clockwise"), NULL,
+    NC_("drawable-action", "Rotate drawable 90 degrees to the right"),
+    GIMP_ROTATE_90, FALSE,
+    GIMP_HELP_LAYER_ROTATE_90 },
+
+  { "drawable-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
+    NC_("drawable-action", "Rotate _180°"), NULL,
+    NC_("drawable-action", "Turn drawable upside-down"),
+    GIMP_ROTATE_180, FALSE,
+    GIMP_HELP_LAYER_ROTATE_180 },
+
+  { "drawable-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
+    NC_("drawable-action", "Rotate 90° counter-clock_wise"), NULL,
+    NC_("drawable-action", "Rotate drawable 90 degrees to the left"),
+    GIMP_ROTATE_270, FALSE,
+    GIMP_HELP_LAYER_ROTATE_270 }
+};
+
+
+void
+drawable_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "drawable-action",
+                                 drawable_actions,
+                                 G_N_ELEMENTS (drawable_actions));
+
+  gimp_action_group_add_toggle_actions (group, "drawable-action",
+                                        drawable_toggle_actions,
+                                        G_N_ELEMENTS (drawable_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "drawable-action",
+                                      drawable_flip_actions,
+                                      G_N_ELEMENTS (drawable_flip_actions),
+                                      drawable_flip_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "drawable-action",
+                                      drawable_rotate_actions,
+                                      G_N_ELEMENTS (drawable_rotate_actions),
+                                      drawable_rotate_cmd_callback);
+
+#define SET_ALWAYS_SHOW_IMAGE(action,show) \
+        gimp_action_group_set_action_always_show_image (group, action, show)
+
+  SET_ALWAYS_SHOW_IMAGE ("drawable-rotate-90",  TRUE);
+  SET_ALWAYS_SHOW_IMAGE ("drawable-rotate-180", TRUE);
+  SET_ALWAYS_SHOW_IMAGE ("drawable-rotate-270", TRUE);
+
+#undef SET_ALWAYS_SHOW_IMAGE
+}
+
+void
+drawable_actions_update (GimpActionGroup *group,
+                         gpointer         data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable     = NULL;
+  gboolean      is_rgb       = FALSE;
+  gboolean      visible      = FALSE;
+  gboolean      linked       = FALSE;
+  gboolean      locked       = FALSE;
+  gboolean      can_lock     = FALSE;
+  gboolean      locked_pos   = FALSE;
+  gboolean      can_lock_pos = FALSE;
+  gboolean      writable     = FALSE;
+  gboolean      movable      = FALSE;
+  gboolean      children     = FALSE;
+
+  image = action_data_get_image (data);
+
+  if (image)
+    {
+      drawable = gimp_image_get_active_drawable (image);
+
+      if (drawable)
+        {
+          GimpItem *item;
+
+          is_rgb = gimp_drawable_is_rgb (drawable);
+
+          if (GIMP_IS_LAYER_MASK (drawable))
+            item = GIMP_ITEM (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+          else
+            item = GIMP_ITEM (drawable);
+
+          visible       = gimp_item_get_visible (item);
+          linked        = gimp_item_get_linked (item);
+          locked        = gimp_item_get_lock_content (item);
+          can_lock      = gimp_item_can_lock_content (item);
+          writable      = ! gimp_item_is_content_locked (item);
+          locked_pos    = gimp_item_get_lock_position (item);
+          can_lock_pos  = gimp_item_can_lock_position (item);
+          movable       = ! gimp_item_is_position_locked (item);
+
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+            children = TRUE;
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("drawable-equalize",       writable && !children);
+  SET_SENSITIVE ("drawable-levels-stretch", writable && !children && is_rgb);
+
+  SET_SENSITIVE ("drawable-visible",       drawable);
+  SET_SENSITIVE ("drawable-linked",        drawable);
+  SET_SENSITIVE ("drawable-lock-content",  can_lock);
+  SET_SENSITIVE ("drawable-lock-position", can_lock_pos);
+
+  SET_ACTIVE ("drawable-visible",       visible);
+  SET_ACTIVE ("drawable-linked",        linked);
+  SET_ACTIVE ("drawable-lock-content",  locked);
+  SET_ACTIVE ("drawable-lock-position", locked_pos);
+
+  SET_SENSITIVE ("drawable-flip-horizontal", writable && movable);
+  SET_SENSITIVE ("drawable-flip-vertical",   writable && movable);
+
+  SET_SENSITIVE ("drawable-rotate-90",  writable && movable);
+  SET_SENSITIVE ("drawable-rotate-180", writable && movable);
+  SET_SENSITIVE ("drawable-rotate-270", writable && movable);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+}
diff --git a/app/actions/drawable-actions.h b/app/actions/drawable-actions.h
new file mode 100644
index 0000000..1b6e38c
--- /dev/null
+++ b/app/actions/drawable-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DRAWABLE_ACTIONS_H__
+#define __DRAWABLE_ACTIONS_H__
+
+
+void   drawable_actions_setup  (GimpActionGroup *group);
+void   drawable_actions_update (GimpActionGroup *group,
+                                gpointer         data);
+
+
+#endif /* __DRAWABLE_ACTIONS_H__ */
diff --git a/app/actions/drawable-commands.c b/app/actions/drawable-commands.c
new file mode 100644
index 0000000..7ea70e8
--- /dev/null
+++ b/app/actions/drawable-commands.c
@@ -0,0 +1,304 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable-equalize.h"
+#include "core/gimpdrawable-levels.h"
+#include "core/gimpdrawable-operation.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpitem-linked.h"
+#include "core/gimpitemundo.h"
+#include "core/gimplayermask.h"
+#include "core/gimpprogress.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "drawable-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+drawable_equalize_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  return_if_no_drawable (image, drawable, data);
+
+  gimp_drawable_equalize (drawable, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+drawable_levels_stretch_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  GimpDisplay  *display;
+  GtkWidget    *widget;
+  return_if_no_drawable (image, drawable, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  if (! gimp_drawable_is_rgb (drawable))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("White Balance operates only on RGB color "
+                              "layers."));
+      return;
+    }
+
+  gimp_drawable_levels_stretch (drawable, GIMP_PROGRESS (display));
+  gimp_image_flush (image);
+}
+
+void
+drawable_linked_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  gboolean      linked;
+  return_if_no_drawable (image, drawable, data);
+
+  linked = g_variant_get_boolean (value);
+
+  if (GIMP_IS_LAYER_MASK (drawable))
+    drawable =
+      GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+
+  if (linked != gimp_item_get_linked (GIMP_ITEM (drawable)))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_LINKED);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable))
+        push_undo = FALSE;
+
+      gimp_item_set_linked (GIMP_ITEM (drawable), linked, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+drawable_visible_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  gboolean      visible;
+  return_if_no_drawable (image, drawable, data);
+
+  visible = g_variant_get_boolean (value);
+
+  if (GIMP_IS_LAYER_MASK (drawable))
+    drawable =
+      GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+
+  if (visible != gimp_item_get_visible (GIMP_ITEM (drawable)))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_VISIBILITY);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable))
+        push_undo = FALSE;
+
+      gimp_item_set_visible (GIMP_ITEM (drawable), visible, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+drawable_lock_content_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  gboolean      locked;
+  return_if_no_drawable (image, drawable, data);
+
+  locked = g_variant_get_boolean (value);
+
+  if (GIMP_IS_LAYER_MASK (drawable))
+    drawable =
+      GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+
+  if (locked != gimp_item_get_lock_content (GIMP_ITEM (drawable)))
+    {
+#if 0
+      GimpUndo *undo;
+#endif
+      gboolean  push_undo = TRUE;
+
+#if 0
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_VISIBILITY);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable))
+        push_undo = FALSE;
+#endif
+
+      gimp_item_set_lock_content (GIMP_ITEM (drawable), locked, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+drawable_lock_position_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  gboolean      locked;
+  return_if_no_drawable (image, drawable, data);
+
+  locked = g_variant_get_boolean (value);
+
+  if (GIMP_IS_LAYER_MASK (drawable))
+    drawable =
+      GIMP_DRAWABLE (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+
+  if (locked != gimp_item_get_lock_position (GIMP_ITEM (drawable)))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_LOCK_POSITION);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (drawable))
+        push_undo = FALSE;
+
+      gimp_item_set_lock_position (GIMP_ITEM (drawable), locked, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+drawable_flip_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage           *image;
+  GimpDrawable        *drawable;
+  GimpItem            *item;
+  GimpContext         *context;
+  gint                 off_x, off_y;
+  gdouble              axis = 0.0;
+  GimpOrientationType  orientation;
+  return_if_no_drawable (image, drawable, data);
+  return_if_no_context (context, data);
+
+  orientation = (GimpOrientationType) g_variant_get_int32 (value);
+
+  item = GIMP_ITEM (drawable);
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  switch (orientation)
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      axis = ((gdouble) off_x + (gdouble) gimp_item_get_width (item) / 2.0);
+      break;
+
+    case GIMP_ORIENTATION_VERTICAL:
+      axis = ((gdouble) off_y + (gdouble) gimp_item_get_height (item) / 2.0);
+      break;
+
+    default:
+      break;
+    }
+
+  if (gimp_item_get_linked (item))
+    {
+      gimp_item_linked_flip (item, context, orientation, axis, FALSE);
+    }
+  else
+    {
+      gimp_item_flip (item, context, orientation, axis,
+                      gimp_item_get_clip (item, FALSE));
+    }
+
+  gimp_image_flush (image);
+}
+
+void
+drawable_rotate_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage        *image;
+  GimpDrawable     *drawable;
+  GimpContext      *context;
+  GimpItem         *item;
+  gint              off_x, off_y;
+  gdouble           center_x, center_y;
+  GimpRotationType  rotation_type;
+  return_if_no_drawable (image, drawable, data);
+  return_if_no_context (context, data);
+
+  rotation_type = (GimpRotationType) g_variant_get_int32 (value);
+
+  item = GIMP_ITEM (drawable);
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  center_x = ((gdouble) off_x + (gdouble) gimp_item_get_width  (item) / 2.0);
+  center_y = ((gdouble) off_y + (gdouble) gimp_item_get_height (item) / 2.0);
+
+  if (gimp_item_get_linked (item))
+    {
+      gimp_item_linked_rotate (item, context, rotation_type,
+                               center_x, center_y, FALSE);
+    }
+  else
+    {
+      gimp_item_rotate (item, context,
+                        rotation_type, center_x, center_y,
+                        gimp_item_get_clip (item, FALSE));
+    }
+
+  gimp_image_flush (image);
+}
diff --git a/app/actions/drawable-commands.h b/app/actions/drawable-commands.h
new file mode 100644
index 0000000..1f8ae79
--- /dev/null
+++ b/app/actions/drawable-commands.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DRAWABLE_COMMANDS_H__
+#define __DRAWABLE_COMMANDS_H__
+
+
+void   drawable_equalize_cmd_callback       (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   drawable_levels_stretch_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   drawable_linked_cmd_callback         (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   drawable_visible_cmd_callback        (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   drawable_lock_content_cmd_callback   (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   drawable_lock_position_cmd_callback  (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   drawable_flip_cmd_callback           (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   drawable_rotate_cmd_callback         (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+
+#endif /* __DRAWABLE_COMMANDS_H__ */
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
new file mode 100644
index 0000000..ce6b005
--- /dev/null
+++ b/app/actions/dynamics-actions.c
@@ -0,0 +1,137 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "dynamics-actions.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry dynamics_actions[] =
+{
+  { "dynamics-popup", GIMP_ICON_DYNAMICS,
+    NC_("dynamics-action", "Paint Dynamics Menu"), NULL, NULL, NULL,
+    GIMP_HELP_DYNAMICS_DIALOG },
+
+  { "dynamics-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("dynamics-action", "_New Dynamics"), NULL,
+    NC_("dynamics-action", "Create a new dynamics"),
+    data_new_cmd_callback,
+    GIMP_HELP_DYNAMICS_NEW },
+
+  { "dynamics-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("dynamics-action", "D_uplicate Dynamics"), NULL,
+    NC_("dynamics-action", "Duplicate this dynamics"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_DYNAMICS_DUPLICATE },
+
+  { "dynamics-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("dynamics-action", "Copy Dynamics _Location"), NULL,
+    NC_("dynamics-action", "Copy dynamics file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_DYNAMICS_COPY_LOCATION },
+
+  { "dynamics-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("dynamics-action", "Show in _File Manager"), NULL,
+    NC_("dynamics-action", "Show dynamics file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_DYNAMICS_SHOW_IN_FILE_MANAGER },
+
+  { "dynamics-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("dynamics-action", "_Delete Dynamics"), NULL,
+    NC_("dynamics-action", "Delete this dynamics"),
+    data_delete_cmd_callback,
+    GIMP_HELP_DYNAMICS_DELETE },
+
+  { "dynamics-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("dynamics-action", "_Refresh Dynamics"), NULL,
+    NC_("dynamics-action", "Refresh dynamics"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_DYNAMICS_REFRESH }
+};
+
+static const GimpStringActionEntry dynamics_edit_actions[] =
+{
+  { "dynamics-edit", GIMP_ICON_EDIT,
+    NC_("dynamics-action", "_Edit Dynamics..."), NULL,
+    NC_("dynamics-action", "Edit this dynamics"),
+    "gimp-dynamics-editor",
+    GIMP_HELP_DYNAMICS_EDIT }
+};
+
+
+void
+dynamics_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "dynamics-action",
+                                 dynamics_actions,
+                                 G_N_ELEMENTS (dynamics_actions));
+
+  gimp_action_group_add_string_actions (group, "dynamics-action",
+                                        dynamics_edit_actions,
+                                        G_N_ELEMENTS (dynamics_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+dynamics_actions_update (GimpActionGroup *group,
+                         gpointer         user_data)
+{
+  GimpContext  *context  = action_data_get_context (user_data);
+  GimpDynamics *dynamics = NULL;
+  GimpData     *data     = NULL;
+  GFile        *file     = NULL;
+
+  if (context)
+    {
+      dynamics = gimp_context_get_dynamics (context);
+
+      if (dynamics)
+        {
+          data = GIMP_DATA (dynamics);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("dynamics-edit",                 dynamics);
+  SET_SENSITIVE ("dynamics-duplicate",            dynamics && gimp_data_is_duplicatable (data));
+  SET_SENSITIVE ("dynamics-copy-location",        file);
+  SET_SENSITIVE ("dynamics-show-in-file-manager", file);
+  SET_SENSITIVE ("dynamics-delete",               dynamics && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/dynamics-actions.h b/app/actions/dynamics-actions.h
new file mode 100644
index 0000000..515f6b3
--- /dev/null
+++ b/app/actions/dynamics-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DYNAMICS_ACTIONS_H__
+#define __DYNAMICS_ACTIONS_H__
+
+
+void   dynamics_actions_setup  (GimpActionGroup *group);
+void   dynamics_actions_update (GimpActionGroup *group,
+                                gpointer         user_data);
+
+
+#endif /* __DYNAMICS_ACTIONS_H__ */
diff --git a/app/actions/dynamics-editor-actions.c b/app/actions/dynamics-editor-actions.c
new file mode 100644
index 0000000..0b38d3c
--- /dev/null
+++ b/app/actions/dynamics-editor-actions.c
@@ -0,0 +1,89 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdataeditor.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "data-editor-commands.h"
+#include "dynamics-editor-actions.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry dynamics_editor_actions[] =
+{
+  { "dynamics-editor-popup", GIMP_ICON_DYNAMICS,
+    NC_("dynamics-editor-action", "Paint Dynamics Editor Menu"), NULL, NULL, NULL,
+    GIMP_HELP_BRUSH_EDITOR_DIALOG }
+};
+
+
+static const GimpToggleActionEntry dynamics_editor_toggle_actions[] =
+{
+  { "dynamics-editor-edit-active", GIMP_ICON_LINKED,
+    NC_("dynamics-editor-action", "Edit Active Dynamics"), NULL, NULL,
+    data_editor_edit_active_cmd_callback,
+    FALSE,
+    GIMP_HELP_BRUSH_EDITOR_EDIT_ACTIVE }
+};
+
+
+void
+dynamics_editor_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "dynamics-editor-action",
+                                 dynamics_editor_actions,
+                                 G_N_ELEMENTS (dynamics_editor_actions));
+
+  gimp_action_group_add_toggle_actions (group, "dynamics-editor-action",
+                                        dynamics_editor_toggle_actions,
+                                        G_N_ELEMENTS (dynamics_editor_toggle_actions));
+
+}
+
+void
+dynamics_editor_actions_update (GimpActionGroup *group,
+                                gpointer         user_data)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (user_data);
+  gboolean        edit_active = FALSE;
+
+  edit_active = gimp_data_editor_get_edit_active (data_editor);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_ACTIVE ("dynamics-editor-edit-active", edit_active);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+}
diff --git a/app/actions/dynamics-editor-actions.h b/app/actions/dynamics-editor-actions.h
new file mode 100644
index 0000000..2f79c6d
--- /dev/null
+++ b/app/actions/dynamics-editor-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DYNAMICS_EDITOR_ACTIONS_H__
+#define __DYNAMICS_EDITOR_ACTIONS_H__
+
+
+void   dynamics_editor_actions_setup  (GimpActionGroup *group);
+void   dynamics_editor_actions_update (GimpActionGroup *group,
+                                       gpointer         data);
+
+
+#endif /* __DYNAMICS_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
new file mode 100644
index 0000000..caf28b7
--- /dev/null
+++ b/app/actions/edit-actions.c
@@ -0,0 +1,417 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer.h"
+#include "core/gimplist.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpundostack.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "tools/tool_manager.h"
+
+#include "actions.h"
+#include "edit-actions.h"
+#include "edit-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   edit_actions_foreground_changed (GimpContext     *context,
+                                               const GimpRGB   *color,
+                                               GimpActionGroup *group);
+static void   edit_actions_background_changed (GimpContext     *context,
+                                               const GimpRGB   *color,
+                                               GimpActionGroup *group);
+static void   edit_actions_pattern_changed    (GimpContext     *context,
+                                               GimpPattern     *pattern,
+                                               GimpActionGroup *group);
+
+
+static const GimpActionEntry edit_actions[] =
+{
+  { "edit-menu",          NULL, NC_("edit-action", "_Edit")     },
+  { "edit-paste-as-menu", NULL, NC_("edit-action", "Paste _as") },
+  { "edit-buffer-menu",   NULL, NC_("edit-action", "_Buffer")   },
+
+  { "undo-popup",
+    "edit-undo", NC_("edit-action", "Undo History Menu"), NULL, NULL, NULL,
+    GIMP_HELP_UNDO_DIALOG },
+
+  { "edit-undo", GIMP_ICON_EDIT_UNDO,
+    NC_("edit-action", "_Undo"), "<primary>Z",
+    NC_("edit-action", "Undo the last operation"),
+    edit_undo_cmd_callback,
+    GIMP_HELP_EDIT_UNDO },
+
+  { "edit-redo", GIMP_ICON_EDIT_REDO,
+    NC_("edit-action", "_Redo"), "<primary>Y",
+    NC_("edit-action", "Redo the last operation that was undone"),
+    edit_redo_cmd_callback,
+    GIMP_HELP_EDIT_REDO },
+
+  { "edit-strong-undo", GIMP_ICON_EDIT_UNDO,
+    NC_("edit-action", "Strong Undo"), "<primary><shift>Z",
+    NC_("edit-action", "Undo the last operation, skipping visibility changes"),
+    edit_strong_undo_cmd_callback,
+    GIMP_HELP_EDIT_STRONG_UNDO },
+
+  { "edit-strong-redo", GIMP_ICON_EDIT_REDO,
+    NC_("edit-action", "Strong Redo"), "<primary><shift>Y",
+    NC_("edit-action",
+        "Redo the last operation that was undone, skipping visibility changes"),
+    edit_strong_redo_cmd_callback,
+    GIMP_HELP_EDIT_STRONG_REDO },
+
+  { "edit-undo-clear", GIMP_ICON_SHRED,
+    NC_("edit-action", "_Clear Undo History"), NULL,
+    NC_("edit-action", "Remove all operations from the undo history"),
+    edit_undo_clear_cmd_callback,
+    GIMP_HELP_EDIT_UNDO_CLEAR },
+
+  { "edit-cut", GIMP_ICON_EDIT_CUT,
+    NC_("edit-action", "Cu_t"), "<primary>X",
+    NC_("edit-action", "Move the selected pixels to the clipboard"),
+    edit_cut_cmd_callback,
+    GIMP_HELP_EDIT_CUT },
+
+  { "edit-copy", GIMP_ICON_EDIT_COPY,
+    NC_("edit-action", "_Copy"), "<primary>C",
+    NC_("edit-action", "Copy the selected pixels to the clipboard"),
+    edit_copy_cmd_callback,
+    GIMP_HELP_EDIT_COPY },
+
+  { "edit-copy-visible", NULL, /* GIMP_ICON_COPY_VISIBLE, */
+    NC_("edit-action", "Copy _Visible"), "<primary><shift>C",
+    NC_("edit-action", "Copy what is visible in the selected region"),
+    edit_copy_visible_cmd_callback,
+    GIMP_HELP_EDIT_COPY_VISIBLE },
+
+  { "edit-paste-as-new-image", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("edit-action", "From _Clipboard"), "<primary><shift>V",
+    NC_("edit-action", "Create a new image from the content of the clipboard"),
+    edit_paste_as_new_image_cmd_callback,
+    GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
+
+  { "edit-paste-as-new-image-short", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("edit-action", "_New Image"), NULL,
+    NC_("edit-action", "Create a new image from the content of the clipboard"),
+    edit_paste_as_new_image_cmd_callback,
+    GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
+
+  { "edit-named-cut", GIMP_ICON_EDIT_CUT,
+    NC_("edit-action", "Cu_t Named..."), NULL,
+    NC_("edit-action", "Move the selected pixels to a named buffer"),
+    edit_named_cut_cmd_callback,
+    GIMP_HELP_BUFFER_CUT },
+
+  { "edit-named-copy", GIMP_ICON_EDIT_COPY,
+    NC_("edit-action", "_Copy Named..."), NULL,
+    NC_("edit-action", "Copy the selected pixels to a named buffer"),
+    edit_named_copy_cmd_callback,
+    GIMP_HELP_BUFFER_COPY },
+
+  { "edit-named-copy-visible", NULL, /* GIMP_ICON_COPY_VISIBLE, */
+    NC_("edit-action", "Copy _Visible Named..."), "",
+    NC_("edit-action",
+        "Copy what is visible in the selected region to a named buffer"),
+    edit_named_copy_visible_cmd_callback,
+    GIMP_HELP_BUFFER_COPY },
+
+  { "edit-named-paste", GIMP_ICON_EDIT_PASTE,
+    NC_("edit-action", "_Paste Named..."), NULL,
+    NC_("edit-action", "Paste the content of a named buffer"),
+    edit_named_paste_cmd_callback,
+    GIMP_HELP_BUFFER_PASTE },
+
+  { "edit-clear", GIMP_ICON_EDIT_CLEAR,
+    NC_("edit-action", "Cl_ear"), "Delete",
+    NC_("edit-action", "Clear the selected pixels"),
+    edit_clear_cmd_callback,
+    GIMP_HELP_EDIT_CLEAR }
+};
+
+static const GimpEnumActionEntry edit_paste_actions[] =
+{
+  { "edit-paste", GIMP_ICON_EDIT_PASTE,
+    NC_("edit-action", "_Paste"), "<primary>V",
+    NC_("edit-action", "Paste the content of the clipboard"),
+    GIMP_PASTE_TYPE_FLOATING, FALSE,
+    GIMP_HELP_EDIT_PASTE },
+
+  { "edit-paste-in-place", GIMP_ICON_EDIT_PASTE,
+    NC_("edit-action", "Paste In P_lace"), "<primary><alt>V",
+    NC_("edit-action",
+        "Paste the content of the clipboard at its original position"),
+    GIMP_PASTE_TYPE_FLOATING_IN_PLACE, FALSE,
+    GIMP_HELP_EDIT_PASTE_IN_PLACE },
+
+  { "edit-paste-into", GIMP_ICON_EDIT_PASTE_INTO,
+    NC_("edit-action", "Paste _Into Selection"), NULL,
+    NC_("edit-action",
+        "Paste the content of the clipboard into the current selection"),
+    GIMP_PASTE_TYPE_FLOATING_INTO, FALSE,
+    GIMP_HELP_EDIT_PASTE_INTO },
+
+  { "edit-paste-into-in-place", GIMP_ICON_EDIT_PASTE_INTO,
+    NC_("edit-action", "Paste Int_o Selection In Place"), NULL,
+    NC_("edit-action",
+        "Paste the content of the clipboard into the current selection "
+        "at its original position"),
+    GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE, FALSE,
+    GIMP_HELP_EDIT_PASTE_INTO_IN_PLACE },
+
+  { "edit-paste-as-new-layer", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("edit-action", "New _Layer"), NULL,
+    NC_("edit-action", "Create a new layer from the content of the clipboard"),
+    GIMP_PASTE_TYPE_NEW_LAYER, FALSE,
+    GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER },
+
+  { "edit-paste-as-new-layer-in-place", GIMP_ICON_EDIT_PASTE_AS_NEW,
+    NC_("edit-action", "New Layer In _Place"), NULL,
+    NC_("edit-action",
+        "Create a new layer from the content of the clipboard "
+        "and place it at its original position"),
+    GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE, FALSE,
+    GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER_IN_PLACE }
+};
+
+static const GimpEnumActionEntry edit_fill_actions[] =
+{
+  { "edit-fill-fg", GIMP_ICON_TOOL_BUCKET_FILL,
+    NC_("edit-action", "Fill with _FG Color"), "<primary>comma",
+    NC_("edit-action", "Fill the selection using the foreground color"),
+    GIMP_FILL_FOREGROUND, FALSE,
+    GIMP_HELP_EDIT_FILL_FG },
+
+  { "edit-fill-bg", GIMP_ICON_TOOL_BUCKET_FILL,
+    NC_("edit-action", "Fill with B_G Color"), "<primary>period",
+    NC_("edit-action", "Fill the selection using the background color"),
+    GIMP_FILL_BACKGROUND, FALSE,
+    GIMP_HELP_EDIT_FILL_BG },
+
+  { "edit-fill-pattern", GIMP_ICON_PATTERN,
+    NC_("edit-action", "Fill _with Pattern"), "<primary>semicolon",
+    NC_("edit-action", "Fill the selection using the active pattern"),
+    GIMP_FILL_PATTERN, FALSE,
+    GIMP_HELP_EDIT_FILL_PATTERN }
+};
+
+
+void
+edit_actions_setup (GimpActionGroup *group)
+{
+  GimpContext *context = gimp_get_user_context (group->gimp);
+  GimpRGB      color;
+  GimpPattern *pattern;
+  GimpAction  *action;
+
+  gimp_action_group_add_actions (group, "edit-action",
+                                 edit_actions,
+                                 G_N_ELEMENTS (edit_actions));
+
+  gimp_action_group_add_enum_actions (group, "edit-action",
+                                      edit_paste_actions,
+                                      G_N_ELEMENTS (edit_paste_actions),
+                                      edit_paste_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "edit-action",
+                                      edit_fill_actions,
+                                      G_N_ELEMENTS (edit_fill_actions),
+                                      edit_fill_cmd_callback);
+
+  action = gimp_action_group_get_action (group,
+                                         "edit-paste-as-new-image-short");
+  gimp_action_set_accel_path (action,
+                              "<Actions>/edit/edit-paste-as-new-image");
+
+  gimp_action_group_set_action_context (group, "edit-fill-fg", context);
+  gimp_action_group_set_action_context (group, "edit-fill-bg", context);
+  gimp_action_group_set_action_context (group, "edit-fill-pattern", context);
+
+  g_signal_connect_object (context, "foreground-changed",
+                           G_CALLBACK (edit_actions_foreground_changed),
+                           group, 0);
+  g_signal_connect_object (context, "background-changed",
+                           G_CALLBACK (edit_actions_background_changed),
+                           group, 0);
+  g_signal_connect_object (context, "pattern-changed",
+                           G_CALLBACK (edit_actions_pattern_changed),
+                           group, 0);
+
+  gimp_context_get_foreground (context, &color);
+  edit_actions_foreground_changed (context, &color, group);
+
+  gimp_context_get_background (context, &color);
+  edit_actions_background_changed (context, &color, group);
+
+  pattern = gimp_context_get_pattern (context);
+  edit_actions_pattern_changed (context, pattern, group);
+
+#define SET_ALWAYS_SHOW_IMAGE(action,show) \
+        gimp_action_group_set_action_always_show_image (group, action, show)
+
+  SET_ALWAYS_SHOW_IMAGE ("edit-fill-fg",      TRUE);
+  SET_ALWAYS_SHOW_IMAGE ("edit-fill-bg",      TRUE);
+  SET_ALWAYS_SHOW_IMAGE ("edit-fill-pattern", TRUE);
+
+#undef SET_ALWAYS_SHOW_IMAGE
+}
+
+void
+edit_actions_update (GimpActionGroup *group,
+                     gpointer         data)
+{
+  GimpImage    *image        = action_data_get_image (data);
+  GimpDisplay  *display      = action_data_get_display (data);
+  GimpDrawable *drawable     = NULL;
+  gchar        *undo_name    = NULL;
+  gchar        *redo_name    = NULL;
+  gboolean      writable     = FALSE;
+  gboolean      children     = FALSE;
+  gboolean      undo_enabled = FALSE;
+
+  if (image)
+    {
+      drawable = gimp_image_get_active_drawable (image);
+
+      if (drawable)
+        {
+          writable = ! gimp_item_is_content_locked (GIMP_ITEM (drawable));
+
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+            children = TRUE;
+        }
+
+      undo_enabled = gimp_image_undo_is_enabled (image);
+
+      if (undo_enabled)
+        {
+          GimpUndoStack *undo_stack = gimp_image_get_undo_stack (image);
+          GimpUndoStack *redo_stack = gimp_image_get_redo_stack (image);
+          GimpUndo      *undo       = gimp_undo_stack_peek (undo_stack);
+          GimpUndo      *redo       = gimp_undo_stack_peek (redo_stack);
+          const gchar   *tool_undo  = NULL;
+          const gchar   *tool_redo  = NULL;
+
+          if (display)
+            {
+              tool_undo = tool_manager_can_undo_active (image->gimp, display);
+              tool_redo = tool_manager_can_redo_active (image->gimp, display);
+            }
+
+          if (tool_undo)
+            undo_name = g_strdup_printf (_("_Undo %s"), tool_undo);
+          else if (undo)
+            undo_name = g_strdup_printf (_("_Undo %s"),
+                                         gimp_object_get_name (undo));
+
+          if (tool_redo)
+            redo_name = g_strdup_printf (_("_Redo %s"), tool_redo);
+          else if (redo)
+            redo_name = g_strdup_printf (_("_Redo %s"),
+                                         gimp_object_get_name (redo));
+        }
+    }
+
+
+#define SET_LABEL(action,label) \
+        gimp_action_group_set_action_label (group, action, (label))
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_LABEL ("edit-undo", undo_name ? undo_name : _("_Undo"));
+  SET_LABEL ("edit-redo", redo_name ? redo_name : _("_Redo"));
+
+  SET_SENSITIVE ("edit-undo",        undo_enabled && undo_name);
+  SET_SENSITIVE ("edit-redo",        undo_enabled && redo_name);
+  SET_SENSITIVE ("edit-strong-undo", undo_enabled && undo_name);
+  SET_SENSITIVE ("edit-strong-redo", undo_enabled && redo_name);
+  SET_SENSITIVE ("edit-undo-clear",  undo_enabled && (undo_name || redo_name));
+
+  g_free (undo_name);
+  g_free (redo_name);
+
+  SET_SENSITIVE ("edit-cut",                         writable && !children);
+  SET_SENSITIVE ("edit-copy",                        drawable);
+  SET_SENSITIVE ("edit-copy-visible",                image);
+  /*             "edit-paste" is always active */
+  SET_SENSITIVE ("edit-paste-in-place",              image);
+  SET_SENSITIVE ("edit-paste-into",                  image);
+  SET_SENSITIVE ("edit-paste-into-in-place",         image);
+  SET_SENSITIVE ("edit-paste-as-new-layer",          image);
+  SET_SENSITIVE ("edit-paste-as-new-layer-in-place", image);
+
+  SET_SENSITIVE ("edit-named-cut",          writable && !children);
+  SET_SENSITIVE ("edit-named-copy",         drawable);
+  SET_SENSITIVE ("edit-named-copy-visible", drawable);
+  /*             "edit-named-paste" is always active */
+
+  SET_SENSITIVE ("edit-clear",              writable && !children);
+  SET_SENSITIVE ("edit-fill-fg",            writable && !children);
+  SET_SENSITIVE ("edit-fill-bg",            writable && !children);
+  SET_SENSITIVE ("edit-fill-pattern",       writable && !children);
+
+#undef SET_LABEL
+#undef SET_SENSITIVE
+}
+
+
+/*  private functions  */
+
+static void
+edit_actions_foreground_changed (GimpContext     *context,
+                                 const GimpRGB   *color,
+                                 GimpActionGroup *group)
+{
+  gimp_action_group_set_action_color (group, "edit-fill-fg", color, FALSE);
+}
+
+static void
+edit_actions_background_changed (GimpContext     *context,
+                                 const GimpRGB   *color,
+                                 GimpActionGroup *group)
+{
+  gimp_action_group_set_action_color (group, "edit-fill-bg", color, FALSE);
+}
+
+static void
+edit_actions_pattern_changed (GimpContext     *context,
+                              GimpPattern     *pattern,
+                              GimpActionGroup *group)
+{
+  gimp_action_group_set_action_viewable (group, "edit-fill-pattern",
+                                         GIMP_VIEWABLE (pattern));
+}
diff --git a/app/actions/edit-actions.h b/app/actions/edit-actions.h
new file mode 100644
index 0000000..89978b3
--- /dev/null
+++ b/app/actions/edit-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EDIT_ACTIONS_H__
+#define __EDIT_ACTIONS_H__
+
+
+void   edit_actions_setup  (GimpActionGroup *group);
+void   edit_actions_update (GimpActionGroup *group,
+                            gpointer         data);
+
+
+#endif /* __EDIT_ACTIONS_H__ */
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
new file mode 100644
index 0000000..6042f86
--- /dev/null
+++ b/app/actions/edit-commands.c
@@ -0,0 +1,721 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-edit.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-edit.h"
+#include "core/gimpfilloptions.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-new.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+
+#include "vectors/gimpvectors-import.h"
+
+#include "widgets/gimpclipboard.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "tools/gimptools-utils.h"
+#include "tools/tool_manager.h"
+
+#include "actions.h"
+#include "edit-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static gboolean   check_drawable_alpha               (GimpDrawable  *drawable,
+                                                      gpointer       data);
+static void       edit_paste                         (GimpDisplay   *display,
+                                                      GimpPasteType  paste_type,
+                                                      gboolean       try_svg);
+static void       cut_named_buffer_callback          (GtkWidget     *widget,
+                                                      const gchar   *name,
+                                                      gpointer       data);
+static void       copy_named_buffer_callback         (GtkWidget     *widget,
+                                                      const gchar   *name,
+                                                      gpointer       data);
+static void       copy_named_visible_buffer_callback (GtkWidget     *widget,
+                                                      const gchar   *name,
+                                                      gpointer       data);
+
+
+/*  public functions  */
+
+void
+edit_undo_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  GimpImage   *image;
+  GimpDisplay *display;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+
+  if (tool_manager_undo_active (image->gimp, display) ||
+      gimp_image_undo (image))
+    {
+      gimp_image_flush (image);
+    }
+}
+
+void
+edit_redo_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  GimpImage   *image;
+  GimpDisplay *display;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+
+  if (tool_manager_redo_active (image->gimp, display) ||
+      gimp_image_redo (image))
+    {
+      gimp_image_flush (image);
+    }
+}
+
+void
+edit_strong_undo_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  if (gimp_image_strong_undo (image))
+    gimp_image_flush (image);
+}
+
+void
+edit_strong_redo_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  if (gimp_image_strong_redo (image))
+    gimp_image_flush (image);
+}
+
+void
+edit_undo_clear_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage     *image;
+  GimpUndoStack *undo_stack;
+  GimpUndoStack *redo_stack;
+  GtkWidget     *widget;
+  GtkWidget     *dialog;
+  gchar         *size;
+  gint64         memsize;
+  gint64         guisize;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  dialog = gimp_message_dialog_new (_("Clear Undo History"),
+                                    GIMP_ICON_DIALOG_WARNING,
+                                    widget,
+                                    GTK_DIALOG_MODAL |
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func,
+                                    GIMP_HELP_EDIT_UNDO_CLEAR,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("Cl_ear"),  GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect_object (gtk_widget_get_toplevel (widget), "unmap",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, G_CONNECT_SWAPPED);
+
+  g_signal_connect_object (image, "disconnect",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, G_CONNECT_SWAPPED);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Really clear image's undo history?"));
+
+  undo_stack = gimp_image_get_undo_stack (image);
+  redo_stack = gimp_image_get_redo_stack (image);
+
+  memsize =  gimp_object_get_memsize (GIMP_OBJECT (undo_stack), &guisize);
+  memsize += guisize;
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (redo_stack), &guisize);
+  memsize += guisize;
+
+  size = g_format_size (memsize);
+
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("Clearing the undo history of this "
+                               "image will gain %s of memory."), size);
+  g_free (size);
+
+  if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      gimp_image_undo_disable (image);
+      gimp_image_undo_enable (image);
+      gimp_image_flush (image);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+void
+edit_cut_cmd_callback (GimpAction *action,
+                       GVariant   *value,
+                       gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  GimpObject   *cut;
+  GError       *error = NULL;
+  return_if_no_drawable (image, drawable, data);
+
+  if (! check_drawable_alpha (drawable, data))
+    return;
+
+  cut = gimp_edit_cut (image, drawable, action_data_get_context (data),
+                       &error);
+
+  if (cut)
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        gimp_message_literal (image->gimp,
+                              G_OBJECT (display), GIMP_MESSAGE_INFO,
+                              GIMP_IS_IMAGE (cut) ?
+                              _("Cut layer to the clipboard.") :
+                              _("Cut pixels to the clipboard."));
+
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (action_data_get_display (data)),
+                            GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
+
+void
+edit_copy_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  GimpObject   *copy;
+  GError       *error = NULL;
+  return_if_no_drawable (image, drawable, data);
+
+  copy = gimp_edit_copy (image, drawable, action_data_get_context (data),
+                         &error);
+
+  if (copy)
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        gimp_message_literal (image->gimp,
+                              G_OBJECT (display), GIMP_MESSAGE_INFO,
+                              GIMP_IS_IMAGE (copy) ?
+                              _("Copied layer to the clipboard.") :
+                              _("Copied pixels to the clipboard."));
+
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (action_data_get_display (data)),
+                            GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
+
+void
+edit_copy_visible_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage *image;
+  GError    *error = NULL;
+  return_if_no_image (image, data);
+
+  if (gimp_edit_copy_visible (image, action_data_get_context (data), &error))
+    {
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (display)
+        gimp_message_literal (image->gimp,
+                              G_OBJECT (display), GIMP_MESSAGE_INFO,
+                              _("Copied pixels to the clipboard."));
+
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (action_data_get_display (data)),
+                            GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
+
+void
+edit_paste_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpDisplay   *display    = action_data_get_display (data);
+  GimpPasteType  paste_type = (GimpPasteType) g_variant_get_int32 (value);
+
+  if (paste_type == GIMP_PASTE_TYPE_FLOATING)
+    {
+      if (! display || ! gimp_display_get_image (display))
+        {
+          edit_paste_as_new_image_cmd_callback (action, value, data);
+          return;
+        }
+    }
+
+  if (! display)
+    return;
+
+  switch (paste_type)
+    {
+    case GIMP_PASTE_TYPE_FLOATING:
+    case GIMP_PASTE_TYPE_FLOATING_IN_PLACE:
+    case GIMP_PASTE_TYPE_FLOATING_INTO:
+    case GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE:
+      edit_paste (display, paste_type, TRUE);
+      break;
+
+    case GIMP_PASTE_TYPE_NEW_LAYER:
+    case GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE:
+      edit_paste (display, paste_type, FALSE);
+      break;
+    }
+}
+
+void
+edit_paste_as_new_image_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  Gimp       *gimp;
+  GtkWidget  *widget;
+  GimpObject *paste;
+  GimpImage  *image = NULL;
+  return_if_no_gimp (gimp, data);
+  return_if_no_widget (widget, data);
+
+  paste = gimp_clipboard_get_object (gimp);
+
+  if (paste)
+    {
+      image = gimp_edit_paste_as_new_image (gimp, paste);
+      g_object_unref (paste);
+    }
+
+  if (image)
+    {
+      gimp_create_display (gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (image);
+    }
+  else
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
+                            _("There is no image data in the clipboard "
+                              "to paste."));
+    }
+}
+
+void
+edit_named_cut_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  dialog = gimp_query_string_box (_("Cut Named"), widget,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_BUFFER_CUT,
+                                  _("Enter a name for this buffer"),
+                                  NULL,
+                                  G_OBJECT (image), "disconnect",
+                                  cut_named_buffer_callback, image);
+  gtk_widget_show (dialog);
+}
+
+void
+edit_named_copy_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  dialog = gimp_query_string_box (_("Copy Named"), widget,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_BUFFER_COPY,
+                                  _("Enter a name for this buffer"),
+                                  NULL,
+                                  G_OBJECT (image), "disconnect",
+                                  copy_named_buffer_callback, image);
+  gtk_widget_show (dialog);
+}
+
+void
+edit_named_copy_visible_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  dialog = gimp_query_string_box (_("Copy Visible Named"), widget,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_BUFFER_COPY,
+                                  _("Enter a name for this buffer"),
+                                  NULL,
+                                  G_OBJECT (image), "disconnect",
+                                  copy_named_visible_buffer_callback, image);
+  gtk_widget_show (dialog);
+}
+
+void
+edit_named_paste_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  Gimp      *gimp;
+  GtkWidget *widget;
+  return_if_no_gimp (gimp, data);
+  return_if_no_widget (widget, data);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)),
+                                             gimp,
+                                             gimp_dialog_factory_get_singleton (),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             "gimp-buffer-list|gimp-buffer-grid");
+}
+
+void
+edit_clear_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  return_if_no_drawable (image, drawable, data);
+
+  if (! check_drawable_alpha (drawable, data))
+    return;
+
+  gimp_drawable_edit_clear (drawable, action_data_get_context (data));
+  gimp_image_flush (image);
+}
+
+void
+edit_fill_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  GimpImage       *image;
+  GimpDrawable    *drawable;
+  GimpFillType     fill_type;
+  GimpFillOptions *options;
+  GError          *error = NULL;
+  return_if_no_drawable (image, drawable, data);
+
+  fill_type = (GimpFillType) g_variant_get_int32 (value);
+
+  options = gimp_fill_options_new (action_data_get_gimp (data), NULL, FALSE);
+
+  if (gimp_fill_options_set_by_fill_type (options,
+                                          action_data_get_context (data),
+                                          fill_type, &error))
+    {
+      gimp_drawable_edit_fill (drawable, options, NULL);
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+
+  g_object_unref (options);
+}
+
+
+/*  private functions  */
+
+static gboolean
+check_drawable_alpha (GimpDrawable *drawable,
+                      gpointer      data)
+{
+  if (gimp_drawable_has_alpha (drawable) &&
+      GIMP_IS_LAYER (drawable)           &&
+      gimp_layer_get_lock_alpha (GIMP_LAYER (drawable)))
+    {
+      Gimp        *gimp    = action_data_get_gimp    (data);
+      GimpDisplay *display = action_data_get_display (data);
+
+      if (gimp && display)
+        {
+          gimp_message_literal (
+            gimp, G_OBJECT (display), GIMP_MESSAGE_WARNING,
+            _("The active layer's alpha channel is locked."));
+
+          gimp_tools_blink_lock_box (gimp, GIMP_ITEM (drawable));
+        }
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+edit_paste (GimpDisplay   *display,
+            GimpPasteType  paste_type,
+            gboolean       try_svg)
+{
+  GimpImage  *image = gimp_display_get_image (display);
+  GimpObject *paste;
+
+  if (try_svg)
+    {
+      gchar *svg;
+      gsize  svg_size;
+
+      svg = gimp_clipboard_get_svg (display->gimp, &svg_size);
+
+      if (svg)
+        {
+          if (gimp_vectors_import_buffer (image, svg, svg_size,
+                                          TRUE, FALSE,
+                                          GIMP_IMAGE_ACTIVE_PARENT, -1,
+                                          NULL, NULL))
+            {
+              gimp_image_flush (image);
+            }
+
+          g_free (svg);
+
+          return;
+        }
+    }
+
+  paste = gimp_clipboard_get_object (display->gimp);
+
+  if (paste)
+    {
+      GimpDisplayShell *shell    = gimp_display_get_shell (display);
+      GimpDrawable     *drawable = gimp_image_get_active_drawable (image);
+      gint              x, y;
+      gint              width, height;
+
+      if (drawable                                &&
+          paste_type != GIMP_PASTE_TYPE_NEW_LAYER &&
+          paste_type != GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE)
+        {
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+            {
+              gimp_message_literal (display->gimp, G_OBJECT (display),
+                                    GIMP_MESSAGE_INFO,
+                                    _("Pasted as new layer because the "
+                                      "target is a layer group."));
+            }
+          else if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+            {
+              gimp_message_literal (display->gimp, G_OBJECT (display),
+                                    GIMP_MESSAGE_INFO,
+                                    _("Pasted as new layer because the "
+                                      "target's pixels are locked."));
+            }
+
+          /* the actual paste-type conversion happens in gimp_edit_paste() */
+        }
+
+      gimp_display_shell_untransform_viewport (
+        shell,
+        ! gimp_display_shell_get_infinite_canvas (shell),
+        &x, &y, &width, &height);
+
+      if (gimp_edit_paste (image, drawable, paste,
+                           paste_type, x, y, width, height))
+        {
+          gimp_image_flush (image);
+        }
+
+      g_object_unref (paste);
+    }
+  else
+    {
+      gimp_message_literal (display->gimp, G_OBJECT (display),
+                            GIMP_MESSAGE_WARNING,
+                            _("There is no image data in the clipboard "
+                              "to paste."));
+    }
+}
+
+static void
+cut_named_buffer_callback (GtkWidget   *widget,
+                           const gchar *name,
+                           gpointer     data)
+{
+  GimpImage    *image    = GIMP_IMAGE (data);
+  GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+  GError       *error    = NULL;
+
+  if (! drawable)
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            _("There is no active layer or channel to cut from."));
+      return;
+    }
+
+  if (! (name && strlen (name)))
+    name = _("(Unnamed Buffer)");
+
+  if (gimp_edit_named_cut (image, name, drawable,
+                           gimp_get_user_context (image->gimp), &error))
+    {
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
+
+static void
+copy_named_buffer_callback (GtkWidget   *widget,
+                            const gchar *name,
+                            gpointer     data)
+{
+  GimpImage    *image    = GIMP_IMAGE (data);
+  GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+  GError       *error    = NULL;
+
+  if (! drawable)
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            _("There is no active layer or channel to copy from."));
+      return;
+    }
+
+  if (! (name && strlen (name)))
+    name = _("(Unnamed Buffer)");
+
+  if (gimp_edit_named_copy (image, name, drawable,
+                            gimp_get_user_context (image->gimp), &error))
+    {
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
+
+static void
+copy_named_visible_buffer_callback (GtkWidget   *widget,
+                                    const gchar *name,
+                                    gpointer     data)
+{
+  GimpImage *image = GIMP_IMAGE (data);
+  GError    *error = NULL;
+
+  if (! (name && strlen (name)))
+    name = _("(Unnamed Buffer)");
+
+  if (gimp_edit_named_copy_visible (image, name,
+                                    gimp_get_user_context (image->gimp),
+                                    &error))
+    {
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
diff --git a/app/actions/edit-commands.h b/app/actions/edit-commands.h
new file mode 100644
index 0000000..2185854
--- /dev/null
+++ b/app/actions/edit-commands.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EDIT_COMMANDS_H__
+#define __EDIT_COMMANDS_H__
+
+
+void   edit_undo_cmd_callback               (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_redo_cmd_callback               (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_strong_undo_cmd_callback        (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_strong_redo_cmd_callback        (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_undo_clear_cmd_callback         (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   edit_cut_cmd_callback                (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_copy_cmd_callback               (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_copy_visible_cmd_callback       (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   edit_paste_cmd_callback              (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_paste_as_new_image_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   edit_named_cut_cmd_callback          (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_named_copy_cmd_callback         (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_named_copy_visible_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_named_paste_cmd_callback        (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   edit_clear_cmd_callback              (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   edit_fill_cmd_callback               (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+
+#endif /* __EDIT_COMMANDS_H__ */
diff --git a/app/actions/error-console-actions.c b/app/actions/error-console-actions.c
new file mode 100644
index 0000000..e82b55a
--- /dev/null
+++ b/app/actions/error-console-actions.c
@@ -0,0 +1,152 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimperrorconsole.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "error-console-actions.h"
+#include "error-console-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry error_console_actions[] =
+{
+  { "error-console-popup", GIMP_ICON_DIALOG_WARNING,
+    NC_("error-console-action", "Error Console Menu"), NULL, NULL, NULL,
+    GIMP_HELP_ERRORS_DIALOG },
+
+  { "error-console-clear", GIMP_ICON_EDIT_CLEAR,
+    NC_("error-console-action", "_Clear"), NULL,
+    NC_("error-console-action", "Clear error console"),
+    error_console_clear_cmd_callback,
+    GIMP_HELP_ERRORS_CLEAR },
+
+  { "error-console-select-all", NULL,
+    NC_("error-console-action", "Select _All"), "",
+    NC_("error-console-action", "Select all error messages"),
+    error_console_select_all_cmd_callback,
+    GIMP_HELP_ERRORS_SELECT_ALL },
+
+  { "error-console-highlight", NULL,
+    NC_("error-console-action", "_Highlight"), NULL, NULL, NULL,
+    GIMP_HELP_ERRORS_HIGHLIGHT }
+};
+
+static const GimpEnumActionEntry error_console_save_actions[] =
+{
+  { "error-console-save-all", GIMP_ICON_DOCUMENT_SAVE_AS,
+    NC_("error-console-action", "_Save Error Log to File..."), NULL,
+    NC_("error-console-action", "Write all error messages to a file"),
+    FALSE, FALSE,
+    GIMP_HELP_ERRORS_SAVE },
+
+  { "error-console-save-selection", GIMP_ICON_DOCUMENT_SAVE_AS,
+    NC_("error-console-action", "Save S_election to File..."), NULL,
+    NC_("error-console-action", "Write the selected error messages to a file"),
+    TRUE, FALSE,
+    GIMP_HELP_ERRORS_SAVE }
+};
+
+static const GimpToggleActionEntry error_console_highlight_actions[] =
+{
+  { "error-console-highlight-error", NULL,
+    NC_("error-console-action", "_Errors"), NULL,
+    NC_("error-console-action", "Highlight error console on errors"),
+    error_console_highlight_error_cmd_callback,
+    FALSE,
+    GIMP_HELP_ERRORS_HIGHLIGHT },
+
+  { "error-console-highlight-warning", NULL,
+    NC_("error-console-action", "_Warnings"), NULL,
+    NC_("error-console-action", "Highlight error console on warnings"),
+    error_console_highlight_warning_cmd_callback,
+    FALSE,
+    GIMP_HELP_ERRORS_HIGHLIGHT },
+
+  { "error-console-highlight-info", NULL,
+    NC_("error-console-action", "_Messages"), NULL,
+    NC_("error-console-action", "Highlight error console on messages"),
+    error_console_highlight_info_cmd_callback,
+    FALSE,
+    GIMP_HELP_ERRORS_HIGHLIGHT }
+};
+
+
+void
+error_console_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "error-console-action",
+                                 error_console_actions,
+                                 G_N_ELEMENTS (error_console_actions));
+
+  gimp_action_group_add_enum_actions (group, "error-console-action",
+                                      error_console_save_actions,
+                                      G_N_ELEMENTS (error_console_save_actions),
+                                      error_console_save_cmd_callback);
+
+  gimp_action_group_add_toggle_actions (group, "error-console-action",
+                                        error_console_highlight_actions,
+                                        G_N_ELEMENTS (error_console_highlight_actions));
+}
+
+void
+error_console_actions_update (GimpActionGroup *group,
+                              gpointer         data)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
+  gboolean          selection;
+
+  selection = gtk_text_buffer_get_selection_bounds (console->text_buffer,
+                                                    NULL, NULL);
+
+#define SET_ACTIVE(action,condition)                                           \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("error-console-clear",          TRUE);
+  SET_SENSITIVE ("error-console-select-all",     TRUE);
+  SET_SENSITIVE ("error-console-save-all",       TRUE);
+  SET_SENSITIVE ("error-console-save-selection", selection);
+  SET_SENSITIVE ("error-console-highlight",      TRUE);
+
+  SET_SENSITIVE ("error-console-highlight-error", TRUE);
+  SET_ACTIVE ("error-console-highlight-error",
+              console->highlight[GIMP_MESSAGE_ERROR]);
+
+  SET_SENSITIVE ("error-console-highlight-warning", TRUE);
+  SET_ACTIVE ("error-console-highlight-warning",
+              console->highlight[GIMP_MESSAGE_WARNING]);
+
+  SET_SENSITIVE ("error-console-highlight-info", TRUE);
+  SET_ACTIVE ("error-console-highlight-info",
+              console->highlight[GIMP_MESSAGE_INFO]);
+
+#undef SET_ACTIVE
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/error-console-actions.h b/app/actions/error-console-actions.h
new file mode 100644
index 0000000..c7a2dde
--- /dev/null
+++ b/app/actions/error-console-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ERROR_CONSOLE_ACIONS_H__
+#define __ERROR_CONSOLE_ACIONS_H__
+
+
+void   error_console_actions_setup  (GimpActionGroup *group);
+void   error_console_actions_update (GimpActionGroup *group,
+                                     gpointer         data);
+
+
+#endif /* __ERROR_CONSOLE_ACTIONS_H__ */
diff --git a/app/actions/error-console-commands.c b/app/actions/error-console-commands.c
new file mode 100644
index 0000000..4d70981
--- /dev/null
+++ b/app/actions/error-console-commands.c
@@ -0,0 +1,201 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimperrorconsole.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimptextbuffer.h"
+
+#include "error-console-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   error_console_save_response (GtkWidget        *dialog,
+                                           gint              response_id,
+                                           GimpErrorConsole *console);
+
+
+/*  public functions  */
+
+void
+error_console_clear_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
+  GtkTextIter       start_iter;
+  GtkTextIter       end_iter;
+
+  gtk_text_buffer_get_bounds (console->text_buffer, &start_iter, &end_iter);
+  gtk_text_buffer_delete (console->text_buffer, &start_iter, &end_iter);
+}
+
+void
+error_console_select_all_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
+  GtkTextIter       start_iter;
+  GtkTextIter       end_iter;
+
+  gtk_text_buffer_get_bounds (console->text_buffer, &start_iter, &end_iter);
+  gtk_text_buffer_select_range (console->text_buffer, &start_iter, &end_iter);
+}
+
+void
+error_console_save_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpErrorConsole *console   = GIMP_ERROR_CONSOLE (data);
+  gboolean          selection = (gboolean) g_variant_get_int32 (value);
+
+  if (selection &&
+      ! gtk_text_buffer_get_selection_bounds (console->text_buffer,
+                                              NULL, NULL))
+    {
+      gimp_message_literal (console->gimp,
+                            G_OBJECT (console), GIMP_MESSAGE_WARNING,
+                            _("Cannot save. Nothing is selected."));
+      return;
+    }
+
+  if (! console->file_dialog)
+    {
+      GtkWidget *dialog;
+
+      dialog = console->file_dialog =
+        gtk_file_chooser_dialog_new (_("Save Error Log to File"), NULL,
+                                     GTK_FILE_CHOOSER_ACTION_SAVE,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
+
+                                     NULL);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      console->save_selection = selection;
+
+      g_object_add_weak_pointer (G_OBJECT (dialog),
+                                 (gpointer) &console->file_dialog);
+
+      gtk_window_set_screen (GTK_WINDOW (dialog),
+                             gtk_widget_get_screen (GTK_WIDGET (console)));
+      gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+      gtk_window_set_role (GTK_WINDOW (dialog), "gimp-save-errors");
+
+      gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
+                                                      TRUE);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (error_console_save_response),
+                        console);
+      g_signal_connect (dialog, "delete-event",
+                        G_CALLBACK (gtk_true),
+                        NULL);
+
+      gimp_help_connect (dialog, gimp_standard_help_func,
+                         GIMP_HELP_ERRORS_DIALOG, NULL);
+    }
+
+  gtk_window_present (GTK_WINDOW (console->file_dialog));
+}
+
+void
+error_console_highlight_error_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
+  gboolean          active  = g_variant_get_boolean (value);
+
+  console->highlight[GIMP_MESSAGE_ERROR] = active;
+}
+
+void
+error_console_highlight_warning_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
+  gboolean          active  = g_variant_get_boolean (value);
+
+  console->highlight[GIMP_MESSAGE_WARNING] = active;
+}
+
+void
+error_console_highlight_info_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
+  gboolean          active  = g_variant_get_boolean (value);
+
+  console->highlight[GIMP_MESSAGE_INFO] = active;
+}
+
+
+/*  private functions  */
+
+static void
+error_console_save_response (GtkWidget        *dialog,
+                             gint              response_id,
+                             GimpErrorConsole *console)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GFile  *file  = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      GError *error = NULL;
+
+      if (! gimp_text_buffer_save (GIMP_TEXT_BUFFER (console->text_buffer),
+                                   file,
+                                   console->save_selection, &error))
+        {
+          gimp_message (console->gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+                        _("Error writing file '%s':\n%s"),
+                        gimp_file_get_utf8_name (file),
+                        error->message);
+          g_clear_error (&error);
+          g_object_unref (file);
+          return;
+        }
+
+      g_object_unref (file);
+    }
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/actions/error-console-commands.h b/app/actions/error-console-commands.h
new file mode 100644
index 0000000..6913a9b
--- /dev/null
+++ b/app/actions/error-console-commands.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ERROR_CONSOLE_COMMANDS_H__
+#define __ERROR_CONSOLE_COMMANDS_H__
+
+
+void   error_console_clear_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   error_console_select_all_cmd_callback        (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   error_console_save_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   error_console_highlight_error_cmd_callback   (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   error_console_highlight_warning_cmd_callback (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   error_console_highlight_info_cmd_callback    (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+
+#endif /* __ERROR_CONSOLE_COMMANDS_H__ */
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
new file mode 100644
index 0000000..b767750
--- /dev/null
+++ b/app/actions/file-actions.c
@@ -0,0 +1,452 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+#include "core/gimpviewable.h"
+
+#include "file/gimp-file.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpactionimpl.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+
+#include "actions.h"
+#include "file-actions.h"
+#include "file-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void    file_actions_last_opened_update  (GimpContainer   *container,
+                                                 GimpImagefile   *unused,
+                                                 GimpActionGroup *group);
+static void    file_actions_last_opened_reorder (GimpContainer   *container,
+                                                 GimpImagefile   *unused1,
+                                                 gint             unused2,
+                                                 GimpActionGroup *group);
+static void    file_actions_close_all_update    (GimpContainer   *images,
+                                                 GimpObject      *unused,
+                                                 GimpActionGroup *group);
+static gchar * file_actions_create_label        (const gchar     *format,
+                                                 GFile           *file);
+
+
+static const GimpActionEntry file_actions[] =
+{
+  { "file-menu",             NULL, NC_("file-action", "_File")        },
+  { "file-create-menu",      NULL, NC_("file-action", "Crea_te")      },
+  { "file-open-recent-menu", NULL, NC_("file-action", "Open _Recent") },
+
+  { "file-open", GIMP_ICON_IMAGE_OPEN,
+    NC_("file-action", "_Open..."), "<primary>O",
+    NC_("file-action", "Open an image file"),
+    file_open_cmd_callback,
+    GIMP_HELP_FILE_OPEN },
+
+  { "file-open-as-layers", GIMP_ICON_LAYER,
+    NC_("file-action", "Op_en as Layers..."), "<primary><alt>O",
+    NC_("file-action", "Open an image file as layers"),
+    file_open_as_layers_cmd_callback,
+    GIMP_HELP_FILE_OPEN_AS_LAYER },
+
+  { "file-open-location", GIMP_ICON_WEB,
+    NC_("file-action", "Open _Location..."), NULL,
+    NC_("file-action", "Open an image file from a specified location"),
+    file_open_location_cmd_callback,
+    GIMP_HELP_FILE_OPEN_LOCATION },
+
+  { "file-create-template", NULL,
+    NC_("file-action", "Create _Template..."), NULL,
+    NC_("file-action", "Create a new template from this image"),
+    file_create_template_cmd_callback,
+    GIMP_HELP_FILE_CREATE_TEMPLATE },
+
+  { "file-revert", GIMP_ICON_IMAGE_RELOAD,
+    NC_("file-action", "Re_vert"), NULL,
+    NC_("file-action", "Reload the image file from disk"),
+    file_revert_cmd_callback,
+    GIMP_HELP_FILE_REVERT },
+
+  { "file-close-all", GIMP_ICON_CLOSE_ALL,
+    NC_("file-action", "C_lose All"), "<primary><shift>W",
+    NC_("file-action", "Close all opened images"),
+    file_close_all_cmd_callback,
+    GIMP_HELP_FILE_CLOSE_ALL },
+
+  { "file-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("file-action", "Copy _Image Location"), NULL,
+    NC_("file-action", "Copy image file location to clipboard"),
+    file_copy_location_cmd_callback,
+    GIMP_HELP_FILE_COPY_LOCATION },
+
+  { "file-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("file-action", "Show in _File Manager"), "<primary><alt>F",
+    NC_("file-action", "Show image file location in the file manager"),
+    file_show_in_file_manager_cmd_callback,
+    GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER },
+
+  { "file-quit", GIMP_ICON_APPLICATION_EXIT,
+    NC_("file-action", "_Quit"), "<primary>Q",
+    NC_("file-action", "Quit the GNU Image Manipulation Program"),
+    file_quit_cmd_callback,
+    GIMP_HELP_FILE_QUIT }
+};
+
+static const GimpEnumActionEntry file_save_actions[] =
+{
+  { "file-save", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("file-action", "_Save"), "<primary>S",
+    NC_("file-action", "Save this image"),
+    GIMP_SAVE_MODE_SAVE, FALSE,
+    GIMP_HELP_FILE_SAVE },
+
+  { "file-save-as", GIMP_ICON_DOCUMENT_SAVE_AS,
+    NC_("file-action", "Save _As..."), "<primary><shift>S",
+    NC_("file-action", "Save this image with a different name"),
+    GIMP_SAVE_MODE_SAVE_AS, FALSE,
+    GIMP_HELP_FILE_SAVE_AS },
+
+  { "file-save-a-copy", NULL,
+    NC_("file-action", "Save a Cop_y..."), NULL,
+    NC_("file-action",
+        "Save a copy of this image, without affecting the source file "
+        "(if any) or the current state of the image"),
+    GIMP_SAVE_MODE_SAVE_A_COPY, FALSE,
+    GIMP_HELP_FILE_SAVE_A_COPY },
+
+  { "file-save-and-close", NULL,
+    NC_("file-action", "Save and Close..."), NULL,
+    NC_("file-action", "Save this image and close its window"),
+    GIMP_SAVE_MODE_SAVE_AND_CLOSE, FALSE,
+    GIMP_HELP_FILE_SAVE },
+
+  { "file-export", NULL,
+    NC_("file-action", "E_xport..."), "<primary>E",
+    NC_("file-action", "Export the image"),
+    GIMP_SAVE_MODE_EXPORT, FALSE,
+    GIMP_HELP_FILE_EXPORT },
+
+  { "file-overwrite", NULL,
+    NC_("file-action", "Over_write"), "",
+    NC_("file-action", "Export the image back to the imported file in the import format"),
+    GIMP_SAVE_MODE_OVERWRITE, FALSE,
+    GIMP_HELP_FILE_OVERWRITE },
+
+  { "file-export-as", NULL,
+    NC_("file-action", "E_xport As..."), "<primary><shift>E",
+    NC_("file-action", "Export the image to various file formats such as PNG or JPEG"),
+    GIMP_SAVE_MODE_EXPORT_AS, FALSE,
+    GIMP_HELP_FILE_EXPORT_AS }
+};
+
+void
+file_actions_setup (GimpActionGroup *group)
+{
+  GimpEnumActionEntry *entries;
+  gint                 n_entries;
+  gint                 i;
+
+  gimp_action_group_add_actions (group, "file-action",
+                                 file_actions,
+                                 G_N_ELEMENTS (file_actions));
+
+  gimp_action_group_add_enum_actions (group, "file-action",
+                                      file_save_actions,
+                                      G_N_ELEMENTS (file_save_actions),
+                                      file_save_cmd_callback);
+
+  n_entries = GIMP_GUI_CONFIG (group->gimp->config)->last_opened_size;
+
+  entries = g_new0 (GimpEnumActionEntry, n_entries);
+
+  for (i = 0; i < n_entries; i++)
+    {
+      entries[i].name           = g_strdup_printf ("file-open-recent-%02d",
+                                                   i + 1);
+      entries[i].icon_name      = GIMP_ICON_DOCUMENT_OPEN,
+      entries[i].label          = entries[i].name;
+      entries[i].tooltip        = NULL;
+      entries[i].value          = i;
+      entries[i].value_variable = FALSE;
+
+      if (i < 9)
+        entries[i].accelerator = g_strdup_printf ("<primary>%d", i + 1);
+      else if (i == 9)
+        entries[i].accelerator = g_strdup ("<primary>0");
+      else
+        entries[i].accelerator = NULL;
+    }
+
+  gimp_action_group_add_enum_actions (group, NULL, entries, n_entries,
+                                      file_open_recent_cmd_callback);
+
+  for (i = 0; i < n_entries; i++)
+    {
+      gimp_action_group_set_action_visible (group, entries[i].name, FALSE);
+      gimp_action_group_set_action_always_show_image (group, entries[i].name,
+                                                      TRUE);
+      gimp_action_group_set_action_context (group, entries[i].name,
+                                            gimp_get_user_context (group->gimp));
+
+      g_free ((gchar *) entries[i].name);
+      if (entries[i].accelerator)
+        g_free ((gchar *) entries[i].accelerator);
+    }
+
+  g_free (entries);
+
+  g_signal_connect_object (group->gimp->documents, "add",
+                           G_CALLBACK (file_actions_last_opened_update),
+                           group, 0);
+  g_signal_connect_object (group->gimp->documents, "remove",
+                           G_CALLBACK (file_actions_last_opened_update),
+                           group, 0);
+  g_signal_connect_object (group->gimp->documents, "reorder",
+                           G_CALLBACK (file_actions_last_opened_reorder),
+                           group, 0);
+
+  file_actions_last_opened_update (group->gimp->documents, NULL, group);
+
+  /*  also listen to image adding/removal so we catch the case where
+   *  the last image is closed but its display stays open.
+   */
+  g_signal_connect_object (group->gimp->images, "add",
+                           G_CALLBACK (file_actions_close_all_update),
+                           group, 0);
+  g_signal_connect_object (group->gimp->images, "remove",
+                           G_CALLBACK (file_actions_close_all_update),
+                           group, 0);
+
+  file_actions_close_all_update (group->gimp->displays, NULL, group);
+}
+
+void
+file_actions_update (GimpActionGroup *group,
+                     gpointer         data)
+{
+  Gimp         *gimp           = action_data_get_gimp (data);
+  GimpImage    *image          = action_data_get_image (data);
+  GimpDrawable *drawable       = NULL;
+  GFile        *file           = NULL;
+  GFile        *source         = NULL;
+  GFile        *export         = NULL;
+  gboolean      show_overwrite = FALSE;
+
+  if (image)
+    {
+      drawable = gimp_image_get_active_drawable (image);
+
+      file   = gimp_image_get_file (image);
+      source = gimp_image_get_imported_file (image);
+      export = gimp_image_get_exported_file (image);
+    }
+
+  show_overwrite =
+    (source &&
+     gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                               GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                                               source, NULL));
+
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("file-save",                 drawable);
+  SET_SENSITIVE ("file-save-as",              drawable);
+  SET_SENSITIVE ("file-save-a-copy",          drawable);
+  SET_SENSITIVE ("file-save-and-close",       drawable);
+  SET_SENSITIVE ("file-revert",               file || source);
+  SET_SENSITIVE ("file-export",               drawable);
+  SET_VISIBLE   ("file-export",               ! show_overwrite);
+  SET_SENSITIVE ("file-overwrite",            show_overwrite);
+  SET_VISIBLE   ("file-overwrite",            show_overwrite);
+  SET_SENSITIVE ("file-export-as",            drawable);
+  SET_SENSITIVE ("file-create-template",      image);
+  SET_SENSITIVE ("file-copy-location",        file || source || export);
+  SET_SENSITIVE ("file-show-in-file-manager", file || source || export);
+
+  if (file)
+    {
+      gimp_action_group_set_action_label (group,
+                                          "file-save",
+                                          C_("file-action", "_Save"));
+    }
+  else
+    {
+      gimp_action_group_set_action_label (group,
+                                          "file-save",
+                                          C_("file-action", "_Save..."));
+    }
+
+  if (export)
+    {
+      gchar *label = file_actions_create_label (_("Export to %s"), export);
+      gimp_action_group_set_action_label (group, "file-export", label);
+      g_free (label);
+    }
+  else if (show_overwrite)
+    {
+      gchar *label = file_actions_create_label (_("Over_write %s"), source);
+      gimp_action_group_set_action_label (group, "file-overwrite", label);
+      g_free (label);
+    }
+  else
+    {
+      gimp_action_group_set_action_label (group,
+                                          "file-export",
+                                          C_("file-action", "E_xport..."));
+    }
+
+  /*  needed for the empty display  */
+  SET_SENSITIVE ("file-close-all", image);
+
+#undef SET_SENSITIVE
+}
+
+
+/*  private functions  */
+
+static void
+file_actions_last_opened_update (GimpContainer   *container,
+                                 GimpImagefile   *unused,
+                                 GimpActionGroup *group)
+{
+  gint num_documents;
+  gint i;
+  gint n = GIMP_GUI_CONFIG (group->gimp->config)->last_opened_size;
+
+  num_documents = gimp_container_get_n_children (container);
+
+  for (i = 0; i < n; i++)
+    {
+      GimpAction *action;
+      gchar      *name = g_strdup_printf ("file-open-recent-%02d", i + 1);
+
+      action = gimp_action_group_get_action (group, name);
+
+      if (i < num_documents)
+        {
+          GimpImagefile *imagefile = (GimpImagefile *)
+            gimp_container_get_child_by_index (container, i);
+
+          if (GIMP_ACTION_IMPL (action)->viewable != (GimpViewable *) imagefile)
+            {
+              GFile       *file;
+              const gchar *name;
+              gchar       *basename;
+              gchar       *escaped;
+
+              file = gimp_imagefile_get_file (imagefile);
+
+              name     = gimp_file_get_utf8_name (file);
+              basename = g_path_get_basename (name);
+
+              escaped = gimp_escape_uline (basename);
+
+              g_free (basename);
+
+              g_object_set (action,
+                            "label",    escaped,
+                            "tooltip",  name,
+                            "visible",  TRUE,
+                            "viewable", imagefile,
+                            NULL);
+
+               g_free (escaped);
+            }
+        }
+      else
+        {
+          g_object_set (action,
+                        "label",    name,
+                        "tooltip",  NULL,
+                        "visible",  FALSE,
+                        "viewable", NULL,
+                        NULL);
+        }
+
+      g_free (name);
+    }
+}
+
+static void
+file_actions_last_opened_reorder (GimpContainer   *container,
+                                  GimpImagefile   *unused1,
+                                  gint             unused2,
+                                  GimpActionGroup *group)
+{
+  file_actions_last_opened_update (container, unused1, group);
+}
+
+static void
+file_actions_close_all_update (GimpContainer   *images,
+                               GimpObject      *unused,
+                               GimpActionGroup *group)
+{
+  GimpContainer *container  = group->gimp->displays;
+  gint           n_displays = gimp_container_get_n_children (container);
+  gboolean       sensitive  = (n_displays > 0);
+
+  if (n_displays == 1)
+    {
+      GimpDisplay *display;
+
+      display = GIMP_DISPLAY (gimp_container_get_first_child (container));
+
+      if (! gimp_display_get_image (display))
+        sensitive = FALSE;
+    }
+
+  gimp_action_group_set_action_sensitive (group, "file-close-all", sensitive);
+}
+
+static gchar *
+file_actions_create_label (const gchar *format,
+                           GFile       *file)
+{
+  gchar *basename         = g_path_get_basename (gimp_file_get_utf8_name (file));
+  gchar *escaped_basename = gimp_escape_uline (basename);
+  gchar *label            = g_strdup_printf (format, escaped_basename);
+
+  g_free (escaped_basename);
+  g_free (basename);
+
+  return label;
+}
diff --git a/app/actions/file-actions.h b/app/actions/file-actions.h
new file mode 100644
index 0000000..7029a9a
--- /dev/null
+++ b/app/actions/file-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_ACTIONS_H__
+#define __FILE_ACTIONS_H__
+
+
+void   file_actions_setup  (GimpActionGroup *group);
+void   file_actions_update (GimpActionGroup *group,
+                            gpointer         data);
+
+
+#endif /* __FILE_ACTIONS_H__ */
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
new file mode 100644
index 0000000..9e72f3e
--- /dev/null
+++ b/app/actions/file-commands.c
@@ -0,0 +1,837 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+#include "core/gimpprogress.h"
+#include "core/gimptemplate.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "file/file-open.h"
+#include "file/file-save.h"
+#include "file/gimp-file.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpclipboard.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpexportdialog.h"
+#include "widgets/gimpfiledialog.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpopendialog.h"
+#include "widgets/gimpsavedialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplay-foreach.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/file-save-dialog.h"
+
+#include "actions.h"
+#include "file-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void        file_open_dialog_show        (Gimp         *gimp,
+                                                 GtkWidget    *parent,
+                                                 const gchar  *title,
+                                                 GimpImage    *image,
+                                                 GFile        *file,
+                                                 gboolean      open_as_layers);
+static GtkWidget * file_save_dialog_show        (Gimp         *gimp,
+                                                 GimpImage    *image,
+                                                 GtkWidget    *parent,
+                                                 const gchar  *title,
+                                                 gboolean      save_a_copy,
+                                                 gboolean      close_after_saving,
+                                                 GimpDisplay  *display);
+static GtkWidget * file_export_dialog_show      (Gimp         *gimp,
+                                                 GimpImage    *image,
+                                                 GtkWidget    *parent);
+static void        file_save_dialog_response    (GtkWidget    *dialog,
+                                                 gint          response_id,
+                                                 gpointer      data);
+static void        file_export_dialog_response  (GtkWidget    *dialog,
+                                                 gint          response_id,
+                                                 gpointer      data);
+static void        file_new_template_callback   (GtkWidget    *widget,
+                                                 const gchar  *name,
+                                                 gpointer      data);
+static void        file_revert_confirm_response (GtkWidget    *dialog,
+                                                 gint          response_id,
+                                                 GimpDisplay  *display);
+
+
+
+/*  public functions  */
+
+
+void
+file_open_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  Gimp        *gimp;
+  GtkWidget   *widget;
+  GimpImage   *image;
+  return_if_no_gimp (gimp, data);
+  return_if_no_widget (widget, data);
+
+  image = action_data_get_image (data);
+
+  file_open_dialog_show (gimp, widget,
+                         _("Open Image"),
+                         image, NULL, FALSE);
+}
+
+void
+file_open_as_layers_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  Gimp        *gimp;
+  GtkWidget   *widget;
+  GimpDisplay *display;
+  GimpImage   *image = NULL;
+  return_if_no_gimp (gimp, data);
+  return_if_no_widget (widget, data);
+
+  display = action_data_get_display (data);
+
+  if (display)
+    image = gimp_display_get_image (display);
+
+  file_open_dialog_show (gimp, widget,
+                         _("Open Image as Layers"),
+                         image, NULL, TRUE);
+}
+
+void
+file_open_location_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GtkWidget *widget;
+  return_if_no_widget (widget, data);
+
+  gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                  gtk_widget_get_screen (widget),
+                                  gimp_widget_get_monitor (widget),
+                                  NULL /*ui_manager*/,
+                                  "gimp-file-open-location-dialog", -1, TRUE);
+}
+
+void
+file_open_recent_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  Gimp          *gimp;
+  GimpImagefile *imagefile;
+  gint           index;
+  gint           num_entries;
+  return_if_no_gimp (gimp, data);
+
+  index = g_variant_get_int32 (value);
+
+  num_entries = gimp_container_get_n_children (gimp->documents);
+
+  if (index >= num_entries)
+    return;
+
+  imagefile = (GimpImagefile *)
+    gimp_container_get_child_by_index (gimp->documents, index);
+
+  if (imagefile)
+    {
+      GFile             *file;
+      GimpDisplay       *display;
+      GtkWidget         *widget;
+      GimpProgress      *progress;
+      GimpImage         *image;
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+      return_if_no_display (display, data);
+      return_if_no_widget (widget, data);
+
+      g_object_ref (display);
+      g_object_ref (imagefile);
+
+      file = gimp_imagefile_get_file (imagefile);
+
+      progress = gimp_display_get_image (display) ?
+                 NULL : GIMP_PROGRESS (display);
+
+      image = file_open_with_display (gimp, action_data_get_context (data),
+                                      progress,
+                                      file, FALSE,
+                                      G_OBJECT (gtk_widget_get_screen (widget)),
+                                      gimp_widget_get_monitor (widget),
+                                      &status, &error);
+
+      if (! image && status != GIMP_PDB_CANCEL)
+        {
+          gimp_message (gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
+                        _("Opening '%s' failed:\n\n%s"),
+                        gimp_file_get_utf8_name (file), error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (imagefile);
+      g_object_unref (display);
+    }
+}
+
+void
+file_save_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  Gimp         *gimp;
+  GimpDisplay  *display;
+  GimpImage    *image;
+  GtkWidget    *widget;
+  GimpSaveMode  save_mode;
+  GFile        *file  = NULL;
+  gboolean      saved = FALSE;
+  return_if_no_gimp (gimp, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  image = gimp_display_get_image (display);
+
+  save_mode = (GimpSaveMode) g_variant_get_int32 (value);
+
+  if (! gimp_image_get_active_drawable (image))
+    return;
+
+  file = gimp_image_get_file (image);
+
+  switch (save_mode)
+    {
+    case GIMP_SAVE_MODE_SAVE:
+    case GIMP_SAVE_MODE_SAVE_AND_CLOSE:
+      /*  Only save if the image has been modified, or if it is new.  */
+      if ((gimp_image_is_dirty (image) ||
+           ! GIMP_GUI_CONFIG (image->gimp->config)->trust_dirty_flag) ||
+          file == NULL)
+        {
+          GimpPlugInProcedure *save_proc = gimp_image_get_save_proc (image);
+
+          if (file && ! save_proc)
+            {
+              save_proc =
+                gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                          GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                                                          file, NULL);
+            }
+
+          if (file && save_proc)
+            {
+              saved = file_save_dialog_save_image (GIMP_PROGRESS (display),
+                                                   gimp, image, file,
+                                                   save_proc,
+                                                   GIMP_RUN_WITH_LAST_VALS,
+                                                   TRUE, FALSE, FALSE,
+                                                   gimp_image_get_xcf_compression (image),
+                                                   TRUE);
+              break;
+            }
+
+          /* fall thru */
+        }
+      else
+        {
+          gimp_message_literal (image->gimp,
+                                G_OBJECT (display), GIMP_MESSAGE_INFO,
+                                _("No changes need to be saved"));
+          saved = TRUE;
+          break;
+        }
+
+    case GIMP_SAVE_MODE_SAVE_AS:
+      file_save_dialog_show (gimp, image, widget,
+                             _("Save Image"), FALSE,
+                             save_mode == GIMP_SAVE_MODE_SAVE_AND_CLOSE, display);
+      break;
+
+    case GIMP_SAVE_MODE_SAVE_A_COPY:
+      file_save_dialog_show (gimp, image, widget,
+                             _("Save a Copy of the Image"), TRUE,
+                             FALSE, display);
+      break;
+
+    case GIMP_SAVE_MODE_EXPORT_AS:
+      file_export_dialog_show (gimp, image, widget);
+      break;
+
+    case GIMP_SAVE_MODE_EXPORT:
+    case GIMP_SAVE_MODE_OVERWRITE:
+      {
+        GFile               *file        = NULL;
+        GimpPlugInProcedure *export_proc = NULL;
+        gboolean             overwrite   = FALSE;
+
+        if (save_mode == GIMP_SAVE_MODE_EXPORT)
+          {
+            file        = gimp_image_get_exported_file (image);
+            export_proc = gimp_image_get_export_proc (image);
+
+            if (! file)
+              {
+                /* Behave as if Export As... was invoked */
+                file_export_dialog_show (gimp, image, widget);
+                break;
+              }
+
+            overwrite = FALSE;
+          }
+        else if (save_mode == GIMP_SAVE_MODE_OVERWRITE)
+          {
+            file = gimp_image_get_imported_file (image);
+
+            overwrite = TRUE;
+          }
+
+        if (file && ! export_proc)
+          {
+            export_proc =
+              gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                        GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                                                        file, NULL);
+          }
+
+        if (file && export_proc)
+          {
+            saved = file_save_dialog_save_image (GIMP_PROGRESS (display),
+                                                 gimp, image, file,
+                                                 export_proc,
+                                                 GIMP_RUN_WITH_LAST_VALS,
+                                                 FALSE,
+                                                 overwrite, ! overwrite,
+                                                 FALSE, TRUE);
+          }
+      }
+      break;
+    }
+
+  if (save_mode == GIMP_SAVE_MODE_SAVE_AND_CLOSE &&
+      saved &&
+      ! gimp_image_is_dirty (image))
+    {
+      gimp_display_close (display);
+    }
+}
+
+void
+file_create_template_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+  dialog = gimp_query_string_box (_("Create New Template"),
+                                  GTK_WIDGET (gimp_display_get_shell (display)),
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_FILE_CREATE_TEMPLATE,
+                                  _("Enter a name for this template"),
+                                  NULL,
+                                  G_OBJECT (image), "disconnect",
+                                  file_new_template_callback, image);
+  gtk_widget_show (dialog);
+}
+
+void
+file_revert_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  GFile       *file;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+  file = gimp_image_get_file (image);
+
+  if (! file)
+    file = gimp_image_get_imported_file (image);
+
+  if (! file)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (display), GIMP_MESSAGE_ERROR,
+                            _("Revert failed. "
+                              "No file name associated with this image."));
+      return;
+    }
+
+#define REVERT_DIALOG_KEY "gimp-revert-confirm-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), REVERT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog =
+        gimp_message_dialog_new (_("Revert Image"), GIMP_ICON_DOCUMENT_REVERT,
+                                 GTK_WIDGET (gimp_display_get_shell (display)),
+                                 0,
+                                 gimp_standard_help_func, GIMP_HELP_FILE_REVERT,
+
+                                 _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                 _("_Revert"), GTK_RESPONSE_OK,
+
+                                 NULL);
+
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      g_signal_connect_object (display, "disconnect",
+                               G_CALLBACK (gtk_widget_destroy),
+                               dialog, G_CONNECT_SWAPPED);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (file_revert_confirm_response),
+                        display);
+
+      gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                         _("Revert '%s' to '%s'?"),
+                                         gimp_image_get_display_name (image),
+                                         gimp_file_get_utf8_name (file));
+
+      gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                 _("By reverting the image to the state saved "
+                                   "on disk, you will lose all changes, "
+                                   "including all undo information."));
+
+      dialogs_attach_dialog (G_OBJECT (image), REVERT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+file_close_all_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  Gimp *gimp;
+  return_if_no_gimp (gimp, data);
+
+  if (! gimp_displays_dirty (gimp))
+    {
+      gimp_displays_close (gimp);
+    }
+  else
+    {
+      GtkWidget *widget;
+      return_if_no_widget (widget, data);
+
+      gimp_dialog_factory_dialog_raise (gimp_dialog_factory_get_singleton (),
+                                        gtk_widget_get_screen (widget),
+                                        gimp_widget_get_monitor (widget),
+                                        "gimp-close-all-dialog", -1);
+    }
+}
+
+void
+file_copy_location_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  Gimp         *gimp;
+  GimpDisplay  *display;
+  GimpImage    *image;
+  GFile        *file;
+  return_if_no_gimp (gimp, data);
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+  file = gimp_image_get_any_file (image);
+
+  if (file)
+    {
+      gchar *uri = g_file_get_uri (file);
+
+      gimp_clipboard_set_text (gimp, uri);
+      g_free (uri);
+    }
+}
+
+void
+file_show_in_file_manager_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  Gimp         *gimp;
+  GimpDisplay  *display;
+  GimpImage    *image;
+  GFile        *file;
+  return_if_no_gimp (gimp, data);
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+  file = gimp_image_get_any_file (image);
+
+  if (file)
+    {
+      GError *error = NULL;
+
+      if (! gimp_file_show_in_file_manager (file, &error))
+        {
+          gimp_message (gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
+                        _("Can't show file in file manager: %s"),
+                        error->message);
+          g_clear_error (&error);
+        }
+    }
+}
+
+void
+file_quit_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  Gimp *gimp;
+  return_if_no_gimp (gimp, data);
+
+  gimp_exit (gimp, FALSE);
+}
+
+void
+file_file_open_dialog (Gimp      *gimp,
+                       GFile     *file,
+                       GtkWidget *parent)
+{
+  file_open_dialog_show (gimp, parent,
+                         _("Open Image"),
+                         NULL, file, FALSE);
+}
+
+
+/*  private functions  */
+
+static void
+file_open_dialog_show (Gimp        *gimp,
+                       GtkWidget   *parent,
+                       const gchar *title,
+                       GimpImage   *image,
+                       GFile       *file,
+                       gboolean     open_as_layers)
+{
+  GtkWidget *dialog;
+
+  dialog = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                           gtk_widget_get_screen (parent),
+                                           gimp_widget_get_monitor (parent),
+                                           NULL /*ui_manager*/,
+                                           "gimp-file-open-dialog", -1, FALSE);
+
+  if (dialog)
+    {
+      if (! file && image)
+        file = gimp_image_get_file (image);
+
+      if (! file)
+        file = g_object_get_data (G_OBJECT (gimp),
+                                  GIMP_FILE_OPEN_LAST_FILE_KEY);
+
+      if (file)
+        {
+          gtk_file_chooser_set_file (GTK_FILE_CHOOSER (dialog), file, NULL);
+        }
+      else if (gimp->default_folder)
+        {
+          gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                                    gimp->default_folder, NULL);
+        }
+
+      gtk_window_set_title (GTK_WINDOW (dialog), title);
+
+      gimp_open_dialog_set_image (GIMP_OPEN_DIALOG (dialog),
+                                  image, open_as_layers);
+
+      gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                    GTK_WINDOW (gtk_widget_get_toplevel (parent)));
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+}
+
+static GtkWidget *
+file_save_dialog_show (Gimp        *gimp,
+                       GimpImage   *image,
+                       GtkWidget   *parent,
+                       const gchar *title,
+                       gboolean     save_a_copy,
+                       gboolean     close_after_saving,
+                       GimpDisplay *display)
+{
+  GtkWidget *dialog;
+
+#define SAVE_DIALOG_KEY "gimp-file-save-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), SAVE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                               gtk_widget_get_screen (parent),
+                                               gimp_widget_get_monitor (parent),
+                                               NULL /*ui_manager*/,
+                                               "gimp-file-save-dialog",
+                                               -1, FALSE);
+
+      if (dialog)
+        {
+          gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                        GTK_WINDOW (gtk_widget_get_toplevel (parent)));
+
+          dialogs_attach_dialog (G_OBJECT (image), SAVE_DIALOG_KEY, dialog);
+          g_signal_connect_object (image, "disconnect",
+                                   G_CALLBACK (gtk_widget_destroy),
+                                   dialog, G_CONNECT_SWAPPED);
+
+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (file_save_dialog_response),
+                            image);
+        }
+    }
+
+  if (dialog)
+    {
+      gtk_window_set_title (GTK_WINDOW (dialog), title);
+
+      gimp_save_dialog_set_image (GIMP_SAVE_DIALOG (dialog),
+                                  image, save_a_copy,
+                                  close_after_saving, GIMP_OBJECT (display));
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+
+  return dialog;
+}
+
+static void
+file_save_dialog_response (GtkWidget *dialog,
+                           gint       response_id,
+                           gpointer   data)
+{
+  if (response_id == FILE_SAVE_RESPONSE_OTHER_DIALOG)
+    {
+      GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog);
+      GtkWindow      *parent;
+      GtkWidget      *other;
+      GFile          *file;
+      gchar          *folder;
+      gchar          *basename;
+
+      parent   = gtk_window_get_transient_for (GTK_WINDOW (dialog));
+      file     = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      folder   = g_path_get_dirname (gimp_file_get_utf8_name (file));
+      basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+      g_object_unref (file);
+
+      other = file_export_dialog_show (GIMP_FILE_DIALOG (file_dialog)->image->gimp,
+                                       GIMP_FILE_DIALOG (file_dialog)->image,
+                                       GTK_WIDGET (parent));
+
+      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (other), folder);
+      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (other), basename);
+
+      g_free (folder);
+      g_free (basename);
+    }
+}
+
+static GtkWidget *
+file_export_dialog_show (Gimp      *gimp,
+                         GimpImage *image,
+                         GtkWidget *parent)
+{
+  GtkWidget *dialog;
+
+#define EXPORT_DIALOG_KEY "gimp-file-export-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), EXPORT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                               gtk_widget_get_screen (parent),
+                                               gimp_widget_get_monitor (parent),
+                                               NULL /*ui_manager*/,
+                                               "gimp-file-export-dialog",
+                                               -1, FALSE);
+
+      if (dialog)
+        {
+          gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                        GTK_WINDOW (gtk_widget_get_toplevel (parent)));
+
+          dialogs_attach_dialog (G_OBJECT (image), EXPORT_DIALOG_KEY, dialog);
+          g_signal_connect_object (image, "disconnect",
+                                   G_CALLBACK (gtk_widget_destroy),
+                                   dialog, G_CONNECT_SWAPPED);
+
+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (file_export_dialog_response),
+                            image);
+        }
+    }
+
+  if (dialog)
+    {
+      gimp_export_dialog_set_image (GIMP_EXPORT_DIALOG (dialog), image);
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+
+  return dialog;
+}
+
+static void
+file_export_dialog_response (GtkWidget *dialog,
+                             gint       response_id,
+                             gpointer   data)
+{
+  if (response_id == FILE_SAVE_RESPONSE_OTHER_DIALOG)
+    {
+      GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog);
+      GtkWindow      *parent;
+      GtkWidget      *other;
+      GFile          *file;
+      gchar          *folder;
+      gchar          *basename;
+
+      parent   = gtk_window_get_transient_for (GTK_WINDOW (dialog));
+      file     = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      folder   = g_path_get_dirname (gimp_file_get_utf8_name (file));
+      basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+      g_object_unref (file);
+
+      other = file_save_dialog_show (GIMP_FILE_DIALOG (file_dialog)->image->gimp,
+                                     GIMP_FILE_DIALOG (file_dialog)->image,
+                                     GTK_WIDGET (parent),
+                                     _("Save Image"),
+                                     FALSE, FALSE, NULL);
+
+      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (other), folder);
+      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (other), basename);
+
+      g_free (folder);
+      g_free (basename);
+    }
+}
+
+static void
+file_new_template_callback (GtkWidget   *widget,
+                            const gchar *name,
+                            gpointer     data)
+{
+  GimpTemplate *template;
+  GimpImage    *image;
+
+  image = (GimpImage *) data;
+
+  if (! (name && strlen (name)))
+    name = _("(Unnamed Template)");
+
+  template = gimp_template_new (name);
+  gimp_template_set_from_image (template, image);
+  gimp_container_add (image->gimp->templates, GIMP_OBJECT (template));
+  g_object_unref (template);
+}
+
+static void
+file_revert_confirm_response (GtkWidget   *dialog,
+                              gint         response_id,
+                              GimpDisplay *display)
+{
+  GimpImage *old_image = gimp_display_get_image (display);
+
+  gtk_widget_destroy (dialog);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      Gimp              *gimp = old_image->gimp;
+      GimpImage         *new_image;
+      GFile             *file;
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+
+      file = gimp_image_get_file (old_image);
+
+      if (! file)
+        file = gimp_image_get_imported_file (old_image);
+
+      new_image = file_open_image (gimp, gimp_get_user_context (gimp),
+                                   GIMP_PROGRESS (display),
+                                   file, file, FALSE, NULL,
+                                   GIMP_RUN_INTERACTIVE,
+                                   &status, NULL, &error);
+
+      if (new_image)
+        {
+          gimp_displays_reconnect (gimp, old_image, new_image);
+          gimp_image_flush (new_image);
+
+          /*  the displays own the image now  */
+          g_object_unref (new_image);
+        }
+      else if (status != GIMP_PDB_CANCEL)
+        {
+          gimp_message (gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
+                        _("Reverting to '%s' failed:\n\n%s"),
+                        gimp_file_get_utf8_name (file), error->message);
+          g_clear_error (&error);
+        }
+    }
+}
diff --git a/app/actions/file-commands.h b/app/actions/file-commands.h
new file mode 100644
index 0000000..47c8750
--- /dev/null
+++ b/app/actions/file-commands.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_COMMANDS_H__
+#define __FILE_COMMANDS_H__
+
+
+void   file_open_cmd_callback                 (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_open_as_layers_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_open_location_cmd_callback        (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_open_recent_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   file_save_cmd_callback                 (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_create_template_cmd_callback      (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   file_revert_cmd_callback               (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_close_all_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_copy_location_cmd_callback        (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_show_in_file_manager_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   file_quit_cmd_callback                 (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   file_file_open_dialog                  (Gimp       *gimp,
+                                               GFile      *file,
+                                               GtkWidget  *parent);
+
+
+#endif /* __FILE_COMMANDS_H__ */
diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c
new file mode 100644
index 0000000..b20c433
--- /dev/null
+++ b/app/actions/filters-actions.c
@@ -0,0 +1,1229 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp-filter-history.h"
+#include "core/gimpimage.h"
+#include "core/gimplayermask.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+
+#include "actions.h"
+#include "filters-actions.h"
+#include "filters-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   filters_actions_set_tooltips    (GimpActionGroup             *group,
+                                               const GimpStringActionEntry *entries,
+                                               gint                         n_entries);
+static void   filters_actions_history_changed (Gimp                        *gimp,
+                                               GimpActionGroup             *group);
+
+
+/*  private variables  */
+
+static const GimpActionEntry filters_menu_actions[] =
+{
+  { "filters-menu",                 NULL, NC_("filters-action",
+                                              "Filte_rs")          },
+  { "filters-recent-menu",          NULL, NC_("filters-action",
+                                              "Recently _Used")     },
+  { "filters-blur-menu",            NULL, NC_("filters-action",
+                                              "_Blur")             },
+  { "filters-noise-menu",           NULL, NC_("filters-action",
+                                              "_Noise")            },
+  { "filters-edge-detect-menu",     NULL, NC_("filters-action",
+                                              "Edge-De_tect")      },
+  { "filters-enhance-menu",         NULL, NC_("filters-action",
+                                              "En_hance")          },
+  { "filters-combine-menu",         NULL, NC_("filters-action",
+                                              "C_ombine")          },
+  { "filters-generic-menu",         NULL, NC_("filters-action",
+                                              "_Generic")          },
+  { "filters-light-shadow-menu",    NULL, NC_("filters-action",
+                                              "_Light and Shadow") },
+  { "filters-distorts-menu",        NULL, NC_("filters-action",
+                                              "_Distorts")         },
+  { "filters-artistic-menu",        NULL, NC_("filters-action",
+                                              "_Artistic")         },
+  { "filters-decor-menu",           NULL, NC_("filters-action",
+                                              "_Decor")            },
+  { "filters-map-menu",             NULL, NC_("filters-action",
+                                              "_Map")              },
+  { "filters-render-menu",          NULL, NC_("filters-action",
+                                              "_Render")           },
+  { "filters-render-clouds-menu",   NULL, NC_("filters-action",
+                                              "_Clouds")           },
+  { "filters-render-fractals-menu", NULL, NC_("filters-action",
+                                              "_Fractals")         },
+  { "filters-render-nature-menu",   NULL, NC_("filters-action",
+                                              "_Nature")           },
+  { "filters-render-noise-menu",    NULL, NC_("filters-action",
+                                              "N_oise")            },
+  { "filters-render-pattern-menu",  NULL, NC_("filters-action",
+                                              "_Pattern")          },
+  { "filters-web-menu",             NULL, NC_("filters-action",
+                                              "_Web")              },
+  { "filters-animation-menu",       NULL, NC_("filters-action",
+                                              "An_imation")        }
+};
+
+static const GimpStringActionEntry filters_actions[] =
+{
+  { "filters-antialias", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Antialias"), NULL, NULL,
+    "gegl:antialias",
+    GIMP_HELP_FILTER_ANTIALIAS },
+
+  { "filters-color-enhance", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Color Enhance"), NULL, NULL,
+    "gegl:color-enhance",
+    GIMP_HELP_FILTER_COLOR_ENHANCE },
+
+  { "filters-invert-linear", GIMP_ICON_INVERT,
+    NC_("filters-action", "L_inear Invert"), NULL, NULL,
+    "gegl:invert-linear",
+    GIMP_HELP_FILTER_INVERT_LINEAR },
+
+  { "filters-invert-perceptual", GIMP_ICON_INVERT,
+    NC_("filters-action", "In_vert"), NULL, NULL,
+    "gegl:invert-gamma",
+    GIMP_HELP_FILTER_INVERT_PERCEPTUAL },
+
+  { "filters-invert-value", GIMP_ICON_INVERT,
+    NC_("filters-action", "_Value Invert"), NULL, NULL,
+    "gegl:value-invert",
+    GIMP_HELP_FILTER_INVERT_VALUE },
+
+  { "filters-stretch-contrast-hsv", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Stretch Contrast HSV"), NULL, NULL,
+    "gegl:stretch-contrast-hsv",
+    GIMP_HELP_FILTER_STRETCH_CONTRAST_HSV }
+};
+
+static const GimpStringActionEntry filters_settings_actions[] =
+{
+  { "filters-dilate", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Dilate"), NULL,
+    NC_("filters-action", "Grow lighter areas of the image"),
+    "gegl:value-propagate\n"
+    "(mode white)"
+    "(lower-threshold 0.000000)"
+    "(upper-threshold 1.000000)"
+    "(rate 1.000000)"
+    "(top yes)"
+    "(left yes)"
+    "(right yes)"
+    "(bottom yes)"
+    "(value yes)"
+    "(alpha no)",
+    GIMP_HELP_FILTER_DILATE },
+
+  { "filters-erode", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Erode"), NULL,
+    NC_("filters-action", "Grow darker areas of the image"),
+    "gegl:value-propagate\n"
+    "(mode black)"
+    "(lower-threshold 0.000000)"
+    "(upper-threshold 1.000000)"
+    "(rate 1.000000)"
+    "(top yes)"
+    "(left yes)"
+    "(right yes)"
+    "(bottom yes)"
+    "(value yes)"
+    "(alpha no)",
+    GIMP_HELP_FILTER_ERODE }
+};
+
+static const GimpStringActionEntry filters_interactive_actions[] =
+{
+  { "filters-alien-map", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Alien Map..."), NULL, NULL,
+    "gegl:alien-map",
+    GIMP_HELP_FILTER_ALIEN_MAP },
+
+  { "filters-apply-canvas", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Apply Canvas..."), NULL, NULL,
+    "gegl:texturize-canvas",
+    GIMP_HELP_FILTER_APPLY_CANVAS },
+
+  { "filters-apply-lens", GIMP_ICON_GEGL,
+    NC_("filters-action", "Apply _Lens..."), NULL, NULL,
+    "gegl:apply-lens",
+    GIMP_HELP_FILTER_APPLY_LENS },
+
+  { "filters-bayer-matrix", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Bayer Matrix..."), NULL, NULL,
+    "gegl:bayer-matrix",
+    GIMP_HELP_FILTER_BAYER_MATRIX },
+
+  { "filters-bloom", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Bloom..."), NULL, NULL,
+    "gegl:bloom",
+    GIMP_HELP_FILTER_BLOOM },
+
+  { "filters-brightness-contrast", GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST,
+    NC_("filters-action", "B_rightness-Contrast..."), NULL, NULL,
+    "gimp:brightness-contrast",
+    GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST },
+
+  { "filters-bump-map", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Bump Map..."), NULL, NULL,
+    "gegl:bump-map",
+    GIMP_HELP_FILTER_BUMP_MAP },
+
+  { "filters-c2g", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Color to Gray..."), NULL, NULL,
+    "gegl:c2g",
+    GIMP_HELP_FILTER_C2G },
+
+  { "filters-cartoon", GIMP_ICON_GEGL,
+    NC_("filters-action", "Ca_rtoon..."), NULL, NULL,
+    "gegl:cartoon",
+    GIMP_HELP_FILTER_CARTOON },
+
+  { "filters-channel-mixer", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Channel Mixer..."), NULL, NULL,
+    "gegl:channel-mixer",
+    GIMP_HELP_FILTER_CHANNEL_MIXER },
+
+  { "filters-checkerboard", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Checkerboard..."), NULL, NULL,
+    "gegl:checkerboard",
+    GIMP_HELP_FILTER_CHECKERBOARD },
+
+  { "filters-color-balance", GIMP_ICON_TOOL_COLOR_BALANCE,
+    NC_("filters-action", "Color _Balance..."), NULL, NULL,
+    "gimp:color-balance",
+    GIMP_HELP_TOOL_COLOR_BALANCE },
+
+  { "filters-color-exchange", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Color Exchange..."), NULL, NULL,
+    "gegl:color-exchange",
+    GIMP_HELP_FILTER_COLOR_EXCHANGE },
+
+  { "filters-colorize", GIMP_ICON_TOOL_COLORIZE,
+    NC_("filters-action", "Colori_ze..."), NULL, NULL,
+    "gimp:colorize",
+    GIMP_HELP_TOOL_COLORIZE },
+
+  { "filters-dither", GIMP_ICON_GEGL,
+    NC_("filters-action", "Dithe_r..."), NULL, NULL,
+    "gegl:dither",
+    GIMP_HELP_FILTER_DITHER },
+
+  { "filters-color-rotate", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Rotate Colors..."), NULL, NULL,
+    "gegl:color-rotate",
+    GIMP_HELP_FILTER_COLOR_ROTATE },
+
+  { "filters-color-temperature", GIMP_ICON_TOOL_COLOR_TEMPERATURE,
+    NC_("filters-action", "Color T_emperature..."), NULL, NULL,
+    "gegl:color-temperature",
+    GIMP_HELP_FILTER_COLOR_TEMPERATURE },
+
+  { "filters-color-to-alpha", GIMP_ICON_GEGL,
+    NC_("filters-action", "Color to _Alpha..."), NULL, NULL,
+    "gegl:color-to-alpha",
+    GIMP_HELP_FILTER_COLOR_TO_ALPHA },
+
+  { "filters-component-extract", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Extract Component..."), NULL, NULL,
+    "gegl:component-extract",
+    GIMP_HELP_FILTER_COMPONENT_EXTRACT },
+
+  { "filters-convolution-matrix", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Convolution Matrix..."), NULL, NULL,
+    "gegl:convolution-matrix",
+    GIMP_HELP_FILTER_CONVOLUTION_MATRIX },
+
+  { "filters-cubism", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Cubism..."), NULL, NULL,
+    "gegl:cubism",
+    GIMP_HELP_FILTER_CUBISM },
+
+  { "filters-curves", GIMP_ICON_TOOL_CURVES,
+    NC_("filters-action", "_Curves..."), NULL, NULL,
+    "gimp:curves",
+    GIMP_HELP_TOOL_CURVES },
+
+  { "filters-deinterlace", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Deinterlace..."), NULL, NULL,
+    "gegl:deinterlace",
+    GIMP_HELP_FILTER_DEINTERLACE },
+
+  { "filters-desaturate", GIMP_ICON_TOOL_DESATURATE,
+    NC_("filters-action", "_Desaturate..."), NULL, NULL,
+    "gimp:desaturate",
+    GIMP_HELP_FILTER_DESATURATE },
+
+  { "filters-difference-of-gaussians", GIMP_ICON_GEGL,
+    NC_("filters-action", "Difference of _Gaussians..."), NULL, NULL,
+    "gegl:difference-of-gaussians",
+    GIMP_HELP_FILTER_DIFFERENCE_OF_GAUSSIANS },
+
+  { "filters-diffraction-patterns", GIMP_ICON_GEGL,
+    NC_("filters-action", "D_iffraction Patterns..."), NULL, NULL,
+    "gegl:diffraction-patterns",
+    GIMP_HELP_FILTER_DIFFRACTION_PATTERNS },
+
+  { "filters-displace", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Displace..."), NULL, NULL,
+    "gegl:displace",
+    GIMP_HELP_FILTER_DISPLACE },
+
+  { "filters-distance-map", GIMP_ICON_GEGL,
+    NC_("filters-action", "Distance _Map..."), NULL, NULL,
+    "gegl:distance-transform",
+    GIMP_HELP_FILTER_DISTANCE_MAP },
+
+  { "filters-dropshadow", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Drop Shadow..."), NULL, NULL,
+    "gegl:dropshadow",
+    GIMP_HELP_FILTER_DROPSHADOW },
+
+  { "filters-edge", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Edge..."), NULL, NULL,
+    "gegl:edge",
+    GIMP_HELP_FILTER_EDGE },
+
+  { "filters-edge-laplace", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Laplace"), NULL, NULL,
+    "gegl:edge-laplace",
+    GIMP_HELP_FILTER_EDGE_LAPLACE },
+
+  { "filters-edge-neon", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Neon..."), NULL, NULL,
+    "gegl:edge-neon",
+    GIMP_HELP_FILTER_EDGE_NEON },
+
+  { "filters-edge-sobel", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Sobel..."), NULL, NULL,
+    "gegl:edge-sobel",
+    GIMP_HELP_FILTER_EDGE_SOBEL },
+
+  { "filters-emboss", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Emboss..."), NULL, NULL,
+    "gegl:emboss",
+    GIMP_HELP_FILTER_EMBOSS },
+
+  { "filters-engrave", GIMP_ICON_GEGL,
+    NC_("filters-action", "En_grave..."), NULL, NULL,
+    "gegl:engrave",
+    GIMP_HELP_FILTER_ENGRAVE },
+
+  { "filters-exposure", GIMP_ICON_TOOL_EXPOSURE,
+    NC_("filters-action", "E_xposure..."), NULL, NULL,
+    "gegl:exposure",
+    GIMP_HELP_FILTER_EXPOSURE },
+
+  { "filters-fattal-2002", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Fattal et al. 2002..."), NULL, NULL,
+    "gegl:fattal02",
+    GIMP_HELP_FILTER_FATTAL_2002 },
+
+  { "filters-focus-blur", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Focus Blur..."), NULL, NULL,
+    "gegl:focus-blur",
+    GIMP_HELP_FILTER_FOCUS_BLUR },
+
+  { "filters-fractal-trace", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Fractal Trace..."), NULL, NULL,
+    "gegl:fractal-trace",
+    GIMP_HELP_FILTER_FRACTAL_TRACE },
+
+  { "filters-gaussian-blur", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Gaussian Blur..."), NULL, NULL,
+    "gegl:gaussian-blur",
+    GIMP_HELP_FILTER_GAUSSIAN_BLUR },
+
+  { "filters-gaussian-blur-selective", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Selective Gaussian Blur..."), NULL, NULL,
+    "gegl:gaussian-blur-selective",
+    GIMP_HELP_FILTER_GAUSSIAN_BLUR_SELECTIVE },
+
+  { "filters-gegl-graph", GIMP_ICON_GEGL,
+    NC_("filters-action", "_GEGL graph..."), NULL, NULL,
+    "gegl:gegl",
+    GIMP_HELP_FILTER_GEGL_GRAPH },
+
+  { "filters-grid", GIMP_ICON_GRID,
+    NC_("filters-action", "_Grid..."), NULL, NULL,
+    "gegl:grid",
+    GIMP_HELP_FILTER_GRID },
+
+  { "filters-high-pass", GIMP_ICON_GEGL,
+    NC_("filters-action", "_High Pass..."), NULL, NULL,
+    "gegl:high-pass",
+    GIMP_HELP_FILTER_HIGH_PASS },
+
+  { "filters-hue-chroma", GIMP_ICON_GEGL,
+    NC_("filters-action", "Hue-_Chroma..."), NULL, NULL,
+    "gegl:hue-chroma",
+    GIMP_HELP_FILTER_HUE_CHROMA },
+
+  { "filters-hue-saturation", GIMP_ICON_TOOL_HUE_SATURATION,
+    NC_("filters-action", "Hue-_Saturation..."), NULL, NULL,
+    "gimp:hue-saturation",
+    GIMP_HELP_TOOL_HUE_SATURATION },
+
+  { "filters-illusion", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Illusion..."), NULL, NULL,
+    "gegl:illusion",
+    GIMP_HELP_FILTER_ILLUSION },
+
+  { "filters-image-gradient", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Image Gradient..."), NULL, NULL,
+    "gegl:image-gradient",
+    GIMP_HELP_FILTER_IMAGE_GRADIENT },
+
+  { "filters-kaleidoscope", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Kaleidoscope..."), NULL, NULL,
+    "gegl:mirrors",
+    GIMP_HELP_FILTER_KALEIDOSCOPE },
+
+  { "filters-lens-blur", GIMP_ICON_GEGL,
+    NC_("filters-action", "Le_ns Blur..."), NULL, NULL,
+    "gegl:lens-blur",
+    GIMP_HELP_FILTER_LENS_BLUR },
+
+  { "filters-lens-distortion", GIMP_ICON_GEGL,
+    NC_("filters-action", "Le_ns Distortion..."), NULL, NULL,
+    "gegl:lens-distortion",
+    GIMP_HELP_FILTER_LENS_DISTORTION },
+
+  { "filters-lens-flare", GIMP_ICON_GEGL,
+    NC_("filters-action", "Lens _Flare..."), NULL, NULL,
+    "gegl:lens-flare",
+    GIMP_HELP_FILTER_LENS_FLARE },
+
+  { "filters-levels", GIMP_ICON_TOOL_LEVELS,
+    NC_("filters-action", "_Levels..."), NULL, NULL,
+    "gimp:levels",
+    GIMP_HELP_TOOL_LEVELS },
+
+  { "filters-linear-sinusoid", GIMP_ICON_TOOL_LEVELS,
+    NC_("filters-action", "_Linear Sinusoid..."), NULL, NULL,
+    "gegl:linear-sinusoid",
+    GIMP_HELP_FILTER_LINEAR_SINUSOID },
+
+  { "filters-little-planet", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Little Planet..."), NULL, NULL,
+    "gegl:stereographic-projection",
+    GIMP_HELP_FILTER_LITTLE_PLANET },
+
+  { "filters-long-shadow", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Long Shadow..."), NULL, NULL,
+    "gegl:long-shadow",
+    GIMP_HELP_FILTER_LONG_SHADOW },
+
+  { "filters-mantiuk-2006", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Mantiuk 2006..."), NULL, NULL,
+    "gegl:mantiuk06",
+    GIMP_HELP_FILTER_MANTIUK_2006 },
+
+  { "filters-maze", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Maze..."), NULL, NULL,
+    "gegl:maze",
+    GIMP_HELP_FILTER_MAZE },
+
+  { "filters-mean-curvature-blur", GIMP_ICON_GEGL,
+    NC_("filters-action", "Mean C_urvature Blur..."), NULL, NULL,
+    "gegl:mean-curvature-blur",
+    GIMP_HELP_FILTER_MEAN_CURVATURE_BLUR },
+
+  { "filters-median-blur", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Median Blur..."), NULL, NULL,
+    "gegl:median-blur",
+    GIMP_HELP_FILTER_MEDIAN_BLUR },
+
+  { "filters-mono-mixer", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Mono Mixer..."), NULL, NULL,
+    "gegl:mono-mixer",
+    GIMP_HELP_FILTER_MONO_MIXER },
+
+  { "filters-mosaic", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Mosaic..."), NULL, NULL,
+    "gegl:mosaic",
+    GIMP_HELP_FILTER_MOSAIC },
+
+  { "filters-motion-blur-circular", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Circular Motion Blur..."), NULL, NULL,
+    "gegl:motion-blur-circular",
+    GIMP_HELP_FILTER_MOTION_BLUR_CIRCULAR },
+
+  { "filters-motion-blur-linear", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Linear Motion Blur..."), NULL, NULL,
+    "gegl:motion-blur-linear",
+    GIMP_HELP_FILTER_MOTION_BLUR_LINEAR },
+
+  { "filters-motion-blur-zoom", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Zoom Motion Blur..."), NULL, NULL,
+    "gegl:motion-blur-zoom",
+    GIMP_HELP_FILTER_MOTION_BLUR_ZOOM },
+
+  { "filters-noise-cell", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Cell Noise..."), NULL, NULL,
+    "gegl:cell-noise",
+    GIMP_HELP_FILTER_NOISE_CELL },
+
+  { "filters-newsprint", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Newsprint..."), NULL, NULL,
+    "gegl:newsprint",
+    GIMP_HELP_FILTER_NEWSPRINT },
+
+  { "filters-noise-cie-lch", GIMP_ICON_GEGL,
+    NC_("filters-action", "_CIE lch Noise..."), NULL, NULL,
+    "gegl:noise-cie-lch",
+    GIMP_HELP_FILTER_NOISE_CIE_LCH },
+
+  { "filters-noise-hsv", GIMP_ICON_GEGL,
+    NC_("filters-action", "HS_V Noise..."), NULL, NULL,
+    "gegl:noise-hsv",
+    GIMP_HELP_FILTER_NOISE_HSV },
+
+  { "filters-noise-hurl", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Hurl..."), NULL, NULL,
+    "gegl:noise-hurl",
+    GIMP_HELP_FILTER_NOISE_HURL },
+
+  { "filters-noise-perlin", GIMP_ICON_GEGL,
+    NC_("filters-action", "Perlin _Noise..."), NULL, NULL,
+    "gegl:perlin-noise",
+    GIMP_HELP_FILTER_NOISE_PERLIN },
+
+  { "filters-noise-pick", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Pick..."), NULL, NULL,
+    "gegl:noise-pick",
+    GIMP_HELP_FILTER_NOISE_PICK },
+
+  { "filters-noise-rgb", GIMP_ICON_GEGL,
+    NC_("filters-action", "_RGB Noise..."), NULL, NULL,
+    "gegl:noise-rgb",
+    GIMP_HELP_FILTER_NOISE_RGB },
+
+  { "filters-noise-reduction", GIMP_ICON_GEGL,
+    NC_("filters-action", "Noise R_eduction..."), NULL, NULL,
+    "gegl:noise-reduction",
+    GIMP_HELP_FILTER_NOISE_REDUCTION },
+
+  { "filters-noise-simplex", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Simplex Noise..."), NULL, NULL,
+    "gegl:simplex-noise",
+    GIMP_HELP_FILTER_NOISE_SIMPLEX },
+
+  { "filters-noise-slur", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Slur..."), NULL, NULL,
+    "gegl:noise-slur",
+    GIMP_HELP_FILTER_NOISE_SLUR },
+
+  { "filters-noise-solid", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Solid Noise..."), NULL, NULL,
+    "gegl:noise-solid",
+    GIMP_HELP_FILTER_NOISE_SOLID },
+
+  { "filters-noise-spread", GIMP_ICON_GEGL,
+    NC_("filters-action", "Sp_read..."), NULL, NULL,
+    "gegl:noise-spread",
+    GIMP_HELP_FILTER_NOISE_SPREAD },
+
+  { "filters-normal-map", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Normal Map..."), NULL, NULL,
+    "gegl:normal-map",
+    GIMP_HELP_FILTER_NORMAL_MAP },
+
+  { "filters-offset", GIMP_ICON_TOOL_OFFSET,
+    NC_("filters-action", "_Offset..."), "<primary><shift>O", NULL,
+    "gimp:offset",
+    GIMP_HELP_TOOL_OFFSET },
+
+  { "filters-oilify", GIMP_ICON_GEGL,
+    NC_("filters-action", "Oili_fy..."), NULL, NULL,
+    "gegl:oilify",
+    GIMP_HELP_FILTER_OILIFY },
+
+  { "filters-panorama-projection", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Panorama Projection..."), NULL, NULL,
+    "gegl:panorama-projection",
+    GIMP_HELP_FILTER_PANORAMA_PROJECTION },
+
+  { "filters-photocopy", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Photocopy..."), NULL, NULL,
+    "gegl:photocopy",
+    GIMP_HELP_FILTER_PHOTOCOPY },
+
+  { "filters-pixelize", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Pixelize..."), NULL, NULL,
+    "gegl:pixelize",
+    GIMP_HELP_FILTER_PIXELIZE },
+
+  { "filters-plasma", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Plasma..."), NULL, NULL,
+    "gegl:plasma",
+    GIMP_HELP_FILTER_PLASMA },
+
+  { "filters-polar-coordinates", GIMP_ICON_GEGL,
+    NC_("filters-action", "P_olar Coordinates..."), NULL, NULL,
+    "gegl:polar-coordinates",
+    GIMP_HELP_FILTER_POLAR_COORDINATES },
+
+  { "filters-posterize", GIMP_ICON_TOOL_POSTERIZE,
+    NC_("filters-action", "_Posterize..."), NULL, NULL,
+    "gimp:posterize",
+    GIMP_HELP_FILTER_POSTERIZE },
+
+  { "filters-recursive-transform", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Recursive Transform..."), NULL, NULL,
+    "gegl:recursive-transform",
+    GIMP_HELP_FILTER_RECURSIVE_TRANSFORM },
+
+  { "filters-red-eye-removal", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Red Eye Removal..."), NULL, NULL,
+    "gegl:red-eye-removal",
+    GIMP_HELP_FILTER_RED_EYE_REMOVAL },
+
+  { "filters-reinhard-2005", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Reinhard 2005..."), NULL, NULL,
+    "gegl:reinhard05",
+    GIMP_HELP_FILTER_REINHARD_2005 },
+
+  { "filters-rgb-clip", GIMP_ICON_GEGL,
+    NC_("filters-action", "RGB _Clip..."), NULL, NULL,
+    "gegl:rgb-clip",
+    GIMP_HELP_FILTER_RGB_CLIP },
+
+  { "filters-ripple", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Ripple..."), NULL, NULL,
+    "gegl:ripple",
+    GIMP_HELP_FILTER_RIPPLE },
+
+  { "filters-saturation", GIMP_ICON_GEGL,
+    NC_("filters-action", "Sat_uration..."), NULL, NULL,
+    "gegl:saturation",
+    GIMP_HELP_FILTER_SATURATION },
+
+  { "filters-semi-flatten", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Semi-Flatten..."), NULL, NULL,
+    "gimp:semi-flatten",
+    GIMP_HELP_FILTER_SEMI_FLATTEN },
+
+  { "filters-sepia", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Sepia..."), NULL, NULL,
+    "gegl:sepia",
+    GIMP_HELP_FILTER_SEPIA },
+
+  { "filters-shadows-highlights", GIMP_ICON_TOOL_SHADOWS_HIGHLIGHTS,
+    NC_("filters-action", "S_hadows-Highlights..."), NULL, NULL,
+    "gegl:shadows-highlights",
+    GIMP_HELP_FILTER_SHADOWS_HIGHLIGHTS },
+
+  { "filters-shift", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Shift..."), NULL, NULL,
+    "gegl:shift",
+    GIMP_HELP_FILTER_SHIFT },
+
+  { "filters-sinus", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Sinus..."), NULL, NULL,
+    "gegl:sinus",
+    GIMP_HELP_FILTER_SINUS },
+
+  { "filters-slic", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Simple Linear Iterative Clustering..."), NULL, NULL,
+    "gegl:slic",
+    GIMP_HELP_FILTER_SLIC },
+
+  { "filters-snn-mean", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Symmetric Nearest Neighbor..."), NULL, NULL,
+    "gegl:snn-mean",
+    GIMP_HELP_FILTER_SNN_MEAN },
+
+  { "filters-softglow", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Softglow..."), NULL, NULL,
+    "gegl:softglow",
+    GIMP_HELP_FILTER_SOFTGLOW },
+
+  { "filters-spherize", GIMP_ICON_GEGL,
+    NC_("filters-action", "Spheri_ze..."), NULL, NULL,
+    "gegl:spherize",
+    GIMP_HELP_FILTER_SPHERIZE },
+
+  { "filters-spiral", GIMP_ICON_GEGL,
+    NC_("filters-action", "S_piral..."), NULL, NULL,
+    "gegl:spiral",
+    GIMP_HELP_FILTER_SPIRAL },
+
+  { "filters-stretch-contrast", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Stretch Contrast..."), NULL, NULL,
+    "gegl:stretch-contrast",
+    GIMP_HELP_FILTER_STRETCH_CONTRAST },
+
+  { "filters-stress", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Stress..."), NULL, NULL,
+    "gegl:stress",
+    GIMP_HELP_FILTER_STRESS },
+
+  { "filters-supernova", GIMP_ICON_GEGL,
+    NC_("filters-action", "Super_nova..."), NULL, NULL,
+    "gegl:supernova",
+    GIMP_HELP_FILTER_SUPERNOVA },
+
+  { "filters-threshold", GIMP_ICON_TOOL_THRESHOLD,
+    NC_("filters-action", "_Threshold..."), NULL, NULL,
+    "gimp:threshold",
+    GIMP_HELP_TOOL_THRESHOLD },
+
+  { "filters-threshold-alpha", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Threshold Alpha..."), NULL, NULL,
+    "gimp:threshold-alpha",
+    GIMP_HELP_FILTER_THRESHOLD_ALPHA },
+
+  { "filters-tile-glass", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Glass Tile..."), NULL, NULL,
+    "gegl:tile-glass",
+    GIMP_HELP_FILTER_TILE_GLASS },
+
+  { "filters-tile-paper", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Paper Tile..."), NULL, NULL,
+    "gegl:tile-paper",
+    GIMP_HELP_FILTER_TILE_PAPER },
+
+  { "filters-tile-seamless", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Tile Seamless..."), NULL, NULL,
+    "gegl:tile-seamless",
+    GIMP_HELP_FILTER_TILE_SEAMLESS },
+
+  { "filters-unsharp-mask", GIMP_ICON_GEGL,
+    NC_("filters-action", "Sharpen (_Unsharp Mask)..."), NULL, NULL,
+    "gegl:unsharp-mask",
+    GIMP_HELP_FILTER_UNSHARP_MASK },
+
+  { "filters-value-propagate", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Value Propagate..."), NULL, NULL,
+    "gegl:value-propagate",
+    GIMP_HELP_FILTER_VALUE_PROPAGATE },
+
+  { "filters-variable-blur", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Variable Blur..."), NULL, NULL,
+    "gegl:variable-blur",
+    GIMP_HELP_FILTER_VARIABLE_BLUR },
+
+  { "filters-video-degradation", GIMP_ICON_GEGL,
+    NC_("filters-action", "Vi_deo Degradation..."), NULL, NULL,
+    "gegl:video-degradation",
+    GIMP_HELP_FILTER_VIDEO_DEGRADATION },
+
+  { "filters-vignette", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Vignette..."), NULL, NULL,
+    "gegl:vignette",
+    GIMP_HELP_FILTER_VIGNETTE },
+
+  { "filters-waterpixels", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Waterpixels..."), NULL, NULL,
+    "gegl:waterpixels",
+    GIMP_HELP_FILTER_WATERPIXELS },
+
+  { "filters-waves", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Waves..."), NULL, NULL,
+    "gegl:waves",
+    GIMP_HELP_FILTER_WAVES },
+
+  { "filters-whirl-pinch", GIMP_ICON_GEGL,
+    NC_("filters-action", "W_hirl and Pinch..."), NULL, NULL,
+    "gegl:whirl-pinch",
+    GIMP_HELP_FILTER_WHIRL_PINCH },
+
+  { "filters-wind", GIMP_ICON_GEGL,
+    NC_("filters-action", "W_ind..."), NULL, NULL,
+    "gegl:wind",
+    GIMP_HELP_FILTER_WIND }
+};
+
+static const GimpEnumActionEntry filters_repeat_actions[] =
+{
+  { "filters-repeat", GIMP_ICON_SYSTEM_RUN,
+    NC_("filters-action", "Re_peat Last"), "<primary>F",
+    NC_("filters-action",
+        "Rerun the last used filter using the same settings"),
+    GIMP_RUN_WITH_LAST_VALS, FALSE,
+    GIMP_HELP_FILTER_REPEAT },
+
+  { "filters-reshow", GIMP_ICON_DIALOG_RESHOW_FILTER,
+    NC_("filters-action", "R_e-Show Last"), "<primary><shift>F",
+    NC_("filters-action", "Show the last used filter dialog again"),
+    GIMP_RUN_INTERACTIVE, FALSE,
+    GIMP_HELP_FILTER_RESHOW }
+};
+
+
+void
+filters_actions_setup (GimpActionGroup *group)
+{
+  GimpProcedureActionEntry *entries;
+  gint                      n_entries;
+  gint                      i;
+
+  gimp_action_group_add_actions (group, "filters-action",
+                                 filters_menu_actions,
+                                 G_N_ELEMENTS (filters_menu_actions));
+
+  gimp_action_group_add_string_actions (group, "filters-action",
+                                        filters_actions,
+                                        G_N_ELEMENTS (filters_actions),
+                                        filters_apply_cmd_callback);
+  filters_actions_set_tooltips (group, filters_actions,
+                                G_N_ELEMENTS (filters_actions));
+
+  gimp_action_group_add_string_actions (group, "filters-action",
+                                        filters_settings_actions,
+                                        G_N_ELEMENTS (filters_settings_actions),
+                                        filters_apply_cmd_callback);
+  filters_actions_set_tooltips (group, filters_settings_actions,
+                                G_N_ELEMENTS (filters_settings_actions));
+
+  gimp_action_group_add_string_actions (group, "filters-action",
+                                        filters_interactive_actions,
+                                        G_N_ELEMENTS (filters_interactive_actions),
+                                        filters_apply_interactive_cmd_callback);
+  filters_actions_set_tooltips (group, filters_interactive_actions,
+                                G_N_ELEMENTS (filters_interactive_actions));
+
+  gimp_action_group_add_enum_actions (group, "filters-action",
+                                      filters_repeat_actions,
+                                      G_N_ELEMENTS (filters_repeat_actions),
+                                      filters_repeat_cmd_callback);
+
+  n_entries = gimp_filter_history_size (group->gimp);
+
+  entries = g_new0 (GimpProcedureActionEntry, n_entries);
+
+  for (i = 0; i < n_entries; i++)
+    {
+      entries[i].name        = g_strdup_printf ("filters-recent-%02d", i + 1);
+      entries[i].icon_name   = NULL;
+      entries[i].label       = "";
+      entries[i].accelerator = "";
+      entries[i].tooltip     = NULL;
+      entries[i].procedure   = NULL;
+      entries[i].help_id     = GIMP_HELP_FILTER_RESHOW;
+    }
+
+  gimp_action_group_add_procedure_actions (group, entries, n_entries,
+                                           filters_history_cmd_callback);
+
+  for (i = 0; i < n_entries; i++)
+    {
+      gimp_action_group_set_action_visible (group, entries[i].name, FALSE);
+      g_free ((gchar *) entries[i].name);
+    }
+
+  g_free (entries);
+
+  g_signal_connect_object (group->gimp, "filter-history-changed",
+                           G_CALLBACK (filters_actions_history_changed),
+                           group, 0);
+
+  filters_actions_history_changed (group->gimp, group);
+}
+
+void
+filters_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable       = NULL;
+  gboolean      writable       = FALSE;
+  gboolean      gray           = FALSE;
+  gboolean      alpha          = FALSE;
+  gboolean      supports_alpha = FALSE;
+
+  image = action_data_get_image (data);
+
+  if (image)
+    {
+      drawable = gimp_image_get_active_drawable (image);
+
+      if (drawable)
+        {
+          GimpItem *item;
+
+          gray           = gimp_drawable_is_gray (drawable);
+          alpha          = gimp_drawable_has_alpha (drawable);
+          supports_alpha = gimp_drawable_supports_alpha (drawable);
+
+          if (GIMP_IS_LAYER_MASK (drawable))
+            item = GIMP_ITEM (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+          else
+            item = GIMP_ITEM (drawable);
+
+          writable = ! gimp_item_is_content_locked (item);
+
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+            writable = FALSE;
+        }
+   }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("filters-alien-map",               writable);
+  SET_SENSITIVE ("filters-antialias",               writable);
+  SET_SENSITIVE ("filters-apply-canvas",            writable);
+  SET_SENSITIVE ("filters-apply-lens",              writable);
+  SET_SENSITIVE ("filters-bayer-matrix",            writable);
+  SET_SENSITIVE ("filters-bloom",                   writable);
+  SET_SENSITIVE ("filters-brightness-contrast",     writable);
+  SET_SENSITIVE ("filters-bump-map",                writable);
+  SET_SENSITIVE ("filters-c2g",                     writable && !gray);
+  SET_SENSITIVE ("filters-cartoon",                 writable);
+  SET_SENSITIVE ("filters-channel-mixer",           writable);
+  SET_SENSITIVE ("filters-checkerboard",            writable);
+  SET_SENSITIVE ("filters-color-balance",           writable && !gray);
+  SET_SENSITIVE ("filters-color-enhance",           writable && !gray);
+  SET_SENSITIVE ("filters-color-exchange",          writable);
+  SET_SENSITIVE ("filters-colorize",                writable && !gray);
+  SET_SENSITIVE ("filters-dither",                  writable);
+  SET_SENSITIVE ("filters-color-rotate",            writable);
+  SET_SENSITIVE ("filters-color-temperature",       writable && !gray);
+  SET_SENSITIVE ("filters-color-to-alpha",          writable && supports_alpha);
+  SET_SENSITIVE ("filters-component-extract",       writable);
+  SET_SENSITIVE ("filters-convolution-matrix",      writable);
+  SET_SENSITIVE ("filters-cubism",                  writable);
+  SET_SENSITIVE ("filters-curves",                  writable);
+  SET_SENSITIVE ("filters-deinterlace",             writable);
+  SET_SENSITIVE ("filters-desaturate",              writable && !gray);
+  SET_SENSITIVE ("filters-difference-of-gaussians", writable);
+  SET_SENSITIVE ("filters-diffraction-patterns",    writable);
+  SET_SENSITIVE ("filters-dilate",                  writable);
+  SET_SENSITIVE ("filters-displace",                writable);
+  SET_SENSITIVE ("filters-distance-map",            writable);
+  SET_SENSITIVE ("filters-dropshadow",              writable && alpha);
+  SET_SENSITIVE ("filters-edge",                    writable);
+  SET_SENSITIVE ("filters-edge-laplace",            writable);
+  SET_SENSITIVE ("filters-edge-neon",               writable);
+  SET_SENSITIVE ("filters-edge-sobel",              writable);
+  SET_SENSITIVE ("filters-emboss",                  writable);
+  SET_SENSITIVE ("filters-engrave",                 writable);
+  SET_SENSITIVE ("filters-erode",                   writable);
+  SET_SENSITIVE ("filters-exposure",                writable);
+  SET_SENSITIVE ("filters-fattal-2002",             writable);
+  SET_SENSITIVE ("filters-focus-blur",              writable);
+  SET_SENSITIVE ("filters-fractal-trace",           writable);
+  SET_SENSITIVE ("filters-gaussian-blur",           writable);
+  SET_SENSITIVE ("filters-gaussian-blur-selective", writable);
+  SET_SENSITIVE ("filters-gegl-graph",              writable);
+  SET_SENSITIVE ("filters-grid",                    writable);
+  SET_SENSITIVE ("filters-high-pass",               writable);
+  SET_SENSITIVE ("filters-hue-chroma",              writable);
+  SET_SENSITIVE ("filters-hue-saturation",          writable && !gray);
+  SET_SENSITIVE ("filters-illusion",                writable);
+  SET_SENSITIVE ("filters-invert-linear",           writable);
+  SET_SENSITIVE ("filters-invert-perceptual",       writable);
+  SET_SENSITIVE ("filters-invert-value",            writable);
+  SET_SENSITIVE ("filters-image-gradient",          writable);
+  SET_SENSITIVE ("filters-kaleidoscope",            writable);
+  SET_SENSITIVE ("filters-lens-blur",               writable);
+  SET_SENSITIVE ("filters-lens-distortion",         writable);
+  SET_SENSITIVE ("filters-lens-flare",              writable);
+  SET_SENSITIVE ("filters-levels",                  writable);
+  SET_SENSITIVE ("filters-linear-sinusoid",         writable);
+  SET_SENSITIVE ("filters-little-planet",           writable);
+  SET_SENSITIVE ("filters-long-shadow",             writable && alpha);
+  SET_SENSITIVE ("filters-mantiuk-2006",            writable);
+  SET_SENSITIVE ("filters-maze",                    writable);
+  SET_SENSITIVE ("filters-mean-curvature-blur",     writable);
+  SET_SENSITIVE ("filters-median-blur",             writable);
+  SET_SENSITIVE ("filters-mono-mixer",              writable && !gray);
+  SET_SENSITIVE ("filters-mosaic",                  writable);
+  SET_SENSITIVE ("filters-motion-blur-circular",    writable);
+  SET_SENSITIVE ("filters-motion-blur-linear",      writable);
+  SET_SENSITIVE ("filters-motion-blur-zoom",        writable);
+  SET_SENSITIVE ("filters-newsprint",               writable);
+  SET_SENSITIVE ("filters-noise-cell",              writable);
+  SET_SENSITIVE ("filters-noise-cie-lch",           writable);
+  SET_SENSITIVE ("filters-noise-hsv",               writable && !gray);
+  SET_SENSITIVE ("filters-noise-hurl",              writable);
+  SET_SENSITIVE ("filters-noise-perlin",            writable);
+  SET_SENSITIVE ("filters-noise-pick",              writable);
+  SET_SENSITIVE ("filters-noise-reduction",         writable);
+  SET_SENSITIVE ("filters-noise-rgb",               writable);
+  SET_SENSITIVE ("filters-noise-simplex",           writable);
+  SET_SENSITIVE ("filters-noise-slur",              writable);
+  SET_SENSITIVE ("filters-noise-solid",             writable);
+  SET_SENSITIVE ("filters-noise-spread",            writable);
+  SET_SENSITIVE ("filters-normal-map",              writable);
+  SET_SENSITIVE ("filters-offset",                  writable);
+  SET_SENSITIVE ("filters-oilify",                  writable);
+  SET_SENSITIVE ("filters-panorama-projection",     writable);
+  SET_SENSITIVE ("filters-photocopy",               writable);
+  SET_SENSITIVE ("filters-pixelize",                writable);
+  SET_SENSITIVE ("filters-plasma",                  writable);
+  SET_SENSITIVE ("filters-polar-coordinates",       writable);
+  SET_SENSITIVE ("filters-posterize",               writable);
+  SET_SENSITIVE ("filters-recursive-transform",     writable);
+  SET_SENSITIVE ("filters-red-eye-removal",         writable && !gray);
+  SET_SENSITIVE ("filters-reinhard-2005",           writable);
+  SET_SENSITIVE ("filters-rgb-clip",                writable);
+  SET_SENSITIVE ("filters-ripple",                  writable);
+  SET_SENSITIVE ("filters-saturation",              writable && !gray);
+  SET_SENSITIVE ("filters-semi-flatten",            writable && alpha);
+  SET_SENSITIVE ("filters-sepia",                   writable && !gray);
+  SET_SENSITIVE ("filters-shadows-highlights",      writable);
+  SET_SENSITIVE ("filters-shift",                   writable);
+  SET_SENSITIVE ("filters-sinus",                   writable);
+  SET_SENSITIVE ("filters-slic",                    writable);
+  SET_SENSITIVE ("filters-snn-mean",                writable);
+  SET_SENSITIVE ("filters-softglow",                writable);
+  SET_SENSITIVE ("filters-spherize",                writable);
+  SET_SENSITIVE ("filters-spiral",                  writable);
+  SET_SENSITIVE ("filters-stretch-contrast",        writable);
+  SET_SENSITIVE ("filters-stretch-contrast-hsv",    writable);
+  SET_SENSITIVE ("filters-stress",                  writable);
+  SET_SENSITIVE ("filters-supernova",               writable);
+  SET_SENSITIVE ("filters-threshold",               writable);
+  SET_SENSITIVE ("filters-threshold-alpha",         writable && alpha);
+  SET_SENSITIVE ("filters-tile-glass",              writable);
+  SET_SENSITIVE ("filters-tile-paper",              writable);
+  SET_SENSITIVE ("filters-tile-seamless",           writable);
+  SET_SENSITIVE ("filters-unsharp-mask",            writable);
+  SET_SENSITIVE ("filters-value-propagate",         writable);
+  SET_SENSITIVE ("filters-variable-blur",           writable);
+  SET_SENSITIVE ("filters-video-degradation",       writable);
+  SET_SENSITIVE ("filters-vignette",                writable);
+  SET_SENSITIVE ("filters-waterpixels",             writable);
+  SET_SENSITIVE ("filters-waves",                   writable);
+  SET_SENSITIVE ("filters-whirl-pinch",             writable);
+  SET_SENSITIVE ("filters-wind",                    writable);
+
+#undef SET_SENSITIVE
+
+  {
+    GimpProcedure *proc = gimp_filter_history_nth (group->gimp, 0);
+    gint           i;
+
+    if (proc &&
+        gimp_procedure_get_sensitive (proc, GIMP_OBJECT (drawable), NULL))
+      {
+        gimp_action_group_set_action_sensitive (group, "filters-repeat", TRUE);
+        gimp_action_group_set_action_sensitive (group, "filters-reshow", TRUE);
+      }
+    else
+      {
+        gimp_action_group_set_action_sensitive (group, "filters-repeat", FALSE);
+        gimp_action_group_set_action_sensitive (group, "filters-reshow", FALSE);
+     }
+
+    for (i = 0; i < gimp_filter_history_length (group->gimp); i++)
+      {
+        gchar    *name = g_strdup_printf ("filters-recent-%02d", i + 1);
+        gboolean  sensitive;
+
+        proc = gimp_filter_history_nth (group->gimp, i);
+
+        sensitive = gimp_procedure_get_sensitive (proc, GIMP_OBJECT (drawable),
+                                                  NULL);
+
+        gimp_action_group_set_action_sensitive (group, name, sensitive);
+
+        g_free (name);
+      }
+  }
+}
+
+static void
+filters_actions_set_tooltips (GimpActionGroup             *group,
+                              const GimpStringActionEntry *entries,
+                              gint                         n_entries)
+{
+  gint i;
+
+  for (i = 0; i < n_entries; i++)
+    {
+      const GimpStringActionEntry *entry = entries + i;
+      const gchar                 *description;
+
+      description = gegl_operation_get_key (entry->value, "description");
+
+      if (description)
+        gimp_action_group_set_action_tooltip (group, entry->name,
+                                              description);
+    }
+}
+
+static GimpActionGroup *
+filters_actions_get_plug_in_group (GimpActionGroup *group)
+{
+  GList *list;
+
+  for (list = gimp_ui_managers_from_name ("<Image>");
+       list;
+       list = g_list_next (list))
+    {
+      GimpUIManager *manager = list->data;
+
+      /* if this is our UI manager */
+      if (gimp_ui_manager_get_action_group (manager, "filters") == group)
+        return gimp_ui_manager_get_action_group (manager, "plug-in");
+    }
+
+  /* this happens during initial UI manager construction */
+  return NULL;
+}
+
+static void
+filters_actions_history_changed (Gimp            *gimp,
+                                 GimpActionGroup *group)
+{
+  GimpProcedure   *proc;
+  GimpActionGroup *plug_in_group;
+  gint             i;
+
+  plug_in_group = filters_actions_get_plug_in_group (group);
+
+  proc = gimp_filter_history_nth (gimp, 0);
+
+  if (proc)
+    {
+      GimpAction  *actual_action = NULL;
+      const gchar *label;
+      gchar       *repeat;
+      gchar       *reshow;
+      gboolean     sensitive = FALSE;
+
+      label = gimp_procedure_get_label (proc);
+
+      repeat = g_strdup_printf (_("Re_peat \"%s\""),  label);
+      reshow = g_strdup_printf (_("R_e-Show \"%s\""), label);
+
+      gimp_action_group_set_action_label (group, "filters-repeat", repeat);
+      gimp_action_group_set_action_label (group, "filters-reshow", reshow);
+
+      g_free (repeat);
+      g_free (reshow);
+
+      if (g_str_has_prefix (gimp_object_get_name (proc), "filters-"))
+        {
+          actual_action =
+            gimp_action_group_get_action (group,
+                                          gimp_object_get_name (proc));
+        }
+      else if (plug_in_group)
+        {
+          /*  copy the sensitivity of the plug-in procedure's actual
+           *  action instead of calling filters_actions_update()
+           *  because doing the latter would set the sensitivity of
+           *  this image's action on all images' actions. See bug
+           *  #517683.
+           */
+          actual_action =
+            gimp_action_group_get_action (plug_in_group,
+                                          gimp_object_get_name (proc));
+        }
+
+      if (actual_action)
+        sensitive = gimp_action_get_sensitive (actual_action);
+
+      gimp_action_group_set_action_sensitive (group, "filters-repeat",
+                                              sensitive);
+      gimp_action_group_set_action_sensitive (group, "filters-reshow",
+                                              sensitive);
+   }
+  else
+    {
+      gimp_action_group_set_action_label (group, "filters-repeat",
+                                          _("Repeat Last"));
+      gimp_action_group_set_action_label (group, "filters-reshow",
+                                          _("Re-Show Last"));
+
+      gimp_action_group_set_action_sensitive (group, "filters-repeat", FALSE);
+      gimp_action_group_set_action_sensitive (group, "filters-reshow", FALSE);
+    }
+
+  for (i = 0; i < gimp_filter_history_length (gimp); i++)
+    {
+      GimpAction  *action;
+      GimpAction  *actual_action = NULL;
+      const gchar *label;
+      gchar       *name;
+      gboolean     sensitive = FALSE;
+
+      name = g_strdup_printf ("filters-recent-%02d", i + 1);
+      action = gimp_action_group_get_action (group, name);
+      g_free (name);
+
+      proc = gimp_filter_history_nth (gimp, i);
+
+      label = gimp_procedure_get_menu_label (proc);
+
+      if (g_str_has_prefix (gimp_object_get_name (proc), "filters-"))
+        {
+          actual_action =
+            gimp_action_group_get_action (group,
+                                          gimp_object_get_name (proc));
+        }
+      else if (plug_in_group)
+        {
+          /*  see comment above  */
+          actual_action =
+            gimp_action_group_get_action (plug_in_group,
+                                          gimp_object_get_name (proc));
+        }
+
+      if (actual_action)
+        sensitive = gimp_action_get_sensitive (actual_action);
+
+      g_object_set (action,
+                    "visible",   TRUE,
+                    "sensitive", sensitive,
+                    "procedure", proc,
+                    "label",     label,
+                    "icon-name", gimp_viewable_get_icon_name (GIMP_VIEWABLE (proc)),
+                    "tooltip",   gimp_procedure_get_blurb (proc),
+                    NULL);
+    }
+
+  for (; i < gimp_filter_history_size (gimp); i++)
+    {
+      GimpAction *action;
+      gchar      *name = g_strdup_printf ("filters-recent-%02d", i + 1);
+
+      action = gimp_action_group_get_action (group, name);
+      g_free (name);
+
+      g_object_set (action,
+                    "visible",   FALSE,
+                    "procedure", NULL,
+                    NULL);
+    }
+}
diff --git a/app/actions/filters-actions.h b/app/actions/filters-actions.h
new file mode 100644
index 0000000..f197b86
--- /dev/null
+++ b/app/actions/filters-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILTERS_ACTIONS_H__
+#define __FILTERS_ACTIONS_H__
+
+
+void   filters_actions_setup  (GimpActionGroup *group);
+void   filters_actions_update (GimpActionGroup *group,
+                               gpointer         data);
+
+
+#endif /* __FILTERS_ACTIONS_H__ */
diff --git a/app/actions/filters-commands.c b/app/actions/filters-commands.c
new file mode 100644
index 0000000..6ca0529
--- /dev/null
+++ b/app/actions/filters-commands.c
@@ -0,0 +1,265 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "operations/gimp-operation-config.h"
+#include "operations/gimpoperationsettings.h"
+
+#include "core/gimp.h"
+#include "core/gimp-filter-history.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+
+#include "widgets/gimpaction.h"
+
+#include "actions.h"
+#include "filters-commands.h"
+#include "gimpgeglprocedure.h"
+#include "procedure-commands.h"
+
+
+/*  local function prototypes  */
+
+static gchar * filters_parse_operation (Gimp          *gimp,
+                                        const gchar   *operation_str,
+                                        const gchar   *icon_name,
+                                        GimpObject   **settings);
+
+static void    filters_run_procedure   (Gimp          *gimp,
+                                        GimpDisplay   *display,
+                                        GimpProcedure *procedure,
+                                        GimpRunMode    run_mode);
+
+
+/*  public functions  */
+
+void
+filters_apply_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage     *image;
+  GimpDrawable  *drawable;
+  gchar         *operation;
+  GimpObject    *settings;
+  GimpProcedure *procedure;
+  return_if_no_drawable (image, drawable, data);
+
+  operation = filters_parse_operation (image->gimp,
+                                       g_variant_get_string (value, NULL),
+                                       gimp_action_get_icon_name (action),
+                                       &settings);
+
+  procedure = gimp_gegl_procedure_new (image->gimp,
+                                       GIMP_RUN_NONINTERACTIVE, settings,
+                                       operation,
+                                       gimp_action_get_name (action),
+                                       gimp_action_get_label (action),
+                                       gimp_action_get_tooltip (action),
+                                       gimp_action_get_icon_name (action),
+                                       gimp_action_get_help_id (action));
+
+  g_free (operation);
+
+  if (settings)
+    g_object_unref (settings);
+
+  gimp_filter_history_add (image->gimp, procedure);
+  filters_history_cmd_callback (NULL,
+                                g_variant_new_uint64 (GPOINTER_TO_SIZE (procedure)),
+                                data);
+
+  g_object_unref (procedure);
+}
+
+void
+filters_apply_interactive_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpImage     *image;
+  GimpDrawable  *drawable;
+  GimpProcedure *procedure;
+  return_if_no_drawable (image, drawable, data);
+
+  procedure = gimp_gegl_procedure_new (image->gimp,
+                                       GIMP_RUN_INTERACTIVE, NULL,
+                                       g_variant_get_string (value, NULL),
+                                       gimp_action_get_name (action),
+                                       gimp_action_get_label (action),
+                                       gimp_action_get_tooltip (action),
+                                       gimp_action_get_icon_name (action),
+                                       gimp_action_get_help_id (action));
+
+  gimp_filter_history_add (image->gimp, procedure);
+  filters_history_cmd_callback (NULL,
+                                g_variant_new_uint64 (GPOINTER_TO_SIZE (procedure)),
+                                data);
+
+  g_object_unref (procedure);
+}
+
+void
+filters_repeat_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage     *image;
+  GimpDrawable  *drawable;
+  GimpDisplay   *display;
+  GimpProcedure *procedure;
+  GimpRunMode    run_mode;
+  return_if_no_drawable (image, drawable, data);
+  return_if_no_display (display, data);
+
+  run_mode = (GimpRunMode) g_variant_get_int32 (value);
+
+  procedure = gimp_filter_history_nth (image->gimp, 0);
+
+  if (procedure)
+    filters_run_procedure (image->gimp, display, procedure, run_mode);
+}
+
+void
+filters_history_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  Gimp          *gimp;
+  GimpDisplay   *display;
+  GimpProcedure *procedure;
+  gsize          hack;
+  return_if_no_gimp (gimp, data);
+  return_if_no_display (display, data);
+
+  hack = g_variant_get_uint64 (value);
+
+  procedure = GSIZE_TO_POINTER (hack);
+
+  filters_run_procedure (gimp, display, procedure, GIMP_RUN_INTERACTIVE);
+}
+
+
+/*  private functions  */
+
+static gchar *
+filters_parse_operation (Gimp         *gimp,
+                         const gchar  *operation_str,
+                         const gchar  *icon_name,
+                         GimpObject  **settings)
+{
+  const gchar *newline = strchr (operation_str, '\n');
+
+  *settings = NULL;
+
+  if (newline)
+    {
+      gchar       *operation;
+      const gchar *serialized;
+
+      operation  = g_strndup (operation_str, newline - operation_str);
+      serialized = newline + 1;
+
+      if (*serialized)
+        {
+          GError *error = NULL;
+
+          *settings =
+            g_object_new (gimp_operation_config_get_type (gimp, operation,
+                                                          icon_name,
+                                                          GIMP_TYPE_OPERATION_SETTINGS),
+                          NULL);
+
+          if (! gimp_config_deserialize_string (GIMP_CONFIG (*settings),
+                                                serialized, -1, NULL,
+                                                &error))
+            {
+              g_warning ("filters_parse_operation: deserializing hardcoded "
+                         "operation settings failed: %s",
+                         error->message);
+              g_clear_error (&error);
+
+              g_object_unref (*settings);
+              *settings = NULL;
+            }
+        }
+
+      return operation;
+    }
+
+  return g_strdup (operation_str);
+}
+
+static void
+filters_run_procedure (Gimp          *gimp,
+                       GimpDisplay   *display,
+                       GimpProcedure *procedure,
+                       GimpRunMode    run_mode)
+{
+  GimpObject     *settings = NULL;
+  GimpValueArray *args;
+
+  if (GIMP_IS_GEGL_PROCEDURE (procedure))
+    {
+      GimpGeglProcedure *gegl_procedure = GIMP_GEGL_PROCEDURE (procedure);
+
+      if (gegl_procedure->default_run_mode == GIMP_RUN_NONINTERACTIVE)
+        run_mode = GIMP_RUN_NONINTERACTIVE;
+
+      settings = gegl_procedure->default_settings;
+    }
+
+  args = procedure_commands_get_display_args (procedure, display, settings);
+
+  if (args)
+    {
+      gboolean success = FALSE;
+
+      if (run_mode == GIMP_RUN_NONINTERACTIVE)
+        {
+          success =
+            procedure_commands_run_procedure (procedure, gimp,
+                                              GIMP_PROGRESS (display),
+                                              args);
+        }
+      else
+        {
+          success =
+            procedure_commands_run_procedure_async (procedure, gimp,
+                                                    GIMP_PROGRESS (display),
+                                                    run_mode, args,
+                                                    display);
+        }
+
+      if (success)
+        gimp_filter_history_add (gimp, procedure);
+
+      gimp_value_array_unref (args);
+    }
+}
diff --git a/app/actions/filters-commands.h b/app/actions/filters-commands.h
new file mode 100644
index 0000000..68cb2ea
--- /dev/null
+++ b/app/actions/filters-commands.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILTERS_COMMANDS_H__
+#define __FILTERS_COMMANDS_H__
+
+
+void   filters_apply_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   filters_apply_interactive_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   filters_repeat_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   filters_history_cmd_callback           (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+
+#endif /* __FILTERS_COMMANDS_H__ */
diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c
new file mode 100644
index 0000000..5191dcc
--- /dev/null
+++ b/app/actions/fonts-actions.c
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "text/gimpfont.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "fonts-actions.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry fonts_actions[] =
+{
+  { "fonts-popup", GIMP_ICON_FONT,
+    NC_("fonts-action", "Fonts Menu"), NULL, NULL, NULL,
+    GIMP_HELP_FONT_DIALOG },
+
+  { "fonts-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("fonts-action", "_Rescan Font List"), NULL,
+    NC_("fonts-action", "Rescan the installed fonts"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_FONT_REFRESH }
+};
+
+
+void
+fonts_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "fonts-action",
+                                 fonts_actions,
+                                 G_N_ELEMENTS (fonts_actions));
+}
+
+void
+fonts_actions_update (GimpActionGroup *group,
+                      gpointer         data)
+{
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("fonts-refresh", TRUE);
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/fonts-actions.h b/app/actions/fonts-actions.h
new file mode 100644
index 0000000..f4651d5
--- /dev/null
+++ b/app/actions/fonts-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FONTS_ACTIONS_H__
+#define __FONTS_ACTIONS_H__
+
+
+void   fonts_actions_setup  (GimpActionGroup *group);
+void   fonts_actions_update (GimpActionGroup *group,
+                             gpointer         data);
+
+
+#endif /* __FONTS_ACTIONS_H__ */
diff --git a/app/actions/gimpgeglprocedure.c b/app/actions/gimpgeglprocedure.c
new file mode 100644
index 0000000..b9f243f
--- /dev/null
+++ b/app/actions/gimpgeglprocedure.c
@@ -0,0 +1,476 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpgeglprocedure.c
+ * Copyright (C) 2016-2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "actions-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "operations/gimp-operation-config.h"
+#include "operations/gimpoperationsettings.h"
+
+#include "core/gimp.h"
+#include "core/gimp-memsize.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable-operation.h"
+#include "core/gimpimage.h"
+#include "core/gimplayermask.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpsettings.h"
+#include "core/gimptoolinfo.h"
+
+#include "display/gimpdisplay.h"
+
+#include "tools/gimpoperationtool.h"
+#include "tools/tool_manager.h"
+
+#include "gimpgeglprocedure.h"
+
+#include "gimp-intl.h"
+
+
+static void     gimp_gegl_procedure_finalize            (GObject        *object);
+
+static gint64   gimp_gegl_procedure_get_memsize         (GimpObject     *object,
+                                                         gint64         *gui_size);
+
+static gchar  * gimp_gegl_procedure_get_description     (GimpViewable   *viewable,
+                                                         gchar         **tooltip);
+
+static const gchar * gimp_gegl_procedure_get_label      (GimpProcedure  *procedure);
+static const gchar * gimp_gegl_procedure_get_menu_label (GimpProcedure  *procedure);
+static const gchar * gimp_gegl_procedure_get_help_id    (GimpProcedure  *procedure);
+static gboolean      gimp_gegl_procedure_get_sensitive  (GimpProcedure  *procedure,
+                                                         GimpObject     *object,
+                                                         const gchar   **tooltip);
+static GimpValueArray * gimp_gegl_procedure_execute     (GimpProcedure  *procedure,
+                                                         Gimp           *gimp,
+                                                         GimpContext    *context,
+                                                         GimpProgress   *progress,
+                                                         GimpValueArray *args,
+                                                         GError        **error);
+static void     gimp_gegl_procedure_execute_async       (GimpProcedure  *procedure,
+                                                         Gimp           *gimp,
+                                                         GimpContext    *context,
+                                                         GimpProgress   *progress,
+                                                         GimpValueArray *args,
+                                                         GimpObject     *display);
+
+
+G_DEFINE_TYPE (GimpGeglProcedure, gimp_gegl_procedure,
+               GIMP_TYPE_PROCEDURE)
+
+#define parent_class gimp_gegl_procedure_parent_class
+
+
+static void
+gimp_gegl_procedure_class_init (GimpGeglProcedureClass *klass)
+{
+  GObjectClass       *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass    *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass  *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpProcedureClass *proc_class        = GIMP_PROCEDURE_CLASS (klass);
+
+  object_class->finalize            = gimp_gegl_procedure_finalize;
+
+  gimp_object_class->get_memsize    = gimp_gegl_procedure_get_memsize;
+
+  viewable_class->default_icon_name = "gimp-gegl";
+  viewable_class->get_description   = gimp_gegl_procedure_get_description;
+
+  proc_class->get_label             = gimp_gegl_procedure_get_label;
+  proc_class->get_menu_label        = gimp_gegl_procedure_get_menu_label;
+  proc_class->get_help_id           = gimp_gegl_procedure_get_help_id;
+  proc_class->get_sensitive         = gimp_gegl_procedure_get_sensitive;
+  proc_class->execute               = gimp_gegl_procedure_execute;
+  proc_class->execute_async         = gimp_gegl_procedure_execute_async;
+}
+
+static void
+gimp_gegl_procedure_init (GimpGeglProcedure *proc)
+{
+}
+
+static void
+gimp_gegl_procedure_finalize (GObject *object)
+{
+  GimpGeglProcedure *proc = GIMP_GEGL_PROCEDURE (object);
+
+  g_clear_object (&proc->default_settings);
+
+  g_clear_pointer (&proc->menu_label, g_free);
+  g_clear_pointer (&proc->label,      g_free);
+  g_clear_pointer (&proc->help_id,    g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_gegl_procedure_get_memsize (GimpObject *object,
+                                 gint64     *gui_size)
+{
+  GimpGeglProcedure *proc    = GIMP_GEGL_PROCEDURE (object);
+  gint64             memsize = 0;
+
+  memsize += gimp_string_get_memsize (proc->menu_label);
+  memsize += gimp_string_get_memsize (proc->label);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gchar *
+gimp_gegl_procedure_get_description (GimpViewable  *viewable,
+                                     gchar        **tooltip)
+{
+  GimpProcedure *procedure = GIMP_PROCEDURE (viewable);
+
+  if (tooltip)
+    *tooltip = g_strdup (gimp_procedure_get_blurb (procedure));
+
+  return g_strdup (gimp_procedure_get_label (procedure));
+}
+
+static const gchar *
+gimp_gegl_procedure_get_label (GimpProcedure *procedure)
+{
+  GimpGeglProcedure *proc = GIMP_GEGL_PROCEDURE (procedure);
+  gchar             *ellipsis;
+  gchar             *label;
+
+  if (proc->label)
+    return proc->label;
+
+  label = gimp_strip_uline (gimp_procedure_get_menu_label (procedure));
+
+  ellipsis = strstr (label, "...");
+
+  if (! ellipsis)
+    ellipsis = strstr (label, "\342\200\246" /* U+2026 HORIZONTAL ELLIPSIS */);
+
+  if (ellipsis && ellipsis == (label + strlen (label) - 3))
+    *ellipsis = '\0';
+
+  proc->label = label;
+
+  return proc->label;
+}
+
+static const gchar *
+gimp_gegl_procedure_get_menu_label (GimpProcedure *procedure)
+{
+  GimpGeglProcedure *proc = GIMP_GEGL_PROCEDURE (procedure);
+
+  if (proc->menu_label)
+    return proc->menu_label;
+
+  return GIMP_PROCEDURE_CLASS (parent_class)->get_menu_label (procedure);
+}
+
+static const gchar *
+gimp_gegl_procedure_get_help_id (GimpProcedure *procedure)
+{
+  GimpGeglProcedure *proc = GIMP_GEGL_PROCEDURE (procedure);
+
+  return proc->help_id;
+}
+
+static gboolean
+gimp_gegl_procedure_get_sensitive (GimpProcedure  *procedure,
+                                   GimpObject     *object,
+                                   const gchar   **tooltip)
+{
+  GimpDrawable *drawable  = GIMP_DRAWABLE (object);
+  gboolean      sensitive = FALSE;
+
+  if (drawable)
+    {
+      GimpItem *item;
+
+      if (GIMP_IS_LAYER_MASK (drawable))
+        item = GIMP_ITEM (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable)));
+      else
+        item = GIMP_ITEM (drawable);
+
+      sensitive = ! gimp_item_is_content_locked (item);
+
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+        sensitive = FALSE;
+    }
+
+  return sensitive;
+}
+
+static GimpValueArray *
+gimp_gegl_procedure_execute (GimpProcedure   *procedure,
+                             Gimp            *gimp,
+                             GimpContext     *context,
+                             GimpProgress    *progress,
+                             GimpValueArray  *args,
+                             GError         **error)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  GObject      *config;
+  GeglNode     *node;
+
+  image    = gimp_value_get_image    (gimp_value_array_index (args, 1), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  config   = g_value_get_object      (gimp_value_array_index (args, 3));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", procedure->original_name,
+                              NULL);
+
+  gimp_drawable_apply_operation_with_config (
+    drawable,
+    progress, gimp_procedure_get_label (procedure),
+    node, config);
+
+  g_object_unref (node);
+
+  gimp_image_flush (image);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static void
+gimp_gegl_procedure_execute_async (GimpProcedure  *procedure,
+                                   Gimp           *gimp,
+                                   GimpContext    *context,
+                                   GimpProgress   *progress,
+                                   GimpValueArray *args,
+                                   GimpObject     *display)
+{
+  GimpRunMode  run_mode;
+  GimpObject  *settings;
+  GimpTool    *active_tool;
+  const gchar *tool_name;
+
+  run_mode = g_value_get_int    (gimp_value_array_index (args, 0));
+  settings = g_value_get_object (gimp_value_array_index (args, 3));
+
+  if (! settings &&
+      (run_mode != GIMP_RUN_INTERACTIVE ||
+       GIMP_GUI_CONFIG (gimp->config)->filter_tool_use_last_settings))
+    {
+      /*  if we didn't get settings passed, get the last used settings  */
+
+      GType          config_type;
+      GimpContainer *container;
+
+      config_type = G_VALUE_TYPE (gimp_value_array_index (args, 3));
+
+      container = gimp_operation_config_get_container (gimp, config_type,
+                                                       (GCompareFunc)
+                                                       gimp_settings_compare);
+
+      settings = gimp_container_get_child_by_index (container, 0);
+
+      /*  only use the settings if they are automatically created
+       *  "last used" values, not if they were saved explicitly and
+       *  have a zero timestamp; and if they are not a separator.
+       */
+      if (settings &&
+          (GIMP_SETTINGS (settings)->time == 0 ||
+           ! gimp_object_get_name (settings)))
+        {
+          settings = NULL;
+        }
+    }
+
+  if (run_mode == GIMP_RUN_NONINTERACTIVE ||
+      run_mode == GIMP_RUN_WITH_LAST_VALS)
+    {
+      if (settings || run_mode == GIMP_RUN_NONINTERACTIVE)
+        {
+          g_value_set_object (gimp_value_array_index (args, 3), settings);
+          gimp_procedure_execute (procedure, gimp, context, progress,
+                                  args, NULL);
+          return;
+        }
+
+      gimp_message (gimp,
+                    G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                    _("There are no last settings for '%s', "
+                      "showing the filter dialog instead."),
+                    gimp_procedure_get_label (procedure));
+    }
+
+  if (! strcmp (procedure->original_name, "gimp:brightness-contrast"))
+    {
+      tool_name = "gimp-brightness-contrast-tool";
+    }
+  else if (! strcmp (procedure->original_name, "gimp:curves"))
+    {
+      tool_name = "gimp-curves-tool";
+    }
+  else if (! strcmp (procedure->original_name, "gimp:levels"))
+    {
+      tool_name = "gimp-levels-tool";
+    }
+  else if (! strcmp (procedure->original_name, "gimp:threshold"))
+    {
+      tool_name = "gimp-threshold-tool";
+    }
+  else if (! strcmp (procedure->original_name, "gimp:offset"))
+    {
+      tool_name = "gimp-offset-tool";
+    }
+  else
+    {
+      tool_name = "gimp-operation-tool";
+    }
+
+  active_tool = tool_manager_get_active (gimp);
+
+  /*  do not use the passed context because we need to set the active
+   *  tool on the global user context
+   */
+  context = gimp_get_user_context (gimp);
+
+  if (strcmp (gimp_object_get_name (active_tool->tool_info), tool_name))
+    {
+      GimpToolInfo *tool_info = gimp_get_tool_info (gimp, tool_name);
+
+      if (GIMP_IS_TOOL_INFO (tool_info))
+        gimp_context_set_tool (context, tool_info);
+    }
+  else
+    {
+      gimp_context_tool_changed (context);
+    }
+
+  active_tool = tool_manager_get_active (gimp);
+
+  if (! strcmp (gimp_object_get_name (active_tool->tool_info), tool_name))
+    {
+      /*  Remember the procedure that created this tool, because
+       *  we can't just switch to an operation tool using
+       *  gimp_context_set_tool(), we also have to go through the
+       *  initialization code below, otherwise we end up with a
+       *  dummy tool that does nothing. See bug #776370.
+       */
+      g_object_set_data_full (G_OBJECT (active_tool), "gimp-gegl-procedure",
+                              g_object_ref (procedure),
+                              (GDestroyNotify) g_object_unref);
+
+      if (! strcmp (tool_name, "gimp-operation-tool"))
+        {
+          gimp_operation_tool_set_operation (GIMP_OPERATION_TOOL (active_tool),
+                                             procedure->original_name,
+                                             gimp_procedure_get_label (procedure),
+                                             gimp_procedure_get_label (procedure),
+                                             gimp_procedure_get_label (procedure),
+                                             gimp_viewable_get_icon_name (GIMP_VIEWABLE (procedure)),
+                                             gimp_procedure_get_help_id (procedure));
+        }
+
+      tool_manager_initialize_active (gimp, GIMP_DISPLAY (display));
+
+      if (settings)
+        gimp_filter_tool_set_config (GIMP_FILTER_TOOL (active_tool),
+                                     GIMP_CONFIG (settings));
+    }
+}
+
+
+/*  public functions  */
+
+GimpProcedure *
+gimp_gegl_procedure_new (Gimp        *gimp,
+                         GimpRunMode  default_run_mode,
+                         GimpObject  *default_settings,
+                         const gchar *operation,
+                         const gchar *name,
+                         const gchar *menu_label,
+                         const gchar *tooltip,
+                         const gchar *icon_name,
+                         const gchar *help_id)
+{
+  GimpProcedure     *procedure;
+  GimpGeglProcedure *gegl_procedure;
+  GType              config_type;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (operation != NULL, NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (menu_label != NULL, NULL);
+
+  config_type = gimp_operation_config_get_type (gimp, operation, icon_name,
+                                                GIMP_TYPE_OPERATION_SETTINGS);
+
+  procedure = g_object_new (GIMP_TYPE_GEGL_PROCEDURE, NULL);
+
+  gegl_procedure = GIMP_GEGL_PROCEDURE (procedure);
+
+  gegl_procedure->default_run_mode = default_run_mode;
+  gegl_procedure->menu_label       = g_strdup (menu_label);
+  gegl_procedure->help_id          = g_strdup (help_id);
+
+  if (default_settings)
+    gegl_procedure->default_settings = g_object_ref (default_settings);
+
+  gimp_object_set_name (GIMP_OBJECT (procedure), name);
+  gimp_viewable_set_icon_name (GIMP_VIEWABLE (procedure), icon_name);
+  gimp_procedure_set_strings (procedure,
+                              operation,
+                              tooltip,
+                              tooltip,
+                              "author", "copyright", "date",
+                              NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("run-mode",
+                                                      "Run mode",
+                                                      "Run mode",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "Image",
+                                                         "Input image",
+                                                         gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "Drawable",
+                                                            "Input drawable",
+                                                            gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_object ("settings",
+                                                    "Settings",
+                                                    "Settings",
+                                                    config_type,
+                                                    GIMP_PARAM_READWRITE));
+
+  return procedure;
+}
diff --git a/app/actions/gimpgeglprocedure.h b/app/actions/gimpgeglprocedure.h
new file mode 100644
index 0000000..07fc24c
--- /dev/null
+++ b/app/actions/gimpgeglprocedure.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpgeglprocedure.h
+ * Copyright (C) 2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_PROCEDURE_H__
+#define __GIMP_GEGL_PROCEDURE_H__
+
+
+#include "pdb/gimpprocedure.h"
+
+
+#define GIMP_TYPE_GEGL_PROCEDURE            (gimp_gegl_procedure_get_type ())
+#define GIMP_GEGL_PROCEDURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GEGL_PROCEDURE, GimpGeglProcedure))
+#define GIMP_GEGL_PROCEDURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GEGL_PROCEDURE, GimpGeglProcedureClass))
+#define GIMP_IS_GEGL_PROCEDURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GEGL_PROCEDURE))
+#define GIMP_IS_GEGL_PROCEDURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GEGL_PROCEDURE))
+#define GIMP_GEGL_PROCEDURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GEGL_PROCEDURE, GimpGeglProcedureClass))
+
+
+typedef struct _GimpGeglProcedure      GimpGeglProcedure;
+typedef struct _GimpGeglProcedureClass GimpGeglProcedureClass;
+
+struct _GimpGeglProcedure
+{
+  GimpProcedure  parent_instance;
+
+  GimpRunMode    default_run_mode;
+  GimpObject    *default_settings;
+
+  gchar         *menu_label;
+  gchar         *label;
+  gchar         *help_id;
+};
+
+struct _GimpGeglProcedureClass
+{
+  GimpProcedureClass parent_class;
+};
+
+
+GType           gimp_gegl_procedure_get_type (void) G_GNUC_CONST;
+
+GimpProcedure * gimp_gegl_procedure_new      (Gimp        *gimp,
+                                              GimpRunMode  default_run_mode,
+                                              GimpObject  *default_settings,
+                                              const gchar *operation,
+                                              const gchar *name,
+                                              const gchar *menu_label,
+                                              const gchar *tooltip,
+                                              const gchar *icon_name,
+                                              const gchar *help_id);
+
+
+#endif /* __GIMP_GEGL_PROCEDURE_H__ */
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
new file mode 100644
index 0000000..ca730e6
--- /dev/null
+++ b/app/actions/gradient-editor-actions.c
@@ -0,0 +1,906 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpgradienteditor.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "data-editor-commands.h"
+#include "gradient-editor-actions.h"
+#include "gradient-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry gradient_editor_actions[] =
+{
+  { "gradient-editor-popup", GIMP_ICON_GRADIENT,
+    NC_("gradient-editor-action", "Gradient Editor Menu"), NULL, NULL, NULL,
+    GIMP_HELP_GRADIENT_EDITOR_DIALOG },
+
+  { "gradient-editor-left-color-type", NULL,
+    NC_("gradient-editor-action", "Left Color Type") },
+  { "gradient-editor-load-left-color", GIMP_ICON_DOCUMENT_REVERT,
+    NC_("gradient-editor-action", "_Load Left Color From") },
+  { "gradient-editor-save-left-color", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("gradient-editor-action", "_Save Left Color To") },
+
+  { "gradient-editor-right-color-type", NULL,
+    NC_("gradient-editor-action", "Right Color Type") },
+  { "gradient-editor-load-right-color", GIMP_ICON_DOCUMENT_REVERT,
+    NC_("gradient-editor-action", "Load Right Color Fr_om") },
+  { "gradient-editor-save-right-color", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("gradient-editor-action", "Sa_ve Right Color To") },
+
+  { "gradient-editor-blending-func", NULL, "blending-function" },
+  { "gradient-editor-coloring-type", NULL, "coloring-type"     },
+
+  { "gradient-editor-left-color", NULL,
+    NC_("gradient-editor-action", "L_eft Endpoint's Color..."), NULL, NULL,
+    gradient_editor_left_color_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
+
+  { "gradient-editor-right-color", NULL,
+    NC_("gradient-editor-action", "R_ight Endpoint's Color..."), NULL, NULL,
+    gradient_editor_right_color_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
+
+  { "gradient-editor-flip", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
+    "flip", NULL, NULL,
+    gradient_editor_flip_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_FLIP },
+
+  { "gradient-editor-replicate", GIMP_ICON_OBJECT_DUPLICATE,
+    "replicate", NULL, NULL,
+    gradient_editor_replicate_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_FLIP },
+
+  { "gradient-editor-split-midpoint", NULL,
+    "splitmidpoint", NULL, NULL,
+    gradient_editor_split_midpoint_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_SPLIT_MIDPOINT },
+
+  { "gradient-editor-split-uniform", NULL,
+    "splituniform", NULL, NULL,
+    gradient_editor_split_uniformly_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM },
+
+  { "gradient-editor-delete", GIMP_ICON_EDIT_DELETE,
+    "delete", "", NULL,
+    gradient_editor_delete_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_DELETE },
+
+  { "gradient-editor-recenter", NULL,
+    "recenter", NULL, NULL,
+    gradient_editor_recenter_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_RECENTER },
+
+  { "gradient-editor-redistribute", NULL,
+    "redistribute", NULL, NULL,
+    gradient_editor_redistribute_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE },
+
+  { "gradient-editor-blend-color", NULL,
+    NC_("gradient-editor-action", "Ble_nd Endpoints' Colors"), NULL, NULL,
+    gradient_editor_blend_color_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR },
+
+  { "gradient-editor-blend-opacity", NULL,
+    NC_("gradient-editor-action", "Blend Endpoints' Opacit_y"), NULL, NULL,
+    gradient_editor_blend_opacity_cmd_callback,
+    GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY }
+};
+
+static const GimpToggleActionEntry gradient_editor_toggle_actions[] =
+{
+  { "gradient-editor-edit-active", GIMP_ICON_LINKED,
+    NC_("gradient-editor-action", "Edit Active Gradient"), NULL, NULL,
+    data_editor_edit_active_cmd_callback,
+    FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_EDIT_ACTIVE }
+};
+
+
+#define LOAD_LEFT_FROM(num,magic) \
+  { "gradient-editor-load-left-" num, NULL, \
+    num, NULL, NULL, \
+    (magic), FALSE, \
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD }
+#define SAVE_LEFT_TO(num,magic) \
+  { "gradient-editor-save-left-" num, NULL, \
+    num, NULL, NULL, \
+    (magic), FALSE, \
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_SAVE }
+#define LOAD_RIGHT_FROM(num,magic) \
+  { "gradient-editor-load-right-" num, NULL, \
+    num, NULL, NULL, \
+    (magic), FALSE, \
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD }
+#define SAVE_RIGHT_TO(num,magic) \
+  { "gradient-editor-save-right-" num, NULL, \
+    num, NULL, NULL, \
+    (magic), FALSE, \
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_SAVE }
+
+static const GimpEnumActionEntry gradient_editor_load_left_actions[] =
+{
+  { "gradient-editor-load-left-left-neighbor", NULL,
+    NC_("gradient-editor-action", "_Left Neighbor's Right Endpoint"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
+
+  { "gradient-editor-load-left-right-endpoint", NULL,
+    NC_("gradient-editor-action", "_Right Endpoint"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
+
+  { "gradient-editor-load-left-fg", NULL,
+    NC_("gradient-editor-action", "_Foreground Color"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_FOREGROUND, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
+
+  { "gradient-editor-load-left-bg", NULL,
+    NC_("gradient-editor-action", "_Background Color"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_BACKGROUND, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
+
+  LOAD_LEFT_FROM ("01", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 0),
+  LOAD_LEFT_FROM ("02", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 1),
+  LOAD_LEFT_FROM ("03", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 2),
+  LOAD_LEFT_FROM ("04", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 3),
+  LOAD_LEFT_FROM ("05", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 4),
+  LOAD_LEFT_FROM ("06", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 5),
+  LOAD_LEFT_FROM ("07", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 6),
+  LOAD_LEFT_FROM ("08", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 7),
+  LOAD_LEFT_FROM ("09", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 8),
+  LOAD_LEFT_FROM ("10", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 9)
+};
+
+static const GimpEnumActionEntry gradient_editor_save_left_actions[] =
+{
+  SAVE_LEFT_TO ("01", 0),
+  SAVE_LEFT_TO ("02", 1),
+  SAVE_LEFT_TO ("03", 2),
+  SAVE_LEFT_TO ("04", 3),
+  SAVE_LEFT_TO ("05", 4),
+  SAVE_LEFT_TO ("06", 5),
+  SAVE_LEFT_TO ("07", 6),
+  SAVE_LEFT_TO ("08", 7),
+  SAVE_LEFT_TO ("09", 8),
+  SAVE_LEFT_TO ("10", 9)
+};
+
+static const GimpEnumActionEntry gradient_editor_load_right_actions[] =
+{
+  { "gradient-editor-load-right-right-neighbor", NULL,
+    NC_("gradient-editor-action", "_Right Neighbor's Left Endpoint"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
+
+  { "gradient-editor-load-right-left-endpoint", NULL,
+    NC_("gradient-editor-action", "_Left Endpoint"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
+
+  { "gradient-editor-load-right-fg", NULL,
+    NC_("gradient-editor-action", "_Foreground Color"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_FOREGROUND, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
+
+  { "gradient-editor-load-right-bg", NULL,
+    NC_("gradient-editor-action", "_Background Color"), NULL, NULL,
+    GRADIENT_EDITOR_COLOR_BACKGROUND, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
+
+  LOAD_RIGHT_FROM ("01", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 0),
+  LOAD_RIGHT_FROM ("02", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 1),
+  LOAD_RIGHT_FROM ("03", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 2),
+  LOAD_RIGHT_FROM ("04", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 3),
+  LOAD_RIGHT_FROM ("05", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 4),
+  LOAD_RIGHT_FROM ("06", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 5),
+  LOAD_RIGHT_FROM ("07", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 6),
+  LOAD_RIGHT_FROM ("08", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 7),
+  LOAD_RIGHT_FROM ("09", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 8),
+  LOAD_RIGHT_FROM ("10", GRADIENT_EDITOR_COLOR_FIRST_CUSTOM + 9)
+};
+
+static const GimpEnumActionEntry gradient_editor_save_right_actions[] =
+{
+  SAVE_RIGHT_TO ("01", 0),
+  SAVE_RIGHT_TO ("02", 1),
+  SAVE_RIGHT_TO ("03", 2),
+  SAVE_RIGHT_TO ("04", 3),
+  SAVE_RIGHT_TO ("05", 4),
+  SAVE_RIGHT_TO ("06", 5),
+  SAVE_RIGHT_TO ("07", 6),
+  SAVE_RIGHT_TO ("08", 7),
+  SAVE_RIGHT_TO ("09", 8),
+  SAVE_RIGHT_TO ("10", 9)
+};
+
+#undef LOAD_LEFT_FROM
+#undef SAVE_LEFT_TO
+#undef LOAD_RIGHT_FROM
+#undef SAVE_RIGHT_TO
+
+
+static const GimpRadioActionEntry gradient_editor_left_color_type_actions[] =
+{
+  { "gradient-editor-left-color-fixed", NULL,
+    NC_("gradient-editor-color-type", "_Fixed"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_FIXED,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
+
+  { "gradient-editor-left-color-foreground", NULL,
+    NC_("gradient-editor-color-type", "F_oreground Color"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_FOREGROUND,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
+
+  { "gradient-editor-left-color-foreground-transparent", NULL,
+    NC_("gradient-editor-color-type",
+        "Fo_reground Color (Transparent)"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
+
+  { "gradient-editor-left-color-background", NULL,
+    NC_("gradient-editor-color-type", "_Background Color"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_BACKGROUND,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
+
+  { "gradient-editor-left-color-background-transparent", NULL,
+    NC_("gradient-editor-color-type",
+        "B_ackground Color (Transparent)"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
+    GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR }
+};
+
+static const GimpRadioActionEntry gradient_editor_right_color_type_actions[] =
+{
+  { "gradient-editor-right-color-fixed", NULL,
+    NC_("gradient-editor-color-type", "_Fixed"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_FIXED,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
+
+  { "gradient-editor-right-color-foreground", NULL,
+    NC_("gradient-editor-color-type", "F_oreground Color"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_FOREGROUND,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
+
+  { "gradient-editor-right-color-foreground-transparent", NULL,
+    NC_("gradient-editor-color-type",
+        "Fo_reground Color (Transparent)"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
+
+  { "gradient-editor-right-color-background", NULL,
+    NC_("gradient-editor-color-type", "_Background Color"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_BACKGROUND,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
+
+  { "gradient-editor-right-color-background-transparent", NULL,
+    NC_("gradient-editor-color-type",
+        "B_ackground Color (Transparent)"), NULL, NULL,
+    GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
+    GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR }
+};
+
+static const GimpRadioActionEntry gradient_editor_blending_actions[] =
+{
+  { "gradient-editor-blending-linear", NULL,
+    NC_("gradient-editor-blending", "_Linear"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_LINEAR,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING },
+
+  { "gradient-editor-blending-curved", NULL,
+    NC_("gradient-editor-blending", "_Curved"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_CURVED,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING },
+
+  { "gradient-editor-blending-sine", NULL,
+    NC_("gradient-editor-blending", "_Sinusoidal"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_SINE,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING },
+
+  { "gradient-editor-blending-sphere-increasing", NULL,
+    NC_("gradient-editor-blending", "Spherical (i_ncreasing)"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING },
+
+  { "gradient-editor-blending-sphere-decreasing", NULL,
+    NC_("gradient-editor-blending", "Spherical (_decreasing)"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING },
+
+  { "gradient-editor-blending-step", NULL,
+    NC_("gradient-editor-blending", "S_tep"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_STEP,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING },
+
+  { "gradient-editor-blending-varies", NULL,
+    NC_("gradient-editor-blending", "(Varies)"), NULL, NULL,
+    -1,
+    GIMP_HELP_GRADIENT_EDITOR_BLENDING }
+};
+
+static const GimpRadioActionEntry gradient_editor_coloring_actions[] =
+{
+  { "gradient-editor-coloring-rgb", NULL,
+    NC_("gradient-editor-coloring", "_RGB"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_RGB,
+    GIMP_HELP_GRADIENT_EDITOR_COLORING },
+
+  { "gradient-editor-coloring-hsv-ccw", NULL,
+    NC_("gradient-editor-coloring", "HSV (_counter-clockwise hue)"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_HSV_CCW,
+    GIMP_HELP_GRADIENT_EDITOR_COLORING },
+
+  { "gradient-editor-coloring-hsv-cw", NULL,
+    NC_("gradient-editor-coloring", "HSV (clockwise _hue)"), NULL, NULL,
+    GIMP_GRADIENT_SEGMENT_HSV_CW,
+    GIMP_HELP_GRADIENT_EDITOR_COLORING },
+
+  { "gradient-editor-coloring-varies", NULL,
+    NC_("gradient-editor-coloring", "(Varies)"), NULL, NULL,
+    -1,
+    GIMP_HELP_GRADIENT_EDITOR_COLORING }
+};
+
+static const GimpEnumActionEntry gradient_editor_zoom_actions[] =
+{
+  { "gradient-editor-zoom-in", GIMP_ICON_ZOOM_IN,
+    N_("Zoom In"), NULL,
+    N_("Zoom in"),
+    GIMP_ZOOM_IN, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN },
+
+  { "gradient-editor-zoom-out", GIMP_ICON_ZOOM_OUT,
+    N_("Zoom Out"), NULL,
+    N_("Zoom out"),
+    GIMP_ZOOM_OUT, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT },
+
+  { "gradient-editor-zoom-all", GIMP_ICON_ZOOM_FIT_BEST,
+    N_("Zoom All"), NULL,
+    N_("Zoom all"),
+    GIMP_ZOOM_OUT_MAX, FALSE,
+    GIMP_HELP_GRADIENT_EDITOR_ZOOM_ALL }
+};
+
+
+void
+gradient_editor_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "gradient-editor-action",
+                                 gradient_editor_actions,
+                                 G_N_ELEMENTS (gradient_editor_actions));
+
+  gimp_action_group_add_toggle_actions (group, "gradient-editor-action",
+                                        gradient_editor_toggle_actions,
+                                        G_N_ELEMENTS (gradient_editor_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "gradient-editor-action",
+                                      gradient_editor_load_left_actions,
+                                      G_N_ELEMENTS (gradient_editor_load_left_actions),
+                                      gradient_editor_load_left_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "gradient-editor-action",
+                                      gradient_editor_save_left_actions,
+                                      G_N_ELEMENTS (gradient_editor_save_left_actions),
+                                      gradient_editor_save_left_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "gradient-editor-action",
+                                      gradient_editor_load_right_actions,
+                                      G_N_ELEMENTS (gradient_editor_load_right_actions),
+                                      gradient_editor_load_right_cmd_callback);
+
+
+  gimp_action_group_add_enum_actions (group, "gradient-editor-action",
+                                      gradient_editor_save_right_actions,
+                                      G_N_ELEMENTS (gradient_editor_save_right_actions),
+                                      gradient_editor_save_right_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "gradient-editor-color-type",
+                                       gradient_editor_left_color_type_actions,
+                                       G_N_ELEMENTS (gradient_editor_left_color_type_actions),
+                                       NULL,
+                                       0,
+                                       gradient_editor_left_color_type_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "gradient-editor-color-type",
+                                       gradient_editor_right_color_type_actions,
+                                       G_N_ELEMENTS (gradient_editor_right_color_type_actions),
+                                       NULL,
+                                       0,
+                                       gradient_editor_right_color_type_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "gradient-editor-blending",
+                                       gradient_editor_blending_actions,
+                                       G_N_ELEMENTS (gradient_editor_blending_actions),
+                                       NULL,
+                                       0,
+                                       gradient_editor_blending_func_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "gradient-editor-coloring",
+                                       gradient_editor_coloring_actions,
+                                       G_N_ELEMENTS (gradient_editor_coloring_actions),
+                                       NULL,
+                                       0,
+                                       gradient_editor_coloring_type_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      gradient_editor_zoom_actions,
+                                      G_N_ELEMENTS (gradient_editor_zoom_actions),
+                                      gradient_editor_zoom_cmd_callback);
+}
+
+void
+gradient_editor_actions_update (GimpActionGroup *group,
+                                gpointer         data)
+{
+  GimpGradientEditor  *editor         = GIMP_GRADIENT_EDITOR (data);
+  GimpDataEditor      *data_editor    = GIMP_DATA_EDITOR (data);
+  GimpGradient        *gradient;
+  gboolean             editable       = FALSE;
+  GimpRGB              left_color;
+  GimpRGB              right_color;
+  GimpRGB              left_seg_color;
+  GimpRGB              right_seg_color;
+  GimpRGB              fg;
+  GimpRGB              bg;
+  gboolean             blending_equal = TRUE;
+  gboolean             coloring_equal = TRUE;
+  gboolean             left_editable  = TRUE;
+  gboolean             right_editable = TRUE;
+  gboolean             selection      = FALSE;
+  gboolean             delete         = FALSE;
+  gboolean             edit_active    = FALSE;
+
+  gradient = GIMP_GRADIENT (data_editor->data);
+
+  if (gradient)
+    {
+      GimpGradientSegmentType  type;
+      GimpGradientSegmentColor color;
+      GimpGradientSegment     *left_seg;
+      GimpGradientSegment     *right_seg;
+      GimpGradientSegment     *seg, *aseg;
+
+      if (data_editor->data_editable)
+        editable = TRUE;
+
+      gimp_gradient_segment_get_left_flat_color (gradient,
+                                                 data_editor->context,
+                                                 editor->control_sel_l,
+                                                 &left_color);
+
+      if (editor->control_sel_l->prev)
+        left_seg = editor->control_sel_l->prev;
+      else
+        left_seg = gimp_gradient_segment_get_last (editor->control_sel_l);
+
+      gimp_gradient_segment_get_right_flat_color (gradient,
+                                                  data_editor->context,
+                                                  left_seg,
+                                                  &left_seg_color);
+
+      gimp_gradient_segment_get_right_flat_color (gradient,
+                                                  data_editor->context,
+                                                  editor->control_sel_r,
+                                                  &right_color);
+
+      if (editor->control_sel_r->next)
+        right_seg = editor->control_sel_r->next;
+      else
+        right_seg = gimp_gradient_segment_get_first (editor->control_sel_r);
+
+      gimp_gradient_segment_get_left_flat_color (gradient,
+                                                 data_editor->context,
+                                                 right_seg,
+                                                 &right_seg_color);
+
+      left_editable  = (editor->control_sel_l->left_color_type ==
+                        GIMP_GRADIENT_COLOR_FIXED);
+      right_editable = (editor->control_sel_r->right_color_type ==
+                        GIMP_GRADIENT_COLOR_FIXED);
+
+      type  = editor->control_sel_l->type;
+      color = editor->control_sel_l->color;
+
+      seg = editor->control_sel_l;
+
+      do
+        {
+          blending_equal = blending_equal && (seg->type == type);
+          coloring_equal = coloring_equal && (seg->color == color);
+
+          aseg = seg;
+          seg  = seg->next;
+        }
+      while (aseg != editor->control_sel_r);
+
+      selection = (editor->control_sel_l != editor->control_sel_r);
+      delete    = (editor->control_sel_l->prev || editor->control_sel_r->next);
+    }
+
+  if (data_editor->context)
+    {
+      gimp_context_get_foreground (data_editor->context, &fg);
+      gimp_context_get_background (data_editor->context, &bg);
+    }
+
+  /*  pretend the gradient not being editable while the dialog is
+   *  insensitive. prevents the gradient from being modified while a
+   *  dialog is running. bug #161411 --mitch
+   */
+  if (! gtk_widget_is_sensitive (GTK_WIDGET (editor)))
+    editable = FALSE;
+
+  if (! editable)
+    {
+      left_editable  = FALSE;
+      right_editable = FALSE;
+    }
+
+  edit_active = gimp_data_editor_get_edit_active (data_editor);
+
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_COLOR(action,color,set_label) \
+        gimp_action_group_set_action_color (group, action, (color), (set_label))
+#define SET_LABEL(action,label) \
+        gimp_action_group_set_action_label (group, action, (label))
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("gradient-editor-left-color-fixed",                  editable);
+  SET_SENSITIVE ("gradient-editor-left-color-foreground",             editable);
+  SET_SENSITIVE ("gradient-editor-left-color-foreground-transparent", editable);
+  SET_SENSITIVE ("gradient-editor-left-color-background",             editable);
+  SET_SENSITIVE ("gradient-editor-left-color-background-transparent", editable);
+
+  if (gradient)
+    {
+      switch (editor->control_sel_l->left_color_type)
+        {
+        case GIMP_GRADIENT_COLOR_FIXED:
+          SET_ACTIVE ("gradient-editor-left-color-fixed", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_FOREGROUND:
+          SET_ACTIVE ("gradient-editor-left-color-foreground", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT:
+          SET_ACTIVE ("gradient-editor-left-color-foreground-transparent", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_BACKGROUND:
+          SET_ACTIVE ("gradient-editor-left-color-background", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT:
+          SET_ACTIVE ("gradient-editor-left-color-background-transparent", TRUE);
+          break;
+        }
+    }
+
+  SET_SENSITIVE ("gradient-editor-left-color",               left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-left-neighbor",  editable);
+  SET_SENSITIVE ("gradient-editor-load-left-right-endpoint", editable);
+
+  if (gradient)
+    {
+      SET_COLOR ("gradient-editor-left-color",
+                 &left_color, FALSE);
+      SET_COLOR ("gradient-editor-load-left-left-neighbor",
+                 &left_seg_color, FALSE);
+      SET_COLOR ("gradient-editor-load-left-right-endpoint",
+                 &right_color, FALSE);
+    }
+
+  SET_SENSITIVE ("gradient-editor-load-left-fg", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-bg", left_editable);
+
+  SET_COLOR ("gradient-editor-load-left-fg",
+             data_editor->context ? &fg : NULL, FALSE);
+  SET_COLOR ("gradient-editor-load-left-bg",
+             data_editor->context ? &bg : NULL, FALSE);
+
+  SET_SENSITIVE ("gradient-editor-load-left-01", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-02", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-03", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-04", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-05", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-06", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-07", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-08", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-09", left_editable);
+  SET_SENSITIVE ("gradient-editor-load-left-10", left_editable);
+
+  SET_COLOR ("gradient-editor-load-left-01", &editor->saved_colors[0], TRUE);
+  SET_COLOR ("gradient-editor-load-left-02", &editor->saved_colors[1], TRUE);
+  SET_COLOR ("gradient-editor-load-left-03", &editor->saved_colors[2], TRUE);
+  SET_COLOR ("gradient-editor-load-left-04", &editor->saved_colors[3], TRUE);
+  SET_COLOR ("gradient-editor-load-left-05", &editor->saved_colors[4], TRUE);
+  SET_COLOR ("gradient-editor-load-left-06", &editor->saved_colors[5], TRUE);
+  SET_COLOR ("gradient-editor-load-left-07", &editor->saved_colors[6], TRUE);
+  SET_COLOR ("gradient-editor-load-left-08", &editor->saved_colors[7], TRUE);
+  SET_COLOR ("gradient-editor-load-left-09", &editor->saved_colors[8], TRUE);
+  SET_COLOR ("gradient-editor-load-left-10", &editor->saved_colors[9], TRUE);
+
+  SET_SENSITIVE ("gradient-editor-save-left-01", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-02", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-03", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-04", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-05", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-06", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-07", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-08", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-09", gradient);
+  SET_SENSITIVE ("gradient-editor-save-left-10", gradient);
+
+  SET_COLOR ("gradient-editor-save-left-01", &editor->saved_colors[0], TRUE);
+  SET_COLOR ("gradient-editor-save-left-02", &editor->saved_colors[1], TRUE);
+  SET_COLOR ("gradient-editor-save-left-03", &editor->saved_colors[2], TRUE);
+  SET_COLOR ("gradient-editor-save-left-04", &editor->saved_colors[3], TRUE);
+  SET_COLOR ("gradient-editor-save-left-05", &editor->saved_colors[4], TRUE);
+  SET_COLOR ("gradient-editor-save-left-06", &editor->saved_colors[5], TRUE);
+  SET_COLOR ("gradient-editor-save-left-07", &editor->saved_colors[6], TRUE);
+  SET_COLOR ("gradient-editor-save-left-08", &editor->saved_colors[7], TRUE);
+  SET_COLOR ("gradient-editor-save-left-09", &editor->saved_colors[8], TRUE);
+  SET_COLOR ("gradient-editor-save-left-10", &editor->saved_colors[9], TRUE);
+
+  SET_SENSITIVE ("gradient-editor-right-color-fixed",                  editable);
+  SET_SENSITIVE ("gradient-editor-right-color-foreground",             editable);
+  SET_SENSITIVE ("gradient-editor-right-color-foreground-transparent", editable);
+  SET_SENSITIVE ("gradient-editor-right-color-background",             editable);
+  SET_SENSITIVE ("gradient-editor-right-color-background-transparent", editable);
+
+  if (gradient)
+    {
+      switch (editor->control_sel_r->right_color_type)
+        {
+        case GIMP_GRADIENT_COLOR_FIXED:
+          SET_ACTIVE ("gradient-editor-right-color-fixed", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_FOREGROUND:
+          SET_ACTIVE ("gradient-editor-right-color-foreground", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT:
+          SET_ACTIVE ("gradient-editor-right-color-foreground-transparent", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_BACKGROUND:
+          SET_ACTIVE ("gradient-editor-right-color-background", TRUE);
+          break;
+        case GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT:
+          SET_ACTIVE ("gradient-editor-right-color-background-transparent", TRUE);
+          break;
+        }
+    }
+
+  SET_SENSITIVE ("gradient-editor-right-color",               right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-right-neighbor", editable);
+  SET_SENSITIVE ("gradient-editor-load-right-left-endpoint",  editable);
+
+  if (gradient)
+    {
+      SET_COLOR ("gradient-editor-right-color",
+                 &right_color, FALSE);
+      SET_COLOR ("gradient-editor-load-right-right-neighbor",
+                 &right_seg_color, FALSE);
+      SET_COLOR ("gradient-editor-load-right-left-endpoint",
+                 &left_color, FALSE);
+    }
+
+  SET_SENSITIVE ("gradient-editor-load-right-fg", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-bg", right_editable);
+
+  SET_COLOR ("gradient-editor-load-right-fg",
+             data_editor->context ? &fg : NULL, FALSE);
+  SET_COLOR ("gradient-editor-load-right-bg",
+             data_editor->context ? &bg : NULL, FALSE);
+
+  SET_SENSITIVE ("gradient-editor-load-right-01", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-02", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-03", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-04", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-05", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-06", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-07", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-08", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-09", right_editable);
+  SET_SENSITIVE ("gradient-editor-load-right-10", right_editable);
+
+  SET_COLOR ("gradient-editor-load-right-01", &editor->saved_colors[0], TRUE);
+  SET_COLOR ("gradient-editor-load-right-02", &editor->saved_colors[1], TRUE);
+  SET_COLOR ("gradient-editor-load-right-03", &editor->saved_colors[2], TRUE);
+  SET_COLOR ("gradient-editor-load-right-04", &editor->saved_colors[3], TRUE);
+  SET_COLOR ("gradient-editor-load-right-05", &editor->saved_colors[4], TRUE);
+  SET_COLOR ("gradient-editor-load-right-06", &editor->saved_colors[5], TRUE);
+  SET_COLOR ("gradient-editor-load-right-07", &editor->saved_colors[6], TRUE);
+  SET_COLOR ("gradient-editor-load-right-08", &editor->saved_colors[7], TRUE);
+  SET_COLOR ("gradient-editor-load-right-09", &editor->saved_colors[8], TRUE);
+  SET_COLOR ("gradient-editor-load-right-10", &editor->saved_colors[9], TRUE);
+
+  SET_SENSITIVE ("gradient-editor-save-right-01", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-02", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-03", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-04", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-05", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-06", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-07", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-08", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-09", gradient);
+  SET_SENSITIVE ("gradient-editor-save-right-10", gradient);
+
+  SET_COLOR ("gradient-editor-save-right-01", &editor->saved_colors[0], TRUE);
+  SET_COLOR ("gradient-editor-save-right-02", &editor->saved_colors[1], TRUE);
+  SET_COLOR ("gradient-editor-save-right-03", &editor->saved_colors[2], TRUE);
+  SET_COLOR ("gradient-editor-save-right-04", &editor->saved_colors[3], TRUE);
+  SET_COLOR ("gradient-editor-save-right-05", &editor->saved_colors[4], TRUE);
+  SET_COLOR ("gradient-editor-save-right-06", &editor->saved_colors[5], TRUE);
+  SET_COLOR ("gradient-editor-save-right-07", &editor->saved_colors[6], TRUE);
+  SET_COLOR ("gradient-editor-save-right-08", &editor->saved_colors[7], TRUE);
+  SET_COLOR ("gradient-editor-save-right-09", &editor->saved_colors[8], TRUE);
+  SET_COLOR ("gradient-editor-save-right-10", &editor->saved_colors[9], TRUE);
+
+  SET_SENSITIVE ("gradient-editor-flip",           editable);
+  SET_SENSITIVE ("gradient-editor-replicate",      editable);
+  SET_SENSITIVE ("gradient-editor-split-midpoint", editable);
+  SET_SENSITIVE ("gradient-editor-split-uniform",  editable);
+  SET_SENSITIVE ("gradient-editor-delete",         editable && delete);
+  SET_SENSITIVE ("gradient-editor-recenter",       editable);
+  SET_SENSITIVE ("gradient-editor-redistribute",   editable);
+
+  if (! selection)
+    {
+      SET_LABEL ("gradient-editor-blending-func",
+                 _("_Blending Function for Segment"));
+      SET_LABEL ("gradient-editor-coloring-type",
+                 _("Coloring _Type for Segment"));
+
+      SET_LABEL ("gradient-editor-flip",
+                 _("_Flip Segment"));
+      SET_LABEL ("gradient-editor-replicate",
+                 _("_Replicate Segment..."));
+      SET_LABEL ("gradient-editor-split-midpoint",
+                 _("Split Segment at _Midpoint"));
+      SET_LABEL ("gradient-editor-split-uniform",
+                 _("Split Segment _Uniformly..."));
+      SET_LABEL ("gradient-editor-delete",
+                 _("_Delete Segment"));
+      SET_LABEL ("gradient-editor-recenter",
+                 _("Re-_center Segment's Midpoint"));
+      SET_LABEL ("gradient-editor-redistribute",
+                 _("Re-distribute _Handles in Segment"));
+    }
+  else
+    {
+      SET_LABEL ("gradient-editor-blending-func",
+                 _("_Blending Function for Selection"));
+      SET_LABEL ("gradient-editor-coloring-type",
+                 _("Coloring _Type for Selection"));
+
+      SET_LABEL ("gradient-editor-flip",
+                 _("_Flip Selection"));
+      SET_LABEL ("gradient-editor-replicate",
+                 _("_Replicate Selection..."));
+      SET_LABEL ("gradient-editor-split-midpoint",
+                 _("Split Segments at _Midpoints"));
+      SET_LABEL ("gradient-editor-split-uniform",
+                 _("Split Segments _Uniformly..."));
+      SET_LABEL ("gradient-editor-delete",
+                 _("_Delete Selection"));
+      SET_LABEL ("gradient-editor-recenter",
+                 _("Re-_center Midpoints in Selection"));
+      SET_LABEL ("gradient-editor-redistribute",
+                 _("Re-distribute _Handles in Selection"));
+    }
+
+  SET_SENSITIVE ("gradient-editor-blending-varies", FALSE);
+  SET_VISIBLE   ("gradient-editor-blending-varies", ! blending_equal);
+
+  SET_SENSITIVE ("gradient-editor-blending-linear",            editable);
+  SET_SENSITIVE ("gradient-editor-blending-curved",            editable);
+  SET_SENSITIVE ("gradient-editor-blending-sine",              editable);
+  SET_SENSITIVE ("gradient-editor-blending-sphere-increasing", editable);
+  SET_SENSITIVE ("gradient-editor-blending-sphere-decreasing", editable);
+  SET_SENSITIVE ("gradient-editor-blending-step",              editable);
+
+  if (blending_equal && gradient)
+    {
+      switch (editor->control_sel_l->type)
+        {
+        case GIMP_GRADIENT_SEGMENT_LINEAR:
+          SET_ACTIVE ("gradient-editor-blending-linear", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_CURVED:
+          SET_ACTIVE ("gradient-editor-blending-curved", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_SINE:
+          SET_ACTIVE ("gradient-editor-blending-sine", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING:
+          SET_ACTIVE ("gradient-editor-blending-sphere-increasing", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING:
+          SET_ACTIVE ("gradient-editor-blending-sphere-decreasing", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_STEP:
+          SET_ACTIVE ("gradient-editor-blending-step", TRUE);
+          break;
+        }
+    }
+  else
+    {
+      SET_ACTIVE ("gradient-editor-blending-varies", TRUE);
+    }
+
+  SET_SENSITIVE ("gradient-editor-coloring-varies", FALSE);
+  SET_VISIBLE   ("gradient-editor-coloring-varies", ! coloring_equal);
+
+  SET_SENSITIVE ("gradient-editor-coloring-rgb",     editable);
+  SET_SENSITIVE ("gradient-editor-coloring-hsv-ccw", editable);
+  SET_SENSITIVE ("gradient-editor-coloring-hsv-cw",  editable);
+
+  if (coloring_equal && gradient)
+    {
+      switch (editor->control_sel_l->color)
+        {
+        case GIMP_GRADIENT_SEGMENT_RGB:
+          SET_ACTIVE ("gradient-editor-coloring-rgb", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_HSV_CCW:
+          SET_ACTIVE ("gradient-editor-coloring-hsv-ccw", TRUE);
+          break;
+        case GIMP_GRADIENT_SEGMENT_HSV_CW:
+          SET_ACTIVE ("gradient-editor-coloring-hsv-cw", TRUE);
+          break;
+        }
+    }
+  else
+    {
+      SET_ACTIVE ("gradient-editor-coloring-varies", TRUE);
+    }
+
+  SET_SENSITIVE ("gradient-editor-blend-color",   editable && selection);
+  SET_SENSITIVE ("gradient-editor-blend-opacity", editable && selection);
+
+  SET_SENSITIVE ("gradient-editor-zoom-out", gradient);
+  SET_SENSITIVE ("gradient-editor-zoom-in",  gradient);
+  SET_SENSITIVE ("gradient-editor-zoom-all", gradient);
+
+  SET_ACTIVE ("gradient-editor-edit-active", edit_active);
+
+#undef SET_ACTIVE
+#undef SET_COLOR
+#undef SET_LABEL
+#undef SET_SENSITIVE
+#undef SET_VISIBLE
+}
diff --git a/app/actions/gradient-editor-actions.h b/app/actions/gradient-editor-actions.h
new file mode 100644
index 0000000..5c2f999
--- /dev/null
+++ b/app/actions/gradient-editor-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GRADIENT_EDITOR_ACTIONS_H__
+#define __GRADIENT_EDITOR_ACTIONS_H__
+
+
+void   gradient_editor_actions_setup  (GimpActionGroup *group);
+void   gradient_editor_actions_update (GimpActionGroup *group,
+                                       gpointer         data);
+
+
+#endif /* __GRADIENT_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c
new file mode 100644
index 0000000..fa3709f
--- /dev/null
+++ b/app/actions/gradient-editor-commands.c
@@ -0,0 +1,738 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpgradient.h"
+
+#include "widgets/gimpgradienteditor.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "gradient-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gradient_editor_split_uniform_response (GtkWidget           *widget,
+                                                      gint                 response_id,
+                                                      GimpGradientEditor  *editor);
+static void   gradient_editor_replicate_response     (GtkWidget           *widget,
+                                                      gint                 response_id,
+                                                      GimpGradientEditor  *editor);
+
+
+/*  public functions */
+
+void
+gradient_editor_left_color_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
+
+  gimp_gradient_editor_edit_left_color (editor);
+}
+
+void
+gradient_editor_left_color_type_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientColor    color_type;
+
+  color_type = (GimpGradientColor) g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, NULL);
+
+  if (gradient        &&
+      color_type >= 0 &&
+      color_type !=
+      gimp_gradient_segment_get_left_color_type (gradient, left))
+    {
+      GimpRGB color;
+
+      gimp_gradient_segment_get_left_flat_color (gradient,
+                                                 GIMP_DATA_EDITOR (editor)->context,
+                                                 left, &color);
+
+      gimp_data_freeze (GIMP_DATA (gradient));
+
+      gimp_gradient_segment_set_left_color_type (gradient, left, color_type);
+
+      if (color_type == GIMP_GRADIENT_COLOR_FIXED)
+        gimp_gradient_segment_set_left_color (gradient, left, &color);
+
+      gimp_data_thaw (GIMP_DATA (gradient));
+    }
+}
+
+void
+gradient_editor_load_left_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpGradientEditor  *editor      = GIMP_GRADIENT_EDITOR (data);
+  GimpDataEditor      *data_editor = GIMP_DATA_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+  GimpGradientSegment *seg;
+  GimpRGB              color;
+  GimpGradientColor    color_type = GIMP_GRADIENT_COLOR_FIXED;
+  gint                 index      = g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  switch (index)
+    {
+    case GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT:
+      if (left->prev != NULL)
+        seg = left->prev;
+      else
+        seg = gimp_gradient_segment_get_last (left);
+
+      color      = seg->right_color;
+      color_type = seg->right_color_type;
+      break;
+
+    case GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT:
+      color      = right->right_color;
+      color_type = right->right_color_type;
+      break;
+
+    case GRADIENT_EDITOR_COLOR_FOREGROUND:
+      gimp_context_get_foreground (data_editor->context, &color);
+      break;
+
+    case GRADIENT_EDITOR_COLOR_BACKGROUND:
+      gimp_context_get_background (data_editor->context, &color);
+      break;
+
+    default: /* Load a color */
+      color = editor->saved_colors[index - GRADIENT_EDITOR_COLOR_FIRST_CUSTOM];
+      break;
+    }
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  gimp_gradient_segment_range_blend (gradient, left, right,
+                                     &color,
+                                     &right->right_color,
+                                     TRUE, TRUE);
+  gimp_gradient_segment_set_left_color_type (gradient, left, color_type);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gradient_editor_save_left_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  gint                 index = g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, NULL);
+
+  gimp_gradient_segment_get_left_color (gradient, left,
+                                        &editor->saved_colors[index]);
+}
+
+void
+gradient_editor_right_color_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
+
+  gimp_gradient_editor_edit_right_color (editor);
+}
+
+void
+gradient_editor_right_color_type_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *right;
+  GimpGradientColor    color_type;
+
+  color_type = (GimpGradientColor) g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, NULL, &right);
+
+  if (gradient        &&
+      color_type >= 0 &&
+      color_type !=
+      gimp_gradient_segment_get_right_color_type (gradient, right))
+    {
+      GimpRGB color;
+
+      gimp_gradient_segment_get_right_flat_color (gradient,
+                                                  GIMP_DATA_EDITOR (editor)->context,
+                                                  right, &color);
+
+      gimp_data_freeze (GIMP_DATA (gradient));
+
+      gimp_gradient_segment_set_right_color_type (gradient, right, color_type);
+
+      if (color_type == GIMP_GRADIENT_COLOR_FIXED)
+        gimp_gradient_segment_set_right_color (gradient, right, &color);
+
+      gimp_data_thaw (GIMP_DATA (gradient));
+    }
+}
+
+void
+gradient_editor_load_right_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpGradientEditor  *editor      = GIMP_GRADIENT_EDITOR (data);
+  GimpDataEditor      *data_editor = GIMP_DATA_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+  GimpGradientSegment *seg;
+  GimpRGB              color;
+  GimpGradientColor    color_type = GIMP_GRADIENT_COLOR_FIXED;
+  gint                 index      = g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  switch (index)
+    {
+    case GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT:
+      if (right->next != NULL)
+        seg = right->next;
+      else
+        seg = gimp_gradient_segment_get_first (right);
+
+      color      = seg->left_color;
+      color_type = seg->left_color_type;
+      break;
+
+    case GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT:
+      color      = left->left_color;
+      color_type = left->left_color_type;
+      break;
+
+    case GRADIENT_EDITOR_COLOR_FOREGROUND:
+      gimp_context_get_foreground (data_editor->context, &color);
+      break;
+
+    case GRADIENT_EDITOR_COLOR_BACKGROUND:
+      gimp_context_get_background (data_editor->context, &color);
+      break;
+
+    default: /* Load a color */
+      color = editor->saved_colors[index - GRADIENT_EDITOR_COLOR_FIRST_CUSTOM];
+      break;
+    }
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  gimp_gradient_segment_range_blend (gradient, left, right,
+                                     &left->left_color,
+                                     &color,
+                                     TRUE, TRUE);
+  gimp_gradient_segment_set_right_color_type (gradient, left, color_type);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gradient_editor_save_right_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *right;
+  gint                 index = g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, NULL, &right);
+
+  gimp_gradient_segment_get_right_color (gradient, right,
+                                         &editor->saved_colors[index]);
+}
+
+void
+gradient_editor_blending_func_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpGradientEditor      *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient            *gradient;
+  GimpGradientSegment     *left;
+  GimpGradientSegment     *right;
+  GEnumClass              *enum_class = NULL;
+  GimpGradientSegmentType  type;
+
+  type = (GimpGradientSegmentType) g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  enum_class = g_type_class_ref (GIMP_TYPE_GRADIENT_SEGMENT_TYPE);
+
+  if (gradient && g_enum_get_value (enum_class, type))
+    {
+      gimp_gradient_segment_range_set_blending_function (gradient,
+                                                         left, right,
+                                                         type);
+    }
+
+  g_type_class_unref (enum_class);
+}
+
+void
+gradient_editor_coloring_type_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpGradientEditor       *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient             *gradient;
+  GimpGradientSegment      *left;
+  GimpGradientSegment      *right;
+  GEnumClass               *enum_class = NULL;
+  GimpGradientSegmentColor  color;
+
+  color = (GimpGradientSegmentColor) g_variant_get_int32 (value);
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  enum_class = g_type_class_ref (GIMP_TYPE_GRADIENT_SEGMENT_COLOR);
+
+  if (gradient && g_enum_get_value (enum_class, color))
+    {
+      gimp_gradient_segment_range_set_coloring_type (gradient,
+                                                     left, right,
+                                                     color);
+    }
+
+  g_type_class_unref (enum_class);
+}
+
+void
+gradient_editor_flip_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_flip (gradient,
+                                    left, right,
+                                    &left, &right);
+
+  gimp_gradient_editor_set_selection (editor, left, right);
+}
+
+void
+gradient_editor_replicate_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpGradientEditor  *editor      = GIMP_GRADIENT_EDITOR (data);
+  GimpDataEditor      *data_editor = GIMP_DATA_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+  GtkWidget           *dialog;
+  GtkWidget           *vbox;
+  GtkWidget           *label;
+  GtkWidget           *scale;
+  GtkAdjustment       *scale_data;
+  const gchar         *title;
+  const gchar         *desc;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  if (left == right)
+    {
+      title = _("Replicate Segment");
+      desc  = _("Replicate Gradient Segment");
+    }
+  else
+    {
+      title = _("Replicate Selection");
+      desc  = _("Replicate Gradient Selection");
+    }
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (gradient),
+                                     data_editor->context,
+                                     title,
+                                     "gimp-gradient-segment-replicate",
+                                     GIMP_ICON_GRADIENT, desc,
+                                     GTK_WIDGET (editor),
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_GRADIENT_EDITOR_REPLICATE,
+
+                                     _("_Cancel"),    GTK_RESPONSE_CANCEL,
+                                     _("_Replicate"), GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gradient_editor_replicate_response),
+                    editor);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  /*  Instructions  */
+  if (left == right)
+    label = gtk_label_new (_("Select the number of times\n"
+                             "to replicate the selected segment."));
+  else
+    label = gtk_label_new (_("Select the number of times\n"
+                             "to replicate the selection."));
+
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  /*  Scale  */
+  scale_data = GTK_ADJUSTMENT (gtk_adjustment_new (2.0, 2.0, 21.0, 1.0, 1.0, 1.0));
+
+  scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, scale_data);
+  gtk_scale_set_digits (GTK_SCALE (scale), 0);
+  gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE, 4);
+  gtk_widget_show (scale);
+
+  g_object_set_data (G_OBJECT (dialog), "adjustment", scale_data);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                          gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+
+  gtk_widget_show (dialog);
+}
+
+void
+gradient_editor_split_midpoint_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data)
+{
+  GimpGradientEditor  *editor      = GIMP_GRADIENT_EDITOR (data);
+  GimpDataEditor      *data_editor = GIMP_DATA_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_split_midpoint (gradient,
+                                              data_editor->context,
+                                              left, right,
+                                              editor->blend_color_space,
+                                              &left, &right);
+
+  gimp_gradient_editor_set_selection (editor, left, right);
+}
+
+void
+gradient_editor_split_uniformly_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data)
+{
+  GimpGradientEditor  *editor      = GIMP_GRADIENT_EDITOR (data);
+  GimpDataEditor      *data_editor = GIMP_DATA_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+  GtkWidget           *dialog;
+  GtkWidget           *vbox;
+  GtkWidget           *label;
+  GtkWidget           *scale;
+  GtkAdjustment       *scale_data;
+  const gchar         *title;
+  const gchar         *desc;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  if (left == right)
+    {
+      title = _("Split Segment Uniformly");
+      desc  = _("Split Gradient Segment Uniformly");
+    }
+  else
+    {
+      title = _("Split Segments Uniformly");
+      desc  = _("Split Gradient Segments Uniformly");
+    }
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (gradient),
+                                     data_editor->context,
+                                     title,
+                                     "gimp-gradient-segment-split-uniformly",
+                                     GIMP_ICON_GRADIENT, desc,
+                                     GTK_WIDGET (editor),
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Split"),  GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gradient_editor_split_uniform_response),
+                    editor);
+
+  /*  The main vbox  */
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  /*  Instructions  */
+  if (left == right)
+    label = gtk_label_new (_("Select the number of uniform parts\n"
+                             "in which to split the selected segment."));
+  else
+    label = gtk_label_new (_("Select the number of uniform parts\n"
+                             "in which to split the segments in the selection."));
+
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  /*  Scale  */
+  scale_data = GTK_ADJUSTMENT (gtk_adjustment_new (2.0, 2.0, 21.0, 1.0, 1.0, 1.0));
+
+  scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, scale_data);
+  gtk_scale_set_digits (GTK_SCALE (scale), 0);
+  gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 4);
+  gtk_widget_show (scale);
+
+  g_object_set_data (G_OBJECT (dialog), "adjustment", scale_data);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                          gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+
+  gtk_widget_show (dialog);
+}
+
+void
+gradient_editor_delete_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_delete (gradient,
+                                      left, right,
+                                      &left, &right);
+
+  gimp_gradient_editor_set_selection (editor, left, right);
+}
+
+void
+gradient_editor_recenter_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_recenter_handles (gradient, left, right);
+}
+
+void
+gradient_editor_redistribute_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_redistribute_handles (gradient, left, right);
+}
+
+void
+gradient_editor_blend_color_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_blend (gradient, left, right,
+                                     &left->left_color,
+                                     &right->right_color,
+                                     TRUE, FALSE);
+}
+
+void
+gradient_editor_blend_opacity_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  GimpGradientSegment *left;
+  GimpGradientSegment *right;
+
+  gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+  gimp_gradient_segment_range_blend (gradient, left, right,
+                                     &left->left_color,
+                                     &right->right_color,
+                                     FALSE, TRUE);
+}
+
+void
+gradient_editor_zoom_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpGradientEditor *editor    = GIMP_GRADIENT_EDITOR (data);
+  GimpZoomType        zoom_type = (GimpZoomType) g_variant_get_int32 (value);
+
+  gimp_gradient_editor_zoom (editor, zoom_type);
+}
+
+
+/*  private functions  */
+
+static void
+gradient_editor_split_uniform_response (GtkWidget          *widget,
+                                        gint                response_id,
+                                        GimpGradientEditor *editor)
+{
+  GtkAdjustment *adjustment;
+  gint           split_parts;
+
+  adjustment = g_object_get_data (G_OBJECT (widget), "adjustment");
+
+  split_parts = RINT (gtk_adjustment_get_value (adjustment));
+
+  gtk_widget_destroy (widget);
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                          gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpDataEditor      *data_editor = GIMP_DATA_EDITOR (editor);
+      GimpGradient        *gradient;
+      GimpGradientSegment *left;
+      GimpGradientSegment *right;
+
+      gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+      gimp_gradient_segment_range_split_uniform (gradient,
+                                                 data_editor->context,
+                                                 left, right,
+                                                 split_parts,
+                                                 editor->blend_color_space,
+                                                 &left, &right);
+
+      gimp_gradient_editor_set_selection (editor, left, right);
+    }
+}
+
+static void
+gradient_editor_replicate_response (GtkWidget          *widget,
+                                    gint                response_id,
+                                    GimpGradientEditor *editor)
+{
+  GtkAdjustment *adjustment;
+  gint           replicate_times;
+
+  adjustment = g_object_get_data (G_OBJECT (widget), "adjustment");
+
+  replicate_times = RINT (gtk_adjustment_get_value (adjustment));
+
+  gtk_widget_destroy (widget);
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                          gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *left;
+      GimpGradientSegment *right;
+
+      gimp_gradient_editor_get_selection (editor, &gradient, &left, &right);
+
+      gimp_gradient_segment_range_replicate (gradient,
+                                             left, right,
+                                             replicate_times,
+                                             &left, &right);
+
+      gimp_gradient_editor_set_selection (editor, left, right);
+    }
+}
diff --git a/app/actions/gradient-editor-commands.h b/app/actions/gradient-editor-commands.h
new file mode 100644
index 0000000..4f930ea
--- /dev/null
+++ b/app/actions/gradient-editor-commands.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GRADIENT_EDITOR_COMMANDS_H__
+#define __GRADIENT_EDITOR_COMMANDS_H__
+
+
+enum
+{
+  GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT,
+  GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT,
+  GRADIENT_EDITOR_COLOR_FOREGROUND,
+  GRADIENT_EDITOR_COLOR_BACKGROUND,
+  GRADIENT_EDITOR_COLOR_FIRST_CUSTOM
+};
+
+
+void   gradient_editor_left_color_cmd_callback       (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_left_color_type_cmd_callback  (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_load_left_cmd_callback        (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_save_left_cmd_callback        (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   gradient_editor_right_color_cmd_callback      (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_right_color_type_cmd_callback (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_load_right_cmd_callback       (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_save_right_cmd_callback       (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   gradient_editor_blending_func_cmd_callback    (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_coloring_type_cmd_callback    (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   gradient_editor_flip_cmd_callback             (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_replicate_cmd_callback        (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_split_midpoint_cmd_callback   (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_split_uniformly_cmd_callback  (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_delete_cmd_callback           (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_recenter_cmd_callback         (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_redistribute_cmd_callback     (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   gradient_editor_blend_color_cmd_callback      (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+void   gradient_editor_blend_opacity_cmd_callback    (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+void   gradient_editor_zoom_cmd_callback             (GimpAction *action,
+                                                      GVariant   *value,
+                                                      gpointer    data);
+
+
+#endif /* __GRADIENT_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
new file mode 100644
index 0000000..f4b22ef
--- /dev/null
+++ b/app/actions/gradients-actions.c
@@ -0,0 +1,150 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "gradients-actions.h"
+#include "gradients-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry gradients_actions[] =
+{
+  { "gradients-popup", GIMP_ICON_GRADIENT,
+    NC_("gradients-action", "Gradients Menu"), NULL, NULL, NULL,
+    GIMP_HELP_GRADIENT_DIALOG },
+
+  { "gradients-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("gradients-action", "_New Gradient"), NULL,
+    NC_("gradients-action", "Create a new gradient"),
+    data_new_cmd_callback,
+    GIMP_HELP_GRADIENT_NEW },
+
+  { "gradients-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("gradients-action", "D_uplicate Gradient"), NULL,
+    NC_("gradients-action", "Duplicate this gradient"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_GRADIENT_DUPLICATE },
+
+  { "gradients-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("gradients-action", "Copy Gradient _Location"), NULL,
+    NC_("gradients-action", "Copy gradient file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_GRADIENT_COPY_LOCATION },
+
+  { "gradients-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("gradients-action", "Show in _File Manager"), NULL,
+    NC_("gradients-action", "Show gradient file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_GRADIENT_SHOW_IN_FILE_MANAGER },
+
+  { "gradients-save-as-pov", GIMP_ICON_DOCUMENT_SAVE_AS,
+    NC_("gradients-action", "Save as _POV-Ray..."), NULL,
+    NC_("gradients-action", "Save gradient as POV-Ray"),
+    gradients_save_as_pov_ray_cmd_callback,
+    GIMP_HELP_GRADIENT_SAVE_AS_POV },
+
+  { "gradients-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("gradients-action", "_Delete Gradient"), NULL,
+    NC_("gradients-action", "Delete this gradient"),
+    data_delete_cmd_callback,
+    GIMP_HELP_GRADIENT_DELETE },
+
+  { "gradients-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("gradients-action", "_Refresh Gradients"), NULL,
+    NC_("gradients-action", "Refresh gradients"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_GRADIENT_REFRESH }
+};
+
+static const GimpStringActionEntry gradients_edit_actions[] =
+{
+  { "gradients-edit", GIMP_ICON_EDIT,
+    NC_("gradients-action", "_Edit Gradient..."), NULL,
+    NC_("gradients-action", "Edit this gradient"),
+    "gimp-gradient-editor",
+    GIMP_HELP_GRADIENT_EDIT }
+};
+
+
+void
+gradients_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "gradients-action",
+                                 gradients_actions,
+                                 G_N_ELEMENTS (gradients_actions));
+
+  gimp_action_group_add_string_actions (group, "gradients-action",
+                                        gradients_edit_actions,
+                                        G_N_ELEMENTS (gradients_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+gradients_actions_update (GimpActionGroup *group,
+                          gpointer         user_data)
+{
+  GimpContext  *context  = action_data_get_context (user_data);
+  GimpGradient *gradient = NULL;
+  GimpData     *data     = NULL;
+  GFile        *file     = NULL;
+
+  if (context)
+    {
+      gradient = gimp_context_get_gradient (context);
+
+      if (action_data_sel_count (user_data) > 1)
+        {
+          gradient = NULL;
+        }
+
+      if (gradient)
+        {
+          data = GIMP_DATA (gradient);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("gradients-edit",                 gradient);
+  SET_SENSITIVE ("gradients-duplicate",            gradient);
+  SET_SENSITIVE ("gradients-save-as-pov",          gradient);
+  SET_SENSITIVE ("gradients-copy-location",        file);
+  SET_SENSITIVE ("gradients-show-in-file-manager", file);
+  SET_SENSITIVE ("gradients-delete",               gradient && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/gradients-actions.h b/app/actions/gradients-actions.h
new file mode 100644
index 0000000..c8ee1ce
--- /dev/null
+++ b/app/actions/gradients-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GRADIENTS_ACTIONS_H__
+#define __GRADIENTS_ACTIONS_H__
+
+
+void   gradients_actions_setup  (GimpActionGroup *group);
+void   gradients_actions_update (GimpActionGroup *group,
+                                 gpointer         user_data);
+
+
+#endif /* __GRADIENT_ACTIONS_H__ */
diff --git a/app/actions/gradients-commands.c b/app/actions/gradients-commands.c
new file mode 100644
index 0000000..40b71fd
--- /dev/null
+++ b/app/actions/gradients-commands.c
@@ -0,0 +1,151 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpgradient-save.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpcontainereditor.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "dialogs/dialogs.h"
+
+#include "gradients-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gradients_save_as_pov_ray_response (GtkWidget    *dialog,
+                                                  gint          response_id,
+                                                  GimpGradient *gradient);
+
+
+/*  public functions  */
+
+void
+gradients_save_as_pov_ray_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpGradient        *gradient;
+  GtkWidget           *dialog;
+
+  context  = gimp_container_view_get_context (editor->view);
+  gradient = gimp_context_get_gradient (context);
+
+  if (! gradient)
+    return;
+
+#define SAVE_AS_POV_DIALOG_KEY "gimp-save-as-pov-ray-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (gradient), SAVE_AS_POV_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      gchar *title = g_strdup_printf (_("Save '%s' as POV-Ray"),
+                                      gimp_object_get_name (gradient));
+
+      dialog = gtk_file_chooser_dialog_new (title, NULL,
+                                            GTK_FILE_CHOOSER_ACTION_SAVE,
+
+                                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                            _("_Save"),   GTK_RESPONSE_OK,
+
+                                            NULL);
+
+      g_free (title);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      g_object_set_data (G_OBJECT (dialog), "gimp", context->gimp);
+
+      gtk_window_set_screen (GTK_WINDOW (dialog),
+                             gtk_widget_get_screen (GTK_WIDGET (editor)));
+      gtk_window_set_role (GTK_WINDOW (dialog), "gimp-gradient-save-pov");
+      gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+
+      gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
+                                                      TRUE);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gradients_save_as_pov_ray_response),
+                        gradient);
+      g_signal_connect (dialog, "delete-event",
+                        G_CALLBACK (gtk_true),
+                        NULL);
+
+      g_signal_connect_object (dialog, "destroy",
+                               G_CALLBACK (g_object_unref),
+                               g_object_ref (gradient),
+                               G_CONNECT_SWAPPED);
+
+      gimp_help_connect (dialog, gimp_standard_help_func,
+                         GIMP_HELP_GRADIENT_SAVE_AS_POV, NULL);
+
+      dialogs_attach_dialog (G_OBJECT (gradient),
+                             SAVE_AS_POV_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+
+/*  private functions  */
+
+static void
+gradients_save_as_pov_ray_response (GtkWidget    *dialog,
+                                    gint          response_id,
+                                    GimpGradient *gradient)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GFile  *file  = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      GError *error = NULL;
+
+      if (! gimp_gradient_save_pov (gradient, file, &error))
+        {
+          gimp_message_literal (g_object_get_data (G_OBJECT (dialog), "gimp"),
+                                G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+                                error->message);
+          g_clear_error (&error);
+          g_object_unref (file);
+          return;
+        }
+
+      g_object_unref (file);
+    }
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/actions/gradients-commands.h b/app/actions/gradients-commands.h
new file mode 100644
index 0000000..938f3ff
--- /dev/null
+++ b/app/actions/gradients-commands.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GRADIENTS_COMMANDS_H__
+#define __GRADIENTS_COMMANDS_H__
+
+
+void   gradients_save_as_pov_ray_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+
+#endif /* __GRADIENTS_COMMANDS_H__ */
diff --git a/app/actions/help-actions.c b/app/actions/help-actions.c
new file mode 100644
index 0000000..6b1502a
--- /dev/null
+++ b/app/actions/help-actions.c
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "help-actions.h"
+#include "help-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry help_actions[] =
+{
+  { "help-menu", NULL, NC_("help-action", "_Help") },
+
+  { "help-help", "gimp-prefs-help-system",
+    NC_("help-action", "_Help"), "F1",
+    NC_("help-action", "Open the GIMP user manual"),
+    help_help_cmd_callback,
+    GIMP_HELP_HELP },
+
+  { "help-context-help", "gimp-prefs-help-system",
+    NC_("help-action", "_Context Help"), "<shift>F1",
+    NC_("help-action", "Show the help for a specific user interface item"),
+    help_context_help_cmd_callback,
+    GIMP_HELP_HELP_CONTEXT }
+};
+
+
+void
+help_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "help-action",
+                                 help_actions,
+                                 G_N_ELEMENTS (help_actions));
+}
+
+void
+help_actions_update (GimpActionGroup *group,
+                     gpointer         data)
+{
+}
diff --git a/app/actions/help-actions.h b/app/actions/help-actions.h
new file mode 100644
index 0000000..970dc97
--- /dev/null
+++ b/app/actions/help-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __HELP_ACTIONS_H__
+#define __HELP_ACTIONS_H__
+
+
+void   help_actions_setup  (GimpActionGroup *group);
+void   help_actions_update (GimpActionGroup *group,
+                            gpointer         data);
+
+
+#endif /* __HELP_ACTIONS_H__ */
diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c
new file mode 100644
index 0000000..9e9693a
--- /dev/null
+++ b/app/actions/help-commands.c
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "widgets/gimphelp.h"
+
+#include "actions.h"
+#include "help-commands.h"
+
+
+void
+help_help_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  Gimp        *gimp;
+  GimpDisplay *display;
+  return_if_no_gimp (gimp, data);
+  return_if_no_display (display, data);
+
+  gimp_help_show (gimp, GIMP_PROGRESS (display), NULL, NULL);
+}
+
+void
+help_context_help_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GtkWidget *widget;
+  return_if_no_widget (widget, data);
+
+  gimp_context_help (widget);
+}
diff --git a/app/actions/help-commands.h b/app/actions/help-commands.h
new file mode 100644
index 0000000..61ce201
--- /dev/null
+++ b/app/actions/help-commands.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __HELP_COMMANDS_H__
+#define __HELP_COMMANDS_H__
+
+
+void   help_help_cmd_callback         (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data);
+void   help_context_help_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data);
+
+
+#endif /* __HELP_COMMANDS_H__ */
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
new file mode 100644
index 0000000..213933f
--- /dev/null
+++ b/app/actions/image-actions.c
@@ -0,0 +1,497 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpitemstack.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "image-actions.h"
+#include "image-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry image_actions[] =
+{
+  { "image-menubar", NULL,
+    NC_("image-action", "Image Menu"), NULL, NULL, NULL,
+    GIMP_HELP_IMAGE_WINDOW },
+
+  { "image-popup", NULL,
+    NC_("image-action", "Image Menu"), NULL, NULL, NULL,
+    GIMP_HELP_IMAGE_WINDOW },
+
+  { "image-menu",                  NULL, NC_("image-action", "_Image")     },
+  { "image-mode-menu",             NULL, NC_("image-action", "_Mode")      },
+  { "image-precision-menu",        NULL, NC_("image-action", "Pr_ecision") },
+#if PENDING_TRANSLATION
+  { "image-precision-menu",        NULL, NC_("image-action", "_Encoding")  },
+#endif
+  { "image-color-management-menu", NULL, NC_("image-action",
+                                             "Color Ma_nagement")          },
+  { "image-transform-menu",        NULL, NC_("image-action", "_Transform") },
+  { "image-guides-menu",           NULL, NC_("image-action", "_Guides")    },
+  { "image-metadata-menu",         NULL, NC_("image-action", "Meta_data")  },
+
+  { "colors-menu",              NULL, NC_("image-action", "_Colors")       },
+  { "colors-info-menu",         NULL, NC_("image-action", "I_nfo")         },
+  { "colors-auto-menu",         NULL, NC_("image-action", "_Auto")         },
+  { "colors-map-menu",          NULL, NC_("image-action", "_Map")          },
+  { "colors-tone-mapping-menu", NULL, NC_("image-action", "_Tone Mapping") },
+  { "colors-components-menu",   NULL, NC_("image-action", "C_omponents")   },
+  { "colors-desaturate-menu",   NULL, NC_("image-action", "D_esaturate")   },
+
+  { "image-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("image-action", "_New..."), "<primary>N",
+    NC_("image-action", "Create a new image"),
+    image_new_cmd_callback,
+    GIMP_HELP_FILE_NEW },
+
+  { "image-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("image-action", "_Duplicate"), "<primary>D",
+    NC_("image-action", "Create a duplicate of this image"),
+    image_duplicate_cmd_callback,
+    GIMP_HELP_IMAGE_DUPLICATE },
+
+  { "image-color-profile-assign", NULL,
+    NC_("image-action", "_Assign Color Profile..."), NULL,
+    NC_("image-action", "Set a color profile on the image"),
+    image_color_profile_assign_cmd_callback,
+    GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN },
+
+  { "image-color-profile-convert", NULL,
+    NC_("image-action", "_Convert to Color Profile..."), NULL,
+    NC_("image-action", "Apply a color profile to the image"),
+    image_color_profile_convert_cmd_callback,
+    GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT },
+
+  { "image-color-profile-discard", NULL,
+    NC_("image-action", "_Discard Color Profile"), NULL,
+    NC_("image-action", "Remove the image's color profile"),
+    image_color_profile_discard_cmd_callback,
+    GIMP_HELP_IMAGE_COLOR_PROFILE_DISCARD },
+
+  { "image-color-profile-save", NULL,
+    NC_("image-action", "_Save Color Profile to File..."), NULL,
+    NC_("image-action", "Save the image's color profile to an ICC file"),
+    image_color_profile_save_cmd_callback,
+    GIMP_HELP_IMAGE_COLOR_PROFILE_SAVE },
+
+  { "image-resize", GIMP_ICON_OBJECT_RESIZE,
+    NC_("image-action", "Can_vas Size..."), NULL,
+    NC_("image-action", "Adjust the image dimensions"),
+    image_resize_cmd_callback,
+    GIMP_HELP_IMAGE_RESIZE },
+
+  { "image-resize-to-layers", NULL,
+    NC_("image-action", "Fit Canvas to L_ayers"), NULL,
+    NC_("image-action", "Resize the image to enclose all layers"),
+    image_resize_to_layers_cmd_callback,
+    GIMP_HELP_IMAGE_RESIZE_TO_LAYERS },
+
+  { "image-resize-to-selection", NULL,
+    NC_("image-action", "F_it Canvas to Selection"), NULL,
+    NC_("image-action", "Resize the image to the extents of the selection"),
+    image_resize_to_selection_cmd_callback,
+    GIMP_HELP_IMAGE_RESIZE_TO_SELECTION },
+
+  { "image-print-size", GIMP_ICON_DOCUMENT_PRINT_RESOLUTION,
+    NC_("image-action", "_Print Size..."), NULL,
+    NC_("image-action", "Adjust the print resolution"),
+    image_print_size_cmd_callback,
+    GIMP_HELP_IMAGE_PRINT_SIZE },
+
+  { "image-scale", GIMP_ICON_OBJECT_SCALE,
+    NC_("image-action", "_Scale Image..."), NULL,
+    NC_("image-action", "Change the size of the image content"),
+    image_scale_cmd_callback,
+    GIMP_HELP_IMAGE_SCALE },
+
+  { "image-crop-to-selection", GIMP_ICON_TOOL_CROP,
+    NC_("image-action", "_Crop to Selection"), NULL,
+    NC_("image-action", "Crop the image to the extents of the selection"),
+    image_crop_to_selection_cmd_callback,
+    GIMP_HELP_IMAGE_CROP },
+
+  { "image-crop-to-content", GIMP_ICON_TOOL_CROP,
+    NC_("image-action", "Crop to C_ontent"), NULL,
+    NC_("image-action", "Crop the image to the extents of its content (remove empty borders from the image)"),
+    image_crop_to_content_cmd_callback,
+    GIMP_HELP_IMAGE_CROP },
+
+  { "image-merge-layers", NULL,
+    NC_("image-action", "Merge Visible _Layers..."), "<primary>M",
+    NC_("image-action", "Merge all visible layers into one layer"),
+    image_merge_layers_cmd_callback,
+    GIMP_HELP_IMAGE_MERGE_LAYERS },
+
+  { "image-flatten", NULL,
+    NC_("image-action", "_Flatten Image"), NULL,
+    NC_("image-action", "Merge all layers into one and remove transparency"),
+    image_flatten_image_cmd_callback,
+    GIMP_HELP_IMAGE_FLATTEN },
+
+  { "image-configure-grid", GIMP_ICON_GRID,
+    NC_("image-action", "Configure G_rid..."), NULL,
+    NC_("image-action", "Configure the grid for this image"),
+    image_configure_grid_cmd_callback,
+    GIMP_HELP_IMAGE_GRID },
+
+  { "image-properties", "dialog-information",
+    NC_("image-action", "Image Pr_operties"), "<alt>Return",
+    NC_("image-action", "Display information about this image"),
+    image_properties_cmd_callback,
+    GIMP_HELP_IMAGE_PROPERTIES }
+};
+
+static const GimpToggleActionEntry image_toggle_actions[] =
+{
+  { "image-color-management-enabled", NULL,
+    NC_("image-action", "_Enable Color Management"), NULL,
+    NC_("image-action", "Whether the image is color managed. Disabling "
+        "color management is equivalent to assigning a built-in sRGB "
+        "color profile. Better leave color management enabled."),
+    image_color_management_enabled_cmd_callback,
+    TRUE,
+    GIMP_HELP_IMAGE_COLOR_MANAGEMENT_ENABLED }
+};
+
+static const GimpRadioActionEntry image_convert_base_type_actions[] =
+{
+  { "image-convert-rgb", GIMP_ICON_CONVERT_RGB,
+    NC_("image-convert-action", "_RGB"), NULL,
+    NC_("image-convert-action", "Convert the image to the RGB colorspace"),
+    GIMP_RGB, GIMP_HELP_IMAGE_CONVERT_RGB },
+
+  { "image-convert-grayscale", GIMP_ICON_CONVERT_GRAYSCALE,
+    NC_("image-convert-action", "_Grayscale"), NULL,
+    NC_("image-convert-action", "Convert the image to grayscale"),
+    GIMP_GRAY, GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },
+
+  { "image-convert-indexed", GIMP_ICON_CONVERT_INDEXED,
+    NC_("image-convert-action", "_Indexed..."), NULL,
+    NC_("image-convert-action", "Convert the image to indexed colors"),
+    GIMP_INDEXED, GIMP_HELP_IMAGE_CONVERT_INDEXED }
+};
+
+static const GimpRadioActionEntry image_convert_precision_actions[] =
+{
+  { "image-convert-u8", NULL,
+    NC_("image-convert-action", "8 bit integer"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to 8 bit integer"),
+    GIMP_COMPONENT_TYPE_U8, GIMP_HELP_IMAGE_CONVERT_U8 },
+
+  { "image-convert-u16", NULL,
+    NC_("image-convert-action", "16 bit integer"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to 16 bit integer"),
+    GIMP_COMPONENT_TYPE_U16, GIMP_HELP_IMAGE_CONVERT_U16 },
+
+  { "image-convert-u32", NULL,
+    NC_("image-convert-action", "32 bit integer"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to 32 bit integer"),
+    GIMP_COMPONENT_TYPE_U32, GIMP_HELP_IMAGE_CONVERT_U32 },
+
+  { "image-convert-half", NULL,
+    NC_("image-convert-action", "16 bit floating point"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to 16 bit floating point"),
+    GIMP_COMPONENT_TYPE_HALF, GIMP_HELP_IMAGE_CONVERT_HALF },
+
+  { "image-convert-float", NULL,
+    NC_("image-convert-action", "32 bit floating point"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to 32 bit floating point"),
+    GIMP_COMPONENT_TYPE_FLOAT, GIMP_HELP_IMAGE_CONVERT_FLOAT },
+
+  { "image-convert-double", NULL,
+    NC_("image-convert-action", "64 bit floating point"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to 64 bit floating point"),
+    GIMP_COMPONENT_TYPE_DOUBLE, GIMP_HELP_IMAGE_CONVERT_DOUBLE }
+};
+
+static const GimpRadioActionEntry image_convert_gamma_actions[] =
+{
+  { "image-convert-gamma", NULL,
+    NC_("image-convert-action", "Perceptual gamma (sRGB)"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to perceptual (sRGB) gamma"),
+    FALSE, GIMP_HELP_IMAGE_CONVERT_GAMMA },
+
+  { "image-convert-linear", NULL,
+    NC_("image-convert-action", "Linear light"), NULL,
+    NC_("image-convert-action",
+        "Convert the image to linear light"),
+    TRUE, GIMP_HELP_IMAGE_CONVERT_GAMMA }
+};
+
+static const GimpEnumActionEntry image_flip_actions[] =
+{
+  { "image-flip-horizontal", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
+    NC_("image-action", "Flip _Horizontally"), NULL,
+    NC_("image-action", "Flip image horizontally"),
+    GIMP_ORIENTATION_HORIZONTAL, FALSE,
+    GIMP_HELP_IMAGE_FLIP_HORIZONTAL },
+
+  { "image-flip-vertical", GIMP_ICON_OBJECT_FLIP_VERTICAL,
+    NC_("image-action", "Flip _Vertically"), NULL,
+    NC_("image-action", "Flip image vertically"),
+    GIMP_ORIENTATION_VERTICAL, FALSE,
+    GIMP_HELP_IMAGE_FLIP_VERTICAL }
+};
+
+static const GimpEnumActionEntry image_rotate_actions[] =
+{
+  { "image-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
+    NC_("image-action", "Rotate 90° _clockwise"), NULL,
+    NC_("image-action", "Rotate the image 90 degrees to the right"),
+    GIMP_ROTATE_90, FALSE,
+    GIMP_HELP_IMAGE_ROTATE_90 },
+
+  { "image-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
+    NC_("image-action", "Rotate _180°"), NULL,
+    NC_("image-action", "Turn the image upside-down"),
+    GIMP_ROTATE_180, FALSE,
+    GIMP_HELP_IMAGE_ROTATE_180 },
+
+  { "image-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
+    NC_("image-action", "Rotate 90° counter-clock_wise"), NULL,
+    NC_("image-action", "Rotate the image 90 degrees to the left"),
+    GIMP_ROTATE_270, FALSE,
+    GIMP_HELP_IMAGE_ROTATE_270 }
+};
+
+
+void
+image_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "image-action",
+                                 image_actions,
+                                 G_N_ELEMENTS (image_actions));
+
+  gimp_action_group_add_toggle_actions (group, "image-action",
+                                        image_toggle_actions,
+                                        G_N_ELEMENTS (image_toggle_actions));
+
+  gimp_action_group_add_radio_actions (group, "image-convert-action",
+                                       image_convert_base_type_actions,
+                                       G_N_ELEMENTS (image_convert_base_type_actions),
+                                       NULL, 0,
+                                       image_convert_base_type_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "image-convert-action",
+                                       image_convert_precision_actions,
+                                       G_N_ELEMENTS (image_convert_precision_actions),
+                                       NULL, 0,
+                                       image_convert_precision_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "image-convert-action",
+                                       image_convert_gamma_actions,
+                                       G_N_ELEMENTS (image_convert_gamma_actions),
+                                       NULL, 0,
+                                       image_convert_gamma_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "image-action",
+                                      image_flip_actions,
+                                      G_N_ELEMENTS (image_flip_actions),
+                                      image_flip_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "image-action",
+                                      image_rotate_actions,
+                                      G_N_ELEMENTS (image_rotate_actions),
+                                      image_rotate_cmd_callback);
+
+#define SET_ALWAYS_SHOW_IMAGE(action,show) \
+        gimp_action_group_set_action_always_show_image (group, action, show)
+
+  SET_ALWAYS_SHOW_IMAGE ("image-rotate-90",  TRUE);
+  SET_ALWAYS_SHOW_IMAGE ("image-rotate-180", TRUE);
+  SET_ALWAYS_SHOW_IMAGE ("image-rotate-270", TRUE);
+
+#undef SET_ALWAYS_SHOW_IMAGE
+}
+
+void
+image_actions_update (GimpActionGroup *group,
+                      gpointer         data)
+{
+  GimpImage *image         = action_data_get_image (data);
+  gboolean   is_indexed    = FALSE;
+  gboolean   is_u8_gamma   = FALSE;
+  gboolean   is_double     = FALSE;
+  gboolean   aux           = FALSE;
+  gboolean   lp            = FALSE;
+  gboolean   sel           = FALSE;
+  gboolean   groups        = FALSE;
+  gboolean   color_managed = FALSE;
+  gboolean   profile       = FALSE;
+
+  if (image)
+    {
+      GimpContainer     *layers;
+      const gchar       *action = NULL;
+      GimpImageBaseType  base_type;
+      GimpPrecision      precision;
+      GimpComponentType  component_type;
+
+      base_type      = gimp_image_get_base_type (image);
+      precision      = gimp_image_get_precision (image);
+      component_type = gimp_image_get_component_type (image);
+
+      switch (base_type)
+        {
+        case GIMP_RGB:     action = "image-convert-rgb";       break;
+        case GIMP_GRAY:    action = "image-convert-grayscale"; break;
+        case GIMP_INDEXED: action = "image-convert-indexed";   break;
+        }
+
+      gimp_action_group_set_action_active (group, action, TRUE);
+
+      switch (component_type)
+        {
+        case GIMP_COMPONENT_TYPE_U8:     action = "image-convert-u8";     break;
+        case GIMP_COMPONENT_TYPE_U16:    action = "image-convert-u16";    break;
+        case GIMP_COMPONENT_TYPE_U32:    action = "image-convert-u32";    break;
+        case GIMP_COMPONENT_TYPE_HALF:   action = "image-convert-half";   break;
+        case GIMP_COMPONENT_TYPE_FLOAT:  action = "image-convert-float";  break;
+        case GIMP_COMPONENT_TYPE_DOUBLE: action = "image-convert-double"; break;
+        }
+
+      gimp_action_group_set_action_active (group, action, TRUE);
+
+      if (gimp_babl_format_get_linear (gimp_image_get_layer_format (image,
+                                                                    FALSE)))
+        {
+          gimp_action_group_set_action_active (group, "image-convert-linear",
+                                               TRUE);
+        }
+      else
+        {
+          gimp_action_group_set_action_active (group, "image-convert-gamma",
+                                               TRUE);
+        }
+
+      is_indexed  = (base_type == GIMP_INDEXED);
+      is_u8_gamma = (precision == GIMP_PRECISION_U8_GAMMA);
+      is_double   = (component_type == GIMP_COMPONENT_TYPE_DOUBLE);
+      aux         = (gimp_image_get_active_channel (image) != NULL);
+      lp          = ! gimp_image_is_empty (image);
+      sel         = ! gimp_channel_is_empty (gimp_image_get_mask (image));
+
+      layers = gimp_image_get_layers (image);
+
+      groups = ! gimp_item_stack_is_flat (GIMP_ITEM_STACK (layers));
+
+      color_managed = gimp_image_get_is_color_managed (image);
+      profile       = (gimp_image_get_color_profile (image) != NULL);
+    }
+
+#define SET_LABEL(action,label) \
+        gimp_action_group_set_action_label (group, action, (label))
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("image-duplicate", image);
+
+  if (profile)
+    {
+      SET_LABEL ("image-convert-rgb",
+                 C_("image-convert-action", "_RGB..."));
+      SET_LABEL ("image-convert-grayscale",
+                 C_("image-convert-action", "_Grayscale..."));
+    }
+  else
+    {
+      SET_LABEL ("image-convert-rgb",
+                 C_("image-convert-action", "_RGB"));
+      SET_LABEL ("image-convert-grayscale",
+                 C_("image-convert-action", "_Grayscale"));
+    }
+
+  SET_SENSITIVE ("image-convert-rgb",       image);
+  SET_SENSITIVE ("image-convert-grayscale", image);
+  SET_SENSITIVE ("image-convert-indexed",   image && !groups && is_u8_gamma);
+
+  SET_SENSITIVE ("image-convert-u8",     image);
+  SET_SENSITIVE ("image-convert-u16",    image && !is_indexed);
+  SET_SENSITIVE ("image-convert-u32",    image && !is_indexed);
+  SET_SENSITIVE ("image-convert-half",   image && !is_indexed);
+  SET_SENSITIVE ("image-convert-float",  image && !is_indexed);
+  SET_SENSITIVE ("image-convert-double", image && !is_indexed);
+  SET_VISIBLE   ("image-convert-double", is_double);
+
+  SET_SENSITIVE ("image-convert-gamma",  image);
+  SET_SENSITIVE ("image-convert-linear", image && !is_indexed);
+
+  SET_SENSITIVE ("image-color-management-enabled", image);
+  SET_ACTIVE    ("image-color-management-enabled", image && color_managed);
+
+  SET_SENSITIVE ("image-color-profile-assign",  image);
+  SET_SENSITIVE ("image-color-profile-convert", image);
+  SET_SENSITIVE ("image-color-profile-discard", image && profile);
+  SET_SENSITIVE ("image-color-profile-save",    image);
+
+  SET_SENSITIVE ("image-flip-horizontal", image);
+  SET_SENSITIVE ("image-flip-vertical",   image);
+  SET_SENSITIVE ("image-rotate-90",       image);
+  SET_SENSITIVE ("image-rotate-180",      image);
+  SET_SENSITIVE ("image-rotate-270",      image);
+
+  SET_SENSITIVE ("image-resize",              image);
+  SET_SENSITIVE ("image-resize-to-layers",    image);
+  SET_SENSITIVE ("image-resize-to-selection", image && sel);
+  SET_SENSITIVE ("image-print-size",          image);
+  SET_SENSITIVE ("image-scale",               image);
+  SET_SENSITIVE ("image-crop-to-selection",   image && sel);
+  SET_SENSITIVE ("image-crop-to-content",     image);
+  SET_SENSITIVE ("image-merge-layers",        image && !aux && lp);
+  SET_SENSITIVE ("image-flatten",             image && !aux && lp);
+  SET_SENSITIVE ("image-configure-grid",      image);
+  SET_SENSITIVE ("image-properties",          image);
+
+#undef SET_LABEL
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+#undef SET_VISIBLE
+}
diff --git a/app/actions/image-actions.h b/app/actions/image-actions.h
new file mode 100644
index 0000000..802f7af
--- /dev/null
+++ b/app/actions/image-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_ACTIONS_H__
+#define __IMAGE_ACTIONS_H__
+
+
+void   image_actions_setup  (GimpActionGroup *group);
+void   image_actions_update (GimpActionGroup *group,
+                             gpointer         data);
+
+
+#endif /* __IMAGE_ACTIONS_H__ */
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
new file mode 100644
index 0000000..536ee6f
--- /dev/null
+++ b/app/actions/image-commands.c
@@ -0,0 +1,1581 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/core-enums.h"
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpimage-convert-indexed.h"
+#include "core/gimpimage-convert-precision.h"
+#include "core/gimpimage-convert-type.h"
+#include "core/gimpimage-crop.h"
+#include "core/gimpimage-duplicate.h"
+#include "core/gimpimage-flip.h"
+#include "core/gimpimage-merge.h"
+#include "core/gimpimage-resize.h"
+#include "core/gimpimage-rotate.h"
+#include "core/gimpimage-scale.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpitem.h"
+#include "core/gimppickable.h"
+#include "core/gimppickable-auto-shrink.h"
+#include "core/gimpprogress.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/color-profile-dialog.h"
+#include "dialogs/convert-indexed-dialog.h"
+#include "dialogs/convert-precision-dialog.h"
+#include "dialogs/grid-dialog.h"
+#include "dialogs/image-merge-layers-dialog.h"
+#include "dialogs/image-new-dialog.h"
+#include "dialogs/image-properties-dialog.h"
+#include "dialogs/image-scale-dialog.h"
+#include "dialogs/print-size-dialog.h"
+#include "dialogs/resize-dialog.h"
+
+#include "actions.h"
+#include "image-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   image_convert_rgb_callback       (GtkWidget                *dialog,
+                                                GimpImage                *image,
+                                                GimpColorProfile         *new_profile,
+                                                GFile                    *new_file,
+                                                GimpColorRenderingIntent  intent,
+                                                gboolean                  bpc,
+                                                gpointer                  user_data);
+
+static void   image_convert_gray_callback      (GtkWidget                *dialog,
+                                                GimpImage                *image,
+                                                GimpColorProfile         *new_profile,
+                                                GFile                    *new_file,
+                                                GimpColorRenderingIntent  intent,
+                                                gboolean                  bpc,
+                                                gpointer                  user_data);
+
+static void   image_convert_indexed_callback   (GtkWidget              *dialog,
+                                                GimpImage              *image,
+                                                GimpConvertPaletteType  palette_type,
+                                                gint                    max_colors,
+                                                gboolean                remove_duplicates,
+                                                GimpConvertDitherType   dither_type,
+                                                gboolean                dither_alpha,
+                                                gboolean                dither_text_layers,
+                                                GimpPalette            *custom_palette,
+                                                gpointer                user_data);
+
+static void   image_convert_precision_callback (GtkWidget              *dialog,
+                                                GimpImage              *image,
+                                                GimpPrecision           precision,
+                                                GeglDitherMethod        layer_dither_method,
+                                                GeglDitherMethod        text_layer_dither_method,
+                                                GeglDitherMethod        mask_dither_method,
+                                                gpointer                user_data);
+
+static void   image_profile_assign_callback    (GtkWidget                *dialog,
+                                                GimpImage                *image,
+                                                GimpColorProfile         *new_profile,
+                                                GFile                    *new_file,
+                                                GimpColorRenderingIntent  intent,
+                                                gboolean                  bpc,
+                                                gpointer                  user_data);
+
+static void   image_profile_convert_callback   (GtkWidget                *dialog,
+                                                GimpImage                *image,
+                                                GimpColorProfile         *new_profile,
+                                                GFile                    *new_file,
+                                                GimpColorRenderingIntent  intent,
+                                                gboolean                  bpc,
+                                                gpointer                  user_data);
+
+static void   image_resize_callback            (GtkWidget              *dialog,
+                                                GimpViewable           *viewable,
+                                                GimpContext            *context,
+                                                gint                    width,
+                                                gint                    height,
+                                                GimpUnit                unit,
+                                                gint                    offset_x,
+                                                gint                    offset_y,
+                                                gdouble                 xres,
+                                                gdouble                 yres,
+                                                GimpUnit                res_unit,
+                                                GimpFillType            fill_type,
+                                                GimpItemSet             layer_set,
+                                                gboolean                resize_text_layers,
+                                                gpointer                user_data);
+
+static void   image_print_size_callback        (GtkWidget              *dialog,
+                                                GimpImage              *image,
+                                                gdouble                 xresolution,
+                                                gdouble                 yresolution,
+                                                GimpUnit                resolution_unit,
+                                                gpointer                user_data);
+
+static void   image_scale_callback             (GtkWidget              *dialog,
+                                                GimpViewable           *viewable,
+                                                gint                    width,
+                                                gint                    height,
+                                                GimpUnit                unit,
+                                                GimpInterpolationType   interpolation,
+                                                gdouble                 xresolution,
+                                                gdouble                 yresolution,
+                                                GimpUnit                resolution_unit,
+                                                gpointer                user_data);
+
+static void   image_merge_layers_callback      (GtkWidget              *dialog,
+                                                GimpImage              *image,
+                                                GimpContext            *context,
+                                                GimpMergeType           merge_type,
+                                                gboolean                merge_active_group,
+                                                gboolean                discard_invisible,
+                                                gpointer                user_data);
+
+
+/*  private variables  */
+
+static GimpUnit               image_resize_unit  = GIMP_UNIT_PIXEL;
+static GimpUnit               image_scale_unit   = GIMP_UNIT_PIXEL;
+static GimpInterpolationType  image_scale_interp = -1;
+static GimpPalette           *image_convert_indexed_custom_palette = NULL;
+
+
+/*  public functions  */
+
+void
+image_new_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_widget (widget, data);
+
+  dialog = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                           gtk_widget_get_screen (widget),
+                                           gimp_widget_get_monitor (widget),
+                                           NULL /*ui_manager*/,
+                                           "gimp-image-new-dialog", -1, FALSE);
+
+  if (dialog)
+    {
+      GimpImage *image = action_data_get_image (data);
+
+      image_new_dialog_set (dialog, image, NULL);
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+}
+
+void
+image_duplicate_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpImage        *image;
+  GimpDisplayShell *shell;
+  GimpImage        *new_image;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+  shell = gimp_display_get_shell (display);
+
+  new_image = gimp_image_duplicate (image);
+
+  gimp_create_display (new_image->gimp, new_image, shell->unit,
+                       gimp_zoom_model_get_factor (shell->zoom),
+                       G_OBJECT (gtk_widget_get_screen (GTK_WIDGET (shell))),
+                       gimp_widget_get_monitor (GTK_WIDGET (shell)));
+
+  g_object_unref (new_image);
+}
+
+void
+image_convert_base_type_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage         *image;
+  GimpDisplay       *display;
+  GtkWidget         *widget;
+  GimpDialogConfig  *config;
+  GtkWidget         *dialog;
+  GimpImageBaseType  base_type;
+  GError            *error = NULL;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  base_type = (GimpImageBaseType) g_variant_get_int32 (value);
+
+  if (base_type == gimp_image_get_base_type (image))
+    return;
+
+#define CONVERT_TYPE_DIALOG_KEY "gimp-convert-type-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), CONVERT_TYPE_DIALOG_KEY);
+
+  if (dialog)
+    {
+      gtk_widget_destroy (dialog);
+      dialog = NULL;
+    }
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  switch (base_type)
+    {
+    case GIMP_RGB:
+    case GIMP_GRAY:
+      if (gimp_image_get_color_profile (image))
+        {
+          ColorProfileDialogType    dialog_type;
+          GimpColorProfileCallback  callback;
+          GimpColorProfile         *current_profile;
+          GimpColorProfile         *default_profile;
+          const Babl               *format;
+
+          current_profile =
+            gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+          if (base_type == GIMP_RGB)
+            {
+              dialog_type = COLOR_PROFILE_DIALOG_CONVERT_TO_RGB;
+              callback    = image_convert_rgb_callback;
+
+              format = gimp_babl_format (GIMP_RGB,
+                                         gimp_image_get_precision (image),
+                                         TRUE);
+              default_profile = gimp_babl_format_get_color_profile (format);
+            }
+          else
+            {
+              dialog_type = COLOR_PROFILE_DIALOG_CONVERT_TO_GRAY;
+              callback    = image_convert_gray_callback;
+
+              format = gimp_babl_format (GIMP_GRAY,
+                                         gimp_image_get_precision (image),
+                                         TRUE);
+              default_profile = gimp_babl_format_get_color_profile (format);
+            }
+
+          dialog = color_profile_dialog_new (dialog_type,
+                                             image,
+                                             action_data_get_context (data),
+                                             widget,
+                                             current_profile,
+                                             default_profile,
+                                             0, 0,
+                                             callback,
+                                             display);
+        }
+      else if (! gimp_image_convert_type (image, base_type, NULL, NULL, &error))
+        {
+          gimp_message_literal (image->gimp,
+                                G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                                error->message);
+          g_clear_error (&error);
+        }
+      break;
+
+    case GIMP_INDEXED:
+      dialog = convert_indexed_dialog_new (image,
+                                           action_data_get_context (data),
+                                           widget,
+                                           config->image_convert_indexed_palette_type,
+                                           config->image_convert_indexed_max_colors,
+                                           config->image_convert_indexed_remove_duplicates,
+                                           config->image_convert_indexed_dither_type,
+                                           config->image_convert_indexed_dither_alpha,
+                                           config->image_convert_indexed_dither_text_layers,
+                                           image_convert_indexed_custom_palette,
+                                           image_convert_indexed_callback,
+                                           display);
+      break;
+    }
+
+  if (dialog)
+    {
+      dialogs_attach_dialog (G_OBJECT (image),
+                             CONVERT_TYPE_DIALOG_KEY, dialog);
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+
+  /*  always flush, also when only the indexed dialog was shown, so
+   *  the menu items get updated back to the current image type
+   */
+  gimp_image_flush (image);
+}
+
+void
+image_convert_precision_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage         *image;
+  GimpDisplay       *display;
+  GtkWidget         *widget;
+  GimpDialogConfig  *config;
+  GtkWidget         *dialog;
+  GimpComponentType  component_type;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  component_type = (GimpComponentType) g_variant_get_int32 (value);
+
+  if (component_type == gimp_image_get_component_type (image))
+    return;
+
+#define CONVERT_PRECISION_DIALOG_KEY "gimp-convert-precision-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), CONVERT_PRECISION_DIALOG_KEY);
+
+  if (dialog)
+    {
+      gtk_widget_destroy (dialog);
+      dialog = NULL;
+    }
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  dialog = convert_precision_dialog_new (image,
+                                         action_data_get_context (data),
+                                         widget,
+                                         component_type,
+                                         config->image_convert_precision_layer_dither_method,
+                                         config->image_convert_precision_text_layer_dither_method,
+                                         config->image_convert_precision_channel_dither_method,
+                                         image_convert_precision_callback,
+                                         display);
+
+  dialogs_attach_dialog (G_OBJECT (image),
+                         CONVERT_PRECISION_DIALOG_KEY, dialog);
+
+  gtk_window_present (GTK_WINDOW (dialog));
+
+  /*  see comment above  */
+  gimp_image_flush (image);
+}
+
+void
+image_convert_gamma_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage     *image;
+  GimpDisplay   *display;
+  gboolean       linear;
+  GimpPrecision  precision;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+
+  linear = (gboolean) g_variant_get_int32 (value);
+
+  if (linear == gimp_babl_format_get_linear (gimp_image_get_layer_format (image,
+                                                                         FALSE)))
+    return;
+
+  precision = gimp_babl_precision (gimp_image_get_component_type (image),
+                                   linear);
+
+  gimp_image_convert_precision (image, precision,
+                                GEGL_DITHER_NONE,
+                                GEGL_DITHER_NONE,
+                                GEGL_DITHER_NONE,
+                                GIMP_PROGRESS (display));
+  gimp_image_flush (image);
+}
+
+void
+image_color_management_enabled_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data)
+{
+  GimpImage *image;
+  gboolean   enabled;
+  return_if_no_image (image, data);
+
+  enabled = g_variant_get_boolean (value);
+
+  if (enabled != gimp_image_get_is_color_managed (image))
+    {
+      gimp_image_set_is_color_managed (image, enabled, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+void
+image_color_profile_assign_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpImage   *image;
+  GimpDisplay *display;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+#define PROFILE_ASSIGN_DIALOG_KEY "gimp-profile-assign-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), PROFILE_ASSIGN_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpColorProfile *current_profile;
+      GimpColorProfile *default_profile;
+
+      current_profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+      default_profile = gimp_image_get_builtin_color_profile (image);
+
+      dialog = color_profile_dialog_new (COLOR_PROFILE_DIALOG_ASSIGN_PROFILE,
+                                         image,
+                                         action_data_get_context (data),
+                                         widget,
+                                         current_profile,
+                                         default_profile,
+                                         0, 0,
+                                         image_profile_assign_callback,
+                                         display);
+
+      dialogs_attach_dialog (G_OBJECT (image),
+                             PROFILE_ASSIGN_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_color_profile_convert_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpImage   *image;
+  GimpDisplay *display;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+#define PROFILE_CONVERT_DIALOG_KEY "gimp-profile-convert-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), PROFILE_CONVERT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GimpColorProfile *current_profile;
+      GimpColorProfile *default_profile;
+
+      current_profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+      default_profile = gimp_image_get_builtin_color_profile (image);
+
+      dialog = color_profile_dialog_new (COLOR_PROFILE_DIALOG_CONVERT_TO_PROFILE,
+                                         image,
+                                         action_data_get_context (data),
+                                         widget,
+                                         current_profile,
+                                         default_profile,
+                                         config->image_convert_profile_intent,
+                                         config->image_convert_profile_bpc,
+                                         image_profile_convert_callback,
+                                         display);
+
+      dialogs_attach_dialog (G_OBJECT (image),
+                             PROFILE_CONVERT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_color_profile_discard_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  gimp_image_set_color_profile (image, NULL, NULL);
+  gimp_image_flush (image);
+}
+
+static void
+image_profile_save_dialog_response (GtkWidget *dialog,
+                                    gint       response_id,
+                                    GimpImage *image)
+{
+  if (response_id == GTK_RESPONSE_ACCEPT)
+    {
+      GimpColorProfile *profile;
+      GFile            *file;
+      GError           *error = NULL;
+
+      profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+      file    = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+
+      if (! file)
+        return;
+
+      if (! gimp_color_profile_save_to_file (profile, file, &error))
+        {
+          gimp_message (image->gimp, NULL,
+                        GIMP_MESSAGE_WARNING,
+                        _("Saving color profile failed: %s"),
+                        error->message);
+          g_clear_error (&error);
+          g_object_unref (file);
+          return;
+        }
+
+      g_object_unref (file);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+void
+image_color_profile_save_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpImage   *image;
+  GimpDisplay *display;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+#define PROFILE_SAVE_DIALOG_KEY "gimp-profile-save-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), PROFILE_SAVE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GtkWindow        *toplevel;
+      GimpColorProfile *profile;
+      gchar            *basename;
+
+      toplevel = GTK_WINDOW (gtk_widget_get_toplevel (widget));
+      profile  = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+      dialog =
+        gimp_color_profile_chooser_dialog_new (_("Save Color Profile"),
+                                               toplevel,
+                                               GTK_FILE_CHOOSER_ACTION_SAVE);
+
+      gimp_color_profile_chooser_dialog_connect_path (dialog,
+                                                      G_OBJECT (image->gimp->config),
+                                                      "color-profile-path");
+
+      basename = g_strconcat (gimp_color_profile_get_label (profile),
+                              ".icc", NULL);
+      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);
+      g_free (basename);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (image_profile_save_dialog_response),
+                        image);
+
+      dialogs_attach_dialog (G_OBJECT (image), PROFILE_SAVE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_resize_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage   *image;
+  GtkWidget   *widget;
+  GimpDisplay *display;
+  GtkWidget   *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+  return_if_no_display (display, data);
+
+#define RESIZE_DIALOG_KEY "gimp-resize-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), RESIZE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      if (image_resize_unit != GIMP_UNIT_PERCENT)
+        image_resize_unit = gimp_display_get_shell (display)->unit;
+
+      dialog = resize_dialog_new (GIMP_VIEWABLE (image),
+                                  action_data_get_context (data),
+                                  _("Set Image Canvas Size"),
+                                  "gimp-image-resize",
+                                  widget,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_IMAGE_RESIZE,
+                                  image_resize_unit,
+                                  config->image_resize_fill_type,
+                                  config->image_resize_layer_set,
+                                  config->image_resize_resize_text_layers,
+                                  image_resize_callback,
+                                  display);
+
+      dialogs_attach_dialog (G_OBJECT (image), RESIZE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_resize_to_layers_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpDisplay  *display;
+  GimpImage    *image;
+  GimpProgress *progress;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+  progress = gimp_progress_start (GIMP_PROGRESS (display), FALSE,
+                                  _("Resizing"));
+
+  gimp_image_resize_to_layers (image,
+                               action_data_get_context (data),
+                               NULL, NULL, NULL, NULL, progress);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+}
+
+void
+image_resize_to_selection_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpDisplay  *display;
+  GimpImage    *image;
+  GimpProgress *progress;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+  progress = gimp_progress_start (GIMP_PROGRESS (display), FALSE,
+                                  _("Resizing"));
+
+  gimp_image_resize_to_selection (image,
+                                  action_data_get_context (data),
+                                  progress);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+}
+
+void
+image_print_size_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  image = gimp_display_get_image (display);
+
+#define PRINT_SIZE_DIALOG_KEY "gimp-print-size-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), PRINT_SIZE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = print_size_dialog_new (image,
+                                      action_data_get_context (data),
+                                      _("Set Image Print Resolution"),
+                                      "gimp-image-print-size",
+                                      widget,
+                                      gimp_standard_help_func,
+                                      GIMP_HELP_IMAGE_PRINT_SIZE,
+                                      image_print_size_callback,
+                                      NULL);
+
+      dialogs_attach_dialog (G_OBJECT (image), PRINT_SIZE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_scale_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  image = gimp_display_get_image (display);
+
+#define SCALE_DIALOG_KEY "gimp-scale-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), SCALE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      if (image_scale_unit != GIMP_UNIT_PERCENT)
+        image_scale_unit = gimp_display_get_shell (display)->unit;
+
+      if (image_scale_interp == -1)
+        image_scale_interp = display->gimp->config->interpolation_type;
+
+      dialog = image_scale_dialog_new (image,
+                                       action_data_get_context (data),
+                                       widget,
+                                       image_scale_unit,
+                                       image_scale_interp,
+                                       image_scale_callback,
+                                       display);
+
+      dialogs_attach_dialog (G_OBJECT (image), SCALE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_flip_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpDisplay         *display;
+  GimpImage           *image;
+  GimpProgress        *progress;
+  GimpOrientationType  orientation;
+  return_if_no_display (display, data);
+
+  orientation = (GimpOrientationType) g_variant_get_int32 (value);
+
+  image = gimp_display_get_image (display);
+
+  progress = gimp_progress_start (GIMP_PROGRESS (display), FALSE,
+                                  _("Flipping"));
+
+  gimp_image_flip (image, action_data_get_context (data),
+                   orientation, progress);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+}
+
+void
+image_rotate_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpImage        *image;
+  GimpProgress     *progress;
+  GimpRotationType  rotation;
+  return_if_no_display (display, data);
+
+  rotation = (GimpRotationType) g_variant_get_int32 (value);
+
+  image = gimp_display_get_image (display);
+
+  progress = gimp_progress_start (GIMP_PROGRESS (display), FALSE,
+                                  _("Rotating"));
+
+  gimp_image_rotate (image, action_data_get_context (data),
+                     rotation, progress);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+}
+
+void
+image_crop_to_selection_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  gint       x, y;
+  gint       width, height;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                          &x, &y, &width, &height))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("Cannot crop because the current selection "
+                              "is empty."));
+      return;
+    }
+
+  gimp_image_crop (image,
+                   action_data_get_context (data), GIMP_FILL_TRANSPARENT,
+                   x, y, width, height, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+image_crop_to_content_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  gint       x, y;
+  gint       width, height;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  switch (gimp_pickable_auto_shrink (GIMP_PICKABLE (image),
+                                     0, 0,
+                                     gimp_image_get_width  (image),
+                                     gimp_image_get_height (image),
+                                     &x, &y, &width, &height))
+    {
+    case GIMP_AUTO_SHRINK_SHRINK:
+      gimp_image_crop (image,
+                       action_data_get_context (data), GIMP_FILL_TRANSPARENT,
+                       x, y, width, height, TRUE);
+      gimp_image_flush (image);
+      break;
+
+    case GIMP_AUTO_SHRINK_EMPTY:
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_INFO,
+                            _("Cannot crop because the image has no content."));
+      break;
+
+    case GIMP_AUTO_SHRINK_UNSHRINKABLE:
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_INFO,
+                            _("Cannot crop because the image is already "
+                              "cropped to its content."));
+      break;
+    }
+}
+
+void
+image_merge_layers_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GtkWidget   *dialog;
+  GimpImage   *image;
+  GimpDisplay *display;
+  GtkWidget   *widget;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+#define MERGE_LAYERS_DIALOG_KEY "gimp-merge-layers-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), MERGE_LAYERS_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      dialog = image_merge_layers_dialog_new (image,
+                                              action_data_get_context (data),
+                                              widget,
+                                              config->layer_merge_type,
+                                              config->layer_merge_active_group_only,
+                                              config->layer_merge_discard_invisible,
+                                              image_merge_layers_callback,
+                                              display);
+
+      dialogs_attach_dialog (G_OBJECT (image), MERGE_LAYERS_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_merge_layers_last_vals_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data)
+{
+  GimpImage        *image;
+  GimpDisplay      *display;
+  GimpDialogConfig *config;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  image_merge_layers_callback (NULL,
+                               image,
+                               action_data_get_context (data),
+                               config->layer_merge_type,
+                               config->layer_merge_active_group_only,
+                               config->layer_merge_discard_invisible,
+                               display);
+}
+
+void
+image_flatten_image_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage   *image;
+  GimpDisplay *display;
+  GtkWidget   *widget;
+  GError      *error = NULL;
+  return_if_no_image (image, data);
+  return_if_no_display (display, data);
+  return_if_no_widget (widget, data);
+
+  if (! gimp_image_flatten (image, action_data_get_context (data),
+                            GIMP_PROGRESS (display), &error))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+}
+
+void
+image_configure_grid_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+#define GRID_DIALOG_KEY "gimp-grid-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), GRID_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+      dialog = grid_dialog_new (image,
+                                action_data_get_context (data),
+                                gtk_widget_get_toplevel (GTK_WIDGET (shell)));
+
+      dialogs_attach_dialog (G_OBJECT (image), GRID_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+image_properties_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+#define PROPERTIES_DIALOG_KEY "gimp-image-properties-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), PROPERTIES_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+      dialog = image_properties_dialog_new (image,
+                                            action_data_get_context (data),
+                                            gtk_widget_get_toplevel (GTK_WIDGET (shell)));
+
+      dialogs_attach_dialog (G_OBJECT (image), PROPERTIES_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+
+/*  private functions  */
+
+static void
+image_convert_rgb_callback (GtkWidget                *dialog,
+                            GimpImage                *image,
+                            GimpColorProfile         *new_profile,
+                            GFile                    *new_file,
+                            GimpColorRenderingIntent  intent,
+                            gboolean                  bpc,
+                            gpointer                  user_data)
+{
+  GimpProgress *progress = user_data;
+  GError       *error    = NULL;
+
+  progress = gimp_progress_start (progress, FALSE,
+                                  _("Converting to RGB (%s)"),
+                                  gimp_color_profile_get_label (new_profile));
+
+  if (! gimp_image_convert_type (image, GIMP_RGB, new_profile,
+                                 progress, &error))
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog),
+                    GIMP_MESSAGE_ERROR,
+                    "%s", error->message);
+      g_clear_error (&error);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      return;
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+
+ gtk_widget_destroy (dialog);
+}
+
+static void
+image_convert_gray_callback (GtkWidget                *dialog,
+                             GimpImage                *image,
+                             GimpColorProfile         *new_profile,
+                             GFile                    *new_file,
+                             GimpColorRenderingIntent  intent,
+                             gboolean                  bpc,
+                             gpointer                  user_data)
+{
+  GimpProgress *progress = user_data;
+  GError       *error    = NULL;
+
+  progress = gimp_progress_start (progress, FALSE,
+                                  _("Converting to grayscale (%s)"),
+                                  gimp_color_profile_get_label (new_profile));
+
+  if (! gimp_image_convert_type (image, GIMP_GRAY, new_profile,
+                                 progress, &error))
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog),
+                    GIMP_MESSAGE_ERROR,
+                    "%s", error->message);
+      g_clear_error (&error);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      return;
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+image_convert_indexed_callback (GtkWidget              *dialog,
+                                GimpImage              *image,
+                                GimpConvertPaletteType  palette_type,
+                                gint                    max_colors,
+                                gboolean                remove_duplicates,
+                                GimpConvertDitherType   dither_type,
+                                gboolean                dither_alpha,
+                                gboolean                dither_text_layers,
+                                GimpPalette            *custom_palette,
+                                gpointer                user_data)
+{
+  GimpDialogConfig *config  = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GimpDisplay      *display = user_data;
+  GimpProgress     *progress;
+  GError           *error   = NULL;
+
+  g_object_set (config,
+                "image-convert-indexed-palette-type",       palette_type,
+                "image-convert-indexed-max-colors",         max_colors,
+                "image-convert-indexed-remove-duplicates",  remove_duplicates,
+                "image-convert-indexed-dither-type",        dither_type,
+                "image-convert-indexed-dither-alpha",       dither_alpha,
+                "image-convert-indexed-dither-text-layers", dither_text_layers,
+                NULL);
+
+  if (image_convert_indexed_custom_palette)
+    g_object_remove_weak_pointer (G_OBJECT (image_convert_indexed_custom_palette),
+                                  (gpointer) &image_convert_indexed_custom_palette);
+
+  image_convert_indexed_custom_palette = custom_palette;
+
+  if (image_convert_indexed_custom_palette)
+    g_object_add_weak_pointer (G_OBJECT (image_convert_indexed_custom_palette),
+                               (gpointer) &image_convert_indexed_custom_palette);
+
+  progress = gimp_progress_start (GIMP_PROGRESS (display), FALSE,
+                                  _("Converting to indexed colors"));
+
+  if (! gimp_image_convert_indexed (image,
+                                    config->image_convert_indexed_palette_type,
+                                    config->image_convert_indexed_max_colors,
+                                    config->image_convert_indexed_remove_duplicates,
+                                    config->image_convert_indexed_dither_type,
+                                    config->image_convert_indexed_dither_alpha,
+                                    config->image_convert_indexed_dither_text_layers,
+                                    image_convert_indexed_custom_palette,
+                                    progress,
+                                    &error))
+    {
+      gimp_message_literal (image->gimp, G_OBJECT (display),
+                            GIMP_MESSAGE_WARNING, error->message);
+      g_clear_error (&error);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      return;
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+image_convert_precision_callback (GtkWidget        *dialog,
+                                  GimpImage        *image,
+                                  GimpPrecision     precision,
+                                  GeglDitherMethod  layer_dither_method,
+                                  GeglDitherMethod  text_layer_dither_method,
+                                  GeglDitherMethod  channel_dither_method,
+                                  gpointer          user_data)
+{
+  GimpDialogConfig *config   = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GimpProgress     *progress = user_data;
+  const gchar      *enum_desc;
+  const Babl       *old_format;
+  const Babl       *new_format;
+  gint              old_bits;
+  gint              new_bits;
+
+  g_object_set (config,
+                "image-convert-precision-layer-dither-method",
+                layer_dither_method,
+                "image-convert-precision-text-layer-dither-method",
+                text_layer_dither_method,
+                "image-convert-precision-channel-dither-method",
+                channel_dither_method,
+                NULL);
+
+  /*  we do the same dither method checks here *and* in the dialog,
+   *  because the dialog leaves the passed dither methods untouched if
+   *  dithering is disabled and passes the original values to the
+   *  callback, in order not to change the values saved in
+   *  GimpDialogConfig.
+   */
+
+  /* random formats with the right precision */
+  old_format = gimp_image_get_layer_format (image, FALSE);
+  new_format = gimp_babl_format (GIMP_RGB, precision, FALSE);
+
+  old_bits = (babl_format_get_bytes_per_pixel (old_format) * 8 /
+              babl_format_get_n_components (old_format));
+  new_bits = (babl_format_get_bytes_per_pixel (new_format) * 8 /
+              babl_format_get_n_components (new_format));
+
+  if (new_bits >= old_bits ||
+      new_bits >  CONVERT_PRECISION_DIALOG_MAX_DITHER_BITS)
+    {
+      /*  don't dither if we are converting to a higher bit depth,
+       *  or to more than MAX_DITHER_BITS.
+       */
+      layer_dither_method      = GEGL_DITHER_NONE;
+      text_layer_dither_method = GEGL_DITHER_NONE;
+      channel_dither_method    = GEGL_DITHER_NONE;
+    }
+
+  gimp_enum_get_value (GIMP_TYPE_PRECISION, precision,
+                       NULL, NULL, &enum_desc, NULL);
+
+  progress = gimp_progress_start (progress, FALSE,
+                                  _("Converting image to %s"),
+                                  enum_desc);
+
+  gimp_image_convert_precision (image,
+                                precision,
+                                layer_dither_method,
+                                text_layer_dither_method,
+                                channel_dither_method,
+                                progress);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+image_profile_assign_callback (GtkWidget                *dialog,
+                               GimpImage                *image,
+                               GimpColorProfile         *new_profile,
+                               GFile                    *new_file,
+                               GimpColorRenderingIntent  intent,
+                               gboolean                  bpc,
+                               gpointer                  user_data)
+{
+  GError *error = NULL;
+
+  gimp_image_undo_group_start (image,
+                               GIMP_UNDO_GROUP_PARASITE_ATTACH,
+                               _("Assign color profile"));
+
+  if (! gimp_image_set_color_profile (image, new_profile, &error))
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog),
+                    GIMP_MESSAGE_ERROR,
+                    "%s", error->message);
+      g_clear_error (&error);
+
+      gimp_image_undo_group_end (image);
+      gimp_image_undo (image);
+
+      return;
+    }
+
+  gimp_image_set_is_color_managed (image, TRUE, TRUE);
+
+  /*  omg...  */
+  gimp_image_parasite_detach (image, "icc-profile-name", TRUE);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+image_profile_convert_callback (GtkWidget                *dialog,
+                                GimpImage                *image,
+                                GimpColorProfile         *new_profile,
+                                GFile                    *new_file,
+                                GimpColorRenderingIntent  intent,
+                                gboolean                  bpc,
+                                gpointer                  user_data)
+{
+  GimpDialogConfig *config   = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GimpProgress     *progress = user_data;
+  GError           *error    = NULL;
+
+  g_object_set (config,
+                "image-convert-profile-intent",                   intent,
+                "image-convert-profile-black-point-compensation", bpc,
+                NULL);
+
+  progress = gimp_progress_start (progress, FALSE,
+                                  _("Converting to '%s'"),
+                                  gimp_color_profile_get_label (new_profile));
+
+  if (! gimp_image_convert_color_profile (image, new_profile,
+                                          config->image_convert_profile_intent,
+                                          config->image_convert_profile_bpc,
+                                          progress, &error))
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog),
+                    GIMP_MESSAGE_ERROR,
+                    "%s", error->message);
+      g_clear_error (&error);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      return;
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+image_resize_callback (GtkWidget    *dialog,
+                       GimpViewable *viewable,
+                       GimpContext  *context,
+                       gint          width,
+                       gint          height,
+                       GimpUnit      unit,
+                       gint          offset_x,
+                       gint          offset_y,
+                       gdouble       xres,
+                       gdouble       yres,
+                       GimpUnit      res_unit,
+                       GimpFillType  fill_type,
+                       GimpItemSet   layer_set,
+                       gboolean      resize_text_layers,
+                       gpointer      user_data)
+{
+  GimpDisplay *display = user_data;
+
+  image_resize_unit = unit;
+
+  if (width > 0 && height > 0)
+    {
+      GimpImage        *image  = GIMP_IMAGE (viewable);
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GimpProgress     *progress;
+      gdouble           old_xres;
+      gdouble           old_yres;
+      GimpUnit          old_res_unit;
+      gboolean          update_resolution;
+
+      g_object_set (config,
+                    "image-resize-fill-type",          fill_type,
+                    "image-resize-layer-set",          layer_set,
+                    "image-resize-resize-text-layers", resize_text_layers,
+                    NULL);
+
+      gtk_widget_destroy (dialog);
+
+      if (width  == gimp_image_get_width  (image) &&
+          height == gimp_image_get_height (image))
+        return;
+
+      progress = gimp_progress_start (GIMP_PROGRESS (display), FALSE,
+                                      _("Resizing"));
+
+      gimp_image_get_resolution (image, &old_xres, &old_yres);
+      old_res_unit = gimp_image_get_unit (image);
+
+      update_resolution = xres     != old_xres ||
+                          yres     != old_yres ||
+                          res_unit != old_res_unit;
+
+      if (update_resolution)
+        {
+          gimp_image_undo_group_start (image,
+                                       GIMP_UNDO_GROUP_IMAGE_SCALE,
+                                       _("Change Canvas Size"));
+          gimp_image_set_resolution (image, xres, yres);
+          gimp_image_set_unit (image, res_unit);
+        }
+
+      gimp_image_resize_with_layers (image,
+                                     context, fill_type,
+                                     width, height, offset_x, offset_y,
+                                     layer_set,
+                                     resize_text_layers,
+                                     progress);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      if (update_resolution)
+        gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+  else
+    {
+      g_warning ("Resize Error: "
+                 "Both width and height must be greater than zero.");
+    }
+}
+
+static void
+image_print_size_callback (GtkWidget *dialog,
+                           GimpImage *image,
+                           gdouble    xresolution,
+                           gdouble    yresolution,
+                           GimpUnit   resolution_unit,
+                           gpointer   data)
+{
+  gdouble xres;
+  gdouble yres;
+
+  gtk_widget_destroy (dialog);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  if (xresolution     == xres &&
+      yresolution     == yres &&
+      resolution_unit == gimp_image_get_unit (image))
+    return;
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE,
+                               _("Change Print Size"));
+
+  gimp_image_set_resolution (image, xresolution, yresolution);
+  gimp_image_set_unit (image, resolution_unit);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_flush (image);
+}
+
+static void
+image_scale_callback (GtkWidget              *dialog,
+                      GimpViewable           *viewable,
+                      gint                    width,
+                      gint                    height,
+                      GimpUnit                unit,
+                      GimpInterpolationType   interpolation,
+                      gdouble                 xresolution,
+                      gdouble                 yresolution,
+                      GimpUnit                resolution_unit,
+                      gpointer                user_data)
+{
+  GimpProgress *progress = user_data;
+  GimpImage    *image    = GIMP_IMAGE (viewable);
+  gdouble       xres;
+  gdouble       yres;
+
+  image_scale_unit   = unit;
+  image_scale_interp = interpolation;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  if (width > 0 && height > 0)
+    {
+      gtk_widget_destroy (dialog);
+
+      if (width           == gimp_image_get_width  (image) &&
+          height          == gimp_image_get_height (image) &&
+          xresolution     == xres                          &&
+          yresolution     == yres                          &&
+          resolution_unit == gimp_image_get_unit (image))
+        return;
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE,
+                                   _("Scale Image"));
+
+      gimp_image_set_resolution (image, xresolution, yresolution);
+      gimp_image_set_unit (image, resolution_unit);
+
+      if (width  != gimp_image_get_width  (image) ||
+          height != gimp_image_get_height (image))
+        {
+          progress = gimp_progress_start (progress, FALSE,
+                                          _("Scaling"));
+
+          gimp_image_scale (image, width, height, interpolation, progress);
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+
+      gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+  else
+    {
+      g_warning ("Scale Error: "
+                 "Both width and height must be greater than zero.");
+    }
+}
+
+static void
+image_merge_layers_callback (GtkWidget     *dialog,
+                             GimpImage     *image,
+                             GimpContext   *context,
+                             GimpMergeType  merge_type,
+                             gboolean       merge_active_group,
+                             gboolean       discard_invisible,
+                             gpointer       user_data)
+{
+  GimpDialogConfig *config  = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GimpDisplay      *display = user_data;
+
+  g_object_set (config,
+                "layer-merge-type",              merge_type,
+                "layer-merge-active-group-only", merge_active_group,
+                "layer-merge-discard-invisible", discard_invisible,
+                NULL);
+
+  gimp_image_merge_visible_layers (image,
+                                   context,
+                                   config->layer_merge_type,
+                                   config->layer_merge_active_group_only,
+                                   config->layer_merge_discard_invisible,
+                                   GIMP_PROGRESS (display));
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/actions/image-commands.h b/app/actions/image-commands.h
new file mode 100644
index 0000000..018dec7
--- /dev/null
+++ b/app/actions/image-commands.h
@@ -0,0 +1,101 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_COMMANDS_H__
+#define __IMAGE_COMMANDS_H__
+
+
+void   image_new_cmd_callback                      (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_duplicate_cmd_callback                (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+void   image_convert_base_type_cmd_callback        (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_convert_precision_cmd_callback        (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_convert_gamma_cmd_callback            (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+void   image_color_management_enabled_cmd_callback (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_color_profile_assign_cmd_callback     (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_color_profile_convert_cmd_callback    (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_color_profile_discard_cmd_callback    (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_color_profile_save_cmd_callback       (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+void   image_resize_cmd_callback                   (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_resize_to_layers_cmd_callback         (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_resize_to_selection_cmd_callback      (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_print_size_cmd_callback               (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_scale_cmd_callback                    (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_flip_cmd_callback                     (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_rotate_cmd_callback                   (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_crop_to_selection_cmd_callback        (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_crop_to_content_cmd_callback          (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+void   image_merge_layers_cmd_callback             (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_merge_layers_last_vals_cmd_callback   (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_flatten_image_cmd_callback            (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+void   image_configure_grid_cmd_callback           (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+void   image_properties_cmd_callback               (GimpAction *action,
+                                                    GVariant   *value,
+                                                    gpointer    data);
+
+
+#endif /* __IMAGE_COMMANDS_H__ */
diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c
new file mode 100644
index 0000000..74745c1
--- /dev/null
+++ b/app/actions/images-actions.c
@@ -0,0 +1,98 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "images-actions.h"
+#include "images-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry images_actions[] =
+{
+  { "images-popup", GIMP_ICON_DIALOG_IMAGES,
+    NC_("images-action", "Images Menu"), NULL, NULL, NULL,
+    GIMP_HELP_IMAGE_DIALOG },
+
+  { "images-raise-views", GIMP_ICON_GO_TOP,
+    NC_("images-action", "_Raise Views"), NULL,
+    NC_("images-action", "Raise this image's displays"),
+    images_raise_views_cmd_callback,
+    NULL },
+
+  { "images-new-view", GIMP_ICON_DOCUMENT_NEW,
+    NC_("images-action", "_New View"), NULL,
+    NC_("images-action", "Create a new display for this image"),
+    images_new_view_cmd_callback,
+    NULL },
+
+  { "images-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("images-action", "_Delete Image"), NULL,
+    NC_("images-action", "Delete this image"),
+    images_delete_image_cmd_callback,
+    NULL }
+};
+
+
+void
+images_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "images-action",
+                                 images_actions,
+                                 G_N_ELEMENTS (images_actions));
+}
+
+void
+images_actions_update (GimpActionGroup *group,
+                       gpointer         data)
+{
+  GimpContext *context    = action_data_get_context (data);
+  GimpImage   *image      = NULL;
+  gint         disp_count = 0;
+
+  if (context)
+    {
+      image = gimp_context_get_image (context);
+
+      if (image)
+        disp_count = gimp_image_get_display_count (image);
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("images-raise-views", image);
+  SET_SENSITIVE ("images-new-view",    image);
+  SET_SENSITIVE ("images-delete",      image && disp_count == 0);
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/images-actions.h b/app/actions/images-actions.h
new file mode 100644
index 0000000..4a304f7
--- /dev/null
+++ b/app/actions/images-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGES_ACTIONS_H__
+#define __IMAGES_ACTIONS_H__
+
+
+void   images_actions_setup  (GimpActionGroup *group);
+void   images_actions_update (GimpActionGroup *group,
+                              gpointer         data);
+
+
+#endif /* __IMAGES_ACTIONS_H__ */
diff --git a/app/actions/images-commands.c b/app/actions/images-commands.c
new file mode 100644
index 0000000..22ea8a8
--- /dev/null
+++ b/app/actions/images-commands.c
@@ -0,0 +1,117 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpimageview.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "images-commands.h"
+
+
+/*  public functions */
+
+void
+images_raise_views_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpImage           *image;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  image = gimp_context_get_image (context);
+
+  if (image && gimp_container_have (container, GIMP_OBJECT (image)))
+    {
+      GList *list;
+
+      for (list = gimp_get_display_iter (image->gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpDisplay *display = list->data;
+
+          if (gimp_display_get_image (display) == image)
+            gimp_display_shell_present (gimp_display_get_shell (display));
+        }
+    }
+}
+
+void
+images_new_view_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpImage           *image;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  image = gimp_context_get_image (context);
+
+  if (image && gimp_container_have (container, GIMP_OBJECT (image)))
+    {
+      gimp_create_display (image->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (GTK_WIDGET (editor))),
+                           gimp_widget_get_monitor (GTK_WIDGET (editor)));
+    }
+}
+
+void
+images_delete_image_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpImage           *image;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  image = gimp_context_get_image (context);
+
+  if (image && gimp_container_have (container, GIMP_OBJECT (image)))
+    {
+      if (gimp_image_get_display_count (image) == 0)
+        g_object_unref (image);
+    }
+}
diff --git a/app/actions/images-commands.h b/app/actions/images-commands.h
new file mode 100644
index 0000000..f836fc4
--- /dev/null
+++ b/app/actions/images-commands.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGES_COMMANDS_H__
+#define __IMAGES_COMMANDS_H__
+
+
+void   images_raise_views_cmd_callback  (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data);
+void   images_new_view_cmd_callback     (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data);
+void   images_delete_image_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data);
+
+
+#endif /* __IMAGES_COMMANDS_H__ */
diff --git a/app/actions/items-actions.c b/app/actions/items-actions.c
new file mode 100644
index 0000000..5f18e1f
--- /dev/null
+++ b/app/actions/items-actions.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpitem.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "items-actions.h"
+
+
+void
+items_actions_setup (GimpActionGroup *group,
+                     const gchar     *prefix)
+{
+  GEnumClass *enum_class;
+  GEnumValue *value;
+
+  enum_class = g_type_class_ref (GIMP_TYPE_COLOR_TAG);
+
+  for (value = enum_class->values; value->value_name; value++)
+    {
+      gchar action[32];
+
+      g_snprintf (action, sizeof (action),
+                  "%s-color-tag-%s", prefix, value->value_nick);
+
+      if (value->value == GIMP_COLOR_TAG_NONE)
+        {
+          gimp_action_group_set_action_always_show_image (group, action, TRUE);
+        }
+      else
+        {
+          GimpRGB color;
+
+          gimp_action_group_set_action_context (group, action,
+                                                gimp_get_user_context (group->gimp));
+
+          gimp_get_color_tag_color (value->value, &color, FALSE);
+          gimp_action_group_set_action_color (group, action, &color, FALSE);
+        }
+    }
+
+  g_type_class_unref (enum_class);
+}
+
+void
+items_actions_update (GimpActionGroup *group,
+                      const gchar     *prefix,
+                      GimpItem        *item)
+{
+  GEnumClass *enum_class;
+  GEnumValue *value;
+  gchar       action[32];
+  gboolean    visible       = FALSE;
+  gboolean    linked        = FALSE;
+  gboolean    has_color_tag = FALSE;
+  gboolean    locked        = FALSE;
+  gboolean    can_lock      = FALSE;
+  gboolean    locked_pos    = FALSE;
+  gboolean    can_lock_pos  = FALSE;
+  GimpRGB     tag_color;
+
+  if (item)
+    {
+      visible      = gimp_item_get_visible (item);
+      linked       = gimp_item_get_linked (item);
+      locked       = gimp_item_get_lock_content (item);
+      can_lock     = gimp_item_can_lock_content (item);
+      locked_pos   = gimp_item_get_lock_position (item);
+      can_lock_pos = gimp_item_can_lock_position (item);
+
+      has_color_tag = gimp_get_color_tag_color (gimp_item_get_color_tag (item),
+                                                &tag_color, FALSE);
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_COLOR(action,color) \
+        gimp_action_group_set_action_color (group, action, color, FALSE)
+
+  g_snprintf (action, sizeof (action), "%s-visible", prefix);
+  SET_SENSITIVE (action, item);
+  SET_ACTIVE    (action, visible);
+
+  g_snprintf (action, sizeof (action), "%s-linked", prefix);
+  SET_SENSITIVE (action, item);
+  SET_ACTIVE    (action, linked);
+
+  g_snprintf (action, sizeof (action), "%s-lock-content", prefix);
+  SET_SENSITIVE (action, can_lock);
+  SET_ACTIVE    (action, locked);
+
+  g_snprintf (action, sizeof (action), "%s-lock-position", prefix);
+  SET_SENSITIVE (action, can_lock_pos);
+  SET_ACTIVE    (action, locked_pos);
+
+  g_snprintf (action, sizeof (action), "%s-color-tag-menu", prefix);
+  SET_COLOR (action, has_color_tag ? &tag_color : NULL);
+
+  enum_class = g_type_class_ref (GIMP_TYPE_COLOR_TAG);
+
+  for (value = enum_class->values; value->value_name; value++)
+    {
+      g_snprintf (action, sizeof (action),
+                  "%s-color-tag-%s", prefix, value->value_nick);
+
+      SET_SENSITIVE (action, item);
+    }
+
+  g_type_class_unref (enum_class);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+#undef SET_COLOR
+}
diff --git a/app/actions/items-actions.h b/app/actions/items-actions.h
new file mode 100644
index 0000000..90efc08
--- /dev/null
+++ b/app/actions/items-actions.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ITEMS_ACTIONS_H__
+#define __ITEMS_ACTIONS_H__
+
+
+void   items_actions_setup  (GimpActionGroup *group,
+                             const gchar     *prefix);
+void   items_actions_update (GimpActionGroup *group,
+                             const gchar     *prefix,
+                             GimpItem        *item);
+
+
+#endif /* __ITEMS_ACTIONS_H__ */
diff --git a/app/actions/items-commands.c b/app/actions/items-commands.c
new file mode 100644
index 0000000..43e17d9
--- /dev/null
+++ b/app/actions/items-commands.c
@@ -0,0 +1,419 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpitem.h"
+#include "core/gimpitemundo.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/fill-dialog.h"
+#include "dialogs/stroke-dialog.h"
+
+#include "actions.h"
+#include "items-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   items_fill_callback   (GtkWidget         *dialog,
+                                     GimpItem          *item,
+                                     GimpDrawable      *drawable,
+                                     GimpContext       *context,
+                                     GimpFillOptions   *options,
+                                     gpointer           user_data);
+static void   items_stroke_callback (GtkWidget         *dialog,
+                                     GimpItem          *item,
+                                     GimpDrawable      *drawable,
+                                     GimpContext       *context,
+                                     GimpStrokeOptions *options,
+                                     gpointer           user_data);
+
+
+/*  public functions  */
+
+void
+items_visible_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            GimpImage  *image,
+                            GimpItem   *item)
+{
+  gboolean visible = g_variant_get_boolean (value);
+
+  if (visible != gimp_item_get_visible (item))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_VISIBILITY);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+        push_undo = FALSE;
+
+      gimp_item_set_visible (item, visible, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+items_linked_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           GimpImage  *image,
+                           GimpItem   *item)
+{
+  gboolean linked = g_variant_get_boolean (value);
+
+  if (linked != gimp_item_get_linked (item))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_LINKED);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+        push_undo = FALSE;
+
+      gimp_item_set_linked (item, linked, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+items_lock_content_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 GimpImage  *image,
+                                 GimpItem   *item)
+{
+  gboolean locked = g_variant_get_boolean (value);
+
+  if (locked != gimp_item_get_lock_content (item))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_LINKED);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+        push_undo = FALSE;
+
+      gimp_item_set_lock_content (item, locked, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+items_lock_position_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  GimpImage  *image,
+                                  GimpItem   *item)
+{
+  gboolean locked = g_variant_get_boolean (value);
+
+  if (locked != gimp_item_get_lock_position (item))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_LOCK_POSITION);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+        push_undo = FALSE;
+
+
+      gimp_item_set_lock_position (item, locked, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+items_color_tag_cmd_callback (GimpAction   *action,
+                              GimpImage    *image,
+                              GimpItem     *item,
+                              GimpColorTag  color_tag)
+{
+  if (color_tag != gimp_item_get_color_tag (item))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_ITEM_COLOR_TAG);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+        push_undo = FALSE;
+
+      gimp_item_set_color_tag (item, color_tag, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+items_fill_cmd_callback (GimpAction  *action,
+                         GimpImage   *image,
+                         GimpItem    *item,
+                         const gchar *dialog_key,
+                         const gchar *dialog_title,
+                         const gchar *dialog_icon_name,
+                         const gchar *dialog_help_id,
+                         gpointer     data)
+{
+  GimpDrawable *drawable;
+  GtkWidget    *dialog;
+  GtkWidget    *widget;
+  return_if_no_widget (widget, data);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("There is no active layer or channel to fill."));
+      return;
+    }
+
+  dialog = dialogs_get_dialog (G_OBJECT (item), dialog_key);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      dialog = fill_dialog_new (item,
+                                drawable,
+                                action_data_get_context (data),
+                                dialog_title,
+                                dialog_icon_name,
+                                dialog_help_id,
+                                widget,
+                                config->fill_options,
+                                items_fill_callback,
+                                NULL);
+
+      dialogs_attach_dialog (G_OBJECT (item), dialog_key, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+items_fill_last_vals_cmd_callback (GimpAction *action,
+                                   GimpImage  *image,
+                                   GimpItem   *item,
+                                   gpointer    data)
+{
+  GimpDrawable     *drawable;
+  GimpDialogConfig *config;
+  GtkWidget        *widget;
+  GError           *error = NULL;
+  return_if_no_widget (widget, data);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("There is no active layer or channel to fill."));
+      return;
+    }
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  if (! gimp_item_fill (item, drawable,
+                        config->fill_options, TRUE, NULL, &error))
+    {
+      gimp_message_literal (image->gimp, G_OBJECT (widget),
+                            GIMP_MESSAGE_WARNING, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gimp_image_flush (image);
+    }
+}
+
+void
+items_stroke_cmd_callback (GimpAction  *action,
+                           GimpImage   *image,
+                           GimpItem    *item,
+                           const gchar *dialog_key,
+                           const gchar *dialog_title,
+                           const gchar *dialog_icon_name,
+                           const gchar *dialog_help_id,
+                           gpointer     data)
+{
+  GimpDrawable *drawable;
+  GtkWidget    *dialog;
+  GtkWidget    *widget;
+  return_if_no_widget (widget, data);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("There is no active layer or channel to stroke to."));
+      return;
+    }
+
+  dialog = dialogs_get_dialog (G_OBJECT (item), dialog_key);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      dialog = stroke_dialog_new (item,
+                                  drawable,
+                                  action_data_get_context (data),
+                                  dialog_title,
+                                  dialog_icon_name,
+                                  dialog_help_id,
+                                  widget,
+                                  config->stroke_options,
+                                  items_stroke_callback,
+                                  NULL);
+
+      dialogs_attach_dialog (G_OBJECT (item), dialog_key, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+items_stroke_last_vals_cmd_callback (GimpAction *action,
+                                     GimpImage  *image,
+                                     GimpItem   *item,
+                                     gpointer    data)
+{
+  GimpDrawable     *drawable;
+  GimpDialogConfig *config;
+  GtkWidget        *widget;
+  GError           *error = NULL;
+  return_if_no_widget (widget, data);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("There is no active layer or channel to stroke to."));
+      return;
+    }
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  if (! gimp_item_stroke (item, drawable,
+                          action_data_get_context (data),
+                          config->stroke_options, NULL,
+                          TRUE, NULL, &error))
+    {
+      gimp_message_literal (image->gimp, G_OBJECT (widget),
+                            GIMP_MESSAGE_WARNING, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gimp_image_flush (image);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+items_fill_callback (GtkWidget       *dialog,
+                     GimpItem        *item,
+                     GimpDrawable    *drawable,
+                     GimpContext     *context,
+                     GimpFillOptions *options,
+                     gpointer         user_data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (context->gimp->config);
+  GimpImage        *image  = gimp_item_get_image (item);
+  GError           *error  = NULL;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (config->fill_options), 0);
+
+  if (! gimp_item_fill (item, drawable, options, TRUE, NULL, &error))
+    {
+      gimp_message_literal (context->gimp,
+                            G_OBJECT (dialog),
+                            GIMP_MESSAGE_WARNING,
+                            error ? error->message : "NULL");
+
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+items_stroke_callback (GtkWidget         *dialog,
+                       GimpItem          *item,
+                       GimpDrawable      *drawable,
+                       GimpContext       *context,
+                       GimpStrokeOptions *options,
+                       gpointer           data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (context->gimp->config);
+  GimpImage        *image  = gimp_item_get_image (item);
+  GError           *error  = NULL;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (config->stroke_options), 0);
+
+  if (! gimp_item_stroke (item, drawable, context, options, NULL,
+                          TRUE, NULL, &error))
+    {
+      gimp_message_literal (context->gimp,
+                            G_OBJECT (dialog),
+                            GIMP_MESSAGE_WARNING,
+                            error ? error->message : "NULL");
+
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/actions/items-commands.h b/app/actions/items-commands.h
new file mode 100644
index 0000000..f7c87b5
--- /dev/null
+++ b/app/actions/items-commands.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ITEMS_COMMANDS_H__
+#define __ITEMS_COMMANDS_H__
+
+
+void   items_visible_cmd_callback          (GimpAction   *action,
+                                            GVariant     *value,
+                                            GimpImage    *image,
+                                            GimpItem     *item);
+void   items_linked_cmd_callback           (GimpAction   *action,
+                                            GVariant     *value,
+                                            GimpImage    *image,
+                                            GimpItem     *item);
+void   items_lock_content_cmd_callback     (GimpAction   *action,
+                                            GVariant     *value,
+                                            GimpImage    *image,
+                                            GimpItem     *item);
+void   items_lock_position_cmd_callback    (GimpAction   *action,
+                                            GVariant     *value,
+                                            GimpImage    *image,
+                                            GimpItem     *item);
+
+void   items_color_tag_cmd_callback        (GimpAction   *action,
+                                            GimpImage    *image,
+                                            GimpItem     *item,
+                                            GimpColorTag  color_tag);
+
+void   items_fill_cmd_callback             (GimpAction   *action,
+                                            GimpImage    *image,
+                                            GimpItem     *item,
+                                            const gchar  *dialog_key,
+                                            const gchar  *dialog_title,
+                                            const gchar  *dialog_icon_name,
+                                            const gchar  *dialog_help_id,
+                                            gpointer      data);
+void   items_fill_last_vals_cmd_callback   (GimpAction   *action,
+                                            GimpImage    *image,
+                                            GimpItem     *item,
+                                            gpointer      data);
+
+void   items_stroke_cmd_callback           (GimpAction   *action,
+                                            GimpImage    *image,
+                                            GimpItem     *item,
+                                            const gchar  *dialog_key,
+                                            const gchar  *dialog_title,
+                                            const gchar  *dialog_icon_name,
+                                            const gchar  *dialog_help_id,
+                                            gpointer      data);
+void   items_stroke_last_vals_cmd_callback (GimpAction   *action,
+                                            GimpImage    *image,
+                                            GimpItem     *item,
+                                            gpointer      data);
+
+
+
+#endif /* __ITEMS_COMMANDS_H__ */
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
new file mode 100644
index 0000000..2100696
--- /dev/null
+++ b/app/actions/layers-actions.c
@@ -0,0 +1,1027 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-floating-selection.h"
+
+#include "text/gimptextlayer.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "actions.h"
+#include "image-commands.h"
+#include "items-actions.h"
+#include "layers-actions.h"
+#include "layers-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry layers_actions[] =
+{
+  { "layers-popup", GIMP_ICON_DIALOG_LAYERS,
+    NC_("layers-action", "Layers Menu"), NULL, NULL, NULL,
+    GIMP_HELP_LAYER_DIALOG },
+
+  { "layers-blend-space-menu", NULL,
+    NC_("layers-action", "Blend Space"), NULL, NULL, NULL,
+    NULL },
+
+  { "layers-composite-space-menu", NULL,
+    NC_("layers-action", "Composite Space"), NULL, NULL, NULL,
+    NULL },
+
+  { "layers-composite-mode-menu", NULL,
+    NC_("layers-action", "Composite Mode"), NULL, NULL, NULL,
+    NULL },
+
+  { "layers-color-tag-menu", NULL,
+    NC_("layers-action", "Color Tag"), NULL, NULL, NULL,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-menu",                   NULL,
+    NC_("layers-action", "_Layer")        },
+  { "layers-stack-menu",             NULL,
+    NC_("layers-action", "Stac_k")        },
+  { "layers-mask-menu",              NULL,
+    NC_("layers-action", "_Mask")         },
+  { "layers-transparency-menu",      NULL,
+    NC_("layers-action", "Tr_ansparency") },
+  { "layers-transform-menu",         NULL,
+    NC_("layers-action", "_Transform")    },
+  { "layers-properties-menu",        GIMP_ICON_DOCUMENT_PROPERTIES,
+    NC_("layers-action", "_Properties")   },
+  { "layers-opacity-menu",           GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "_Opacity")      },
+  { "layers-mode-menu",              GIMP_ICON_TOOL_PENCIL,
+    NC_("layers-action", "Layer _Mode")   },
+
+  { "layers-edit", GIMP_ICON_EDIT,
+    NC_("layers-action", "Default Edit Action"), NULL,
+    NC_("layers-action", "Activate the default edit action for this type of layer"),
+    layers_edit_cmd_callback,
+    GIMP_HELP_LAYER_EDIT },
+
+  { "layers-edit-text", GIMP_ICON_EDIT,
+    NC_("layers-action", "Edit Te_xt on canvas"), NULL,
+    NC_("layers-action", "Edit this text layer content on canvas"),
+    layers_edit_text_cmd_callback,
+    GIMP_HELP_LAYER_EDIT },
+
+  { "layers-edit-attributes", GIMP_ICON_EDIT,
+    NC_("layers-action", "_Edit Layer Attributes..."), NULL,
+    NC_("layers-action", "Edit the layer's name"),
+    layers_edit_attributes_cmd_callback,
+    GIMP_HELP_LAYER_EDIT },
+
+  { "layers-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("layers-action", "_New Layer..."), "<primary><shift>N",
+    NC_("layers-action", "Create a new layer and add it to the image"),
+    layers_new_cmd_callback,
+    GIMP_HELP_LAYER_NEW },
+
+  { "layers-new-last-values", GIMP_ICON_DOCUMENT_NEW,
+    NC_("layers-action", "_New Layer"), NULL,
+    NC_("layers-action", "Create a new layer with last used values"),
+    layers_new_last_vals_cmd_callback,
+    GIMP_HELP_LAYER_NEW },
+
+  { "layers-new-from-visible", NULL,
+    NC_("layers-action", "New from _Visible"), NULL,
+    NC_("layers-action",
+        "Create a new layer from what is visible in this image"),
+    layers_new_from_visible_cmd_callback,
+    GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
+
+  { "layers-new-group", GIMP_ICON_FOLDER_NEW,
+    NC_("layers-action", "New Layer _Group"), NULL,
+    NC_("layers-action", "Create a new layer group and add it to the image"),
+    layers_new_group_cmd_callback,
+    GIMP_HELP_LAYER_NEW },
+
+  { "layers-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("layers-action", "D_uplicate Layer"), "<primary><shift>D",
+    NC_("layers-action",
+        "Create a duplicate of the layer and add it to the image"),
+    layers_duplicate_cmd_callback,
+    GIMP_HELP_LAYER_DUPLICATE },
+
+  { "layers-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("layers-action", "_Delete Layer"), NULL,
+    NC_("layers-action", "Delete this layer"),
+    layers_delete_cmd_callback,
+    GIMP_HELP_LAYER_DELETE },
+
+  { "layers-raise", GIMP_ICON_GO_UP,
+    NC_("layers-action", "_Raise Layer"), NULL,
+    NC_("layers-action", "Raise this layer one step in the layer stack"),
+    layers_raise_cmd_callback,
+    GIMP_HELP_LAYER_RAISE },
+
+  { "layers-raise-to-top", GIMP_ICON_GO_TOP,
+    NC_("layers-action", "Layer to _Top"), NULL,
+    NC_("layers-action", "Move this layer to the top of the layer stack"),
+    layers_raise_to_top_cmd_callback,
+    GIMP_HELP_LAYER_RAISE_TO_TOP },
+
+  { "layers-lower", GIMP_ICON_GO_DOWN,
+    NC_("layers-action", "_Lower Layer"), NULL,
+    NC_("layers-action", "Lower this layer one step in the layer stack"),
+    layers_lower_cmd_callback,
+    GIMP_HELP_LAYER_LOWER },
+
+  { "layers-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
+    NC_("layers-action", "Layer to _Bottom"), NULL,
+    NC_("layers-action", "Move this layer to the bottom of the layer stack"),
+    layers_lower_to_bottom_cmd_callback,
+    GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
+
+  { "layers-anchor", GIMP_ICON_LAYER_ANCHOR,
+    NC_("layers-action", "_Anchor Layer"), "<primary>H",
+    NC_("layers-action", "Anchor the floating layer"),
+    layers_anchor_cmd_callback,
+    GIMP_HELP_LAYER_ANCHOR },
+
+  { "layers-merge-down", GIMP_ICON_LAYER_MERGE_DOWN,
+    NC_("layers-action", "Merge Do_wn"), NULL,
+    NC_("layers-action", "Merge this layer with the first visible layer below it"),
+    layers_merge_down_cmd_callback,
+    GIMP_HELP_LAYER_MERGE_DOWN },
+
+  /* this is the same as layers-merge-down, except it's sensitive even if
+   * the layer can't be merged down
+   */
+  { "layers-merge-down-button", GIMP_ICON_LAYER_MERGE_DOWN,
+    NC_("layers-action", "Merge Do_wn"), NULL,
+    NC_("layers-action", "Merge this layer with the first visible layer below it"),
+    layers_merge_down_cmd_callback,
+    GIMP_HELP_LAYER_MERGE_DOWN },
+
+  { "layers-merge-group", NULL,
+    NC_("layers-action", "Merge Layer Group"), NULL,
+    NC_("layers-action", "Merge the layer group's layers into one normal layer"),
+    layers_merge_group_cmd_callback,
+    GIMP_HELP_LAYER_MERGE_GROUP },
+
+  { "layers-merge-layers", NULL,
+    NC_("layers-action", "Merge _Visible Layers..."), NULL,
+    NC_("layers-action", "Merge all visible layers into one layer"),
+    image_merge_layers_cmd_callback,
+    GIMP_HELP_IMAGE_MERGE_LAYERS },
+
+  { "layers-merge-layers-last-values", NULL,
+    NC_("layers-action", "Merge _Visible Layers"), NULL,
+    NC_("layers-action", "Merge all visible layers with last used values"),
+    image_merge_layers_last_vals_cmd_callback,
+    GIMP_HELP_IMAGE_MERGE_LAYERS },
+
+  { "layers-flatten-image", NULL,
+    NC_("layers-action", "_Flatten Image"), NULL,
+    NC_("layers-action", "Merge all layers into one and remove transparency"),
+    image_flatten_image_cmd_callback,
+    GIMP_HELP_IMAGE_FLATTEN },
+
+  { "layers-text-discard", GIMP_ICON_TOOL_TEXT,
+    NC_("layers-action", "_Discard Text Information"), NULL,
+    NC_("layers-action", "Turn this text layer into a normal layer"),
+    layers_text_discard_cmd_callback,
+    GIMP_HELP_LAYER_TEXT_DISCARD },
+
+  { "layers-text-to-vectors", GIMP_ICON_TOOL_TEXT,
+    NC_("layers-action", "Text to _Path"), NULL,
+    NC_("layers-action", "Create a path from this text layer"),
+    layers_text_to_vectors_cmd_callback,
+    GIMP_HELP_LAYER_TEXT_TO_PATH },
+
+  { "layers-text-along-vectors", GIMP_ICON_TOOL_TEXT,
+    NC_("layers-action", "Text alon_g Path"), NULL,
+    NC_("layers-action", "Warp this layer's text along the current path"),
+    layers_text_along_vectors_cmd_callback,
+    GIMP_HELP_LAYER_TEXT_ALONG_PATH },
+
+  { "layers-resize", GIMP_ICON_OBJECT_RESIZE,
+    NC_("layers-action", "Layer B_oundary Size..."), NULL,
+    NC_("layers-action", "Adjust the layer dimensions"),
+    layers_resize_cmd_callback,
+    GIMP_HELP_LAYER_RESIZE },
+
+  { "layers-resize-to-image", GIMP_ICON_LAYER_TO_IMAGESIZE,
+    NC_("layers-action", "Layer to _Image Size"), NULL,
+    NC_("layers-action", "Resize the layer to the size of the image"),
+    layers_resize_to_image_cmd_callback,
+    GIMP_HELP_LAYER_RESIZE_TO_IMAGE },
+
+  { "layers-scale", GIMP_ICON_OBJECT_SCALE,
+    NC_("layers-action", "_Scale Layer..."), NULL,
+    NC_("layers-action", "Change the size of the layer content"),
+    layers_scale_cmd_callback,
+    GIMP_HELP_LAYER_SCALE },
+
+  { "layers-crop-to-selection", GIMP_ICON_TOOL_CROP,
+    NC_("layers-action", "_Crop to Selection"), NULL,
+    NC_("layers-action", "Crop the layer to the extents of the selection"),
+    layers_crop_to_selection_cmd_callback,
+    GIMP_HELP_LAYER_CROP },
+
+  { "layers-crop-to-content", GIMP_ICON_TOOL_CROP,
+    NC_("layers-action", "Crop to C_ontent"), NULL,
+    NC_("layers-action", "Crop the layer to the extents of its content (remove empty borders from the layer)"),
+    layers_crop_to_content_cmd_callback,
+    GIMP_HELP_LAYER_CROP },
+
+  { "layers-mask-add", GIMP_ICON_LAYER_MASK,
+    NC_("layers-action", "Add La_yer Mask..."), NULL,
+    NC_("layers-action",
+        "Add a mask that allows non-destructive editing of transparency"),
+    layers_mask_add_cmd_callback,
+    GIMP_HELP_LAYER_MASK_ADD },
+
+  /* this is the same as layers-mask-add, except it's sensitive even if
+   * there is a mask on the layer
+   */
+  { "layers-mask-add-button", GIMP_ICON_LAYER_MASK,
+    NC_("layers-action", "Add La_yer Mask..."), NULL,
+    NC_("layers-action",
+        "Add a mask that allows non-destructive editing of transparency"),
+    layers_mask_add_cmd_callback,
+    GIMP_HELP_LAYER_MASK_ADD },
+
+  { "layers-mask-add-last-values", GIMP_ICON_LAYER_MASK,
+    NC_("layers-action", "Add La_yer Mask"), NULL,
+    NC_("layers-action",
+        "Add a mask with last used values"),
+    layers_mask_add_last_vals_cmd_callback,
+    GIMP_HELP_LAYER_MASK_ADD },
+
+  { "layers-alpha-add", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Add Alpha C_hannel"), NULL,
+    NC_("layers-action", "Add transparency information to the layer"),
+    layers_alpha_add_cmd_callback,
+    GIMP_HELP_LAYER_ALPHA_ADD },
+
+  { "layers-alpha-remove", NULL,
+    NC_("layers-action", "_Remove Alpha Channel"), NULL,
+    NC_("layers-action", "Remove transparency information from the layer"),
+    layers_alpha_remove_cmd_callback,
+    GIMP_HELP_LAYER_ALPHA_REMOVE }
+};
+
+static const GimpToggleActionEntry layers_toggle_actions[] =
+{
+  { "layers-mask-edit", GIMP_ICON_EDIT,
+    NC_("layers-action", "_Edit Layer Mask"), NULL,
+    NC_("layers-action", "Work on the layer mask"),
+    layers_mask_edit_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_MASK_EDIT },
+
+  { "layers-mask-show", GIMP_ICON_VISIBLE,
+    NC_("layers-action", "S_how Layer Mask"), NULL, NULL,
+    layers_mask_show_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_MASK_SHOW },
+
+  { "layers-mask-disable", NULL,
+    NC_("layers-action", "_Disable Layer Mask"), NULL,
+    NC_("layers-action", "Dismiss the effect of the layer mask"),
+    layers_mask_disable_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_MASK_DISABLE },
+
+  { "layers-visible", GIMP_ICON_VISIBLE,
+    NC_("layers-action", "Toggle Layer _Visibility"), NULL, NULL,
+    layers_visible_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_VISIBLE },
+
+  { "layers-linked", GIMP_ICON_LINKED,
+    NC_("layers-action", "Toggle Layer _Linked State"), NULL, NULL,
+    layers_linked_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LINKED },
+
+  { "layers-lock-content", NULL /* GIMP_ICON_LOCK */,
+    NC_("layers-action", "L_ock Pixels of Layer"), NULL, NULL,
+    layers_lock_content_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LOCK_PIXELS },
+
+  { "layers-lock-position", GIMP_ICON_TOOL_MOVE,
+    NC_("layers-action", "L_ock Position of Layer"), NULL, NULL,
+    layers_lock_position_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LOCK_POSITION },
+
+  { "layers-lock-alpha", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Lock Alph_a Channel"), NULL,
+    NC_("layers-action",
+        "Keep transparency information on this layer from being modified"),
+    layers_lock_alpha_cmd_callback,
+    FALSE,
+    GIMP_HELP_LAYER_LOCK_ALPHA },
+};
+
+static const GimpRadioActionEntry layers_blend_space_actions[] =
+{
+  { "layers-blend-space-auto", NULL,
+    NC_("layers-action", "Auto"), NULL,
+    NC_("layers-action", "Layer Blend Space: Auto"),
+    GIMP_LAYER_COLOR_SPACE_AUTO,
+    NULL },
+
+  { "layers-blend-space-rgb-linear", NULL,
+    NC_("layers-action", "RGB (linear)"), NULL,
+    NC_("layers-action", "Layer Blend Space: RGB (linear)"),
+    GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    NULL },
+
+  { "layers-blend-space-rgb-perceptual", NULL,
+    NC_("layers-action", "RGB (perceptual)"), NULL,
+    NC_("layers-action", "Layer Blend Space: RGB (perceptual)"),
+    GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    NULL }
+};
+
+static const GimpRadioActionEntry layers_composite_space_actions[] =
+{
+  { "layers-composite-space-auto", NULL,
+    NC_("layers-action", "Auto"), NULL,
+    NC_("layers-action", "Layer Composite Space: Auto"),
+    GIMP_LAYER_COLOR_SPACE_AUTO,
+    NULL },
+
+  { "layers-composite-space-rgb-linear", NULL,
+    NC_("layers-action", "RGB (linear)"), NULL,
+    NC_("layers-action", "Layer Composite Space: RGB (linear)"),
+    GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    NULL },
+
+  { "layers-composite-space-rgb-perceptual", NULL,
+    NC_("layers-action", "RGB (perceptual)"), NULL,
+    NC_("layers-action", "Layer Composite Space: RGB (perceptual)"),
+    GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    NULL }
+};
+
+static const GimpRadioActionEntry layers_composite_mode_actions[] =
+{
+  { "layers-composite-mode-auto", NULL,
+    NC_("layers-action", "Auto"), NULL,
+    NC_("layers-action", "Layer Composite Mode: Auto"),
+    GIMP_LAYER_COMPOSITE_AUTO,
+    NULL },
+
+  { "layers-composite-mode-union", NULL,
+    NC_("layers-action", "Union"), NULL,
+    NC_("layers-action", "Layer Composite Mode: Union"),
+    GIMP_LAYER_COMPOSITE_UNION,
+    NULL },
+
+  { "layers-composite-mode-clip-to-backdrop", NULL,
+    NC_("layers-action", "Clip to Backdrop"), NULL,
+    NC_("layers-action", "Layer Composite Mode: Clip to Backdrop"),
+    GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    NULL },
+
+  { "layers-composite-mode-clip-to-layer", NULL,
+    NC_("layers-action", "Clip to Layer"), NULL,
+    NC_("layers-action", "Layer Composite Mode: Clip to Layer"),
+    GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER,
+    NULL },
+
+  { "layers-composite-mode-intersection", NULL,
+    NC_("layers-action", "Intersection"), NULL,
+    NC_("layers-action", "Layer Composite Mode: Intersection"),
+    GIMP_LAYER_COMPOSITE_INTERSECTION,
+    NULL }
+};
+
+static const GimpEnumActionEntry layers_color_tag_actions[] =
+{
+  { "layers-color-tag-none", GIMP_ICON_EDIT_CLEAR,
+    NC_("layers-action", "None"), NULL,
+    NC_("layers-action", "Layer Color Tag: Clear"),
+    GIMP_COLOR_TAG_NONE, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-blue", NULL,
+    NC_("layers-action", "Blue"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Blue"),
+    GIMP_COLOR_TAG_BLUE, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-green", NULL,
+    NC_("layers-action", "Green"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Green"),
+    GIMP_COLOR_TAG_GREEN, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-yellow", NULL,
+    NC_("layers-action", "Yellow"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Yellow"),
+    GIMP_COLOR_TAG_YELLOW, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-orange", NULL,
+    NC_("layers-action", "Orange"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Orange"),
+    GIMP_COLOR_TAG_ORANGE, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-brown", NULL,
+    NC_("layers-action", "Brown"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Brown"),
+    GIMP_COLOR_TAG_BROWN, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-red", NULL,
+    NC_("layers-action", "Red"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Red"),
+    GIMP_COLOR_TAG_RED, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-violet", NULL,
+    NC_("layers-action", "Violet"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Violet"),
+    GIMP_COLOR_TAG_VIOLET, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG },
+
+  { "layers-color-tag-gray", NULL,
+    NC_("layers-action", "Gray"), NULL,
+    NC_("layers-action", "Layer Color Tag: Set to Gray"),
+    GIMP_COLOR_TAG_GRAY, FALSE,
+    GIMP_HELP_LAYER_COLOR_TAG }
+};
+
+static const GimpEnumActionEntry layers_mask_apply_actions[] =
+{
+  { "layers-mask-apply", NULL,
+    NC_("layers-action", "Apply Layer _Mask"), NULL,
+    NC_("layers-action", "Apply the effect of the layer mask and remove it"),
+    GIMP_MASK_APPLY, FALSE,
+    GIMP_HELP_LAYER_MASK_APPLY },
+
+  { "layers-mask-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("layers-action", "Delete Layer Mas_k"), NULL,
+    NC_("layers-action", "Remove the layer mask and its effect"),
+    GIMP_MASK_DISCARD, FALSE,
+    GIMP_HELP_LAYER_MASK_DELETE }
+};
+
+static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
+{
+  { "layers-mask-selection-replace", GIMP_ICON_SELECTION_REPLACE,
+    NC_("layers-action", "_Mask to Selection"), NULL,
+    NC_("layers-action", "Replace the selection with the layer mask"),
+    GIMP_CHANNEL_OP_REPLACE, FALSE,
+    GIMP_HELP_LAYER_MASK_SELECTION_REPLACE },
+
+  { "layers-mask-selection-add", GIMP_ICON_SELECTION_ADD,
+    NC_("layers-action", "_Add to Selection"), NULL,
+    NC_("layers-action", "Add the layer mask to the current selection"),
+    GIMP_CHANNEL_OP_ADD, FALSE,
+    GIMP_HELP_LAYER_MASK_SELECTION_ADD },
+
+  { "layers-mask-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
+    NC_("layers-action", "_Subtract from Selection"), NULL,
+    NC_("layers-action", "Subtract the layer mask from the current selection"),
+    GIMP_CHANNEL_OP_SUBTRACT, FALSE,
+    GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT },
+
+  { "layers-mask-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
+    NC_("layers-action", "_Intersect with Selection"), NULL,
+    NC_("layers-action", "Intersect the layer mask with the current selection"),
+    GIMP_CHANNEL_OP_INTERSECT, FALSE,
+    GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT }
+};
+
+static const GimpEnumActionEntry layers_alpha_to_selection_actions[] =
+{
+  { "layers-alpha-selection-replace", GIMP_ICON_SELECTION_REPLACE,
+    NC_("layers-action", "Al_pha to Selection"), NULL,
+    NC_("layers-action",
+        "Replace the selection with the layer's alpha channel"),
+    GIMP_CHANNEL_OP_REPLACE, FALSE,
+    GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE },
+
+  { "layers-alpha-selection-add", GIMP_ICON_SELECTION_ADD,
+    NC_("layers-action", "A_dd to Selection"), NULL,
+    NC_("layers-action",
+        "Add the layer's alpha channel to the current selection"),
+    GIMP_CHANNEL_OP_ADD, FALSE,
+    GIMP_HELP_LAYER_ALPHA_SELECTION_ADD },
+
+  { "layers-alpha-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
+    NC_("layers-action", "_Subtract from Selection"), NULL,
+    NC_("layers-action",
+        "Subtract the layer's alpha channel from the current selection"),
+    GIMP_CHANNEL_OP_SUBTRACT, FALSE,
+    GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT },
+
+  { "layers-alpha-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
+    NC_("layers-action", "_Intersect with Selection"), NULL,
+    NC_("layers-action",
+        "Intersect the layer's alpha channel with the current selection"),
+    GIMP_CHANNEL_OP_INTERSECT, FALSE,
+    GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT }
+};
+
+static const GimpEnumActionEntry layers_select_actions[] =
+{
+  { "layers-select-top", NULL,
+    NC_("layers-action", "Select _Top Layer"), "Home",
+    NC_("layers-action", "Select the topmost layer"),
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    GIMP_HELP_LAYER_TOP },
+
+  { "layers-select-bottom", NULL,
+    NC_("layers-action", "Select _Bottom Layer"), "End",
+    NC_("layers-action", "Select the bottommost layer"),
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_LAYER_BOTTOM },
+
+  { "layers-select-previous", NULL,
+    NC_("layers-action", "Select _Previous Layer"), "Prior",
+    NC_("layers-action", "Select the layer above the current layer"),
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_LAYER_PREVIOUS },
+
+  { "layers-select-next", NULL,
+    NC_("layers-action", "Select _Next Layer"), "Next",
+    NC_("layers-action", "Select the layer below the current layer"),
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_LAYER_NEXT }
+};
+
+static const GimpEnumActionEntry layers_opacity_actions[] =
+{
+  { "layers-opacity-set", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    GIMP_HELP_LAYER_OPACITY },
+  { "layers-opacity-transparent", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Make Completely Transparent"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    GIMP_HELP_LAYER_OPACITY },
+  { "layers-opacity-opaque", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Make Completely Opaque"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_LAYER_OPACITY },
+  { "layers-opacity-decrease", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Make More Transparent"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_LAYER_OPACITY },
+  { "layers-opacity-increase", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Make More Opaque"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_LAYER_OPACITY },
+  { "layers-opacity-decrease-skip", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Make 10% More Transparent"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    GIMP_HELP_LAYER_OPACITY },
+  { "layers-opacity-increase-skip", GIMP_ICON_TRANSPARENCY,
+    NC_("layers-action", "Layer Opacity: Make 10% More Opaque"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    GIMP_HELP_LAYER_OPACITY }
+};
+
+static const GimpEnumActionEntry layers_mode_actions[] =
+{
+  { "layers-mode-first", GIMP_ICON_TOOL_PENCIL,
+    NC_("layers-action", "Layer Mode: Select First"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    GIMP_HELP_LAYER_MODE },
+  { "layers-mode-last", GIMP_ICON_TOOL_PENCIL,
+    NC_("layers-action", "Layer Mode: Select Last"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_LAYER_MODE },
+  { "layers-mode-previous", GIMP_ICON_TOOL_PENCIL,
+    NC_("layers-action", "Layer Mode: Select Previous"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_LAYER_MODE },
+  { "layers-mode-next", GIMP_ICON_TOOL_PENCIL,
+    NC_("layers-action", "Layer Mode: Select Next"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_LAYER_MODE }
+};
+
+/**
+ * layers_actions_fix_tooltip:
+ * @group:
+ * @action:
+ * @modifiers:
+ *
+ * Make layer alpha to selection click-shortcuts discoverable, at
+ * least in theory.
+ **/
+static void
+layers_actions_fix_tooltip (GimpActionGroup *group,
+                            const gchar     *action,
+                            GdkModifierType  modifiers)
+{
+  const gchar *old_hint;
+  gchar       *new_hint;
+
+  old_hint = gimp_action_group_get_action_tooltip (group,
+                                                   action);
+  new_hint = g_strconcat (old_hint,
+                          "\n",
+                          /* Will be followed with e.g. "Shift-Click
+                             on thumbnail"
+                           */
+                          _("Shortcut: "),
+                          gimp_get_mod_string (modifiers),
+                          /* Will be prepended with a modifier key
+                             string, e.g. "Shift"
+                           */
+                          _("-Click on thumbnail in Layers dockable"),
+                          NULL);
+
+  gimp_action_group_set_action_tooltip (group, action, new_hint);
+  g_free (new_hint);
+}
+
+void
+layers_actions_setup (GimpActionGroup *group)
+{
+  GdkDisplay      *display = gdk_display_get_default ();
+  GdkModifierType  extend_mask;
+  GdkModifierType  modify_mask;
+
+  extend_mask =
+    gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                  GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+  modify_mask =
+    gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                  GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+  gimp_action_group_add_actions (group, "layers-action",
+                                 layers_actions,
+                                 G_N_ELEMENTS (layers_actions));
+
+  gimp_action_group_add_toggle_actions (group, "layers-action",
+                                        layers_toggle_actions,
+                                        G_N_ELEMENTS (layers_toggle_actions));
+
+  gimp_action_group_add_radio_actions (group, "layers-action",
+                                       layers_blend_space_actions,
+                                       G_N_ELEMENTS (layers_blend_space_actions),
+                                       NULL, 0,
+                                       layers_blend_space_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "layers-action",
+                                       layers_composite_space_actions,
+                                       G_N_ELEMENTS (layers_composite_space_actions),
+                                       NULL, 0,
+                                       layers_composite_space_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "layers-action",
+                                       layers_composite_mode_actions,
+                                       G_N_ELEMENTS (layers_composite_mode_actions),
+                                       NULL, 0,
+                                       layers_composite_mode_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_color_tag_actions,
+                                      G_N_ELEMENTS (layers_color_tag_actions),
+                                      layers_color_tag_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_mask_apply_actions,
+                                      G_N_ELEMENTS (layers_mask_apply_actions),
+                                      layers_mask_apply_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_mask_to_selection_actions,
+                                      G_N_ELEMENTS (layers_mask_to_selection_actions),
+                                      layers_mask_to_selection_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_alpha_to_selection_actions,
+                                      G_N_ELEMENTS (layers_alpha_to_selection_actions),
+                                      layers_alpha_to_selection_cmd_callback);
+
+  layers_actions_fix_tooltip (group, "layers-alpha-selection-replace",
+                              GDK_MOD1_MASK);
+  layers_actions_fix_tooltip (group, "layers-alpha-selection-add",
+                              extend_mask | GDK_MOD1_MASK);
+  layers_actions_fix_tooltip (group, "layers-alpha-selection-subtract",
+                              modify_mask | GDK_MOD1_MASK);
+  layers_actions_fix_tooltip (group, "layers-alpha-selection-intersect",
+                              extend_mask | modify_mask | GDK_MOD1_MASK);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_select_actions,
+                                      G_N_ELEMENTS (layers_select_actions),
+                                      layers_select_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_opacity_actions,
+                                      G_N_ELEMENTS (layers_opacity_actions),
+                                      layers_opacity_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "layers-action",
+                                      layers_mode_actions,
+                                      G_N_ELEMENTS (layers_mode_actions),
+                                      layers_mode_cmd_callback);
+
+  items_actions_setup (group, "layers");
+}
+
+void
+layers_actions_update (GimpActionGroup *group,
+                       gpointer         data)
+{
+  GimpImage     *image          = action_data_get_image (data);
+  GimpLayer     *layer          = NULL;
+  GimpLayerMask *mask           = NULL;     /*  layer mask             */
+  gboolean       fs             = FALSE;    /*  floating sel           */
+  gboolean       ac             = FALSE;    /*  active channel         */
+  gboolean       sel            = FALSE;
+  gboolean       alpha          = FALSE;    /*  alpha channel present  */
+  gboolean       indexed        = FALSE;    /*  is indexed             */
+  gboolean       lock_alpha     = FALSE;
+  gboolean       can_lock_alpha = FALSE;
+  gboolean       text_layer     = FALSE;
+  gboolean       visible        = FALSE;
+  gboolean       writable       = FALSE;
+  gboolean       movable        = FALSE;
+  gboolean       children       = FALSE;
+  gboolean       bs_mutable     = FALSE;
+  gboolean       cs_mutable     = FALSE;
+  gboolean       cm_mutable     = FALSE;
+  GList         *next           = NULL;
+  GList         *next_visible   = NULL;
+  GList         *prev           = NULL;
+  gboolean       next_mode      = FALSE;
+  gboolean       prev_mode      = FALSE;
+
+  if (image)
+    {
+      fs      = (gimp_image_get_floating_selection (image) != NULL);
+      ac      = (gimp_image_get_active_channel (image) != NULL);
+      sel     = ! gimp_channel_is_empty (gimp_image_get_mask (image));
+      indexed = (gimp_image_get_base_type (image) == GIMP_INDEXED);
+
+      layer = gimp_image_get_active_layer (image);
+
+      if (layer)
+        {
+          GimpLayerMode *modes;
+          GimpLayerMode  mode   = gimp_layer_get_mode (layer);
+          const gchar   *action = NULL;
+          GList         *layer_list;
+          GList         *list;
+          gint           n_modes;
+          gint           i = 0;
+
+          switch (gimp_layer_get_blend_space (layer))
+            {
+            case GIMP_LAYER_COLOR_SPACE_AUTO:
+              action = "layers-blend-space-auto"; break;
+            case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
+              action = "layers-blend-space-rgb-linear"; break;
+            case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
+              action = "layers-blend-space-rgb-perceptual"; break;
+            default:
+              action = NULL; break; /* can't happen */
+            }
+
+          if (action)
+            gimp_action_group_set_action_active (group, action, TRUE);
+
+          switch (gimp_layer_get_composite_space (layer))
+            {
+            case GIMP_LAYER_COLOR_SPACE_AUTO:
+              action = "layers-composite-space-auto"; break;
+            case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
+              action = "layers-composite-space-rgb-linear"; break;
+            case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
+              action = "layers-composite-space-rgb-perceptual"; break;
+            default:
+              action = NULL; break; /* can't happen */
+            }
+
+          if (action)
+            gimp_action_group_set_action_active (group, action, TRUE);
+
+          switch (gimp_layer_get_composite_mode (layer))
+            {
+            case GIMP_LAYER_COMPOSITE_AUTO:
+              action = "layers-composite-mode-auto"; break;
+            case GIMP_LAYER_COMPOSITE_UNION:
+              action = "layers-composite-mode-union"; break;
+            case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+              action = "layers-composite-mode-clip-to-backdrop"; break;
+            case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+              action = "layers-composite-mode-clip-to-layer"; break;
+            case GIMP_LAYER_COMPOSITE_INTERSECTION:
+              action = "layers-composite-mode-intersection"; break;
+            }
+
+          gimp_action_group_set_action_active (group, action, TRUE);
+
+          bs_mutable = gimp_layer_mode_is_blend_space_mutable (mode);
+          cs_mutable = gimp_layer_mode_is_composite_space_mutable (mode);
+          cm_mutable = gimp_layer_mode_is_composite_mode_mutable (mode);
+
+          mask           = gimp_layer_get_mask (layer);
+          lock_alpha     = gimp_layer_get_lock_alpha (layer);
+          can_lock_alpha = gimp_layer_can_lock_alpha (layer);
+          alpha          = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
+          visible        = gimp_item_get_visible (GIMP_ITEM (layer));
+          writable       = ! gimp_item_is_content_locked (GIMP_ITEM (layer));
+          movable        = ! gimp_item_is_position_locked (GIMP_ITEM (layer));
+
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+            children = TRUE;
+
+          layer_list = gimp_item_get_container_iter (GIMP_ITEM (layer));
+
+          list = g_list_find (layer_list, layer);
+
+          if (list)
+            {
+              prev = g_list_previous (list);
+              next = g_list_next (list);
+
+              for (next_visible = next;
+                   next_visible;
+                   next_visible = g_list_next (next_visible))
+                {
+                  if (gimp_item_get_visible (next_visible->data))
+                    {
+                      /*  "next_visible" is actually "next_visible" and
+                       *  "writable" and "not group"
+                       */
+                      if (gimp_item_is_content_locked (next_visible->data) ||
+                          gimp_viewable_get_children (next_visible->data))
+                        next_visible = NULL;
+
+                      break;
+                    }
+                }
+            }
+
+          modes = gimp_layer_mode_get_context_array (mode,
+                                                     GIMP_LAYER_MODE_CONTEXT_LAYER,
+                                                     &n_modes);
+          while (i < (n_modes - 1) && modes[i] != mode)
+            i++;
+          g_free (modes);
+          next_mode = (i < n_modes - 1);
+          prev_mode = (i > 0);
+
+          text_layer = gimp_item_is_text_layer (GIMP_ITEM (layer));
+        }
+    }
+
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_LABEL(action,label) \
+        gimp_action_group_set_action_label (group, action, label)
+
+  SET_SENSITIVE ("layers-edit",             !ac && ((layer && !fs) || text_layer));
+  SET_VISIBLE   ("layers-edit-text",        text_layer && !ac);
+  SET_SENSITIVE ("layers-edit-text",        text_layer && !ac);
+  SET_SENSITIVE ("layers-edit-attributes",  layer && !fs && !ac);
+
+  if (layer && gimp_layer_is_floating_sel (layer))
+    {
+      SET_LABEL ("layers-new",             C_("layers-action", "To _New Layer"));
+      SET_LABEL ("layers-new-last-values", C_("layers-action", "To _New Layer"));
+    }
+  else
+    {
+      SET_LABEL ("layers-new",             C_("layers-action", "_New Layer..."));
+      SET_LABEL ("layers-new-last-values", C_("layers-action", "_New Layer"));
+    }
+
+  SET_SENSITIVE ("layers-new",              image);
+  SET_SENSITIVE ("layers-new-last-values",  image);
+  SET_SENSITIVE ("layers-new-from-visible", image);
+  SET_SENSITIVE ("layers-new-group",        image && !indexed);
+  SET_SENSITIVE ("layers-duplicate",        layer && !fs && !ac);
+  SET_SENSITIVE ("layers-delete",           layer && !ac);
+
+  SET_SENSITIVE ("layers-mode-first",       layer && !ac && prev_mode);
+  SET_SENSITIVE ("layers-mode-last",        layer && !ac && next_mode);
+  SET_SENSITIVE ("layers-mode-previous",    layer && !ac && prev_mode);
+  SET_SENSITIVE ("layers-mode-next",        layer && !ac && next_mode);
+
+  SET_SENSITIVE ("layers-select-top",       layer && !fs && !ac && prev);
+  SET_SENSITIVE ("layers-select-bottom",    layer && !fs && !ac && next);
+  SET_SENSITIVE ("layers-select-previous",  layer && !fs && !ac && prev);
+  SET_SENSITIVE ("layers-select-next",      layer && !fs && !ac && next);
+
+  SET_SENSITIVE ("layers-raise",            layer && !fs && !ac && prev);
+  SET_SENSITIVE ("layers-raise-to-top",     layer && !fs && !ac && prev);
+  SET_SENSITIVE ("layers-lower",            layer && !fs && !ac && next);
+  SET_SENSITIVE ("layers-lower-to-bottom",  layer && !fs && !ac && next);
+
+  SET_VISIBLE   ("layers-anchor",            layer &&  fs && !ac);
+  SET_VISIBLE   ("layers-merge-down",        !fs);
+  SET_SENSITIVE ("layers-merge-down",        layer && !fs && !ac && visible && next_visible);
+  SET_VISIBLE   ("layers-merge-down-button", !fs);
+  SET_SENSITIVE ("layers-merge-down-button", layer && !fs && !ac);
+  SET_VISIBLE   ("layers-merge-group",       children);
+  SET_SENSITIVE ("layers-merge-group",       layer && !fs && !ac && children);
+  SET_SENSITIVE ("layers-merge-layers",      layer && !fs && !ac);
+  SET_SENSITIVE ("layers-flatten-image",     layer && !fs && !ac);
+
+  SET_VISIBLE   ("layers-text-discard",       text_layer && !ac);
+  SET_VISIBLE   ("layers-text-to-vectors",    text_layer && !ac);
+  SET_VISIBLE   ("layers-text-along-vectors", text_layer && !ac);
+
+  SET_SENSITIVE ("layers-resize",          writable && movable && !ac);
+  SET_SENSITIVE ("layers-resize-to-image", writable && movable && !ac);
+  SET_SENSITIVE ("layers-scale",           writable && movable && !ac);
+
+  SET_SENSITIVE ("layers-crop-to-selection", writable && movable && sel);
+  SET_SENSITIVE ("layers-crop-to-content",   writable && movable);
+
+  SET_SENSITIVE ("layers-alpha-add",    writable && !children && !fs && !alpha);
+  SET_SENSITIVE ("layers-alpha-remove", writable && !children && !fs &&  alpha);
+
+  SET_SENSITIVE ("layers-lock-alpha", can_lock_alpha);
+  SET_ACTIVE    ("layers-lock-alpha", lock_alpha);
+
+  SET_SENSITIVE ("layers-blend-space-auto",           layer && bs_mutable);
+  SET_SENSITIVE ("layers-blend-space-rgb-linear",     layer && bs_mutable);
+  SET_SENSITIVE ("layers-blend-space-rgb-perceptual", layer && bs_mutable);
+
+  SET_SENSITIVE ("layers-composite-space-auto",           layer && cs_mutable);
+  SET_SENSITIVE ("layers-composite-space-rgb-linear",     layer && cs_mutable);
+  SET_SENSITIVE ("layers-composite-space-rgb-perceptual", layer && cs_mutable);
+
+  SET_SENSITIVE ("layers-composite-mode-auto",             layer && cm_mutable);
+  SET_SENSITIVE ("layers-composite-mode-union",            layer && cm_mutable);
+  SET_SENSITIVE ("layers-composite-mode-clip-to-backdrop", layer && cm_mutable);
+  SET_SENSITIVE ("layers-composite-mode-clip-to-layer",    layer && cm_mutable);
+  SET_SENSITIVE ("layers-composite-mode-intersection",     layer && cm_mutable);
+
+  SET_SENSITIVE ("layers-mask-add",             layer && !fs && !ac && !mask);
+  SET_SENSITIVE ("layers-mask-add-button",      layer && !fs && !ac);
+  SET_SENSITIVE ("layers-mask-add-last-values", layer && !fs && !ac && !mask);
+
+  SET_SENSITIVE ("layers-mask-apply",  writable && !fs && !ac &&  mask && !children);
+  SET_SENSITIVE ("layers-mask-delete", layer    && !fs && !ac &&  mask);
+
+  SET_SENSITIVE ("layers-mask-edit",    layer && !fs && !ac &&  mask);
+  SET_SENSITIVE ("layers-mask-show",    layer && !fs && !ac &&  mask);
+  SET_SENSITIVE ("layers-mask-disable", layer && !fs && !ac &&  mask);
+
+  SET_ACTIVE ("layers-mask-edit",    mask && gimp_layer_get_edit_mask (layer));
+  SET_ACTIVE ("layers-mask-show",    mask && gimp_layer_get_show_mask (layer));
+  SET_ACTIVE ("layers-mask-disable", mask && !gimp_layer_get_apply_mask (layer));
+
+  SET_SENSITIVE ("layers-mask-selection-replace",   layer && !fs && !ac && mask);
+  SET_SENSITIVE ("layers-mask-selection-add",       layer && !fs && !ac && mask);
+  SET_SENSITIVE ("layers-mask-selection-subtract",  layer && !fs && !ac && mask);
+  SET_SENSITIVE ("layers-mask-selection-intersect", layer && !fs && !ac && mask);
+
+  SET_SENSITIVE ("layers-alpha-selection-replace",   layer && !fs && !ac);
+  SET_SENSITIVE ("layers-alpha-selection-add",       layer && !fs && !ac);
+  SET_SENSITIVE ("layers-alpha-selection-subtract",  layer && !fs && !ac);
+  SET_SENSITIVE ("layers-alpha-selection-intersect", layer && !fs && !ac);
+
+#undef SET_VISIBLE
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+#undef SET_LABEL
+
+  items_actions_update (group, "layers", GIMP_ITEM (layer));
+}
diff --git a/app/actions/layers-actions.h b/app/actions/layers-actions.h
new file mode 100644
index 0000000..0f257bf
--- /dev/null
+++ b/app/actions/layers-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LAYERS_ACTIONS_H__
+#define __LAYERS_ACTIONS_H__
+
+
+void   layers_actions_setup  (GimpActionGroup *group);
+void   layers_actions_update (GimpActionGroup *group,
+                              gpointer         data);
+
+
+#endif /* __LAYERS_ACTIONS_H__ */
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
new file mode 100644
index 0000000..528eb4c
--- /dev/null
+++ b/app/actions/layers-commands.c
@@ -0,0 +1,1749 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable-fill.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-merge.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpitemundo.h"
+#include "core/gimplayerpropundo.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimplayer-new.h"
+#include "core/gimppickable.h"
+#include "core/gimppickable-auto-shrink.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpundostack.h"
+#include "core/gimpprogress.h"
+
+#include "text/gimptext.h"
+#include "text/gimptext-vectors.h"
+#include "text/gimptextlayer.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-warp.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpprogressdialog.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
+
+#include "tools/gimptexttool.h"
+#include "tools/tool_manager.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/layer-add-mask-dialog.h"
+#include "dialogs/layer-options-dialog.h"
+#include "dialogs/resize-dialog.h"
+#include "dialogs/scale-dialog.h"
+
+#include "actions.h"
+#include "items-commands.h"
+#include "layers-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   layers_new_callback             (GtkWidget             *dialog,
+                                               GimpImage             *image,
+                                               GimpLayer             *layer,
+                                               GimpContext           *context,
+                                               const gchar           *layer_name,
+                                               GimpLayerMode          layer_mode,
+                                               GimpLayerColorSpace    layer_blend_space,
+                                               GimpLayerColorSpace    layer_composite_space,
+                                               GimpLayerCompositeMode layer_composite_mode,
+                                               gdouble                layer_opacity,
+                                               GimpFillType           layer_fill_type,
+                                               gint                   layer_width,
+                                               gint                   layer_height,
+                                               gint                   layer_offset_x,
+                                               gint                   layer_offset_y,
+                                               gboolean               layer_visible,
+                                               gboolean               layer_linked,
+                                               GimpColorTag           layer_color_tag,
+                                               gboolean               layer_lock_pixels,
+                                               gboolean               layer_lock_position,
+                                               gboolean               layer_lock_alpha,
+                                               gboolean               rename_text_layer,
+                                               gpointer               user_data);
+static void   layers_edit_attributes_callback (GtkWidget             *dialog,
+                                               GimpImage             *image,
+                                               GimpLayer             *layer,
+                                               GimpContext           *context,
+                                               const gchar           *layer_name,
+                                               GimpLayerMode          layer_mode,
+                                               GimpLayerColorSpace    layer_blend_space,
+                                               GimpLayerColorSpace    layer_composite_space,
+                                               GimpLayerCompositeMode layer_composite_mode,
+                                               gdouble                layer_opacity,
+                                               GimpFillType           layer_fill_type,
+                                               gint                   layer_width,
+                                               gint                   layer_height,
+                                               gint                   layer_offset_x,
+                                               gint                   layer_offset_y,
+                                               gboolean               layer_visible,
+                                               gboolean               layer_linked,
+                                               GimpColorTag           layer_color_tag,
+                                               gboolean               layer_lock_pixels,
+                                               gboolean               layer_lock_position,
+                                               gboolean               layer_lock_alpha,
+                                               gboolean               rename_text_layer,
+                                               gpointer               user_data);
+static void   layers_add_mask_callback        (GtkWidget             *dialog,
+                                               GimpLayer             *layer,
+                                               GimpAddMaskType        add_mask_type,
+                                               GimpChannel           *channel,
+                                               gboolean               invert,
+                                               gpointer               user_data);
+static void   layers_scale_callback           (GtkWidget             *dialog,
+                                               GimpViewable          *viewable,
+                                               gint                   width,
+                                               gint                   height,
+                                               GimpUnit               unit,
+                                               GimpInterpolationType  interpolation,
+                                               gdouble                xresolution,
+                                               gdouble                yresolution,
+                                               GimpUnit               resolution_unit,
+                                               gpointer               user_data);
+static void   layers_resize_callback          (GtkWidget             *dialog,
+                                               GimpViewable          *viewable,
+                                               GimpContext           *context,
+                                               gint                   width,
+                                               gint                   height,
+                                               GimpUnit               unit,
+                                               gint                   offset_x,
+                                               gint                   offset_y,
+                                               gdouble                unused0,
+                                               gdouble                unused1,
+                                               GimpUnit               unused2,
+                                               GimpFillType           fill_type,
+                                               GimpItemSet            unused3,
+                                               gboolean               unused4,
+                                               gpointer               data);
+
+static gint   layers_mode_index               (GimpLayerMode          layer_mode,
+                                               const GimpLayerMode   *modes,
+                                               gint                   n_modes);
+
+
+/*  private variables  */
+
+static GimpUnit               layer_resize_unit   = GIMP_UNIT_PIXEL;
+static GimpUnit               layer_scale_unit    = GIMP_UNIT_PIXEL;
+static GimpInterpolationType  layer_scale_interp  = -1;
+
+
+/*  public functions  */
+
+void
+layers_edit_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+  if (gimp_item_is_text_layer (GIMP_ITEM (layer)))
+    {
+      layers_edit_text_cmd_callback (action, value, data);
+    }
+  else
+    {
+      layers_edit_attributes_cmd_callback (action, value, data);
+    }
+}
+
+void
+layers_edit_text_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  GimpTool  *active_tool;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+  g_return_if_fail (gimp_item_is_text_layer (GIMP_ITEM (layer)));
+
+  active_tool = tool_manager_get_active (image->gimp);
+
+  if (! GIMP_IS_TEXT_TOOL (active_tool))
+    {
+      GimpToolInfo *tool_info = gimp_get_tool_info (image->gimp,
+                                                    "gimp-text-tool");
+
+      if (GIMP_IS_TOOL_INFO (tool_info))
+        {
+          gimp_context_set_tool (action_data_get_context (data), tool_info);
+          active_tool = tool_manager_get_active (image->gimp);
+        }
+    }
+
+  if (GIMP_IS_TEXT_TOOL (active_tool))
+    {
+      if (gimp_text_tool_set_layer (GIMP_TEXT_TOOL (active_tool), layer))
+        {
+          GimpDisplayShell *shell;
+
+          shell = gimp_display_get_shell (active_tool->display);
+          gtk_widget_grab_focus (shell->canvas);
+        }
+    }
+}
+
+void
+layers_edit_attributes_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+#define EDIT_DIALOG_KEY "gimp-layer-edit-attributes-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (layer), EDIT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpItem *item = GIMP_ITEM (layer);
+
+      dialog = layer_options_dialog_new (gimp_item_get_image (GIMP_ITEM (layer)),
+                                         layer,
+                                         action_data_get_context (data),
+                                         widget,
+                                         _("Layer Attributes"),
+                                         "gimp-layer-edit",
+                                         GIMP_ICON_EDIT,
+                                         _("Edit Layer Attributes"),
+                                         GIMP_HELP_LAYER_EDIT,
+                                         gimp_object_get_name (layer),
+                                         gimp_layer_get_mode (layer),
+                                         gimp_layer_get_blend_space (layer),
+                                         gimp_layer_get_composite_space (layer),
+                                         gimp_layer_get_composite_mode (layer),
+                                         gimp_layer_get_opacity (layer),
+                                         0 /* unused */,
+                                         gimp_item_get_visible (item),
+                                         gimp_item_get_linked (item),
+                                         gimp_item_get_color_tag (item),
+                                         gimp_item_get_lock_content (item),
+                                         gimp_item_get_lock_position (item),
+                                         gimp_layer_get_lock_alpha (layer),
+                                         layers_edit_attributes_callback,
+                                         NULL);
+
+      dialogs_attach_dialog (G_OBJECT (layer), EDIT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+layers_new_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GimpLayer *floating_sel;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  /*  If there is a floating selection, the new command transforms
+   *  the current fs into a new layer
+   */
+  if ((floating_sel = gimp_image_get_floating_selection (image)))
+    {
+      GError *error = NULL;
+
+      if (! floating_sel_to_layer (floating_sel, &error))
+        {
+          gimp_message_literal (image->gimp,
+                                G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                                error->message);
+          g_clear_error (&error);
+          return;
+        }
+
+      gimp_image_flush (image);
+      return;
+    }
+
+#define NEW_DIALOG_KEY "gimp-layer-new-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), NEW_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config     = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GimpLayerMode     layer_mode = config->layer_new_mode;
+
+      if (layer_mode == GIMP_LAYER_MODE_NORMAL ||
+          layer_mode == GIMP_LAYER_MODE_NORMAL_LEGACY)
+        {
+          layer_mode = gimp_image_get_default_new_layer_mode (image);
+        }
+
+      dialog = layer_options_dialog_new (image, NULL,
+                                         action_data_get_context (data),
+                                         widget,
+                                         _("New Layer"),
+                                         "gimp-layer-new",
+                                         GIMP_ICON_LAYER,
+                                         _("Create a New Layer"),
+                                         GIMP_HELP_LAYER_NEW,
+                                         config->layer_new_name,
+                                         layer_mode,
+                                         config->layer_new_blend_space,
+                                         config->layer_new_composite_space,
+                                         config->layer_new_composite_mode,
+                                         config->layer_new_opacity,
+                                         config->layer_new_fill_type,
+                                         TRUE,
+                                         FALSE,
+                                         GIMP_COLOR_TAG_NONE,
+                                         FALSE,
+                                         FALSE,
+                                         FALSE,
+                                         layers_new_callback,
+                                         NULL);
+
+      dialogs_attach_dialog (G_OBJECT (image), NEW_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+layers_new_last_vals_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpImage        *image;
+  GtkWidget        *widget;
+  GimpLayer        *layer;
+  GimpDialogConfig *config;
+  GimpLayerMode     layer_mode;
+
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  /*  If there is a floating selection, the new command transforms
+   *  the current fs into a new layer
+   */
+  if (gimp_image_get_floating_selection (image))
+    {
+      layers_new_cmd_callback (action, value, data);
+      return;
+    }
+
+  layer_mode = config->layer_new_mode;
+
+  if (layer_mode == GIMP_LAYER_MODE_NORMAL ||
+      layer_mode == GIMP_LAYER_MODE_NORMAL_LEGACY)
+    {
+      layer_mode = gimp_image_get_default_new_layer_mode (image);
+    }
+
+  layer = gimp_layer_new (image,
+                          gimp_image_get_width  (image),
+                          gimp_image_get_height (image),
+                          gimp_image_get_layer_format (image, TRUE),
+                          config->layer_new_name,
+                          config->layer_new_opacity,
+                          layer_mode);
+
+  gimp_drawable_fill (GIMP_DRAWABLE (layer),
+                      action_data_get_context (data),
+                      config->layer_new_fill_type);
+  gimp_layer_set_blend_space (layer,
+                              config->layer_new_blend_space, FALSE);
+  gimp_layer_set_composite_space (layer,
+                                  config->layer_new_composite_space, FALSE);
+  gimp_layer_set_composite_mode (layer,
+                                 config->layer_new_composite_mode, FALSE);
+
+  gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+layers_new_from_visible_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage        *image;
+  GimpDisplayShell *shell;
+  GimpLayer        *layer;
+  GimpPickable     *pickable;
+  GimpColorProfile *profile;
+  return_if_no_image (image, data);
+  return_if_no_shell (shell, data);
+
+  pickable = gimp_display_shell_get_canvas_pickable (shell);
+
+  gimp_pickable_flush (pickable);
+
+  profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+  layer = gimp_layer_new_from_gegl_buffer (gimp_pickable_get_buffer (pickable),
+                                           image,
+                                           gimp_image_get_layer_format (image,
+                                                                        TRUE),
+                                           _("Visible"),
+                                           GIMP_OPACITY_OPAQUE,
+                                           gimp_image_get_default_new_layer_mode (image),
+                                           profile);
+
+  gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+layers_new_group_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_image (image, data);
+
+  layer = gimp_group_layer_new (image);
+
+  gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+layers_select_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage            *image;
+  GimpLayer            *layer;
+  GimpContainer        *container;
+  GimpLayer            *new_layer;
+  GimpActionSelectType  select_type;
+  return_if_no_image (image, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  layer = gimp_image_get_active_layer (image);
+
+  if (layer)
+    container = gimp_item_get_container (GIMP_ITEM (layer));
+  else
+    container = gimp_image_get_layers (image);
+
+  new_layer = (GimpLayer *) action_select_object (select_type,
+                                                  container,
+                                                  (GimpObject *) layer);
+
+  if (new_layer && new_layer != layer)
+    {
+      gimp_image_set_active_layer (image, new_layer);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_raise_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_image_raise_item (image, GIMP_ITEM (layer), NULL);
+  gimp_image_flush (image);
+}
+
+void
+layers_raise_to_top_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_image_raise_item_to_top (image, GIMP_ITEM (layer));
+  gimp_image_flush (image);
+}
+
+void
+layers_lower_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_image_lower_item (image, GIMP_ITEM (layer), NULL);
+  gimp_image_flush (image);
+}
+
+void
+layers_lower_to_bottom_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_image_lower_item_to_bottom (image, GIMP_ITEM (layer));
+  gimp_image_flush (image);
+}
+
+void
+layers_duplicate_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GimpLayer *new_layer;
+  return_if_no_layer (image, layer, data);
+
+  new_layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (layer),
+                                               G_TYPE_FROM_INSTANCE (layer)));
+
+  /*  use the actual parent here, not GIMP_IMAGE_ACTIVE_PARENT because
+   *  the latter would add a duplicated group inside itself instead of
+   *  above it
+   */
+  gimp_image_add_layer (image, new_layer,
+                        gimp_layer_get_parent (layer), -1,
+                        TRUE);
+  gimp_image_flush (image);
+}
+
+void
+layers_anchor_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (gimp_layer_is_floating_sel (layer))
+    {
+      floating_sel_anchor (layer);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_merge_down_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage   *image;
+  GimpLayer   *layer;
+  GimpDisplay *display;
+  return_if_no_layer (image, layer, data);
+  return_if_no_display (display, data);
+
+  gimp_image_merge_down (image, layer, action_data_get_context (data),
+                         GIMP_EXPAND_AS_NECESSARY,
+                         GIMP_PROGRESS (display), NULL);
+  gimp_image_flush (image);
+}
+
+void
+layers_merge_group_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_image_merge_group_layer (image, GIMP_GROUP_LAYER (layer));
+  gimp_image_flush (image);
+}
+
+void
+layers_delete_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_image_remove_layer (image, layer, TRUE, NULL);
+  gimp_image_flush (image);
+}
+
+void
+layers_text_discard_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (GIMP_IS_TEXT_LAYER (layer))
+    gimp_text_layer_discard (GIMP_TEXT_LAYER (layer));
+}
+
+void
+layers_text_to_vectors_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (GIMP_IS_TEXT_LAYER (layer))
+    {
+      GimpVectors *vectors;
+      gint         x, y;
+
+      vectors = gimp_text_vectors_new (image, GIMP_TEXT_LAYER (layer)->text);
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
+      gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
+
+      gimp_image_add_vectors (image, vectors,
+                              GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_text_along_vectors_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpImage   *image;
+  GimpLayer   *layer;
+  GimpVectors *vectors;
+  return_if_no_layer (image, layer, data);
+  return_if_no_vectors (image, vectors, data);
+
+  if (GIMP_IS_TEXT_LAYER (layer))
+    {
+      gdouble      box_width;
+      gdouble      box_height;
+      GimpVectors *new_vectors;
+      gdouble      offset;
+
+      box_width  = gimp_item_get_width  (GIMP_ITEM (layer));
+      box_height = gimp_item_get_height (GIMP_ITEM (layer));
+
+      new_vectors = gimp_text_vectors_new (image, GIMP_TEXT_LAYER (layer)->text);
+
+      offset = 0;
+      switch (GIMP_TEXT_LAYER (layer)->text->base_dir)
+        {
+        case GIMP_TEXT_DIRECTION_LTR:
+        case GIMP_TEXT_DIRECTION_RTL:
+          offset = 0.5 * box_height;
+          break;
+        case GIMP_TEXT_DIRECTION_TTB_RTL:
+        case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+        case GIMP_TEXT_DIRECTION_TTB_LTR:
+        case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+          {
+            GimpStroke *stroke = NULL;
+
+            while ((stroke = gimp_vectors_stroke_get_next (new_vectors, stroke)))
+              {
+                gimp_stroke_rotate (stroke, 0, 0, 270);
+                gimp_stroke_translate (stroke, 0, box_width);
+              }
+          }
+          offset = 0.5 * box_width;
+          break;
+        }
+
+
+      gimp_vectors_warp_vectors (vectors, new_vectors, offset);
+
+      gimp_item_set_visible (GIMP_ITEM (new_vectors), TRUE, FALSE);
+
+      gimp_image_add_vectors (image, new_vectors,
+                              GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_resize_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+#define RESIZE_DIALOG_KEY "gimp-resize-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (layer), RESIZE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config  = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GimpDisplay      *display = NULL;
+
+      if (GIMP_IS_IMAGE_WINDOW (data))
+        display = action_data_get_display (data);
+
+      if (layer_resize_unit != GIMP_UNIT_PERCENT && display)
+        layer_resize_unit = gimp_display_get_shell (display)->unit;
+
+      dialog = resize_dialog_new (GIMP_VIEWABLE (layer),
+                                  action_data_get_context (data),
+                                  _("Set Layer Boundary Size"),
+                                  "gimp-layer-resize",
+                                  widget,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_LAYER_RESIZE,
+                                  layer_resize_unit,
+                                  config->layer_resize_fill_type,
+                                  GIMP_ITEM_SET_NONE,
+                                  FALSE,
+                                  layers_resize_callback,
+                                  NULL);
+
+      dialogs_attach_dialog (G_OBJECT (layer), RESIZE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+layers_resize_to_image_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  gimp_layer_resize_to_image (layer,
+                              action_data_get_context (data),
+                              GIMP_FILL_TRANSPARENT);
+  gimp_image_flush (image);
+}
+
+void
+layers_scale_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+#define SCALE_DIALOG_KEY "gimp-scale-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (layer), SCALE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDisplay *display = NULL;
+
+      if (GIMP_IS_IMAGE_WINDOW (data))
+        display = action_data_get_display (data);
+
+      if (layer_scale_unit != GIMP_UNIT_PERCENT && display)
+        layer_scale_unit = gimp_display_get_shell (display)->unit;
+
+      if (layer_scale_interp == -1)
+        layer_scale_interp = image->gimp->config->interpolation_type;
+
+      dialog = scale_dialog_new (GIMP_VIEWABLE (layer),
+                                 action_data_get_context (data),
+                                 _("Scale Layer"), "gimp-layer-scale",
+                                 widget,
+                                 gimp_standard_help_func, GIMP_HELP_LAYER_SCALE,
+                                 layer_scale_unit,
+                                 layer_scale_interp,
+                                 layers_scale_callback,
+                                 display);
+
+      dialogs_attach_dialog (G_OBJECT (layer), SCALE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+layers_crop_to_selection_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  gint       x, y;
+  gint       width, height;
+  gint       off_x, off_y;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+  if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                          &x, &y, &width, &height))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            _("Cannot crop because the current selection "
+                              "is empty."));
+      return;
+    }
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+  off_x -= x;
+  off_y -= y;
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
+                               _("Crop Layer to Selection"));
+
+  gimp_item_resize (GIMP_ITEM (layer),
+                    action_data_get_context (data), GIMP_FILL_TRANSPARENT,
+                    width, height, off_x, off_y);
+
+  gimp_image_undo_group_end (image);
+  gimp_image_flush (image);
+}
+
+void
+layers_crop_to_content_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  gint       x, y;
+  gint       width, height;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+  switch (gimp_pickable_auto_shrink (GIMP_PICKABLE (layer),
+                                     0, 0,
+                                     gimp_item_get_width  (GIMP_ITEM (layer)),
+                                     gimp_item_get_height (GIMP_ITEM (layer)),
+                                     &x, &y, &width, &height))
+    {
+    case GIMP_AUTO_SHRINK_SHRINK:
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
+                                   _("Crop Layer to Content"));
+
+      gimp_item_resize (GIMP_ITEM (layer),
+                        action_data_get_context (data), GIMP_FILL_TRANSPARENT,
+                        width, height, -x, -y);
+
+      gimp_image_undo_group_end (image);
+      gimp_image_flush (image);
+      break;
+
+    case GIMP_AUTO_SHRINK_EMPTY:
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_INFO,
+                            _("Cannot crop because the active layer "
+                              "has no content."));
+      break;
+
+    case GIMP_AUTO_SHRINK_UNSHRINKABLE:
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_INFO,
+                            _("Cannot crop because the active layer "
+                              "is already cropped to its content."));
+      break;
+    }
+}
+
+void
+layers_mask_add_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+  if (gimp_layer_get_mask (layer))
+    return;
+
+#define ADD_MASK_DIALOG_KEY "gimp-add-mask-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (layer), ADD_MASK_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      dialog = layer_add_mask_dialog_new (layer, action_data_get_context (data),
+                                          widget,
+                                          config->layer_add_mask_type,
+                                          config->layer_add_mask_invert,
+                                          layers_add_mask_callback,
+                                          NULL);
+
+      dialogs_attach_dialog (G_OBJECT (layer), ADD_MASK_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+layers_mask_add_last_vals_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpImage        *image;
+  GimpLayer        *layer;
+  GtkWidget        *widget;
+  GimpDialogConfig *config;
+  GimpChannel      *channel = NULL;
+  GimpLayerMask    *mask;
+  return_if_no_layer (image, layer, data);
+  return_if_no_widget (widget, data);
+
+  if (gimp_layer_get_mask (layer))
+    return;
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  if (config->layer_add_mask_type == GIMP_ADD_MASK_CHANNEL)
+    {
+      channel = gimp_image_get_active_channel (image);
+
+      if (! channel)
+        {
+          GimpContainer *channels = gimp_image_get_channels (image);
+
+          channel = GIMP_CHANNEL (gimp_container_get_first_child (channels));
+        }
+
+      if (! channel)
+        {
+          layers_mask_add_cmd_callback (action, value, data);
+          return;
+        }
+    }
+
+  mask = gimp_layer_create_mask (layer,
+                                 config->layer_add_mask_type,
+                                 channel);
+
+  if (config->layer_add_mask_invert)
+    gimp_channel_invert (GIMP_CHANNEL (mask), FALSE);
+
+  gimp_layer_add_mask (layer, mask, TRUE, NULL);
+  gimp_image_flush (image);
+}
+
+void
+layers_mask_apply_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (gimp_layer_get_mask (layer))
+    {
+      GimpMaskApplyMode mode = (GimpMaskApplyMode) g_variant_get_int32 (value);
+
+      gimp_layer_apply_mask (layer, mode, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_mask_edit_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (gimp_layer_get_mask (layer))
+    {
+      gboolean active = g_variant_get_boolean (value);
+
+      gimp_layer_set_edit_mask (layer, active);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_mask_show_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (gimp_layer_get_mask (layer))
+    {
+      gboolean active = g_variant_get_boolean (value);
+
+      gimp_layer_set_show_mask (layer, active, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_mask_disable_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (gimp_layer_get_mask (layer))
+    {
+      gboolean active = g_variant_get_boolean (value);
+
+      gimp_layer_set_apply_mask (layer, ! active, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_mask_to_selection_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpImage     *image;
+  GimpLayer     *layer;
+  GimpLayerMask *mask;
+  return_if_no_layer (image, layer, data);
+
+  mask = gimp_layer_get_mask (layer);
+
+  if (mask)
+    {
+      GimpChannelOps operation = (GimpChannelOps) g_variant_get_int32 (value);
+
+      gimp_item_to_selection (GIMP_ITEM (mask), operation,
+                              TRUE, FALSE, 0.0, 0.0);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_alpha_add_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    {
+      gimp_layer_add_alpha (layer);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_alpha_remove_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  if (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    {
+      gimp_layer_remove_alpha (layer, action_data_get_context (data));
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_alpha_to_selection_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpImage      *image;
+  GimpLayer      *layer;
+  GimpChannelOps  operation;
+  return_if_no_layer (image, layer, data);
+
+  operation = (GimpChannelOps) g_variant_get_int32 (value);
+
+  gimp_item_to_selection (GIMP_ITEM (layer), operation,
+                          TRUE, FALSE, 0.0, 0.0);
+  gimp_image_flush (image);
+}
+
+void
+layers_opacity_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage            *image;
+  GimpLayer            *layer;
+  gdouble               opacity;
+  GimpUndo             *undo;
+  GimpActionSelectType  select_type;
+  gboolean              push_undo = TRUE;
+  return_if_no_layer (image, layer, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                       GIMP_UNDO_LAYER_OPACITY);
+
+  if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+    push_undo = FALSE;
+
+  opacity = action_select_value (select_type,
+                                 gimp_layer_get_opacity (layer),
+                                 0.0, 1.0, 1.0,
+                                 1.0 / 255.0, 0.01, 0.1, 0.0, FALSE);
+  gimp_layer_set_opacity (layer, opacity, push_undo);
+  gimp_image_flush (image);
+}
+
+void
+layers_mode_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpImage            *image;
+  GimpLayer            *layer;
+  GimpLayerMode        *modes;
+  gint                  n_modes;
+  GimpLayerMode         layer_mode;
+  gint                  index;
+  GimpUndo             *undo;
+  GimpActionSelectType  select_type;
+  gboolean              push_undo = TRUE;
+  return_if_no_layer (image, layer, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                       GIMP_UNDO_LAYER_MODE);
+
+  if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+    push_undo = FALSE;
+
+  layer_mode = gimp_layer_get_mode (layer);
+
+  modes = gimp_layer_mode_get_context_array (layer_mode,
+                                             GIMP_LAYER_MODE_CONTEXT_LAYER,
+                                             &n_modes);
+  index = layers_mode_index (layer_mode, modes, n_modes);
+  index = action_select_value (select_type,
+                               index, 0, n_modes - 1, 0,
+                               0.0, 1.0, 1.0, 0.0, FALSE);
+  layer_mode = modes[index];
+  g_free (modes);
+
+  gimp_layer_set_mode (layer, layer_mode, push_undo);
+  gimp_image_flush (image);
+}
+
+void
+layers_blend_space_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpImage           *image;
+  GimpLayer           *layer;
+  GimpLayerColorSpace  blend_space;
+  return_if_no_layer (image, layer, data);
+
+  blend_space = (GimpLayerColorSpace) g_variant_get_int32 (value);
+
+  if (blend_space != gimp_layer_get_blend_space (layer))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_LAYER_PROP_UNDO,
+                                           GIMP_UNDO_LAYER_MODE);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+        push_undo = FALSE;
+
+      gimp_layer_set_blend_space (layer, blend_space, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_composite_space_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage           *image;
+  GimpLayer           *layer;
+  GimpLayerColorSpace  composite_space;
+  return_if_no_layer (image, layer, data);
+
+  composite_space = (GimpLayerColorSpace) g_variant_get_int32 (value);
+
+  if (composite_space != gimp_layer_get_composite_space (layer))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_LAYER_PROP_UNDO,
+                                           GIMP_UNDO_LAYER_MODE);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+        push_undo = FALSE;
+
+      gimp_layer_set_composite_space (layer, composite_space, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_composite_mode_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage              *image;
+  GimpLayer              *layer;
+  GimpLayerCompositeMode  composite_mode;
+  return_if_no_layer (image, layer, data);
+
+  composite_mode = (GimpLayerCompositeMode) g_variant_get_int32 (value);
+
+  if (composite_mode != gimp_layer_get_composite_mode (layer))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_LAYER_PROP_UNDO,
+                                           GIMP_UNDO_LAYER_MODE);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+        push_undo = FALSE;
+
+      gimp_layer_set_composite_mode (layer, composite_mode, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_visible_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer   data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  items_visible_cmd_callback (action, value, image, GIMP_ITEM (layer));
+}
+
+void
+layers_linked_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  items_linked_cmd_callback (action, value, image, GIMP_ITEM (layer));
+}
+
+void
+layers_lock_content_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  items_lock_content_cmd_callback (action, value, image, GIMP_ITEM (layer));
+}
+
+void
+layers_lock_position_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  return_if_no_layer (image, layer, data);
+
+  items_lock_position_cmd_callback (action, value, image, GIMP_ITEM (layer));
+}
+
+void
+layers_lock_alpha_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  gboolean   lock_alpha;
+  return_if_no_layer (image, layer, data);
+
+  lock_alpha = g_variant_get_boolean (value);
+
+  if (lock_alpha != gimp_layer_get_lock_alpha (layer))
+    {
+      GimpUndo *undo;
+      gboolean  push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                           GIMP_UNDO_LAYER_LOCK_ALPHA);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+        push_undo = FALSE;
+
+      gimp_layer_set_lock_alpha (layer, lock_alpha, push_undo);
+      gimp_image_flush (image);
+    }
+}
+
+void
+layers_color_tag_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpImage    *image;
+  GimpLayer    *layer;
+  GimpColorTag  color_tag;
+  return_if_no_layer (image, layer, data);
+
+  color_tag = (GimpColorTag) g_variant_get_int32 (value);
+
+  items_color_tag_cmd_callback (action, image, GIMP_ITEM (layer),
+                                color_tag);
+}
+
+
+/*  private functions  */
+
+static void
+layers_new_callback (GtkWidget              *dialog,
+                     GimpImage              *image,
+                     GimpLayer              *layer,
+                     GimpContext            *context,
+                     const gchar            *layer_name,
+                     GimpLayerMode           layer_mode,
+                     GimpLayerColorSpace     layer_blend_space,
+                     GimpLayerColorSpace     layer_composite_space,
+                     GimpLayerCompositeMode  layer_composite_mode,
+                     gdouble                 layer_opacity,
+                     GimpFillType            layer_fill_type,
+                     gint                    layer_width,
+                     gint                    layer_height,
+                     gint                    layer_offset_x,
+                     gint                    layer_offset_y,
+                     gboolean                layer_visible,
+                     gboolean                layer_linked,
+                     GimpColorTag            layer_color_tag,
+                     gboolean                layer_lock_pixels,
+                     gboolean                layer_lock_position,
+                     gboolean                layer_lock_alpha,
+                     gboolean                rename_text_layer, /* unused */
+                     gpointer                user_data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  g_object_set (config,
+                "layer-new-name",            layer_name,
+                "layer-new-mode",            layer_mode,
+                "layer-new-blend-space",     layer_blend_space,
+                "layer-new-composite-space", layer_composite_space,
+                "layer-new-composite-mode",  layer_composite_mode,
+                "layer-new-opacity",         layer_opacity,
+                "layer-new-fill-type",       layer_fill_type,
+                NULL);
+
+  layer = gimp_layer_new (image, layer_width, layer_height,
+                          gimp_image_get_layer_format (image, TRUE),
+                          config->layer_new_name,
+                          config->layer_new_opacity,
+                          config->layer_new_mode);
+
+  if (layer)
+    {
+      gimp_item_set_offset (GIMP_ITEM (layer), layer_offset_x, layer_offset_y);
+      gimp_drawable_fill (GIMP_DRAWABLE (layer), context,
+                          config->layer_new_fill_type);
+      gimp_item_set_visible (GIMP_ITEM (layer), layer_visible, FALSE);
+      gimp_item_set_linked (GIMP_ITEM (layer), layer_linked, FALSE);
+      gimp_item_set_color_tag (GIMP_ITEM (layer), layer_color_tag, FALSE);
+      gimp_item_set_lock_content (GIMP_ITEM (layer), layer_lock_pixels,
+                                  FALSE);
+      gimp_item_set_lock_position (GIMP_ITEM (layer), layer_lock_position,
+                                   FALSE);
+      gimp_layer_set_lock_alpha (layer, layer_lock_alpha, FALSE);
+      gimp_layer_set_blend_space (layer, layer_blend_space, FALSE);
+      gimp_layer_set_composite_space (layer, layer_composite_space, FALSE);
+      gimp_layer_set_composite_mode (layer, layer_composite_mode, FALSE);
+
+      gimp_image_add_layer (image, layer,
+                            GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+      gimp_image_flush (image);
+    }
+  else
+    {
+      g_warning ("%s: could not allocate new layer", G_STRFUNC);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+layers_edit_attributes_callback (GtkWidget              *dialog,
+                                 GimpImage              *image,
+                                 GimpLayer              *layer,
+                                 GimpContext            *context,
+                                 const gchar            *layer_name,
+                                 GimpLayerMode           layer_mode,
+                                 GimpLayerColorSpace     layer_blend_space,
+                                 GimpLayerColorSpace     layer_composite_space,
+                                 GimpLayerCompositeMode  layer_composite_mode,
+                                 gdouble                 layer_opacity,
+                                 GimpFillType            unused1,
+                                 gint                    unused2,
+                                 gint                    unused3,
+                                 gint                    layer_offset_x,
+                                 gint                    layer_offset_y,
+                                 gboolean                layer_visible,
+                                 gboolean                layer_linked,
+                                 GimpColorTag            layer_color_tag,
+                                 gboolean                layer_lock_pixels,
+                                 gboolean                layer_lock_position,
+                                 gboolean                layer_lock_alpha,
+                                 gboolean                rename_text_layer,
+                                 gpointer                user_data)
+{
+  GimpItem *item = GIMP_ITEM (layer);
+
+  if (strcmp (layer_name, gimp_object_get_name (layer))               ||
+      layer_mode            != gimp_layer_get_mode (layer)            ||
+      layer_blend_space     != gimp_layer_get_blend_space (layer)     ||
+      layer_composite_space != gimp_layer_get_composite_space (layer) ||
+      layer_composite_mode  != gimp_layer_get_composite_mode (layer)  ||
+      layer_opacity         != gimp_layer_get_opacity (layer)         ||
+      layer_offset_x        != gimp_item_get_offset_x (item)          ||
+      layer_offset_y        != gimp_item_get_offset_y (item)          ||
+      layer_visible         != gimp_item_get_visible (item)           ||
+      layer_linked          != gimp_item_get_linked (item)            ||
+      layer_color_tag       != gimp_item_get_color_tag (item)         ||
+      layer_lock_pixels     != gimp_item_get_lock_content (item)      ||
+      layer_lock_position   != gimp_item_get_lock_position (item)     ||
+      layer_lock_alpha      != gimp_layer_get_lock_alpha (layer))
+    {
+      gimp_image_undo_group_start (image,
+                                   GIMP_UNDO_GROUP_ITEM_PROPERTIES,
+                                   _("Layer Attributes"));
+
+      if (strcmp (layer_name, gimp_object_get_name (layer)))
+        {
+          GError *error = NULL;
+
+          if (! gimp_item_rename (GIMP_ITEM (layer), layer_name, &error))
+            {
+              gimp_message_literal (image->gimp,
+                                    G_OBJECT (dialog), GIMP_MESSAGE_WARNING,
+                                    error->message);
+              g_clear_error (&error);
+            }
+        }
+
+      if (layer_mode != gimp_layer_get_mode (layer))
+        gimp_layer_set_mode (layer, layer_mode, TRUE);
+
+      if (layer_blend_space != gimp_layer_get_blend_space (layer))
+        gimp_layer_set_blend_space (layer, layer_blend_space, TRUE);
+
+      if (layer_composite_space != gimp_layer_get_composite_space (layer))
+        gimp_layer_set_composite_space (layer, layer_composite_space, TRUE);
+
+      if (layer_composite_mode != gimp_layer_get_composite_mode (layer))
+        gimp_layer_set_composite_mode (layer, layer_composite_mode, TRUE);
+
+      if (layer_opacity != gimp_layer_get_opacity (layer))
+        gimp_layer_set_opacity (layer, layer_opacity, TRUE);
+
+      if (layer_offset_x != gimp_item_get_offset_x (item) ||
+          layer_offset_y != gimp_item_get_offset_y (item))
+        {
+          gimp_item_translate (item,
+                               layer_offset_x - gimp_item_get_offset_x (item),
+                               layer_offset_y - gimp_item_get_offset_y (item),
+                               TRUE);
+        }
+
+      if (layer_visible != gimp_item_get_visible (item))
+        gimp_item_set_visible (item, layer_visible, TRUE);
+
+      if (layer_linked != gimp_item_get_linked (item))
+        gimp_item_set_linked (item, layer_linked, TRUE);
+
+      if (layer_color_tag != gimp_item_get_color_tag (item))
+        gimp_item_set_color_tag (item, layer_color_tag, TRUE);
+
+      if (layer_lock_pixels != gimp_item_get_lock_content (item))
+        gimp_item_set_lock_content (item, layer_lock_pixels, TRUE);
+
+      if (layer_lock_position != gimp_item_get_lock_position (item))
+        gimp_item_set_lock_position (item, layer_lock_position, TRUE);
+
+      if (layer_lock_alpha != gimp_layer_get_lock_alpha (layer))
+        gimp_layer_set_lock_alpha (layer, layer_lock_alpha, TRUE);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+
+  if (gimp_item_is_text_layer (GIMP_ITEM (layer)))
+    {
+      g_object_set (layer,
+                    "auto-rename", rename_text_layer,
+                    NULL);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+layers_add_mask_callback (GtkWidget       *dialog,
+                          GimpLayer       *layer,
+                          GimpAddMaskType  add_mask_type,
+                          GimpChannel     *channel,
+                          gboolean         invert,
+                          gpointer         user_data)
+{
+  GimpImage        *image  = gimp_item_get_image (GIMP_ITEM (layer));
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GimpLayerMask    *mask;
+  GError           *error = NULL;
+
+  g_object_set (config,
+                "layer-add-mask-type",   add_mask_type,
+                "layer-add-mask-invert", invert,
+                NULL);
+
+  mask = gimp_layer_create_mask (layer,
+                                 config->layer_add_mask_type,
+                                 channel);
+
+  if (config->layer_add_mask_invert)
+    gimp_channel_invert (GIMP_CHANNEL (mask), FALSE);
+
+  if (! gimp_layer_add_mask (layer, mask, TRUE, &error))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (dialog), GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_object_unref (mask);
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+layers_scale_callback (GtkWidget             *dialog,
+                       GimpViewable          *viewable,
+                       gint                   width,
+                       gint                   height,
+                       GimpUnit               unit,
+                       GimpInterpolationType  interpolation,
+                       gdouble                xresolution,    /* unused */
+                       gdouble                yresolution,    /* unused */
+                       GimpUnit               resolution_unit,/* unused */
+                       gpointer               user_data)
+{
+  GimpDisplay *display = GIMP_DISPLAY (user_data);
+
+  layer_scale_unit   = unit;
+  layer_scale_interp = interpolation;
+
+  if (width > 0 && height > 0)
+    {
+      GimpItem     *item = GIMP_ITEM (viewable);
+      GimpProgress *progress;
+      GtkWidget    *progress_dialog = NULL;
+
+      gtk_widget_destroy (dialog);
+
+      if (width  == gimp_item_get_width  (item) &&
+          height == gimp_item_get_height (item))
+        return;
+
+      if (display)
+        {
+          progress = GIMP_PROGRESS (display);
+        }
+      else
+        {
+          progress_dialog = gimp_progress_dialog_new ();
+          progress = GIMP_PROGRESS (progress_dialog);
+        }
+
+      progress = gimp_progress_start (progress, FALSE, _("Scaling"));
+
+      gimp_item_scale_by_origin (item,
+                                 width, height, interpolation,
+                                 progress, TRUE);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      if (progress_dialog)
+        gtk_widget_destroy (progress_dialog);
+
+      gimp_image_flush (gimp_item_get_image (item));
+    }
+  else
+    {
+      g_warning ("Scale Error: "
+                 "Both width and height must be greater than zero.");
+    }
+}
+
+static void
+layers_resize_callback (GtkWidget    *dialog,
+                        GimpViewable *viewable,
+                        GimpContext  *context,
+                        gint          width,
+                        gint          height,
+                        GimpUnit      unit,
+                        gint          offset_x,
+                        gint          offset_y,
+                        gdouble       unused0,
+                        gdouble       unused1,
+                        GimpUnit      unused2,
+                        GimpFillType  fill_type,
+                        GimpItemSet   unused3,
+                        gboolean      unused4,
+                        gpointer      user_data)
+{
+  layer_resize_unit = unit;
+
+  if (width > 0 && height > 0)
+    {
+      GimpItem         *item   = GIMP_ITEM (viewable);
+      GimpImage        *image  = gimp_item_get_image (item);
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      g_object_set (config,
+                    "layer-resize-fill-type", fill_type,
+                    NULL);
+
+      gtk_widget_destroy (dialog);
+
+      if (width  == gimp_item_get_width  (item) &&
+          height == gimp_item_get_height (item))
+        return;
+
+      gimp_item_resize (item, context, fill_type,
+                        width, height, offset_x, offset_y);
+      gimp_image_flush (gimp_item_get_image (item));
+    }
+  else
+    {
+      g_warning ("Resize Error: "
+                 "Both width and height must be greater than zero.");
+    }
+}
+
+static gint
+layers_mode_index (GimpLayerMode         layer_mode,
+                   const GimpLayerMode  *modes,
+                   gint                  n_modes)
+{
+  gint i = 0;
+
+  while (i < (n_modes - 1) && modes[i] != layer_mode)
+    i++;
+
+  return i;
+}
diff --git a/app/actions/layers-commands.h b/app/actions/layers-commands.h
new file mode 100644
index 0000000..7a8b181
--- /dev/null
+++ b/app/actions/layers-commands.h
@@ -0,0 +1,173 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LAYERS_COMMANDS_H__
+#define __LAYERS_COMMANDS_H__
+
+
+void   layers_edit_cmd_callback               (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_edit_text_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_edit_attributes_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_new_cmd_callback                (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_new_last_vals_cmd_callback      (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_new_from_visible_cmd_callback   (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_new_group_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_select_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_raise_cmd_callback              (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_raise_to_top_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_lower_cmd_callback              (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_lower_to_bottom_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_duplicate_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_anchor_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_merge_down_cmd_callback         (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_merge_group_cmd_callback        (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_delete_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_text_discard_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_text_to_vectors_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_text_along_vectors_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_resize_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_resize_to_image_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_scale_cmd_callback              (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_crop_to_selection_cmd_callback  (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_crop_to_content_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_mask_add_cmd_callback           (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mask_add_last_vals_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mask_apply_cmd_callback         (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mask_edit_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mask_show_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mask_disable_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mask_to_selection_cmd_callback  (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_alpha_add_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_alpha_remove_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_alpha_to_selection_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_opacity_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_mode_cmd_callback               (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_blend_space_cmd_callback        (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_composite_space_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_composite_mode_cmd_callback     (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_visible_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_linked_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_lock_content_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_lock_position_cmd_callback      (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   layers_lock_alpha_cmd_callback         (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+void   layers_color_tag_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+
+#endif /* __LAYERS_COMMANDS_H__ */
diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c
new file mode 100644
index 0000000..0f39df3
--- /dev/null
+++ b/app/actions/mypaint-brushes-actions.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpmybrush.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "mypaint-brushes-actions.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry mypaint_brushes_actions[] =
+{
+  { "mypaint-brushes-popup", GIMP_ICON_MYPAINT_BRUSH,
+    NC_("mypaint-brushes-action", "MyPaint Brushes Menu"), NULL, NULL, NULL,
+    GIMP_HELP_MYPAINT_BRUSH_DIALOG },
+
+  { "mypaint-brushes-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("mypaint-brushes-action", "_New MyPaint Brush"), NULL,
+    NC_("mypaint-brushes-action", "Create a new MyPaint brush"),
+    data_new_cmd_callback,
+    GIMP_HELP_MYPAINT_BRUSH_NEW },
+
+  { "mypaint-brushes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("mypaint-brushes-action", "D_uplicate MyPaint Brush"), NULL,
+    NC_("mypaint-brushes-action", "Duplicate this MyPaint brush"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_MYPAINT_BRUSH_DUPLICATE },
+
+  { "mypaint-brushes-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("mypaint-brushes-action", "Copy MyPaint Brush _Location"), NULL,
+    NC_("mypaint-brushes-action", "Copy MyPaint brush file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_MYPAINT_BRUSH_COPY_LOCATION },
+
+  { "mypaint-brushes-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("mypaint-brushes-action", "Show in _File Manager"), NULL,
+    NC_("mypaint-brushes-action", "Show MyPaint brush file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_MYPAINT_BRUSH_SHOW_IN_FILE_MANAGER },
+
+  { "mypaint-brushes-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("mypaint-brushes-action", "_Delete MyPaint Brush"), NULL,
+    NC_("mypaint-brushes-action", "Delete this MyPaint brush"),
+    data_delete_cmd_callback,
+    GIMP_HELP_MYPAINT_BRUSH_DELETE },
+
+  { "mypaint-brushes-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("mypaint-brushes-action", "_Refresh MyPaint Brushes"), NULL,
+    NC_("mypaint-brushes-action", "Refresh MyPaint brushes"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_MYPAINT_BRUSH_REFRESH }
+};
+
+static const GimpStringActionEntry mypaint_brushes_edit_actions[] =
+{
+  { "mypaint-brushes-edit", GIMP_ICON_EDIT,
+    NC_("mypaint-brushes-action", "_Edit MyPaint Brush..."), NULL,
+    NC_("mypaint-brushes-action", "Edit MyPaint brush"),
+    "gimp-mybrush-editor",
+    GIMP_HELP_MYPAINT_BRUSH_EDIT }
+};
+
+
+void
+mypaint_brushes_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "mypaint-brushes-action",
+                                 mypaint_brushes_actions,
+                                 G_N_ELEMENTS (mypaint_brushes_actions));
+
+  gimp_action_group_add_string_actions (group, "mypaint-brushes-action",
+                                        mypaint_brushes_edit_actions,
+                                        G_N_ELEMENTS (mypaint_brushes_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+mypaint_brushes_actions_update (GimpActionGroup *group,
+                                gpointer         user_data)
+{
+  GimpContext *context = action_data_get_context (user_data);
+  GimpMybrush *brush   = NULL;
+  GimpData    *data    = NULL;
+  GFile       *file    = NULL;
+
+  if (context)
+    {
+      brush = gimp_context_get_mybrush (context);
+
+      if (action_data_sel_count (user_data) > 1)
+        {
+          brush = NULL;
+        }
+
+      if (brush)
+        {
+          data = GIMP_DATA (brush);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("mypaint-brushes-edit",                 brush && FALSE);
+  SET_SENSITIVE ("mypaint-brushes-duplicate",            brush && gimp_data_is_duplicatable (data));
+  SET_SENSITIVE ("mypaint-brushes-copy-location",        file);
+  SET_SENSITIVE ("mypaint-brushes-show-in-file-manager", file);
+  SET_SENSITIVE ("mypaint-brushes-delete",               brush && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/mypaint-brushes-actions.h b/app/actions/mypaint-brushes-actions.h
new file mode 100644
index 0000000..63c93c6
--- /dev/null
+++ b/app/actions/mypaint-brushes-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MYPAINT_BRUSHES_ACTIONS_H__
+#define __MYPAINT_BRUSHES_ACTIONS_H__
+
+
+void   mypaint_brushes_actions_setup  (GimpActionGroup *group);
+void   mypaint_brushes_actions_update (GimpActionGroup *group,
+                                       gpointer         data);
+
+
+#endif /* __MYPAINT_BRUSHES_ACTIONS_H__ */
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
new file mode 100644
index 0000000..1540126
--- /dev/null
+++ b/app/actions/palette-editor-actions.c
@@ -0,0 +1,183 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppaletteeditor.h"
+
+#include "data-editor-commands.h"
+#include "palette-editor-actions.h"
+#include "palette-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry palette_editor_actions[] =
+{
+  { "palette-editor-popup", GIMP_ICON_PALETTE,
+    NC_("palette-editor-action", "Palette Editor Menu"), NULL, NULL, NULL,
+    GIMP_HELP_PALETTE_EDITOR_DIALOG },
+
+  { "palette-editor-edit-color", GIMP_ICON_EDIT,
+    NC_("palette-editor-action", "_Edit Color..."), NULL,
+    NC_("palette-editor-action", "Edit this entry"),
+    palette_editor_edit_color_cmd_callback,
+    GIMP_HELP_PALETTE_EDITOR_EDIT },
+
+  { "palette-editor-delete-color", GIMP_ICON_EDIT_DELETE,
+    NC_("palette-editor-action", "_Delete Color"), NULL,
+    NC_("palette-editor-action", "Delete this entry"),
+    palette_editor_delete_color_cmd_callback,
+    GIMP_HELP_PALETTE_EDITOR_DELETE }
+};
+
+static const GimpToggleActionEntry palette_editor_toggle_actions[] =
+{
+  { "palette-editor-edit-active", GIMP_ICON_LINKED,
+    NC_("palette-editor-action", "Edit Active Palette"), NULL, NULL,
+    data_editor_edit_active_cmd_callback,
+    FALSE,
+    GIMP_HELP_PALETTE_EDITOR_EDIT_ACTIVE }
+};
+
+static const GimpEnumActionEntry palette_editor_new_actions[] =
+{
+  { "palette-editor-new-color-fg", GIMP_ICON_DOCUMENT_NEW,
+    NC_("palette-editor-action", "New Color from _FG"), NULL,
+    NC_("palette-editor-action",
+        "Create a new entry from the foreground color"),
+    FALSE, FALSE,
+    GIMP_HELP_PALETTE_EDITOR_NEW },
+
+  { "palette-editor-new-color-bg", GIMP_ICON_DOCUMENT_NEW,
+    NC_("palette-editor-action", "New Color from _BG"), NULL,
+    NC_("palette-editor-action",
+        "Create a new entry from the background color"),
+    TRUE, FALSE,
+    GIMP_HELP_PALETTE_EDITOR_NEW }
+};
+
+static const GimpEnumActionEntry palette_editor_zoom_actions[] =
+{
+  { "palette-editor-zoom-in", GIMP_ICON_ZOOM_IN,
+    N_("Zoom _In"), NULL,
+    N_("Zoom in"),
+    GIMP_ZOOM_IN, FALSE,
+    GIMP_HELP_PALETTE_EDITOR_ZOOM_IN },
+
+  { "palette-editor-zoom-out", GIMP_ICON_ZOOM_OUT,
+    N_("Zoom _Out"), NULL,
+    N_("Zoom out"),
+    GIMP_ZOOM_OUT, FALSE,
+    GIMP_HELP_PALETTE_EDITOR_ZOOM_OUT },
+
+  { "palette-editor-zoom-all", GIMP_ICON_ZOOM_FIT_BEST,
+    N_("Zoom _All"), NULL,
+    N_("Zoom all"),
+    GIMP_ZOOM_OUT_MAX, FALSE,
+    GIMP_HELP_PALETTE_EDITOR_ZOOM_ALL }
+};
+
+
+void
+palette_editor_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "palette-editor-action",
+                                 palette_editor_actions,
+                                 G_N_ELEMENTS (palette_editor_actions));
+
+  gimp_action_group_add_toggle_actions (group, "palette-editor-action",
+                                        palette_editor_toggle_actions,
+                                        G_N_ELEMENTS (palette_editor_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "palette-editor-action",
+                                      palette_editor_new_actions,
+                                      G_N_ELEMENTS (palette_editor_new_actions),
+                                      palette_editor_new_color_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      palette_editor_zoom_actions,
+                                      G_N_ELEMENTS (palette_editor_zoom_actions),
+                                      palette_editor_zoom_cmd_callback);
+}
+
+void
+palette_editor_actions_update (GimpActionGroup *group,
+                               gpointer         user_data)
+{
+  GimpPaletteEditor *editor      = GIMP_PALETTE_EDITOR (user_data);
+  GimpDataEditor    *data_editor = GIMP_DATA_EDITOR (user_data);
+  GimpData          *data;
+  gboolean           editable    = FALSE;
+  GimpRGB            fg;
+  GimpRGB            bg;
+  gboolean           edit_active = FALSE;
+
+  data = data_editor->data;
+
+  if (data)
+    {
+      if (data_editor->data_editable)
+        editable = TRUE;
+    }
+
+  if (data_editor->context)
+    {
+      gimp_context_get_foreground (data_editor->context, &fg);
+      gimp_context_get_background (data_editor->context, &bg);
+    }
+
+  edit_active = gimp_data_editor_get_edit_active (data_editor);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_COLOR(action,color) \
+        gimp_action_group_set_action_color (group, action, color, FALSE);
+
+  SET_SENSITIVE ("palette-editor-edit-color",   editable && editor->color);
+  SET_SENSITIVE ("palette-editor-delete-color", editable && editor->color);
+
+  SET_SENSITIVE ("palette-editor-new-color-fg", editable);
+  SET_SENSITIVE ("palette-editor-new-color-bg", editable);
+
+  SET_COLOR ("palette-editor-new-color-fg", data_editor->context ? &fg : NULL);
+  SET_COLOR ("palette-editor-new-color-bg", data_editor->context ? &bg : NULL);
+
+  SET_SENSITIVE ("palette-editor-zoom-out", data);
+  SET_SENSITIVE ("palette-editor-zoom-in",  data);
+  SET_SENSITIVE ("palette-editor-zoom-all", data);
+
+  SET_ACTIVE ("palette-editor-edit-active", edit_active);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+#undef SET_COLOR
+}
diff --git a/app/actions/palette-editor-actions.h b/app/actions/palette-editor-actions.h
new file mode 100644
index 0000000..287df8a
--- /dev/null
+++ b/app/actions/palette-editor-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PALETTE_EDITOR_ACTIONS_H__
+#define __PALETTE_EDITOR_ACTIONS_H__
+
+
+void   palette_editor_actions_setup  (GimpActionGroup *group);
+void   palette_editor_actions_update (GimpActionGroup *group,
+                                      gpointer         data);
+
+
+#endif /* __PALETTE_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/palette-editor-commands.c b/app/actions/palette-editor-commands.c
new file mode 100644
index 0000000..55a8c0e
--- /dev/null
+++ b/app/actions/palette-editor-commands.c
@@ -0,0 +1,96 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimppalette.h"
+
+#include "widgets/gimppaletteeditor.h"
+#include "widgets/gimppaletteview.h"
+
+#include "palette-editor-commands.h"
+
+
+/*  public functions  */
+
+void
+palette_editor_edit_color_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
+
+  gimp_palette_editor_edit_color (editor);
+}
+
+void
+palette_editor_new_color_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpPaletteEditor *editor      = GIMP_PALETTE_EDITOR (data);
+  GimpDataEditor    *data_editor = GIMP_DATA_EDITOR (data);
+  gboolean           background  = (gboolean) g_variant_get_int32 (value);
+
+  if (data_editor->data_editable)
+    {
+      GimpPalette      *palette = GIMP_PALETTE (data_editor->data);
+      GimpPaletteEntry *entry;
+      GimpRGB           color;
+
+      if (background)
+        gimp_context_get_background (data_editor->context, &color);
+      else
+        gimp_context_get_foreground (data_editor->context, &color);
+
+      entry = gimp_palette_add_entry (palette, -1, NULL, &color);
+      gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view), entry);
+    }
+}
+
+void
+palette_editor_delete_color_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpPaletteEditor *editor      = GIMP_PALETTE_EDITOR (data);
+  GimpDataEditor    *data_editor = GIMP_DATA_EDITOR (data);
+
+  if (data_editor->data_editable && editor->color)
+    {
+      GimpPalette *palette = GIMP_PALETTE (data_editor->data);
+
+      gimp_palette_delete_entry (palette, editor->color);
+    }
+}
+
+void
+palette_editor_zoom_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpPaletteEditor *editor    = GIMP_PALETTE_EDITOR (data);
+  GimpZoomType       zoom_type = (GimpZoomType) g_variant_get_int32 (value);
+
+  gimp_palette_editor_zoom (editor, zoom_type);
+}
diff --git a/app/actions/palette-editor-commands.h b/app/actions/palette-editor-commands.h
new file mode 100644
index 0000000..29cd43c
--- /dev/null
+++ b/app/actions/palette-editor-commands.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PALETTE_EDITOR_COMMANDS_H__
+#define __PALETTE_EDITOR_COMMANDS_H__
+
+
+void   palette_editor_edit_color_cmd_callback   (GimpAction *action,
+                                                 GVariant   *value,
+                                                 gpointer    data);
+void   palette_editor_new_color_cmd_callback    (GimpAction *action,
+                                                 GVariant   *value,
+                                                 gpointer    data);
+void   palette_editor_delete_color_cmd_callback (GimpAction *action,
+                                                 GVariant   *value,
+                                                 gpointer    data);
+
+void   palette_editor_zoom_cmd_callback         (GimpAction *action,
+                                                 GVariant   *value,
+                                                 gpointer    data);
+
+
+#endif /* __PALETTE_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
new file mode 100644
index 0000000..80dab41
--- /dev/null
+++ b/app/actions/palettes-actions.c
@@ -0,0 +1,159 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "palettes-actions.h"
+#include "palettes-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry palettes_actions[] =
+{
+  { "palettes-popup", GIMP_ICON_PALETTE,
+    NC_("palettes-action", "Palettes Menu"), NULL, NULL, NULL,
+    GIMP_HELP_PALETTE_DIALOG },
+
+  { "palettes-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("palettes-action", "_New Palette"), NULL,
+    NC_("palettes-action", "Create a new palette"),
+    data_new_cmd_callback,
+    GIMP_HELP_PALETTE_NEW },
+
+  { "palettes-import", "gtk-convert",
+    NC_("palettes-action", "_Import Palette..."), NULL,
+    NC_("palettes-action", "Import palette"),
+    palettes_import_cmd_callback,
+    GIMP_HELP_PALETTE_IMPORT },
+
+  { "palettes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("palettes-action", "D_uplicate Palette"), NULL,
+    NC_("palettes-action", "Duplicate this palette"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_PALETTE_DUPLICATE },
+
+  { "palettes-merge", NULL,
+    NC_("palettes-action", "_Merge Palettes..."), NULL,
+    NC_("palettes-action", "Merge palettes"),
+    palettes_merge_cmd_callback,
+    GIMP_HELP_PALETTE_MERGE },
+
+  { "palettes-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("palettes-action", "Copy Palette _Location"), NULL,
+    NC_("palettes-action", "Copy palette file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_PALETTE_COPY_LOCATION },
+
+  { "palettes-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("palettes-action", "Show in _File Manager"), NULL,
+    NC_("palettes-action", "Show palette file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_PALETTE_SHOW_IN_FILE_MANAGER },
+
+  { "palettes-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("palettes-action", "_Delete Palette"), NULL,
+    NC_("palettes-action", "Delete this palette"),
+    data_delete_cmd_callback,
+    GIMP_HELP_PALETTE_DELETE },
+
+  { "palettes-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("palettes-action", "_Refresh Palettes"), NULL,
+    NC_("palettes-action", "Refresh palettes"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_PALETTE_REFRESH }
+};
+
+static const GimpStringActionEntry palettes_edit_actions[] =
+{
+  { "palettes-edit", GIMP_ICON_EDIT,
+    NC_("palettes-action", "_Edit Palette..."), NULL,
+    NC_("palettes-action", "Edit this palette"),
+    "gimp-palette-editor",
+    GIMP_HELP_PALETTE_EDIT }
+};
+
+
+void
+palettes_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "palettes-action",
+                                 palettes_actions,
+                                 G_N_ELEMENTS (palettes_actions));
+
+  gimp_action_group_add_string_actions (group, "palettes-action",
+                                        palettes_edit_actions,
+                                        G_N_ELEMENTS (palettes_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+palettes_actions_update (GimpActionGroup *group,
+                         gpointer         user_data)
+{
+  GimpContext *context   = action_data_get_context (user_data);
+  GimpPalette *palette   = NULL;
+  GimpData    *data      = NULL;
+  GFile       *file      = NULL;
+  gint         sel_count = 0;
+
+  if (context)
+    {
+      palette = gimp_context_get_palette (context);
+
+      sel_count = action_data_sel_count (user_data);
+
+      if (sel_count > 1)
+        {
+          palette = NULL;
+        }
+
+      if (palette)
+        {
+          data = GIMP_DATA (palette);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("palettes-edit",                 palette);
+  SET_SENSITIVE ("palettes-duplicate",            palette && gimp_data_is_duplicatable (data));
+  SET_SENSITIVE ("palettes-merge",                sel_count > 1);
+  SET_SENSITIVE ("palettes-copy-location",        file);
+  SET_SENSITIVE ("palettes-show-in-file-manager", file);
+  SET_SENSITIVE ("palettes-delete",               palette && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/palettes-actions.h b/app/actions/palettes-actions.h
new file mode 100644
index 0000000..4029532
--- /dev/null
+++ b/app/actions/palettes-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PALETTES_ACTIONS_H__
+#define __PALETTES_ACTIONS_H__
+
+
+void   palettes_actions_setup  (GimpActionGroup *group);
+void   palettes_actions_update (GimpActionGroup *group,
+                                gpointer         user_data);
+
+
+#endif /* __PALETTES_ACTIONS_H__ */
diff --git a/app/actions/palettes-commands.c b/app/actions/palettes-commands.c
new file mode 100644
index 0000000..5240e77
--- /dev/null
+++ b/app/actions/palettes-commands.c
@@ -0,0 +1,152 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimppalette.h"
+
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpdatafactoryview.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpview.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "palettes-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   palettes_merge_callback (GtkWidget   *widget,
+                                       const gchar *palette_name,
+                                       gpointer     data);
+
+
+/*  public functions */
+
+void
+palettes_import_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GtkWidget *widget;
+  return_if_no_widget (widget, data);
+
+  gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                  gtk_widget_get_screen (widget),
+                                  gimp_widget_get_monitor (widget),
+                                  NULL /*ui_manager*/,
+                                  "gimp-palette-import-dialog", -1, TRUE);
+}
+
+void
+palettes_merge_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GtkWidget           *dialog;
+
+#define MERGE_DIALOG_KEY "gimp-palettes-merge-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (editor), MERGE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = gimp_query_string_box (_("Merge Palettes"),
+                                      GTK_WIDGET (editor),
+                                      gimp_standard_help_func,
+                                      GIMP_HELP_PALETTE_MERGE,
+                                      _("Enter a name for the merged palette"),
+                                      NULL,
+                                      G_OBJECT (editor), "destroy",
+                                      palettes_merge_callback, editor);
+
+      dialogs_attach_dialog (G_OBJECT (editor), MERGE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+
+/*  private functions  */
+
+static void
+palettes_merge_callback (GtkWidget   *widget,
+                         const gchar *palette_name,
+                         gpointer     data)
+{
+  GimpContainerEditor *editor = data;
+  GimpDataFactoryView *view   = data;
+  GimpDataFactory     *factory;
+  GimpContext         *context;
+  GimpPalette         *new_palette;
+  GList               *selected = NULL;
+  GList               *list;
+
+  context = gimp_container_view_get_context (editor->view);
+  factory = gimp_data_factory_view_get_data_factory (view);
+
+  gimp_container_view_get_selected (editor->view, &selected);
+
+  if (g_list_length (selected) < 2)
+    {
+      gimp_message_literal (context->gimp,
+                            G_OBJECT (editor), GIMP_MESSAGE_WARNING,
+                            _("There must be at least two palettes selected "
+                              "to merge."));
+      g_list_free (selected);
+      return;
+    }
+
+  new_palette = GIMP_PALETTE (gimp_data_factory_data_new (factory, context,
+                                                          palette_name));
+
+  for (list = selected; list; list = g_list_next (list))
+    {
+      GimpPalette *palette = list->data;
+      GList       *cols;
+
+      for (cols = gimp_palette_get_colors (palette);
+           cols;
+           cols = g_list_next (cols))
+        {
+          GimpPaletteEntry *entry = cols->data;
+
+          gimp_palette_add_entry (new_palette, -1,
+                                  entry->name,
+                                  &entry->color);
+        }
+    }
+
+  g_list_free (selected);
+}
diff --git a/app/actions/palettes-commands.h b/app/actions/palettes-commands.h
new file mode 100644
index 0000000..ab7fb24
--- /dev/null
+++ b/app/actions/palettes-commands.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PALETTES_COMMANDS_H__
+#define __PALETTES_COMMANDS_H__
+
+
+void   palettes_import_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data);
+void   palettes_merge_cmd_callback  (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data);
+
+
+#endif /* __PALETTES_COMMANDS_H__ */
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
new file mode 100644
index 0000000..f563ef6
--- /dev/null
+++ b/app/actions/patterns-actions.c
@@ -0,0 +1,149 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "patterns-actions.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry patterns_actions[] =
+{
+  { "patterns-popup", GIMP_ICON_PATTERN,
+    NC_("patterns-action", "Patterns Menu"), NULL, NULL, NULL,
+    GIMP_HELP_PATTERN_DIALOG },
+
+  { "patterns-open-as-image", GIMP_ICON_DOCUMENT_OPEN,
+    NC_("patterns-action", "_Open Pattern as Image"), NULL,
+    NC_("patterns-action", "Open this pattern as an image"),
+    data_open_as_image_cmd_callback,
+    GIMP_HELP_PATTERN_OPEN_AS_IMAGE },
+
+  { "patterns-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("patterns-action", "_New Pattern"), NULL,
+    NC_("patterns-action", "Create a new pattern"),
+    data_new_cmd_callback,
+    GIMP_HELP_PATTERN_NEW },
+
+  { "patterns-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("patterns-action", "D_uplicate Pattern"), NULL,
+    NC_("patterns-action", "Duplicate this pattern"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_PATTERN_DUPLICATE },
+
+  { "patterns-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("patterns-action", "Copy Pattern _Location"), NULL,
+    NC_("patterns-action", "Copy pattern file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_PATTERN_COPY_LOCATION },
+
+  { "patterns-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("patterns-action", "Show in _File Manager"), NULL,
+    NC_("patterns-action", "Show pattern file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_PATTERN_SHOW_IN_FILE_MANAGER },
+
+  { "patterns-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("patterns-action", "_Delete Pattern"), NULL,
+    NC_("patterns-action", "Delete this pattern"),
+    data_delete_cmd_callback,
+    GIMP_HELP_PATTERN_DELETE },
+
+  { "patterns-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("patterns-action", "_Refresh Patterns"), NULL,
+    NC_("patterns-action", "Refresh patterns"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_PATTERN_REFRESH }
+};
+
+static const GimpStringActionEntry patterns_edit_actions[] =
+{
+  { "patterns-edit", GIMP_ICON_EDIT,
+    NC_("patterns-action", "_Edit Pattern..."), NULL,
+    NC_("patterns-action", "Edit pattern"),
+    "gimp-pattern-editor",
+    GIMP_HELP_PATTERN_EDIT }
+};
+
+
+void
+patterns_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "patterns-action",
+                                 patterns_actions,
+                                 G_N_ELEMENTS (patterns_actions));
+
+  gimp_action_group_add_string_actions (group, "patterns-action",
+                                        patterns_edit_actions,
+                                        G_N_ELEMENTS (patterns_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+patterns_actions_update (GimpActionGroup *group,
+                         gpointer         user_data)
+{
+  GimpContext *context = action_data_get_context (user_data);
+  GimpPattern *pattern = NULL;
+  GimpData    *data    = NULL;
+  GFile       *file    = NULL;
+
+  if (context)
+    {
+      pattern = gimp_context_get_pattern (context);
+
+      if (action_data_sel_count (user_data) > 1)
+        {
+          pattern = NULL;
+        }
+
+      if (pattern)
+        {
+          data = GIMP_DATA (pattern);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("patterns-edit",                 pattern && FALSE);
+  SET_SENSITIVE ("patterns-open-as-image",        file);
+  SET_SENSITIVE ("patterns-duplicate",            pattern && gimp_data_is_duplicatable (data));
+  SET_SENSITIVE ("patterns-copy-location",        file);
+  SET_SENSITIVE ("patterns-show-in-file-manager", file);
+  SET_SENSITIVE ("patterns-delete",               pattern && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/patterns-actions.h b/app/actions/patterns-actions.h
new file mode 100644
index 0000000..a736b9d
--- /dev/null
+++ b/app/actions/patterns-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PATTERNS_ACTIONS_H__
+#define __PATTERNS_ACTIONS_H__
+
+
+void   patterns_actions_setup  (GimpActionGroup *group);
+void   patterns_actions_update (GimpActionGroup *group,
+                                gpointer         user_data);
+
+
+#endif /* __PATTERNS_ACTIONS_H__ */
diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c
new file mode 100644
index 0000000..5a78324
--- /dev/null
+++ b/app/actions/plug-in-actions.c
@@ -0,0 +1,517 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginmanager-help-domain.h"
+#include "plug-in/gimppluginmanager-locale-domain.h"
+#include "plug-in/gimppluginmanager-menu-branch.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpactionimpl.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "plug-in-actions.h"
+#include "plug-in-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void     plug_in_actions_menu_branch_added    (GimpPlugInManager   *manager,
+                                                      GFile               *file,
+                                                      const gchar         *menu_path,
+                                                      const gchar         *menu_label,
+                                                      GimpActionGroup     *group);
+static void     plug_in_actions_register_procedure   (GimpPDB             *pdb,
+                                                      GimpProcedure       *procedure,
+                                                      GimpActionGroup     *group);
+static void     plug_in_actions_unregister_procedure (GimpPDB             *pdb,
+                                                      GimpProcedure       *procedure,
+                                                      GimpActionGroup     *group);
+static void     plug_in_actions_menu_path_added      (GimpPlugInProcedure *proc,
+                                                      const gchar         *menu_path,
+                                                      GimpActionGroup     *group);
+static void     plug_in_actions_add_proc             (GimpActionGroup     *group,
+                                                      GimpPlugInProcedure *proc);
+
+static gboolean plug_in_actions_check_translation    (const gchar         *original,
+                                                      const gchar         *translated);
+static void     plug_in_actions_build_path           (GimpActionGroup     *group,
+                                                      const gchar         *original,
+                                                      const gchar         *translated);
+
+
+/*  private variables  */
+
+static const GimpActionEntry plug_in_actions[] =
+{
+  { "plug-in-reset-all", GIMP_ICON_RESET,
+    NC_("plug-in-action", "Reset all _Filters"), NULL,
+    NC_("plug-in-action", "Reset all plug-ins to their default settings"),
+    plug_in_reset_all_cmd_callback,
+    GIMP_HELP_FILTER_RESET_ALL }
+};
+
+
+/*  public functions  */
+
+void
+plug_in_actions_setup (GimpActionGroup *group)
+{
+  GimpPlugInManager *manager = group->gimp->plug_in_manager;
+  GSList            *list;
+
+  gimp_action_group_add_actions (group, "plug-in-action",
+                                 plug_in_actions,
+                                 G_N_ELEMENTS (plug_in_actions));
+
+  for (list = gimp_plug_in_manager_get_menu_branches (manager);
+       list;
+       list = g_slist_next (list))
+    {
+      GimpPlugInMenuBranch *branch = list->data;
+
+      plug_in_actions_menu_branch_added (manager,
+                                         branch->file,
+                                         branch->menu_path,
+                                         branch->menu_label,
+                                         group);
+    }
+
+  g_signal_connect_object (manager,
+                           "menu-branch-added",
+                           G_CALLBACK (plug_in_actions_menu_branch_added),
+                           group, 0);
+
+  for (list = manager->plug_in_procedures;
+       list;
+       list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *plug_in_proc = list->data;
+
+      if (plug_in_proc->file)
+        plug_in_actions_register_procedure (group->gimp->pdb,
+                                            GIMP_PROCEDURE (plug_in_proc),
+                                            group);
+    }
+
+  g_signal_connect_object (group->gimp->pdb, "register-procedure",
+                           G_CALLBACK (plug_in_actions_register_procedure),
+                           group, 0);
+  g_signal_connect_object (group->gimp->pdb, "unregister-procedure",
+                           G_CALLBACK (plug_in_actions_unregister_procedure),
+                           group, 0);
+}
+
+void
+plug_in_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+  GimpImage         *image    = action_data_get_image (data);
+  GimpPlugInManager *manager  = group->gimp->plug_in_manager;
+  GimpDrawable      *drawable = NULL;
+  GSList            *list;
+
+  if (image)
+    drawable = gimp_image_get_active_drawable (image);
+
+  for (list = manager->plug_in_procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+
+      if ((proc->menu_label || proc->menu_paths) &&
+          ! proc->file_proc                      &&
+          proc->image_types_val)
+        {
+          GimpProcedure *procedure = GIMP_PROCEDURE (proc);
+          gboolean       sensitive;
+          const gchar   *tooltip;
+
+          sensitive = gimp_procedure_get_sensitive (procedure,
+                                                    GIMP_OBJECT (drawable),
+                                                    &tooltip);
+
+          gimp_action_group_set_action_sensitive (group,
+                                                  gimp_object_get_name (proc),
+                                                  sensitive);
+
+          if (sensitive || ! drawable || ! tooltip)
+            tooltip = gimp_procedure_get_blurb (procedure);
+
+          gimp_action_group_set_action_tooltip (group,
+                                                gimp_object_get_name (proc),
+                                                tooltip);
+        }
+    }
+}
+
+
+/*  private functions  */
+
+static void
+plug_in_actions_menu_branch_added (GimpPlugInManager *manager,
+                                   GFile             *file,
+                                   const gchar       *menu_path,
+                                   const gchar       *menu_label,
+                                   GimpActionGroup   *group)
+{
+  const gchar *locale_domain;
+  const gchar *path_translated;
+  const gchar *label_translated;
+  gchar       *full;
+  gchar       *full_translated;
+
+  locale_domain = gimp_plug_in_manager_get_locale_domain (manager, file, NULL);
+
+  path_translated  = dgettext (locale_domain, menu_path);
+  label_translated = dgettext (locale_domain, menu_label);
+
+  full            = g_strconcat (menu_path,       "/", menu_label,       NULL);
+  full_translated = g_strconcat (path_translated, "/", label_translated, NULL);
+
+  if (plug_in_actions_check_translation (full, full_translated))
+    plug_in_actions_build_path (group, full, full_translated);
+  else
+    plug_in_actions_build_path (group, full, full);
+
+  g_free (full_translated);
+  g_free (full);
+}
+
+static void
+plug_in_actions_register_procedure (GimpPDB         *pdb,
+                                    GimpProcedure   *procedure,
+                                    GimpActionGroup *group)
+{
+  if (GIMP_IS_PLUG_IN_PROCEDURE (procedure))
+    {
+      GimpPlugInProcedure *plug_in_proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+      g_signal_connect_object (plug_in_proc, "menu-path-added",
+                               G_CALLBACK (plug_in_actions_menu_path_added),
+                               group, 0);
+
+      if ((plug_in_proc->menu_label || plug_in_proc->menu_paths) &&
+          ! plug_in_proc->file_proc)
+        {
+#if 0
+          g_print ("%s: %s\n", G_STRFUNC,
+                   gimp_object_get_name (procedure));
+#endif
+
+          plug_in_actions_add_proc (group, plug_in_proc);
+        }
+    }
+}
+
+static void
+plug_in_actions_unregister_procedure (GimpPDB         *pdb,
+                                      GimpProcedure   *procedure,
+                                      GimpActionGroup *group)
+{
+  if (GIMP_IS_PLUG_IN_PROCEDURE (procedure))
+    {
+      GimpPlugInProcedure *plug_in_proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+      g_signal_handlers_disconnect_by_func (plug_in_proc,
+                                            plug_in_actions_menu_path_added,
+                                            group);
+
+      if ((plug_in_proc->menu_label || plug_in_proc->menu_paths) &&
+          ! plug_in_proc->file_proc)
+        {
+          GimpAction *action;
+
+#if 0
+          g_print ("%s: %s\n", G_STRFUNC,
+                   gimp_object_get_name (procedure));
+#endif
+
+          action = gimp_action_group_get_action (group,
+                                                 gimp_object_get_name (procedure));
+
+          if (action)
+            gimp_action_group_remove_action (group, action);
+        }
+    }
+}
+
+static void
+plug_in_actions_menu_path_added (GimpPlugInProcedure *plug_in_proc,
+                                 const gchar         *menu_path,
+                                 GimpActionGroup     *group)
+{
+  const gchar *locale_domain;
+  const gchar *path_translated;
+
+#if 0
+  g_print ("%s: %s (%s)\n", G_STRFUNC,
+           gimp_object_get_name (plug_in_proc), menu_path);
+#endif
+
+  locale_domain = gimp_plug_in_procedure_get_locale_domain (plug_in_proc);
+
+  path_translated = dgettext (locale_domain, menu_path);
+
+  if (plug_in_actions_check_translation (menu_path, path_translated))
+    plug_in_actions_build_path (group, menu_path, path_translated);
+  else
+    plug_in_actions_build_path (group, menu_path, menu_path);
+}
+
+static void
+plug_in_actions_add_proc (GimpActionGroup     *group,
+                          GimpPlugInProcedure *proc)
+{
+  GimpProcedureActionEntry  entry;
+  const gchar              *locale_domain;
+  gchar                    *path_original    = NULL;
+  gchar                    *path_translated  = NULL;
+
+  locale_domain = gimp_plug_in_procedure_get_locale_domain (proc);
+
+  if (! proc->menu_label)
+    {
+      gchar *p1, *p2;
+
+      path_original   = proc->menu_paths->data;
+      path_translated = dgettext (locale_domain, path_original);
+
+      path_original = g_strdup (path_original);
+
+      if (plug_in_actions_check_translation (path_original, path_translated))
+        path_translated = g_strdup (path_translated);
+      else
+        path_translated = g_strdup (path_original);
+
+      p1 = strrchr (path_original, '/');
+      p2 = strrchr (path_translated, '/');
+
+      if (p1 && p2)
+        {
+          *p1 = '\0';
+          *p2 = '\0';
+        }
+      else
+        {
+          g_warning ("bad menu path for procedure \"%s\": \"%s\"",
+                     gimp_object_get_name (proc), path_original);
+
+          g_free (path_original);
+          g_free (path_translated);
+
+          return;
+        }
+    }
+
+  entry.name        = gimp_object_get_name (proc);
+  entry.icon_name   = gimp_viewable_get_icon_name (GIMP_VIEWABLE (proc));
+  entry.label       = gimp_procedure_get_menu_label (GIMP_PROCEDURE (proc));
+  entry.accelerator = NULL;
+  entry.tooltip     = gimp_procedure_get_blurb (GIMP_PROCEDURE (proc));
+  entry.procedure   = GIMP_PROCEDURE (proc);
+  entry.help_id     = gimp_procedure_get_help_id (GIMP_PROCEDURE (proc));
+
+  gimp_action_group_add_procedure_actions (group, &entry, 1,
+                                           plug_in_run_cmd_callback);
+
+  if (proc->menu_label)
+    {
+      GList *list;
+
+      for (list = proc->menu_paths; list; list = g_list_next (list))
+        {
+          const gchar *original   = list->data;
+          const gchar *translated = dgettext (locale_domain, original);
+
+          if (plug_in_actions_check_translation (original, translated))
+            plug_in_actions_build_path (group, original, translated);
+          else
+            plug_in_actions_build_path (group, original, original);
+        }
+    }
+  else
+    {
+      plug_in_actions_build_path (group, path_original, path_translated);
+
+      g_free (path_original);
+      g_free (path_translated);
+    }
+
+  if ((proc->menu_label || proc->menu_paths) &&
+      ! proc->file_proc                      &&
+      proc->image_types_val)
+    {
+      GimpContext  *context  = gimp_get_user_context (group->gimp);
+      GimpImage    *image    = gimp_context_get_image (context);
+      GimpDrawable *drawable = NULL;
+      gboolean      sensitive;
+      const gchar  *tooltip;
+
+      if (image)
+        drawable = gimp_image_get_active_drawable (image);
+
+      sensitive = gimp_procedure_get_sensitive (GIMP_PROCEDURE (proc),
+                                                GIMP_OBJECT (drawable),
+                                                &tooltip);
+
+      gimp_action_group_set_action_sensitive (group,
+                                              gimp_object_get_name (proc),
+                                              sensitive);
+
+      if (! sensitive && drawable && tooltip)
+        gimp_action_group_set_action_tooltip (group,
+                                              gimp_object_get_name (proc),
+                                              tooltip);
+    }
+}
+
+static gboolean
+plug_in_actions_check_translation (const gchar *original,
+                                   const gchar *translated)
+{
+  const gchar *p1;
+  const gchar *p2;
+
+  /*  first check if <Prefix> is present and identical in both strings  */
+  p1 = strchr (original, '>');
+  p2 = strchr (translated, '>');
+
+  if (!p1 || !p2                           ||
+      (p1 - original) != (p2 - translated) ||
+      strncmp (original, translated, p1 - original))
+    {
+      g_printerr ("bad translation \"%s\"\n"
+                  "for menu path   \"%s\"\n"
+                  "(<Prefix> must not be translated)\n\n",
+                  translated, original);
+      return FALSE;
+    }
+
+  p1++;
+  p2++;
+
+  /*  then check if either a '/' or nothing follows in *both* strings  */
+  if (! ((*p1 == '/' && *p2 == '/') ||
+         (*p1 == '\0' && *p2 == '\0')))
+    {
+      g_printerr ("bad translation \"%s\"\n"
+                  "for menu path   \"%s\"\n"
+                  "(<Prefix> must be followed by either nothing or '/')\n\n",
+                  translated, original);
+      return FALSE;
+    }
+
+  /*  then check the number of slashes in the remaining string  */
+  while (p1 && p2)
+    {
+      p1 = strchr (p1, '/');
+      p2 = strchr (p2, '/');
+
+      if (p1) p1++;
+      if (p2) p2++;
+    }
+
+  if (p1 || p2)
+    {
+      g_printerr ("bad translation \"%s\"\n"
+                  "for menu path   \"%s\"\n"
+                  "(number of '/' must be the same)\n\n",
+                  translated, original);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+plug_in_actions_build_path (GimpActionGroup *group,
+                            const gchar     *path_original,
+                            const gchar     *path_translated)
+{
+  GHashTable *path_table;
+  gchar      *copy_original;
+  gchar      *copy_translated;
+  gchar      *p1, *p2;
+
+  path_table = g_object_get_data (G_OBJECT (group), "plug-in-path-table");
+
+  if (! path_table)
+    {
+      path_table = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                          g_free, NULL);
+
+      g_object_set_data_full (G_OBJECT (group), "plug-in-path-table",
+                              path_table,
+                              (GDestroyNotify) g_hash_table_destroy);
+    }
+
+  copy_original   = gimp_strip_uline (path_original);
+  copy_translated = g_strdup (path_translated);
+
+  p1 = strrchr (copy_original, '/');
+  p2 = strrchr (copy_translated, '/');
+
+  if (p1 && p2 && ! g_hash_table_lookup (path_table, copy_original))
+    {
+      GimpAction *action;
+      gchar      *label;
+
+      label = p2 + 1;
+
+#if 0
+      g_print ("adding plug-in submenu '%s' (%s)\n",
+               copy_original, label);
+#endif
+
+      action = gimp_action_impl_new (copy_original, label, NULL, NULL, NULL);
+      gimp_action_group_add_action (group, action);
+      g_object_unref (action);
+
+      g_hash_table_insert (path_table, g_strdup (copy_original), action);
+
+      *p1 = '\0';
+      *p2 = '\0';
+
+      /* recursively call ourselves with the last part of the path removed */
+      plug_in_actions_build_path (group, copy_original, copy_translated);
+    }
+
+  g_free (copy_original);
+  g_free (copy_translated);
+}
diff --git a/app/actions/plug-in-actions.h b/app/actions/plug-in-actions.h
new file mode 100644
index 0000000..a586acd
--- /dev/null
+++ b/app/actions/plug-in-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_ACTIONS_H__
+#define __PLUG_IN_ACTIONS_H__
+
+
+void   plug_in_actions_setup  (GimpActionGroup *group);
+void   plug_in_actions_update (GimpActionGroup *group,
+                               gpointer         data);
+
+
+#endif /* __PLUG_IN_ACTIONS_H__ */
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
new file mode 100644
index 0000000..ed7428d
--- /dev/null
+++ b/app/actions/plug-in-commands.c
@@ -0,0 +1,221 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-filter-history.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginmanager-data.h"
+
+#include "widgets/gimpbufferview.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpdatafactoryview.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpimageeditor.h"
+#include "widgets/gimpitemtreeview.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "plug-in-commands.h"
+#include "procedure-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   plug_in_reset_all_response (GtkWidget *dialog,
+                                          gint       response_id,
+                                          Gimp      *gimp);
+
+
+/*  public functions  */
+
+void
+plug_in_run_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  Gimp           *gimp;
+  GimpValueArray *args    = NULL;
+  GimpDisplay    *display = NULL;
+  GimpProcedure  *procedure;
+  gsize           hack;
+  return_if_no_gimp (gimp, data);
+
+  hack = g_variant_get_uint64 (value);
+
+  procedure = GSIZE_TO_POINTER (hack);
+
+  switch (procedure->proc_type)
+    {
+    case GIMP_EXTENSION:
+      args = procedure_commands_get_run_mode_arg (procedure);
+      break;
+
+    case GIMP_PLUGIN:
+    case GIMP_TEMPORARY:
+      if (GIMP_IS_DATA_FACTORY_VIEW (data) ||
+          GIMP_IS_BUFFER_VIEW (data))
+        {
+          GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+          GimpContainer       *container;
+          GimpContext         *context;
+          GimpObject          *object;
+
+          container = gimp_container_view_get_container (editor->view);
+          context   = gimp_container_view_get_context (editor->view);
+
+          object = gimp_context_get_by_type (context,
+                                             gimp_container_get_children_type (container));
+
+          args = procedure_commands_get_data_args (procedure, object);
+        }
+      else if (GIMP_IS_IMAGE_EDITOR (data))
+        {
+          GimpImageEditor *editor = GIMP_IMAGE_EDITOR (data);
+          GimpImage       *image;
+
+          image = gimp_image_editor_get_image (editor);
+
+          args = procedure_commands_get_image_args (procedure, image);
+        }
+      else if (GIMP_IS_ITEM_TREE_VIEW (data))
+        {
+          GimpItemTreeView *view = GIMP_ITEM_TREE_VIEW (data);
+          GimpImage        *image;
+          GimpItem         *item;
+
+          image = gimp_item_tree_view_get_image (view);
+
+          if (image)
+            item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+          else
+            item = NULL;
+
+          args = procedure_commands_get_item_args (procedure, image, item);
+        }
+      else
+        {
+          display = action_data_get_display (data);
+
+          args = procedure_commands_get_display_args (procedure, display, NULL);
+        }
+      break;
+
+    case GIMP_INTERNAL:
+      g_warning ("Unhandled procedure type.");
+      break;
+    }
+
+  if (args)
+    {
+      if (procedure_commands_run_procedure_async (procedure, gimp,
+                                                  GIMP_PROGRESS (display),
+                                                  GIMP_RUN_INTERACTIVE, args,
+                                                  display))
+        {
+          /* remember only image plug-ins */
+          if (procedure->num_args >= 2 &&
+              GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->args[1]))
+            {
+              gimp_filter_history_add (gimp, procedure);
+            }
+        }
+
+      gimp_value_array_unref (args);
+    }
+}
+
+void
+plug_in_reset_all_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  Gimp      *gimp;
+  GtkWidget *dialog;
+  return_if_no_gimp (gimp, data);
+
+#define RESET_FILTERS_DIALOG_KEY "gimp-reset-all-filters-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (gimp), RESET_FILTERS_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = gimp_message_dialog_new (_("Reset all Filters"),
+                                        GIMP_ICON_DIALOG_QUESTION,
+                                        NULL, 0,
+                                        gimp_standard_help_func, NULL,
+
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Reset"),  GTK_RESPONSE_OK,
+
+                                        NULL);
+
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (plug_in_reset_all_response),
+                        gimp);
+
+      gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                         _("Do you really want to reset all "
+                                           "filters to default values?"));
+
+      dialogs_attach_dialog (G_OBJECT (gimp), RESET_FILTERS_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+
+/*  private functions  */
+
+static void
+plug_in_reset_all_response (GtkWidget *dialog,
+                            gint       response_id,
+                            Gimp      *gimp)
+{
+  gtk_widget_destroy (dialog);
+
+  if (response_id == GTK_RESPONSE_OK)
+    gimp_plug_in_manager_data_free (gimp->plug_in_manager);
+}
diff --git a/app/actions/plug-in-commands.h b/app/actions/plug-in-commands.h
new file mode 100644
index 0000000..b648482
--- /dev/null
+++ b/app/actions/plug-in-commands.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_COMMANDS_H__
+#define __PLUG_IN_COMMANDS_H__
+
+
+void   plug_in_run_cmd_callback       (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data);
+
+void   plug_in_reset_all_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data);
+
+
+#endif /* __PLUG_IN_COMMANDS_H__ */
diff --git a/app/actions/procedure-commands.c b/app/actions/procedure-commands.c
new file mode 100644
index 0000000..93ec29d
--- /dev/null
+++ b/app/actions/procedure-commands.c
@@ -0,0 +1,326 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "display/gimpdisplay.h"
+
+#include "procedure-commands.h"
+
+
+GimpValueArray *
+procedure_commands_get_run_mode_arg (GimpProcedure *procedure)
+{
+  GimpValueArray *args;
+  gint            n_args = 0;
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  /* initialize the first argument  */
+  if (gimp_value_array_length (args) > n_args &&
+      GIMP_IS_PARAM_SPEC_INT32 (procedure->args[n_args]))
+    {
+      g_value_set_int (gimp_value_array_index (args, n_args),
+                       GIMP_RUN_INTERACTIVE);
+      n_args++;
+    }
+
+  gimp_value_array_truncate (args, n_args);
+
+  return args;
+}
+
+GimpValueArray *
+procedure_commands_get_data_args (GimpProcedure *procedure,
+                                  GimpObject    *object)
+{
+  GimpValueArray *args;
+  gint            n_args = 0;
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  /* initialize the first argument  */
+  g_value_set_int (gimp_value_array_index (args, n_args),
+                   GIMP_RUN_INTERACTIVE);
+  n_args++;
+
+  if (gimp_value_array_length (args) > n_args &&
+      GIMP_IS_PARAM_SPEC_STRING (procedure->args[n_args]))
+    {
+      if (object)
+        {
+          g_value_set_string (gimp_value_array_index (args, n_args),
+                              gimp_object_get_name (object));
+          n_args++;
+        }
+      else
+        {
+          g_warning ("Uh-oh, no active data object for the plug-in!");
+          gimp_value_array_unref (args);
+          return NULL;
+        }
+    }
+
+  gimp_value_array_truncate (args, n_args);
+
+  return args;
+}
+
+GimpValueArray *
+procedure_commands_get_image_args (GimpProcedure   *procedure,
+                                   GimpImage       *image)
+{
+  GimpValueArray *args;
+  gint            n_args = 0;
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  /* initialize the first argument  */
+  g_value_set_int (gimp_value_array_index (args, n_args),
+                   GIMP_RUN_INTERACTIVE);
+  n_args++;
+
+  if (gimp_value_array_length (args) > n_args &&
+      GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->args[n_args]))
+    {
+      if (image)
+        {
+          gimp_value_set_image (gimp_value_array_index (args, n_args), image);
+          n_args++;
+        }
+      else
+        {
+          g_warning ("Uh-oh, no active image for the plug-in!");
+          gimp_value_array_unref (args);
+          return NULL;
+        }
+    }
+
+  gimp_value_array_truncate (args, n_args);
+
+  return args;
+}
+
+GimpValueArray *
+procedure_commands_get_item_args (GimpProcedure *procedure,
+                                  GimpImage     *image,
+                                  GimpItem      *item)
+{
+  GimpValueArray *args;
+  gint            n_args = 0;
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  /* initialize the first argument  */
+  g_value_set_int (gimp_value_array_index (args, n_args),
+                   GIMP_RUN_INTERACTIVE);
+  n_args++;
+
+  if (gimp_value_array_length (args) > n_args &&
+      GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->args[n_args]))
+    {
+      if (image)
+        {
+          gimp_value_set_image (gimp_value_array_index (args, n_args), image);
+          n_args++;
+
+          if (gimp_value_array_length (args) > n_args &&
+              GIMP_IS_PARAM_SPEC_ITEM_ID (procedure->args[n_args]))
+            {
+              if (item &&
+                  g_type_is_a (G_TYPE_FROM_INSTANCE (item),
+                               GIMP_PARAM_SPEC_ITEM_ID (procedure->args[n_args])->item_type))
+                {
+                  gimp_value_set_item (gimp_value_array_index (args, n_args),
+                                       item);
+                  n_args++;
+                }
+              else
+                {
+                  g_warning ("Uh-oh, no active item for the plug-in!");
+                  gimp_value_array_unref (args);
+                  return NULL;
+                }
+            }
+        }
+    }
+
+  gimp_value_array_truncate (args, n_args);
+
+  return args;
+}
+
+GimpValueArray *
+procedure_commands_get_display_args (GimpProcedure *procedure,
+                                     GimpDisplay   *display,
+                                     GimpObject    *settings)
+{
+  GimpValueArray *args;
+  gint            n_args = 0;
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  /* initialize the first argument  */
+  g_value_set_int (gimp_value_array_index (args, n_args),
+                   GIMP_RUN_INTERACTIVE);
+  n_args++;
+
+  if (gimp_value_array_length (args) > n_args &&
+      GIMP_IS_PARAM_SPEC_DISPLAY_ID (procedure->args[n_args]))
+    {
+      if (display)
+        {
+          gimp_value_set_display (gimp_value_array_index (args, n_args),
+                                  GIMP_OBJECT (display));
+          n_args++;
+        }
+      else
+        {
+          g_warning ("Uh-oh, no active display for the plug-in!");
+          gimp_value_array_unref (args);
+          return NULL;
+        }
+    }
+
+  if (gimp_value_array_length (args) > n_args &&
+      GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->args[n_args]))
+    {
+      GimpImage *image = display ? gimp_display_get_image (display) : NULL;
+
+      if (image)
+        {
+          gimp_value_set_image (gimp_value_array_index (args, n_args), image);
+          n_args++;
+
+          if (gimp_value_array_length (args) > n_args &&
+              GIMP_IS_PARAM_SPEC_DRAWABLE_ID (procedure->args[n_args]))
+            {
+              GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+              if (drawable)
+                {
+                  gimp_value_set_drawable (gimp_value_array_index (args, n_args),
+                                           drawable);
+                  n_args++;
+                }
+              else
+                {
+                  g_warning ("Uh-oh, no active drawable for the plug-in!");
+                  gimp_value_array_unref (args);
+                  return NULL;
+                }
+            }
+        }
+    }
+
+  if (gimp_value_array_length (args) > n_args &&
+      g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (procedure->args[n_args]),
+                   GIMP_TYPE_OBJECT))
+    {
+      g_value_set_object (gimp_value_array_index (args, n_args), settings);
+      n_args++;
+    }
+
+  gimp_value_array_truncate (args, n_args);
+
+  return args;
+}
+
+gboolean
+procedure_commands_run_procedure (GimpProcedure  *procedure,
+                                  Gimp           *gimp,
+                                  GimpProgress   *progress,
+                                  GimpValueArray *args)
+{
+  GimpValueArray *return_vals;
+  GError         *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (args != NULL, FALSE);
+
+  g_value_set_int (gimp_value_array_index (args, 0), GIMP_RUN_NONINTERACTIVE);
+
+  return_vals = gimp_procedure_execute (procedure, gimp,
+                                        gimp_get_user_context (gimp),
+                                        progress, args,
+                                        &error);
+  gimp_value_array_unref (return_vals);
+
+  if (error)
+    {
+      gimp_message_literal (gimp,
+                            G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+procedure_commands_run_procedure_async (GimpProcedure  *procedure,
+                                        Gimp           *gimp,
+                                        GimpProgress   *progress,
+                                        GimpRunMode     run_mode,
+                                        GimpValueArray *args,
+                                        GimpDisplay    *display)
+{
+  GError *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (display == NULL || GIMP_IS_DISPLAY (display), FALSE);
+  g_return_val_if_fail (args != NULL, FALSE);
+
+  g_value_set_int (gimp_value_array_index (args, 0), run_mode);
+
+  gimp_procedure_execute_async (procedure, gimp,
+                                gimp_get_user_context (gimp),
+                                progress, args,
+                                GIMP_OBJECT (display), &error);
+
+  if (error)
+    {
+      gimp_message_literal (gimp,
+                            G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
diff --git a/app/actions/procedure-commands.h b/app/actions/procedure-commands.h
new file mode 100644
index 0000000..13c1109
--- /dev/null
+++ b/app/actions/procedure-commands.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PROCEDURE_COMMANDS_H__
+#define __PROCEDURE_COMMANDS_H__
+
+
+GimpValueArray * procedure_commands_get_run_mode_arg (GimpProcedure  *procedure);
+GimpValueArray * procedure_commands_get_data_args    (GimpProcedure  *procedure,
+                                                      GimpObject     *object);
+GimpValueArray * procedure_commands_get_image_args   (GimpProcedure  *procedure,
+                                                      GimpImage      *image);
+GimpValueArray * procedure_commands_get_item_args    (GimpProcedure  *procedure,
+                                                      GimpImage      *image,
+                                                      GimpItem       *item);
+GimpValueArray * procedure_commands_get_display_args (GimpProcedure  *procedure,
+                                                      GimpDisplay    *display,
+                                                      GimpObject     *settings);
+
+gboolean      procedure_commands_run_procedure       (GimpProcedure  *procedure,
+                                                      Gimp           *gimp,
+                                                      GimpProgress   *progress,
+                                                      GimpValueArray *args);
+gboolean      procedure_commands_run_procedure_async (GimpProcedure  *procedure,
+                                                      Gimp           *gimp,
+                                                      GimpProgress   *progress,
+                                                      GimpRunMode     run_mode,
+                                                      GimpValueArray *args,
+                                                      GimpDisplay    *display);
+
+
+#endif /* __PROCEDURE_COMMANDS_H__ */
diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c
new file mode 100644
index 0000000..542d0f4
--- /dev/null
+++ b/app/actions/quick-mask-actions.c
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpimage-quick-mask.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "quick-mask-actions.h"
+#include "quick-mask-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry quick_mask_actions[] =
+{
+  { "quick-mask-popup", NULL,
+    NC_("quick-mask-action", "Quick Mask Menu"), NULL, NULL, NULL,
+    GIMP_HELP_QUICK_MASK },
+
+  { "quick-mask-configure", NULL,
+    NC_("quick-mask-action", "_Configure Color and Opacity..."), NULL, NULL,
+    quick_mask_configure_cmd_callback,
+    GIMP_HELP_QUICK_MASK_EDIT }
+};
+
+static const GimpToggleActionEntry quick_mask_toggle_actions[] =
+{
+  { "quick-mask-toggle", GIMP_ICON_QUICK_MASK_ON,
+    NC_("quick-mask-action", "Toggle _Quick Mask"), "<shift>Q",
+    NC_("quick-mask-action", "Toggle Quick Mask on/off"),
+    quick_mask_toggle_cmd_callback,
+    FALSE,
+    GIMP_HELP_QUICK_MASK_TOGGLE }
+};
+
+static const GimpRadioActionEntry quick_mask_invert_actions[] =
+{
+  { "quick-mask-invert-on", NULL,
+    NC_("quick-mask-action", "Mask _Selected Areas"), NULL, NULL,
+    TRUE,
+    GIMP_HELP_QUICK_MASK_INVERT },
+
+  { "quick-mask-invert-off", NULL,
+    NC_("quick-mask-action", "Mask _Unselected Areas"), NULL, NULL,
+    FALSE,
+    GIMP_HELP_QUICK_MASK_INVERT }
+};
+
+
+void
+quick_mask_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "quick-mask-action",
+                                 quick_mask_actions,
+                                 G_N_ELEMENTS (quick_mask_actions));
+
+  gimp_action_group_add_toggle_actions (group, "quick-mask-action",
+                                        quick_mask_toggle_actions,
+                                        G_N_ELEMENTS (quick_mask_toggle_actions));
+
+  gimp_action_group_add_radio_actions (group, "quick-mask-action",
+                                       quick_mask_invert_actions,
+                                       G_N_ELEMENTS (quick_mask_invert_actions),
+                                       NULL,
+                                       FALSE,
+                                       quick_mask_invert_cmd_callback);
+}
+
+void
+quick_mask_actions_update (GimpActionGroup *group,
+                           gpointer         data)
+{
+  GimpImage *image               = action_data_get_image (data);
+  gboolean   quick_mask_state    = FALSE;
+  gboolean   quick_mask_inverted = FALSE;
+  GimpRGB    quick_mask_color;
+
+  if (image)
+    {
+      quick_mask_state    = gimp_image_get_quick_mask_state (image);
+      quick_mask_inverted = gimp_image_get_quick_mask_inverted (image);
+
+      gimp_image_get_quick_mask_color (image, &quick_mask_color);
+    }
+
+#define SET_SENSITIVE(action,sensitive) \
+        gimp_action_group_set_action_sensitive (group, action, (sensitive) != 0)
+#define SET_ACTIVE(action,active) \
+        gimp_action_group_set_action_active (group, action, (active) != 0)
+#define SET_COLOR(action,color) \
+        gimp_action_group_set_action_color (group, action, (color), FALSE)
+
+  SET_SENSITIVE ("quick-mask-toggle", image);
+  SET_ACTIVE    ("quick-mask-toggle", quick_mask_state);
+
+  SET_SENSITIVE ("quick-mask-invert-on",  image);
+  SET_SENSITIVE ("quick-mask-invert-off", image);
+
+  if (quick_mask_inverted)
+    SET_ACTIVE ("quick-mask-invert-on", TRUE);
+  else
+    SET_ACTIVE ("quick-mask-invert-off", TRUE);
+
+  SET_SENSITIVE ("quick-mask-configure", image);
+
+  if (image)
+    SET_COLOR ("quick-mask-configure", &quick_mask_color);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+#undef SET_COLOR
+}
diff --git a/app/actions/quick-mask-actions.h b/app/actions/quick-mask-actions.h
new file mode 100644
index 0000000..78ea13e
--- /dev/null
+++ b/app/actions/quick-mask-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __QUICK_MASK_ACTIONS_H__
+#define __QUICK_MASK_ACTIONS_H__
+
+
+void   quick_mask_actions_setup  (GimpActionGroup *group);
+void   quick_mask_actions_update (GimpActionGroup *group,
+                                  gpointer         data);
+
+
+#endif /* __QUICK_MASK_ACTIONS_H__ */
diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c
new file mode 100644
index 0000000..3ea9d01
--- /dev/null
+++ b/app/actions/quick-mask-commands.c
@@ -0,0 +1,182 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-quick-mask.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/channel-options-dialog.h"
+#include "dialogs/item-options-dialog.h"
+
+#include "actions.h"
+#include "quick-mask-commands.h"
+
+#include "gimp-intl.h"
+
+
+#define RGBA_EPSILON 1e-6
+
+
+/*  local function prototypes  */
+
+static void   quick_mask_configure_callback (GtkWidget     *dialog,
+                                             GimpImage     *image,
+                                             GimpChannel   *channel,
+                                             GimpContext   *context,
+                                             const gchar   *channel_name,
+                                             const GimpRGB *channel_color,
+                                             gboolean       save_selection,
+                                             gboolean       channel_visible,
+                                             gboolean       channel_linked,
+                                             GimpColorTag   channel_color_tag,
+                                             gboolean       channel_lock_content,
+                                             gboolean       channel_lock_position,
+                                             gpointer       user_data);
+
+
+/*  public functions */
+
+void
+quick_mask_toggle_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage *image;
+  gboolean   active;
+  return_if_no_image (image, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_image_get_quick_mask_state (image))
+    {
+      gimp_image_set_quick_mask_state (image, active);
+      gimp_image_flush (image);
+    }
+}
+
+void
+quick_mask_invert_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage *image;
+  gboolean   inverted;
+  return_if_no_image (image, data);
+
+  inverted = (gboolean) g_variant_get_int32 (value);
+
+  if (inverted != gimp_image_get_quick_mask_inverted (image))
+    {
+      gimp_image_quick_mask_invert (image);
+      gimp_image_flush (image);
+    }
+}
+
+void
+quick_mask_configure_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+#define CONFIGURE_DIALOG_KEY "gimp-image-quick-mask-configure-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), CONFIGURE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpRGB color;
+
+      gimp_image_get_quick_mask_color (image, &color);
+
+      dialog = channel_options_dialog_new (image, NULL,
+                                           action_data_get_context (data),
+                                           widget,
+                                           _("Quick Mask Attributes"),
+                                           "gimp-quick-mask-edit",
+                                           GIMP_ICON_QUICK_MASK_ON,
+                                           _("Edit Quick Mask Attributes"),
+                                           GIMP_HELP_QUICK_MASK_EDIT,
+                                           _("Edit Quick Mask Color"),
+                                           _("_Mask opacity:"),
+                                           FALSE,
+                                           NULL,
+                                           &color,
+                                           FALSE,
+                                           FALSE,
+                                           GIMP_COLOR_TAG_NONE,
+                                           FALSE,
+                                           FALSE,
+                                           quick_mask_configure_callback,
+                                           NULL);
+
+      item_options_dialog_set_switches_visible (dialog, FALSE);
+
+      dialogs_attach_dialog (G_OBJECT (image), CONFIGURE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+
+/*  private functions  */
+
+static void
+quick_mask_configure_callback (GtkWidget     *dialog,
+                               GimpImage     *image,
+                               GimpChannel   *channel,
+                               GimpContext   *context,
+                               const gchar   *channel_name,
+                               const GimpRGB *channel_color,
+                               gboolean       save_selection,
+                               gboolean       channel_visible,
+                               gboolean       channel_linked,
+                               GimpColorTag   channel_color_tag,
+                               gboolean       channel_lock_content,
+                               gboolean       channel_lock_position,
+                               gpointer       user_data)
+{
+  GimpRGB old_color;
+
+  gimp_image_get_quick_mask_color (image, &old_color);
+
+  if (gimp_rgba_distance (&old_color, channel_color) > RGBA_EPSILON)
+    {
+      gimp_image_set_quick_mask_color (image, channel_color);
+      gimp_image_flush (image);
+    }
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/actions/quick-mask-commands.h b/app/actions/quick-mask-commands.h
new file mode 100644
index 0000000..1e8628c
--- /dev/null
+++ b/app/actions/quick-mask-commands.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __QUICK_MASK_COMMANDS_H__
+#define __QUICK_MASK_COMMANDS_H__
+
+
+void   quick_mask_toggle_cmd_callback    (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data);
+void   quick_mask_invert_cmd_callback    (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data);
+void   quick_mask_configure_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data);
+
+
+#endif /* __QUICK_MASK_COMMANDS_H__ */
diff --git a/app/actions/sample-points-actions.c b/app/actions/sample-points-actions.c
new file mode 100644
index 0000000..60111c4
--- /dev/null
+++ b/app/actions/sample-points-actions.c
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsamplepointeditor.h"
+
+#include "sample-points-actions.h"
+#include "sample-points-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry sample_points_actions[] =
+{
+  { "sample-points-popup", GIMP_ICON_SAMPLE_POINT,
+    NC_("sample-points-action", "Sample Point Menu"), NULL, NULL, NULL,
+    GIMP_HELP_SAMPLE_POINT_DIALOG }
+};
+
+static const GimpToggleActionEntry sample_points_toggle_actions[] =
+{
+  { "sample-points-sample-merged", NULL,
+    NC_("sample-points-action", "_Sample Merged"), "",
+    NC_("sample-points-action",
+        "Use the composite color of all visible layers"),
+    sample_points_sample_merged_cmd_callback,
+    TRUE,
+    GIMP_HELP_SAMPLE_POINT_SAMPLE_MERGED }
+};
+
+
+void
+sample_points_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "sample-points-action",
+                                 sample_points_actions,
+                                 G_N_ELEMENTS (sample_points_actions));
+
+  gimp_action_group_add_toggle_actions (group, "sample-points-action",
+                                        sample_points_toggle_actions,
+                                        G_N_ELEMENTS (sample_points_toggle_actions));
+}
+
+void
+sample_points_actions_update (GimpActionGroup *group,
+                              gpointer         data)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (data);
+
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_ACTIVE ("sample-points-sample-merged",
+              gimp_sample_point_editor_get_sample_merged (editor));
+
+#undef SET_ACTIVE
+}
diff --git a/app/actions/sample-points-actions.h b/app/actions/sample-points-actions.h
new file mode 100644
index 0000000..47b40fb
--- /dev/null
+++ b/app/actions/sample-points-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SAMPLE_POINTS_ACIONS_H__
+#define __SAMPLE_POINTS_ACIONS_H__
+
+
+void   sample_points_actions_setup  (GimpActionGroup *group);
+void   sample_points_actions_update (GimpActionGroup *group,
+                                     gpointer         data);
+
+
+#endif /* __SAMPLE_POINTS_ACTIONS_H__ */
diff --git a/app/actions/sample-points-commands.c b/app/actions/sample-points-commands.c
new file mode 100644
index 0000000..c943c6d
--- /dev/null
+++ b/app/actions/sample-points-commands.c
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "actions-types.h"
+
+#include "widgets/gimpsamplepointeditor.h"
+
+#include "sample-points-commands.h"
+
+
+/*  public functions  */
+
+void
+sample_points_sample_merged_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (data);
+  gboolean               active = g_variant_get_boolean (value);
+
+  gimp_sample_point_editor_set_sample_merged (editor, active);
+}
diff --git a/app/actions/sample-points-commands.h b/app/actions/sample-points-commands.h
new file mode 100644
index 0000000..bfdd4ef
--- /dev/null
+++ b/app/actions/sample-points-commands.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SAMPLE_POINTS_COMMANDS_H__
+#define __SAMPLE_POINTS_COMMANDS_H__
+
+
+void   sample_points_sample_merged_cmd_callback (GimpAction *action,
+                                                 GVariant   *value,
+                                                 gpointer    data);
+
+
+#endif /* __SAMPLE_POINTS_COMMANDS_H__ */
diff --git a/app/actions/select-actions.c b/app/actions/select-actions.c
new file mode 100644
index 0000000..294b077
--- /dev/null
+++ b/app/actions/select-actions.c
@@ -0,0 +1,199 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "select-actions.h"
+#include "select-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry select_actions[] =
+{
+  { "selection-popup", GIMP_ICON_SELECTION,
+    NC_("select-action", "Selection Editor Menu"), NULL, NULL, NULL,
+    GIMP_HELP_SELECTION_DIALOG },
+
+  { "select-menu", NULL, NC_("select-action", "_Select") },
+
+  { "select-all", GIMP_ICON_SELECTION_ALL,
+    NC_("select-action", "_All"), "<primary>A",
+    NC_("select-action", "Select everything"),
+    select_all_cmd_callback,
+    GIMP_HELP_SELECTION_ALL },
+
+  { "select-none", GIMP_ICON_SELECTION_NONE,
+    NC_("select-action", "_None"), "<primary><shift>A",
+    NC_("select-action", "Dismiss the selection"),
+    select_none_cmd_callback,
+    GIMP_HELP_SELECTION_NONE },
+
+  { "select-invert", GIMP_ICON_INVERT,
+    NC_("select-action", "_Invert"), "<primary>I",
+    NC_("select-action", "Invert the selection"),
+    select_invert_cmd_callback,
+    GIMP_HELP_SELECTION_INVERT },
+
+  { "select-float", GIMP_ICON_LAYER_FLOATING_SELECTION,
+    NC_("select-action", "_Float"), "<primary><shift>L",
+    NC_("select-action", "Create a floating selection"),
+    select_float_cmd_callback,
+    GIMP_HELP_SELECTION_FLOAT },
+
+  { "select-feather", NULL,
+    NC_("select-action", "Fea_ther..."), NULL,
+    NC_("select-action",
+        "Blur the selection border so that it fades out smoothly"),
+    select_feather_cmd_callback,
+    GIMP_HELP_SELECTION_FEATHER },
+
+  { "select-sharpen", NULL,
+    NC_("select-action", "_Sharpen"), NULL,
+    NC_("select-action", "Remove fuzziness from the selection"),
+    select_sharpen_cmd_callback,
+    GIMP_HELP_SELECTION_SHARPEN },
+
+  { "select-shrink", GIMP_ICON_SELECTION_SHRINK,
+    NC_("select-action", "S_hrink..."), NULL,
+    NC_("select-action", "Contract the selection"),
+    select_shrink_cmd_callback,
+    GIMP_HELP_SELECTION_SHRINK },
+
+  { "select-grow", GIMP_ICON_SELECTION_GROW,
+    NC_("select-action", "_Grow..."), NULL,
+    NC_("select-action", "Enlarge the selection"),
+    select_grow_cmd_callback,
+    GIMP_HELP_SELECTION_GROW },
+
+  { "select-border", GIMP_ICON_SELECTION_BORDER,
+    NC_("select-action", "Bo_rder..."), NULL,
+    NC_("select-action", "Replace the selection by its border"),
+    select_border_cmd_callback,
+    GIMP_HELP_SELECTION_BORDER },
+
+  { "select-flood", NULL,
+    NC_("select-action", "Re_move Holes"), NULL,
+    NC_("select-action", "Remove holes from the selection"),
+    select_flood_cmd_callback,
+    GIMP_HELP_SELECTION_FLOOD },
+
+  { "select-save", GIMP_ICON_SELECTION_TO_CHANNEL,
+    NC_("select-action", "Save to _Channel"), NULL,
+    NC_("select-action", "Save the selection to a channel"),
+    select_save_cmd_callback,
+    GIMP_HELP_SELECTION_TO_CHANNEL },
+
+  { "select-fill", GIMP_ICON_TOOL_BUCKET_FILL,
+    NC_("select-action", "_Fill Selection Outline..."), NULL,
+    NC_("select-action", "Fill the selection outline"),
+    select_fill_cmd_callback,
+    GIMP_HELP_SELECTION_FILL },
+
+  { "select-fill-last-values", GIMP_ICON_TOOL_BUCKET_FILL,
+    NC_("select-action", "_Fill Selection Outline"), NULL,
+    NC_("select-action", "Fill the selection outline with last used values"),
+    select_fill_last_vals_cmd_callback,
+    GIMP_HELP_SELECTION_FILL },
+
+  { "select-stroke", GIMP_ICON_SELECTION_STROKE,
+    NC_("select-action", "_Stroke Selection..."), NULL,
+    NC_("select-action", "Paint along the selection outline"),
+    select_stroke_cmd_callback,
+    GIMP_HELP_SELECTION_STROKE },
+
+  { "select-stroke-last-values", GIMP_ICON_SELECTION_STROKE,
+    NC_("select-action", "_Stroke Selection"), NULL,
+    NC_("select-action", "Stroke the selection with last used values"),
+    select_stroke_last_vals_cmd_callback,
+    GIMP_HELP_SELECTION_STROKE }
+};
+
+
+void
+select_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "select-action",
+                                 select_actions,
+                                 G_N_ELEMENTS (select_actions));
+}
+
+void
+select_actions_update (GimpActionGroup *group,
+                       gpointer         data)
+{
+  GimpImage    *image    = action_data_get_image (data);
+  GimpDrawable *drawable = NULL;
+  gboolean      fs       = FALSE;
+  gboolean      sel      = FALSE;
+  gboolean      writable = FALSE;
+  gboolean      children = FALSE;
+
+  if (image)
+    {
+      drawable = gimp_image_get_active_drawable (image);
+
+      if (drawable)
+        {
+          writable = ! gimp_item_is_content_locked (GIMP_ITEM (drawable));
+
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+            children = TRUE;
+        }
+
+      fs  = (gimp_image_get_floating_selection (image) != NULL);
+      sel = ! gimp_channel_is_empty (gimp_image_get_mask (image));
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("select-all",    drawable);
+  SET_SENSITIVE ("select-none",   drawable && sel);
+  SET_SENSITIVE ("select-invert", drawable);
+  SET_SENSITIVE ("select-float",  writable && !children && sel);
+
+  SET_SENSITIVE ("select-feather", drawable && sel);
+  SET_SENSITIVE ("select-sharpen", drawable && sel);
+  SET_SENSITIVE ("select-shrink",  drawable && sel);
+  SET_SENSITIVE ("select-grow",    drawable && sel);
+  SET_SENSITIVE ("select-border",  drawable && sel);
+  SET_SENSITIVE ("select-flood",   drawable && sel);
+
+  SET_SENSITIVE ("select-save",               drawable && !fs);
+  SET_SENSITIVE ("select-fill",               writable && !children && sel);
+  SET_SENSITIVE ("select-fill-last-values",   writable && !children && sel);
+  SET_SENSITIVE ("select-stroke",             writable && !children && sel);
+  SET_SENSITIVE ("select-stroke-last-values", writable && !children && sel);
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/select-actions.h b/app/actions/select-actions.h
new file mode 100644
index 0000000..250d2e1
--- /dev/null
+++ b/app/actions/select-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SELECT_ACTIONS_H__
+#define __SELECT_ACTIONS_H__
+
+
+void   select_actions_setup  (GimpActionGroup *group);
+void   select_actions_update (GimpActionGroup *group,
+                              gpointer         data);
+
+
+#endif /* __SELECT_ACTIONS_H__ */
diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c
new file mode 100644
index 0000000..687872b
--- /dev/null
+++ b/app/actions/select-commands.c
@@ -0,0 +1,685 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimpselection.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "items-commands.h"
+#include "select-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   select_feather_callback (GtkWidget *widget,
+                                       gdouble    size,
+                                       GimpUnit   unit,
+                                       gpointer   data);
+static void   select_border_callback  (GtkWidget *widget,
+                                       gdouble    size,
+                                       GimpUnit   unit,
+                                       gpointer   data);
+static void   select_grow_callback    (GtkWidget *widget,
+                                       gdouble    size,
+                                       GimpUnit   unit,
+                                       gpointer   data);
+static void   select_shrink_callback  (GtkWidget *widget,
+                                       gdouble    size,
+                                       GimpUnit   unit,
+                                       gpointer   data);
+
+
+/*  public functions  */
+
+void
+select_all_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  gimp_channel_all (gimp_image_get_mask (image), TRUE);
+  gimp_image_flush (image);
+}
+
+void
+select_none_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+select_invert_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  gimp_channel_invert (gimp_image_get_mask (image), TRUE);
+  gimp_image_flush (image);
+}
+
+void
+select_float_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GError    *error = NULL;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  if (gimp_selection_float (GIMP_SELECTION (gimp_image_get_mask (image)),
+                            gimp_image_get_active_drawable (image),
+                            action_data_get_context (data),
+                            TRUE, 0, 0, &error))
+    {
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+    }
+}
+
+void
+select_feather_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+#define FEATHER_DIALOG_KEY "gimp-selection-feather-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), FEATHER_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GtkWidget        *button;
+      gdouble           xres;
+      gdouble           yres;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      dialog = gimp_query_size_box (_("Feather Selection"),
+                                    GTK_WIDGET (gimp_display_get_shell (display)),
+                                    gimp_standard_help_func,
+                                    GIMP_HELP_SELECTION_FEATHER,
+                                    _("Feather selection by"),
+                                    config->selection_feather_radius, 0, 32767, 3,
+                                    gimp_display_get_shell (display)->unit,
+                                    MIN (xres, yres),
+                                    FALSE,
+                                    G_OBJECT (image), "disconnect",
+                                    select_feather_callback, image);
+
+      /* Edge lock button */
+      button = gtk_check_button_new_with_mnemonic (_("_Selected areas continue outside the image"));
+      g_object_set_data (G_OBJECT (dialog), "edge-lock-toggle", button);
+      gimp_help_set_help_data (button,
+                               _("When feathering, act as if selected areas "
+                                 "continued outside the image."),
+                               NULL);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                    config->selection_feather_edge_lock);
+      gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), button,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      dialogs_attach_dialog (G_OBJECT (image), FEATHER_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+select_sharpen_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  gimp_channel_sharpen (gimp_image_get_mask (image), TRUE);
+  gimp_image_flush (image);
+}
+
+void
+select_shrink_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+#define SHRINK_DIALOG_KEY "gimp-selection-shrink-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), SHRINK_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GtkWidget        *button;
+      gint              width;
+      gint              height;
+      gint              max_value;
+      gdouble           xres;
+      gdouble           yres;
+
+      gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                        NULL, NULL, &width, &height);
+      max_value = MIN (width, height) / 2;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      dialog = gimp_query_size_box (_("Shrink Selection"),
+                                    GTK_WIDGET (gimp_display_get_shell (display)),
+                                    gimp_standard_help_func,
+                                    GIMP_HELP_SELECTION_SHRINK,
+                                    _("Shrink selection by"),
+                                    config->selection_shrink_radius,
+                                    1, max_value, 0,
+                                    gimp_display_get_shell (display)->unit,
+                                    MIN (xres, yres),
+                                    FALSE,
+                                    G_OBJECT (image), "disconnect",
+                                    select_shrink_callback, image);
+
+      /* Edge lock button */
+      button = gtk_check_button_new_with_mnemonic (_("_Selected areas continue outside the image"));
+      g_object_set_data (G_OBJECT (dialog), "edge-lock-toggle", button);
+      gimp_help_set_help_data (button,
+                               _("When shrinking, act as if selected areas "
+                                 "continued outside the image."),
+                               NULL);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                    config->selection_shrink_edge_lock);
+      gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), button,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      dialogs_attach_dialog (G_OBJECT (image), SHRINK_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+select_grow_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+#define GROW_DIALOG_KEY "gimp-selection-grow-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), GROW_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      gint              width;
+      gint              height;
+      gint              max_value;
+      gdouble           xres;
+      gdouble           yres;
+
+      width  = gimp_image_get_width  (image);
+      height = gimp_image_get_height (image);
+      max_value = MAX (width, height);
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      dialog = gimp_query_size_box (_("Grow Selection"),
+                                    GTK_WIDGET (gimp_display_get_shell (display)),
+                                    gimp_standard_help_func,
+                                    GIMP_HELP_SELECTION_GROW,
+                                    _("Grow selection by"),
+                                    config->selection_grow_radius,
+                                    1, max_value, 0,
+                                    gimp_display_get_shell (display)->unit,
+                                    MIN (xres, yres),
+                                    FALSE,
+                                    G_OBJECT (image), "disconnect",
+                                    select_grow_callback, image);
+
+      dialogs_attach_dialog (G_OBJECT (image), GROW_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+select_border_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  GtkWidget   *dialog;
+  return_if_no_display (display, data);
+
+  image = gimp_display_get_image (display);
+
+#define BORDER_DIALOG_KEY "gimp-selection-border-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), BORDER_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GtkWidget        *combo;
+      GtkWidget        *button;
+      gint              width;
+      gint              height;
+      gint              max_value;
+      gdouble           xres;
+      gdouble           yres;
+
+      gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                        NULL, NULL, &width, &height);
+      max_value = MIN (width, height) / 2;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      dialog = gimp_query_size_box (_("Border Selection"),
+                                    GTK_WIDGET (gimp_display_get_shell (display)),
+                                    gimp_standard_help_func,
+                                    GIMP_HELP_SELECTION_BORDER,
+                                    _("Border selection by"),
+                                    config->selection_border_radius,
+                                    1, max_value, 0,
+                                    gimp_display_get_shell (display)->unit,
+                                    MIN (xres, yres),
+                                    FALSE,
+                                    G_OBJECT (image), "disconnect",
+                                    select_border_callback, image);
+
+      /* Border style combo */
+      combo = gimp_enum_combo_box_new (GIMP_TYPE_CHANNEL_BORDER_STYLE);
+      gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo),
+                                    _("Border style"));
+
+      gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), combo,
+                          FALSE, FALSE, 0);
+
+      g_object_set_data (G_OBJECT (dialog), "border-style-combo", combo);
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
+                                     config->selection_border_style);
+      gtk_widget_show (combo);
+
+      /* Edge lock button */
+      button = gtk_check_button_new_with_mnemonic (_("_Selected areas continue outside the image"));
+      g_object_set_data (G_OBJECT (dialog), "edge-lock-toggle", button);
+      gimp_help_set_help_data (button,
+                               _("When bordering, act as if selected areas "
+                                 "continued outside the image."),
+                               NULL);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                    config->selection_border_edge_lock);
+      gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), button,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      dialogs_attach_dialog (G_OBJECT (image), BORDER_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+select_flood_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  gimp_channel_flood (gimp_image_get_mask (image), TRUE);
+  gimp_image_flush (image);
+}
+
+void
+select_save_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpImage   *image;
+  GimpChannel *channel;
+  GtkWidget   *widget;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (gimp_image_get_mask (image)),
+                                               GIMP_TYPE_CHANNEL));
+
+  /*  saved selections are not visible by default  */
+  gimp_item_set_visible (GIMP_ITEM (channel), FALSE, FALSE);
+
+  gimp_image_add_channel (image, channel,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (image->gimp)),
+                                             image->gimp,
+                                             gimp_dialog_factory_get_singleton (),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             "gimp-channel-list");
+}
+
+void
+select_fill_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  items_fill_cmd_callback (action,
+                           image, GIMP_ITEM (gimp_image_get_mask (image)),
+                           "gimp-selection-fill-dialog",
+                           _("Fill Selection Outline"),
+                           GIMP_ICON_TOOL_BUCKET_FILL,
+                           GIMP_HELP_SELECTION_FILL,
+                           data);
+}
+
+void
+select_fill_last_vals_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  items_fill_last_vals_cmd_callback (action,
+                                     image,
+                                     GIMP_ITEM (gimp_image_get_mask (image)),
+                                     data);
+}
+
+void
+select_stroke_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  items_stroke_cmd_callback (action,
+                             image, GIMP_ITEM (gimp_image_get_mask (image)),
+                             "gimp-selection-stroke-dialog",
+                             _("Stroke Selection"),
+                             GIMP_ICON_SELECTION_STROKE,
+                             GIMP_HELP_SELECTION_STROKE,
+                             data);
+}
+
+void
+select_stroke_last_vals_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage *image;
+  return_if_no_image (image, data);
+
+  items_stroke_last_vals_cmd_callback (action,
+                                       image,
+                                       GIMP_ITEM (gimp_image_get_mask (image)),
+                                       data);
+}
+
+
+/*  private functions  */
+
+static void
+select_feather_callback (GtkWidget *widget,
+                         gdouble    size,
+                         GimpUnit   unit,
+                         gpointer   data)
+{
+  GimpImage        *image  = GIMP_IMAGE (data);
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GtkWidget        *button;
+  gdouble           radius_x;
+  gdouble           radius_y;
+
+  button = g_object_get_data (G_OBJECT (widget), "edge-lock-toggle");
+
+  g_object_set (config,
+                "selection-feather-radius", size,
+                "selection-feather-edge-lock",
+                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)),
+                NULL);
+
+  radius_x = config->selection_feather_radius;
+  radius_y = config->selection_feather_radius;
+
+  if (unit != GIMP_UNIT_PIXEL)
+    {
+      gdouble xres;
+      gdouble yres;
+      gdouble factor;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      factor = (MAX (xres, yres) /
+                MIN (xres, yres));
+
+      if (xres == MIN (xres, yres))
+        radius_y *= factor;
+      else
+        radius_x *= factor;
+    }
+
+  gimp_channel_feather (gimp_image_get_mask (image), radius_x, radius_y,
+                        config->selection_feather_edge_lock,
+                        TRUE);
+  gimp_image_flush (image);
+}
+
+static void
+select_border_callback (GtkWidget *widget,
+                        gdouble    size,
+                        GimpUnit   unit,
+                        gpointer   data)
+{
+  GimpImage        *image  = GIMP_IMAGE (data);
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GtkWidget        *combo;
+  GtkWidget        *button;
+  gdouble           radius_x;
+  gdouble           radius_y;
+  gint              border_style;
+
+  combo  = g_object_get_data (G_OBJECT (widget), "border-style-combo");
+  button = g_object_get_data (G_OBJECT (widget), "edge-lock-toggle");
+
+  gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &border_style);
+
+  g_object_set (config,
+                "selection-border-radius", size,
+                "selection-border-style",  border_style,
+                "selection-border-edge-lock",
+                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)),
+                NULL);
+
+  radius_x = ROUND (config->selection_border_radius);
+  radius_y = ROUND (config->selection_border_radius);
+
+  if (unit != GIMP_UNIT_PIXEL)
+    {
+      gdouble xres;
+      gdouble yres;
+      gdouble factor;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      factor = (MAX (xres, yres) /
+                MIN (xres, yres));
+
+      if (xres == MIN (xres, yres))
+        radius_y *= factor;
+      else
+        radius_x *= factor;
+    }
+
+  gimp_channel_border (gimp_image_get_mask (image), radius_x, radius_y,
+                       config->selection_border_style,
+                       config->selection_border_edge_lock,
+                       TRUE);
+  gimp_image_flush (image);
+}
+
+static void
+select_grow_callback (GtkWidget *widget,
+                      gdouble    size,
+                      GimpUnit   unit,
+                      gpointer   data)
+{
+  GimpImage        *image  = GIMP_IMAGE (data);
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+  gdouble           radius_x;
+  gdouble           radius_y;
+
+  g_object_set (config,
+                "selection-grow-radius", size,
+                NULL);
+
+  radius_x = ROUND (config->selection_grow_radius);
+  radius_y = ROUND (config->selection_grow_radius);
+
+  if (unit != GIMP_UNIT_PIXEL)
+    {
+      gdouble xres;
+      gdouble yres;
+      gdouble factor;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      factor = (MAX (xres, yres) /
+                MIN (xres, yres));
+
+      if (xres == MIN (xres, yres))
+        radius_y *= factor;
+      else
+        radius_x *= factor;
+    }
+
+  gimp_channel_grow (gimp_image_get_mask (image), radius_x, radius_y, TRUE);
+  gimp_image_flush (image);
+}
+
+static void
+select_shrink_callback (GtkWidget *widget,
+                        gdouble    size,
+                        GimpUnit   unit,
+                        gpointer   data)
+{
+  GimpImage        *image  = GIMP_IMAGE (data);
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GtkWidget        *button;
+  gint              radius_x;
+  gint              radius_y;
+
+  button = g_object_get_data (G_OBJECT (widget), "edge-lock-toggle");
+
+  g_object_set (config,
+                "selection-shrink-radius", size,
+                "selection-shrink-edge-lock",
+                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)),
+                NULL);
+
+  radius_x = ROUND (config->selection_shrink_radius);
+  radius_y = ROUND (config->selection_shrink_radius);
+
+  if (unit != GIMP_UNIT_PIXEL)
+    {
+      gdouble xres;
+      gdouble yres;
+      gdouble factor;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      factor = (MAX (xres, yres) /
+                MIN (xres, yres));
+
+      if (xres == MIN (xres, yres))
+        radius_y *= factor;
+      else
+        radius_x *= factor;
+    }
+
+  gimp_channel_shrink (gimp_image_get_mask (image), radius_x, radius_y,
+                       config->selection_shrink_edge_lock,
+                       TRUE);
+  gimp_image_flush (image);
+}
diff --git a/app/actions/select-commands.h b/app/actions/select-commands.h
new file mode 100644
index 0000000..e6d2a30
--- /dev/null
+++ b/app/actions/select-commands.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SELECT_COMMANDS_H__
+#define __SELECT_COMMANDS_H__
+
+
+void   select_all_cmd_callback              (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_none_cmd_callback             (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_invert_cmd_callback           (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_float_cmd_callback            (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_feather_cmd_callback          (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_sharpen_cmd_callback          (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_shrink_cmd_callback           (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_grow_cmd_callback             (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_border_cmd_callback           (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_flood_cmd_callback            (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_save_cmd_callback             (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+void   select_fill_cmd_callback             (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_fill_last_vals_cmd_callback   (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_stroke_cmd_callback           (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+void   select_stroke_last_vals_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data);
+
+
+#endif /* __SELECT_COMMANDS_H__ */
diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c
new file mode 100644
index 0000000..e3a59ad
--- /dev/null
+++ b/app/actions/templates-actions.c
@@ -0,0 +1,105 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "templates-actions.h"
+#include "templates-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry templates_actions[] =
+{
+  { "templates-popup", GIMP_ICON_TEMPLATE,
+    NC_("templates-action", "Templates Menu"), NULL, NULL, NULL,
+    GIMP_HELP_TEMPLATE_DIALOG },
+
+  { "templates-create-image", GIMP_ICON_IMAGE,
+    NC_("templates-action", "_Create Image from Template"), "",
+    NC_("templates-action", "Create a new image from the selected template"),
+    templates_create_image_cmd_callback,
+    GIMP_HELP_TEMPLATE_IMAGE_NEW },
+
+  { "templates-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("templates-action", "_New Template..."), NULL,
+    NC_("templates-action", "Create a new template"),
+    templates_new_cmd_callback,
+    GIMP_HELP_TEMPLATE_NEW },
+
+  { "templates-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("templates-action", "D_uplicate Template..."), "",
+    NC_("templates-action", "Duplicate this template"),
+    templates_duplicate_cmd_callback,
+    GIMP_HELP_TEMPLATE_DUPLICATE },
+
+  { "templates-edit", GIMP_ICON_EDIT,
+    NC_("templates-action", "_Edit Template..."), NULL,
+    NC_("templates-action", "Edit this template"),
+    templates_edit_cmd_callback,
+    GIMP_HELP_TEMPLATE_EDIT },
+
+  { "templates-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("templates-action", "_Delete Template"), NULL,
+    NC_("templates-action", "Delete this template"),
+    templates_delete_cmd_callback,
+    GIMP_HELP_TEMPLATE_DELETE }
+};
+
+
+void
+templates_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "templates-action",
+                                 templates_actions,
+                                 G_N_ELEMENTS (templates_actions));
+}
+
+void
+templates_actions_update (GimpActionGroup *group,
+                          gpointer         data)
+{
+  GimpContext  *context  = action_data_get_context (data);
+  GimpTemplate *template = NULL;
+
+  if (context)
+    template = gimp_context_get_template (context);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("templates-create-image", template);
+  SET_SENSITIVE ("templates-new",          context);
+  SET_SENSITIVE ("templates-duplicate",    template);
+  SET_SENSITIVE ("templates-edit",         template);
+  SET_SENSITIVE ("templates-delete",       template);
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/templates-actions.h b/app/actions/templates-actions.h
new file mode 100644
index 0000000..904a40d
--- /dev/null
+++ b/app/actions/templates-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEMPLATES_ACTIONS_H__
+#define __TEMPLATES_ACTIONS_H__
+
+
+void   templates_actions_setup  (GimpActionGroup *group);
+void   templates_actions_update (GimpActionGroup *group,
+                                 gpointer         data);
+
+
+#endif /* __TEMPLATES_COMMANDS_H__ */
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
new file mode 100644
index 0000000..6039de0
--- /dev/null
+++ b/app/actions/templates-commands.c
@@ -0,0 +1,345 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage-new.h"
+#include "core/gimptemplate.h"
+
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimptemplateeditor.h"
+#include "widgets/gimptemplateview.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/template-options-dialog.h"
+
+#include "actions.h"
+#include "templates-commands.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  GimpContext   *context;
+  GimpContainer *container;
+  GimpTemplate  *template;
+} TemplateDeleteData;
+
+
+/*  local function prototypes  */
+
+static void   templates_new_callback     (GtkWidget          *dialog,
+                                          GimpTemplate       *template,
+                                          GimpTemplate       *edit_template,
+                                          GimpContext        *context,
+                                          gpointer            user_data);
+static void   templates_edit_callback    (GtkWidget          *dialog,
+                                          GimpTemplate       *template,
+                                          GimpTemplate       *edit_template,
+                                          GimpContext        *context,
+                                          gpointer            user_data);
+static void   templates_delete_response  (GtkWidget          *dialog,
+                                          gint                response_id,
+                                          TemplateDeleteData *delete_data);
+static void   templates_delete_data_free (TemplateDeleteData *delete_data);
+
+
+/*  public functions */
+
+void
+templates_create_image_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  Gimp                *gimp;
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpTemplate        *template;
+  return_if_no_gimp (gimp, data);
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  template = gimp_context_get_template (context);
+
+  if (template && gimp_container_have (container, GIMP_OBJECT (template)))
+    {
+      GtkWidget *widget = GTK_WIDGET (editor);
+      GimpImage *image;
+
+      image = gimp_image_new_from_template (gimp, template, context);
+      gimp_create_display (gimp, image, gimp_template_get_unit (template), 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (image);
+
+      gimp_image_new_set_last_template (gimp, template);
+    }
+}
+
+void
+templates_new_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GtkWidget           *dialog;
+
+  context = gimp_container_view_get_context (editor->view);
+
+#define NEW_DIALOG_KEY "gimp-template-new-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (context->gimp), NEW_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = template_options_dialog_new (NULL, context,
+                                            GTK_WIDGET (editor),
+                                            _("New Template"),
+                                            "gimp-template-new",
+                                            GIMP_ICON_TEMPLATE,
+                                            _("Create a New Template"),
+                                            GIMP_HELP_TEMPLATE_NEW,
+                                            templates_new_callback,
+                                            NULL);
+
+      dialogs_attach_dialog (G_OBJECT (context->gimp), NEW_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+templates_duplicate_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpTemplate        *template;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  template = gimp_context_get_template (context);
+
+  if (template && gimp_container_have (container, GIMP_OBJECT (template)))
+    {
+      GimpTemplate *new_template;
+
+      new_template = gimp_config_duplicate (GIMP_CONFIG (template));
+
+      gimp_container_add (container, GIMP_OBJECT (new_template));
+      gimp_context_set_by_type (context,
+                                gimp_container_get_children_type (container),
+                                GIMP_OBJECT (new_template));
+      g_object_unref (new_template);
+
+      templates_edit_cmd_callback (action, value, data);
+    }
+}
+
+void
+templates_edit_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpTemplate        *template;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  template = gimp_context_get_template (context);
+
+  if (template && gimp_container_have (container, GIMP_OBJECT (template)))
+    {
+      GtkWidget *dialog;
+
+#define EDIT_DIALOG_KEY "gimp-template-edit-dialog"
+
+      dialog = dialogs_get_dialog (G_OBJECT (template), EDIT_DIALOG_KEY);
+
+      if (! dialog)
+        {
+          dialog = template_options_dialog_new (template, context,
+                                                GTK_WIDGET (editor),
+                                                _("Edit Template"),
+                                                "gimp-template-edit",
+                                                GIMP_ICON_EDIT,
+                                                _("Edit Template"),
+                                                GIMP_HELP_TEMPLATE_EDIT,
+                                                templates_edit_callback,
+                                                NULL);
+
+          dialogs_attach_dialog (G_OBJECT (template), EDIT_DIALOG_KEY, dialog);
+        }
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+}
+
+void
+templates_delete_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContainer       *container;
+  GimpContext         *context;
+  GimpTemplate        *template;
+
+  container = gimp_container_view_get_container (editor->view);
+  context   = gimp_container_view_get_context (editor->view);
+
+  template = gimp_context_get_template (context);
+
+  if (template && gimp_container_have (container, GIMP_OBJECT (template)))
+    {
+      TemplateDeleteData *delete_data = g_slice_new (TemplateDeleteData);
+      GtkWidget          *dialog;
+
+      delete_data->context   = context;
+      delete_data->container = container;
+      delete_data->template  = template;
+
+      dialog =
+        gimp_message_dialog_new (_("Delete Template"), "edit-delete",
+                                 GTK_WIDGET (editor), 0,
+                                 gimp_standard_help_func, NULL,
+
+                                 _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                 _("_Delete"), GTK_RESPONSE_OK,
+
+                                 NULL);
+
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      g_object_weak_ref (G_OBJECT (dialog),
+                         (GWeakNotify) templates_delete_data_free, delete_data);
+
+      g_signal_connect_object (template, "disconnect",
+                               G_CALLBACK (gtk_widget_destroy),
+                               dialog, G_CONNECT_SWAPPED);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (templates_delete_response),
+                        delete_data);
+
+      gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                         _("Are you sure you want to delete "
+                                           "template '%s' from the list and "
+                                           "from disk?"),
+                                         gimp_object_get_name (template));
+      gtk_widget_show (dialog);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+templates_new_callback (GtkWidget    *dialog,
+                        GimpTemplate *template,
+                        GimpTemplate *edit_template,
+                        GimpContext  *context,
+                        gpointer      user_data)
+{
+  gimp_container_add (context->gimp->templates, GIMP_OBJECT (edit_template));
+  gimp_context_set_template (gimp_get_user_context (context->gimp),
+                             edit_template);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+templates_edit_callback (GtkWidget    *dialog,
+                         GimpTemplate *template,
+                         GimpTemplate *edit_template,
+                         GimpContext  *context,
+                         gpointer      user_data)
+{
+  gimp_config_sync (G_OBJECT (edit_template),
+                    G_OBJECT (template), 0);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+templates_delete_response (GtkWidget          *dialog,
+                           gint                response_id,
+                           TemplateDeleteData *delete_data)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpObject *new_active = NULL;
+
+      if (delete_data->template ==
+          gimp_context_get_template (delete_data->context))
+        {
+          new_active = gimp_container_get_neighbor_of (delete_data->container,
+                                                       GIMP_OBJECT (delete_data->template));
+        }
+
+      if (gimp_container_have (delete_data->container,
+                               GIMP_OBJECT (delete_data->template)))
+        {
+          if (new_active)
+            gimp_context_set_by_type (delete_data->context,
+                                      gimp_container_get_children_type (delete_data->container),
+                                      new_active);
+
+          gimp_container_remove (delete_data->container,
+                                 GIMP_OBJECT (delete_data->template));
+        }
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+templates_delete_data_free (TemplateDeleteData *delete_data)
+{
+  g_slice_free (TemplateDeleteData, delete_data);
+}
diff --git a/app/actions/templates-commands.h b/app/actions/templates-commands.h
new file mode 100644
index 0000000..91356f2
--- /dev/null
+++ b/app/actions/templates-commands.h
@@ -0,0 +1,39 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEMPLATES_COMMANDS_H__
+#define __TEMPLATES_COMMANDS_H__
+
+
+void   templates_create_image_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+void   templates_new_cmd_callback          (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+void   templates_duplicate_cmd_callback    (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+void   templates_edit_cmd_callback         (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+void   templates_delete_cmd_callback       (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data);
+
+
+#endif /* __TEMPLATES_COMMANDS_H__ */
diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c
new file mode 100644
index 0000000..5a31220
--- /dev/null
+++ b/app/actions/text-editor-actions.c
@@ -0,0 +1,148 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimptexteditor.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "text-editor-actions.h"
+#include "text-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry text_editor_actions[] =
+{
+  { "text-editor-toolbar", GIMP_ICON_EDIT,
+    "Text Editor Toolbar", NULL, NULL, NULL,
+    GIMP_HELP_TEXT_EDITOR_DIALOG },
+
+  { "text-editor-load", GIMP_ICON_DOCUMENT_OPEN,
+    NC_("text-editor-action", "Open"), NULL,
+    NC_("text-editor-action", "Load text from file"),
+    text_editor_load_cmd_callback,
+    NULL },
+
+  { "text-editor-clear", GIMP_ICON_EDIT_CLEAR,
+    NC_("text-editor-action", "Clear"), NULL,
+    NC_("text-editor-action", "Clear all text"),
+    text_editor_clear_cmd_callback,
+    NULL }
+};
+
+static const GimpRadioActionEntry text_editor_direction_actions[] =
+{
+  { "text-editor-direction-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR,
+    NC_("text-editor-action", "LTR"), NULL,
+    NC_("text-editor-action", "From left to right"),
+    GIMP_TEXT_DIRECTION_LTR,
+    NULL },
+
+  { "text-editor-direction-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL,
+    NC_("text-editor-action", "RTL"), NULL,
+    NC_("text-editor-action", "From right to left"),
+    GIMP_TEXT_DIRECTION_RTL,
+    NULL },
+
+  { "text-editor-direction-ttb-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL,
+    NC_("text-editor-action", "TTB-RTL"), NULL,
+    NC_("text-editor-action", "Vertical, right to left (mixed orientation)"),
+    GIMP_TEXT_DIRECTION_TTB_RTL,
+    NULL },
+
+  { "text-editor-direction-ttb-rtl-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
+    NC_("text-editor-action", "TTB-RTL-UPRIGHT"), NULL,
+    NC_("text-editor-action", "Vertical, right to left (upright orientation)"),
+    GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
+    NULL },
+
+  { "text-editor-direction-ttb-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR,
+    NC_("text-editor-action", "TTB-LTR"), NULL,
+    NC_("text-editor-action", "Vertical, left to right (mixed orientation)"),
+    GIMP_TEXT_DIRECTION_TTB_LTR,
+    NULL },
+
+  { "text-editor-direction-ttb-ltr-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
+    NC_("text-editor-action", "TTB-LTR-UPRIGHT"), NULL,
+    NC_("text-editor-action", "Vertical, left to right (upright orientation)"),
+    GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
+    NULL },
+};
+
+
+void
+text_editor_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "text-editor-action",
+                                 text_editor_actions,
+                                 G_N_ELEMENTS (text_editor_actions));
+
+  gimp_action_group_add_radio_actions (group, "text-editor-action",
+                                       text_editor_direction_actions,
+                                       G_N_ELEMENTS (text_editor_direction_actions),
+                                       NULL,
+                                       GIMP_TEXT_DIRECTION_LTR,
+                                       text_editor_direction_cmd_callback);
+}
+
+void
+text_editor_actions_update (GimpActionGroup *group,
+                            gpointer         data)
+{
+  GimpTextEditor *editor = GIMP_TEXT_EDITOR (data);
+
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  switch (editor->base_dir)
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+      SET_ACTIVE ("text-editor-direction-ltr", TRUE);
+      break;
+
+    case GIMP_TEXT_DIRECTION_RTL:
+      SET_ACTIVE ("text-editor-direction-rtl", TRUE);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+      SET_ACTIVE ("text-editor-direction-ttb-rtl", TRUE);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+      SET_ACTIVE ("text-editor-direction-ttb-rtl-upright", TRUE);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+      SET_ACTIVE ("text-editor-direction-ttb-ltr", TRUE);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      SET_ACTIVE ("text-editor-direction-ttb-ltr-upright", TRUE);
+      break;
+    }
+
+#undef SET_ACTIVE
+}
diff --git a/app/actions/text-editor-actions.h b/app/actions/text-editor-actions.h
new file mode 100644
index 0000000..a2940b7
--- /dev/null
+++ b/app/actions/text-editor-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEXT_EDITOR_ACIONS_H__
+#define __TEXT_EDITOR_ACIONS_H__
+
+
+void   text_editor_actions_setup  (GimpActionGroup *group);
+void   text_editor_actions_update (GimpActionGroup *group,
+                                   gpointer         data);
+
+
+#endif /* __TEXT_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/text-editor-commands.c b/app/actions/text-editor-commands.c
new file mode 100644
index 0000000..3a7764d
--- /dev/null
+++ b/app/actions/text-editor-commands.c
@@ -0,0 +1,153 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimptextbuffer.h"
+#include "widgets/gimptexteditor.h"
+#include "widgets/gimpuimanager.h"
+
+#include "text-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   text_editor_load_response (GtkWidget      *dialog,
+                                         gint            response_id,
+                                         GimpTextEditor *editor);
+
+
+/*  public functions  */
+
+void
+text_editor_load_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpTextEditor *editor = GIMP_TEXT_EDITOR (data);
+
+  if (! editor->file_dialog)
+    {
+      GtkWidget *dialog;
+
+      dialog = editor->file_dialog =
+        gtk_file_chooser_dialog_new (_("Open Text File (UTF-8)"),
+                                     GTK_WINDOW (editor),
+                                     GTK_FILE_CHOOSER_ACTION_OPEN,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
+
+                                     NULL);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      gtk_window_set_role (GTK_WINDOW (dialog), "gimp-text-load-file");
+      gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+      gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+
+      g_object_add_weak_pointer (G_OBJECT (dialog),
+                                 (gpointer) &editor->file_dialog);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (text_editor_load_response),
+                        editor);
+      g_signal_connect (dialog, "delete-event",
+                        G_CALLBACK (gtk_true),
+                        NULL);
+    }
+
+  gtk_window_present (GTK_WINDOW (editor->file_dialog));
+}
+
+void
+text_editor_clear_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpTextEditor *editor = GIMP_TEXT_EDITOR (data);
+  GtkTextBuffer  *buffer;
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor->view));
+
+  gtk_text_buffer_set_text (buffer, "", 0);
+}
+
+void
+text_editor_direction_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpTextEditor    *editor = GIMP_TEXT_EDITOR (data);
+  GimpTextDirection  direction;
+
+  direction = (GimpTextDirection) g_variant_get_int32 (value);
+
+  gimp_text_editor_set_direction (editor, direction);
+}
+
+
+/*  private functions  */
+
+static void
+text_editor_load_response (GtkWidget      *dialog,
+                           gint            response_id,
+                           GimpTextEditor *editor)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GtkTextBuffer *buffer;
+      GFile         *file;
+      GError        *error = NULL;
+
+      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor->view));
+      file   = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+
+      if (! gimp_text_buffer_load (GIMP_TEXT_BUFFER (buffer), file, &error))
+        {
+          gimp_message (editor->ui_manager->gimp, G_OBJECT (dialog),
+                        GIMP_MESSAGE_ERROR,
+                        _("Could not open '%s' for reading: %s"),
+                        gimp_file_get_utf8_name (file),
+                        error->message);
+          g_clear_error (&error);
+          g_object_unref (file);
+          return;
+        }
+
+      g_object_unref (file);
+    }
+
+  gtk_widget_hide (dialog);
+}
diff --git a/app/actions/text-editor-commands.h b/app/actions/text-editor-commands.h
new file mode 100644
index 0000000..1ea89d0
--- /dev/null
+++ b/app/actions/text-editor-commands.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEXT_EDITOR_COMMANDS_H__
+#define __TEXT_EDITOR_COMMANDS_H__
+
+
+void   text_editor_load_cmd_callback      (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+void   text_editor_clear_cmd_callback     (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+void   text_editor_direction_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+
+
+#endif /* __TEXT_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
new file mode 100644
index 0000000..1692253
--- /dev/null
+++ b/app/actions/text-tool-actions.c
@@ -0,0 +1,229 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpimage.h"
+
+#include "text/gimptextlayer.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimptexteditor.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "tools/gimptool.h"
+#include "tools/gimptexttool.h"
+
+#include "text-tool-actions.h"
+#include "text-tool-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry text_tool_actions[] =
+{
+  { "text-tool-popup", NULL,
+    NC_("text-tool-action", "Text Tool Menu"), NULL, NULL, NULL,
+    NULL },
+
+  { "text-tool-input-methods-menu", NULL,
+    NC_("text-tool-action", "Input _Methods"), NULL, NULL, NULL,
+    NULL },
+
+  { "text-tool-cut", GIMP_ICON_EDIT_CUT,
+    NC_("text-tool-action", "Cu_t"), NULL, "<primary>X",
+    text_tool_cut_cmd_callback,
+    NULL },
+
+  { "text-tool-copy", GIMP_ICON_EDIT_COPY,
+    NC_("text-tool-action", "_Copy"), NULL, "<primary>C",
+    text_tool_copy_cmd_callback,
+    NULL },
+
+  { "text-tool-paste", GIMP_ICON_EDIT_PASTE,
+    NC_("text-tool-action", "_Paste"), NULL, "<primary>V",
+    text_tool_paste_cmd_callback,
+    NULL },
+
+  { "text-tool-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("text-tool-action", "_Delete"), NULL, NULL,
+    text_tool_delete_cmd_callback,
+    NULL },
+
+  { "text-tool-load", GIMP_ICON_DOCUMENT_OPEN,
+    NC_("text-tool-action", "_Open text file..."), NULL, NULL,
+    text_tool_load_cmd_callback,
+    NULL },
+
+  { "text-tool-clear", GIMP_ICON_EDIT_CLEAR,
+    NC_("text-tool-action", "Cl_ear"), NULL,
+    NC_("text-tool-action", "Clear all text"),
+    text_tool_clear_cmd_callback,
+    NULL },
+
+  { "text-tool-text-to-path", GIMP_ICON_PATH,
+    NC_("text-tool-action", "_Path from Text"), "",
+    NC_("text-tool-action",
+        "Create a path from the outlines of the current text"),
+    text_tool_text_to_path_cmd_callback,
+    NULL },
+
+  { "text-tool-text-along-path", GIMP_ICON_PATH,
+    NC_("text-tool-action", "Text _along Path"), "",
+    NC_("text-tool-action",
+        "Bend the text along the currently active path"),
+    text_tool_text_along_path_cmd_callback,
+    NULL }
+};
+
+static const GimpRadioActionEntry text_tool_direction_actions[] =
+{
+  { "text-tool-direction-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR,
+    NC_("text-tool-action", "From left to right"), NULL, NULL,
+    GIMP_TEXT_DIRECTION_LTR,
+    NULL },
+
+  { "text-tool-direction-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL,
+    NC_("text-tool-action", "From right to left"), NULL, NULL,
+    GIMP_TEXT_DIRECTION_RTL,
+    NULL },
+
+  { "text-tool-direction-ttb-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL,
+    NC_("text-tool-action", "Vertical, right to left (mixed orientation)"), NULL, NULL,
+    GIMP_TEXT_DIRECTION_TTB_RTL,
+    NULL },
+
+  { "text-tool-direction-ttb-rtl-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
+    NC_("text-tool-action", "Vertical, right to left (upright orientation)"), NULL, NULL,
+    GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
+    NULL },
+
+  { "text-tool-direction-ttb-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR,
+    NC_("text-tool-action", "Vertical, left to right (mixed orientation)"), NULL, NULL,
+    GIMP_TEXT_DIRECTION_TTB_LTR,
+    NULL },
+
+  { "text-tool-direction-ttb-ltr-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
+    NC_("text-tool-action", "Vertical, left to right (upright orientation)"), NULL, NULL,
+    GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
+    NULL }
+};
+
+
+#define SET_HIDE_EMPTY(action,condition) \
+        gimp_action_group_set_action_hide_empty (group, action, (condition) != 0)
+
+void
+text_tool_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "text-tool-action",
+                                 text_tool_actions,
+                                 G_N_ELEMENTS (text_tool_actions));
+
+  gimp_action_group_add_radio_actions (group, "text-tool-action",
+                                       text_tool_direction_actions,
+                                       G_N_ELEMENTS (text_tool_direction_actions),
+                                       NULL,
+                                       GIMP_TEXT_DIRECTION_LTR,
+                                       text_tool_direction_cmd_callback);
+
+  SET_HIDE_EMPTY ("text-tool-input-methods-menu", FALSE);
+}
+
+/* The following code is written on the assumption that this is for a
+ * context menu, activated by right-clicking in a text layer.
+ * Therefore, the tool must have a display.  If for any reason the
+ * code is adapted to a different situation, some existence testing
+ * will need to be added.
+ */
+void
+text_tool_actions_update (GimpActionGroup *group,
+                          gpointer         data)
+{
+  GimpTextTool     *text_tool  = GIMP_TEXT_TOOL (data);
+  GimpDisplay      *display    = GIMP_TOOL (text_tool)->display;
+  GimpImage        *image      = gimp_display_get_image (display);
+  GimpLayer        *layer;
+  GimpVectors      *vectors;
+  GimpDisplayShell *shell;
+  GtkClipboard     *clipboard;
+  gboolean          text_layer = FALSE;
+  gboolean          text_sel   = FALSE;   /* some text is selected        */
+  gboolean          clip       = FALSE;   /* clipboard has text available */
+  gboolean          input_method_menu;
+  gboolean          unicode_menu;
+  GimpTextDirection direction;
+  gint              i;
+
+  layer = gimp_image_get_active_layer (image);
+
+  if (layer)
+    text_layer = gimp_item_is_text_layer (GIMP_ITEM (layer));
+
+  vectors = gimp_image_get_active_vectors (image);
+
+  text_sel = gimp_text_tool_get_has_text_selection (text_tool);
+
+  /* see whether there is text available for pasting */
+  shell = gimp_display_get_shell (display);
+  clipboard = gtk_widget_get_clipboard (shell->canvas,
+                                        GDK_SELECTION_CLIPBOARD);
+  clip = gtk_clipboard_wait_is_text_available (clipboard);
+
+  g_object_get (gtk_widget_get_settings (shell->canvas),
+                "gtk-show-input-method-menu", &input_method_menu,
+                "gtk-show-unicode-menu",      &unicode_menu,
+                NULL);
+
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("text-tool-cut",             text_sel);
+  SET_SENSITIVE ("text-tool-copy",            text_sel);
+  SET_SENSITIVE ("text-tool-paste",           clip);
+  SET_SENSITIVE ("text-tool-delete",          text_sel);
+  SET_SENSITIVE ("text-tool-clear",           text_layer);
+  SET_SENSITIVE ("text-tool-load",            image);
+  SET_SENSITIVE ("text-tool-text-to-path",    text_layer);
+  SET_SENSITIVE ("text-tool-text-along-path", text_layer && vectors);
+
+  direction = gimp_text_tool_get_direction (text_tool);
+  for (i = 0; i < G_N_ELEMENTS (text_tool_direction_actions); i++)
+    {
+      if (direction == text_tool_direction_actions[i].value)
+        {
+          SET_ACTIVE (text_tool_direction_actions[i].name, TRUE);
+          break;
+        }
+    }
+
+  SET_VISIBLE ("text-tool-input-methods-menu", input_method_menu);
+}
diff --git a/app/actions/text-tool-actions.h b/app/actions/text-tool-actions.h
new file mode 100644
index 0000000..5efca91
--- /dev/null
+++ b/app/actions/text-tool-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEXT_TOOL_ACTIONS_H__
+#define __TEXT_TOOL_ACTIONS_H__
+
+
+void   text_tool_actions_setup  (GimpActionGroup *group);
+void   text_tool_actions_update (GimpActionGroup *group,
+                                 gpointer         data);
+
+
+#endif /* __TEXT_TOOL_ACTIONS_H__ */
diff --git a/app/actions/text-tool-commands.c b/app/actions/text-tool-commands.c
new file mode 100644
index 0000000..296bbf3
--- /dev/null
+++ b/app/actions/text-tool-commands.c
@@ -0,0 +1,229 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimptextbuffer.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+
+#include "tools/gimptexttool.h"
+
+#include "dialogs/dialogs.h"
+
+#include "text-tool-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   text_tool_load_dialog_response (GtkWidget    *dialog,
+                                              gint          response_id,
+                                              GimpTextTool *tool);
+
+
+/*  public functions  */
+
+void
+text_tool_cut_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+
+  gimp_text_tool_cut_clipboard (text_tool);
+}
+
+void
+text_tool_copy_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+
+  gimp_text_tool_copy_clipboard (text_tool);
+}
+
+void
+text_tool_paste_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+
+  gimp_text_tool_paste_clipboard (text_tool);
+}
+
+void
+text_tool_delete_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+
+  gimp_text_tool_delete_selection (text_tool);
+}
+
+void
+text_tool_load_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+  GtkWidget    *dialog;
+
+  dialog = dialogs_get_dialog (G_OBJECT (text_tool), "gimp-text-file-dialog");
+
+  if (! dialog)
+    {
+      GtkWidget *parent = NULL;
+
+      if (GIMP_TOOL (text_tool)->display)
+        {
+          GimpDisplayShell *shell;
+
+          shell = gimp_display_get_shell (GIMP_TOOL (text_tool)->display);
+
+          parent = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+        }
+
+      dialog = gtk_file_chooser_dialog_new (_("Open Text File (UTF-8)"),
+                                            parent ? GTK_WINDOW (parent) : NULL,
+                                            GTK_FILE_CHOOSER_ACTION_OPEN,
+
+                                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                            _("_Open"),   GTK_RESPONSE_OK,
+
+                                            NULL);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      gtk_window_set_role (GTK_WINDOW (dialog), "gimp-text-load-file");
+      gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (text_tool_load_dialog_response),
+                        text_tool);
+      g_signal_connect (dialog, "delete-event",
+                        G_CALLBACK (gtk_true),
+                        NULL);
+
+      dialogs_attach_dialog (G_OBJECT (text_tool),
+                             "gimp-text-file-dialog", dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+text_tool_clear_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpTextTool  *text_tool = GIMP_TEXT_TOOL (data);
+  GtkTextBuffer *buffer    = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    start, end;
+
+  gtk_text_buffer_get_bounds (buffer, &start, &end);
+  gtk_text_buffer_select_range (buffer, &start, &end);
+  gimp_text_tool_delete_selection (text_tool);
+}
+
+void
+text_tool_text_to_path_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+
+  gimp_text_tool_create_vectors (text_tool);
+}
+
+void
+text_tool_text_along_path_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
+
+  gimp_text_tool_create_vectors_warped (text_tool);
+}
+
+void
+text_tool_direction_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (data);
+  GimpTextDirection  direction;
+
+  direction = (GimpTextDirection) g_variant_get_int32 (value);
+
+  g_object_set (text_tool->proxy,
+                "base-direction", direction,
+                NULL);
+}
+
+
+/*  private functions  */
+
+static void
+text_tool_load_dialog_response (GtkWidget    *dialog,
+                                gint          response_id,
+                                GimpTextTool *tool)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GFile  *file  = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      GError *error = NULL;
+
+      if (! gimp_text_buffer_load (tool->buffer, file, &error))
+        {
+          gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (dialog),
+                        GIMP_MESSAGE_ERROR,
+                        _("Could not open '%s' for reading: %s"),
+                        gimp_file_get_utf8_name (file),
+                        error->message);
+          g_clear_error (&error);
+          g_object_unref (file);
+          return;
+        }
+
+      g_object_unref (file);
+    }
+
+  gtk_widget_hide (dialog);
+}
diff --git a/app/actions/text-tool-commands.h b/app/actions/text-tool-commands.h
new file mode 100644
index 0000000..d7bef1c
--- /dev/null
+++ b/app/actions/text-tool-commands.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEXT_TOOL_COMMANDS_H__
+#define __TEXT_TOOL_COMMANDS_H__
+
+
+void   text_tool_cut_cmd_callback             (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_copy_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_paste_cmd_callback           (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_delete_cmd_callback          (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_load_cmd_callback            (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_clear_cmd_callback           (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_text_to_path_cmd_callback    (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_text_along_path_cmd_callback (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+void   text_tool_direction_cmd_callback       (GimpAction *action,
+                                               GVariant   *value,
+                                               gpointer    data);
+
+
+#endif /* __TEXT_TOOL_COMMANDS_H__ */
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
new file mode 100644
index 0000000..10c59eb
--- /dev/null
+++ b/app/actions/tool-options-actions.c
@@ -0,0 +1,238 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptoolpreset.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "tool-options-actions.h"
+#include "tool-options-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void tool_options_actions_update_presets (GimpActionGroup    *group,
+                                                 const gchar        *action_prefix,
+                                                 GimpActionCallback  callback,
+                                                 const gchar        *help_id,
+                                                 GimpContainer      *presets,
+                                                 gboolean            need_writable,
+                                                 gboolean            need_deletable);
+
+
+/*  global variables  */
+
+static const GimpActionEntry tool_options_actions[] =
+{
+  { "tool-options-popup", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tool-options-action", "Tool Options Menu"), NULL, NULL, NULL,
+    GIMP_HELP_TOOL_OPTIONS_DIALOG },
+
+  { "tool-options-save-preset-menu", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("tool-options-action", "_Save Tool Preset"), "", NULL, NULL,
+    GIMP_HELP_TOOL_OPTIONS_SAVE },
+
+  { "tool-options-restore-preset-menu", GIMP_ICON_DOCUMENT_REVERT,
+    NC_("tool-options-action", "_Restore Tool Preset"), "", NULL, NULL,
+    GIMP_HELP_TOOL_OPTIONS_RESTORE },
+
+  { "tool-options-edit-preset-menu", GIMP_ICON_EDIT,
+    NC_("tool-options-action", "E_dit Tool Preset"), NULL, NULL, NULL,
+    GIMP_HELP_TOOL_OPTIONS_EDIT },
+
+  { "tool-options-delete-preset-menu", GIMP_ICON_EDIT_DELETE,
+    NC_("tool-options-action", "_Delete Tool Preset"), "", NULL, NULL,
+    GIMP_HELP_TOOL_OPTIONS_DELETE },
+
+  { "tool-options-save-new-preset", GIMP_ICON_DOCUMENT_NEW,
+    NC_("tool-options-action", "_New Tool Preset..."), "", NULL,
+    tool_options_save_new_preset_cmd_callback,
+    GIMP_HELP_TOOL_OPTIONS_SAVE },
+
+  { "tool-options-reset", GIMP_ICON_RESET,
+    NC_("tool-options-action", "R_eset Tool Options"), NULL,
+    NC_("tool-options-action", "Reset to default values"),
+    tool_options_reset_cmd_callback,
+    GIMP_HELP_TOOL_OPTIONS_RESET },
+
+  { "tool-options-reset-all", GIMP_ICON_RESET,
+    NC_("tool-options-action", "Reset _all Tool Options"), NULL,
+    NC_("tool-options-action", "Reset all tool options"),
+    tool_options_reset_all_cmd_callback,
+    GIMP_HELP_TOOL_OPTIONS_RESET }
+};
+
+
+/*  public functions  */
+
+#define SET_VISIBLE(action,condition) \
+        gimp_action_group_set_action_visible (group, action, (condition) != 0)
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_HIDE_EMPTY(action,condition) \
+        gimp_action_group_set_action_hide_empty (group, action, (condition) != 0)
+
+void
+tool_options_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "tool-options-action",
+                                 tool_options_actions,
+                                 G_N_ELEMENTS (tool_options_actions));
+
+  SET_HIDE_EMPTY ("tool-options-restore-preset-menu", FALSE);
+  SET_HIDE_EMPTY ("tool-options-edit-preset-menu",    FALSE);
+  SET_HIDE_EMPTY ("tool-options-delete-preset-menu",  FALSE);
+}
+
+void
+tool_options_actions_update (GimpActionGroup *group,
+                             gpointer         data)
+{
+  GimpContext  *context   = gimp_get_user_context (group->gimp);
+  GimpToolInfo *tool_info = gimp_context_get_tool (context);
+
+  SET_VISIBLE ("tool-options-save-preset-menu",    tool_info->presets);
+  SET_VISIBLE ("tool-options-restore-preset-menu", tool_info->presets);
+  SET_VISIBLE ("tool-options-edit-preset-menu",    tool_info->presets);
+  SET_VISIBLE ("tool-options-delete-preset-menu",  tool_info->presets);
+
+  tool_options_actions_update_presets (group, "tool-options-save-preset",
+                                       tool_options_save_preset_cmd_callback,
+                                       GIMP_HELP_TOOL_OPTIONS_SAVE,
+                                       tool_info->presets,
+                                       TRUE /* writable */,
+                                       FALSE /* deletable */);
+
+  tool_options_actions_update_presets (group, "tool-options-restore-preset",
+                                       tool_options_restore_preset_cmd_callback,
+                                       GIMP_HELP_TOOL_OPTIONS_RESTORE,
+                                       tool_info->presets,
+                                       FALSE /* writable */,
+                                       FALSE /* deletable */);
+
+  tool_options_actions_update_presets (group, "tool-options-edit-preset",
+                                       tool_options_edit_preset_cmd_callback,
+                                       GIMP_HELP_TOOL_OPTIONS_EDIT,
+                                       tool_info->presets,
+                                       FALSE /* writable */,
+                                       FALSE /* deletable */);
+
+  tool_options_actions_update_presets (group, "tool-options-delete-preset",
+                                       tool_options_delete_preset_cmd_callback,
+                                       GIMP_HELP_TOOL_OPTIONS_DELETE,
+                                       tool_info->presets,
+                                       FALSE /* writable */,
+                                       TRUE /* deletable */);
+}
+
+
+/*  private function  */
+
+static void
+tool_options_actions_update_presets (GimpActionGroup    *group,
+                                     const gchar        *action_prefix,
+                                     GimpActionCallback  callback,
+                                     const gchar        *help_id,
+                                     GimpContainer      *presets,
+                                     gboolean            need_writable,
+                                     gboolean            need_deletable)
+{
+  GList *list;
+  gint   n_children = 0;
+  gint   i;
+
+  for (i = 0; ; i++)
+    {
+      gchar      *action_name;
+      GimpAction *action;
+
+      action_name = g_strdup_printf ("%s-%03d", action_prefix, i);
+      action = gimp_action_group_get_action (group, action_name);
+      g_free (action_name);
+
+      if (! action)
+        break;
+
+      gimp_action_group_remove_action (group, action);
+    }
+
+  if (presets)
+    n_children = gimp_container_get_n_children (presets);
+
+  if (n_children > 0)
+    {
+      GimpEnumActionEntry entry;
+
+      entry.name           = NULL;
+      entry.label          = NULL;
+      entry.accelerator    = "";
+      entry.tooltip        = NULL;
+      entry.value          = 0;
+      entry.value_variable = FALSE;
+      entry.help_id        = help_id;
+
+      for (list = GIMP_LIST (presets)->queue->head, i = 0;
+           list;
+           list = g_list_next (list), i++)
+        {
+          GimpObject *preset = list->data;
+          GdkPixbuf  *pixbuf = NULL;
+
+          entry.name      = g_strdup_printf ("%s-%03d", action_prefix, i);
+          entry.label     = gimp_object_get_name (preset);
+          entry.icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (preset));
+          entry.value     = i;
+
+          g_object_get (preset, "icon-pixbuf", &pixbuf, NULL);
+
+          gimp_action_group_add_enum_actions (group, NULL, &entry, 1, callback);
+
+          if (need_writable)
+            SET_SENSITIVE (entry.name,
+                           gimp_data_is_writable (GIMP_DATA (preset)));
+
+          if (need_deletable)
+            SET_SENSITIVE (entry.name,
+                           gimp_data_is_deletable (GIMP_DATA (preset)));
+
+          if (pixbuf)
+            gimp_action_group_set_action_pixbuf (group, entry.name, pixbuf);
+
+          g_free ((gchar *) entry.name);
+        }
+    }
+}
+
+#undef SET_VISIBLE
+#undef SET_SENSITIVE
+#undef SET_HIDE_EMPTY
diff --git a/app/actions/tool-options-actions.h b/app/actions/tool-options-actions.h
new file mode 100644
index 0000000..2115fe1
--- /dev/null
+++ b/app/actions/tool-options-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_OPTIONS_ACTIONS_H__
+#define __TOOL_OPTIONS_ACTIONS_H__
+
+
+void   tool_options_actions_setup  (GimpActionGroup *group);
+void   tool_options_actions_update (GimpActionGroup *group,
+                                    gpointer         data);
+
+
+#endif /* __TOOL_OPTIONS_ACTIONS_H__ */
diff --git a/app/actions/tool-options-commands.c b/app/actions/tool-options-commands.c
new file mode 100644
index 0000000..94fd3c6
--- /dev/null
+++ b/app/actions/tool-options-commands.c
@@ -0,0 +1,268 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+#include "core/gimptoolpreset.h"
+
+#include "widgets/gimpdataeditor.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpeditor.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimptooloptionseditor.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "dialogs/data-delete-dialog.h"
+
+#include "tool-options-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   tool_options_show_preset_editor (Gimp           *gimp,
+                                               GimpEditor     *editor,
+                                               GimpToolPreset *preset);
+
+
+/*  public functions  */
+
+void
+tool_options_save_new_preset_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    user_data)
+{
+  GimpEditor  *editor  = GIMP_EDITOR (user_data);
+  Gimp        *gimp    = gimp_editor_get_ui_manager (editor)->gimp;
+  GimpContext *context = gimp_get_user_context (gimp);
+  GimpData    *data;
+
+  data = gimp_data_factory_data_new (context->gimp->tool_preset_factory,
+                                     context, _("Untitled"));
+
+  tool_options_show_preset_editor (gimp, editor, GIMP_TOOL_PRESET (data));
+}
+
+void
+tool_options_save_preset_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpEditor     *editor    = GIMP_EDITOR (data);
+  Gimp           *gimp      = gimp_editor_get_ui_manager (editor)->gimp;
+  GimpContext    *context   = gimp_get_user_context (gimp);
+  GimpToolInfo   *tool_info = gimp_context_get_tool (context);
+  GimpToolPreset *preset;
+  gint            index;
+
+  index = g_variant_get_int32 (value);
+
+  preset = (GimpToolPreset *)
+    gimp_container_get_child_by_index (tool_info->presets, index);
+
+  if (preset)
+    {
+      gimp_config_sync (G_OBJECT (tool_info->tool_options),
+                        G_OBJECT (preset->tool_options), 0);
+
+      tool_options_show_preset_editor (gimp, editor, preset);
+    }
+}
+
+void
+tool_options_restore_preset_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpEditor     *editor    = GIMP_EDITOR (data);
+  Gimp           *gimp      = gimp_editor_get_ui_manager (editor)->gimp;
+  GimpContext    *context   = gimp_get_user_context (gimp);
+  GimpToolInfo   *tool_info = gimp_context_get_tool (context);
+  GimpToolPreset *preset;
+  gint            index;
+
+  index = g_variant_get_int32 (value);
+
+  preset = (GimpToolPreset *)
+    gimp_container_get_child_by_index (tool_info->presets, index);
+
+  if (preset)
+    {
+      if (gimp_context_get_tool_preset (context) != preset)
+        gimp_context_set_tool_preset (context, preset);
+      else
+        gimp_context_tool_preset_changed (context);
+    }
+}
+
+void
+tool_options_edit_preset_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpEditor     *editor    = GIMP_EDITOR (data);
+  Gimp           *gimp      = gimp_editor_get_ui_manager (editor)->gimp;
+  GimpContext    *context   = gimp_get_user_context (gimp);
+  GimpToolInfo   *tool_info = gimp_context_get_tool (context);
+  GimpToolPreset *preset;
+  gint            index;
+
+  index = g_variant_get_int32 (value);
+
+  preset = (GimpToolPreset *)
+    gimp_container_get_child_by_index (tool_info->presets, index);
+
+  if (preset)
+    {
+      tool_options_show_preset_editor (gimp, editor, preset);
+    }
+}
+
+void
+tool_options_delete_preset_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpEditor     *editor    = GIMP_EDITOR (data);
+  GimpContext    *context   = gimp_get_user_context (gimp_editor_get_ui_manager (editor)->gimp);
+  GimpToolInfo   *tool_info = gimp_context_get_tool (context);
+  GimpToolPreset *preset;
+  gint            index;
+
+  index = g_variant_get_int32 (value);
+
+  preset = (GimpToolPreset *)
+    gimp_container_get_child_by_index (tool_info->presets, index);
+
+  if (preset &&
+      gimp_data_is_deletable (GIMP_DATA (preset)))
+    {
+      GimpDataFactory *factory = context->gimp->tool_preset_factory;
+      GtkWidget       *dialog;
+
+      dialog = data_delete_dialog_new (factory, GIMP_DATA (preset), NULL,
+                                       GTK_WIDGET (editor));
+      gtk_widget_show (dialog);
+    }
+}
+
+void
+tool_options_reset_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpEditor   *editor    = GIMP_EDITOR (data);
+  GimpContext  *context   = gimp_get_user_context (gimp_editor_get_ui_manager (editor)->gimp);
+  GimpToolInfo *tool_info = gimp_context_get_tool (context);
+
+  gimp_config_reset (GIMP_CONFIG (tool_info->tool_options));
+}
+
+void
+tool_options_reset_all_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpEditor *editor = GIMP_EDITOR (data);
+  GtkWidget  *dialog;
+
+  dialog = gimp_message_dialog_new (_("Reset All Tool Options"),
+                                    GIMP_ICON_DIALOG_QUESTION,
+                                    GTK_WIDGET (editor),
+                                    GTK_DIALOG_MODAL |
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("_Reset"),  GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect_object (gtk_widget_get_toplevel (GTK_WIDGET (editor)),
+                           "unmap",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, G_CONNECT_SWAPPED);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Do you really want to reset all "
+                                       "tool options to default values?"));
+
+  if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      Gimp  *gimp = gimp_editor_get_ui_manager (editor)->gimp;
+      GList *list;
+
+      for (list = gimp_get_tool_info_iter (gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpToolInfo *tool_info = list->data;
+
+          gimp_config_reset (GIMP_CONFIG (tool_info->tool_options));
+        }
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+
+/*  private functions  */
+
+static void
+tool_options_show_preset_editor (Gimp           *gimp,
+                                 GimpEditor     *editor,
+                                 GimpToolPreset *preset)
+{
+  GtkWidget *dockable;
+
+  dockable =
+    gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)),
+                                               gimp,
+                                               gimp_dialog_factory_get_singleton (),
+                                               gtk_widget_get_screen (GTK_WIDGET (editor)),
+                                               gimp_widget_get_monitor (GTK_WIDGET (editor)),
+                                               "gimp-tool-preset-editor");
+
+  gimp_data_editor_set_data (GIMP_DATA_EDITOR (gtk_bin_get_child (GTK_BIN (dockable))),
+                             GIMP_DATA (preset));
+}
diff --git a/app/actions/tool-options-commands.h b/app/actions/tool-options-commands.h
new file mode 100644
index 0000000..8594e44
--- /dev/null
+++ b/app/actions/tool-options-commands.h
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_OPTIONS_COMMANDS_H__
+#define __TOOL_OPTIONS_COMMANDS_H__
+
+
+void   tool_options_save_new_preset_cmd_callback (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   tool_options_save_preset_cmd_callback     (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   tool_options_restore_preset_cmd_callback  (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   tool_options_edit_preset_cmd_callback     (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   tool_options_delete_preset_cmd_callback   (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   tool_options_reset_cmd_callback           (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   tool_options_reset_all_cmd_callback       (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+
+#endif /* __TOOL_OPTIONS_COMMANDS_H__ */
diff --git a/app/actions/tool-preset-editor-actions.c b/app/actions/tool-preset-editor-actions.c
new file mode 100644
index 0000000..8b22e6f
--- /dev/null
+++ b/app/actions/tool-preset-editor-actions.c
@@ -0,0 +1,105 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdataeditor.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "data-editor-commands.h"
+#include "tool-preset-editor-actions.h"
+#include "tool-preset-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry tool_preset_editor_actions[] =
+{
+  { "tool-preset-editor-popup", GIMP_ICON_TOOL_PRESET,
+    NC_("tool-preset-editor-action", "Tool Preset Editor Menu"), NULL, NULL, NULL,
+    GIMP_HELP_TOOL_PRESET_EDITOR_DIALOG },
+
+  { "tool-preset-editor-save", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("tool-preset-editor-action", "_Save Tool Options to Preset"), NULL,
+    NC_("tool-preset-editor-action", "Save the active tool options to this "
+        "tool preset"),
+    tool_preset_editor_save_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_SAVE },
+
+  { "tool-preset-editor-restore", GIMP_ICON_DOCUMENT_REVERT,
+    NC_("tool-preset-editor-action", "_Restore Tool Preset"), NULL,
+    NC_("tool-preset-editor-action", "Restore this tool preset"),
+    tool_preset_editor_restore_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_RESTORE }
+};
+
+
+static const GimpToggleActionEntry tool_preset_editor_toggle_actions[] =
+{
+  { "tool-preset-editor-edit-active", GIMP_ICON_LINKED,
+    NC_("tool-preset-editor-action", "Edit Active Tool Preset"), NULL, NULL,
+    data_editor_edit_active_cmd_callback,
+    FALSE,
+    GIMP_HELP_TOOL_PRESET_EDITOR_EDIT_ACTIVE }
+};
+
+
+void
+tool_preset_editor_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "tool-preset-editor-action",
+                                 tool_preset_editor_actions,
+                                 G_N_ELEMENTS (tool_preset_editor_actions));
+
+  gimp_action_group_add_toggle_actions (group, "tool-preset-editor-action",
+                                        tool_preset_editor_toggle_actions,
+                                        G_N_ELEMENTS (tool_preset_editor_toggle_actions));
+
+}
+
+void
+tool_preset_editor_actions_update (GimpActionGroup *group,
+                                   gpointer         user_data)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (user_data);
+  gboolean        edit_active = FALSE;
+
+  edit_active = gimp_data_editor_get_edit_active (data_editor);
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("tool-preset-editor-save",        data_editor->data);
+  SET_SENSITIVE ("tool-preset-editor-restore",     data_editor->data);
+  SET_ACTIVE    ("tool-preset-editor-edit-active", edit_active);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+}
diff --git a/app/actions/tool-preset-editor-actions.h b/app/actions/tool-preset-editor-actions.h
new file mode 100644
index 0000000..35275c5
--- /dev/null
+++ b/app/actions/tool-preset-editor-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_PRESET_EDITOR_ACTIONS_H__
+#define __TOOL_PRESET_EDITOR_ACTIONS_H__
+
+
+void   tool_preset_editor_actions_setup  (GimpActionGroup *group);
+void   tool_preset_editor_actions_update (GimpActionGroup *group,
+                                          gpointer         data);
+
+
+#endif /* __TOOL_PRESET_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/tool-preset-editor-commands.c b/app/actions/tool-preset-editor-commands.c
new file mode 100644
index 0000000..654ae16
--- /dev/null
+++ b/app/actions/tool-preset-editor-commands.c
@@ -0,0 +1,90 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptoolpreset.h"
+
+#include "widgets/gimpdataeditor.h"
+
+#include "tool-preset-editor-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+tool_preset_editor_save_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpDataEditor *editor  = GIMP_DATA_EDITOR (data);
+  GimpContext    *context = editor->context;
+  GimpToolPreset *preset;
+  GimpToolInfo   *tool_info;
+
+  preset    = GIMP_TOOL_PRESET (gimp_data_editor_get_data (editor));
+  tool_info = gimp_context_get_tool (gimp_get_user_context (context->gimp));
+
+  if (tool_info && preset)
+    {
+      GimpToolInfo *preset_tool;
+
+      preset_tool =  gimp_context_get_tool (GIMP_CONTEXT (preset->tool_options));
+
+      if (tool_info != preset_tool)
+        {
+          gimp_message (context->gimp,
+                        G_OBJECT (editor), GIMP_MESSAGE_WARNING,
+                        _("Can't save '%s' tool options to an "
+                          "existing '%s' tool preset."),
+                        tool_info->label,
+                        preset_tool->label);
+          return;
+        }
+
+      gimp_config_sync (G_OBJECT (tool_info->tool_options),
+                        G_OBJECT (preset->tool_options), 0);
+    }
+}
+
+void
+tool_preset_editor_restore_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpDataEditor *editor  = GIMP_DATA_EDITOR (data);
+  GimpContext    *context = editor->context;
+  GimpToolPreset *preset;
+
+  preset = GIMP_TOOL_PRESET (gimp_data_editor_get_data (editor));
+
+  if (preset)
+    gimp_context_tool_preset_changed (gimp_get_user_context (context->gimp));
+}
diff --git a/app/actions/tool-preset-editor-commands.h b/app/actions/tool-preset-editor-commands.h
new file mode 100644
index 0000000..f90f636
--- /dev/null
+++ b/app/actions/tool-preset-editor-commands.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_PRESET_EDITOR_COMMANDS_H__
+#define __TOOL_PRESET_EDITOR_COMMANDS_H__
+
+
+void   tool_preset_editor_save_cmd_callback    (GimpAction *action,
+                                                GVariant   *value,
+                                                gpointer    data);
+void   tool_preset_editor_restore_cmd_callback (GimpAction *action,
+                                                GVariant   *value,
+                                                gpointer    data);
+
+
+#endif /* __TOOL_PRESET_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
new file mode 100644
index 0000000..36baabd
--- /dev/null
+++ b/app/actions/tool-presets-actions.c
@@ -0,0 +1,155 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+#include "core/gimptoolpreset.h"
+#include "core/gimptooloptions.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "data-commands.h"
+#include "tool-presets-actions.h"
+#include "tool-presets-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry tool_presets_actions[] =
+{
+  { "tool-presets-popup", GIMP_ICON_TOOL_PRESET,
+    NC_("tool-presets-action", "Tool Presets Menu"), NULL, NULL, NULL,
+    GIMP_HELP_TOOL_PRESET_DIALOG },
+
+  { "tool-presets-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("tool-presets-action", "_New Tool Preset"), NULL,
+    NC_("tool-presets-action", "Create a new tool preset"),
+    data_new_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_NEW },
+
+  { "tool-presets-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("tool-presets-action", "D_uplicate Tool Preset"), NULL,
+    NC_("tool-presets-action", "Duplicate this tool preset"),
+    data_duplicate_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_DUPLICATE },
+
+  { "tool-presets-copy-location", GIMP_ICON_EDIT_COPY,
+    NC_("tool-presets-action", "Copy Tool Preset _Location"), NULL,
+    NC_("tool-presets-action", "Copy tool preset file location to clipboard"),
+    data_copy_location_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
+
+  { "tool-presets-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
+    NC_("tool-presets-action", "Show in _File Manager"), NULL,
+    NC_("tool-presets-action", "Show tool preset file location in the file manager"),
+    data_show_in_file_manager_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER },
+
+  { "tool-presets-save", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("tool-presets-action", "_Save Tool Options to Preset"), NULL,
+    NC_("tool-presets-action", "Save the active tool options to this "
+        "tool preset"),
+    tool_presets_save_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_SAVE },
+
+  { "tool-presets-restore", GIMP_ICON_DOCUMENT_REVERT,
+    NC_("tool-presets-action", "_Restore Tool Preset"), NULL,
+    NC_("tool-presets-action", "Restore this tool preset"),
+    tool_presets_restore_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_RESTORE },
+
+  { "tool-presets-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("tool-presets-action", "_Delete Tool Preset"), NULL,
+    NC_("tool-presets-action", "Delete this tool preset"),
+    data_delete_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_DELETE },
+
+  { "tool-presets-refresh", GIMP_ICON_VIEW_REFRESH,
+    NC_("tool-presets-action", "_Refresh Tool Presets"), NULL,
+    NC_("tool-presets-action", "Refresh tool presets"),
+    data_refresh_cmd_callback,
+    GIMP_HELP_TOOL_PRESET_REFRESH }
+};
+
+static const GimpStringActionEntry tool_presets_edit_actions[] =
+{
+  { "tool-presets-edit", GIMP_ICON_EDIT,
+    NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
+    NC_("tool-presets-action", "Edit this tool preset"),
+    "gimp-tool-preset-editor",
+    GIMP_HELP_TOOL_PRESET_EDIT }
+};
+
+
+void
+tool_presets_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "tool-presets-action",
+                                 tool_presets_actions,
+                                 G_N_ELEMENTS (tool_presets_actions));
+
+  gimp_action_group_add_string_actions (group, "tool-presets-action",
+                                        tool_presets_edit_actions,
+                                        G_N_ELEMENTS (tool_presets_edit_actions),
+                                        data_edit_cmd_callback);
+}
+
+void
+tool_presets_actions_update (GimpActionGroup *group,
+                             gpointer         user_data)
+{
+  GimpContext    *context     = action_data_get_context (user_data);
+  GimpToolPreset *tool_preset = NULL;
+  GimpData       *data        = NULL;
+  GFile          *file        = NULL;
+
+  if (context)
+    {
+      tool_preset = gimp_context_get_tool_preset (context);
+
+      if (tool_preset)
+        {
+          data = GIMP_DATA (tool_preset);
+
+          file = gimp_data_get_file (data);
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("tool-presets-edit",                 tool_preset);
+  SET_SENSITIVE ("tool-presets-duplicate",            tool_preset && gimp_data_is_duplicatable (data));
+  SET_SENSITIVE ("tool-presets-copy-location",        file);
+  SET_SENSITIVE ("tool-presets-show-in-file-manager", file);
+  SET_SENSITIVE ("tool-presets-save",                 tool_preset);
+  SET_SENSITIVE ("tool-presets-restore",              tool_preset);
+  SET_SENSITIVE ("tool-presets-delete",               tool_preset && gimp_data_is_deletable (data));
+
+#undef SET_SENSITIVE
+}
diff --git a/app/actions/tool-presets-actions.h b/app/actions/tool-presets-actions.h
new file mode 100644
index 0000000..7cdf969
--- /dev/null
+++ b/app/actions/tool-presets-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_PRESETS_ACTIONS_H__
+#define __TOOL_PRESETS_ACTIONS_H__
+
+
+void   tool_presets_actions_setup  (GimpActionGroup *group);
+void   tool_presets_actions_update (GimpActionGroup *group,
+                                    gpointer         user_data);
+
+
+#endif /* __TOOL_PRESET_ACTIONS_H__ */
diff --git a/app/actions/tool-presets-commands.c b/app/actions/tool-presets-commands.c
new file mode 100644
index 0000000..bc60557
--- /dev/null
+++ b/app/actions/tool-presets-commands.c
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptoolpreset.h"
+
+#include "widgets/gimpcontainereditor.h"
+#include "widgets/gimpcontainerview.h"
+
+#include "tool-presets-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+tool_presets_save_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpToolPreset      *preset;
+  GimpToolInfo        *tool_info;
+
+  context = gimp_container_view_get_context (editor->view);
+
+  preset    = gimp_context_get_tool_preset (context);
+  tool_info = gimp_context_get_tool (gimp_get_user_context (context->gimp));
+
+  if (tool_info && preset)
+    {
+      GimpToolInfo *preset_tool;
+
+      preset_tool =  gimp_context_get_tool (GIMP_CONTEXT (preset->tool_options));
+
+      if (tool_info != preset_tool)
+        {
+          gimp_message (context->gimp,
+                        G_OBJECT (editor), GIMP_MESSAGE_WARNING,
+                        _("Can't save '%s' tool options to an "
+                          "existing '%s' tool preset."),
+                        tool_info->label,
+                        preset_tool->label);
+          return;
+        }
+
+      gimp_config_sync (G_OBJECT (tool_info->tool_options),
+                        G_OBJECT (preset->tool_options), 0);
+    }
+}
+
+void
+tool_presets_restore_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
+  GimpContext         *context;
+  GimpToolPreset      *preset;
+
+  context = gimp_container_view_get_context (editor->view);
+
+  preset = gimp_context_get_tool_preset (context);
+
+  if (preset)
+    gimp_context_tool_preset_changed (gimp_get_user_context (context->gimp));
+}
diff --git a/app/actions/tool-presets-commands.h b/app/actions/tool-presets-commands.h
new file mode 100644
index 0000000..ecf9c21
--- /dev/null
+++ b/app/actions/tool-presets-commands.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_PRESETS_COMMANDS_H__
+#define __TOOL_PRESETS_COMMANDS_H__
+
+
+void   tool_presets_save_cmd_callback    (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data);
+void   tool_presets_restore_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data);
+
+
+#endif /* __TOOL_PRESETS_COMMANDS_H__ */
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
new file mode 100644
index 0000000..dd9a827
--- /dev/null
+++ b/app/actions/tools-actions.c
@@ -0,0 +1,800 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "tools-actions.h"
+#include "tools-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry tools_actions[] =
+{
+  { "tools-menu",           NULL, NC_("tools-action", "_Tools")           },
+  { "tools-select-menu",    NULL, NC_("tools-action", "_Selection Tools") },
+  { "tools-paint-menu",     NULL, NC_("tools-action", "_Paint Tools")     },
+  { "tools-transform-menu", NULL, NC_("tools-action", "_Transform Tools") },
+  { "tools-color-menu",     NULL, NC_("tools-action", "_Color Tools")     },
+};
+
+static const GimpStringActionEntry tools_alternative_actions[] =
+{
+  { "tools-by-color-select-short", GIMP_ICON_TOOL_BY_COLOR_SELECT,
+    NC_("tools-action", "_By Color"), NULL,
+    NC_("tools-action", "Select regions with similar colors"),
+    "gimp-by-color-select-tool",
+    GIMP_HELP_TOOL_BY_COLOR_SELECT },
+
+  { "tools-rotate-arbitrary", GIMP_ICON_TOOL_ROTATE,
+    NC_("tools-action", "_Arbitrary Rotation..."), "",
+    NC_("tools-action", "Rotate drawable by an arbitrary angle"),
+    "gimp-rotate-layer",
+    GIMP_HELP_TOOL_ROTATE },
+
+  { "tools-rotate-image-arbitrary", GIMP_ICON_TOOL_ROTATE,
+    NC_("tools-action", "_Arbitrary Rotation..."), "",
+    NC_("tools-action", "Rotate image by an arbitrary angle"),
+    "gimp-rotate-image",
+    GIMP_HELP_TOOL_ROTATE }
+};
+
+static const GimpEnumActionEntry tools_color_average_radius_actions[] =
+{
+  { "tools-color-average-radius-set", GIMP_ICON_TOOL_COLOR_PICKER,
+    "Set Color Picker Radius", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_paintbrush_size_actions[] =
+{
+  { "tools-paintbrush-size-set", GIMP_ICON_TOOL_PAINTBRUSH,
+    "Set Brush Size", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_paintbrush_aspect_ratio_actions[] =
+{
+  { "tools-paintbrush-aspect-ratio-set", GIMP_ICON_TOOL_PAINTBRUSH,
+    "Set Brush Aspect Ratio", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_paintbrush_angle_actions[] =
+{
+  { "tools-paintbrush-angle-set", GIMP_ICON_TOOL_PAINTBRUSH,
+    "Set Brush Angle", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_paintbrush_spacing_actions[] =
+{
+  { "tools-paintbrush-spacing-set", GIMP_ICON_TOOL_PAINTBRUSH,
+    "Set Brush Spacing", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_paintbrush_hardness_actions[] =
+{
+  { "tools-paintbrush-hardness-set", GIMP_ICON_TOOL_PAINTBRUSH,
+    "Set Brush Hardness", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_paintbrush_force_actions[] =
+{
+  { "tools-paintbrush-force-set", GIMP_ICON_TOOL_PAINTBRUSH,
+    "Set Brush Force", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_ink_blob_size_actions[] =
+{
+  { "tools-ink-blob-size-set", GIMP_ICON_TOOL_INK,
+    "Set Ink Blob Size", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_ink_blob_aspect_actions[] =
+{
+  { "tools-ink-blob-aspect-set", GIMP_ICON_TOOL_INK,
+    "Set Ink Blob Aspect", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_ink_blob_angle_actions[] =
+{
+  { "tools-ink-blob-angle-set", GIMP_ICON_TOOL_INK,
+    "Set Ink Blob Angle", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_airbrush_rate_actions[] =
+{
+  { "tools-airbrush-rate-set", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-airbrush-rate-minimum", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-airbrush-rate-maximum", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-airbrush-rate-decrease", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-airbrush-rate-increase", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-airbrush-rate-decrease-skip", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-airbrush-rate-increase-skip", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Rate: Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_airbrush_flow_actions[] =
+{
+  { "tools-airbrush-flow-set", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-airbrush-flow-minimum", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Set to Minimum"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-airbrush-flow-maximum", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Set to Maximum"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-airbrush-flow-decrease", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-airbrush-flow-increase", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-airbrush-flow-decrease-skip", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-airbrush-flow-increase-skip", GIMP_ICON_TOOL_AIRBRUSH,
+    NC_("tools-action", "Airbrush Flow: Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_mybrush_radius_actions[] =
+{
+  { "tools-mypaint-brush-radius-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
+    "Set MyPaint Brush Radius", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_mybrush_hardness_actions[] =
+{
+  { "tools-mypaint-brush-hardness-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
+    "Set MyPaint Brush Hardness", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_foreground_select_brush_size_actions[] =
+{
+  { "tools-foreground-select-brush-size-set",
+    GIMP_ICON_TOOL_FOREGROUND_SELECT,
+    "Set Foreground Select Brush Size", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] =
+{
+  { "tools-transform-preview-opacity-set", GIMP_ICON_TOOL_PERSPECTIVE,
+    "Set Transform Tool Preview Opacity", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_warp_effect_size_actions[] =
+{
+  { "tools-warp-effect-size-set", GIMP_ICON_TOOL_WARP,
+    "Set Warp Effect Size", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_warp_effect_hardness_actions[] =
+{
+  { "tools-warp-effect-hardness-set", GIMP_ICON_TOOL_WARP,
+    "Set Warp Effect Hardness", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_opacity_actions[] =
+{
+  { "tools-opacity-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-opacity-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Set to Default Value"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-opacity-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-opacity-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-opacity-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Decrease by 1"), "less", NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-opacity-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Increase by 1"), "greater", NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-opacity-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Decrease by 10"), "<primary>less", NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-opacity-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Increase by 10"), "<primary>greater", NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-opacity-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-opacity-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Opacity: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_size_actions[] =
+{
+  { "tools-size-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-size-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Set to Default Value"), "backslash", NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-size-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-size-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-size-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Decrease by 1"), "bracketleft", NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-size-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Increase by 1"), "bracketright", NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-size-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Decrease by 10"), "braceleft", NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-size-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Increase by 10"), "braceright", NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-size-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-size-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Size: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_aspect_actions[] =
+{
+  { "tools-aspect-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-aspect-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Set To Default Value"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-aspect-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-aspect-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-aspect-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Decrease by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-aspect-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Increase by 0.1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-aspect-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-aspect-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-aspect-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-aspect-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Aspect Ratio: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_angle_actions[] =
+{
+  { "tools-angle-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-angle-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Set Angle To Default Value"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-angle-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-angle-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-angle-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Decrease by 1°"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-angle-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Increase by 1°"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-angle-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Decrease by 15°"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-angle-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Increase by 15°"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-angle-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-angle-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Angle: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_spacing_actions[] =
+{
+  { "tools-spacing-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-spacing-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Set To Default Value"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-spacing-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-spacing-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-spacing-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-spacing-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-spacing-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-spacing-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-spacing-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-spacing-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Spacing: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_hardness_actions[] =
+{
+  { "tools-hardness-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-hardness-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Set to Default Value"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-hardness-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-hardness-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-hardness-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-hardness-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-hardness-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-hardness-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-hardness-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-hardness-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Hardness: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_force_actions[] =
+{
+  { "tools-force-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Set"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-force-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Set to Default Value"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    NULL },
+  { "tools-force-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Minimize"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-force-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Maximize"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-force-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Decrease by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-force-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Increase by 1"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+  { "tools-force-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Decrease by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+  { "tools-force-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Increase by 10"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL },
+  { "tools-force-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Decrease Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-force-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    NC_("tools-action", "Tool's Force: Increase Relative"), NULL, NULL,
+    GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
+    NULL },
+};
+
+static const GimpEnumActionEntry tools_object_1_actions[] =
+{
+  { "tools-object-1-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Select Object 1 by Index", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-object-1-first", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "First Object 1", NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-object-1-last", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Last Object 1", NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-object-1-previous", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Previous Object 1", NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-object-1-next", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Next Object 1", NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry tools_object_2_actions[] =
+{
+  { "tools-object-2-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Select Object 2 by Index", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+  { "tools-object-2-first", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "First Object 2", NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+  { "tools-object-2-last", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Last Object 2", NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+  { "tools-object-2-previous", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Previous Object 2", NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+  { "tools-object-2-next", GIMP_ICON_DIALOG_TOOL_OPTIONS,
+    "Next Object 2", NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL }
+};
+
+
+void
+tools_actions_setup (GimpActionGroup *group)
+{
+  GimpAction *action;
+  GList      *list;
+
+  gimp_action_group_add_actions (group, "tools-action",
+                                 tools_actions,
+                                 G_N_ELEMENTS (tools_actions));
+
+  gimp_action_group_add_string_actions (group, "tools-action",
+                                        tools_alternative_actions,
+                                        G_N_ELEMENTS (tools_alternative_actions),
+                                        tools_select_cmd_callback);
+
+  action = gimp_action_group_get_action (group,
+                                         "tools-by-color-select-short");
+  gimp_action_set_accel_path (action, "<Actions>/tools/tools-by-color-select");
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_color_average_radius_actions,
+                                      G_N_ELEMENTS (tools_color_average_radius_actions),
+                                      tools_color_average_radius_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_paintbrush_size_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_size_actions),
+                                      tools_paintbrush_size_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_paintbrush_aspect_ratio_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_aspect_ratio_actions),
+                                      tools_paintbrush_aspect_ratio_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_paintbrush_angle_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_angle_actions),
+                                      tools_paintbrush_angle_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_paintbrush_spacing_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_spacing_actions),
+                                      tools_paintbrush_spacing_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_paintbrush_hardness_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_hardness_actions),
+                                      tools_paintbrush_hardness_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_paintbrush_force_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_force_actions),
+                                      tools_paintbrush_force_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_ink_blob_size_actions,
+                                      G_N_ELEMENTS (tools_ink_blob_size_actions),
+                                      tools_ink_blob_size_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_ink_blob_aspect_actions,
+                                      G_N_ELEMENTS (tools_ink_blob_aspect_actions),
+                                      tools_ink_blob_aspect_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_ink_blob_angle_actions,
+                                      G_N_ELEMENTS (tools_ink_blob_angle_actions),
+                                      tools_ink_blob_angle_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_airbrush_rate_actions,
+                                      G_N_ELEMENTS (tools_airbrush_rate_actions),
+                                      tools_airbrush_rate_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_airbrush_flow_actions,
+                                      G_N_ELEMENTS (tools_airbrush_flow_actions),
+                                      tools_airbrush_flow_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_mybrush_radius_actions,
+                                      G_N_ELEMENTS (tools_mybrush_radius_actions),
+                                      tools_mybrush_radius_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_mybrush_hardness_actions,
+                                      G_N_ELEMENTS (tools_mybrush_hardness_actions),
+                                      tools_mybrush_hardness_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_foreground_select_brush_size_actions,
+                                      G_N_ELEMENTS (tools_foreground_select_brush_size_actions),
+                                      tools_fg_select_brush_size_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_transform_preview_opacity_actions,
+                                      G_N_ELEMENTS (tools_transform_preview_opacity_actions),
+                                      tools_transform_preview_opacity_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_warp_effect_size_actions,
+                                      G_N_ELEMENTS (tools_warp_effect_size_actions),
+                                      tools_warp_effect_size_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_warp_effect_hardness_actions,
+                                      G_N_ELEMENTS (tools_warp_effect_hardness_actions),
+                                      tools_warp_effect_hardness_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_opacity_actions,
+                                      G_N_ELEMENTS (tools_opacity_actions),
+                                      tools_opacity_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_size_actions,
+                                      G_N_ELEMENTS (tools_size_actions),
+                                      tools_size_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_aspect_actions,
+                                      G_N_ELEMENTS (tools_aspect_actions),
+                                      tools_aspect_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_angle_actions,
+                                      G_N_ELEMENTS (tools_angle_actions),
+                                      tools_angle_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_spacing_actions,
+                                      G_N_ELEMENTS (tools_spacing_actions),
+                                      tools_spacing_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_hardness_actions,
+                                      G_N_ELEMENTS (tools_hardness_actions),
+                                      tools_hardness_cmd_callback);
+  gimp_action_group_add_enum_actions (group, "tools-action",
+                                      tools_force_actions,
+                                      G_N_ELEMENTS (tools_force_actions),
+                                      tools_force_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_object_1_actions,
+                                      G_N_ELEMENTS (tools_object_1_actions),
+                                      tools_object_1_cmd_callback);
+  gimp_action_group_add_enum_actions (group, NULL,
+                                      tools_object_2_actions,
+                                      G_N_ELEMENTS (tools_object_2_actions),
+                                      tools_object_2_cmd_callback);
+
+  for (list = gimp_get_tool_info_iter (group->gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = list->data;
+
+      if (tool_info->menu_label)
+        {
+          GimpStringActionEntry  entry;
+          gchar                 *name;
+          const gchar           *icon_name;
+          const gchar           *identifier;
+
+          name       = gimp_tool_info_get_action_name (tool_info);
+          icon_name  = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+          identifier = gimp_object_get_name (tool_info);
+
+          entry.name        = name;
+          entry.icon_name   = icon_name;
+          entry.label       = tool_info->menu_label;
+          entry.accelerator = tool_info->menu_accel;
+          entry.tooltip     = tool_info->tooltip;
+          entry.help_id     = tool_info->help_id;
+          entry.value       = identifier;
+
+          gimp_action_group_add_string_actions (group, NULL,
+                                                &entry, 1,
+                                                tools_select_cmd_callback);
+
+          g_free (name);
+        }
+    }
+}
+
+void
+tools_actions_update (GimpActionGroup *group,
+                      gpointer         data)
+{
+}
diff --git a/app/actions/tools-actions.h b/app/actions/tools-actions.h
new file mode 100644
index 0000000..9bec68b
--- /dev/null
+++ b/app/actions/tools-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOLS_ACTIONS_H__
+#define __TOOLS_ACTIONS_H__
+
+
+void   tools_actions_setup  (GimpActionGroup *group);
+void   tools_actions_update (GimpActionGroup *group,
+                             gpointer         data);
+
+
+#endif /* __TOOLS_ACTIONS_H__ */
diff --git a/app/actions/tools-commands.c b/app/actions/tools-commands.c
new file mode 100644
index 0000000..7e84c53
--- /dev/null
+++ b/app/actions/tools-commands.c
@@ -0,0 +1,820 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "actions-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolinfo.h"
+
+#include "paint/gimpinkoptions.h"
+#include "paint/gimpairbrushoptions.h"
+#include "paint/gimpmybrushoptions.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpenumaction.h"
+#include "widgets/gimpuimanager.h"
+
+#include "display/gimpdisplay.h"
+
+#include "tools/gimp-tools.h"
+#include "tools/gimpcoloroptions.h"
+#include "tools/gimpforegroundselectoptions.h"
+#include "tools/gimprectangleoptions.h"
+#include "tools/gimptool.h"
+#include "tools/gimptoolcontrol.h"
+#include "tools/gimptransformoptions.h"
+#include "tools/gimptransformtool.h"
+#include "tools/gimpwarpoptions.h"
+#include "tools/tool_manager.h"
+
+#include "actions.h"
+#include "tools-commands.h"
+
+
+/*  local function prototypes  */
+
+static void   tools_activate_enum_action (const gchar *action_desc,
+                                          GVariant    *value);
+
+
+/*  local variables  */
+
+/* this is a hack to allow GimpToolButton to activate a tool-selection action
+ * without initializing the tool
+ */
+static gint tools_select_cmd_initialize_blocked = 0;
+
+
+/*  public functions  */
+
+void
+tools_select_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  Gimp              *gimp;
+  GimpToolInfo      *tool_info;
+  GimpContext       *context;
+  GimpDisplay       *display;
+  const gchar       *tool_name;
+  gboolean           set_transform_type = FALSE;
+  GimpTransformType  transform_type;
+  return_if_no_gimp (gimp, data);
+
+  tool_name = g_variant_get_string (value, NULL);
+
+  /*  special case gimp-rotate-tool being called from the Image or Layer
+   *  menus
+   */
+  if (strcmp (tool_name, "gimp-rotate-layer") == 0)
+    {
+      tool_name          = "gimp-rotate-tool";
+      set_transform_type = TRUE;
+      transform_type     = GIMP_TRANSFORM_TYPE_LAYER;
+    }
+  else if (strcmp (tool_name, "gimp-rotate-image") == 0)
+    {
+      tool_name          = "gimp-rotate-tool";
+      set_transform_type = TRUE;
+      transform_type     = GIMP_TRANSFORM_TYPE_IMAGE;
+    }
+
+  tool_info = gimp_get_tool_info (gimp, tool_name);
+
+  context = gimp_get_user_context (gimp);
+
+  /*  always allocate a new tool when selected from the image menu
+   */
+  if (gimp_context_get_tool (context) != tool_info ||
+      tools_select_cmd_initialize_blocked)
+    {
+      gimp_context_set_tool (context, tool_info);
+    }
+  else
+    {
+      gimp_context_tool_changed (context);
+    }
+
+  if (set_transform_type)
+    {
+      GimpTool *tool = tool_manager_get_active (gimp);
+
+      gimp_transform_tool_set_type (GIMP_TRANSFORM_TOOL (tool),
+                                    transform_type);
+    }
+
+  if (! tools_select_cmd_initialize_blocked)
+    {
+      display = gimp_context_get_display (context);
+
+      if (display && gimp_display_get_image (display))
+        tool_manager_initialize_active (gimp, display);
+    }
+}
+
+void
+tools_select_cmd_block_initialize (void)
+{
+  tools_select_cmd_initialize_blocked++;
+}
+
+void
+tools_select_cmd_unblock_initialize (void)
+{
+  g_return_if_fail (tools_select_cmd_initialize_blocked > 0);
+
+  tools_select_cmd_initialize_blocked--;
+}
+
+void
+tools_color_average_radius_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_COLOR_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "average-radius",
+                              1.0, 1.0, 10.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_paintbrush_size_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "brush-size",
+                              0.1, 1.0, 10.0, 1.0, FALSE);
+    }
+}
+
+void
+tools_paintbrush_angle_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "brush-angle",
+                              0.1, 1.0, 15.0, 0.1, TRUE);
+    }
+}
+
+void
+tools_paintbrush_aspect_ratio_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "brush-aspect-ratio",
+                              0.01, 0.1, 1.0, 0.1, TRUE);
+    }
+}
+
+void
+tools_paintbrush_spacing_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "brush-spacing",
+                              0.001, 0.01, 0.1, 0.1, FALSE);
+    }
+}
+
+void
+tools_paintbrush_hardness_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "brush-hardness",
+                              0.001, 0.01, 0.1, 0.1, FALSE);
+    }
+}
+
+void
+tools_paintbrush_force_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "brush-force",
+                              0.001, 0.01, 0.1, 0.1, FALSE);
+    }
+}
+
+void
+tools_ink_blob_size_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_INK_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "size",
+                              0.1, 1.0, 10.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_ink_blob_aspect_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_INK_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "blob-aspect",
+                              1.0, 0.1, 1.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_ink_blob_angle_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_INK_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "blob-angle",
+                              gimp_deg_to_rad (0.1),
+                              gimp_deg_to_rad (1.0),
+                              gimp_deg_to_rad (15.0),
+                              0.1, TRUE);
+    }
+}
+
+void
+tools_airbrush_rate_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_AIRBRUSH_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "rate",
+                              0.1, 1.0, 10.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_airbrush_flow_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_AIRBRUSH_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "flow",
+                              0.1, 1.0, 10.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_mybrush_radius_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_MYBRUSH_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "radius",
+                              0.1, 0.1, 0.5, 1.0, FALSE);
+    }
+}
+
+void
+tools_mybrush_hardness_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_MYBRUSH_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "hardness",
+                              0.001, 0.01, 0.1, 1.0, FALSE);
+    }
+}
+
+void
+tools_fg_select_brush_size_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_FOREGROUND_SELECT_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "stroke-width",
+                              1.0, 4.0, 16.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_transform_preview_opacity_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_TRANSFORM_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "preview-opacity",
+                              0.01, 0.1, 0.5, 0.1, FALSE);
+    }
+}
+
+void
+tools_warp_effect_size_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_WARP_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "effect-size",
+                              1.0, 4.0, 16.0, 0.1, FALSE);
+    }
+}
+
+void
+tools_warp_effect_hardness_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpContext          *context;
+  GimpToolInfo         *tool_info;
+  GimpActionSelectType  select_type;
+  return_if_no_context (context, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  tool_info = gimp_context_get_tool (context);
+
+  if (tool_info && GIMP_IS_WARP_OPTIONS (tool_info->tool_options))
+    {
+      action_select_property (select_type,
+                              action_data_get_display (data),
+                              G_OBJECT (tool_info->tool_options),
+                              "effect-hardness",
+                              0.001, 0.01, 0.1, 0.1, FALSE);
+    }
+}
+
+void
+tools_opacity_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_opacity (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_size_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_size (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_aspect_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_aspect (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_angle_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_angle (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_spacing_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_spacing (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_hardness_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_hardness (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_force_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_force (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_object_1_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_object_1 (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+void
+tools_object_2_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpContext *context;
+  GimpTool    *tool;
+  return_if_no_context (context, data);
+
+  tool = tool_manager_get_active (context->gimp);
+
+  if (tool)
+    {
+      const gchar *action_desc;
+
+      action_desc = gimp_tool_control_get_action_object_2 (tool->control);
+
+      if (action_desc)
+        tools_activate_enum_action (action_desc, value);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+tools_activate_enum_action (const gchar *action_desc,
+                            GVariant    *value)
+{
+  gchar *group_name;
+  gchar *action_name;
+
+  group_name  = g_strdup (action_desc);
+  action_name = strchr (group_name, '/');
+
+  if (action_name)
+    {
+      GList      *managers;
+      GimpAction *action;
+
+      *action_name++ = '\0';
+
+      managers = gimp_ui_managers_from_name ("<Image>");
+
+      action = gimp_ui_manager_find_action (managers->data,
+                                            group_name, action_name);
+
+      if (GIMP_IS_ENUM_ACTION (action) &&
+          GIMP_ENUM_ACTION (action)->value_variable)
+        {
+          gimp_action_emit_activate (GIMP_ACTION (action), value);
+        }
+    }
+
+  g_free (group_name);
+}
diff --git a/app/actions/tools-commands.h b/app/actions/tools-commands.h
new file mode 100644
index 0000000..38ab455
--- /dev/null
+++ b/app/actions/tools-commands.h
@@ -0,0 +1,120 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOLS_COMMANDS_H__
+#define __TOOLS_COMMANDS_H__
+
+
+void   tools_select_cmd_callback                    (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_select_cmd_block_initialize            (void);
+void   tools_select_cmd_unblock_initialize          (void);
+
+void   tools_color_average_radius_cmd_callback      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_paintbrush_size_cmd_callback           (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_paintbrush_angle_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_paintbrush_aspect_ratio_cmd_callback   (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_paintbrush_spacing_cmd_callback        (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_paintbrush_hardness_cmd_callback       (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_paintbrush_force_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_ink_blob_size_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_ink_blob_aspect_cmd_callback           (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_ink_blob_angle_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_airbrush_rate_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_airbrush_flow_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_mybrush_radius_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_mybrush_hardness_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_fg_select_brush_size_cmd_callback      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_transform_preview_opacity_cmd_callback (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_warp_effect_size_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_warp_effect_hardness_cmd_callback      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_opacity_cmd_callback                   (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_size_cmd_callback                      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_aspect_cmd_callback                    (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_angle_cmd_callback                     (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_spacing_cmd_callback                   (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_hardness_cmd_callback                  (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_force_cmd_callback                     (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   tools_object_1_cmd_callback                  (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   tools_object_2_cmd_callback                  (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+
+#endif /* __TOOLS_COMMANDS_H__ */
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
new file mode 100644
index 0000000..300203b
--- /dev/null
+++ b/app/actions/vectors-actions.c
@@ -0,0 +1,465 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "actions.h"
+#include "items-actions.h"
+#include "vectors-actions.h"
+#include "vectors-commands.h"
+
+#include "gimp-intl.h"
+
+
+static const GimpActionEntry vectors_actions[] =
+{
+  { "vectors-popup", GIMP_ICON_DIALOG_PATHS,
+    NC_("vectors-action", "Paths Menu"), NULL, NULL, NULL,
+    GIMP_HELP_PATH_DIALOG },
+
+  { "vectors-color-tag-menu", NULL,
+    NC_("vectors-action", "Color Tag"), NULL, NULL, NULL,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-edit", GIMP_ICON_TOOL_PATH,
+    NC_("vectors-action", "Edit Pa_th"), NULL,
+    NC_("vectors-action", "Edit the active path"),
+    vectors_edit_cmd_callback,
+    GIMP_HELP_TOOL_VECTORS },
+
+  { "vectors-edit-attributes", GIMP_ICON_EDIT,
+    NC_("vectors-action", "_Edit Path Attributes..."), NULL,
+    NC_("vectors-action", "Edit path attributes"),
+    vectors_edit_attributes_cmd_callback,
+    GIMP_HELP_PATH_EDIT },
+
+  { "vectors-new", GIMP_ICON_DOCUMENT_NEW,
+    NC_("vectors-action", "_New Path..."), NULL,
+    NC_("vectors-action", "Create a new path..."),
+    vectors_new_cmd_callback,
+    GIMP_HELP_PATH_NEW },
+
+  { "vectors-new-last-values", GIMP_ICON_DOCUMENT_NEW,
+    NC_("vectors-action", "_New Path with last values"), NULL,
+    NC_("vectors-action", "Create a new path with last used values"),
+    vectors_new_last_vals_cmd_callback,
+    GIMP_HELP_PATH_NEW },
+
+  { "vectors-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
+    NC_("vectors-action", "D_uplicate Path"), NULL,
+    NC_("vectors-action", "Duplicate this path"),
+    vectors_duplicate_cmd_callback,
+    GIMP_HELP_PATH_DUPLICATE },
+
+  { "vectors-delete", GIMP_ICON_EDIT_DELETE,
+    NC_("vectors-action", "_Delete Path"), NULL,
+    NC_("vectors-action", "Delete this path"),
+    vectors_delete_cmd_callback,
+    GIMP_HELP_PATH_DELETE },
+
+  { "vectors-merge-visible", NULL,
+    NC_("vectors-action", "Merge _Visible Paths"), NULL, NULL,
+    vectors_merge_visible_cmd_callback,
+    GIMP_HELP_PATH_MERGE_VISIBLE },
+
+  { "vectors-raise", GIMP_ICON_GO_UP,
+    NC_("vectors-action", "_Raise Path"), NULL,
+    NC_("vectors-action", "Raise this path"),
+    vectors_raise_cmd_callback,
+    GIMP_HELP_PATH_RAISE },
+
+  { "vectors-raise-to-top", GIMP_ICON_GO_TOP,
+    NC_("vectors-action", "Raise Path to _Top"), NULL,
+    NC_("vectors-action", "Raise this path to the top"),
+    vectors_raise_to_top_cmd_callback,
+    GIMP_HELP_PATH_RAISE_TO_TOP },
+
+  { "vectors-lower", GIMP_ICON_GO_DOWN,
+    NC_("vectors-action", "_Lower Path"), NULL,
+    NC_("vectors-action", "Lower this path"),
+    vectors_lower_cmd_callback,
+    GIMP_HELP_PATH_LOWER },
+
+  { "vectors-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
+    NC_("vectors-action", "Lower Path to _Bottom"), NULL,
+    NC_("vectors-action", "Lower this path to the bottom"),
+    vectors_lower_to_bottom_cmd_callback,
+    GIMP_HELP_PATH_LOWER_TO_BOTTOM },
+
+  { "vectors-fill", GIMP_ICON_TOOL_BUCKET_FILL,
+    NC_("vectors-action", "Fill Pat_h..."), NULL,
+    NC_("vectors-action", "Fill the path"),
+    vectors_fill_cmd_callback,
+    GIMP_HELP_PATH_FILL },
+
+  { "vectors-fill-last-values", GIMP_ICON_TOOL_BUCKET_FILL,
+    NC_("vectors-action", "Fill Path"), NULL,
+    NC_("vectors-action", "Fill the path with last values"),
+    vectors_fill_last_vals_cmd_callback,
+    GIMP_HELP_PATH_FILL },
+
+  { "vectors-stroke", GIMP_ICON_PATH_STROKE,
+    NC_("vectors-action", "Stro_ke Path..."), NULL,
+    NC_("vectors-action", "Paint along the path"),
+    vectors_stroke_cmd_callback,
+    GIMP_HELP_PATH_STROKE },
+
+  { "vectors-stroke-last-values", GIMP_ICON_PATH_STROKE,
+    NC_("vectors-action", "Stro_ke Path"), NULL,
+    NC_("vectors-action", "Paint along the path with last values"),
+    vectors_stroke_last_vals_cmd_callback,
+    GIMP_HELP_PATH_STROKE },
+
+  { "vectors-copy", GIMP_ICON_EDIT_COPY,
+    NC_("vectors-action", "Co_py Path"), "", NULL,
+    vectors_copy_cmd_callback,
+    GIMP_HELP_PATH_COPY },
+
+  { "vectors-paste", GIMP_ICON_EDIT_PASTE,
+    NC_("vectors-action", "Paste Pat_h"), "", NULL,
+    vectors_paste_cmd_callback,
+    GIMP_HELP_PATH_PASTE },
+
+  { "vectors-export", GIMP_ICON_DOCUMENT_SAVE,
+    NC_("vectors-action", "E_xport Path..."), "", NULL,
+    vectors_export_cmd_callback,
+    GIMP_HELP_PATH_EXPORT },
+
+  { "vectors-import", GIMP_ICON_DOCUMENT_OPEN,
+    NC_("vectors-action", "I_mport Path..."), "", NULL,
+    vectors_import_cmd_callback,
+    GIMP_HELP_PATH_IMPORT }
+};
+
+static const GimpToggleActionEntry vectors_toggle_actions[] =
+{
+  { "vectors-visible", GIMP_ICON_VISIBLE,
+    NC_("vectors-action", "Toggle Path _Visibility"), NULL, NULL,
+    vectors_visible_cmd_callback,
+    FALSE,
+    GIMP_HELP_PATH_VISIBLE },
+
+  { "vectors-linked", GIMP_ICON_LINKED,
+    NC_("vectors-action", "Toggle Path _Linked State"), NULL, NULL,
+    vectors_linked_cmd_callback,
+    FALSE,
+    GIMP_HELP_PATH_LINKED },
+
+  { "vectors-lock-content", NULL /* GIMP_ICON_LOCK */,
+    NC_("vectors-action", "L_ock Strokes of Path"), NULL, NULL,
+    vectors_lock_content_cmd_callback,
+    FALSE,
+    GIMP_HELP_PATH_LOCK_STROKES },
+
+  { "vectors-lock-position", GIMP_ICON_TOOL_MOVE,
+    NC_("vectors-action", "L_ock Position of Path"), NULL, NULL,
+    vectors_lock_position_cmd_callback,
+    FALSE,
+    GIMP_HELP_PATH_LOCK_POSITION }
+};
+
+static const GimpEnumActionEntry vectors_color_tag_actions[] =
+{
+  { "vectors-color-tag-none", GIMP_ICON_EDIT_CLEAR,
+    NC_("vectors-action", "None"), NULL,
+    NC_("vectors-action", "Path Color Tag: Clear"),
+    GIMP_COLOR_TAG_NONE, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-blue", NULL,
+    NC_("vectors-action", "Blue"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Blue"),
+    GIMP_COLOR_TAG_BLUE, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-green", NULL,
+    NC_("vectors-action", "Green"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Green"),
+    GIMP_COLOR_TAG_GREEN, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-yellow", NULL,
+    NC_("vectors-action", "Yellow"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Yellow"),
+    GIMP_COLOR_TAG_YELLOW, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-orange", NULL,
+    NC_("vectors-action", "Orange"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Orange"),
+    GIMP_COLOR_TAG_ORANGE, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-brown", NULL,
+    NC_("vectors-action", "Brown"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Brown"),
+    GIMP_COLOR_TAG_BROWN, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-red", NULL,
+    NC_("vectors-action", "Red"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Red"),
+    GIMP_COLOR_TAG_RED, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-violet", NULL,
+    NC_("vectors-action", "Violet"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Violet"),
+    GIMP_COLOR_TAG_VIOLET, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG },
+
+  { "vectors-color-tag-gray", NULL,
+    NC_("vectors-action", "Gray"), NULL,
+    NC_("vectors-action", "Path Color Tag: Set to Gray"),
+    GIMP_COLOR_TAG_GRAY, FALSE,
+    GIMP_HELP_PATH_COLOR_TAG }
+};
+
+static const GimpEnumActionEntry vectors_to_selection_actions[] =
+{
+  { "vectors-selection-replace", GIMP_ICON_SELECTION_REPLACE,
+    NC_("vectors-action", "Path to Sele_ction"), NULL,
+    NC_("vectors-action", "Path to selection"),
+    GIMP_CHANNEL_OP_REPLACE, FALSE,
+    GIMP_HELP_PATH_SELECTION_REPLACE },
+
+  { "vectors-selection-from-vectors", GIMP_ICON_SELECTION_REPLACE,
+    NC_("vectors-action", "Fr_om Path"), "<shift>V",
+    NC_("vectors-action", "Replace selection with path"),
+    GIMP_CHANNEL_OP_REPLACE, FALSE,
+    GIMP_HELP_PATH_SELECTION_REPLACE },
+
+  { "vectors-selection-add", GIMP_ICON_SELECTION_ADD,
+    NC_("vectors-action", "_Add to Selection"), NULL,
+    NC_("vectors-action", "Add path to selection"),
+    GIMP_CHANNEL_OP_ADD, FALSE,
+    GIMP_HELP_PATH_SELECTION_ADD },
+
+  { "vectors-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
+    NC_("vectors-action", "_Subtract from Selection"), NULL,
+    NC_("vectors-action", "Subtract path from selection"),
+    GIMP_CHANNEL_OP_SUBTRACT, FALSE,
+    GIMP_HELP_PATH_SELECTION_SUBTRACT },
+
+  { "vectors-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
+    NC_("vectors-action", "_Intersect with Selection"), NULL,
+    NC_("vectors-action", "Intersect path with selection"),
+    GIMP_CHANNEL_OP_INTERSECT, FALSE,
+    GIMP_HELP_PATH_SELECTION_INTERSECT }
+};
+
+static const GimpEnumActionEntry vectors_selection_to_vectors_actions[] =
+{
+  { "vectors-selection-to-vectors", GIMP_ICON_SELECTION_TO_PATH,
+    NC_("vectors-action", "Selecti_on to Path"), NULL,
+    NC_("vectors-action", "Selection to path"),
+    FALSE, FALSE,
+    GIMP_HELP_SELECTION_TO_PATH },
+
+  { "vectors-selection-to-vectors-short", GIMP_ICON_SELECTION_TO_PATH,
+    NC_("vectors-action", "To _Path"), NULL,
+    NC_("vectors-action", "Selection to path"),
+    FALSE, FALSE,
+    GIMP_HELP_SELECTION_TO_PATH },
+
+  { "vectors-selection-to-vectors-advanced", GIMP_ICON_SELECTION_TO_PATH,
+    NC_("vectors-action", "Selection to Path (_Advanced)"), NULL,
+    NC_("vectors-action", "Advanced options"),
+    TRUE, FALSE,
+    GIMP_HELP_SELECTION_TO_PATH }
+};
+
+static const GimpEnumActionEntry vectors_select_actions[] =
+{
+  { "vectors-select-top", NULL,
+    NC_("vectors-action", "Select _Top Path"), NULL,
+    NC_("vectors-action", "Select the topmost path"),
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    GIMP_HELP_PATH_TOP },
+
+  { "vectors-select-bottom", NULL,
+    NC_("vectors-action", "Select _Bottom Path"), NULL,
+    NC_("vectors-action", "Select the bottommost path"),
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_PATH_BOTTOM },
+
+  { "vectors-select-previous", NULL,
+    NC_("vectors-action", "Select _Previous Path"), NULL,
+    NC_("vectors-action", "Select the path above the current path"),
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_PATH_PREVIOUS },
+
+  { "vectors-select-next", NULL,
+    NC_("vectors-action", "Select _Next Path"), NULL,
+    NC_("vectors-action", "Select the vector below the current path"),
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_PATH_NEXT }
+};
+
+void
+vectors_actions_setup (GimpActionGroup *group)
+{
+  gimp_action_group_add_actions (group, "vectors-action",
+                                 vectors_actions,
+                                 G_N_ELEMENTS (vectors_actions));
+
+  gimp_action_group_add_toggle_actions (group, "vectors-action",
+                                        vectors_toggle_actions,
+                                        G_N_ELEMENTS (vectors_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "vectors-action",
+                                      vectors_color_tag_actions,
+                                      G_N_ELEMENTS (vectors_color_tag_actions),
+                                      vectors_color_tag_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "vectors-action",
+                                      vectors_to_selection_actions,
+                                      G_N_ELEMENTS (vectors_to_selection_actions),
+                                      vectors_to_selection_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "vectors-action",
+                                      vectors_selection_to_vectors_actions,
+                                      G_N_ELEMENTS (vectors_selection_to_vectors_actions),
+                                      vectors_selection_to_vectors_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "vectors-action",
+                                      vectors_select_actions,
+                                      G_N_ELEMENTS (vectors_select_actions),
+                                      vectors_select_cmd_callback);
+
+  items_actions_setup (group, "vectors");
+}
+
+void
+vectors_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+  GimpImage    *image         = action_data_get_image (data);
+  GimpVectors  *vectors       = NULL;
+  GimpDrawable *drawable      = NULL;
+  gint          n_vectors     = 0;
+  gboolean      mask_empty    = TRUE;
+  gboolean      dr_writable   = FALSE;
+  gboolean      dr_children   = FALSE;
+  GList        *next          = NULL;
+  GList        *prev          = NULL;
+
+  if (image)
+    {
+      n_vectors  = gimp_image_get_n_vectors (image);
+      mask_empty = gimp_channel_is_empty (gimp_image_get_mask (image));
+
+      vectors = gimp_image_get_active_vectors (image);
+
+      if (vectors)
+        {
+          GList *vectors_list;
+          GList *list;
+
+          vectors_list = gimp_item_get_container_iter (GIMP_ITEM (vectors));
+
+          list = g_list_find (vectors_list, vectors);
+
+          if (list)
+            {
+              prev = g_list_previous (list);
+              next = g_list_next (list);
+            }
+        }
+
+      drawable = gimp_image_get_active_drawable (image);
+
+      if (drawable)
+        {
+          dr_writable = ! gimp_item_is_content_locked (GIMP_ITEM (drawable));
+
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+            dr_children = TRUE;
+        }
+    }
+
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_SENSITIVE ("vectors-edit",            vectors);
+  SET_SENSITIVE ("vectors-edit-attributes", vectors);
+
+  SET_SENSITIVE ("vectors-new",             image);
+  SET_SENSITIVE ("vectors-new-last-values", image);
+  SET_SENSITIVE ("vectors-duplicate",       vectors);
+  SET_SENSITIVE ("vectors-delete",          vectors);
+  SET_SENSITIVE ("vectors-merge-visible",   n_vectors > 1);
+
+  SET_SENSITIVE ("vectors-raise",           vectors && prev);
+  SET_SENSITIVE ("vectors-raise-to-top",    vectors && prev);
+  SET_SENSITIVE ("vectors-lower",           vectors && next);
+  SET_SENSITIVE ("vectors-lower-to-bottom", vectors && next);
+
+  SET_SENSITIVE ("vectors-copy",   vectors);
+  SET_SENSITIVE ("vectors-paste",  image);
+  SET_SENSITIVE ("vectors-export", vectors);
+  SET_SENSITIVE ("vectors-import", image);
+
+  SET_SENSITIVE ("vectors-selection-to-vectors",          image && !mask_empty);
+  SET_SENSITIVE ("vectors-selection-to-vectors-short",    image && !mask_empty);
+  SET_SENSITIVE ("vectors-selection-to-vectors-advanced", image && !mask_empty);
+  SET_SENSITIVE ("vectors-fill",                          vectors &&
+                                                          dr_writable &&
+                                                          !dr_children);
+  SET_SENSITIVE ("vectors-fill-last-values",              vectors &&
+                                                          dr_writable &&
+                                                          !dr_children);
+  SET_SENSITIVE ("vectors-stroke",                        vectors &&
+                                                          dr_writable &&
+                                                          !dr_children);
+  SET_SENSITIVE ("vectors-stroke-last-values",            vectors &&
+                                                          dr_writable &&
+                                                          !dr_children);
+
+  SET_SENSITIVE ("vectors-selection-replace",      vectors);
+  SET_SENSITIVE ("vectors-selection-from-vectors", vectors);
+  SET_SENSITIVE ("vectors-selection-add",          vectors);
+  SET_SENSITIVE ("vectors-selection-subtract",     vectors);
+  SET_SENSITIVE ("vectors-selection-intersect",    vectors);
+
+  SET_SENSITIVE ("vectors-select-top",       vectors && prev);
+  SET_SENSITIVE ("vectors-select-bottom",    vectors && next);
+  SET_SENSITIVE ("vectors-select-previous",  vectors && prev);
+  SET_SENSITIVE ("vectors-select-next",      vectors && next);
+
+#undef SET_SENSITIVE
+#undef SET_ACTIVE
+
+  items_actions_update (group, "vectors", GIMP_ITEM (vectors));
+}
diff --git a/app/actions/vectors-actions.h b/app/actions/vectors-actions.h
new file mode 100644
index 0000000..b5422b8
--- /dev/null
+++ b/app/actions/vectors-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_ACTIONS_H__
+#define __VECTORS_ACTIONS_H__
+
+
+void   vectors_actions_setup  (GimpActionGroup *group);
+void   vectors_actions_update (GimpActionGroup *group,
+                               gpointer         data);
+
+
+#endif /* __VECTORS_ACTIONS_H__ */
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
new file mode 100644
index 0000000..43b3044
--- /dev/null
+++ b/app/actions/vectors-commands.c
@@ -0,0 +1,892 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-merge.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+#include "core/gimptoolinfo.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimpprocedure.h"
+
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-export.h"
+#include "vectors/gimpvectors-import.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpclipboard.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+
+#include "tools/gimpvectortool.h"
+#include "tools/tool_manager.h"
+
+#include "dialogs/dialogs.h"
+#include "dialogs/vectors-export-dialog.h"
+#include "dialogs/vectors-import-dialog.h"
+#include "dialogs/vectors-options-dialog.h"
+
+#include "actions.h"
+#include "items-commands.h"
+#include "vectors-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   vectors_new_callback             (GtkWidget    *dialog,
+                                                GimpImage    *image,
+                                                GimpVectors  *vectors,
+                                                GimpContext  *context,
+                                                const gchar  *vectors_name,
+                                                gboolean      vectors_visible,
+                                                gboolean      vectors_linked,
+                                                GimpColorTag  vectors_color_tag,
+                                                gboolean      vectors_lock_content,
+                                                gboolean      vectors_lock_position,
+                                                gpointer      user_data);
+static void   vectors_edit_attributes_callback (GtkWidget    *dialog,
+                                                GimpImage    *image,
+                                                GimpVectors  *vectors,
+                                                GimpContext  *context,
+                                                const gchar  *vectors_name,
+                                                gboolean      vectors_visible,
+                                                gboolean      vectors_linked,
+                                                GimpColorTag  vectors_color_tag,
+                                                gboolean      vectors_lock_content,
+                                                gboolean      vectors_lock_position,
+                                                gpointer      user_data);
+static void   vectors_import_callback          (GtkWidget    *dialog,
+                                                GimpImage    *image,
+                                                GFile        *file,
+                                                GFile        *import_folder,
+                                                gboolean      merge_vectors,
+                                                gboolean      scale_vectors,
+                                                gpointer      user_data);
+static void   vectors_export_callback          (GtkWidget    *dialog,
+                                                GimpImage    *image,
+                                                GFile        *file,
+                                                GFile        *export_folder,
+                                                gboolean      active_only,
+                                                gpointer      user_data);
+
+
+/*  public functions  */
+
+void
+vectors_edit_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  GimpTool    *active_tool;
+  return_if_no_vectors (image, vectors, data);
+
+  active_tool = tool_manager_get_active (image->gimp);
+
+  if (! GIMP_IS_VECTOR_TOOL (active_tool))
+    {
+      GimpToolInfo  *tool_info = gimp_get_tool_info (image->gimp,
+                                                     "gimp-vector-tool");
+
+      if (GIMP_IS_TOOL_INFO (tool_info))
+        {
+          gimp_context_set_tool (action_data_get_context (data), tool_info);
+          active_tool = tool_manager_get_active (image->gimp);
+        }
+    }
+
+  if (GIMP_IS_VECTOR_TOOL (active_tool))
+    gimp_vector_tool_set_vectors (GIMP_VECTOR_TOOL (active_tool), vectors);
+}
+
+void
+vectors_edit_attributes_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_vectors (image, vectors, data);
+  return_if_no_widget (widget, data);
+
+#define EDIT_DIALOG_KEY "gimp-vectors-edit-attributes-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (vectors), EDIT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpItem *item = GIMP_ITEM (vectors);
+
+      dialog = vectors_options_dialog_new (image, vectors,
+                                           action_data_get_context (data),
+                                           widget,
+                                           _("Path Attributes"),
+                                           "gimp-vectors-edit",
+                                           GIMP_ICON_EDIT,
+                                           _("Edit Path Attributes"),
+                                           GIMP_HELP_PATH_EDIT,
+                                           gimp_object_get_name (vectors),
+                                           gimp_item_get_visible (item),
+                                           gimp_item_get_linked (item),
+                                           gimp_item_get_color_tag (item),
+                                           gimp_item_get_lock_content (item),
+                                           gimp_item_get_lock_position (item),
+                                           vectors_edit_attributes_callback,
+                                           NULL);
+
+      dialogs_attach_dialog (G_OBJECT (vectors), EDIT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+vectors_new_cmd_callback (GimpAction *action,
+                          GVariant   *value,
+                          gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+#define NEW_DIALOG_KEY "gimp-vectors-new-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), NEW_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+      dialog = vectors_options_dialog_new (image, NULL,
+                                           action_data_get_context (data),
+                                           widget,
+                                           _("New Path"),
+                                           "gimp-vectors-new",
+                                           GIMP_ICON_PATH,
+                                           _("Create a New Path"),
+                                           GIMP_HELP_PATH_NEW,
+                                           config->vectors_new_name,
+                                           FALSE,
+                                           FALSE,
+                                           GIMP_COLOR_TAG_NONE,
+                                           FALSE,
+                                           FALSE,
+                                           vectors_new_callback,
+                                           NULL);
+
+      dialogs_attach_dialog (G_OBJECT (image), NEW_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+vectors_new_last_vals_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage        *image;
+  GimpVectors      *vectors;
+  GimpDialogConfig *config;
+  return_if_no_image (image, data);
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  vectors = gimp_vectors_new (image, config->vectors_new_name);
+  gimp_image_add_vectors (image, vectors,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+}
+
+void
+vectors_raise_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  gimp_image_raise_item (image, GIMP_ITEM (vectors), NULL);
+  gimp_image_flush (image);
+}
+
+void
+vectors_raise_to_top_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  gimp_image_raise_item_to_top (image, GIMP_ITEM (vectors));
+  gimp_image_flush (image);
+}
+
+void
+vectors_lower_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  gimp_image_lower_item (image, GIMP_ITEM (vectors), NULL);
+  gimp_image_flush (image);
+}
+
+void
+vectors_lower_to_bottom_cmd_callback (GimpAction *action,
+                                      GVariant   *value,
+                                      gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  gimp_image_lower_item_to_bottom (image, GIMP_ITEM (vectors));
+  gimp_image_flush (image);
+}
+
+void
+vectors_duplicate_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  GimpVectors *new_vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  new_vectors = GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
+                                                   G_TYPE_FROM_INSTANCE (vectors)));
+  /*  use the actual parent here, not GIMP_IMAGE_ACTIVE_PARENT because
+   *  the latter would add a duplicated group inside itself instead of
+   *  above it
+   */
+  gimp_image_add_vectors (image, new_vectors,
+                          gimp_vectors_get_parent (vectors), -1,
+                          TRUE);
+  gimp_image_flush (image);
+}
+
+void
+vectors_delete_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  gimp_image_remove_vectors (image, vectors, TRUE, NULL);
+  gimp_image_flush (image);
+}
+
+void
+vectors_merge_visible_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  GtkWidget   *widget;
+  GError      *error = NULL;
+  return_if_no_vectors (image, vectors, data);
+  return_if_no_widget (widget, data);
+
+  if (! gimp_image_merge_visible_vectors (image, &error))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+                            error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+}
+
+void
+vectors_to_selection_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpImage      *image;
+  GimpVectors    *vectors;
+  GimpChannelOps  operation;
+  return_if_no_vectors (image, vectors, data);
+
+  operation = (GimpChannelOps) g_variant_get_int32 (value);
+
+  gimp_item_to_selection (GIMP_ITEM (vectors), operation,
+                          TRUE, FALSE, 0, 0);
+  gimp_image_flush (image);
+}
+
+void
+vectors_selection_to_vectors_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data)
+{
+  GimpImage      *image;
+  GtkWidget      *widget;
+  GimpProcedure  *procedure;
+  GimpValueArray *args;
+  GimpDisplay    *display;
+  gboolean        advanced;
+  GError         *error = NULL;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  advanced = (gboolean) g_variant_get_int32 (value);
+
+  if (advanced)
+    procedure = gimp_pdb_lookup_procedure (image->gimp->pdb,
+                                           "plug-in-sel2path-advanced");
+  else
+    procedure = gimp_pdb_lookup_procedure (image->gimp->pdb,
+                                           "plug-in-sel2path");
+
+  if (! procedure)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_ERROR,
+                            "Selection to path procedure lookup failed.");
+      return;
+    }
+
+  display = gimp_context_get_display (action_data_get_context (data));
+
+  args = gimp_procedure_get_arguments (procedure);
+  gimp_value_array_truncate (args, 2);
+
+  g_value_set_int      (gimp_value_array_index (args, 0),
+                        GIMP_RUN_INTERACTIVE);
+  gimp_value_set_image (gimp_value_array_index (args, 1),
+                        image);
+
+  gimp_procedure_execute_async (procedure, image->gimp,
+                                action_data_get_context (data),
+                                GIMP_PROGRESS (display), args,
+                                GIMP_OBJECT (display), &error);
+
+  gimp_value_array_unref (args);
+
+  if (error)
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (widget), GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_error_free (error);
+    }
+}
+
+void
+vectors_fill_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_fill_cmd_callback (action,
+                           image, GIMP_ITEM (vectors),
+                           "gimp-vectors-fill-dialog",
+                           _("Fill Path"),
+                           GIMP_ICON_TOOL_BUCKET_FILL,
+                           GIMP_HELP_PATH_FILL,
+                           data);
+}
+
+void
+vectors_fill_last_vals_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_fill_last_vals_cmd_callback (action,
+                                     image, GIMP_ITEM (vectors),
+                                     data);
+}
+
+void
+vectors_stroke_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_stroke_cmd_callback (action,
+                             image, GIMP_ITEM (vectors),
+                             "gimp-vectors-stroke-dialog",
+                             _("Stroke Path"),
+                             GIMP_ICON_PATH_STROKE,
+                             GIMP_HELP_PATH_STROKE,
+                             data);
+}
+
+void
+vectors_stroke_last_vals_cmd_callback (GimpAction *action,
+                                       GVariant   *value,
+                                       gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_stroke_last_vals_cmd_callback (action,
+                                       image, GIMP_ITEM (vectors),
+                                       data);
+}
+
+void
+vectors_copy_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  gchar       *svg;
+  return_if_no_vectors (image, vectors, data);
+
+  svg = gimp_vectors_export_string (image, vectors);
+
+  if (svg)
+    {
+      gimp_clipboard_set_svg (image->gimp, svg);
+      g_free (svg);
+    }
+}
+
+void
+vectors_paste_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  gchar     *svg;
+  gsize      svg_size;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+  svg = gimp_clipboard_get_svg (image->gimp, &svg_size);
+
+  if (svg)
+    {
+      GError *error = NULL;
+
+      if (! gimp_vectors_import_buffer (image, svg, svg_size,
+                                        TRUE, FALSE,
+                                        GIMP_IMAGE_ACTIVE_PARENT, -1,
+                                        NULL, &error))
+        {
+          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
+                        "%s", error->message);
+          g_clear_error (&error);
+        }
+      else
+        {
+          gimp_image_flush (image);
+        }
+
+      g_free (svg);
+    }
+}
+
+void
+vectors_export_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  GtkWidget   *widget;
+  GtkWidget   *dialog;
+  return_if_no_vectors (image, vectors, data);
+  return_if_no_widget (widget, data);
+
+#define EXPORT_DIALOG_KEY "gimp-vectors-export-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), EXPORT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GFile            *folder = NULL;
+
+      if (config->vectors_export_path)
+        folder = gimp_file_new_for_config_path (config->vectors_export_path,
+                                                NULL);
+
+      dialog = vectors_export_dialog_new (image, widget,
+                                          folder,
+                                          config->vectors_export_active_only,
+                                          vectors_export_callback,
+                                          NULL);
+
+      if (folder)
+        g_object_unref (folder);
+
+      dialogs_attach_dialog (G_OBJECT (image), EXPORT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+vectors_import_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage *image;
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  return_if_no_image (image, data);
+  return_if_no_widget (widget, data);
+
+#define IMPORT_DIALOG_KEY "gimp-vectors-import-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (image), IMPORT_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+      GFile            *folder = NULL;
+
+      if (config->vectors_import_path)
+        folder = gimp_file_new_for_config_path (config->vectors_import_path,
+                                                NULL);
+
+      dialog = vectors_import_dialog_new (image, widget,
+                                          folder,
+                                          config->vectors_import_merge,
+                                          config->vectors_import_scale,
+                                          vectors_import_callback,
+                                          NULL);
+
+      dialogs_attach_dialog (G_OBJECT (image), IMPORT_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+vectors_visible_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_visible_cmd_callback (action, value, image, GIMP_ITEM (vectors));
+}
+
+void
+vectors_linked_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_linked_cmd_callback (action, value, image, GIMP_ITEM (vectors));
+}
+
+void
+vectors_lock_content_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_lock_content_cmd_callback (action, value, image, GIMP_ITEM (vectors));
+}
+
+void
+vectors_lock_position_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpImage   *image;
+  GimpVectors *vectors;
+  return_if_no_vectors (image, vectors, data);
+
+  items_lock_position_cmd_callback (action, value, image, GIMP_ITEM (vectors));
+}
+
+void
+vectors_color_tag_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpImage    *image;
+  GimpVectors  *vectors;
+  GimpColorTag  color_tag;
+  return_if_no_vectors (image, vectors, data);
+
+  color_tag = (GimpColorTag) g_variant_get_int32 (value);
+
+  items_color_tag_cmd_callback (action, image, GIMP_ITEM (vectors),
+                                color_tag);
+}
+
+
+/*  private functions  */
+
+static void
+vectors_new_callback (GtkWidget    *dialog,
+                      GimpImage    *image,
+                      GimpVectors  *vectors,
+                      GimpContext  *context,
+                      const gchar  *vectors_name,
+                      gboolean      vectors_visible,
+                      gboolean      vectors_linked,
+                      GimpColorTag  vectors_color_tag,
+                      gboolean      vectors_lock_content,
+                      gboolean      vectors_lock_position,
+                      gpointer      user_data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  g_object_set (config,
+                "path-new-name", vectors_name,
+                NULL);
+
+  vectors = gimp_vectors_new (image, config->vectors_new_name);
+  gimp_item_set_visible (GIMP_ITEM (vectors), vectors_visible, FALSE);
+  gimp_item_set_linked (GIMP_ITEM (vectors), vectors_linked, FALSE);
+  gimp_item_set_color_tag (GIMP_ITEM (vectors), vectors_color_tag, FALSE);
+  gimp_item_set_lock_content (GIMP_ITEM (vectors), vectors_lock_content, FALSE);
+  gimp_item_set_lock_position (GIMP_ITEM (vectors), vectors_lock_position, FALSE);
+
+  gimp_image_add_vectors (image, vectors,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+vectors_edit_attributes_callback (GtkWidget    *dialog,
+                                  GimpImage    *image,
+                                  GimpVectors  *vectors,
+                                  GimpContext  *context,
+                                  const gchar  *vectors_name,
+                                  gboolean      vectors_visible,
+                                  gboolean      vectors_linked,
+                                  GimpColorTag  vectors_color_tag,
+                                  gboolean      vectors_lock_content,
+                                  gboolean      vectors_lock_position,
+                                  gpointer      user_data)
+{
+  GimpItem *item = GIMP_ITEM (vectors);
+
+  if (strcmp (vectors_name, gimp_object_get_name (vectors))      ||
+      vectors_visible       != gimp_item_get_visible (item)      ||
+      vectors_linked        != gimp_item_get_linked (item)       ||
+      vectors_color_tag     != gimp_item_get_color_tag (item)    ||
+      vectors_lock_content  != gimp_item_get_lock_content (item) ||
+      vectors_lock_position != gimp_item_get_lock_position (item))
+    {
+      gimp_image_undo_group_start (image,
+                                   GIMP_UNDO_GROUP_ITEM_PROPERTIES,
+                                   _("Path Attributes"));
+
+      if (strcmp (vectors_name, gimp_object_get_name (vectors)))
+        gimp_item_rename (GIMP_ITEM (vectors), vectors_name, NULL);
+
+      if (vectors_visible != gimp_item_get_visible (item))
+        gimp_item_set_visible (item, vectors_visible, TRUE);
+
+      if (vectors_linked != gimp_item_get_linked (item))
+        gimp_item_set_linked (item, vectors_linked, TRUE);
+
+      if (vectors_color_tag != gimp_item_get_color_tag (item))
+        gimp_item_set_color_tag (item, vectors_color_tag, TRUE);
+
+      if (vectors_lock_content != gimp_item_get_lock_content (item))
+        gimp_item_set_lock_content (item, vectors_lock_content, TRUE);
+
+      if (vectors_lock_position != gimp_item_get_lock_position (item))
+        gimp_item_set_lock_position (item, vectors_lock_position, TRUE);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+vectors_import_callback (GtkWidget *dialog,
+                         GimpImage *image,
+                         GFile     *file,
+                         GFile     *import_folder,
+                         gboolean   merge_vectors,
+                         gboolean   scale_vectors,
+                         gpointer   user_data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (image->gimp->config);
+  gchar            *path   = NULL;
+  GError           *error  = NULL;
+
+  if (import_folder)
+    path = gimp_file_get_config_path (import_folder, NULL);
+
+  g_object_set (config,
+                "path-import-path",  path,
+                "path-import-merge", merge_vectors,
+                "path-import-scale", scale_vectors,
+                NULL);
+
+  if (path)
+    g_free (path);
+
+  if (gimp_vectors_import_file (image, file,
+                                config->vectors_import_merge,
+                                config->vectors_import_scale,
+                                GIMP_IMAGE_ACTIVE_PARENT, -1,
+                                NULL, &error))
+    {
+      gimp_image_flush (image);
+    }
+  else
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog),
+                    GIMP_MESSAGE_ERROR,
+                    "%s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+vectors_export_callback (GtkWidget *dialog,
+                         GimpImage *image,
+                         GFile     *file,
+                         GFile     *export_folder,
+                         gboolean   active_only,
+                         gpointer   user_data)
+{
+  GimpDialogConfig *config  = GIMP_DIALOG_CONFIG (image->gimp->config);
+  GimpVectors      *vectors = NULL;
+  gchar            *path    = NULL;
+  GError           *error   = NULL;
+
+  if (export_folder)
+    path = gimp_file_get_config_path (export_folder, NULL);
+
+  g_object_set (config,
+                "path-export-path",        path,
+                "path-export-active-only", active_only,
+                NULL);
+
+  if (path)
+    g_free (path);
+
+  if (config->vectors_export_active_only)
+    vectors = gimp_image_get_active_vectors (image);
+
+  if (! gimp_vectors_export_file (image, vectors, file, &error))
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog),
+                    GIMP_MESSAGE_ERROR,
+                    "%s", error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+void
+vectors_select_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpImage            *image;
+  GimpVectors          *vectors;
+  GimpContainer        *container;
+  GimpVectors          *new_vectors;
+  GimpActionSelectType  select_type;
+  return_if_no_image (image, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  vectors = gimp_image_get_active_vectors (image);
+
+  if (vectors)
+    container = gimp_item_get_container (GIMP_ITEM (vectors));
+  else
+    container = gimp_image_get_vectors (image);
+
+  new_vectors = (GimpVectors *) action_select_object (select_type,
+                                                      container,
+                                                      (GimpObject *) vectors);
+
+  if (new_vectors && new_vectors != vectors)
+    {
+      gimp_image_set_active_vectors (image, new_vectors);
+      gimp_image_flush (image);
+    }
+}
diff --git a/app/actions/vectors-commands.h b/app/actions/vectors-commands.h
new file mode 100644
index 0000000..5ce88b9
--- /dev/null
+++ b/app/actions/vectors-commands.h
@@ -0,0 +1,112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_COMMANDS_H__
+#define __VECTORS_COMMANDS_H__
+
+
+void   vectors_edit_cmd_callback                 (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_edit_attributes_cmd_callback      (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_new_cmd_callback                  (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_new_last_vals_cmd_callback        (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_raise_cmd_callback                (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_raise_to_top_cmd_callback         (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_lower_cmd_callback                (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_lower_to_bottom_cmd_callback      (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_duplicate_cmd_callback            (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_delete_cmd_callback               (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_merge_visible_cmd_callback        (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_to_selection_cmd_callback         (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_selection_to_vectors_cmd_callback (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_fill_cmd_callback                 (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_fill_last_vals_cmd_callback       (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_stroke_cmd_callback               (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_stroke_last_vals_cmd_callback     (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_copy_cmd_callback                 (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_paste_cmd_callback                (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_export_cmd_callback               (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_import_cmd_callback               (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_visible_cmd_callback              (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_linked_cmd_callback               (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_lock_content_cmd_callback         (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+void   vectors_lock_position_cmd_callback        (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_color_tag_cmd_callback            (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+void   vectors_select_cmd_callback               (GimpAction *action,
+                                                  GVariant   *value,
+                                                  gpointer    data);
+
+
+#endif /* __VECTORS_COMMANDS_H__ */
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
new file mode 100644
index 0000000..bbf272c
--- /dev/null
+++ b/app/actions/view-actions.c
@@ -0,0 +1,1211 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdisplayoptions.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimprender.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimpdisplayshell-scale.h"
+#include "display/gimpimagewindow.h"
+
+#include "actions.h"
+#include "view-actions.h"
+#include "view-commands.h"
+#include "window-actions.h"
+#include "window-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   view_actions_set_zoom          (GimpActionGroup   *group,
+                                              GimpDisplayShell  *shell);
+static void   view_actions_set_rotate        (GimpActionGroup   *group,
+                                              GimpDisplayShell  *shell);
+static void   view_actions_check_type_notify (GimpDisplayConfig *config,
+                                              GParamSpec        *pspec,
+                                              GimpActionGroup   *group);
+
+
+static const GimpActionEntry view_actions[] =
+{
+  { "view-menu",                NULL, NC_("view-action", "_View")          },
+  { "view-zoom-menu",           NULL, NC_("view-action", "_Zoom")          },
+  { "view-rotate-menu",         NULL, NC_("view-action", "_Flip & Rotate") },
+  { "view-padding-color-menu",  NULL, NC_("view-action", "_Padding Color") },
+
+  { "view-color-management-menu", NULL,
+    NC_("view-action", "_Color Management") },
+
+  { "view-display-intent-menu", NULL,
+    NC_("view-action", "Display _Rendering Intent") },
+
+  { "view-softproof-intent-menu", NULL,
+    NC_("view-action", "Soft-Proofing Re_ndering Intent") },
+
+  { "view-move-to-screen-menu", GIMP_ICON_WINDOW_MOVE_TO_SCREEN,
+    NC_("view-action", "Move to Screen"), NULL, NULL, NULL,
+    GIMP_HELP_VIEW_CHANGE_SCREEN },
+
+  { "view-new", GIMP_ICON_WINDOW_NEW,
+    NC_("view-action", "_New View"), NULL,
+    NC_("view-action", "Create another view on this image"),
+    view_new_cmd_callback,
+    GIMP_HELP_VIEW_NEW },
+
+  { "view-close", GIMP_ICON_WINDOW_CLOSE,
+    NC_("view-action",  "_Close View"), "<primary>W",
+    NC_("view-action", "Close the active image view"),
+    view_close_cmd_callback,
+    GIMP_HELP_FILE_CLOSE },
+
+  { "view-scroll-center", GIMP_ICON_CENTER,
+    NC_("view-action", "C_enter Image in Window"), "<shift>J",
+    NC_("view-action", "Scroll the image so that it is centered in the window"),
+    view_scroll_center_cmd_callback,
+    GIMP_HELP_VIEW_SCROLL_CENTER },
+
+  { "view-zoom-fit-in", GIMP_ICON_ZOOM_FIT_BEST,
+    NC_("view-action", "_Fit Image in Window"), "<primary><shift>J",
+    NC_("view-action", "Adjust the zoom ratio so that the image becomes fully visible"),
+    view_zoom_fit_in_cmd_callback,
+    GIMP_HELP_VIEW_ZOOM_FIT_IN },
+
+  { "view-zoom-fill", GIMP_ICON_ZOOM_FIT_BEST,
+    NC_("view-action", "Fi_ll Window"), NULL,
+    NC_("view-action", "Adjust the zoom ratio so that the entire window is used"),
+    view_zoom_fill_cmd_callback,
+    GIMP_HELP_VIEW_ZOOM_FILL },
+
+  { "view-zoom-selection", GIMP_ICON_SELECTION,
+    NC_("view-action", "Zoom to _Selection"), NULL,
+    NC_("view-action", "Adjust the zoom ratio so that the selection fills the window"),
+    view_zoom_selection_cmd_callback,
+    GIMP_HELP_VIEW_ZOOM_SELECTION },
+
+  { "view-zoom-revert", NULL,
+    NC_("view-action", "Re_vert Zoom"), "grave",
+    NC_("view-action", "Restore the previous zoom level"),
+    view_zoom_revert_cmd_callback,
+    GIMP_HELP_VIEW_ZOOM_REVERT },
+
+  { "view-rotate-other", NULL,
+    NC_("view-action", "Othe_r rotation angle..."), NULL,
+    NC_("view-action", "Set a custom rotation angle"),
+    view_rotate_other_cmd_callback,
+    GIMP_HELP_VIEW_ROTATE_OTHER },
+
+  { "view-navigation-window", GIMP_ICON_DIALOG_NAVIGATION,
+    NC_("view-action", "Na_vigation Window"), NULL,
+    NC_("view-action", "Show an overview window for this image"),
+    view_navigation_window_cmd_callback,
+    GIMP_HELP_NAVIGATION_DIALOG },
+
+  { "view-display-filters", GIMP_ICON_DISPLAY_FILTER,
+    NC_("view-action", "Display _Filters..."), NULL,
+    NC_("view-action", "Configure filters applied to this view"),
+    view_display_filters_cmd_callback,
+    GIMP_HELP_DISPLAY_FILTER_DIALOG },
+
+  { "view-color-management-reset", GIMP_ICON_RESET,
+    NC_("view-action", "As in _Preferences"), NULL,
+    NC_("view-action",
+        "Reset color management to what's configured in preferences"),
+    view_color_management_reset_cmd_callback,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-softproof-profile", NULL,
+    NC_("view-action", "Soft-_Proofing Profile..."), NULL,
+    NC_("view-action", "Set the soft-proofing profile"),
+    view_softproof_profile_cmd_callback,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-shrink-wrap", GIMP_ICON_ZOOM_FIT_BEST,
+    NC_("view-action", "Shrink _Wrap"), "<primary>J",
+    NC_("view-action", "Reduce the image window to the size of the image display"),
+    view_shrink_wrap_cmd_callback,
+    GIMP_HELP_VIEW_SHRINK_WRAP },
+
+  { "view-open-display", NULL,
+    NC_("view-action", "_Open Display..."), NULL,
+    NC_("view-action", "Connect to another display"),
+    window_open_display_cmd_callback,
+    NULL }
+};
+
+static const GimpToggleActionEntry view_toggle_actions[] =
+{
+
+  { "view-show-all", NULL,
+    NC_("view-action", "Show _All"), NULL,
+    NC_("view-action", "Show full image content"),
+    view_show_all_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_SHOW_ALL },
+
+  { "view-dot-for-dot", NULL,
+    NC_("view-action", "_Dot for Dot"), NULL,
+    NC_("view-action", "A pixel on the screen represents an image pixel"),
+    view_dot_for_dot_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_DOT_FOR_DOT },
+
+  { "view-color-management-enable", NULL,
+    NC_("view-action", "_Color-Manage this View"), NULL,
+    NC_("view-action", "Use color management for this view"),
+    view_color_management_enable_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-color-management-softproof", NULL,
+    NC_("view-action", "_Proof Colors"), NULL,
+    NC_("view-action", "Use this view for soft-proofing"),
+    view_color_management_softproof_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-display-black-point-compensation", NULL,
+    NC_("view-action", "_Black Point Compensation"), NULL,
+    NC_("view-action", "Use black point compensation for image display"),
+    view_display_bpc_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-softproof-black-point-compensation", NULL,
+    NC_("view-action", "_Black Point Compensation"), NULL,
+    NC_("view-action", "Use black point compensation for soft-proofing"),
+    view_softproof_bpc_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-softproof-gamut-check", NULL,
+    NC_("view-action", "_Mark Out Of Gamut Colors"), NULL,
+    NC_("view-action", "When soft-proofing, mark colors which cannot "
+        "be represented in the target color space"),
+    view_softproof_gamut_check_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-show-selection", NULL,
+    NC_("view-action", "Show _Selection"), "<primary>T",
+    NC_("view-action", "Display the selection outline"),
+    view_toggle_selection_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_SELECTION },
+
+  { "view-show-layer-boundary", NULL,
+    NC_("view-action", "Show _Layer Boundary"), NULL,
+    NC_("view-action", "Draw a border around the active layer"),
+    view_toggle_layer_boundary_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY },
+
+  { "view-show-canvas-boundary", NULL,
+    NC_("view-action", "Show Canvas Bounda_ry"), NULL,
+    NC_("view-action", "Draw a border around the canvas"),
+    view_toggle_canvas_boundary_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_CANVAS_BOUNDARY },
+
+  { "view-show-guides", NULL,
+    NC_("view-action", "Show _Guides"), "<primary><shift>T",
+    NC_("view-action", "Display the image's guides"),
+    view_toggle_guides_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_GUIDES },
+
+  { "view-show-grid", NULL,
+    NC_("view-action", "S_how Grid"), NULL,
+    NC_("view-action", "Display the image's grid"),
+    view_toggle_grid_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_SHOW_GRID },
+
+  { "view-show-sample-points", NULL,
+    NC_("view-action", "Sh_ow Sample Points"), NULL,
+    NC_("view-action", "Display the image's color sample points"),
+    view_toggle_sample_points_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_SAMPLE_POINTS },
+
+  { "view-snap-to-guides", NULL,
+    NC_("view-action", "Snap to Gu_ides"), NULL,
+    NC_("view-action", "Tool operations snap to guides"),
+    view_snap_to_guides_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SNAP_TO_GUIDES },
+
+  { "view-snap-to-grid", NULL,
+    NC_("view-action", "Sna_p to Grid"), NULL,
+    NC_("view-action", "Tool operations snap to the grid"),
+    view_snap_to_grid_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_SNAP_TO_GRID },
+
+  { "view-snap-to-canvas", NULL,
+    NC_("view-action", "Snap to _Canvas Edges"), NULL,
+    NC_("view-action", "Tool operations snap to the canvas edges"),
+    view_snap_to_canvas_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_SNAP_TO_CANVAS },
+
+  { "view-snap-to-vectors", NULL,
+    NC_("view-action", "Snap t_o Active Path"), NULL,
+    NC_("view-action", "Tool operations snap to the active path"),
+    view_snap_to_vectors_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_SNAP_TO_VECTORS },
+
+  { "view-show-menubar", NULL,
+    NC_("view-action", "Show _Menubar"), NULL,
+    NC_("view-action", "Show this window's menubar"),
+    view_toggle_menubar_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_MENUBAR },
+
+  { "view-show-rulers", NULL,
+    NC_("view-action", "Show R_ulers"), "<primary><shift>R",
+    NC_("view-action", "Show this window's rulers"),
+    view_toggle_rulers_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_RULERS },
+
+  { "view-show-scrollbars", NULL,
+    NC_("view-action", "Show Scroll_bars"), NULL,
+    NC_("view-action", "Show this window's scrollbars"),
+    view_toggle_scrollbars_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_SCROLLBARS },
+
+  { "view-show-statusbar", NULL,
+    NC_("view-action", "Show S_tatusbar"), NULL,
+    NC_("view-action", "Show this window's statusbar"),
+    view_toggle_statusbar_cmd_callback,
+    TRUE,
+    GIMP_HELP_VIEW_SHOW_STATUSBAR },
+
+  { "view-fullscreen", GIMP_ICON_VIEW_FULLSCREEN,
+    NC_("view-action", "Fullscr_een"), "F11",
+    NC_("view-action", "Toggle fullscreen view"),
+    view_fullscreen_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_FULLSCREEN }
+};
+
+static const GimpEnumActionEntry view_zoom_actions[] =
+{
+  { "view-zoom", NULL,
+    NC_("view-zoom-action", "Set zoom factor"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+
+  { "view-zoom-minimum", GIMP_ICON_ZOOM_OUT,
+    NC_("view-zoom-action", "Zoom out as far as possible"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-maximum", GIMP_ICON_ZOOM_IN,
+    NC_("view-zoom-action", "Zoom in as far as possible"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-out", GIMP_ICON_ZOOM_OUT,
+    NC_("view-zoom-action", "Zoom _Out"), "minus",
+    NC_("view-zoom-action", "Zoom out"),
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-in", GIMP_ICON_ZOOM_IN,
+    NC_("view-zoom-action", "Zoom _In"), "plus",
+    NC_("view-zoom-action", "Zoom in"),
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-out-accel", GIMP_ICON_CHAR_PICKER,
+    NC_("view-zoom-action", "Zoom Out"), "KP_Subtract",
+    NC_("view-zoom-action", "Zoom out"),
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-in-accel", GIMP_ICON_CHAR_PICKER,
+    NC_("view-zoom-action", "Zoom In"), "KP_Add",
+    NC_("view-zoom-action", "Zoom in"),
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-out-skip", GIMP_ICON_ZOOM_OUT,
+    NC_("view-zoom-action", "Zoom out a lot"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-in-skip", GIMP_ICON_ZOOM_IN,
+    NC_("view-zoom-action", "Zoom in a lot"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    GIMP_HELP_VIEW_ZOOM_IN }
+};
+
+static const GimpRadioActionEntry view_zoom_explicit_actions[] =
+{
+  { "view-zoom-16-1", NULL,
+    NC_("view-zoom-action", "1_6:1  (1600%)"), "5",
+    NC_("view-zoom-action", "Zoom 16:1"),
+    160000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-16-1-accel", NULL,
+    NC_("view-zoom-action", "1_6:1  (1600%)"), "KP_5",
+    NC_("view-zoom-action", "Zoom 16:1"),
+    160000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-8-1", NULL,
+    NC_("view-zoom-action", "_8:1  (800%)"), "4",
+    NC_("view-zoom-action", "Zoom 8:1"),
+    80000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-8-1-accel", NULL,
+    NC_("view-zoom-action", "_8:1  (800%)"), "KP_4",
+    NC_("view-zoom-action", "Zoom 8:1"),
+    80000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-4-1", NULL,
+    NC_("view-zoom-action", "_4:1  (400%)"), "3",
+    NC_("view-zoom-action", "Zoom 4:1"),
+    40000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-4-1-accel", NULL,
+    NC_("view-zoom-action", "_4:1  (400%)"), "KP_3",
+    NC_("view-zoom-action", "Zoom 4:1"),
+    40000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-2-1", NULL,
+    NC_("view-zoom-action", "_2:1  (200%)"), "2",
+    NC_("view-zoom-action", "Zoom 2:1"),
+    20000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-2-1-accel", NULL,
+    NC_("view-zoom-action", "_2:1  (200%)"), "KP_2",
+    NC_("view-zoom-action", "Zoom 2:1"),
+    20000,
+    GIMP_HELP_VIEW_ZOOM_IN },
+
+  { "view-zoom-1-1", GIMP_ICON_ZOOM_ORIGINAL,
+    NC_("view-zoom-action", "_1:1  (100%)"), "1",
+    NC_("view-zoom-action", "Zoom 1:1"),
+    10000,
+    GIMP_HELP_VIEW_ZOOM_100 },
+
+  { "view-zoom-1-1-accel", GIMP_ICON_ZOOM_ORIGINAL,
+    NC_("view-zoom-action", "_1:1  (100%)"), "KP_1",
+    NC_("view-zoom-action", "Zoom 1:1"),
+    10000,
+    GIMP_HELP_VIEW_ZOOM_100 },
+
+  { "view-zoom-1-2", NULL,
+    NC_("view-zoom-action", "1:_2  (50%)"), "<shift>2",
+    NC_("view-zoom-action", "Zoom 1:2"),
+    5000,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-1-4", NULL,
+    NC_("view-zoom-action", "1:_4  (25%)"), "<shift>3",
+    NC_("view-zoom-action", "Zoom 1:4"),
+    2500,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-1-8", NULL,
+    NC_("view-zoom-action", "1:_8  (12.5%)"), "<shift>4",
+    NC_("view-zoom-action", "Zoom 1:8"),
+    1250,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-1-16", NULL,
+    NC_("view-zoom-action", "1:1_6  (6.25%)"), "<shift>5",
+    NC_("view-zoom-action", "Zoom 1:16"),
+    625,
+    GIMP_HELP_VIEW_ZOOM_OUT },
+
+  { "view-zoom-other", NULL,
+    NC_("view-zoom-action", "Othe_r zoom factor..."), NULL,
+    NC_("view-zoom-action", "Set a custom zoom factor"),
+    0,
+    GIMP_HELP_VIEW_ZOOM_OTHER }
+};
+
+static const GimpToggleActionEntry view_flip_actions[] =
+{
+  { "view-flip-horizontally", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
+    NC_("view-action", "Flip _Horizontally"), NULL,
+    NC_("view-action", "Flip the view horizontally"),
+    view_flip_horizontally_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_FLIP },
+
+  { "view-flip-vertically", GIMP_ICON_OBJECT_FLIP_VERTICAL,
+    NC_("view-action", "Flip _Vertically"), NULL,
+    NC_("view-action", "Flip the view vertically"),
+    view_flip_vertically_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_FLIP }
+};
+
+static const GimpEnumActionEntry view_rotate_absolute_actions[] =
+{
+  { "view-rotate-set-absolute", NULL,
+    "Display Rotation Absolute Angle Set", NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+
+  { "view-rotate-reset", GIMP_ICON_RESET,
+    NC_("view-action", "_Reset Flip & Rotate"), "exclam",
+    NC_("view-action",
+        "Reset flipping to unflipped and the angle of rotation to 0°"),
+    GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
+    GIMP_HELP_VIEW_ROTATE_RESET },
+};
+
+static const GimpEnumActionEntry view_rotate_relative_actions[] =
+{
+  { "view-rotate-15", GIMP_ICON_OBJECT_ROTATE_90,
+    NC_("view-action", "Rotate 15° _clockwise"), NULL,
+    NC_("view-action", "Rotate the view 15 degrees to the right"),
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    GIMP_HELP_VIEW_ROTATE_15 },
+
+  { "view-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
+    NC_("view-action", "Rotate 90° _clockwise"), NULL,
+    NC_("view-action", "Rotate the view 90 degrees to the right"),
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    GIMP_HELP_VIEW_ROTATE_90 },
+
+  { "view-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
+    NC_("view-action", "Rotate _180°"), NULL,
+    NC_("view-action", "Turn the view upside-down"),
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    GIMP_HELP_VIEW_ROTATE_180 },
+
+  { "view-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
+    NC_("view-action", "Rotate 90° counter-clock_wise"), NULL,
+    NC_("view-action", "Rotate the view 90 degrees to the left"),
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    GIMP_HELP_VIEW_ROTATE_270 },
+
+  { "view-rotate-345", GIMP_ICON_OBJECT_ROTATE_270,
+    NC_("view-action", "Rotate 15° counter-clock_wise"), NULL,
+    NC_("view-action", "Rotate the view 15 degrees to the left"),
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    GIMP_HELP_VIEW_ROTATE_345 }
+};
+
+static const GimpRadioActionEntry view_display_intent_actions[] =
+{
+  { "view-display-intent-perceptual", NULL,
+    NC_("view-action", "_Perceptual"), NULL,
+    NC_("view-action", "Display rendering intent is perceptual"),
+    GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-display-intent-relative-colorimetric", NULL,
+    NC_("view-action", "_Relative Colorimetric"), NULL,
+    NC_("view-action", "Display rendering intent is relative colorimetric"),
+    GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-display-intent-saturation", NULL,
+    NC_("view-action", "_Saturation"), NULL,
+    NC_("view-action", "Display rendering intent is saturation"),
+    GIMP_COLOR_RENDERING_INTENT_SATURATION,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-display-intent-absolute-colorimetric", NULL,
+    NC_("view-action", "_Absolute Colorimetric"), NULL,
+    NC_("view-action", "Display rendering intent is absolute colorimetric"),
+    GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT }
+};
+
+static const GimpRadioActionEntry view_softproof_intent_actions[] =
+{
+  { "view-softproof-intent-perceptual", NULL,
+    NC_("view-action", "_Perceptual"), NULL,
+    NC_("view-action", "Soft-proofing rendering intent is perceptual"),
+    GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-softproof-intent-relative-colorimetric", NULL,
+    NC_("view-action", "_Relative Colorimetric"), NULL,
+    NC_("view-action", "Soft-proofing rendering intent is relative colorimetric"),
+    GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-softproof-intent-saturation", NULL,
+    NC_("view-action", "_Saturation"), NULL,
+    NC_("view-action", "Soft-proofing rendering intent is saturation"),
+    GIMP_COLOR_RENDERING_INTENT_SATURATION,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
+  { "view-softproof-intent-absolute-colorimetric", NULL,
+    NC_("view-action", "_Absolute Colorimetric"), NULL,
+    NC_("view-action", "Soft-proofing rendering intent is absolute colorimetric"),
+    GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC,
+    GIMP_HELP_VIEW_COLOR_MANAGEMENT }
+};
+
+static const GimpEnumActionEntry view_padding_color_actions[] =
+{
+  { "view-padding-color-theme", NULL,
+    NC_("view-padding-color", "From _Theme"), NULL,
+    NC_("view-padding-color", "Use the current theme's background color"),
+    GIMP_CANVAS_PADDING_MODE_DEFAULT, FALSE,
+    GIMP_HELP_VIEW_PADDING_COLOR },
+
+  { "view-padding-color-light-check", NULL,
+    NC_("view-padding-color", "_Light Check Color"), NULL,
+    NC_("view-padding-color", "Use the light check color"),
+    GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK, FALSE,
+    GIMP_HELP_VIEW_PADDING_COLOR },
+
+  { "view-padding-color-dark-check", NULL,
+    NC_("view-padding-color", "_Dark Check Color"), NULL,
+    NC_("view-padding-color", "Use the dark check color"),
+    GIMP_CANVAS_PADDING_MODE_DARK_CHECK, FALSE,
+    GIMP_HELP_VIEW_PADDING_COLOR },
+
+  { "view-padding-color-custom", GIMP_ICON_PALETTE,
+    NC_("view-padding-color", "_Custom Color..."), NULL,
+    NC_("view-padding-color", "Use an arbitrary color"),
+    GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,
+    GIMP_HELP_VIEW_PADDING_COLOR },
+
+  { "view-padding-color-prefs", GIMP_ICON_RESET,
+    NC_("view-padding-color", "As in _Preferences"), NULL,
+    NC_("view-padding-color",
+        "Reset padding color to what's configured in preferences"),
+    GIMP_CANVAS_PADDING_MODE_RESET, FALSE,
+    GIMP_HELP_VIEW_PADDING_COLOR }
+};
+
+static const GimpToggleActionEntry view_padding_color_toggle_actions[] =
+{
+  { "view-padding-color-in-show-all", NULL,
+    NC_("view-padding-color", "Keep Padding in \"Show _All\" Mode"), NULL,
+    NC_("view-padding-color",
+        "Keep canvas padding when \"View -> Show All\" is enabled"),
+    view_padding_color_in_show_all_cmd_callback,
+    FALSE,
+    GIMP_HELP_VIEW_PADDING_COLOR }
+};
+
+static const GimpEnumActionEntry view_scroll_horizontal_actions[] =
+{
+  { "view-scroll-horizontal", NULL,
+    NC_("view-action", "Set horizontal scroll offset"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+
+  { "view-scroll-left-border", NULL,
+    NC_("view-action", "Scroll to left border"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+
+  { "view-scroll-right-border", NULL,
+    NC_("view-action", "Scroll to right border"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+
+  { "view-scroll-left", NULL,
+    NC_("view-action", "Scroll left"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+
+  { "view-scroll-right", NULL,
+    NC_("view-action", "Scroll right"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+
+  { "view-scroll-page-left", NULL,
+    NC_("view-action", "Scroll page left"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+
+  { "view-scroll-page-right", NULL,
+    NC_("view-action", "Scroll page right"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+static const GimpEnumActionEntry view_scroll_vertical_actions[] =
+{
+  { "view-scroll-vertical", NULL,
+    NC_("view-action", "Set vertical scroll offset"), NULL, NULL,
+    GIMP_ACTION_SELECT_SET, TRUE,
+    NULL },
+
+  { "view-scroll-top-border", NULL,
+    NC_("view-action", "Scroll to top border"), NULL, NULL,
+    GIMP_ACTION_SELECT_FIRST, FALSE,
+    NULL },
+
+  { "view-scroll-bottom-border", NULL,
+    NC_("view-action", "Scroll to bottom border"), NULL, NULL,
+    GIMP_ACTION_SELECT_LAST, FALSE,
+    NULL },
+
+  { "view-scroll-up", NULL,
+    NC_("view-action", "Scroll up"), NULL, NULL,
+    GIMP_ACTION_SELECT_PREVIOUS, FALSE,
+    NULL },
+
+  { "view-scroll-down", NULL,
+    NC_("view-action", "Scroll down"), NULL, NULL,
+    GIMP_ACTION_SELECT_NEXT, FALSE,
+    NULL },
+
+  { "view-scroll-page-up", NULL,
+    NC_("view-action", "Scroll page up"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
+    NULL },
+
+  { "view-scroll-page-down", NULL,
+    NC_("view-action", "Scroll page down"), NULL, NULL,
+    GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
+    NULL }
+};
+
+
+void
+view_actions_setup (GimpActionGroup *group)
+{
+  GimpAction *action;
+
+  gimp_action_group_add_actions (group, "view-action",
+                                 view_actions,
+                                 G_N_ELEMENTS (view_actions));
+
+  gimp_action_group_add_toggle_actions (group, "view-action",
+                                        view_toggle_actions,
+                                        G_N_ELEMENTS (view_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "view-zoom-action",
+                                      view_zoom_actions,
+                                      G_N_ELEMENTS (view_zoom_actions),
+                                      view_zoom_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "view-zoom-action",
+                                       view_zoom_explicit_actions,
+                                       G_N_ELEMENTS (view_zoom_explicit_actions),
+                                       NULL,
+                                       10000,
+                                       view_zoom_explicit_cmd_callback);
+
+  gimp_action_group_add_toggle_actions (group, "view-action",
+                                        view_flip_actions,
+                                        G_N_ELEMENTS (view_flip_actions));
+
+  gimp_action_group_add_enum_actions (group, "view-action",
+                                      view_rotate_absolute_actions,
+                                      G_N_ELEMENTS (view_rotate_absolute_actions),
+                                      view_rotate_absolute_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "view-action",
+                                      view_rotate_relative_actions,
+                                      G_N_ELEMENTS (view_rotate_relative_actions),
+                                      view_rotate_relative_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "view-action",
+                                       view_display_intent_actions,
+                                       G_N_ELEMENTS (view_display_intent_actions),
+                                       NULL,
+                                       GIMP_COLOR_MANAGEMENT_DISPLAY,
+                                       view_display_intent_cmd_callback);
+
+  gimp_action_group_add_radio_actions (group, "view-action",
+                                       view_softproof_intent_actions,
+                                       G_N_ELEMENTS (view_softproof_intent_actions),
+                                       NULL,
+                                       GIMP_COLOR_MANAGEMENT_DISPLAY,
+                                       view_softproof_intent_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "view-padding-color",
+                                      view_padding_color_actions,
+                                      G_N_ELEMENTS (view_padding_color_actions),
+                                      view_padding_color_cmd_callback);
+
+  gimp_action_group_add_toggle_actions (group, "view-padding-color",
+                                        view_padding_color_toggle_actions,
+                                        G_N_ELEMENTS (view_padding_color_toggle_actions));
+
+  gimp_action_group_add_enum_actions (group, "view-action",
+                                      view_scroll_horizontal_actions,
+                                      G_N_ELEMENTS (view_scroll_horizontal_actions),
+                                      view_scroll_horizontal_cmd_callback);
+
+  gimp_action_group_add_enum_actions (group, "view-action",
+                                      view_scroll_vertical_actions,
+                                      G_N_ELEMENTS (view_scroll_vertical_actions),
+                                      view_scroll_vertical_cmd_callback);
+
+  /*  connect "activate" of view-zoom-other manually so it can be
+   *  selected even if it's the active item of the radio group
+   */
+  action = gimp_action_group_get_action (group, "view-zoom-other");
+
+  g_signal_connect (action, "activate",
+                    G_CALLBACK (view_zoom_other_cmd_callback),
+                    group->user_data);
+
+  g_signal_connect_object (group->gimp->config, "notify::check-type",
+                           G_CALLBACK (view_actions_check_type_notify),
+                           group, 0);
+  view_actions_check_type_notify (GIMP_DISPLAY_CONFIG (group->gimp->config),
+                                  NULL, group);
+
+  if (GIMP_IS_IMAGE_WINDOW (group->user_data) ||
+      GIMP_IS_GIMP (group->user_data))
+    {
+      /*  add window actions only if the context of the group is
+       *  the display itself or the global popup (not if the context
+       *  is a dock)
+       *  (see dock-actions.c)
+       */
+      window_actions_setup (group, GIMP_HELP_VIEW_CHANGE_SCREEN);
+    }
+}
+
+void
+view_actions_update (GimpActionGroup *group,
+                     gpointer         data)
+{
+  GimpDisplay        *display           = action_data_get_display (data);
+  GimpImage          *image             = NULL;
+  GimpDisplayShell   *shell             = NULL;
+  GimpDisplayOptions *options           = NULL;
+  GimpColorConfig    *color_config      = NULL;
+  gchar              *label             = NULL;
+  gboolean            fullscreen        = FALSE;
+  gboolean            revert_enabled    = FALSE;   /* able to revert zoom? */
+  gboolean            flip_horizontally = FALSE;
+  gboolean            flip_vertically   = FALSE;
+  gboolean            cm                = FALSE;
+  gboolean            sp                = FALSE;
+  gboolean            d_bpc             = FALSE;
+  gboolean            s_bpc             = FALSE;
+  gboolean            gammut            = FALSE;
+
+  if (display)
+    {
+      GimpImageWindow *window;
+      const gchar     *action = NULL;
+
+      image  = gimp_display_get_image (display);
+      shell  = gimp_display_get_shell (display);
+      window = gimp_display_shell_get_window (shell);
+
+      if (window)
+        fullscreen = gimp_image_window_get_fullscreen (window);
+
+      options = (image ?
+                 (fullscreen ? shell->fullscreen_options : shell->options) :
+                 shell->no_image_options);
+
+      revert_enabled = gimp_display_shell_scale_can_revert (shell);
+
+      flip_horizontally = shell->flip_horizontally;
+      flip_vertically   = shell->flip_vertically;
+
+      color_config = gimp_display_shell_get_color_config (shell);
+
+      switch (gimp_color_config_get_mode (color_config))
+        {
+        case GIMP_COLOR_MANAGEMENT_OFF:
+          break;
+
+        case GIMP_COLOR_MANAGEMENT_DISPLAY:
+          cm = (image != NULL);
+          break;
+
+        case GIMP_COLOR_MANAGEMENT_SOFTPROOF:
+          cm = (image != NULL);
+          sp = (image != NULL);
+          break;
+        }
+
+      switch (gimp_color_config_get_display_intent (color_config))
+        {
+        case GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL:
+          action = "view-display-intent-perceptual";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC:
+          action = "view-display-intent-relative-colorimetric";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_SATURATION:
+          action = "view-display-intent-saturation";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC:
+          action = "view-display-intent-absolute-colorimetric";
+          break;
+        }
+
+      gimp_action_group_set_action_active (group, action, TRUE);
+
+      switch (gimp_color_config_get_simulation_intent (color_config))
+        {
+        case GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL:
+          action = "view-softproof-intent-perceptual";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC:
+          action = "view-softproof-intent-relative-colorimetric";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_SATURATION:
+          action = "view-softproof-intent-saturation";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC:
+          action = "view-softproof-intent-absolute-colorimetric";
+          break;
+        }
+
+      gimp_action_group_set_action_active (group, action, TRUE);
+
+      d_bpc  = gimp_color_config_get_display_bpc (color_config);
+      s_bpc  = gimp_color_config_get_simulation_bpc (color_config);
+      gammut = gimp_color_config_get_simulation_gamut_check (color_config);
+    }
+
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+#define SET_SENSITIVE(action,condition) \
+        gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
+#define SET_COLOR(action,color) \
+        gimp_action_group_set_action_color (group, action, color, FALSE)
+
+  SET_SENSITIVE ("view-new",   image);
+  SET_SENSITIVE ("view-close", image);
+
+  SET_SENSITIVE ("view-show-all", image);
+  SET_ACTIVE    ("view-show-all", display && shell->show_all);
+
+  SET_SENSITIVE ("view-dot-for-dot", image);
+  SET_ACTIVE    ("view-dot-for-dot", display && shell->dot_for_dot);
+
+  SET_SENSITIVE ("view-scroll-center", image);
+
+  SET_SENSITIVE ("view-zoom-revert", revert_enabled);
+  if (revert_enabled)
+    {
+      label = g_strdup_printf (_("Re_vert Zoom (%d%%)"),
+                               ROUND (shell->last_scale * 100));
+      gimp_action_group_set_action_label (group, "view-zoom-revert", label);
+      g_free (label);
+    }
+  else
+    {
+      gimp_action_group_set_action_label (group, "view-zoom-revert",
+                                          _("Re_vert Zoom"));
+    }
+
+  SET_SENSITIVE ("view-zoom",              image);
+  SET_SENSITIVE ("view-zoom-minimum",      image);
+  SET_SENSITIVE ("view-zoom-maximum",      image);
+  SET_SENSITIVE ("view-zoom-in",           image);
+  SET_SENSITIVE ("view-zoom-in-accel",     image);
+  SET_SENSITIVE ("view-zoom-in-skip",      image);
+  SET_SENSITIVE ("view-zoom-out",          image);
+  SET_SENSITIVE ("view-zoom-out-accel",    image);
+  SET_SENSITIVE ("view-zoom-out-skip",     image);
+
+  SET_SENSITIVE ("view-zoom-fit-in",       image);
+  SET_SENSITIVE ("view-zoom-fill",         image);
+  SET_SENSITIVE ("view-zoom-selection",    image);
+  SET_SENSITIVE ("view-zoom-revert",       image);
+
+  SET_SENSITIVE ("view-zoom-16-1",         image);
+  SET_SENSITIVE ("view-zoom-16-1-accel",   image);
+  SET_SENSITIVE ("view-zoom-8-1",          image);
+  SET_SENSITIVE ("view-zoom-8-1-accel",    image);
+  SET_SENSITIVE ("view-zoom-4-1",          image);
+  SET_SENSITIVE ("view-zoom-4-1-accel",    image);
+  SET_SENSITIVE ("view-zoom-2-1",          image);
+  SET_SENSITIVE ("view-zoom-2-1-accel",    image);
+  SET_SENSITIVE ("view-zoom-1-1",          image);
+  SET_SENSITIVE ("view-zoom-1-1-accel",    image);
+  SET_SENSITIVE ("view-zoom-1-2",          image);
+  SET_SENSITIVE ("view-zoom-1-4",          image);
+  SET_SENSITIVE ("view-zoom-1-8",          image);
+  SET_SENSITIVE ("view-zoom-1-16",         image);
+  SET_SENSITIVE ("view-zoom-other",        image);
+
+  SET_SENSITIVE ("view-flip-horizontally", image);
+  SET_ACTIVE    ("view-flip-horizontally", flip_horizontally);
+
+  SET_SENSITIVE ("view-flip-vertically",   image);
+  SET_ACTIVE    ("view-flip-vertically",   flip_vertically);
+
+  SET_SENSITIVE ("view-rotate-reset",      image);
+  SET_SENSITIVE ("view-rotate-15",         image);
+  SET_SENSITIVE ("view-rotate-345",        image);
+  SET_SENSITIVE ("view-rotate-90",         image);
+  SET_SENSITIVE ("view-rotate-180",        image);
+  SET_SENSITIVE ("view-rotate-270",        image);
+  SET_SENSITIVE ("view-rotate-other",      image);
+
+  if (image)
+    {
+      view_actions_set_zoom (group, shell);
+      view_actions_set_rotate (group, shell);
+    }
+
+  SET_SENSITIVE ("view-navigation-window", image);
+  SET_SENSITIVE ("view-display-filters",   image);
+
+  SET_SENSITIVE ("view-color-management-enable",                image);
+  SET_ACTIVE    ("view-color-management-enable",                cm);
+  SET_SENSITIVE ("view-color-management-softproof",             image);
+  SET_ACTIVE    ("view-color-management-softproof",             sp);
+  SET_SENSITIVE ("view-display-intent-perceptual",              cm);
+  SET_SENSITIVE ("view-display-intent-relative-colorimetric",   cm);
+  SET_SENSITIVE ("view-display-intent-saturation",              cm);
+  SET_SENSITIVE ("view-display-intent-absolute-colorimetric",   cm);
+  SET_SENSITIVE ("view-display-black-point-compensation",       cm);
+  SET_ACTIVE    ("view-display-black-point-compensation",       d_bpc);
+  SET_SENSITIVE ("view-softproof-profile",                      sp);
+  SET_SENSITIVE ("view-softproof-intent-perceptual",            sp);
+  SET_SENSITIVE ("view-softproof-intent-relative-colorimetric", sp);
+  SET_SENSITIVE ("view-softproof-intent-saturation",            sp);
+  SET_SENSITIVE ("view-softproof-intent-absolute-colorimetric", sp);
+  SET_SENSITIVE ("view-softproof-black-point-compensation",     sp);
+  SET_ACTIVE    ("view-softproof-black-point-compensation",     s_bpc);
+  SET_SENSITIVE ("view-softproof-gamut-check",                  sp);
+  SET_ACTIVE    ("view-softproof-gamut-check",                  gammut);
+  SET_SENSITIVE ("view-color-management-reset",                 image);
+
+  SET_SENSITIVE ("view-show-selection",       image);
+  SET_ACTIVE    ("view-show-selection",       display && options->show_selection);
+  SET_SENSITIVE ("view-show-layer-boundary",  image);
+  SET_ACTIVE    ("view-show-layer-boundary",  display && options->show_layer_boundary);
+  SET_SENSITIVE ("view-show-canvas-boundary", image && shell->show_all);
+  SET_ACTIVE    ("view-show-canvas-boundary", display && options->show_canvas_boundary);
+  SET_SENSITIVE ("view-show-guides",          image);
+  SET_ACTIVE    ("view-show-guides",          display && options->show_guides);
+  SET_SENSITIVE ("view-show-grid",            image);
+  SET_ACTIVE    ("view-show-grid",            display && options->show_grid);
+  SET_SENSITIVE ("view-show-sample-points",   image);
+  SET_ACTIVE    ("view-show-sample-points",   display && options->show_sample_points);
+
+  SET_SENSITIVE ("view-snap-to-guides",       image);
+  SET_ACTIVE    ("view-snap-to-guides",       display && options->snap_to_guides);
+  SET_SENSITIVE ("view-snap-to-grid",         image);
+  SET_ACTIVE    ("view-snap-to-grid",         display && options->snap_to_grid);
+  SET_SENSITIVE ("view-snap-to-canvas",       image);
+  SET_ACTIVE    ("view-snap-to-canvas",       display && options->snap_to_canvas);
+  SET_SENSITIVE ("view-snap-to-vectors",      image);
+  SET_ACTIVE    ("view-snap-to-vectors",      display && options->snap_to_path);
+
+  SET_SENSITIVE ("view-padding-color-theme",       image);
+  SET_SENSITIVE ("view-padding-color-light-check", image);
+  SET_SENSITIVE ("view-padding-color-dark-check",  image);
+  SET_SENSITIVE ("view-padding-color-custom",      image);
+  SET_SENSITIVE ("view-padding-color-prefs",       image);
+
+  if (display)
+    {
+      SET_COLOR ("view-padding-color-menu", &options->padding_color);
+
+      if (shell->canvas)
+        {
+          GtkStyle *style = gtk_widget_get_style (shell->canvas);
+          GimpRGB   color;
+
+          gtk_widget_ensure_style (shell->canvas);
+          gimp_rgb_set_gdk_color (&color, style->bg + GTK_STATE_NORMAL);
+          gimp_rgb_set_alpha (&color, GIMP_OPACITY_OPAQUE);
+
+          SET_COLOR ("view-padding-color-theme",  &color);
+        }
+    }
+
+  SET_SENSITIVE ("view-padding-color-in-show-all", image);
+  SET_ACTIVE    ("view-padding-color-in-show-all", display && options->padding_in_show_all);
+
+  SET_SENSITIVE ("view-show-menubar",    image);
+  SET_ACTIVE    ("view-show-menubar",    display && options->show_menubar);
+  SET_SENSITIVE ("view-show-rulers",     image);
+  SET_ACTIVE    ("view-show-rulers",     display && options->show_rulers);
+  SET_SENSITIVE ("view-show-scrollbars", image);
+  SET_ACTIVE    ("view-show-scrollbars", display && options->show_scrollbars);
+  SET_SENSITIVE ("view-show-statusbar",  image);
+  SET_ACTIVE    ("view-show-statusbar",  display && options->show_statusbar);
+
+  SET_SENSITIVE ("view-shrink-wrap", image);
+  SET_ACTIVE    ("view-fullscreen",  display && fullscreen);
+
+  if (GIMP_IS_IMAGE_WINDOW (group->user_data) ||
+      GIMP_IS_GIMP (group->user_data))
+    {
+      GtkWidget *window = NULL;
+
+      if (shell)
+        window = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+      /*  see view_actions_setup()  */
+      if (GTK_IS_WINDOW (window))
+        window_actions_update (group, window);
+    }
+
+#undef SET_ACTIVE
+#undef SET_SENSITIVE
+#undef SET_COLOR
+}
+
+
+/*  private functions  */
+
+static void
+view_actions_set_zoom (GimpActionGroup  *group,
+                       GimpDisplayShell *shell)
+{
+  const gchar *action = NULL;
+  gchar       *str;
+  gchar       *label;
+  guint        scale;
+
+  g_object_get (shell->zoom,
+                "percentage", &str,
+                NULL);
+
+  scale = ROUND (gimp_zoom_model_get_factor (shell->zoom) * 1000);
+
+  switch (scale)
+    {
+    case 16000:  action = "view-zoom-16-1";  break;
+    case  8000:  action = "view-zoom-8-1";   break;
+    case  4000:  action = "view-zoom-4-1";   break;
+    case  2000:  action = "view-zoom-2-1";   break;
+    case  1000:  action = "view-zoom-1-1";   break;
+    case   500:  action = "view-zoom-1-2";   break;
+    case   250:  action = "view-zoom-1-4";   break;
+    case   125:  action = "view-zoom-1-8";   break;
+    case    63:
+    case    62:  action = "view-zoom-1-16";  break;
+    }
+
+  if (! action)
+    {
+      action = "view-zoom-other";
+
+      label = g_strdup_printf (_("Othe_r (%s)..."), str);
+      gimp_action_group_set_action_label (group, action, label);
+      g_free (label);
+
+      shell->other_scale = gimp_zoom_model_get_factor (shell->zoom);
+    }
+
+  gimp_action_group_set_action_active (group, action, TRUE);
+
+  label = g_strdup_printf (_("_Zoom (%s)"), str);
+  gimp_action_group_set_action_label (group, "view-zoom-menu", label);
+  g_free (label);
+
+  /* flag as dirty */
+  shell->other_scale = - fabs (shell->other_scale);
+
+  g_free (str);
+}
+
+static void
+view_actions_set_rotate (GimpActionGroup  *group,
+                         GimpDisplayShell *shell)
+{
+  const gchar *flip;
+  gchar       *label;
+
+  if (shell->flip_horizontally &&
+      shell->flip_vertically)
+    {
+      /* please preserve the trailing space */
+      /* H: Horizontal, V: Vertical */
+      flip = _("(H+V) ");
+    }
+  else if (shell->flip_horizontally)
+    {
+      /* please preserve the trailing space */
+      /* H: Horizontal */
+      flip = _("(H) ");
+    }
+  else if (shell->flip_vertically)
+    {
+      /* please preserve the trailing space */
+      /* V: Vertical */
+      flip = _("(V) ");
+    }
+  else
+    {
+      flip = "";
+    }
+
+  label = g_strdup_printf (_("_Flip %s& Rotate (%d°)"),
+                           flip, (gint) shell->rotate_angle);
+  gimp_action_group_set_action_label (group, "view-rotate-menu", label);
+  g_free (label);
+}
+
+static void
+view_actions_check_type_notify (GimpDisplayConfig *config,
+                                GParamSpec        *pspec,
+                                GimpActionGroup   *group)
+{
+  gimp_action_group_set_action_color (group, "view-padding-color-light-check",
+                                      gimp_render_light_check_color (),
+                                      FALSE);
+  gimp_action_group_set_action_color (group, "view-padding-color-dark-check",
+                                      gimp_render_dark_check_color (),
+                                      FALSE);
+}
diff --git a/app/actions/view-actions.h b/app/actions/view-actions.h
new file mode 100644
index 0000000..97aad0a
--- /dev/null
+++ b/app/actions/view-actions.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VIEW_ACTIONS_H__
+#define __VIEW_ACTIONS_H__
+
+
+void   view_actions_setup  (GimpActionGroup *group);
+void   view_actions_update (GimpActionGroup *group,
+                            gpointer         data);
+
+
+#endif /* __VIEW_ACTIONS_H__ */
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
new file mode 100644
index 0000000..2c2629c
--- /dev/null
+++ b/app/actions/view-commands.c
@@ -0,0 +1,1281 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdisplayoptions.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpgrouplayer.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpcolordialog.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplay-foreach.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimpdisplayshell-filter-dialog.h"
+#include "display/gimpdisplayshell-rotate.h"
+#include "display/gimpdisplayshell-rotate-dialog.h"
+#include "display/gimpdisplayshell-scale.h"
+#include "display/gimpdisplayshell-scale-dialog.h"
+#include "display/gimpdisplayshell-scroll.h"
+#include "display/gimpdisplayshell-close.h"
+#include "display/gimpimagewindow.h"
+
+#include "dialogs/color-profile-dialog.h"
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "view-commands.h"
+
+#include "gimp-intl.h"
+
+
+#define SET_ACTIVE(manager,action_name,active) \
+  { GimpActionGroup *group = \
+      gimp_ui_manager_get_action_group (manager, "view"); \
+    gimp_action_group_set_action_active (group, action_name, active); }
+
+#define IS_ACTIVE_DISPLAY(display) \
+  ((display) == \
+   gimp_context_get_display (gimp_get_user_context ((display)->gimp)))
+
+
+/*  local function prototypes  */
+
+static void   view_softproof_profile_callback  (GtkWidget                *dialog,
+                                                GimpImage                *image,
+                                                GimpColorProfile         *new_profile,
+                                                GFile                    *new_file,
+                                                GimpColorRenderingIntent  intent,
+                                                gboolean                  bpc,
+                                                gpointer                  user_data);
+static void   view_padding_color_dialog_update (GimpColorDialog          *dialog,
+                                                const GimpRGB            *color,
+                                                GimpColorDialogState      state,
+                                                GimpDisplayShell         *shell);
+
+
+/*  public functions  */
+
+void
+view_new_cmd_callback (GimpAction *action,
+                       GVariant   *value,
+                       gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+
+  gimp_create_display (display->gimp,
+                       gimp_display_get_image (display),
+                       shell->unit, gimp_zoom_model_get_factor (shell->zoom),
+                       G_OBJECT (gtk_widget_get_screen (GTK_WIDGET (shell))),
+                       gimp_widget_get_monitor (GTK_WIDGET (shell)));
+}
+
+void
+view_close_cmd_callback (GimpAction *action,
+                         GVariant   *value,
+                         gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+  image = gimp_display_get_image (display);
+
+  /* Check for the image so we don't close the last display. */
+  if (image)
+    gimp_display_shell_close (shell, FALSE);
+}
+
+void
+view_scroll_center_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDisplay *display;
+  return_if_no_display (display, data);
+
+  gimp_display_shell_scroll_center_image (gimp_display_get_shell (display),
+                                          TRUE, TRUE);
+}
+
+void
+view_zoom_fit_in_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplay *display;
+  return_if_no_display (display, data);
+
+  gimp_display_shell_scale_fit_in (gimp_display_get_shell (display));
+}
+
+void
+view_zoom_fill_cmd_callback (GimpAction *action,
+                             GVariant   *value,
+                             gpointer    data)
+{
+  GimpDisplay *display;
+  return_if_no_display (display, data);
+
+  gimp_display_shell_scale_fill (gimp_display_get_shell (display));
+}
+
+void
+view_zoom_selection_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  gint         x, y, width, height;
+  return_if_no_display (display, data);
+  return_if_no_image (image, data);
+
+  gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                    &x, &y, &width, &height);
+
+  gimp_display_shell_scale_to_rectangle (gimp_display_get_shell (display),
+                                         GIMP_ZOOM_IN,
+                                         x, y, width, height,
+                                         FALSE);
+}
+
+void
+view_zoom_revert_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplay *display;
+  return_if_no_display (display, data);
+
+  gimp_display_shell_scale_revert (gimp_display_get_shell (display));
+}
+
+void
+view_zoom_cmd_callback (GimpAction *action,
+                        GVariant   *value,
+                        gpointer    data)
+{
+  GimpDisplayShell     *shell;
+  GimpActionSelectType  select_type;
+  return_if_no_shell (shell, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  switch (select_type)
+    {
+    case GIMP_ACTION_SELECT_FIRST:
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_OUT_MAX,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+      break;
+
+    case GIMP_ACTION_SELECT_LAST:
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_IN_MAX,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+      break;
+
+    case GIMP_ACTION_SELECT_PREVIOUS:
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_OUT,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+      break;
+
+    case GIMP_ACTION_SELECT_NEXT:
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_IN,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+      break;
+
+    case GIMP_ACTION_SELECT_SKIP_PREVIOUS:
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_OUT_MORE,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+      break;
+
+    case GIMP_ACTION_SELECT_SKIP_NEXT:
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_IN_MORE,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+      break;
+
+    default:
+      {
+        gdouble scale = gimp_zoom_model_get_factor (shell->zoom);
+
+        scale = action_select_value (select_type,
+                                     scale,
+                                     0.0, 512.0, 1.0,
+                                     1.0 / 8.0, 1.0, 16.0, 0.0,
+                                     FALSE);
+
+        /* min = 1.0 / 256,  max = 256.0                */
+        /* scale = min *  (max / min)**(i/n), i = 0..n  */
+        scale = pow (65536.0, scale / 512.0) / 256.0;
+
+        gimp_display_shell_scale (shell,
+                                  GIMP_ZOOM_TO,
+                                  scale,
+                                  GIMP_ZOOM_FOCUS_BEST_GUESS);
+        break;
+      }
+    }
+}
+
+void
+view_zoom_explicit_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gint              factor;
+  return_if_no_shell (shell, data);
+
+  factor = g_variant_get_int32 (value);
+
+  if (factor != 0 /* not Other... */)
+    {
+      if (fabs (factor - gimp_zoom_model_get_factor (shell->zoom)) > 0.0001)
+        gimp_display_shell_scale (shell,
+                                  GIMP_ZOOM_TO,
+                                  (gdouble) factor / 10000,
+                                  GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS);
+    }
+}
+
+/* not a GimpActionCallback */
+void
+view_zoom_other_cmd_callback (GimpAction *action,
+                              gpointer    data)
+{
+  GimpDisplayShell *shell;
+  return_if_no_shell (shell, data);
+
+  /* check if we are activated by the user or from
+   * view_actions_set_zoom(), also this is really a GtkToggleAction
+   * NOT a GimpToggleAction
+   */
+  if (gtk_toggle_action_get_active ((GtkToggleAction *) action) &&
+      shell->other_scale != gimp_zoom_model_get_factor (shell->zoom))
+    {
+      gimp_display_shell_scale_dialog (shell);
+    }
+}
+
+void
+view_show_all_cmd_callback (GimpAction *action,
+                            GVariant   *value,
+                            gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != shell->show_all)
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      gimp_display_shell_set_show_all (shell, active);
+
+      if (window)
+        SET_ACTIVE (gimp_image_window_get_ui_manager (window),
+                    "view-show-all", shell->show_all);
+
+      if (IS_ACTIVE_DISPLAY (display))
+        SET_ACTIVE (shell->popup_manager, "view-show-all",
+                    shell->show_all);
+    }
+}
+
+void
+view_dot_for_dot_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != shell->dot_for_dot)
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      gimp_display_shell_scale_set_dot_for_dot (shell, active);
+
+      if (window)
+        SET_ACTIVE (gimp_image_window_get_ui_manager (window),
+                    "view-dot-for-dot", shell->dot_for_dot);
+
+      if (IS_ACTIVE_DISPLAY (display))
+        SET_ACTIVE (shell->popup_manager, "view-dot-for-dot",
+                    shell->dot_for_dot);
+    }
+}
+
+void
+view_flip_horizontally_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != shell->flip_horizontally)
+    {
+      gimp_display_shell_flip (shell, active, shell->flip_vertically);
+    }
+}
+
+void
+view_flip_vertically_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != shell->flip_vertically)
+    {
+      gimp_display_shell_flip (shell, shell->flip_horizontally, active);
+    }
+}
+
+void
+view_rotate_absolute_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplay          *display;
+  GimpDisplayShell     *shell;
+  GimpActionSelectType  select_type;
+  gdouble               angle = 0.0;
+  return_if_no_display (display, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  shell = gimp_display_get_shell (display);
+
+  angle = action_select_value (select_type,
+                               0.0,
+                               -180.0, 180.0, 0.0,
+                               1.0, 15.0, 90.0, 0.0,
+                               TRUE);
+
+  gimp_display_shell_rotate_to (shell, angle);
+
+  if (select_type == GIMP_ACTION_SELECT_SET_TO_DEFAULT)
+    gimp_display_shell_flip (shell, FALSE, FALSE);
+}
+
+void
+view_rotate_relative_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplay          *display;
+  GimpDisplayShell     *shell;
+  GimpActionSelectType  select_type;
+  gdouble               delta = 0.0;
+  return_if_no_display (display, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  shell = gimp_display_get_shell (display);
+
+  delta = action_select_value (select_type,
+                               0.0,
+                               -180.0, 180.0, 0.0,
+                               1.0, 15.0, 90.0, 0.0,
+                               TRUE);
+
+  gimp_display_shell_rotate (shell, delta);
+}
+
+void
+view_rotate_other_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  return_if_no_display (display, data);
+
+  shell = gimp_display_get_shell (display);
+
+  gimp_display_shell_rotate_dialog (shell);
+}
+
+void
+view_scroll_horizontal_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpDisplayShell     *shell;
+  GtkAdjustment        *adj;
+  GimpActionSelectType  select_type;
+  gdouble               offset;
+  return_if_no_shell (shell, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  adj = shell->hsbdata;
+
+  offset = action_select_value (select_type,
+                                gtk_adjustment_get_value (adj),
+                                gtk_adjustment_get_lower (adj),
+                                gtk_adjustment_get_upper (adj) -
+                                gtk_adjustment_get_page_size (adj),
+                                gtk_adjustment_get_lower (adj),
+                                1,
+                                gtk_adjustment_get_step_increment (adj),
+                                gtk_adjustment_get_page_increment (adj),
+                                0,
+                                FALSE);
+
+  gtk_adjustment_set_value (shell->hsbdata, offset);
+}
+
+void
+view_scroll_vertical_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplayShell     *shell;
+  GtkAdjustment        *adj;
+  GimpActionSelectType  select_type;
+  gdouble               offset;
+  return_if_no_shell (shell, data);
+
+  select_type = (GimpActionSelectType) g_variant_get_int32 (value);
+
+  adj = shell->vsbdata;
+
+  offset = action_select_value (select_type,
+                                gtk_adjustment_get_value (adj),
+                                gtk_adjustment_get_lower (adj),
+                                gtk_adjustment_get_upper (adj) -
+                                gtk_adjustment_get_page_size (adj),
+                                gtk_adjustment_get_lower (adj),
+                                1,
+                                gtk_adjustment_get_step_increment (adj),
+                                gtk_adjustment_get_page_increment (adj),
+                                0,
+                                FALSE);
+
+  gtk_adjustment_set_value (shell->vsbdata, offset);
+}
+
+void
+view_navigation_window_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  Gimp             *gimp;
+  GimpDisplayShell *shell;
+  return_if_no_gimp (gimp, data);
+  return_if_no_shell (shell, data);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)),
+                                             gimp,
+                                             gimp_dialog_factory_get_singleton (),
+                                             gtk_widget_get_screen (GTK_WIDGET (shell)),
+                                             gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                                             "gimp-navigation-view");
+}
+
+void
+view_display_filters_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplayShell *shell;
+  GtkWidget        *dialog;
+  return_if_no_shell (shell, data);
+
+#define FILTERS_DIALOG_KEY "gimp-display-filters-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (shell), FILTERS_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      dialog = gimp_display_shell_filter_dialog_new (shell);
+
+      dialogs_attach_dialog (G_OBJECT (shell), FILTERS_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+view_color_management_reset_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpDisplayShell *shell;
+  GimpColorConfig  *global_config;
+  GimpColorConfig  *shell_config;
+  return_if_no_shell (shell, data);
+
+  global_config = GIMP_CORE_CONFIG (shell->display->config)->color_management;
+  shell_config  = gimp_display_shell_get_color_config (shell);
+
+  gimp_config_copy (GIMP_CONFIG (global_config),
+                    GIMP_CONFIG (shell_config),
+                    0);
+  shell->color_config_set = FALSE;
+}
+
+void
+view_color_management_enable_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data)
+{
+  GimpDisplayShell        *shell;
+  GimpColorConfig         *color_config;
+  GimpColorManagementMode  mode;
+  gboolean                 active;
+  return_if_no_shell (shell, data);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  active = g_variant_get_boolean (value);
+
+  mode = gimp_color_config_get_mode (color_config);
+
+  if (active)
+    {
+      if (mode != GIMP_COLOR_MANAGEMENT_SOFTPROOF)
+        mode = GIMP_COLOR_MANAGEMENT_DISPLAY;
+    }
+  else
+    {
+      mode = GIMP_COLOR_MANAGEMENT_OFF;
+    }
+
+  if (mode != gimp_color_config_get_mode (color_config))
+    {
+      g_object_set (color_config,
+                    "mode", mode,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_color_management_softproof_cmd_callback (GimpAction *action,
+                                              GVariant   *value,
+                                              gpointer    data)
+{
+  GimpDisplayShell        *shell;
+  GimpColorConfig         *color_config;
+  GimpColorManagementMode  mode;
+  gboolean                 active;
+  return_if_no_shell (shell, data);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  active = g_variant_get_boolean (value);
+
+  mode = gimp_color_config_get_mode (color_config);
+
+  if (active)
+    {
+      mode = GIMP_COLOR_MANAGEMENT_SOFTPROOF;
+    }
+  else
+    {
+      if (mode != GIMP_COLOR_MANAGEMENT_OFF)
+        mode = GIMP_COLOR_MANAGEMENT_DISPLAY;
+    }
+
+  if (mode != gimp_color_config_get_mode (color_config))
+    {
+      g_object_set (color_config,
+                    "mode", mode,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_display_intent_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpDisplayShell          *shell;
+  GimpColorConfig           *color_config;
+  GimpColorRenderingIntent   intent;
+  return_if_no_shell (shell, data);
+
+  intent = (GimpColorRenderingIntent) g_variant_get_int32 (value);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  if (intent != gimp_color_config_get_display_intent (color_config))
+    {
+      g_object_set (color_config,
+                    "display-rendering-intent", intent,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_display_bpc_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplayShell *shell;
+  GimpColorConfig  *color_config;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_color_config_get_display_bpc (color_config))
+    {
+      g_object_set (color_config,
+                    "display-use-black-point-compensation", active,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_softproof_profile_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpImage        *image;
+  GimpDisplayShell *shell;
+  GimpColorConfig  *color_config;
+  GtkWidget        *dialog;
+  return_if_no_image (image, data);
+  return_if_no_shell (shell, data);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+#define SOFTPROOF_PROFILE_DIALOG_KEY "gimp-softproof-profile-dialog"
+
+  dialog = dialogs_get_dialog (G_OBJECT (shell), SOFTPROOF_PROFILE_DIALOG_KEY);
+
+  if (! dialog)
+    {
+      GimpColorProfile *current_profile;
+
+      current_profile = gimp_color_config_get_simulation_color_profile (color_config,
+                                                                        NULL);
+
+      dialog = color_profile_dialog_new (COLOR_PROFILE_DIALOG_SELECT_SOFTPROOF_PROFILE,
+                                         image,
+                                         action_data_get_context (data),
+                                         GTK_WIDGET (shell),
+                                         current_profile,
+                                         NULL,
+                                         0, 0,
+                                         view_softproof_profile_callback,
+                                         shell);
+
+      dialogs_attach_dialog (G_OBJECT (shell),
+                             SOFTPROOF_PROFILE_DIALOG_KEY, dialog);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+view_softproof_intent_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpDisplayShell          *shell;
+  GimpColorConfig           *color_config;
+  GimpColorRenderingIntent   intent;
+  return_if_no_shell (shell, data);
+
+  intent = (GimpColorRenderingIntent) g_variant_get_int32 (value);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  if (intent != gimp_color_config_get_simulation_intent (color_config))
+    {
+      g_object_set (color_config,
+                    "simulation-rendering-intent", intent,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_softproof_bpc_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDisplayShell *shell;
+  GimpColorConfig  *color_config;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_color_config_get_simulation_bpc (color_config))
+    {
+      g_object_set (color_config,
+                    "simulation-use-black-point-compensation", active,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_softproof_gamut_check_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpDisplayShell *shell;
+  GimpColorConfig  *color_config;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_color_config_get_simulation_gamut_check (color_config))
+    {
+      g_object_set (color_config,
+                    "simulation-gamut-check", active,
+                    NULL);
+      shell->color_config_set = TRUE;
+    }
+}
+
+void
+view_toggle_selection_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_selection (shell))
+    {
+      gimp_display_shell_set_show_selection (shell, active);
+    }
+}
+
+void
+view_toggle_layer_boundary_cmd_callback (GimpAction *action,
+                                         GVariant   *value,
+                                         gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_layer (shell))
+    {
+      gimp_display_shell_set_show_layer (shell, active);
+    }
+}
+
+void
+view_toggle_canvas_boundary_cmd_callback (GimpAction *action,
+                                          GVariant   *value,
+                                          gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_canvas (shell))
+    {
+      gimp_display_shell_set_show_canvas (shell, active);
+    }
+}
+
+void
+view_toggle_menubar_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_menubar (shell))
+    {
+      gimp_display_shell_set_show_menubar (shell, active);
+    }
+}
+
+void
+view_toggle_rulers_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_rulers (shell))
+    {
+      gimp_display_shell_set_show_rulers (shell, active);
+    }
+}
+
+void
+view_toggle_scrollbars_cmd_callback (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_scrollbars (shell))
+    {
+      gimp_display_shell_set_show_scrollbars (shell, active);
+    }
+}
+
+void
+view_toggle_statusbar_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_statusbar (shell))
+    {
+      gimp_display_shell_set_show_statusbar (shell, active);
+    }
+}
+
+void
+view_toggle_guides_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_guides (shell))
+    {
+      gimp_display_shell_set_show_guides (shell, active);
+    }
+}
+
+void
+view_toggle_grid_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_grid (shell))
+    {
+      gimp_display_shell_set_show_grid (shell, active);
+    }
+}
+
+void
+view_toggle_sample_points_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_show_sample_points (shell))
+    {
+      gimp_display_shell_set_show_sample_points (shell, active);
+    }
+}
+
+void
+view_snap_to_guides_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_snap_to_guides (shell))
+    {
+      gimp_display_shell_set_snap_to_guides (shell, active);
+    }
+}
+
+void
+view_snap_to_grid_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_snap_to_grid (shell))
+    {
+      gimp_display_shell_set_snap_to_grid (shell, active);
+    }
+}
+
+void
+view_snap_to_canvas_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_snap_to_canvas (shell))
+    {
+      gimp_display_shell_set_snap_to_canvas (shell, active);
+    }
+}
+
+void
+view_snap_to_vectors_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_snap_to_vectors (shell))
+    {
+      gimp_display_shell_set_snap_to_vectors (shell, active);
+    }
+}
+
+void
+view_padding_color_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  GimpDisplay           *display;
+  GimpImageWindow       *window;
+  GimpDisplayShell      *shell;
+  GimpDisplayOptions    *options;
+  GimpCanvasPaddingMode  padding_mode;
+  gboolean               fullscreen;
+  return_if_no_display (display, data);
+
+  padding_mode = (GimpCanvasPaddingMode) g_variant_get_int32 (value);
+
+  shell  = gimp_display_get_shell (display);
+  window = gimp_display_shell_get_window (shell);
+
+  if (window)
+    fullscreen = gimp_image_window_get_fullscreen (window);
+  else
+    fullscreen = FALSE;
+
+  if (fullscreen)
+    options = shell->fullscreen_options;
+  else
+    options = shell->options;
+
+#define PADDING_COLOR_DIALOG_KEY "gimp-padding-color-dialog"
+
+  switch (padding_mode)
+    {
+    case GIMP_CANVAS_PADDING_MODE_DEFAULT:
+    case GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK:
+    case GIMP_CANVAS_PADDING_MODE_DARK_CHECK:
+      dialogs_destroy_dialog (G_OBJECT (shell), PADDING_COLOR_DIALOG_KEY);
+
+      options->padding_mode_set = TRUE;
+
+      gimp_display_shell_set_padding (shell, padding_mode,
+                                      &options->padding_color);
+      break;
+
+    case GIMP_CANVAS_PADDING_MODE_CUSTOM:
+      {
+        GtkWidget *dialog;
+
+        dialog = dialogs_get_dialog (G_OBJECT (shell), PADDING_COLOR_DIALOG_KEY);
+
+        if (! dialog)
+          {
+            GimpImage        *image = gimp_display_get_image (display);
+            GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+            dialog =
+              gimp_color_dialog_new (GIMP_VIEWABLE (image),
+                                     action_data_get_context (data),
+                                     _("Set Canvas Padding Color"),
+                                     GIMP_ICON_FONT,
+                                     _("Set Custom Canvas Padding Color"),
+                                     GTK_WIDGET (shell),
+                                     NULL, NULL,
+                                     &options->padding_color,
+                                     FALSE, FALSE);
+
+            g_signal_connect (dialog, "update",
+                              G_CALLBACK (view_padding_color_dialog_update),
+                              shell);
+
+            dialogs_attach_dialog (G_OBJECT (shell),
+                                   PADDING_COLOR_DIALOG_KEY, dialog);
+          }
+
+        gtk_window_present (GTK_WINDOW (dialog));
+      }
+      break;
+
+    case GIMP_CANVAS_PADDING_MODE_RESET:
+      dialogs_destroy_dialog (G_OBJECT (shell), PADDING_COLOR_DIALOG_KEY);
+
+      {
+        GimpDisplayOptions *default_options;
+
+        options->padding_mode_set = FALSE;
+
+        if (fullscreen)
+          default_options = display->config->default_fullscreen_view;
+        else
+          default_options = display->config->default_view;
+
+        gimp_display_shell_set_padding (shell,
+                                        default_options->padding_mode,
+                                        &default_options->padding_color);
+        gimp_display_shell_set_padding_in_show_all (shell,
+                                                    default_options->padding_in_show_all);
+      }
+      break;
+    }
+}
+
+void
+view_padding_color_in_show_all_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data)
+{
+  GimpDisplayShell *shell;
+  gboolean          active;
+  return_if_no_shell (shell, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != gimp_display_shell_get_padding_in_show_all (shell))
+    {
+      gimp_display_shell_set_padding_in_show_all (shell, active);
+    }
+}
+
+void
+view_shrink_wrap_cmd_callback (GimpAction *action,
+                               GVariant   *value,
+                               gpointer    data)
+{
+  GimpDisplayShell *shell;
+  return_if_no_shell (shell, data);
+
+  gimp_display_shell_scale_shrink_wrap (shell, FALSE);
+}
+
+void
+view_fullscreen_cmd_callback (GimpAction *action,
+                              GVariant   *value,
+                              gpointer    data)
+{
+  GimpDisplay      *display;
+  GimpDisplayShell *shell;
+  GimpImageWindow  *window;
+  return_if_no_display (display, data);
+
+  shell  = gimp_display_get_shell (display);
+  window = gimp_display_shell_get_window (shell);
+
+  if (window)
+    {
+      gboolean active = g_variant_get_boolean (value);
+
+      gimp_image_window_set_fullscreen (window, active);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+view_softproof_profile_callback (GtkWidget                *dialog,
+                                 GimpImage                *image,
+                                 GimpColorProfile         *new_profile,
+                                 GFile                    *new_file,
+                                 GimpColorRenderingIntent  intent,
+                                 gboolean                  bpc,
+                                 gpointer                  user_data)
+{
+  GimpDisplayShell *shell = user_data;
+  GimpColorConfig  *color_config;
+  gchar            *path  = NULL;
+
+  color_config = gimp_display_shell_get_color_config (shell);
+
+  if (new_file)
+    path = g_file_get_path (new_file);
+
+  g_object_set (color_config,
+                "printer-profile", path,
+                NULL);
+  shell->color_config_set = TRUE;
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+view_padding_color_dialog_update (GimpColorDialog      *dialog,
+                                  const GimpRGB        *color,
+                                  GimpColorDialogState  state,
+                                  GimpDisplayShell     *shell)
+{
+  GimpImageWindow    *window;
+  GimpDisplayOptions *options;
+  gboolean            fullscreen;
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (window)
+    fullscreen = gimp_image_window_get_fullscreen (window);
+  else
+    fullscreen = FALSE;
+
+  if (fullscreen)
+    options = shell->fullscreen_options;
+  else
+    options = shell->options;
+
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_OK:
+      options->padding_mode_set = TRUE;
+
+      gimp_display_shell_set_padding (shell, GIMP_CANVAS_PADDING_MODE_CUSTOM,
+                                      color);
+      /* fallthru */
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      gtk_widget_destroy (GTK_WIDGET (dialog));
+      break;
+
+    default:
+      break;
+    }
+}
diff --git a/app/actions/view-commands.h b/app/actions/view-commands.h
new file mode 100644
index 0000000..17b15b2
--- /dev/null
+++ b/app/actions/view-commands.h
@@ -0,0 +1,181 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VIEW_COMMANDS_H__
+#define __VIEW_COMMANDS_H__
+
+
+void   view_new_cmd_callback                        (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_close_cmd_callback                      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_scroll_center_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_zoom_fit_in_cmd_callback                (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_zoom_fill_cmd_callback                  (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_zoom_selection_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_zoom_revert_cmd_callback                (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_zoom_cmd_callback                       (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_zoom_explicit_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+/* not a GimpActionCallback */
+void   view_zoom_other_cmd_callback                 (GimpAction *action,
+                                                     gpointer    data);
+
+void   view_show_all_cmd_callback                   (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_dot_for_dot_cmd_callback                (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_scroll_horizontal_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_scroll_vertical_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_flip_horizontally_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_flip_vertically_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_rotate_absolute_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_rotate_relative_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_rotate_other_cmd_callback               (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_navigation_window_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_display_filters_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_color_management_reset_cmd_callback     (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_color_management_enable_cmd_callback    (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_color_management_softproof_cmd_callback (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_display_intent_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_display_bpc_cmd_callback                (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_softproof_profile_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_softproof_intent_cmd_callback           (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_softproof_bpc_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_softproof_gamut_check_cmd_callback      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_toggle_selection_cmd_callback           (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_layer_boundary_cmd_callback      (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_canvas_boundary_cmd_callback     (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_menubar_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_rulers_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_scrollbars_cmd_callback          (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_statusbar_cmd_callback           (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_guides_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_grid_cmd_callback                (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_toggle_sample_points_cmd_callback       (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_snap_to_guides_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_snap_to_grid_cmd_callback               (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_snap_to_canvas_cmd_callback             (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_snap_to_vectors_cmd_callback            (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_padding_color_cmd_callback              (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_padding_color_in_show_all_cmd_callback  (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+void   view_shrink_wrap_cmd_callback                (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+void   view_fullscreen_cmd_callback                 (GimpAction *action,
+                                                     GVariant   *value,
+                                                     gpointer    data);
+
+
+#endif /* __VIEW_COMMANDS_H__ */
diff --git a/app/actions/window-actions.c b/app/actions/window-actions.c
new file mode 100644
index 0000000..ec2e9be
--- /dev/null
+++ b/app/actions/window-actions.c
@@ -0,0 +1,297 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "actions.h"
+#include "window-actions.h"
+#include "window-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  private functions  */
+
+static void   window_actions_display_opened (GdkDisplayManager *manager,
+                                             GdkDisplay        *display,
+                                             GimpActionGroup   *group);
+static void   window_actions_display_closed (GdkDisplay        *display,
+                                             gboolean           is_error,
+                                             GimpActionGroup   *group);
+
+
+/*  public functions  */
+
+void
+window_actions_setup (GimpActionGroup *group,
+                      const gchar     *move_to_screen_help_id)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+  GSList            *displays;
+  GSList            *list;
+
+  g_object_set_data_full (G_OBJECT (group), "move-to-screen-help-id",
+                          g_strdup (move_to_screen_help_id),
+                          (GDestroyNotify) g_free);
+
+  g_object_set_data_full (G_OBJECT (group), "display-table",
+                          g_hash_table_new_full (g_str_hash,
+                                                 g_str_equal,
+                                                 g_free, NULL),
+                          (GDestroyNotify) g_hash_table_unref);
+
+  displays = gdk_display_manager_list_displays (manager);
+
+  /*  present displays in the order in which they were opened  */
+  displays = g_slist_reverse (displays);
+
+  for (list = displays; list; list = g_slist_next (list))
+    {
+      window_actions_display_opened (manager, list->data, group);
+    }
+
+  g_slist_free (displays);
+
+  g_signal_connect_object (manager, "display-opened",
+                           G_CALLBACK (window_actions_display_opened),
+                           G_OBJECT (group), 0);
+}
+
+void
+window_actions_update (GimpActionGroup *group,
+                       GtkWidget       *window)
+{
+  const gchar *group_name;
+  gint         show_menu = FALSE;
+  gchar       *name;
+
+  group_name = gimp_action_group_get_name (group);
+
+#define SET_ACTIVE(action,active) \
+        gimp_action_group_set_action_active (group, action, (active) != 0)
+#define SET_VISIBLE(action,active) \
+        gimp_action_group_set_action_visible (group, action, (active) != 0)
+
+  if (GTK_IS_WINDOW (window))
+    {
+      GdkScreen  *screen;
+      gchar      *screen_name;
+
+#ifndef GIMP_UNSTABLE
+      {
+        GdkDisplay *display;
+
+        display = gtk_widget_get_display (window);
+        show_menu = (gdk_display_get_n_screens (display) > 1);
+      }
+#else
+      show_menu = TRUE;
+#endif /* !GIMP_UNSTABLE */
+
+      if (! show_menu)
+        {
+          GdkDisplayManager *manager = gdk_display_manager_get ();
+          GSList            *displays;
+
+          displays = gdk_display_manager_list_displays (manager);
+          show_menu = (displays->next != NULL);
+          g_slist_free (displays);
+        }
+
+      screen = gtk_widget_get_screen (window);
+
+      screen_name = gdk_screen_make_display_name (screen);
+      name = g_strdup_printf ("%s-move-to-screen-%s", group_name, screen_name);
+      g_free (screen_name);
+
+      SET_ACTIVE (name, TRUE);
+      g_free (name);
+    }
+
+  name = g_strdup_printf ("%s-move-to-screen-menu", group_name);
+  SET_VISIBLE (name, show_menu);
+  g_free (name);
+
+#undef SET_ACTIVE
+#undef SET_VISIBLE
+}
+
+
+/*  private functions  */
+
+static void
+window_actions_display_opened (GdkDisplayManager *manager,
+                               GdkDisplay        *display,
+                               GimpActionGroup   *group)
+{
+  GimpRadioActionEntry *entries;
+  GHashTable           *displays;
+  const gchar          *display_name;
+  const gchar          *help_id;
+  const gchar          *group_name;
+  GSList               *radio_group;
+  gint                  count;
+  gint                  n_screens;
+  gint                  i;
+
+  displays = g_object_get_data (G_OBJECT (group), "display-table");
+
+  display_name = gdk_display_get_name (display);
+
+  count = GPOINTER_TO_INT (g_hash_table_lookup (displays,
+                                                display_name));
+
+  g_hash_table_insert (displays, g_strdup (display_name),
+                       GINT_TO_POINTER (count + 1));
+
+  /*  don't add the same display twice  */
+  if (count > 0)
+    return;
+
+  help_id = g_object_get_data (G_OBJECT (group), "change-to-screen-help-id");
+
+  group_name = gimp_action_group_get_name (group);
+
+  n_screens = gdk_display_get_n_screens (display);
+
+  entries = g_new0 (GimpRadioActionEntry, n_screens);
+
+  for (i = 0; i < n_screens; i++)
+    {
+      GdkScreen *screen = gdk_display_get_screen (display, i);
+      gchar     *screen_name;
+
+      screen_name = gdk_screen_make_display_name (screen);
+
+      entries[i].name        = g_strdup_printf ("%s-move-to-screen-%s",
+                                                group_name, screen_name);
+      entries[i].icon_name   = GIMP_ICON_WINDOW_MOVE_TO_SCREEN;
+      entries[i].label       = g_strdup_printf (_("Screen %s"), screen_name);
+      entries[i].accelerator = NULL;
+      entries[i].tooltip     = g_strdup_printf (_("Move this window to "
+                                                  "screen %s"), screen_name);
+      entries[i].value       = g_quark_from_string (screen_name);
+      entries[i].help_id     = help_id;
+
+      g_free (screen_name);
+    }
+
+  radio_group = g_object_get_data (G_OBJECT (group),
+                                   "change-to-screen-radio-group");
+  radio_group = gimp_action_group_add_radio_actions (group, NULL,
+                                                     entries, n_screens,
+                                                     radio_group, 0,
+                                                     window_move_to_screen_cmd_callback);
+  g_object_set_data (G_OBJECT (group), "change-to-screen-radio-group",
+                     radio_group);
+
+  for (i = 0; i < n_screens; i++)
+    {
+      GdkScreen  *screen = gdk_display_get_screen (display, i);
+      GimpAction *action;
+
+      action = gimp_action_group_get_action (group, entries[i].name);
+
+      if (action)
+        g_object_set_data (G_OBJECT (action), "screen", screen);
+
+      g_free ((gchar *) entries[i].name);
+      g_free ((gchar *) entries[i].tooltip);
+      g_free ((gchar *) entries[i].label);
+    }
+
+  g_free (entries);
+
+  g_signal_connect_object (display, "closed",
+                           G_CALLBACK (window_actions_display_closed),
+                           G_OBJECT (group), 0);
+}
+
+static void
+window_actions_display_closed (GdkDisplay      *display,
+                               gboolean         is_error,
+                               GimpActionGroup *group)
+{
+  GHashTable  *displays;
+  const gchar *display_name;
+  const gchar *group_name;
+  gint         count;
+  gint         n_screens;
+  gint         i;
+
+  displays = g_object_get_data (G_OBJECT (group), "display-table");
+
+  display_name = gdk_display_get_name (display);
+
+  count = GPOINTER_TO_INT (g_hash_table_lookup (displays,
+                                                display_name));
+
+  /*  don't remove the same display twice  */
+  if (count > 1)
+    {
+      g_hash_table_insert (displays, g_strdup (display_name),
+                           GINT_TO_POINTER (count - 1));
+      return;
+    }
+
+  g_hash_table_remove (displays, display_name);
+
+  group_name = gimp_action_group_get_name (group);
+
+  n_screens = gdk_display_get_n_screens (display);
+
+  for (i = 0; i < n_screens; i++)
+    {
+      GdkScreen  *screen = gdk_display_get_screen (display, i);
+      GimpAction *action;
+      gchar      *screen_name;
+      gchar      *action_name;
+
+      screen_name = gdk_screen_make_display_name (screen);
+      action_name = g_strdup_printf ("%s-move-to-screen-%s",
+                                     group_name, screen_name);
+      g_free (screen_name);
+
+      action = gimp_action_group_get_action (group, action_name);
+
+      if (action)
+        {
+          GSList *radio_group;
+
+          radio_group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action));
+          if (radio_group->data == (gpointer) action)
+            radio_group = radio_group->next;
+
+          gimp_action_group_remove_action (group, action);
+
+          g_object_set_data (G_OBJECT (group), "change-to-screen-radio-group",
+                             radio_group);
+        }
+
+      g_free (action_name);
+    }
+}
diff --git a/app/actions/window-actions.h b/app/actions/window-actions.h
new file mode 100644
index 0000000..2aae4e2
--- /dev/null
+++ b/app/actions/window-actions.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WINDOW_ACTIONS_H__
+#define __WINDOW_ACTIONS_H__
+
+
+void   window_actions_setup  (GimpActionGroup *group,
+                              const gchar     *move_to_screen_help_id);
+void   window_actions_update (GimpActionGroup *group,
+                              GtkWidget       *window);
+
+
+#endif /* __WINDOW_ACTIONS_H__ */
diff --git a/app/actions/window-commands.c b/app/actions/window-commands.c
new file mode 100644
index 0000000..046f986
--- /dev/null
+++ b/app/actions/window-commands.c
@@ -0,0 +1,158 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+
+#include "actions.h"
+#include "window-commands.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+window_close_cmd_callback (GimpAction *action,
+                           GVariant   *value,
+                           gpointer    data)
+{
+  GtkWidget *widget;
+  return_if_no_widget (widget, data);
+
+  if (! gtk_widget_is_toplevel (widget))
+    widget = gtk_widget_get_toplevel (widget);
+
+  if (widget && gtk_widget_get_window (widget))
+    {
+      GdkEvent *event = gdk_event_new (GDK_DELETE);
+
+      event->any.window     = g_object_ref (gtk_widget_get_window (widget));
+      event->any.send_event = TRUE;
+
+      gtk_main_do_event (event);
+      gdk_event_free (event);
+    }
+}
+
+void
+window_open_display_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GtkWidget *widget;
+  GtkWidget *dialog;
+  GtkWidget *entry;
+  return_if_no_widget (widget, data);
+
+  dialog = gimp_message_dialog_new ("Open Display", GIMP_ICON_WILBER_EEK,
+                                    widget, GTK_DIALOG_MODAL,
+                                    NULL, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("_OK"),     GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     "Experimental multi-display stuff!\n"
+                                     "Click OK and have fun crashing GIMP...");
+
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             "Please enter the name of the new display:");
+
+  entry = gtk_entry_new ();
+  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+  gtk_box_pack_start (GTK_BOX (GIMP_MESSAGE_DIALOG (dialog)->box), entry,
+                      TRUE, TRUE, 0);
+
+  gtk_widget_grab_focus (entry);
+  gtk_widget_show_all (dialog);
+
+  while (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      gchar *screen_name;
+
+      screen_name = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
+
+      if (strcmp (screen_name, ""))
+        {
+          GdkDisplay *display;
+
+          gtk_widget_set_sensitive (dialog, FALSE);
+
+          display = gdk_display_open (screen_name);
+
+          if (! display)
+            gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                       "Can't open display '%s'. "
+                                       "Please try another one:",
+                                       screen_name);
+
+          g_free (screen_name);
+
+          gtk_widget_set_sensitive (dialog, TRUE);
+
+          if (display)
+            break;
+        }
+
+      gtk_widget_grab_focus (entry);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+void
+window_move_to_screen_cmd_callback (GimpAction *action,
+                                    GVariant   *value,
+                                    gpointer    data)
+{
+  GtkWidget *widget;
+#if 0
+  GdkScreen *screen;
+#endif
+  return_if_no_widget (widget, data);
+
+#if 0
+  if (! gtk_widget_is_toplevel (widget))
+    widget = gtk_widget_get_toplevel (widget);
+
+  screen = g_object_get_data (G_OBJECT (current), "screen");
+
+  if (GDK_IS_SCREEN (screen) && screen != gtk_widget_get_screen (widget))
+    {
+      gtk_window_set_screen (GTK_WINDOW (widget), screen);
+    }
+#endif
+}
diff --git a/app/actions/window-commands.h b/app/actions/window-commands.h
new file mode 100644
index 0000000..41478d5
--- /dev/null
+++ b/app/actions/window-commands.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WINDOW_COMMANDS_H__
+#define __WINDOW_COMMANDS_H__
+
+
+void   window_close_cmd_callback          (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+void   window_open_display_cmd_callback   (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+void   window_move_to_screen_cmd_callback (GimpAction *action,
+                                           GVariant   *value,
+                                           gpointer    data);
+
+
+#endif /* __WINDOW_COMMANDS_H__ */
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
new file mode 100644
index 0000000..52b2a9c
--- /dev/null
+++ b/app/actions/windows-actions.c
@@ -0,0 +1,618 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdisplayconfig.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "dialogs/dialogs.h"
+
+#include "windows-actions.h"
+#include "windows-commands.h"
+
+#include "gimp-intl.h"
+
+
+static void  windows_actions_display_add               (GimpContainer     *container,
+                                                        GimpDisplay       *display,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_display_remove            (GimpContainer     *container,
+                                                        GimpDisplay       *display,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_display_reorder           (GimpContainer     *container,
+                                                        GimpDisplay       *display,
+                                                        gint               position,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_image_notify              (GimpDisplay       *display,
+                                                        const GParamSpec  *unused,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_title_notify              (GimpDisplayShell  *shell,
+                                                        const GParamSpec  *unused,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_update_display_accels     (GimpActionGroup   *group);
+
+static void  windows_actions_dock_window_added         (GimpDialogFactory *factory,
+                                                        GimpDockWindow    *dock_window,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_dock_window_removed       (GimpDialogFactory *factory,
+                                                        GimpDockWindow    *dock_window,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_dock_window_notify        (GimpDockWindow    *dock,
+                                                        const GParamSpec  *pspec,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_recent_add                (GimpContainer     *container,
+                                                        GimpSessionInfo   *info,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_recent_remove             (GimpContainer     *container,
+                                                        GimpSessionInfo   *info,
+                                                        GimpActionGroup   *group);
+static void  windows_actions_single_window_mode_notify (GimpDisplayConfig *config,
+                                                        GParamSpec        *pspec,
+                                                        GimpActionGroup   *group);
+
+
+/* The only reason we have "Tab" in the action entries below is to
+ * give away the hardcoded keyboard shortcut. If the user changes the
+ * shortcut to something else, both that shortcut and Tab will
+ * work. The reason we have the shortcut hardcoded is because
+ * gtk_accelerator_valid() returns FALSE for GDK_tab.
+ */
+
+static const GimpActionEntry windows_actions[] =
+{
+  { "windows-menu",         NULL, NC_("windows-action",
+                                      "_Windows")               },
+  { "windows-docks-menu",   NULL, NC_("windows-action",
+                                      "_Recently Closed Docks") },
+  { "windows-dialogs-menu", NULL, NC_("windows-action",
+                                      "_Dockable Dialogs")      },
+
+  { "windows-show-display-next", NULL,
+    NC_("windows-action", "Next Image"), "<alt>Tab",
+    NC_("windows-action", "Switch to the next image"),
+    windows_show_display_next_cmd_callback,
+    NULL },
+
+  { "windows-show-display-previous", NULL,
+    NC_("windows-action", "Previous Image"), "<alt><shift>Tab",
+    NC_("windows-action", "Switch to the previous image"),
+    windows_show_display_previous_cmd_callback,
+    NULL },
+
+  { "windows-tab-position",        NULL, NC_("windows-action",
+                                             "_Tabs Position")   },
+};
+
+static const GimpToggleActionEntry windows_toggle_actions[] =
+{
+  { "windows-hide-docks", NULL,
+    NC_("windows-action", "_Hide Docks"), "Tab",
+    NC_("windows-action", "When enabled, docks and other dialogs are hidden, leaving only image windows."),
+    windows_hide_docks_cmd_callback,
+    FALSE,
+    GIMP_HELP_WINDOWS_HIDE_DOCKS },
+
+  { "windows-show-tabs", NULL,
+    NC_("windows-action", "_Show Tabs"), NULL,
+    NC_("windows-action", "When enabled, the image tabs bar is shown."),
+    windows_show_tabs_cmd_callback,
+    FALSE,
+    GIMP_HELP_WINDOWS_SHOW_TABS },
+
+  { "windows-use-single-window-mode", NULL,
+    NC_("windows-action", "Single-Window _Mode"), NULL,
+    NC_("windows-action", "When enabled, GIMP is in a single-window mode."),
+    windows_use_single_window_mode_cmd_callback,
+    FALSE,
+    GIMP_HELP_WINDOWS_USE_SINGLE_WINDOW_MODE }
+};
+
+static const GimpRadioActionEntry windows_tabs_position_actions[] =
+{
+  { "windows-tabs-position-top", GIMP_ICON_GO_TOP,
+    NC_("windows-tabs-position-action", "_Top"), NULL,
+    NC_("windows-tabs-position-action", "Position the tabs on the top"),
+    GIMP_POSITION_TOP, GIMP_HELP_WINDOWS_TABS_POSITION },
+
+  { "windows-tabs-position-bottom", GIMP_ICON_GO_BOTTOM,
+    NC_("windows-tabs-position-action", "_Bottom"), NULL,
+    NC_("windows-tabs-position-action", "Position the tabs on the bottom"),
+    GIMP_POSITION_BOTTOM, GIMP_HELP_WINDOWS_TABS_POSITION },
+
+  { "windows-tabs-position-left", GIMP_ICON_GO_FIRST,
+    NC_("windows-tabs-position-action", "_Left"), NULL,
+    NC_("windows-tabs-position-action", "Position the tabs on the left"),
+    GIMP_POSITION_LEFT, GIMP_HELP_WINDOWS_TABS_POSITION },
+
+  { "windows-tabs-position-right", GIMP_ICON_GO_LAST,
+    NC_("windows-tabs-position-action", "_Right"), NULL,
+    NC_("windows-tabs-position-action", "Position the tabs on the right"),
+    GIMP_POSITION_RIGHT, GIMP_HELP_WINDOWS_TABS_POSITION },
+};
+
+void
+windows_actions_setup (GimpActionGroup *group)
+{
+  GList *list;
+
+  gimp_action_group_add_actions (group, "windows-action",
+                                 windows_actions,
+                                 G_N_ELEMENTS (windows_actions));
+
+  gimp_action_group_add_toggle_actions (group, "windows-action",
+                                        windows_toggle_actions,
+                                        G_N_ELEMENTS (windows_toggle_actions));
+
+  gimp_action_group_add_radio_actions (group, "windows-tabs-position-action",
+                                       windows_tabs_position_actions,
+                                       G_N_ELEMENTS (windows_tabs_position_actions),
+                                       NULL, 0,
+                                       windows_set_tabs_position_cmd_callback);
+
+  gimp_action_group_set_action_hide_empty (group, "windows-docks-menu", FALSE);
+
+  g_signal_connect_object (group->gimp->displays, "add",
+                           G_CALLBACK (windows_actions_display_add),
+                           group, 0);
+  g_signal_connect_object (group->gimp->displays, "remove",
+                           G_CALLBACK (windows_actions_display_remove),
+                           group, 0);
+  g_signal_connect_object (group->gimp->displays, "reorder",
+                           G_CALLBACK (windows_actions_display_reorder),
+                           group, 0);
+
+  for (list = gimp_get_display_iter (group->gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+
+      windows_actions_display_add (group->gimp->displays, display, group);
+    }
+
+  g_signal_connect_object (gimp_dialog_factory_get_singleton (), "dock-window-added",
+                           G_CALLBACK (windows_actions_dock_window_added),
+                           group, 0);
+  g_signal_connect_object (gimp_dialog_factory_get_singleton (), "dock-window-removed",
+                           G_CALLBACK (windows_actions_dock_window_removed),
+                           group, 0);
+
+  for (list = gimp_dialog_factory_get_open_dialogs (gimp_dialog_factory_get_singleton ());
+       list;
+       list = g_list_next (list))
+    {
+      GimpDockWindow *dock_window = list->data;
+
+      if (GIMP_IS_DOCK_WINDOW (dock_window))
+        windows_actions_dock_window_added (gimp_dialog_factory_get_singleton (),
+                                           dock_window,
+                                           group);
+    }
+
+  g_signal_connect_object (global_recent_docks, "add",
+                           G_CALLBACK (windows_actions_recent_add),
+                           group, 0);
+  g_signal_connect_object (global_recent_docks, "remove",
+                           G_CALLBACK (windows_actions_recent_remove),
+                           group, 0);
+
+  for (list = GIMP_LIST (global_recent_docks)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpSessionInfo *info = list->data;
+
+      windows_actions_recent_add (global_recent_docks, info, group);
+    }
+
+  g_signal_connect_object (group->gimp->config, "notify::single-window-mode",
+                           G_CALLBACK (windows_actions_single_window_mode_notify),
+                           group, 0);
+}
+
+void
+windows_actions_update (GimpActionGroup *group,
+                        gpointer         data)
+{
+  GimpGuiConfig *config = GIMP_GUI_CONFIG (group->gimp->config);
+  const gchar   *action = NULL;
+
+#define SET_ACTIVE(action,condition) \
+        gimp_action_group_set_action_active (group, action, (condition) != 0)
+
+  SET_ACTIVE ("windows-use-single-window-mode", config->single_window_mode);
+  SET_ACTIVE ("windows-hide-docks", config->hide_docks);
+  SET_ACTIVE ("windows-show-tabs", config->show_tabs);
+
+  switch (config->tabs_position)
+    {
+    case GIMP_POSITION_TOP:
+      action = "windows-tabs-position-top";
+      break;
+    case GIMP_POSITION_BOTTOM:
+      action = "windows-tabs-position-bottom";
+      break;
+    case GIMP_POSITION_LEFT:
+      action = "windows-tabs-position-left";
+      break;
+    case GIMP_POSITION_RIGHT:
+      action = "windows-tabs-position-right";
+      break;
+    default:
+      action = "windows-tabs-position-top";
+      break;
+    }
+
+  gimp_action_group_set_action_active (group, action, TRUE);
+  gimp_action_group_set_action_sensitive (group, "windows-tab-position", config->single_window_mode);
+  gimp_action_group_set_action_sensitive (group, "windows-show-tabs", config->single_window_mode);
+
+#undef SET_ACTIVE
+}
+
+gchar *
+windows_actions_dock_window_to_action_name (GimpDockWindow *dock_window)
+{
+  return g_strdup_printf ("windows-dock-%04d",
+                          gimp_dock_window_get_id (dock_window));
+}
+
+
+/*  private functions  */
+
+static void
+windows_actions_display_add (GimpContainer   *container,
+                             GimpDisplay     *display,
+                             GimpActionGroup *group)
+{
+  GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+  g_signal_connect_object (display, "notify::image",
+                           G_CALLBACK (windows_actions_image_notify),
+                           group, 0);
+
+  g_signal_connect_object (shell, "notify::title",
+                           G_CALLBACK (windows_actions_title_notify),
+                           group, 0);
+
+  windows_actions_image_notify (display, NULL, group);
+}
+
+static void
+windows_actions_display_remove (GimpContainer   *container,
+                                GimpDisplay     *display,
+                                GimpActionGroup *group)
+{
+  GimpDisplayShell *shell = gimp_display_get_shell (display);
+  GimpAction       *action;
+  gchar            *action_name;
+
+  if (shell)
+    g_signal_handlers_disconnect_by_func (shell,
+                                          windows_actions_title_notify,
+                                          group);
+
+  action_name = gimp_display_get_action_name (display);
+  action = gimp_action_group_get_action (group, action_name);
+  g_free (action_name);
+
+  if (action)
+    gimp_action_group_remove_action_and_accel (group, action);
+
+  windows_actions_update_display_accels (group);
+}
+
+static void
+windows_actions_display_reorder (GimpContainer   *container,
+                                 GimpDisplay     *display,
+                                 gint             new_index,
+                                 GimpActionGroup *group)
+{
+  windows_actions_update_display_accels (group);
+}
+
+static void
+windows_actions_image_notify (GimpDisplay      *display,
+                              const GParamSpec *unused,
+                              GimpActionGroup  *group)
+{
+  GimpImage  *image = gimp_display_get_image (display);
+  GimpAction *action;
+  gchar      *action_name;
+
+  action_name = gimp_display_get_action_name (display);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      GimpActionEntry entry;
+
+      entry.name        = action_name;
+      entry.icon_name   = GIMP_ICON_IMAGE;
+      entry.label       = "";
+      entry.accelerator = NULL;
+      entry.tooltip     = NULL;
+      entry.callback    = windows_show_display_cmd_callback;
+      entry.help_id     = NULL;
+
+      gimp_action_group_add_actions (group, NULL, &entry, 1);
+
+      gimp_action_group_set_action_always_show_image (group, action_name,
+                                                      TRUE);
+      action = gimp_action_group_get_action (group, action_name);
+
+      g_object_set_data (G_OBJECT (action), "display", display);
+    }
+
+  g_free (action_name);
+
+  if (image)
+    {
+      const gchar *display_name;
+      gchar       *escaped;
+      gchar       *title;
+
+      display_name = gimp_image_get_display_name (image);
+      escaped = gimp_escape_uline (display_name);
+
+      title = g_strdup_printf ("%s-%d.%d", escaped,
+                               gimp_image_get_ID (image),
+                               gimp_display_get_instance (display));
+      g_free (escaped);
+
+      g_object_set (action,
+                    "visible",  TRUE,
+                    "label",    title,
+                    "tooltip",  gimp_image_get_display_path (image),
+                    "viewable", image,
+                    "context",  gimp_get_user_context (group->gimp),
+                    NULL);
+
+      g_free (title);
+
+      windows_actions_update_display_accels (group);
+    }
+  else
+    {
+      g_object_set (action,
+                    "visible",  FALSE,
+                    "viewable", NULL,
+                    NULL);
+    }
+}
+
+static void
+windows_actions_title_notify (GimpDisplayShell *shell,
+                              const GParamSpec *unused,
+                              GimpActionGroup  *group)
+{
+  windows_actions_image_notify (shell->display, NULL, group);
+}
+
+static void
+windows_actions_update_display_accels (GimpActionGroup *group)
+{
+  GList *list;
+  gint   i;
+
+  for (list = gimp_get_display_iter (group->gimp), i = 0;
+       list && i < 10;
+       list = g_list_next (list), i++)
+    {
+      GimpDisplay *display = list->data;
+      GimpAction  *action;
+      gchar       *action_name;
+
+      if (! gimp_display_get_image (display))
+        break;
+
+      action_name = gimp_display_get_action_name (display);
+
+      action = gimp_action_group_get_action (group, action_name);
+      g_free (action_name);
+
+      if (action)
+        {
+          const gchar *accel_path;
+          guint        accel_key;
+
+          accel_path = gimp_action_get_accel_path (action);
+
+          if (i < 9)
+            accel_key = GDK_KEY_1 + i;
+          else
+            accel_key = GDK_KEY_0;
+
+          gtk_accel_map_change_entry (accel_path,
+                                      accel_key, GDK_MOD1_MASK,
+                                      TRUE);
+        }
+    }
+}
+
+static void
+windows_actions_dock_window_added (GimpDialogFactory *factory,
+                                   GimpDockWindow    *dock_window,
+                                   GimpActionGroup   *group)
+{
+  GimpAction      *action;
+  GimpActionEntry  entry;
+  gchar           *action_name = windows_actions_dock_window_to_action_name (dock_window);
+
+  entry.name        = action_name;
+  entry.icon_name   = NULL;
+  entry.label       = "";
+  entry.accelerator = NULL;
+  entry.tooltip     = NULL;
+  entry.callback    = windows_show_dock_cmd_callback;
+  entry.help_id     = GIMP_HELP_WINDOWS_SHOW_DOCK;
+
+  gimp_action_group_add_actions (group, NULL, &entry, 1);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  g_object_set (action,
+                "ellipsize", PANGO_ELLIPSIZE_END,
+                NULL);
+
+  g_object_set_data (G_OBJECT (action), "dock-window", dock_window);
+
+  g_free (action_name);
+
+  g_signal_connect_object (dock_window, "notify::title",
+                           G_CALLBACK (windows_actions_dock_window_notify),
+                           group, 0);
+
+  if (gtk_window_get_title (GTK_WINDOW (dock_window)))
+    windows_actions_dock_window_notify (dock_window, NULL, group);
+}
+
+static void
+windows_actions_dock_window_removed (GimpDialogFactory *factory,
+                                     GimpDockWindow    *dock_window,
+                                     GimpActionGroup   *group)
+{
+  GimpAction *action;
+  gchar      *action_name;
+
+  action_name = windows_actions_dock_window_to_action_name (dock_window);
+  action = gimp_action_group_get_action (group, action_name);
+  g_free (action_name);
+
+  if (action)
+    gimp_action_group_remove_action_and_accel (group, action);
+}
+
+static void
+windows_actions_dock_window_notify (GimpDockWindow   *dock_window,
+                                    const GParamSpec *pspec,
+                                    GimpActionGroup  *group)
+{
+  GimpAction *action;
+  gchar      *action_name;
+
+  action_name = windows_actions_dock_window_to_action_name (dock_window);
+  action = gimp_action_group_get_action (group, action_name);
+  g_free (action_name);
+
+  if (action)
+    g_object_set (action,
+                  "label",   gtk_window_get_title (GTK_WINDOW (dock_window)),
+                  "tooltip", gtk_window_get_title (GTK_WINDOW (dock_window)),
+                  NULL);
+}
+
+static void
+windows_actions_recent_add (GimpContainer   *container,
+                            GimpSessionInfo *info,
+                            GimpActionGroup *group)
+{
+  GimpAction      *action;
+  GimpActionEntry  entry;
+  gint             info_id;
+  static gint      info_id_counter = 1;
+  gchar           *action_name;
+
+  info_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (info),
+                                                "recent-action-id"));
+
+  if (! info_id)
+    {
+      info_id = info_id_counter++;
+
+      g_object_set_data (G_OBJECT (info), "recent-action-id",
+                         GINT_TO_POINTER (info_id));
+    }
+
+  action_name = g_strdup_printf ("windows-recent-%04d", info_id);
+
+  entry.name        = action_name;
+  entry.icon_name   = NULL;
+  entry.label       = gimp_object_get_name (info);
+  entry.accelerator = NULL;
+  entry.tooltip     = gimp_object_get_name (info);
+  entry.callback    = windows_open_recent_cmd_callback;
+  entry.help_id     = GIMP_HELP_WINDOWS_OPEN_RECENT_DOCK;
+
+  gimp_action_group_add_actions (group, NULL, &entry, 1);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  g_object_set (action,
+                "ellipsize",       PANGO_ELLIPSIZE_END,
+                "max-width-chars", 30,
+                NULL);
+
+  g_object_set_data (G_OBJECT (action), "info", info);
+
+  g_free (action_name);
+}
+
+static void
+windows_actions_recent_remove (GimpContainer   *container,
+                               GimpSessionInfo *info,
+                               GimpActionGroup *group)
+{
+  GimpAction *action;
+  gint        info_id;
+  gchar      *action_name;
+
+  info_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (info),
+                                                "recent-action-id"));
+
+  action_name = g_strdup_printf ("windows-recent-%04d", info_id);
+  action = gimp_action_group_get_action (group, action_name);
+  g_free (action_name);
+
+  if (action)
+    gimp_action_group_remove_action_and_accel (group, action);
+}
+
+static void
+windows_actions_single_window_mode_notify (GimpDisplayConfig *config,
+                                           GParamSpec        *pspec,
+                                           GimpActionGroup   *group)
+{
+  gimp_action_group_set_action_active (group,
+                                       "windows-use-single-window-mode",
+                                       GIMP_GUI_CONFIG (config)->single_window_mode);
+}
diff --git a/app/actions/windows-actions.h b/app/actions/windows-actions.h
new file mode 100644
index 0000000..6d73fed
--- /dev/null
+++ b/app/actions/windows-actions.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WINDOWS_ACTIONS_H__
+#define __WINDOWS_ACTIONS_H__
+
+
+void    windows_actions_setup                      (GimpActionGroup *group);
+void    windows_actions_update                     (GimpActionGroup *group,
+                                                    gpointer         data);
+gchar * windows_actions_dock_window_to_action_name (GimpDockWindow  *dock_window);
+
+
+#endif /* __WINDOWS_ACTIONS_H__ */
diff --git a/app/actions/windows-commands.c b/app/actions/windows-commands.c
new file mode 100644
index 0000000..873b595
--- /dev/null
+++ b/app/actions/windows-commands.c
@@ -0,0 +1,225 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "actions-types.h"
+
+#include "config/gimpdisplayconfig.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions.h"
+#include "dialogs-actions.h"
+#include "windows-commands.h"
+
+#include "gimp-intl.h"
+
+
+void
+windows_hide_docks_cmd_callback (GimpAction *action,
+                                 GVariant   *value,
+                                 gpointer    data)
+{
+  Gimp     *gimp;
+  gboolean  active;
+  return_if_no_gimp (gimp, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != GIMP_GUI_CONFIG (gimp->config)->hide_docks)
+    g_object_set (gimp->config,
+                  "hide-docks", active,
+                  NULL);
+}
+
+void
+windows_use_single_window_mode_cmd_callback (GimpAction *action,
+                                             GVariant   *value,
+                                             gpointer    data)
+{
+  Gimp     *gimp;
+  gboolean  active;
+  return_if_no_gimp (gimp, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != GIMP_GUI_CONFIG (gimp->config)->single_window_mode)
+    g_object_set (gimp->config,
+                  "single-window-mode", active,
+                  NULL);
+}
+
+void
+windows_show_tabs_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  Gimp     *gimp;
+  gboolean  active;
+  return_if_no_gimp (gimp, data);
+
+  active = g_variant_get_boolean (value);
+
+  if (active != GIMP_GUI_CONFIG (gimp->config)->show_tabs)
+    g_object_set (gimp->config,
+                  "show-tabs", active,
+                  NULL);
+}
+
+
+void
+windows_set_tabs_position_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  Gimp         *gimp;
+  GimpPosition  position;
+  return_if_no_gimp (gimp, data);
+
+  position = (GimpPosition) g_variant_get_int32 (value);
+
+  if (position != GIMP_GUI_CONFIG (gimp->config)->tabs_position)
+    g_object_set (gimp->config,
+                  "tabs-position", position,
+                  NULL);
+}
+
+void
+windows_show_display_next_cmd_callback (GimpAction *action,
+                                        GVariant   *value,
+                                        gpointer    data)
+{
+  GimpDisplay *display;
+  Gimp        *gimp;
+  gint         index;
+  return_if_no_display (display, data);
+  return_if_no_gimp (gimp, data);
+
+  index = gimp_container_get_child_index (gimp->displays,
+                                          GIMP_OBJECT (display));
+  index++;
+
+  if (index >= gimp_container_get_n_children (gimp->displays))
+    index = 0;
+
+  display = GIMP_DISPLAY (gimp_container_get_child_by_index (gimp->displays,
+                                                             index));
+  gimp_display_shell_present (gimp_display_get_shell (display));
+}
+
+void
+windows_show_display_previous_cmd_callback (GimpAction *action,
+                                            GVariant   *value,
+                                            gpointer    data)
+{
+  GimpDisplay *display;
+  Gimp        *gimp;
+  gint         index;
+  return_if_no_display (display, data);
+  return_if_no_gimp (gimp, data);
+
+  index = gimp_container_get_child_index (gimp->displays,
+                                          GIMP_OBJECT (display));
+  index--;
+
+  if (index < 0)
+    index = gimp_container_get_n_children (gimp->displays) - 1;
+
+  display = GIMP_DISPLAY (gimp_container_get_child_by_index (gimp->displays,
+                                                             index));
+  gimp_display_shell_present (gimp_display_get_shell (display));
+}
+
+void
+windows_show_display_cmd_callback (GimpAction *action,
+                                   GVariant   *value,
+                                   gpointer    data)
+{
+  GimpDisplay *display = g_object_get_data (G_OBJECT (action), "display");
+
+  gimp_display_shell_present (gimp_display_get_shell (display));
+}
+
+void
+windows_show_dock_cmd_callback (GimpAction *action,
+                                GVariant   *value,
+                                gpointer    data)
+{
+  GtkWindow *dock_window = g_object_get_data (G_OBJECT (action), "dock-window");
+
+  gtk_window_present (dock_window);
+}
+
+void
+windows_open_recent_cmd_callback (GimpAction *action,
+                                  GVariant   *value,
+                                  gpointer    data)
+{
+  GimpSessionInfo        *info;
+  GimpDialogFactoryEntry *entry;
+  Gimp                   *gimp;
+  GtkWidget              *widget;
+  return_if_no_gimp (gimp, data);
+  return_if_no_widget (widget, data);
+
+  info  = g_object_get_data (G_OBJECT (action), "info");
+  entry = gimp_session_info_get_factory_entry (info);
+
+  if (entry && strcmp ("gimp-toolbox-window", entry->identifier) == 0 &&
+      dialogs_actions_toolbox_exists (gimp))
+    {
+      gimp_message (gimp,
+                    G_OBJECT (action_data_get_widget (data)),
+                    GIMP_MESSAGE_WARNING,
+                    _("The chosen recent dock contains a toolbox. Please "
+                      "close the currently open toolbox and try again."));
+      return;
+    }
+
+  g_object_ref (info);
+
+  gimp_container_remove (global_recent_docks, GIMP_OBJECT (info));
+
+  gimp_dialog_factory_add_session_info (gimp_dialog_factory_get_singleton (),
+                                        info);
+
+  gimp_session_info_restore (info, gimp_dialog_factory_get_singleton (),
+                             gtk_widget_get_screen (widget),
+                             gimp_widget_get_monitor (widget));
+
+  g_object_unref (info);
+}
diff --git a/app/actions/windows-commands.h b/app/actions/windows-commands.h
new file mode 100644
index 0000000..712d3c1
--- /dev/null
+++ b/app/actions/windows-commands.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WINDOWS_COMMANDS_H__
+#define __WINDOWS_COMMANDS_H__
+
+
+void  windows_hide_docks_cmd_callback             (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void  windows_use_single_window_mode_cmd_callback (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void  windows_show_tabs_cmd_callback              (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void  windows_set_tabs_position_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+void  windows_show_display_next_cmd_callback      (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void  windows_show_display_previous_cmd_callback  (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void  windows_show_display_cmd_callback           (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void  windows_show_dock_cmd_callback              (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+void  windows_open_recent_cmd_callback            (GimpAction *action,
+                                                   GVariant   *value,
+                                                   gpointer    data);
+
+
+#endif /* __WINDOWS_COMMANDS_H__ */
diff --git a/app/app.c b/app/app.c
new file mode 100644
index 0000000..89db192
--- /dev/null
+++ b/app/app.c
@@ -0,0 +1,523 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <winnls.h>
+#endif
+
+#undef GIMP_DISABLE_DEPRECATED /* for compat enums */
+#include "libgimpbase/gimpbase.h"
+#define GIMP_DISABLE_DEPRECATED
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core/core-types.h"
+
+#include "config/gimplangrc.h"
+#include "config/gimprc.h"
+
+#include "gegl/gimp-gegl.h"
+
+#include "core/gimp.h"
+#include "core/gimp-batch.h"
+#include "core/gimp-user-install.h"
+#include "core/gimpimage.h"
+
+#include "file/file-open.h"
+
+#ifndef GIMP_CONSOLE_COMPILATION
+#include "dialogs/user-install-dialog.h"
+
+#include "gui/gui.h"
+#endif
+
+#include "app.h"
+#include "errors.h"
+#include "language.h"
+#include "sanity.h"
+#include "gimp-debug.h"
+
+#include "gimp-intl.h"
+#include "gimp-update.h"
+
+
+/*  local prototypes  */
+
+static void       app_init_update_noop       (const gchar        *text1,
+                                              const gchar        *text2,
+                                              gdouble             percentage);
+static void       app_restore_after_callback (Gimp               *gimp,
+                                              GimpInitStatusFunc  status_callback);
+static gboolean   app_exit_after_callback    (Gimp               *gimp,
+                                              gboolean            kill_it,
+                                              GMainLoop         **loop);
+
+GType gimp_convert_dither_type_compat_get_type (void); /* compat cruft */
+GType gimp_layer_mode_effects_get_type         (void); /* compat cruft */
+
+
+/*  local variables  */
+
+static GObject *initial_screen  = NULL;
+static gint     initial_monitor = 0;
+
+
+/*  public functions  */
+
+void
+app_libs_init (GOptionContext *context,
+               gboolean        no_interface)
+{
+  GQuark quark;
+
+  /* disable OpenCL before GEGL is even initialized; this way we only
+   * enable if wanted in gimprc, instead of always enabling, and then
+   * disabling again if wanted in gimprc
+   */
+  g_object_set (gegl_config (),
+                "use-opencl", FALSE,
+                "application-license", "GPL3",
+                NULL);
+
+  g_option_context_add_group (context, gegl_get_option_group ());
+
+#ifndef GIMP_CONSOLE_COMPILATION
+  if (! no_interface)
+    {
+      gui_libs_init (context);
+    }
+#endif
+
+  /*  keep compat enum code in sync with pdb/enumcode.pl  */
+  quark = g_quark_from_static_string ("gimp-compat-enum");
+
+  g_type_set_qdata (GIMP_TYPE_CONVERT_DITHER_TYPE, quark,
+                    (gpointer) gimp_convert_dither_type_compat_get_type ());
+  g_type_set_qdata (GIMP_TYPE_LAYER_MODE, quark,
+                    (gpointer) gimp_layer_mode_effects_get_type ());
+}
+
+void
+app_abort (gboolean     no_interface,
+           const gchar *abort_message)
+{
+#ifndef GIMP_CONSOLE_COMPILATION
+  if (no_interface)
+#endif
+    {
+      g_print ("%s\n\n", abort_message);
+    }
+#ifndef GIMP_CONSOLE_COMPILATION
+  else
+    {
+      gui_abort (abort_message);
+    }
+#endif
+
+  app_exit (EXIT_FAILURE);
+}
+
+void
+app_exit (gint status)
+{
+  exit (status);
+}
+
+void
+app_run (const gchar         *full_prog_name,
+         const gchar        **filenames,
+         GFile               *alternate_system_gimprc,
+         GFile               *alternate_gimprc,
+         const gchar         *session_name,
+         const gchar         *batch_interpreter,
+         const gchar        **batch_commands,
+         gboolean             as_new,
+         gboolean             no_interface,
+         gboolean             no_data,
+         gboolean             no_fonts,
+         gboolean             no_splash,
+         gboolean             be_verbose,
+         gboolean             use_shm,
+         gboolean             use_cpu_accel,
+         gboolean             console_messages,
+         gboolean             use_debug_handler,
+         gboolean             show_playground,
+         gboolean             show_debug_menu,
+         GimpStackTraceMode   stack_trace_mode,
+         GimpPDBCompatMode    pdb_compat_mode,
+         const gchar         *backtrace_file)
+{
+  GimpInitStatusFunc  update_status_func = NULL;
+  Gimp               *gimp;
+  GMainLoop          *loop;
+  GMainLoop          *run_loop;
+  GFile              *default_folder = NULL;
+  GFile              *gimpdir;
+  const gchar        *abort_message;
+  GimpLangRc         *temprc;
+  gchar              *language   = NULL;
+  GError             *font_error = NULL;
+
+  if (filenames && filenames[0] && ! filenames[1] &&
+      g_file_test (filenames[0], G_FILE_TEST_IS_DIR))
+    {
+      if (g_path_is_absolute (filenames[0]))
+        {
+          default_folder = g_file_new_for_path (filenames[0]);
+        }
+      else
+        {
+          gchar *absolute = g_build_path (G_DIR_SEPARATOR_S,
+                                          g_get_current_dir (),
+                                          filenames[0],
+                                          NULL);
+          default_folder = g_file_new_for_path (absolute);
+          g_free (absolute);
+        }
+
+      filenames = NULL;
+    }
+
+  /* Language needs to be determined first, before any GimpContext is
+   * instantiated (which happens when the Gimp object is created)
+   * because its properties need to be properly localized in the
+   * settings language (if different from system language). Otherwise we
+   * end up with pieces of GUI always using the system language (cf. bug
+   * 787457). Therefore we do a first pass on "gimprc" file for the sole
+   * purpose of getting the settings language, so that we can initialize
+   * it before anything else.
+   */
+  temprc = gimp_lang_rc_new (alternate_system_gimprc,
+                             alternate_gimprc,
+                             be_verbose);
+  language = gimp_lang_rc_get_language (temprc);
+  g_object_unref (temprc);
+
+  /*  change the locale if a language if specified  */
+  language_init (language);
+  if (language)
+    g_free (language);
+
+  /*  Create an instance of the "Gimp" object which is the root of the
+   *  core object system
+   */
+  gimp = gimp_new (full_prog_name,
+                   session_name,
+                   default_folder,
+                   be_verbose,
+                   no_data,
+                   no_fonts,
+                   no_interface,
+                   use_shm,
+                   use_cpu_accel,
+                   console_messages,
+                   show_playground,
+                   show_debug_menu,
+                   stack_trace_mode,
+                   pdb_compat_mode);
+
+  if (default_folder)
+    g_object_unref (default_folder);
+
+  gimp_cpu_accel_set_use (use_cpu_accel);
+
+  /*  Check if the user's gimp_directory exists
+   */
+  gimpdir = gimp_directory_file (NULL);
+
+  if (g_file_query_file_type (gimpdir, G_FILE_QUERY_INFO_NONE, NULL) !=
+      G_FILE_TYPE_DIRECTORY)
+    {
+      GimpUserInstall *install = gimp_user_install_new (G_OBJECT (gimp),
+                                                        be_verbose);
+
+#ifdef GIMP_CONSOLE_COMPILATION
+      gimp_user_install_run (install);
+#else
+      if (! (no_interface ?
+             gimp_user_install_run (install) :
+             user_install_dialog_run (install)))
+        exit (EXIT_FAILURE);
+#endif
+
+      gimp_user_install_free (install);
+    }
+
+  g_object_unref (gimpdir);
+
+  gimp_load_config (gimp, alternate_system_gimprc, alternate_gimprc);
+
+  /* Initialize the error handling after creating/migrating the config
+   * directory because it will create some folders for backup and crash
+   * logs in advance. Therefore running this before
+   * gimp_user_install_new() would break migration as well as initial
+   * folder creations.
+   *
+   * It also needs to be run after gimp_load_config() because error
+   * handling is based on Preferences. It means that early loading code
+   * is not handled by our debug code, but that's not a big deal.
+   */
+  errors_init (gimp, full_prog_name, use_debug_handler,
+               stack_trace_mode, backtrace_file);
+
+  /*  run the late-stage sanity check.  it's important that this check is run
+   *  after the call to language_init() (see comment in sanity_check_late().)
+   */
+  abort_message = sanity_check_late ();
+  if (abort_message)
+    app_abort (no_interface, abort_message);
+
+  /*  initialize lowlevel stuff  */
+  gimp_gegl_init (gimp);
+
+  /*  Connect our restore_after callback before gui_init() connects
+   *  theirs, so ours runs first and can grab the initial monitor
+   *  before the GUI's restore_after callback resets it.
+   */
+  g_signal_connect_after (gimp, "restore",
+                          G_CALLBACK (app_restore_after_callback),
+                          NULL);
+
+#ifndef GIMP_CONSOLE_COMPILATION
+  if (! no_interface)
+    update_status_func = gui_init (gimp, no_splash);
+#endif
+
+  if (! update_status_func)
+    update_status_func = app_init_update_noop;
+
+  /*  Create all members of the global Gimp instance which need an already
+   *  parsed gimprc, e.g. the data factories
+   */
+  gimp_initialize (gimp, update_status_func);
+
+  /*  Load all data files
+   */
+  gimp_restore (gimp, update_status_func, &font_error);
+
+  /*  enable autosave late so we don't autosave when the
+   *  monitor resolution is set in gui_init()
+   */
+  gimp_rc_set_autosave (GIMP_RC (gimp->edit_config), TRUE);
+
+  /*  check for updates *after* enabling config autosave, so that the timestamp
+   *  is saved
+   */
+  gimp_update_auto_check (gimp->edit_config);
+
+  loop = run_loop = g_main_loop_new (NULL, FALSE);
+
+  g_signal_connect_after (gimp, "exit",
+                          G_CALLBACK (app_exit_after_callback),
+                          &run_loop);
+
+#ifndef GIMP_CONSOLE_COMPILATION
+  if (run_loop && ! no_interface)
+    {
+      /* Before opening images from command line, check for salvaged images
+       * and query interactively to know if we should recover or discard
+       * them.
+       */
+      GList *recovered_files;
+      GList *iter;
+
+      recovered_files = errors_recovered ();
+      if (recovered_files &&
+          gui_recover (g_list_length (recovered_files)))
+        {
+          for (iter = recovered_files; iter; iter = iter->next)
+            {
+              GFile             *file;
+              GimpImage         *image;
+              GError            *error = NULL;
+              GimpPDBStatusType  status;
+
+              file = g_file_new_for_path (iter->data);
+              image = file_open_with_display (gimp,
+                                              gimp_get_user_context (gimp),
+                                              NULL,
+                                              file, as_new,
+                                              initial_screen,
+                                              initial_monitor,
+                                              &status, &error);
+              if (image)
+                {
+                  /* Break ties with the backup directory. */
+                  gimp_image_set_file (image, NULL);
+                  /* One of the rare exceptions where we should call
+                   * gimp_image_dirty() directly instead of creating
+                   * an undo. We want the image to be dirty from
+                   * scratch, without anything to undo.
+                   */
+                  gimp_image_dirty (image, GIMP_DIRTY_IMAGE);
+                }
+              else
+                {
+                  g_error_free (error);
+                }
+
+              g_object_unref (file);
+            }
+        }
+      /* Delete backup XCF images. */
+      for (iter = recovered_files; iter; iter = iter->next)
+        {
+          g_unlink (iter->data);
+        }
+      g_list_free_full (recovered_files, g_free);
+    }
+#endif
+
+  /*  Load the images given on the command-line. */
+  if (filenames)
+    {
+      gint i;
+
+      for (i = 0; filenames[i] != NULL; i++)
+        {
+          if (run_loop)
+            {
+              GFile *file = g_file_new_for_commandline_arg (filenames[i]);
+
+              file_open_from_command_line (gimp, file, as_new,
+                                           initial_screen,
+                                           initial_monitor);
+
+              g_object_unref (file);
+            }
+        }
+    }
+
+  /* The software is now fully loaded and ready to be used and get
+   * external input.
+   */
+  gimp->initialized = TRUE;
+
+  if (font_error)
+    {
+      gimp_message_literal (gimp, NULL,
+                            GIMP_MESSAGE_INFO,
+                            font_error->message);
+      g_error_free (font_error);
+    }
+
+  if (run_loop)
+    gimp_batch_run (gimp, batch_interpreter, batch_commands);
+
+  if (run_loop)
+    {
+      gimp_threads_leave (gimp);
+      g_main_loop_run (loop);
+      gimp_threads_enter (gimp);
+    }
+
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  g_main_loop_unref (loop);
+
+  gimp_gegl_exit (gimp);
+
+  errors_exit ();
+
+  g_object_unref (gimp);
+
+  gimp_debug_instances ();
+
+  gegl_exit ();
+}
+
+
+/*  private functions  */
+
+static void
+app_init_update_noop (const gchar *text1,
+                      const gchar *text2,
+                      gdouble      percentage)
+{
+  /*  deliberately do nothing  */
+}
+
+static void
+app_restore_after_callback (Gimp               *gimp,
+                            GimpInitStatusFunc  status_callback)
+{
+  /*  Getting the display name for a -1 display returns the initial
+   *  monitor during startup. Need to call this from a restore_after
+   *  callback, because before restore(), the GUI can't return anything,
+   *  after after restore() the initial monitor gets reset.
+   */
+  g_free (gimp_get_display_name (gimp, -1, &initial_screen, &initial_monitor));
+}
+
+static gboolean
+app_exit_after_callback (Gimp       *gimp,
+                         gboolean    kill_it,
+                         GMainLoop **loop)
+{
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  /*
+   *  In stable releases, we simply call exit() here. This speeds up
+   *  the process of quitting GIMP and also works around the problem
+   *  that plug-ins might still be running.
+   *
+   *  In unstable releases, we shut down GIMP properly in an attempt
+   *  to catch possible problems in our finalizers.
+   */
+
+#ifdef GIMP_UNSTABLE
+
+  if (g_main_loop_is_running (*loop))
+    g_main_loop_quit (*loop);
+
+  *loop = NULL;
+
+#else
+
+  gimp_gegl_exit (gimp);
+
+  gegl_exit ();
+
+  exit (EXIT_SUCCESS);
+
+#endif
+
+  return FALSE;
+}
diff --git a/app/app.h b/app/app.h
new file mode 100644
index 0000000..1ec9447
--- /dev/null
+++ b/app/app.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_H__
+#define __APP_H__
+
+
+#ifndef GIMP_APP_GLUE_COMPILATION
+#error You must not #include "app.h" from a subdir
+#endif
+
+
+void  app_libs_init (GOptionContext      *context,
+                     gboolean             no_interface);
+void  app_abort     (gboolean             no_interface,
+                     const gchar         *abort_message) G_GNUC_NORETURN;
+void  app_exit      (gint                 status) G_GNUC_NORETURN;
+
+void  app_run       (const gchar         *full_prog_name,
+                     const gchar        **filenames,
+                     GFile               *alternate_system_gimprc,
+                     GFile               *alternate_gimprc,
+                     const gchar         *session_name,
+                     const gchar         *batch_interpreter,
+                     const gchar        **batch_commands,
+                     gboolean             as_new,
+                     gboolean             no_interface,
+                     gboolean             no_data,
+                     gboolean             no_fonts,
+                     gboolean             no_splash,
+                     gboolean             be_verbose,
+                     gboolean             use_shm,
+                     gboolean             use_cpu_accel,
+                     gboolean             console_messages,
+                     gboolean             use_debug_handler,
+                     gboolean             show_playground,
+                     gboolean             show_debug_menu,
+                     GimpStackTraceMode   stack_trace_mode,
+                     GimpPDBCompatMode    pdb_compat_mode,
+                     const gchar         *backtrace_file);
+
+
+#endif /* __APP_H__ */
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
new file mode 100644
index 0000000..04ac126
--- /dev/null
+++ b/app/config/Makefile.am
@@ -0,0 +1,165 @@
+## Process this file with automake to produce Makefile.in
+
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+
+if OS_WIN32
+else
+libm = -lm
+endif
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Config\"				\
+	-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"	\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GIO_UNIX_CFLAGS)					\
+	$(GIO_WINDOWS_CFLAGS)					\
+	$(GEGL_CFLAGS)						\
+	$(CAIRO_CFLAGS)						\
+	$(GDK_PIXBUF_CFLAGS)					\
+	$(MYPAINT_BRUSHES_CFLAGS)				\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappconfig.a
+
+libappconfig_a_sources = \
+	config-enums.h			\
+	config-types.h			\
+	gimpconfig-dump.c		\
+	gimpconfig-dump.h		\
+	gimpconfig-file.c		\
+	gimpconfig-file.h		\
+	gimpconfig-utils.c		\
+	gimpconfig-utils.h		\
+	gimpcoreconfig.c		\
+	gimpcoreconfig.h		\
+	gimpdialogconfig.c		\
+	gimpdialogconfig.h		\
+	gimpdisplayconfig.c		\
+	gimpdisplayconfig.h		\
+	gimpdisplayoptions.c		\
+	gimpdisplayoptions.h		\
+	gimpgeglconfig.c		\
+	gimpgeglconfig.h		\
+	gimpguiconfig.c			\
+	gimpguiconfig.h			\
+	gimplangrc.c			\
+	gimplangrc.h			\
+	gimppluginconfig.c		\
+	gimppluginconfig.h		\
+	gimprc.c			\
+	gimprc.h			\
+	gimprc-blurbs.h			\
+	gimprc-deserialize.c		\
+	gimprc-deserialize.h		\
+	gimprc-serialize.c		\
+	gimprc-serialize.h		\
+	gimprc-unknown.c		\
+	gimprc-unknown.h		\
+	gimpxmlparser.c			\
+	gimpxmlparser.h
+
+libappconfig_a_built_sources = \
+	config-enums.c
+
+libappconfig_a_SOURCES = \
+	$(libappconfig_a_built_sources)	\
+	$(libappconfig_a_sources)
+
+EXTRA_PROGRAMS = test-config
+
+#
+# unit tests for the GimpConfig system
+#
+
+TESTS = test-config
+
+test_config_DEPENDENCIES = $(gimpconfig_libs)
+
+# We need this due to circular dependencies
+test_config_LDFLAGS = \
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_param_spec_duplicate		\
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
+	-Wl,-u,$(SYMPREFIX)gimp_async_set_new			\
+	-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new
+
+test_config_LDADD = \
+	../xcf/libappxcf.a						\
+	../pdb/libappinternal-procs.a					\
+	../pdb/libapppdb.a						\
+	../plug-in/libappplug-in.a					\
+	../vectors/libappvectors.a					\
+	../core/libappcore.a						\
+	../file/libappfile.a						\
+	../file-data/libappfile-data.a					\
+	../text/libapptext.a						\
+	../paint/libapppaint.a						\
+	../gegl/libappgegl.a						\
+	../operations/libappoperations.a				\
+	../operations/layer-modes/libapplayermodes.a			\
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a	\
+	libappconfig.a							\
+	../gimp-debug.o							\
+	../gimp-log.o							\
+	$(libgimpmodule)						\
+	$(libgimpcolor)							\
+	$(libgimpthumb)							\
+	$(libgimpmath)							\
+	$(libgimpconfig)						\
+	$(libgimpbase)							\
+	$(PANGOCAIRO_LIBS)						\
+	$(HARFBUZZ_LIBS)						\
+	$(GDK_PIXBUF_LIBS)						\
+	$(GEGL_LIBS)							\
+	$(GIO_LIBS)							\
+	$(GEXIV2_LIBS)							\
+	$(Z_LIBS)							\
+	$(JSON_C_LIBS)							\
+	$(LIBMYPAINT_LIBS)						\
+	$(libm)
+
+CLEANFILES = $(EXTRA_PROGRAMS) foorc
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-cec
+CLEANFILES += $(gen_sources)
+
+xgen-cec: $(srcdir)/config-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/config-enums.c: xgen-cec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/config/Makefile.in b/app/config/Makefile.in
new file mode 100644
index 0000000..ab37152
--- /dev/null
+++ b/app/config/Makefile.in
@@ -0,0 +1,1505 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+EXTRA_PROGRAMS = test-config$(EXEEXT)
+TESTS = test-config$(EXEEXT)
+subdir = app/config
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappconfig_a_AR = $(AR) $(ARFLAGS)
+libappconfig_a_LIBADD =
+am__objects_1 = config-enums.$(OBJEXT)
+am__objects_2 = gimpconfig-dump.$(OBJEXT) gimpconfig-file.$(OBJEXT) \
+	gimpconfig-utils.$(OBJEXT) gimpcoreconfig.$(OBJEXT) \
+	gimpdialogconfig.$(OBJEXT) gimpdisplayconfig.$(OBJEXT) \
+	gimpdisplayoptions.$(OBJEXT) gimpgeglconfig.$(OBJEXT) \
+	gimpguiconfig.$(OBJEXT) gimplangrc.$(OBJEXT) \
+	gimppluginconfig.$(OBJEXT) gimprc.$(OBJEXT) \
+	gimprc-deserialize.$(OBJEXT) gimprc-serialize.$(OBJEXT) \
+	gimprc-unknown.$(OBJEXT) gimpxmlparser.$(OBJEXT)
+am_libappconfig_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappconfig_a_OBJECTS = $(am_libappconfig_a_OBJECTS)
+test_config_SOURCES = test-config.c
+test_config_OBJECTS = test-config.$(OBJEXT)
+am__DEPENDENCIES_1 =
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(test_config_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/config-enums.Po \
+	./$(DEPDIR)/gimpconfig-dump.Po ./$(DEPDIR)/gimpconfig-file.Po \
+	./$(DEPDIR)/gimpconfig-utils.Po ./$(DEPDIR)/gimpcoreconfig.Po \
+	./$(DEPDIR)/gimpdialogconfig.Po \
+	./$(DEPDIR)/gimpdisplayconfig.Po \
+	./$(DEPDIR)/gimpdisplayoptions.Po \
+	./$(DEPDIR)/gimpgeglconfig.Po ./$(DEPDIR)/gimpguiconfig.Po \
+	./$(DEPDIR)/gimplangrc.Po ./$(DEPDIR)/gimppluginconfig.Po \
+	./$(DEPDIR)/gimprc-deserialize.Po \
+	./$(DEPDIR)/gimprc-serialize.Po ./$(DEPDIR)/gimprc-unknown.Po \
+	./$(DEPDIR)/gimprc.Po ./$(DEPDIR)/gimpxmlparser.Po \
+	./$(DEPDIR)/test-config.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappconfig_a_SOURCES) test-config.c
+DIST_SOURCES = $(libappconfig_a_SOURCES) test-config.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	$(top_srcdir)/test-driver
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+@OS_WIN32_FALSE@libm = -lm
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Config\"				\
+	-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"	\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GIO_UNIX_CFLAGS)					\
+	$(GIO_WINDOWS_CFLAGS)					\
+	$(GEGL_CFLAGS)						\
+	$(CAIRO_CFLAGS)						\
+	$(GDK_PIXBUF_CFLAGS)					\
+	$(MYPAINT_BRUSHES_CFLAGS)				\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappconfig.a
+libappconfig_a_sources = \
+	config-enums.h			\
+	config-types.h			\
+	gimpconfig-dump.c		\
+	gimpconfig-dump.h		\
+	gimpconfig-file.c		\
+	gimpconfig-file.h		\
+	gimpconfig-utils.c		\
+	gimpconfig-utils.h		\
+	gimpcoreconfig.c		\
+	gimpcoreconfig.h		\
+	gimpdialogconfig.c		\
+	gimpdialogconfig.h		\
+	gimpdisplayconfig.c		\
+	gimpdisplayconfig.h		\
+	gimpdisplayoptions.c		\
+	gimpdisplayoptions.h		\
+	gimpgeglconfig.c		\
+	gimpgeglconfig.h		\
+	gimpguiconfig.c			\
+	gimpguiconfig.h			\
+	gimplangrc.c			\
+	gimplangrc.h			\
+	gimppluginconfig.c		\
+	gimppluginconfig.h		\
+	gimprc.c			\
+	gimprc.h			\
+	gimprc-blurbs.h			\
+	gimprc-deserialize.c		\
+	gimprc-deserialize.h		\
+	gimprc-serialize.c		\
+	gimprc-serialize.h		\
+	gimprc-unknown.c		\
+	gimprc-unknown.h		\
+	gimpxmlparser.c			\
+	gimpxmlparser.h
+
+libappconfig_a_built_sources = \
+	config-enums.c
+
+libappconfig_a_SOURCES = \
+	$(libappconfig_a_built_sources)	\
+	$(libappconfig_a_sources)
+
+test_config_DEPENDENCIES = $(gimpconfig_libs)
+
+# We need this due to circular dependencies
+test_config_LDFLAGS = \
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_param_spec_duplicate		\
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
+	-Wl,-u,$(SYMPREFIX)gimp_async_set_new			\
+	-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new
+
+test_config_LDADD = \
+	../xcf/libappxcf.a						\
+	../pdb/libappinternal-procs.a					\
+	../pdb/libapppdb.a						\
+	../plug-in/libappplug-in.a					\
+	../vectors/libappvectors.a					\
+	../core/libappcore.a						\
+	../file/libappfile.a						\
+	../file-data/libappfile-data.a					\
+	../text/libapptext.a						\
+	../paint/libapppaint.a						\
+	../gegl/libappgegl.a						\
+	../operations/libappoperations.a				\
+	../operations/layer-modes/libapplayermodes.a			\
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a	\
+	libappconfig.a							\
+	../gimp-debug.o							\
+	../gimp-log.o							\
+	$(libgimpmodule)						\
+	$(libgimpcolor)							\
+	$(libgimpthumb)							\
+	$(libgimpmath)							\
+	$(libgimpconfig)						\
+	$(libgimpbase)							\
+	$(PANGOCAIRO_LIBS)						\
+	$(HARFBUZZ_LIBS)						\
+	$(GDK_PIXBUF_LIBS)						\
+	$(GEGL_LIBS)							\
+	$(GIO_LIBS)							\
+	$(GEXIV2_LIBS)							\
+	$(Z_LIBS)							\
+	$(JSON_C_LIBS)							\
+	$(LIBMYPAINT_LIBS)						\
+	$(libm)
+
+CLEANFILES = $(EXTRA_PROGRAMS) foorc $(gen_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-cec
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/config/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/config/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappconfig.a: $(libappconfig_a_OBJECTS) $(libappconfig_a_DEPENDENCIES) $(EXTRA_libappconfig_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappconfig.a
+	$(AM_V_AR)$(libappconfig_a_AR) libappconfig.a $(libappconfig_a_OBJECTS) $(libappconfig_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappconfig.a
+
+test-config$(EXEEXT): $(test_config_OBJECTS) $(test_config_DEPENDENCIES) $(EXTRA_test_config_DEPENDENCIES) 
+	@rm -f test-config$(EXEEXT)
+	$(AM_V_CCLD)$(test_config_LINK) $(test_config_OBJECTS) $(test_config_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config-enums.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpconfig-dump.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpconfig-file.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpconfig-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcoreconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdialogconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgeglconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpguiconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplangrc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprc-deserialize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprc-serialize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprc-unknown.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpxmlparser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-config.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS: 
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-config.log: test-config$(EXEEXT)
+	@p='test-config$(EXEEXT)'; \
+	b='test-config'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/config-enums.Po
+	-rm -f ./$(DEPDIR)/gimpconfig-dump.Po
+	-rm -f ./$(DEPDIR)/gimpconfig-file.Po
+	-rm -f ./$(DEPDIR)/gimpconfig-utils.Po
+	-rm -f ./$(DEPDIR)/gimpcoreconfig.Po
+	-rm -f ./$(DEPDIR)/gimpdialogconfig.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayconfig.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayoptions.Po
+	-rm -f ./$(DEPDIR)/gimpgeglconfig.Po
+	-rm -f ./$(DEPDIR)/gimpguiconfig.Po
+	-rm -f ./$(DEPDIR)/gimplangrc.Po
+	-rm -f ./$(DEPDIR)/gimppluginconfig.Po
+	-rm -f ./$(DEPDIR)/gimprc-deserialize.Po
+	-rm -f ./$(DEPDIR)/gimprc-serialize.Po
+	-rm -f ./$(DEPDIR)/gimprc-unknown.Po
+	-rm -f ./$(DEPDIR)/gimprc.Po
+	-rm -f ./$(DEPDIR)/gimpxmlparser.Po
+	-rm -f ./$(DEPDIR)/test-config.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/config-enums.Po
+	-rm -f ./$(DEPDIR)/gimpconfig-dump.Po
+	-rm -f ./$(DEPDIR)/gimpconfig-file.Po
+	-rm -f ./$(DEPDIR)/gimpconfig-utils.Po
+	-rm -f ./$(DEPDIR)/gimpcoreconfig.Po
+	-rm -f ./$(DEPDIR)/gimpdialogconfig.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayconfig.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayoptions.Po
+	-rm -f ./$(DEPDIR)/gimpgeglconfig.Po
+	-rm -f ./$(DEPDIR)/gimpguiconfig.Po
+	-rm -f ./$(DEPDIR)/gimplangrc.Po
+	-rm -f ./$(DEPDIR)/gimppluginconfig.Po
+	-rm -f ./$(DEPDIR)/gimprc-deserialize.Po
+	-rm -f ./$(DEPDIR)/gimprc-serialize.Po
+	-rm -f ./$(DEPDIR)/gimprc-unknown.Po
+	-rm -f ./$(DEPDIR)/gimprc.Po
+	-rm -f ./$(DEPDIR)/gimpxmlparser.Po
+	-rm -f ./$(DEPDIR)/test-config.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-cec: $(srcdir)/config-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/config-enums.c: xgen-cec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/config/config-enums.c b/app/config/config-enums.c
new file mode 100644
index 0000000..aefdfb2
--- /dev/null
+++ b/app/config/config-enums.c
@@ -0,0 +1,397 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "config-enums.h"
+#include"gimp-intl.h"
+
+/* enumerations from "config-enums.h" */
+GType
+gimp_canvas_padding_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CANVAS_PADDING_MODE_DEFAULT, "GIMP_CANVAS_PADDING_MODE_DEFAULT", "default" },
+    { GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK, "GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK", "light-check" },
+    { GIMP_CANVAS_PADDING_MODE_DARK_CHECK, "GIMP_CANVAS_PADDING_MODE_DARK_CHECK", "dark-check" },
+    { GIMP_CANVAS_PADDING_MODE_CUSTOM, "GIMP_CANVAS_PADDING_MODE_CUSTOM", "custom" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CANVAS_PADDING_MODE_DEFAULT, NC_("canvas-padding-mode", "From theme"), NULL },
+    { GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK, NC_("canvas-padding-mode", "Light check color"), NULL },
+    { GIMP_CANVAS_PADDING_MODE_DARK_CHECK, NC_("canvas-padding-mode", "Dark check color"), NULL },
+    { GIMP_CANVAS_PADDING_MODE_CUSTOM, NC_("canvas-padding-mode", "Custom color"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCanvasPaddingMode", values);
+      gimp_type_set_translation_context (type, "canvas-padding-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_cursor_format_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CURSOR_FORMAT_BITMAP, "GIMP_CURSOR_FORMAT_BITMAP", "bitmap" },
+    { GIMP_CURSOR_FORMAT_PIXBUF, "GIMP_CURSOR_FORMAT_PIXBUF", "pixbuf" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CURSOR_FORMAT_BITMAP, NC_("cursor-format", "Black & white"), NULL },
+    { GIMP_CURSOR_FORMAT_PIXBUF, NC_("cursor-format", "Fancy"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCursorFormat", values);
+      gimp_type_set_translation_context (type, "cursor-format");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_cursor_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CURSOR_MODE_TOOL_ICON, "GIMP_CURSOR_MODE_TOOL_ICON", "tool-icon" },
+    { GIMP_CURSOR_MODE_TOOL_CROSSHAIR, "GIMP_CURSOR_MODE_TOOL_CROSSHAIR", "tool-crosshair" },
+    { GIMP_CURSOR_MODE_CROSSHAIR, "GIMP_CURSOR_MODE_CROSSHAIR", "crosshair" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CURSOR_MODE_TOOL_ICON, NC_("cursor-mode", "Tool icon"), NULL },
+    { GIMP_CURSOR_MODE_TOOL_CROSSHAIR, NC_("cursor-mode", "Tool icon with crosshair"), NULL },
+    { GIMP_CURSOR_MODE_CROSSHAIR, NC_("cursor-mode", "Crosshair only"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCursorMode", values);
+      gimp_type_set_translation_context (type, "cursor-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_export_file_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_EXPORT_FILE_PNG, "GIMP_EXPORT_FILE_PNG", "png" },
+    { GIMP_EXPORT_FILE_JPG, "GIMP_EXPORT_FILE_JPG", "jpg" },
+    { GIMP_EXPORT_FILE_ORA, "GIMP_EXPORT_FILE_ORA", "ora" },
+    { GIMP_EXPORT_FILE_PSD, "GIMP_EXPORT_FILE_PSD", "psd" },
+    { GIMP_EXPORT_FILE_PDF, "GIMP_EXPORT_FILE_PDF", "pdf" },
+    { GIMP_EXPORT_FILE_TIF, "GIMP_EXPORT_FILE_TIF", "tif" },
+    { GIMP_EXPORT_FILE_BMP, "GIMP_EXPORT_FILE_BMP", "bmp" },
+    { GIMP_EXPORT_FILE_WEBP, "GIMP_EXPORT_FILE_WEBP", "webp" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_EXPORT_FILE_PNG, NC_("export-file-type", "PNG Image"), NULL },
+    { GIMP_EXPORT_FILE_JPG, NC_("export-file-type", "JPEG Image"), NULL },
+    { GIMP_EXPORT_FILE_ORA, NC_("export-file-type", "OpenRaster Image"), NULL },
+    { GIMP_EXPORT_FILE_PSD, NC_("export-file-type", "Photoshop Image"), NULL },
+    { GIMP_EXPORT_FILE_PDF, NC_("export-file-type", "Portable Document Format"), NULL },
+    { GIMP_EXPORT_FILE_TIF, NC_("export-file-type", "TIFF Image"), NULL },
+    { GIMP_EXPORT_FILE_BMP, NC_("export-file-type", "Windows BMP Image"), NULL },
+    { GIMP_EXPORT_FILE_WEBP, NC_("export-file-type", "WebP Image"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpExportFileType", values);
+      gimp_type_set_translation_context (type, "export-file-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_handedness_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HANDEDNESS_LEFT, "GIMP_HANDEDNESS_LEFT", "left" },
+    { GIMP_HANDEDNESS_RIGHT, "GIMP_HANDEDNESS_RIGHT", "right" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HANDEDNESS_LEFT, NC_("handedness", "Left-handed"), NULL },
+    { GIMP_HANDEDNESS_RIGHT, NC_("handedness", "Right-handed"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpHandedness", values);
+      gimp_type_set_translation_context (type, "handedness");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_help_browser_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HELP_BROWSER_GIMP, "GIMP_HELP_BROWSER_GIMP", "gimp" },
+    { GIMP_HELP_BROWSER_WEB_BROWSER, "GIMP_HELP_BROWSER_WEB_BROWSER", "web-browser" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HELP_BROWSER_GIMP, NC_("help-browser-type", "GIMP help browser"), NULL },
+    { GIMP_HELP_BROWSER_WEB_BROWSER, NC_("help-browser-type", "Web browser"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpHelpBrowserType", values);
+      gimp_type_set_translation_context (type, "help-browser-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_icon_size_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ICON_SIZE_AUTO, "GIMP_ICON_SIZE_AUTO", "auto" },
+    { GIMP_ICON_SIZE_THEME, "GIMP_ICON_SIZE_THEME", "theme" },
+    { GIMP_ICON_SIZE_SMALL, "GIMP_ICON_SIZE_SMALL", "small" },
+    { GIMP_ICON_SIZE_MEDIUM, "GIMP_ICON_SIZE_MEDIUM", "medium" },
+    { GIMP_ICON_SIZE_LARGE, "GIMP_ICON_SIZE_LARGE", "large" },
+    { GIMP_ICON_SIZE_HUGE, "GIMP_ICON_SIZE_HUGE", "huge" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ICON_SIZE_AUTO, NC_("icon-size", "Guess ideal size"), NULL },
+    { GIMP_ICON_SIZE_THEME, NC_("icon-size", "Theme-set size"), NULL },
+    { GIMP_ICON_SIZE_SMALL, NC_("icon-size", "Small size"), NULL },
+    { GIMP_ICON_SIZE_MEDIUM, NC_("icon-size", "Medium size"), NULL },
+    { GIMP_ICON_SIZE_LARGE, NC_("icon-size", "Large size"), NULL },
+    { GIMP_ICON_SIZE_HUGE, NC_("icon-size", "Huge size"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpIconSize", values);
+      gimp_type_set_translation_context (type, "icon-size");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_position_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_POSITION_TOP, "GIMP_POSITION_TOP", "top" },
+    { GIMP_POSITION_BOTTOM, "GIMP_POSITION_BOTTOM", "bottom" },
+    { GIMP_POSITION_LEFT, "GIMP_POSITION_LEFT", "left" },
+    { GIMP_POSITION_RIGHT, "GIMP_POSITION_RIGHT", "right" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_POSITION_TOP, NC_("position", "Top"), NULL },
+    { GIMP_POSITION_BOTTOM, NC_("position", "Bottom"), NULL },
+    { GIMP_POSITION_LEFT, NC_("position", "Left"), NULL },
+    { GIMP_POSITION_RIGHT, NC_("position", "Right"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpPosition", values);
+      gimp_type_set_translation_context (type, "position");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_space_bar_action_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_SPACE_BAR_ACTION_NONE, "GIMP_SPACE_BAR_ACTION_NONE", "none" },
+    { GIMP_SPACE_BAR_ACTION_PAN, "GIMP_SPACE_BAR_ACTION_PAN", "pan" },
+    { GIMP_SPACE_BAR_ACTION_MOVE, "GIMP_SPACE_BAR_ACTION_MOVE", "move" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_SPACE_BAR_ACTION_NONE, NC_("space-bar-action", "No action"), NULL },
+    { GIMP_SPACE_BAR_ACTION_PAN, NC_("space-bar-action", "Pan view"), NULL },
+    { GIMP_SPACE_BAR_ACTION_MOVE, NC_("space-bar-action", "Switch to Move tool"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpSpaceBarAction", values);
+      gimp_type_set_translation_context (type, "space-bar-action");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_tool_group_menu_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_CLICK, "GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_CLICK", "click" },
+    { GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER, "GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER", "hover" },
+    { GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER_SINGLE_COLUMN, "GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER_SINGLE_COLUMN", "hover-single-column" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_CLICK, NC_("tool-group-menu-mode", "Show on click"), NULL },
+    { GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER, NC_("tool-group-menu-mode", "Show on hover"), NULL },
+    { GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER_SINGLE_COLUMN, NC_("tool-group-menu-mode", "Show on hover in single column"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpToolGroupMenuMode", values);
+      gimp_type_set_translation_context (type, "tool-group-menu-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_window_hint_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_WINDOW_HINT_NORMAL, "GIMP_WINDOW_HINT_NORMAL", "normal" },
+    { GIMP_WINDOW_HINT_UTILITY, "GIMP_WINDOW_HINT_UTILITY", "utility" },
+    { GIMP_WINDOW_HINT_KEEP_ABOVE, "GIMP_WINDOW_HINT_KEEP_ABOVE", "keep-above" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_WINDOW_HINT_NORMAL, NC_("window-hint", "Normal window"), NULL },
+    { GIMP_WINDOW_HINT_UTILITY, NC_("window-hint", "Utility window"), NULL },
+    { GIMP_WINDOW_HINT_KEEP_ABOVE, NC_("window-hint", "Keep above"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpWindowHint", values);
+      gimp_type_set_translation_context (type, "window-hint");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_zoom_quality_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ZOOM_QUALITY_LOW, "GIMP_ZOOM_QUALITY_LOW", "low" },
+    { GIMP_ZOOM_QUALITY_HIGH, "GIMP_ZOOM_QUALITY_HIGH", "high" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ZOOM_QUALITY_LOW, NC_("zoom-quality", "Low"), NULL },
+    { GIMP_ZOOM_QUALITY_HIGH, NC_("zoom-quality", "High"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpZoomQuality", values);
+      gimp_type_set_translation_context (type, "zoom-quality");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/config/config-enums.h b/app/config/config-enums.h
new file mode 100644
index 0000000..c2d30bb
--- /dev/null
+++ b/app/config/config-enums.h
@@ -0,0 +1,173 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONFIG_ENUMS_H__
+#define __CONFIG_ENUMS_H__
+
+
+#define GIMP_TYPE_CANVAS_PADDING_MODE (gimp_canvas_padding_mode_get_type ())
+
+GType gimp_canvas_padding_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CANVAS_PADDING_MODE_DEFAULT,      /*< desc="From theme"        >*/
+  GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK,  /*< desc="Light check color" >*/
+  GIMP_CANVAS_PADDING_MODE_DARK_CHECK,   /*< desc="Dark check color"  >*/
+  GIMP_CANVAS_PADDING_MODE_CUSTOM,       /*< desc="Custom color"      >*/
+  GIMP_CANVAS_PADDING_MODE_RESET = -1    /*< skip >*/
+} GimpCanvasPaddingMode;
+
+
+#define GIMP_TYPE_CURSOR_FORMAT (gimp_cursor_format_get_type ())
+
+GType gimp_cursor_format_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CURSOR_FORMAT_BITMAP, /*< desc="Black & white" >*/
+  GIMP_CURSOR_FORMAT_PIXBUF  /*< desc="Fancy"         >*/
+} GimpCursorFormat;
+
+
+#define GIMP_TYPE_CURSOR_MODE (gimp_cursor_mode_get_type ())
+
+GType gimp_cursor_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CURSOR_MODE_TOOL_ICON,       /*< desc="Tool icon"                >*/
+  GIMP_CURSOR_MODE_TOOL_CROSSHAIR,  /*< desc="Tool icon with crosshair" >*/
+  GIMP_CURSOR_MODE_CROSSHAIR        /*< desc="Crosshair only"           >*/
+} GimpCursorMode;
+
+
+#define GIMP_TYPE_EXPORT_FILE_TYPE (gimp_export_file_type_get_type ())
+
+GType gimp_export_file_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_EXPORT_FILE_PNG,  /*< desc="PNG Image"                >*/
+  GIMP_EXPORT_FILE_JPG,  /*< desc="JPEG Image"               >*/
+  GIMP_EXPORT_FILE_ORA,  /*< desc="OpenRaster Image"         >*/
+  GIMP_EXPORT_FILE_PSD,  /*< desc="Photoshop Image"          >*/
+  GIMP_EXPORT_FILE_PDF,  /*< desc="Portable Document Format" >*/
+  GIMP_EXPORT_FILE_TIF,  /*< desc="TIFF Image"               >*/
+  GIMP_EXPORT_FILE_BMP,  /*< desc="Windows BMP Image"        >*/
+  GIMP_EXPORT_FILE_WEBP, /*< desc="WebP Image"               >*/
+} GimpExportFileType;
+
+
+#define GIMP_TYPE_HANDEDNESS (gimp_handedness_get_type ())
+
+GType gimp_handedness_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HANDEDNESS_LEFT, /*< desc="Left-handed"  >*/
+  GIMP_HANDEDNESS_RIGHT /*< desc="Right-handed" >*/
+} GimpHandedness;
+
+
+#define GIMP_TYPE_HELP_BROWSER_TYPE (gimp_help_browser_type_get_type ())
+
+GType gimp_help_browser_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HELP_BROWSER_GIMP,        /*< desc="GIMP help browser" >*/
+  GIMP_HELP_BROWSER_WEB_BROWSER  /*< desc="Web browser"       >*/
+} GimpHelpBrowserType;
+
+
+#define GIMP_TYPE_ICON_SIZE (gimp_icon_size_get_type ())
+
+GType gimp_icon_size_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_ICON_SIZE_AUTO,    /*< desc="Guess ideal size" > */
+  GIMP_ICON_SIZE_THEME,   /*< desc="Theme-set size"   > */
+  GIMP_ICON_SIZE_SMALL,   /*< desc="Small size"       > */
+  GIMP_ICON_SIZE_MEDIUM,  /*< desc="Medium size"      > */
+  GIMP_ICON_SIZE_LARGE,   /*< desc="Large size"       > */
+  GIMP_ICON_SIZE_HUGE     /*< desc="Huge size"        > */
+} GimpIconSize;
+
+
+#define GIMP_TYPE_POSITION (gimp_position_get_type ())
+
+GType gimp_position_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_POSITION_TOP,    /*< desc="Top" >*/
+  GIMP_POSITION_BOTTOM, /*< desc="Bottom" >*/
+  GIMP_POSITION_LEFT,   /*< desc="Left"  >*/
+  GIMP_POSITION_RIGHT   /*< desc="Right" >*/
+} GimpPosition;
+
+
+#define GIMP_TYPE_SPACE_BAR_ACTION (gimp_space_bar_action_get_type ())
+
+GType gimp_space_bar_action_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_SPACE_BAR_ACTION_NONE,  /*< desc="No action"           >*/
+  GIMP_SPACE_BAR_ACTION_PAN,   /*< desc="Pan view"            >*/
+  GIMP_SPACE_BAR_ACTION_MOVE   /*< desc="Switch to Move tool" >*/
+} GimpSpaceBarAction;
+
+
+#define GIMP_TYPE_TOOL_GROUP_MENU_MODE (gimp_tool_group_menu_mode_get_type ())
+
+GType gimp_tool_group_menu_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_CLICK,               /*< desc="Show on click"                   >*/
+  GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER,               /*< desc="Show on hover"                   >*/
+  GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER_SINGLE_COLUMN  /*< desc="Show on hover in single column"  >*/
+} GimpToolGroupMenuMode;
+
+
+#define GIMP_TYPE_WINDOW_HINT (gimp_window_hint_get_type ())
+
+GType gimp_window_hint_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_WINDOW_HINT_NORMAL,     /*< desc="Normal window"  >*/
+  GIMP_WINDOW_HINT_UTILITY,    /*< desc="Utility window" >*/
+  GIMP_WINDOW_HINT_KEEP_ABOVE  /*< desc="Keep above"     >*/
+} GimpWindowHint;
+
+
+#define GIMP_TYPE_ZOOM_QUALITY (gimp_zoom_quality_get_type ())
+
+GType gimp_zoom_quality_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_ZOOM_QUALITY_LOW,   /*< desc="Low"  >*/
+  GIMP_ZOOM_QUALITY_HIGH   /*< desc="High" >*/
+} GimpZoomQuality;
+
+
+#endif /* __CONFIG_ENUMS_H__ */
diff --git a/app/config/config-types.h b/app/config/config-types.h
new file mode 100644
index 0000000..40b0802
--- /dev/null
+++ b/app/config/config-types.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpConfig typedefs
+ * Copyright (C) 2001-2002  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+
+
+#include "libgimpconfig/gimpconfigtypes.h"
+
+#include "config/config-enums.h"
+
+
+#define GIMP_OPACITY_TRANSPARENT      0.0
+#define GIMP_OPACITY_OPAQUE           1.0
+
+
+typedef struct _GimpGeglConfig       GimpGeglConfig;
+typedef struct _GimpCoreConfig       GimpCoreConfig;
+typedef struct _GimpDisplayConfig    GimpDisplayConfig;
+typedef struct _GimpGuiConfig        GimpGuiConfig;
+typedef struct _GimpDialogConfig     GimpDialogConfig;
+typedef struct _GimpLangRc           GimpLangRc;
+typedef struct _GimpPluginConfig     GimpPluginConfig;
+typedef struct _GimpRc               GimpRc;
+
+typedef struct _GimpXmlParser        GimpXmlParser;
+
+typedef struct _GimpDisplayOptions   GimpDisplayOptions;
+
+/* should be in core/core-types.h */
+typedef struct _GimpGrid             GimpGrid;
+typedef struct _GimpTemplate         GimpTemplate;
+
+
+/* for now these are defines, but can be turned into something
+ * fancier for nicer debugging
+ */
+#define gimp_assert             g_assert
+#define gimp_assert_not_reached g_assert_not_reached
+
+
+#endif /* __CONFIG_TYPES_H__ */
diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c
new file mode 100644
index 0000000..1a2b376
--- /dev/null
+++ b/app/config/gimpconfig-dump.c
@@ -0,0 +1,644 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpConfig object property dumper.
+ * Copyright (C) 2001-2006  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifdef G_OS_WIN32
+#include <gio/gwin32outputstream.h>
+#else
+#include <gio/gunixoutputstream.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimpconfig-dump.h"
+#include "gimprc.h"
+
+
+
+static void    dump_gimprc_system   (GimpConfig       *rc,
+                                     GimpConfigWriter *writer,
+                                     GOutputStream    *output);
+static void    dump_gimprc_manpage  (GimpConfig       *rc,
+                                     GimpConfigWriter *writer,
+                                     GOutputStream    *output);
+static gchar * dump_describe_param  (GParamSpec       *param_spec);
+static void    dump_with_linebreaks (GOutputStream    *output,
+                                     const gchar      *text);
+
+
+gboolean
+gimp_config_dump (GObject              *gimp,
+                  GimpConfigDumpFormat  format)
+{
+  GOutputStream    *output;
+  GimpConfigWriter *writer;
+  GimpConfig       *rc;
+
+  g_return_val_if_fail (G_IS_OBJECT (gimp), FALSE);
+
+  rc = g_object_new (GIMP_TYPE_RC,
+                     "gimp", gimp,
+                     NULL);
+
+#ifdef G_OS_WIN32
+  output = g_win32_output_stream_new ((gpointer) 1, FALSE);
+#else
+  output = g_unix_output_stream_new (1, FALSE);
+#endif
+
+  writer = gimp_config_writer_new_stream (output, NULL, NULL);
+
+  switch (format)
+    {
+    case GIMP_CONFIG_DUMP_NONE:
+      break;
+
+    case GIMP_CONFIG_DUMP_GIMPRC:
+      gimp_config_writer_comment (writer,
+                                  "Dump of the GIMP default configuration");
+      gimp_config_writer_linefeed (writer);
+      gimp_config_serialize_properties (rc, writer);
+      gimp_config_writer_linefeed (writer);
+      break;
+
+    case GIMP_CONFIG_DUMP_GIMPRC_SYSTEM:
+      dump_gimprc_system (rc, writer, output);
+      break;
+
+    case GIMP_CONFIG_DUMP_GIMPRC_MANPAGE:
+      dump_gimprc_manpage (rc, writer, output);
+      break;
+    }
+
+  gimp_config_writer_finish (writer, NULL, NULL);
+  g_object_unref (output);
+  g_object_unref (rc);
+
+  return TRUE;
+}
+
+
+static const gchar system_gimprc_header[] =
+"This is the system-wide gimprc file.  Any change made in this file "
+"will affect all users of this system, provided that they are not "
+"overriding the default values in their personal gimprc file.\n"
+"\n"
+"Lines that start with a '#' are comments. Blank lines are ignored.\n"
+"\n"
+"By default everything in this file is commented out.  The file then "
+"documents the default values and shows what changes are possible.\n"
+"\n"
+"The variable ${gimp_dir} is set to the value of the environment "
+"variable GIMP2_DIRECTORY or, if that is not set, the compiled-in "
+"default value is used.  If GIMP2_DIRECTORY is not an absolute path, "
+"it is interpreted relative to your home directory.";
+
+static void
+dump_gimprc_system (GimpConfig       *rc,
+                    GimpConfigWriter *writer,
+                    GOutputStream    *output)
+{
+  GObjectClass  *klass;
+  GParamSpec   **property_specs;
+  guint          n_property_specs;
+  guint          i;
+
+  gimp_config_writer_comment (writer, system_gimprc_header);
+  gimp_config_writer_linefeed (writer);
+
+  klass = G_OBJECT_GET_CLASS (rc);
+  property_specs = g_object_class_list_properties (klass, &n_property_specs);
+
+  for (i = 0; i < n_property_specs; i++)
+    {
+      GParamSpec *prop_spec = property_specs[i];
+      gchar      *comment;
+
+      if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE))
+        continue;
+
+      if (prop_spec->flags & GIMP_CONFIG_PARAM_IGNORE)
+        continue;
+
+      comment = dump_describe_param (prop_spec);
+      if (comment)
+        {
+          gimp_config_writer_comment (writer, comment);
+          g_free (comment);
+        }
+
+      gimp_config_writer_comment_mode (writer, TRUE);
+      gimp_config_writer_linefeed (writer);
+
+      if (! strcmp (prop_spec->name, "num-processors"))
+        {
+          gimp_config_writer_open (writer, "num-processors");
+          gimp_config_writer_printf (writer, "1");
+          gimp_config_writer_close (writer);
+        }
+      else if (! strcmp (prop_spec->name, "tile-cache-size"))
+        {
+          gimp_config_writer_open (writer, "tile-cache-size");
+          gimp_config_writer_printf (writer, "2g");
+          gimp_config_writer_close (writer);
+        }
+      else if (! strcmp (prop_spec->name, "undo-size"))
+        {
+          gimp_config_writer_open (writer, "undo-size");
+          gimp_config_writer_printf (writer, "1g");
+          gimp_config_writer_close (writer);
+        }
+      else if (! strcmp (prop_spec->name, "mypaint-brush-path"))
+        {
+          gchar *path = g_strdup_printf ("@mypaint_brushes_dir@%s"
+                                         "~/.mypaint/brushes",
+                                         G_SEARCHPATH_SEPARATOR_S);
+
+          gimp_config_writer_open (writer, "mypaint-brush-path");
+          gimp_config_writer_string (writer, path);
+          gimp_config_writer_close (writer);
+
+          g_free (path);
+        }
+      else
+        {
+          gimp_config_serialize_property (rc, prop_spec, writer);
+        }
+
+      gimp_config_writer_comment_mode (writer, FALSE);
+      gimp_config_writer_linefeed (writer);
+    }
+
+  g_free (property_specs);
+}
+
+
+static const gchar man_page_header[] =
+".\\\" This man-page is auto-generated by gimp --dump-gimprc-manpage.\n"
+"\n"
+".TH GIMPRC 5 \"Version @GIMP_VERSION@\" \"GIMP Manual Pages\"\n"
+".SH NAME\n"
+"gimprc \\- gimp configuration file\n"
+".SH DESCRIPTION\n"
+"The\n"
+".B gimprc\n"
+"file is a configuration file read by GIMP when it starts up.  There\n"
+"are two of these: one system-wide one stored in\n"
+"@gimpsysconfdir@/gimprc and a per-user @manpage_gimpdir@/gimprc\n"
+"which may override system settings.\n"
+"\n"
+"Comments are introduced by a hash sign (#), and continue until the end\n"
+"of the line.  Blank lines are ignored.\n"
+"\n"
+"The\n"
+".B gimprc\n"
+"file associates values with properties.  These properties may be set\n"
+"by lisp-like assignments of the form:\n"
+".IP\n"
+"\\f3(\\f2property\\-name\\ value\\f3)\\f1\n"
+".TP\n"
+"where:\n"
+".TP 10\n"
+".I property\\-name\n"
+"is one of the property names described below.\n"
+".TP\n"
+".I value\n"
+"is the value the property is to be set to.\n"
+".PP\n"
+"\n"
+"Either spaces or tabs may be used to separate the name from the value.\n"
+".PP\n"
+".SH PROPERTIES\n"
+"Valid properties and their default values are:\n"
+"\n";
+
+static const gchar *man_page_path =
+".PP\n"
+".SH PATH EXPANSION\n"
+"Strings of type PATH are expanded in a manner similar to\n"
+".BR bash (1).\n"
+"Specifically: tilde (~) is expanded to the user's home directory. Note that\n"
+"the bash feature of being able to refer to other user's home directories\n"
+"by writing ~userid/ is not valid in this file.\n"
+"\n"
+"${variable} is expanded to the current value of an environment variable.\n"
+"There are a few variables that are pre-defined:\n"
+".TP\n"
+".I gimp_dir\n"
+"The personal gimp directory which is set to the value of the environment\n"
+"variable GIMP2_DIRECTORY or to @manpage_gimpdir@.\n"
+".TP\n"
+".I gimp_data_dir\n"
+"Base for paths to shareable data, which is set to the value of the\n"
+"environment variable GIMP2_DATADIR or to the compiled-in default value\n"
+"@gimpdatadir@.\n"
+".TP\n"
+".I gimp_plug_in_dir\n"
+"Base to paths for architecture-specific plug-ins and modules, which is set\n"
+"to the value of the environment variable GIMP2_PLUGINDIR or to the\n"
+"compiled-in default value @gimpplugindir@.\n"
+".TP\n"
+".I gimp_sysconf_dir\n"
+"Path to configuration files, which is set to the value of the environment\n"
+"variable GIMP2_SYSCONFDIR or to the compiled-in default value \n"
+"@gimpsysconfdir@.\n"
+".TP\n"
+".I gimp_cache_dir\n"
+"Path to cached files, which is set to the value of the environment\n"
+"variable GIMP2_CACHEDIR or to the system default for per-user cached files.\n"
+".TP\n"
+".I gimp_temp_dir\n"
+"Path to temporary files, which is set to the value of the environment\n"
+"variable GIMP2_TEMPDIR or to the system default for temporary files.\n"
+"\n";
+
+static const gchar man_page_footer[] =
+".SH FILES\n"
+".TP\n"
+".I @gimpsysconfdir@/gimprc\n"
+"System-wide configuration file\n"
+".TP\n"
+".I @manpage_gimpdir@/gimprc\n"
+"Per-user configuration file\n"
+"\n"
+".SH \"SEE ALSO\"\n"
+".BR gimp (1)\n";
+
+
+static void
+dump_gimprc_manpage (GimpConfig       *rc,
+                     GimpConfigWriter *writer,
+                     GOutputStream    *output)
+{
+  GObjectClass  *klass;
+  GParamSpec   **property_specs;
+  guint          n_property_specs;
+  guint          i;
+
+  g_output_stream_printf (output, NULL, NULL, NULL,
+                          "%s", man_page_header);
+
+  klass = G_OBJECT_GET_CLASS (rc);
+  property_specs = g_object_class_list_properties (klass, &n_property_specs);
+
+  for (i = 0; i < n_property_specs; i++)
+    {
+      GParamSpec *prop_spec = property_specs[i];
+      gchar      *desc;
+      gboolean    success;
+
+      if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE))
+        continue;
+
+      if (prop_spec->flags & GIMP_CONFIG_PARAM_IGNORE)
+        continue;
+
+      g_output_stream_printf (output, NULL, NULL, NULL,
+                              ".TP\n");
+
+      if (! strcmp (prop_spec->name, "num-processors"))
+        {
+          gimp_config_writer_open (writer, "num-processors");
+          gimp_config_writer_printf (writer, "1");
+          gimp_config_writer_close (writer);
+
+          success = TRUE;
+        }
+      else if (! strcmp (prop_spec->name, "tile-cache-size"))
+        {
+          gimp_config_writer_open (writer, "tile-cache-size");
+          gimp_config_writer_printf (writer, "2g");
+          gimp_config_writer_close (writer);
+
+          success = TRUE;
+        }
+      else if (! strcmp (prop_spec->name, "undo-size"))
+        {
+          gimp_config_writer_open (writer, "undo-size");
+          gimp_config_writer_printf (writer, "1g");
+          gimp_config_writer_close (writer);
+
+          success = TRUE;
+        }
+      else if (! strcmp (prop_spec->name, "mypaint-brush-path"))
+        {
+          gchar *path = g_strdup_printf ("@mypaint_brushes_dir@%s"
+                                         "~/.mypaint/brushes",
+                                         G_SEARCHPATH_SEPARATOR_S);
+
+          gimp_config_writer_open (writer, "mypaint-brush-path");
+          gimp_config_writer_string (writer, path);
+          gimp_config_writer_close (writer);
+
+          g_free (path);
+
+          success = TRUE;
+        }
+      else
+        {
+          success = gimp_config_serialize_property (rc, prop_spec, writer);
+        }
+
+      if (success)
+        {
+          g_output_stream_printf (output, NULL, NULL, NULL,
+                                  "\n");
+
+          desc = dump_describe_param (prop_spec);
+
+          dump_with_linebreaks (output, desc);
+
+          g_output_stream_printf (output, NULL, NULL, NULL,
+                                  "\n");
+
+          g_free (desc);
+        }
+    }
+
+  g_free (property_specs);
+
+  g_output_stream_printf (output, NULL, NULL, NULL,
+                          "%s", man_page_path);
+  g_output_stream_printf (output, NULL, NULL, NULL,
+                          "%s", man_page_footer);
+}
+
+
+static const gchar display_format_description[] =
+"This is a format string; certain % character sequences are recognised and "
+"expanded as follows:\n"
+"\n"
+"%%  literal percent sign\n"
+"%f  bare filename, or \"Untitled\"\n"
+"%F  full path to file, or \"Untitled\"\n"
+"%p  PDB image id\n"
+"%i  view instance number\n"
+"%t  image type (RGB, grayscale, indexed)\n"
+"%z  zoom factor as a percentage\n"
+"%s  source scale factor\n"
+"%d  destination scale factor\n"
+"%Dx expands to x if the image is dirty, the empty string otherwise\n"
+"%Cx expands to x if the image is clean, the empty string otherwise\n"
+"%B  expands to (modified) if the image is dirty, the empty string otherwise\n"
+"%A  expands to (clean) if the image is clean, the empty string otherwise\n"
+"%Nx expands to x if the image is export-dirty, the empty string otherwise\n"
+"%Ex expands to x if the image is export-clean, the empty string otherwise\n"
+"%l  the number of layers\n"
+"%L  the number of layers (long form)\n"
+"%m  memory used by the image\n"
+"%n  the name of the active layer/channel\n"
+"%P  the PDB id of the active layer/channel\n"
+"%w  image width in pixels\n"
+"%W  image width in real-world units\n"
+"%h  image height in pixels\n"
+"%H  image height in real-world units\n"
+"%M  the image size expressed in megapixels\n"
+"%u  unit symbol\n"
+"%U  unit abbreviation\n"
+"%x  the width of the active layer/channel in pixels\n"
+"%X  the width of the active layer/channel in real-world units\n"
+"%y  the height of the active layer/channel in pixels\n"
+"%Y  the height of the active layer/channel in real-world units\n"
+"%o  the name of the image's color profile\n\n";
+
+
+static gchar *
+dump_describe_param (GParamSpec *param_spec)
+{
+  const gchar *blurb  = g_param_spec_get_blurb (param_spec);
+  const gchar *values = NULL;
+
+  if (!blurb)
+    {
+      g_warning ("FIXME: Property '%s' has no blurb.", param_spec->name);
+
+      blurb = g_strdup_printf ("The %s property has no description.",
+                               param_spec->name);
+    }
+
+  if (GIMP_IS_PARAM_SPEC_RGB (param_spec))
+    {
+      if (gimp_param_spec_rgb_has_alpha (param_spec))
+        values =
+          "The color is specified in the form (color-rgba red green blue "
+          "alpha) with channel values as floats in the range of 0.0 to 1.0.";
+      else
+        values =
+          "The color is specified in the form (color-rgb red green blue) "
+          "with channel values as floats in the range of 0.0 to 1.0.";
+    }
+  else if (GIMP_IS_PARAM_SPEC_MEMSIZE (param_spec))
+    {
+      values =
+        "The integer size can contain a suffix of 'B', 'K', 'M' or 'G' which "
+        "makes GIMP interpret the size as being specified in bytes, kilobytes, "
+        "megabytes or gigabytes. If no suffix is specified the size defaults "
+        "to being specified in kilobytes.";
+    }
+  else if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (param_spec))
+    {
+      switch (gimp_param_spec_config_path_type (param_spec))
+        {
+        case GIMP_CONFIG_PATH_FILE:
+          values = "This is a single filename.";
+          break;
+
+        case GIMP_CONFIG_PATH_FILE_LIST:
+          switch (G_SEARCHPATH_SEPARATOR)
+            {
+            case ':':
+              values = "This is a colon-separated list of files.";
+              break;
+            case ';':
+              values = "This is a semicolon-separated list of files.";
+              break;
+            default:
+              g_warning ("unhandled G_SEARCHPATH_SEPARATOR value");
+              break;
+            }
+          break;
+
+        case GIMP_CONFIG_PATH_DIR:
+          values = "This is a single folder.";
+          break;
+
+        case GIMP_CONFIG_PATH_DIR_LIST:
+          switch (G_SEARCHPATH_SEPARATOR)
+            {
+            case ':':
+              values = "This is a colon-separated list of folders to search.";
+              break;
+            case ';':
+              values = "This is a semicolon-separated list of folders to search.";
+              break;
+            default:
+              g_warning ("unhandled G_SEARCHPATH_SEPARATOR value");
+              break;
+            }
+          break;
+        }
+    }
+  else if (GIMP_IS_PARAM_SPEC_UNIT (param_spec))
+    {
+      values =
+        "The unit can be one inches, millimeters, points or picas plus "
+        "those in your user units database.";
+    }
+  else if (g_type_is_a (param_spec->value_type, GIMP_TYPE_CONFIG))
+    {
+      values = "This is a parameter list.";
+    }
+  else
+    {
+      switch (G_TYPE_FUNDAMENTAL (param_spec->value_type))
+        {
+        case G_TYPE_BOOLEAN:
+          values = "Possible values are yes and no.";
+          break;
+        case G_TYPE_INT:
+        case G_TYPE_UINT:
+        case G_TYPE_LONG:
+        case G_TYPE_ULONG:
+          values = "This is an integer value.";
+          break;
+        case G_TYPE_FLOAT:
+        case G_TYPE_DOUBLE:
+          values = "This is a float value.";
+          break;
+        case G_TYPE_STRING:
+          /* eek */
+          if (strcmp (g_param_spec_get_name (param_spec), "image-title-format")
+              &&
+              strcmp (g_param_spec_get_name (param_spec), "image-status-format"))
+            {
+              values = "This is a string value.";
+            }
+          else
+            {
+              values = display_format_description;
+            }
+          break;
+        case G_TYPE_ENUM:
+          {
+            GEnumClass *enum_class;
+            GEnumValue *enum_value;
+            GString    *str;
+            gint        i;
+
+            enum_class = g_type_class_peek (param_spec->value_type);
+
+            str = g_string_new (blurb);
+
+            g_string_append (str, "  Possible values are ");
+
+            for (i = 0, enum_value = enum_class->values;
+                 i < enum_class->n_values;
+                 i++, enum_value++)
+              {
+                g_string_append (str, enum_value->value_nick);
+
+                switch (enum_class->n_values - i)
+                  {
+                  case 1:
+                    g_string_append_c (str, '.');
+                    break;
+                  case 2:
+                    g_string_append (str, " and ");
+                    break;
+                  default:
+                    g_string_append (str, ", ");
+                    break;
+                  }
+              }
+
+            return g_string_free (str, FALSE);
+          }
+          break;
+        default:
+          break;
+        }
+    }
+
+  if (!values)
+    g_warning ("FIXME: Can't tell anything about a %s.",
+               g_type_name (param_spec->value_type));
+
+  if (strcmp (blurb, "") == 0)
+    return g_strdup_printf ("%s", values);
+  else
+    return g_strdup_printf ("%s  %s", blurb, values);
+}
+
+
+#define LINE_LENGTH 78
+
+static void
+dump_with_linebreaks (GOutputStream *output,
+                      const gchar   *text)
+{
+  gint len = strlen (text);
+
+  while (len > 0)
+    {
+      const gchar *t;
+      gint         i, space;
+
+      /*  groff doesn't like lines to start with a single quote  */
+      if (*text == '\'')
+        g_output_stream_printf (output, NULL, NULL, NULL,
+                                "\\&");  /*  a zero width space  */
+
+      for (t = text, i = 0, space = 0;
+           *t != '\n' && (i <= LINE_LENGTH || space == 0) && i < len;
+           t++, i++)
+        {
+          if (g_ascii_isspace (*t))
+            space = i;
+        }
+
+      if (i > LINE_LENGTH && space && *t != '\n')
+        i = space;
+
+      g_output_stream_write_all (output, text, i, NULL, NULL, NULL);
+      g_output_stream_printf (output, NULL, NULL, NULL,
+                              "\n");
+
+      if (*t == '\n')
+        g_output_stream_printf (output, NULL, NULL, NULL,
+                                ".br\n");
+
+      i++;
+
+      text += i;
+      len  -= i;
+    }
+}
diff --git a/app/config/gimpconfig-dump.h b/app/config/gimpconfig-dump.h
new file mode 100644
index 0000000..ead2da3
--- /dev/null
+++ b/app/config/gimpconfig-dump.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONFIG_DUMP_H__
+#define __GIMP_CONFIG_DUMP_H__
+
+
+typedef enum
+{
+  GIMP_CONFIG_DUMP_NONE,
+  GIMP_CONFIG_DUMP_GIMPRC,
+  GIMP_CONFIG_DUMP_GIMPRC_SYSTEM,
+  GIMP_CONFIG_DUMP_GIMPRC_MANPAGE
+} GimpConfigDumpFormat;
+
+
+gboolean  gimp_config_dump (GObject              *gimp,
+                            GimpConfigDumpFormat  format);
+
+
+#endif  /* __GIMP_CONFIG_DUMP_H__ */
diff --git a/app/config/gimpconfig-file.c b/app/config/gimpconfig-file.c
new file mode 100644
index 0000000..9823b8f
--- /dev/null
+++ b/app/config/gimpconfig-file.c
@@ -0,0 +1,241 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * File Utitility functions for GimpConfig.
+ * Copyright (C) 2001-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <sys/types.h>
+
+#include <gio/gio.h>
+#include <glib/gstdio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#ifdef G_OS_WIN32
+#include "libgimpbase/gimpwin32-io.h"
+#endif
+
+#include "config-types.h"
+
+#include "gimpconfig-file.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+gimp_config_file_copy (const gchar         *source,
+                       const gchar         *dest,
+                       const gchar         *old_options_pattern,
+                       GRegexEvalCallback   update_callback,
+                       GError             **error)
+{
+  gchar        buffer[8192];
+  FILE        *sfile;
+  FILE        *dfile;
+  GStatBuf     stat_buf;
+  gint         nbytes;
+  gint         unwritten_len = 0;
+  GRegex      *old_options_regexp = NULL;
+
+  if (old_options_pattern && update_callback)
+    {
+      old_options_regexp = g_regex_new (old_options_pattern, 0, 0, error);
+
+      /* error set by g_regex_new. */
+      if (! old_options_regexp)
+        return FALSE;
+    }
+
+  sfile = g_fopen (source, "rb");
+  if (sfile == NULL)
+    {
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   _("Could not open '%s' for reading: %s"),
+                   gimp_filename_to_utf8 (source), g_strerror (errno));
+      if (old_options_regexp)
+        g_regex_unref (old_options_regexp);
+      return FALSE;
+    }
+
+  dfile = g_fopen (dest, "wb");
+  if (dfile == NULL)
+    {
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   _("Could not open '%s' for writing: %s"),
+                   gimp_filename_to_utf8 (dest), g_strerror (errno));
+      fclose (sfile);
+      if (old_options_regexp)
+        g_regex_unref (old_options_regexp);
+      return FALSE;
+    }
+
+  while ((nbytes = fread (buffer + unwritten_len, 1,
+                          sizeof (buffer) - unwritten_len, sfile)) > 0 || unwritten_len)
+    {
+      size_t read_len = nbytes + unwritten_len;
+      size_t write_len;
+      gchar* eol = NULL;
+      gchar* write_bytes = NULL;
+
+      if (old_options_regexp && update_callback)
+        {
+          eol = g_strrstr_len (buffer, read_len, "\n");
+          if (eol)
+            {
+              *eol = '\0';
+              read_len = strlen (buffer) + 1;
+              *eol++ = '\n';
+            }
+          else if (! feof (sfile))
+            {
+              gchar format[256];
+
+              /* We are in unlikely case where a single config line is
+               * longer than the buffer!
+               */
+
+              g_snprintf (format, sizeof (format),
+                          _("Error parsing '%%s': line longer than %s characters."),
+                          G_GINT64_FORMAT);
+
+              g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+                           format,
+                           gimp_filename_to_utf8 (source),
+                           (gint64) sizeof (buffer));
+
+              fclose (sfile);
+              fclose (dfile);
+              g_regex_unref (old_options_regexp);
+              return FALSE;
+            }
+
+          write_bytes = g_regex_replace_eval (old_options_regexp, buffer,
+                                              read_len, 0, 0, update_callback,
+                                              NULL, error);
+          if (write_bytes == NULL)
+            {
+              /* error already set. */
+              fclose (sfile);
+              fclose (dfile);
+              g_regex_unref (old_options_regexp);
+              return FALSE;
+            }
+          write_len = strlen (write_bytes);
+        }
+      else
+        {
+          write_bytes = buffer;
+          write_len = read_len;
+        }
+
+      if (fwrite (write_bytes, 1, write_len, dfile) < write_len)
+        {
+          g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                       _("Error writing '%s': %s"),
+                       gimp_filename_to_utf8 (dest), g_strerror (errno));
+          if (old_options_regexp && update_callback)
+            {
+              g_free (write_bytes);
+              g_regex_unref (old_options_regexp);
+            }
+          fclose (sfile);
+          fclose (dfile);
+          return FALSE;
+        }
+
+      if (old_options_regexp && update_callback)
+        {
+          g_free (write_bytes);
+
+          if (eol)
+            {
+              unwritten_len = nbytes + unwritten_len - read_len;
+              memmove (buffer, eol, unwritten_len);
+            }
+          else
+            /* EOF */
+            break;
+        }
+    }
+
+  if (ferror (sfile))
+    {
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   _("Error reading '%s': %s"),
+                   gimp_filename_to_utf8 (source), g_strerror (errno));
+      fclose (sfile);
+      fclose (dfile);
+      if (old_options_regexp)
+        g_regex_unref (old_options_regexp);
+      return FALSE;
+    }
+
+  fclose (sfile);
+
+  if (fclose (dfile) == EOF)
+    {
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   _("Error writing '%s': %s"),
+                   gimp_filename_to_utf8 (dest), g_strerror (errno));
+      if (old_options_regexp)
+        g_regex_unref (old_options_regexp);
+      return FALSE;
+    }
+
+  if (g_stat (source, &stat_buf) == 0)
+    {
+      g_chmod (dest, stat_buf.st_mode);
+    }
+
+  if (old_options_regexp)
+    g_regex_unref (old_options_regexp);
+  return TRUE;
+}
+
+gboolean
+gimp_config_file_backup_on_error (GFile        *file,
+                                  const gchar  *name,
+                                  GError      **error)
+{
+  gchar    *path;
+  gchar    *backup;
+  gboolean  success;
+
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  path   = g_file_get_path (file);
+  backup = g_strconcat (path, "~", NULL);
+
+  success = gimp_config_file_copy (path, backup, NULL, NULL, error);
+
+  if (success)
+    g_message (_("There was an error parsing your '%s' file. "
+                 "Default values will be used. A backup of your "
+                 "configuration has been created at '%s'."),
+               name, gimp_filename_to_utf8 (backup));
+
+  g_free (backup);
+  g_free (path);
+
+  return success;
+}
diff --git a/app/config/gimpconfig-file.h b/app/config/gimpconfig-file.h
new file mode 100644
index 0000000..fc61886
--- /dev/null
+++ b/app/config/gimpconfig-file.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * File utitility functions for GimpConfig.
+ * Copyright (C) 2001-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONFIG_FILE_H__
+#define __GIMP_CONFIG_FILE_H__
+
+
+gboolean   gimp_config_file_copy             (const gchar        *source,
+                                              const gchar        *dest,
+                                              const gchar        *old_options_regexp,
+                                              GRegexEvalCallback  update_callback,
+                                              GError            **error);
+
+gboolean   gimp_config_file_backup_on_error  (GFile              *file,
+                                              const gchar        *name,
+                                              GError            **error);
+
+
+#endif  /* __GIMP_CONFIG_FILE_H__ */
diff --git a/app/config/gimpconfig-utils.c b/app/config/gimpconfig-utils.c
new file mode 100644
index 0000000..fbe08d3
--- /dev/null
+++ b/app/config/gimpconfig-utils.c
@@ -0,0 +1,223 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * Utitility functions for GimpConfig.
+ * Copyright (C) 2001-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimpconfig-utils.h"
+
+
+static void
+gimp_config_connect_notify (GObject    *src,
+                            GParamSpec *param_spec,
+                            GObject    *dest)
+{
+  if (param_spec->flags & G_PARAM_READABLE)
+    {
+      GParamSpec *dest_spec;
+
+      dest_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (dest),
+                                                param_spec->name);
+
+      if (dest_spec                                         &&
+          (dest_spec->value_type == param_spec->value_type) &&
+          (dest_spec->flags & G_PARAM_WRITABLE)             &&
+          (dest_spec->flags & G_PARAM_CONSTRUCT_ONLY) == 0)
+        {
+          GValue value = G_VALUE_INIT;
+
+          g_value_init (&value, param_spec->value_type);
+
+          g_object_get_property (src,  param_spec->name, &value);
+
+          g_signal_handlers_block_by_func (dest,
+                                           gimp_config_connect_notify, src);
+          g_object_set_property (dest, param_spec->name, &value);
+          g_signal_handlers_unblock_by_func (dest,
+                                             gimp_config_connect_notify, src);
+
+          g_value_unset (&value);
+        }
+    }
+}
+
+/**
+ * gimp_config_connect:
+ * @a: a #GObject
+ * @b: another #GObject
+ * @property_name: the name of a property to connect or %NULL for all
+ *
+ * Connects the two object @a and @b in a way that property changes of
+ * one are propagated to the other. This is a two-way connection.
+ *
+ * If @property_name is %NULL the connection is setup for all
+ * properties. It is not required that @a and @b are of the same type.
+ * Only changes on properties that exist in both object classes and
+ * are of the same value_type are propagated.
+ **/
+void
+gimp_config_connect (GObject     *a,
+                     GObject     *b,
+                     const gchar *property_name)
+{
+  gchar *signal_name;
+
+  g_return_if_fail (a != b);
+  g_return_if_fail (G_IS_OBJECT (a) && G_IS_OBJECT (b));
+
+  if (property_name)
+    signal_name = g_strconcat ("notify::", property_name, NULL);
+  else
+    signal_name = "notify";
+
+  g_signal_connect_object (a, signal_name,
+                           G_CALLBACK (gimp_config_connect_notify),
+                           b, 0);
+  g_signal_connect_object (b, signal_name,
+                           G_CALLBACK (gimp_config_connect_notify),
+                           a, 0);
+
+  if (property_name)
+    g_free (signal_name);
+}
+
+static void
+gimp_config_connect_full_notify (GObject    *src,
+                                 GParamSpec *param_spec,
+                                 GObject    *dest)
+{
+  if (param_spec->flags & G_PARAM_READABLE)
+    {
+      gchar      *attach_key;
+      gchar      *dest_prop_name;
+      GParamSpec *dest_spec = NULL;
+
+      attach_key = g_strdup_printf ("%p-%s", dest, param_spec->name);
+      dest_prop_name = g_object_get_data (src, attach_key);
+      g_free (attach_key);
+
+      if (dest_prop_name)
+        dest_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (dest),
+                                                  dest_prop_name);
+
+      if (dest_spec                                         &&
+          (dest_spec->value_type == param_spec->value_type) &&
+          (dest_spec->flags & G_PARAM_WRITABLE)             &&
+          (dest_spec->flags & G_PARAM_CONSTRUCT_ONLY) == 0)
+        {
+          GValue value = G_VALUE_INIT;
+
+          g_value_init (&value, param_spec->value_type);
+
+          g_object_get_property (src,  param_spec->name, &value);
+
+          g_signal_handlers_block_by_func (dest,
+                                           gimp_config_connect_full_notify, src);
+          g_object_set_property (dest, dest_prop_name, &value);
+          g_signal_handlers_unblock_by_func (dest,
+                                             gimp_config_connect_full_notify, src);
+
+          g_value_unset (&value);
+        }
+    }
+}
+
+/**
+ * gimp_config_connect_full:
+ * @a: a #GObject
+ * @b: another #GObject
+ * @property_name_a: the name of a property of @a to connect
+ * @property_name_b: the name of a property of @b to connect
+ *
+ * Connects the two object @a and @b in a way that property changes of
+ * one are propagated to the other. This is a two-way connection.
+ *
+ * If @property_name is %NULL the connection is setup for all
+ * properties. It is not required that @a and @b are of the same type.
+ * Only changes on properties that exist in both object classes and
+ * are of the same value_type are propagated.
+ **/
+void
+gimp_config_connect_full (GObject     *a,
+                          GObject     *b,
+                          const gchar *property_name_a,
+                          const gchar *property_name_b)
+{
+  gchar *signal_name;
+  gchar *attach_key;
+
+  g_return_if_fail (a != b);
+  g_return_if_fail (G_IS_OBJECT (a) && G_IS_OBJECT (b));
+  g_return_if_fail (property_name_a != NULL);
+  g_return_if_fail (property_name_b != NULL);
+
+  signal_name = g_strconcat ("notify::", property_name_a, NULL);
+  attach_key  = g_strdup_printf ("%p-%s", b, property_name_a);
+
+  g_signal_connect_object (a, signal_name,
+                           G_CALLBACK (gimp_config_connect_full_notify),
+                           b, 0);
+  g_object_set_data_full (a, attach_key, g_strdup (property_name_b),
+                          (GDestroyNotify) g_free);
+
+  g_free (signal_name);
+  g_free (attach_key);
+
+  signal_name = g_strconcat ("notify::", property_name_b, NULL);
+  attach_key  = g_strdup_printf ("%p-%s", a, property_name_b);
+
+  g_signal_connect_object (b, signal_name,
+                           G_CALLBACK (gimp_config_connect_full_notify),
+                           a, 0);
+  g_object_set_data_full (b, attach_key, g_strdup (property_name_a),
+                          (GDestroyNotify) g_free);
+
+  g_free (signal_name);
+  g_free (attach_key);
+}
+
+/**
+ * gimp_config_disconnect:
+ * @a: a #GObject
+ * @b: another #GObject
+ *
+ * Removes a connection between @dest and @src that was previously set
+ * up using gimp_config_connect().
+ **/
+void
+gimp_config_disconnect (GObject *a,
+                        GObject *b)
+{
+  g_return_if_fail (G_IS_OBJECT (a) && G_IS_OBJECT (b));
+
+  g_signal_handlers_disconnect_by_func (b,
+                                        G_CALLBACK (gimp_config_connect_notify),
+                                        a);
+  g_signal_handlers_disconnect_by_func (a,
+                                        G_CALLBACK (gimp_config_connect_notify),
+                                        b);
+}
+
diff --git a/app/config/gimpconfig-utils.h b/app/config/gimpconfig-utils.h
new file mode 100644
index 0000000..7928ca9
--- /dev/null
+++ b/app/config/gimpconfig-utils.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * Utitility functions for GimpConfig.
+ * Copyright (C) 2001-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_CONFIG_UTILS_H__
+#define __APP_GIMP_CONFIG_UTILS_H__
+
+
+void   gimp_config_connect      (GObject     *a,
+                                 GObject     *b,
+                                 const gchar *property_name);
+void   gimp_config_connect_full (GObject     *a,
+                                 GObject     *b,
+                                 const gchar *property_name_a,
+                                 const gchar *property_name_b);
+void   gimp_config_disconnect   (GObject     *a,
+                                 GObject     *b);
+
+
+#endif  /* __APP_GIMP_CONFIG_UTILS_H__ */
diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c
new file mode 100644
index 0000000..823e808
--- /dev/null
+++ b/app/config/gimpcoreconfig.c
@@ -0,0 +1,1415 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpCoreConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifdef G_OS_WIN32
+#include <shlobj.h>
+
+/* Constant available since Shell32.dll 5.0 */
+#ifndef CSIDL_LOCAL_APPDATA
+#define CSIDL_LOCAL_APPDATA 0x001c
+#endif
+
+#endif
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "core/core-types.h"
+#include "core/gimp-utils.h"
+#include "core/gimpgrid.h"
+#include "core/gimptemplate.h"
+
+#include "gimprc-blurbs.h"
+#include "gimpcoreconfig.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_DEFAULT_BRUSH         "2. Hardness 050"
+#define GIMP_DEFAULT_DYNAMICS      "Dynamics Off"
+#define GIMP_DEFAULT_PATTERN       "Pine"
+#define GIMP_DEFAULT_PALETTE       "Default"
+#define GIMP_DEFAULT_GRADIENT      "FG to BG (RGB)"
+#define GIMP_DEFAULT_TOOL_PRESET   "Current Options"
+#define GIMP_DEFAULT_FONT          "Sans-serif"
+#define GIMP_DEFAULT_MYPAINT_BRUSH "Fixme"
+#define GIMP_DEFAULT_COMMENT       "Created with GIMP"
+
+
+enum
+{
+  PROP_0,
+  PROP_LANGUAGE,
+  PROP_INTERPOLATION_TYPE,
+  PROP_DEFAULT_THRESHOLD,
+  PROP_PLUG_IN_PATH,
+  PROP_MODULE_PATH,
+  PROP_INTERPRETER_PATH,
+  PROP_ENVIRON_PATH,
+  PROP_BRUSH_PATH,
+  PROP_BRUSH_PATH_WRITABLE,
+  PROP_DYNAMICS_PATH,
+  PROP_DYNAMICS_PATH_WRITABLE,
+  PROP_MYPAINT_BRUSH_PATH,
+  PROP_MYPAINT_BRUSH_PATH_WRITABLE,
+  PROP_PATTERN_PATH,
+  PROP_PATTERN_PATH_WRITABLE,
+  PROP_PALETTE_PATH,
+  PROP_PALETTE_PATH_WRITABLE,
+  PROP_GRADIENT_PATH,
+  PROP_GRADIENT_PATH_WRITABLE,
+  PROP_TOOL_PRESET_PATH,
+  PROP_TOOL_PRESET_PATH_WRITABLE,
+  PROP_FONT_PATH,
+  PROP_FONT_PATH_WRITABLE,
+  PROP_DEFAULT_BRUSH,
+  PROP_DEFAULT_DYNAMICS,
+  PROP_DEFAULT_MYPAINT_BRUSH,
+  PROP_DEFAULT_PATTERN,
+  PROP_DEFAULT_PALETTE,
+  PROP_DEFAULT_GRADIENT,
+  PROP_DEFAULT_TOOL_PRESET,
+  PROP_DEFAULT_FONT,
+  PROP_GLOBAL_BRUSH,
+  PROP_GLOBAL_DYNAMICS,
+  PROP_GLOBAL_PATTERN,
+  PROP_GLOBAL_PALETTE,
+  PROP_GLOBAL_GRADIENT,
+  PROP_GLOBAL_FONT,
+  PROP_DEFAULT_IMAGE,
+  PROP_DEFAULT_GRID,
+  PROP_UNDO_LEVELS,
+  PROP_UNDO_SIZE,
+  PROP_UNDO_PREVIEW_SIZE,
+  PROP_FILTER_HISTORY_SIZE,
+  PROP_PLUGINRC_PATH,
+  PROP_LAYER_PREVIEWS,
+  PROP_GROUP_LAYER_PREVIEWS,
+  PROP_LAYER_PREVIEW_SIZE,
+  PROP_THUMBNAIL_SIZE,
+  PROP_THUMBNAIL_FILESIZE_LIMIT,
+  PROP_COLOR_MANAGEMENT,
+  PROP_SAVE_DOCUMENT_HISTORY,
+  PROP_QUICK_MASK_COLOR,
+  PROP_IMPORT_PROMOTE_FLOAT,
+  PROP_IMPORT_PROMOTE_DITHER,
+  PROP_IMPORT_ADD_ALPHA,
+  PROP_IMPORT_RAW_PLUG_IN,
+  PROP_EXPORT_FILE_TYPE,
+  PROP_EXPORT_COLOR_PROFILE,
+  PROP_EXPORT_METADATA_EXIF,
+  PROP_EXPORT_METADATA_XMP,
+  PROP_EXPORT_METADATA_IPTC,
+  PROP_DEBUG_POLICY,
+  PROP_CHECK_UPDATES,
+  PROP_CHECK_UPDATE_TIMESTAMP,
+  PROP_LAST_RELEASE_TIMESTAMP,
+  PROP_LAST_RELEASE_COMMENT,
+  PROP_LAST_REVISION,
+  PROP_LAST_KNOWN_RELEASE,
+
+  /* ignored, only for backward compatibility: */
+  PROP_INSTALL_COLORMAP,
+  PROP_MIN_COLORS
+};
+
+
+static void  gimp_core_config_finalize               (GObject      *object);
+static void  gimp_core_config_set_property           (GObject      *object,
+                                                      guint         property_id,
+                                                      const GValue *value,
+                                                      GParamSpec   *pspec);
+static void  gimp_core_config_get_property           (GObject      *object,
+                                                      guint         property_id,
+                                                      GValue       *value,
+                                                      GParamSpec   *pspec);
+static void gimp_core_config_default_image_notify    (GObject      *object,
+                                                      GParamSpec   *pspec,
+                                                      gpointer      data);
+static void gimp_core_config_default_grid_notify     (GObject      *object,
+                                                      GParamSpec   *pspec,
+                                                      gpointer      data);
+static void gimp_core_config_color_management_notify (GObject      *object,
+                                                      GParamSpec   *pspec,
+                                                      gpointer      data);
+
+
+G_DEFINE_TYPE (GimpCoreConfig, gimp_core_config, GIMP_TYPE_GEGL_CONFIG)
+
+#define parent_class gimp_core_config_parent_class
+
+#ifdef G_OS_WIN32
+/*
+ * Taken from glib 2.35 code / gimpenv.c.
+ * Only temporary until the user-font folder detection can go upstream
+ * in fontconfig!
+ * XXX
+ */
+static gchar *
+get_special_folder (int csidl)
+{
+  wchar_t      path[MAX_PATH+1];
+  HRESULT      hr;
+  LPITEMIDLIST pidl = NULL;
+  BOOL         b;
+  gchar       *retval = NULL;
+
+  hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl);
+  if (hr == S_OK)
+    {
+      b = SHGetPathFromIDListW (pidl, path);
+      if (b)
+        retval = g_utf16_to_utf8 (path, -1, NULL, NULL, NULL);
+      CoTaskMemFree (pidl);
+    }
+
+  return retval;
+}
+#endif
+
+static void
+gimp_core_config_class_init (GimpCoreConfigClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  gchar        *path;
+  gchar        *mypaint_brushes;
+  GimpRGB       red          = { 1.0, 0, 0, 0.5 };
+  guint64       undo_size;
+
+  object_class->finalize     = gimp_core_config_finalize;
+  object_class->set_property = gimp_core_config_set_property;
+  object_class->get_property = gimp_core_config_get_property;
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LANGUAGE,
+                           "language",
+                           "Language",
+                           LANGUAGE_BLURB,
+                           NULL,  /* take from environment */
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_INTERPOLATION_TYPE,
+                         "interpolation-type",
+                         "Interpolation",
+                         INTERPOLATION_TYPE_BLURB,
+                         GIMP_TYPE_INTERPOLATION_TYPE,
+                         GIMP_INTERPOLATION_CUBIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_DEFAULT_THRESHOLD,
+                        "default-threshold",
+                        "Default threshold",
+                        DEFAULT_THRESHOLD_BLURB,
+                        0, 255, 15,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  path = gimp_config_build_plug_in_path ("plug-ins");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_PLUG_IN_PATH,
+                         "plug-in-path",
+                         "Plug-in path",
+                         PLUG_IN_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+  g_free (path);
+
+  path = gimp_config_build_plug_in_path ("modules");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_MODULE_PATH,
+                         "module-path",
+                         "Module path",
+                         MODULE_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+  g_free (path);
+
+  path = gimp_config_build_plug_in_path ("interpreters");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_INTERPRETER_PATH,
+                         "interpreter-path",
+                         "Interpreter path",
+                         INTERPRETER_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+  g_free (path);
+
+  path = gimp_config_build_plug_in_path ("environ");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_ENVIRON_PATH,
+                         "environ-path",
+                         "Environment path",
+                         ENVIRON_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("brushes");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_BRUSH_PATH,
+                         "brush-path",
+                         "Brush path",
+                         BRUSH_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_writable_path ("brushes");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_BRUSH_PATH_WRITABLE,
+                         "brush-path-writable",
+                         "Writable brush path",
+                         BRUSH_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("dynamics");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_DYNAMICS_PATH,
+                         "dynamics-path",
+                         "Dynamics path",
+                         DYNAMICS_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_writable_path ("dynamics");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_DYNAMICS_PATH_WRITABLE,
+                         "dynamics-path-writable",
+                         "Writable dynamics path",
+                         DYNAMICS_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+#ifdef ENABLE_RELOCATABLE_RESOURCES
+  mypaint_brushes = g_build_filename ("${gimp_installation_dir}",
+                                      "share", "mypaint-data",
+                                      "1.0", "brushes", NULL);
+#else
+  mypaint_brushes = g_strdup (MYPAINT_BRUSHES_DIR);
+#endif
+
+  path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+                       "~/.mypaint/brushes",
+                       mypaint_brushes,
+                       NULL);
+  g_free (mypaint_brushes);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_MYPAINT_BRUSH_PATH,
+                         "mypaint-brush-path",
+                         "MyPaint brush path",
+                         MYPAINT_BRUSH_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+                       "~/.mypaint/brushes",
+                       NULL);
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_MYPAINT_BRUSH_PATH_WRITABLE,
+                         "mypaint-brush-path-writable",
+                         "Writable MyPaint brush path",
+                         MYPAINT_BRUSH_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("patterns");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_PATTERN_PATH,
+                         "pattern-path",
+                         "Pattern path",
+                         PATTERN_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_writable_path ("patterns");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_PATTERN_PATH_WRITABLE,
+                         "pattern-path-writable",
+                         "Writable pattern path",
+                         PATTERN_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("palettes");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_PALETTE_PATH,
+                         "palette-path",
+                         "Palette path",
+                         PALETTE_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_writable_path ("palettes");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_PALETTE_PATH_WRITABLE,
+                         "palette-path-writable",
+                         "Writable palette path",
+                         PALETTE_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("gradients");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_GRADIENT_PATH,
+                         "gradient-path",
+                         "Gradient path",
+                         GRADIENT_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_writable_path ("gradients");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_GRADIENT_PATH_WRITABLE,
+                         "gradient-path-writable",
+                         "Writable gradient path",
+                         GRADIENT_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("tool-presets");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_TOOL_PRESET_PATH,
+                         "tool-preset-path",
+                         "Tool preset path",
+                         TOOL_PRESET_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_writable_path ("tool-presets");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_TOOL_PRESET_PATH_WRITABLE,
+                         "tool-preset-path-writable",
+                         "Writable tool preset path",
+                         TOOL_PRESET_PATH_WRITABLE_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("fonts");
+#if defined G_OS_WIN32
+  /* XXX: since a Windows 10 update, build 17704, Microsoft added the
+   * concept of user-installed fonts (until now it was only possible to
+   * have system-wide fonts! How weird is that?).
+   * A feature request at fontconfig is also done, but until this gets
+   * implemented upstream, let's add the folder ourselves in GIMP's
+   * default list of folders.
+   * See: https://gitlab.gnome.org/GNOME/gimp/issues/2949
+   * Also: https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/144
+   */
+    {
+      gchar *user_fonts_dir = get_special_folder (CSIDL_LOCAL_APPDATA);
+
+      if (user_fonts_dir)
+        {
+          gchar *path2;
+          gchar *tmp;
+
+          path2 = g_build_filename (user_fonts_dir,
+                                    "Microsoft", "Windows", "Fonts", NULL);
+          g_free (user_fonts_dir);
+
+          /* G_SEARCHPATH_SEPARATOR-separated list of folders. */
+          tmp = g_strconcat (path2, G_SEARCHPATH_SEPARATOR_S, path, NULL);
+          g_free (path2);
+          g_free (path);
+          path = tmp;
+        }
+    }
+#endif
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_FONT_PATH,
+                         "font-path",
+                         "Font path",
+                         FONT_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_CONFIRM);
+  g_free (path);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_FONT_PATH_WRITABLE,
+                         "font-path-writable",
+                         "Writable font path",
+                         NULL,
+                         GIMP_CONFIG_PATH_DIR_LIST, NULL,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_BRUSH,
+                           "default-brush",
+                           "Default brush",
+                           DEFAULT_BRUSH_BLURB,
+                           GIMP_DEFAULT_BRUSH,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_DYNAMICS,
+                           "default-dynamics",
+                           "Default dynamics",
+                           DEFAULT_DYNAMICS_BLURB,
+                           GIMP_DEFAULT_DYNAMICS,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_MYPAINT_BRUSH,
+                           "default-mypaint-brush",
+                           "Default MyPaint brush",
+                           DEFAULT_MYPAINT_BRUSH_BLURB,
+                           GIMP_DEFAULT_MYPAINT_BRUSH,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_PATTERN,
+                           "default-pattern",
+                           "Default pattern",
+                           DEFAULT_PATTERN_BLURB,
+                           GIMP_DEFAULT_PATTERN,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_PALETTE,
+                           "default-palette",
+                           "Default palette",
+                           DEFAULT_PALETTE_BLURB,
+                           GIMP_DEFAULT_PALETTE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_GRADIENT,
+                           "default-gradient",
+                           "Default gradient",
+                           DEFAULT_GRADIENT_BLURB,
+                           GIMP_DEFAULT_GRADIENT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_TOOL_PRESET,
+                           "default-tool-preset",
+                           "Default tool preset",
+                           DEFAULT_TOOL_PRESET_BLURB,
+                           GIMP_DEFAULT_TOOL_PRESET,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_DEFAULT_FONT,
+                           "default-font",
+                           "Default font",
+                           DEFAULT_FONT_BLURB,
+                           GIMP_DEFAULT_FONT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GLOBAL_BRUSH,
+                            "global-brush",
+                            "Global brush",
+                            GLOBAL_BRUSH_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GLOBAL_DYNAMICS,
+                            "global-dynamics",
+                            "Global dynamics",
+                            GLOBAL_DYNAMICS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GLOBAL_PATTERN,
+                            "global-pattern",
+                            "Global pattern",
+                            GLOBAL_PATTERN_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GLOBAL_PALETTE,
+                            "global-palette",
+                            "Global palette",
+                            GLOBAL_PALETTE_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GLOBAL_GRADIENT,
+                            "global-gradient",
+                            "Global gradient",
+                            GLOBAL_GRADIENT_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GLOBAL_FONT,
+                            "global-font",
+                            "Global font",
+                            GLOBAL_FONT_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_DEFAULT_IMAGE,
+                           "default-image",
+                           "Default image",
+                           DEFAULT_IMAGE_BLURB,
+                           GIMP_TYPE_TEMPLATE,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_DEFAULT_GRID,
+                           "default-grid",
+                           "Default grid",
+                           DEFAULT_GRID_BLURB,
+                           GIMP_TYPE_GRID,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_UNDO_LEVELS,
+                        "undo-levels",
+                        "Undo levels",
+                        UNDO_LEVELS_BLURB,
+                        0, 1 << 20, 5,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_CONFIG_PARAM_CONFIRM);
+
+  undo_size = gimp_get_physical_memory_size ();
+
+  if (undo_size > 0)
+    undo_size = undo_size / 8; /* 1/8th of the memory */
+  else
+    undo_size = 1 << 26; /* 64GB */
+
+  GIMP_CONFIG_PROP_MEMSIZE (object_class, PROP_UNDO_SIZE,
+                            "undo-size",
+                            "Undo size",
+                            UNDO_SIZE_BLURB,
+                            0, GIMP_MAX_MEMSIZE, undo_size,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_CONFIRM);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_UNDO_PREVIEW_SIZE,
+                         "undo-preview-size",
+                         "Undo preview size",
+                         UNDO_PREVIEW_SIZE_BLURB,
+                         GIMP_TYPE_VIEW_SIZE,
+                         GIMP_VIEW_SIZE_LARGE,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_FILTER_HISTORY_SIZE,
+                        "plug-in-history-size", /* compat name */
+                        "Filter history size",
+                        FILTER_HISTORY_SIZE_BLURB,
+                        0, 256, 10,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_PATH (object_class,
+                         PROP_PLUGINRC_PATH,
+                         "pluginrc-path",
+                         "plugninrc path",
+                         PLUGINRC_PATH_BLURB,
+                         GIMP_CONFIG_PATH_FILE,
+                         "${gimp_dir}" G_DIR_SEPARATOR_S "pluginrc",
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LAYER_PREVIEWS,
+                            "layer-previews",
+                            "Layer previews",
+                            LAYER_PREVIEWS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GROUP_LAYER_PREVIEWS,
+                            "group-layer-previews",
+                            "Layer group previews",
+                            GROUP_LAYER_PREVIEWS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_PREVIEW_SIZE,
+                         "layer-preview-size",
+                         "Layer preview size",
+                         LAYER_PREVIEW_SIZE_BLURB,
+                         GIMP_TYPE_VIEW_SIZE,
+                         GIMP_VIEW_SIZE_MEDIUM,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_THUMBNAIL_SIZE,
+                         "thumbnail-size",
+                         "Thumbnail size",
+                         THUMBNAIL_SIZE_BLURB,
+                         GIMP_TYPE_THUMBNAIL_SIZE,
+                         GIMP_THUMBNAIL_SIZE_NORMAL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_MEMSIZE (object_class, PROP_THUMBNAIL_FILESIZE_LIMIT,
+                            "thumbnail-filesize-limit",
+                            "Thumbnail file size limit",
+                            THUMBNAIL_FILESIZE_LIMIT_BLURB,
+                            0, GIMP_MAX_MEMSIZE, 1 << 22,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_COLOR_MANAGEMENT,
+                           "color-management",
+                           "Color management",
+                           COLOR_MANAGEMENT_BLURB,
+                           GIMP_TYPE_COLOR_CONFIG,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CHECK_UPDATES,
+                            "check-updates",
+                            "Check for updates",
+                            CHECK_UPDATES_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT64 (object_class, PROP_CHECK_UPDATE_TIMESTAMP,
+                          "check-update-timestamp",
+                          "timestamp of the last update check",
+                          CHECK_UPDATE_TIMESTAMP_BLURB,
+                          0, G_MAXINT64, 0,
+                          GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT64 (object_class, PROP_LAST_RELEASE_TIMESTAMP,
+                          "last-release-timestamp",
+                          "timestamp of the last release",
+                          LAST_RELEASE_TIMESTAMP_BLURB,
+                          0, G_MAXINT64, 0,
+                          GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LAST_RELEASE_COMMENT,
+                           "last-release-comment",
+                           "Comment for last release",
+                           LAST_KNOWN_RELEASE_BLURB,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LAST_KNOWN_RELEASE,
+                           "last-known-release",
+                           "last known release of GIMP",
+                           LAST_KNOWN_RELEASE_BLURB,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LAST_REVISION,
+                        "last-revision",
+                        "Last revision of current release",
+                        LAST_RELEASE_TIMESTAMP_BLURB,
+                        0, G_MAXINT, 0,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAVE_DOCUMENT_HISTORY,
+                            "save-document-history",
+                            "Save document history",
+                            SAVE_DOCUMENT_HISTORY_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_QUICK_MASK_COLOR,
+                        "quick-mask-color",
+                        "Quick mask color",
+                        QUICK_MASK_COLOR_BLURB,
+                        TRUE, &red,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_IMPORT_PROMOTE_FLOAT,
+                            "import-promote-float",
+                            "Import promote float",
+                            IMPORT_PROMOTE_FLOAT_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_IMPORT_PROMOTE_DITHER,
+                            "import-promote-dither",
+                            "Import promote dither",
+                            IMPORT_PROMOTE_DITHER_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_IMPORT_ADD_ALPHA,
+                            "import-add-alpha",
+                            "Import add alpha",
+                            IMPORT_ADD_ALPHA_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_IMPORT_RAW_PLUG_IN,
+                         "import-raw-plug-in",
+                         "Import raw plug-in",
+                         IMPORT_RAW_PLUG_IN_BLURB,
+                         GIMP_CONFIG_PATH_FILE,
+                         "",
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_EXPORT_FILE_TYPE,
+                         "export-file-type",
+                         "Default export file type",
+                         EXPORT_FILE_TYPE_BLURB,
+                         GIMP_TYPE_EXPORT_FILE_TYPE,
+                         GIMP_EXPORT_FILE_PNG,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_EXPORT_COLOR_PROFILE,
+                            "export-color-profile",
+                            "Export Color Profile",
+                            EXPORT_COLOR_PROFILE_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_EXPORT_METADATA_EXIF,
+                            "export-metadata-exif",
+                            "Export Exif metadata",
+                            EXPORT_METADATA_EXIF_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_EXPORT_METADATA_XMP,
+                            "export-metadata-xmp",
+                            "Export XMP metadata",
+                            EXPORT_METADATA_XMP_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_EXPORT_METADATA_IPTC,
+                            "export-metadata-iptc",
+                            "Export IPTC metadata",
+                            EXPORT_METADATA_IPTC_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DEBUG_POLICY,
+                         "debug-policy",
+                         "Try generating backtrace upon errors",
+                         GENERATE_BACKTRACE_BLURB,
+                         GIMP_TYPE_DEBUG_POLICY,
+#ifdef GIMP_UNSTABLE
+                         GIMP_DEBUG_POLICY_WARNING,
+#else
+                         GIMP_DEBUG_POLICY_FATAL,
+#endif
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  /*  only for backward compatibility:  */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_INSTALL_COLORMAP,
+                            "install-colormap",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_MIN_COLORS,
+                        "min-colors",
+                        NULL, NULL,
+                        27, 256, 144,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_CONFIG_PARAM_IGNORE);
+}
+
+static void
+gimp_core_config_init (GimpCoreConfig *config)
+{
+  config->default_image = g_object_new (GIMP_TYPE_TEMPLATE,
+                                        "name",    "Default Image",
+                                        "comment", GIMP_DEFAULT_COMMENT,
+                                        NULL);
+  g_signal_connect (config->default_image, "notify",
+                    G_CALLBACK (gimp_core_config_default_image_notify),
+                    config);
+
+  config->default_grid = g_object_new (GIMP_TYPE_GRID,
+                                       "name", "Default Grid",
+                                       NULL);
+  g_signal_connect (config->default_grid, "notify",
+                    G_CALLBACK (gimp_core_config_default_grid_notify),
+                    config);
+
+  config->color_management = g_object_new (GIMP_TYPE_COLOR_CONFIG, NULL);
+  g_signal_connect (config->color_management, "notify",
+                    G_CALLBACK (gimp_core_config_color_management_notify),
+                    config);
+}
+
+static void
+gimp_core_config_finalize (GObject *object)
+{
+  GimpCoreConfig *core_config = GIMP_CORE_CONFIG (object);
+
+  g_free (core_config->language);
+  g_free (core_config->plug_in_path);
+  g_free (core_config->module_path);
+  g_free (core_config->interpreter_path);
+  g_free (core_config->environ_path);
+  g_free (core_config->brush_path);
+  g_free (core_config->brush_path_writable);
+  g_free (core_config->dynamics_path);
+  g_free (core_config->dynamics_path_writable);
+  g_free (core_config->pattern_path);
+  g_free (core_config->pattern_path_writable);
+  g_free (core_config->palette_path);
+  g_free (core_config->palette_path_writable);
+  g_free (core_config->gradient_path);
+  g_free (core_config->gradient_path_writable);
+  g_free (core_config->tool_preset_path);
+  g_free (core_config->tool_preset_path_writable);
+  g_free (core_config->font_path);
+  g_free (core_config->font_path_writable);
+  g_free (core_config->default_brush);
+  g_free (core_config->default_dynamics);
+  g_free (core_config->default_pattern);
+  g_free (core_config->default_palette);
+  g_free (core_config->default_gradient);
+  g_free (core_config->default_tool_preset);
+  g_free (core_config->default_font);
+  g_free (core_config->plug_in_rc_path);
+  g_free (core_config->import_raw_plug_in);
+
+  g_clear_pointer (&core_config->last_known_release, g_free);
+  g_clear_pointer (&core_config->last_release_comment, g_free);
+
+  g_clear_object (&core_config->default_image);
+  g_clear_object (&core_config->default_grid);
+  g_clear_object (&core_config->color_management);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_core_config_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpCoreConfig *core_config = GIMP_CORE_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_LANGUAGE:
+      g_free (core_config->language);
+      core_config->language = g_value_dup_string (value);
+      break;
+    case PROP_INTERPOLATION_TYPE:
+      core_config->interpolation_type = g_value_get_enum (value);
+      break;
+    case PROP_DEFAULT_THRESHOLD:
+      core_config->default_threshold = g_value_get_int (value);
+      break;
+    case PROP_PLUG_IN_PATH:
+      g_free (core_config->plug_in_path);
+      core_config->plug_in_path = g_value_dup_string (value);
+      break;
+    case PROP_MODULE_PATH:
+      g_free (core_config->module_path);
+      core_config->module_path = g_value_dup_string (value);
+      break;
+    case PROP_INTERPRETER_PATH:
+      g_free (core_config->interpreter_path);
+      core_config->interpreter_path = g_value_dup_string (value);
+      break;
+    case PROP_ENVIRON_PATH:
+      g_free (core_config->environ_path);
+      core_config->environ_path = g_value_dup_string (value);
+      break;
+    case PROP_BRUSH_PATH:
+      g_free (core_config->brush_path);
+      core_config->brush_path = g_value_dup_string (value);
+      break;
+    case PROP_BRUSH_PATH_WRITABLE:
+      g_free (core_config->brush_path_writable);
+      core_config->brush_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_DYNAMICS_PATH:
+      g_free (core_config->dynamics_path);
+      core_config->dynamics_path = g_value_dup_string (value);
+      break;
+    case PROP_DYNAMICS_PATH_WRITABLE:
+      g_free (core_config->dynamics_path_writable);
+      core_config->dynamics_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_MYPAINT_BRUSH_PATH:
+      g_free (core_config->mypaint_brush_path);
+      core_config->mypaint_brush_path = g_value_dup_string (value);
+      break;
+    case PROP_MYPAINT_BRUSH_PATH_WRITABLE:
+      g_free (core_config->mypaint_brush_path_writable);
+      core_config->mypaint_brush_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_PATTERN_PATH:
+      g_free (core_config->pattern_path);
+      core_config->pattern_path = g_value_dup_string (value);
+      break;
+    case PROP_PATTERN_PATH_WRITABLE:
+      g_free (core_config->pattern_path_writable);
+      core_config->pattern_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_PALETTE_PATH:
+      g_free (core_config->palette_path);
+      core_config->palette_path = g_value_dup_string (value);
+      break;
+    case PROP_PALETTE_PATH_WRITABLE:
+      g_free (core_config->palette_path_writable);
+      core_config->palette_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_GRADIENT_PATH:
+      g_free (core_config->gradient_path);
+      core_config->gradient_path = g_value_dup_string (value);
+      break;
+    case PROP_GRADIENT_PATH_WRITABLE:
+      g_free (core_config->gradient_path_writable);
+      core_config->gradient_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_TOOL_PRESET_PATH:
+      g_free (core_config->tool_preset_path);
+      core_config->tool_preset_path = g_value_dup_string (value);
+      break;
+    case PROP_TOOL_PRESET_PATH_WRITABLE:
+      g_free (core_config->tool_preset_path_writable);
+      core_config->tool_preset_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_FONT_PATH:
+      g_free (core_config->font_path);
+      core_config->font_path = g_value_dup_string (value);
+      break;
+    case PROP_FONT_PATH_WRITABLE:
+      g_free (core_config->font_path_writable);
+      core_config->font_path_writable = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_BRUSH:
+      g_free (core_config->default_brush);
+      core_config->default_brush = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_DYNAMICS:
+      g_free (core_config->default_dynamics);
+      core_config->default_dynamics = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_MYPAINT_BRUSH:
+      g_free (core_config->default_mypaint_brush);
+      core_config->default_mypaint_brush = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_PATTERN:
+      g_free (core_config->default_pattern);
+      core_config->default_pattern = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_PALETTE:
+      g_free (core_config->default_palette);
+      core_config->default_palette = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_GRADIENT:
+      g_free (core_config->default_gradient);
+      core_config->default_gradient = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_TOOL_PRESET:
+      g_free (core_config->default_tool_preset);
+      core_config->default_tool_preset = g_value_dup_string (value);
+      break;
+    case PROP_DEFAULT_FONT:
+      g_free (core_config->default_font);
+      core_config->default_font = g_value_dup_string (value);
+      break;
+    case PROP_GLOBAL_BRUSH:
+      core_config->global_brush = g_value_get_boolean (value);
+      break;
+    case PROP_GLOBAL_DYNAMICS:
+      core_config->global_dynamics = g_value_get_boolean (value);
+      break;
+    case PROP_GLOBAL_PATTERN:
+      core_config->global_pattern = g_value_get_boolean (value);
+      break;
+    case PROP_GLOBAL_PALETTE:
+      core_config->global_palette = g_value_get_boolean (value);
+      break;
+    case PROP_GLOBAL_GRADIENT:
+      core_config->global_gradient = g_value_get_boolean (value);
+      break;
+    case PROP_GLOBAL_FONT:
+      core_config->global_font = g_value_get_boolean (value);
+      break;
+    case PROP_DEFAULT_IMAGE:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value) ,
+                          G_OBJECT (core_config->default_image), 0);
+      break;
+    case PROP_DEFAULT_GRID:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value),
+                          G_OBJECT (core_config->default_grid), 0);
+      break;
+    case PROP_FILTER_HISTORY_SIZE:
+      core_config->filter_history_size = g_value_get_int (value);
+      break;
+    case PROP_UNDO_LEVELS:
+      core_config->levels_of_undo = g_value_get_int (value);
+      break;
+    case PROP_UNDO_SIZE:
+      core_config->undo_size = g_value_get_uint64 (value);
+      break;
+    case PROP_UNDO_PREVIEW_SIZE:
+      core_config->undo_preview_size = g_value_get_enum (value);
+      break;
+    case PROP_PLUGINRC_PATH:
+      g_free (core_config->plug_in_rc_path);
+      core_config->plug_in_rc_path = g_value_dup_string (value);
+      break;
+    case PROP_LAYER_PREVIEWS:
+      core_config->layer_previews = g_value_get_boolean (value);
+      break;
+    case PROP_GROUP_LAYER_PREVIEWS:
+      core_config->group_layer_previews = g_value_get_boolean (value);
+      break;
+    case PROP_LAYER_PREVIEW_SIZE:
+      core_config->layer_preview_size = g_value_get_enum (value);
+      break;
+    case PROP_THUMBNAIL_SIZE:
+      core_config->thumbnail_size = g_value_get_enum (value);
+      break;
+    case PROP_THUMBNAIL_FILESIZE_LIMIT:
+      core_config->thumbnail_filesize_limit = g_value_get_uint64 (value);
+      break;
+    case PROP_COLOR_MANAGEMENT:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value),
+                          G_OBJECT (core_config->color_management), 0);
+      break;
+    case PROP_CHECK_UPDATES:
+      core_config->check_updates = g_value_get_boolean (value);
+      break;
+    case PROP_CHECK_UPDATE_TIMESTAMP:
+      core_config->check_update_timestamp = g_value_get_int64 (value);
+      break;
+    case PROP_LAST_RELEASE_TIMESTAMP:
+      core_config->last_release_timestamp = g_value_get_int64 (value);
+      break;
+    case PROP_LAST_RELEASE_COMMENT:
+      g_clear_pointer (&core_config->last_release_comment, g_free);
+      core_config->last_release_comment = g_value_dup_string (value);
+      break;
+    case PROP_LAST_REVISION:
+      core_config->last_revision = g_value_get_int (value);
+      break;
+    case PROP_LAST_KNOWN_RELEASE:
+      g_clear_pointer (&core_config->last_known_release, g_free);
+      core_config->last_known_release = g_value_dup_string (value);
+      break;
+    case PROP_SAVE_DOCUMENT_HISTORY:
+      core_config->save_document_history = g_value_get_boolean (value);
+      break;
+    case PROP_QUICK_MASK_COLOR:
+      gimp_value_get_rgb (value, &core_config->quick_mask_color);
+      break;
+    case PROP_IMPORT_PROMOTE_FLOAT:
+      core_config->import_promote_float = g_value_get_boolean (value);
+      break;
+    case PROP_IMPORT_PROMOTE_DITHER:
+      core_config->import_promote_dither = g_value_get_boolean (value);
+      break;
+    case PROP_IMPORT_ADD_ALPHA:
+      core_config->import_add_alpha = g_value_get_boolean (value);
+      break;
+    case PROP_IMPORT_RAW_PLUG_IN:
+      g_free (core_config->import_raw_plug_in);
+      core_config->import_raw_plug_in = g_value_dup_string (value);
+      break;
+    case PROP_EXPORT_FILE_TYPE:
+      core_config->export_file_type = g_value_get_enum (value);
+      break;
+    case PROP_EXPORT_COLOR_PROFILE:
+      core_config->export_color_profile = g_value_get_boolean (value);
+      break;
+    case PROP_EXPORT_METADATA_EXIF:
+      core_config->export_metadata_exif = g_value_get_boolean (value);
+      break;
+    case PROP_EXPORT_METADATA_XMP:
+      core_config->export_metadata_xmp = g_value_get_boolean (value);
+      break;
+    case PROP_EXPORT_METADATA_IPTC:
+      core_config->export_metadata_iptc = g_value_get_boolean (value);
+      break;
+    case PROP_DEBUG_POLICY:
+      core_config->debug_policy = g_value_get_enum (value);
+      break;
+
+    case PROP_INSTALL_COLORMAP:
+    case PROP_MIN_COLORS:
+      /*  ignored  */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_core_config_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpCoreConfig *core_config = GIMP_CORE_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_LANGUAGE:
+      g_value_set_string (value, core_config->language);
+      break;
+    case PROP_INTERPOLATION_TYPE:
+      g_value_set_enum (value, core_config->interpolation_type);
+      break;
+    case PROP_DEFAULT_THRESHOLD:
+      g_value_set_int (value, core_config->default_threshold);
+      break;
+    case PROP_PLUG_IN_PATH:
+      g_value_set_string (value, core_config->plug_in_path);
+      break;
+    case PROP_MODULE_PATH:
+      g_value_set_string (value, core_config->module_path);
+      break;
+    case PROP_INTERPRETER_PATH:
+      g_value_set_string (value, core_config->interpreter_path);
+      break;
+    case PROP_ENVIRON_PATH:
+      g_value_set_string (value, core_config->environ_path);
+      break;
+    case PROP_BRUSH_PATH:
+      g_value_set_string (value, core_config->brush_path);
+      break;
+    case PROP_BRUSH_PATH_WRITABLE:
+      g_value_set_string (value, core_config->brush_path_writable);
+      break;
+    case PROP_DYNAMICS_PATH:
+      g_value_set_string (value, core_config->dynamics_path);
+      break;
+    case PROP_DYNAMICS_PATH_WRITABLE:
+      g_value_set_string (value, core_config->dynamics_path_writable);
+      break;
+    case PROP_MYPAINT_BRUSH_PATH:
+      g_value_set_string (value, core_config->mypaint_brush_path);
+      break;
+    case PROP_MYPAINT_BRUSH_PATH_WRITABLE:
+      g_value_set_string (value, core_config->mypaint_brush_path_writable);
+      break;
+    case PROP_PATTERN_PATH:
+      g_value_set_string (value, core_config->pattern_path);
+      break;
+    case PROP_PATTERN_PATH_WRITABLE:
+      g_value_set_string (value, core_config->pattern_path_writable);
+      break;
+    case PROP_PALETTE_PATH:
+      g_value_set_string (value, core_config->palette_path);
+      break;
+    case PROP_PALETTE_PATH_WRITABLE:
+      g_value_set_string (value, core_config->palette_path_writable);
+      break;
+    case PROP_GRADIENT_PATH:
+      g_value_set_string (value, core_config->gradient_path);
+      break;
+    case PROP_GRADIENT_PATH_WRITABLE:
+      g_value_set_string (value, core_config->gradient_path_writable);
+      break;
+    case PROP_TOOL_PRESET_PATH:
+      g_value_set_string (value, core_config->tool_preset_path);
+      break;
+    case PROP_TOOL_PRESET_PATH_WRITABLE:
+      g_value_set_string (value, core_config->tool_preset_path_writable);
+      break;
+    case PROP_FONT_PATH:
+      g_value_set_string (value, core_config->font_path);
+      break;
+    case PROP_FONT_PATH_WRITABLE:
+      g_value_set_string (value, core_config->font_path_writable);
+      break;
+    case PROP_DEFAULT_BRUSH:
+      g_value_set_string (value, core_config->default_brush);
+      break;
+    case PROP_DEFAULT_DYNAMICS:
+      g_value_set_string (value, core_config->default_dynamics);
+      break;
+    case PROP_DEFAULT_MYPAINT_BRUSH:
+      g_value_set_string (value, core_config->default_mypaint_brush);
+      break;
+    case PROP_DEFAULT_PATTERN:
+      g_value_set_string (value, core_config->default_pattern);
+      break;
+    case PROP_DEFAULT_PALETTE:
+      g_value_set_string (value, core_config->default_palette);
+      break;
+    case PROP_DEFAULT_GRADIENT:
+      g_value_set_string (value, core_config->default_gradient);
+      break;
+    case PROP_DEFAULT_TOOL_PRESET:
+      g_value_set_string (value, core_config->default_tool_preset);
+      break;
+    case PROP_DEFAULT_FONT:
+      g_value_set_string (value, core_config->default_font);
+      break;
+    case PROP_GLOBAL_BRUSH:
+      g_value_set_boolean (value, core_config->global_brush);
+      break;
+    case PROP_GLOBAL_DYNAMICS:
+      g_value_set_boolean (value, core_config->global_dynamics);
+      break;
+    case PROP_GLOBAL_PATTERN:
+      g_value_set_boolean (value, core_config->global_pattern);
+      break;
+    case PROP_GLOBAL_PALETTE:
+      g_value_set_boolean (value, core_config->global_palette);
+      break;
+    case PROP_GLOBAL_GRADIENT:
+      g_value_set_boolean (value, core_config->global_gradient);
+      break;
+    case PROP_GLOBAL_FONT:
+      g_value_set_boolean (value, core_config->global_font);
+      break;
+    case PROP_DEFAULT_IMAGE:
+      g_value_set_object (value, core_config->default_image);
+      break;
+    case PROP_DEFAULT_GRID:
+      g_value_set_object (value, core_config->default_grid);
+      break;
+    case PROP_FILTER_HISTORY_SIZE:
+      g_value_set_int (value, core_config->filter_history_size);
+      break;
+    case PROP_UNDO_LEVELS:
+      g_value_set_int (value, core_config->levels_of_undo);
+      break;
+    case PROP_UNDO_SIZE:
+      g_value_set_uint64 (value, core_config->undo_size);
+      break;
+    case PROP_UNDO_PREVIEW_SIZE:
+      g_value_set_enum (value, core_config->undo_preview_size);
+      break;
+    case PROP_PLUGINRC_PATH:
+      g_value_set_string (value, core_config->plug_in_rc_path);
+      break;
+    case PROP_LAYER_PREVIEWS:
+      g_value_set_boolean (value, core_config->layer_previews);
+      break;
+    case PROP_GROUP_LAYER_PREVIEWS:
+      g_value_set_boolean (value, core_config->group_layer_previews);
+      break;
+    case PROP_LAYER_PREVIEW_SIZE:
+      g_value_set_enum (value, core_config->layer_preview_size);
+      break;
+    case PROP_THUMBNAIL_SIZE:
+      g_value_set_enum (value, core_config->thumbnail_size);
+      break;
+    case PROP_THUMBNAIL_FILESIZE_LIMIT:
+      g_value_set_uint64 (value, core_config->thumbnail_filesize_limit);
+      break;
+    case PROP_COLOR_MANAGEMENT:
+      g_value_set_object (value, core_config->color_management);
+      break;
+    case PROP_CHECK_UPDATES:
+      g_value_set_boolean (value, core_config->check_updates);
+      break;
+    case PROP_CHECK_UPDATE_TIMESTAMP:
+      g_value_set_int64 (value, core_config->check_update_timestamp);
+      break;
+    case PROP_LAST_RELEASE_TIMESTAMP:
+      g_value_set_int64 (value, core_config->last_release_timestamp);
+      break;
+    case PROP_LAST_RELEASE_COMMENT:
+      g_value_set_string (value, core_config->last_release_comment);
+      break;
+    case PROP_LAST_REVISION:
+      g_value_set_int (value, core_config->last_revision);
+      break;
+    case PROP_LAST_KNOWN_RELEASE:
+      g_value_set_string (value, core_config->last_known_release);
+      break;
+    case PROP_SAVE_DOCUMENT_HISTORY:
+      g_value_set_boolean (value, core_config->save_document_history);
+      break;
+    case PROP_QUICK_MASK_COLOR:
+      gimp_value_set_rgb (value, &core_config->quick_mask_color);
+      break;
+    case PROP_IMPORT_PROMOTE_FLOAT:
+      g_value_set_boolean (value, core_config->import_promote_float);
+      break;
+    case PROP_IMPORT_PROMOTE_DITHER:
+      g_value_set_boolean (value, core_config->import_promote_dither);
+      break;
+    case PROP_IMPORT_ADD_ALPHA:
+      g_value_set_boolean (value, core_config->import_add_alpha);
+      break;
+    case PROP_IMPORT_RAW_PLUG_IN:
+      g_value_set_string (value, core_config->import_raw_plug_in);
+      break;
+    case PROP_EXPORT_FILE_TYPE:
+      g_value_set_enum (value, core_config->export_file_type);
+      break;
+    case PROP_EXPORT_COLOR_PROFILE:
+      g_value_set_boolean (value, core_config->export_color_profile);
+      break;
+    case PROP_EXPORT_METADATA_EXIF:
+      g_value_set_boolean (value, core_config->export_metadata_exif);
+      break;
+    case PROP_EXPORT_METADATA_XMP:
+      g_value_set_boolean (value, core_config->export_metadata_xmp);
+      break;
+    case PROP_EXPORT_METADATA_IPTC:
+      g_value_set_boolean (value, core_config->export_metadata_iptc);
+      break;
+    case PROP_DEBUG_POLICY:
+      g_value_set_enum (value, core_config->debug_policy);
+      break;
+
+    case PROP_INSTALL_COLORMAP:
+    case PROP_MIN_COLORS:
+      /*  ignored  */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_core_config_default_image_notify (GObject    *object,
+                                       GParamSpec *pspec,
+                                       gpointer    data)
+{
+  g_object_notify (G_OBJECT (data), "default-image");
+}
+
+static void
+gimp_core_config_default_grid_notify (GObject    *object,
+                                      GParamSpec *pspec,
+                                      gpointer    data)
+{
+  g_object_notify (G_OBJECT (data), "default-grid");
+}
+
+static void
+gimp_core_config_color_management_notify (GObject    *object,
+                                          GParamSpec *pspec,
+                                          gpointer    data)
+{
+  g_object_notify (G_OBJECT (data), "color-management");
+}
diff --git a/app/config/gimpcoreconfig.h b/app/config/gimpcoreconfig.h
new file mode 100644
index 0000000..f413ae4
--- /dev/null
+++ b/app/config/gimpcoreconfig.h
@@ -0,0 +1,123 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpCoreConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CORE_CONFIG_H__
+#define __GIMP_CORE_CONFIG_H__
+
+#include "operations/operations-enums.h"
+#include "core/core-enums.h"
+
+#include "config/gimpgeglconfig.h"
+
+
+#define GIMP_TYPE_CORE_CONFIG            (gimp_core_config_get_type ())
+#define GIMP_CORE_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CORE_CONFIG, GimpCoreConfig))
+#define GIMP_CORE_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CORE_CONFIG, GimpCoreConfigClass))
+#define GIMP_IS_CORE_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CORE_CONFIG))
+#define GIMP_IS_CORE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CORE_CONFIG))
+
+
+typedef struct _GimpCoreConfigClass GimpCoreConfigClass;
+
+struct _GimpCoreConfig
+{
+  GimpGeglConfig          parent_instance;
+
+  gchar                  *language;
+  GimpInterpolationType   interpolation_type;
+  gint                    default_threshold;
+  gchar                  *plug_in_path;
+  gchar                  *module_path;
+  gchar                  *interpreter_path;
+  gchar                  *environ_path;
+  gchar                  *brush_path;
+  gchar                  *brush_path_writable;
+  gchar                  *dynamics_path;
+  gchar                  *dynamics_path_writable;
+  gchar                  *mypaint_brush_path;
+  gchar                  *mypaint_brush_path_writable;
+  gchar                  *pattern_path;
+  gchar                  *pattern_path_writable;
+  gchar                  *palette_path;
+  gchar                  *palette_path_writable;
+  gchar                  *gradient_path;
+  gchar                  *gradient_path_writable;
+  gchar                  *tool_preset_path;
+  gchar                  *tool_preset_path_writable;
+  gchar                  *font_path;
+  gchar                  *font_path_writable;  /*  unused  */
+  gchar                  *default_brush;
+  gchar                  *default_dynamics;
+  gchar                  *default_mypaint_brush;
+  gchar                  *default_pattern;
+  gchar                  *default_palette;
+  gchar                  *default_tool_preset;
+  gchar                  *default_gradient;
+  gchar                  *default_font;
+  gboolean                global_brush;
+  gboolean                global_dynamics;
+  gboolean                global_pattern;
+  gboolean                global_palette;
+  gboolean                global_gradient;
+  gboolean                global_font;
+  GimpTemplate           *default_image;
+  GimpGrid               *default_grid;
+  gint                    levels_of_undo;
+  guint64                 undo_size;
+  GimpViewSize            undo_preview_size;
+  gint                    filter_history_size;
+  gchar                  *plug_in_rc_path;
+  gboolean                layer_previews;
+  gboolean                group_layer_previews;
+  GimpViewSize            layer_preview_size;
+  GimpThumbnailSize       thumbnail_size;
+  guint64                 thumbnail_filesize_limit;
+  GimpColorConfig        *color_management;
+  gboolean                save_document_history;
+  GimpRGB                 quick_mask_color;
+  gboolean                import_promote_float;
+  gboolean                import_promote_dither;
+  gboolean                import_add_alpha;
+  gchar                  *import_raw_plug_in;
+  GimpExportFileType      export_file_type;
+  gboolean                export_color_profile;
+  gboolean                export_metadata_exif;
+  gboolean                export_metadata_xmp;
+  gboolean                export_metadata_iptc;
+  GimpDebugPolicy         debug_policy;
+
+  gboolean                check_updates;
+  gint64                  check_update_timestamp;
+  gchar                  *last_known_release;
+  gint64                  last_release_timestamp;
+  gchar                  *last_release_comment;
+  gint                    last_revision;
+};
+
+struct _GimpCoreConfigClass
+{
+  GimpGeglConfigClass  parent_class;
+};
+
+
+GType  gimp_core_config_get_type (void) G_GNUC_CONST;
+
+
+#endif /* GIMP_CORE_CONFIG_H__ */
diff --git a/app/config/gimpdialogconfig.c b/app/config/gimpdialogconfig.c
new file mode 100644
index 0000000..f81d778
--- /dev/null
+++ b/app/config/gimpdialogconfig.c
@@ -0,0 +1,991 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDialogConfig class
+ * Copyright (C) 2016  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core/core-types.h" /* fill and stroke options */
+#include "core/gimp.h"
+#include "core/gimpstrokeoptions.h"
+
+#include "config-types.h"
+
+#include "gimprc-blurbs.h"
+#include "gimpdialogconfig.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+
+  PROP_GIMP,
+
+  PROP_COLOR_PROFILE_POLICY,
+
+  PROP_COLOR_PROFILE_PATH,
+
+  PROP_IMAGE_CONVERT_PROFILE_INTENT,
+  PROP_IMAGE_CONVERT_PROFILE_BPC,
+
+  PROP_IMAGE_CONVERT_PRECISION_LAYER_DITHER_METHOD,
+  PROP_IMAGE_CONVERT_PRECISION_TEXT_LAYER_DITHER_METHOD,
+  PROP_IMAGE_CONVERT_PRECISION_CHANNEL_DITHER_METHOD,
+
+  PROP_IMAGE_CONVERT_INDEXED_PALETTE_TYPE,
+  PROP_IMAGE_CONVERT_INDEXED_MAX_COLORS,
+  PROP_IMAGE_CONVERT_INDEXED_REMOVE_DUPLICATES,
+  PROP_IMAGE_CONVERT_INDEXED_DITHER_TYPE,
+  PROP_IMAGE_CONVERT_INDEXED_DITHER_ALPHA,
+  PROP_IMAGE_CONVERT_INDEXED_DITHER_TEXT_LAYERS,
+
+  PROP_IMAGE_RESIZE_FILL_TYPE,
+  PROP_IMAGE_RESIZE_LAYER_SET,
+  PROP_IMAGE_RESIZE_RESIZE_TEXT_LAYERS,
+
+  PROP_LAYER_NEW_NAME,
+  PROP_LAYER_NEW_MODE,
+  PROP_LAYER_NEW_BLEND_SPACE,
+  PROP_LAYER_NEW_COMPOSITE_SPACE,
+  PROP_LAYER_NEW_COMPOSITE_MODE,
+  PROP_LAYER_NEW_OPACITY,
+  PROP_LAYER_NEW_FILL_TYPE,
+
+  PROP_LAYER_RESIZE_FILL_TYPE,
+
+  PROP_LAYER_ADD_MASK_TYPE,
+  PROP_LAYER_ADD_MASK_INVERT,
+
+  PROP_LAYER_MERGE_TYPE,
+  PROP_LAYER_MERGE_ACTIVE_GROUP_ONLY,
+  PROP_LAYER_MERGE_DISCARD_INVISIBLE,
+
+  PROP_CHANNEL_NEW_NAME,
+  PROP_CHANNEL_NEW_COLOR,
+
+  PROP_VECTORS_NEW_NAME,
+
+  PROP_VECTORS_EXPORT_PATH,
+  PROP_VECTORS_EXPORT_ACTIVE_ONLY,
+
+  PROP_VECTORS_IMPORT_PATH,
+  PROP_VECTORS_IMPORT_MERGE,
+  PROP_VECTORS_IMPORT_SCALE,
+
+  PROP_SELECTION_FEATHER_RADIUS,
+  PROP_SELECTION_FEATHER_EDGE_LOCK,
+
+  PROP_SELECTION_GROW_RADIUS,
+
+  PROP_SELECTION_SHRINK_RADIUS,
+  PROP_SELECTION_SHRINK_EDGE_LOCK,
+
+  PROP_SELECTION_BORDER_RADIUS,
+  PROP_SELECTION_BORDER_STYLE,
+  PROP_SELECTION_BORDER_EDGE_LOCK,
+
+  PROP_FILL_OPTIONS,
+  PROP_STROKE_OPTIONS
+};
+
+
+typedef struct _GimpDialogConfigPrivate GimpDialogConfigPrivate;
+
+struct _GimpDialogConfigPrivate
+{
+  Gimp *gimp;
+};
+
+#define GET_PRIVATE(config) \
+        ((GimpDialogConfigPrivate *) gimp_dialog_config_get_instance_private ((GimpDialogConfig *) (config)))
+
+
+static void  gimp_dialog_config_constructed           (GObject      *object);
+static void  gimp_dialog_config_finalize              (GObject      *object);
+static void  gimp_dialog_config_set_property          (GObject      *object,
+                                                       guint         property_id,
+                                                       const GValue *value,
+                                                       GParamSpec   *pspec);
+static void  gimp_dialog_config_get_property          (GObject      *object,
+                                                       guint         property_id,
+                                                       GValue       *value,
+                                                       GParamSpec   *pspec);
+
+static void  gimp_dialog_config_fill_options_notify   (GObject      *object,
+                                                       GParamSpec   *pspec,
+                                                       gpointer      data);
+static void  gimp_dialog_config_stroke_options_notify (GObject      *object,
+                                                       GParamSpec   *pspec,
+                                                       gpointer      data);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDialogConfig, gimp_dialog_config,
+                            GIMP_TYPE_GUI_CONFIG)
+
+#define parent_class gimp_dialog_config_parent_class
+
+
+static void
+gimp_dialog_config_class_init (GimpDialogConfigClass *klass)
+{
+  GObjectClass *object_class     = G_OBJECT_CLASS (klass);
+  GimpRGB       half_transparent = { 0.0, 0.0, 0.0, 0.5 };
+
+  object_class->constructed  = gimp_dialog_config_constructed;
+  object_class->finalize     = gimp_dialog_config_finalize;
+  object_class->set_property = gimp_dialog_config_set_property;
+  object_class->get_property = gimp_dialog_config_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_COLOR_PROFILE_POLICY,
+                         "color-profile-policy",
+                         "Color profile policy",
+                         COLOR_PROFILE_POLICY_BLURB,
+                         GIMP_TYPE_COLOR_PROFILE_POLICY,
+                         GIMP_COLOR_PROFILE_POLICY_ASK,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_COLOR_PROFILE_PATH,
+                         "color-profile-path",
+                         "Default color profile folder path",
+                         COLOR_PROFILE_PATH_BLURB,
+                         GIMP_CONFIG_PATH_FILE,
+                         NULL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_IMAGE_CONVERT_PROFILE_INTENT,
+                         "image-convert-profile-intent",
+                         "Default rendering intent for color profile conversion",
+                         IMAGE_CONVERT_PROFILE_INTENT_BLURB,
+                         GIMP_TYPE_COLOR_RENDERING_INTENT,
+                         GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_IMAGE_CONVERT_PROFILE_BPC,
+                            "image-convert-profile-black-point-compensation",
+                            "Default 'Black point compensation' for "
+                            "color profile conversion",
+                            IMAGE_CONVERT_PROFILE_BPC_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class,
+                         PROP_IMAGE_CONVERT_PRECISION_LAYER_DITHER_METHOD,
+                         "image-convert-precision-layer-dither-method",
+                         "Default layer dither type for precision conversion",
+                         IMAGE_CONVERT_PRECISION_LAYER_DITHER_METHOD_BLURB,
+                         GEGL_TYPE_DITHER_METHOD,
+                         GEGL_DITHER_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class,
+                         PROP_IMAGE_CONVERT_PRECISION_TEXT_LAYER_DITHER_METHOD,
+                         "image-convert-precision-text-layer-dither-method",
+                         "Default text layer dither type for precision conversion",
+                         IMAGE_CONVERT_PRECISION_TEXT_LAYER_DITHER_METHOD_BLURB,
+                         GEGL_TYPE_DITHER_METHOD,
+                         GEGL_DITHER_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class,
+                         PROP_IMAGE_CONVERT_PRECISION_CHANNEL_DITHER_METHOD,
+                         "image-convert-precision-channel-dither-method",
+                         "Default channel dither type for precision conversion",
+                         IMAGE_CONVERT_PRECISION_CHANNEL_DITHER_METHOD_BLURB,
+                         GEGL_TYPE_DITHER_METHOD,
+                         GEGL_DITHER_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class,
+                         PROP_IMAGE_CONVERT_INDEXED_PALETTE_TYPE,
+                         "image-convert-indexed-palette-type",
+                         "Default palette type for indexed conversion",
+                         IMAGE_CONVERT_INDEXED_PALETTE_TYPE_BLURB,
+                         GIMP_TYPE_CONVERT_PALETTE_TYPE,
+                         GIMP_CONVERT_PALETTE_GENERATE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class,
+                        PROP_IMAGE_CONVERT_INDEXED_MAX_COLORS,
+                        "image-convert-indexed-max-colors",
+                        "Default maximum number of colors for indexed conversion",
+                        IMAGE_CONVERT_INDEXED_MAX_COLORS_BLURB,
+                        2, 256, 256,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class,
+                            PROP_IMAGE_CONVERT_INDEXED_REMOVE_DUPLICATES,
+                            "image-convert-indexed-remove-duplicates",
+                            "Default remove duplicates for indexed conversion",
+                            IMAGE_CONVERT_INDEXED_REMOVE_DUPLICATES_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class,
+                         PROP_IMAGE_CONVERT_INDEXED_DITHER_TYPE,
+                         "image-convert-indexed-dither-type",
+                         "Default dither type for indexed conversion",
+                         IMAGE_CONVERT_INDEXED_DITHER_TYPE_BLURB,
+                         GIMP_TYPE_CONVERT_DITHER_TYPE,
+                         GIMP_CONVERT_DITHER_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class,
+                            PROP_IMAGE_CONVERT_INDEXED_DITHER_ALPHA,
+                            "image-convert-indexed-dither-alpha",
+                            "Default dither alpha for indexed conversion",
+                            IMAGE_CONVERT_INDEXED_DITHER_ALPHA_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class,
+                            PROP_IMAGE_CONVERT_INDEXED_DITHER_TEXT_LAYERS,
+                            "image-convert-indexed-dither-text-layers",
+                            "Default dither text layers for indexed conversion",
+                            IMAGE_CONVERT_INDEXED_DITHER_TEXT_LAYERS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_IMAGE_RESIZE_FILL_TYPE,
+                         "image-resize-fill-type",
+                         "Default image resize fill type",
+                         IMAGE_RESIZE_FILL_TYPE_BLURB,
+                         GIMP_TYPE_FILL_TYPE,
+                         GIMP_FILL_TRANSPARENT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_IMAGE_RESIZE_LAYER_SET,
+                         "image-resize-layer-set",
+                         "Default image resize layer set",
+                         IMAGE_RESIZE_LAYER_SET_BLURB,
+                         GIMP_TYPE_ITEM_SET,
+                         GIMP_ITEM_SET_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_IMAGE_RESIZE_RESIZE_TEXT_LAYERS,
+                            "image-resize-resize-text-layers",
+                            "Default image resize text layers",
+                            IMAGE_RESIZE_RESIZE_TEXT_LAYERS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LAYER_NEW_NAME,
+                           "layer-new-name",
+                           "Default new layer name",
+                           LAYER_NEW_NAME_BLURB,
+                           _("Layer"),
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_MODE,
+                         "layer-new-mode",
+                         "Default new layer mode",
+                         LAYER_NEW_MODE_BLURB,
+                         GIMP_TYPE_LAYER_MODE,
+                         GIMP_LAYER_MODE_NORMAL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_BLEND_SPACE,
+                         "layer-new-blend-space",
+                         "Default new layer blend space",
+                         LAYER_NEW_BLEND_SPACE_BLURB,
+                         GIMP_TYPE_LAYER_COLOR_SPACE,
+                         GIMP_LAYER_COLOR_SPACE_AUTO,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_COMPOSITE_SPACE,
+                         "layer-new-composite-space",
+                         "Default new layer composite space",
+                         LAYER_NEW_COMPOSITE_SPACE_BLURB,
+                         GIMP_TYPE_LAYER_COLOR_SPACE,
+                         GIMP_LAYER_COLOR_SPACE_AUTO,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_COMPOSITE_MODE,
+                         "layer-new-composite-mode",
+                         "Default new layer composite mode",
+                         LAYER_NEW_COMPOSITE_MODE_BLURB,
+                         GIMP_TYPE_LAYER_COMPOSITE_MODE,
+                         GIMP_LAYER_COMPOSITE_AUTO,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LAYER_NEW_OPACITY,
+                           "layer-new-opacity",
+                           "Default new layer opacity",
+                           LAYER_NEW_OPACITY_BLURB,
+                           GIMP_OPACITY_TRANSPARENT, GIMP_OPACITY_OPAQUE,
+                           GIMP_OPACITY_OPAQUE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_FILL_TYPE,
+                         "layer-new-fill-type",
+                         "Default new layer fill type",
+                         LAYER_NEW_FILL_TYPE_BLURB,
+                         GIMP_TYPE_FILL_TYPE,
+                         GIMP_FILL_TRANSPARENT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_RESIZE_FILL_TYPE,
+                         "layer-resize-fill-type",
+                         "Default layer resize fill type",
+                         LAYER_RESIZE_FILL_TYPE_BLURB,
+                         GIMP_TYPE_FILL_TYPE,
+                         GIMP_FILL_TRANSPARENT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_ADD_MASK_TYPE,
+                         "layer-add-mask-type",
+                         "Default layer mask type",
+                         LAYER_ADD_MASK_TYPE_BLURB,
+                         GIMP_TYPE_ADD_MASK_TYPE,
+                         GIMP_ADD_MASK_WHITE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LAYER_ADD_MASK_INVERT,
+                            "layer-add-mask-invert",
+                            "Default layer mask invert",
+                            LAYER_ADD_MASK_INVERT_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_MERGE_TYPE,
+                         "layer-merge-type",
+                         "Default layer merge type",
+                         LAYER_MERGE_TYPE_BLURB,
+                         GIMP_TYPE_MERGE_TYPE,
+                         GIMP_EXPAND_AS_NECESSARY,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LAYER_MERGE_ACTIVE_GROUP_ONLY,
+                            "layer-merge-active-group-only",
+                            "Default layer merge active group only",
+                            LAYER_MERGE_ACTIVE_GROUP_ONLY_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LAYER_MERGE_DISCARD_INVISIBLE,
+                            "layer-merge-discard-invisible",
+                            "Default layer merge discard invisible",
+                            LAYER_MERGE_DISCARD_INVISIBLE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_CHANNEL_NEW_NAME,
+                           "channel-new-name",
+                           "Default new channel name",
+                           CHANNEL_NEW_NAME_BLURB,
+                           _("Channel"),
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_CHANNEL_NEW_COLOR,
+                        "channel-new-color",
+                        "Default new channel color and opacity",
+                        CHANNEL_NEW_COLOR_BLURB,
+                        TRUE,
+                        &half_transparent,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_VECTORS_NEW_NAME,
+                           "path-new-name",
+                           "Default new path name",
+                           VECTORS_NEW_NAME_BLURB,
+                           _("Path"),
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_VECTORS_EXPORT_PATH,
+                         "path-export-path",
+                         "Default path export folder path",
+                         VECTORS_EXPORT_PATH_BLURB,
+                         GIMP_CONFIG_PATH_FILE,
+                         NULL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VECTORS_EXPORT_ACTIVE_ONLY,
+                            "path-export-active-only",
+                            "Default export only the active path",
+                            VECTORS_EXPORT_ACTIVE_ONLY_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_VECTORS_IMPORT_PATH,
+                         "path-import-path",
+                         "Default path import folder path",
+                         VECTORS_IMPORT_PATH_BLURB,
+                         GIMP_CONFIG_PATH_FILE,
+                         NULL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VECTORS_IMPORT_MERGE,
+                            "path-import-merge",
+                            "Default merge imported vectors",
+                            VECTORS_IMPORT_MERGE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VECTORS_IMPORT_SCALE,
+                            "path-import-scale",
+                            "Default scale imported vectors",
+                            VECTORS_IMPORT_SCALE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SELECTION_FEATHER_RADIUS,
+                           "selection-feather-radius",
+                           "Selection feather radius",
+                           SELECTION_FEATHER_RADIUS_BLURB,
+                           0.0, 32767.0, 5.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SELECTION_FEATHER_EDGE_LOCK,
+                            "selection-feather-edge-lock",
+                            "Selection feather edge lock",
+                            SELECTION_FEATHER_EDGE_LOCK_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SELECTION_GROW_RADIUS,
+                           "selection-grow-radius",
+                           "Selection grow radius",
+                           SELECTION_GROW_RADIUS_BLURB,
+                           1.0, 32767.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SELECTION_SHRINK_RADIUS,
+                           "selection-shrink-radius",
+                           "Selection shrink radius",
+                           SELECTION_SHRINK_RADIUS_BLURB,
+                           1.0, 32767.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SELECTION_SHRINK_EDGE_LOCK,
+                            "selection-shrink-edge-lock",
+                            "Selection shrink edge lock",
+                            SELECTION_SHRINK_EDGE_LOCK_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SELECTION_BORDER_RADIUS,
+                           "selection-border-radius",
+                           "Selection border radius",
+                           SELECTION_BORDER_RADIUS_BLURB,
+                           1.0, 32767.0, 5.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SELECTION_BORDER_EDGE_LOCK,
+                            "selection-border-edge-lock",
+                            "Selection border edge lock",
+                            SELECTION_BORDER_EDGE_LOCK_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_SELECTION_BORDER_STYLE,
+                         "selection-border-style",
+                         "Selection border style",
+                         SELECTION_BORDER_STYLE_BLURB,
+                         GIMP_TYPE_CHANNEL_BORDER_STYLE,
+                         GIMP_CHANNEL_BORDER_STYLE_SMOOTH,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_FILL_OPTIONS,
+                           "fill-options",
+                           "Fill Options",
+                           FILL_OPTIONS_BLURB,
+                           GIMP_TYPE_FILL_OPTIONS,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_STROKE_OPTIONS,
+                           "stroke-options",
+                           "Stroke Options",
+                           STROKE_OPTIONS_BLURB,
+                           GIMP_TYPE_STROKE_OPTIONS,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+}
+
+static void
+gimp_dialog_config_init (GimpDialogConfig *config)
+{
+}
+
+static void
+gimp_dialog_config_constructed (GObject *object)
+{
+  GimpDialogConfig        *config = GIMP_DIALOG_CONFIG (object);
+  GimpDialogConfigPrivate *priv   = GET_PRIVATE (object);
+  GimpContext             *context;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (priv->gimp));
+
+  context = gimp_get_user_context (priv->gimp);
+
+  config->fill_options = gimp_fill_options_new (priv->gimp, context, TRUE);
+  gimp_context_set_serialize_properties (GIMP_CONTEXT (config->fill_options),
+                                         0);
+
+  g_signal_connect (config->fill_options, "notify",
+                    G_CALLBACK (gimp_dialog_config_fill_options_notify),
+                    config);
+
+  config->stroke_options = gimp_stroke_options_new (priv->gimp, context, TRUE);
+  gimp_context_set_serialize_properties (GIMP_CONTEXT (config->stroke_options),
+                                         0);
+
+  g_signal_connect (config->stroke_options, "notify",
+                    G_CALLBACK (gimp_dialog_config_stroke_options_notify),
+                    config);
+}
+
+static void
+gimp_dialog_config_finalize (GObject *object)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (object);
+
+  g_clear_pointer (&config->color_profile_path,  g_free);
+  g_clear_pointer (&config->layer_new_name,      g_free);
+  g_clear_pointer (&config->channel_new_name,    g_free);
+  g_clear_pointer (&config->vectors_new_name,    g_free);
+  g_clear_pointer (&config->vectors_export_path, g_free);
+  g_clear_pointer (&config->vectors_import_path, g_free);
+
+  g_clear_object (&config->fill_options);
+  g_clear_object (&config->stroke_options);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dialog_config_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpDialogConfig        *config = GIMP_DIALOG_CONFIG (object);
+  GimpDialogConfigPrivate *priv   = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      priv->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    case PROP_COLOR_PROFILE_POLICY:
+      config->color_profile_policy = g_value_get_enum (value);
+      break;
+
+    case PROP_COLOR_PROFILE_PATH:
+      if (config->color_profile_path)
+        g_free (config->color_profile_path);
+      config->color_profile_path = g_value_dup_string (value);
+      break;
+
+    case PROP_IMAGE_CONVERT_PROFILE_INTENT:
+      config->image_convert_profile_intent = g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_CONVERT_PROFILE_BPC:
+      config->image_convert_profile_bpc = g_value_get_boolean (value);
+      break;
+
+    case PROP_IMAGE_CONVERT_PRECISION_LAYER_DITHER_METHOD:
+      config->image_convert_precision_layer_dither_method =
+        g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_CONVERT_PRECISION_TEXT_LAYER_DITHER_METHOD:
+      config->image_convert_precision_text_layer_dither_method =
+        g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_CONVERT_PRECISION_CHANNEL_DITHER_METHOD:
+      config->image_convert_precision_channel_dither_method =
+        g_value_get_enum (value);
+      break;
+
+    case PROP_IMAGE_CONVERT_INDEXED_PALETTE_TYPE:
+      config->image_convert_indexed_palette_type = g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_MAX_COLORS:
+      config->image_convert_indexed_max_colors = g_value_get_int (value);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_REMOVE_DUPLICATES:
+      config->image_convert_indexed_remove_duplicates = g_value_get_boolean (value);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_DITHER_TYPE:
+      config->image_convert_indexed_dither_type = g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_DITHER_ALPHA:
+      config->image_convert_indexed_dither_alpha = g_value_get_boolean (value);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_DITHER_TEXT_LAYERS:
+      config->image_convert_indexed_dither_text_layers = g_value_get_boolean (value);
+      break;
+
+    case PROP_IMAGE_RESIZE_FILL_TYPE:
+      config->image_resize_fill_type = g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_RESIZE_LAYER_SET:
+      config->image_resize_layer_set = g_value_get_enum (value);
+      break;
+    case PROP_IMAGE_RESIZE_RESIZE_TEXT_LAYERS:
+      config->image_resize_resize_text_layers = g_value_get_boolean (value);
+      break;
+
+    case PROP_LAYER_NEW_NAME:
+      if (config->layer_new_name)
+        g_free (config->layer_new_name);
+      config->layer_new_name = g_value_dup_string (value);
+      break;
+    case PROP_LAYER_NEW_MODE:
+      config->layer_new_mode = g_value_get_enum (value);
+      break;
+    case PROP_LAYER_NEW_BLEND_SPACE:
+      config->layer_new_blend_space = g_value_get_enum (value);
+      break;
+    case PROP_LAYER_NEW_COMPOSITE_SPACE:
+      config->layer_new_composite_space = g_value_get_enum (value);
+      break;
+    case PROP_LAYER_NEW_COMPOSITE_MODE:
+      config->layer_new_composite_mode = g_value_get_enum (value);
+      break;
+    case PROP_LAYER_NEW_OPACITY:
+      config->layer_new_opacity = g_value_get_double (value);
+      break;
+    case PROP_LAYER_NEW_FILL_TYPE:
+      config->layer_new_fill_type = g_value_get_enum (value);
+      break;
+
+    case PROP_LAYER_RESIZE_FILL_TYPE:
+      config->layer_resize_fill_type = g_value_get_enum (value);
+      break;
+
+    case PROP_LAYER_ADD_MASK_TYPE:
+      config->layer_add_mask_type = g_value_get_enum (value);
+      break;
+    case PROP_LAYER_ADD_MASK_INVERT:
+      config->layer_add_mask_invert = g_value_get_boolean (value);
+      break;
+
+    case PROP_LAYER_MERGE_TYPE:
+      config->layer_merge_type = g_value_get_enum (value);
+      break;
+    case PROP_LAYER_MERGE_ACTIVE_GROUP_ONLY:
+      config->layer_merge_active_group_only = g_value_get_boolean (value);
+      break;
+    case PROP_LAYER_MERGE_DISCARD_INVISIBLE:
+      config->layer_merge_discard_invisible = g_value_get_boolean (value);
+      break;
+
+    case PROP_CHANNEL_NEW_NAME:
+      if (config->channel_new_name)
+        g_free (config->channel_new_name);
+      config->channel_new_name = g_value_dup_string (value);
+      break;
+    case PROP_CHANNEL_NEW_COLOR:
+      gimp_value_get_rgb (value, &config->channel_new_color);
+      break;
+
+    case PROP_VECTORS_NEW_NAME:
+      if (config->vectors_new_name)
+        g_free (config->vectors_new_name);
+      config->vectors_new_name = g_value_dup_string (value);
+      break;
+
+    case PROP_VECTORS_EXPORT_PATH:
+      if (config->vectors_export_path)
+        g_free (config->vectors_export_path);
+      config->vectors_export_path = g_value_dup_string (value);
+      break;
+    case PROP_VECTORS_EXPORT_ACTIVE_ONLY:
+      config->vectors_export_active_only = g_value_get_boolean (value);
+      break;
+
+    case PROP_VECTORS_IMPORT_PATH:
+      if (config->vectors_import_path)
+        g_free (config->vectors_import_path);
+      config->vectors_import_path = g_value_dup_string (value);
+      break;
+    case PROP_VECTORS_IMPORT_MERGE:
+      config->vectors_import_merge = g_value_get_boolean (value);
+      break;
+    case PROP_VECTORS_IMPORT_SCALE:
+      config->vectors_import_scale = g_value_get_boolean (value);
+      break;
+
+    case PROP_SELECTION_FEATHER_RADIUS:
+      config->selection_feather_radius = g_value_get_double (value);
+      break;
+    case PROP_SELECTION_FEATHER_EDGE_LOCK:
+      config->selection_feather_edge_lock = g_value_get_boolean (value);
+      break;
+
+    case PROP_SELECTION_GROW_RADIUS:
+      config->selection_grow_radius = g_value_get_double (value);
+      break;
+
+    case PROP_SELECTION_SHRINK_RADIUS:
+      config->selection_shrink_radius = g_value_get_double (value);
+      break;
+    case PROP_SELECTION_SHRINK_EDGE_LOCK:
+      config->selection_shrink_edge_lock = g_value_get_boolean (value);
+      break;
+
+    case PROP_SELECTION_BORDER_RADIUS:
+      config->selection_border_radius = g_value_get_double (value);
+      break;
+    case PROP_SELECTION_BORDER_EDGE_LOCK:
+      config->selection_border_edge_lock = g_value_get_boolean (value);
+      break;
+    case PROP_SELECTION_BORDER_STYLE:
+      config->selection_border_style = g_value_get_enum (value);
+      break;
+
+    case PROP_FILL_OPTIONS:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value) ,
+                          G_OBJECT (config->fill_options), 0);
+      break;
+    case PROP_STROKE_OPTIONS:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value) ,
+                          G_OBJECT (config->stroke_options), 0);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dialog_config_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpDialogConfig        *config = GIMP_DIALOG_CONFIG (object);
+  GimpDialogConfigPrivate *priv   = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, priv->gimp);
+      break;
+
+    case PROP_COLOR_PROFILE_POLICY:
+      g_value_set_enum (value, config->color_profile_policy);
+      break;
+
+    case PROP_COLOR_PROFILE_PATH:
+      g_value_set_string (value, config->color_profile_path);
+      break;
+
+    case PROP_IMAGE_CONVERT_PROFILE_INTENT:
+      g_value_set_enum (value, config->image_convert_profile_intent);
+      break;
+    case PROP_IMAGE_CONVERT_PROFILE_BPC:
+      g_value_set_boolean (value, config->image_convert_profile_bpc);
+      break;
+
+    case PROP_IMAGE_CONVERT_PRECISION_LAYER_DITHER_METHOD:
+      g_value_set_enum (value,
+                        config->image_convert_precision_layer_dither_method);
+      break;
+    case PROP_IMAGE_CONVERT_PRECISION_TEXT_LAYER_DITHER_METHOD:
+      g_value_set_enum (value,
+                        config->image_convert_precision_text_layer_dither_method);
+      break;
+    case PROP_IMAGE_CONVERT_PRECISION_CHANNEL_DITHER_METHOD:
+      g_value_set_enum (value,
+                        config->image_convert_precision_channel_dither_method);
+      break;
+
+    case PROP_IMAGE_CONVERT_INDEXED_PALETTE_TYPE:
+      g_value_set_enum (value, config->image_convert_indexed_palette_type);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_MAX_COLORS:
+      g_value_set_int (value, config->image_convert_indexed_max_colors);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_REMOVE_DUPLICATES:
+      g_value_set_boolean (value, config->image_convert_indexed_remove_duplicates);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_DITHER_TYPE:
+      g_value_set_enum (value, config->image_convert_indexed_dither_type);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_DITHER_ALPHA:
+      g_value_set_boolean (value, config->image_convert_indexed_dither_alpha);
+      break;
+    case PROP_IMAGE_CONVERT_INDEXED_DITHER_TEXT_LAYERS:
+      g_value_set_boolean (value, config->image_convert_indexed_dither_text_layers);
+      break;
+
+    case PROP_IMAGE_RESIZE_FILL_TYPE:
+      g_value_set_enum (value, config->image_resize_fill_type);
+      break;
+    case PROP_IMAGE_RESIZE_LAYER_SET:
+      g_value_set_enum (value, config->image_resize_layer_set);
+      break;
+    case PROP_IMAGE_RESIZE_RESIZE_TEXT_LAYERS:
+      g_value_set_boolean (value, config->image_resize_resize_text_layers);
+      break;
+
+    case PROP_LAYER_NEW_NAME:
+      g_value_set_string (value, config->layer_new_name);
+      break;
+    case PROP_LAYER_NEW_MODE:
+      g_value_set_enum (value, config->layer_new_mode);
+      break;
+    case PROP_LAYER_NEW_BLEND_SPACE:
+      g_value_set_enum (value, config->layer_new_blend_space);
+      break;
+    case PROP_LAYER_NEW_COMPOSITE_SPACE:
+      g_value_set_enum (value, config->layer_new_composite_space);
+      break;
+    case PROP_LAYER_NEW_COMPOSITE_MODE:
+      g_value_set_enum (value, config->layer_new_composite_mode);
+      break;
+    case PROP_LAYER_NEW_OPACITY:
+      g_value_set_double (value, config->layer_new_opacity);
+      break;
+    case PROP_LAYER_NEW_FILL_TYPE:
+      g_value_set_enum (value, config->layer_new_fill_type);
+      break;
+
+    case PROP_LAYER_RESIZE_FILL_TYPE:
+      g_value_set_enum (value, config->layer_resize_fill_type);
+      break;
+
+    case PROP_LAYER_ADD_MASK_TYPE:
+      g_value_set_enum (value, config->layer_add_mask_type);
+      break;
+    case PROP_LAYER_ADD_MASK_INVERT:
+      g_value_set_boolean (value, config->layer_add_mask_invert);
+      break;
+
+    case PROP_LAYER_MERGE_TYPE:
+      g_value_set_enum (value, config->layer_merge_type);
+      break;
+    case PROP_LAYER_MERGE_ACTIVE_GROUP_ONLY:
+      g_value_set_boolean (value, config->layer_merge_active_group_only);
+      break;
+    case PROP_LAYER_MERGE_DISCARD_INVISIBLE:
+      g_value_set_boolean (value, config->layer_merge_discard_invisible);
+      break;
+
+    case PROP_CHANNEL_NEW_NAME:
+      g_value_set_string (value, config->channel_new_name);
+      break;
+    case PROP_CHANNEL_NEW_COLOR:
+      gimp_value_set_rgb (value, &config->channel_new_color);
+      break;
+
+    case PROP_VECTORS_NEW_NAME:
+      g_value_set_string (value, config->vectors_new_name);
+      break;
+
+    case PROP_VECTORS_EXPORT_PATH:
+      g_value_set_string (value, config->vectors_export_path);
+      break;
+    case PROP_VECTORS_EXPORT_ACTIVE_ONLY:
+      g_value_set_boolean (value, config->vectors_export_active_only);
+      break;
+
+    case PROP_VECTORS_IMPORT_PATH:
+      g_value_set_string (value, config->vectors_import_path);
+      break;
+    case PROP_VECTORS_IMPORT_MERGE:
+      g_value_set_boolean (value, config->vectors_import_merge);
+      break;
+    case PROP_VECTORS_IMPORT_SCALE:
+      g_value_set_boolean (value, config->vectors_import_scale);
+      break;
+
+    case PROP_SELECTION_FEATHER_RADIUS:
+      g_value_set_double (value, config->selection_feather_radius);
+      break;
+    case PROP_SELECTION_FEATHER_EDGE_LOCK:
+      g_value_set_boolean (value, config->selection_feather_edge_lock);
+      break;
+
+    case PROP_SELECTION_GROW_RADIUS:
+      g_value_set_double (value, config->selection_grow_radius);
+      break;
+
+    case PROP_SELECTION_SHRINK_RADIUS:
+      g_value_set_double (value, config->selection_shrink_radius);
+      break;
+    case PROP_SELECTION_SHRINK_EDGE_LOCK:
+      g_value_set_boolean (value, config->selection_shrink_edge_lock);
+      break;
+
+    case PROP_SELECTION_BORDER_RADIUS:
+      g_value_set_double (value, config->selection_border_radius);
+      break;
+    case PROP_SELECTION_BORDER_EDGE_LOCK:
+      g_value_set_boolean (value, config->selection_border_edge_lock);
+      break;
+    case PROP_SELECTION_BORDER_STYLE:
+      g_value_set_enum (value, config->selection_border_style);
+      break;
+
+    case PROP_FILL_OPTIONS:
+      g_value_set_object (value, config->fill_options);
+      break;
+    case PROP_STROKE_OPTIONS:
+      g_value_set_object (value, config->stroke_options);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dialog_config_fill_options_notify (GObject    *object,
+                                        GParamSpec *pspec,
+                                        gpointer    data)
+{
+  /*  ignore notifications on parent class properties such as fg/bg  */
+  if (pspec->owner_type == G_TYPE_FROM_INSTANCE (object))
+    g_object_notify (G_OBJECT (data), "fill-options");
+}
+
+static void
+gimp_dialog_config_stroke_options_notify (GObject    *object,
+                                          GParamSpec *pspec,
+                                          gpointer    data)
+{
+  /*  see above  */
+  if (pspec->owner_type == G_TYPE_FROM_INSTANCE (object))
+    g_object_notify (G_OBJECT (data), "stroke-options");
+}
diff --git a/app/config/gimpdialogconfig.h b/app/config/gimpdialogconfig.h
new file mode 100644
index 0000000..1053f6d
--- /dev/null
+++ b/app/config/gimpdialogconfig.h
@@ -0,0 +1,123 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDialogConfig class
+ * Copyright (C) 2016  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DIALOG_CONFIG_H__
+#define __GIMP_DIALOG_CONFIG_H__
+
+#include "config/gimpguiconfig.h"
+
+
+/* We don't want to include stuff from core/ here, instead do the next
+ * less ugly hack...
+ */
+typedef struct _GimpFillOptions   GimpFillOptions;
+typedef struct _GimpStrokeOptions GimpStrokeOptions;
+
+
+#define GIMP_TYPE_DIALOG_CONFIG            (gimp_dialog_config_get_type ())
+#define GIMP_DIALOG_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DIALOG_CONFIG, GimpDialogConfig))
+#define GIMP_DIALOG_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DIALOG_CONFIG, GimpDialogConfigClass))
+#define GIMP_IS_DIALOG_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DIALOG_CONFIG))
+#define GIMP_IS_DIALOG_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DIALOG_CONFIG))
+
+
+typedef struct _GimpDialogConfigClass GimpDialogConfigClass;
+
+struct _GimpDialogConfig
+{
+  GimpGuiConfig             parent_instance;
+
+  GimpColorProfilePolicy    color_profile_policy;
+
+  gchar                    *color_profile_path;
+
+  GimpColorRenderingIntent  image_convert_profile_intent;
+  gboolean                  image_convert_profile_bpc;
+
+  GeglDitherMethod          image_convert_precision_layer_dither_method;
+  GeglDitherMethod          image_convert_precision_text_layer_dither_method;
+  GeglDitherMethod          image_convert_precision_channel_dither_method;
+
+  GimpConvertPaletteType    image_convert_indexed_palette_type;
+  gint                      image_convert_indexed_max_colors;
+  gboolean                  image_convert_indexed_remove_duplicates;
+  GimpConvertDitherType     image_convert_indexed_dither_type;
+  gboolean                  image_convert_indexed_dither_alpha;
+  gboolean                  image_convert_indexed_dither_text_layers;
+
+  GimpFillType              image_resize_fill_type;
+  GimpItemSet               image_resize_layer_set;
+  gboolean                  image_resize_resize_text_layers;
+
+  gchar                    *layer_new_name;
+  GimpLayerMode             layer_new_mode;
+  GimpLayerColorSpace       layer_new_blend_space;
+  GimpLayerColorSpace       layer_new_composite_space;
+  GimpLayerCompositeMode    layer_new_composite_mode;
+  gdouble                   layer_new_opacity;
+  GimpFillType              layer_new_fill_type;
+
+  GimpFillType              layer_resize_fill_type;
+
+  GimpAddMaskType           layer_add_mask_type;
+  gboolean                  layer_add_mask_invert;
+
+  GimpMergeType             layer_merge_type;
+  gboolean                  layer_merge_active_group_only;
+  gboolean                  layer_merge_discard_invisible;
+
+  gchar                    *channel_new_name;
+  GimpRGB                   channel_new_color;
+
+  gchar                    *vectors_new_name;
+
+  gchar                    *vectors_export_path;
+  gboolean                  vectors_export_active_only;
+
+  gchar                    *vectors_import_path;
+  gboolean                  vectors_import_merge;
+  gboolean                  vectors_import_scale;
+
+  gdouble                   selection_feather_radius;
+  gboolean                  selection_feather_edge_lock;
+
+  gdouble                   selection_grow_radius;
+
+  gdouble                   selection_shrink_radius;
+  gboolean                  selection_shrink_edge_lock;
+
+  gdouble                   selection_border_radius;
+  gboolean                  selection_border_edge_lock;
+  GimpChannelBorderStyle    selection_border_style;
+
+  GimpFillOptions          *fill_options;
+  GimpStrokeOptions        *stroke_options;
+};
+
+struct _GimpDialogConfigClass
+{
+  GimpGuiConfigClass  parent_class;
+};
+
+
+GType  gimp_dialog_config_get_type (void) G_GNUC_CONST;
+
+
+#endif /* GIMP_DIALOG_CONFIG_H__ */
diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
new file mode 100644
index 0000000..d38a6a1
--- /dev/null
+++ b/app/config/gimpdisplayconfig.c
@@ -0,0 +1,623 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDisplayConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc-blurbs.h"
+#include "gimpdisplayconfig.h"
+#include "gimpdisplayoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_ACTIVATE_ON_FOCUS    TRUE
+#define DEFAULT_MONITOR_RESOLUTION   96.0
+#define DEFAULT_MARCHING_ANTS_SPEED  200
+#define DEFAULT_USE_EVENT_HISTORY    FALSE
+
+enum
+{
+  PROP_0,
+  PROP_TRANSPARENCY_SIZE,
+  PROP_TRANSPARENCY_TYPE,
+  PROP_SNAP_DISTANCE,
+  PROP_MARCHING_ANTS_SPEED,
+  PROP_RESIZE_WINDOWS_ON_ZOOM,
+  PROP_RESIZE_WINDOWS_ON_RESIZE,
+  PROP_DEFAULT_SHOW_ALL,
+  PROP_DEFAULT_DOT_FOR_DOT,
+  PROP_INITIAL_ZOOM_TO_FIT,
+  PROP_CURSOR_MODE,
+  PROP_CURSOR_UPDATING,
+  PROP_SHOW_BRUSH_OUTLINE,
+  PROP_SNAP_BRUSH_OUTLINE,
+  PROP_SHOW_PAINT_TOOL_CURSOR,
+  PROP_IMAGE_TITLE_FORMAT,
+  PROP_IMAGE_STATUS_FORMAT,
+  PROP_MONITOR_XRESOLUTION,
+  PROP_MONITOR_YRESOLUTION,
+  PROP_MONITOR_RES_FROM_GDK,
+  PROP_NAV_PREVIEW_SIZE,
+  PROP_DEFAULT_VIEW,
+  PROP_DEFAULT_FULLSCREEN_VIEW,
+  PROP_ACTIVATE_ON_FOCUS,
+  PROP_SPACE_BAR_ACTION,
+  PROP_ZOOM_QUALITY,
+  PROP_USE_EVENT_HISTORY,
+
+  /* ignored, only for backward compatibility: */
+  PROP_DEFAULT_SNAP_TO_GUIDES,
+  PROP_DEFAULT_SNAP_TO_GRID,
+  PROP_DEFAULT_SNAP_TO_CANVAS,
+  PROP_DEFAULT_SNAP_TO_PATH,
+  PROP_CONFIRM_ON_CLOSE,
+  PROP_XOR_COLOR,
+  PROP_PERFECT_MOUSE
+};
+
+
+static void  gimp_display_config_finalize          (GObject      *object);
+static void  gimp_display_config_set_property      (GObject      *object,
+                                                    guint         property_id,
+                                                    const GValue *value,
+                                                    GParamSpec   *pspec);
+static void  gimp_display_config_get_property      (GObject      *object,
+                                                    guint         property_id,
+                                                    GValue       *value,
+                                                    GParamSpec   *pspec);
+
+static void  gimp_display_config_view_notify       (GObject      *object,
+                                                    GParamSpec   *pspec,
+                                                    gpointer      data);
+static void  gimp_display_config_fullscreen_notify (GObject      *object,
+                                                    GParamSpec   *pspec,
+                                                    gpointer      data);
+
+
+G_DEFINE_TYPE (GimpDisplayConfig, gimp_display_config, GIMP_TYPE_CORE_CONFIG)
+
+#define parent_class gimp_display_config_parent_class
+
+
+static void
+gimp_display_config_class_init (GimpDisplayConfigClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GimpRGB       color        = { 0, 0, 0, 0 };
+
+  object_class->finalize     = gimp_display_config_finalize;
+  object_class->set_property = gimp_display_config_set_property;
+  object_class->get_property = gimp_display_config_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TRANSPARENCY_SIZE,
+                         "transparency-size",
+                         "Transparency size",
+                         TRANSPARENCY_SIZE_BLURB,
+                         GIMP_TYPE_CHECK_SIZE,
+                         GIMP_CHECK_SIZE_MEDIUM_CHECKS,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TRANSPARENCY_TYPE,
+                         "transparency-type",
+                         "Transparency type",
+                         TRANSPARENCY_TYPE_BLURB,
+                         GIMP_TYPE_CHECK_TYPE,
+                         GIMP_CHECK_TYPE_GRAY_CHECKS,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_SNAP_DISTANCE,
+                        "snap-distance",
+                        "Snap distance",
+                        DEFAULT_SNAP_DISTANCE_BLURB,
+                        1, 255, 8,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_MARCHING_ANTS_SPEED,
+                        "marching-ants-speed",
+                        "Marching ants speed",
+                        MARCHING_ANTS_SPEED_BLURB,
+                        10, 10000, DEFAULT_MARCHING_ANTS_SPEED,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_RESIZE_WINDOWS_ON_ZOOM,
+                            "resize-windows-on-zoom",
+                            "Resize windows on zoom",
+                            RESIZE_WINDOWS_ON_ZOOM_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_RESIZE_WINDOWS_ON_RESIZE,
+                            "resize-windows-on-resize",
+                            "Resize windows on resize",
+                            RESIZE_WINDOWS_ON_RESIZE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEFAULT_SHOW_ALL,
+                            "default-show-all",
+                            "Default show-all",
+                            DEFAULT_SHOW_ALL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEFAULT_DOT_FOR_DOT,
+                            "default-dot-for-dot",
+                            "Default dot-for-dot",
+                            DEFAULT_DOT_FOR_DOT_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_INITIAL_ZOOM_TO_FIT,
+                            "initial-zoom-to-fit",
+                            "Initial zoom-to-fit",
+                            INITIAL_ZOOM_TO_FIT_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CURSOR_MODE,
+                         "cursor-mode",
+                         "Cursor mode",
+                         CURSOR_MODE_BLURB,
+                         GIMP_TYPE_CURSOR_MODE,
+                         GIMP_CURSOR_MODE_TOOL_CROSSHAIR,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CURSOR_UPDATING,
+                            "cursor-updating",
+                            "Cursor updating",
+                            CURSOR_UPDATING_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_BRUSH_OUTLINE,
+                            "show-brush-outline",
+                            "Show brush outline",
+                            SHOW_BRUSH_OUTLINE_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_BRUSH_OUTLINE,
+                            "snap-brush-outline",
+                            "Snap brush outline",
+                            SNAP_BRUSH_OUTLINE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_PAINT_TOOL_CURSOR,
+                            "show-paint-tool-cursor",
+                            "Show paint tool cursor",
+                            SHOW_PAINT_TOOL_CURSOR_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_IMAGE_TITLE_FORMAT,
+                           "image-title-format",
+                           "Image title format",
+                           IMAGE_TITLE_FORMAT_BLURB,
+                           GIMP_CONFIG_DEFAULT_IMAGE_TITLE_FORMAT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_IMAGE_STATUS_FORMAT,
+                           "image-status-format",
+                           "Image statusbar format",
+                           IMAGE_STATUS_FORMAT_BLURB,
+                           GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RESOLUTION (object_class, PROP_MONITOR_XRESOLUTION,
+                               "monitor-xresolution",
+                               "Monitor resolution X",
+                               MONITOR_XRESOLUTION_BLURB,
+                               DEFAULT_MONITOR_RESOLUTION,
+                               GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RESOLUTION (object_class, PROP_MONITOR_YRESOLUTION,
+                               "monitor-yresolution",
+                               "Monitor resolution Y",
+                               MONITOR_YRESOLUTION_BLURB,
+                               DEFAULT_MONITOR_RESOLUTION,
+                               GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MONITOR_RES_FROM_GDK,
+                            "monitor-resolution-from-windowing-system",
+                            "Monitor resolution from windowing system",
+                            MONITOR_RES_FROM_GDK_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_NAV_PREVIEW_SIZE,
+                         "navigation-preview-size",
+                         "Navigation preview size",
+                         NAVIGATION_PREVIEW_SIZE_BLURB,
+                         GIMP_TYPE_VIEW_SIZE,
+                         GIMP_VIEW_SIZE_MEDIUM,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_DEFAULT_VIEW,
+                           "default-view",
+                           "Default view options",
+                           DEFAULT_VIEW_BLURB,
+                           GIMP_TYPE_DISPLAY_OPTIONS,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_DEFAULT_FULLSCREEN_VIEW,
+                           "default-fullscreen-view",
+                           "Default fullscreen view options",
+                           DEFAULT_FULLSCREEN_VIEW_BLURB,
+                           GIMP_TYPE_DISPLAY_OPTIONS,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ACTIVATE_ON_FOCUS,
+                            "activate-on-focus",
+                            "Activate on focus",
+                            ACTIVATE_ON_FOCUS_BLURB,
+                            DEFAULT_ACTIVATE_ON_FOCUS,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_SPACE_BAR_ACTION,
+                         "space-bar-action",
+                         "Space bar action",
+                         SPACE_BAR_ACTION_BLURB,
+                         GIMP_TYPE_SPACE_BAR_ACTION,
+                         GIMP_SPACE_BAR_ACTION_PAN,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ZOOM_QUALITY,
+                         "zoom-quality",
+                         "Zoom quality",
+                         ZOOM_QUALITY_BLURB,
+                         GIMP_TYPE_ZOOM_QUALITY,
+                         GIMP_ZOOM_QUALITY_HIGH,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_EVENT_HISTORY,
+                            "use-event-history",
+                            "Use event history",
+                            DEFAULT_USE_EVENT_HISTORY_BLURB,
+                            DEFAULT_USE_EVENT_HISTORY,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  /*  only for backward compatibility:  */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEFAULT_SNAP_TO_GUIDES,
+                            "default-snap-to-guides",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEFAULT_SNAP_TO_GRID,
+                            "default-snap-to-grid",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEFAULT_SNAP_TO_CANVAS,
+                            "default-snap-to-canvas",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEFAULT_SNAP_TO_PATH,
+                            "default-snap-to-path",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONFIRM_ON_CLOSE,
+                            "confirm-on-close",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_XOR_COLOR,
+                        "xor-color",
+                        NULL, NULL,
+                        FALSE, &color,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PERFECT_MOUSE,
+                            "perfect-mouse",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+}
+
+static void
+gimp_display_config_init (GimpDisplayConfig *config)
+{
+  config->default_view =
+    g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
+
+  g_signal_connect (config->default_view, "notify",
+                    G_CALLBACK (gimp_display_config_view_notify),
+                    config);
+
+  config->default_fullscreen_view =
+    g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
+
+  g_signal_connect (config->default_fullscreen_view, "notify",
+                    G_CALLBACK (gimp_display_config_fullscreen_notify),
+                    config);
+}
+
+static void
+gimp_display_config_finalize (GObject *object)
+{
+  GimpDisplayConfig *display_config = GIMP_DISPLAY_CONFIG (object);
+
+  g_free (display_config->image_title_format);
+  g_free (display_config->image_status_format);
+
+  g_clear_object (&display_config->default_view);
+  g_clear_object (&display_config->default_fullscreen_view);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_display_config_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpDisplayConfig *display_config = GIMP_DISPLAY_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_TRANSPARENCY_SIZE:
+      display_config->transparency_size = g_value_get_enum (value);
+      break;
+    case PROP_TRANSPARENCY_TYPE:
+      display_config->transparency_type = g_value_get_enum (value);
+      break;
+    case PROP_SNAP_DISTANCE:
+      display_config->snap_distance = g_value_get_int (value);
+      break;
+    case PROP_MARCHING_ANTS_SPEED:
+      display_config->marching_ants_speed = g_value_get_int (value);
+      break;
+    case PROP_RESIZE_WINDOWS_ON_ZOOM:
+      display_config->resize_windows_on_zoom = g_value_get_boolean (value);
+      break;
+    case PROP_RESIZE_WINDOWS_ON_RESIZE:
+      display_config->resize_windows_on_resize = g_value_get_boolean (value);
+      break;
+    case PROP_DEFAULT_SHOW_ALL:
+      display_config->default_show_all = g_value_get_boolean (value);
+      break;
+    case PROP_DEFAULT_DOT_FOR_DOT:
+      display_config->default_dot_for_dot = g_value_get_boolean (value);
+      break;
+    case PROP_INITIAL_ZOOM_TO_FIT:
+      display_config->initial_zoom_to_fit = g_value_get_boolean (value);
+      break;
+    case PROP_CURSOR_MODE:
+      display_config->cursor_mode = g_value_get_enum (value);
+      break;
+    case PROP_CURSOR_UPDATING:
+      display_config->cursor_updating = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_BRUSH_OUTLINE:
+      display_config->show_brush_outline = g_value_get_boolean (value);
+      break;
+    case PROP_SNAP_BRUSH_OUTLINE:
+      display_config->snap_brush_outline = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_PAINT_TOOL_CURSOR:
+      display_config->show_paint_tool_cursor = g_value_get_boolean (value);
+      break;
+    case PROP_IMAGE_TITLE_FORMAT:
+      g_free (display_config->image_title_format);
+      display_config->image_title_format = g_value_dup_string (value);
+      break;
+    case PROP_IMAGE_STATUS_FORMAT:
+      g_free (display_config->image_status_format);
+      display_config->image_status_format = g_value_dup_string (value);
+      break;
+    case PROP_MONITOR_XRESOLUTION:
+      display_config->monitor_xres = g_value_get_double (value);
+      break;
+    case PROP_MONITOR_YRESOLUTION:
+      display_config->monitor_yres = g_value_get_double (value);
+      break;
+    case PROP_MONITOR_RES_FROM_GDK:
+      display_config->monitor_res_from_gdk = g_value_get_boolean (value);
+      break;
+    case PROP_NAV_PREVIEW_SIZE:
+      display_config->nav_preview_size = g_value_get_enum (value);
+      break;
+    case PROP_DEFAULT_VIEW:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value),
+                          G_OBJECT (display_config->default_view), 0);
+      break;
+    case PROP_DEFAULT_FULLSCREEN_VIEW:
+      if (g_value_get_object (value))
+        gimp_config_sync (g_value_get_object (value),
+                          G_OBJECT (display_config->default_fullscreen_view),
+                          0);
+      break;
+    case PROP_ACTIVATE_ON_FOCUS:
+      display_config->activate_on_focus = g_value_get_boolean (value);
+      break;
+    case PROP_SPACE_BAR_ACTION:
+      display_config->space_bar_action = g_value_get_enum (value);
+      break;
+    case PROP_ZOOM_QUALITY:
+      display_config->zoom_quality = g_value_get_enum (value);
+      break;
+    case PROP_USE_EVENT_HISTORY:
+      display_config->use_event_history = g_value_get_boolean (value);
+      break;
+
+    case PROP_DEFAULT_SNAP_TO_GUIDES:
+    case PROP_DEFAULT_SNAP_TO_GRID:
+    case PROP_DEFAULT_SNAP_TO_CANVAS:
+    case PROP_DEFAULT_SNAP_TO_PATH:
+    case PROP_CONFIRM_ON_CLOSE:
+    case PROP_XOR_COLOR:
+    case PROP_PERFECT_MOUSE:
+      /* ignored */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_display_config_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpDisplayConfig *display_config = GIMP_DISPLAY_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_TRANSPARENCY_SIZE:
+      g_value_set_enum (value, display_config->transparency_size);
+      break;
+    case PROP_TRANSPARENCY_TYPE:
+      g_value_set_enum (value, display_config->transparency_type);
+      break;
+    case PROP_SNAP_DISTANCE:
+      g_value_set_int (value, display_config->snap_distance);
+      break;
+    case PROP_MARCHING_ANTS_SPEED:
+      g_value_set_int (value, display_config->marching_ants_speed);
+      break;
+    case PROP_RESIZE_WINDOWS_ON_ZOOM:
+      g_value_set_boolean (value, display_config->resize_windows_on_zoom);
+      break;
+    case PROP_RESIZE_WINDOWS_ON_RESIZE:
+      g_value_set_boolean (value, display_config->resize_windows_on_resize);
+      break;
+    case PROP_DEFAULT_SHOW_ALL:
+      g_value_set_boolean (value, display_config->default_show_all);
+      break;
+    case PROP_DEFAULT_DOT_FOR_DOT:
+      g_value_set_boolean (value, display_config->default_dot_for_dot);
+      break;
+    case PROP_INITIAL_ZOOM_TO_FIT:
+      g_value_set_boolean (value, display_config->initial_zoom_to_fit);
+      break;
+    case PROP_CURSOR_MODE:
+      g_value_set_enum (value, display_config->cursor_mode);
+      break;
+    case PROP_CURSOR_UPDATING:
+      g_value_set_boolean (value, display_config->cursor_updating);
+      break;
+    case PROP_SHOW_BRUSH_OUTLINE:
+      g_value_set_boolean (value, display_config->show_brush_outline);
+      break;
+    case PROP_SNAP_BRUSH_OUTLINE:
+      g_value_set_boolean (value, display_config->snap_brush_outline);
+      break;
+    case PROP_SHOW_PAINT_TOOL_CURSOR:
+      g_value_set_boolean (value, display_config->show_paint_tool_cursor);
+      break;
+    case PROP_IMAGE_TITLE_FORMAT:
+      g_value_set_string (value, display_config->image_title_format);
+      break;
+    case PROP_IMAGE_STATUS_FORMAT:
+      g_value_set_string (value, display_config->image_status_format);
+      break;
+    case PROP_MONITOR_XRESOLUTION:
+      g_value_set_double (value, display_config->monitor_xres);
+      break;
+    case PROP_MONITOR_YRESOLUTION:
+      g_value_set_double (value, display_config->monitor_yres);
+      break;
+    case PROP_MONITOR_RES_FROM_GDK:
+      g_value_set_boolean (value, display_config->monitor_res_from_gdk);
+      break;
+    case PROP_NAV_PREVIEW_SIZE:
+      g_value_set_enum (value, display_config->nav_preview_size);
+      break;
+    case PROP_DEFAULT_VIEW:
+      g_value_set_object (value, display_config->default_view);
+      break;
+    case PROP_DEFAULT_FULLSCREEN_VIEW:
+      g_value_set_object (value, display_config->default_fullscreen_view);
+      break;
+    case PROP_ACTIVATE_ON_FOCUS:
+      g_value_set_boolean (value, display_config->activate_on_focus);
+      break;
+    case PROP_SPACE_BAR_ACTION:
+      g_value_set_enum (value, display_config->space_bar_action);
+      break;
+    case PROP_ZOOM_QUALITY:
+      g_value_set_enum (value, display_config->zoom_quality);
+      break;
+    case PROP_USE_EVENT_HISTORY:
+      g_value_set_boolean (value, display_config->use_event_history);
+      break;
+
+    case PROP_DEFAULT_SNAP_TO_GUIDES:
+    case PROP_DEFAULT_SNAP_TO_GRID:
+    case PROP_DEFAULT_SNAP_TO_CANVAS:
+    case PROP_DEFAULT_SNAP_TO_PATH:
+    case PROP_CONFIRM_ON_CLOSE:
+    case PROP_XOR_COLOR:
+    case PROP_PERFECT_MOUSE:
+      /* ignored */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_display_config_view_notify (GObject    *object,
+                                 GParamSpec *pspec,
+                                 gpointer    data)
+{
+  g_object_notify (G_OBJECT (data), "default-view");
+}
+
+static void
+gimp_display_config_fullscreen_notify (GObject    *object,
+                                       GParamSpec *pspec,
+                                       gpointer    data)
+{
+  g_object_notify (G_OBJECT (data), "default-fullscreen-view");
+}
diff --git a/app/config/gimpdisplayconfig.h b/app/config/gimpdisplayconfig.h
new file mode 100644
index 0000000..e4c2a72
--- /dev/null
+++ b/app/config/gimpdisplayconfig.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDisplayConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_CONFIG_H__
+#define __GIMP_DISPLAY_CONFIG_H__
+
+#include "config/gimpcoreconfig.h"
+
+
+#define GIMP_CONFIG_DEFAULT_IMAGE_TITLE_FORMAT  "%D*%f-%p.%i (%t, %o, %L) %wx%h"
+#define GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT "%n (%m)"
+
+
+#define GIMP_TYPE_DISPLAY_CONFIG            (gimp_display_config_get_type ())
+#define GIMP_DISPLAY_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_CONFIG, GimpDisplayConfig))
+#define GIMP_DISPLAY_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DISPLAY_CONFIG, GimpDisplayConfigClass))
+#define GIMP_IS_DISPLAY_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DISPLAY_CONFIG))
+#define GIMP_IS_DISPLAY_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DISPLAY_CONFIG))
+
+
+typedef struct _GimpDisplayConfigClass GimpDisplayConfigClass;
+
+struct _GimpDisplayConfig
+{
+  GimpCoreConfig      parent_instance;
+
+  GimpCheckSize       transparency_size;
+  GimpCheckType       transparency_type;
+  gint                snap_distance;
+  gint                marching_ants_speed;
+  gboolean            resize_windows_on_zoom;
+  gboolean            resize_windows_on_resize;
+  gboolean            default_show_all;
+  gboolean            default_dot_for_dot;
+  gboolean            initial_zoom_to_fit;
+  GimpCursorMode      cursor_mode;
+  gboolean            cursor_updating;
+  gboolean            show_brush_outline;
+  gboolean            snap_brush_outline;
+  gboolean            show_paint_tool_cursor;
+  gchar              *image_title_format;
+  gchar              *image_status_format;
+  gdouble             monitor_xres;
+  gdouble             monitor_yres;
+  gboolean            monitor_res_from_gdk;
+  GimpViewSize        nav_preview_size;
+  GimpDisplayOptions *default_view;
+  GimpDisplayOptions *default_fullscreen_view;
+  gboolean            activate_on_focus;
+  GimpSpaceBarAction  space_bar_action;
+  GimpZoomQuality     zoom_quality;
+  gboolean            use_event_history;
+};
+
+struct _GimpDisplayConfigClass
+{
+  GimpCoreConfigClass  parent_class;
+};
+
+
+GType  gimp_display_config_get_type (void) G_GNUC_CONST;
+
+
+#endif /* GIMP_DISPLAY_CONFIG_H__ */
diff --git a/app/config/gimpdisplayoptions.c b/app/config/gimpdisplayoptions.c
new file mode 100644
index 0000000..b51a653
--- /dev/null
+++ b/app/config/gimpdisplayoptions.c
@@ -0,0 +1,597 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDisplayOptions
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc-blurbs.h"
+
+#include "gimpdisplayoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SHOW_MENUBAR,
+  PROP_SHOW_STATUSBAR,
+  PROP_SHOW_RULERS,
+  PROP_SHOW_SCROLLBARS,
+  PROP_SHOW_SELECTION,
+  PROP_SHOW_LAYER_BOUNDARY,
+  PROP_SHOW_CANVAS_BOUNDARY,
+  PROP_SHOW_GUIDES,
+  PROP_SHOW_GRID,
+  PROP_SHOW_SAMPLE_POINTS,
+  PROP_SNAP_TO_GUIDES,
+  PROP_SNAP_TO_GRID,
+  PROP_SNAP_TO_CANVAS,
+  PROP_SNAP_TO_PATH,
+  PROP_PADDING_MODE,
+  PROP_PADDING_COLOR,
+  PROP_PADDING_IN_SHOW_ALL
+};
+
+
+static void   gimp_display_options_set_property (GObject      *object,
+                                                 guint         property_id,
+                                                 const GValue *value,
+                                                 GParamSpec   *pspec);
+static void   gimp_display_options_get_property (GObject      *object,
+                                                 guint         property_id,
+                                                 GValue       *value,
+                                                 GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDisplayOptions,
+                         gimp_display_options,
+                         G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+typedef struct _GimpDisplayOptions      GimpDisplayOptionsFullscreen;
+typedef struct _GimpDisplayOptionsClass GimpDisplayOptionsFullscreenClass;
+
+#define gimp_display_options_fullscreen_init gimp_display_options_init
+
+G_DEFINE_TYPE_WITH_CODE (GimpDisplayOptionsFullscreen,
+                         gimp_display_options_fullscreen,
+                         GIMP_TYPE_DISPLAY_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+typedef struct _GimpDisplayOptions      GimpDisplayOptionsNoImage;
+typedef struct _GimpDisplayOptionsClass GimpDisplayOptionsNoImageClass;
+
+#define gimp_display_options_no_image_init gimp_display_options_init
+
+G_DEFINE_TYPE_WITH_CODE (GimpDisplayOptionsNoImage,
+                         gimp_display_options_no_image,
+                         GIMP_TYPE_DISPLAY_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+
+static void
+gimp_display_options_class_init (GimpDisplayOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GimpRGB       white;
+
+  gimp_rgba_set (&white, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+
+  object_class->set_property = gimp_display_options_set_property;
+  object_class->get_property = gimp_display_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_MENUBAR,
+                            "show-menubar",
+                            "Show menubar",
+                            SHOW_MENUBAR_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
+                            "show-statusbar",
+                            "Show statusbar",
+                            SHOW_STATUSBAR_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_RULERS,
+                            "show-rulers",
+                            "Show rulers",
+                            SHOW_RULERS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SCROLLBARS,
+                            "show-scrollbars",
+                            "Show scrollbars",
+                            SHOW_SCROLLBARS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SELECTION,
+                            "show-selection",
+                            "Show selection",
+                            SHOW_SELECTION_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_LAYER_BOUNDARY,
+                            "show-layer-boundary",
+                            "Show layer boundary",
+                            SHOW_LAYER_BOUNDARY_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_CANVAS_BOUNDARY,
+                            "show-canvas-boundary",
+                            "Show canvas boundary",
+                            SHOW_CANVAS_BOUNDARY_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_GUIDES,
+                            "show-guides",
+                            "Show guides",
+                            SHOW_GUIDES_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_GRID,
+                            "show-grid",
+                            "Show grid",
+                            SHOW_GRID_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SAMPLE_POINTS,
+                            "show-sample-points",
+                            "Show sample points",
+                            SHOW_SAMPLE_POINTS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_GUIDES,
+                            "snap-to-guides",
+                            "Snap to guides",
+                            SNAP_TO_GUIDES_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_GRID,
+                            "snap-to-grid",
+                            "Snap to grid",
+                            SNAP_TO_GRID_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_CANVAS,
+                            "snap-to-canvas",
+                            "Snap to canvas",
+                            SNAP_TO_CANVAS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_PATH,
+                            "snap-to-path",
+                            "Snap to path",
+                            SNAP_TO_PATH_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PADDING_MODE,
+                         "padding-mode",
+                         "Padding mode",
+                         CANVAS_PADDING_MODE_BLURB,
+                         GIMP_TYPE_CANVAS_PADDING_MODE,
+                         GIMP_CANVAS_PADDING_MODE_DEFAULT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_PADDING_COLOR,
+                        "padding-color",
+                        "Padding color",
+                        CANVAS_PADDING_COLOR_BLURB,
+                        FALSE, &white,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PADDING_IN_SHOW_ALL,
+                            "padding-in-show-all",
+                            "Keep padding in \"Show All\" mode",
+                            CANVAS_PADDING_IN_SHOW_ALL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_display_options_fullscreen_class_init (GimpDisplayOptionsFullscreenClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GimpRGB       black;
+
+  gimp_rgba_set (&black, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+
+  object_class->set_property = gimp_display_options_set_property;
+  object_class->get_property = gimp_display_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_MENUBAR,
+                            "show-menubar",
+                            "Show menubar",
+                            SHOW_MENUBAR_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
+                            "show-statusbar",
+                            "Show statusbar",
+                            SHOW_STATUSBAR_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_RULERS,
+                            "show-rulers",
+                            "Show rulers",
+                            SHOW_RULERS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SCROLLBARS,
+                            "show-scrollbars",
+                            "Show scrollbars",
+                            SHOW_SCROLLBARS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SELECTION,
+                            "show-selection",
+                            "Show selection",
+                            SHOW_SELECTION_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_LAYER_BOUNDARY,
+                            "show-layer-boundary",
+                            "Show layer boundary",
+                            SHOW_LAYER_BOUNDARY_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_CANVAS_BOUNDARY,
+                            "show-canvas-boundary",
+                            "Show canvas boundary",
+                            SHOW_CANVAS_BOUNDARY_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_GUIDES,
+                            "show-guides",
+                            "Show guides",
+                            SHOW_GUIDES_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_GRID,
+                            "show-grid",
+                            "Show grid",
+                            SHOW_GRID_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SAMPLE_POINTS,
+                            "show-sample-points",
+                            "Show sample points",
+                            SHOW_SAMPLE_POINTS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_GUIDES,
+                            "snap-to-guides",
+                            "Snap to guides",
+                            SNAP_TO_GUIDES_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_GRID,
+                            "snap-to-grid",
+                            "Snap to grid",
+                            SHOW_SCROLLBARS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_CANVAS,
+                            "snap-to-canvas",
+                            "Snap to canvas",
+                            SNAP_TO_CANVAS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_PATH,
+                            "snap-to-path",
+                            "Snap to path",
+                            SNAP_TO_PATH_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PADDING_MODE,
+                         "padding-mode",
+                         "Padding mode",
+                         CANVAS_PADDING_MODE_BLURB,
+                         GIMP_TYPE_CANVAS_PADDING_MODE,
+                         GIMP_CANVAS_PADDING_MODE_CUSTOM,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_PADDING_COLOR,
+                        "padding-color",
+                        "Padding color",
+                        CANVAS_PADDING_COLOR_BLURB,
+                        FALSE, &black,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PADDING_IN_SHOW_ALL,
+                            "padding-in-show-all",
+                            "Keep padding in \"Show All\" mode",
+                            CANVAS_PADDING_IN_SHOW_ALL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_display_options_no_image_class_init (GimpDisplayOptionsNoImageClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_display_options_set_property;
+  object_class->get_property = gimp_display_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_RULERS,
+                            "show-rulers",
+                            "Show rulers",
+                            SHOW_RULERS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SCROLLBARS,
+                            "show-scrollbars",
+                            "Show scrollbars",
+                            SHOW_SCROLLBARS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SELECTION,
+                            "show-selection",
+                            "Show selection",
+                            SHOW_SELECTION_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_LAYER_BOUNDARY,
+                            "show-layer-boundary",
+                            "Show layer boundary",
+                            SHOW_LAYER_BOUNDARY_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_CANVAS_BOUNDARY,
+                            "show-canvas-boundary",
+                            "Show canvas boundary",
+                            SHOW_CANVAS_BOUNDARY_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_GUIDES,
+                            "show-guides",
+                            "Show guides",
+                            SHOW_GUIDES_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_GRID,
+                            "show-grid",
+                            "Show grid",
+                            SHOW_GRID_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_SAMPLE_POINTS,
+                            "show-sample-points",
+                            "Show sample points",
+                            SHOW_SAMPLE_POINTS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_GUIDES,
+                            "snap-to-guides",
+                            "Snap to guides",
+                            SNAP_TO_GUIDES_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_GRID,
+                            "snap-to-grid",
+                            "Snap to grid",
+                            SHOW_SCROLLBARS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_CANVAS,
+                            "snap-to-canvas",
+                            "Snap to canvas",
+                            SNAP_TO_CANVAS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SNAP_TO_PATH,
+                            "snap-to-path",
+                            "Snap tp path",
+                            SNAP_TO_PATH_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_display_options_init (GimpDisplayOptions *options)
+{
+  options->padding_mode_set = FALSE;
+}
+
+static void
+gimp_display_options_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpDisplayOptions *options = GIMP_DISPLAY_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SHOW_MENUBAR:
+      options->show_menubar = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_STATUSBAR:
+      options->show_statusbar = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_RULERS:
+      options->show_rulers = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_SCROLLBARS:
+      options->show_scrollbars = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_SELECTION:
+      options->show_selection = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_LAYER_BOUNDARY:
+      options->show_layer_boundary = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_CANVAS_BOUNDARY:
+      options->show_canvas_boundary = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_GUIDES:
+      options->show_guides = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_GRID:
+      options->show_grid = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_SAMPLE_POINTS:
+      options->show_sample_points = g_value_get_boolean (value);
+      break;
+    case PROP_SNAP_TO_GUIDES:
+      options->snap_to_guides = g_value_get_boolean (value);
+      break;
+    case PROP_SNAP_TO_GRID:
+      options->snap_to_grid = g_value_get_boolean (value);
+      break;
+    case PROP_SNAP_TO_CANVAS:
+      options->snap_to_canvas = g_value_get_boolean (value);
+      break;
+    case PROP_SNAP_TO_PATH:
+      options->snap_to_path = g_value_get_boolean (value);
+      break;
+    case PROP_PADDING_MODE:
+      options->padding_mode = g_value_get_enum (value);
+      break;
+    case PROP_PADDING_COLOR:
+      options->padding_color = *(GimpRGB *) g_value_get_boxed (value);
+      break;
+    case PROP_PADDING_IN_SHOW_ALL:
+      options->padding_in_show_all = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_display_options_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpDisplayOptions *options = GIMP_DISPLAY_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SHOW_MENUBAR:
+      g_value_set_boolean (value, options->show_menubar);
+      break;
+    case PROP_SHOW_STATUSBAR:
+      g_value_set_boolean (value, options->show_statusbar);
+      break;
+    case PROP_SHOW_RULERS:
+      g_value_set_boolean (value, options->show_rulers);
+      break;
+    case PROP_SHOW_SCROLLBARS:
+      g_value_set_boolean (value, options->show_scrollbars);
+      break;
+    case PROP_SHOW_SELECTION:
+      g_value_set_boolean (value, options->show_selection);
+      break;
+    case PROP_SHOW_LAYER_BOUNDARY:
+      g_value_set_boolean (value, options->show_layer_boundary);
+      break;
+    case PROP_SHOW_CANVAS_BOUNDARY:
+      g_value_set_boolean (value, options->show_canvas_boundary);
+      break;
+    case PROP_SHOW_GUIDES:
+      g_value_set_boolean (value, options->show_guides);
+      break;
+    case PROP_SHOW_GRID:
+      g_value_set_boolean (value, options->show_grid);
+      break;
+    case PROP_SHOW_SAMPLE_POINTS:
+      g_value_set_boolean (value, options->show_sample_points);
+      break;
+    case PROP_SNAP_TO_GUIDES:
+      g_value_set_boolean (value, options->snap_to_guides);
+      break;
+    case PROP_SNAP_TO_GRID:
+      g_value_set_boolean (value, options->snap_to_grid);
+      break;
+    case PROP_SNAP_TO_CANVAS:
+      g_value_set_boolean (value, options->snap_to_canvas);
+      break;
+    case PROP_SNAP_TO_PATH:
+      g_value_set_boolean (value, options->snap_to_path);
+      break;
+    case PROP_PADDING_MODE:
+      g_value_set_enum (value, options->padding_mode);
+      break;
+    case PROP_PADDING_COLOR:
+      g_value_set_boxed (value, &options->padding_color);
+      break;
+    case PROP_PADDING_IN_SHOW_ALL:
+      g_value_set_boolean (value, options->padding_in_show_all);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/config/gimpdisplayoptions.h b/app/config/gimpdisplayoptions.h
new file mode 100644
index 0000000..8da5e7a
--- /dev/null
+++ b/app/config/gimpdisplayoptions.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDisplayOptions
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_OPTIONS_H__
+#define __GIMP_DISPLAY_OPTIONS_H__
+
+
+#define GIMP_TYPE_DISPLAY_OPTIONS            (gimp_display_options_get_type ())
+#define GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN (gimp_display_options_fullscreen_get_type ())
+#define GIMP_TYPE_DISPLAY_OPTIONS_NO_IMAGE   (gimp_display_options_no_image_get_type ())
+
+#define GIMP_DISPLAY_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_OPTIONS, GimpDisplayOptions))
+#define GIMP_DISPLAY_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DISPLAY_OPTIONS, GimpDisplayOptionsClass))
+#define GIMP_IS_DISPLAY_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DISPLAY_OPTIONS))
+#define GIMP_IS_DISPLAY_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DISPLAY_OPTIONS))
+#define GIMP_DISPLAY_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DISPLAY_OPTIONS, GimpDisplayOptionsClass))
+
+
+typedef struct _GimpDisplayOptionsClass GimpDisplayOptionsClass;
+
+struct _GimpDisplayOptions
+{
+  GObject                parent_instance;
+
+  /*  GimpImageWindow options  */
+  gboolean               show_menubar;
+  gboolean               show_statusbar;
+
+  /*  GimpDisplayShell options  */
+  gboolean               show_rulers;
+  gboolean               show_scrollbars;
+  gboolean               show_selection;
+  gboolean               show_layer_boundary;
+  gboolean               show_canvas_boundary;
+  gboolean               show_guides;
+  gboolean               show_grid;
+  gboolean               show_sample_points;
+
+  gboolean               snap_to_guides;
+  gboolean               snap_to_grid;
+  gboolean               snap_to_canvas;
+  gboolean               snap_to_path;
+
+  GimpCanvasPaddingMode  padding_mode;
+  GimpRGB                padding_color;
+  gboolean               padding_mode_set;
+  gboolean               padding_in_show_all;
+};
+
+struct _GimpDisplayOptionsClass
+{
+  GObjectClass           parent_class;
+};
+
+
+GType  gimp_display_options_get_type            (void) G_GNUC_CONST;
+GType  gimp_display_options_fullscreen_get_type (void) G_GNUC_CONST;
+GType  gimp_display_options_no_image_get_type   (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_DISPLAY_OPTIONS_H__ */
diff --git a/app/config/gimpgeglconfig.c b/app/config/gimpgeglconfig.c
new file mode 100644
index 0000000..1994c44
--- /dev/null
+++ b/app/config/gimpgeglconfig.c
@@ -0,0 +1,273 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGeglConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core/core-types.h" /* eek */
+
+#include "gimprc-blurbs.h"
+#include "gimpgeglconfig.h"
+
+#include "core/gimp-utils.h"
+
+#include "gimp-debug.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_DEFAULT_SWAP_COMPRESSION "fast"
+
+#define GIMP_MAX_MEM_PROCESS          (MIN (G_MAXSIZE, GIMP_MAX_MEMSIZE))
+
+
+enum
+{
+  PROP_0,
+  PROP_TEMP_PATH,
+  PROP_SWAP_PATH,
+  PROP_SWAP_COMPRESSION,
+  PROP_NUM_PROCESSORS,
+  PROP_TILE_CACHE_SIZE,
+  PROP_USE_OPENCL,
+
+  /* ignored, only for backward compatibility: */
+  PROP_STINGY_MEMORY_USE
+};
+
+
+static void   gimp_gegl_config_constructed  (GObject             *object);
+static void   gimp_gegl_config_finalize     (GObject             *object);
+static void   gimp_gegl_config_set_property (GObject             *object,
+                                             guint                property_id,
+                                             const GValue        *value,
+                                             GParamSpec          *pspec);
+static void   gimp_gegl_config_get_property (GObject             *object,
+                                             guint                property_id,
+                                             GValue              *value,
+                                             GParamSpec          *pspec);
+
+
+G_DEFINE_TYPE (GimpGeglConfig, gimp_gegl_config, G_TYPE_OBJECT)
+
+#define parent_class gimp_gegl_config_parent_class
+
+
+static void
+gimp_gegl_config_class_init (GimpGeglConfigClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  gint          n_threads;
+  gint          max_n_threads;
+  guint64       memory_size;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->constructed  = gimp_gegl_config_constructed;
+  object_class->finalize     = gimp_gegl_config_finalize;
+  object_class->set_property = gimp_gegl_config_set_property;
+  object_class->get_property = gimp_gegl_config_get_property;
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_TEMP_PATH,
+                         "temp-path",
+                         "Temp path",
+                         TEMP_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR,
+                         "${gimp_temp_dir}",
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_SWAP_PATH,
+                         "swap-path",
+                         "Swap path",
+                         SWAP_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR,
+                         "${gimp_cache_dir}",
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_SWAP_COMPRESSION,
+                           "swap-compression",
+                           "Swap compression",
+                            SWAP_COMPRESSION_BLURB,
+                           GIMP_DEFAULT_SWAP_COMPRESSION,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  n_threads = g_get_num_processors ();
+
+  max_n_threads =
+    G_PARAM_SPEC_INT (g_object_class_find_property (G_OBJECT_GET_CLASS (gegl_config ()),
+                                                    "threads"))->maximum;
+
+  n_threads = MIN (n_threads, max_n_threads);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_NUM_PROCESSORS,
+                        "num-processors",
+                        "Number of threads to use",
+                        NUM_PROCESSORS_BLURB,
+                        1, max_n_threads, n_threads,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  memory_size = gimp_get_physical_memory_size ();
+
+  /* limit to the amount one process can handle */
+  memory_size = MIN (GIMP_MAX_MEM_PROCESS, memory_size);
+
+  if (memory_size > 0)
+    memory_size = memory_size / 2; /* half the memory */
+  else
+    memory_size = 1 << 30; /* 1GB */
+
+  GIMP_CONFIG_PROP_MEMSIZE (object_class, PROP_TILE_CACHE_SIZE,
+                            "tile-cache-size",
+                            "Tile cache size",
+                            TILE_CACHE_SIZE_BLURB,
+                            0, GIMP_MAX_MEM_PROCESS,
+                            memory_size,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_CONFIRM);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_OPENCL,
+                            "use-opencl",
+                            "Use OpenCL",
+                            USE_OPENCL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  /*  only for backward compatibility:  */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_STINGY_MEMORY_USE,
+                            "stingy-memory-use",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_CONFIG_PARAM_IGNORE);
+}
+
+static void
+gimp_gegl_config_init (GimpGeglConfig *config)
+{
+}
+
+static void
+gimp_gegl_config_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_debug_add_instance (object, G_OBJECT_GET_CLASS (object));
+}
+
+static void
+gimp_gegl_config_finalize (GObject *object)
+{
+  GimpGeglConfig *gegl_config = GIMP_GEGL_CONFIG (object);
+
+  g_free (gegl_config->temp_path);
+  g_free (gegl_config->swap_path);
+  g_free (gegl_config->swap_compression);
+
+  gimp_debug_remove_instance (object);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_gegl_config_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpGeglConfig *gegl_config = GIMP_GEGL_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_TEMP_PATH:
+      g_free (gegl_config->temp_path);
+      gegl_config->temp_path = g_value_dup_string (value);
+      break;
+    case PROP_SWAP_PATH:
+      g_free (gegl_config->swap_path);
+      gegl_config->swap_path = g_value_dup_string (value);
+      break;
+    case PROP_SWAP_COMPRESSION:
+      g_free (gegl_config->swap_compression);
+      gegl_config->swap_compression = g_value_dup_string (value);
+      break;
+    case PROP_NUM_PROCESSORS:
+      gegl_config->num_processors = g_value_get_int (value);
+      break;
+    case PROP_TILE_CACHE_SIZE:
+      gegl_config->tile_cache_size = g_value_get_uint64 (value);
+      break;
+    case PROP_USE_OPENCL:
+      gegl_config->use_opencl = g_value_get_boolean (value);
+      break;
+
+    case PROP_STINGY_MEMORY_USE:
+      /* ignored */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_gegl_config_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpGeglConfig *gegl_config = GIMP_GEGL_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_TEMP_PATH:
+      g_value_set_string (value, gegl_config->temp_path);
+      break;
+    case PROP_SWAP_PATH:
+      g_value_set_string (value, gegl_config->swap_path);
+      break;
+    case PROP_SWAP_COMPRESSION:
+      g_value_set_string (value, gegl_config->swap_compression);
+      break;
+    case PROP_NUM_PROCESSORS:
+      g_value_set_int (value, gegl_config->num_processors);
+      break;
+    case PROP_TILE_CACHE_SIZE:
+      g_value_set_uint64 (value, gegl_config->tile_cache_size);
+      break;
+    case PROP_USE_OPENCL:
+      g_value_set_boolean (value, gegl_config->use_opencl);
+      break;
+
+    case PROP_STINGY_MEMORY_USE:
+      /* ignored */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/config/gimpgeglconfig.h b/app/config/gimpgeglconfig.h
new file mode 100644
index 0000000..4ca948f
--- /dev/null
+++ b/app/config/gimpgeglconfig.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGeglConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_CONFIG_H__
+#define __GIMP_GEGL_CONFIG_H__
+
+
+#define GIMP_TYPE_GEGL_CONFIG            (gimp_gegl_config_get_type ())
+#define GIMP_GEGL_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GEGL_CONFIG, GimpGeglConfig))
+#define GIMP_GEGL_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GEGL_CONFIG, GimpGeglConfigClass))
+#define GIMP_IS_GEGL_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GEGL_CONFIG))
+#define GIMP_IS_GEGL_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GEGL_CONFIG))
+
+
+typedef struct _GimpGeglConfigClass GimpGeglConfigClass;
+
+struct _GimpGeglConfig
+{
+  GObject   parent_instance;
+
+  gchar    *temp_path;
+  gchar    *swap_path;
+  gchar    *swap_compression;
+  gint      num_processors;
+  guint64   tile_cache_size;
+  gboolean  use_opencl;
+};
+
+struct _GimpGeglConfigClass
+{
+  GObjectClass           parent_class;
+};
+
+
+GType  gimp_gegl_config_get_type (void) G_GNUC_CONST;
+
+
+#endif /* GIMP_GEGL_CONFIG_H__ */
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
new file mode 100644
index 0000000..79ff839
--- /dev/null
+++ b/app/config/gimpguiconfig.c
@@ -0,0 +1,1017 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGuiConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc-blurbs.h"
+#include "gimpguiconfig.h"
+
+#include "gimp-intl.h"
+
+
+#ifdef HAVE_WEBKIT
+#define DEFAULT_HELP_BROWSER   GIMP_HELP_BROWSER_GIMP
+#else
+#define DEFAULT_HELP_BROWSER   GIMP_HELP_BROWSER_WEB_BROWSER
+#endif
+
+#define DEFAULT_USER_MANUAL_ONLINE_URI \
+  "https://docs.gimp.org/" GIMP_APP_VERSION_STRING
+
+
+enum
+{
+  SIZE_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_EDIT_NON_VISIBLE,
+  PROP_MOVE_TOOL_CHANGES_ACTIVE,
+  PROP_FILTER_TOOL_MAX_RECENT,
+  PROP_FILTER_TOOL_USE_LAST_SETTINGS,
+  PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS,
+  PROP_TRUST_DIRTY_FLAG,
+  PROP_SAVE_DEVICE_STATUS,
+  PROP_DEVICES_SHARE_TOOL,
+  PROP_SAVE_SESSION_INFO,
+  PROP_RESTORE_SESSION,
+  PROP_RESTORE_MONITOR,
+  PROP_SAVE_TOOL_OPTIONS,
+  PROP_COMPACT_SLIDERS,
+  PROP_SHOW_TOOLTIPS,
+  PROP_TEAROFF_MENUS,
+  PROP_CAN_CHANGE_ACCELS,
+  PROP_SAVE_ACCELS,
+  PROP_RESTORE_ACCELS,
+  PROP_LAST_OPENED_SIZE,
+  PROP_MAX_NEW_IMAGE_SIZE,
+  PROP_TOOLBOX_COLOR_AREA,
+  PROP_TOOLBOX_FOO_AREA,
+  PROP_TOOLBOX_IMAGE_AREA,
+  PROP_TOOLBOX_WILBER,
+  PROP_TOOLBOX_GROUPS,
+  PROP_TOOLBOX_GROUP_MENU_MODE,
+  PROP_THEME_PATH,
+  PROP_THEME,
+  PROP_ICON_THEME_PATH,
+  PROP_ICON_THEME,
+  PROP_ICON_SIZE,
+  PROP_USE_HELP,
+  PROP_SHOW_HELP_BUTTON,
+  PROP_HELP_LOCALES,
+  PROP_HELP_BROWSER,
+  PROP_SEARCH_SHOW_UNAVAILABLE_ACTIONS,
+  PROP_ACTION_HISTORY_SIZE,
+  PROP_USER_MANUAL_ONLINE,
+  PROP_USER_MANUAL_ONLINE_URI,
+  PROP_DOCK_WINDOW_HINT,
+  PROP_CURSOR_HANDEDNESS,
+
+  PROP_PLAYGROUND_NPD_TOOL,
+  PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL,
+
+  PROP_HIDE_DOCKS,
+  PROP_SINGLE_WINDOW_MODE,
+  PROP_SHOW_TABS,
+  PROP_TABS_POSITION,
+  PROP_LAST_TIP_SHOWN,
+
+  /* ignored, only for backward compatibility: */
+  PROP_CURSOR_FORMAT,
+  PROP_IMAGE_MAP_TOOL_MAX_RECENT,
+  PROP_INFO_WINDOW_PER_DISPLAY,
+  PROP_MENU_MNEMONICS,
+  PROP_SHOW_TOOL_TIPS,
+  PROP_SHOW_TIPS,
+  PROP_TOOLBOX_WINDOW_HINT,
+  PROP_TRANSIENT_DOCKS,
+  PROP_WEB_BROWSER
+};
+
+
+static void   gimp_gui_config_finalize     (GObject      *object);
+static void   gimp_gui_config_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec);
+static void   gimp_gui_config_get_property (GObject      *object,
+                                            guint         property_id,
+                                            GValue       *value,
+                                            GParamSpec   *pspec);
+
+static void   monitor_resolution_changed   (GimpDisplayConfig *display_config,
+                                            GParamSpec        *pspec,
+                                            GimpGuiConfig     *gui_config);
+
+G_DEFINE_TYPE (GimpGuiConfig, gimp_gui_config, GIMP_TYPE_DISPLAY_CONFIG)
+
+#define parent_class gimp_gui_config_parent_class
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+static void
+gimp_gui_config_class_init (GimpGuiConfigClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  gchar        *path;
+
+  signals[SIZE_CHANGED] =
+    g_signal_new ("size-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpGuiConfigClass, size_changed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize     = gimp_gui_config_finalize;
+  object_class->set_property = gimp_gui_config_set_property;
+  object_class->get_property = gimp_gui_config_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_EDIT_NON_VISIBLE,
+                            "edit-non-visible",
+                            "Non-visible layers can be edited",
+                            EDIT_NON_VISIBLE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MOVE_TOOL_CHANGES_ACTIVE,
+                            "move-tool-changes-active",
+                            "Move tool changes active layer",
+                            MOVE_TOOL_CHANGES_ACTIVE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_FILTER_TOOL_MAX_RECENT,
+                        "filter-tool-max-recent",
+                        "Max recent settings to keep in filters",
+                        FILTER_TOOL_MAX_RECENT_BLURB,
+                        0, 255, 10,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILTER_TOOL_USE_LAST_SETTINGS,
+                            "filter-tool-use-last-settings",
+                            "Use last used settings in filters",
+                            FILTER_TOOL_USE_LAST_SETTINGS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS,
+                            "filter-tool-show-color-options",
+                            "Show avanced color options in filters",
+                            FILTER_TOOL_SHOW_COLOR_OPTIONS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TRUST_DIRTY_FLAG,
+                            "trust-dirty-flag",
+                            "Trust dirty flag",
+                            TRUST_DIRTY_FLAG_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAVE_DEVICE_STATUS,
+                            "save-device-status",
+                            "Save device status",
+                            SAVE_DEVICE_STATUS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEVICES_SHARE_TOOL,
+                            "devices-share-tool",
+                            "Devices share tool",
+                            DEVICES_SHARE_TOOL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAVE_SESSION_INFO,
+                            "save-session-info",
+                            "Save session",
+                            SAVE_SESSION_INFO_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_RESTORE_SESSION,
+                            "restore-session",
+                            "Restore session",
+                            RESTORE_SESSION_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_RESTORE_MONITOR,
+                            "restore-monitor",
+                            "Restore monitor",
+                            RESTORE_MONITOR_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAVE_TOOL_OPTIONS,
+                            "save-tool-options",
+                            "Save tool options",
+                            SAVE_TOOL_OPTIONS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COMPACT_SLIDERS,
+                            "compact-sliders",
+                            "Compact sliders",
+                            COMPACT_SLIDERS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_TOOLTIPS,
+                            "show-tooltips",
+                            "Show tooltips",
+                            SHOW_TOOLTIPS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TEAROFF_MENUS,
+                            "tearoff-menus",
+                            "Tearoff menus",
+                            TEAROFF_MENUS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CAN_CHANGE_ACCELS,
+                            "can-change-accels",
+                            "Can change accelerators",
+                            CAN_CHANGE_ACCELS_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAVE_ACCELS,
+                            "save-accels",
+                            "Save accelerators",
+                            SAVE_ACCELS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_RESTORE_ACCELS,
+                            "restore-accels",
+                            "Restore acclerator",
+                            RESTORE_ACCELS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LAST_OPENED_SIZE,
+                        "last-opened-size",
+                        "Size of recently used menu",
+                        LAST_OPENED_SIZE_BLURB,
+                        0, 1024, 10,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_MEMSIZE (object_class, PROP_MAX_NEW_IMAGE_SIZE,
+                            "max-new-image-size",
+                            "Maximum new image size",
+                            MAX_NEW_IMAGE_SIZE_BLURB,
+                            0, GIMP_MAX_MEMSIZE, 1 << 27, /* 128MB */
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TOOLBOX_COLOR_AREA,
+                            "toolbox-color-area",
+                            "Show toolbox color area",
+                            TOOLBOX_COLOR_AREA_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TOOLBOX_FOO_AREA,
+                            "toolbox-foo-area",
+                            "Show toolbox foo area",
+                            TOOLBOX_FOO_AREA_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TOOLBOX_IMAGE_AREA,
+                            "toolbox-image-area",
+                            "Show toolbox image area",
+                            TOOLBOX_IMAGE_AREA_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
+                            "toolbox-wilber",
+                            "Show toolbox wilber",
+                            TOOLBOX_WILBER_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TOOLBOX_GROUPS,
+                            "toolbox-groups",
+                            "Use toolbox groups",
+                            TOOLBOX_GROUPS_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TOOLBOX_GROUP_MENU_MODE,
+                         "toolbox-group-menu-mode",
+                         "Toolbox group menu mode",
+                         TOOLBOX_GROUP_MENU_MODE_BLURB,
+                         GIMP_TYPE_TOOL_GROUP_MENU_MODE,
+                         GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER_SINGLE_COLUMN,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  path = gimp_config_build_data_path ("themes");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_THEME_PATH,
+                         "theme-path",
+                         "Theme path",
+                         THEME_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+  g_free (path);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_THEME,
+                           "theme",
+                           "Theme",
+                           THEME_BLURB,
+                           GIMP_CONFIG_DEFAULT_THEME,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  path = gimp_config_build_data_path ("icons");
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_ICON_THEME_PATH,
+                         "icon-theme-path",
+                         "Icon theme path",
+                         ICON_THEME_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+  g_free (path);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_ICON_THEME,
+                           "icon-theme",
+                           "Icon theme",
+                           ICON_THEME_BLURB,
+                           GIMP_CONFIG_DEFAULT_ICON_THEME,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ICON_SIZE,
+                         "icon-size",
+                         "icon-size",
+                         ICON_SIZE_BLURB,
+                         GIMP_TYPE_ICON_SIZE,
+                         GIMP_ICON_SIZE_AUTO,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_HELP,
+                            "use-help",
+                            "Use help",
+                            USE_HELP_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_HELP_BUTTON,
+                            "show-help-button",
+                            "Show help button",
+                            SHOW_HELP_BUTTON_BLURB,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_HELP_LOCALES,
+                           "help-locales",
+                           "Help locales",
+                           HELP_LOCALES_BLURB,
+                           "",
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_HELP_BROWSER,
+                         "help-browser",
+                         "Help browser",
+                         HELP_BROWSER_BLURB,
+                         GIMP_TYPE_HELP_BROWSER_TYPE,
+                         DEFAULT_HELP_BROWSER,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USER_MANUAL_ONLINE,
+                            "user-manual-online",
+                            "User manual online",
+                            USER_MANUAL_ONLINE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_USER_MANUAL_ONLINE_URI,
+                           "user-manual-online-uri",
+                           "User manual online URI",
+                           USER_MANUAL_ONLINE_URI_BLURB,
+                           DEFAULT_USER_MANUAL_ONLINE_URI,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SEARCH_SHOW_UNAVAILABLE_ACTIONS,
+                            "search-show-unavailable-actions",
+                            "Show unavailable actions",
+                            SEARCH_SHOW_UNAVAILABLE_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_ACTION_HISTORY_SIZE,
+                        "action-history-size",
+                        "Action history size",
+                        ACTION_HISTORY_SIZE_BLURB,
+                        0, 1000, 100,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DOCK_WINDOW_HINT,
+                         "dock-window-hint",
+                         "Dock window hint",
+                         DOCK_WINDOW_HINT_BLURB,
+                         GIMP_TYPE_WINDOW_HINT,
+                         GIMP_WINDOW_HINT_UTILITY,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CURSOR_HANDEDNESS,
+                         "cursor-handedness",
+                         "Cursor handedness",
+                         CURSOR_HANDEDNESS_BLURB,
+                         GIMP_TYPE_HANDEDNESS,
+                         GIMP_HANDEDNESS_RIGHT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PLAYGROUND_NPD_TOOL,
+                            "playground-npd-tool",
+                            "Playground N-Point Deformation tool",
+                            PLAYGROUND_NPD_TOOL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_RESTART);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class,
+                            PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL,
+                            "playground-seamless-clone-tool",
+                            "Playground Seamless Clone tool",
+                            PLAYGROUND_SEAMLESS_CLONE_TOOL_BLURB,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_RESTART);
+
+  g_object_class_install_property (object_class, PROP_HIDE_DOCKS,
+                                   g_param_spec_boolean ("hide-docks",
+                                                         NULL,
+                                                         HIDE_DOCKS_BLURB,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT |
+                                                         GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_SINGLE_WINDOW_MODE,
+                                   g_param_spec_boolean ("single-window-mode",
+                                                         NULL,
+                                                         SINGLE_WINDOW_MODE_BLURB,
+                                                         TRUE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT |
+                                                         GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_SHOW_TABS,
+                                   g_param_spec_boolean ("show-tabs",
+                                                         NULL,
+                                                         SHOW_TABS_BLURB,
+                                                         TRUE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT |
+                                                         GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_TABS_POSITION,
+                                   g_param_spec_enum ("tabs-position", NULL, NULL,
+                                                      GIMP_TYPE_POSITION,
+                                                      GIMP_POSITION_TOP,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT |
+                                                      GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_LAST_TIP_SHOWN,
+                                   g_param_spec_int ("last-tip-shown",
+                                                     NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT |
+                                                     GIMP_PARAM_STATIC_STRINGS));
+
+  /*  only for backward compatibility:  */
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CURSOR_FORMAT,
+                         "cursor-format",
+                         NULL, NULL,
+                         GIMP_TYPE_CURSOR_FORMAT,
+                         GIMP_CURSOR_FORMAT_PIXBUF,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_IMAGE_MAP_TOOL_MAX_RECENT,
+                        "image-map-tool-max-recent",
+                        NULL, NULL,
+                        0, 255, 10,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_INFO_WINDOW_PER_DISPLAY,
+                            "info-window-per-display",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MENU_MNEMONICS,
+                            "menu-mnemonics",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_TOOL_TIPS,
+                            "show-tool-tips",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_TIPS,
+                            "show-tips",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TOOLBOX_WINDOW_HINT,
+                         "toolbox-window-hint",
+                         NULL, NULL,
+                         GIMP_TYPE_WINDOW_HINT,
+                         GIMP_WINDOW_HINT_UTILITY,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TRANSIENT_DOCKS,
+                            "transient-docks",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_IGNORE);
+
+  GIMP_CONFIG_PROP_PATH (object_class, PROP_WEB_BROWSER,
+                         "web-browser",
+                         NULL, NULL,
+                         GIMP_CONFIG_PATH_FILE,
+                         "not used any longer",
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_IGNORE);
+}
+
+static void
+gimp_gui_config_init (GimpGuiConfig *config)
+{
+}
+
+static void
+gimp_gui_config_finalize (GObject *object)
+{
+  GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (object);
+
+  g_free (gui_config->theme_path);
+  g_free (gui_config->theme);
+  g_free (gui_config->icon_theme_path);
+  g_free (gui_config->icon_theme);
+  g_free (gui_config->help_locales);
+  g_free (gui_config->user_manual_online_uri);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_gui_config_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_EDIT_NON_VISIBLE:
+      gui_config->edit_non_visible = g_value_get_boolean (value);
+      break;
+    case PROP_MOVE_TOOL_CHANGES_ACTIVE:
+      gui_config->move_tool_changes_active = g_value_get_boolean (value);
+      break;
+    case PROP_FILTER_TOOL_MAX_RECENT:
+    case PROP_IMAGE_MAP_TOOL_MAX_RECENT:
+      gui_config->filter_tool_max_recent = g_value_get_int (value);
+      break;
+    case PROP_FILTER_TOOL_USE_LAST_SETTINGS:
+      gui_config->filter_tool_use_last_settings = g_value_get_boolean (value);
+      break;
+    case PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS:
+      gui_config->filter_tool_show_color_options = g_value_get_boolean (value);
+      break;
+    case PROP_TRUST_DIRTY_FLAG:
+      gui_config->trust_dirty_flag = g_value_get_boolean (value);
+      break;
+    case PROP_SAVE_DEVICE_STATUS:
+      gui_config->save_device_status = g_value_get_boolean (value);
+      break;
+    case PROP_DEVICES_SHARE_TOOL:
+      gui_config->devices_share_tool = g_value_get_boolean (value);
+      break;
+    case PROP_SAVE_SESSION_INFO:
+      gui_config->save_session_info = g_value_get_boolean (value);
+      break;
+    case PROP_RESTORE_SESSION:
+      gui_config->restore_session = g_value_get_boolean (value);
+      break;
+    case PROP_RESTORE_MONITOR:
+      gui_config->restore_monitor = g_value_get_boolean (value);
+      break;
+    case PROP_SAVE_TOOL_OPTIONS:
+      gui_config->save_tool_options = g_value_get_boolean (value);
+      break;
+    case PROP_COMPACT_SLIDERS:
+      gui_config->compact_sliders = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_TOOLTIPS:
+      gui_config->show_tooltips = g_value_get_boolean (value);
+      break;
+    case PROP_TEAROFF_MENUS:
+      gui_config->tearoff_menus = g_value_get_boolean (value);
+      break;
+    case PROP_CAN_CHANGE_ACCELS:
+      gui_config->can_change_accels = g_value_get_boolean (value);
+      break;
+    case PROP_SAVE_ACCELS:
+      gui_config->save_accels = g_value_get_boolean (value);
+      break;
+    case PROP_RESTORE_ACCELS:
+      gui_config->restore_accels = g_value_get_boolean (value);
+      break;
+    case PROP_LAST_OPENED_SIZE:
+      gui_config->last_opened_size = g_value_get_int (value);
+      break;
+    case PROP_MAX_NEW_IMAGE_SIZE:
+      gui_config->max_new_image_size = g_value_get_uint64 (value);
+      break;
+    case PROP_TOOLBOX_COLOR_AREA:
+      gui_config->toolbox_color_area = g_value_get_boolean (value);
+      break;
+    case PROP_TOOLBOX_FOO_AREA:
+      gui_config->toolbox_foo_area = g_value_get_boolean (value);
+      break;
+    case PROP_TOOLBOX_IMAGE_AREA:
+      gui_config->toolbox_image_area = g_value_get_boolean (value);
+      break;
+    case PROP_TOOLBOX_WILBER:
+      gui_config->toolbox_wilber = g_value_get_boolean (value);
+      break;
+    case PROP_TOOLBOX_GROUPS:
+      gui_config->toolbox_groups = g_value_get_boolean (value);
+      break;
+    case PROP_TOOLBOX_GROUP_MENU_MODE:
+      gui_config->toolbox_group_menu_mode = g_value_get_enum (value);
+      break;
+     case PROP_THEME_PATH:
+      g_free (gui_config->theme_path);
+      gui_config->theme_path = g_value_dup_string (value);
+      break;
+    case PROP_THEME:
+      g_free (gui_config->theme);
+      gui_config->theme = g_value_dup_string (value);
+      break;
+     case PROP_ICON_THEME_PATH:
+      g_free (gui_config->icon_theme_path);
+      gui_config->icon_theme_path = g_value_dup_string (value);
+      break;
+    case PROP_ICON_THEME:
+      g_free (gui_config->icon_theme);
+      gui_config->icon_theme = g_value_dup_string (value);
+      break;
+    case PROP_ICON_SIZE:
+        {
+          GimpIconSize size = g_value_get_enum (value);
+
+          g_signal_handlers_disconnect_by_func (GIMP_DISPLAY_CONFIG (gui_config),
+                                                G_CALLBACK (monitor_resolution_changed),
+                                                gui_config);
+          if (size == GIMP_ICON_SIZE_AUTO)
+            {
+              g_signal_connect (GIMP_DISPLAY_CONFIG (gui_config),
+                                "notify::monitor-xresolution",
+                                G_CALLBACK (monitor_resolution_changed),
+                                gui_config);
+              g_signal_connect (GIMP_DISPLAY_CONFIG (gui_config),
+                                "notify::monitor-yresolution",
+                                G_CALLBACK (monitor_resolution_changed),
+                                gui_config);
+            }
+          gui_config->icon_size = size;
+          g_signal_emit (gui_config, signals[SIZE_CHANGED], 0);
+        }
+      break;
+    case PROP_USE_HELP:
+      gui_config->use_help = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_HELP_BUTTON:
+      gui_config->show_help_button = g_value_get_boolean (value);
+      break;
+    case PROP_HELP_LOCALES:
+      g_free (gui_config->help_locales);
+      gui_config->help_locales = g_value_dup_string (value);
+      break;
+    case PROP_HELP_BROWSER:
+      gui_config->help_browser = g_value_get_enum (value);
+      break;
+    case PROP_USER_MANUAL_ONLINE:
+      gui_config->user_manual_online = g_value_get_boolean (value);
+      break;
+    case PROP_USER_MANUAL_ONLINE_URI:
+      g_free (gui_config->user_manual_online_uri);
+      gui_config->user_manual_online_uri = g_value_dup_string (value);
+      break;
+    case PROP_SEARCH_SHOW_UNAVAILABLE_ACTIONS:
+      gui_config->search_show_unavailable = g_value_get_boolean (value);
+      break;
+    case PROP_ACTION_HISTORY_SIZE:
+      gui_config->action_history_size = g_value_get_int (value);
+      break;
+    case PROP_DOCK_WINDOW_HINT:
+      gui_config->dock_window_hint = g_value_get_enum (value);
+      break;
+    case PROP_CURSOR_HANDEDNESS:
+      gui_config->cursor_handedness = g_value_get_enum (value);
+      break;
+
+    case PROP_PLAYGROUND_NPD_TOOL:
+      gui_config->playground_npd_tool = g_value_get_boolean (value);
+      break;
+    case PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL:
+      gui_config->playground_seamless_clone_tool = g_value_get_boolean (value);
+      break;
+
+    case PROP_HIDE_DOCKS:
+      gui_config->hide_docks = g_value_get_boolean (value);
+      break;
+    case PROP_SINGLE_WINDOW_MODE:
+      gui_config->single_window_mode = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_TABS:
+      gui_config->show_tabs = g_value_get_boolean (value);
+      break;
+    case PROP_TABS_POSITION:
+      gui_config->tabs_position = g_value_get_enum (value);
+      break;
+    case PROP_LAST_TIP_SHOWN:
+      gui_config->last_tip_shown = g_value_get_int (value);
+      break;
+
+    case PROP_CURSOR_FORMAT:
+    case PROP_INFO_WINDOW_PER_DISPLAY:
+    case PROP_MENU_MNEMONICS:
+    case PROP_SHOW_TOOL_TIPS:
+    case PROP_SHOW_TIPS:
+    case PROP_TOOLBOX_WINDOW_HINT:
+    case PROP_TRANSIENT_DOCKS:
+    case PROP_WEB_BROWSER:
+      /* ignored */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_gui_config_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_EDIT_NON_VISIBLE:
+      g_value_set_boolean (value, gui_config->edit_non_visible);
+      break;
+    case PROP_MOVE_TOOL_CHANGES_ACTIVE:
+      g_value_set_boolean (value, gui_config->move_tool_changes_active);
+      break;
+    case PROP_FILTER_TOOL_MAX_RECENT:
+    case PROP_IMAGE_MAP_TOOL_MAX_RECENT:
+      g_value_set_int (value, gui_config->filter_tool_max_recent);
+      break;
+    case PROP_FILTER_TOOL_USE_LAST_SETTINGS:
+      g_value_set_boolean (value, gui_config->filter_tool_use_last_settings);
+      break;
+    case PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS:
+      g_value_set_boolean (value, gui_config->filter_tool_show_color_options);
+      break;
+    case PROP_TRUST_DIRTY_FLAG:
+      g_value_set_boolean (value, gui_config->trust_dirty_flag);
+      break;
+    case PROP_SAVE_DEVICE_STATUS:
+      g_value_set_boolean (value, gui_config->save_device_status);
+      break;
+    case PROP_DEVICES_SHARE_TOOL:
+      g_value_set_boolean (value, gui_config->devices_share_tool);
+      break;
+    case PROP_SAVE_SESSION_INFO:
+      g_value_set_boolean (value, gui_config->save_session_info);
+      break;
+    case PROP_RESTORE_SESSION:
+      g_value_set_boolean (value, gui_config->restore_session);
+      break;
+    case PROP_RESTORE_MONITOR:
+      g_value_set_boolean (value, gui_config->restore_monitor);
+      break;
+    case PROP_SAVE_TOOL_OPTIONS:
+      g_value_set_boolean (value, gui_config->save_tool_options);
+      break;
+    case PROP_COMPACT_SLIDERS:
+      g_value_set_boolean (value, gui_config->compact_sliders);
+      break;
+    case PROP_SHOW_TOOLTIPS:
+      g_value_set_boolean (value, gui_config->show_tooltips);
+      break;
+    case PROP_TEAROFF_MENUS:
+      g_value_set_boolean (value, gui_config->tearoff_menus);
+      break;
+    case PROP_CAN_CHANGE_ACCELS:
+      g_value_set_boolean (value, gui_config->can_change_accels);
+      break;
+    case PROP_SAVE_ACCELS:
+      g_value_set_boolean (value, gui_config->save_accels);
+      break;
+    case PROP_RESTORE_ACCELS:
+      g_value_set_boolean (value, gui_config->restore_accels);
+      break;
+    case PROP_LAST_OPENED_SIZE:
+      g_value_set_int (value, gui_config->last_opened_size);
+      break;
+    case PROP_MAX_NEW_IMAGE_SIZE:
+      g_value_set_uint64 (value, gui_config->max_new_image_size);
+      break;
+    case PROP_TOOLBOX_COLOR_AREA:
+      g_value_set_boolean (value, gui_config->toolbox_color_area);
+      break;
+    case PROP_TOOLBOX_FOO_AREA:
+      g_value_set_boolean (value, gui_config->toolbox_foo_area);
+      break;
+    case PROP_TOOLBOX_IMAGE_AREA:
+      g_value_set_boolean (value, gui_config->toolbox_image_area);
+      break;
+    case PROP_TOOLBOX_WILBER:
+      g_value_set_boolean (value, gui_config->toolbox_wilber);
+      break;
+    case PROP_TOOLBOX_GROUPS:
+      g_value_set_boolean (value, gui_config->toolbox_groups);
+      break;
+    case PROP_TOOLBOX_GROUP_MENU_MODE:
+      g_value_set_enum (value, gui_config->toolbox_group_menu_mode);
+      break;
+    case PROP_THEME_PATH:
+      g_value_set_string (value, gui_config->theme_path);
+      break;
+    case PROP_THEME:
+      g_value_set_string (value, gui_config->theme);
+      break;
+    case PROP_ICON_THEME_PATH:
+      g_value_set_string (value, gui_config->icon_theme_path);
+      break;
+    case PROP_ICON_THEME:
+      g_value_set_string (value, gui_config->icon_theme);
+      break;
+    case PROP_ICON_SIZE:
+      g_value_set_enum (value, gui_config->icon_size);
+      break;
+    case PROP_USE_HELP:
+      g_value_set_boolean (value, gui_config->use_help);
+      break;
+    case PROP_SHOW_HELP_BUTTON:
+      g_value_set_boolean (value, gui_config->show_help_button);
+      break;
+    case PROP_HELP_LOCALES:
+      g_value_set_string (value, gui_config->help_locales);
+      break;
+    case PROP_HELP_BROWSER:
+      g_value_set_enum (value, gui_config->help_browser);
+      break;
+    case PROP_USER_MANUAL_ONLINE:
+      g_value_set_boolean (value, gui_config->user_manual_online);
+      break;
+    case PROP_USER_MANUAL_ONLINE_URI:
+      g_value_set_string (value, gui_config->user_manual_online_uri);
+      break;
+    case PROP_SEARCH_SHOW_UNAVAILABLE_ACTIONS:
+      g_value_set_boolean (value, gui_config->search_show_unavailable);
+      break;
+    case PROP_ACTION_HISTORY_SIZE:
+      g_value_set_int (value, gui_config->action_history_size);
+      break;
+    case PROP_DOCK_WINDOW_HINT:
+      g_value_set_enum (value, gui_config->dock_window_hint);
+      break;
+    case PROP_CURSOR_HANDEDNESS:
+      g_value_set_enum (value, gui_config->cursor_handedness);
+      break;
+
+    case PROP_PLAYGROUND_NPD_TOOL:
+      g_value_set_boolean (value, gui_config->playground_npd_tool);
+      break;
+    case PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL:
+      g_value_set_boolean (value, gui_config->playground_seamless_clone_tool);
+      break;
+
+    case PROP_HIDE_DOCKS:
+      g_value_set_boolean (value, gui_config->hide_docks);
+      break;
+    case PROP_SINGLE_WINDOW_MODE:
+      g_value_set_boolean (value, gui_config->single_window_mode);
+      break;
+    case PROP_SHOW_TABS:
+      g_value_set_boolean (value, gui_config->show_tabs);
+      break;
+    case PROP_TABS_POSITION:
+      g_value_set_enum (value, gui_config->tabs_position);
+      break;
+    case PROP_LAST_TIP_SHOWN:
+      g_value_set_int (value, gui_config->last_tip_shown);
+      break;
+
+    case PROP_CURSOR_FORMAT:
+    case PROP_INFO_WINDOW_PER_DISPLAY:
+    case PROP_MENU_MNEMONICS:
+    case PROP_SHOW_TOOL_TIPS:
+    case PROP_SHOW_TIPS:
+    case PROP_TOOLBOX_WINDOW_HINT:
+    case PROP_TRANSIENT_DOCKS:
+    case PROP_WEB_BROWSER:
+      /* ignored */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+monitor_resolution_changed (GimpDisplayConfig *display_config,
+                            GParamSpec        *pspec,
+                            GimpGuiConfig     *gui_config)
+{
+  if (gui_config->icon_size == GIMP_ICON_SIZE_AUTO)
+    {
+      g_signal_emit (gui_config, signals[SIZE_CHANGED], 0);
+    }
+}
+
+GimpIconSize
+gimp_gui_config_detect_icon_size (GimpGuiConfig *gui_config)
+{
+  GimpIconSize size = gui_config->icon_size;
+
+  if (size == GIMP_ICON_SIZE_AUTO)
+    {
+      GimpDisplayConfig *display_config;
+
+      display_config = GIMP_DISPLAY_CONFIG (gui_config);
+
+      if (display_config->monitor_xres < 100.0 ||
+          display_config->monitor_yres < 100.0)
+        size = GIMP_ICON_SIZE_SMALL;
+      else if (display_config->monitor_xres < 192.0 ||
+               display_config->monitor_yres < 192.0)
+        size = GIMP_ICON_SIZE_MEDIUM;
+      else if (display_config->monitor_xres < 250.0 ||
+               display_config->monitor_yres < 250.0)
+        size = GIMP_ICON_SIZE_LARGE;
+      else
+        size = GIMP_ICON_SIZE_HUGE;
+    }
+
+  return size;
+}
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
new file mode 100644
index 0000000..b2a25ee
--- /dev/null
+++ b/app/config/gimpguiconfig.h
@@ -0,0 +1,110 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGuiConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GUI_CONFIG_H__
+#define __GIMP_GUI_CONFIG_H__
+
+#include "config/gimpdisplayconfig.h"
+
+
+#define GIMP_CONFIG_DEFAULT_THEME          "Dark"
+#define GIMP_CONFIG_DEFAULT_ICON_THEME     "Symbolic"
+
+
+#define GIMP_TYPE_GUI_CONFIG            (gimp_gui_config_get_type ())
+#define GIMP_GUI_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GUI_CONFIG, GimpGuiConfig))
+#define GIMP_GUI_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GUI_CONFIG, GimpGuiConfigClass))
+#define GIMP_IS_GUI_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GUI_CONFIG))
+#define GIMP_IS_GUI_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GUI_CONFIG))
+
+
+typedef struct _GimpGuiConfigClass GimpGuiConfigClass;
+
+struct _GimpGuiConfig
+{
+  GimpDisplayConfig      parent_instance;
+
+  gboolean               edit_non_visible;
+  gboolean               move_tool_changes_active;
+  gint                   filter_tool_max_recent;
+  gboolean               filter_tool_use_last_settings;
+  gboolean               filter_tool_show_color_options;
+  gboolean               trust_dirty_flag;
+  gboolean               save_device_status;
+  gboolean               devices_share_tool;
+  gboolean               save_session_info;
+  gboolean               restore_session;
+  gboolean               restore_monitor;
+  gboolean               save_tool_options;
+  gboolean               compact_sliders;
+  gboolean               show_tooltips;
+  gboolean               tearoff_menus;
+  gboolean               can_change_accels;
+  gboolean               save_accels;
+  gboolean               restore_accels;
+  gint                   last_opened_size;
+  guint64                max_new_image_size;
+  gboolean               toolbox_color_area;
+  gboolean               toolbox_foo_area;
+  gboolean               toolbox_image_area;
+  gboolean               toolbox_wilber;
+  gboolean               toolbox_groups;
+  GimpToolGroupMenuMode  toolbox_group_menu_mode;
+  gchar                 *theme_path;
+  gchar                 *theme;
+  gchar                 *icon_theme_path;
+  gchar                 *icon_theme;
+  GimpIconSize           icon_size;
+  gboolean               use_help;
+  gboolean               show_help_button;
+  gchar                 *help_locales;
+  GimpHelpBrowserType    help_browser;
+  gboolean               user_manual_online;
+  gchar                 *user_manual_online_uri;
+  gboolean               search_show_unavailable;
+  gint                   action_history_size;
+  GimpWindowHint         dock_window_hint;
+  GimpHandedness         cursor_handedness;
+
+  /* experimental playground */
+  gboolean             playground_npd_tool;
+  gboolean             playground_seamless_clone_tool;
+
+  /* saved in sessionrc */
+  gboolean             hide_docks;
+  gboolean             single_window_mode;
+  gboolean             show_tabs;
+  GimpPosition         tabs_position;
+  gint                 last_tip_shown;
+};
+
+struct _GimpGuiConfigClass
+{
+  GimpDisplayConfigClass  parent_class;
+
+  void (* size_changed) (GimpGuiConfig *config);
+};
+
+
+GType  gimp_gui_config_get_type (void) G_GNUC_CONST;
+
+GimpIconSize gimp_gui_config_detect_icon_size (GimpGuiConfig *config);
+
+#endif /* GIMP_GUI_CONFIG_H__ */
diff --git a/app/config/gimplangrc.c b/app/config/gimplangrc.c
new file mode 100644
index 0000000..34e26f4
--- /dev/null
+++ b/app/config/gimplangrc.c
@@ -0,0 +1,280 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpLangRc: pre-parsing of gimprc returning the language.
+ * Copyright (C) 2017  Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimplangrc.h"
+
+enum
+{
+  PROP_0,
+  PROP_VERBOSE,
+  PROP_SYSTEM_GIMPRC,
+  PROP_USER_GIMPRC,
+  PROP_LANGUAGE
+};
+
+
+static void         gimp_lang_rc_constructed       (GObject      *object);
+static void         gimp_lang_rc_finalize          (GObject      *object);
+static void         gimp_lang_rc_set_property      (GObject      *object,
+                                                    guint         property_id,
+                                                    const GValue *value,
+                                                    GParamSpec   *pspec);
+static void         gimp_lang_rc_get_property      (GObject      *object,
+                                                    guint         property_id,
+                                                    GValue       *value,
+                                                    GParamSpec   *pspec);
+
+
+/* Just use GimpConfig interface's default implementation which will
+ * fill the PROP_LANGUAGE property. */
+G_DEFINE_TYPE_WITH_CODE (GimpLangRc, gimp_lang_rc, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+#define parent_class gimp_lang_rc_parent_class
+
+
+static void
+gimp_lang_rc_class_init (GimpLangRcClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_lang_rc_constructed;
+  object_class->finalize     = gimp_lang_rc_finalize;
+  object_class->set_property = gimp_lang_rc_set_property;
+  object_class->get_property = gimp_lang_rc_get_property;
+
+  g_object_class_install_property (object_class, PROP_VERBOSE,
+                                   g_param_spec_boolean ("verbose",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SYSTEM_GIMPRC,
+                                   g_param_spec_object ("system-gimprc",
+                                                        NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_USER_GIMPRC,
+                                   g_param_spec_object ("user-gimprc",
+                                                        NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LANGUAGE,
+                           "language", NULL, NULL, NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+}
+
+static void
+gimp_lang_rc_init (GimpLangRc *rc)
+{
+}
+
+static void
+gimp_lang_rc_constructed (GObject *object)
+{
+  GimpLangRc *rc = GIMP_LANG_RC (object);
+  GError     *error = NULL;
+
+  if (rc->verbose)
+    g_print ("Parsing '%s' for configured language.\n",
+             gimp_file_get_utf8_name (rc->system_gimprc));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (rc),
+                                       rc->system_gimprc, NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        g_message ("%s", error->message);
+
+      g_clear_error (&error);
+    }
+
+  if (rc->verbose)
+    g_print ("Parsing '%s' for configured language.\n",
+             gimp_file_get_utf8_name (rc->user_gimprc));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (rc),
+                                       rc->user_gimprc, NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        g_message ("%s", error->message);
+
+      g_clear_error (&error);
+    }
+
+  if (rc->verbose)
+    {
+      if (rc->language)
+        g_print ("Language property found: %s.\n", rc->language);
+      else
+        g_print ("No language property found.\n");
+    }
+}
+
+static void
+gimp_lang_rc_finalize (GObject *object)
+{
+  GimpLangRc *rc = GIMP_LANG_RC (object);
+
+  g_clear_object (&rc->system_gimprc);
+  g_clear_object (&rc->user_gimprc);
+
+  g_clear_pointer (&rc->language, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_lang_rc_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GimpLangRc *rc = GIMP_LANG_RC (object);
+
+  switch (property_id)
+    {
+    case PROP_VERBOSE:
+      rc->verbose = g_value_get_boolean (value);
+      break;
+
+    case PROP_SYSTEM_GIMPRC:
+      if (rc->system_gimprc)
+        g_object_unref (rc->system_gimprc);
+
+      if (g_value_get_object (value))
+        rc->system_gimprc = g_value_dup_object (value);
+      else
+        rc->system_gimprc = gimp_sysconf_directory_file ("gimprc", NULL);
+      break;
+
+    case PROP_USER_GIMPRC:
+      if (rc->user_gimprc)
+        g_object_unref (rc->user_gimprc);
+
+      if (g_value_get_object (value))
+        rc->user_gimprc = g_value_dup_object (value);
+      else
+        rc->user_gimprc = gimp_directory_file ("gimprc", NULL);
+      break;
+
+    case PROP_LANGUAGE:
+      if (rc->language)
+        g_free (rc->language);
+      rc->language = g_value_dup_string (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_lang_rc_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GimpLangRc *rc = GIMP_LANG_RC (object);
+
+  switch (property_id)
+    {
+    case PROP_VERBOSE:
+      g_value_set_boolean (value, rc->verbose);
+      break;
+    case PROP_SYSTEM_GIMPRC:
+      g_value_set_object (value, rc->system_gimprc);
+      break;
+    case PROP_USER_GIMPRC:
+      g_value_set_object (value, rc->user_gimprc);
+      break;
+    case PROP_LANGUAGE:
+      g_value_set_string (value, rc->language);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_lang_rc_new:
+ * @system_gimprc: the name of the system-wide gimprc file or %NULL to
+ *                 use the standard location
+ * @user_gimprc:   the name of the user gimprc file or %NULL to use the
+ *                 standard location
+ * @verbose:       enable console messages about loading the language
+ *
+ * Creates a new GimpLangRc object which only looks for the configure
+ * language.
+ *
+ * Returns: the new #GimpLangRc.
+ */
+GimpLangRc *
+gimp_lang_rc_new (GFile    *system_gimprc,
+                  GFile    *user_gimprc,
+                  gboolean  verbose)
+{
+  GimpLangRc *rc;
+
+  g_return_val_if_fail (system_gimprc == NULL || G_IS_FILE (system_gimprc),
+                        NULL);
+  g_return_val_if_fail (user_gimprc == NULL || G_IS_FILE (user_gimprc),
+                        NULL);
+
+  rc = g_object_new (GIMP_TYPE_LANG_RC,
+                     "verbose",       verbose,
+                     "system-gimprc", system_gimprc,
+                     "user-gimprc",   user_gimprc,
+                     NULL);
+
+  return rc;
+}
+
+/**
+ * gimp_lang_rc_get_language:
+ * @lang_rc:  a #GimpLangRc object.
+ *
+ * This function looks up the language set in `gimprc`.
+ *
+ * Return value: a newly allocated string representing the language or
+ *               %NULL if the key couldn't be found.
+ **/
+gchar *
+gimp_lang_rc_get_language (GimpLangRc *rc)
+{
+  return rc->language ? g_strdup (rc->language) : NULL;
+}
diff --git a/app/config/gimplangrc.h b/app/config/gimplangrc.h
new file mode 100644
index 0000000..62412fd
--- /dev/null
+++ b/app/config/gimplangrc.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpLangRc: pre-parsing of gimprc returning the language.
+ * Copyright (C) 2017  Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LANG_RC_H__
+#define __GIMP_LANG_RC_H__
+
+
+#define GIMP_TYPE_LANG_RC            (gimp_lang_rc_get_type ())
+#define GIMP_LANG_RC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LANG_RC, GimpLangRc))
+#define GIMP_LANG_RC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LANG_RC, GimpLangRcClass))
+#define GIMP_IS_LANG_RC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LANG_RC))
+#define GIMP_IS_LANG_RC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LANG_RC))
+
+
+typedef struct _GimpLangRcClass GimpLangRcClass;
+
+struct _GimpLangRc
+{
+  GObject        parent_instance;
+
+  GFile         *user_gimprc;
+  GFile         *system_gimprc;
+  gboolean       verbose;
+
+  gchar         *language;
+};
+
+struct _GimpLangRcClass
+{
+  GObjectClass   parent_class;
+};
+
+
+GType         gimp_lang_rc_get_type     (void) G_GNUC_CONST;
+
+GimpLangRc  * gimp_lang_rc_new          (GFile      *system_gimprc,
+                                         GFile      *user_gimprc,
+                                         gboolean    verbose);
+gchar       * gimp_lang_rc_get_language (GimpLangRc *rc);
+
+
+#endif /* GIMP_LANG_RC_H__ */
+
diff --git a/app/config/gimppluginconfig.c b/app/config/gimppluginconfig.c
new file mode 100644
index 0000000..5fb4fe2
--- /dev/null
+++ b/app/config/gimppluginconfig.c
@@ -0,0 +1,217 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpPluginConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc-blurbs.h"
+#include "gimppluginconfig.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FRACTALEXPLORER_PATH,
+  PROP_GFIG_PATH,
+  PROP_GFLARE_PATH,
+  PROP_GIMPRESSIONIST_PATH,
+  PROP_SCRIPT_FU_PATH
+};
+
+
+static void  gimp_plugin_config_finalize     (GObject      *object);
+static void  gimp_plugin_config_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+static void  gimp_plugin_config_get_property (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpPluginConfig, gimp_plugin_config, GIMP_TYPE_DIALOG_CONFIG)
+
+#define parent_class gimp_plugin_config_parent_class
+
+
+static void
+gimp_plugin_config_class_init (GimpPluginConfigClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  gchar        *path;
+
+  object_class->finalize     = gimp_plugin_config_finalize;
+  object_class->set_property = gimp_plugin_config_set_property;
+  object_class->get_property = gimp_plugin_config_get_property;
+
+  path = gimp_config_build_data_path ("fractalexplorer");
+  GIMP_CONFIG_PROP_PATH (object_class,
+                         PROP_FRACTALEXPLORER_PATH,
+                         "fractalexplorer-path",
+                         "Fractal Explorer path",
+                         FRACTALEXPLORER_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("gfig");
+  GIMP_CONFIG_PROP_PATH (object_class,
+                         PROP_GFIG_PATH,
+                         "gfig-path",
+                         "GFig path",
+                         GFIG_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("gflare");
+  GIMP_CONFIG_PROP_PATH (object_class,
+                         PROP_GFLARE_PATH,
+                         "gflare-path",
+                         "GFlare path",
+                         GFLARE_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("gimpressionist");
+  GIMP_CONFIG_PROP_PATH (object_class,
+                         PROP_GIMPRESSIONIST_PATH,
+                         "gimpressionist-path",
+                         "GIMPressionist path",
+                         GIMPRESSIONIST_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS);
+  g_free (path);
+
+  path = gimp_config_build_data_path ("scripts");
+  GIMP_CONFIG_PROP_PATH (object_class,
+                         PROP_SCRIPT_FU_PATH,
+                         "script-fu-path",
+                         "Script-Fu path",
+                         SCRIPT_FU_PATH_BLURB,
+                         GIMP_CONFIG_PATH_DIR_LIST, path,
+                         GIMP_PARAM_STATIC_STRINGS);
+  g_free (path);
+}
+
+static void
+gimp_plugin_config_init (GimpPluginConfig *config)
+{
+}
+
+static void
+gimp_plugin_config_finalize (GObject *object)
+{
+  GimpPluginConfig *plugin_config = GIMP_PLUGIN_CONFIG (object);
+
+  g_free (plugin_config->fractalexplorer_path);
+  g_free (plugin_config->gfig_path);
+  g_free (plugin_config->gflare_path);
+  g_free (plugin_config->gimpressionist_path);
+  g_free (plugin_config->script_fu_path);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_plugin_config_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpPluginConfig *plugin_config = GIMP_PLUGIN_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_FRACTALEXPLORER_PATH:
+      g_free (plugin_config->fractalexplorer_path);
+      plugin_config->fractalexplorer_path = g_value_dup_string (value);
+      break;
+
+    case PROP_GFIG_PATH:
+      g_free (plugin_config->gfig_path);
+      plugin_config->gfig_path = g_value_dup_string (value);
+      break;
+
+    case PROP_GFLARE_PATH:
+      g_free (plugin_config->gflare_path);
+      plugin_config->gflare_path = g_value_dup_string (value);
+      break;
+
+    case PROP_GIMPRESSIONIST_PATH:
+      g_free (plugin_config->gimpressionist_path);
+      plugin_config->gimpressionist_path = g_value_dup_string (value);
+      break;
+
+    case PROP_SCRIPT_FU_PATH:
+      g_free (plugin_config->script_fu_path);
+      plugin_config->script_fu_path = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_plugin_config_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpPluginConfig *plugin_config = GIMP_PLUGIN_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_FRACTALEXPLORER_PATH:
+      g_value_set_string (value, plugin_config->fractalexplorer_path);
+      break;
+
+    case PROP_GFIG_PATH:
+      g_value_set_string (value, plugin_config->gfig_path);
+      break;
+
+    case PROP_GFLARE_PATH:
+      g_value_set_string (value, plugin_config->gflare_path);
+      break;
+
+    case PROP_GIMPRESSIONIST_PATH:
+      g_value_set_string (value, plugin_config->gimpressionist_path);
+      break;
+
+    case PROP_SCRIPT_FU_PATH:
+      g_value_set_string (value, plugin_config->script_fu_path);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/config/gimppluginconfig.h b/app/config/gimppluginconfig.h
new file mode 100644
index 0000000..e9b0f53
--- /dev/null
+++ b/app/config/gimppluginconfig.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpPluginConfig class
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUGIN_CONFIG_H__
+#define __GIMP_PLUGIN_CONFIG_H__
+
+#include "config/gimpdialogconfig.h"
+
+
+#define GIMP_TYPE_PLUGIN_CONFIG            (gimp_plugin_config_get_type ())
+#define GIMP_PLUGIN_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUGIN_CONFIG, GimpPluginConfig))
+#define GIMP_PLUGIN_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUGIN_CONFIG, GimpPluginConfigClass))
+#define GIMP_IS_PLUGIN_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUGIN_CONFIG))
+#define GIMP_IS_PLUGIN_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUGIN_CONFIG))
+
+
+typedef struct _GimpPluginConfigClass GimpPluginConfigClass;
+
+struct _GimpPluginConfig
+{
+  GimpDialogConfig    parent_instance;
+
+  gchar              *fractalexplorer_path;
+  gchar              *gfig_path;
+  gchar              *gflare_path;
+  gchar              *gimpressionist_path;
+  gchar              *script_fu_path;
+};
+
+struct _GimpPluginConfigClass
+{
+  GimpGuiConfigClass  parent_class;
+};
+
+
+GType  gimp_plugin_config_get_type (void) G_GNUC_CONST;
+
+
+#endif /* GIMP_PLUGIN_CONFIG_H__ */
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
new file mode 100644
index 0000000..51b771a
--- /dev/null
+++ b/app/config/gimprc-blurbs.h
@@ -0,0 +1,747 @@
+/*  gimprc-blurbs.h  --  descriptions for gimprc properties  */
+
+#ifndef __GIMP_RC_BLURBS_H__
+#define __GIMP_RC_BLURBS_H__
+
+
+/*  Not all strings defined here are used in the user interface
+ *  (the preferences dialog mainly) and only those that are should
+ *  be marked for translation.
+ */
+
+#define ACTIVATE_ON_FOCUS_BLURB \
+_("When enabled, an image will become the active image when its image " \
+  "window receives the focus. This is useful for window managers using " \
+  "\"click to focus\".")
+
+#define BRUSH_PATH_BLURB \
+"Sets the brush search path."
+
+#define BRUSH_PATH_WRITABLE_BLURB ""
+
+#define DYNAMICS_PATH_BLURB \
+_("Sets the dynamics search path.")
+
+#define DYNAMICS_PATH_WRITABLE_BLURB ""
+
+#define TOOL_PRESET_PATH_BLURB \
+_("Sets the dynamics search path.")
+
+#define TOOL_PRESET_PATH_WRITABLE_BLURB ""
+
+#define CANVAS_PADDING_COLOR_BLURB \
+_("Sets the canvas padding color used if the padding mode is set to " \
+  "custom color.")
+
+#define CANVAS_PADDING_IN_SHOW_ALL_BLURB \
+_("Specifies whether to keep the canvas padding when \"View -> Show All\" " \
+  "is enabled.")
+
+#define CANVAS_PADDING_MODE_BLURB \
+_("Specifies how the area around the image should be drawn.")
+
+#define CHECK_UPDATES_BLURB \
+_("Check for availability of GIMP updates through background internet queries.")
+
+#define CHECK_UPDATE_TIMESTAMP_BLURB \
+_("Timestamp of the last update check.")
+
+#define COLOR_MANAGEMENT_BLURB \
+"Defines the color management behavior."
+
+#define COLOR_PROFILE_POLICY_BLURB \
+_("How to handle embedded color profiles when opening a file.")
+
+#define COLOR_PROFILE_PATH_BLURB \
+_("Sets the default folder path for all color profile file dialogs.")
+
+#define COMPACT_SLIDERS_BLURB \
+_("Use compact style for sliders.")
+
+#define CURSOR_MODE_BLURB \
+_("Sets the type of mouse pointers to use.")
+
+#define CURSOR_HANDEDNESS_BLURB \
+_("Sets the handedness for cursor positioning.")
+
+#define CURSOR_UPDATING_BLURB \
+_("Context-dependent mouse pointers are helpful.  They are enabled by " \
+  "default.  However, they require overhead that you may want to do without.")
+
+#define DEFAULT_BRUSH_BLURB \
+"Specify a default brush.  The brush is searched for in the " \
+"specified brush path."
+
+#define DEFAULT_DYNAMICS_BLURB \
+"Specify a default dynamics.  The dynamics is searched for in the " \
+"specified dynamics path."
+
+#define DEFAULT_TOOL_PRESET_BLURB \
+"Specify a default tool preset.  The tool preset is searched for in the " \
+"specified tool prests path."
+
+#define DEFAULT_SHOW_ALL_BLURB \
+_("Show full image content by default.")
+
+#define DEFAULT_DOT_FOR_DOT_BLURB \
+_("When enabled, this will ensure that each pixel of an image gets " \
+  "mapped to a pixel on the screen.")
+
+#define DEFAULT_FONT_BLURB \
+"Specify a default font."
+
+#define DEFAULT_GRADIENT_BLURB \
+"Specify a default gradient."
+
+#define DEFAULT_GRID_BLURB \
+"Specify a default image grid."
+
+#define DEFAULT_IMAGE_BLURB \
+"Sets the default image in the \"File/New\" dialog."
+
+#define DEFAULT_MYPAINT_BRUSH_BLURB \
+"Specify a default MyPaint brush."
+
+#define DEFAULT_PATTERN_BLURB \
+"Specify a default pattern."
+
+#define DEFAULT_PALETTE_BLURB \
+"Specify a default palette."
+
+#define DEFAULT_SNAP_DISTANCE_BLURB \
+_("This is the distance in pixels where Guide and Grid snapping " \
+  "activates.")
+
+#define SNAP_TO_GUIDES_BLURB \
+_("Snap to guides by default in new image windows.")
+
+#define SNAP_TO_GRID_BLURB \
+_("Snap to the grid by default in new image windows.")
+
+#define SNAP_TO_CANVAS_BLURB \
+_("Snap to the canvas edges by default in new image windows.")
+
+#define SNAP_TO_PATH_BLURB \
+_("Snap to the active path by default in new image windows.")
+
+#define DEFAULT_THRESHOLD_BLURB \
+_("Tools such as fuzzy-select and bucket fill find regions based on a " \
+  "seed-fill algorithm.  The seed fill starts at the initially selected " \
+  "pixel and progresses in all directions until the difference of pixel " \
+  "intensity from the original is greater than a specified threshold. " \
+  "This value represents the default threshold.")
+
+#define DEFAULT_VIEW_BLURB \
+"Sets the default settings for the image view."
+
+#define DEFAULT_FULLSCREEN_VIEW_BLURB \
+"Sets the default settings used when an image is viewed in fullscreen mode."
+
+#define DOCK_WINDOW_HINT_BLURB \
+_("The window type hint that is set on dock windows and the toolbox " \
+  "window. This may affect the way your window manager decorates and " \
+  "handles these windows.")
+
+#define ENVIRON_PATH_BLURB \
+"Sets the environ search path."
+
+#define FRACTALEXPLORER_PATH_BLURB \
+"Where to search for fractals used by the Fractal Explorer plug-in."
+
+#define GFIG_PATH_BLURB \
+"Where to search for Gfig figures used by the Gfig plug-in."
+
+#define GFLARE_PATH_BLURB \
+"Where to search for gflares used by the GFlare plug-in."
+
+#define GIMPRESSIONIST_PATH_BLURB \
+"Where to search for data used by the Gimpressionist plug-in."
+
+#define GLOBAL_BRUSH_BLURB \
+_("When enabled, the selected brush will be used for all tools.")
+
+#define GLOBAL_DYNAMICS_BLURB \
+_("When enabled, the selected dynamics will be used for all tools.")
+
+#define GLOBAL_FONT_BLURB \
+"When enabled, the selected font will be used for all tools."
+
+#define GLOBAL_GRADIENT_BLURB \
+_("When enabled, the selected gradient will be used for all tools.")
+
+#define GLOBAL_PATTERN_BLURB \
+_("When enabled, the selected pattern will be used for all tools.")
+
+#define GLOBAL_PALETTE_BLURB \
+"When enabled, the selected palette will be used for all tools."
+
+#define GRADIENT_PATH_BLURB \
+"Sets the gradient search path."
+
+#define GRADIENT_PATH_WRITABLE_BLURB ""
+
+#define FONT_PATH_BLURB \
+"Where to look for fonts in addition to the system-wide installed fonts."
+
+#define HELP_BROWSER_BLURB \
+_("Sets the browser used by the help system.")
+
+#define HELP_LOCALES_BLURB \
+"Specifies the language preferences used by the help system. This is a " \
+"colon-separated list of language identifiers with decreasing priority. " \
+"If empty, the language is taken from the user's locale setting."
+
+#define FILTER_TOOL_MAX_RECENT_BLURB \
+_("How many recent settings to keep around in filter tools.")
+
+#define FILTER_TOOL_USE_LAST_SETTINGS_BLURB \
+_("Default to the last used settings in filter tools.")
+
+#define FILTER_TOOL_SHOW_COLOR_OPTIONS_BLURB \
+_("Show advanced color options in filter tools.")
+
+#define IMAGE_STATUS_FORMAT_BLURB \
+_("Sets the text to appear in image window status bars.")
+
+#define IMAGE_TITLE_FORMAT_BLURB \
+_("Sets the text to appear in image window titles.")
+
+#define IMPORT_PROMOTE_FLOAT_BLURB \
+_("Promote imported images to floating point precision. Does not apply " \
+  "to indexed images.")
+
+#define IMPORT_PROMOTE_DITHER_BLURB \
+_("When promoting imported images to floating point precision, also add " \
+  "minimal noise in order to distribute color values a bit.")
+
+#define IMPORT_ADD_ALPHA_BLURB \
+_("Add an alpha channel to all layers of imported images.")
+
+#define IMPORT_RAW_PLUG_IN_BLURB \
+_("Which plug-in to use for importing raw digital camera files.")
+
+#define EXPORT_FILE_TYPE_BLURB \
+_("Export file type used by default.")
+
+#define EXPORT_COLOR_PROFILE_BLURB \
+_("Export the image's color profile by default.")
+
+/* Translators: tooltip for configuration option (checkbox).
+ * It determines how file export plug-ins handle Exif by default.
+ */
+#define EXPORT_METADATA_EXIF_BLURB \
+_("Export Exif metadata by default.")
+
+/* Translators: tooltip for configuration option (checkbox).
+ * It determines how file export plug-ins handle XMP by default.
+ */
+#define EXPORT_METADATA_XMP_BLURB \
+_("Export XMP metadata by default.")
+
+/* Translators: tooltip for configuration option (checkbox).
+ * It determines how file export plug-ins handle IPTC by default.
+ */
+#define EXPORT_METADATA_IPTC_BLURB \
+_("Export IPTC metadata by default.")
+
+#define GENERATE_BACKTRACE_BLURB \
+_("Try generating debug data for bug reporting when appropriate.")
+
+#define INITIAL_ZOOM_TO_FIT_BLURB \
+_("When enabled, this will ensure that the full image is visible after a " \
+  "file is opened, otherwise it will be displayed with a scale of 1:1.")
+
+#define INTERPOLATION_TYPE_BLURB \
+_("Sets the level of interpolation used for scaling and other " \
+  "transformations.")
+
+#define INTERPRETER_PATH_BLURB \
+"Sets the interpreter search path."
+
+#define LANGUAGE_BLURB \
+_("Specifies the language to use for the user interface.")
+
+#define LAST_KNOWN_RELEASE_BLURB \
+_("The last known release version of GIMP as queried from official website.")
+
+#define LAST_OPENED_SIZE_BLURB \
+_("How many recently opened image filenames to keep on the File menu.")
+
+#define LAST_RELEASE_TIMESTAMP_BLURB \
+_("The timestamp for the last known release date.")
+
+#define LAST_REVISION_BLURB \
+_("The last revision number for the release.")
+
+#define MARCHING_ANTS_SPEED_BLURB \
+_("Speed of marching ants in the selection outline.  This value is in " \
+  "milliseconds (less time indicates faster marching).")
+
+#define MAX_NEW_IMAGE_SIZE_BLURB  \
+_("GIMP will warn the user if an attempt is made to create an image that " \
+  "would take more memory than the size specified here.")
+
+#define MODULE_PATH_BLURB \
+"Sets the module search path."
+
+#define MONITOR_RES_FROM_GDK_BLURB \
+"When enabled, GIMP will use the monitor resolution from the windowing system."
+
+#define MONITOR_XRESOLUTION_BLURB \
+_("Sets the monitor's horizontal resolution, in dots per inch.  If set to " \
+  "0, forces the X server to be queried for both horizontal and vertical " \
+  "resolution information.")
+
+#define MONITOR_YRESOLUTION_BLURB \
+_("Sets the monitor's vertical resolution, in dots per inch.  If set to " \
+  "0, forces the X server to be queried for both horizontal and vertical " \
+  "resolution information.")
+
+#define EDIT_NON_VISIBLE_BLURB \
+_("When enabled, non-visible layers can be edited as normal.")
+
+#define MOVE_TOOL_CHANGES_ACTIVE_BLURB \
+_("If enabled, the move tool sets the edited layer or path as active.  " \
+  "This used to be the default behaviour in older versions.")
+
+#define MYPAINT_BRUSH_PATH_BLURB \
+"Sets the brush search path."
+
+#define MYPAINT_BRUSH_PATH_WRITABLE_BLURB ""
+
+#define NAVIGATION_PREVIEW_SIZE_BLURB \
+_("Sets the size of the navigation preview available in the lower right " \
+  "corner of the image window.")
+
+#define NUM_PROCESSORS_BLURB \
+_("Sets how many threads GIMP should use for operations that support it.")
+
+#define PALETTE_PATH_BLURB \
+"Sets the palette search path."
+
+#define PALETTE_PATH_WRITABLE_BLURB ""
+
+#define PATTERN_PATH_BLURB \
+"Sets the pattern search path."
+
+#define PATTERN_PATH_WRITABLE_BLURB ""
+
+#define FILTER_HISTORY_SIZE_BLURB \
+"How many recently used filters and plug-ins to keep on the Filters menu."
+
+#define PLUG_IN_PATH_BLURB \
+"Sets the plug-in search path."
+
+#define PLUGINRC_PATH_BLURB \
+"Sets the pluginrc search path."
+
+#define LAYER_PREVIEWS_BLURB \
+_("Sets whether GIMP should create previews of layers and channels. " \
+  "Previews in the layers and channels dialog are nice to have but they " \
+  "can slow things down when working with large images.")
+
+#define GROUP_LAYER_PREVIEWS_BLURB \
+_("Sets whether GIMP should create previews of layer groups. " \
+  "Layer group previews are more expensive than ordinary layer previews.")
+
+#define LAYER_PREVIEW_SIZE_BLURB \
+_("Sets the preview size used for layers and channel previews in newly " \
+  "created dialogs.")
+
+#define QUICK_MASK_COLOR_BLURB \
+_("Sets the default quick mask color.")
+
+#define RESIZE_WINDOWS_ON_RESIZE_BLURB \
+_("When enabled, the image window will automatically resize itself " \
+  "whenever the physical image size changes. This setting only takes " \
+  "effect in multi-window mode.")
+
+#define RESIZE_WINDOWS_ON_ZOOM_BLURB \
+_("When enabled, the image window will automatically resize itself " \
+  "when zooming into and out of images. This setting only takes " \
+  "effect in multi-window mode.")
+
+#define RESTORE_SESSION_BLURB \
+_("Let GIMP try to restore your last saved session on each startup.")
+
+#define RESTORE_MONITOR_BLURB \
+_("When enabled, GIMP will try to restore windows on the monitor they " \
+  "were open before.  When disabled, windows will appear on the currently " \
+  "used monitor.")
+
+#define SAVE_DEVICE_STATUS_BLURB \
+_("Remember the current tool, pattern, color, and brush across GIMP " \
+  "sessions.")
+
+#define DEVICES_SHARE_TOOL_BLURB \
+_("When enabled, the same tool and tool options will be used for all " \
+  "input devices. No tool switching will occur when the input device " \
+  "changes.")
+
+#define SAVE_DOCUMENT_HISTORY_BLURB \
+_("Keep a permanent record of all opened and saved files in the Recent " \
+  "Documents list.")
+
+#define SAVE_SESSION_INFO_BLURB \
+_("Save the positions and sizes of the main dialogs when GIMP exits.")
+
+#define SAVE_TOOL_OPTIONS_BLURB \
+_("Save the tool options when GIMP exits.")
+
+#define SCRIPT_FU_PATH_BLURB \
+"This path will be searched for scripts when the Script-Fu plug-in is run."
+
+#define SHOW_BRUSH_OUTLINE_BLURB \
+_("When enabled, all paint tools will show a preview of the current " \
+  "brush's outline.")
+
+#define SNAP_BRUSH_OUTLINE_BLURB \
+_("When enabled, the brush outline will snap to individual dabs while " \
+  "painting.")
+
+#define SHOW_HELP_BUTTON_BLURB \
+_("When enabled, dialogs will show a help button that gives access to " \
+  "the related help page.  Without this button, the help page can still " \
+  "be reached by pressing F1.")
+
+#define SHOW_PAINT_TOOL_CURSOR_BLURB \
+_("When enabled, the mouse pointer will be shown over the image while " \
+  "using a paint tool.")
+
+#define SHOW_MENUBAR_BLURB \
+_("When enabled, the menubar is visible by default. This can also be " \
+  "toggled with the \"View->Show Menubar\" command.")
+
+#define SHOW_RULERS_BLURB \
+_("When enabled, the rulers are visible by default. This can also be " \
+  "toggled with the \"View->Show Rulers\" command.")
+
+#define SHOW_SCROLLBARS_BLURB \
+_("When enabled, the scrollbars are visible by default. This can also be " \
+  "toggled with the \"View->Show Scrollbars\" command.")
+
+#define SHOW_STATUSBAR_BLURB \
+_("When enabled, the statusbar is visible by default. This can also be " \
+  "toggled with the \"View->Show Statusbar\" command.")
+
+#define SHOW_SELECTION_BLURB \
+_("When enabled, the selection is visible by default. This can also be " \
+  "toggled with the \"View->Show Selection\" command.")
+
+#define SHOW_LAYER_BOUNDARY_BLURB \
+_("When enabled, the layer boundary is visible by default. This can also " \
+  "be toggled with the \"View->Show Layer Boundary\" command.")
+
+#define SHOW_CANVAS_BOUNDARY_BLURB \
+_("When enabled, the canvas boundary is visible by default. This can also " \
+  "be toggled with the \"View->Show Canvas Boundary\" command.")
+
+#define SHOW_GUIDES_BLURB \
+_("When enabled, the guides are visible by default. This can also be " \
+  "toggled with the \"View->Show Guides\" command.")
+
+#define SHOW_GRID_BLURB \
+_("When enabled, the grid is visible by default. This can also be toggled " \
+  "with the \"View->Show Grid\" command.")
+
+#define SHOW_SAMPLE_POINTS_BLURB \
+_("When enabled, the sample points are visible by default. This can also be " \
+  "toggled with the \"View->Show Sample Points\" command.")
+
+#define SHOW_TOOLTIPS_BLURB \
+_("Show a tooltip when the pointer hovers over an item.")
+
+#define SINGLE_WINDOW_MODE_BLURB \
+_("Use GIMP in a single-window mode.")
+
+#define HIDE_DOCKS_BLURB \
+_("Hide docks and other windows, leaving only image windows.")
+
+#define SHOW_TABS_BLURB \
+_("Show the image tabs bar in single window mode.")
+
+#define PLAYGROUND_NPD_TOOL_BLURB \
+_("Enable the N-Point Deformation tool.")
+
+#define PLAYGROUND_HANDLE_TRANSFORM_TOOL_BLURB \
+_("Enable the Handle Transform tool.")
+
+#define PLAYGROUND_SYMMETRY_BLURB \
+_("Enable symmetry on painting.")
+
+#define PLAYGROUND_MYBRUSH_TOOL_BLURB \
+_("Enable the MyPaint Brush tool.")
+
+#define PLAYGROUND_SEAMLESS_CLONE_TOOL_BLURB \
+_("Enable the Seamless Clone tool.")
+
+#define SPACE_BAR_ACTION_BLURB \
+_("What to do when the space bar is pressed in the image window.")
+
+#define SWAP_COMPRESSION_BLURB \
+_("The compression method used for tile data stored in the swap file.")
+
+#define SWAP_PATH_BLURB \
+_("Sets the swap file location. GIMP uses a tile based memory allocation " \
+  "scheme. The swap file is used to quickly and easily swap tiles out to " \
+  "disk and back in. Be aware that the swap file can easily get very large " \
+  "if GIMP is used with large images. " \
+  "Also, things can get horribly slow if the swap file is created on " \
+  "a folder that is mounted over NFS.  For these reasons, it may be " \
+  "desirable to put your swap file in \"/tmp\".")
+
+#define TEAROFF_MENUS_BLURB \
+_("When enabled, menus can be torn off.")
+
+#define CAN_CHANGE_ACCELS_BLURB \
+_("When enabled, you can change keyboard shortcuts for menu items " \
+  "by hitting a key combination while the menu item is highlighted.")
+
+#define SAVE_ACCELS_BLURB \
+_("Save changed keyboard shortcuts when GIMP exits.")
+
+#define RESTORE_ACCELS_BLURB \
+_("Restore saved keyboard shortcuts on each GIMP startup.")
+
+#define TEMP_PATH_BLURB \
+_("Sets the folder for temporary storage. Files will appear here " \
+  "during the course of running GIMP.  Most files will disappear " \
+  "when GIMP exits, but some files are likely to remain, so it " \
+  "is best if this folder not be one that is shared by other users.")
+
+#define THEME_BLURB \
+_("The name of the theme to use.")
+
+#define THEME_PATH_BLURB \
+"Sets the theme search path."
+
+#define ICON_THEME_BLURB \
+"The name of the icon theme to use."
+
+#define ICON_SIZE_BLURB \
+"The size of the icons to use."
+
+#define ICON_THEME_PATH_BLURB \
+"Sets the icon theme search path."
+
+#define IMAGE_CONVERT_PROFILE_INTENT_BLURB \
+_("Sets the default rendering intent for the 'Convert to Color Profile' dialog.")
+
+#define IMAGE_CONVERT_PROFILE_BPC_BLURB \
+_("Sets the default 'Black Point Compensation' state for the " \
+  "'Convert to Color Profile' dialog.")
+
+#define IMAGE_CONVERT_PRECISION_LAYER_DITHER_METHOD_BLURB \
+_("Sets the default layer dithering method for the 'Convert Precision' dialog.")
+
+#define IMAGE_CONVERT_PRECISION_TEXT_LAYER_DITHER_METHOD_BLURB \
+_("Sets the default text layer dithering method for the 'Convert Precision' dialog.")
+
+#define IMAGE_CONVERT_PRECISION_CHANNEL_DITHER_METHOD_BLURB \
+_("Sets the default channel dithering method for the 'Convert Precision' dialog.")
+
+#define IMAGE_CONVERT_INDEXED_PALETTE_TYPE_BLURB \
+_("Sets the default palette type for the 'Convert to Indexed' dialog.")
+
+#define IMAGE_CONVERT_INDEXED_MAX_COLORS_BLURB \
+_("Sets the default maximum number of colors for the 'Convert to Indexed' dialog.")
+
+#define IMAGE_CONVERT_INDEXED_REMOVE_DUPLICATES_BLURB \
+_("Sets the default 'Remove duplicate colors' state for the 'Convert to Indexed' dialog.")
+
+#define IMAGE_CONVERT_INDEXED_DITHER_TYPE_BLURB \
+_("Sets the default dithering type for the 'Convert to Indexed' dialog.")
+
+#define IMAGE_CONVERT_INDEXED_DITHER_ALPHA_BLURB \
+_("Sets the default 'Dither alpha' state for the 'Convert to Indexed' dialog.")
+
+#define IMAGE_CONVERT_INDEXED_DITHER_TEXT_LAYERS_BLURB \
+_("Sets the default 'Dither text layers' state for the 'Convert to Indexed' dialog.")
+
+#define IMAGE_RESIZE_FILL_TYPE_BLURB \
+_("Sets the default fill type for the 'Canvas Size' dialog.")
+
+#define IMAGE_RESIZE_LAYER_SET_BLURB \
+_("Sets the default set of layers to resize for the 'Canvas Size' dialog.")
+
+#define IMAGE_RESIZE_RESIZE_TEXT_LAYERS_BLURB \
+_("Sets the default 'Resize text layers' state for the 'Canvas Size' dialog.")
+
+#define LAYER_NEW_NAME_BLURB \
+_("Sets the default layer name for the 'New Layer' dialog.")
+
+#define LAYER_NEW_MODE_BLURB \
+_("Sets the default mode for the 'New Layer' dialog.")
+
+#define LAYER_NEW_BLEND_SPACE_BLURB \
+_("Sets the default blend space for the 'New Layer' dialog.")
+
+#define LAYER_NEW_COMPOSITE_SPACE_BLURB \
+_("Sets the default composite space for the 'New Layer' dialog.")
+
+#define LAYER_NEW_COMPOSITE_MODE_BLURB \
+_("Sets the default composite mode for the 'New Layer' dialog.")
+
+#define LAYER_NEW_OPACITY_BLURB \
+_("Sets the default opacity for the 'New Layer' dialog.")
+
+#define LAYER_NEW_FILL_TYPE_BLURB \
+_("Sets the default fill type for the 'New Layer' dialog.")
+
+#define LAYER_RESIZE_FILL_TYPE_BLURB \
+_("Sets the default fill type for the 'Layer Boundary Size' dialog.")
+
+#define LAYER_ADD_MASK_TYPE_BLURB \
+_("Sets the default mask for the 'Add Layer Mask' dialog.")
+
+#define LAYER_ADD_MASK_INVERT_BLURB \
+_("Sets the default 'invert mask' state for the 'Add Layer Mask' dialog.")
+
+#define LAYER_MERGE_TYPE_BLURB \
+_("Sets the default merge type for the 'Merge Visible Layers' dialog.")
+
+#define LAYER_MERGE_ACTIVE_GROUP_ONLY_BLURB \
+_("Sets the default 'Active group only' for the 'Merge Visible Layers' dialog.")
+
+#define LAYER_MERGE_DISCARD_INVISIBLE_BLURB \
+_("Sets the default 'Discard invisible' for the 'Merge Visible Layers' dialog.")
+
+#define CHANNEL_NEW_NAME_BLURB \
+_("Sets the default channel name for the 'New Channel' dialog.")
+
+#define CHANNEL_NEW_COLOR_BLURB \
+_("Sets the default color and opacity for the 'New Channel' dialog.")
+
+#define VECTORS_NEW_NAME_BLURB \
+_("Sets the default path name for the 'New Path' dialog.")
+
+#define VECTORS_EXPORT_PATH_BLURB \
+_("Sets the default folder path for the 'Export Path' dialog.")
+
+#define VECTORS_EXPORT_ACTIVE_ONLY_BLURB \
+_("Sets the default 'Export the active path' state for the 'Export Path' dialog.")
+
+#define VECTORS_IMPORT_PATH_BLURB \
+_("Sets the default folder path for the 'Import Path' dialog.")
+
+#define VECTORS_IMPORT_MERGE_BLURB \
+_("Sets the default 'Merge imported paths' state for the 'Import Path' dialog.")
+
+#define VECTORS_IMPORT_SCALE_BLURB \
+_("Sets the default 'Scale imported paths to fit size' state for the 'Import Path' dialog.")
+
+#define SELECTION_FEATHER_RADIUS_BLURB \
+_("Sets the default feather radius for the 'Feather Selection' dialog.")
+
+#define SELECTION_FEATHER_EDGE_LOCK_BLURB \
+_("Sets the default 'Selected areas continue outside the image' setting " \
+  "for the 'Feather Selection' dialog.")
+
+#define SELECTION_GROW_RADIUS_BLURB \
+_("Sets the default grow radius for the 'Grow Selection' dialog.")
+
+#define SELECTION_SHRINK_RADIUS_BLURB \
+_("Sets the default shrink radius for the 'Shrink Selection' dialog.")
+
+#define SELECTION_SHRINK_EDGE_LOCK_BLURB \
+_("Sets the default 'Selected areas continue outside the image' setting " \
+  "for the 'Shrink Selection' dialog.")
+
+#define SELECTION_BORDER_RADIUS_BLURB \
+_("Sets the default border radius for the 'Border Selection' dialog.")
+
+#define SELECTION_BORDER_EDGE_LOCK_BLURB \
+_("Sets the default 'Selected areas continue outside the image' setting " \
+  "for the 'Border Selection' dialog.")
+
+#define SELECTION_BORDER_STYLE_BLURB \
+_("Sets the default border style for the 'Border Selection' dialog.")
+
+#define FILL_OPTIONS_BLURB \
+"The default fill options for the fill dialogs."
+
+#define STROKE_OPTIONS_BLURB \
+"The default stroke options for the stroke dialogs."
+
+#define THUMBNAIL_SIZE_BLURB \
+_("Sets the size of the thumbnail shown in the Open dialog.")
+
+#define THUMBNAIL_FILESIZE_LIMIT_BLURB \
+_("The thumbnail in the Open dialog will be automatically updated " \
+  "if the file being previewed is smaller than the size set here.")
+
+#define TILE_CACHE_SIZE_BLURB \
+_("When the amount of pixel data exceeds this limit, GIMP will start to " \
+  "swap tiles to disk.  This is a lot slower but it makes it possible to " \
+  "work on images that wouldn't fit into memory otherwise.  If you have a " \
+  "lot of RAM, you may want to set this to a higher value.")
+
+#define TOOLBOX_COLOR_AREA_BLURB \
+_("Show the current foreground and background colors in the toolbox.")
+
+#define TOOLBOX_FOO_AREA_BLURB \
+_("Show the currently selected brush, pattern and gradient in the toolbox.")
+
+#define TOOLBOX_GROUP_MENU_MODE_BLURB \
+_("Menu mode of grouped tools.")
+
+#define TOOLBOX_GROUPS_BLURB \
+_("Use a single toolbox button for grouped tools.")
+
+#define TOOLBOX_IMAGE_AREA_BLURB \
+_("Show the currently active image in the toolbox.")
+
+#define TOOLBOX_WILBER_BLURB \
+_("Show the GIMP mascot at the top of the toolbox.")
+
+#define TRANSPARENCY_TYPE_BLURB \
+_("Sets the manner in which transparency is displayed in images.")
+
+#define TRANSPARENCY_SIZE_BLURB \
+_("Sets the size of the checkerboard used to display transparency.")
+
+#define TRUST_DIRTY_FLAG_BLURB \
+_("When enabled, GIMP will not save an image if it has not been changed " \
+  "since it was opened.")
+
+#define UNDO_LEVELS_BLURB \
+_("Sets the minimal number of operations that can be undone. More undo " \
+  "levels are kept available until the undo-size limit is reached.")
+
+#define UNDO_SIZE_BLURB \
+_("Sets an upper limit to the memory that is used per image to keep " \
+  "operations on the undo stack. Regardless of this setting, at least " \
+  "as many undo-levels as configured can be undone.")
+
+#define UNDO_PREVIEW_SIZE_BLURB \
+_("Sets the size of the previews in the Undo History.")
+
+#define USE_HELP_BLURB \
+_("When enabled, pressing F1 will open the help browser.")
+
+#define USE_OPENCL_BLURB \
+_("When enabled, uses OpenCL for some operations.")
+
+#define USER_MANUAL_ONLINE_BLURB \
+"When enabled, the online user manual will be used by the help system. " \
+"Otherwise the locally installed copy is used."
+
+#define USER_MANUAL_ONLINE_URI_BLURB \
+"The location of the online user manual. This is used if " \
+"'user-manual-online' is enabled."
+
+#define ZOOM_QUALITY_BLURB \
+"There's a tradeoff between speed and quality of the zoomed-out display."
+
+#define DEFAULT_USE_EVENT_HISTORY_BLURB \
+"Bugs in event history buffer are frequent so in case of cursor " \
+"offset problems turning it off helps."
+
+#define SEARCH_SHOW_UNAVAILABLE_BLURB \
+_("When enabled, a search of actions will also return inactive actions.")
+
+#define ACTION_HISTORY_SIZE_BLURB \
+_("The maximum number of actions saved in history.")
+
+
+#endif  /* __GIMP_RC_BLURBS_H__ */
diff --git a/app/config/gimprc-deserialize.c b/app/config/gimprc-deserialize.c
new file mode 100644
index 0000000..0278485
--- /dev/null
+++ b/app/config/gimprc-deserialize.c
@@ -0,0 +1,174 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc deserialization routines
+ * Copyright (C) 2001-2002  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc-deserialize.h"
+#include "gimprc-unknown.h"
+
+#include "gimp-intl.h"
+
+
+static GTokenType gimp_rc_deserialize_unknown (GimpConfig *config,
+                                               GScanner   *scanner);
+
+
+gboolean
+gimp_rc_deserialize (GimpConfig *config,
+                     GScanner   *scanner,
+                     gint        nest_level,
+                     gpointer    data)
+{
+  GObjectClass  *klass;
+  GParamSpec   **property_specs;
+  guint          n_property_specs;
+  guint          i;
+  guint          scope_id;
+  guint          old_scope_id;
+  GTokenType     token;
+  GTokenType     next;
+
+  g_return_val_if_fail (GIMP_IS_CONFIG (config), FALSE);
+
+  klass = G_OBJECT_GET_CLASS (config);
+
+  property_specs = g_object_class_list_properties (klass, &n_property_specs);
+  if (! property_specs)
+    return TRUE;
+
+  scope_id = g_type_qname (G_TYPE_FROM_INSTANCE (config));
+  old_scope_id = g_scanner_set_scope (scanner, scope_id);
+
+  for (i = 0; i < n_property_specs; i++)
+    {
+      GParamSpec *prop_spec = property_specs[i];
+
+      if (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE)
+        {
+          g_scanner_scope_add_symbol (scanner, scope_id,
+                                      prop_spec->name, prop_spec);
+        }
+    }
+
+  g_free (property_specs);
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (TRUE)
+    {
+      next = g_scanner_peek_next_token (scanner);
+
+      if (G_UNLIKELY (next != token && ! (token == G_TOKEN_SYMBOL &&
+                                          next  == G_TOKEN_IDENTIFIER)))
+        {
+          break;
+        }
+
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_IDENTIFIER:
+          token = gimp_rc_deserialize_unknown (config, scanner);
+          break;
+
+        case G_TOKEN_SYMBOL:
+          token = gimp_config_deserialize_property (config,
+                                                    scanner, nest_level);
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+  g_scanner_set_scope (scanner, old_scope_id);
+
+  g_object_thaw_notify (G_OBJECT (config));
+
+  if (token == G_TOKEN_NONE)
+    return FALSE;
+
+  /* If the unknown token value couldn't be parsed the default error
+     message is rather confusing.  We try to produce something more
+     meaningful here ...
+   */
+  if (token == G_TOKEN_STRING && next == G_TOKEN_IDENTIFIER)
+    {
+      g_scanner_unexp_token (scanner, G_TOKEN_SYMBOL, NULL, NULL, NULL,
+                             _("fatal parse error"), TRUE);
+      return FALSE;
+    }
+
+  return gimp_config_deserialize_return (scanner, token, nest_level);
+}
+
+static GTokenType
+gimp_rc_deserialize_unknown (GimpConfig *config,
+                             GScanner   *scanner)
+{
+  gchar *key;
+  guint  old_scope_id;
+
+  old_scope_id = g_scanner_set_scope (scanner, 0);
+
+  if (g_scanner_peek_next_token (scanner) != G_TOKEN_STRING)
+    return G_TOKEN_STRING;
+
+  key = g_strdup (scanner->value.v_identifier);
+
+  g_scanner_get_next_token (scanner);
+
+  g_scanner_set_scope (scanner, old_scope_id);
+
+  if (! g_utf8_validate (scanner->value.v_string, -1, NULL))
+    {
+      g_scanner_error (scanner,
+                       _("value for token %s is not a valid UTF-8 string"),
+                       key);
+      g_free (key);
+      return G_TOKEN_NONE;
+    }
+
+  gimp_rc_add_unknown_token (config, key, scanner->value.v_string);
+  g_free (key);
+
+  return G_TOKEN_RIGHT_PAREN;
+}
diff --git a/app/config/gimprc-deserialize.h b/app/config/gimprc-deserialize.h
new file mode 100644
index 0000000..06b39fc
--- /dev/null
+++ b/app/config/gimprc-deserialize.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc deserialization routines
+ * Copyright (C) 2001-2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RC_DESERIALIZE_H__
+#define __GIMP_RC_DESERIALIZE_H__
+
+
+gboolean  gimp_rc_deserialize (GimpConfig *config,
+                               GScanner   *scanner,
+                               gint        nest_level,
+                               gpointer    data);
+
+
+#endif /* __GIMP_RC_DESERIALIZE_H__ */
diff --git a/app/config/gimprc-serialize.c b/app/config/gimprc-serialize.c
new file mode 100644
index 0000000..add6ac0
--- /dev/null
+++ b/app/config/gimprc-serialize.c
@@ -0,0 +1,120 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc serialization routines
+ * Copyright (C) 2001-2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc.h"
+#include "gimprc-serialize.h"
+#include "gimprc-unknown.h"
+
+
+static gboolean gimp_rc_serialize_properties_diff (GimpConfig       *config,
+                                                   GimpConfig       *compare,
+                                                   GimpConfigWriter *writer);
+static gboolean gimp_rc_serialize_unknown_tokens  (GimpConfig       *config,
+                                                   GimpConfigWriter *writer);
+
+
+gboolean
+gimp_rc_serialize (GimpConfig       *config,
+                   GimpConfigWriter *writer,
+                   gpointer          data)
+{
+  if (data && GIMP_IS_RC (data))
+    {
+      if (! gimp_rc_serialize_properties_diff (config, data, writer))
+        return FALSE;
+    }
+  else
+    {
+      if (! gimp_config_serialize_properties (config, writer))
+        return FALSE;
+    }
+
+  return gimp_rc_serialize_unknown_tokens (config, writer);
+}
+
+static gboolean
+gimp_rc_serialize_properties_diff (GimpConfig       *config,
+                                   GimpConfig       *compare,
+                                   GimpConfigWriter *writer)
+{
+  GList    *diff;
+  GList    *list;
+  gboolean  retval = TRUE;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), FALSE);
+  g_return_val_if_fail (G_IS_OBJECT (compare), FALSE);
+  g_return_val_if_fail (G_TYPE_FROM_INSTANCE (config) ==
+                        G_TYPE_FROM_INSTANCE (compare), FALSE);
+
+  diff = gimp_config_diff (G_OBJECT (config),
+                           G_OBJECT (compare), GIMP_CONFIG_PARAM_SERIALIZE);
+
+  for (list = diff; list; list = g_list_next (list))
+    {
+      GParamSpec *prop_spec = list->data;
+
+      if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE))
+        continue;
+
+      if (! gimp_config_serialize_property (config, prop_spec, writer))
+        {
+          retval = FALSE;
+          break;
+        }
+    }
+
+  g_list_free (diff);
+
+  return retval;
+}
+
+static void
+serialize_unknown_token (const gchar *key,
+                         const gchar *value,
+                         gpointer     data)
+{
+  GimpConfigWriter *writer = data;
+
+  gimp_config_writer_open (writer, key);
+  gimp_config_writer_string (writer, value);
+  gimp_config_writer_close (writer);
+}
+
+static gboolean
+gimp_rc_serialize_unknown_tokens (GimpConfig       *config,
+                                  GimpConfigWriter *writer)
+{
+  g_return_val_if_fail (G_IS_OBJECT (config), FALSE);
+
+  gimp_config_writer_linefeed (writer);
+  gimp_rc_foreach_unknown_token (config, serialize_unknown_token, writer);
+
+  return TRUE;
+}
diff --git a/app/config/gimprc-serialize.h b/app/config/gimprc-serialize.h
new file mode 100644
index 0000000..d314835
--- /dev/null
+++ b/app/config/gimprc-serialize.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc serialization routines
+ * Copyright (C) 2001-2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RC_SERIALIZE_H__
+#define __GIMP_RC_SERIALIZE_H__
+
+
+gboolean  gimp_rc_serialize (GimpConfig       *config,
+                             GimpConfigWriter *writer,
+                             gpointer          data);
+
+
+#endif /* __GIMP_RC_SERIALIZE_H__ */
diff --git a/app/config/gimprc-unknown.c b/app/config/gimprc-unknown.c
new file mode 100644
index 0000000..055b240
--- /dev/null
+++ b/app/config/gimprc-unknown.c
@@ -0,0 +1,214 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc serialization and deserialization helpers
+ * Copyright (C) 2001-2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimprc-unknown.h"
+
+
+/*
+ * Code to store and lookup unknown tokens (string key/value pairs).
+ */
+
+#define GIMP_RC_UNKNOWN_TOKENS "gimp-rc-unknown-tokens"
+
+typedef struct
+{
+  gchar *key;
+  gchar *value;
+} GimpConfigToken;
+
+static void  gimp_rc_destroy_unknown_tokens (GSList *unknown_tokens);
+
+
+/**
+ * gimp_rc_add_unknown_token:
+ * @config: a #GObject.
+ * @key: a nul-terminated string to identify the value.
+ * @value: a nul-terminated string representing the value.
+ *
+ * This function adds arbitrary key/value pairs to a GObject.  It's
+ * purpose is to attach additional data to a #GimpConfig object that
+ * can be stored along with the object properties when serializing the
+ * object to a configuration file. Please note however that the
+ * default gimp_config_serialize() implementation does not serialize
+ * unknown tokens.
+ *
+ * If you want to remove a key/value pair from the object, call this
+ * function with a %NULL @value.
+ **/
+void
+gimp_rc_add_unknown_token (GimpConfig  *config,
+                           const gchar *key,
+                           const gchar *value)
+{
+  GimpConfigToken *token;
+  GSList          *unknown_tokens;
+  GSList          *last;
+  GSList          *list;
+
+  g_return_if_fail (GIMP_IS_CONFIG (config));
+  g_return_if_fail (key != NULL);
+
+  unknown_tokens = (GSList *) g_object_get_data (G_OBJECT (config),
+                                                 GIMP_RC_UNKNOWN_TOKENS);
+
+  for (last = NULL, list = unknown_tokens;
+       list;
+       last = list, list = g_slist_next (list))
+    {
+      token = (GimpConfigToken *) list->data;
+
+      if (strcmp (token->key, key) == 0)
+        {
+          g_free (token->value);
+
+          if (value)
+            {
+              token->value = g_strdup (value);
+            }
+          else
+            {
+              g_free (token->key);
+
+              unknown_tokens = g_slist_remove (unknown_tokens, token);
+              g_object_set_data_full (G_OBJECT (config),
+                                      GIMP_RC_UNKNOWN_TOKENS,
+                                      unknown_tokens,
+                     (GDestroyNotify) gimp_rc_destroy_unknown_tokens);
+            }
+
+          return;
+        }
+    }
+
+  if (!value)
+    return;
+
+  token = g_slice_new (GimpConfigToken);
+  token->key   = g_strdup (key);
+  token->value = g_strdup (value);
+
+  if (last)
+    {
+      last = g_slist_last (g_slist_append (last, token));
+    }
+  else
+    {
+      unknown_tokens = g_slist_append (NULL, token);
+
+      g_object_set_data_full (G_OBJECT (config),
+                              GIMP_RC_UNKNOWN_TOKENS,
+                              unknown_tokens,
+                              (GDestroyNotify) gimp_rc_destroy_unknown_tokens);
+    }
+}
+
+/**
+ * gimp_rc_lookup_unknown_token:
+ * @config: a #GObject.
+ * @key: a nul-terminated string to identify the value.
+ *
+ * This function retrieves data that was previously attached using
+ * gimp_rc_add_unknown_token(). You should not free or modify
+ * the returned string.
+ *
+ * Returns: a pointer to a constant string.
+ **/
+const gchar *
+gimp_rc_lookup_unknown_token (GimpConfig  *config,
+                              const gchar *key)
+{
+  GSList          *unknown_tokens;
+  GSList          *list;
+
+  g_return_val_if_fail (GIMP_IS_CONFIG (config), NULL);
+  g_return_val_if_fail (key != NULL, NULL);
+
+  unknown_tokens = g_object_get_data (G_OBJECT (config),
+                                      GIMP_RC_UNKNOWN_TOKENS);
+
+  for (list = unknown_tokens; list; list = g_slist_next (list))
+    {
+      GimpConfigToken *token = list->data;
+
+      if (strcmp (token->key, key) == 0)
+        return token->value;
+    }
+
+  return NULL;
+}
+
+/**
+ * gimp_rc_foreach_unknown_token:
+ * @config: a #GObject.
+ * @func: a function to call for each key/value pair.
+ * @user_data: data to pass to @func.
+ *
+ * Calls @func for each key/value stored with the @config using
+ * gimp_rc_add_unknown_token().
+ **/
+void
+gimp_rc_foreach_unknown_token (GimpConfig            *config,
+                               GimpConfigForeachFunc  func,
+                               gpointer               user_data)
+{
+  GSList *unknown_tokens;
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_CONFIG (config));
+  g_return_if_fail (func != NULL);
+
+  unknown_tokens = g_object_get_data (G_OBJECT (config),
+                                      GIMP_RC_UNKNOWN_TOKENS);
+
+  for (list = unknown_tokens; list; list = g_slist_next (list))
+    {
+      GimpConfigToken *token = list->data;
+
+      func (token->key, token->value, user_data);
+    }
+}
+
+static void
+gimp_rc_destroy_unknown_tokens (GSList *unknown_tokens)
+{
+  GSList *list;
+
+  for (list = unknown_tokens; list; list = g_slist_next (list))
+    {
+      GimpConfigToken *token = list->data;
+
+      g_free (token->key);
+      g_free (token->value);
+      g_slice_free (GimpConfigToken, token);
+    }
+
+  g_slist_free (unknown_tokens);
+}
diff --git a/app/config/gimprc-unknown.h b/app/config/gimprc-unknown.h
new file mode 100644
index 0000000..33a6243
--- /dev/null
+++ b/app/config/gimprc-unknown.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc serialization and deserialization helpers
+ * Copyright (C) 2001-2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RC_UNKNOWN_H__
+#define __GIMP_RC_UNKNOWN_H__
+
+
+typedef void  (* GimpConfigForeachFunc) (const gchar *key,
+                                         const gchar *value,
+                                         gpointer     user_data);
+
+
+void          gimp_rc_add_unknown_token     (GimpConfig            *config,
+                                             const gchar           *key,
+                                             const gchar           *value);
+const gchar * gimp_rc_lookup_unknown_token  (GimpConfig            *config,
+                                             const gchar           *key);
+void          gimp_rc_foreach_unknown_token (GimpConfig            *config,
+                                             GimpConfigForeachFunc  func,
+                                             gpointer               user_data);
+
+
+#endif  /* __GIMP_RC_UNKNOWN_H__ */
diff --git a/app/config/gimprc.c b/app/config/gimprc.c
new file mode 100644
index 0000000..53d54e5
--- /dev/null
+++ b/app/config/gimprc.c
@@ -0,0 +1,593 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc, the object for GIMPs user configuration file gimprc.
+ * Copyright (C) 2001-2002  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "config-types.h"
+
+#include "gimpconfig-file.h"
+#include "gimprc.h"
+#include "gimprc-deserialize.h"
+#include "gimprc-serialize.h"
+#include "gimprc-unknown.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VERBOSE,
+  PROP_SYSTEM_GIMPRC,
+  PROP_USER_GIMPRC
+};
+
+
+static void         gimp_rc_config_iface_init (GimpConfigInterface *iface);
+
+static void         gimp_rc_dispose           (GObject      *object);
+static void         gimp_rc_finalize          (GObject      *object);
+static void         gimp_rc_set_property      (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void         gimp_rc_get_property      (GObject      *object,
+                                               guint         property_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+static GimpConfig * gimp_rc_duplicate         (GimpConfig   *object);
+static gboolean     gimp_rc_idle_save         (GimpRc       *rc);
+static void         gimp_rc_notify            (GimpRc       *rc,
+                                               GParamSpec   *param,
+                                               gpointer      data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpRc, gimp_rc, GIMP_TYPE_PLUGIN_CONFIG,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_rc_config_iface_init))
+
+#define parent_class gimp_rc_parent_class
+
+
+static void
+gimp_rc_class_init (GimpRcClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_rc_dispose;
+  object_class->finalize     = gimp_rc_finalize;
+  object_class->set_property = gimp_rc_set_property;
+  object_class->get_property = gimp_rc_get_property;
+
+  g_object_class_install_property (object_class, PROP_VERBOSE,
+                                   g_param_spec_boolean ("verbose",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SYSTEM_GIMPRC,
+                                   g_param_spec_object ("system-gimprc",
+                                                        NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USER_GIMPRC,
+                                   g_param_spec_object ("user-gimprc",
+                                                        NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_rc_init (GimpRc *rc)
+{
+  rc->autosave     = FALSE;
+  rc->save_idle_id = 0;
+}
+
+static void
+gimp_rc_dispose (GObject *object)
+{
+  GimpRc *rc = GIMP_RC (object);
+
+  if (rc->save_idle_id)
+    gimp_rc_idle_save (rc);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_rc_finalize (GObject *object)
+{
+  GimpRc *rc = GIMP_RC (object);
+
+  g_clear_object (&rc->system_gimprc);
+  g_clear_object (&rc->user_gimprc);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_rc_set_property (GObject      *object,
+                      guint         property_id,
+                      const GValue *value,
+                      GParamSpec   *pspec)
+{
+  GimpRc *rc = GIMP_RC (object);
+
+  switch (property_id)
+    {
+    case PROP_VERBOSE:
+      rc->verbose = g_value_get_boolean (value);
+      break;
+
+    case PROP_SYSTEM_GIMPRC:
+      if (rc->system_gimprc)
+        g_object_unref (rc->system_gimprc);
+
+      if (g_value_get_object (value))
+        rc->system_gimprc = g_value_dup_object (value);
+      else
+        rc->system_gimprc = gimp_sysconf_directory_file ("gimprc", NULL);
+      break;
+
+    case PROP_USER_GIMPRC:
+      if (rc->user_gimprc)
+        g_object_unref (rc->user_gimprc);
+
+      if (g_value_get_object (value))
+        rc->user_gimprc = g_value_dup_object (value);
+      else
+        rc->user_gimprc = gimp_directory_file ("gimprc", NULL);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_rc_get_property (GObject    *object,
+                      guint       property_id,
+                      GValue     *value,
+                      GParamSpec *pspec)
+{
+  GimpRc *rc = GIMP_RC (object);
+
+  switch (property_id)
+    {
+    case PROP_VERBOSE:
+      g_value_set_boolean (value, rc->verbose);
+      break;
+    case PROP_SYSTEM_GIMPRC:
+      g_value_set_object (value, rc->system_gimprc);
+      break;
+    case PROP_USER_GIMPRC:
+      g_value_set_object (value, rc->user_gimprc);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_rc_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_rc_serialize;
+  iface->deserialize = gimp_rc_deserialize;
+  iface->duplicate   = gimp_rc_duplicate;
+}
+
+static void
+gimp_rc_duplicate_unknown_token (const gchar *key,
+                                 const gchar *value,
+                                 gpointer     user_data)
+{
+  gimp_rc_add_unknown_token (GIMP_CONFIG (user_data), key, value);
+}
+
+static GimpConfig *
+gimp_rc_duplicate (GimpConfig *config)
+{
+  GObject    *gimp;
+  GimpConfig *dup;
+
+  g_object_get (config, "gimp", &gimp, NULL);
+
+  dup = g_object_new (GIMP_TYPE_RC,
+                      "gimp", gimp,
+                      NULL);
+
+  if (gimp)
+    g_object_unref (gimp);
+
+  gimp_config_sync (G_OBJECT (config), G_OBJECT (dup), 0);
+
+  gimp_rc_foreach_unknown_token (config,
+                                 gimp_rc_duplicate_unknown_token, dup);
+
+  return dup;
+}
+
+static gboolean
+gimp_rc_idle_save (GimpRc *rc)
+{
+  gimp_rc_save (rc);
+
+  rc->save_idle_id = 0;
+
+  return FALSE;
+}
+
+static void
+gimp_rc_notify (GimpRc     *rc,
+                GParamSpec *param,
+                gpointer    data)
+{
+  if (!rc->autosave)
+    return;
+
+  if (!rc->save_idle_id)
+    rc->save_idle_id = g_idle_add ((GSourceFunc) gimp_rc_idle_save, rc);
+}
+
+/**
+ * gimp_rc_new:
+ * @gimp:          a #Gimp
+ * @system_gimprc: the name of the system-wide gimprc file or %NULL to
+ *                 use the standard location
+ * @user_gimprc:   the name of the user gimprc file or %NULL to use the
+ *                 standard location
+ * @verbose:       enable console messages about loading and saving
+ *
+ * Creates a new GimpRc object and loads the system-wide and the user
+ * configuration files.
+ *
+ * Returns: the new #GimpRc.
+ */
+GimpRc *
+gimp_rc_new (GObject  *gimp,
+             GFile    *system_gimprc,
+             GFile    *user_gimprc,
+             gboolean  verbose)
+{
+  GimpRc *rc;
+
+  g_return_val_if_fail (G_IS_OBJECT (gimp), NULL);
+  g_return_val_if_fail (system_gimprc == NULL || G_IS_FILE (system_gimprc),
+                        NULL);
+  g_return_val_if_fail (user_gimprc == NULL || G_IS_FILE (user_gimprc),
+                        NULL);
+
+  rc = g_object_new (GIMP_TYPE_RC,
+                     "gimp",          gimp,
+                     "verbose",       verbose,
+                     "system-gimprc", system_gimprc,
+                     "user-gimprc",   user_gimprc,
+                     NULL);
+
+  gimp_rc_load_system (rc);
+  gimp_rc_load_user (rc);
+
+  return rc;
+}
+
+void
+gimp_rc_load_system (GimpRc *rc)
+{
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_RC (rc));
+
+  if (rc->verbose)
+    g_print ("Parsing '%s'\n",
+             gimp_file_get_utf8_name (rc->system_gimprc));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (rc),
+                                       rc->system_gimprc, NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        g_message ("%s", error->message);
+
+      g_clear_error (&error);
+    }
+}
+
+void
+gimp_rc_load_user (GimpRc *rc)
+{
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_RC (rc));
+
+  if (rc->verbose)
+    g_print ("Parsing '%s'\n",
+             gimp_file_get_utf8_name (rc->user_gimprc));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (rc),
+                                       rc->user_gimprc, NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        {
+          g_message ("%s", error->message);
+
+          gimp_config_file_backup_on_error (rc->user_gimprc, "gimprc", NULL);
+        }
+
+      g_clear_error (&error);
+    }
+}
+
+void
+gimp_rc_set_autosave (GimpRc   *rc,
+                      gboolean  autosave)
+{
+  g_return_if_fail (GIMP_IS_RC (rc));
+
+  autosave = autosave ? TRUE : FALSE;
+
+  if (rc->autosave == autosave)
+    return;
+
+  if (autosave)
+    g_signal_connect (rc, "notify",
+                      G_CALLBACK (gimp_rc_notify),
+                      NULL);
+  else
+    g_signal_handlers_disconnect_by_func (rc, gimp_rc_notify, NULL);
+
+  rc->autosave = autosave;
+}
+
+
+/**
+ * gimp_rc_query:
+ * @rc:  a #GimpRc object.
+ * @key: a string used as a key for the lookup.
+ *
+ * This function looks up @key in the object properties of @rc. If
+ * there's a matching property, a string representation of its value
+ * is returned. If no property is found, the list of unknown tokens
+ * attached to the @rc object is searched.
+ *
+ * Return value: a newly allocated string representing the value or %NULL
+ *               if the key couldn't be found.
+ **/
+gchar *
+gimp_rc_query (GimpRc      *rc,
+               const gchar *key)
+{
+  GObjectClass  *klass;
+  GObject       *rc_object;
+  GParamSpec   **property_specs;
+  GParamSpec    *prop_spec;
+  guint          i, n_property_specs;
+  gchar         *retval = NULL;
+
+  g_return_val_if_fail (GIMP_IS_RC (rc), NULL);
+  g_return_val_if_fail (key != NULL, NULL);
+
+  rc_object = G_OBJECT (rc);
+  klass = G_OBJECT_GET_CLASS (rc);
+
+  property_specs = g_object_class_list_properties (klass, &n_property_specs);
+
+  if (!property_specs)
+    return NULL;
+
+  for (i = 0, prop_spec = NULL; i < n_property_specs && !prop_spec; i++)
+    {
+      prop_spec = property_specs[i];
+
+      if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE) ||
+          strcmp (prop_spec->name, key))
+        {
+          prop_spec = NULL;
+        }
+    }
+
+  if (prop_spec)
+    {
+      GString *str   = g_string_new (NULL);
+      GValue   value = G_VALUE_INIT;
+
+      g_value_init (&value, prop_spec->value_type);
+      g_object_get_property (rc_object, prop_spec->name, &value);
+
+      if (gimp_config_serialize_value (&value, str, FALSE))
+        retval = g_string_free (str, FALSE);
+      else
+        g_string_free (str, TRUE);
+
+      g_value_unset (&value);
+    }
+  else
+    {
+      retval = g_strdup (gimp_rc_lookup_unknown_token (GIMP_CONFIG (rc), key));
+    }
+
+  g_free (property_specs);
+
+  if (!retval)
+    {
+      const gchar * const path_tokens[] =
+      {
+        "gimp_dir",
+        "gimp_data_dir",
+        "gimp_plug_in_dir",
+        "gimp_plugin_dir",
+        "gimp_sysconf_dir"
+      };
+
+      for (i = 0; !retval && i < G_N_ELEMENTS (path_tokens); i++)
+        if (strcmp (key, path_tokens[i]) == 0)
+          retval = g_strdup_printf ("${%s}", path_tokens[i]);
+    }
+
+  if (retval)
+    {
+      gchar *tmp = gimp_config_path_expand (retval, FALSE, NULL);
+
+      if (tmp)
+        {
+          g_free (retval);
+          retval = tmp;
+        }
+    }
+
+  return retval;
+}
+
+/**
+ * gimp_rc_set_unknown_token:
+ * @gimprc: a #GimpRc object.
+ * @token:
+ * @value:
+ *
+ * Calls gimp_rc_add_unknown_token() and triggers an idle-save if
+ * autosave is enabled on @gimprc.
+ **/
+void
+gimp_rc_set_unknown_token (GimpRc      *rc,
+                           const gchar *token,
+                           const gchar *value)
+{
+  g_return_if_fail (GIMP_IS_RC (rc));
+
+  gimp_rc_add_unknown_token (GIMP_CONFIG (rc), token, value);
+
+  if (rc->autosave)
+    gimp_rc_notify (rc, NULL, NULL);
+}
+
+/**
+ * gimp_rc_save:
+ * @gimprc: a #GimpRc object.
+ *
+ * Saves any settings that differ from the system-wide defined
+ * defaults to the users personal gimprc file.
+ **/
+void
+gimp_rc_save (GimpRc *rc)
+{
+  GObject *gimp;
+  GimpRc  *global;
+  gchar   *header;
+  GError  *error = NULL;
+
+  const gchar *top =
+    "GIMP gimprc\n"
+    "\n"
+    "This is your personal gimprc file.  Any variable defined in this file "
+    "takes precedence over the value defined in the system-wide gimprc: ";
+  const gchar *bottom =
+    "\n"
+    "Most values can be set within GIMP by changing some options in "
+    "the Preferences dialog.";
+  const gchar *footer =
+    "end of gimprc";
+
+  g_return_if_fail (GIMP_IS_RC (rc));
+
+  g_object_get (rc, "gimp", &gimp, NULL);
+
+  global = g_object_new (GIMP_TYPE_RC,
+                         "gimp", gimp,
+                         NULL);
+
+  if (gimp)
+    g_object_unref (gimp);
+
+  gimp_config_deserialize_gfile (GIMP_CONFIG (global),
+                                 rc->system_gimprc, NULL, NULL);
+
+  header = g_strconcat (top, gimp_file_get_utf8_name (rc->system_gimprc),
+                        bottom, NULL);
+
+  if (rc->verbose)
+    g_print ("Writing '%s'\n",
+             gimp_file_get_utf8_name (rc->user_gimprc));
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (rc),
+                                        rc->user_gimprc,
+                                        header, footer, global,
+                                        &error))
+    {
+      g_message ("%s", error->message);
+      g_error_free (error);
+    }
+
+  g_free (header);
+  g_object_unref (global);
+}
+
+/**
+ * gimp_rc_migrate:
+ * @rc: a #GimpRc object.
+ *
+ * Resets all GimpParamConfigPath properties of the passed rc object
+ * to their default values, in order to prevent paths in a migrated
+ * gimprc to refer to folders in the old GIMP's user directory.
+ **/
+void
+gimp_rc_migrate (GimpRc *rc)
+{
+  GParamSpec **pspecs;
+  guint        n_pspecs;
+  gint         i;
+
+  g_return_if_fail (GIMP_IS_RC (rc));
+
+  pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (rc), &n_pspecs);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *pspec = pspecs[i];
+
+      if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
+        {
+          GValue value = G_VALUE_INIT;
+
+          g_value_init (&value, pspec->value_type);
+
+          g_param_value_set_default (pspec, &value);
+          g_object_set_property (G_OBJECT (rc), pspec->name, &value);
+
+          g_value_unset (&value);
+        }
+    }
+
+  g_free (pspecs);
+}
diff --git a/app/config/gimprc.h b/app/config/gimprc.h
new file mode 100644
index 0000000..fbe47a1
--- /dev/null
+++ b/app/config/gimprc.h
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpRc
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RC_H__
+#define __GIMP_RC_H__
+
+#include "config/gimppluginconfig.h"
+
+
+#define GIMP_TYPE_RC            (gimp_rc_get_type ())
+#define GIMP_RC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RC, GimpRc))
+#define GIMP_RC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RC, GimpRcClass))
+#define GIMP_IS_RC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RC))
+#define GIMP_IS_RC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_RC))
+
+
+typedef struct _GimpRcClass GimpRcClass;
+
+struct _GimpRc
+{
+  GimpPluginConfig  parent_instance;
+
+  GFile            *user_gimprc;
+  GFile            *system_gimprc;
+  gboolean          verbose;
+  gboolean          autosave;
+  guint             save_idle_id;
+};
+
+struct _GimpRcClass
+{
+  GimpPluginConfigClass  parent_class;
+};
+
+
+GType     gimp_rc_get_type          (void) G_GNUC_CONST;
+
+GimpRc  * gimp_rc_new               (GObject     *gimp,
+                                     GFile       *system_gimprc,
+                                     GFile       *user_gimprc,
+                                     gboolean     verbose);
+
+void      gimp_rc_load_system       (GimpRc      *rc);
+void      gimp_rc_load_user         (GimpRc      *rc);
+
+void      gimp_rc_set_autosave      (GimpRc      *rc,
+                                     gboolean     autosave);
+void      gimp_rc_save              (GimpRc      *rc);
+
+gchar   * gimp_rc_query             (GimpRc      *rc,
+                                     const gchar *key);
+
+void      gimp_rc_set_unknown_token (GimpRc      *rc,
+                                     const gchar *token,
+                                     const gchar *value);
+
+void      gimp_rc_migrate           (GimpRc      *rc);
+
+
+#endif /* GIMP_RC_H__ */
diff --git a/app/config/gimpxmlparser.c b/app/config/gimpxmlparser.c
new file mode 100644
index 0000000..1bec8f8
--- /dev/null
+++ b/app/config/gimpxmlparser.c
@@ -0,0 +1,404 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * GimpXmlParser
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "config-types.h"
+
+#include "gimpxmlparser.h"
+
+
+struct _GimpXmlParser
+{
+  GMarkupParseContext *context;
+};
+
+
+static gboolean parse_encoding (const gchar  *text,
+                                gint          text_len,
+                                gchar       **encodind);
+
+
+/**
+ * gimp_xml_parser_new:
+ * @markup_parser: a #GMarkupParser
+ * @user_data: user data to pass to #GMarkupParser functions
+ *
+ * GimpXmlParser is a thin wrapper around GMarkupParser. This function
+ * creates one for you and sets up a GMarkupParseContext.
+ *
+ * Return value: a new #GimpXmlParser
+ **/
+GimpXmlParser *
+gimp_xml_parser_new (const GMarkupParser *markup_parser,
+                     gpointer             user_data)
+{
+  GimpXmlParser *parser;
+
+  g_return_val_if_fail (markup_parser != NULL, NULL);
+
+  parser = g_slice_new (GimpXmlParser);
+
+  parser->context = g_markup_parse_context_new (markup_parser,
+                                                0, user_data, NULL);
+
+  return parser;
+}
+
+/**
+ * gimp_xml_parser_parse_file:
+ * @parser: a #GimpXmlParser
+ * @filename: name of a file to parse
+ * @error: return location for possible errors
+ *
+ * This function creates a GIOChannel for @filename and calls
+ * gimp_xml_parser_parse_io_channel() for you.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+gimp_xml_parser_parse_file (GimpXmlParser  *parser,
+                            const gchar    *filename,
+                            GError        **error)
+{
+  GIOChannel *io;
+  gboolean    success;
+
+  g_return_val_if_fail (parser != NULL, FALSE);
+  g_return_val_if_fail (filename != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  io = g_io_channel_new_file (filename, "r", error);
+  if (!io)
+    return FALSE;
+
+  success = gimp_xml_parser_parse_io_channel (parser, io, error);
+
+  g_io_channel_unref (io);
+
+  return success;
+}
+
+/**
+ * gimp_xml_parser_parse_gfile:
+ * @parser: a #GimpXmlParser
+ * @file: the #GFile to parse
+ * @error: return location for possible errors
+ *
+ * This function creates a GIOChannel for @file and calls
+ * gimp_xml_parser_parse_io_channel() for you.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+gimp_xml_parser_parse_gfile (GimpXmlParser  *parser,
+                             GFile          *file,
+                             GError        **error)
+{
+  gchar    *path;
+  gboolean  success;
+
+  g_return_val_if_fail (parser != NULL, FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+
+  path = g_file_get_path (file);
+
+  success = gimp_xml_parser_parse_file (parser, path, error);
+
+  g_free (path);
+
+  return success;
+}
+
+/**
+ * gimp_xml_parser_parse_fd:
+ * @parser: a #GimpXmlParser
+ * @fd:     a file descriptor
+ * @error: return location for possible errors
+ *
+ * This function creates a GIOChannel for @fd and calls
+ * gimp_xml_parser_parse_io_channel() for you.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+gimp_xml_parser_parse_fd (GimpXmlParser  *parser,
+                          gint            fd,
+                          GError        **error)
+{
+  GIOChannel *io;
+  gboolean    success;
+
+  g_return_val_if_fail (parser != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+#ifdef G_OS_WIN32
+  io = g_io_channel_win32_new_fd (fd);
+#else
+  io = g_io_channel_unix_new (fd);
+#endif
+
+  success = gimp_xml_parser_parse_io_channel (parser, io, error);
+
+  g_io_channel_unref (io);
+
+  return success;
+}
+
+/**
+ * gimp_xml_parser_parse_io_channel:
+ * @parser: a #GimpXmlParser
+ * @io: a #GIOChannel
+ * @error: return location for possible errors
+ *
+ * Makes @parser read from the specified @io channel. This function
+ * returns when the GIOChannel becomes empty (end of file) or an
+ * error occurs, either reading from @io or parsing the read data.
+ *
+ * This function tries to determine the character encoding from the
+ * XML header and converts the content to UTF-8 for you. For this
+ * feature to work, the XML header with the encoding attribute must be
+ * contained in the first 4096 bytes read. Otherwise UTF-8 encoding
+ * will be assumed and parsing may break later if this assumption
+ * was wrong.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+gimp_xml_parser_parse_io_channel (GimpXmlParser  *parser,
+                                  GIOChannel     *io,
+                                  GError        **error)
+{
+  GIOStatus    status;
+  gchar        buffer[4096];
+  gsize        len = 0;
+  gsize        bytes;
+  const gchar *io_encoding;
+  gchar       *encoding = NULL;
+
+  g_return_val_if_fail (parser != NULL, FALSE);
+  g_return_val_if_fail (io != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  io_encoding = g_io_channel_get_encoding (io);
+  if (g_strcmp0 (io_encoding, "UTF-8"))
+    {
+      g_warning ("gimp_xml_parser_parse_io_channel():\n"
+                 "The encoding has already been set on this GIOChannel!");
+      return FALSE;
+    }
+
+  /* try to determine the encoding */
+
+  g_io_channel_set_encoding (io, NULL, NULL);
+
+  while (len < sizeof (buffer))
+    {
+      status = g_io_channel_read_chars (io, buffer + len, 1, &bytes, error);
+      len += bytes;
+
+      if (status == G_IO_STATUS_ERROR)
+        return FALSE;
+      if (status == G_IO_STATUS_EOF)
+        break;
+
+      if (parse_encoding (buffer, len, &encoding))
+        break;
+    }
+
+  if (encoding)
+    {
+      if (! g_io_channel_set_encoding (io, encoding, error))
+        return FALSE;
+
+      g_free (encoding);
+    }
+  else
+    {
+      g_io_channel_set_encoding (io, "UTF-8", NULL);
+    }
+
+  while (TRUE)
+    {
+      if (!g_markup_parse_context_parse (parser->context, buffer, len, error))
+        return FALSE;
+
+      status = g_io_channel_read_chars (io,
+                                        buffer, sizeof (buffer), &len, error);
+
+      switch (status)
+        {
+        case G_IO_STATUS_ERROR:
+          return FALSE;
+        case G_IO_STATUS_EOF:
+          return g_markup_parse_context_end_parse (parser->context, error);
+        case G_IO_STATUS_NORMAL:
+        case G_IO_STATUS_AGAIN:
+          break;
+        }
+    }
+}
+
+/**
+ * gimp_xml_parser_parse_buffer:
+ * @parser: a #GimpXmlParser
+ * @buffer: a string buffer
+ * @len: the number of byes in @buffer or -1 if @buffer is nul-terminated
+ * @error: return location for possible errors
+ *
+ * This function uses the given @parser to parse the XML in @buffer.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+gimp_xml_parser_parse_buffer (GimpXmlParser  *parser,
+                              const gchar    *buffer,
+                              gssize          len,
+                              GError        **error)
+{
+  gchar    *encoding = NULL;
+  gchar    *conv     = NULL;
+  gboolean  success;
+
+  g_return_val_if_fail (parser != NULL, FALSE);
+  g_return_val_if_fail (buffer != NULL || len == 0, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (len < 0)
+    len = strlen (buffer);
+
+  if (parse_encoding (buffer, len, &encoding) && encoding)
+    {
+      if (g_ascii_strcasecmp (encoding, "UTF-8") &&
+          g_ascii_strcasecmp (encoding, "UTF8"))
+        {
+          gsize written;
+
+          conv = g_convert (buffer, len,
+                            "UTF-8", encoding, NULL, &written, error);
+          if (! conv)
+            {
+              g_free (encoding);
+              return FALSE;
+            }
+
+          len = written;
+        }
+
+      g_free (encoding);
+    }
+
+  success = g_markup_parse_context_parse (parser->context,
+                                          conv ? conv : buffer, len, error);
+
+  if (conv)
+    g_free (conv);
+
+  return success;
+}
+
+/**
+ * gimp_xml_parser_free:
+ * @parser: a #GimpXmlParser
+ *
+ * Frees the resources allocated for @parser. You must not access
+ * @parser after calling this function.
+ **/
+void
+gimp_xml_parser_free (GimpXmlParser *parser)
+{
+  g_return_if_fail (parser != NULL);
+
+  g_markup_parse_context_free (parser->context);
+  g_slice_free (GimpXmlParser, parser);
+}
+
+
+/* Try to determine encoding from XML header.  This function returns
+   FALSE when it doesn't have enough text to parse.  It returns TRUE
+   and sets encoding when the XML header has been parsed.
+ */
+static gboolean
+parse_encoding (const gchar  *text,
+                gint          text_len,
+                gchar       **encoding)
+{
+  const gchar *start;
+  const gchar *end;
+  gint         i;
+
+  g_return_val_if_fail (text, FALSE);
+
+  if (text_len < 20)
+    return FALSE;
+
+  start = g_strstr_len (text, text_len, "<?xml");
+  if (!start)
+    return FALSE;
+
+  end = g_strstr_len (start, text_len - (start - text), "?>");
+  if (!end)
+    return FALSE;
+
+  *encoding = NULL;
+
+  text_len = end - start;
+  if (text_len < 12)
+    return TRUE;
+
+  start = g_strstr_len (start + 1, text_len - 1, "encoding");
+  if (!start)
+    return TRUE;
+
+  start += 8;
+
+  while (start < end && *start == ' ')
+    start++;
+
+  if (*start != '=')
+    return TRUE;
+
+  start++;
+
+  while (start < end && *start == ' ')
+    start++;
+
+  if (*start != '\"' && *start != '\'')
+    return TRUE;
+
+  text_len = end - start;
+  if (text_len < 1)
+    return TRUE;
+
+  for (i = 1; i < text_len; i++)
+    if (start[i] == start[0])
+      break;
+
+  if (i == text_len || i < 3)
+    return TRUE;
+
+  *encoding = g_strndup (start + 1, i - 1);
+
+  return TRUE;
+}
diff --git a/app/config/gimpxmlparser.h b/app/config/gimpxmlparser.h
new file mode 100644
index 0000000..f744472
--- /dev/null
+++ b/app/config/gimpxmlparser.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * GimpXmlParser
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_XML_PARSER_H__
+#define __GIMP_XML_PARSER_H__
+
+
+GimpXmlParser * gimp_xml_parser_new              (const GMarkupParser *markup_parser,
+                                                  gpointer             user_data);
+gboolean        gimp_xml_parser_parse_file       (GimpXmlParser       *parser,
+                                                  const gchar         *filename,
+                                                  GError             **error);
+gboolean        gimp_xml_parser_parse_gfile      (GimpXmlParser       *parser,
+                                                  GFile               *file,
+                                                  GError             **error);
+gboolean        gimp_xml_parser_parse_fd         (GimpXmlParser       *parser,
+                                                  gint                 fd,
+                                                  GError             **error);
+gboolean        gimp_xml_parser_parse_io_channel (GimpXmlParser       *parser,
+                                                  GIOChannel          *io,
+                                                  GError             **error);
+gboolean        gimp_xml_parser_parse_buffer     (GimpXmlParser       *parser,
+                                                  const gchar         *buffer,
+                                                  gssize               len,
+                                                  GError             **error);
+void            gimp_xml_parser_free             (GimpXmlParser       *parser);
+
+
+#endif  /* __GIMP_XML_PARSER_H__ */
diff --git a/app/config/test-config.c b/app/config/test-config.c
new file mode 100644
index 0000000..1aff0a4
--- /dev/null
+++ b/app/config/test-config.c
@@ -0,0 +1,278 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Test suite for GimpConfig.
+ * Copyright (C) 2001-2002  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "stdlib.h"
+#include "string.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpbase-private.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core/core-types.h"
+#include "core/gimpgrid.h"
+
+#include "gimprc-unknown.h"
+
+
+static void  notify_callback      (GObject     *object,
+                                   GParamSpec  *pspec);
+static void  output_unknown_token (const gchar *key,
+                                   const gchar *value,
+                                   gpointer     data);
+
+static void  units_init           (void);
+
+
+int
+main (int   argc,
+      char *argv[])
+{
+  GimpConfig  *grid;
+  GimpConfig  *grid2;
+  const gchar *filename = "foorc";
+  gchar       *header;
+  gchar       *result;
+  GList       *list;
+  gint         i;
+  GError      *error = NULL;
+
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], "--g-fatal-warnings") == 0)
+        {
+          GLogLevelFlags fatal_mask;
+
+          fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+          fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+          g_log_set_always_fatal (fatal_mask);
+        }
+    }
+
+  units_init ();
+
+  g_print ("\nTesting GimpConfig ...\n");
+
+  g_print (" Creating a new Grid object ...");
+  grid = g_object_new (GIMP_TYPE_GRID, NULL);
+  g_print (" done.\n");
+
+  g_print (" Adding the unknown token (foobar \"hadjaha\") ...");
+  gimp_rc_add_unknown_token (grid, "foobar", "hadjaha");
+  g_print (" done.\n");
+
+  g_print (" Serializing %s to '%s' ...",
+           g_type_name (G_TYPE_FROM_INSTANCE (grid)), filename);
+
+  if (! gimp_config_serialize_to_file (grid,
+                                       filename,
+                                       "foorc", "end of foorc",
+                                       NULL, &error))
+    {
+      g_print ("%s\n", error->message);
+      return EXIT_FAILURE;
+    }
+  g_print (" done.\n");
+
+  g_signal_connect (grid, "notify",
+                    G_CALLBACK (notify_callback),
+                    NULL);
+
+  g_print (" Deserializing from '%s' ...\n", filename);
+  if (! gimp_config_deserialize_file (grid, filename, NULL, &error))
+    {
+      g_print ("%s\n", error->message);
+      return EXIT_FAILURE;
+    }
+  header = " Unknown string tokens:\n";
+  gimp_rc_foreach_unknown_token (grid, output_unknown_token, &header);
+  g_print (" done.\n\n");
+
+  g_print (" Changing a property ...");
+  g_object_set (grid, "style", GIMP_GRID_DOTS, NULL);
+
+  g_print (" Testing gimp_config_duplicate() ...");
+  grid2 = gimp_config_duplicate (grid);
+  g_print (" done.\n");
+
+  g_signal_connect (grid2, "notify",
+                    G_CALLBACK (notify_callback),
+                    NULL);
+
+  g_print (" Changing a property in the duplicate ...");
+  g_object_set (grid2, "xspacing", 20.0, NULL);
+
+  g_print (" Creating a diff between the two ...");
+  for (list = gimp_config_diff (G_OBJECT (grid), G_OBJECT (grid2), 0);
+       list;
+       list = list->next)
+    {
+      GParamSpec *pspec = list->data;
+
+      g_print ("%c%s", (list->prev ? ',' : ' '), pspec->name);
+    }
+  g_print ("\n\n");
+
+  g_object_unref (grid2);
+
+  g_print (" Deserializing from gimpconfig.c (should fail) ...");
+  if (! gimp_config_deserialize_file (grid, "gimpconfig.c", NULL, &error))
+    {
+      g_print (" OK, failed. The error was:\n %s\n", error->message);
+      g_error_free (error);
+      error = NULL;
+    }
+  else
+    {
+      g_print ("This test should have failed :-(\n");
+      return EXIT_FAILURE;
+    }
+
+  g_print (" Serializing to a string and back ... ");
+
+  result = gimp_config_serialize_to_string (grid, NULL);
+
+  grid2 = g_object_new (GIMP_TYPE_GRID, NULL);
+
+  if (! gimp_config_deserialize_string (grid2, result, -1, NULL, &error))
+    {
+      g_print ("failed!\nThe error was:\n %s\n", error->message);
+      g_error_free (error);
+      return EXIT_FAILURE;
+    }
+  else
+    {
+      GList *diff = gimp_config_diff (G_OBJECT (grid), G_OBJECT (grid2), 0);
+
+      if (diff)
+        {
+          GList *list;
+
+          g_print ("succeeded but properties differ:\n");
+          for (list = diff; list; list = list->next)
+            {
+              GParamSpec *pspec = list->data;
+              g_print ("   %s\n", pspec->name);
+            }
+          return EXIT_FAILURE;
+        }
+
+      g_print ("OK (%u bytes)\n", result ? (guint) strlen (result) : 0);
+    }
+
+  g_free (result);
+  g_object_unref (grid2);
+  g_object_unref (grid);
+
+  g_print ("\nFinished test of GimpConfig.\n\n");
+
+  return EXIT_SUCCESS;
+}
+
+static void
+notify_callback (GObject    *object,
+                 GParamSpec *pspec)
+{
+  GString *str;
+  GValue   value = G_VALUE_INIT;
+
+  g_return_if_fail (G_IS_OBJECT (object));
+  g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+
+  g_value_init (&value, pspec->value_type);
+  g_object_get_property (object, pspec->name, &value);
+
+  str = g_string_new (NULL);
+
+  if (gimp_config_serialize_value (&value, str, TRUE))
+    {
+      g_print ("  %s -> %s\n", pspec->name, str->str);
+    }
+  else
+    {
+      g_print ("  %s changed but we failed to serialize its value!\n",
+               pspec->name);
+    }
+
+  g_string_free (str, TRUE);
+  g_value_unset (&value);
+}
+
+static void
+output_unknown_token (const gchar *key,
+                      const gchar *value,
+                      gpointer     data)
+{
+  gchar **header  = (gchar **) data;
+  gchar  *escaped = g_strescape (value, NULL);
+
+  if (*header)
+    {
+      g_print ("%s", *header);
+      *header = NULL;
+    }
+
+  g_print ("   %s \"%s\"\n", key, escaped);
+
+  g_free (escaped);
+}
+
+
+/* minimal dummy units implementation  */
+
+static const gchar *
+unit_get_identifier (GimpUnit unit)
+{
+  switch (unit)
+    {
+    case GIMP_UNIT_PIXEL:
+      return "pixels";
+    case GIMP_UNIT_INCH:
+      return "inches";
+    case GIMP_UNIT_MM:
+      return "millimeters";
+    case GIMP_UNIT_POINT:
+      return "points";
+    case GIMP_UNIT_PICA:
+      return "picas";
+    default:
+      return NULL;
+    }
+}
+
+static gint
+unit_get_number_of_units (void)
+{
+  return GIMP_UNIT_END;
+}
+
+static void
+units_init (void)
+{
+  GimpUnitVtable vtable;
+
+  vtable.unit_get_number_of_units = unit_get_number_of_units;
+  vtable.unit_get_identifier      = unit_get_identifier;
+
+  gimp_base_init (&vtable);
+}
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
new file mode 100644
index 0000000..c25f302
--- /dev/null
+++ b/app/core/Makefile.am
@@ -0,0 +1,550 @@
+## Process this file with automake to produce Makefile.in
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+xobjective_cxx = "-xobjective-c++"
+xnone = "-xnone"
+endif
+
+AM_CPPFLAGS = \
+	-DGIMPDIR=\""$(gimpdir)"\"			\
+	-DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\"	\
+	-DGIMP_USER_VERSION=\"$(GIMP_USER_VERSION)\"	\
+	-DG_LOG_DOMAIN=\"Gimp-Core\"			\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)/app				\
+	-I$(top_srcdir)/app				\
+	$(CAIRO_CFLAGS)					\
+	$(GEGL_CFLAGS)					\
+	$(GDK_PIXBUF_CFLAGS)				\
+	$(LIBMYPAINT_CFLAGS)				\
+	$(MYPAINT_BRUSHES_CFLAGS)			\
+	$(GEXIV2_CFLAGS)				\
+	$(LIBUNWIND_CFLAGS)				\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappcore.a
+
+libappcore_a_sources = \
+	core-enums.h				\
+	core-types.h				\
+	gimp.c					\
+	gimp.h					\
+	gimp-atomic.c				\
+	gimp-atomic.h				\
+	gimp-batch.c				\
+	gimp-batch.h				\
+	gimp-cairo.c				\
+	gimp-cairo.h				\
+	gimp-contexts.c				\
+	gimp-contexts.h				\
+	gimp-data-factories.c			\
+	gimp-data-factories.h			\
+	gimp-edit.c				\
+	gimp-edit.h				\
+	gimp-filter-history.c			\
+	gimp-filter-history.h			\
+	gimp-gradients.c			\
+	gimp-gradients.h			\
+	gimp-gui.c				\
+	gimp-gui.h				\
+	gimp-internal-data.c			\
+	gimp-internal-data.h			\
+	gimp-memsize.c				\
+	gimp-memsize.h				\
+	gimp-modules.c				\
+	gimp-modules.h				\
+	gimp-palettes.c				\
+	gimp-palettes.h				\
+	gimp-parallel.cc			\
+	gimp-parallel.h				\
+	gimp-parasites.c			\
+	gimp-parasites.h			\
+	gimp-spawn.c				\
+	gimp-spawn.h				\
+	gimp-tags.c				\
+	gimp-tags.h				\
+	gimp-templates.c			\
+	gimp-templates.h			\
+	gimp-transform-resize.c			\
+	gimp-transform-resize.h			\
+	gimp-transform-3d-utils.c		\
+	gimp-transform-3d-utils.h		\
+	gimp-transform-utils.c			\
+	gimp-transform-utils.h			\
+	gimp-units.c				\
+	gimp-units.h				\
+	gimp-user-install.c			\
+	gimp-user-install.h			\
+	gimp-utils.c				\
+	gimp-utils.h				\
+	gimpasync.c				\
+	gimpasync.h				\
+	gimpasyncset.c				\
+	gimpasyncset.h				\
+	gimpauxitem.c				\
+	gimpauxitem.h				\
+	gimpauxitemundo.c			\
+	gimpauxitemundo.h			\
+	gimpbacktrace.h				\
+	gimpbacktrace-backend.h			\
+	gimpbacktrace-linux.c			\
+	gimpbacktrace-none.c			\
+	gimpbacktrace-windows.c			\
+	gimpbezierdesc.h			\
+	gimpbezierdesc.c			\
+	gimpboundary.c				\
+	gimpboundary.h				\
+	gimpbrush.c				\
+	gimpbrush.h				\
+	gimpbrush-boundary.c			\
+	gimpbrush-boundary.h			\
+	gimpbrush-header.h			\
+	gimpbrush-load.c			\
+	gimpbrush-load.h			\
+	gimpbrush-mipmap.cc			\
+	gimpbrush-mipmap.h			\
+	gimpbrush-private.h			\
+	gimpbrush-save.c			\
+	gimpbrush-save.h			\
+	gimpbrush-transform.cc			\
+	gimpbrush-transform.h			\
+	gimpbrushcache.c			\
+	gimpbrushcache.h			\
+	gimpbrushclipboard.c			\
+	gimpbrushclipboard.h			\
+	gimpbrushgenerated.c			\
+	gimpbrushgenerated.h			\
+	gimpbrushgenerated-load.c		\
+	gimpbrushgenerated-load.h		\
+	gimpbrushgenerated-save.c		\
+	gimpbrushgenerated-save.h		\
+	gimpbrushpipe.c				\
+	gimpbrushpipe.h				\
+	gimpbrushpipe-load.c			\
+	gimpbrushpipe-load.h			\
+	gimpbrushpipe-save.c			\
+	gimpbrushpipe-save.h			\
+	gimpbuffer.c				\
+	gimpbuffer.h				\
+	gimpcancelable.c			\
+	gimpcancelable.h			\
+	gimpchannel.c				\
+	gimpchannel.h				\
+	gimpchannel-combine.c			\
+	gimpchannel-combine.h			\
+	gimpchannel-select.c			\
+	gimpchannel-select.h			\
+	gimpchannelpropundo.c			\
+	gimpchannelpropundo.h			\
+	gimpchannelundo.c			\
+	gimpchannelundo.h			\
+	gimpchunkiterator.c			\
+	gimpchunkiterator.h			\
+	gimpcontainer.c				\
+	gimpcontainer.h				\
+	gimpcontainer-filter.c			\
+	gimpcontainer-filter.h			\
+	gimpcontext.c				\
+	gimpcontext.h				\
+	gimpcoords.c				\
+	gimpcoords.h				\
+	gimpcoords-interpolate.c		\
+	gimpcoords-interpolate.h		\
+	gimpcurve.c				\
+	gimpcurve.h				\
+	gimpcurve-load.c			\
+	gimpcurve-load.h			\
+	gimpcurve-map.c				\
+	gimpcurve-map.h				\
+	gimpcurve-save.c			\
+	gimpcurve-save.h			\
+	gimpdashpattern.c			\
+	gimpdashpattern.h			\
+	gimpdata.c				\
+	gimpdata.h				\
+	gimpdatafactory.c			\
+	gimpdatafactory.h			\
+	gimpdataloaderfactory.c			\
+	gimpdataloaderfactory.h			\
+	gimpdocumentlist.c			\
+	gimpdocumentlist.h			\
+	gimpdrawable.c				\
+	gimpdrawable.h				\
+	gimpdrawable-bucket-fill.c		\
+	gimpdrawable-bucket-fill.h		\
+	gimpdrawable-combine.c			\
+	gimpdrawable-combine.h			\
+	gimpdrawable-edit.c			\
+	gimpdrawable-edit.h			\
+	gimpdrawable-equalize.c			\
+	gimpdrawable-equalize.h			\
+	gimpdrawable-fill.c			\
+	gimpdrawable-fill.h			\
+	gimpdrawable-filters.c			\
+	gimpdrawable-filters.h			\
+	gimpdrawable-floating-selection.c	\
+	gimpdrawable-floating-selection.h	\
+	gimpdrawable-foreground-extract.c	\
+	gimpdrawable-foreground-extract.h	\
+	gimpdrawable-gradient.c			\
+	gimpdrawable-gradient.h			\
+	gimpdrawable-histogram.c		\
+	gimpdrawable-histogram.h		\
+	gimpdrawable-levels.c			\
+	gimpdrawable-levels.h			\
+	gimpdrawable-offset.c			\
+	gimpdrawable-offset.h			\
+	gimpdrawable-operation.c		\
+	gimpdrawable-operation.h		\
+	gimpdrawable-preview.c			\
+	gimpdrawable-preview.h			\
+	gimpdrawable-private.h			\
+	gimpdrawable-shadow.c			\
+	gimpdrawable-shadow.h			\
+	gimpdrawable-stroke.c			\
+	gimpdrawable-stroke.h			\
+	gimpdrawable-transform.c		\
+	gimpdrawable-transform.h		\
+	gimpdrawablefilter.c			\
+	gimpdrawablefilter.h			\
+	gimpdrawablemodundo.c			\
+	gimpdrawablemodundo.h			\
+	gimpdrawablestack.c			\
+	gimpdrawablestack.h			\
+	gimpdrawableundo.c			\
+	gimpdrawableundo.h			\
+	gimpdynamics.c				\
+	gimpdynamics.h				\
+	gimpdynamics-load.c			\
+	gimpdynamics-load.h			\
+	gimpdynamics-save.c			\
+	gimpdynamics-save.h			\
+	gimpdynamicsoutput.c			\
+	gimpdynamicsoutput.h			\
+	gimperror.c				\
+	gimperror.h				\
+	gimpfilloptions.c			\
+	gimpfilloptions.h			\
+	gimpfilter.c				\
+	gimpfilter.h				\
+	gimpfilteredcontainer.c			\
+	gimpfilteredcontainer.h			\
+	gimpfilterstack.c			\
+	gimpfilterstack.h			\
+	gimpfloatingselectionundo.c		\
+	gimpfloatingselectionundo.h		\
+	gimpgradient.c				\
+	gimpgradient.h				\
+	gimpgradient-load.c			\
+	gimpgradient-load.h			\
+	gimpgradient-save.c			\
+	gimpgradient-save.h			\
+	gimpgrid.c				\
+	gimpgrid.h				\
+	gimpgrouplayer.c			\
+	gimpgrouplayer.h			\
+	gimpgrouplayerundo.c			\
+	gimpgrouplayerundo.h			\
+	gimpguide.c				\
+	gimpguide.h				\
+	gimpguideundo.c				\
+	gimpguideundo.h				\
+	gimphistogram.c				\
+	gimphistogram.h				\
+	gimpidtable.c				\
+	gimpidtable.h				\
+	gimpimage.c				\
+	gimpimage.h				\
+	gimpimage-arrange.c			\
+	gimpimage-arrange.h			\
+	gimpimage-color-profile.c		\
+	gimpimage-color-profile.h		\
+	gimpimage-colormap.c			\
+	gimpimage-colormap.h			\
+	gimpimage-convert-indexed.c		\
+	gimpimage-convert-indexed.h		\
+	gimpimage-convert-fsdither.h		\
+	gimpimage-convert-data.h		\
+	gimpimage-convert-precision.c		\
+	gimpimage-convert-precision.h		\
+	gimpimage-convert-type.c		\
+	gimpimage-convert-type.h		\
+	gimpimage-crop.c			\
+	gimpimage-crop.h			\
+	gimpimage-duplicate.c			\
+	gimpimage-duplicate.h			\
+	gimpimage-flip.c			\
+	gimpimage-flip.h			\
+	gimpimage-grid.h                	\
+	gimpimage-grid.c                	\
+	gimpimage-guides.c			\
+	gimpimage-guides.h			\
+	gimpimage-item-list.c			\
+	gimpimage-item-list.h			\
+	gimpimage-merge.c			\
+	gimpimage-merge.h			\
+	gimpimage-metadata.c			\
+	gimpimage-metadata.h			\
+	gimpimage-new.c				\
+	gimpimage-new.h				\
+	gimpimage-pick-color.c			\
+	gimpimage-pick-color.h			\
+	gimpimage-pick-item.c			\
+	gimpimage-pick-item.h			\
+	gimpimage-preview.c			\
+	gimpimage-preview.h			\
+	gimpimage-private.h			\
+	gimpimage-quick-mask.c			\
+	gimpimage-quick-mask.h			\
+	gimpimage-resize.c			\
+	gimpimage-resize.h			\
+	gimpimage-rotate.c			\
+	gimpimage-rotate.h			\
+	gimpimage-sample-points.c		\
+	gimpimage-sample-points.h		\
+	gimpimage-scale.c			\
+	gimpimage-scale.h			\
+	gimpimage-snap.c			\
+	gimpimage-snap.h			\
+	gimpimage-symmetry.c			\
+	gimpimage-symmetry.h			\
+	gimpimage-transform.c			\
+	gimpimage-transform.h			\
+	gimpimage-undo.c			\
+	gimpimage-undo.h			\
+	gimpimage-undo-push.c			\
+	gimpimage-undo-push.h			\
+	gimpimageproxy.c			\
+	gimpimageproxy.h			\
+	gimpimageundo.c				\
+	gimpimageundo.h				\
+	gimpimagefile.c				\
+	gimpimagefile.h				\
+	gimpitem.c				\
+	gimpitem.h				\
+	gimpitem-exclusive.c			\
+	gimpitem-exclusive.h			\
+	gimpitem-linked.c			\
+	gimpitem-linked.h			\
+	gimpitem-preview.c			\
+	gimpitem-preview.h			\
+	gimpitempropundo.c			\
+	gimpitempropundo.h			\
+	gimpitemstack.c				\
+	gimpitemstack.h				\
+	gimpitemtree.c				\
+	gimpitemtree.h				\
+	gimpitemundo.c				\
+	gimpitemundo.h				\
+	gimplayer.c				\
+	gimplayer.h				\
+	gimplayer-floating-selection.c		\
+	gimplayer-floating-selection.h		\
+	gimplayer-new.c				\
+	gimplayer-new.h				\
+	gimplayermask.c				\
+	gimplayermask.h				\
+	gimplayermaskpropundo.c			\
+	gimplayermaskpropundo.h			\
+	gimplayermaskundo.c			\
+	gimplayermaskundo.h			\
+	gimplayerpropundo.c			\
+	gimplayerpropundo.h			\
+	gimplayerstack.c			\
+	gimplayerstack.h			\
+	gimplayerundo.c				\
+	gimplayerundo.h				\
+	gimplineart.c				\
+	gimplineart.h				\
+	gimplist.c				\
+	gimplist.h				\
+	gimpmaskundo.c				\
+	gimpmaskundo.h				\
+	gimpmybrush.c				\
+	gimpmybrush.h				\
+	gimpmybrush-load.c			\
+	gimpmybrush-load.h			\
+	gimpmybrush-private.h			\
+	gimpobject.c				\
+	gimpobject.h				\
+	gimpobjectqueue.c			\
+	gimpobjectqueue.h			\
+	gimppaintinfo.c				\
+	gimppaintinfo.h				\
+	gimppattern.c				\
+	gimppattern.h				\
+	gimppattern-header.h			\
+	gimppattern-load.c			\
+	gimppattern-load.h			\
+	gimppattern-save.c			\
+	gimppattern-save.h			\
+	gimppatternclipboard.c			\
+	gimppatternclipboard.h			\
+	gimppalette.c				\
+	gimppalette.h				\
+	gimppalette-import.c			\
+	gimppalette-import.h			\
+	gimppalette-load.c			\
+	gimppalette-load.h			\
+	gimppalette-save.c			\
+	gimppalette-save.h			\
+	gimppalettemru.c			\
+	gimppalettemru.h			\
+	gimpparamspecs.c			\
+	gimpparamspecs.h			\
+	gimpparamspecs-desc.c			\
+	gimpparamspecs-desc.h			\
+	gimpparamspecs-duplicate.c		\
+	gimpparamspecs-duplicate.h		\
+	gimpparasitelist.c			\
+	gimpparasitelist.h			\
+	gimppdbprogress.c			\
+	gimppdbprogress.h			\
+	gimppickable.c				\
+	gimppickable.h				\
+	gimppickable-auto-shrink.c		\
+	gimppickable-auto-shrink.h		\
+	gimppickable-contiguous-region.cc	\
+	gimppickable-contiguous-region.h	\
+	gimpprogress.c				\
+	gimpprogress.h				\
+	gimpprojectable.c			\
+	gimpprojectable.h			\
+	gimpprojection.c			\
+	gimpprojection.h			\
+	gimpsamplepoint.c			\
+	gimpsamplepoint.h			\
+	gimpsamplepointundo.c			\
+	gimpsamplepointundo.h			\
+	gimpscanconvert.c			\
+	gimpscanconvert.h			\
+	gimpselection.c				\
+	gimpselection.h				\
+	gimpsettings.c				\
+	gimpsettings.h				\
+	gimpstrokeoptions.c			\
+	gimpstrokeoptions.h			\
+	gimpsubprogress.c			\
+	gimpsubprogress.h			\
+	gimpsymmetry.c				\
+	gimpsymmetry.h				\
+	gimpsymmetry-mandala.c			\
+	gimpsymmetry-mandala.h			\
+	gimpsymmetry-mirror.c			\
+	gimpsymmetry-mirror.h			\
+	gimpsymmetry-tiling.c			\
+	gimpsymmetry-tiling.h			\
+	gimptag.c				\
+	gimptag.h				\
+	gimptagcache.c				\
+	gimptagcache.h				\
+	gimptagged.c				\
+	gimptagged.h				\
+	gimptaggedcontainer.c			\
+	gimptaggedcontainer.h			\
+	gimptempbuf.c				\
+	gimptempbuf.h				\
+	gimptemplate.c				\
+	gimptemplate.h				\
+	gimptilehandlerprojectable.c		\
+	gimptilehandlerprojectable.h		\
+	gimptoolgroup.c				\
+	gimptoolgroup.h				\
+	gimptoolinfo.c				\
+	gimptoolinfo.h				\
+	gimptoolitem.c				\
+	gimptoolitem.h				\
+	gimptooloptions.c			\
+	gimptooloptions.h			\
+	gimptoolpreset.c			\
+	gimptoolpreset.h			\
+	gimptoolpreset-load.c			\
+	gimptoolpreset-load.h			\
+	gimptoolpreset-save.c			\
+	gimptoolpreset-save.h			\
+	gimptreehandler.c			\
+	gimptreehandler.h			\
+	gimptreeproxy.c				\
+	gimptreeproxy.h				\
+	gimptriviallycancelablewaitable.c	\
+	gimptriviallycancelablewaitable.h	\
+	gimpuncancelablewaitable.c		\
+	gimpuncancelablewaitable.h		\
+	gimpunit.c				\
+	gimpunit.h				\
+	gimpundo.c				\
+	gimpundo.h				\
+	gimpundostack.c				\
+	gimpundostack.h				\
+	gimpviewable.c				\
+	gimpviewable.h				\
+	gimpwaitable.c				\
+	gimpwaitable.h
+
+libappcore_a_built_sources = \
+	core-enums.c	\
+	gimpmarshal.c	\
+	gimpmarshal.h
+
+libappcore_a_extra_sources = \
+	gimpmarshal.list
+
+libappcore_a_SOURCES = $(libappcore_a_built_sources) $(libappcore_a_sources)
+
+BUILT_SOURCES = \
+	$(libappcore_a_built_sources)
+
+EXTRA_DIST = \
+	$(libappcore_a_extra_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-gmh xgen-gmc xgen-cec
+CLEANFILES = $(gen_sources)
+
+gimpmarshal.h: $(srcdir)/gimpmarshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --header >> xgen-gmh \
+	&& (cmp -s xgen-gmh $(@F) || cp xgen-gmh $(@F)) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+gimpmarshal.c: gimpmarshal.h
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --header --body >> xgen-gmc \
+	&& cp xgen-gmc $(@F) \
+	&& rm -f xgen-gmc xgen-gmc~
+
+xgen-cec: $(srcdir)/core-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/core-enums.c: xgen-cec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/core/Makefile.in b/app/core/Makefile.in
new file mode 100644
index 0000000..0d84372
--- /dev/null
+++ b/app/core/Makefile.in
@@ -0,0 +1,2438 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/core
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappcore_a_AR = $(AR) $(ARFLAGS)
+libappcore_a_LIBADD =
+am__objects_1 = core-enums.$(OBJEXT) gimpmarshal.$(OBJEXT)
+am__objects_2 = gimp.$(OBJEXT) gimp-atomic.$(OBJEXT) \
+	gimp-batch.$(OBJEXT) gimp-cairo.$(OBJEXT) \
+	gimp-contexts.$(OBJEXT) gimp-data-factories.$(OBJEXT) \
+	gimp-edit.$(OBJEXT) gimp-filter-history.$(OBJEXT) \
+	gimp-gradients.$(OBJEXT) gimp-gui.$(OBJEXT) \
+	gimp-internal-data.$(OBJEXT) gimp-memsize.$(OBJEXT) \
+	gimp-modules.$(OBJEXT) gimp-palettes.$(OBJEXT) \
+	gimp-parallel.$(OBJEXT) gimp-parasites.$(OBJEXT) \
+	gimp-spawn.$(OBJEXT) gimp-tags.$(OBJEXT) \
+	gimp-templates.$(OBJEXT) gimp-transform-resize.$(OBJEXT) \
+	gimp-transform-3d-utils.$(OBJEXT) \
+	gimp-transform-utils.$(OBJEXT) gimp-units.$(OBJEXT) \
+	gimp-user-install.$(OBJEXT) gimp-utils.$(OBJEXT) \
+	gimpasync.$(OBJEXT) gimpasyncset.$(OBJEXT) \
+	gimpauxitem.$(OBJEXT) gimpauxitemundo.$(OBJEXT) \
+	gimpbacktrace-linux.$(OBJEXT) gimpbacktrace-none.$(OBJEXT) \
+	gimpbacktrace-windows.$(OBJEXT) gimpbezierdesc.$(OBJEXT) \
+	gimpboundary.$(OBJEXT) gimpbrush.$(OBJEXT) \
+	gimpbrush-boundary.$(OBJEXT) gimpbrush-load.$(OBJEXT) \
+	gimpbrush-mipmap.$(OBJEXT) gimpbrush-save.$(OBJEXT) \
+	gimpbrush-transform.$(OBJEXT) gimpbrushcache.$(OBJEXT) \
+	gimpbrushclipboard.$(OBJEXT) gimpbrushgenerated.$(OBJEXT) \
+	gimpbrushgenerated-load.$(OBJEXT) \
+	gimpbrushgenerated-save.$(OBJEXT) gimpbrushpipe.$(OBJEXT) \
+	gimpbrushpipe-load.$(OBJEXT) gimpbrushpipe-save.$(OBJEXT) \
+	gimpbuffer.$(OBJEXT) gimpcancelable.$(OBJEXT) \
+	gimpchannel.$(OBJEXT) gimpchannel-combine.$(OBJEXT) \
+	gimpchannel-select.$(OBJEXT) gimpchannelpropundo.$(OBJEXT) \
+	gimpchannelundo.$(OBJEXT) gimpchunkiterator.$(OBJEXT) \
+	gimpcontainer.$(OBJEXT) gimpcontainer-filter.$(OBJEXT) \
+	gimpcontext.$(OBJEXT) gimpcoords.$(OBJEXT) \
+	gimpcoords-interpolate.$(OBJEXT) gimpcurve.$(OBJEXT) \
+	gimpcurve-load.$(OBJEXT) gimpcurve-map.$(OBJEXT) \
+	gimpcurve-save.$(OBJEXT) gimpdashpattern.$(OBJEXT) \
+	gimpdata.$(OBJEXT) gimpdatafactory.$(OBJEXT) \
+	gimpdataloaderfactory.$(OBJEXT) gimpdocumentlist.$(OBJEXT) \
+	gimpdrawable.$(OBJEXT) gimpdrawable-bucket-fill.$(OBJEXT) \
+	gimpdrawable-combine.$(OBJEXT) gimpdrawable-edit.$(OBJEXT) \
+	gimpdrawable-equalize.$(OBJEXT) gimpdrawable-fill.$(OBJEXT) \
+	gimpdrawable-filters.$(OBJEXT) \
+	gimpdrawable-floating-selection.$(OBJEXT) \
+	gimpdrawable-foreground-extract.$(OBJEXT) \
+	gimpdrawable-gradient.$(OBJEXT) \
+	gimpdrawable-histogram.$(OBJEXT) gimpdrawable-levels.$(OBJEXT) \
+	gimpdrawable-offset.$(OBJEXT) gimpdrawable-operation.$(OBJEXT) \
+	gimpdrawable-preview.$(OBJEXT) gimpdrawable-shadow.$(OBJEXT) \
+	gimpdrawable-stroke.$(OBJEXT) gimpdrawable-transform.$(OBJEXT) \
+	gimpdrawablefilter.$(OBJEXT) gimpdrawablemodundo.$(OBJEXT) \
+	gimpdrawablestack.$(OBJEXT) gimpdrawableundo.$(OBJEXT) \
+	gimpdynamics.$(OBJEXT) gimpdynamics-load.$(OBJEXT) \
+	gimpdynamics-save.$(OBJEXT) gimpdynamicsoutput.$(OBJEXT) \
+	gimperror.$(OBJEXT) gimpfilloptions.$(OBJEXT) \
+	gimpfilter.$(OBJEXT) gimpfilteredcontainer.$(OBJEXT) \
+	gimpfilterstack.$(OBJEXT) gimpfloatingselectionundo.$(OBJEXT) \
+	gimpgradient.$(OBJEXT) gimpgradient-load.$(OBJEXT) \
+	gimpgradient-save.$(OBJEXT) gimpgrid.$(OBJEXT) \
+	gimpgrouplayer.$(OBJEXT) gimpgrouplayerundo.$(OBJEXT) \
+	gimpguide.$(OBJEXT) gimpguideundo.$(OBJEXT) \
+	gimphistogram.$(OBJEXT) gimpidtable.$(OBJEXT) \
+	gimpimage.$(OBJEXT) gimpimage-arrange.$(OBJEXT) \
+	gimpimage-color-profile.$(OBJEXT) gimpimage-colormap.$(OBJEXT) \
+	gimpimage-convert-indexed.$(OBJEXT) \
+	gimpimage-convert-precision.$(OBJEXT) \
+	gimpimage-convert-type.$(OBJEXT) gimpimage-crop.$(OBJEXT) \
+	gimpimage-duplicate.$(OBJEXT) gimpimage-flip.$(OBJEXT) \
+	gimpimage-grid.$(OBJEXT) gimpimage-guides.$(OBJEXT) \
+	gimpimage-item-list.$(OBJEXT) gimpimage-merge.$(OBJEXT) \
+	gimpimage-metadata.$(OBJEXT) gimpimage-new.$(OBJEXT) \
+	gimpimage-pick-color.$(OBJEXT) gimpimage-pick-item.$(OBJEXT) \
+	gimpimage-preview.$(OBJEXT) gimpimage-quick-mask.$(OBJEXT) \
+	gimpimage-resize.$(OBJEXT) gimpimage-rotate.$(OBJEXT) \
+	gimpimage-sample-points.$(OBJEXT) gimpimage-scale.$(OBJEXT) \
+	gimpimage-snap.$(OBJEXT) gimpimage-symmetry.$(OBJEXT) \
+	gimpimage-transform.$(OBJEXT) gimpimage-undo.$(OBJEXT) \
+	gimpimage-undo-push.$(OBJEXT) gimpimageproxy.$(OBJEXT) \
+	gimpimageundo.$(OBJEXT) gimpimagefile.$(OBJEXT) \
+	gimpitem.$(OBJEXT) gimpitem-exclusive.$(OBJEXT) \
+	gimpitem-linked.$(OBJEXT) gimpitem-preview.$(OBJEXT) \
+	gimpitempropundo.$(OBJEXT) gimpitemstack.$(OBJEXT) \
+	gimpitemtree.$(OBJEXT) gimpitemundo.$(OBJEXT) \
+	gimplayer.$(OBJEXT) gimplayer-floating-selection.$(OBJEXT) \
+	gimplayer-new.$(OBJEXT) gimplayermask.$(OBJEXT) \
+	gimplayermaskpropundo.$(OBJEXT) gimplayermaskundo.$(OBJEXT) \
+	gimplayerpropundo.$(OBJEXT) gimplayerstack.$(OBJEXT) \
+	gimplayerundo.$(OBJEXT) gimplineart.$(OBJEXT) \
+	gimplist.$(OBJEXT) gimpmaskundo.$(OBJEXT) \
+	gimpmybrush.$(OBJEXT) gimpmybrush-load.$(OBJEXT) \
+	gimpobject.$(OBJEXT) gimpobjectqueue.$(OBJEXT) \
+	gimppaintinfo.$(OBJEXT) gimppattern.$(OBJEXT) \
+	gimppattern-load.$(OBJEXT) gimppattern-save.$(OBJEXT) \
+	gimppatternclipboard.$(OBJEXT) gimppalette.$(OBJEXT) \
+	gimppalette-import.$(OBJEXT) gimppalette-load.$(OBJEXT) \
+	gimppalette-save.$(OBJEXT) gimppalettemru.$(OBJEXT) \
+	gimpparamspecs.$(OBJEXT) gimpparamspecs-desc.$(OBJEXT) \
+	gimpparamspecs-duplicate.$(OBJEXT) gimpparasitelist.$(OBJEXT) \
+	gimppdbprogress.$(OBJEXT) gimppickable.$(OBJEXT) \
+	gimppickable-auto-shrink.$(OBJEXT) \
+	gimppickable-contiguous-region.$(OBJEXT) \
+	gimpprogress.$(OBJEXT) gimpprojectable.$(OBJEXT) \
+	gimpprojection.$(OBJEXT) gimpsamplepoint.$(OBJEXT) \
+	gimpsamplepointundo.$(OBJEXT) gimpscanconvert.$(OBJEXT) \
+	gimpselection.$(OBJEXT) gimpsettings.$(OBJEXT) \
+	gimpstrokeoptions.$(OBJEXT) gimpsubprogress.$(OBJEXT) \
+	gimpsymmetry.$(OBJEXT) gimpsymmetry-mandala.$(OBJEXT) \
+	gimpsymmetry-mirror.$(OBJEXT) gimpsymmetry-tiling.$(OBJEXT) \
+	gimptag.$(OBJEXT) gimptagcache.$(OBJEXT) gimptagged.$(OBJEXT) \
+	gimptaggedcontainer.$(OBJEXT) gimptempbuf.$(OBJEXT) \
+	gimptemplate.$(OBJEXT) gimptilehandlerprojectable.$(OBJEXT) \
+	gimptoolgroup.$(OBJEXT) gimptoolinfo.$(OBJEXT) \
+	gimptoolitem.$(OBJEXT) gimptooloptions.$(OBJEXT) \
+	gimptoolpreset.$(OBJEXT) gimptoolpreset-load.$(OBJEXT) \
+	gimptoolpreset-save.$(OBJEXT) gimptreehandler.$(OBJEXT) \
+	gimptreeproxy.$(OBJEXT) \
+	gimptriviallycancelablewaitable.$(OBJEXT) \
+	gimpuncancelablewaitable.$(OBJEXT) gimpunit.$(OBJEXT) \
+	gimpundo.$(OBJEXT) gimpundostack.$(OBJEXT) \
+	gimpviewable.$(OBJEXT) gimpwaitable.$(OBJEXT)
+am_libappcore_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappcore_a_OBJECTS = $(am_libappcore_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/core-enums.Po \
+	./$(DEPDIR)/gimp-atomic.Po ./$(DEPDIR)/gimp-batch.Po \
+	./$(DEPDIR)/gimp-cairo.Po ./$(DEPDIR)/gimp-contexts.Po \
+	./$(DEPDIR)/gimp-data-factories.Po ./$(DEPDIR)/gimp-edit.Po \
+	./$(DEPDIR)/gimp-filter-history.Po \
+	./$(DEPDIR)/gimp-gradients.Po ./$(DEPDIR)/gimp-gui.Po \
+	./$(DEPDIR)/gimp-internal-data.Po ./$(DEPDIR)/gimp-memsize.Po \
+	./$(DEPDIR)/gimp-modules.Po ./$(DEPDIR)/gimp-palettes.Po \
+	./$(DEPDIR)/gimp-parallel.Po ./$(DEPDIR)/gimp-parasites.Po \
+	./$(DEPDIR)/gimp-spawn.Po ./$(DEPDIR)/gimp-tags.Po \
+	./$(DEPDIR)/gimp-templates.Po \
+	./$(DEPDIR)/gimp-transform-3d-utils.Po \
+	./$(DEPDIR)/gimp-transform-resize.Po \
+	./$(DEPDIR)/gimp-transform-utils.Po ./$(DEPDIR)/gimp-units.Po \
+	./$(DEPDIR)/gimp-user-install.Po ./$(DEPDIR)/gimp-utils.Po \
+	./$(DEPDIR)/gimp.Po ./$(DEPDIR)/gimpasync.Po \
+	./$(DEPDIR)/gimpasyncset.Po ./$(DEPDIR)/gimpauxitem.Po \
+	./$(DEPDIR)/gimpauxitemundo.Po \
+	./$(DEPDIR)/gimpbacktrace-linux.Po \
+	./$(DEPDIR)/gimpbacktrace-none.Po \
+	./$(DEPDIR)/gimpbacktrace-windows.Po \
+	./$(DEPDIR)/gimpbezierdesc.Po ./$(DEPDIR)/gimpboundary.Po \
+	./$(DEPDIR)/gimpbrush-boundary.Po \
+	./$(DEPDIR)/gimpbrush-load.Po ./$(DEPDIR)/gimpbrush-mipmap.Po \
+	./$(DEPDIR)/gimpbrush-save.Po \
+	./$(DEPDIR)/gimpbrush-transform.Po ./$(DEPDIR)/gimpbrush.Po \
+	./$(DEPDIR)/gimpbrushcache.Po \
+	./$(DEPDIR)/gimpbrushclipboard.Po \
+	./$(DEPDIR)/gimpbrushgenerated-load.Po \
+	./$(DEPDIR)/gimpbrushgenerated-save.Po \
+	./$(DEPDIR)/gimpbrushgenerated.Po \
+	./$(DEPDIR)/gimpbrushpipe-load.Po \
+	./$(DEPDIR)/gimpbrushpipe-save.Po ./$(DEPDIR)/gimpbrushpipe.Po \
+	./$(DEPDIR)/gimpbuffer.Po ./$(DEPDIR)/gimpcancelable.Po \
+	./$(DEPDIR)/gimpchannel-combine.Po \
+	./$(DEPDIR)/gimpchannel-select.Po ./$(DEPDIR)/gimpchannel.Po \
+	./$(DEPDIR)/gimpchannelpropundo.Po \
+	./$(DEPDIR)/gimpchannelundo.Po \
+	./$(DEPDIR)/gimpchunkiterator.Po \
+	./$(DEPDIR)/gimpcontainer-filter.Po \
+	./$(DEPDIR)/gimpcontainer.Po ./$(DEPDIR)/gimpcontext.Po \
+	./$(DEPDIR)/gimpcoords-interpolate.Po \
+	./$(DEPDIR)/gimpcoords.Po ./$(DEPDIR)/gimpcurve-load.Po \
+	./$(DEPDIR)/gimpcurve-map.Po ./$(DEPDIR)/gimpcurve-save.Po \
+	./$(DEPDIR)/gimpcurve.Po ./$(DEPDIR)/gimpdashpattern.Po \
+	./$(DEPDIR)/gimpdata.Po ./$(DEPDIR)/gimpdatafactory.Po \
+	./$(DEPDIR)/gimpdataloaderfactory.Po \
+	./$(DEPDIR)/gimpdocumentlist.Po \
+	./$(DEPDIR)/gimpdrawable-bucket-fill.Po \
+	./$(DEPDIR)/gimpdrawable-combine.Po \
+	./$(DEPDIR)/gimpdrawable-edit.Po \
+	./$(DEPDIR)/gimpdrawable-equalize.Po \
+	./$(DEPDIR)/gimpdrawable-fill.Po \
+	./$(DEPDIR)/gimpdrawable-filters.Po \
+	./$(DEPDIR)/gimpdrawable-floating-selection.Po \
+	./$(DEPDIR)/gimpdrawable-foreground-extract.Po \
+	./$(DEPDIR)/gimpdrawable-gradient.Po \
+	./$(DEPDIR)/gimpdrawable-histogram.Po \
+	./$(DEPDIR)/gimpdrawable-levels.Po \
+	./$(DEPDIR)/gimpdrawable-offset.Po \
+	./$(DEPDIR)/gimpdrawable-operation.Po \
+	./$(DEPDIR)/gimpdrawable-preview.Po \
+	./$(DEPDIR)/gimpdrawable-shadow.Po \
+	./$(DEPDIR)/gimpdrawable-stroke.Po \
+	./$(DEPDIR)/gimpdrawable-transform.Po \
+	./$(DEPDIR)/gimpdrawable.Po ./$(DEPDIR)/gimpdrawablefilter.Po \
+	./$(DEPDIR)/gimpdrawablemodundo.Po \
+	./$(DEPDIR)/gimpdrawablestack.Po \
+	./$(DEPDIR)/gimpdrawableundo.Po \
+	./$(DEPDIR)/gimpdynamics-load.Po \
+	./$(DEPDIR)/gimpdynamics-save.Po ./$(DEPDIR)/gimpdynamics.Po \
+	./$(DEPDIR)/gimpdynamicsoutput.Po ./$(DEPDIR)/gimperror.Po \
+	./$(DEPDIR)/gimpfilloptions.Po ./$(DEPDIR)/gimpfilter.Po \
+	./$(DEPDIR)/gimpfilteredcontainer.Po \
+	./$(DEPDIR)/gimpfilterstack.Po \
+	./$(DEPDIR)/gimpfloatingselectionundo.Po \
+	./$(DEPDIR)/gimpgradient-load.Po \
+	./$(DEPDIR)/gimpgradient-save.Po ./$(DEPDIR)/gimpgradient.Po \
+	./$(DEPDIR)/gimpgrid.Po ./$(DEPDIR)/gimpgrouplayer.Po \
+	./$(DEPDIR)/gimpgrouplayerundo.Po ./$(DEPDIR)/gimpguide.Po \
+	./$(DEPDIR)/gimpguideundo.Po ./$(DEPDIR)/gimphistogram.Po \
+	./$(DEPDIR)/gimpidtable.Po ./$(DEPDIR)/gimpimage-arrange.Po \
+	./$(DEPDIR)/gimpimage-color-profile.Po \
+	./$(DEPDIR)/gimpimage-colormap.Po \
+	./$(DEPDIR)/gimpimage-convert-indexed.Po \
+	./$(DEPDIR)/gimpimage-convert-precision.Po \
+	./$(DEPDIR)/gimpimage-convert-type.Po \
+	./$(DEPDIR)/gimpimage-crop.Po \
+	./$(DEPDIR)/gimpimage-duplicate.Po \
+	./$(DEPDIR)/gimpimage-flip.Po ./$(DEPDIR)/gimpimage-grid.Po \
+	./$(DEPDIR)/gimpimage-guides.Po \
+	./$(DEPDIR)/gimpimage-item-list.Po \
+	./$(DEPDIR)/gimpimage-merge.Po \
+	./$(DEPDIR)/gimpimage-metadata.Po ./$(DEPDIR)/gimpimage-new.Po \
+	./$(DEPDIR)/gimpimage-pick-color.Po \
+	./$(DEPDIR)/gimpimage-pick-item.Po \
+	./$(DEPDIR)/gimpimage-preview.Po \
+	./$(DEPDIR)/gimpimage-quick-mask.Po \
+	./$(DEPDIR)/gimpimage-resize.Po \
+	./$(DEPDIR)/gimpimage-rotate.Po \
+	./$(DEPDIR)/gimpimage-sample-points.Po \
+	./$(DEPDIR)/gimpimage-scale.Po ./$(DEPDIR)/gimpimage-snap.Po \
+	./$(DEPDIR)/gimpimage-symmetry.Po \
+	./$(DEPDIR)/gimpimage-transform.Po \
+	./$(DEPDIR)/gimpimage-undo-push.Po \
+	./$(DEPDIR)/gimpimage-undo.Po ./$(DEPDIR)/gimpimage.Po \
+	./$(DEPDIR)/gimpimagefile.Po ./$(DEPDIR)/gimpimageproxy.Po \
+	./$(DEPDIR)/gimpimageundo.Po ./$(DEPDIR)/gimpitem-exclusive.Po \
+	./$(DEPDIR)/gimpitem-linked.Po ./$(DEPDIR)/gimpitem-preview.Po \
+	./$(DEPDIR)/gimpitem.Po ./$(DEPDIR)/gimpitempropundo.Po \
+	./$(DEPDIR)/gimpitemstack.Po ./$(DEPDIR)/gimpitemtree.Po \
+	./$(DEPDIR)/gimpitemundo.Po \
+	./$(DEPDIR)/gimplayer-floating-selection.Po \
+	./$(DEPDIR)/gimplayer-new.Po ./$(DEPDIR)/gimplayer.Po \
+	./$(DEPDIR)/gimplayermask.Po \
+	./$(DEPDIR)/gimplayermaskpropundo.Po \
+	./$(DEPDIR)/gimplayermaskundo.Po \
+	./$(DEPDIR)/gimplayerpropundo.Po ./$(DEPDIR)/gimplayerstack.Po \
+	./$(DEPDIR)/gimplayerundo.Po ./$(DEPDIR)/gimplineart.Po \
+	./$(DEPDIR)/gimplist.Po ./$(DEPDIR)/gimpmarshal.Po \
+	./$(DEPDIR)/gimpmaskundo.Po ./$(DEPDIR)/gimpmybrush-load.Po \
+	./$(DEPDIR)/gimpmybrush.Po ./$(DEPDIR)/gimpobject.Po \
+	./$(DEPDIR)/gimpobjectqueue.Po ./$(DEPDIR)/gimppaintinfo.Po \
+	./$(DEPDIR)/gimppalette-import.Po \
+	./$(DEPDIR)/gimppalette-load.Po \
+	./$(DEPDIR)/gimppalette-save.Po ./$(DEPDIR)/gimppalette.Po \
+	./$(DEPDIR)/gimppalettemru.Po \
+	./$(DEPDIR)/gimpparamspecs-desc.Po \
+	./$(DEPDIR)/gimpparamspecs-duplicate.Po \
+	./$(DEPDIR)/gimpparamspecs.Po ./$(DEPDIR)/gimpparasitelist.Po \
+	./$(DEPDIR)/gimppattern-load.Po \
+	./$(DEPDIR)/gimppattern-save.Po ./$(DEPDIR)/gimppattern.Po \
+	./$(DEPDIR)/gimppatternclipboard.Po \
+	./$(DEPDIR)/gimppdbprogress.Po \
+	./$(DEPDIR)/gimppickable-auto-shrink.Po \
+	./$(DEPDIR)/gimppickable-contiguous-region.Po \
+	./$(DEPDIR)/gimppickable.Po ./$(DEPDIR)/gimpprogress.Po \
+	./$(DEPDIR)/gimpprojectable.Po ./$(DEPDIR)/gimpprojection.Po \
+	./$(DEPDIR)/gimpsamplepoint.Po \
+	./$(DEPDIR)/gimpsamplepointundo.Po \
+	./$(DEPDIR)/gimpscanconvert.Po ./$(DEPDIR)/gimpselection.Po \
+	./$(DEPDIR)/gimpsettings.Po ./$(DEPDIR)/gimpstrokeoptions.Po \
+	./$(DEPDIR)/gimpsubprogress.Po \
+	./$(DEPDIR)/gimpsymmetry-mandala.Po \
+	./$(DEPDIR)/gimpsymmetry-mirror.Po \
+	./$(DEPDIR)/gimpsymmetry-tiling.Po ./$(DEPDIR)/gimpsymmetry.Po \
+	./$(DEPDIR)/gimptag.Po ./$(DEPDIR)/gimptagcache.Po \
+	./$(DEPDIR)/gimptagged.Po ./$(DEPDIR)/gimptaggedcontainer.Po \
+	./$(DEPDIR)/gimptempbuf.Po ./$(DEPDIR)/gimptemplate.Po \
+	./$(DEPDIR)/gimptilehandlerprojectable.Po \
+	./$(DEPDIR)/gimptoolgroup.Po ./$(DEPDIR)/gimptoolinfo.Po \
+	./$(DEPDIR)/gimptoolitem.Po ./$(DEPDIR)/gimptooloptions.Po \
+	./$(DEPDIR)/gimptoolpreset-load.Po \
+	./$(DEPDIR)/gimptoolpreset-save.Po \
+	./$(DEPDIR)/gimptoolpreset.Po ./$(DEPDIR)/gimptreehandler.Po \
+	./$(DEPDIR)/gimptreeproxy.Po \
+	./$(DEPDIR)/gimptriviallycancelablewaitable.Po \
+	./$(DEPDIR)/gimpuncancelablewaitable.Po \
+	./$(DEPDIR)/gimpundo.Po ./$(DEPDIR)/gimpundostack.Po \
+	./$(DEPDIR)/gimpunit.Po ./$(DEPDIR)/gimpviewable.Po \
+	./$(DEPDIR)/gimpwaitable.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libappcore_a_SOURCES)
+DIST_SOURCES = $(libappcore_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
+@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
+@PLATFORM_OSX_TRUE@xnone = "-xnone"
+AM_CPPFLAGS = \
+	-DGIMPDIR=\""$(gimpdir)"\"			\
+	-DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\"	\
+	-DGIMP_USER_VERSION=\"$(GIMP_USER_VERSION)\"	\
+	-DG_LOG_DOMAIN=\"Gimp-Core\"			\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)/app				\
+	-I$(top_srcdir)/app				\
+	$(CAIRO_CFLAGS)					\
+	$(GEGL_CFLAGS)					\
+	$(GDK_PIXBUF_CFLAGS)				\
+	$(LIBMYPAINT_CFLAGS)				\
+	$(MYPAINT_BRUSHES_CFLAGS)			\
+	$(GEXIV2_CFLAGS)				\
+	$(LIBUNWIND_CFLAGS)				\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappcore.a
+libappcore_a_sources = \
+	core-enums.h				\
+	core-types.h				\
+	gimp.c					\
+	gimp.h					\
+	gimp-atomic.c				\
+	gimp-atomic.h				\
+	gimp-batch.c				\
+	gimp-batch.h				\
+	gimp-cairo.c				\
+	gimp-cairo.h				\
+	gimp-contexts.c				\
+	gimp-contexts.h				\
+	gimp-data-factories.c			\
+	gimp-data-factories.h			\
+	gimp-edit.c				\
+	gimp-edit.h				\
+	gimp-filter-history.c			\
+	gimp-filter-history.h			\
+	gimp-gradients.c			\
+	gimp-gradients.h			\
+	gimp-gui.c				\
+	gimp-gui.h				\
+	gimp-internal-data.c			\
+	gimp-internal-data.h			\
+	gimp-memsize.c				\
+	gimp-memsize.h				\
+	gimp-modules.c				\
+	gimp-modules.h				\
+	gimp-palettes.c				\
+	gimp-palettes.h				\
+	gimp-parallel.cc			\
+	gimp-parallel.h				\
+	gimp-parasites.c			\
+	gimp-parasites.h			\
+	gimp-spawn.c				\
+	gimp-spawn.h				\
+	gimp-tags.c				\
+	gimp-tags.h				\
+	gimp-templates.c			\
+	gimp-templates.h			\
+	gimp-transform-resize.c			\
+	gimp-transform-resize.h			\
+	gimp-transform-3d-utils.c		\
+	gimp-transform-3d-utils.h		\
+	gimp-transform-utils.c			\
+	gimp-transform-utils.h			\
+	gimp-units.c				\
+	gimp-units.h				\
+	gimp-user-install.c			\
+	gimp-user-install.h			\
+	gimp-utils.c				\
+	gimp-utils.h				\
+	gimpasync.c				\
+	gimpasync.h				\
+	gimpasyncset.c				\
+	gimpasyncset.h				\
+	gimpauxitem.c				\
+	gimpauxitem.h				\
+	gimpauxitemundo.c			\
+	gimpauxitemundo.h			\
+	gimpbacktrace.h				\
+	gimpbacktrace-backend.h			\
+	gimpbacktrace-linux.c			\
+	gimpbacktrace-none.c			\
+	gimpbacktrace-windows.c			\
+	gimpbezierdesc.h			\
+	gimpbezierdesc.c			\
+	gimpboundary.c				\
+	gimpboundary.h				\
+	gimpbrush.c				\
+	gimpbrush.h				\
+	gimpbrush-boundary.c			\
+	gimpbrush-boundary.h			\
+	gimpbrush-header.h			\
+	gimpbrush-load.c			\
+	gimpbrush-load.h			\
+	gimpbrush-mipmap.cc			\
+	gimpbrush-mipmap.h			\
+	gimpbrush-private.h			\
+	gimpbrush-save.c			\
+	gimpbrush-save.h			\
+	gimpbrush-transform.cc			\
+	gimpbrush-transform.h			\
+	gimpbrushcache.c			\
+	gimpbrushcache.h			\
+	gimpbrushclipboard.c			\
+	gimpbrushclipboard.h			\
+	gimpbrushgenerated.c			\
+	gimpbrushgenerated.h			\
+	gimpbrushgenerated-load.c		\
+	gimpbrushgenerated-load.h		\
+	gimpbrushgenerated-save.c		\
+	gimpbrushgenerated-save.h		\
+	gimpbrushpipe.c				\
+	gimpbrushpipe.h				\
+	gimpbrushpipe-load.c			\
+	gimpbrushpipe-load.h			\
+	gimpbrushpipe-save.c			\
+	gimpbrushpipe-save.h			\
+	gimpbuffer.c				\
+	gimpbuffer.h				\
+	gimpcancelable.c			\
+	gimpcancelable.h			\
+	gimpchannel.c				\
+	gimpchannel.h				\
+	gimpchannel-combine.c			\
+	gimpchannel-combine.h			\
+	gimpchannel-select.c			\
+	gimpchannel-select.h			\
+	gimpchannelpropundo.c			\
+	gimpchannelpropundo.h			\
+	gimpchannelundo.c			\
+	gimpchannelundo.h			\
+	gimpchunkiterator.c			\
+	gimpchunkiterator.h			\
+	gimpcontainer.c				\
+	gimpcontainer.h				\
+	gimpcontainer-filter.c			\
+	gimpcontainer-filter.h			\
+	gimpcontext.c				\
+	gimpcontext.h				\
+	gimpcoords.c				\
+	gimpcoords.h				\
+	gimpcoords-interpolate.c		\
+	gimpcoords-interpolate.h		\
+	gimpcurve.c				\
+	gimpcurve.h				\
+	gimpcurve-load.c			\
+	gimpcurve-load.h			\
+	gimpcurve-map.c				\
+	gimpcurve-map.h				\
+	gimpcurve-save.c			\
+	gimpcurve-save.h			\
+	gimpdashpattern.c			\
+	gimpdashpattern.h			\
+	gimpdata.c				\
+	gimpdata.h				\
+	gimpdatafactory.c			\
+	gimpdatafactory.h			\
+	gimpdataloaderfactory.c			\
+	gimpdataloaderfactory.h			\
+	gimpdocumentlist.c			\
+	gimpdocumentlist.h			\
+	gimpdrawable.c				\
+	gimpdrawable.h				\
+	gimpdrawable-bucket-fill.c		\
+	gimpdrawable-bucket-fill.h		\
+	gimpdrawable-combine.c			\
+	gimpdrawable-combine.h			\
+	gimpdrawable-edit.c			\
+	gimpdrawable-edit.h			\
+	gimpdrawable-equalize.c			\
+	gimpdrawable-equalize.h			\
+	gimpdrawable-fill.c			\
+	gimpdrawable-fill.h			\
+	gimpdrawable-filters.c			\
+	gimpdrawable-filters.h			\
+	gimpdrawable-floating-selection.c	\
+	gimpdrawable-floating-selection.h	\
+	gimpdrawable-foreground-extract.c	\
+	gimpdrawable-foreground-extract.h	\
+	gimpdrawable-gradient.c			\
+	gimpdrawable-gradient.h			\
+	gimpdrawable-histogram.c		\
+	gimpdrawable-histogram.h		\
+	gimpdrawable-levels.c			\
+	gimpdrawable-levels.h			\
+	gimpdrawable-offset.c			\
+	gimpdrawable-offset.h			\
+	gimpdrawable-operation.c		\
+	gimpdrawable-operation.h		\
+	gimpdrawable-preview.c			\
+	gimpdrawable-preview.h			\
+	gimpdrawable-private.h			\
+	gimpdrawable-shadow.c			\
+	gimpdrawable-shadow.h			\
+	gimpdrawable-stroke.c			\
+	gimpdrawable-stroke.h			\
+	gimpdrawable-transform.c		\
+	gimpdrawable-transform.h		\
+	gimpdrawablefilter.c			\
+	gimpdrawablefilter.h			\
+	gimpdrawablemodundo.c			\
+	gimpdrawablemodundo.h			\
+	gimpdrawablestack.c			\
+	gimpdrawablestack.h			\
+	gimpdrawableundo.c			\
+	gimpdrawableundo.h			\
+	gimpdynamics.c				\
+	gimpdynamics.h				\
+	gimpdynamics-load.c			\
+	gimpdynamics-load.h			\
+	gimpdynamics-save.c			\
+	gimpdynamics-save.h			\
+	gimpdynamicsoutput.c			\
+	gimpdynamicsoutput.h			\
+	gimperror.c				\
+	gimperror.h				\
+	gimpfilloptions.c			\
+	gimpfilloptions.h			\
+	gimpfilter.c				\
+	gimpfilter.h				\
+	gimpfilteredcontainer.c			\
+	gimpfilteredcontainer.h			\
+	gimpfilterstack.c			\
+	gimpfilterstack.h			\
+	gimpfloatingselectionundo.c		\
+	gimpfloatingselectionundo.h		\
+	gimpgradient.c				\
+	gimpgradient.h				\
+	gimpgradient-load.c			\
+	gimpgradient-load.h			\
+	gimpgradient-save.c			\
+	gimpgradient-save.h			\
+	gimpgrid.c				\
+	gimpgrid.h				\
+	gimpgrouplayer.c			\
+	gimpgrouplayer.h			\
+	gimpgrouplayerundo.c			\
+	gimpgrouplayerundo.h			\
+	gimpguide.c				\
+	gimpguide.h				\
+	gimpguideundo.c				\
+	gimpguideundo.h				\
+	gimphistogram.c				\
+	gimphistogram.h				\
+	gimpidtable.c				\
+	gimpidtable.h				\
+	gimpimage.c				\
+	gimpimage.h				\
+	gimpimage-arrange.c			\
+	gimpimage-arrange.h			\
+	gimpimage-color-profile.c		\
+	gimpimage-color-profile.h		\
+	gimpimage-colormap.c			\
+	gimpimage-colormap.h			\
+	gimpimage-convert-indexed.c		\
+	gimpimage-convert-indexed.h		\
+	gimpimage-convert-fsdither.h		\
+	gimpimage-convert-data.h		\
+	gimpimage-convert-precision.c		\
+	gimpimage-convert-precision.h		\
+	gimpimage-convert-type.c		\
+	gimpimage-convert-type.h		\
+	gimpimage-crop.c			\
+	gimpimage-crop.h			\
+	gimpimage-duplicate.c			\
+	gimpimage-duplicate.h			\
+	gimpimage-flip.c			\
+	gimpimage-flip.h			\
+	gimpimage-grid.h                	\
+	gimpimage-grid.c                	\
+	gimpimage-guides.c			\
+	gimpimage-guides.h			\
+	gimpimage-item-list.c			\
+	gimpimage-item-list.h			\
+	gimpimage-merge.c			\
+	gimpimage-merge.h			\
+	gimpimage-metadata.c			\
+	gimpimage-metadata.h			\
+	gimpimage-new.c				\
+	gimpimage-new.h				\
+	gimpimage-pick-color.c			\
+	gimpimage-pick-color.h			\
+	gimpimage-pick-item.c			\
+	gimpimage-pick-item.h			\
+	gimpimage-preview.c			\
+	gimpimage-preview.h			\
+	gimpimage-private.h			\
+	gimpimage-quick-mask.c			\
+	gimpimage-quick-mask.h			\
+	gimpimage-resize.c			\
+	gimpimage-resize.h			\
+	gimpimage-rotate.c			\
+	gimpimage-rotate.h			\
+	gimpimage-sample-points.c		\
+	gimpimage-sample-points.h		\
+	gimpimage-scale.c			\
+	gimpimage-scale.h			\
+	gimpimage-snap.c			\
+	gimpimage-snap.h			\
+	gimpimage-symmetry.c			\
+	gimpimage-symmetry.h			\
+	gimpimage-transform.c			\
+	gimpimage-transform.h			\
+	gimpimage-undo.c			\
+	gimpimage-undo.h			\
+	gimpimage-undo-push.c			\
+	gimpimage-undo-push.h			\
+	gimpimageproxy.c			\
+	gimpimageproxy.h			\
+	gimpimageundo.c				\
+	gimpimageundo.h				\
+	gimpimagefile.c				\
+	gimpimagefile.h				\
+	gimpitem.c				\
+	gimpitem.h				\
+	gimpitem-exclusive.c			\
+	gimpitem-exclusive.h			\
+	gimpitem-linked.c			\
+	gimpitem-linked.h			\
+	gimpitem-preview.c			\
+	gimpitem-preview.h			\
+	gimpitempropundo.c			\
+	gimpitempropundo.h			\
+	gimpitemstack.c				\
+	gimpitemstack.h				\
+	gimpitemtree.c				\
+	gimpitemtree.h				\
+	gimpitemundo.c				\
+	gimpitemundo.h				\
+	gimplayer.c				\
+	gimplayer.h				\
+	gimplayer-floating-selection.c		\
+	gimplayer-floating-selection.h		\
+	gimplayer-new.c				\
+	gimplayer-new.h				\
+	gimplayermask.c				\
+	gimplayermask.h				\
+	gimplayermaskpropundo.c			\
+	gimplayermaskpropundo.h			\
+	gimplayermaskundo.c			\
+	gimplayermaskundo.h			\
+	gimplayerpropundo.c			\
+	gimplayerpropundo.h			\
+	gimplayerstack.c			\
+	gimplayerstack.h			\
+	gimplayerundo.c				\
+	gimplayerundo.h				\
+	gimplineart.c				\
+	gimplineart.h				\
+	gimplist.c				\
+	gimplist.h				\
+	gimpmaskundo.c				\
+	gimpmaskundo.h				\
+	gimpmybrush.c				\
+	gimpmybrush.h				\
+	gimpmybrush-load.c			\
+	gimpmybrush-load.h			\
+	gimpmybrush-private.h			\
+	gimpobject.c				\
+	gimpobject.h				\
+	gimpobjectqueue.c			\
+	gimpobjectqueue.h			\
+	gimppaintinfo.c				\
+	gimppaintinfo.h				\
+	gimppattern.c				\
+	gimppattern.h				\
+	gimppattern-header.h			\
+	gimppattern-load.c			\
+	gimppattern-load.h			\
+	gimppattern-save.c			\
+	gimppattern-save.h			\
+	gimppatternclipboard.c			\
+	gimppatternclipboard.h			\
+	gimppalette.c				\
+	gimppalette.h				\
+	gimppalette-import.c			\
+	gimppalette-import.h			\
+	gimppalette-load.c			\
+	gimppalette-load.h			\
+	gimppalette-save.c			\
+	gimppalette-save.h			\
+	gimppalettemru.c			\
+	gimppalettemru.h			\
+	gimpparamspecs.c			\
+	gimpparamspecs.h			\
+	gimpparamspecs-desc.c			\
+	gimpparamspecs-desc.h			\
+	gimpparamspecs-duplicate.c		\
+	gimpparamspecs-duplicate.h		\
+	gimpparasitelist.c			\
+	gimpparasitelist.h			\
+	gimppdbprogress.c			\
+	gimppdbprogress.h			\
+	gimppickable.c				\
+	gimppickable.h				\
+	gimppickable-auto-shrink.c		\
+	gimppickable-auto-shrink.h		\
+	gimppickable-contiguous-region.cc	\
+	gimppickable-contiguous-region.h	\
+	gimpprogress.c				\
+	gimpprogress.h				\
+	gimpprojectable.c			\
+	gimpprojectable.h			\
+	gimpprojection.c			\
+	gimpprojection.h			\
+	gimpsamplepoint.c			\
+	gimpsamplepoint.h			\
+	gimpsamplepointundo.c			\
+	gimpsamplepointundo.h			\
+	gimpscanconvert.c			\
+	gimpscanconvert.h			\
+	gimpselection.c				\
+	gimpselection.h				\
+	gimpsettings.c				\
+	gimpsettings.h				\
+	gimpstrokeoptions.c			\
+	gimpstrokeoptions.h			\
+	gimpsubprogress.c			\
+	gimpsubprogress.h			\
+	gimpsymmetry.c				\
+	gimpsymmetry.h				\
+	gimpsymmetry-mandala.c			\
+	gimpsymmetry-mandala.h			\
+	gimpsymmetry-mirror.c			\
+	gimpsymmetry-mirror.h			\
+	gimpsymmetry-tiling.c			\
+	gimpsymmetry-tiling.h			\
+	gimptag.c				\
+	gimptag.h				\
+	gimptagcache.c				\
+	gimptagcache.h				\
+	gimptagged.c				\
+	gimptagged.h				\
+	gimptaggedcontainer.c			\
+	gimptaggedcontainer.h			\
+	gimptempbuf.c				\
+	gimptempbuf.h				\
+	gimptemplate.c				\
+	gimptemplate.h				\
+	gimptilehandlerprojectable.c		\
+	gimptilehandlerprojectable.h		\
+	gimptoolgroup.c				\
+	gimptoolgroup.h				\
+	gimptoolinfo.c				\
+	gimptoolinfo.h				\
+	gimptoolitem.c				\
+	gimptoolitem.h				\
+	gimptooloptions.c			\
+	gimptooloptions.h			\
+	gimptoolpreset.c			\
+	gimptoolpreset.h			\
+	gimptoolpreset-load.c			\
+	gimptoolpreset-load.h			\
+	gimptoolpreset-save.c			\
+	gimptoolpreset-save.h			\
+	gimptreehandler.c			\
+	gimptreehandler.h			\
+	gimptreeproxy.c				\
+	gimptreeproxy.h				\
+	gimptriviallycancelablewaitable.c	\
+	gimptriviallycancelablewaitable.h	\
+	gimpuncancelablewaitable.c		\
+	gimpuncancelablewaitable.h		\
+	gimpunit.c				\
+	gimpunit.h				\
+	gimpundo.c				\
+	gimpundo.h				\
+	gimpundostack.c				\
+	gimpundostack.h				\
+	gimpviewable.c				\
+	gimpviewable.h				\
+	gimpwaitable.c				\
+	gimpwaitable.h
+
+libappcore_a_built_sources = \
+	core-enums.c	\
+	gimpmarshal.c	\
+	gimpmarshal.h
+
+libappcore_a_extra_sources = \
+	gimpmarshal.list
+
+libappcore_a_SOURCES = $(libappcore_a_built_sources) $(libappcore_a_sources)
+BUILT_SOURCES = \
+	$(libappcore_a_built_sources)
+
+EXTRA_DIST = \
+	$(libappcore_a_extra_sources)
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-gmh xgen-gmc xgen-cec
+CLEANFILES = $(gen_sources)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/core/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/core/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappcore.a: $(libappcore_a_OBJECTS) $(libappcore_a_DEPENDENCIES) $(EXTRA_libappcore_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappcore.a
+	$(AM_V_AR)$(libappcore_a_AR) libappcore.a $(libappcore_a_OBJECTS) $(libappcore_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappcore.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core-enums.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-atomic.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-batch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-cairo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-contexts.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-data-factories.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-edit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-filter-history.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gradients.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-internal-data.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-memsize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-modules.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-palettes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-parallel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-parasites.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-spawn.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-tags.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-templates.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-transform-3d-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-transform-resize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-transform-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-units.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-user-install.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpasync.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpasyncset.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpauxitem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpauxitemundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbacktrace-linux.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbacktrace-none.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbacktrace-windows.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbezierdesc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpboundary.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrush-boundary.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrush-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrush-mipmap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrush-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrush-transform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrush.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushcache.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushclipboard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushgenerated-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushgenerated-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushgenerated.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushpipe-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushpipe-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushpipe.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcancelable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchannel-combine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchannel-select.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchannel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchannelpropundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchannelundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchunkiterator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainer-filter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontext.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcoords-interpolate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcoords.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurve-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurve-map.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurve-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurve.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdashpattern.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdata.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdatafactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdataloaderfactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdocumentlist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-bucket-fill.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-combine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-edit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-equalize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-fill.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-filters.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-floating-selection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-foreground-extract.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-gradient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-histogram.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-levels.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-offset.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-operation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-preview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-shadow.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-stroke.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable-transform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawablefilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawablemodundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawablestack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawableundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamics-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamics-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamics.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamicsoutput.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimperror.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfilloptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfilteredcontainer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfilterstack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfloatingselectionundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradient-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradient-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgrouplayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgrouplayerundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpguide.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpguideundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphistogram.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpidtable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-arrange.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-color-profile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-colormap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-convert-indexed.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-convert-precision.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-convert-type.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-crop.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-duplicate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-flip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-grid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-guides.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-item-list.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-merge.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-metadata.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-new.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-pick-color.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-pick-item.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-preview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-quick-mask.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-resize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-rotate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-sample-points.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-scale.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-snap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-symmetry.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-transform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-undo-push.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage-undo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimagefile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimageproxy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimageundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitem-exclusive.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitem-linked.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitem-preview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitempropundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitemstack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitemtree.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitemundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayer-floating-selection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayer-new.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayermask.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayermaskpropundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayermaskundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayerpropundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayerstack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayerundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplineart.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmarshal.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmaskundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrush-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrush.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpobject.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpobjectqueue.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppalette-import.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppalette-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppalette-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppalette.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppalettemru.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpparamspecs-desc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpparamspecs-duplicate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpparamspecs.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpparasitelist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppattern-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppattern-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppattern.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppatternclipboard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdbprogress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppickable-auto-shrink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppickable-contiguous-region.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppickable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprogress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprojectable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprojection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsamplepoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsamplepointundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpscanconvert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpselection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsettings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpstrokeoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsubprogress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsymmetry-mandala.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsymmetry-mirror.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsymmetry-tiling.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsymmetry.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptagcache.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptagged.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptaggedcontainer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptempbuf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptemplate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptilehandlerprojectable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolgroup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolitem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooloptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpreset-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpreset-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpreset.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptreehandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptreeproxy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptriviallycancelablewaitable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpuncancelablewaitable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpundostack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpunit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwaitable.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/core-enums.Po
+	-rm -f ./$(DEPDIR)/gimp-atomic.Po
+	-rm -f ./$(DEPDIR)/gimp-batch.Po
+	-rm -f ./$(DEPDIR)/gimp-cairo.Po
+	-rm -f ./$(DEPDIR)/gimp-contexts.Po
+	-rm -f ./$(DEPDIR)/gimp-data-factories.Po
+	-rm -f ./$(DEPDIR)/gimp-edit.Po
+	-rm -f ./$(DEPDIR)/gimp-filter-history.Po
+	-rm -f ./$(DEPDIR)/gimp-gradients.Po
+	-rm -f ./$(DEPDIR)/gimp-gui.Po
+	-rm -f ./$(DEPDIR)/gimp-internal-data.Po
+	-rm -f ./$(DEPDIR)/gimp-memsize.Po
+	-rm -f ./$(DEPDIR)/gimp-modules.Po
+	-rm -f ./$(DEPDIR)/gimp-palettes.Po
+	-rm -f ./$(DEPDIR)/gimp-parallel.Po
+	-rm -f ./$(DEPDIR)/gimp-parasites.Po
+	-rm -f ./$(DEPDIR)/gimp-spawn.Po
+	-rm -f ./$(DEPDIR)/gimp-tags.Po
+	-rm -f ./$(DEPDIR)/gimp-templates.Po
+	-rm -f ./$(DEPDIR)/gimp-transform-3d-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-transform-resize.Po
+	-rm -f ./$(DEPDIR)/gimp-transform-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-units.Po
+	-rm -f ./$(DEPDIR)/gimp-user-install.Po
+	-rm -f ./$(DEPDIR)/gimp-utils.Po
+	-rm -f ./$(DEPDIR)/gimp.Po
+	-rm -f ./$(DEPDIR)/gimpasync.Po
+	-rm -f ./$(DEPDIR)/gimpasyncset.Po
+	-rm -f ./$(DEPDIR)/gimpauxitem.Po
+	-rm -f ./$(DEPDIR)/gimpauxitemundo.Po
+	-rm -f ./$(DEPDIR)/gimpbacktrace-linux.Po
+	-rm -f ./$(DEPDIR)/gimpbacktrace-none.Po
+	-rm -f ./$(DEPDIR)/gimpbacktrace-windows.Po
+	-rm -f ./$(DEPDIR)/gimpbezierdesc.Po
+	-rm -f ./$(DEPDIR)/gimpboundary.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-boundary.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-load.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-mipmap.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-save.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-transform.Po
+	-rm -f ./$(DEPDIR)/gimpbrush.Po
+	-rm -f ./$(DEPDIR)/gimpbrushcache.Po
+	-rm -f ./$(DEPDIR)/gimpbrushclipboard.Po
+	-rm -f ./$(DEPDIR)/gimpbrushgenerated-load.Po
+	-rm -f ./$(DEPDIR)/gimpbrushgenerated-save.Po
+	-rm -f ./$(DEPDIR)/gimpbrushgenerated.Po
+	-rm -f ./$(DEPDIR)/gimpbrushpipe-load.Po
+	-rm -f ./$(DEPDIR)/gimpbrushpipe-save.Po
+	-rm -f ./$(DEPDIR)/gimpbrushpipe.Po
+	-rm -f ./$(DEPDIR)/gimpbuffer.Po
+	-rm -f ./$(DEPDIR)/gimpcancelable.Po
+	-rm -f ./$(DEPDIR)/gimpchannel-combine.Po
+	-rm -f ./$(DEPDIR)/gimpchannel-select.Po
+	-rm -f ./$(DEPDIR)/gimpchannel.Po
+	-rm -f ./$(DEPDIR)/gimpchannelpropundo.Po
+	-rm -f ./$(DEPDIR)/gimpchannelundo.Po
+	-rm -f ./$(DEPDIR)/gimpchunkiterator.Po
+	-rm -f ./$(DEPDIR)/gimpcontainer-filter.Po
+	-rm -f ./$(DEPDIR)/gimpcontainer.Po
+	-rm -f ./$(DEPDIR)/gimpcontext.Po
+	-rm -f ./$(DEPDIR)/gimpcoords-interpolate.Po
+	-rm -f ./$(DEPDIR)/gimpcoords.Po
+	-rm -f ./$(DEPDIR)/gimpcurve-load.Po
+	-rm -f ./$(DEPDIR)/gimpcurve-map.Po
+	-rm -f ./$(DEPDIR)/gimpcurve-save.Po
+	-rm -f ./$(DEPDIR)/gimpcurve.Po
+	-rm -f ./$(DEPDIR)/gimpdashpattern.Po
+	-rm -f ./$(DEPDIR)/gimpdata.Po
+	-rm -f ./$(DEPDIR)/gimpdatafactory.Po
+	-rm -f ./$(DEPDIR)/gimpdataloaderfactory.Po
+	-rm -f ./$(DEPDIR)/gimpdocumentlist.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-bucket-fill.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-combine.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-edit.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-equalize.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-fill.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-filters.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-floating-selection.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-foreground-extract.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-gradient.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-histogram.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-levels.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-offset.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-operation.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-preview.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-shadow.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-stroke.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-transform.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable.Po
+	-rm -f ./$(DEPDIR)/gimpdrawablefilter.Po
+	-rm -f ./$(DEPDIR)/gimpdrawablemodundo.Po
+	-rm -f ./$(DEPDIR)/gimpdrawablestack.Po
+	-rm -f ./$(DEPDIR)/gimpdrawableundo.Po
+	-rm -f ./$(DEPDIR)/gimpdynamics-load.Po
+	-rm -f ./$(DEPDIR)/gimpdynamics-save.Po
+	-rm -f ./$(DEPDIR)/gimpdynamics.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicsoutput.Po
+	-rm -f ./$(DEPDIR)/gimperror.Po
+	-rm -f ./$(DEPDIR)/gimpfilloptions.Po
+	-rm -f ./$(DEPDIR)/gimpfilter.Po
+	-rm -f ./$(DEPDIR)/gimpfilteredcontainer.Po
+	-rm -f ./$(DEPDIR)/gimpfilterstack.Po
+	-rm -f ./$(DEPDIR)/gimpfloatingselectionundo.Po
+	-rm -f ./$(DEPDIR)/gimpgradient-load.Po
+	-rm -f ./$(DEPDIR)/gimpgradient-save.Po
+	-rm -f ./$(DEPDIR)/gimpgradient.Po
+	-rm -f ./$(DEPDIR)/gimpgrid.Po
+	-rm -f ./$(DEPDIR)/gimpgrouplayer.Po
+	-rm -f ./$(DEPDIR)/gimpgrouplayerundo.Po
+	-rm -f ./$(DEPDIR)/gimpguide.Po
+	-rm -f ./$(DEPDIR)/gimpguideundo.Po
+	-rm -f ./$(DEPDIR)/gimphistogram.Po
+	-rm -f ./$(DEPDIR)/gimpidtable.Po
+	-rm -f ./$(DEPDIR)/gimpimage-arrange.Po
+	-rm -f ./$(DEPDIR)/gimpimage-color-profile.Po
+	-rm -f ./$(DEPDIR)/gimpimage-colormap.Po
+	-rm -f ./$(DEPDIR)/gimpimage-convert-indexed.Po
+	-rm -f ./$(DEPDIR)/gimpimage-convert-precision.Po
+	-rm -f ./$(DEPDIR)/gimpimage-convert-type.Po
+	-rm -f ./$(DEPDIR)/gimpimage-crop.Po
+	-rm -f ./$(DEPDIR)/gimpimage-duplicate.Po
+	-rm -f ./$(DEPDIR)/gimpimage-flip.Po
+	-rm -f ./$(DEPDIR)/gimpimage-grid.Po
+	-rm -f ./$(DEPDIR)/gimpimage-guides.Po
+	-rm -f ./$(DEPDIR)/gimpimage-item-list.Po
+	-rm -f ./$(DEPDIR)/gimpimage-merge.Po
+	-rm -f ./$(DEPDIR)/gimpimage-metadata.Po
+	-rm -f ./$(DEPDIR)/gimpimage-new.Po
+	-rm -f ./$(DEPDIR)/gimpimage-pick-color.Po
+	-rm -f ./$(DEPDIR)/gimpimage-pick-item.Po
+	-rm -f ./$(DEPDIR)/gimpimage-preview.Po
+	-rm -f ./$(DEPDIR)/gimpimage-quick-mask.Po
+	-rm -f ./$(DEPDIR)/gimpimage-resize.Po
+	-rm -f ./$(DEPDIR)/gimpimage-rotate.Po
+	-rm -f ./$(DEPDIR)/gimpimage-sample-points.Po
+	-rm -f ./$(DEPDIR)/gimpimage-scale.Po
+	-rm -f ./$(DEPDIR)/gimpimage-snap.Po
+	-rm -f ./$(DEPDIR)/gimpimage-symmetry.Po
+	-rm -f ./$(DEPDIR)/gimpimage-transform.Po
+	-rm -f ./$(DEPDIR)/gimpimage-undo-push.Po
+	-rm -f ./$(DEPDIR)/gimpimage-undo.Po
+	-rm -f ./$(DEPDIR)/gimpimage.Po
+	-rm -f ./$(DEPDIR)/gimpimagefile.Po
+	-rm -f ./$(DEPDIR)/gimpimageproxy.Po
+	-rm -f ./$(DEPDIR)/gimpimageundo.Po
+	-rm -f ./$(DEPDIR)/gimpitem-exclusive.Po
+	-rm -f ./$(DEPDIR)/gimpitem-linked.Po
+	-rm -f ./$(DEPDIR)/gimpitem-preview.Po
+	-rm -f ./$(DEPDIR)/gimpitem.Po
+	-rm -f ./$(DEPDIR)/gimpitempropundo.Po
+	-rm -f ./$(DEPDIR)/gimpitemstack.Po
+	-rm -f ./$(DEPDIR)/gimpitemtree.Po
+	-rm -f ./$(DEPDIR)/gimpitemundo.Po
+	-rm -f ./$(DEPDIR)/gimplayer-floating-selection.Po
+	-rm -f ./$(DEPDIR)/gimplayer-new.Po
+	-rm -f ./$(DEPDIR)/gimplayer.Po
+	-rm -f ./$(DEPDIR)/gimplayermask.Po
+	-rm -f ./$(DEPDIR)/gimplayermaskpropundo.Po
+	-rm -f ./$(DEPDIR)/gimplayermaskundo.Po
+	-rm -f ./$(DEPDIR)/gimplayerpropundo.Po
+	-rm -f ./$(DEPDIR)/gimplayerstack.Po
+	-rm -f ./$(DEPDIR)/gimplayerundo.Po
+	-rm -f ./$(DEPDIR)/gimplineart.Po
+	-rm -f ./$(DEPDIR)/gimplist.Po
+	-rm -f ./$(DEPDIR)/gimpmarshal.Po
+	-rm -f ./$(DEPDIR)/gimpmaskundo.Po
+	-rm -f ./$(DEPDIR)/gimpmybrush-load.Po
+	-rm -f ./$(DEPDIR)/gimpmybrush.Po
+	-rm -f ./$(DEPDIR)/gimpobject.Po
+	-rm -f ./$(DEPDIR)/gimpobjectqueue.Po
+	-rm -f ./$(DEPDIR)/gimppaintinfo.Po
+	-rm -f ./$(DEPDIR)/gimppalette-import.Po
+	-rm -f ./$(DEPDIR)/gimppalette-load.Po
+	-rm -f ./$(DEPDIR)/gimppalette-save.Po
+	-rm -f ./$(DEPDIR)/gimppalette.Po
+	-rm -f ./$(DEPDIR)/gimppalettemru.Po
+	-rm -f ./$(DEPDIR)/gimpparamspecs-desc.Po
+	-rm -f ./$(DEPDIR)/gimpparamspecs-duplicate.Po
+	-rm -f ./$(DEPDIR)/gimpparamspecs.Po
+	-rm -f ./$(DEPDIR)/gimpparasitelist.Po
+	-rm -f ./$(DEPDIR)/gimppattern-load.Po
+	-rm -f ./$(DEPDIR)/gimppattern-save.Po
+	-rm -f ./$(DEPDIR)/gimppattern.Po
+	-rm -f ./$(DEPDIR)/gimppatternclipboard.Po
+	-rm -f ./$(DEPDIR)/gimppdbprogress.Po
+	-rm -f ./$(DEPDIR)/gimppickable-auto-shrink.Po
+	-rm -f ./$(DEPDIR)/gimppickable-contiguous-region.Po
+	-rm -f ./$(DEPDIR)/gimppickable.Po
+	-rm -f ./$(DEPDIR)/gimpprogress.Po
+	-rm -f ./$(DEPDIR)/gimpprojectable.Po
+	-rm -f ./$(DEPDIR)/gimpprojection.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepoint.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepointundo.Po
+	-rm -f ./$(DEPDIR)/gimpscanconvert.Po
+	-rm -f ./$(DEPDIR)/gimpselection.Po
+	-rm -f ./$(DEPDIR)/gimpsettings.Po
+	-rm -f ./$(DEPDIR)/gimpstrokeoptions.Po
+	-rm -f ./$(DEPDIR)/gimpsubprogress.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry-mandala.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry-mirror.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry-tiling.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry.Po
+	-rm -f ./$(DEPDIR)/gimptag.Po
+	-rm -f ./$(DEPDIR)/gimptagcache.Po
+	-rm -f ./$(DEPDIR)/gimptagged.Po
+	-rm -f ./$(DEPDIR)/gimptaggedcontainer.Po
+	-rm -f ./$(DEPDIR)/gimptempbuf.Po
+	-rm -f ./$(DEPDIR)/gimptemplate.Po
+	-rm -f ./$(DEPDIR)/gimptilehandlerprojectable.Po
+	-rm -f ./$(DEPDIR)/gimptoolgroup.Po
+	-rm -f ./$(DEPDIR)/gimptoolinfo.Po
+	-rm -f ./$(DEPDIR)/gimptoolitem.Po
+	-rm -f ./$(DEPDIR)/gimptooloptions.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreset-load.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreset-save.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreset.Po
+	-rm -f ./$(DEPDIR)/gimptreehandler.Po
+	-rm -f ./$(DEPDIR)/gimptreeproxy.Po
+	-rm -f ./$(DEPDIR)/gimptriviallycancelablewaitable.Po
+	-rm -f ./$(DEPDIR)/gimpuncancelablewaitable.Po
+	-rm -f ./$(DEPDIR)/gimpundo.Po
+	-rm -f ./$(DEPDIR)/gimpundostack.Po
+	-rm -f ./$(DEPDIR)/gimpunit.Po
+	-rm -f ./$(DEPDIR)/gimpviewable.Po
+	-rm -f ./$(DEPDIR)/gimpwaitable.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/core-enums.Po
+	-rm -f ./$(DEPDIR)/gimp-atomic.Po
+	-rm -f ./$(DEPDIR)/gimp-batch.Po
+	-rm -f ./$(DEPDIR)/gimp-cairo.Po
+	-rm -f ./$(DEPDIR)/gimp-contexts.Po
+	-rm -f ./$(DEPDIR)/gimp-data-factories.Po
+	-rm -f ./$(DEPDIR)/gimp-edit.Po
+	-rm -f ./$(DEPDIR)/gimp-filter-history.Po
+	-rm -f ./$(DEPDIR)/gimp-gradients.Po
+	-rm -f ./$(DEPDIR)/gimp-gui.Po
+	-rm -f ./$(DEPDIR)/gimp-internal-data.Po
+	-rm -f ./$(DEPDIR)/gimp-memsize.Po
+	-rm -f ./$(DEPDIR)/gimp-modules.Po
+	-rm -f ./$(DEPDIR)/gimp-palettes.Po
+	-rm -f ./$(DEPDIR)/gimp-parallel.Po
+	-rm -f ./$(DEPDIR)/gimp-parasites.Po
+	-rm -f ./$(DEPDIR)/gimp-spawn.Po
+	-rm -f ./$(DEPDIR)/gimp-tags.Po
+	-rm -f ./$(DEPDIR)/gimp-templates.Po
+	-rm -f ./$(DEPDIR)/gimp-transform-3d-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-transform-resize.Po
+	-rm -f ./$(DEPDIR)/gimp-transform-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-units.Po
+	-rm -f ./$(DEPDIR)/gimp-user-install.Po
+	-rm -f ./$(DEPDIR)/gimp-utils.Po
+	-rm -f ./$(DEPDIR)/gimp.Po
+	-rm -f ./$(DEPDIR)/gimpasync.Po
+	-rm -f ./$(DEPDIR)/gimpasyncset.Po
+	-rm -f ./$(DEPDIR)/gimpauxitem.Po
+	-rm -f ./$(DEPDIR)/gimpauxitemundo.Po
+	-rm -f ./$(DEPDIR)/gimpbacktrace-linux.Po
+	-rm -f ./$(DEPDIR)/gimpbacktrace-none.Po
+	-rm -f ./$(DEPDIR)/gimpbacktrace-windows.Po
+	-rm -f ./$(DEPDIR)/gimpbezierdesc.Po
+	-rm -f ./$(DEPDIR)/gimpboundary.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-boundary.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-load.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-mipmap.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-save.Po
+	-rm -f ./$(DEPDIR)/gimpbrush-transform.Po
+	-rm -f ./$(DEPDIR)/gimpbrush.Po
+	-rm -f ./$(DEPDIR)/gimpbrushcache.Po
+	-rm -f ./$(DEPDIR)/gimpbrushclipboard.Po
+	-rm -f ./$(DEPDIR)/gimpbrushgenerated-load.Po
+	-rm -f ./$(DEPDIR)/gimpbrushgenerated-save.Po
+	-rm -f ./$(DEPDIR)/gimpbrushgenerated.Po
+	-rm -f ./$(DEPDIR)/gimpbrushpipe-load.Po
+	-rm -f ./$(DEPDIR)/gimpbrushpipe-save.Po
+	-rm -f ./$(DEPDIR)/gimpbrushpipe.Po
+	-rm -f ./$(DEPDIR)/gimpbuffer.Po
+	-rm -f ./$(DEPDIR)/gimpcancelable.Po
+	-rm -f ./$(DEPDIR)/gimpchannel-combine.Po
+	-rm -f ./$(DEPDIR)/gimpchannel-select.Po
+	-rm -f ./$(DEPDIR)/gimpchannel.Po
+	-rm -f ./$(DEPDIR)/gimpchannelpropundo.Po
+	-rm -f ./$(DEPDIR)/gimpchannelundo.Po
+	-rm -f ./$(DEPDIR)/gimpchunkiterator.Po
+	-rm -f ./$(DEPDIR)/gimpcontainer-filter.Po
+	-rm -f ./$(DEPDIR)/gimpcontainer.Po
+	-rm -f ./$(DEPDIR)/gimpcontext.Po
+	-rm -f ./$(DEPDIR)/gimpcoords-interpolate.Po
+	-rm -f ./$(DEPDIR)/gimpcoords.Po
+	-rm -f ./$(DEPDIR)/gimpcurve-load.Po
+	-rm -f ./$(DEPDIR)/gimpcurve-map.Po
+	-rm -f ./$(DEPDIR)/gimpcurve-save.Po
+	-rm -f ./$(DEPDIR)/gimpcurve.Po
+	-rm -f ./$(DEPDIR)/gimpdashpattern.Po
+	-rm -f ./$(DEPDIR)/gimpdata.Po
+	-rm -f ./$(DEPDIR)/gimpdatafactory.Po
+	-rm -f ./$(DEPDIR)/gimpdataloaderfactory.Po
+	-rm -f ./$(DEPDIR)/gimpdocumentlist.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-bucket-fill.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-combine.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-edit.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-equalize.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-fill.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-filters.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-floating-selection.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-foreground-extract.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-gradient.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-histogram.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-levels.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-offset.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-operation.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-preview.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-shadow.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-stroke.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable-transform.Po
+	-rm -f ./$(DEPDIR)/gimpdrawable.Po
+	-rm -f ./$(DEPDIR)/gimpdrawablefilter.Po
+	-rm -f ./$(DEPDIR)/gimpdrawablemodundo.Po
+	-rm -f ./$(DEPDIR)/gimpdrawablestack.Po
+	-rm -f ./$(DEPDIR)/gimpdrawableundo.Po
+	-rm -f ./$(DEPDIR)/gimpdynamics-load.Po
+	-rm -f ./$(DEPDIR)/gimpdynamics-save.Po
+	-rm -f ./$(DEPDIR)/gimpdynamics.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicsoutput.Po
+	-rm -f ./$(DEPDIR)/gimperror.Po
+	-rm -f ./$(DEPDIR)/gimpfilloptions.Po
+	-rm -f ./$(DEPDIR)/gimpfilter.Po
+	-rm -f ./$(DEPDIR)/gimpfilteredcontainer.Po
+	-rm -f ./$(DEPDIR)/gimpfilterstack.Po
+	-rm -f ./$(DEPDIR)/gimpfloatingselectionundo.Po
+	-rm -f ./$(DEPDIR)/gimpgradient-load.Po
+	-rm -f ./$(DEPDIR)/gimpgradient-save.Po
+	-rm -f ./$(DEPDIR)/gimpgradient.Po
+	-rm -f ./$(DEPDIR)/gimpgrid.Po
+	-rm -f ./$(DEPDIR)/gimpgrouplayer.Po
+	-rm -f ./$(DEPDIR)/gimpgrouplayerundo.Po
+	-rm -f ./$(DEPDIR)/gimpguide.Po
+	-rm -f ./$(DEPDIR)/gimpguideundo.Po
+	-rm -f ./$(DEPDIR)/gimphistogram.Po
+	-rm -f ./$(DEPDIR)/gimpidtable.Po
+	-rm -f ./$(DEPDIR)/gimpimage-arrange.Po
+	-rm -f ./$(DEPDIR)/gimpimage-color-profile.Po
+	-rm -f ./$(DEPDIR)/gimpimage-colormap.Po
+	-rm -f ./$(DEPDIR)/gimpimage-convert-indexed.Po
+	-rm -f ./$(DEPDIR)/gimpimage-convert-precision.Po
+	-rm -f ./$(DEPDIR)/gimpimage-convert-type.Po
+	-rm -f ./$(DEPDIR)/gimpimage-crop.Po
+	-rm -f ./$(DEPDIR)/gimpimage-duplicate.Po
+	-rm -f ./$(DEPDIR)/gimpimage-flip.Po
+	-rm -f ./$(DEPDIR)/gimpimage-grid.Po
+	-rm -f ./$(DEPDIR)/gimpimage-guides.Po
+	-rm -f ./$(DEPDIR)/gimpimage-item-list.Po
+	-rm -f ./$(DEPDIR)/gimpimage-merge.Po
+	-rm -f ./$(DEPDIR)/gimpimage-metadata.Po
+	-rm -f ./$(DEPDIR)/gimpimage-new.Po
+	-rm -f ./$(DEPDIR)/gimpimage-pick-color.Po
+	-rm -f ./$(DEPDIR)/gimpimage-pick-item.Po
+	-rm -f ./$(DEPDIR)/gimpimage-preview.Po
+	-rm -f ./$(DEPDIR)/gimpimage-quick-mask.Po
+	-rm -f ./$(DEPDIR)/gimpimage-resize.Po
+	-rm -f ./$(DEPDIR)/gimpimage-rotate.Po
+	-rm -f ./$(DEPDIR)/gimpimage-sample-points.Po
+	-rm -f ./$(DEPDIR)/gimpimage-scale.Po
+	-rm -f ./$(DEPDIR)/gimpimage-snap.Po
+	-rm -f ./$(DEPDIR)/gimpimage-symmetry.Po
+	-rm -f ./$(DEPDIR)/gimpimage-transform.Po
+	-rm -f ./$(DEPDIR)/gimpimage-undo-push.Po
+	-rm -f ./$(DEPDIR)/gimpimage-undo.Po
+	-rm -f ./$(DEPDIR)/gimpimage.Po
+	-rm -f ./$(DEPDIR)/gimpimagefile.Po
+	-rm -f ./$(DEPDIR)/gimpimageproxy.Po
+	-rm -f ./$(DEPDIR)/gimpimageundo.Po
+	-rm -f ./$(DEPDIR)/gimpitem-exclusive.Po
+	-rm -f ./$(DEPDIR)/gimpitem-linked.Po
+	-rm -f ./$(DEPDIR)/gimpitem-preview.Po
+	-rm -f ./$(DEPDIR)/gimpitem.Po
+	-rm -f ./$(DEPDIR)/gimpitempropundo.Po
+	-rm -f ./$(DEPDIR)/gimpitemstack.Po
+	-rm -f ./$(DEPDIR)/gimpitemtree.Po
+	-rm -f ./$(DEPDIR)/gimpitemundo.Po
+	-rm -f ./$(DEPDIR)/gimplayer-floating-selection.Po
+	-rm -f ./$(DEPDIR)/gimplayer-new.Po
+	-rm -f ./$(DEPDIR)/gimplayer.Po
+	-rm -f ./$(DEPDIR)/gimplayermask.Po
+	-rm -f ./$(DEPDIR)/gimplayermaskpropundo.Po
+	-rm -f ./$(DEPDIR)/gimplayermaskundo.Po
+	-rm -f ./$(DEPDIR)/gimplayerpropundo.Po
+	-rm -f ./$(DEPDIR)/gimplayerstack.Po
+	-rm -f ./$(DEPDIR)/gimplayerundo.Po
+	-rm -f ./$(DEPDIR)/gimplineart.Po
+	-rm -f ./$(DEPDIR)/gimplist.Po
+	-rm -f ./$(DEPDIR)/gimpmarshal.Po
+	-rm -f ./$(DEPDIR)/gimpmaskundo.Po
+	-rm -f ./$(DEPDIR)/gimpmybrush-load.Po
+	-rm -f ./$(DEPDIR)/gimpmybrush.Po
+	-rm -f ./$(DEPDIR)/gimpobject.Po
+	-rm -f ./$(DEPDIR)/gimpobjectqueue.Po
+	-rm -f ./$(DEPDIR)/gimppaintinfo.Po
+	-rm -f ./$(DEPDIR)/gimppalette-import.Po
+	-rm -f ./$(DEPDIR)/gimppalette-load.Po
+	-rm -f ./$(DEPDIR)/gimppalette-save.Po
+	-rm -f ./$(DEPDIR)/gimppalette.Po
+	-rm -f ./$(DEPDIR)/gimppalettemru.Po
+	-rm -f ./$(DEPDIR)/gimpparamspecs-desc.Po
+	-rm -f ./$(DEPDIR)/gimpparamspecs-duplicate.Po
+	-rm -f ./$(DEPDIR)/gimpparamspecs.Po
+	-rm -f ./$(DEPDIR)/gimpparasitelist.Po
+	-rm -f ./$(DEPDIR)/gimppattern-load.Po
+	-rm -f ./$(DEPDIR)/gimppattern-save.Po
+	-rm -f ./$(DEPDIR)/gimppattern.Po
+	-rm -f ./$(DEPDIR)/gimppatternclipboard.Po
+	-rm -f ./$(DEPDIR)/gimppdbprogress.Po
+	-rm -f ./$(DEPDIR)/gimppickable-auto-shrink.Po
+	-rm -f ./$(DEPDIR)/gimppickable-contiguous-region.Po
+	-rm -f ./$(DEPDIR)/gimppickable.Po
+	-rm -f ./$(DEPDIR)/gimpprogress.Po
+	-rm -f ./$(DEPDIR)/gimpprojectable.Po
+	-rm -f ./$(DEPDIR)/gimpprojection.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepoint.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepointundo.Po
+	-rm -f ./$(DEPDIR)/gimpscanconvert.Po
+	-rm -f ./$(DEPDIR)/gimpselection.Po
+	-rm -f ./$(DEPDIR)/gimpsettings.Po
+	-rm -f ./$(DEPDIR)/gimpstrokeoptions.Po
+	-rm -f ./$(DEPDIR)/gimpsubprogress.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry-mandala.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry-mirror.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry-tiling.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetry.Po
+	-rm -f ./$(DEPDIR)/gimptag.Po
+	-rm -f ./$(DEPDIR)/gimptagcache.Po
+	-rm -f ./$(DEPDIR)/gimptagged.Po
+	-rm -f ./$(DEPDIR)/gimptaggedcontainer.Po
+	-rm -f ./$(DEPDIR)/gimptempbuf.Po
+	-rm -f ./$(DEPDIR)/gimptemplate.Po
+	-rm -f ./$(DEPDIR)/gimptilehandlerprojectable.Po
+	-rm -f ./$(DEPDIR)/gimptoolgroup.Po
+	-rm -f ./$(DEPDIR)/gimptoolinfo.Po
+	-rm -f ./$(DEPDIR)/gimptoolitem.Po
+	-rm -f ./$(DEPDIR)/gimptooloptions.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreset-load.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreset-save.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreset.Po
+	-rm -f ./$(DEPDIR)/gimptreehandler.Po
+	-rm -f ./$(DEPDIR)/gimptreeproxy.Po
+	-rm -f ./$(DEPDIR)/gimptriviallycancelablewaitable.Po
+	-rm -f ./$(DEPDIR)/gimpuncancelablewaitable.Po
+	-rm -f ./$(DEPDIR)/gimpundo.Po
+	-rm -f ./$(DEPDIR)/gimpundostack.Po
+	-rm -f ./$(DEPDIR)/gimpunit.Po
+	-rm -f ./$(DEPDIR)/gimpviewable.Po
+	-rm -f ./$(DEPDIR)/gimpwaitable.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check install install-am install-exec install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+gimpmarshal.h: $(srcdir)/gimpmarshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --header >> xgen-gmh \
+	&& (cmp -s xgen-gmh $(@F) || cp xgen-gmh $(@F)) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+gimpmarshal.c: gimpmarshal.h
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --header --body >> xgen-gmc \
+	&& cp xgen-gmc $(@F) \
+	&& rm -f xgen-gmc xgen-gmc~
+
+xgen-cec: $(srcdir)/core-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/core-enums.c: xgen-cec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/core/core-enums.c b/app/core/core-enums.c
new file mode 100644
index 0000000..f8ecb14
--- /dev/null
+++ b/app/core/core-enums.c
@@ -0,0 +1,1316 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "core-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "core-enums.h" */
+GType
+gimp_align_reference_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ALIGN_REFERENCE_FIRST, "GIMP_ALIGN_REFERENCE_FIRST", "first" },
+    { GIMP_ALIGN_REFERENCE_IMAGE, "GIMP_ALIGN_REFERENCE_IMAGE", "image" },
+    { GIMP_ALIGN_REFERENCE_SELECTION, "GIMP_ALIGN_REFERENCE_SELECTION", "selection" },
+    { GIMP_ALIGN_REFERENCE_ACTIVE_LAYER, "GIMP_ALIGN_REFERENCE_ACTIVE_LAYER", "active-layer" },
+    { GIMP_ALIGN_REFERENCE_ACTIVE_CHANNEL, "GIMP_ALIGN_REFERENCE_ACTIVE_CHANNEL", "active-channel" },
+    { GIMP_ALIGN_REFERENCE_ACTIVE_PATH, "GIMP_ALIGN_REFERENCE_ACTIVE_PATH", "active-path" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ALIGN_REFERENCE_FIRST, NC_("align-reference-type", "First item"), NULL },
+    { GIMP_ALIGN_REFERENCE_IMAGE, NC_("align-reference-type", "Image"), NULL },
+    { GIMP_ALIGN_REFERENCE_SELECTION, NC_("align-reference-type", "Selection"), NULL },
+    { GIMP_ALIGN_REFERENCE_ACTIVE_LAYER, NC_("align-reference-type", "Active layer"), NULL },
+    { GIMP_ALIGN_REFERENCE_ACTIVE_CHANNEL, NC_("align-reference-type", "Active channel"), NULL },
+    { GIMP_ALIGN_REFERENCE_ACTIVE_PATH, NC_("align-reference-type", "Active path"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpAlignReferenceType", values);
+      gimp_type_set_translation_context (type, "align-reference-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_alignment_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ALIGN_LEFT, "GIMP_ALIGN_LEFT", "align-left" },
+    { GIMP_ALIGN_HCENTER, "GIMP_ALIGN_HCENTER", "align-hcenter" },
+    { GIMP_ALIGN_RIGHT, "GIMP_ALIGN_RIGHT", "align-right" },
+    { GIMP_ALIGN_TOP, "GIMP_ALIGN_TOP", "align-top" },
+    { GIMP_ALIGN_VCENTER, "GIMP_ALIGN_VCENTER", "align-vcenter" },
+    { GIMP_ALIGN_BOTTOM, "GIMP_ALIGN_BOTTOM", "align-bottom" },
+    { GIMP_ARRANGE_LEFT, "GIMP_ARRANGE_LEFT", "arrange-left" },
+    { GIMP_ARRANGE_HCENTER, "GIMP_ARRANGE_HCENTER", "arrange-hcenter" },
+    { GIMP_ARRANGE_RIGHT, "GIMP_ARRANGE_RIGHT", "arrange-right" },
+    { GIMP_ARRANGE_TOP, "GIMP_ARRANGE_TOP", "arrange-top" },
+    { GIMP_ARRANGE_VCENTER, "GIMP_ARRANGE_VCENTER", "arrange-vcenter" },
+    { GIMP_ARRANGE_BOTTOM, "GIMP_ARRANGE_BOTTOM", "arrange-bottom" },
+    { GIMP_ARRANGE_HFILL, "GIMP_ARRANGE_HFILL", "arrange-hfill" },
+    { GIMP_ARRANGE_VFILL, "GIMP_ARRANGE_VFILL", "arrange-vfill" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ALIGN_LEFT, "GIMP_ALIGN_LEFT", NULL },
+    { GIMP_ALIGN_HCENTER, "GIMP_ALIGN_HCENTER", NULL },
+    { GIMP_ALIGN_RIGHT, "GIMP_ALIGN_RIGHT", NULL },
+    { GIMP_ALIGN_TOP, "GIMP_ALIGN_TOP", NULL },
+    { GIMP_ALIGN_VCENTER, "GIMP_ALIGN_VCENTER", NULL },
+    { GIMP_ALIGN_BOTTOM, "GIMP_ALIGN_BOTTOM", NULL },
+    { GIMP_ARRANGE_LEFT, "GIMP_ARRANGE_LEFT", NULL },
+    { GIMP_ARRANGE_HCENTER, "GIMP_ARRANGE_HCENTER", NULL },
+    { GIMP_ARRANGE_RIGHT, "GIMP_ARRANGE_RIGHT", NULL },
+    { GIMP_ARRANGE_TOP, "GIMP_ARRANGE_TOP", NULL },
+    { GIMP_ARRANGE_VCENTER, "GIMP_ARRANGE_VCENTER", NULL },
+    { GIMP_ARRANGE_BOTTOM, "GIMP_ARRANGE_BOTTOM", NULL },
+    { GIMP_ARRANGE_HFILL, "GIMP_ARRANGE_HFILL", NULL },
+    { GIMP_ARRANGE_VFILL, "GIMP_ARRANGE_VFILL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpAlignmentType", values);
+      gimp_type_set_translation_context (type, "alignment-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_channel_border_style_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CHANNEL_BORDER_STYLE_HARD, "GIMP_CHANNEL_BORDER_STYLE_HARD", "hard" },
+    { GIMP_CHANNEL_BORDER_STYLE_SMOOTH, "GIMP_CHANNEL_BORDER_STYLE_SMOOTH", "smooth" },
+    { GIMP_CHANNEL_BORDER_STYLE_FEATHERED, "GIMP_CHANNEL_BORDER_STYLE_FEATHERED", "feathered" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CHANNEL_BORDER_STYLE_HARD, NC_("channel-border-style", "Hard"), NULL },
+    { GIMP_CHANNEL_BORDER_STYLE_SMOOTH, NC_("channel-border-style", "Smooth"), NULL },
+    { GIMP_CHANNEL_BORDER_STYLE_FEATHERED, NC_("channel-border-style", "Feathered"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpChannelBorderStyle", values);
+      gimp_type_set_translation_context (type, "channel-border-style");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_color_pick_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_COLOR_PICK_MODE_PIXEL, "GIMP_COLOR_PICK_MODE_PIXEL", "pixel" },
+    { GIMP_COLOR_PICK_MODE_RGB_PERCENT, "GIMP_COLOR_PICK_MODE_RGB_PERCENT", "rgb-percent" },
+    { GIMP_COLOR_PICK_MODE_RGB_U8, "GIMP_COLOR_PICK_MODE_RGB_U8", "rgb-u8" },
+    { GIMP_COLOR_PICK_MODE_HSV, "GIMP_COLOR_PICK_MODE_HSV", "hsv" },
+    { GIMP_COLOR_PICK_MODE_LCH, "GIMP_COLOR_PICK_MODE_LCH", "lch" },
+    { GIMP_COLOR_PICK_MODE_LAB, "GIMP_COLOR_PICK_MODE_LAB", "lab" },
+    { GIMP_COLOR_PICK_MODE_CMYK, "GIMP_COLOR_PICK_MODE_CMYK", "cmyk" },
+    { GIMP_COLOR_PICK_MODE_XYY, "GIMP_COLOR_PICK_MODE_XYY", "xyy" },
+    { GIMP_COLOR_PICK_MODE_YUV, "GIMP_COLOR_PICK_MODE_YUV", "yuv" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_COLOR_PICK_MODE_PIXEL, NC_("color-pick-mode", "Pixel"), NULL },
+    { GIMP_COLOR_PICK_MODE_RGB_PERCENT, NC_("color-pick-mode", "RGB (%)"), NULL },
+    { GIMP_COLOR_PICK_MODE_RGB_U8, NC_("color-pick-mode", "RGB (0..255)"), NULL },
+    { GIMP_COLOR_PICK_MODE_HSV, NC_("color-pick-mode", "HSV"), NULL },
+    { GIMP_COLOR_PICK_MODE_LCH, NC_("color-pick-mode", "CIE LCh"), NULL },
+    { GIMP_COLOR_PICK_MODE_LAB, NC_("color-pick-mode", "CIE LAB"), NULL },
+    { GIMP_COLOR_PICK_MODE_CMYK, NC_("color-pick-mode", "CMYK"), NULL },
+    { GIMP_COLOR_PICK_MODE_XYY, NC_("color-pick-mode", "CIE xyY"), NULL },
+    { GIMP_COLOR_PICK_MODE_YUV, NC_("color-pick-mode", "CIE Yu'v'"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpColorPickMode", values);
+      gimp_type_set_translation_context (type, "color-pick-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_color_profile_policy_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_COLOR_PROFILE_POLICY_ASK, "GIMP_COLOR_PROFILE_POLICY_ASK", "ask" },
+    { GIMP_COLOR_PROFILE_POLICY_KEEP, "GIMP_COLOR_PROFILE_POLICY_KEEP", "keep" },
+    { GIMP_COLOR_PROFILE_POLICY_CONVERT, "GIMP_COLOR_PROFILE_POLICY_CONVERT", "convert" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_COLOR_PROFILE_POLICY_ASK, NC_("color-profile-policy", "Ask what to do"), NULL },
+    { GIMP_COLOR_PROFILE_POLICY_KEEP, NC_("color-profile-policy", "Keep embedded profile"), NULL },
+    { GIMP_COLOR_PROFILE_POLICY_CONVERT, NC_("color-profile-policy", "Convert to built-in sRGB or grayscale profile"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpColorProfilePolicy", values);
+      gimp_type_set_translation_context (type, "color-profile-policy");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_component_mask_get_type (void)
+{
+  static const GFlagsValue values[] =
+  {
+    { GIMP_COMPONENT_MASK_RED, "GIMP_COMPONENT_MASK_RED", "red" },
+    { GIMP_COMPONENT_MASK_GREEN, "GIMP_COMPONENT_MASK_GREEN", "green" },
+    { GIMP_COMPONENT_MASK_BLUE, "GIMP_COMPONENT_MASK_BLUE", "blue" },
+    { GIMP_COMPONENT_MASK_ALPHA, "GIMP_COMPONENT_MASK_ALPHA", "alpha" },
+    { GIMP_COMPONENT_MASK_ALL, "GIMP_COMPONENT_MASK_ALL", "all" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpFlagsDesc descs[] =
+  {
+    { GIMP_COMPONENT_MASK_RED, "GIMP_COMPONENT_MASK_RED", NULL },
+    { GIMP_COMPONENT_MASK_GREEN, "GIMP_COMPONENT_MASK_GREEN", NULL },
+    { GIMP_COMPONENT_MASK_BLUE, "GIMP_COMPONENT_MASK_BLUE", NULL },
+    { GIMP_COMPONENT_MASK_ALPHA, "GIMP_COMPONENT_MASK_ALPHA", NULL },
+    { GIMP_COMPONENT_MASK_ALL, "GIMP_COMPONENT_MASK_ALL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_flags_register_static ("GimpComponentMask", values);
+      gimp_type_set_translation_context (type, "component-mask");
+      gimp_flags_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_container_policy_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CONTAINER_POLICY_STRONG, "GIMP_CONTAINER_POLICY_STRONG", "strong" },
+    { GIMP_CONTAINER_POLICY_WEAK, "GIMP_CONTAINER_POLICY_WEAK", "weak" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CONTAINER_POLICY_STRONG, "GIMP_CONTAINER_POLICY_STRONG", NULL },
+    { GIMP_CONTAINER_POLICY_WEAK, "GIMP_CONTAINER_POLICY_WEAK", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpContainerPolicy", values);
+      gimp_type_set_translation_context (type, "container-policy");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_convert_dither_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CONVERT_DITHER_NONE, "GIMP_CONVERT_DITHER_NONE", "none" },
+    { GIMP_CONVERT_DITHER_FS, "GIMP_CONVERT_DITHER_FS", "fs" },
+    { GIMP_CONVERT_DITHER_FS_LOWBLEED, "GIMP_CONVERT_DITHER_FS_LOWBLEED", "fs-lowbleed" },
+    { GIMP_CONVERT_DITHER_FIXED, "GIMP_CONVERT_DITHER_FIXED", "fixed" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CONVERT_DITHER_NONE, NC_("convert-dither-type", "None"), NULL },
+    { GIMP_CONVERT_DITHER_FS, NC_("convert-dither-type", "Floyd-Steinberg (normal)"), NULL },
+    { GIMP_CONVERT_DITHER_FS_LOWBLEED, NC_("convert-dither-type", "Floyd-Steinberg (reduced color bleeding)"), NULL },
+    { GIMP_CONVERT_DITHER_FIXED, NC_("convert-dither-type", "Positioned"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpConvertDitherType", values);
+      gimp_type_set_translation_context (type, "convert-dither-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_convolution_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_NORMAL_CONVOL, "GIMP_NORMAL_CONVOL", "normal-convol" },
+    { GIMP_ABSOLUTE_CONVOL, "GIMP_ABSOLUTE_CONVOL", "absolute-convol" },
+    { GIMP_NEGATIVE_CONVOL, "GIMP_NEGATIVE_CONVOL", "negative-convol" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_NORMAL_CONVOL, "GIMP_NORMAL_CONVOL", NULL },
+    { GIMP_ABSOLUTE_CONVOL, "GIMP_ABSOLUTE_CONVOL", NULL },
+    { GIMP_NEGATIVE_CONVOL, "GIMP_NEGATIVE_CONVOL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpConvolutionType", values);
+      gimp_type_set_translation_context (type, "convolution-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_curve_point_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CURVE_POINT_SMOOTH, "GIMP_CURVE_POINT_SMOOTH", "smooth" },
+    { GIMP_CURVE_POINT_CORNER, "GIMP_CURVE_POINT_CORNER", "corner" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CURVE_POINT_SMOOTH, NC_("curve-point-type", "Smooth"), NULL },
+    { GIMP_CURVE_POINT_CORNER, NC_("curve-point-type", "Corner"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCurvePointType", values);
+      gimp_type_set_translation_context (type, "curve-point-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_curve_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CURVE_SMOOTH, "GIMP_CURVE_SMOOTH", "smooth" },
+    { GIMP_CURVE_FREE, "GIMP_CURVE_FREE", "free" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CURVE_SMOOTH, NC_("curve-type", "Smooth"), NULL },
+    { GIMP_CURVE_FREE, NC_("curve-type", "Freehand"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCurveType", values);
+      gimp_type_set_translation_context (type, "curve-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_dash_preset_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_DASH_CUSTOM, "GIMP_DASH_CUSTOM", "custom" },
+    { GIMP_DASH_LINE, "GIMP_DASH_LINE", "line" },
+    { GIMP_DASH_LONG_DASH, "GIMP_DASH_LONG_DASH", "long-dash" },
+    { GIMP_DASH_MEDIUM_DASH, "GIMP_DASH_MEDIUM_DASH", "medium-dash" },
+    { GIMP_DASH_SHORT_DASH, "GIMP_DASH_SHORT_DASH", "short-dash" },
+    { GIMP_DASH_SPARSE_DOTS, "GIMP_DASH_SPARSE_DOTS", "sparse-dots" },
+    { GIMP_DASH_NORMAL_DOTS, "GIMP_DASH_NORMAL_DOTS", "normal-dots" },
+    { GIMP_DASH_DENSE_DOTS, "GIMP_DASH_DENSE_DOTS", "dense-dots" },
+    { GIMP_DASH_STIPPLES, "GIMP_DASH_STIPPLES", "stipples" },
+    { GIMP_DASH_DASH_DOT, "GIMP_DASH_DASH_DOT", "dash-dot" },
+    { GIMP_DASH_DASH_DOT_DOT, "GIMP_DASH_DASH_DOT_DOT", "dash-dot-dot" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_DASH_CUSTOM, NC_("dash-preset", "Custom"), NULL },
+    { GIMP_DASH_LINE, NC_("dash-preset", "Line"), NULL },
+    { GIMP_DASH_LONG_DASH, NC_("dash-preset", "Long dashes"), NULL },
+    { GIMP_DASH_MEDIUM_DASH, NC_("dash-preset", "Medium dashes"), NULL },
+    { GIMP_DASH_SHORT_DASH, NC_("dash-preset", "Short dashes"), NULL },
+    { GIMP_DASH_SPARSE_DOTS, NC_("dash-preset", "Sparse dots"), NULL },
+    { GIMP_DASH_NORMAL_DOTS, NC_("dash-preset", "Normal dots"), NULL },
+    { GIMP_DASH_DENSE_DOTS, NC_("dash-preset", "Dense dots"), NULL },
+    { GIMP_DASH_STIPPLES, NC_("dash-preset", "Stipples"), NULL },
+    { GIMP_DASH_DASH_DOT, NC_("dash-preset", "Dash, dot"), NULL },
+    { GIMP_DASH_DASH_DOT_DOT, NC_("dash-preset", "Dash, dot, dot"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpDashPreset", values);
+      gimp_type_set_translation_context (type, "dash-preset");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_debug_policy_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_DEBUG_POLICY_WARNING, "GIMP_DEBUG_POLICY_WARNING", "warning" },
+    { GIMP_DEBUG_POLICY_CRITICAL, "GIMP_DEBUG_POLICY_CRITICAL", "critical" },
+    { GIMP_DEBUG_POLICY_FATAL, "GIMP_DEBUG_POLICY_FATAL", "fatal" },
+    { GIMP_DEBUG_POLICY_NEVER, "GIMP_DEBUG_POLICY_NEVER", "never" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_DEBUG_POLICY_WARNING, NC_("debug-policy", "Debug warnings, critical errors and crashes"), NULL },
+    { GIMP_DEBUG_POLICY_CRITICAL, NC_("debug-policy", "Debug critical errors and crashes"), NULL },
+    { GIMP_DEBUG_POLICY_FATAL, NC_("debug-policy", "Debug crashes only"), NULL },
+    { GIMP_DEBUG_POLICY_NEVER, NC_("debug-policy", "Never debug GIMP"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpDebugPolicy", values);
+      gimp_type_set_translation_context (type, "debug-policy");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_dirty_mask_get_type (void)
+{
+  static const GFlagsValue values[] =
+  {
+    { GIMP_DIRTY_NONE, "GIMP_DIRTY_NONE", "none" },
+    { GIMP_DIRTY_IMAGE, "GIMP_DIRTY_IMAGE", "image" },
+    { GIMP_DIRTY_IMAGE_SIZE, "GIMP_DIRTY_IMAGE_SIZE", "image-size" },
+    { GIMP_DIRTY_IMAGE_META, "GIMP_DIRTY_IMAGE_META", "image-meta" },
+    { GIMP_DIRTY_IMAGE_STRUCTURE, "GIMP_DIRTY_IMAGE_STRUCTURE", "image-structure" },
+    { GIMP_DIRTY_ITEM, "GIMP_DIRTY_ITEM", "item" },
+    { GIMP_DIRTY_ITEM_META, "GIMP_DIRTY_ITEM_META", "item-meta" },
+    { GIMP_DIRTY_DRAWABLE, "GIMP_DIRTY_DRAWABLE", "drawable" },
+    { GIMP_DIRTY_VECTORS, "GIMP_DIRTY_VECTORS", "vectors" },
+    { GIMP_DIRTY_SELECTION, "GIMP_DIRTY_SELECTION", "selection" },
+    { GIMP_DIRTY_ACTIVE_DRAWABLE, "GIMP_DIRTY_ACTIVE_DRAWABLE", "active-drawable" },
+    { GIMP_DIRTY_ALL, "GIMP_DIRTY_ALL", "all" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpFlagsDesc descs[] =
+  {
+    { GIMP_DIRTY_NONE, "GIMP_DIRTY_NONE", NULL },
+    { GIMP_DIRTY_IMAGE, "GIMP_DIRTY_IMAGE", NULL },
+    { GIMP_DIRTY_IMAGE_SIZE, "GIMP_DIRTY_IMAGE_SIZE", NULL },
+    { GIMP_DIRTY_IMAGE_META, "GIMP_DIRTY_IMAGE_META", NULL },
+    { GIMP_DIRTY_IMAGE_STRUCTURE, "GIMP_DIRTY_IMAGE_STRUCTURE", NULL },
+    { GIMP_DIRTY_ITEM, "GIMP_DIRTY_ITEM", NULL },
+    { GIMP_DIRTY_ITEM_META, "GIMP_DIRTY_ITEM_META", NULL },
+    { GIMP_DIRTY_DRAWABLE, "GIMP_DIRTY_DRAWABLE", NULL },
+    { GIMP_DIRTY_VECTORS, "GIMP_DIRTY_VECTORS", NULL },
+    { GIMP_DIRTY_SELECTION, "GIMP_DIRTY_SELECTION", NULL },
+    { GIMP_DIRTY_ACTIVE_DRAWABLE, "GIMP_DIRTY_ACTIVE_DRAWABLE", NULL },
+    { GIMP_DIRTY_ALL, "GIMP_DIRTY_ALL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_flags_register_static ("GimpDirtyMask", values);
+      gimp_type_set_translation_context (type, "dirty-mask");
+      gimp_flags_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_dynamics_output_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_DYNAMICS_OUTPUT_OPACITY, "GIMP_DYNAMICS_OUTPUT_OPACITY", "opacity" },
+    { GIMP_DYNAMICS_OUTPUT_SIZE, "GIMP_DYNAMICS_OUTPUT_SIZE", "size" },
+    { GIMP_DYNAMICS_OUTPUT_ANGLE, "GIMP_DYNAMICS_OUTPUT_ANGLE", "angle" },
+    { GIMP_DYNAMICS_OUTPUT_COLOR, "GIMP_DYNAMICS_OUTPUT_COLOR", "color" },
+    { GIMP_DYNAMICS_OUTPUT_HARDNESS, "GIMP_DYNAMICS_OUTPUT_HARDNESS", "hardness" },
+    { GIMP_DYNAMICS_OUTPUT_FORCE, "GIMP_DYNAMICS_OUTPUT_FORCE", "force" },
+    { GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO, "GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO", "aspect-ratio" },
+    { GIMP_DYNAMICS_OUTPUT_SPACING, "GIMP_DYNAMICS_OUTPUT_SPACING", "spacing" },
+    { GIMP_DYNAMICS_OUTPUT_RATE, "GIMP_DYNAMICS_OUTPUT_RATE", "rate" },
+    { GIMP_DYNAMICS_OUTPUT_FLOW, "GIMP_DYNAMICS_OUTPUT_FLOW", "flow" },
+    { GIMP_DYNAMICS_OUTPUT_JITTER, "GIMP_DYNAMICS_OUTPUT_JITTER", "jitter" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_DYNAMICS_OUTPUT_OPACITY, NC_("dynamics-output-type", "Opacity"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_SIZE, NC_("dynamics-output-type", "Size"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_ANGLE, NC_("dynamics-output-type", "Angle"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_COLOR, NC_("dynamics-output-type", "Color"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_HARDNESS, NC_("dynamics-output-type", "Hardness"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_FORCE, NC_("dynamics-output-type", "Force"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO, NC_("dynamics-output-type", "Aspect ratio"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_SPACING, NC_("dynamics-output-type", "Spacing"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_RATE, NC_("dynamics-output-type", "Rate"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_FLOW, NC_("dynamics-output-type", "Flow"), NULL },
+    { GIMP_DYNAMICS_OUTPUT_JITTER, NC_("dynamics-output-type", "Jitter"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpDynamicsOutputType", values);
+      gimp_type_set_translation_context (type, "dynamics-output-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_fill_style_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_FILL_STYLE_SOLID, "GIMP_FILL_STYLE_SOLID", "solid" },
+    { GIMP_FILL_STYLE_PATTERN, "GIMP_FILL_STYLE_PATTERN", "pattern" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_FILL_STYLE_SOLID, NC_("fill-style", "Solid color"), NULL },
+    { GIMP_FILL_STYLE_PATTERN, NC_("fill-style", "Pattern"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpFillStyle", values);
+      gimp_type_set_translation_context (type, "fill-style");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_filter_region_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_FILTER_REGION_SELECTION, "GIMP_FILTER_REGION_SELECTION", "selection" },
+    { GIMP_FILTER_REGION_DRAWABLE, "GIMP_FILTER_REGION_DRAWABLE", "drawable" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_FILTER_REGION_SELECTION, NC_("filter-region", "Use the selection as input"), NULL },
+    { GIMP_FILTER_REGION_DRAWABLE, NC_("filter-region", "Use the entire layer as input"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpFilterRegion", values);
+      gimp_type_set_translation_context (type, "filter-region");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_gradient_color_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_GRADIENT_COLOR_FIXED, "GIMP_GRADIENT_COLOR_FIXED", "fixed" },
+    { GIMP_GRADIENT_COLOR_FOREGROUND, "GIMP_GRADIENT_COLOR_FOREGROUND", "foreground" },
+    { GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT, "GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT", "foreground-transparent" },
+    { GIMP_GRADIENT_COLOR_BACKGROUND, "GIMP_GRADIENT_COLOR_BACKGROUND", "background" },
+    { GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT, "GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT", "background-transparent" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_GRADIENT_COLOR_FIXED, NC_("gradient-color", "Fixed"), NULL },
+    { GIMP_GRADIENT_COLOR_FOREGROUND, NC_("gradient-color", "Foreground color"), NULL },
+    /* Translators: this is an abbreviated version of "Foreground color".
+       Keep it short. */
+    { GIMP_GRADIENT_COLOR_FOREGROUND, NC_("gradient-color", "FG"), NULL },
+    { GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT, NC_("gradient-color", "Foreground color (transparent)"), NULL },
+    /* Translators: this is an abbreviated version of "Foreground color (transparent)".
+       Keep it short. */
+    { GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT, NC_("gradient-color", "FG (t)"), NULL },
+    { GIMP_GRADIENT_COLOR_BACKGROUND, NC_("gradient-color", "Background color"), NULL },
+    /* Translators: this is an abbreviated version of "Background color".
+       Keep it short. */
+    { GIMP_GRADIENT_COLOR_BACKGROUND, NC_("gradient-color", "BG"), NULL },
+    { GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT, NC_("gradient-color", "Background color (transparent)"), NULL },
+    /* Translators: this is an abbreviated version of "Background color (transparent)".
+       Keep it short. */
+    { GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT, NC_("gradient-color", "BG (t)"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpGradientColor", values);
+      gimp_type_set_translation_context (type, "gradient-color");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_gravity_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_GRAVITY_NONE, "GIMP_GRAVITY_NONE", "none" },
+    { GIMP_GRAVITY_NORTH_WEST, "GIMP_GRAVITY_NORTH_WEST", "north-west" },
+    { GIMP_GRAVITY_NORTH, "GIMP_GRAVITY_NORTH", "north" },
+    { GIMP_GRAVITY_NORTH_EAST, "GIMP_GRAVITY_NORTH_EAST", "north-east" },
+    { GIMP_GRAVITY_WEST, "GIMP_GRAVITY_WEST", "west" },
+    { GIMP_GRAVITY_CENTER, "GIMP_GRAVITY_CENTER", "center" },
+    { GIMP_GRAVITY_EAST, "GIMP_GRAVITY_EAST", "east" },
+    { GIMP_GRAVITY_SOUTH_WEST, "GIMP_GRAVITY_SOUTH_WEST", "south-west" },
+    { GIMP_GRAVITY_SOUTH, "GIMP_GRAVITY_SOUTH", "south" },
+    { GIMP_GRAVITY_SOUTH_EAST, "GIMP_GRAVITY_SOUTH_EAST", "south-east" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_GRAVITY_NONE, "GIMP_GRAVITY_NONE", NULL },
+    { GIMP_GRAVITY_NORTH_WEST, "GIMP_GRAVITY_NORTH_WEST", NULL },
+    { GIMP_GRAVITY_NORTH, "GIMP_GRAVITY_NORTH", NULL },
+    { GIMP_GRAVITY_NORTH_EAST, "GIMP_GRAVITY_NORTH_EAST", NULL },
+    { GIMP_GRAVITY_WEST, "GIMP_GRAVITY_WEST", NULL },
+    { GIMP_GRAVITY_CENTER, "GIMP_GRAVITY_CENTER", NULL },
+    { GIMP_GRAVITY_EAST, "GIMP_GRAVITY_EAST", NULL },
+    { GIMP_GRAVITY_SOUTH_WEST, "GIMP_GRAVITY_SOUTH_WEST", NULL },
+    { GIMP_GRAVITY_SOUTH, "GIMP_GRAVITY_SOUTH", NULL },
+    { GIMP_GRAVITY_SOUTH_EAST, "GIMP_GRAVITY_SOUTH_EAST", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpGravityType", values);
+      gimp_type_set_translation_context (type, "gravity-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_guide_style_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_GUIDE_STYLE_NONE, "GIMP_GUIDE_STYLE_NONE", "none" },
+    { GIMP_GUIDE_STYLE_NORMAL, "GIMP_GUIDE_STYLE_NORMAL", "normal" },
+    { GIMP_GUIDE_STYLE_MIRROR, "GIMP_GUIDE_STYLE_MIRROR", "mirror" },
+    { GIMP_GUIDE_STYLE_MANDALA, "GIMP_GUIDE_STYLE_MANDALA", "mandala" },
+    { GIMP_GUIDE_STYLE_SPLIT_VIEW, "GIMP_GUIDE_STYLE_SPLIT_VIEW", "split-view" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_GUIDE_STYLE_NONE, "GIMP_GUIDE_STYLE_NONE", NULL },
+    { GIMP_GUIDE_STYLE_NORMAL, "GIMP_GUIDE_STYLE_NORMAL", NULL },
+    { GIMP_GUIDE_STYLE_MIRROR, "GIMP_GUIDE_STYLE_MIRROR", NULL },
+    { GIMP_GUIDE_STYLE_MANDALA, "GIMP_GUIDE_STYLE_MANDALA", NULL },
+    { GIMP_GUIDE_STYLE_SPLIT_VIEW, "GIMP_GUIDE_STYLE_SPLIT_VIEW", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpGuideStyle", values);
+      gimp_type_set_translation_context (type, "guide-style");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_histogram_channel_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HISTOGRAM_VALUE, "GIMP_HISTOGRAM_VALUE", "value" },
+    { GIMP_HISTOGRAM_RED, "GIMP_HISTOGRAM_RED", "red" },
+    { GIMP_HISTOGRAM_GREEN, "GIMP_HISTOGRAM_GREEN", "green" },
+    { GIMP_HISTOGRAM_BLUE, "GIMP_HISTOGRAM_BLUE", "blue" },
+    { GIMP_HISTOGRAM_ALPHA, "GIMP_HISTOGRAM_ALPHA", "alpha" },
+    { GIMP_HISTOGRAM_LUMINANCE, "GIMP_HISTOGRAM_LUMINANCE", "luminance" },
+    { GIMP_HISTOGRAM_RGB, "GIMP_HISTOGRAM_RGB", "rgb" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HISTOGRAM_VALUE, NC_("histogram-channel", "Value"), NULL },
+    { GIMP_HISTOGRAM_RED, NC_("histogram-channel", "Red"), NULL },
+    { GIMP_HISTOGRAM_GREEN, NC_("histogram-channel", "Green"), NULL },
+    { GIMP_HISTOGRAM_BLUE, NC_("histogram-channel", "Blue"), NULL },
+    { GIMP_HISTOGRAM_ALPHA, NC_("histogram-channel", "Alpha"), NULL },
+    { GIMP_HISTOGRAM_LUMINANCE, NC_("histogram-channel", "Luminance"), NULL },
+    { GIMP_HISTOGRAM_RGB, NC_("histogram-channel", "RGB"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpHistogramChannel", values);
+      gimp_type_set_translation_context (type, "histogram-channel");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_item_set_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ITEM_SET_NONE, "GIMP_ITEM_SET_NONE", "none" },
+    { GIMP_ITEM_SET_ALL, "GIMP_ITEM_SET_ALL", "all" },
+    { GIMP_ITEM_SET_IMAGE_SIZED, "GIMP_ITEM_SET_IMAGE_SIZED", "image-sized" },
+    { GIMP_ITEM_SET_VISIBLE, "GIMP_ITEM_SET_VISIBLE", "visible" },
+    { GIMP_ITEM_SET_LINKED, "GIMP_ITEM_SET_LINKED", "linked" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ITEM_SET_NONE, NC_("item-set", "None"), NULL },
+    { GIMP_ITEM_SET_ALL, NC_("item-set", "All layers"), NULL },
+    { GIMP_ITEM_SET_IMAGE_SIZED, NC_("item-set", "Image-sized layers"), NULL },
+    { GIMP_ITEM_SET_VISIBLE, NC_("item-set", "All visible layers"), NULL },
+    { GIMP_ITEM_SET_LINKED, NC_("item-set", "All linked layers"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpItemSet", values);
+      gimp_type_set_translation_context (type, "item-set");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_matting_engine_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_MATTING_ENGINE_GLOBAL, "GIMP_MATTING_ENGINE_GLOBAL", "global" },
+    { GIMP_MATTING_ENGINE_LEVIN, "GIMP_MATTING_ENGINE_LEVIN", "levin" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_MATTING_ENGINE_GLOBAL, NC_("matting-engine", "Matting Global"), NULL },
+    { GIMP_MATTING_ENGINE_LEVIN, NC_("matting-engine", "Matting Levin"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpMattingEngine", values);
+      gimp_type_set_translation_context (type, "matting-engine");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_message_severity_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_MESSAGE_INFO, "GIMP_MESSAGE_INFO", "info" },
+    { GIMP_MESSAGE_WARNING, "GIMP_MESSAGE_WARNING", "warning" },
+    { GIMP_MESSAGE_ERROR, "GIMP_MESSAGE_ERROR", "error" },
+    { GIMP_MESSAGE_BUG_WARNING, "GIMP_MESSAGE_BUG_WARNING", "bug-warning" },
+    { GIMP_MESSAGE_BUG_CRITICAL, "GIMP_MESSAGE_BUG_CRITICAL", "bug-critical" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_MESSAGE_INFO, NC_("message-severity", "Message"), NULL },
+    { GIMP_MESSAGE_WARNING, NC_("message-severity", "Warning"), NULL },
+    { GIMP_MESSAGE_ERROR, NC_("message-severity", "Error"), NULL },
+    { GIMP_MESSAGE_BUG_WARNING, NC_("message-severity", "WARNING"), NULL },
+    { GIMP_MESSAGE_BUG_CRITICAL, NC_("message-severity", "CRITICAL"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpMessageSeverity", values);
+      gimp_type_set_translation_context (type, "message-severity");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_paste_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_PASTE_TYPE_FLOATING, "GIMP_PASTE_TYPE_FLOATING", "floating" },
+    { GIMP_PASTE_TYPE_FLOATING_IN_PLACE, "GIMP_PASTE_TYPE_FLOATING_IN_PLACE", "floating-in-place" },
+    { GIMP_PASTE_TYPE_FLOATING_INTO, "GIMP_PASTE_TYPE_FLOATING_INTO", "floating-into" },
+    { GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE, "GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE", "floating-into-in-place" },
+    { GIMP_PASTE_TYPE_NEW_LAYER, "GIMP_PASTE_TYPE_NEW_LAYER", "new-layer" },
+    { GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE, "GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE", "new-layer-in-place" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_PASTE_TYPE_FLOATING, "GIMP_PASTE_TYPE_FLOATING", NULL },
+    { GIMP_PASTE_TYPE_FLOATING_IN_PLACE, "GIMP_PASTE_TYPE_FLOATING_IN_PLACE", NULL },
+    { GIMP_PASTE_TYPE_FLOATING_INTO, "GIMP_PASTE_TYPE_FLOATING_INTO", NULL },
+    { GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE, "GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE", NULL },
+    { GIMP_PASTE_TYPE_NEW_LAYER, "GIMP_PASTE_TYPE_NEW_LAYER", NULL },
+    { GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE, "GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpPasteType", values);
+      gimp_type_set_translation_context (type, "paste-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_thumbnail_size_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_THUMBNAIL_SIZE_NONE, "GIMP_THUMBNAIL_SIZE_NONE", "none" },
+    { GIMP_THUMBNAIL_SIZE_NORMAL, "GIMP_THUMBNAIL_SIZE_NORMAL", "normal" },
+    { GIMP_THUMBNAIL_SIZE_LARGE, "GIMP_THUMBNAIL_SIZE_LARGE", "large" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_THUMBNAIL_SIZE_NONE, NC_("thumbnail-size", "No thumbnails"), NULL },
+    { GIMP_THUMBNAIL_SIZE_NORMAL, NC_("thumbnail-size", "Normal (128x128)"), NULL },
+    { GIMP_THUMBNAIL_SIZE_LARGE, NC_("thumbnail-size", "Large (256x256)"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpThumbnailSize", values);
+      gimp_type_set_translation_context (type, "thumbnail-size");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_undo_event_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_UNDO_EVENT_UNDO_PUSHED, "GIMP_UNDO_EVENT_UNDO_PUSHED", "undo-pushed" },
+    { GIMP_UNDO_EVENT_UNDO_EXPIRED, "GIMP_UNDO_EVENT_UNDO_EXPIRED", "undo-expired" },
+    { GIMP_UNDO_EVENT_REDO_EXPIRED, "GIMP_UNDO_EVENT_REDO_EXPIRED", "redo-expired" },
+    { GIMP_UNDO_EVENT_UNDO, "GIMP_UNDO_EVENT_UNDO", "undo" },
+    { GIMP_UNDO_EVENT_REDO, "GIMP_UNDO_EVENT_REDO", "redo" },
+    { GIMP_UNDO_EVENT_UNDO_FREE, "GIMP_UNDO_EVENT_UNDO_FREE", "undo-free" },
+    { GIMP_UNDO_EVENT_UNDO_FREEZE, "GIMP_UNDO_EVENT_UNDO_FREEZE", "undo-freeze" },
+    { GIMP_UNDO_EVENT_UNDO_THAW, "GIMP_UNDO_EVENT_UNDO_THAW", "undo-thaw" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_UNDO_EVENT_UNDO_PUSHED, "GIMP_UNDO_EVENT_UNDO_PUSHED", NULL },
+    { GIMP_UNDO_EVENT_UNDO_EXPIRED, "GIMP_UNDO_EVENT_UNDO_EXPIRED", NULL },
+    { GIMP_UNDO_EVENT_REDO_EXPIRED, "GIMP_UNDO_EVENT_REDO_EXPIRED", NULL },
+    { GIMP_UNDO_EVENT_UNDO, "GIMP_UNDO_EVENT_UNDO", NULL },
+    { GIMP_UNDO_EVENT_REDO, "GIMP_UNDO_EVENT_REDO", NULL },
+    { GIMP_UNDO_EVENT_UNDO_FREE, "GIMP_UNDO_EVENT_UNDO_FREE", NULL },
+    { GIMP_UNDO_EVENT_UNDO_FREEZE, "GIMP_UNDO_EVENT_UNDO_FREEZE", NULL },
+    { GIMP_UNDO_EVENT_UNDO_THAW, "GIMP_UNDO_EVENT_UNDO_THAW", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpUndoEvent", values);
+      gimp_type_set_translation_context (type, "undo-event");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_undo_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_UNDO_MODE_UNDO, "GIMP_UNDO_MODE_UNDO", "undo" },
+    { GIMP_UNDO_MODE_REDO, "GIMP_UNDO_MODE_REDO", "redo" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_UNDO_MODE_UNDO, "GIMP_UNDO_MODE_UNDO", NULL },
+    { GIMP_UNDO_MODE_REDO, "GIMP_UNDO_MODE_REDO", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpUndoMode", values);
+      gimp_type_set_translation_context (type, "undo-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_undo_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_UNDO_GROUP_NONE, "GIMP_UNDO_GROUP_NONE", "group-none" },
+    { GIMP_UNDO_GROUP_IMAGE_SCALE, "GIMP_UNDO_GROUP_IMAGE_SCALE", "group-image-scale" },
+    { GIMP_UNDO_GROUP_IMAGE_RESIZE, "GIMP_UNDO_GROUP_IMAGE_RESIZE", "group-image-resize" },
+    { GIMP_UNDO_GROUP_IMAGE_FLIP, "GIMP_UNDO_GROUP_IMAGE_FLIP", "group-image-flip" },
+    { GIMP_UNDO_GROUP_IMAGE_ROTATE, "GIMP_UNDO_GROUP_IMAGE_ROTATE", "group-image-rotate" },
+    { GIMP_UNDO_GROUP_IMAGE_TRANSFORM, "GIMP_UNDO_GROUP_IMAGE_TRANSFORM", "group-image-transform" },
+    { GIMP_UNDO_GROUP_IMAGE_CROP, "GIMP_UNDO_GROUP_IMAGE_CROP", "group-image-crop" },
+    { GIMP_UNDO_GROUP_IMAGE_CONVERT, "GIMP_UNDO_GROUP_IMAGE_CONVERT", "group-image-convert" },
+    { GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE, "GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE", "group-image-item-remove" },
+    { GIMP_UNDO_GROUP_IMAGE_ITEM_REORDER, "GIMP_UNDO_GROUP_IMAGE_ITEM_REORDER", "group-image-item-reorder" },
+    { GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, "GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE", "group-image-layers-merge" },
+    { GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, "GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE", "group-image-vectors-merge" },
+    { GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, "GIMP_UNDO_GROUP_IMAGE_QUICK_MASK", "group-image-quick-mask" },
+    { GIMP_UNDO_GROUP_IMAGE_GRID, "GIMP_UNDO_GROUP_IMAGE_GRID", "group-image-grid" },
+    { GIMP_UNDO_GROUP_GUIDE, "GIMP_UNDO_GROUP_GUIDE", "group-guide" },
+    { GIMP_UNDO_GROUP_SAMPLE_POINT, "GIMP_UNDO_GROUP_SAMPLE_POINT", "group-sample-point" },
+    { GIMP_UNDO_GROUP_DRAWABLE, "GIMP_UNDO_GROUP_DRAWABLE", "group-drawable" },
+    { GIMP_UNDO_GROUP_DRAWABLE_MOD, "GIMP_UNDO_GROUP_DRAWABLE_MOD", "group-drawable-mod" },
+    { GIMP_UNDO_GROUP_MASK, "GIMP_UNDO_GROUP_MASK", "group-mask" },
+    { GIMP_UNDO_GROUP_ITEM_VISIBILITY, "GIMP_UNDO_GROUP_ITEM_VISIBILITY", "group-item-visibility" },
+    { GIMP_UNDO_GROUP_ITEM_LINKED, "GIMP_UNDO_GROUP_ITEM_LINKED", "group-item-linked" },
+    { GIMP_UNDO_GROUP_ITEM_PROPERTIES, "GIMP_UNDO_GROUP_ITEM_PROPERTIES", "group-item-properties" },
+    { GIMP_UNDO_GROUP_ITEM_DISPLACE, "GIMP_UNDO_GROUP_ITEM_DISPLACE", "group-item-displace" },
+    { GIMP_UNDO_GROUP_ITEM_SCALE, "GIMP_UNDO_GROUP_ITEM_SCALE", "group-item-scale" },
+    { GIMP_UNDO_GROUP_ITEM_RESIZE, "GIMP_UNDO_GROUP_ITEM_RESIZE", "group-item-resize" },
+    { GIMP_UNDO_GROUP_LAYER_ADD, "GIMP_UNDO_GROUP_LAYER_ADD", "group-layer-add" },
+    { GIMP_UNDO_GROUP_LAYER_ADD_MASK, "GIMP_UNDO_GROUP_LAYER_ADD_MASK", "group-layer-add-mask" },
+    { GIMP_UNDO_GROUP_LAYER_APPLY_MASK, "GIMP_UNDO_GROUP_LAYER_APPLY_MASK", "group-layer-apply-mask" },
+    { GIMP_UNDO_GROUP_FS_TO_LAYER, "GIMP_UNDO_GROUP_FS_TO_LAYER", "group-fs-to-layer" },
+    { GIMP_UNDO_GROUP_FS_FLOAT, "GIMP_UNDO_GROUP_FS_FLOAT", "group-fs-float" },
+    { GIMP_UNDO_GROUP_FS_ANCHOR, "GIMP_UNDO_GROUP_FS_ANCHOR", "group-fs-anchor" },
+    { GIMP_UNDO_GROUP_EDIT_PASTE, "GIMP_UNDO_GROUP_EDIT_PASTE", "group-edit-paste" },
+    { GIMP_UNDO_GROUP_EDIT_CUT, "GIMP_UNDO_GROUP_EDIT_CUT", "group-edit-cut" },
+    { GIMP_UNDO_GROUP_TEXT, "GIMP_UNDO_GROUP_TEXT", "group-text" },
+    { GIMP_UNDO_GROUP_TRANSFORM, "GIMP_UNDO_GROUP_TRANSFORM", "group-transform" },
+    { GIMP_UNDO_GROUP_PAINT, "GIMP_UNDO_GROUP_PAINT", "group-paint" },
+    { GIMP_UNDO_GROUP_PARASITE_ATTACH, "GIMP_UNDO_GROUP_PARASITE_ATTACH", "group-parasite-attach" },
+    { GIMP_UNDO_GROUP_PARASITE_REMOVE, "GIMP_UNDO_GROUP_PARASITE_REMOVE", "group-parasite-remove" },
+    { GIMP_UNDO_GROUP_VECTORS_IMPORT, "GIMP_UNDO_GROUP_VECTORS_IMPORT", "group-vectors-import" },
+    { GIMP_UNDO_GROUP_MISC, "GIMP_UNDO_GROUP_MISC", "group-misc" },
+    { GIMP_UNDO_IMAGE_TYPE, "GIMP_UNDO_IMAGE_TYPE", "image-type" },
+    { GIMP_UNDO_IMAGE_PRECISION, "GIMP_UNDO_IMAGE_PRECISION", "image-precision" },
+    { GIMP_UNDO_IMAGE_SIZE, "GIMP_UNDO_IMAGE_SIZE", "image-size" },
+    { GIMP_UNDO_IMAGE_RESOLUTION, "GIMP_UNDO_IMAGE_RESOLUTION", "image-resolution" },
+    { GIMP_UNDO_IMAGE_GRID, "GIMP_UNDO_IMAGE_GRID", "image-grid" },
+    { GIMP_UNDO_IMAGE_METADATA, "GIMP_UNDO_IMAGE_METADATA", "image-metadata" },
+    { GIMP_UNDO_IMAGE_COLORMAP, "GIMP_UNDO_IMAGE_COLORMAP", "image-colormap" },
+    { GIMP_UNDO_IMAGE_COLOR_MANAGED, "GIMP_UNDO_IMAGE_COLOR_MANAGED", "image-color-managed" },
+    { GIMP_UNDO_GUIDE, "GIMP_UNDO_GUIDE", "guide" },
+    { GIMP_UNDO_SAMPLE_POINT, "GIMP_UNDO_SAMPLE_POINT", "sample-point" },
+    { GIMP_UNDO_DRAWABLE, "GIMP_UNDO_DRAWABLE", "drawable" },
+    { GIMP_UNDO_DRAWABLE_MOD, "GIMP_UNDO_DRAWABLE_MOD", "drawable-mod" },
+    { GIMP_UNDO_MASK, "GIMP_UNDO_MASK", "mask" },
+    { GIMP_UNDO_ITEM_REORDER, "GIMP_UNDO_ITEM_REORDER", "item-reorder" },
+    { GIMP_UNDO_ITEM_RENAME, "GIMP_UNDO_ITEM_RENAME", "item-rename" },
+    { GIMP_UNDO_ITEM_DISPLACE, "GIMP_UNDO_ITEM_DISPLACE", "item-displace" },
+    { GIMP_UNDO_ITEM_VISIBILITY, "GIMP_UNDO_ITEM_VISIBILITY", "item-visibility" },
+    { GIMP_UNDO_ITEM_LINKED, "GIMP_UNDO_ITEM_LINKED", "item-linked" },
+    { GIMP_UNDO_ITEM_COLOR_TAG, "GIMP_UNDO_ITEM_COLOR_TAG", "item-color-tag" },
+    { GIMP_UNDO_ITEM_LOCK_CONTENT, "GIMP_UNDO_ITEM_LOCK_CONTENT", "item-lock-content" },
+    { GIMP_UNDO_ITEM_LOCK_POSITION, "GIMP_UNDO_ITEM_LOCK_POSITION", "item-lock-position" },
+    { GIMP_UNDO_LAYER_ADD, "GIMP_UNDO_LAYER_ADD", "layer-add" },
+    { GIMP_UNDO_LAYER_REMOVE, "GIMP_UNDO_LAYER_REMOVE", "layer-remove" },
+    { GIMP_UNDO_LAYER_MODE, "GIMP_UNDO_LAYER_MODE", "layer-mode" },
+    { GIMP_UNDO_LAYER_OPACITY, "GIMP_UNDO_LAYER_OPACITY", "layer-opacity" },
+    { GIMP_UNDO_LAYER_LOCK_ALPHA, "GIMP_UNDO_LAYER_LOCK_ALPHA", "layer-lock-alpha" },
+    { GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE, "GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE", "group-layer-suspend-resize" },
+    { GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE, "GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE", "group-layer-resume-resize" },
+    { GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK, "GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK", "group-layer-suspend-mask" },
+    { GIMP_UNDO_GROUP_LAYER_RESUME_MASK, "GIMP_UNDO_GROUP_LAYER_RESUME_MASK", "group-layer-resume-mask" },
+    { GIMP_UNDO_GROUP_LAYER_START_TRANSFORM, "GIMP_UNDO_GROUP_LAYER_START_TRANSFORM", "group-layer-start-transform" },
+    { GIMP_UNDO_GROUP_LAYER_END_TRANSFORM, "GIMP_UNDO_GROUP_LAYER_END_TRANSFORM", "group-layer-end-transform" },
+    { GIMP_UNDO_GROUP_LAYER_CONVERT, "GIMP_UNDO_GROUP_LAYER_CONVERT", "group-layer-convert" },
+    { GIMP_UNDO_TEXT_LAYER, "GIMP_UNDO_TEXT_LAYER", "text-layer" },
+    { GIMP_UNDO_TEXT_LAYER_MODIFIED, "GIMP_UNDO_TEXT_LAYER_MODIFIED", "text-layer-modified" },
+    { GIMP_UNDO_TEXT_LAYER_CONVERT, "GIMP_UNDO_TEXT_LAYER_CONVERT", "text-layer-convert" },
+    { GIMP_UNDO_LAYER_MASK_ADD, "GIMP_UNDO_LAYER_MASK_ADD", "layer-mask-add" },
+    { GIMP_UNDO_LAYER_MASK_REMOVE, "GIMP_UNDO_LAYER_MASK_REMOVE", "layer-mask-remove" },
+    { GIMP_UNDO_LAYER_MASK_APPLY, "GIMP_UNDO_LAYER_MASK_APPLY", "layer-mask-apply" },
+    { GIMP_UNDO_LAYER_MASK_SHOW, "GIMP_UNDO_LAYER_MASK_SHOW", "layer-mask-show" },
+    { GIMP_UNDO_CHANNEL_ADD, "GIMP_UNDO_CHANNEL_ADD", "channel-add" },
+    { GIMP_UNDO_CHANNEL_REMOVE, "GIMP_UNDO_CHANNEL_REMOVE", "channel-remove" },
+    { GIMP_UNDO_CHANNEL_COLOR, "GIMP_UNDO_CHANNEL_COLOR", "channel-color" },
+    { GIMP_UNDO_VECTORS_ADD, "GIMP_UNDO_VECTORS_ADD", "vectors-add" },
+    { GIMP_UNDO_VECTORS_REMOVE, "GIMP_UNDO_VECTORS_REMOVE", "vectors-remove" },
+    { GIMP_UNDO_VECTORS_MOD, "GIMP_UNDO_VECTORS_MOD", "vectors-mod" },
+    { GIMP_UNDO_FS_TO_LAYER, "GIMP_UNDO_FS_TO_LAYER", "fs-to-layer" },
+    { GIMP_UNDO_TRANSFORM_GRID, "GIMP_UNDO_TRANSFORM_GRID", "transform-grid" },
+    { GIMP_UNDO_PAINT, "GIMP_UNDO_PAINT", "paint" },
+    { GIMP_UNDO_INK, "GIMP_UNDO_INK", "ink" },
+    { GIMP_UNDO_FOREGROUND_SELECT, "GIMP_UNDO_FOREGROUND_SELECT", "foreground-select" },
+    { GIMP_UNDO_PARASITE_ATTACH, "GIMP_UNDO_PARASITE_ATTACH", "parasite-attach" },
+    { GIMP_UNDO_PARASITE_REMOVE, "GIMP_UNDO_PARASITE_REMOVE", "parasite-remove" },
+    { GIMP_UNDO_CANT, "GIMP_UNDO_CANT", "cant" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_UNDO_GROUP_NONE, NC_("undo-type", "<<invalid>>"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_SCALE, NC_("undo-type", "Scale image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_RESIZE, NC_("undo-type", "Resize image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_FLIP, NC_("undo-type", "Flip image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_ROTATE, NC_("undo-type", "Rotate image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_TRANSFORM, NC_("undo-type", "Transform image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_CROP, NC_("undo-type", "Crop image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_CONVERT, NC_("undo-type", "Convert image"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE, NC_("undo-type", "Remove item"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_ITEM_REORDER, NC_("undo-type", "Reorder item"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, NC_("undo-type", "Merge layers"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, NC_("undo-type", "Merge paths"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, NC_("undo-type", "Quick Mask"), NULL },
+    { GIMP_UNDO_GROUP_IMAGE_GRID, NC_("undo-type", "Grid"), NULL },
+    { GIMP_UNDO_GROUP_GUIDE, NC_("undo-type", "Guide"), NULL },
+    { GIMP_UNDO_GROUP_SAMPLE_POINT, NC_("undo-type", "Sample Point"), NULL },
+    { GIMP_UNDO_GROUP_DRAWABLE, NC_("undo-type", "Layer/Channel"), NULL },
+    { GIMP_UNDO_GROUP_DRAWABLE_MOD, NC_("undo-type", "Layer/Channel modification"), NULL },
+    { GIMP_UNDO_GROUP_MASK, NC_("undo-type", "Selection mask"), NULL },
+    { GIMP_UNDO_GROUP_ITEM_VISIBILITY, NC_("undo-type", "Item visibility"), NULL },
+    { GIMP_UNDO_GROUP_ITEM_LINKED, NC_("undo-type", "Link/Unlink item"), NULL },
+    { GIMP_UNDO_GROUP_ITEM_PROPERTIES, NC_("undo-type", "Item properties"), NULL },
+    { GIMP_UNDO_GROUP_ITEM_DISPLACE, NC_("undo-type", "Move item"), NULL },
+    { GIMP_UNDO_GROUP_ITEM_SCALE, NC_("undo-type", "Scale item"), NULL },
+    { GIMP_UNDO_GROUP_ITEM_RESIZE, NC_("undo-type", "Resize item"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_ADD, NC_("undo-type", "Add layer"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_ADD_MASK, NC_("undo-type", "Add layer mask"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_APPLY_MASK, NC_("undo-type", "Apply layer mask"), NULL },
+    { GIMP_UNDO_GROUP_FS_TO_LAYER, NC_("undo-type", "Floating selection to layer"), NULL },
+    { GIMP_UNDO_GROUP_FS_FLOAT, NC_("undo-type", "Float selection"), NULL },
+    { GIMP_UNDO_GROUP_FS_ANCHOR, NC_("undo-type", "Anchor floating selection"), NULL },
+    { GIMP_UNDO_GROUP_EDIT_PASTE, NC_("undo-type", "Paste"), NULL },
+    { GIMP_UNDO_GROUP_EDIT_CUT, NC_("undo-type", "Cut"), NULL },
+    { GIMP_UNDO_GROUP_TEXT, NC_("undo-type", "Text"), NULL },
+    { GIMP_UNDO_GROUP_TRANSFORM, NC_("undo-type", "Transform"), NULL },
+    { GIMP_UNDO_GROUP_PAINT, NC_("undo-type", "Paint"), NULL },
+    { GIMP_UNDO_GROUP_PARASITE_ATTACH, NC_("undo-type", "Attach parasite"), NULL },
+    { GIMP_UNDO_GROUP_PARASITE_REMOVE, NC_("undo-type", "Remove parasite"), NULL },
+    { GIMP_UNDO_GROUP_VECTORS_IMPORT, NC_("undo-type", "Import paths"), NULL },
+    { GIMP_UNDO_GROUP_MISC, NC_("undo-type", "Plug-In"), NULL },
+    { GIMP_UNDO_IMAGE_TYPE, NC_("undo-type", "Image type"), NULL },
+    { GIMP_UNDO_IMAGE_PRECISION, NC_("undo-type", "Image precision"), NULL },
+    { GIMP_UNDO_IMAGE_SIZE, NC_("undo-type", "Image size"), NULL },
+    { GIMP_UNDO_IMAGE_RESOLUTION, NC_("undo-type", "Image resolution change"), NULL },
+    { GIMP_UNDO_IMAGE_GRID, NC_("undo-type", "Grid"), NULL },
+    { GIMP_UNDO_IMAGE_METADATA, NC_("undo-type", "Change metadata"), NULL },
+    { GIMP_UNDO_IMAGE_COLORMAP, NC_("undo-type", "Change indexed palette"), NULL },
+    { GIMP_UNDO_IMAGE_COLOR_MANAGED, NC_("undo-type", "Change color managed state"), NULL },
+    { GIMP_UNDO_GUIDE, NC_("undo-type", "Guide"), NULL },
+    { GIMP_UNDO_SAMPLE_POINT, NC_("undo-type", "Sample Point"), NULL },
+    { GIMP_UNDO_DRAWABLE, NC_("undo-type", "Layer/Channel"), NULL },
+    { GIMP_UNDO_DRAWABLE_MOD, NC_("undo-type", "Layer/Channel modification"), NULL },
+    { GIMP_UNDO_MASK, NC_("undo-type", "Selection mask"), NULL },
+    { GIMP_UNDO_ITEM_REORDER, NC_("undo-type", "Reorder item"), NULL },
+    { GIMP_UNDO_ITEM_RENAME, NC_("undo-type", "Rename item"), NULL },
+    { GIMP_UNDO_ITEM_DISPLACE, NC_("undo-type", "Move item"), NULL },
+    { GIMP_UNDO_ITEM_VISIBILITY, NC_("undo-type", "Item visibility"), NULL },
+    { GIMP_UNDO_ITEM_LINKED, NC_("undo-type", "Link/Unlink item"), NULL },
+    { GIMP_UNDO_ITEM_COLOR_TAG, NC_("undo-type", "Item color tag"), NULL },
+    { GIMP_UNDO_ITEM_LOCK_CONTENT, NC_("undo-type", "Lock/Unlock content"), NULL },
+    { GIMP_UNDO_ITEM_LOCK_POSITION, NC_("undo-type", "Lock/Unlock position"), NULL },
+    { GIMP_UNDO_LAYER_ADD, NC_("undo-type", "New layer"), NULL },
+    { GIMP_UNDO_LAYER_REMOVE, NC_("undo-type", "Delete layer"), NULL },
+    { GIMP_UNDO_LAYER_MODE, NC_("undo-type", "Set layer mode"), NULL },
+    { GIMP_UNDO_LAYER_OPACITY, NC_("undo-type", "Set layer opacity"), NULL },
+    { GIMP_UNDO_LAYER_LOCK_ALPHA, NC_("undo-type", "Lock/Unlock alpha channel"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE, NC_("undo-type", "Suspend group layer resize"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE, NC_("undo-type", "Resume group layer resize"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK, NC_("undo-type", "Suspend group layer mask"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_RESUME_MASK, NC_("undo-type", "Resume group layer mask"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_START_TRANSFORM, NC_("undo-type", "Start transforming group layer"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_END_TRANSFORM, NC_("undo-type", "End transforming group layer"), NULL },
+    { GIMP_UNDO_GROUP_LAYER_CONVERT, NC_("undo-type", "Convert group layer"), NULL },
+    { GIMP_UNDO_TEXT_LAYER, NC_("undo-type", "Text layer"), NULL },
+    { GIMP_UNDO_TEXT_LAYER_MODIFIED, NC_("undo-type", "Text layer modification"), NULL },
+    { GIMP_UNDO_TEXT_LAYER_CONVERT, NC_("undo-type", "Convert text layer"), NULL },
+    { GIMP_UNDO_LAYER_MASK_ADD, NC_("undo-type", "Add layer mask"), NULL },
+    { GIMP_UNDO_LAYER_MASK_REMOVE, NC_("undo-type", "Delete layer mask"), NULL },
+    { GIMP_UNDO_LAYER_MASK_APPLY, NC_("undo-type", "Apply layer mask"), NULL },
+    { GIMP_UNDO_LAYER_MASK_SHOW, NC_("undo-type", "Show layer mask"), NULL },
+    { GIMP_UNDO_CHANNEL_ADD, NC_("undo-type", "New channel"), NULL },
+    { GIMP_UNDO_CHANNEL_REMOVE, NC_("undo-type", "Delete channel"), NULL },
+    { GIMP_UNDO_CHANNEL_COLOR, NC_("undo-type", "Channel color"), NULL },
+    { GIMP_UNDO_VECTORS_ADD, NC_("undo-type", "New path"), NULL },
+    { GIMP_UNDO_VECTORS_REMOVE, NC_("undo-type", "Delete path"), NULL },
+    { GIMP_UNDO_VECTORS_MOD, NC_("undo-type", "Path modification"), NULL },
+    { GIMP_UNDO_FS_TO_LAYER, NC_("undo-type", "Floating selection to layer"), NULL },
+    { GIMP_UNDO_TRANSFORM_GRID, NC_("undo-type", "Transform grid"), NULL },
+    { GIMP_UNDO_PAINT, NC_("undo-type", "Paint"), NULL },
+    { GIMP_UNDO_INK, NC_("undo-type", "Ink"), NULL },
+    { GIMP_UNDO_FOREGROUND_SELECT, NC_("undo-type", "Select foreground"), NULL },
+    { GIMP_UNDO_PARASITE_ATTACH, NC_("undo-type", "Attach parasite"), NULL },
+    { GIMP_UNDO_PARASITE_REMOVE, NC_("undo-type", "Remove parasite"), NULL },
+    { GIMP_UNDO_CANT, NC_("undo-type", "Not undoable"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpUndoType", values);
+      gimp_type_set_translation_context (type, "undo-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_view_size_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_VIEW_SIZE_TINY, "GIMP_VIEW_SIZE_TINY", "tiny" },
+    { GIMP_VIEW_SIZE_EXTRA_SMALL, "GIMP_VIEW_SIZE_EXTRA_SMALL", "extra-small" },
+    { GIMP_VIEW_SIZE_SMALL, "GIMP_VIEW_SIZE_SMALL", "small" },
+    { GIMP_VIEW_SIZE_MEDIUM, "GIMP_VIEW_SIZE_MEDIUM", "medium" },
+    { GIMP_VIEW_SIZE_LARGE, "GIMP_VIEW_SIZE_LARGE", "large" },
+    { GIMP_VIEW_SIZE_EXTRA_LARGE, "GIMP_VIEW_SIZE_EXTRA_LARGE", "extra-large" },
+    { GIMP_VIEW_SIZE_HUGE, "GIMP_VIEW_SIZE_HUGE", "huge" },
+    { GIMP_VIEW_SIZE_ENORMOUS, "GIMP_VIEW_SIZE_ENORMOUS", "enormous" },
+    { GIMP_VIEW_SIZE_GIGANTIC, "GIMP_VIEW_SIZE_GIGANTIC", "gigantic" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_VIEW_SIZE_TINY, NC_("view-size", "Tiny"), NULL },
+    { GIMP_VIEW_SIZE_EXTRA_SMALL, NC_("view-size", "Very small"), NULL },
+    { GIMP_VIEW_SIZE_SMALL, NC_("view-size", "Small"), NULL },
+    { GIMP_VIEW_SIZE_MEDIUM, NC_("view-size", "Medium"), NULL },
+    { GIMP_VIEW_SIZE_LARGE, NC_("view-size", "Large"), NULL },
+    { GIMP_VIEW_SIZE_EXTRA_LARGE, NC_("view-size", "Very large"), NULL },
+    { GIMP_VIEW_SIZE_HUGE, NC_("view-size", "Huge"), NULL },
+    { GIMP_VIEW_SIZE_ENORMOUS, NC_("view-size", "Enormous"), NULL },
+    { GIMP_VIEW_SIZE_GIGANTIC, NC_("view-size", "Gigantic"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpViewSize", values);
+      gimp_type_set_translation_context (type, "view-size");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_view_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_VIEW_TYPE_LIST, "GIMP_VIEW_TYPE_LIST", "list" },
+    { GIMP_VIEW_TYPE_GRID, "GIMP_VIEW_TYPE_GRID", "grid" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_VIEW_TYPE_LIST, NC_("view-type", "View as list"), NULL },
+    { GIMP_VIEW_TYPE_GRID, NC_("view-type", "View as grid"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpViewType", values);
+      gimp_type_set_translation_context (type, "view-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
new file mode 100644
index 0000000..8826145
--- /dev/null
+++ b/app/core/core-enums.h
@@ -0,0 +1,701 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CORE_ENUMS_H__
+#define __CORE_ENUMS_H__
+
+
+#if 0
+   This file is parsed by two scripts, enumgen.pl in pdb,
+   and gimp-mkenums. All enums that are not marked with
+   /*< pdb-skip >*/ are exported to libgimp and the PDB. Enums that are
+   not marked with /*< skip >*/ are registered with the GType system.
+   If you want the enum to be skipped by both scripts, you have to use
+   /*< pdb-skip, skip >*/.
+
+   The same syntax applies to enum values.
+#endif
+
+
+/*
+ * these enums are registered with the type system
+ */
+
+
+#define GIMP_TYPE_ALIGN_REFERENCE_TYPE (gimp_align_reference_type_get_type ())
+
+GType gimp_align_reference_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_ALIGN_REFERENCE_FIRST,          /*< desc="First item"     >*/
+  GIMP_ALIGN_REFERENCE_IMAGE,          /*< desc="Image"          >*/
+  GIMP_ALIGN_REFERENCE_SELECTION,      /*< desc="Selection"      >*/
+  GIMP_ALIGN_REFERENCE_ACTIVE_LAYER,   /*< desc="Active layer"   >*/
+  GIMP_ALIGN_REFERENCE_ACTIVE_CHANNEL, /*< desc="Active channel" >*/
+  GIMP_ALIGN_REFERENCE_ACTIVE_PATH     /*< desc="Active path"    >*/
+} GimpAlignReferenceType;
+
+
+#define GIMP_TYPE_ALIGNMENT_TYPE (gimp_alignment_type_get_type ())
+
+GType gimp_alignment_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_ALIGN_LEFT,
+  GIMP_ALIGN_HCENTER,
+  GIMP_ALIGN_RIGHT,
+  GIMP_ALIGN_TOP,
+  GIMP_ALIGN_VCENTER,
+  GIMP_ALIGN_BOTTOM,
+  GIMP_ARRANGE_LEFT,
+  GIMP_ARRANGE_HCENTER,
+  GIMP_ARRANGE_RIGHT,
+  GIMP_ARRANGE_TOP,
+  GIMP_ARRANGE_VCENTER,
+  GIMP_ARRANGE_BOTTOM,
+  GIMP_ARRANGE_HFILL,
+  GIMP_ARRANGE_VFILL
+} GimpAlignmentType;
+
+
+#define GIMP_TYPE_CHANNEL_BORDER_STYLE (gimp_channel_border_style_get_type ())
+
+GType gimp_channel_border_style_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_CHANNEL_BORDER_STYLE_HARD,     /*< desc="Hard"      >*/
+  GIMP_CHANNEL_BORDER_STYLE_SMOOTH,   /*< desc="Smooth"    >*/
+  GIMP_CHANNEL_BORDER_STYLE_FEATHERED /*< desc="Feathered" >*/
+} GimpChannelBorderStyle;
+
+
+/*  Note: when appending values here, don't forget to update
+ *  GimpColorFrame and other places use this enum to create combo
+ *  boxes.
+ */
+#define GIMP_TYPE_COLOR_PICK_MODE (gimp_color_pick_mode_get_type ())
+
+GType gimp_color_pick_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_COLOR_PICK_MODE_PIXEL,       /*< desc="Pixel"        >*/
+  GIMP_COLOR_PICK_MODE_RGB_PERCENT, /*< desc="RGB (%)"      >*/
+  GIMP_COLOR_PICK_MODE_RGB_U8,      /*< desc="RGB (0..255)" >*/
+  GIMP_COLOR_PICK_MODE_HSV,         /*< desc="HSV"          >*/
+  GIMP_COLOR_PICK_MODE_LCH,         /*< desc="CIE LCh"      >*/
+  GIMP_COLOR_PICK_MODE_LAB,         /*< desc="CIE LAB"      >*/
+  GIMP_COLOR_PICK_MODE_CMYK,        /*< desc="CMYK"         >*/
+  GIMP_COLOR_PICK_MODE_XYY,         /*< desc="CIE xyY"      >*/
+  GIMP_COLOR_PICK_MODE_YUV,         /*< desc="CIE Yu'v'"      >*/
+
+  GIMP_COLOR_PICK_MODE_LAST = GIMP_COLOR_PICK_MODE_YUV /*< skip >*/
+} GimpColorPickMode;
+
+
+#define GIMP_TYPE_COLOR_PROFILE_POLICY (gimp_color_profile_policy_get_type ())
+
+GType gimp_color_profile_policy_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_COLOR_PROFILE_POLICY_ASK,    /*< desc="Ask what to do"           >*/
+  GIMP_COLOR_PROFILE_POLICY_KEEP,   /*< desc="Keep embedded profile"    >*/
+  GIMP_COLOR_PROFILE_POLICY_CONVERT /*< desc="Convert to built-in sRGB or grayscale profile" >*/
+} GimpColorProfilePolicy;
+
+
+#define GIMP_TYPE_COMPONENT_MASK (gimp_component_mask_get_type ())
+
+GType gimp_component_mask_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< pdb-skip >*/
+{
+  GIMP_COMPONENT_MASK_RED   = 1 << 0,
+  GIMP_COMPONENT_MASK_GREEN = 1 << 1,
+  GIMP_COMPONENT_MASK_BLUE  = 1 << 2,
+  GIMP_COMPONENT_MASK_ALPHA = 1 << 3,
+
+  GIMP_COMPONENT_MASK_ALL = (GIMP_COMPONENT_MASK_RED   |
+                             GIMP_COMPONENT_MASK_GREEN |
+                             GIMP_COMPONENT_MASK_BLUE  |
+                             GIMP_COMPONENT_MASK_ALPHA)
+} GimpComponentMask;
+
+
+#define GIMP_TYPE_CONTAINER_POLICY (gimp_container_policy_get_type ())
+
+GType gimp_container_policy_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_CONTAINER_POLICY_STRONG,
+  GIMP_CONTAINER_POLICY_WEAK
+} GimpContainerPolicy;
+
+
+#define GIMP_TYPE_CONVERT_DITHER_TYPE (gimp_convert_dither_type_get_type ())
+
+GType gimp_convert_dither_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CONVERT_DITHER_NONE,        /*< desc="None"                                     >*/
+  GIMP_CONVERT_DITHER_FS,          /*< desc="Floyd-Steinberg (normal)"                 >*/
+  GIMP_CONVERT_DITHER_FS_LOWBLEED, /*< desc="Floyd-Steinberg (reduced color bleeding)" >*/
+  GIMP_CONVERT_DITHER_FIXED,       /*< desc="Positioned"                               >*/
+  GIMP_CONVERT_DITHER_NODESTRUCT   /*< pdb-skip, skip >*/
+} GimpConvertDitherType;
+
+
+#define GIMP_TYPE_CONVOLUTION_TYPE (gimp_convolution_type_get_type ())
+
+GType gimp_convolution_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_NORMAL_CONVOL,      /*  Negative numbers truncated  */
+  GIMP_ABSOLUTE_CONVOL,    /*  Absolute value              */
+  GIMP_NEGATIVE_CONVOL     /*  add 127 to values           */
+} GimpConvolutionType;
+
+
+#define GIMP_TYPE_CURVE_POINT_TYPE (gimp_curve_point_type_get_type ())
+
+GType gimp_curve_point_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_CURVE_POINT_SMOOTH,   /*< desc="Smooth" >*/
+  GIMP_CURVE_POINT_CORNER    /*< desc="Corner" >*/
+} GimpCurvePointType;
+
+
+#define GIMP_TYPE_CURVE_TYPE (gimp_curve_type_get_type ())
+
+GType gimp_curve_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_CURVE_SMOOTH,   /*< desc="Smooth"   >*/
+  GIMP_CURVE_FREE      /*< desc="Freehand" >*/
+} GimpCurveType;
+
+
+#define GIMP_TYPE_DASH_PRESET (gimp_dash_preset_get_type ())
+
+GType gimp_dash_preset_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_DASH_CUSTOM,       /*< desc="Custom"         >*/
+  GIMP_DASH_LINE,         /*< desc="Line"           >*/
+  GIMP_DASH_LONG_DASH,    /*< desc="Long dashes"    >*/
+  GIMP_DASH_MEDIUM_DASH,  /*< desc="Medium dashes"  >*/
+  GIMP_DASH_SHORT_DASH,   /*< desc="Short dashes"   >*/
+  GIMP_DASH_SPARSE_DOTS,  /*< desc="Sparse dots"    >*/
+  GIMP_DASH_NORMAL_DOTS,  /*< desc="Normal dots"    >*/
+  GIMP_DASH_DENSE_DOTS,   /*< desc="Dense dots"     >*/
+  GIMP_DASH_STIPPLES,     /*< desc="Stipples"       >*/
+  GIMP_DASH_DASH_DOT,     /*< desc="Dash, dot"      >*/
+  GIMP_DASH_DASH_DOT_DOT  /*< desc="Dash, dot, dot" >*/
+} GimpDashPreset;
+
+
+#define GIMP_TYPE_DEBUG_POLICY (gimp_debug_policy_get_type ())
+
+GType gimp_debug_policy_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_DEBUG_POLICY_WARNING,    /*< desc="Debug warnings, critical errors and crashes" >*/
+  GIMP_DEBUG_POLICY_CRITICAL,   /*< desc="Debug critical errors and crashes"           >*/
+  GIMP_DEBUG_POLICY_FATAL,      /*< desc="Debug crashes only"                          >*/
+  GIMP_DEBUG_POLICY_NEVER       /*< desc="Never debug GIMP"                            >*/
+} GimpDebugPolicy;
+
+
+#define GIMP_TYPE_DIRTY_MASK (gimp_dirty_mask_get_type ())
+
+GType gimp_dirty_mask_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_DIRTY_NONE            = 0,
+
+  GIMP_DIRTY_IMAGE           = 1 << 0,
+  GIMP_DIRTY_IMAGE_SIZE      = 1 << 1,
+  GIMP_DIRTY_IMAGE_META      = 1 << 2,
+  GIMP_DIRTY_IMAGE_STRUCTURE = 1 << 3,
+  GIMP_DIRTY_ITEM            = 1 << 4,
+  GIMP_DIRTY_ITEM_META       = 1 << 5,
+  GIMP_DIRTY_DRAWABLE        = 1 << 6,
+  GIMP_DIRTY_VECTORS         = 1 << 7,
+  GIMP_DIRTY_SELECTION       = 1 << 8,
+  GIMP_DIRTY_ACTIVE_DRAWABLE = 1 << 9,
+
+  GIMP_DIRTY_ALL             = 0xffff
+} GimpDirtyMask;
+
+
+#define GIMP_TYPE_DYNAMICS_OUTPUT_TYPE (gimp_dynamics_output_type_get_type ())
+
+GType gimp_dynamics_output_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_DYNAMICS_OUTPUT_OPACITY,      /*< desc="Opacity"      >*/
+  GIMP_DYNAMICS_OUTPUT_SIZE,         /*< desc="Size"         >*/
+  GIMP_DYNAMICS_OUTPUT_ANGLE,        /*< desc="Angle"        >*/
+  GIMP_DYNAMICS_OUTPUT_COLOR,        /*< desc="Color"        >*/
+  GIMP_DYNAMICS_OUTPUT_HARDNESS,     /*< desc="Hardness"     >*/
+  GIMP_DYNAMICS_OUTPUT_FORCE,        /*< desc="Force"        >*/
+  GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO, /*< desc="Aspect ratio" >*/
+  GIMP_DYNAMICS_OUTPUT_SPACING,      /*< desc="Spacing"      >*/
+  GIMP_DYNAMICS_OUTPUT_RATE,         /*< desc="Rate"         >*/
+  GIMP_DYNAMICS_OUTPUT_FLOW,         /*< desc="Flow"         >*/
+  GIMP_DYNAMICS_OUTPUT_JITTER,       /*< desc="Jitter"       >*/
+} GimpDynamicsOutputType;
+
+
+#define GIMP_TYPE_FILL_STYLE (gimp_fill_style_get_type ())
+
+GType gimp_fill_style_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_FILL_STYLE_SOLID,  /*< desc="Solid color" >*/
+  GIMP_FILL_STYLE_PATTERN /*< desc="Pattern"     >*/
+} GimpFillStyle;
+
+
+#define GIMP_TYPE_FILTER_REGION (gimp_filter_region_get_type ())
+
+GType gimp_filter_region_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_FILTER_REGION_SELECTION, /*< desc="Use the selection as input"    >*/
+  GIMP_FILTER_REGION_DRAWABLE   /*< desc="Use the entire layer as input" >*/
+} GimpFilterRegion;
+
+
+#define GIMP_TYPE_GRADIENT_COLOR (gimp_gradient_color_get_type ())
+
+GType gimp_gradient_color_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_GRADIENT_COLOR_FIXED,                  /*< desc="Fixed"                                           >*/
+  GIMP_GRADIENT_COLOR_FOREGROUND,             /*< desc="Foreground color",               abbrev="FG"     >*/
+  GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT, /*< desc="Foreground color (transparent)",  abbrev="FG (t)" >*/
+  GIMP_GRADIENT_COLOR_BACKGROUND,             /*< desc="Background color",               abbrev="BG"     >*/
+  GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT  /*< desc="Background color (transparent)", abbrev="BG (t)" >*/
+} GimpGradientColor;
+
+
+#define GIMP_TYPE_GRAVITY_TYPE (gimp_gravity_type_get_type ())
+
+GType gimp_gravity_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_GRAVITY_NONE,
+  GIMP_GRAVITY_NORTH_WEST,
+  GIMP_GRAVITY_NORTH,
+  GIMP_GRAVITY_NORTH_EAST,
+  GIMP_GRAVITY_WEST,
+  GIMP_GRAVITY_CENTER,
+  GIMP_GRAVITY_EAST,
+  GIMP_GRAVITY_SOUTH_WEST,
+  GIMP_GRAVITY_SOUTH,
+  GIMP_GRAVITY_SOUTH_EAST
+} GimpGravityType;
+
+
+#define GIMP_TYPE_GUIDE_STYLE (gimp_guide_style_get_type ())
+
+GType gimp_guide_style_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< pdb-skip >*/
+{
+  GIMP_GUIDE_STYLE_NONE,
+  GIMP_GUIDE_STYLE_NORMAL,
+  GIMP_GUIDE_STYLE_MIRROR,
+  GIMP_GUIDE_STYLE_MANDALA,
+  GIMP_GUIDE_STYLE_SPLIT_VIEW
+} GimpGuideStyle;
+
+
+#define GIMP_TYPE_HISTOGRAM_CHANNEL (gimp_histogram_channel_get_type ())
+
+GType gimp_histogram_channel_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HISTOGRAM_VALUE     = 0,  /*< desc="Value"         >*/
+  GIMP_HISTOGRAM_RED       = 1,  /*< desc="Red"           >*/
+  GIMP_HISTOGRAM_GREEN     = 2,  /*< desc="Green"         >*/
+  GIMP_HISTOGRAM_BLUE      = 3,  /*< desc="Blue"          >*/
+  GIMP_HISTOGRAM_ALPHA     = 4,  /*< desc="Alpha"         >*/
+  GIMP_HISTOGRAM_LUMINANCE = 5,  /*< desc="Luminance"     >*/
+  GIMP_HISTOGRAM_RGB       = 6   /*< desc="RGB", pdb-skip >*/
+} GimpHistogramChannel;
+
+
+#define GIMP_TYPE_ITEM_SET (gimp_item_set_get_type ())
+
+GType gimp_item_set_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_ITEM_SET_NONE,        /*< desc="None"               >*/
+  GIMP_ITEM_SET_ALL,         /*< desc="All layers"         >*/
+  GIMP_ITEM_SET_IMAGE_SIZED, /*< desc="Image-sized layers" >*/
+  GIMP_ITEM_SET_VISIBLE,     /*< desc="All visible layers" >*/
+  GIMP_ITEM_SET_LINKED       /*< desc="All linked layers"  >*/
+} GimpItemSet;
+
+
+#define GIMP_TYPE_MATTING_ENGINE (gimp_matting_engine_get_type ())
+
+GType gimp_matting_engine_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_MATTING_ENGINE_GLOBAL,  /*< desc="Matting Global" >*/
+  GIMP_MATTING_ENGINE_LEVIN,   /*< desc="Matting Levin" >*/
+} GimpMattingEngine;
+
+
+#define GIMP_TYPE_MESSAGE_SEVERITY (gimp_message_severity_get_type ())
+
+GType gimp_message_severity_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_MESSAGE_INFO,        /*< desc="Message"  >*/
+  GIMP_MESSAGE_WARNING,     /*< desc="Warning"  >*/
+  GIMP_MESSAGE_ERROR,       /*< desc="Error"    >*/
+  GIMP_MESSAGE_BUG_WARNING, /*< desc="WARNING"  >*/
+  GIMP_MESSAGE_BUG_CRITICAL /*< desc="CRITICAL" >*/
+} GimpMessageSeverity;
+
+
+#define GIMP_TYPE_PASTE_TYPE (gimp_paste_type_get_type ())
+
+GType gimp_paste_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_PASTE_TYPE_FLOATING,
+  GIMP_PASTE_TYPE_FLOATING_IN_PLACE,
+  GIMP_PASTE_TYPE_FLOATING_INTO,
+  GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE,
+  GIMP_PASTE_TYPE_NEW_LAYER,
+  GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE
+} GimpPasteType;
+
+
+#define GIMP_TYPE_THUMBNAIL_SIZE (gimp_thumbnail_size_get_type ())
+
+GType gimp_thumbnail_size_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_THUMBNAIL_SIZE_NONE    = 0,    /*< desc="No thumbnails"    >*/
+  GIMP_THUMBNAIL_SIZE_NORMAL  = 128,  /*< desc="Normal (128x128)" >*/
+  GIMP_THUMBNAIL_SIZE_LARGE   = 256   /*< desc="Large (256x256)"  >*/
+} GimpThumbnailSize;
+
+
+#define GIMP_TYPE_UNDO_EVENT (gimp_undo_event_get_type ())
+
+GType gimp_undo_event_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_UNDO_EVENT_UNDO_PUSHED,  /* a new undo has been added to the undo stack */
+  GIMP_UNDO_EVENT_UNDO_EXPIRED, /* an undo has been freed from the undo stack  */
+  GIMP_UNDO_EVENT_REDO_EXPIRED, /* a redo has been freed from the redo stack   */
+  GIMP_UNDO_EVENT_UNDO,         /* an undo has been executed                   */
+  GIMP_UNDO_EVENT_REDO,         /* a redo has been executed                    */
+  GIMP_UNDO_EVENT_UNDO_FREE,    /* all undo and redo info has been cleared     */
+  GIMP_UNDO_EVENT_UNDO_FREEZE,  /* undo has been frozen                        */
+  GIMP_UNDO_EVENT_UNDO_THAW     /* undo has been thawn                         */
+} GimpUndoEvent;
+
+
+#define GIMP_TYPE_UNDO_MODE (gimp_undo_mode_get_type ())
+
+GType gimp_undo_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< pdb-skip >*/
+{
+  GIMP_UNDO_MODE_UNDO,
+  GIMP_UNDO_MODE_REDO
+} GimpUndoMode;
+
+
+#define GIMP_TYPE_UNDO_TYPE (gimp_undo_type_get_type ())
+
+GType gimp_undo_type_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< pdb-skip >*/
+{
+  /* Type NO_UNDO_GROUP (0) is special - in the gimpimage structure it
+   * means there is no undo group currently being added to.
+   */
+  GIMP_UNDO_GROUP_NONE = 0,              /*< desc="<<invalid>>"                    >*/
+
+  GIMP_UNDO_GROUP_FIRST = GIMP_UNDO_GROUP_NONE, /*< skip >*/
+
+  GIMP_UNDO_GROUP_IMAGE_SCALE,           /*< desc="Scale image"                    >*/
+  GIMP_UNDO_GROUP_IMAGE_RESIZE,          /*< desc="Resize image"                   >*/
+  GIMP_UNDO_GROUP_IMAGE_FLIP,            /*< desc="Flip image"                     >*/
+  GIMP_UNDO_GROUP_IMAGE_ROTATE,          /*< desc="Rotate image"                   >*/
+  GIMP_UNDO_GROUP_IMAGE_TRANSFORM,       /*< desc="Transform image"                >*/
+  GIMP_UNDO_GROUP_IMAGE_CROP,            /*< desc="Crop image"                     >*/
+  GIMP_UNDO_GROUP_IMAGE_CONVERT,         /*< desc="Convert image"                  >*/
+  GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE,     /*< desc="Remove item"                    >*/
+  GIMP_UNDO_GROUP_IMAGE_ITEM_REORDER,    /*< desc="Reorder item"                   >*/
+  GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,    /*< desc="Merge layers"                   >*/
+  GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE,   /*< desc="Merge paths"                    >*/
+  GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,      /*< desc="Quick Mask"                     >*/
+  GIMP_UNDO_GROUP_IMAGE_GRID,            /*< desc="Grid"                           >*/
+  GIMP_UNDO_GROUP_GUIDE,                 /*< desc="Guide"                          >*/
+  GIMP_UNDO_GROUP_SAMPLE_POINT,          /*< desc="Sample Point"                   >*/
+  GIMP_UNDO_GROUP_DRAWABLE,              /*< desc="Layer/Channel"                  >*/
+  GIMP_UNDO_GROUP_DRAWABLE_MOD,          /*< desc="Layer/Channel modification"     >*/
+  GIMP_UNDO_GROUP_MASK,                  /*< desc="Selection mask"                 >*/
+  GIMP_UNDO_GROUP_ITEM_VISIBILITY,       /*< desc="Item visibility"                >*/
+  GIMP_UNDO_GROUP_ITEM_LINKED,           /*< desc="Link/Unlink item"               >*/
+  GIMP_UNDO_GROUP_ITEM_PROPERTIES,       /*< desc="Item properties"                >*/
+  GIMP_UNDO_GROUP_ITEM_DISPLACE,         /*< desc="Move item"                      >*/
+  GIMP_UNDO_GROUP_ITEM_SCALE,            /*< desc="Scale item"                     >*/
+  GIMP_UNDO_GROUP_ITEM_RESIZE,           /*< desc="Resize item"                    >*/
+  GIMP_UNDO_GROUP_LAYER_ADD,             /*< desc="Add layer"                      >*/
+  GIMP_UNDO_GROUP_LAYER_ADD_MASK,        /*< desc="Add layer mask"                 >*/
+  GIMP_UNDO_GROUP_LAYER_APPLY_MASK,      /*< desc="Apply layer mask"               >*/
+  GIMP_UNDO_GROUP_FS_TO_LAYER,           /*< desc="Floating selection to layer"    >*/
+  GIMP_UNDO_GROUP_FS_FLOAT,              /*< desc="Float selection"                >*/
+  GIMP_UNDO_GROUP_FS_ANCHOR,             /*< desc="Anchor floating selection"      >*/
+  GIMP_UNDO_GROUP_EDIT_PASTE,            /*< desc="Paste"                          >*/
+  GIMP_UNDO_GROUP_EDIT_CUT,              /*< desc="Cut"                            >*/
+  GIMP_UNDO_GROUP_TEXT,                  /*< desc="Text"                           >*/
+  GIMP_UNDO_GROUP_TRANSFORM,             /*< desc="Transform"                      >*/
+  GIMP_UNDO_GROUP_PAINT,                 /*< desc="Paint"                          >*/
+  GIMP_UNDO_GROUP_PARASITE_ATTACH,       /*< desc="Attach parasite"                >*/
+  GIMP_UNDO_GROUP_PARASITE_REMOVE,       /*< desc="Remove parasite"                >*/
+  GIMP_UNDO_GROUP_VECTORS_IMPORT,        /*< desc="Import paths"                   >*/
+  GIMP_UNDO_GROUP_MISC,                  /*< desc="Plug-In"                        >*/
+
+  GIMP_UNDO_GROUP_LAST = GIMP_UNDO_GROUP_MISC, /*< skip >*/
+
+  /*  Undo types which actually do something  */
+
+  GIMP_UNDO_IMAGE_TYPE,                  /*< desc="Image type"                     >*/
+  GIMP_UNDO_IMAGE_PRECISION,             /*< desc="Image precision"                >*/
+  GIMP_UNDO_IMAGE_SIZE,                  /*< desc="Image size"                     >*/
+  GIMP_UNDO_IMAGE_RESOLUTION,            /*< desc="Image resolution change"        >*/
+  GIMP_UNDO_IMAGE_GRID,                  /*< desc="Grid"                           >*/
+  GIMP_UNDO_IMAGE_METADATA,              /*< desc="Change metadata"                >*/
+  GIMP_UNDO_IMAGE_COLORMAP,              /*< desc="Change indexed palette"         >*/
+  GIMP_UNDO_IMAGE_COLOR_MANAGED,         /*< desc="Change color managed state"     >*/
+  GIMP_UNDO_GUIDE,                       /*< desc="Guide"                          >*/
+  GIMP_UNDO_SAMPLE_POINT,                /*< desc="Sample Point"                   >*/
+  GIMP_UNDO_DRAWABLE,                    /*< desc="Layer/Channel"                  >*/
+  GIMP_UNDO_DRAWABLE_MOD,                /*< desc="Layer/Channel modification"     >*/
+  GIMP_UNDO_MASK,                        /*< desc="Selection mask"                 >*/
+  GIMP_UNDO_ITEM_REORDER,                /*< desc="Reorder item"                   >*/
+  GIMP_UNDO_ITEM_RENAME,                 /*< desc="Rename item"                    >*/
+  GIMP_UNDO_ITEM_DISPLACE,               /*< desc="Move item"                      >*/
+  GIMP_UNDO_ITEM_VISIBILITY,             /*< desc="Item visibility"                >*/
+  GIMP_UNDO_ITEM_LINKED,                 /*< desc="Link/Unlink item"               >*/
+  GIMP_UNDO_ITEM_COLOR_TAG,              /*< desc="Item color tag"                 >*/
+  GIMP_UNDO_ITEM_LOCK_CONTENT,           /*< desc="Lock/Unlock content"            >*/
+  GIMP_UNDO_ITEM_LOCK_POSITION,          /*< desc="Lock/Unlock position"           >*/
+  GIMP_UNDO_LAYER_ADD,                   /*< desc="New layer"                      >*/
+  GIMP_UNDO_LAYER_REMOVE,                /*< desc="Delete layer"                   >*/
+  GIMP_UNDO_LAYER_MODE,                  /*< desc="Set layer mode"                 >*/
+  GIMP_UNDO_LAYER_OPACITY,               /*< desc="Set layer opacity"              >*/
+  GIMP_UNDO_LAYER_LOCK_ALPHA,            /*< desc="Lock/Unlock alpha channel"      >*/
+  GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE,  /*< desc="Suspend group layer resize"     >*/
+  GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE,   /*< desc="Resume group layer resize"      >*/
+  GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK,    /*< desc="Suspend group layer mask"       >*/
+  GIMP_UNDO_GROUP_LAYER_RESUME_MASK,     /*< desc="Resume group layer mask"        >*/
+  GIMP_UNDO_GROUP_LAYER_START_TRANSFORM, /*< desc="Start transforming group layer" >*/
+  GIMP_UNDO_GROUP_LAYER_END_TRANSFORM,   /*< desc="End transforming group layer"   >*/
+  GIMP_UNDO_GROUP_LAYER_CONVERT,         /*< desc="Convert group layer"            >*/
+  GIMP_UNDO_TEXT_LAYER,                  /*< desc="Text layer"                     >*/
+  GIMP_UNDO_TEXT_LAYER_MODIFIED,         /*< desc="Text layer modification"        >*/
+  GIMP_UNDO_TEXT_LAYER_CONVERT,          /*< desc="Convert text layer"             >*/
+  GIMP_UNDO_LAYER_MASK_ADD,              /*< desc="Add layer mask"                 >*/
+  GIMP_UNDO_LAYER_MASK_REMOVE,           /*< desc="Delete layer mask"              >*/
+  GIMP_UNDO_LAYER_MASK_APPLY,            /*< desc="Apply layer mask"               >*/
+  GIMP_UNDO_LAYER_MASK_SHOW,             /*< desc="Show layer mask"                >*/
+  GIMP_UNDO_CHANNEL_ADD,                 /*< desc="New channel"                    >*/
+  GIMP_UNDO_CHANNEL_REMOVE,              /*< desc="Delete channel"                 >*/
+  GIMP_UNDO_CHANNEL_COLOR,               /*< desc="Channel color"                  >*/
+  GIMP_UNDO_VECTORS_ADD,                 /*< desc="New path"                       >*/
+  GIMP_UNDO_VECTORS_REMOVE,              /*< desc="Delete path"                    >*/
+  GIMP_UNDO_VECTORS_MOD,                 /*< desc="Path modification"              >*/
+  GIMP_UNDO_FS_TO_LAYER,                 /*< desc="Floating selection to layer"    >*/
+  GIMP_UNDO_TRANSFORM_GRID,              /*< desc="Transform grid"                 >*/
+  GIMP_UNDO_PAINT,                       /*< desc="Paint"                          >*/
+  GIMP_UNDO_INK,                         /*< desc="Ink"                            >*/
+  GIMP_UNDO_FOREGROUND_SELECT,           /*< desc="Select foreground"              >*/
+  GIMP_UNDO_PARASITE_ATTACH,             /*< desc="Attach parasite"                >*/
+  GIMP_UNDO_PARASITE_REMOVE,             /*< desc="Remove parasite"                >*/
+
+  GIMP_UNDO_CANT                         /*< desc="Not undoable"                   >*/
+} GimpUndoType;
+
+
+#define GIMP_TYPE_VIEW_SIZE (gimp_view_size_get_type ())
+
+GType gimp_view_size_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_VIEW_SIZE_TINY        = 12,   /*< desc="Tiny"        >*/
+  GIMP_VIEW_SIZE_EXTRA_SMALL = 16,   /*< desc="Very small"  >*/
+  GIMP_VIEW_SIZE_SMALL       = 24,   /*< desc="Small"       >*/
+  GIMP_VIEW_SIZE_MEDIUM      = 32,   /*< desc="Medium"      >*/
+  GIMP_VIEW_SIZE_LARGE       = 48,   /*< desc="Large"       >*/
+  GIMP_VIEW_SIZE_EXTRA_LARGE = 64,   /*< desc="Very large"  >*/
+  GIMP_VIEW_SIZE_HUGE        = 96,   /*< desc="Huge"        >*/
+  GIMP_VIEW_SIZE_ENORMOUS    = 128,  /*< desc="Enormous"    >*/
+  GIMP_VIEW_SIZE_GIGANTIC    = 192   /*< desc="Gigantic"    >*/
+} GimpViewSize;
+
+
+#define GIMP_TYPE_VIEW_TYPE (gimp_view_type_get_type ())
+
+GType gimp_view_type_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_VIEW_TYPE_LIST,  /*< desc="View as list" >*/
+  GIMP_VIEW_TYPE_GRID   /*< desc="View as grid" >*/
+} GimpViewType;
+
+
+/*
+ * non-registered enums; register them if needed
+ */
+
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_CONTEXT_PROP_FIRST       =  2,
+
+  GIMP_CONTEXT_PROP_IMAGE       =  GIMP_CONTEXT_PROP_FIRST,
+  GIMP_CONTEXT_PROP_DISPLAY     =  3,
+  GIMP_CONTEXT_PROP_TOOL        =  4,
+  GIMP_CONTEXT_PROP_PAINT_INFO  =  5,
+  GIMP_CONTEXT_PROP_FOREGROUND  =  6,
+  GIMP_CONTEXT_PROP_BACKGROUND  =  7,
+  GIMP_CONTEXT_PROP_OPACITY     =  8,
+  GIMP_CONTEXT_PROP_PAINT_MODE  =  9,
+  GIMP_CONTEXT_PROP_BRUSH       = 10,
+  GIMP_CONTEXT_PROP_DYNAMICS    = 11,
+  GIMP_CONTEXT_PROP_MYBRUSH     = 12,
+  GIMP_CONTEXT_PROP_PATTERN     = 13,
+  GIMP_CONTEXT_PROP_GRADIENT    = 14,
+  GIMP_CONTEXT_PROP_PALETTE     = 15,
+  GIMP_CONTEXT_PROP_FONT        = 16,
+  GIMP_CONTEXT_PROP_TOOL_PRESET = 17,
+  GIMP_CONTEXT_PROP_BUFFER      = 18,
+  GIMP_CONTEXT_PROP_IMAGEFILE   = 19,
+  GIMP_CONTEXT_PROP_TEMPLATE    = 20,
+
+  GIMP_CONTEXT_PROP_LAST        = GIMP_CONTEXT_PROP_TEMPLATE
+} GimpContextPropType;
+
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_CONTEXT_PROP_MASK_IMAGE       = 1 <<  2,
+  GIMP_CONTEXT_PROP_MASK_DISPLAY     = 1 <<  3,
+  GIMP_CONTEXT_PROP_MASK_TOOL        = 1 <<  4,
+  GIMP_CONTEXT_PROP_MASK_PAINT_INFO  = 1 <<  5,
+  GIMP_CONTEXT_PROP_MASK_FOREGROUND  = 1 <<  6,
+  GIMP_CONTEXT_PROP_MASK_BACKGROUND  = 1 <<  7,
+  GIMP_CONTEXT_PROP_MASK_OPACITY     = 1 <<  8,
+  GIMP_CONTEXT_PROP_MASK_PAINT_MODE  = 1 <<  9,
+  GIMP_CONTEXT_PROP_MASK_BRUSH       = 1 << 10,
+  GIMP_CONTEXT_PROP_MASK_DYNAMICS    = 1 << 11,
+  GIMP_CONTEXT_PROP_MASK_MYBRUSH     = 1 << 12,
+  GIMP_CONTEXT_PROP_MASK_PATTERN     = 1 << 13,
+  GIMP_CONTEXT_PROP_MASK_GRADIENT    = 1 << 14,
+  GIMP_CONTEXT_PROP_MASK_PALETTE     = 1 << 15,
+  GIMP_CONTEXT_PROP_MASK_FONT        = 1 << 16,
+  GIMP_CONTEXT_PROP_MASK_TOOL_PRESET = 1 << 17,
+  GIMP_CONTEXT_PROP_MASK_BUFFER      = 1 << 18,
+  GIMP_CONTEXT_PROP_MASK_IMAGEFILE   = 1 << 19,
+  GIMP_CONTEXT_PROP_MASK_TEMPLATE    = 1 << 20,
+
+  /*  aliases  */
+  GIMP_CONTEXT_PROP_MASK_PAINT = (GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                                  GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                                  GIMP_CONTEXT_PROP_MASK_OPACITY    |
+                                  GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
+                                  GIMP_CONTEXT_PROP_MASK_BRUSH      |
+                                  GIMP_CONTEXT_PROP_MASK_DYNAMICS   |
+                                  GIMP_CONTEXT_PROP_MASK_PATTERN    |
+                                  GIMP_CONTEXT_PROP_MASK_GRADIENT),
+
+  GIMP_CONTEXT_PROP_MASK_ALL   = (GIMP_CONTEXT_PROP_MASK_IMAGE       |
+                                  GIMP_CONTEXT_PROP_MASK_DISPLAY     |
+                                  GIMP_CONTEXT_PROP_MASK_TOOL        |
+                                  GIMP_CONTEXT_PROP_MASK_PAINT_INFO  |
+                                  GIMP_CONTEXT_PROP_MASK_MYBRUSH     |
+                                  GIMP_CONTEXT_PROP_MASK_PALETTE     |
+                                  GIMP_CONTEXT_PROP_MASK_FONT        |
+                                  GIMP_CONTEXT_PROP_MASK_TOOL_PRESET |
+                                  GIMP_CONTEXT_PROP_MASK_BUFFER      |
+                                  GIMP_CONTEXT_PROP_MASK_IMAGEFILE   |
+                                  GIMP_CONTEXT_PROP_MASK_TEMPLATE    |
+                                  GIMP_CONTEXT_PROP_MASK_PAINT)
+} GimpContextPropMask;
+
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_IMAGE_SCALE_OK,
+  GIMP_IMAGE_SCALE_TOO_SMALL,
+  GIMP_IMAGE_SCALE_TOO_BIG
+} GimpImageScaleCheckType;
+
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_ITEM_TYPE_LAYERS   = 1 << 0,
+  GIMP_ITEM_TYPE_CHANNELS = 1 << 1,
+  GIMP_ITEM_TYPE_VECTORS  = 1 << 2,
+
+  GIMP_ITEM_TYPE_ALL      = (GIMP_ITEM_TYPE_LAYERS   |
+                             GIMP_ITEM_TYPE_CHANNELS |
+                             GIMP_ITEM_TYPE_VECTORS)
+} GimpItemTypeMask;
+
+
+#endif /* __CORE_ENUMS_H__ */
diff --git a/app/core/core-types.h b/app/core/core-types.h
new file mode 100644
index 0000000..bc331b4
--- /dev/null
+++ b/app/core/core-types.h
@@ -0,0 +1,303 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CORE_TYPES_H__
+#define __CORE_TYPES_H__
+
+
+#include "libgimpbase/gimpbasetypes.h"
+#include "libgimpmath/gimpmathtypes.h"
+#include "libgimpcolor/gimpcolortypes.h"
+#include "libgimpmodule/gimpmoduletypes.h"
+#include "libgimpthumb/gimpthumb-types.h"
+
+#include "config/config-types.h"
+
+#include "core/core-enums.h"
+
+
+/*  former base/ defines  */
+
+#define MAX_CHANNELS  4
+
+#define RED           0
+#define GREEN         1
+#define BLUE          2
+#define ALPHA         3
+
+#define GRAY          0
+#define ALPHA_G       1
+
+#define INDEXED       0
+#define ALPHA_I       1
+
+
+/*  defines  */
+
+#define GIMP_COORDS_MIN_PRESSURE      0.0
+#define GIMP_COORDS_MAX_PRESSURE      1.0
+#define GIMP_COORDS_DEFAULT_PRESSURE  1.0
+
+#define GIMP_COORDS_MIN_TILT         -1.0
+#define GIMP_COORDS_MAX_TILT          1.0
+#define GIMP_COORDS_DEFAULT_TILT      0.0
+
+#define GIMP_COORDS_MIN_WHEEL         0.0
+#define GIMP_COORDS_MAX_WHEEL         1.0
+#define GIMP_COORDS_DEFAULT_WHEEL     0.5
+
+#define GIMP_COORDS_DEFAULT_VELOCITY  0.0
+
+#define GIMP_COORDS_DEFAULT_DIRECTION 0.0
+
+#define GIMP_COORDS_DEFAULT_XSCALE    1.0
+#define GIMP_COORDS_DEFAULT_YSCALE    1.0
+
+#define GIMP_COORDS_DEFAULT_VALUES    { 0.0, 0.0, \
+                                        GIMP_COORDS_DEFAULT_PRESSURE, \
+                                        GIMP_COORDS_DEFAULT_TILT,     \
+                                        GIMP_COORDS_DEFAULT_TILT,     \
+                                        GIMP_COORDS_DEFAULT_WHEEL,    \
+                                        GIMP_COORDS_DEFAULT_VELOCITY, \
+                                        GIMP_COORDS_DEFAULT_DIRECTION,\
+                                        GIMP_COORDS_DEFAULT_XSCALE,   \
+                                        GIMP_COORDS_DEFAULT_YSCALE }
+
+
+/*  base classes  */
+
+typedef struct _GimpObject                      GimpObject;
+typedef struct _GimpViewable                    GimpViewable;
+typedef struct _GimpFilter                      GimpFilter;
+typedef struct _GimpItem                        GimpItem;
+typedef struct _GimpAuxItem                     GimpAuxItem;
+
+typedef struct _Gimp                            Gimp;
+typedef struct _GimpImage                       GimpImage;
+
+
+/*  containers  */
+
+typedef struct _GimpContainer                   GimpContainer;
+typedef struct _GimpList                        GimpList;
+typedef struct _GimpDocumentList                GimpDocumentList;
+typedef struct _GimpDrawableStack               GimpDrawableStack;
+typedef struct _GimpFilteredContainer           GimpFilteredContainer;
+typedef struct _GimpFilterStack                 GimpFilterStack;
+typedef struct _GimpItemStack                   GimpItemStack;
+typedef struct _GimpLayerStack                  GimpLayerStack;
+typedef struct _GimpTaggedContainer             GimpTaggedContainer;
+typedef struct _GimpTreeProxy                   GimpTreeProxy;
+
+
+/*  not really a container  */
+
+typedef struct _GimpItemTree                    GimpItemTree;
+
+
+/*  context objects  */
+
+typedef struct _GimpContext                     GimpContext;
+typedef struct _GimpFillOptions                 GimpFillOptions;
+typedef struct _GimpStrokeOptions               GimpStrokeOptions;
+typedef struct _GimpToolOptions                 GimpToolOptions;
+
+
+/*  info objects  */
+
+typedef struct _GimpPaintInfo                   GimpPaintInfo;
+typedef struct _GimpToolGroup                   GimpToolGroup;
+typedef struct _GimpToolInfo                    GimpToolInfo;
+typedef struct _GimpToolItem                    GimpToolItem;
+
+
+/*  data objects  */
+
+typedef struct _GimpDataFactory                 GimpDataFactory;
+typedef struct _GimpDataLoaderFactory           GimpDataLoaderFactory;
+typedef struct _GimpData                        GimpData;
+typedef struct _GimpBrush                       GimpBrush;
+typedef struct _GimpBrushCache                  GimpBrushCache;
+typedef struct _GimpBrushClipboard              GimpBrushClipboard;
+typedef struct _GimpBrushGenerated              GimpBrushGenerated;
+typedef struct _GimpBrushPipe                   GimpBrushPipe;
+typedef struct _GimpCurve                       GimpCurve;
+typedef struct _GimpDynamics                    GimpDynamics;
+typedef struct _GimpDynamicsOutput              GimpDynamicsOutput;
+typedef struct _GimpGradient                    GimpGradient;
+typedef struct _GimpMybrush                     GimpMybrush;
+typedef struct _GimpPalette                     GimpPalette;
+typedef struct _GimpPaletteMru                  GimpPaletteMru;
+typedef struct _GimpPattern                     GimpPattern;
+typedef struct _GimpPatternClipboard            GimpPatternClipboard;
+typedef struct _GimpToolPreset                  GimpToolPreset;
+typedef struct _GimpTagCache                    GimpTagCache;
+
+
+/*  drawable objects  */
+
+typedef struct _GimpDrawable                    GimpDrawable;
+typedef struct _GimpChannel                     GimpChannel;
+typedef struct _GimpLayerMask                   GimpLayerMask;
+typedef struct _GimpSelection                   GimpSelection;
+typedef struct _GimpLayer                       GimpLayer;
+typedef struct _GimpGroupLayer                  GimpGroupLayer;
+
+
+/*  auxillary image items  */
+
+typedef struct _GimpGuide                       GimpGuide;
+typedef struct _GimpSamplePoint                 GimpSamplePoint;
+
+
+/*  undo objects  */
+
+typedef struct _GimpUndo                        GimpUndo;
+typedef struct _GimpUndoStack                   GimpUndoStack;
+typedef struct _GimpUndoAccumulator             GimpUndoAccumulator;
+
+
+/* Symmetry transformations */
+
+typedef struct _GimpSymmetry                    GimpSymmetry;
+typedef struct _GimpMirror                      GimpMirror;
+typedef struct _GimpTiling                      GimpTiling;
+typedef struct _GimpMandala                     GimpMandala;
+
+
+/*  misc objects  */
+
+typedef struct _GimpAsync                       GimpAsync;
+typedef struct _GimpAsyncSet                    GimpAsyncSet;
+typedef struct _GimpBuffer                      GimpBuffer;
+typedef struct _GimpDrawableFilter              GimpDrawableFilter;
+typedef struct _GimpEnvironTable                GimpEnvironTable;
+typedef struct _GimpHistogram                   GimpHistogram;
+typedef struct _GimpIdTable                     GimpIdTable;
+typedef struct _GimpImagefile                   GimpImagefile;
+typedef struct _GimpImageProxy                  GimpImageProxy;
+typedef struct _GimpInterpreterDB               GimpInterpreterDB;
+typedef struct _GimpLineArt                     GimpLineArt;
+typedef struct _GimpObjectQueue                 GimpObjectQueue;
+typedef struct _GimpParasiteList                GimpParasiteList;
+typedef struct _GimpPdbProgress                 GimpPdbProgress;
+typedef struct _GimpProjection                  GimpProjection;
+typedef struct _GimpSettings                    GimpSettings;
+typedef struct _GimpSubProgress                 GimpSubProgress;
+typedef struct _GimpTag                         GimpTag;
+typedef struct _GimpTreeHandler                 GimpTreeHandler;
+typedef struct _GimpTriviallyCancelableWaitable GimpTriviallyCancelableWaitable;
+typedef struct _GimpUncancelableWaitable        GimpUncancelableWaitable;
+
+
+/*  interfaces  */
+
+typedef struct _GimpCancelable                  GimpCancelable;  /* dummy typedef */
+typedef struct _GimpPickable                    GimpPickable;    /* dummy typedef */
+typedef struct _GimpProgress                    GimpProgress;    /* dummy typedef */
+typedef struct _GimpProjectable                 GimpProjectable; /* dummy typedef */
+typedef struct _GimpTagged                      GimpTagged;      /* dummy typedef */
+typedef struct _GimpWaitable                    GimpWaitable;    /* dummy typedef */
+
+
+/*  non-object types  */
+
+typedef struct _GimpBacktrace                   GimpBacktrace;
+typedef struct _GimpBoundSeg                    GimpBoundSeg;
+typedef struct _GimpChunkIterator               GimpChunkIterator;
+typedef struct _GimpCoords                      GimpCoords;
+typedef struct _GimpGradientSegment             GimpGradientSegment;
+typedef struct _GimpPaletteEntry                GimpPaletteEntry;
+typedef struct _GimpScanConvert                 GimpScanConvert;
+typedef struct _GimpTempBuf                     GimpTempBuf;
+typedef         guint32                         GimpTattoo;
+
+/* The following hack is made so that we can reuse the definition
+ * the cairo definition of cairo_path_t without having to translate
+ * between our own version of a bezier description and cairos version.
+ *
+ * to avoid having to include <cairo.h> in each and every file
+ * including this file we only use the "real" definition when cairo.h
+ * already has been included and use something else.
+ *
+ * Note that if you really want to work with GimpBezierDesc (except just
+ * passing pointers to it around) you also need to include <cairo.h>.
+ */
+#ifdef CAIRO_VERSION
+typedef cairo_path_t GimpBezierDesc;
+#else
+typedef void * GimpBezierDesc;
+#endif
+
+
+/*  functions  */
+
+typedef void     (* GimpInitStatusFunc)    (const gchar *text1,
+                                            const gchar *text2,
+                                            gdouble      percentage);
+
+typedef gboolean (* GimpObjectFilterFunc)  (GimpObject  *object,
+                                            gpointer     user_data);
+
+typedef gint64   (* GimpMemsizeFunc)       (gpointer     instance,
+                                            gint64      *gui_size);
+
+typedef void     (* GimpRunAsyncFunc)      (GimpAsync   *async,
+                                            gpointer     user_data);
+
+
+/*  structs  */
+
+struct _GimpCoords
+{
+  gdouble  x;
+  gdouble  y;
+  gdouble  pressure;
+  gdouble  xtilt;
+  gdouble  ytilt;
+  gdouble  wheel;
+  gdouble  velocity;
+  gdouble  direction;
+  gdouble  xscale;  /* the view scale                */
+  gdouble  yscale;
+  gdouble  angle;   /* the view rotation angle       */
+  gboolean reflect; /* whether the view is reflected */
+  gboolean extended;
+};
+
+/*  temp hack as replacement for GdkSegment  */
+
+typedef struct _GimpSegment GimpSegment;
+
+struct _GimpSegment
+{
+  gint x1;
+  gint y1;
+  gint x2;
+  gint y2;
+};
+
+
+#include "gegl/gimp-gegl-types.h"
+#include "paint/paint-types.h"
+#include "text/text-types.h"
+#include "vectors/vectors-types.h"
+#include "pdb/pdb-types.h"
+#include "plug-in/plug-in-types.h"
+
+
+#endif /* __CORE_TYPES_H__ */
diff --git a/app/core/gimp-atomic.c b/app/core/gimp-atomic.c
new file mode 100644
index 0000000..c5a54b8
--- /dev/null
+++ b/app/core/gimp-atomic.c
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-atomic.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp-atomic.h"
+
+
+/*  GSList  */
+
+
+static GSList gimp_atomic_slist_sentinel;
+
+
+void
+gimp_atomic_slist_push_head (GSList   * volatile *list,
+                             gpointer             data)
+{
+  GSList *old_head;
+  GSList *new_head;
+
+  g_return_if_fail (list != NULL);
+
+  new_head = g_slist_alloc ();
+
+  new_head->data = data;
+
+  do
+    {
+      do
+        {
+          old_head = g_atomic_pointer_get (list);
+        }
+      while (old_head == &gimp_atomic_slist_sentinel);
+
+      new_head->next = old_head;
+    }
+  while (! g_atomic_pointer_compare_and_exchange (list, old_head, new_head));
+}
+
+gpointer
+gimp_atomic_slist_pop_head (GSList * volatile *list)
+{
+  GSList   *old_head;
+  GSList   *new_head;
+  gpointer  data;
+
+  g_return_val_if_fail (list != NULL, NULL);
+
+  do
+    {
+      do
+        {
+          old_head = g_atomic_pointer_get (list);
+        }
+      while (old_head == &gimp_atomic_slist_sentinel);
+
+      if (! old_head)
+        return NULL;
+    }
+  while (! g_atomic_pointer_compare_and_exchange (list,
+                                                  old_head,
+                                                  &gimp_atomic_slist_sentinel));
+
+  new_head = old_head->next;
+  data     = old_head->data;
+
+  g_atomic_pointer_set (list, new_head);
+
+  g_slist_free1 (old_head);
+
+  return data;
+}
diff --git a/app/core/gimp-atomic.h b/app/core/gimp-atomic.h
new file mode 100644
index 0000000..c1d71cc
--- /dev/null
+++ b/app/core/gimp-atomic.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-atomic.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ATOMIC_H__
+#define __GIMP_ATOMIC_H__
+
+
+/*  GSList  */
+
+void       gimp_atomic_slist_push_head (GSList   * volatile *list,
+                                        gpointer             data);
+gpointer   gimp_atomic_slist_pop_head  (GSList   * volatile *list);
+
+
+#endif /* __GIMP_ATOMIC_H__ */
diff --git a/app/core/gimp-batch.c b/app/core/gimp-batch.c
new file mode 100644
index 0000000..e7908a2
--- /dev/null
+++ b/app/core/gimp-batch.c
@@ -0,0 +1,203 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-batch.h"
+#include "gimpparamspecs.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimpprocedure.h"
+
+#include "gimp-intl.h"
+
+
+#define BATCH_DEFAULT_EVAL_PROC   "plug-in-script-fu-eval"
+
+
+static void  gimp_batch_exit_after_callback (Gimp          *gimp) G_GNUC_NORETURN;
+
+static void  gimp_batch_run_cmd             (Gimp          *gimp,
+                                             const gchar   *proc_name,
+                                             GimpProcedure *procedure,
+                                             GimpRunMode    run_mode,
+                                             const gchar   *cmd);
+
+
+void
+gimp_batch_run (Gimp         *gimp,
+                const gchar  *batch_interpreter,
+                const gchar **batch_commands)
+{
+  gulong  exit_id;
+
+  if (! batch_commands || ! batch_commands[0])
+    return;
+
+  exit_id = g_signal_connect_after (gimp, "exit",
+                                    G_CALLBACK (gimp_batch_exit_after_callback),
+                                    NULL);
+
+  if (! batch_interpreter)
+    {
+      batch_interpreter = g_getenv ("GIMP_BATCH_INTERPRETER");
+
+      if (! batch_interpreter)
+        {
+          batch_interpreter = BATCH_DEFAULT_EVAL_PROC;
+
+          if (gimp->be_verbose)
+            g_printerr ("No batch interpreter specified, using the default "
+                        "'%s'.\n", batch_interpreter);
+        }
+    }
+
+  /*  script-fu text console, hardcoded for backward compatibility  */
+
+  if (strcmp (batch_interpreter, "plug-in-script-fu-eval") == 0 &&
+      strcmp (batch_commands[0], "-") == 0)
+    {
+      const gchar   *proc_name = "plug-in-script-fu-text-console";
+      GimpProcedure *procedure = gimp_pdb_lookup_procedure (gimp->pdb,
+                                                            proc_name);
+
+      if (procedure)
+        gimp_batch_run_cmd (gimp, proc_name, procedure,
+                            GIMP_RUN_NONINTERACTIVE, NULL);
+      else
+        g_message (_("The batch interpreter '%s' is not available. "
+                     "Batch mode disabled."), proc_name);
+    }
+  else
+    {
+      GimpProcedure *eval_proc = gimp_pdb_lookup_procedure (gimp->pdb,
+                                                            batch_interpreter);
+
+      if (eval_proc)
+        {
+          gint i;
+
+          for (i = 0; batch_commands[i]; i++)
+            gimp_batch_run_cmd (gimp, batch_interpreter, eval_proc,
+                                GIMP_RUN_NONINTERACTIVE, batch_commands[i]);
+        }
+      else
+        {
+          g_message (_("The batch interpreter '%s' is not available. "
+                       "Batch mode disabled."), batch_interpreter);
+        }
+    }
+
+  g_signal_handler_disconnect (gimp, exit_id);
+}
+
+
+/*
+ * The purpose of this handler is to exit GIMP cleanly when the batch
+ * procedure calls the gimp-exit procedure. Without this callback, the
+ * message "batch command experienced an execution error" would appear
+ * and gimp would hang forever.
+ */
+static void
+gimp_batch_exit_after_callback (Gimp *gimp)
+{
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  gegl_exit ();
+
+  exit (EXIT_SUCCESS);
+}
+
+static void
+gimp_batch_run_cmd (Gimp          *gimp,
+                    const gchar   *proc_name,
+                    GimpProcedure *procedure,
+                    GimpRunMode    run_mode,
+                    const gchar   *cmd)
+{
+  GimpValueArray *args;
+  GimpValueArray *return_vals;
+  GError         *error = NULL;
+  gint            i     = 0;
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  if (procedure->num_args > i &&
+      GIMP_IS_PARAM_SPEC_INT32 (procedure->args[i]))
+    g_value_set_int (gimp_value_array_index (args, i++), run_mode);
+
+  if (procedure->num_args > i &&
+      GIMP_IS_PARAM_SPEC_STRING (procedure->args[i]))
+    g_value_set_static_string (gimp_value_array_index (args, i++), cmd);
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name_args (gimp->pdb,
+                                             gimp_get_user_context (gimp),
+                                             NULL, &error,
+                                             proc_name, args);
+
+  switch (g_value_get_enum (gimp_value_array_index (return_vals, 0)))
+    {
+    case GIMP_PDB_EXECUTION_ERROR:
+      if (error)
+        {
+          g_printerr ("batch command experienced an execution error:\n"
+                      "%s\n", error->message);
+        }
+      else
+        {
+          g_printerr ("batch command experienced an execution error\n");
+        }
+      break;
+
+    case GIMP_PDB_CALLING_ERROR:
+      if (error)
+        {
+          g_printerr ("batch command experienced a calling error:\n"
+                      "%s\n", error->message);
+        }
+      else
+        {
+          g_printerr ("batch command experienced a calling error\n");
+        }
+      break;
+
+    case GIMP_PDB_SUCCESS:
+      g_printerr ("batch command executed successfully\n");
+      break;
+    }
+
+  gimp_value_array_unref (return_vals);
+  gimp_value_array_unref (args);
+
+  if (error)
+    g_error_free (error);
+
+  return;
+}
diff --git a/app/core/gimp-batch.h b/app/core/gimp-batch.h
new file mode 100644
index 0000000..3e6945c
--- /dev/null
+++ b/app/core/gimp-batch.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BATCH_H__
+#define __GIMP_BATCH_H__
+
+
+void   gimp_batch_run (Gimp         *gimp,
+                       const gchar  *batch_interpreter,
+                       const gchar **batch_commands);
+
+
+#endif /* __GIMP_BATCH_H__ */
diff --git a/app/core/gimp-cairo.c b/app/core/gimp-cairo.c
new file mode 100644
index 0000000..9d5574f
--- /dev/null
+++ b/app/core/gimp-cairo.c
@@ -0,0 +1,217 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-cairo.c
+ * Copyright (C) 2010-2012  Michael Natterer <mitch@gimp.org>
+ *
+ * Some code here is based on code from librsvg that was originally
+ * written by Raph Levien <raph@artofcode.com> for Gill.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp-cairo.h"
+
+
+#define REV (2.0 * G_PI)
+
+
+static cairo_user_data_key_t surface_data_key = { 0, };
+
+
+cairo_pattern_t *
+gimp_cairo_pattern_create_stipple (const GimpRGB *fg,
+                                   const GimpRGB *bg,
+                                   gint           index,
+                                   gdouble        offset_x,
+                                   gdouble        offset_y)
+{
+  cairo_surface_t *surface;
+  cairo_pattern_t *pattern;
+  guchar          *data;
+  guchar          *d;
+  guchar           fg_r, fg_g, fg_b, fg_a;
+  guchar           bg_r, bg_g, bg_b, bg_a;
+  gint             x, y;
+
+  g_return_val_if_fail (fg != NULL, NULL);
+  g_return_val_if_fail (bg != NULL, NULL);
+
+  data = g_malloc (8 * 8 * 4);
+
+  gimp_rgba_get_uchar (fg, &fg_r, &fg_g, &fg_b, &fg_a);
+  gimp_rgba_get_uchar (bg, &bg_r, &bg_g, &bg_b, &bg_a);
+
+  d = data;
+
+  for (y = 0; y < 8; y++)
+    {
+      for (x = 0; x < 8; x++)
+        {
+          if ((x + y + index) % 8 >= 4)
+            GIMP_CAIRO_ARGB32_SET_PIXEL (d, fg_r, fg_g, fg_b, fg_a);
+          else
+            GIMP_CAIRO_ARGB32_SET_PIXEL (d, bg_r, bg_g, bg_b, bg_a);
+
+          d += 4;
+        }
+    }
+
+  surface = cairo_image_surface_create_for_data (data,
+                                                 CAIRO_FORMAT_ARGB32,
+                                                 8, 8, 8 * 4);
+  cairo_surface_set_user_data (surface, &surface_data_key,
+                               data, (cairo_destroy_func_t) g_free);
+
+  pattern = cairo_pattern_create_for_surface (surface);
+  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+
+  cairo_surface_destroy (surface);
+
+  if (offset_x != 0.0 || offset_y != 0.0)
+    {
+      cairo_matrix_t matrix;
+
+      cairo_matrix_init_translate (&matrix,
+                                   fmod (offset_x, 8),
+                                   fmod (offset_y, 8));
+      cairo_pattern_set_matrix (pattern, &matrix);
+    }
+
+  return pattern;
+}
+
+void
+gimp_cairo_arc (cairo_t *cr,
+                gdouble  center_x,
+                gdouble  center_y,
+                gdouble  radius,
+                gdouble  start_angle,
+                gdouble  slice_angle)
+{
+  g_return_if_fail (cr != NULL);
+
+  if (slice_angle >= 0)
+    {
+      cairo_arc_negative (cr, center_x, center_y, radius,
+                          - start_angle,
+                          - start_angle - slice_angle);
+    }
+  else
+    {
+      cairo_arc (cr, center_x, center_y, radius,
+                 - start_angle,
+                 - start_angle - slice_angle);
+    }
+}
+
+void
+gimp_cairo_rounded_rectangle (cairo_t *cr,
+                              gdouble  x,
+                              gdouble  y,
+                              gdouble  width,
+                              gdouble  height,
+                              gdouble  corner_radius)
+{
+  g_return_if_fail (cr != NULL);
+
+  if (width < 0.0)
+    {
+      x     += width;
+      width  = -width;
+    }
+
+  if (height < 0.0)
+    {
+      y      += height;
+      height  = -height;
+    }
+
+  corner_radius = CLAMP (corner_radius, 0.0, MIN (width, height) / 2.0);
+
+  if (corner_radius == 0.0)
+    {
+      cairo_rectangle (cr, x, y, width, height);
+
+      return;
+    }
+
+  cairo_new_sub_path (cr);
+
+  cairo_arc     (cr,
+                 x + corner_radius, y + corner_radius,
+                 corner_radius,
+                 0.50 * REV, 0.75 * REV);
+  cairo_line_to (cr,
+                 x + width - corner_radius, y);
+
+  cairo_arc     (cr,
+                 x + width - corner_radius, y + corner_radius,
+                 corner_radius,
+                 0.75 * REV, 1.00 * REV);
+  cairo_line_to (cr,
+                 x + width, y + height - corner_radius);
+
+  cairo_arc     (cr,
+                 x + width - corner_radius, y + height - corner_radius,
+                 corner_radius,
+                 0.00 * REV, 0.25 * REV);
+  cairo_line_to (cr,
+                 x + corner_radius, y + height);
+
+  cairo_arc     (cr,
+                 x + corner_radius, y + height - corner_radius,
+                 corner_radius,
+                 0.25 * REV, 0.50 * REV);
+  cairo_line_to (cr,
+                 x, y + corner_radius);
+
+  cairo_close_path (cr);
+}
+
+void
+gimp_cairo_segments (cairo_t     *cr,
+                     GimpSegment *segs,
+                     gint         n_segs)
+{
+  gint i;
+
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (segs != NULL && n_segs > 0);
+
+  for (i = 0; i < n_segs; i++)
+    {
+      if (segs[i].x1 == segs[i].x2)
+        {
+          cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1 + 0.5);
+          cairo_line_to (cr, segs[i].x2 + 0.5, segs[i].y2 - 0.5);
+        }
+      else
+        {
+          cairo_move_to (cr, segs[i].x1 + 0.5, segs[i].y1 + 0.5);
+          cairo_line_to (cr, segs[i].x2 - 0.5, segs[i].y2 + 0.5);
+        }
+    }
+}
diff --git a/app/core/gimp-cairo.h b/app/core/gimp-cairo.h
new file mode 100644
index 0000000..b767740
--- /dev/null
+++ b/app/core/gimp-cairo.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-cairo.h
+ * Copyright (C) 2010-2012  Michael Natterer <mitch@gimp.org>
+ *
+ * Some code here is based on code from librsvg that was originally
+ * written by Raph Levien <raph@artofcode.com> for Gill.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_CAIRO_H__
+#define __APP_GIMP_CAIRO_H__
+
+
+cairo_pattern_t * gimp_cairo_pattern_create_stipple (const GimpRGB   *fg,
+                                                     const GimpRGB   *bg,
+                                                     gint             index,
+                                                     gdouble          offset_x,
+                                                     gdouble          offset_y);
+
+void              gimp_cairo_arc                    (cairo_t         *cr,
+                                                     gdouble          center_x,
+                                                     gdouble          center_y,
+                                                     gdouble          radius,
+                                                     gdouble          start_angle,
+                                                     gdouble          slice_angle);
+void              gimp_cairo_rounded_rectangle      (cairo_t         *cr,
+                                                     gdouble          x,
+                                                     gdouble          y,
+                                                     gdouble          width,
+                                                     gdouble          height,
+                                                     gdouble          corner_radius);
+void              gimp_cairo_segments               (cairo_t         *cr,
+                                                     GimpSegment     *segs,
+                                                     gint             n_segs);
+
+
+#endif /* __APP_GIMP_CAIRO_H__ */
diff --git a/app/core/gimp-contexts.c b/app/core/gimp-contexts.c
new file mode 100644
index 0000000..59d1e53
--- /dev/null
+++ b/app/core/gimp-contexts.c
@@ -0,0 +1,161 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimp-contexts.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimperror.h"
+#include "gimp-contexts.h"
+#include "gimpcontext.h"
+
+#include "config/gimpconfig-file.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_contexts_init (Gimp *gimp)
+{
+  GimpContext *context;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /*  the default context contains the user's saved preferences
+   *
+   *  TODO: load from disk
+   */
+  context = gimp_context_new (gimp, "Default", NULL);
+  gimp_set_default_context (gimp, context);
+  g_object_unref (context);
+
+  /*  the initial user_context is a straight copy of the default context
+   */
+  context = gimp_context_new (gimp, "User", context);
+  gimp_set_user_context (gimp, context);
+  g_object_unref (context);
+}
+
+void
+gimp_contexts_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_set_user_context (gimp, NULL);
+  gimp_set_default_context (gimp, NULL);
+}
+
+gboolean
+gimp_contexts_load (Gimp    *gimp,
+                    GError **error)
+{
+  GFile    *file;
+  GError   *my_error = NULL;
+  gboolean  success;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file = gimp_directory_file ("contextrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  success = gimp_config_deserialize_gfile (GIMP_CONFIG (gimp_get_user_context (gimp)),
+                                           file,
+                                           NULL, &my_error);
+
+  g_object_unref (file);
+
+  if (! success)
+    {
+      if (my_error->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        {
+          g_clear_error (&my_error);
+          success = TRUE;
+        }
+      else
+        {
+          g_propagate_error (error, my_error);
+        }
+    }
+
+  return success;
+}
+
+gboolean
+gimp_contexts_save (Gimp    *gimp,
+                    GError **error)
+{
+  GFile    *file;
+  gboolean  success;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file = gimp_directory_file ("contextrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  success = gimp_config_serialize_to_gfile (GIMP_CONFIG (gimp_get_user_context (gimp)),
+                                            file,
+                                            "GIMP user context",
+                                            "end of user context",
+                                            NULL, error);
+
+  g_object_unref (file);
+
+  return success;
+}
+
+gboolean
+gimp_contexts_clear (Gimp    *gimp,
+                     GError **error)
+{
+  GFile    *file;
+  GError   *my_error = NULL;
+  gboolean  success  = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  file = gimp_directory_file ("contextrc", NULL);
+
+  if (! g_file_delete (file, NULL, &my_error) &&
+      my_error->code != G_IO_ERROR_NOT_FOUND)
+    {
+      success = FALSE;
+
+      g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                   _("Deleting \"%s\" failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+    }
+
+  g_clear_error (&my_error);
+  g_object_unref (file);
+
+  return success;
+}
diff --git a/app/core/gimp-contexts.h b/app/core/gimp-contexts.h
new file mode 100644
index 0000000..9aa402b
--- /dev/null
+++ b/app/core/gimp-contexts.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-contexts.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTEXTS_H__
+#define __GIMP_CONTEXTS_H__
+
+
+void       gimp_contexts_init  (Gimp    *gimp);
+void       gimp_contexts_exit  (Gimp    *gimp);
+
+gboolean   gimp_contexts_load  (Gimp    *gimp,
+                                GError **error);
+gboolean   gimp_contexts_save  (Gimp    *gimp,
+                                GError **error);
+
+gboolean   gimp_contexts_clear (Gimp    *gimp,
+                                GError **error);
+
+
+#endif  /*  __GIMP_CONTEXTS_H__  */
diff --git a/app/core/gimp-data-factories.c b/app/core/gimp-data-factories.c
new file mode 100644
index 0000000..69b5e2a
--- /dev/null
+++ b/app/core/gimp-data-factories.c
@@ -0,0 +1,433 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimprc.h"
+
+#include "gimp.h"
+#include "gimp-data-factories.h"
+#include "gimp-gradients.h"
+#include "gimp-memsize.h"
+#include "gimp-palettes.h"
+#include "gimpcontainer.h"
+#include "gimpbrush-load.h"
+#include "gimpbrush.h"
+#include "gimpbrushclipboard.h"
+#include "gimpbrushgenerated-load.h"
+#include "gimpbrushpipe-load.h"
+#include "gimpdataloaderfactory.h"
+#include "gimpdynamics.h"
+#include "gimpdynamics-load.h"
+#include "gimpgradient-load.h"
+#include "gimpgradient.h"
+#include "gimpmybrush-load.h"
+#include "gimpmybrush.h"
+#include "gimppalette-load.h"
+#include "gimppalette.h"
+#include "gimppattern-load.h"
+#include "gimppattern.h"
+#include "gimppatternclipboard.h"
+#include "gimptagcache.h"
+#include "gimptoolpreset.h"
+#include "gimptoolpreset-load.h"
+
+#include "text/gimpfontfactory.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_data_factories_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp->brush_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_BRUSH,
+                                  "brush-path",
+                                  "brush-path-writable",
+                                  gimp_brush_new,
+                                  gimp_brush_get_standard);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->brush_factory),
+                               "brush factory");
+  gimp_data_loader_factory_add_loader (gimp->brush_factory,
+                                       "GIMP Brush",
+                                       gimp_brush_load,
+                                       GIMP_BRUSH_FILE_EXTENSION,
+                                       TRUE);
+  gimp_data_loader_factory_add_loader (gimp->brush_factory,
+                                       "GIMP Brush Pixmap",
+                                       gimp_brush_load,
+                                       GIMP_BRUSH_PIXMAP_FILE_EXTENSION,
+                                       FALSE);
+  gimp_data_loader_factory_add_loader (gimp->brush_factory,
+                                       "Photoshop ABR Brush",
+                                       gimp_brush_load_abr,
+                                       GIMP_BRUSH_PS_FILE_EXTENSION,
+                                       FALSE);
+  gimp_data_loader_factory_add_loader (gimp->brush_factory,
+                                       "Paint Shop Pro JBR Brush",
+                                       gimp_brush_load_abr,
+                                       GIMP_BRUSH_PSP_FILE_EXTENSION,
+                                       FALSE);
+ gimp_data_loader_factory_add_loader (gimp->brush_factory,
+                                       "GIMP Generated Brush",
+                                       gimp_brush_generated_load,
+                                       GIMP_BRUSH_GENERATED_FILE_EXTENSION,
+                                       TRUE);
+  gimp_data_loader_factory_add_loader (gimp->brush_factory,
+                                       "GIMP Brush Pipe",
+                                       gimp_brush_pipe_load,
+                                       GIMP_BRUSH_PIPE_FILE_EXTENSION,
+                                       TRUE);
+
+  gimp->dynamics_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_DYNAMICS,
+                                  "dynamics-path",
+                                  "dynamics-path-writable",
+                                  gimp_dynamics_new,
+                                  gimp_dynamics_get_standard);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->dynamics_factory),
+                               "dynamics factory");
+  gimp_data_loader_factory_add_loader (gimp->dynamics_factory,
+                                       "GIMP Paint Dynamics",
+                                       gimp_dynamics_load,
+                                       GIMP_DYNAMICS_FILE_EXTENSION,
+                                       TRUE);
+
+  gimp->mybrush_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_MYBRUSH,
+                                  "mypaint-brush-path",
+                                  "mypaint-brush-path-writable",
+                                  NULL,
+                                  NULL);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->mybrush_factory),
+                               "mypaint brush factory");
+  gimp_data_loader_factory_add_loader (gimp->mybrush_factory,
+                                       "MyPaint Brush",
+                                       gimp_mybrush_load,
+                                       GIMP_MYBRUSH_FILE_EXTENSION,
+                                       FALSE);
+
+  gimp->pattern_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_PATTERN,
+                                  "pattern-path",
+                                  "pattern-path-writable",
+                                  NULL,
+                                  gimp_pattern_get_standard);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->pattern_factory),
+                               "pattern factory");
+  gimp_data_loader_factory_add_loader (gimp->pattern_factory,
+                                       "GIMP Pattern",
+                                       gimp_pattern_load,
+                                       GIMP_PATTERN_FILE_EXTENSION,
+                                       TRUE);
+  gimp_data_loader_factory_add_fallback (gimp->pattern_factory,
+                                         "Pattern from GdkPixbuf",
+                                         gimp_pattern_load_pixbuf);
+
+  gimp->gradient_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_GRADIENT,
+                                  "gradient-path",
+                                  "gradient-path-writable",
+                                  gimp_gradient_new,
+                                  gimp_gradient_get_standard);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->gradient_factory),
+                               "gradient factory");
+  gimp_data_loader_factory_add_loader (gimp->gradient_factory,
+                                       "GIMP Gradient",
+                                       gimp_gradient_load,
+                                       GIMP_GRADIENT_FILE_EXTENSION,
+                                       TRUE);
+  gimp_data_loader_factory_add_loader (gimp->gradient_factory,
+                                       "SVG Gradient",
+                                       gimp_gradient_load_svg,
+                                       GIMP_GRADIENT_SVG_FILE_EXTENSION,
+                                       FALSE);
+
+  gimp->palette_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_PALETTE,
+                                  "palette-path",
+                                  "palette-path-writable",
+                                  gimp_palette_new,
+                                  gimp_palette_get_standard);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->palette_factory),
+                               "palette factory");
+  gimp_data_loader_factory_add_loader (gimp->palette_factory,
+                                       "GIMP Palette",
+                                       gimp_palette_load,
+                                       GIMP_PALETTE_FILE_EXTENSION,
+                                       TRUE);
+
+  gimp->font_factory =
+    gimp_font_factory_new (gimp,
+                           "font-path");
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->font_factory),
+                               "font factory");
+
+  gimp->tool_preset_factory =
+    gimp_data_loader_factory_new (gimp,
+                                  GIMP_TYPE_TOOL_PRESET,
+                                  "tool-preset-path",
+                                  "tool-preset-path-writable",
+                                  gimp_tool_preset_new,
+                                  NULL);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->tool_preset_factory),
+                               "tool preset factory");
+  gimp_data_loader_factory_add_loader (gimp->tool_preset_factory,
+                                       "GIMP Tool Preset",
+                                       gimp_tool_preset_load,
+                                       GIMP_TOOL_PRESET_FILE_EXTENSION,
+                                       TRUE);
+
+  gimp->tag_cache = gimp_tag_cache_new ();
+}
+
+void
+gimp_data_factories_add_builtin (Gimp *gimp)
+{
+  GimpData *data;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /*  add the builtin FG -> BG etc. gradients  */
+  gimp_gradients_init (gimp);
+
+  /*  add the color history palette  */
+  gimp_palettes_init (gimp);
+
+  /*  add the clipboard brushes  */
+  data = gimp_brush_clipboard_new (gimp, FALSE);
+  gimp_data_make_internal (data, "gimp-brush-clipboard-image");
+  gimp_container_add (gimp_data_factory_get_container (gimp->brush_factory),
+                      GIMP_OBJECT (data));
+  g_object_unref (data);
+
+  data = gimp_brush_clipboard_new (gimp, TRUE);
+  gimp_data_make_internal (data, "gimp-brush-clipboard-mask");
+  gimp_container_add (gimp_data_factory_get_container (gimp->brush_factory),
+                      GIMP_OBJECT (data));
+  g_object_unref (data);
+
+  /*  add the clipboard pattern  */
+  data = gimp_pattern_clipboard_new (gimp);
+  gimp_data_make_internal (data, "gimp-pattern-clipboard-image");
+  gimp_container_add (gimp_data_factory_get_container (gimp->pattern_factory),
+                      GIMP_OBJECT (data));
+  g_object_unref (data);
+}
+
+void
+gimp_data_factories_clear (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->brush_factory)
+    gimp_data_factory_data_free (gimp->brush_factory);
+
+  if (gimp->dynamics_factory)
+    gimp_data_factory_data_free (gimp->dynamics_factory);
+
+  if (gimp->mybrush_factory)
+    gimp_data_factory_data_free (gimp->mybrush_factory);
+
+  if (gimp->pattern_factory)
+    gimp_data_factory_data_free (gimp->pattern_factory);
+
+  if (gimp->gradient_factory)
+    gimp_data_factory_data_free (gimp->gradient_factory);
+
+  if (gimp->palette_factory)
+    gimp_data_factory_data_free (gimp->palette_factory);
+
+  if (gimp->font_factory)
+    gimp_data_factory_data_free (gimp->font_factory);
+
+  if (gimp->tool_preset_factory)
+    gimp_data_factory_data_free (gimp->tool_preset_factory);
+}
+
+void
+gimp_data_factories_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_clear_object (&gimp->brush_factory);
+  g_clear_object (&gimp->dynamics_factory);
+  g_clear_object (&gimp->mybrush_factory);
+  g_clear_object (&gimp->pattern_factory);
+  g_clear_object (&gimp->gradient_factory);
+  g_clear_object (&gimp->palette_factory);
+  g_clear_object (&gimp->font_factory);
+  g_clear_object (&gimp->tool_preset_factory);
+  g_clear_object (&gimp->tag_cache);
+}
+
+gint64
+gimp_data_factories_get_memsize (Gimp   *gimp,
+                                 gint64 *gui_size)
+{
+  gint64 memsize = 0;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->named_buffers),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->brush_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->dynamics_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->mybrush_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->pattern_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->gradient_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->palette_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->font_factory),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->tool_preset_factory),
+                                      gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->tag_cache),
+                                      gui_size);
+
+  return memsize;
+}
+
+void
+gimp_data_factories_data_clean (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_data_factory_data_clean (gimp->brush_factory);
+  gimp_data_factory_data_clean (gimp->dynamics_factory);
+  gimp_data_factory_data_clean (gimp->mybrush_factory);
+  gimp_data_factory_data_clean (gimp->pattern_factory);
+  gimp_data_factory_data_clean (gimp->gradient_factory);
+  gimp_data_factory_data_clean (gimp->palette_factory);
+  gimp_data_factory_data_clean (gimp->font_factory);
+  gimp_data_factory_data_clean (gimp->tool_preset_factory);
+}
+
+void
+gimp_data_factories_load (Gimp               *gimp,
+                          GimpInitStatusFunc  status_callback)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /*  initialize the list of gimp brushes    */
+  status_callback (NULL, _("Brushes"), 0.1);
+  gimp_data_factory_data_init (gimp->brush_factory, gimp->user_context,
+                               gimp->no_data);
+
+  /*  initialize the list of gimp dynamics   */
+  status_callback (NULL, _("Dynamics"), 0.15);
+  gimp_data_factory_data_init (gimp->dynamics_factory, gimp->user_context,
+                               gimp->no_data);
+
+  /*  initialize the list of mypaint brushes    */
+  status_callback (NULL, _("MyPaint Brushes"), 0.2);
+  gimp_data_factory_data_init (gimp->mybrush_factory, gimp->user_context,
+                               gimp->no_data);
+
+  /*  initialize the list of gimp patterns   */
+  status_callback (NULL, _("Patterns"), 0.3);
+  gimp_data_factory_data_init (gimp->pattern_factory, gimp->user_context,
+                               gimp->no_data);
+
+  /*  initialize the list of gimp palettes   */
+  status_callback (NULL, _("Palettes"), 0.4);
+  gimp_data_factory_data_init (gimp->palette_factory, gimp->user_context,
+                               gimp->no_data);
+
+  /*  initialize the list of gimp gradients  */
+  status_callback (NULL, _("Gradients"), 0.5);
+  gimp_data_factory_data_init (gimp->gradient_factory, gimp->user_context,
+                               gimp->no_data);
+
+  /*  initialize the color history   */
+  status_callback (NULL, _("Color History"), 0.55);
+  gimp_palettes_load (gimp);
+
+  /*  initialize the list of gimp fonts   */
+  status_callback (NULL, _("Fonts"), 0.6);
+  gimp_data_factory_data_init (gimp->font_factory, gimp->user_context,
+                               gimp->no_fonts);
+
+  /*  initialize the list of gimp tool presets if we have a GUI  */
+  if (! gimp->no_interface)
+    {
+      status_callback (NULL, _("Tool Presets"), 0.7);
+      gimp_data_factory_data_init (gimp->tool_preset_factory, gimp->user_context,
+                                   gimp->no_data);
+    }
+
+  /* update tag cache */
+  status_callback (NULL, _("Updating tag cache"), 0.75);
+  gimp_tag_cache_load (gimp->tag_cache);
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->brush_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->dynamics_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->mybrush_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->pattern_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->gradient_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->palette_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->font_factory));
+  gimp_tag_cache_add_container (gimp->tag_cache,
+                                gimp_data_factory_get_container (gimp->tool_preset_factory));
+}
+
+void
+gimp_data_factories_save (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_tag_cache_save (gimp->tag_cache);
+
+  gimp_data_factory_data_save (gimp->brush_factory);
+  gimp_data_factory_data_save (gimp->dynamics_factory);
+  gimp_data_factory_data_save (gimp->mybrush_factory);
+  gimp_data_factory_data_save (gimp->pattern_factory);
+  gimp_data_factory_data_save (gimp->gradient_factory);
+  gimp_data_factory_data_save (gimp->palette_factory);
+  gimp_data_factory_data_save (gimp->font_factory);
+  gimp_data_factory_data_save (gimp->tool_preset_factory);
+
+  gimp_palettes_save (gimp);
+}
diff --git a/app/core/gimp-data-factories.h b/app/core/gimp-data-factories.h
new file mode 100644
index 0000000..d5b273d
--- /dev/null
+++ b/app/core/gimp-data-factories.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DATA_FACTORIES_H__
+#define __GIMP_DATA_FACTORIES_H__
+
+
+void      gimp_data_factories_init        (Gimp               *gimp);
+void      gimp_data_factories_add_builtin (Gimp               *gimp);
+void      gimp_data_factories_clear       (Gimp               *gimp);
+void      gimp_data_factories_exit        (Gimp               *gimp);
+
+gint64    gimp_data_factories_get_memsize (Gimp   *gimp,
+                                           gint64 *gui_size);
+void      gimp_data_factories_data_clean  (Gimp   *gimp);
+
+void      gimp_data_factories_load        (Gimp               *gimp,
+                                           GimpInitStatusFunc  status_callback);
+void      gimp_data_factories_save        (Gimp               *gimp);
+
+
+#endif /* __GIMP_DATA_FACTORIES_H__ */
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
new file mode 100644
index 0000000..372ad2d
--- /dev/null
+++ b/app/core/gimp-edit.c
@@ -0,0 +1,771 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-edit.h"
+#include "gimpbuffer.h"
+#include "gimpcontext.h"
+#include "gimpgrouplayer.h"
+#include "gimpimage.h"
+#include "gimpimage-duplicate.h"
+#include "gimpimage-new.h"
+#include "gimpimage-undo.h"
+#include "gimplayer-floating-selection.h"
+#include "gimplayer-new.h"
+#include "gimplist.h"
+#include "gimppickable.h"
+#include "gimpselection.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function protypes  */
+
+static GimpBuffer * gimp_edit_extract (GimpImage     *image,
+                                       GimpPickable  *pickable,
+                                       GimpContext   *context,
+                                       gboolean       cut_pixels,
+                                       GError       **error);
+
+
+/*  public functions  */
+
+GimpObject *
+gimp_edit_cut (GimpImage     *image,
+               GimpDrawable  *drawable,
+               GimpContext   *context,
+               GError       **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (GIMP_IS_LAYER (drawable) &&
+      gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      GimpImage *clip_image;
+      gint       off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      clip_image = gimp_image_new_from_drawable (image->gimp, drawable);
+      g_object_set_data (G_OBJECT (clip_image), "offset-x",
+                         GINT_TO_POINTER (off_x));
+      g_object_set_data (G_OBJECT (clip_image), "offset-y",
+                         GINT_TO_POINTER (off_y));
+      gimp_container_remove (image->gimp->images, GIMP_OBJECT (clip_image));
+      gimp_set_clipboard_image (image->gimp, clip_image);
+      g_object_unref (clip_image);
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_CUT,
+                                   C_("undo-type", "Cut Layer"));
+
+      gimp_image_remove_layer (image, GIMP_LAYER (drawable),
+                               TRUE, NULL);
+
+      gimp_image_undo_group_end (image);
+
+      return GIMP_OBJECT (gimp_get_clipboard_image (image->gimp));
+    }
+  else
+    {
+      GimpBuffer *buffer;
+
+      buffer = gimp_edit_extract (image, GIMP_PICKABLE (drawable),
+                                  context, TRUE, error);
+
+      if (buffer)
+        {
+          gimp_set_clipboard_buffer (image->gimp, buffer);
+          g_object_unref (buffer);
+
+          return GIMP_OBJECT (gimp_get_clipboard_buffer (image->gimp));
+        }
+    }
+
+  return NULL;
+}
+
+GimpObject *
+gimp_edit_copy (GimpImage     *image,
+                GimpDrawable  *drawable,
+                GimpContext   *context,
+                GError       **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (GIMP_IS_LAYER (drawable) &&
+      gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      GimpImage *clip_image;
+      gint       off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      clip_image = gimp_image_new_from_drawable (image->gimp, drawable);
+      g_object_set_data (G_OBJECT (clip_image), "offset-x",
+                         GINT_TO_POINTER (off_x));
+      g_object_set_data (G_OBJECT (clip_image), "offset-y",
+                         GINT_TO_POINTER (off_y));
+      gimp_container_remove (image->gimp->images, GIMP_OBJECT (clip_image));
+      gimp_set_clipboard_image (image->gimp, clip_image);
+      g_object_unref (clip_image);
+
+      return GIMP_OBJECT (gimp_get_clipboard_image (image->gimp));
+    }
+  else
+    {
+      GimpBuffer *buffer;
+
+      buffer = gimp_edit_extract (image, GIMP_PICKABLE (drawable),
+                                  context, FALSE, error);
+
+      if (buffer)
+        {
+          gimp_set_clipboard_buffer (image->gimp, buffer);
+          g_object_unref (buffer);
+
+          return GIMP_OBJECT (gimp_get_clipboard_buffer (image->gimp));
+        }
+    }
+
+  return NULL;
+}
+
+GimpBuffer *
+gimp_edit_copy_visible (GimpImage    *image,
+                        GimpContext  *context,
+                        GError      **error)
+{
+  GimpBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  buffer = gimp_edit_extract (image, GIMP_PICKABLE (image),
+                              context, FALSE, error);
+
+  if (buffer)
+    {
+      gimp_set_clipboard_buffer (image->gimp, buffer);
+      g_object_unref (buffer);
+
+      return gimp_get_clipboard_buffer (image->gimp);
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_edit_paste_is_in_place (GimpPasteType paste_type)
+{
+  switch (paste_type)
+    {
+    case GIMP_PASTE_TYPE_FLOATING:
+    case GIMP_PASTE_TYPE_FLOATING_INTO:
+    case GIMP_PASTE_TYPE_NEW_LAYER:
+      return FALSE;
+
+    case GIMP_PASTE_TYPE_FLOATING_IN_PLACE:
+    case GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE:
+    case GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE:
+      return TRUE;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+static gboolean
+gimp_edit_paste_is_floating (GimpPasteType paste_type)
+{
+  switch (paste_type)
+    {
+    case GIMP_PASTE_TYPE_FLOATING:
+    case GIMP_PASTE_TYPE_FLOATING_INTO:
+    case GIMP_PASTE_TYPE_FLOATING_IN_PLACE:
+    case GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE:
+      return TRUE;
+
+    case GIMP_PASTE_TYPE_NEW_LAYER:
+    case GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE:
+      return FALSE;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+static GimpLayer *
+gimp_edit_paste_get_layer (GimpImage     *image,
+                           GimpDrawable  *drawable,
+                           GimpObject    *paste,
+                           GimpPasteType *paste_type)
+{
+  GimpLayer  *layer = NULL;
+  const Babl *floating_format;
+
+  /*  change paste type to NEW_LAYER for cases where we can't attach a
+   *  floating selection
+   */
+  if (! drawable                                            ||
+      gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) ||
+      gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      if (gimp_edit_paste_is_in_place (*paste_type))
+        *paste_type = GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE;
+      else
+        *paste_type = GIMP_PASTE_TYPE_NEW_LAYER;
+    }
+
+  /*  floating pastes always have the pasted-to drawable's format with
+   *  alpha; if drawable == NULL, user is pasting into an empty image
+   */
+  if (drawable && gimp_edit_paste_is_floating (*paste_type))
+    floating_format = gimp_drawable_get_format_with_alpha (drawable);
+  else
+    floating_format = gimp_image_get_layer_format (image, TRUE);
+
+  if (GIMP_IS_IMAGE (paste))
+    {
+      GType layer_type;
+
+      layer = gimp_image_get_layer_iter (GIMP_IMAGE (paste))->data;
+
+      switch (*paste_type)
+        {
+        case GIMP_PASTE_TYPE_FLOATING:
+        case GIMP_PASTE_TYPE_FLOATING_IN_PLACE:
+        case GIMP_PASTE_TYPE_FLOATING_INTO:
+        case GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE:
+          /*  when pasting as floating make sure gimp_item_convert()
+           *  will turn group layers into normal layers, otherwise use
+           *  the same layer type so e.g. text information gets
+           *  preserved. See issue #2667.
+           */
+          if (GIMP_IS_GROUP_LAYER (layer))
+            layer_type = GIMP_TYPE_LAYER;
+          else
+            layer_type = G_TYPE_FROM_INSTANCE (layer);
+          break;
+
+        case GIMP_PASTE_TYPE_NEW_LAYER:
+        case GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE:
+          layer_type = G_TYPE_FROM_INSTANCE (layer);
+          break;
+
+        default:
+          g_return_val_if_reached (NULL);
+        }
+
+      layer = GIMP_LAYER (gimp_item_convert (GIMP_ITEM (layer),
+                                             image, layer_type));
+
+      switch (*paste_type)
+        {
+        case GIMP_PASTE_TYPE_FLOATING:
+        case GIMP_PASTE_TYPE_FLOATING_IN_PLACE:
+        case GIMP_PASTE_TYPE_FLOATING_INTO:
+        case GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE:
+          /*  when pasting as floating selection, get rid of the layer mask,
+           *  and make sure the layer has the right format
+           */
+          if (gimp_layer_get_mask (layer))
+            gimp_layer_apply_mask (layer, GIMP_MASK_DISCARD, FALSE);
+
+          if (gimp_drawable_get_format (GIMP_DRAWABLE (layer)) !=
+              floating_format)
+            {
+              gimp_drawable_convert_type (GIMP_DRAWABLE (layer), image,
+                                          gimp_drawable_get_base_type (drawable),
+                                          gimp_drawable_get_precision (drawable),
+                                          TRUE,
+                                          NULL,
+                                          GEGL_DITHER_NONE, GEGL_DITHER_NONE,
+                                          FALSE, NULL);
+            }
+          break;
+
+        default:
+          break;
+        }
+    }
+  else if (GIMP_IS_BUFFER (paste))
+    {
+      layer = gimp_layer_new_from_buffer (GIMP_BUFFER (paste), image,
+                                          floating_format,
+                                          _("Pasted Layer"),
+                                          GIMP_OPACITY_OPAQUE,
+                                          gimp_image_get_default_new_layer_mode (image));
+    }
+
+  return layer;
+}
+
+static void
+gimp_edit_paste_get_viewport_offset (GimpImage    *image,
+                                     GimpDrawable *drawable,
+                                     GimpObject   *paste,
+                                     gint          viewport_x,
+                                     gint          viewport_y,
+                                     gint          viewport_width,
+                                     gint          viewport_height,
+                                     gint         *offset_x,
+                                     gint         *offset_y)
+{
+  gint     image_width;
+  gint     image_height;
+  gint     width;
+  gint     height;
+  gboolean clamp_to_image = TRUE;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (drawable == NULL ||
+                    gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_VIEWABLE (paste));
+  g_return_if_fail (offset_x != NULL);
+  g_return_if_fail (offset_y != NULL);
+
+  image_width  = gimp_image_get_width  (image);
+  image_height = gimp_image_get_height (image);
+
+  gimp_viewable_get_size (GIMP_VIEWABLE (paste), &width, &height);
+
+  if (viewport_width  == image_width &&
+      viewport_height == image_height)
+    {
+      /* if the whole image is visible, act as if there was no viewport */
+
+      viewport_x      = 0;
+      viewport_y      = 0;
+      viewport_width  = 0;
+      viewport_height = 0;
+    }
+
+  if (drawable)
+    {
+      /*  if pasting to a drawable  */
+
+      GimpContainer *children;
+      gint           off_x, off_y;
+      gint           target_x, target_y;
+      gint           target_width, target_height;
+      gint           paste_x, paste_y;
+      gint           paste_width, paste_height;
+      gboolean       have_mask;
+
+      have_mask = ! gimp_channel_is_empty (gimp_image_get_mask (image));
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (drawable));
+
+      if (children && gimp_container_get_n_children (children) == 0)
+        {
+          /* treat empty layer groups as image-sized, use the selection
+           * as target
+           */
+          gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                            &target_x, &target_y,
+                            &target_width, &target_height);
+        }
+      else
+        {
+          gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                    &target_x, &target_y,
+                                    &target_width, &target_height);
+        }
+
+      if (! have_mask         &&    /* if we have no mask */
+          viewport_width  > 0 &&    /* and we have a viewport */
+          viewport_height > 0 &&
+          (width  < target_width || /* and the paste is smaller than the target */
+           height < target_height) &&
+
+          /* and the viewport intersects with the target */
+          gimp_rectangle_intersect (viewport_x, viewport_y,
+                                    viewport_width, viewport_height,
+                                    off_x, off_y, /* target_x,y are 0 */
+                                    target_width, target_height,
+                                    &paste_x, &paste_y,
+                                    &paste_width, &paste_height))
+        {
+          /*  center on the viewport  */
+
+          *offset_x = paste_x + (paste_width - width)  / 2;
+          *offset_y = paste_y + (paste_height- height) / 2;
+        }
+      else
+        {
+          /*  otherwise center on the target  */
+
+          *offset_x = off_x + target_x + (target_width  - width)  / 2;
+          *offset_y = off_y + target_y + (target_height - height) / 2;
+
+          /*  and keep it that way  */
+          clamp_to_image = FALSE;
+        }
+    }
+  else if (viewport_width  > 0 &&  /* if we have a viewport */
+           viewport_height > 0 &&
+           (width  < image_width || /* and the paste is       */
+            height < image_height)) /* smaller than the image */
+    {
+      /*  center on the viewport  */
+
+      *offset_x = viewport_x + (viewport_width  - width)  / 2;
+      *offset_y = viewport_y + (viewport_height - height) / 2;
+    }
+  else
+    {
+      /*  otherwise center on the image  */
+
+      *offset_x = (image_width  - width)  / 2;
+      *offset_y = (image_height - height) / 2;
+
+      /*  and keep it that way  */
+      clamp_to_image = FALSE;
+    }
+
+  if (clamp_to_image)
+    {
+      /*  Ensure that the pasted layer is always within the image, if it
+       *  fits and aligned at top left if it doesn't. (See bug #142944).
+       */
+      *offset_x = MIN (*offset_x, image_width  - width);
+      *offset_y = MIN (*offset_y, image_height - height);
+      *offset_x = MAX (*offset_x, 0);
+      *offset_y = MAX (*offset_y, 0);
+    }
+}
+
+static void
+gimp_edit_paste_get_paste_offset (GimpImage    *image,
+                                  GimpDrawable *drawable,
+                                  GimpObject   *paste,
+                                  gint         *offset_x,
+                                  gint         *offset_y)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (drawable == NULL ||
+                    gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_VIEWABLE (paste));
+  g_return_if_fail (offset_x != NULL);
+  g_return_if_fail (offset_y != NULL);
+
+  if (GIMP_IS_IMAGE (paste))
+    {
+      *offset_x = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (paste),
+                                                      "offset-x"));
+      *offset_y = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (paste),
+                                                      "offset-y"));
+    }
+  else if (GIMP_IS_BUFFER (paste))
+    {
+      GimpBuffer *buffer = GIMP_BUFFER (paste);
+
+      *offset_x = buffer->offset_x;
+      *offset_y = buffer->offset_y;
+    }
+}
+
+static GimpLayer *
+gimp_edit_paste_paste (GimpImage     *image,
+                       GimpDrawable  *drawable,
+                       GimpLayer     *layer,
+                       GimpPasteType  paste_type,
+                       gint           offset_x,
+                       gint           offset_y)
+{
+  gimp_item_translate (GIMP_ITEM (layer), offset_x, offset_y, FALSE);
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                               C_("undo-type", "Paste"));
+
+  switch (paste_type)
+    {
+    case GIMP_PASTE_TYPE_FLOATING:
+    case GIMP_PASTE_TYPE_FLOATING_IN_PLACE:
+      /*  if there is a selection mask clear it - this might not
+       *  always be desired, but in general, it seems like the correct
+       *  behavior
+       */
+      if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+        gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
+
+      /* fall thru */
+
+    case GIMP_PASTE_TYPE_FLOATING_INTO:
+    case GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE:
+      floating_sel_attach (layer, drawable);
+      break;
+
+    case GIMP_PASTE_TYPE_NEW_LAYER:
+    case GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE:
+      {
+        GimpLayer *parent   = NULL;
+        gint       position = 0;
+
+        /*  always add on top of a passed layer, where we would attach
+         *  a floating selection
+         */
+        if (GIMP_IS_LAYER (drawable))
+          {
+            parent   = gimp_layer_get_parent (GIMP_LAYER (drawable));
+            position = gimp_item_get_index (GIMP_ITEM (drawable));
+          }
+
+        gimp_image_add_layer (image, layer, parent, position, TRUE);
+      }
+      break;
+    }
+
+  gimp_image_undo_group_end (image);
+
+  return layer;
+}
+
+GimpLayer *
+gimp_edit_paste (GimpImage     *image,
+                 GimpDrawable  *drawable,
+                 GimpObject    *paste,
+                 GimpPasteType  paste_type,
+                 gint           viewport_x,
+                 gint           viewport_y,
+                 gint           viewport_width,
+                 gint           viewport_height)
+{
+  GimpLayer *layer;
+  gint       offset_x = 0;
+  gint       offset_y = 0;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (drawable == NULL ||
+                        gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (paste) || GIMP_IS_BUFFER (paste), NULL);
+
+  layer = gimp_edit_paste_get_layer (image, drawable, paste, &paste_type);
+
+  if (! layer)
+    return NULL;
+
+  if (gimp_edit_paste_is_in_place (paste_type))
+    {
+      gimp_edit_paste_get_paste_offset (image, drawable, paste,
+                                        &offset_x,
+                                        &offset_y);
+    }
+  else
+    {
+      gimp_edit_paste_get_viewport_offset (image, drawable, GIMP_OBJECT (layer),
+                                           viewport_x,
+                                           viewport_y,
+                                           viewport_width,
+                                           viewport_height,
+                                           &offset_x,
+                                           &offset_y);
+    }
+
+  return gimp_edit_paste_paste (image, drawable, layer, paste_type,
+                                offset_x, offset_y);
+}
+
+GimpImage *
+gimp_edit_paste_as_new_image (Gimp       *gimp,
+                              GimpObject *paste)
+{
+  GimpImage *image = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (paste) || GIMP_IS_BUFFER (paste), NULL);
+
+  if (GIMP_IS_IMAGE (paste))
+    {
+      image = gimp_image_duplicate (GIMP_IMAGE (paste));
+    }
+  else if (GIMP_IS_BUFFER (paste))
+    {
+      image = gimp_image_new_from_buffer (gimp, GIMP_BUFFER (paste));
+    }
+
+  return image;
+}
+
+const gchar *
+gimp_edit_named_cut (GimpImage     *image,
+                     const gchar   *name,
+                     GimpDrawable  *drawable,
+                     GimpContext   *context,
+                     GError       **error)
+{
+  GimpBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  buffer = gimp_edit_extract (image, GIMP_PICKABLE (drawable),
+                              context, TRUE, error);
+
+  if (buffer)
+    {
+      gimp_object_set_name (GIMP_OBJECT (buffer), name);
+      gimp_container_add (image->gimp->named_buffers, GIMP_OBJECT (buffer));
+      g_object_unref (buffer);
+
+      return gimp_object_get_name (buffer);
+    }
+
+  return NULL;
+}
+
+const gchar *
+gimp_edit_named_copy (GimpImage     *image,
+                      const gchar   *name,
+                      GimpDrawable  *drawable,
+                      GimpContext   *context,
+                      GError       **error)
+{
+  GimpBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  buffer = gimp_edit_extract (image, GIMP_PICKABLE (drawable),
+                              context, FALSE, error);
+
+  if (buffer)
+    {
+      gimp_object_set_name (GIMP_OBJECT (buffer), name);
+      gimp_container_add (image->gimp->named_buffers, GIMP_OBJECT (buffer));
+      g_object_unref (buffer);
+
+      return gimp_object_get_name (buffer);
+    }
+
+  return NULL;
+}
+
+const gchar *
+gimp_edit_named_copy_visible (GimpImage    *image,
+                              const gchar  *name,
+                              GimpContext  *context,
+                              GError      **error)
+{
+  GimpBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  buffer = gimp_edit_extract (image, GIMP_PICKABLE (image),
+                              context, FALSE, error);
+
+  if (buffer)
+    {
+      gimp_object_set_name (GIMP_OBJECT (buffer), name);
+      gimp_container_add (image->gimp->named_buffers, GIMP_OBJECT (buffer));
+      g_object_unref (buffer);
+
+      return gimp_object_get_name (buffer);
+    }
+
+  return NULL;
+}
+
+
+/*  private functions  */
+
+static GimpBuffer *
+gimp_edit_extract (GimpImage     *image,
+                   GimpPickable  *pickable,
+                   GimpContext   *context,
+                   gboolean       cut_pixels,
+                   GError       **error)
+{
+  GeglBuffer *buffer;
+  gint        offset_x;
+  gint        offset_y;
+
+  if (cut_pixels)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_CUT,
+                                 C_("undo-type", "Cut"));
+
+  /*  Cut/copy the mask portion from the image  */
+  buffer = gimp_selection_extract (GIMP_SELECTION (gimp_image_get_mask (image)),
+                                   pickable, context,
+                                   cut_pixels, FALSE, FALSE,
+                                   &offset_x, &offset_y, error);
+
+  if (cut_pixels)
+    gimp_image_undo_group_end (image);
+
+  if (buffer)
+    {
+      GimpBuffer *gimp_buffer;
+      gdouble     res_x;
+      gdouble     res_y;
+
+      gimp_buffer = gimp_buffer_new (buffer, _("Global Buffer"),
+                                     offset_x, offset_y, FALSE);
+      g_object_unref (buffer);
+
+      gimp_image_get_resolution (image, &res_x, &res_y);
+      gimp_buffer_set_resolution (gimp_buffer, res_x, res_y);
+      gimp_buffer_set_unit (gimp_buffer, gimp_image_get_unit (image));
+
+      if (GIMP_IS_COLOR_MANAGED (pickable))
+        {
+          GimpColorProfile *profile =
+            gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (pickable));
+
+          if (profile)
+            gimp_buffer_set_color_profile (gimp_buffer, profile);
+        }
+
+      return gimp_buffer;
+    }
+
+  return NULL;
+}
diff --git a/app/core/gimp-edit.h b/app/core/gimp-edit.h
new file mode 100644
index 0000000..c3d8ca5
--- /dev/null
+++ b/app/core/gimp-edit.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_EDIT_H__
+#define __GIMP_EDIT_H__
+
+
+GimpObject  * gimp_edit_cut                (GimpImage       *image,
+                                            GimpDrawable    *drawable,
+                                            GimpContext     *context,
+                                            GError         **error);
+GimpObject  * gimp_edit_copy               (GimpImage       *image,
+                                            GimpDrawable    *drawable,
+                                            GimpContext     *context,
+                                            GError         **error);
+GimpBuffer  * gimp_edit_copy_visible       (GimpImage       *image,
+                                            GimpContext     *context,
+                                            GError         **error);
+
+GimpLayer   * gimp_edit_paste              (GimpImage       *image,
+                                            GimpDrawable    *drawable,
+                                            GimpObject      *paste,
+                                            GimpPasteType    paste_type,
+                                            gint             viewport_x,
+                                            gint             viewport_y,
+                                            gint             viewport_width,
+                                            gint             viewport_height);
+GimpImage   * gimp_edit_paste_as_new_image (Gimp            *gimp,
+                                            GimpObject      *paste);
+
+const gchar * gimp_edit_named_cut          (GimpImage       *image,
+                                            const gchar     *name,
+                                            GimpDrawable    *drawable,
+                                            GimpContext     *context,
+                                            GError         **error);
+const gchar * gimp_edit_named_copy         (GimpImage       *image,
+                                            const gchar     *name,
+                                            GimpDrawable    *drawable,
+                                            GimpContext     *context,
+                                            GError         **error);
+const gchar * gimp_edit_named_copy_visible (GimpImage       *image,
+                                            const gchar     *name,
+                                            GimpContext     *context,
+                                            GError         **error);
+
+
+#endif  /*  __GIMP_EDIT_H__  */
diff --git a/app/core/gimp-filter-history.c b/app/core/gimp-filter-history.c
new file mode 100644
index 0000000..afdd6ed
--- /dev/null
+++ b/app/core/gimp-filter-history.c
@@ -0,0 +1,160 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * gimp-filter-history.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimp-filter-history.h"
+
+#include "pdb/gimpprocedure.h"
+
+
+/*  local function prototypes  */
+
+static gint   gimp_filter_history_compare (GimpProcedure *proc1,
+                                           GimpProcedure *proc2);
+
+
+/*  public functions  */
+
+gint
+gimp_filter_history_size (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+
+  return MAX (1, gimp->config->filter_history_size);
+}
+
+gint
+gimp_filter_history_length (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+
+  return g_list_length (gimp->filter_history);
+}
+
+GimpProcedure *
+gimp_filter_history_nth (Gimp  *gimp,
+                         gint   n)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_list_nth_data (gimp->filter_history, n);
+}
+
+void
+gimp_filter_history_add (Gimp          *gimp,
+                         GimpProcedure *procedure)
+{
+  GList *link;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  /* return early if the procedure is already at the top */
+  if (gimp->filter_history &&
+      gimp_filter_history_compare (gimp->filter_history->data, procedure) == 0)
+    return;
+
+  /* ref new first then unref old, they might be the same */
+  g_object_ref (procedure);
+
+  link = g_list_find_custom (gimp->filter_history, procedure,
+                             (GCompareFunc) gimp_filter_history_compare);
+
+  if (link)
+    {
+      g_object_unref (link->data);
+      gimp->filter_history = g_list_delete_link (gimp->filter_history, link);
+    }
+
+  gimp->filter_history = g_list_prepend (gimp->filter_history, procedure);
+
+  link = g_list_nth (gimp->filter_history, gimp_filter_history_size (gimp));
+
+  if (link)
+    {
+      g_object_unref (link->data);
+      gimp->filter_history = g_list_delete_link (gimp->filter_history, link);
+    }
+
+  gimp_filter_history_changed (gimp);
+}
+
+void
+gimp_filter_history_remove (Gimp          *gimp,
+                            GimpProcedure *procedure)
+{
+  GList *link;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  link = g_list_find_custom (gimp->filter_history, procedure,
+                             (GCompareFunc) gimp_filter_history_compare);
+
+  if (link)
+    {
+      g_object_unref (link->data);
+      gimp->filter_history = g_list_delete_link (gimp->filter_history, link);
+
+      gimp_filter_history_changed (gimp);
+    }
+}
+
+void
+gimp_filter_history_clear (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->filter_history)
+    {
+      g_list_free_full (gimp->filter_history, (GDestroyNotify) g_object_unref);
+      gimp->filter_history = NULL;
+
+      gimp_filter_history_changed (gimp);
+    }
+}
+
+
+/*  private functions  */
+
+static gint
+gimp_filter_history_compare (GimpProcedure *proc1,
+                             GimpProcedure *proc2)
+{
+  /*  the procedures can have the same name, but could still be two
+   *  different filters using the same operation, so also compare
+   *  their menu labels
+   */
+  return (gimp_procedure_name_compare (proc1, proc2) ||
+          strcmp (gimp_procedure_get_menu_label (proc1),
+                  gimp_procedure_get_menu_label (proc2)));
+}
diff --git a/app/core/gimp-filter-history.h b/app/core/gimp-filter-history.h
new file mode 100644
index 0000000..e74b820
--- /dev/null
+++ b/app/core/gimp-filter-history.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-filter-history.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_HISTORY_H__
+#define __GIMP_FILTER_HISTORY_H__
+
+
+gint            gimp_filter_history_size   (Gimp          *gimp);
+gint            gimp_filter_history_length (Gimp          *gimp);
+GimpProcedure * gimp_filter_history_nth    (Gimp          *gimp,
+                                            gint           n);
+void            gimp_filter_history_add    (Gimp          *gimp,
+                                            GimpProcedure *procedure);
+void            gimp_filter_history_remove (Gimp          *gimp,
+                                            GimpProcedure *procedure);
+void            gimp_filter_history_clear  (Gimp          *gimp);
+
+
+#endif /* __GIMP_FILTER_HISTORY_H__ */
diff --git a/app/core/gimp-gradients.c b/app/core/gimp-gradients.c
new file mode 100644
index 0000000..2c4ec0f
--- /dev/null
+++ b/app/core/gimp-gradients.c
@@ -0,0 +1,174 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimp-gradients.c
+ * Copyright (C) 2002 Michael Natterer  <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-gradients.h"
+#include "gimpcontext.h"
+#include "gimpcontainer.h"
+#include "gimpdatafactory.h"
+#include "gimpgradient.h"
+
+#include "gimp-intl.h"
+
+
+#define CUSTOM_KEY         "gimp-gradient-custom"
+#define FG_BG_RGB_KEY      "gimp-gradient-fg-bg-rgb"
+#define FG_BG_HARDEDGE_KEY "gimp-gradient-fg-bg-rgb-hardedge"
+#define FG_BG_HSV_CCW_KEY  "gimp-gradient-fg-bg-hsv-ccw"
+#define FG_BG_HSV_CW_KEY   "gimp-gradient-fg-bg-hsv-cw"
+#define FG_TRANSPARENT_KEY "gimp-gradient-fg-transparent"
+
+
+/*  local function prototypes  */
+
+static GimpGradient * gimp_gradients_add_gradient (Gimp        *gimp,
+                                                   const gchar *name,
+                                                   const gchar *id);
+
+
+/*  public functions  */
+
+void
+gimp_gradients_init (Gimp *gimp)
+{
+  GimpGradient *gradient;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /* Custom */
+  gradient = gimp_gradients_add_gradient (gimp,
+                                          _("Custom"),
+                                          CUSTOM_KEY);
+  g_object_set (gradient,
+                "writable", TRUE,
+                NULL);
+  gradient->segments->left_color_type  = GIMP_GRADIENT_COLOR_FOREGROUND;
+  gradient->segments->right_color_type = GIMP_GRADIENT_COLOR_BACKGROUND;
+
+  /* FG to BG (RGB) */
+  gradient = gimp_gradients_add_gradient (gimp,
+                                          _("FG to BG (RGB)"),
+                                          FG_BG_RGB_KEY);
+  gradient->segments->left_color_type  = GIMP_GRADIENT_COLOR_FOREGROUND;
+  gradient->segments->right_color_type = GIMP_GRADIENT_COLOR_BACKGROUND;
+  gimp_context_set_gradient (gimp->user_context, gradient);
+
+  /* FG to BG (Hardedge) */
+  gradient = gimp_gradients_add_gradient (gimp,
+                                          _("FG to BG (Hardedge)"),
+                                          FG_BG_HARDEDGE_KEY);
+  gradient->segments->left_color_type  = GIMP_GRADIENT_COLOR_FOREGROUND;
+  gradient->segments->right_color_type = GIMP_GRADIENT_COLOR_BACKGROUND;
+  gradient->segments->type             = GIMP_GRADIENT_SEGMENT_STEP;
+
+  /* FG to BG (HSV counter-clockwise) */
+  gradient = gimp_gradients_add_gradient (gimp,
+                                          _("FG to BG (HSV counter-clockwise)"),
+                                          FG_BG_HSV_CCW_KEY);
+  gradient->segments->left_color_type  = GIMP_GRADIENT_COLOR_FOREGROUND;
+  gradient->segments->right_color_type = GIMP_GRADIENT_COLOR_BACKGROUND;
+  gradient->segments->color            = GIMP_GRADIENT_SEGMENT_HSV_CCW;
+
+  /* FG to BG (HSV clockwise hue) */
+  gradient = gimp_gradients_add_gradient (gimp,
+                                          _("FG to BG (HSV clockwise hue)"),
+                                          FG_BG_HSV_CW_KEY);
+  gradient->segments->left_color_type  = GIMP_GRADIENT_COLOR_FOREGROUND;
+  gradient->segments->right_color_type = GIMP_GRADIENT_COLOR_BACKGROUND;
+  gradient->segments->color            = GIMP_GRADIENT_SEGMENT_HSV_CW;
+
+  /* FG to Transparent */
+  gradient = gimp_gradients_add_gradient (gimp,
+                                          _("FG to Transparent"),
+                                          FG_TRANSPARENT_KEY);
+  gradient->segments->left_color_type  = GIMP_GRADIENT_COLOR_FOREGROUND;
+  gradient->segments->right_color_type = GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT;
+}
+
+GimpGradient *
+gimp_gradients_get_custom (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_get_data (G_OBJECT (gimp), CUSTOM_KEY);
+}
+
+GimpGradient *
+gimp_gradients_get_fg_bg_rgb (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_get_data (G_OBJECT (gimp), FG_BG_RGB_KEY);
+}
+
+GimpGradient *
+gimp_gradients_get_fg_bg_hsv_ccw (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_get_data (G_OBJECT (gimp), FG_BG_HSV_CCW_KEY);
+}
+
+GimpGradient *
+gimp_gradients_get_fg_bg_hsv_cw (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_get_data (G_OBJECT (gimp), FG_BG_HSV_CW_KEY);
+}
+
+GimpGradient *
+gimp_gradients_get_fg_transparent (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_get_data (G_OBJECT (gimp), FG_TRANSPARENT_KEY);
+}
+
+
+/*  private functions  */
+
+static GimpGradient *
+gimp_gradients_add_gradient (Gimp        *gimp,
+                             const gchar *name,
+                             const gchar *id)
+{
+  GimpGradient *gradient;
+
+  gradient = GIMP_GRADIENT (gimp_gradient_new (gimp_get_user_context (gimp),
+                                               name));
+
+  gimp_data_make_internal (GIMP_DATA (gradient), id);
+
+  gimp_container_add (gimp_data_factory_get_container (gimp->gradient_factory),
+                      GIMP_OBJECT (gradient));
+  g_object_unref (gradient);
+
+  g_object_set_data (G_OBJECT (gimp), id, gradient);
+
+  return gradient;
+}
diff --git a/app/core/gimp-gradients.h b/app/core/gimp-gradients.h
new file mode 100644
index 0000000..72f21a6
--- /dev/null
+++ b/app/core/gimp-gradients.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimp-gradients.h
+ * Copyright (C) 2002 Michael Natterer  <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRADIENTS__
+#define __GIMP_GRADIENTS__
+
+
+void           gimp_gradients_init               (Gimp *gimp);
+
+GimpGradient * gimp_gradients_get_custom         (Gimp *gimp);
+GimpGradient * gimp_gradients_get_fg_bg_rgb      (Gimp *gimp);
+GimpGradient * gimp_gradients_get_fg_bg_hsv_ccw  (Gimp *gimp);
+GimpGradient * gimp_gradients_get_fg_bg_hsv_cw   (Gimp *gimp);
+GimpGradient * gimp_gradients_get_fg_transparent (Gimp *gimp);
+
+
+#endif /* __GIMP_GRADIENTS__ */
diff --git a/app/core/gimp-gui.c b/app/core/gimp-gui.c
new file mode 100644
index 0000000..0b0fe42
--- /dev/null
+++ b/app/core/gimp-gui.c
@@ -0,0 +1,585 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-gui.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpimage.h"
+#include "gimpprogress.h"
+#include "gimpwaitable.h"
+
+#include "about.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_gui_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp->gui.ungrab                 = NULL;
+  gimp->gui.threads_enter          = NULL;
+  gimp->gui.threads_leave          = NULL;
+  gimp->gui.set_busy               = NULL;
+  gimp->gui.unset_busy             = NULL;
+  gimp->gui.show_message           = NULL;
+  gimp->gui.help                   = NULL;
+  gimp->gui.get_program_class      = NULL;
+  gimp->gui.get_display_name       = NULL;
+  gimp->gui.get_user_time          = NULL;
+  gimp->gui.get_theme_dir          = NULL;
+  gimp->gui.get_icon_theme_dir     = NULL;
+  gimp->gui.display_get_by_id      = NULL;
+  gimp->gui.display_get_id         = NULL;
+  gimp->gui.display_get_window_id  = NULL;
+  gimp->gui.display_create         = NULL;
+  gimp->gui.display_delete         = NULL;
+  gimp->gui.displays_reconnect     = NULL;
+  gimp->gui.progress_new           = NULL;
+  gimp->gui.progress_free          = NULL;
+  gimp->gui.pdb_dialog_set         = NULL;
+  gimp->gui.pdb_dialog_close       = NULL;
+  gimp->gui.recent_list_add_file   = NULL;
+  gimp->gui.recent_list_load       = NULL;
+  gimp->gui.get_mount_operation    = NULL;
+  gimp->gui.query_profile_policy   = NULL;
+}
+
+void
+gimp_gui_ungrab (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->gui.ungrab)
+    gimp->gui.ungrab (gimp);
+}
+
+void
+gimp_threads_enter (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->gui.threads_enter)
+    gimp->gui.threads_enter (gimp);
+}
+
+void
+gimp_threads_leave (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->gui.threads_leave)
+    gimp->gui.threads_leave (gimp);
+}
+
+void
+gimp_set_busy (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /* FIXME: gimp_busy HACK */
+  gimp->busy++;
+
+  if (gimp->busy == 1)
+    {
+      if (gimp->gui.set_busy)
+        gimp->gui.set_busy (gimp);
+    }
+}
+
+static gboolean
+gimp_idle_unset_busy (gpointer data)
+{
+  Gimp *gimp = data;
+
+  gimp_unset_busy (gimp);
+
+  gimp->busy_idle_id = 0;
+
+  return FALSE;
+}
+
+void
+gimp_set_busy_until_idle (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (! gimp->busy_idle_id)
+    {
+      gimp_set_busy (gimp);
+
+      gimp->busy_idle_id = g_idle_add_full (G_PRIORITY_HIGH,
+                                            gimp_idle_unset_busy, gimp,
+                                            NULL);
+    }
+}
+
+void
+gimp_unset_busy (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (gimp->busy > 0);
+
+  /* FIXME: gimp_busy HACK */
+  gimp->busy--;
+
+  if (gimp->busy == 0)
+    {
+      if (gimp->gui.unset_busy)
+        gimp->gui.unset_busy (gimp);
+    }
+}
+
+void
+gimp_show_message (Gimp                *gimp,
+                   GObject             *handler,
+                   GimpMessageSeverity  severity,
+                   const gchar         *domain,
+                   const gchar         *message)
+{
+  const gchar *desc = (severity == GIMP_MESSAGE_ERROR) ? "Error" : "Message";
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (handler == NULL || G_IS_OBJECT (handler));
+  g_return_if_fail (message != NULL);
+
+  if (! domain)
+    domain = GIMP_ACRONYM;
+
+  if (! gimp->console_messages)
+    {
+      if (gimp->gui.show_message)
+        {
+          gimp->gui.show_message (gimp, handler, severity,
+                                  domain, message);
+          return;
+        }
+      else if (GIMP_IS_PROGRESS (handler) &&
+               gimp_progress_message (GIMP_PROGRESS (handler), gimp,
+                                      severity, domain, message))
+        {
+          /* message has been handled by GimpProgress */
+          return;
+        }
+    }
+
+  gimp_enum_get_value (GIMP_TYPE_MESSAGE_SEVERITY, severity,
+                       NULL, NULL, &desc, NULL);
+  g_printerr ("%s-%s: %s\n\n", domain, desc, message);
+}
+
+void
+gimp_wait (Gimp         *gimp,
+           GimpWaitable *waitable,
+           const gchar  *format,
+           ...)
+{
+  va_list  args;
+  gchar   *message;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_WAITABLE (waitable));
+  g_return_if_fail (format != NULL);
+
+  if (gimp_waitable_wait_for (waitable, 0.5 * G_TIME_SPAN_SECOND))
+    return;
+
+  va_start (args, format);
+
+  message = g_strdup_vprintf (format, args);
+
+  va_end (args);
+
+  if (! gimp->console_messages &&
+      gimp->gui.wait           &&
+      gimp->gui.wait (gimp, waitable, message))
+    {
+      return;
+    }
+
+  /* Translator:  This message is displayed while GIMP is waiting for
+   * some operation to finish.  The %s argument is a message describing
+   * the operation.
+   */
+  g_printerr (_("Please wait: %s\n"), message);
+
+  gimp_waitable_wait (waitable);
+
+  g_free (message);
+}
+
+void
+gimp_help (Gimp         *gimp,
+           GimpProgress *progress,
+           const gchar  *help_domain,
+           const gchar  *help_id)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  if (gimp->gui.help)
+    gimp->gui.help (gimp, progress, help_domain, help_id);
+}
+
+const gchar *
+gimp_get_program_class (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->gui.get_program_class)
+    return gimp->gui.get_program_class (gimp);
+
+  return NULL;
+}
+
+gchar *
+gimp_get_display_name (Gimp     *gimp,
+                       gint      display_ID,
+                       GObject **screen,
+                       gint     *monitor)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (screen != NULL, NULL);
+  g_return_val_if_fail (monitor != NULL, NULL);
+
+  if (gimp->gui.get_display_name)
+    return gimp->gui.get_display_name (gimp, display_ID, screen, monitor);
+
+  *screen  = NULL;
+  *monitor = 0;
+
+  return NULL;
+}
+
+/**
+ * gimp_get_user_time:
+ * @gimp:
+ *
+ * Returns the timestamp of the last user interaction. The timestamp is
+ * taken from events caused by user interaction such as key presses or
+ * pointer movements. See gdk_x11_display_get_user_time().
+ *
+ * Return value: the timestamp of the last user interaction
+ */
+guint32
+gimp_get_user_time (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+
+  if (gimp->gui.get_user_time)
+    return gimp->gui.get_user_time (gimp);
+
+  return 0;
+}
+
+GFile *
+gimp_get_theme_dir (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->gui.get_theme_dir)
+    return gimp->gui.get_theme_dir (gimp);
+
+  return NULL;
+}
+
+GFile *
+gimp_get_icon_theme_dir (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->gui.get_icon_theme_dir)
+    return gimp->gui.get_icon_theme_dir (gimp);
+
+  return NULL;
+}
+
+GimpObject *
+gimp_get_window_strategy (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->gui.get_window_strategy)
+    return gimp->gui.get_window_strategy (gimp);
+
+  return NULL;
+}
+
+GimpObject *
+gimp_get_empty_display (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->gui.get_empty_display)
+    return gimp->gui.get_empty_display (gimp);
+
+  return NULL;
+}
+
+GimpObject *
+gimp_get_display_by_ID (Gimp *gimp,
+                        gint  ID)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->gui.display_get_by_id)
+    return gimp->gui.display_get_by_id (gimp, ID);
+
+  return NULL;
+}
+
+gint
+gimp_get_display_ID (Gimp       *gimp,
+                     GimpObject *display)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), -1);
+  g_return_val_if_fail (GIMP_IS_OBJECT (display), -1);
+
+  if (gimp->gui.display_get_id)
+    return gimp->gui.display_get_id (display);
+
+  return -1;
+}
+
+guint32
+gimp_get_display_window_id (Gimp       *gimp,
+                            GimpObject *display)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), -1);
+  g_return_val_if_fail (GIMP_IS_OBJECT (display), -1);
+
+  if (gimp->gui.display_get_window_id)
+    return gimp->gui.display_get_window_id (display);
+
+  return -1;
+}
+
+GimpObject *
+gimp_create_display (Gimp      *gimp,
+                     GimpImage *image,
+                     GimpUnit   unit,
+                     gdouble    scale,
+                     GObject   *screen,
+                     gint       monitor)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (screen == NULL || G_IS_OBJECT (screen), NULL);
+
+  if (gimp->gui.display_create)
+    return gimp->gui.display_create (gimp, image, unit, scale, screen, monitor);
+
+  return NULL;
+}
+
+void
+gimp_delete_display (Gimp       *gimp,
+                     GimpObject *display)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_OBJECT (display));
+
+  if (gimp->gui.display_delete)
+    gimp->gui.display_delete (display);
+}
+
+void
+gimp_reconnect_displays (Gimp      *gimp,
+                         GimpImage *old_image,
+                         GimpImage *new_image)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_IMAGE (old_image));
+  g_return_if_fail (GIMP_IS_IMAGE (new_image));
+
+  if (gimp->gui.displays_reconnect)
+    gimp->gui.displays_reconnect (gimp, old_image, new_image);
+}
+
+GimpProgress *
+gimp_new_progress (Gimp       *gimp,
+                   GimpObject *display)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (display == NULL || GIMP_IS_OBJECT (display), NULL);
+
+  if (gimp->gui.progress_new)
+    return gimp->gui.progress_new (gimp, display);
+
+  return NULL;
+}
+
+void
+gimp_free_progress (Gimp         *gimp,
+                    GimpProgress *progress)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+
+  if (gimp->gui.progress_free)
+    gimp->gui.progress_free (gimp, progress);
+}
+
+gboolean
+gimp_pdb_dialog_new (Gimp          *gimp,
+                     GimpContext   *context,
+                     GimpProgress  *progress,
+                     GimpContainer *container,
+                     const gchar   *title,
+                     const gchar   *callback_name,
+                     const gchar   *object_name,
+                     ...)
+{
+  gboolean retval = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (title != NULL, FALSE);
+  g_return_val_if_fail (callback_name != NULL, FALSE);
+
+  if (gimp->gui.pdb_dialog_new)
+    {
+      va_list args;
+
+      va_start (args, object_name);
+
+      retval = gimp->gui.pdb_dialog_new (gimp, context, progress,
+                                         container, title,
+                                         callback_name, object_name,
+                                         args);
+
+      va_end (args);
+    }
+
+  return retval;
+}
+
+gboolean
+gimp_pdb_dialog_set (Gimp          *gimp,
+                     GimpContainer *container,
+                     const gchar   *callback_name,
+                     const gchar   *object_name,
+                     ...)
+{
+  gboolean retval = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (callback_name != NULL, FALSE);
+  g_return_val_if_fail (object_name != NULL, FALSE);
+
+  if (gimp->gui.pdb_dialog_set)
+    {
+      va_list args;
+
+      va_start (args, object_name);
+
+      retval = gimp->gui.pdb_dialog_set (gimp, container, callback_name,
+                                         object_name, args);
+
+      va_end (args);
+    }
+
+  return retval;
+}
+
+gboolean
+gimp_pdb_dialog_close (Gimp          *gimp,
+                       GimpContainer *container,
+                       const gchar   *callback_name)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (callback_name != NULL, FALSE);
+
+  if (gimp->gui.pdb_dialog_close)
+    return gimp->gui.pdb_dialog_close (gimp, container, callback_name);
+
+  return FALSE;
+}
+
+gboolean
+gimp_recent_list_add_file (Gimp        *gimp,
+                           GFile       *file,
+                           const gchar *mime_type)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+
+  if (gimp->gui.recent_list_add_file)
+    return gimp->gui.recent_list_add_file (gimp, file, mime_type);
+
+  return FALSE;
+}
+
+void
+gimp_recent_list_load (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->gui.recent_list_load)
+    gimp->gui.recent_list_load (gimp);
+}
+
+GMountOperation *
+gimp_get_mount_operation (Gimp         *gimp,
+                          GimpProgress *progress)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+
+  if (gimp->gui.get_mount_operation)
+    return gimp->gui.get_mount_operation (gimp, progress);
+
+  return g_mount_operation_new ();
+}
+
+GimpColorProfilePolicy
+gimp_query_profile_policy (Gimp                      *gimp,
+                           GimpImage                 *image,
+                           GimpContext               *context,
+                           GimpColorProfile         **dest_profile,
+                           GimpColorRenderingIntent  *intent,
+                           gboolean                  *bpc,
+                           gboolean                  *dont_ask)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_COLOR_PROFILE_POLICY_KEEP);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_COLOR_PROFILE_POLICY_KEEP);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_COLOR_PROFILE_POLICY_KEEP);
+  g_return_val_if_fail (dest_profile != NULL, GIMP_COLOR_PROFILE_POLICY_KEEP);
+
+  if (gimp->gui.query_profile_policy)
+    return gimp->gui.query_profile_policy (gimp, image, context,
+                                           dest_profile,
+                                           intent, bpc,
+                                           dont_ask);
+
+  return GIMP_COLOR_PROFILE_POLICY_KEEP;
+}
diff --git a/app/core/gimp-gui.h b/app/core/gimp-gui.h
new file mode 100644
index 0000000..49f2761
--- /dev/null
+++ b/app/core/gimp-gui.h
@@ -0,0 +1,211 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GUI_H__
+#define __GIMP_GUI_H__
+
+
+typedef struct _GimpGui GimpGui;
+
+struct _GimpGui
+{
+  void           (* ungrab)                 (Gimp                *gimp);
+
+  void           (* threads_enter)          (Gimp                *gimp);
+  void           (* threads_leave)          (Gimp                *gimp);
+
+  void           (* set_busy)               (Gimp                *gimp);
+  void           (* unset_busy)             (Gimp                *gimp);
+
+  void           (* show_message)           (Gimp                *gimp,
+                                             GObject             *handler,
+                                             GimpMessageSeverity  severity,
+                                             const gchar         *domain,
+                                             const gchar         *message);
+  void           (* help)                   (Gimp                *gimp,
+                                             GimpProgress        *progress,
+                                             const gchar         *help_domain,
+                                             const gchar         *help_id);
+
+  gboolean       (* wait)                   (Gimp                *gimp,
+                                             GimpWaitable        *waitable,
+                                             const gchar         *message);
+
+  const gchar  * (* get_program_class)      (Gimp                *gimp);
+  gchar        * (* get_display_name)       (Gimp                *gimp,
+                                             gint                 display_ID,
+                                             GObject            **screen,
+                                             gint                *monitor);
+  guint32        (* get_user_time)          (Gimp                *gimp);
+
+  GFile        * (* get_theme_dir)          (Gimp                *gimp);
+  GFile        * (* get_icon_theme_dir)     (Gimp                *gimp);
+
+  GimpObject   * (* get_window_strategy)    (Gimp                *gimp);
+  GimpObject   * (* get_empty_display)      (Gimp                *gimp);
+  GimpObject   * (* display_get_by_id)      (Gimp                *gimp,
+                                             gint                 ID);
+  gint           (* display_get_id)         (GimpObject          *display);
+  guint32        (* display_get_window_id)  (GimpObject          *display);
+  GimpObject   * (* display_create)         (Gimp                *gimp,
+                                             GimpImage           *image,
+                                             GimpUnit             unit,
+                                             gdouble              scale,
+                                             GObject             *screen,
+                                             gint                 monitor);
+  void           (* display_delete)         (GimpObject          *display);
+  void           (* displays_reconnect)     (Gimp                *gimp,
+                                             GimpImage           *old_image,
+                                             GimpImage           *new_image);
+
+  GimpProgress * (* progress_new)           (Gimp                *gimp,
+                                             GimpObject          *display);
+  void           (* progress_free)          (Gimp                *gimp,
+                                             GimpProgress        *progress);
+
+  gboolean       (* pdb_dialog_new)         (Gimp                *gimp,
+                                             GimpContext         *context,
+                                             GimpProgress        *progress,
+                                             GimpContainer       *container,
+                                             const gchar         *title,
+                                             const gchar         *callback_name,
+                                             const gchar         *object_name,
+                                             va_list              args);
+  gboolean       (* pdb_dialog_set)         (Gimp                *gimp,
+                                             GimpContainer       *container,
+                                             const gchar         *callback_name,
+                                             const gchar         *object_name,
+                                             va_list              args);
+  gboolean       (* pdb_dialog_close)       (Gimp                *gimp,
+                                             GimpContainer       *container,
+                                             const gchar         *callback_name);
+  gboolean       (* recent_list_add_file)   (Gimp                *gimp,
+                                             GFile               *file,
+                                             const gchar         *mime_type);
+  void           (* recent_list_load)       (Gimp                *gimp);
+
+  GMountOperation
+               * (* get_mount_operation)    (Gimp                *gimp,
+                                             GimpProgress        *progress);
+
+  GimpColorProfilePolicy
+                 (* query_profile_policy)   (Gimp                *gimp,
+                                             GimpImage           *image,
+                                             GimpContext         *context,
+                                             GimpColorProfile   **dest_profile,
+                                             GimpColorRenderingIntent *intent,
+                                             gboolean            *bpc,
+                                             gboolean            *dont_ask);
+};
+
+
+void           gimp_gui_init               (Gimp                *gimp);
+
+void           gimp_gui_ungrab             (Gimp                *gimp);
+
+void           gimp_threads_enter          (Gimp                *gimp);
+void           gimp_threads_leave          (Gimp                *gimp);
+
+GimpObject   * gimp_get_window_strategy    (Gimp                *gimp);
+GimpObject   * gimp_get_empty_display      (Gimp                *gimp);
+GimpObject   * gimp_get_display_by_ID      (Gimp                *gimp,
+                                            gint                 ID);
+gint           gimp_get_display_ID         (Gimp                *gimp,
+                                            GimpObject          *display);
+guint32        gimp_get_display_window_id  (Gimp                *gimp,
+                                            GimpObject          *display);
+GimpObject   * gimp_create_display         (Gimp                *gimp,
+                                            GimpImage           *image,
+                                            GimpUnit             unit,
+                                            gdouble              scale,
+                                            GObject             *screen,
+                                            gint                 monitor);
+void           gimp_delete_display         (Gimp                *gimp,
+                                            GimpObject          *display);
+void           gimp_reconnect_displays     (Gimp                *gimp,
+                                            GimpImage           *old_image,
+                                            GimpImage           *new_image);
+
+void           gimp_set_busy               (Gimp                *gimp);
+void           gimp_set_busy_until_idle    (Gimp                *gimp);
+void           gimp_unset_busy             (Gimp                *gimp);
+
+void           gimp_show_message           (Gimp                *gimp,
+                                            GObject             *handler,
+                                            GimpMessageSeverity  severity,
+                                            const gchar         *domain,
+                                            const gchar         *message);
+void           gimp_help                   (Gimp                *gimp,
+                                            GimpProgress        *progress,
+                                            const gchar         *help_domain,
+                                            const gchar         *help_id);
+
+void           gimp_wait                   (Gimp                *gimp,
+                                            GimpWaitable        *waitable,
+                                            const gchar         *format,
+                                            ...) G_GNUC_PRINTF (3, 4);
+
+GimpProgress * gimp_new_progress           (Gimp                *gimp,
+                                            GimpObject          *display);
+void           gimp_free_progress          (Gimp                *gimp,
+                                            GimpProgress        *progress);
+
+const gchar  * gimp_get_program_class      (Gimp                *gimp);
+gchar        * gimp_get_display_name       (Gimp                *gimp,
+                                            gint                 display_ID,
+                                            GObject            **screen,
+                                            gint                *monitor);
+guint32        gimp_get_user_time          (Gimp                *gimp);
+GFile        * gimp_get_theme_dir          (Gimp                *gimp);
+GFile        * gimp_get_icon_theme_dir     (Gimp                *gimp);
+
+gboolean       gimp_pdb_dialog_new         (Gimp                *gimp,
+                                            GimpContext         *context,
+                                            GimpProgress        *progress,
+                                            GimpContainer       *container,
+                                            const gchar         *title,
+                                            const gchar         *callback_name,
+                                            const gchar         *object_name,
+                                            ...) G_GNUC_NULL_TERMINATED;
+gboolean       gimp_pdb_dialog_set         (Gimp                *gimp,
+                                            GimpContainer       *container,
+                                            const gchar         *callback_name,
+                                            const gchar         *object_name,
+                                            ...) G_GNUC_NULL_TERMINATED;
+gboolean       gimp_pdb_dialog_close       (Gimp                *gimp,
+                                            GimpContainer       *container,
+                                            const gchar         *callback_name);
+gboolean       gimp_recent_list_add_file   (Gimp                *gimp,
+                                            GFile               *file,
+                                            const gchar         *mime_type);
+void           gimp_recent_list_load       (Gimp                *gimp);
+
+GMountOperation
+             * gimp_get_mount_operation    (Gimp                *gimp,
+                                            GimpProgress        *progress);
+
+GimpColorProfilePolicy
+               gimp_query_profile_policy   (Gimp                *gimp,
+                                            GimpImage           *image,
+                                            GimpContext         *context,
+                                            GimpColorProfile   **dest_profile,
+                                            GimpColorRenderingIntent *intent,
+                                            gboolean            *bpc,
+                                            gboolean            *dont_ask);
+
+
+#endif  /* __GIMP_GUI_H__ */
diff --git a/app/core/gimp-internal-data.c b/app/core/gimp-internal-data.c
new file mode 100644
index 0000000..6653946
--- /dev/null
+++ b/app/core/gimp-internal-data.c
@@ -0,0 +1,346 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimp-internal-data.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-gradients.h"
+#include "gimp-internal-data.h"
+#include "gimpdata.h"
+#include "gimpdataloaderfactory.h"
+#include "gimperror.h"
+#include "gimpgradient-load.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_INTERNAL_DATA_DIRECTORY "internal-data"
+
+
+typedef GimpData * (* GimpDataGetFunc) (Gimp *gimp);
+
+
+typedef struct _GimpInternalDataFile GimpInternalDataFile;
+
+struct _GimpInternalDataFile
+{
+  const gchar      *name;
+  GimpDataGetFunc   get_func;
+  GimpDataLoadFunc  load_func;
+};
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_internal_data_create_directory (GError                     **error);
+
+static GFile    * gimp_internal_data_get_file         (const GimpInternalDataFile  *data_file);
+
+static gboolean   gimp_internal_data_load_data_file   (Gimp                        *gimp,
+                                                       const GimpInternalDataFile  *data_file,
+                                                       GError                     **error);
+static gboolean   gimp_internal_data_save_data_file   (Gimp                        *gimp,
+                                                       const GimpInternalDataFile  *data_file,
+                                                       GError                     **error);
+static gboolean   gimp_internal_data_delete_data_file (Gimp                        *gimp,
+                                                       const GimpInternalDataFile  *data_file,
+                                                       GError                     **error);
+
+/*  static variables  */
+
+static const GimpInternalDataFile internal_data_files[] =
+{
+  /* Custom gradient */
+  {
+    .name      = "custom" GIMP_GRADIENT_FILE_EXTENSION,
+    .get_func  = (GimpDataGetFunc) gimp_gradients_get_custom,
+    .load_func = gimp_gradient_load
+  }
+};
+
+
+/*  public functions  */
+
+gboolean
+gimp_internal_data_load (Gimp    *gimp,
+                         GError **error)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  for (i = 0; i < G_N_ELEMENTS (internal_data_files); i++)
+    {
+      const GimpInternalDataFile *data_file = &internal_data_files[i];
+
+      if (! gimp_internal_data_load_data_file (gimp, data_file, error))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_internal_data_save (Gimp    *gimp,
+                         GError **error)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_internal_data_create_directory (error))
+    return FALSE;
+
+  for (i = 0; i < G_N_ELEMENTS (internal_data_files); i++)
+    {
+      const GimpInternalDataFile *data_file = &internal_data_files[i];
+
+      if (! gimp_internal_data_save_data_file (gimp, data_file, error))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_internal_data_clear (Gimp    *gimp,
+                          GError **error)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  for (i = 0; i < G_N_ELEMENTS (internal_data_files); i++)
+    {
+      const GimpInternalDataFile *data_file = &internal_data_files[i];
+
+      if (! gimp_internal_data_delete_data_file (gimp, data_file, error))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_internal_data_create_directory (GError **error)
+{
+  GFile    *directory;
+  GError   *my_error = NULL;
+  gboolean  success;
+
+  directory = gimp_directory_file (GIMP_INTERNAL_DATA_DIRECTORY, NULL);
+
+  success = g_file_make_directory (directory, NULL, &my_error);
+
+  g_object_unref (directory);
+
+  if (! success)
+    {
+      if (my_error->code == G_IO_ERROR_EXISTS)
+        {
+          g_clear_error (&my_error);
+          success = TRUE;
+        }
+      else
+        {
+          g_propagate_error (error, my_error);
+        }
+    }
+
+  return success;
+}
+
+static GFile *
+gimp_internal_data_get_file (const GimpInternalDataFile *data_file)
+{
+  return gimp_directory_file (GIMP_INTERNAL_DATA_DIRECTORY,
+                              data_file->name,
+                              NULL);
+}
+
+static gboolean
+gimp_internal_data_load_data_file (Gimp                        *gimp,
+                                   const GimpInternalDataFile  *data_file,
+                                   GError                     **error)
+{
+  GFile        *file;
+  GInputStream *input;
+  GimpData     *data;
+  GList        *list;
+  GError       *my_error = NULL;
+
+  file = gimp_internal_data_get_file (data_file);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+
+  if (! input)
+    {
+      g_object_unref (file);
+
+      if (my_error->code == G_IO_ERROR_NOT_FOUND)
+        {
+          g_clear_error (&my_error);
+          return TRUE;
+        }
+      else
+        {
+          g_propagate_error (error, my_error);
+          return FALSE;
+        }
+    }
+
+  list = data_file->load_func (gimp->user_context, file, input, error);
+
+  g_object_unref (input);
+  g_object_unref (file);
+
+  if (! list)
+    return FALSE;
+
+  data = data_file->get_func (gimp);
+
+  gimp_data_copy (data, GIMP_DATA (list->data));
+
+  g_list_free_full (list, g_object_unref);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_internal_data_save_data_file (Gimp                        *gimp,
+                                   const GimpInternalDataFile  *data_file,
+                                   GError                     **error)
+{
+  GFile         *file;
+  GOutputStream *output;
+  GimpData      *data;
+  gboolean       success;
+
+  file = gimp_internal_data_get_file (data_file);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  output = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE,
+                                            G_FILE_CREATE_NONE,
+                                            NULL, error));
+
+  if (! output)
+    {
+      g_object_unref (file);
+
+      return FALSE;
+    }
+
+  data = data_file->get_func (gimp);
+
+  /* we bypass gimp_data_save() and call the data's save() virtual function
+   * directly, since gimp_data_save() is a nop for internal data.
+   *
+   * FIXME:  we save the data whether it's dirty or not, since it might not
+   * exist on disk.  currently, we only use this for cheap data, such as
+   * gradients, so this is not a big concern, but if we save more expensive
+   * data in the future, we should fix this.
+   */
+  gimp_assert (GIMP_DATA_GET_CLASS (data)->save);
+  success = GIMP_DATA_GET_CLASS (data)->save (data, output, error);
+
+  if (success)
+    {
+      if (! g_output_stream_close (output, NULL, error))
+        {
+          g_prefix_error (error,
+                          _("Error saving '%s': "),
+                          gimp_file_get_utf8_name (file));
+          success = FALSE;
+        }
+    }
+  else
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      g_cancellable_cancel (cancellable);
+      if (error && *error)
+        {
+          g_prefix_error (error,
+                          _("Error saving '%s': "),
+                          gimp_file_get_utf8_name (file));
+        }
+      else
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_WRITE,
+                       _("Error saving '%s'"),
+                       gimp_file_get_utf8_name (file));
+        }
+      g_output_stream_close (output, cancellable, NULL);
+      g_object_unref (cancellable);
+    }
+
+  g_object_unref (output);
+  g_object_unref (file);
+
+  return success;
+}
+
+static gboolean
+gimp_internal_data_delete_data_file (Gimp                        *gimp,
+                                     const GimpInternalDataFile  *data_file,
+                                     GError                     **error)
+{
+  GFile    *file;
+  GError   *my_error = NULL;
+  gboolean  success  = TRUE;
+
+  file = gimp_internal_data_get_file (data_file);
+
+  if (gimp->be_verbose)
+    g_print ("Deleting '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! g_file_delete (file, NULL, &my_error) &&
+      my_error->code != G_IO_ERROR_NOT_FOUND)
+    {
+      success = FALSE;
+
+      g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                   _("Deleting \"%s\" failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+    }
+
+  g_clear_error (&my_error);
+  g_object_unref (file);
+
+  return success;
+}
diff --git a/app/core/gimp-internal-data.h b/app/core/gimp-internal-data.h
new file mode 100644
index 0000000..93f42dd
--- /dev/null
+++ b/app/core/gimp-internal-data.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimp-internal-data.h
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_INTERNAL_DATA__
+#define __GIMP_INTERNAL_DATA__
+
+
+gboolean   gimp_internal_data_load  (Gimp    *gimp,
+                                     GError **error);
+gboolean   gimp_internal_data_save  (Gimp    *gimp,
+                                     GError **error);
+
+gboolean   gimp_internal_data_clear (Gimp    *gimp,
+                                     GError **error);
+
+
+#endif /* __GIMP_INTERNAL_DATA__ */
diff --git a/app/core/gimp-memsize.c b/app/core/gimp-memsize.c
new file mode 100644
index 0000000..df71737
--- /dev/null
+++ b/app/core/gimp-memsize.c
@@ -0,0 +1,341 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpparamspecs.h"
+
+
+gint64
+gimp_g_type_instance_get_memsize (GTypeInstance *instance)
+{
+  if (instance)
+    {
+      GTypeQuery type_query;
+
+      g_type_query (G_TYPE_FROM_INSTANCE (instance), &type_query);
+
+      return type_query.instance_size;
+    }
+
+  return 0;
+}
+
+gint64
+gimp_g_object_get_memsize (GObject *object)
+{
+  if (object)
+    return gimp_g_type_instance_get_memsize ((GTypeInstance *) object);
+
+  return 0;
+}
+
+gint64
+gimp_g_hash_table_get_memsize (GHashTable *hash,
+                               gint64      data_size)
+{
+  if (hash)
+    return (2 * sizeof (gint) +
+            5 * sizeof (gpointer) +
+            g_hash_table_size (hash) * (3 * sizeof (gpointer) + data_size));
+
+  return 0;
+}
+
+typedef struct
+{
+  GimpMemsizeFunc func;
+  gint64          memsize;
+  gint64          gui_size;
+} HashMemsize;
+
+static void
+hash_memsize_foreach (gpointer     key,
+                      gpointer     value,
+                      HashMemsize *memsize)
+{
+  gint64 gui_size = 0;
+
+  memsize->memsize  += memsize->func (value, &gui_size);
+  memsize->gui_size += gui_size;
+}
+
+gint64
+gimp_g_hash_table_get_memsize_foreach (GHashTable      *hash,
+                                       GimpMemsizeFunc  func,
+                                       gint64          *gui_size)
+{
+  HashMemsize memsize;
+
+  g_return_val_if_fail (func != NULL, 0);
+
+  if (! hash)
+    return 0;
+
+  memsize.func     = func;
+  memsize.memsize  = 0;
+  memsize.gui_size = 0;
+
+  g_hash_table_foreach (hash, (GHFunc) hash_memsize_foreach, &memsize);
+
+  if (gui_size)
+    *gui_size = memsize.gui_size;
+
+  return memsize.memsize + gimp_g_hash_table_get_memsize (hash, 0);
+}
+
+gint64
+gimp_g_slist_get_memsize (GSList  *slist,
+                          gint64   data_size)
+{
+  return g_slist_length (slist) * (data_size + sizeof (GSList));
+}
+
+gint64
+gimp_g_slist_get_memsize_foreach (GSList          *slist,
+                                  GimpMemsizeFunc  func,
+                                  gint64          *gui_size)
+{
+  GSList *l;
+  gint64  memsize = 0;
+
+  g_return_val_if_fail (func != NULL, 0);
+
+  for (l = slist; l; l = g_slist_next (l))
+    memsize += sizeof (GSList) + func (l->data, gui_size);
+
+  return memsize;
+}
+
+gint64
+gimp_g_list_get_memsize (GList  *list,
+                         gint64  data_size)
+{
+  return g_list_length (list) * (data_size + sizeof (GList));
+}
+
+gint64
+gimp_g_list_get_memsize_foreach (GList           *list,
+                                 GimpMemsizeFunc  func,
+                                 gint64          *gui_size)
+{
+  GList  *l;
+  gint64  memsize = 0;
+
+  g_return_val_if_fail (func != NULL, 0);
+
+  for (l = list; l; l = g_list_next (l))
+    memsize += sizeof (GList) + func (l->data, gui_size);
+
+  return memsize;
+}
+
+gint64
+gimp_g_queue_get_memsize (GQueue *queue,
+                          gint64  data_size)
+{
+  if (queue)
+    {
+      return sizeof (GQueue) +
+             g_queue_get_length (queue) * (data_size + sizeof (GList));
+    }
+
+  return 0;
+}
+
+gint64
+gimp_g_queue_get_memsize_foreach (GQueue          *queue,
+                                  GimpMemsizeFunc  func,
+                                  gint64          *gui_size)
+{
+  gint64 memsize = 0;
+
+  g_return_val_if_fail (func != NULL, 0);
+
+  if (queue)
+    {
+      GList *l;
+
+      memsize = sizeof (GQueue);
+
+      for (l = queue->head; l; l = g_list_next (l))
+        memsize += sizeof (GList) + func (l->data, gui_size);
+    }
+
+  return memsize;
+}
+
+gint64
+gimp_g_value_get_memsize (GValue *value)
+{
+  gint64 memsize = 0;
+
+  if (! value)
+    return 0;
+
+  if (G_VALUE_HOLDS_STRING (value))
+    {
+      memsize += gimp_string_get_memsize (g_value_get_string (value));
+    }
+  else if (G_VALUE_HOLDS_BOXED (value))
+    {
+      if (GIMP_VALUE_HOLDS_RGB (value))
+        {
+          memsize += sizeof (GimpRGB);
+        }
+      else if (GIMP_VALUE_HOLDS_MATRIX2 (value))
+        {
+          memsize += sizeof (GimpMatrix2);
+        }
+      else if (GIMP_VALUE_HOLDS_PARASITE (value))
+        {
+          memsize += gimp_parasite_get_memsize (g_value_get_boxed (value),
+                                                NULL);
+        }
+      else if (GIMP_VALUE_HOLDS_ARRAY (value)       ||
+               GIMP_VALUE_HOLDS_INT8_ARRAY (value)  ||
+               GIMP_VALUE_HOLDS_INT16_ARRAY (value) ||
+               GIMP_VALUE_HOLDS_INT32_ARRAY (value) ||
+               GIMP_VALUE_HOLDS_FLOAT_ARRAY (value))
+        {
+          GimpArray *array = g_value_get_boxed (value);
+
+          if (array)
+            memsize += sizeof (GimpArray) +
+                       (array->static_data ? 0 : array->length);
+        }
+      else if (GIMP_VALUE_HOLDS_STRING_ARRAY (value))
+        {
+          GimpArray *array = g_value_get_boxed (value);
+
+          if (array)
+            {
+              memsize += sizeof (GimpArray);
+
+              if (! array->static_data)
+                {
+                  gchar **tmp = (gchar **) array->data;
+                  gint    i;
+
+                  memsize += array->length * sizeof (gchar *);
+
+                  for (i = 0; i < array->length; i++)
+                    memsize += gimp_string_get_memsize (tmp[i]);
+                }
+            }
+        }
+      else
+        {
+          g_printerr ("%s: unhandled boxed value type: %s\n",
+                      G_STRFUNC, G_VALUE_TYPE_NAME (value));
+        }
+    }
+  else if (G_VALUE_HOLDS_OBJECT (value))
+    {
+      g_printerr ("%s: unhandled object value type: %s\n",
+                  G_STRFUNC, G_VALUE_TYPE_NAME (value));
+    }
+
+  return memsize + sizeof (GValue);
+}
+
+gint64
+gimp_g_param_spec_get_memsize (GParamSpec *pspec)
+{
+  gint64 memsize = 0;
+
+  if (! pspec)
+    return 0;
+
+  if (! (pspec->flags & G_PARAM_STATIC_NAME))
+    memsize += gimp_string_get_memsize (g_param_spec_get_name (pspec));
+
+  if (! (pspec->flags & G_PARAM_STATIC_NICK))
+    memsize += gimp_string_get_memsize (g_param_spec_get_nick (pspec));
+
+  if (! (pspec->flags & G_PARAM_STATIC_BLURB))
+    memsize += gimp_string_get_memsize (g_param_spec_get_blurb (pspec));
+
+  return memsize + gimp_g_type_instance_get_memsize ((GTypeInstance *) pspec);
+}
+
+gint64
+gimp_gegl_buffer_get_memsize (GeglBuffer *buffer)
+{
+  if (buffer)
+    {
+      const Babl *format = gegl_buffer_get_format (buffer);
+
+      return ((gint64) babl_format_get_bytes_per_pixel (format) *
+              (gint64) gegl_buffer_get_width (buffer) *
+              (gint64) gegl_buffer_get_height (buffer) +
+              gimp_g_object_get_memsize (G_OBJECT (buffer)));
+    }
+
+  return 0;
+}
+
+gint64
+gimp_gegl_pyramid_get_memsize (GeglBuffer *buffer)
+{
+  if (buffer)
+    {
+      const Babl *format = gegl_buffer_get_format (buffer);
+
+      /* The pyramid levels constitute a geometric sum with a ratio of 1/4. */
+      return ((gint64) babl_format_get_bytes_per_pixel (format) *
+              (gint64) gegl_buffer_get_width (buffer) *
+              (gint64) gegl_buffer_get_height (buffer) * 1.33 +
+              gimp_g_object_get_memsize (G_OBJECT (buffer)));
+    }
+
+  return 0;
+}
+
+gint64
+gimp_string_get_memsize (const gchar *string)
+{
+  if (string)
+    return strlen (string) + 1;
+
+  return 0;
+}
+
+gint64
+gimp_parasite_get_memsize (GimpParasite *parasite,
+                           gint64       *gui_size)
+{
+  if (parasite)
+    return (sizeof (GimpParasite) +
+            gimp_string_get_memsize (parasite->name) +
+            parasite->size);
+
+  return 0;
+}
diff --git a/app/core/gimp-memsize.h b/app/core/gimp-memsize.h
new file mode 100644
index 0000000..139dc02
--- /dev/null
+++ b/app/core/gimp-memsize.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_MEMSIZE_H__
+#define __APP_GIMP_MEMSIZE_H__
+
+
+gint64   gimp_g_type_instance_get_memsize      (GTypeInstance   *instance);
+gint64   gimp_g_object_get_memsize             (GObject         *object);
+
+gint64   gimp_g_hash_table_get_memsize         (GHashTable      *hash,
+                                                gint64           data_size);
+gint64   gimp_g_hash_table_get_memsize_foreach (GHashTable      *hash,
+                                                GimpMemsizeFunc  func,
+                                                gint64          *gui_size);
+
+gint64   gimp_g_slist_get_memsize              (GSList          *slist,
+                                                gint64           data_size);
+gint64   gimp_g_slist_get_memsize_foreach      (GSList          *slist,
+                                                GimpMemsizeFunc  func,
+                                                gint64          *gui_size);
+
+gint64   gimp_g_list_get_memsize               (GList           *list,
+                                                gint64           data_size);
+gint64   gimp_g_list_get_memsize_foreach       (GList           *list,
+                                                GimpMemsizeFunc  func,
+                                                gint64          *gui_size);
+
+gint64   gimp_g_queue_get_memsize              (GQueue          *queue,
+                                                gint64           data_size);
+gint64   gimp_g_queue_get_memsize_foreach      (GQueue          *queue,
+                                                GimpMemsizeFunc  func,
+                                                gint64          *gui_size);
+
+gint64   gimp_g_value_get_memsize              (GValue          *value);
+gint64   gimp_g_param_spec_get_memsize         (GParamSpec      *pspec);
+
+gint64   gimp_gegl_buffer_get_memsize          (GeglBuffer      *buffer);
+gint64   gimp_gegl_pyramid_get_memsize         (GeglBuffer      *buffer);
+
+gint64   gimp_string_get_memsize               (const gchar     *string);
+gint64   gimp_parasite_get_memsize             (GimpParasite    *parasite,
+                                                gint64          *gui_size);
+
+
+#endif /* __APP_GIMP_MEMSIZE_H__ */
diff --git a/app/core/gimp-modules.c b/app/core/gimp-modules.c
new file mode 100644
index 0000000..6a7b30d
--- /dev/null
+++ b/app/core/gimp-modules.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmodules.c
+ * (C) 1999 Austin Donnelly <austin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmodule/gimpmodule.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimp-modules.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_modules_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (! gimp->no_interface)
+    {
+      gimp->module_db = gimp_module_db_new (gimp->be_verbose);
+      gimp->write_modulerc = FALSE;
+    }
+}
+
+void
+gimp_modules_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_clear_object (&gimp->module_db);
+}
+
+void
+gimp_modules_load (Gimp *gimp)
+{
+  GFile    *file;
+  GScanner *scanner;
+  gchar    *module_load_inhibit = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->no_interface)
+    return;
+
+  /* FIXME, gimp->be_verbose is not yet initialized in init() */
+  gimp->module_db->verbose = gimp->be_verbose;
+
+  file = gimp_directory_file ("modulerc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  scanner = gimp_scanner_new_gfile (file, NULL);
+  g_object_unref (file);
+
+  if (scanner)
+    {
+      GTokenType  token;
+      GError     *error = NULL;
+
+#define MODULE_LOAD_INHIBIT 1
+
+      g_scanner_scope_add_symbol (scanner, 0, "module-load-inhibit",
+                                  GINT_TO_POINTER (MODULE_LOAD_INHIBIT));
+
+      token = G_TOKEN_LEFT_PAREN;
+
+      while (g_scanner_peek_next_token (scanner) == token)
+        {
+          token = g_scanner_get_next_token (scanner);
+
+          switch (token)
+            {
+            case G_TOKEN_LEFT_PAREN:
+              token = G_TOKEN_SYMBOL;
+              break;
+
+            case G_TOKEN_SYMBOL:
+              if (scanner->value.v_symbol == GINT_TO_POINTER (MODULE_LOAD_INHIBIT))
+                {
+                  token = G_TOKEN_STRING;
+
+                  if (! gimp_scanner_parse_string_no_validate (scanner,
+                                                               &module_load_inhibit))
+                    goto error;
+                }
+              token = G_TOKEN_RIGHT_PAREN;
+              break;
+
+            case G_TOKEN_RIGHT_PAREN:
+              token = G_TOKEN_LEFT_PAREN;
+              break;
+
+            default: /* do nothing */
+              break;
+            }
+        }
+
+#undef MODULE_LOAD_INHIBIT
+
+      if (token != G_TOKEN_LEFT_PAREN)
+        {
+          g_scanner_get_next_token (scanner);
+          g_scanner_unexp_token (scanner, token, NULL, NULL, NULL,
+                                 _("fatal parse error"), TRUE);
+        }
+
+    error:
+
+      if (error)
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_clear_error (&error);
+        }
+
+      gimp_scanner_destroy (scanner);
+    }
+
+  if (module_load_inhibit)
+    {
+      gimp_module_db_set_load_inhibit (gimp->module_db, module_load_inhibit);
+      g_free (module_load_inhibit);
+    }
+
+  gimp_module_db_load (gimp->module_db, gimp->config->module_path);
+}
+
+static void
+add_to_inhibit_string (gpointer data,
+                       gpointer user_data)
+{
+  GimpModule *module = data;
+  GString    *str    = user_data;
+
+  if (module->load_inhibit)
+    {
+      g_string_append_c (str, G_SEARCHPATH_SEPARATOR);
+      g_string_append (str, module->filename);
+    }
+}
+
+void
+gimp_modules_unload (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (! gimp->no_interface && gimp->write_modulerc)
+    {
+      GimpConfigWriter *writer;
+      GString          *str;
+      const gchar      *p;
+      GFile            *file;
+      GError           *error = NULL;
+
+      str = g_string_new (NULL);
+      g_list_foreach (gimp->module_db->modules, add_to_inhibit_string, str);
+      if (str->len > 0)
+        p = str->str + 1;
+      else
+        p = "";
+
+      file = gimp_directory_file ("modulerc", NULL);
+
+      if (gimp->be_verbose)
+        g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+      writer = gimp_config_writer_new_gfile (file, TRUE,
+                                             "GIMP modulerc", &error);
+      g_object_unref (file);
+
+      if (writer)
+        {
+          gimp_config_writer_open (writer, "module-load-inhibit");
+          gimp_config_writer_string (writer, p);
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_finish (writer, "end of modulerc", &error);
+
+          gimp->write_modulerc = FALSE;
+        }
+
+      g_string_free (str, TRUE);
+
+      if (error)
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_clear_error (&error);
+        }
+    }
+}
+
+void
+gimp_modules_refresh (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (! gimp->no_interface)
+    {
+      gimp_module_db_refresh (gimp->module_db, gimp->config->module_path);
+    }
+}
diff --git a/app/core/gimp-modules.h b/app/core/gimp-modules.h
new file mode 100644
index 0000000..fc90d69
--- /dev/null
+++ b/app/core/gimp-modules.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmodules.h
+ * (C) 1999 Austin Donnelly <austin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MODULES_H__
+#define __GIMP_MODULES_H__
+
+
+void   gimp_modules_init    (Gimp *gimp);
+void   gimp_modules_exit    (Gimp *gimp);
+
+void   gimp_modules_load    (Gimp *gimp);
+void   gimp_modules_unload  (Gimp *gimp);
+
+void   gimp_modules_refresh (Gimp *gimp);
+
+
+#endif  /* __GIMP_MODULES_H__ */
diff --git a/app/core/gimp-palettes.c b/app/core/gimp-palettes.c
new file mode 100644
index 0000000..4f189a4
--- /dev/null
+++ b/app/core/gimp-palettes.c
@@ -0,0 +1,143 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimp-gradients.c
+ * Copyright (C) 2014 Michael Natterer  <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-palettes.h"
+#include "gimpcontext.h"
+#include "gimpcontainer.h"
+#include "gimpdatafactory.h"
+#include "gimppalettemru.h"
+
+#include "gimp-intl.h"
+
+
+#define COLOR_HISTORY_KEY "gimp-palette-color-history"
+
+
+/*  local function prototypes  */
+
+static GimpPalette * gimp_palettes_add_palette (Gimp        *gimp,
+                                                const gchar *name,
+                                                const gchar *id);
+
+
+/*  public functions  */
+
+void
+gimp_palettes_init (Gimp *gimp)
+{
+  GimpPalette *palette;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  palette = gimp_palettes_add_palette (gimp,
+                                       _("Color History"),
+                                       COLOR_HISTORY_KEY);
+  gimp_context_set_palette (gimp->user_context, palette);
+}
+
+void
+gimp_palettes_load (Gimp *gimp)
+{
+  GimpPalette *palette;
+  GFile       *file;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  palette = gimp_palettes_get_color_history (gimp);
+
+  file = gimp_directory_file ("colorrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  gimp_palette_mru_load (GIMP_PALETTE_MRU (palette), file);
+
+  g_object_unref (file);
+}
+
+void
+gimp_palettes_save (Gimp *gimp)
+{
+  GimpPalette *palette;
+  GFile       *file;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  palette = gimp_palettes_get_color_history (gimp);
+
+  file = gimp_directory_file ("colorrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  gimp_palette_mru_save (GIMP_PALETTE_MRU (palette), file);
+
+  g_object_unref (file);
+}
+
+GimpPalette *
+gimp_palettes_get_color_history (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_get_data (G_OBJECT (gimp), COLOR_HISTORY_KEY);
+}
+
+void
+gimp_palettes_add_color_history (Gimp          *gimp,
+                                 const GimpRGB *color)
+{
+  GimpPalette *history;
+
+  history = gimp_palettes_get_color_history (gimp);
+  gimp_palette_mru_add (GIMP_PALETTE_MRU (history), color);
+}
+
+/*  private functions  */
+
+static GimpPalette *
+gimp_palettes_add_palette (Gimp        *gimp,
+                           const gchar *name,
+                           const gchar *id)
+{
+  GimpData *palette;
+
+  palette = gimp_palette_mru_new (name);
+
+  gimp_data_make_internal (palette, id);
+
+  gimp_container_add (gimp_data_factory_get_container (gimp->palette_factory),
+                      GIMP_OBJECT (palette));
+  g_object_unref (palette);
+
+  g_object_set_data (G_OBJECT (gimp), id, palette);
+
+  return GIMP_PALETTE (palette);
+}
diff --git a/app/core/gimp-palettes.h b/app/core/gimp-palettes.h
new file mode 100644
index 0000000..7858c86
--- /dev/null
+++ b/app/core/gimp-palettes.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimp-palettes.h
+ * Copyright (C) 2014 Michael Natterer  <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTES__
+#define __GIMP_PALETTES__
+
+
+void          gimp_palettes_init              (Gimp          *gimp);
+
+void          gimp_palettes_load              (Gimp          *gimp);
+void          gimp_palettes_save              (Gimp          *gimp);
+
+GimpPalette * gimp_palettes_get_color_history (Gimp          *gimp);
+void          gimp_palettes_add_color_history (Gimp          *gimp,
+                                               const GimpRGB *color);
+
+
+#endif /* __GIMP_PALETTES__ */
diff --git a/app/core/gimp-parallel.cc b/app/core/gimp-parallel.cc
new file mode 100644
index 0000000..208bcfe
--- /dev/null
+++ b/app/core/gimp-parallel.cc
@@ -0,0 +1,553 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-parallel.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+extern "C"
+{
+
+#include "core-types.h"
+
+#include "config/gimpgeglconfig.h"
+
+#include "gimp.h"
+#include "gimp-parallel.h"
+#include "gimpasync.h"
+#include "gimpcancelable.h"
+
+
+#define GIMP_PARALLEL_MAX_THREADS           64
+#define GIMP_PARALLEL_RUN_ASYNC_MAX_THREADS  1
+
+
+typedef struct
+{
+  GimpAsync        *async;
+  gint              priority;
+  GimpRunAsyncFunc  func;
+  gpointer          user_data;
+  GDestroyNotify    user_data_destroy_func;
+} GimpParallelRunAsyncTask;
+
+typedef struct
+{
+  GThread   *thread;
+
+  gboolean   quit;
+
+  GimpAsync *current_async;
+} GimpParallelRunAsyncThread;
+
+
+/*  local function prototypes  */
+
+static void                       gimp_parallel_notify_num_processors   (GimpGeglConfig             *config);
+
+static void                       gimp_parallel_set_n_threads           (gint                        n_threads,
+                                                                         gboolean                    finish_tasks);
+
+static void                       gimp_parallel_run_async_set_n_threads (gint                        n_threads,
+                                                                         gboolean                    finish_tasks);
+static gpointer                   gimp_parallel_run_async_thread_func   (GimpParallelRunAsyncThread *thread);
+static void                       gimp_parallel_run_async_enqueue_task  (GimpParallelRunAsyncTask   *task);
+static GimpParallelRunAsyncTask * gimp_parallel_run_async_dequeue_task  (void);
+static gboolean                   gimp_parallel_run_async_execute_task  (GimpParallelRunAsyncTask   *task);
+static void                       gimp_parallel_run_async_abort_task    (GimpParallelRunAsyncTask   *task);
+static void                       gimp_parallel_run_async_cancel        (GimpAsync                  *async);
+static void                       gimp_parallel_run_async_waiting       (GimpAsync                  *async);
+
+
+/*  local variables  */
+
+static gint                       gimp_parallel_run_async_n_threads = 0;
+static GimpParallelRunAsyncThread gimp_parallel_run_async_threads[GIMP_PARALLEL_RUN_ASYNC_MAX_THREADS];
+
+static GMutex                     gimp_parallel_run_async_mutex;
+static GCond                      gimp_parallel_run_async_cond;
+static GQueue                     gimp_parallel_run_async_queue = G_QUEUE_INIT;
+
+
+/*  public functions  */
+
+
+void
+gimp_parallel_init (Gimp *gimp)
+{
+  GimpGeglConfig *config;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  config = GIMP_GEGL_CONFIG (gimp->config);
+
+  g_signal_connect (config, "notify::num-processors",
+                    G_CALLBACK (gimp_parallel_notify_num_processors),
+                    NULL);
+
+  gimp_parallel_notify_num_processors (config);
+}
+
+void
+gimp_parallel_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        (gpointer) gimp_parallel_notify_num_processors,
+                                        NULL);
+
+  /* stop all threads */
+  gimp_parallel_set_n_threads (0, /* finish_tasks = */ FALSE);
+}
+
+GimpAsync *
+gimp_parallel_run_async (GimpRunAsyncFunc func,
+                         gpointer         user_data)
+{
+  return gimp_parallel_run_async_full (0, func, user_data, NULL);
+}
+
+GimpAsync *
+gimp_parallel_run_async_full (gint             priority,
+                              GimpRunAsyncFunc func,
+                              gpointer         user_data,
+                              GDestroyNotify   user_data_destroy_func)
+{
+  GimpAsync                *async;
+  GimpParallelRunAsyncTask *task;
+
+  g_return_val_if_fail (func != NULL, NULL);
+
+  async = gimp_async_new ();
+
+  task = g_slice_new (GimpParallelRunAsyncTask);
+
+  task->async                  = GIMP_ASYNC (g_object_ref (async));
+  task->priority               = priority;
+  task->func                   = func;
+  task->user_data              = user_data;
+  task->user_data_destroy_func = user_data_destroy_func;
+
+  if (gimp_parallel_run_async_n_threads > 0)
+    {
+      g_signal_connect_after (async, "cancel",
+                              G_CALLBACK (gimp_parallel_run_async_cancel),
+                              NULL);
+      g_signal_connect_after (async, "waiting",
+                              G_CALLBACK (gimp_parallel_run_async_waiting),
+                              NULL);
+
+      g_mutex_lock (&gimp_parallel_run_async_mutex);
+
+      gimp_parallel_run_async_enqueue_task (task);
+
+      g_cond_signal (&gimp_parallel_run_async_cond);
+
+      g_mutex_unlock (&gimp_parallel_run_async_mutex);
+    }
+  else
+    {
+      while (gimp_parallel_run_async_execute_task (task));
+    }
+
+  return async;
+}
+
+GimpAsync *
+gimp_parallel_run_async_independent (GimpRunAsyncFunc func,
+                                     gpointer         user_data)
+{
+  return gimp_parallel_run_async_independent_full (0, func, user_data);
+}
+
+GimpAsync *
+gimp_parallel_run_async_independent_full (gint             priority,
+                                          GimpRunAsyncFunc func,
+                                          gpointer         user_data)
+{
+  GimpAsync                *async;
+  GimpParallelRunAsyncTask *task;
+  GThread                  *thread;
+
+  g_return_val_if_fail (func != NULL, NULL);
+
+  async = gimp_async_new ();
+
+  task = g_slice_new0 (GimpParallelRunAsyncTask);
+
+  task->async     = GIMP_ASYNC (g_object_ref (async));
+  task->priority  = priority;
+  task->func      = func;
+  task->user_data = user_data;
+
+  thread = g_thread_new (
+    "async-ind",
+    [] (gpointer data) -> gpointer
+    {
+      GimpParallelRunAsyncTask *task = (GimpParallelRunAsyncTask *) data;
+
+      /* adjust the thread's priority */
+#if defined (G_OS_WIN32)
+      if (task->priority < 0)
+        {
+          SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_ABOVE_NORMAL);
+        }
+      else if (task->priority > 0)
+        {
+          SetThreadPriority (GetCurrentThread (), THREAD_MODE_BACKGROUND_BEGIN);
+        }
+#elif defined (HAVE_UNISTD_H) && defined (__gnu_linux__)
+      if (task->priority)
+        {
+          (nice (task->priority) != -1);
+                              /* ^-- avoid "unused result" warning */
+        }
+#endif
+
+      while (gimp_parallel_run_async_execute_task (task));
+
+      return NULL;
+    },
+    task);
+
+  gimp_async_add_callback (async,
+                           [] (GimpAsync *async,
+                               gpointer   thread)
+                           {
+                             g_thread_join ((GThread *) thread);
+                           },
+                           thread);
+
+  return async;
+}
+
+
+/*  private functions  */
+
+
+static void
+gimp_parallel_notify_num_processors (GimpGeglConfig *config)
+{
+  gimp_parallel_set_n_threads (config->num_processors,
+                               /* finish_tasks = */ TRUE);
+}
+
+static void
+gimp_parallel_set_n_threads (gint     n_threads,
+                             gboolean finish_tasks)
+{
+  gimp_parallel_run_async_set_n_threads (n_threads, finish_tasks);
+}
+
+static void
+gimp_parallel_run_async_set_n_threads (gint     n_threads,
+                                       gboolean finish_tasks)
+{
+  gint i;
+
+  n_threads = CLAMP (n_threads, 0, GIMP_PARALLEL_RUN_ASYNC_MAX_THREADS);
+
+  if (n_threads > gimp_parallel_run_async_n_threads) /* need more threads */
+    {
+      for (i = gimp_parallel_run_async_n_threads; i < n_threads; i++)
+        {
+          GimpParallelRunAsyncThread *thread =
+            &gimp_parallel_run_async_threads[i];
+
+          thread->quit = FALSE;
+
+          thread->thread = g_thread_new (
+            "async",
+            (GThreadFunc) gimp_parallel_run_async_thread_func,
+            thread);
+        }
+    }
+  else if (n_threads < gimp_parallel_run_async_n_threads) /* need less threads */
+    {
+      g_mutex_lock (&gimp_parallel_run_async_mutex);
+
+      for (i = n_threads; i < gimp_parallel_run_async_n_threads; i++)
+        {
+          GimpParallelRunAsyncThread *thread =
+            &gimp_parallel_run_async_threads[i];
+
+          thread->quit = TRUE;
+
+          if (thread->current_async && ! finish_tasks)
+            gimp_cancelable_cancel (GIMP_CANCELABLE (thread->current_async));
+        }
+
+      g_cond_broadcast (&gimp_parallel_run_async_cond);
+
+      g_mutex_unlock (&gimp_parallel_run_async_mutex);
+
+      for (i = n_threads; i < gimp_parallel_run_async_n_threads; i++)
+        {
+          GimpParallelRunAsyncThread *thread =
+            &gimp_parallel_run_async_threads[i];
+
+          g_thread_join (thread->thread);
+        }
+    }
+
+  gimp_parallel_run_async_n_threads = n_threads;
+
+  if (n_threads == 0)
+    {
+      GimpParallelRunAsyncTask *task;
+
+      /* finish remaining tasks */
+      while ((task = gimp_parallel_run_async_dequeue_task ()))
+        {
+          if (finish_tasks)
+            while (gimp_parallel_run_async_execute_task (task));
+          else
+            gimp_parallel_run_async_abort_task (task);
+        }
+    }
+}
+
+static gpointer
+gimp_parallel_run_async_thread_func (GimpParallelRunAsyncThread *thread)
+{
+  g_mutex_lock (&gimp_parallel_run_async_mutex);
+
+  while (TRUE)
+    {
+      GimpParallelRunAsyncTask *task;
+
+      while (! thread->quit &&
+             (task = gimp_parallel_run_async_dequeue_task ()))
+        {
+          gboolean resume;
+
+          thread->current_async = GIMP_ASYNC (g_object_ref (task->async));
+
+          do
+            {
+              g_mutex_unlock (&gimp_parallel_run_async_mutex);
+
+              resume = gimp_parallel_run_async_execute_task (task);
+
+              g_mutex_lock (&gimp_parallel_run_async_mutex);
+            }
+          while (resume &&
+                 (g_queue_is_empty (&gimp_parallel_run_async_queue) ||
+                  task->priority <
+                  ((GimpParallelRunAsyncTask *)
+                     g_queue_peek_head (
+                       &gimp_parallel_run_async_queue))->priority));
+
+          g_clear_object (&thread->current_async);
+
+          if (resume)
+            gimp_parallel_run_async_enqueue_task (task);
+        }
+
+      if (thread->quit)
+        break;
+
+      g_cond_wait (&gimp_parallel_run_async_cond,
+                   &gimp_parallel_run_async_mutex);
+    }
+
+  g_mutex_unlock (&gimp_parallel_run_async_mutex);
+
+  return NULL;
+}
+
+static void
+gimp_parallel_run_async_enqueue_task (GimpParallelRunAsyncTask *task)
+{
+  GList *link;
+  GList *iter;
+
+  if (gimp_async_is_canceled (task->async))
+    {
+      gimp_parallel_run_async_abort_task (task);
+
+      return;
+    }
+
+  link       = g_list_alloc ();
+  link->data = task;
+
+  g_object_set_data (G_OBJECT (task->async),
+                     "gimp-parallel-run-async-link", link);
+
+  for (iter = g_queue_peek_tail_link (&gimp_parallel_run_async_queue);
+       iter;
+       iter = g_list_previous (iter))
+    {
+      GimpParallelRunAsyncTask *other_task =
+        (GimpParallelRunAsyncTask *) iter->data;
+
+      if (other_task->priority <= task->priority)
+        break;
+    }
+
+  if (iter)
+    {
+      link->prev = iter;
+      link->next = iter->next;
+
+      iter->next = link;
+
+      if (link->next)
+        link->next->prev = link;
+      else
+        gimp_parallel_run_async_queue.tail = link;
+
+      gimp_parallel_run_async_queue.length++;
+    }
+  else
+    {
+      g_queue_push_head_link (&gimp_parallel_run_async_queue, link);
+    }
+}
+
+static GimpParallelRunAsyncTask *
+gimp_parallel_run_async_dequeue_task (void)
+{
+  GimpParallelRunAsyncTask *task;
+
+  task = (GimpParallelRunAsyncTask *) g_queue_pop_head (
+                                        &gimp_parallel_run_async_queue);
+
+  if (task)
+    {
+      g_object_set_data (G_OBJECT (task->async),
+                         "gimp-parallel-run-async-link", NULL);
+    }
+
+  return task;
+}
+
+static gboolean
+gimp_parallel_run_async_execute_task (GimpParallelRunAsyncTask *task)
+{
+  if (gimp_async_is_canceled (task->async))
+    {
+      gimp_parallel_run_async_abort_task (task);
+
+      return FALSE;
+    }
+
+  task->func (task->async, task->user_data);
+
+  if (gimp_async_is_stopped (task->async))
+    {
+      g_object_unref (task->async);
+
+      g_slice_free (GimpParallelRunAsyncTask, task);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_parallel_run_async_abort_task (GimpParallelRunAsyncTask *task)
+{
+  if (task->user_data && task->user_data_destroy_func)
+    task->user_data_destroy_func (task->user_data);
+
+  gimp_async_abort (task->async);
+
+  g_object_unref (task->async);
+
+  g_slice_free (GimpParallelRunAsyncTask, task);
+}
+
+static void
+gimp_parallel_run_async_cancel (GimpAsync *async)
+{
+  GList                    *link;
+  GimpParallelRunAsyncTask *task = NULL;
+
+  link = (GList *) g_object_get_data (G_OBJECT (async),
+                                      "gimp-parallel-run-async-link");
+
+  if (! link)
+    return;
+
+  g_mutex_lock (&gimp_parallel_run_async_mutex);
+
+  link = (GList *) g_object_get_data (G_OBJECT (async),
+                                      "gimp-parallel-run-async-link");
+
+  if (link)
+    {
+      g_object_set_data (G_OBJECT (async),
+                         "gimp-parallel-run-async-link", NULL);
+
+      task = (GimpParallelRunAsyncTask *) link->data;
+
+      g_queue_delete_link (&gimp_parallel_run_async_queue, link);
+    }
+
+  g_mutex_unlock (&gimp_parallel_run_async_mutex);
+
+  if (task)
+    gimp_parallel_run_async_abort_task (task);
+}
+
+static void
+gimp_parallel_run_async_waiting (GimpAsync *async)
+{
+  GList *link;
+
+  link = (GList *) g_object_get_data (G_OBJECT (async),
+                                      "gimp-parallel-run-async-link");
+
+  if (! link)
+    return;
+
+  g_mutex_lock (&gimp_parallel_run_async_mutex);
+
+  link = (GList *) g_object_get_data (G_OBJECT (async),
+                                      "gimp-parallel-run-async-link");
+
+  if (link)
+    {
+      GimpParallelRunAsyncTask *task = (GimpParallelRunAsyncTask *) link->data;
+
+      task->priority = G_MININT;
+
+      g_queue_unlink         (&gimp_parallel_run_async_queue, link);
+      g_queue_push_head_link (&gimp_parallel_run_async_queue, link);
+    }
+
+  g_mutex_unlock (&gimp_parallel_run_async_mutex);
+}
+
+} /* extern "C" */
diff --git a/app/core/gimp-parallel.h b/app/core/gimp-parallel.h
new file mode 100644
index 0000000..76abc1d
--- /dev/null
+++ b/app/core/gimp-parallel.h
@@ -0,0 +1,157 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-parallel.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARALLEL_H__
+#define __GIMP_PARALLEL_H__
+
+
+void        gimp_parallel_init                       (Gimp             *gimp);
+void        gimp_parallel_exit                       (Gimp             *gimp);
+
+GimpAsync * gimp_parallel_run_async                  (GimpRunAsyncFunc  func,
+                                                      gpointer          user_data);
+GimpAsync * gimp_parallel_run_async_full             (gint              priority,
+                                                      GimpRunAsyncFunc  func,
+                                                      gpointer          user_data,
+                                                      GDestroyNotify    user_data_destroy_func);
+GimpAsync * gimp_parallel_run_async_independent      (GimpRunAsyncFunc  func,
+                                                      gpointer          user_data);
+GimpAsync * gimp_parallel_run_async_independent_full (gint              priority,
+                                                      GimpRunAsyncFunc  func,
+                                                      gpointer          user_data);
+
+
+#ifdef __cplusplus
+
+extern "C++"
+{
+
+#include <new>
+
+template <class RunAsyncFunc>
+inline GimpAsync *
+gimp_parallel_run_async (RunAsyncFunc func)
+{
+  RunAsyncFunc *func_copy = g_new (RunAsyncFunc, 1);
+
+  new (func_copy) RunAsyncFunc (func);
+
+  return gimp_parallel_run_async_full (0,
+                                       [] (GimpAsync *async,
+                                           gpointer   user_data)
+                                       {
+                                         RunAsyncFunc *func_copy =
+                                           (RunAsyncFunc *) user_data;
+
+                                         (*func_copy) (async);
+
+                                         func_copy->~RunAsyncFunc ();
+                                         g_free (func_copy);
+                                       },
+                                       func_copy,
+                                       [] (gpointer user_data)
+                                       {
+                                         RunAsyncFunc *func_copy =
+                                           (RunAsyncFunc *) user_data;
+
+                                         func_copy->~RunAsyncFunc ();
+                                         g_free (func_copy);
+                                       });
+}
+
+template <class RunAsyncFunc,
+          class DestroyFunc>
+inline GimpAsync *
+gimp_parallel_run_async_full (gint         priority,
+                              RunAsyncFunc func,
+                              DestroyFunc  destroy_func)
+{
+  typedef struct
+  {
+    RunAsyncFunc func;
+    DestroyFunc  destroy_func;
+  } Funcs;
+
+  Funcs *funcs_copy = g_new (Funcs, 1);
+
+  new (funcs_copy) Funcs {func, destroy_func};
+
+  return gimp_parallel_run_async_full (priority,
+                                       [] (GimpAsync *async,
+                                           gpointer   user_data)
+                                       {
+                                         Funcs *funcs_copy =
+                                           (Funcs *) user_data;
+
+                                         funcs_copy->func (async);
+
+                                         funcs_copy->~Funcs ();
+                                         g_free (funcs_copy);
+                                       },
+                                       funcs_copy,
+                                       [] (gpointer user_data)
+                                       {
+                                         Funcs *funcs_copy =
+                                           (Funcs *) user_data;
+
+                                         funcs_copy->destroy_func ();
+
+                                         funcs_copy->~Funcs ();
+                                         g_free (funcs_copy);
+                                       });
+}
+
+template <class RunAsyncFunc>
+inline GimpAsync *
+gimp_parallel_run_async_independent_full (gint         priority,
+                                          RunAsyncFunc func)
+{
+  RunAsyncFunc *func_copy = g_new (RunAsyncFunc, 1);
+
+  new (func_copy) RunAsyncFunc (func);
+
+  return gimp_parallel_run_async_independent_full (priority,
+                                                   [] (GimpAsync *async,
+                                                       gpointer   user_data)
+                                                   {
+                                                     RunAsyncFunc *func_copy =
+                                                       (RunAsyncFunc *) user_data;
+
+                                                     (*func_copy) (async);
+
+                                                     func_copy->~RunAsyncFunc ();
+                                                     g_free (func_copy);
+                                                   },
+                                                   func_copy);
+}
+
+template <class RunAsyncFunc>
+inline GimpAsync *
+gimp_parallel_run_async_independent (RunAsyncFunc func)
+{
+  return gimp_parallel_run_async_independent_full (0, func);
+}
+
+}
+
+#endif /* __cplusplus */
+
+
+#endif /* __GIMP_PARALLEL_H__ */
diff --git a/app/core/gimp-parasites.c b/app/core/gimp-parasites.c
new file mode 100644
index 0000000..e781a54
--- /dev/null
+++ b/app/core/gimp-parasites.c
@@ -0,0 +1,170 @@
+/* gimpparasite.c: Copyright 1998 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-parasites.h"
+#include "gimpparasitelist.h"
+
+
+gboolean
+gimp_parasite_validate (Gimp                *gimp,
+                        const GimpParasite  *parasite,
+                        GError             **error)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (parasite != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return TRUE;
+}
+
+void
+gimp_parasite_attach (Gimp               *gimp,
+                      const GimpParasite *parasite)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (parasite != NULL);
+
+  gimp_parasite_list_add (gimp->parasites, parasite);
+}
+
+void
+gimp_parasite_detach (Gimp        *gimp,
+                      const gchar *name)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (name != NULL);
+
+  gimp_parasite_list_remove (gimp->parasites, name);
+}
+
+const GimpParasite *
+gimp_parasite_find (Gimp        *gimp,
+                    const gchar *name)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return gimp_parasite_list_find (gimp->parasites, name);
+}
+
+static void
+list_func (const gchar    *key,
+           GimpParasite   *parasite,
+           gchar        ***current)
+{
+  *(*current)++ = g_strdup (key);
+}
+
+gchar **
+gimp_parasite_list (Gimp *gimp,
+                    gint *count)
+{
+  gchar **list;
+  gchar **current;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (count != NULL, NULL);
+
+  *count = gimp_parasite_list_length (gimp->parasites);
+
+  list = current = g_new (gchar *, *count);
+
+  gimp_parasite_list_foreach (gimp->parasites, (GHFunc) list_func, &current);
+
+  return list;
+}
+
+
+/*  FIXME: this doesn't belong here  */
+
+void
+gimp_parasite_shift_parent (GimpParasite *parasite)
+{
+  g_return_if_fail (parasite != NULL);
+
+  parasite->flags = (parasite->flags >> 8);
+}
+
+
+/*  parasiterc functions  */
+
+void
+gimp_parasiterc_load (Gimp *gimp)
+{
+  GFile  *file;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  file = gimp_directory_file ("parasiterc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (gimp->parasites),
+                                       file, NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+
+      g_error_free (error);
+    }
+
+  g_object_unref (file);
+}
+
+void
+gimp_parasiterc_save (Gimp *gimp)
+{
+  const gchar *header =
+    "GIMP parasiterc\n"
+    "\n"
+    "This file will be entirely rewritten each time you exit.";
+  const gchar *footer =
+    "end of parasiterc";
+
+  GFile  *file;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_PARASITE_LIST (gimp->parasites));
+
+  file = gimp_directory_file ("parasiterc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (gimp->parasites),
+                                        file,
+                                        header, footer, NULL,
+                                        &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_error_free (error);
+    }
+
+  g_object_unref (file);
+}
diff --git a/app/core/gimp-parasites.h b/app/core/gimp-parasites.h
new file mode 100644
index 0000000..06d38c8
--- /dev/null
+++ b/app/core/gimp-parasites.h
@@ -0,0 +1,41 @@
+/* gimpparasite.h: Copyright 1998 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARASITES_H__
+#define __GIMP_PARASITES_H__
+
+
+/* some wrappers to access gimp->parasites, mainly for the PDB */
+
+gboolean              gimp_parasite_validate     (Gimp               *gimp,
+                                                  const GimpParasite *parasite,
+                                                  GError            **error);
+void                  gimp_parasite_attach       (Gimp               *gimp,
+                                                  const GimpParasite *parasite);
+void                  gimp_parasite_detach       (Gimp               *gimp,
+                                                  const gchar        *name);
+const GimpParasite  * gimp_parasite_find         (Gimp               *gimp,
+                                                  const gchar        *name);
+gchar              ** gimp_parasite_list         (Gimp               *gimp,
+                                                  gint               *count);
+
+void                  gimp_parasite_shift_parent (GimpParasite       *parasite);
+
+void                  gimp_parasiterc_load       (Gimp               *gimp);
+void                  gimp_parasiterc_save       (Gimp               *gimp);
+
+
+#endif  /*  __GIMP_PARASITES_H__  */
diff --git a/app/core/gimp-spawn.c b/app/core/gimp-spawn.c
new file mode 100644
index 0000000..bfa08e8
--- /dev/null
+++ b/app/core/gimp-spawn.c
@@ -0,0 +1,250 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-spawn.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#ifdef HAVE_VFORK
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <errno.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <io.h>
+#endif
+
+#include "core-types.h"
+
+#include "gimp-spawn.h"
+
+#include "gimp-intl.h"
+
+
+#ifdef HAVE_VFORK
+
+/* copied from glib */
+static gint
+exec_err_to_g_error (gint en)
+{
+  switch (en)
+    {
+#ifdef EACCES
+    case EACCES:
+      return G_SPAWN_ERROR_ACCES;
+      break;
+#endif
+
+#ifdef EPERM
+    case EPERM:
+      return G_SPAWN_ERROR_PERM;
+      break;
+#endif
+
+#ifdef E2BIG
+    case E2BIG:
+      return G_SPAWN_ERROR_TOO_BIG;
+      break;
+#endif
+
+#ifdef ENOEXEC
+    case ENOEXEC:
+      return G_SPAWN_ERROR_NOEXEC;
+      break;
+#endif
+
+#ifdef ENAMETOOLONG
+    case ENAMETOOLONG:
+      return G_SPAWN_ERROR_NAMETOOLONG;
+      break;
+#endif
+
+#ifdef ENOENT
+    case ENOENT:
+      return G_SPAWN_ERROR_NOENT;
+      break;
+#endif
+
+#ifdef ENOMEM
+    case ENOMEM:
+      return G_SPAWN_ERROR_NOMEM;
+      break;
+#endif
+
+#ifdef ENOTDIR
+    case ENOTDIR:
+      return G_SPAWN_ERROR_NOTDIR;
+      break;
+#endif
+
+#ifdef ELOOP
+    case ELOOP:
+      return G_SPAWN_ERROR_LOOP;
+      break;
+#endif
+
+#ifdef ETXTBUSY
+    case ETXTBUSY:
+      return G_SPAWN_ERROR_TXTBUSY;
+      break;
+#endif
+
+#ifdef EIO
+    case EIO:
+      return G_SPAWN_ERROR_IO;
+      break;
+#endif
+
+#ifdef ENFILE
+    case ENFILE:
+      return G_SPAWN_ERROR_NFILE;
+      break;
+#endif
+
+#ifdef EMFILE
+    case EMFILE:
+      return G_SPAWN_ERROR_MFILE;
+      break;
+#endif
+
+#ifdef EINVAL
+    case EINVAL:
+      return G_SPAWN_ERROR_INVAL;
+      break;
+#endif
+
+#ifdef EISDIR
+    case EISDIR:
+      return G_SPAWN_ERROR_ISDIR;
+      break;
+#endif
+
+#ifdef ELIBBAD
+    case ELIBBAD:
+      return G_SPAWN_ERROR_LIBBAD;
+      break;
+#endif
+
+    default:
+      return G_SPAWN_ERROR_FAILED;
+      break;
+    }
+}
+
+#endif /* HAVE_VFORK */
+
+gboolean
+gimp_spawn_async (gchar       **argv,
+                  gchar       **envp,
+                  GSpawnFlags   flags,
+                  GPid         *child_pid,
+                  GError      **error)
+{
+  g_return_val_if_fail (argv != NULL, FALSE);
+  g_return_val_if_fail (argv[0] != NULL, FALSE);
+
+#ifdef HAVE_VFORK
+  if (flags == (G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
+                G_SPAWN_DO_NOT_REAP_CHILD      |
+                G_SPAWN_CHILD_INHERITS_STDIN))
+    {
+      pid_t pid;
+
+      pid = vfork ();
+
+      if (pid < 0)
+        {
+          gint errsv = errno;
+
+          g_set_error (error,
+                       G_SPAWN_ERROR,
+                       G_SPAWN_ERROR_FORK,
+                       _("Failed to fork (%s)"),
+                       g_strerror (errsv));
+
+          return FALSE;
+        }
+      else if (pid == 0)
+        {
+          if (envp)
+            execve (argv[0], argv, envp);
+          else
+            execv (argv[0], argv);
+
+          _exit (errno);
+        }
+      else
+        {
+          int   status = -1;
+          pid_t result;
+
+          result = waitpid (pid, &status, WNOHANG);
+
+          if (result)
+            {
+              if (result < 0)
+                {
+                  g_warning ("waitpid() should not fail in "
+                             "gimp_spawn_async()");
+                }
+
+              if (WIFEXITED (status))
+                status = WEXITSTATUS (status);
+              else
+                status = -1;
+
+              g_set_error (error,
+                           G_SPAWN_ERROR,
+                           exec_err_to_g_error (status),
+                           _("Failed to execute child process “%s” (%s)"),
+                           argv[0],
+                           g_strerror (status));
+
+              return FALSE;
+            }
+
+          if (child_pid) *child_pid = pid;
+
+          return TRUE;
+        }
+    }
+#endif /* HAVE_VFORK */
+
+  return g_spawn_async (NULL, argv, envp, flags, NULL, NULL, child_pid, error);
+}
+
+void
+gimp_spawn_set_cloexec (gint fd)
+{
+#if defined (G_OS_WIN32)
+  SetHandleInformation ((HANDLE) _get_osfhandle (fd), HANDLE_FLAG_INHERIT, 0);
+#elif defined (HAVE_FCNTL_H)
+  fcntl (fd, F_SETFD, fcntl (fd, F_GETFD, 0) | FD_CLOEXEC);
+#elif defined (__GNUC__)
+#warning gimp_spawn_set_cloexec() is not implemented for the target platform
+#endif
+}
diff --git a/app/core/gimp-spawn.h b/app/core/gimp-spawn.h
new file mode 100644
index 0000000..f81cf7d
--- /dev/null
+++ b/app/core/gimp-spawn.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-spawn.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SPAWN_H__
+#define __GIMP_SPAWN_H__
+
+
+gboolean   gimp_spawn_async       (gchar       **argv,
+                                   gchar       **envp,
+                                   GSpawnFlags   flags,
+                                   GPid         *child_pid,
+                                   GError      **error);
+
+void       gimp_spawn_set_cloexec (gint          fd);
+
+
+#endif /* __GIMP_SPAWN_H__ */
diff --git a/app/core/gimp-tags.c b/app/core/gimp-tags.c
new file mode 100644
index 0000000..5efedb9
--- /dev/null
+++ b/app/core/gimp-tags.c
@@ -0,0 +1,271 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-tags.c
+ * Copyright (C) 2009 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "config/gimpxmlparser.h"
+
+#include "gimp-utils.h"
+#include "gimp-tags.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_TAGS_FILE "tags.xml"
+
+typedef struct
+{
+  const gchar *locale;
+  GString     *buf;
+  gboolean     locale_matches;
+} GimpTagsInstaller;
+
+
+static  void        gimp_tags_installer_load_start_element (GMarkupParseContext *context,
+                                                            const gchar         *element_name,
+                                                            const gchar        **attribute_names,
+                                                            const gchar        **attribute_values,
+                                                            gpointer             user_data,
+                                                            GError             **error);
+static void         gimp_tags_installer_load_end_element   (GMarkupParseContext *context,
+                                                            const gchar         *element_name,
+                                                            gpointer             user_data,
+                                                            GError             **error);
+static void         gimp_tags_installer_load_text          (GMarkupParseContext *context,
+                                                            const gchar         *text,
+                                                            gsize                text_len,
+                                                            gpointer             user_data,
+                                                            GError             **error);
+static const gchar* attribute_name_to_value                (const gchar        **attribute_names,
+                                                            const gchar        **attribute_values,
+                                                            const gchar         *name);
+
+
+gboolean
+gimp_tags_user_install (void)
+{
+  GFile             *file;
+  GOutputStream     *output;
+  GMarkupParser      markup_parser;
+  GimpXmlParser     *xml_parser;
+  const char        *tags_locale;
+  GimpTagsInstaller  tags_installer = { 0, };
+  GError            *error          = NULL;
+  gboolean           result         = TRUE;
+
+  /* This is a special string to specify the language identifier to
+   * look for in the gimp-tags-default.xml file. Please translate the
+   * C in it according to the name of the po file used for
+   * gimp-tags-default.xml. E.g. lithuanian for the translation,
+   * that would be "tags-locale:lt".
+   */
+  tags_locale = _("tags-locale:C");
+
+  if (g_str_has_prefix (tags_locale, "tags-locale:"))
+    {
+      tags_locale += strlen ("tags-locale:");
+
+      if (*tags_locale && *tags_locale != 'C')
+        tags_installer.locale = tags_locale;
+    }
+  else
+    {
+      g_warning ("Wrong translation for 'tags-locale:', fix the translation!");
+    }
+
+  tags_installer.buf = g_string_new (NULL);
+
+  g_string_append (tags_installer.buf, "<?xml version='1.0' encoding='UTF-8'?>\n");
+  g_string_append (tags_installer.buf, "<tags>\n");
+
+  markup_parser.start_element = gimp_tags_installer_load_start_element;
+  markup_parser.end_element   = gimp_tags_installer_load_end_element;
+  markup_parser.text          = gimp_tags_installer_load_text;
+  markup_parser.passthrough   = NULL;
+  markup_parser.error         = NULL;
+
+  xml_parser = gimp_xml_parser_new (&markup_parser, &tags_installer);
+
+  file = gimp_data_directory_file ("tags", "gimp-tags-default.xml", NULL);
+  result = gimp_xml_parser_parse_gfile (xml_parser, file, &error);
+  g_object_unref (file);
+
+  gimp_xml_parser_free (xml_parser);
+
+  if (! result)
+    {
+      g_string_free (tags_installer.buf, TRUE);
+      return FALSE;
+    }
+
+  g_string_append (tags_installer.buf, "\n</tags>\n");
+
+  file = gimp_directory_file (GIMP_TAGS_FILE, NULL);
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, &error));
+  if (! output)
+    {
+      g_printerr ("%s\n", error->message);
+      result = FALSE;
+    }
+  else if (! g_output_stream_write_all (output,
+                                        tags_installer.buf->str,
+                                        tags_installer.buf->len,
+                                        NULL, NULL, &error))
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      g_printerr (_("Error writing '%s': %s"),
+                  gimp_file_get_utf8_name (file), error->message);
+      result = FALSE;
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (output, cancellable, NULL);
+      g_object_unref (cancellable);
+    }
+  else if (! g_output_stream_close (output, NULL, &error))
+    {
+      g_printerr (_("Error closing '%s': %s"),
+                  gimp_file_get_utf8_name (file), error->message);
+      result = FALSE;
+    }
+
+  if (output)
+    g_object_unref (output);
+
+  g_clear_error (&error);
+  g_object_unref (file);
+  g_string_free (tags_installer.buf, TRUE);
+
+  return result;
+}
+
+static  void
+gimp_tags_installer_load_start_element (GMarkupParseContext  *context,
+                                        const gchar          *element_name,
+                                        const gchar         **attribute_names,
+                                        const gchar         **attribute_values,
+                                        gpointer              user_data,
+                                        GError              **error)
+{
+  GimpTagsInstaller *tags_installer = user_data;
+
+  if (! strcmp (element_name, "resource"))
+    {
+      g_string_append_printf (tags_installer->buf, "\n  <resource");
+
+      while (*attribute_names)
+        {
+          g_string_append_printf (tags_installer->buf, " %s=\"%s\"",
+                                  *attribute_names, *attribute_values);
+
+          attribute_names++;
+          attribute_values++;
+        }
+
+      g_string_append_printf (tags_installer->buf, ">\n");
+    }
+  else if (! strcmp (element_name, "thetag"))
+    {
+      const char *current_locale;
+
+      current_locale = attribute_name_to_value (attribute_names, attribute_values,
+                                                "xml:lang");
+
+      if (current_locale && tags_installer->locale)
+        {
+          tags_installer->locale_matches = ! strcmp (current_locale,
+                                                     tags_installer->locale);
+        }
+      else
+        {
+          tags_installer->locale_matches = (current_locale ==
+                                            tags_installer->locale);
+        }
+    }
+}
+
+static void
+gimp_tags_installer_load_end_element (GMarkupParseContext  *context,
+                                      const gchar          *element_name,
+                                      gpointer              user_data,
+                                      GError              **error)
+{
+  GimpTagsInstaller *tags_installer = user_data;
+
+  if (strcmp (element_name, "resource") == 0)
+    {
+      g_string_append (tags_installer->buf, "  </resource>\n");
+    }
+}
+
+static void
+gimp_tags_installer_load_text (GMarkupParseContext  *context,
+                               const gchar          *text,
+                               gsize                 text_len,
+                               gpointer              user_data,
+                               GError              **error)
+{
+  GimpTagsInstaller *tags_installer = user_data;
+  const gchar       *current_element;
+  gchar             *tag_string;
+
+  current_element = g_markup_parse_context_get_element (context);
+
+  if (tags_installer->locale_matches &&
+      current_element &&
+      strcmp (current_element, "thetag") == 0)
+    {
+      tag_string = g_markup_escape_text (text, text_len);
+      g_string_append_printf (tags_installer->buf, "    <tag>%s</tag>\n",
+                              tag_string);
+      g_free (tag_string);
+    }
+}
+
+static const gchar *
+attribute_name_to_value (const gchar **attribute_names,
+                         const gchar **attribute_values,
+                         const gchar  *name)
+{
+  while (*attribute_names)
+    {
+      if (! strcmp (*attribute_names, name))
+        {
+          return *attribute_values;
+        }
+
+      attribute_names++;
+      attribute_values++;
+    }
+
+  return NULL;
+}
diff --git a/app/core/gimp-tags.h b/app/core/gimp-tags.h
new file mode 100644
index 0000000..8f52dce
--- /dev/null
+++ b/app/core/gimp-tags.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAGS_H__
+#define __GIMP_TAGS_H__
+
+
+gboolean gimp_tags_user_install (void);
+
+
+#endif  /*  __GIMP_TAGS_H__  */
diff --git a/app/core/gimp-templates.c b/app/core/gimp-templates.c
new file mode 100644
index 0000000..ba0800d
--- /dev/null
+++ b/app/core/gimp-templates.c
@@ -0,0 +1,213 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-templates.h"
+#include "gimplist.h"
+#include "gimptemplate.h"
+
+
+/* functions to load and save the gimp templates files */
+
+void
+gimp_templates_load (Gimp *gimp)
+{
+  GFile  *file;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_LIST (gimp->templates));
+
+  file = gimp_directory_file ("templaterc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (gimp->templates),
+                                       file, NULL, &error))
+    {
+      if (error->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        {
+          g_clear_error (&error);
+          g_object_unref (file);
+
+          file = gimp_sysconf_directory_file ("templaterc", NULL);
+
+          if (! gimp_config_deserialize_gfile (GIMP_CONFIG (gimp->templates),
+                                               file, NULL, &error))
+            {
+              gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+                                    error->message);
+            }
+        }
+      else
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+        }
+
+      g_clear_error (&error);
+    }
+
+  gimp_list_reverse (GIMP_LIST (gimp->templates));
+
+  g_object_unref (file);
+}
+
+void
+gimp_templates_save (Gimp *gimp)
+{
+  const gchar *header =
+    "GIMP templaterc\n"
+    "\n"
+    "This file will be entirely rewritten each time you exit.";
+  const gchar *footer =
+    "end of templaterc";
+
+  GFile  *file;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_LIST (gimp->templates));
+
+  file = gimp_directory_file ("templaterc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (gimp->templates),
+                                        file,
+                                        header, footer, NULL,
+                                        &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_error_free (error);
+    }
+
+  g_object_unref (file);
+}
+
+
+/*  just like gimp_list_get_child_by_name() but matches case-insensitive
+ *  and dpi/ppi-insensitive
+ */
+static GimpObject *
+gimp_templates_migrate_get_child_by_name (GimpContainer *container,
+                                          const gchar   *name)
+{
+  GimpList   *list   = GIMP_LIST (container);
+  GimpObject *retval = NULL;
+  GList      *glist;
+
+  for (glist = list->queue->head; glist; glist = g_list_next (glist))
+    {
+      GimpObject *object = glist->data;
+      gchar      *str1   = g_ascii_strdown (gimp_object_get_name (object), -1);
+      gchar      *str2   = g_ascii_strdown (name, -1);
+
+      if (! strcmp (str1, str2))
+        {
+          retval = object;
+        }
+      else
+        {
+          gchar *dpi = strstr (str1, "dpi");
+
+          if (dpi)
+            {
+              memcpy (dpi, "ppi", 3);
+
+              g_print ("replaced: %s\n", str1);
+
+              if (! strcmp (str1, str2))
+                retval = object;
+            }
+        }
+
+      g_free (str1);
+      g_free (str2);
+    }
+
+  return retval;
+}
+
+/**
+ * gimp_templates_migrate:
+ * @olddir: the old user directory
+ *
+ * Migrating the templaterc from GIMP 2.0 to GIMP 2.2 needs this special
+ * hack since we changed the way that units are handled. This function
+ * merges the user's templaterc with the systemwide templaterc. The goal
+ * is to replace the unit for a couple of default templates with "pixels".
+ **/
+void
+gimp_templates_migrate (const gchar *olddir)
+{
+  GimpContainer *templates = gimp_list_new (GIMP_TYPE_TEMPLATE, TRUE);
+  GFile         *file      = gimp_directory_file ("templaterc", NULL);
+
+  if (gimp_config_deserialize_gfile (GIMP_CONFIG (templates), file,
+                                     NULL, NULL))
+    {
+      GFile *sysconf_file;
+
+      sysconf_file = gimp_sysconf_directory_file ("templaterc", NULL);
+
+      if (olddir && (strstr (olddir, "2.0") || strstr (olddir, "2.2")))
+        {
+          /* We changed the spelling of a couple of template names:
+           *
+           * - from upper to lower case between 2.0 and 2.2
+           * - from "dpi" to "ppi" between 2.2 and 2.4
+           */
+          GimpContainerClass *class = GIMP_CONTAINER_GET_CLASS (templates);
+          gpointer            func  = class->get_child_by_name;
+
+          class->get_child_by_name = gimp_templates_migrate_get_child_by_name;
+
+          gimp_config_deserialize_gfile (GIMP_CONFIG (templates),
+                                         sysconf_file, NULL, NULL);
+
+          class->get_child_by_name = func;
+        }
+      else
+        {
+          gimp_config_deserialize_gfile (GIMP_CONFIG (templates),
+                                         sysconf_file, NULL, NULL);
+        }
+
+      g_object_unref (sysconf_file);
+
+      gimp_list_reverse (GIMP_LIST (templates));
+
+      gimp_config_serialize_to_gfile (GIMP_CONFIG (templates), file,
+                                      NULL, NULL, NULL, NULL);
+    }
+
+  g_object_unref (file);
+}
diff --git a/app/core/gimp-templates.h b/app/core/gimp-templates.h
new file mode 100644
index 0000000..3dc0fde
--- /dev/null
+++ b/app/core/gimp-templates.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEMPLATES_H__
+#define __GIMP_TEMPLATES_H__
+
+
+void  gimp_templates_load    (Gimp        *gimp);
+void  gimp_templates_save    (Gimp        *gimp);
+
+void  gimp_templates_migrate (const gchar *olddir);
+
+
+#endif  /*  __GIMP_TEMPLATES_H__  */
diff --git a/app/core/gimp-transform-3d-utils.c b/app/core/gimp-transform-3d-utils.c
new file mode 100644
index 0000000..5ea9f81
--- /dev/null
+++ b/app/core/gimp-transform-3d-utils.c
@@ -0,0 +1,359 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-3d-transform-utils.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp-transform-3d-utils.h"
+
+
+#define MIN_FOCAL_LENGTH 0.01
+
+
+gdouble
+gimp_transform_3d_angle_of_view_to_focal_length (gdouble angle_of_view,
+                                                 gdouble width,
+                                                 gdouble height)
+{
+  return MAX (width, height) / (2.0 * tan (angle_of_view / 2.0));
+}
+
+gdouble
+gimp_transform_3d_focal_length_to_angle_of_view (gdouble focal_length,
+                                                 gdouble width,
+                                                 gdouble height)
+{
+  return 2.0 * atan (MAX (width, height) / (2.0 * focal_length));
+}
+
+gint
+gimp_transform_3d_permutation_to_rotation_order (const gint permutation[3])
+{
+  if (permutation[1] == (permutation[0] + 1) % 3)
+    return permutation[0] << 1;
+  else
+    return (permutation[2] << 1) + 1;
+}
+
+void
+gimp_transform_3d_rotation_order_to_permutation (gint rotation_order,
+                                                 gint permutation[3])
+{
+  gboolean reverse = rotation_order & 1;
+  gint     shift   = rotation_order >> 1;
+  gint i;
+
+  for (i = 0; i < 3; i++)
+    permutation[reverse ? 2 - i : i] = (i + shift) % 3;
+}
+
+gint
+gimp_transform_3d_rotation_order_reverse (gint rotation_order)
+{
+  return rotation_order ^ 1;
+}
+
+void
+gimp_transform_3d_vector3_rotate (GimpVector3       *vector,
+                                  const GimpVector3 *axis)
+{
+  GimpVector3 normal;
+  GimpVector3 proj;
+  GimpVector3 u, v;
+  gdouble     angle;
+
+  angle = gimp_vector3_length (axis);
+
+  if (angle == 0.0)
+    return;
+
+  normal = gimp_vector3_mul_val (*axis, 1.0 / angle);
+
+  proj = gimp_vector3_mul_val (normal,
+                               gimp_vector3_inner_product_val (*vector,
+                                                               normal));
+
+  u = gimp_vector3_sub_val (*vector, proj);
+  v = gimp_vector3_cross_product_val (u, normal);
+
+  gimp_vector3_mul (&u, cos (angle));
+  gimp_vector3_mul (&v, sin (angle));
+
+  *vector = proj;
+
+  gimp_vector3_add (vector, vector, &u);
+  gimp_vector3_add (vector, vector, &v);
+}
+
+GimpVector3
+gimp_transform_3d_vector3_rotate_val (GimpVector3 vector,
+                                      GimpVector3 axis)
+{
+  gimp_transform_3d_vector3_rotate (&vector, &axis);
+
+  return vector;
+}
+
+void
+gimp_transform_3d_matrix3_to_matrix4 (const GimpMatrix3 *matrix3,
+                                      GimpMatrix4       *matrix4,
+                                      gint               axis)
+{
+  gint i, j;
+  gint k, l;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (i == axis)
+        {
+          matrix4->coeff[i][i] = 1.0;
+        }
+      else
+        {
+          matrix4->coeff[axis][i] = 0.0;
+          matrix4->coeff[i][axis] = 0.0;
+        }
+    }
+
+  for (i = 0; i < 3; i++)
+    {
+      k = i + (i >= axis);
+
+      for (j = 0; j < 3; j++)
+        {
+          l = j + (j >= axis);
+
+          matrix4->coeff[k][l] = matrix3->coeff[i][j];
+        }
+    }
+}
+
+void
+gimp_transform_3d_matrix4_to_matrix3 (const GimpMatrix4 *matrix4,
+                                      GimpMatrix3       *matrix3,
+                                      gint               axis)
+{
+  gint i, j;
+  gint k, l;
+
+  for (i = 0; i < 3; i++)
+    {
+      k = i + (i >= axis);
+
+      for (j = 0; j < 3; j++)
+        {
+          l = j + (j >= axis);
+
+          matrix3->coeff[i][j] = matrix4->coeff[k][l];
+        }
+    }
+}
+
+void
+gimp_transform_3d_matrix4_translate (GimpMatrix4 *matrix,
+                                     gdouble      x,
+                                     gdouble      y,
+                                     gdouble      z)
+{
+  gint i;
+
+  for (i = 0; i < 4; i++)
+    matrix->coeff[0][i] += x * matrix->coeff[3][i];
+
+  for (i = 0; i < 4; i++)
+    matrix->coeff[1][i] += y * matrix->coeff[3][i];
+
+  for (i = 0; i < 4; i++)
+    matrix->coeff[2][i] += z * matrix->coeff[3][i];
+}
+
+void
+gimp_transform_3d_matrix4_rotate (GimpMatrix4       *matrix,
+                                  const GimpVector3 *axis)
+{
+  GimpMatrix4 rotation;
+  GimpVector3 v;
+
+  v = gimp_transform_3d_vector3_rotate_val ((GimpVector3) {1.0, 0.0, 0.0},
+                                            *axis);
+
+  rotation.coeff[0][0] = v.x;
+  rotation.coeff[1][0] = v.y;
+  rotation.coeff[2][0] = v.z;
+  rotation.coeff[3][0] = 0.0;
+
+  v = gimp_transform_3d_vector3_rotate_val ((GimpVector3) {0.0, 1.0, 0.0},
+                                            *axis);
+
+  rotation.coeff[0][1] = v.x;
+  rotation.coeff[1][1] = v.y;
+  rotation.coeff[2][1] = v.z;
+  rotation.coeff[3][1] = 0.0;
+
+  v = gimp_transform_3d_vector3_rotate_val ((GimpVector3) {0.0, 0.0, 1.0},
+                                            *axis);
+
+  rotation.coeff[0][2] = v.x;
+  rotation.coeff[1][2] = v.y;
+  rotation.coeff[2][2] = v.z;
+  rotation.coeff[3][2] = 0.0;
+
+  rotation.coeff[0][3] = 0.0;
+  rotation.coeff[1][3] = 0.0;
+  rotation.coeff[2][3] = 0.0;
+  rotation.coeff[3][3] = 1.0;
+
+  gimp_matrix4_mult (&rotation, matrix);
+}
+
+void
+gimp_transform_3d_matrix4_rotate_standard (GimpMatrix4 *matrix,
+                                           gint         axis,
+                                           gdouble      angle)
+{
+  gdouble v[3] = {};
+
+  v[axis] = angle;
+
+  gimp_transform_3d_matrix4_rotate (matrix, &(GimpVector3) {v[0], v[1], v[2]});
+}
+
+void
+gimp_transform_3d_matrix4_rotate_euler (GimpMatrix4 *matrix,
+                                        gint         rotation_order,
+                                        gdouble      angle_x,
+                                        gdouble      angle_y,
+                                        gdouble      angle_z,
+                                        gdouble      pivot_x,
+                                        gdouble      pivot_y,
+                                        gdouble      pivot_z)
+{
+  const gdouble angles[3] = {angle_x, angle_y, angle_z};
+  gint          permutation[3];
+  gint          i;
+
+  gimp_transform_3d_rotation_order_to_permutation (rotation_order, permutation);
+
+  gimp_transform_3d_matrix4_translate (matrix, -pivot_x, -pivot_y, -pivot_z);
+
+  for (i = 0; i < 3; i++)
+    {
+      gimp_transform_3d_matrix4_rotate_standard (matrix,
+                                                 permutation[i],
+                                                 angles[permutation[i]]);
+    }
+
+  gimp_transform_3d_matrix4_translate (matrix, +pivot_x, +pivot_y, +pivot_z);
+}
+
+void
+gimp_transform_3d_matrix4_rotate_euler_decompose (GimpMatrix4 *matrix,
+                                                  gint         rotation_order,
+                                                  gdouble     *angle_x,
+                                                  gdouble     *angle_y,
+                                                  gdouble     *angle_z)
+{
+  GimpMatrix4     m = *matrix;
+  gdouble * const angles[3] = {angle_x, angle_y, angle_z};
+  gint            permutation[3];
+  gboolean        forward;
+
+  gimp_transform_3d_rotation_order_to_permutation (rotation_order, permutation);
+
+  forward = permutation[1] == (permutation[0] + 1) % 3;
+
+  *angles[permutation[2]] = atan2 (m.coeff[permutation[1]][permutation[0]],
+                                   m.coeff[permutation[0]][permutation[0]]);
+
+  if (forward)
+    *angles[permutation[2]] *= -1.0;
+
+  gimp_transform_3d_matrix4_rotate_standard (&m,
+                                             permutation[2],
+                                             -*angles[permutation[2]]);
+
+  *angles[permutation[1]] = atan2 (m.coeff[permutation[2]][permutation[0]],
+                                   m.coeff[permutation[0]][permutation[0]]);
+
+  if (! forward)
+    *angles[permutation[1]] *= -1.0;
+
+  gimp_transform_3d_matrix4_rotate_standard (&m,
+                                             permutation[1],
+                                             -*angles[permutation[1]]);
+
+  *angles[permutation[0]] = atan2 (m.coeff[permutation[2]][permutation[1]],
+                                   m.coeff[permutation[1]][permutation[1]]);
+
+  if (forward)
+    *angles[permutation[0]] *= -1.0;
+}
+
+void
+gimp_transform_3d_matrix4_perspective (GimpMatrix4 *matrix,
+                                       gdouble      camera_x,
+                                       gdouble      camera_y,
+                                       gdouble      camera_z)
+{
+  gint i;
+
+  camera_z = MIN (camera_z, -MIN_FOCAL_LENGTH);
+
+  gimp_transform_3d_matrix4_translate (matrix, -camera_x, -camera_y, 0.0);
+
+  for (i = 0; i < 4; i++)
+    matrix->coeff[3][i] += matrix->coeff[2][i] / -camera_z;
+
+  gimp_transform_3d_matrix4_translate (matrix, +camera_x, +camera_y, 0.0);
+}
+
+void
+gimp_transform_3d_matrix (GimpMatrix3 *matrix,
+                          gdouble      camera_x,
+                          gdouble      camera_y,
+                          gdouble      camera_z,
+                          gdouble      offset_x,
+                          gdouble      offset_y,
+                          gdouble      offset_z,
+                          gint         rotation_order,
+                          gdouble      angle_x,
+                          gdouble      angle_y,
+                          gdouble      angle_z,
+                          gdouble      pivot_x,
+                          gdouble      pivot_y,
+                          gdouble      pivot_z)
+{
+  GimpMatrix4 m;
+
+  gimp_matrix4_identity (&m);
+  gimp_transform_3d_matrix4_rotate_euler (&m,
+                                          rotation_order,
+                                          angle_x, angle_y, angle_z,
+                                          pivot_x, pivot_y, pivot_z);
+  gimp_transform_3d_matrix4_translate (&m, offset_x, offset_y, offset_z);
+  gimp_transform_3d_matrix4_perspective (&m, camera_x, camera_y, camera_z);
+
+  gimp_transform_3d_matrix4_to_matrix3 (&m, matrix, 2);
+}
diff --git a/app/core/gimp-transform-3d-utils.h b/app/core/gimp-transform-3d-utils.h
new file mode 100644
index 0000000..92f6795
--- /dev/null
+++ b/app/core/gimp-transform-3d-utils.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-3d-transform-utils.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_3D_UTILS_H__
+#define __GIMP_TRANSFORM_3D_UTILS_H__
+
+
+gdouble       gimp_transform_3d_angle_of_view_to_focal_length   (gdouble            angle_of_view,
+                                                                 gdouble            width,
+                                                                 gdouble            height);
+gdouble       gimp_transform_3d_focal_length_to_angle_of_view   (gdouble            focal_length,
+                                                                 gdouble            width,
+                                                                 gdouble            height);
+
+gint          gimp_transform_3d_permutation_to_rotation_order   (const gint         permutation[3]);
+void          gimp_transform_3d_rotation_order_to_permutation   (gint               rotation_order,
+                                                                 gint               permutation[3]);
+gint          gimp_transform_3d_rotation_order_reverse          (gint               rotation_order);
+
+void          gimp_transform_3d_vector3_rotate                  (GimpVector3       *vector,
+                                                                 const GimpVector3 *axis);
+GimpVector3   gimp_transform_3d_vector3_rotate_val              (GimpVector3        vector,
+                                                                 GimpVector3        axis);
+
+void          gimp_transform_3d_matrix3_to_matrix4              (const GimpMatrix3 *matrix3,
+                                                                 GimpMatrix4       *matrix4,
+                                                                 gint               axis);
+void          gimp_transform_3d_matrix4_to_matrix3              (const GimpMatrix4 *matrix4,
+                                                                 GimpMatrix3       *matrix3,
+                                                                 gint               axis);
+
+void          gimp_transform_3d_matrix4_translate               (GimpMatrix4       *matrix,
+                                                                 gdouble            x,
+                                                                 gdouble            y,
+                                                                 gdouble            z);
+
+void          gimp_transform_3d_matrix4_rotate                  (GimpMatrix4       *matrix,
+                                                                 const GimpVector3 *axis);
+void          gimp_transform_3d_matrix4_rotate_standard         (GimpMatrix4       *matrix,
+                                                                 gint               axis,
+                                                                 gdouble            angle);
+
+void          gimp_transform_3d_matrix4_rotate_euler            (GimpMatrix4       *matrix,
+                                                                 gint               rotation_order,
+                                                                 gdouble            angle_x,
+                                                                 gdouble            angle_y,
+                                                                 gdouble            angle_z,
+                                                                 gdouble            pivot_x,
+                                                                 gdouble            pivot_y,
+                                                                 gdouble            pivot_z);
+void          gimp_transform_3d_matrix4_rotate_euler_decompose  (GimpMatrix4       *matrix,
+                                                                 gint               rotation_order,
+                                                                 gdouble           *angle_x,
+                                                                 gdouble           *angle_y,
+                                                                 gdouble           *angle_z);
+
+void          gimp_transform_3d_matrix4_perspective             (GimpMatrix4       *matrix,
+                                                                 gdouble            camera_x,
+                                                                 gdouble            camera_y,
+                                                                 gdouble            camera_z);
+
+void          gimp_transform_3d_matrix                          (GimpMatrix3       *matrix,
+                                                                 gdouble            camera_x,
+                                                                 gdouble            camera_y,
+                                                                 gdouble            camera_z,
+                                                                 gdouble            offset_x,
+                                                                 gdouble            offset_y,
+                                                                 gdouble            offset_z,
+                                                                 gint               rotation_order,
+                                                                 gdouble            angle_x,
+                                                                 gdouble            angle_y,
+                                                                 gdouble            angle_z,
+                                                                 gdouble            pivot_x,
+                                                                 gdouble            pivot_y,
+                                                                 gdouble            pivot_z);
+
+
+#endif /* __GIMP_TRANSFORM_3D_UTILS_H__ */
diff --git a/app/core/gimp-transform-resize.c b/app/core/gimp-transform-resize.c
new file mode 100644
index 0000000..7aabd67
--- /dev/null
+++ b/app/core/gimp-transform-resize.c
@@ -0,0 +1,841 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp-transform-resize.h"
+#include "gimp-transform-utils.h"
+#include "gimp-utils.h"
+
+
+#if defined (HAVE_ISFINITE)
+#define FINITE(x) isfinite(x)
+#elif defined (HAVE_FINITE)
+#define FINITE(x) finite(x)
+#elif defined (G_OS_WIN32)
+#define FINITE(x) _finite(x)
+#else
+#error "no FINITE() implementation available?!"
+#endif
+
+#define EPSILON 0.00000001
+
+
+typedef struct
+{
+  GimpVector2 a, b, c, d;
+  gdouble     area;
+  gdouble     aspect;
+} Rectangle;
+
+
+static void      gimp_transform_resize_adjust        (const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gint              *x1,
+                                                      gint              *y1,
+                                                      gint              *x2,
+                                                      gint              *y2);
+static void      gimp_transform_resize_crop          (const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gdouble            aspect,
+                                                      gint              *x1,
+                                                      gint              *y1,
+                                                      gint              *x2,
+                                                      gint              *y2);
+
+static void      add_rectangle                       (const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      Rectangle         *r,
+                                                      GimpVector2        a,
+                                                      GimpVector2        b,
+                                                      GimpVector2        c,
+                                                      GimpVector2        d);
+static gboolean  intersect                           (GimpVector2        a,
+                                                      GimpVector2        b,
+                                                      GimpVector2        c,
+                                                      GimpVector2        d,
+                                                      GimpVector2       *i);
+static gboolean  intersect_x                         (GimpVector2        a,
+                                                      GimpVector2        b,
+                                                      GimpVector2        c,
+                                                      GimpVector2       *i);
+static gboolean  intersect_y                         (GimpVector2        a,
+                                                      GimpVector2        b,
+                                                      GimpVector2        c,
+                                                      GimpVector2       *i);
+static gboolean  in_poly                             (const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      GimpVector2        p);
+static gboolean  point_on_border                     (const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      GimpVector2        p);
+
+static void      find_two_point_rectangle            (Rectangle         *r,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gint               p);
+static void      find_three_point_rectangle_corner   (Rectangle         *r,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gint               p);
+static void      find_three_point_rectangle          (Rectangle          *r,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gint               p);
+static void      find_three_point_rectangle_triangle (Rectangle         *r,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gint               p);
+static void      find_maximum_aspect_rectangle       (Rectangle          *r,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      gint               p);
+
+
+/*
+ * This function wants to be passed the inverse transformation matrix!!
+ */
+gboolean
+gimp_transform_resize_boundary (const GimpMatrix3   *inv,
+                                GimpTransformResize  resize,
+                                gdouble              u1,
+                                gdouble              v1,
+                                gdouble              u2,
+                                gdouble              v2,
+                                gint                *x1,
+                                gint                *y1,
+                                gint                *x2,
+                                gint                *y2)
+{
+  GimpVector2 bounds[4];
+  GimpVector2 points[5];
+  gint        n_points;
+  gboolean    valid;
+  gint        i;
+
+  g_return_val_if_fail (inv != NULL, FALSE);
+
+  /*  initialize with the original boundary  */
+  *x1 = floor (u1);
+  *y1 = floor (v1);
+  *x2 = ceil  (u2);
+  *y2 = ceil  (v2);
+
+  /* if clipping then just return the original rectangle */
+  if (resize == GIMP_TRANSFORM_RESIZE_CLIP)
+    return TRUE;
+
+  bounds[0] = (GimpVector2) { u1, v1 };
+  bounds[1] = (GimpVector2) { u2, v1 };
+  bounds[2] = (GimpVector2) { u2, v2 };
+  bounds[3] = (GimpVector2) { u1, v2 };
+
+  gimp_transform_polygon (inv, bounds, 4, TRUE,
+                          points, &n_points);
+
+  valid = (n_points >= 2);
+
+  /*  check if the transformation matrix is valid at all  */
+  for (i = 0; i < n_points && valid; i++)
+    valid = (FINITE (points[i].x) && FINITE (points[i].y));
+
+  if (! valid)
+    {
+      /* since there is no sensible way to deal with this, just do the same as
+       * with GIMP_TRANSFORM_RESIZE_CLIP: return
+       */
+      return FALSE;
+    }
+
+  switch (resize)
+    {
+    case GIMP_TRANSFORM_RESIZE_ADJUST:
+      /* return smallest rectangle (with sides parallel to x- and y-axis)
+       * that surrounds the new points */
+      gimp_transform_resize_adjust (points, n_points,
+                                    x1, y1, x2, y2);
+      break;
+
+    case GIMP_TRANSFORM_RESIZE_CROP:
+      gimp_transform_resize_crop (points, n_points,
+                                  0.0,
+                                  x1, y1, x2, y2);
+      break;
+
+    case GIMP_TRANSFORM_RESIZE_CROP_WITH_ASPECT:
+      gimp_transform_resize_crop (points, n_points,
+                                  (u2 - u1) / (v2 - v1),
+                                  x1, y1, x2, y2);
+      break;
+
+    case GIMP_TRANSFORM_RESIZE_CLIP:
+      /* Remove warning about not handling all enum values. We handle
+       * this case in the beginning of the function
+       */
+      break;
+    }
+
+  /* ensure that resulting rectangle has at least area 1 */
+  if (*x1 == *x2)
+    (*x2)++;
+
+  if (*y1 == *y2)
+    (*y2)++;
+
+  return TRUE;
+}
+
+/* this calculates the smallest rectangle (with sides parallel to x- and
+ * y-axis) that contains the points d1 to d4
+ */
+static void
+gimp_transform_resize_adjust (const GimpVector2 *points,
+                              gint               n_points,
+                              gint              *x1,
+                              gint              *y1,
+                              gint              *x2,
+                              gint              *y2)
+{
+  GimpVector2 top_left;
+  GimpVector2 bottom_right;
+  gint        i;
+
+  top_left = bottom_right = points[0];
+
+  for (i = 1; i < n_points; i++)
+    {
+      top_left.x     = MIN (top_left.x,     points[i].x);
+      top_left.y     = MIN (top_left.y,     points[i].y);
+
+      bottom_right.x = MAX (bottom_right.x, points[i].x);
+      bottom_right.y = MAX (bottom_right.y, points[i].y);
+    }
+
+  *x1 = (gint) floor (top_left.x + EPSILON);
+  *y1 = (gint) floor (top_left.y + EPSILON);
+
+  *x2 = (gint) ceil (bottom_right.x - EPSILON);
+  *y2 = (gint) ceil (bottom_right.y - EPSILON);
+}
+
+static void
+gimp_transform_resize_crop (const GimpVector2 *orig_points,
+                            gint               n_points,
+                            gdouble            aspect,
+                            gint              *x1,
+                            gint              *y1,
+                            gint              *x2,
+                            gint              *y2)
+{
+  GimpVector2 points[5];
+  Rectangle   r;
+  GimpVector2 t,a;
+  gint        i, j;
+  gint        min;
+
+  memcpy (points, orig_points, sizeof (GimpVector2) * n_points);
+
+  /* find lowest, rightmost corner of surrounding rectangle */
+  a.x = 0;
+  a.y = 0;
+  for (i = 0; i < 4; i++)
+    {
+      if (points[i].x < a.x)
+        a.x = points[i].x;
+
+      if (points[i].y < a.y)
+        a.y = points[i].y;
+    }
+
+  /* and translate all the points to the first quadrant */
+  for (i = 0; i < n_points; i++)
+    {
+      points[i].x += (-a.x) * 2;
+      points[i].y += (-a.y) * 2;
+    }
+
+  /* find the convex hull using Jarvis's March as the points are passed
+   * in different orders due to gimp_matrix3_transform_point()
+   */
+  min = 0;
+  for (i = 0; i < n_points; i++)
+    {
+      if (points[i].y < points[min].y)
+        min = i;
+    }
+
+  t = points[0];
+  points[0] = points[min];
+  points[min] = t;
+
+  for (i = 1; i < n_points - 1; i++)
+    {
+      gdouble min_theta;
+      gdouble min_mag;
+      int next;
+
+      next = n_points - 1;
+      min_theta = 2.0 * G_PI;
+      min_mag = DBL_MAX;
+
+      for (j = i; j < n_points; j++)
+        {
+          gdouble theta;
+          gdouble sy;
+          gdouble sx;
+          gdouble mag;
+
+          sy = points[j].y - points[i - 1].y;
+          sx = points[j].x - points[i - 1].x;
+
+          if ((sx == 0.0) && (sy == 0.0))
+            {
+              next = j;
+              break;
+            }
+
+          theta = atan2 (-sy, -sx);
+          mag = (sx * sx) + (sy * sy);
+
+          if ((theta < min_theta) ||
+              ((theta == min_theta) && (mag < min_mag)))
+            {
+              min_theta = theta;
+              min_mag = mag;
+              next = j;
+            }
+        }
+
+      t = points[i];
+      points[i] = points[next];
+      points[next] = t;
+    }
+
+  /* reverse the order of points */
+  for (i = 0; i < n_points / 2; i++)
+    {
+      t                        = points[i];
+      points[i]                = points[n_points - i - 1];
+      points[n_points - i - 1] = t;
+    }
+
+  r.a.x = r.a.y = r.b.x = r.b.y = r.c.x = r.c.y = r.d.x = r.d.y = r.area = 0;
+  r.aspect = aspect;
+
+  if (aspect != 0)
+    {
+      for (i = 0; i < n_points; i++)
+        find_maximum_aspect_rectangle (&r, points, n_points, i);
+    }
+  else
+    {
+      for (i = 0; i < n_points; i++)
+        {
+          find_three_point_rectangle          (&r, points, n_points, i);
+          find_three_point_rectangle_corner   (&r, points, n_points, i);
+          find_two_point_rectangle            (&r, points, n_points, i);
+          find_three_point_rectangle_triangle (&r, points, n_points, i);
+        }
+    }
+
+  if (r.area == 0)
+    {
+      /* saveguard if something went wrong, adjust and give warning */
+      gimp_transform_resize_adjust (orig_points, n_points,
+                                    x1, y1, x2, y2);
+      g_printerr ("no rectangle found by algorithm, no cropping done\n");
+      return;
+    }
+  else
+    {
+      /* round and translate the calculated points back */
+      *x1 = floor (r.a.x + 0.5);
+      *y1 = floor (r.a.y + 0.5);
+      *x2 = ceil  (r.c.x - 0.5);
+      *y2 = ceil  (r.c.y - 0.5);
+
+      *x1 = *x1 - ((-a.x) * 2);
+      *y1 = *y1 - ((-a.y) * 2);
+      *x2 = *x2 - ((-a.x) * 2);
+      *y2 = *y2 - ((-a.y) * 2);
+      return;
+    }
+}
+
+static void
+find_three_point_rectangle (Rectangle         *r,
+                            const GimpVector2 *points,
+                            gint               n_points,
+                            gint               p)
+{
+  GimpVector2 a = points[p       % n_points];  /* 0 1 2 3 */
+  GimpVector2 b = points[(p + 1) % n_points];  /* 1 2 3 0 */
+  GimpVector2 c = points[(p + 2) % n_points];  /* 2 3 0 1 */
+  GimpVector2 d = points[(p + 3) % n_points];  /* 3 0 1 2 */
+  GimpVector2 i1;                              /* intersection point */
+  GimpVector2 i2;                              /* intersection point */
+  GimpVector2 i3;                              /* intersection point */
+
+  if (intersect_x (b, c, a,  &i1) &&
+      intersect_y (c, d, i1, &i2) &&
+      intersect_x (d, a, i2, &i3))
+    add_rectangle (points, n_points, r, i3, i3, i1, i1);
+
+  if (intersect_y (b, c, a,  &i1) &&
+      intersect_x (c, d, i1, &i2) &&
+      intersect_y (d, a, i2, &i3))
+    add_rectangle (points, n_points, r, i3, i3, i1, i1);
+
+  if (intersect_x (d, c, a,  &i1) &&
+      intersect_y (c, b, i1, &i2) &&
+      intersect_x (b, a, i2, &i3))
+    add_rectangle (points, n_points, r, i3, i3, i1, i1);
+
+  if (intersect_y (d, c, a,  &i1) &&
+      intersect_x (c, b, i1, &i2) &&
+      intersect_y (b, a, i2, &i3))
+    add_rectangle (points, n_points, r, i3, i3, i1, i1);
+}
+
+static void
+find_three_point_rectangle_corner (Rectangle         *r,
+                                   const GimpVector2 *points,
+                                   gint               n_points,
+                                   gint               p)
+{
+  GimpVector2 a = points[p       % n_points];  /* 0 1 2 3 */
+  GimpVector2 b = points[(p + 1) % n_points];  /* 1 2 3 0 */
+  GimpVector2 c = points[(p + 2) % n_points];  /* 2 3 0 2 */
+  GimpVector2 d = points[(p + 3) % n_points];  /* 3 0 2 1 */
+  GimpVector2 i1;                              /* intersection point */
+  GimpVector2 i2;                              /* intersection point */
+
+  if (intersect_x (b, c, a , &i1) &&
+      intersect_y (c, d, i1, &i2))
+    add_rectangle (points, n_points, r, a, a, i1, i2);
+
+  if (intersect_y (b, c, a , &i1) &&
+      intersect_x (c, d, i1, &i2))
+    add_rectangle (points, n_points, r, a, a, i1, i2);
+
+  if (intersect_x (c, d, a , &i1) &&
+      intersect_y (b, c, i1, &i2))
+    add_rectangle (points, n_points, r, a, a, i1, i2);
+
+  if (intersect_y (c, d, a , &i1) &&
+      intersect_x (b, c, i1, &i2))
+    add_rectangle (points, n_points, r, a, a, i1, i2);
+}
+
+static void
+find_two_point_rectangle (Rectangle         *r,
+                          const GimpVector2 *points,
+                          gint               n_points,
+                          gint               p)
+{
+  GimpVector2 a = points[ p      % n_points];  /* 0 1 2 3 */
+  GimpVector2 b = points[(p + 1) % n_points];  /* 1 2 3 0 */
+  GimpVector2 c = points[(p + 2) % n_points];  /* 2 3 0 1 */
+  GimpVector2 d = points[(p + 3) % n_points];  /* 3 0 1 2 */
+  GimpVector2 i1;                              /* intersection point */
+  GimpVector2 i2;                              /* intersection point */
+  GimpVector2 mid;                             /* Mid point */
+
+  add_rectangle (points, n_points, r, a, a, c, c);
+  add_rectangle (points, n_points, r, b, b, d, d);
+
+  if (intersect_x (c, b, a, &i1) &&
+      intersect_y (c, b, a, &i2))
+    {
+      mid.x = ( i1.x + i2.x ) / 2.0;
+      mid.y = ( i1.y + i2.y ) / 2.0;
+
+      add_rectangle (points, n_points, r, a, a, mid, mid);
+    }
+}
+
+static void
+find_three_point_rectangle_triangle (Rectangle         *r,
+                                     const GimpVector2 *points,
+                                     gint               n_points,
+                                     gint               p)
+{
+  GimpVector2 a = points[p       % n_points];  /* 0 1 2 3 */
+  GimpVector2 b = points[(p + 1) % n_points];  /* 1 2 3 0 */
+  GimpVector2 c = points[(p + 2) % n_points];  /* 2 3 0 1 */
+  GimpVector2 d = points[(p + 3) % n_points];  /* 3 0 1 2 */
+  GimpVector2 i1;                              /* intersection point */
+  GimpVector2 i2;                              /* intersection point */
+  GimpVector2 mid;
+
+  mid.x = (a.x + b.x) / 2.0;
+  mid.y = (a.y + b.y) / 2.0;
+
+  if (intersect_x (b, c, mid, &i1) &&
+      intersect_y (a, d, mid, &i2))
+    add_rectangle (points, n_points, r, mid, mid, i1, i2);
+
+  if (intersect_y (b, c, mid, &i1) &&
+      intersect_x (a, d, mid, &i2))
+    add_rectangle (points, n_points, r, mid, mid, i1, i2);
+
+  if (intersect_x (a, d, mid, &i1) &&
+      intersect_y (b, c, mid, &i2))
+    add_rectangle (points, n_points, r, mid, mid, i1, i2);
+
+  if (intersect_y (a, d, mid, &i1) &&
+      intersect_x (b, c, mid, &i2))
+    add_rectangle (points, n_points, r, mid, mid, i1, i2);
+}
+
+static void
+find_maximum_aspect_rectangle (Rectangle         *r,
+                               const GimpVector2 *points,
+                               gint               n_points,
+                               gint               p)
+{
+  GimpVector2 a = points[ p      % n_points];  /* 0 1 2 3 */
+  GimpVector2 b = points[(p + 1) % n_points];  /* 1 2 3 0 */
+  GimpVector2 c = points[(p + 2) % n_points];  /* 2 3 0 1 */
+  GimpVector2 d = points[(p + 3) % n_points];  /* 3 0 1 2 */
+  GimpVector2 i1;                              /* intersection point */
+  GimpVector2 i2;                              /* intersection point */
+  GimpVector2 i3;                              /* intersection point */
+
+  if (intersect_x (b, c, a, &i1))
+    {
+      i2.x = i1.x + 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (c, d, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      i2.x = i1.x - 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (c, d, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+    }
+
+  if (intersect_y (b, c, a, &i1))
+    {
+      i2.x = i1.x + 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (c, d, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      i2.x = i1.x - 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (c, d, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+    }
+
+  if (intersect_x (c, d, a,  &i1))
+    {
+      i2.x = i1.x + 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (b, c, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      i2.x = i1.x - 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (b, c, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+    }
+
+  if (intersect_y (c, d, a,  &i1))
+    {
+      i2.x = i1.x + 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (b, c, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      i2.x = i1.x - 1.0 * r->aspect;
+      i2.y = i1.y + 1.0;
+
+      if (intersect (d, a, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (a, b, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+
+      if (intersect (b, c, i1, i2, &i3))
+        add_rectangle (points, n_points, r, i1, i3, i1, i3);
+    }
+}
+
+/* check if point is inside the polygon "points", if point is on border
+ * its still inside.
+ */
+static gboolean
+in_poly (const GimpVector2 *points,
+         gint               n_points,
+         GimpVector2        p)
+{
+  GimpVector2 p1, p2;
+  gint  counter = 0;
+  gint  i;
+
+  p1 = points[0];
+
+  for (i = 1; i <= n_points; i++)
+    {
+      p2 = points[i % n_points];
+
+      if (p.y > MIN (p1.y, p2.y))
+        {
+          if (p.y <= MAX (p1.y, p2.y))
+            {
+              if (p.x <= MAX (p1.x, p2.x))
+                {
+                  if (p1.y != p2.y)
+                    {
+                      gdouble xinters = ((p.y - p1.y) * (p2.x - p1.x) /
+                                         (p2.y - p1.y) + p1.x);
+
+                      if (p1.x == p2.x || p.x <= xinters)
+                        counter++;
+                    }
+                }
+            }
+        }
+
+      p1 = p2;
+    }
+
+  /* border check */
+  if (point_on_border (points, n_points, p))
+    return TRUE;
+
+  return (counter % 2 != 0);
+}
+
+/* check if the point p lies on the polygon "points"
+ */
+static gboolean
+point_on_border (const GimpVector2 *points,
+                 gint               n_points,
+                 GimpVector2        p)
+{
+  gint i;
+
+  for (i = 0; i <= n_points; i++)
+    {
+      GimpVector2   a  = points[i       % n_points];
+      GimpVector2   b  = points[(i + 1) % n_points];
+      gdouble a1 = (b.y - a.y);
+      gdouble b1 = (a.x - b.x);
+      gdouble c1 = a1 * a.x + b1 * a.y;
+      gdouble c2 = a1 * p.x + b1 * p.y;
+
+      if (ABS (c1 - c2) < EPSILON &&
+          MIN (a.x, b.x) <= p.x   &&
+          MAX (a.x, b.x) >= p.x   &&
+          MIN (a.y, b.y) <= p.y   &&
+          MAX (a.y, b.y) >= p.y)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* calculate the intersection point of the line a-b with the line c-d
+ * and write it to i, if existing.
+ */
+static gboolean
+intersect (GimpVector2  a,
+           GimpVector2  b,
+           GimpVector2  c,
+           GimpVector2  d,
+           GimpVector2 *i)
+{
+  gdouble a1  = (b.y - a.y);
+  gdouble b1  = (a.x - b.x);
+  gdouble c1  = a1 * a.x + b1 * a.y;
+
+  gdouble a2  = (d.y - c.y);
+  gdouble b2  = (c.x - d.x);
+  gdouble c2  = a2 * c.x + b2 * c.y;
+  gdouble det = a1 * b2 - a2 * b1;
+
+  if (det == 0)
+    return FALSE;
+
+  i->x = (b2 * c1 - b1 * c2) / det;
+  i->y = (a1 * c2 - a2 * c1) / det;
+
+  return TRUE;
+}
+
+/* calculate the intersection point of the line a-b with the vertical line
+ * through c and write it to i, if existing.
+ */
+static gboolean
+intersect_x (GimpVector2  a,
+             GimpVector2  b,
+             GimpVector2  c,
+             GimpVector2 *i)
+{
+  GimpVector2   d = c;
+  d.y += 1;
+
+  return intersect(a,b,c,d,i);
+}
+
+/* calculate the intersection point of the line a-b with the horizontal line
+ * through c and write it to i, if existing.
+ */
+static gboolean
+intersect_y (GimpVector2  a,
+             GimpVector2  b,
+             GimpVector2  c,
+             GimpVector2 *i)
+{
+  GimpVector2   d = c;
+  d.x += 1;
+
+  return intersect(a,b,c,d,i);
+}
+
+/* this takes the smallest ortho-aligned (the sides of the rectangle are
+ * parallel to the x- and y-axis) rectangle fitting around the points a to d,
+ * checks if the whole rectangle is inside the polygon described by points and
+ * writes it to r if the area is bigger than the rectangle already stored in r.
+ */
+static void
+add_rectangle (const GimpVector2 *points,
+               gint               n_points,
+               Rectangle         *r,
+               GimpVector2        a,
+               GimpVector2        b,
+               GimpVector2        c,
+               GimpVector2        d)
+{
+  gdouble width;
+  gdouble height;
+  gdouble minx, maxx;
+  gdouble miny, maxy;
+
+  /* get the orthoaligned (the sides of the rectangle are parallel to the x-
+   * and y-axis) rectangle surrounding the points a to d.
+   */
+  minx = MIN4 (a.x, b.x, c.x, d.x);
+  maxx = MAX4 (a.x, b.x, c.x, d.x);
+  miny = MIN4 (a.y, b.y, c.y, d.y);
+  maxy = MAX4 (a.y, b.y, c.y, d.y);
+
+  a.x = minx;
+  a.y = miny;
+
+  b.x = maxx;
+  b.y = miny;
+
+  c.x = maxx;
+  c.y = maxy;
+
+  d.x = minx;
+  d.y = maxy;
+
+  width  =  maxx - minx;
+  height =  maxy - miny;
+
+  /* check if this rectangle is inside the polygon "points" */
+  if (in_poly (points, n_points, a) &&
+      in_poly (points, n_points, b) &&
+      in_poly (points, n_points, c) &&
+      in_poly (points, n_points, d))
+    {
+      gdouble area = width * height;
+
+      /* check if the new rectangle is larger (in terms of area)
+       * than the currently stored rectangle in r, if yes store
+       * new rectangle to r
+       */
+      if (r->area <= area)
+        {
+          r->a.x = a.x;
+          r->a.y = a.y;
+
+          r->b.x = b.x;
+          r->b.y = b.y;
+
+          r->c.x = c.x;
+          r->c.y = c.y;
+
+          r->d.x = d.x;
+          r->d.y = d.y;
+
+          r->area = area;
+        }
+    }
+}
diff --git a/app/core/gimp-transform-resize.h b/app/core/gimp-transform-resize.h
new file mode 100644
index 0000000..4ebb53f
--- /dev/null
+++ b/app/core/gimp-transform-resize.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_RESIZE_H__
+#define __GIMP_TRANSFORM_RESIZE_H__
+
+
+gboolean   gimp_transform_resize_boundary (const GimpMatrix3   *inv,
+                                           GimpTransformResize  resize,
+                                           gdouble              u1,
+                                           gdouble              v1,
+                                           gdouble              u2,
+                                           gdouble              v2,
+                                           gint                *x1,
+                                           gint                *y1,
+                                           gint                *x2,
+                                           gint                *y2);
+
+
+#endif  /*  __GIMP_TRANSFORM_RESIZE_H__  */
diff --git a/app/core/gimp-transform-utils.c b/app/core/gimp-transform-utils.c
new file mode 100644
index 0000000..555ff09
--- /dev/null
+++ b/app/core/gimp-transform-utils.c
@@ -0,0 +1,1211 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <glib-object.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp-transform-utils.h"
+#include "gimpcoords.h"
+#include "gimpcoords-interpolate.h"
+
+
+#define EPSILON 1e-6
+
+
+void
+gimp_transform_get_rotate_center (gint      x,
+                                  gint      y,
+                                  gint      width,
+                                  gint      height,
+                                  gboolean  auto_center,
+                                  gdouble  *center_x,
+                                  gdouble  *center_y)
+{
+  g_return_if_fail (center_x != NULL);
+  g_return_if_fail (center_y != NULL);
+
+  if (auto_center)
+    {
+      *center_x = (gdouble) x + (gdouble) width  / 2.0;
+      *center_y = (gdouble) y + (gdouble) height / 2.0;
+    }
+}
+
+void
+gimp_transform_get_flip_axis (gint                 x,
+                              gint                 y,
+                              gint                 width,
+                              gint                 height,
+                              GimpOrientationType  flip_type,
+                              gboolean             auto_center,
+                              gdouble             *axis)
+{
+  g_return_if_fail (axis != NULL);
+
+  if (auto_center)
+    {
+      switch (flip_type)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          *axis = ((gdouble) x + (gdouble) width / 2.0);
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          *axis = ((gdouble) y + (gdouble) height / 2.0);
+          break;
+
+        default:
+          g_return_if_reached ();
+          break;
+        }
+    }
+}
+
+void
+gimp_transform_matrix_flip (GimpMatrix3         *matrix,
+                            GimpOrientationType  flip_type,
+                            gdouble              axis)
+{
+  g_return_if_fail (matrix != NULL);
+
+  switch (flip_type)
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      gimp_matrix3_translate (matrix, - axis, 0.0);
+      gimp_matrix3_scale (matrix, -1.0, 1.0);
+      gimp_matrix3_translate (matrix, axis, 0.0);
+      break;
+
+    case GIMP_ORIENTATION_VERTICAL:
+      gimp_matrix3_translate (matrix, 0.0, - axis);
+      gimp_matrix3_scale (matrix, 1.0, -1.0);
+      gimp_matrix3_translate (matrix, 0.0, axis);
+      break;
+
+    case GIMP_ORIENTATION_UNKNOWN:
+      break;
+    }
+}
+
+void
+gimp_transform_matrix_flip_free (GimpMatrix3 *matrix,
+                                 gdouble      x1,
+                                 gdouble      y1,
+                                 gdouble      x2,
+                                 gdouble      y2)
+{
+  gdouble angle;
+
+  g_return_if_fail (matrix != NULL);
+
+  angle = atan2  (y2 - y1, x2 - x1);
+
+  gimp_matrix3_identity  (matrix);
+  gimp_matrix3_translate (matrix, -x1, -y1);
+  gimp_matrix3_rotate    (matrix, -angle);
+  gimp_matrix3_scale     (matrix, 1.0, -1.0);
+  gimp_matrix3_rotate    (matrix, angle);
+  gimp_matrix3_translate (matrix, x1, y1);
+}
+
+void
+gimp_transform_matrix_rotate (GimpMatrix3         *matrix,
+                              GimpRotationType     rotate_type,
+                              gdouble              center_x,
+                              gdouble              center_y)
+{
+  gdouble angle = 0;
+
+  switch (rotate_type)
+    {
+    case GIMP_ROTATE_90:
+      angle = G_PI_2;
+      break;
+    case GIMP_ROTATE_180:
+      angle = G_PI;
+      break;
+    case GIMP_ROTATE_270:
+      angle = - G_PI_2;
+      break;
+    }
+
+  gimp_transform_matrix_rotate_center (matrix, center_x, center_y, angle);
+}
+
+void
+gimp_transform_matrix_rotate_rect (GimpMatrix3 *matrix,
+                                   gint         x,
+                                   gint         y,
+                                   gint         width,
+                                   gint         height,
+                                   gdouble      angle)
+{
+  gdouble center_x;
+  gdouble center_y;
+
+  g_return_if_fail (matrix != NULL);
+
+  center_x = (gdouble) x + (gdouble) width  / 2.0;
+  center_y = (gdouble) y + (gdouble) height / 2.0;
+
+  gimp_matrix3_translate (matrix, -center_x, -center_y);
+  gimp_matrix3_rotate    (matrix, angle);
+  gimp_matrix3_translate (matrix, +center_x, +center_y);
+}
+
+void
+gimp_transform_matrix_rotate_center (GimpMatrix3 *matrix,
+                                     gdouble      center_x,
+                                     gdouble      center_y,
+                                     gdouble      angle)
+{
+  g_return_if_fail (matrix != NULL);
+
+  gimp_matrix3_translate (matrix, -center_x, -center_y);
+  gimp_matrix3_rotate    (matrix, angle);
+  gimp_matrix3_translate (matrix, +center_x, +center_y);
+}
+
+void
+gimp_transform_matrix_scale (GimpMatrix3 *matrix,
+                             gint         x,
+                             gint         y,
+                             gint         width,
+                             gint         height,
+                             gdouble      t_x,
+                             gdouble      t_y,
+                             gdouble      t_width,
+                             gdouble      t_height)
+{
+  gdouble scale_x = 1.0;
+  gdouble scale_y = 1.0;
+
+  g_return_if_fail (matrix != NULL);
+
+  if (width > 0)
+    scale_x = t_width / (gdouble) width;
+
+  if (height > 0)
+    scale_y = t_height / (gdouble) height;
+
+  gimp_matrix3_identity  (matrix);
+  gimp_matrix3_translate (matrix, -x, -y);
+  gimp_matrix3_scale     (matrix, scale_x, scale_y);
+  gimp_matrix3_translate (matrix, t_x, t_y);
+}
+
+void
+gimp_transform_matrix_shear (GimpMatrix3         *matrix,
+                             gint                 x,
+                             gint                 y,
+                             gint                 width,
+                             gint                 height,
+                             GimpOrientationType  orientation,
+                             gdouble              amount)
+{
+  gdouble center_x;
+  gdouble center_y;
+
+  g_return_if_fail (matrix != NULL);
+
+  if (width == 0)
+    width = 1;
+
+  if (height == 0)
+    height = 1;
+
+  center_x = (gdouble) x + (gdouble) width  / 2.0;
+  center_y = (gdouble) y + (gdouble) height / 2.0;
+
+  gimp_matrix3_identity  (matrix);
+  gimp_matrix3_translate (matrix, -center_x, -center_y);
+
+  if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+    gimp_matrix3_xshear (matrix, amount / height);
+  else
+    gimp_matrix3_yshear (matrix, amount / width);
+
+  gimp_matrix3_translate (matrix, +center_x, +center_y);
+}
+
+void
+gimp_transform_matrix_perspective (GimpMatrix3 *matrix,
+                                   gint         x,
+                                   gint         y,
+                                   gint         width,
+                                   gint         height,
+                                   gdouble      t_x1,
+                                   gdouble      t_y1,
+                                   gdouble      t_x2,
+                                   gdouble      t_y2,
+                                   gdouble      t_x3,
+                                   gdouble      t_y3,
+                                   gdouble      t_x4,
+                                   gdouble      t_y4)
+{
+  GimpMatrix3 trafo;
+  gdouble     scalex;
+  gdouble     scaley;
+
+  g_return_if_fail (matrix != NULL);
+
+  scalex = scaley = 1.0;
+
+  if (width > 0)
+    scalex = 1.0 / (gdouble) width;
+
+  if (height > 0)
+    scaley = 1.0 / (gdouble) height;
+
+  gimp_matrix3_translate (matrix, -x, -y);
+  gimp_matrix3_scale     (matrix, scalex, scaley);
+
+  /* Determine the perspective transform that maps from
+   * the unit cube to the transformed coordinates
+   */
+  {
+    gdouble dx1, dx2, dx3, dy1, dy2, dy3;
+
+    dx1 = t_x2 - t_x4;
+    dx2 = t_x3 - t_x4;
+    dx3 = t_x1 - t_x2 + t_x4 - t_x3;
+
+    dy1 = t_y2 - t_y4;
+    dy2 = t_y3 - t_y4;
+    dy3 = t_y1 - t_y2 + t_y4 - t_y3;
+
+    /*  Is the mapping affine?  */
+    if ((dx3 == 0.0) && (dy3 == 0.0))
+      {
+        trafo.coeff[0][0] = t_x2 - t_x1;
+        trafo.coeff[0][1] = t_x4 - t_x2;
+        trafo.coeff[0][2] = t_x1;
+        trafo.coeff[1][0] = t_y2 - t_y1;
+        trafo.coeff[1][1] = t_y4 - t_y2;
+        trafo.coeff[1][2] = t_y1;
+        trafo.coeff[2][0] = 0.0;
+        trafo.coeff[2][1] = 0.0;
+      }
+    else
+      {
+        gdouble det1, det2;
+
+        det1 = dx3 * dy2 - dy3 * dx2;
+        det2 = dx1 * dy2 - dy1 * dx2;
+
+        trafo.coeff[2][0] = (det2 == 0.0) ? 1.0 : det1 / det2;
+
+        det1 = dx1 * dy3 - dy1 * dx3;
+
+        trafo.coeff[2][1] = (det2 == 0.0) ? 1.0 : det1 / det2;
+
+        trafo.coeff[0][0] = t_x2 - t_x1 + trafo.coeff[2][0] * t_x2;
+        trafo.coeff[0][1] = t_x3 - t_x1 + trafo.coeff[2][1] * t_x3;
+        trafo.coeff[0][2] = t_x1;
+
+        trafo.coeff[1][0] = t_y2 - t_y1 + trafo.coeff[2][0] * t_y2;
+        trafo.coeff[1][1] = t_y3 - t_y1 + trafo.coeff[2][1] * t_y3;
+        trafo.coeff[1][2] = t_y1;
+      }
+
+    trafo.coeff[2][2] = 1.0;
+  }
+
+  gimp_matrix3_mult (&trafo, matrix);
+}
+
+/* modified gaussian algorithm
+ * solves a system of linear equations
+ *
+ * Example:
+ * 1x + 2y + 4z = 25
+ * 2x + 1y      = 4
+ * 3x + 5y + 2z = 23
+ * Solution: x=1, y=2, z=5
+ *
+ * Input:
+ * matrix = { 1,2,4,25,2,1,0,4,3,5,2,23 }
+ * s = 3 (Number of variables)
+ * Output:
+ * return value == TRUE (TRUE, if there is a single unique solution)
+ * solution == { 1,2,5 } (if the return value is FALSE, the content
+ * of solution is of no use)
+ */
+static gboolean
+mod_gauss (gdouble matrix[],
+           gdouble solution[],
+           gint    s)
+{
+  gint    p[s]; /* row permutation */
+  gint    i, j, r, temp;
+  gdouble q;
+  gint    t = s + 1;
+
+  for (i = 0; i < s; i++)
+    {
+      p[i] = i;
+    }
+
+  for (r = 0; r < s; r++)
+    {
+      /* make sure that (r,r) is not 0 */
+      if (fabs (matrix[p[r] * t + r]) <= EPSILON)
+        {
+          /* we need to permutate rows */
+          for (i = r + 1; i <= s; i++)
+            {
+              if (i == s)
+                {
+                  /* if this happens, the linear system has zero or
+                   * more than one solutions.
+                   */
+                  return FALSE;
+                }
+
+              if (fabs (matrix[p[i] * t + r]) > EPSILON)
+                break;
+            }
+
+          temp = p[r];
+          p[r] = p[i];
+          p[i] = temp;
+        }
+
+      /* make (r,r) == 1 */
+      q = 1.0 / matrix[p[r] * t + r];
+      matrix[p[r] * t + r] = 1.0;
+
+      for (j = r + 1; j < t; j++)
+        {
+          matrix[p[r] * t + j] *= q;
+        }
+
+      /* make that all entries in column r are 0 (except (r,r)) */
+      for (i = 0; i < s; i++)
+        {
+          if (i == r)
+            continue;
+
+          for (j = r + 1; j < t ; j++)
+            {
+              matrix[p[i] * t + j] -= matrix[p[r] * t + j] * matrix[p[i] * t + r];
+            }
+
+          /* we don't need to execute the following line
+           * since we won't access this element again:
+           *
+           * matrix[p[i] * t + r] = 0.0;
+           */
+        }
+    }
+
+  for (i = 0; i < s; i++)
+    {
+      solution[i] = matrix[p[i] * t + s];
+    }
+
+  return TRUE;
+}
+
+/* multiplies 'matrix' by the matrix that transforms a set of 4 'input_points'
+ * to corresponding 'output_points', if such matrix exists, and is valid (i.e.,
+ * keeps the output points in front of the camera).
+ *
+ * returns TRUE if successful.
+ */
+gboolean
+gimp_transform_matrix_generic (GimpMatrix3       *matrix,
+                               const GimpVector2  input_points[4],
+                               const GimpVector2  output_points[4])
+{
+  GimpMatrix3 trafo;
+  gdouble     coeff[8 * 9];
+  gboolean    negative = -1;
+  gint        i;
+  gboolean    result   = TRUE;
+
+  g_return_val_if_fail (matrix != NULL, FALSE);
+  g_return_val_if_fail (input_points != NULL, FALSE);
+  g_return_val_if_fail (output_points != NULL, FALSE);
+
+  /* find the matrix that transforms 'input_points' to 'output_points', whose
+   * (3, 3) coeffcient is 1, by solving a system of linear equations whose
+   * solution is the remaining 8 coefficients.
+   */
+  for (i = 0; i < 4; i++)
+    {
+      coeff[i * 9 + 0] = input_points[i].x;
+      coeff[i * 9 + 1] = input_points[i].y;
+      coeff[i * 9 + 2] = 1.0;
+      coeff[i * 9 + 3] = 0.0;
+      coeff[i * 9 + 4] = 0.0;
+      coeff[i * 9 + 5] = 0.0;
+      coeff[i * 9 + 6] = -input_points[i].x * output_points[i].x;
+      coeff[i * 9 + 7] = -input_points[i].y * output_points[i].x;
+      coeff[i * 9 + 8] =                      output_points[i].x;
+
+      coeff[(i + 4) * 9 + 0] = 0.0;
+      coeff[(i + 4) * 9 + 1] = 0.0;
+      coeff[(i + 4) * 9 + 2] = 0.0;
+      coeff[(i + 4) * 9 + 3] = input_points[i].x;
+      coeff[(i + 4) * 9 + 4] = input_points[i].y;
+      coeff[(i + 4) * 9 + 5] = 1.0;
+      coeff[(i + 4) * 9 + 6] = -input_points[i].x * output_points[i].y;
+      coeff[(i + 4) * 9 + 7] = -input_points[i].y * output_points[i].y;
+      coeff[(i + 4) * 9 + 8] =                      output_points[i].y;
+    }
+
+  /* if there is no solution, bail */
+  if (! mod_gauss (coeff, (gdouble *) trafo.coeff, 8))
+    return FALSE;
+
+  trafo.coeff[2][2] = 1.0;
+
+  /* make sure that none of the input points maps to a point at infinity, and
+   * that all output points are on the same side of the camera.
+   */
+  for (i = 0; i < 4; i++)
+    {
+      gdouble  w;
+      gboolean neg;
+
+      w = trafo.coeff[2][0] * input_points[i].x +
+          trafo.coeff[2][1] * input_points[i].y +
+          trafo.coeff[2][2];
+
+      if (fabs (w) <= EPSILON)
+        result = FALSE;
+
+      neg = (w < 0.0);
+
+      if (negative < 0)
+        {
+          negative = neg;
+        }
+      else if (neg != negative)
+        {
+          result = FALSE;
+          break;
+        }
+    }
+
+  /* if the output points are all behind the camera, negate the matrix, which
+   * would map the input points to the corresponding points in front of the
+   * camera.
+   */
+  if (negative > 0)
+    {
+      gint r;
+      gint c;
+
+      for (r = 0; r < 3; r++)
+        {
+          for (c = 0; c < 3; c++)
+            {
+              trafo.coeff[r][c] = -trafo.coeff[r][c];
+            }
+        }
+    }
+
+  /* append the transformation to 'matrix' */
+  gimp_matrix3_mult (&trafo, matrix);
+
+  return result;
+}
+
+gboolean
+gimp_transform_polygon_is_convex (gdouble x1,
+                                  gdouble y1,
+                                  gdouble x2,
+                                  gdouble y2,
+                                  gdouble x3,
+                                  gdouble y3,
+                                  gdouble x4,
+                                  gdouble y4)
+{
+  gdouble z1, z2, z3, z4;
+
+  /* We test if the transformed polygon is convex.  if z1 and z2 have
+   * the same sign as well as z3 and z4 the polygon is convex.
+   */
+  z1 = ((x2 - x1) * (y4 - y1) -
+        (x4 - x1) * (y2 - y1));
+  z2 = ((x4 - x1) * (y3 - y1) -
+        (x3 - x1) * (y4 - y1));
+  z3 = ((x4 - x2) * (y3 - y2) -
+        (x3 - x2) * (y4 - y2));
+  z4 = ((x3 - x2) * (y1 - y2) -
+        (x1 - x2) * (y3 - y2));
+
+  return (z1 * z2 > 0) && (z3 * z4 > 0);
+}
+
+/* transforms the polygon or polyline, whose vertices are given by 'vertices',
+ * by 'matrix', performing clipping by the near plane.  'closed' indicates
+ * whether the vertices represent a polygon ('closed == TRUE') or a polyline
+ * ('closed == FALSE').
+ *
+ * returns the transformed vertices in 't_vertices', and their count in
+ * 'n_t_vertices'.  the minimal possible number of transformed vertices is 0,
+ * which happens when the entire input is clipped.  in general, the maximal
+ * possible number of transformed vertices is '3 * n_vertices / 2' (rounded
+ * down), however, for convex polygons the number is 'n_vertices + 1', and for
+ * a single line segment ('n_vertices == 2' and 'closed == FALSE') the number
+ * is 2.
+ *
+ * 't_vertices' may not alias 'vertices', except when transforming a single
+ * line segment.
+ */
+void
+gimp_transform_polygon (const GimpMatrix3 *matrix,
+                        const GimpVector2 *vertices,
+                        gint               n_vertices,
+                        gboolean           closed,
+                        GimpVector2       *t_vertices,
+                        gint              *n_t_vertices)
+{
+  GimpVector3 curr;
+  gboolean    curr_visible;
+  gint        i;
+
+  g_return_if_fail (matrix != NULL);
+  g_return_if_fail (vertices != NULL);
+  g_return_if_fail (n_vertices >= 0);
+  g_return_if_fail (t_vertices != NULL);
+  g_return_if_fail (n_t_vertices != NULL);
+
+  *n_t_vertices = 0;
+
+  if (n_vertices == 0)
+    return;
+
+  curr.x = matrix->coeff[0][0] * vertices[0].x +
+           matrix->coeff[0][1] * vertices[0].y +
+           matrix->coeff[0][2];
+  curr.y = matrix->coeff[1][0] * vertices[0].x +
+           matrix->coeff[1][1] * vertices[0].y +
+           matrix->coeff[1][2];
+  curr.z = matrix->coeff[2][0] * vertices[0].x +
+           matrix->coeff[2][1] * vertices[0].y +
+           matrix->coeff[2][2];
+
+  curr_visible = (curr.z >= GIMP_TRANSFORM_NEAR_Z);
+
+  for (i = 0; i < n_vertices; i++)
+    {
+      if (curr_visible)
+        {
+          t_vertices[(*n_t_vertices)++] = (GimpVector2) { curr.x / curr.z,
+                                                          curr.y / curr.z };
+        }
+
+      if (i < n_vertices - 1 || closed)
+        {
+          GimpVector3 next;
+          gboolean    next_visible;
+          gint        j = (i + 1) % n_vertices;
+
+          next.x = matrix->coeff[0][0] * vertices[j].x +
+                   matrix->coeff[0][1] * vertices[j].y +
+                   matrix->coeff[0][2];
+          next.y = matrix->coeff[1][0] * vertices[j].x +
+                   matrix->coeff[1][1] * vertices[j].y +
+                   matrix->coeff[1][2];
+          next.z = matrix->coeff[2][0] * vertices[j].x +
+                   matrix->coeff[2][1] * vertices[j].y +
+                   matrix->coeff[2][2];
+
+          next_visible = (next.z >= GIMP_TRANSFORM_NEAR_Z);
+
+          if (next_visible != curr_visible)
+            {
+              gdouble ratio = (curr.z - GIMP_TRANSFORM_NEAR_Z) / (curr.z - next.z);
+
+              t_vertices[(*n_t_vertices)++] =
+                (GimpVector2) { (curr.x + (next.x - curr.x) * ratio) / GIMP_TRANSFORM_NEAR_Z,
+                                (curr.y + (next.y - curr.y) * ratio) / GIMP_TRANSFORM_NEAR_Z };
+            }
+
+          curr         = next;
+          curr_visible = next_visible;
+        }
+    }
+}
+
+/* same as gimp_transform_polygon(), but using GimpCoords as the vertex type,
+ * instead of GimpVector2.
+ */
+void
+gimp_transform_polygon_coords (const GimpMatrix3 *matrix,
+                               const GimpCoords  *vertices,
+                               gint               n_vertices,
+                               gboolean           closed,
+                               GimpCoords        *t_vertices,
+                               gint              *n_t_vertices)
+{
+  GimpVector3 curr;
+  gboolean    curr_visible;
+  gint        i;
+
+  g_return_if_fail (matrix != NULL);
+  g_return_if_fail (vertices != NULL);
+  g_return_if_fail (n_vertices >= 0);
+  g_return_if_fail (t_vertices != NULL);
+  g_return_if_fail (n_t_vertices != NULL);
+
+  *n_t_vertices = 0;
+
+  if (n_vertices == 0)
+    return;
+
+  curr.x = matrix->coeff[0][0] * vertices[0].x +
+           matrix->coeff[0][1] * vertices[0].y +
+           matrix->coeff[0][2];
+  curr.y = matrix->coeff[1][0] * vertices[0].x +
+           matrix->coeff[1][1] * vertices[0].y +
+           matrix->coeff[1][2];
+  curr.z = matrix->coeff[2][0] * vertices[0].x +
+           matrix->coeff[2][1] * vertices[0].y +
+           matrix->coeff[2][2];
+
+  curr_visible = (curr.z >= GIMP_TRANSFORM_NEAR_Z);
+
+  for (i = 0; i < n_vertices; i++)
+    {
+      if (curr_visible)
+        {
+          t_vertices[*n_t_vertices]   = vertices[i];
+          t_vertices[*n_t_vertices].x = curr.x / curr.z;
+          t_vertices[*n_t_vertices].y = curr.y / curr.z;
+
+          (*n_t_vertices)++;
+        }
+
+      if (i < n_vertices - 1 || closed)
+        {
+          GimpVector3 next;
+          gboolean    next_visible;
+          gint        j = (i + 1) % n_vertices;
+
+          next.x = matrix->coeff[0][0] * vertices[j].x +
+                   matrix->coeff[0][1] * vertices[j].y +
+                   matrix->coeff[0][2];
+          next.y = matrix->coeff[1][0] * vertices[j].x +
+                   matrix->coeff[1][1] * vertices[j].y +
+                   matrix->coeff[1][2];
+          next.z = matrix->coeff[2][0] * vertices[j].x +
+                   matrix->coeff[2][1] * vertices[j].y +
+                   matrix->coeff[2][2];
+
+          next_visible = (next.z >= GIMP_TRANSFORM_NEAR_Z);
+
+          if (next_visible != curr_visible)
+            {
+              gdouble ratio = (curr.z - GIMP_TRANSFORM_NEAR_Z) / (curr.z - next.z);
+
+              gimp_coords_mix (1.0 - ratio, &vertices[i],
+                                     ratio, &vertices[j],
+                                            &t_vertices[*n_t_vertices]);
+
+              t_vertices[*n_t_vertices].x = (curr.x + (next.x - curr.x) * ratio) /
+                                             GIMP_TRANSFORM_NEAR_Z;
+              t_vertices[*n_t_vertices].y = (curr.y + (next.y - curr.y) * ratio) /
+                                             GIMP_TRANSFORM_NEAR_Z;
+
+              (*n_t_vertices)++;
+            }
+
+          curr         = next;
+          curr_visible = next_visible;
+        }
+    }
+}
+
+/* returns the value of the polynomial 'poly', of degree 'degree', at 'x'.  the
+ * coefficients of 'poly' should be specified in descending-degree order.
+ */
+static gdouble
+polynomial_eval (const gdouble *poly,
+                 gint           degree,
+                 gdouble        x)
+{
+  gdouble y = poly[0];
+  gint    i;
+
+  for (i = 1; i <= degree; i++)
+    y = y * x + poly[i];
+
+  return y;
+}
+
+/* derives the polynomial 'poly', of degree 'degree'.
+ *
+ * returns the derivative in 'result'.
+ */
+static void
+polynomial_derive (const gdouble *poly,
+                   gint           degree,
+                   gdouble       *result)
+{
+  while (degree)
+    *result++ = *poly++ * degree--;
+}
+
+/* finds the real odd-multiplicity root of the polynomial 'poly', of degree
+ * 'degree', inside the range '(x1, x2)'.
+ *
+ * returns TRUE if such a root exists, and stores its value in '*root'.
+ *
+ * 'poly' shall be monotonic in the range '(x1, x2)'.
+ */
+static gboolean
+polynomial_odd_root (const gdouble *poly,
+                     gint           degree,
+                     gdouble        x1,
+                     gdouble        x2,
+                     gdouble       *root)
+{
+  gdouble y1;
+  gdouble y2;
+  gint    i;
+
+  y1 = polynomial_eval (poly, degree, x1);
+  y2 = polynomial_eval (poly, degree, x2);
+
+  if (y1 * y2 > -EPSILON)
+    {
+      /* the two endpoints have the same sign, or one of them is zero.  there's
+       * no root inside the range.
+       */
+      return FALSE;
+    }
+  else if (y1 > 0.0)
+    {
+      gdouble t;
+
+      /* if the first endpoint is positive, swap the endpoints, so that the
+       * first endpoint is always negative, and the second endpoint is always
+       * positive.
+       */
+
+      t  = x1;
+      x1 = x2;
+      x2 = t;
+    }
+
+  /* approximate the root using binary search */
+  for (i = 0; i < 53; i++)
+    {
+      gdouble x = (x1 + x2) / 2.0;
+      gdouble y = polynomial_eval (poly, degree, x);
+
+      if (y > 0.0)
+        x2 = x;
+      else
+        x1 = x;
+    }
+
+  *root = (x1 + x2) / 2.0;
+
+  return TRUE;
+}
+
+/* finds the real odd-multiplicity roots of the polynomial 'poly', of degree
+ * 'degree', inside the range '(x1, x2)'.
+ *
+ * returns the roots in 'roots', in ascending order, and their count in
+ * 'n_roots'.
+ */
+static void
+polynomial_odd_roots (const gdouble *poly,
+                      gint           degree,
+                      gdouble        x1,
+                      gdouble        x2,
+                      gdouble       *roots,
+                      gint          *n_roots)
+{
+  *n_roots = 0;
+
+  /* find the real degree of the polynomial (skip any leading coefficients that
+   * are 0)
+   */
+  for (; degree && fabs (*poly) < EPSILON; poly++, degree--);
+
+  #define ADD_ROOT(root) \
+    do \
+      { \
+        gdouble r = (root); \
+        \
+        if (r > x1 && r < x2) \
+          roots[(*n_roots)++] = r; \
+      } \
+    while (FALSE)
+
+  switch (degree)
+    {
+    /* constant case */
+    case 0:
+      break;
+
+    /* linear case */
+    case 1:
+      ADD_ROOT (-poly[1] / poly[0]);
+      break;
+
+    /* quadratic case */
+    case 2:
+      {
+        gdouble s = SQR (poly[1]) - 4 * poly[0] * poly[2];
+
+        if (s > EPSILON)
+          {
+            s = sqrt (s);
+
+            if (poly[0] < 0.0)
+              s = -s;
+
+            ADD_ROOT ((-poly[1] - s) / (2.0 * poly[0]));
+            ADD_ROOT ((-poly[1] + s) / (2.0 * poly[0]));
+          }
+
+        break;
+      }
+
+    /* general case */
+    default:
+      {
+        gdouble deriv[degree];
+        gdouble deriv_roots[degree - 1];
+        gint    n_deriv_roots;
+        gdouble a;
+        gdouble b;
+        gint    i;
+
+        /* find the odd roots of the derivative, i.e., the local extrema of the
+         * polynomial
+         */
+        polynomial_derive (poly, degree, deriv);
+        polynomial_odd_roots (deriv, degree - 1, x1, x2,
+                              deriv_roots, &n_deriv_roots);
+
+        /* search for roots between each consecutive pair of extrema, including
+         * the endpoints
+         */
+        a = x1;
+
+        for (i = 0; i <= n_deriv_roots; i++)
+          {
+            if (i < n_deriv_roots)
+              b = deriv_roots[i];
+            else
+              b = x2;
+
+            *n_roots += polynomial_odd_root (poly, degree, a, b,
+                                             &roots[*n_roots]);
+
+            a = b;
+          }
+
+        break;
+      }
+    }
+
+  #undef ADD_ROOT
+}
+
+/* clips the cubic bezier segment, defined by the four control points 'bezier',
+ * to the halfplane 'ax + by + c >= 0'.
+ *
+ * returns the clipped set of bezier segments in 'c_bezier', and their count in
+ * 'n_c_bezier'.  the minimal possible number of clipped segments is 0, which
+ * happens when the entire segment is clipped.  the maximal possible number of
+ * clipped segments is 2.
+ *
+ * if the first clipped segment is an initial segment of 'bezier', sets
+ * '*start_in' to TRUE, otherwise to FALSE.  if the last clipped segment is a
+ * final segment of 'bezier', sets '*end_in' to TRUE, otherwise to FALSE.
+ *
+ * 'c_bezier' may not alias 'bezier'.
+ */
+static void
+clip_bezier (const GimpCoords  bezier[4],
+             gdouble           a,
+             gdouble           b,
+             gdouble           c,
+             GimpCoords        c_bezier[2][4],
+             gint             *n_c_bezier,
+             gboolean         *start_in,
+             gboolean         *end_in)
+{
+  gdouble dot[4];
+  gdouble poly[4];
+  gdouble roots[5];
+  gint    n_roots;
+  gint    n_positive;
+  gint    i;
+
+  n_positive = 0;
+
+  for (i = 0; i < 4; i++)
+    {
+      dot[i] = a * bezier[i].x + b * bezier[i].y + c;
+
+      n_positive += (dot[i] >= 0.0);
+    }
+
+  if (n_positive == 0)
+    {
+      /* all points are out -- the entire segment is out */
+
+      *n_c_bezier = 0;
+      *start_in   = FALSE;
+      *end_in     = FALSE;
+
+      return;
+    }
+  else if (n_positive == 4)
+    {
+      /* all points are in -- the entire segment is in */
+
+      memcpy (c_bezier[0], bezier, sizeof (GimpCoords[4]));
+
+      *n_c_bezier = 1;
+      *start_in   = TRUE;
+      *end_in     = TRUE;
+
+      return;
+    }
+
+  /* find the points of intersection of the segment with the 'ax + by + c = 0'
+   * line
+   */
+  poly[0] = dot[3] - 3.0 * dot[2] + 3.0 * dot[1] - dot[0];
+  poly[1] = 3.0 * (dot[2] - 2.0 * dot[1] + dot[0]);
+  poly[2] = 3.0 * (dot[1] - dot[0]);
+  poly[3] = dot[0];
+
+  roots[0] = 0.0;
+  polynomial_odd_roots (poly, 3, 0.0, 1.0, roots + 1, &n_roots);
+  roots[++n_roots] = 1.0;
+
+  /* construct the list of segments that are inside the halfplane */
+  *n_c_bezier = 0;
+  *start_in   = (polynomial_eval (poly, 3, roots[1] / 2.0) > 0.0);
+  *end_in     = (*start_in + n_roots + 1) % 2;
+
+  for (i = ! *start_in; i < n_roots; i += 2)
+    {
+      gdouble t0 = roots[i];
+      gdouble t1 = roots[i + 1];
+
+      gimp_coords_interpolate_bezier_at (bezier, t0,
+                                         &c_bezier[*n_c_bezier][0],
+                                         &c_bezier[*n_c_bezier][1]);
+      gimp_coords_interpolate_bezier_at (bezier, t1,
+                                         &c_bezier[*n_c_bezier][3],
+                                         &c_bezier[*n_c_bezier][2]);
+
+      gimp_coords_mix (1.0,             &c_bezier[*n_c_bezier][0],
+                       (t1 - t0) / 3.0, &c_bezier[*n_c_bezier][1],
+                       &c_bezier[*n_c_bezier][1]);
+      gimp_coords_mix (1.0,             &c_bezier[*n_c_bezier][3],
+                       (t0 - t1) / 3.0, &c_bezier[*n_c_bezier][2],
+                       &c_bezier[*n_c_bezier][2]);
+
+      (*n_c_bezier)++;
+    }
+}
+
+/* transforms the cubic bezier segment, defined by the four control points
+ * 'bezier', by 'matrix', subdividing it as necessary to avoid diverging too
+ * much from the real transformed curve.  at most 'depth' subdivisions are
+ * performed.
+ *
+ * appends the transformed sequence of bezier segments to 't_beziers'.
+ *
+ * 'bezier' shall be fully clipped to the near plane.
+ */
+static void
+transform_bezier_coords (const GimpMatrix3 *matrix,
+                         const GimpCoords   bezier[4],
+                         GQueue            *t_beziers,
+                         gint               depth)
+{
+  GimpCoords *t_bezier;
+  gint        n;
+
+  /* check if we need to split the segment */
+  if (depth > 0)
+    {
+      GimpVector2 v[4];
+      GimpVector2 c[2];
+      GimpVector2 b;
+      gint        i;
+
+      for (i = 0; i < 4; i++)
+        v[i] = (GimpVector2) { bezier[i].x, bezier[i].y };
+
+      gimp_vector2_sub (&c[0], &v[1], &v[0]);
+      gimp_vector2_sub (&c[1], &v[2], &v[3]);
+
+      gimp_vector2_sub (&b, &v[3], &v[0]);
+      gimp_vector2_mul (&b, 1.0 / gimp_vector2_inner_product (&b, &b));
+
+      for (i = 0; i < 2; i++)
+        {
+          /* split the segment if one of the control points is too far from the
+           * line connecting the anchors
+           */
+          if (fabs (gimp_vector2_cross_product (&c[i], &b).x) > 0.5)
+            {
+              GimpCoords mid_position;
+              GimpCoords mid_velocity;
+              GimpCoords sub[4];
+
+              gimp_coords_interpolate_bezier_at (bezier, 0.5,
+                                                 &mid_position, &mid_velocity);
+
+              /* first half */
+              sub[0] = bezier[0];
+              sub[3] = mid_position;
+
+              gimp_coords_mix (0.5,        &sub[0],
+                               0.5,        &bezier[1],
+                                           &sub[1]);
+              gimp_coords_mix (1.0,        &sub[3],
+                               -1.0 / 6.0, &mid_velocity,
+                                           &sub[2]);
+
+              transform_bezier_coords (matrix, sub, t_beziers, depth - 1);
+
+              /* second half */
+              sub[0] = mid_position;
+              sub[3] = bezier[3];
+
+              gimp_coords_mix (1.0,        &sub[0],
+                               +1.0 / 6.0, &mid_velocity,
+                                           &sub[1]);
+              gimp_coords_mix (0.5,        &sub[3],
+                               0.5,        &bezier[2],
+                                           &sub[2]);
+
+              transform_bezier_coords (matrix, sub, t_beziers, depth - 1);
+
+              return;
+            }
+        }
+    }
+
+  /* transform the segment by transforming each of the individual points.  note
+   * that, for non-affine transforms, this is only an approximation of the real
+   * transformed curve, but due to subdivision it should be good enough.
+   */
+  t_bezier = g_new (GimpCoords, 4);
+
+  /* note that while the segments themselves are clipped to the near plane,
+   * their control points may still get transformed behind the camera.  we
+   * therefore clip the control points to the near plane as well, which is not
+   * too meaningful, but avoids erroneously transforming them behind the
+   * camera.
+   */
+  gimp_transform_polygon_coords (matrix, bezier, 2, FALSE,
+                                 t_bezier, &n);
+  gimp_transform_polygon_coords (matrix, bezier + 2, 2, FALSE,
+                                 t_bezier + 2, &n);
+
+  g_queue_push_tail (t_beziers, t_bezier);
+}
+
+/* transforms the cubic bezier segment, defined by the four control points
+ * 'bezier', by 'matrix', performing clipping by the near plane and subdividing
+ * as necessary.
+ *
+ * returns the transformed set of bezier-segment sequences in 't_beziers', as
+ * GQueues of GimpCoords[4] bezier-segments, and the number of sequences in
+ * 'n_t_beziers'.  the minimal possible number of transformed sequences is 0,
+ * which happens when the entire segment is clipped.  the maximal possible
+ * number of transformed sequences is 2.  each sequence has at least one
+ * segment.
+ *
+ * if the first transformed segment is an initial segment of 'bezier', sets
+ * '*start_in' to TRUE, otherwise to FALSE.  if the last transformed segment is
+ * a final segment of 'bezier', sets '*end_in' to TRUE, otherwise to FALSE.
+ */
+void
+gimp_transform_bezier_coords (const GimpMatrix3 *matrix,
+                              const GimpCoords   bezier[4],
+                              GQueue            *t_beziers[2],
+                              gint              *n_t_beziers,
+                              gboolean          *start_in,
+                              gboolean          *end_in)
+{
+  GimpCoords c_bezier[2][4];
+  gint       i;
+
+  g_return_if_fail (matrix != NULL);
+  g_return_if_fail (bezier != NULL);
+  g_return_if_fail (t_beziers != NULL);
+  g_return_if_fail (n_t_beziers != NULL);
+  g_return_if_fail (start_in != NULL);
+  g_return_if_fail (end_in != NULL);
+
+  /* if the matrix is affine, transform the easy way */
+  if (gimp_matrix3_is_affine (matrix))
+    {
+      GimpCoords *t_bezier;
+
+      t_beziers[0] = g_queue_new ();
+      *n_t_beziers = 1;
+
+      t_bezier = g_new (GimpCoords, 1);
+      g_queue_push_tail (t_beziers[0], t_bezier);
+
+      for (i = 0; i < 4; i++)
+        {
+          t_bezier[i] = bezier[i];
+
+          gimp_matrix3_transform_point (matrix,
+                                        bezier[i].x,    bezier[i].y,
+                                        &t_bezier[i].x, &t_bezier[i].y);
+        }
+
+      return;
+    }
+
+  /* clip the segment to the near plane */
+  clip_bezier (bezier,
+               matrix->coeff[2][0],
+               matrix->coeff[2][1],
+               matrix->coeff[2][2] - GIMP_TRANSFORM_NEAR_Z,
+               c_bezier, n_t_beziers,
+               start_in, end_in);
+
+  /* transform each of the resulting segments */
+  for (i = 0; i < *n_t_beziers; i++)
+    {
+      t_beziers[i] = g_queue_new ();
+
+      transform_bezier_coords (matrix, c_bezier[i], t_beziers[i], 3);
+    }
+}
diff --git a/app/core/gimp-transform-utils.h b/app/core/gimp-transform-utils.h
new file mode 100644
index 0000000..c2c1252
--- /dev/null
+++ b/app/core/gimp-transform-utils.h
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_UTILS_H__
+#define __GIMP_TRANSFORM_UTILS_H__
+
+
+#define GIMP_TRANSFORM_NEAR_Z 0.02
+
+
+void       gimp_transform_get_rotate_center    (gint                 x,
+                                                gint                 y,
+                                                gint                 width,
+                                                gint                 height,
+                                                gboolean             auto_center,
+                                                gdouble             *center_x,
+                                                gdouble             *center_y);
+void       gimp_transform_get_flip_axis        (gint                 x,
+                                                gint                 y,
+                                                gint                 width,
+                                                gint                 height,
+                                                GimpOrientationType  flip_type,
+                                                gboolean             auto_center,
+                                                gdouble             *axis);
+
+void       gimp_transform_matrix_flip          (GimpMatrix3         *matrix,
+                                                GimpOrientationType  flip_type,
+                                                gdouble              axis);
+void       gimp_transform_matrix_flip_free     (GimpMatrix3         *matrix,
+                                                gdouble              x1,
+                                                gdouble              y1,
+                                                gdouble              x2,
+                                                gdouble              y2);
+void       gimp_transform_matrix_rotate        (GimpMatrix3         *matrix,
+                                                GimpRotationType     rotate_type,
+                                                gdouble              center_x,
+                                                gdouble              center_y);
+void       gimp_transform_matrix_rotate_rect   (GimpMatrix3         *matrix,
+                                                gint                 x,
+                                                gint                 y,
+                                                gint                 width,
+                                                gint                 height,
+                                                gdouble              angle);
+void       gimp_transform_matrix_rotate_center (GimpMatrix3         *matrix,
+                                                gdouble              center_x,
+                                                gdouble              center_y,
+                                                gdouble              angle);
+void       gimp_transform_matrix_scale         (GimpMatrix3         *matrix,
+                                                gint                 x,
+                                                gint                 y,
+                                                gint                 width,
+                                                gint                 height,
+                                                gdouble              t_x,
+                                                gdouble              t_y,
+                                                gdouble              t_width,
+                                                gdouble              t_height);
+void       gimp_transform_matrix_shear         (GimpMatrix3         *matrix,
+                                                gint                 x,
+                                                gint                 y,
+                                                gint                 width,
+                                                gint                 height,
+                                                GimpOrientationType  orientation,
+                                                gdouble              amount);
+void       gimp_transform_matrix_perspective   (GimpMatrix3         *matrix,
+                                                gint                 x,
+                                                gint                 y,
+                                                gint                 width,
+                                                gint                 height,
+                                                gdouble              t_x1,
+                                                gdouble              t_y1,
+                                                gdouble              t_x2,
+                                                gdouble              t_y2,
+                                                gdouble              t_x3,
+                                                gdouble              t_y3,
+                                                gdouble              t_x4,
+                                                gdouble              t_y4);
+gboolean   gimp_transform_matrix_generic       (GimpMatrix3         *matrix,
+                                                const GimpVector2    input_points[4],
+                                                const GimpVector2    output_points[4]);
+
+gboolean   gimp_transform_polygon_is_convex    (gdouble              x1,
+                                                gdouble              y1,
+                                                gdouble              x2,
+                                                gdouble              y2,
+                                                gdouble              x3,
+                                                gdouble              y3,
+                                                gdouble              x4,
+                                                gdouble              y4);
+
+void       gimp_transform_polygon              (const GimpMatrix3   *matrix,
+                                                const GimpVector2   *vertices,
+                                                gint                 n_vertices,
+                                                gboolean             closed,
+                                                GimpVector2         *t_vertices,
+                                                gint                *n_t_vertices);
+void       gimp_transform_polygon_coords       (const GimpMatrix3   *matrix,
+                                                const GimpCoords    *vertices,
+                                                gint                 n_vertices,
+                                                gboolean             closed,
+                                                GimpCoords          *t_vertices,
+                                                gint                *n_t_vertices);
+
+void       gimp_transform_bezier_coords        (const GimpMatrix3   *matrix,
+                                                const GimpCoords     bezier[4],
+                                                GQueue              *t_beziers[2],
+                                                gint                *n_t_beziers,
+                                                gboolean            *start_in,
+                                                gboolean            *end_in);
+
+
+#endif  /*  __GIMP_TRANSFORM_UTILS_H__  */
diff --git a/app/core/gimp-units.c b/app/core/gimp-units.c
new file mode 100644
index 0000000..22caca1
--- /dev/null
+++ b/app/core/gimp-units.c
@@ -0,0 +1,488 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpunit.c
+ * Copyright (C) 1999-2000 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains functions to load & save the file containing the
+ * user-defined size units, when the application starts/finished.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpbase-private.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-units.h"
+#include "gimpunit.h"
+
+#include "config/gimpconfig-file.h"
+
+#include "gimp-intl.h"
+
+
+/*
+ *  All deserialize functions return G_TOKEN_LEFT_PAREN on success,
+ *  or the GTokenType they would have expected but didn't get.
+ */
+
+static GTokenType gimp_unitrc_unit_info_deserialize (GScanner *scanner,
+                                                     Gimp     *gimp);
+
+
+static Gimp *the_unit_gimp = NULL;
+
+
+static gint
+gimp_units_get_number_of_units (void)
+{
+  return _gimp_unit_get_number_of_units (the_unit_gimp);
+}
+
+static gint
+gimp_units_get_number_of_built_in_units (void)
+{
+  return GIMP_UNIT_END;
+}
+
+static GimpUnit
+gimp_units_unit_new (gchar   *identifier,
+                     gdouble  factor,
+                     gint     digits,
+                     gchar   *symbol,
+                     gchar   *abbreviation,
+                     gchar   *singular,
+                     gchar   *plural)
+{
+  return _gimp_unit_new (the_unit_gimp,
+                         identifier,
+                         factor,
+                         digits,
+                         symbol,
+                         abbreviation,
+                         singular,
+                         plural);
+}
+
+static gboolean
+gimp_units_unit_get_deletion_flag (GimpUnit unit)
+{
+  return _gimp_unit_get_deletion_flag (the_unit_gimp, unit);
+}
+
+static void
+gimp_units_unit_set_deletion_flag (GimpUnit unit,
+                                   gboolean deletion_flag)
+{
+  _gimp_unit_set_deletion_flag (the_unit_gimp, unit, deletion_flag);
+}
+
+static gdouble
+gimp_units_unit_get_factor (GimpUnit unit)
+{
+  return _gimp_unit_get_factor (the_unit_gimp, unit);
+}
+
+static gint
+gimp_units_unit_get_digits (GimpUnit unit)
+{
+  return _gimp_unit_get_digits (the_unit_gimp, unit);
+}
+
+static const gchar *
+gimp_units_unit_get_identifier (GimpUnit unit)
+{
+  return _gimp_unit_get_identifier (the_unit_gimp, unit);
+}
+
+static const gchar *
+gimp_units_unit_get_symbol (GimpUnit unit)
+{
+  return _gimp_unit_get_symbol (the_unit_gimp, unit);
+}
+
+static const gchar *
+gimp_units_unit_get_abbreviation (GimpUnit unit)
+{
+  return _gimp_unit_get_abbreviation (the_unit_gimp, unit);
+}
+
+static const gchar *
+gimp_units_unit_get_singular (GimpUnit unit)
+{
+  return _gimp_unit_get_singular (the_unit_gimp, unit);
+}
+
+static const gchar *
+gimp_units_unit_get_plural (GimpUnit unit)
+{
+  return _gimp_unit_get_plural (the_unit_gimp, unit);
+}
+
+void
+gimp_units_init (Gimp *gimp)
+{
+  GimpUnitVtable vtable;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (the_unit_gimp == NULL);
+
+  the_unit_gimp = gimp;
+
+  vtable.unit_get_number_of_units          = gimp_units_get_number_of_units;
+  vtable.unit_get_number_of_built_in_units = gimp_units_get_number_of_built_in_units;
+  vtable.unit_new               = gimp_units_unit_new;
+  vtable.unit_get_deletion_flag = gimp_units_unit_get_deletion_flag;
+  vtable.unit_set_deletion_flag = gimp_units_unit_set_deletion_flag;
+  vtable.unit_get_factor        = gimp_units_unit_get_factor;
+  vtable.unit_get_digits        = gimp_units_unit_get_digits;
+  vtable.unit_get_identifier    = gimp_units_unit_get_identifier;
+  vtable.unit_get_symbol        = gimp_units_unit_get_symbol;
+  vtable.unit_get_abbreviation  = gimp_units_unit_get_abbreviation;
+  vtable.unit_get_singular      = gimp_units_unit_get_singular;
+  vtable.unit_get_plural        = gimp_units_unit_get_plural;
+
+  gimp_base_init (&vtable);
+
+  gimp->user_units   = NULL;
+  gimp->n_user_units = 0;
+}
+
+void
+gimp_units_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_user_units_free (gimp);
+}
+
+
+/*  unitrc functions  **********/
+
+enum
+{
+  UNIT_INFO = 1,
+  UNIT_FACTOR,
+  UNIT_DIGITS,
+  UNIT_SYMBOL,
+  UNIT_ABBREV,
+  UNIT_SINGULAR,
+  UNIT_PLURAL
+};
+
+void
+gimp_unitrc_load (Gimp *gimp)
+{
+  GFile      *file;
+  GScanner   *scanner;
+  GTokenType  token;
+  GError     *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  file = gimp_directory_file ("unitrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  scanner = gimp_scanner_new_gfile (file, &error);
+
+  if (! scanner && error->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
+    {
+      g_clear_error (&error);
+      g_object_unref (file);
+
+      file = gimp_sysconf_directory_file ("unitrc", NULL);
+
+      scanner = gimp_scanner_new_gfile (file, NULL);
+    }
+
+  if (! scanner)
+    {
+      g_clear_error (&error);
+      g_object_unref (file);
+      return;
+    }
+
+  g_scanner_scope_add_symbol (scanner, 0,
+                              "unit-info", GINT_TO_POINTER (UNIT_INFO));
+  g_scanner_scope_add_symbol (scanner, UNIT_INFO,
+                              "factor", GINT_TO_POINTER (UNIT_FACTOR));
+  g_scanner_scope_add_symbol (scanner, UNIT_INFO,
+                              "digits", GINT_TO_POINTER (UNIT_DIGITS));
+  g_scanner_scope_add_symbol (scanner, UNIT_INFO,
+                              "symbol", GINT_TO_POINTER (UNIT_SYMBOL));
+  g_scanner_scope_add_symbol (scanner, UNIT_INFO,
+                              "abbreviation", GINT_TO_POINTER (UNIT_ABBREV));
+  g_scanner_scope_add_symbol (scanner, UNIT_INFO,
+                              "singular", GINT_TO_POINTER (UNIT_SINGULAR));
+  g_scanner_scope_add_symbol (scanner, UNIT_INFO,
+                              "plural", GINT_TO_POINTER (UNIT_PLURAL));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          if (scanner->value.v_symbol == GINT_TO_POINTER (UNIT_INFO))
+            {
+              g_scanner_set_scope (scanner, UNIT_INFO);
+              token = gimp_unitrc_unit_info_deserialize (scanner, gimp);
+
+              if (token == G_TOKEN_RIGHT_PAREN)
+                g_scanner_set_scope (scanner, 0);
+            }
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+  if (token != G_TOKEN_LEFT_PAREN)
+    {
+      g_scanner_get_next_token (scanner);
+      g_scanner_unexp_token (scanner, token, NULL, NULL, NULL,
+                             _("fatal parse error"), TRUE);
+
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_clear_error (&error);
+
+      gimp_config_file_backup_on_error (file, "unitrc", NULL);
+    }
+
+  gimp_scanner_destroy (scanner);
+  g_object_unref (file);
+}
+
+void
+gimp_unitrc_save (Gimp *gimp)
+{
+  GimpConfigWriter *writer;
+  GFile            *file;
+  gint              i;
+  GError           *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  file = gimp_directory_file ("unitrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  writer =
+    gimp_config_writer_new_gfile (file,
+                                  TRUE,
+                                  "GIMP units\n\n"
+                                  "This file contains the user unit database. "
+                                  "You can edit this list with the unit "
+                                  "editor. You are not supposed to edit it "
+                                  "manually, but of course you can do.\n"
+                                  "This file will be entirely rewritten each "
+                                  "time you exit.",
+                                  NULL);
+
+  g_object_unref (file);
+
+  if (!writer)
+    return;
+
+  /*  save user defined units  */
+  for (i = _gimp_unit_get_number_of_built_in_units (gimp);
+       i < _gimp_unit_get_number_of_units (gimp);
+       i++)
+    {
+      if (_gimp_unit_get_deletion_flag (gimp, i) == FALSE)
+        {
+          gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
+
+          gimp_config_writer_open (writer, "unit-info");
+          gimp_config_writer_string (writer,
+                                     _gimp_unit_get_identifier (gimp, i));
+
+          gimp_config_writer_open (writer, "factor");
+          gimp_config_writer_print (writer,
+                                    g_ascii_dtostr (buf, sizeof (buf),
+                                                    _gimp_unit_get_factor (gimp, i)),
+                                    -1);
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_open (writer, "digits");
+          gimp_config_writer_printf (writer,
+                                     "%d", _gimp_unit_get_digits (gimp, i));
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_open (writer, "symbol");
+          gimp_config_writer_string (writer,
+                                     _gimp_unit_get_symbol (gimp, i));
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_open (writer, "abbreviation");
+          gimp_config_writer_string (writer,
+                                     _gimp_unit_get_abbreviation (gimp, i));
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_open (writer, "singular");
+          gimp_config_writer_string (writer,
+                                     _gimp_unit_get_singular (gimp, i));
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_open (writer, "plural");
+          gimp_config_writer_string (writer,
+                                     _gimp_unit_get_plural (gimp, i));
+          gimp_config_writer_close (writer);
+
+          gimp_config_writer_close (writer);
+        }
+    }
+
+  if (! gimp_config_writer_finish (writer, "end of units", &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_clear_error (&error);
+    }
+}
+
+
+/*  private functions  */
+
+static GTokenType
+gimp_unitrc_unit_info_deserialize (GScanner *scanner,
+                                   Gimp     *gimp)
+{
+  gchar      *identifier   = NULL;
+  gdouble     factor       = 1.0;
+  gint        digits       = 2.0;
+  gchar      *symbol       = NULL;
+  gchar      *abbreviation = NULL;
+  gchar      *singular     = NULL;
+  gchar      *plural       = NULL;
+  GTokenType  token;
+
+  if (! gimp_scanner_parse_string (scanner, &identifier))
+    return G_TOKEN_STRING;
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+            case UNIT_FACTOR:
+              token = G_TOKEN_FLOAT;
+              if (! gimp_scanner_parse_float (scanner, &factor))
+                goto cleanup;
+              break;
+
+            case UNIT_DIGITS:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &digits))
+                goto cleanup;
+              break;
+
+            case UNIT_SYMBOL:
+              token = G_TOKEN_STRING;
+              if (! gimp_scanner_parse_string (scanner, &symbol))
+                goto cleanup;
+              break;
+
+            case UNIT_ABBREV:
+              token = G_TOKEN_STRING;
+              if (! gimp_scanner_parse_string (scanner, &abbreviation))
+                goto cleanup;
+              break;
+
+            case UNIT_SINGULAR:
+              token = G_TOKEN_STRING;
+              if (! gimp_scanner_parse_string (scanner, &singular))
+                goto cleanup;
+              break;
+
+            case UNIT_PLURAL:
+              token = G_TOKEN_STRING;
+              if (! gimp_scanner_parse_string (scanner, &plural))
+                goto cleanup;
+             break;
+
+            default:
+              break;
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (token == G_TOKEN_LEFT_PAREN)
+    {
+      token = G_TOKEN_RIGHT_PAREN;
+
+      if (g_scanner_peek_next_token (scanner) == token)
+        {
+          GimpUnit unit = _gimp_unit_new (gimp,
+                                          identifier, factor, digits,
+                                          symbol, abbreviation,
+                                          singular, plural);
+
+          /*  make the unit definition persistent  */
+          _gimp_unit_set_deletion_flag (gimp, unit, FALSE);
+        }
+    }
+
+ cleanup:
+
+  g_free (identifier);
+  g_free (symbol);
+  g_free (abbreviation);
+  g_free (singular);
+  g_free (plural);
+
+  return token;
+}
diff --git a/app/core/gimp-units.h b/app/core/gimp-units.h
new file mode 100644
index 0000000..64f819a
--- /dev/null
+++ b/app/core/gimp-units.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UNITS_H__
+#define __GIMP_UNITS_H__
+
+
+void   gimp_units_init  (Gimp *gimp);
+void   gimp_units_exit  (Gimp *gimp);
+
+void   gimp_unitrc_load (Gimp *gimp);
+void   gimp_unitrc_save (Gimp *gimp);
+
+
+#endif  /*  __GIMP_UNITS_H__  */
diff --git a/app/core/gimp-user-install.c b/app/core/gimp-user-install.c
new file mode 100644
index 0000000..2b1c910
--- /dev/null
+++ b/app/core/gimp-user-install.c
@@ -0,0 +1,977 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-user-install.c
+ * Copyright (C) 2000-2008 Michael Natterer and Sven Neumann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains functions to help migrate the settings from a
+ * previous GIMP version to be used with the current (newer) version.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef PLATFORM_OSX
+#include <AppKit/AppKit.h>
+#endif
+
+#include <gio/gio.h>
+#include <glib/gstdio.h>
+
+#ifdef G_OS_WIN32
+#include <libgimpbase/gimpwin32-io.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "config/gimpconfig-file.h"
+#include "config/gimprc.h"
+
+#include "gimp-templates.h"
+#include "gimp-tags.h"
+#include "gimp-user-install.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpUserInstall
+{
+  GObject                 *gimp;
+
+  gboolean                verbose;
+
+  gchar                  *old_dir;
+  gint                    old_major;
+  gint                    old_minor;
+
+  const gchar            *migrate;
+
+  GimpUserInstallLogFunc  log;
+  gpointer                log_data;
+};
+
+typedef enum
+{
+  USER_INSTALL_MKDIR, /* Create the directory        */
+  USER_INSTALL_COPY   /* Copy from sysconf directory */
+} GimpUserInstallAction;
+
+static const struct
+{
+  const gchar           *name;
+  GimpUserInstallAction  action;
+}
+gimp_user_install_items[] =
+{
+  { "menurc",          USER_INSTALL_COPY  },
+  { "brushes",         USER_INSTALL_MKDIR },
+  { "dynamics",        USER_INSTALL_MKDIR },
+  { "fonts",           USER_INSTALL_MKDIR },
+  { "gradients",       USER_INSTALL_MKDIR },
+  { "palettes",        USER_INSTALL_MKDIR },
+  { "patterns",        USER_INSTALL_MKDIR },
+  { "tool-presets",    USER_INSTALL_MKDIR },
+  { "plug-ins",        USER_INSTALL_MKDIR },
+  { "modules",         USER_INSTALL_MKDIR },
+  { "interpreters",    USER_INSTALL_MKDIR },
+  { "environ",         USER_INSTALL_MKDIR },
+  { "scripts",         USER_INSTALL_MKDIR },
+  { "templates",       USER_INSTALL_MKDIR },
+  { "themes",          USER_INSTALL_MKDIR },
+  { "icons",           USER_INSTALL_MKDIR },
+  { "tmp",             USER_INSTALL_MKDIR },
+  { "curves",          USER_INSTALL_MKDIR },
+  { "levels",          USER_INSTALL_MKDIR },
+  { "filters",         USER_INSTALL_MKDIR },
+  { "fractalexplorer", USER_INSTALL_MKDIR },
+  { "gfig",            USER_INSTALL_MKDIR },
+  { "gflare",          USER_INSTALL_MKDIR },
+  { "gimpressionist",  USER_INSTALL_MKDIR }
+};
+
+
+static gboolean  user_install_detect_old         (GimpUserInstall    *install,
+                                                  const gchar        *gimp_dir);
+static gchar *   user_install_old_style_gimpdir  (void);
+
+static void      user_install_log                (GimpUserInstall    *install,
+                                                  const gchar        *format,
+                                                  ...) G_GNUC_PRINTF (2, 3);
+static void      user_install_log_newline        (GimpUserInstall    *install);
+static void      user_install_log_error          (GimpUserInstall    *install,
+                                                  GError            **error);
+
+static gboolean  user_install_mkdir              (GimpUserInstall    *install,
+                                                  const gchar        *dirname);
+static gboolean  user_install_mkdir_with_parents (GimpUserInstall    *install,
+                                                  const gchar        *dirname);
+static gboolean  user_install_file_copy          (GimpUserInstall    *install,
+                                                  const gchar        *source,
+                                                  const gchar        *dest,
+                                                  const gchar        *old_options_regexp,
+                                                  GRegexEvalCallback  update_callback);
+static gboolean  user_install_dir_copy           (GimpUserInstall    *install,
+                                                  gint                level,
+                                                  const gchar        *source,
+                                                  const gchar        *base,
+                                                  const gchar        *update_pattern,
+                                                  GRegexEvalCallback  update_callback);
+
+static gboolean  user_install_create_files       (GimpUserInstall    *install);
+static gboolean  user_install_migrate_files      (GimpUserInstall    *install);
+
+
+/*  public functions  */
+
+GimpUserInstall *
+gimp_user_install_new (GObject  *gimp,
+                       gboolean  verbose)
+{
+  GimpUserInstall *install = g_slice_new0 (GimpUserInstall);
+
+  install->gimp    = gimp;
+  install->verbose = verbose;
+
+  user_install_detect_old (install, gimp_directory ());
+
+#ifdef PLATFORM_OSX
+  /* The config path on OSX has for a very short time frame (2.8.2 only)
+     been "~/Library/GIMP". It changed to "~/Library/Application Support"
+     in 2.8.4 and was in the home folder (as was other UNIX) before. */
+
+  if (! install->old_dir)
+    {
+      gchar             *dir;
+      NSAutoreleasePool *pool;
+      NSArray           *path;
+      NSString          *library_dir;
+
+      pool = [[NSAutoreleasePool alloc] init];
+
+      path = NSSearchPathForDirectoriesInDomains (NSLibraryDirectory,
+                                                  NSUserDomainMask, YES);
+      library_dir = [path objectAtIndex:0];
+
+      dir = g_build_filename ([library_dir UTF8String],
+                              GIMPDIR, GIMP_USER_VERSION, NULL);
+
+      [pool drain];
+
+      user_install_detect_old (install, dir);
+      g_free (dir);
+    }
+
+#endif
+
+  if (! install->old_dir)
+    {
+      /* if the default XDG-style config directory was not found, try
+       * the "old-style" path in the home folder.
+       */
+      gchar *dir = user_install_old_style_gimpdir ();
+      user_install_detect_old (install, dir);
+      g_free (dir);
+    }
+
+  return install;
+}
+
+gboolean
+gimp_user_install_run (GimpUserInstall *install)
+{
+  gchar *dirname;
+
+  g_return_val_if_fail (install != NULL, FALSE);
+
+  dirname = g_filename_display_name (gimp_directory ());
+
+  if (install->migrate)
+    user_install_log (install,
+                      _("It seems you have used GIMP %s before.  "
+                        "GIMP will now migrate your user settings to '%s'."),
+                      install->migrate, dirname);
+  else
+    user_install_log (install,
+                      _("It appears that you are using GIMP for the "
+                        "first time.  GIMP will now create a folder "
+                        "named '%s' and copy some files to it."),
+                      dirname);
+
+  g_free (dirname);
+
+  user_install_log_newline (install);
+
+  if (! user_install_mkdir_with_parents (install, gimp_directory ()))
+    return FALSE;
+
+  if (install->migrate)
+    if (! user_install_migrate_files (install))
+      return FALSE;
+
+  return user_install_create_files (install);
+}
+
+void
+gimp_user_install_free (GimpUserInstall *install)
+{
+  g_return_if_fail (install != NULL);
+
+  g_free (install->old_dir);
+
+  g_slice_free (GimpUserInstall, install);
+}
+
+void
+gimp_user_install_set_log_handler (GimpUserInstall        *install,
+                                   GimpUserInstallLogFunc  log,
+                                   gpointer                user_data)
+{
+  g_return_if_fail (install != NULL);
+
+  install->log      = log;
+  install->log_data = user_data;
+}
+
+
+/*  Local functions  */
+
+static gboolean
+user_install_detect_old (GimpUserInstall *install,
+                         const gchar     *gimp_dir)
+{
+  gchar    *dir     = g_strdup (gimp_dir);
+  gchar    *version;
+  gboolean  migrate = FALSE;
+
+  version = strstr (dir, GIMP_APP_VERSION);
+
+  if (version)
+    {
+      gint i;
+
+      for (i = (GIMP_MINOR_VERSION & ~1); i >= 0; i -= 2)
+        {
+          /*  we assume that GIMP_APP_VERSION is in the form '2.x'  */
+          g_snprintf (version + 2, 2, "%d", i);
+
+          migrate = g_file_test (dir, G_FILE_TEST_IS_DIR);
+
+          if (migrate)
+            {
+#ifdef GIMP_UNSTABLE
+              g_printerr ("gimp-user-install: migrating from %s\n", dir);
+#endif
+              install->old_major = 2;
+              install->old_minor = i;
+
+              break;
+            }
+        }
+    }
+
+  if (migrate)
+    {
+      install->old_dir = dir;
+      install->migrate = (const gchar *) version;
+    }
+  else
+    {
+      g_free (dir);
+    }
+
+  return migrate;
+}
+
+static gchar *
+user_install_old_style_gimpdir (void)
+{
+  const gchar *home_dir = g_get_home_dir ();
+  gchar       *gimp_dir = NULL;
+
+  if (home_dir)
+    {
+      gimp_dir = g_build_filename (home_dir, ".gimp-" GIMP_APP_VERSION, NULL);
+    }
+  else
+    {
+      gchar *user_name = g_strdup (g_get_user_name ());
+      gchar *subdir_name;
+
+#ifdef G_OS_WIN32
+      gchar *p = user_name;
+
+      while (*p)
+        {
+          /* Replace funny characters in the user name with an
+           * underscore. The code below also replaces some
+           * characters that in fact are legal in file names, but
+           * who cares, as long as the definitely illegal ones are
+           * caught.
+           */
+          if (!g_ascii_isalnum (*p) && !strchr ("-.,@=", *p))
+            *p = '_';
+          p++;
+        }
+#endif
+
+#ifndef G_OS_WIN32
+      g_message ("warning: no home directory.");
+#endif
+      subdir_name = g_strconcat (".gimp-" GIMP_APP_VERSION ".", user_name, NULL);
+      gimp_dir = g_build_filename (gimp_data_directory (),
+                                   subdir_name,
+                                   NULL);
+      g_free (user_name);
+      g_free (subdir_name);
+    }
+
+  return gimp_dir;
+}
+
+static void
+user_install_log (GimpUserInstall *install,
+                  const gchar     *format,
+                  ...)
+{
+  va_list args;
+
+  va_start (args, format);
+
+  if (format)
+    {
+      gchar *message = g_strdup_vprintf (format, args);
+
+      if (install->verbose)
+        g_print ("%s\n", message);
+
+      if (install->log)
+        install->log (message, FALSE, install->log_data);
+
+      g_free (message);
+    }
+
+  va_end (args);
+}
+
+static void
+user_install_log_newline (GimpUserInstall *install)
+{
+  if (install->verbose)
+    g_print ("\n");
+
+  if (install->log)
+    install->log (NULL, FALSE, install->log_data);
+}
+
+static void
+user_install_log_error (GimpUserInstall  *install,
+                        GError          **error)
+{
+  if (error && *error)
+    {
+      const gchar *message = ((*error)->message ?
+                              (*error)->message : "(unknown error)");
+
+      if (install->log)
+        install->log (message, TRUE, install->log_data);
+      else
+        g_print ("error: %s\n", message);
+
+      g_clear_error (error);
+    }
+}
+
+static gboolean
+user_install_file_copy (GimpUserInstall    *install,
+                        const gchar        *source,
+                        const gchar        *dest,
+                        const gchar        *old_options_regexp,
+                        GRegexEvalCallback  update_callback)
+{
+  GError   *error = NULL;
+  gboolean  success;
+
+  user_install_log (install, _("Copying file '%s' from '%s'..."),
+                    gimp_filename_to_utf8 (dest),
+                    gimp_filename_to_utf8 (source));
+
+  success = gimp_config_file_copy (source, dest, old_options_regexp, update_callback, &error);
+
+  user_install_log_error (install, &error);
+
+  return success;
+}
+
+static gboolean
+user_install_mkdir (GimpUserInstall *install,
+                    const gchar     *dirname)
+{
+  user_install_log (install, _("Creating folder '%s'..."),
+                    gimp_filename_to_utf8 (dirname));
+
+  if (g_mkdir (dirname,
+               S_IRUSR | S_IWUSR | S_IXUSR |
+               S_IRGRP | S_IXGRP |
+               S_IROTH | S_IXOTH) == -1)
+    {
+      GError *error = NULL;
+
+      g_set_error (&error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   _("Cannot create folder '%s': %s"),
+                   gimp_filename_to_utf8 (dirname), g_strerror (errno));
+
+      user_install_log_error (install, &error);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+user_install_mkdir_with_parents (GimpUserInstall *install,
+                                 const gchar     *dirname)
+{
+  user_install_log (install, _("Creating folder '%s'..."),
+                    gimp_filename_to_utf8 (dirname));
+
+  if (g_mkdir_with_parents (dirname,
+                            S_IRUSR | S_IWUSR | S_IXUSR |
+                            S_IRGRP | S_IXGRP |
+                            S_IROTH | S_IXOTH) == -1)
+    {
+      GError *error = NULL;
+
+      g_set_error (&error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   _("Cannot create folder '%s': %s"),
+                   gimp_filename_to_utf8 (dirname), g_strerror (errno));
+
+      user_install_log_error (install, &error);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* The regexp pattern of all options changed from menurc of GIMP 2.8.
+ * Add any pattern that we want to recognize for replacement in the menurc of
+ * the next release
+ */
+#define MENURC_OVER20_UPDATE_PATTERN \
+  "\"<Actions>/buffers/buffers-paste-as-new\""  "|" \
+  "\"<Actions>/edit/edit-paste-as-new\""        "|" \
+  "\"<Actions>/file/file-export\""              "|" \
+  "\"<Actions>/file/file-export-to\""           "|" \
+  "\"<Actions>/layers/layers-text-tool\""       "|" \
+  "\"<Actions>/plug-in/plug-in-gauss\""         "|" \
+  "\"<Actions>/tools/tools-value-[1-4]-.*\""    "|" \
+  "\"<Actions>/vectors/vectors-path-tool\""     "|" \
+  "\"<Actions>/tools/tools-blend\""
+
+/**
+ * callback to use for updating a menurc from GIMP over 2.0.
+ * data is unused (always NULL).
+ * The updated value will be matched line by line.
+ */
+static gboolean
+user_update_menurc_over20 (const GMatchInfo *matched_value,
+                           GString          *new_value,
+                           gpointer          data)
+{
+  gchar *match = g_match_info_fetch (matched_value, 0);
+
+  /* "*-paste-as-new" renamed to "*-paste-as-new-image"
+   */
+  if (g_strcmp0 (match, "\"<Actions>/buffers/buffers-paste-as-new\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/buffers/buffers-paste-as-new-image\"");
+    }
+  else if (g_strcmp0 (match, "\"<Actions>/edit/edit-paste-as-new\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/edit/edit-paste-as-new-image\"");
+    }
+  /* file-export-* changes to follow file-save-* patterns.  Actions
+   * available since GIMP 2.8, changed for 2.10 in commit 4b14ed2.
+   */
+  else if (g_strcmp0 (match, "\"<Actions>/file/file-export\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/file/file-export-as\"");
+    }
+  else if (g_strcmp0 (match, "\"<Actions>/file/file-export-to\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/file/file-export\"");
+    }
+  else if (g_strcmp0 (match, "\"<Actions>/layers/layers-text-tool\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/layers/layers-edit\"");
+    }
+  /* plug-in-gauss doesn't exist anymore since commit ff59aebbe88.
+   * The expected replacement would be filters-gaussian-blur which is
+   * gegl:gaussian-blur operation. See also bug 775931.
+   */
+  else if (g_strcmp0 (match, "\"<Actions>/plug-in/plug-in-gauss\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/filters/filters-gaussian-blur\"");
+    }
+  /* Tools settings renamed more user-friendly.  Actions available
+   * since GIMP 2.4, changed for 2.10 in commit 0bdb747.
+   */
+  else if (g_str_has_prefix (match, "\"<Actions>/tools/tools-value-1-"))
+    {
+      g_string_append (new_value, "\"<Actions>/tools/tools-opacity-");
+      g_string_append (new_value, match + 31);
+    }
+  else if (g_str_has_prefix (match, "\"<Actions>/tools/tools-value-2-"))
+    {
+      g_string_append (new_value, "\"<Actions>/tools/tools-size-");
+      g_string_append (new_value, match + 31);
+    }
+  else if (g_str_has_prefix (match, "\"<Actions>/tools/tools-value-3-"))
+    {
+      g_string_append (new_value, "\"<Actions>/tools/tools-aspect-");
+      g_string_append (new_value, match + 31);
+    }
+  else if (g_str_has_prefix (match, "\"<Actions>/tools/tools-value-4-"))
+    {
+      g_string_append (new_value, "\"<Actions>/tools/tools-angle-");
+      g_string_append (new_value, match + 31);
+    }
+  else if (g_strcmp0 (match, "\"<Actions>/vectors/vectors-path-tool\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/vectors/vectors-edit\"");
+    }
+  else if (g_strcmp0 (match, "\"<Actions>/tools/tools-blend\"") == 0)
+    {
+      g_string_append (new_value, "\"<Actions>/tools/tools-gradient\"");
+    }
+  /* Should not happen. Just in case we match something unexpected by
+   * mistake.
+   */
+  else
+    {
+      g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match);
+      g_string_append (new_value, match);
+    }
+
+  g_free (match);
+  return FALSE;
+}
+
+#define CONTROLLERRC_UPDATE_PATTERN \
+  "\\(map \"(scroll|cursor)-[^\"]*\\bcontrol\\b[^\"]*\""
+
+static gboolean
+user_update_controllerrc (const GMatchInfo *matched_value,
+                          GString          *new_value,
+                          gpointer          data)
+{
+  gchar  *original;
+  gchar  *replacement;
+  GRegex *regexp = NULL;
+
+  /* No need of a complicated pattern here.
+   * CONTROLLERRC_UPDATE_PATTERN took care of it first.
+   */
+  regexp   = g_regex_new ("\\bcontrol\\b", 0, 0, NULL);
+  original = g_match_info_fetch (matched_value, 0);
+
+  replacement = g_regex_replace (regexp, original, -1, 0,
+                                 "primary", 0, NULL);
+  g_string_append (new_value, replacement);
+
+  g_free (original);
+  g_free (replacement);
+  g_regex_unref (regexp);
+
+  return FALSE;
+}
+
+#define GIMPRC_UPDATE_PATTERN \
+  "\\(theme [^)]*\\)"    "|" \
+  "\\(.*-path [^)]*\\)"
+
+static gboolean
+user_update_gimprc (const GMatchInfo *matched_value,
+                    GString          *new_value,
+                    gpointer          data)
+{
+  /* Do not migrate paths and themes from GIMP < 2.10. */
+  return FALSE;
+}
+
+#define GIMPRESSIONIST_UPDATE_PATTERN \
+  "selectedbrush=Brushes/paintbrush.pgm"
+
+static gboolean
+user_update_gimpressionist (const GMatchInfo *matched_value,
+                            GString          *new_value,
+                            gpointer          data)
+{
+  gchar *match = g_match_info_fetch (matched_value, 0);
+
+  /* See bug 791934: both brushes are identical. */
+  if (g_strcmp0 (match, "selectedbrush=Brushes/paintbrush.pgm") == 0)
+    {
+      g_string_append (new_value, "selectedbrush=Brushes/paintbrush01.pgm");
+    }
+  else
+    {
+      g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match);
+      g_string_append (new_value, match);
+    }
+
+  g_free (match);
+  return FALSE;
+}
+
+#define TOOL_PRESETS_UPDATE_PATTERN \
+  "GimpImageMapOptions"  "|" \
+  "GimpBlendOptions"     "|" \
+  "gimp-blend-tool"      "|" \
+  "gimp-tool-blend"
+
+static gboolean
+user_update_tool_presets (const GMatchInfo *matched_value,
+                          GString          *new_value,
+                          gpointer          data)
+{
+  gchar *match = g_match_info_fetch (matched_value, 0);
+
+  if (g_strcmp0 (match, "GimpImageMapOptions") == 0)
+    {
+      g_string_append (new_value, "GimpFilterOptions");
+    }
+  else if (g_strcmp0 (match, "GimpBlendOptions") == 0)
+    {
+      g_string_append (new_value, "GimpGradientOptions");
+    }
+  else if (g_strcmp0 (match, "gimp-blend-tool") == 0)
+    {
+      g_string_append (new_value, "gimp-gradient-tool");
+    }
+  else if (g_strcmp0 (match, "gimp-tool-blend") == 0)
+    {
+      g_string_append (new_value, "gimp-tool-gradient");
+    }
+  else
+    {
+      g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match);
+      g_string_append (new_value, match);
+    }
+
+  g_free (match);
+  return FALSE;
+}
+
+/* Actually not only for contextrc, but all other files where
+ * gimp-blend-tool may appear. Apparently that is also "devicerc", as
+ * well as "toolrc" (but this one is skipped anyway).
+ */
+#define CONTEXTRC_UPDATE_PATTERN "gimp-blend-tool"
+
+static gboolean
+user_update_contextrc_over20 (const GMatchInfo *matched_value,
+                              GString          *new_value,
+                              gpointer          data)
+{
+  gchar *match = g_match_info_fetch (matched_value, 0);
+
+  if (g_strcmp0 (match, "gimp-blend-tool") == 0)
+    {
+      g_string_append (new_value, "gimp-gradient-tool");
+    }
+  else
+    {
+      g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match);
+      g_string_append (new_value, match);
+    }
+
+  g_free (match);
+  return FALSE;
+}
+
+static gboolean
+user_install_dir_copy (GimpUserInstall    *install,
+                       gint                level,
+                       const gchar        *source,
+                       const gchar        *base,
+                       const gchar        *update_pattern,
+                       GRegexEvalCallback  update_callback)
+{
+  GDir        *source_dir = NULL;
+  GDir        *dest_dir   = NULL;
+  gchar        dest[1024];
+  const gchar *basename;
+  gchar       *dirname = NULL;
+  gchar       *name;
+  GError      *error   = NULL;
+  gboolean     success = FALSE;
+
+  if (level >= 5)
+    {
+      /* Config migration is recursive, but we can't go on forever,
+       * since we may fall into recursive symlinks in particular (which
+       * is a security risk to fill a disk, and would also block GIMP
+       * forever at migration stage).
+       * Let's just break the recursivity at 5 levels, which is just an
+       * arbitrary value (but I don't think there should be any data
+       * deeper than this).
+       */
+      goto error;
+    }
+
+  name = g_path_get_basename (source);
+  dirname = g_build_filename (base, name, NULL);
+  g_free (name);
+
+  success = user_install_mkdir (install, dirname);
+  if (! success)
+    goto error;
+
+  success = (dest_dir = g_dir_open (dirname, 0, &error)) != NULL;
+  if (! success)
+    goto error;
+
+  success = (source_dir = g_dir_open (source, 0, &error)) != NULL;
+  if (! success)
+    goto error;
+
+  while ((basename = g_dir_read_name (source_dir)) != NULL)
+    {
+      name = g_build_filename (source, basename, NULL);
+
+      if (g_file_test (name, G_FILE_TEST_IS_REGULAR))
+        {
+          g_snprintf (dest, sizeof (dest), "%s%c%s",
+                      dirname, G_DIR_SEPARATOR, basename);
+
+          success = user_install_file_copy (install, name, dest,
+                                            update_pattern,
+                                            update_callback);
+          if (! success)
+            {
+              g_free (name);
+              goto error;
+            }
+        }
+      else
+        {
+          user_install_dir_copy (install, level + 1, name, dirname,
+                                 update_pattern, update_callback);
+        }
+
+      g_free (name);
+    }
+
+ error:
+  user_install_log_error (install, &error);
+
+  if (source_dir)
+    g_dir_close (source_dir);
+
+  if (dest_dir)
+    g_dir_close (dest_dir);
+
+  if (dirname)
+    g_free (dirname);
+
+  return success;
+}
+
+static gboolean
+user_install_create_files (GimpUserInstall *install)
+{
+  gchar dest[1024];
+  gchar source[1024];
+  gint  i;
+
+  for (i = 0; i < G_N_ELEMENTS (gimp_user_install_items); i++)
+    {
+      g_snprintf (dest, sizeof (dest), "%s%c%s",
+                  gimp_directory (),
+                  G_DIR_SEPARATOR,
+                  gimp_user_install_items[i].name);
+
+      if (g_file_test (dest, G_FILE_TEST_EXISTS))
+        continue;
+
+      switch (gimp_user_install_items[i].action)
+        {
+        case USER_INSTALL_MKDIR:
+          if (! user_install_mkdir (install, dest))
+            return FALSE;
+          break;
+
+        case USER_INSTALL_COPY:
+          g_snprintf (source, sizeof (source), "%s%c%s",
+                      gimp_sysconf_directory (), G_DIR_SEPARATOR,
+                      gimp_user_install_items[i].name);
+
+          if (! user_install_file_copy (install, source, dest, NULL, NULL))
+            return FALSE;
+          break;
+        }
+    }
+
+  g_snprintf (dest, sizeof (dest), "%s%c%s",
+              gimp_directory (), G_DIR_SEPARATOR, "tags.xml");
+
+  if (! g_file_test (dest, G_FILE_TEST_IS_REGULAR))
+    {
+      /* if there was no tags.xml, install it with default tag set.
+       */
+      if (! gimp_tags_user_install ())
+        {
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+user_install_migrate_files (GimpUserInstall *install)
+{
+  GDir        *dir;
+  const gchar *basename;
+  gchar        dest[1024];
+  GimpRc      *gimprc;
+  GError      *error = NULL;
+
+  dir = g_dir_open (install->old_dir, 0, &error);
+
+  if (! dir)
+    {
+      user_install_log_error (install, &error);
+      return FALSE;
+    }
+
+  while ((basename = g_dir_read_name (dir)) != NULL)
+    {
+      gchar *source = g_build_filename (install->old_dir, basename, NULL);
+
+      if (g_file_test (source, G_FILE_TEST_IS_REGULAR))
+        {
+          const gchar        *update_pattern = NULL;
+          GRegexEvalCallback  update_callback = NULL;
+
+          /*  skip these files for all old versions  */
+          if (strcmp (basename, "documents") == 0      ||
+              g_str_has_prefix (basename, "gimpswap.") ||
+              strcmp (basename, "pluginrc") == 0       ||
+              strcmp (basename, "themerc") == 0        ||
+              strcmp (basename, "toolrc") == 0)
+            {
+              goto next_file;
+            }
+          else if (strcmp (basename, "menurc") == 0)
+            {
+              switch (install->old_minor)
+                {
+                case 0:
+                  /*  skip menurc for gimp 2.0 as the format has changed  */
+                  goto next_file;
+                  break;
+                default:
+                  update_pattern  = MENURC_OVER20_UPDATE_PATTERN;
+                  update_callback = user_update_menurc_over20;
+                  break;
+                }
+            }
+          else if (strcmp (basename, "controllerrc") == 0)
+            {
+              update_pattern  = CONTROLLERRC_UPDATE_PATTERN;
+              update_callback = user_update_controllerrc;
+            }
+          else if (strcmp (basename, "gimprc") == 0)
+            {
+              update_pattern  = GIMPRC_UPDATE_PATTERN;
+              update_callback = user_update_gimprc;
+            }
+          else if (strcmp (basename, "contextrc") == 0      ||
+                   strcmp (basename, "devicerc") == 0)
+            {
+              update_pattern  = CONTEXTRC_UPDATE_PATTERN;
+              update_callback = user_update_contextrc_over20;
+            }
+
+          g_snprintf (dest, sizeof (dest), "%s%c%s",
+                      gimp_directory (), G_DIR_SEPARATOR, basename);
+
+          user_install_file_copy (install, source, dest,
+                                  update_pattern, update_callback);
+        }
+      else if (g_file_test (source, G_FILE_TEST_IS_DIR))
+        {
+          const gchar        *update_pattern = NULL;
+          GRegexEvalCallback  update_callback = NULL;
+
+          /*  skip these directories for all old versions  */
+          if (strcmp (basename, "tmp") == 0          ||
+              strcmp (basename, "tool-options") == 0 ||
+              strcmp (basename, "themes") == 0)
+            {
+              goto next_file;
+            }
+
+          if (strcmp (basename, "gimpressionist") == 0)
+            {
+              update_pattern  = GIMPRESSIONIST_UPDATE_PATTERN;
+              update_callback = user_update_gimpressionist;
+            }
+          else if (strcmp (basename, "tool-presets") == 0)
+            {
+              update_pattern  = TOOL_PRESETS_UPDATE_PATTERN;
+              update_callback = user_update_tool_presets;
+            }
+          user_install_dir_copy (install, 0, source, gimp_directory (),
+                                 update_pattern, update_callback);
+        }
+
+    next_file:
+      g_free (source);
+    }
+
+  /*  create the tmp directory that was explicitly not copied  */
+
+  g_snprintf (dest, sizeof (dest), "%s%c%s",
+              gimp_directory (), G_DIR_SEPARATOR, "tmp");
+
+  user_install_mkdir (install, dest);
+  g_dir_close (dir);
+
+  gimp_templates_migrate (install->old_dir);
+
+  gimprc = gimp_rc_new (install->gimp, NULL, NULL, FALSE);
+  gimp_rc_migrate (gimprc);
+  gimp_rc_save (gimprc);
+  g_object_unref (gimprc);
+
+  return TRUE;
+}
diff --git a/app/core/gimp-user-install.h b/app/core/gimp-user-install.h
new file mode 100644
index 0000000..1bac686
--- /dev/null
+++ b/app/core/gimp-user-install.h
@@ -0,0 +1,39 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_USER_INSTALL_H__
+#define __GIMP_USER_INSTALL_H__
+
+
+typedef struct _GimpUserInstall GimpUserInstall;
+
+typedef void  (* GimpUserInstallLogFunc) (const gchar *message,
+                                          gboolean     error,
+                                          gpointer     user_data);
+
+
+GimpUserInstall * gimp_user_install_new  (GObject          *gimp,
+                                          gboolean          verbose);
+gboolean          gimp_user_install_run  (GimpUserInstall  *install);
+void              gimp_user_install_free (GimpUserInstall  *install);
+
+void   gimp_user_install_set_log_handler (GimpUserInstall        *install,
+                                          GimpUserInstallLogFunc  log,
+                                          gpointer                user_data);
+
+
+#endif /* __USER_INSTALL_H__ */
diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c
new file mode 100644
index 0000000..d3df098
--- /dev/null
+++ b/app/core/gimp-utils.c
@@ -0,0 +1,1098 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
+
+#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
+#include <langinfo.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#include <process.h>
+#endif
+
+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
+/* For get_backtrace() */
+#include <stdlib.h>
+#include <string.h>
+#include <execinfo.h>
+#endif
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gobject/gvaluecollector.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-utils.h"
+#include "gimpasync.h"
+#include "gimpcontext.h"
+#include "gimperror.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_FUNC 100
+
+
+gint
+gimp_get_pid (void)
+{
+  return (gint) getpid ();
+}
+
+guint64
+gimp_get_physical_memory_size (void)
+{
+#ifdef G_OS_UNIX
+#if defined(HAVE_UNISTD_H) && defined(_SC_PHYS_PAGES) && defined (_SC_PAGE_SIZE)
+  return (guint64) sysconf (_SC_PHYS_PAGES) * sysconf (_SC_PAGE_SIZE);
+#endif
+#endif
+
+#ifdef G_OS_WIN32
+# if defined(_MSC_VER) && (_MSC_VER <= 1200)
+  MEMORYSTATUS memory_status;
+  memory_status.dwLength = sizeof (memory_status);
+
+  GlobalMemoryStatus (&memory_status);
+  return memory_status.dwTotalPhys;
+# else
+  /* requires w2k and newer SDK than provided with msvc6 */
+  MEMORYSTATUSEX memory_status;
+
+  memory_status.dwLength = sizeof (memory_status);
+
+  if (GlobalMemoryStatusEx (&memory_status))
+    return memory_status.ullTotalPhys;
+# endif
+#endif
+
+  return 0;
+}
+
+/*
+ *  basically copied from gtk_get_default_language()
+ */
+gchar *
+gimp_get_default_language (const gchar *category)
+{
+  gchar *lang;
+  gchar *p;
+  gint   cat = LC_CTYPE;
+
+  if (! category)
+    category = "LC_CTYPE";
+
+#ifdef G_OS_WIN32
+
+  p = getenv ("LC_ALL");
+  if (p != NULL)
+    lang = g_strdup (p);
+  else
+    {
+      p = getenv ("LANG");
+      if (p != NULL)
+        lang = g_strdup (p);
+      else
+        {
+          p = getenv (category);
+          if (p != NULL)
+            lang = g_strdup (p);
+          else
+            lang = g_win32_getlocale ();
+        }
+    }
+
+#else
+
+  if (strcmp (category, "LC_CTYPE") == 0)
+    cat = LC_CTYPE;
+  else if (strcmp (category, "LC_MESSAGES") == 0)
+    cat = LC_MESSAGES;
+  else
+    g_warning ("unsupported category used with gimp_get_default_language()");
+
+  lang = g_strdup (setlocale (cat, NULL));
+
+#endif
+
+  p = strchr (lang, '.');
+  if (p)
+    *p = '\0';
+  p = strchr (lang, '@');
+  if (p)
+    *p = '\0';
+
+  return lang;
+}
+
+GimpUnit
+gimp_get_default_unit (void)
+{
+#if defined (HAVE__NL_MEASUREMENT_MEASUREMENT)
+  const gchar *measurement = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT);
+
+  switch (*((guchar *) measurement))
+    {
+    case 1: /* metric   */
+      return GIMP_UNIT_MM;
+
+    case 2: /* imperial */
+      return GIMP_UNIT_INCH;
+    }
+
+#elif defined (G_OS_WIN32)
+  DWORD measurement;
+  int   ret;
+
+  ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                      LOCALE_IMEASURE | LOCALE_RETURN_NUMBER,
+                      (LPTSTR)&measurement,
+                      sizeof(measurement) / sizeof(TCHAR) );
+
+  if (ret != 0) /* GetLocaleInfo succeeded */
+    {
+    switch ((guint) measurement)
+      {
+      case 0: /* metric */
+        return GIMP_UNIT_MM;
+
+      case 1: /* imperial */
+        return GIMP_UNIT_INCH;
+      }
+    }
+#endif
+
+  return GIMP_UNIT_MM;
+}
+
+gchar **
+gimp_properties_append (GType    object_type,
+                        gint    *n_properties,
+                        gchar  **names,
+                        GValue **values,
+                        ...)
+{
+  va_list args;
+
+  g_return_val_if_fail (g_type_is_a (object_type, G_TYPE_OBJECT), NULL);
+  g_return_val_if_fail (n_properties != NULL, NULL);
+  g_return_val_if_fail (names != NULL || *n_properties == 0, NULL);
+  g_return_val_if_fail (values != NULL || *n_properties == 0, NULL);
+
+  va_start (args, values);
+  names = gimp_properties_append_valist (object_type, n_properties,
+                                         names, values, args);
+  va_end (args);
+
+  return names;
+}
+
+gchar **
+gimp_properties_append_valist (GType     object_type,
+                               gint      *n_properties,
+                               gchar   **names,
+                               GValue  **values,
+                               va_list   args)
+{
+  GObjectClass *object_class;
+  gchar        *param_name;
+
+  g_return_val_if_fail (g_type_is_a (object_type, G_TYPE_OBJECT), NULL);
+  g_return_val_if_fail (n_properties != NULL, NULL);
+  g_return_val_if_fail (names != NULL || *n_properties == 0, NULL);
+  g_return_val_if_fail (values != NULL || *n_properties == 0, NULL);
+
+  object_class = g_type_class_ref (object_type);
+
+  param_name = va_arg (args, gchar *);
+
+  while (param_name)
+    {
+      GValue     *value;
+      gchar      *error = NULL;
+      GParamSpec *pspec = g_object_class_find_property (object_class,
+                                                        param_name);
+
+      if (! pspec)
+        {
+          g_warning ("%s: object class `%s' has no property named `%s'",
+                     G_STRFUNC, g_type_name (object_type), param_name);
+          break;
+        }
+
+      names   = g_renew (gchar *, names,   *n_properties + 1);
+      *values = g_renew (GValue,  *values, *n_properties + 1);
+
+      value = &((*values)[*n_properties]);
+
+      names[*n_properties] = g_strdup (param_name);
+      value->g_type = 0;
+
+      g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+
+      G_VALUE_COLLECT (value, args, 0, &error);
+
+      if (error)
+        {
+          g_warning ("%s: %s", G_STRFUNC, error);
+          g_free (error);
+          g_free (names[*n_properties]);
+          g_value_unset (value);
+          break;
+        }
+
+      *n_properties = *n_properties + 1;
+
+      param_name = va_arg (args, gchar *);
+    }
+
+  g_type_class_unref (object_class);
+
+  return names;
+}
+
+void
+gimp_properties_free (gint     n_properties,
+                      gchar  **names,
+                      GValue  *values)
+{
+  g_return_if_fail (names  != NULL || n_properties == 0);
+  g_return_if_fail (values != NULL || n_properties == 0);
+
+  if (names && values)
+    {
+      gint i;
+
+      for (i = 0; i < n_properties; i++)
+        {
+          g_free (names[i]);
+          g_value_unset (&values[i]);
+        }
+
+      g_free (names);
+      g_free (values);
+    }
+}
+
+/*  markup unescape code stolen and adapted from gmarkup.c
+ */
+static gchar *
+char_str (gunichar c,
+          gchar   *buf)
+{
+  memset (buf, 0, 8);
+  g_unichar_to_utf8 (c, buf);
+  return buf;
+}
+
+static gboolean
+unescape_gstring (GString *string)
+{
+  const gchar *from;
+  gchar       *to;
+
+  /*
+   * Meeks' theorum: unescaping can only shrink text.
+   * for &lt; etc. this is obvious, for &#xffff; more
+   * thought is required, but this is patently so.
+   */
+  for (from = to = string->str; *from != '\0'; from++, to++)
+    {
+      *to = *from;
+
+      if (*to == '\r')
+        {
+          *to = '\n';
+          if (from[1] == '\n')
+            from++;
+        }
+      if (*from == '&')
+        {
+          from++;
+          if (*from == '#')
+            {
+              gboolean is_hex = FALSE;
+              gulong   l;
+              gchar   *end = NULL;
+
+              from++;
+
+              if (*from == 'x')
+                {
+                  is_hex = TRUE;
+                  from++;
+                }
+
+              /* digit is between start and p */
+              errno = 0;
+              if (is_hex)
+                l = strtoul (from, &end, 16);
+              else
+                l = strtoul (from, &end, 10);
+
+              if (end == from || errno != 0)
+                {
+                  return FALSE;
+                }
+              else if (*end != ';')
+                {
+                  return FALSE;
+                }
+              else
+                {
+                  /* characters XML 1.1 permits */
+                  if ((0 < l && l <= 0xD7FF) ||
+                      (0xE000 <= l && l <= 0xFFFD) ||
+                      (0x10000 <= l && l <= 0x10FFFF))
+                    {
+                      gchar buf[8];
+                      char_str (l, buf);
+                      strcpy (to, buf);
+                      to += strlen (buf) - 1;
+                      from = end;
+                    }
+                  else
+                    {
+                      return FALSE;
+                    }
+                }
+            }
+
+          else if (strncmp (from, "lt;", 3) == 0)
+            {
+              *to = '<';
+              from += 2;
+            }
+          else if (strncmp (from, "gt;", 3) == 0)
+            {
+              *to = '>';
+              from += 2;
+            }
+          else if (strncmp (from, "amp;", 4) == 0)
+            {
+              *to = '&';
+              from += 3;
+            }
+          else if (strncmp (from, "quot;", 5) == 0)
+            {
+              *to = '"';
+              from += 4;
+            }
+          else if (strncmp (from, "apos;", 5) == 0)
+            {
+              *to = '\'';
+              from += 4;
+            }
+          else
+            {
+              return FALSE;
+            }
+        }
+    }
+
+  gimp_assert (to - string->str <= string->len);
+  if (to - string->str != string->len)
+    g_string_truncate (string, to - string->str);
+
+  return TRUE;
+}
+
+gchar *
+gimp_markup_extract_text (const gchar *markup)
+{
+  GString     *string;
+  const gchar *p;
+  gboolean     in_tag = FALSE;
+
+  if (! markup)
+    return NULL;
+
+  string = g_string_new (NULL);
+
+  for (p = markup; *p; p++)
+    {
+      if (in_tag)
+        {
+          if (*p == '>')
+            in_tag = FALSE;
+        }
+      else
+        {
+          if (*p == '<')
+            in_tag = TRUE;
+          else
+            g_string_append_c (string, *p);
+        }
+    }
+
+  unescape_gstring (string);
+
+  return g_string_free (string, FALSE);
+}
+
+/**
+ * gimp_enum_get_value_name:
+ * @enum_type: Enum type
+ * @value:     Enum value
+ *
+ * Returns the value name for a given value of a given enum
+ * type. Useful to have inline in GIMP_LOG() messages for example.
+ *
+ * Returns: The value name.
+ **/
+const gchar *
+gimp_enum_get_value_name (GType enum_type,
+                          gint  value)
+{
+  const gchar *value_name = NULL;
+
+  gimp_enum_get_value (enum_type,
+                       value,
+                       &value_name,
+                       NULL /*value_nick*/,
+                       NULL /*value_desc*/,
+                       NULL /*value_help*/);
+
+  return value_name;
+}
+
+gboolean
+gimp_get_fill_params (GimpContext   *context,
+                      GimpFillType   fill_type,
+                      GimpRGB       *color,
+                      GimpPattern  **pattern,
+                      GError       **error)
+
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (pattern != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  *pattern = NULL;
+
+  switch (fill_type)
+    {
+    case GIMP_FILL_FOREGROUND:
+      gimp_context_get_foreground (context, color);
+      break;
+
+    case GIMP_FILL_BACKGROUND:
+      gimp_context_get_background (context, color);
+      break;
+
+    case GIMP_FILL_WHITE:
+      gimp_rgba_set (color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+      break;
+
+    case GIMP_FILL_TRANSPARENT:
+      gimp_rgba_set (color, 0.0, 0.0, 0.0, GIMP_OPACITY_TRANSPARENT);
+      break;
+
+    case GIMP_FILL_PATTERN:
+      *pattern = gimp_context_get_pattern (context);
+
+      if (! *pattern)
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("No patterns available for this operation."));
+
+          /*  fall back to BG fill  */
+          gimp_context_get_background (context, color);
+
+          return FALSE;
+        }
+      break;
+
+    default:
+      g_warning ("%s: invalid fill_type %d", G_STRFUNC, fill_type);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/**
+ * gimp_constrain_line:
+ * @start_x:
+ * @start_y:
+ * @end_x:
+ * @end_y:
+ * @n_snap_lines: Number evenly disributed lines to snap to.
+ * @offset_angle: The angle by which to offset the lines, in degrees.
+ * @xres:         The horizontal resolution.
+ * @yres:         The vertical resolution.
+ *
+ * Projects a line onto the specified subset of evenly radially
+ * distributed lines. @n_lines of 2 makes the line snap horizontally
+ * or vertically. @n_lines of 4 snaps on 45 degree steps. @n_lines of
+ * 12 on 15 degree steps. etc.
+ **/
+void
+gimp_constrain_line (gdouble  start_x,
+                     gdouble  start_y,
+                     gdouble *end_x,
+                     gdouble *end_y,
+                     gint     n_snap_lines,
+                     gdouble  offset_angle,
+                     gdouble  xres,
+                     gdouble  yres)
+{
+  GimpVector2 diff;
+  GimpVector2 dir;
+  gdouble     angle;
+
+  offset_angle *= G_PI / 180.0;
+
+  diff.x = (*end_x - start_x) / xres;
+  diff.y = (*end_y - start_y) / yres;
+
+  angle = (atan2 (diff.y, diff.x) - offset_angle) * n_snap_lines / G_PI;
+  angle = RINT (angle) * G_PI / n_snap_lines + offset_angle;
+
+  dir.x = cos (angle);
+  dir.y = sin (angle);
+
+  gimp_vector2_mul (&dir, gimp_vector2_inner_product (&dir, &diff));
+
+  *end_x = start_x + dir.x * xres;
+  *end_y = start_y + dir.y * yres;
+}
+
+gint
+gimp_file_compare (GFile *file1,
+                   GFile *file2)
+{
+  if (g_file_equal (file1, file2))
+    {
+      return 0;
+    }
+  else
+    {
+      gchar *uri1   = g_file_get_uri (file1);
+      gchar *uri2   = g_file_get_uri (file2);
+      gint   result = strcmp (uri1, uri2);
+
+      g_free (uri1);
+      g_free (uri2);
+
+      return result;
+    }
+}
+
+static inline gboolean
+is_script (const gchar *filename)
+{
+#ifdef G_OS_WIN32
+  /* On Windows there is no concept like the Unix executable flag.
+   * There is a weak emulation provided by the MS C Runtime using file
+   * extensions (com, exe, cmd, bat). This needs to be extended to
+   * treat scripts (Python, Perl, ...) as executables, too. We use the
+   * PATHEXT variable, which is also used by cmd.exe.
+   */
+  static gchar **exts = NULL;
+
+  const gchar   *ext = strrchr (filename, '.');
+  const gchar   *pathext;
+  gint           i;
+
+  if (exts == NULL)
+    {
+      pathext = g_getenv ("PATHEXT");
+      if (pathext != NULL)
+        {
+          exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100);
+        }
+      else
+        {
+          exts = g_new (gchar *, 1);
+          exts[0] = NULL;
+        }
+    }
+
+  for (i = 0; exts[i]; i++)
+    {
+      if (g_ascii_strcasecmp (ext, exts[i]) == 0)
+        return TRUE;
+    }
+#endif /* G_OS_WIN32 */
+
+  return FALSE;
+}
+
+gboolean
+gimp_file_is_executable (GFile *file)
+{
+  GFileInfo *info;
+  gboolean   executable = FALSE;
+
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+
+  info = g_file_query_info (file,
+                            G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                            G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                            G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE ",",
+                            G_FILE_QUERY_INFO_NONE,
+                            NULL, NULL);
+
+  if (info)
+    {
+      GFileType    file_type = g_file_info_get_file_type (info);
+      const gchar *filename  = g_file_info_get_name (info);
+
+      if (file_type == G_FILE_TYPE_REGULAR &&
+          (g_file_info_get_attribute_boolean (info,
+                                              G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE) ||
+           is_script (filename)))
+        {
+          executable = TRUE;
+        }
+
+      g_object_unref (info);
+    }
+
+  return executable;
+}
+
+/**
+ * gimp_file_get_extension:
+ * @file: A #GFile
+ *
+ * Returns @file's extension (including the .), or NULL if there is no
+ * extension. Note that this function handles compressed files too,
+ * e.g. for "file.png.gz" it will return ".png.gz".
+ *
+ * Returns: The @file's extension. Free with g_free() when no longer needed.
+ **/
+gchar *
+gimp_file_get_extension (GFile *file)
+{
+  gchar *uri;
+  gint   uri_len;
+  gchar *ext = NULL;
+  gint   search_len;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  uri     = g_file_get_uri (file);
+  uri_len = strlen (uri);
+
+  if (g_str_has_suffix (uri, ".gz"))
+    search_len = uri_len - 3;
+  else if (g_str_has_suffix (uri, ".bz2"))
+    search_len = uri_len - 4;
+  else if (g_str_has_suffix (uri, ".xz"))
+    search_len = uri_len - 3;
+  else
+    search_len = uri_len;
+
+  ext = g_strrstr_len (uri, search_len, ".");
+
+  if (ext)
+    ext = g_strdup (ext);
+
+  g_free (uri);
+
+  return ext;
+}
+
+GFile *
+gimp_file_with_new_extension (GFile *file,
+                              GFile *ext_file)
+{
+  gchar *uri;
+  gchar *file_ext;
+  gint   file_ext_len = 0;
+  gchar *ext_file_ext = NULL;
+  gchar *uri_without_ext;
+  gchar *new_uri;
+  GFile *ret;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (ext_file == NULL || G_IS_FILE (ext_file), NULL);
+
+  uri      = g_file_get_uri (file);
+  file_ext = gimp_file_get_extension (file);
+
+  if (file_ext)
+    {
+      file_ext_len = strlen (file_ext);
+      g_free (file_ext);
+    }
+
+  if (ext_file)
+    ext_file_ext = gimp_file_get_extension (ext_file);
+
+  uri_without_ext = g_strndup (uri, strlen (uri) - file_ext_len);
+
+  g_free (uri);
+
+  new_uri = g_strconcat (uri_without_ext, ext_file_ext, NULL);
+
+  ret = g_file_new_for_uri (new_uri);
+
+  g_free (ext_file_ext);
+  g_free (uri_without_ext);
+  g_free (new_uri);
+
+  return ret;
+}
+
+gchar *
+gimp_data_input_stream_read_line_always (GDataInputStream  *stream,
+                                         gsize             *length,
+                                         GCancellable      *cancellable,
+                                         GError           **error)
+{
+  GError *temp_error = NULL;
+  gchar  *result;
+
+  g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (stream), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! error)
+    error = &temp_error;
+
+  result = g_data_input_stream_read_line (stream, length, cancellable, error);
+
+  if (! result && ! *error)
+    {
+      result = g_strdup ("");
+
+      if (length) *length = 0;
+    }
+
+  g_clear_error (&temp_error);
+
+  return result;
+}
+
+gboolean
+gimp_ascii_strtoi (const gchar  *nptr,
+                   gchar       **endptr,
+                   gint          base,
+                   gint         *result)
+{
+  gchar  *temp_endptr;
+  gint64  temp_result;
+
+  g_return_val_if_fail (nptr != NULL, FALSE);
+  g_return_val_if_fail (base == 0 || (base >= 2 && base <= 36), FALSE);
+
+  if (! endptr)
+    endptr = &temp_endptr;
+
+  temp_result = g_ascii_strtoll (nptr, endptr, base);
+
+  if (*endptr == nptr || errno == ERANGE ||
+      temp_result < G_MININT || temp_result > G_MAXINT)
+    {
+      errno = 0;
+
+      return FALSE;
+    }
+
+  if (result) *result = temp_result;
+
+  return TRUE;
+}
+
+gboolean
+gimp_ascii_strtod (const gchar  *nptr,
+                   gchar       **endptr,
+                   gdouble      *result)
+{
+  gchar   *temp_endptr;
+  gdouble  temp_result;
+
+  g_return_val_if_fail (nptr != NULL, FALSE);
+
+  if (! endptr)
+    endptr = &temp_endptr;
+
+  temp_result = g_ascii_strtod (nptr, endptr);
+
+  if (*endptr == nptr || errno == ERANGE)
+    {
+      errno = 0;
+
+      return FALSE;
+    }
+
+  if (result) *result = temp_result;
+
+  return TRUE;
+}
+
+gint
+gimp_g_list_compare (GList *list1,
+                     GList *list2)
+{
+  while (list1 && list2)
+    {
+      if (list1->data < list2->data)
+        return -1;
+      else if (list1->data > list2->data)
+        return +1;
+
+      list1 = g_list_next (list1);
+      list2 = g_list_next (list2);
+    }
+
+  if (! list1)
+    return -1;
+  else if (! list2)
+    return +1;
+
+  return 0;
+}
+
+typedef struct
+{
+  gint              ref_count;
+
+  GimpAsync        *async;
+  gint              idle_id;
+
+  GimpRunAsyncFunc  func;
+  gpointer          user_data;
+  GDestroyNotify    user_data_destroy_func;
+} GimpIdleRunAsyncData;
+
+static GimpIdleRunAsyncData *
+gimp_idle_run_async_data_new (void)
+{
+  GimpIdleRunAsyncData *data;
+
+  data = g_slice_new0 (GimpIdleRunAsyncData);
+
+  data->ref_count = 1;
+
+  return data;
+}
+
+static void
+gimp_idle_run_async_data_inc_ref (GimpIdleRunAsyncData *data)
+{
+  data->ref_count++;
+}
+
+static void
+gimp_idle_run_async_data_dec_ref (GimpIdleRunAsyncData *data)
+{
+  data->ref_count--;
+
+  if (data->ref_count == 0)
+    {
+      g_signal_handlers_disconnect_by_data (data->async, data);
+
+      if (! gimp_async_is_stopped (data->async))
+        gimp_async_abort (data->async);
+
+      g_object_unref (data->async);
+
+      if (data->user_data && data->user_data_destroy_func)
+        data->user_data_destroy_func (data->user_data);
+
+      g_slice_free (GimpIdleRunAsyncData, data);
+    }
+}
+
+static void
+gimp_idle_run_async_cancel (GimpAsync            *async,
+                            GimpIdleRunAsyncData *data)
+{
+  gimp_idle_run_async_data_inc_ref (data);
+
+  if (data->idle_id)
+    {
+      g_source_remove (data->idle_id);
+
+      data->idle_id = 0;
+    }
+
+  gimp_idle_run_async_data_dec_ref (data);
+}
+
+static void
+gimp_idle_run_async_waiting (GimpAsync            *async,
+                             GimpIdleRunAsyncData *data)
+{
+  gimp_idle_run_async_data_inc_ref (data);
+
+  if (data->idle_id)
+    {
+      g_source_remove (data->idle_id);
+
+      data->idle_id = 0;
+    }
+
+  g_signal_handlers_block_by_func (data->async,
+                                   gimp_idle_run_async_cancel,
+                                   data);
+
+  while (! gimp_async_is_stopped (data->async))
+    data->func (data->async, data->user_data);
+
+  g_signal_handlers_unblock_by_func (data->async,
+                                     gimp_idle_run_async_cancel,
+                                     data);
+
+  data->user_data = NULL;
+
+  gimp_idle_run_async_data_dec_ref (data);
+}
+
+static gboolean
+gimp_idle_run_async_idle (GimpIdleRunAsyncData *data)
+{
+  gimp_idle_run_async_data_inc_ref (data);
+
+  g_signal_handlers_block_by_func (data->async,
+                                   gimp_idle_run_async_cancel,
+                                   data);
+
+  data->func (data->async, data->user_data);
+
+  g_signal_handlers_unblock_by_func (data->async,
+                                     gimp_idle_run_async_cancel,
+                                     data);
+
+  if (gimp_async_is_stopped (data->async))
+    {
+      data->user_data = NULL;
+
+      gimp_idle_run_async_data_dec_ref (data);
+
+      return G_SOURCE_REMOVE;
+    }
+
+  gimp_idle_run_async_data_dec_ref (data);
+
+  return G_SOURCE_CONTINUE;
+}
+
+GimpAsync *
+gimp_idle_run_async (GimpRunAsyncFunc func,
+                     gpointer         user_data)
+{
+  return gimp_idle_run_async_full (G_PRIORITY_DEFAULT_IDLE, func,
+                                   user_data, NULL);
+}
+
+GimpAsync *
+gimp_idle_run_async_full (gint             priority,
+                          GimpRunAsyncFunc func,
+                          gpointer         user_data,
+                          GDestroyNotify   user_data_destroy_func)
+{
+  GimpIdleRunAsyncData *data;
+
+  g_return_val_if_fail (func != NULL, NULL);
+
+  data = gimp_idle_run_async_data_new ();
+
+  data->func                   = func;
+  data->user_data              = user_data;
+  data->user_data_destroy_func = user_data_destroy_func;
+
+  data->async = gimp_async_new ();
+
+  g_signal_connect (data->async, "cancel",
+                    G_CALLBACK (gimp_idle_run_async_cancel),
+                    data);
+  g_signal_connect (data->async, "waiting",
+                    G_CALLBACK (gimp_idle_run_async_waiting),
+                    data);
+
+  data->idle_id = g_idle_add_full (
+    priority,
+    (GSourceFunc) gimp_idle_run_async_idle,
+    data,
+    (GDestroyNotify) gimp_idle_run_async_data_dec_ref);
+
+  return g_object_ref (data->async);
+}
+
+
+/*  debug stuff  */
+
+#include "gegl/gimp-babl.h"
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayer-new.h"
+
+GimpImage *
+gimp_create_image_from_buffer (Gimp        *gimp,
+                               GeglBuffer  *buffer,
+                               const gchar *image_name)
+{
+  GimpImage  *image;
+  GimpLayer  *layer;
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  if (! image_name)
+    image_name = "Debug Image";
+
+  format = gegl_buffer_get_format (buffer);
+
+  image = gimp_create_image (gimp,
+                             gegl_buffer_get_width  (buffer),
+                             gegl_buffer_get_height (buffer),
+                             gimp_babl_format_get_base_type (format),
+                             gimp_babl_format_get_precision (format),
+                             FALSE);
+
+  layer = gimp_layer_new_from_gegl_buffer (buffer, image, format,
+                                           image_name,
+                                           GIMP_OPACITY_OPAQUE,
+                                           GIMP_LAYER_MODE_NORMAL,
+                                           NULL /* same image */);
+  gimp_image_add_layer (image, layer, NULL, -1, FALSE);
+
+  gimp_create_display (gimp, image, GIMP_UNIT_PIXEL, 1.0, NULL, 0);
+
+  /* unref the image unconditionally, even when no display was created */
+  g_object_add_weak_pointer (G_OBJECT (image), (gpointer) &image);
+  g_object_unref (image);
+
+  return image;
+}
diff --git a/app/core/gimp-utils.h b/app/core/gimp-utils.h
new file mode 100644
index 0000000..8373de7
--- /dev/null
+++ b/app/core/gimp-utils.h
@@ -0,0 +1,116 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_UTILS_H__
+#define __APP_GIMP_UTILS_H__
+
+
+#define GIMP_TIMER_START() \
+  { GTimer *_timer = g_timer_new ();
+
+#define GIMP_TIMER_END(message) \
+  g_printerr ("%s: %s took %0.4f seconds\n", \
+              G_STRFUNC, message, g_timer_elapsed (_timer, NULL)); \
+  g_timer_destroy (_timer); }
+
+
+#define MIN4(a,b,c,d) MIN (MIN ((a), (b)), MIN ((c), (d)))
+#define MAX4(a,b,c,d) MAX (MAX ((a), (b)), MAX ((c), (d)))
+
+
+gint         gimp_get_pid                          (void);
+guint64      gimp_get_physical_memory_size         (void);
+gchar      * gimp_get_default_language             (const gchar     *category);
+GimpUnit     gimp_get_default_unit                 (void);
+
+gchar     ** gimp_properties_append                (GType            object_type,
+                                                    gint            *n_properties,
+                                                    gchar          **names,
+                                                    GValue         **values,
+                                                    ...) G_GNUC_NULL_TERMINATED;
+gchar     ** gimp_properties_append_valist         (GType            object_type,
+                                                    gint            *n_properties,
+                                                    gchar          **names,
+                                                    GValue         **values,
+                                                    va_list          args);
+void         gimp_properties_free                  (gint             n_properties,
+                                                    gchar          **names,
+                                                    GValue          *values);
+
+gchar      * gimp_markup_extract_text              (const gchar     *markup);
+
+const gchar* gimp_enum_get_value_name              (GType            enum_type,
+                                                    gint             value);
+
+gboolean     gimp_get_fill_params                  (GimpContext      *context,
+                                                    GimpFillType      fill_type,
+                                                    GimpRGB          *color,
+                                                    GimpPattern     **pattern,
+                                                    GError          **error);
+
+/* Common values for the n_snap_lines parameter of
+ * gimp_constrain_line.
+ */
+#define GIMP_CONSTRAIN_LINE_90_DEGREES 2
+#define GIMP_CONSTRAIN_LINE_45_DEGREES 4
+#define GIMP_CONSTRAIN_LINE_15_DEGREES 12
+
+void         gimp_constrain_line                   (gdouble          start_x,
+                                                    gdouble          start_y,
+                                                    gdouble         *end_x,
+                                                    gdouble         *end_y,
+                                                    gint             n_snap_lines,
+                                                    gdouble          offset_angle,
+                                                    gdouble          xres,
+                                                    gdouble          yres);
+
+gint         gimp_file_compare                     (GFile           *file1,
+                                                    GFile           *file2);
+gboolean     gimp_file_is_executable               (GFile           *file);
+gchar      * gimp_file_get_extension               (GFile           *file);
+GFile      * gimp_file_with_new_extension          (GFile           *file,
+                                                    GFile           *ext_file);
+
+gchar      * gimp_data_input_stream_read_line_always (GDataInputStream  *stream,
+                                                      gsize             *length,
+                                                      GCancellable      *cancellable,
+                                                      GError           **error);
+
+gboolean     gimp_ascii_strtoi                     (const gchar     *nptr,
+                                                    gchar          **endptr,
+                                                    gint             base,
+                                                    gint            *result);
+gboolean     gimp_ascii_strtod                     (const gchar     *nptr,
+                                                    gchar          **endptr,
+                                                    gdouble         *result);
+
+gint         gimp_g_list_compare                   (GList           *list1,
+                                                    GList           *list2);
+
+GimpAsync  * gimp_idle_run_async                   (GimpRunAsyncFunc func,
+                                                    gpointer         user_data);
+GimpAsync  * gimp_idle_run_async_full              (gint             priority,
+                                                    GimpRunAsyncFunc func,
+                                                    gpointer         user_data,
+                                                    GDestroyNotify   user_data_destroy_func);
+
+GimpImage  * gimp_create_image_from_buffer         (Gimp            *gimp,
+                                                    GeglBuffer      *buffer,
+                                                    const gchar     *image_name);
+
+
+#endif /* __APP_GIMP_UTILS_H__ */
diff --git a/app/core/gimp.c b/app/core/gimp.c
new file mode 100644
index 0000000..ede44fe
--- /dev/null
+++ b/app/core/gimp.c
@@ -0,0 +1,1224 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h> /* strlen */
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimprc.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimp-pdb-compat.h"
+#include "pdb/internal-procs.h"
+
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginmanager-restore.h"
+
+#include "paint/gimp-paint.h"
+
+#include "xcf/xcf.h"
+#include "file-data/file-data.h"
+
+#include "gimp.h"
+#include "gimp-contexts.h"
+#include "gimp-data-factories.h"
+#include "gimp-filter-history.h"
+#include "gimp-memsize.h"
+#include "gimp-modules.h"
+#include "gimp-parasites.h"
+#include "gimp-templates.h"
+#include "gimp-units.h"
+#include "gimp-utils.h"
+#include "gimpbrush.h"
+#include "gimpbuffer.h"
+#include "gimpcontext.h"
+#include "gimpdynamics.h"
+#include "gimpdocumentlist.h"
+#include "gimpgradient.h"
+#include "gimpidtable.h"
+#include "gimpimage.h"
+#include "gimpimagefile.h"
+#include "gimplist.h"
+#include "gimpmarshal.h"
+#include "gimpmybrush.h"
+#include "gimppalette.h"
+#include "gimpparasitelist.h"
+#include "gimppattern.h"
+#include "gimptemplate.h"
+#include "gimptoolinfo.h"
+#include "gimptreeproxy.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  INITIALIZE,
+  RESTORE,
+  EXIT,
+  CLIPBOARD_CHANGED,
+  FILTER_HISTORY_CHANGED,
+  IMAGE_OPENED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_VERBOSE
+};
+
+
+static void      gimp_constructed          (GObject           *object);
+static void      gimp_set_property         (GObject           *object,
+                                            guint              property_id,
+                                            const GValue      *value,
+                                            GParamSpec        *pspec);
+static void      gimp_get_property         (GObject           *object,
+                                            guint              property_id,
+                                            GValue            *value,
+                                            GParamSpec        *pspec);
+static void      gimp_dispose              (GObject           *object);
+static void      gimp_finalize             (GObject           *object);
+
+static gint64    gimp_get_memsize          (GimpObject        *object,
+                                            gint64            *gui_size);
+
+static void      gimp_real_initialize      (Gimp              *gimp,
+                                            GimpInitStatusFunc status_callback);
+static void      gimp_real_restore         (Gimp              *gimp,
+                                            GimpInitStatusFunc status_callback);
+static gboolean  gimp_real_exit            (Gimp              *gimp,
+                                            gboolean           force);
+
+static void      gimp_global_config_notify (GObject           *global_config,
+                                            GParamSpec        *param_spec,
+                                            GObject           *edit_config);
+static void      gimp_edit_config_notify   (GObject           *edit_config,
+                                            GParamSpec        *param_spec,
+                                            GObject           *global_config);
+
+
+G_DEFINE_TYPE (Gimp, gimp, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_parent_class
+
+static guint gimp_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_class_init (GimpClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  gimp_signals[INITIALIZE] =
+    g_signal_new ("initialize",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpClass, initialize),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  gimp_signals[RESTORE] =
+    g_signal_new ("restore",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpClass, restore),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  gimp_signals[EXIT] =
+    g_signal_new ("exit",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpClass, exit),
+                  g_signal_accumulator_true_handled, NULL,
+                  gimp_marshal_BOOLEAN__BOOLEAN,
+                  G_TYPE_BOOLEAN, 1,
+                  G_TYPE_BOOLEAN);
+
+  gimp_signals[CLIPBOARD_CHANGED] =
+    g_signal_new ("clipboard-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpClass, clipboard_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_signals[FILTER_HISTORY_CHANGED] =
+    g_signal_new ("filter-history-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpClass,
+                                   filter_history_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_signals[IMAGE_OPENED] =
+    g_signal_new ("image-opened",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpClass, image_opened),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1, G_TYPE_FILE);
+
+  object_class->constructed      = gimp_constructed;
+  object_class->set_property     = gimp_set_property;
+  object_class->get_property     = gimp_get_property;
+  object_class->dispose          = gimp_dispose;
+  object_class->finalize         = gimp_finalize;
+
+  gimp_object_class->get_memsize = gimp_get_memsize;
+
+  klass->initialize              = gimp_real_initialize;
+  klass->restore                 = gimp_real_restore;
+  klass->exit                    = gimp_real_exit;
+  klass->clipboard_changed       = NULL;
+
+  g_object_class_install_property (object_class, PROP_VERBOSE,
+                                   g_param_spec_boolean ("verbose", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_init (Gimp *gimp)
+{
+  gimp->be_verbose       = FALSE;
+  gimp->no_data          = FALSE;
+  gimp->no_interface     = FALSE;
+  gimp->show_gui         = TRUE;
+  gimp->use_shm          = FALSE;
+  gimp->use_cpu_accel    = TRUE;
+  gimp->message_handler  = GIMP_CONSOLE;
+  gimp->show_playground  = FALSE;
+  gimp->stack_trace_mode = GIMP_STACK_TRACE_NEVER;
+  gimp->pdb_compat_mode  = GIMP_PDB_COMPAT_OFF;
+
+  gimp_gui_init (gimp);
+
+  gimp->parasites = gimp_parasite_list_new ();
+
+  gimp_units_init (gimp);
+
+  gimp->images = gimp_list_new_weak (GIMP_TYPE_IMAGE, FALSE);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->images), "images");
+
+  gimp->next_guide_ID        = 1;
+  gimp->next_sample_point_ID = 1;
+  gimp->image_table          = gimp_id_table_new ();
+  gimp->item_table           = gimp_id_table_new ();
+
+  gimp->displays = g_object_new (GIMP_TYPE_LIST,
+                                 "children-type", GIMP_TYPE_OBJECT,
+                                 "policy",        GIMP_CONTAINER_POLICY_WEAK,
+                                 "append",        TRUE,
+                                 NULL);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->displays), "displays");
+  gimp->next_display_ID = 1;
+
+  gimp->named_buffers = gimp_list_new (GIMP_TYPE_BUFFER, TRUE);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->named_buffers),
+                               "named buffers");
+
+  gimp_data_factories_init (gimp);
+
+  gimp->tool_info_list = g_object_new (GIMP_TYPE_LIST,
+                                       "children-type", GIMP_TYPE_TOOL_INFO,
+                                       "append",        TRUE,
+                                       NULL);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->tool_info_list),
+                               "tool infos");
+
+  gimp->tool_item_list = g_object_new (GIMP_TYPE_LIST,
+                                       "children-type", GIMP_TYPE_TOOL_ITEM,
+                                       "append",        TRUE,
+                                       NULL);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->tool_item_list),
+                               "tool items");
+
+  gimp->tool_item_ui_list = gimp_tree_proxy_new_for_container (
+    gimp->tool_item_list);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->tool_item_ui_list),
+                               "ui tool items");
+
+  gimp->documents = gimp_document_list_new (gimp);
+
+  gimp->templates = gimp_list_new (GIMP_TYPE_TEMPLATE, TRUE);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->templates), "templates");
+}
+
+static void
+gimp_constructed (GObject *object)
+{
+  Gimp *gimp = GIMP (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_modules_init (gimp);
+
+  gimp_paint_init (gimp);
+
+  gimp->plug_in_manager = gimp_plug_in_manager_new (gimp);
+  gimp->pdb             = gimp_pdb_new (gimp);
+
+  xcf_init (gimp);
+  file_data_init (gimp);
+
+  /*  create user and default context  */
+  gimp_contexts_init (gimp);
+}
+
+static void
+gimp_set_property (GObject           *object,
+                   guint              property_id,
+                   const GValue      *value,
+                   GParamSpec        *pspec)
+{
+  Gimp *gimp = GIMP (object);
+
+  switch (property_id)
+    {
+    case PROP_VERBOSE:
+      gimp->be_verbose = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_get_property (GObject    *object,
+                   guint       property_id,
+                   GValue     *value,
+                   GParamSpec *pspec)
+{
+  Gimp *gimp = GIMP (object);
+
+  switch (property_id)
+    {
+    case PROP_VERBOSE:
+      g_value_set_boolean (value, gimp->be_verbose);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dispose (GObject *object)
+{
+  Gimp *gimp = GIMP (object);
+
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  gimp_data_factories_clear (gimp);
+
+  gimp_filter_history_clear (gimp);
+
+  g_clear_object (&gimp->edit_config);
+  g_clear_object (&gimp->config);
+
+  gimp_contexts_exit (gimp);
+
+  g_clear_object (&gimp->image_new_last_template);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_finalize (GObject *object)
+{
+  Gimp  *gimp      = GIMP (object);
+  GList *standards = NULL;
+
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  standards = g_list_prepend (standards,
+                              gimp_brush_get_standard (gimp->user_context));
+  standards = g_list_prepend (standards,
+                              gimp_dynamics_get_standard (gimp->user_context));
+  standards = g_list_prepend (standards,
+                              gimp_mybrush_get_standard (gimp->user_context));
+  standards = g_list_prepend (standards,
+                              gimp_pattern_get_standard (gimp->user_context));
+  standards = g_list_prepend (standards,
+                              gimp_gradient_get_standard (gimp->user_context));
+  standards = g_list_prepend (standards,
+                              gimp_palette_get_standard (gimp->user_context));
+
+  g_clear_object (&gimp->templates);
+  g_clear_object (&gimp->documents);
+
+  gimp_tool_info_set_standard (gimp, NULL);
+
+  g_clear_object (&gimp->tool_item_list);
+  g_clear_object (&gimp->tool_item_ui_list);
+
+  if (gimp->tool_info_list)
+    {
+      gimp_container_foreach (gimp->tool_info_list,
+                              (GFunc) g_object_run_dispose, NULL);
+      g_clear_object (&gimp->tool_info_list);
+    }
+
+  file_data_exit (gimp);
+  xcf_exit (gimp);
+
+  g_clear_object (&gimp->pdb);
+
+  gimp_data_factories_exit (gimp);
+
+  g_clear_object (&gimp->named_buffers);
+  g_clear_object (&gimp->clipboard_buffer);
+  g_clear_object (&gimp->clipboard_image);
+  g_clear_object (&gimp->displays);
+  g_clear_object (&gimp->item_table);
+  g_clear_object (&gimp->image_table);
+  g_clear_object (&gimp->images);
+  g_clear_object (&gimp->plug_in_manager);
+
+  if (gimp->module_db)
+    gimp_modules_exit (gimp);
+
+  gimp_paint_exit (gimp);
+
+  g_clear_object (&gimp->parasites);
+  g_clear_object (&gimp->default_folder);
+
+  g_clear_pointer (&gimp->session_name, g_free);
+
+  if (gimp->context_list)
+    {
+      GList *list;
+
+      g_warning ("%s: list of contexts not empty upon exit (%d contexts left)\n",
+                 G_STRFUNC, g_list_length (gimp->context_list));
+
+      for (list = gimp->context_list; list; list = g_list_next (list))
+        g_printerr ("stale context: %s\n", gimp_object_get_name (list->data));
+
+      g_list_free (gimp->context_list);
+      gimp->context_list = NULL;
+    }
+
+  g_list_foreach (standards, (GFunc) g_object_unref, NULL);
+  g_list_free (standards);
+
+  gimp_units_exit (gimp);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_get_memsize (GimpObject *object,
+                  gint64     *gui_size)
+{
+  Gimp   *gimp    = GIMP (object);
+  gint64  memsize = 0;
+
+  memsize += gimp_g_list_get_memsize (gimp->user_units, 0 /* FIXME */);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->parasites),
+                                      gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->paint_info_list),
+                                      gui_size);
+
+  memsize += gimp_g_object_get_memsize (G_OBJECT (gimp->module_db));
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->plug_in_manager),
+                                      gui_size);
+
+  memsize += gimp_g_list_get_memsize_foreach (gimp->filter_history,
+                                              (GimpMemsizeFunc)
+                                              gimp_object_get_memsize,
+                                              gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->image_table), 0);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->item_table),  0);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->displays), gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->clipboard_image),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->clipboard_buffer),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->named_buffers),
+                                      gui_size);
+
+  memsize += gimp_data_factories_get_memsize (gimp, gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->pdb), gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->tool_info_list),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->standard_tool_info),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->documents),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->templates),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->image_new_last_template),
+                                      gui_size);
+
+  memsize += gimp_g_list_get_memsize (gimp->context_list, 0);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->default_context),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->user_context),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_real_initialize (Gimp               *gimp,
+                      GimpInitStatusFunc  status_callback)
+{
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  status_callback (_("Initialization"), NULL, 0.0);
+
+  /*  set the last values used to default values  */
+  gimp->image_new_last_template =
+    gimp_config_duplicate (GIMP_CONFIG (gimp->config->default_image));
+
+  /*  add data objects that need the user context  */
+  gimp_data_factories_add_builtin (gimp);
+
+  /*  register all internal procedures  */
+  status_callback (NULL, _("Internal Procedures"), 0.2);
+  internal_procs_init (gimp->pdb);
+  gimp_pdb_compat_procs_register (gimp->pdb, gimp->pdb_compat_mode);
+
+  gimp_plug_in_manager_initialize (gimp->plug_in_manager, status_callback);
+
+  status_callback (NULL, "", 1.0);
+}
+
+static void
+gimp_real_restore (Gimp               *gimp,
+                   GimpInitStatusFunc  status_callback)
+{
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  gimp_plug_in_manager_restore (gimp->plug_in_manager,
+                                gimp_get_user_context (gimp), status_callback);
+
+  /*  initialize babl fishes  */
+  status_callback (_("Initialization"), "Babl Fishes", 0.0);
+  gimp_babl_init_fishes (status_callback);
+
+  gimp->restored = TRUE;
+}
+
+static gboolean
+gimp_real_exit (Gimp     *gimp,
+                gboolean  force)
+{
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  gimp_plug_in_manager_exit (gimp->plug_in_manager);
+  gimp_modules_unload (gimp);
+
+  gimp_data_factories_save (gimp);
+
+  gimp_templates_save (gimp);
+  gimp_parasiterc_save (gimp);
+  gimp_unitrc_save (gimp);
+
+  return FALSE; /* continue exiting */
+}
+
+Gimp *
+gimp_new (const gchar       *name,
+          const gchar       *session_name,
+          GFile             *default_folder,
+          gboolean           be_verbose,
+          gboolean           no_data,
+          gboolean           no_fonts,
+          gboolean           no_interface,
+          gboolean           use_shm,
+          gboolean           use_cpu_accel,
+          gboolean           console_messages,
+          gboolean           show_playground,
+          gboolean           show_debug_menu,
+          GimpStackTraceMode stack_trace_mode,
+          GimpPDBCompatMode  pdb_compat_mode)
+{
+  Gimp *gimp;
+
+  g_return_val_if_fail (name != NULL, NULL);
+
+  gimp = g_object_new (GIMP_TYPE_GIMP,
+                       "name",    name,
+                       "verbose", be_verbose ? TRUE : FALSE,
+                       NULL);
+
+  if (default_folder)
+    gimp->default_folder = g_object_ref (default_folder);
+
+  gimp->session_name     = g_strdup (session_name);
+  gimp->no_data          = no_data          ? TRUE : FALSE;
+  gimp->no_fonts         = no_fonts         ? TRUE : FALSE;
+  gimp->no_interface     = no_interface     ? TRUE : FALSE;
+  gimp->use_shm          = use_shm          ? TRUE : FALSE;
+  gimp->use_cpu_accel    = use_cpu_accel    ? TRUE : FALSE;
+  gimp->console_messages = console_messages ? TRUE : FALSE;
+  gimp->show_playground  = show_playground  ? TRUE : FALSE;
+  gimp->show_debug_menu  = show_debug_menu  ? TRUE : FALSE;
+  gimp->stack_trace_mode = stack_trace_mode;
+  gimp->pdb_compat_mode  = pdb_compat_mode;
+
+  return gimp;
+}
+
+/**
+ * gimp_set_show_gui:
+ * @gimp:
+ * @show:
+ *
+ * Test cases that tests the UI typically don't want any windows to be
+ * presented during the test run. Allow them to set this.
+ **/
+void
+gimp_set_show_gui (Gimp     *gimp,
+                   gboolean  show_gui)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp->show_gui = show_gui;
+}
+
+/**
+ * gimp_get_show_gui:
+ * @gimp:
+ *
+ * Returns: %TRUE if the GUI should be shown, %FALSE otherwise.
+ **/
+gboolean
+gimp_get_show_gui (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  return gimp->show_gui;
+}
+
+static void
+gimp_global_config_notify (GObject    *global_config,
+                           GParamSpec *param_spec,
+                           GObject    *edit_config)
+{
+  GValue global_value = G_VALUE_INIT;
+  GValue edit_value   = G_VALUE_INIT;
+
+  g_value_init (&global_value, param_spec->value_type);
+  g_value_init (&edit_value,   param_spec->value_type);
+
+  g_object_get_property (global_config, param_spec->name, &global_value);
+  g_object_get_property (edit_config,   param_spec->name, &edit_value);
+
+  if (g_param_values_cmp (param_spec, &global_value, &edit_value))
+    {
+      g_signal_handlers_block_by_func (edit_config,
+                                       gimp_edit_config_notify,
+                                       global_config);
+
+      g_object_set_property (edit_config, param_spec->name, &global_value);
+
+      g_signal_handlers_unblock_by_func (edit_config,
+                                         gimp_edit_config_notify,
+                                         global_config);
+    }
+
+  g_value_unset (&global_value);
+  g_value_unset (&edit_value);
+}
+
+static void
+gimp_edit_config_notify (GObject    *edit_config,
+                         GParamSpec *param_spec,
+                         GObject    *global_config)
+{
+  GValue edit_value   = G_VALUE_INIT;
+  GValue global_value = G_VALUE_INIT;
+
+  g_value_init (&edit_value,   param_spec->value_type);
+  g_value_init (&global_value, param_spec->value_type);
+
+  g_object_get_property (edit_config,   param_spec->name, &edit_value);
+  g_object_get_property (global_config, param_spec->name, &global_value);
+
+  if (g_param_values_cmp (param_spec, &edit_value, &global_value))
+    {
+      if (param_spec->flags & GIMP_CONFIG_PARAM_RESTART)
+        {
+#ifdef GIMP_CONFIG_DEBUG
+          g_print ("NOT Applying edit_config change of '%s' to global_config "
+                   "because it needs restart\n",
+                   param_spec->name);
+#endif
+        }
+      else
+        {
+#ifdef GIMP_CONFIG_DEBUG
+          g_print ("Applying edit_config change of '%s' to global_config\n",
+                   param_spec->name);
+#endif
+          g_signal_handlers_block_by_func (global_config,
+                                           gimp_global_config_notify,
+                                           edit_config);
+
+          g_object_set_property (global_config, param_spec->name, &edit_value);
+
+          g_signal_handlers_unblock_by_func (global_config,
+                                             gimp_global_config_notify,
+                                             edit_config);
+        }
+    }
+
+  g_value_unset (&edit_value);
+  g_value_unset (&global_value);
+}
+
+void
+gimp_load_config (Gimp  *gimp,
+                  GFile *alternate_system_gimprc,
+                  GFile *alternate_gimprc)
+{
+  GimpRc *gimprc;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (alternate_system_gimprc == NULL ||
+                    G_IS_FILE (alternate_system_gimprc));
+  g_return_if_fail (alternate_gimprc == NULL ||
+                    G_IS_FILE (alternate_gimprc));
+  g_return_if_fail (gimp->config == NULL);
+  g_return_if_fail (gimp->edit_config == NULL);
+
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  /*  this needs to be done before gimprc loading because gimprc can
+   *  use user defined units
+   */
+  gimp_unitrc_load (gimp);
+
+  gimprc = gimp_rc_new (G_OBJECT (gimp),
+                        alternate_system_gimprc,
+                        alternate_gimprc,
+                        gimp->be_verbose);
+
+  gimp->config = GIMP_CORE_CONFIG (gimprc);
+
+  gimp->edit_config = gimp_config_duplicate (GIMP_CONFIG (gimp->config));
+
+  g_signal_connect_object (gimp->config, "notify",
+                           G_CALLBACK (gimp_global_config_notify),
+                           gimp->edit_config, 0);
+  g_signal_connect_object (gimp->edit_config, "notify",
+                           G_CALLBACK (gimp_edit_config_notify),
+                           gimp->config, 0);
+
+  if (! gimp->show_playground)
+    {
+      gboolean    use_opencl;
+      gboolean    use_npd_tool;
+      gboolean    use_seamless_clone_tool;
+
+      /* Playground preferences is shown by default for unstable
+       * versions and if the associated CLI option was set. Additionally
+       * we want to show it if any of the playground options had been
+       * enabled. Otherwise you might end up getting blocked with a
+       * playground feature and forget where you can even disable it.
+       *
+       * Also we check this once at start when loading config, and not
+       * inside preferences-dialog.c because we don't want to end up
+       * with inconsistent behavior where you open once the Preferences,
+       * deactivate features, then back to preferences and the tab is
+       * gone.
+       */
+
+      g_object_get (gimp->edit_config,
+                    "use-opencl",                     &use_opencl,
+                    "playground-npd-tool",            &use_npd_tool,
+                    "playground-seamless-clone-tool", &use_seamless_clone_tool,
+                    NULL);
+      if (use_opencl || use_npd_tool || use_seamless_clone_tool)
+        gimp->show_playground = TRUE;
+    }
+}
+
+void
+gimp_initialize (Gimp               *gimp,
+                 GimpInitStatusFunc  status_callback)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (status_callback != NULL);
+  g_return_if_fail (GIMP_IS_CORE_CONFIG (gimp->config));
+
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  g_signal_emit (gimp, gimp_signals[INITIALIZE], 0, status_callback);
+}
+
+/**
+ * gimp_restore:
+ * @gimp: a #Gimp object
+ * @error: a #GError for uncessful loading.
+ *
+ * This function always succeeds. If present, @error may be filled for
+ * possible feedback on data which failed to load. It doesn't imply any
+ * fatale error.
+ **/
+void
+gimp_restore (Gimp                *gimp,
+              GimpInitStatusFunc   status_callback,
+              GError             **error)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (status_callback != NULL);
+
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  /*  initialize  the global parasite table  */
+  status_callback (_("Looking for data files"), _("Parasites"), 0.0);
+  gimp_parasiterc_load (gimp);
+
+  /*  initialize the lists of gimp brushes, dynamics, patterns etc.  */
+  gimp_data_factories_load (gimp, status_callback);
+
+  /*  initialize the template list  */
+  status_callback (NULL, _("Templates"), 0.8);
+  gimp_templates_load (gimp);
+
+  /*  initialize the module list  */
+  status_callback (NULL, _("Modules"), 0.9);
+  gimp_modules_load (gimp);
+
+  g_signal_emit (gimp, gimp_signals[RESTORE], 0, status_callback);
+
+  /* when done, make sure everything is clean, to clean out dirty
+   * states from data objects which reference each other and got
+   * dirtied by loading the referenced object
+   */
+  gimp_data_factories_data_clean (gimp);
+}
+
+/**
+ * gimp_is_restored:
+ * @gimp: a #Gimp object
+ *
+ * Return value: %TRUE if GIMP is completely started, %FALSE otherwise.
+ **/
+gboolean
+gimp_is_restored (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  return gimp->restored;
+}
+
+/**
+ * gimp_exit:
+ * @gimp: a #Gimp object
+ * @force: whether to force the application to quit
+ *
+ * Exit this GIMP session. Unless @force is %TRUE, the user is queried
+ * whether unsaved images should be saved and can cancel the operation.
+ **/
+void
+gimp_exit (Gimp     *gimp,
+           gboolean  force)
+{
+  gboolean  handled;
+  GList    *image_iter;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  g_signal_emit (gimp, gimp_signals[EXIT], 0,
+                 force ? TRUE : FALSE,
+                 &handled);
+
+  if (handled)
+    return;
+
+  /* Get rid of images without display. We do this *after* handling the
+   * usual exit callbacks, because the things that are torn down there
+   * might have references to these images (for instance GimpActions
+   * in the UI manager).
+   */
+  while ((image_iter = gimp_get_image_iter (gimp)))
+    {
+      GimpImage *image = image_iter->data;
+
+      g_object_unref (image);
+    }
+}
+
+GList *
+gimp_get_image_iter (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return GIMP_LIST (gimp->images)->queue->head;
+}
+
+GList *
+gimp_get_display_iter (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return GIMP_LIST (gimp->displays)->queue->head;
+}
+
+GList *
+gimp_get_image_windows (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_list_copy (gimp->image_windows);
+}
+
+GList *
+gimp_get_paint_info_iter (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return GIMP_LIST (gimp->paint_info_list)->queue->head;
+}
+
+GList *
+gimp_get_tool_info_iter (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return GIMP_LIST (gimp->tool_info_list)->queue->head;
+}
+
+GList *
+gimp_get_tool_item_iter (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return GIMP_LIST (gimp->tool_item_list)->queue->head;
+}
+
+GList *
+gimp_get_tool_item_ui_iter (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return GIMP_LIST (gimp->tool_item_ui_list)->queue->head;
+}
+
+GimpObject *
+gimp_get_clipboard_object (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->clipboard_image)
+    return GIMP_OBJECT (gimp->clipboard_image);
+
+  return GIMP_OBJECT (gimp->clipboard_buffer);
+}
+
+void
+gimp_set_clipboard_image (Gimp      *gimp,
+                          GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  g_clear_object (&gimp->clipboard_buffer);
+  g_set_object (&gimp->clipboard_image, image);
+
+  /* we want the signal emission */
+  g_signal_emit (gimp, gimp_signals[CLIPBOARD_CHANGED], 0);
+}
+
+GimpImage *
+gimp_get_clipboard_image (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp->clipboard_image;
+}
+
+void
+gimp_set_clipboard_buffer (Gimp       *gimp,
+                           GimpBuffer *buffer)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (buffer == NULL || GIMP_IS_BUFFER (buffer));
+
+  g_clear_object (&gimp->clipboard_image);
+  g_set_object (&gimp->clipboard_buffer, buffer);
+
+  /* we want the signal emission */
+  g_signal_emit (gimp, gimp_signals[CLIPBOARD_CHANGED], 0);
+}
+
+GimpBuffer *
+gimp_get_clipboard_buffer (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp->clipboard_buffer;
+}
+
+GimpImage *
+gimp_create_image (Gimp              *gimp,
+                   gint               width,
+                   gint               height,
+                   GimpImageBaseType  type,
+                   GimpPrecision      precision,
+                   gboolean           attach_comment)
+{
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  image = gimp_image_new (gimp, width, height, type, precision);
+
+  if (attach_comment)
+    {
+      const gchar *comment;
+
+      comment = gimp_template_get_comment (gimp->config->default_image);
+
+      if (comment)
+        {
+          GimpParasite *parasite = gimp_parasite_new ("gimp-comment",
+                                                      GIMP_PARASITE_PERSISTENT,
+                                                      strlen (comment) + 1,
+                                                      comment);
+          gimp_image_parasite_attach (image, parasite, FALSE);
+          gimp_parasite_free (parasite);
+        }
+    }
+
+  return image;
+}
+
+void
+gimp_set_default_context (Gimp        *gimp,
+                          GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  g_set_object (&gimp->default_context, context);
+}
+
+GimpContext *
+gimp_get_default_context (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp->default_context;
+}
+
+void
+gimp_set_user_context (Gimp        *gimp,
+                       GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  g_set_object (&gimp->user_context, context);
+}
+
+GimpContext *
+gimp_get_user_context (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp->user_context;
+}
+
+GimpToolInfo *
+gimp_get_tool_info (Gimp        *gimp,
+                    const gchar *tool_id)
+{
+  gpointer info;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (tool_id != NULL, NULL);
+
+  info = gimp_container_get_child_by_name (gimp->tool_info_list, tool_id);
+
+  return (GimpToolInfo *) info;
+}
+
+/**
+ * gimp_message:
+ * @gimp:     a pointer to the %Gimp object
+ * @handler:  either a %GimpProgress or a %GtkWidget pointer
+ * @severity: severity of the message
+ * @format:   printf-like format string
+ * @...:      arguments to use with @format
+ *
+ * Present a message to the user. How exactly the message is displayed
+ * depends on the @severity, the @handler object and user preferences.
+ **/
+void
+gimp_message (Gimp                *gimp,
+              GObject             *handler,
+              GimpMessageSeverity  severity,
+              const gchar         *format,
+              ...)
+{
+  va_list args;
+
+  va_start (args, format);
+
+  gimp_message_valist (gimp, handler, severity, format, args);
+
+  va_end (args);
+}
+
+/**
+ * gimp_message_valist:
+ * @gimp:     a pointer to the %Gimp object
+ * @handler:  either a %GimpProgress or a %GtkWidget pointer
+ * @severity: severity of the message
+ * @format:   printf-like format string
+ * @args:     arguments to use with @format
+ *
+ * See documentation for gimp_message().
+ **/
+void
+gimp_message_valist (Gimp                *gimp,
+                     GObject             *handler,
+                     GimpMessageSeverity  severity,
+                     const gchar         *format,
+                     va_list              args)
+{
+  gchar *message;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (handler == NULL || G_IS_OBJECT (handler));
+  g_return_if_fail (format != NULL);
+
+  message = g_strdup_vprintf (format, args);
+
+  gimp_show_message (gimp, handler, severity, NULL, message);
+
+  g_free (message);
+}
+
+void
+gimp_message_literal (Gimp                *gimp,
+                      GObject             *handler,
+                      GimpMessageSeverity  severity,
+                      const gchar         *message)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (handler == NULL || G_IS_OBJECT (handler));
+  g_return_if_fail (message != NULL);
+
+  gimp_show_message (gimp, handler, severity, NULL, message);
+}
+
+void
+gimp_filter_history_changed (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_signal_emit (gimp, gimp_signals[FILTER_HISTORY_CHANGED], 0);
+}
+
+void
+gimp_image_opened (Gimp  *gimp,
+                   GFile *file)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (G_IS_FILE (file));
+
+  g_signal_emit (gimp, gimp_signals[IMAGE_OPENED], 0, file);
+}
+
+GFile *
+gimp_get_temp_file (Gimp        *gimp,
+                    const gchar *extension)
+{
+  static gint  id = 0;
+  static gint  pid;
+  gchar       *basename;
+  GFile       *dir;
+  GFile       *file;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (id == 0)
+    pid = gimp_get_pid ();
+
+  if (extension)
+    basename = g_strdup_printf ("gimp-temp-%d%d.%s", pid, id++, extension);
+  else
+    basename = g_strdup_printf ("gimp-temp-%d%d", pid, id++);
+
+  dir = gimp_file_new_for_config_path (GIMP_GEGL_CONFIG (gimp->config)->temp_path,
+                                       NULL);
+  if (! g_file_query_exists (dir, NULL))
+    {
+      /* Try to make the temp directory if it doesn't exist.
+       * Ignore any error.
+       */
+      g_file_make_directory_with_parents (dir, NULL, NULL);
+    }
+  file = g_file_get_child (dir, basename);
+  g_free (basename);
+  g_object_unref (dir);
+
+  return file;
+}
diff --git a/app/core/gimp.h b/app/core/gimp.h
new file mode 100644
index 0000000..d4b1e39
--- /dev/null
+++ b/app/core/gimp.h
@@ -0,0 +1,248 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_H__
+#define __GIMP_H__
+
+
+#include "gimpobject.h"
+#include "gimp-gui.h"
+
+
+#define GIMP_TYPE_GIMP            (gimp_get_type ())
+#define GIMP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GIMP, Gimp))
+#define GIMP_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GIMP, GimpClass))
+#define GIMP_IS_GIMP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GIMP))
+#define GIMP_IS_GIMP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GIMP))
+
+
+typedef struct _GimpClass GimpClass;
+
+struct _Gimp
+{
+  GimpObject              parent_instance;
+
+  GimpCoreConfig         *config;
+  GimpCoreConfig         *edit_config; /* don't use this one, it's just
+                                        * for the preferences dialog
+                                        */
+  gchar                  *session_name;
+  GFile                  *default_folder;
+
+  gboolean                be_verbose;
+  gboolean                no_data;
+  gboolean                no_fonts;
+  gboolean                no_interface;
+  gboolean                show_gui;
+  gboolean                use_shm;
+  gboolean                use_cpu_accel;
+  GimpMessageHandlerType  message_handler;
+  gboolean                console_messages;
+  gboolean                show_playground;
+  gboolean                show_debug_menu;
+  GimpStackTraceMode      stack_trace_mode;
+  GimpPDBCompatMode       pdb_compat_mode;
+
+  GimpGui                 gui;         /* gui vtable */
+
+  gboolean                restored;    /* becomes TRUE in gimp_restore() */
+  gboolean                initialized; /* Fully initialized (only set once at start). */
+
+  gint                    busy;
+  guint                   busy_idle_id;
+
+  GList                  *user_units;
+  gint                    n_user_units;
+
+  GimpParasiteList       *parasites;
+
+  GimpContainer          *paint_info_list;
+  GimpPaintInfo          *standard_paint_info;
+
+  GimpModuleDB           *module_db;
+  gboolean                write_modulerc;
+
+  GimpPlugInManager      *plug_in_manager;
+
+  GList                  *filter_history;
+
+  GimpContainer          *images;
+  guint32                 next_guide_ID;
+  guint32                 next_sample_point_ID;
+  GimpIdTable            *image_table;
+  GimpIdTable            *item_table;
+
+  GimpContainer          *displays;
+  gint                    next_display_ID;
+
+  GList                  *image_windows;
+
+  GimpImage              *clipboard_image;
+  GimpBuffer             *clipboard_buffer;
+  GimpContainer          *named_buffers;
+
+  GimpDataFactory        *brush_factory;
+  GimpDataFactory        *dynamics_factory;
+  GimpDataFactory        *mybrush_factory;
+  GimpDataFactory        *pattern_factory;
+  GimpDataFactory        *gradient_factory;
+  GimpDataFactory        *palette_factory;
+  GimpDataFactory        *font_factory;
+  GimpDataFactory        *tool_preset_factory;
+
+  GimpTagCache           *tag_cache;
+
+  GimpPDB                *pdb;
+
+  GimpContainer          *tool_info_list;
+  GimpToolInfo           *standard_tool_info;
+
+  GimpContainer          *tool_item_list;
+  GimpContainer          *tool_item_ui_list;
+
+  /*  the opened and saved images in MRU order  */
+  GimpContainer          *documents;
+
+  /*  image_new values  */
+  GimpContainer          *templates;
+  GimpTemplate           *image_new_last_template;
+
+  /*  the list of all contexts  */
+  GList                  *context_list;
+
+  /*  the default context which is initialized from gimprc  */
+  GimpContext            *default_context;
+
+  /*  the context used by the interface  */
+  GimpContext            *user_context;
+};
+
+struct _GimpClass
+{
+  GimpObjectClass  parent_class;
+
+  void     (* initialize)             (Gimp               *gimp,
+                                       GimpInitStatusFunc  status_callback);
+  void     (* restore)                (Gimp               *gimp,
+                                       GimpInitStatusFunc  status_callback);
+  gboolean (* exit)                   (Gimp               *gimp,
+                                       gboolean            force);
+
+  void     (* clipboard_changed)      (Gimp               *gimp);
+
+  void     (* filter_history_changed) (Gimp               *gimp);
+
+  /*  emitted if an image is loaded and opened with a display  */
+  void     (* image_opened)           (Gimp               *gimp,
+                                       GFile              *file);
+};
+
+
+GType          gimp_get_type               (void) G_GNUC_CONST;
+
+Gimp         * gimp_new                    (const gchar         *name,
+                                            const gchar         *session_name,
+                                            GFile               *default_folder,
+                                            gboolean             be_verbose,
+                                            gboolean             no_data,
+                                            gboolean             no_fonts,
+                                            gboolean             no_interface,
+                                            gboolean             use_shm,
+                                            gboolean             use_cpu_accel,
+                                            gboolean             console_messages,
+                                            gboolean             show_playground,
+                                            gboolean             show_debug_menu,
+                                            GimpStackTraceMode   stack_trace_mode,
+                                            GimpPDBCompatMode    pdb_compat_mode);
+void           gimp_set_show_gui           (Gimp                *gimp,
+                                            gboolean             show_gui);
+gboolean       gimp_get_show_gui           (Gimp                *gimp);
+
+void           gimp_load_config            (Gimp                *gimp,
+                                            GFile               *alternate_system_gimprc,
+                                            GFile               *alternate_gimprc);
+void           gimp_initialize             (Gimp                *gimp,
+                                            GimpInitStatusFunc   status_callback);
+void           gimp_restore                (Gimp                *gimp,
+                                            GimpInitStatusFunc   status_callback,
+                                            GError             **error);
+gboolean       gimp_is_restored            (Gimp                *gimp);
+
+void           gimp_exit                   (Gimp                *gimp,
+                                            gboolean             force);
+
+GList        * gimp_get_image_iter         (Gimp                *gimp);
+GList        * gimp_get_display_iter       (Gimp                *gimp);
+GList        * gimp_get_image_windows      (Gimp                *gimp);
+GList        * gimp_get_paint_info_iter    (Gimp                *gimp);
+GList        * gimp_get_tool_info_iter     (Gimp                *gimp);
+GList        * gimp_get_tool_item_iter     (Gimp                *gimp);
+GList        * gimp_get_tool_item_ui_iter  (Gimp                *gimp);
+
+GimpObject   * gimp_get_clipboard_object   (Gimp                *gimp);
+
+void           gimp_set_clipboard_image    (Gimp                *gimp,
+                                            GimpImage           *image);
+GimpImage    * gimp_get_clipboard_image    (Gimp                *gimp);
+
+void           gimp_set_clipboard_buffer   (Gimp                *gimp,
+                                            GimpBuffer          *buffer);
+GimpBuffer   * gimp_get_clipboard_buffer   (Gimp                *gimp);
+
+GimpImage    * gimp_create_image           (Gimp                *gimp,
+                                            gint                 width,
+                                            gint                 height,
+                                            GimpImageBaseType    type,
+                                            GimpPrecision        precision,
+                                            gboolean             attach_comment);
+
+void           gimp_set_default_context    (Gimp                *gimp,
+                                            GimpContext         *context);
+GimpContext  * gimp_get_default_context    (Gimp                *gimp);
+
+void           gimp_set_user_context       (Gimp                *gimp,
+                                            GimpContext         *context);
+GimpContext  * gimp_get_user_context       (Gimp                *gimp);
+
+GimpToolInfo * gimp_get_tool_info          (Gimp                *gimp,
+                                            const gchar         *tool_name);
+
+void           gimp_message                (Gimp                *gimp,
+                                            GObject             *handler,
+                                            GimpMessageSeverity  severity,
+                                            const gchar         *format,
+                                            ...) G_GNUC_PRINTF (4, 5);
+void           gimp_message_valist         (Gimp                *gimp,
+                                            GObject             *handler,
+                                            GimpMessageSeverity  severity,
+                                            const gchar         *format,
+                                            va_list              args) G_GNUC_PRINTF (4, 0);
+void           gimp_message_literal        (Gimp                *gimp,
+                                            GObject             *handler,
+                                            GimpMessageSeverity  severity,
+                                            const gchar         *message);
+
+void           gimp_filter_history_changed (Gimp                *gimp);
+
+void           gimp_image_opened           (Gimp                *gimp,
+                                            GFile               *file);
+
+GFile        * gimp_get_temp_file          (Gimp                *gimp,
+                                            const gchar         *extension);
+
+
+#endif  /* __GIMP_H__ */
diff --git a/app/core/gimpasync.c b/app/core/gimpasync.c
new file mode 100644
index 0000000..322d57d
--- /dev/null
+++ b/app/core/gimpasync.c
@@ -0,0 +1,752 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpasync.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpasync.h"
+#include "gimpcancelable.h"
+#include "gimpmarshal.h"
+#include "gimpwaitable.h"
+
+
+/* GimpAsync represents an asynchronous task.  Both the public and the
+ * protected interfaces are intentionally minimal at this point, to keep things
+ * simple.  They may be extended in the future as needed.
+ *
+ * GimpAsync implements the GimpWaitable and GimpCancelable interfaces.
+ *
+ * Upon creation, a GimpAsync object is in the "running" state.  Once the task
+ * is complete (and before the object's destruction), it should be transitioned
+ * to the "stopped" state, using either 'gimp_async_finish()' or
+ * 'gimp_async_abort()'.
+ *
+ * Similarly, upon creation, a GimpAsync object is said to be "unsynced".  It
+ * becomes synced once the execution of any of the completion callbacks added
+ * through 'gimp_async_add_callback()' had started, or after a successful call
+ * to one of the 'gimp_waitable_wait()' family of functions.
+ *
+ * Note that certain GimpAsync functions may only be called during a certain
+ * state, on a certain thread, or depending on whether or not the object is
+ * synced, as detailed for each function.  When referring to threads, the "main
+ * thread" is the thread running the main loop, or any thread whose execution
+ * is synchronized with the main thread, and the "async thread" is the thread
+ * calling 'gimp_async_finish()' or 'gimp_async_abort()' (which may also be the
+ * main thread), or any thread whose execution is synchronized with the async
+ * thread.
+ */
+
+
+/* #define TIME_ASYNC_OPS */
+
+
+enum
+{
+  WAITING,
+  LAST_SIGNAL
+};
+
+
+typedef struct _GimpAsyncCallbackInfo GimpAsyncCallbackInfo;
+
+
+struct _GimpAsyncCallbackInfo
+{
+  GimpAsync         *async;
+  GimpAsyncCallback  callback;
+  gpointer           data;
+  gpointer           gobject;
+};
+
+struct _GimpAsyncPrivate
+{
+  GMutex         mutex;
+  GCond          cond;
+
+  GQueue         callbacks;
+
+  gpointer       result;
+  GDestroyNotify result_destroy_func;
+
+  guint          idle_id;
+
+  gboolean       stopped;
+  gboolean       finished;
+  gboolean       synced;
+  gboolean       canceled;
+
+#ifdef TIME_ASYNC_OPS
+  guint64        start_time;
+#endif
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_async_waitable_iface_init   (GimpWaitableInterface   *iface);
+
+static void       gimp_async_cancelable_iface_init (GimpCancelableInterface *iface);
+
+static void       gimp_async_finalize              (GObject                 *object);
+
+static void       gimp_async_wait                  (GimpWaitable            *waitable);
+static gboolean   gimp_async_try_wait              (GimpWaitable            *waitable);
+static gboolean   gimp_async_wait_until            (GimpWaitable            *waitable,
+                                                    gint64                   end_time);
+
+static void       gimp_async_cancel                (GimpCancelable          *cancelable);
+
+static gboolean   gimp_async_idle                  (GimpAsync               *async);
+
+static void       gimp_async_callback_weak_notify  (GimpAsyncCallbackInfo   *callback_info,
+                                                    GObject                 *gobject);
+
+static void       gimp_async_stop                  (GimpAsync               *async);
+static void       gimp_async_run_callbacks         (GimpAsync               *async);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpAsync, gimp_async, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpAsync)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_WAITABLE,
+                                                gimp_async_waitable_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CANCELABLE,
+                                                gimp_async_cancelable_iface_init))
+
+#define parent_class gimp_async_parent_class
+
+static guint async_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  local variables  */
+
+static volatile gint gimp_async_n_running = 0;
+
+
+/*  private functions  */
+
+
+static void
+gimp_async_class_init (GimpAsyncClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  async_signals[WAITING] =
+    g_signal_new ("waiting",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpAsyncClass, waiting),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize = gimp_async_finalize;
+}
+
+static void
+gimp_async_waitable_iface_init (GimpWaitableInterface *iface)
+{
+  iface->wait       = gimp_async_wait;
+  iface->try_wait   = gimp_async_try_wait;
+  iface->wait_until = gimp_async_wait_until;
+}
+
+static void
+gimp_async_cancelable_iface_init (GimpCancelableInterface *iface)
+{
+  iface->cancel = gimp_async_cancel;
+}
+
+static void
+gimp_async_init (GimpAsync *async)
+{
+  async->priv = gimp_async_get_instance_private (async);
+
+  g_mutex_init (&async->priv->mutex);
+  g_cond_init  (&async->priv->cond);
+
+  g_queue_init (&async->priv->callbacks);
+
+  g_atomic_int_inc (&gimp_async_n_running);
+
+#ifdef TIME_ASYNC_OPS
+  async->priv->start_time = g_get_monotonic_time ();
+#endif
+}
+
+static void
+gimp_async_finalize (GObject *object)
+{
+  GimpAsync *async = GIMP_ASYNC (object);
+
+  g_warn_if_fail (async->priv->stopped);
+  g_warn_if_fail (async->priv->idle_id == 0);
+  g_warn_if_fail (g_queue_is_empty (&async->priv->callbacks));
+
+  if (async->priv->finished &&
+      async->priv->result   &&
+      async->priv->result_destroy_func)
+    {
+      async->priv->result_destroy_func (async->priv->result);
+
+      async->priv->result = NULL;
+    }
+
+  g_cond_clear  (&async->priv->cond);
+  g_mutex_clear (&async->priv->mutex);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+/* waits for 'waitable' to transition to the "stopped" state.  if 'waitable' is
+ * already stopped, returns immediately.
+ *
+ * after the call, all callbacks previously added through
+ * 'gimp_async_add_callback()' are guaranteed to have been called.
+ *
+ * may only be called on the main thread.
+ */
+static void
+gimp_async_wait (GimpWaitable *waitable)
+{
+  GimpAsync *async = GIMP_ASYNC (waitable);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  if (! async->priv->stopped)
+    {
+      g_signal_emit (async, async_signals[WAITING], 0);
+
+      while (! async->priv->stopped)
+        g_cond_wait (&async->priv->cond, &async->priv->mutex);
+    }
+
+  g_mutex_unlock (&async->priv->mutex);
+
+  gimp_async_run_callbacks (async);
+}
+
+/* same as 'gimp_async_wait()', but returns immediately if 'waitable' is not in
+ * the "stopped" state.
+ *
+ * returns TRUE if 'waitable' has transitioned to the "stopped" state, or FALSE
+ * otherwise.
+ */
+static gboolean
+gimp_async_try_wait (GimpWaitable *waitable)
+{
+  GimpAsync *async = GIMP_ASYNC (waitable);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  if (! async->priv->stopped)
+    {
+      g_mutex_unlock (&async->priv->mutex);
+
+      return FALSE;
+    }
+
+  g_mutex_unlock (&async->priv->mutex);
+
+  gimp_async_run_callbacks (async);
+
+  return TRUE;
+}
+
+/* same as 'gimp_async_wait()', taking an additional 'end_time' parameter,
+ * specifying the maximal monotonic time until which to wait for 'waitable' to
+ * stop.
+ *
+ * returns TRUE if 'waitable' has transitioned to the "stopped" state, or FALSE
+ * if the wait was interrupted before the transition.
+ */
+static gboolean
+gimp_async_wait_until (GimpWaitable *waitable,
+                       gint64        end_time)
+{
+  GimpAsync *async = GIMP_ASYNC (waitable);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  if (! async->priv->stopped)
+    {
+      g_signal_emit (async, async_signals[WAITING], 0);
+
+      while (! async->priv->stopped)
+        {
+          if (! g_cond_wait_until (&async->priv->cond, &async->priv->mutex,
+                                   end_time))
+            {
+              g_mutex_unlock (&async->priv->mutex);
+
+              return FALSE;
+            }
+        }
+    }
+
+  g_mutex_unlock (&async->priv->mutex);
+
+  gimp_async_run_callbacks (async);
+
+  return TRUE;
+}
+
+/* requests the cancellation of the task managed by 'cancelable'.
+ *
+ * note that 'gimp_async_cancel()' doesn't directly cause 'cancelable' to be
+ * stopped, nor synced.  furthermore, 'cancelable' may still complete
+ * successfully even when cancellation has been requested.
+ *
+ * may only be called on the main thread.
+ */
+static void
+gimp_async_cancel (GimpCancelable *cancelable)
+{
+  GimpAsync *async = GIMP_ASYNC (cancelable);
+
+  async->priv->canceled = TRUE;
+}
+
+static gboolean
+gimp_async_idle (GimpAsync *async)
+{
+  gimp_waitable_wait (GIMP_WAITABLE (async));
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_async_callback_weak_notify (GimpAsyncCallbackInfo *callback_info,
+                                 GObject               *gobject)
+{
+  GimpAsync *async       = callback_info->async;
+  gboolean   unref_async = FALSE;
+
+  g_mutex_lock (&async->priv->mutex);
+
+  g_queue_remove (&async->priv->callbacks, callback_info);
+
+  g_slice_free (GimpAsyncCallbackInfo, callback_info);
+
+  if (g_queue_is_empty (&async->priv->callbacks) && async->priv->idle_id)
+    {
+      g_source_remove (async->priv->idle_id);
+      async->priv->idle_id = 0;
+
+      unref_async = TRUE;
+    }
+
+  g_mutex_unlock (&async->priv->mutex);
+
+  if (unref_async)
+    g_object_unref (async);
+}
+
+static void
+gimp_async_stop (GimpAsync *async)
+{
+#ifdef TIME_ASYNC_OPS
+  {
+    guint64 time = g_get_monotonic_time ();
+
+    g_printerr ("Asynchronous operation took %g seconds%s\n",
+                (time - async->priv->start_time) / 1000000.0,
+                async->priv->finished ? "" : " (aborted)");
+  }
+#endif
+
+  g_atomic_int_dec_and_test (&gimp_async_n_running);
+
+  if (! g_queue_is_empty (&async->priv->callbacks))
+    {
+      g_object_ref (async);
+
+      async->priv->idle_id = g_idle_add_full (G_PRIORITY_DEFAULT,
+                                              (GSourceFunc) gimp_async_idle,
+                                              async, NULL);
+    }
+
+  async->priv->stopped = TRUE;
+
+  g_cond_broadcast (&async->priv->cond);
+}
+
+static void
+gimp_async_run_callbacks (GimpAsync *async)
+{
+  GimpAsyncCallbackInfo *callback_info;
+  gboolean               unref_async = FALSE;
+
+  if (async->priv->idle_id)
+    {
+      g_source_remove (async->priv->idle_id);
+      async->priv->idle_id = 0;
+
+      unref_async = TRUE;
+    }
+
+  async->priv->synced = TRUE;
+
+  while ((callback_info = g_queue_pop_head (&async->priv->callbacks)))
+    {
+      if (callback_info->gobject)
+        {
+          g_object_ref (callback_info->gobject);
+
+          g_object_weak_unref (callback_info->gobject,
+                               (GWeakNotify) gimp_async_callback_weak_notify,
+                               callback_info);
+        }
+
+      callback_info->callback (async, callback_info->data);
+
+      if (callback_info->gobject)
+        g_object_unref (callback_info->gobject);
+
+      g_slice_free (GimpAsyncCallbackInfo, callback_info);
+    }
+
+  if (unref_async)
+    g_object_unref (async);
+}
+
+
+/*  public functions  */
+
+
+/* creates a new GimpAsync object, initially unsynced and placed in the
+ * "running" state.
+ */
+GimpAsync *
+gimp_async_new (void)
+{
+  return g_object_new (GIMP_TYPE_ASYNC,
+                       NULL);
+}
+
+/* checks if 'async' is synced.
+ *
+ * may only be called on the main thread.
+ */
+gboolean
+gimp_async_is_synced (GimpAsync *async)
+{
+  g_return_val_if_fail (GIMP_IS_ASYNC (async), FALSE);
+
+  return async->priv->synced;
+}
+
+/* registers a callback to be called when 'async' transitions to the "stopped"
+ * state.  if 'async' is already stopped, the callback may be called directly.
+ *
+ * callbacks are called in the order in which they were added.  'async' is
+ * guaranteed to be kept alive, even without an external reference, between the
+ * point where it was stopped, and until all callbacks added while 'async' was
+ * externally referenced have been called.
+ *
+ * the callback is guaranteed to be called on the main thread.
+ *
+ * may only be called on the main thread.
+ */
+void
+gimp_async_add_callback (GimpAsync         *async,
+                         GimpAsyncCallback  callback,
+                         gpointer           data)
+{
+  GimpAsyncCallbackInfo *callback_info;
+
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+  g_return_if_fail (callback != NULL);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  if (async->priv->stopped && g_queue_is_empty (&async->priv->callbacks))
+    {
+      async->priv->synced = TRUE;
+
+      g_mutex_unlock (&async->priv->mutex);
+
+      callback (async, data);
+
+      return;
+    }
+
+  callback_info           = g_slice_new0 (GimpAsyncCallbackInfo);
+  callback_info->async    = async;
+  callback_info->callback = callback;
+  callback_info->data     = data;
+
+  g_queue_push_tail (&async->priv->callbacks, callback_info);
+
+  g_mutex_unlock (&async->priv->mutex);
+}
+
+/* same as 'gimp_async_add_callback()', however, takes an additional 'gobject'
+ * argument, which should be a GObject.
+ *
+ * 'gobject' is guaranteed to remain alive for the duration of the callback.
+ *
+ * When 'gobject' is destroyed, the callback is automatically removed.
+ */
+void
+gimp_async_add_callback_for_object (GimpAsync         *async,
+                                    GimpAsyncCallback  callback,
+                                    gpointer           data,
+                                    gpointer           gobject)
+{
+  GimpAsyncCallbackInfo *callback_info;
+
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+  g_return_if_fail (callback != NULL);
+  g_return_if_fail (G_IS_OBJECT (gobject));
+
+  g_mutex_lock (&async->priv->mutex);
+
+  if (async->priv->stopped && g_queue_is_empty (&async->priv->callbacks))
+    {
+      async->priv->synced = TRUE;
+
+      g_mutex_unlock (&async->priv->mutex);
+
+      g_object_ref (gobject);
+
+      callback (async, data);
+
+      g_object_unref (gobject);
+
+      return;
+    }
+
+  callback_info           = g_slice_new0 (GimpAsyncCallbackInfo);
+  callback_info->async    = async;
+  callback_info->callback = callback;
+  callback_info->data     = data;
+  callback_info->gobject  = gobject;
+
+  g_queue_push_tail (&async->priv->callbacks, callback_info);
+
+  g_object_weak_ref (gobject,
+                     (GWeakNotify) gimp_async_callback_weak_notify,
+                     callback_info);
+
+  g_mutex_unlock (&async->priv->mutex);
+}
+
+/* removes all callbacks previously registered through
+ * 'gimp_async_add_callback()', matching 'callback' and 'data', which hasn't
+ * been called yet.
+ *
+ * may only be called on the main thread.
+ */
+void
+gimp_async_remove_callback (GimpAsync         *async,
+                            GimpAsyncCallback  callback,
+                            gpointer           data)
+{
+  GList    *iter;
+  gboolean  unref_async = FALSE;
+
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+  g_return_if_fail (callback != NULL);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  iter = g_queue_peek_head_link (&async->priv->callbacks);
+
+  while (iter)
+    {
+      GimpAsyncCallbackInfo *callback_info = iter->data;
+      GList                 *next          = g_list_next (iter);
+
+      if (callback_info->callback == callback &&
+          callback_info->data     == data)
+        {
+          if (callback_info->gobject)
+            {
+              g_object_weak_unref (
+                callback_info->gobject,
+                (GWeakNotify) gimp_async_callback_weak_notify,
+                callback_info);
+            }
+
+          g_queue_delete_link (&async->priv->callbacks, iter);
+
+          g_slice_free (GimpAsyncCallbackInfo, callback_info);
+        }
+
+      iter = next;
+    }
+
+  if (g_queue_is_empty (&async->priv->callbacks) && async->priv->idle_id)
+    {
+      g_source_remove (async->priv->idle_id);
+      async->priv->idle_id = 0;
+
+      unref_async = TRUE;
+    }
+
+  g_mutex_unlock (&async->priv->mutex);
+
+  if (unref_async)
+    g_object_unref (async);
+}
+
+/* checks if 'async' is in the "stopped" state.
+ *
+ * may only be called on the async thread.
+ */
+gboolean
+gimp_async_is_stopped (GimpAsync *async)
+{
+  g_return_val_if_fail (GIMP_IS_ASYNC (async), FALSE);
+
+  return async->priv->stopped;
+}
+
+/* transitions 'async' to the "stopped" state, indicating that the task
+ * completed normally, possibly providing a result.
+ *
+ * 'async' shall be in the "running" state.
+ *
+ * may only be called on the async thread.
+ */
+void
+gimp_async_finish (GimpAsync *async,
+                   gpointer   result)
+{
+  gimp_async_finish_full (async, result, NULL);
+}
+
+/* same as 'gimp_async_finish()', taking an additional GDestroyNotify function,
+ * used for freeing the result when 'async' is destroyed.
+ */
+void
+gimp_async_finish_full (GimpAsync      *async,
+                        gpointer        result,
+                        GDestroyNotify  result_destroy_func)
+{
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+  g_return_if_fail (! async->priv->stopped);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  async->priv->finished            = TRUE;
+  async->priv->result              = result;
+  async->priv->result_destroy_func = result_destroy_func;
+
+  gimp_async_stop (async);
+
+  g_mutex_unlock (&async->priv->mutex);
+}
+
+/* checks if 'async' completed normally, using 'gimp_async_finish()' (in
+ * contrast to 'gimp_async_abort()').
+ *
+ * 'async' shall be in the "stopped" state.
+ *
+ * may only be called on the async thread, or on the main thread when 'async'
+ * is synced.
+ */
+gboolean
+gimp_async_is_finished (GimpAsync *async)
+{
+  g_return_val_if_fail (GIMP_IS_ASYNC (async), FALSE);
+  g_return_val_if_fail (async->priv->stopped, FALSE);
+
+  return async->priv->finished;
+}
+
+/* returns the result of 'async', as passed to 'gimp_async_finish()'.
+ *
+ * 'async' shall be in the "stopped" state, and should have completed normally.
+ *
+ * may only be called on the async thread, or on the main thread when 'async'
+ * is synced.
+ */
+gpointer
+gimp_async_get_result (GimpAsync *async)
+{
+  g_return_val_if_fail (GIMP_IS_ASYNC (async), NULL);
+  g_return_val_if_fail (async->priv->stopped, NULL);
+  g_return_val_if_fail (async->priv->finished, NULL);
+
+  return async->priv->result;
+}
+
+/* transitions 'async' to the "stopped" state, indicating that the task
+ * was stopped before completion (normally, in response to a
+ * 'gimp_cancelable_cancel()' call).
+ *
+ * 'async' shall be in the "running" state.
+ *
+ * may only be called on the async thread.
+ */
+void
+gimp_async_abort (GimpAsync *async)
+{
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+  g_return_if_fail (! async->priv->stopped);
+
+  g_mutex_lock (&async->priv->mutex);
+
+  gimp_async_stop (async);
+
+  g_mutex_unlock (&async->priv->mutex);
+}
+
+/* checks if cancellation of 'async' has been requested.
+ *
+ * note that a return value of TRUE only indicates that
+ * 'gimp_cancelable_cancel()' has been called for 'async', and not that 'async'
+ * is stopped, or, if it is stopped, that it was aborted.
+ */
+gboolean
+gimp_async_is_canceled (GimpAsync *async)
+{
+  g_return_val_if_fail (GIMP_IS_ASYNC (async), FALSE);
+
+  return async->priv->canceled;
+}
+
+/* a convenience function, canceling 'async' and waiting for it to stop.
+ *
+ * may only be called on the main thread.
+ */
+void
+gimp_async_cancel_and_wait (GimpAsync *async)
+{
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+
+  gimp_cancelable_cancel (GIMP_CANCELABLE (async));
+  gimp_waitable_wait (GIMP_WAITABLE (async));
+}
+
+
+/*  public functions (stats)  */
+
+
+gint
+gimp_async_get_n_running (void)
+{
+  return gimp_async_n_running;
+}
diff --git a/app/core/gimpasync.h b/app/core/gimpasync.h
new file mode 100644
index 0000000..0c2a671
--- /dev/null
+++ b/app/core/gimpasync.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpasync.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ASYNC_H__
+#define __GIMP_ASYNC_H__
+
+
+#define GIMP_TYPE_ASYNC            (gimp_async_get_type ())
+#define GIMP_ASYNC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ASYNC, GimpAsync))
+#define GIMP_ASYNC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ASYNC, GimpAsyncClass))
+#define GIMP_IS_ASYNC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ASYNC))
+#define GIMP_IS_ASYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ASYNC))
+#define GIMP_ASYNC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ASYNC, GimpAsyncClass))
+
+
+typedef void (* GimpAsyncCallback) (GimpAsync *async,
+                                    gpointer   data);
+
+
+typedef struct _GimpAsyncPrivate GimpAsyncPrivate;
+typedef struct _GimpAsyncClass   GimpAsyncClass;
+
+struct _GimpAsync
+{
+  GObject           parent_instance;
+
+  GimpAsyncPrivate *priv;
+};
+
+struct _GimpAsyncClass
+{
+  GObjectClass  parent_class;
+
+  /*  signals  */
+  void   (* waiting) (GimpAsync *async);
+};
+
+
+GType       gimp_async_get_type                (void) G_GNUC_CONST;
+
+GimpAsync * gimp_async_new                     (void);
+
+gboolean    gimp_async_is_synced               (GimpAsync         *async);
+
+void        gimp_async_add_callback            (GimpAsync         *async,
+                                                GimpAsyncCallback  callback,
+                                                gpointer           data);
+void        gimp_async_add_callback_for_object (GimpAsync         *async,
+                                                GimpAsyncCallback  callback,
+                                                gpointer           data,
+                                                gpointer           gobject);
+void        gimp_async_remove_callback         (GimpAsync         *async,
+                                                GimpAsyncCallback  callback,
+                                                gpointer           data);
+
+gboolean    gimp_async_is_stopped              (GimpAsync         *async);
+
+void        gimp_async_finish                  (GimpAsync         *async,
+                                                gpointer           result);
+void        gimp_async_finish_full             (GimpAsync         *async,
+                                                gpointer           result,
+                                                GDestroyNotify     result_destroy_func);
+gboolean    gimp_async_is_finished             (GimpAsync         *async);
+gpointer    gimp_async_get_result              (GimpAsync         *async);
+
+void        gimp_async_abort                   (GimpAsync         *async);
+
+gboolean    gimp_async_is_canceled             (GimpAsync         *async);
+
+void        gimp_async_cancel_and_wait         (GimpAsync         *async);
+
+
+/*  stats  */
+
+gint        gimp_async_get_n_running           (void);
+
+
+#endif /* __GIMP_ASYNC_H__ */
diff --git a/app/core/gimpasyncset.c b/app/core/gimpasyncset.c
new file mode 100644
index 0000000..f1b611e
--- /dev/null
+++ b/app/core/gimpasyncset.c
@@ -0,0 +1,348 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpasyncset.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpasync.h"
+#include "gimpasyncset.h"
+#include "gimpcancelable.h"
+#include "gimpwaitable.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_EMPTY
+};
+
+
+struct _GimpAsyncSetPrivate
+{
+  GHashTable *asyncs;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_async_set_waitable_iface_init   (GimpWaitableInterface   *iface);
+
+static void       gimp_async_set_cancelable_iface_init (GimpCancelableInterface *iface);
+
+static void       gimp_async_set_dispose               (GObject                 *object);
+static void       gimp_async_set_finalize              (GObject                 *object);
+static void       gimp_async_set_set_property          (GObject                 *object,
+                                                        guint                    property_id,
+                                                        const GValue            *value,
+                                                        GParamSpec              *pspec);
+static void       gimp_async_set_get_property          (GObject                 *object,
+                                                        guint                    property_id,
+                                                        GValue                  *value,
+                                                        GParamSpec              *pspec);
+
+static void       gimp_async_set_wait                  (GimpWaitable            *waitable);
+static gboolean   gimp_async_set_try_wait              (GimpWaitable            *waitable);
+static gboolean   gimp_async_set_wait_until            (GimpWaitable            *waitable,
+                                                        gint64                   end_time);
+
+static void       gimp_async_set_cancel                (GimpCancelable          *cancelable);
+
+static void       gimp_async_set_async_callback        (GimpAsync               *async,
+                                                        GimpAsyncSet            *async_set);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpAsyncSet, gimp_async_set, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpAsyncSet)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_WAITABLE,
+                                                gimp_async_set_waitable_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CANCELABLE,
+                                                gimp_async_set_cancelable_iface_init))
+
+#define parent_class gimp_async_set_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_async_set_class_init (GimpAsyncSetClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_async_set_dispose;
+  object_class->finalize     = gimp_async_set_finalize;
+  object_class->set_property = gimp_async_set_set_property;
+  object_class->get_property = gimp_async_set_get_property;
+
+  g_object_class_install_property (object_class, PROP_EMPTY,
+                                   g_param_spec_boolean ("empty",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_async_set_waitable_iface_init (GimpWaitableInterface *iface)
+{
+  iface->wait       = gimp_async_set_wait;
+  iface->try_wait   = gimp_async_set_try_wait;
+  iface->wait_until = gimp_async_set_wait_until;
+}
+
+static void
+gimp_async_set_cancelable_iface_init (GimpCancelableInterface *iface)
+{
+  iface->cancel = gimp_async_set_cancel;
+}
+
+static void
+gimp_async_set_init (GimpAsyncSet *async_set)
+{
+  async_set->priv = gimp_async_set_get_instance_private (async_set);
+
+  async_set->priv->asyncs = g_hash_table_new (NULL, NULL);
+}
+
+static void
+gimp_async_set_dispose (GObject *object)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (object);
+
+  gimp_async_set_clear (async_set);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_async_set_finalize (GObject *object)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (object);
+
+  g_hash_table_unref (async_set->priv->asyncs);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_async_set_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_async_set_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (object);
+
+  switch (property_id)
+    {
+    case PROP_EMPTY:
+      g_value_set_boolean (value, gimp_async_set_is_empty (async_set));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_async_set_wait (GimpWaitable *waitable)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (waitable);
+
+  while (! gimp_async_set_is_empty (async_set))
+    {
+      GimpAsync      *async;
+      GHashTableIter  iter;
+
+      g_hash_table_iter_init (&iter, async_set->priv->asyncs);
+
+      g_hash_table_iter_next (&iter, (gpointer *) &async, NULL);
+
+      gimp_waitable_wait (GIMP_WAITABLE (async));
+    }
+}
+
+static gboolean
+gimp_async_set_try_wait (GimpWaitable *waitable)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (waitable);
+
+  while (! gimp_async_set_is_empty (async_set))
+    {
+      GimpAsync      *async;
+      GHashTableIter  iter;
+
+      g_hash_table_iter_init (&iter, async_set->priv->asyncs);
+
+      g_hash_table_iter_next (&iter, (gpointer *) &async, NULL);
+
+      if (! gimp_waitable_try_wait (GIMP_WAITABLE (async)))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_async_set_wait_until (GimpWaitable *waitable,
+                           gint64        end_time)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (waitable);
+
+  while (! gimp_async_set_is_empty (async_set))
+    {
+      GimpAsync      *async;
+      GHashTableIter  iter;
+
+      g_hash_table_iter_init (&iter, async_set->priv->asyncs);
+
+      g_hash_table_iter_next (&iter, (gpointer *) &async, NULL);
+
+      if (! gimp_waitable_wait_until (GIMP_WAITABLE (async), end_time))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_async_set_cancel (GimpCancelable *cancelable)
+{
+  GimpAsyncSet *async_set = GIMP_ASYNC_SET (cancelable);
+  GList        *list;
+
+  list = g_hash_table_get_keys (async_set->priv->asyncs);
+
+  g_list_foreach (list, (GFunc) g_object_ref, NULL);
+
+  g_list_foreach (list, (GFunc) gimp_cancelable_cancel, NULL);
+
+  g_list_free_full (list, g_object_unref);
+}
+
+static void
+gimp_async_set_async_callback (GimpAsync    *async,
+                               GimpAsyncSet *async_set)
+{
+  g_hash_table_remove (async_set->priv->asyncs, async);
+
+  if (gimp_async_set_is_empty (async_set))
+    g_object_notify (G_OBJECT (async_set), "empty");
+}
+
+
+/*  public functions  */
+
+
+GimpAsyncSet *
+gimp_async_set_new (void)
+{
+  return g_object_new (GIMP_TYPE_ASYNC_SET,
+                       NULL);
+}
+
+void
+gimp_async_set_add (GimpAsyncSet *async_set,
+                    GimpAsync    *async)
+{
+  g_return_if_fail (GIMP_IS_ASYNC_SET (async_set));
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+
+  if (g_hash_table_add (async_set->priv->asyncs, async))
+    {
+      if (g_hash_table_size (async_set->priv->asyncs) == 1)
+        g_object_notify (G_OBJECT (async_set), "empty");
+
+      gimp_async_add_callback (
+        async,
+        (GimpAsyncCallback) gimp_async_set_async_callback,
+        async_set);
+    }
+}
+
+void
+gimp_async_set_remove (GimpAsyncSet *async_set,
+                       GimpAsync    *async)
+{
+  g_return_if_fail (GIMP_IS_ASYNC_SET (async_set));
+  g_return_if_fail (GIMP_IS_ASYNC (async));
+
+  if (g_hash_table_remove (async_set->priv->asyncs, async))
+    {
+      gimp_async_remove_callback (
+        async,
+        (GimpAsyncCallback) gimp_async_set_async_callback,
+        async_set);
+
+      if (g_hash_table_size (async_set->priv->asyncs) == 0)
+        g_object_notify (G_OBJECT (async_set), "empty");
+    }
+}
+
+void
+gimp_async_set_clear (GimpAsyncSet *async_set)
+{
+  GimpAsync      *async;
+  GHashTableIter  iter;
+
+  g_return_if_fail (GIMP_IS_ASYNC_SET (async_set));
+
+  if (gimp_async_set_is_empty (async_set))
+    return;
+
+  g_hash_table_iter_init (&iter, async_set->priv->asyncs);
+
+  while (g_hash_table_iter_next (&iter, (gpointer *) &async, NULL))
+    {
+      gimp_async_remove_callback (
+        async,
+        (GimpAsyncCallback) gimp_async_set_async_callback,
+        async_set);
+    }
+
+  g_hash_table_remove_all (async_set->priv->asyncs);
+
+  g_object_notify (G_OBJECT (async_set), "empty");
+}
+
+gboolean
+gimp_async_set_is_empty (GimpAsyncSet *async_set)
+{
+  g_return_val_if_fail (GIMP_IS_ASYNC_SET (async_set), FALSE);
+
+  return g_hash_table_size (async_set->priv->asyncs) == 0;
+}
diff --git a/app/core/gimpasyncset.h b/app/core/gimpasyncset.h
new file mode 100644
index 0000000..62cc524
--- /dev/null
+++ b/app/core/gimpasyncset.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpasyncset.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ASYNC_SET_H__
+#define __GIMP_ASYNC_SET_H__
+
+
+#define GIMP_TYPE_ASYNC_SET            (gimp_async_set_get_type ())
+#define GIMP_ASYNC_SET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ASYNC_SET, GimpAsyncSet))
+#define GIMP_ASYNC_SET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ASYNC_SET, GimpAsyncSetClass))
+#define GIMP_IS_ASYNC_SET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ASYNC_SET))
+#define GIMP_IS_ASYNC_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ASYNC_SET))
+#define GIMP_ASYNC_SET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ASYNC_SET, GimpAsyncSetClass))
+
+
+typedef struct _GimpAsyncSetPrivate GimpAsyncSetPrivate;
+typedef struct _GimpAsyncSetClass   GimpAsyncSetClass;
+
+struct _GimpAsyncSet
+{
+  GObject              parent_instance;
+
+  GimpAsyncSetPrivate *priv;
+};
+
+struct _GimpAsyncSetClass
+{
+  GObjectClass  parent_class;
+};
+
+
+GType          gimp_async_set_get_type (void) G_GNUC_CONST;
+
+GimpAsyncSet * gimp_async_set_new      (void);
+
+void           gimp_async_set_add      (GimpAsyncSet *async_set,
+                                        GimpAsync    *async);
+void           gimp_async_set_remove   (GimpAsyncSet *async_set,
+                                        GimpAsync    *async);
+void           gimp_async_set_clear    (GimpAsyncSet *async_set);
+gboolean       gimp_async_set_is_empty (GimpAsyncSet *async_set);
+
+
+#endif /* __GIMP_ASYNC_SET_H__ */
diff --git a/app/core/gimpauxitem.c b/app/core/gimpauxitem.c
new file mode 100644
index 0000000..cc96149
--- /dev/null
+++ b/app/core/gimpauxitem.c
@@ -0,0 +1,147 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "gimpauxitem.h"
+
+
+enum
+{
+  REMOVED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_ID
+};
+
+
+struct _GimpAuxItemPrivate
+{
+  guint32  aux_item_ID;
+};
+
+
+static void   gimp_aux_item_get_property (GObject      *object,
+                                          guint         property_id,
+                                          GValue       *value,
+                                          GParamSpec   *pspec);
+static void   gimp_aux_item_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec);
+
+
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GimpAuxItem, gimp_aux_item, G_TYPE_OBJECT)
+
+static guint gimp_aux_item_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_aux_item_class_init (GimpAuxItemClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  gimp_aux_item_signals[REMOVED] =
+    g_signal_new ("removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpAuxItemClass, removed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->get_property = gimp_aux_item_get_property;
+  object_class->set_property = gimp_aux_item_set_property;
+
+  klass->removed             = NULL;
+
+  g_object_class_install_property (object_class, PROP_ID,
+                                   g_param_spec_uint ("id", NULL, NULL,
+                                                      0, G_MAXUINT32, 0,
+                                                      G_PARAM_CONSTRUCT_ONLY |
+                                                      GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_aux_item_init (GimpAuxItem *aux_item)
+{
+  aux_item->priv = gimp_aux_item_get_instance_private (aux_item);
+}
+
+static void
+gimp_aux_item_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpAuxItem *aux_item = GIMP_AUX_ITEM (object);
+
+  switch (property_id)
+    {
+    case PROP_ID:
+      g_value_set_uint (value, aux_item->priv->aux_item_ID);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_aux_item_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpAuxItem *aux_item = GIMP_AUX_ITEM (object);
+
+  switch (property_id)
+    {
+    case PROP_ID:
+      aux_item->priv->aux_item_ID = g_value_get_uint (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+guint32
+gimp_aux_item_get_ID (GimpAuxItem *aux_item)
+{
+  g_return_val_if_fail (GIMP_IS_AUX_ITEM (aux_item), 0);
+
+  return aux_item->priv->aux_item_ID;
+}
+
+void
+gimp_aux_item_removed (GimpAuxItem *aux_item)
+{
+  g_return_if_fail (GIMP_IS_AUX_ITEM (aux_item));
+
+  g_signal_emit (aux_item, gimp_aux_item_signals[REMOVED], 0);
+}
diff --git a/app/core/gimpauxitem.h b/app/core/gimpauxitem.h
new file mode 100644
index 0000000..6907b39
--- /dev/null
+++ b/app/core/gimpauxitem.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_AUX_ITEM_H__
+#define __GIMP_AUX_ITEM_H__
+
+
+#define GIMP_TYPE_AUX_ITEM            (gimp_aux_item_get_type ())
+#define GIMP_AUX_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_AUX_ITEM, GimpAuxItem))
+#define GIMP_AUX_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_AUX_ITEM, GimpAuxItemClass))
+#define GIMP_IS_AUX_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_AUX_ITEM))
+#define GIMP_IS_AUX_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_AUX_ITEM))
+#define GIMP_AUX_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AUX_ITEM, GimpAuxItemClass))
+
+
+typedef struct _GimpAuxItemPrivate GimpAuxItemPrivate;
+typedef struct _GimpAuxItemClass   GimpAuxItemClass;
+
+struct _GimpAuxItem
+{
+  GObject             parent_instance;
+
+  GimpAuxItemPrivate *priv;
+};
+
+struct _GimpAuxItemClass
+{
+  GObjectClass  parent_class;
+
+  /*  signals  */
+  void (* removed) (GimpAuxItem *aux_item);
+};
+
+
+GType     gimp_aux_item_get_type (void) G_GNUC_CONST;
+
+guint32   gimp_aux_item_get_ID       (GimpAuxItem *aux_item);
+
+void      gimp_aux_item_removed      (GimpAuxItem *aux_item);
+
+
+#endif /* __GIMP_AUX_ITEM_H__ */
diff --git a/app/core/gimpauxitemundo.c b/app/core/gimpauxitemundo.c
new file mode 100644
index 0000000..e0253ab
--- /dev/null
+++ b/app/core/gimpauxitemundo.c
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpauxitem.h"
+#include "gimpauxitemundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_AUX_ITEM
+};
+
+
+static void   gimp_aux_item_undo_constructed  (GObject      *object);
+static void   gimp_aux_item_undo_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void   gimp_aux_item_undo_get_property (GObject      *object,
+                                               guint         property_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+static void   gimp_aux_item_undo_free         (GimpUndo     *undo,
+                                               GimpUndoMode  undo_mode);
+
+
+G_DEFINE_ABSTRACT_TYPE (GimpAuxItemUndo, gimp_aux_item_undo, GIMP_TYPE_UNDO)
+
+#define parent_class gimp_aux_item_undo_parent_class
+
+
+static void
+gimp_aux_item_undo_class_init (GimpAuxItemUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed  = gimp_aux_item_undo_constructed;
+  object_class->set_property = gimp_aux_item_undo_set_property;
+  object_class->get_property = gimp_aux_item_undo_get_property;
+
+  undo_class->free           = gimp_aux_item_undo_free;
+
+  g_object_class_install_property (object_class, PROP_AUX_ITEM,
+                                   g_param_spec_object ("aux-item", NULL, NULL,
+                                                        GIMP_TYPE_AUX_ITEM,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_aux_item_undo_init (GimpAuxItemUndo *undo)
+{
+}
+
+static void
+gimp_aux_item_undo_constructed (GObject *object)
+{
+  GimpAuxItemUndo *aux_item_undo = GIMP_AUX_ITEM_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_AUX_ITEM (aux_item_undo->aux_item));
+}
+
+static void
+gimp_aux_item_undo_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpAuxItemUndo *aux_item_undo = GIMP_AUX_ITEM_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_AUX_ITEM:
+      aux_item_undo->aux_item = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_aux_item_undo_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpAuxItemUndo *aux_item_undo = GIMP_AUX_ITEM_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_AUX_ITEM:
+      g_value_set_object (value, aux_item_undo->aux_item);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_aux_item_undo_free (GimpUndo     *undo,
+                         GimpUndoMode  undo_mode)
+{
+  GimpAuxItemUndo *aux_item_undo = GIMP_AUX_ITEM_UNDO (undo);
+
+  g_clear_object (&aux_item_undo->aux_item);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpauxitemundo.h b/app/core/gimpauxitemundo.h
new file mode 100644
index 0000000..2858f4d
--- /dev/null
+++ b/app/core/gimpauxitemundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_AUX_ITEM_UNDO_H__
+#define __GIMP_AUX_ITEM_UNDO_H__
+
+
+#include "gimpundo.h"
+
+
+#define GIMP_TYPE_AUX_ITEM_UNDO            (gimp_aux_item_undo_get_type ())
+#define GIMP_AUX_ITEM_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_AUX_ITEM_UNDO, GimpAuxItemUndo))
+#define GIMP_AUX_ITEM_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_AUX_ITEM_UNDO, GimpAuxItemUndoClass))
+#define GIMP_IS_AUX_ITEM_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_AUX_ITEM_UNDO))
+#define GIMP_IS_AUX_ITEM_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_AUX_ITEM_UNDO))
+#define GIMP_AUX_ITEM_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AUX_ITEM_UNDO, GimpAuxItemUndoClass))
+
+
+typedef struct _GimpAuxItemUndo      GimpAuxItemUndo;
+typedef struct _GimpAuxItemUndoClass GimpAuxItemUndoClass;
+
+struct _GimpAuxItemUndo
+{
+  GimpUndo     parent_instance;
+
+  GimpAuxItem *aux_item;
+};
+
+struct _GimpAuxItemUndoClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType   gimp_aux_item_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_AUX_ITEM_UNDO_H__ */
diff --git a/app/core/gimpbacktrace-backend.h b/app/core/gimpbacktrace-backend.h
new file mode 100644
index 0000000..4bfb1c9
--- /dev/null
+++ b/app/core/gimpbacktrace-backend.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbacktrace-backend.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BACKTRACE_BACKEND_H__
+#define __GIMP_BACKTRACE_BACKEND_H__
+
+
+#ifdef __gnu_linux__
+# define GIMP_BACKTRACE_BACKEND_LINUX
+#elif defined (G_OS_WIN32) && defined (ARCH_X86)
+# define GIMP_BACKTRACE_BACKEND_WINDOWS
+#else
+# define GIMP_BACKTRACE_BACKEND_NONE
+#endif
+
+
+#endif  /*  __GIMP_BACKTRACE_BACKEND_H__  */
diff --git a/app/core/gimpbacktrace-linux.c b/app/core/gimpbacktrace-linux.c
new file mode 100644
index 0000000..a8593f8
--- /dev/null
+++ b/app/core/gimpbacktrace-linux.c
@@ -0,0 +1,725 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpbacktrace-linux.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#define _GNU_SOURCE
+
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "gimpbacktrace-backend.h"
+
+
+#ifdef GIMP_BACKTRACE_BACKEND_LINUX
+
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <signal.h>
+#include <execinfo.h>
+#include <dlfcn.h>
+#include <string.h>
+#include <stdio.h>
+
+#ifdef HAVE_LIBBACKTRACE
+#include <backtrace.h>
+#endif
+
+#ifdef HAVE_LIBUNWIND
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#endif
+
+#include "core-types.h"
+
+#include "gimpbacktrace.h"
+
+
+#define MAX_N_THREADS        256
+#define MAX_N_FRAMES         256
+#define MAX_THREAD_NAME_SIZE 32
+#define N_SKIPPED_FRAMES     2
+#define MAX_WAIT_TIME        (G_TIME_SPAN_SECOND / 20)
+#define BACKTRACE_SIGNAL     SIGUSR1
+
+
+typedef struct _GimpBacktraceThread GimpBacktraceThread;
+
+
+struct _GimpBacktraceThread
+{
+  pid_t    tid;
+  gchar    name[MAX_THREAD_NAME_SIZE];
+  gchar    state;
+
+  guintptr frames[MAX_N_FRAMES];
+  gint     n_frames;
+};
+
+struct _GimpBacktrace
+{
+  GimpBacktraceThread *threads;
+  gint                 n_threads;
+};
+
+
+/*  local function prototypes  */
+
+static inline gint   gimp_backtrace_normalize_frame   (GimpBacktrace *backtrace,
+                                                       gint           thread,
+                                                       gint           frame);
+
+static gint          gimp_backtrace_enumerate_threads (gboolean       include_current_thread,
+                                                       pid_t         *threads,
+                                                       gint           size);
+static void          gimp_backtrace_read_thread_name  (pid_t          tid,
+                                                       gchar         *name,
+                                                       gint           size);
+static gchar         gimp_backtrace_read_thread_state (pid_t          tid);
+
+static void          gimp_backtrace_signal_handler    (gint           signum);
+
+
+/*  static variables  */
+
+static GMutex            mutex;
+static gint              n_initializations;
+static gboolean          initialized;
+static struct sigaction  orig_action;
+static pid_t             blacklisted_threads[MAX_N_THREADS];
+static gint              n_blacklisted_threads;
+static GimpBacktrace    *handler_backtrace;
+static gint              handler_n_remaining_threads;
+static gint              handler_lock;
+
+#ifdef HAVE_LIBBACKTRACE
+static struct backtrace_state *backtrace_state;
+#endif
+
+static const gchar * const blacklisted_thread_names[] =
+{
+  "gmain",
+  "threaded-ml"
+};
+
+
+/*  private functions  */
+
+
+static inline gint
+gimp_backtrace_normalize_frame (GimpBacktrace *backtrace,
+                                gint           thread,
+                                gint           frame)
+{
+  if (frame >= 0)
+    return frame + N_SKIPPED_FRAMES;
+  else
+    return backtrace->threads[thread].n_frames + frame;
+}
+
+static gint
+gimp_backtrace_enumerate_threads (gboolean  include_current_thread,
+                                  pid_t    *threads,
+                                  gint      size)
+{
+  DIR           *dir;
+  struct dirent *dirent;
+  pid_t          tid;
+  gint           n_threads;
+
+  dir = opendir ("/proc/self/task");
+
+  if (! dir)
+    return 0;
+
+  tid = syscall (SYS_gettid);
+
+  n_threads = 0;
+
+  while (n_threads < size && (dirent = readdir (dir)))
+    {
+      pid_t id = g_ascii_strtoull (dirent->d_name, NULL, 10);
+
+      if (id)
+        {
+          if (! include_current_thread && id == tid)
+            id = 0;
+        }
+
+      if (id)
+        {
+          gint i;
+
+          for (i = 0; i < n_blacklisted_threads; i++)
+            {
+              if (id == blacklisted_threads[i])
+                {
+                  id = 0;
+
+                  break;
+                }
+            }
+        }
+
+      if (id)
+        threads[n_threads++] = id;
+    }
+
+  closedir (dir);
+
+  return n_threads;
+}
+
+static void
+gimp_backtrace_read_thread_name (pid_t  tid,
+                                 gchar *name,
+                                 gint   size)
+{
+  gchar filename[64];
+  gint  fd;
+
+  if (size <= 0)
+    return;
+
+  name[0] = '\0';
+
+  g_snprintf (filename, sizeof (filename),
+              "/proc/self/task/%llu/comm",
+              (unsigned long long) tid);
+
+  fd = open (filename, O_RDONLY);
+
+  if (fd >= 0)
+    {
+      gint n = read (fd, name, size);
+
+      if (n > 0)
+        name[n - 1] = '\0';
+
+      close (fd);
+    }
+}
+
+static gchar
+gimp_backtrace_read_thread_state (pid_t tid)
+{
+  gchar buffer[64];
+  gint  fd;
+  gchar state = '\0';
+
+  g_snprintf (buffer, sizeof (buffer),
+              "/proc/self/task/%llu/stat",
+              (unsigned long long) tid);
+
+  fd = open (buffer, O_RDONLY);
+
+  if (fd >= 0)
+    {
+      gint n = read (fd, buffer, sizeof (buffer));
+
+      if (n > 0)
+        buffer[n - 1] = '\0';
+
+      sscanf (buffer, "%*d %*s %c", &state);
+
+      close (fd);
+    }
+
+  return state;
+}
+
+static void
+gimp_backtrace_signal_handler (gint signum)
+{
+  GimpBacktrace *curr_backtrace;
+  gint           lock;
+
+  do
+    {
+      lock = g_atomic_int_get (&handler_lock);
+
+      if (lock < 0)
+        continue;
+    }
+  while (! g_atomic_int_compare_and_exchange (&handler_lock, lock, lock + 1));
+
+  curr_backtrace = g_atomic_pointer_get (&handler_backtrace);
+
+  if (curr_backtrace)
+    {
+      pid_t tid = syscall (SYS_gettid);
+      gint  i;
+
+      for (i = 0; i < curr_backtrace->n_threads; i++)
+        {
+          GimpBacktraceThread *thread = &curr_backtrace->threads[i];
+
+          if (thread->tid == tid)
+            {
+              thread->n_frames = backtrace ((gpointer *) thread->frames,
+                                            MAX_N_FRAMES);
+
+              g_atomic_int_dec_and_test (&handler_n_remaining_threads);
+
+              break;
+            }
+        }
+    }
+
+  g_atomic_int_dec_and_test (&handler_lock);
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_backtrace_init (void)
+{
+#ifdef HAVE_LIBBACKTRACE
+  backtrace_state = backtrace_create_state (NULL, 0, NULL, NULL);
+#endif
+}
+
+gboolean
+gimp_backtrace_start (void)
+{
+  g_mutex_lock (&mutex);
+
+  if (n_initializations == 0)
+    {
+      struct sigaction action = {};
+
+      action.sa_handler = gimp_backtrace_signal_handler;
+      action.sa_flags   = SA_RESTART;
+
+      sigemptyset (&action.sa_mask);
+
+      if (sigaction (BACKTRACE_SIGNAL, &action, &orig_action) == 0)
+        {
+          pid_t *threads;
+          gint   n_threads;
+          gint   i;
+
+          n_blacklisted_threads = 0;
+
+          threads = g_new (pid_t, MAX_N_THREADS);
+
+          n_threads = gimp_backtrace_enumerate_threads (TRUE,
+                                                        threads, MAX_N_THREADS);
+
+          for (i = 0; i < n_threads; i++)
+            {
+              gchar name[MAX_THREAD_NAME_SIZE];
+              gint  j;
+
+              gimp_backtrace_read_thread_name (threads[i],
+                                               name, MAX_THREAD_NAME_SIZE);
+
+              for (j = 0; j < G_N_ELEMENTS (blacklisted_thread_names); j++)
+                {
+                  if (! strcmp (name, blacklisted_thread_names[j]))
+                    {
+                      blacklisted_threads[n_blacklisted_threads++] = threads[i];
+                    }
+                }
+            }
+
+          g_free (threads);
+
+          initialized = TRUE;
+        }
+    }
+
+  n_initializations++;
+
+  g_mutex_unlock (&mutex);
+
+  return initialized;
+}
+
+void
+gimp_backtrace_stop (void)
+{
+  g_return_if_fail (n_initializations > 0);
+
+  g_mutex_lock (&mutex);
+
+  n_initializations--;
+
+  if (n_initializations == 0 && initialized)
+    {
+      if (sigaction (BACKTRACE_SIGNAL, &orig_action, NULL) < 0)
+        g_warning ("failed to restore origianl backtrace signal handler");
+
+      initialized = FALSE;
+    }
+
+  g_mutex_unlock (&mutex);
+}
+
+GimpBacktrace *
+gimp_backtrace_new (gboolean include_current_thread)
+{
+  GimpBacktrace *backtrace;
+  pid_t          pid;
+  pid_t         *threads;
+  gint           n_threads;
+  gint64         start_time;
+  gint           i;
+
+  if (! initialized)
+    return NULL;
+
+  pid = getpid ();
+
+  threads = g_new (pid_t, MAX_N_THREADS);
+
+  n_threads = gimp_backtrace_enumerate_threads (include_current_thread,
+                                                threads, MAX_N_THREADS);
+
+  if (n_threads == 0)
+    {
+      g_free (threads);
+
+      return NULL;
+    }
+
+  g_mutex_lock (&mutex);
+
+  backtrace = g_slice_new (GimpBacktrace);
+
+  backtrace->threads   = g_new (GimpBacktraceThread, n_threads);
+  backtrace->n_threads = n_threads;
+
+  while (! g_atomic_int_compare_and_exchange (&handler_lock, 0, -1));
+
+  g_atomic_pointer_set (&handler_backtrace,           backtrace);
+  g_atomic_int_set     (&handler_n_remaining_threads, n_threads);
+
+  g_atomic_int_set (&handler_lock, 0);
+
+  for (i = 0; i < n_threads; i++)
+    {
+      GimpBacktraceThread *thread = &backtrace->threads[i];
+
+      thread->tid      = threads[i];
+      thread->n_frames = 0;
+
+      gimp_backtrace_read_thread_name (thread->tid,
+                                       thread->name, MAX_THREAD_NAME_SIZE);
+
+      thread->state = gimp_backtrace_read_thread_state (thread->tid);
+
+      syscall (SYS_tgkill, pid, threads[i], BACKTRACE_SIGNAL);
+    }
+
+  g_free (threads);
+
+  start_time = g_get_monotonic_time ();
+
+  while (g_atomic_int_get (&handler_n_remaining_threads) > 0)
+    {
+      gint64 time = g_get_monotonic_time ();
+
+      if (time - start_time > MAX_WAIT_TIME)
+        break;
+
+      g_usleep (1000);
+    }
+
+  while (! g_atomic_int_compare_and_exchange (&handler_lock, 0, -1));
+
+  g_atomic_pointer_set (&handler_backtrace, NULL);
+
+  g_atomic_int_set (&handler_lock, 0);
+
+#if 0
+  if (handler_n_remaining_threads > 0)
+    {
+      gint j = 0;
+
+      for (i = 0; i < n_threads; i++)
+        {
+          if (backtrace->threads[i].n_frames == 0)
+            {
+              if (n_blacklisted_threads < MAX_N_THREADS)
+                {
+                  blacklisted_threads[n_blacklisted_threads++] =
+                    backtrace->threads[i].tid;
+                }
+            }
+          else
+            {
+              if (j < i)
+                backtrace->threads[j] = backtrace->threads[i];
+
+              j++;
+            }
+        }
+
+      n_threads = j;
+    }
+#endif
+
+  g_mutex_unlock (&mutex);
+
+  if (n_threads == 0)
+    {
+      gimp_backtrace_free (backtrace);
+
+      return NULL;
+    }
+
+  return backtrace;
+}
+
+void
+gimp_backtrace_free (GimpBacktrace *backtrace)
+{
+  if (! backtrace)
+    return;
+
+  g_free (backtrace->threads);
+
+  g_slice_free (GimpBacktrace, backtrace);
+}
+
+gint
+gimp_backtrace_get_n_threads (GimpBacktrace *backtrace)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+
+  return backtrace->n_threads;
+}
+
+guintptr
+gimp_backtrace_get_thread_id (GimpBacktrace *backtrace,
+                              gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, 0);
+
+  return backtrace->threads[thread].tid;
+}
+
+const gchar *
+gimp_backtrace_get_thread_name (GimpBacktrace *backtrace,
+                                gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, NULL);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, NULL);
+
+  if (backtrace->threads[thread].name[0])
+    return backtrace->threads[thread].name;
+  else
+    return NULL;
+}
+
+gboolean
+gimp_backtrace_is_thread_running (GimpBacktrace *backtrace,
+                                  gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, FALSE);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, FALSE);
+
+  return backtrace->threads[thread].state == 'R';
+}
+
+gint
+gimp_backtrace_find_thread_by_id (GimpBacktrace *backtrace,
+                                  guintptr       thread_id,
+                                  gint           thread_hint)
+{
+  pid_t tid = thread_id;
+  gint  i;
+
+  g_return_val_if_fail (backtrace != NULL, -1);
+
+  if (thread_hint >= 0                    &&
+      thread_hint <  backtrace->n_threads &&
+      backtrace->threads[thread_hint].tid == tid)
+    {
+      return thread_hint;
+    }
+
+  for (i = 0; i < backtrace->n_threads; i++)
+    {
+      if (backtrace->threads[i].tid == tid)
+        return i;
+    }
+
+  return -1;
+}
+
+gint
+gimp_backtrace_get_n_frames (GimpBacktrace *backtrace,
+                             gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, 0);
+
+  return MAX (backtrace->threads[thread].n_frames - N_SKIPPED_FRAMES, 0);
+}
+
+guintptr
+gimp_backtrace_get_frame_address (GimpBacktrace *backtrace,
+                                  gint           thread,
+                                  gint           frame)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, 0);
+
+  frame = gimp_backtrace_normalize_frame (backtrace, thread, frame);
+
+  g_return_val_if_fail (frame >= N_SKIPPED_FRAMES &&
+                        frame <  backtrace->threads[thread].n_frames, 0);
+
+  return backtrace->threads[thread].frames[frame];
+}
+
+#ifdef HAVE_LIBBACKTRACE
+static void
+gimp_backtrace_syminfo_callback (GimpBacktraceAddressInfo *info,
+                                 guintptr                  pc,
+                                 const gchar              *symname,
+                                 guintptr                  symval,
+                                 guintptr                  symsize)
+{
+  if (symname)
+    g_strlcpy (info->symbol_name, symname, sizeof (info->symbol_name));
+
+  info->symbol_address = symval;
+}
+
+static gint
+gimp_backtrace_pcinfo_callback (GimpBacktraceAddressInfo *info,
+                                guintptr                  pc,
+                                const gchar              *filename,
+                                gint                      lineno,
+                                const gchar              *function)
+{
+  if (function)
+    g_strlcpy (info->symbol_name, function, sizeof (info->symbol_name));
+
+  if (filename)
+    g_strlcpy (info->source_file, filename, sizeof (info->source_file));
+
+  info->source_line = lineno;
+
+  return 0;
+}
+#endif /* HAVE_LIBBACKTRACE */
+
+gboolean
+gimp_backtrace_get_address_info (guintptr                  address,
+                                 GimpBacktraceAddressInfo *info)
+{
+  Dl_info  dl_info;
+  gboolean result = FALSE;
+
+  g_return_val_if_fail (info != NULL, FALSE);
+
+  info->object_name[0] = '\0';
+
+  info->symbol_name[0] = '\0';
+  info->symbol_address = 0;
+
+  info->source_file[0] = '\0';
+  info->source_line    = 0;
+
+  if (dladdr ((gpointer) address, &dl_info))
+    {
+      if (dl_info.dli_fname)
+        {
+          g_strlcpy (info->object_name, dl_info.dli_fname,
+                     sizeof (info->object_name));
+        }
+
+      if (dl_info.dli_sname)
+        {
+          g_strlcpy (info->symbol_name, dl_info.dli_sname,
+                     sizeof (info->symbol_name));
+        }
+
+      info->symbol_address = (guintptr) dl_info.dli_saddr;
+
+      result = TRUE;
+    }
+
+#ifdef HAVE_LIBBACKTRACE
+  if (backtrace_state)
+    {
+      backtrace_syminfo (
+        backtrace_state, address,
+        (backtrace_syminfo_callback) gimp_backtrace_syminfo_callback,
+        NULL,
+        info);
+
+      backtrace_pcinfo (
+        backtrace_state, address,
+        (backtrace_full_callback) gimp_backtrace_pcinfo_callback,
+        NULL,
+        info);
+
+      result = TRUE;
+    }
+#endif /* HAVE_LIBBACKTRACE */
+
+#ifdef HAVE_LIBUNWIND
+/* we use libunwind to get the symbol name, when available, even if dladdr() or
+ * libbacktrace already found one, since it provides more descriptive names in
+ * some cases, and, in particular, full symbol names for C++ lambdas.
+ *
+ * note that, in some cases, this can result in a discrepancy between the
+ * symbol name, and the corresponding source location.
+ */
+#if 0
+  if (! info->symbol_name[0])
+#endif
+    {
+      unw_context_t context = {};
+      unw_cursor_t  cursor;
+      unw_word_t    offset;
+
+      if (unw_init_local (&cursor, &context)         == 0 &&
+          unw_set_reg (&cursor, UNW_REG_IP, address) == 0 &&
+          unw_get_proc_name (&cursor,
+                             info->symbol_name, sizeof (info->symbol_name),
+                             &offset)                == 0)
+        {
+          info->symbol_address = address - offset;
+
+          result = TRUE;
+        }
+    }
+#endif /* HAVE_LIBUNWIND */
+
+  return result;
+}
+
+
+#endif /* GIMP_BACKTRACE_BACKEND_LINUX */
diff --git a/app/core/gimpbacktrace-none.c b/app/core/gimpbacktrace-none.c
new file mode 100644
index 0000000..087e8cb
--- /dev/null
+++ b/app/core/gimpbacktrace-none.c
@@ -0,0 +1,126 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpbacktrace-none.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "gimpbacktrace-backend.h"
+
+
+#ifdef GIMP_BACKTRACE_BACKEND_NONE
+
+
+#include "core-types.h"
+
+#include "gimpbacktrace.h"
+
+
+/*  public functions  */
+
+
+void
+gimp_backtrace_init (void)
+{
+}
+
+gboolean
+gimp_backtrace_start (void)
+{
+  return FALSE;
+}
+
+void
+gimp_backtrace_stop (void)
+{
+}
+
+GimpBacktrace *
+gimp_backtrace_new (gboolean include_current_thread)
+{
+  return NULL;
+}
+
+void
+gimp_backtrace_free (GimpBacktrace *backtrace)
+{
+  g_return_if_fail (backtrace == NULL);
+}
+
+gint
+gimp_backtrace_get_n_threads (GimpBacktrace *backtrace)
+{
+  g_return_val_if_reached (0);
+}
+
+guintptr
+gimp_backtrace_get_thread_id (GimpBacktrace *backtrace,
+                              gint           thread)
+{
+  g_return_val_if_reached (0);
+}
+
+const gchar *
+gimp_backtrace_get_thread_name (GimpBacktrace *backtrace,
+                                gint           thread)
+{
+  g_return_val_if_reached (NULL);
+}
+
+gboolean
+gimp_backtrace_is_thread_running (GimpBacktrace *backtrace,
+                                  gint           thread)
+{
+  g_return_val_if_reached (FALSE);
+}
+
+gint
+gimp_backtrace_find_thread_by_id (GimpBacktrace *backtrace,
+                                  guintptr       thread_id,
+                                  gint           thread_hint)
+{
+  g_return_val_if_reached (-1);
+}
+
+gint
+gimp_backtrace_get_n_frames (GimpBacktrace *backtrace,
+                             gint           thread)
+{
+  g_return_val_if_reached (0);
+}
+
+guintptr
+gimp_backtrace_get_frame_address (GimpBacktrace *backtrace,
+                                  gint           thread,
+                                  gint           frame)
+{
+  g_return_val_if_reached (0);
+}
+
+gboolean
+gimp_backtrace_get_address_info (guintptr                  address,
+                                 GimpBacktraceAddressInfo *info)
+{
+  return FALSE;
+}
+
+
+#endif /* GIMP_BACKTRACE_BACKEND_NONE */
diff --git a/app/core/gimpbacktrace-windows.c b/app/core/gimpbacktrace-windows.c
new file mode 100644
index 0000000..da1fb73
--- /dev/null
+++ b/app/core/gimpbacktrace-windows.c
@@ -0,0 +1,706 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpbacktrace-windows.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "gimpbacktrace-backend.h"
+
+
+#ifdef GIMP_BACKTRACE_BACKEND_WINDOWS
+
+
+#include <windows.h>
+#include <psapi.h>
+#include <tlhelp32.h>
+#include <dbghelp.h>
+
+#include <string.h>
+
+#include "core-types.h"
+
+#include "gimpbacktrace.h"
+
+
+#define MAX_N_THREADS               256
+#define MAX_N_FRAMES                256
+#define THREAD_ENUMERATION_INTERVAL G_TIME_SPAN_SECOND
+
+
+typedef struct _Thread              Thread;
+typedef struct _GimpBacktraceThread GimpBacktraceThread;
+
+
+struct _Thread
+{
+  DWORD  tid;
+
+  union
+  {
+    gchar   *name;
+    guint64  time;
+  };
+};
+
+struct _GimpBacktraceThread
+{
+  DWORD        tid;
+  const gchar *name;
+  guint64      time;
+  guint64      last_time;
+
+  guintptr     frames[MAX_N_FRAMES];
+  gint         n_frames;
+};
+
+struct _GimpBacktrace
+{
+  GimpBacktraceThread *threads;
+  gint                 n_threads;
+};
+
+
+/*  local function prototypes  */
+
+static inline gint   gimp_backtrace_normalize_frame   (GimpBacktrace       *backtrace,
+                                                       gint                 thread,
+                                                       gint                 frame);
+
+static void          gimp_backtrace_set_thread_name   (DWORD                tid,
+                                                       const gchar         *name);
+
+static gboolean      gimp_backtrace_enumerate_threads (void);
+
+static LONG WINAPI   gimp_backtrace_exception_handler (PEXCEPTION_POINTERS  info);
+
+
+/*  static variables  */
+
+static GMutex    mutex;
+static gint      n_initializations;
+static gboolean  initialized;
+Thread           threads[MAX_N_THREADS];
+gint             n_threads;
+gint64           last_thread_enumeration_time;
+Thread           thread_names[MAX_N_THREADS];
+gint             n_thread_names;
+gint             thread_names_spinlock;
+Thread           thread_times[MAX_N_THREADS];
+gint             n_thread_times;
+
+DWORD   WINAPI (* gimp_backtrace_SymSetOptions)        (DWORD            SymOptions);
+BOOL    WINAPI (* gimp_backtrace_SymInitialize)        (HANDLE           hProcess,
+                                                        PCSTR            UserSearchPath,
+                                                        BOOL             fInvadeProcess);
+BOOL    WINAPI (* gimp_backtrace_SymCleanup)           (HANDLE           hProcess);
+BOOL    WINAPI (* gimp_backtrace_SymFromAddr)          (HANDLE           hProcess,
+                                                        DWORD64          Address,
+                                                        PDWORD64         Displacement,
+                                                        PSYMBOL_INFO     Symbol);
+BOOL    WINAPI (* gimp_backtrace_SymGetLineFromAddr64) (HANDLE           hProcess,
+                                                        DWORD64          qwAddr,
+                                                        PDWORD           pdwDisplacement,
+                                                        PIMAGEHLP_LINE64 Line64);
+
+
+/*  private functions  */
+
+
+static inline gint
+gimp_backtrace_normalize_frame (GimpBacktrace *backtrace,
+                                gint           thread,
+                                gint           frame)
+{
+  if (frame >= 0)
+    return frame;
+  else
+    return backtrace->threads[thread].n_frames + frame;
+}
+
+static void
+gimp_backtrace_set_thread_name (DWORD        tid,
+                                const gchar *name)
+{
+  while (! g_atomic_int_compare_and_exchange (&thread_names_spinlock,
+                                              0, 1));
+
+  if (n_thread_names < MAX_N_THREADS)
+    {
+      Thread *thread = &thread_names[n_thread_names++];
+
+      thread->tid  = tid;
+      thread->name = g_strdup (name);
+    }
+
+  g_atomic_int_set (&thread_names_spinlock, 0);
+}
+
+static gboolean
+gimp_backtrace_enumerate_threads (void)
+{
+  HANDLE        hThreadSnap;
+  THREADENTRY32 te32;
+  DWORD         pid;
+  gint64        time;
+
+  time = g_get_monotonic_time ();
+
+  if (time - last_thread_enumeration_time < THREAD_ENUMERATION_INTERVAL)
+    return n_threads > 0;
+
+  last_thread_enumeration_time = time;
+
+  n_threads = 0;
+
+  hThreadSnap = CreateToolhelp32Snapshot (TH32CS_SNAPTHREAD, 0);
+
+  if (hThreadSnap == INVALID_HANDLE_VALUE)
+    return FALSE;
+
+  te32.dwSize = sizeof (te32);
+
+  if (! Thread32First (hThreadSnap, &te32))
+    {
+      CloseHandle (hThreadSnap);
+
+      return FALSE;
+    }
+
+  pid = GetCurrentProcessId ();
+
+  while (! g_atomic_int_compare_and_exchange (&thread_names_spinlock, 0, 1));
+
+  do
+    {
+      if (n_threads == MAX_N_THREADS)
+        break;
+
+      if (te32.th32OwnerProcessID == pid)
+        {
+          Thread *thread = &threads[n_threads++];
+          gint    i;
+
+          thread->tid  = te32.th32ThreadID;
+          thread->name = NULL;
+
+          for (i = n_thread_names - 1; i >= 0; i--)
+            {
+              if (thread->tid == thread_names[i].tid)
+                {
+                  thread->name = thread_names[i].name;
+
+                  break;
+                }
+            }
+        }
+    }
+  while (Thread32Next (hThreadSnap, &te32));
+
+  g_atomic_int_set (&thread_names_spinlock, 0);
+
+  CloseHandle (hThreadSnap);
+
+  return n_threads > 0;
+}
+
+static LONG WINAPI
+gimp_backtrace_exception_handler (PEXCEPTION_POINTERS info)
+{
+  #define EXCEPTION_SET_THREAD_NAME ((DWORD) 0x406D1388)
+
+  typedef struct _THREADNAME_INFO
+  {
+    DWORD  dwType;	    /* must be 0x1000                        */
+    LPCSTR szName;	    /* pointer to name (in user addr space)  */
+    DWORD  dwThreadID;	/* thread ID (-1=caller thread)          */
+    DWORD  dwFlags;	    /* reserved for future use, must be zero */
+  } THREADNAME_INFO;
+
+  if (info->ExceptionRecord                   != NULL                      &&
+      info->ExceptionRecord->ExceptionCode    == EXCEPTION_SET_THREAD_NAME &&
+      info->ExceptionRecord->NumberParameters * 
+      sizeof (ULONG_PTR)                      == sizeof (THREADNAME_INFO))
+    {
+      THREADNAME_INFO name_info;
+
+      memcpy (&name_info, info->ExceptionRecord->ExceptionInformation,
+              sizeof (name_info));
+
+      if (name_info.dwType == 0x1000)
+        {
+          DWORD tid = name_info.dwThreadID;
+
+          if (tid == -1)
+            tid = GetCurrentThreadId ();
+
+          gimp_backtrace_set_thread_name (tid, name_info.szName);
+
+          return EXCEPTION_CONTINUE_EXECUTION;
+        }
+    }
+
+  return EXCEPTION_CONTINUE_SEARCH;
+
+  #undef EXCEPTION_SET_THREAD_NAME
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_backtrace_init (void)
+{
+  gimp_backtrace_set_thread_name (GetCurrentThreadId (), g_get_prgname ());
+
+  AddVectoredExceptionHandler (TRUE, gimp_backtrace_exception_handler);
+}
+
+gboolean
+gimp_backtrace_start (void)
+{
+  g_mutex_lock (&mutex);
+
+  if (n_initializations == 0)
+    {
+      HMODULE hModule;
+      DWORD   options;
+
+      hModule = LoadLibraryA ("mgwhelp.dll");
+
+      #define INIT_PROC(name)                                    \
+        G_STMT_START                                             \
+          {                                                      \
+            gimp_backtrace_##name = name;                        \
+                                                                 \
+            if (hModule)                                         \
+              {                                                  \
+                gpointer proc = GetProcAddress (hModule, #name); \
+                                                                 \
+                if (proc)                                        \
+                  gimp_backtrace_##name = proc;                  \
+              }                                                  \
+          }                                                      \
+        G_STMT_END
+
+      INIT_PROC (SymSetOptions);
+      INIT_PROC (SymInitialize);
+      INIT_PROC (SymCleanup);
+      INIT_PROC (SymFromAddr);
+      INIT_PROC (SymGetLineFromAddr64);
+
+      #undef INIT_PROC
+
+      options = SymGetOptions ();
+
+      options &= ~SYMOPT_UNDNAME;
+      options |= SYMOPT_OMAP_FIND_NEAREST |
+                 SYMOPT_DEFERRED_LOADS    |
+                 SYMOPT_DEBUG;
+
+#ifdef ARCH_X86_64
+      options |= SYMOPT_INCLUDE_32BIT_MODULES;
+#endif
+
+      gimp_backtrace_SymSetOptions (options);
+
+      if (gimp_backtrace_SymInitialize (GetCurrentProcess (), NULL, TRUE))
+        {
+          n_threads                    = 0;
+          last_thread_enumeration_time = 0;
+          n_thread_times               = 0;
+
+          initialized = TRUE;
+        }
+    }
+
+  n_initializations++;
+
+  g_mutex_unlock (&mutex);
+
+  return initialized;
+}
+
+void
+gimp_backtrace_stop (void)
+{
+  g_return_if_fail (n_initializations > 0);
+
+  g_mutex_lock (&mutex);
+
+  n_initializations--;
+
+  if (n_initializations == 0)
+    {
+      if (initialized)
+        {
+          gimp_backtrace_SymCleanup (GetCurrentProcess ());
+
+          initialized = FALSE;
+        }
+    }
+
+  g_mutex_unlock (&mutex);
+}
+
+GimpBacktrace *
+gimp_backtrace_new (gboolean include_current_thread)
+{
+  GimpBacktrace *backtrace;
+  HANDLE         hProcess;
+  DWORD          tid;
+  gint           i;
+
+  if (! initialized)
+    return NULL;
+
+  g_mutex_lock (&mutex);
+
+  if (! gimp_backtrace_enumerate_threads ())
+    {
+      g_mutex_unlock (&mutex);
+
+      return NULL;
+    }
+
+  hProcess = GetCurrentProcess ();
+  tid      = GetCurrentThreadId ();
+
+  backtrace = g_slice_new (GimpBacktrace);
+
+  backtrace->threads   = g_new (GimpBacktraceThread, n_threads);
+  backtrace->n_threads = 0;
+
+  for (i = 0; i < n_threads; i++)
+    {
+      GimpBacktraceThread *thread  = &backtrace->threads[backtrace->n_threads];
+      HANDLE               hThread;
+      CONTEXT              context = {};
+      STACKFRAME64         frame   = {};
+      DWORD                machine_type;
+      FILETIME             creation_time;
+      FILETIME             exit_time;
+      FILETIME             kernel_time;
+      FILETIME             user_time;
+
+      if (! include_current_thread && threads[i].tid == tid)
+        continue;
+
+      hThread = OpenThread (THREAD_QUERY_INFORMATION |
+                            THREAD_GET_CONTEXT       |
+                            THREAD_SUSPEND_RESUME,
+                            FALSE,
+                            threads[i].tid);
+
+      if (hThread == INVALID_HANDLE_VALUE)
+        continue;
+
+      if (threads[i].tid != tid && SuspendThread (hThread) == (DWORD) -1)
+        {
+          CloseHandle (hThread);
+
+          continue;
+        }
+
+      context.ContextFlags = CONTEXT_FULL;
+
+      if (! GetThreadContext (hThread, &context))
+        {
+          if (threads[i].tid != tid)
+            ResumeThread (hThread);
+
+          CloseHandle (hThread);
+
+          continue;
+        }
+
+#ifdef ARCH_X86_64
+      machine_type = IMAGE_FILE_MACHINE_AMD64;
+      frame.AddrPC.Offset    = context.Rip;
+      frame.AddrPC.Mode      = AddrModeFlat;
+      frame.AddrStack.Offset = context.Rsp;
+      frame.AddrStack.Mode   = AddrModeFlat;
+      frame.AddrFrame.Offset = context.Rbp;
+      frame.AddrFrame.Mode   = AddrModeFlat;
+#elif defined (ARCH_X86)
+      machine_type = IMAGE_FILE_MACHINE_I386;
+      frame.AddrPC.Offset    = context.Eip;
+      frame.AddrPC.Mode      = AddrModeFlat;
+      frame.AddrStack.Offset = context.Esp;
+      frame.AddrStack.Mode   = AddrModeFlat;
+      frame.AddrFrame.Offset = context.Ebp;
+      frame.AddrFrame.Mode   = AddrModeFlat;
+#else
+#error unsupported architecture
+#endif
+
+      thread->tid       = threads[i].tid;
+      thread->name      = threads[i].name;
+      thread->last_time = 0;
+      thread->time      = 0;
+
+      thread->n_frames = 0;
+
+      while (thread->n_frames < MAX_N_FRAMES &&
+             StackWalk64 (machine_type, hProcess, hThread, &frame, &context,
+                          NULL,
+                          SymFunctionTableAccess64,
+                          SymGetModuleBase64,
+                          NULL))
+        {
+          thread->frames[thread->n_frames++] = frame.AddrPC.Offset;
+
+          if (frame.AddrPC.Offset == frame.AddrReturn.Offset)
+            break;
+        }
+
+      if (GetThreadTimes (hThread,
+                          &creation_time, &exit_time,
+                          &kernel_time, &user_time))
+        {
+          thread->time = (((guint64) kernel_time.dwHighDateTime << 32) |
+                          ((guint64) kernel_time.dwLowDateTime))       +
+                         (((guint64) user_time.dwHighDateTime   << 32) |
+                          ((guint64) user_time.dwLowDateTime));
+
+          if (i < n_thread_times && thread->tid == thread_times[i].tid)
+            {
+              thread->last_time = thread_times[i].time;
+            }
+          else
+            {
+              gint j;
+
+              for (j = 0; j < n_thread_times; j++)
+                {
+                  if (thread->tid == thread_times[j].tid)
+                    {
+                      thread->last_time = thread_times[j].time;
+
+                      break;
+                    }
+                }
+            }
+        }
+
+      if (threads[i].tid != tid)
+        ResumeThread (hThread);
+
+      CloseHandle (hThread);
+
+      if (thread->n_frames > 0)
+        backtrace->n_threads++;
+    }
+
+  n_thread_times = backtrace->n_threads;
+
+  for (i = 0; i < backtrace->n_threads; i++)
+    {
+      thread_times[i].tid  = backtrace->threads[i].tid;
+      thread_times[i].time = backtrace->threads[i].time;
+    }
+
+  g_mutex_unlock (&mutex);
+
+  if (backtrace->n_threads == 0)
+    {
+      gimp_backtrace_free (backtrace);
+
+      return NULL;
+    }
+
+  return backtrace;
+}
+
+void
+gimp_backtrace_free (GimpBacktrace *backtrace)
+{
+  if (backtrace)
+    {
+      g_free (backtrace->threads);
+
+      g_slice_free (GimpBacktrace, backtrace);
+    }
+}
+
+gint
+gimp_backtrace_get_n_threads (GimpBacktrace *backtrace)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+
+  return backtrace->n_threads;
+}
+
+guintptr
+gimp_backtrace_get_thread_id (GimpBacktrace *backtrace,
+                              gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, 0);
+
+  return backtrace->threads[thread].tid;
+}
+
+const gchar *
+gimp_backtrace_get_thread_name (GimpBacktrace *backtrace,
+                                gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, NULL);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, NULL);
+
+  return backtrace->threads[thread].name;
+}
+
+gboolean
+gimp_backtrace_is_thread_running (GimpBacktrace *backtrace,
+                                  gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, FALSE);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, FALSE);
+
+  return backtrace->threads[thread].time >
+         backtrace->threads[thread].last_time;
+}
+
+gint
+gimp_backtrace_find_thread_by_id (GimpBacktrace *backtrace,
+                                  guintptr       thread_id,
+                                  gint           thread_hint)
+{
+  DWORD tid = thread_id;
+  gint  i;
+
+  g_return_val_if_fail (backtrace != NULL, -1);
+
+  if (thread_hint >= 0                    &&
+      thread_hint <  backtrace->n_threads &&
+      backtrace->threads[thread_hint].tid == tid)
+    {
+      return thread_hint;
+    }
+
+  for (i = 0; i < backtrace->n_threads; i++)
+    {
+      if (backtrace->threads[i].tid == tid)
+        return i;
+    }
+
+  return -1;
+}
+
+gint
+gimp_backtrace_get_n_frames (GimpBacktrace *backtrace,
+                             gint           thread)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, 0);
+
+  return backtrace->threads[thread].n_frames;
+}
+
+guintptr
+gimp_backtrace_get_frame_address (GimpBacktrace *backtrace,
+                                  gint           thread,
+                                  gint           frame)
+{
+  g_return_val_if_fail (backtrace != NULL, 0);
+  g_return_val_if_fail (thread >= 0 && thread < backtrace->n_threads, 0);
+
+  frame = gimp_backtrace_normalize_frame (backtrace, thread, frame);
+
+  g_return_val_if_fail (frame >= 0 &&
+                        frame <  backtrace->threads[thread].n_frames, 0);
+
+  return backtrace->threads[thread].frames[frame];
+}
+
+gboolean
+gimp_backtrace_get_address_info (guintptr                  address,
+                                 GimpBacktraceAddressInfo *info)
+{
+  SYMBOL_INFO     *symbol_info;
+  HANDLE           hProcess;
+  HMODULE          hModule;
+  DWORD64          offset      = 0;
+  IMAGEHLP_LINE64  line        = {};
+  DWORD            line_offset = 0;
+  gboolean         result      = FALSE;
+
+  hProcess = GetCurrentProcess ();
+  hModule  = (HMODULE) (guintptr) SymGetModuleBase64 (hProcess, address);
+
+  if (hModule && GetModuleFileNameExA (hProcess, hModule,
+                                       info->object_name,
+                                       sizeof (info->object_name)))
+    {
+      result = TRUE;
+    }
+  else
+    {
+      info->object_name[0] = '\0';
+    }
+
+  symbol_info = g_malloc (sizeof (SYMBOL_INFO)       +
+                          sizeof (info->symbol_name) - 1);
+
+  symbol_info->SizeOfStruct = sizeof (SYMBOL_INFO);
+  symbol_info->MaxNameLen   = sizeof (info->symbol_name);
+
+  if (gimp_backtrace_SymFromAddr (hProcess, address,
+                                  &offset, symbol_info))
+    {
+      g_strlcpy (info->symbol_name, symbol_info->Name,
+                 sizeof (info->symbol_name));
+
+      info->symbol_address = offset ? address - offset : 0;
+
+      result = TRUE;
+    }
+  else
+    {
+      info->symbol_name[0] = '\0';
+      info->symbol_address = 0;
+    }
+
+  g_free (symbol_info);
+
+  if (gimp_backtrace_SymGetLineFromAddr64 (hProcess, address,
+                                           &line_offset, &line))
+    {
+      g_strlcpy (info->source_file, line.FileName,
+                 sizeof (info->source_file));
+
+      info->source_line = line.LineNumber;
+
+      result = TRUE;
+    }
+  else
+    {
+      info->source_file[0] = '\0';
+      info->source_line    = 0;
+    }
+
+  return result;
+}
+
+
+#endif /* GIMP_BACKTRACE_BACKEND_WINDOWS */
diff --git a/app/core/gimpbacktrace.h b/app/core/gimpbacktrace.h
new file mode 100644
index 0000000..8c172b2
--- /dev/null
+++ b/app/core/gimpbacktrace.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbacktrace.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BACKTRACE_H__
+#define __GIMP_BACKTRACE_H__
+
+
+typedef struct _GimpBacktraceAddressInfo GimpBacktraceAddressInfo;
+
+
+struct _GimpBacktraceAddressInfo
+{
+  gchar    object_name[256];
+
+  gchar    symbol_name[256];
+  guintptr symbol_address;
+
+  gchar    source_file[256];
+  gint     source_line;
+};
+
+
+void            gimp_backtrace_init              (void);
+
+gboolean        gimp_backtrace_start             (void);
+void            gimp_backtrace_stop              (void);
+
+GimpBacktrace * gimp_backtrace_new               (gboolean                 include_current_thread);
+void            gimp_backtrace_free              (GimpBacktrace           *backtrace);
+
+gint            gimp_backtrace_get_n_threads     (GimpBacktrace           *backtrace);
+guintptr        gimp_backtrace_get_thread_id     (GimpBacktrace           *backtrace,
+                                                  gint                     thread);
+const gchar   * gimp_backtrace_get_thread_name   (GimpBacktrace           *backtrace,
+                                                  gint                     thread);
+gboolean        gimp_backtrace_is_thread_running (GimpBacktrace           *backtrace,
+                                                  gint                     thread);
+
+gint            gimp_backtrace_find_thread_by_id (GimpBacktrace           *backtrace,
+                                                  guintptr                 thread_id,
+                                                  gint                     thread_hint);
+
+gint            gimp_backtrace_get_n_frames      (GimpBacktrace           *backtrace,
+                                                  gint                     thread);
+guintptr        gimp_backtrace_get_frame_address (GimpBacktrace           *backtrace,
+                                                  gint                     thread,
+                                                  gint                     frame);
+
+gboolean        gimp_backtrace_get_address_info  (guintptr                  address,
+                                                  GimpBacktraceAddressInfo *info);
+
+
+#endif  /*  __GIMP_BACKTRACE_H__  */
diff --git a/app/core/gimpbezierdesc.c b/app/core/gimpbezierdesc.c
new file mode 100644
index 0000000..6047544
--- /dev/null
+++ b/app/core/gimpbezierdesc.c
@@ -0,0 +1,202 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbezierdesc.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <cairo.h>
+
+#include "core-types.h"
+
+#include "gimpbezierdesc.h"
+#include "gimpboundary.h"
+
+
+GType
+gimp_bezier_desc_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpBezierDesc",
+                                         (GBoxedCopyFunc) gimp_bezier_desc_copy,
+                                         (GBoxedFreeFunc) gimp_bezier_desc_free);
+
+  return type;
+}
+
+GimpBezierDesc *
+gimp_bezier_desc_new (cairo_path_data_t *data,
+                      gint               n_data)
+{
+  GimpBezierDesc *desc;
+
+  g_return_val_if_fail (n_data == 0 || data != NULL, NULL);
+
+  desc = g_slice_new (GimpBezierDesc);
+
+  desc->status   = CAIRO_STATUS_SUCCESS;
+  desc->num_data = n_data;
+  desc->data     = data;
+
+  return desc;
+}
+
+static void
+add_polyline (GArray            *path_data,
+              const GimpVector2 *points,
+              gint               n_points,
+              gboolean           closed)
+{
+  GimpVector2       prev = { 0.0, 0.0, };
+  cairo_path_data_t pd;
+  gint              i;
+
+  for (i = 0; i < n_points; i++)
+    {
+      /* compress multiple identical coordinates */
+      if (i == 0 ||
+          prev.x != points[i].x ||
+          prev.y != points[i].y)
+        {
+          pd.header.type   = (i == 0) ? CAIRO_PATH_MOVE_TO : CAIRO_PATH_LINE_TO;
+          pd.header.length = 2;
+
+          g_array_append_val (path_data, pd);
+
+          pd.point.x = points[i].x;
+          pd.point.y = points[i].y;
+
+          g_array_append_val (path_data, pd);
+
+          prev = points[i];
+        }
+    }
+
+  /* close the polyline when needed */
+  if (closed)
+    {
+      pd.header.type   = CAIRO_PATH_CLOSE_PATH;
+      pd.header.length = 1;
+
+      g_array_append_val (path_data, pd);
+    }
+}
+
+GimpBezierDesc *
+gimp_bezier_desc_new_from_bound_segs (GimpBoundSeg *bound_segs,
+                                      gint          n_bound_segs,
+                                      gint          n_bound_groups)
+{
+  GArray      *path_data;
+  GimpVector2 *points;
+  gint         n_points;
+  gint         seg;
+  gint         i;
+  guint        path_data_len;
+
+  g_return_val_if_fail (bound_segs != NULL, NULL);
+  g_return_val_if_fail (n_bound_segs > 0, NULL);
+
+  path_data = g_array_new (FALSE, FALSE, sizeof (cairo_path_data_t));
+
+  points = g_new0 (GimpVector2, n_bound_segs + 4);
+
+  seg = 0;
+  n_points = 0;
+
+  points[n_points].x = (gdouble) (bound_segs[0].x1);
+  points[n_points].y = (gdouble) (bound_segs[0].y1);
+
+  n_points++;
+
+  for (i = 0; i < n_bound_groups; i++)
+    {
+      while (bound_segs[seg].x1 != -1 ||
+             bound_segs[seg].x2 != -1 ||
+             bound_segs[seg].y1 != -1 ||
+             bound_segs[seg].y2 != -1)
+        {
+          points[n_points].x = (gdouble) (bound_segs[seg].x1);
+          points[n_points].y = (gdouble) (bound_segs[seg].y1);
+
+          n_points++;
+          seg++;
+        }
+
+      /* Close the stroke points up */
+      points[n_points] = points[0];
+
+      n_points++;
+
+      add_polyline (path_data, points, n_points, TRUE);
+
+      n_points = 0;
+      seg++;
+
+      points[n_points].x = (gdouble) (bound_segs[seg].x1);
+      points[n_points].y = (gdouble) (bound_segs[seg].y1);
+
+      n_points++;
+    }
+
+  g_free (points);
+
+  path_data_len = path_data->len;
+
+  return gimp_bezier_desc_new ((cairo_path_data_t *) g_array_free (path_data, FALSE),
+                               path_data_len);
+}
+
+void
+gimp_bezier_desc_translate (GimpBezierDesc *desc,
+                            gdouble         offset_x,
+                            gdouble         offset_y)
+{
+  gint i, j;
+
+  g_return_if_fail (desc != NULL);
+
+  for (i = 0; i < desc->num_data; i += desc->data[i].header.length)
+    for (j = 1; j < desc->data[i].header.length; ++j)
+      {
+        desc->data[i+j].point.x += offset_x;
+        desc->data[i+j].point.y += offset_y;
+      }
+}
+
+GimpBezierDesc *
+gimp_bezier_desc_copy (const GimpBezierDesc *desc)
+{
+  g_return_val_if_fail (desc != NULL, NULL);
+
+  return gimp_bezier_desc_new (g_memdup (desc->data,
+                                         desc->num_data * sizeof (cairo_path_data_t)),
+                               desc->num_data);
+}
+
+void
+gimp_bezier_desc_free (GimpBezierDesc *desc)
+{
+  g_return_if_fail (desc != NULL);
+
+  g_free (desc->data);
+  g_slice_free (GimpBezierDesc, desc);
+}
diff --git a/app/core/gimpbezierdesc.h b/app/core/gimpbezierdesc.h
new file mode 100644
index 0000000..3d09dc2
--- /dev/null
+++ b/app/core/gimpbezierdesc.h
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbezierdesc.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BEZIER_DESC_H__
+#define __GIMP_BEZIER_DESC_H__
+
+
+#define          GIMP_TYPE_BEZIER_DESC     (gimp_bezier_desc_get_type ())
+
+GType            gimp_bezier_desc_get_type (void) G_GNUC_CONST;
+
+
+/* takes ownership of "data" */
+GimpBezierDesc * gimp_bezier_desc_new                 (cairo_path_data_t    *data,
+                                                       gint                  n_data);
+
+/* expects sorted GimpBoundSegs */
+GimpBezierDesc * gimp_bezier_desc_new_from_bound_segs (GimpBoundSeg         *bound_segs,
+                                                       gint                  n_bound_segs,
+                                                       gint                  n_bound_groups);
+
+void             gimp_bezier_desc_translate           (GimpBezierDesc       *desc,
+                                                       gdouble               offset_x,
+                                                       gdouble               offset_y);
+
+GimpBezierDesc * gimp_bezier_desc_copy                (const GimpBezierDesc *desc);
+void             gimp_bezier_desc_free                (GimpBezierDesc       *desc);
+
+
+#endif /* __GIMP_BEZIER_DESC_H__ */
diff --git a/app/core/gimpboundary.c b/app/core/gimpboundary.c
new file mode 100644
index 0000000..995242c
--- /dev/null
+++ b/app/core/gimpboundary.c
@@ -0,0 +1,1016 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpboundary.h"
+
+
+/* GimpBoundSeg array growth parameter */
+#define MAX_SEGS_INC  2048
+
+
+typedef struct _GimpBoundary GimpBoundary;
+
+struct _GimpBoundary
+{
+  /*  The array of segments  */
+  GimpBoundSeg *segs;
+  gint          num_segs;
+  gint          max_segs;
+
+  /*  The array of vertical segments  */
+  gint         *vert_segs;
+
+  /*  The empty segment arrays */
+  gint         *empty_segs_n;
+  gint         *empty_segs_c;
+  gint         *empty_segs_l;
+  gint          max_empty_segs;
+};
+
+
+/*  local function prototypes  */
+
+static GimpBoundary * gimp_boundary_new        (const GeglRectangle *region);
+static GimpBoundSeg * gimp_boundary_free       (GimpBoundary        *boundary,
+                                                gboolean             free_segs);
+
+static void           gimp_boundary_add_seg    (GimpBoundary        *bounrady,
+                                                gint                 x1,
+                                                gint                 y1,
+                                                gint                 x2,
+                                                gint                 y2,
+                                                gboolean             open);
+
+static void           find_empty_segs          (const GeglRectangle *region,
+                                                const gfloat        *line_data,
+                                                gint                 scanline,
+                                                gint                 empty_segs[],
+                                                gint                 max_empty,
+                                                gint                *num_empty,
+                                                GimpBoundaryType     type,
+                                                gint                 x1,
+                                                gint                 y1,
+                                                gint                 x2,
+                                                gint                 y2,
+                                                gfloat               threshold);
+static void           process_horiz_seg        (GimpBoundary        *boundary,
+                                                gint                 x1,
+                                                gint                 y1,
+                                                gint                 x2,
+                                                gint                 y2,
+                                                gboolean             open);
+static void           make_horiz_segs          (GimpBoundary        *boundary,
+                                                gint                 start,
+                                                gint                 end,
+                                                gint                 scanline,
+                                                gint                 empty[],
+                                                gint                 num_empty,
+                                                gint                 top);
+static GimpBoundary * generate_boundary        (GeglBuffer          *buffer,
+                                                const GeglRectangle *region,
+                                                const Babl          *format,
+                                                GimpBoundaryType     type,
+                                                gint                 x1,
+                                                gint                 y1,
+                                                gint                 x2,
+                                                gint                 y2,
+                                                gfloat               threshold);
+
+static gint       cmp_segptr_xy1_addr     (const GimpBoundSeg **seg_ptr_a,
+                                           const GimpBoundSeg **seg_ptr_b);
+static gint       cmp_segptr_xy2_addr     (const GimpBoundSeg **seg_ptr_a,
+                                           const GimpBoundSeg **seg_ptr_b);
+
+static gint       cmp_segptr_xy1          (const GimpBoundSeg **seg_ptr_a,
+                                           const GimpBoundSeg **seg_ptr_b);
+static gint       cmp_segptr_xy2          (const GimpBoundSeg **seg_ptr_a,
+                                           const GimpBoundSeg **seg_ptr_b);
+
+static const GimpBoundSeg * find_segment  (const GimpBoundSeg **segs_by_xy1,
+                                           const GimpBoundSeg **segs_by_xy2,
+                                           gint                 num_segs,
+                                           gint                 x,
+                                           gint                 y);
+
+static const GimpBoundSeg * find_segment_with_func (const GimpBoundSeg **segs,
+                                                    gint                 num_segs,
+                                                    const GimpBoundSeg  *search_seg,
+                                                    GCompareFunc         cmp_func);
+
+static void       simplify_subdivide  (const GimpBoundSeg  *segs,
+                                       gint                 start_idx,
+                                       gint                 end_idx,
+                                       GArray             **ret_points);
+
+
+/*  public functions  */
+
+/**
+ * gimp_boundary_find:
+ * @buffer:    a #GeglBuffer
+ * @format:    a #Babl float format representing the component to analyze
+ * @type:      type of bounds
+ * @x1:        left side of bounds
+ * @y1:        top side of bounds
+ * @x2:        right side of bounds
+ * @y2:        bottom side of bounds
+ * @threshold: pixel value of boundary line
+ * @num_segs:  number of returned #GimpBoundSeg's
+ *
+ * This function returns an array of #GimpBoundSeg's which describe all
+ * outlines along pixel value @threahold, optionally within specified
+ * bounds instead of the whole region.
+ *
+ * The @maskPR parameter can be any PixelRegion.  If the region has
+ * more than 1 bytes/pixel, the last byte of each pixel is used to
+ * determine the boundary outline.
+ *
+ * Return value: the boundary array.
+ **/
+GimpBoundSeg *
+gimp_boundary_find (GeglBuffer          *buffer,
+                    const GeglRectangle *region,
+                    const Babl          *format,
+                    GimpBoundaryType     type,
+                    int                  x1,
+                    int                  y1,
+                    int                  x2,
+                    int                  y2,
+                    gfloat               threshold,
+                    int                 *num_segs)
+{
+  GimpBoundary  *boundary;
+  GeglRectangle  rect = { 0, };
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (num_segs != NULL, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+  g_return_val_if_fail (babl_format_get_bytes_per_pixel (format) ==
+                        sizeof (gfloat), NULL);
+
+  if (region)
+    {
+      rect = *region;
+    }
+  else
+    {
+      rect.width  = gegl_buffer_get_width  (buffer);
+      rect.height = gegl_buffer_get_height (buffer);
+    }
+
+  boundary = generate_boundary (buffer, &rect, format, type,
+                                x1, y1, x2, y2, threshold);
+
+  *num_segs = boundary->num_segs;
+
+  return gimp_boundary_free (boundary, FALSE);
+}
+
+/**
+ * gimp_boundary_sort:
+ * @segs:       unsorted input segs.
+ * @num_segs:   number of input segs
+ * @num_groups: number of groups in the sorted segs
+ *
+ * This function takes an array of #GimpBoundSeg's as returned by
+ * gimp_boundary_find() and sorts it by contiguous groups. The returned
+ * array contains markers consisting of -1 coordinates and is
+ * @num_groups elements longer than @segs.
+ *
+ * Return value: the sorted segs
+ **/
+GimpBoundSeg *
+gimp_boundary_sort (const GimpBoundSeg *segs,
+                    gint                num_segs,
+                    gint               *num_groups)
+{
+  GimpBoundary        *boundary;
+  const GimpBoundSeg **segs_ptrs_by_xy1;
+  const GimpBoundSeg **segs_ptrs_by_xy2;
+  gint                 index;
+  gint                 x, y;
+  gint                 startx, starty;
+
+  g_return_val_if_fail ((segs == NULL && num_segs == 0) ||
+                        (segs != NULL && num_segs >  0), NULL);
+  g_return_val_if_fail (num_groups != NULL, NULL);
+
+  *num_groups = 0;
+
+  if (num_segs == 0)
+    return NULL;
+
+  /* prepare arrays with GimpBoundSeg pointers sorted by xy1 and xy2
+   * accordingly
+   */
+  segs_ptrs_by_xy1 = g_new (const GimpBoundSeg *, num_segs);
+  segs_ptrs_by_xy2 = g_new (const GimpBoundSeg *, num_segs);
+
+  for (index = 0; index < num_segs; index++)
+    {
+      segs_ptrs_by_xy1[index] = segs + index;
+      segs_ptrs_by_xy2[index] = segs + index;
+    }
+
+  qsort (segs_ptrs_by_xy1, num_segs, sizeof (GimpBoundSeg *),
+         (GCompareFunc) cmp_segptr_xy1_addr);
+  qsort (segs_ptrs_by_xy2, num_segs, sizeof (GimpBoundSeg *),
+         (GCompareFunc) cmp_segptr_xy2_addr);
+
+  for (index = 0; index < num_segs; index++)
+    ((GimpBoundSeg *) segs)[index].visited = FALSE;
+
+  boundary = gimp_boundary_new (NULL);
+
+  for (index = 0; index < num_segs; index++)
+    {
+      const GimpBoundSeg *cur_seg;
+
+      if (segs[index].visited)
+        continue;
+
+      gimp_boundary_add_seg (boundary,
+                             segs[index].x1, segs[index].y1,
+                             segs[index].x2, segs[index].y2,
+                             segs[index].open);
+
+      ((GimpBoundSeg *) segs)[index].visited = TRUE;
+
+      startx = segs[index].x1;
+      starty = segs[index].y1;
+      x = segs[index].x2;
+      y = segs[index].y2;
+
+      while ((cur_seg = find_segment (segs_ptrs_by_xy1, segs_ptrs_by_xy2,
+                                      num_segs, x, y)) != NULL)
+        {
+          /*  make sure ordering is correct  */
+          if (x == cur_seg->x1 && y == cur_seg->y1)
+            {
+              gimp_boundary_add_seg (boundary,
+                                     cur_seg->x1, cur_seg->y1,
+                                     cur_seg->x2, cur_seg->y2,
+                                     cur_seg->open);
+              x = cur_seg->x2;
+              y = cur_seg->y2;
+            }
+          else
+            {
+              gimp_boundary_add_seg (boundary,
+                                     cur_seg->x2, cur_seg->y2,
+                                     cur_seg->x1, cur_seg->y1,
+                                     cur_seg->open);
+              x = cur_seg->x1;
+              y = cur_seg->y1;
+            }
+
+          ((GimpBoundSeg *) cur_seg)->visited = TRUE;
+        }
+
+      if (G_UNLIKELY (x != startx || y != starty))
+        g_warning ("sort_boundary(): Unconnected boundary group!");
+
+      /*  Mark the end of a group  */
+      *num_groups = *num_groups + 1;
+      gimp_boundary_add_seg (boundary, -1, -1, -1, -1, 0);
+  }
+
+  g_free (segs_ptrs_by_xy1);
+  g_free (segs_ptrs_by_xy2);
+
+  return gimp_boundary_free (boundary, FALSE);
+}
+
+/**
+ * gimp_boundary_simplify:
+ * @sorted_segs: sorted input segs
+ * @num_groups:  number of groups in the sorted segs
+ * @num_segs:    number of returned segs.
+ *
+ * This function takes an array of #GimpBoundSeg's which has been sorted
+ * with gimp_boundary_sort() and reduces the number of segments while
+ * preserving the general shape as close as possible.
+ *
+ * Return value: the simplified segs.
+ **/
+GimpBoundSeg *
+gimp_boundary_simplify (GimpBoundSeg *sorted_segs,
+                        gint          num_groups,
+                        gint         *num_segs)
+{
+  GArray *new_bounds;
+  gint    i, seg;
+
+  g_return_val_if_fail ((sorted_segs == NULL && num_groups == 0) ||
+                        (sorted_segs != NULL && num_groups >  0), NULL);
+  g_return_val_if_fail (num_segs != NULL, NULL);
+
+  new_bounds = g_array_new (FALSE, FALSE, sizeof (GimpBoundSeg));
+
+  seg = 0;
+
+  for (i = 0; i < num_groups; i++)
+    {
+      gint start    = seg;
+      gint n_points = 0;
+
+      while (sorted_segs[seg].x1 != -1 ||
+             sorted_segs[seg].x2 != -1 ||
+             sorted_segs[seg].y1 != -1 ||
+             sorted_segs[seg].y2 != -1)
+        {
+          n_points++;
+          seg++;
+        }
+
+      if (n_points > 0)
+        {
+          GArray   *tmp_points;
+          GimpBoundSeg  tmp_seg;
+          gint      j;
+
+          tmp_points = g_array_new (FALSE, FALSE, sizeof (gint));
+
+          /* temporarily use the delimiter to close the polygon */
+          tmp_seg = sorted_segs[seg];
+          sorted_segs[seg] = sorted_segs[start];
+          simplify_subdivide (sorted_segs,
+                              start, start + n_points, &tmp_points);
+          sorted_segs[seg] = tmp_seg;
+
+          for (j = 0; j < tmp_points->len; j++)
+            g_array_append_val (new_bounds,
+                                sorted_segs[g_array_index (tmp_points,
+                                                           gint, j)]);
+
+          g_array_append_val (new_bounds, sorted_segs[seg]);
+
+          g_array_free (tmp_points, TRUE);
+        }
+
+      seg++;
+    }
+
+  *num_segs = new_bounds->len;
+
+  return (GimpBoundSeg *) g_array_free (new_bounds, FALSE);
+}
+
+void
+gimp_boundary_offset (GimpBoundSeg *segs,
+                      gint          num_segs,
+                      gint          off_x,
+                      gint          off_y)
+{
+  gint i;
+
+  g_return_if_fail ((segs == NULL && num_segs == 0) ||
+                    (segs != NULL && num_segs >  0));
+
+  for (i = 0; i < num_segs; i++)
+    {
+      /* don't offset sorting sentinels */
+      if (!(segs[i].x1 == -1 &&
+            segs[i].y1 == -1 &&
+            segs[i].x2 == -1 &&
+            segs[i].y2 == -1))
+        {
+          segs[i].x1 += off_x;
+          segs[i].y1 += off_y;
+          segs[i].x2 += off_x;
+          segs[i].y2 += off_y;
+        }
+    }
+}
+
+
+/*  private functions  */
+
+static GimpBoundary *
+gimp_boundary_new (const GeglRectangle *region)
+{
+  GimpBoundary *boundary = g_slice_new0 (GimpBoundary);
+
+  if (region)
+    {
+      gint i;
+
+      /*  array for determining the vertical line segments
+       *  which must be drawn
+       */
+      boundary->vert_segs = g_new (gint, region->width + region->x + 1);
+
+      for (i = 0; i <= (region->width + region->x); i++)
+        boundary->vert_segs[i] = -1;
+
+      /*  find the maximum possible number of empty segments
+       *  given the current mask
+       */
+      boundary->max_empty_segs = region->width + 3;
+
+      boundary->empty_segs_n = g_new (gint, boundary->max_empty_segs);
+      boundary->empty_segs_c = g_new (gint, boundary->max_empty_segs);
+      boundary->empty_segs_l = g_new (gint, boundary->max_empty_segs);
+    }
+
+  return boundary;
+}
+
+static GimpBoundSeg *
+gimp_boundary_free (GimpBoundary *boundary,
+                    gboolean      free_segs)
+{
+  GimpBoundSeg *segs = NULL;
+
+  if (free_segs)
+    g_free (boundary->segs);
+  else
+    segs = boundary->segs;
+
+  g_free (boundary->vert_segs);
+  g_free (boundary->empty_segs_n);
+  g_free (boundary->empty_segs_c);
+  g_free (boundary->empty_segs_l);
+
+  g_slice_free (GimpBoundary, boundary);
+
+  return segs;
+}
+
+static void
+gimp_boundary_add_seg (GimpBoundary *boundary,
+                       gint          x1,
+                       gint          y1,
+                       gint          x2,
+                       gint          y2,
+                       gboolean      open)
+{
+  if (boundary->num_segs >= boundary->max_segs)
+    {
+      boundary->max_segs += MAX_SEGS_INC;
+
+      boundary->segs = g_renew (GimpBoundSeg, boundary->segs, boundary->max_segs);
+    }
+
+  boundary->segs[boundary->num_segs].x1   = x1;
+  boundary->segs[boundary->num_segs].y1   = y1;
+  boundary->segs[boundary->num_segs].x2   = x2;
+  boundary->segs[boundary->num_segs].y2   = y2;
+  boundary->segs[boundary->num_segs].open = open;
+
+  boundary->num_segs ++;
+}
+
+static void
+find_empty_segs (const GeglRectangle *region,
+                 const gfloat        *line_data,
+                 gint                 scanline,
+                 gint                 empty_segs[],
+                 gint                 max_empty,
+                 gint                *num_empty,
+                 GimpBoundaryType     type,
+                 gint                 x1,
+                 gint                 y1,
+                 gint                 x2,
+                 gint                 y2,
+                 gfloat               threshold)
+{
+  gint start = 0;
+  gint end   = 0;
+  gint endx  = 0;
+  gint last  = -1;
+  gint l_num_empty;
+  gint x;
+
+  *num_empty = 0;
+
+  if (scanline < region->y || scanline >= (region->y + region->height))
+    {
+      empty_segs[(*num_empty)++] = 0;
+      empty_segs[(*num_empty)++] = G_MAXINT;
+      return;
+    }
+
+  if (type == GIMP_BOUNDARY_WITHIN_BOUNDS)
+    {
+      if (scanline < y1 || scanline >= y2)
+        {
+          empty_segs[(*num_empty)++] = 0;
+          empty_segs[(*num_empty)++] = G_MAXINT;
+          return;
+        }
+
+      start = x1;
+      end   = x2;
+    }
+  else if (type == GIMP_BOUNDARY_IGNORE_BOUNDS)
+    {
+      start = region->x;
+      end   = region->x + region->width;
+      if (scanline < y1 || scanline >= y2)
+        x2 = -1;
+    }
+
+  empty_segs[(*num_empty)++] = 0;
+
+  l_num_empty = *num_empty;
+
+  endx = end;
+
+  line_data += start;
+
+  for (x = start; x < end;)
+    {
+      if (type == GIMP_BOUNDARY_IGNORE_BOUNDS && (endx > x1 || x < x2))
+        {
+          for (; x < endx; x++)
+            {
+              gint val;
+
+              if (*line_data > threshold)
+                {
+                  if (x >= x1 && x < x2)
+                    val = -1;
+                  else
+                    val = 1;
+                }
+              else
+                {
+                  val = -1;
+                }
+
+              line_data++;
+
+              if (last != val)
+                empty_segs[l_num_empty++] = x;
+
+              last = val;
+            }
+        }
+      else
+        {
+          for (; x < endx; x++)
+            {
+              gint val;
+
+              if (*line_data > threshold)
+                val = 1;
+              else
+                val = -1;
+
+              line_data++;
+
+              if (last != val)
+                empty_segs[l_num_empty++] = x;
+
+              last = val;
+            }
+        }
+    }
+
+  *num_empty = l_num_empty;
+
+  if (last > 0)
+    empty_segs[(*num_empty)++] = x;
+
+  empty_segs[(*num_empty)++] = G_MAXINT;
+}
+
+static void
+process_horiz_seg (GimpBoundary *boundary,
+                   gint          x1,
+                   gint          y1,
+                   gint          x2,
+                   gint          y2,
+                   gboolean      open)
+{
+  /*  This procedure accounts for any vertical segments that must be
+      drawn to close in the horizontal segments.                     */
+
+  if (boundary->vert_segs[x1] >= 0)
+    {
+      gimp_boundary_add_seg (boundary, x1, boundary->vert_segs[x1], x1, y1, !open);
+      boundary->vert_segs[x1] = -1;
+    }
+  else
+    boundary->vert_segs[x1] = y1;
+
+  if (boundary->vert_segs[x2] >= 0)
+    {
+      gimp_boundary_add_seg (boundary, x2, boundary->vert_segs[x2], x2, y2, open);
+      boundary->vert_segs[x2] = -1;
+    }
+  else
+    boundary->vert_segs[x2] = y2;
+
+  gimp_boundary_add_seg (boundary, x1, y1, x2, y2, open);
+}
+
+static void
+make_horiz_segs (GimpBoundary *boundary,
+                 gint          start,
+                 gint          end,
+                 gint          scanline,
+                 gint          empty[],
+                 gint          num_empty,
+                 gint          top)
+{
+  gint empty_index;
+  gint e_s, e_e;    /* empty segment start and end values */
+
+  for (empty_index = 0; empty_index < num_empty; empty_index += 2)
+    {
+      e_s = *empty++;
+      e_e = *empty++;
+
+      if (e_s <= start && e_e >= end)
+        {
+          process_horiz_seg (boundary,
+                             start, scanline, end, scanline, top);
+        }
+      else if ((e_s > start && e_s < end) ||
+               (e_e < end && e_e > start))
+        {
+          process_horiz_seg (boundary,
+                             MAX (e_s, start), scanline,
+                             MIN (e_e, end), scanline, top);
+        }
+    }
+}
+
+static GimpBoundary *
+generate_boundary (GeglBuffer          *buffer,
+                   const GeglRectangle *region,
+                   const Babl          *format,
+                   GimpBoundaryType     type,
+                   gint                 x1,
+                   gint                 y1,
+                   gint                 x2,
+                   gint                 y2,
+                   gfloat               threshold)
+{
+  GimpBoundary  *boundary;
+  GeglRectangle  line_rect = { 0, };
+  gfloat        *line_data;
+  gint           scanline;
+  gint           i;
+  gint           start, end;
+  gint          *tmp_segs;
+
+  gint          num_empty_n = 0;
+  gint          num_empty_c = 0;
+  gint          num_empty_l = 0;
+
+  boundary = gimp_boundary_new (region);
+
+  line_rect.width  = gegl_buffer_get_width (buffer);
+  line_rect.height = 1;
+
+  line_data = g_alloca (sizeof (gfloat) * line_rect.width);
+
+  start = 0;
+  end   = 0;
+
+  if (type == GIMP_BOUNDARY_WITHIN_BOUNDS)
+    {
+      start = y1;
+      end   = y2;
+    }
+  else if (type == GIMP_BOUNDARY_IGNORE_BOUNDS)
+    {
+      start = region->y;
+      end   = region->y + region->height;
+    }
+
+  /*  Find the empty segments for the previous and current scanlines  */
+  find_empty_segs (region, NULL,
+                   start - 1, boundary->empty_segs_l,
+                   boundary->max_empty_segs, &num_empty_l,
+                   type, x1, y1, x2, y2,
+                   threshold);
+
+  line_rect.y = start;
+  gegl_buffer_get (buffer, &line_rect, 1.0, format,
+                   line_data, GEGL_AUTO_ROWSTRIDE,
+                   GEGL_ABYSS_NONE);
+
+  find_empty_segs (region, line_data,
+                   start, boundary->empty_segs_c,
+                   boundary->max_empty_segs, &num_empty_c,
+                   type, x1, y1, x2, y2,
+                   threshold);
+
+  for (scanline = start; scanline < end; scanline++)
+    {
+      /*  find the empty segment list for the next scanline  */
+      line_rect.y = scanline + 1;
+      if (scanline + 1 == end)
+        line_data = NULL;
+      else
+        gegl_buffer_get (buffer, &line_rect, 1.0, format,
+                         line_data, GEGL_AUTO_ROWSTRIDE,
+                         GEGL_ABYSS_NONE);
+
+      find_empty_segs (region, line_data,
+                       scanline + 1, boundary->empty_segs_n,
+                       boundary->max_empty_segs, &num_empty_n,
+                       type, x1, y1, x2, y2,
+                       threshold);
+
+      /*  process the segments on the current scanline  */
+      for (i = 1; i < num_empty_c - 1; i += 2)
+        {
+          make_horiz_segs (boundary,
+                           boundary->empty_segs_c [i],
+                           boundary->empty_segs_c [i+1],
+                           scanline,
+                           boundary->empty_segs_l, num_empty_l, 1);
+          make_horiz_segs (boundary,
+                           boundary->empty_segs_c [i],
+                           boundary->empty_segs_c [i+1],
+                           scanline + 1,
+                           boundary->empty_segs_n, num_empty_n, 0);
+        }
+
+      /*  get the next scanline of empty segments, swap others  */
+      tmp_segs               = boundary->empty_segs_l;
+      boundary->empty_segs_l = boundary->empty_segs_c;
+      num_empty_l            = num_empty_c;
+      boundary->empty_segs_c = boundary->empty_segs_n;
+      num_empty_c            = num_empty_n;
+      boundary->empty_segs_n = tmp_segs;
+    }
+
+  return boundary;
+}
+
+/*  sorting utility functions  */
+
+static inline gint
+cmp_xy (const gint ax,
+        const gint ay,
+        const gint bx,
+        const gint by)
+{
+  if (ay < by)
+    {
+      return -1;
+    }
+  else if (ay > by)
+    {
+      return 1;
+    }
+  else if (ax < bx)
+    {
+      return -1;
+    }
+  else if (ax > bx)
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+
+/*
+ * Compares (x1, y1) pairs in specified segments, using their addresses if
+ * (x1, y1) pairs are equal.
+ */
+static gint
+cmp_segptr_xy1_addr (const GimpBoundSeg **seg_ptr_a,
+                     const GimpBoundSeg **seg_ptr_b)
+{
+  const GimpBoundSeg *seg_a = *seg_ptr_a;
+  const GimpBoundSeg *seg_b = *seg_ptr_b;
+
+  gint result = cmp_xy (seg_a->x1, seg_a->y1, seg_b->x1, seg_b->y1);
+
+  if (result == 0)
+    {
+      if (seg_a < seg_b)
+        result = -1;
+      else if (seg_a > seg_b)
+        result = 1;
+    }
+
+  return result;
+}
+
+/*
+ * Compares (x2, y2) pairs in specified segments, using their addresses if
+ * (x2, y2) pairs are equal.
+ */
+static gint
+cmp_segptr_xy2_addr (const GimpBoundSeg **seg_ptr_a,
+                     const GimpBoundSeg **seg_ptr_b)
+{
+  const GimpBoundSeg *seg_a = *seg_ptr_a;
+  const GimpBoundSeg *seg_b = *seg_ptr_b;
+
+  gint result = cmp_xy (seg_a->x2, seg_a->y2, seg_b->x2, seg_b->y2);
+
+  if (result == 0)
+    {
+      if (seg_a < seg_b)
+        result = -1;
+      else if (seg_a > seg_b)
+        result = 1;
+    }
+
+  return result;
+}
+
+
+/*
+ * Compares (x1, y1) pairs in specified segments.
+ */
+static gint
+cmp_segptr_xy1 (const GimpBoundSeg **seg_ptr_a,
+                const GimpBoundSeg **seg_ptr_b)
+{
+  const GimpBoundSeg *seg_a = *seg_ptr_a, *seg_b = *seg_ptr_b;
+
+  return cmp_xy (seg_a->x1, seg_a->y1, seg_b->x1, seg_b->y1);
+}
+
+/*
+ * Compares (x2, y2) pairs in specified segments.
+ */
+static gint
+cmp_segptr_xy2 (const GimpBoundSeg **seg_ptr_a,
+                const GimpBoundSeg **seg_ptr_b)
+{
+  const GimpBoundSeg *seg_a = *seg_ptr_a;
+  const GimpBoundSeg *seg_b = *seg_ptr_b;
+
+  return cmp_xy (seg_a->x2, seg_a->y2, seg_b->x2, seg_b->y2);
+}
+
+
+static const GimpBoundSeg *
+find_segment (const GimpBoundSeg **segs_by_xy1,
+              const GimpBoundSeg **segs_by_xy2,
+              gint                 num_segs,
+              gint                 x,
+              gint                 y)
+{
+  const GimpBoundSeg *segptr_xy1;
+  const GimpBoundSeg *segptr_xy2;
+  GimpBoundSeg        search_seg;
+
+  search_seg.x1 = search_seg.x2 = x;
+  search_seg.y1 = search_seg.y2 = y;
+
+  segptr_xy1 = find_segment_with_func (segs_by_xy1, num_segs, &search_seg,
+                                       (GCompareFunc) cmp_segptr_xy1);
+  segptr_xy2 = find_segment_with_func (segs_by_xy2, num_segs, &search_seg,
+                                       (GCompareFunc) cmp_segptr_xy2);
+
+  /* return segment with smaller address */
+  if (segptr_xy1 != NULL && segptr_xy2 != NULL)
+    return MIN(segptr_xy1, segptr_xy2);
+  else if (segptr_xy1 != NULL)
+    return segptr_xy1;
+  else if (segptr_xy2 != NULL)
+    return segptr_xy2;
+
+  return NULL;
+}
+
+
+static const GimpBoundSeg *
+find_segment_with_func (const GimpBoundSeg **segs,
+                        gint                 num_segs,
+                        const GimpBoundSeg  *search_seg,
+                        GCompareFunc         cmp_func)
+{
+  const GimpBoundSeg **seg;
+  const GimpBoundSeg *found_seg = NULL;
+
+  seg = bsearch (&search_seg, segs, num_segs, sizeof (GimpBoundSeg *), cmp_func);
+
+  if (seg != NULL)
+    {
+      /* find first matching segment */
+      while (seg > segs && cmp_func (seg - 1, &search_seg) == 0)
+        seg--;
+
+      /* find first non-visited segment */
+      while (seg != segs + num_segs && cmp_func (seg, &search_seg) == 0)
+        if (!(*seg)->visited)
+          {
+            found_seg = *seg;
+            break;
+          }
+        else
+          seg++;
+    }
+
+    return found_seg;
+}
+
+
+/*  simplifying utility functions  */
+
+static void
+simplify_subdivide (const GimpBoundSeg *segs,
+                    gint                start_idx,
+                    gint                end_idx,
+                    GArray            **ret_points)
+{
+  gint maxdist_idx;
+  gint maxdist;
+  gint threshold;
+  gint i, dx, dy;
+
+  if (end_idx - start_idx < 2)
+    {
+      *ret_points = g_array_append_val (*ret_points, start_idx);
+      return;
+    }
+
+  maxdist = 0;
+
+  if (segs[start_idx].x1 == segs[end_idx].x1 &&
+      segs[start_idx].y1 == segs[end_idx].y1)
+    {
+      /* start and endpoint are at the same coordinates */
+      for (i = start_idx + 1; i < end_idx; i++)
+        {
+          /* compare the sqared distances */
+          gint dist = (SQR (segs[i].x1 - segs[start_idx].x1) +
+                       SQR (segs[i].y1 - segs[start_idx].y1));
+
+          if (dist > maxdist)
+            {
+              maxdist = dist;
+            }
+        }
+
+      threshold = 1;
+    }
+  else
+    {
+      dx = segs[end_idx].x1 - segs[start_idx].x1;
+      dy = segs[end_idx].y1 - segs[start_idx].y1;
+
+      for (i = start_idx + 1; i < end_idx; i++)
+        {
+          /* this is not really the euclidic distance, but is
+           * proportional for this part of the line
+           * (for the real distance we'd have to divide by
+           * (SQR(dx)+SQR(dy)))
+           */
+          gint dist = abs (dx * (segs[start_idx].y1 - segs[i].y1) -
+                           dy * (segs[start_idx].x1 - segs[i].x1));
+
+          if (dist > maxdist)
+            {
+              maxdist = dist;
+            }
+        }
+
+      /* threshold is chosen to catch 45 degree stairs */
+      threshold = SQR (dx) + SQR (dy);
+    }
+
+  if (maxdist <= threshold)
+    {
+      *ret_points = g_array_append_val (*ret_points, start_idx);
+      return;
+    }
+
+  /* Simons hack */
+  maxdist_idx = (start_idx + end_idx) / 2;
+
+  simplify_subdivide (segs, start_idx, maxdist_idx, ret_points);
+  simplify_subdivide (segs, maxdist_idx, end_idx, ret_points);
+}
diff --git a/app/core/gimpboundary.h b/app/core/gimpboundary.h
new file mode 100644
index 0000000..1e05eec
--- /dev/null
+++ b/app/core/gimpboundary.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_BOUNDARY_H__
+#define  __GIMP_BOUNDARY_H__
+
+
+/* half intensity for mask */
+#define GIMP_BOUNDARY_HALF_WAY 0.5
+
+
+typedef enum
+{
+  GIMP_BOUNDARY_WITHIN_BOUNDS,
+  GIMP_BOUNDARY_IGNORE_BOUNDS
+} GimpBoundaryType;
+
+
+struct _GimpBoundSeg
+{
+  gint   x1;
+  gint   y1;
+  gint   x2;
+  gint   y2;
+  guint  open    : 1;
+  guint  visited : 1;
+};
+
+
+GimpBoundSeg * gimp_boundary_find      (GeglBuffer          *buffer,
+                                        const GeglRectangle *region,
+                                        const Babl          *format,
+                                        GimpBoundaryType     type,
+                                        gint                 x1,
+                                        gint                 y1,
+                                        gint                 x2,
+                                        gint                 y2,
+                                        gfloat               threshold,
+                                        gint                *num_segs);
+GimpBoundSeg * gimp_boundary_sort      (const GimpBoundSeg  *segs,
+                                        gint                 num_segs,
+                                        gint                *num_groups);
+GimpBoundSeg * gimp_boundary_simplify  (GimpBoundSeg        *sorted_segs,
+                                        gint                 num_groups,
+                                        gint                *num_segs);
+
+/* offsets in-place */
+void       gimp_boundary_offset        (GimpBoundSeg        *segs,
+                                        gint                 num_segs,
+                                        gint                 off_x,
+                                        gint                 off_y);
+
+
+#endif  /*  __GIMP_BOUNDARY_H__  */
diff --git a/app/core/gimpbrush-boundary.c b/app/core/gimpbrush-boundary.c
new file mode 100644
index 0000000..9e5cbaa
--- /dev/null
+++ b/app/core/gimpbrush-boundary.c
@@ -0,0 +1,130 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpbezierdesc.h"
+#include "gimpboundary.h"
+#include "gimpbrush.h"
+#include "gimpbrush-boundary.h"
+#include "gimptempbuf.h"
+
+
+static GimpBezierDesc *
+gimp_brush_transform_boundary_exact (GimpBrush *brush,
+                                     gdouble    scale,
+                                     gdouble    aspect_ratio,
+                                     gdouble    angle,
+                                     gboolean   reflect,
+                                     gdouble    hardness)
+{
+  const GimpTempBuf *mask;
+
+  mask = gimp_brush_transform_mask (brush,
+                                    scale, aspect_ratio,
+                                    angle, reflect, hardness);
+
+  if (mask)
+    {
+      GeglBuffer    *buffer;
+      GimpBoundSeg  *bound_segs;
+      gint           n_bound_segs;
+
+      buffer = gimp_temp_buf_create_buffer ((GimpTempBuf *) mask);
+
+      bound_segs = gimp_boundary_find (buffer, NULL,
+                                       babl_format ("Y float"),
+                                       GIMP_BOUNDARY_WITHIN_BOUNDS,
+                                       0, 0,
+                                       gegl_buffer_get_width  (buffer),
+                                       gegl_buffer_get_height (buffer),
+                                       0.0,
+                                       &n_bound_segs);
+
+      g_object_unref (buffer);
+
+      if (bound_segs)
+        {
+          GimpBoundSeg *stroke_segs;
+          gint          n_stroke_groups;
+
+          stroke_segs = gimp_boundary_sort (bound_segs, n_bound_segs,
+                                            &n_stroke_groups);
+
+          g_free (bound_segs);
+
+          if (stroke_segs)
+            {
+              GimpBezierDesc *path;
+
+              path = gimp_bezier_desc_new_from_bound_segs (stroke_segs,
+                                                           n_bound_segs,
+                                                           n_stroke_groups);
+
+              g_free (stroke_segs);
+
+              return path;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+static GimpBezierDesc *
+gimp_brush_transform_boundary_approx (GimpBrush *brush,
+                                      gdouble    scale,
+                                      gdouble    aspect_ratio,
+                                      gdouble    angle,
+                                      gboolean   reflect,
+                                      gdouble    hardness)
+{
+  return gimp_brush_transform_boundary_exact (brush,
+                                              scale, aspect_ratio,
+                                              angle, reflect, hardness);
+}
+
+GimpBezierDesc *
+gimp_brush_real_transform_boundary (GimpBrush *brush,
+                                    gdouble    scale,
+                                    gdouble    aspect_ratio,
+                                    gdouble    angle,
+                                    gboolean   reflect,
+                                    gdouble    hardness,
+                                    gint      *width,
+                                    gint      *height)
+{
+  gimp_brush_transform_size (brush, scale, aspect_ratio, angle, reflect,
+                             width, height);
+
+  if (*width < 256 && *height < 256)
+    {
+      return gimp_brush_transform_boundary_exact (brush,
+                                                  scale, aspect_ratio,
+                                                  angle, reflect, hardness);
+    }
+
+  return gimp_brush_transform_boundary_approx (brush,
+                                               scale, aspect_ratio,
+                                               angle, reflect, hardness);
+}
diff --git a/app/core/gimpbrush-boundary.h b/app/core/gimpbrush-boundary.h
new file mode 100644
index 0000000..0bc99db
--- /dev/null
+++ b/app/core/gimpbrush-boundary.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_BOUNDARY_H__
+#define __GIMP_BRUSH_BOUNDARY_H__
+
+
+GimpBezierDesc * gimp_brush_real_transform_boundary (GimpBrush *brush,
+                                                     gdouble    scale,
+                                                     gdouble    aspect_ratio,
+                                                     gdouble    angle,
+                                                     gboolean   reflect,
+                                                     gdouble    hardness,
+                                                     gint      *width,
+                                                     gint      *height);
+
+
+#endif /* __GIMP_BRUSH_BOUNDARY_H__ */
diff --git a/app/core/gimpbrush-header.h b/app/core/gimpbrush-header.h
new file mode 100644
index 0000000..0e66715
--- /dev/null
+++ b/app/core/gimpbrush-header.h
@@ -0,0 +1,49 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_HEADER_H__
+#define __GIMP_BRUSH_HEADER_H__
+
+
+#define GIMP_BRUSH_MAGIC    (('G' << 24) + ('I' << 16) + \
+                             ('M' << 8)  + ('P' << 0))
+#define GIMP_BRUSH_MAX_SIZE 10000 /* Max size in either dimension in px */
+#define GIMP_BRUSH_MAX_NAME 256   /* Max length of the brush's name     */
+
+
+/*  All field entries are MSB  */
+
+typedef struct _GimpBrushHeader GimpBrushHeader;
+
+struct _GimpBrushHeader
+{
+  guint32   header_size;  /*  = sizeof (GimpBrushHeader) + brush name  */
+  guint32   version;      /*  brush file version #  */
+  guint32   width;        /*  width of brush  */
+  guint32   height;       /*  height of brush  */
+  guint32   bytes;        /*  depth of brush in bytes  */
+  guint32   magic_number; /*  GIMP brush magic number  */
+  guint32   spacing;      /*  brush spacing  */
+};
+
+/*  In a brush file, next comes the brush name, null-terminated.
+ *  After that comes the brush data -- width * height * bytes bytes of
+ *  it...
+ */
+
+
+#endif /* __GIMP_BRUSH_HEADER_H__ */
diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c
new file mode 100644
index 0000000..51bf1da
--- /dev/null
+++ b/app/core/gimpbrush-load.c
@@ -0,0 +1,1213 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrush-load.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpbrush.h"
+#include "gimpbrush-header.h"
+#include "gimpbrush-load.h"
+#include "gimpbrush-private.h"
+#include "gimppattern-header.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+/* stuff from abr2gbr Copyright (C) 2001 Marco Lamberto <lm@sunnyspot.org>  */
+/* the above is GPL  see http://the.sunnyspot.org/gimp/  */
+
+typedef struct _AbrHeader               AbrHeader;
+typedef struct _AbrBrushHeader          AbrBrushHeader;
+typedef struct _AbrSampledBrushHeader   AbrSampledBrushHeader;
+
+struct _AbrHeader
+{
+  gint16 version;
+  gint16 count;
+};
+
+struct _AbrBrushHeader
+{
+  gint16 type;
+  gint32 size;
+};
+
+struct _AbrSampledBrushHeader
+{
+  gint32   misc;
+  gint16   spacing;
+  gchar    antialiasing;
+  gint16   bounds[4];
+  gint32   bounds_long[4];
+  gint16   depth;
+  gboolean wide;
+};
+
+
+/*  local function prototypes  */
+
+static GList     * gimp_brush_load_abr_v12       (GDataInputStream  *input,
+                                                  AbrHeader         *abr_hdr,
+                                                  GFile             *file,
+                                                  GError           **error);
+static GList     * gimp_brush_load_abr_v6        (GDataInputStream  *input,
+                                                  AbrHeader         *abr_hdr,
+                                                  GFile             *file,
+                                                  GError           **error);
+static GimpBrush * gimp_brush_load_abr_brush_v12 (GDataInputStream  *input,
+                                                  AbrHeader         *abr_hdr,
+                                                  gint               index,
+                                                  GFile             *file,
+                                                  GError           **error);
+static GimpBrush * gimp_brush_load_abr_brush_v6  (GDataInputStream  *input,
+                                                  AbrHeader         *abr_hdr,
+                                                  gint32             max_offset,
+                                                  gint               index,
+                                                  GFile             *file,
+                                                  GError           **error);
+
+static gchar       abr_read_char                 (GDataInputStream  *input,
+                                                  GError           **error);
+static gint16      abr_read_short                (GDataInputStream  *input,
+                                                  GError           **error);
+static gint32      abr_read_long                 (GDataInputStream  *input,
+                                                  GError           **error);
+static gchar     * abr_read_ucs2_text            (GDataInputStream  *input,
+                                                  GError           **error);
+static gboolean    abr_supported                 (AbrHeader         *abr_hdr,
+                                                  GError           **error);
+static gboolean    abr_reach_8bim_section        (GDataInputStream  *input,
+                                                  const gchar       *name,
+                                                  GError           **error);
+static gboolean    abr_rle_decode                (GDataInputStream  *input,
+                                                  gchar             *buffer,
+                                                  gsize              buffer_size,
+                                                  gint32             height,
+                                                  GError           **error);
+
+
+/*  public functions  */
+
+GList *
+gimp_brush_load (GimpContext   *context,
+                 GFile         *file,
+                 GInputStream  *input,
+                 GError       **error)
+{
+  GimpBrush *brush;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  brush = gimp_brush_load_brush (context, file, input, error);
+  if (! brush)
+    return NULL;
+
+  return g_list_prepend (NULL, brush);
+}
+
+GimpBrush *
+gimp_brush_load_brush (GimpContext   *context,
+                       GFile         *file,
+                       GInputStream  *input,
+                       GError       **error)
+{
+  GimpBrush       *brush;
+  gsize            bn_size;
+  GimpBrushHeader  header;
+  gchar           *name = NULL;
+  guchar          *mask;
+  gsize            bytes_read;
+  gssize           i, size;
+  gboolean         success = TRUE;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /*  read the header  */
+  if (! g_input_stream_read_all (input, &header, sizeof (header),
+                                 &bytes_read, NULL, error) ||
+      bytes_read != sizeof (header))
+    {
+      return NULL;
+    }
+
+  /*  rearrange the bytes in each unsigned int  */
+  header.header_size  = g_ntohl (header.header_size);
+  header.version      = g_ntohl (header.version);
+  header.width        = g_ntohl (header.width);
+  header.height       = g_ntohl (header.height);
+  header.bytes        = g_ntohl (header.bytes);
+  header.magic_number = g_ntohl (header.magic_number);
+  header.spacing      = g_ntohl (header.spacing);
+
+  /*  Check for correct file format */
+
+  if (header.width == 0)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: Width = 0."));
+      return NULL;
+    }
+
+  if (header.height == 0)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: Height = 0."));
+      return NULL;
+    }
+
+  if (header.bytes == 0)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: Bytes = 0."));
+      return NULL;
+    }
+
+  if (header.width  > GIMP_BRUSH_MAX_SIZE ||
+      header.height > GIMP_BRUSH_MAX_SIZE ||
+      G_MAXSIZE / header.width / header.height / MAX (4, header.bytes) < 1)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: %dx%d over max size."),
+                   header.width, header.height);
+      return NULL;
+    }
+
+  switch (header.version)
+    {
+    case 1:
+      /*  If this is a version 1 brush, set the fp back 8 bytes  */
+      if (! g_seekable_seek (G_SEEKABLE (input), -8, G_SEEK_CUR,
+                             NULL, error))
+        return NULL;
+
+      header.header_size += 8;
+      /*  spacing is not defined in version 1  */
+      header.spacing = 25;
+      break;
+
+    case 3:  /*  cinepaint brush  */
+      if (header.bytes == 18  /* FLOAT16_GRAY_GIMAGE */)
+        {
+          header.bytes = 2;
+        }
+      else
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Fatal parse error in brush file: Unknown depth %d."),
+                       header.bytes);
+          return NULL;
+        }
+      /*  fallthrough  */
+
+    case 2:
+      if (header.magic_number == GIMP_BRUSH_MAGIC)
+        break;
+
+    default:
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: Unknown version %d."),
+                   header.version);
+      return NULL;
+    }
+
+  if (header.header_size < sizeof (GimpBrushHeader))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Unsupported brush format"));
+      return NULL;
+    }
+
+  /*  Read in the brush name  */
+  if ((bn_size = (header.header_size - sizeof (header))))
+    {
+      gchar *utf8;
+
+      if (bn_size > GIMP_BRUSH_MAX_NAME)
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Invalid header data in '%s': "
+                         "Brush name is too long: %lu"),
+                       gimp_file_get_utf8_name (file),
+                       (gulong) bn_size);
+          return NULL;
+        }
+
+      name = g_new0 (gchar, bn_size + 1);
+
+      if (! g_input_stream_read_all (input, name, bn_size,
+                                     &bytes_read, NULL, error) ||
+          bytes_read != bn_size)
+        {
+          g_free (name);
+          return NULL;
+        }
+
+      utf8 = gimp_any_to_utf8 (name, bn_size - 1,
+                               _("Invalid UTF-8 string in brush file '%s'."),
+                               gimp_file_get_utf8_name (file));
+      g_free (name);
+      name = utf8;
+    }
+
+  if (! name)
+    name = g_strdup (_("Unnamed"));
+
+  brush = g_object_new (GIMP_TYPE_BRUSH,
+                        "name",      name,
+                        "mime-type", "image/x-gimp-gbr",
+                        NULL);
+  g_free (name);
+
+  brush->priv->mask = gimp_temp_buf_new (header.width, header.height,
+                                         babl_format ("Y u8"));
+
+  mask = gimp_temp_buf_get_data (brush->priv->mask);
+  size = header.width * header.height * header.bytes;
+
+  switch (header.bytes)
+    {
+    case 1:
+      success = (g_input_stream_read_all (input, mask, size,
+                                          &bytes_read, NULL, error) &&
+                 bytes_read == size);
+
+      /* For backwards-compatibility, check if a pattern follows.
+       * The obsolete .gpb format did it this way.
+       */
+      if (success)
+        {
+          GimpPatternHeader ph;
+          goffset           rewind;
+
+          rewind = g_seekable_tell (G_SEEKABLE (input));
+
+          if (g_input_stream_read_all (input, &ph, sizeof (GimpPatternHeader),
+                                       &bytes_read, NULL, NULL) &&
+              bytes_read == sizeof (GimpPatternHeader))
+            {
+              /*  rearrange the bytes in each unsigned int  */
+              ph.header_size  = g_ntohl (ph.header_size);
+              ph.version      = g_ntohl (ph.version);
+              ph.width        = g_ntohl (ph.width);
+              ph.height       = g_ntohl (ph.height);
+              ph.bytes        = g_ntohl (ph.bytes);
+              ph.magic_number = g_ntohl (ph.magic_number);
+
+              if (ph.magic_number == GIMP_PATTERN_MAGIC        &&
+                  ph.version      == 1                         &&
+                  ph.header_size  > sizeof (GimpPatternHeader) &&
+                  ph.bytes        == 3                         &&
+                  ph.width        == header.width              &&
+                  ph.height       == header.height             &&
+                  g_input_stream_skip (input,
+                                       ph.header_size -
+                                       sizeof (GimpPatternHeader),
+                                       NULL, NULL) ==
+                  ph.header_size - sizeof (GimpPatternHeader))
+                {
+                  guchar *pixmap;
+                  gssize  pixmap_size;
+
+                  brush->priv->pixmap =
+                    gimp_temp_buf_new (header.width, header.height,
+                                       babl_format ("R'G'B' u8"));
+
+                  pixmap = gimp_temp_buf_get_data (brush->priv->pixmap);
+
+                  pixmap_size = gimp_temp_buf_get_data_size (brush->priv->pixmap);
+
+                  success = (g_input_stream_read_all (input, pixmap,
+                                                      pixmap_size,
+                                                      &bytes_read, NULL,
+                                                      error) &&
+                             bytes_read == pixmap_size);
+                }
+              else
+                {
+                  /*  seek back if pattern wasn't found  */
+                  success = g_seekable_seek (G_SEEKABLE (input),
+                                             rewind, G_SEEK_SET,
+                                             NULL, error);
+                }
+            }
+        }
+      break;
+
+    case 2:  /*  cinepaint brush, 16 bit floats  */
+      {
+        guchar buf[8 * 1024];
+
+        for (i = 0; success && i < size;)
+          {
+            gssize bytes = MIN (size - i, sizeof (buf));
+
+            success = (g_input_stream_read_all (input, buf, bytes,
+                                                &bytes_read, NULL, error) &&
+                       bytes_read == bytes);
+
+            if (success)
+              {
+                guint16 *b = (guint16 *) buf;
+
+                i += bytes;
+
+                for (; bytes > 0; bytes -= 2, mask++, b++)
+                  {
+                    union
+                    {
+                      guint16 u[2];
+                      gfloat  f;
+                    } short_float;
+
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                    short_float.u[0] = 0;
+                    short_float.u[1] = GUINT16_FROM_BE (*b);
+#else
+                    short_float.u[0] = GUINT16_FROM_BE (*b);
+                    short_float.u[1] = 0;
+#endif
+
+                    *mask = (guchar) (short_float.f * 255.0 + 0.5);
+                  }
+              }
+          }
+      }
+      break;
+
+    case 4:
+      {
+        guchar *pixmap;
+        guchar  buf[8 * 1024];
+
+        brush->priv->pixmap = gimp_temp_buf_new (header.width, header.height,
+                                                 babl_format ("R'G'B' u8"));
+        pixmap = gimp_temp_buf_get_data (brush->priv->pixmap);
+
+        for (i = 0; success && i < size;)
+          {
+            gssize bytes = MIN (size - i, sizeof (buf));
+
+            success = (g_input_stream_read_all (input, buf, bytes,
+                                                &bytes_read, NULL, error) &&
+                       bytes_read == bytes);
+
+            if (success)
+              {
+                guchar *b = buf;
+
+                i += bytes;
+
+                for (; bytes > 0; bytes -= 4, pixmap += 3, mask++, b += 4)
+                  {
+                    pixmap[0] = b[0];
+                    pixmap[1] = b[1];
+                    pixmap[2] = b[2];
+
+                    mask[0]   = b[3];
+                  }
+              }
+          }
+      }
+      break;
+
+    default:
+      g_object_unref (brush);
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file:\n"
+                     "Unsupported brush depth %d\n"
+                     "GIMP brushes must be GRAY or RGBA."),
+                   header.bytes);
+      return NULL;
+    }
+
+  if (! success)
+    {
+      g_object_unref (brush);
+      return NULL;
+    }
+
+  brush->priv->spacing  = header.spacing;
+  brush->priv->x_axis.x = header.width  / 2.0;
+  brush->priv->x_axis.y = 0.0;
+  brush->priv->y_axis.x = 0.0;
+  brush->priv->y_axis.y = header.height / 2.0;
+
+  return brush;
+}
+
+GList *
+gimp_brush_load_abr (GimpContext   *context,
+                     GFile         *file,
+                     GInputStream  *input,
+                     GError       **error)
+{
+  GDataInputStream *data_input;
+  AbrHeader         abr_hdr;
+  GList            *brush_list = NULL;
+  GError           *my_error   = NULL;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  data_input = g_data_input_stream_new (input);
+
+  g_data_input_stream_set_byte_order (data_input,
+                                      G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN);
+
+  abr_hdr.version = abr_read_short (data_input, &my_error);
+  if (my_error)
+    goto done;
+
+  /* sub-version for ABR v6 */
+  abr_hdr.count = abr_read_short (data_input, &my_error);
+  if (my_error)
+    goto done;
+
+  if (abr_supported (&abr_hdr, &my_error))
+    {
+      switch (abr_hdr.version)
+        {
+        case 1:
+        case 2:
+          brush_list = gimp_brush_load_abr_v12 (data_input, &abr_hdr,
+                                                file, &my_error);
+          break;
+
+        case 10:
+        case 6:
+          brush_list = gimp_brush_load_abr_v6 (data_input, &abr_hdr,
+                                               file, &my_error);
+          break;
+        }
+    }
+
+ done:
+
+  g_object_unref (data_input);
+
+  if (! brush_list)
+    {
+      if (! my_error)
+        g_set_error (&my_error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                     _("Unable to decode abr format version %d."),
+                     abr_hdr.version);
+    }
+
+  if (my_error)
+    g_propagate_error (error, my_error);
+
+  return g_list_reverse (brush_list);
+}
+
+
+/*  private functions  */
+
+static GList *
+gimp_brush_load_abr_v12 (GDataInputStream  *input,
+                         AbrHeader         *abr_hdr,
+                         GFile             *file,
+                         GError           **error)
+{
+  GList *brush_list = NULL;
+  gint   i;
+
+  for (i = 0; i < abr_hdr->count; i++)
+    {
+      GimpBrush *brush;
+      GError    *my_error = NULL;
+
+      brush = gimp_brush_load_abr_brush_v12 (input, abr_hdr, i,
+                                             file, &my_error);
+
+      /*  a NULL brush without an error means an unsupported brush
+       *  type was encountered, silently skip it and try the next one
+       */
+
+      if (brush)
+        {
+          brush_list = g_list_prepend (brush_list, brush);
+        }
+      else if (my_error)
+        {
+          g_propagate_error (error, my_error);
+          break;
+        }
+    }
+
+  return brush_list;
+}
+
+static GList *
+gimp_brush_load_abr_v6 (GDataInputStream  *input,
+                        AbrHeader         *abr_hdr,
+                        GFile             *file,
+                        GError           **error)
+{
+  GList   *brush_list = NULL;
+  gint32   sample_section_size;
+  goffset  sample_section_end;
+  gint     i = 1;
+
+  if (! abr_reach_8bim_section (input, "samp", error))
+    return brush_list;
+
+  sample_section_size = abr_read_long (input, error);
+  if (error && *error)
+    return brush_list;
+
+  sample_section_end = (sample_section_size +
+                        g_seekable_tell (G_SEEKABLE (input)));
+
+  while (g_seekable_tell (G_SEEKABLE (input)) < sample_section_end)
+    {
+      GimpBrush *brush;
+      GError    *my_error = NULL;
+
+      brush = gimp_brush_load_abr_brush_v6 (input, abr_hdr, sample_section_end,
+                                            i, file, &my_error);
+
+      /*  a NULL brush without an error means an unsupported brush
+       *  type was encountered, silently skip it and try the next one
+       */
+
+      if (brush)
+        {
+          brush_list = g_list_prepend (brush_list, brush);
+        }
+      else if (my_error)
+        {
+          g_propagate_error (error, my_error);
+          break;
+        }
+
+      i++;
+    }
+
+  return brush_list;
+}
+
+static GimpBrush *
+gimp_brush_load_abr_brush_v12 (GDataInputStream  *input,
+                               AbrHeader         *abr_hdr,
+                               gint               index,
+                               GFile             *file,
+                               GError           **error)
+{
+  GimpBrush      *brush = NULL;
+  AbrBrushHeader  abr_brush_hdr;
+
+  abr_brush_hdr.type = abr_read_short (input, error);
+  if (error && *error)
+    return NULL;
+
+  abr_brush_hdr.size = abr_read_long (input, error);
+  if (error && *error)
+    return NULL;
+
+  if (abr_brush_hdr.size < 0)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: "
+                     "Brush size value corrupt."));
+      return NULL;
+    }
+
+  /*  g_print(" + BRUSH\n | << type: %i  block size: %i bytes\n",
+   *          abr_brush_hdr.type, abr_brush_hdr.size);
+   */
+
+  switch (abr_brush_hdr.type)
+    {
+    case 1: /* computed brush */
+      /* FIXME: support it!
+       *
+       * We can probabaly feed the info into the generated brush code
+       * and get a usable brush back. It seems to support the same
+       * types -akl
+       */
+      g_printerr ("WARNING: computed brush unsupported, skipping.\n");
+      g_seekable_seek (G_SEEKABLE (input), abr_brush_hdr.size,
+                       G_SEEK_CUR, NULL, NULL);
+      break;
+
+    case 2: /* sampled brush */
+      {
+        AbrSampledBrushHeader  abr_sampled_brush_hdr;
+        gint                   width, height;
+        gint                   bytes;
+        gint                   size;
+        guchar                *mask;
+        gint                   i;
+        gchar                 *name;
+        gchar                 *sample_name = NULL;
+        gchar                 *tmp;
+        gshort                 compress;
+
+        abr_sampled_brush_hdr.misc = abr_read_long (input, error);
+        if (error && *error)
+          break;
+
+        abr_sampled_brush_hdr.spacing = abr_read_short (input, error);
+        if (error && *error)
+          break;
+
+        if (abr_hdr->version == 2)
+          {
+            sample_name = abr_read_ucs2_text (input, error);
+            if (error && *error)
+              break;
+          }
+
+        abr_sampled_brush_hdr.antialiasing = abr_read_char (input, error);
+        if (error && *error)
+          break;
+
+        for (i = 0; i < 4; i++)
+          {
+            abr_sampled_brush_hdr.bounds[i] = abr_read_short (input, error);
+            if (error && *error)
+              break;
+          }
+
+        for (i = 0; i < 4; i++)
+          {
+            abr_sampled_brush_hdr.bounds_long[i] = abr_read_long (input, error);
+            if (error && *error)
+              break;
+          }
+
+        abr_sampled_brush_hdr.depth = abr_read_short (input, error);
+        if (error && *error)
+          break;
+
+        height = (abr_sampled_brush_hdr.bounds_long[2] -
+                  abr_sampled_brush_hdr.bounds_long[0]); /* bottom - top */
+        width  = (abr_sampled_brush_hdr.bounds_long[3] -
+                  abr_sampled_brush_hdr.bounds_long[1]); /* right - left */
+        bytes  = abr_sampled_brush_hdr.depth >> 3;
+
+        /* g_print ("width %i  height %i  bytes %i\n", width, height, bytes); */
+
+        if (width  < 1 || width  > 10000 ||
+            height < 1 || height > 10000 ||
+            bytes  < 1 || bytes  > 1     ||
+            G_MAXSIZE / width / height / bytes < 1)
+          {
+            g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                         _("Fatal parse error in brush file: "
+                           "Brush dimensions out of range."));
+            break;
+          }
+
+        abr_sampled_brush_hdr.wide = height > 16384;
+
+        if (abr_sampled_brush_hdr.wide)
+          {
+            /* FIXME: support wide brushes */
+
+            g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                         _("Fatal parse error in brush file: "
+                           "Wide brushes are not supported."));
+            break;
+          }
+
+        tmp = g_path_get_basename (gimp_file_get_utf8_name (file));
+        if (! sample_name)
+          {
+            /* build name from filename and index */
+            name = g_strdup_printf ("%s-%03d", tmp, index);
+          }
+        else
+          {
+            /* build name from filename and sample name */
+            name = g_strdup_printf ("%s-%s", tmp, sample_name);
+            g_free (sample_name);
+          }
+        g_free (tmp);
+
+        brush = g_object_new (GIMP_TYPE_BRUSH,
+                              "name",      name,
+                              /*  FIXME: MIME type!!  */
+                              "mime-type", "application/x-photoshop-abr",
+                              NULL);
+
+        g_free (name);
+
+        brush->priv->spacing  = abr_sampled_brush_hdr.spacing;
+        brush->priv->x_axis.x = width / 2.0;
+        brush->priv->x_axis.y = 0.0;
+        brush->priv->y_axis.x = 0.0;
+        brush->priv->y_axis.y = height / 2.0;
+        brush->priv->mask     = gimp_temp_buf_new (width, height,
+                                                   babl_format ("Y u8"));
+
+        mask = gimp_temp_buf_get_data (brush->priv->mask);
+        size = width * height * bytes;
+
+        compress = abr_read_char (input, error);
+        if (error && *error)
+          {
+            g_object_unref (brush);
+            brush = NULL;
+            break;
+          }
+
+        /* g_print(" | << size: %dx%d %d bit (%d bytes) %s\n",
+         *         width, height, abr_sampled_brush_hdr.depth, size,
+         *         comppres ? "compressed" : "raw");
+         */
+
+        if (! compress)
+          {
+            gsize bytes_read;
+
+            if (! g_input_stream_read_all (G_INPUT_STREAM (input),
+                                           mask, size,
+                                           &bytes_read, NULL, error) ||
+                bytes_read != size)
+              {
+                g_object_unref (brush);
+                brush = NULL;
+                break;
+              }
+          }
+        else
+          {
+            if (! abr_rle_decode (input, (gchar *) mask, size, height, error))
+              {
+                g_object_unref (brush);
+                brush = NULL;
+                break;
+              }
+          }
+      }
+      break;
+
+    default:
+      g_printerr ("WARNING: unknown brush type, skipping.\n");
+      g_seekable_seek (G_SEEKABLE (input), abr_brush_hdr.size,
+                       G_SEEK_CUR, NULL, NULL);
+      break;
+    }
+
+  return brush;
+}
+
+static GimpBrush *
+gimp_brush_load_abr_brush_v6 (GDataInputStream  *input,
+                              AbrHeader         *abr_hdr,
+                              gint32             max_offset,
+                              gint               index,
+                              GFile             *file,
+                              GError           **error)
+{
+  GimpBrush *brush = NULL;
+  guchar    *mask;
+
+  gint32     brush_size;
+  gint32     brush_end;
+  goffset    next_brush;
+
+  gint32     top, left, bottom, right;
+  gint16     depth;
+  gchar      compress;
+
+  gint32     width, height;
+  gint32     size;
+
+  gchar     *tmp;
+  gchar     *name;
+  gboolean   r;
+
+  brush_size = abr_read_long (input, error);
+  if (error && *error)
+    return NULL;
+
+  if (brush_size < 0)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: "
+                     "Brush size value corrupt."));
+      return NULL;
+    }
+
+  brush_end = brush_size;
+
+  /* complement to 4 */
+  while (brush_end % 4 != 0)
+    brush_end++;
+
+  next_brush = (brush_end + g_seekable_tell (G_SEEKABLE (input)));
+
+  if (abr_hdr->count == 1)
+    {
+      /* discard key and short coordinates and unknown short */
+      r = g_seekable_seek (G_SEEKABLE (input), 47, G_SEEK_CUR,
+                           NULL, error);
+    }
+  else
+    {
+      /* discard key and unknown bytes */
+      r = g_seekable_seek (G_SEEKABLE (input), 301, G_SEEK_CUR,
+                           NULL, error);
+    }
+
+  if (! r)
+    {
+      g_prefix_error (error,
+                      _("Fatal parse error in brush file: "
+                        "File appears truncated: "));
+      return NULL;
+    }
+
+  top      = abr_read_long  (input, error); if (error && *error) return NULL;
+  left     = abr_read_long  (input, error); if (error && *error) return NULL;
+  bottom   = abr_read_long  (input, error); if (error && *error) return NULL;
+  right    = abr_read_long  (input, error); if (error && *error) return NULL;
+  depth    = abr_read_short (input, error); if (error && *error) return NULL;
+  compress = abr_read_char  (input, error); if (error && *error) return NULL;
+
+  depth = depth >> 3;
+
+  width  = right - left;
+  height = bottom - top;
+  size   = width * depth * height;
+
+#if 0
+  g_printerr ("width %i  height %i  depth %i  compress %i\n",
+              width, height, depth, compress);
+#endif
+
+  if (width  < 1 || width  > 10000 ||
+      height < 1 || height > 10000 ||
+      depth  < 1 || depth  > 1     ||
+      G_MAXSIZE / width / height / depth < 1)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: "
+                     "Brush dimensions out of range."));
+      return NULL;
+    }
+
+  if (compress < 0 || compress > 1)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: "
+                     "Unknown compression method."));
+      return NULL;
+    }
+
+  tmp = g_path_get_basename (gimp_file_get_utf8_name (file));
+  name = g_strdup_printf ("%s-%03d", tmp, index);
+  g_free (tmp);
+
+  brush = g_object_new (GIMP_TYPE_BRUSH,
+                        "name",      name,
+                        /*  FIXME: MIME type!!  */
+                        "mime-type", "application/x-photoshop-abr",
+                        NULL);
+
+  g_free (name);
+
+  brush->priv->spacing  = 25; /* real value needs 8BIMdesc section parser */
+  brush->priv->x_axis.x = width / 2.0;
+  brush->priv->x_axis.y = 0.0;
+  brush->priv->y_axis.x = 0.0;
+  brush->priv->y_axis.y = height / 2.0;
+  brush->priv->mask     = gimp_temp_buf_new (width, height,
+                                             babl_format ("Y u8"));
+
+  mask = gimp_temp_buf_get_data (brush->priv->mask);
+
+  /* data decoding */
+  if (! compress)
+    {
+      /* not compressed - read raw bytes as brush data */
+      gsize bytes_read;
+
+      if (! g_input_stream_read_all (G_INPUT_STREAM (input),
+                                     mask, size,
+                                     &bytes_read, NULL, error) ||
+          bytes_read != size)
+        {
+          g_object_unref (brush);
+          return NULL;
+        }
+    }
+  else
+    {
+      if (! abr_rle_decode (input, (gchar *) mask, size, height, error))
+        {
+          g_object_unref (brush);
+          return NULL;
+        }
+    }
+
+  if (g_seekable_tell (G_SEEKABLE (input)) <= next_brush)
+    g_seekable_seek (G_SEEKABLE (input), next_brush, G_SEEK_SET,
+                     NULL, NULL);
+
+  return brush;
+}
+
+static gchar
+abr_read_char (GDataInputStream  *input,
+               GError           **error)
+{
+  return g_data_input_stream_read_byte (input, NULL, error);
+}
+
+static gint16
+abr_read_short (GDataInputStream  *input,
+                GError           **error)
+{
+  return g_data_input_stream_read_int16 (input, NULL, error);
+}
+
+static gint32
+abr_read_long (GDataInputStream  *input,
+               GError           **error)
+{
+  return g_data_input_stream_read_int32 (input, NULL, error);
+}
+
+static gchar *
+abr_read_ucs2_text (GDataInputStream  *input,
+                    GError           **error)
+{
+  gchar *name_ucs2;
+  gchar *name_utf8;
+  gint   len;
+  gint   i;
+
+  /* two-bytes characters encoded (UCS-2)
+   *  format:
+   *   long : number of characters in string
+   *   data : zero terminated UCS-2 string
+   */
+
+  len = 2 * abr_read_long (input, error);
+  if (len <= 0)
+    return NULL;
+
+  name_ucs2 = g_new (gchar, len);
+
+  for (i = 0; i < len; i++)
+    {
+      name_ucs2[i] = abr_read_char (input, error);
+      if (error && *error)
+        {
+          g_free (name_ucs2);
+          return NULL;
+        }
+    }
+
+  name_utf8 = g_convert (name_ucs2, len,
+                         "UTF-8", "UCS-2BE",
+                         NULL, NULL, NULL);
+
+  g_free (name_ucs2);
+
+  return name_utf8;
+}
+
+static gboolean
+abr_supported (AbrHeader  *abr_hdr,
+               GError    **error)
+{
+  switch (abr_hdr->version)
+    {
+    case 1:
+    case 2:
+      return TRUE;
+      break;
+
+    case 10:
+    case 6:
+      /* in this case, count contains format sub-version */
+      if (abr_hdr->count == 1 || abr_hdr->count == 2)
+        return TRUE;
+
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: "
+                     "Unable to decode abr format version %d."),
+
+                   /* horrid subversion display, but better than
+                    * having yet another translatable string for
+                    * this
+                    */
+                   abr_hdr->version * 10 + abr_hdr->count);
+      break;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+abr_reach_8bim_section (GDataInputStream  *input,
+                        const gchar       *name,
+                        GError           **error)
+{
+  while (TRUE)
+    {
+      gchar   tag[4];
+      gchar   tagname[5];
+      guint32 section_size;
+      gsize   bytes_read;
+
+      if (! g_input_stream_read_all (G_INPUT_STREAM (input),
+                                     tag, 4,
+                                     &bytes_read, NULL, error) ||
+          bytes_read != 4)
+        return FALSE;
+
+      if (strncmp (tag, "8BIM", 4))
+        return FALSE;
+
+      if (! g_input_stream_read_all (G_INPUT_STREAM (input),
+                                     tagname, 4,
+                                     &bytes_read, NULL, error) ||
+          bytes_read != 4)
+        return FALSE;
+
+      tagname[4] = '\0';
+
+      if (! strncmp (tagname, name, 4))
+        return TRUE;
+
+      section_size = abr_read_long (input, error);
+      if (error && *error)
+        return FALSE;
+
+      if (! g_seekable_seek (G_SEEKABLE (input), section_size, G_SEEK_CUR,
+                             NULL, error))
+        return FALSE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+abr_rle_decode (GDataInputStream  *input,
+                gchar             *buffer,
+                gsize              buffer_size,
+                gint32             height,
+                GError           **error)
+{
+  gint    i, j;
+  gshort *cscanline_len = NULL;
+  gchar  *cdata         = NULL;
+  gchar  *data          = buffer;
+
+  /* read compressed size foreach scanline */
+  cscanline_len = gegl_scratch_new (gshort, height);
+  for (i = 0; i < height; i++)
+    {
+      cscanline_len[i] = abr_read_short (input, error);
+      if ((error && *error) || cscanline_len[i] <= 0)
+        goto err;
+    }
+
+  /* unpack each scanline data */
+  for (i = 0; i < height; i++)
+    {
+      gint  len;
+      gsize bytes_read;
+
+      len = cscanline_len[i];
+
+      cdata = gegl_scratch_alloc (len);
+
+      if (! g_input_stream_read_all (G_INPUT_STREAM (input),
+                                     cdata, len,
+                                     &bytes_read, NULL, error) ||
+          bytes_read != len)
+        {
+          goto err;
+        }
+
+      for (j = 0; j < len;)
+        {
+          gint32 n = cdata[j++];
+
+          if (n >= 128)     /* force sign */
+            n -= 256;
+
+          if (n < 0)
+            {
+              /* copy the following char -n + 1 times */
+
+              if (n == -128)  /* it's a nop */
+                continue;
+
+              n = -n + 1;
+
+              if (j + 1 > len || (data - buffer) + n > buffer_size)
+                goto err;
+
+              memset (data, cdata[j], n);
+
+              j    += 1;
+              data += n;
+            }
+          else
+            {
+              /* read the following n + 1 chars (no compr) */
+
+              n = n + 1;
+
+              if (j + n > len || (data - buffer) + n > buffer_size)
+                goto err;
+
+              memcpy (data, &cdata[j], n);
+
+              j    += n;
+              data += n;
+            }
+        }
+
+      g_clear_pointer (&cdata, gegl_scratch_free);
+    }
+
+  g_clear_pointer (&cscanline_len, gegl_scratch_free);
+
+  return TRUE;
+
+err:
+  g_clear_pointer (&cdata, gegl_scratch_free);
+  g_clear_pointer (&cscanline_len, gegl_scratch_free);
+  if (error && ! *error)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file: "
+                     "RLE compressed brush data corrupt."));
+    }
+  return FALSE;
+}
diff --git a/app/core/gimpbrush-load.h b/app/core/gimpbrush-load.h
new file mode 100644
index 0000000..6c4f0af
--- /dev/null
+++ b/app/core/gimpbrush-load.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_LOAD_H__
+#define __GIMP_BRUSH_LOAD_H__
+
+
+#define GIMP_BRUSH_FILE_EXTENSION        ".gbr"
+#define GIMP_BRUSH_PIXMAP_FILE_EXTENSION ".gpb"
+#define GIMP_BRUSH_PS_FILE_EXTENSION     ".abr"
+#define GIMP_BRUSH_PSP_FILE_EXTENSION    ".jbr"
+
+
+GList     * gimp_brush_load        (GimpContext   *context,
+                                    GFile         *file,
+                                    GInputStream  *input,
+                                    GError       **error);
+GimpBrush * gimp_brush_load_brush  (GimpContext   *context,
+                                    GFile         *file,
+                                    GInputStream  *input,
+                                    GError       **error);
+
+GList     * gimp_brush_load_abr    (GimpContext   *context,
+                                    GFile         *file,
+                                    GInputStream  *input,
+                                    GError       **error);
+
+
+#endif /* __GIMP_BRUSH_LOAD_H__ */
diff --git a/app/core/gimpbrush-mipmap.cc b/app/core/gimpbrush-mipmap.cc
new file mode 100644
index 0000000..7c3b061
--- /dev/null
+++ b/app/core/gimpbrush-mipmap.cc
@@ -0,0 +1,514 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrush-mipmap.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+extern "C"
+{
+
+#include "core-types.h"
+
+#include "gimpbrush.h"
+#include "gimpbrush-mipmap.h"
+#include "gimpbrush-private.h"
+#include "gimptempbuf.h"
+
+} /* extern "C" */
+
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+#define GIMP_BRUSH_MIPMAP(brush, mipmaps, x, y) \
+  ((*(mipmaps))[(y) * (brush)->priv->n_horz_mipmaps + (x)])
+
+
+/*  local function prototypes  */
+
+static void                gimp_brush_mipmap_clear          (GimpBrush           *brush,
+                                                             GimpTempBuf       ***mipmaps);
+
+static const GimpTempBuf * gimp_brush_mipmap_get            (GimpBrush           *brush,
+                                                             const GimpTempBuf   *source,
+                                                             GimpTempBuf       ***mipmaps,
+                                                             gdouble             *scale_x,
+                                                             gdouble             *scale_y);
+
+static GimpTempBuf       * gimp_brush_mipmap_downscale      (const GimpTempBuf   *source);
+static GimpTempBuf       * gimp_brush_mipmap_downscale_horz (const GimpTempBuf   *source);
+static GimpTempBuf       * gimp_brush_mipmap_downscale_vert (const GimpTempBuf   *source);
+
+
+/*  private functions  */
+
+static void
+gimp_brush_mipmap_clear (GimpBrush     *brush,
+                         GimpTempBuf ***mipmaps)
+{
+  if (*mipmaps)
+    {
+      gint i;
+
+      for (i = 0;
+           i < brush->priv->n_horz_mipmaps * brush->priv->n_vert_mipmaps;
+           i++)
+        {
+          g_clear_pointer (&(*mipmaps)[i], gimp_temp_buf_unref);
+        }
+
+      g_clear_pointer (mipmaps, g_free);
+    }
+}
+
+static const GimpTempBuf *
+gimp_brush_mipmap_get (GimpBrush           *brush,
+                       const GimpTempBuf   *source,
+                       GimpTempBuf       ***mipmaps,
+                       gdouble             *scale_x,
+                       gdouble             *scale_y)
+{
+  gint x;
+  gint y;
+  gint i;
+
+  if (! source)
+    return NULL;
+
+  if (! *mipmaps)
+    {
+      gint width  = gimp_temp_buf_get_width  (source);
+      gint height = gimp_temp_buf_get_height (source);
+
+      brush->priv->n_horz_mipmaps = floor (log (width)  / M_LN2) + 1;
+      brush->priv->n_vert_mipmaps = floor (log (height) / M_LN2) + 1;
+
+      *mipmaps = g_new0 (GimpTempBuf *, brush->priv->n_horz_mipmaps *
+                                        brush->priv->n_vert_mipmaps);
+
+      GIMP_BRUSH_MIPMAP (brush, mipmaps, 0, 0) = gimp_temp_buf_ref (source);
+    }
+
+  x = floor (SAFE_CLAMP (log (1.0 / MAX (*scale_x, 0.0)) / M_LN2,
+                         0, brush->priv->n_horz_mipmaps - 1));
+  y = floor (SAFE_CLAMP (log (1.0 / MAX (*scale_y, 0.0)) / M_LN2,
+                         0, brush->priv->n_vert_mipmaps - 1));
+
+  *scale_x *= pow (2.0, x);
+  *scale_y *= pow (2.0, y);
+
+  if (GIMP_BRUSH_MIPMAP (brush, mipmaps, x, y))
+    return GIMP_BRUSH_MIPMAP (brush, mipmaps, x, y);
+
+  g_return_val_if_fail (x >= 0 || y >= 0, NULL);
+
+  for (i = 1; i <= x + y; i++)
+    {
+      gint u = x - i;
+      gint v = y;
+
+      if (u < 0)
+        {
+          v += u;
+          u  = 0;
+        }
+
+      while (u <= x && v >= 0)
+        {
+          if (GIMP_BRUSH_MIPMAP (brush, mipmaps, u, v))
+            {
+              for (; x - u > y - v; u++)
+                {
+                  GIMP_BRUSH_MIPMAP (brush, mipmaps, u + 1, v) =
+                    gimp_brush_mipmap_downscale_horz (
+                      GIMP_BRUSH_MIPMAP (brush, mipmaps, u, v));
+                }
+
+              for (; y - v > x - u; v++)
+                {
+                  GIMP_BRUSH_MIPMAP (brush, mipmaps, u, v + 1) =
+                    gimp_brush_mipmap_downscale_vert (
+                      GIMP_BRUSH_MIPMAP (brush, mipmaps, u, v));
+                }
+
+              for (; u < x; u++, v++)
+                {
+                  GIMP_BRUSH_MIPMAP (brush, mipmaps, u + 1, v + 1) =
+                    gimp_brush_mipmap_downscale (
+                      GIMP_BRUSH_MIPMAP (brush, mipmaps, u, v));
+                }
+
+              return GIMP_BRUSH_MIPMAP (brush, mipmaps, u, v);
+            }
+
+          u++;
+          v--;
+        }
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+template <class T>
+struct MipmapTraits;
+
+template <>
+struct MipmapTraits<guint8>
+{
+  static guint8
+  mix (guint8 a,
+       guint8 b)
+  {
+    return ((guint32) a + (guint32) b + 1) / 2;
+  }
+
+  static guint8
+  mix (guint8 a,
+       guint8 b,
+       guint8 c,
+       guint8 d)
+  {
+    return ((guint32) a + (guint32) b + (guint32) c + (guint32) d + 2) / 4;
+  }
+};
+
+template <>
+struct MipmapTraits<gfloat>
+{
+  static gfloat
+  mix (gfloat a,
+       gfloat b)
+  {
+    return (a + b) / 2.0;
+  }
+
+  static gfloat
+  mix (gfloat a,
+       gfloat b,
+       gfloat c,
+       gfloat d)
+  {
+    return (a + b + c + d) / 4.0;
+  }
+};
+
+template <class T,
+          gint  N>
+struct MipmapAlgorithms
+{
+  static GimpTempBuf *
+  downscale (const GimpTempBuf *source)
+  {
+    GimpTempBuf *destination;
+    gint         width  = gimp_temp_buf_get_width  (source);
+    gint         height = gimp_temp_buf_get_height (source);
+
+    width  /= 2;
+    height /= 2;
+
+    destination = gimp_temp_buf_new (width, height,
+                                     gimp_temp_buf_get_format (source));
+
+    gegl_parallel_distribute_area (
+      GEGL_RECTANGLE (0, 0, width, height), PIXELS_PER_THREAD,
+      [=] (const GeglRectangle *area)
+      {
+        const T *src0        = (const T *) gimp_temp_buf_get_data (source);
+        T       *dest0       = (T       *) gimp_temp_buf_get_data (destination);
+        gint     src_stride  = N * gimp_temp_buf_get_width (source);
+        gint     dest_stride = N * gimp_temp_buf_get_width (destination);
+        gint     y;
+
+        src0  += 2 * (area->y * src_stride  + N * area->x);
+        dest0 +=      area->y * dest_stride + N * area->x;
+
+        for (y = 0; y < area->height; y++)
+          {
+            const T *src  = src0;
+            T       *dest = dest0;
+            gint     x;
+
+            for (x = 0; x < area->width; x++)
+              {
+                gint c;
+
+                for (c = 0; c < N; c++)
+                  {
+                    dest[c] = MipmapTraits<T>::mix (src[c],
+                                                    src[N + c],
+                                                    src[src_stride + c],
+                                                    src[src_stride + N + c]);
+                  }
+
+                src  += 2 * N;
+                dest += N;
+              }
+
+            src0  += 2 * src_stride;
+            dest0 += dest_stride;
+          }
+      });
+
+    return destination;
+  }
+
+  static GimpTempBuf *
+  downscale_horz (const GimpTempBuf *source)
+  {
+    GimpTempBuf *destination;
+    gint         width  = gimp_temp_buf_get_width  (source);
+    gint         height = gimp_temp_buf_get_height (source);
+
+    width /= 2;
+
+    destination = gimp_temp_buf_new (width, height,
+                                     gimp_temp_buf_get_format (source));
+
+    gegl_parallel_distribute_range (
+      height, PIXELS_PER_THREAD / width,
+      [=] (gint offset,
+           gint size)
+      {
+        const T *src0        = (const T *) gimp_temp_buf_get_data (source);
+        T       *dest0       = (T       *) gimp_temp_buf_get_data (destination);
+        gint     src_stride  = N * gimp_temp_buf_get_width (source);
+        gint     dest_stride = N * gimp_temp_buf_get_width (destination);
+        gint     y;
+
+        src0  += offset * src_stride;
+        dest0 += offset * dest_stride;
+
+        for (y = 0; y < size; y++)
+          {
+            const T *src  = src0;
+            T       *dest = dest0;
+            gint     x;
+
+            for (x = 0; x < width; x++)
+              {
+                gint c;
+
+                for (c = 0; c < N; c++)
+                  dest[c] = MipmapTraits<T>::mix (src[c], src[N + c]);
+
+                src  += 2 * N;
+                dest += N;
+              }
+
+            src0  += src_stride;
+            dest0 += dest_stride;
+          }
+      });
+
+    return destination;
+  }
+
+  static GimpTempBuf *
+  downscale_vert (const GimpTempBuf *source)
+  {
+    GimpTempBuf *destination;
+    gint         width  = gimp_temp_buf_get_width  (source);
+    gint         height = gimp_temp_buf_get_height (source);
+
+    height /= 2;
+
+    destination = gimp_temp_buf_new (width, height,
+                                     gimp_temp_buf_get_format (source));
+
+    gegl_parallel_distribute_range (
+      width, PIXELS_PER_THREAD / height,
+      [=] (gint offset,
+           gint size)
+      {
+        const T *src0        = (const T *) gimp_temp_buf_get_data (source);
+        T       *dest0       = (T       *) gimp_temp_buf_get_data (destination);
+        gint     src_stride  = N * gimp_temp_buf_get_width (source);
+        gint     dest_stride = N * gimp_temp_buf_get_width (destination);
+        gint     x;
+
+        src0  += offset * N;
+        dest0 += offset * N;
+
+        for (x = 0; x < size; x++)
+          {
+            const T *src  = src0;
+            T       *dest = dest0;
+            gint     y;
+
+            for (y = 0; y < height; y++)
+              {
+                gint c;
+
+                for (c = 0; c < N; c++)
+                  dest[c] = MipmapTraits<T>::mix (src[c], src[src_stride + c]);
+
+                src  += 2 * src_stride;
+                dest += dest_stride;
+              }
+
+            src0  += N;
+            dest0 += N;
+          }
+      });
+
+    return destination;
+  }
+};
+
+template <class Func>
+static GimpTempBuf *
+gimp_brush_mipmap_dispatch (const GimpTempBuf *source,
+                            Func               func)
+{
+  const Babl *format = gimp_temp_buf_get_format (source);
+  const Babl *type;
+  gint        n_components;
+
+  type         = babl_format_get_type (format, 0);
+  n_components = babl_format_get_n_components (format);
+
+  if (type == babl_type ("u8"))
+    {
+      switch (n_components)
+        {
+        case 1:
+          return func (MipmapAlgorithms<guint8, 1> ());
+
+        case 3:
+          return func (MipmapAlgorithms<guint8, 3> ());
+        }
+    }
+  else if (type == babl_type ("float"))
+    {
+      switch (n_components)
+        {
+        case 1:
+          return func (MipmapAlgorithms<gfloat, 1> ());
+
+        case 3:
+          return func (MipmapAlgorithms<gfloat, 3> ());
+        }
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+static GimpTempBuf *
+gimp_brush_mipmap_downscale (const GimpTempBuf *source)
+{
+  return gimp_brush_mipmap_dispatch (
+    source,
+    [&] (auto algorithms)
+    {
+      return algorithms.downscale (source);
+    });
+}
+
+static GimpTempBuf *
+gimp_brush_mipmap_downscale_horz (const GimpTempBuf *source)
+{
+  return gimp_brush_mipmap_dispatch (
+    source,
+    [&] (auto algorithms)
+    {
+      return algorithms.downscale_horz (source);
+    });
+}
+
+static GimpTempBuf *
+gimp_brush_mipmap_downscale_vert (const GimpTempBuf *source)
+{
+  return gimp_brush_mipmap_dispatch (
+    source,
+    [&] (auto algorithms)
+    {
+      return algorithms.downscale_vert (source);
+    });
+}
+
+
+/*  public functions  */
+
+void
+gimp_brush_mipmap_clear (GimpBrush *brush)
+{
+  gimp_brush_mipmap_clear (brush, &brush->priv->mask_mipmaps);
+  gimp_brush_mipmap_clear (brush, &brush->priv->pixmap_mipmaps);
+}
+
+const GimpTempBuf *
+gimp_brush_mipmap_get_mask (GimpBrush *brush,
+                            gdouble   *scale_x,
+                            gdouble   *scale_y)
+{
+  return gimp_brush_mipmap_get (brush,
+                                brush->priv->mask,
+                                &brush->priv->mask_mipmaps,
+                                scale_x, scale_y);
+}
+
+const GimpTempBuf *
+gimp_brush_mipmap_get_pixmap (GimpBrush *brush,
+                              gdouble   *scale_x,
+                              gdouble   *scale_y)
+{
+  return gimp_brush_mipmap_get (brush,
+                                brush->priv->pixmap,
+                                &brush->priv->pixmap_mipmaps,
+                                scale_x, scale_y);
+}
+
+gsize
+gimp_brush_mipmap_get_memsize (GimpBrush *brush)
+{
+  gsize memsize = 0;
+
+  if (brush->priv->mask_mipmaps)
+    {
+      gint i;
+
+      for (i = 1;
+           i < brush->priv->n_horz_mipmaps * brush->priv->n_vert_mipmaps;
+           i++)
+        {
+          memsize += gimp_temp_buf_get_memsize (brush->priv->mask_mipmaps[i]);
+        }
+    }
+
+  if (brush->priv->pixmap_mipmaps)
+    {
+      gint i;
+
+      for (i = 1;
+           i < brush->priv->n_horz_mipmaps * brush->priv->n_vert_mipmaps;
+           i++)
+        {
+          memsize += gimp_temp_buf_get_memsize (brush->priv->pixmap_mipmaps[i]);
+        }
+    }
+
+  return memsize;
+}
diff --git a/app/core/gimpbrush-mipmap.h b/app/core/gimpbrush-mipmap.h
new file mode 100644
index 0000000..b2b8fd3
--- /dev/null
+++ b/app/core/gimpbrush-mipmap.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrush-mipmap.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_MIPMAP_H__
+#define __GIMP_BRUSH_MIPMAP_H__
+
+
+void                gimp_brush_mipmap_clear       (GimpBrush *brush);
+
+const GimpTempBuf * gimp_brush_mipmap_get_mask    (GimpBrush *brush,
+                                                   gdouble   *scale_x,
+                                                   gdouble   *scale_y);
+
+const GimpTempBuf * gimp_brush_mipmap_get_pixmap  (GimpBrush *brush,
+                                                   gdouble   *scale_x,
+                                                   gdouble   *scale_y);
+
+gsize               gimp_brush_mipmap_get_memsize (GimpBrush *brush);
+
+
+#endif  /*  __GIMP_BRUSH_MIPMAP_H__  */
diff --git a/app/core/gimpbrush-private.h b/app/core/gimpbrush-private.h
new file mode 100644
index 0000000..c8d4d29
--- /dev/null
+++ b/app/core/gimpbrush-private.h
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_PRIVATE_H__
+#define __GIMP_BRUSH_PRIVATE_H__
+
+
+struct _GimpBrushPrivate
+{
+  GimpTempBuf     *mask;           /*  the actual mask                    */
+  GimpTempBuf     *blurred_mask;    /*  blurred actual mask cached          */
+  GimpTempBuf     *pixmap;         /*  optional pixmap data               */
+  GimpTempBuf     *blurred_pixmap;  /*  optional pixmap data blurred cache  */
+
+  gdouble          blur_hardness;
+
+  gint             n_horz_mipmaps;
+  gint             n_vert_mipmaps;
+  GimpTempBuf    **mask_mipmaps;
+  GimpTempBuf    **pixmap_mipmaps;
+
+  gint             spacing;    /*  brush's spacing                */
+  GimpVector2      x_axis;     /*  for calculating brush spacing  */
+  GimpVector2      y_axis;     /*  for calculating brush spacing  */
+
+  gint             use_count;  /*  for keeping the caches alive   */
+  GimpBrushCache  *mask_cache;
+  GimpBrushCache  *pixmap_cache;
+  GimpBrushCache  *boundary_cache;
+};
+
+
+#endif /* __GIMP_BRUSH_PRIVATE_H__ */
diff --git a/app/core/gimpbrush-save.c b/app/core/gimpbrush-save.c
new file mode 100644
index 0000000..38d4bcd
--- /dev/null
+++ b/app/core/gimpbrush-save.c
@@ -0,0 +1,107 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "gimpbrush.h"
+#include "gimpbrush-header.h"
+#include "gimpbrush-save.h"
+#include "gimptempbuf.h"
+
+
+gboolean
+gimp_brush_save (GimpData       *data,
+                 GOutputStream  *output,
+                 GError        **error)
+{
+  GimpBrush       *brush  = GIMP_BRUSH (data);
+  GimpTempBuf     *mask   = gimp_brush_get_mask (brush);
+  GimpTempBuf     *pixmap = gimp_brush_get_pixmap (brush);
+  GimpBrushHeader  header;
+  const gchar     *name;
+  gint             width;
+  gint             height;
+
+  name   = gimp_object_get_name (brush);
+  width  = gimp_temp_buf_get_width  (mask);
+  height = gimp_temp_buf_get_height (mask);
+
+  header.header_size  = g_htonl (sizeof (GimpBrushHeader) +
+                                 strlen (name) + 1);
+  header.version      = g_htonl (2);
+  header.width        = g_htonl (width);
+  header.height       = g_htonl (height);
+  header.bytes        = g_htonl (pixmap ? 4 : 1);
+  header.magic_number = g_htonl (GIMP_BRUSH_MAGIC);
+  header.spacing      = g_htonl (gimp_brush_get_spacing (brush));
+
+  if (! g_output_stream_write_all (output, &header, sizeof (header),
+                                   NULL, NULL, error))
+    {
+      return FALSE;
+    }
+
+  if (! g_output_stream_write_all (output, name, strlen (name) + 1,
+                                   NULL, NULL, error))
+    {
+      return FALSE;
+    }
+
+  if (pixmap)
+    {
+      gsize   size = width * height * 4;
+      guchar *data = g_malloc (size);
+      guchar *p    = gimp_temp_buf_get_data (pixmap);
+      guchar *m    = gimp_temp_buf_get_data (mask);
+      guchar *d    = data;
+      gint    i;
+
+      for (i = 0; i < width * height; i++)
+        {
+          *d++ = *p++;
+          *d++ = *p++;
+          *d++ = *p++;
+          *d++ = *m++;
+        }
+
+      if (! g_output_stream_write_all (output, data, size,
+                                       NULL, NULL, error))
+        {
+          g_free (data);
+
+          return FALSE;
+        }
+
+      g_free (data);
+    }
+  else
+    {
+      if (! g_output_stream_write_all (output,
+                                       gimp_temp_buf_get_data (mask),
+                                       gimp_temp_buf_get_data_size (mask),
+                                       NULL, NULL, error))
+        {
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/core/gimpbrush-save.h b/app/core/gimpbrush-save.h
new file mode 100644
index 0000000..f400cf0
--- /dev/null
+++ b/app/core/gimpbrush-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_SAVE_H__
+#define __GIMP_BRUSH_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_brush_save (GimpData       *data,
+                            GOutputStream  *output,
+                            GError        **error);
+
+
+#endif  /*  __GIMP_BRUSH_SAVE_H__  */
diff --git a/app/core/gimpbrush-transform.cc b/app/core/gimpbrush-transform.cc
new file mode 100644
index 0000000..45673cd
--- /dev/null
+++ b/app/core/gimpbrush-transform.cc
@@ -0,0 +1,1043 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrush-transform.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+extern "C"
+{
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpbrush.h"
+#include "gimpbrush-mipmap.h"
+#include "gimpbrush-transform.h"
+#include "gimptempbuf.h"
+
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+
+/*  local function prototypes  */
+
+static void    gimp_brush_transform_bounding_box           (const GimpTempBuf *temp_buf,
+                                                            const GimpMatrix3 *matrix,
+                                                            gint              *x,
+                                                            gint              *y,
+                                                            gint              *width,
+                                                            gint              *height);
+
+static void    gimp_brush_transform_blur                   (GimpTempBuf       *buf,
+                                                            gint               r);
+static gint    gimp_brush_transform_blur_radius            (gint               height,
+                                                            gint               width,
+                                                            gdouble            hardness);
+static void    gimp_brush_transform_adjust_hardness_matrix (gdouble            width,
+                                                            gdouble            height,
+                                                            gdouble            blur_radius,
+                                                            GimpMatrix3       *matrix);
+
+
+/*  public functions  */
+
+void
+gimp_brush_real_transform_size (GimpBrush *brush,
+                                gdouble    scale,
+                                gdouble    aspect_ratio,
+                                gdouble    angle,
+                                gboolean   reflect,
+                                gint      *width,
+                                gint      *height)
+{
+  const GimpTempBuf *source;
+  GimpMatrix3        matrix;
+  gdouble            scale_x, scale_y;
+  gint               x, y;
+
+  gimp_brush_transform_get_scale (scale, aspect_ratio,
+                                  &scale_x, &scale_y);
+
+  source = gimp_brush_mipmap_get_mask (brush, &scale_x, &scale_y);
+
+  gimp_brush_transform_matrix (gimp_temp_buf_get_width  (source),
+                               gimp_temp_buf_get_height (source),
+                               scale_x, scale_y, angle, reflect, &matrix);
+
+  gimp_brush_transform_bounding_box (source, &matrix, &x, &y, width, height);
+}
+
+/*
+ * Transforms the brush mask with bilinear interpolation.
+ *
+ * Rather than calculating the inverse transform for each point in the
+ * transformed image, this algorithm uses the inverse transformed
+ * corner points of the destination image to work out the starting
+ * position in the source image and the U and V deltas in the source
+ * image space.  It then uses a scan-line approach, looping through
+ * rows and columns in the transformed (destination) image while
+ * walking along the corresponding rows and columns (named U and V) in
+ * the source image.
+ *
+ * The horizontal in destination space (transform result) is reverse
+ * transformed into source image space to get U.  The vertical in
+ * destination space (transform result) is reverse transformed into
+ * source image space to get V.
+ *
+ * The strength of this particular algorithm is that calculation work
+ * should depend more upon the final transformed brush size rather
+ * than the input brush size.
+ *
+ * There are no floating point calculations in the inner loop for speed.
+ *
+ * Some variables end with the suffix _i to indicate they have been
+ * premultiplied by int_multiple
+ */
+GimpTempBuf *
+gimp_brush_real_transform_mask (GimpBrush *brush,
+                                gdouble    scale,
+                                gdouble    aspect_ratio,
+                                gdouble    angle,
+                                gboolean   reflect,
+                                gdouble    hardness)
+{
+  GimpTempBuf       *result;
+  const GimpTempBuf *source;
+  const guchar      *src;
+  GimpMatrix3        matrix;
+  gdouble            scale_x, scale_y;
+  gint               src_width;
+  gint               src_height;
+  gint               src_width_minus_one;
+  gint               src_height_minus_one;
+  gint               dest_width;
+  gint               dest_height;
+  gint               blur_radius;
+  gint               x, y;
+  gdouble            b_lx, b_rx, t_lx, t_rx;
+  gdouble            b_ly, b_ry, t_ly, t_ry;
+  gdouble            src_tl_to_tr_delta_x;
+  gdouble            src_tl_to_tr_delta_y;
+  gdouble            src_tl_to_bl_delta_x;
+  gdouble            src_tl_to_bl_delta_y;
+  gint               src_walk_ux_i;
+  gint               src_walk_uy_i;
+  gint               src_walk_vx_i;
+  gint               src_walk_vy_i;
+  gint               src_x_min_i;
+  gint               src_y_min_i;
+  gint               src_x_max_i;
+  gint               src_y_max_i;
+
+  /*
+   * tl, tr etc are used because it is easier to visualize top left,
+   * top right etc corners of the forward transformed source image
+   * rectangle.
+   */
+  const gint fraction_bits = 12;
+  const gint int_multiple  = pow (2, fraction_bits);
+
+  /* In inner loop's bilinear calculation, two numbers that were each
+   * previously multiplied by int_multiple are multiplied together.
+   * To get back the right result, the multiplication result must be
+   * divided *twice* by 2^fraction_bits, equivalent to bit shift right
+   * by 2 * fraction_bits
+   */
+  const gint recovery_bits = 2 * fraction_bits;
+
+  /*
+   * example: suppose fraction_bits = 9
+   * a 9-bit mask looks like this: 0001 1111 1111
+   * and is given by:  2^fraction_bits - 1
+   * demonstration:
+   * 2^0     = 0000 0000 0001
+   * 2^1     = 0000 0000 0010
+   * :
+   * 2^8     = 0001 0000 0000
+   * 2^9     = 0010 0000 0000
+   * 2^9 - 1 = 0001 1111 1111
+   */
+  const guint fraction_bitmask = pow(2, fraction_bits) - 1 ;
+
+  gimp_brush_transform_get_scale (scale, aspect_ratio,
+                                  &scale_x, &scale_y);
+
+  source = gimp_brush_mipmap_get_mask (brush, &scale_x, &scale_y);
+
+  src_width  = gimp_temp_buf_get_width  (source);
+  src_height = gimp_temp_buf_get_height (source);
+
+  gimp_brush_transform_matrix (src_width, src_height,
+                               scale_x, scale_y, angle, reflect, &matrix);
+
+  if (gimp_matrix3_is_identity (&matrix) && hardness == 1.0)
+    return gimp_temp_buf_copy (source);
+
+  src_width_minus_one  = src_width  - 1;
+  src_height_minus_one = src_height - 1;
+
+  gimp_brush_transform_bounding_box (source, &matrix,
+                                     &x, &y, &dest_width, &dest_height);
+
+  blur_radius = 0;
+
+  if (hardness < 1.0)
+    {
+      GimpMatrix3 unrotated_matrix;
+      gint        unrotated_x;
+      gint        unrotated_y;
+      gint        unrotated_dest_width;
+      gint        unrotated_dest_height;
+
+      gimp_brush_transform_matrix (src_width, src_height,
+                                   scale_x, scale_y, 0.0, FALSE,
+                                   &unrotated_matrix);
+
+      gimp_brush_transform_bounding_box (source, &unrotated_matrix,
+                                         &unrotated_x, &unrotated_y,
+                                         &unrotated_dest_width,
+                                         &unrotated_dest_height);
+
+      blur_radius = gimp_brush_transform_blur_radius (unrotated_dest_width,
+                                                      unrotated_dest_height,
+                                                      hardness);
+
+      gimp_brush_transform_adjust_hardness_matrix (dest_width, dest_height,
+                                                   blur_radius, &matrix);
+    }
+
+  gimp_matrix3_translate (&matrix, -x, -y);
+  gimp_matrix3_invert (&matrix);
+  gimp_matrix3_translate (&matrix, -0.5, -0.5);
+
+  result = gimp_temp_buf_new (dest_width, dest_height,
+                              gimp_temp_buf_get_format (source));
+
+  src = gimp_temp_buf_get_data (source);
+
+  /* prevent disappearance of 1x1 pixel brush at some rotations when
+     scaling < 1 */
+  /*
+  if (src_width == 1 && src_height == 1 && scale_x < 1 && scale_y < 1 )
+    {
+      *dest = src[0];
+      return result;
+    }*/
+
+  gimp_matrix3_transform_point (&matrix,
+                                0.5,              0.5,
+                                &t_lx,            &t_ly);
+  gimp_matrix3_transform_point (&matrix,
+                                dest_width - 0.5, 0.5,
+                                &t_rx,            &t_ry);
+  gimp_matrix3_transform_point (&matrix,
+                                0.5,              dest_height - 0.5,
+                                &b_lx,            &b_ly);
+  gimp_matrix3_transform_point (&matrix,
+                                dest_width - 0.5, dest_height - 0.5,
+                                &b_rx,            &b_ry);
+
+  /* in image space, calc U (what was horizontal originally)
+   * note: double precision
+   */
+  src_tl_to_tr_delta_x = t_rx - t_lx;
+  src_tl_to_tr_delta_y = t_ry - t_ly;
+
+  /* in image space, calc V (what was vertical originally)
+   * note: double precision
+   */
+  src_tl_to_bl_delta_x = b_lx - t_lx;
+  src_tl_to_bl_delta_y = b_ly - t_ly;
+
+  /* speed optimized, note conversion to int precision */
+  src_walk_ux_i = (gint) ((src_tl_to_tr_delta_x / MAX (dest_width  - 1, 1)) *
+                          int_multiple);
+  src_walk_uy_i = (gint) ((src_tl_to_tr_delta_y / MAX (dest_width  - 1, 1)) *
+                          int_multiple);
+  src_walk_vx_i = (gint) ((src_tl_to_bl_delta_x / MAX (dest_height - 1, 1)) *
+                          int_multiple);
+  src_walk_vy_i = (gint) ((src_tl_to_bl_delta_y / MAX (dest_height - 1, 1)) *
+                          int_multiple);
+
+  src_x_min_i = -int_multiple / 2;
+  src_y_min_i = -int_multiple / 2;
+
+  src_x_max_i = src_width  * int_multiple - int_multiple / 2;
+  src_y_max_i = src_height * int_multiple - int_multiple / 2;
+
+  gegl_parallel_distribute_area (
+    GEGL_RECTANGLE (0, 0, dest_width, dest_height), PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *area)
+    {
+      guchar       *dest;
+      gint          src_space_cur_pos_x;
+      gint          src_space_cur_pos_y;
+      gint          src_space_cur_pos_x_i;
+      gint          src_space_cur_pos_y_i;
+      gint          src_space_row_start_x_i;
+      gint          src_space_row_start_y_i;
+      const guchar *src_walker;
+      const guchar *pixel_next;
+      const guchar *pixel_below;
+      const guchar *pixel_below_next;
+      gint          opposite_x, distance_from_true_x;
+      gint          opposite_y, distance_from_true_y;
+      gint          u, v;
+
+      dest = gimp_temp_buf_get_data (result) +
+             dest_width * area->y + area->x;
+
+      /* initialize current position in source space to the start position (tl)
+       * speed optimized, note conversion to int precision
+       */
+      src_space_row_start_x_i = (gint) (t_lx * int_multiple) +
+                                src_walk_vx_i * area->y      +
+                                src_walk_ux_i * area->x;
+      src_space_row_start_y_i = (gint) (t_ly * int_multiple) +
+                                src_walk_vy_i * area->y      +
+                                src_walk_uy_i * area->x;
+
+      for (v = 0; v < area->height; v++)
+        {
+          src_space_cur_pos_x_i = src_space_row_start_x_i;
+          src_space_cur_pos_y_i = src_space_row_start_y_i;
+
+          for (u = 0; u < area->width; u++)
+            {
+              if (src_space_cur_pos_x_i <  src_x_min_i ||
+                  src_space_cur_pos_x_i >= src_x_max_i ||
+                  src_space_cur_pos_y_i <  src_y_min_i ||
+                  src_space_cur_pos_y_i >= src_y_max_i)
+                  /* no corresponding pixel in source space */
+                {
+                  *dest = 0;
+                }
+              else /* reverse transformed point hits source pixel */
+                {
+                  src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits;
+                  src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits;
+
+                  src_walker = src                             +
+                               src_space_cur_pos_y * src_width +
+                               src_space_cur_pos_x;
+
+                  pixel_next       = src_walker + 1;
+                  pixel_below      = src_walker + src_width;
+                  pixel_below_next = pixel_below + 1;
+
+                  if (src_space_cur_pos_x < 0)
+                    {
+                      src_walker  = pixel_next;
+                      pixel_below = pixel_below_next;
+                    }
+                  else if (src_space_cur_pos_x >= src_width_minus_one)
+                    {
+                      pixel_next       = src_walker;
+                      pixel_below_next = pixel_below;
+                    }
+
+                  if (src_space_cur_pos_y < 0)
+                    {
+                      src_walker = pixel_below;
+                      pixel_next = pixel_below_next;
+                    }
+                  else if (src_space_cur_pos_y >= src_height_minus_one)
+                    {
+                      pixel_below      = src_walker;
+                      pixel_below_next = pixel_next;
+                    }
+
+                  distance_from_true_x = src_space_cur_pos_x_i & fraction_bitmask;
+                  distance_from_true_y = src_space_cur_pos_y_i & fraction_bitmask;
+                  opposite_x =  int_multiple - distance_from_true_x;
+                  opposite_y =  int_multiple - distance_from_true_y;
+
+                  *dest = ((src_walker[0] * opposite_x +
+                            pixel_next[0] * distance_from_true_x) * opposite_y +
+                           (pixel_below[0] * opposite_x +
+                            pixel_below_next[0] *distance_from_true_x) * distance_from_true_y
+                           ) >> recovery_bits;
+                }
+
+              src_space_cur_pos_x_i += src_walk_ux_i;
+              src_space_cur_pos_y_i += src_walk_uy_i;
+
+              dest++;
+            } /* end for x */
+
+          src_space_row_start_x_i += src_walk_vx_i;
+          src_space_row_start_y_i += src_walk_vy_i;
+
+          dest += dest_width - area->width;
+        } /* end for y */
+    });
+
+  gimp_brush_transform_blur (result, blur_radius);
+
+  return result;
+}
+
+/*
+ * Transforms the brush pixmap with bilinear interpolation.
+ *
+ * The algorithm used is exactly the same as for the brush mask
+ * (gimp_brush_real_transform_mask) except it accounts for 3 color channels
+ *  instead of 1 grayscale channel.
+ *
+ * Rather than calculating the inverse transform for each point in the
+ * transformed image, this algorithm uses the inverse transformed
+ * corner points of the destination image to work out the starting
+ * position in the source image and the U and V deltas in the source
+ * image space.  It then uses a scan-line approach, looping through
+ * rows and columns in the transformed (destination) image while
+ * walking along the corresponding rows and columns (named U and V) in
+ * the source image.
+ *
+ * The horizontal in destination space (transform result) is reverse
+ * transformed into source image space to get U.  The vertical in
+ * destination space (transform result) is reverse transformed into
+ * source image space to get V.
+ *
+ * The strength of this particular algorithm is that calculation work
+ * should depend more upon the final transformed brush size rather
+ * than the input brush size.
+ *
+ * There are no floating point calculations in the inner loop for speed.
+ *
+ * Some variables end with the suffix _i to indicate they have been
+ * premultiplied by int_multiple
+ */
+GimpTempBuf *
+gimp_brush_real_transform_pixmap (GimpBrush *brush,
+                                  gdouble    scale,
+                                  gdouble    aspect_ratio,
+                                  gdouble    angle,
+                                  gboolean   reflect,
+                                  gdouble    hardness)
+{
+  GimpTempBuf       *result;
+  const GimpTempBuf *source;
+  const guchar      *src;
+  GimpMatrix3        matrix;
+  gdouble            scale_x, scale_y;
+  gint               src_width;
+  gint               src_height;
+  gint               src_width_minus_one;
+  gint               src_height_minus_one;
+  gint               dest_width;
+  gint               dest_height;
+  gint               blur_radius;
+  gint               x, y;
+  gdouble            b_lx, b_rx, t_lx, t_rx;
+  gdouble            b_ly, b_ry, t_ly, t_ry;
+  gdouble            src_tl_to_tr_delta_x;
+  gdouble            src_tl_to_tr_delta_y;
+  gdouble            src_tl_to_bl_delta_x;
+  gdouble            src_tl_to_bl_delta_y;
+  gint               src_walk_ux_i;
+  gint               src_walk_uy_i;
+  gint               src_walk_vx_i;
+  gint               src_walk_vy_i;
+  gint               src_x_min_i;
+  gint               src_y_min_i;
+  gint               src_x_max_i;
+  gint               src_y_max_i;
+
+  /*
+   * tl, tr etc are used because it is easier to visualize top left,
+   * top right etc corners of the forward transformed source image
+   * rectangle.
+   */
+  const gint fraction_bits = 12;
+  const gint int_multiple  = pow (2, fraction_bits);
+
+  /* In inner loop's bilinear calculation, two numbers that were each
+   * previously multiplied by int_multiple are multiplied together.
+   * To get back the right result, the multiplication result must be
+   * divided *twice* by 2^fraction_bits, equivalent to bit shift right
+   * by 2 * fraction_bits
+   */
+  const gint recovery_bits = 2 * fraction_bits;
+
+  /*
+   * example: suppose fraction_bits = 9
+   * a 9-bit mask looks like this: 0001 1111 1111
+   * and is given by:  2^fraction_bits - 1
+   * demonstration:
+   * 2^0     = 0000 0000 0001
+   * 2^1     = 0000 0000 0010
+   * :
+   * 2^8     = 0001 0000 0000
+   * 2^9     = 0010 0000 0000
+   * 2^9 - 1 = 0001 1111 1111
+   */
+  const guint fraction_bitmask = pow(2, fraction_bits) - 1 ;
+
+  gimp_brush_transform_get_scale (scale, aspect_ratio,
+                                  &scale_x, &scale_y);
+
+  source = gimp_brush_mipmap_get_pixmap (brush, &scale_x, &scale_y);
+
+  src_width  = gimp_temp_buf_get_width  (source);
+  src_height = gimp_temp_buf_get_height (source);
+
+  gimp_brush_transform_matrix (src_width, src_height,
+                               scale_x, scale_y, angle, reflect, &matrix);
+
+  if (gimp_matrix3_is_identity (&matrix) && hardness == 1.0)
+    return gimp_temp_buf_copy (source);
+
+  src_width_minus_one  = src_width  - 1;
+  src_height_minus_one = src_height - 1;
+
+  gimp_brush_transform_bounding_box (source, &matrix,
+                                     &x, &y, &dest_width, &dest_height);
+
+  blur_radius = 0;
+
+  if (hardness < 1.0)
+    {
+      GimpMatrix3 unrotated_matrix;
+      gint        unrotated_x;
+      gint        unrotated_y;
+      gint        unrotated_dest_width;
+      gint        unrotated_dest_height;
+
+      gimp_brush_transform_matrix (src_width, src_height,
+                                   scale_x, scale_y, 0.0, FALSE,
+                                   &unrotated_matrix);
+
+      gimp_brush_transform_bounding_box (source, &unrotated_matrix,
+                                         &unrotated_x, &unrotated_y,
+                                         &unrotated_dest_width,
+                                         &unrotated_dest_height);
+
+      blur_radius = gimp_brush_transform_blur_radius (unrotated_dest_width,
+                                                      unrotated_dest_height,
+                                                      hardness);
+
+      gimp_brush_transform_adjust_hardness_matrix (dest_width, dest_height,
+                                                   blur_radius, &matrix);
+    }
+
+  gimp_matrix3_translate (&matrix, -x, -y);
+  gimp_matrix3_invert (&matrix);
+  gimp_matrix3_translate (&matrix, -0.5, -0.5);
+
+  result = gimp_temp_buf_new (dest_width, dest_height,
+                              gimp_temp_buf_get_format (source));
+
+  src = gimp_temp_buf_get_data (source);
+
+  /* prevent disappearance of 1x1 pixel brush at some rotations when
+     scaling < 1 */
+  /*
+  if (src_width == 1 && src_height == 1 && scale_x < 1 && scale_y < 1 )
+    {
+      *dest = src[0];
+      return result;
+    }*/
+
+  gimp_matrix3_transform_point (&matrix,
+                                0.5,              0.5,
+                                &t_lx,            &t_ly);
+  gimp_matrix3_transform_point (&matrix,
+                                dest_width - 0.5, 0.5,
+                                &t_rx,            &t_ry);
+  gimp_matrix3_transform_point (&matrix,
+                                0.5,              dest_height - 0.5,
+                                &b_lx,            &b_ly);
+  gimp_matrix3_transform_point (&matrix,
+                                dest_width - 0.5, dest_height - 0.5,
+                                &b_rx,            &b_ry);
+
+  /* in image space, calc U (what was horizontal originally)
+   * note: double precision
+   */
+  src_tl_to_tr_delta_x = t_rx - t_lx;
+  src_tl_to_tr_delta_y = t_ry - t_ly;
+
+  /* in image space, calc V (what was vertical originally)
+   * note: double precision
+   */
+  src_tl_to_bl_delta_x = b_lx - t_lx;
+  src_tl_to_bl_delta_y = b_ly - t_ly;
+
+  /* speed optimized, note conversion to int precision */
+  src_walk_ux_i = (gint) ((src_tl_to_tr_delta_x / MAX (dest_width  - 1, 1)) *
+                          int_multiple);
+  src_walk_uy_i = (gint) ((src_tl_to_tr_delta_y / MAX (dest_width  - 1, 1)) *
+                          int_multiple);
+  src_walk_vx_i = (gint) ((src_tl_to_bl_delta_x / MAX (dest_height - 1, 1)) *
+                          int_multiple);
+  src_walk_vy_i = (gint) ((src_tl_to_bl_delta_y / MAX (dest_height - 1, 1)) *
+                          int_multiple);
+
+  src_x_min_i = -int_multiple / 2;
+  src_y_min_i = -int_multiple / 2;
+
+  src_x_max_i = src_width  * int_multiple - int_multiple / 2;
+  src_y_max_i = src_height * int_multiple - int_multiple / 2;
+
+  gegl_parallel_distribute_area (
+    GEGL_RECTANGLE (0, 0, dest_width, dest_height), PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *area)
+    {
+      guchar       *dest;
+      gint          src_space_cur_pos_x;
+      gint          src_space_cur_pos_y;
+      gint          src_space_cur_pos_x_i;
+      gint          src_space_cur_pos_y_i;
+      gint          src_space_row_start_x_i;
+      gint          src_space_row_start_y_i;
+      const guchar *src_walker;
+      const guchar *pixel_next;
+      const guchar *pixel_below;
+      const guchar *pixel_below_next;
+      gint          opposite_x, distance_from_true_x;
+      gint          opposite_y, distance_from_true_y;
+      gint          u, v;
+
+      dest = gimp_temp_buf_get_data (result) +
+             3 * (dest_width * area->y + area->x);
+
+      /* initialize current position in source space to the start position (tl)
+       * speed optimized, note conversion to int precision
+       */
+      src_space_row_start_x_i = (gint) (t_lx * int_multiple) +
+                                src_walk_vx_i * area->y      +
+                                src_walk_ux_i * area->x;
+      src_space_row_start_y_i = (gint) (t_ly * int_multiple) +
+                                src_walk_vy_i * area->y      +
+                                src_walk_uy_i * area->x;
+
+      for (v = 0; v < area->height; v++)
+        {
+          src_space_cur_pos_x_i = src_space_row_start_x_i;
+          src_space_cur_pos_y_i = src_space_row_start_y_i;
+
+          for (u = 0; u < area->width; u++)
+            {
+              if (src_space_cur_pos_x_i <  src_x_min_i ||
+                  src_space_cur_pos_x_i >= src_x_max_i ||
+                  src_space_cur_pos_y_i <  src_y_min_i ||
+                  src_space_cur_pos_y_i >= src_y_max_i)
+                  /* no corresponding pixel in source space */
+                {
+                  dest[0] = 0;
+                  dest[1] = 0;
+                  dest[2] = 0;
+                }
+              else /* reverse transformed point hits source pixel */
+                {
+                  src_space_cur_pos_x = src_space_cur_pos_x_i >> fraction_bits;
+                  src_space_cur_pos_y = src_space_cur_pos_y_i >> fraction_bits;
+
+                  src_walker = src                                  +
+                               3 * (src_space_cur_pos_y * src_width +
+                                    src_space_cur_pos_x);
+
+                  pixel_next       = src_walker + 3;
+                  pixel_below      = src_walker + 3 * src_width;
+                  pixel_below_next = pixel_below + 3;
+
+                  if (src_space_cur_pos_x < 0)
+                    {
+                      src_walker  = pixel_next;
+                      pixel_below = pixel_below_next;
+                    }
+                  else if (src_space_cur_pos_x >= src_width_minus_one)
+                    {
+                      pixel_next       = src_walker;
+                      pixel_below_next = pixel_below;
+                    }
+
+                  if (src_space_cur_pos_y < 0)
+                    {
+                      src_walker = pixel_below;
+                      pixel_next = pixel_below_next;
+                    }
+                  else if (src_space_cur_pos_y >= src_height_minus_one)
+                    {
+                      pixel_below      = src_walker;
+                      pixel_below_next = pixel_next;
+                    }
+
+                  distance_from_true_x = src_space_cur_pos_x_i & fraction_bitmask;
+                  distance_from_true_y = src_space_cur_pos_y_i & fraction_bitmask;
+                  opposite_x =  int_multiple - distance_from_true_x;
+                  opposite_y =  int_multiple - distance_from_true_y;
+
+                  dest[0] = ((src_walker[0] * opposite_x +
+                              pixel_next[0] * distance_from_true_x) * opposite_y +
+                             (pixel_below[0] * opposite_x +
+                              pixel_below_next[0] *distance_from_true_x) * distance_from_true_y
+                            ) >> recovery_bits;
+
+                  dest[1] = ((src_walker[1] * opposite_x +
+                              pixel_next[1] * distance_from_true_x) * opposite_y +
+                             (pixel_below[1] * opposite_x +
+                              pixel_below_next[1] *distance_from_true_x) * distance_from_true_y
+                            ) >> recovery_bits;
+
+                  dest[2] = ((src_walker[2] * opposite_x +
+                              pixel_next[2] * distance_from_true_x) * opposite_y +
+                             (pixel_below[2] * opposite_x +
+                              pixel_below_next[2] *distance_from_true_x) * distance_from_true_y
+                            ) >> recovery_bits;
+                }
+
+              src_space_cur_pos_x_i += src_walk_ux_i;
+              src_space_cur_pos_y_i += src_walk_uy_i;
+
+              dest += 3;
+            } /* end for x */
+
+          src_space_row_start_x_i += src_walk_vx_i;
+          src_space_row_start_y_i += src_walk_vy_i;
+
+          dest += 3 * (dest_width - area->width);
+        } /* end for y */
+    });
+
+  gimp_brush_transform_blur (result, blur_radius);
+
+  return result;
+}
+
+void
+gimp_brush_transform_get_scale (gdouble  scale,
+                                gdouble  aspect_ratio,
+                                gdouble *scale_x,
+                                gdouble *scale_y)
+{
+  if (aspect_ratio < 0.0)
+    {
+      *scale_x = scale * (1.0 + (aspect_ratio / 20.0));
+      *scale_y = scale;
+    }
+  else
+    {
+      *scale_x = scale;
+      *scale_y = scale * (1.0 - (aspect_ratio / 20.0));
+    }
+}
+
+void
+gimp_brush_transform_matrix (gdouble      width,
+                             gdouble      height,
+                             gdouble      scale_x,
+                             gdouble      scale_y,
+                             gdouble      angle,
+                             gboolean     reflect,
+                             GimpMatrix3 *matrix)
+{
+  const gdouble center_x = width  / 2;
+  const gdouble center_y = height / 2;
+
+  gimp_matrix3_identity (matrix);
+  gimp_matrix3_scale (matrix, scale_x, scale_y);
+  gimp_matrix3_translate (matrix, - center_x * scale_x, - center_y * scale_y);
+  gimp_matrix3_rotate (matrix, -2 * G_PI * angle);
+  if (reflect)
+    gimp_matrix3_scale (matrix, -1.0, 1.0);
+  gimp_matrix3_translate (matrix, center_x * scale_x, center_y * scale_y);
+}
+
+/*  private functions  */
+
+static void
+gimp_brush_transform_bounding_box (const GimpTempBuf *temp_buf,
+                                   const GimpMatrix3 *matrix,
+                                   gint              *x,
+                                   gint              *y,
+                                   gint              *width,
+                                   gint              *height)
+{
+  const gdouble  w = gimp_temp_buf_get_width  (temp_buf);
+  const gdouble  h = gimp_temp_buf_get_height (temp_buf);
+  gdouble        x1, x2, x3, x4;
+  gdouble        y1, y2, y3, y4;
+
+  gimp_matrix3_transform_point (matrix, 0, 0, &x1, &y1);
+  gimp_matrix3_transform_point (matrix, w, 0, &x2, &y2);
+  gimp_matrix3_transform_point (matrix, 0, h, &x3, &y3);
+  gimp_matrix3_transform_point (matrix, w, h, &x4, &y4);
+
+  *x = (gint) ceil (MIN (MIN (x1, x2), MIN (x3, x4)) - 0.5);
+  *y = (gint) ceil (MIN (MIN (y1, y2), MIN (y3, y4)) - 0.5);
+
+  *width  = (gint) ceil (MAX (MAX (x1, x2), MAX (x3, x4)) - 0.5) - *x;
+  *height = (gint) ceil (MAX (MAX (y1, y2), MAX (y3, y4)) - 0.5) - *y;
+
+  /* Transform size can not be less than 1 px */
+  *width  = MAX (1, *width);
+  *height = MAX (1, *height);
+}
+
+/* Blurs the brush mask/pixmap, in place, using a convolution of the form:
+ *
+ *   12  11  10   9   8
+ *    7   6   5   4   3
+ *    2   1   0   1   2
+ *    3   4   5   6   7
+ *    8   9  10  11  12
+ *
+ * (i.e., an array, wrapped into a matrix, whose i-th element is
+ * `abs (i - a / 2)`, where `a` is the length of the array.)  `r` specifies the
+ * convolution kernel's radius.
+ */
+static void
+gimp_brush_transform_blur (GimpTempBuf *buf,
+                           gint         r)
+{
+  typedef struct
+  {
+    gint sum;
+    gint weighted_sum;
+    gint middle_sum;
+  } Sums;
+
+  const Babl *format       = gimp_temp_buf_get_format (buf);
+  gint        components   = babl_format_get_n_components (format);
+  gint        components_r = components * r;
+  gint        width        = gimp_temp_buf_get_width (buf);
+  gint        height       = gimp_temp_buf_get_height (buf);
+  gint        stride       = components * width;
+  gint        stride_r     = stride * r;
+  guchar     *data         = gimp_temp_buf_get_data (buf);
+  gint        rw           = MIN (r, width - 1);
+  gint        rh           = MIN (r, height - 1);
+  gfloat      n            = 2 * r + 1;
+  gfloat      n_r          = n * r;
+  gfloat      weight       = floor (n * n / 2) * (floor (n * n / 2) + 1);
+  gfloat      weight_inv   = 1 / weight;
+  Sums       *sums;
+
+  if (rw <= 0 || rh <= 0)
+    return;
+
+  sums = g_new (Sums, width * height * components);
+
+  gegl_parallel_distribute_range (
+    height, PIXELS_PER_THREAD / width,
+    [=] (gint y0, gint height)
+    {
+      gint          x;
+      gint          y;
+      gint          c;
+      const guchar *d;
+      Sums         *s;
+
+      d = data + y0 * stride;
+      s = sums + y0 * stride;
+
+      for (y = 0; y < height; y++)
+        {
+          const guchar *p;
+
+          struct
+          {
+            gint sum;
+            gint weighted_sum;
+            gint leading_sum;
+            gint leading_weighted_sum;
+          } acc[components];
+
+          memset (acc, 0, sizeof (acc));
+
+          p = d;
+
+          for (x = 0; x <= rw; x++)
+            {
+              for (c = 0; c < components; c++)
+                {
+                  acc[c].sum          +=      *p;
+                  acc[c].weighted_sum += -x * *p;
+
+                  p++;
+                }
+            }
+
+          for (x = 0; x < width; x++)
+            {
+              for (c = 0; c < components; c++)
+                {
+                  if (x > 0)
+                    {
+                      acc[c].weighted_sum         += acc[c].sum;
+                      acc[c].leading_weighted_sum += acc[c].leading_sum;
+
+                      if (x < width - r)
+                        {
+                          acc[c].sum              +=      d[components_r];
+                          acc[c].weighted_sum     += -r * d[components_r];
+                        }
+                    }
+
+                  acc[c].leading_sum += d[0];
+
+                  s->sum          = acc[c].sum;
+                  s->weighted_sum = acc[c].weighted_sum;
+                  s->middle_sum   = 2 * acc[c].leading_weighted_sum -
+                                    acc[c].weighted_sum;
+
+                  if (x >= r)
+                    {
+                      acc[c].sum                  -=     d[-components_r];
+                      acc[c].weighted_sum         -= r * d[-components_r];
+                      acc[c].leading_sum          -=     d[-components_r];
+                      acc[c].leading_weighted_sum -= r * d[-components_r];
+                    }
+
+                  d++;
+                  s++;
+                }
+            }
+        }
+    });
+
+  gegl_parallel_distribute_range (
+    width, PIXELS_PER_THREAD / height,
+    [=] (gint x0, gint width)
+    {
+      gint        x;
+      gint        y;
+      gint        c;
+      guchar     *d0;
+      const Sums *s0;
+      guchar     *d;
+      const Sums *s;
+
+      d0 = data + x0 * components;
+      s0 = sums + x0 * components;
+
+      for (x = 0; x < width; x++)
+        {
+          const Sums *p;
+          gfloat      n_y;
+
+          struct
+          {
+            gfloat weighted_sum;
+            gint   leading_sum;
+            gint   trailing_sum;
+          } acc[components];
+
+          memset (acc, 0, sizeof (acc));
+
+          d = d0 + components * x;
+          s = s0 + components * x;
+
+          p = s + stride;
+
+          for (y = 1, n_y = n; y <= rh; y++, n_y += n)
+            {
+              for (c = 0; c < components; c++)
+                {
+                  acc[c].weighted_sum += n_y * p->sum - p->weighted_sum;
+                  acc[c].trailing_sum += p->sum;
+
+                  p++;
+                }
+
+              p += stride - components;
+            }
+
+          for (y = 0; y < height; y++)
+            {
+              for (c = 0; c < components; c++)
+                {
+                  if (y > 0)
+                    {
+                      acc[c].weighted_sum += s->weighted_sum          +
+                                             n * (acc[c].leading_sum  -
+                                                  acc[c].trailing_sum);
+                      acc[c].trailing_sum -= s->sum;
+
+                      if (y < height - r)
+                        {
+                          acc[c].weighted_sum += n_r * s[stride_r].sum -
+                                                 s[stride_r].weighted_sum;
+                          acc[c].trailing_sum += s[stride_r].sum;
+                        }
+                    }
+
+                  acc[c].leading_sum  += s->sum;
+
+                  *d = (acc[c].weighted_sum + s->middle_sum) * weight_inv + 0.5f;
+
+                  acc[c].weighted_sum += s->weighted_sum;
+
+                  if (y >= r)
+                    {
+                      acc[c].weighted_sum -= n_r * s[-stride_r].sum +
+                                             s[-stride_r].weighted_sum;
+                      acc[c].leading_sum  -= s[-stride_r].sum;
+                    }
+
+                  d++;
+                  s++;
+                }
+
+              d += stride - components;
+              s += stride - components;
+            }
+        }
+    });
+
+  g_free (sums);
+}
+
+static gint
+gimp_brush_transform_blur_radius (gint    height,
+                                  gint    width,
+                                  gdouble hardness)
+{
+  return floor ((1.0 - hardness) * (sqrt (0.5) - 0.5) * MIN (width, height));
+}
+
+static void
+gimp_brush_transform_adjust_hardness_matrix (gdouble      width,
+                                             gdouble      height,
+                                             gdouble      blur_radius,
+                                             GimpMatrix3 *matrix)
+{
+  gdouble scale;
+
+  if (blur_radius == 0.0)
+    return;
+
+  scale = (MIN (width, height) - 2.0 * blur_radius) / MIN (width, height);
+
+  gimp_matrix3_scale (matrix, scale, scale);
+  gimp_matrix3_translate (matrix,
+                          (1.0 - scale) * width  / 2.0,
+                          (1.0 - scale) * height / 2.0);
+}
+
+} /* extern "C" */
diff --git a/app/core/gimpbrush-transform.h b/app/core/gimpbrush-transform.h
new file mode 100644
index 0000000..5f7cbcb
--- /dev/null
+++ b/app/core/gimpbrush-transform.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrush-transform.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_TRANSFORM_H__
+#define __GIMP_BRUSH_TRANSFORM_H__
+
+
+/*  virtual functions of GimpBrush, don't call directly  */
+
+void          gimp_brush_real_transform_size   (GimpBrush   *brush,
+                                                gdouble      scale,
+                                                gdouble      aspect_ratio,
+                                                gdouble      angle,
+                                                gboolean     reflect,
+                                                gint        *scaled_width,
+                                                gint        *scaled_height);
+GimpTempBuf * gimp_brush_real_transform_mask   (GimpBrush   *brush,
+                                                gdouble      scale,
+                                                gdouble      aspect_ratio,
+                                                gdouble      angle,
+                                                gboolean     reflect,
+                                                gdouble      hardness);
+GimpTempBuf * gimp_brush_real_transform_pixmap (GimpBrush   *brush,
+                                                gdouble      scale,
+                                                gdouble      aspect_ratio,
+                                                gdouble      angle,
+                                                gboolean     reflect,
+                                                gdouble      hardness);
+
+void          gimp_brush_transform_get_scale   (gdouble      scale,
+                                                gdouble      aspect_ratio,
+                                                gdouble     *scale_x,
+                                                gdouble     *scale_y);
+void          gimp_brush_transform_matrix      (gdouble      width,
+                                                gdouble      height,
+                                                gdouble      scale_x,
+                                                gdouble      scale_y,
+                                                gdouble      angle,
+                                                gboolean     reflect,
+                                                GimpMatrix3 *matrix);
+
+
+#endif  /*  __GIMP_BRUSH_TRANSFORM_H__  */
diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c
new file mode 100644
index 0000000..8e15115
--- /dev/null
+++ b/app/core/gimpbrush.c
@@ -0,0 +1,942 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpbezierdesc.h"
+#include "gimpbrush.h"
+#include "gimpbrush-boundary.h"
+#include "gimpbrush-load.h"
+#include "gimpbrush-mipmap.h"
+#include "gimpbrush-private.h"
+#include "gimpbrush-save.h"
+#include "gimpbrush-transform.h"
+#include "gimpbrushcache.h"
+#include "gimpbrushgenerated.h"
+#include "gimpbrushpipe.h"
+#include "gimpmarshal.h"
+#include "gimptagged.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  SPACING_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_SPACING
+};
+
+
+static void          gimp_brush_tagged_iface_init     (GimpTaggedInterface  *iface);
+
+static void          gimp_brush_finalize              (GObject              *object);
+static void          gimp_brush_set_property          (GObject              *object,
+                                                       guint                 property_id,
+                                                       const GValue         *value,
+                                                       GParamSpec           *pspec);
+static void          gimp_brush_get_property          (GObject              *object,
+                                                       guint                 property_id,
+                                                       GValue               *value,
+                                                       GParamSpec           *pspec);
+
+static gint64        gimp_brush_get_memsize           (GimpObject           *object,
+                                                       gint64               *gui_size);
+
+static gboolean      gimp_brush_get_size              (GimpViewable         *viewable,
+                                                       gint                 *width,
+                                                       gint                 *height);
+static GimpTempBuf * gimp_brush_get_new_preview       (GimpViewable         *viewable,
+                                                       GimpContext          *context,
+                                                       gint                  width,
+                                                       gint                  height);
+static gchar       * gimp_brush_get_description       (GimpViewable         *viewable,
+                                                       gchar               **tooltip);
+
+static void          gimp_brush_dirty                 (GimpData             *data);
+static const gchar * gimp_brush_get_extension         (GimpData             *data);
+static void          gimp_brush_copy                  (GimpData             *data,
+                                                       GimpData             *src_data);
+
+static void          gimp_brush_real_begin_use        (GimpBrush            *brush);
+static void          gimp_brush_real_end_use          (GimpBrush            *brush);
+static GimpBrush   * gimp_brush_real_select_brush     (GimpBrush            *brush,
+                                                       const GimpCoords     *last_coords,
+                                                       const GimpCoords     *current_coords);
+static gboolean      gimp_brush_real_want_null_motion (GimpBrush            *brush,
+                                                       const GimpCoords     *last_coords,
+                                                       const GimpCoords     *current_coords);
+
+static gchar       * gimp_brush_get_checksum          (GimpTagged           *tagged);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBrush, gimp_brush, GIMP_TYPE_DATA,
+                         G_ADD_PRIVATE (GimpBrush)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_TAGGED,
+                                                gimp_brush_tagged_iface_init))
+
+#define parent_class gimp_brush_parent_class
+
+static guint brush_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_brush_class_init (GimpBrushClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+
+  brush_signals[SPACING_CHANGED] =
+    g_signal_new ("spacing-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpBrushClass, spacing_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize            = gimp_brush_finalize;
+  object_class->get_property        = gimp_brush_get_property;
+  object_class->set_property        = gimp_brush_set_property;
+
+  gimp_object_class->get_memsize    = gimp_brush_get_memsize;
+
+  viewable_class->default_icon_name = "gimp-tool-paintbrush";
+  viewable_class->get_size          = gimp_brush_get_size;
+  viewable_class->get_new_preview   = gimp_brush_get_new_preview;
+  viewable_class->get_description   = gimp_brush_get_description;
+
+  data_class->dirty                 = gimp_brush_dirty;
+  data_class->save                  = gimp_brush_save;
+  data_class->get_extension         = gimp_brush_get_extension;
+  data_class->copy                  = gimp_brush_copy;
+
+  klass->begin_use                  = gimp_brush_real_begin_use;
+  klass->end_use                    = gimp_brush_real_end_use;
+  klass->select_brush               = gimp_brush_real_select_brush;
+  klass->want_null_motion           = gimp_brush_real_want_null_motion;
+  klass->transform_size             = gimp_brush_real_transform_size;
+  klass->transform_mask             = gimp_brush_real_transform_mask;
+  klass->transform_pixmap           = gimp_brush_real_transform_pixmap;
+  klass->transform_boundary         = gimp_brush_real_transform_boundary;
+  klass->spacing_changed            = NULL;
+
+  g_object_class_install_property (object_class, PROP_SPACING,
+                                   g_param_spec_double ("spacing", NULL,
+                                                        _("Brush Spacing"),
+                                                        1.0, 5000.0, 20.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_brush_tagged_iface_init (GimpTaggedInterface *iface)
+{
+  iface->get_checksum = gimp_brush_get_checksum;
+}
+
+static void
+gimp_brush_init (GimpBrush *brush)
+{
+  brush->priv = gimp_brush_get_instance_private (brush);
+
+  brush->priv->spacing  = 20;
+  brush->priv->x_axis.x = 15.0;
+  brush->priv->x_axis.y =  0.0;
+  brush->priv->y_axis.x =  0.0;
+  brush->priv->y_axis.y = 15.0;
+
+  brush->priv->blur_hardness = 1.0;
+}
+
+static void
+gimp_brush_finalize (GObject *object)
+{
+  GimpBrush *brush = GIMP_BRUSH (object);
+
+  g_clear_pointer (&brush->priv->mask,          gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->pixmap,        gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->blurred_mask,   gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->blurred_pixmap, gimp_temp_buf_unref);
+
+  gimp_brush_mipmap_clear (brush);
+
+  g_clear_object (&brush->priv->mask_cache);
+  g_clear_object (&brush->priv->pixmap_cache);
+  g_clear_object (&brush->priv->boundary_cache);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_brush_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GimpBrush *brush = GIMP_BRUSH (object);
+
+  switch (property_id)
+    {
+    case PROP_SPACING:
+      gimp_brush_set_spacing (brush, g_value_get_double (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_brush_get_property (GObject    *object,
+                         guint       property_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GimpBrush *brush = GIMP_BRUSH (object);
+
+  switch (property_id)
+    {
+    case PROP_SPACING:
+      g_value_set_double (value, gimp_brush_get_spacing (brush));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_brush_get_memsize (GimpObject *object,
+                        gint64     *gui_size)
+{
+  GimpBrush *brush   = GIMP_BRUSH (object);
+  gint64     memsize = 0;
+
+  memsize += gimp_temp_buf_get_memsize (brush->priv->mask);
+  memsize += gimp_temp_buf_get_memsize (brush->priv->pixmap);
+
+  memsize += gimp_brush_mipmap_get_memsize (brush);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_brush_get_size (GimpViewable *viewable,
+                     gint         *width,
+                     gint         *height)
+{
+  GimpBrush *brush = GIMP_BRUSH (viewable);
+
+  *width  = gimp_temp_buf_get_width  (brush->priv->mask);
+  *height = gimp_temp_buf_get_height (brush->priv->mask);
+
+  return TRUE;
+}
+
+static GimpTempBuf *
+gimp_brush_get_new_preview (GimpViewable *viewable,
+                            GimpContext  *context,
+                            gint          width,
+                            gint          height)
+{
+  GimpBrush         *brush       = GIMP_BRUSH (viewable);
+  const GimpTempBuf *mask_buf    = brush->priv->mask;
+  const GimpTempBuf *pixmap_buf  = brush->priv->pixmap;
+  GimpTempBuf       *return_buf  = NULL;
+  gint               mask_width;
+  gint               mask_height;
+  guchar            *mask_data;
+  guchar            *mask;
+  guchar            *buf;
+  gint               x, y;
+  gboolean           scaled = FALSE;
+
+  mask_width  = gimp_temp_buf_get_width  (mask_buf);
+  mask_height = gimp_temp_buf_get_height (mask_buf);
+
+  if (mask_width > width || mask_height > height)
+    {
+      gdouble ratio_x = (gdouble) width  / (gdouble) mask_width;
+      gdouble ratio_y = (gdouble) height / (gdouble) mask_height;
+      gdouble scale   = MIN (ratio_x, ratio_y);
+
+      if (scale != 1.0)
+        {
+          gimp_brush_begin_use (brush);
+
+          if (GIMP_IS_BRUSH_GENERATED (brush))
+            {
+               GimpBrushGenerated *gen_brush = GIMP_BRUSH_GENERATED (brush);
+
+               mask_buf = gimp_brush_transform_mask (brush, scale,
+                                                     (gimp_brush_generated_get_aspect_ratio (gen_brush) - 1.0) * 20.0 / 19.0,
+                                                     gimp_brush_generated_get_angle (gen_brush) / 360.0,
+                                                     FALSE,
+                                                     gimp_brush_generated_get_hardness (gen_brush));
+            }
+          else
+            mask_buf = gimp_brush_transform_mask (brush, scale,
+                                                  0.0, 0.0, FALSE, 1.0);
+
+          if (! mask_buf)
+            {
+              mask_buf = gimp_temp_buf_new (1, 1, babl_format ("Y u8"));
+              gimp_temp_buf_data_clear ((GimpTempBuf *) mask_buf);
+            }
+          else
+            {
+              gimp_temp_buf_ref ((GimpTempBuf *) mask_buf);
+            }
+
+          if (pixmap_buf)
+            pixmap_buf = gimp_brush_transform_pixmap (brush, scale,
+                                                      0.0, 0.0, FALSE, 1.0);
+
+          mask_width  = gimp_temp_buf_get_width  (mask_buf);
+          mask_height = gimp_temp_buf_get_height (mask_buf);
+
+          scaled = TRUE;
+        }
+    }
+
+  return_buf = gimp_temp_buf_new (mask_width, mask_height,
+                                  babl_format ("R'G'B'A u8"));
+
+  mask = mask_data = gimp_temp_buf_lock (mask_buf, babl_format ("Y u8"),
+                                         GEGL_ACCESS_READ);
+  buf  = gimp_temp_buf_get_data (return_buf);
+
+  if (pixmap_buf)
+    {
+      guchar *pixmap_data;
+      guchar *pixmap;
+
+      pixmap = pixmap_data = gimp_temp_buf_lock (pixmap_buf,
+                                                 babl_format ("R'G'B' u8"),
+                                                 GEGL_ACCESS_READ);
+
+      for (y = 0; y < mask_height; y++)
+        {
+          for (x = 0; x < mask_width ; x++)
+            {
+              *buf++ = *pixmap++;
+              *buf++ = *pixmap++;
+              *buf++ = *pixmap++;
+              *buf++ = *mask++;
+            }
+        }
+
+      gimp_temp_buf_unlock (pixmap_buf, pixmap_data);
+    }
+  else
+    {
+      for (y = 0; y < mask_height; y++)
+        {
+          for (x = 0; x < mask_width ; x++)
+            {
+              *buf++ = 0;
+              *buf++ = 0;
+              *buf++ = 0;
+              *buf++ = *mask++;
+            }
+        }
+    }
+
+  gimp_temp_buf_unlock (mask_buf, mask_data);
+
+  if (scaled)
+    {
+      gimp_temp_buf_unref ((GimpTempBuf *) mask_buf);
+
+      gimp_brush_end_use (brush);
+    }
+
+  return return_buf;
+}
+
+static gchar *
+gimp_brush_get_description (GimpViewable  *viewable,
+                            gchar        **tooltip)
+{
+  GimpBrush *brush = GIMP_BRUSH (viewable);
+
+  return g_strdup_printf ("%s (%d × %d)",
+                          gimp_object_get_name (brush),
+                          gimp_temp_buf_get_width  (brush->priv->mask),
+                          gimp_temp_buf_get_height (brush->priv->mask));
+}
+
+static void
+gimp_brush_dirty (GimpData *data)
+{
+  GimpBrush *brush = GIMP_BRUSH (data);
+
+  if (brush->priv->mask_cache)
+    gimp_brush_cache_clear (brush->priv->mask_cache);
+
+  if (brush->priv->pixmap_cache)
+    gimp_brush_cache_clear (brush->priv->pixmap_cache);
+
+  if (brush->priv->boundary_cache)
+    gimp_brush_cache_clear (brush->priv->boundary_cache);
+
+  gimp_brush_mipmap_clear (brush);
+
+  g_clear_pointer (&brush->priv->blurred_mask,   gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->blurred_pixmap, gimp_temp_buf_unref);
+
+  GIMP_DATA_CLASS (parent_class)->dirty (data);
+}
+
+static const gchar *
+gimp_brush_get_extension (GimpData *data)
+{
+  return GIMP_BRUSH_FILE_EXTENSION;
+}
+
+static void
+gimp_brush_copy (GimpData *data,
+                 GimpData *src_data)
+{
+  GimpBrush *brush     = GIMP_BRUSH (data);
+  GimpBrush *src_brush = GIMP_BRUSH (src_data);
+
+  g_clear_pointer (&brush->priv->mask, gimp_temp_buf_unref);
+  if (src_brush->priv->mask)
+    brush->priv->mask = gimp_temp_buf_copy (src_brush->priv->mask);
+
+  g_clear_pointer (&brush->priv->pixmap, gimp_temp_buf_unref);
+  if (src_brush->priv->pixmap)
+    brush->priv->pixmap = gimp_temp_buf_copy (src_brush->priv->pixmap);
+
+  brush->priv->spacing = src_brush->priv->spacing;
+  brush->priv->x_axis  = src_brush->priv->x_axis;
+  brush->priv->y_axis  = src_brush->priv->y_axis;
+
+  gimp_data_dirty (data);
+}
+
+static void
+gimp_brush_real_begin_use (GimpBrush *brush)
+{
+  brush->priv->mask_cache =
+    gimp_brush_cache_new ((GDestroyNotify) gimp_temp_buf_unref, 'M', 'm');
+
+  brush->priv->pixmap_cache =
+    gimp_brush_cache_new ((GDestroyNotify) gimp_temp_buf_unref, 'P', 'p');
+
+  brush->priv->boundary_cache =
+    gimp_brush_cache_new ((GDestroyNotify) gimp_bezier_desc_free, 'B', 'b');
+}
+
+static void
+gimp_brush_real_end_use (GimpBrush *brush)
+{
+  g_clear_object (&brush->priv->mask_cache);
+  g_clear_object (&brush->priv->pixmap_cache);
+  g_clear_object (&brush->priv->boundary_cache);
+
+  g_clear_pointer (&brush->priv->blurred_mask,   gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->blurred_pixmap, gimp_temp_buf_unref);
+}
+
+static GimpBrush *
+gimp_brush_real_select_brush (GimpBrush        *brush,
+                              const GimpCoords *last_coords,
+                              const GimpCoords *current_coords)
+{
+  return brush;
+}
+
+static gboolean
+gimp_brush_real_want_null_motion (GimpBrush        *brush,
+                                  const GimpCoords *last_coords,
+                                  const GimpCoords *current_coords)
+{
+  return TRUE;
+}
+
+static gchar *
+gimp_brush_get_checksum (GimpTagged *tagged)
+{
+  GimpBrush *brush           = GIMP_BRUSH (tagged);
+  gchar     *checksum_string = NULL;
+
+  if (brush->priv->mask)
+    {
+      GChecksum *checksum = g_checksum_new (G_CHECKSUM_MD5);
+
+      g_checksum_update (checksum,
+                         gimp_temp_buf_get_data (brush->priv->mask),
+                         gimp_temp_buf_get_data_size (brush->priv->mask));
+      if (brush->priv->pixmap)
+        g_checksum_update (checksum,
+                           gimp_temp_buf_get_data (brush->priv->pixmap),
+                           gimp_temp_buf_get_data_size (brush->priv->pixmap));
+      g_checksum_update (checksum,
+                         (const guchar *) &brush->priv->spacing,
+                         sizeof (brush->priv->spacing));
+      g_checksum_update (checksum,
+                         (const guchar *) &brush->priv->x_axis,
+                         sizeof (brush->priv->x_axis));
+      g_checksum_update (checksum,
+                         (const guchar *) &brush->priv->y_axis,
+                         sizeof (brush->priv->y_axis));
+
+      checksum_string = g_strdup (g_checksum_get_string (checksum));
+
+      g_checksum_free (checksum);
+    }
+
+  return checksum_string;
+}
+
+/*  public functions  */
+
+GimpData *
+gimp_brush_new (GimpContext *context,
+                const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return gimp_brush_generated_new (name,
+                                   GIMP_BRUSH_GENERATED_CIRCLE,
+                                   5.0, 2, 0.5, 1.0, 0.0);
+}
+
+GimpData *
+gimp_brush_get_standard (GimpContext *context)
+{
+  static GimpData *standard_brush = NULL;
+
+  if (! standard_brush)
+    {
+      standard_brush = gimp_brush_new (context, "Standard");
+
+      gimp_data_clean (standard_brush);
+      gimp_data_make_internal (standard_brush, "gimp-brush-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_brush),
+                                 (gpointer *) &standard_brush);
+    }
+
+  return standard_brush;
+}
+
+void
+gimp_brush_begin_use (GimpBrush *brush)
+{
+  g_return_if_fail (GIMP_IS_BRUSH (brush));
+
+  brush->priv->use_count++;
+
+  if (brush->priv->use_count == 1)
+    GIMP_BRUSH_GET_CLASS (brush)->begin_use (brush);
+}
+
+void
+gimp_brush_end_use (GimpBrush *brush)
+{
+  g_return_if_fail (GIMP_IS_BRUSH (brush));
+  g_return_if_fail (brush->priv->use_count > 0);
+
+  brush->priv->use_count--;
+
+  if (brush->priv->use_count == 0)
+    GIMP_BRUSH_GET_CLASS (brush)->end_use (brush);
+}
+
+GimpBrush *
+gimp_brush_select_brush (GimpBrush        *brush,
+                         const GimpCoords *last_coords,
+                         const GimpCoords *current_coords)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+  g_return_val_if_fail (last_coords != NULL, NULL);
+  g_return_val_if_fail (current_coords != NULL, NULL);
+
+  return GIMP_BRUSH_GET_CLASS (brush)->select_brush (brush,
+                                                     last_coords,
+                                                     current_coords);
+}
+
+gboolean
+gimp_brush_want_null_motion (GimpBrush        *brush,
+                             const GimpCoords *last_coords,
+                             const GimpCoords *current_coords)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), FALSE);
+  g_return_val_if_fail (last_coords != NULL, FALSE);
+  g_return_val_if_fail (current_coords != NULL, FALSE);
+
+  return GIMP_BRUSH_GET_CLASS (brush)->want_null_motion (brush,
+                                                         last_coords,
+                                                         current_coords);
+}
+
+void
+gimp_brush_transform_size (GimpBrush     *brush,
+                           gdouble        scale,
+                           gdouble        aspect_ratio,
+                           gdouble        angle,
+                           gboolean       reflect,
+                           gint          *width,
+                           gint          *height)
+{
+  g_return_if_fail (GIMP_IS_BRUSH (brush));
+  g_return_if_fail (scale > 0.0);
+  g_return_if_fail (width != NULL);
+  g_return_if_fail (height != NULL);
+
+  if (scale             == 1.0 &&
+      aspect_ratio      == 0.0 &&
+      fmod (angle, 0.5) == 0.0)
+    {
+      *width  = gimp_temp_buf_get_width  (brush->priv->mask);
+      *height = gimp_temp_buf_get_height (brush->priv->mask);
+
+      return;
+    }
+
+  GIMP_BRUSH_GET_CLASS (brush)->transform_size (brush,
+                                                scale, aspect_ratio, angle, reflect,
+                                                width, height);
+}
+
+const GimpTempBuf *
+gimp_brush_transform_mask (GimpBrush *brush,
+                           gdouble    scale,
+                           gdouble    aspect_ratio,
+                           gdouble    angle,
+                           gboolean   reflect,
+                           gdouble    hardness)
+{
+  const GimpTempBuf *mask;
+  gint               width;
+  gint               height;
+  gdouble            effective_hardness = hardness;
+
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+  g_return_val_if_fail (scale > 0.0, NULL);
+
+  gimp_brush_transform_size (brush,
+                             scale, aspect_ratio, angle, reflect,
+                             &width, &height);
+
+  mask = gimp_brush_cache_get (brush->priv->mask_cache,
+                               width, height,
+                               scale, aspect_ratio, angle, reflect, hardness);
+
+  if (! mask)
+    {
+#if 0
+      /* This code makes sure that brushes using blur for hardness
+       * (all of them but generated) are blurred once and no more.
+       * It also makes hardnes dynamics not work for these brushes.
+       * This is intentional. Confoliving for each stamp is too expensive.*/
+      if (! brush->priv->blurred_mask &&
+          ! GIMP_IS_BRUSH_GENERATED(brush) &&
+          ! GIMP_IS_BRUSH_PIPE(brush) && /*Can't cache pipes. Sanely anyway*/
+          hardness < 1.0)
+        {
+           brush->priv->blurred_mask = GIMP_BRUSH_GET_CLASS (brush)->transform_mask (brush,
+                                                             1.0,
+                                                             0.0,
+                                                             0.0,
+                                                             FALSE,
+                                                             hardness);
+           brush->priv->blur_hardness = hardness;
+        }
+
+      if (brush->priv->blurred_mask)
+        {
+          effective_hardness = 1.0; /*Hardness has already been applied*/
+        }
+#endif
+
+      mask = GIMP_BRUSH_GET_CLASS (brush)->transform_mask (brush,
+                                                           scale,
+                                                           aspect_ratio,
+                                                           angle,
+                                                           reflect,
+                                                           effective_hardness);
+
+      gimp_brush_cache_add (brush->priv->mask_cache,
+                            (gpointer) mask,
+                            width, height,
+                            scale, aspect_ratio, angle, reflect, effective_hardness);
+    }
+
+  return mask;
+}
+
+const GimpTempBuf *
+gimp_brush_transform_pixmap (GimpBrush *brush,
+                             gdouble    scale,
+                             gdouble    aspect_ratio,
+                             gdouble    angle,
+                             gboolean   reflect,
+                             gdouble    hardness)
+{
+  const GimpTempBuf *pixmap;
+  gint               width;
+  gint               height;
+  gdouble            effective_hardness = hardness;
+
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+  g_return_val_if_fail (brush->priv->pixmap != NULL, NULL);
+  g_return_val_if_fail (scale > 0.0, NULL);
+
+  gimp_brush_transform_size (brush,
+                             scale, aspect_ratio, angle, reflect,
+                             &width, &height);
+
+  pixmap = gimp_brush_cache_get (brush->priv->pixmap_cache,
+                                 width, height,
+                                 scale, aspect_ratio, angle, reflect, hardness);
+
+  if (! pixmap)
+    {
+#if 0
+     if (! brush->priv->blurred_pixmap &&
+         ! GIMP_IS_BRUSH_GENERATED(brush) &&
+         ! GIMP_IS_BRUSH_PIPE(brush) /*Can't cache pipes. Sanely anyway*/
+         && hardness < 1.0)
+      {
+         brush->priv->blurred_pixmap = GIMP_BRUSH_GET_CLASS (brush)->transform_pixmap (brush,
+                                                                  1.0,
+                                                                  0.0,
+                                                                  0.0,
+                                                                  FALSE,
+                                                                  hardness);
+         brush->priv->blur_hardness = hardness;
+       }
+
+      if (brush->priv->blurred_pixmap) {
+        effective_hardness = 1.0; /*Hardness has already been applied*/
+      }
+#endif
+
+      pixmap = GIMP_BRUSH_GET_CLASS (brush)->transform_pixmap (brush,
+                                                               scale,
+                                                               aspect_ratio,
+                                                               angle,
+                                                               reflect,
+                                                               effective_hardness);
+
+      gimp_brush_cache_add (brush->priv->pixmap_cache,
+                            (gpointer) pixmap,
+                            width, height,
+                            scale, aspect_ratio, angle, reflect, effective_hardness);
+    }
+
+  return pixmap;
+}
+
+const GimpBezierDesc *
+gimp_brush_transform_boundary (GimpBrush *brush,
+                               gdouble    scale,
+                               gdouble    aspect_ratio,
+                               gdouble    angle,
+                               gboolean   reflect,
+                               gdouble    hardness,
+                               gint      *width,
+                               gint      *height)
+{
+  const GimpBezierDesc *boundary;
+
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+  g_return_val_if_fail (scale > 0.0, NULL);
+  g_return_val_if_fail (width != NULL, NULL);
+  g_return_val_if_fail (height != NULL, NULL);
+
+  gimp_brush_transform_size (brush,
+                             scale, aspect_ratio, angle, reflect,
+                             width, height);
+
+  boundary = gimp_brush_cache_get (brush->priv->boundary_cache,
+                                   *width, *height,
+                                   scale, aspect_ratio, angle, reflect, hardness);
+
+  if (! boundary)
+    {
+      boundary = GIMP_BRUSH_GET_CLASS (brush)->transform_boundary (brush,
+                                                                   scale,
+                                                                   aspect_ratio,
+                                                                   angle,
+                                                                   reflect,
+                                                                   hardness,
+                                                                   width,
+                                                                   height);
+
+      /*  while the brush mask is always at least 1x1 pixels, its
+       *  outline can correctly be NULL
+       *
+       *  FIXME: make the cache handle NULL things when it is
+       *         properly implemented
+       */
+      if (boundary)
+        gimp_brush_cache_add (brush->priv->boundary_cache,
+                              (gpointer) boundary,
+                              *width, *height,
+                              scale, aspect_ratio, angle, reflect, hardness);
+    }
+
+  return boundary;
+}
+
+GimpTempBuf *
+gimp_brush_get_mask (GimpBrush *brush)
+{
+  g_return_val_if_fail (brush != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+
+  if (brush->priv->blurred_mask)
+    {
+      return brush->priv->blurred_mask;
+    }
+  return brush->priv->mask;
+}
+
+GimpTempBuf *
+gimp_brush_get_pixmap (GimpBrush *brush)
+{
+  g_return_val_if_fail (brush != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+
+  if(brush->priv->blurred_pixmap)
+    {
+      return brush->priv->blurred_pixmap;
+    }
+  return brush->priv->pixmap;
+}
+
+void
+gimp_brush_flush_blur_caches (GimpBrush *brush)
+{
+#if 0
+  g_clear_pointer (&brush->priv->blurred_mask,   gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->blurred_pixmap, gimp_temp_buf_unref);
+
+  if (brush->priv->mask_cache)
+    gimp_brush_cache_clear (brush->priv->mask_cache);
+
+  if (brush->priv->pixmap_cache)
+    gimp_brush_cache_clear (brush->priv->pixmap_cache);
+
+  if (brush->priv->boundary_cache)
+    gimp_brush_cache_clear (brush->priv->boundary_cache);
+#endif
+}
+
+gdouble
+gimp_brush_get_blur_hardness (GimpBrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), 0);
+
+  return brush->priv->blur_hardness;
+}
+
+gint
+gimp_brush_get_width (GimpBrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), 0);
+
+  if (brush->priv->blurred_mask)
+    return gimp_temp_buf_get_width (brush->priv->blurred_mask);
+
+  if (brush->priv->blurred_pixmap)
+    return gimp_temp_buf_get_width (brush->priv->blurred_pixmap);
+
+  return gimp_temp_buf_get_width (brush->priv->mask);
+}
+
+gint
+gimp_brush_get_height (GimpBrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), 0);
+
+  if (brush->priv->blurred_mask)
+    return gimp_temp_buf_get_height (brush->priv->blurred_mask);
+
+  if (brush->priv->blurred_pixmap)
+    return gimp_temp_buf_get_height (brush->priv->blurred_pixmap);
+
+  return gimp_temp_buf_get_height (brush->priv->mask);
+}
+
+gint
+gimp_brush_get_spacing (GimpBrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), 0);
+
+  return brush->priv->spacing;
+}
+
+void
+gimp_brush_set_spacing (GimpBrush *brush,
+                        gint       spacing)
+{
+  g_return_if_fail (GIMP_IS_BRUSH (brush));
+
+  if (brush->priv->spacing != spacing)
+    {
+      brush->priv->spacing = spacing;
+
+      g_signal_emit (brush, brush_signals[SPACING_CHANGED], 0);
+      g_object_notify (G_OBJECT (brush), "spacing");
+    }
+}
+
+static const GimpVector2 fail = { 0.0, 0.0 };
+
+GimpVector2
+gimp_brush_get_x_axis (GimpBrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), fail);
+
+  return brush->priv->x_axis;
+}
+
+GimpVector2
+gimp_brush_get_y_axis (GimpBrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), fail);
+
+  return brush->priv->y_axis;
+}
diff --git a/app/core/gimpbrush.h b/app/core/gimpbrush.h
new file mode 100644
index 0000000..b5735f0
--- /dev/null
+++ b/app/core/gimpbrush.h
@@ -0,0 +1,152 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_H__
+#define __GIMP_BRUSH_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_BRUSH            (gimp_brush_get_type ())
+#define GIMP_BRUSH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH, GimpBrush))
+#define GIMP_BRUSH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH, GimpBrushClass))
+#define GIMP_IS_BRUSH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH))
+#define GIMP_IS_BRUSH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH))
+#define GIMP_BRUSH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH, GimpBrushClass))
+
+
+typedef struct _GimpBrushPrivate GimpBrushPrivate;
+typedef struct _GimpBrushClass   GimpBrushClass;
+
+struct _GimpBrush
+{
+  GimpData          parent_instance;
+
+  GimpBrushPrivate *priv;
+};
+
+struct _GimpBrushClass
+{
+  GimpDataClass  parent_class;
+
+  /*  virtual functions  */
+  void             (* begin_use)          (GimpBrush        *brush);
+  void             (* end_use)            (GimpBrush        *brush);
+  GimpBrush      * (* select_brush)       (GimpBrush        *brush,
+                                           const GimpCoords *last_coords,
+                                           const GimpCoords *current_coords);
+  gboolean         (* want_null_motion)   (GimpBrush        *brush,
+                                           const GimpCoords *last_coords,
+                                           const GimpCoords *current_coords);
+  void             (* transform_size)     (GimpBrush        *brush,
+                                           gdouble           scale,
+                                           gdouble           aspect_ratio,
+                                           gdouble           angle,
+                                           gboolean          reflect,
+                                           gint             *width,
+                                           gint             *height);
+  GimpTempBuf    * (* transform_mask)     (GimpBrush        *brush,
+                                           gdouble           scale,
+                                           gdouble           aspect_ratio,
+                                           gdouble           angle,
+                                           gboolean          reflect,
+                                           gdouble           hardness);
+  GimpTempBuf    * (* transform_pixmap)   (GimpBrush        *brush,
+                                           gdouble           scale,
+                                           gdouble           aspect_ratio,
+                                           gdouble           angle,
+                                           gboolean          reflect,
+                                           gdouble           hardness);
+  GimpBezierDesc * (* transform_boundary) (GimpBrush        *brush,
+                                           gdouble           scale,
+                                           gdouble           aspect_ratio,
+                                           gdouble           angle,
+                                           gboolean          reflect,
+                                           gdouble           hardness,
+                                           gint             *width,
+                                           gint             *height);
+
+  /*  signals  */
+  void             (* spacing_changed)    (GimpBrush        *brush);
+};
+
+
+GType                  gimp_brush_get_type           (void) G_GNUC_CONST;
+
+GimpData             * gimp_brush_new                (GimpContext      *context,
+                                                      const gchar      *name);
+GimpData             * gimp_brush_get_standard       (GimpContext      *context);
+
+void                   gimp_brush_begin_use          (GimpBrush        *brush);
+void                   gimp_brush_end_use            (GimpBrush        *brush);
+
+GimpBrush            * gimp_brush_select_brush       (GimpBrush        *brush,
+                                                      const GimpCoords *last_coords,
+                                                      const GimpCoords *current_coords);
+gboolean               gimp_brush_want_null_motion   (GimpBrush        *brush,
+                                                      const GimpCoords *last_coords,
+                                                      const GimpCoords *current_coords);
+
+/* Gets width and height of a transformed mask of the brush, for
+ * provided parameters.
+ */
+void                   gimp_brush_transform_size     (GimpBrush        *brush,
+                                                      gdouble           scale,
+                                                      gdouble           aspect_ratio,
+                                                      gdouble           angle,
+                                                      gboolean          reflect,
+                                                      gint             *width,
+                                                      gint             *height);
+const GimpTempBuf    * gimp_brush_transform_mask     (GimpBrush        *brush,
+                                                      gdouble           scale,
+                                                      gdouble           aspect_ratio,
+                                                      gdouble           angle,
+                                                      gboolean          reflect,
+                                                      gdouble           hardness);
+const GimpTempBuf    * gimp_brush_transform_pixmap   (GimpBrush        *brush,
+                                                      gdouble           scale,
+                                                      gdouble           aspect_ratio,
+                                                      gdouble           angle,
+                                                      gboolean          reflect,
+                                                      gdouble           hardness);
+const GimpBezierDesc * gimp_brush_transform_boundary (GimpBrush        *brush,
+                                                      gdouble           scale,
+                                                      gdouble           aspect_ratio,
+                                                      gdouble           angle,
+                                                      gboolean          reflect,
+                                                      gdouble           hardness,
+                                                      gint             *width,
+                                                      gint             *height);
+
+GimpTempBuf          * gimp_brush_get_mask           (GimpBrush        *brush);
+GimpTempBuf          * gimp_brush_get_pixmap         (GimpBrush        *brush);
+
+gint                   gimp_brush_get_width          (GimpBrush        *brush);
+gint                   gimp_brush_get_height         (GimpBrush        *brush);
+
+gint                   gimp_brush_get_spacing        (GimpBrush        *brush);
+void                   gimp_brush_set_spacing        (GimpBrush        *brush,
+                                                      gint              spacing);
+
+GimpVector2            gimp_brush_get_x_axis         (GimpBrush        *brush);
+GimpVector2            gimp_brush_get_y_axis         (GimpBrush        *brush);
+
+void                   gimp_brush_flush_blur_caches  (GimpBrush        *brush);
+gdouble                gimp_brush_get_blur_hardness  (GimpBrush        *brush);
+
+#endif /* __GIMP_BRUSH_H__ */
diff --git a/app/core/gimpbrushcache.c b/app/core/gimpbrushcache.c
new file mode 100644
index 0000000..07ad008
--- /dev/null
+++ b/app/core/gimpbrushcache.c
@@ -0,0 +1,299 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushcache.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpbrushcache.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+#define MAX_CACHED_DATA 20
+
+
+enum
+{
+  PROP_0,
+  PROP_DATA_DESTROY
+};
+
+
+typedef struct _GimpBrushCacheUnit GimpBrushCacheUnit;
+
+struct _GimpBrushCacheUnit
+{
+  gpointer data;
+
+  gint     width;
+  gint     height;
+  gdouble  scale;
+  gdouble  aspect_ratio;
+  gdouble  angle;
+  gboolean reflect;
+  gdouble  hardness;
+};
+
+
+static void   gimp_brush_cache_constructed  (GObject      *object);
+static void   gimp_brush_cache_finalize     (GObject      *object);
+static void   gimp_brush_cache_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void   gimp_brush_cache_get_property (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpBrushCache, gimp_brush_cache, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_brush_cache_parent_class
+
+
+static void
+gimp_brush_cache_class_init (GimpBrushCacheClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_brush_cache_constructed;
+  object_class->finalize     = gimp_brush_cache_finalize;
+  object_class->set_property = gimp_brush_cache_set_property;
+  object_class->get_property = gimp_brush_cache_get_property;
+
+  g_object_class_install_property (object_class, PROP_DATA_DESTROY,
+                                   g_param_spec_pointer ("data-destroy",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_brush_cache_init (GimpBrushCache *brush)
+{
+}
+
+static void
+gimp_brush_cache_constructed (GObject *object)
+{
+  GimpBrushCache *cache = GIMP_BRUSH_CACHE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (cache->data_destroy != NULL);
+}
+
+static void
+gimp_brush_cache_finalize (GObject *object)
+{
+  GimpBrushCache *cache = GIMP_BRUSH_CACHE (object);
+
+  gimp_brush_cache_clear (cache);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_brush_cache_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpBrushCache *cache = GIMP_BRUSH_CACHE (object);
+
+  switch (property_id)
+    {
+    case PROP_DATA_DESTROY:
+      cache->data_destroy = g_value_get_pointer (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_brush_cache_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpBrushCache *cache = GIMP_BRUSH_CACHE (object);
+
+  switch (property_id)
+    {
+    case PROP_DATA_DESTROY:
+      g_value_set_pointer (value, cache->data_destroy);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GimpBrushCache *
+gimp_brush_cache_new (GDestroyNotify  data_destroy,
+                      gchar           debug_hit,
+                      gchar           debug_miss)
+{
+  GimpBrushCache *cache;
+
+  g_return_val_if_fail (data_destroy != NULL, NULL);
+
+  cache =  g_object_new (GIMP_TYPE_BRUSH_CACHE,
+                         "data-destroy", data_destroy,
+                         NULL);
+
+  cache->debug_hit  = debug_hit;
+  cache->debug_miss = debug_miss;
+
+  return cache;
+}
+
+void
+gimp_brush_cache_clear (GimpBrushCache *cache)
+{
+  g_return_if_fail (GIMP_IS_BRUSH_CACHE (cache));
+
+  if (cache->cached_units)
+    {
+      GList *iter;
+
+      for (iter = cache->cached_units; iter; iter = g_list_next (iter))
+        {
+          GimpBrushCacheUnit *unit = iter->data;
+
+          cache->data_destroy (unit->data);
+        }
+
+      g_list_free_full (cache->cached_units, g_free);
+      cache->cached_units = NULL;
+    }
+}
+
+gconstpointer
+gimp_brush_cache_get (GimpBrushCache *cache,
+                      gint            width,
+                      gint            height,
+                      gdouble         scale,
+                      gdouble         aspect_ratio,
+                      gdouble         angle,
+                      gboolean        reflect,
+                      gdouble         hardness)
+{
+  GList *iter;
+
+  g_return_val_if_fail (GIMP_IS_BRUSH_CACHE (cache), NULL);
+
+  for (iter = cache->cached_units; iter; iter = g_list_next (iter))
+    {
+      GimpBrushCacheUnit *unit = iter->data;
+
+      if (unit->data                         &&
+          unit->width        == width        &&
+          unit->height       == height       &&
+          unit->scale        == scale        &&
+          unit->aspect_ratio == aspect_ratio &&
+          unit->angle        == angle        &&
+          unit->reflect      == reflect      &&
+          unit->hardness     == hardness)
+        {
+          if (gimp_log_flags & GIMP_LOG_BRUSH_CACHE)
+            g_printerr ("%c", cache->debug_hit);
+
+          /* Make the returned cached brush first in the list. */
+          cache->cached_units = g_list_remove_link (cache->cached_units, iter);
+          iter->next = cache->cached_units;
+          if (cache->cached_units)
+            cache->cached_units->prev = iter;
+          cache->cached_units = iter;
+
+          return (gconstpointer) unit->data;
+        }
+    }
+
+  if (gimp_log_flags & GIMP_LOG_BRUSH_CACHE)
+    g_printerr ("%c", cache->debug_miss);
+
+  return NULL;
+}
+
+void
+gimp_brush_cache_add (GimpBrushCache *cache,
+                      gpointer        data,
+                      gint            width,
+                      gint            height,
+                      gdouble         scale,
+                      gdouble         aspect_ratio,
+                      gdouble         angle,
+                      gboolean        reflect,
+                      gdouble         hardness)
+{
+  GList              *iter;
+  GimpBrushCacheUnit *unit;
+  GList              *last   = NULL;
+  gint                length = 0;
+
+  g_return_if_fail (GIMP_IS_BRUSH_CACHE (cache));
+  g_return_if_fail (data != NULL);
+
+  for (iter = cache->cached_units; iter; iter = g_list_next (iter))
+    {
+      unit = iter->data;
+
+      if (data == unit->data)
+        return;
+
+      length++;
+      last = iter;
+    }
+
+  if (length > MAX_CACHED_DATA)
+    {
+      unit = last->data;
+
+      cache->data_destroy (unit->data);
+      cache->cached_units = g_list_delete_link (cache->cached_units, last);
+      g_free (unit);
+    }
+
+  unit = g_new0 (GimpBrushCacheUnit, 1);
+
+  unit->data         = data;
+  unit->width        = width;
+  unit->height       = height;
+  unit->scale        = scale;
+  unit->aspect_ratio = aspect_ratio;
+  unit->angle        = angle;
+  unit->reflect      = reflect;
+  unit->hardness     = hardness;
+
+  cache->cached_units = g_list_prepend (cache->cached_units, unit);
+}
diff --git a/app/core/gimpbrushcache.h b/app/core/gimpbrushcache.h
new file mode 100644
index 0000000..7722117
--- /dev/null
+++ b/app/core/gimpbrushcache.h
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushcache.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_CACHE_H__
+#define __GIMP_BRUSH_CACHE_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_BRUSH_CACHE            (gimp_brush_cache_get_type ())
+#define GIMP_BRUSH_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_CACHE, GimpBrushCache))
+#define GIMP_BRUSH_CACHE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_CACHE, GimpBrushCacheClass))
+#define GIMP_IS_BRUSH_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_CACHE))
+#define GIMP_IS_BRUSH_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_CACHE))
+#define GIMP_BRUSH_CACHE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_CACHE, GimpBrushCacheClass))
+
+
+typedef struct _GimpBrushCacheClass GimpBrushCacheClass;
+
+struct _GimpBrushCache
+{
+  GimpObject      parent_instance;
+
+  GDestroyNotify  data_destroy;
+
+  GList          *cached_units;
+
+  gchar           debug_hit;
+  gchar           debug_miss;
+};
+
+struct _GimpBrushCacheClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType            gimp_brush_cache_get_type (void) G_GNUC_CONST;
+
+GimpBrushCache * gimp_brush_cache_new      (GDestroyNotify  data_destory,
+                                            gchar           debug_hit,
+                                            gchar           debug_miss);
+
+void             gimp_brush_cache_clear    (GimpBrushCache *cache);
+
+gconstpointer    gimp_brush_cache_get      (GimpBrushCache *cache,
+                                            gint            width,
+                                            gint            height,
+                                            gdouble         scale,
+                                            gdouble         aspect_ratio,
+                                            gdouble         angle,
+                                            gboolean        reflect,
+                                            gdouble         hardness);
+void             gimp_brush_cache_add      (GimpBrushCache *cache,
+                                            gpointer        data,
+                                            gint            width,
+                                            gint            height,
+                                            gdouble         scale,
+                                            gdouble         aspect_ratio,
+                                            gdouble         angle,
+                                            gboolean        reflect,
+                                            gdouble         hardness);
+
+
+#endif  /*  __GIMP_BRUSH_CACHE_H__  */
diff --git a/app/core/gimpbrushclipboard.c b/app/core/gimpbrushclipboard.c
new file mode 100644
index 0000000..2d4a5e1
--- /dev/null
+++ b/app/core/gimpbrushclipboard.c
@@ -0,0 +1,298 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushclipboard.c
+ * Copyright (C) 2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpbuffer.h"
+#include "gimpbrush-private.h"
+#include "gimpbrushclipboard.h"
+#include "gimpimage.h"
+#include "gimppickable.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+#define BRUSH_MAX_SIZE 1024
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_MASK_ONLY
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_brush_clipboard_constructed  (GObject      *object);
+static void       gimp_brush_clipboard_set_property (GObject      *object,
+                                                     guint         property_id,
+                                                     const GValue *value,
+                                                     GParamSpec   *pspec);
+static void       gimp_brush_clipboard_get_property (GObject      *object,
+                                                     guint         property_id,
+                                                     GValue       *value,
+                                                     GParamSpec   *pspec);
+
+static GimpData * gimp_brush_clipboard_duplicate    (GimpData     *data);
+
+static void       gimp_brush_clipboard_changed      (Gimp         *gimp,
+                                                     GimpBrush    *brush);
+
+
+G_DEFINE_TYPE (GimpBrushClipboard, gimp_brush_clipboard, GIMP_TYPE_BRUSH)
+
+#define parent_class gimp_brush_clipboard_parent_class
+
+
+static void
+gimp_brush_clipboard_class_init (GimpBrushClipboardClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpDataClass *data_class   = GIMP_DATA_CLASS (klass);
+
+  object_class->constructed  = gimp_brush_clipboard_constructed;
+  object_class->set_property = gimp_brush_clipboard_set_property;
+  object_class->get_property = gimp_brush_clipboard_get_property;
+
+  data_class->duplicate      = gimp_brush_clipboard_duplicate;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_MASK_ONLY,
+                                   g_param_spec_boolean ("mask-only", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_brush_clipboard_init (GimpBrushClipboard *brush)
+{
+}
+
+static void
+gimp_brush_clipboard_constructed (GObject *object)
+{
+  GimpBrushClipboard *brush = GIMP_BRUSH_CLIPBOARD (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (brush->gimp));
+
+  g_signal_connect_object (brush->gimp, "clipboard-changed",
+                           G_CALLBACK (gimp_brush_clipboard_changed),
+                           brush, 0);
+
+  gimp_brush_clipboard_changed (brush->gimp, GIMP_BRUSH (brush));
+}
+
+static void
+gimp_brush_clipboard_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpBrushClipboard *brush = GIMP_BRUSH_CLIPBOARD (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      brush->gimp = g_value_get_object (value);
+      break;
+
+    case PROP_MASK_ONLY:
+      brush->mask_only = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_brush_clipboard_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpBrushClipboard *brush = GIMP_BRUSH_CLIPBOARD (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, brush->gimp);
+      break;
+
+    case PROP_MASK_ONLY:
+      g_value_set_boolean (value, brush->mask_only);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpData *
+gimp_brush_clipboard_duplicate (GimpData *data)
+{
+  GimpData *new = g_object_new (GIMP_TYPE_BRUSH, NULL);
+
+  gimp_data_copy (new, data);
+
+  return new;
+}
+
+GimpData *
+gimp_brush_clipboard_new (Gimp     *gimp,
+                          gboolean  mask_only)
+{
+  const gchar *name;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (mask_only)
+    name = _("Clipboard Mask");
+  else
+    name = _("Clipboard Image");
+
+  return g_object_new (GIMP_TYPE_BRUSH_CLIPBOARD,
+                       "name",      name,
+                       "gimp",      gimp,
+                       "mask-only", mask_only,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_brush_clipboard_changed (Gimp      *gimp,
+                              GimpBrush *brush)
+{
+  GimpObject *paste;
+  GeglBuffer *buffer = NULL;
+  gint        width;
+  gint        height;
+
+  g_clear_pointer (&brush->priv->mask,   gimp_temp_buf_unref);
+  g_clear_pointer (&brush->priv->pixmap, gimp_temp_buf_unref);
+
+  paste = gimp_get_clipboard_object (gimp);
+
+  if (GIMP_IS_IMAGE (paste))
+    {
+      gimp_pickable_flush (GIMP_PICKABLE (paste));
+      buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
+    }
+  else if (GIMP_IS_BUFFER (paste))
+    {
+      buffer = gimp_buffer_get_buffer (GIMP_BUFFER (paste));
+    }
+
+  if (buffer)
+    {
+      const Babl *format = gegl_buffer_get_format (buffer);
+
+      width  = MIN (gegl_buffer_get_width  (buffer), BRUSH_MAX_SIZE);
+      height = MIN (gegl_buffer_get_height (buffer), BRUSH_MAX_SIZE);
+
+      brush->priv->mask = gimp_temp_buf_new (width, height,
+                                             babl_format ("Y u8"));
+
+      if (GIMP_BRUSH_CLIPBOARD (brush)->mask_only)
+        {
+          guchar *p;
+          gint    i;
+
+          gegl_buffer_get (buffer,
+                           GEGL_RECTANGLE (0, 0, width, height), 1.0,
+                           babl_format ("Y u8"),
+                           gimp_temp_buf_get_data (brush->priv->mask),
+                           GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+          /*  invert the mask, it's more intuitive to think
+           *  "black on white" than the other way around
+           */
+          for (i = 0, p = gimp_temp_buf_get_data (brush->priv->mask);
+               i < width * height;
+               i++, p++)
+            {
+              *p = 255 - *p;
+            }
+        }
+      else
+        {
+          brush->priv->pixmap = gimp_temp_buf_new (width, height,
+                                                   babl_format ("R'G'B' u8"));
+
+          /*  copy the alpha channel into the brush's mask  */
+          if (babl_format_has_alpha (format))
+            {
+              gegl_buffer_get (buffer,
+                               GEGL_RECTANGLE (0, 0, width, height), 1.0,
+                               babl_format ("A u8"),
+                               gimp_temp_buf_get_data (brush->priv->mask),
+                               GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+            }
+          else
+            {
+              memset (gimp_temp_buf_get_data (brush->priv->mask), 255,
+                      width * height);
+            }
+
+          /*  copy the color channels into the brush's pixmap  */
+          gegl_buffer_get (buffer,
+                           GEGL_RECTANGLE (0, 0, width, height), 1.0,
+                           babl_format ("R'G'B' u8"),
+                           gimp_temp_buf_get_data (brush->priv->pixmap),
+                           GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+        }
+    }
+  else
+    {
+      width  = 17;
+      height = 17;
+
+      brush->priv->mask = gimp_temp_buf_new (width, height,
+                                             babl_format ("Y u8"));
+      gimp_temp_buf_data_clear (brush->priv->mask);
+    }
+
+  brush->priv->x_axis.x = width / 2;
+  brush->priv->x_axis.y = 0;
+  brush->priv->y_axis.x = 0;
+  brush->priv->y_axis.y = height / 2;
+
+  gimp_data_dirty (GIMP_DATA (brush));
+}
diff --git a/app/core/gimpbrushclipboard.h b/app/core/gimpbrushclipboard.h
new file mode 100644
index 0000000..95af7e1
--- /dev/null
+++ b/app/core/gimpbrushclipboard.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushclipboard.h
+ * Copyright (C) 2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_CLIPBOARD_H__
+#define __GIMP_BRUSH_CLIPBOARD_H__
+
+
+#include "gimpbrush.h"
+
+
+#define GIMP_TYPE_BRUSH_CLIPBOARD            (gimp_brush_clipboard_get_type ())
+#define GIMP_BRUSH_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_CLIPBOARD, GimpBrushClipboard))
+#define GIMP_BRUSH_CLIPBOARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_CLIPBOARD, GimpBrushClipboardClass))
+#define GIMP_IS_BRUSH_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_CLIPBOARD))
+#define GIMP_IS_BRUSH_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_CLIPBOARD))
+#define GIMP_BRUSH_CLIPBOARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_CLIPBOARD, GimpBrushClipboardClass))
+
+
+typedef struct _GimpBrushClipboardClass GimpBrushClipboardClass;
+
+struct _GimpBrushClipboard
+{
+  GimpBrush  parent_instance;
+
+  Gimp      *gimp;
+  gboolean   mask_only;
+};
+
+struct _GimpBrushClipboardClass
+{
+  GimpBrushClass  parent_class;
+};
+
+
+GType      gimp_brush_clipboard_get_type (void) G_GNUC_CONST;
+
+GimpData * gimp_brush_clipboard_new      (Gimp     *gimp,
+                                          gboolean  mask_only);
+
+
+#endif  /*  __GIMP_BRUSH_CLIPBOARD_H__  */
diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c
new file mode 100644
index 0000000..a526ae6
--- /dev/null
+++ b/app/core/gimpbrushgenerated-load.c
@@ -0,0 +1,284 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp_brush_generated module Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp-utils.h"
+#include "gimpbrushgenerated.h"
+#include "gimpbrushgenerated-load.h"
+
+#include "gimp-intl.h"
+
+
+GList *
+gimp_brush_generated_load (GimpContext   *context,
+                           GFile         *file,
+                           GInputStream  *input,
+                           GError       **error)
+{
+  GimpBrush               *brush;
+  GDataInputStream        *data_input;
+  gchar                   *string;
+  gsize                    string_len;
+  gint                     linenum;
+  gchar                   *name       = NULL;
+  GimpBrushGeneratedShape  shape      = GIMP_BRUSH_GENERATED_CIRCLE;
+  gboolean                 have_shape = FALSE;
+  gint                     spikes     = 2;
+  gdouble                  spacing;
+  gdouble                  radius;
+  gdouble                  hardness;
+  gdouble                  aspect_ratio;
+  gdouble                  angle;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  data_input = g_data_input_stream_new (input);
+
+  /* make sure the file we are reading is the right type */
+  linenum = 1;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+
+  if (! g_str_has_prefix (string, "GIMP-VBR"))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Not a GIMP brush file."));
+      g_free (string);
+      goto failed;
+    }
+
+  g_free (string);
+
+  /* make sure we are reading a compatible version */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+
+  if (! g_str_has_prefix (string, "1.0"))
+    {
+      if (! g_str_has_prefix (string, "1.5"))
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Unknown GIMP brush version."));
+          g_free (string);
+          goto failed;
+        }
+      else
+        {
+          have_shape = TRUE;
+        }
+    }
+
+  g_free (string);
+
+  /* read name */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+
+  g_strstrip (string);
+
+  /* the empty string is not an allowed name */
+  if (strlen (string) < 1)
+    {
+      name = g_strdup (_("Untitled"));
+    }
+  else
+    {
+      name = gimp_any_to_utf8 (string, -1,
+                               _("Invalid UTF-8 string in brush file '%s'."),
+                               gimp_file_get_utf8_name (file));
+    }
+
+  g_free (string);
+
+  if (have_shape)
+    {
+      GEnumClass *enum_class;
+      GEnumValue *shape_val;
+
+      enum_class = g_type_class_peek (GIMP_TYPE_BRUSH_GENERATED_SHAPE);
+
+      /* read shape */
+      linenum++;
+      string_len = 256;
+      string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                        NULL, error);
+      if (! string)
+        goto failed;
+
+      g_strstrip (string);
+      shape_val = g_enum_get_value_by_nick (enum_class, string);
+
+      if (! shape_val)
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Unknown GIMP brush shape."));
+          g_free (string);
+          goto failed;
+        }
+
+      g_free (string);
+
+      shape = shape_val->value;
+    }
+
+  /* read brush spacing */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+  if (! gimp_ascii_strtod (string, NULL, &spacing))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Invalid brush spacing."));
+      g_free (string);
+      goto failed;
+    }
+  g_free (string);
+
+
+  /* read brush radius */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+  if (! gimp_ascii_strtod (string, NULL, &radius))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Invalid brush radius."));
+      g_free (string);
+      goto failed;
+    }
+  g_free (string);
+
+  if (have_shape)
+    {
+      /* read number of spikes */
+      linenum++;
+      string_len = 256;
+      string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                        NULL, error);
+      if (! string)
+        goto failed;
+      if (! gimp_ascii_strtoi (string, NULL, 10, &spikes) ||
+          spikes < 2 || spikes > 20)
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Invalid brush spike count."));
+          g_free (string);
+          goto failed;
+        }
+      g_free (string);
+    }
+
+  /* read brush hardness */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+  if (! gimp_ascii_strtod (string, NULL, &hardness))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Invalid brush hardness."));
+      g_free (string);
+      goto failed;
+    }
+  g_free (string);
+
+  /* read brush aspect_ratio */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+  if (! gimp_ascii_strtod (string, NULL, &aspect_ratio))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Invalid brush aspect ratio."));
+      g_free (string);
+      goto failed;
+    }
+  g_free (string);
+
+  /* read brush angle */
+  linenum++;
+  string_len = 256;
+  string = gimp_data_input_stream_read_line_always (data_input, &string_len,
+                                                    NULL, error);
+  if (! string)
+    goto failed;
+  if (! gimp_ascii_strtod (string, NULL, &angle))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Invalid brush angle."));
+      g_free (string);
+      goto failed;
+    }
+  g_free (string);
+
+  g_object_unref (data_input);
+
+  brush = GIMP_BRUSH (gimp_brush_generated_new (name, shape, radius, spikes,
+                                                hardness, aspect_ratio, angle));
+  g_free (name);
+
+  gimp_brush_set_spacing (brush, spacing);
+
+  return g_list_prepend (NULL, brush);
+
+ failed:
+
+  g_object_unref (data_input);
+
+  if (name)
+    g_free (name);
+
+  g_prefix_error (error, _("In line %d of brush file: "), linenum);
+
+  return NULL;
+}
diff --git a/app/core/gimpbrushgenerated-load.h b/app/core/gimpbrushgenerated-load.h
new file mode 100644
index 0000000..afecb3b
--- /dev/null
+++ b/app/core/gimpbrushgenerated-load.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * brush_generated module Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_GENERATED_LOAD_H__
+#define __GIMP_BRUSH_GENERATED_LOAD_H__
+
+
+#define GIMP_BRUSH_GENERATED_FILE_EXTENSION ".vbr"
+
+
+GList * gimp_brush_generated_load (GimpContext   *context,
+                                   GFile         *file,
+                                   GInputStream  *input,
+                                   GError       **error);
+
+
+#endif  /*  __GIMP_BRUSH_GENERATED_LOAD_H__  */
diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c
new file mode 100644
index 0000000..2b9f8a0
--- /dev/null
+++ b/app/core/gimpbrushgenerated-save.c
@@ -0,0 +1,119 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp_brush_generated module Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpbrushgenerated.h"
+#include "gimpbrushgenerated-save.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+gimp_brush_generated_save (GimpData       *data,
+                           GOutputStream  *output,
+                           GError        **error)
+{
+  GimpBrushGenerated *brush = GIMP_BRUSH_GENERATED (data);
+  const gchar        *name  = gimp_object_get_name (data);
+  GString            *string;
+  gchar               buf[G_ASCII_DTOSTR_BUF_SIZE];
+  gboolean            have_shape = FALSE;
+
+  g_return_val_if_fail (name != NULL && *name != '\0', FALSE);
+
+  /* write magic header */
+  string = g_string_new ("GIMP-VBR\n");
+
+  /* write version */
+  if (brush->shape != GIMP_BRUSH_GENERATED_CIRCLE || brush->spikes > 2)
+    {
+      g_string_append (string, "1.5\n");
+      have_shape = TRUE;
+    }
+  else
+    {
+      g_string_append (string, "1.0\n");
+    }
+
+  /* write name */
+  g_string_append_printf (string, "%.255s\n", name);
+
+  if (have_shape)
+    {
+      GEnumClass *enum_class;
+      GEnumValue *shape_val;
+
+      enum_class = g_type_class_peek (GIMP_TYPE_BRUSH_GENERATED_SHAPE);
+
+      /* write shape */
+      shape_val = g_enum_get_value (enum_class, brush->shape);
+      g_string_append_printf (string, "%s\n", shape_val->value_nick);
+    }
+
+  /* write brush spacing */
+  g_string_append_printf (string, "%s\n",
+                          g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                                          gimp_brush_get_spacing (GIMP_BRUSH (brush))));
+
+  /* write brush radius */
+  g_string_append_printf (string, "%s\n",
+                          g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                                          brush->radius));
+
+  if (have_shape)
+    {
+      /* write brush spikes */
+      g_string_append_printf (string, "%d\n", brush->spikes);
+    }
+
+  /* write brush hardness */
+  g_string_append_printf (string, "%s\n",
+                          g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                                          brush->hardness));
+
+  /* write brush aspect_ratio */
+  g_string_append_printf (string, "%s\n",
+                          g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                                          brush->aspect_ratio));
+
+  /* write brush angle */
+  g_string_append_printf (string, "%s\n",
+                          g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                                          brush->angle));
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, error))
+    {
+      g_string_free (string, TRUE);
+
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+
+  return TRUE;
+}
diff --git a/app/core/gimpbrushgenerated-save.h b/app/core/gimpbrushgenerated-save.h
new file mode 100644
index 0000000..b33d82e
--- /dev/null
+++ b/app/core/gimpbrushgenerated-save.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * brush_generated module Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_GENERATED_SAVE_H__
+#define __GIMP_BRUSH_GENERATED_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_brush_generated_save (GimpData       *data,
+                                      GOutputStream  *output,
+                                      GError        **error);
+
+
+#endif  /*  __GIMP_BRUSH_GENERATED_SAVE_H__  */
diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c
new file mode 100644
index 0000000..dacdaa8
--- /dev/null
+++ b/app/core/gimpbrushgenerated.c
@@ -0,0 +1,875 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp_brush_generated module Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpbrush-private.h"
+#include "gimpbrushgenerated.h"
+#include "gimpbrushgenerated-load.h"
+#include "gimpbrushgenerated-save.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+#define OVERSAMPLING 4
+
+
+enum
+{
+  PROP_0,
+  PROP_SHAPE,
+  PROP_RADIUS,
+  PROP_SPIKES,
+  PROP_HARDNESS,
+  PROP_ASPECT_RATIO,
+  PROP_ANGLE
+};
+
+
+/*  local function prototypes  */
+
+static void          gimp_brush_generated_set_property  (GObject      *object,
+                                                         guint         property_id,
+                                                         const GValue *value,
+                                                         GParamSpec   *pspec);
+static void          gimp_brush_generated_get_property  (GObject      *object,
+                                                         guint         property_id,
+                                                         GValue       *value,
+                                                         GParamSpec   *pspec);
+
+static void          gimp_brush_generated_dirty         (GimpData     *data);
+static const gchar * gimp_brush_generated_get_extension (GimpData     *data);
+static void          gimp_brush_generated_copy          (GimpData     *data,
+                                                         GimpData     *src_data);
+
+static void          gimp_brush_generated_transform_size(GimpBrush    *gbrush,
+                                                         gdouble       scale,
+                                                         gdouble       aspect_ratio,
+                                                         gdouble       angle,
+                                                         gboolean      reflect,
+                                                         gint         *width,
+                                                         gint         *height);
+static GimpTempBuf * gimp_brush_generated_transform_mask(GimpBrush    *gbrush,
+                                                         gdouble       scale,
+                                                         gdouble       aspect_ratio,
+                                                         gdouble       angle,
+                                                         gboolean      reflect,
+                                                         gdouble       hardness);
+
+static GimpTempBuf * gimp_brush_generated_calc          (GimpBrushGenerated      *brush,
+                                                         GimpBrushGeneratedShape  shape,
+                                                         gfloat                   radius,
+                                                         gint                     spikes,
+                                                         gfloat                   hardness,
+                                                         gfloat                   aspect_ratio,
+                                                         gfloat                   angle,
+                                                         gboolean                 reflect,
+                                                         GimpVector2             *xaxis,
+                                                         GimpVector2             *yaxis);
+static void          gimp_brush_generated_get_size      (GimpBrushGenerated      *gbrush,
+                                                         GimpBrushGeneratedShape  shape,
+                                                         gfloat                   radius,
+                                                         gint                     spikes,
+                                                         gfloat                   hardness,
+                                                         gfloat                   aspect_ratio,
+                                                         gdouble                  angle_in_degrees,
+                                                         gboolean                 reflect,
+                                                         gint                    *width,
+                                                         gint                    *height,
+                                                         gdouble                 *_s,
+                                                         gdouble                 *_c,
+                                                         GimpVector2             *_x_axis,
+                                                         GimpVector2             *_y_axis);
+
+
+G_DEFINE_TYPE (GimpBrushGenerated, gimp_brush_generated, GIMP_TYPE_BRUSH)
+
+#define parent_class gimp_brush_generated_parent_class
+
+
+static void
+gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GimpDataClass  *data_class   = GIMP_DATA_CLASS (klass);
+  GimpBrushClass *brush_class  = GIMP_BRUSH_CLASS (klass);
+
+  object_class->set_property  = gimp_brush_generated_set_property;
+  object_class->get_property  = gimp_brush_generated_get_property;
+
+  data_class->save            = gimp_brush_generated_save;
+  data_class->dirty           = gimp_brush_generated_dirty;
+  data_class->get_extension   = gimp_brush_generated_get_extension;
+  data_class->copy            = gimp_brush_generated_copy;
+
+  brush_class->transform_size = gimp_brush_generated_transform_size;
+  brush_class->transform_mask = gimp_brush_generated_transform_mask;
+
+  g_object_class_install_property (object_class, PROP_SHAPE,
+                                   g_param_spec_enum ("shape", NULL,
+                                                      _("Brush Shape"),
+                                                      GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                                      GIMP_BRUSH_GENERATED_CIRCLE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RADIUS,
+                                   g_param_spec_double ("radius", NULL,
+                                                        _("Brush Radius"),
+                                                        0.1, 4000.0, 5.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SPIKES,
+                                   g_param_spec_int    ("spikes", NULL,
+                                                        _("Brush Spikes"),
+                                                        2, 20, 2,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HARDNESS,
+                                   g_param_spec_double ("hardness", NULL,
+                                                        _("Brush Hardness"),
+                                                        0.0, 1.0, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ASPECT_RATIO,
+                                   g_param_spec_double ("aspect-ratio",
+                                                        NULL,
+                                                        _("Brush Aspect Ratio"),
+                                                        1.0, 20.0, 1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ANGLE,
+                                   g_param_spec_double ("angle", NULL,
+                                                        _("Brush Angle"),
+                                                        0.0, 180.0, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_brush_generated_init (GimpBrushGenerated *brush)
+{
+  brush->shape        = GIMP_BRUSH_GENERATED_CIRCLE;
+  brush->radius       = 5.0;
+  brush->hardness     = 0.0;
+  brush->aspect_ratio = 1.0;
+  brush->angle        = 0.0;
+}
+
+static void
+gimp_brush_generated_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpBrushGenerated *brush = GIMP_BRUSH_GENERATED (object);
+
+  switch (property_id)
+    {
+    case PROP_SHAPE:
+      gimp_brush_generated_set_shape (brush, g_value_get_enum (value));
+      break;
+    case PROP_RADIUS:
+      gimp_brush_generated_set_radius (brush, g_value_get_double (value));
+      break;
+    case PROP_SPIKES:
+      gimp_brush_generated_set_spikes (brush, g_value_get_int (value));
+      break;
+    case PROP_HARDNESS:
+      gimp_brush_generated_set_hardness (brush, g_value_get_double (value));
+      break;
+    case PROP_ASPECT_RATIO:
+      gimp_brush_generated_set_aspect_ratio (brush, g_value_get_double (value));
+      break;
+    case PROP_ANGLE:
+      gimp_brush_generated_set_angle (brush, g_value_get_double (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_brush_generated_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpBrushGenerated *brush = GIMP_BRUSH_GENERATED (object);
+
+  switch (property_id)
+    {
+    case PROP_SHAPE:
+      g_value_set_enum (value, brush->shape);
+      break;
+    case PROP_RADIUS:
+      g_value_set_double (value, brush->radius);
+      break;
+    case PROP_SPIKES:
+      g_value_set_int (value, brush->spikes);
+      break;
+    case PROP_HARDNESS:
+      g_value_set_double (value, brush->hardness);
+      break;
+    case PROP_ASPECT_RATIO:
+      g_value_set_double (value, brush->aspect_ratio);
+      break;
+    case PROP_ANGLE:
+      g_value_set_double (value, brush->angle);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_brush_generated_dirty (GimpData *data)
+{
+  GimpBrushGenerated *brush  = GIMP_BRUSH_GENERATED (data);
+  GimpBrush          *gbrush = GIMP_BRUSH (brush);
+
+  g_clear_pointer (&gbrush->priv->mask, gimp_temp_buf_unref);
+
+  gbrush->priv->mask = gimp_brush_generated_calc (brush,
+                                                  brush->shape,
+                                                  brush->radius,
+                                                  brush->spikes,
+                                                  brush->hardness,
+                                                  brush->aspect_ratio,
+                                                  brush->angle,
+                                                  FALSE,
+                                                  &gbrush->priv->x_axis,
+                                                  &gbrush->priv->y_axis);
+
+  GIMP_DATA_CLASS (parent_class)->dirty (data);
+}
+
+static const gchar *
+gimp_brush_generated_get_extension (GimpData *data)
+{
+  return GIMP_BRUSH_GENERATED_FILE_EXTENSION;
+}
+
+static void
+gimp_brush_generated_copy (GimpData *data,
+                           GimpData *src_data)
+{
+  GimpBrushGenerated *brush     = GIMP_BRUSH_GENERATED (data);
+  GimpBrushGenerated *src_brush = GIMP_BRUSH_GENERATED (src_data);
+
+  gimp_data_freeze (data);
+
+  gimp_brush_set_spacing (GIMP_BRUSH (brush),
+                          gimp_brush_get_spacing (GIMP_BRUSH (src_brush)));
+
+  brush->shape        = src_brush->shape;
+  brush->radius       = src_brush->radius;
+  brush->spikes       = src_brush->spikes;
+  brush->hardness     = src_brush->hardness;
+  brush->aspect_ratio = src_brush->aspect_ratio;
+  brush->angle        = src_brush->angle;
+
+  gimp_data_thaw (data);
+}
+
+static void
+gimp_brush_generated_transform_size (GimpBrush *gbrush,
+                                     gdouble    scale,
+                                     gdouble    aspect_ratio,
+                                     gdouble    angle,
+                                     gboolean   reflect,
+                                     gint      *width,
+                                     gint      *height)
+{
+  GimpBrushGenerated *brush = GIMP_BRUSH_GENERATED (gbrush);
+  gdouble             ratio;
+
+  ratio = fabs (aspect_ratio) * 19.0 / 20.0 + 1.0;
+  ratio = MIN (ratio, 20);
+
+  /* Since generated brushes are symmetric they don't have aspect
+   * ratios < 1.0. it's the same as rotating by 90 degrees and 1 /
+   * ratio, so we fix the input for this case.
+   */
+  if (aspect_ratio < 0.0)
+    angle = angle + 0.25;
+
+  angle  = fmod (fmod (angle, 1.0) + 1.0, 1.0);
+  angle *= 360;
+
+  gimp_brush_generated_get_size (brush,
+                                 brush->shape,
+                                 brush->radius * scale,
+                                 brush->spikes,
+                                 brush->hardness,
+                                 ratio,
+                                 angle,
+                                 reflect,
+                                 width, height,
+                                 NULL, NULL, NULL, NULL);
+}
+
+static GimpTempBuf *
+gimp_brush_generated_transform_mask (GimpBrush *gbrush,
+                                     gdouble    scale,
+                                     gdouble    aspect_ratio,
+                                     gdouble    angle,
+                                     gboolean   reflect,
+                                     gdouble    hardness)
+{
+  GimpBrushGenerated *brush  = GIMP_BRUSH_GENERATED (gbrush);
+  gdouble             ratio;
+
+  ratio = fabs (aspect_ratio) * 19.0 / 20.0 + 1.0;
+  ratio = MIN (ratio, 20);
+
+  /* Since generated brushes are symmetric they don't have aspect
+   * ratios < 1.0. it's the same as rotating by 90 degrees and 1 /
+   * ratio, so we fix the input for this case.
+   */
+  if (aspect_ratio < 0.0)
+    angle = angle + 0.25;
+
+  angle  = fmod (fmod (angle, 1.0) + 1.0, 1.0);
+  angle *= 360;
+
+  if (scale    == 1.0                 &&
+      ratio    == brush->aspect_ratio &&
+      angle    == brush->angle        &&
+      reflect  == FALSE               &&
+      hardness == brush->hardness)
+    {
+      return gimp_temp_buf_copy (gimp_brush_get_mask (gbrush));
+    }
+
+  return gimp_brush_generated_calc (brush,
+                                    brush->shape,
+                                    brush->radius * scale,
+                                    brush->spikes,
+                                    hardness,
+                                    ratio,
+                                    angle,
+                                    reflect,
+                                    NULL, NULL);
+}
+
+
+/*  the actual brush rendering functions  */
+
+static gdouble
+gauss (gdouble f)
+{
+  /* this aint' a real gauss function */
+  if (f < -0.5)
+    {
+      f = -1.0 - f;
+      return (2.0 * f*f);
+    }
+
+  if (f < 0.5)
+    return (1.0 - 2.0 * f*f);
+
+  f = 1.0 - f;
+  return (2.0 * f*f);
+}
+
+/* set up lookup table */
+static gfloat *
+gimp_brush_generated_calc_lut (gdouble radius,
+                               gdouble hardness)
+{
+  gfloat  *lookup;
+  gint     length;
+  gint     x;
+  gdouble  d;
+  gdouble  sum;
+  gdouble  exponent;
+  gdouble  buffer[OVERSAMPLING];
+
+  length = OVERSAMPLING * ceil (1 + sqrt (2 * SQR (ceil (radius + 1.0))));
+
+  lookup = gegl_scratch_new (gfloat, length);
+  sum = 0.0;
+
+  if ((1.0 - hardness) < 0.0000004)
+    exponent = 1000000.0;
+  else
+    exponent = 0.4 / (1.0 - hardness);
+
+  for (x = 0; x < OVERSAMPLING; x++)
+    {
+      d = fabs ((x + 0.5) / OVERSAMPLING - 0.5);
+
+      if (d > radius)
+        buffer[x] = 0.0;
+      else
+        buffer[x] = gauss (pow (d / radius, exponent));
+
+      sum += buffer[x];
+    }
+
+  for (x = 0; d < radius || sum > 0.00001; d += 1.0 / OVERSAMPLING)
+    {
+      sum -= buffer[x % OVERSAMPLING];
+
+      if (d > radius)
+        buffer[x % OVERSAMPLING] = 0.0;
+      else
+        buffer[x % OVERSAMPLING] = gauss (pow (d / radius, exponent));
+
+      sum += buffer[x % OVERSAMPLING];
+      lookup[x++] = sum / OVERSAMPLING;
+    }
+
+  while (x < length)
+    {
+      lookup[x++] = 0.0f;
+    }
+
+  return lookup;
+}
+
+static GimpTempBuf *
+gimp_brush_generated_calc (GimpBrushGenerated      *brush,
+                           GimpBrushGeneratedShape  shape,
+                           gfloat                   radius,
+                           gint                     spikes,
+                           gfloat                   hardness,
+                           gfloat                   aspect_ratio,
+                           gfloat                   angle,
+                           gboolean                 reflect,
+                           GimpVector2             *xaxis,
+                           GimpVector2             *yaxis)
+{
+  gfloat      *centerp;
+  gfloat      *lookup;
+  gfloat       a;
+  gint         x, y;
+  gdouble      c, s, cs, ss;
+  GimpVector2  x_axis;
+  GimpVector2  y_axis;
+  GimpTempBuf *mask;
+  gint         width;
+  gint         height;
+  gint         half_width;
+  gint         half_height;
+
+  gimp_brush_generated_get_size (brush,
+                                 shape,
+                                 radius,
+                                 spikes,
+                                 hardness,
+                                 aspect_ratio,
+                                 angle,
+                                 reflect,
+                                 &width, &height,
+                                 &s, &c, &x_axis, &y_axis);
+
+  mask = gimp_temp_buf_new (width, height,
+                            babl_format ("Y float"));
+
+  half_width  = width  / 2;
+  half_height = height / 2;
+
+  centerp = (gfloat *) gimp_temp_buf_get_data (mask) +
+            half_height * width + half_width;
+
+  lookup = gimp_brush_generated_calc_lut (radius, hardness);
+
+  cs = cos (- 2 * G_PI / spikes);
+  ss = sin (- 2 * G_PI / spikes);
+
+  /* for an even number of spikes compute one half and mirror it */
+  for (y = ((spikes % 2) ? -half_height : 0); y <= half_height; y++)
+    {
+      for (x = -half_width; x <= half_width; x++)
+        {
+          gdouble d  = 0;
+          gdouble tx = c * x - s * y;
+          gdouble ty = fabs (s * x + c * y);
+
+          if (spikes > 2)
+            {
+              gdouble angle = atan2 (ty, tx);
+
+              while (angle > G_PI / spikes)
+                {
+                  gdouble sx = tx;
+                  gdouble sy = ty;
+
+                  tx = cs * sx - ss * sy;
+                  ty = ss * sx + cs * sy;
+
+                  angle -= 2 * G_PI / spikes;
+                }
+            }
+
+          ty *= aspect_ratio;
+
+          switch (shape)
+            {
+            case GIMP_BRUSH_GENERATED_CIRCLE:
+              d = sqrt (SQR (tx) + SQR (ty));
+              break;
+            case GIMP_BRUSH_GENERATED_SQUARE:
+              d = MAX (fabs (tx), fabs (ty));
+              break;
+            case GIMP_BRUSH_GENERATED_DIAMOND:
+              d = fabs (tx) + fabs (ty);
+              break;
+            }
+
+          if (d < radius + 1)
+            a = lookup[(gint) RINT (d * OVERSAMPLING)];
+          else
+            a = 0.0f;
+
+          centerp[y * width + x] = a;
+
+          if (spikes % 2 == 0)
+            centerp[-1 * y * width - x] = a;
+        }
+    }
+
+  gegl_scratch_free (lookup);
+
+  if (xaxis)
+    *xaxis = x_axis;
+
+  if (yaxis)
+    *yaxis = y_axis;
+
+  return mask;
+}
+
+/* This function is shared between gimp_brush_generated_transform_size and
+ * gimp_brush_generated_calc, therefore we provide a bunch of optional
+ * pointers for returnvalues.
+ */
+static void
+gimp_brush_generated_get_size (GimpBrushGenerated      *gbrush,
+                               GimpBrushGeneratedShape  shape,
+                               gfloat                   radius,
+                               gint                     spikes,
+                               gfloat                   hardness,
+                               gfloat                   aspect_ratio,
+                               gdouble                  angle_in_degrees,
+                               gboolean                 reflect,
+                               gint                    *width,
+                               gint                    *height,
+                               gdouble                 *_s,
+                               gdouble                 *_c,
+                               GimpVector2             *_x_axis,
+                               GimpVector2             *_y_axis)
+{
+  gdouble      half_width  = 0.0;
+  gdouble      half_height = 0.0;
+  gint         w, h;
+  gdouble      c, s;
+  gdouble      short_radius;
+  GimpVector2  x_axis;
+  GimpVector2  y_axis;
+
+  /* Since floatongpoint is not really accurate,
+   * we need to round to limit the errors.
+   * Errors in some border cases resulted in
+   * different height and width reported for
+   * the same input value on calling procedure side.
+   * This became problem at the rise of dynamics that
+   * allows for any angle to turn up.
+   **/
+
+  angle_in_degrees = RINT (angle_in_degrees * 1000.0) / 1000.0;
+
+  s = sin (gimp_deg_to_rad (angle_in_degrees));
+  c = cos (gimp_deg_to_rad (angle_in_degrees));
+
+  if (reflect)
+    c = -c;
+
+  short_radius = radius / aspect_ratio;
+
+  x_axis.x =        c * radius;
+  x_axis.y = -1.0 * s * radius;
+  y_axis.x =        s * short_radius;
+  y_axis.y =        c * short_radius;
+
+  switch (shape)
+    {
+    case GIMP_BRUSH_GENERATED_CIRCLE:
+      half_width  = sqrt (x_axis.x * x_axis.x + y_axis.x * y_axis.x);
+      half_height = sqrt (x_axis.y * x_axis.y + y_axis.y * y_axis.y);
+      break;
+
+    case GIMP_BRUSH_GENERATED_SQUARE:
+      half_width  = fabs (x_axis.x) + fabs (y_axis.x);
+      half_height = fabs (x_axis.y) + fabs (y_axis.y);
+      break;
+
+    case GIMP_BRUSH_GENERATED_DIAMOND:
+      half_width  = MAX (fabs (x_axis.x), fabs (y_axis.x));
+      half_height = MAX (fabs (x_axis.y), fabs (y_axis.y));
+      break;
+    }
+
+  if (spikes > 2)
+    {
+      /* could be optimized by respecting the angle */
+      half_width = half_height = sqrt (radius * radius +
+                                       short_radius * short_radius);
+      y_axis.x = s * radius;
+      y_axis.y = c * radius;
+    }
+
+  w = MAX (1, ceil (half_width  * 2));
+  h = MAX (1, ceil (half_height * 2));
+
+  if (! (w & 0x1)) w++;
+  if (! (h & 0x1)) h++;
+
+  *width  = w;
+  *height = h;
+
+  /*  These will typically be set then this function is called by
+   *  gimp_brush_generated_calc, which needs the values in its algorithms.
+   */
+  if (_s != NULL)
+    *_s = s;
+
+  if (_c != NULL)
+    *_c = c;
+
+  if (_x_axis != NULL)
+    *_x_axis = x_axis;
+
+  if (_y_axis != NULL)
+    *_y_axis = y_axis;
+}
+
+
+/*  public functions  */
+
+GimpData *
+gimp_brush_generated_new (const gchar             *name,
+                          GimpBrushGeneratedShape  shape,
+                          gfloat                   radius,
+                          gint                     spikes,
+                          gfloat                   hardness,
+                          gfloat                   aspect_ratio,
+                          gfloat                   angle)
+{
+  GimpBrushGenerated *brush;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (*name != '\0', NULL);
+
+  brush = g_object_new (GIMP_TYPE_BRUSH_GENERATED,
+                        "name",         name,
+                        "mime-type",    "application/x-gimp-brush-generated",
+                        "spacing",      20.0,
+                        "shape",        shape,
+                        "radius",       radius,
+                        "spikes",       spikes,
+                        "hardness",     hardness,
+                        "aspect-ratio", aspect_ratio,
+                        "angle",        angle,
+                        NULL);
+
+  return GIMP_DATA (brush);
+}
+
+GimpBrushGeneratedShape
+gimp_brush_generated_set_shape (GimpBrushGenerated      *brush,
+                                GimpBrushGeneratedShape  shape)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush),
+                        GIMP_BRUSH_GENERATED_CIRCLE);
+
+  if (brush->shape != shape)
+    {
+      brush->shape = shape;
+
+      g_object_notify (G_OBJECT (brush), "shape");
+      gimp_data_dirty (GIMP_DATA (brush));
+    }
+
+  return brush->shape;
+}
+
+gfloat
+gimp_brush_generated_set_radius (GimpBrushGenerated *brush,
+                                 gfloat              radius)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  radius = CLAMP (radius, 0.0, 32767.0);
+
+  if (brush->radius != radius)
+    {
+      brush->radius = radius;
+
+      g_object_notify (G_OBJECT (brush), "radius");
+      gimp_data_dirty (GIMP_DATA (brush));
+    }
+
+  return brush->radius;
+}
+
+gint
+gimp_brush_generated_set_spikes (GimpBrushGenerated *brush,
+                                 gint                spikes)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1);
+
+  spikes = CLAMP (spikes, 2, 20);
+
+  if (brush->spikes != spikes)
+    {
+      brush->spikes = spikes;
+
+      g_object_notify (G_OBJECT (brush), "spikes");
+      gimp_data_dirty (GIMP_DATA (brush));
+    }
+
+  return brush->spikes;
+}
+
+gfloat
+gimp_brush_generated_set_hardness (GimpBrushGenerated *brush,
+                                   gfloat              hardness)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  hardness = CLAMP (hardness, 0.0, 1.0);
+
+  if (brush->hardness != hardness)
+    {
+      brush->hardness = hardness;
+
+      g_object_notify (G_OBJECT (brush), "hardness");
+      gimp_data_dirty (GIMP_DATA (brush));
+    }
+
+  return brush->hardness;
+}
+
+gfloat
+gimp_brush_generated_set_aspect_ratio (GimpBrushGenerated *brush,
+                                       gfloat              ratio)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  ratio = CLAMP (ratio, 1.0, 1000.0);
+
+  if (brush->aspect_ratio != ratio)
+    {
+      brush->aspect_ratio = ratio;
+
+      g_object_notify (G_OBJECT (brush), "aspect-ratio");
+      gimp_data_dirty (GIMP_DATA (brush));
+    }
+
+  return brush->aspect_ratio;
+}
+
+gfloat
+gimp_brush_generated_set_angle (GimpBrushGenerated *brush,
+                                gfloat              angle)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  if (angle < 0.0)
+    angle = -1.0 * fmod (angle, 180.0);
+  else if (angle > 180.0)
+    angle = fmod (angle, 180.0);
+
+  if (brush->angle != angle)
+    {
+      brush->angle = angle;
+
+      g_object_notify (G_OBJECT (brush), "angle");
+      gimp_data_dirty (GIMP_DATA (brush));
+    }
+
+  return brush->angle;
+}
+
+GimpBrushGeneratedShape
+gimp_brush_generated_get_shape (GimpBrushGenerated *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush),
+                        GIMP_BRUSH_GENERATED_CIRCLE);
+
+  return brush->shape;
+}
+
+gfloat
+gimp_brush_generated_get_radius (GimpBrushGenerated *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  return brush->radius;
+}
+
+gint
+gimp_brush_generated_get_spikes (GimpBrushGenerated *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1);
+
+  return brush->spikes;
+}
+
+gfloat
+gimp_brush_generated_get_hardness (GimpBrushGenerated *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  return brush->hardness;
+}
+
+gfloat
+gimp_brush_generated_get_aspect_ratio (GimpBrushGenerated *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  return brush->aspect_ratio;
+}
+
+gfloat
+gimp_brush_generated_get_angle (GimpBrushGenerated *brush)
+{
+  g_return_val_if_fail (GIMP_IS_BRUSH_GENERATED (brush), -1.0);
+
+  return brush->angle;
+}
diff --git a/app/core/gimpbrushgenerated.h b/app/core/gimpbrushgenerated.h
new file mode 100644
index 0000000..2df3578
--- /dev/null
+++ b/app/core/gimpbrushgenerated.h
@@ -0,0 +1,88 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * brush_generated module Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_GENERATED_H__
+#define __GIMP_BRUSH_GENERATED_H__
+
+
+#include "gimpbrush.h"
+
+
+#define GIMP_TYPE_BRUSH_GENERATED            (gimp_brush_generated_get_type ())
+#define GIMP_BRUSH_GENERATED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_GENERATED, GimpBrushGenerated))
+#define GIMP_BRUSH_GENERATED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_GENERATED, GimpBrushGeneratedClass))
+#define GIMP_IS_BRUSH_GENERATED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_GENERATED))
+#define GIMP_IS_BRUSH_GENERATED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_GENERATED))
+#define GIMP_BRUSH_GENERATED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_GENERATED, GimpBrushGeneratedClass))
+
+
+typedef struct _GimpBrushGeneratedClass GimpBrushGeneratedClass;
+
+struct _GimpBrushGenerated
+{
+  GimpBrush               parent_instance;
+
+  GimpBrushGeneratedShape shape;
+  gfloat                  radius;
+  gint                    spikes;       /* 2 - 20     */
+  gfloat                  hardness;     /* 0.0 - 1.0  */
+  gfloat                  aspect_ratio; /* y/x        */
+  gfloat                  angle;        /* in degrees */
+};
+
+struct _GimpBrushGeneratedClass
+{
+  GimpBrushClass  parent_class;
+};
+
+
+GType       gimp_brush_generated_get_type     (void) G_GNUC_CONST;
+
+GimpData  * gimp_brush_generated_new          (const gchar             *name,
+                                               GimpBrushGeneratedShape  shape,
+                                               gfloat                   radius,
+                                               gint                     spikes,
+                                               gfloat                   hardness,
+                                               gfloat                   aspect_ratio,
+                                               gfloat                   angle);
+
+GimpBrushGeneratedShape
+        gimp_brush_generated_set_shape        (GimpBrushGenerated      *brush,
+                                               GimpBrushGeneratedShape  shape);
+gfloat  gimp_brush_generated_set_radius       (GimpBrushGenerated      *brush,
+                                               gfloat                   radius);
+gint    gimp_brush_generated_set_spikes       (GimpBrushGenerated      *brush,
+                                               gint                     spikes);
+gfloat  gimp_brush_generated_set_hardness     (GimpBrushGenerated      *brush,
+                                               gfloat                   hardness);
+gfloat  gimp_brush_generated_set_aspect_ratio (GimpBrushGenerated      *brush,
+                                               gfloat                   ratio);
+gfloat  gimp_brush_generated_set_angle        (GimpBrushGenerated      *brush,
+                                               gfloat                   angle);
+
+GimpBrushGeneratedShape
+        gimp_brush_generated_get_shape        (GimpBrushGenerated      *brush);
+gfloat  gimp_brush_generated_get_radius       (GimpBrushGenerated      *brush);
+gint    gimp_brush_generated_get_spikes       (GimpBrushGenerated      *brush);
+gfloat  gimp_brush_generated_get_hardness     (GimpBrushGenerated      *brush);
+gfloat  gimp_brush_generated_get_aspect_ratio (GimpBrushGenerated      *brush);
+gfloat  gimp_brush_generated_get_angle        (GimpBrushGenerated      *brush);
+
+
+#endif  /*  __GIMP_BRUSH_GENERATED_H__  */
diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c
new file mode 100644
index 0000000..18ad898
--- /dev/null
+++ b/app/core/gimpbrushpipe-load.c
@@ -0,0 +1,163 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1999 Adrian Likins and Tor Lillqvist
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpbrush-load.h"
+#include "gimpbrush-private.h"
+#include "gimpbrushpipe.h"
+#include "gimpbrushpipe-load.h"
+
+#include "gimp-intl.h"
+
+
+GList *
+gimp_brush_pipe_load (GimpContext   *context,
+                      GFile         *file,
+                      GInputStream  *input,
+                      GError       **error)
+{
+  GimpBrushPipe *pipe      = NULL;
+  gint           n_brushes = 0;
+  GString       *buffer;
+  gchar         *paramstring;
+  gchar          c;
+  gsize          bytes_read;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /* The file format starts with a painfully simple text header */
+
+  /*  get the name  */
+  buffer = g_string_new (NULL);
+  while (g_input_stream_read_all (input, &c, 1, &bytes_read, NULL, NULL) &&
+         bytes_read == 1 &&
+         c != '\n'       &&
+         buffer->len < 1024)
+    {
+      g_string_append_c (buffer, c);
+    }
+
+  if (buffer->len > 0 && buffer->len < 1024)
+    {
+      gchar *utf8 =
+        gimp_any_to_utf8 (buffer->str, buffer->len,
+                          _("Invalid UTF-8 string in brush file '%s'."),
+                          gimp_file_get_utf8_name (file));
+
+      pipe = g_object_new (GIMP_TYPE_BRUSH_PIPE,
+                           "name",      utf8,
+                           "mime-type", "image/x-gimp-gih",
+                           NULL);
+
+      g_free (utf8);
+    }
+
+  g_string_free (buffer, TRUE);
+
+  if (! pipe)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file '%s': "
+                     "File is corrupt."),
+                   gimp_file_get_utf8_name (file));
+      return NULL;
+    }
+
+  /*  get the number of brushes  */
+  buffer = g_string_new (NULL);
+  while (g_input_stream_read_all (input, &c, 1, &bytes_read, NULL, NULL) &&
+         bytes_read == 1 &&
+         c != '\n'       &&
+         buffer->len < 1024)
+    {
+      g_string_append_c (buffer, c);
+    }
+
+  if (buffer->len > 0 && buffer->len < 1024)
+    {
+      n_brushes = strtol (buffer->str, &paramstring, 10);
+    }
+
+  if (n_brushes < 1)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file '%s': "
+                     "File is corrupt."),
+                   gimp_file_get_utf8_name (file));
+      g_object_unref (pipe);
+      g_string_free (buffer, TRUE);
+      return NULL;
+    }
+
+  while (*paramstring && g_ascii_isspace (*paramstring))
+    paramstring++;
+
+  pipe->brushes = g_new0 (GimpBrush *, n_brushes);
+
+  while (pipe->n_brushes < n_brushes)
+    {
+      pipe->brushes[pipe->n_brushes] = gimp_brush_load_brush (context,
+                                                              file, input,
+                                                              error);
+
+      if (! pipe->brushes[pipe->n_brushes])
+        {
+          g_object_unref (pipe);
+          g_string_free (buffer, TRUE);
+          return NULL;
+        }
+
+      pipe->n_brushes++;
+    }
+
+  if (! gimp_brush_pipe_set_params (pipe, paramstring))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Fatal parse error in brush file '%s': "
+                     "Inconsistent parameters."),
+                   gimp_file_get_utf8_name (file));
+      g_object_unref (pipe);
+      g_string_free (buffer, TRUE);
+      return NULL;
+    }
+
+  g_string_free (buffer, TRUE);
+
+  /* Current brush is the first one. */
+  pipe->current = pipe->brushes[0];
+
+  /*  just to satisfy the code that relies on this crap  */
+  GIMP_BRUSH (pipe)->priv->spacing  = pipe->current->priv->spacing;
+  GIMP_BRUSH (pipe)->priv->x_axis   = pipe->current->priv->x_axis;
+  GIMP_BRUSH (pipe)->priv->y_axis   = pipe->current->priv->y_axis;
+  GIMP_BRUSH (pipe)->priv->mask     = pipe->current->priv->mask;
+  GIMP_BRUSH (pipe)->priv->pixmap   = pipe->current->priv->pixmap;
+
+  return g_list_prepend (NULL, pipe);
+}
diff --git a/app/core/gimpbrushpipe-load.h b/app/core/gimpbrushpipe-load.h
new file mode 100644
index 0000000..7426fcb
--- /dev/null
+++ b/app/core/gimpbrushpipe-load.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1999 Adrian Likins and Tor Lillqvist
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_PIPE_LOAD_H__
+#define __GIMP_BRUSH_PIPE_LOAD_H__
+
+
+#define GIMP_BRUSH_PIPE_FILE_EXTENSION ".gih"
+
+
+GList * gimp_brush_pipe_load (GimpContext   *context,
+                              GFile         *file,
+                              GInputStream  *input,
+                              GError       **error);
+
+
+#endif  /* __GIMP_BRUSH_PIPE_LOAD_H__ */
diff --git a/app/core/gimpbrushpipe-save.c b/app/core/gimpbrushpipe-save.c
new file mode 100644
index 0000000..1b8e7fb
--- /dev/null
+++ b/app/core/gimpbrushpipe-save.c
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "gimpbrushpipe.h"
+#include "gimpbrushpipe-save.h"
+
+
+gboolean
+gimp_brush_pipe_save (GimpData       *data,
+                      GOutputStream  *output,
+                      GError        **error)
+{
+  GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (data);
+  const gchar   *name;
+  gint           i;
+
+  name = gimp_object_get_name (pipe);
+
+  if (! g_output_stream_printf (output, NULL, NULL, error,
+                                "%s\n%d %s\n",
+                                name, pipe->n_brushes, pipe->params))
+    {
+      return FALSE;
+    }
+
+  for (i = 0; i < pipe->n_brushes; i++)
+    {
+      GimpBrush *brush = pipe->brushes[i];
+
+      if (brush &&
+          ! GIMP_DATA_GET_CLASS (brush)->save (GIMP_DATA (brush),
+                                               output, error))
+        {
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/core/gimpbrushpipe-save.h b/app/core/gimpbrushpipe-save.h
new file mode 100644
index 0000000..df76855
--- /dev/null
+++ b/app/core/gimpbrushpipe-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_PIPE_SAVE_H__
+#define __GIMP_BRUSH_PIPE_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_brush_pipe_save (GimpData       *data,
+                                 GOutputStream  *output,
+                                 GError        **error);
+
+
+#endif  /*  __GIMP_BRUSH_PIPE_SAVE_H__  */
diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c
new file mode 100644
index 0000000..cca68ad
--- /dev/null
+++ b/app/core/gimpbrushpipe.c
@@ -0,0 +1,420 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1999 Adrian Likins and Tor Lillqvist
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpparasiteio.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpbrush-private.h"
+#include "gimpbrushpipe.h"
+#include "gimpbrushpipe-load.h"
+#include "gimpbrushpipe-save.h"
+#include "gimptempbuf.h"
+
+
+static void          gimp_brush_pipe_finalize         (GObject          *object);
+
+static gint64        gimp_brush_pipe_get_memsize      (GimpObject       *object,
+                                                       gint64           *gui_size);
+
+static gboolean      gimp_brush_pipe_get_popup_size   (GimpViewable     *viewable,
+                                                       gint              width,
+                                                       gint              height,
+                                                       gboolean          dot_for_dot,
+                                                       gint             *popup_width,
+                                                       gint             *popup_height);
+
+static const gchar * gimp_brush_pipe_get_extension    (GimpData         *data);
+static void          gimp_brush_pipe_copy             (GimpData         *data,
+                                                       GimpData         *src_data);
+
+static void          gimp_brush_pipe_begin_use        (GimpBrush        *brush);
+static void          gimp_brush_pipe_end_use          (GimpBrush        *brush);
+static GimpBrush   * gimp_brush_pipe_select_brush     (GimpBrush        *brush,
+                                                       const GimpCoords *last_coords,
+                                                       const GimpCoords *current_coords);
+static gboolean      gimp_brush_pipe_want_null_motion (GimpBrush        *brush,
+                                                       const GimpCoords *last_coords,
+                                                       const GimpCoords *current_coords);
+
+
+G_DEFINE_TYPE (GimpBrushPipe, gimp_brush_pipe, GIMP_TYPE_BRUSH);
+
+#define parent_class gimp_brush_pipe_parent_class
+
+
+static void
+gimp_brush_pipe_class_init (GimpBrushPipeClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+  GimpBrushClass    *brush_class       = GIMP_BRUSH_CLASS (klass);
+
+  object_class->finalize         = gimp_brush_pipe_finalize;
+
+  gimp_object_class->get_memsize = gimp_brush_pipe_get_memsize;
+
+  viewable_class->get_popup_size = gimp_brush_pipe_get_popup_size;
+
+  data_class->save               = gimp_brush_pipe_save;
+  data_class->get_extension      = gimp_brush_pipe_get_extension;
+  data_class->copy               = gimp_brush_pipe_copy;
+
+  brush_class->begin_use         = gimp_brush_pipe_begin_use;
+  brush_class->end_use           = gimp_brush_pipe_end_use;
+  brush_class->select_brush      = gimp_brush_pipe_select_brush;
+  brush_class->want_null_motion  = gimp_brush_pipe_want_null_motion;
+}
+
+static void
+gimp_brush_pipe_init (GimpBrushPipe *pipe)
+{
+  pipe->current   = NULL;
+  pipe->dimension = 0;
+  pipe->rank      = NULL;
+  pipe->stride    = NULL;
+  pipe->n_brushes = 0;
+  pipe->brushes   = NULL;
+  pipe->select    = NULL;
+  pipe->index     = NULL;
+}
+
+static void
+gimp_brush_pipe_finalize (GObject *object)
+{
+  GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (object);
+
+  g_clear_pointer (&pipe->rank,   g_free);
+  g_clear_pointer (&pipe->stride, g_free);
+  g_clear_pointer (&pipe->select, g_free);
+  g_clear_pointer (&pipe->index,  g_free);
+  g_clear_pointer (&pipe->params, g_free);
+
+  if (pipe->brushes)
+    {
+      gint i;
+
+      for (i = 0; i < pipe->n_brushes; i++)
+        if (pipe->brushes[i])
+          g_object_unref (pipe->brushes[i]);
+
+      g_clear_pointer (&pipe->brushes, g_free);
+    }
+
+  GIMP_BRUSH (pipe)->priv->mask   = NULL;
+  GIMP_BRUSH (pipe)->priv->pixmap = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_brush_pipe_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpBrushPipe *pipe    = GIMP_BRUSH_PIPE (object);
+  gint64         memsize = 0;
+  gint           i;
+
+  memsize += pipe->dimension * (sizeof (gint) /* rank   */ +
+                                sizeof (gint) /* stride */ +
+                                sizeof (PipeSelectModes));
+
+  for (i = 0; i < pipe->n_brushes; i++)
+    memsize += gimp_object_get_memsize (GIMP_OBJECT (pipe->brushes[i]),
+                                        gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_brush_pipe_get_popup_size (GimpViewable *viewable,
+                                gint          width,
+                                gint          height,
+                                gboolean      dot_for_dot,
+                                gint         *popup_width,
+                                gint         *popup_height)
+{
+  return gimp_viewable_get_size (viewable, popup_width, popup_height);
+}
+
+static const gchar *
+gimp_brush_pipe_get_extension (GimpData *data)
+{
+  return GIMP_BRUSH_PIPE_FILE_EXTENSION;
+}
+
+static void
+gimp_brush_pipe_copy (GimpData *data,
+                      GimpData *src_data)
+{
+  GimpBrushPipe *pipe     = GIMP_BRUSH_PIPE (data);
+  GimpBrushPipe *src_pipe = GIMP_BRUSH_PIPE (src_data);
+  gint           i;
+
+  pipe->dimension = src_pipe->dimension;
+
+  g_clear_pointer (&pipe->rank, g_free);
+  pipe->rank = g_memdup (src_pipe->rank,
+                         pipe->dimension * sizeof (gint));
+
+  g_clear_pointer (&pipe->stride, g_free);
+  pipe->stride = g_memdup (src_pipe->stride,
+                           pipe->dimension * sizeof (gint));
+
+  g_clear_pointer (&pipe->select, g_free);
+  pipe->select = g_memdup (src_pipe->select,
+                           pipe->dimension * sizeof (PipeSelectModes));
+
+  g_clear_pointer (&pipe->index, g_free);
+  pipe->index = g_memdup (src_pipe->index,
+                          pipe->dimension * sizeof (gint));
+
+  for (i = 0; i < pipe->n_brushes; i++)
+    if (pipe->brushes[i])
+      g_object_unref (pipe->brushes[i]);
+  g_clear_pointer (&pipe->brushes, g_free);
+
+  pipe->n_brushes = src_pipe->n_brushes;
+
+  pipe->brushes = g_new0 (GimpBrush *, pipe->n_brushes);
+  for (i = 0; i < pipe->n_brushes; i++)
+    if (src_pipe->brushes[i])
+      {
+        pipe->brushes[i] =
+          GIMP_BRUSH (gimp_data_duplicate (GIMP_DATA (src_pipe->brushes[i])));
+        gimp_object_set_name (GIMP_OBJECT (pipe->brushes[i]),
+                              gimp_object_get_name (src_pipe->brushes[i]));
+      }
+
+  g_clear_pointer (&pipe->params, g_free);
+  pipe->params = g_strdup (src_pipe->params);
+
+  pipe->current = pipe->brushes[0];
+
+  GIMP_BRUSH (pipe)->priv->spacing  = pipe->current->priv->spacing;
+  GIMP_BRUSH (pipe)->priv->x_axis   = pipe->current->priv->x_axis;
+  GIMP_BRUSH (pipe)->priv->y_axis   = pipe->current->priv->y_axis;
+  GIMP_BRUSH (pipe)->priv->mask     = pipe->current->priv->mask;
+  GIMP_BRUSH (pipe)->priv->pixmap   = pipe->current->priv->pixmap;
+
+  gimp_data_dirty (data);
+}
+
+static void
+gimp_brush_pipe_begin_use (GimpBrush *brush)
+{
+  GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (brush);
+  gint           i;
+
+  GIMP_BRUSH_CLASS (parent_class)->begin_use (brush);
+
+  for (i = 0; i < pipe->n_brushes; i++)
+    if (pipe->brushes[i])
+      gimp_brush_begin_use (pipe->brushes[i]);
+}
+
+static void
+gimp_brush_pipe_end_use (GimpBrush *brush)
+{
+  GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (brush);
+  gint           i;
+
+  GIMP_BRUSH_CLASS (parent_class)->end_use (brush);
+
+  for (i = 0; i < pipe->n_brushes; i++)
+    if (pipe->brushes[i])
+      gimp_brush_end_use (pipe->brushes[i]);
+}
+
+static GimpBrush *
+gimp_brush_pipe_select_brush (GimpBrush        *brush,
+                              const GimpCoords *last_coords,
+                              const GimpCoords *current_coords)
+{
+  GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (brush);
+  gint           i, brushix, ix;
+
+  if (pipe->n_brushes == 1)
+    return GIMP_BRUSH (pipe->current);
+
+  brushix = 0;
+  for (i = 0; i < pipe->dimension; i++)
+    {
+      switch (pipe->select[i])
+        {
+        case PIPE_SELECT_INCREMENTAL:
+          ix = (pipe->index[i] + 1) % pipe->rank[i];
+          break;
+
+        case PIPE_SELECT_ANGULAR:
+          /* Coords angle is already nomalized,
+           * offset by 90 degrees is still needed
+           * because hoses were made PS compatible*/
+          ix = (gint) RINT ((1.0 - current_coords->direction + 0.25) * pipe->rank[i]) % pipe->rank[i];
+          break;
+
+        case PIPE_SELECT_VELOCITY:
+          ix = ROUND (current_coords->velocity * pipe->rank[i]);
+          break;
+
+        case PIPE_SELECT_RANDOM:
+          /* This probably isn't the right way */
+          ix = g_random_int_range (0, pipe->rank[i]);
+          break;
+
+        case PIPE_SELECT_PRESSURE:
+          ix = RINT (current_coords->pressure * (pipe->rank[i] - 1));
+          break;
+
+        case PIPE_SELECT_TILT_X:
+          ix = RINT (current_coords->xtilt / 2.0 * pipe->rank[i]) + pipe->rank[i] / 2;
+          break;
+
+        case PIPE_SELECT_TILT_Y:
+          ix = RINT (current_coords->ytilt / 2.0 * pipe->rank[i]) + pipe->rank[i] / 2;
+          break;
+
+        case PIPE_SELECT_CONSTANT:
+        default:
+          ix = pipe->index[i];
+          break;
+        }
+
+      pipe->index[i] = CLAMP (ix, 0, pipe->rank[i] - 1);
+      brushix += pipe->stride[i] * pipe->index[i];
+    }
+
+  /* Make sure is inside bounds */
+  brushix = CLAMP (brushix, 0, pipe->n_brushes - 1);
+
+  pipe->current = pipe->brushes[brushix];
+
+  return GIMP_BRUSH (pipe->current);
+}
+
+static gboolean
+gimp_brush_pipe_want_null_motion (GimpBrush        *brush,
+                                  const GimpCoords *last_coords,
+                                  const GimpCoords *current_coords)
+{
+  GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (brush);
+  gint           i;
+
+  if (pipe->n_brushes == 1)
+    return TRUE;
+
+  for (i = 0; i < pipe->dimension; i++)
+    if (pipe->select[i] == PIPE_SELECT_ANGULAR)
+      return FALSE;
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+gboolean
+gimp_brush_pipe_set_params (GimpBrushPipe *pipe,
+                            const gchar   *paramstring)
+{
+  gint totalcells;
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_BRUSH_PIPE (pipe), FALSE);
+  g_return_val_if_fail (pipe->dimension == 0, FALSE); /* only on a new pipe! */
+
+  if (paramstring && *paramstring)
+    {
+      GimpPixPipeParams params;
+
+      gimp_pixpipe_params_init (&params);
+      gimp_pixpipe_params_parse (paramstring, &params);
+
+      pipe->dimension = params.dim;
+      pipe->rank      = g_new0 (gint, pipe->dimension);
+      pipe->select    = g_new0 (PipeSelectModes, pipe->dimension);
+      pipe->index     = g_new0 (gint, pipe->dimension);
+      /* placement is not used at all ?? */
+
+      for (i = 0; i < pipe->dimension; i++)
+        {
+          pipe->rank[i] = MAX (1, params.rank[i]);
+
+          if (strcmp (params.selection[i], "incremental") == 0)
+            pipe->select[i] = PIPE_SELECT_INCREMENTAL;
+          else if (strcmp (params.selection[i], "angular") == 0)
+            pipe->select[i] = PIPE_SELECT_ANGULAR;
+          else if (strcmp (params.selection[i], "velocity") == 0)
+            pipe->select[i] = PIPE_SELECT_VELOCITY;
+          else if (strcmp (params.selection[i], "random") == 0)
+            pipe->select[i] = PIPE_SELECT_RANDOM;
+          else if (strcmp (params.selection[i], "pressure") == 0)
+            pipe->select[i] = PIPE_SELECT_PRESSURE;
+          else if (strcmp (params.selection[i], "xtilt") == 0)
+            pipe->select[i] = PIPE_SELECT_TILT_X;
+          else if (strcmp (params.selection[i], "ytilt") == 0)
+            pipe->select[i] = PIPE_SELECT_TILT_Y;
+          else
+            pipe->select[i] = PIPE_SELECT_CONSTANT;
+
+          pipe->index[i] = 0;
+        }
+
+      gimp_pixpipe_params_free (&params);
+
+      pipe->params = g_strdup (paramstring);
+    }
+  else
+    {
+      pipe->dimension = 1;
+      pipe->rank      = g_new (gint, 1);
+      pipe->rank[0]   = pipe->n_brushes;
+      pipe->select    = g_new (PipeSelectModes, 1);
+      pipe->select[0] = PIPE_SELECT_INCREMENTAL;
+      pipe->index     = g_new (gint, 1);
+      pipe->index[0]  = 0;
+    }
+
+  totalcells = 1; /* Not all necessarily present, maybe */
+  for (i = 0; i < pipe->dimension; i++)
+    totalcells *= pipe->rank[i];
+
+  pipe->stride = g_new0 (gint, pipe->dimension);
+
+  for (i = 0; i < pipe->dimension; i++)
+    {
+      if (i == 0)
+        pipe->stride[i] = totalcells / pipe->rank[i];
+      else
+        pipe->stride[i] = pipe->stride[i-1] / pipe->rank[i];
+    }
+
+  if (pipe->stride[pipe->dimension - 1] != 1)
+    return FALSE;
+
+  return TRUE;
+}
diff --git a/app/core/gimpbrushpipe.h b/app/core/gimpbrushpipe.h
new file mode 100644
index 0000000..9615210
--- /dev/null
+++ b/app/core/gimpbrushpipe.h
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1999 Adrian Likins and Tor Lillqvist
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_PIPE_H__
+#define __GIMP_BRUSH_PIPE_H__
+
+
+#include "gimpbrush.h"
+
+
+#define GIMP_TYPE_BRUSH_PIPE            (gimp_brush_pipe_get_type ())
+#define GIMP_BRUSH_PIPE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_PIPE, GimpBrushPipe))
+#define GIMP_BRUSH_PIPE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_PIPE, GimpBrushPipeClass))
+#define GIMP_IS_BRUSH_PIPE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_PIPE))
+#define GIMP_IS_BRUSH_PIPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_PIPE))
+#define GIMP_BRUSH_PIPE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_PIPE, GimpBrushPipeClass))
+
+
+typedef enum
+{
+  PIPE_SELECT_CONSTANT,
+  PIPE_SELECT_INCREMENTAL,
+  PIPE_SELECT_ANGULAR,
+  PIPE_SELECT_VELOCITY,
+  PIPE_SELECT_RANDOM,
+  PIPE_SELECT_PRESSURE,
+  PIPE_SELECT_TILT_X,
+  PIPE_SELECT_TILT_Y
+} PipeSelectModes;
+
+
+typedef struct _GimpBrushPipeClass GimpBrushPipeClass;
+
+struct _GimpBrushPipe
+{
+  GimpBrush         parent_instance;
+
+  gint              dimension;
+  gint             *rank;       /* Size in each dimension */
+  gint             *stride;     /* Aux for indexing */
+  PipeSelectModes  *select;     /* One mode per dimension */
+
+  gint             *index;      /* Current index for incremental dimensions */
+
+  gint              n_brushes;  /* Might be less than the product of the
+                                 * ranks in some odd special case */
+  GimpBrush       **brushes;
+  GimpBrush        *current;    /* Currently selected brush */
+
+  gchar            *params;     /* For pipe <-> image conversion */
+};
+
+struct _GimpBrushPipeClass
+{
+  GimpBrushClass  parent_class;
+};
+
+
+GType      gimp_brush_pipe_get_type   (void) G_GNUC_CONST;
+
+gboolean   gimp_brush_pipe_set_params (GimpBrushPipe *pipe,
+                                       const gchar   *paramstring);
+
+
+#endif  /* __GIMP_BRUSH_PIPE_H__ */
diff --git a/app/core/gimpbuffer.c b/app/core/gimpbuffer.c
new file mode 100644
index 0000000..c713ed8
--- /dev/null
+++ b/app/core/gimpbuffer.c
@@ -0,0 +1,541 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp-memsize.h"
+#include "gimpbuffer.h"
+#include "gimpimage.h"
+#include "gimptempbuf.h"
+
+
+static void          gimp_color_managed_iface_init (GimpColorManagedInterface *iface);
+
+static void          gimp_buffer_finalize          (GObject           *object);
+
+static gint64        gimp_buffer_get_memsize       (GimpObject        *object,
+                                                    gint64            *gui_size);
+
+static gboolean      gimp_buffer_get_size          (GimpViewable      *viewable,
+                                                    gint              *width,
+                                                    gint              *height);
+static void          gimp_buffer_get_preview_size  (GimpViewable      *viewable,
+                                                    gint               size,
+                                                    gboolean           is_popup,
+                                                    gboolean           dot_for_dot,
+                                                    gint              *popup_width,
+                                                    gint              *popup_height);
+static gboolean      gimp_buffer_get_popup_size    (GimpViewable      *viewable,
+                                                    gint               width,
+                                                    gint               height,
+                                                    gboolean           dot_for_dot,
+                                                    gint              *popup_width,
+                                                    gint              *popup_height);
+static GimpTempBuf * gimp_buffer_get_new_preview   (GimpViewable      *viewable,
+                                                    GimpContext       *context,
+                                                    gint               width,
+                                                    gint               height);
+static GdkPixbuf   * gimp_buffer_get_new_pixbuf    (GimpViewable      *viewable,
+                                                    GimpContext       *context,
+                                                    gint               width,
+                                                    gint               height);
+static gchar       * gimp_buffer_get_description   (GimpViewable      *viewable,
+                                                    gchar            **tooltip);
+
+static const guint8 *
+       gimp_buffer_color_managed_get_icc_profile   (GimpColorManaged  *managed,
+                                                    gsize             *len);
+static GimpColorProfile *
+       gimp_buffer_color_managed_get_color_profile (GimpColorManaged  *managed);
+static void
+       gimp_buffer_color_managed_profile_changed   (GimpColorManaged  *managed);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBuffer, gimp_buffer, GIMP_TYPE_VIEWABLE,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
+                                                gimp_color_managed_iface_init))
+
+#define parent_class gimp_buffer_parent_class
+
+
+static void
+gimp_buffer_class_init (GimpBufferClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->finalize            = gimp_buffer_finalize;
+
+  gimp_object_class->get_memsize    = gimp_buffer_get_memsize;
+
+  viewable_class->default_icon_name = "edit-paste";
+  viewable_class->name_editable     = TRUE;
+  viewable_class->get_size          = gimp_buffer_get_size;
+  viewable_class->get_preview_size  = gimp_buffer_get_preview_size;
+  viewable_class->get_popup_size    = gimp_buffer_get_popup_size;
+  viewable_class->get_new_preview   = gimp_buffer_get_new_preview;
+  viewable_class->get_new_pixbuf    = gimp_buffer_get_new_pixbuf;
+  viewable_class->get_description   = gimp_buffer_get_description;
+}
+
+static void
+gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
+{
+  iface->get_icc_profile   = gimp_buffer_color_managed_get_icc_profile;
+  iface->get_color_profile = gimp_buffer_color_managed_get_color_profile;
+  iface->profile_changed   = gimp_buffer_color_managed_profile_changed;
+}
+
+static void
+gimp_buffer_init (GimpBuffer *buffer)
+{
+}
+
+static void
+gimp_buffer_finalize (GObject *object)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (object);
+
+  g_clear_object (&buffer->buffer);
+
+  gimp_buffer_set_color_profile (buffer, NULL);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_buffer_get_memsize (GimpObject *object,
+                         gint64     *gui_size)
+{
+  GimpBuffer *buffer  = GIMP_BUFFER (object);
+  gint64      memsize = 0;
+
+  memsize += gimp_gegl_buffer_get_memsize (buffer->buffer);
+  memsize += gimp_g_object_get_memsize (G_OBJECT (buffer->color_profile));
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_buffer_get_size (GimpViewable *viewable,
+                      gint         *width,
+                      gint         *height)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (viewable);
+
+  *width  = gimp_buffer_get_width (buffer);
+  *height = gimp_buffer_get_height (buffer);
+
+  return TRUE;
+}
+
+static void
+gimp_buffer_get_preview_size (GimpViewable *viewable,
+                              gint          size,
+                              gboolean      is_popup,
+                              gboolean      dot_for_dot,
+                              gint         *width,
+                              gint         *height)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (viewable);
+
+  gimp_viewable_calc_preview_size (gimp_buffer_get_width (buffer),
+                                   gimp_buffer_get_height (buffer),
+                                   size,
+                                   size,
+                                   dot_for_dot, 1.0, 1.0,
+                                   width,
+                                   height,
+                                   NULL);
+}
+
+static gboolean
+gimp_buffer_get_popup_size (GimpViewable *viewable,
+                            gint          width,
+                            gint          height,
+                            gboolean      dot_for_dot,
+                            gint         *popup_width,
+                            gint         *popup_height)
+{
+  GimpBuffer *buffer;
+  gint        buffer_width;
+  gint        buffer_height;
+
+  buffer        = GIMP_BUFFER (viewable);
+  buffer_width  = gimp_buffer_get_width (buffer);
+  buffer_height = gimp_buffer_get_height (buffer);
+
+  if (buffer_width > width || buffer_height > height)
+    {
+      gboolean scaling_up;
+
+      gimp_viewable_calc_preview_size (buffer_width,
+                                       buffer_height,
+                                       width  * 2,
+                                       height * 2,
+                                       dot_for_dot, 1.0, 1.0,
+                                       popup_width,
+                                       popup_height,
+                                       &scaling_up);
+
+      if (scaling_up)
+        {
+          *popup_width  = buffer_width;
+          *popup_height = buffer_height;
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GimpTempBuf *
+gimp_buffer_get_new_preview (GimpViewable *viewable,
+                             GimpContext  *context,
+                             gint          width,
+                             gint          height)
+{
+  GimpBuffer  *buffer = GIMP_BUFFER (viewable);
+  const Babl  *format = gimp_buffer_get_format (buffer);
+  GimpTempBuf *preview;
+
+  if (babl_format_is_palette (format))
+    format = gimp_babl_format (GIMP_RGB, GIMP_PRECISION_U8_GAMMA,
+                               babl_format_has_alpha (format));
+  else
+    format = gimp_babl_format (gimp_babl_format_get_base_type (format),
+                               gimp_babl_precision (GIMP_COMPONENT_TYPE_U8,
+                                                    gimp_babl_format_get_linear (format)),
+                               babl_format_has_alpha (format));
+
+  preview = gimp_temp_buf_new (width, height, format);
+
+  gegl_buffer_get (buffer->buffer, GEGL_RECTANGLE (0, 0, width, height),
+                   MIN ((gdouble) width  / (gdouble) gimp_buffer_get_width (buffer),
+                        (gdouble) height / (gdouble) gimp_buffer_get_height (buffer)),
+                   format,
+                   gimp_temp_buf_get_data (preview),
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  return preview;
+}
+
+static GdkPixbuf *
+gimp_buffer_get_new_pixbuf (GimpViewable *viewable,
+                            GimpContext  *context,
+                            gint          width,
+                            gint          height)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (viewable);
+  GdkPixbuf  *pixbuf;
+  gdouble     scale;
+
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                           width, height);
+
+  scale = MIN ((gdouble) width  / (gdouble) gimp_buffer_get_width (buffer),
+               (gdouble) height / (gdouble) gimp_buffer_get_height (buffer));
+
+  if (buffer->color_profile)
+    {
+      GimpColorProfile *srgb_profile;
+      GimpTempBuf      *temp_buf;
+      GeglBuffer       *src_buf;
+      GeglBuffer       *dest_buf;
+
+      srgb_profile = gimp_color_profile_new_rgb_srgb ();
+
+      temp_buf = gimp_temp_buf_new (width, height,
+                                    gimp_buffer_get_format (buffer));
+
+      gegl_buffer_get (buffer->buffer,
+                       GEGL_RECTANGLE (0, 0, width, height),
+                       scale,
+                       gimp_temp_buf_get_format (temp_buf),
+                       gimp_temp_buf_get_data (temp_buf),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+      src_buf  = gimp_temp_buf_create_buffer (temp_buf);
+      dest_buf = gimp_pixbuf_create_buffer (pixbuf);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      gimp_gegl_convert_color_profile (src_buf,
+                                       GEGL_RECTANGLE (0, 0, width, height),
+                                       buffer->color_profile,
+                                       dest_buf,
+                                       GEGL_RECTANGLE (0, 0, 0, 0),
+                                       srgb_profile,
+                                       GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                       TRUE,
+                                       NULL);
+
+      g_object_unref (src_buf);
+      g_object_unref (dest_buf);
+
+      g_object_unref (srgb_profile);
+    }
+  else
+    {
+      gegl_buffer_get (buffer->buffer,
+                       GEGL_RECTANGLE (0, 0, width, height),
+                       scale,
+                       gimp_pixbuf_get_format (pixbuf),
+                       gdk_pixbuf_get_pixels (pixbuf),
+                       gdk_pixbuf_get_rowstride (pixbuf),
+                       GEGL_ABYSS_CLAMP);
+    }
+
+  return pixbuf;
+}
+
+static gchar *
+gimp_buffer_get_description (GimpViewable  *viewable,
+                             gchar        **tooltip)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (viewable);
+
+  return g_strdup_printf ("%s (%d × %d)",
+                          gimp_object_get_name (buffer),
+                          gimp_buffer_get_width (buffer),
+                          gimp_buffer_get_height (buffer));
+}
+
+static const guint8 *
+gimp_buffer_color_managed_get_icc_profile (GimpColorManaged *managed,
+                             gsize            *len)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (managed);
+
+  if (buffer->color_profile)
+    return gimp_color_profile_get_icc_profile (buffer->color_profile, len);
+
+  return NULL;
+}
+
+static GimpColorProfile *
+gimp_buffer_color_managed_get_color_profile (GimpColorManaged *managed)
+{
+  GimpBuffer *buffer = GIMP_BUFFER (managed);
+
+  if (buffer->color_profile)
+    return buffer->color_profile;
+
+  return gimp_babl_format_get_color_profile (gimp_buffer_get_format (buffer));
+}
+
+static void
+gimp_buffer_color_managed_profile_changed (GimpColorManaged *managed)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (managed));
+}
+
+
+/*  public functions  */
+
+GimpBuffer *
+gimp_buffer_new (GeglBuffer    *buffer,
+                 const gchar   *name,
+                 gint           offset_x,
+                 gint           offset_y,
+                 gboolean       copy_pixels)
+{
+  GimpBuffer *gimp_buffer;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  gimp_buffer = g_object_new (GIMP_TYPE_BUFFER,
+                              "name", name,
+                              NULL);
+
+  if (copy_pixels)
+    gimp_buffer->buffer = gimp_gegl_buffer_dup (buffer);
+  else
+    gimp_buffer->buffer = g_object_ref (buffer);
+
+  gimp_buffer->offset_x = offset_x;
+  gimp_buffer->offset_y = offset_y;
+
+  return gimp_buffer;
+}
+
+GimpBuffer *
+gimp_buffer_new_from_pixbuf (GdkPixbuf   *pixbuf,
+                             const gchar *name,
+                             gint         offset_x,
+                             gint         offset_y)
+{
+  GimpBuffer       *gimp_buffer;
+  GeglBuffer       *buffer;
+  guint8           *icc_data;
+  gsize             icc_len;
+  GimpColorProfile *profile = NULL;
+
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  buffer = gimp_pixbuf_create_buffer (pixbuf);
+
+  gimp_buffer = gimp_buffer_new (buffer, name,
+                                 offset_x, offset_y, FALSE);
+
+  icc_data = gimp_pixbuf_get_icc_profile (pixbuf, &icc_len);
+  if (icc_data)
+    {
+      profile = gimp_color_profile_new_from_icc_profile (icc_data, icc_len,
+                                                         NULL);
+      g_free (icc_data);
+    }
+
+  if (! profile && gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB)
+    {
+      profile = gimp_color_profile_new_rgb_srgb ();
+    }
+
+  if (profile)
+    {
+      gimp_buffer_set_color_profile (gimp_buffer, profile);
+      g_object_unref (profile);
+    }
+
+  g_object_unref (buffer);
+
+  return gimp_buffer;
+}
+
+gint
+gimp_buffer_get_width (GimpBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), 0);
+
+  return gegl_buffer_get_width (buffer->buffer);
+}
+
+gint
+gimp_buffer_get_height (GimpBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), 0);
+
+  return gegl_buffer_get_height (buffer->buffer);
+}
+
+const Babl *
+gimp_buffer_get_format (GimpBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
+
+  return gegl_buffer_get_format (buffer->buffer);
+}
+
+GeglBuffer *
+gimp_buffer_get_buffer (GimpBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
+
+  return buffer->buffer;
+}
+
+void
+gimp_buffer_set_resolution (GimpBuffer *buffer,
+                            gdouble     resolution_x,
+                            gdouble     resolution_y)
+{
+  g_return_if_fail (GIMP_IS_BUFFER (buffer));
+  g_return_if_fail (resolution_x >= 0.0 && resolution_x <= GIMP_MAX_RESOLUTION);
+  g_return_if_fail (resolution_y >= 0.0 && resolution_y <= GIMP_MAX_RESOLUTION);
+
+  buffer->resolution_x = resolution_x;
+  buffer->resolution_y = resolution_y;
+}
+
+gboolean
+gimp_buffer_get_resolution (GimpBuffer *buffer,
+                            gdouble    *resolution_x,
+                            gdouble    *resolution_y)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), FALSE);
+
+  if (buffer->resolution_x > 0.0 &&
+      buffer->resolution_y > 0.0)
+    {
+      if (resolution_x) *resolution_x = buffer->resolution_x;
+      if (resolution_y) *resolution_y = buffer->resolution_y;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_buffer_set_unit (GimpBuffer *buffer,
+                      GimpUnit    unit)
+{
+  g_return_if_fail (GIMP_IS_BUFFER (buffer));
+  g_return_if_fail (unit > GIMP_UNIT_PIXEL);
+
+  buffer->unit = unit;
+}
+
+GimpUnit
+gimp_buffer_get_unit (GimpBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), GIMP_UNIT_PIXEL);
+
+  return buffer->unit;
+}
+
+void
+gimp_buffer_set_color_profile (GimpBuffer       *buffer,
+                               GimpColorProfile *profile)
+{
+  g_return_if_fail (GIMP_IS_BUFFER (buffer));
+  g_return_if_fail (profile == NULL || GIMP_IS_COLOR_PROFILE (profile));
+
+  if (profile != buffer->color_profile)
+    {
+      g_clear_object (&buffer->color_profile);
+
+      if (profile)
+        buffer->color_profile = g_object_ref (profile);
+    }
+}
+
+GimpColorProfile *
+gimp_buffer_get_color_profile (GimpBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
+
+  return buffer->color_profile;
+}
diff --git a/app/core/gimpbuffer.h b/app/core/gimpbuffer.h
new file mode 100644
index 0000000..2949bae
--- /dev/null
+++ b/app/core/gimpbuffer.h
@@ -0,0 +1,90 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BUFFER_H__
+#define __GIMP_BUFFER_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_BUFFER            (gimp_buffer_get_type ())
+#define GIMP_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BUFFER, GimpBuffer))
+#define GIMP_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUFFER, GimpBufferClass))
+#define GIMP_IS_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BUFFER))
+#define GIMP_IS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUFFER))
+#define GIMP_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BUFFER, GimpBufferClass))
+
+
+typedef struct _GimpBufferClass GimpBufferClass;
+
+struct _GimpBuffer
+{
+  GimpViewable      parent_instance;
+
+  GeglBuffer       *buffer;
+  gint              offset_x;
+  gint              offset_y;
+
+  gdouble           resolution_x;
+  gdouble           resolution_y;
+  GimpUnit          unit;
+
+  GimpColorProfile *color_profile;
+};
+
+struct _GimpBufferClass
+{
+  GimpViewableClass  parent_class;
+};
+
+
+GType              gimp_buffer_get_type          (void) G_GNUC_CONST;
+
+GimpBuffer       * gimp_buffer_new               (GeglBuffer       *buffer,
+                                                  const gchar      *name,
+                                                  gint              offset_x,
+                                                  gint              offset_y,
+                                                  gboolean          copy_pixels);
+GimpBuffer       * gimp_buffer_new_from_pixbuf   (GdkPixbuf        *pixbuf,
+                                                  const gchar      *name,
+                                                  gint              offset_x,
+                                                  gint              offset_y);
+
+gint               gimp_buffer_get_width         (GimpBuffer       *buffer);
+gint               gimp_buffer_get_height        (GimpBuffer       *buffer);
+const Babl       * gimp_buffer_get_format        (GimpBuffer       *buffer);
+
+GeglBuffer       * gimp_buffer_get_buffer        (GimpBuffer       *buffer);
+
+void               gimp_buffer_set_resolution    (GimpBuffer       *buffer,
+                                                  gdouble           resolution_x,
+                                                  gdouble           resolution_y);
+gboolean           gimp_buffer_get_resolution    (GimpBuffer       *buffer,
+                                                  gdouble          *resolution_x,
+                                                  gdouble          *resolution_y);
+
+void               gimp_buffer_set_unit          (GimpBuffer       *buffer,
+                                                  GimpUnit          unit);
+GimpUnit           gimp_buffer_get_unit          (GimpBuffer       *buffer);
+
+void               gimp_buffer_set_color_profile (GimpBuffer       *buffer,
+                                                  GimpColorProfile *profile);
+GimpColorProfile * gimp_buffer_get_color_profile (GimpBuffer       *buffer);
+
+
+#endif /* __GIMP_BUFFER_H__ */
diff --git a/app/core/gimpcancelable.c b/app/core/gimpcancelable.c
new file mode 100644
index 0000000..9cb5f12
--- /dev/null
+++ b/app/core/gimpcancelable.c
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcancelable.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpcancelable.h"
+#include "gimpmarshal.h"
+
+
+enum
+{
+  CANCEL,
+  LAST_SIGNAL
+};
+
+
+G_DEFINE_INTERFACE (GimpCancelable, gimp_cancelable, G_TYPE_OBJECT)
+
+
+static guint cancelable_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  private functions  */
+
+
+static void
+gimp_cancelable_default_init (GimpCancelableInterface *iface)
+{
+  cancelable_signals[CANCEL] =
+    g_signal_new ("cancel",
+                  G_TYPE_FROM_CLASS (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpCancelableInterface, cancel),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_cancelable_cancel (GimpCancelable *cancelable)
+{
+  g_return_if_fail (GIMP_IS_CANCELABLE (cancelable));
+
+  g_signal_emit (cancelable, cancelable_signals[CANCEL], 0);
+}
diff --git a/app/core/gimpcancelable.h b/app/core/gimpcancelable.h
new file mode 100644
index 0000000..dc2a655
--- /dev/null
+++ b/app/core/gimpcancelable.h
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpcancelable.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANCELABLE_H__
+#define __GIMP_CANCELABLE_H__
+
+
+#define GIMP_TYPE_CANCELABLE               (gimp_cancelable_get_type ())
+#define GIMP_IS_CANCELABLE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANCELABLE))
+#define GIMP_CANCELABLE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANCELABLE, GimpCancelable))
+#define GIMP_CANCELABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CANCELABLE, GimpCancelableInterface))
+
+
+typedef struct _GimpCancelableInterface GimpCancelableInterface;
+
+struct _GimpCancelableInterface
+{
+  GTypeInterface base_iface;
+
+  /*  signals  */
+  void   (* cancel) (GimpCancelable *cancelable);
+};
+
+
+GType   gimp_cancelable_get_type (void) G_GNUC_CONST;
+
+void    gimp_cancelable_cancel   (GimpCancelable *cancelable);
+
+
+#endif  /* __GIMP_CANCELABLE_H__ */
diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c
new file mode 100644
index 0000000..8326f65
--- /dev/null
+++ b/app/core/gimpchannel-combine.c
@@ -0,0 +1,471 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-mask-combine.h"
+
+#include "gimpchannel.h"
+#include "gimpchannel-combine.h"
+
+
+typedef struct
+{
+  GeglRectangle rect;
+
+  gboolean      bounds_known;
+  gboolean      empty;
+  GeglRectangle bounds;
+} GimpChannelCombineData;
+
+
+/*  local function prototypes  */
+
+static void       gimp_channel_combine_clear            (GimpChannel            *mask,
+                                                         const GeglRectangle    *rect);
+static void       gimp_channel_combine_clear_complement (GimpChannel            *mask,
+                                                         const GeglRectangle    *rect);
+
+static gboolean   gimp_channel_combine_start            (GimpChannel            *mask,
+                                                         GimpChannelOps          op,
+                                                         const GeglRectangle    *rect,
+                                                         gboolean                full_extent,
+                                                         gboolean                full_value,
+                                                         GimpChannelCombineData *data);
+static void       gimp_channel_combine_end              (GimpChannel            *mask,
+                                                         GimpChannelCombineData *data);
+
+
+/*  private functions  */
+
+static void
+gimp_channel_combine_clear (GimpChannel         *mask,
+                            const GeglRectangle *rect)
+{
+  GeglBuffer    *buffer;
+  GeglRectangle  area;
+  GeglRectangle  update_area;
+
+  if (mask->bounds_known && mask->empty)
+    return;
+
+  buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+  if (rect)
+    {
+      if (rect->width <= 0 || rect->height <= 0)
+        return;
+
+      if (mask->bounds_known)
+        {
+          if (! gegl_rectangle_intersect (&area,
+                                          GEGL_RECTANGLE (mask->x1,
+                                                          mask->y1,
+                                                          mask->x2 - mask->x1,
+                                                          mask->y2 - mask->y1),
+                                          rect))
+            {
+              return;
+            }
+        }
+      else
+        {
+          area = *rect;
+        }
+
+      update_area = area;
+    }
+  else
+    {
+      if (mask->bounds_known)
+        {
+          area.x      = mask->x1;
+          area.y      = mask->y1;
+          area.width  = mask->x2 - mask->x1;
+          area.height = mask->y2 - mask->y1;
+        }
+      else
+        {
+          area.x      = 0;
+          area.y      = 0;
+          area.width  = gimp_item_get_width  (GIMP_ITEM (mask));
+          area.height = gimp_item_get_height (GIMP_ITEM (mask));
+        }
+
+      update_area = area;
+
+      gegl_rectangle_align_to_buffer (&area, &area, buffer,
+                                      GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+    }
+
+  gegl_buffer_clear (buffer, &area);
+
+  gimp_drawable_update (GIMP_DRAWABLE (mask),
+                        update_area.x, update_area.y,
+                        update_area.width, update_area.height);
+}
+
+static void
+gimp_channel_combine_clear_complement (GimpChannel         *mask,
+                                       const GeglRectangle *rect)
+{
+  gint width  = gimp_item_get_width  (GIMP_ITEM (mask));
+  gint height = gimp_item_get_height (GIMP_ITEM (mask));
+
+  gimp_channel_combine_clear (
+    mask,
+    GEGL_RECTANGLE (0,
+                    0,
+                    width,
+                    rect->y));
+
+  gimp_channel_combine_clear (
+    mask,
+    GEGL_RECTANGLE (0,
+                    rect->y + rect->height,
+                    width,
+                    height - (rect->y + rect->height)));
+
+  gimp_channel_combine_clear (
+    mask,
+    GEGL_RECTANGLE (0,
+                    rect->y,
+                    rect->x,
+                    rect->height));
+
+  gimp_channel_combine_clear (
+    mask,
+    GEGL_RECTANGLE (rect->x + rect->width,
+                    rect->y,
+                    width - (rect->x + rect->width),
+                    rect->height));
+}
+
+static gboolean
+gimp_channel_combine_start (GimpChannel            *mask,
+                            GimpChannelOps          op,
+                            const GeglRectangle    *rect,
+                            gboolean                full_extent,
+                            gboolean                full_value,
+                            GimpChannelCombineData *data)
+{
+  GeglBuffer    *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+  GeglRectangle  extent;
+  gboolean       intersects;
+
+  extent.x      = 0;
+  extent.y      = 0;
+  extent.width  = gimp_item_get_width  (GIMP_ITEM (mask));
+  extent.height = gimp_item_get_height (GIMP_ITEM (mask));
+
+  intersects = gegl_rectangle_intersect (&data->rect, rect, &extent);
+
+  data->bounds_known  = mask->bounds_known;
+  data->empty         = mask->empty;
+
+  data->bounds.x      = mask->x1;
+  data->bounds.y      = mask->y1;
+  data->bounds.width  = mask->x2 - mask->x1;
+  data->bounds.height = mask->y2 - mask->y1;
+
+  gegl_buffer_freeze_changed (buffer);
+
+  /*  Determine new boundary  */
+  switch (op)
+    {
+    case GIMP_CHANNEL_OP_REPLACE:
+      gimp_channel_combine_clear (mask, NULL);
+
+      if (! intersects)
+        {
+          data->bounds_known = TRUE;
+          data->empty        = TRUE;
+
+          return FALSE;
+        }
+
+      data->bounds_known = FALSE;
+
+      if (full_extent)
+        {
+          data->bounds_known = TRUE;
+          data->empty        = FALSE;
+          data->bounds       = data->rect;
+        }
+      break;
+
+    case GIMP_CHANNEL_OP_ADD:
+      if (! intersects)
+        return FALSE;
+
+      data->bounds_known = FALSE;
+
+      if (full_extent && (mask->bounds_known ||
+                          gegl_rectangle_equal (&data->rect, &extent)))
+        {
+          data->bounds_known = TRUE;
+          data->empty        = FALSE;
+
+          if (mask->bounds_known && ! mask->empty)
+            {
+              gegl_rectangle_bounding_box (&data->bounds,
+                                           &data->bounds, &data->rect);
+            }
+          else
+            {
+              data->bounds = data->rect;
+            }
+        }
+      break;
+
+    case GIMP_CHANNEL_OP_SUBTRACT:
+      if (intersects && mask->bounds_known)
+        {
+          if (mask->empty)
+            {
+              intersects = FALSE;
+            }
+          else
+            {
+              intersects = gegl_rectangle_intersect (&data->rect,
+                                                     &data->rect,
+                                                     &data->bounds);
+            }
+        }
+
+      if (! intersects)
+        return FALSE;
+
+      if (full_value &&
+          gegl_rectangle_contains (&data->rect,
+                                   mask->bounds_known ? &data->bounds :
+                                                        &extent))
+        {
+          gimp_channel_combine_clear (mask, NULL);
+
+          data->bounds_known = TRUE;
+          data->empty        = TRUE;
+
+          return FALSE;
+        }
+
+      data->bounds_known = FALSE;
+
+      gegl_buffer_set_abyss (buffer, &data->rect);
+      break;
+
+    case GIMP_CHANNEL_OP_INTERSECT:
+      if (intersects && mask->bounds_known)
+        {
+          if (mask->empty)
+            {
+              intersects = FALSE;
+            }
+          else
+            {
+              intersects = gegl_rectangle_intersect (&data->rect,
+                                                     &data->rect,
+                                                     &data->bounds);
+            }
+        }
+
+      if (! intersects)
+        {
+          gimp_channel_combine_clear (mask, NULL);
+
+          data->bounds_known = TRUE;
+          data->empty        = TRUE;
+
+          return FALSE;
+        }
+
+      if (full_value && mask->bounds_known &&
+          gegl_rectangle_contains (&data->rect, &data->bounds))
+        {
+          return FALSE;
+        }
+
+      data->bounds_known = FALSE;
+
+      gimp_channel_combine_clear_complement (mask, &data->rect);
+
+      gegl_buffer_set_abyss (buffer, &data->rect);
+      break;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_channel_combine_end (GimpChannel            *mask,
+                          GimpChannelCombineData *data)
+{
+  GeglBuffer *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+  gegl_buffer_set_abyss (buffer, gegl_buffer_get_extent (buffer));
+
+  gegl_buffer_thaw_changed (buffer);
+
+  mask->bounds_known = data->bounds_known;
+
+  if (data->bounds_known)
+    {
+      mask->empty = data->empty;
+
+      if (data->empty)
+        {
+          mask->x1 = 0;
+          mask->y1 = 0;
+          mask->x2 = gimp_item_get_width  (GIMP_ITEM (mask));
+          mask->y2 = gimp_item_get_height (GIMP_ITEM (mask));
+        }
+      else
+        {
+          mask->x1 = data->bounds.x;
+          mask->y1 = data->bounds.y;
+          mask->x2 = data->bounds.x + data->bounds.width;
+          mask->y2 = data->bounds.y + data->bounds.height;
+        }
+    }
+
+  gimp_drawable_update (GIMP_DRAWABLE (mask),
+                        data->rect.x, data->rect.y,
+                        data->rect.width, data->rect.height);
+}
+
+
+/*  public functions  */
+
+void
+gimp_channel_combine_rect (GimpChannel    *mask,
+                           GimpChannelOps  op,
+                           gint            x,
+                           gint            y,
+                           gint            w,
+                           gint            h)
+{
+  GimpChannelCombineData data;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (mask));
+
+  if (gimp_channel_combine_start (mask, op, GEGL_RECTANGLE (x, y, w, h),
+                                  TRUE, TRUE, &data))
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+      gimp_gegl_mask_combine_rect (buffer, op, x, y, w, h);
+    }
+
+  gimp_channel_combine_end (mask, &data);
+}
+
+void
+gimp_channel_combine_ellipse (GimpChannel    *mask,
+                              GimpChannelOps  op,
+                              gint            x,
+                              gint            y,
+                              gint            w,
+                              gint            h,
+                              gboolean        antialias)
+{
+  gimp_channel_combine_ellipse_rect (mask, op, x, y, w, h,
+                                     w / 2.0, h / 2.0, antialias);
+}
+
+void
+gimp_channel_combine_ellipse_rect (GimpChannel    *mask,
+                                   GimpChannelOps  op,
+                                   gint            x,
+                                   gint            y,
+                                   gint            w,
+                                   gint            h,
+                                   gdouble         rx,
+                                   gdouble         ry,
+                                   gboolean        antialias)
+{
+  GimpChannelCombineData data;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (mask));
+
+  if (gimp_channel_combine_start (mask, op, GEGL_RECTANGLE (x, y, w, h),
+                                  TRUE, FALSE, &data))
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+      gimp_gegl_mask_combine_ellipse_rect (buffer, op, x, y, w, h,
+                                           rx, ry, antialias);
+    }
+
+  gimp_channel_combine_end (mask, &data);
+}
+
+void
+gimp_channel_combine_mask (GimpChannel    *mask,
+                           GimpChannel    *add_on,
+                           GimpChannelOps  op,
+                           gint            off_x,
+                           gint            off_y)
+{
+  GeglBuffer *add_on_buffer;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (mask));
+  g_return_if_fail (GIMP_IS_CHANNEL (add_on));
+
+  add_on_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (add_on));
+
+  gimp_channel_combine_buffer (mask, add_on_buffer,
+                               op, off_x, off_y);
+}
+
+void
+gimp_channel_combine_buffer (GimpChannel    *mask,
+                             GeglBuffer     *add_on_buffer,
+                             GimpChannelOps  op,
+                             gint            off_x,
+                             gint            off_y)
+{
+  GimpChannelCombineData data;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (mask));
+  g_return_if_fail (GEGL_IS_BUFFER (add_on_buffer));
+
+  if (gimp_channel_combine_start (mask, op,
+                                  GEGL_RECTANGLE (
+                                    off_x + gegl_buffer_get_x (add_on_buffer),
+                                    off_y + gegl_buffer_get_y (add_on_buffer),
+                                    gegl_buffer_get_width  (add_on_buffer),
+                                    gegl_buffer_get_height (add_on_buffer)),
+                                  FALSE, FALSE, &data))
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+      gimp_gegl_mask_combine_buffer (buffer, add_on_buffer, op,
+                                     off_x, off_y);
+    }
+
+  gimp_channel_combine_end (mask, &data);
+}
diff --git a/app/core/gimpchannel-combine.h b/app/core/gimpchannel-combine.h
new file mode 100644
index 0000000..de1f125
--- /dev/null
+++ b/app/core/gimpchannel-combine.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHANNEL_COMBINE_H__
+#define __GIMP_CHANNEL_COMBINE_H__
+
+
+void   gimp_channel_combine_rect         (GimpChannel    *mask,
+                                          GimpChannelOps  op,
+                                          gint            x,
+                                          gint            y,
+                                          gint            w,
+                                          gint            h);
+void   gimp_channel_combine_ellipse      (GimpChannel    *mask,
+                                          GimpChannelOps  op,
+                                          gint            x,
+                                          gint            y,
+                                          gint            w,
+                                          gint            h,
+                                          gboolean        antialias);
+void   gimp_channel_combine_ellipse_rect (GimpChannel    *mask,
+                                          GimpChannelOps  op,
+                                          gint            x,
+                                          gint            y,
+                                          gint            w,
+                                          gint            h,
+                                          gdouble         rx,
+                                          gdouble         ry,
+                                          gboolean        antialias);
+void   gimp_channel_combine_mask         (GimpChannel    *mask,
+                                          GimpChannel    *add_on,
+                                          GimpChannelOps  op,
+                                          gint            off_x,
+                                          gint            off_y);
+void   gimp_channel_combine_buffer       (GimpChannel    *mask,
+                                          GeglBuffer     *add_on_buffer,
+                                          GimpChannelOps  op,
+                                          gint            off_x,
+                                          gint            off_y);
+
+
+#endif /* __GIMP_CHANNEL_COMBINE_H__ */
diff --git a/app/core/gimpchannel-select.c b/app/core/gimpchannel-select.c
new file mode 100644
index 0000000..b76280e
--- /dev/null
+++ b/app/core/gimpchannel-select.c
@@ -0,0 +1,605 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-mask-combine.h"
+
+#include "gimpchannel.h"
+#include "gimpchannel-select.h"
+#include "gimpchannel-combine.h"
+#include "gimppickable.h"
+#include "gimppickable-contiguous-region.h"
+#include "gimpscanconvert.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimp-intl.h"
+
+
+/*  basic selection functions  */
+
+void
+gimp_channel_select_rectangle (GimpChannel    *channel,
+                               gint            x,
+                               gint            y,
+                               gint            w,
+                               gint            h,
+                               GimpChannelOps  op,
+                               gboolean        feather,
+                               gdouble         feather_radius_x,
+                               gdouble         feather_radius_y,
+                               gboolean        push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+
+  if (push_undo)
+    gimp_channel_push_undo (channel, C_("undo-type", "Rectangle Select"));
+
+  /*  if feathering for rect, make a new mask with the
+   *  rectangle and feather that with the old mask
+   */
+  if (feather)
+    {
+      GimpItem   *item = GIMP_ITEM (channel);
+      GeglBuffer *add_on;
+
+      add_on = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                gimp_item_get_width  (item),
+                                                gimp_item_get_height (item)),
+                                babl_format ("Y float"));
+
+      gimp_gegl_mask_combine_rect (add_on, GIMP_CHANNEL_OP_REPLACE, x, y, w, h);
+
+      gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
+                               feather_radius_x,
+                               feather_radius_y,
+                               TRUE);
+
+      gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
+      g_object_unref (add_on);
+    }
+  else
+    {
+      gimp_channel_combine_rect (channel, op, x, y, w, h);
+    }
+}
+
+void
+gimp_channel_select_ellipse (GimpChannel    *channel,
+                             gint            x,
+                             gint            y,
+                             gint            w,
+                             gint            h,
+                             GimpChannelOps  op,
+                             gboolean        antialias,
+                             gboolean        feather,
+                             gdouble         feather_radius_x,
+                             gdouble         feather_radius_y,
+                             gboolean        push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+
+  if (push_undo)
+    gimp_channel_push_undo (channel, C_("undo-type", "Ellipse Select"));
+
+  /*  if feathering for rect, make a new mask with the
+   *  rectangle and feather that with the old mask
+   */
+  if (feather)
+    {
+      GimpItem   *item = GIMP_ITEM (channel);
+      GeglBuffer *add_on;
+
+      add_on = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                gimp_item_get_width  (item),
+                                                gimp_item_get_height (item)),
+                                babl_format ("Y float"));
+
+      gimp_gegl_mask_combine_ellipse (add_on, GIMP_CHANNEL_OP_REPLACE,
+                                      x, y, w, h, antialias);
+
+      gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
+                               feather_radius_x,
+                               feather_radius_y,
+                               TRUE);
+
+      gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
+      g_object_unref (add_on);
+    }
+  else
+    {
+      gimp_channel_combine_ellipse (channel, op, x, y, w, h, antialias);
+    }
+}
+
+void
+gimp_channel_select_round_rect (GimpChannel         *channel,
+                                gint                 x,
+                                gint                 y,
+                                gint                 w,
+                                gint                 h,
+                                gdouble              corner_radius_x,
+                                gdouble              corner_radius_y,
+                                GimpChannelOps       op,
+                                gboolean             antialias,
+                                gboolean             feather,
+                                gdouble              feather_radius_x,
+                                gdouble              feather_radius_y,
+                                gboolean             push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+
+  if (push_undo)
+    gimp_channel_push_undo (channel, C_("undo-type", "Rounded Rectangle Select"));
+
+  /*  if feathering for rect, make a new mask with the
+   *  rectangle and feather that with the old mask
+   */
+  if (feather)
+    {
+      GimpItem   *item = GIMP_ITEM (channel);
+      GeglBuffer *add_on;
+
+      add_on = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                gimp_item_get_width  (item),
+                                                gimp_item_get_height (item)),
+                                babl_format ("Y float"));
+
+      gimp_gegl_mask_combine_ellipse_rect (add_on, GIMP_CHANNEL_OP_REPLACE,
+                                           x, y, w, h,
+                                           corner_radius_x, corner_radius_y,
+                                           antialias);
+
+      gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
+                               feather_radius_x,
+                               feather_radius_y,
+                               TRUE);
+
+      gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
+      g_object_unref (add_on);
+    }
+  else
+    {
+      gimp_channel_combine_ellipse_rect (channel, op, x, y, w, h,
+                                         corner_radius_x, corner_radius_y,
+                                         antialias);
+    }
+}
+
+/*  select by GimpScanConvert functions  */
+
+void
+gimp_channel_select_scan_convert (GimpChannel     *channel,
+                                  const gchar     *undo_desc,
+                                  GimpScanConvert *scan_convert,
+                                  gint             offset_x,
+                                  gint             offset_y,
+                                  GimpChannelOps   op,
+                                  gboolean         antialias,
+                                  gboolean         feather,
+                                  gdouble          feather_radius_x,
+                                  gdouble          feather_radius_y,
+                                  gboolean         push_undo)
+{
+  GimpItem   *item;
+  GeglBuffer *add_on;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (undo_desc != NULL);
+  g_return_if_fail (scan_convert != NULL);
+
+  if (push_undo)
+    gimp_channel_push_undo (channel, undo_desc);
+
+  item = GIMP_ITEM (channel);
+
+  add_on = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                            gimp_item_get_width  (item),
+                                            gimp_item_get_height (item)),
+                            babl_format ("Y float"));
+
+  gimp_scan_convert_render (scan_convert, add_on,
+                            offset_x, offset_y, antialias);
+
+  if (feather)
+    gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
+                             feather_radius_x,
+                             feather_radius_y,
+                             TRUE);
+
+  gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
+  g_object_unref (add_on);
+}
+
+void
+gimp_channel_select_polygon (GimpChannel       *channel,
+                             const gchar       *undo_desc,
+                             gint               n_points,
+                             const GimpVector2 *points,
+                             GimpChannelOps     op,
+                             gboolean           antialias,
+                             gboolean           feather,
+                             gdouble            feather_radius_x,
+                             gdouble            feather_radius_y,
+                             gboolean           push_undo)
+{
+  GimpScanConvert *scan_convert;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (undo_desc != NULL);
+
+  scan_convert = gimp_scan_convert_new ();
+
+  gimp_scan_convert_add_polyline (scan_convert, n_points, points, TRUE);
+
+  gimp_channel_select_scan_convert (channel, undo_desc, scan_convert, 0, 0,
+                                    op, antialias, feather,
+                                    feather_radius_x, feather_radius_y,
+                                    push_undo);
+
+  gimp_scan_convert_free (scan_convert);
+}
+
+void
+gimp_channel_select_vectors (GimpChannel    *channel,
+                             const gchar    *undo_desc,
+                             GimpVectors    *vectors,
+                             GimpChannelOps  op,
+                             gboolean        antialias,
+                             gboolean        feather,
+                             gdouble         feather_radius_x,
+                             gdouble         feather_radius_y,
+                             gboolean        push_undo)
+{
+  const GimpBezierDesc *bezier;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (undo_desc != NULL);
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+
+  bezier = gimp_vectors_get_bezier (vectors);
+
+  if (bezier && bezier->num_data > 4)
+    {
+      GimpScanConvert *scan_convert;
+
+      scan_convert = gimp_scan_convert_new ();
+      gimp_scan_convert_add_bezier (scan_convert, bezier);
+
+      gimp_channel_select_scan_convert (channel, undo_desc, scan_convert, 0, 0,
+                                        op, antialias, feather,
+                                        feather_radius_x, feather_radius_y,
+                                        push_undo);
+
+      gimp_scan_convert_free (scan_convert);
+    }
+}
+
+
+/*  select by GimpChannel functions  */
+
+void
+gimp_channel_select_buffer (GimpChannel    *channel,
+                            const gchar    *undo_desc,
+                            GeglBuffer     *add_on,
+                            gint            offset_x,
+                            gint            offset_y,
+                            GimpChannelOps  op,
+                            gboolean        feather,
+                            gdouble         feather_radius_x,
+                            gdouble         feather_radius_y)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (undo_desc != NULL);
+  g_return_if_fail (GEGL_IS_BUFFER (add_on));
+
+  gimp_channel_push_undo (channel, undo_desc);
+
+  if (feather)
+    {
+      GimpItem   *item = GIMP_ITEM (channel);
+      GeglBuffer *add_on2;
+
+      add_on2 = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                 gimp_item_get_width  (item),
+                                                 gimp_item_get_height (item)),
+                                 babl_format ("Y float"));
+
+      gimp_gegl_mask_combine_buffer (add_on2, add_on,
+                                     GIMP_CHANNEL_OP_REPLACE,
+                                     offset_x, offset_y);
+
+      gimp_gegl_apply_feather (add_on2, NULL, NULL, add_on2, NULL,
+                               feather_radius_x,
+                               feather_radius_y,
+                               TRUE);
+
+      gimp_channel_combine_buffer (channel, add_on2, op, 0, 0);
+      g_object_unref (add_on2);
+    }
+  else
+    {
+      gimp_channel_combine_buffer (channel, add_on, op, offset_x, offset_y);
+    }
+}
+
+void
+gimp_channel_select_channel (GimpChannel    *channel,
+                             const gchar    *undo_desc,
+                             GimpChannel    *add_on,
+                             gint            offset_x,
+                             gint            offset_y,
+                             GimpChannelOps  op,
+                             gboolean        feather,
+                             gdouble         feather_radius_x,
+                             gdouble         feather_radius_y)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (undo_desc != NULL);
+  g_return_if_fail (GIMP_IS_CHANNEL (add_on));
+
+  gimp_channel_select_buffer (channel, undo_desc,
+                              gimp_drawable_get_buffer (GIMP_DRAWABLE (add_on)),
+                              offset_x, offset_y, op,
+                              feather,
+                              feather_radius_x, feather_radius_y);
+}
+
+void
+gimp_channel_select_alpha (GimpChannel    *channel,
+                           GimpDrawable   *drawable,
+                           GimpChannelOps  op,
+                           gboolean        feather,
+                           gdouble         feather_radius_x,
+                           gdouble         feather_radius_y)
+{
+  GimpItem    *item;
+  GimpChannel *add_on;
+  gint         off_x, off_y;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  item = GIMP_ITEM (channel);
+
+  if (gimp_drawable_has_alpha (drawable))
+    {
+      add_on = gimp_channel_new_from_alpha (gimp_item_get_image (item),
+                                            drawable, NULL, NULL);
+    }
+  else
+    {
+      /*  no alpha is equivalent to completely opaque alpha,
+       *  so simply select the whole layer's extents.  --mitch
+       */
+      add_on = gimp_channel_new_mask (gimp_item_get_image (item),
+                                      gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                      gimp_item_get_height (GIMP_ITEM (drawable)));
+      gimp_channel_all (add_on, FALSE);
+    }
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  gimp_channel_select_channel (channel, C_("undo-type", "Alpha to Selection"), add_on,
+                               off_x, off_y,
+                               op, feather,
+                               feather_radius_x,
+                               feather_radius_y);
+  g_object_unref (add_on);
+}
+
+void
+gimp_channel_select_component (GimpChannel     *channel,
+                               GimpChannelType  component,
+                               GimpChannelOps   op,
+                               gboolean         feather,
+                               gdouble          feather_radius_x,
+                               gdouble          feather_radius_y)
+{
+  GimpItem    *item;
+  GimpChannel *add_on;
+  const gchar *desc;
+  gchar       *undo_desc;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+
+  item = GIMP_ITEM (channel);
+
+  add_on = gimp_channel_new_from_component (gimp_item_get_image (item),
+                                            component, NULL, NULL);
+
+  if (feather)
+    gimp_channel_feather (add_on,
+                          feather_radius_x,
+                          feather_radius_y,
+                          TRUE,
+                          FALSE /* no undo */);
+
+  gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
+                       NULL, NULL, &desc, NULL);
+
+  undo_desc = g_strdup_printf (C_("undo-type", "%s Channel to Selection"), desc);
+
+  gimp_channel_select_channel (channel, undo_desc, add_on,
+                               0, 0, op,
+                               FALSE, 0.0, 0.0);
+
+  g_free (undo_desc);
+  g_object_unref (add_on);
+}
+
+void
+gimp_channel_select_fuzzy (GimpChannel         *channel,
+                           GimpDrawable        *drawable,
+                           gboolean             sample_merged,
+                           gint                 x,
+                           gint                 y,
+                           gfloat               threshold,
+                           gboolean             select_transparent,
+                           GimpSelectCriterion  select_criterion,
+                           gboolean             diagonal_neighbors,
+                           GimpChannelOps       op,
+                           gboolean             antialias,
+                           gboolean             feather,
+                           gdouble              feather_radius_x,
+                           gdouble              feather_radius_y)
+{
+  GimpPickable *pickable;
+  GeglBuffer   *add_on;
+  gint          add_on_x = 0;
+  gint          add_on_y = 0;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  if (sample_merged)
+    pickable = GIMP_PICKABLE (gimp_item_get_image (GIMP_ITEM (drawable)));
+  else
+    pickable = GIMP_PICKABLE (drawable);
+
+  add_on = gimp_pickable_contiguous_region_by_seed (pickable,
+                                                    antialias,
+                                                    threshold,
+                                                    select_transparent,
+                                                    select_criterion,
+                                                    diagonal_neighbors,
+                                                    x, y);
+
+  if (! sample_merged)
+    gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
+
+  gimp_channel_select_buffer (channel, C_("undo-type", "Fuzzy Select"),
+                              add_on, add_on_x, add_on_y,
+                              op,
+                              feather,
+                              feather_radius_x,
+                              feather_radius_y);
+  g_object_unref (add_on);
+}
+
+void
+gimp_channel_select_by_color (GimpChannel         *channel,
+                              GimpDrawable        *drawable,
+                              gboolean             sample_merged,
+                              const GimpRGB       *color,
+                              gfloat               threshold,
+                              gboolean             select_transparent,
+                              GimpSelectCriterion  select_criterion,
+                              GimpChannelOps       op,
+                              gboolean             antialias,
+                              gboolean             feather,
+                              gdouble              feather_radius_x,
+                              gdouble              feather_radius_y)
+{
+  GimpPickable *pickable;
+  GeglBuffer   *add_on;
+  gint          add_on_x = 0;
+  gint          add_on_y = 0;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (color != NULL);
+
+  if (sample_merged)
+    pickable = GIMP_PICKABLE (gimp_item_get_image (GIMP_ITEM (drawable)));
+  else
+    pickable = GIMP_PICKABLE (drawable);
+
+  add_on = gimp_pickable_contiguous_region_by_color (pickable,
+                                                     antialias,
+                                                     threshold,
+                                                     select_transparent,
+                                                     select_criterion,
+                                                     color);
+
+  if (! sample_merged)
+    gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
+
+  gimp_channel_select_buffer (channel, C_("undo-type", "Select by Color"),
+                              add_on, add_on_x, add_on_y,
+                              op,
+                              feather,
+                              feather_radius_x,
+                              feather_radius_y);
+  g_object_unref (add_on);
+}
+
+void
+gimp_channel_select_by_index (GimpChannel    *channel,
+                              GimpDrawable   *drawable,
+                              gint            index,
+                              GimpChannelOps  op,
+                              gboolean        feather,
+                              gdouble         feather_radius_x,
+                              gdouble         feather_radius_y)
+{
+  GeglBuffer *add_on;
+  gint        add_on_x = 0;
+  gint        add_on_y = 0;
+
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_drawable_is_indexed (drawable));
+
+  add_on = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                            gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                            gimp_item_get_height (GIMP_ITEM (drawable))),
+                            babl_format ("Y float"));
+
+  gimp_gegl_index_to_mask (gimp_drawable_get_buffer (drawable), NULL,
+                           gimp_drawable_get_format_without_alpha (drawable),
+                           add_on, NULL,
+                           index);
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
+
+  gimp_channel_select_buffer (channel, C_("undo-type", "Select by Indexed Color"),
+                              add_on, add_on_x, add_on_y,
+                              op,
+                              feather,
+                              feather_radius_x,
+                              feather_radius_y);
+  g_object_unref (add_on);
+}
diff --git a/app/core/gimpchannel-select.h b/app/core/gimpchannel-select.h
new file mode 100644
index 0000000..ca2680d
--- /dev/null
+++ b/app/core/gimpchannel-select.h
@@ -0,0 +1,160 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHANNEL_SELECT_H__
+#define __GIMP_CHANNEL_SELECT_H__
+
+
+/*  basic selection functions  */
+
+void   gimp_channel_select_rectangle    (GimpChannel         *channel,
+                                         gint                 x,
+                                         gint                 y,
+                                         gint                 w,
+                                         gint                 h,
+                                         GimpChannelOps       op,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y,
+                                         gboolean             push_undo);
+void   gimp_channel_select_ellipse      (GimpChannel         *channel,
+                                         gint                 x,
+                                         gint                 y,
+                                         gint                 w,
+                                         gint                 h,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y,
+                                         gboolean             push_undo);
+void   gimp_channel_select_round_rect   (GimpChannel         *channel,
+                                         gint                 x,
+                                         gint                 y,
+                                         gint                 w,
+                                         gint                 h,
+                                         gdouble              corner_radius_y,
+                                         gdouble              corner_radius_x,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y,
+                                         gboolean             push_undo);
+
+/*  select by GimpScanConvert functions  */
+
+void   gimp_channel_select_scan_convert (GimpChannel         *channel,
+                                         const gchar         *undo_desc,
+                                         GimpScanConvert     *scan_convert,
+                                         gint                 offset_x,
+                                         gint                 offset_y,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y,
+                                         gboolean             push_undo);
+void   gimp_channel_select_polygon      (GimpChannel         *channel,
+                                         const gchar         *undo_desc,
+                                         gint                 n_points,
+                                         const GimpVector2   *points,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y,
+                                         gboolean             push_undo);
+void   gimp_channel_select_vectors      (GimpChannel         *channel,
+                                         const gchar         *undo_desc,
+                                         GimpVectors         *vectors,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y,
+                                         gboolean             push_undo);
+void   gimp_channel_select_buffer       (GimpChannel         *channel,
+                                         const gchar         *undo_desc,
+                                         GeglBuffer          *add_on,
+                                         gint                 offset_x,
+                                         gint                 offset_y,
+                                         GimpChannelOps       op,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+
+
+/*  select by GimpChannel functions  */
+
+void   gimp_channel_select_channel      (GimpChannel         *channel,
+                                         const gchar         *undo_desc,
+                                         GimpChannel         *add_on,
+                                         gint                 offset_x,
+                                         gint                 offset_y,
+                                         GimpChannelOps       op,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+void   gimp_channel_select_alpha        (GimpChannel         *channel,
+                                         GimpDrawable        *drawable,
+                                         GimpChannelOps       op,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+void   gimp_channel_select_component    (GimpChannel         *channel,
+                                         GimpChannelType      component,
+                                         GimpChannelOps       op,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+void   gimp_channel_select_fuzzy        (GimpChannel         *channel,
+                                         GimpDrawable        *drawable,
+                                         gboolean             sample_merged,
+                                         gint                 x,
+                                         gint                 y,
+                                         gfloat               threshold,
+                                         gboolean             select_transparent,
+                                         GimpSelectCriterion  select_criterion,
+                                         gboolean             diagonal_neighbors,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+void   gimp_channel_select_by_color     (GimpChannel         *channel,
+                                         GimpDrawable        *drawable,
+                                         gboolean             sample_merged,
+                                         const GimpRGB       *color,
+                                         gfloat               threshold,
+                                         gboolean             select_transparent,
+                                         GimpSelectCriterion  select_criterion,
+                                         GimpChannelOps       op,
+                                         gboolean             antialias,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+void   gimp_channel_select_by_index     (GimpChannel         *channel,
+                                         GimpDrawable        *drawable,
+                                         gint                 index,
+                                         GimpChannelOps       op,
+                                         gboolean             feather,
+                                         gdouble              feather_radius_x,
+                                         gdouble              feather_radius_y);
+
+
+#endif  /*  __GIMP_CHANNEL_SELECT_H__  */
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
new file mode 100644
index 0000000..784551a
--- /dev/null
+++ b/app/core/gimpchannel.c
@@ -0,0 +1,1956 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "paint/gimppaintcore-stroke.h"
+#include "paint/gimppaintoptions.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-mask.h"
+#include "gegl/gimp-gegl-nodes.h"
+
+#include "gimp.h"
+#include "gimp-utils.h"
+#include "gimpboundary.h"
+#include "gimpcontainer.h"
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimpimage-quick-mask.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpchannel.h"
+#include "gimpchannel-select.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-fill.h"
+#include "gimpdrawable-stroke.h"
+#include "gimpmarshal.h"
+#include "gimppaintinfo.h"
+#include "gimppickable.h"
+#include "gimpstrokeoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define RGBA_EPSILON 1e-6
+
+enum
+{
+  COLOR_CHANGED,
+  LAST_SIGNAL
+};
+
+
+static void gimp_channel_pickable_iface_init (GimpPickableInterface *iface);
+
+static void       gimp_channel_finalize      (GObject           *object);
+
+static gint64     gimp_channel_get_memsize   (GimpObject        *object,
+                                              gint64            *gui_size);
+
+static gchar  * gimp_channel_get_description (GimpViewable      *viewable,
+                                              gchar            **tooltip);
+
+static GeglNode * gimp_channel_get_node      (GimpFilter        *filter);
+
+static gboolean   gimp_channel_is_attached   (GimpItem          *item);
+static GimpItemTree * gimp_channel_get_tree  (GimpItem          *item);
+static gboolean   gimp_channel_bounds        (GimpItem          *item,
+                                              gdouble           *x,
+                                              gdouble           *y,
+                                              gdouble           *width,
+                                              gdouble           *height);
+static GimpItem * gimp_channel_duplicate     (GimpItem          *item,
+                                              GType              new_type);
+static void       gimp_channel_convert       (GimpItem          *item,
+                                              GimpImage         *dest_image,
+                                              GType              old_type);
+static void       gimp_channel_translate     (GimpItem          *item,
+                                              gdouble            off_x,
+                                              gdouble            off_y,
+                                              gboolean           push_undo);
+static void       gimp_channel_scale         (GimpItem          *item,
+                                              gint               new_width,
+                                              gint               new_height,
+                                              gint               new_offset_x,
+                                              gint               new_offset_y,
+                                              GimpInterpolationType interp_type,
+                                              GimpProgress      *progress);
+static void       gimp_channel_resize        (GimpItem          *item,
+                                              GimpContext       *context,
+                                              GimpFillType       fill_type,
+                                              gint               new_width,
+                                              gint               new_height,
+                                              gint               offset_x,
+                                              gint               offset_y);
+static GimpTransformResize
+                  gimp_channel_get_clip      (GimpItem          *item,
+                                              GimpTransformResize clip_result);
+static gboolean   gimp_channel_fill          (GimpItem          *item,
+                                              GimpDrawable      *drawable,
+                                              GimpFillOptions   *fill_options,
+                                              gboolean           push_undo,
+                                              GimpProgress      *progress,
+                                              GError           **error);
+static gboolean   gimp_channel_stroke        (GimpItem          *item,
+                                              GimpDrawable      *drawable,
+                                              GimpStrokeOptions *stroke_options,
+                                              gboolean           push_undo,
+                                              GimpProgress      *progress,
+                                              GError           **error);
+static void       gimp_channel_to_selection  (GimpItem          *item,
+                                              GimpChannelOps     op,
+                                              gboolean           antialias,
+                                              gboolean           feather,
+                                              gdouble            feather_radius_x,
+                                              gdouble            feather_radius_y);
+
+static void       gimp_channel_convert_type  (GimpDrawable      *drawable,
+                                              GimpImage         *dest_image,
+                                              const Babl        *new_format,
+                                              GimpColorProfile  *dest_profile,
+                                              GeglDitherMethod   layer_dither_type,
+                                              GeglDitherMethod   mask_dither_type,
+                                              gboolean           push_undo,
+                                              GimpProgress      *progress);
+static void gimp_channel_invalidate_boundary   (GimpDrawable       *drawable);
+static void gimp_channel_get_active_components (GimpDrawable       *drawable,
+                                                gboolean           *active);
+
+static void      gimp_channel_set_buffer     (GimpDrawable        *drawable,
+                                              gboolean             push_undo,
+                                              const gchar         *undo_desc,
+                                              GeglBuffer          *buffer,
+                                              const GeglRectangle *bounds);
+
+static gdouble   gimp_channel_get_opacity_at (GimpPickable        *pickable,
+                                              gint                 x,
+                                              gint                 y);
+
+static gboolean   gimp_channel_real_boundary (GimpChannel         *channel,
+                                              const GimpBoundSeg **segs_in,
+                                              const GimpBoundSeg **segs_out,
+                                              gint                *num_segs_in,
+                                              gint                *num_segs_out,
+                                              gint                 x1,
+                                              gint                 y1,
+                                              gint                 x2,
+                                              gint                 y2);
+static gboolean   gimp_channel_real_is_empty (GimpChannel         *channel);
+static void       gimp_channel_real_feather  (GimpChannel         *channel,
+                                              gdouble              radius_x,
+                                              gdouble              radius_y,
+                                              gboolean             edge_lock,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_sharpen  (GimpChannel         *channel,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_clear    (GimpChannel         *channel,
+                                              const gchar         *undo_desc,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_all      (GimpChannel         *channel,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_invert   (GimpChannel         *channel,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_border   (GimpChannel         *channel,
+                                              gint                 radius_x,
+                                              gint                 radius_y,
+                                              GimpChannelBorderStyle style,
+                                              gboolean             edge_lock,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_grow     (GimpChannel         *channel,
+                                              gint                 radius_x,
+                                              gint                 radius_y,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_shrink   (GimpChannel         *channel,
+                                              gint                 radius_x,
+                                              gint                 radius_y,
+                                              gboolean             edge_lock,
+                                              gboolean             push_undo);
+static void       gimp_channel_real_flood    (GimpChannel         *channel,
+                                              gboolean             push_undo);
+
+
+static void      gimp_channel_buffer_changed (GeglBuffer          *buffer,
+                                              const GeglRectangle *rect,
+                                              GimpChannel         *channel);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpChannel, gimp_channel, GIMP_TYPE_DRAWABLE,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_channel_pickable_iface_init))
+
+#define parent_class gimp_channel_parent_class
+
+static guint channel_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_channel_class_init (GimpChannelClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpFilterClass   *filter_class      = GIMP_FILTER_CLASS (klass);
+  GimpItemClass     *item_class        = GIMP_ITEM_CLASS (klass);
+  GimpDrawableClass *drawable_class    = GIMP_DRAWABLE_CLASS (klass);
+
+  channel_signals[COLOR_CHANGED] =
+    g_signal_new ("color-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpChannelClass, color_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize            = gimp_channel_finalize;
+
+  gimp_object_class->get_memsize    = gimp_channel_get_memsize;
+
+  viewable_class->get_description   = gimp_channel_get_description;
+  viewable_class->default_icon_name = "gimp-channel";
+
+  filter_class->get_node            = gimp_channel_get_node;
+
+  item_class->is_attached          = gimp_channel_is_attached;
+  item_class->get_tree             = gimp_channel_get_tree;
+  item_class->bounds               = gimp_channel_bounds;
+  item_class->duplicate            = gimp_channel_duplicate;
+  item_class->convert              = gimp_channel_convert;
+  item_class->translate            = gimp_channel_translate;
+  item_class->scale                = gimp_channel_scale;
+  item_class->resize               = gimp_channel_resize;
+  item_class->get_clip             = gimp_channel_get_clip;
+  item_class->fill                 = gimp_channel_fill;
+  item_class->stroke               = gimp_channel_stroke;
+  item_class->to_selection         = gimp_channel_to_selection;
+  item_class->default_name         = _("Channel");
+  item_class->rename_desc          = C_("undo-type", "Rename Channel");
+  item_class->translate_desc       = C_("undo-type", "Move Channel");
+  item_class->scale_desc           = C_("undo-type", "Scale Channel");
+  item_class->resize_desc          = C_("undo-type", "Resize Channel");
+  item_class->flip_desc            = C_("undo-type", "Flip Channel");
+  item_class->rotate_desc          = C_("undo-type", "Rotate Channel");
+  item_class->transform_desc       = C_("undo-type", "Transform Channel");
+  item_class->fill_desc            = C_("undo-type", "Fill Channel");
+  item_class->stroke_desc          = C_("undo-type", "Stroke Channel");
+  item_class->to_selection_desc    = C_("undo-type", "Channel to Selection");
+  item_class->reorder_desc         = C_("undo-type", "Reorder Channel");
+  item_class->raise_desc           = C_("undo-type", "Raise Channel");
+  item_class->raise_to_top_desc    = C_("undo-type", "Raise Channel to Top");
+  item_class->lower_desc           = C_("undo-type", "Lower Channel");
+  item_class->lower_to_bottom_desc = C_("undo-type", "Lower Channel to Bottom");
+  item_class->raise_failed         = _("Channel cannot be raised higher.");
+  item_class->lower_failed         = _("Channel cannot be lowered more.");
+
+  drawable_class->convert_type          = gimp_channel_convert_type;
+  drawable_class->invalidate_boundary   = gimp_channel_invalidate_boundary;
+  drawable_class->get_active_components = gimp_channel_get_active_components;
+  drawable_class->set_buffer            = gimp_channel_set_buffer;
+
+  klass->boundary       = gimp_channel_real_boundary;
+  klass->is_empty       = gimp_channel_real_is_empty;
+  klass->feather        = gimp_channel_real_feather;
+  klass->sharpen        = gimp_channel_real_sharpen;
+  klass->clear          = gimp_channel_real_clear;
+  klass->all            = gimp_channel_real_all;
+  klass->invert         = gimp_channel_real_invert;
+  klass->border         = gimp_channel_real_border;
+  klass->grow           = gimp_channel_real_grow;
+  klass->shrink         = gimp_channel_real_shrink;
+  klass->flood          = gimp_channel_real_flood;
+
+  klass->feather_desc   = C_("undo-type", "Feather Channel");
+  klass->sharpen_desc   = C_("undo-type", "Sharpen Channel");
+  klass->clear_desc     = C_("undo-type", "Clear Channel");
+  klass->all_desc       = C_("undo-type", "Fill Channel");
+  klass->invert_desc    = C_("undo-type", "Invert Channel");
+  klass->border_desc    = C_("undo-type", "Border Channel");
+  klass->grow_desc      = C_("undo-type", "Grow Channel");
+  klass->shrink_desc    = C_("undo-type", "Shrink Channel");
+  klass->flood_desc     = C_("undo-type", "Flood Channel");
+}
+
+static void
+gimp_channel_init (GimpChannel *channel)
+{
+  gimp_rgba_set (&channel->color, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+
+  channel->show_masked    = FALSE;
+
+  /*  Selection mask variables  */
+  channel->boundary_known = FALSE;
+  channel->segs_in        = NULL;
+  channel->segs_out       = NULL;
+  channel->num_segs_in    = 0;
+  channel->num_segs_out   = 0;
+  channel->empty          = FALSE;
+  channel->bounds_known   = FALSE;
+  channel->x1             = 0;
+  channel->y1             = 0;
+  channel->x2             = 0;
+  channel->y2             = 0;
+}
+
+static void
+gimp_channel_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->get_opacity_at = gimp_channel_get_opacity_at;
+}
+
+static void
+gimp_channel_finalize (GObject *object)
+{
+  GimpChannel *channel = GIMP_CHANNEL (object);
+
+  g_clear_pointer (&channel->segs_in,  g_free);
+  g_clear_pointer (&channel->segs_out, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_channel_get_memsize (GimpObject *object,
+                          gint64     *gui_size)
+{
+  GimpChannel *channel = GIMP_CHANNEL (object);
+
+  *gui_size += channel->num_segs_in  * sizeof (GimpBoundSeg);
+  *gui_size += channel->num_segs_out * sizeof (GimpBoundSeg);
+
+  return GIMP_OBJECT_CLASS (parent_class)->get_memsize (object, gui_size);
+}
+
+static gchar *
+gimp_channel_get_description (GimpViewable  *viewable,
+                              gchar        **tooltip)
+{
+  if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
+                gimp_object_get_name (viewable)))
+    {
+      return g_strdup (_("Quick Mask"));
+    }
+
+  return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable,
+                                                              tooltip);
+}
+
+static GeglNode *
+gimp_channel_get_node (GimpFilter *filter)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (filter);
+  GimpChannel  *channel  = GIMP_CHANNEL (filter);
+  GeglNode     *node;
+  GeglNode     *source;
+  GeglNode     *mode_node;
+  const Babl   *color_format;
+
+  node = GIMP_FILTER_CLASS (parent_class)->get_node (filter);
+
+  source = gimp_drawable_get_source_node (drawable);
+  gegl_node_add_child (node, source);
+
+  g_warn_if_fail (channel->color_node == NULL);
+
+  if (gimp_drawable_get_linear (drawable))
+    color_format = babl_format ("RGBA float");
+  else
+    color_format = babl_format ("R'G'B'A float");
+
+  channel->color_node = gegl_node_new_child (node,
+                                             "operation", "gegl:color",
+                                             "format",    color_format,
+                                             NULL);
+  gimp_gegl_node_set_color (channel->color_node,
+                            &channel->color);
+
+  g_warn_if_fail (channel->mask_node == NULL);
+
+  channel->mask_node = gegl_node_new_child (node,
+                                            "operation", "gegl:opacity",
+                                            NULL);
+  gegl_node_connect_to (channel->color_node, "output",
+                        channel->mask_node,  "input");
+
+  g_warn_if_fail (channel->invert_node == NULL);
+
+  channel->invert_node = gegl_node_new_child (node,
+                                              "operation", "gegl:invert-linear",
+                                              NULL);
+
+  if (channel->show_masked)
+    {
+      gegl_node_connect_to (source,               "output",
+                            channel->invert_node, "input");
+      gegl_node_connect_to (channel->invert_node, "output",
+                            channel->mask_node,   "aux");
+    }
+  else
+    {
+      gegl_node_connect_to (source,             "output",
+                            channel->mask_node, "aux");
+    }
+
+  mode_node = gimp_drawable_get_mode_node (drawable);
+
+  gegl_node_connect_to (channel->mask_node, "output",
+                        mode_node,          "aux");
+
+  return node;
+}
+
+static gboolean
+gimp_channel_is_attached (GimpItem *item)
+{
+  GimpImage *image = gimp_item_get_image (item);
+
+  return (GIMP_IS_IMAGE (image) &&
+          gimp_container_have (gimp_image_get_channels (image),
+                               GIMP_OBJECT (item)));
+}
+
+static GimpItemTree *
+gimp_channel_get_tree (GimpItem *item)
+{
+  if (gimp_item_is_attached (item))
+    {
+      GimpImage *image = gimp_item_get_image (item);
+
+      return gimp_image_get_channel_tree (image);
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_channel_bounds (GimpItem *item,
+                     gdouble  *x,
+                     gdouble  *y,
+                     gdouble  *width,
+                     gdouble  *height)
+{
+  GimpChannel *channel = GIMP_CHANNEL (item);
+
+  if (! channel->bounds_known)
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+
+      channel->empty = ! gimp_gegl_mask_bounds (buffer,
+                                                &channel->x1,
+                                                &channel->y1,
+                                                &channel->x2,
+                                                &channel->y2);
+
+      channel->bounds_known = TRUE;
+    }
+
+  *x      = channel->x1;
+  *y      = channel->y1;
+  *width  = channel->x2 - channel->x1;
+  *height = channel->y2 - channel->y1;
+
+  return ! channel->empty;
+}
+
+static GimpItem *
+gimp_channel_duplicate (GimpItem *item,
+                        GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  if (GIMP_IS_CHANNEL (new_item))
+    {
+      GimpChannel *channel     = GIMP_CHANNEL (item);
+      GimpChannel *new_channel = GIMP_CHANNEL (new_item);
+
+      new_channel->color        = channel->color;
+      new_channel->show_masked  = channel->show_masked;
+
+      /*  selection mask variables  */
+      new_channel->bounds_known = channel->bounds_known;
+      new_channel->empty        = channel->empty;
+      new_channel->x1           = channel->x1;
+      new_channel->y1           = channel->y1;
+      new_channel->x2           = channel->x2;
+      new_channel->y2           = channel->y2;
+
+      if (new_type == GIMP_TYPE_CHANNEL)
+        {
+          /*  8-bit channel hack: make sure pixels between all sorts
+           *  of channels of an image is always copied without any
+           *  gamma conversion
+           */
+          GimpDrawable *new_drawable = GIMP_DRAWABLE (new_item);
+          GimpImage    *image        = gimp_item_get_image (item);
+          const Babl   *format       = gimp_image_get_channel_format (image);
+
+          if (format != gimp_drawable_get_format (new_drawable))
+            {
+              GeglBuffer *new_buffer;
+
+              new_buffer =
+                gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                 gimp_item_get_width  (new_item),
+                                                 gimp_item_get_height (new_item)),
+                                 format);
+
+              gegl_buffer_set_format (new_buffer,
+                                      gimp_drawable_get_format (new_drawable));
+              gimp_gegl_buffer_copy (gimp_drawable_get_buffer (new_drawable),
+                                     NULL, GEGL_ABYSS_NONE,
+                                     new_buffer, NULL);
+              gegl_buffer_set_format (new_buffer, NULL);
+
+              gimp_drawable_set_buffer (new_drawable, FALSE, NULL, new_buffer);
+              g_object_unref (new_buffer);
+            }
+        }
+    }
+
+  return new_item;
+}
+
+static void
+gimp_channel_convert (GimpItem  *item,
+                      GimpImage *dest_image,
+                      GType      old_type)
+{
+  GimpChannel  *channel  = GIMP_CHANNEL (item);
+  GimpDrawable *drawable = GIMP_DRAWABLE (item);
+
+  if (! gimp_drawable_is_gray (drawable))
+    {
+      gimp_drawable_convert_type (drawable, dest_image,
+                                  GIMP_GRAY,
+                                  gimp_image_get_precision (dest_image),
+                                  gimp_drawable_has_alpha (drawable),
+                                  NULL,
+                                  GEGL_DITHER_NONE, GEGL_DITHER_NONE,
+                                  FALSE, NULL);
+    }
+
+  if (gimp_drawable_has_alpha (drawable))
+    {
+      GeglBuffer *new_buffer;
+      const Babl *format;
+      GimpRGB     background;
+
+      format = gimp_drawable_get_format_without_alpha (drawable);
+
+      new_buffer =
+        gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                         gimp_item_get_width (item),
+                                         gimp_item_get_height (item)),
+                         format);
+
+      gimp_rgba_set (&background, 0.0, 0.0, 0.0, 0.0);
+
+      gimp_gegl_apply_flatten (gimp_drawable_get_buffer (drawable),
+                               NULL, NULL,
+                               new_buffer, &background,
+                               GIMP_LAYER_COLOR_SPACE_RGB_LINEAR);
+
+      gimp_drawable_set_buffer_full (drawable, FALSE, NULL,
+                                     new_buffer,
+                                     GEGL_RECTANGLE (
+                                       gimp_item_get_offset_x (item),
+                                       gimp_item_get_offset_y (item),
+                                       0, 0),
+                                     TRUE);
+      g_object_unref (new_buffer);
+    }
+
+  if (G_TYPE_FROM_INSTANCE (channel) == GIMP_TYPE_CHANNEL)
+    {
+      gint width  = gimp_image_get_width  (dest_image);
+      gint height = gimp_image_get_height (dest_image);
+
+      gimp_item_set_offset (item, 0, 0);
+
+      if (gimp_item_get_width  (item) != width ||
+          gimp_item_get_height (item) != height)
+        {
+          gimp_item_resize (item, gimp_get_user_context (dest_image->gimp),
+                            GIMP_FILL_TRANSPARENT,
+                            width, height, 0, 0);
+        }
+    }
+
+  GIMP_ITEM_CLASS (parent_class)->convert (item, dest_image, old_type);
+}
+
+static void
+gimp_channel_translate (GimpItem *item,
+                        gdouble   off_x,
+                        gdouble   off_y,
+                        gboolean  push_undo)
+{
+  GimpChannel *channel = GIMP_CHANNEL (item);
+  gint         x, y, width, height;
+
+  gimp_item_bounds (GIMP_ITEM (channel), &x, &y, &width, &height);
+
+  /*  update the old area  */
+  gimp_drawable_update (GIMP_DRAWABLE (item), x, y, width, height);
+
+  if (push_undo)
+    gimp_channel_push_undo (channel, NULL);
+
+  if (gimp_rectangle_intersect (x + SIGNED_ROUND (off_x),
+                                y + SIGNED_ROUND (off_y),
+                                width, height,
+                                0, 0,
+                                gimp_item_get_width  (GIMP_ITEM (channel)),
+                                gimp_item_get_height (GIMP_ITEM (channel)),
+                                &x, &y, &width, &height))
+    {
+      /*  copy the portion of the mask we will keep to a temporary
+       *  buffer
+       */
+      GeglBuffer *tmp_buffer =
+        gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
+                         gimp_drawable_get_format (GIMP_DRAWABLE (channel)));
+
+      gimp_gegl_buffer_copy (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                             GEGL_RECTANGLE (x - SIGNED_ROUND (off_x),
+                                             y - SIGNED_ROUND (off_y),
+                                             width, height),
+                             GEGL_ABYSS_NONE,
+                             tmp_buffer,
+                             GEGL_RECTANGLE (0, 0, 0, 0));
+
+      /*  clear the mask  */
+      gegl_buffer_clear (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                         NULL);
+
+      /*  copy the temp mask back to the mask  */
+      gimp_gegl_buffer_copy (tmp_buffer, NULL, GEGL_ABYSS_NONE,
+                             gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                             GEGL_RECTANGLE (x, y, 0, 0));
+
+      /*  free the temporary mask  */
+      g_object_unref (tmp_buffer);
+
+      channel->x1 = x;
+      channel->y1 = y;
+      channel->x2 = x + width;
+      channel->y2 = y + height;
+    }
+  else
+    {
+      /*  clear the mask  */
+      gegl_buffer_clear (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                         NULL);
+
+      channel->empty = TRUE;
+      channel->x1    = 0;
+      channel->y1    = 0;
+      channel->x2    = gimp_item_get_width  (GIMP_ITEM (channel));
+      channel->y2    = gimp_item_get_height (GIMP_ITEM (channel));
+    }
+
+  /*  update the new area  */
+  gimp_drawable_update (GIMP_DRAWABLE (item),
+                        channel->x1, channel->y1,
+                        channel->x2 - channel->x1,
+                        channel->y2 - channel->y1);
+}
+
+static void
+gimp_channel_scale (GimpItem              *item,
+                    gint                   new_width,
+                    gint                   new_height,
+                    gint                   new_offset_x,
+                    gint                   new_offset_y,
+                    GimpInterpolationType  interpolation_type,
+                    GimpProgress          *progress)
+{
+  GimpChannel *channel = GIMP_CHANNEL (item);
+
+  if (G_TYPE_FROM_INSTANCE (item) == GIMP_TYPE_CHANNEL)
+    {
+      new_offset_x = 0;
+      new_offset_y = 0;
+    }
+
+  /*  don't waste CPU cycles scaling an empty channel  */
+  if (channel->bounds_known && channel->empty)
+    {
+      GimpDrawable *drawable = GIMP_DRAWABLE (item);
+      GeglBuffer   *new_buffer;
+
+      new_buffer =
+        gegl_buffer_new (GEGL_RECTANGLE (0, 0, new_width, new_height),
+                         gimp_drawable_get_format (drawable));
+
+      gimp_drawable_set_buffer_full (drawable,
+                                     gimp_item_is_attached (item), NULL,
+                                     new_buffer,
+                                     GEGL_RECTANGLE (new_offset_x, new_offset_y,
+                                                     0,            0),
+                                     TRUE);
+      g_object_unref (new_buffer);
+
+      gimp_channel_clear (GIMP_CHANNEL (item), NULL, FALSE);
+    }
+  else
+    {
+      GIMP_ITEM_CLASS (parent_class)->scale (item, new_width, new_height,
+                                             new_offset_x, new_offset_y,
+                                             interpolation_type, progress);
+    }
+}
+
+static void
+gimp_channel_resize (GimpItem     *item,
+                     GimpContext  *context,
+                     GimpFillType  fill_type,
+                     gint          new_width,
+                     gint          new_height,
+                     gint          offset_x,
+                     gint          offset_y)
+{
+  GIMP_ITEM_CLASS (parent_class)->resize (item, context, GIMP_FILL_TRANSPARENT,
+                                          new_width, new_height,
+                                          offset_x, offset_y);
+
+  if (G_TYPE_FROM_INSTANCE (item) == GIMP_TYPE_CHANNEL)
+    {
+      gimp_item_set_offset (item, 0, 0);
+    }
+}
+
+static GimpTransformResize
+gimp_channel_get_clip (GimpItem            *item,
+                       GimpTransformResize  clip_result)
+{
+  return GIMP_TRANSFORM_RESIZE_CLIP;
+}
+
+static gboolean
+gimp_channel_fill (GimpItem         *item,
+                   GimpDrawable     *drawable,
+                   GimpFillOptions  *fill_options,
+                   gboolean          push_undo,
+                   GimpProgress     *progress,
+                   GError          **error)
+{
+  GimpChannel        *channel = GIMP_CHANNEL (item);
+  const GimpBoundSeg *segs_in;
+  const GimpBoundSeg *segs_out;
+  gint                n_segs_in;
+  gint                n_segs_out;
+  gint                offset_x, offset_y;
+
+  if (! gimp_channel_boundary (channel, &segs_in, &segs_out,
+                               &n_segs_in, &n_segs_out,
+                               0, 0, 0, 0))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot fill empty channel."));
+      return FALSE;
+    }
+
+  gimp_item_get_offset (item, &offset_x, &offset_y);
+
+  gimp_drawable_fill_boundary (drawable,
+                               fill_options,
+                               segs_in, n_segs_in,
+                               offset_x, offset_y,
+                               push_undo);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_channel_stroke (GimpItem           *item,
+                     GimpDrawable       *drawable,
+                     GimpStrokeOptions  *stroke_options,
+                     gboolean            push_undo,
+                     GimpProgress       *progress,
+                     GError            **error)
+{
+  GimpChannel        *channel = GIMP_CHANNEL (item);
+  const GimpBoundSeg *segs_in;
+  const GimpBoundSeg *segs_out;
+  gint                n_segs_in;
+  gint                n_segs_out;
+  gboolean            retval = FALSE;
+  gint                offset_x, offset_y;
+
+  if (! gimp_channel_boundary (channel, &segs_in, &segs_out,
+                               &n_segs_in, &n_segs_out,
+                               0, 0, 0, 0))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot stroke empty channel."));
+      return FALSE;
+    }
+
+  gimp_item_get_offset (item, &offset_x, &offset_y);
+
+  switch (gimp_stroke_options_get_method (stroke_options))
+    {
+    case GIMP_STROKE_LINE:
+      gimp_drawable_stroke_boundary (drawable,
+                                     stroke_options,
+                                     segs_in, n_segs_in,
+                                     offset_x, offset_y,
+                                     push_undo);
+      retval = TRUE;
+      break;
+
+    case GIMP_STROKE_PAINT_METHOD:
+      {
+        GimpPaintInfo    *paint_info;
+        GimpPaintCore    *core;
+        GimpPaintOptions *paint_options;
+        gboolean          emulate_dynamics;
+
+        paint_info = gimp_context_get_paint_info (GIMP_CONTEXT (stroke_options));
+
+        core = g_object_new (paint_info->paint_type, NULL);
+
+        paint_options = gimp_stroke_options_get_paint_options (stroke_options);
+        emulate_dynamics = gimp_stroke_options_get_emulate_dynamics (stroke_options);
+
+        retval = gimp_paint_core_stroke_boundary (core, drawable,
+                                                  paint_options,
+                                                  emulate_dynamics,
+                                                  segs_in, n_segs_in,
+                                                  offset_x, offset_y,
+                                                  push_undo, error);
+
+        g_object_unref (core);
+      }
+      break;
+
+    default:
+      g_return_val_if_reached (FALSE);
+    }
+
+  return retval;
+}
+
+static void
+gimp_channel_to_selection (GimpItem       *item,
+                           GimpChannelOps  op,
+                           gboolean        antialias,
+                           gboolean        feather,
+                           gdouble         feather_radius_x,
+                           gdouble         feather_radius_y)
+{
+  GimpChannel *channel = GIMP_CHANNEL (item);
+  GimpImage   *image   = gimp_item_get_image (item);
+  gint         off_x, off_y;
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  gimp_channel_select_channel (gimp_image_get_mask (image),
+                               GIMP_ITEM_GET_CLASS (item)->to_selection_desc,
+                               channel, off_x, off_y,
+                               op,
+                               feather, feather_radius_x, feather_radius_x);
+}
+
+static void
+gimp_channel_convert_type (GimpDrawable     *drawable,
+                           GimpImage        *dest_image,
+                           const Babl       *new_format,
+                           GimpColorProfile *dest_profile,
+                           GeglDitherMethod  layer_dither_type,
+                           GeglDitherMethod  mask_dither_type,
+                           gboolean          push_undo,
+                           GimpProgress     *progress)
+{
+  GeglBuffer *dest_buffer;
+
+  dest_buffer =
+    gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                     gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                     gimp_item_get_height (GIMP_ITEM (drawable))),
+                     new_format);
+
+  if (mask_dither_type == GEGL_DITHER_NONE)
+    {
+      gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                             GEGL_ABYSS_NONE,
+                             dest_buffer, NULL);
+    }
+  else
+    {
+      gint bits;
+
+      bits = (babl_format_get_bytes_per_pixel (new_format) * 8 /
+              babl_format_get_n_components (new_format));
+
+      gimp_gegl_apply_dither (gimp_drawable_get_buffer (drawable),
+                              NULL, NULL,
+                              dest_buffer, 1 << bits, mask_dither_type);
+    }
+
+  gimp_drawable_set_buffer (drawable, push_undo, NULL, dest_buffer);
+  g_object_unref (dest_buffer);
+}
+
+static void
+gimp_channel_invalidate_boundary (GimpDrawable *drawable)
+{
+  GimpChannel *channel = GIMP_CHANNEL (drawable);
+
+  channel->boundary_known = FALSE;
+  channel->bounds_known   = FALSE;
+}
+
+static void
+gimp_channel_get_active_components (GimpDrawable *drawable,
+                                    gboolean     *active)
+{
+  /*  Make sure that the alpha channel is not valid.  */
+  active[GRAY]    = TRUE;
+  active[ALPHA_G] = FALSE;
+}
+
+static void
+gimp_channel_set_buffer (GimpDrawable        *drawable,
+                         gboolean             push_undo,
+                         const gchar         *undo_desc,
+                         GeglBuffer          *buffer,
+                         const GeglRectangle *bounds)
+{
+  GimpChannel *channel    = GIMP_CHANNEL (drawable);
+  GeglBuffer  *old_buffer = gimp_drawable_get_buffer (drawable);
+
+  if (old_buffer)
+    {
+      g_signal_handlers_disconnect_by_func (old_buffer,
+                                            gimp_channel_buffer_changed,
+                                            channel);
+    }
+
+  GIMP_DRAWABLE_CLASS (parent_class)->set_buffer (drawable,
+                                                  push_undo, undo_desc,
+                                                  buffer, bounds);
+
+  gegl_buffer_signal_connect (buffer, "changed",
+                              G_CALLBACK (gimp_channel_buffer_changed),
+                              channel);
+
+  if (gimp_filter_peek_node (GIMP_FILTER (channel)))
+    {
+      const Babl *color_format;
+
+      if (gimp_drawable_get_linear (drawable))
+        color_format = babl_format ("RGBA float");
+      else
+        color_format = babl_format ("R'G'B'A float");
+
+      gegl_node_set (channel->color_node,
+                     "format", color_format,
+                     NULL);
+    }
+}
+
+static gdouble
+gimp_channel_get_opacity_at (GimpPickable *pickable,
+                             gint          x,
+                             gint          y)
+{
+  GimpChannel *channel = GIMP_CHANNEL (pickable);
+  gdouble      value   = GIMP_OPACITY_TRANSPARENT;
+
+  if (x >= 0 && x < gimp_item_get_width  (GIMP_ITEM (channel)) &&
+      y >= 0 && y < gimp_item_get_height (GIMP_ITEM (channel)))
+    {
+      if (! channel->bounds_known ||
+          (! channel->empty &&
+           x >= channel->x1 &&
+           x <  channel->x2 &&
+           y >= channel->y1 &&
+           y <  channel->y2))
+        {
+          gegl_buffer_sample (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                              x, y, NULL, &value, babl_format ("Y double"),
+                              GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+        }
+    }
+
+  return value;
+}
+
+static gboolean
+gimp_channel_real_boundary (GimpChannel         *channel,
+                            const GimpBoundSeg **segs_in,
+                            const GimpBoundSeg **segs_out,
+                            gint                *num_segs_in,
+                            gint                *num_segs_out,
+                            gint                 x1,
+                            gint                 y1,
+                            gint                 x2,
+                            gint                 y2)
+{
+  if (! channel->boundary_known)
+    {
+      gint x3, y3, x4, y4;
+
+      /* free the out of date boundary segments */
+      g_free (channel->segs_in);
+      g_free (channel->segs_out);
+
+      if (gimp_item_bounds (GIMP_ITEM (channel), &x3, &y3, &x4, &y4))
+        {
+          GeglBuffer    *buffer;
+          GeglRectangle  rect = { x3, y3, x4, y4 };
+
+          x4 += x3;
+          y4 += y3;
+
+          buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+
+          channel->segs_out = gimp_boundary_find (buffer, &rect,
+                                                  babl_format ("Y float"),
+                                                  GIMP_BOUNDARY_IGNORE_BOUNDS,
+                                                  x1, y1, x2, y2,
+                                                  GIMP_BOUNDARY_HALF_WAY,
+                                                  &channel->num_segs_out);
+          x1 = MAX (x1, x3);
+          y1 = MAX (y1, y3);
+          x2 = MIN (x2, x4);
+          y2 = MIN (y2, y4);
+
+          if (x2 > x1 && y2 > y1)
+            {
+              channel->segs_in = gimp_boundary_find (buffer, NULL,
+                                                     babl_format ("Y float"),
+                                                     GIMP_BOUNDARY_WITHIN_BOUNDS,
+                                                     x1, y1, x2, y2,
+                                                     GIMP_BOUNDARY_HALF_WAY,
+                                                     &channel->num_segs_in);
+            }
+          else
+            {
+              channel->segs_in     = NULL;
+              channel->num_segs_in = 0;
+            }
+        }
+      else
+        {
+          channel->segs_in      = NULL;
+          channel->segs_out     = NULL;
+          channel->num_segs_in  = 0;
+          channel->num_segs_out = 0;
+        }
+
+      channel->boundary_known = TRUE;
+    }
+
+  *segs_in      = channel->segs_in;
+  *segs_out     = channel->segs_out;
+  *num_segs_in  = channel->num_segs_in;
+  *num_segs_out = channel->num_segs_out;
+
+  return (! channel->empty);
+}
+
+static gboolean
+gimp_channel_real_is_empty (GimpChannel *channel)
+{
+  GeglBuffer *buffer;
+
+  if (channel->bounds_known)
+    return channel->empty;
+
+  buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+
+  if (! gimp_gegl_mask_is_empty (buffer))
+    return FALSE;
+
+  /*  The mask is empty, meaning we can set the bounds as known  */
+  g_clear_pointer (&channel->segs_in,  g_free);
+  g_clear_pointer (&channel->segs_out, g_free);
+
+  channel->empty          = TRUE;
+  channel->num_segs_in    = 0;
+  channel->num_segs_out   = 0;
+  channel->bounds_known   = TRUE;
+  channel->boundary_known = TRUE;
+  channel->x1             = 0;
+  channel->y1             = 0;
+  channel->x2             = gimp_item_get_width  (GIMP_ITEM (channel));
+  channel->y2             = gimp_item_get_height (GIMP_ITEM (channel));
+
+  return TRUE;
+}
+
+static void
+gimp_channel_real_feather (GimpChannel *channel,
+                           gdouble      radius_x,
+                           gdouble      radius_y,
+                           gboolean     edge_lock,
+                           gboolean     push_undo)
+{
+  gint x1, y1, x2, y2;
+
+  if (radius_x <= 0.0 && radius_y <= 0.0)
+    return;
+
+  if (! gimp_item_bounds (GIMP_ITEM (channel), &x1, &y1, &x2, &y2))
+    return;
+
+  x2 += x1;
+  y2 += y1;
+
+  if (gimp_channel_is_empty (channel))
+    return;
+
+  x1 = MAX (0, x1 - ceil (radius_x));
+  y1 = MAX (0, y1 - ceil (radius_y));
+
+  x2 = MIN (gimp_item_get_width  (GIMP_ITEM (channel)), x2 + ceil (radius_x));
+  y2 = MIN (gimp_item_get_height (GIMP_ITEM (channel)), y2 + ceil (radius_y));
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->feather_desc);
+
+  gimp_gegl_apply_feather (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                           NULL, NULL,
+                           gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                           GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1),
+                           radius_x,
+                           radius_y,
+                           edge_lock);
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+}
+
+static void
+gimp_channel_real_sharpen (GimpChannel *channel,
+                           gboolean     push_undo)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (channel);
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->sharpen_desc);
+
+  gimp_gegl_apply_threshold (gimp_drawable_get_buffer (drawable),
+                             NULL, NULL,
+                             gimp_drawable_get_buffer (drawable),
+                             0.5);
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+}
+
+static void
+gimp_channel_real_clear (GimpChannel *channel,
+                         const gchar *undo_desc,
+                         gboolean     push_undo)
+{
+  GeglBuffer    *buffer;
+  GeglRectangle  rect;
+  GeglRectangle  aligned_rect;
+
+  if (channel->bounds_known && channel->empty)
+    return;
+
+  if (push_undo)
+    {
+      if (! undo_desc)
+        undo_desc = GIMP_CHANNEL_GET_CLASS (channel)->clear_desc;
+
+      gimp_channel_push_undo (channel, undo_desc);
+    }
+
+  buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+
+  if (channel->bounds_known)
+    {
+      rect.x      = channel->x1;
+      rect.y      = channel->y1;
+      rect.width  = channel->x2 - channel->x1;
+      rect.height = channel->y2 - channel->y1;
+    }
+  else
+    {
+      rect.x      = 0;
+      rect.y      = 0;
+      rect.width  = gimp_item_get_width  (GIMP_ITEM (channel));
+      rect.height = gimp_item_get_height (GIMP_ITEM (channel));
+    }
+
+  gegl_rectangle_align_to_buffer (&aligned_rect, &rect, buffer,
+                                  GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+  gegl_buffer_clear (buffer, &aligned_rect);
+
+  /*  we know the bounds  */
+  channel->bounds_known = TRUE;
+  channel->empty        = TRUE;
+  channel->x1           = 0;
+  channel->y1           = 0;
+  channel->x2           = gimp_item_get_width  (GIMP_ITEM (channel));
+  channel->y2           = gimp_item_get_height (GIMP_ITEM (channel));
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel),
+                        rect.x, rect.y, rect.width, rect.height);
+}
+
+static void
+gimp_channel_real_all (GimpChannel *channel,
+                       gboolean     push_undo)
+{
+  GeglColor *color;
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->all_desc);
+
+  /*  clear the channel  */
+  color = gegl_color_new ("#fff");
+  gegl_buffer_set_color (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                         NULL, color);
+  g_object_unref (color);
+
+  /*  we know the bounds  */
+  channel->bounds_known = TRUE;
+  channel->empty        = FALSE;
+  channel->x1           = 0;
+  channel->y1           = 0;
+  channel->x2           = gimp_item_get_width  (GIMP_ITEM (channel));
+  channel->y2           = gimp_item_get_height (GIMP_ITEM (channel));
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+}
+
+static void
+gimp_channel_real_invert (GimpChannel *channel,
+                          gboolean     push_undo)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (channel);
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->invert_desc);
+
+  if (channel->bounds_known && channel->empty)
+    {
+      gimp_channel_all (channel, FALSE);
+    }
+  else
+    {
+      gimp_gegl_apply_invert_linear (gimp_drawable_get_buffer (drawable),
+                                     NULL, NULL,
+                                     gimp_drawable_get_buffer (drawable));
+
+      gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+    }
+}
+
+static void
+gimp_channel_real_border (GimpChannel            *channel,
+                          gint                    radius_x,
+                          gint                    radius_y,
+                          GimpChannelBorderStyle  style,
+                          gboolean                edge_lock,
+                          gboolean                push_undo)
+{
+  gint x1, y1, x2, y2;
+
+  if (radius_x == 0 && radius_y == 0)
+    {
+      /* The relevant GEGL operations require radius_x and radius_y to be > 0.
+       * When both are 0 (currently can only be achieved by the user through
+       * PDB), the effect should be to clear the channel.
+       */
+      gimp_channel_clear (channel,
+                          GIMP_CHANNEL_GET_CLASS (channel)->border_desc,
+                          push_undo);
+      return;
+    }
+  else if (radius_x <= 0 || radius_y <= 0)
+    {
+      /* FIXME: Implement the case where only one of radius_x and radius_y is 0.
+       * Currently, should never happen.
+       */
+      g_return_if_reached();
+    }
+
+  if (! gimp_item_bounds (GIMP_ITEM (channel), &x1, &y1, &x2, &y2))
+    return;
+
+  x2 += x1;
+  y2 += y1;
+
+  if (gimp_channel_is_empty (channel))
+    return;
+
+  if (x1 - radius_x < 0)
+    x1 = 0;
+  else
+    x1 -= radius_x;
+
+  if (x2 + radius_x > gimp_item_get_width (GIMP_ITEM (channel)))
+    x2 = gimp_item_get_width (GIMP_ITEM (channel));
+  else
+    x2 += radius_x;
+
+  if (y1 - radius_y < 0)
+    y1 = 0;
+  else
+    y1 -= radius_y;
+
+  if (y2 + radius_y > gimp_item_get_height (GIMP_ITEM (channel)))
+    y2 = gimp_item_get_height (GIMP_ITEM (channel));
+  else
+    y2 += radius_y;
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->border_desc);
+
+  gimp_gegl_apply_border (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                          NULL, NULL,
+                          gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                          GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1),
+                          radius_x, radius_y, style, edge_lock);
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+}
+
+static void
+gimp_channel_real_grow (GimpChannel *channel,
+                        gint         radius_x,
+                        gint         radius_y,
+                        gboolean     push_undo)
+{
+  gint x1, y1, x2, y2;
+
+  if (radius_x == 0 && radius_y == 0)
+    return;
+
+  if (radius_x <= 0 && radius_y <= 0)
+    {
+      gimp_channel_shrink (channel, -radius_x, -radius_y, FALSE, push_undo);
+      return;
+    }
+
+  if (radius_x < 0 || radius_y < 0)
+    return;
+
+  if (! gimp_item_bounds (GIMP_ITEM (channel), &x1, &y1, &x2, &y2))
+    return;
+
+  x2 += x1;
+  y2 += y1;
+
+  if (gimp_channel_is_empty (channel))
+    return;
+
+  if (x1 - radius_x > 0)
+    x1 = x1 - radius_x;
+  else
+    x1 = 0;
+
+  if (y1 - radius_y > 0)
+    y1 = y1 - radius_y;
+  else
+    y1 = 0;
+
+  if (x2 + radius_x < gimp_item_get_width (GIMP_ITEM (channel)))
+    x2 = x2 + radius_x;
+  else
+    x2 = gimp_item_get_width (GIMP_ITEM (channel));
+
+  if (y2 + radius_y < gimp_item_get_height (GIMP_ITEM (channel)))
+    y2 = y2 + radius_y;
+  else
+    y2 = gimp_item_get_height (GIMP_ITEM (channel));
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->grow_desc);
+
+  gimp_gegl_apply_grow (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                        NULL, NULL,
+                        gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                        GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1),
+                        radius_x, radius_y);
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+}
+
+static void
+gimp_channel_real_shrink (GimpChannel *channel,
+                          gint         radius_x,
+                          gint         radius_y,
+                          gboolean     edge_lock,
+                          gboolean     push_undo)
+{
+  gint x1, y1, x2, y2;
+
+  if (radius_x == 0 && radius_y == 0)
+    return;
+
+  if (radius_x <= 0 && radius_y <= 0)
+    {
+      gimp_channel_grow (channel, -radius_x, -radius_y, push_undo);
+      return;
+    }
+
+  if (radius_x < 0 || radius_y < 0)
+    return;
+
+  if (! gimp_item_bounds (GIMP_ITEM (channel), &x1, &y1, &x2, &y2))
+    return;
+
+  x2 += x1;
+  y2 += y1;
+
+  if (gimp_channel_is_empty (channel))
+    return;
+
+  if (x1 > 0)
+    x1--;
+  if (y1 > 0)
+    y1--;
+  if (x2 < gimp_item_get_width (GIMP_ITEM (channel)))
+    x2++;
+  if (y2 < gimp_item_get_height (GIMP_ITEM (channel)))
+    y2++;
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->shrink_desc);
+
+  gimp_gegl_apply_shrink (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                          NULL, NULL,
+                          gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                          GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1),
+                          radius_x, radius_y, edge_lock);
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+}
+
+static void
+gimp_channel_real_flood (GimpChannel *channel,
+                         gboolean     push_undo)
+{
+  gint x, y, width, height;
+
+  if (! gimp_item_bounds (GIMP_ITEM (channel), &x, &y, &width, &height))
+    return;
+
+  if (gimp_channel_is_empty (channel))
+    return;
+
+  if (push_undo)
+    gimp_channel_push_undo (channel,
+                            GIMP_CHANNEL_GET_CLASS (channel)->flood_desc);
+
+  gimp_gegl_apply_flood (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                         NULL, NULL,
+                         gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                         GEGL_RECTANGLE (x, y, width, height));
+
+  gimp_drawable_update (GIMP_DRAWABLE (channel), x, y, width, height);
+}
+
+static void
+gimp_channel_buffer_changed (GeglBuffer          *buffer,
+                             const GeglRectangle *rect,
+                             GimpChannel         *channel)
+{
+  gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (channel));
+}
+
+
+/*  public functions  */
+
+GimpChannel *
+gimp_channel_new (GimpImage     *image,
+                  gint           width,
+                  gint           height,
+                  const gchar   *name,
+                  const GimpRGB *color)
+{
+  GimpChannel *channel;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  channel =
+    GIMP_CHANNEL (gimp_drawable_new (GIMP_TYPE_CHANNEL,
+                                     image, name,
+                                     0, 0, width, height,
+                                     gimp_image_get_channel_format (image)));
+
+  if (color)
+    channel->color = *color;
+
+  channel->show_masked = TRUE;
+
+  /*  selection mask variables  */
+  channel->x2          = width;
+  channel->y2          = height;
+
+  return channel;
+}
+
+GimpChannel *
+gimp_channel_new_from_buffer (GimpImage     *image,
+                              GeglBuffer    *buffer,
+                              const gchar   *name,
+                              const GimpRGB *color)
+{
+  GimpChannel *channel;
+  GeglBuffer  *dest;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  channel = gimp_channel_new (image,
+                              gegl_buffer_get_width  (buffer),
+                              gegl_buffer_get_height (buffer),
+                              name, color);
+
+  dest = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+  gimp_gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE, dest, NULL);
+
+  return channel;
+}
+
+GimpChannel *
+gimp_channel_new_from_alpha (GimpImage     *image,
+                             GimpDrawable  *drawable,
+                             const gchar   *name,
+                             const GimpRGB *color)
+{
+  GimpChannel *channel;
+  GeglBuffer  *dest_buffer;
+  gint         width;
+  gint         height;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_drawable_has_alpha (drawable), NULL);
+
+  width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+  height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  channel = gimp_channel_new (image, width, height, name, color);
+
+  gimp_channel_clear (channel, NULL, FALSE);
+
+  dest_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+
+  gegl_buffer_set_format (dest_buffer,
+                          gimp_drawable_get_component_format (drawable,
+                                                              GIMP_CHANNEL_ALPHA));
+  gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                         GEGL_ABYSS_NONE,
+                         dest_buffer, NULL);
+  gegl_buffer_set_format (dest_buffer, NULL);
+
+  return channel;
+}
+
+GimpChannel *
+gimp_channel_new_from_component (GimpImage       *image,
+                                 GimpChannelType  type,
+                                 const gchar     *name,
+                                 const GimpRGB   *color)
+{
+  GimpChannel *channel;
+  GeglBuffer  *src_buffer;
+  GeglBuffer  *dest_buffer;
+  gint         width;
+  gint         height;
+  const Babl  *format;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  format = gimp_image_get_component_format (image, type);
+
+  g_return_val_if_fail (format != NULL, NULL);
+
+  gimp_pickable_flush (GIMP_PICKABLE (image));
+
+  src_buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (image));
+  width  = gegl_buffer_get_width  (src_buffer);
+  height = gegl_buffer_get_height (src_buffer);
+
+  channel = gimp_channel_new (image, width, height, name, color);
+
+  dest_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+
+  gegl_buffer_set_format (dest_buffer, format);
+  gimp_gegl_buffer_copy (src_buffer, NULL, GEGL_ABYSS_NONE, dest_buffer, NULL);
+  gegl_buffer_set_format (dest_buffer, NULL);
+
+  return channel;
+}
+
+GimpChannel *
+gimp_channel_get_parent (GimpChannel *channel)
+{
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), NULL);
+
+  return GIMP_CHANNEL (gimp_viewable_get_parent (GIMP_VIEWABLE (channel)));
+}
+
+void
+gimp_channel_set_color (GimpChannel   *channel,
+                        const GimpRGB *color,
+                        gboolean       push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (color != NULL);
+
+  if (gimp_rgba_distance (&channel->color, color) > RGBA_EPSILON)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (channel)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (channel));
+
+          gimp_image_undo_push_channel_color (image, C_("undo-type", "Set Channel Color"),
+                                              channel);
+        }
+
+      channel->color = *color;
+
+      if (gimp_filter_peek_node (GIMP_FILTER (channel)))
+        {
+          gimp_gegl_node_set_color (channel->color_node,
+                                    &channel->color);
+        }
+
+      gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+
+      g_signal_emit (channel, channel_signals[COLOR_CHANGED], 0);
+    }
+}
+
+void
+gimp_channel_get_color (GimpChannel *channel,
+                        GimpRGB     *color)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (color != NULL);
+
+  *color = channel->color;
+}
+
+gdouble
+gimp_channel_get_opacity (GimpChannel *channel)
+{
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), GIMP_OPACITY_TRANSPARENT);
+
+  return channel->color.a;
+}
+
+void
+gimp_channel_set_opacity (GimpChannel *channel,
+                          gdouble      opacity,
+                          gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  opacity = CLAMP (opacity, GIMP_OPACITY_TRANSPARENT, GIMP_OPACITY_OPAQUE);
+
+  if (channel->color.a != opacity)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (channel)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (channel));
+
+          gimp_image_undo_push_channel_color (image, C_("undo-type", "Set Channel Opacity"),
+                                              channel);
+        }
+
+      channel->color.a = opacity;
+
+      if (gimp_filter_peek_node (GIMP_FILTER (channel)))
+        {
+          gimp_gegl_node_set_color (channel->color_node,
+                                    &channel->color);
+        }
+
+      gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+
+      g_signal_emit (channel, channel_signals[COLOR_CHANGED], 0);
+    }
+}
+
+gboolean
+gimp_channel_get_show_masked (GimpChannel *channel)
+{
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), FALSE);
+
+  return channel->show_masked;
+}
+
+void
+gimp_channel_set_show_masked (GimpChannel *channel,
+                              gboolean     show_masked)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (show_masked != channel->show_masked)
+    {
+      channel->show_masked = show_masked ? TRUE : FALSE;
+
+      if (channel->invert_node)
+        {
+          GeglNode *source;
+
+          source = gimp_drawable_get_source_node (GIMP_DRAWABLE (channel));
+
+          if (channel->show_masked)
+            {
+              gegl_node_connect_to (source,               "output",
+                                    channel->invert_node, "input");
+              gegl_node_connect_to (channel->invert_node, "output",
+                                    channel->mask_node,   "aux");
+            }
+          else
+            {
+              gegl_node_disconnect (channel->invert_node, "input");
+
+              gegl_node_connect_to (source,             "output",
+                                    channel->mask_node, "aux");
+            }
+        }
+
+      gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0, -1, -1);
+    }
+}
+
+void
+gimp_channel_push_undo (GimpChannel *channel,
+                        const gchar *undo_desc)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+
+  gimp_image_undo_push_mask (gimp_item_get_image (GIMP_ITEM (channel)),
+                             undo_desc, channel);
+}
+
+
+/******************************/
+/*  selection mask functions  */
+/******************************/
+
+GimpChannel *
+gimp_channel_new_mask (GimpImage *image,
+                       gint       width,
+                       gint       height)
+{
+  GimpChannel *channel;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  channel =
+    GIMP_CHANNEL (gimp_drawable_new (GIMP_TYPE_CHANNEL,
+                                     image, _("Selection Mask"),
+                                     0, 0, width, height,
+                                     gimp_image_get_mask_format (image)));
+
+  channel->show_masked = TRUE;
+  channel->x2          = width;
+  channel->y2          = height;
+
+  gegl_buffer_clear (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                     NULL);
+
+  return channel;
+}
+
+gboolean
+gimp_channel_boundary (GimpChannel         *channel,
+                       const GimpBoundSeg **segs_in,
+                       const GimpBoundSeg **segs_out,
+                       gint                *num_segs_in,
+                       gint                *num_segs_out,
+                       gint                 x1,
+                       gint                 y1,
+                       gint                 x2,
+                       gint                 y2)
+{
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), FALSE);
+  g_return_val_if_fail (segs_in != NULL, FALSE);
+  g_return_val_if_fail (segs_out != NULL, FALSE);
+  g_return_val_if_fail (num_segs_in != NULL, FALSE);
+  g_return_val_if_fail (num_segs_out != NULL, FALSE);
+
+  return GIMP_CHANNEL_GET_CLASS (channel)->boundary (channel,
+                                                     segs_in, segs_out,
+                                                     num_segs_in, num_segs_out,
+                                                     x1, y1,
+                                                     x2, y2);
+}
+
+gboolean
+gimp_channel_is_empty (GimpChannel *channel)
+{
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), TRUE);
+
+  return GIMP_CHANNEL_GET_CLASS (channel)->is_empty (channel);
+}
+
+void
+gimp_channel_feather (GimpChannel *channel,
+                      gdouble      radius_x,
+                      gdouble      radius_y,
+                      gboolean     edge_lock,
+                      gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->feather (channel, radius_x, radius_y,
+                                             edge_lock, push_undo);
+}
+
+void
+gimp_channel_sharpen (GimpChannel *channel,
+                      gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->sharpen (channel, push_undo);
+}
+
+void
+gimp_channel_clear (GimpChannel *channel,
+                    const gchar *undo_desc,
+                    gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->clear (channel, undo_desc, push_undo);
+}
+
+void
+gimp_channel_all (GimpChannel *channel,
+                  gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->all (channel, push_undo);
+}
+
+void
+gimp_channel_invert (GimpChannel *channel,
+                     gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->invert (channel, push_undo);
+}
+
+void
+gimp_channel_border (GimpChannel            *channel,
+                     gint                    radius_x,
+                     gint                    radius_y,
+                     GimpChannelBorderStyle  style,
+                     gboolean                edge_lock,
+                     gboolean                push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->border (channel,
+                                            radius_x, radius_y, style, edge_lock,
+                                            push_undo);
+}
+
+void
+gimp_channel_grow (GimpChannel *channel,
+                   gint         radius_x,
+                   gint         radius_y,
+                   gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->grow (channel, radius_x, radius_y,
+                                          push_undo);
+}
+
+void
+gimp_channel_shrink (GimpChannel  *channel,
+                     gint          radius_x,
+                     gint          radius_y,
+                     gboolean      edge_lock,
+                     gboolean      push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->shrink (channel, radius_x, radius_y,
+                                            edge_lock, push_undo);
+}
+
+void
+gimp_channel_flood (GimpChannel *channel,
+                    gboolean     push_undo)
+{
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (channel)))
+    push_undo = FALSE;
+
+  GIMP_CHANNEL_GET_CLASS (channel)->flood (channel, push_undo);
+}
diff --git a/app/core/gimpchannel.h b/app/core/gimpchannel.h
new file mode 100644
index 0000000..348f4f6
--- /dev/null
+++ b/app/core/gimpchannel.h
@@ -0,0 +1,216 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHANNEL_H__
+#define __GIMP_CHANNEL_H__
+
+#include "gimpdrawable.h"
+
+
+#define GIMP_TYPE_CHANNEL            (gimp_channel_get_type ())
+#define GIMP_CHANNEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CHANNEL, GimpChannel))
+#define GIMP_CHANNEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CHANNEL, GimpChannelClass))
+#define GIMP_IS_CHANNEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CHANNEL))
+#define GIMP_IS_CHANNEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CHANNEL))
+#define GIMP_CHANNEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CHANNEL, GimpChannelClass))
+
+
+typedef struct _GimpChannelClass GimpChannelClass;
+
+struct _GimpChannel
+{
+  GimpDrawable  parent_instance;
+
+  GimpRGB       color;             /*  Also stores the opacity        */
+  gboolean      show_masked;       /*  Show masked areas--as          */
+                                   /*  opposed to selected areas      */
+
+  GeglNode     *color_node;
+  GeglNode     *invert_node;
+  GeglNode     *mask_node;
+
+  /*  Selection mask variables  */
+  gboolean      boundary_known;    /*  is the current boundary valid  */
+  GimpBoundSeg *segs_in;           /*  outline of selected region     */
+  GimpBoundSeg *segs_out;          /*  outline of selected region     */
+  gint          num_segs_in;       /*  number of lines in boundary    */
+  gint          num_segs_out;      /*  number of lines in boundary    */
+  gboolean      empty;             /*  is the region empty?           */
+  gboolean      bounds_known;      /*  recalculate the bounds?        */
+  gint          x1, y1;            /*  coordinates for bounding box   */
+  gint          x2, y2;            /*  lower right hand coordinate    */
+};
+
+struct _GimpChannelClass
+{
+  GimpDrawableClass  parent_class;
+
+  /*  signals  */
+  void     (* color_changed) (GimpChannel             *channel);
+
+  /*  virtual functions  */
+  gboolean (* boundary)      (GimpChannel             *channel,
+                              const GimpBoundSeg     **segs_in,
+                              const GimpBoundSeg     **segs_out,
+                              gint                    *num_segs_in,
+                              gint                    *num_segs_out,
+                              gint                     x1,
+                              gint                     y1,
+                              gint                     x2,
+                              gint                     y2);
+  gboolean (* is_empty)      (GimpChannel             *channel);
+
+  void     (* feather)       (GimpChannel             *channel,
+                              gdouble                  radius_x,
+                              gdouble                  radius_y,
+                              gboolean                 edge_lock,
+                              gboolean                 push_undo);
+  void     (* sharpen)       (GimpChannel             *channel,
+                              gboolean                 push_undo);
+  void     (* clear)         (GimpChannel             *channel,
+                              const gchar             *undo_desc,
+                              gboolean                 push_undo);
+  void     (* all)           (GimpChannel             *channel,
+                              gboolean                 push_undo);
+  void     (* invert)        (GimpChannel             *channel,
+                              gboolean                 push_undo);
+  void     (* border)        (GimpChannel             *channel,
+                              gint                     radius_x,
+                              gint                     radius_y,
+                              GimpChannelBorderStyle   style,
+                              gboolean                 edge_lock,
+                              gboolean                 push_undo);
+  void     (* grow)          (GimpChannel             *channel,
+                              gint                     radius_x,
+                              gint                     radius_y,
+                              gboolean                 push_undo);
+  void     (* shrink)        (GimpChannel             *channel,
+                              gint                     radius_x,
+                              gint                     radius_y,
+                              gboolean                 edge_lock,
+                              gboolean                 push_undo);
+  void     (* flood)         (GimpChannel             *channel,
+                              gboolean                 push_undo);
+
+  const gchar *feather_desc;
+  const gchar *sharpen_desc;
+  const gchar *clear_desc;
+  const gchar *all_desc;
+  const gchar *invert_desc;
+  const gchar *border_desc;
+  const gchar *grow_desc;
+  const gchar *shrink_desc;
+  const gchar *flood_desc;
+};
+
+
+/*  function declarations  */
+
+GType         gimp_channel_get_type           (void) G_GNUC_CONST;
+
+GimpChannel * gimp_channel_new                (GimpImage         *image,
+                                               gint               width,
+                                               gint               height,
+                                               const gchar       *name,
+                                               const GimpRGB     *color);
+GimpChannel * gimp_channel_new_from_buffer    (GimpImage         *image,
+                                               GeglBuffer        *buffer,
+                                               const gchar       *name,
+                                               const GimpRGB     *color);
+GimpChannel * gimp_channel_new_from_alpha     (GimpImage         *image,
+                                               GimpDrawable      *drawable,
+                                               const gchar       *name,
+                                               const GimpRGB     *color);
+GimpChannel * gimp_channel_new_from_component (GimpImage         *image,
+                                               GimpChannelType    type,
+                                               const gchar       *name,
+                                               const GimpRGB     *color);
+
+GimpChannel * gimp_channel_get_parent         (GimpChannel       *channel);
+
+gdouble       gimp_channel_get_opacity        (GimpChannel       *channel);
+void          gimp_channel_set_opacity        (GimpChannel       *channel,
+                                               gdouble            opacity,
+                                               gboolean           push_undo);
+
+void          gimp_channel_get_color          (GimpChannel       *channel,
+                                               GimpRGB           *color);
+void          gimp_channel_set_color          (GimpChannel       *channel,
+                                               const GimpRGB     *color,
+                                               gboolean           push_undo);
+
+gboolean      gimp_channel_get_show_masked    (GimpChannel       *channel);
+void          gimp_channel_set_show_masked    (GimpChannel       *channel,
+                                               gboolean           show_masked);
+
+void          gimp_channel_push_undo          (GimpChannel       *mask,
+                                               const gchar       *undo_desc);
+
+
+/*  selection mask functions  */
+
+GimpChannel * gimp_channel_new_mask           (GimpImage              *image,
+                                               gint                    width,
+                                               gint                    height);
+
+gboolean      gimp_channel_boundary           (GimpChannel            *mask,
+                                               const GimpBoundSeg    **segs_in,
+                                               const GimpBoundSeg    **segs_out,
+                                               gint                   *num_segs_in,
+                                               gint                   *num_segs_out,
+                                               gint                    x1,
+                                               gint                    y1,
+                                               gint                    x2,
+                                               gint                    y2);
+gboolean      gimp_channel_is_empty           (GimpChannel            *mask);
+
+void          gimp_channel_feather            (GimpChannel            *mask,
+                                               gdouble                 radius_x,
+                                               gdouble                 radius_y,
+                                               gboolean                edge_lock,
+                                               gboolean                push_undo);
+void          gimp_channel_sharpen            (GimpChannel            *mask,
+                                               gboolean                push_undo);
+
+void          gimp_channel_clear              (GimpChannel            *mask,
+                                               const gchar            *undo_desc,
+                                               gboolean                push_undo);
+void          gimp_channel_all                (GimpChannel            *mask,
+                                               gboolean                push_undo);
+void          gimp_channel_invert             (GimpChannel            *mask,
+                                               gboolean                push_undo);
+
+void          gimp_channel_border             (GimpChannel            *mask,
+                                               gint                    radius_x,
+                                               gint                    radius_y,
+                                               GimpChannelBorderStyle  style,
+                                               gboolean                edge_lock,
+                                               gboolean                push_undo);
+void          gimp_channel_grow               (GimpChannel            *mask,
+                                               gint                    radius_x,
+                                               gint                    radius_y,
+                                               gboolean                push_undo);
+void          gimp_channel_shrink             (GimpChannel            *mask,
+                                               gint                    radius_x,
+                                               gint                    radius_y,
+                                               gboolean                edge_lock,
+                                               gboolean                push_undo);
+void          gimp_channel_flood              (GimpChannel            *mask,
+                                               gboolean                push_undo);
+
+
+#endif /* __GIMP_CHANNEL_H__ */
diff --git a/app/core/gimpchannelpropundo.c b/app/core/gimpchannelpropundo.c
new file mode 100644
index 0000000..f140d28
--- /dev/null
+++ b/app/core/gimpchannelpropundo.c
@@ -0,0 +1,108 @@
+/* Gimp - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpchannel.h"
+#include "gimpchannelpropundo.h"
+
+
+static void   gimp_channel_prop_undo_constructed (GObject             *object);
+
+static void   gimp_channel_prop_undo_pop         (GimpUndo            *undo,
+                                                  GimpUndoMode         undo_mode,
+                                                  GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpChannelPropUndo, gimp_channel_prop_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_channel_prop_undo_parent_class
+
+
+static void
+gimp_channel_prop_undo_class_init (GimpChannelPropUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_channel_prop_undo_constructed;
+
+  undo_class->pop           = gimp_channel_prop_undo_pop;
+}
+
+static void
+gimp_channel_prop_undo_init (GimpChannelPropUndo *undo)
+{
+}
+
+static void
+gimp_channel_prop_undo_constructed (GObject *object)
+{
+  GimpChannelPropUndo *channel_prop_undo = GIMP_CHANNEL_PROP_UNDO (object);
+  GimpChannel         *channel;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CHANNEL (GIMP_ITEM_UNDO (object)->item));
+
+  channel = GIMP_CHANNEL (GIMP_ITEM_UNDO (object)->item);
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_CHANNEL_COLOR:
+      gimp_channel_get_color (channel, &channel_prop_undo->color);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_channel_prop_undo_pop (GimpUndo            *undo,
+                            GimpUndoMode         undo_mode,
+                            GimpUndoAccumulator *accum)
+{
+  GimpChannelPropUndo *channel_prop_undo = GIMP_CHANNEL_PROP_UNDO (undo);
+  GimpChannel         *channel           = GIMP_CHANNEL (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_CHANNEL_COLOR:
+      {
+        GimpRGB color;
+
+        gimp_channel_get_color (channel, &color);
+        gimp_channel_set_color (channel, &channel_prop_undo->color, FALSE);
+        channel_prop_undo->color = color;
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
diff --git a/app/core/gimpchannelpropundo.h b/app/core/gimpchannelpropundo.h
new file mode 100644
index 0000000..2aa7ad5
--- /dev/null
+++ b/app/core/gimpchannelpropundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHANNEL_PROP_UNDO_H__
+#define __GIMP_CHANNEL_PROP_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_CHANNEL_PROP_UNDO            (gimp_channel_prop_undo_get_type ())
+#define GIMP_CHANNEL_PROP_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CHANNEL_PROP_UNDO, GimpChannelPropUndo))
+#define GIMP_CHANNEL_PROP_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CHANNEL_PROP_UNDO, GimpChannelPropUndoClass))
+#define GIMP_IS_CHANNEL_PROP_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CHANNEL_PROP_UNDO))
+#define GIMP_IS_CHANNEL_PROP_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CHANNEL_PROP_UNDO))
+#define GIMP_CHANNEL_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CHANNEL_PROP_UNDO, GimpChannelPropUndoClass))
+
+
+typedef struct _GimpChannelPropUndo      GimpChannelPropUndo;
+typedef struct _GimpChannelPropUndoClass GimpChannelPropUndoClass;
+
+struct _GimpChannelPropUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpRGB       color;
+};
+
+struct _GimpChannelPropUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_channel_prop_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_CHANNEL_PROP_UNDO_H__ */
diff --git a/app/core/gimpchannelundo.c b/app/core/gimpchannelundo.c
new file mode 100644
index 0000000..1892ced
--- /dev/null
+++ b/app/core/gimpchannelundo.c
@@ -0,0 +1,214 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpchannel.h"
+#include "gimpchannelundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PREV_PARENT,
+  PROP_PREV_POSITION,
+  PROP_PREV_CHANNEL
+};
+
+
+static void    gimp_channel_undo_constructed  (GObject             *object);
+static void    gimp_channel_undo_set_property (GObject             *object,
+                                               guint                property_id,
+                                               const GValue        *value,
+                                               GParamSpec          *pspec);
+static void    gimp_channel_undo_get_property (GObject             *object,
+                                               guint                property_id,
+                                               GValue              *value,
+                                               GParamSpec          *pspec);
+
+static gint64  gimp_channel_undo_get_memsize  (GimpObject          *object,
+                                               gint64              *gui_size);
+
+static void    gimp_channel_undo_pop          (GimpUndo            *undo,
+                                               GimpUndoMode         undo_mode,
+                                               GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpChannelUndo, gimp_channel_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_channel_undo_parent_class
+
+
+static void
+gimp_channel_undo_class_init (GimpChannelUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_channel_undo_constructed;
+  object_class->set_property     = gimp_channel_undo_set_property;
+  object_class->get_property     = gimp_channel_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_channel_undo_get_memsize;
+
+  undo_class->pop                = gimp_channel_undo_pop;
+
+  g_object_class_install_property (object_class, PROP_PREV_PARENT,
+                                   g_param_spec_object ("prev-parent",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CHANNEL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PREV_POSITION,
+                                   g_param_spec_int ("prev-position",
+                                                     NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PREV_CHANNEL,
+                                   g_param_spec_object ("prev-channel",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CHANNEL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_channel_undo_init (GimpChannelUndo *undo)
+{
+}
+
+static void
+gimp_channel_undo_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CHANNEL (GIMP_ITEM_UNDO (object)->item));
+}
+
+static void
+gimp_channel_undo_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpChannelUndo *channel_undo = GIMP_CHANNEL_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREV_PARENT:
+      channel_undo->prev_parent = g_value_get_object (value);
+      break;
+    case PROP_PREV_POSITION:
+      channel_undo->prev_position = g_value_get_int (value);
+      break;
+    case PROP_PREV_CHANNEL:
+      channel_undo->prev_channel = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_channel_undo_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpChannelUndo *channel_undo = GIMP_CHANNEL_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREV_PARENT:
+      g_value_set_object (value, channel_undo->prev_parent);
+      break;
+    case PROP_PREV_POSITION:
+      g_value_set_int (value, channel_undo->prev_position);
+      break;
+    case PROP_PREV_CHANNEL:
+      g_value_set_object (value, channel_undo->prev_channel);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_channel_undo_get_memsize (GimpObject *object,
+                               gint64     *gui_size)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (object);
+  gint64        memsize   = 0;
+
+  if (! gimp_item_is_attached (item_undo->item))
+    memsize += gimp_object_get_memsize (GIMP_OBJECT (item_undo->item),
+                                        gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_channel_undo_pop (GimpUndo            *undo,
+                       GimpUndoMode         undo_mode,
+                       GimpUndoAccumulator *accum)
+{
+  GimpChannelUndo *channel_undo = GIMP_CHANNEL_UNDO (undo);
+  GimpChannel     *channel      = GIMP_CHANNEL (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+       undo->undo_type == GIMP_UNDO_CHANNEL_ADD) ||
+      (undo_mode       == GIMP_UNDO_MODE_REDO &&
+       undo->undo_type == GIMP_UNDO_CHANNEL_REMOVE))
+    {
+      /*  remove channel  */
+
+      /*  record the current parent and position  */
+      channel_undo->prev_parent   = gimp_channel_get_parent (channel);
+      channel_undo->prev_position = gimp_item_get_index (GIMP_ITEM (channel));
+
+      gimp_image_remove_channel (undo->image, channel, FALSE,
+                                 channel_undo->prev_channel);
+    }
+  else
+    {
+      /*  restore channel  */
+
+      /*  record the active channel  */
+      channel_undo->prev_channel = gimp_image_get_active_channel (undo->image);
+
+      gimp_image_add_channel (undo->image, channel,
+                              channel_undo->prev_parent,
+                              channel_undo->prev_position, FALSE);
+    }
+}
diff --git a/app/core/gimpchannelundo.h b/app/core/gimpchannelundo.h
new file mode 100644
index 0000000..7bfceb9
--- /dev/null
+++ b/app/core/gimpchannelundo.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHANNEL_UNDO_H__
+#define __GIMP_CHANNEL_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_CHANNEL_UNDO            (gimp_channel_undo_get_type ())
+#define GIMP_CHANNEL_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CHANNEL_UNDO, GimpChannelUndo))
+#define GIMP_CHANNEL_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CHANNEL_UNDO, GimpChannelUndoClass))
+#define GIMP_IS_CHANNEL_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CHANNEL_UNDO))
+#define GIMP_IS_CHANNEL_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CHANNEL_UNDO))
+#define GIMP_CHANNEL_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CHANNEL_UNDO, GimpChannelUndoClass))
+
+
+typedef struct _GimpChannelUndo      GimpChannelUndo;
+typedef struct _GimpChannelUndoClass GimpChannelUndoClass;
+
+struct _GimpChannelUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpChannel  *prev_parent;
+  gint          prev_position;   /*  former position in list  */
+  GimpChannel  *prev_channel;    /*  previous active channel  */
+};
+
+struct _GimpChannelUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_channel_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_CHANNEL_UNDO_H__ */
diff --git a/app/core/gimpchunkiterator.c b/app/core/gimpchunkiterator.c
new file mode 100644
index 0000000..616bb46
--- /dev/null
+++ b/app/core/gimpchunkiterator.c
@@ -0,0 +1,555 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpchunkiterator.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpchunkiterator.h"
+
+
+/* the maximal chunk size */
+#define MAX_CHUNK_WIDTH          4096
+#define MAX_CHUNK_HEIGHT         4096
+
+/* the default iteration interval */
+#define DEFAULT_INTERVAL         (1.0 / 15.0) /* seconds */
+
+/* the minimal area to process per iteration */
+#define MIN_AREA_PER_ITERATION   4096
+
+/* the maximal ratio between the actual processed area and the target area,
+ * above which the current chunk height is readjusted, even in the middle of a
+ * row, to better match the target area
+ */
+#define MAX_AREA_RATIO           2.0
+
+/* the width of the target-area sliding window */
+#define TARGET_AREA_HISTORY_SIZE 3
+
+
+struct _GimpChunkIterator
+{
+  cairo_region_t *region;
+  cairo_region_t *priority_region;
+
+  GeglRectangle   tile_rect;
+  GeglRectangle   priority_rect;
+
+  gdouble         interval;
+
+  cairo_region_t *current_region;
+  GeglRectangle   current_rect;
+
+  gint            current_x;
+  gint            current_y;
+  gint            current_height;
+
+  gint64          iteration_time;
+
+  gint64          last_time;
+  gint            last_area;
+
+  gdouble         target_area;
+  gdouble         target_area_min;
+  gdouble         target_area_history[TARGET_AREA_HISTORY_SIZE];
+  gint            target_area_history_i;
+  gint            target_area_history_n;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_chunk_iterator_set_current_rect   (GimpChunkIterator   *iter,
+                                                          const GeglRectangle *rect);
+static void       gimp_chunk_iterator_merge_current_rect (GimpChunkIterator   *iter);
+
+static void       gimp_chunk_iterator_merge              (GimpChunkIterator   *iter);
+
+static gboolean   gimp_chunk_iterator_prepare            (GimpChunkIterator   *iter);
+
+static void       gimp_chunk_iterator_set_target_area    (GimpChunkIterator   *iter,
+                                                          gdouble              target_area);
+static gdouble    gimp_chunk_iterator_get_target_area    (GimpChunkIterator   *iter);
+static void       gimp_chunk_iterator_reset_target_area  (GimpChunkIterator   *iter);
+
+static void       gimp_chunk_iterator_calc_rect          (GimpChunkIterator   *iter,
+                                                          GeglRectangle       *rect,
+                                                          gboolean             readjust_height);
+
+
+/*  private functions  */
+
+static void
+gimp_chunk_iterator_set_current_rect (GimpChunkIterator   *iter,
+                                      const GeglRectangle *rect)
+{
+  cairo_region_subtract_rectangle (iter->current_region,
+                                   (const cairo_rectangle_int_t *) rect);
+
+  iter->current_rect   = *rect;
+
+  iter->current_x      = rect->x;
+  iter->current_y      = rect->y;
+  iter->current_height = 0;
+}
+
+static void
+gimp_chunk_iterator_merge_current_rect (GimpChunkIterator *iter)
+{
+  GeglRectangle rect;
+
+  if (gegl_rectangle_is_empty (&iter->current_rect))
+    return;
+
+  /* merge the remainder of the current row */
+  rect.x      = iter->current_x;
+  rect.y      = iter->current_y;
+  rect.width  = iter->current_rect.x + iter->current_rect.width -
+                iter->current_x;
+  rect.height = iter->current_height;
+
+  cairo_region_union_rectangle (iter->current_region,
+                                (const cairo_rectangle_int_t *) &rect);
+
+  /* merge the remainder of the current rect */
+  rect.x      = iter->current_rect.x;
+  rect.y      = iter->current_y + iter->current_height;
+  rect.width  = iter->current_rect.width;
+  rect.height = iter->current_rect.y + iter->current_rect.height - rect.y;
+
+  cairo_region_union_rectangle (iter->current_region,
+                                (const cairo_rectangle_int_t *) &rect);
+
+  /* reset the current rect and coordinates */
+  iter->current_rect.x      = 0;
+  iter->current_rect.y      = 0;
+  iter->current_rect.width  = 0;
+  iter->current_rect.height = 0;
+
+  iter->current_x           = 0;
+  iter->current_y           = 0;
+  iter->current_height      = 0;
+}
+
+static void
+gimp_chunk_iterator_merge (GimpChunkIterator *iter)
+{
+  /* merge the current rect back to the current region */
+  gimp_chunk_iterator_merge_current_rect (iter);
+
+  /* merge the priority region back to the global region */
+  if (iter->priority_region)
+    {
+      cairo_region_union (iter->region, iter->priority_region);
+
+      g_clear_pointer (&iter->priority_region, cairo_region_destroy);
+
+      iter->current_region = iter->region;
+    }
+}
+
+static gboolean
+gimp_chunk_iterator_prepare (GimpChunkIterator *iter)
+{
+  if (iter->current_x == iter->current_rect.x + iter->current_rect.width)
+    {
+      iter->current_x       = iter->current_rect.x;
+      iter->current_y      += iter->current_height;
+      iter->current_height  = 0;
+
+      if (iter->current_y == iter->current_rect.y + iter->current_rect.height)
+        {
+          GeglRectangle rect;
+
+          if (! iter->priority_region &&
+              ! gegl_rectangle_is_empty (&iter->priority_rect))
+            {
+              iter->priority_region = cairo_region_copy (iter->region);
+
+              cairo_region_intersect_rectangle (
+                iter->priority_region,
+                (const cairo_rectangle_int_t *) &iter->priority_rect);
+
+              cairo_region_subtract_rectangle (
+                iter->region,
+                (const cairo_rectangle_int_t *) &iter->priority_rect);
+            }
+
+          if (! iter->priority_region ||
+              cairo_region_is_empty (iter->priority_region))
+            {
+              iter->current_region = iter->region;
+            }
+          else
+            {
+              iter->current_region = iter->priority_region;
+            }
+
+          if (cairo_region_is_empty (iter->current_region))
+            {
+              iter->current_rect.x      = 0;
+              iter->current_rect.y      = 0;
+              iter->current_rect.width  = 0;
+              iter->current_rect.height = 0;
+
+              iter->current_x           = 0;
+              iter->current_y           = 0;
+              iter->current_height      = 0;
+
+              return FALSE;
+            }
+
+          cairo_region_get_rectangle (iter->current_region, 0,
+                                      (cairo_rectangle_int_t *) &rect);
+
+          gimp_chunk_iterator_set_current_rect (iter, &rect);
+        }
+    }
+
+  return TRUE;
+}
+
+static gint
+compare_double (const gdouble *x,
+                const gdouble *y)
+{
+  return (*x > *y) - (*x < *y);
+}
+
+static void
+gimp_chunk_iterator_set_target_area (GimpChunkIterator *iter,
+                                     gdouble            target_area)
+{
+  gdouble target_area_history[TARGET_AREA_HISTORY_SIZE];
+
+  iter->target_area_min = MIN (iter->target_area_min, target_area);
+
+  iter->target_area_history[iter->target_area_history_i++] = target_area;
+
+  iter->target_area_history_n  = MAX (iter->target_area_history_n,
+                                      iter->target_area_history_i);
+  iter->target_area_history_i %= TARGET_AREA_HISTORY_SIZE;
+
+  memcpy (target_area_history, iter->target_area_history,
+          iter->target_area_history_n * sizeof (gdouble));
+
+  qsort (target_area_history, iter->target_area_history_n, sizeof (gdouble),
+         (gpointer) compare_double);
+
+  iter->target_area = target_area_history[iter->target_area_history_n / 2];
+}
+
+static gdouble
+gimp_chunk_iterator_get_target_area (GimpChunkIterator *iter)
+{
+  if (iter->target_area)
+    return iter->target_area;
+  else
+    return iter->tile_rect.width * iter->tile_rect.height;
+}
+
+static void
+gimp_chunk_iterator_reset_target_area (GimpChunkIterator *iter)
+{
+  if (iter->target_area_history_n)
+    {
+      iter->target_area           = iter->target_area_min;
+      iter->target_area_min       = MAX_CHUNK_WIDTH * MAX_CHUNK_HEIGHT;
+      iter->target_area_history_i = 0;
+      iter->target_area_history_n = 0;
+    }
+}
+
+static void
+gimp_chunk_iterator_calc_rect (GimpChunkIterator *iter,
+                               GeglRectangle     *rect,
+                               gboolean           readjust_height)
+{
+  gdouble target_area;
+  gdouble aspect_ratio;
+  gint    offset_x;
+  gint    offset_y;
+
+  if (readjust_height)
+    gimp_chunk_iterator_reset_target_area (iter);
+
+  target_area = gimp_chunk_iterator_get_target_area (iter);
+
+  aspect_ratio = (gdouble) iter->tile_rect.height /
+                 (gdouble) iter->tile_rect.width;
+
+  rect->x = iter->current_x;
+  rect->y = iter->current_y;
+
+  offset_x = rect->x - iter->tile_rect.x;
+  offset_y = rect->y - iter->tile_rect.y;
+
+  if (readjust_height)
+    {
+      rect->height = RINT ((offset_y + sqrt (target_area * aspect_ratio)) /
+                           iter->tile_rect.height)                        *
+                     iter->tile_rect.height                               -
+                     offset_y;
+
+      if (rect->height <= 0)
+        rect->height += iter->tile_rect.height;
+
+      rect->height = MIN (rect->height,
+                          iter->current_rect.y + iter->current_rect.height -
+                          rect->y);
+      rect->height = MIN (rect->height, MAX_CHUNK_HEIGHT);
+    }
+  else
+    {
+      rect->height = iter->current_height;
+    }
+
+  rect->width = RINT ((offset_x + (gdouble) target_area   /
+                                  (gdouble) rect->height) /
+                      iter->tile_rect.width)              *
+                iter->tile_rect.width                     -
+                offset_x;
+
+  if (rect->width <= 0)
+    rect->width += iter->tile_rect.width;
+
+  rect->width = MIN (rect->width,
+                     iter->current_rect.x + iter->current_rect.width -
+                     rect->x);
+  rect->width = MIN (rect->width, MAX_CHUNK_WIDTH);
+}
+
+
+/*  public functions  */
+
+GimpChunkIterator *
+gimp_chunk_iterator_new (cairo_region_t *region)
+{
+  GimpChunkIterator *iter;
+
+  g_return_val_if_fail (region != NULL, NULL);
+
+  iter = g_slice_new0 (GimpChunkIterator);
+
+  iter->region         = region;
+  iter->current_region = region;
+
+  g_object_get (gegl_config (),
+                "tile-width",  &iter->tile_rect.width,
+                "tile-height", &iter->tile_rect.height,
+                NULL);
+
+  iter->interval = DEFAULT_INTERVAL;
+
+  return iter;
+}
+
+void
+gimp_chunk_iterator_set_tile_rect (GimpChunkIterator   *iter,
+                                   const GeglRectangle *rect)
+{
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (rect != NULL);
+  g_return_if_fail (! gegl_rectangle_is_empty (rect));
+
+  iter->tile_rect = *rect;
+}
+
+void
+gimp_chunk_iterator_set_priority_rect (GimpChunkIterator   *iter,
+                                       const GeglRectangle *rect)
+{
+  const GeglRectangle empty_rect = {};
+
+  g_return_if_fail (iter != NULL);
+
+  if (! rect)
+    rect = &empty_rect;
+
+  if (! gegl_rectangle_equal (rect, &iter->priority_rect))
+    {
+      iter->priority_rect = *rect;
+
+      gimp_chunk_iterator_merge (iter);
+    }
+}
+
+void
+gimp_chunk_iterator_set_interval (GimpChunkIterator *iter,
+                                  gdouble            interval)
+{
+  g_return_if_fail (iter != NULL);
+
+  interval = MAX (interval, 0.0);
+
+  if (interval != iter->interval)
+    {
+      if (iter->interval)
+        {
+          gdouble ratio = interval / iter->interval;
+          gint    i;
+
+          iter->target_area *= ratio;
+
+          for (i = 0; i < TARGET_AREA_HISTORY_SIZE; i++)
+            iter->target_area_history[i] *= ratio;
+        }
+
+      iter->interval = interval;
+    }
+}
+
+gboolean
+gimp_chunk_iterator_next (GimpChunkIterator *iter)
+{
+  g_return_val_if_fail (iter != NULL, FALSE);
+
+  if (! gimp_chunk_iterator_prepare (iter))
+    {
+      gimp_chunk_iterator_stop (iter, TRUE);
+
+      return FALSE;
+    }
+
+  iter->iteration_time = g_get_monotonic_time ();
+
+  iter->last_time = iter->iteration_time;
+  iter->last_area = 0;
+
+  return TRUE;
+}
+
+gboolean
+gimp_chunk_iterator_get_rect (GimpChunkIterator *iter,
+                              GeglRectangle     *rect)
+{
+  gint64 time;
+
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (rect != NULL, FALSE);
+
+  if (! gimp_chunk_iterator_prepare (iter))
+    return FALSE;
+
+  time = g_get_monotonic_time ();
+
+  if (iter->last_area >= MIN_AREA_PER_ITERATION)
+    {
+      gdouble interval;
+
+      interval = (gdouble) (time - iter->last_time) / G_TIME_SPAN_SECOND;
+
+      gimp_chunk_iterator_set_target_area (
+        iter,
+        iter->last_area * iter->interval / interval);
+
+      interval = (gdouble) (time - iter->iteration_time) / G_TIME_SPAN_SECOND;
+
+      if (interval > iter->interval)
+        return FALSE;
+    }
+
+  if (iter->current_x == iter->current_rect.x)
+    {
+      gimp_chunk_iterator_calc_rect (iter, rect, TRUE);
+    }
+  else
+    {
+      gimp_chunk_iterator_calc_rect (iter, rect, FALSE);
+
+      if (rect->width * rect->height >=
+          MAX_AREA_RATIO * gimp_chunk_iterator_get_target_area (iter))
+        {
+          GeglRectangle old_rect = *rect;
+
+          gimp_chunk_iterator_calc_rect (iter, rect, TRUE);
+
+          if (rect->height >= old_rect.height)
+            *rect = old_rect;
+        }
+    }
+
+  if (rect->height != iter->current_height)
+    {
+      /* if the chunk height changed in the middle of a row, merge the
+       * remaining area back into the current region, and reset the current
+       * area to the remainder of the row, using the new chunk height
+       */
+      if (rect->x != iter->current_rect.x)
+        {
+          GeglRectangle rem;
+
+          rem.x      = rect->x;
+          rem.y      = rect->y;
+          rem.width  = iter->current_rect.x + iter->current_rect.width -
+                       rect->x;
+          rem.height = rect->height;
+
+          gimp_chunk_iterator_merge_current_rect (iter);
+
+          gimp_chunk_iterator_set_current_rect (iter, &rem);
+        }
+
+      iter->current_height = rect->height;
+    }
+
+  iter->current_x += rect->width;
+
+  iter->last_time = time;
+  iter->last_area = rect->width * rect->height;
+
+  return TRUE;
+}
+
+cairo_region_t *
+gimp_chunk_iterator_stop (GimpChunkIterator *iter,
+                          gboolean           free_region)
+{
+  cairo_region_t *result = NULL;
+
+  g_return_val_if_fail (iter != NULL, NULL);
+
+  if (free_region)
+    {
+      cairo_region_destroy (iter->region);
+    }
+  else
+    {
+      gimp_chunk_iterator_merge (iter);
+
+      result = iter->region;
+    }
+
+  g_clear_pointer (&iter->priority_region, cairo_region_destroy);
+
+  g_slice_free (GimpChunkIterator, iter);
+
+  return result;
+}
diff --git a/app/core/gimpchunkiterator.h b/app/core/gimpchunkiterator.h
new file mode 100644
index 0000000..e1756f3
--- /dev/null
+++ b/app/core/gimpchunkiterator.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpchunkiterator.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHUNK_ITEARTOR_H__
+#define __GIMP_CHUNK_ITEARTOR_H__
+
+
+GimpChunkIterator * gimp_chunk_iterator_new               (cairo_region_t      *region);
+
+void                gimp_chunk_iterator_set_tile_rect     (GimpChunkIterator   *iter,
+                                                           const GeglRectangle *rect);
+
+void                gimp_chunk_iterator_set_priority_rect (GimpChunkIterator   *iter,
+                                                           const GeglRectangle *rect);
+
+void                gimp_chunk_iterator_set_interval      (GimpChunkIterator   *iter,
+                                                           gdouble              interval);
+
+gboolean            gimp_chunk_iterator_next              (GimpChunkIterator   *iter);
+gboolean            gimp_chunk_iterator_get_rect          (GimpChunkIterator   *iter,
+                                                           GeglRectangle       *rect);
+
+cairo_region_t    * gimp_chunk_iterator_stop              (GimpChunkIterator   *iter,
+                                                           gboolean             free_region);
+
+
+#endif  /*  __GIMP_CHUNK_ITEARTOR_H__  */
diff --git a/app/core/gimpcontainer-filter.c b/app/core/gimpcontainer-filter.c
new file mode 100644
index 0000000..956a4a0
--- /dev/null
+++ b/app/core/gimpcontainer-filter.c
@@ -0,0 +1,174 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainer-filter.c
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "gimpcontainer.h"
+#include "gimpcontainer-filter.h"
+#include "gimplist.h"
+
+
+typedef struct
+{
+  GimpObjectFilterFunc   filter;
+  GimpContainer         *container;
+  gpointer               user_data;
+} GimpContainerFilterContext;
+
+
+static void
+gimp_container_filter_foreach_func (GimpObject                 *object,
+                                    GimpContainerFilterContext *context)
+{
+  if (context->filter (object, context->user_data))
+    gimp_container_add (context->container, object);
+}
+
+/**
+ * gimp_container_filter:
+ * @container: a #GimpContainer to filter
+ * @filter: a #GimpObjectFilterFunc
+ * @user_data: a pointer passed to @filter
+ *
+ * Calls the supplied @filter function on each object in @container.
+ * A return value of %TRUE is interpreted as a match.
+ *
+ * Returns: a weak #GimpContainer filled with matching objects.
+ **/
+GimpContainer *
+gimp_container_filter (GimpContainer        *container,
+                       GimpObjectFilterFunc  filter,
+                       gpointer              user_data)
+{
+  GimpContainer              *result;
+  GimpContainerFilterContext  context;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (filter != NULL, NULL);
+
+  result =
+    g_object_new (G_TYPE_FROM_INSTANCE (container),
+                  "children-type", gimp_container_get_children_type (container),
+                  "policy",        GIMP_CONTAINER_POLICY_WEAK,
+                  NULL);
+
+  context.filter    = filter;
+  context.container = result;
+  context.user_data = user_data;
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_filter_foreach_func,
+                          &context);
+
+  /*  This is somewhat ugly, but it keeps lists in the same order.  */
+  if (GIMP_IS_LIST (result))
+    gimp_list_reverse (GIMP_LIST (result));
+
+
+  return result;
+}
+
+
+static gboolean
+gimp_object_filter_by_name (GimpObject   *object,
+                            const GRegex *regex)
+{
+  return g_regex_match (regex, gimp_object_get_name (object), 0, NULL);
+}
+
+/**
+ * gimp_container_filter_by_name:
+ * @container: a #GimpContainer to filter
+ * @regexp: a regular expression (as a %NULL-terminated string)
+ * @error: error location to report errors or %NULL
+ *
+ * This function performs a case-insensitive regular expression search
+ * on the names of the GimpObjects in @container.
+ *
+ * Returns: a weak #GimpContainer filled with matching objects.
+ **/
+GimpContainer *
+gimp_container_filter_by_name (GimpContainer  *container,
+                               const gchar    *regexp,
+                               GError        **error)
+{
+  GimpContainer *result;
+  GRegex        *regex;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (regexp != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  regex = g_regex_new (regexp, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0,
+                       error);
+
+  if (! regex)
+    return NULL;
+
+  result =
+    gimp_container_filter (container,
+                           (GimpObjectFilterFunc) gimp_object_filter_by_name,
+                           regex);
+
+  g_regex_unref (regex);
+
+  return result;
+}
+
+
+gchar **
+gimp_container_get_filtered_name_array (GimpContainer *container,
+                                        const gchar   *regexp,
+                                        gint          *length)
+{
+  GimpContainer *weak;
+  GError        *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (length != NULL, NULL);
+
+  if (regexp == NULL || strlen (regexp) == 0)
+    return (gimp_container_get_name_array (container, length));
+
+  weak = gimp_container_filter_by_name (container, regexp, &error);
+
+  if (weak)
+    {
+      gchar **retval = gimp_container_get_name_array (weak, length);
+
+      g_object_unref (weak);
+
+      return retval;
+    }
+  else
+    {
+      g_warning ("%s", error->message);
+      g_error_free (error);
+
+      *length = 0;
+      return NULL;
+    }
+}
diff --git a/app/core/gimpcontainer-filter.h b/app/core/gimpcontainer-filter.h
new file mode 100644
index 0000000..7c98b32
--- /dev/null
+++ b/app/core/gimpcontainer-filter.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainer-filter.c
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_FILTER_H__
+#define __GIMP_CONTAINER_FILTER_H__
+
+
+GimpContainer * gimp_container_filter         (GimpContainer        *container,
+                                               GimpObjectFilterFunc  filter,
+                                               gpointer              user_data);
+GimpContainer * gimp_container_filter_by_name (GimpContainer        *container,
+                                               const gchar          *regexp,
+                                               GError              **error);
+
+gchar        ** gimp_container_get_filtered_name_array
+                                              (GimpContainer        *container,
+                                               const gchar          *regexp,
+                                               gint                 *length);
+
+
+#endif  /* __GIMP_CONTAINER_FILTER_H__ */
diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c
new file mode 100644
index 0000000..322a3ec
--- /dev/null
+++ b/app/core/gimpcontainer.c
@@ -0,0 +1,1167 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainer.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-memsize.h"
+#include "gimpcontainer.h"
+#include "gimpmarshal.h"
+
+
+/* #define DEBUG_CONTAINER */
+
+#ifdef DEBUG_CONTAINER
+#define D(stmnt) stmnt
+#else
+#define D(stmnt)
+#endif
+
+
+enum
+{
+  ADD,
+  REMOVE,
+  REORDER,
+  FREEZE,
+  THAW,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_CHILDREN_TYPE,
+  PROP_POLICY
+};
+
+
+typedef struct
+{
+  gchar     *signame;
+  GCallback  callback;
+  gpointer   callback_data;
+
+  GQuark     quark;  /*  used to attach the signal id's of child signals  */
+} GimpContainerHandler;
+
+struct _GimpContainerPrivate
+{
+  GType                children_type;
+  GimpContainerPolicy  policy;
+  gint                 n_children;
+
+  GList               *handlers;
+  gint                 freeze_count;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_container_config_iface_init   (GimpConfigInterface *iface);
+
+static void       gimp_container_dispose         (GObject          *object);
+
+static void       gimp_container_set_property    (GObject          *object,
+                                                  guint             property_id,
+                                                  const GValue     *value,
+                                                  GParamSpec       *pspec);
+static void       gimp_container_get_property    (GObject          *object,
+                                                  guint             property_id,
+                                                  GValue           *value,
+                                                  GParamSpec       *pspec);
+
+static gint64     gimp_container_get_memsize     (GimpObject       *object,
+                                                  gint64           *gui_size);
+
+static void       gimp_container_real_add        (GimpContainer    *container,
+                                                  GimpObject       *object);
+static void       gimp_container_real_remove     (GimpContainer    *container,
+                                                  GimpObject       *object);
+
+static gboolean   gimp_container_serialize       (GimpConfig       *config,
+                                                  GimpConfigWriter *writer,
+                                                  gpointer          data);
+static gboolean   gimp_container_deserialize     (GimpConfig       *config,
+                                                  GScanner         *scanner,
+                                                  gint              nest_level,
+                                                  gpointer          data);
+
+static void   gimp_container_disconnect_callback (GimpObject       *object,
+                                                  gpointer          data);
+
+static void       gimp_container_free_handler    (GimpContainer    *container,
+                                                  GimpContainerHandler *handler);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainer, gimp_container, GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpContainer)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_container_config_iface_init))
+
+#define parent_class gimp_container_parent_class
+
+static guint container_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_container_class_init (GimpContainerClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  container_signals[ADD] =
+    g_signal_new ("add",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContainerClass, add),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_OBJECT);
+
+  container_signals[REMOVE] =
+    g_signal_new ("remove",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContainerClass, remove),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_OBJECT);
+
+  container_signals[REORDER] =
+    g_signal_new ("reorder",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContainerClass, reorder),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_INT,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_OBJECT,
+                  G_TYPE_INT);
+
+  container_signals[FREEZE] =
+    g_signal_new ("freeze",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpContainerClass, freeze),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  container_signals[THAW] =
+    g_signal_new ("thaw",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpContainerClass, thaw),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose          = gimp_container_dispose;
+  object_class->set_property     = gimp_container_set_property;
+  object_class->get_property     = gimp_container_get_property;
+
+  gimp_object_class->get_memsize = gimp_container_get_memsize;
+
+  klass->add                     = gimp_container_real_add;
+  klass->remove                  = gimp_container_real_remove;
+  klass->reorder                 = NULL;
+  klass->freeze                  = NULL;
+  klass->thaw                    = NULL;
+
+  klass->clear                   = NULL;
+  klass->have                    = NULL;
+  klass->foreach                 = NULL;
+  klass->search                  = NULL;
+  klass->get_unique_names        = NULL;
+  klass->get_child_by_name       = NULL;
+  klass->get_child_by_index      = NULL;
+  klass->get_child_index         = NULL;
+
+  g_object_class_install_property (object_class, PROP_CHILDREN_TYPE,
+                                   g_param_spec_gtype ("children-type",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_OBJECT,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_POLICY,
+                                   g_param_spec_enum ("policy",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_CONTAINER_POLICY,
+                                                      GIMP_CONTAINER_POLICY_STRONG,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_container_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_container_serialize;
+  iface->deserialize = gimp_container_deserialize;
+}
+
+static void
+gimp_container_init (GimpContainer *container)
+{
+  container->priv = gimp_container_get_instance_private (container);
+  container->priv->handlers      = NULL;
+  container->priv->freeze_count  = 0;
+
+  container->priv->children_type = G_TYPE_NONE;
+  container->priv->policy        = GIMP_CONTAINER_POLICY_STRONG;
+  container->priv->n_children    = 0;
+}
+
+static void
+gimp_container_dispose (GObject *object)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  gimp_container_clear (container);
+
+  while (container->priv->handlers)
+    gimp_container_remove_handler (container,
+                                   ((GimpContainerHandler *)
+                                    container->priv->handlers->data)->quark);
+
+  if (container->priv->children_type != G_TYPE_NONE)
+    {
+      g_type_class_unref (g_type_class_peek (container->priv->children_type));
+      container->priv->children_type = G_TYPE_NONE;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_container_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  switch (property_id)
+    {
+    case PROP_CHILDREN_TYPE:
+      container->priv->children_type = g_value_get_gtype (value);
+      g_type_class_ref (container->priv->children_type);
+      break;
+    case PROP_POLICY:
+      container->priv->policy = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_container_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  switch (property_id)
+    {
+    case PROP_CHILDREN_TYPE:
+      g_value_set_gtype (value, container->priv->children_type);
+      break;
+    case PROP_POLICY:
+      g_value_set_enum (value, container->priv->policy);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_container_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+  gint64         memsize   = 0;
+  GList         *list;
+
+  for (list = container->priv->handlers; list; list = g_list_next (list))
+    {
+      GimpContainerHandler *handler = list->data;
+
+      memsize += (sizeof (GList) +
+                  sizeof (GimpContainerHandler) +
+                  gimp_string_get_memsize (handler->signame));
+    }
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_container_real_add (GimpContainer *container,
+                         GimpObject    *object)
+{
+  container->priv->n_children++;
+}
+
+static void
+gimp_container_real_remove (GimpContainer *container,
+                            GimpObject    *object)
+{
+  container->priv->n_children--;
+}
+
+
+typedef struct
+{
+  GimpConfigWriter *writer;
+  gpointer          data;
+  gboolean          success;
+} SerializeData;
+
+static void
+gimp_container_serialize_foreach (GObject       *object,
+                                  SerializeData *serialize_data)
+{
+  GimpConfigInterface *config_iface;
+  const gchar         *name;
+
+  config_iface = GIMP_CONFIG_GET_INTERFACE (object);
+
+  if (! config_iface)
+    serialize_data->success = FALSE;
+
+  if (! serialize_data->success)
+    return;
+
+  gimp_config_writer_open (serialize_data->writer,
+                           g_type_name (G_TYPE_FROM_INSTANCE (object)));
+
+  name = gimp_object_get_name (object);
+
+  if (name)
+    gimp_config_writer_string (serialize_data->writer, name);
+  else
+    gimp_config_writer_print (serialize_data->writer, "NULL", 4);
+
+  serialize_data->success = config_iface->serialize (GIMP_CONFIG (object),
+                                                     serialize_data->writer,
+                                                     serialize_data->data);
+  gimp_config_writer_close (serialize_data->writer);
+}
+
+static gboolean
+gimp_container_serialize (GimpConfig       *config,
+                          GimpConfigWriter *writer,
+                          gpointer          data)
+{
+  GimpContainer *container = GIMP_CONTAINER (config);
+  SerializeData  serialize_data;
+
+  serialize_data.writer  = writer;
+  serialize_data.data    = data;
+  serialize_data.success = TRUE;
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_serialize_foreach,
+                          &serialize_data);
+
+  return serialize_data.success;
+}
+
+static gboolean
+gimp_container_deserialize (GimpConfig *config,
+                            GScanner   *scanner,
+                            gint        nest_level,
+                            gpointer    data)
+{
+  GimpContainer *container = GIMP_CONTAINER (config);
+  GTokenType     token;
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_IDENTIFIER;
+          break;
+
+        case G_TOKEN_IDENTIFIER:
+          {
+            GimpObject *child     = NULL;
+            GType       type;
+            gchar      *name      = NULL;
+            gboolean    add_child = FALSE;
+
+            type = g_type_from_name (scanner->value.v_identifier);
+
+            if (! type)
+              {
+                g_scanner_error (scanner,
+                                 "unable to determine type of '%s'",
+                                 scanner->value.v_identifier);
+                return FALSE;
+              }
+
+            if (! g_type_is_a (type, container->priv->children_type))
+              {
+                g_scanner_error (scanner,
+                                 "'%s' is not a subclass of '%s'",
+                                 scanner->value.v_identifier,
+                                 g_type_name (container->priv->children_type));
+                return FALSE;
+              }
+
+            if (! g_type_is_a (type, GIMP_TYPE_CONFIG))
+              {
+                g_scanner_error (scanner,
+                                 "'%s' does not implement GimpConfigInterface",
+                                 scanner->value.v_identifier);
+                return FALSE;
+              }
+
+            if (! gimp_scanner_parse_string (scanner, &name))
+              {
+                token = G_TOKEN_STRING;
+                break;
+              }
+
+            if (! name)
+              name = g_strdup ("");
+
+            if (gimp_container_get_unique_names (container))
+              child = gimp_container_get_child_by_name (container, name);
+
+            if (! child)
+              {
+                if (GIMP_IS_GIMP (data))
+                  child = g_object_new (type, "gimp", data, NULL);
+                else
+                  child = g_object_new (type, NULL);
+
+                add_child = TRUE;
+              }
+
+            /*  always use the deserialized name. while it normally
+             *  doesn't make a difference there are obscure case like
+             *  template migration.
+             */
+            gimp_object_take_name (child, name);
+
+            if (! GIMP_CONFIG_GET_INTERFACE (child)->deserialize (GIMP_CONFIG (child),
+                                                                  scanner,
+                                                                  nest_level + 1,
+                                                                  NULL))
+              {
+                if (add_child)
+                  g_object_unref (child);
+
+                /*  warning should be already set by child  */
+                return FALSE;
+              }
+
+            if (add_child)
+              {
+                gimp_container_add (container, child);
+
+                if (container->priv->policy == GIMP_CONTAINER_POLICY_STRONG)
+                  g_object_unref (child);
+              }
+          }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+  return gimp_config_deserialize_return (scanner, token, nest_level);
+}
+
+static void
+gimp_container_disconnect_callback (GimpObject *object,
+                                    gpointer    data)
+{
+  GimpContainer *container = GIMP_CONTAINER (data);
+
+  gimp_container_remove (container, object);
+}
+
+static void
+gimp_container_free_handler_foreach_func (GimpObject           *object,
+                                          GimpContainerHandler *handler)
+{
+  gulong handler_id;
+
+  handler_id = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (object),
+                                                     handler->quark));
+
+  if (handler_id)
+    {
+      g_signal_handler_disconnect (object, handler_id);
+
+      g_object_set_qdata (G_OBJECT (object), handler->quark, NULL);
+    }
+}
+
+static void
+gimp_container_free_handler (GimpContainer        *container,
+                             GimpContainerHandler *handler)
+{
+  D (g_print ("%s: id = %d\n", G_STRFUNC, handler->quark));
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_free_handler_foreach_func,
+                          handler);
+
+  g_free (handler->signame);
+  g_slice_free (GimpContainerHandler, handler);
+}
+
+GType
+gimp_container_get_children_type (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), G_TYPE_NONE);
+
+  return container->priv->children_type;
+}
+
+GimpContainerPolicy
+gimp_container_get_policy (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), 0);
+
+  return container->priv->policy;
+}
+
+gint
+gimp_container_get_n_children (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), 0);
+
+  return container->priv->n_children;
+}
+
+gboolean
+gimp_container_add (GimpContainer *container,
+                    GimpObject    *object)
+{
+  GList *list;
+  gint   n_children;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (object != NULL, FALSE);
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (object,
+                                                    container->priv->children_type),
+                        FALSE);
+
+  if (gimp_container_have (container, object))
+    {
+      g_warning ("%s: container %p already contains object %p",
+                 G_STRFUNC, container, object);
+      return FALSE;
+    }
+
+  for (list = container->priv->handlers; list; list = g_list_next (list))
+    {
+      GimpContainerHandler *handler = list->data;
+      gulong                handler_id;
+
+      handler_id = g_signal_connect (object,
+                                     handler->signame,
+                                     handler->callback,
+                                     handler->callback_data);
+
+      g_object_set_qdata (G_OBJECT (object), handler->quark,
+                          GUINT_TO_POINTER (handler_id));
+    }
+
+  switch (container->priv->policy)
+    {
+    case GIMP_CONTAINER_POLICY_STRONG:
+      g_object_ref (object);
+      break;
+
+    case GIMP_CONTAINER_POLICY_WEAK:
+      g_signal_connect (object, "disconnect",
+                        G_CALLBACK (gimp_container_disconnect_callback),
+                        container);
+      break;
+    }
+
+  n_children = container->priv->n_children;
+
+  g_signal_emit (container, container_signals[ADD], 0, object);
+
+  if (n_children == container->priv->n_children)
+    {
+      g_warning ("%s: GimpContainer::add() implementation did not "
+                 "chain up. Please report this at https://www.gimp.org/bugs/",
+                 G_STRFUNC);
+
+      container->priv->n_children++;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_container_remove (GimpContainer *container,
+                       GimpObject    *object)
+{
+  GList *list;
+  gint   n_children;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (object != NULL, FALSE);
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (object,
+                                                    container->priv->children_type),
+                        FALSE);
+
+  if (! gimp_container_have (container, object))
+    {
+      g_warning ("%s: container %p does not contain object %p",
+                 G_STRFUNC, container, object);
+      return FALSE;
+    }
+
+  for (list = container->priv->handlers; list; list = g_list_next (list))
+    {
+      GimpContainerHandler *handler = list->data;
+      gulong                handler_id;
+
+      handler_id = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (object),
+                                                         handler->quark));
+
+      if (handler_id)
+        {
+          g_signal_handler_disconnect (object, handler_id);
+
+          g_object_set_qdata (G_OBJECT (object), handler->quark, NULL);
+        }
+    }
+
+  n_children = container->priv->n_children;
+
+  g_signal_emit (container, container_signals[REMOVE], 0, object);
+
+  if (n_children == container->priv->n_children)
+    {
+      g_warning ("%s: GimpContainer::remove() implementation did not "
+                 "chain up. Please report this at https://www.gimp.org/bugs/",
+                 G_STRFUNC);
+
+      container->priv->n_children--;
+    }
+
+  switch (container->priv->policy)
+    {
+    case GIMP_CONTAINER_POLICY_STRONG:
+      g_object_unref (object);
+      break;
+
+    case GIMP_CONTAINER_POLICY_WEAK:
+      g_signal_handlers_disconnect_by_func (object,
+                                            gimp_container_disconnect_callback,
+                                            container);
+      break;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_container_insert (GimpContainer *container,
+                       GimpObject    *object,
+                       gint           index)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (object != NULL, FALSE);
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (object,
+                                                    container->priv->children_type),
+                        FALSE);
+
+  g_return_val_if_fail (index >= -1 &&
+                        index <= container->priv->n_children, FALSE);
+
+  if (gimp_container_have (container, object))
+    {
+      g_warning ("%s: container %p already contains object %p",
+                 G_STRFUNC, container, object);
+      return FALSE;
+    }
+
+  if (gimp_container_add (container, object))
+    {
+      return gimp_container_reorder (container, object, index);
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_container_reorder (GimpContainer *container,
+                        GimpObject    *object,
+                        gint           new_index)
+{
+  gint index;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (object != NULL, FALSE);
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (object,
+                                                    container->priv->children_type),
+                        FALSE);
+
+  g_return_val_if_fail (new_index >= -1 &&
+                        new_index < container->priv->n_children, FALSE);
+
+  if (new_index == -1)
+    new_index = container->priv->n_children - 1;
+
+  index = gimp_container_get_child_index (container, object);
+
+  if (index == -1)
+    {
+      g_warning ("%s: container %p does not contain object %p",
+                 G_STRFUNC, container, object);
+      return FALSE;
+    }
+
+  if (index != new_index)
+    g_signal_emit (container, container_signals[REORDER], 0,
+                   object, new_index);
+
+  return TRUE;
+}
+
+void
+gimp_container_freeze (GimpContainer *container)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  container->priv->freeze_count++;
+
+  if (container->priv->freeze_count == 1)
+    g_signal_emit (container, container_signals[FREEZE], 0);
+}
+
+void
+gimp_container_thaw (GimpContainer *container)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  if (container->priv->freeze_count > 0)
+    container->priv->freeze_count--;
+
+  if (container->priv->freeze_count == 0)
+    g_signal_emit (container, container_signals[THAW], 0);
+}
+
+gboolean
+gimp_container_frozen (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+
+  return (container->priv->freeze_count > 0) ? TRUE : FALSE;
+}
+
+gint
+gimp_container_freeze_count (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), 0);
+
+  return container->priv->freeze_count;
+}
+
+void
+gimp_container_clear (GimpContainer *container)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  if (container->priv->n_children > 0)
+    {
+      gimp_container_freeze (container);
+      GIMP_CONTAINER_GET_CLASS (container)->clear (container);
+      gimp_container_thaw (container);
+    }
+}
+
+gboolean
+gimp_container_is_empty (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+
+  return (container->priv->n_children == 0);
+}
+
+gboolean
+gimp_container_have (GimpContainer *container,
+                     GimpObject    *object)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+
+  if (container->priv->n_children < 1)
+    return FALSE;
+
+  return GIMP_CONTAINER_GET_CLASS (container)->have (container, object);
+}
+
+void
+gimp_container_foreach (GimpContainer *container,
+                        GFunc          func,
+                        gpointer       user_data)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+  g_return_if_fail (func != NULL);
+
+  if (container->priv->n_children > 0)
+    GIMP_CONTAINER_GET_CLASS (container)->foreach (container, func, user_data);
+}
+
+GimpObject *
+gimp_container_search (GimpContainer           *container,
+                       GimpContainerSearchFunc  func,
+                       gpointer                 user_data)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (func != NULL, NULL);
+
+  if (container->priv->n_children > 0)
+    {
+      return GIMP_CONTAINER_GET_CLASS (container)->search (container,
+                                                           func, user_data);
+    }
+
+  return NULL;
+}
+
+gboolean
+gimp_container_get_unique_names (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+
+  if (GIMP_CONTAINER_GET_CLASS (container)->get_unique_names)
+    return GIMP_CONTAINER_GET_CLASS (container)->get_unique_names (container);
+
+  return FALSE;
+}
+
+GimpObject *
+gimp_container_get_child_by_name (GimpContainer *container,
+                                  const gchar   *name)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+
+  if (!name)
+    return NULL;
+
+  return GIMP_CONTAINER_GET_CLASS (container)->get_child_by_name (container,
+                                                                  name);
+}
+
+GimpObject *
+gimp_container_get_child_by_index (GimpContainer *container,
+                                   gint           index)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+
+  if (index < 0 || index >= container->priv->n_children)
+    return NULL;
+
+  return GIMP_CONTAINER_GET_CLASS (container)->get_child_by_index (container,
+                                                                   index);
+}
+
+/**
+ * gimp_container_get_first_child:
+ * @container: a #GimpContainer
+ *
+ * Return value: the first child object stored in @container or %NULL if the
+ *               container is empty
+ */
+GimpObject *
+gimp_container_get_first_child (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+
+  if (container->priv->n_children > 0)
+    return GIMP_CONTAINER_GET_CLASS (container)->get_child_by_index (container,
+                                                                     0);
+
+  return NULL;
+}
+
+/**
+ * gimp_container_get_last_child:
+ * @container: a #GimpContainer
+ *
+ * Return value: the last child object stored in @container or %NULL if the
+ *               container is empty
+ */
+GimpObject *
+gimp_container_get_last_child (GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+
+  if (container->priv->n_children > 0)
+    return GIMP_CONTAINER_GET_CLASS (container)->get_child_by_index (container,
+                                                                     container->priv->n_children - 1);
+
+  return NULL;
+}
+
+gint
+gimp_container_get_child_index (GimpContainer *container,
+                                GimpObject    *object)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), -1);
+  g_return_val_if_fail (object != NULL, -1);
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (object,
+                                                    container->priv->children_type),
+                        -1);
+
+  return GIMP_CONTAINER_GET_CLASS (container)->get_child_index (container,
+                                                                object);
+}
+
+GimpObject *
+gimp_container_get_neighbor_of (GimpContainer *container,
+                                GimpObject    *object)
+{
+  gint index;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_OBJECT (object), NULL);
+
+  index = gimp_container_get_child_index (container, object);
+
+  if (index != -1)
+    {
+      GimpObject *new;
+
+      new = gimp_container_get_child_by_index (container, index + 1);
+
+      if (! new && index > 0)
+        new = gimp_container_get_child_by_index (container, index - 1);
+
+      return new;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_container_get_name_array_foreach_func (GimpObject   *object,
+                                            gchar      ***iter)
+{
+  gchar **array = *iter;
+
+  *array = g_strdup (gimp_object_get_name (object));
+  (*iter)++;
+}
+
+gchar **
+gimp_container_get_name_array (GimpContainer *container,
+                               gint          *length)
+{
+  gchar **names;
+  gchar **iter;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (length != NULL, NULL);
+
+  *length = gimp_container_get_n_children (container);
+  if (*length == 0)
+    return NULL;
+
+  names = iter = g_new (gchar *, *length);
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_get_name_array_foreach_func,
+                          &iter);
+
+  return names;
+}
+
+static void
+gimp_container_add_handler_foreach_func (GimpObject           *object,
+                                         GimpContainerHandler *handler)
+{
+  gulong handler_id;
+
+  handler_id = g_signal_connect (object,
+                                 handler->signame,
+                                 handler->callback,
+                                 handler->callback_data);
+
+  g_object_set_qdata (G_OBJECT (object), handler->quark,
+                      GUINT_TO_POINTER (handler_id));
+}
+
+GQuark
+gimp_container_add_handler (GimpContainer *container,
+                            const gchar   *signame,
+                            GCallback      callback,
+                            gpointer       callback_data)
+{
+  GimpContainerHandler *handler;
+  gchar                *key;
+
+  static gint           handler_id = 0;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), 0);
+  g_return_val_if_fail (signame != NULL, 0);
+  g_return_val_if_fail (callback != NULL, 0);
+
+  if (! g_str_has_prefix (signame, "notify::"))
+    g_return_val_if_fail (g_signal_lookup (signame,
+                                           container->priv->children_type), 0);
+
+  handler = g_slice_new0 (GimpContainerHandler);
+
+  /*  create a unique key for this handler  */
+  key = g_strdup_printf ("%s-%d", signame, handler_id++);
+
+  handler->signame       = g_strdup (signame);
+  handler->callback      = callback;
+  handler->callback_data = callback_data;
+  handler->quark         = g_quark_from_string (key);
+
+  D (g_print ("%s: key = %s, id = %d\n", G_STRFUNC, key, handler->quark));
+
+  g_free (key);
+
+  container->priv->handlers = g_list_prepend (container->priv->handlers, handler);
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_add_handler_foreach_func,
+                          handler);
+
+  return handler->quark;
+}
+
+void
+gimp_container_remove_handler (GimpContainer *container,
+                               GQuark         id)
+{
+  GimpContainerHandler *handler;
+  GList                *list;
+
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+  g_return_if_fail (id != 0);
+
+  for (list = container->priv->handlers; list; list = g_list_next (list))
+    {
+      handler = (GimpContainerHandler *) list->data;
+
+      if (handler->quark == id)
+        break;
+    }
+
+  if (! list)
+    {
+      g_warning ("%s: tried to remove handler which unknown id %d",
+                 G_STRFUNC, id);
+      return;
+    }
+
+  gimp_container_free_handler (container, handler);
+
+  container->priv->handlers = g_list_delete_link (container->priv->handlers,
+                                                  list);
+}
+
+void
+gimp_container_remove_handlers_by_func (GimpContainer *container,
+                                        GCallback      callback,
+                                        gpointer       callback_data)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+  g_return_if_fail (callback != NULL);
+
+  list = container->priv->handlers;
+
+  while (list)
+    {
+      GimpContainerHandler *handler = list->data;
+      GList                *next    = g_list_next (list);
+
+      if (handler->callback      == callback &&
+          handler->callback_data == callback_data)
+        {
+          gimp_container_free_handler (container, handler);
+
+          container->priv->handlers = g_list_delete_link (
+            container->priv->handlers, list);
+        }
+
+      list = next;
+    }
+}
+
+void
+gimp_container_remove_handlers_by_data (GimpContainer *container,
+                                        gpointer       callback_data)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  list = container->priv->handlers;
+
+  while (list)
+    {
+      GimpContainerHandler *handler = list->data;
+      GList                *next    = g_list_next (list);
+
+      if (handler->callback_data == callback_data)
+        {
+          gimp_container_free_handler (container, handler);
+
+          container->priv->handlers = g_list_delete_link (
+            container->priv->handlers, list);
+        }
+
+      list = next;
+    }
+}
diff --git a/app/core/gimpcontainer.h b/app/core/gimpcontainer.h
new file mode 100644
index 0000000..88465b5
--- /dev/null
+++ b/app/core/gimpcontainer.h
@@ -0,0 +1,150 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainer.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_H__
+#define __GIMP_CONTAINER_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_CONTAINER            (gimp_container_get_type ())
+#define GIMP_CONTAINER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER, GimpContainer))
+#define GIMP_CONTAINER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER, GimpContainerClass))
+#define GIMP_IS_CONTAINER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER))
+#define GIMP_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER))
+#define GIMP_CONTAINER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER, GimpContainerClass))
+
+
+typedef gboolean (* GimpContainerSearchFunc) (GimpObject *object,
+                                              gpointer    user_data);
+
+
+typedef struct _GimpContainerClass   GimpContainerClass;
+typedef struct _GimpContainerPrivate GimpContainerPrivate;
+
+struct _GimpContainer
+{
+  GimpObject            parent_instance;
+
+  GimpContainerPrivate *priv;
+};
+
+struct _GimpContainerClass
+{
+  GimpObjectClass  parent_class;
+
+  /*  signals  */
+  void         (* add)                (GimpContainer           *container,
+                                       GimpObject              *object);
+  void         (* remove)             (GimpContainer           *container,
+                                       GimpObject              *object);
+  void         (* reorder)            (GimpContainer           *container,
+                                       GimpObject              *object,
+                                       gint                     new_index);
+  void         (* freeze)             (GimpContainer           *container);
+  void         (* thaw)               (GimpContainer           *container);
+
+  /*  virtual functions  */
+  void         (* clear)              (GimpContainer           *container);
+  gboolean     (* have)               (GimpContainer           *container,
+                                       GimpObject              *object);
+  void         (* foreach)            (GimpContainer           *container,
+                                       GFunc                    func,
+                                       gpointer                 user_data);
+  GimpObject * (* search)             (GimpContainer           *container,
+                                       GimpContainerSearchFunc  func,
+                                       gpointer                 user_data);
+  gboolean     (* get_unique_names)   (GimpContainer           *container);
+  GimpObject * (* get_child_by_name)  (GimpContainer           *container,
+                                       const gchar             *name);
+  GimpObject * (* get_child_by_index) (GimpContainer           *container,
+                                       gint                     index);
+  gint         (* get_child_index)    (GimpContainer           *container,
+                                       GimpObject              *object);
+};
+
+
+GType        gimp_container_get_type           (void) G_GNUC_CONST;
+
+GType        gimp_container_get_children_type  (GimpContainer           *container);
+GimpContainerPolicy gimp_container_get_policy  (GimpContainer           *container);
+gint         gimp_container_get_n_children     (GimpContainer           *container);
+
+gboolean     gimp_container_add                (GimpContainer           *container,
+                                                GimpObject              *object);
+gboolean     gimp_container_remove             (GimpContainer           *container,
+                                                GimpObject              *object);
+gboolean     gimp_container_insert             (GimpContainer           *container,
+                                                GimpObject              *object,
+                                                gint                     new_index);
+gboolean     gimp_container_reorder            (GimpContainer           *container,
+                                                GimpObject              *object,
+                                                gint                     new_index);
+
+void         gimp_container_freeze             (GimpContainer           *container);
+void         gimp_container_thaw               (GimpContainer           *container);
+gboolean     gimp_container_frozen             (GimpContainer           *container);
+gint         gimp_container_freeze_count       (GimpContainer           *container);
+
+void         gimp_container_clear              (GimpContainer           *container);
+gboolean     gimp_container_is_empty           (GimpContainer           *container);
+gboolean     gimp_container_have               (GimpContainer           *container,
+                                                GimpObject              *object);
+void         gimp_container_foreach            (GimpContainer           *container,
+                                                GFunc                    func,
+                                                gpointer                 user_data);
+GimpObject * gimp_container_search             (GimpContainer           *container,
+                                                GimpContainerSearchFunc  func,
+                                                gpointer                 user_data);
+
+gboolean     gimp_container_get_unique_names   (GimpContainer           *container);
+
+GimpObject * gimp_container_get_child_by_name  (GimpContainer           *container,
+                                                const gchar             *name);
+GimpObject * gimp_container_get_child_by_index (GimpContainer           *container,
+                                                gint                     index);
+GimpObject * gimp_container_get_first_child    (GimpContainer           *container);
+GimpObject * gimp_container_get_last_child     (GimpContainer           *container);
+gint         gimp_container_get_child_index    (GimpContainer           *container,
+                                                GimpObject              *object);
+
+GimpObject * gimp_container_get_neighbor_of    (GimpContainer           *container,
+                                                GimpObject              *object);
+
+gchar     ** gimp_container_get_name_array     (GimpContainer           *container,
+                                                gint                    *length);
+
+GQuark       gimp_container_add_handler        (GimpContainer           *container,
+                                                const gchar             *signame,
+                                                GCallback                callback,
+                                                gpointer                 callback_data);
+void         gimp_container_remove_handler     (GimpContainer           *container,
+                                                GQuark                   id);
+void         gimp_container_remove_handlers_by_func
+                                               (GimpContainer           *container,
+                                                GCallback                callback,
+                                                gpointer                 callback_data);
+void         gimp_container_remove_handlers_by_data
+                                               (GimpContainer           *container,
+                                                gpointer                 callback_data);
+
+
+#endif  /* __GIMP_CONTAINER_H__ */
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
new file mode 100644
index 0000000..3788583
--- /dev/null
+++ b/app/core/gimpcontext.c
@@ -0,0 +1,3828 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontext.c
+ * Copyright (C) 1999-2010 Michael Natterer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimp-memsize.h"
+#include "gimpbrush.h"
+#include "gimpbuffer.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpdatafactory.h"
+#include "gimpdynamics.h"
+#include "gimpimagefile.h"
+#include "gimpgradient.h"
+#include "gimpimage.h"
+#include "gimpmarshal.h"
+#include "gimpmybrush.h"
+#include "gimppaintinfo.h"
+#include "gimppalette.h"
+#include "gimppattern.h"
+#include "gimptemplate.h"
+#include "gimptoolinfo.h"
+#include "gimptoolpreset.h"
+
+#include "text/gimpfont.h"
+
+#include "gimp-intl.h"
+
+
+#define RGBA_EPSILON 1e-10
+
+typedef void (* GimpContextCopyPropFunc) (GimpContext *src,
+                                          GimpContext *dest);
+
+#define context_find_defined(context, prop)                              \
+  while (!(((context)->defined_props) & (1 << (prop))) && (context)->parent) \
+    (context) = (context)->parent
+
+#define COPY_NAME(src, dest, member)            \
+  g_free (dest->member);                        \
+  dest->member = g_strdup (src->member)
+
+
+/*  local function prototypes  */
+
+static void    gimp_context_config_iface_init (GimpConfigInterface   *iface);
+
+static void       gimp_context_constructed    (GObject               *object);
+static void       gimp_context_dispose        (GObject               *object);
+static void       gimp_context_finalize       (GObject               *object);
+static void       gimp_context_set_property   (GObject               *object,
+                                               guint                  property_id,
+                                               const GValue          *value,
+                                               GParamSpec            *pspec);
+static void       gimp_context_get_property   (GObject               *object,
+                                               guint                  property_id,
+                                               GValue                *value,
+                                               GParamSpec            *pspec);
+static gint64     gimp_context_get_memsize    (GimpObject            *object,
+                                               gint64                *gui_size);
+
+static gboolean   gimp_context_serialize            (GimpConfig       *config,
+                                                     GimpConfigWriter *writer,
+                                                     gpointer          data);
+static gboolean   gimp_context_deserialize          (GimpConfig       *config,
+                                                     GScanner         *scanner,
+                                                     gint              nest_level,
+                                                     gpointer          data);
+static gboolean   gimp_context_serialize_property   (GimpConfig       *config,
+                                                     guint             property_id,
+                                                     const GValue     *value,
+                                                     GParamSpec       *pspec,
+                                                     GimpConfigWriter *writer);
+static gboolean   gimp_context_deserialize_property (GimpConfig       *config,
+                                                     guint             property_id,
+                                                     GValue           *value,
+                                                     GParamSpec       *pspec,
+                                                     GScanner         *scanner,
+                                                     GTokenType       *expected);
+static GimpConfig * gimp_context_duplicate          (GimpConfig       *config);
+static gboolean     gimp_context_copy               (GimpConfig       *src,
+                                                     GimpConfig       *dest,
+                                                     GParamFlags       flags);
+
+/*  image  */
+static void gimp_context_image_removed       (GimpContainer    *container,
+                                              GimpImage        *image,
+                                              GimpContext      *context);
+static void gimp_context_real_set_image      (GimpContext      *context,
+                                              GimpImage        *image);
+
+/*  display  */
+static void gimp_context_display_removed     (GimpContainer    *container,
+                                              gpointer          display,
+                                              GimpContext      *context);
+static void gimp_context_real_set_display    (GimpContext      *context,
+                                              gpointer          display);
+
+/*  tool  */
+static void gimp_context_tool_dirty          (GimpToolInfo     *tool_info,
+                                              GimpContext      *context);
+static void gimp_context_tool_removed        (GimpContainer    *container,
+                                              GimpToolInfo     *tool_info,
+                                              GimpContext      *context);
+static void gimp_context_tool_list_thaw      (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_tool       (GimpContext      *context,
+                                              GimpToolInfo     *tool_info);
+
+/*  paint info  */
+static void gimp_context_paint_info_dirty    (GimpPaintInfo    *paint_info,
+                                              GimpContext      *context);
+static void gimp_context_paint_info_removed  (GimpContainer    *container,
+                                              GimpPaintInfo    *paint_info,
+                                              GimpContext      *context);
+static void gimp_context_paint_info_list_thaw(GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_paint_info (GimpContext      *context,
+                                              GimpPaintInfo    *paint_info);
+
+/*  foreground  */
+static void gimp_context_real_set_foreground (GimpContext      *context,
+                                              const GimpRGB    *color);
+
+/*  background  */
+static void gimp_context_real_set_background (GimpContext      *context,
+                                              const GimpRGB    *color);
+
+/*  opacity  */
+static void gimp_context_real_set_opacity    (GimpContext      *context,
+                                              gdouble           opacity);
+
+/*  paint mode  */
+static void gimp_context_real_set_paint_mode (GimpContext      *context,
+                                              GimpLayerMode     paint_mode);
+
+/*  brush  */
+static void gimp_context_brush_dirty         (GimpBrush        *brush,
+                                              GimpContext      *context);
+static void gimp_context_brush_removed       (GimpContainer    *brush_list,
+                                              GimpBrush        *brush,
+                                              GimpContext      *context);
+static void gimp_context_brush_list_thaw     (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_brush      (GimpContext      *context,
+                                              GimpBrush        *brush);
+
+/*  dynamics  */
+
+static void gimp_context_dynamics_dirty      (GimpDynamics     *dynamics,
+                                              GimpContext      *context);
+static void gimp_context_dynamics_removed    (GimpContainer    *container,
+                                              GimpDynamics     *dynamics,
+                                              GimpContext      *context);
+static void gimp_context_dynamics_list_thaw  (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_dynamics   (GimpContext      *context,
+                                              GimpDynamics     *dynamics);
+
+/*  mybrush  */
+static void gimp_context_mybrush_dirty       (GimpMybrush      *brush,
+                                              GimpContext      *context);
+static void gimp_context_mybrush_removed     (GimpContainer    *brush_list,
+                                              GimpMybrush      *brush,
+                                              GimpContext      *context);
+static void gimp_context_mybrush_list_thaw   (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_mybrush    (GimpContext      *context,
+                                              GimpMybrush      *brush);
+
+/*  pattern  */
+static void gimp_context_pattern_dirty       (GimpPattern      *pattern,
+                                              GimpContext      *context);
+static void gimp_context_pattern_removed     (GimpContainer    *container,
+                                              GimpPattern      *pattern,
+                                              GimpContext      *context);
+static void gimp_context_pattern_list_thaw   (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_pattern    (GimpContext      *context,
+                                              GimpPattern      *pattern);
+
+/*  gradient  */
+static void gimp_context_gradient_dirty      (GimpGradient     *gradient,
+                                              GimpContext      *context);
+static void gimp_context_gradient_removed    (GimpContainer    *container,
+                                              GimpGradient     *gradient,
+                                              GimpContext      *context);
+static void gimp_context_gradient_list_thaw  (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_gradient   (GimpContext      *context,
+                                              GimpGradient     *gradient);
+
+/*  palette  */
+static void gimp_context_palette_dirty       (GimpPalette      *palette,
+                                              GimpContext      *context);
+static void gimp_context_palette_removed     (GimpContainer    *container,
+                                              GimpPalette      *palette,
+                                              GimpContext      *context);
+static void gimp_context_palette_list_thaw   (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_palette    (GimpContext      *context,
+                                              GimpPalette      *palette);
+
+/*  font  */
+static void gimp_context_font_dirty          (GimpFont         *font,
+                                              GimpContext      *context);
+static void gimp_context_font_removed        (GimpContainer    *container,
+                                              GimpFont         *font,
+                                              GimpContext      *context);
+static void gimp_context_font_list_thaw      (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_font       (GimpContext      *context,
+                                              GimpFont         *font);
+
+/*  tool preset  */
+static void gimp_context_tool_preset_dirty     (GimpToolPreset   *tool_preset,
+                                                GimpContext      *context);
+static void gimp_context_tool_preset_removed   (GimpContainer    *container,
+                                                GimpToolPreset   *tool_preset,
+                                                GimpContext      *context);
+static void gimp_context_tool_preset_list_thaw (GimpContainer    *container,
+                                                GimpContext      *context);
+static void gimp_context_real_set_tool_preset  (GimpContext      *context,
+                                                GimpToolPreset   *tool_preset);
+
+/*  buffer  */
+static void gimp_context_buffer_dirty        (GimpBuffer       *buffer,
+                                              GimpContext      *context);
+static void gimp_context_buffer_removed      (GimpContainer    *container,
+                                              GimpBuffer       *buffer,
+                                              GimpContext      *context);
+static void gimp_context_buffer_list_thaw    (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_buffer     (GimpContext      *context,
+                                              GimpBuffer       *buffer);
+
+/*  imagefile  */
+static void gimp_context_imagefile_dirty     (GimpImagefile    *imagefile,
+                                              GimpContext      *context);
+static void gimp_context_imagefile_removed   (GimpContainer    *container,
+                                              GimpImagefile    *imagefile,
+                                              GimpContext      *context);
+static void gimp_context_imagefile_list_thaw (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_imagefile  (GimpContext      *context,
+                                              GimpImagefile    *imagefile);
+
+/*  template  */
+static void gimp_context_template_dirty      (GimpTemplate     *template,
+                                              GimpContext      *context);
+static void gimp_context_template_removed    (GimpContainer    *container,
+                                              GimpTemplate     *template,
+                                              GimpContext      *context);
+static void gimp_context_template_list_thaw  (GimpContainer    *container,
+                                              GimpContext      *context);
+static void gimp_context_real_set_template   (GimpContext      *context,
+                                              GimpTemplate     *template);
+
+
+/*  utilities  */
+static gpointer gimp_context_find_object     (GimpContext      *context,
+                                              GimpContainer    *container,
+                                              const gchar      *object_name,
+                                              gpointer          standard_object);
+
+
+/*  properties & signals  */
+
+enum
+{
+  GIMP_CONTEXT_PROP_0,
+  GIMP_CONTEXT_PROP_GIMP
+
+  /*  remaining values are in core-enums.h  (GimpContextPropType)  */
+};
+
+enum
+{
+  DUMMY_0,
+  DUMMY_1,
+  IMAGE_CHANGED,
+  DISPLAY_CHANGED,
+  TOOL_CHANGED,
+  PAINT_INFO_CHANGED,
+  FOREGROUND_CHANGED,
+  BACKGROUND_CHANGED,
+  OPACITY_CHANGED,
+  PAINT_MODE_CHANGED,
+  BRUSH_CHANGED,
+  DYNAMICS_CHANGED,
+  MYBRUSH_CHANGED,
+  PATTERN_CHANGED,
+  GRADIENT_CHANGED,
+  PALETTE_CHANGED,
+  FONT_CHANGED,
+  TOOL_PRESET_CHANGED,
+  BUFFER_CHANGED,
+  IMAGEFILE_CHANGED,
+  TEMPLATE_CHANGED,
+  PROP_NAME_CHANGED,
+  LAST_SIGNAL
+};
+
+static const gchar * const gimp_context_prop_names[] =
+{
+  NULL, /* PROP_0 */
+  "gimp",
+  "image",
+  "display",
+  "tool",
+  "paint-info",
+  "foreground",
+  "background",
+  "opacity",
+  "paint-mode",
+  "brush",
+  "dynamics",
+  "mybrush",
+  "pattern",
+  "gradient",
+  "palette",
+  "font",
+  "tool-preset",
+  "buffer",
+  "imagefile",
+  "template"
+};
+
+static GType gimp_context_prop_types[] =
+{
+  G_TYPE_NONE, /* PROP_0    */
+  G_TYPE_NONE, /* PROP_GIMP */
+  0,
+  G_TYPE_NONE,
+  0,
+  0,
+  G_TYPE_NONE,
+  G_TYPE_NONE,
+  G_TYPE_NONE,
+  G_TYPE_NONE,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0
+};
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContext, gimp_context, GIMP_TYPE_VIEWABLE,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_context_config_iface_init))
+
+#define parent_class gimp_context_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+static guint gimp_context_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_context_class_init (GimpContextClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpRGB          black;
+  GimpRGB          white;
+
+  gimp_rgba_set (&black, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&white, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+
+  gimp_context_signals[IMAGE_CHANGED] =
+    g_signal_new ("image-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, image_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_IMAGE);
+
+  gimp_context_signals[DISPLAY_CHANGED] =
+    g_signal_new ("display-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, display_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_OBJECT);
+
+  gimp_context_signals[TOOL_CHANGED] =
+    g_signal_new ("tool-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, tool_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_TOOL_INFO);
+
+  gimp_context_signals[PAINT_INFO_CHANGED] =
+    g_signal_new ("paint-info-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, paint_info_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PAINT_INFO);
+
+  gimp_context_signals[FOREGROUND_CHANGED] =
+    g_signal_new ("foreground-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, foreground_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__BOXED,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_RGB | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  gimp_context_signals[BACKGROUND_CHANGED] =
+    g_signal_new ("background-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, background_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__BOXED,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_RGB | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  gimp_context_signals[OPACITY_CHANGED] =
+    g_signal_new ("opacity-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, opacity_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__DOUBLE,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_DOUBLE);
+
+  gimp_context_signals[PAINT_MODE_CHANGED] =
+    g_signal_new ("paint-mode-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, paint_mode_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_LAYER_MODE);
+
+  gimp_context_signals[BRUSH_CHANGED] =
+    g_signal_new ("brush-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, brush_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_BRUSH);
+
+  gimp_context_signals[DYNAMICS_CHANGED] =
+    g_signal_new ("dynamics-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, dynamics_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DYNAMICS);
+
+  gimp_context_signals[MYBRUSH_CHANGED] =
+    g_signal_new ("mybrush-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, mybrush_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_MYBRUSH);
+
+  gimp_context_signals[PATTERN_CHANGED] =
+    g_signal_new ("pattern-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, pattern_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PATTERN);
+
+  gimp_context_signals[GRADIENT_CHANGED] =
+    g_signal_new ("gradient-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, gradient_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_GRADIENT);
+
+  gimp_context_signals[PALETTE_CHANGED] =
+    g_signal_new ("palette-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, palette_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PALETTE);
+
+  gimp_context_signals[FONT_CHANGED] =
+    g_signal_new ("font-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, font_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_FONT);
+
+  gimp_context_signals[TOOL_PRESET_CHANGED] =
+    g_signal_new ("tool-preset-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, tool_preset_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_TOOL_PRESET);
+
+  gimp_context_signals[BUFFER_CHANGED] =
+    g_signal_new ("buffer-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, buffer_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_BUFFER);
+
+  gimp_context_signals[IMAGEFILE_CHANGED] =
+    g_signal_new ("imagefile-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, imagefile_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_IMAGEFILE);
+
+  gimp_context_signals[TEMPLATE_CHANGED] =
+    g_signal_new ("template-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, template_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_TEMPLATE);
+
+  gimp_context_signals[PROP_NAME_CHANGED] =
+    g_signal_new ("prop-name-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContextClass, prop_name_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+
+  object_class->constructed      = gimp_context_constructed;
+  object_class->set_property     = gimp_context_set_property;
+  object_class->get_property     = gimp_context_get_property;
+  object_class->dispose          = gimp_context_dispose;
+  object_class->finalize         = gimp_context_finalize;
+
+  gimp_object_class->get_memsize = gimp_context_get_memsize;
+
+  klass->image_changed           = NULL;
+  klass->display_changed         = NULL;
+  klass->tool_changed            = NULL;
+  klass->paint_info_changed      = NULL;
+  klass->foreground_changed      = NULL;
+  klass->background_changed      = NULL;
+  klass->opacity_changed         = NULL;
+  klass->paint_mode_changed      = NULL;
+  klass->brush_changed           = NULL;
+  klass->dynamics_changed        = NULL;
+  klass->mybrush_changed         = NULL;
+  klass->pattern_changed         = NULL;
+  klass->gradient_changed        = NULL;
+  klass->palette_changed         = NULL;
+  klass->font_changed            = NULL;
+  klass->tool_preset_changed     = NULL;
+  klass->buffer_changed          = NULL;
+  klass->imagefile_changed       = NULL;
+  klass->template_changed        = NULL;
+  klass->prop_name_changed       = NULL;
+
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_IMAGE]       = GIMP_TYPE_IMAGE;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_TOOL]        = GIMP_TYPE_TOOL_INFO;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_PAINT_INFO]  = GIMP_TYPE_PAINT_INFO;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_BRUSH]       = GIMP_TYPE_BRUSH;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_DYNAMICS]    = GIMP_TYPE_DYNAMICS;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_MYBRUSH]     = GIMP_TYPE_MYBRUSH;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_PATTERN]     = GIMP_TYPE_PATTERN;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_GRADIENT]    = GIMP_TYPE_GRADIENT;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_PALETTE]     = GIMP_TYPE_PALETTE;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_FONT]        = GIMP_TYPE_FONT;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_TOOL_PRESET] = GIMP_TYPE_TOOL_PRESET;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_BUFFER]      = GIMP_TYPE_BUFFER;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_IMAGEFILE]   = GIMP_TYPE_IMAGEFILE;
+  gimp_context_prop_types[GIMP_CONTEXT_PROP_TEMPLATE]    = GIMP_TYPE_TEMPLATE;
+
+  g_object_class_install_property (object_class, GIMP_CONTEXT_PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, GIMP_CONTEXT_PROP_IMAGE,
+                                   g_param_spec_object (gimp_context_prop_names[GIMP_CONTEXT_PROP_IMAGE],
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, GIMP_CONTEXT_PROP_DISPLAY,
+                                   g_param_spec_object (gimp_context_prop_names[GIMP_CONTEXT_PROP_DISPLAY],
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_OBJECT,
+                                                        GIMP_PARAM_READWRITE));
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_TOOL,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_TOOL],
+                           NULL, NULL,
+                           GIMP_TYPE_TOOL_INFO,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_PAINT_INFO,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_PAINT_INFO],
+                           NULL, NULL,
+                           GIMP_TYPE_PAINT_INFO,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, GIMP_CONTEXT_PROP_FOREGROUND,
+                        gimp_context_prop_names[GIMP_CONTEXT_PROP_FOREGROUND],
+                        _("Foreground"),
+                        _("Foreground color"),
+                         FALSE, &black,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, GIMP_CONTEXT_PROP_BACKGROUND,
+                        gimp_context_prop_names[GIMP_CONTEXT_PROP_BACKGROUND],
+                        _("Background"),
+                        _("Background color"),
+                        FALSE, &white,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, GIMP_CONTEXT_PROP_OPACITY,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_OPACITY],
+                           _("Opacity"),
+                           _("Opacity"),
+                           GIMP_OPACITY_TRANSPARENT,
+                           GIMP_OPACITY_OPAQUE,
+                           GIMP_OPACITY_OPAQUE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, GIMP_CONTEXT_PROP_PAINT_MODE,
+                         gimp_context_prop_names[GIMP_CONTEXT_PROP_PAINT_MODE],
+                         _("Paint Mode"),
+                         _("Paint Mode"),
+                         GIMP_TYPE_LAYER_MODE,
+                         GIMP_LAYER_MODE_NORMAL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_BRUSH,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_BRUSH],
+                           _("Brush"),
+                           _("Brush"),
+                           GIMP_TYPE_BRUSH,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_DYNAMICS,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_DYNAMICS],
+                           _("Dynamics"),
+                           _("Paint dynamics"),
+                           GIMP_TYPE_DYNAMICS,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_MYBRUSH,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_MYBRUSH],
+                           _("MyPaint Brush"),
+                           _("MyPaint Brush"),
+                           GIMP_TYPE_MYBRUSH,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_PATTERN,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_PATTERN],
+                           _("Pattern"),
+                           _("Pattern"),
+                           GIMP_TYPE_PATTERN,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_GRADIENT,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_GRADIENT],
+                           _("Gradient"),
+                           _("Gradient"),
+                           GIMP_TYPE_GRADIENT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_PALETTE,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_PALETTE],
+                           _("Palette"),
+                           _("Palette"),
+                           GIMP_TYPE_PALETTE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_FONT,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_FONT],
+                           _("Font"),
+                           _("Font"),
+                           GIMP_TYPE_FONT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_TOOL_PRESET,
+                           gimp_context_prop_names[GIMP_CONTEXT_PROP_TOOL_PRESET],
+                           _("Tool Preset"),
+                           _("Tool Preset"),
+                           GIMP_TYPE_TOOL_PRESET,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, GIMP_CONTEXT_PROP_BUFFER,
+                                   g_param_spec_object (gimp_context_prop_names[GIMP_CONTEXT_PROP_BUFFER],
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_BUFFER,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, GIMP_CONTEXT_PROP_IMAGEFILE,
+                                   g_param_spec_object (gimp_context_prop_names[GIMP_CONTEXT_PROP_IMAGEFILE],
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_IMAGEFILE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, GIMP_CONTEXT_PROP_TEMPLATE,
+                                   g_param_spec_object (gimp_context_prop_names[GIMP_CONTEXT_PROP_TEMPLATE],
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TEMPLATE,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_context_init (GimpContext *context)
+{
+  context->gimp            = NULL;
+
+  context->parent          = NULL;
+
+  context->defined_props   = GIMP_CONTEXT_PROP_MASK_ALL;
+  context->serialize_props = GIMP_CONTEXT_PROP_MASK_ALL;
+
+  context->image           = NULL;
+  context->display         = NULL;
+
+  context->tool_info       = NULL;
+  context->tool_name       = NULL;
+
+  context->paint_info      = NULL;
+  context->paint_name      = NULL;
+
+  context->brush           = NULL;
+  context->brush_name      = NULL;
+
+  context->dynamics        = NULL;
+  context->dynamics_name   = NULL;
+
+  context->mybrush         = NULL;
+  context->mybrush_name    = NULL;
+
+  context->pattern         = NULL;
+  context->pattern_name    = NULL;
+
+  context->gradient        = NULL;
+  context->gradient_name   = NULL;
+
+  context->palette         = NULL;
+  context->palette_name    = NULL;
+
+  context->font            = NULL;
+  context->font_name       = NULL;
+
+  context->tool_preset      = NULL;
+  context->tool_preset_name = NULL;
+
+  context->buffer          = NULL;
+  context->buffer_name     = NULL;
+
+  context->imagefile       = NULL;
+  context->imagefile_name  = NULL;
+
+  context->template        = NULL;
+  context->template_name   = NULL;
+}
+
+static void
+gimp_context_config_iface_init (GimpConfigInterface *iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_config_iface)
+    parent_config_iface = g_type_default_interface_peek (GIMP_TYPE_CONFIG);
+
+  iface->serialize            = gimp_context_serialize;
+  iface->deserialize          = gimp_context_deserialize;
+  iface->serialize_property   = gimp_context_serialize_property;
+  iface->deserialize_property = gimp_context_deserialize_property;
+  iface->duplicate            = gimp_context_duplicate;
+  iface->copy                 = gimp_context_copy;
+}
+
+static void
+gimp_context_constructed (GObject *object)
+{
+  Gimp          *gimp;
+  GimpContainer *container;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp = GIMP_CONTEXT (object)->gimp;
+
+  gimp_assert (GIMP_IS_GIMP (gimp));
+
+  gimp->context_list = g_list_prepend (gimp->context_list, object);
+
+  g_signal_connect_object (gimp->images, "remove",
+                           G_CALLBACK (gimp_context_image_removed),
+                           object, 0);
+  g_signal_connect_object (gimp->displays, "remove",
+                           G_CALLBACK (gimp_context_display_removed),
+                           object, 0);
+
+  g_signal_connect_object (gimp->tool_info_list, "remove",
+                           G_CALLBACK (gimp_context_tool_removed),
+                           object, 0);
+  g_signal_connect_object (gimp->tool_info_list, "thaw",
+                           G_CALLBACK (gimp_context_tool_list_thaw),
+                           object, 0);
+
+  g_signal_connect_object (gimp->paint_info_list, "remove",
+                           G_CALLBACK (gimp_context_paint_info_removed),
+                           object, 0);
+  g_signal_connect_object (gimp->paint_info_list, "thaw",
+                           G_CALLBACK (gimp_context_paint_info_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->brush_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_brush_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_brush_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->dynamics_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_dynamics_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_dynamics_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->mybrush_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_mybrush_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_mybrush_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->pattern_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_pattern_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_pattern_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->gradient_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_gradient_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_gradient_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->palette_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_palette_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_palette_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->font_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_font_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_font_list_thaw),
+                           object, 0);
+
+  container = gimp_data_factory_get_container (gimp->tool_preset_factory);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_context_tool_preset_removed),
+                           object, 0);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_context_tool_preset_list_thaw),
+                           object, 0);
+
+  g_signal_connect_object (gimp->named_buffers, "remove",
+                           G_CALLBACK (gimp_context_buffer_removed),
+                           object, 0);
+  g_signal_connect_object (gimp->named_buffers, "thaw",
+                           G_CALLBACK (gimp_context_buffer_list_thaw),
+                           object, 0);
+
+  g_signal_connect_object (gimp->documents, "remove",
+                           G_CALLBACK (gimp_context_imagefile_removed),
+                           object, 0);
+  g_signal_connect_object (gimp->documents, "thaw",
+                           G_CALLBACK (gimp_context_imagefile_list_thaw),
+                           object, 0);
+
+  g_signal_connect_object (gimp->templates, "remove",
+                           G_CALLBACK (gimp_context_template_removed),
+                           object, 0);
+  g_signal_connect_object (gimp->templates, "thaw",
+                           G_CALLBACK (gimp_context_template_list_thaw),
+                           object, 0);
+
+  gimp_context_set_paint_info (GIMP_CONTEXT (object),
+                               gimp_paint_info_get_standard (gimp));
+}
+
+static void
+gimp_context_dispose (GObject *object)
+{
+  GimpContext *context = GIMP_CONTEXT (object);
+
+  gimp_context_set_parent (context, NULL);
+
+  if (context->gimp)
+    {
+      context->gimp->context_list = g_list_remove (context->gimp->context_list,
+                                                   context);
+      context->gimp = NULL;
+    }
+
+  g_clear_object (&context->tool_info);
+  g_clear_object (&context->paint_info);
+  g_clear_object (&context->brush);
+  g_clear_object (&context->dynamics);
+  g_clear_object (&context->mybrush);
+  g_clear_object (&context->pattern);
+  g_clear_object (&context->gradient);
+  g_clear_object (&context->palette);
+  g_clear_object (&context->font);
+  g_clear_object (&context->tool_preset);
+  g_clear_object (&context->buffer);
+  g_clear_object (&context->imagefile);
+  g_clear_object (&context->template);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_context_finalize (GObject *object)
+{
+  GimpContext *context = GIMP_CONTEXT (object);
+
+  context->parent  = NULL;
+  context->image   = NULL;
+  context->display = NULL;
+
+  g_clear_pointer (&context->tool_name,        g_free);
+  g_clear_pointer (&context->paint_name,       g_free);
+  g_clear_pointer (&context->brush_name,       g_free);
+  g_clear_pointer (&context->dynamics_name,    g_free);
+  g_clear_pointer (&context->mybrush_name,     g_free);
+  g_clear_pointer (&context->pattern_name,     g_free);
+  g_clear_pointer (&context->gradient_name,    g_free);
+  g_clear_pointer (&context->palette_name,     g_free);
+  g_clear_pointer (&context->font_name,        g_free);
+  g_clear_pointer (&context->tool_preset_name, g_free);
+  g_clear_pointer (&context->buffer_name,      g_free);
+  g_clear_pointer (&context->imagefile_name,   g_free);
+  g_clear_pointer (&context->template_name,    g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_context_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GimpContext *context = GIMP_CONTEXT (object);
+
+  switch (property_id)
+    {
+    case GIMP_CONTEXT_PROP_GIMP:
+      context->gimp = g_value_get_object (value);
+      break;
+    case GIMP_CONTEXT_PROP_IMAGE:
+      gimp_context_set_image (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_DISPLAY:
+      gimp_context_set_display (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_TOOL:
+      gimp_context_set_tool (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_PAINT_INFO:
+      gimp_context_set_paint_info (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_FOREGROUND:
+      gimp_context_set_foreground (context, g_value_get_boxed (value));
+      break;
+    case GIMP_CONTEXT_PROP_BACKGROUND:
+      gimp_context_set_background (context, g_value_get_boxed (value));
+      break;
+    case GIMP_CONTEXT_PROP_OPACITY:
+      gimp_context_set_opacity (context, g_value_get_double (value));
+      break;
+    case GIMP_CONTEXT_PROP_PAINT_MODE:
+      gimp_context_set_paint_mode (context, g_value_get_enum (value));
+      break;
+    case GIMP_CONTEXT_PROP_BRUSH:
+      gimp_context_set_brush (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_DYNAMICS:
+      gimp_context_set_dynamics (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_MYBRUSH:
+      gimp_context_set_mybrush (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_PATTERN:
+      gimp_context_set_pattern (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_GRADIENT:
+      gimp_context_set_gradient (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_PALETTE:
+      gimp_context_set_palette (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_FONT:
+      gimp_context_set_font (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_TOOL_PRESET:
+      gimp_context_set_tool_preset (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_BUFFER:
+      gimp_context_set_buffer (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_IMAGEFILE:
+      gimp_context_set_imagefile (context, g_value_get_object (value));
+      break;
+    case GIMP_CONTEXT_PROP_TEMPLATE:
+      gimp_context_set_template (context, g_value_get_object (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_context_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GimpContext *context = GIMP_CONTEXT (object);
+
+  switch (property_id)
+    {
+    case GIMP_CONTEXT_PROP_GIMP:
+      g_value_set_object (value, context->gimp);
+      break;
+    case GIMP_CONTEXT_PROP_IMAGE:
+      g_value_set_object (value, gimp_context_get_image (context));
+      break;
+    case GIMP_CONTEXT_PROP_DISPLAY:
+      g_value_set_object (value, gimp_context_get_display (context));
+      break;
+    case GIMP_CONTEXT_PROP_TOOL:
+      g_value_set_object (value, gimp_context_get_tool (context));
+      break;
+    case GIMP_CONTEXT_PROP_PAINT_INFO:
+      g_value_set_object (value, gimp_context_get_paint_info (context));
+      break;
+    case GIMP_CONTEXT_PROP_FOREGROUND:
+      {
+        GimpRGB color;
+
+        gimp_context_get_foreground (context, &color);
+        g_value_set_boxed (value, &color);
+      }
+      break;
+    case GIMP_CONTEXT_PROP_BACKGROUND:
+      {
+        GimpRGB color;
+
+        gimp_context_get_background (context, &color);
+        g_value_set_boxed (value, &color);
+      }
+      break;
+    case GIMP_CONTEXT_PROP_OPACITY:
+      g_value_set_double (value, gimp_context_get_opacity (context));
+      break;
+    case GIMP_CONTEXT_PROP_PAINT_MODE:
+      g_value_set_enum (value, gimp_context_get_paint_mode (context));
+      break;
+    case GIMP_CONTEXT_PROP_BRUSH:
+      g_value_set_object (value, gimp_context_get_brush (context));
+      break;
+    case GIMP_CONTEXT_PROP_DYNAMICS:
+      g_value_set_object (value, gimp_context_get_dynamics (context));
+      break;
+    case GIMP_CONTEXT_PROP_MYBRUSH:
+      g_value_set_object (value, gimp_context_get_mybrush (context));
+      break;
+    case GIMP_CONTEXT_PROP_PATTERN:
+      g_value_set_object (value, gimp_context_get_pattern (context));
+      break;
+    case GIMP_CONTEXT_PROP_GRADIENT:
+      g_value_set_object (value, gimp_context_get_gradient (context));
+      break;
+    case GIMP_CONTEXT_PROP_PALETTE:
+      g_value_set_object (value, gimp_context_get_palette (context));
+      break;
+    case GIMP_CONTEXT_PROP_FONT:
+      g_value_set_object (value, gimp_context_get_font (context));
+      break;
+    case GIMP_CONTEXT_PROP_TOOL_PRESET:
+      g_value_set_object (value, gimp_context_get_tool_preset (context));
+      break;
+    case GIMP_CONTEXT_PROP_BUFFER:
+      g_value_set_object (value, gimp_context_get_buffer (context));
+      break;
+    case GIMP_CONTEXT_PROP_IMAGEFILE:
+      g_value_set_object (value, gimp_context_get_imagefile (context));
+      break;
+    case GIMP_CONTEXT_PROP_TEMPLATE:
+      g_value_set_object (value, gimp_context_get_template (context));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_context_get_memsize (GimpObject *object,
+                          gint64     *gui_size)
+{
+  GimpContext *context = GIMP_CONTEXT (object);
+  gint64       memsize = 0;
+
+  memsize += gimp_string_get_memsize (context->tool_name);
+  memsize += gimp_string_get_memsize (context->paint_name);
+  memsize += gimp_string_get_memsize (context->brush_name);
+  memsize += gimp_string_get_memsize (context->dynamics_name);
+  memsize += gimp_string_get_memsize (context->mybrush_name);
+  memsize += gimp_string_get_memsize (context->pattern_name);
+  memsize += gimp_string_get_memsize (context->palette_name);
+  memsize += gimp_string_get_memsize (context->font_name);
+  memsize += gimp_string_get_memsize (context->tool_preset_name);
+  memsize += gimp_string_get_memsize (context->buffer_name);
+  memsize += gimp_string_get_memsize (context->imagefile_name);
+  memsize += gimp_string_get_memsize (context->template_name);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_context_serialize (GimpConfig       *config,
+                        GimpConfigWriter *writer,
+                        gpointer          data)
+{
+  return gimp_config_serialize_changed_properties (config, writer);
+}
+
+static gboolean
+gimp_context_deserialize (GimpConfig *config,
+                          GScanner   *scanner,
+                          gint        nest_level,
+                          gpointer    data)
+{
+  GimpContext   *context        = GIMP_CONTEXT (config);
+  GimpLayerMode  old_paint_mode = context->paint_mode;
+  gboolean       success;
+
+  success = gimp_config_deserialize_properties (config, scanner, nest_level);
+
+  if (context->paint_mode != old_paint_mode)
+    {
+      if (context->paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        g_object_set (context,
+                      "paint-mode", GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+                      NULL);
+    }
+
+  return success;
+}
+
+static gboolean
+gimp_context_serialize_property (GimpConfig       *config,
+                                 guint             property_id,
+                                 const GValue     *value,
+                                 GParamSpec       *pspec,
+                                 GimpConfigWriter *writer)
+{
+  GimpContext *context = GIMP_CONTEXT (config);
+  GimpObject  *serialize_obj;
+
+  /*  serialize nothing if the property is not in serialize_props  */
+  if (! ((1 << property_id) & context->serialize_props))
+    return TRUE;
+
+  switch (property_id)
+    {
+    case GIMP_CONTEXT_PROP_TOOL:
+    case GIMP_CONTEXT_PROP_PAINT_INFO:
+    case GIMP_CONTEXT_PROP_BRUSH:
+    case GIMP_CONTEXT_PROP_DYNAMICS:
+    case GIMP_CONTEXT_PROP_MYBRUSH:
+    case GIMP_CONTEXT_PROP_PATTERN:
+    case GIMP_CONTEXT_PROP_GRADIENT:
+    case GIMP_CONTEXT_PROP_PALETTE:
+    case GIMP_CONTEXT_PROP_FONT:
+    case GIMP_CONTEXT_PROP_TOOL_PRESET:
+      serialize_obj = g_value_get_object (value);
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  gimp_config_writer_open (writer, pspec->name);
+
+  if (serialize_obj)
+    gimp_config_writer_string (writer, gimp_object_get_name (serialize_obj));
+  else
+    gimp_config_writer_print (writer, "NULL", 4);
+
+  gimp_config_writer_close (writer);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_context_deserialize_property (GimpConfig *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec,
+                                   GScanner   *scanner,
+                                   GTokenType *expected)
+{
+  GimpContext   *context = GIMP_CONTEXT (object);
+  GimpContainer *container;
+  gpointer       standard;
+  gchar        **name_loc;
+  gchar         *object_name;
+
+  switch (property_id)
+    {
+    case GIMP_CONTEXT_PROP_TOOL:
+      container = context->gimp->tool_info_list;
+      standard  = gimp_tool_info_get_standard (context->gimp);
+      name_loc  = &context->tool_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_PAINT_INFO:
+      container = context->gimp->paint_info_list;
+      standard  = gimp_paint_info_get_standard (context->gimp);
+      name_loc  = &context->paint_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_BRUSH:
+      container = gimp_data_factory_get_container (context->gimp->brush_factory);
+      standard  = gimp_brush_get_standard (context);
+      name_loc  = &context->brush_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_DYNAMICS:
+      container = gimp_data_factory_get_container (context->gimp->dynamics_factory);
+      standard  = gimp_dynamics_get_standard (context);
+      name_loc  = &context->dynamics_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_MYBRUSH:
+      container = gimp_data_factory_get_container (context->gimp->mybrush_factory);
+      standard  = gimp_mybrush_get_standard (context);
+      name_loc  = &context->mybrush_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_PATTERN:
+      container = gimp_data_factory_get_container (context->gimp->pattern_factory);
+      standard  = gimp_pattern_get_standard (context);
+      name_loc  = &context->pattern_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_GRADIENT:
+      container = gimp_data_factory_get_container (context->gimp->gradient_factory);
+      standard  = gimp_gradient_get_standard (context);
+      name_loc  = &context->gradient_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_PALETTE:
+      container = gimp_data_factory_get_container (context->gimp->palette_factory);
+      standard  = gimp_palette_get_standard (context);
+      name_loc  = &context->palette_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_FONT:
+      container = gimp_data_factory_get_container (context->gimp->font_factory);
+      standard  = gimp_font_get_standard ();
+      name_loc  = &context->font_name;
+      break;
+
+    case GIMP_CONTEXT_PROP_TOOL_PRESET:
+      container = gimp_data_factory_get_container (context->gimp->tool_preset_factory);
+      standard  = NULL;
+      name_loc  = &context->tool_preset_name;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  if (gimp_scanner_parse_identifier (scanner, "NULL"))
+    {
+      g_value_set_object (value, NULL);
+    }
+  else if (gimp_scanner_parse_string (scanner, &object_name))
+    {
+      GimpObject *deserialize_obj;
+
+      if (! object_name)
+        object_name = g_strdup ("");
+
+      deserialize_obj = gimp_container_get_child_by_name (container,
+                                                          object_name);
+
+      if (! deserialize_obj)
+        {
+          g_value_set_object (value, standard);
+
+          g_free (*name_loc);
+          *name_loc = g_strdup (object_name);
+        }
+      else
+        {
+          g_value_set_object (value, deserialize_obj);
+        }
+
+      g_free (object_name);
+    }
+  else
+    {
+      *expected = G_TOKEN_STRING;
+    }
+
+  return TRUE;
+}
+
+static GimpConfig *
+gimp_context_duplicate (GimpConfig *config)
+{
+  GimpContext *context = GIMP_CONTEXT (config);
+  GimpContext *new;
+
+  new = GIMP_CONTEXT (parent_config_iface->duplicate (config));
+
+  COPY_NAME (context, new, tool_name);
+  COPY_NAME (context, new, paint_name);
+  COPY_NAME (context, new, brush_name);
+  COPY_NAME (context, new, dynamics_name);
+  COPY_NAME (context, new, mybrush_name);
+  COPY_NAME (context, new, pattern_name);
+  COPY_NAME (context, new, gradient_name);
+  COPY_NAME (context, new, palette_name);
+  COPY_NAME (context, new, font_name);
+  COPY_NAME (context, new, tool_preset_name);
+  COPY_NAME (context, new, buffer_name);
+  COPY_NAME (context, new, imagefile_name);
+  COPY_NAME (context, new, template_name);
+
+  return GIMP_CONFIG (new);
+}
+
+static gboolean
+gimp_context_copy (GimpConfig  *src,
+                   GimpConfig  *dest,
+                   GParamFlags  flags)
+{
+  GimpContext *src_context  = GIMP_CONTEXT (src);
+  GimpContext *dest_context = GIMP_CONTEXT (dest);
+  gboolean     success      = parent_config_iface->copy (src, dest, flags);
+
+  COPY_NAME (src_context, dest_context, tool_name);
+  COPY_NAME (src_context, dest_context, paint_name);
+  COPY_NAME (src_context, dest_context, brush_name);
+  COPY_NAME (src_context, dest_context, dynamics_name);
+  COPY_NAME (src_context, dest_context, mybrush_name);
+  COPY_NAME (src_context, dest_context, pattern_name);
+  COPY_NAME (src_context, dest_context, gradient_name);
+  COPY_NAME (src_context, dest_context, palette_name);
+  COPY_NAME (src_context, dest_context, font_name);
+  COPY_NAME (src_context, dest_context, tool_preset_name);
+  COPY_NAME (src_context, dest_context, buffer_name);
+  COPY_NAME (src_context, dest_context, imagefile_name);
+  COPY_NAME (src_context, dest_context, template_name);
+
+  return success;
+}
+
+
+/*****************************************************************************/
+/*  public functions  ********************************************************/
+
+GimpContext *
+gimp_context_new (Gimp        *gimp,
+                  const gchar *name,
+                  GimpContext *template)
+{
+  GimpContext *context;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (template == NULL || GIMP_IS_CONTEXT (template), NULL);
+
+  context = g_object_new (GIMP_TYPE_CONTEXT,
+                          "name", name,
+                          "gimp", gimp,
+                          NULL);
+
+  if (template)
+    {
+      context->defined_props = template->defined_props;
+
+      gimp_context_copy_properties (template, context,
+                                    GIMP_CONTEXT_PROP_MASK_ALL);
+    }
+
+  return context;
+}
+
+GimpContext *
+gimp_context_get_parent (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->parent;
+}
+
+static void
+gimp_context_parent_notify (GimpContext *parent,
+                            GParamSpec  *pspec,
+                            GimpContext *context)
+{
+  if (pspec->owner_type == GIMP_TYPE_CONTEXT)
+    {
+      GimpContextPropType prop = pspec->param_id;
+
+      /*  copy from parent if the changed property is undefined;
+       *  ignore properties that are not context properties, for
+       *  example notifications on the context's "gimp" property
+       */
+      if ((prop >= GIMP_CONTEXT_PROP_FIRST) &&
+          (prop <= GIMP_CONTEXT_PROP_LAST)  &&
+          ! ((1 << prop) & context->defined_props))
+        {
+          gimp_context_copy_property (parent, context, prop);
+        }
+    }
+}
+
+void
+gimp_context_set_parent (GimpContext *context,
+                         GimpContext *parent)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (parent == NULL || GIMP_IS_CONTEXT (parent));
+  g_return_if_fail (parent == NULL || parent->parent != context);
+  g_return_if_fail (context != parent);
+
+  if (context->parent == parent)
+    return;
+
+  if (context->parent)
+    {
+      g_signal_handlers_disconnect_by_func (context->parent,
+                                            gimp_context_parent_notify,
+                                            context);
+
+      g_object_remove_weak_pointer (G_OBJECT (context->parent),
+                                    (gpointer) &context->parent);
+    }
+
+  context->parent = parent;
+
+  if (parent)
+    {
+      g_object_add_weak_pointer (G_OBJECT (context->parent),
+                                 (gpointer) &context->parent);
+
+      /*  copy all undefined properties from the new parent  */
+      gimp_context_copy_properties (parent, context,
+                                    ~context->defined_props &
+                                    GIMP_CONTEXT_PROP_MASK_ALL);
+
+      g_signal_connect_object (parent, "notify",
+                               G_CALLBACK (gimp_context_parent_notify),
+                               context,
+                               0);
+    }
+}
+
+
+/*  define / undefinine context properties  */
+
+void
+gimp_context_define_property (GimpContext         *context,
+                              GimpContextPropType  prop,
+                              gboolean             defined)
+{
+  GimpContextPropMask mask;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail ((prop >= GIMP_CONTEXT_PROP_FIRST) &&
+                    (prop <= GIMP_CONTEXT_PROP_LAST));
+
+  mask = (1 << prop);
+
+  if (defined)
+    {
+      if (! (context->defined_props & mask))
+        {
+          context->defined_props |= mask;
+        }
+    }
+  else
+    {
+      if (context->defined_props & mask)
+        {
+          context->defined_props &= ~mask;
+
+          if (context->parent)
+            gimp_context_copy_property (context->parent, context, prop);
+        }
+    }
+}
+
+gboolean
+gimp_context_property_defined (GimpContext         *context,
+                               GimpContextPropType  prop)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+
+  return (context->defined_props & (1 << prop)) ? TRUE : FALSE;
+}
+
+void
+gimp_context_define_properties (GimpContext         *context,
+                                GimpContextPropMask  prop_mask,
+                                gboolean             defined)
+{
+  GimpContextPropType prop;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
+    if ((1 << prop) & prop_mask)
+      gimp_context_define_property (context, prop, defined);
+}
+
+
+/*  specify which context properties will be serialized  */
+
+void
+gimp_context_set_serialize_properties (GimpContext         *context,
+                                       GimpContextPropMask  props_mask)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  context->serialize_props = props_mask;
+}
+
+GimpContextPropMask
+gimp_context_get_serialize_properties (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), 0);
+
+  return context->serialize_props;
+}
+
+
+/*  copying context properties  */
+
+void
+gimp_context_copy_property (GimpContext         *src,
+                            GimpContext         *dest,
+                            GimpContextPropType  prop)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (src));
+  g_return_if_fail (GIMP_IS_CONTEXT (dest));
+  g_return_if_fail ((prop >= GIMP_CONTEXT_PROP_FIRST) &&
+                    (prop <= GIMP_CONTEXT_PROP_LAST));
+
+  switch (prop)
+    {
+    case GIMP_CONTEXT_PROP_IMAGE:
+      gimp_context_real_set_image (dest, src->image);
+      break;
+
+    case GIMP_CONTEXT_PROP_DISPLAY:
+      gimp_context_real_set_display (dest, src->display);
+      break;
+
+    case GIMP_CONTEXT_PROP_TOOL:
+      gimp_context_real_set_tool (dest, src->tool_info);
+      COPY_NAME (src, dest, tool_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_PAINT_INFO:
+      gimp_context_real_set_paint_info (dest, src->paint_info);
+      COPY_NAME (src, dest, paint_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_FOREGROUND:
+      gimp_context_real_set_foreground (dest, &src->foreground);
+      break;
+
+    case GIMP_CONTEXT_PROP_BACKGROUND:
+      gimp_context_real_set_background (dest, &src->background);
+      break;
+
+    case GIMP_CONTEXT_PROP_OPACITY:
+      gimp_context_real_set_opacity (dest, src->opacity);
+      break;
+
+    case GIMP_CONTEXT_PROP_PAINT_MODE:
+      gimp_context_real_set_paint_mode (dest, src->paint_mode);
+      break;
+
+    case GIMP_CONTEXT_PROP_BRUSH:
+      gimp_context_real_set_brush (dest, src->brush);
+      COPY_NAME (src, dest, brush_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_DYNAMICS:
+      gimp_context_real_set_dynamics (dest, src->dynamics);
+      COPY_NAME (src, dest, dynamics_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_MYBRUSH:
+      gimp_context_real_set_mybrush (dest, src->mybrush);
+      COPY_NAME (src, dest, mybrush_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_PATTERN:
+      gimp_context_real_set_pattern (dest, src->pattern);
+      COPY_NAME (src, dest, pattern_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_GRADIENT:
+      gimp_context_real_set_gradient (dest, src->gradient);
+      COPY_NAME (src, dest, gradient_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_PALETTE:
+      gimp_context_real_set_palette (dest, src->palette);
+      COPY_NAME (src, dest, palette_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_FONT:
+      gimp_context_real_set_font (dest, src->font);
+      COPY_NAME (src, dest, font_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_TOOL_PRESET:
+      gimp_context_real_set_tool_preset (dest, src->tool_preset);
+      COPY_NAME (src, dest, tool_preset_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_BUFFER:
+      gimp_context_real_set_buffer (dest, src->buffer);
+      COPY_NAME (src, dest, buffer_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_IMAGEFILE:
+      gimp_context_real_set_imagefile (dest, src->imagefile);
+      COPY_NAME (src, dest, imagefile_name);
+      break;
+
+    case GIMP_CONTEXT_PROP_TEMPLATE:
+      gimp_context_real_set_template (dest, src->template);
+      COPY_NAME (src, dest, template_name);
+      break;
+
+    default:
+      break;
+    }
+}
+
+void
+gimp_context_copy_properties (GimpContext         *src,
+                              GimpContext         *dest,
+                              GimpContextPropMask  prop_mask)
+{
+  GimpContextPropType prop;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (src));
+  g_return_if_fail (GIMP_IS_CONTEXT (dest));
+
+  for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
+    if ((1 << prop) & prop_mask)
+      gimp_context_copy_property (src, dest, prop);
+}
+
+
+/*  attribute access functions  */
+
+/*****************************************************************************/
+/*  manipulate by GType  *****************************************************/
+
+GimpContextPropType
+gimp_context_type_to_property (GType type)
+{
+  GimpContextPropType prop;
+
+  for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
+    {
+      if (g_type_is_a (type, gimp_context_prop_types[prop]))
+        return prop;
+    }
+
+  return -1;
+}
+
+const gchar *
+gimp_context_type_to_prop_name (GType type)
+{
+  GimpContextPropType prop;
+
+  for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
+    {
+      if (g_type_is_a (type, gimp_context_prop_types[prop]))
+        return gimp_context_prop_names[prop];
+    }
+
+  return NULL;
+}
+
+const gchar *
+gimp_context_type_to_signal_name (GType type)
+{
+  GimpContextPropType prop;
+
+  for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
+    {
+      if (g_type_is_a (type, gimp_context_prop_types[prop]))
+        return g_signal_name (gimp_context_signals[prop]);
+    }
+
+  return NULL;
+}
+
+GimpObject *
+gimp_context_get_by_type (GimpContext *context,
+                          GType        type)
+{
+  GimpContextPropType  prop;
+  GimpObject          *object = NULL;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  prop = gimp_context_type_to_property (type);
+
+  g_return_val_if_fail (prop != -1, NULL);
+
+  g_object_get (context,
+                gimp_context_prop_names[prop], &object,
+                NULL);
+
+  /*  g_object_get() refs the object, this function however is a getter,
+   *  which usually doesn't ref it's return value
+   */
+  if (object)
+    g_object_unref (object);
+
+  return object;
+}
+
+void
+gimp_context_set_by_type (GimpContext *context,
+                          GType        type,
+                          GimpObject  *object)
+{
+  GimpContextPropType  prop;
+  GParamSpec          *pspec;
+  GValue               value = G_VALUE_INIT;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (object == NULL || G_IS_OBJECT (object));
+
+  prop = gimp_context_type_to_property (type);
+
+  g_return_if_fail (prop != -1);
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (context),
+                                        gimp_context_prop_names[prop]);
+
+  g_return_if_fail (pspec != NULL);
+
+  g_value_init (&value, pspec->value_type);
+  g_value_set_object (&value, object);
+
+  /*  we use gimp_context_set_property() (which in turn only calls
+   *  gimp_context_set_foo() functions) instead of the much more obvious
+   *  g_object_set(); this avoids g_object_freeze_notify()/thaw_notify()
+   *  around the g_object_set() and makes GimpContext callbacks being
+   *  called in a much more predictable order. See bug #731279.
+   */
+  gimp_context_set_property (G_OBJECT (context),
+                             pspec->param_id,
+                             (const GValue *) &value,
+                             pspec);
+
+  g_value_unset (&value);
+}
+
+void
+gimp_context_changed_by_type (GimpContext *context,
+                              GType        type)
+{
+  GimpContextPropType  prop;
+  GimpObject          *object;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  prop = gimp_context_type_to_property (type);
+
+  g_return_if_fail (prop != -1);
+
+  object = gimp_context_get_by_type (context, type);
+
+  g_signal_emit (context,
+                 gimp_context_signals[prop], 0,
+                 object);
+}
+
+
+/*****************************************************************************/
+/*  image  *******************************************************************/
+
+GimpImage *
+gimp_context_get_image (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->image;
+}
+
+void
+gimp_context_set_image (GimpContext *context,
+                        GimpImage   *image)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_IMAGE);
+
+  gimp_context_real_set_image (context, image);
+}
+
+void
+gimp_context_image_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[IMAGE_CHANGED], 0,
+                 context->image);
+}
+
+static void
+gimp_context_image_removed (GimpContainer *container,
+                            GimpImage     *image,
+                            GimpContext   *context)
+{
+  if (context->image == image)
+    gimp_context_real_set_image (context, NULL);
+}
+
+static void
+gimp_context_real_set_image (GimpContext *context,
+                             GimpImage   *image)
+{
+  if (context->image == image)
+    return;
+
+  context->image = image;
+
+  g_object_notify (G_OBJECT (context), "image");
+  gimp_context_image_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  display  *****************************************************************/
+
+gpointer
+gimp_context_get_display (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->display;
+}
+
+void
+gimp_context_set_display (GimpContext *context,
+                          gpointer     display)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (display == NULL || GIMP_IS_OBJECT (display));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_DISPLAY);
+
+  gimp_context_real_set_display (context, display);
+}
+
+void
+gimp_context_display_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[DISPLAY_CHANGED], 0,
+                 context->display);
+}
+
+static void
+gimp_context_display_removed (GimpContainer *container,
+                              gpointer       display,
+                              GimpContext   *context)
+{
+  if (context->display == display)
+    gimp_context_real_set_display (context, NULL);
+}
+
+static void
+gimp_context_real_set_display (GimpContext *context,
+                               gpointer     display)
+{
+  GimpObject *old_display;
+
+  if (context->display == display)
+    {
+      /*  make sure that setting a display *always* sets the image
+       *  to that display's image, even if the display already
+       *  matches
+       */
+      if (display)
+        {
+          GimpImage *image;
+
+          g_object_get (display, "image", &image, NULL);
+
+          gimp_context_real_set_image (context, image);
+
+          if (image)
+            g_object_unref (image);
+        }
+
+      return;
+    }
+
+  old_display = context->display;
+
+  context->display = display;
+
+  if (context->display)
+    {
+      GimpImage *image;
+
+      g_object_get (display, "image", &image, NULL);
+
+      gimp_context_real_set_image (context, image);
+
+      if (image)
+        g_object_unref (image);
+    }
+  else if (old_display)
+    {
+      gimp_context_real_set_image (context, NULL);
+    }
+
+  g_object_notify (G_OBJECT (context), "display");
+  gimp_context_display_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  tool  ********************************************************************/
+
+GimpToolInfo *
+gimp_context_get_tool (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->tool_info;
+}
+
+void
+gimp_context_set_tool (GimpContext  *context,
+                       GimpToolInfo *tool_info)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (tool_info == NULL || GIMP_IS_TOOL_INFO (tool_info));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_TOOL);
+
+  gimp_context_real_set_tool (context, tool_info);
+}
+
+void
+gimp_context_tool_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[TOOL_CHANGED], 0,
+                 context->tool_info);
+}
+
+static void
+gimp_context_tool_dirty (GimpToolInfo *tool_info,
+                         GimpContext  *context)
+{
+  g_free (context->tool_name);
+  context->tool_name = g_strdup (gimp_object_get_name (tool_info));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_TOOL);
+}
+
+static void
+gimp_context_tool_list_thaw (GimpContainer *container,
+                             GimpContext   *context)
+{
+  GimpToolInfo *tool_info;
+
+  if (! context->tool_name)
+    context->tool_name = g_strdup ("gimp-paintbrush-tool");
+
+  tool_info = gimp_context_find_object (context, container,
+                                        context->tool_name,
+                                        gimp_tool_info_get_standard (context->gimp));
+
+  gimp_context_real_set_tool (context, tool_info);
+}
+
+static void
+gimp_context_tool_removed (GimpContainer *container,
+                           GimpToolInfo  *tool_info,
+                           GimpContext   *context)
+{
+  if (tool_info == context->tool_info)
+    {
+      g_signal_handlers_disconnect_by_func (context->tool_info,
+                                            gimp_context_tool_dirty,
+                                            context);
+      g_clear_object (&context->tool_info);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_tool_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_tool (GimpContext  *context,
+                            GimpToolInfo *tool_info)
+{
+  if (context->tool_info == tool_info)
+    return;
+
+  if (context->tool_name &&
+      tool_info != gimp_tool_info_get_standard (context->gimp))
+    {
+      g_clear_pointer (&context->tool_name, g_free);
+    }
+
+  if (context->tool_info)
+    g_signal_handlers_disconnect_by_func (context->tool_info,
+                                          gimp_context_tool_dirty,
+                                          context);
+
+  g_set_object (&context->tool_info, tool_info);
+
+  if (tool_info)
+    {
+      g_signal_connect_object (tool_info, "name-changed",
+                               G_CALLBACK (gimp_context_tool_dirty),
+                               context,
+                               0);
+
+      if (tool_info != gimp_tool_info_get_standard (context->gimp))
+        context->tool_name = g_strdup (gimp_object_get_name (tool_info));
+
+      if (tool_info->paint_info)
+        gimp_context_real_set_paint_info (context, tool_info->paint_info);
+    }
+
+  g_object_notify (G_OBJECT (context), "tool");
+  gimp_context_tool_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  paint info  **************************************************************/
+
+GimpPaintInfo *
+gimp_context_get_paint_info (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->paint_info;
+}
+
+void
+gimp_context_set_paint_info (GimpContext   *context,
+                             GimpPaintInfo *paint_info)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (paint_info == NULL || GIMP_IS_PAINT_INFO (paint_info));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_PAINT_INFO);
+
+  gimp_context_real_set_paint_info (context, paint_info);
+}
+
+void
+gimp_context_paint_info_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[PAINT_INFO_CHANGED], 0,
+                 context->paint_info);
+}
+
+static void
+gimp_context_paint_info_dirty (GimpPaintInfo *paint_info,
+                               GimpContext   *context)
+{
+  g_free (context->paint_name);
+  context->paint_name = g_strdup (gimp_object_get_name (paint_info));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_PAINT_INFO);
+}
+
+/*  the global paint info list is there again after refresh  */
+static void
+gimp_context_paint_info_list_thaw (GimpContainer *container,
+                                   GimpContext   *context)
+{
+  GimpPaintInfo *paint_info;
+
+  if (! context->paint_name)
+    context->paint_name = g_strdup ("gimp-paintbrush");
+
+  paint_info = gimp_context_find_object (context, container,
+                                         context->paint_name,
+                                         gimp_paint_info_get_standard (context->gimp));
+
+  gimp_context_real_set_paint_info (context, paint_info);
+}
+
+static void
+gimp_context_paint_info_removed (GimpContainer *container,
+                                 GimpPaintInfo *paint_info,
+                                 GimpContext   *context)
+{
+  if (paint_info == context->paint_info)
+    {
+      g_signal_handlers_disconnect_by_func (context->paint_info,
+                                            gimp_context_paint_info_dirty,
+                                            context);
+      g_clear_object (&context->paint_info);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_paint_info_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_paint_info (GimpContext   *context,
+                                  GimpPaintInfo *paint_info)
+{
+  if (context->paint_info == paint_info)
+    return;
+
+  if (context->paint_name &&
+      paint_info != gimp_paint_info_get_standard (context->gimp))
+    {
+      g_clear_pointer (&context->paint_name, g_free);
+    }
+
+  if (context->paint_info)
+    g_signal_handlers_disconnect_by_func (context->paint_info,
+                                          gimp_context_paint_info_dirty,
+                                          context);
+
+  g_set_object (&context->paint_info, paint_info);
+
+  if (paint_info)
+    {
+      g_signal_connect_object (paint_info, "name-changed",
+                               G_CALLBACK (gimp_context_paint_info_dirty),
+                               context,
+                               0);
+
+      if (paint_info != gimp_paint_info_get_standard (context->gimp))
+        context->paint_name = g_strdup (gimp_object_get_name (paint_info));
+    }
+
+  g_object_notify (G_OBJECT (context), "paint-info");
+  gimp_context_paint_info_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  foreground color  ********************************************************/
+
+void
+gimp_context_get_foreground (GimpContext *context,
+                             GimpRGB     *color)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (color != NULL);
+
+  *color = context->foreground;
+}
+
+void
+gimp_context_set_foreground (GimpContext   *context,
+                             const GimpRGB *color)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (color != NULL);
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_FOREGROUND);
+
+  gimp_context_real_set_foreground (context, color);
+}
+
+void
+gimp_context_foreground_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[FOREGROUND_CHANGED], 0,
+                 &context->foreground);
+}
+
+static void
+gimp_context_real_set_foreground (GimpContext   *context,
+                                  const GimpRGB *color)
+{
+  if (gimp_rgba_distance (&context->foreground, color) < RGBA_EPSILON)
+    return;
+
+  context->foreground = *color;
+  gimp_rgb_set_alpha (&context->foreground, GIMP_OPACITY_OPAQUE);
+
+  g_object_notify (G_OBJECT (context), "foreground");
+  gimp_context_foreground_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  background color  ********************************************************/
+
+void
+gimp_context_get_background (GimpContext *context,
+                             GimpRGB     *color)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_return_if_fail (color != NULL);
+
+  *color = context->background;
+}
+
+void
+gimp_context_set_background (GimpContext   *context,
+                             const GimpRGB *color)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (color != NULL);
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_BACKGROUND);
+
+  gimp_context_real_set_background (context, color);
+}
+
+void
+gimp_context_background_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[BACKGROUND_CHANGED], 0,
+                 &context->background);
+}
+
+static void
+gimp_context_real_set_background (GimpContext   *context,
+                                  const GimpRGB *color)
+{
+  if (gimp_rgba_distance (&context->background, color) < RGBA_EPSILON)
+    return;
+
+  context->background = *color;
+  gimp_rgb_set_alpha (&context->background, GIMP_OPACITY_OPAQUE);
+
+  g_object_notify (G_OBJECT (context), "background");
+  gimp_context_background_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  color utility functions  *************************************************/
+
+void
+gimp_context_set_default_colors (GimpContext *context)
+{
+  GimpContext *bg_context;
+  GimpRGB      fg;
+  GimpRGB      bg;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  bg_context = context;
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_FOREGROUND);
+  context_find_defined (bg_context, GIMP_CONTEXT_PROP_BACKGROUND);
+
+  gimp_rgba_set (&fg, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&bg, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+
+  gimp_context_real_set_foreground (context, &fg);
+  gimp_context_real_set_background (bg_context, &bg);
+}
+
+void
+gimp_context_swap_colors (GimpContext *context)
+{
+  GimpContext *bg_context;
+  GimpRGB      fg;
+  GimpRGB      bg;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  bg_context = context;
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_FOREGROUND);
+  context_find_defined (bg_context, GIMP_CONTEXT_PROP_BACKGROUND);
+
+  gimp_context_get_foreground (context, &fg);
+  gimp_context_get_background (bg_context, &bg);
+
+  gimp_context_real_set_foreground (context, &bg);
+  gimp_context_real_set_background (bg_context, &fg);
+}
+
+
+/*****************************************************************************/
+/*  opacity  *****************************************************************/
+
+gdouble
+gimp_context_get_opacity (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_OPACITY_OPAQUE);
+
+  return context->opacity;
+}
+
+void
+gimp_context_set_opacity (GimpContext *context,
+                          gdouble      opacity)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_OPACITY);
+
+  gimp_context_real_set_opacity (context, opacity);
+}
+
+void
+gimp_context_opacity_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[OPACITY_CHANGED], 0,
+                 context->opacity);
+}
+
+static void
+gimp_context_real_set_opacity (GimpContext *context,
+                               gdouble      opacity)
+{
+  if (context->opacity == opacity)
+    return;
+
+  context->opacity = opacity;
+
+  g_object_notify (G_OBJECT (context), "opacity");
+  gimp_context_opacity_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  paint mode  **************************************************************/
+
+GimpLayerMode
+gimp_context_get_paint_mode (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_LAYER_MODE_NORMAL);
+
+  return context->paint_mode;
+}
+
+void
+gimp_context_set_paint_mode (GimpContext   *context,
+                             GimpLayerMode  paint_mode)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_PAINT_MODE);
+
+  gimp_context_real_set_paint_mode (context, paint_mode);
+}
+
+void
+gimp_context_paint_mode_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[PAINT_MODE_CHANGED], 0,
+                 context->paint_mode);
+}
+
+static void
+gimp_context_real_set_paint_mode (GimpContext   *context,
+                                  GimpLayerMode  paint_mode)
+{
+  if (context->paint_mode == paint_mode)
+    return;
+
+  context->paint_mode = paint_mode;
+
+  g_object_notify (G_OBJECT (context), "paint-mode");
+  gimp_context_paint_mode_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  brush  *******************************************************************/
+
+GimpBrush *
+gimp_context_get_brush (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->brush;
+}
+
+void
+gimp_context_set_brush (GimpContext *context,
+                        GimpBrush   *brush)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_BRUSH);
+
+  gimp_context_real_set_brush (context, brush);
+}
+
+void
+gimp_context_brush_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[BRUSH_CHANGED], 0,
+                 context->brush);
+}
+
+static void
+gimp_context_brush_dirty (GimpBrush   *brush,
+                          GimpContext *context)
+{
+  g_free (context->brush_name);
+  context->brush_name = g_strdup (gimp_object_get_name (brush));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_BRUSH);
+}
+
+static void
+gimp_context_brush_list_thaw (GimpContainer *container,
+                              GimpContext   *context)
+{
+  GimpBrush *brush;
+
+  if (! context->brush_name)
+    context->brush_name = g_strdup (context->gimp->config->default_brush);
+
+  brush = gimp_context_find_object (context, container,
+                                    context->brush_name,
+                                    gimp_brush_get_standard (context));
+
+  gimp_context_real_set_brush (context, brush);
+}
+
+/*  the active brush disappeared  */
+static void
+gimp_context_brush_removed (GimpContainer *container,
+                            GimpBrush     *brush,
+                            GimpContext   *context)
+{
+  if (brush == context->brush)
+    {
+      g_signal_handlers_disconnect_by_func (context->brush,
+                                            gimp_context_brush_dirty,
+                                            context);
+      g_clear_object (&context->brush);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_brush_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_brush (GimpContext *context,
+                             GimpBrush   *brush)
+{
+  if (context->brush == brush)
+    return;
+
+  if (context->brush_name &&
+      brush != GIMP_BRUSH (gimp_brush_get_standard (context)))
+    {
+      g_clear_pointer (&context->brush_name, g_free);
+    }
+
+  if (context->brush)
+    g_signal_handlers_disconnect_by_func (context->brush,
+                                          gimp_context_brush_dirty,
+                                          context);
+
+  g_set_object (&context->brush, brush);
+
+  if (brush)
+    {
+      g_signal_connect_object (brush, "name-changed",
+                               G_CALLBACK (gimp_context_brush_dirty),
+                               context,
+                               0);
+
+      if (brush != GIMP_BRUSH (gimp_brush_get_standard (context)))
+        context->brush_name = g_strdup (gimp_object_get_name (brush));
+    }
+
+  g_object_notify (G_OBJECT (context), "brush");
+  gimp_context_brush_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  dynamics *****************************************************************/
+
+GimpDynamics *
+gimp_context_get_dynamics (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->dynamics;
+}
+
+void
+gimp_context_set_dynamics (GimpContext  *context,
+                           GimpDynamics *dynamics)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (dynamics == NULL || GIMP_IS_DYNAMICS (dynamics));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_DYNAMICS);
+
+  gimp_context_real_set_dynamics (context, dynamics);
+}
+
+void
+gimp_context_dynamics_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[DYNAMICS_CHANGED], 0,
+                 context->dynamics);
+}
+
+static void
+gimp_context_dynamics_dirty (GimpDynamics *dynamics,
+                             GimpContext  *context)
+{
+  g_free (context->dynamics_name);
+  context->dynamics_name = g_strdup (gimp_object_get_name (dynamics));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_DYNAMICS);
+}
+
+static void
+gimp_context_dynamics_removed (GimpContainer *container,
+                               GimpDynamics  *dynamics,
+                               GimpContext   *context)
+{
+  if (dynamics == context->dynamics)
+    {
+      g_signal_handlers_disconnect_by_func (context->dynamics,
+                                            gimp_context_dynamics_dirty,
+                                            context);
+      g_clear_object (&context->dynamics);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_dynamics_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_dynamics_list_thaw (GimpContainer *container,
+                                 GimpContext   *context)
+{
+  GimpDynamics *dynamics;
+
+  if (! context->dynamics_name)
+    context->dynamics_name = g_strdup (context->gimp->config->default_dynamics);
+
+  dynamics = gimp_context_find_object (context, container,
+                                       context->dynamics_name,
+                                       gimp_dynamics_get_standard (context));
+
+  gimp_context_real_set_dynamics (context, dynamics);
+}
+
+static void
+gimp_context_real_set_dynamics (GimpContext  *context,
+                                GimpDynamics *dynamics)
+{
+  if (context->dynamics == dynamics)
+    return;
+
+  if (context->dynamics_name &&
+      dynamics != GIMP_DYNAMICS (gimp_dynamics_get_standard (context)))
+    {
+      g_clear_pointer (&context->dynamics_name, g_free);
+    }
+
+  if (context->dynamics)
+    g_signal_handlers_disconnect_by_func (context->dynamics,
+                                          gimp_context_dynamics_dirty,
+                                          context);
+
+  g_set_object (&context->dynamics, dynamics);
+
+  if (dynamics)
+    {
+      g_signal_connect_object (dynamics, "name-changed",
+                               G_CALLBACK (gimp_context_dynamics_dirty),
+                               context,
+                               0);
+
+      if (dynamics != GIMP_DYNAMICS (gimp_dynamics_get_standard (context)))
+        context->dynamics_name = g_strdup (gimp_object_get_name (dynamics));
+    }
+
+  g_object_notify (G_OBJECT (context), "dynamics");
+  gimp_context_dynamics_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  mybrush  *****************************************************************/
+
+GimpMybrush *
+gimp_context_get_mybrush (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->mybrush;
+}
+
+void
+gimp_context_set_mybrush (GimpContext *context,
+                          GimpMybrush *brush)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (brush == NULL || GIMP_IS_MYBRUSH (brush));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_MYBRUSH);
+
+  gimp_context_real_set_mybrush (context, brush);
+}
+
+void
+gimp_context_mybrush_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[MYBRUSH_CHANGED], 0,
+                 context->mybrush);
+}
+
+static void
+gimp_context_mybrush_dirty (GimpMybrush *brush,
+                            GimpContext *context)
+{
+  g_free (context->mybrush_name);
+  context->mybrush_name = g_strdup (gimp_object_get_name (brush));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_MYBRUSH);
+}
+
+static void
+gimp_context_mybrush_list_thaw (GimpContainer *container,
+                                GimpContext   *context)
+{
+  GimpMybrush *brush;
+
+  if (! context->mybrush_name)
+    context->mybrush_name = g_strdup (context->gimp->config->default_mypaint_brush);
+
+  brush = gimp_context_find_object (context, container,
+                                    context->mybrush_name,
+                                    gimp_mybrush_get_standard (context));
+
+  gimp_context_real_set_mybrush (context, brush);
+}
+
+static void
+gimp_context_mybrush_removed (GimpContainer *container,
+                              GimpMybrush   *brush,
+                              GimpContext   *context)
+{
+  if (brush == context->mybrush)
+    {
+      g_signal_handlers_disconnect_by_func (context->mybrush,
+                                            gimp_context_mybrush_dirty,
+                                            context);
+      g_clear_object (&context->mybrush);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_mybrush_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_mybrush (GimpContext *context,
+                               GimpMybrush *brush)
+{
+  if (context->mybrush == brush)
+    return;
+
+  if (context->mybrush_name &&
+      brush != GIMP_MYBRUSH (gimp_mybrush_get_standard (context)))
+    {
+      g_clear_pointer (&context->mybrush_name, g_free);
+    }
+
+  if (context->mybrush)
+    g_signal_handlers_disconnect_by_func (context->mybrush,
+                                          gimp_context_mybrush_dirty,
+                                          context);
+
+  g_set_object (&context->mybrush, brush);
+
+  if (brush)
+    {
+      g_signal_connect_object (brush, "name-changed",
+                               G_CALLBACK (gimp_context_mybrush_dirty),
+                               context,
+                               0);
+
+      if (brush != GIMP_MYBRUSH (gimp_mybrush_get_standard (context)))
+        context->mybrush_name = g_strdup (gimp_object_get_name (brush));
+    }
+
+  g_object_notify (G_OBJECT (context), "mybrush");
+  gimp_context_mybrush_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  pattern  *****************************************************************/
+
+GimpPattern *
+gimp_context_get_pattern (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->pattern;
+}
+
+void
+gimp_context_set_pattern (GimpContext *context,
+                          GimpPattern *pattern)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (pattern == NULL || GIMP_IS_PATTERN (pattern));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_PATTERN);
+
+  gimp_context_real_set_pattern (context, pattern);
+}
+
+void
+gimp_context_pattern_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[PATTERN_CHANGED], 0,
+                 context->pattern);
+}
+
+static void
+gimp_context_pattern_dirty (GimpPattern *pattern,
+                            GimpContext *context)
+{
+  g_free (context->pattern_name);
+  context->pattern_name = g_strdup (gimp_object_get_name (pattern));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_PATTERN);
+}
+
+static void
+gimp_context_pattern_list_thaw (GimpContainer *container,
+                                GimpContext   *context)
+{
+  GimpPattern *pattern;
+
+  if (! context->pattern_name)
+    context->pattern_name = g_strdup (context->gimp->config->default_pattern);
+
+  pattern = gimp_context_find_object (context, container,
+                                      context->pattern_name,
+                                      gimp_pattern_get_standard (context));
+
+  gimp_context_real_set_pattern (context, pattern);
+}
+
+static void
+gimp_context_pattern_removed (GimpContainer *container,
+                              GimpPattern   *pattern,
+                              GimpContext   *context)
+{
+  if (pattern == context->pattern)
+    {
+      g_signal_handlers_disconnect_by_func (context->pattern,
+                                            gimp_context_pattern_dirty,
+                                            context);
+      g_clear_object (&context->pattern);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_pattern_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_pattern (GimpContext *context,
+                               GimpPattern *pattern)
+{
+  if (context->pattern == pattern)
+    return;
+
+  if (context->pattern_name &&
+      pattern != GIMP_PATTERN (gimp_pattern_get_standard (context)))
+    {
+      g_clear_pointer (&context->pattern_name, g_free);
+    }
+
+  if (context->pattern)
+    g_signal_handlers_disconnect_by_func (context->pattern,
+                                          gimp_context_pattern_dirty,
+                                          context);
+
+  g_set_object (&context->pattern, pattern);
+
+  if (pattern)
+    {
+      g_signal_connect_object (pattern, "name-changed",
+                               G_CALLBACK (gimp_context_pattern_dirty),
+                               context,
+                               0);
+
+      if (pattern != GIMP_PATTERN (gimp_pattern_get_standard (context)))
+        context->pattern_name = g_strdup (gimp_object_get_name (pattern));
+    }
+
+  g_object_notify (G_OBJECT (context), "pattern");
+  gimp_context_pattern_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  gradient  ****************************************************************/
+
+GimpGradient *
+gimp_context_get_gradient (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->gradient;
+}
+
+void
+gimp_context_set_gradient (GimpContext  *context,
+                           GimpGradient *gradient)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (gradient == NULL || GIMP_IS_GRADIENT (gradient));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_GRADIENT);
+
+  gimp_context_real_set_gradient (context, gradient);
+}
+
+void
+gimp_context_gradient_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[GRADIENT_CHANGED], 0,
+                 context->gradient);
+}
+
+static void
+gimp_context_gradient_dirty (GimpGradient *gradient,
+                             GimpContext  *context)
+{
+  g_free (context->gradient_name);
+  context->gradient_name = g_strdup (gimp_object_get_name (gradient));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_GRADIENT);
+}
+
+static void
+gimp_context_gradient_list_thaw (GimpContainer *container,
+                                 GimpContext   *context)
+{
+  GimpGradient *gradient;
+
+  if (! context->gradient_name)
+    context->gradient_name = g_strdup (context->gimp->config->default_gradient);
+
+  gradient = gimp_context_find_object (context, container,
+                                       context->gradient_name,
+                                       gimp_gradient_get_standard (context));
+
+  gimp_context_real_set_gradient (context, gradient);
+}
+
+static void
+gimp_context_gradient_removed (GimpContainer *container,
+                               GimpGradient  *gradient,
+                               GimpContext   *context)
+{
+  if (gradient == context->gradient)
+    {
+      g_signal_handlers_disconnect_by_func (context->gradient,
+                                            gimp_context_gradient_dirty,
+                                            context);
+      g_clear_object (&context->gradient);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_gradient_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_gradient (GimpContext  *context,
+                                GimpGradient *gradient)
+{
+  if (context->gradient == gradient)
+    return;
+
+  if (context->gradient_name &&
+      gradient != GIMP_GRADIENT (gimp_gradient_get_standard (context)))
+    {
+      g_clear_pointer (&context->gradient_name, g_free);
+    }
+
+  if (context->gradient)
+    g_signal_handlers_disconnect_by_func (context->gradient,
+                                          gimp_context_gradient_dirty,
+                                          context);
+
+  g_set_object (&context->gradient, gradient);
+
+  if (gradient)
+    {
+      g_signal_connect_object (gradient, "name-changed",
+                               G_CALLBACK (gimp_context_gradient_dirty),
+                               context,
+                               0);
+
+      if (gradient != GIMP_GRADIENT (gimp_gradient_get_standard (context)))
+        context->gradient_name = g_strdup (gimp_object_get_name (gradient));
+    }
+
+  g_object_notify (G_OBJECT (context), "gradient");
+  gimp_context_gradient_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  palette  *****************************************************************/
+
+GimpPalette *
+gimp_context_get_palette (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->palette;
+}
+
+void
+gimp_context_set_palette (GimpContext *context,
+                          GimpPalette *palette)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (palette == NULL || GIMP_IS_PALETTE (palette));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_PALETTE);
+
+  gimp_context_real_set_palette (context, palette);
+}
+
+void
+gimp_context_palette_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[PALETTE_CHANGED], 0,
+                 context->palette);
+}
+
+static void
+gimp_context_palette_dirty (GimpPalette *palette,
+                            GimpContext *context)
+{
+  g_free (context->palette_name);
+  context->palette_name = g_strdup (gimp_object_get_name (palette));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_PALETTE);
+}
+
+static void
+gimp_context_palette_list_thaw (GimpContainer *container,
+                                GimpContext   *context)
+{
+  GimpPalette *palette;
+
+  if (! context->palette_name)
+    context->palette_name = g_strdup (context->gimp->config->default_palette);
+
+  palette = gimp_context_find_object (context, container,
+                                      context->palette_name,
+                                      gimp_palette_get_standard (context));
+
+  gimp_context_real_set_palette (context, palette);
+}
+
+static void
+gimp_context_palette_removed (GimpContainer *container,
+                              GimpPalette   *palette,
+                              GimpContext   *context)
+{
+  if (palette == context->palette)
+    {
+      g_signal_handlers_disconnect_by_func (context->palette,
+                                            gimp_context_palette_dirty,
+                                            context);
+      g_clear_object (&context->palette);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_palette_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_palette (GimpContext *context,
+                               GimpPalette *palette)
+{
+  if (context->palette == palette)
+    return;
+
+  if (context->palette_name &&
+      palette != GIMP_PALETTE (gimp_palette_get_standard (context)))
+    {
+      g_clear_pointer (&context->palette_name, g_free);
+    }
+
+  if (context->palette)
+    g_signal_handlers_disconnect_by_func (context->palette,
+                                          gimp_context_palette_dirty,
+                                          context);
+
+  g_set_object (&context->palette, palette);
+
+  if (palette)
+    {
+      g_signal_connect_object (palette, "name-changed",
+                               G_CALLBACK (gimp_context_palette_dirty),
+                               context,
+                               0);
+
+      if (palette != GIMP_PALETTE (gimp_palette_get_standard (context)))
+        context->palette_name = g_strdup (gimp_object_get_name (palette));
+    }
+
+  g_object_notify (G_OBJECT (context), "palette");
+  gimp_context_palette_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  font     *****************************************************************/
+
+GimpFont *
+gimp_context_get_font (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->font;
+}
+
+void
+gimp_context_set_font (GimpContext *context,
+                       GimpFont    *font)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (font == NULL || GIMP_IS_FONT (font));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_FONT);
+
+  gimp_context_real_set_font (context, font);
+}
+
+const gchar *
+gimp_context_get_font_name (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->font_name;
+}
+
+void
+gimp_context_set_font_name (GimpContext *context,
+                            const gchar *name)
+{
+  GimpContainer *container;
+  GimpObject    *font;
+
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  container = gimp_data_factory_get_container (context->gimp->font_factory);
+  font      = gimp_container_get_child_by_name (container, name);
+
+  if (font)
+    {
+      gimp_context_set_font (context, GIMP_FONT (font));
+    }
+  else
+    {
+      /* No font with this name exists, use the standard font, but
+       * keep the intended name around
+       */
+      gimp_context_set_font (context, GIMP_FONT (gimp_font_get_standard ()));
+
+      g_free (context->font_name);
+      context->font_name = g_strdup (name);
+    }
+}
+
+void
+gimp_context_font_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[FONT_CHANGED], 0,
+                 context->font);
+}
+
+static void
+gimp_context_font_dirty (GimpFont    *font,
+                         GimpContext *context)
+{
+  g_free (context->font_name);
+  context->font_name = g_strdup (gimp_object_get_name (font));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_FONT);
+}
+
+static void
+gimp_context_font_list_thaw (GimpContainer *container,
+                             GimpContext   *context)
+{
+  GimpFont *font;
+
+  if (! context->font_name)
+    context->font_name = g_strdup (context->gimp->config->default_font);
+
+  font = gimp_context_find_object (context, container,
+                                   context->font_name,
+                                   gimp_font_get_standard ());
+
+  gimp_context_real_set_font (context, font);
+}
+
+static void
+gimp_context_font_removed (GimpContainer *container,
+                           GimpFont      *font,
+                           GimpContext   *context)
+{
+  if (font == context->font)
+    {
+      g_signal_handlers_disconnect_by_func (context->font,
+                                            gimp_context_font_dirty,
+                                            context);
+      g_clear_object (&context->font);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_font_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_font (GimpContext *context,
+                            GimpFont    *font)
+{
+  if (context->font == font)
+    return;
+
+  if (context->font_name &&
+      font != GIMP_FONT (gimp_font_get_standard ()))
+    {
+      g_clear_pointer (&context->font_name, g_free);
+    }
+
+  if (context->font)
+    g_signal_handlers_disconnect_by_func (context->font,
+                                          gimp_context_font_dirty,
+                                          context);
+
+  g_set_object (&context->font, font);
+
+  if (font)
+    {
+      g_signal_connect_object (font, "name-changed",
+                               G_CALLBACK (gimp_context_font_dirty),
+                               context,
+                               0);
+
+      if (font != GIMP_FONT (gimp_font_get_standard ()))
+        context->font_name = g_strdup (gimp_object_get_name (font));
+    }
+
+  g_object_notify (G_OBJECT (context), "font");
+  gimp_context_font_changed (context);
+}
+
+
+/********************************************************************************/
+/*  tool preset *****************************************************************/
+
+GimpToolPreset *
+gimp_context_get_tool_preset (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->tool_preset;
+}
+
+void
+gimp_context_set_tool_preset (GimpContext    *context,
+                              GimpToolPreset *tool_preset)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (tool_preset == NULL || GIMP_IS_TOOL_PRESET (tool_preset));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_TOOL_PRESET);
+
+  gimp_context_real_set_tool_preset (context, tool_preset);
+}
+
+void
+gimp_context_tool_preset_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[TOOL_PRESET_CHANGED], 0,
+                 context->tool_preset);
+}
+
+static void
+gimp_context_tool_preset_dirty (GimpToolPreset *tool_preset,
+                                GimpContext    *context)
+{
+  g_free (context->tool_preset_name);
+  context->tool_preset_name = g_strdup (gimp_object_get_name (tool_preset));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_TOOL_PRESET);
+}
+
+static void
+gimp_context_tool_preset_removed (GimpContainer  *container,
+                                  GimpToolPreset *tool_preset,
+                                  GimpContext    *context)
+{
+  if (tool_preset == context->tool_preset)
+    {
+      g_signal_handlers_disconnect_by_func (context->tool_preset,
+                                            gimp_context_tool_preset_dirty,
+                                            context);
+      g_clear_object (&context->tool_preset);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_tool_preset_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_tool_preset_list_thaw (GimpContainer *container,
+                                    GimpContext   *context)
+{
+  GimpToolPreset *tool_preset;
+
+  tool_preset = gimp_context_find_object (context, container,
+                                          context->tool_preset_name,
+                                          NULL);
+
+  gimp_context_real_set_tool_preset (context, tool_preset);
+}
+
+static void
+gimp_context_real_set_tool_preset (GimpContext    *context,
+                                   GimpToolPreset *tool_preset)
+{
+  if (context->tool_preset == tool_preset)
+    return;
+
+  if (context->tool_preset_name)
+    {
+      g_clear_pointer (&context->tool_preset_name, g_free);
+    }
+
+  if (context->tool_preset)
+    g_signal_handlers_disconnect_by_func (context->tool_preset,
+                                          gimp_context_tool_preset_dirty,
+                                          context);
+
+  g_set_object (&context->tool_preset, tool_preset);
+
+  if (tool_preset)
+    {
+      g_signal_connect_object (tool_preset, "name-changed",
+                               G_CALLBACK (gimp_context_tool_preset_dirty),
+                               context,
+                               0);
+
+      context->tool_preset_name = g_strdup (gimp_object_get_name (tool_preset));
+    }
+
+  g_object_notify (G_OBJECT (context), "tool-preset");
+  gimp_context_tool_preset_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  buffer  ******************************************************************/
+
+GimpBuffer *
+gimp_context_get_buffer (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->buffer;
+}
+
+void
+gimp_context_set_buffer (GimpContext *context,
+                         GimpBuffer *buffer)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (buffer == NULL || GIMP_IS_BUFFER (buffer));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_BUFFER);
+
+  gimp_context_real_set_buffer (context, buffer);
+}
+
+void
+gimp_context_buffer_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[BUFFER_CHANGED], 0,
+                 context->buffer);
+}
+
+static void
+gimp_context_buffer_dirty (GimpBuffer  *buffer,
+                           GimpContext *context)
+{
+  g_free (context->buffer_name);
+  context->buffer_name = g_strdup (gimp_object_get_name (buffer));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_BUFFER);
+}
+
+static void
+gimp_context_buffer_list_thaw (GimpContainer *container,
+                               GimpContext   *context)
+{
+  GimpBuffer *buffer;
+
+  buffer = gimp_context_find_object (context, container,
+                                     context->buffer_name,
+                                     NULL);
+
+  if (buffer)
+    {
+      gimp_context_real_set_buffer (context, buffer);
+    }
+  else
+    {
+      g_object_notify (G_OBJECT (context), "buffer");
+      gimp_context_buffer_changed (context);
+    }
+}
+
+static void
+gimp_context_buffer_removed (GimpContainer *container,
+                             GimpBuffer    *buffer,
+                             GimpContext   *context)
+{
+  if (buffer == context->buffer)
+    {
+      g_signal_handlers_disconnect_by_func (context->buffer,
+                                            gimp_context_buffer_dirty,
+                                            context);
+      g_clear_object (&context->buffer);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_buffer_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_buffer (GimpContext *context,
+                              GimpBuffer  *buffer)
+{
+  if (context->buffer == buffer)
+    return;
+
+  if (context->buffer_name)
+    {
+      g_clear_pointer (&context->buffer_name, g_free);
+    }
+
+  if (context->buffer)
+    g_signal_handlers_disconnect_by_func (context->buffer,
+                                          gimp_context_buffer_dirty,
+                                          context);
+
+  g_set_object (&context->buffer, buffer);
+
+  if (buffer)
+    {
+      g_signal_connect_object (buffer, "name-changed",
+                               G_CALLBACK (gimp_context_buffer_dirty),
+                               context,
+                               0);
+
+      context->buffer_name = g_strdup (gimp_object_get_name (buffer));
+    }
+
+  g_object_notify (G_OBJECT (context), "buffer");
+  gimp_context_buffer_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  imagefile  ***************************************************************/
+
+GimpImagefile *
+gimp_context_get_imagefile (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->imagefile;
+}
+
+void
+gimp_context_set_imagefile (GimpContext   *context,
+                            GimpImagefile *imagefile)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (imagefile == NULL || GIMP_IS_IMAGEFILE (imagefile));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_IMAGEFILE);
+
+  gimp_context_real_set_imagefile (context, imagefile);
+}
+
+void
+gimp_context_imagefile_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[IMAGEFILE_CHANGED], 0,
+                 context->imagefile);
+}
+
+static void
+gimp_context_imagefile_dirty (GimpImagefile *imagefile,
+                              GimpContext   *context)
+{
+  g_free (context->imagefile_name);
+  context->imagefile_name = g_strdup (gimp_object_get_name (imagefile));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_IMAGEFILE);
+}
+
+static void
+gimp_context_imagefile_list_thaw (GimpContainer *container,
+                                  GimpContext   *context)
+{
+  GimpImagefile *imagefile;
+
+  imagefile = gimp_context_find_object (context, container,
+                                        context->imagefile_name,
+                                        NULL);
+
+  if (imagefile)
+    {
+      gimp_context_real_set_imagefile (context, imagefile);
+    }
+  else
+    {
+      g_object_notify (G_OBJECT (context), "imagefile");
+      gimp_context_imagefile_changed (context);
+    }
+}
+
+static void
+gimp_context_imagefile_removed (GimpContainer *container,
+                                GimpImagefile *imagefile,
+                                GimpContext   *context)
+{
+  if (imagefile == context->imagefile)
+    {
+      g_signal_handlers_disconnect_by_func (context->imagefile,
+                                            gimp_context_imagefile_dirty,
+                                            context);
+      g_clear_object (&context->imagefile);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_imagefile_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_imagefile (GimpContext   *context,
+                                 GimpImagefile *imagefile)
+{
+  if (context->imagefile == imagefile)
+    return;
+
+  if (context->imagefile_name)
+    {
+      g_clear_pointer (&context->imagefile_name, g_free);
+    }
+
+  if (context->imagefile)
+    g_signal_handlers_disconnect_by_func (context->imagefile,
+                                          gimp_context_imagefile_dirty,
+                                          context);
+
+  g_set_object (&context->imagefile, imagefile);
+
+  if (imagefile)
+    {
+      g_signal_connect_object (imagefile, "name-changed",
+                               G_CALLBACK (gimp_context_imagefile_dirty),
+                               context,
+                               0);
+
+      context->imagefile_name = g_strdup (gimp_object_get_name (imagefile));
+    }
+
+  g_object_notify (G_OBJECT (context), "imagefile");
+  gimp_context_imagefile_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  template  ***************************************************************/
+
+GimpTemplate *
+gimp_context_get_template (GimpContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return context->template;
+}
+
+void
+gimp_context_set_template (GimpContext  *context,
+                           GimpTemplate *template)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (template == NULL || GIMP_IS_TEMPLATE (template));
+
+  context_find_defined (context, GIMP_CONTEXT_PROP_TEMPLATE);
+
+  gimp_context_real_set_template (context, template);
+}
+
+void
+gimp_context_template_changed (GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  g_signal_emit (context,
+                 gimp_context_signals[TEMPLATE_CHANGED], 0,
+                 context->template);
+}
+
+static void
+gimp_context_template_dirty (GimpTemplate *template,
+                             GimpContext  *context)
+{
+  g_free (context->template_name);
+  context->template_name = g_strdup (gimp_object_get_name (template));
+
+  g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0,
+                 GIMP_CONTEXT_PROP_TEMPLATE);
+}
+
+static void
+gimp_context_template_list_thaw (GimpContainer *container,
+                                 GimpContext   *context)
+{
+  GimpTemplate *template;
+
+  template = gimp_context_find_object (context, container,
+                                       context->template_name,
+                                       NULL);
+
+  if (template)
+    {
+      gimp_context_real_set_template (context, template);
+    }
+  else
+    {
+      g_object_notify (G_OBJECT (context), "template");
+      gimp_context_template_changed (context);
+    }
+}
+
+static void
+gimp_context_template_removed (GimpContainer *container,
+                               GimpTemplate  *template,
+                               GimpContext   *context)
+{
+  if (template == context->template)
+    {
+      g_signal_handlers_disconnect_by_func (context->template,
+                                            gimp_context_template_dirty,
+                                            context);
+      g_clear_object (&context->template);
+
+      if (! gimp_container_frozen (container))
+        gimp_context_template_list_thaw (container, context);
+    }
+}
+
+static void
+gimp_context_real_set_template (GimpContext  *context,
+                                GimpTemplate *template)
+{
+  if (context->template == template)
+    return;
+
+  if (context->template_name)
+    {
+      g_clear_pointer (&context->template_name, g_free);
+    }
+
+  if (context->template)
+    g_signal_handlers_disconnect_by_func (context->template,
+                                          gimp_context_template_dirty,
+                                          context);
+
+  g_set_object (&context->template, template);
+
+  if (template)
+    {
+      g_signal_connect_object (template, "name-changed",
+                               G_CALLBACK (gimp_context_template_dirty),
+                               context,
+                               0);
+
+      context->template_name = g_strdup (gimp_object_get_name (template));
+    }
+
+  g_object_notify (G_OBJECT (context), "template");
+  gimp_context_template_changed (context);
+}
+
+
+/*****************************************************************************/
+/*  utility functions  *******************************************************/
+
+static gpointer
+gimp_context_find_object (GimpContext   *context,
+                          GimpContainer *container,
+                          const gchar   *object_name,
+                          gpointer       standard_object)
+{
+  GimpObject *object = NULL;
+
+  if (object_name)
+    object = gimp_container_get_child_by_name (container, object_name);
+
+  if (! object && ! gimp_container_is_empty (container))
+    object = gimp_container_get_child_by_index (container, 0);
+
+  if (! object)
+    object = standard_object;
+
+  return object;
+}
diff --git a/app/core/gimpcontext.h b/app/core/gimpcontext.h
new file mode 100644
index 0000000..7f15a4a
--- /dev/null
+++ b/app/core/gimpcontext.h
@@ -0,0 +1,360 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontext.h
+ * Copyright (C) 1999-2010 Michael Natterer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTEXT_H__
+#define __GIMP_CONTEXT_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_CONTEXT            (gimp_context_get_type ())
+#define GIMP_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTEXT, GimpContext))
+#define GIMP_CONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GIMP_TYPE_CONTEXT, GimpContextClass))
+#define GIMP_IS_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTEXT))
+#define GIMP_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTEXT))
+#define GIMP_CONTEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS (obj, GIMP_TYPE_CONTEXT, GimpContextClass))
+
+
+typedef struct _GimpContextClass GimpContextClass;
+
+/**
+ * GimpContext:
+ *
+ * Holds state such as the active image, active display, active brush,
+ * active foreground and background color, and so on. There can many
+ * instances of contexts. The user context is what the user sees and
+ * interacts with but there can also be contexts for docks and for
+ * plug-ins.
+ */
+struct _GimpContext
+{
+  GimpViewable          parent_instance;
+
+  Gimp                 *gimp;
+
+  GimpContext          *parent;
+
+  guint32               defined_props;
+  guint32               serialize_props;
+
+  GimpImage            *image;
+  gpointer              display;
+
+  GimpToolInfo         *tool_info;
+  gchar                *tool_name;
+
+  GimpPaintInfo        *paint_info;
+  gchar                *paint_name;
+
+  GimpRGB               foreground;
+  GimpRGB               background;
+
+  gdouble               opacity;
+  GimpLayerMode         paint_mode;
+
+  GimpBrush            *brush;
+  gchar                *brush_name;
+
+  GimpDynamics         *dynamics;
+  gchar                *dynamics_name;
+
+  GimpMybrush          *mybrush;
+  gchar                *mybrush_name;
+
+  GimpPattern          *pattern;
+  gchar                *pattern_name;
+
+  GimpGradient         *gradient;
+  gchar                *gradient_name;
+
+  GimpPalette          *palette;
+  gchar                *palette_name;
+
+  GimpFont             *font;
+  gchar                *font_name;
+
+  GimpToolPreset       *tool_preset;
+  gchar                *tool_preset_name;
+
+  GimpBuffer           *buffer;
+  gchar                *buffer_name;
+
+  GimpImagefile        *imagefile;
+  gchar                *imagefile_name;
+
+  GimpTemplate         *template;
+  gchar                *template_name;
+};
+
+struct _GimpContextClass
+{
+  GimpViewableClass  parent_class;
+
+  void (* image_changed)      (GimpContext          *context,
+                               GimpImage            *image);
+  void (* display_changed)    (GimpContext          *context,
+                               gpointer              display);
+
+  void (* tool_changed)       (GimpContext          *context,
+                               GimpToolInfo         *tool_info);
+  void (* paint_info_changed) (GimpContext          *context,
+                               GimpPaintInfo        *paint_info);
+
+  void (* foreground_changed) (GimpContext          *context,
+                               GimpRGB              *color);
+  void (* background_changed) (GimpContext          *context,
+                               GimpRGB              *color);
+  void (* opacity_changed)    (GimpContext          *context,
+                               gdouble               opacity);
+  void (* paint_mode_changed) (GimpContext          *context,
+                               GimpLayerMode         paint_mode);
+  void (* brush_changed)      (GimpContext          *context,
+                               GimpBrush            *brush);
+  void (* dynamics_changed)   (GimpContext          *context,
+                               GimpDynamics         *dynamics);
+  void (* mybrush_changed)    (GimpContext          *context,
+                               GimpMybrush          *brush);
+  void (* pattern_changed)    (GimpContext          *context,
+                               GimpPattern          *pattern);
+  void (* gradient_changed)   (GimpContext          *context,
+                               GimpGradient         *gradient);
+  void (* palette_changed)    (GimpContext          *context,
+                               GimpPalette          *palette);
+  void (* font_changed)       (GimpContext          *context,
+                               GimpFont             *font);
+  void (* tool_preset_changed)(GimpContext          *context,
+                               GimpToolPreset       *tool_preset);
+  void (* buffer_changed)     (GimpContext          *context,
+                               GimpBuffer           *buffer);
+  void (* imagefile_changed)  (GimpContext          *context,
+                               GimpImagefile        *imagefile);
+  void (* template_changed)   (GimpContext          *context,
+                               GimpTemplate         *template);
+
+  void (* prop_name_changed)  (GimpContext          *context,
+                               GimpContextPropType   prop);
+};
+
+
+GType         gimp_context_get_type          (void) G_GNUC_CONST;
+
+GimpContext * gimp_context_new               (Gimp                *gimp,
+                                              const gchar         *name,
+                                              GimpContext         *template);
+
+GimpContext * gimp_context_get_parent        (GimpContext         *context);
+void          gimp_context_set_parent        (GimpContext         *context,
+                                              GimpContext         *parent);
+
+/*  define / undefinine context properties
+ *
+ *  the value of an undefined property will be taken from the parent context.
+ */
+void          gimp_context_define_property   (GimpContext         *context,
+                                              GimpContextPropType  prop,
+                                              gboolean             defined);
+
+gboolean      gimp_context_property_defined  (GimpContext         *context,
+                                              GimpContextPropType  prop);
+
+void          gimp_context_define_properties (GimpContext         *context,
+                                              GimpContextPropMask  props_mask,
+                                              gboolean             defined);
+
+
+/*  specify which context properties will be serialized
+ */
+void   gimp_context_set_serialize_properties (GimpContext         *context,
+                                              GimpContextPropMask  props_mask);
+
+GimpContextPropMask
+       gimp_context_get_serialize_properties (GimpContext         *context);
+
+
+/*  copying context properties
+ */
+void          gimp_context_copy_property     (GimpContext         *src,
+                                              GimpContext         *dest,
+                                              GimpContextPropType  prop);
+
+void          gimp_context_copy_properties   (GimpContext         *src,
+                                              GimpContext         *dest,
+                                              GimpContextPropMask  props_mask);
+
+
+/*  manipulate by GType  */
+GimpContextPropType   gimp_context_type_to_property    (GType     type);
+const gchar         * gimp_context_type_to_prop_name   (GType     type);
+const gchar         * gimp_context_type_to_signal_name (GType     type);
+
+GimpObject     * gimp_context_get_by_type         (GimpContext     *context,
+                                                   GType            type);
+void             gimp_context_set_by_type         (GimpContext     *context,
+                                                   GType            type,
+                                                   GimpObject      *object);
+void             gimp_context_changed_by_type     (GimpContext     *context,
+                                                   GType            type);
+
+
+/*  image  */
+GimpImage      * gimp_context_get_image           (GimpContext     *context);
+void             gimp_context_set_image           (GimpContext     *context,
+                                                   GimpImage       *image);
+void             gimp_context_image_changed       (GimpContext     *context);
+
+
+/*  display  */
+gpointer         gimp_context_get_display         (GimpContext     *context);
+void             gimp_context_set_display         (GimpContext     *context,
+                                                   gpointer         display);
+void             gimp_context_display_changed     (GimpContext     *context);
+
+
+/*  tool  */
+GimpToolInfo   * gimp_context_get_tool            (GimpContext     *context);
+void             gimp_context_set_tool            (GimpContext     *context,
+                                                   GimpToolInfo    *tool_info);
+void             gimp_context_tool_changed        (GimpContext     *context);
+
+
+/*  paint info  */
+GimpPaintInfo  * gimp_context_get_paint_info      (GimpContext     *context);
+void             gimp_context_set_paint_info      (GimpContext     *context,
+                                                   GimpPaintInfo   *paint_info);
+void             gimp_context_paint_info_changed  (GimpContext     *context);
+
+
+/*  foreground color  */
+void             gimp_context_get_foreground       (GimpContext     *context,
+                                                    GimpRGB         *color);
+void             gimp_context_set_foreground       (GimpContext     *context,
+                                                    const GimpRGB   *color);
+void             gimp_context_foreground_changed   (GimpContext     *context);
+
+
+/*  background color  */
+void             gimp_context_get_background       (GimpContext     *context,
+                                                    GimpRGB         *color);
+void             gimp_context_set_background       (GimpContext     *context,
+                                                    const GimpRGB   *color);
+void             gimp_context_background_changed   (GimpContext     *context);
+
+
+/*  color utility functions  */
+void             gimp_context_set_default_colors  (GimpContext     *context);
+void             gimp_context_swap_colors         (GimpContext     *context);
+
+
+/*  opacity  */
+gdouble          gimp_context_get_opacity         (GimpContext     *context);
+void             gimp_context_set_opacity         (GimpContext     *context,
+                                                   gdouble          opacity);
+void             gimp_context_opacity_changed     (GimpContext     *context);
+
+
+/*  paint mode  */
+GimpLayerMode    gimp_context_get_paint_mode      (GimpContext     *context);
+void             gimp_context_set_paint_mode      (GimpContext     *context,
+                                                   GimpLayerMode    paint_mode);
+void             gimp_context_paint_mode_changed  (GimpContext     *context);
+
+
+/*  brush  */
+GimpBrush      * gimp_context_get_brush           (GimpContext     *context);
+void             gimp_context_set_brush           (GimpContext     *context,
+                                                   GimpBrush       *brush);
+void             gimp_context_brush_changed       (GimpContext     *context);
+
+
+/*  dynamics  */
+GimpDynamics   * gimp_context_get_dynamics        (GimpContext     *context);
+void             gimp_context_set_dynamics        (GimpContext     *context,
+                                                   GimpDynamics    *dynamics);
+void             gimp_context_dynamics_changed    (GimpContext     *context);
+
+
+/*  mybrush  */
+GimpMybrush    * gimp_context_get_mybrush         (GimpContext     *context);
+void             gimp_context_set_mybrush         (GimpContext     *context,
+                                                   GimpMybrush     *brush);
+void             gimp_context_mybrush_changed     (GimpContext     *context);
+
+
+/*  pattern  */
+GimpPattern    * gimp_context_get_pattern         (GimpContext     *context);
+void             gimp_context_set_pattern         (GimpContext     *context,
+                                                   GimpPattern     *pattern);
+void             gimp_context_pattern_changed     (GimpContext     *context);
+
+
+/*  gradient  */
+GimpGradient   * gimp_context_get_gradient        (GimpContext     *context);
+void             gimp_context_set_gradient        (GimpContext     *context,
+                                                   GimpGradient    *gradient);
+void             gimp_context_gradient_changed    (GimpContext     *context);
+
+
+/*  palette  */
+GimpPalette    * gimp_context_get_palette         (GimpContext     *context);
+void             gimp_context_set_palette         (GimpContext     *context,
+                                                   GimpPalette     *palette);
+void             gimp_context_palette_changed     (GimpContext     *context);
+
+
+/*  font  */
+GimpFont       * gimp_context_get_font            (GimpContext     *context);
+void             gimp_context_set_font            (GimpContext     *context,
+                                                   GimpFont        *font);
+const gchar    * gimp_context_get_font_name       (GimpContext     *context);
+void             gimp_context_set_font_name       (GimpContext     *context,
+                                                   const gchar     *name);
+void             gimp_context_font_changed        (GimpContext     *context);
+
+
+/*  tool_preset  */
+GimpToolPreset * gimp_context_get_tool_preset     (GimpContext     *context);
+void             gimp_context_set_tool_preset     (GimpContext     *context,
+                                                   GimpToolPreset  *tool_preset);
+void             gimp_context_tool_preset_changed (GimpContext     *context);
+
+
+/*  buffer  */
+GimpBuffer     * gimp_context_get_buffer          (GimpContext     *context);
+void             gimp_context_set_buffer          (GimpContext     *context,
+                                                   GimpBuffer      *palette);
+void             gimp_context_buffer_changed      (GimpContext     *context);
+
+
+/*  imagefile  */
+GimpImagefile  * gimp_context_get_imagefile       (GimpContext     *context);
+void             gimp_context_set_imagefile       (GimpContext     *context,
+                                                   GimpImagefile   *imagefile);
+void             gimp_context_imagefile_changed   (GimpContext     *context);
+
+
+/*  template  */
+GimpTemplate   * gimp_context_get_template        (GimpContext     *context);
+void             gimp_context_set_template        (GimpContext     *context,
+                                                   GimpTemplate    *template);
+void             gimp_context_template_changed    (GimpContext     *context);
+
+
+#endif /* __GIMP_CONTEXT_H__ */
diff --git a/app/core/gimpcoords-interpolate.c b/app/core/gimpcoords-interpolate.c
new file mode 100644
index 0000000..f667e57
--- /dev/null
+++ b/app/core/gimpcoords-interpolate.c
@@ -0,0 +1,371 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcoords-interpolate.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpcoords.h"
+#include "gimpcoords-interpolate.h"
+
+
+/* Local helper functions declarations*/
+static void     gimp_coords_interpolate_bezier_internal (const GimpCoords  bezier_pt[4],
+                                                         const gdouble     start_t,
+                                                         const gdouble     end_t,
+                                                         const gdouble     precision,
+                                                         GArray           *ret_coords,
+                                                         GArray           *ret_params,
+                                                         gint              depth);
+static gdouble  gimp_coords_get_catmull_spline_point    (const gdouble     t,
+                                                         const gdouble     p0,
+                                                         const gdouble     p1,
+                                                         const gdouble     p2,
+                                                         const gdouble     p3);
+
+/* Functions for bezier subdivision */
+
+void
+gimp_coords_interpolate_bezier (const GimpCoords  bezier_pt[4],
+                                const gdouble     precision,
+                                GArray           *ret_coords,
+                                GArray           *ret_params)
+{
+  g_return_if_fail (bezier_pt != NULL);
+  g_return_if_fail (precision > 0.0);
+  g_return_if_fail (ret_coords != NULL);
+
+  gimp_coords_interpolate_bezier_internal (bezier_pt,
+                                           0.0, 1.0,
+                                           precision,
+                                           ret_coords, ret_params, 10);
+}
+
+/* Recursive subdivision helper function */
+static void
+gimp_coords_interpolate_bezier_internal (const GimpCoords  bezier_pt[4],
+                                         const gdouble     start_t,
+                                         const gdouble     end_t,
+                                         const gdouble     precision,
+                                         GArray           *ret_coords,
+                                         GArray           *ret_params,
+                                         gint              depth)
+{
+  /*
+   * bezier_pt has to contain four GimpCoords with the four control points
+   * of the bezier segment. We subdivide it at the parameter 0.5.
+   */
+
+  GimpCoords subdivided[8];
+  gdouble    middle_t = (start_t + end_t) / 2;
+
+  subdivided[0] = bezier_pt[0];
+  subdivided[6] = bezier_pt[3];
+
+  /* if (!depth) g_printerr ("Hit recursion depth limit!\n"); */
+
+  gimp_coords_average (&bezier_pt[0],  &bezier_pt[1],  &subdivided[1]);
+  gimp_coords_average (&bezier_pt[1],  &bezier_pt[2],  &subdivided[7]);
+  gimp_coords_average (&bezier_pt[2],  &bezier_pt[3],  &subdivided[5]);
+
+  gimp_coords_average (&subdivided[1], &subdivided[7], &subdivided[2]);
+  gimp_coords_average (&subdivided[7], &subdivided[5], &subdivided[4]);
+  gimp_coords_average (&subdivided[2], &subdivided[4], &subdivided[3]);
+
+  /*
+   * We now have the coordinates of the two bezier segments in
+   * subdivided [0-3] and subdivided [3-6]
+   */
+
+  /*
+   * Here we need to check, if we have sufficiently subdivided, i.e.
+   * if the stroke is sufficiently close to a straight line.
+   */
+
+  if (! depth ||
+      gimp_coords_bezier_is_straight (subdivided, precision)) /* 1st half */
+    {
+      g_array_append_vals (ret_coords, subdivided, 3);
+
+      if (ret_params)
+        {
+          gdouble params[3];
+
+          params[0] = start_t;
+          params[1] = (2 * start_t + middle_t) / 3;
+          params[2] = (start_t + 2 * middle_t) / 3;
+
+          g_array_append_vals (ret_params, params, 3);
+        }
+    }
+  else
+    {
+      gimp_coords_interpolate_bezier_internal (subdivided,
+                                               start_t, (start_t + end_t) / 2,
+                                               precision,
+                                               ret_coords, ret_params,
+                                               depth - 1);
+    }
+
+  if (! depth ||
+      gimp_coords_bezier_is_straight (subdivided + 3, precision)) /* 2nd half */
+    {
+      g_array_append_vals (ret_coords, subdivided + 3, 3);
+
+      if (ret_params)
+        {
+          gdouble params[3];
+
+          params[0] = middle_t;
+          params[1] = (2 * middle_t + end_t) / 3;
+          params[2] = (middle_t + 2 * end_t) / 3;
+
+          g_array_append_vals (ret_params, params, 3);
+        }
+    }
+  else
+    {
+      gimp_coords_interpolate_bezier_internal (subdivided + 3,
+                                               (start_t + end_t) / 2, end_t,
+                                               precision,
+                                               ret_coords, ret_params,
+                                               depth - 1);
+    }
+}
+
+
+/*
+ * Returns the position and/or velocity of a Bezier curve at time 't'.
+ */
+
+void
+gimp_coords_interpolate_bezier_at (const GimpCoords  bezier_pt[4],
+                                   gdouble           t,
+                                   GimpCoords       *position,
+                                   GimpCoords       *velocity)
+{
+  gdouble u = 1.0 - t;
+
+  g_return_if_fail (bezier_pt != NULL);
+
+  if (position)
+    {
+      GimpCoords a;
+      GimpCoords b;
+
+      gimp_coords_mix (      u * u * u, &bezier_pt[0],
+                       3.0 * u * u * t, &bezier_pt[1],
+                                        &a);
+      gimp_coords_mix (3.0 * u * t * t, &bezier_pt[2],
+                             t * t * t, &bezier_pt[3],
+                                        &b);
+
+      gimp_coords_add (&a, &b, position);
+    }
+
+  if (velocity)
+    {
+      GimpCoords a;
+      GimpCoords b;
+
+      gimp_coords_mix (-3.0 * u * u,             &bezier_pt[0],
+                        3.0 * (u - 2.0 * t) * u, &bezier_pt[1],
+                                                 &a);
+      gimp_coords_mix (-3.0 * (t - 2.0 * u) * t, &bezier_pt[2],
+                        3.0 * t * t,             &bezier_pt[3],
+                                                 &b);
+
+      gimp_coords_add (&a, &b, velocity);
+    }
+}
+
+/*
+ * a helper function that determines if a bezier segment is "straight
+ * enough" to be approximated by a line.
+ *
+ * To be more exact, it also checks for the control points to be distributed
+ * evenly along the line. This makes it easier to reconstruct parameters for
+ * a given point along the segment.
+ *
+ * Needs four GimpCoords in an array.
+ */
+
+gboolean
+gimp_coords_bezier_is_straight (const GimpCoords bezier_pt[4],
+                                gdouble          precision)
+{
+  GimpCoords pt1, pt2;
+
+  g_return_val_if_fail (bezier_pt != NULL, FALSE);
+  g_return_val_if_fail (precision > 0.0, FALSE);
+
+  /* calculate the "ideal" positions for the control points */
+
+  gimp_coords_mix (2.0 / 3.0, &bezier_pt[0],
+                   1.0 / 3.0, &bezier_pt[3],
+                   &pt1);
+  gimp_coords_mix (1.0 / 3.0, &bezier_pt[0],
+                   2.0 / 3.0, &bezier_pt[3],
+                   &pt2);
+
+  /* calculate the deviation of the actual control points */
+
+  return (gimp_coords_manhattan_dist (&bezier_pt[1], &pt1) < precision &&
+          gimp_coords_manhattan_dist (&bezier_pt[2], &pt2) < precision);
+}
+
+
+/* Functions for catmull-rom interpolation */
+
+void
+gimp_coords_interpolate_catmull (const GimpCoords  catmull_pt[4],
+                                 gdouble           precision,
+                                 GArray           *ret_coords,
+                                 GArray           *ret_params)
+{
+  gdouble    delta_x, delta_y;
+  gdouble    distance;
+  gdouble    dir_step;
+  gdouble    delta_dir;
+  gint       num_points;
+  gint       n;
+
+  GimpCoords past_coords;
+  GimpCoords start_coords;
+  GimpCoords end_coords;
+  GimpCoords future_coords;
+
+  g_return_if_fail (catmull_pt != NULL);
+  g_return_if_fail (precision > 0.0);
+  g_return_if_fail (ret_coords != NULL);
+
+  delta_x = catmull_pt[2].x - catmull_pt[1].x;
+  delta_y = catmull_pt[2].y - catmull_pt[1].y;
+
+  /* Catmull-Rom interpolation requires 4 points.
+   * Two endpoints plus one more at each end.
+   */
+
+  past_coords   = catmull_pt[0];
+  start_coords  = catmull_pt[1];
+  end_coords    = catmull_pt[2];
+  future_coords = catmull_pt[3];
+
+  distance  = sqrt (SQR (delta_x) + SQR (delta_y));
+
+  num_points = distance / precision;
+
+  delta_dir = end_coords.direction - start_coords.direction;
+
+  if (delta_dir <= -0.5)
+    delta_dir += 1.0;
+  else if (delta_dir >= 0.5)
+    delta_dir -= 1.0;
+
+  dir_step =  delta_dir / num_points;
+
+  for (n = 1; n <= num_points; n++)
+    {
+      GimpCoords coords = past_coords; /* Make sure we carry over things
+                                        * we do not interpolate */
+      gdouble    velocity;
+      gdouble    pressure;
+      gdouble    p = (gdouble) n / num_points;
+
+      coords.x =
+        gimp_coords_get_catmull_spline_point (p,
+                                              past_coords.x,
+                                              start_coords.x,
+                                              end_coords.x,
+                                              future_coords.x);
+
+      coords.y =
+        gimp_coords_get_catmull_spline_point (p,
+                                              past_coords.y,
+                                              start_coords.y,
+                                              end_coords.y,
+                                              future_coords.y);
+
+      pressure =
+        gimp_coords_get_catmull_spline_point (p,
+                                              past_coords.pressure,
+                                              start_coords.pressure,
+                                              end_coords.pressure,
+                                              future_coords.pressure);
+      coords.pressure = CLAMP (pressure, 0.0, 1.0);
+
+      coords.xtilt =
+        gimp_coords_get_catmull_spline_point (p,
+                                              past_coords.xtilt,
+                                              start_coords.xtilt,
+                                              end_coords.xtilt,
+                                              future_coords.xtilt);
+      coords.ytilt =
+        gimp_coords_get_catmull_spline_point (p,
+                                              past_coords.ytilt,
+                                              start_coords.ytilt,
+                                              end_coords.ytilt,
+                                              future_coords.ytilt);
+
+      coords.wheel =
+        gimp_coords_get_catmull_spline_point (p,
+                                              past_coords.wheel,
+                                              start_coords.wheel,
+                                              end_coords.wheel,
+                                              future_coords.wheel);
+
+      velocity = gimp_coords_get_catmull_spline_point (p,
+                                                       past_coords.velocity,
+                                                       start_coords.velocity,
+                                                       end_coords.velocity,
+                                                       future_coords.velocity);
+      coords.velocity = CLAMP (velocity, 0.0, 1.0);
+
+      coords.direction = start_coords.direction + dir_step * n;
+
+      coords.direction = coords.direction - floor (coords.direction);
+
+      coords.xscale  = end_coords.xscale;
+      coords.yscale  = end_coords.yscale;
+      coords.angle   = end_coords.angle;
+      coords.reflect = end_coords.reflect;
+
+      g_array_append_val (ret_coords, coords);
+
+      if (ret_params)
+        g_array_append_val (ret_params, p);
+    }
+}
+
+static gdouble
+gimp_coords_get_catmull_spline_point (const gdouble t,
+                                      const gdouble p0,
+                                      const gdouble p1,
+                                      const gdouble p2,
+                                      const gdouble p3)
+{
+  return ((((-t + 2.0) * t - 1.0) * t / 2.0)        * p0 +
+          ((((3.0 * t - 5.0) * t) * t + 2.0) / 2.0) * p1 +
+          (((-3.0 * t + 4.0) * t + 1.0) * t / 2.0)  * p2 +
+          (((t - 1) * t * t) / 2.0)                 * p3);
+}
diff --git a/app/core/gimpcoords-interpolate.h b/app/core/gimpcoords-interpolate.h
new file mode 100644
index 0000000..d729cd4
--- /dev/null
+++ b/app/core/gimpcoords-interpolate.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcoords-interpolate.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COORDS_INTERPOLATE_H__
+#define __GIMP_COORDS_INTERPOLATE_H__
+
+void       gimp_coords_interpolate_bezier    (const GimpCoords  bezier_pt[4],
+                                              gdouble           precision,
+                                              GArray           *ret_coords,
+                                              GArray           *ret_params);
+
+void       gimp_coords_interpolate_bezier_at (const GimpCoords  bezier_pt[4],
+                                              gdouble           t,
+                                              GimpCoords       *position,
+                                              GimpCoords       *velocity);
+
+gboolean   gimp_coords_bezier_is_straight    (const GimpCoords  bezier_pt[4],
+                                              gdouble           precision);
+
+void       gimp_coords_interpolate_catmull   (const GimpCoords  catmull_pt[4],
+                                              gdouble           precision,
+                                              GArray           *ret_coords,
+                                              GArray           *ret_params);
+
+#endif /* __GIMP_COORDS_INTERPOLATE_H__ */
diff --git a/app/core/gimpcoords.c b/app/core/gimpcoords.c
new file mode 100644
index 0000000..306f7f2
--- /dev/null
+++ b/app/core/gimpcoords.c
@@ -0,0 +1,248 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcoords.c
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpcoords.h"
+
+
+#define INPUT_RESOLUTION 256
+
+
+/*   amul * a + bmul * b = ret_val  */
+
+void
+gimp_coords_mix (const gdouble     amul,
+                 const GimpCoords *a,
+                 const gdouble     bmul,
+                 const GimpCoords *b,
+                 GimpCoords       *ret_val)
+{
+  if (b)
+    {
+      ret_val->x         = amul * a->x         + bmul * b->x;
+      ret_val->y         = amul * a->y         + bmul * b->y;
+      ret_val->pressure  = amul * a->pressure  + bmul * b->pressure;
+      ret_val->xtilt     = amul * a->xtilt     + bmul * b->xtilt;
+      ret_val->ytilt     = amul * a->ytilt     + bmul * b->ytilt;
+      ret_val->wheel     = amul * a->wheel     + bmul * b->wheel;
+      ret_val->velocity  = amul * a->velocity  + bmul * b->velocity;
+      ret_val->direction = amul * a->direction + bmul * b->direction;
+      ret_val->extended  = b->extended || a->extended;
+    }
+  else
+    {
+      ret_val->x         = amul * a->x;
+      ret_val->y         = amul * a->y;
+      ret_val->pressure  = amul * a->pressure;
+      ret_val->xtilt     = amul * a->xtilt;
+      ret_val->ytilt     = amul * a->ytilt;
+      ret_val->wheel     = amul * a->wheel;
+      ret_val->velocity  = amul * a->velocity;
+      ret_val->direction = amul * a->direction;
+      ret_val->extended  = a->extended;
+    }
+}
+
+
+/*    (a+b)/2 = ret_average  */
+
+void
+gimp_coords_average (const GimpCoords *a,
+                     const GimpCoords *b,
+                     GimpCoords       *ret_average)
+{
+  gimp_coords_mix (0.5, a, 0.5, b, ret_average);
+}
+
+
+/* a + b = ret_add  */
+
+void
+gimp_coords_add (const GimpCoords *a,
+                 const GimpCoords *b,
+                 GimpCoords       *ret_add)
+{
+  gimp_coords_mix (1.0, a, 1.0, b, ret_add);
+}
+
+
+/* a - b = ret_difference */
+
+void
+gimp_coords_difference (const GimpCoords *a,
+                        const GimpCoords *b,
+                        GimpCoords       *ret_difference)
+{
+  gimp_coords_mix (1.0, a, -1.0, b, ret_difference);
+}
+
+
+/* a * f = ret_product  */
+
+void
+gimp_coords_scale (const gdouble     f,
+                   const GimpCoords *a,
+                   GimpCoords       *ret_product)
+{
+  gimp_coords_mix (f, a, 0.0, NULL, ret_product);
+}
+
+
+/* local helper for measuring the scalarproduct of two gimpcoords. */
+
+gdouble
+gimp_coords_scalarprod (const GimpCoords *a,
+                        const GimpCoords *b)
+{
+  return (a->x         * b->x        +
+          a->y         * b->y        +
+          a->pressure  * b->pressure +
+          a->xtilt     * b->xtilt    +
+          a->ytilt     * b->ytilt    +
+          a->wheel     * b->wheel    +
+          a->velocity  * b->velocity +
+          a->direction * b->direction);
+}
+
+
+/*
+ * The "length" of the gimpcoord.
+ * Applies a metric that increases the weight on the
+ * pressure/xtilt/ytilt/wheel to ensure proper interpolation
+ */
+
+gdouble
+gimp_coords_length_squared (const GimpCoords *a)
+{
+  GimpCoords upscaled_a;
+
+  upscaled_a.x         = a->x;
+  upscaled_a.y         = a->y;
+  upscaled_a.pressure  = a->pressure  * INPUT_RESOLUTION;
+  upscaled_a.xtilt     = a->xtilt     * INPUT_RESOLUTION;
+  upscaled_a.ytilt     = a->ytilt     * INPUT_RESOLUTION;
+  upscaled_a.wheel     = a->wheel     * INPUT_RESOLUTION;
+  upscaled_a.velocity  = a->velocity  * INPUT_RESOLUTION;
+  upscaled_a.direction = a->direction * INPUT_RESOLUTION;
+
+  return gimp_coords_scalarprod (&upscaled_a, &upscaled_a);
+}
+
+
+gdouble
+gimp_coords_length (const GimpCoords *a)
+{
+  return sqrt (gimp_coords_length_squared (a));
+}
+
+/*
+ * Distance via manhattan metric, an upper bound for the eucledian metric.
+ * used for e.g. bezier approximation
+ */
+
+gdouble
+gimp_coords_manhattan_dist (const GimpCoords *a,
+                            const GimpCoords *b)
+{
+  gdouble dist = 0;
+
+  dist += ABS (a->pressure - b->pressure);
+  dist += ABS (a->xtilt - b->xtilt);
+  dist += ABS (a->ytilt - b->ytilt);
+  dist += ABS (a->wheel - b->wheel);
+  dist += ABS (a->velocity - b->velocity);
+  dist += ABS (a->direction - b->direction);
+
+  dist *= INPUT_RESOLUTION;
+
+  dist += ABS (a->x - b->x);
+  dist += ABS (a->y - b->y);
+
+  return dist;
+}
+
+gboolean
+gimp_coords_equal (const GimpCoords *a,
+                   const GimpCoords *b)
+{
+  return (a->x         == b->x        &&
+          a->y         == b->y        &&
+          a->pressure  == b->pressure &&
+          a->xtilt     == b->xtilt    &&
+          a->ytilt     == b->ytilt    &&
+          a->wheel     == b->wheel    &&
+          a->velocity  == b->velocity &&
+          a->direction == b->direction);
+
+  /* Extended attribute was omitted from this comparison deliberately,
+   * it describes the events origin, not its value
+   */
+}
+
+/* helper for calculating direction of two gimpcoords. */
+
+gdouble
+gimp_coords_direction (const GimpCoords *a,
+                       const GimpCoords *b)
+{
+  gdouble direction;
+  gdouble delta_x, delta_y;
+
+  delta_x = a->x - b->x;
+  delta_y = a->y - b->y;
+
+  if ((delta_x == 0) && (delta_y == 0))
+    {
+      direction = a->direction;
+    }
+  else if (delta_x == 0)
+    {
+      if (delta_y > 0)
+        direction = 0.25;
+      else
+        direction = 0.75;
+    }
+  else if (delta_y == 0)
+    {
+      if (delta_x < 0)
+        direction = 0.0;
+      else
+        direction = 0.5;
+    }
+  else
+    {
+      direction = atan ((- 1.0 * delta_y) / delta_x) / (2 * G_PI);
+
+      if (delta_x > 0.0)
+        direction = direction + 0.5;
+
+      if (direction < 0.0)
+        direction = direction + 1.0;
+    }
+
+  return direction;
+}
diff --git a/app/core/gimpcoords.h b/app/core/gimpcoords.h
new file mode 100644
index 0000000..38297f2
--- /dev/null
+++ b/app/core/gimpcoords.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcoords.h
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COORDS_H__
+#define __GIMP_COORDS_H__
+
+
+void     gimp_coords_mix            (const gdouble     amul,
+                                     const GimpCoords *a,
+                                     const gdouble     bmul,
+                                     const GimpCoords *b,
+                                     GimpCoords       *ret_val);
+void     gimp_coords_average        (const GimpCoords *a,
+                                     const GimpCoords *b,
+                                     GimpCoords       *ret_average);
+void     gimp_coords_add            (const GimpCoords *a,
+                                     const GimpCoords *b,
+                                     GimpCoords       *ret_add);
+void     gimp_coords_difference     (const GimpCoords *a,
+                                     const GimpCoords *b,
+                                     GimpCoords       *difference);
+void     gimp_coords_scale          (const gdouble     f,
+                                     const GimpCoords *a,
+                                     GimpCoords       *ret_product);
+
+gdouble  gimp_coords_scalarprod     (const GimpCoords *a,
+                                     const GimpCoords *b);
+gdouble  gimp_coords_length         (const GimpCoords *a);
+gdouble  gimp_coords_length_squared (const GimpCoords *a);
+gdouble  gimp_coords_manhattan_dist (const GimpCoords *a,
+                                     const GimpCoords *b);
+
+gboolean gimp_coords_equal          (const GimpCoords *a,
+                                     const GimpCoords *b);
+
+gdouble  gimp_coords_direction      (const GimpCoords *a,
+                                     const GimpCoords *b);
+
+
+#endif /* __GIMP_COORDS_H__ */
diff --git a/app/core/gimpcurve-load.c b/app/core/gimpcurve-load.c
new file mode 100644
index 0000000..9397d4a
--- /dev/null
+++ b/app/core/gimpcurve-load.c
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpcurve.h"
+#include "gimpcurve-load.h"
+
+
+GList *
+gimp_curve_load (GFile         *file,
+                 GInputStream  *input,
+                 GError       **error)
+{
+  GimpCurve *curve;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  curve = g_object_new (GIMP_TYPE_CURVE, NULL);
+
+  if (gimp_config_deserialize_stream (GIMP_CONFIG (curve),
+                                      input,
+                                      NULL, error))
+    {
+      return g_list_prepend (NULL, curve);
+    }
+
+  g_object_unref (curve);
+
+  return NULL;
+}
diff --git a/app/core/gimpcurve-load.h b/app/core/gimpcurve-load.h
new file mode 100644
index 0000000..fc7ffa3
--- /dev/null
+++ b/app/core/gimpcurve-load.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVE_LOAD_H__
+#define __GIMP_CURVE_LOAD_H__
+
+
+#define GIMP_CURVE_FILE_EXTENSION ".curve"
+
+
+GList * gimp_curve_load (GFile         *file,
+                         GInputStream  *input,
+                         GError       **error);
+
+
+#endif /* __GIMP_CURVE_LOAD_H__ */
diff --git a/app/core/gimpcurve-map.c b/app/core/gimpcurve-map.c
new file mode 100644
index 0000000..bd39b27
--- /dev/null
+++ b/app/core/gimpcurve-map.c
@@ -0,0 +1,253 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpcurve.h"
+#include "gimpcurve-map.h"
+
+
+#if defined (HAVE_ISFINITE)
+#define FINITE(x) isfinite(x)
+#elif defined (HAVE_FINITE)
+#define FINITE(x) finite(x)
+#elif defined (G_OS_WIN32)
+#define FINITE(x) _finite(x)
+#else
+#error "no FINITE() implementation available?!"
+#endif
+
+
+enum
+{
+  CURVE_NONE   = 0,
+  CURVE_COLORS = 1 << 0,
+  CURVE_RED    = 1 << 1,
+  CURVE_GREEN  = 1 << 2,
+  CURVE_BLUE   = 1 << 3,
+  CURVE_ALPHA  = 1 << 4
+};
+
+static guint           gimp_curve_get_apply_mask   (GimpCurve *curve_colors,
+                                                    GimpCurve *curve_red,
+                                                    GimpCurve *curve_green,
+                                                    GimpCurve *curve_blue,
+                                                    GimpCurve *curve_alpha);
+static inline gdouble  gimp_curve_map_value_inline (GimpCurve *curve,
+                                                    gdouble    value);
+
+
+gdouble
+gimp_curve_map_value (GimpCurve *curve,
+                      gdouble    value)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), 0.0);
+
+  return gimp_curve_map_value_inline (curve, value);
+}
+
+void
+gimp_curve_map_pixels (GimpCurve *curve_colors,
+                       GimpCurve *curve_red,
+                       GimpCurve *curve_green,
+                       GimpCurve *curve_blue,
+                       GimpCurve *curve_alpha,
+                       gfloat    *src,
+                       gfloat    *dest,
+                       glong      samples)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve_colors));
+  g_return_if_fail (GIMP_IS_CURVE (curve_red));
+  g_return_if_fail (GIMP_IS_CURVE (curve_green));
+  g_return_if_fail (GIMP_IS_CURVE (curve_blue));
+  g_return_if_fail (GIMP_IS_CURVE (curve_alpha));
+
+  switch (gimp_curve_get_apply_mask (curve_colors,
+                                     curve_red,
+                                     curve_green,
+                                     curve_blue,
+                                     curve_alpha))
+    {
+    case CURVE_NONE:
+      memcpy (dest, src, samples * 4 * sizeof (gfloat));
+      break;
+
+    case CURVE_COLORS:
+      while (samples--)
+        {
+          dest[0] = gimp_curve_map_value_inline (curve_colors, src[0]);
+          dest[1] = gimp_curve_map_value_inline (curve_colors, src[1]);
+          dest[2] = gimp_curve_map_value_inline (curve_colors, src[2]);
+          /* don't apply the colors curve to the alpha channel */
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case CURVE_RED:
+      while (samples--)
+        {
+          dest[0] = gimp_curve_map_value_inline (curve_red, src[0]);
+          dest[1] = src[1];
+          dest[2] = src[2];
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case CURVE_GREEN:
+      while (samples--)
+        {
+          dest[0] = src[0];
+          dest[1] = gimp_curve_map_value_inline (curve_green, src[1]);
+          dest[2] = src[2];
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case CURVE_BLUE:
+      while (samples--)
+        {
+          dest[0] = src[0];
+          dest[1] = src[1];
+          dest[2] = gimp_curve_map_value_inline (curve_blue, src[2]);
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+     case CURVE_ALPHA:
+      while (samples--)
+        {
+          dest[0] = src[0];
+          dest[1] = src[1];
+          dest[2] = src[2];
+          dest[3] = gimp_curve_map_value_inline (curve_alpha, src[3]);
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case (CURVE_RED | CURVE_GREEN | CURVE_BLUE):
+      while (samples--)
+        {
+          dest[0] = gimp_curve_map_value_inline (curve_red,   src[0]);
+          dest[1] = gimp_curve_map_value_inline (curve_green, src[1]);
+          dest[2] = gimp_curve_map_value_inline (curve_blue,  src[2]);
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    default:
+      while (samples--)
+        {
+          dest[0] = gimp_curve_map_value_inline (curve_colors,
+                                                 gimp_curve_map_value_inline (curve_red,
+                                                                              src[0]));
+          dest[1] = gimp_curve_map_value_inline (curve_colors,
+                                                 gimp_curve_map_value_inline (curve_green,
+                                                                              src[1]));
+          dest[2] = gimp_curve_map_value_inline (curve_colors,
+                                                 gimp_curve_map_value_inline (curve_blue,
+                                                                              src[2]));
+          /* don't apply the colors curve to the alpha channel */
+          dest[3] = gimp_curve_map_value_inline (curve_alpha, src[3]);
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+    }
+}
+
+static guint
+gimp_curve_get_apply_mask (GimpCurve *curve_colors,
+                           GimpCurve *curve_red,
+                           GimpCurve *curve_green,
+                           GimpCurve *curve_blue,
+                           GimpCurve *curve_alpha)
+{
+  return ((gimp_curve_is_identity (curve_colors) ? 0 : CURVE_COLORS) |
+          (gimp_curve_is_identity (curve_red)    ? 0 : CURVE_RED)    |
+          (gimp_curve_is_identity (curve_green)  ? 0 : CURVE_GREEN)  |
+          (gimp_curve_is_identity (curve_blue)   ? 0 : CURVE_BLUE)   |
+          (gimp_curve_is_identity (curve_alpha)  ? 0 : CURVE_ALPHA));
+}
+
+static inline gdouble
+gimp_curve_map_value_inline (GimpCurve *curve,
+                             gdouble    value)
+{
+  if (curve->identity)
+    {
+      if (FINITE (value))
+        return CLAMP (value, 0.0, 1.0);
+
+      return 0.0;
+    }
+
+  /*  check for known values first, so broken values like NaN
+   *  delivered by broken drivers don't run into the interpolation
+   *  code
+   */
+  if (value > 0.0 && value < 1.0) /* interpolate the curve */
+    {
+      gdouble f;
+      gint    index;
+
+      /*  map value to the sample space  */
+      value = value * (curve->n_samples - 1);
+
+      /*  determine the indices of the closest sample points  */
+      index = (gint) value;
+
+      /*  calculate the position between the sample points  */
+      f = value - index;
+
+      return (1.0 - f) * curve->samples[index] + f * curve->samples[index + 1];
+    }
+  else if (value >= 1.0)
+    {
+      return curve->samples[curve->n_samples - 1];
+    }
+  else
+    {
+      return curve->samples[0];
+    }
+}
diff --git a/app/core/gimpcurve-map.h b/app/core/gimpcurve-map.h
new file mode 100644
index 0000000..185e2fc
--- /dev/null
+++ b/app/core/gimpcurve-map.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVE_MAP_H__
+#define __GIMP_CURVE_MAP_H__
+
+
+gdouble         gimp_curve_map_value         (GimpCurve     *curve,
+                                              gdouble        value);
+void            gimp_curve_map_pixels        (GimpCurve     *curve_colors,
+                                              GimpCurve     *curve_red,
+                                              GimpCurve     *curve_green,
+                                              GimpCurve     *curve_blue,
+                                              GimpCurve     *curve_alpha,
+                                              gfloat        *src,
+                                              gfloat        *dest,
+                                              glong          samples);
+
+
+#endif /* __GIMP_CURVE_MAP_H__ */
diff --git a/app/core/gimpcurve-save.c b/app/core/gimpcurve-save.c
new file mode 100644
index 0000000..2791b13
--- /dev/null
+++ b/app/core/gimpcurve-save.c
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpcurve.h"
+#include "gimpcurve-save.h"
+
+
+gboolean
+gimp_curve_save (GimpData       *data,
+                 GOutputStream  *output,
+                 GError        **error)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return gimp_config_serialize_to_stream (GIMP_CONFIG (data),
+                                          output,
+                                          "GIMP curve file",
+                                          "end of GIMP curve file",
+                                          NULL, error);
+}
diff --git a/app/core/gimpcurve-save.h b/app/core/gimpcurve-save.h
new file mode 100644
index 0000000..98d504f
--- /dev/null
+++ b/app/core/gimpcurve-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVE_SAVE_H__
+#define __GIMP_CURVE_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_curve_save (GimpData       *data,
+                            GOutputStream  *output,
+                            GError        **error);
+
+
+#endif /* __GIMP_CURVE_SAVE_H__ */
diff --git a/app/core/gimpcurve.c b/app/core/gimpcurve.c
new file mode 100644
index 0000000..bde20b2
--- /dev/null
+++ b/app/core/gimpcurve.c
@@ -0,0 +1,1289 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h> /* memcmp */
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpcurve.h"
+#include "gimpcurve-load.h"
+#include "gimpcurve-save.h"
+#include "gimpparamspecs.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON 1e-6
+
+
+enum
+{
+  PROP_0,
+  PROP_CURVE_TYPE,
+  PROP_N_POINTS,
+  PROP_POINTS,
+  PROP_POINT_TYPES,
+  PROP_N_SAMPLES,
+  PROP_SAMPLES
+};
+
+
+/*  local function prototypes  */
+
+static void          gimp_curve_config_iface_init (GimpConfigInterface *iface);
+
+static void          gimp_curve_finalize          (GObject          *object);
+static void          gimp_curve_set_property      (GObject          *object,
+                                                   guint             property_id,
+                                                   const GValue     *value,
+                                                   GParamSpec       *pspec);
+static void          gimp_curve_get_property      (GObject          *object,
+                                                   guint             property_id,
+                                                   GValue           *value,
+                                                   GParamSpec       *pspec);
+
+static gint64        gimp_curve_get_memsize       (GimpObject       *object,
+                                                   gint64           *gui_size);
+
+static void          gimp_curve_get_preview_size  (GimpViewable     *viewable,
+                                                   gint              size,
+                                                   gboolean          popup,
+                                                   gboolean          dot_for_dot,
+                                                   gint             *width,
+                                                   gint             *height);
+static gboolean      gimp_curve_get_popup_size    (GimpViewable     *viewable,
+                                                   gint              width,
+                                                   gint              height,
+                                                   gboolean          dot_for_dot,
+                                                   gint             *popup_width,
+                                                   gint             *popup_height);
+static GimpTempBuf * gimp_curve_get_new_preview   (GimpViewable     *viewable,
+                                                   GimpContext      *context,
+                                                   gint              width,
+                                                   gint              height);
+static gchar       * gimp_curve_get_description   (GimpViewable     *viewable,
+                                                   gchar           **tooltip);
+
+static void          gimp_curve_dirty             (GimpData         *data);
+static const gchar * gimp_curve_get_extension     (GimpData         *data);
+static void          gimp_curve_data_copy         (GimpData         *data,
+                                                   GimpData         *src_data);
+
+static gboolean      gimp_curve_serialize         (GimpConfig       *config,
+                                                   GimpConfigWriter *writer,
+                                                   gpointer          data);
+static gboolean      gimp_curve_deserialize       (GimpConfig       *config,
+                                                   GScanner         *scanner,
+                                                   gint              nest_level,
+                                                   gpointer          data);
+static gboolean      gimp_curve_equal             (GimpConfig       *a,
+                                                   GimpConfig       *b);
+static void          _gimp_curve_reset            (GimpConfig       *config);
+static gboolean      gimp_curve_config_copy       (GimpConfig       *src,
+                                                   GimpConfig       *dest,
+                                                   GParamFlags       flags);
+
+static void          gimp_curve_calculate         (GimpCurve        *curve);
+static void          gimp_curve_plot              (GimpCurve        *curve,
+                                                   gint              p1,
+                                                   gint              p2,
+                                                   gint              p3,
+                                                   gint              p4);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpCurve, gimp_curve, GIMP_TYPE_DATA,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_curve_config_iface_init))
+
+#define parent_class gimp_curve_parent_class
+
+
+static void
+gimp_curve_class_init (GimpCurveClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+  GParamSpec        *array_spec;
+
+  object_class->finalize            = gimp_curve_finalize;
+  object_class->set_property        = gimp_curve_set_property;
+  object_class->get_property        = gimp_curve_get_property;
+
+  gimp_object_class->get_memsize    = gimp_curve_get_memsize;
+
+  viewable_class->default_icon_name = "FIXME icon name";
+  viewable_class->get_preview_size  = gimp_curve_get_preview_size;
+  viewable_class->get_popup_size    = gimp_curve_get_popup_size;
+  viewable_class->get_new_preview   = gimp_curve_get_new_preview;
+  viewable_class->get_description   = gimp_curve_get_description;
+
+  data_class->dirty                 = gimp_curve_dirty;
+  data_class->save                  = gimp_curve_save;
+  data_class->get_extension         = gimp_curve_get_extension;
+  data_class->copy                  = gimp_curve_data_copy;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CURVE_TYPE,
+                         "curve-type",
+                         "Curve Type",
+                         "The curve type",
+                         GIMP_TYPE_CURVE_TYPE,
+                         GIMP_CURVE_SMOOTH, 0);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_N_POINTS,
+                        "n-points",
+                        "Number of Points",
+                        "The number of points",
+                        0, G_MAXINT, 0,
+                        /* for backward compatibility */
+                        GIMP_CONFIG_PARAM_IGNORE);
+
+  array_spec = g_param_spec_double ("point", NULL, NULL,
+                                    -1.0, 1.0, 0.0, GIMP_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_POINTS,
+                                   gimp_param_spec_value_array ("points",
+                                                                NULL, NULL,
+                                                                array_spec,
+                                                                GIMP_PARAM_STATIC_STRINGS |
+                                                                GIMP_CONFIG_PARAM_FLAGS));
+
+  array_spec = g_param_spec_enum ("point-type", NULL, NULL,
+                                  GIMP_TYPE_CURVE_POINT_TYPE,
+                                  GIMP_CURVE_POINT_SMOOTH,
+                                  GIMP_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_POINT_TYPES,
+                                   gimp_param_spec_value_array ("point-types",
+                                                                NULL, NULL,
+                                                                array_spec,
+                                                                GIMP_PARAM_STATIC_STRINGS |
+                                                                GIMP_CONFIG_PARAM_FLAGS));
+
+  GIMP_CONFIG_PROP_INT  (object_class, PROP_N_SAMPLES,
+                         "n-samples",
+                         "Number of Samples",
+                         "The number of samples",
+                         256, 256, 256, 0);
+
+  array_spec = g_param_spec_double ("sample", NULL, NULL,
+                                    0.0, 1.0, 0.0, GIMP_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_SAMPLES,
+                                   gimp_param_spec_value_array ("samples",
+                                                                NULL, NULL,
+                                                                array_spec,
+                                                                GIMP_PARAM_STATIC_STRINGS |
+                                                                GIMP_CONFIG_PARAM_FLAGS));
+}
+
+static void
+gimp_curve_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_curve_serialize;
+  iface->deserialize = gimp_curve_deserialize;
+  iface->equal       = gimp_curve_equal;
+  iface->reset       = _gimp_curve_reset;
+  iface->copy        = gimp_curve_config_copy;
+}
+
+static void
+gimp_curve_init (GimpCurve *curve)
+{
+  curve->n_points  = 0;
+  curve->points    = NULL;
+  curve->n_samples = 0;
+  curve->samples   = NULL;
+  curve->identity  = FALSE;
+}
+
+static void
+gimp_curve_finalize (GObject *object)
+{
+  GimpCurve *curve = GIMP_CURVE (object);
+
+  g_clear_pointer (&curve->points,  g_free);
+  curve->n_points = 0;
+
+  g_clear_pointer (&curve->samples, g_free);
+  curve->n_samples = 0;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_curve_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GimpCurve *curve = GIMP_CURVE (object);
+
+  switch (property_id)
+    {
+    case PROP_CURVE_TYPE:
+      gimp_curve_set_curve_type (curve, g_value_get_enum (value));
+      break;
+
+    case PROP_N_POINTS:
+      /* ignored */
+      break;
+
+    case PROP_POINTS:
+      {
+        GimpValueArray *array = g_value_get_boxed (value);
+        GimpCurvePoint *points;
+        gint            length;
+        gint            n_points;
+        gint            i;
+
+        if (! array)
+          {
+            gimp_curve_clear_points (curve);
+
+            break;
+          }
+
+        length = gimp_value_array_length (array) / 2;
+
+        n_points = 0;
+        points   = g_new0 (GimpCurvePoint, length);
+
+        for (i = 0; i < length; i++)
+          {
+            GValue *x = gimp_value_array_index (array, i * 2);
+            GValue *y = gimp_value_array_index (array, i * 2 + 1);
+
+            /* for backward compatibility */
+            if (g_value_get_double (x) < 0.0)
+              continue;
+
+            points[n_points].x = CLAMP (g_value_get_double (x), 0.0, 1.0);
+            points[n_points].y = CLAMP (g_value_get_double (y), 0.0, 1.0);
+
+            if (n_points > 0)
+              {
+                points[n_points].x = MAX (points[n_points].x,
+                                          points[n_points - 1].x);
+              }
+
+            if (n_points < curve->n_points)
+              points[n_points].type = curve->points[n_points].type;
+            else
+              points[n_points].type = GIMP_CURVE_POINT_SMOOTH;
+
+            n_points++;
+          }
+
+        g_free (curve->points);
+
+        curve->n_points = n_points;
+        curve->points   = points;
+
+        g_object_notify (object, "n-points");
+        g_object_notify (object, "point-types");
+      }
+      break;
+
+    case PROP_POINT_TYPES:
+      {
+        GimpValueArray *array = g_value_get_boxed (value);
+        GimpCurvePoint *points;
+        gint            length;
+        gdouble         x     = 0.0;
+        gdouble         y     = 0.0;
+        gint            i;
+
+        if (! array)
+          {
+            gimp_curve_clear_points (curve);
+
+            break;
+          }
+
+        length = gimp_value_array_length (array);
+
+        points = g_new0 (GimpCurvePoint, length);
+
+        for (i = 0; i < length; i++)
+          {
+            GValue *type = gimp_value_array_index (array, i);
+
+            points[i].type = g_value_get_enum (type);
+
+            if (i < curve->n_points)
+              {
+                x = curve->points[i].x;
+                y = curve->points[i].y;
+              }
+
+            points[i].x = x;
+            points[i].y = y;
+          }
+
+        g_free (curve->points);
+
+        curve->n_points = length;
+        curve->points   = points;
+
+        g_object_notify (object, "n-points");
+        g_object_notify (object, "points");
+      }
+      break;
+
+    case PROP_N_SAMPLES:
+      gimp_curve_set_n_samples (curve, g_value_get_int (value));
+      break;
+
+    case PROP_SAMPLES:
+      {
+        GimpValueArray *array = g_value_get_boxed (value);
+        gint            length;
+        gint            i;
+
+        if (! array)
+          break;
+
+        length = gimp_value_array_length (array);
+
+        for (i = 0; i < curve->n_samples && i < length; i++)
+          {
+            GValue *v = gimp_value_array_index (array, i);
+
+            curve->samples[i] = CLAMP (g_value_get_double (v), 0.0, 1.0);
+          }
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_curve_get_property (GObject    *object,
+                         guint       property_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GimpCurve *curve = GIMP_CURVE (object);
+
+  switch (property_id)
+    {
+    case PROP_CURVE_TYPE:
+      g_value_set_enum (value, curve->curve_type);
+      break;
+
+    case PROP_N_POINTS:
+      g_value_set_int (value, curve->n_points);
+      break;
+
+    case PROP_POINTS:
+      {
+        GimpValueArray *array = gimp_value_array_new (curve->n_points * 2);
+        GValue          v     = G_VALUE_INIT;
+        gint            i;
+
+        g_value_init (&v, G_TYPE_DOUBLE);
+
+        for (i = 0; i < curve->n_points; i++)
+          {
+            g_value_set_double (&v, curve->points[i].x);
+            gimp_value_array_append (array, &v);
+
+            g_value_set_double (&v, curve->points[i].y);
+            gimp_value_array_append (array, &v);
+          }
+
+        g_value_unset (&v);
+
+        g_value_take_boxed (value, array);
+      }
+      break;
+
+    case PROP_POINT_TYPES:
+      {
+        GimpValueArray *array = gimp_value_array_new (curve->n_points);
+        GValue          v     = G_VALUE_INIT;
+        gint            i;
+
+        g_value_init (&v, GIMP_TYPE_CURVE_POINT_TYPE);
+
+        for (i = 0; i < curve->n_points; i++)
+          {
+            g_value_set_enum (&v, curve->points[i].type);
+            gimp_value_array_append (array, &v);
+          }
+
+        g_value_unset (&v);
+
+        g_value_take_boxed (value, array);
+      }
+      break;
+
+    case PROP_N_SAMPLES:
+      g_value_set_int (value, curve->n_samples);
+      break;
+
+    case PROP_SAMPLES:
+      {
+        GimpValueArray *array = gimp_value_array_new (curve->n_samples);
+        GValue          v     = G_VALUE_INIT;
+        gint            i;
+
+        g_value_init (&v, G_TYPE_DOUBLE);
+
+        for (i = 0; i < curve->n_samples; i++)
+          {
+            g_value_set_double (&v, curve->samples[i]);
+            gimp_value_array_append (array, &v);
+          }
+
+        g_value_unset (&v);
+
+        g_value_take_boxed (value, array);
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_curve_get_memsize (GimpObject *object,
+                        gint64     *gui_size)
+{
+  GimpCurve *curve   = GIMP_CURVE (object);
+  gint64     memsize = 0;
+
+  memsize += curve->n_points  * sizeof (GimpCurvePoint);
+  memsize += curve->n_samples * sizeof (gdouble);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_curve_get_preview_size (GimpViewable *viewable,
+                             gint          size,
+                             gboolean      popup,
+                             gboolean      dot_for_dot,
+                             gint         *width,
+                             gint         *height)
+{
+  *width  = size;
+  *height = size;
+}
+
+static gboolean
+gimp_curve_get_popup_size (GimpViewable *viewable,
+                           gint          width,
+                           gint          height,
+                           gboolean      dot_for_dot,
+                           gint         *popup_width,
+                           gint         *popup_height)
+{
+  *popup_width  = width  * 2;
+  *popup_height = height * 2;
+
+  return TRUE;
+}
+
+static GimpTempBuf *
+gimp_curve_get_new_preview (GimpViewable *viewable,
+                            GimpContext  *context,
+                            gint          width,
+                            gint          height)
+{
+  return NULL;
+}
+
+static gchar *
+gimp_curve_get_description (GimpViewable  *viewable,
+                            gchar        **tooltip)
+{
+  GimpCurve *curve = GIMP_CURVE (viewable);
+
+  return g_strdup_printf ("%s", gimp_object_get_name (curve));
+}
+
+static void
+gimp_curve_dirty (GimpData *data)
+{
+  GimpCurve *curve = GIMP_CURVE (data);
+
+  curve->identity = FALSE;
+
+  gimp_curve_calculate (curve);
+
+  GIMP_DATA_CLASS (parent_class)->dirty (data);
+}
+
+static const gchar *
+gimp_curve_get_extension (GimpData *data)
+{
+  return GIMP_CURVE_FILE_EXTENSION;
+}
+
+static void
+gimp_curve_data_copy (GimpData *data,
+                      GimpData *src_data)
+{
+  gimp_data_freeze (data);
+
+  gimp_config_copy (GIMP_CONFIG (src_data),
+                    GIMP_CONFIG (data), 0);
+
+  gimp_data_thaw (data);
+}
+
+static gboolean
+gimp_curve_serialize (GimpConfig       *config,
+                      GimpConfigWriter *writer,
+                      gpointer          data)
+{
+  return gimp_config_serialize_properties (config, writer);
+}
+
+static gboolean
+gimp_curve_deserialize (GimpConfig *config,
+                        GScanner   *scanner,
+                        gint        nest_level,
+                        gpointer    data)
+{
+  gboolean success;
+
+  success = gimp_config_deserialize_properties (config, scanner, nest_level);
+
+  GIMP_CURVE (config)->identity = FALSE;
+
+  return success;
+}
+
+static gboolean
+gimp_curve_equal (GimpConfig *a,
+                  GimpConfig *b)
+{
+  GimpCurve *a_curve = GIMP_CURVE (a);
+  GimpCurve *b_curve = GIMP_CURVE (b);
+
+  if (a_curve->curve_type != b_curve->curve_type)
+    return FALSE;
+
+  if (a_curve->n_points != b_curve->n_points ||
+      memcmp (a_curve->points, b_curve->points,
+              sizeof (GimpCurvePoint) * a_curve->n_points))
+    {
+      return FALSE;
+    }
+
+  if (a_curve->n_samples != b_curve->n_samples ||
+      memcmp (a_curve->samples, b_curve->samples,
+              sizeof (gdouble) * a_curve->n_samples))
+    {
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+_gimp_curve_reset (GimpConfig *config)
+{
+  gimp_curve_reset (GIMP_CURVE (config), TRUE);
+}
+
+static gboolean
+gimp_curve_config_copy (GimpConfig  *src,
+                        GimpConfig  *dest,
+                        GParamFlags  flags)
+{
+  GimpCurve *src_curve  = GIMP_CURVE (src);
+  GimpCurve *dest_curve = GIMP_CURVE (dest);
+
+  /* make sure the curve type is copied *before* the points, so that we don't
+   * overwrite the copied points when changing the type
+   */
+  dest_curve->curve_type = src_curve->curve_type;
+
+  gimp_config_sync (G_OBJECT (src), G_OBJECT (dest), flags);
+
+  dest_curve->identity = src_curve->identity;
+
+  gimp_data_dirty (GIMP_DATA (dest));
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GimpData *
+gimp_curve_new (const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (*name != '\0', NULL);
+
+  return g_object_new (GIMP_TYPE_CURVE,
+                       "name", name,
+                       NULL);
+}
+
+GimpData *
+gimp_curve_get_standard (void)
+{
+  static GimpData *standard_curve = NULL;
+
+  if (! standard_curve)
+    {
+      standard_curve = gimp_curve_new ("Standard");
+
+      gimp_data_clean (standard_curve);
+      gimp_data_make_internal (standard_curve,
+                               "gimp-curve-standard");
+
+      g_object_ref (standard_curve);
+    }
+
+  return standard_curve;
+}
+
+void
+gimp_curve_reset (GimpCurve *curve,
+                  gboolean   reset_type)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+
+  g_object_freeze_notify (G_OBJECT (curve));
+
+  for (i = 0; i < curve->n_samples; i++)
+    curve->samples[i] = (gdouble) i / (gdouble) (curve->n_samples - 1);
+
+  g_object_notify (G_OBJECT (curve), "samples");
+
+  g_free (curve->points);
+
+  curve->n_points = 2;
+  curve->points   = g_new0 (GimpCurvePoint, 2);
+
+  curve->points[0].x    = 0.0;
+  curve->points[0].y    = 0.0;
+  curve->points[0].type = GIMP_CURVE_POINT_SMOOTH;
+
+  curve->points[1].x    = 1.0;
+  curve->points[1].y    = 1.0;
+  curve->points[1].type = GIMP_CURVE_POINT_SMOOTH;
+
+  g_object_notify (G_OBJECT (curve), "n-points");
+  g_object_notify (G_OBJECT (curve), "points");
+  g_object_notify (G_OBJECT (curve), "point-types");
+
+  if (reset_type)
+    {
+      curve->curve_type = GIMP_CURVE_SMOOTH;
+      g_object_notify (G_OBJECT (curve), "curve-type");
+    }
+
+  curve->identity = TRUE;
+
+  g_object_thaw_notify (G_OBJECT (curve));
+
+  gimp_data_dirty (GIMP_DATA (curve));
+}
+
+void
+gimp_curve_set_curve_type (GimpCurve     *curve,
+                           GimpCurveType  curve_type)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+
+  if (curve->curve_type != curve_type)
+    {
+      gimp_data_freeze (GIMP_DATA (curve));
+
+      g_object_freeze_notify (G_OBJECT (curve));
+
+      curve->curve_type = curve_type;
+
+      if (curve_type == GIMP_CURVE_SMOOTH)
+        {
+          gint i;
+
+          g_free (curve->points);
+
+          /*  pick some points from the curve and make them control
+           *  points
+           */
+          curve->n_points = 9;
+          curve->points   = g_new0 (GimpCurvePoint, 9);
+
+          for (i = 0; i < curve->n_points; i++)
+            {
+              gint sample = i * (curve->n_samples - 1) / (curve->n_points - 1);
+
+              curve->points[i].x    = (gdouble) sample /
+                                      (gdouble) (curve->n_samples - 1);
+              curve->points[i].y    = curve->samples[sample];
+              curve->points[i].type = GIMP_CURVE_POINT_SMOOTH;
+            }
+
+          g_object_notify (G_OBJECT (curve), "n-points");
+          g_object_notify (G_OBJECT (curve), "points");
+          g_object_notify (G_OBJECT (curve), "point-types");
+        }
+      else
+        {
+          gimp_curve_clear_points (curve);
+        }
+
+      g_object_notify (G_OBJECT (curve), "curve-type");
+
+      g_object_thaw_notify (G_OBJECT (curve));
+
+      gimp_data_thaw (GIMP_DATA (curve));
+    }
+}
+
+GimpCurveType
+gimp_curve_get_curve_type (GimpCurve *curve)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), GIMP_CURVE_SMOOTH);
+
+  return curve->curve_type;
+}
+
+gint
+gimp_curve_get_n_points (GimpCurve *curve)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), 0);
+
+  return curve->n_points;
+}
+
+void
+gimp_curve_set_n_samples (GimpCurve *curve,
+                          gint       n_samples)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (n_samples >= 256);
+  g_return_if_fail (n_samples <= 4096);
+
+  if (n_samples != curve->n_samples)
+    {
+      gint i;
+
+      g_object_freeze_notify (G_OBJECT (curve));
+
+      curve->n_samples = n_samples;
+      g_object_notify (G_OBJECT (curve), "n-samples");
+
+      curve->samples = g_renew (gdouble, curve->samples, curve->n_samples);
+
+      for (i = 0; i < curve->n_samples; i++)
+        curve->samples[i] = (gdouble) i / (gdouble) (curve->n_samples - 1);
+
+      g_object_notify (G_OBJECT (curve), "samples");
+
+      if (curve->curve_type == GIMP_CURVE_FREE)
+        curve->identity = TRUE;
+
+      g_object_thaw_notify (G_OBJECT (curve));
+    }
+}
+
+gint
+gimp_curve_get_n_samples (GimpCurve *curve)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), 0);
+
+  return curve->n_samples;
+}
+
+gint
+gimp_curve_get_point_at (GimpCurve *curve,
+                         gdouble    x)
+{
+  gint    closest_point = -1;
+  gdouble distance      = EPSILON;
+  gint    i;
+
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), -1);
+
+  for (i = 0; i < curve->n_points; i++)
+    {
+      gdouble point_distance;
+
+      point_distance = fabs (x - curve->points[i].x);
+
+      if (point_distance <= distance)
+        {
+          closest_point = i;
+          distance      = point_distance;
+        }
+    }
+
+  return closest_point;
+}
+
+gint
+gimp_curve_get_closest_point (GimpCurve *curve,
+                              gdouble    x,
+                              gdouble    y,
+                              gdouble    max_distance)
+{
+  gint    closest_point = -1;
+  gdouble distance2     = G_MAXDOUBLE;
+  gint    i;
+
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), -1);
+
+  if (max_distance >= 0.0)
+    distance2 = SQR (max_distance);
+
+  for (i = curve->n_points - 1; i >= 0; i--)
+    {
+      gdouble point_distance2;
+
+      point_distance2 = SQR (x - curve->points[i].x) +
+                        SQR (y - curve->points[i].y);
+
+      if (point_distance2 <= distance2)
+        {
+          closest_point = i;
+          distance2     = point_distance2;
+        }
+    }
+
+  return closest_point;
+}
+
+gint
+gimp_curve_add_point (GimpCurve *curve,
+                      gdouble    x,
+                      gdouble    y)
+{
+  GimpCurvePoint *points;
+  gint            point;
+
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), -1);
+
+  if (curve->curve_type == GIMP_CURVE_FREE)
+    return -1;
+
+  x = CLAMP (x, 0.0, 1.0);
+  y = CLAMP (y, 0.0, 1.0);
+
+  for (point = 0; point < curve->n_points; point++)
+    {
+      if (curve->points[point].x > x)
+        break;
+    }
+
+  points = g_new0 (GimpCurvePoint, curve->n_points + 1);
+
+  memcpy (points,         curve->points,
+          point * sizeof (GimpCurvePoint));
+  memcpy (points + point + 1, curve->points + point,
+          (curve->n_points - point) * sizeof (GimpCurvePoint));
+
+  points[point].x    = x;
+  points[point].y    = y;
+  points[point].type = GIMP_CURVE_POINT_SMOOTH;
+
+  g_free (curve->points);
+
+  curve->n_points++;
+  curve->points = points;
+
+  g_object_notify (G_OBJECT (curve), "n-points");
+  g_object_notify (G_OBJECT (curve), "points");
+  g_object_notify (G_OBJECT (curve), "point-types");
+
+  gimp_data_dirty (GIMP_DATA (curve));
+
+  return point;
+}
+
+void
+gimp_curve_delete_point (GimpCurve *curve,
+                         gint       point)
+{
+  GimpCurvePoint *points;
+
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (point >= 0 && point < curve->n_points);
+
+  points = g_new0 (GimpCurvePoint, curve->n_points - 1);
+
+  memcpy (points,         curve->points,
+          point * sizeof (GimpCurvePoint));
+  memcpy (points + point, curve->points + point + 1,
+          (curve->n_points - point - 1) * sizeof (GimpCurvePoint));
+
+  g_free (curve->points);
+
+  curve->n_points--;
+  curve->points = points;
+
+  g_object_notify (G_OBJECT (curve), "n-points");
+  g_object_notify (G_OBJECT (curve), "points");
+  g_object_notify (G_OBJECT (curve), "point-types");
+
+  gimp_data_dirty (GIMP_DATA (curve));
+}
+
+void
+gimp_curve_set_point (GimpCurve *curve,
+                      gint       point,
+                      gdouble    x,
+                      gdouble    y)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (point >= 0 && point < curve->n_points);
+
+  curve->points[point].x = CLAMP (x, 0.0, 1.0);
+  curve->points[point].y = CLAMP (y, 0.0, 1.0);
+
+  if (point > 0)
+    curve->points[point].x = MAX (x, curve->points[point - 1].x);
+
+  if (point < curve->n_points - 1)
+    curve->points[point].x = MIN (x, curve->points[point + 1].x);
+
+  g_object_notify (G_OBJECT (curve), "points");
+
+  gimp_data_dirty (GIMP_DATA (curve));
+}
+
+void
+gimp_curve_move_point (GimpCurve *curve,
+                       gint       point,
+                       gdouble    y)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (point >= 0 && point < curve->n_points);
+
+  curve->points[point].y = CLAMP (y, 0.0, 1.0);
+
+  g_object_notify (G_OBJECT (curve), "points");
+
+  gimp_data_dirty (GIMP_DATA (curve));
+}
+
+void
+gimp_curve_get_point (GimpCurve *curve,
+                      gint       point,
+                      gdouble   *x,
+                      gdouble   *y)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (point >= 0 && point < curve->n_points);
+
+  if (x) *x = curve->points[point].x;
+  if (y) *y = curve->points[point].y;
+}
+
+void
+gimp_curve_set_point_type (GimpCurve          *curve,
+                           gint                point,
+                           GimpCurvePointType  type)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (point >= 0 && point < curve->n_points);
+
+  curve->points[point].type = type;
+
+  g_object_notify (G_OBJECT (curve), "point-types");
+
+  gimp_data_dirty (GIMP_DATA (curve));
+}
+
+GimpCurvePointType
+gimp_curve_get_point_type (GimpCurve *curve,
+                           gint       point)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), GIMP_CURVE_POINT_SMOOTH);
+  g_return_val_if_fail (point >= 0 && point < curve->n_points, GIMP_CURVE_POINT_SMOOTH);
+
+  return curve->points[point].type;
+}
+
+void
+gimp_curve_clear_points (GimpCurve *curve)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+
+  if (curve->points)
+    {
+      g_clear_pointer (&curve->points, g_free);
+      curve->n_points = 0;
+
+      g_object_notify (G_OBJECT (curve), "n-points");
+      g_object_notify (G_OBJECT (curve), "points");
+      g_object_notify (G_OBJECT (curve), "point-types");
+
+      gimp_data_dirty (GIMP_DATA (curve));
+    }
+}
+
+void
+gimp_curve_set_curve (GimpCurve *curve,
+                      gdouble    x,
+                      gdouble    y)
+{
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  g_return_if_fail (x >= 0 && x <= 1.0);
+  g_return_if_fail (y >= 0 && y <= 1.0);
+
+  if (curve->curve_type == GIMP_CURVE_SMOOTH)
+    return;
+
+  curve->samples[ROUND (x * (gdouble) (curve->n_samples - 1))] = y;
+
+  g_object_notify (G_OBJECT (curve), "samples");
+
+  gimp_data_dirty (GIMP_DATA (curve));
+}
+
+/**
+ * gimp_curve_is_identity:
+ * @curve: a #GimpCurve object
+ *
+ * If this function returns %TRUE, then the curve maps each value to
+ * itself. If it returns %FALSE, then this assumption can not be made.
+ *
+ * Return value: %TRUE if the curve is an identity mapping, %FALSE otherwise.
+ **/
+gboolean
+gimp_curve_is_identity (GimpCurve *curve)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE (curve), FALSE);
+
+  return curve->identity;
+}
+
+void
+gimp_curve_get_uchar (GimpCurve *curve,
+                      gint       n_samples,
+                      guchar    *samples)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+  /* FIXME: support n_samples != curve->n_samples */
+  g_return_if_fail (n_samples == curve->n_samples);
+  g_return_if_fail (samples != NULL);
+
+  for (i = 0; i < curve->n_samples; i++)
+    samples[i] = curve->samples[i] * 255.999;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_curve_calculate (GimpCurve *curve)
+{
+  gint i;
+  gint p1, p2, p3, p4;
+
+  if (gimp_data_is_frozen (GIMP_DATA (curve)))
+    return;
+
+  switch (curve->curve_type)
+    {
+    case GIMP_CURVE_SMOOTH:
+      /*  Initialize boundary curve points */
+      if (curve->n_points > 0)
+        {
+          GimpCurvePoint point;
+          gint           boundary;
+
+          point    = curve->points[0];
+          boundary = ROUND (point.x * (gdouble) (curve->n_samples - 1));
+
+          for (i = 0; i < boundary; i++)
+            curve->samples[i] = point.y;
+
+          point    = curve->points[curve->n_points - 1];
+          boundary = ROUND (point.x * (gdouble) (curve->n_samples - 1));
+
+          for (i = boundary; i < curve->n_samples; i++)
+            curve->samples[i] = point.y;
+        }
+
+      for (i = 0; i < curve->n_points - 1; i++)
+        {
+          p1 = MAX (i - 1, 0);
+          p2 = i;
+          p3 = i + 1;
+          p4 = MIN (i + 2, curve->n_points - 1);
+
+          if (curve->points[p2].type == GIMP_CURVE_POINT_CORNER)
+            p1 = p2;
+
+          if (curve->points[p3].type == GIMP_CURVE_POINT_CORNER)
+            p4 = p3;
+
+          gimp_curve_plot (curve, p1, p2, p3, p4);
+        }
+
+      /* ensure that the control points are used exactly */
+      for (i = 0; i < curve->n_points; i++)
+        {
+          gdouble x = curve->points[i].x;
+          gdouble y = curve->points[i].y;
+
+          curve->samples[ROUND (x * (gdouble) (curve->n_samples - 1))] = y;
+        }
+
+      g_object_notify (G_OBJECT (curve), "samples");
+      break;
+
+    case GIMP_CURVE_FREE:
+      break;
+    }
+}
+
+/*
+ * This function calculates the curve values between the control points
+ * p2 and p3, taking the potentially existing neighbors p1 and p4 into
+ * account.
+ *
+ * This function uses a cubic bezier curve for the individual segments and
+ * calculates the necessary intermediate control points depending on the
+ * neighbor curve control points.
+ */
+static void
+gimp_curve_plot (GimpCurve *curve,
+                 gint       p1,
+                 gint       p2,
+                 gint       p3,
+                 gint       p4)
+{
+  gint    i;
+  gdouble x0, x3;
+  gdouble y0, y1, y2, y3;
+  gdouble dx, dy;
+  gdouble slope;
+
+  /* the outer control points for the bezier curve. */
+  x0 = curve->points[p2].x;
+  y0 = curve->points[p2].y;
+  x3 = curve->points[p3].x;
+  y3 = curve->points[p3].y;
+
+  /*
+   * the x values of the inner control points are fixed at
+   * x1 = 2/3*x0 + 1/3*x3   and  x2 = 1/3*x0 + 2/3*x3
+   * this ensures that the x values increase linearly with the
+   * parameter t and enables us to skip the calculation of the x
+   * values altogether - just calculate y(t) evenly spaced.
+   */
+
+  dx = x3 - x0;
+  dy = y3 - y0;
+
+  if (dx <= EPSILON)
+    {
+      gint index;
+
+      index = ROUND (x0 * (gdouble) (curve->n_samples - 1));
+
+      curve->samples[index] = y3;
+
+      return;
+    }
+
+  if (p1 == p2 && p3 == p4)
+    {
+      /* No information about the neighbors,
+       * calculate y1 and y2 to get a straight line
+       */
+      y1 = y0 + dy / 3.0;
+      y2 = y0 + dy * 2.0 / 3.0;
+    }
+  else if (p1 == p2 && p3 != p4)
+    {
+      /* only the right neighbor is available. Make the tangent at the
+       * right endpoint parallel to the line between the left endpoint
+       * and the right neighbor. Then point the tangent at the left towards
+       * the control handle of the right tangent, to ensure that the curve
+       * does not have an inflection point.
+       */
+      slope = (curve->points[p4].y - y0) / (curve->points[p4].x - x0);
+
+      y2 = y3 - slope * dx / 3.0;
+      y1 = y0 + (y2 - y0) / 2.0;
+    }
+  else if (p1 != p2 && p3 == p4)
+    {
+      /* see previous case */
+      slope = (y3 - curve->points[p1].y) / (x3 - curve->points[p1].x);
+
+      y1 = y0 + slope * dx / 3.0;
+      y2 = y3 + (y1 - y3) / 2.0;
+    }
+  else /* (p1 != p2 && p3 != p4) */
+    {
+      /* Both neighbors are available. Make the tangents at the endpoints
+       * parallel to the line between the opposite endpoint and the adjacent
+       * neighbor.
+       */
+      slope = (y3 - curve->points[p1].y) / (x3 - curve->points[p1].x);
+
+      y1 = y0 + slope * dx / 3.0;
+
+      slope = (curve->points[p4].y - y0) / (curve->points[p4].x - x0);
+
+      y2 = y3 - slope * dx / 3.0;
+    }
+
+  /*
+   * finally calculate the y(t) values for the given bezier values. We can
+   * use homogeneously distributed values for t, since x(t) increases linearly.
+   */
+  for (i = 0; i <= ROUND (dx * (gdouble) (curve->n_samples - 1)); i++)
+    {
+      gdouble y, t;
+      gint    index;
+
+      t = i / dx / (gdouble) (curve->n_samples - 1);
+      y =     y0 * (1-t) * (1-t) * (1-t) +
+          3 * y1 * (1-t) * (1-t) * t     +
+          3 * y2 * (1-t) * t     * t     +
+              y3 * t     * t     * t;
+
+      index = i + ROUND (x0 * (gdouble) (curve->n_samples - 1));
+
+      if (index < curve->n_samples)
+        curve->samples[index] = CLAMP (y, 0.0, 1.0);
+    }
+}
diff --git a/app/core/gimpcurve.h b/app/core/gimpcurve.h
new file mode 100644
index 0000000..71654aa
--- /dev/null
+++ b/app/core/gimpcurve.h
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVE_H__
+#define __GIMP_CURVE_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_CURVE            (gimp_curve_get_type ())
+#define GIMP_CURVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CURVE, GimpCurve))
+#define GIMP_CURVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CURVE, GimpCurveClass))
+#define GIMP_IS_CURVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CURVE))
+#define GIMP_IS_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CURVE))
+#define GIMP_CURVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CURVE, GimpCurveClass))
+
+
+typedef struct _GimpCurvePoint GimpCurvePoint;
+typedef struct _GimpCurveClass GimpCurveClass;
+
+struct _GimpCurvePoint
+{
+  gdouble            x;
+  gdouble            y;
+
+  GimpCurvePointType type;
+};
+
+struct _GimpCurve
+{
+  GimpData        parent_instance;
+
+  GimpCurveType   curve_type;
+
+  gint            n_points;
+  GimpCurvePoint *points;
+
+  gint            n_samples;
+  gdouble        *samples;
+
+  gboolean        identity;  /* whether the curve is an identity mapping */
+};
+
+struct _GimpCurveClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType                gimp_curve_get_type          (void) G_GNUC_CONST;
+
+GimpData           * gimp_curve_new               (const gchar        *name);
+GimpData           * gimp_curve_get_standard      (void);
+
+void                 gimp_curve_reset             (GimpCurve          *curve,
+                                                   gboolean            reset_type);
+
+void                 gimp_curve_set_curve_type    (GimpCurve          *curve,
+                                                   GimpCurveType       curve_type);
+GimpCurveType        gimp_curve_get_curve_type    (GimpCurve          *curve);
+
+gint                 gimp_curve_get_n_points      (GimpCurve          *curve);
+
+void                 gimp_curve_set_n_samples     (GimpCurve          *curve,
+                                                   gint                n_samples);
+gint                 gimp_curve_get_n_samples     (GimpCurve          *curve);
+
+gint                 gimp_curve_get_point_at      (GimpCurve          *curve,
+                                                   gdouble             x);
+gint                 gimp_curve_get_closest_point (GimpCurve          *curve,
+                                                   gdouble             x,
+                                                   gdouble             y,
+                                                   gdouble             max_distance);
+
+gint                 gimp_curve_add_point         (GimpCurve          *curve,
+                                                   gdouble             x,
+                                                   gdouble             y);
+void                 gimp_curve_delete_point      (GimpCurve          *curve,
+                                                   gint                point);
+void                 gimp_curve_set_point         (GimpCurve          *curve,
+                                                   gint                point,
+                                                   gdouble             x,
+                                                   gdouble             y);
+void                 gimp_curve_move_point        (GimpCurve          *curve,
+                                                   gint                point,
+                                                   gdouble             y);
+void                 gimp_curve_get_point         (GimpCurve          *curve,
+                                                   gint                point,
+                                                   gdouble            *x,
+                                                   gdouble            *y);
+void                 gimp_curve_set_point_type    (GimpCurve          *curve,
+                                                   gint                point,
+                                                   GimpCurvePointType  type);
+GimpCurvePointType   gimp_curve_get_point_type    (GimpCurve          *curve,
+                                                   gint                point);
+void                 gimp_curve_clear_points      (GimpCurve          *curve);
+
+void                 gimp_curve_set_curve         (GimpCurve          *curve,
+                                                   gdouble             x,
+                                                   gdouble             y);
+
+gboolean             gimp_curve_is_identity       (GimpCurve          *curve);
+
+void                 gimp_curve_get_uchar         (GimpCurve          *curve,
+                                                   gint                n_samples,
+                                                   guchar             *samples);
+
+
+#endif /* __GIMP_CURVE_H__ */
diff --git a/app/core/gimpdashpattern.c b/app/core/gimpdashpattern.c
new file mode 100644
index 0000000..e9fb9fc
--- /dev/null
+++ b/app/core/gimpdashpattern.c
@@ -0,0 +1,355 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdashpattern.c
+ * Copyright (C) 2003 Simon Budig
+ * Copyright (C) 2005 Sven Neumann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpdashpattern.h"
+
+
+GType
+gimp_dash_pattern_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpDashPattern",
+                                         (GBoxedCopyFunc) gimp_dash_pattern_copy,
+                                         (GBoxedFreeFunc) gimp_dash_pattern_free);
+
+  return type;
+}
+
+GArray *
+gimp_dash_pattern_new_from_preset (GimpDashPreset preset)
+{
+  GArray *pattern;
+  gdouble dash;
+  gint    i;
+
+  pattern = g_array_new (FALSE, FALSE, sizeof (gdouble));
+
+  switch (preset)
+    {
+    case GIMP_DASH_CUSTOM:
+      g_warning ("GIMP_DASH_CUSTOM passed to gimp_dash_pattern_from_preset()");
+      break;
+
+    case GIMP_DASH_LINE:
+      break;
+
+    case GIMP_DASH_LONG_DASH:
+      dash = 9.0; g_array_append_val (pattern, dash);
+      dash = 3.0; g_array_append_val (pattern, dash);
+      break;
+
+    case GIMP_DASH_MEDIUM_DASH:
+      dash = 6.0; g_array_append_val (pattern, dash);
+      dash = 6.0; g_array_append_val (pattern, dash);
+      break;
+
+    case GIMP_DASH_SHORT_DASH:
+      dash = 3.0; g_array_append_val (pattern, dash);
+      dash = 9.0; g_array_append_val (pattern, dash);
+      break;
+
+    case GIMP_DASH_SPARSE_DOTS:
+      for (i = 0; i < 2; i++)
+        {
+          dash = 1.0; g_array_append_val (pattern, dash);
+          dash = 5.0; g_array_append_val (pattern, dash);
+        }
+      break;
+
+    case GIMP_DASH_NORMAL_DOTS:
+      for (i = 0; i < 3; i++)
+        {
+          dash = 1.0; g_array_append_val (pattern, dash);
+          dash = 3.0; g_array_append_val (pattern, dash);
+        }
+      break;
+
+    case GIMP_DASH_DENSE_DOTS:
+      for (i = 0; i < 12; i++)
+        {
+          dash = 1.0; g_array_append_val (pattern, dash);
+        }
+      break;
+
+    case GIMP_DASH_STIPPLES:
+      for (i = 0; i < 24; i++)
+        {
+          dash = 0.5; g_array_append_val (pattern, dash);
+        }
+      break;
+
+    case GIMP_DASH_DASH_DOT:
+      dash = 7.0; g_array_append_val (pattern, dash);
+      dash = 2.0; g_array_append_val (pattern, dash);
+      dash = 1.0; g_array_append_val (pattern, dash);
+      dash = 2.0; g_array_append_val (pattern, dash);
+      break;
+
+    case GIMP_DASH_DASH_DOT_DOT:
+      dash = 7.0; g_array_append_val (pattern, dash);
+      for (i=0; i < 5; i++)
+        {
+          dash = 1.0; g_array_append_val (pattern, dash);
+        }
+      break;
+    }
+
+  if (pattern->len < 2)
+    {
+      gimp_dash_pattern_free (pattern);
+      return NULL;
+    }
+
+  return pattern;
+}
+
+GArray *
+gimp_dash_pattern_new_from_segments (const gboolean *segments,
+                                     gint            n_segments,
+                                     gdouble         dash_length)
+{
+  GArray   *pattern;
+  gint      i;
+  gint      count;
+  gboolean  state;
+
+  g_return_val_if_fail (segments != NULL || n_segments == 0, NULL);
+
+  pattern = g_array_new (FALSE, FALSE, sizeof (gdouble));
+
+  for (i = 0, count = 0, state = TRUE; i <= n_segments; i++)
+    {
+      if (i < n_segments && segments[i] == state)
+        {
+          count++;
+        }
+      else
+        {
+          gdouble l = (dash_length * count) / n_segments;
+
+          g_array_append_val (pattern, l);
+
+          count = 1;
+          state = ! state;
+        }
+    }
+
+  if (pattern->len < 2)
+    {
+      gimp_dash_pattern_free (pattern);
+      return NULL;
+    }
+
+  return pattern;
+}
+
+void
+gimp_dash_pattern_fill_segments (GArray   *pattern,
+                                 gboolean *segments,
+                                 gint      n_segments)
+{
+  gdouble   factor;
+  gdouble   sum;
+  gint      i, j;
+  gboolean  paint;
+
+  g_return_if_fail (segments != NULL || n_segments == 0);
+
+  if (pattern == NULL || pattern->len <= 1)
+    {
+      for (i = 0; i < n_segments; i++)
+        segments[i] = TRUE;
+
+      return;
+    }
+
+  for (i = 0, sum = 0; i < pattern->len ; i++)
+    {
+      sum += g_array_index (pattern, gdouble, i);
+    }
+
+  factor = ((gdouble) n_segments) / sum;
+
+  j = 0;
+  sum = g_array_index (pattern, gdouble, j) * factor;
+  paint = TRUE;
+
+  for (i = 0; i < n_segments ; i++)
+    {
+      while (j < pattern->len && sum <= i)
+        {
+          paint = ! paint;
+          j++;
+          sum += g_array_index (pattern, gdouble, j) * factor;
+        }
+
+      segments[i] = paint;
+    }
+}
+
+GArray *
+gimp_dash_pattern_from_value_array (GimpValueArray *value_array)
+{
+  if (value_array == NULL || gimp_value_array_length (value_array) == 0)
+    {
+      return NULL;
+    }
+  else
+    {
+      GArray *pattern;
+      gint    length;
+      gint    i;
+
+      length = gimp_value_array_length (value_array);
+
+      pattern = g_array_sized_new (FALSE, FALSE, sizeof (gdouble), length);
+
+      for (i = 0; i < length; i++)
+        {
+          GValue *item = gimp_value_array_index (value_array, i);
+          gdouble val;
+
+          g_return_val_if_fail (G_VALUE_HOLDS_DOUBLE (item), NULL);
+
+          val = g_value_get_double (item);
+
+          g_array_append_val (pattern, val);
+        }
+
+      return pattern;
+    }
+}
+
+GimpValueArray *
+gimp_dash_pattern_to_value_array (GArray *pattern)
+{
+  if (pattern != NULL && pattern->len > 0)
+    {
+      GimpValueArray *value_array = gimp_value_array_new (pattern->len);
+      GValue          item        = G_VALUE_INIT;
+      gint            i;
+
+      g_value_init (&item, G_TYPE_DOUBLE);
+
+      for (i = 0; i < pattern->len; i++)
+        {
+          g_value_set_double (&item, g_array_index (pattern, gdouble, i));
+          gimp_value_array_append (value_array, &item);
+        }
+
+      g_value_unset (&item);
+
+      return value_array;
+    }
+
+  return NULL;
+}
+
+GArray *
+gimp_dash_pattern_from_double_array (gint           n_dashes,
+                                     const gdouble *dashes)
+{
+  if (n_dashes > 0 && dashes != NULL)
+    {
+      GArray *pattern;
+      gint    i;
+
+      pattern = g_array_new (FALSE, FALSE, sizeof (gdouble));
+
+      for (i = 0; i < n_dashes; i++)
+        {
+          if (dashes[i] >= 0.0)
+            {
+              g_array_append_val (pattern, dashes[i]);
+            }
+          else
+            {
+              g_array_free (pattern, TRUE);
+              return NULL;
+            }
+        }
+
+      return pattern;
+    }
+
+  return NULL;
+}
+
+gdouble *
+gimp_dash_pattern_to_double_array (GArray *pattern,
+                                   gint   *n_dashes)
+{
+  if (pattern != NULL && pattern->len > 0)
+    {
+      gdouble *dashes;
+      gint     i;
+
+      dashes = g_new0 (gdouble, pattern->len);
+
+      for (i = 0; i < pattern->len; i++)
+        {
+          dashes[i] = g_array_index (pattern, gdouble, i);
+        }
+
+      if (n_dashes)
+        *n_dashes = pattern->len;
+
+      return dashes;
+    }
+
+  return NULL;
+}
+
+GArray *
+gimp_dash_pattern_copy (GArray *pattern)
+{
+  if (pattern)
+    {
+      GArray *copy;
+      gint    i;
+
+      copy = g_array_sized_new (FALSE, FALSE, sizeof (gdouble), pattern->len);
+
+      for (i = 0; i < pattern->len; i++)
+        g_array_append_val (copy, g_array_index (pattern, gdouble, i));
+
+      return copy;
+    }
+
+  return NULL;
+}
+
+void
+gimp_dash_pattern_free (GArray *pattern)
+{
+  if (pattern)
+    g_array_free (pattern, TRUE);
+}
diff --git a/app/core/gimpdashpattern.h b/app/core/gimpdashpattern.h
new file mode 100644
index 0000000..005c516
--- /dev/null
+++ b/app/core/gimpdashpattern.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdashpattern.h
+ * Copyright (C) 2003 Simon Budig
+ * Copyright (C) 2005 Sven Neumann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DASH_PATTERN_H__
+#define __GIMP_DASH_PATTERN_H__
+
+
+#define GIMP_TYPE_DASH_PATTERN               (gimp_dash_pattern_get_type ())
+#define GIMP_VALUE_HOLDS_DASH_PATTERN(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_DASH_PATTERN))
+
+
+GType            gimp_dash_pattern_get_type          (void) G_GNUC_CONST;
+
+GArray         * gimp_dash_pattern_new_from_preset   (GimpDashPreset  preset);
+GArray         * gimp_dash_pattern_new_from_segments (const gboolean *segments,
+                                                      gint            n_segments,
+                                                      gdouble         dash_length);
+
+void             gimp_dash_pattern_fill_segments     (GArray         *pattern,
+                                                      gboolean       *segments,
+                                                      gint            n_segments);
+
+GArray         * gimp_dash_pattern_from_value_array  (GimpValueArray *value_array);
+GimpValueArray * gimp_dash_pattern_to_value_array    (GArray         *pattern);
+
+GArray         * gimp_dash_pattern_from_double_array (gint            n_dashes,
+                                                      const gdouble  *dashes);
+gdouble        * gimp_dash_pattern_to_double_array   (GArray         *pattern,
+                                                      gint           *n_dashes);
+
+GArray         * gimp_dash_pattern_copy              (GArray         *pattern);
+void             gimp_dash_pattern_free              (GArray         *pattern);
+
+
+#endif  /*  __GIMP_DASH_PATTERN_H__  */
diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c
new file mode 100644
index 0000000..e4640f3
--- /dev/null
+++ b/app/core/gimpdata.c
@@ -0,0 +1,1245 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdata.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpdata.h"
+#include "gimpmarshal.h"
+#include "gimptag.h"
+#include "gimptagged.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  DIRTY,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_FILE,
+  PROP_WRITABLE,
+  PROP_DELETABLE,
+  PROP_MIME_TYPE
+};
+
+
+struct _GimpDataPrivate
+{
+  GFile  *file;
+  GQuark  mime_type;
+  guint   writable  : 1;
+  guint   deletable : 1;
+  guint   dirty     : 1;
+  guint   internal  : 1;
+  gint    freeze_count;
+  gint64  mtime;
+
+  /* Identifies the GimpData object across sessions. Used when there
+   * is not a filename associated with the object.
+   */
+  gchar  *identifier;
+
+  GList  *tags;
+};
+
+#define GIMP_DATA_GET_PRIVATE(obj) (((GimpData *) (obj))->priv)
+
+
+static void       gimp_data_tagged_iface_init (GimpTaggedInterface *iface);
+
+static void       gimp_data_constructed       (GObject             *object);
+static void       gimp_data_finalize          (GObject             *object);
+static void       gimp_data_set_property      (GObject             *object,
+                                               guint                property_id,
+                                               const GValue        *value,
+                                               GParamSpec          *pspec);
+static void       gimp_data_get_property      (GObject             *object,
+                                               guint                property_id,
+                                               GValue              *value,
+                                               GParamSpec          *pspec);
+
+static void       gimp_data_name_changed      (GimpObject          *object);
+static gint64     gimp_data_get_memsize       (GimpObject          *object,
+                                               gint64              *gui_size);
+
+static gboolean   gimp_data_is_name_editable  (GimpViewable        *viewable);
+
+static void       gimp_data_real_dirty        (GimpData            *data);
+static GimpData * gimp_data_real_duplicate    (GimpData            *data);
+static gint       gimp_data_real_compare      (GimpData            *data1,
+                                               GimpData            *data2);
+
+static gboolean   gimp_data_add_tag           (GimpTagged          *tagged,
+                                               GimpTag             *tag);
+static gboolean   gimp_data_remove_tag        (GimpTagged          *tagged,
+                                               GimpTag             *tag);
+static GList    * gimp_data_get_tags          (GimpTagged          *tagged);
+static gchar    * gimp_data_get_identifier    (GimpTagged          *tagged);
+static gchar    * gimp_data_get_checksum      (GimpTagged          *tagged);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpData, gimp_data, GIMP_TYPE_VIEWABLE,
+                         G_ADD_PRIVATE (GimpData)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_TAGGED,
+                                                gimp_data_tagged_iface_init))
+
+#define parent_class gimp_data_parent_class
+
+static guint data_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_data_class_init (GimpDataClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  data_signals[DIRTY] =
+    g_signal_new ("dirty",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDataClass, dirty),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->constructed        = gimp_data_constructed;
+  object_class->finalize           = gimp_data_finalize;
+  object_class->set_property       = gimp_data_set_property;
+  object_class->get_property       = gimp_data_get_property;
+
+  gimp_object_class->name_changed  = gimp_data_name_changed;
+  gimp_object_class->get_memsize   = gimp_data_get_memsize;
+
+  viewable_class->name_editable    = TRUE;
+  viewable_class->is_name_editable = gimp_data_is_name_editable;
+
+  klass->dirty                     = gimp_data_real_dirty;
+  klass->save                      = NULL;
+  klass->get_extension             = NULL;
+  klass->copy                      = NULL;
+  klass->duplicate                 = gimp_data_real_duplicate;
+  klass->compare                   = gimp_data_real_compare;
+
+  g_object_class_install_property (object_class, PROP_FILE,
+                                   g_param_spec_object ("file", NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WRITABLE,
+                                   g_param_spec_boolean ("writable", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_DELETABLE,
+                                   g_param_spec_boolean ("deletable", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_MIME_TYPE,
+                                   g_param_spec_string ("mime-type", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_data_tagged_iface_init (GimpTaggedInterface *iface)
+{
+  iface->add_tag        = gimp_data_add_tag;
+  iface->remove_tag     = gimp_data_remove_tag;
+  iface->get_tags       = gimp_data_get_tags;
+  iface->get_identifier = gimp_data_get_identifier;
+  iface->get_checksum   = gimp_data_get_checksum;
+}
+
+static void
+gimp_data_init (GimpData *data)
+{
+  GimpDataPrivate *private = gimp_data_get_instance_private (data);
+
+  data->priv = private;
+
+  private->writable  = TRUE;
+  private->deletable = TRUE;
+  private->dirty     = TRUE;
+
+  /*  freeze the data object during construction  */
+  gimp_data_freeze (data);
+}
+
+static void
+gimp_data_constructed (GObject *object)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  if (! GIMP_DATA_GET_CLASS (object)->save)
+    private->writable = FALSE;
+
+  gimp_data_thaw (GIMP_DATA (object));
+}
+
+static void
+gimp_data_finalize (GObject *object)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (object);
+
+  g_clear_object (&private->file);
+
+  if (private->tags)
+    {
+      g_list_free_full (private->tags, (GDestroyNotify) g_object_unref);
+      private->tags = NULL;
+    }
+
+  g_clear_pointer (&private->identifier, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_data_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpData        *data    = GIMP_DATA (object);
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (data);
+
+  switch (property_id)
+    {
+    case PROP_FILE:
+      gimp_data_set_file (data,
+                          g_value_get_object (value),
+                          private->writable,
+                          private->deletable);
+      break;
+
+    case PROP_WRITABLE:
+      private->writable = g_value_get_boolean (value);
+      break;
+
+    case PROP_DELETABLE:
+      private->deletable = g_value_get_boolean (value);
+      break;
+
+    case PROP_MIME_TYPE:
+      if (g_value_get_string (value))
+        private->mime_type = g_quark_from_string (g_value_get_string (value));
+      else
+        private->mime_type = 0;
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_FILE:
+      g_value_set_object (value, private->file);
+      break;
+
+    case PROP_WRITABLE:
+      g_value_set_boolean (value, private->writable);
+      break;
+
+    case PROP_DELETABLE:
+      g_value_set_boolean (value, private->deletable);
+      break;
+
+    case PROP_MIME_TYPE:
+      g_value_set_string (value, g_quark_to_string (private->mime_type));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_name_changed (GimpObject *object)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (object);
+
+  private->dirty = TRUE;
+
+  if (GIMP_OBJECT_CLASS (parent_class)->name_changed)
+    GIMP_OBJECT_CLASS (parent_class)->name_changed (object);
+}
+
+static gint64
+gimp_data_get_memsize (GimpObject *object,
+                       gint64     *gui_size)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (object);
+  gint64           memsize = 0;
+
+  memsize += gimp_g_object_get_memsize (G_OBJECT (private->file));
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_data_is_name_editable (GimpViewable *viewable)
+{
+  return gimp_data_is_writable (GIMP_DATA (viewable)) &&
+         ! gimp_data_is_internal (GIMP_DATA (viewable));
+}
+
+static void
+gimp_data_real_dirty (GimpData *data)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (data));
+
+  /* Emit the "name-changed" to signal general dirtiness, our name
+   * changed implementation will also set the "dirty" flag to TRUE.
+   */
+  gimp_object_name_changed (GIMP_OBJECT (data));
+}
+
+static GimpData *
+gimp_data_real_duplicate (GimpData *data)
+{
+  if (GIMP_DATA_GET_CLASS (data)->copy)
+    {
+      GimpData *new = g_object_new (G_OBJECT_TYPE (data), NULL);
+
+      gimp_data_copy (new, data);
+
+      return new;
+    }
+
+  return NULL;
+}
+
+static gint
+gimp_data_real_compare (GimpData *data1,
+                        GimpData *data2)
+{
+  GimpDataPrivate *private1 = GIMP_DATA_GET_PRIVATE (data1);
+  GimpDataPrivate *private2 = GIMP_DATA_GET_PRIVATE (data2);
+
+  /*  move the internal objects (like the FG -> BG) gradient) to the top  */
+  if (private1->internal != private2->internal)
+    return private1->internal ? -1 : 1;
+
+  /*  keep user-deletable objects above system resource files  */
+  if (private1->deletable != private2->deletable)
+    return private1->deletable ? -1 : 1;
+
+  return gimp_object_name_collate ((GimpObject *) data1,
+                                   (GimpObject *) data2);
+}
+
+static gboolean
+gimp_data_add_tag (GimpTagged *tagged,
+                   GimpTag    *tag)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (tagged);
+  GList           *list;
+
+  for (list = private->tags; list; list = g_list_next (list))
+    {
+      GimpTag *this = GIMP_TAG (list->data);
+
+      if (gimp_tag_equals (tag, this))
+        return FALSE;
+    }
+
+  private->tags = g_list_prepend (private->tags, g_object_ref (tag));
+
+  return TRUE;
+}
+
+static gboolean
+gimp_data_remove_tag (GimpTagged *tagged,
+                      GimpTag    *tag)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (tagged);
+  GList           *list;
+
+  for (list = private->tags; list; list = g_list_next (list))
+    {
+      GimpTag *this = GIMP_TAG (list->data);
+
+      if (gimp_tag_equals (tag, this))
+        {
+          private->tags = g_list_delete_link (private->tags, list);
+          g_object_unref (this);
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static GList *
+gimp_data_get_tags (GimpTagged *tagged)
+{
+  GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (tagged);
+
+  return private->tags;
+}
+
+static gchar *
+gimp_data_get_identifier (GimpTagged *tagged)
+{
+  GimpDataPrivate *private    = GIMP_DATA_GET_PRIVATE (tagged);
+  gchar           *identifier = NULL;
+
+  if (private->file)
+    {
+      const gchar *data_dir = gimp_data_directory ();
+      const gchar *gimp_dir = gimp_directory ();
+      gchar       *path     = g_file_get_path (private->file);
+      gchar       *tmp;
+
+      if (g_str_has_prefix (path, data_dir))
+        {
+          tmp = g_strconcat ("${gimp_data_dir}",
+                             path + strlen (data_dir),
+                             NULL);
+          identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
+          g_free (tmp);
+        }
+      else if (g_str_has_prefix (path, gimp_dir))
+        {
+          tmp = g_strconcat ("${gimp_dir}",
+                             path + strlen (gimp_dir),
+                             NULL);
+          identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
+          g_free (tmp);
+        }
+      else if (g_str_has_prefix (path, MYPAINT_BRUSHES_DIR))
+        {
+          tmp = g_strconcat ("${mypaint_brushes_dir}",
+                             path + strlen (MYPAINT_BRUSHES_DIR),
+                             NULL);
+          identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
+          g_free (tmp);
+        }
+      else
+        {
+          identifier = g_filename_to_utf8 (path, -1,
+                                           NULL, NULL, NULL);
+        }
+
+      if (! identifier)
+        {
+          g_printerr ("%s: failed to convert '%s' to utf8.\n",
+                      G_STRFUNC, path);
+          identifier = g_strdup (path);
+        }
+
+      g_free (path);
+    }
+  else if (private->internal)
+    {
+      identifier = g_strdup (private->identifier);
+    }
+
+  return identifier;
+}
+
+static gchar *
+gimp_data_get_checksum (GimpTagged *tagged)
+{
+  return NULL;
+}
+
+/**
+ * gimp_data_save:
+ * @data:  object whose contents are to be saved.
+ * @error: return location for errors or %NULL
+ *
+ * Save the object.  If the object is marked as "internal", nothing
+ * happens.  Otherwise, it is saved to disk, using the file name set
+ * by gimp_data_set_file().  If the save is successful, the object is
+ * marked as not dirty.  If not, an error message is returned using
+ * the @error argument.
+ *
+ * Returns: %TRUE if the object is internal or the save is successful.
+ **/
+gboolean
+gimp_data_save (GimpData  *data,
+                GError   **error)
+{
+  GimpDataPrivate *private;
+  gboolean         success = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  g_return_val_if_fail (private->writable == TRUE, FALSE);
+
+  if (private->internal)
+    {
+      private->dirty = FALSE;
+      return TRUE;
+    }
+
+  g_return_val_if_fail (G_IS_FILE (private->file), FALSE);
+
+  if (GIMP_DATA_GET_CLASS (data)->save)
+    {
+      GOutputStream *output;
+
+      output = G_OUTPUT_STREAM (g_file_replace (private->file,
+                                                NULL, FALSE, G_FILE_CREATE_NONE,
+                                                NULL, error));
+
+      if (output)
+        {
+          success = GIMP_DATA_GET_CLASS (data)->save (data, output, error);
+
+          if (success)
+            {
+              if (! g_output_stream_close (output, NULL, error))
+                {
+                  g_prefix_error (error,
+                                  _("Error saving '%s': "),
+                                  gimp_file_get_utf8_name (private->file));
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              GCancellable *cancellable = g_cancellable_new ();
+
+              g_cancellable_cancel (cancellable);
+              if (error && *error)
+                {
+                  g_prefix_error (error,
+                                  _("Error saving '%s': "),
+                                  gimp_file_get_utf8_name (private->file));
+                }
+              else
+                {
+                  g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_WRITE,
+                               _("Error saving '%s'"),
+                               gimp_file_get_utf8_name (private->file));
+                }
+              g_output_stream_close (output, cancellable, NULL);
+              g_object_unref (cancellable);
+            }
+
+          g_object_unref (output);
+        }
+    }
+
+  if (success)
+    {
+      GFileInfo *info = g_file_query_info (private->file,
+                                           G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                           G_FILE_QUERY_INFO_NONE,
+                                           NULL, NULL);
+      if (info)
+        {
+          private->mtime =
+            g_file_info_get_attribute_uint64 (info,
+                                              G_FILE_ATTRIBUTE_TIME_MODIFIED);
+          g_object_unref (info);
+        }
+
+      private->dirty = FALSE;
+    }
+
+  return success;
+}
+
+/**
+ * gimp_data_dirty:
+ * @data: a #GimpData object.
+ *
+ * Marks @data as dirty.  Unless the object is frozen, this causes
+ * its preview to be invalidated, and emits a "dirty" signal.  If the
+ * object is frozen, the function has no effect.
+ **/
+void
+gimp_data_dirty (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  if (private->freeze_count == 0)
+    g_signal_emit (data, data_signals[DIRTY], 0);
+}
+
+void
+gimp_data_clean (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  private->dirty = FALSE;
+}
+
+gboolean
+gimp_data_is_dirty (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->dirty;
+}
+
+/**
+ * gimp_data_freeze:
+ * @data: a #GimpData object.
+ *
+ * Increments the freeze count for the object.  A positive freeze count
+ * prevents the object from being treated as dirty.  Any call to this
+ * function must be followed eventually by a call to gimp_data_thaw().
+ **/
+void
+gimp_data_freeze (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  private->freeze_count++;
+}
+
+/**
+ * gimp_data_thaw:
+ * @data: a #GimpData object.
+ *
+ * Decrements the freeze count for the object.  If the freeze count
+ * drops to zero, the object is marked as dirty, and the "dirty"
+ * signal is emitted.  It is an error to call this function without
+ * having previously called gimp_data_freeze().
+ **/
+void
+gimp_data_thaw (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  g_return_if_fail (private->freeze_count > 0);
+
+  private->freeze_count--;
+
+  if (private->freeze_count == 0)
+    gimp_data_dirty (data);
+}
+
+gboolean
+gimp_data_is_frozen (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->freeze_count > 0;
+}
+
+/**
+ * gimp_data_delete_from_disk:
+ * @data:  a #GimpData object.
+ * @error: return location for errors or %NULL
+ *
+ * Deletes the object from disk.  If the object is marked as "internal",
+ * nothing happens.  Otherwise, if the file exists whose name has been
+ * set by gimp_data_set_file(), it is deleted.  Obviously this is
+ * a potentially dangerous function, which should be used with care.
+ *
+ * Returns: %TRUE if the object is internal to Gimp, or the deletion is
+ *          successful.
+ **/
+gboolean
+gimp_data_delete_from_disk (GimpData  *data,
+                            GError   **error)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  g_return_val_if_fail (private->file      != NULL, FALSE);
+  g_return_val_if_fail (private->deletable == TRUE, FALSE);
+
+  if (private->internal)
+    return TRUE;
+
+  return g_file_delete (private->file, NULL, error);
+}
+
+const gchar *
+gimp_data_get_extension (GimpData *data)
+{
+  g_return_val_if_fail (GIMP_IS_DATA (data), NULL);
+
+  if (GIMP_DATA_GET_CLASS (data)->get_extension)
+    return GIMP_DATA_GET_CLASS (data)->get_extension (data);
+
+  return NULL;
+}
+
+/**
+ * gimp_data_set_file:
+ * @data:     A #GimpData object
+ * @file:     File to assign to @data.
+ * @writable: %TRUE if we want to be able to write to this file.
+ * @deletable: %TRUE if we want to be able to delete this file.
+ *
+ * This function assigns a file to @data, and sets some flags
+ * according to the properties of the file.  If @writable is %TRUE,
+ * and the user has permission to write or overwrite the requested
+ * file name, and a "save" method exists for @data's object type, then
+ * @data is marked as writable.
+ **/
+void
+gimp_data_set_file (GimpData *data,
+                    GFile    *file,
+                    gboolean  writable,
+                    gboolean  deletable)
+{
+  GimpDataPrivate *private;
+  gchar           *path;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+  g_return_if_fail (G_IS_FILE (file));
+
+  path = g_file_get_path (file);
+
+  g_return_if_fail (path != NULL);
+  g_return_if_fail (g_path_is_absolute (path));
+
+  g_free (path);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  if (private->internal)
+    return;
+
+  g_set_object (&private->file, file);
+
+  private->writable  = FALSE;
+  private->deletable = FALSE;
+
+  /*  if the data is supposed to be writable or deletable,
+   *  still check if it really is
+   */
+  if (writable || deletable)
+    {
+      GFileInfo *info;
+
+      if (g_file_query_exists (private->file, NULL)) /* check if it exists */
+        {
+          info = g_file_query_info (private->file,
+                                    G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
+                                    G_FILE_QUERY_INFO_NONE,
+                                    NULL, NULL);
+
+          /* and we can write it */
+          if (info)
+            {
+              if (g_file_info_get_attribute_boolean (info,
+                                                     G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
+                {
+                  private->writable  = writable  ? TRUE : FALSE;
+                  private->deletable = deletable ? TRUE : FALSE;
+                }
+
+              g_object_unref (info);
+            }
+        }
+      else /* OR it doesn't exist */
+        {
+          GFile *parent = g_file_get_parent (private->file);
+
+          info = g_file_query_info (parent,
+                                    G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
+                                    G_FILE_QUERY_INFO_NONE,
+                                    NULL, NULL);
+
+          /* and we can write to its parent directory */
+          if (info)
+            {
+              if (g_file_info_get_attribute_boolean (info,
+                                                     G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
+                {
+                  private->writable  = writable  ? TRUE : FALSE;
+                  private->deletable = deletable ? TRUE : FALSE;
+                }
+
+              g_object_unref (info);
+            }
+
+          g_object_unref (parent);
+        }
+
+      /*  if we can't save, we are not writable  */
+      if (! GIMP_DATA_GET_CLASS (data)->save)
+        private->writable = FALSE;
+    }
+}
+
+GFile *
+gimp_data_get_file (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), NULL);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->file;
+}
+
+/**
+ * gimp_data_create_filename:
+ * @data:     a #Gimpdata object.
+ * @dest_dir: directory in which to create a file name.
+ *
+ * This function creates a unique file name to be used for saving
+ * a representation of @data in the directory @dest_dir.  If the
+ * user does not have write permission in @dest_dir, then @data
+ * is marked as "not writable", so you should check on this before
+ * assuming that @data can be saved.
+ **/
+void
+gimp_data_create_filename (GimpData *data,
+                           GFile    *dest_dir)
+{
+  GimpDataPrivate *private;
+  gchar           *safename;
+  gchar           *basename;
+  GFile           *file;
+  gint             i;
+  gint             unum  = 1;
+  GError          *error = NULL;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+  g_return_if_fail (G_IS_FILE (dest_dir));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  if (private->internal)
+    return;
+
+  safename = g_strstrip (g_strdup (gimp_object_get_name (data)));
+
+  if (safename[0] == '.')
+    safename[0] = '-';
+
+  for (i = 0; safename[i]; i++)
+    if (strchr ("\\/*?\"`'<>{}|\n\t ;:$^&", safename[i]))
+      safename[i] = '-';
+
+  basename = g_strconcat (safename, gimp_data_get_extension (data), NULL);
+
+  file = g_file_get_child_for_display_name (dest_dir, basename, &error);
+  g_free (basename);
+
+  if (! file)
+    {
+      g_warning ("gimp_data_create_filename:\n"
+                 "g_file_get_child_for_display_name() failed for '%s': %s",
+                 gimp_object_get_name (data), error->message);
+      g_clear_error (&error);
+      g_free (safename);
+      return;
+    }
+
+  while (g_file_query_exists (file, NULL))
+    {
+      g_object_unref (file);
+
+      basename = g_strdup_printf ("%s-%d%s",
+                                  safename,
+                                  unum++,
+                                  gimp_data_get_extension (data));
+
+      file = g_file_get_child_for_display_name (dest_dir, basename, NULL);
+      g_free (basename);
+    }
+
+  g_free (safename);
+
+  gimp_data_set_file (data, file, TRUE, TRUE);
+
+  g_object_unref (file);
+}
+
+static const gchar *tag_blacklist[] = { "brushes",
+                                        "dynamics",
+                                        "patterns",
+                                        "palettes",
+                                        "gradients",
+                                        "tool-presets" };
+
+/**
+ * gimp_data_set_folder_tags:
+ * @data:          a #Gimpdata object.
+ * @top_directory: the top directory of the currently processed data
+ *                 hierarchy.
+ *
+ * Sets tags based on all folder names below top_directory. So if the
+ * data's filename is e.g.
+ * /home/foo/.config/GIMP/X.Y/brushes/Flowers/Roses/rose.gbr, it will
+ * add "Flowers" and "Roses" tags.
+ *
+ * if the top directory (as passed, or as derived from the data's
+ * filename) does not end with one of the default data directory names
+ * (brushes, patterns etc), its name will be added as tag too.
+ **/
+void
+gimp_data_set_folder_tags (GimpData *data,
+                           GFile    *top_directory)
+{
+  GimpDataPrivate *private;
+  gchar           *tmp;
+  gchar           *dirname;
+  gchar           *top_path;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+  g_return_if_fail (G_IS_FILE (top_directory));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  if (private->internal)
+    return;
+
+  g_return_if_fail (private->file != NULL);
+
+  tmp = g_file_get_path (private->file);
+  dirname = g_path_get_dirname (tmp);
+  g_free (tmp);
+
+  top_path = g_file_get_path (top_directory);
+
+  g_return_if_fail (g_str_has_prefix (dirname, top_path));
+
+  /*  walk up the hierarchy and set each folder on the way as tag,
+   *  except the top_directory
+   */
+  while (strcmp (dirname, top_path))
+    {
+      gchar   *basename = g_path_get_basename (dirname);
+      GimpTag *tag      = gimp_tag_new (basename);
+
+      gimp_tag_set_internal (tag, TRUE);
+      gimp_tagged_add_tag (GIMP_TAGGED (data), tag);
+      g_object_unref (tag);
+      g_free (basename);
+
+      tmp = g_path_get_dirname (dirname);
+      g_free (dirname);
+      dirname = tmp;
+    }
+
+  g_free (top_path);
+
+  if (dirname)
+    {
+      gchar *basename = g_path_get_basename (dirname);
+      gint   i;
+
+      for (i = 0; i <  G_N_ELEMENTS (tag_blacklist); i++)
+        {
+          if (! strcmp (basename, tag_blacklist[i]))
+            break;
+        }
+
+      if (i == G_N_ELEMENTS (tag_blacklist))
+        {
+          GimpTag *tag = gimp_tag_new (basename);
+
+          gimp_tag_set_internal (tag, TRUE);
+          gimp_tagged_add_tag (GIMP_TAGGED (data), tag);
+          g_object_unref (tag);
+        }
+
+      g_free (basename);
+      g_free (dirname);
+    }
+}
+
+const gchar *
+gimp_data_get_mime_type (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), NULL);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return g_quark_to_string (private->mime_type);
+}
+
+gboolean
+gimp_data_is_writable (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->writable;
+}
+
+gboolean
+gimp_data_is_deletable (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->deletable;
+}
+
+void
+gimp_data_set_mtime (GimpData *data,
+                     gint64    mtime)
+{
+  GimpDataPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  private->mtime = mtime;
+}
+
+gint64
+gimp_data_get_mtime (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), 0);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->mtime;
+}
+
+gboolean
+gimp_data_is_copyable (GimpData *data)
+{
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  return GIMP_DATA_GET_CLASS (data)->copy != NULL;
+}
+
+/**
+ * gimp_data_copy:
+ * @data:     a #GimpData object
+ * @src_data: the #GimpData object to copy from
+ *
+ * Copies @src_data to @data.  Only the object data is  copied:  the
+ * name, file name, preview, etc. are not copied.
+ **/
+void
+gimp_data_copy (GimpData *data,
+                GimpData *src_data)
+{
+  g_return_if_fail (GIMP_IS_DATA (data));
+  g_return_if_fail (GIMP_IS_DATA (src_data));
+  g_return_if_fail (GIMP_DATA_GET_CLASS (data)->copy != NULL);
+  g_return_if_fail (GIMP_DATA_GET_CLASS (data)->copy ==
+                    GIMP_DATA_GET_CLASS (src_data)->copy);
+
+  if (data != src_data)
+    GIMP_DATA_GET_CLASS (data)->copy (data, src_data);
+}
+
+gboolean
+gimp_data_is_duplicatable (GimpData *data)
+{
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  if (GIMP_DATA_GET_CLASS (data)->duplicate == gimp_data_real_duplicate)
+    return gimp_data_is_copyable (data);
+  else
+    return GIMP_DATA_GET_CLASS (data)->duplicate != NULL;
+}
+
+/**
+ * gimp_data_duplicate:
+ * @data: a #GimpData object
+ *
+ * Creates a copy of @data, if possible.  Only the object data is
+ * copied:  the newly created object is not automatically given an
+ * object name, file name, preview, etc.
+ *
+ * Returns: the newly created copy, or %NULL if @data cannot be copied.
+ **/
+GimpData *
+gimp_data_duplicate (GimpData *data)
+{
+  g_return_val_if_fail (GIMP_IS_DATA (data), NULL);
+
+  if (gimp_data_is_duplicatable (data))
+    {
+      GimpData        *new     = GIMP_DATA_GET_CLASS (data)->duplicate (data);
+      GimpDataPrivate *private = GIMP_DATA_GET_PRIVATE (new);
+
+      g_object_set (new,
+                    "name",      NULL,
+                    "writable",  GIMP_DATA_GET_CLASS (new)->save != NULL,
+                    "deletable", TRUE,
+                    NULL);
+
+      g_clear_object (&private->file);
+
+      return new;
+    }
+
+  return NULL;
+}
+
+/**
+ * gimp_data_make_internal:
+ * @data: a #GimpData object.
+ *
+ * Mark @data as "internal" to Gimp, which means that it will not be
+ * saved to disk.  Note that if you do this, later calls to
+ * gimp_data_save() and gimp_data_delete_from_disk() will
+ * automatically return successfully without giving any warning.
+ *
+ * The identifier name shall be an untranslated globally unique string
+ * that identifies the internal object across sessions.
+ **/
+void
+gimp_data_make_internal (GimpData    *data,
+                         const gchar *identifier)
+{
+  GimpDataPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DATA (data));
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  g_clear_object (&private->file);
+
+  g_free (private->identifier);
+  private->identifier = g_strdup (identifier);
+
+  private->writable  = FALSE;
+  private->deletable = FALSE;
+  private->internal  = TRUE;
+}
+
+gboolean
+gimp_data_is_internal (GimpData *data)
+{
+  GimpDataPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+
+  private = GIMP_DATA_GET_PRIVATE (data);
+
+  return private->internal;
+}
+
+/**
+ * gimp_data_compare:
+ * @data1: a #GimpData object.
+ * @data2: another #GimpData object.
+ *
+ * Compares two data objects for use in sorting. Objects marked as
+ * "internal" come first, then user-writable objects, then system data
+ * files. In these three groups, the objects are sorted alphabetically
+ * by name, using gimp_object_name_collate().
+ *
+ * Return value: -1 if @data1 compares before @data2,
+ *                0 if they compare equal,
+ *                1 if @data1 compares after @data2.
+ **/
+gint
+gimp_data_compare (GimpData *data1,
+                   GimpData *data2)
+{
+  g_return_val_if_fail (GIMP_IS_DATA (data1), 0);
+  g_return_val_if_fail (GIMP_IS_DATA (data2), 0);
+  g_return_val_if_fail (GIMP_DATA_GET_CLASS (data1)->compare ==
+                        GIMP_DATA_GET_CLASS (data2)->compare, 0);
+
+  return GIMP_DATA_GET_CLASS (data1)->compare (data1, data2);
+}
+
+/**
+ * gimp_data_error_quark:
+ *
+ * This function is used to implement the GIMP_DATA_ERROR macro. It
+ * shouldn't be called directly.
+ *
+ * Return value: the #GQuark to identify error in the GimpData error domain.
+ **/
+GQuark
+gimp_data_error_quark (void)
+{
+  return g_quark_from_static_string ("gimp-data-error-quark");
+}
diff --git a/app/core/gimpdata.h b/app/core/gimpdata.h
new file mode 100644
index 0000000..44cd26c
--- /dev/null
+++ b/app/core/gimpdata.h
@@ -0,0 +1,133 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdata.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DATA_H__
+#define __GIMP_DATA_H__
+
+
+#include "gimpviewable.h"
+
+
+typedef enum
+{
+  GIMP_DATA_ERROR_OPEN,   /*  opening data file failed   */
+  GIMP_DATA_ERROR_READ,   /*  reading data file failed   */
+  GIMP_DATA_ERROR_WRITE,  /*  writing data file failed   */
+  GIMP_DATA_ERROR_DELETE  /*  deleting data file failed  */
+} GimpDataError;
+
+
+#define GIMP_TYPE_DATA            (gimp_data_get_type ())
+#define GIMP_DATA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DATA, GimpData))
+#define GIMP_DATA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DATA, GimpDataClass))
+#define GIMP_IS_DATA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DATA))
+#define GIMP_IS_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DATA))
+#define GIMP_DATA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DATA, GimpDataClass))
+
+
+typedef struct _GimpDataPrivate GimpDataPrivate;
+typedef struct _GimpDataClass   GimpDataClass;
+
+struct _GimpData
+{
+  GimpViewable     parent_instance;
+
+  GimpDataPrivate *priv;
+};
+
+struct _GimpDataClass
+{
+  GimpViewableClass  parent_class;
+
+  /*  signals  */
+  void          (* dirty)         (GimpData  *data);
+
+  /*  virtual functions  */
+  gboolean      (* save)          (GimpData       *data,
+                                   GOutputStream  *output,
+                                   GError        **error);
+  const gchar * (* get_extension) (GimpData       *data);
+  void          (* copy)          (GimpData       *data,
+                                   GimpData       *src_data);
+  GimpData    * (* duplicate)     (GimpData       *data);
+  gint          (* compare)       (GimpData       *data1,
+                                   GimpData       *data2);
+};
+
+
+GType         gimp_data_get_type         (void) G_GNUC_CONST;
+
+gboolean      gimp_data_save             (GimpData     *data,
+                                          GError      **error);
+
+void          gimp_data_dirty            (GimpData     *data);
+void          gimp_data_clean            (GimpData     *data);
+gboolean      gimp_data_is_dirty         (GimpData     *data);
+
+void          gimp_data_freeze           (GimpData     *data);
+void          gimp_data_thaw             (GimpData     *data);
+gboolean      gimp_data_is_frozen        (GimpData     *data);
+
+gboolean      gimp_data_delete_from_disk (GimpData     *data,
+                                          GError      **error);
+
+const gchar * gimp_data_get_extension    (GimpData     *data);
+
+void          gimp_data_set_file         (GimpData     *data,
+                                          GFile        *file,
+                                          gboolean      writable,
+                                          gboolean      deletable);
+GFile       * gimp_data_get_file         (GimpData     *data);
+
+void          gimp_data_create_filename  (GimpData     *data,
+                                          GFile        *dest_dir);
+
+void          gimp_data_set_folder_tags  (GimpData     *data,
+                                          GFile        *top_directory);
+
+const gchar * gimp_data_get_mime_type    (GimpData     *data);
+
+gboolean      gimp_data_is_writable      (GimpData     *data);
+gboolean      gimp_data_is_deletable     (GimpData     *data);
+
+void          gimp_data_set_mtime        (GimpData     *data,
+                                          gint64        mtime);
+gint64        gimp_data_get_mtime        (GimpData     *data);
+
+gboolean      gimp_data_is_copyable      (GimpData     *data);
+void          gimp_data_copy             (GimpData     *data,
+                                          GimpData     *src_data);
+
+gboolean      gimp_data_is_duplicatable  (GimpData     *data);
+GimpData    * gimp_data_duplicate        (GimpData     *data);
+
+void          gimp_data_make_internal    (GimpData     *data,
+                                          const gchar  *identifier);
+gboolean      gimp_data_is_internal      (GimpData     *data);
+
+gint          gimp_data_compare          (GimpData     *data1,
+                                          GimpData     *data2);
+
+#define GIMP_DATA_ERROR (gimp_data_error_quark ())
+
+GQuark        gimp_data_error_quark      (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_DATA_H__ */
diff --git a/app/core/gimpdatafactory.c b/app/core/gimpdatafactory.c
new file mode 100644
index 0000000..5ee7114
--- /dev/null
+++ b/app/core/gimpdatafactory.c
@@ -0,0 +1,945 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdatafactory.c
+ * Copyright (C) 2001-2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+#include <stdlib.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-utils.h"
+#include "gimpasyncset.h"
+#include "gimpcancelable.h"
+#include "gimpcontext.h"
+#include "gimpdata.h"
+#include "gimpdatafactory.h"
+#include "gimplist.h"
+#include "gimpuncancelablewaitable.h"
+#include "gimpwaitable.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_DATA_TYPE,
+  PROP_PATH_PROPERTY_NAME,
+  PROP_WRITABLE_PROPERTY_NAME,
+  PROP_NEW_FUNC,
+  PROP_GET_STANDARD_FUNC
+};
+
+
+struct _GimpDataFactoryPrivate
+{
+  Gimp                    *gimp;
+
+  GType                    data_type;
+  GimpContainer           *container;
+  GimpContainer           *container_obsolete;
+
+  gchar                   *path_property_name;
+  gchar                   *writable_property_name;
+
+  GimpDataNewFunc          data_new_func;
+  GimpDataGetStandardFunc  data_get_standard_func;
+
+  GimpAsyncSet            *async_set;
+};
+
+#define GET_PRIVATE(obj) (((GimpDataFactory *) (obj))->priv)
+
+
+static void       gimp_data_factory_constructed         (GObject             *object);
+static void       gimp_data_factory_set_property        (GObject             *object,
+                                                         guint                property_id,
+                                                         const GValue        *value,
+                                                         GParamSpec          *pspec);
+static void       gimp_data_factory_get_property        (GObject             *object,
+                                                         guint                property_id,
+                                                         GValue              *value,
+                                                         GParamSpec          *pspec);
+static void       gimp_data_factory_finalize            (GObject             *object);
+
+static gint64     gimp_data_factory_get_memsize         (GimpObject          *object,
+                                                         gint64              *gui_size);
+
+static void       gimp_data_factory_real_data_save      (GimpDataFactory     *factory);
+static void       gimp_data_factory_real_data_cancel    (GimpDataFactory     *factory);
+static GimpData * gimp_data_factory_real_data_duplicate (GimpDataFactory     *factory,
+                                                         GimpData            *data);
+static gboolean   gimp_data_factory_real_data_delete    (GimpDataFactory     *factory,
+                                                         GimpData            *data,
+                                                         gboolean             delete_from_disk,
+                                                         GError             **error);
+
+static void       gimp_data_factory_path_notify         (GObject             *object,
+                                                         const GParamSpec    *pspec,
+                                                         GimpDataFactory     *factory);
+static GFile    * gimp_data_factory_get_save_dir        (GimpDataFactory     *factory,
+                                                         GError             **error);
+
+
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GimpDataFactory, gimp_data_factory,
+                                     GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_data_factory_parent_class
+
+
+static void
+gimp_data_factory_class_init (GimpDataFactoryClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->constructed      = gimp_data_factory_constructed;
+  object_class->set_property     = gimp_data_factory_set_property;
+  object_class->get_property     = gimp_data_factory_get_property;
+  object_class->finalize         = gimp_data_factory_finalize;
+
+  gimp_object_class->get_memsize = gimp_data_factory_get_memsize;
+
+  klass->data_init               = NULL;
+  klass->data_refresh            = NULL;
+  klass->data_save               = gimp_data_factory_real_data_save;
+  klass->data_cancel             = gimp_data_factory_real_data_cancel;
+  klass->data_duplicate          = gimp_data_factory_real_data_duplicate;
+  klass->data_delete             = gimp_data_factory_real_data_delete;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DATA_TYPE,
+                                   g_param_spec_gtype ("data-type", NULL, NULL,
+                                                       GIMP_TYPE_DATA,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PATH_PROPERTY_NAME,
+                                   g_param_spec_string ("path-property-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_WRITABLE_PROPERTY_NAME,
+                                   g_param_spec_string ("writable-property-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_NEW_FUNC,
+                                   g_param_spec_pointer ("new-func",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_GET_STANDARD_FUNC,
+                                   g_param_spec_pointer ("get-standard-func",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_data_factory_init (GimpDataFactory *factory)
+{
+  factory->priv = gimp_data_factory_get_instance_private (factory);
+
+  factory->priv->async_set = gimp_async_set_new ();
+}
+
+static void
+gimp_data_factory_constructed (GObject *object)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (priv->gimp));
+  gimp_assert (g_type_is_a (priv->data_type, GIMP_TYPE_DATA));
+  gimp_assert (GIMP_DATA_FACTORY_GET_CLASS (object)->data_init != NULL);
+  gimp_assert (GIMP_DATA_FACTORY_GET_CLASS (object)->data_refresh != NULL);
+
+  priv->container = gimp_list_new (priv->data_type, TRUE);
+  gimp_list_set_sort_func (GIMP_LIST (priv->container),
+                           (GCompareFunc) gimp_data_compare);
+
+  priv->container_obsolete = gimp_list_new (priv->data_type, TRUE);
+  gimp_list_set_sort_func (GIMP_LIST (priv->container_obsolete),
+                           (GCompareFunc) gimp_data_compare);
+}
+
+static void
+gimp_data_factory_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      priv->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    case PROP_DATA_TYPE:
+      priv->data_type = g_value_get_gtype (value);
+      break;
+
+    case PROP_PATH_PROPERTY_NAME:
+      priv->path_property_name = g_value_dup_string (value);
+      break;
+
+    case PROP_WRITABLE_PROPERTY_NAME:
+      priv->writable_property_name = g_value_dup_string (value);
+      break;
+
+    case PROP_NEW_FUNC:
+      priv->data_new_func = g_value_get_pointer (value);
+      break;
+
+    case PROP_GET_STANDARD_FUNC:
+      priv->data_get_standard_func = g_value_get_pointer (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_factory_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, priv->gimp);
+      break;
+
+    case PROP_DATA_TYPE:
+      g_value_set_gtype (value, priv->data_type);
+      break;
+
+    case PROP_PATH_PROPERTY_NAME:
+      g_value_set_string (value, priv->path_property_name);
+      break;
+
+    case PROP_WRITABLE_PROPERTY_NAME:
+      g_value_set_string (value, priv->writable_property_name);
+      break;
+
+    case PROP_NEW_FUNC:
+      g_value_set_pointer (value, priv->data_new_func);
+      break;
+
+    case PROP_GET_STANDARD_FUNC:
+      g_value_set_pointer (value, priv->data_get_standard_func);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_factory_finalize (GObject *object)
+{
+  GimpDataFactory        *factory = GIMP_DATA_FACTORY (object);
+  GimpDataFactoryPrivate *priv    = GET_PRIVATE (object);
+
+  if (priv->async_set)
+    {
+      gimp_data_factory_data_cancel (factory);
+
+      g_clear_object (&priv->async_set);
+    }
+
+  g_clear_object (&priv->container);
+  g_clear_object (&priv->container_obsolete);
+
+  g_clear_pointer (&priv->path_property_name,     g_free);
+  g_clear_pointer (&priv->writable_property_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_data_factory_get_memsize (GimpObject *object,
+                               gint64     *gui_size)
+{
+  GimpDataFactoryPrivate *priv    = GET_PRIVATE (object);
+  gint64                  memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (priv->container),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (priv->container_obsolete),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_data_factory_real_data_save (GimpDataFactory *factory)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+  GList                  *dirty = NULL;
+  GList                  *list;
+  GFile                  *writable_dir;
+  GError                 *error = NULL;
+
+  for (list = GIMP_LIST (priv->container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpData *data = list->data;
+
+      if (gimp_data_is_dirty (data) &&
+          gimp_data_is_writable (data))
+        {
+          dirty = g_list_prepend (dirty, data);
+        }
+    }
+
+  if (! dirty)
+    return;
+
+  writable_dir = gimp_data_factory_get_save_dir (factory, &error);
+
+  if (! writable_dir)
+    {
+      gimp_message (priv->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    _("Failed to save data:\n\n%s"),
+                    error->message);
+      g_clear_error (&error);
+
+      g_list_free (dirty);
+
+      return;
+    }
+
+  for (list = dirty; list; list = g_list_next (list))
+    {
+      GimpData *data  = list->data;
+      GError   *error = NULL;
+
+      if (! gimp_data_get_file (data))
+        gimp_data_create_filename (data, writable_dir);
+
+      if (factory->priv->gimp->be_verbose)
+        {
+          GFile *file = gimp_data_get_file (data);
+
+          if (file)
+            g_print ("Writing dirty data '%s'\n",
+                     gimp_file_get_utf8_name (file));
+        }
+
+      if (! gimp_data_save (data, &error))
+        {
+          /*  check if there actually was an error (no error
+           *  means the data class does not implement save)
+           */
+          if (error)
+            {
+              gimp_message (priv->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            _("Failed to save data:\n\n%s"),
+                            error->message);
+              g_clear_error (&error);
+            }
+        }
+    }
+
+  g_object_unref (writable_dir);
+
+  g_list_free (dirty);
+}
+
+static void
+gimp_data_factory_real_data_cancel (GimpDataFactory *factory)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+
+  gimp_cancelable_cancel (GIMP_CANCELABLE (priv->async_set));
+  gimp_waitable_wait     (GIMP_WAITABLE   (priv->async_set));
+}
+
+static GimpData *
+gimp_data_factory_real_data_duplicate (GimpDataFactory *factory,
+                                       GimpData        *data)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+  GimpData               *new_data;
+
+  new_data = gimp_data_duplicate (data);
+
+  if (new_data)
+    {
+      const gchar *name = gimp_object_get_name (data);
+      gchar       *ext;
+      gint         copy_len;
+      gint         number;
+      gchar       *new_name;
+
+      ext      = strrchr (name, '#');
+      copy_len = strlen (_("copy"));
+
+      if ((strlen (name) >= copy_len                                 &&
+           strcmp (&name[strlen (name) - copy_len], _("copy")) == 0) ||
+          (ext && (number = atoi (ext + 1)) > 0                      &&
+           ((gint) (log10 (number) + 1)) == strlen (ext + 1)))
+        {
+          /* don't have redundant "copy"s */
+          new_name = g_strdup (name);
+        }
+      else
+        {
+          new_name = g_strdup_printf (_("%s copy"), name);
+        }
+
+      gimp_object_take_name (GIMP_OBJECT (new_data), new_name);
+
+      gimp_container_add (priv->container, GIMP_OBJECT (new_data));
+      g_object_unref (new_data);
+    }
+
+  return new_data;
+}
+
+static gboolean
+gimp_data_factory_real_data_delete (GimpDataFactory  *factory,
+                                    GimpData         *data,
+                                    gboolean          delete_from_disk,
+                                    GError          **error)
+{
+  if (delete_from_disk && gimp_data_get_file (data))
+    return gimp_data_delete_from_disk (data, error);
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_data_factory_data_init (GimpDataFactory *factory,
+                             GimpContext     *context,
+                             gboolean         no_data)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+  gchar                  *signal_name;
+
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  /*  Always freeze() and thaw() the container around initialization,
+   *  even if no_data, the thaw() will implicitly make GimpContext
+   *  create the standard data that serves as fallback.
+   */
+  gimp_container_freeze (priv->container);
+
+  if (! no_data)
+    {
+      if (priv->gimp->be_verbose)
+        {
+          const gchar *name = gimp_object_get_name (factory);
+
+          g_print ("Loading '%s' data\n", name ? name : "???");
+        }
+
+      GIMP_DATA_FACTORY_GET_CLASS (factory)->data_init (factory, context);
+    }
+
+  gimp_container_thaw (priv->container);
+
+  signal_name = g_strdup_printf ("notify::%s", priv->path_property_name);
+  g_signal_connect_object (priv->gimp->config, signal_name,
+                           G_CALLBACK (gimp_data_factory_path_notify),
+                           factory, 0);
+  g_free (signal_name);
+}
+
+static void
+gimp_data_factory_clean_cb (GimpDataFactory *factory,
+                            GimpData        *data,
+                            gpointer         user_data)
+{
+  if (gimp_data_is_dirty (data))
+    gimp_data_clean (data);
+}
+
+void
+gimp_data_factory_data_clean (GimpDataFactory *factory)
+{
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+
+  gimp_data_factory_data_foreach (factory, TRUE,
+                                  gimp_data_factory_clean_cb, NULL);
+}
+
+void
+gimp_data_factory_data_refresh (GimpDataFactory *factory,
+                                GimpContext     *context)
+{
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  GIMP_DATA_FACTORY_GET_CLASS (factory)->data_refresh (factory, context);
+}
+
+void
+gimp_data_factory_data_save (GimpDataFactory *factory)
+{
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+
+  if (! gimp_container_is_empty (factory->priv->container))
+    GIMP_DATA_FACTORY_GET_CLASS (factory)->data_save (factory);
+}
+
+static void
+gimp_data_factory_data_free_foreach (GimpDataFactory *factory,
+                                     GimpData        *data,
+                                     gpointer         user_data)
+{
+  gimp_container_remove (factory->priv->container, GIMP_OBJECT (data));
+}
+
+void
+gimp_data_factory_data_free (GimpDataFactory *factory)
+{
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+
+  gimp_data_factory_data_cancel (factory);
+
+  if (! gimp_container_is_empty (factory->priv->container))
+    {
+      gimp_container_freeze (factory->priv->container);
+
+      gimp_data_factory_data_foreach (factory, TRUE,
+                                      gimp_data_factory_data_free_foreach,
+                                      NULL);
+
+      gimp_container_thaw (factory->priv->container);
+    }
+}
+
+GimpAsyncSet *
+gimp_data_factory_get_async_set (GimpDataFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+
+  return factory->priv->async_set;
+}
+
+gboolean
+gimp_data_factory_data_wait (GimpDataFactory *factory)
+{
+  GimpDataFactoryPrivate *priv;
+  GimpWaitable           *waitable;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), FALSE);
+
+  priv = GET_PRIVATE (factory);
+
+  /* don't allow cancellation for now */
+  waitable = gimp_uncancelable_waitable_new (GIMP_WAITABLE (priv->async_set));
+
+  gimp_wait (priv->gimp, waitable,
+             _("Loading fonts (this may take a while...)"));
+
+  g_object_unref (waitable);
+
+  return TRUE;
+}
+
+void
+gimp_data_factory_data_cancel (GimpDataFactory *factory)
+{
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+
+  GIMP_DATA_FACTORY_GET_CLASS (factory)->data_cancel (factory);
+}
+
+gboolean
+gimp_data_factory_has_data_new_func (GimpDataFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), FALSE);
+
+  return factory->priv->data_new_func != NULL;
+}
+
+GimpData *
+gimp_data_factory_data_new (GimpDataFactory *factory,
+                            GimpContext     *context,
+                            const gchar     *name)
+{
+  GimpDataFactoryPrivate *priv;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (*name != '\0', NULL);
+
+  priv = GET_PRIVATE (factory);
+
+  if (priv->data_new_func)
+    {
+      GimpData *data = priv->data_new_func (context, name);
+
+      if (data)
+        {
+          gimp_container_add (priv->container, GIMP_OBJECT (data));
+          g_object_unref (data);
+
+          return data;
+        }
+
+      g_warning ("%s: GimpDataFactory::data_new_func() returned NULL",
+                 G_STRFUNC);
+    }
+
+  return NULL;
+}
+
+GimpData *
+gimp_data_factory_data_get_standard (GimpDataFactory *factory,
+                                     GimpContext     *context)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  if (factory->priv->data_get_standard_func)
+    return factory->priv->data_get_standard_func (context);
+
+  return NULL;
+}
+
+GimpData *
+gimp_data_factory_data_duplicate (GimpDataFactory *factory,
+                                  GimpData        *data)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_DATA (data), NULL);
+
+  return GIMP_DATA_FACTORY_GET_CLASS (factory)->data_duplicate (factory, data);
+}
+
+gboolean
+gimp_data_factory_data_delete (GimpDataFactory  *factory,
+                               GimpData         *data,
+                               gboolean          delete_from_disk,
+                               GError          **error)
+{
+  GimpDataFactoryPrivate *priv;
+  gboolean                retval = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), FALSE);
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  priv = GET_PRIVATE (factory);
+
+  if (gimp_container_have (priv->container, GIMP_OBJECT (data)))
+    {
+      g_object_ref (data);
+
+      gimp_container_remove (priv->container, GIMP_OBJECT (data));
+
+      retval = GIMP_DATA_FACTORY_GET_CLASS (factory)->data_delete (factory, data,
+                                                                   delete_from_disk,
+                                                                   error);
+
+      g_object_unref (data);
+    }
+
+  return retval;
+}
+
+gboolean
+gimp_data_factory_data_save_single (GimpDataFactory  *factory,
+                                    GimpData         *data,
+                                    GError          **error)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), FALSE);
+  g_return_val_if_fail (GIMP_IS_DATA (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_data_is_dirty (data))
+    return TRUE;
+
+  if (! gimp_data_get_file (data))
+    {
+      GFile  *writable_dir;
+      GError *my_error = NULL;
+
+      writable_dir = gimp_data_factory_get_save_dir (factory, &my_error);
+
+      if (! writable_dir)
+        {
+          g_set_error (error, GIMP_DATA_ERROR, 0,
+                       _("Failed to save data:\n\n%s"),
+                       my_error->message);
+          g_clear_error (&my_error);
+
+          return FALSE;
+        }
+
+      gimp_data_create_filename (data, writable_dir);
+
+      g_object_unref (writable_dir);
+    }
+
+  if (! gimp_data_is_writable (data))
+    return FALSE;
+
+  if (factory->priv->gimp->be_verbose)
+    {
+      GFile *file = gimp_data_get_file (data);
+
+      if (file)
+        g_print ("Writing dirty data '%s'\n",
+                 gimp_file_get_utf8_name (file));
+    }
+
+  if (! gimp_data_save (data, error))
+    {
+      /*  check if there actually was an error (no error
+       *  means the data class does not implement save)
+       */
+      if (! error)
+        g_set_error (error, GIMP_DATA_ERROR, 0,
+                     _("Failed to save data:\n\n%s"),
+                     "Data class does not implement saving");
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+void
+gimp_data_factory_data_foreach (GimpDataFactory     *factory,
+                                gboolean             skip_internal,
+                                GimpDataForeachFunc  callback,
+                                gpointer             user_data)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_DATA_FACTORY (factory));
+  g_return_if_fail (callback != NULL);
+
+  list = GIMP_LIST (factory->priv->container)->queue->head;
+
+  while (list)
+    {
+      GList *next = g_list_next (list);
+
+      if (! (skip_internal && gimp_data_is_internal (list->data)))
+        callback (factory, list->data, user_data);
+
+      list = next;
+    }
+}
+
+Gimp *
+gimp_data_factory_get_gimp (GimpDataFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+
+  return factory->priv->gimp;
+}
+
+GType
+gimp_data_factory_get_data_type (GimpDataFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), G_TYPE_NONE);
+
+  return gimp_container_get_children_type (factory->priv->container);
+}
+
+GimpContainer *
+gimp_data_factory_get_container (GimpDataFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+
+  return factory->priv->container;
+}
+
+GimpContainer *
+gimp_data_factory_get_container_obsolete (GimpDataFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+
+  return factory->priv->container_obsolete;
+}
+
+GList *
+gimp_data_factory_get_data_path (GimpDataFactory *factory)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+  gchar                  *path = NULL;
+  GList                  *list = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+
+  g_object_get (priv->gimp->config,
+                priv->path_property_name, &path,
+                NULL);
+
+  if (path)
+    {
+      list = gimp_config_path_expand_to_files (path, NULL);
+      g_free (path);
+    }
+
+  return list;
+}
+
+GList *
+gimp_data_factory_get_data_path_writable (GimpDataFactory *factory)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+  gchar                  *path = NULL;
+  GList                  *list = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+
+  g_object_get (priv->gimp->config,
+                priv->writable_property_name, &path,
+                NULL);
+
+  if (path)
+    {
+      list = gimp_config_path_expand_to_files (path, NULL);
+      g_free (path);
+    }
+
+  return list;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_data_factory_path_notify (GObject          *object,
+                               const GParamSpec *pspec,
+                               GimpDataFactory  *factory)
+{
+  GimpDataFactoryPrivate *priv = GET_PRIVATE (factory);
+
+  gimp_set_busy (priv->gimp);
+
+  gimp_data_factory_data_refresh (factory, gimp_get_user_context (priv->gimp));
+
+  gimp_unset_busy (priv->gimp);
+}
+
+static GFile *
+gimp_data_factory_get_save_dir (GimpDataFactory  *factory,
+                                GError          **error)
+{
+  GList *path;
+  GList *writable_path;
+  GFile *writable_dir = NULL;
+
+  path          = gimp_data_factory_get_data_path          (factory);
+  writable_path = gimp_data_factory_get_data_path_writable (factory);
+
+  if (writable_path)
+    {
+      GList    *list;
+      gboolean  found_any = FALSE;
+
+      for (list = writable_path; list; list = g_list_next (list))
+        {
+          GList *found = g_list_find_custom (path, list->data,
+                                             (GCompareFunc) gimp_file_compare);
+          if (found)
+            {
+              GFile *dir = found->data;
+
+              found_any = TRUE;
+
+              if (g_file_query_file_type (dir, G_FILE_QUERY_INFO_NONE,
+                                          NULL) != G_FILE_TYPE_DIRECTORY)
+                {
+                  /*  error out only if this is the last chance  */
+                  if (! list->next)
+                    {
+                      g_set_error (error, GIMP_DATA_ERROR, 0,
+                                   _("You have a writable data folder "
+                                     "configured (%s), but this folder does "
+                                     "not exist. Please create the folder or "
+                                     "fix your configuration in the "
+                                     "Preferences dialog's 'Folders' section."),
+                                   gimp_file_get_utf8_name (dir));
+                    }
+                }
+              else
+                {
+                  writable_dir = g_object_ref (dir);
+                  break;
+                }
+            }
+        }
+
+      if (! writable_dir && ! found_any)
+        {
+          g_set_error (error, GIMP_DATA_ERROR, 0,
+                       _("You have a writable data folder configured, but this "
+                         "folder is not part of your data search path. You "
+                         "probably edited the gimprc file manually, "
+                         "please fix it in the Preferences dialog's 'Folders' "
+                         "section."));
+        }
+    }
+  else
+    {
+      g_set_error (error, GIMP_DATA_ERROR, 0,
+                   _("You don't have any writable data folder configured."));
+    }
+
+  g_list_free_full (path,          (GDestroyNotify) g_object_unref);
+  g_list_free_full (writable_path, (GDestroyNotify) g_object_unref);
+
+  return writable_dir;
+}
diff --git a/app/core/gimpdatafactory.h b/app/core/gimpdatafactory.h
new file mode 100644
index 0000000..47c57ae
--- /dev/null
+++ b/app/core/gimpdatafactory.h
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdatafactory.h
+ * Copyright (C) 2001-2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DATA_FACTORY_H__
+#define __GIMP_DATA_FACTORY_H__
+
+
+#include "gimpobject.h"
+
+
+typedef GimpData * (* GimpDataNewFunc)         (GimpContext     *context,
+                                                const gchar     *name);
+typedef GimpData * (* GimpDataGetStandardFunc) (GimpContext     *context);
+
+typedef void       (* GimpDataForeachFunc)     (GimpDataFactory *factory,
+                                                GimpData        *data,
+                                                gpointer         user_data);
+
+
+#define GIMP_TYPE_DATA_FACTORY            (gimp_data_factory_get_type ())
+#define GIMP_DATA_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DATA_FACTORY, GimpDataFactory))
+#define GIMP_DATA_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DATA_FACTORY, GimpDataFactoryClass))
+#define GIMP_IS_DATA_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DATA_FACTORY))
+#define GIMP_IS_DATA_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DATA_FACTORY))
+#define GIMP_DATA_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DATA_FACTORY, GimpDataFactoryClass))
+
+
+typedef struct _GimpDataFactoryPrivate GimpDataFactoryPrivate;
+typedef struct _GimpDataFactoryClass   GimpDataFactoryClass;
+
+struct _GimpDataFactory
+{
+  GimpObject              parent_instance;
+
+  GimpDataFactoryPrivate *priv;
+};
+
+struct _GimpDataFactoryClass
+{
+  GimpObjectClass  parent_class;
+
+  void           (* data_init)      (GimpDataFactory *factory,
+                                     GimpContext     *context);
+  void           (* data_refresh)   (GimpDataFactory *factory,
+                                     GimpContext     *context);
+  void           (* data_save)      (GimpDataFactory *factory);
+
+  void           (* data_cancel)    (GimpDataFactory *factory);
+
+  GimpData     * (* data_duplicate) (GimpDataFactory  *factory,
+                                     GimpData         *data);
+  gboolean       (* data_delete)    (GimpDataFactory  *factory,
+                                     GimpData         *data,
+                                     gboolean          delete_from_disk,
+                                     GError          **error);
+};
+
+
+GType           gimp_data_factory_get_type          (void) G_GNUC_CONST;
+
+void            gimp_data_factory_data_init         (GimpDataFactory  *factory,
+                                                     GimpContext      *context,
+                                                     gboolean          no_data);
+void            gimp_data_factory_data_clean        (GimpDataFactory  *factory);
+void            gimp_data_factory_data_refresh      (GimpDataFactory  *factory,
+                                                     GimpContext      *context);
+void            gimp_data_factory_data_save         (GimpDataFactory  *factory);
+void            gimp_data_factory_data_free         (GimpDataFactory  *factory);
+
+GimpAsyncSet  * gimp_data_factory_get_async_set     (GimpDataFactory  *factory);
+gboolean        gimp_data_factory_data_wait         (GimpDataFactory  *factory);
+void            gimp_data_factory_data_cancel       (GimpDataFactory  *factory);
+
+gboolean        gimp_data_factory_has_data_new_func (GimpDataFactory  *factory);
+GimpData      * gimp_data_factory_data_new          (GimpDataFactory  *factory,
+                                                     GimpContext      *context,
+                                                     const gchar      *name);
+GimpData      * gimp_data_factory_data_get_standard (GimpDataFactory  *factory,
+                                                     GimpContext      *context);
+
+GimpData      * gimp_data_factory_data_duplicate    (GimpDataFactory  *factory,
+                                                     GimpData         *data);
+gboolean        gimp_data_factory_data_delete       (GimpDataFactory  *factory,
+                                                     GimpData         *data,
+                                                     gboolean          delete_from_disk,
+                                                     GError          **error);
+
+gboolean        gimp_data_factory_data_save_single  (GimpDataFactory  *factory,
+                                                     GimpData         *data,
+                                                     GError          **error);
+
+void            gimp_data_factory_data_foreach      (GimpDataFactory  *factory,
+                                                     gboolean          skip_internal,
+                                                     GimpDataForeachFunc  callback,
+                                                     gpointer          user_data);
+
+Gimp          * gimp_data_factory_get_gimp          (GimpDataFactory  *factory);
+GType           gimp_data_factory_get_data_type     (GimpDataFactory  *factory);
+GimpContainer * gimp_data_factory_get_container     (GimpDataFactory  *factory);
+GimpContainer * gimp_data_factory_get_container_obsolete
+                                                    (GimpDataFactory  *factory);
+GList         * gimp_data_factory_get_data_path     (GimpDataFactory  *factory);
+GList         * gimp_data_factory_get_data_path_writable
+                                                    (GimpDataFactory  *factory);
+
+
+
+#endif  /*  __GIMP_DATA_FACTORY_H__  */
diff --git a/app/core/gimpdataloaderfactory.c b/app/core/gimpdataloaderfactory.c
new file mode 100644
index 0000000..01c4496
--- /dev/null
+++ b/app/core/gimpdataloaderfactory.c
@@ -0,0 +1,562 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdataloaderfactory.c
+ * Copyright (C) 2001-2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-utils.h"
+#include "gimpcontainer.h"
+#include "gimpdata.h"
+#include "gimpdataloaderfactory.h"
+
+#include "gimp-intl.h"
+
+
+/* Data files that have this string in their path are considered
+ * obsolete and are only kept around for backwards compatibility
+ */
+#define GIMP_OBSOLETE_DATA_DIR_NAME "gimp-obsolete-files"
+
+
+typedef struct _GimpDataLoader GimpDataLoader;
+
+struct _GimpDataLoader
+{
+  gchar            *name;
+  GimpDataLoadFunc  load_func;
+  gchar            *extension;
+  gboolean          writable;
+};
+
+
+struct _GimpDataLoaderFactoryPrivate
+{
+  GList          *loaders;
+  GimpDataLoader *fallback;
+};
+
+#define GET_PRIVATE(obj) (((GimpDataLoaderFactory *) (obj))->priv)
+
+
+static void   gimp_data_loader_factory_finalize       (GObject         *object);
+
+static void   gimp_data_loader_factory_data_init      (GimpDataFactory *factory,
+                                                       GimpContext     *context);
+static void   gimp_data_loader_factory_data_refresh   (GimpDataFactory *factory,
+                                                       GimpContext     *context);
+
+static GimpDataLoader *
+              gimp_data_loader_factory_get_loader     (GimpDataFactory *factory,
+                                                       GFile           *file);
+
+static void   gimp_data_loader_factory_load           (GimpDataFactory *factory,
+                                                       GimpContext     *context,
+                                                       GHashTable      *cache);
+static void   gimp_data_loader_factory_load_directory (GimpDataFactory *factory,
+                                                       GimpContext     *context,
+                                                       GHashTable      *cache,
+                                                       gboolean         dir_writable,
+                                                       GFile           *directory,
+                                                       GFile           *top_directory);
+static void   gimp_data_loader_factory_load_data      (GimpDataFactory *factory,
+                                                       GimpContext     *context,
+                                                       GHashTable      *cache,
+                                                       gboolean         dir_writable,
+                                                       GFile           *file,
+                                                       GFileInfo       *info,
+                                                       GFile           *top_directory);
+
+static GimpDataLoader * gimp_data_loader_new          (const gchar     *name,
+                                                       GimpDataLoadFunc load_func,
+                                                       const gchar     *extension,
+                                                       gboolean         writable);
+static void            gimp_data_loader_free          (GimpDataLoader  *loader);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDataLoaderFactory, gimp_data_loader_factory,
+                            GIMP_TYPE_DATA_FACTORY)
+
+#define parent_class gimp_data_loader_factory_parent_class
+
+
+static void
+gimp_data_loader_factory_class_init (GimpDataLoaderFactoryClass *klass)
+{
+  GObjectClass         *object_class  = G_OBJECT_CLASS (klass);
+  GimpDataFactoryClass *factory_class = GIMP_DATA_FACTORY_CLASS (klass);
+
+  object_class->finalize      = gimp_data_loader_factory_finalize;
+
+  factory_class->data_init    = gimp_data_loader_factory_data_init;
+  factory_class->data_refresh = gimp_data_loader_factory_data_refresh;
+}
+
+static void
+gimp_data_loader_factory_init (GimpDataLoaderFactory *factory)
+{
+  factory->priv = gimp_data_loader_factory_get_instance_private (factory);
+}
+
+static void
+gimp_data_loader_factory_finalize (GObject *object)
+{
+  GimpDataLoaderFactoryPrivate *priv = GET_PRIVATE (object);
+
+  g_list_free_full (priv->loaders, (GDestroyNotify) gimp_data_loader_free);
+  priv->loaders = NULL;
+
+  g_clear_pointer (&priv->fallback, gimp_data_loader_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_data_loader_factory_data_init (GimpDataFactory *factory,
+                                    GimpContext     *context)
+{
+  gimp_data_loader_factory_load (factory, context, NULL);
+}
+
+static void
+gimp_data_loader_factory_refresh_cache_add (GimpDataFactory *factory,
+                                            GimpData        *data,
+                                            gpointer         user_data)
+{
+  GFile *file = gimp_data_get_file (data);
+
+  if (file)
+    {
+      GimpContainer *container = gimp_data_factory_get_container (factory);
+      GHashTable    *cache     = user_data;
+      GList         *list;
+
+      g_object_ref (data);
+
+      gimp_container_remove (container, GIMP_OBJECT (data));
+
+      list = g_hash_table_lookup (cache, file);
+      list = g_list_prepend (list, data);
+
+      g_hash_table_insert (cache, file, list);
+    }
+}
+
+static gboolean
+gimp_data_loader_factory_refresh_cache_remove (gpointer key,
+                                               gpointer value,
+                                               gpointer user_data)
+{
+  GList *list;
+
+  for (list = value; list; list = list->next)
+    g_object_unref (list->data);
+
+  g_list_free (value);
+
+  return TRUE;
+}
+
+static void
+gimp_data_loader_factory_data_refresh (GimpDataFactory *factory,
+                                       GimpContext     *context)
+{
+  GimpContainer *container = gimp_data_factory_get_container (factory);
+  GHashTable    *cache;
+
+  gimp_container_freeze (container);
+
+  /*  First, save all dirty data objects  */
+  gimp_data_factory_data_save (factory);
+
+  cache = g_hash_table_new (g_file_hash, (GEqualFunc) g_file_equal);
+
+  gimp_data_factory_data_foreach (factory, TRUE,
+                                  gimp_data_loader_factory_refresh_cache_add,
+                                  cache);
+
+  /*  Now the cache contains a GFile => list-of-objects mapping of
+   *  the old objects. So we should now traverse the directory and for
+   *  each file load it only if its mtime is newer.
+   *
+   *  Once a file was added, it is removed from the cache, so the only
+   *  objects remaining there will be those that are not present on
+   *  the disk (that have to be destroyed)
+   */
+  gimp_data_loader_factory_load (factory, context, cache);
+
+  /*  Now all the data is loaded. Free what remains in the cache  */
+  g_hash_table_foreach_remove (cache,
+                               gimp_data_loader_factory_refresh_cache_remove,
+                               NULL);
+
+  g_hash_table_destroy (cache);
+
+  gimp_container_thaw (container);
+}
+
+
+/*  public functions  */
+
+GimpDataFactory *
+gimp_data_loader_factory_new (Gimp                    *gimp,
+                              GType                    data_type,
+                              const gchar             *path_property_name,
+                              const gchar             *writable_property_name,
+                              GimpDataNewFunc          new_func,
+                              GimpDataGetStandardFunc  get_standard_func)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (g_type_is_a (data_type, GIMP_TYPE_DATA), NULL);
+  g_return_val_if_fail (path_property_name != NULL, NULL);
+  g_return_val_if_fail (writable_property_name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_DATA_LOADER_FACTORY,
+                       "gimp",                   gimp,
+                       "data-type",              data_type,
+                       "path-property-name",     path_property_name,
+                       "writable-property-name", writable_property_name,
+                       "new-func",               new_func,
+                       "get-standard-func",      get_standard_func,
+                       NULL);
+}
+
+void
+gimp_data_loader_factory_add_loader (GimpDataFactory  *factory,
+                                     const gchar      *name,
+                                     GimpDataLoadFunc  load_func,
+                                     const gchar      *extension,
+                                     gboolean          writable)
+{
+  GimpDataLoaderFactoryPrivate *priv;
+  GimpDataLoader               *loader;
+
+  g_return_if_fail (GIMP_IS_DATA_LOADER_FACTORY (factory));
+  g_return_if_fail (name != NULL);
+  g_return_if_fail (load_func != NULL);
+  g_return_if_fail (extension != NULL);
+
+  priv = GET_PRIVATE (factory);
+
+  loader = gimp_data_loader_new (name, load_func, extension, writable);
+
+  priv->loaders = g_list_append (priv->loaders, loader);
+}
+
+void
+gimp_data_loader_factory_add_fallback (GimpDataFactory  *factory,
+                                       const gchar      *name,
+                                       GimpDataLoadFunc  load_func)
+{
+  GimpDataLoaderFactoryPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_DATA_LOADER_FACTORY (factory));
+  g_return_if_fail (name != NULL);
+  g_return_if_fail (load_func != NULL);
+
+  priv = GET_PRIVATE (factory);
+
+  g_clear_pointer (&priv->fallback, gimp_data_loader_free);
+
+  priv->fallback = gimp_data_loader_new (name, load_func, NULL, FALSE);
+}
+
+
+/*  private functions  */
+
+static GimpDataLoader *
+gimp_data_loader_factory_get_loader (GimpDataFactory *factory,
+                                     GFile           *file)
+{
+  GimpDataLoaderFactoryPrivate *priv = GET_PRIVATE (factory);
+  GList                        *list;
+
+  for (list = priv->loaders; list; list = g_list_next (list))
+    {
+      GimpDataLoader *loader = list->data;
+
+      if (gimp_file_has_extension (file, loader->extension))
+        return loader;
+    }
+
+  return priv->fallback;
+}
+
+static void
+gimp_data_loader_factory_load (GimpDataFactory *factory,
+                               GimpContext     *context,
+                               GHashTable      *cache)
+{
+  GList *path;
+  GList *writable_path;
+  GList *list;
+
+  path          = gimp_data_factory_get_data_path          (factory);
+  writable_path = gimp_data_factory_get_data_path_writable (factory);
+
+  for (list = path; list; list = g_list_next (list))
+    {
+      gboolean dir_writable = FALSE;
+
+      if (g_list_find_custom (writable_path, list->data,
+                              (GCompareFunc) gimp_file_compare))
+        dir_writable = TRUE;
+
+      gimp_data_loader_factory_load_directory (factory, context, cache,
+                                               dir_writable,
+                                               list->data,
+                                               list->data);
+    }
+
+  g_list_free_full (path,          (GDestroyNotify) g_object_unref);
+  g_list_free_full (writable_path, (GDestroyNotify) g_object_unref);
+}
+
+static void
+gimp_data_loader_factory_load_directory (GimpDataFactory *factory,
+                                         GimpContext     *context,
+                                         GHashTable      *cache,
+                                         gboolean         dir_writable,
+                                         GFile           *directory,
+                                         GFile           *top_directory)
+{
+  GFileEnumerator *enumerator;
+
+  enumerator = g_file_enumerate_children (directory,
+                                          G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                          G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                          G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                          G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                          G_FILE_QUERY_INFO_NONE,
+                                          NULL, NULL);
+
+  if (enumerator)
+    {
+      GFileInfo *info;
+
+      while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
+        {
+          GFileType  file_type;
+          GFile     *child;
+
+          if (g_file_info_get_is_hidden (info))
+            {
+              g_object_unref (info);
+              continue;
+            }
+
+          file_type = g_file_info_get_file_type (info);
+          child     = g_file_enumerator_get_child (enumerator, info);
+
+          if (file_type == G_FILE_TYPE_DIRECTORY)
+            {
+              gimp_data_loader_factory_load_directory (factory, context, cache,
+                                                       dir_writable,
+                                                       child,
+                                                       top_directory);
+            }
+          else if (file_type == G_FILE_TYPE_REGULAR)
+            {
+              gimp_data_loader_factory_load_data (factory, context, cache,
+                                                  dir_writable,
+                                                  child, info,
+                                                  top_directory);
+            }
+
+          g_object_unref (child);
+          g_object_unref (info);
+        }
+
+      g_object_unref (enumerator);
+    }
+}
+
+static void
+gimp_data_loader_factory_load_data (GimpDataFactory *factory,
+                                    GimpContext     *context,
+                                    GHashTable      *cache,
+                                    gboolean         dir_writable,
+                                    GFile           *file,
+                                    GFileInfo       *info,
+                                    GFile           *top_directory)
+{
+  GimpDataLoader *loader;
+  GimpContainer  *container;
+  GimpContainer  *container_obsolete;
+  GList          *data_list = NULL;
+  GInputStream   *input;
+  guint64         mtime;
+  GError         *error = NULL;
+
+  loader = gimp_data_loader_factory_get_loader (factory, file);
+
+  if (! loader)
+    return;
+
+  container          = gimp_data_factory_get_container          (factory);
+  container_obsolete = gimp_data_factory_get_container_obsolete (factory);
+
+  if (gimp_data_factory_get_gimp (factory)->be_verbose)
+    g_print ("  Loading %s\n", gimp_file_get_utf8_name (file));
+
+  mtime = g_file_info_get_attribute_uint64 (info,
+                                            G_FILE_ATTRIBUTE_TIME_MODIFIED);
+
+  if (cache)
+    {
+      GList *cached_data = g_hash_table_lookup (cache, file);
+
+      if (cached_data &&
+          gimp_data_get_mtime (cached_data->data) != 0 &&
+          gimp_data_get_mtime (cached_data->data) == mtime)
+        {
+          GList *list;
+
+          for (list = cached_data; list; list = g_list_next (list))
+            gimp_container_add (container, list->data);
+
+          return;
+        }
+    }
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+
+  if (input)
+    {
+      GInputStream *buffered = g_buffered_input_stream_new (input);
+
+      data_list = loader->load_func (context, file, buffered, &error);
+
+      if (error)
+        {
+          g_prefix_error (&error,
+                          _("Error loading '%s': "),
+                          gimp_file_get_utf8_name (file));
+        }
+      else if (! data_list)
+        {
+          g_set_error (&error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Error loading '%s'"),
+                       gimp_file_get_utf8_name (file));
+        }
+
+      g_object_unref (buffered);
+      g_object_unref (input);
+    }
+  else
+    {
+      g_prefix_error (&error,
+                      _("Could not open '%s' for reading: "),
+                      gimp_file_get_utf8_name (file));
+    }
+
+  if (G_LIKELY (data_list))
+    {
+      GList    *list;
+      gchar    *uri;
+      gboolean  obsolete;
+      gboolean  writable  = FALSE;
+      gboolean  deletable = FALSE;
+
+      uri = g_file_get_uri (file);
+
+      obsolete = (strstr (uri, GIMP_OBSOLETE_DATA_DIR_NAME) != 0);
+
+      g_free (uri);
+
+      /* obsolete files are immutable, don't check their writability */
+      if (! obsolete)
+        {
+          deletable = (g_list_length (data_list) == 1 && dir_writable);
+          writable  = (deletable && loader->writable);
+        }
+
+      for (list = data_list; list; list = g_list_next (list))
+        {
+          GimpData *data = list->data;
+
+          gimp_data_set_file (data, file, writable, deletable);
+          gimp_data_set_mtime (data, mtime);
+          gimp_data_clean (data);
+
+          if (obsolete)
+            {
+              gimp_container_add (container_obsolete,
+                                  GIMP_OBJECT (data));
+            }
+          else
+            {
+              gimp_data_set_folder_tags (data, top_directory);
+
+              gimp_container_add (container,
+                                  GIMP_OBJECT (data));
+            }
+
+          g_object_unref (data);
+        }
+
+      g_list_free (data_list);
+    }
+
+  /*  not else { ... } because loader->load_func() can return a list
+   *  of data objects *and* an error message if loading failed after
+   *  something was already loaded
+   */
+  if (G_UNLIKELY (error))
+    {
+      gimp_message (gimp_data_factory_get_gimp (factory), NULL,
+                    GIMP_MESSAGE_ERROR,
+                    _("Failed to load data:\n\n%s"), error->message);
+      g_clear_error (&error);
+    }
+}
+
+static GimpDataLoader *
+gimp_data_loader_new (const gchar      *name,
+                      GimpDataLoadFunc  load_func,
+                      const gchar      *extension,
+                      gboolean          writable)
+{
+  GimpDataLoader *loader = g_slice_new (GimpDataLoader);
+
+  loader->name      = g_strdup (name);
+  loader->load_func = load_func;
+  loader->extension = g_strdup (extension);
+  loader->writable  = writable ? TRUE : FALSE;
+
+  return loader;
+}
+
+static void
+gimp_data_loader_free (GimpDataLoader *loader)
+{
+  g_free (loader->name);
+  g_free (loader->extension);
+
+  g_slice_free (GimpDataLoader, loader);
+}
diff --git a/app/core/gimpdataloaderfactory.h b/app/core/gimpdataloaderfactory.h
new file mode 100644
index 0000000..cf0d742
--- /dev/null
+++ b/app/core/gimpdataloaderfactory.h
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdataloaderfactory.h
+ * Copyright (C) 2001-2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DATA_LOADER_FACTORY_H__
+#define __GIMP_DATA_LOADER_FACTORY_H__
+
+
+#include "gimpdatafactory.h"
+
+
+typedef GList * (* GimpDataLoadFunc) (GimpContext   *context,
+                                      GFile         *file,
+                                      GInputStream  *input,
+                                      GError       **error);
+
+
+#define GIMP_TYPE_DATA_LOADER_FACTORY            (gimp_data_loader_factory_get_type ())
+#define GIMP_DATA_LOADER_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DATA_LOADER_FACTORY, GimpDataLoaderFactory))
+#define GIMP_DATA_LOADER_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DATA_LOADER_FACTORY, GimpDataLoaderFactoryClass))
+#define GIMP_IS_DATA_LOADER_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DATA_LOADER_FACTORY))
+#define GIMP_IS_DATA_LOADER_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DATA_LOADER_FACTORY))
+#define GIMP_DATA_LOADER_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DATA_LOADER_FACTORY, GimpDataLoaderFactoryClass))
+
+
+typedef struct _GimpDataLoaderFactoryPrivate GimpDataLoaderFactoryPrivate;
+typedef struct _GimpDataLoaderFactoryClass   GimpDataLoaderFactoryClass;
+
+struct _GimpDataLoaderFactory
+{
+  GimpDataFactory               parent_instance;
+
+  GimpDataLoaderFactoryPrivate *priv;
+};
+
+struct _GimpDataLoaderFactoryClass
+{
+  GimpDataFactoryClass  parent_class;
+};
+
+
+GType             gimp_data_loader_factory_get_type     (void) G_GNUC_CONST;
+
+GimpDataFactory * gimp_data_loader_factory_new          (Gimp                   *gimp,
+                                                         GType                   data_type,
+                                                         const gchar            *path_property_name,
+                                                         const gchar            *writable_property_name,
+                                                         GimpDataNewFunc         new_func,
+                                                         GimpDataGetStandardFunc  get_standard_func);
+
+void              gimp_data_loader_factory_add_loader   (GimpDataFactory         *factory,
+                                                         const gchar             *name,
+                                                         GimpDataLoadFunc         load_func,
+                                                         const gchar             *extension,
+                                                         gboolean                 writable);
+void              gimp_data_loader_factory_add_fallback (GimpDataFactory         *factory,
+                                                         const gchar             *name,
+                                                         GimpDataLoadFunc         load_func);
+
+
+#endif  /*  __GIMP_DATA_LOADER_FACTORY_H__  */
diff --git a/app/core/gimpdocumentlist.c b/app/core/gimpdocumentlist.c
new file mode 100644
index 0000000..fe10f6f
--- /dev/null
+++ b/app/core/gimpdocumentlist.c
@@ -0,0 +1,106 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimpdocumentlist.h"
+#include "gimpimagefile.h"
+
+
+G_DEFINE_TYPE (GimpDocumentList, gimp_document_list, GIMP_TYPE_LIST)
+
+
+static void
+gimp_document_list_class_init (GimpDocumentListClass *klass)
+{
+}
+
+static void
+gimp_document_list_init (GimpDocumentList *list)
+{
+}
+
+GimpContainer *
+gimp_document_list_new (Gimp *gimp)
+{
+  GimpDocumentList *document_list;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  document_list = g_object_new (GIMP_TYPE_DOCUMENT_LIST,
+                                "name",          "document-list",
+                                "children-type", GIMP_TYPE_IMAGEFILE,
+                                "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                                NULL);
+
+  document_list->gimp = gimp;
+
+  return GIMP_CONTAINER (document_list);
+}
+
+GimpImagefile *
+gimp_document_list_add_file (GimpDocumentList *document_list,
+                             GFile            *file,
+                             const gchar      *mime_type)
+{
+  Gimp          *gimp;
+  GimpImagefile *imagefile;
+  GimpContainer *container;
+  gchar         *uri;
+
+  g_return_val_if_fail (GIMP_IS_DOCUMENT_LIST (document_list), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  container = GIMP_CONTAINER (document_list);
+
+  gimp = document_list->gimp;
+
+  uri = g_file_get_uri (file);
+
+  imagefile = (GimpImagefile *) gimp_container_get_child_by_name (container,
+                                                                  uri);
+
+  g_free (uri);
+
+  if (imagefile)
+    {
+      gimp_container_reorder (container, GIMP_OBJECT (imagefile), 0);
+    }
+  else
+    {
+      imagefile = gimp_imagefile_new (gimp, file);
+      gimp_container_add (container, GIMP_OBJECT (imagefile));
+      g_object_unref (imagefile);
+    }
+
+  gimp_imagefile_set_mime_type (imagefile, mime_type);
+
+  if (gimp->config->save_document_history)
+    gimp_recent_list_add_file (gimp, file, mime_type);
+
+  return imagefile;
+}
diff --git a/app/core/gimpdocumentlist.h b/app/core/gimpdocumentlist.h
new file mode 100644
index 0000000..68bca80
--- /dev/null
+++ b/app/core/gimpdocumentlist.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCUMENT_LIST_H__
+#define __GIMP_DOCUMENT_LIST_H__
+
+#include "core/gimplist.h"
+
+
+#define GIMP_TYPE_DOCUMENT_LIST           (gimp_document_list_get_type ())
+#define GIMP_DOCUMENT_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCUMENT_LIST, GimpDocumentList))
+#define GIMP_DOCUMENT_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCUMENT_LIST, GimpDocumentListClass))
+#define GIMP_IS_DOCUMENT_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCUMENT_LIST))
+#define GIMP_IS_DOCUMENT_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCUMENT_LIST))
+
+
+typedef struct _GimpDocumentListClass GimpDocumentListClass;
+
+struct _GimpDocumentList
+{
+  GimpList  parent_instance;
+
+  Gimp     *gimp;
+};
+
+struct _GimpDocumentListClass
+{
+  GimpListClass  parent_class;
+};
+
+
+GType           gimp_document_list_get_type (void) G_GNUC_CONST;
+GimpContainer * gimp_document_list_new      (Gimp             *gimp);
+
+GimpImagefile * gimp_document_list_add_file (GimpDocumentList *document_list,
+                                             GFile            *file,
+                                             const gchar      *mime_type);
+
+
+#endif  /*  __GIMP_DOCUMENT_LIST_H__  */
diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c
new file mode 100644
index 0000000..1cef758
--- /dev/null
+++ b/app/core/gimpdrawable-bucket-fill.c
@@ -0,0 +1,499 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#define GEGL_ITERATOR2_API
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-mask.h"
+#include "gegl/gimp-gegl-mask-combine.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-bucket-fill.h"
+#include "gimpfilloptions.h"
+#include "gimpimage.h"
+#include "gimppickable.h"
+#include "gimppickable-contiguous-region.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_bucket_fill (GimpDrawable         *drawable,
+                           GimpFillOptions      *options,
+                           gboolean              fill_transparent,
+                           GimpSelectCriterion   fill_criterion,
+                           gdouble               threshold,
+                           gboolean              sample_merged,
+                           gboolean              diagonal_neighbors,
+                           gdouble               seed_x,
+                           gdouble               seed_y)
+{
+  GimpImage  *image;
+  GeglBuffer *buffer;
+  gdouble     mask_x;
+  gdouble     mask_y;
+  gint        width, height;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  gimp_set_busy (image->gimp);
+
+  buffer = gimp_drawable_get_bucket_fill_buffer (drawable, options,
+                                                 fill_transparent, fill_criterion,
+                                                 threshold, FALSE, sample_merged,
+                                                 diagonal_neighbors,
+                                                 seed_x, seed_y, NULL,
+                                                 &mask_x, &mask_y, &width, &height);
+
+  if (buffer)
+    {
+      /*  Apply it to the image  */
+      gimp_drawable_apply_buffer (drawable, buffer,
+                                  GEGL_RECTANGLE (0, 0, width, height),
+                                  TRUE, C_("undo-type", "Bucket Fill"),
+                                  gimp_context_get_opacity (GIMP_CONTEXT (options)),
+                                  gimp_context_get_paint_mode (GIMP_CONTEXT (options)),
+                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                  gimp_layer_mode_get_paint_composite_mode
+                                  (gimp_context_get_paint_mode (GIMP_CONTEXT (options))),
+                                  NULL, (gint) mask_x, mask_y);
+      g_object_unref (buffer);
+
+      gimp_drawable_update (drawable, mask_x, mask_y, width, height);
+    }
+
+  gimp_unset_busy (image->gimp);
+}
+
+/**
+ * gimp_drawable_get_bucket_fill_buffer:
+ * @drawable: the #GimpDrawable to edit.
+ * @options:
+ * @fill_transparent:
+ * @fill_criterion:
+ * @threshold:
+ * @show_all:
+ * @sample_merged:
+ * @diagonal_neighbors:
+ * @seed_x: X coordinate to start the fill.
+ * @seed_y: Y coordinate to start the fill.
+ * @mask_buffer: mask of the fill in-progress when in an interactive
+ *               filling process. Set to NULL if you need a one-time
+ *               fill.
+ * @mask_x: returned x bound of @mask_buffer.
+ * @mask_y: returned x bound of @mask_buffer.
+ * @mask_width: returned width bound of @mask_buffer.
+ * @mask_height: returned height bound of @mask_buffer.
+ *
+ * Creates the fill buffer for a bucket fill operation on @drawable,
+ * without actually applying it (if you want to apply it directly as a
+ * one-time operation, use gimp_drawable_bucket_fill() instead). If
+ * @mask_buffer is not NULL, the intermediate fill mask will also be
+ * returned. This fill mask can later be reused in successive calls to
+ * gimp_drawable_get_bucket_fill_buffer() for interactive filling.
+ *
+ * Returns: a fill buffer which can be directly applied to @drawable, or
+ *          used in a drawable filter as preview.
+ */
+GeglBuffer *
+gimp_drawable_get_bucket_fill_buffer (GimpDrawable         *drawable,
+                                      GimpFillOptions      *options,
+                                      gboolean              fill_transparent,
+                                      GimpSelectCriterion   fill_criterion,
+                                      gdouble               threshold,
+                                      gboolean              show_all,
+                                      gboolean              sample_merged,
+                                      gboolean              diagonal_neighbors,
+                                      gdouble               seed_x,
+                                      gdouble               seed_y,
+                                      GeglBuffer          **mask_buffer,
+                                      gdouble              *mask_x,
+                                      gdouble              *mask_y,
+                                      gint                 *mask_width,
+                                      gint                 *mask_height)
+{
+  GimpImage    *image;
+  GimpPickable *pickable;
+  GeglBuffer   *buffer;
+  GeglBuffer   *new_mask;
+  gboolean      antialias;
+  gint          x, y, width, height;
+  gint          mask_offset_x = 0;
+  gint          mask_offset_y = 0;
+  gint          sel_x, sel_y, sel_width, sel_height;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  &sel_x, &sel_y, &sel_width, &sel_height))
+    return NULL;
+
+  if (mask_buffer && *mask_buffer && threshold == 0.0)
+    {
+      gfloat pixel;
+
+      gegl_buffer_sample (*mask_buffer, seed_x, seed_y, NULL, &pixel,
+                          babl_format ("Y float"),
+                          GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+      if (pixel != 0.0)
+        /* Already selected. This seed won't change the selection. */
+        return NULL;
+    }
+
+  gimp_set_busy (image->gimp);
+
+  if (sample_merged)
+    {
+      if (! show_all)
+        pickable = GIMP_PICKABLE (image);
+      else
+        pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+    }
+  else
+    {
+      pickable = GIMP_PICKABLE (drawable);
+    }
+
+  antialias = gimp_fill_options_get_antialias (options);
+
+  /*  Do a seed bucket fill...To do this, calculate a new
+   *  contiguous region.
+   */
+  new_mask = gimp_pickable_contiguous_region_by_seed (pickable,
+                                                      antialias,
+                                                      threshold,
+                                                      fill_transparent,
+                                                      fill_criterion,
+                                                      diagonal_neighbors,
+                                                      (gint) seed_x,
+                                                      (gint) seed_y);
+  if (mask_buffer && *mask_buffer)
+    {
+      gimp_gegl_mask_combine_buffer (new_mask, *mask_buffer,
+                                     GIMP_CHANNEL_OP_ADD, 0, 0);
+      g_object_unref (*mask_buffer);
+    }
+
+  if (mask_buffer)
+    *mask_buffer = new_mask;
+
+  gimp_gegl_mask_bounds (new_mask, &x, &y, &width, &height);
+  width  -= x;
+  height -= y;
+
+  /*  If there is a selection, intersect the region bounds
+   *  with the selection bounds, to avoid processing areas
+   *  that are going to be masked out anyway.  The actual
+   *  intersection of the fill region with the mask data
+   *  happens when combining the fill buffer, in
+   *  gimp_drawable_apply_buffer().
+   */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      gint off_x = 0;
+      gint off_y = 0;
+
+      if (sample_merged)
+        gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      if (! gimp_rectangle_intersect (x, y, width, height,
+
+                                      sel_x + off_x, sel_y + off_y,
+                                      sel_width,     sel_height,
+
+                                      &x, &y, &width, &height))
+        {
+          /*  The fill region and the selection are disjoint; bail.  */
+
+          if (! mask_buffer)
+            g_object_unref (new_mask);
+
+          gimp_unset_busy (image->gimp);
+
+          return NULL;
+        }
+    }
+
+  /*  make sure we handle the mask correctly if it was sample-merged  */
+  if (sample_merged)
+    {
+      GimpItem *item = GIMP_ITEM (drawable);
+      gint      off_x, off_y;
+
+      /*  Limit the channel bounds to the drawable's extents  */
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      gimp_rectangle_intersect (x, y, width, height,
+
+                                off_x, off_y,
+                                gimp_item_get_width (item),
+                                gimp_item_get_height (item),
+
+                                &x, &y, &width, &height);
+
+      mask_offset_x = x;
+      mask_offset_y = y;
+
+      /*  translate mask bounds to drawable coords  */
+      x -= off_x;
+      y -= off_y;
+    }
+  else
+    {
+      mask_offset_x = x;
+      mask_offset_y = y;
+    }
+
+  buffer = gimp_fill_options_create_buffer (options, drawable,
+                                            GEGL_RECTANGLE (0, 0,
+                                                            width, height),
+                                            -x, -y);
+
+  gimp_gegl_apply_opacity (buffer, NULL, NULL, buffer, new_mask,
+                           -mask_offset_x, -mask_offset_y, 1.0);
+
+  if (mask_x)
+    *mask_x = x;
+  if (mask_y)
+    *mask_y = y;
+  if (mask_width)
+    *mask_width = width;
+  if (mask_height)
+    *mask_height = height;
+
+  if (! mask_buffer)
+    g_object_unref (new_mask);
+
+  gimp_unset_busy (image->gimp);
+
+  return buffer;
+}
+
+/**
+ * gimp_drawable_get_line_art_fill_buffer:
+ * @drawable: the #GimpDrawable to edit.
+ * @line_art: the #GimpLineArt computed as fill source.
+ * @options: the #GimpFillOptions.
+ * @sample_merged:
+ * @seed_x: X coordinate to start the fill.
+ * @seed_y: Y coordinate to start the fill.
+ * @mask_buffer: mask of the fill in-progress when in an interactive
+ *               filling process. Set to NULL if you need a one-time
+ *               fill.
+ * @mask_x: returned x bound of @mask_buffer.
+ * @mask_y: returned x bound of @mask_buffer.
+ * @mask_width: returned width bound of @mask_buffer.
+ * @mask_height: returned height bound of @mask_buffer.
+ *
+ * Creates the fill buffer for a bucket fill operation on @drawable
+ * based on @line_art and @options, without actually applying it.
+ * If @mask_buffer is not NULL, the intermediate fill mask will also be
+ * returned. This fill mask can later be reused in successive calls to
+ * gimp_drawable_get_bucket_fill_buffer() for interactive filling.
+ *
+ * Returns: a fill buffer which can be directly applied to @drawable, or
+ *          used in a drawable filter as preview.
+ */
+GeglBuffer *
+gimp_drawable_get_line_art_fill_buffer (GimpDrawable     *drawable,
+                                        GimpLineArt      *line_art,
+                                        GimpFillOptions  *options,
+                                        gboolean          sample_merged,
+                                        gdouble           seed_x,
+                                        gdouble           seed_y,
+                                        GeglBuffer      **mask_buffer,
+                                        gdouble          *mask_x,
+                                        gdouble          *mask_y,
+                                        gint             *mask_width,
+                                        gint             *mask_height)
+{
+  GimpImage  *image;
+  GeglBuffer *buffer;
+  GeglBuffer *new_mask;
+  gint        x, y, width, height;
+  gint        mask_offset_x = 0;
+  gint        mask_offset_y = 0;
+  gint        sel_x, sel_y, sel_width, sel_height;
+  gdouble     feather_radius;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  &sel_x, &sel_y, &sel_width, &sel_height))
+    return NULL;
+
+  if (mask_buffer && *mask_buffer)
+    {
+      gfloat pixel;
+
+      gegl_buffer_sample (*mask_buffer, seed_x, seed_y, NULL, &pixel,
+                          babl_format ("Y float"),
+                          GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+      if (pixel != 0.0)
+        /* Already selected. This seed won't change the selection. */
+        return NULL;
+    }
+
+  gimp_set_busy (image->gimp);
+
+  /*  Do a seed bucket fill...To do this, calculate a new
+   *  contiguous region.
+   */
+  new_mask = gimp_pickable_contiguous_region_by_line_art (NULL, line_art,
+                                                          (gint) seed_x,
+                                                          (gint) seed_y);
+  if (mask_buffer && *mask_buffer)
+    {
+      gimp_gegl_mask_combine_buffer (new_mask, *mask_buffer,
+                                     GIMP_CHANNEL_OP_ADD, 0, 0);
+      g_object_unref (*mask_buffer);
+    }
+  if (mask_buffer)
+    *mask_buffer = new_mask;
+
+  gimp_gegl_mask_bounds (new_mask, &x, &y, &width, &height);
+  width  -= x;
+  height -= y;
+
+  /*  If there is a selection, intersect the region bounds
+   *  with the selection bounds, to avoid processing areas
+   *  that are going to be masked out anyway.  The actual
+   *  intersection of the fill region with the mask data
+   *  happens when combining the fill buffer, in
+   *  gimp_drawable_apply_buffer().
+   */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      gint off_x = 0;
+      gint off_y = 0;
+
+      if (sample_merged)
+        gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      if (! gimp_rectangle_intersect (x, y, width, height,
+
+                                      sel_x + off_x, sel_y + off_y,
+                                      sel_width,     sel_height,
+
+                                      &x, &y, &width, &height))
+        {
+          if (! mask_buffer)
+            g_object_unref (new_mask);
+          /*  The fill region and the selection are disjoint; bail.  */
+          gimp_unset_busy (image->gimp);
+
+          return NULL;
+        }
+    }
+
+  /*  make sure we handle the mask correctly if it was sample-merged  */
+  if (sample_merged)
+    {
+      GimpItem *item = GIMP_ITEM (drawable);
+      gint      off_x, off_y;
+
+      /*  Limit the channel bounds to the drawable's extents  */
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      gimp_rectangle_intersect (x, y, width, height,
+
+                                off_x, off_y,
+                                gimp_item_get_width (item),
+                                gimp_item_get_height (item),
+
+                                &x, &y, &width, &height);
+
+      mask_offset_x = x;
+      mask_offset_y = y;
+
+      /*  translate mask bounds to drawable coords  */
+      x -= off_x;
+      y -= off_y;
+    }
+  else
+    {
+      mask_offset_x = x;
+      mask_offset_y = y;
+    }
+
+  buffer = gimp_fill_options_create_buffer (options, drawable,
+                                            GEGL_RECTANGLE (0, 0,
+                                                            width, height),
+                                            -x, -y);
+
+  gimp_gegl_apply_opacity (buffer, NULL, NULL, buffer, new_mask,
+                           -mask_offset_x, -mask_offset_y, 1.0);
+
+  if (gimp_fill_options_get_feather (options, &feather_radius))
+    {
+      /* Feathering for the line art algorithm is not applied during
+       * mask creation because we just want to apply it on the borders
+       * of the mask at the end (since the mask can evolve, we don't
+       * want to actually touch it, but only the intermediate results).
+       */
+      gimp_gegl_apply_feather (buffer, NULL, NULL, buffer, NULL,
+                               feather_radius, feather_radius, TRUE);
+    }
+
+  if (mask_x)
+    *mask_x = x;
+  if (mask_y)
+    *mask_y = y;
+  if (mask_width)
+    *mask_width = width;
+  if (mask_height)
+    *mask_height = height;
+
+  if (! mask_buffer)
+    g_object_unref (new_mask);
+
+  gimp_unset_busy (image->gimp);
+
+  return buffer;
+}
diff --git a/app/core/gimpdrawable-bucket-fill.h b/app/core/gimpdrawable-bucket-fill.h
new file mode 100644
index 0000000..148de97
--- /dev/null
+++ b/app/core/gimpdrawable-bucket-fill.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_DRAWABLE_BUCKET_FILL_H__
+#define  __GIMP_DRAWABLE_BUCKET_FILL_H__
+
+
+void         gimp_drawable_bucket_fill              (GimpDrawable         *drawable,
+                                                     GimpFillOptions      *options,
+                                                     gboolean              fill_transparent,
+                                                     GimpSelectCriterion   fill_criterion,
+                                                     gdouble               threshold,
+                                                     gboolean              sample_merged,
+                                                     gboolean              diagonal_neighbors,
+                                                     gdouble               x,
+                                                     gdouble               y);
+GeglBuffer * gimp_drawable_get_bucket_fill_buffer   (GimpDrawable         *drawable,
+                                                     GimpFillOptions      *options,
+                                                     gboolean              fill_transparent,
+                                                     GimpSelectCriterion   fill_criterion,
+                                                     gdouble               threshold,
+                                                     gboolean              show_all,
+                                                     gboolean              sample_merged,
+                                                     gboolean              diagonal_neighbors,
+                                                     gdouble               seed_x,
+                                                     gdouble               seed_y,
+                                                     GeglBuffer          **mask_buffer,
+                                                     gdouble              *mask_x,
+                                                     gdouble              *mask_y,
+                                                     gint                 *mask_width,
+                                                     gint                 *mask_height);
+
+GeglBuffer * gimp_drawable_get_line_art_fill_buffer (GimpDrawable         *drawable,
+                                                     GimpLineArt          *line_art,
+                                                     GimpFillOptions      *options,
+                                                     gboolean              sample_merged,
+                                                     gdouble               seed_x,
+                                                     gdouble               seed_y,
+                                                     GeglBuffer          **mask_buffer,
+                                                     gdouble              *mask_x,
+                                                     gdouble              *mask_y,
+                                                     gint                 *mask_width,
+                                                     gint                 *mask_height);
+
+#endif  /*  __GIMP_DRAWABLE_BUCKET_FILL_H__  */
diff --git a/app/core/gimpdrawable-combine.c b/app/core/gimpdrawable-combine.c
new file mode 100644
index 0000000..e48d9dd
--- /dev/null
+++ b/app/core/gimpdrawable-combine.c
@@ -0,0 +1,144 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gegl/gimpapplicator.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpchunkiterator.h"
+#include "gimpdrawable-combine.h"
+#include "gimpimage.h"
+
+
+void
+gimp_drawable_real_apply_buffer (GimpDrawable           *drawable,
+                                 GeglBuffer             *buffer,
+                                 const GeglRectangle    *buffer_region,
+                                 gboolean                push_undo,
+                                 const gchar            *undo_desc,
+                                 gdouble                 opacity,
+                                 GimpLayerMode           mode,
+                                 GimpLayerColorSpace     blend_space,
+                                 GimpLayerColorSpace     composite_space,
+                                 GimpLayerCompositeMode  composite_mode,
+                                 GeglBuffer             *base_buffer,
+                                 gint                    base_x,
+                                 gint                    base_y)
+{
+  GimpItem          *item  = GIMP_ITEM (drawable);
+  GimpImage         *image = gimp_item_get_image (item);
+  GimpChannel       *mask  = gimp_image_get_mask (image);
+  GimpApplicator    *applicator;
+  GimpChunkIterator *iter;
+  gint               x, y, width, height;
+  gint               offset_x, offset_y;
+
+  /*  don't apply the mask to itself and don't apply an empty mask  */
+  if (GIMP_DRAWABLE (mask) == drawable || gimp_channel_is_empty (mask))
+    mask = NULL;
+
+  if (! base_buffer)
+    base_buffer = gimp_drawable_get_buffer (drawable);
+
+  /*  get the layer offsets  */
+  gimp_item_get_offset (item, &offset_x, &offset_y);
+
+  /*  make sure the image application coordinates are within drawable bounds  */
+  if (! gimp_rectangle_intersect (base_x, base_y,
+                                  buffer_region->width, buffer_region->height,
+                                  0, 0,
+                                  gimp_item_get_width  (item),
+                                  gimp_item_get_height (item),
+                                  &x, &y, &width, &height))
+    {
+      return;
+    }
+
+  if (mask)
+    {
+      GimpItem *mask_item = GIMP_ITEM (mask);
+
+      /*  make sure coordinates are in mask bounds ...
+       *  we need to add the layer offset to transform coords
+       *  into the mask coordinate system
+       */
+      if (! gimp_rectangle_intersect (x, y, width, height,
+                                      -offset_x, -offset_y,
+                                      gimp_item_get_width  (mask_item),
+                                      gimp_item_get_height (mask_item),
+                                      &x, &y, &width, &height))
+        {
+          return;
+        }
+    }
+
+  if (push_undo)
+    {
+      gimp_drawable_push_undo (drawable, undo_desc,
+                               NULL, x, y, width, height);
+    }
+
+  applicator = gimp_applicator_new (NULL);
+
+  if (mask)
+    {
+      GeglBuffer *mask_buffer;
+
+      mask_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+      gimp_applicator_set_mask_buffer (applicator, mask_buffer);
+      gimp_applicator_set_mask_offset (applicator, -offset_x, -offset_y);
+    }
+
+  gimp_applicator_set_src_buffer (applicator, base_buffer);
+  gimp_applicator_set_dest_buffer (applicator,
+                                   gimp_drawable_get_buffer (drawable));
+
+  gimp_applicator_set_apply_buffer (applicator, buffer);
+  gimp_applicator_set_apply_offset (applicator,
+                                    base_x - buffer_region->x,
+                                    base_y - buffer_region->y);
+
+  gimp_applicator_set_opacity (applicator, opacity);
+  gimp_applicator_set_mode (applicator, mode,
+                            blend_space, composite_space, composite_mode);
+  gimp_applicator_set_affect (applicator,
+                              gimp_drawable_get_active_mask (drawable));
+
+  iter = gimp_chunk_iterator_new (cairo_region_create_rectangle (
+    &(cairo_rectangle_int_t) {x, y, width, height}));
+
+  while (gimp_chunk_iterator_next (iter))
+    {
+      GeglRectangle rect;
+
+      while (gimp_chunk_iterator_get_rect (iter, &rect))
+        gimp_applicator_blit (applicator, &rect);
+    }
+
+  g_object_unref (applicator);
+}
diff --git a/app/core/gimpdrawable-combine.h b/app/core/gimpdrawable-combine.h
new file mode 100644
index 0000000..d21d558
--- /dev/null
+++ b/app/core/gimpdrawable-combine.h
@@ -0,0 +1,39 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_COMBINE_H__
+#define __GIMP_DRAWABLE_COMBINE_H__
+
+
+/*  virtual functions of GimpDrawable, don't call directly  */
+
+void   gimp_drawable_real_apply_buffer (GimpDrawable           *drawable,
+                                        GeglBuffer             *buffer,
+                                        const GeglRectangle    *buffer_region,
+                                        gboolean                push_undo,
+                                        const gchar            *undo_desc,
+                                        gdouble                 opacity,
+                                        GimpLayerMode           mode,
+                                        GimpLayerColorSpace     blend_space,
+                                        GimpLayerColorSpace     composite_space,
+                                        GimpLayerCompositeMode  composite_mode,
+                                        GeglBuffer             *base_buffer,
+                                        gint                    base_x,
+                                        gint                    base_y);
+
+
+#endif /* __GIMP_DRAWABLE_COMBINE_H__ */
diff --git a/app/core/gimpdrawable-edit.c b/app/core/gimpdrawable-edit.c
new file mode 100644
index 0000000..214b8fb
--- /dev/null
+++ b/app/core/gimpdrawable-edit.c
@@ -0,0 +1,231 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-edit.h"
+#include "gimpdrawablefilter.h"
+#include "gimpcontext.h"
+#include "gimpfilloptions.h"
+#include "gimpimage.h"
+#include "gimppattern.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_drawable_edit_can_fill_direct (GimpDrawable    *drawable,
+                                                      GimpFillOptions *options);
+static void       gimp_drawable_edit_fill_direct     (GimpDrawable    *drawable,
+                                                      GimpFillOptions *options,
+                                                      const gchar     *undo_desc);
+
+
+/*  private functions  */
+
+static gboolean
+gimp_drawable_edit_can_fill_direct (GimpDrawable    *drawable,
+                                    GimpFillOptions *options)
+{
+  GimpImage                *image;
+  GimpContext              *context;
+  gdouble                   opacity;
+  GimpComponentMask         affect;
+  GimpLayerMode             mode;
+  GimpLayerCompositeMode    composite_mode;
+  GimpLayerCompositeRegion  composite_region;
+
+  image            = gimp_item_get_image (GIMP_ITEM (drawable));
+  context          = GIMP_CONTEXT (options);
+  opacity          = gimp_context_get_opacity (context);
+  affect           = gimp_drawable_get_active_mask (drawable);
+  mode             = gimp_context_get_paint_mode (context);
+  composite_mode   = gimp_layer_mode_get_paint_composite_mode (mode);
+  composite_region = gimp_layer_mode_get_included_region (mode, composite_mode);
+
+  if (gimp_channel_is_empty (gimp_image_get_mask (image)) &&
+      opacity == GIMP_OPACITY_OPAQUE                      &&
+      affect  == GIMP_COMPONENT_MASK_ALL                  &&
+      gimp_layer_mode_is_trivial (mode)                   &&
+      (! gimp_layer_mode_is_subtractive (mode)            ^
+       ! (composite_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE)))
+    {
+      switch (gimp_fill_options_get_style (options))
+        {
+        case GIMP_FILL_STYLE_SOLID:
+          return TRUE;
+
+        case GIMP_FILL_STYLE_PATTERN:
+          {
+            GimpPattern *pattern;
+            GimpTempBuf *mask;
+            const Babl  *format;
+
+            pattern = gimp_context_get_pattern (context);
+            mask    = gimp_pattern_get_mask (pattern);
+            format  = gimp_temp_buf_get_format (mask);
+
+            return ! babl_format_has_alpha (format);
+          }
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_drawable_edit_fill_direct (GimpDrawable    *drawable,
+                                GimpFillOptions *options,
+                                const gchar     *undo_desc)
+{
+  GeglBuffer    *buffer;
+  GimpContext   *context;
+  GimpLayerMode  mode;
+  gint           width;
+  gint           height;
+
+  buffer  = gimp_drawable_get_buffer (drawable);
+  context = GIMP_CONTEXT (options);
+  mode    = gimp_context_get_paint_mode (context);
+  width   = gimp_item_get_width  (GIMP_ITEM (drawable));
+  height  = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  gimp_drawable_push_undo (drawable, undo_desc,
+                           NULL, 0, 0, width, height);
+
+  if (! gimp_layer_mode_is_subtractive (mode))
+    gimp_fill_options_fill_buffer (options, drawable, buffer, 0, 0);
+  else
+    gimp_gegl_clear (buffer, NULL);
+}
+
+
+/*  public functions  */
+
+void
+gimp_drawable_edit_clear (GimpDrawable *drawable,
+                          GimpContext  *context)
+{
+  GimpFillOptions *options;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  options = gimp_fill_options_new (context->gimp, NULL, FALSE);
+
+  if (gimp_drawable_has_alpha (drawable))
+    gimp_fill_options_set_by_fill_type (options, context,
+                                        GIMP_FILL_TRANSPARENT, NULL);
+  else
+    gimp_fill_options_set_by_fill_type (options, context,
+                                        GIMP_FILL_BACKGROUND, NULL);
+
+  gimp_drawable_edit_fill (drawable, options, C_("undo-type", "Clear"));
+
+  g_object_unref (options);
+}
+
+void
+gimp_drawable_edit_fill (GimpDrawable    *drawable,
+                         GimpFillOptions *options,
+                         const gchar     *undo_desc)
+{
+  GimpContext *context;
+  gint         x, y, width, height;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  &x, &y, &width, &height))
+    {
+      return;  /*  nothing to do, but the fill succeeded  */
+    }
+
+  context = GIMP_CONTEXT (options);
+
+  if (gimp_layer_mode_is_alpha_only (gimp_context_get_paint_mode (context)))
+    {
+      if (! gimp_drawable_has_alpha (drawable) ||
+          ! (gimp_drawable_get_active_mask (drawable) &
+             GIMP_COMPONENT_MASK_ALPHA))
+        {
+          return;  /*  nothing to do, but the fill succeeded  */
+        }
+    }
+
+  if (! undo_desc)
+    undo_desc = gimp_fill_options_get_undo_desc (options);
+
+  /* check if we can fill the drawable's buffer directly */
+  if (gimp_drawable_edit_can_fill_direct (drawable, options))
+    {
+      gimp_drawable_edit_fill_direct (drawable, options, undo_desc);
+
+      gimp_drawable_update (drawable, x, y, width, height);
+    }
+  else
+    {
+      GeglNode           *operation;
+      GimpDrawableFilter *filter;
+      gdouble             opacity;
+      GimpLayerMode       mode;
+      GimpLayerMode       composite_mode;
+
+      opacity        = gimp_context_get_opacity (context);
+      mode           = gimp_context_get_paint_mode (context);
+      composite_mode = gimp_layer_mode_get_paint_composite_mode (mode);
+
+      operation = gegl_node_new_child (NULL,
+                                       "operation",        "gimp:fill-source",
+                                       "options",          options,
+                                       "drawable",         drawable,
+                                       "pattern-offset-x", -x,
+                                       "pattern-offset-y", -y,
+                                       NULL);
+
+      filter = gimp_drawable_filter_new (drawable, undo_desc, operation, NULL);
+
+      gimp_drawable_filter_set_opacity (filter, opacity);
+      gimp_drawable_filter_set_mode    (filter,
+                                        mode,
+                                        GIMP_LAYER_COLOR_SPACE_AUTO,
+                                        GIMP_LAYER_COLOR_SPACE_AUTO,
+                                        composite_mode);
+
+      gimp_drawable_filter_apply  (filter, NULL);
+      gimp_drawable_filter_commit (filter, NULL, FALSE);
+
+      g_object_unref (filter);
+      g_object_unref (operation);
+    }
+}
diff --git a/app/core/gimpdrawable-edit.h b/app/core/gimpdrawable-edit.h
new file mode 100644
index 0000000..a4ecb1c
--- /dev/null
+++ b/app/core/gimpdrawable-edit.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_EDIT_H__
+#define __GIMP_DRAWABLE_EDIT_H__
+
+
+void   gimp_drawable_edit_clear (GimpDrawable    *drawable,
+                                 GimpContext     *context);
+void   gimp_drawable_edit_fill  (GimpDrawable    *drawable,
+                                 GimpFillOptions *options,
+                                 const gchar     *undo_desc);
+
+
+#endif  /*  __GIMP_DRAWABLE_EDIT_H__  */
diff --git a/app/core/gimpdrawable-equalize.c b/app/core/gimpdrawable-equalize.c
new file mode 100644
index 0000000..202dc7f
--- /dev/null
+++ b/app/core/gimpdrawable-equalize.c
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpdrawable.h"
+#include "gimpdrawable-equalize.h"
+#include "gimpdrawable-histogram.h"
+#include "gimpdrawable-operation.h"
+#include "gimphistogram.h"
+#include "gimpimage.h"
+#include "gimpselection.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_drawable_equalize (GimpDrawable *drawable,
+                        gboolean      mask_only)
+{
+  GimpImage     *image;
+  GimpChannel   *selection;
+  GimpHistogram *histogram;
+  GeglNode      *equalize;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+  selection = gimp_image_get_mask (image);
+
+  histogram = gimp_histogram_new (FALSE);
+  gimp_drawable_calculate_histogram (drawable, histogram, FALSE);
+
+  equalize = gegl_node_new_child (NULL,
+                                  "operation", "gimp:equalize",
+                                  "histogram", histogram,
+                                  NULL);
+
+  if (! mask_only)
+    gimp_selection_suspend (GIMP_SELECTION (selection));
+
+  gimp_drawable_apply_operation (drawable, NULL,
+                                 C_("undo-type", "Equalize"),
+                                 equalize);
+
+  if (! mask_only)
+    gimp_selection_resume (GIMP_SELECTION (selection));
+
+  g_object_unref (equalize);
+  g_object_unref (histogram);
+}
diff --git a/app/core/gimpdrawable-equalize.h b/app/core/gimpdrawable-equalize.h
new file mode 100644
index 0000000..065b83f
--- /dev/null
+++ b/app/core/gimpdrawable-equalize.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_EQUALIZE_H__
+#define __GIMP_DRAWABLE_EQUALIZE_H__
+
+
+void   gimp_drawable_equalize (GimpDrawable *drawable,
+                               gboolean      mask_only);
+
+
+#endif  /*  __GIMP_DRAWABLE_EQUALIZE_H__  */
diff --git a/app/core/gimpdrawable-fill.c b/app/core/gimpdrawable-fill.c
new file mode 100644
index 0000000..a596d47
--- /dev/null
+++ b/app/core/gimpdrawable-fill.c
@@ -0,0 +1,279 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimp-utils.h"
+#include "gimpbezierdesc.h"
+#include "gimpchannel.h"
+#include "gimpdrawable-fill.h"
+#include "gimperror.h"
+#include "gimpfilloptions.h"
+#include "gimpimage.h"
+#include "gimppattern.h"
+#include "gimppickable.h"
+#include "gimpscanconvert.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_fill (GimpDrawable *drawable,
+                    GimpContext  *context,
+                    GimpFillType  fill_type)
+{
+  GimpRGB      color;
+  GimpPattern *pattern;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (fill_type == GIMP_FILL_TRANSPARENT &&
+      ! gimp_drawable_has_alpha (drawable))
+    {
+      fill_type = GIMP_FILL_BACKGROUND;
+    }
+
+  if (! gimp_get_fill_params (context, fill_type, &color, &pattern, NULL))
+    return;
+
+  gimp_drawable_fill_buffer (drawable,
+                             gimp_drawable_get_buffer (drawable),
+                             &color, pattern, 0, 0);
+
+  gimp_drawable_update (drawable, 0, 0, -1, -1);
+}
+
+void
+gimp_drawable_fill_buffer (GimpDrawable  *drawable,
+                           GeglBuffer    *buffer,
+                           const GimpRGB *color,
+                           GimpPattern   *pattern,
+                           gint           pattern_offset_x,
+                           gint           pattern_offset_y)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+  g_return_if_fail (color != NULL || pattern != NULL);
+  g_return_if_fail (pattern == NULL || GIMP_IS_PATTERN (pattern));
+
+  if (pattern)
+    {
+      GeglBuffer       *src_buffer;
+      GeglBuffer       *dest_buffer;
+      GimpColorProfile *src_profile;
+      GimpColorProfile *dest_profile;
+
+      src_buffer = gimp_pattern_create_buffer (pattern);
+
+      src_profile  = gimp_babl_format_get_color_profile (
+                       gegl_buffer_get_format (src_buffer));
+      dest_profile = gimp_color_managed_get_color_profile (
+                       GIMP_COLOR_MANAGED (drawable));
+
+      if (gimp_color_transform_can_gegl_copy (src_profile, dest_profile))
+        {
+          dest_buffer = g_object_ref (src_buffer);
+        }
+      else
+        {
+          dest_buffer = gegl_buffer_new (gegl_buffer_get_extent (src_buffer),
+                                         gegl_buffer_get_format (buffer));
+
+          gimp_gegl_convert_color_profile (
+            src_buffer,  NULL, src_profile,
+            dest_buffer, NULL, dest_profile,
+            GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+            TRUE,
+            NULL);
+        }
+
+      gegl_buffer_set_pattern (buffer, NULL, dest_buffer,
+                               pattern_offset_x, pattern_offset_y);
+
+      g_object_unref (src_buffer);
+      g_object_unref (dest_buffer);
+    }
+  else
+    {
+      GimpRGB    image_color;
+      GeglColor *gegl_color;
+
+      gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                         color, &image_color);
+
+      if (! gimp_drawable_has_alpha (drawable))
+        gimp_rgb_set_alpha (&image_color, 1.0);
+
+      gegl_color = gimp_gegl_color_new (&image_color);
+      gegl_buffer_set_color (buffer, NULL, gegl_color);
+      g_object_unref (gegl_color);
+    }
+}
+
+void
+gimp_drawable_fill_boundary (GimpDrawable       *drawable,
+                             GimpFillOptions    *options,
+                             const GimpBoundSeg *bound_segs,
+                             gint                n_bound_segs,
+                             gint                offset_x,
+                             gint                offset_y,
+                             gboolean            push_undo)
+{
+  GimpScanConvert *scan_convert;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+  g_return_if_fail (bound_segs == NULL || n_bound_segs != 0);
+  g_return_if_fail (gimp_fill_options_get_style (options) !=
+                    GIMP_FILL_STYLE_PATTERN ||
+                    gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL);
+
+  scan_convert = gimp_scan_convert_new_from_boundary (bound_segs, n_bound_segs,
+                                                      offset_x, offset_y);
+
+  if (scan_convert)
+    {
+      gimp_drawable_fill_scan_convert (drawable, options,
+                                       scan_convert, push_undo);
+      gimp_scan_convert_free (scan_convert);
+    }
+}
+
+gboolean
+gimp_drawable_fill_vectors (GimpDrawable     *drawable,
+                            GimpFillOptions  *options,
+                            GimpVectors      *vectors,
+                            gboolean          push_undo,
+                            GError          **error)
+{
+  const GimpBezierDesc *bezier;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), FALSE);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
+  g_return_val_if_fail (gimp_fill_options_get_style (options) !=
+                        GIMP_FILL_STYLE_PATTERN ||
+                        gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL,
+                        FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  bezier = gimp_vectors_get_bezier (vectors);
+
+  if (bezier && bezier->num_data > 4)
+    {
+      GimpScanConvert *scan_convert = gimp_scan_convert_new ();
+
+      gimp_scan_convert_add_bezier (scan_convert, bezier);
+      gimp_drawable_fill_scan_convert (drawable, options,
+                                       scan_convert, push_undo);
+
+      gimp_scan_convert_free (scan_convert);
+
+      return TRUE;
+    }
+
+  g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                       _("Not enough points to fill"));
+
+  return FALSE;
+}
+
+void
+gimp_drawable_fill_scan_convert (GimpDrawable    *drawable,
+                                 GimpFillOptions *options,
+                                 GimpScanConvert *scan_convert,
+                                 gboolean         push_undo)
+{
+  GimpContext *context;
+  GeglBuffer  *buffer;
+  GeglBuffer  *mask_buffer;
+  gint         x, y, w, h;
+  gint         off_x;
+  gint         off_y;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+  g_return_if_fail (scan_convert != NULL);
+  g_return_if_fail (gimp_fill_options_get_style (options) !=
+                    GIMP_FILL_STYLE_PATTERN ||
+                    gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL);
+
+  context = GIMP_CONTEXT (options);
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &w, &h))
+    return;
+
+  /* fill a 1-bpp GeglBuffer with black, this will describe the shape
+   * of the stroke.
+   */
+  mask_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, w, h),
+                                 babl_format ("Y u8"));
+
+  /* render the stroke into it */
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  gimp_scan_convert_render (scan_convert, mask_buffer,
+                            x + off_x, y + off_y,
+                            gimp_fill_options_get_antialias (options));
+
+  buffer = gimp_fill_options_create_buffer (options, drawable,
+                                            GEGL_RECTANGLE (0, 0, w, h),
+                                            -x, -y);
+
+  gimp_gegl_apply_opacity (buffer, NULL, NULL, buffer,
+                           mask_buffer, 0, 0, 1.0);
+  g_object_unref (mask_buffer);
+
+  /* Apply to drawable */
+  gimp_drawable_apply_buffer (drawable, buffer,
+                              GEGL_RECTANGLE (0, 0, w, h),
+                              push_undo, C_("undo-type", "Render Stroke"),
+                              gimp_context_get_opacity (context),
+                              gimp_context_get_paint_mode (context),
+                              GIMP_LAYER_COLOR_SPACE_AUTO,
+                              GIMP_LAYER_COLOR_SPACE_AUTO,
+                              gimp_layer_mode_get_paint_composite_mode (
+                                gimp_context_get_paint_mode (context)),
+                              NULL, x, y);
+
+  g_object_unref (buffer);
+
+  gimp_drawable_update (drawable, x, y, w, h);
+}
diff --git a/app/core/gimpdrawable-fill.h b/app/core/gimpdrawable-fill.h
new file mode 100644
index 0000000..d85d5bb
--- /dev/null
+++ b/app/core/gimpdrawable-fill.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_FILL_H__
+#define __GIMP_DRAWABLE_FILL_H__
+
+
+/*  Lowlevel API that is used for initializing entire drawables and
+ *  buffers before they are used in images, they don't push an undo.
+ */
+
+void       gimp_drawable_fill              (GimpDrawable        *drawable,
+                                            GimpContext         *context,
+                                            GimpFillType         fill_type);
+void       gimp_drawable_fill_buffer       (GimpDrawable        *drawable,
+                                            GeglBuffer          *buffer,
+                                            const GimpRGB       *color,
+                                            GimpPattern         *pattern,
+                                            gint                 pattern_offset_x,
+                                            gint                 pattern_offset_y);
+
+
+/*  Proper API that is used for actual editing (not just initializing)
+ */
+
+void       gimp_drawable_fill_boundary     (GimpDrawable        *drawable,
+                                            GimpFillOptions     *options,
+                                            const GimpBoundSeg  *bound_segs,
+                                            gint                 n_bound_segs,
+                                            gint                 offset_x,
+                                            gint                 offset_y,
+                                            gboolean             push_undo);
+
+gboolean   gimp_drawable_fill_vectors      (GimpDrawable        *drawable,
+                                            GimpFillOptions     *options,
+                                            GimpVectors         *vectors,
+                                            gboolean             push_undo,
+                                            GError             **error);
+
+void       gimp_drawable_fill_scan_convert (GimpDrawable        *drawable,
+                                            GimpFillOptions     *options,
+                                            GimpScanConvert     *scan_convert,
+                                            gboolean             push_undo);
+
+
+#endif /* __GIMP_DRAWABLE_FILL_H__ */
diff --git a/app/core/gimpdrawable-filters.c b/app/core/gimpdrawable-filters.c
new file mode 100644
index 0000000..762a870
--- /dev/null
+++ b/app/core/gimpdrawable-filters.c
@@ -0,0 +1,343 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-filters.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+#include <cairo.h>
+
+#include "core-types.h"
+
+#include "gegl/gimpapplicator.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimp.h"
+#include "gimp-utils.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-filters.h"
+#include "gimpdrawable-private.h"
+#include "gimpfilter.h"
+#include "gimpfilterstack.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimplayer.h"
+#include "gimpprogress.h"
+#include "gimpprojection.h"
+
+
+GimpContainer *
+gimp_drawable_get_filters (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  return drawable->private->filter_stack;
+}
+
+gboolean
+gimp_drawable_has_filters (GimpDrawable *drawable)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  for (list = GIMP_LIST (drawable->private->filter_stack)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpFilter *filter = list->data;
+
+      if (gimp_filter_get_active (filter))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_drawable_add_filter (GimpDrawable *drawable,
+                          GimpFilter   *filter)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GIMP_IS_FILTER (filter));
+  g_return_if_fail (gimp_drawable_has_filter (drawable, filter) == FALSE);
+
+  gimp_container_add (drawable->private->filter_stack,
+                      GIMP_OBJECT (filter));
+}
+
+void
+gimp_drawable_remove_filter (GimpDrawable *drawable,
+                             GimpFilter   *filter)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GIMP_IS_FILTER (filter));
+  g_return_if_fail (gimp_drawable_has_filter (drawable, filter) == TRUE);
+
+  gimp_container_remove (drawable->private->filter_stack,
+                         GIMP_OBJECT (filter));
+}
+
+gboolean
+gimp_drawable_has_filter (GimpDrawable *drawable,
+                          GimpFilter   *filter)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), FALSE);
+
+  return gimp_container_have (drawable->private->filter_stack,
+                              GIMP_OBJECT (filter));
+}
+
+gboolean
+gimp_drawable_merge_filter (GimpDrawable *drawable,
+                            GimpFilter   *filter,
+                            GimpProgress *progress,
+                            const gchar  *undo_desc,
+                            const Babl   *format,
+                            gboolean      clip,
+                            gboolean      cancellable,
+                            gboolean      update)
+{
+  GimpImage      *image;
+  GimpApplicator *applicator;
+  gboolean        applicator_cache         = FALSE;
+  const Babl     *applicator_output_format = NULL;
+  GeglBuffer     *buffer                   = NULL;
+  GeglBuffer     *dest_buffer;
+  GeglBuffer     *undo_buffer              = NULL;
+  GeglRectangle   undo_rect;
+  GeglBuffer     *cache                    = NULL;
+  GeglRectangle  *rects                    = NULL;
+  gint            n_rects                  = 0;
+  GeglRectangle   rect;
+  gboolean        success                  = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+
+  image       = gimp_item_get_image (GIMP_ITEM (drawable));
+  applicator  = gimp_filter_get_applicator (filter);
+  dest_buffer = gimp_drawable_get_buffer (drawable);
+
+  if (! format)
+    format = gimp_drawable_get_format (drawable);
+
+  rect = gegl_node_get_bounding_box (gimp_filter_get_node (filter));
+
+  if (! clip && gegl_rectangle_equal (&rect,
+                                      gegl_buffer_get_extent (dest_buffer)))
+    {
+      clip = TRUE;
+    }
+
+  if (clip)
+    {
+      if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                      &rect.x, &rect.y,
+                                      &rect.width, &rect.height))
+        {
+          return TRUE;
+        }
+
+      if (format != gimp_drawable_get_format (drawable))
+        {
+          buffer = gegl_buffer_new (gegl_buffer_get_extent (dest_buffer),
+                                    format);
+
+          dest_buffer = buffer;
+        }
+    }
+  else
+    {
+      buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, rect.width, rect.height),
+                                format);
+
+      dest_buffer = g_object_new (GEGL_TYPE_BUFFER,
+                                  "source",  buffer,
+                                  "shift-x", -rect.x,
+                                  "shift-y", -rect.y,
+                                  NULL);
+    }
+
+  if (applicator)
+    {
+      const GeglRectangle *crop_rect;
+
+      crop_rect = gimp_applicator_get_crop (applicator);
+
+      if (crop_rect && ! gegl_rectangle_intersect (&rect, &rect, crop_rect))
+        return TRUE;
+
+      /*  the cache and its valid rectangles are the region that
+       *  has already been processed by this applicator.
+       */
+      cache = gimp_applicator_get_cache_buffer (applicator,
+                                                &rects, &n_rects);
+
+      /*  skip the cache and output-format conversion while processing
+       *  the remaining area, so that the result is written directly to
+       *  the drawable's buffer.
+       */
+      applicator_cache         = gimp_applicator_get_cache (applicator);
+      applicator_output_format = gimp_applicator_get_output_format (applicator);
+
+      gimp_applicator_set_cache (applicator, FALSE);
+      if (applicator_output_format == format)
+        gimp_applicator_set_output_format (applicator, NULL);
+    }
+
+  if (! buffer)
+    {
+      gegl_rectangle_align_to_buffer (
+        &undo_rect,
+        &rect,
+        gimp_drawable_get_buffer (drawable),
+        GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      undo_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                     undo_rect.width,
+                                                     undo_rect.height),
+                                     gimp_drawable_get_format (drawable));
+
+      gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
+                             &undo_rect,
+                             GEGL_ABYSS_NONE,
+                             undo_buffer,
+                             GEGL_RECTANGLE (0, 0, 0, 0));
+    }
+
+  gimp_projection_stop_rendering (gimp_image_get_projection (image));
+
+  /* make sure we have a source node - this connects the filter stack to the
+   * underlying source node
+   */
+  (void) gimp_drawable_get_source_node (drawable);
+
+  if (gimp_gegl_apply_cached_operation (gimp_drawable_get_buffer (drawable),
+                                        progress, undo_desc,
+                                        gimp_filter_get_node (filter), FALSE,
+                                        dest_buffer, &rect, FALSE,
+                                        cache, rects, n_rects,
+                                        cancellable))
+    {
+      /*  finished successfully  */
+
+      if (clip)
+        {
+          if (buffer)
+            {
+              gimp_drawable_set_buffer_full (drawable,
+                                             TRUE, undo_desc,
+                                             buffer, NULL,
+                                             FALSE);
+            }
+          else
+            {
+              gimp_drawable_push_undo (drawable, undo_desc, undo_buffer,
+                                       undo_rect.x, undo_rect.y,
+                                       undo_rect.width, undo_rect.height);
+            }
+        }
+      else
+        {
+          GimpLayerMask *mask = NULL;
+          gint           offset_x;
+          gint           offset_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
+
+          if (GIMP_IS_LAYER (drawable))
+            mask = gimp_layer_get_mask (GIMP_LAYER (drawable));
+
+          if (mask)
+            {
+              gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_DRAWABLE_MOD,
+                                           undo_desc);
+            }
+
+          gimp_drawable_set_buffer_full (
+            drawable, TRUE, undo_desc, buffer,
+            GEGL_RECTANGLE (offset_x + rect.x, offset_y + rect.y, 0, 0),
+            FALSE);
+
+          if (mask)
+            {
+              gimp_item_resize (GIMP_ITEM (mask),
+                                gimp_get_default_context (image->gimp),
+                                GIMP_FILL_TRANSPARENT,
+                                rect.width, rect.height,
+                                -rect.x, -rect.y);
+
+              gimp_image_undo_group_end (image);
+            }
+        }
+    }
+  else
+    {
+      /*  canceled by the user  */
+
+      if (clip)
+        {
+          gimp_gegl_buffer_copy (undo_buffer,
+                                 GEGL_RECTANGLE (0, 0,
+                                                 undo_rect.width,
+                                                 undo_rect.height),
+                                 GEGL_ABYSS_NONE,
+                                 gimp_drawable_get_buffer (drawable),
+                                 &undo_rect);
+        }
+
+      success = FALSE;
+    }
+
+  if (clip)
+    {
+      g_clear_object (&undo_buffer);
+      g_clear_object (&buffer);
+    }
+  else
+    {
+      g_object_unref (buffer);
+      g_object_unref (dest_buffer);
+    }
+
+  if (cache)
+    {
+      g_object_unref (cache);
+      g_free (rects);
+    }
+
+  if (applicator)
+    {
+      gimp_applicator_set_cache (applicator, applicator_cache);
+      gimp_applicator_set_output_format (applicator, applicator_output_format);
+    }
+
+  if (update)
+    {
+      gimp_drawable_update (drawable,
+                            rect.x, rect.y,
+                            rect.width, rect.height);
+    }
+
+  return success;
+}
diff --git a/app/core/gimpdrawable-filters.h b/app/core/gimpdrawable-filters.h
new file mode 100644
index 0000000..504d402
--- /dev/null
+++ b/app/core/gimpdrawable-filters.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-filters.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_FILTERS_H__
+#define __GIMP_DRAWABLE_FILTERS_H__
+
+
+GimpContainer * gimp_drawable_get_filters   (GimpDrawable *drawable);
+
+gboolean        gimp_drawable_has_filters   (GimpDrawable *drawable);
+
+void            gimp_drawable_add_filter    (GimpDrawable *drawable,
+                                             GimpFilter   *filter);
+void            gimp_drawable_remove_filter (GimpDrawable *drawable,
+                                             GimpFilter   *filter);
+
+gboolean        gimp_drawable_has_filter    (GimpDrawable *drawable,
+                                             GimpFilter   *filter);
+
+gboolean        gimp_drawable_merge_filter  (GimpDrawable *drawable,
+                                             GimpFilter   *filter,
+                                             GimpProgress *progress,
+                                             const gchar  *undo_desc,
+                                             const Babl   *format,
+                                             gboolean      clip,
+                                             gboolean      cancellable,
+                                             gboolean      update);
+
+
+#endif /* __GIMP_DRAWABLE_FILTERS_H__ */
diff --git a/app/core/gimpdrawable-floating-selection.c b/app/core/gimpdrawable-floating-selection.c
new file mode 100644
index 0000000..71866b1
--- /dev/null
+++ b/app/core/gimpdrawable-floating-selection.c
@@ -0,0 +1,512 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gegl/gimpapplicator.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable-floating-selection.h"
+#include "gimpdrawable-filters.h"
+#include "gimpdrawable-private.h"
+#include "gimpimage.h"
+#include "gimplayer.h"
+
+#include "gimp-log.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void    gimp_drawable_remove_fs_filter             (GimpDrawable      *drawable);
+static void    gimp_drawable_sync_fs_filter               (GimpDrawable      *drawable);
+
+static void    gimp_drawable_fs_notify                    (GObject           *object,
+                                                           const GParamSpec  *pspec,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_lock_position_changed     (GimpDrawable      *signal_drawable,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_format_changed            (GimpDrawable      *signal_drawable,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_affect_changed            (GimpImage         *image,
+                                                           GimpChannelType    channel,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_mask_changed              (GimpImage         *image,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_visibility_changed        (GimpLayer         *fs,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_excludes_backdrop_changed (GimpLayer         *fs,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_bounding_box_changed      (GimpLayer         *fs,
+                                                           GimpDrawable      *drawable);
+static void    gimp_drawable_fs_update                    (GimpLayer         *fs,
+                                                           gint               x,
+                                                           gint               y,
+                                                           gint               width,
+                                                           gint               height,
+                                                           GimpDrawable      *drawable);
+
+
+/*  public functions  */
+
+GimpLayer *
+gimp_drawable_get_floating_sel (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  return drawable->private->floating_selection;
+}
+
+void
+gimp_drawable_attach_floating_sel (GimpDrawable *drawable,
+                                   GimpLayer    *fs)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (gimp_drawable_get_floating_sel (drawable) == NULL);
+  g_return_if_fail (GIMP_IS_LAYER (fs));
+
+  GIMP_LOG (FLOATING_SELECTION, "%s", G_STRFUNC);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  drawable->private->floating_selection = fs;
+  gimp_image_set_floating_selection (image, fs);
+
+  /*  clear the selection  */
+  gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (fs));
+
+  gimp_item_bind_visible_to_active (GIMP_ITEM (fs), FALSE);
+  gimp_filter_set_active (GIMP_FILTER (fs), FALSE);
+
+  _gimp_drawable_add_floating_sel_filter (drawable);
+
+  g_signal_connect (fs, "visibility-changed",
+                    G_CALLBACK (gimp_drawable_fs_visibility_changed),
+                    drawable);
+  g_signal_connect (fs, "excludes-backdrop-changed",
+                    G_CALLBACK (gimp_drawable_fs_excludes_backdrop_changed),
+                    drawable);
+  g_signal_connect (fs, "bounding-box-changed",
+                    G_CALLBACK (gimp_drawable_fs_bounding_box_changed),
+                    drawable);
+  g_signal_connect (fs, "update",
+                    G_CALLBACK (gimp_drawable_fs_update),
+                    drawable);
+
+  gimp_drawable_fs_update (fs,
+                           0, 0,
+                           gimp_item_get_width  (GIMP_ITEM (fs)),
+                           gimp_item_get_height (GIMP_ITEM (fs)),
+                           drawable);
+}
+
+void
+gimp_drawable_detach_floating_sel (GimpDrawable *drawable)
+{
+  GimpImage *image;
+  GimpLayer *fs;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_drawable_get_floating_sel (drawable) != NULL);
+
+  GIMP_LOG (FLOATING_SELECTION, "%s", G_STRFUNC);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+  fs    = drawable->private->floating_selection;
+
+  gimp_drawable_remove_fs_filter (drawable);
+
+  g_signal_handlers_disconnect_by_func (fs,
+                                        gimp_drawable_fs_visibility_changed,
+                                        drawable);
+  g_signal_handlers_disconnect_by_func (fs,
+                                        gimp_drawable_fs_excludes_backdrop_changed,
+                                        drawable);
+  g_signal_handlers_disconnect_by_func (fs,
+                                        gimp_drawable_fs_bounding_box_changed,
+                                        drawable);
+  g_signal_handlers_disconnect_by_func (fs,
+                                        gimp_drawable_fs_update,
+                                        drawable);
+
+  gimp_drawable_fs_update (fs,
+                           0, 0,
+                           gimp_item_get_width  (GIMP_ITEM (fs)),
+                           gimp_item_get_height (GIMP_ITEM (fs)),
+                           drawable);
+
+  gimp_item_bind_visible_to_active (GIMP_ITEM (fs), TRUE);
+
+  /*  clear the selection  */
+  gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (fs));
+
+  gimp_image_set_floating_selection (image, NULL);
+  drawable->private->floating_selection = NULL;
+}
+
+GimpFilter *
+gimp_drawable_get_floating_sel_filter (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_drawable_get_floating_sel (drawable) != NULL, NULL);
+
+  /* Ensure that the graph is construced before the filter is used.
+   * Otherwise, we rely on the projection to cause the graph to be
+   * constructed, which fails for images that aren't displayed.
+   */
+  gimp_filter_get_node (GIMP_FILTER (drawable));
+
+  return drawable->private->fs_filter;
+}
+
+
+/*  private functions  */
+
+void
+_gimp_drawable_add_floating_sel_filter (GimpDrawable *drawable)
+{
+  GimpDrawablePrivate *private = drawable->private;
+  GimpImage           *image   = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpLayer           *fs      = gimp_drawable_get_floating_sel (drawable);
+  GeglNode            *node;
+  GeglNode            *fs_source;
+
+  if (! private->source_node)
+    return;
+
+  private->fs_filter = gimp_filter_new (_("Floating Selection"));
+  gimp_viewable_set_icon_name (GIMP_VIEWABLE (private->fs_filter),
+                               "gimp-floating-selection");
+
+  node = gimp_filter_get_node (private->fs_filter);
+
+  fs_source = gimp_drawable_get_source_node (GIMP_DRAWABLE (fs));
+
+  /* rip the fs' source node out of its graph */
+  if (fs->layer_offset_node)
+    {
+      gegl_node_disconnect (fs->layer_offset_node, "input");
+      gegl_node_remove_child (gimp_filter_get_node (GIMP_FILTER (fs)),
+                              fs_source);
+    }
+
+  gegl_node_add_child (node, fs_source);
+
+  private->fs_applicator = gimp_applicator_new (node);
+
+  gimp_filter_set_applicator (private->fs_filter, private->fs_applicator);
+
+  gimp_applicator_set_cache (private->fs_applicator, TRUE);
+
+  private->fs_crop_node = gegl_node_new_child (node,
+                                               "operation", "gegl:nop",
+                                               NULL);
+
+  gegl_node_connect_to (fs_source,             "output",
+                        private->fs_crop_node, "input");
+  gegl_node_connect_to (private->fs_crop_node, "output",
+                        node,                  "aux");
+
+  gimp_drawable_add_filter (drawable, private->fs_filter);
+
+  g_signal_connect (fs, "notify",
+                    G_CALLBACK (gimp_drawable_fs_notify),
+                    drawable);
+  g_signal_connect (drawable, "notify::offset-x",
+                    G_CALLBACK (gimp_drawable_fs_notify),
+                    drawable);
+  g_signal_connect (drawable, "notify::offset-y",
+                    G_CALLBACK (gimp_drawable_fs_notify),
+                    drawable);
+  g_signal_connect (drawable, "lock-position-changed",
+                    G_CALLBACK (gimp_drawable_fs_lock_position_changed),
+                    drawable);
+  g_signal_connect (drawable, "format-changed",
+                    G_CALLBACK (gimp_drawable_fs_format_changed),
+                    drawable);
+  g_signal_connect (image, "component-active-changed",
+                    G_CALLBACK (gimp_drawable_fs_affect_changed),
+                    drawable);
+  g_signal_connect (image, "mask-changed",
+                    G_CALLBACK (gimp_drawable_fs_mask_changed),
+                    drawable);
+
+  gimp_drawable_sync_fs_filter (drawable);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_drawable_remove_fs_filter (GimpDrawable *drawable)
+{
+  GimpDrawablePrivate *private = drawable->private;
+  GimpImage           *image   = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpLayer           *fs      = gimp_drawable_get_floating_sel (drawable);
+
+  if (private->fs_filter)
+    {
+      GeglNode *node;
+      GeglNode *fs_source;
+
+      g_signal_handlers_disconnect_by_func (fs,
+                                            gimp_drawable_fs_notify,
+                                            drawable);
+      g_signal_handlers_disconnect_by_func (drawable,
+                                            gimp_drawable_fs_notify,
+                                            drawable);
+      g_signal_handlers_disconnect_by_func (drawable,
+                                            gimp_drawable_fs_lock_position_changed,
+                                            drawable);
+      g_signal_handlers_disconnect_by_func (drawable,
+                                            gimp_drawable_fs_format_changed,
+                                            drawable);
+      g_signal_handlers_disconnect_by_func (image,
+                                            gimp_drawable_fs_affect_changed,
+                                            drawable);
+      g_signal_handlers_disconnect_by_func (image,
+                                            gimp_drawable_fs_mask_changed,
+                                            drawable);
+
+      gimp_drawable_remove_filter (drawable, private->fs_filter);
+
+      node = gimp_filter_get_node (private->fs_filter);
+
+      fs_source = gimp_drawable_get_source_node (GIMP_DRAWABLE (fs));
+
+      gegl_node_remove_child (node, fs_source);
+
+      /* plug the fs' source node back into its graph */
+      if (fs->layer_offset_node)
+        {
+          gegl_node_add_child (gimp_filter_get_node (GIMP_FILTER (fs)),
+                               fs_source);
+          gegl_node_connect_to (fs_source,             "output",
+                                fs->layer_offset_node, "input");
+        }
+
+      g_clear_object (&private->fs_filter);
+      g_clear_object (&private->fs_applicator);
+
+      private->fs_crop_node = NULL;
+
+      gimp_drawable_update_bounding_box (drawable);
+    }
+}
+
+static void
+gimp_drawable_sync_fs_filter (GimpDrawable *drawable)
+{
+  GimpDrawablePrivate *private = drawable->private;
+  GimpImage           *image   = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpChannel         *mask    = gimp_image_get_mask (image);
+  GimpLayer           *fs      = gimp_drawable_get_floating_sel (drawable);
+  gint                 off_x, off_y;
+  gint                 fs_off_x, fs_off_y;
+
+  gimp_filter_set_active (private->fs_filter,
+                          gimp_item_get_visible (GIMP_ITEM (fs)));
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+  gimp_item_get_offset (GIMP_ITEM (fs), &fs_off_x, &fs_off_y);
+
+  if (gimp_item_get_clip (GIMP_ITEM (drawable), GIMP_TRANSFORM_RESIZE_ADJUST) ==
+      GIMP_TRANSFORM_RESIZE_CLIP ||
+      ! gimp_drawable_has_alpha (drawable))
+    {
+      gegl_node_set (
+        private->fs_crop_node,
+        "operation", "gegl:crop",
+        "x",         (gdouble) (off_x - fs_off_x),
+        "y",         (gdouble) (off_y - fs_off_y),
+        "width",     (gdouble) gimp_item_get_width  (GIMP_ITEM (drawable)),
+        "height",    (gdouble) gimp_item_get_height (GIMP_ITEM (drawable)),
+        NULL);
+    }
+  else
+    {
+      gegl_node_set (
+        private->fs_crop_node,
+        "operation", "gegl:nop",
+        NULL);
+    }
+
+  gimp_applicator_set_apply_offset (private->fs_applicator,
+                                    fs_off_x - off_x,
+                                    fs_off_y - off_y);
+
+  if (gimp_channel_is_empty (mask))
+    {
+      gimp_applicator_set_mask_buffer (private->fs_applicator, NULL);
+    }
+  else
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+      gimp_applicator_set_mask_buffer (private->fs_applicator, buffer);
+      gimp_applicator_set_mask_offset (private->fs_applicator,
+                                       -off_x, -off_y);
+    }
+
+  gimp_applicator_set_opacity (private->fs_applicator,
+                               gimp_layer_get_opacity (fs));
+  gimp_applicator_set_mode (private->fs_applicator,
+                            gimp_layer_get_mode (fs),
+                            gimp_layer_get_blend_space (fs),
+                            gimp_layer_get_composite_space (fs),
+                            gimp_layer_get_composite_mode (fs));
+  gimp_applicator_set_affect (private->fs_applicator,
+                              gimp_drawable_get_active_mask (drawable));
+  gimp_applicator_set_output_format (private->fs_applicator,
+                                     gimp_drawable_get_format (drawable));
+
+  gimp_drawable_update_bounding_box (drawable);
+}
+
+static void
+gimp_drawable_fs_notify (GObject          *object,
+                         const GParamSpec *pspec,
+                         GimpDrawable     *drawable)
+{
+  if (! strcmp (pspec->name, "offset-x")        ||
+      ! strcmp (pspec->name, "offset-y")        ||
+      ! strcmp (pspec->name, "visible")         ||
+      ! strcmp (pspec->name, "mode")            ||
+      ! strcmp (pspec->name, "blend-space")     ||
+      ! strcmp (pspec->name, "composite-space") ||
+      ! strcmp (pspec->name, "composite-mode")  ||
+      ! strcmp (pspec->name, "opacity"))
+    {
+      gimp_drawable_sync_fs_filter (drawable);
+    }
+}
+
+static void
+gimp_drawable_fs_lock_position_changed (GimpDrawable *signal_drawable,
+                                        GimpDrawable *drawable)
+{
+  GimpLayer *fs = gimp_drawable_get_floating_sel (drawable);
+
+  gimp_drawable_sync_fs_filter (drawable);
+
+  gimp_drawable_update (GIMP_DRAWABLE (fs), 0, 0, -1, -1);
+}
+
+static void
+gimp_drawable_fs_format_changed (GimpDrawable *signal_drawable,
+                                 GimpDrawable *drawable)
+{
+  GimpLayer *fs = gimp_drawable_get_floating_sel (drawable);
+
+  gimp_drawable_sync_fs_filter (drawable);
+
+  gimp_drawable_update (GIMP_DRAWABLE (fs), 0, 0, -1, -1);
+}
+
+static void
+gimp_drawable_fs_affect_changed (GimpImage       *image,
+                                 GimpChannelType  channel,
+                                 GimpDrawable    *drawable)
+{
+  GimpLayer *fs = gimp_drawable_get_floating_sel (drawable);
+
+  gimp_drawable_sync_fs_filter (drawable);
+
+  gimp_drawable_update (GIMP_DRAWABLE (fs), 0, 0, -1, -1);
+}
+
+static void
+gimp_drawable_fs_mask_changed (GimpImage    *image,
+                               GimpDrawable *drawable)
+{
+  GimpLayer *fs = gimp_drawable_get_floating_sel (drawable);
+
+  gimp_drawable_sync_fs_filter (drawable);
+
+  gimp_drawable_update (GIMP_DRAWABLE (fs), 0, 0, -1, -1);
+}
+
+static void
+gimp_drawable_fs_visibility_changed (GimpLayer    *fs,
+                                     GimpDrawable *drawable)
+{
+  if (gimp_layer_get_excludes_backdrop (fs))
+    gimp_drawable_update (drawable, 0, 0, -1, -1);
+  else
+    gimp_drawable_update (GIMP_DRAWABLE (fs), 0, 0, -1, -1);
+}
+
+static void
+gimp_drawable_fs_excludes_backdrop_changed (GimpLayer    *fs,
+                                            GimpDrawable *drawable)
+{
+  if (gimp_item_get_visible (GIMP_ITEM (fs)))
+    gimp_drawable_update (drawable, 0, 0, -1, -1);
+}
+
+static void
+gimp_drawable_fs_bounding_box_changed (GimpLayer    *fs,
+                                       GimpDrawable *drawable)
+{
+  gimp_drawable_update_bounding_box (drawable);
+}
+
+static void
+gimp_drawable_fs_update (GimpLayer    *fs,
+                         gint          x,
+                         gint          y,
+                         gint          width,
+                         gint          height,
+                         GimpDrawable *drawable)
+{
+  GeglRectangle bounding_box;
+  GeglRectangle rect;
+  gint          fs_off_x, fs_off_y;
+  gint          off_x, off_y;
+
+  gimp_item_get_offset (GIMP_ITEM (fs), &fs_off_x, &fs_off_y);
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  bounding_box = gimp_drawable_get_bounding_box (drawable);
+
+  bounding_box.x += off_x;
+  bounding_box.y += off_y;
+
+  rect.x      = x + fs_off_x;
+  rect.y      = y + fs_off_y;
+  rect.width  = width;
+  rect.height = height;
+
+  if (gegl_rectangle_intersect (&rect, &rect, &bounding_box))
+    {
+      gimp_drawable_update (drawable,
+                            rect.x - off_x, rect.y - off_y,
+                            rect.width, rect.height);
+    }
+}
diff --git a/app/core/gimpdrawable-floating-selection.h b/app/core/gimpdrawable-floating-selection.h
new file mode 100644
index 0000000..336a0cf
--- /dev/null
+++ b/app/core/gimpdrawable-floating-selection.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_FLOATING_SELECTION_H__
+#define __GIMP_DRAWABLE_FLOATING_SELECTION_H__
+
+
+GimpLayer  * gimp_drawable_get_floating_sel          (GimpDrawable *drawable);
+void         gimp_drawable_attach_floating_sel       (GimpDrawable *drawable,
+                                                      GimpLayer    *floating_sel);
+void         gimp_drawable_detach_floating_sel       (GimpDrawable *drawable);
+GimpFilter * gimp_drawable_get_floating_sel_filter   (GimpDrawable *drawable);
+
+void         _gimp_drawable_add_floating_sel_filter  (GimpDrawable *drawable);
+
+
+#endif /* __GIMP_DRAWABLE_FLOATING_SELECTION_H__ */
diff --git a/app/core/gimpdrawable-foreground-extract.c b/app/core/gimpdrawable-foreground-extract.c
new file mode 100644
index 0000000..5846363
--- /dev/null
+++ b/app/core/gimpdrawable-foreground-extract.c
@@ -0,0 +1,150 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-foreground-extract.h"
+#include "gimpimage.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GeglBuffer *
+gimp_drawable_foreground_extract (GimpDrawable      *drawable,
+                                  GimpMattingEngine  engine,
+                                  gint               global_iterations,
+                                  gint               levin_levels,
+                                  gint               levin_active_levels,
+                                  GeglBuffer        *trimap,
+                                  GimpProgress      *progress)
+{
+  GeglBuffer    *drawable_buffer;
+  GeglNode      *gegl;
+  GeglNode      *input_node;
+  GeglNode      *trimap_node;
+  GeglNode      *matting_node;
+  GeglNode      *output_node;
+  GeglBuffer    *buffer;
+  GeglProcessor *processor;
+  gdouble        value;
+  gint           off_x, off_y;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (trimap), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  progress = gimp_progress_start (progress, FALSE,
+                                  _("Computing alpha of unknown pixels"));
+
+  drawable_buffer = gimp_drawable_get_buffer (drawable);
+
+  gegl = gegl_node_new ();
+
+  trimap_node = gegl_node_new_child (gegl,
+                                     "operation", "gegl:buffer-source",
+                                     "buffer",    trimap,
+                                     NULL);
+  input_node = gegl_node_new_child (gegl,
+                                    "operation", "gegl:buffer-source",
+                                    "buffer",    drawable_buffer,
+                                    NULL);
+  output_node = gegl_node_new_child (gegl,
+                                     "operation", "gegl:buffer-sink",
+                                     "buffer",    &buffer,
+                                     "format",    NULL,
+                                     NULL);
+
+  if (engine == GIMP_MATTING_ENGINE_GLOBAL)
+    {
+      matting_node = gegl_node_new_child (gegl,
+                                          "operation",  "gegl:matting-global",
+                                          "iterations", global_iterations,
+                                          NULL);
+    }
+  else
+    {
+      matting_node = gegl_node_new_child (gegl,
+                                          "operation",     "gegl:matting-levin",
+                                          "levels",        levin_levels,
+                                          "active_levels", levin_active_levels,
+                                          NULL);
+    }
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  if (off_x || off_y)
+    {
+      GeglNode *pre;
+      GeglNode *post;
+
+      pre = gegl_node_new_child (gegl,
+                                 "operation", "gegl:translate",
+                                 "x", -1.0 * off_x,
+                                 "y", -1.0 * off_y,
+                                 NULL);
+      post = gegl_node_new_child (gegl,
+                                  "operation", "gegl:translate",
+                                  "x", 1.0 * off_x,
+                                  "y", 1.0 * off_y,
+                                  NULL);
+
+      gegl_node_connect_to (trimap_node,   "output", pre, "input");
+      gegl_node_connect_to (pre,  "output", matting_node, "aux");
+      gegl_node_link_many (input_node, matting_node, post, output_node, NULL);
+    }
+  else
+    {
+      gegl_node_connect_to (input_node,   "output",
+                            matting_node, "input");
+      gegl_node_connect_to (trimap_node,  "output",
+                            matting_node, "aux");
+      gegl_node_connect_to (matting_node, "output",
+                            output_node,  "input");
+    }
+
+  processor = gegl_node_new_processor (output_node, NULL);
+
+  while (gegl_processor_work (processor, &value))
+    {
+      if (progress)
+        gimp_progress_set_value (progress, value);
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  g_object_unref (processor);
+
+  g_object_unref (gegl);
+
+  return buffer;
+}
diff --git a/app/core/gimpdrawable-foreground-extract.h b/app/core/gimpdrawable-foreground-extract.h
new file mode 100644
index 0000000..19e2356
--- /dev/null
+++ b/app/core/gimpdrawable-foreground-extract.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__
+#define  __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__
+
+
+GeglBuffer * gimp_drawable_foreground_extract (GimpDrawable       *drawable,
+                                               GimpMattingEngine   engine,
+                                               gint                global_iterations,
+                                               gint                levin_levels,
+                                               gint                levin_active_levels,
+                                               GeglBuffer         *trimap,
+                                               GimpProgress       *progress);
+
+
+#endif  /*  __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__  */
diff --git a/app/core/gimpdrawable-gradient.c b/app/core/gimpdrawable-gradient.c
new file mode 100644
index 0000000..2d7cbe8
--- /dev/null
+++ b/app/core/gimpdrawable-gradient.c
@@ -0,0 +1,313 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-gradient.h"
+#include "gimpgradient.h"
+#include "gimpimage.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_gradient (GimpDrawable                *drawable,
+                        GimpContext                 *context,
+                        GimpGradient                *gradient,
+                        GeglDistanceMetric           metric,
+                        GimpLayerMode                paint_mode,
+                        GimpGradientType             gradient_type,
+                        gdouble                      opacity,
+                        gdouble                      offset,
+                        GimpRepeatMode               repeat,
+                        gboolean                     reverse,
+                        GimpGradientBlendColorSpace  blend_color_space,
+                        gboolean                     supersample,
+                        gint                         max_depth,
+                        gdouble                      threshold,
+                        gboolean                     dither,
+                        gdouble                      startx,
+                        gdouble                      starty,
+                        gdouble                      endx,
+                        gdouble                      endy,
+                        GimpProgress                *progress)
+{
+  GimpImage  *image;
+  GeglBuffer *buffer;
+  GeglBuffer *shapeburst = NULL;
+  GeglNode   *render;
+  gint        x, y, width, height;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+    return;
+
+  gimp_set_busy (image->gimp);
+
+  /*  Always create an alpha temp buf (for generality) */
+  buffer = gegl_buffer_new (GEGL_RECTANGLE (x, y, width, height),
+                            gimp_drawable_get_format_with_alpha (drawable));
+
+  if (gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR &&
+      gradient_type <= GIMP_GRADIENT_SHAPEBURST_DIMPLED)
+    {
+      shapeburst =
+        gimp_drawable_gradient_shapeburst_distmap (drawable, metric,
+                                                   GEGL_RECTANGLE (x, y, width, height),
+                                                   progress);
+    }
+
+  gimp_drawable_gradient_adjust_coords (drawable,
+                                        gradient_type,
+                                        GEGL_RECTANGLE (x, y, width, height),
+                                        &startx, &starty, &endx, &endy);
+
+  render = gegl_node_new_child (NULL,
+                                "operation",                  "gimp:gradient",
+                                "context",                    context,
+                                "gradient",                   gradient,
+                                "start-x",                    startx,
+                                "start-y",                    starty,
+                                "end-x",                      endx,
+                                "end-y",                      endy,
+                                "gradient-type",              gradient_type,
+                                "gradient-repeat",            repeat,
+                                "offset",                     offset,
+                                "gradient-reverse",           reverse,
+                                "gradient-blend-color-space", blend_color_space,
+                                "supersample",                supersample,
+                                "supersample-depth",          max_depth,
+                                "supersample-threshold",      threshold,
+                                "dither",                     dither,
+                                NULL);
+
+  gimp_gegl_apply_operation (shapeburst, progress, C_("undo-type", "Gradient"),
+                             render,
+                             buffer, GEGL_RECTANGLE (x, y, width, height),
+                             FALSE);
+
+  g_object_unref (render);
+
+  if (shapeburst)
+    g_object_unref (shapeburst);
+
+  gimp_drawable_apply_buffer (drawable, buffer,
+                              GEGL_RECTANGLE (x, y, width, height),
+                              TRUE, C_("undo-type", "Gradient"),
+                              opacity, paint_mode,
+                              GIMP_LAYER_COLOR_SPACE_AUTO,
+                              GIMP_LAYER_COLOR_SPACE_AUTO,
+                              gimp_layer_mode_get_paint_composite_mode (paint_mode),
+                              NULL, x, y);
+
+  gimp_drawable_update (drawable, x, y, width, height);
+
+  g_object_unref (buffer);
+
+  gimp_unset_busy (image->gimp);
+}
+
+GeglBuffer *
+gimp_drawable_gradient_shapeburst_distmap (GimpDrawable        *drawable,
+                                           GeglDistanceMetric   metric,
+                                           const GeglRectangle *region,
+                                           GimpProgress        *progress)
+{
+  GimpChannel *mask;
+  GimpImage   *image;
+  GeglBuffer  *dist_buffer;
+  GeglBuffer  *temp_buffer;
+  GeglNode    *shapeburst;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  /*  allocate the distance map  */
+  dist_buffer = gegl_buffer_new (region, babl_format ("Y float"));
+
+  /*  allocate the selection mask copy  */
+  temp_buffer = gegl_buffer_new (region, babl_format ("Y float"));
+
+  mask = gimp_image_get_mask (image);
+
+  /*  If the image mask is not empty, use it as the shape burst source  */
+  if (! gimp_channel_is_empty (mask))
+    {
+      gint x, y, width, height;
+      gint off_x, off_y;
+
+      gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      /*  copy the mask to the temp mask  */
+      gimp_gegl_buffer_copy (
+        gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)),
+        GEGL_RECTANGLE (x + off_x, y + off_y, width, height),
+        GEGL_ABYSS_NONE, temp_buffer, region);
+    }
+  else
+    {
+      /*  If the intended drawable has an alpha channel, use that  */
+      if (gimp_drawable_has_alpha (drawable))
+        {
+          const Babl *component_format;
+
+          component_format = babl_format ("A float");
+
+          /*  extract the aplha into the temp mask  */
+          gegl_buffer_set_format (temp_buffer, component_format);
+          gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable), region,
+                                 GEGL_ABYSS_NONE,
+                                 temp_buffer, region);
+          gegl_buffer_set_format (temp_buffer, NULL);
+        }
+      else
+        {
+          GeglColor *white = gegl_color_new ("white");
+
+          /*  Otherwise, just fill the shapeburst to white  */
+          gegl_buffer_set_color (temp_buffer, NULL, white);
+          g_object_unref (white);
+        }
+    }
+
+  shapeburst = gegl_node_new_child (NULL,
+                                    "operation", "gegl:distance-transform",
+                                    "normalize", TRUE,
+                                    "metric",    metric,
+                                    NULL);
+
+  if (progress)
+    gimp_gegl_progress_connect (shapeburst, progress,
+                                _("Calculating distance map"));
+
+  gimp_gegl_apply_operation (temp_buffer, NULL, NULL,
+                             shapeburst,
+                             dist_buffer, region, FALSE);
+
+  g_object_unref (shapeburst);
+
+  g_object_unref (temp_buffer);
+
+  return dist_buffer;
+}
+
+void
+gimp_drawable_gradient_adjust_coords (GimpDrawable        *drawable,
+                                      GimpGradientType     gradient_type,
+                                      const GeglRectangle *region,
+                                      gdouble             *startx,
+                                      gdouble             *starty,
+                                      gdouble             *endx,
+                                      gdouble             *endy)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (region != NULL);
+  g_return_if_fail (startx != NULL);
+  g_return_if_fail (starty != NULL);
+  g_return_if_fail (endx != NULL);
+  g_return_if_fail (endy != NULL);
+
+  /* we potentially adjust the gradient coordinates according to the gradient
+   * type, so that in cases where the gradient span is not related to the
+   * segment length, the gradient cache (in GimpOperationGradient) is big
+   * enough not to produce banding.
+   */
+
+  switch (gradient_type)
+    {
+    /* for conical gradients, use a segment with the original origin and
+     * direction, whose length is the circumference of the largest circle
+     * centered at the origin, passing through one of the regions's vertices.
+     */
+    case GIMP_GRADIENT_CONICAL_SYMMETRIC:
+    case GIMP_GRADIENT_CONICAL_ASYMMETRIC:
+      {
+        gdouble     r = 0.0;
+        GimpVector2 v;
+
+        r = MAX (r, hypot (region->x - *startx,
+                           region->y - *starty));
+        r = MAX (r, hypot (region->x + region->width - *startx,
+                           region->y - *starty));
+        r = MAX (r, hypot (region->x - *startx,
+                           region->y + region->height - *starty));
+        r = MAX (r, hypot (region->x + region->width - *startx,
+                           region->y + region->height - *starty));
+
+        /* symmetric conical gradients only span half a revolution, and
+         * therefore require only half the cache size.
+         */
+        if (gradient_type == GIMP_GRADIENT_CONICAL_SYMMETRIC)
+          r /= 2.0;
+
+        gimp_vector2_set (&v, *endx - *startx, *endy - *starty);
+        gimp_vector2_normalize (&v);
+        gimp_vector2_mul (&v, 2.0 * G_PI * r);
+
+        *endx = *startx + v.x;
+        *endy = *starty + v.y;
+      }
+      break;
+
+    /* for shaped gradients, only the segment's length matters; use the
+     * regions's diagonal, which is the largest possible distance between two
+     * points in the region.
+     */
+    case GIMP_GRADIENT_SHAPEBURST_ANGULAR:
+    case GIMP_GRADIENT_SHAPEBURST_SPHERICAL:
+    case GIMP_GRADIENT_SHAPEBURST_DIMPLED:
+      *startx = region->x;
+      *starty = region->y;
+      *endx   = region->x + region->width;
+      *endy   = region->y + region->height;
+      break;
+
+    default:
+      break;
+    }
+}
diff --git a/app/core/gimpdrawable-gradient.h b/app/core/gimpdrawable-gradient.h
new file mode 100644
index 0000000..4f38c8a
--- /dev/null
+++ b/app/core/gimpdrawable-gradient.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_DRAWABLE_GRADIENT_H__
+#define  __GIMP_DRAWABLE_GRADIENT_H__
+
+
+void         gimp_drawable_gradient                    (GimpDrawable                *drawable,
+                                                        GimpContext                 *context,
+                                                        GimpGradient                *gradient,
+                                                        GeglDistanceMetric           metric,
+                                                        GimpLayerMode                paint_mode,
+                                                        GimpGradientType             gradient_type,
+                                                        gdouble                      opacity,
+                                                        gdouble                      offset,
+                                                        GimpRepeatMode               repeat,
+                                                        gboolean                     reverse,
+                                                        GimpGradientBlendColorSpace  blend_color_space,
+                                                        gboolean                     supersample,
+                                                        gint                         max_depth,
+                                                        gdouble                      threshold,
+                                                        gboolean                     dither,
+                                                        gdouble                      startx,
+                                                        gdouble                      starty,
+                                                        gdouble                      endx,
+                                                        gdouble                      endy,
+                                                        GimpProgress                *progress);
+
+GeglBuffer * gimp_drawable_gradient_shapeburst_distmap (GimpDrawable                *drawable,
+                                                        GeglDistanceMetric           metric,
+                                                        const GeglRectangle         *region,
+                                                        GimpProgress                *progress);
+
+void         gimp_drawable_gradient_adjust_coords      (GimpDrawable                *drawable,
+                                                        GimpGradientType             gradient_type,
+                                                        const GeglRectangle         *region,
+                                                        gdouble                     *startx,
+                                                        gdouble                     *starty,
+                                                        gdouble                     *endx,
+                                                        gdouble                     *endy);
+
+
+#endif /* __GIMP_DRAWABLE_GRADIENT_H__ */
diff --git a/app/core/gimpdrawable-histogram.c b/app/core/gimpdrawable-histogram.c
new file mode 100644
index 0000000..b0be3f5
--- /dev/null
+++ b/app/core/gimpdrawable-histogram.c
@@ -0,0 +1,258 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphistogram module Copyright (C) 1999 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimptilehandlervalidate.h"
+
+#include "gimpasync.h"
+#include "gimpchannel.h"
+#include "gimpdrawable-filters.h"
+#include "gimpdrawable-histogram.h"
+#include "gimphistogram.h"
+#include "gimpimage.h"
+#include "gimpprojectable.h"
+
+
+/*  local function prototypes  */
+
+static GimpAsync * gimp_drawable_calculate_histogram_internal (GimpDrawable  *drawable,
+                                                               GimpHistogram *histogram,
+                                                               gboolean       with_filters,
+                                                               gboolean       run_async);
+
+
+/*  private functions  */
+
+
+static GimpAsync *
+gimp_drawable_calculate_histogram_internal (GimpDrawable  *drawable,
+                                            GimpHistogram *histogram,
+                                            gboolean       with_filters,
+                                            gboolean       run_async)
+{
+  GimpAsync   *async = NULL;
+  GimpImage   *image;
+  GimpChannel *mask;
+  gint         x, y, width, height;
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+    goto end;
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+  mask  = gimp_image_get_mask (image);
+
+  if (FALSE)
+    {
+      GeglNode      *node = gegl_node_new ();
+      GeglNode      *source;
+      GeglNode      *histogram_sink;
+      GeglProcessor *processor;
+
+      if (with_filters)
+        {
+          source = gimp_drawable_get_source_node (drawable);
+        }
+      else
+        {
+          source =
+            gimp_gegl_add_buffer_source (node,
+                                         gimp_drawable_get_buffer (drawable),
+                                         0, 0);
+        }
+
+      histogram_sink =
+        gegl_node_new_child (node,
+                             "operation", "gimp:histogram-sink",
+                             "histogram", histogram,
+                             NULL);
+
+      gegl_node_connect_to (source,         "output",
+                            histogram_sink, "input");
+
+      if (! gimp_channel_is_empty (mask))
+        {
+          GeglNode *mask_source;
+          gint      off_x, off_y;
+
+          g_printerr ("adding mask aux\n");
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          mask_source =
+            gimp_gegl_add_buffer_source (node,
+                                         gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)),
+                                         -off_x, -off_y);
+
+          gegl_node_connect_to (mask_source,    "output",
+                                histogram_sink, "aux");
+        }
+
+      processor = gegl_node_new_processor (histogram_sink,
+                                           GEGL_RECTANGLE (x, y, width, height));
+
+      while (gegl_processor_work (processor, NULL));
+
+      g_object_unref (processor);
+      g_object_unref (node);
+    }
+  else
+    {
+      GeglBuffer      *buffer      = gimp_drawable_get_buffer (drawable);
+      GimpProjectable *projectable = NULL;
+
+      if (with_filters && gimp_drawable_has_filters (drawable))
+        {
+          GimpTileHandlerValidate *validate;
+          GeglNode                *node;
+
+          node = gimp_drawable_get_source_node (drawable);
+
+          buffer = gegl_buffer_new (gegl_buffer_get_extent (buffer),
+                                    gegl_buffer_get_format (buffer));
+
+          validate =
+            GIMP_TILE_HANDLER_VALIDATE (gimp_tile_handler_validate_new (node));
+
+          gimp_tile_handler_validate_assign (validate, buffer);
+
+          g_object_unref (validate);
+
+          gimp_tile_handler_validate_invalidate (validate,
+                                                 gegl_buffer_get_extent (buffer));
+
+#if 0
+          /*  this would keep the buffer updated across drawable or
+           *  filter changes, but the histogram is created in one go
+           *  and doesn't need the signal connection
+           */
+          g_signal_connect_object (node, "invalidated",
+                                   G_CALLBACK (gimp_tile_handler_validate_invalidate),
+                                   validate, G_CONNECT_SWAPPED);
+#endif
+
+          if (GIMP_IS_PROJECTABLE (drawable))
+            projectable = GIMP_PROJECTABLE (drawable);
+        }
+      else
+        {
+          g_object_ref (buffer);
+        }
+
+      if (projectable)
+        gimp_projectable_begin_render (projectable);
+
+      if (! gimp_channel_is_empty (mask))
+        {
+          gint off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          if (run_async)
+            {
+              async = gimp_histogram_calculate_async (
+                histogram, buffer,
+                GEGL_RECTANGLE (x, y, width, height),
+                gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)),
+                GEGL_RECTANGLE (x + off_x, y + off_y,
+                                width, height));
+            }
+          else
+            {
+              gimp_histogram_calculate (
+                histogram, buffer,
+                GEGL_RECTANGLE (x, y, width, height),
+                gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)),
+                GEGL_RECTANGLE (x + off_x, y + off_y,
+                                width, height));
+            }
+        }
+      else
+        {
+          if (run_async)
+            {
+              async = gimp_histogram_calculate_async (
+                histogram, buffer,
+                GEGL_RECTANGLE (x, y, width, height),
+                NULL, NULL);
+            }
+          else
+            {
+              gimp_histogram_calculate (
+                histogram, buffer,
+                GEGL_RECTANGLE (x, y, width, height),
+                NULL, NULL);
+            }
+        }
+
+      if (projectable)
+        gimp_projectable_end_render (projectable);
+
+      g_object_unref (buffer);
+    }
+
+end:
+  if (run_async && ! async)
+    {
+      async = gimp_async_new ();
+
+      gimp_async_finish (async, NULL);
+    }
+
+  return async;
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_drawable_calculate_histogram (GimpDrawable  *drawable,
+                                   GimpHistogram *histogram,
+                                   gboolean       with_filters)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (histogram != NULL);
+
+  gimp_drawable_calculate_histogram_internal (drawable,
+                                              histogram, with_filters,
+                                              FALSE);
+}
+
+GimpAsync *
+gimp_drawable_calculate_histogram_async (GimpDrawable  *drawable,
+                                         GimpHistogram *histogram,
+                                         gboolean       with_filters)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (histogram != NULL, NULL);
+
+  return gimp_drawable_calculate_histogram_internal (drawable,
+                                                     histogram, with_filters,
+                                                     TRUE);
+}
diff --git a/app/core/gimpdrawable-histogram.h b/app/core/gimpdrawable-histogram.h
new file mode 100644
index 0000000..947393a
--- /dev/null
+++ b/app/core/gimpdrawable-histogram.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphistogram module Copyright (C) 1999 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_HISTOGRAM_H__
+#define __GIMP_DRAWABLE_HISTOGRAM_H__
+
+
+void        gimp_drawable_calculate_histogram       (GimpDrawable  *drawable,
+                                                     GimpHistogram *histogram,
+                                                     gboolean       with_filters);
+GimpAsync * gimp_drawable_calculate_histogram_async (GimpDrawable  *drawable,
+                                                     GimpHistogram *histogram,
+                                                     gboolean       with_filters);
+
+
+#endif /* __GIMP_HISTOGRAM_H__ */
diff --git a/app/core/gimpdrawable-levels.c b/app/core/gimpdrawable-levels.c
new file mode 100644
index 0000000..301326b
--- /dev/null
+++ b/app/core/gimpdrawable-levels.c
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "operations/gimplevelsconfig.h"
+
+#include "gimpdrawable.h"
+#include "gimpdrawable-histogram.h"
+#include "gimpdrawable-levels.h"
+#include "gimpdrawable-operation.h"
+#include "gimphistogram.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_levels_stretch (GimpDrawable *drawable,
+                              GimpProgress *progress)
+{
+  GimpLevelsConfig *config;
+  GimpHistogram    *histogram;
+  GeglNode         *levels;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), NULL, NULL, NULL, NULL))
+    return;
+
+  config = g_object_new (GIMP_TYPE_LEVELS_CONFIG, NULL);
+
+  histogram = gimp_histogram_new (FALSE);
+  gimp_drawable_calculate_histogram (drawable, histogram, FALSE);
+
+  gimp_levels_config_stretch (config, histogram,
+                              gimp_drawable_is_rgb (drawable));
+
+  g_object_unref (histogram);
+
+  levels = g_object_new (GEGL_TYPE_NODE,
+                         "operation", "gimp:levels",
+                         NULL);
+
+  gegl_node_set (levels,
+                 "config", config,
+                 NULL);
+
+  gimp_drawable_apply_operation (drawable, progress, _("Levels"),
+                                 levels);
+
+  g_object_unref (levels);
+  g_object_unref (config);
+}
diff --git a/app/core/gimpdrawable-levels.h b/app/core/gimpdrawable-levels.h
new file mode 100644
index 0000000..22011c1
--- /dev/null
+++ b/app/core/gimpdrawable-levels.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_LEVELS_H__
+#define __GIMP_DRAWABLE_LEVELS_H__
+
+
+void   gimp_drawable_levels_stretch (GimpDrawable *drawable,
+                                     GimpProgress *progress);
+
+
+#endif  /*  __GIMP_DRAWABLE_LEVELS_H__  */
diff --git a/app/core/gimpdrawable-offset.c b/app/core/gimpdrawable-offset.c
new file mode 100644
index 0000000..b7f5eb2
--- /dev/null
+++ b/app/core/gimpdrawable-offset.c
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-offset.h"
+#include "gimpdrawable-operation.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_drawable_offset (GimpDrawable   *drawable,
+                      GimpContext    *context,
+                      gboolean        wrap_around,
+                      GimpOffsetType  fill_type,
+                      gint            offset_x,
+                      gint            offset_y)
+{
+  GeglNode *node;
+  gint      width;
+  gint      height;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  NULL, NULL, &width, &height))
+    {
+      return;
+    }
+
+  if (wrap_around)
+    fill_type = GIMP_OFFSET_WRAP_AROUND;
+
+  if (fill_type == GIMP_OFFSET_WRAP_AROUND)
+    {
+      offset_x %= width;
+      offset_y %= height;
+    }
+
+  if (offset_x == 0 && offset_y == 0)
+    return;
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gimp:offset",
+                              "context", context,
+                              "type",    fill_type,
+                              "x",       offset_x,
+                              "y",       offset_y,
+                              NULL);
+
+  gimp_drawable_apply_operation (drawable, NULL,
+                                 C_("undo-type", "Offset Drawable"),
+                                 node);
+
+  g_object_unref (node);
+}
diff --git a/app/core/gimpdrawable-offset.h b/app/core/gimpdrawable-offset.h
new file mode 100644
index 0000000..6629150
--- /dev/null
+++ b/app/core/gimpdrawable-offset.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_OFFSET_H__
+#define __GIMP_DRAWABLE_OFFSET_H__
+
+
+void   gimp_drawable_offset (GimpDrawable   *drawable,
+                             GimpContext    *context,
+                             gboolean        wrap_around,
+                             GimpOffsetType  fill_type,
+                             gint            offset_x,
+                             gint            offset_y);
+
+
+#endif  /*  __GIMP_DRAWABLE_OFFSET_H__  */
diff --git a/app/core/gimpdrawable-operation.c b/app/core/gimpdrawable-operation.c
new file mode 100644
index 0000000..fdda286
--- /dev/null
+++ b/app/core/gimpdrawable-operation.c
@@ -0,0 +1,128 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-operation.c
+ * Copyright (C) 2007 Øyvind Kolås <pippin@gimp.org>
+ *                    Sven Neumann <sven@gimp.org>
+ *                    Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/gimp-operation-config.h"
+#include "operations/gimpoperationsettings.h"
+
+#include "gimpdrawable.h"
+#include "gimpdrawable-operation.h"
+#include "gimpdrawablefilter.h"
+#include "gimpprogress.h"
+#include "gimpsettings.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_apply_operation (GimpDrawable *drawable,
+                               GimpProgress *progress,
+                               const gchar  *undo_desc,
+                               GeglNode     *operation)
+{
+  gimp_drawable_apply_operation_with_config (drawable,
+                                             progress, undo_desc,
+                                             operation, NULL);
+}
+
+void
+gimp_drawable_apply_operation_with_config (GimpDrawable *drawable,
+                                           GimpProgress *progress,
+                                           const gchar  *undo_desc,
+                                           GeglNode     *operation,
+                                           GObject      *config)
+{
+  GimpDrawableFilter *filter;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (undo_desc != NULL);
+  g_return_if_fail (GEGL_IS_NODE (operation));
+  g_return_if_fail (config == NULL || GIMP_IS_OPERATION_SETTINGS (config));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  NULL, NULL, NULL, NULL))
+    {
+      return;
+    }
+
+  filter = gimp_drawable_filter_new (drawable, undo_desc, operation, NULL);
+
+  gimp_drawable_filter_set_add_alpha (filter,
+                                      gimp_gegl_node_has_key (operation,
+                                                              "needs-alpha"));
+
+  if (config)
+    {
+      gimp_operation_config_sync_node (config, operation);
+
+      gimp_operation_settings_sync_drawable_filter (
+        GIMP_OPERATION_SETTINGS (config), filter);
+    }
+
+  gimp_drawable_filter_apply  (filter, NULL);
+  gimp_drawable_filter_commit (filter, progress, TRUE);
+
+  g_object_unref (filter);
+
+  if (progress)
+    gimp_progress_end (progress);
+}
+
+void
+gimp_drawable_apply_operation_by_name (GimpDrawable *drawable,
+                                       GimpProgress *progress,
+                                       const gchar  *undo_desc,
+                                       const gchar  *operation_type,
+                                       GObject      *config)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (undo_desc != NULL);
+  g_return_if_fail (operation_type != NULL);
+  g_return_if_fail (config == NULL || GIMP_IS_SETTINGS (config));
+
+  node = g_object_new (GEGL_TYPE_NODE,
+                       "operation", operation_type,
+                       NULL);
+
+  if (config)
+    gegl_node_set (node,
+                   "config", config,
+                   NULL);
+
+  gimp_drawable_apply_operation (drawable, progress, undo_desc, node);
+
+  g_object_unref (node);
+}
diff --git a/app/core/gimpdrawable-operation.h b/app/core/gimpdrawable-operation.h
new file mode 100644
index 0000000..6ca381f
--- /dev/null
+++ b/app/core/gimpdrawable-operation.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-operation.h
+ * Copyright (C) 2007 Øyvind Kolås <pippin@gimp.org>
+ *                    Sven Neumann <sven@gimp.org>
+ *                    Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_OPERATION_H__
+#define __GIMP_DRAWABLE_OPERATION_H__
+
+
+void   gimp_drawable_apply_operation             (GimpDrawable *drawable,
+                                                  GimpProgress *progress,
+                                                  const gchar  *undo_desc,
+                                                  GeglNode     *operation);
+void   gimp_drawable_apply_operation_with_config (GimpDrawable *drawable,
+                                                  GimpProgress *progress,
+                                                  const gchar  *undo_desc,
+                                                  GeglNode     *operation,
+                                                  GObject      *config);
+void   gimp_drawable_apply_operation_by_name     (GimpDrawable *drawable,
+                                                  GimpProgress *progress,
+                                                  const gchar  *undo_desc,
+                                                  const gchar  *operation_type,
+                                                  GObject      *config);
+
+
+#endif /* __GIMP_DRAWABLE_OPERATION_H__ */
diff --git a/app/core/gimpdrawable-preview.c b/app/core/gimpdrawable-preview.c
new file mode 100644
index 0000000..28ae1e2
--- /dev/null
+++ b/app/core/gimpdrawable-preview.c
@@ -0,0 +1,492 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimptilehandlervalidate.h"
+
+#include "gimp.h"
+#include "gimp-parallel.h"
+#include "gimp-utils.h"
+#include "gimpasync.h"
+#include "gimpchannel.h"
+#include "gimpchunkiterator.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpdrawable-preview.h"
+#include "gimpdrawable-private.h"
+#include "gimplayer.h"
+#include "gimptempbuf.h"
+
+#include "gimp-priorities.h"
+
+
+typedef struct
+{
+  const Babl        *format;
+  GeglBuffer        *buffer;
+  GeglRectangle      rect;
+  gdouble            scale;
+
+  GimpChunkIterator *iter;
+} SubPreviewData;
+
+
+/*  local function prototypes  */
+
+static SubPreviewData * sub_preview_data_new  (const Babl          *format,
+                                               GeglBuffer          *buffer,
+                                               const GeglRectangle *rect,
+                                               gdouble              scale);
+static void             sub_preview_data_free (SubPreviewData      *data);
+
+
+
+/*  private functions  */
+
+
+static SubPreviewData *
+sub_preview_data_new (const Babl          *format,
+                      GeglBuffer          *buffer,
+                      const GeglRectangle *rect,
+                      gdouble              scale)
+{
+  SubPreviewData *data = g_slice_new (SubPreviewData);
+
+  data->format = format;
+  data->buffer = g_object_ref (buffer);
+  data->rect   = *rect;
+  data->scale  = scale;
+
+  data->iter   = NULL;
+
+  return data;
+}
+
+static void
+sub_preview_data_free (SubPreviewData *data)
+{
+  g_object_unref (data->buffer);
+
+  if (data->iter)
+    gimp_chunk_iterator_stop (data->iter, TRUE);
+
+  g_slice_free (SubPreviewData, data);
+}
+
+
+/*  public functions  */
+
+
+GimpTempBuf *
+gimp_drawable_get_new_preview (GimpViewable *viewable,
+                               GimpContext  *context,
+                               gint          width,
+                               gint          height)
+{
+  GimpItem  *item  = GIMP_ITEM (viewable);
+  GimpImage *image = gimp_item_get_image (item);
+
+  if (! image->gimp->config->layer_previews)
+    return NULL;
+
+  return gimp_drawable_get_sub_preview (GIMP_DRAWABLE (viewable),
+                                        0, 0,
+                                        gimp_item_get_width  (item),
+                                        gimp_item_get_height (item),
+                                        width,
+                                        height);
+}
+
+GdkPixbuf *
+gimp_drawable_get_new_pixbuf (GimpViewable *viewable,
+                              GimpContext  *context,
+                              gint          width,
+                              gint          height)
+{
+  GimpItem  *item  = GIMP_ITEM (viewable);
+  GimpImage *image = gimp_item_get_image (item);
+
+  if (! image->gimp->config->layer_previews)
+    return NULL;
+
+  return gimp_drawable_get_sub_pixbuf (GIMP_DRAWABLE (viewable),
+                                       0, 0,
+                                       gimp_item_get_width  (item),
+                                       gimp_item_get_height (item),
+                                       width,
+                                       height);
+}
+
+const Babl *
+gimp_drawable_get_preview_format (GimpDrawable *drawable)
+{
+  gboolean alpha;
+  gboolean linear;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  alpha  = gimp_drawable_has_alpha (drawable);
+  linear = gimp_drawable_get_linear (drawable);
+
+  switch (gimp_drawable_get_base_type (drawable))
+    {
+    case GIMP_GRAY:
+      return gimp_babl_format (GIMP_GRAY,
+                               gimp_babl_precision (GIMP_COMPONENT_TYPE_U8,
+                                                    linear),
+                               alpha);
+
+    case GIMP_RGB:
+      return gimp_babl_format (GIMP_RGB,
+                               gimp_babl_precision (GIMP_COMPONENT_TYPE_U8,
+                                                    linear),
+                               alpha);
+
+    case GIMP_INDEXED:
+      if (alpha)
+        return babl_format ("R'G'B'A u8");
+      else
+        return babl_format ("R'G'B' u8");
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+GimpTempBuf *
+gimp_drawable_get_sub_preview (GimpDrawable *drawable,
+                               gint          src_x,
+                               gint          src_y,
+                               gint          src_width,
+                               gint          src_height,
+                               gint          dest_width,
+                               gint          dest_height)
+{
+  GimpItem    *item;
+  GimpImage   *image;
+  GeglBuffer  *buffer;
+  GimpTempBuf *preview;
+  gdouble      scale;
+  gint         scaled_x;
+  gint         scaled_y;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (src_x >= 0, NULL);
+  g_return_val_if_fail (src_y >= 0, NULL);
+  g_return_val_if_fail (src_width  > 0, NULL);
+  g_return_val_if_fail (src_height > 0, NULL);
+  g_return_val_if_fail (dest_width  > 0, NULL);
+  g_return_val_if_fail (dest_height > 0, NULL);
+
+  item = GIMP_ITEM (drawable);
+
+  g_return_val_if_fail ((src_x + src_width)  <= gimp_item_get_width  (item), NULL);
+  g_return_val_if_fail ((src_y + src_height) <= gimp_item_get_height (item), NULL);
+
+  image = gimp_item_get_image (item);
+
+  if (! image->gimp->config->layer_previews)
+    return NULL;
+
+  buffer = gimp_drawable_get_buffer (drawable);
+
+  preview = gimp_temp_buf_new (dest_width, dest_height,
+                               gimp_drawable_get_preview_format (drawable));
+
+  scale = MIN ((gdouble) dest_width  / (gdouble) src_width,
+               (gdouble) dest_height / (gdouble) src_height);
+
+  scaled_x = RINT ((gdouble) src_x * scale);
+  scaled_y = RINT ((gdouble) src_y * scale);
+
+  gegl_buffer_get (buffer,
+                   GEGL_RECTANGLE (scaled_x, scaled_y, dest_width, dest_height),
+                   scale,
+                   gimp_temp_buf_get_format (preview),
+                   gimp_temp_buf_get_data (preview),
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+  return preview;
+}
+
+GdkPixbuf *
+gimp_drawable_get_sub_pixbuf (GimpDrawable *drawable,
+                              gint          src_x,
+                              gint          src_y,
+                              gint          src_width,
+                              gint          src_height,
+                              gint          dest_width,
+                              gint          dest_height)
+{
+  GimpItem           *item;
+  GimpImage          *image;
+  GeglBuffer         *buffer;
+  GdkPixbuf          *pixbuf;
+  gdouble             scale;
+  gint                scaled_x;
+  gint                scaled_y;
+  GimpColorTransform *transform;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (src_x >= 0, NULL);
+  g_return_val_if_fail (src_y >= 0, NULL);
+  g_return_val_if_fail (src_width  > 0, NULL);
+  g_return_val_if_fail (src_height > 0, NULL);
+  g_return_val_if_fail (dest_width  > 0, NULL);
+  g_return_val_if_fail (dest_height > 0, NULL);
+
+  item = GIMP_ITEM (drawable);
+
+  g_return_val_if_fail ((src_x + src_width)  <= gimp_item_get_width  (item), NULL);
+  g_return_val_if_fail ((src_y + src_height) <= gimp_item_get_height (item), NULL);
+
+  image = gimp_item_get_image (item);
+
+  if (! image->gimp->config->layer_previews)
+    return NULL;
+
+  buffer = gimp_drawable_get_buffer (drawable);
+
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                           dest_width, dest_height);
+
+  scale = MIN ((gdouble) dest_width  / (gdouble) src_width,
+               (gdouble) dest_height / (gdouble) src_height);
+
+  scaled_x = RINT ((gdouble) src_x * scale);
+  scaled_y = RINT ((gdouble) src_y * scale);
+
+  transform = gimp_image_get_color_transform_to_srgb_u8 (image);
+
+  if (transform)
+    {
+      GimpTempBuf *temp_buf;
+      GeglBuffer  *src_buf;
+      GeglBuffer  *dest_buf;
+
+      temp_buf = gimp_temp_buf_new (dest_width, dest_height,
+                                    gimp_drawable_get_format (drawable));
+
+      gegl_buffer_get (buffer,
+                       GEGL_RECTANGLE (scaled_x, scaled_y,
+                                       dest_width, dest_height),
+                       scale,
+                       gimp_temp_buf_get_format (temp_buf),
+                       gimp_temp_buf_get_data (temp_buf),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+      src_buf  = gimp_temp_buf_create_buffer (temp_buf);
+      dest_buf = gimp_pixbuf_create_buffer (pixbuf);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      gimp_color_transform_process_buffer (transform,
+                                           src_buf,
+                                           GEGL_RECTANGLE (0, 0,
+                                                           dest_width, dest_height),
+                                           dest_buf,
+                                           GEGL_RECTANGLE (0, 0, 0, 0));
+
+      g_object_unref (src_buf);
+      g_object_unref (dest_buf);
+    }
+  else
+    {
+      gegl_buffer_get (buffer,
+                       GEGL_RECTANGLE (scaled_x, scaled_y,
+                                       dest_width, dest_height),
+                       scale,
+                       gimp_pixbuf_get_format (pixbuf),
+                       gdk_pixbuf_get_pixels (pixbuf),
+                       gdk_pixbuf_get_rowstride (pixbuf),
+                       GEGL_ABYSS_CLAMP);
+    }
+
+  return pixbuf;
+}
+
+static void
+gimp_drawable_get_sub_preview_async_func (GimpAsync      *async,
+                                          SubPreviewData *data)
+{
+  GimpTempBuf             *preview;
+  GimpTileHandlerValidate *validate;
+
+  preview = gimp_temp_buf_new (data->rect.width, data->rect.height,
+                               data->format);
+
+  validate = gimp_tile_handler_validate_get_assigned (data->buffer);
+
+  if (validate)
+    {
+      if (! data->iter)
+        {
+          cairo_region_t        *region;
+          cairo_rectangle_int_t  rect;
+
+          rect.x      = floor (data->rect.x / data->scale);
+          rect.y      = floor (data->rect.y / data->scale);
+          rect.width  = ceil ((data->rect.x + data->rect.width)  /
+                              data->scale) - rect.x;
+          rect.height = ceil ((data->rect.x + data->rect.height) /
+                              data->scale) - rect.y;
+
+          region = cairo_region_copy (validate->dirty_region);
+
+          cairo_region_intersect_rectangle (region, &rect);
+
+          data->iter = gimp_chunk_iterator_new (region);
+        }
+
+      if (gimp_chunk_iterator_next (data->iter))
+        {
+          GeglRectangle rect;
+
+          gimp_tile_handler_validate_begin_validate (validate);
+
+          while (gimp_chunk_iterator_get_rect (data->iter, &rect))
+            {
+              gimp_tile_handler_validate_validate (validate,
+                                                   data->buffer, &rect,
+                                                   FALSE, FALSE);
+            }
+
+          gimp_tile_handler_validate_end_validate (validate);
+
+          return;
+        }
+
+      data->iter = NULL;
+    }
+
+  gegl_buffer_get (data->buffer, &data->rect, data->scale,
+                   gimp_temp_buf_get_format (preview),
+                   gimp_temp_buf_get_data (preview),
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+  sub_preview_data_free (data);
+
+  gimp_async_finish_full (async,
+                          preview,
+                          (GDestroyNotify) gimp_temp_buf_unref);
+}
+
+GimpAsync *
+gimp_drawable_get_sub_preview_async (GimpDrawable *drawable,
+                                     gint          src_x,
+                                     gint          src_y,
+                                     gint          src_width,
+                                     gint          src_height,
+                                     gint          dest_width,
+                                     gint          dest_height)
+{
+  GimpItem       *item;
+  GimpImage      *image;
+  GeglBuffer     *buffer;
+  SubPreviewData *data;
+  gdouble         scale;
+  gint            scaled_x;
+  gint            scaled_y;
+  static gint     no_async_drawable_previews = -1;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (src_x >= 0, NULL);
+  g_return_val_if_fail (src_y >= 0, NULL);
+  g_return_val_if_fail (src_width  > 0, NULL);
+  g_return_val_if_fail (src_height > 0, NULL);
+  g_return_val_if_fail (dest_width  > 0, NULL);
+  g_return_val_if_fail (dest_height > 0, NULL);
+
+  item = GIMP_ITEM (drawable);
+
+  g_return_val_if_fail ((src_x + src_width)  <= gimp_item_get_width  (item), NULL);
+  g_return_val_if_fail ((src_y + src_height) <= gimp_item_get_height (item), NULL);
+
+  image = gimp_item_get_image (item);
+
+  if (! image->gimp->config->layer_previews)
+    return NULL;
+
+  buffer = gimp_drawable_get_buffer (drawable);
+
+  if (no_async_drawable_previews < 0)
+    {
+      no_async_drawable_previews =
+        (g_getenv ("GIMP_NO_ASYNC_DRAWABLE_PREVIEWS") != NULL);
+    }
+
+  if (no_async_drawable_previews)
+    {
+      GimpAsync *async = gimp_async_new ();
+
+      gimp_async_finish_full (async,
+                              gimp_drawable_get_sub_preview (drawable,
+                                                             src_x,
+                                                             src_y,
+                                                             src_width,
+                                                             src_height,
+                                                             dest_width,
+                                                             dest_height),
+                              (GDestroyNotify) gimp_temp_buf_unref);
+
+      return async;
+    }
+
+  scale = MIN ((gdouble) dest_width  / (gdouble) src_width,
+               (gdouble) dest_height / (gdouble) src_height);
+
+  scaled_x = RINT ((gdouble) src_x * scale);
+  scaled_y = RINT ((gdouble) src_y * scale);
+
+  data = sub_preview_data_new (
+    gimp_drawable_get_preview_format (drawable),
+    buffer,
+    GEGL_RECTANGLE (scaled_x, scaled_y, dest_width, dest_height),
+    scale);
+
+  if (gimp_tile_handler_validate_get_assigned (buffer))
+    {
+      return gimp_idle_run_async_full (
+        GIMP_PRIORITY_VIEWABLE_IDLE,
+        (GimpRunAsyncFunc) gimp_drawable_get_sub_preview_async_func,
+        data,
+        (GDestroyNotify) sub_preview_data_free);
+    }
+  else
+    {
+      return gimp_parallel_run_async_full (
+        +1,
+        (GimpRunAsyncFunc) gimp_drawable_get_sub_preview_async_func,
+        data,
+        (GDestroyNotify) sub_preview_data_free);
+    }
+}
diff --git a/app/core/gimpdrawable-preview.h b/app/core/gimpdrawable-preview.h
new file mode 100644
index 0000000..31f8ade
--- /dev/null
+++ b/app/core/gimpdrawable-preview.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE__PREVIEW_H__
+#define __GIMP_DRAWABLE__PREVIEW_H__
+
+
+/*
+ *  virtual functions of GimpDrawable -- don't call directly
+ */
+GimpTempBuf * gimp_drawable_get_new_preview       (GimpViewable *viewable,
+                                                   GimpContext  *context,
+                                                   gint          width,
+                                                   gint          height);
+GdkPixbuf   * gimp_drawable_get_new_pixbuf        (GimpViewable *viewable,
+                                                   GimpContext  *context,
+                                                   gint          width,
+                                                   gint          height);
+
+/*
+ *  normal functions (no virtuals)
+ */
+const Babl  * gimp_drawable_get_preview_format    (GimpDrawable *drawable);
+
+GimpTempBuf * gimp_drawable_get_sub_preview       (GimpDrawable *drawable,
+                                                   gint          src_x,
+                                                   gint          src_y,
+                                                   gint          src_width,
+                                                   gint          src_height,
+                                                   gint          dest_width,
+                                                   gint          dest_height);
+GdkPixbuf   * gimp_drawable_get_sub_pixbuf        (GimpDrawable *drawable,
+                                                   gint          src_x,
+                                                   gint          src_y,
+                                                   gint          src_width,
+                                                   gint          src_height,
+                                                   gint          dest_width,
+                                                   gint          dest_height);
+
+GimpAsync   * gimp_drawable_get_sub_preview_async (GimpDrawable *drawable,
+                                                   gint          src_x,
+                                                   gint          src_y,
+                                                   gint          src_width,
+                                                   gint          src_height,
+                                                   gint          dest_width,
+                                                   gint          dest_height);
+
+
+#endif /* __GIMP_DRAWABLE__PREVIEW_H__ */
diff --git a/app/core/gimpdrawable-private.h b/app/core/gimpdrawable-private.h
new file mode 100644
index 0000000..780d5bf
--- /dev/null
+++ b/app/core/gimpdrawable-private.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_PRIVATE_H__
+#define __GIMP_DRAWABLE_PRIVATE_H__
+
+struct _GimpDrawablePrivate
+{
+  GeglBuffer     *buffer; /* buffer for drawable data */
+  GeglBuffer     *shadow; /* shadow buffer            */
+
+  GeglNode       *source_node;
+  GeglNode       *buffer_source_node;
+  GimpContainer  *filter_stack;
+  GeglRectangle   bounding_box;
+
+  GimpLayer      *floating_selection;
+  GimpFilter     *fs_filter;
+  GeglNode       *fs_crop_node;
+  GimpApplicator *fs_applicator;
+
+  GeglNode       *mode_node;
+
+  gint            paint_count;
+  GeglBuffer     *paint_buffer;
+  cairo_region_t *paint_copy_region;
+  cairo_region_t *paint_update_region;
+};
+
+#endif /* __GIMP_DRAWABLE_PRIVATE_H__ */
diff --git a/app/core/gimpdrawable-shadow.c b/app/core/gimpdrawable-shadow.c
new file mode 100644
index 0000000..4c42655
--- /dev/null
+++ b/app/core/gimpdrawable-shadow.c
@@ -0,0 +1,110 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+#include <cairo.h>
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimpdrawable.h"
+#include "gimpdrawable-private.h"
+#include "gimpdrawable-shadow.h"
+
+
+GeglBuffer *
+gimp_drawable_get_shadow_buffer (GimpDrawable *drawable)
+{
+  GimpItem   *item;
+  gint        width;
+  gint        height;
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  item = GIMP_ITEM (drawable);
+
+  width  = gimp_item_get_width  (item);
+  height = gimp_item_get_height (item);
+  format = gimp_drawable_get_format (drawable);
+
+  if (drawable->private->shadow)
+    {
+      if ((width  != gegl_buffer_get_width  (drawable->private->shadow)) ||
+          (height != gegl_buffer_get_height (drawable->private->shadow)) ||
+          (format != gegl_buffer_get_format (drawable->private->shadow)))
+        {
+          gimp_drawable_free_shadow_buffer (drawable);
+        }
+      else
+        {
+          return drawable->private->shadow;
+        }
+    }
+
+  drawable->private->shadow = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                               width, height),
+                                               format);
+
+  return drawable->private->shadow;
+}
+
+void
+gimp_drawable_free_shadow_buffer (GimpDrawable *drawable)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  g_clear_object (&drawable->private->shadow);
+}
+
+void
+gimp_drawable_merge_shadow_buffer (GimpDrawable *drawable,
+                                   gboolean      push_undo,
+                                   const gchar  *undo_desc)
+{
+  gint x, y;
+  gint width, height;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GEGL_IS_BUFFER (drawable->private->shadow));
+
+  /*  A useful optimization here is to limit the update to the
+   *  extents of the selection mask, as it cannot extend beyond
+   *  them.
+   */
+  if (gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+    {
+      GeglBuffer *buffer = g_object_ref (drawable->private->shadow);
+
+      gimp_drawable_apply_buffer (drawable, buffer,
+                                  GEGL_RECTANGLE (x, y, width, height),
+                                  push_undo, undo_desc,
+                                  GIMP_OPACITY_OPAQUE,
+                                  GIMP_LAYER_MODE_REPLACE,
+                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                  GIMP_LAYER_COMPOSITE_AUTO,
+                                  NULL, x, y);
+
+      g_object_unref (buffer);
+    }
+}
diff --git a/app/core/gimpdrawable-shadow.h b/app/core/gimpdrawable-shadow.h
new file mode 100644
index 0000000..b3ab582
--- /dev/null
+++ b/app/core/gimpdrawable-shadow.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-shadow.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_SHADOW_H__
+#define __GIMP_DRAWABLE_SHADOW_H__
+
+
+GeglBuffer * gimp_drawable_get_shadow_buffer   (GimpDrawable *drawable);
+void         gimp_drawable_free_shadow_buffer  (GimpDrawable *drawable);
+
+void         gimp_drawable_merge_shadow_buffer (GimpDrawable *drawable,
+                                                gboolean      push_undo,
+                                                const gchar  *undo_desc);
+
+
+#endif /* __GIMP_DRAWABLE_SHADOW_H__ */
diff --git a/app/core/gimpdrawable-stroke.c b/app/core/gimpdrawable-stroke.c
new file mode 100644
index 0000000..5b35d51
--- /dev/null
+++ b/app/core/gimpdrawable-stroke.c
@@ -0,0 +1,161 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-stroke.c
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable-fill.h"
+#include "gimpdrawable-stroke.h"
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimpscanconvert.h"
+#include "gimpstrokeoptions.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_stroke_boundary (GimpDrawable       *drawable,
+                               GimpStrokeOptions  *options,
+                               const GimpBoundSeg *bound_segs,
+                               gint                n_bound_segs,
+                               gint                offset_x,
+                               gint                offset_y,
+                               gboolean            push_undo)
+{
+  GimpScanConvert *scan_convert;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_STROKE_OPTIONS (options));
+  g_return_if_fail (bound_segs == NULL || n_bound_segs != 0);
+  g_return_if_fail (gimp_fill_options_get_style (GIMP_FILL_OPTIONS (options)) !=
+                    GIMP_FILL_STYLE_PATTERN ||
+                    gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL);
+
+  scan_convert = gimp_scan_convert_new_from_boundary (bound_segs, n_bound_segs,
+                                                      offset_x, offset_y);
+
+  if (scan_convert)
+    {
+      gimp_drawable_stroke_scan_convert (drawable, options,
+                                         scan_convert, push_undo);
+      gimp_scan_convert_free (scan_convert);
+    }
+}
+
+gboolean
+gimp_drawable_stroke_vectors (GimpDrawable       *drawable,
+                              GimpStrokeOptions  *options,
+                              GimpVectors        *vectors,
+                              gboolean            push_undo,
+                              GError            **error)
+{
+  const GimpBezierDesc *bezier;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), FALSE);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
+  g_return_val_if_fail (gimp_fill_options_get_style (GIMP_FILL_OPTIONS (options)) !=
+                        GIMP_FILL_STYLE_PATTERN ||
+                        gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL,
+                        FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  bezier = gimp_vectors_get_bezier (vectors);
+
+  if (bezier && bezier->num_data >= 2)
+    {
+      GimpScanConvert *scan_convert = gimp_scan_convert_new ();
+
+      gimp_scan_convert_add_bezier (scan_convert, bezier);
+      gimp_drawable_stroke_scan_convert (drawable, options,
+                                         scan_convert, push_undo);
+
+      gimp_scan_convert_free (scan_convert);
+
+      return TRUE;
+    }
+
+  g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                       _("Not enough points to stroke"));
+
+  return FALSE;
+}
+
+void
+gimp_drawable_stroke_scan_convert (GimpDrawable      *drawable,
+                                   GimpStrokeOptions *options,
+                                   GimpScanConvert   *scan_convert,
+                                   gboolean           push_undo)
+{
+  gdouble  width;
+  GimpUnit unit;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_STROKE_OPTIONS (options));
+  g_return_if_fail (scan_convert != NULL);
+  g_return_if_fail (gimp_fill_options_get_style (GIMP_FILL_OPTIONS (options)) !=
+                    GIMP_FILL_STYLE_PATTERN ||
+                    gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL);
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), NULL, NULL, NULL, NULL))
+    return;
+
+  width = gimp_stroke_options_get_width (options);
+  unit  = gimp_stroke_options_get_unit (options);
+
+  if (unit != GIMP_UNIT_PIXEL)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+      gdouble    xres;
+      gdouble    yres;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      gimp_scan_convert_set_pixel_ratio (scan_convert, yres / xres);
+
+      width = gimp_units_to_pixels (width, unit, yres);
+    }
+
+  gimp_scan_convert_stroke (scan_convert, width,
+                            gimp_stroke_options_get_join_style (options),
+                            gimp_stroke_options_get_cap_style (options),
+                            gimp_stroke_options_get_miter_limit (options),
+                            gimp_stroke_options_get_dash_offset (options),
+                            gimp_stroke_options_get_dash_info (options));
+
+  gimp_drawable_fill_scan_convert (drawable, GIMP_FILL_OPTIONS (options),
+                                   scan_convert, push_undo);
+}
diff --git a/app/core/gimpdrawable-stroke.h b/app/core/gimpdrawable-stroke.h
new file mode 100644
index 0000000..5f16e5b
--- /dev/null
+++ b/app/core/gimpdrawable-stroke.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawable-stroke.h
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_DRAWABLE_STROKE_H__
+#define  __GIMP_DRAWABLE_STROKE_H__
+
+
+void       gimp_drawable_stroke_boundary     (GimpDrawable       *drawable,
+                                              GimpStrokeOptions  *options,
+                                              const GimpBoundSeg *bound_segs,
+                                              gint                n_bound_segs,
+                                              gint                offset_x,
+                                              gint                offset_y,
+                                              gboolean            push_undo);
+
+gboolean   gimp_drawable_stroke_vectors      (GimpDrawable       *drawable,
+                                              GimpStrokeOptions  *options,
+                                              GimpVectors        *vectors,
+                                              gboolean            push_undo,
+                                              GError            **error);
+
+void       gimp_drawable_stroke_scan_convert (GimpDrawable      *drawable,
+                                              GimpStrokeOptions *options,
+                                              GimpScanConvert   *scan_convert,
+                                              gboolean           push_undo);
+
+
+#endif  /*  __GIMP_DRAWABLE_STROKE_H__  */
diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c
new file mode 100644
index 0000000..9cbedfd
--- /dev/null
+++ b/app/core/gimpdrawable-transform.c
@@ -0,0 +1,1070 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp.h"
+#include "gimp-transform-resize.h"
+#include "gimpchannel.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-transform.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimplayer-floating-selection.h"
+#include "gimplayer-new.h"
+#include "gimppickable.h"
+#include "gimpprogress.h"
+#include "gimpselection.h"
+
+#include "gimp-intl.h"
+
+
+#if defined (HAVE_FINITE)
+#define FINITE(x) finite(x)
+#elif defined (HAVE_ISFINITE)
+#define FINITE(x) isfinite(x)
+#elif defined (G_OS_WIN32)
+#define FINITE(x) _finite(x)
+#else
+#error "no FINITE() implementation available?!"
+#endif
+
+
+/*  public functions  */
+
+GeglBuffer *
+gimp_drawable_transform_buffer_affine (GimpDrawable            *drawable,
+                                       GimpContext             *context,
+                                       GeglBuffer              *orig_buffer,
+                                       gint                     orig_offset_x,
+                                       gint                     orig_offset_y,
+                                       const GimpMatrix3       *matrix,
+                                       GimpTransformDirection   direction,
+                                       GimpInterpolationType    interpolation_type,
+                                       GimpTransformResize      clip_result,
+                                       GimpColorProfile       **buffer_profile,
+                                       gint                    *new_offset_x,
+                                       gint                    *new_offset_y,
+                                       GimpProgress            *progress)
+{
+  GeglBuffer  *new_buffer;
+  GimpMatrix3  m;
+  gint         u1, v1, u2, v2;  /* source bounding box */
+  gint         x1, y1, x2, y2;  /* target bounding box */
+  GimpMatrix3  gegl_matrix;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (orig_buffer), NULL);
+  g_return_val_if_fail (matrix != NULL, NULL);
+  g_return_val_if_fail (buffer_profile != NULL, NULL);
+  g_return_val_if_fail (new_offset_x != NULL, NULL);
+  g_return_val_if_fail (new_offset_y != NULL, NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  *buffer_profile =
+    gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (drawable));
+
+  m = *matrix;
+
+  if (direction == GIMP_TRANSFORM_BACKWARD)
+    {
+      /*  Find the inverse of the transformation matrix  */
+      gimp_matrix3_invert (&m);
+    }
+
+  u1 = orig_offset_x;
+  v1 = orig_offset_y;
+  u2 = u1 + gegl_buffer_get_width  (orig_buffer);
+  v2 = v1 + gegl_buffer_get_height (orig_buffer);
+
+  /*  Find the bounding coordinates of target */
+  gimp_transform_resize_boundary (&m, clip_result,
+                                  u1, v1, u2, v2,
+                                  &x1, &y1, &x2, &y2);
+
+  /*  Get the new temporary buffer for the transformed result  */
+  new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, x2 - x1, y2 - y1),
+                                gegl_buffer_get_format (orig_buffer));
+
+  gimp_matrix3_identity (&gegl_matrix);
+  gimp_matrix3_translate (&gegl_matrix, u1, v1);
+  gimp_matrix3_mult (&m, &gegl_matrix);
+  gimp_matrix3_translate (&gegl_matrix, -x1, -y1);
+
+  gimp_gegl_apply_transform (orig_buffer, progress, NULL,
+                             new_buffer,
+                             interpolation_type,
+                             &gegl_matrix);
+
+  *new_offset_x = x1;
+  *new_offset_y = y1;
+
+  return new_buffer;
+}
+
+GeglBuffer *
+gimp_drawable_transform_buffer_flip (GimpDrawable         *drawable,
+                                     GimpContext          *context,
+                                     GeglBuffer           *orig_buffer,
+                                     gint                  orig_offset_x,
+                                     gint                  orig_offset_y,
+                                     GimpOrientationType   flip_type,
+                                     gdouble               axis,
+                                     gboolean              clip_result,
+                                     GimpColorProfile    **buffer_profile,
+                                     gint                 *new_offset_x,
+                                     gint                 *new_offset_y)
+{
+  const Babl         *format;
+  GeglBuffer         *new_buffer;
+  GeglBufferIterator *iter;
+  GeglRectangle       src_rect;
+  GeglRectangle       dest_rect;
+  gint                bpp;
+  gint                orig_x, orig_y;
+  gint                orig_width, orig_height;
+  gint                new_x, new_y;
+  gint                new_width, new_height;
+  gint                x, y;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (orig_buffer), NULL);
+  g_return_val_if_fail (buffer_profile != NULL, NULL);
+  g_return_val_if_fail (new_offset_x != NULL, NULL);
+  g_return_val_if_fail (new_offset_y != NULL, NULL);
+
+  *buffer_profile =
+    gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (drawable));
+
+  orig_x      = orig_offset_x;
+  orig_y      = orig_offset_y;
+  orig_width  = gegl_buffer_get_width (orig_buffer);
+  orig_height = gegl_buffer_get_height (orig_buffer);
+
+  new_x      = orig_x;
+  new_y      = orig_y;
+  new_width  = orig_width;
+  new_height = orig_height;
+
+  switch (flip_type)
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      new_x = RINT (-((gdouble) orig_x +
+                      (gdouble) orig_width - axis) + axis);
+      break;
+
+    case GIMP_ORIENTATION_VERTICAL:
+      new_y = RINT (-((gdouble) orig_y +
+                      (gdouble) orig_height - axis) + axis);
+      break;
+
+    case GIMP_ORIENTATION_UNKNOWN:
+      g_return_val_if_reached (NULL);
+      break;
+    }
+
+  format = gegl_buffer_get_format (orig_buffer);
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                new_width, new_height),
+                                format);
+
+  if (clip_result && (new_x != orig_x || new_y != orig_y))
+    {
+      GimpRGB    bg;
+      GeglColor *color;
+      gint       clip_x, clip_y;
+      gint       clip_width, clip_height;
+
+      *new_offset_x = orig_x;
+      *new_offset_y = orig_y;
+
+      /*  Use transparency, rather than the bg color, as the "outside" color of
+       *  channels, and drawables with an alpha channel.
+       */
+      if (GIMP_IS_CHANNEL (drawable) || babl_format_has_alpha (format))
+        {
+          gimp_rgba_set (&bg, 0.0, 0.0, 0.0, 0.0);
+        }
+      else
+        {
+          gimp_context_get_background (context, &bg);
+          gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                             &bg, &bg);
+        }
+
+      color = gimp_gegl_color_new (&bg);
+      gegl_buffer_set_color (new_buffer, NULL, color);
+      g_object_unref (color);
+
+      if (gimp_rectangle_intersect (orig_x, orig_y, orig_width, orig_height,
+                                    new_x, new_y, new_width, new_height,
+                                    &clip_x, &clip_y,
+                                    &clip_width, &clip_height))
+        {
+          orig_x = new_x = clip_x - orig_x;
+          orig_y = new_y = clip_y - orig_y;
+        }
+
+      orig_width  = new_width  = clip_width;
+      orig_height = new_height = clip_height;
+    }
+  else
+    {
+      *new_offset_x = new_x;
+      *new_offset_y = new_y;
+
+      orig_x = 0;
+      orig_y = 0;
+      new_x  = 0;
+      new_y  = 0;
+    }
+
+  if (new_width == 0 && new_height == 0)
+    return new_buffer;
+
+  dest_rect.x      = new_x;
+  dest_rect.y      = new_y;
+  dest_rect.width  = new_width;
+  dest_rect.height = new_height;
+
+  iter = gegl_buffer_iterator_new (new_buffer, &dest_rect, 0, NULL,
+                                   GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE, 1);
+
+  switch (flip_type)
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      while (gegl_buffer_iterator_next (iter))
+        {
+          gint stride = iter->items[0].roi.width * bpp;
+
+          src_rect = iter->items[0].roi;
+
+          src_rect.x = (orig_x + orig_width)          -
+                       (iter->items[0].roi.x - dest_rect.x) -
+                       iter->items[0].roi.width;
+
+          gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, iter->items[0].data,
+                           stride, GEGL_ABYSS_NONE);
+
+          for (y = 0; y < iter->items[0].roi.height; y++)
+            {
+              guint8 *left  = iter->items[0].data;
+              guint8 *right = iter->items[0].data;
+
+              left  += y * stride;
+              right += y * stride + (iter->items[0].roi.width - 1) * bpp;
+
+              for (x = 0; x < iter->items[0].roi.width / 2; x++)
+                {
+                  guint8 temp[bpp];
+
+                  memcpy (temp,  left,  bpp);
+                  memcpy (left,  right, bpp);
+                  memcpy (right, temp,  bpp);
+
+                  left  += bpp;
+                  right -= bpp;
+                }
+            }
+        }
+      break;
+
+    case GIMP_ORIENTATION_VERTICAL:
+      while (gegl_buffer_iterator_next (iter))
+        {
+          gint stride = iter->items[0].roi.width * bpp;
+
+          src_rect = iter->items[0].roi;
+
+          src_rect.y = (orig_y + orig_height)         -
+                       (iter->items[0].roi.y - dest_rect.y) -
+                       iter->items[0].roi.height;
+
+          gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, iter->items[0].data,
+                           stride, GEGL_ABYSS_NONE);
+
+          for (x = 0; x < iter->items[0].roi.width; x++)
+            {
+              guint8 *top    = iter->items[0].data;
+              guint8 *bottom = iter->items[0].data;
+
+              top    += x * bpp;
+              bottom += x * bpp + (iter->items[0].roi.height - 1) * stride;
+
+              for (y = 0; y < iter->items[0].roi.height / 2; y++)
+                {
+                  guint8 temp[bpp];
+
+                  memcpy (temp,   top,    bpp);
+                  memcpy (top,    bottom, bpp);
+                  memcpy (bottom, temp,   bpp);
+
+                  top    += stride;
+                  bottom -= stride;
+                }
+            }
+        }
+      break;
+
+    case GIMP_ORIENTATION_UNKNOWN:
+      gegl_buffer_iterator_stop (iter);
+      break;
+    }
+
+  return new_buffer;
+}
+
+static void
+gimp_drawable_transform_rotate_point (gint              x,
+                                      gint              y,
+                                      GimpRotationType  rotate_type,
+                                      gdouble           center_x,
+                                      gdouble           center_y,
+                                      gint             *new_x,
+                                      gint             *new_y)
+{
+  g_return_if_fail (new_x != NULL);
+  g_return_if_fail (new_y != NULL);
+
+  switch (rotate_type)
+    {
+    case GIMP_ROTATE_90:
+      *new_x = RINT (center_x - (gdouble) y + center_y);
+      *new_y = RINT (center_y + (gdouble) x - center_x);
+      break;
+
+    case GIMP_ROTATE_180:
+      *new_x = RINT (center_x - ((gdouble) x - center_x));
+      *new_y = RINT (center_y - ((gdouble) y - center_y));
+      break;
+
+    case GIMP_ROTATE_270:
+      *new_x = RINT (center_x + (gdouble) y - center_y);
+      *new_y = RINT (center_y - (gdouble) x + center_x);
+      break;
+
+    default:
+      *new_x = x;
+      *new_y = y;
+      g_return_if_reached ();
+    }
+}
+
+GeglBuffer *
+gimp_drawable_transform_buffer_rotate (GimpDrawable      *drawable,
+                                       GimpContext       *context,
+                                       GeglBuffer        *orig_buffer,
+                                       gint               orig_offset_x,
+                                       gint               orig_offset_y,
+                                       GimpRotationType   rotate_type,
+                                       gdouble            center_x,
+                                       gdouble            center_y,
+                                       gboolean           clip_result,
+                                       GimpColorProfile **buffer_profile,
+                                       gint              *new_offset_x,
+                                       gint              *new_offset_y)
+{
+  const Babl    *format;
+  GeglBuffer    *new_buffer;
+  GeglRectangle  src_rect;
+  GeglRectangle  dest_rect;
+  gint           orig_x, orig_y;
+  gint           orig_width, orig_height;
+  gint           orig_bpp;
+  gint           new_x, new_y;
+  gint           new_width, new_height;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (orig_buffer), NULL);
+  g_return_val_if_fail (buffer_profile != NULL, NULL);
+  g_return_val_if_fail (new_offset_x != NULL, NULL);
+  g_return_val_if_fail (new_offset_y != NULL, NULL);
+
+  *buffer_profile =
+    gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (drawable));
+
+  orig_x      = orig_offset_x;
+  orig_y      = orig_offset_y;
+  orig_width  = gegl_buffer_get_width (orig_buffer);
+  orig_height = gegl_buffer_get_height (orig_buffer);
+  orig_bpp    = babl_format_get_bytes_per_pixel (gegl_buffer_get_format (orig_buffer));
+
+  switch (rotate_type)
+    {
+    case GIMP_ROTATE_90:
+      gimp_drawable_transform_rotate_point (orig_x,
+                                            orig_y + orig_height,
+                                            rotate_type, center_x, center_y,
+                                            &new_x, &new_y);
+      new_width  = orig_height;
+      new_height = orig_width;
+      break;
+
+    case GIMP_ROTATE_180:
+      gimp_drawable_transform_rotate_point (orig_x + orig_width,
+                                            orig_y + orig_height,
+                                            rotate_type, center_x, center_y,
+                                            &new_x, &new_y);
+      new_width  = orig_width;
+      new_height = orig_height;
+      break;
+
+    case GIMP_ROTATE_270:
+      gimp_drawable_transform_rotate_point (orig_x + orig_width,
+                                            orig_y,
+                                            rotate_type, center_x, center_y,
+                                            &new_x, &new_y);
+      new_width  = orig_height;
+      new_height = orig_width;
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+      break;
+    }
+
+  format = gegl_buffer_get_format (orig_buffer);
+
+  if (clip_result && (new_x != orig_x || new_y != orig_y ||
+                      new_width != orig_width || new_height != orig_height))
+
+    {
+      GimpRGB    bg;
+      GeglColor *color;
+      gint       clip_x, clip_y;
+      gint       clip_width, clip_height;
+
+      new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                    orig_width, orig_height),
+                                    format);
+
+      *new_offset_x = orig_x;
+      *new_offset_y = orig_y;
+
+      /*  Use transparency, rather than the bg color, as the "outside" color of
+       *  channels, and drawables with an alpha channel.
+       */
+      if (GIMP_IS_CHANNEL (drawable) || babl_format_has_alpha (format))
+        {
+          gimp_rgba_set (&bg, 0.0, 0.0, 0.0, 0.0);
+        }
+      else
+        {
+          gimp_context_get_background (context, &bg);
+          gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                             &bg, &bg);
+        }
+
+      color = gimp_gegl_color_new (&bg);
+      gegl_buffer_set_color (new_buffer, NULL, color);
+      g_object_unref (color);
+
+      if (gimp_rectangle_intersect (orig_x, orig_y, orig_width, orig_height,
+                                    new_x, new_y, new_width, new_height,
+                                    &clip_x, &clip_y,
+                                    &clip_width, &clip_height))
+        {
+          gint saved_orig_x = orig_x;
+          gint saved_orig_y = orig_y;
+
+          new_x = clip_x - orig_x;
+          new_y = clip_y - orig_y;
+
+          switch (rotate_type)
+            {
+            case GIMP_ROTATE_90:
+              gimp_drawable_transform_rotate_point (clip_x + clip_width,
+                                                    clip_y,
+                                                    GIMP_ROTATE_270,
+                                                    center_x,
+                                                    center_y,
+                                                    &orig_x,
+                                                    &orig_y);
+              orig_x      -= saved_orig_x;
+              orig_y      -= saved_orig_y;
+              orig_width   = clip_height;
+              orig_height  = clip_width;
+              break;
+
+            case GIMP_ROTATE_180:
+              orig_x      = clip_x - orig_x;
+              orig_y      = clip_y - orig_y;
+              orig_width  = clip_width;
+              orig_height = clip_height;
+              break;
+
+            case GIMP_ROTATE_270:
+              gimp_drawable_transform_rotate_point (clip_x,
+                                                    clip_y + clip_height,
+                                                    GIMP_ROTATE_90,
+                                                    center_x,
+                                                    center_y,
+                                                    &orig_x,
+                                                    &orig_y);
+              orig_x      -= saved_orig_x;
+              orig_y      -= saved_orig_y;
+              orig_width   = clip_height;
+              orig_height  = clip_width;
+              break;
+            }
+
+          new_width  = clip_width;
+          new_height = clip_height;
+        }
+      else
+        {
+          new_width  = 0;
+          new_height = 0;
+        }
+    }
+  else
+    {
+      new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                    new_width, new_height),
+                                    format);
+
+      *new_offset_x = new_x;
+      *new_offset_y = new_y;
+
+      orig_x = 0;
+      orig_y = 0;
+      new_x  = 0;
+      new_y  = 0;
+    }
+
+  if (new_width < 1 || new_height < 1)
+    return new_buffer;
+
+  src_rect.x      = orig_x;
+  src_rect.y      = orig_y;
+  src_rect.width  = orig_width;
+  src_rect.height = orig_height;
+
+  dest_rect.x      = new_x;
+  dest_rect.y      = new_y;
+  dest_rect.width  = new_width;
+  dest_rect.height = new_height;
+
+  switch (rotate_type)
+    {
+    case GIMP_ROTATE_90:
+      {
+        guchar *buf = g_new (guchar, new_height * orig_bpp);
+        gint    i;
+
+        /* Not cool, we leak memory if we return, but anyway that is
+         * never supposed to happen. If we see this warning, a bug has
+         * to be fixed!
+         */
+        g_return_val_if_fail (new_height == orig_width, NULL);
+
+        src_rect.y      = orig_y + orig_height - 1;
+        src_rect.height = 1;
+
+        dest_rect.x     = new_x;
+        dest_rect.width = 1;
+
+        for (i = 0; i < orig_height; i++)
+          {
+            src_rect.y  = orig_y + orig_height - 1 - i;
+            dest_rect.x = new_x + i;
+
+            gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, buf,
+                             GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+            gegl_buffer_set (new_buffer, &dest_rect, 0, NULL, buf,
+                             GEGL_AUTO_ROWSTRIDE);
+          }
+
+        g_free (buf);
+      }
+      break;
+
+    case GIMP_ROTATE_180:
+      {
+        guchar *buf = g_new (guchar, new_width * orig_bpp);
+        gint    i, j, k;
+
+        /* Not cool, we leak memory if we return, but anyway that is
+         * never supposed to happen. If we see this warning, a bug has
+         * to be fixed!
+         */
+        g_return_val_if_fail (new_width == orig_width, NULL);
+
+        src_rect.y      = orig_y + orig_height - 1;
+        src_rect.height = 1;
+
+        dest_rect.y      = new_y;
+        dest_rect.height = 1;
+
+        for (i = 0; i < orig_height; i++)
+          {
+            src_rect.y  = orig_y + orig_height - 1 - i;
+            dest_rect.y = new_y + i;
+
+            gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, buf,
+                             GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+            for (j = 0; j < orig_width / 2; j++)
+              {
+                guchar *left  = buf + j * orig_bpp;
+                guchar *right = buf + (orig_width - 1 - j) * orig_bpp;
+
+                for (k = 0; k < orig_bpp; k++)
+                  {
+                    guchar tmp = left[k];
+                    left[k]    = right[k];
+                    right[k]   = tmp;
+                  }
+              }
+
+            gegl_buffer_set (new_buffer, &dest_rect, 0, NULL, buf,
+                             GEGL_AUTO_ROWSTRIDE);
+          }
+
+        g_free (buf);
+      }
+      break;
+
+    case GIMP_ROTATE_270:
+      {
+        guchar *buf = g_new (guchar, new_width * orig_bpp);
+        gint    i;
+
+        /* Not cool, we leak memory if we return, but anyway that is
+         * never supposed to happen. If we see this warning, a bug has
+         * to be fixed!
+         */
+        g_return_val_if_fail (new_width == orig_height, NULL);
+
+        src_rect.x     = orig_x + orig_width - 1;
+        src_rect.width = 1;
+
+        dest_rect.y      = new_y;
+        dest_rect.height = 1;
+
+        for (i = 0; i < orig_width; i++)
+          {
+            src_rect.x  = orig_x + orig_width - 1 - i;
+            dest_rect.y = new_y + i;
+
+            gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, buf,
+                             GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+            gegl_buffer_set (new_buffer, &dest_rect, 0, NULL, buf,
+                             GEGL_AUTO_ROWSTRIDE);
+          }
+
+        g_free (buf);
+      }
+      break;
+    }
+
+  return new_buffer;
+}
+
+GimpDrawable *
+gimp_drawable_transform_affine (GimpDrawable           *drawable,
+                                GimpContext            *context,
+                                const GimpMatrix3      *matrix,
+                                GimpTransformDirection  direction,
+                                GimpInterpolationType   interpolation_type,
+                                GimpTransformResize     clip_result,
+                                GimpProgress           *progress)
+{
+  GimpImage    *image;
+  GeglBuffer   *orig_buffer;
+  gint          orig_offset_x;
+  gint          orig_offset_y;
+  gboolean      new_layer;
+  GimpDrawable *result = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (matrix != NULL, NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  /* Start a transform undo group */
+  gimp_image_undo_group_start (image,
+                               GIMP_UNDO_GROUP_TRANSFORM,
+                               C_("undo-type", "Transform"));
+
+  /* Cut/Copy from the specified drawable */
+  orig_buffer = gimp_drawable_transform_cut (drawable, context,
+                                             &orig_offset_x, &orig_offset_y,
+                                             &new_layer);
+
+  if (orig_buffer)
+    {
+      GeglBuffer       *new_buffer;
+      gint              new_offset_x;
+      gint              new_offset_y;
+      GimpColorProfile *profile;
+
+      /*  also transform the mask if we are transforming an entire layer  */
+      if (GIMP_IS_LAYER (drawable) &&
+          gimp_layer_get_mask (GIMP_LAYER (drawable)) &&
+          gimp_channel_is_empty (gimp_image_get_mask (image)))
+        {
+          GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (drawable));
+
+          gimp_item_transform (GIMP_ITEM (mask), context,
+                               matrix,
+                               direction,
+                               interpolation_type,
+                               clip_result,
+                               progress);
+        }
+
+      /* transform the buffer */
+      new_buffer = gimp_drawable_transform_buffer_affine (drawable, context,
+                                                          orig_buffer,
+                                                          orig_offset_x,
+                                                          orig_offset_y,
+                                                          matrix,
+                                                          direction,
+                                                          interpolation_type,
+                                                          clip_result,
+                                                          &profile,
+                                                          &new_offset_x,
+                                                          &new_offset_y,
+                                                          progress);
+
+      /* Free the cut/copied buffer */
+      g_object_unref (orig_buffer);
+
+      if (new_buffer)
+        {
+          result = gimp_drawable_transform_paste (drawable, new_buffer, profile,
+                                                  new_offset_x, new_offset_y,
+                                                  new_layer);
+          g_object_unref (new_buffer);
+        }
+    }
+
+  /*  push the undo group end  */
+  gimp_image_undo_group_end (image);
+
+  return result;
+}
+
+GimpDrawable *
+gimp_drawable_transform_flip (GimpDrawable        *drawable,
+                              GimpContext         *context,
+                              GimpOrientationType  flip_type,
+                              gdouble              axis,
+                              gboolean             clip_result)
+{
+  GimpImage    *image;
+  GeglBuffer   *orig_buffer;
+  gint          orig_offset_x;
+  gint          orig_offset_y;
+  gboolean      new_layer;
+  GimpDrawable *result = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  /* Start a transform undo group */
+  gimp_image_undo_group_start (image,
+                               GIMP_UNDO_GROUP_TRANSFORM,
+                               C_("undo-type", "Flip"));
+
+  /* Cut/Copy from the specified drawable */
+  orig_buffer = gimp_drawable_transform_cut (drawable, context,
+                                             &orig_offset_x, &orig_offset_y,
+                                             &new_layer);
+
+  if (orig_buffer)
+    {
+      GeglBuffer       *new_buffer;
+      gint              new_offset_x;
+      gint              new_offset_y;
+      GimpColorProfile *profile;
+
+      /*  also transform the mask if we are transforming an entire layer  */
+      if (GIMP_IS_LAYER (drawable) &&
+          gimp_layer_get_mask (GIMP_LAYER (drawable)) &&
+          gimp_channel_is_empty (gimp_image_get_mask (image)))
+        {
+          GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (drawable));
+
+          gimp_item_flip (GIMP_ITEM (mask), context,
+                          flip_type,
+                          axis,
+                          clip_result);
+        }
+
+      /* transform the buffer */
+      new_buffer = gimp_drawable_transform_buffer_flip (drawable, context,
+                                                        orig_buffer,
+                                                        orig_offset_x,
+                                                        orig_offset_y,
+                                                        flip_type, axis,
+                                                        clip_result,
+                                                        &profile,
+                                                        &new_offset_x,
+                                                        &new_offset_y);
+
+      /* Free the cut/copied buffer */
+      g_object_unref (orig_buffer);
+
+      if (new_buffer)
+        {
+          result = gimp_drawable_transform_paste (drawable, new_buffer, profile,
+                                                  new_offset_x, new_offset_y,
+                                                  new_layer);
+          g_object_unref (new_buffer);
+        }
+    }
+
+  /*  push the undo group end  */
+  gimp_image_undo_group_end (image);
+
+  return result;
+}
+
+GimpDrawable *
+gimp_drawable_transform_rotate (GimpDrawable     *drawable,
+                                GimpContext      *context,
+                                GimpRotationType  rotate_type,
+                                gdouble           center_x,
+                                gdouble           center_y,
+                                gboolean          clip_result)
+{
+  GimpImage    *image;
+  GeglBuffer   *orig_buffer;
+  gint          orig_offset_x;
+  gint          orig_offset_y;
+  gboolean      new_layer;
+  GimpDrawable *result = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  /* Start a transform undo group */
+  gimp_image_undo_group_start (image,
+                               GIMP_UNDO_GROUP_TRANSFORM,
+                               C_("undo-type", "Rotate"));
+
+  /* Cut/Copy from the specified drawable */
+  orig_buffer = gimp_drawable_transform_cut (drawable, context,
+                                             &orig_offset_x, &orig_offset_y,
+                                             &new_layer);
+
+  if (orig_buffer)
+    {
+      GeglBuffer       *new_buffer;
+      gint              new_offset_x;
+      gint              new_offset_y;
+      GimpColorProfile *profile;
+
+      /*  also transform the mask if we are transforming an entire layer  */
+      if (GIMP_IS_LAYER (drawable) &&
+          gimp_layer_get_mask (GIMP_LAYER (drawable)) &&
+          gimp_channel_is_empty (gimp_image_get_mask (image)))
+        {
+          GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (drawable));
+
+          gimp_item_rotate (GIMP_ITEM (mask), context,
+                            rotate_type,
+                            center_x,
+                            center_y,
+                            clip_result);
+        }
+
+      /* transform the buffer */
+      new_buffer = gimp_drawable_transform_buffer_rotate (drawable, context,
+                                                          orig_buffer,
+                                                          orig_offset_x,
+                                                          orig_offset_y,
+                                                          rotate_type,
+                                                          center_x, center_y,
+                                                          clip_result,
+                                                          &profile,
+                                                          &new_offset_x,
+                                                          &new_offset_y);
+
+      /* Free the cut/copied buffer */
+      g_object_unref (orig_buffer);
+
+      if (new_buffer)
+        {
+          result = gimp_drawable_transform_paste (drawable, new_buffer, profile,
+                                                  new_offset_x, new_offset_y,
+                                                  new_layer);
+          g_object_unref (new_buffer);
+        }
+    }
+
+  /*  push the undo group end  */
+  gimp_image_undo_group_end (image);
+
+  return result;
+}
+
+GeglBuffer *
+gimp_drawable_transform_cut (GimpDrawable *drawable,
+                             GimpContext  *context,
+                             gint         *offset_x,
+                             gint         *offset_y,
+                             gboolean     *new_layer)
+{
+  GimpImage  *image;
+  GeglBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (offset_x != NULL, NULL);
+  g_return_val_if_fail (offset_y != NULL, NULL);
+  g_return_val_if_fail (new_layer != NULL, NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  /*  extract the selected mask if there is a selection  */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      gint x, y, w, h;
+
+      /* set the keep_indexed flag to FALSE here, since we use
+       * gimp_layer_new_from_gegl_buffer() later which assumes that
+       * the buffer are either RGB or GRAY.  Eeek!!!  (Sven)
+       */
+      if (gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &w, &h))
+        {
+          buffer = gimp_selection_extract (GIMP_SELECTION (gimp_image_get_mask (image)),
+                                           GIMP_PICKABLE (drawable),
+                                           context,
+                                           TRUE, FALSE, TRUE,
+                                           offset_x, offset_y,
+                                           NULL);
+          /*  clear the selection  */
+          gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
+
+          *new_layer = TRUE;
+        }
+      else
+        {
+          buffer = NULL;
+          *new_layer = FALSE;
+        }
+    }
+  else  /*  otherwise, just copy the layer  */
+    {
+      buffer = gimp_selection_extract (GIMP_SELECTION (gimp_image_get_mask (image)),
+                                       GIMP_PICKABLE (drawable),
+                                       context,
+                                       FALSE, TRUE, GIMP_IS_LAYER (drawable),
+                                       offset_x, offset_y,
+                                       NULL);
+
+      *new_layer = FALSE;
+    }
+
+  return buffer;
+}
+
+GimpDrawable *
+gimp_drawable_transform_paste (GimpDrawable     *drawable,
+                               GeglBuffer       *buffer,
+                               GimpColorProfile *buffer_profile,
+                               gint              offset_x,
+                               gint              offset_y,
+                               gboolean          new_layer)
+{
+  GimpImage   *image;
+  GimpLayer   *layer     = NULL;
+  const gchar *undo_desc = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (GIMP_IS_COLOR_PROFILE (buffer_profile), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  if (GIMP_IS_LAYER (drawable))
+    undo_desc = C_("undo-type", "Transform Layer");
+  else if (GIMP_IS_CHANNEL (drawable))
+    undo_desc = C_("undo-type", "Transform Channel");
+  else
+    return NULL;
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE, undo_desc);
+
+  if (new_layer)
+    {
+      layer =
+        gimp_layer_new_from_gegl_buffer (buffer, image,
+                                         gimp_drawable_get_format_with_alpha (drawable),
+                                         _("Transformation"),
+                                         GIMP_OPACITY_OPAQUE,
+                                         gimp_image_get_default_new_layer_mode (image),
+                                         buffer_profile);
+
+      gimp_item_set_offset (GIMP_ITEM (layer), offset_x, offset_y);
+
+      floating_sel_attach (layer, drawable);
+
+      drawable = GIMP_DRAWABLE (layer);
+    }
+  else
+    {
+      gimp_drawable_set_buffer_full (drawable, TRUE, NULL,
+                                     buffer,
+                                     GEGL_RECTANGLE (offset_x, offset_y, 0, 0),
+                                     TRUE);
+    }
+
+  gimp_image_undo_group_end (image);
+
+  return drawable;
+}
diff --git a/app/core/gimpdrawable-transform.h b/app/core/gimpdrawable-transform.h
new file mode 100644
index 0000000..8cdd53f
--- /dev/null
+++ b/app/core/gimpdrawable-transform.h
@@ -0,0 +1,94 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_TRANSFORM_H__
+#define __GIMP_DRAWABLE_TRANSFORM_H__
+
+
+GeglBuffer          * gimp_drawable_transform_buffer_affine      (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  GeglBuffer              *orig_buffer,
+                                                                  gint                     orig_offset_x,
+                                                                  gint                     orig_offset_y,
+                                                                  const GimpMatrix3       *matrix,
+                                                                  GimpTransformDirection   direction,
+                                                                  GimpInterpolationType    interpolation_type,
+                                                                  GimpTransformResize      clip_result,
+                                                                  GimpColorProfile       **buffer_profile,
+                                                                  gint                    *new_offset_x,
+                                                                  gint                    *new_offset_y,
+                                                                  GimpProgress            *progress);
+GeglBuffer          * gimp_drawable_transform_buffer_flip        (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  GeglBuffer              *orig_buffer,
+                                                                  gint                     orig_offset_x,
+                                                                  gint                     orig_offset_y,
+                                                                  GimpOrientationType      flip_type,
+                                                                  gdouble                  axis,
+                                                                  gboolean                 clip_result,
+                                                                  GimpColorProfile       **buffer_profile,
+                                                                  gint                    *new_offset_x,
+                                                                  gint                    *new_offset_y);
+
+GeglBuffer          * gimp_drawable_transform_buffer_rotate      (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  GeglBuffer              *buffer,
+                                                                  gint                     orig_offset_x,
+                                                                  gint                     orig_offset_y,
+                                                                  GimpRotationType         rotate_type,
+                                                                  gdouble                  center_x,
+                                                                  gdouble                  center_y,
+                                                                  gboolean                 clip_result,
+                                                                  GimpColorProfile       **buffer_profile,
+                                                                  gint                    *new_offset_x,
+                                                                  gint                    *new_offset_y);
+
+GimpDrawable         * gimp_drawable_transform_affine            (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  const GimpMatrix3       *matrix,
+                                                                  GimpTransformDirection   direction,
+                                                                  GimpInterpolationType    interpolation_type,
+                                                                  GimpTransformResize      clip_result,
+                                                                  GimpProgress            *progress);
+
+GimpDrawable         * gimp_drawable_transform_flip              (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  GimpOrientationType      flip_type,
+                                                                  gdouble                  axis,
+                                                                  gboolean                 clip_result);
+
+GimpDrawable         * gimp_drawable_transform_rotate            (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  GimpRotationType         rotate_type,
+                                                                  gdouble                  center_x,
+                                                                  gdouble                  center_y,
+                                                                  gboolean                 clip_result);
+
+GeglBuffer           * gimp_drawable_transform_cut               (GimpDrawable            *drawable,
+                                                                  GimpContext             *context,
+                                                                  gint                    *offset_x,
+                                                                  gint                    *offset_y,
+                                                                  gboolean                *new_layer);
+GimpDrawable         * gimp_drawable_transform_paste             (GimpDrawable            *drawable,
+                                                                  GeglBuffer              *buffer,
+                                                                  GimpColorProfile        *buffer_profile,
+                                                                  gint                     offset_x,
+                                                                  gint                     offset_y,
+                                                                  gboolean                 new_layer);
+
+
+#endif  /*  __GIMP_DRAWABLE_TRANSFORM_H__  */
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
new file mode 100644
index 0000000..9a85eee
--- /dev/null
+++ b/app/core/gimpdrawable.c
@@ -0,0 +1,1916 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp-memsize.h"
+#include "gimp-utils.h"
+#include "gimpchannel.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-combine.h"
+#include "gimpdrawable-fill.h"
+#include "gimpdrawable-floating-selection.h"
+#include "gimpdrawable-preview.h"
+#include "gimpdrawable-private.h"
+#include "gimpdrawable-shadow.h"
+#include "gimpdrawable-transform.h"
+#include "gimpfilterstack.h"
+#include "gimpimage.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-undo-push.h"
+#include "gimpmarshal.h"
+#include "gimppickable.h"
+#include "gimpprogress.h"
+
+#include "gimp-log.h"
+
+#include "gimp-intl.h"
+
+
+#define PAINT_UPDATE_CHUNK_WIDTH  32
+#define PAINT_UPDATE_CHUNK_HEIGHT 32
+
+
+enum
+{
+  UPDATE,
+  FORMAT_CHANGED,
+  ALPHA_CHANGED,
+  BOUNDING_BOX_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_BUFFER
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_color_managed_iface_init    (GimpColorManagedInterface *iface);
+static void       gimp_pickable_iface_init         (GimpPickableInterface     *iface);
+
+static void       gimp_drawable_dispose            (GObject           *object);
+static void       gimp_drawable_finalize           (GObject           *object);
+static void       gimp_drawable_set_property       (GObject           *object,
+                                                    guint              property_id,
+                                                    const GValue      *value,
+                                                    GParamSpec        *pspec);
+static void       gimp_drawable_get_property       (GObject           *object,
+                                                    guint              property_id,
+                                                    GValue            *value,
+                                                    GParamSpec        *pspec);
+
+static gint64     gimp_drawable_get_memsize        (GimpObject        *object,
+                                                    gint64            *gui_size);
+
+static gboolean   gimp_drawable_get_size           (GimpViewable      *viewable,
+                                                    gint              *width,
+                                                    gint              *height);
+static void       gimp_drawable_preview_freeze     (GimpViewable      *viewable);
+static void       gimp_drawable_preview_thaw       (GimpViewable      *viewable);
+
+static GeglNode * gimp_drawable_get_node           (GimpFilter        *filter);
+
+static void       gimp_drawable_removed            (GimpItem          *item);
+static GimpItem * gimp_drawable_duplicate          (GimpItem          *item,
+                                                    GType              new_type);
+static void       gimp_drawable_scale              (GimpItem          *item,
+                                                    gint               new_width,
+                                                    gint               new_height,
+                                                    gint               new_offset_x,
+                                                    gint               new_offset_y,
+                                                    GimpInterpolationType interp_type,
+                                                    GimpProgress      *progress);
+static void       gimp_drawable_resize             (GimpItem          *item,
+                                                    GimpContext       *context,
+                                                    GimpFillType       fill_type,
+                                                    gint               new_width,
+                                                    gint               new_height,
+                                                    gint               offset_x,
+                                                    gint               offset_y);
+static void       gimp_drawable_flip               (GimpItem          *item,
+                                                    GimpContext       *context,
+                                                    GimpOrientationType  flip_type,
+                                                    gdouble            axis,
+                                                    gboolean           clip_result);
+static void       gimp_drawable_rotate             (GimpItem          *item,
+                                                    GimpContext       *context,
+                                                    GimpRotationType   rotate_type,
+                                                    gdouble            center_x,
+                                                    gdouble            center_y,
+                                                    gboolean           clip_result);
+static void       gimp_drawable_transform          (GimpItem          *item,
+                                                    GimpContext       *context,
+                                                    const GimpMatrix3 *matrix,
+                                                    GimpTransformDirection direction,
+                                                    GimpInterpolationType interpolation_type,
+                                                    GimpTransformResize clip_result,
+                                                    GimpProgress      *progress);
+
+static const guint8 *
+                  gimp_drawable_get_icc_profile    (GimpColorManaged  *managed,
+                                                    gsize             *len);
+static GimpColorProfile *
+                  gimp_drawable_get_color_profile  (GimpColorManaged  *managed);
+static void       gimp_drawable_profile_changed    (GimpColorManaged  *managed);
+
+static gboolean   gimp_drawable_get_pixel_at       (GimpPickable      *pickable,
+                                                    gint               x,
+                                                    gint               y,
+                                                    const Babl        *format,
+                                                    gpointer           pixel);
+static void       gimp_drawable_get_pixel_average  (GimpPickable      *pickable,
+                                                    const GeglRectangle *rect,
+                                                    const Babl        *format,
+                                                    gpointer           pixel);
+
+static void       gimp_drawable_real_update        (GimpDrawable      *drawable,
+                                                    gint               x,
+                                                    gint               y,
+                                                    gint               width,
+                                                    gint               height);
+
+static gint64  gimp_drawable_real_estimate_memsize (GimpDrawable      *drawable,
+                                                    GimpComponentType  component_type,
+                                                    gint               width,
+                                                    gint               height);
+
+static void       gimp_drawable_real_update_all    (GimpDrawable      *drawable);
+
+static GimpComponentMask
+                gimp_drawable_real_get_active_mask (GimpDrawable      *drawable);
+
+static gboolean   gimp_drawable_real_supports_alpha
+                                                   (GimpDrawable     *drawable);
+
+static void       gimp_drawable_real_convert_type  (GimpDrawable      *drawable,
+                                                    GimpImage         *dest_image,
+                                                    const Babl        *new_format,
+                                                    GimpColorProfile  *dest_profile,
+                                                    GeglDitherMethod   layer_dither_type,
+                                                    GeglDitherMethod   mask_dither_type,
+                                                    gboolean           push_undo,
+                                                    GimpProgress      *progress);
+
+static GeglBuffer * gimp_drawable_real_get_buffer  (GimpDrawable      *drawable);
+static void       gimp_drawable_real_set_buffer    (GimpDrawable      *drawable,
+                                                    gboolean           push_undo,
+                                                    const gchar       *undo_desc,
+                                                    GeglBuffer        *buffer,
+                                                    const GeglRectangle *bounds);
+
+static GeglRectangle gimp_drawable_real_get_bounding_box
+                                                   (GimpDrawable      *drawable);
+
+static void       gimp_drawable_real_push_undo     (GimpDrawable      *drawable,
+                                                    const gchar       *undo_desc,
+                                                    GeglBuffer        *buffer,
+                                                    gint               x,
+                                                    gint               y,
+                                                    gint               width,
+                                                    gint               height);
+static void       gimp_drawable_real_swap_pixels   (GimpDrawable      *drawable,
+                                                    GeglBuffer        *buffer,
+                                                    gint               x,
+                                                    gint               y);
+static GeglNode * gimp_drawable_real_get_source_node (GimpDrawable    *drawable);
+
+static void       gimp_drawable_format_changed     (GimpDrawable      *drawable);
+static void       gimp_drawable_alpha_changed      (GimpDrawable      *drawable);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDrawable, gimp_drawable, GIMP_TYPE_ITEM,
+                         G_ADD_PRIVATE (GimpDrawable)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
+                                                gimp_color_managed_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_pickable_iface_init))
+
+#define parent_class gimp_drawable_parent_class
+
+static guint gimp_drawable_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_drawable_class_init (GimpDrawableClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpFilterClass   *filter_class      = GIMP_FILTER_CLASS (klass);
+  GimpItemClass     *item_class        = GIMP_ITEM_CLASS (klass);
+
+  gimp_drawable_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDrawableClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT_INT_INT,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  gimp_drawable_signals[FORMAT_CHANGED] =
+    g_signal_new ("format-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDrawableClass, format_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_drawable_signals[ALPHA_CHANGED] =
+    g_signal_new ("alpha-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDrawableClass, alpha_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_drawable_signals[BOUNDING_BOX_CHANGED] =
+    g_signal_new ("bounding-box-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDrawableClass, bounding_box_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose           = gimp_drawable_dispose;
+  object_class->finalize          = gimp_drawable_finalize;
+  object_class->set_property      = gimp_drawable_set_property;
+  object_class->get_property      = gimp_drawable_get_property;
+
+  gimp_object_class->get_memsize  = gimp_drawable_get_memsize;
+
+  viewable_class->get_size        = gimp_drawable_get_size;
+  viewable_class->get_new_preview = gimp_drawable_get_new_preview;
+  viewable_class->get_new_pixbuf  = gimp_drawable_get_new_pixbuf;
+  viewable_class->preview_freeze  = gimp_drawable_preview_freeze;
+  viewable_class->preview_thaw    = gimp_drawable_preview_thaw;
+
+  filter_class->get_node          = gimp_drawable_get_node;
+
+  item_class->removed             = gimp_drawable_removed;
+  item_class->duplicate           = gimp_drawable_duplicate;
+  item_class->scale               = gimp_drawable_scale;
+  item_class->resize              = gimp_drawable_resize;
+  item_class->flip                = gimp_drawable_flip;
+  item_class->rotate              = gimp_drawable_rotate;
+  item_class->transform           = gimp_drawable_transform;
+
+  klass->update                   = gimp_drawable_real_update;
+  klass->format_changed           = NULL;
+  klass->alpha_changed            = NULL;
+  klass->bounding_box_changed     = NULL;
+  klass->estimate_memsize         = gimp_drawable_real_estimate_memsize;
+  klass->update_all               = gimp_drawable_real_update_all;
+  klass->invalidate_boundary      = NULL;
+  klass->get_active_components    = NULL;
+  klass->get_active_mask          = gimp_drawable_real_get_active_mask;
+  klass->supports_alpha           = gimp_drawable_real_supports_alpha;
+  klass->convert_type             = gimp_drawable_real_convert_type;
+  klass->apply_buffer             = gimp_drawable_real_apply_buffer;
+  klass->get_buffer               = gimp_drawable_real_get_buffer;
+  klass->set_buffer               = gimp_drawable_real_set_buffer;
+  klass->get_bounding_box         = gimp_drawable_real_get_bounding_box;
+  klass->push_undo                = gimp_drawable_real_push_undo;
+  klass->swap_pixels              = gimp_drawable_real_swap_pixels;
+  klass->get_source_node          = gimp_drawable_real_get_source_node;
+
+  g_object_class_override_property (object_class, PROP_BUFFER, "buffer");
+}
+
+static void
+gimp_drawable_init (GimpDrawable *drawable)
+{
+  drawable->private = gimp_drawable_get_instance_private (drawable);
+
+  drawable->private->filter_stack = gimp_filter_stack_new (GIMP_TYPE_FILTER);
+}
+
+/* sorry for the evil casts */
+
+static void
+gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
+{
+  iface->get_icc_profile   = gimp_drawable_get_icc_profile;
+  iface->get_color_profile = gimp_drawable_get_color_profile;
+  iface->profile_changed   = gimp_drawable_profile_changed;
+}
+
+static void
+gimp_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->get_image             = (GimpImage     * (*) (GimpPickable *pickable)) gimp_item_get_image;
+  iface->get_format            = (const Babl    * (*) (GimpPickable *pickable)) gimp_drawable_get_format;
+  iface->get_format_with_alpha = (const Babl    * (*) (GimpPickable *pickable)) gimp_drawable_get_format_with_alpha;
+  iface->get_buffer            = (GeglBuffer    * (*) (GimpPickable *pickable)) gimp_drawable_get_buffer;
+  iface->get_pixel_at          = gimp_drawable_get_pixel_at;
+  iface->get_pixel_average     = gimp_drawable_get_pixel_average;
+}
+
+static void
+gimp_drawable_dispose (GObject *object)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (object);
+
+  if (gimp_drawable_get_floating_sel (drawable))
+    gimp_drawable_detach_floating_sel (drawable);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_drawable_finalize (GObject *object)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (object);
+
+  while (drawable->private->paint_count)
+    gimp_drawable_end_paint (drawable);
+
+  g_clear_object (&drawable->private->buffer);
+
+  gimp_drawable_free_shadow_buffer (drawable);
+
+  g_clear_object (&drawable->private->source_node);
+  g_clear_object (&drawable->private->buffer_source_node);
+  g_clear_object (&drawable->private->filter_stack);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_drawable_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_drawable_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      g_value_set_object (value, drawable->private->buffer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_drawable_get_memsize (GimpObject *object,
+                           gint64     *gui_size)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (object);
+  gint64        memsize  = 0;
+
+  memsize += gimp_gegl_buffer_get_memsize (gimp_drawable_get_buffer (drawable));
+  memsize += gimp_gegl_buffer_get_memsize (drawable->private->shadow);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_drawable_get_size (GimpViewable *viewable,
+                        gint         *width,
+                        gint         *height)
+{
+  GimpItem *item = GIMP_ITEM (viewable);
+
+  *width  = gimp_item_get_width  (item);
+  *height = gimp_item_get_height (item);
+
+  return TRUE;
+}
+
+static void
+gimp_drawable_preview_freeze (GimpViewable *viewable)
+{
+  GimpViewable *parent = gimp_viewable_get_parent (viewable);
+
+  if (! parent && gimp_item_is_attached (GIMP_ITEM (viewable)))
+    parent = GIMP_VIEWABLE (gimp_item_get_image (GIMP_ITEM (viewable)));
+
+  if (parent)
+    gimp_viewable_preview_freeze (parent);
+}
+
+static void
+gimp_drawable_preview_thaw (GimpViewable *viewable)
+{
+  GimpViewable *parent = gimp_viewable_get_parent (viewable);
+
+  if (! parent && gimp_item_is_attached (GIMP_ITEM (viewable)))
+    parent = GIMP_VIEWABLE (gimp_item_get_image (GIMP_ITEM (viewable)));
+
+  if (parent)
+    gimp_viewable_preview_thaw (parent);
+}
+
+static GeglNode *
+gimp_drawable_get_node (GimpFilter *filter)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (filter);
+  GeglNode     *node;
+  GeglNode     *input;
+  GeglNode     *output;
+
+  node = GIMP_FILTER_CLASS (parent_class)->get_node (filter);
+
+  g_warn_if_fail (drawable->private->mode_node == NULL);
+
+  drawable->private->mode_node =
+    gegl_node_new_child (node,
+                         "operation", "gimp:normal",
+                         NULL);
+
+  input  = gegl_node_get_input_proxy  (node, "input");
+  output = gegl_node_get_output_proxy (node, "output");
+
+  gegl_node_connect_to (input,                        "output",
+                        drawable->private->mode_node, "input");
+  gegl_node_connect_to (drawable->private->mode_node, "output",
+                        output,                       "input");
+
+  return node;
+}
+
+static void
+gimp_drawable_removed (GimpItem *item)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (item);
+
+  gimp_drawable_free_shadow_buffer (drawable);
+
+  if (GIMP_ITEM_CLASS (parent_class)->removed)
+    GIMP_ITEM_CLASS (parent_class)->removed (item);
+}
+
+static GimpItem *
+gimp_drawable_duplicate (GimpItem *item,
+                         GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  if (GIMP_IS_DRAWABLE (new_item))
+    {
+      GimpDrawable  *drawable     = GIMP_DRAWABLE (item);
+      GimpDrawable  *new_drawable = GIMP_DRAWABLE (new_item);
+      GeglBuffer    *new_buffer;
+
+      new_buffer = gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
+
+      gimp_drawable_set_buffer (new_drawable, FALSE, NULL, new_buffer);
+      g_object_unref (new_buffer);
+    }
+
+  return new_item;
+}
+
+static void
+gimp_drawable_scale (GimpItem              *item,
+                     gint                   new_width,
+                     gint                   new_height,
+                     gint                   new_offset_x,
+                     gint                   new_offset_y,
+                     GimpInterpolationType  interpolation_type,
+                     GimpProgress          *progress)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (item);
+  GeglBuffer   *new_buffer;
+
+  new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                new_width, new_height),
+                                gimp_drawable_get_format (drawable));
+
+  gimp_gegl_apply_scale (gimp_drawable_get_buffer (drawable),
+                         progress, C_("undo-type", "Scale"),
+                         new_buffer,
+                         interpolation_type,
+                         ((gdouble) new_width /
+                          gimp_item_get_width  (item)),
+                         ((gdouble) new_height /
+                          gimp_item_get_height (item)));
+
+  gimp_drawable_set_buffer_full (drawable, gimp_item_is_attached (item), NULL,
+                                 new_buffer,
+                                 GEGL_RECTANGLE (new_offset_x, new_offset_y,
+                                                 0,            0),
+                                 TRUE);
+  g_object_unref (new_buffer);
+}
+
+static void
+gimp_drawable_resize (GimpItem     *item,
+                      GimpContext  *context,
+                      GimpFillType  fill_type,
+                      gint          new_width,
+                      gint          new_height,
+                      gint          offset_x,
+                      gint          offset_y)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (item);
+  GeglBuffer   *new_buffer;
+  gint          new_offset_x;
+  gint          new_offset_y;
+  gint          copy_x, copy_y;
+  gint          copy_width, copy_height;
+  gboolean      intersect;
+
+  /*  if the size doesn't change, this is a nop  */
+  if (new_width  == gimp_item_get_width  (item) &&
+      new_height == gimp_item_get_height (item) &&
+      offset_x   == 0                           &&
+      offset_y   == 0)
+    return;
+
+  new_offset_x = gimp_item_get_offset_x (item) - offset_x;
+  new_offset_y = gimp_item_get_offset_y (item) - offset_y;
+
+  intersect = gimp_rectangle_intersect (gimp_item_get_offset_x (item),
+                                        gimp_item_get_offset_y (item),
+                                        gimp_item_get_width (item),
+                                        gimp_item_get_height (item),
+                                        new_offset_x,
+                                        new_offset_y,
+                                        new_width,
+                                        new_height,
+                                        &copy_x,
+                                        &copy_y,
+                                        &copy_width,
+                                        &copy_height);
+
+  new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                new_width, new_height),
+                                gimp_drawable_get_format (drawable));
+
+  if (! intersect              ||
+      copy_width  != new_width ||
+      copy_height != new_height)
+    {
+      /*  Clear the new buffer if needed  */
+
+      GimpRGB      color;
+      GimpPattern *pattern;
+
+      gimp_get_fill_params (context, fill_type, &color, &pattern, NULL);
+      gimp_drawable_fill_buffer (drawable, new_buffer,
+                                 &color, pattern, 0, 0);
+    }
+
+  if (intersect && copy_width && copy_height)
+    {
+      /*  Copy the pixels in the intersection  */
+      gimp_gegl_buffer_copy (
+        gimp_drawable_get_buffer (drawable),
+        GEGL_RECTANGLE (copy_x - gimp_item_get_offset_x (item),
+                        copy_y - gimp_item_get_offset_y (item),
+                        copy_width,
+                        copy_height), GEGL_ABYSS_NONE,
+        new_buffer,
+        GEGL_RECTANGLE (copy_x - new_offset_x,
+                        copy_y - new_offset_y, 0, 0));
+    }
+
+  gimp_drawable_set_buffer_full (drawable, gimp_item_is_attached (item), NULL,
+                                 new_buffer,
+                                 GEGL_RECTANGLE (new_offset_x, new_offset_y,
+                                                 0,            0),
+                                 TRUE);
+  g_object_unref (new_buffer);
+}
+
+static void
+gimp_drawable_flip (GimpItem            *item,
+                    GimpContext         *context,
+                    GimpOrientationType  flip_type,
+                    gdouble              axis,
+                    gboolean             clip_result)
+{
+  GimpDrawable     *drawable = GIMP_DRAWABLE (item);
+  GeglBuffer       *buffer;
+  GimpColorProfile *buffer_profile;
+  gint              off_x, off_y;
+  gint              new_off_x, new_off_y;
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  buffer = gimp_drawable_transform_buffer_flip (drawable, context,
+                                                gimp_drawable_get_buffer (drawable),
+                                                off_x, off_y,
+                                                flip_type, axis,
+                                                clip_result,
+                                                &buffer_profile,
+                                                &new_off_x, &new_off_y);
+
+  if (buffer)
+    {
+      gimp_drawable_transform_paste (drawable, buffer, buffer_profile,
+                                     new_off_x, new_off_y, FALSE);
+      g_object_unref (buffer);
+    }
+}
+
+static void
+gimp_drawable_rotate (GimpItem         *item,
+                      GimpContext      *context,
+                      GimpRotationType  rotate_type,
+                      gdouble           center_x,
+                      gdouble           center_y,
+                      gboolean          clip_result)
+{
+  GimpDrawable     *drawable = GIMP_DRAWABLE (item);
+  GeglBuffer       *buffer;
+  GimpColorProfile *buffer_profile;
+  gint              off_x, off_y;
+  gint              new_off_x, new_off_y;
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  buffer = gimp_drawable_transform_buffer_rotate (drawable, context,
+                                                  gimp_drawable_get_buffer (drawable),
+                                                  off_x, off_y,
+                                                  rotate_type, center_x, center_y,
+                                                  clip_result,
+                                                  &buffer_profile,
+                                                  &new_off_x, &new_off_y);
+
+  if (buffer)
+    {
+      gimp_drawable_transform_paste (drawable, buffer, buffer_profile,
+                                     new_off_x, new_off_y, FALSE);
+      g_object_unref (buffer);
+    }
+}
+
+static void
+gimp_drawable_transform (GimpItem               *item,
+                         GimpContext            *context,
+                         const GimpMatrix3      *matrix,
+                         GimpTransformDirection  direction,
+                         GimpInterpolationType   interpolation_type,
+                         GimpTransformResize     clip_result,
+                         GimpProgress           *progress)
+{
+  GimpDrawable     *drawable = GIMP_DRAWABLE (item);
+  GeglBuffer       *buffer;
+  GimpColorProfile *buffer_profile;
+  gint              off_x, off_y;
+  gint              new_off_x, new_off_y;
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  buffer = gimp_drawable_transform_buffer_affine (drawable, context,
+                                                  gimp_drawable_get_buffer (drawable),
+                                                  off_x, off_y,
+                                                  matrix, direction,
+                                                  interpolation_type,
+                                                  clip_result,
+                                                  &buffer_profile,
+                                                  &new_off_x, &new_off_y,
+                                                  progress);
+
+  if (buffer)
+    {
+      gimp_drawable_transform_paste (drawable, buffer, buffer_profile,
+                                     new_off_x, new_off_y, FALSE);
+      g_object_unref (buffer);
+    }
+}
+
+static const guint8 *
+gimp_drawable_get_icc_profile (GimpColorManaged *managed,
+                               gsize            *len)
+{
+  GimpColorProfile *profile = gimp_color_managed_get_color_profile (managed);
+
+  return gimp_color_profile_get_icc_profile (profile, len);
+}
+
+static GimpColorProfile *
+gimp_drawable_get_color_profile (GimpColorManaged *managed)
+{
+  const Babl *format = gimp_drawable_get_format (GIMP_DRAWABLE (managed));
+
+  return gimp_babl_format_get_color_profile (format);
+}
+
+static void
+gimp_drawable_profile_changed (GimpColorManaged *managed)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (managed));
+}
+
+static gboolean
+gimp_drawable_get_pixel_at (GimpPickable *pickable,
+                            gint          x,
+                            gint          y,
+                            const Babl   *format,
+                            gpointer      pixel)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (pickable);
+
+  /* do not make this a g_return_if_fail() */
+  if (x < 0 || x >= gimp_item_get_width  (GIMP_ITEM (drawable)) ||
+      y < 0 || y >= gimp_item_get_height (GIMP_ITEM (drawable)))
+    return FALSE;
+
+  gegl_buffer_sample (gimp_drawable_get_buffer (drawable),
+                      x, y, NULL, pixel, format,
+                      GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+  return TRUE;
+}
+
+static void
+gimp_drawable_get_pixel_average (GimpPickable        *pickable,
+                                 const GeglRectangle *rect,
+                                 const Babl          *format,
+                                 gpointer             pixel)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (pickable);
+
+  return gimp_gegl_average_color (gimp_drawable_get_buffer (drawable),
+                                  rect, TRUE, GEGL_ABYSS_NONE, format, pixel);
+}
+
+static void
+gimp_drawable_real_update (GimpDrawable *drawable,
+                           gint          x,
+                           gint          y,
+                           gint          width,
+                           gint          height)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (drawable));
+}
+
+static gint64
+gimp_drawable_real_estimate_memsize (GimpDrawable      *drawable,
+                                     GimpComponentType  component_type,
+                                     gint               width,
+                                     gint               height)
+{
+  GimpImage  *image  = gimp_item_get_image (GIMP_ITEM (drawable));
+  gboolean    linear = gimp_drawable_get_linear (drawable);
+  const Babl *format;
+
+  format = gimp_image_get_format (image,
+                                  gimp_drawable_get_base_type (drawable),
+                                  gimp_babl_precision (component_type, linear),
+                                  gimp_drawable_has_alpha (drawable));
+
+  return (gint64) babl_format_get_bytes_per_pixel (format) * width * height;
+}
+
+static void
+gimp_drawable_real_update_all (GimpDrawable *drawable)
+{
+  gimp_drawable_update (drawable, 0, 0, -1, -1);
+}
+
+static GimpComponentMask
+gimp_drawable_real_get_active_mask (GimpDrawable *drawable)
+{
+  /*  Return all, because that skips the component mask op when painting  */
+  return GIMP_COMPONENT_MASK_ALL;
+}
+
+static gboolean
+gimp_drawable_real_supports_alpha (GimpDrawable *drawable)
+{
+  return FALSE;
+}
+
+/* FIXME: this default impl is currently unused because no subclass
+ * chains up. the goal is to handle the almost identical subclass code
+ * here again.
+ */
+static void
+gimp_drawable_real_convert_type (GimpDrawable      *drawable,
+                                 GimpImage         *dest_image,
+                                 const Babl        *new_format,
+                                 GimpColorProfile  *dest_profile,
+                                 GeglDitherMethod   layer_dither_type,
+                                 GeglDitherMethod   mask_dither_type,
+                                 gboolean           push_undo,
+                                 GimpProgress      *progress)
+{
+  GeglBuffer *dest_buffer;
+
+  dest_buffer =
+    gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                     gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                     gimp_item_get_height (GIMP_ITEM (drawable))),
+                     new_format);
+
+  gimp_gegl_buffer_copy (
+    gimp_drawable_get_buffer (drawable), NULL, GEGL_ABYSS_NONE,
+    dest_buffer, NULL);
+
+  gimp_drawable_set_buffer (drawable, push_undo, NULL, dest_buffer);
+  g_object_unref (dest_buffer);
+}
+
+static GeglBuffer *
+gimp_drawable_real_get_buffer (GimpDrawable *drawable)
+{
+  return drawable->private->buffer;
+}
+
+static void
+gimp_drawable_real_set_buffer (GimpDrawable        *drawable,
+                               gboolean             push_undo,
+                               const gchar         *undo_desc,
+                               GeglBuffer          *buffer,
+                               const GeglRectangle *bounds)
+{
+  GimpItem   *item          = GIMP_ITEM (drawable);
+  const Babl *old_format    = NULL;
+  gint        old_has_alpha = -1;
+
+  g_object_freeze_notify (G_OBJECT (drawable));
+
+  gimp_drawable_invalidate_boundary (drawable);
+
+  if (push_undo)
+    gimp_image_undo_push_drawable_mod (gimp_item_get_image (item), undo_desc,
+                                       drawable, FALSE);
+
+  if (drawable->private->buffer)
+    {
+      old_format    = gimp_drawable_get_format (drawable);
+      old_has_alpha = gimp_drawable_has_alpha (drawable);
+    }
+
+  g_set_object (&drawable->private->buffer, buffer);
+
+  if (drawable->private->buffer_source_node)
+    gegl_node_set (drawable->private->buffer_source_node,
+                   "buffer", gimp_drawable_get_buffer (drawable),
+                   NULL);
+
+  gimp_item_set_offset (item, bounds->x, bounds->y);
+  gimp_item_set_size (item,
+                      bounds->width  ? bounds->width :
+                                       gegl_buffer_get_width (buffer),
+                      bounds->height ? bounds->height :
+                                       gegl_buffer_get_height (buffer));
+
+  gimp_drawable_update_bounding_box (drawable);
+
+  if (gimp_drawable_get_format (drawable) != old_format)
+    gimp_drawable_format_changed (drawable);
+
+  if (gimp_drawable_has_alpha (drawable) != old_has_alpha)
+    gimp_drawable_alpha_changed (drawable);
+
+  g_object_notify (G_OBJECT (drawable), "buffer");
+
+  g_object_thaw_notify (G_OBJECT (drawable));
+}
+
+static GeglRectangle
+gimp_drawable_real_get_bounding_box (GimpDrawable *drawable)
+{
+  return gegl_node_get_bounding_box (gimp_drawable_get_source_node (drawable));
+}
+
+static void
+gimp_drawable_real_push_undo (GimpDrawable *drawable,
+                              const gchar  *undo_desc,
+                              GeglBuffer   *buffer,
+                              gint          x,
+                              gint          y,
+                              gint          width,
+                              gint          height)
+{
+  GimpImage *image;
+
+  if (! buffer)
+    {
+      GeglBuffer    *drawable_buffer = gimp_drawable_get_buffer (drawable);
+      GeglRectangle  drawable_rect;
+
+      gegl_rectangle_align_to_buffer (
+        &drawable_rect,
+        GEGL_RECTANGLE (x, y, width, height),
+        drawable_buffer,
+        GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      x      = drawable_rect.x;
+      y      = drawable_rect.y;
+      width  = drawable_rect.width;
+      height = drawable_rect.height;
+
+      buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
+                                gimp_drawable_get_format (drawable));
+
+      gimp_gegl_buffer_copy (
+        drawable_buffer,
+        &drawable_rect, GEGL_ABYSS_NONE,
+        buffer,
+        GEGL_RECTANGLE (0, 0, 0, 0));
+    }
+  else
+    {
+      g_object_ref (buffer);
+    }
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  gimp_image_undo_push_drawable (image,
+                                 undo_desc, drawable,
+                                 buffer, x, y);
+
+  g_object_unref (buffer);
+}
+
+static void
+gimp_drawable_real_swap_pixels (GimpDrawable *drawable,
+                                GeglBuffer   *buffer,
+                                gint          x,
+                                gint          y)
+{
+  GeglBuffer *tmp;
+  gint        width  = gegl_buffer_get_width (buffer);
+  gint        height = gegl_buffer_get_height (buffer);
+
+  tmp = gimp_gegl_buffer_dup (buffer);
+
+  gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
+                         GEGL_RECTANGLE (x, y, width, height), GEGL_ABYSS_NONE,
+                         buffer,
+                         GEGL_RECTANGLE (0, 0, 0, 0));
+  gimp_gegl_buffer_copy (tmp,
+                         GEGL_RECTANGLE (0, 0, width, height), GEGL_ABYSS_NONE,
+                         gimp_drawable_get_buffer (drawable),
+                         GEGL_RECTANGLE (x, y, 0, 0));
+
+  g_object_unref (tmp);
+
+  gimp_drawable_update (drawable, x, y, width, height);
+}
+
+static GeglNode *
+gimp_drawable_real_get_source_node (GimpDrawable *drawable)
+{
+  g_warn_if_fail (drawable->private->buffer_source_node == NULL);
+
+  drawable->private->buffer_source_node =
+    gegl_node_new_child (NULL,
+                         "operation", "gimp:buffer-source-validate",
+                         "buffer",    gimp_drawable_get_buffer (drawable),
+                         NULL);
+
+  return g_object_ref (drawable->private->buffer_source_node);
+}
+
+static void
+gimp_drawable_format_changed (GimpDrawable *drawable)
+{
+  g_signal_emit (drawable, gimp_drawable_signals[FORMAT_CHANGED], 0);
+}
+
+static void
+gimp_drawable_alpha_changed (GimpDrawable *drawable)
+{
+  g_signal_emit (drawable, gimp_drawable_signals[ALPHA_CHANGED], 0);
+}
+
+
+/*  public functions  */
+
+GimpDrawable *
+gimp_drawable_new (GType          type,
+                   GimpImage     *image,
+                   const gchar   *name,
+                   gint           offset_x,
+                   gint           offset_y,
+                   gint           width,
+                   gint           height,
+                   const Babl    *format)
+{
+  GimpDrawable *drawable;
+  GeglBuffer   *buffer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (g_type_is_a (type, GIMP_TYPE_DRAWABLE), NULL);
+  g_return_val_if_fail (width > 0 && height > 0, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+
+  drawable = GIMP_DRAWABLE (gimp_item_new (type,
+                                           image, name,
+                                           offset_x, offset_y,
+                                           width, height));
+
+  buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height), format);
+
+  gimp_drawable_set_buffer (drawable, FALSE, NULL, buffer);
+  g_object_unref (buffer);
+
+  return drawable;
+}
+
+gint64
+gimp_drawable_estimate_memsize (GimpDrawable      *drawable,
+                                GimpComponentType  component_type,
+                                gint               width,
+                                gint               height)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), 0);
+
+  return GIMP_DRAWABLE_GET_CLASS (drawable)->estimate_memsize (drawable,
+                                                               component_type,
+                                                               width, height);
+}
+
+void
+gimp_drawable_update (GimpDrawable *drawable,
+                      gint          x,
+                      gint          y,
+                      gint          width,
+                      gint          height)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  if (width < 0)
+    {
+      GeglRectangle bounding_box;
+
+      bounding_box = gimp_drawable_get_bounding_box (drawable);
+
+      x     = bounding_box.x;
+      width = bounding_box.width;
+    }
+
+  if (height < 0)
+    {
+      GeglRectangle bounding_box;
+
+      bounding_box = gimp_drawable_get_bounding_box (drawable);
+
+      y      = bounding_box.y;
+      height = bounding_box.height;
+    }
+
+  if (drawable->private->paint_count == 0)
+    {
+      g_signal_emit (drawable, gimp_drawable_signals[UPDATE], 0,
+                     x, y, width, height);
+    }
+  else
+    {
+      GeglRectangle rect;
+
+      if (gegl_rectangle_intersect (
+            &rect,
+            GEGL_RECTANGLE (x, y, width, height),
+            GEGL_RECTANGLE (0, 0,
+                            gimp_item_get_width  (GIMP_ITEM (drawable)),
+                            gimp_item_get_height (GIMP_ITEM (drawable)))))
+        {
+          GeglRectangle aligned_rect;
+
+          gegl_rectangle_align_to_buffer (&aligned_rect, &rect,
+                                          gimp_drawable_get_buffer (drawable),
+                                          GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+          if (drawable->private->paint_copy_region)
+            {
+              cairo_region_union_rectangle (
+                drawable->private->paint_copy_region,
+                (const cairo_rectangle_int_t *) &aligned_rect);
+            }
+          else
+            {
+              drawable->private->paint_copy_region =
+                cairo_region_create_rectangle (
+                  (const cairo_rectangle_int_t *) &aligned_rect);
+            }
+
+          gegl_rectangle_align (&aligned_rect, &rect,
+                                GEGL_RECTANGLE (0, 0,
+                                                PAINT_UPDATE_CHUNK_WIDTH,
+                                                PAINT_UPDATE_CHUNK_HEIGHT),
+                                GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+          if (drawable->private->paint_update_region)
+            {
+              cairo_region_union_rectangle (
+                drawable->private->paint_update_region,
+                (const cairo_rectangle_int_t *) &aligned_rect);
+            }
+          else
+            {
+              drawable->private->paint_update_region =
+                cairo_region_create_rectangle (
+                  (const cairo_rectangle_int_t *) &aligned_rect);
+            }
+        }
+    }
+}
+
+void
+gimp_drawable_update_all (GimpDrawable *drawable)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  GIMP_DRAWABLE_GET_CLASS (drawable)->update_all (drawable);
+}
+
+void
+gimp_drawable_invalidate_boundary (GimpDrawable *drawable)
+{
+  GimpDrawableClass *drawable_class;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  drawable_class = GIMP_DRAWABLE_GET_CLASS (drawable);
+
+  if (drawable_class->invalidate_boundary)
+    drawable_class->invalidate_boundary (drawable);
+}
+
+void
+gimp_drawable_get_active_components (GimpDrawable *drawable,
+                                     gboolean     *active)
+{
+  GimpDrawableClass *drawable_class;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (active != NULL);
+
+  drawable_class = GIMP_DRAWABLE_GET_CLASS (drawable);
+
+  if (drawable_class->get_active_components)
+    drawable_class->get_active_components (drawable, active);
+}
+
+GimpComponentMask
+gimp_drawable_get_active_mask (GimpDrawable *drawable)
+{
+  GimpComponentMask mask;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), 0);
+
+  mask = GIMP_DRAWABLE_GET_CLASS (drawable)->get_active_mask (drawable);
+
+  /* if the drawable doesn't have an alpha channel, the value of the mask's
+   * alpha-bit doesn't matter, however, we'd like to have a fully-clear or
+   * fully-set mask whenever possible, since it allows us to skip component
+   * masking altogether.  we therefore set or clear the alpha bit, depending on
+   * the state of the other bits, so that it never gets in the way of a uniform
+   * mask.
+   */
+  if (! gimp_drawable_has_alpha (drawable))
+    {
+      if (mask & ~GIMP_COMPONENT_MASK_ALPHA)
+        mask |= GIMP_COMPONENT_MASK_ALPHA;
+      else
+        mask &= ~GIMP_COMPONENT_MASK_ALPHA;
+    }
+
+  return mask;
+}
+
+gboolean
+gimp_drawable_supports_alpha (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  return GIMP_DRAWABLE_GET_CLASS (drawable)->supports_alpha (drawable);
+}
+
+void
+gimp_drawable_convert_type (GimpDrawable      *drawable,
+                            GimpImage         *dest_image,
+                            GimpImageBaseType  new_base_type,
+                            GimpPrecision      new_precision,
+                            gboolean           new_has_alpha,
+                            GimpColorProfile  *dest_profile,
+                            GeglDitherMethod   layer_dither_type,
+                            GeglDitherMethod   mask_dither_type,
+                            gboolean           push_undo,
+                            GimpProgress      *progress)
+{
+  const Babl *old_format;
+  const Babl *new_format;
+  gint        old_bits;
+  gint        new_bits;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GIMP_IS_IMAGE (dest_image));
+  g_return_if_fail (new_base_type != gimp_drawable_get_base_type (drawable) ||
+                    new_precision != gimp_drawable_get_precision (drawable) ||
+                    new_has_alpha != gimp_drawable_has_alpha (drawable)     ||
+                    dest_profile);
+  g_return_if_fail (dest_profile == NULL || GIMP_IS_COLOR_PROFILE (dest_profile));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
+    push_undo = FALSE;
+
+  old_format = gimp_drawable_get_format (drawable);
+  new_format = gimp_image_get_format (dest_image,
+                                      new_base_type,
+                                      new_precision,
+                                      new_has_alpha);
+
+  old_bits = (babl_format_get_bytes_per_pixel (old_format) * 8 /
+              babl_format_get_n_components (old_format));
+  new_bits = (babl_format_get_bytes_per_pixel (new_format) * 8 /
+              babl_format_get_n_components (new_format));
+
+  if (old_bits <= new_bits || new_bits > 16)
+    {
+      /*  don't dither if we are converting to a higher bit depth,
+       *  or to more than 16 bits (gegl:dither only does
+       *  16 bits).
+       */
+      layer_dither_type = GEGL_DITHER_NONE;
+      mask_dither_type  = GEGL_DITHER_NONE;
+    }
+
+  GIMP_DRAWABLE_GET_CLASS (drawable)->convert_type (drawable, dest_image,
+                                                    new_format,
+                                                    dest_profile,
+                                                    layer_dither_type,
+                                                    mask_dither_type,
+                                                    push_undo,
+                                                    progress);
+
+  if (progress)
+    gimp_progress_set_value (progress, 1.0);
+}
+
+void
+gimp_drawable_apply_buffer (GimpDrawable           *drawable,
+                            GeglBuffer             *buffer,
+                            const GeglRectangle    *buffer_region,
+                            gboolean                push_undo,
+                            const gchar            *undo_desc,
+                            gdouble                 opacity,
+                            GimpLayerMode           mode,
+                            GimpLayerColorSpace     blend_space,
+                            GimpLayerColorSpace     composite_space,
+                            GimpLayerCompositeMode  composite_mode,
+                            GeglBuffer             *base_buffer,
+                            gint                    base_x,
+                            gint                    base_y)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+  g_return_if_fail (buffer_region != NULL);
+  g_return_if_fail (base_buffer == NULL || GEGL_IS_BUFFER (base_buffer));
+
+  GIMP_DRAWABLE_GET_CLASS (drawable)->apply_buffer (drawable, buffer,
+                                                    buffer_region,
+                                                    push_undo, undo_desc,
+                                                    opacity, mode,
+                                                    blend_space,
+                                                    composite_space,
+                                                    composite_mode,
+                                                    base_buffer,
+                                                    base_x, base_y);
+}
+
+GeglBuffer *
+gimp_drawable_get_buffer (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  if (drawable->private->paint_count == 0)
+    return GIMP_DRAWABLE_GET_CLASS (drawable)->get_buffer (drawable);
+  else
+    return drawable->private->paint_buffer;
+}
+
+void
+gimp_drawable_set_buffer (GimpDrawable *drawable,
+                          gboolean      push_undo,
+                          const gchar  *undo_desc,
+                          GeglBuffer   *buffer)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
+    push_undo = FALSE;
+
+  gimp_drawable_set_buffer_full (drawable, push_undo, undo_desc, buffer, NULL,
+                                 TRUE);
+}
+
+void
+gimp_drawable_set_buffer_full (GimpDrawable        *drawable,
+                               gboolean             push_undo,
+                               const gchar         *undo_desc,
+                               GeglBuffer          *buffer,
+                               const GeglRectangle *bounds,
+                               gboolean             update)
+{
+  GimpItem      *item;
+  GeglRectangle  curr_bounds;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  item = GIMP_ITEM (drawable);
+
+  if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
+    push_undo = FALSE;
+
+  if (! bounds)
+    {
+      gimp_item_get_offset (GIMP_ITEM (drawable),
+                            &curr_bounds.x, &curr_bounds.y);
+
+      curr_bounds.width  = 0;
+      curr_bounds.height = 0;
+
+      bounds = &curr_bounds;
+    }
+
+  if (update && gimp_drawable_get_buffer (drawable))
+    {
+      GeglBuffer    *old_buffer = gimp_drawable_get_buffer (drawable);
+      GeglRectangle  old_extent;
+      GeglRectangle  new_extent;
+
+      old_extent = *gegl_buffer_get_extent (old_buffer);
+      old_extent.x += gimp_item_get_offset_x (item);
+      old_extent.y += gimp_item_get_offset_x (item);
+
+      new_extent = *gegl_buffer_get_extent (buffer);
+      new_extent.x += bounds->x;
+      new_extent.y += bounds->y;
+
+      if (! gegl_rectangle_equal (&old_extent, &new_extent))
+        gimp_drawable_update (drawable, 0, 0, -1, -1);
+    }
+
+  g_object_freeze_notify (G_OBJECT (drawable));
+
+  GIMP_DRAWABLE_GET_CLASS (drawable)->set_buffer (drawable,
+                                                  push_undo, undo_desc,
+                                                  buffer, bounds);
+
+  g_object_thaw_notify (G_OBJECT (drawable));
+
+  if (update)
+    gimp_drawable_update (drawable, 0, 0, -1, -1);
+}
+
+void
+gimp_drawable_steal_buffer (GimpDrawable *drawable,
+                            GimpDrawable *src_drawable)
+{
+  GeglBuffer *buffer;
+  GeglBuffer *replacement_buffer;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GIMP_IS_DRAWABLE (src_drawable));
+
+  buffer = gimp_drawable_get_buffer (src_drawable);
+
+  g_return_if_fail (buffer != NULL);
+
+  g_object_ref (buffer);
+
+  replacement_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, 1, 1),
+                                        gegl_buffer_get_format (buffer));
+
+  gimp_drawable_set_buffer (src_drawable, FALSE, NULL, replacement_buffer);
+  gimp_drawable_set_buffer (drawable,     FALSE, NULL, buffer);
+
+  g_object_unref (replacement_buffer);
+  g_object_unref (buffer);
+}
+
+GeglNode *
+gimp_drawable_get_source_node (GimpDrawable *drawable)
+{
+  GeglNode *input;
+  GeglNode *source;
+  GeglNode *filter;
+  GeglNode *output;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  if (drawable->private->source_node)
+    return drawable->private->source_node;
+
+  drawable->private->source_node = gegl_node_new ();
+
+  input = gegl_node_get_input_proxy (drawable->private->source_node, "input");
+
+  source = GIMP_DRAWABLE_GET_CLASS (drawable)->get_source_node (drawable);
+
+  gegl_node_add_child (drawable->private->source_node, source);
+
+  g_object_unref (source);
+
+  if (gegl_node_has_pad (source, "input"))
+    {
+      gegl_node_connect_to (input,  "output",
+                            source, "input");
+    }
+
+  filter = gimp_filter_stack_get_graph (GIMP_FILTER_STACK (drawable->private->filter_stack));
+
+  gegl_node_add_child (drawable->private->source_node, filter);
+
+  gegl_node_connect_to (source, "output",
+                        filter, "input");
+
+  output = gegl_node_get_output_proxy (drawable->private->source_node, "output");
+
+  gegl_node_connect_to (filter, "output",
+                        output, "input");
+
+  if (gimp_drawable_get_floating_sel (drawable))
+    _gimp_drawable_add_floating_sel_filter (drawable);
+
+  return drawable->private->source_node;
+}
+
+GeglNode *
+gimp_drawable_get_mode_node (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  if (! drawable->private->mode_node)
+    gimp_filter_get_node (GIMP_FILTER (drawable));
+
+  return drawable->private->mode_node;
+}
+
+GeglRectangle
+gimp_drawable_get_bounding_box (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable),
+                        *GEGL_RECTANGLE (0, 0, 0, 0));
+
+  if (gegl_rectangle_is_empty (&drawable->private->bounding_box))
+    gimp_drawable_update_bounding_box (drawable);
+
+  return drawable->private->bounding_box;
+}
+
+gboolean
+gimp_drawable_update_bounding_box (GimpDrawable *drawable)
+{
+  GeglRectangle bounding_box;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  bounding_box =
+    GIMP_DRAWABLE_GET_CLASS (drawable)->get_bounding_box (drawable);
+
+  if (! gegl_rectangle_equal (&bounding_box, &drawable->private->bounding_box))
+    {
+      GeglRectangle old_bounding_box = drawable->private->bounding_box;
+      GeglRectangle diff_rects[4];
+      gint          n_diff_rects;
+      gint          i;
+
+      n_diff_rects = gegl_rectangle_subtract (diff_rects,
+                                              &old_bounding_box,
+                                              &bounding_box);
+
+      for (i = 0; i < n_diff_rects; i++)
+        {
+          gimp_drawable_update (drawable,
+                                diff_rects[i].x,
+                                diff_rects[i].y,
+                                diff_rects[i].width,
+                                diff_rects[i].height);
+        }
+
+      drawable->private->bounding_box = bounding_box;
+
+      g_signal_emit (drawable, gimp_drawable_signals[BOUNDING_BOX_CHANGED], 0);
+
+      n_diff_rects = gegl_rectangle_subtract (diff_rects,
+                                              &bounding_box,
+                                              &old_bounding_box);
+
+      for (i = 0; i < n_diff_rects; i++)
+        {
+          gimp_drawable_update (drawable,
+                                diff_rects[i].x,
+                                diff_rects[i].y,
+                                diff_rects[i].width,
+                                diff_rects[i].height);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_drawable_swap_pixels (GimpDrawable *drawable,
+                           GeglBuffer   *buffer,
+                           gint          x,
+                           gint          y)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  GIMP_DRAWABLE_GET_CLASS (drawable)->swap_pixels (drawable, buffer, x, y);
+}
+
+void
+gimp_drawable_push_undo (GimpDrawable *drawable,
+                         const gchar  *undo_desc,
+                         GeglBuffer   *buffer,
+                         gint          x,
+                         gint          y,
+                         gint          width,
+                         gint          height)
+{
+  GimpItem *item;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (buffer == NULL || GEGL_IS_BUFFER (buffer));
+
+  item = GIMP_ITEM (drawable);
+
+  g_return_if_fail (gimp_item_is_attached (item));
+
+  if (! buffer &&
+      ! gimp_rectangle_intersect (x, y,
+                                  width, height,
+                                  0, 0,
+                                  gimp_item_get_width (item),
+                                  gimp_item_get_height (item),
+                                  &x, &y, &width, &height))
+    {
+      g_warning ("%s: tried to push empty region", G_STRFUNC);
+      return;
+    }
+
+  GIMP_DRAWABLE_GET_CLASS (drawable)->push_undo (drawable, undo_desc,
+                                                 buffer,
+                                                 x, y, width, height);
+}
+
+const Babl *
+gimp_drawable_get_format (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  return gegl_buffer_get_format (drawable->private->buffer);
+}
+
+const Babl *
+gimp_drawable_get_format_with_alpha (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  return gimp_image_get_format (gimp_item_get_image (GIMP_ITEM (drawable)),
+                                gimp_drawable_get_base_type (drawable),
+                                gimp_drawable_get_precision (drawable),
+                                TRUE);
+}
+
+const Babl *
+gimp_drawable_get_format_without_alpha (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  return gimp_image_get_format (gimp_item_get_image (GIMP_ITEM (drawable)),
+                                gimp_drawable_get_base_type (drawable),
+                                gimp_drawable_get_precision (drawable),
+                                FALSE);
+}
+
+gboolean
+gimp_drawable_get_linear (GimpDrawable *drawable)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  format = gegl_buffer_get_format (drawable->private->buffer);
+
+  return gimp_babl_format_get_linear (format);
+}
+
+gboolean
+gimp_drawable_has_alpha (GimpDrawable *drawable)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  format = gegl_buffer_get_format (drawable->private->buffer);
+
+  return babl_format_has_alpha (format);
+}
+
+GimpImageBaseType
+gimp_drawable_get_base_type (GimpDrawable *drawable)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), -1);
+
+  format = gegl_buffer_get_format (drawable->private->buffer);
+
+  return gimp_babl_format_get_base_type (format);
+}
+
+GimpComponentType
+gimp_drawable_get_component_type (GimpDrawable *drawable)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), -1);
+
+  format = gegl_buffer_get_format (drawable->private->buffer);
+
+  return gimp_babl_format_get_component_type (format);
+}
+
+GimpPrecision
+gimp_drawable_get_precision (GimpDrawable *drawable)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), -1);
+
+  format = gegl_buffer_get_format (drawable->private->buffer);
+
+  return gimp_babl_format_get_precision (format);
+}
+
+gboolean
+gimp_drawable_is_rgb (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  return (gimp_drawable_get_base_type (drawable) == GIMP_RGB);
+}
+
+gboolean
+gimp_drawable_is_gray (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  return (gimp_drawable_get_base_type (drawable) == GIMP_GRAY);
+}
+
+gboolean
+gimp_drawable_is_indexed (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  return (gimp_drawable_get_base_type (drawable) == GIMP_INDEXED);
+}
+
+const Babl *
+gimp_drawable_get_component_format (GimpDrawable    *drawable,
+                                    GimpChannelType  channel)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  switch (channel)
+    {
+    case GIMP_CHANNEL_RED:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_drawable_get_precision (drawable),
+                                         RED);
+
+    case GIMP_CHANNEL_GREEN:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_drawable_get_precision (drawable),
+                                         GREEN);
+
+    case GIMP_CHANNEL_BLUE:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_drawable_get_precision (drawable),
+                                         BLUE);
+
+    case GIMP_CHANNEL_ALPHA:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_drawable_get_precision (drawable),
+                                         ALPHA);
+
+    case GIMP_CHANNEL_GRAY:
+      return gimp_babl_component_format (GIMP_GRAY,
+                                         gimp_drawable_get_precision (drawable),
+                                         GRAY);
+
+    case GIMP_CHANNEL_INDEXED:
+      return babl_format ("Y u8"); /* will extract grayscale, the best
+                                    * we can do here */
+    }
+
+  return NULL;
+}
+
+gint
+gimp_drawable_get_component_index (GimpDrawable    *drawable,
+                                   GimpChannelType  channel)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), -1);
+
+  switch (channel)
+    {
+    case GIMP_CHANNEL_RED:     return RED;
+    case GIMP_CHANNEL_GREEN:   return GREEN;
+    case GIMP_CHANNEL_BLUE:    return BLUE;
+    case GIMP_CHANNEL_GRAY:    return GRAY;
+    case GIMP_CHANNEL_INDEXED: return INDEXED;
+    case GIMP_CHANNEL_ALPHA:
+      switch (gimp_drawable_get_base_type (drawable))
+        {
+        case GIMP_RGB:     return ALPHA;
+        case GIMP_GRAY:    return ALPHA_G;
+        case GIMP_INDEXED: return ALPHA_I;
+        }
+    }
+
+  return -1;
+}
+
+const guchar *
+gimp_drawable_get_colormap (GimpDrawable *drawable)
+{
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  return image ? gimp_image_get_colormap (image) : NULL;
+}
+
+void
+gimp_drawable_start_paint (GimpDrawable *drawable)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+
+  if (drawable->private->paint_count == 0)
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (drawable);
+
+      g_return_if_fail (buffer != NULL);
+      g_return_if_fail (drawable->private->paint_buffer == NULL);
+      g_return_if_fail (drawable->private->paint_copy_region == NULL);
+      g_return_if_fail (drawable->private->paint_update_region == NULL);
+
+      drawable->private->paint_buffer = gimp_gegl_buffer_dup (buffer);
+    }
+
+  drawable->private->paint_count++;
+}
+
+gboolean
+gimp_drawable_end_paint (GimpDrawable *drawable)
+{
+  gboolean result = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (drawable->private->paint_count > 0, FALSE);
+
+  if (drawable->private->paint_count == 1)
+    {
+      result = gimp_drawable_flush_paint (drawable);
+
+      g_clear_object (&drawable->private->paint_buffer);
+    }
+
+  drawable->private->paint_count--;
+
+  return result;
+}
+
+gboolean
+gimp_drawable_flush_paint (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (drawable->private->paint_count > 0, FALSE);
+
+  if (drawable->private->paint_copy_region)
+    {
+      GeglBuffer *buffer;
+      gint        n_rects;
+      gint        i;
+
+      buffer = GIMP_DRAWABLE_GET_CLASS (drawable)->get_buffer (drawable);
+
+      g_return_val_if_fail (buffer != NULL, FALSE);
+      g_return_val_if_fail (drawable->private->paint_buffer != NULL, FALSE);
+
+      n_rects = cairo_region_num_rectangles (
+        drawable->private->paint_copy_region);
+
+      for (i = 0; i < n_rects; i++)
+        {
+          GeglRectangle rect;
+
+          cairo_region_get_rectangle (drawable->private->paint_copy_region,
+                                      i, (cairo_rectangle_int_t *) &rect);
+
+          gimp_gegl_buffer_copy (
+            drawable->private->paint_buffer, &rect, GEGL_ABYSS_NONE,
+            buffer, NULL);
+        }
+
+      g_clear_pointer (&drawable->private->paint_copy_region,
+                       cairo_region_destroy);
+
+      n_rects = cairo_region_num_rectangles (
+        drawable->private->paint_update_region);
+
+      for (i = 0; i < n_rects; i++)
+        {
+          GeglRectangle rect;
+
+          cairo_region_get_rectangle (drawable->private->paint_update_region,
+                                      i, (cairo_rectangle_int_t *) &rect);
+
+          g_signal_emit (drawable, gimp_drawable_signals[UPDATE], 0,
+                         rect.x, rect.y, rect.width, rect.height);
+        }
+
+      g_clear_pointer (&drawable->private->paint_update_region,
+                       cairo_region_destroy);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_drawable_is_painting (GimpDrawable *drawable)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  return drawable->private->paint_count > 0;
+}
diff --git a/app/core/gimpdrawable.h b/app/core/gimpdrawable.h
new file mode 100644
index 0000000..73c4283
--- /dev/null
+++ b/app/core/gimpdrawable.h
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_H__
+#define __GIMP_DRAWABLE_H__
+
+
+#include "gimpitem.h"
+
+
+#define GIMP_TYPE_DRAWABLE            (gimp_drawable_get_type ())
+#define GIMP_DRAWABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAWABLE, GimpDrawable))
+#define GIMP_DRAWABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAWABLE, GimpDrawableClass))
+#define GIMP_IS_DRAWABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAWABLE))
+#define GIMP_IS_DRAWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAWABLE))
+#define GIMP_DRAWABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAWABLE, GimpDrawableClass))
+
+
+typedef struct _GimpDrawablePrivate GimpDrawablePrivate;
+typedef struct _GimpDrawableClass   GimpDrawableClass;
+
+struct _GimpDrawable
+{
+  GimpItem             parent_instance;
+
+  GimpDrawablePrivate *private;
+};
+
+struct _GimpDrawableClass
+{
+  GimpItemClass  parent_class;
+
+  /*  signals  */
+  void          (* update)                (GimpDrawable         *drawable,
+                                           gint                  x,
+                                           gint                  y,
+                                           gint                  width,
+                                           gint                  height);
+  void          (* format_changed)        (GimpDrawable         *drawable);
+  void          (* alpha_changed)         (GimpDrawable         *drawable);
+  void          (* bounding_box_changed)  (GimpDrawable         *drawable);
+
+  /*  virtual functions  */
+  gint64        (* estimate_memsize)      (GimpDrawable         *drawable,
+                                           GimpComponentType     component_type,
+                                           gint                  width,
+                                           gint                  height);
+  void          (* update_all)            (GimpDrawable         *drawable);
+  void          (* invalidate_boundary)   (GimpDrawable         *drawable);
+  void          (* get_active_components) (GimpDrawable         *drawable,
+                                           gboolean             *active);
+  GimpComponentMask (* get_active_mask)   (GimpDrawable         *drawable);
+  gboolean      (* supports_alpha)        (GimpDrawable         *drawable);
+  void          (* convert_type)          (GimpDrawable         *drawable,
+                                           GimpImage            *dest_image,
+                                           const Babl           *new_format,
+                                           GimpColorProfile     *dest_profile,
+                                           GeglDitherMethod      layer_dither_type,
+                                           GeglDitherMethod      mask_dither_type,
+                                           gboolean              push_undo,
+                                           GimpProgress         *progress);
+  void          (* apply_buffer)          (GimpDrawable         *drawable,
+                                           GeglBuffer           *buffer,
+                                           const GeglRectangle  *buffer_region,
+                                           gboolean              push_undo,
+                                           const gchar          *undo_desc,
+                                           gdouble               opacity,
+                                           GimpLayerMode         mode,
+                                           GimpLayerColorSpace   blend_space,
+                                           GimpLayerColorSpace   composite_space,
+                                           GimpLayerCompositeMode composite_mode,
+                                           GeglBuffer           *base_buffer,
+                                           gint                  base_x,
+                                           gint                  base_y);
+  GeglBuffer  * (* get_buffer)            (GimpDrawable         *drawable);
+  void          (* set_buffer)            (GimpDrawable         *drawable,
+                                           gboolean              push_undo,
+                                           const gchar          *undo_desc,
+                                           GeglBuffer           *buffer,
+                                           const GeglRectangle  *bounds);
+  GeglRectangle (* get_bounding_box)      (GimpDrawable         *drawable);
+  void          (* push_undo)             (GimpDrawable         *drawable,
+                                           const gchar          *undo_desc,
+                                           GeglBuffer           *buffer,
+                                           gint                  x,
+                                           gint                  y,
+                                           gint                  width,
+                                           gint                  height);
+  void          (* swap_pixels)           (GimpDrawable         *drawable,
+                                           GeglBuffer           *buffer,
+                                           gint                  x,
+                                           gint                  y);
+  GeglNode    * (* get_source_node)       (GimpDrawable         *drawable);
+};
+
+
+GType           gimp_drawable_get_type           (void) G_GNUC_CONST;
+
+GimpDrawable  * gimp_drawable_new                (GType               type,
+                                                  GimpImage          *image,
+                                                  const gchar        *name,
+                                                  gint                offset_x,
+                                                  gint                offset_y,
+                                                  gint                width,
+                                                  gint                height,
+                                                  const Babl         *format);
+
+gint64          gimp_drawable_estimate_memsize   (GimpDrawable       *drawable,
+                                                  GimpComponentType   component_type,
+                                                  gint                width,
+                                                  gint                height);
+
+void            gimp_drawable_update             (GimpDrawable       *drawable,
+                                                  gint                x,
+                                                  gint                y,
+                                                  gint                width,
+                                                  gint                height);
+void            gimp_drawable_update_all         (GimpDrawable       *drawable);
+
+void           gimp_drawable_invalidate_boundary (GimpDrawable       *drawable);
+void         gimp_drawable_get_active_components (GimpDrawable       *drawable,
+                                                  gboolean           *active);
+GimpComponentMask gimp_drawable_get_active_mask  (GimpDrawable       *drawable);
+
+gboolean        gimp_drawable_supports_alpha     (GimpDrawable       *drawable);
+
+void            gimp_drawable_convert_type       (GimpDrawable       *drawable,
+                                                  GimpImage          *dest_image,
+                                                  GimpImageBaseType   new_base_type,
+                                                  GimpPrecision       new_precision,
+                                                  gboolean            new_has_alpha,
+                                                  GimpColorProfile   *dest_profile,
+                                                  GeglDitherMethod    layer_dither_type,
+                                                  GeglDitherMethod    mask_dither_type,
+                                                  gboolean            push_undo,
+                                                  GimpProgress       *progress);
+
+void            gimp_drawable_apply_buffer       (GimpDrawable        *drawable,
+                                                  GeglBuffer          *buffer,
+                                                  const GeglRectangle *buffer_rect,
+                                                  gboolean             push_undo,
+                                                  const gchar         *undo_desc,
+                                                  gdouble              opacity,
+                                                  GimpLayerMode        mode,
+                                                  GimpLayerColorSpace  blend_space,
+                                                  GimpLayerColorSpace  composite_space,
+                                                  GimpLayerCompositeMode composite_mode,
+                                                  GeglBuffer          *base_buffer,
+                                                  gint                 base_x,
+                                                  gint                 base_y);
+
+GeglBuffer    * gimp_drawable_get_buffer         (GimpDrawable       *drawable);
+void            gimp_drawable_set_buffer         (GimpDrawable       *drawable,
+                                                  gboolean            push_undo,
+                                                  const gchar        *undo_desc,
+                                                  GeglBuffer         *buffer);
+void            gimp_drawable_set_buffer_full    (GimpDrawable       *drawable,
+                                                  gboolean            push_undo,
+                                                  const gchar        *undo_desc,
+                                                  GeglBuffer         *buffer,
+                                                  const GeglRectangle *bounds,
+                                                  gboolean            update);
+
+void            gimp_drawable_steal_buffer       (GimpDrawable       *drawable,
+                                                  GimpDrawable       *src_drawable);
+
+GeglNode      * gimp_drawable_get_source_node    (GimpDrawable       *drawable);
+GeglNode      * gimp_drawable_get_mode_node      (GimpDrawable       *drawable);
+
+GeglRectangle   gimp_drawable_get_bounding_box   (GimpDrawable       *drawable);
+gboolean        gimp_drawable_update_bounding_box
+                                                 (GimpDrawable       *drawable);
+
+void            gimp_drawable_swap_pixels        (GimpDrawable       *drawable,
+                                                  GeglBuffer         *buffer,
+                                                  gint                x,
+                                                  gint                y);
+
+void            gimp_drawable_push_undo          (GimpDrawable       *drawable,
+                                                  const gchar        *undo_desc,
+                                                  GeglBuffer         *buffer,
+                                                  gint                x,
+                                                  gint                y,
+                                                  gint                width,
+                                                  gint                height);
+
+const Babl      * gimp_drawable_get_format           (GimpDrawable    *drawable);
+const Babl      * gimp_drawable_get_format_with_alpha(GimpDrawable    *drawable);
+const Babl      * gimp_drawable_get_format_without_alpha
+                                                     (GimpDrawable    *drawable);
+gboolean          gimp_drawable_get_linear           (GimpDrawable    *drawable);
+gboolean          gimp_drawable_has_alpha            (GimpDrawable    *drawable);
+GimpImageBaseType gimp_drawable_get_base_type        (GimpDrawable    *drawable);
+GimpComponentType gimp_drawable_get_component_type   (GimpDrawable    *drawable);
+GimpPrecision     gimp_drawable_get_precision        (GimpDrawable    *drawable);
+gboolean          gimp_drawable_is_rgb               (GimpDrawable    *drawable);
+gboolean          gimp_drawable_is_gray              (GimpDrawable    *drawable);
+gboolean          gimp_drawable_is_indexed           (GimpDrawable    *drawable);
+
+const Babl      * gimp_drawable_get_component_format (GimpDrawable    *drawable,
+                                                      GimpChannelType  channel);
+gint              gimp_drawable_get_component_index  (GimpDrawable    *drawable,
+                                                      GimpChannelType  channel);
+
+const guchar    * gimp_drawable_get_colormap         (GimpDrawable    *drawable);
+
+void              gimp_drawable_start_paint          (GimpDrawable    *drawable);
+gboolean          gimp_drawable_end_paint            (GimpDrawable    *drawable);
+gboolean          gimp_drawable_flush_paint          (GimpDrawable    *drawable);
+gboolean          gimp_drawable_is_painting          (GimpDrawable    *drawable);
+
+
+#endif /* __GIMP_DRAWABLE_H__ */
diff --git a/app/core/gimpdrawablefilter.c b/app/core/gimpdrawablefilter.c
new file mode 100644
index 0000000..6cda4f1
--- /dev/null
+++ b/app/core/gimpdrawablefilter.c
@@ -0,0 +1,1364 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains the code necessary for generating on canvas
+ * previews, by connecting a specified GEGL operation to do the
+ * processing. It uses drawable filters that allow for non-destructive
+ * manipulation of drawable data, with live preview on screen.
+ *
+ * To create a tool that uses this, see app/tools/gimpfiltertool.c for
+ * the interface and e.g. app/tools/gimpcolorbalancetool.c for an
+ * example of using that interface.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimpapplicator.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable-filters.h"
+#include "gimpdrawablefilter.h"
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimpmarshal.h"
+#include "gimpprogress.h"
+
+
+enum
+{
+  FLUSH,
+  LAST_SIGNAL
+};
+
+
+struct _GimpDrawableFilter
+{
+  GimpFilter              parent_instance;
+
+  GimpDrawable           *drawable;
+  GeglNode               *operation;
+
+  gboolean                has_input;
+
+  gboolean                clip;
+  GimpFilterRegion        region;
+  gboolean                crop_enabled;
+  GeglRectangle           crop_rect;
+  gboolean                preview_enabled;
+  gboolean                preview_split_enabled;
+  GimpAlignmentType       preview_split_alignment;
+  gint                    preview_split_position;
+  gdouble                 opacity;
+  GimpLayerMode           paint_mode;
+  GimpLayerColorSpace     blend_space;
+  GimpLayerColorSpace     composite_space;
+  GimpLayerCompositeMode  composite_mode;
+  gboolean                add_alpha;
+  gboolean                color_managed;
+  gboolean                gamma_hack;
+
+  gboolean                override_constraints;
+
+  GeglRectangle           filter_area;
+  gboolean                filter_clip;
+
+  GeglNode               *translate;
+  GeglNode               *crop_before;
+  GeglNode               *cast_before;
+  GeglNode               *transform_before;
+  GeglNode               *transform_after;
+  GeglNode               *cast_after;
+  GeglNode               *crop_after;
+  GimpApplicator         *applicator;
+};
+
+
+static void       gimp_drawable_filter_dispose               (GObject             *object);
+static void       gimp_drawable_filter_finalize              (GObject             *object);
+
+static void       gimp_drawable_filter_sync_active           (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_clip             (GimpDrawableFilter  *filter,
+                                                              gboolean             sync_region);
+static void       gimp_drawable_filter_sync_region           (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_crop             (GimpDrawableFilter  *filter,
+                                                              gboolean             old_crop_enabled,
+                                                              const GeglRectangle *old_crop_rect,
+                                                              gboolean             old_preview_split_enabled,
+                                                              GimpAlignmentType    old_preview_split_alignment,
+                                                              gint                 old_preview_split_position,
+                                                              gboolean             update);
+static void       gimp_drawable_filter_sync_opacity          (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_mode             (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_affect           (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_format           (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_mask             (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_transform        (GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_sync_gamma_hack       (GimpDrawableFilter  *filter);
+
+static gboolean   gimp_drawable_filter_is_added              (GimpDrawableFilter  *filter);
+static gboolean   gimp_drawable_filter_is_active             (GimpDrawableFilter  *filter);
+static gboolean   gimp_drawable_filter_add_filter            (GimpDrawableFilter  *filter);
+static gboolean   gimp_drawable_filter_remove_filter         (GimpDrawableFilter  *filter);
+
+static void       gimp_drawable_filter_update_drawable       (GimpDrawableFilter  *filter,
+                                                              const GeglRectangle *area);
+
+static void       gimp_drawable_filter_affect_changed        (GimpImage           *image,
+                                                              GimpChannelType      channel,
+                                                              GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_mask_changed          (GimpImage           *image,
+                                                              GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_profile_changed       (GimpColorManaged    *managed,
+                                                              GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_lock_position_changed (GimpDrawable        *drawable,
+                                                              GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_format_changed        (GimpDrawable        *drawable,
+                                                              GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_drawable_removed      (GimpDrawable        *drawable,
+                                                              GimpDrawableFilter  *filter);
+static void       gimp_drawable_filter_lock_alpha_changed    (GimpLayer           *layer,
+                                                              GimpDrawableFilter  *filter);
+
+
+G_DEFINE_TYPE (GimpDrawableFilter, gimp_drawable_filter, GIMP_TYPE_FILTER)
+
+#define parent_class gimp_drawable_filter_parent_class
+
+static guint drawable_filter_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_drawable_filter_class_init (GimpDrawableFilterClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  drawable_filter_signals[FLUSH] =
+    g_signal_new ("flush",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDrawableFilterClass, flush),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose  = gimp_drawable_filter_dispose;
+  object_class->finalize = gimp_drawable_filter_finalize;
+}
+
+static void
+gimp_drawable_filter_init (GimpDrawableFilter *drawable_filter)
+{
+  drawable_filter->clip                    = TRUE;
+  drawable_filter->region                  = GIMP_FILTER_REGION_SELECTION;
+  drawable_filter->preview_enabled         = TRUE;
+  drawable_filter->preview_split_enabled   = FALSE;
+  drawable_filter->preview_split_alignment = GIMP_ALIGN_LEFT;
+  drawable_filter->preview_split_position  = 0;
+  drawable_filter->opacity                 = GIMP_OPACITY_OPAQUE;
+  drawable_filter->paint_mode              = GIMP_LAYER_MODE_REPLACE;
+  drawable_filter->blend_space             = GIMP_LAYER_COLOR_SPACE_AUTO;
+  drawable_filter->composite_space         = GIMP_LAYER_COLOR_SPACE_AUTO;
+  drawable_filter->composite_mode          = GIMP_LAYER_COMPOSITE_AUTO;
+}
+
+static void
+gimp_drawable_filter_dispose (GObject *object)
+{
+  GimpDrawableFilter *drawable_filter = GIMP_DRAWABLE_FILTER (object);
+
+  if (drawable_filter->drawable)
+    gimp_drawable_filter_remove_filter (drawable_filter);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_drawable_filter_finalize (GObject *object)
+{
+  GimpDrawableFilter *drawable_filter = GIMP_DRAWABLE_FILTER (object);
+
+  g_clear_object (&drawable_filter->operation);
+  g_clear_object (&drawable_filter->applicator);
+  g_clear_object (&drawable_filter->drawable);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GimpDrawableFilter *
+gimp_drawable_filter_new (GimpDrawable *drawable,
+                          const gchar  *undo_desc,
+                          GeglNode     *operation,
+                          const gchar  *icon_name)
+{
+  GimpDrawableFilter *filter;
+  GeglNode           *node;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GEGL_IS_NODE (operation), NULL);
+  g_return_val_if_fail (gegl_node_has_pad (operation, "output"), NULL);
+
+  filter = g_object_new (GIMP_TYPE_DRAWABLE_FILTER,
+                         "name",      undo_desc,
+                         "icon-name", icon_name,
+                         NULL);
+
+  filter->drawable  = g_object_ref (drawable);
+  filter->operation = g_object_ref (operation);
+
+  node = gimp_filter_get_node (GIMP_FILTER (filter));
+
+  gegl_node_add_child (node, operation);
+  gimp_gegl_node_set_underlying_operation (node, operation);
+
+  filter->applicator = gimp_applicator_new (node);
+
+  gimp_filter_set_applicator (GIMP_FILTER (filter), filter->applicator);
+
+  gimp_applicator_set_cache (filter->applicator, TRUE);
+
+  filter->has_input = gegl_node_has_pad (filter->operation, "input");
+
+  if (filter->has_input)
+    {
+      GeglNode *input;
+
+      input = gegl_node_get_input_proxy (node, "input");
+
+      filter->translate = gegl_node_new_child (node,
+                                               "operation", "gegl:translate",
+                                               NULL);
+
+      filter->crop_before = gegl_node_new_child (node,
+                                                 "operation", "gegl:crop",
+                                                 NULL);
+
+      filter->cast_before = gegl_node_new_child (node,
+                                                 "operation", "gegl:nop",
+                                                 NULL);
+
+      filter->transform_before = gegl_node_new_child (node,
+                                                      "operation", "gegl:nop",
+                                                      NULL);
+
+      gegl_node_link_many (input,
+                           filter->translate,
+                           filter->crop_before,
+                           filter->cast_before,
+                           filter->transform_before,
+                           filter->operation,
+                           NULL);
+    }
+
+  filter->transform_after = gegl_node_new_child (node,
+                                                 "operation", "gegl:nop",
+                                                 NULL);
+
+  filter->cast_after = gegl_node_new_child (node,
+                                            "operation", "gegl:nop",
+                                            NULL);
+
+  filter->crop_after = gegl_node_new_child (node,
+                                            "operation", "gegl:crop",
+                                            NULL);
+
+  gegl_node_link_many (filter->operation,
+                       filter->transform_after,
+                       filter->cast_after,
+                       filter->crop_after,
+                       NULL);
+
+  gegl_node_connect_to (filter->crop_after, "output",
+                        node,               "aux");
+
+  return filter;
+}
+
+GimpDrawable *
+gimp_drawable_filter_get_drawable (GimpDrawableFilter *filter)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE_FILTER (filter), NULL);
+
+  return filter->drawable;
+}
+
+GeglNode *
+gimp_drawable_filter_get_operation (GimpDrawableFilter *filter)
+{
+  g_return_val_if_fail (GIMP_IS_DRAWABLE_FILTER (filter), NULL);
+
+  return filter->operation;
+}
+
+void
+gimp_drawable_filter_set_clip (GimpDrawableFilter *filter,
+                               gboolean            clip)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (clip != filter->clip)
+    {
+      filter->clip = clip;
+
+      gimp_drawable_filter_sync_clip (filter, TRUE);
+    }
+}
+
+void
+gimp_drawable_filter_set_region (GimpDrawableFilter *filter,
+                                 GimpFilterRegion    region)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (region != filter->region)
+    {
+      filter->region = region;
+
+      gimp_drawable_filter_sync_region (filter);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+void
+gimp_drawable_filter_set_crop (GimpDrawableFilter  *filter,
+                               const GeglRectangle *rect,
+                               gboolean             update)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if ((rect != NULL) != filter->crop_enabled ||
+      (rect && ! gegl_rectangle_equal (rect, &filter->crop_rect)))
+    {
+      gboolean      old_enabled = filter->crop_enabled;
+      GeglRectangle old_rect    = filter->crop_rect;
+
+      if (rect)
+        {
+          filter->crop_enabled = TRUE;
+          filter->crop_rect    = *rect;
+        }
+      else
+        {
+          filter->crop_enabled = FALSE;
+        }
+
+      gimp_drawable_filter_sync_crop (filter,
+                                      old_enabled,
+                                      &old_rect,
+                                      filter->preview_split_enabled,
+                                      filter->preview_split_alignment,
+                                      filter->preview_split_position,
+                                      update);
+    }
+}
+
+void
+gimp_drawable_filter_set_preview (GimpDrawableFilter *filter,
+                                  gboolean            enabled)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (enabled != filter->preview_enabled)
+    {
+      filter->preview_enabled = enabled;
+
+      gimp_drawable_filter_sync_active (filter);
+
+      if (gimp_drawable_filter_is_added (filter))
+        {
+          gimp_drawable_update_bounding_box (filter->drawable);
+
+          gimp_drawable_filter_update_drawable (filter, NULL);
+        }
+    }
+}
+
+void
+gimp_drawable_filter_set_preview_split (GimpDrawableFilter  *filter,
+                                        gboolean             enabled,
+                                        GimpAlignmentType    alignment,
+                                        gint                 position)
+{
+  GimpItem *item;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+  g_return_if_fail (alignment == GIMP_ALIGN_LEFT  ||
+                    alignment == GIMP_ALIGN_RIGHT ||
+                    alignment == GIMP_ALIGN_TOP   ||
+                    alignment == GIMP_ALIGN_BOTTOM);
+
+  item = GIMP_ITEM (filter->drawable);
+
+  switch (alignment)
+    {
+    case GIMP_ALIGN_LEFT:
+    case GIMP_ALIGN_RIGHT:
+      position = CLAMP (position, 0, gimp_item_get_width (item));
+      break;
+
+    case GIMP_ALIGN_TOP:
+    case GIMP_ALIGN_BOTTOM:
+      position = CLAMP (position, 0, gimp_item_get_height (item));
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  if (enabled   != filter->preview_split_enabled   ||
+      alignment != filter->preview_split_alignment ||
+      position  != filter->preview_split_position)
+    {
+      gboolean          old_enabled   = filter->preview_split_enabled;
+      GimpAlignmentType old_alignment = filter->preview_split_alignment;
+      gint              old_position  = filter->preview_split_position;
+
+      filter->preview_split_enabled   = enabled;
+      filter->preview_split_alignment = alignment;
+      filter->preview_split_position  = position;
+
+      gimp_drawable_filter_sync_crop (filter,
+                                      filter->crop_enabled,
+                                      &filter->crop_rect,
+                                      old_enabled,
+                                      old_alignment,
+                                      old_position,
+                                      TRUE);
+    }
+}
+
+void
+gimp_drawable_filter_set_opacity (GimpDrawableFilter *filter,
+                                  gdouble             opacity)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (opacity != filter->opacity)
+    {
+      filter->opacity = opacity;
+
+      gimp_drawable_filter_sync_opacity (filter);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+void
+gimp_drawable_filter_set_mode (GimpDrawableFilter     *filter,
+                               GimpLayerMode           paint_mode,
+                               GimpLayerColorSpace     blend_space,
+                               GimpLayerColorSpace     composite_space,
+                               GimpLayerCompositeMode  composite_mode)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (paint_mode      != filter->paint_mode      ||
+      blend_space     != filter->blend_space     ||
+      composite_space != filter->composite_space ||
+      composite_mode  != filter->composite_mode)
+    {
+      filter->paint_mode      = paint_mode;
+      filter->blend_space     = blend_space;
+      filter->composite_space = composite_space;
+      filter->composite_mode  = composite_mode;
+
+      gimp_drawable_filter_sync_mode (filter);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+void
+gimp_drawable_filter_set_add_alpha (GimpDrawableFilter *filter,
+                                    gboolean            add_alpha)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (add_alpha != filter->add_alpha)
+    {
+      filter->add_alpha = add_alpha;
+
+      gimp_drawable_filter_sync_format (filter);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+void
+gimp_drawable_filter_set_color_managed (GimpDrawableFilter *filter,
+                                        gboolean            color_managed)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (color_managed != filter->color_managed)
+    {
+      filter->color_managed = color_managed;
+
+      gimp_drawable_filter_sync_transform (filter);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+void
+gimp_drawable_filter_set_gamma_hack (GimpDrawableFilter *filter,
+                                     gboolean            gamma_hack)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (gamma_hack != filter->gamma_hack)
+    {
+      filter->gamma_hack = gamma_hack;
+
+      gimp_drawable_filter_sync_gamma_hack (filter);
+      gimp_drawable_filter_sync_transform (filter);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+void
+gimp_drawable_filter_set_override_constraints (GimpDrawableFilter *filter,
+                                               gboolean            override_constraints)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (override_constraints != filter->override_constraints)
+    {
+      filter->override_constraints = override_constraints;
+
+      gimp_drawable_filter_sync_affect (filter);
+      gimp_drawable_filter_sync_format (filter);
+      gimp_drawable_filter_sync_clip   (filter, TRUE);
+
+      if (gimp_drawable_filter_is_active (filter))
+        gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+const Babl *
+gimp_drawable_filter_get_format (GimpDrawableFilter *filter)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE_FILTER (filter), NULL);
+
+  format = gimp_applicator_get_output_format (filter->applicator);
+
+  if (! format)
+    format = gimp_drawable_get_format (filter->drawable);
+
+  return format;
+}
+
+void
+gimp_drawable_filter_apply (GimpDrawableFilter  *filter,
+                            const GeglRectangle *area)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (filter->drawable)));
+
+  gimp_drawable_filter_add_filter (filter);
+
+  gimp_drawable_filter_sync_clip (filter, TRUE);
+
+  if (gimp_drawable_filter_is_active (filter))
+    {
+      gimp_drawable_update_bounding_box (filter->drawable);
+
+      gimp_drawable_filter_update_drawable (filter, area);
+    }
+}
+
+gboolean
+gimp_drawable_filter_commit (GimpDrawableFilter *filter,
+                             GimpProgress       *progress,
+                             gboolean            cancellable)
+{
+  gboolean success = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE_FILTER (filter), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (filter->drawable)),
+                        FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+
+  if (gimp_drawable_filter_is_added (filter))
+    {
+      const Babl *format;
+
+      format = gimp_drawable_filter_get_format (filter);
+
+      gimp_drawable_filter_set_preview_split (filter, FALSE,
+                                              filter->preview_split_alignment,
+                                              filter->preview_split_position);
+      gimp_drawable_filter_set_preview (filter, TRUE);
+
+      success = gimp_drawable_merge_filter (filter->drawable,
+                                            GIMP_FILTER (filter),
+                                            progress,
+                                            gimp_object_get_name (filter),
+                                            format,
+                                            filter->filter_clip,
+                                            cancellable,
+                                            FALSE);
+
+      gimp_drawable_filter_remove_filter (filter);
+
+      if (! success)
+        gimp_drawable_filter_update_drawable (filter, NULL);
+
+      g_signal_emit (filter, drawable_filter_signals[FLUSH], 0);
+    }
+
+  return success;
+}
+
+void
+gimp_drawable_filter_abort (GimpDrawableFilter *filter)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  if (gimp_drawable_filter_remove_filter (filter))
+    {
+      gimp_drawable_filter_update_drawable (filter, NULL);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_drawable_filter_sync_active (GimpDrawableFilter *filter)
+{
+  gimp_applicator_set_active (filter->applicator, filter->preview_enabled);
+}
+
+static void
+gimp_drawable_filter_sync_clip (GimpDrawableFilter *filter,
+                                gboolean            sync_region)
+{
+  gboolean clip;
+
+  if (filter->override_constraints)
+    clip = filter->clip;
+  else
+    clip = gimp_item_get_clip (GIMP_ITEM (filter->drawable), filter->clip);
+
+  if (! clip)
+    {
+      GimpImage   *image = gimp_item_get_image (GIMP_ITEM (filter->drawable));
+      GimpChannel *mask  = gimp_image_get_mask (image);
+
+      if (! gimp_channel_is_empty (mask))
+        clip = TRUE;
+    }
+
+  if (! clip)
+    {
+      GeglRectangle bounding_box;
+
+      bounding_box = gegl_node_get_bounding_box (filter->operation);
+
+      if (gegl_rectangle_is_infinite_plane (&bounding_box))
+        clip = TRUE;
+    }
+
+  if (clip != filter->filter_clip)
+    {
+      filter->filter_clip = clip;
+
+      if (sync_region)
+        gimp_drawable_filter_sync_region (filter);
+    }
+}
+
+static void
+gimp_drawable_filter_sync_region (GimpDrawableFilter *filter)
+{
+  if (filter->region == GIMP_FILTER_REGION_SELECTION)
+    {
+      if (filter->has_input)
+        {
+          gegl_node_set (filter->translate,
+                         "x", (gdouble) -filter->filter_area.x,
+                         "y", (gdouble) -filter->filter_area.y,
+                         NULL);
+
+          gegl_node_set (filter->crop_before,
+                         "width",  (gdouble) filter->filter_area.width,
+                         "height", (gdouble) filter->filter_area.height,
+                         NULL);
+        }
+
+      if (filter->filter_clip)
+        {
+          gegl_node_set (filter->crop_after,
+                         "operation", "gegl:crop",
+                         "x",         0.0,
+                         "y",         0.0,
+                         "width",     (gdouble) filter->filter_area.width,
+                         "height",    (gdouble) filter->filter_area.height,
+                         NULL);
+        }
+      else
+        {
+          gegl_node_set (filter->crop_after,
+                         "operation", "gegl:nop",
+                         NULL);
+        }
+
+      gimp_applicator_set_apply_offset (filter->applicator,
+                                        filter->filter_area.x,
+                                        filter->filter_area.y);
+    }
+  else
+    {
+      GimpItem *item   = GIMP_ITEM (filter->drawable);
+      gdouble   width  = gimp_item_get_width (item);
+      gdouble   height = gimp_item_get_height (item);
+
+      if (filter->has_input)
+        {
+          gegl_node_set (filter->translate,
+                         "x", (gdouble) 0.0,
+                         "y", (gdouble) 0.0,
+                         NULL);
+
+          gegl_node_set (filter->crop_before,
+                         "width",  width,
+                         "height", height,
+                         NULL);
+        }
+
+      if (filter->filter_clip)
+        {
+          gegl_node_set (filter->crop_after,
+                         "operation", "gegl:crop",
+                         "x",         (gdouble) filter->filter_area.x,
+                         "y",         (gdouble) filter->filter_area.y,
+                         "width",     (gdouble) filter->filter_area.width,
+                         "height",    (gdouble) filter->filter_area.height,
+                         NULL);
+        }
+      else
+        {
+          gegl_node_set (filter->crop_after,
+                         "operation", "gegl:nop",
+                         NULL);
+        }
+
+      gimp_applicator_set_apply_offset (filter->applicator, 0, 0);
+    }
+
+  if (gimp_drawable_filter_is_active (filter))
+    {
+      if (gimp_drawable_update_bounding_box (filter->drawable))
+        g_signal_emit (filter, drawable_filter_signals[FLUSH], 0);
+    }
+}
+
+static gboolean
+gimp_drawable_filter_get_crop_rect (GimpDrawableFilter  *filter,
+                                    gboolean             crop_enabled,
+                                    const GeglRectangle *crop_rect,
+                                    gboolean             preview_split_enabled,
+                                    GimpAlignmentType    preview_split_alignment,
+                                    gint                 preview_split_position,
+                                    GeglRectangle       *rect)
+{
+  GeglRectangle bounds;
+  gint          x1, x2;
+  gint          y1, y2;
+
+  bounds = gegl_rectangle_infinite_plane ();
+
+  x1 = bounds.x;
+  x2 = bounds.x + bounds.width;
+
+  y1 = bounds.y;
+  y2 = bounds.y + bounds.height;
+
+  if (preview_split_enabled)
+    {
+      switch (preview_split_alignment)
+        {
+        case GIMP_ALIGN_LEFT:
+          x2 = preview_split_position;
+          break;
+
+        case GIMP_ALIGN_RIGHT:
+          x1 = preview_split_position;
+          break;
+
+        case GIMP_ALIGN_TOP:
+          y2 = preview_split_position;
+          break;
+
+        case GIMP_ALIGN_BOTTOM:
+          y1 = preview_split_position;
+          break;
+
+        default:
+          g_return_val_if_reached (FALSE);
+        }
+    }
+
+  gegl_rectangle_set (rect, x1, y1, x2 - x1, y2 - y1);
+
+  if (crop_enabled)
+    gegl_rectangle_intersect (rect, rect, crop_rect);
+
+  return ! gegl_rectangle_equal (rect, &bounds);
+}
+
+static void
+gimp_drawable_filter_sync_crop (GimpDrawableFilter  *filter,
+                                gboolean             old_crop_enabled,
+                                const GeglRectangle *old_crop_rect,
+                                gboolean             old_preview_split_enabled,
+                                GimpAlignmentType    old_preview_split_alignment,
+                                gint                 old_preview_split_position,
+                                gboolean             update)
+{
+  GeglRectangle old_rect;
+  GeglRectangle new_rect;
+  gboolean      enabled;
+
+  gimp_drawable_filter_get_crop_rect (filter,
+                                      old_crop_enabled,
+                                      old_crop_rect,
+                                      old_preview_split_enabled,
+                                      old_preview_split_alignment,
+                                      old_preview_split_position,
+                                      &old_rect);
+
+  enabled = gimp_drawable_filter_get_crop_rect (filter,
+                                                filter->crop_enabled,
+                                                &filter->crop_rect,
+                                                filter->preview_split_enabled,
+                                                filter->preview_split_alignment,
+                                                filter->preview_split_position,
+                                                &new_rect);
+
+  gimp_applicator_set_crop (filter->applicator, enabled ? &new_rect : NULL);
+
+  if (update                                     &&
+      gimp_drawable_filter_is_active (filter) &&
+      ! gegl_rectangle_equal (&old_rect, &new_rect))
+    {
+      GeglRectangle diff_rects[4];
+      gint          n_diff_rects;
+      gint          i;
+
+      gimp_drawable_update_bounding_box (filter->drawable);
+
+      n_diff_rects = gegl_rectangle_xor (diff_rects, &old_rect, &new_rect);
+
+      for (i = 0; i < n_diff_rects; i++)
+        gimp_drawable_filter_update_drawable (filter, &diff_rects[i]);
+    }
+}
+
+static void
+gimp_drawable_filter_sync_opacity (GimpDrawableFilter *filter)
+{
+  gimp_applicator_set_opacity (filter->applicator,
+                               filter->opacity);
+}
+
+static void
+gimp_drawable_filter_sync_mode (GimpDrawableFilter *filter)
+{
+  GimpLayerMode paint_mode = filter->paint_mode;
+
+  if (! filter->has_input && paint_mode == GIMP_LAYER_MODE_REPLACE)
+    {
+      /* if the filter's op has no input, use NORMAL instead of REPLACE, so
+       * that we composite the op's output on top of the input, instead of
+       * completely replacing it.
+       */
+      paint_mode = GIMP_LAYER_MODE_NORMAL;
+    }
+
+  gimp_applicator_set_mode (filter->applicator,
+                            paint_mode,
+                            filter->blend_space,
+                            filter->composite_space,
+                            filter->composite_mode);
+}
+
+static void
+gimp_drawable_filter_sync_affect (GimpDrawableFilter *filter)
+{
+  gimp_applicator_set_affect (
+    filter->applicator,
+    filter->override_constraints ?
+
+      GIMP_COMPONENT_MASK_RED   |
+      GIMP_COMPONENT_MASK_GREEN |
+      GIMP_COMPONENT_MASK_BLUE  |
+      GIMP_COMPONENT_MASK_ALPHA :
+
+      gimp_drawable_get_active_mask (filter->drawable));
+}
+
+static void
+gimp_drawable_filter_sync_format (GimpDrawableFilter *filter)
+{
+  const Babl *format;
+
+  if (filter->add_alpha                                &&
+      (gimp_drawable_supports_alpha (filter->drawable) ||
+       filter->override_constraints))
+    {
+      format = gimp_drawable_get_format_with_alpha (filter->drawable);
+    }
+  else
+    {
+      format = gimp_drawable_get_format (filter->drawable);
+    }
+
+  gimp_applicator_set_output_format (filter->applicator, format);
+}
+
+static void
+gimp_drawable_filter_sync_mask (GimpDrawableFilter *filter)
+{
+  GimpImage   *image = gimp_item_get_image (GIMP_ITEM (filter->drawable));
+  GimpChannel *mask  = gimp_image_get_mask (image);
+
+  if (gimp_channel_is_empty (mask))
+    {
+      gimp_applicator_set_mask_buffer (filter->applicator, NULL);
+    }
+  else
+    {
+      GeglBuffer *mask_buffer;
+      gint        offset_x, offset_y;
+
+      mask_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+      gimp_item_get_offset (GIMP_ITEM (filter->drawable),
+                            &offset_x, &offset_y);
+
+      gimp_applicator_set_mask_buffer (filter->applicator, mask_buffer);
+      gimp_applicator_set_mask_offset (filter->applicator,
+                                       -offset_x, -offset_y);
+    }
+
+  gimp_item_mask_intersect (GIMP_ITEM (filter->drawable),
+                            &filter->filter_area.x,
+                            &filter->filter_area.y,
+                            &filter->filter_area.width,
+                            &filter->filter_area.height);
+}
+
+static void
+gimp_drawable_filter_sync_transform (GimpDrawableFilter *filter)
+{
+  GimpColorManaged *managed = GIMP_COLOR_MANAGED (filter->drawable);
+
+  if (filter->color_managed)
+    {
+      const Babl       *drawable_format  = NULL;
+      const Babl       *input_format     = NULL;
+      const Babl       *output_format    = NULL;
+      GimpColorProfile *drawable_profile = NULL;
+      GimpColorProfile *input_profile    = NULL;
+      GimpColorProfile *output_profile   = NULL;
+      guint32           dummy;
+
+      drawable_format = gimp_drawable_get_format (filter->drawable);
+      if (filter->has_input)
+        input_format  = gimp_gegl_node_get_format (filter->operation, "input");
+      output_format   = gimp_gegl_node_get_format (filter->operation, "output");
+
+      g_printerr ("drawable format:      %s\n", babl_get_name (drawable_format));
+      if (filter->has_input)
+        g_printerr ("filter input format:  %s\n", babl_get_name (input_format));
+      g_printerr ("filter output format: %s\n", babl_get_name (output_format));
+
+      /*  convert the drawable format to float, so we get a precise
+       *  color transform
+       */
+      drawable_format =
+        gimp_babl_format (gimp_babl_format_get_base_type (drawable_format),
+                          gimp_babl_precision (GIMP_COMPONENT_TYPE_FLOAT,
+                                               gimp_babl_format_get_linear (drawable_format)),
+                          babl_format_has_alpha (drawable_format));
+
+      /*  convert the filter input/output formats to something we have
+       *  built-in color profiles for (see the get_color_profile()
+       *  calls below)
+       */
+      if (filter->has_input)
+        input_format = gimp_color_profile_get_lcms_format (input_format,  &dummy);
+      output_format  = gimp_color_profile_get_lcms_format (output_format, &dummy);
+
+      g_printerr ("profile transform drawable format: %s\n",
+                  babl_get_name (drawable_format));
+      if (filter->has_input)
+        g_printerr ("profile transform input format:    %s\n",
+                    babl_get_name (input_format));
+      g_printerr ("profile transform output format:   %s\n",
+                  babl_get_name (output_format));
+
+      drawable_profile = gimp_color_managed_get_color_profile (managed);
+      if (filter->has_input)
+        input_profile  = gimp_babl_format_get_color_profile (input_format);
+      output_profile   = gimp_babl_format_get_color_profile (output_format);
+
+      if ((filter->has_input &&
+           ! gimp_color_transform_can_gegl_copy (drawable_profile,
+                                                 input_profile)) ||
+          ! gimp_color_transform_can_gegl_copy (output_profile,
+                                                drawable_profile))
+        {
+          g_printerr ("using gimp:profile-transform\n");
+
+          if (filter->has_input)
+            {
+              gegl_node_set (filter->transform_before,
+                             "operation",    "gimp:profile-transform",
+                             "src-profile",  drawable_profile,
+                             "src-format",   drawable_format,
+                             "dest-profile", input_profile,
+                             "dest-format",  input_format,
+                             NULL);
+            }
+
+          gegl_node_set (filter->transform_after,
+                         "operation",    "gimp:profile-transform",
+                         "src-profile",  output_profile,
+                         "src-format",   output_format,
+                         "dest-profile", drawable_profile,
+                         "dest-format",  drawable_format,
+                         NULL);
+
+          return;
+        }
+    }
+
+  g_printerr ("using gegl copy\n");
+
+  if (filter->has_input)
+    {
+      gegl_node_set (filter->transform_before,
+                     "operation", "gegl:nop",
+                     NULL);
+    }
+
+  gegl_node_set (filter->transform_after,
+                 "operation", "gegl:nop",
+                 NULL);
+}
+
+static void
+gimp_drawable_filter_sync_gamma_hack (GimpDrawableFilter *filter)
+{
+  if (filter->gamma_hack)
+    {
+      const Babl *drawable_format;
+      const Babl *cast_format;
+
+      drawable_format =
+        gimp_drawable_get_format_with_alpha (filter->drawable);
+
+      cast_format =
+        gimp_babl_format (gimp_babl_format_get_base_type (drawable_format),
+                          gimp_babl_precision (gimp_babl_format_get_component_type (drawable_format),
+                                               ! gimp_babl_format_get_linear (drawable_format)),
+                          TRUE);
+
+      if (filter->has_input)
+        {
+          gegl_node_set (filter->cast_before,
+                         "operation",     "gegl:cast-format",
+                         "input-format",  drawable_format,
+                         "output-format", cast_format,
+                         NULL);
+        }
+
+      gegl_node_set (filter->cast_after,
+                     "operation",     "gegl:cast-format",
+                     "input-format",  cast_format,
+                     "output-format", drawable_format,
+                     NULL);
+    }
+  else
+    {
+      if (filter->has_input)
+        {
+          gegl_node_set (filter->cast_before,
+                         "operation", "gegl:nop",
+                         NULL);
+        }
+
+      gegl_node_set (filter->cast_after,
+                     "operation", "gegl:nop",
+                     NULL);
+    }
+}
+
+static gboolean
+gimp_drawable_filter_is_added (GimpDrawableFilter *filter)
+{
+  return gimp_drawable_has_filter (filter->drawable,
+                                   GIMP_FILTER (filter));
+}
+
+static gboolean
+gimp_drawable_filter_is_active (GimpDrawableFilter *filter)
+{
+  return gimp_drawable_filter_is_added (filter) &&
+         filter->preview_enabled;
+}
+
+static gboolean
+gimp_drawable_filter_add_filter (GimpDrawableFilter *filter)
+{
+  if (! gimp_drawable_filter_is_added (filter))
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (filter->drawable));
+
+      gimp_viewable_preview_freeze (GIMP_VIEWABLE (filter->drawable));
+
+      gimp_drawable_filter_sync_active (filter);
+      gimp_drawable_filter_sync_mask (filter);
+      gimp_drawable_filter_sync_clip (filter, FALSE);
+      gimp_drawable_filter_sync_region (filter);
+      gimp_drawable_filter_sync_crop (filter,
+                                      filter->crop_enabled,
+                                      &filter->crop_rect,
+                                      filter->preview_split_enabled,
+                                      filter->preview_split_alignment,
+                                      filter->preview_split_position,
+                                      TRUE);
+      gimp_drawable_filter_sync_opacity (filter);
+      gimp_drawable_filter_sync_mode (filter);
+      gimp_drawable_filter_sync_affect (filter);
+      gimp_drawable_filter_sync_format (filter);
+      gimp_drawable_filter_sync_transform (filter);
+      gimp_drawable_filter_sync_gamma_hack (filter);
+
+      gimp_drawable_add_filter (filter->drawable,
+                                GIMP_FILTER (filter));
+
+      gimp_drawable_update_bounding_box (filter->drawable);
+
+      g_signal_connect (image, "component-active-changed",
+                        G_CALLBACK (gimp_drawable_filter_affect_changed),
+                        filter);
+      g_signal_connect (image, "mask-changed",
+                        G_CALLBACK (gimp_drawable_filter_mask_changed),
+                        filter);
+      g_signal_connect (image, "profile-changed",
+                        G_CALLBACK (gimp_drawable_filter_profile_changed),
+                        filter);
+      g_signal_connect (filter->drawable, "lock-position-changed",
+                        G_CALLBACK (gimp_drawable_filter_lock_position_changed),
+                        filter);
+      g_signal_connect (filter->drawable, "format-changed",
+                        G_CALLBACK (gimp_drawable_filter_format_changed),
+                        filter);
+      g_signal_connect (filter->drawable, "removed",
+                        G_CALLBACK (gimp_drawable_filter_drawable_removed),
+                        filter);
+
+      if (GIMP_IS_LAYER (filter->drawable))
+        {
+          g_signal_connect (filter->drawable, "lock-alpha-changed",
+                            G_CALLBACK (gimp_drawable_filter_lock_alpha_changed),
+                            filter);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_drawable_filter_remove_filter (GimpDrawableFilter *filter)
+{
+  if (gimp_drawable_filter_is_added (filter))
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (filter->drawable));
+
+      if (GIMP_IS_LAYER (filter->drawable))
+        {
+          g_signal_handlers_disconnect_by_func (filter->drawable,
+                                                gimp_drawable_filter_lock_alpha_changed,
+                                                filter);
+        }
+
+      g_signal_handlers_disconnect_by_func (filter->drawable,
+                                            gimp_drawable_filter_drawable_removed,
+                                            filter);
+      g_signal_handlers_disconnect_by_func (filter->drawable,
+                                            gimp_drawable_filter_format_changed,
+                                            filter);
+      g_signal_handlers_disconnect_by_func (filter->drawable,
+                                            gimp_drawable_filter_lock_position_changed,
+                                            filter);
+      g_signal_handlers_disconnect_by_func (image,
+                                            gimp_drawable_filter_profile_changed,
+                                            filter);
+      g_signal_handlers_disconnect_by_func (image,
+                                            gimp_drawable_filter_mask_changed,
+                                            filter);
+      g_signal_handlers_disconnect_by_func (image,
+                                            gimp_drawable_filter_affect_changed,
+                                            filter);
+
+      gimp_drawable_remove_filter (filter->drawable,
+                                   GIMP_FILTER (filter));
+
+      gimp_drawable_update_bounding_box (filter->drawable);
+
+      gimp_viewable_preview_thaw (GIMP_VIEWABLE (filter->drawable));
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_drawable_filter_update_drawable (GimpDrawableFilter  *filter,
+                                      const GeglRectangle *area)
+{
+  GeglRectangle bounding_box;
+  GeglRectangle update_area;
+
+  bounding_box = gimp_drawable_get_bounding_box (filter->drawable);
+
+  if (area)
+    {
+      if (! gegl_rectangle_intersect (&update_area,
+                                      area, &bounding_box))
+        {
+          return;
+        }
+    }
+  else
+    {
+      gimp_drawable_filter_get_crop_rect (filter,
+                                          filter->crop_enabled,
+                                          &filter->crop_rect,
+                                          filter->preview_split_enabled,
+                                          filter->preview_split_alignment,
+                                          filter->preview_split_position,
+                                          &update_area);
+
+      if (! gegl_rectangle_intersect (&update_area,
+                                      &update_area, &bounding_box))
+        {
+          return;
+        }
+    }
+
+  if (update_area.width  > 0 &&
+      update_area.height > 0)
+    {
+      gimp_drawable_update (filter->drawable,
+                            update_area.x,
+                            update_area.y,
+                            update_area.width,
+                            update_area.height);
+
+      g_signal_emit (filter, drawable_filter_signals[FLUSH], 0);
+    }
+}
+
+static void
+gimp_drawable_filter_affect_changed (GimpImage          *image,
+                                     GimpChannelType     channel,
+                                     GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_sync_affect (filter);
+  gimp_drawable_filter_update_drawable (filter, NULL);
+}
+
+static void
+gimp_drawable_filter_mask_changed (GimpImage          *image,
+                                   GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_update_drawable (filter, NULL);
+
+  gimp_drawable_filter_sync_mask (filter);
+  gimp_drawable_filter_sync_clip (filter, FALSE);
+  gimp_drawable_filter_sync_region (filter);
+
+  gimp_drawable_filter_update_drawable (filter, NULL);
+}
+
+static void
+gimp_drawable_filter_profile_changed (GimpColorManaged   *managed,
+                                      GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_sync_transform (filter);
+  gimp_drawable_filter_update_drawable (filter, NULL);
+}
+
+static void
+gimp_drawable_filter_lock_position_changed (GimpDrawable       *drawable,
+                                            GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_sync_clip (filter, TRUE);
+  gimp_drawable_filter_update_drawable (filter, NULL);
+}
+
+static void
+gimp_drawable_filter_format_changed (GimpDrawable       *drawable,
+                                     GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_sync_format (filter);
+  gimp_drawable_filter_update_drawable (filter, NULL);
+}
+
+static void
+gimp_drawable_filter_drawable_removed (GimpDrawable       *drawable,
+                                       GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_remove_filter (filter);
+}
+
+static void
+gimp_drawable_filter_lock_alpha_changed (GimpLayer          *layer,
+                                         GimpDrawableFilter *filter)
+{
+  gimp_drawable_filter_sync_affect (filter);
+  gimp_drawable_filter_update_drawable (filter, NULL);
+}
diff --git a/app/core/gimpdrawablefilter.h b/app/core/gimpdrawablefilter.h
new file mode 100644
index 0000000..5aa8324
--- /dev/null
+++ b/app/core/gimpdrawablefilter.h
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_FILTER_H__
+#define __GIMP_DRAWABLE_FILTER_H__
+
+
+#include "gimpfilter.h"
+
+
+#define GIMP_TYPE_DRAWABLE_FILTER            (gimp_drawable_filter_get_type ())
+#define GIMP_DRAWABLE_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAWABLE_FILTER, GimpDrawableFilter))
+#define GIMP_DRAWABLE_FILTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAWABLE_FILTER, GimpDrawableFilterClass))
+#define GIMP_IS_DRAWABLE_FILTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAWABLE_FILTER))
+#define GIMP_IS_DRAWABLE_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAWABLE_FILTER))
+#define GIMP_DRAWABLE_FILTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAWABLE_FILTER, GimpDrawableFilterClass))
+
+
+typedef struct _GimpDrawableFilterClass  GimpDrawableFilterClass;
+
+struct _GimpDrawableFilterClass
+{
+  GimpFilterClass  parent_class;
+
+  void (* flush) (GimpDrawableFilter *filter);
+};
+
+
+/*  Drawable Filter functions  */
+
+/*  Successive apply() functions can be called, but eventually MUST be
+ *  followed with an commit() or an abort() call, both of which will
+ *  remove the live filter from the drawable.
+ */
+
+GType      gimp_drawable_filter_get_type       (void) G_GNUC_CONST;
+
+GimpDrawableFilter *
+           gimp_drawable_filter_new            (GimpDrawable        *drawable,
+                                                const gchar         *undo_desc,
+                                                GeglNode            *operation,
+                                                const gchar         *icon_name);
+
+GimpDrawable *
+           gimp_drawable_filter_get_drawable   (GimpDrawableFilter  *filter);
+GeglNode * gimp_drawable_filter_get_operation  (GimpDrawableFilter  *filter);
+
+void       gimp_drawable_filter_set_clip       (GimpDrawableFilter  *filter,
+                                                gboolean             clip);
+void       gimp_drawable_filter_set_region     (GimpDrawableFilter  *filter,
+                                                GimpFilterRegion     region);
+void       gimp_drawable_filter_set_crop       (GimpDrawableFilter  *filter,
+                                                const GeglRectangle *rect,
+                                                gboolean             update);
+void       gimp_drawable_filter_set_preview    (GimpDrawableFilter  *filter,
+                                                gboolean             enabled);
+void       gimp_drawable_filter_set_preview_split
+                                               (GimpDrawableFilter  *filter,
+                                                gboolean             enabled,
+                                                GimpAlignmentType    alignment,
+                                                gint                 split_position);
+void       gimp_drawable_filter_set_opacity    (GimpDrawableFilter  *filter,
+                                                gdouble              opacity);
+void       gimp_drawable_filter_set_mode       (GimpDrawableFilter  *filter,
+                                                GimpLayerMode        paint_mode,
+                                                GimpLayerColorSpace  blend_space,
+                                                GimpLayerColorSpace  composite_space,
+                                                GimpLayerCompositeMode composite_mode);
+void       gimp_drawable_filter_set_add_alpha  (GimpDrawableFilter  *filter,
+                                                gboolean             add_alpha);
+
+void       gimp_drawable_filter_set_color_managed
+                                               (GimpDrawableFilter  *filter,
+                                                gboolean             managed);
+void       gimp_drawable_filter_set_gamma_hack (GimpDrawableFilter  *filter,
+                                                gboolean             gamma_hack);
+
+void       gimp_drawable_filter_set_override_constraints
+                                               (GimpDrawableFilter  *filter,
+                                                gboolean             override_constraints);
+
+const Babl *
+           gimp_drawable_filter_get_format     (GimpDrawableFilter  *filter);
+
+void       gimp_drawable_filter_apply          (GimpDrawableFilter  *filter,
+                                                const GeglRectangle *area);
+
+gboolean   gimp_drawable_filter_commit         (GimpDrawableFilter  *filter,
+                                                GimpProgress        *progress,
+                                                gboolean             cancellable);
+void       gimp_drawable_filter_abort          (GimpDrawableFilter  *filter);
+
+
+#endif /* __GIMP_DRAWABLE_FILTER_H__ */
diff --git a/app/core/gimpdrawablemodundo.c b/app/core/gimpdrawablemodundo.c
new file mode 100644
index 0000000..5c3e897
--- /dev/null
+++ b/app/core/gimpdrawablemodundo.c
@@ -0,0 +1,216 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp-memsize.h"
+#include "gimpimage.h"
+#include "gimpdrawable.h"
+#include "gimpdrawablemodundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_COPY_BUFFER
+};
+
+
+static void     gimp_drawable_mod_undo_constructed  (GObject             *object);
+static void     gimp_drawable_mod_undo_set_property (GObject             *object,
+                                                     guint                property_id,
+                                                     const GValue        *value,
+                                                     GParamSpec          *pspec);
+static void     gimp_drawable_mod_undo_get_property (GObject             *object,
+                                                     guint                property_id,
+                                                     GValue              *value,
+                                                     GParamSpec          *pspec);
+
+static gint64   gimp_drawable_mod_undo_get_memsize  (GimpObject          *object,
+                                                     gint64              *gui_size);
+
+static void     gimp_drawable_mod_undo_pop          (GimpUndo            *undo,
+                                                     GimpUndoMode         undo_mode,
+                                                     GimpUndoAccumulator *accum);
+static void     gimp_drawable_mod_undo_free         (GimpUndo            *undo,
+                                                     GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpDrawableModUndo, gimp_drawable_mod_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_drawable_mod_undo_parent_class
+
+
+static void
+gimp_drawable_mod_undo_class_init (GimpDrawableModUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_drawable_mod_undo_constructed;
+  object_class->set_property     = gimp_drawable_mod_undo_set_property;
+  object_class->get_property     = gimp_drawable_mod_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_drawable_mod_undo_get_memsize;
+
+  undo_class->pop                = gimp_drawable_mod_undo_pop;
+  undo_class->free               = gimp_drawable_mod_undo_free;
+
+  g_object_class_install_property (object_class, PROP_COPY_BUFFER,
+                                   g_param_spec_boolean ("copy-buffer",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_drawable_mod_undo_init (GimpDrawableModUndo *undo)
+{
+}
+
+static void
+gimp_drawable_mod_undo_constructed (GObject *object)
+{
+  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
+  GimpItem            *item;
+  GimpDrawable        *drawable;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_DRAWABLE (GIMP_ITEM_UNDO (object)->item));
+
+  item     = GIMP_ITEM_UNDO (object)->item;
+  drawable = GIMP_DRAWABLE (item);
+
+  if (drawable_mod_undo->copy_buffer)
+    {
+      drawable_mod_undo->buffer =
+        gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
+    }
+  else
+    {
+      drawable_mod_undo->buffer =
+        g_object_ref (gimp_drawable_get_buffer (drawable));
+    }
+
+  gimp_item_get_offset (item,
+                        &drawable_mod_undo->offset_x,
+                        &drawable_mod_undo->offset_y);
+}
+
+static void
+gimp_drawable_mod_undo_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_COPY_BUFFER:
+      drawable_mod_undo->copy_buffer = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_drawable_mod_undo_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_COPY_BUFFER:
+      g_value_set_boolean (value, drawable_mod_undo->copy_buffer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_drawable_mod_undo_get_memsize (GimpObject *object,
+                                    gint64     *gui_size)
+{
+  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (object);
+  gint64               memsize           = 0;
+
+  memsize += gimp_gegl_buffer_get_memsize (drawable_mod_undo->buffer);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_drawable_mod_undo_pop (GimpUndo            *undo,
+                            GimpUndoMode         undo_mode,
+                            GimpUndoAccumulator *accum)
+{
+  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (undo);
+  GimpDrawable        *drawable          = GIMP_DRAWABLE (GIMP_ITEM_UNDO (undo)->item);
+  GeglBuffer          *buffer;
+  gint                 offset_x;
+  gint                 offset_y;
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  buffer   = drawable_mod_undo->buffer;
+  offset_x = drawable_mod_undo->offset_x;
+  offset_y = drawable_mod_undo->offset_y;
+
+  drawable_mod_undo->buffer = g_object_ref (gimp_drawable_get_buffer (drawable));
+
+  gimp_item_get_offset (GIMP_ITEM (drawable),
+                        &drawable_mod_undo->offset_x,
+                        &drawable_mod_undo->offset_y);
+
+  gimp_drawable_set_buffer_full (drawable, FALSE, NULL,
+                                 buffer,
+                                 GEGL_RECTANGLE (offset_x, offset_y, 0, 0),
+                                 TRUE);
+  g_object_unref (buffer);
+}
+
+static void
+gimp_drawable_mod_undo_free (GimpUndo     *undo,
+                             GimpUndoMode  undo_mode)
+{
+  GimpDrawableModUndo *drawable_mod_undo = GIMP_DRAWABLE_MOD_UNDO (undo);
+
+  g_clear_object (&drawable_mod_undo->buffer);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpdrawablemodundo.h b/app/core/gimpdrawablemodundo.h
new file mode 100644
index 0000000..30bf5a0
--- /dev/null
+++ b/app/core/gimpdrawablemodundo.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_MOD_UNDO_H__
+#define __GIMP_DRAWABLE_MOD_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_DRAWABLE_MOD_UNDO            (gimp_drawable_mod_undo_get_type ())
+#define GIMP_DRAWABLE_MOD_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAWABLE_MOD_UNDO, GimpDrawableModUndo))
+#define GIMP_DRAWABLE_MOD_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAWABLE_MOD_UNDO, GimpDrawableModUndoClass))
+#define GIMP_IS_DRAWABLE_MOD_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAWABLE_MOD_UNDO))
+#define GIMP_IS_DRAWABLE_MOD_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAWABLE_MOD_UNDO))
+#define GIMP_DRAWABLE_MOD_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAWABLE_MOD_UNDO, GimpDrawableModUndoClass))
+
+
+typedef struct _GimpDrawableModUndo      GimpDrawableModUndo;
+typedef struct _GimpDrawableModUndoClass GimpDrawableModUndoClass;
+
+struct _GimpDrawableModUndo
+{
+  GimpItemUndo   parent_instance;
+
+  GeglBuffer    *buffer;
+  gboolean       copy_buffer;
+  gint           offset_x;
+  gint           offset_y;
+};
+
+struct _GimpDrawableModUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_drawable_mod_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_DRAWABLE_MOD_UNDO_H__ */
diff --git a/app/core/gimpdrawablestack.c b/app/core/gimpdrawablestack.c
new file mode 100644
index 0000000..c8e706a
--- /dev/null
+++ b/app/core/gimpdrawablestack.c
@@ -0,0 +1,224 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawablestack.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpdrawable.h"
+#include "gimpdrawablestack.h"
+#include "gimpmarshal.h"
+
+
+enum
+{
+  UPDATE,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_drawable_stack_constructed      (GObject           *object);
+
+static void   gimp_drawable_stack_add              (GimpContainer     *container,
+                                                    GimpObject        *object);
+static void   gimp_drawable_stack_remove           (GimpContainer     *container,
+                                                    GimpObject        *object);
+static void   gimp_drawable_stack_reorder          (GimpContainer     *container,
+                                                    GimpObject        *object,
+                                                    gint               new_index);
+
+static void   gimp_drawable_stack_drawable_update  (GimpItem          *item,
+                                                    gint               x,
+                                                    gint               y,
+                                                    gint               width,
+                                                    gint               height,
+                                                    GimpDrawableStack *stack);
+static void   gimp_drawable_stack_drawable_active  (GimpItem          *item,
+                                                    GimpDrawableStack *stack);
+
+
+G_DEFINE_TYPE (GimpDrawableStack, gimp_drawable_stack, GIMP_TYPE_ITEM_STACK)
+
+#define parent_class gimp_drawable_stack_parent_class
+
+static guint stack_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_drawable_stack_class_init (GimpDrawableStackClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GimpContainerClass *container_class = GIMP_CONTAINER_CLASS (klass);
+
+  stack_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDrawableStackClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT_INT_INT,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  object_class->constructed = gimp_drawable_stack_constructed;
+
+  container_class->add      = gimp_drawable_stack_add;
+  container_class->remove   = gimp_drawable_stack_remove;
+  container_class->reorder  = gimp_drawable_stack_reorder;
+}
+
+static void
+gimp_drawable_stack_init (GimpDrawableStack *stack)
+{
+}
+
+static void
+gimp_drawable_stack_constructed (GObject *object)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+                            GIMP_TYPE_DRAWABLE));
+
+  gimp_container_add_handler (container, "update",
+                              G_CALLBACK (gimp_drawable_stack_drawable_update),
+                              container);
+  gimp_container_add_handler (container, "active-changed",
+                              G_CALLBACK (gimp_drawable_stack_drawable_active),
+                              container);
+}
+
+static void
+gimp_drawable_stack_add (GimpContainer *container,
+                         GimpObject    *object)
+{
+  GimpDrawableStack *stack = GIMP_DRAWABLE_STACK (container);
+
+  GIMP_CONTAINER_CLASS (parent_class)->add (container, object);
+
+  if (gimp_filter_get_active (GIMP_FILTER (object)))
+    gimp_drawable_stack_drawable_active (GIMP_ITEM (object), stack);
+}
+
+static void
+gimp_drawable_stack_remove (GimpContainer *container,
+                            GimpObject    *object)
+{
+  GimpDrawableStack *stack = GIMP_DRAWABLE_STACK (container);
+
+  GIMP_CONTAINER_CLASS (parent_class)->remove (container, object);
+
+  if (gimp_filter_get_active (GIMP_FILTER (object)))
+    gimp_drawable_stack_drawable_active (GIMP_ITEM (object), stack);
+}
+
+static void
+gimp_drawable_stack_reorder (GimpContainer *container,
+                             GimpObject    *object,
+                             gint           new_index)
+{
+  GimpDrawableStack *stack  = GIMP_DRAWABLE_STACK (container);
+
+  GIMP_CONTAINER_CLASS (parent_class)->reorder (container, object, new_index);
+
+  if (gimp_filter_get_active (GIMP_FILTER (object)))
+    gimp_drawable_stack_drawable_active (GIMP_ITEM (object), stack);
+}
+
+
+/*  public functions  */
+
+GimpContainer *
+gimp_drawable_stack_new (GType drawable_type)
+{
+  g_return_val_if_fail (g_type_is_a (drawable_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  return g_object_new (GIMP_TYPE_DRAWABLE_STACK,
+                       "name",          g_type_name (drawable_type),
+                       "children-type", drawable_type,
+                       "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                       NULL);
+}
+
+
+/*  protected functions  */
+
+void
+gimp_drawable_stack_update (GimpDrawableStack *stack,
+                            gint               x,
+                            gint               y,
+                            gint               width,
+                            gint               height)
+{
+  g_return_if_fail (GIMP_IS_DRAWABLE_STACK (stack));
+
+  g_signal_emit (stack, stack_signals[UPDATE], 0,
+                 x, y, width, height);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_drawable_stack_drawable_update (GimpItem          *item,
+                                     gint               x,
+                                     gint               y,
+                                     gint               width,
+                                     gint               height,
+                                     GimpDrawableStack *stack)
+{
+  if (gimp_filter_get_active (GIMP_FILTER (item)))
+    {
+      gint offset_x;
+      gint offset_y;
+
+      gimp_item_get_offset (item, &offset_x, &offset_y);
+
+      gimp_drawable_stack_update (stack,
+                                  x + offset_x, y + offset_y,
+                                  width, height);
+    }
+}
+
+static void
+gimp_drawable_stack_drawable_active (GimpItem          *item,
+                                     GimpDrawableStack *stack)
+{
+  GeglRectangle bounding_box;
+
+  bounding_box = gimp_drawable_get_bounding_box (GIMP_DRAWABLE (item));
+
+  bounding_box.x += gimp_item_get_offset_x (item);
+  bounding_box.y += gimp_item_get_offset_y (item);
+
+  gimp_drawable_stack_update (stack,
+                              bounding_box.x,     bounding_box.y,
+                              bounding_box.width, bounding_box.height);
+}
diff --git a/app/core/gimpdrawablestack.h b/app/core/gimpdrawablestack.h
new file mode 100644
index 0000000..28ee7c4
--- /dev/null
+++ b/app/core/gimpdrawablestack.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawablestack.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_STACK_H__
+#define __GIMP_DRAWABLE_STACK_H__
+
+#include "gimpitemstack.h"
+
+
+#define GIMP_TYPE_DRAWABLE_STACK            (gimp_drawable_stack_get_type ())
+#define GIMP_DRAWABLE_STACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAWABLE_STACK, GimpDrawableStack))
+#define GIMP_DRAWABLE_STACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAWABLE_STACK, GimpDrawableStackClass))
+#define GIMP_IS_DRAWABLE_STACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAWABLE_STACK))
+#define GIMP_IS_DRAWABLE_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAWABLE_STACK))
+
+
+typedef struct _GimpDrawableStackClass GimpDrawableStackClass;
+
+struct _GimpDrawableStack
+{
+  GimpItemStack  parent_instance;
+};
+
+struct _GimpDrawableStackClass
+{
+  GimpItemStackClass  parent_class;
+
+  void (* update) (GimpDrawableStack *stack,
+                   gint               x,
+                   gint               y,
+                   gint               width,
+                   gint               height);
+};
+
+
+GType           gimp_drawable_stack_get_type  (void) G_GNUC_CONST;
+GimpContainer * gimp_drawable_stack_new       (GType              drawable_type);
+
+
+/*  protected  */
+
+void            gimp_drawable_stack_update    (GimpDrawableStack *stack,
+                                               gint               x,
+                                               gint               y,
+                                               gint               width,
+                                               gint               height);
+
+
+#endif  /*  __GIMP_DRAWABLE_STACK_H__  */
diff --git a/app/core/gimpdrawableundo.c b/app/core/gimpdrawableundo.c
new file mode 100644
index 0000000..78b8f39
--- /dev/null
+++ b/app/core/gimpdrawableundo.c
@@ -0,0 +1,207 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpimage.h"
+#include "gimpdrawable.h"
+#include "gimpdrawableundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_BUFFER,
+  PROP_X,
+  PROP_Y
+};
+
+
+static void     gimp_drawable_undo_constructed  (GObject             *object);
+static void     gimp_drawable_undo_set_property (GObject             *object,
+                                                 guint                property_id,
+                                                 const GValue        *value,
+                                                 GParamSpec          *pspec);
+static void     gimp_drawable_undo_get_property (GObject             *object,
+                                                 guint                property_id,
+                                                 GValue              *value,
+                                                 GParamSpec          *pspec);
+
+static gint64   gimp_drawable_undo_get_memsize  (GimpObject          *object,
+                                                 gint64              *gui_size);
+
+static void     gimp_drawable_undo_pop          (GimpUndo            *undo,
+                                                 GimpUndoMode         undo_mode,
+                                                 GimpUndoAccumulator *accum);
+static void     gimp_drawable_undo_free         (GimpUndo            *undo,
+                                                 GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpDrawableUndo, gimp_drawable_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_drawable_undo_parent_class
+
+
+static void
+gimp_drawable_undo_class_init (GimpDrawableUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_drawable_undo_constructed;
+  object_class->set_property     = gimp_drawable_undo_set_property;
+  object_class->get_property     = gimp_drawable_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_drawable_undo_get_memsize;
+
+  undo_class->pop                = gimp_drawable_undo_pop;
+  undo_class->free               = gimp_drawable_undo_free;
+
+  g_object_class_install_property (object_class, PROP_BUFFER,
+                                   g_param_spec_object ("buffer", NULL, NULL,
+                                                        GEGL_TYPE_BUFFER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_int ("x", NULL, NULL,
+                                                     0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_int ("y", NULL, NULL,
+                                                     0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_drawable_undo_init (GimpDrawableUndo *undo)
+{
+}
+
+static void
+gimp_drawable_undo_constructed (GObject *object)
+{
+  GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_DRAWABLE (GIMP_ITEM_UNDO (object)->item));
+  gimp_assert (GEGL_IS_BUFFER (drawable_undo->buffer));
+}
+
+static void
+gimp_drawable_undo_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      drawable_undo->buffer = g_value_dup_object (value);
+      break;
+    case PROP_X:
+      drawable_undo->x = g_value_get_int (value);
+      break;
+    case PROP_Y:
+      drawable_undo->y = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_drawable_undo_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      g_value_set_object (value, drawable_undo->buffer);
+      break;
+    case PROP_X:
+      g_value_set_int (value, drawable_undo->x);
+      break;
+    case PROP_Y:
+      g_value_set_int (value, drawable_undo->y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_drawable_undo_get_memsize (GimpObject *object,
+                                gint64     *gui_size)
+{
+  GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
+  gint64            memsize       = 0;
+
+  memsize += gimp_gegl_buffer_get_memsize (drawable_undo->buffer);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_drawable_undo_pop (GimpUndo            *undo,
+                        GimpUndoMode         undo_mode,
+                        GimpUndoAccumulator *accum)
+{
+  GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (undo);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  gimp_drawable_swap_pixels (GIMP_DRAWABLE (GIMP_ITEM_UNDO (undo)->item),
+                             drawable_undo->buffer,
+                             drawable_undo->x,
+                             drawable_undo->y);
+}
+
+static void
+gimp_drawable_undo_free (GimpUndo     *undo,
+                         GimpUndoMode  undo_mode)
+{
+  GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (undo);
+
+  g_clear_object (&drawable_undo->buffer);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpdrawableundo.h b/app/core/gimpdrawableundo.h
new file mode 100644
index 0000000..5d7269e
--- /dev/null
+++ b/app/core/gimpdrawableundo.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_UNDO_H__
+#define __GIMP_DRAWABLE_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_DRAWABLE_UNDO            (gimp_drawable_undo_get_type ())
+#define GIMP_DRAWABLE_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAWABLE_UNDO, GimpDrawableUndo))
+#define GIMP_DRAWABLE_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAWABLE_UNDO, GimpDrawableUndoClass))
+#define GIMP_IS_DRAWABLE_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAWABLE_UNDO))
+#define GIMP_IS_DRAWABLE_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAWABLE_UNDO))
+#define GIMP_DRAWABLE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAWABLE_UNDO, GimpDrawableUndoClass))
+
+
+typedef struct _GimpDrawableUndo      GimpDrawableUndo;
+typedef struct _GimpDrawableUndoClass GimpDrawableUndoClass;
+
+struct _GimpDrawableUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GeglBuffer   *buffer;
+  gint          x;
+  gint          y;
+};
+
+struct _GimpDrawableUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_drawable_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_DRAWABLE_UNDO_H__ */
diff --git a/app/core/gimpdynamics-load.c b/app/core/gimpdynamics-load.c
new file mode 100644
index 0000000..36c9f72
--- /dev/null
+++ b/app/core/gimpdynamics-load.c
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpdynamics.h"
+#include "gimpdynamics-load.h"
+
+
+GList *
+gimp_dynamics_load (GimpContext   *context,
+                    GFile         *file,
+                    GInputStream  *input,
+                    GError       **error)
+{
+  GimpDynamics *dynamics;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  dynamics = g_object_new (GIMP_TYPE_DYNAMICS, NULL);
+
+  if (gimp_config_deserialize_stream (GIMP_CONFIG (dynamics),
+                                      input,
+                                      NULL, error))
+    {
+      return g_list_prepend (NULL, dynamics);
+    }
+
+  g_object_unref (dynamics);
+
+  return NULL;
+}
diff --git a/app/core/gimpdynamics-load.h b/app/core/gimpdynamics-load.h
new file mode 100644
index 0000000..374c6ed
--- /dev/null
+++ b/app/core/gimpdynamics-load.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_LOAD_H__
+#define __GIMP_DYNAMICS_LOAD_H__
+
+
+#define GIMP_DYNAMICS_FILE_EXTENSION ".gdyn"
+
+
+GList * gimp_dynamics_load (GimpContext   *context,
+                            GFile         *file,
+                            GInputStream  *input,
+                            GError       **error);
+
+
+#endif /* __GIMP_DYNAMICS_LOAD_H__ */
diff --git a/app/core/gimpdynamics-save.c b/app/core/gimpdynamics-save.c
new file mode 100644
index 0000000..d8bdf3d
--- /dev/null
+++ b/app/core/gimpdynamics-save.c
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpdynamics.h"
+#include "gimpdynamics-save.h"
+
+
+gboolean
+gimp_dynamics_save (GimpData       *data,
+                    GOutputStream  *output,
+                    GError        **error)
+{
+  g_return_val_if_fail (GIMP_IS_DYNAMICS (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return gimp_config_serialize_to_stream (GIMP_CONFIG (data),
+                                          output,
+                                          "GIMP dynamics file",
+                                          "end of GIMP dynamics file",
+                                          NULL, error);
+}
diff --git a/app/core/gimpdynamics-save.h b/app/core/gimpdynamics-save.h
new file mode 100644
index 0000000..7fe2df3
--- /dev/null
+++ b/app/core/gimpdynamics-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_SAVE_H__
+#define __GIMP_DYNAMICS_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_dynamics_save (GimpData       *data,
+                               GOutputStream  *output,
+                               GError        **error);
+
+
+#endif /* __GIMP_DYNAMICS_SAVE_H__ */
diff --git a/app/core/gimpdynamics.c b/app/core/gimpdynamics.c
new file mode 100644
index 0000000..a1fb0ef
--- /dev/null
+++ b/app/core/gimpdynamics.c
@@ -0,0 +1,653 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpcurve.h"
+#include "gimpdynamics.h"
+#include "gimpdynamics-load.h"
+#include "gimpdynamics-save.h"
+#include "gimpdynamicsoutput.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_NAME "Nameless dynamics"
+
+enum
+{
+  PROP_0,
+
+  PROP_NAME,
+
+  PROP_OPACITY_OUTPUT,
+  PROP_SIZE_OUTPUT,
+  PROP_ANGLE_OUTPUT,
+  PROP_COLOR_OUTPUT,
+  PROP_FORCE_OUTPUT,
+  PROP_HARDNESS_OUTPUT,
+  PROP_ASPECT_RATIO_OUTPUT,
+  PROP_SPACING_OUTPUT,
+  PROP_RATE_OUTPUT,
+  PROP_FLOW_OUTPUT,
+  PROP_JITTER_OUTPUT
+};
+
+
+typedef struct _GimpDynamicsPrivate GimpDynamicsPrivate;
+
+struct _GimpDynamicsPrivate
+{
+  GimpDynamicsOutput *opacity_output;
+  GimpDynamicsOutput *hardness_output;
+  GimpDynamicsOutput *force_output;
+  GimpDynamicsOutput *rate_output;
+  GimpDynamicsOutput *flow_output;
+  GimpDynamicsOutput *size_output;
+  GimpDynamicsOutput *aspect_ratio_output;
+  GimpDynamicsOutput *color_output;
+  GimpDynamicsOutput *angle_output;
+  GimpDynamicsOutput *jitter_output;
+  GimpDynamicsOutput *spacing_output;
+};
+
+#define GET_PRIVATE(output) \
+        ((GimpDynamicsPrivate *) gimp_dynamics_get_instance_private ((GimpDynamics *) (output)))
+
+
+static void          gimp_dynamics_finalize      (GObject      *object);
+static void          gimp_dynamics_set_property  (GObject      *object,
+                                                  guint         property_id,
+                                                  const GValue *value,
+                                                  GParamSpec   *pspec);
+static void          gimp_dynamics_get_property  (GObject      *object,
+                                                  guint         property_id,
+                                                  GValue       *value,
+                                                  GParamSpec   *pspec);
+static void
+       gimp_dynamics_dispatch_properties_changed (GObject      *object,
+                                                  guint         n_pspecs,
+                                                  GParamSpec  **pspecs);
+
+static const gchar * gimp_dynamics_get_extension (GimpData     *data);
+static void          gimp_dynamics_copy          (GimpData     *data,
+                                                  GimpData     *src_data);
+
+static GimpDynamicsOutput *
+                     gimp_dynamics_create_output (GimpDynamics           *dynamics,
+                                                  const gchar            *name,
+                                                  GimpDynamicsOutputType  type);
+static void          gimp_dynamics_output_notify (GObject          *output,
+                                                  const GParamSpec *pspec,
+                                                  GimpDynamics     *dynamics);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDynamics, gimp_dynamics, GIMP_TYPE_DATA)
+
+#define parent_class gimp_dynamics_parent_class
+
+
+static void
+gimp_dynamics_class_init (GimpDynamicsClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpDataClass     *data_class     = GIMP_DATA_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->finalize                    = gimp_dynamics_finalize;
+  object_class->set_property                = gimp_dynamics_set_property;
+  object_class->get_property                = gimp_dynamics_get_property;
+  object_class->dispatch_properties_changed = gimp_dynamics_dispatch_properties_changed;
+
+  viewable_class->default_icon_name         = "gimp-dynamics";
+
+  data_class->save                          = gimp_dynamics_save;
+  data_class->get_extension                 = gimp_dynamics_get_extension;
+  data_class->copy                          = gimp_dynamics_copy;
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_NAME,
+                           "name",
+                           NULL, NULL,
+                           DEFAULT_NAME,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_OPACITY_OUTPUT,
+                           "opacity-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_FORCE_OUTPUT,
+                           "force-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_HARDNESS_OUTPUT,
+                           "hardness-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_RATE_OUTPUT,
+                           "rate-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_FLOW_OUTPUT,
+                           "flow-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_SIZE_OUTPUT,
+                           "size-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_ASPECT_RATIO_OUTPUT,
+                           "aspect-ratio-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_COLOR_OUTPUT,
+                           "color-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_ANGLE_OUTPUT,
+                           "angle-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_JITTER_OUTPUT,
+                           "jitter-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_SPACING_OUTPUT,
+                           "spacing-output",
+                           NULL, NULL,
+                           GIMP_TYPE_DYNAMICS_OUTPUT,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+}
+
+static void
+gimp_dynamics_init (GimpDynamics *dynamics)
+{
+  GimpDynamicsPrivate *private = GET_PRIVATE (dynamics);
+
+  private->opacity_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "opacity-output",
+                                 GIMP_DYNAMICS_OUTPUT_OPACITY);
+
+  private->force_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "force-output",
+                                 GIMP_DYNAMICS_OUTPUT_FORCE);
+
+  private->hardness_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "hardness-output",
+                                 GIMP_DYNAMICS_OUTPUT_HARDNESS);
+
+  private->rate_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "rate-output",
+                                 GIMP_DYNAMICS_OUTPUT_RATE);
+
+  private->flow_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "flow-output",
+                                 GIMP_DYNAMICS_OUTPUT_FLOW);
+
+  private->size_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "size-output",
+                                 GIMP_DYNAMICS_OUTPUT_SIZE);
+
+  private->aspect_ratio_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "aspect-ratio-output",
+                                 GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO);
+
+  private->color_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "color-output",
+                                 GIMP_DYNAMICS_OUTPUT_COLOR);
+
+  private->angle_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "angle-output",
+                                 GIMP_DYNAMICS_OUTPUT_ANGLE);
+
+  private->jitter_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "jitter-output",
+                                 GIMP_DYNAMICS_OUTPUT_JITTER);
+
+  private->spacing_output =
+    gimp_dynamics_create_output (dynamics,
+                                 "spacing-output",
+                                 GIMP_DYNAMICS_OUTPUT_SPACING);
+}
+
+static void
+gimp_dynamics_finalize (GObject *object)
+{
+  GimpDynamicsPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->opacity_output);
+  g_clear_object (&private->force_output);
+  g_clear_object (&private->hardness_output);
+  g_clear_object (&private->rate_output);
+  g_clear_object (&private->flow_output);
+  g_clear_object (&private->size_output);
+  g_clear_object (&private->aspect_ratio_output);
+  g_clear_object (&private->color_output);
+  g_clear_object (&private->angle_output);
+  g_clear_object (&private->jitter_output);
+  g_clear_object (&private->spacing_output);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dynamics_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpDynamicsPrivate *private     = GET_PRIVATE (object);
+  GimpDynamicsOutput  *src_output  = NULL;
+  GimpDynamicsOutput  *dest_output = NULL;
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      gimp_object_set_name (GIMP_OBJECT (object), g_value_get_string (value));
+      break;
+
+    case PROP_OPACITY_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->opacity_output;
+      break;
+
+    case PROP_FORCE_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->force_output;
+      break;
+
+    case PROP_HARDNESS_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->hardness_output;
+      break;
+
+    case PROP_RATE_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->rate_output;
+      break;
+
+    case PROP_FLOW_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->flow_output;
+      break;
+
+    case PROP_SIZE_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->size_output;
+      break;
+
+    case PROP_ASPECT_RATIO_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->aspect_ratio_output;
+      break;
+
+    case PROP_COLOR_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->color_output;
+      break;
+
+    case PROP_ANGLE_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->angle_output;
+      break;
+
+    case PROP_JITTER_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->jitter_output;
+      break;
+
+    case PROP_SPACING_OUTPUT:
+      src_output  = g_value_get_object (value);
+      dest_output = private->spacing_output;
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+
+  if (src_output && dest_output)
+    {
+      gimp_config_copy (GIMP_CONFIG (src_output),
+                        GIMP_CONFIG (dest_output),
+                        GIMP_CONFIG_PARAM_SERIALIZE);
+    }
+}
+
+static void
+gimp_dynamics_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpDynamicsPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      g_value_set_string (value, gimp_object_get_name (object));
+      break;
+
+    case PROP_OPACITY_OUTPUT:
+      g_value_set_object (value, private->opacity_output);
+      break;
+
+    case PROP_FORCE_OUTPUT:
+      g_value_set_object (value, private->force_output);
+      break;
+
+    case PROP_HARDNESS_OUTPUT:
+      g_value_set_object (value, private->hardness_output);
+      break;
+
+    case PROP_RATE_OUTPUT:
+      g_value_set_object (value, private->rate_output);
+      break;
+
+    case PROP_FLOW_OUTPUT:
+      g_value_set_object (value, private->flow_output);
+      break;
+
+    case PROP_SIZE_OUTPUT:
+      g_value_set_object (value, private->size_output);
+      break;
+
+    case PROP_ASPECT_RATIO_OUTPUT:
+      g_value_set_object (value, private->aspect_ratio_output);
+      break;
+
+    case PROP_COLOR_OUTPUT:
+      g_value_set_object (value, private->color_output);
+      break;
+
+    case PROP_ANGLE_OUTPUT:
+      g_value_set_object (value, private->angle_output);
+      break;
+
+    case PROP_JITTER_OUTPUT:
+      g_value_set_object (value, private->jitter_output);
+      break;
+
+    case PROP_SPACING_OUTPUT:
+      g_value_set_object (value, private->spacing_output);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dynamics_dispatch_properties_changed (GObject     *object,
+                                           guint        n_pspecs,
+                                           GParamSpec **pspecs)
+{
+  gint i;
+
+  G_OBJECT_CLASS (parent_class)->dispatch_properties_changed (object,
+                                                              n_pspecs, pspecs);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      if (pspecs[i]->flags & GIMP_CONFIG_PARAM_SERIALIZE)
+        {
+          gimp_data_dirty (GIMP_DATA (object));
+          break;
+        }
+    }
+}
+
+static const gchar *
+gimp_dynamics_get_extension (GimpData *data)
+{
+  return GIMP_DYNAMICS_FILE_EXTENSION;
+}
+
+static void
+gimp_dynamics_copy (GimpData *data,
+                    GimpData *src_data)
+{
+  gimp_data_freeze (data);
+
+  gimp_config_copy (GIMP_CONFIG (src_data),
+                    GIMP_CONFIG (data), 0);
+
+  gimp_data_thaw (data);
+}
+
+
+/*  public functions  */
+
+GimpData *
+gimp_dynamics_new (GimpContext *context,
+                   const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (name[0] != '\0', NULL);
+
+  return g_object_new (GIMP_TYPE_DYNAMICS,
+                       "name", name,
+                       NULL);
+}
+
+GimpData *
+gimp_dynamics_get_standard (GimpContext *context)
+{
+  static GimpData *standard_dynamics = NULL;
+
+  if (! standard_dynamics)
+    {
+      standard_dynamics = gimp_dynamics_new (context, "Standard dynamics");
+
+      gimp_data_clean (standard_dynamics);
+      gimp_data_make_internal (standard_dynamics, "gimp-dynamics-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_dynamics),
+                                 (gpointer *) &standard_dynamics);
+    }
+
+  return standard_dynamics;
+}
+
+GimpDynamicsOutput *
+gimp_dynamics_get_output (GimpDynamics           *dynamics,
+                          GimpDynamicsOutputType  type_id)
+{
+  GimpDynamicsPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DYNAMICS (dynamics), NULL);
+
+  private = GET_PRIVATE (dynamics);
+
+  switch (type_id)
+    {
+    case GIMP_DYNAMICS_OUTPUT_OPACITY:
+      return private->opacity_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_FORCE:
+      return private->force_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_HARDNESS:
+      return private->hardness_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_RATE:
+      return private->rate_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_FLOW:
+      return private->flow_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_SIZE:
+      return private->size_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO:
+      return private->aspect_ratio_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_COLOR:
+      return private->color_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_ANGLE:
+      return private->angle_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_JITTER:
+      return private->jitter_output;
+      break;
+
+    case GIMP_DYNAMICS_OUTPUT_SPACING:
+      return private->spacing_output;
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+      break;
+    }
+}
+
+gboolean
+gimp_dynamics_is_output_enabled (GimpDynamics           *dynamics,
+                                 GimpDynamicsOutputType  type)
+{
+  GimpDynamicsOutput *output;
+
+  g_return_val_if_fail (GIMP_IS_DYNAMICS (dynamics), FALSE);
+
+  output = gimp_dynamics_get_output (dynamics, type);
+
+  return gimp_dynamics_output_is_enabled (output);
+}
+
+gdouble
+gimp_dynamics_get_linear_value (GimpDynamics           *dynamics,
+                                GimpDynamicsOutputType  type,
+                                const GimpCoords       *coords,
+                                GimpPaintOptions       *options,
+                                gdouble                 fade_point)
+{
+  GimpDynamicsOutput *output;
+
+  g_return_val_if_fail (GIMP_IS_DYNAMICS (dynamics), 0.0);
+
+  output = gimp_dynamics_get_output (dynamics, type);
+
+  return gimp_dynamics_output_get_linear_value (output, coords,
+                                                options, fade_point);
+}
+
+gdouble
+gimp_dynamics_get_angular_value (GimpDynamics           *dynamics,
+                                 GimpDynamicsOutputType  type,
+                                 const GimpCoords       *coords,
+                                 GimpPaintOptions       *options,
+                                 gdouble                 fade_point)
+{
+  GimpDynamicsOutput *output;
+
+  g_return_val_if_fail (GIMP_IS_DYNAMICS (dynamics), 0.0);
+
+  output = gimp_dynamics_get_output (dynamics, type);
+
+  return gimp_dynamics_output_get_angular_value (output, coords,
+                                                 options, fade_point);
+}
+
+gdouble
+gimp_dynamics_get_aspect_value (GimpDynamics           *dynamics,
+                                GimpDynamicsOutputType  type,
+                                const GimpCoords       *coords,
+                                GimpPaintOptions       *options,
+                                gdouble                 fade_point)
+{
+  GimpDynamicsOutput *output;
+
+  g_return_val_if_fail (GIMP_IS_DYNAMICS (dynamics), 0.0);
+
+  output = gimp_dynamics_get_output (dynamics, type);
+
+  return gimp_dynamics_output_get_aspect_value (output, coords,
+                                                options, fade_point);
+}
+
+
+/*  private functions  */
+
+static GimpDynamicsOutput *
+gimp_dynamics_create_output (GimpDynamics           *dynamics,
+                             const gchar            *name,
+                             GimpDynamicsOutputType  type)
+{
+  GimpDynamicsOutput *output = gimp_dynamics_output_new (name, type);
+
+  g_signal_connect (output, "notify",
+                    G_CALLBACK (gimp_dynamics_output_notify),
+                    dynamics);
+
+  return output;
+}
+
+static void
+gimp_dynamics_output_notify (GObject          *output,
+                             const GParamSpec *pspec,
+                             GimpDynamics     *dynamics)
+{
+  g_object_notify (G_OBJECT (dynamics), gimp_object_get_name (output));
+}
diff --git a/app/core/gimpdynamics.h b/app/core/gimpdynamics.h
new file mode 100644
index 0000000..e65fdf6
--- /dev/null
+++ b/app/core/gimpdynamics.h
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_H__
+#define __GIMP_DYNAMICS_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_DYNAMICS            (gimp_dynamics_get_type ())
+#define GIMP_DYNAMICS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DYNAMICS, GimpDynamics))
+#define GIMP_DYNAMICS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DYNAMICS, GimpDynamicsClass))
+#define GIMP_IS_DYNAMICS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DYNAMICS))
+#define GIMP_IS_DYNAMICS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DYNAMICS))
+#define GIMP_DYNAMICS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS, GimpDynamicsClass))
+
+
+typedef struct _GimpDynamicsClass GimpDynamicsClass;
+
+struct _GimpDynamics
+{
+  GimpData  parent_instance;
+};
+
+struct _GimpDynamicsClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType                gimp_dynamics_get_type     (void) G_GNUC_CONST;
+
+GimpData           * gimp_dynamics_new          (GimpContext            *context,
+                                                 const gchar            *name);
+GimpData           * gimp_dynamics_get_standard (GimpContext            *context);
+
+GimpDynamicsOutput * gimp_dynamics_get_output   (GimpDynamics           *dynamics,
+                                                 GimpDynamicsOutputType  type);
+
+gboolean        gimp_dynamics_is_output_enabled (GimpDynamics           *dynamics,
+                                                 GimpDynamicsOutputType  type);
+
+gdouble         gimp_dynamics_get_linear_value  (GimpDynamics           *dynamics,
+                                                 GimpDynamicsOutputType  type,
+                                                 const GimpCoords       *coords,
+                                                 GimpPaintOptions       *options,
+                                                 gdouble                 fade_point);
+
+gdouble         gimp_dynamics_get_angular_value (GimpDynamics           *dynamics,
+                                                 GimpDynamicsOutputType  type,
+                                                 const GimpCoords       *coords,
+                                                 GimpPaintOptions       *options,
+                                                 gdouble                 fade_point);
+
+gdouble         gimp_dynamics_get_aspect_value  (GimpDynamics           *dynamics,
+                                                 GimpDynamicsOutputType  type,
+                                                 const GimpCoords       *coords,
+                                                 GimpPaintOptions       *options,
+                                                 gdouble                 fade_point);
+
+
+#endif  /*  __GIMP_DYNAMICS_H__  */
diff --git a/app/core/gimpdynamicsoutput.c b/app/core/gimpdynamicsoutput.c
new file mode 100644
index 0000000..7a4f309
--- /dev/null
+++ b/app/core/gimpdynamicsoutput.c
@@ -0,0 +1,767 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "paint/gimppaintoptions.h"
+
+
+#include "gimpcurve.h"
+#include "gimpcurve-map.h"
+
+#include "gimpdynamicsoutput.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_USE_PRESSURE  FALSE
+#define DEFAULT_USE_VELOCITY  FALSE
+#define DEFAULT_USE_DIRECTION FALSE
+#define DEFAULT_USE_TILT      FALSE
+#define DEFAULT_USE_WHEEL     FALSE
+#define DEFAULT_USE_RANDOM    FALSE
+#define DEFAULT_USE_FADE      FALSE
+
+
+enum
+{
+  PROP_0,
+
+  PROP_TYPE,
+  PROP_USE_PRESSURE,
+  PROP_USE_VELOCITY,
+  PROP_USE_DIRECTION,
+  PROP_USE_TILT,
+  PROP_USE_WHEEL,
+  PROP_USE_RANDOM,
+  PROP_USE_FADE,
+  PROP_PRESSURE_CURVE,
+  PROP_VELOCITY_CURVE,
+  PROP_DIRECTION_CURVE,
+  PROP_TILT_CURVE,
+  PROP_WHEEL_CURVE,
+  PROP_RANDOM_CURVE,
+  PROP_FADE_CURVE
+};
+
+
+typedef struct _GimpDynamicsOutputPrivate GimpDynamicsOutputPrivate;
+
+struct _GimpDynamicsOutputPrivate
+{
+  GimpDynamicsOutputType  type;
+
+  gboolean                use_pressure;
+  gboolean                use_velocity;
+  gboolean                use_direction;
+  gboolean                use_tilt;
+  gboolean                use_wheel;
+  gboolean                use_random;
+  gboolean                use_fade;
+
+  GimpCurve              *pressure_curve;
+  GimpCurve              *velocity_curve;
+  GimpCurve              *direction_curve;
+  GimpCurve              *tilt_curve;
+  GimpCurve              *wheel_curve;
+  GimpCurve              *random_curve;
+  GimpCurve              *fade_curve;
+};
+
+#define GET_PRIVATE(output) \
+        ((GimpDynamicsOutputPrivate *) gimp_dynamics_output_get_instance_private ((GimpDynamicsOutput *) (output)))
+
+
+static void   gimp_dynamics_output_finalize     (GObject           *object);
+static void   gimp_dynamics_output_set_property (GObject           *object,
+                                                 guint              property_id,
+                                                 const GValue      *value,
+                                                 GParamSpec        *pspec);
+static void   gimp_dynamics_output_get_property (GObject           *object,
+                                                 guint              property_id,
+                                                 GValue            *value,
+                                                 GParamSpec        *pspec);
+static void   gimp_dynamics_output_copy_curve   (GimpCurve          *src,
+                                                 GimpCurve          *dest);
+
+static GimpCurve *
+              gimp_dynamics_output_create_curve (GimpDynamicsOutput *output,
+                                                 const gchar        *name);
+static void   gimp_dynamics_output_curve_dirty  (GimpCurve          *curve,
+                                                 GimpDynamicsOutput *output);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDynamicsOutput, gimp_dynamics_output,
+                         GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpDynamicsOutput)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+#define parent_class gimp_dynamics_output_parent_class
+
+
+static void
+gimp_dynamics_output_class_init (GimpDynamicsOutputClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_dynamics_output_finalize;
+  object_class->set_property = gimp_dynamics_output_set_property;
+  object_class->get_property = gimp_dynamics_output_get_property;
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("type", NULL,
+                                                      _("Output type"),
+                                                      GIMP_TYPE_DYNAMICS_OUTPUT_TYPE,
+                                                      GIMP_DYNAMICS_OUTPUT_OPACITY,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_PRESSURE,
+                            "use-pressure",
+                            NULL, NULL,
+                            DEFAULT_USE_PRESSURE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_VELOCITY,
+                            "use-velocity",
+                            NULL, NULL,
+                            DEFAULT_USE_VELOCITY,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_DIRECTION,
+                            "use-direction",
+                            NULL, NULL,
+                            DEFAULT_USE_DIRECTION,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_TILT,
+                            "use-tilt",
+                            NULL, NULL,
+                            DEFAULT_USE_TILT,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_WHEEL,
+                            "use-wheel",
+                            NULL, NULL,
+                            DEFAULT_USE_TILT,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_RANDOM,
+                            "use-random",
+                            NULL, NULL,
+                            DEFAULT_USE_RANDOM,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_FADE,
+                            "use-fade",
+                            NULL, NULL,
+                            DEFAULT_USE_FADE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_PRESSURE_CURVE,
+                           "pressure-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_VELOCITY_CURVE,
+                           "velocity-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_DIRECTION_CURVE,
+                           "direction-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_TILT_CURVE,
+                           "tilt-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_WHEEL_CURVE,
+                           "wheel-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_RANDOM_CURVE,
+                           "random-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_FADE_CURVE,
+                           "fade-curve",
+                            NULL, NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+}
+
+static void
+gimp_dynamics_output_init (GimpDynamicsOutput *output)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (output);
+
+  private->pressure_curve  = gimp_dynamics_output_create_curve (output,
+                                                                "pressure-curve");
+  private->velocity_curve  = gimp_dynamics_output_create_curve (output,
+                                                                "velocity-curve");
+  private->direction_curve = gimp_dynamics_output_create_curve (output,
+                                                                "direction-curve");
+  private->tilt_curve      = gimp_dynamics_output_create_curve (output,
+                                                                "tilt-curve");
+  private->wheel_curve     = gimp_dynamics_output_create_curve (output,
+                                                                "wheel-curve");
+  private->random_curve    = gimp_dynamics_output_create_curve (output,
+                                                                "random-curve");
+  private->fade_curve      = gimp_dynamics_output_create_curve (output,
+                                                                "fade-curve");
+}
+
+static void
+gimp_dynamics_output_finalize (GObject *object)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->pressure_curve);
+  g_clear_object (&private->velocity_curve);
+  g_clear_object (&private->direction_curve);
+  g_clear_object (&private->tilt_curve);
+  g_clear_object (&private->wheel_curve);
+  g_clear_object (&private->random_curve);
+  g_clear_object (&private->fade_curve);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dynamics_output_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      private->type = g_value_get_enum (value);
+      break;
+
+    case PROP_USE_PRESSURE:
+      private->use_pressure = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_VELOCITY:
+      private->use_velocity = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_DIRECTION:
+      private->use_direction = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_TILT:
+      private->use_tilt = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_WHEEL:
+      private->use_wheel = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_RANDOM:
+      private->use_random = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_FADE:
+      private->use_fade = g_value_get_boolean (value);
+      break;
+
+    case PROP_PRESSURE_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->pressure_curve);
+      break;
+
+    case PROP_VELOCITY_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->velocity_curve);
+      break;
+
+    case PROP_DIRECTION_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->direction_curve);
+      break;
+
+    case PROP_TILT_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->tilt_curve);
+      break;
+
+    case PROP_WHEEL_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->wheel_curve);
+      break;
+
+    case PROP_RANDOM_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->random_curve);
+      break;
+
+    case PROP_FADE_CURVE:
+      gimp_dynamics_output_copy_curve (g_value_get_object (value),
+                                       private->fade_curve);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dynamics_output_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, private->type);
+      break;
+
+    case PROP_USE_PRESSURE:
+      g_value_set_boolean (value, private->use_pressure);
+      break;
+
+    case PROP_USE_VELOCITY:
+      g_value_set_boolean (value, private->use_velocity);
+      break;
+
+    case PROP_USE_DIRECTION:
+      g_value_set_boolean (value, private->use_direction);
+      break;
+
+    case PROP_USE_TILT:
+      g_value_set_boolean (value, private->use_tilt);
+      break;
+
+    case PROP_USE_WHEEL:
+      g_value_set_boolean (value, private->use_wheel);
+      break;
+
+    case PROP_USE_RANDOM:
+      g_value_set_boolean (value, private->use_random);
+      break;
+
+    case PROP_USE_FADE:
+      g_value_set_boolean (value, private->use_fade);
+      break;
+
+    case PROP_PRESSURE_CURVE:
+      g_value_set_object (value, private->pressure_curve);
+      break;
+
+    case PROP_VELOCITY_CURVE:
+      g_value_set_object (value, private->velocity_curve);
+      break;
+
+    case PROP_DIRECTION_CURVE:
+      g_value_set_object (value, private->direction_curve);
+      break;
+
+    case PROP_TILT_CURVE:
+      g_value_set_object (value, private->tilt_curve);
+      break;
+
+    case PROP_WHEEL_CURVE:
+      g_value_set_object (value, private->wheel_curve);
+      break;
+
+    case PROP_RANDOM_CURVE:
+      g_value_set_object (value, private->random_curve);
+      break;
+
+    case PROP_FADE_CURVE:
+      g_value_set_object (value, private->fade_curve);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GimpDynamicsOutput *
+gimp_dynamics_output_new (const gchar            *name,
+                          GimpDynamicsOutputType  type)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_DYNAMICS_OUTPUT,
+                       "name", name,
+                       "type", type,
+                       NULL);
+}
+
+gboolean
+gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (output);
+
+  return (private->use_pressure  ||
+          private->use_velocity  ||
+          private->use_direction ||
+          private->use_tilt      ||
+          private->use_wheel     ||
+          private->use_random    ||
+          private->use_fade);
+}
+
+gdouble
+gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
+                                       const GimpCoords   *coords,
+                                       GimpPaintOptions   *options,
+                                       gdouble             fade_point)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (output);
+  gdouble                    total   = 0.0;
+  gdouble                    result  = 1.0;
+  gint                       factors = 0;
+
+  if (private->use_pressure)
+    {
+      total += gimp_curve_map_value (private->pressure_curve,
+                                     coords->pressure);
+      factors++;
+    }
+
+  if (private->use_velocity)
+    {
+      total += gimp_curve_map_value (private->velocity_curve,
+                                    (1.0 - coords->velocity));
+      factors++;
+    }
+
+  if (private->use_direction)
+    {
+      total += gimp_curve_map_value (private->direction_curve,
+                                     fmod (coords->direction + 0.5, 1));
+      factors++;
+    }
+
+  if (private->use_tilt)
+    {
+      total += gimp_curve_map_value (private->tilt_curve,
+                                     (1.0 - sqrt (SQR (coords->xtilt) +
+                                      SQR (coords->ytilt))));
+      factors++;
+    }
+
+  if (private->use_wheel)
+    {
+      gdouble wheel;
+
+      wheel = coords->wheel;
+
+      total += gimp_curve_map_value (private->wheel_curve, wheel);
+      factors++;
+    }
+
+  if (private->use_random)
+    {
+      total += gimp_curve_map_value (private->random_curve,
+                                     g_random_double_range (0.0, 1.0));
+      factors++;
+    }
+
+  if (private->use_fade)
+    {
+      total += gimp_curve_map_value (private->fade_curve, fade_point);
+
+      factors++;
+    }
+
+  if (factors > 0)
+    result = total / factors;
+
+#if 0
+  g_printerr ("Dynamics queried(linear). Result: %f, factors: %d, total: %f\n",
+              result, factors, total);
+#endif
+
+  return result;
+}
+
+gdouble
+gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
+                                        const GimpCoords   *coords,
+                                        GimpPaintOptions   *options,
+                                        gdouble             fade_point)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (output);
+  gdouble                    total   = 0.0;
+  gdouble                    result  = 0.0; /* angles are additive, so we return zero for no change. */
+  gint                       factors = 0;
+
+  if (private->use_pressure)
+    {
+      total += gimp_curve_map_value (private->pressure_curve,
+                                     coords->pressure);
+      factors++;
+    }
+
+  if (private->use_velocity)
+    {
+      total += gimp_curve_map_value (private->velocity_curve,
+                                    (1.0 - coords->velocity));
+      factors++;
+    }
+
+  if (private->use_direction)
+    {
+      gdouble angle = gimp_curve_map_value (private->direction_curve,
+                                            coords->direction);
+
+      if (options->brush_lock_to_view)
+        {
+          if (coords->reflect)
+            angle = 0.5 - angle;
+
+          angle -= coords->angle;
+          angle  = fmod (fmod (angle, 1.0) + 1.0, 1.0);
+        }
+
+      total += angle;
+      factors++;
+    }
+
+  /* For tilt to make sense, it needs to be converted to an angle, not
+   * just a vector
+   */
+  if (private->use_tilt)
+    {
+      gdouble tilt_x = coords->xtilt;
+      gdouble tilt_y = coords->ytilt;
+      gdouble tilt   = 0.0;
+
+      if (tilt_x == 0.0)
+        {
+          if (tilt_y > 0.0)
+            tilt = 0.25;
+          else if (tilt_y < 0.0)
+            tilt = 0.75;
+          else
+            tilt = 0.0;
+        }
+      else
+        {
+          tilt = atan ((- 1.0 * tilt_y) /
+                                tilt_x) / (2 * G_PI);
+
+          if (tilt_x > 0.0)
+            tilt = tilt + 0.5;
+        }
+
+      tilt = tilt + 0.5; /* correct the angle, its wrong by 180 degrees */
+
+      while (tilt > 1.0)
+        tilt -= 1.0;
+
+      while (tilt < 0.0)
+        tilt += 1.0;
+
+      total += gimp_curve_map_value (private->tilt_curve, tilt);
+      factors++;
+    }
+
+  if (private->use_wheel)
+    {
+      gdouble angle = 1.0 - fmod(0.5 + coords->wheel, 1);
+
+      total += gimp_curve_map_value (private->wheel_curve, angle);
+      factors++;
+    }
+
+  if (private->use_random)
+    {
+      total += gimp_curve_map_value (private->random_curve,
+                                     g_random_double_range (0.0, 1.0));
+      factors++;
+    }
+
+  if (private->use_fade)
+    {
+      total += gimp_curve_map_value (private->fade_curve, fade_point);
+
+      factors++;
+    }
+
+  if (factors > 0)
+    result = total / factors;
+
+#if 0
+  g_printerr ("Dynamics queried(angle). Result: %f, factors: %d, total: %f\n",
+              result, factors, total);
+#endif
+
+   return result;
+}
+
+gdouble
+gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
+                                       const GimpCoords   *coords,
+                                       GimpPaintOptions   *options,
+                                       gdouble             fade_point)
+{
+  GimpDynamicsOutputPrivate *private = GET_PRIVATE (output);
+  gdouble                    total   = 0.0;
+  gint                       factors = 0;
+  gdouble                    sign    = 1.0;
+  gdouble                    result  = 1.0;
+
+  if (private->use_pressure)
+    {
+      total += gimp_curve_map_value (private->pressure_curve,
+                                     coords->pressure);
+      factors++;
+    }
+
+  if (private->use_velocity)
+    {
+      total += gimp_curve_map_value (private->velocity_curve,
+                                     coords->velocity);
+      factors++;
+    }
+
+  if (private->use_direction)
+    {
+      gdouble direction = gimp_curve_map_value (private->direction_curve,
+                                                coords->direction);
+
+      if (((direction > 0.875) && (direction <= 1.0)) ||
+          ((direction > 0.0) && (direction < 0.125))  ||
+          ((direction > 0.375) && (direction < 0.625)))
+        sign = -1.0;
+
+      total += 1.0;
+      factors++;
+    }
+
+  if (private->use_tilt)
+    {
+      gdouble tilt_value =  MAX (fabs (coords->xtilt), fabs (coords->ytilt));
+
+      tilt_value = gimp_curve_map_value (private->tilt_curve,
+                                         tilt_value);
+
+      total += tilt_value;
+
+      factors++;
+    }
+
+  if (private->use_wheel)
+    {
+      gdouble wheel = gimp_curve_map_value (private->wheel_curve,
+                                            coords->wheel);
+
+      if (((wheel > 0.875) && (wheel <= 1.0)) ||
+          ((wheel > 0.0) && (wheel < 0.125))  ||
+          ((wheel > 0.375) && (wheel < 0.625)))
+        sign = -1.0;
+
+      total += 1.0;
+      factors++;
+
+    }
+
+  if (private->use_random)
+    {
+      gdouble random = gimp_curve_map_value (private->random_curve,
+                                             g_random_double_range (0.0, 1.0));
+
+      total += random;
+      factors++;
+    }
+
+  if (private->use_fade)
+    {
+      total += gimp_curve_map_value (private->fade_curve, fade_point);
+
+      factors++;
+    }
+
+  if (factors > 0)
+    result = total / factors;
+
+
+#if 0
+  g_printerr ("Dynamics queried(aspect). Result: %f, factors: %d, total: %f sign: %f\n",
+              result, factors, total, sign);
+#endif
+  result = CLAMP (result * sign, -1.0, 1.0);
+
+  return result;
+}
+
+static void
+gimp_dynamics_output_copy_curve (GimpCurve *src,
+                                 GimpCurve *dest)
+{
+  if (src && dest)
+    {
+      gimp_config_copy (GIMP_CONFIG (src),
+                        GIMP_CONFIG (dest),
+                        GIMP_CONFIG_PARAM_SERIALIZE);
+    }
+}
+
+static GimpCurve *
+gimp_dynamics_output_create_curve (GimpDynamicsOutput *output,
+                                   const gchar        *name)
+{
+  GimpCurve *curve = GIMP_CURVE (gimp_curve_new (name));
+
+  g_signal_connect_object (curve, "dirty",
+                           G_CALLBACK (gimp_dynamics_output_curve_dirty),
+                           output, 0);
+
+  return curve;
+}
+
+static void
+gimp_dynamics_output_curve_dirty (GimpCurve          *curve,
+                                  GimpDynamicsOutput *output)
+{
+  g_object_notify (G_OBJECT (output), gimp_object_get_name (curve));
+}
diff --git a/app/core/gimpdynamicsoutput.h b/app/core/gimpdynamicsoutput.h
new file mode 100644
index 0000000..855cc4a
--- /dev/null
+++ b/app/core/gimpdynamicsoutput.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_OUTPUT_H__
+#define __GIMP_DYNAMICS_OUTPUT_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_DYNAMICS_OUTPUT            (gimp_dynamics_output_get_type ())
+#define GIMP_DYNAMICS_OUTPUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DYNAMICS_OUTPUT, GimpDynamicsOutput))
+#define GIMP_DYNAMICS_OUTPUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DYNAMICS_OUTPUT, GimpDynamicsOutputClass))
+#define GIMP_IS_DYNAMICS_OUTPUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DYNAMICS_OUTPUT))
+#define GIMP_IS_DYNAMICS_OUTPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DYNAMICS_OUTPUT))
+#define GIMP_DYNAMICS_OUTPUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS_OUTPUT, GimpDynamicsOutputClass))
+
+
+typedef struct _GimpDynamicsOutputClass GimpDynamicsOutputClass;
+
+struct _GimpDynamicsOutput
+{
+  GimpObject  parent_instance;
+};
+
+struct _GimpDynamicsOutputClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType                gimp_dynamics_output_get_type (void) G_GNUC_CONST;
+
+GimpDynamicsOutput * gimp_dynamics_output_new      (const gchar            *name,
+                                                    GimpDynamicsOutputType  type);
+
+gboolean   gimp_dynamics_output_is_enabled         (GimpDynamicsOutput *output);
+
+gdouble    gimp_dynamics_output_get_linear_value   (GimpDynamicsOutput *output,
+                                                    const GimpCoords   *coords,
+                                                    GimpPaintOptions   *options,
+                                                    gdouble             fade_point);
+
+gdouble    gimp_dynamics_output_get_angular_value  (GimpDynamicsOutput *output,
+                                                    const GimpCoords   *coords,
+                                                    GimpPaintOptions   *options,
+                                                    gdouble             fade_point);
+gdouble    gimp_dynamics_output_get_aspect_value   (GimpDynamicsOutput *output,
+                                                    const GimpCoords   *coords,
+                                                    GimpPaintOptions   *options,
+                                                    gdouble             fade_point);
+
+
+#endif  /*  __GIMP_DYNAMICS_OUTPUT_H__  */
diff --git a/app/core/gimperror.c b/app/core/gimperror.c
new file mode 100644
index 0000000..29394cb
--- /dev/null
+++ b/app/core/gimperror.c
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "gimperror.h"
+
+
+/**
+ * gimp_error_quark:
+ *
+ * This function is never called directly. Use GIMP_ERROR() instead.
+ *
+ * Return value: the #GQuark that defines the general GIMP error domain.
+ **/
+GQuark
+gimp_error_quark (void)
+{
+  return g_quark_from_static_string ("gimp-error-quark");
+}
diff --git a/app/core/gimperror.h b/app/core/gimperror.h
new file mode 100644
index 0000000..f8088ec
--- /dev/null
+++ b/app/core/gimperror.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ERROR_H__
+#define __GIMP_ERROR_H__
+
+
+typedef enum
+{
+  GIMP_FAILED,  /* generic error condition */
+} GimpErrorCode;
+
+
+#define GIMP_ERROR (gimp_error_quark ())
+
+GQuark  gimp_error_quark (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_ERROR_H__ */
diff --git a/app/core/gimpfilloptions.c b/app/core/gimpfilloptions.c
new file mode 100644
index 0000000..d10b6e4
--- /dev/null
+++ b/app/core/gimpfilloptions.c
@@ -0,0 +1,548 @@
+/* The GIMP -- an image manipulation program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilloptions.c
+ * Copyright (C) 2003 Simon Budig
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimp.h"
+#include "gimp-palettes.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-fill.h"
+#include "gimperror.h"
+#include "gimpfilloptions.h"
+#include "gimppattern.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_STYLE,
+  PROP_ANTIALIAS,
+  PROP_FEATHER,
+  PROP_FEATHER_RADIUS,
+  PROP_PATTERN_VIEW_TYPE,
+  PROP_PATTERN_VIEW_SIZE
+};
+
+
+typedef struct _GimpFillOptionsPrivate GimpFillOptionsPrivate;
+
+struct _GimpFillOptionsPrivate
+{
+  GimpFillStyle style;
+  gboolean      antialias;
+  gboolean      feather;
+  gdouble       feather_radius;
+
+  GimpViewType  pattern_view_type;
+  GimpViewSize  pattern_view_size;
+
+  const gchar  *undo_desc;
+};
+
+#define GET_PRIVATE(options) \
+        ((GimpFillOptionsPrivate *) gimp_fill_options_get_instance_private ((GimpFillOptions *) (options)))
+
+
+static void     gimp_fill_options_config_init  (GimpConfigInterface *iface);
+
+static void     gimp_fill_options_set_property (GObject             *object,
+                                                guint                property_id,
+                                                const GValue        *value,
+                                                GParamSpec          *pspec);
+static void     gimp_fill_options_get_property (GObject             *object,
+                                                guint                property_id,
+                                                GValue              *value,
+                                                GParamSpec          *pspec);
+
+static gboolean gimp_fill_options_serialize    (GimpConfig          *config,
+                                                GimpConfigWriter    *writer,
+                                                gpointer             data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpFillOptions, gimp_fill_options, GIMP_TYPE_CONTEXT,
+                         G_ADD_PRIVATE (GimpFillOptions)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_fill_options_config_init))
+
+
+static void
+gimp_fill_options_class_init (GimpFillOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_fill_options_set_property;
+  object_class->get_property = gimp_fill_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_STYLE,
+                         "style",
+                         _("Style"),
+                         NULL,
+                         GIMP_TYPE_FILL_STYLE,
+                         GIMP_FILL_STYLE_SOLID,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FEATHER,
+                            "feather",
+                            _("Feather edges"),
+                            _("Enable feathering of fill edges"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS,
+                           "feather-radius",
+                           _("Radius"),
+                           _("Radius of feathering"),
+                           0.0, 100.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, PROP_PATTERN_VIEW_TYPE,
+                                   g_param_spec_enum ("pattern-view-type",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_VIEW_TYPE,
+                                                      GIMP_VIEW_TYPE_GRID,
+                                                      G_PARAM_CONSTRUCT |
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_PATTERN_VIEW_SIZE,
+                                   g_param_spec_int ("pattern-view-size",
+                                                     NULL, NULL,
+                                                     GIMP_VIEW_SIZE_TINY,
+                                                     GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                                                     GIMP_VIEW_SIZE_SMALL,
+                                                     G_PARAM_CONSTRUCT |
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_fill_options_config_init (GimpConfigInterface *iface)
+{
+  iface->serialize = gimp_fill_options_serialize;
+}
+
+static void
+gimp_fill_options_init (GimpFillOptions *options)
+{
+}
+
+static void
+gimp_fill_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpFillOptionsPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_STYLE:
+      private->style = g_value_get_enum (value);
+      private->undo_desc = NULL;
+      break;
+    case PROP_ANTIALIAS:
+      private->antialias = g_value_get_boolean (value);
+      break;
+    case PROP_FEATHER:
+      private->feather = g_value_get_boolean (value);
+      break;
+    case PROP_FEATHER_RADIUS:
+      private->feather_radius = g_value_get_double (value);
+      break;
+
+    case PROP_PATTERN_VIEW_TYPE:
+      private->pattern_view_type = g_value_get_enum (value);
+      break;
+    case PROP_PATTERN_VIEW_SIZE:
+      private->pattern_view_size = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_fill_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpFillOptionsPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_STYLE:
+      g_value_set_enum (value, private->style);
+      break;
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, private->antialias);
+      break;
+    case PROP_FEATHER:
+      g_value_set_boolean (value, private->feather);
+      break;
+    case PROP_FEATHER_RADIUS:
+      g_value_set_double (value, private->feather_radius);
+      break;
+
+    case PROP_PATTERN_VIEW_TYPE:
+      g_value_set_enum (value, private->pattern_view_type);
+      break;
+    case PROP_PATTERN_VIEW_SIZE:
+      g_value_set_int (value, private->pattern_view_size);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_fill_options_serialize (GimpConfig       *config,
+                             GimpConfigWriter *writer,
+                             gpointer          data)
+{
+  return gimp_config_serialize_properties (config, writer);
+}
+
+
+/*  public functions  */
+
+GimpFillOptions *
+gimp_fill_options_new (Gimp        *gimp,
+                       GimpContext *context,
+                       gboolean     use_context_color)
+{
+  GimpFillOptions *options;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (use_context_color == FALSE || context != NULL, NULL);
+
+  options = g_object_new (GIMP_TYPE_FILL_OPTIONS,
+                          "gimp", gimp,
+                          NULL);
+
+  if (use_context_color)
+    {
+      gimp_context_define_properties (GIMP_CONTEXT (options),
+                                      GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                                      GIMP_CONTEXT_PROP_MASK_PATTERN,
+                                      FALSE);
+
+      gimp_context_set_parent (GIMP_CONTEXT (options), context);
+    }
+
+  return options;
+}
+
+GimpFillStyle
+gimp_fill_options_get_style (GimpFillOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), GIMP_FILL_STYLE_SOLID);
+
+  return GET_PRIVATE (options)->style;
+}
+
+void
+gimp_fill_options_set_style (GimpFillOptions *options,
+                             GimpFillStyle    style)
+{
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+
+  g_object_set (options, "style", style, NULL);
+}
+
+gboolean
+gimp_fill_options_get_antialias (GimpFillOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), FALSE);
+
+  return GET_PRIVATE (options)->antialias;
+}
+
+void
+gimp_fill_options_set_antialias (GimpFillOptions *options,
+                                 gboolean         antialias)
+{
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+
+  g_object_set (options, "antialias", antialias, NULL);
+}
+
+gboolean
+gimp_fill_options_get_feather (GimpFillOptions *options,
+                               gdouble         *radius)
+{
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), FALSE);
+
+  if (radius)
+    *radius = GET_PRIVATE (options)->feather_radius;
+
+  return GET_PRIVATE (options)->feather;
+}
+
+void
+gimp_fill_options_set_feather (GimpFillOptions *options,
+                               gboolean         feather,
+                               gdouble          radius)
+{
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+
+  g_object_set (options, "feather", feather, NULL);
+  g_object_set (options, "feather-radius", radius, NULL);
+}
+
+gboolean
+gimp_fill_options_set_by_fill_type (GimpFillOptions  *options,
+                                    GimpContext      *context,
+                                    GimpFillType      fill_type,
+                                    GError          **error)
+{
+  GimpFillOptionsPrivate *private;
+  GimpRGB                 color;
+  const gchar            *undo_desc;
+
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  private = GET_PRIVATE (options);
+
+  private->undo_desc = NULL;
+
+  switch (fill_type)
+    {
+    case GIMP_FILL_FOREGROUND:
+      gimp_context_get_foreground (context, &color);
+      undo_desc = C_("undo-type", "Fill with Foreground Color");
+      break;
+
+    case GIMP_FILL_BACKGROUND:
+      gimp_context_get_background (context, &color);
+      undo_desc = C_("undo-type", "Fill with Background Color");
+      break;
+
+    case GIMP_FILL_WHITE:
+      gimp_rgba_set (&color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+      undo_desc = C_("undo-type", "Fill with White");
+      break;
+
+    case GIMP_FILL_TRANSPARENT:
+      gimp_context_get_background (context, &color);
+      gimp_context_set_paint_mode (GIMP_CONTEXT (options),
+                                   GIMP_LAYER_MODE_ERASE);
+      undo_desc = C_("undo-type", "Fill with Transparency");
+      break;
+
+    case GIMP_FILL_PATTERN:
+      {
+        GimpPattern *pattern = gimp_context_get_pattern (context);
+
+        if (! pattern)
+          {
+            g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                                 _("No patterns available for this operation."));
+            return FALSE;
+          }
+
+        gimp_fill_options_set_style (options, GIMP_FILL_STYLE_PATTERN);
+        gimp_context_set_pattern (GIMP_CONTEXT (options), pattern);
+        private->undo_desc = C_("undo-type", "Fill with Pattern");
+
+        return TRUE;
+      }
+      break;
+
+    default:
+      g_warning ("%s: invalid fill_type %d", G_STRFUNC, fill_type);
+      return FALSE;
+    }
+
+  gimp_fill_options_set_style (options, GIMP_FILL_STYLE_SOLID);
+  gimp_context_set_foreground (GIMP_CONTEXT (options), &color);
+  private->undo_desc = undo_desc;
+
+  return TRUE;
+}
+
+gboolean
+gimp_fill_options_set_by_fill_mode (GimpFillOptions     *options,
+                                    GimpContext         *context,
+                                    GimpBucketFillMode   fill_mode,
+                                    GError             **error)
+{
+  GimpFillType fill_type;
+
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  switch (fill_mode)
+    {
+    default:
+    case GIMP_BUCKET_FILL_FG:
+      fill_type = GIMP_FILL_FOREGROUND;
+      break;
+
+    case GIMP_BUCKET_FILL_BG:
+      fill_type = GIMP_FILL_BACKGROUND;
+      break;
+
+    case GIMP_BUCKET_FILL_PATTERN:
+      fill_type = GIMP_FILL_PATTERN;
+      break;
+    }
+
+  return gimp_fill_options_set_by_fill_type (options, context,
+                                             fill_type, error);
+}
+
+const gchar *
+gimp_fill_options_get_undo_desc (GimpFillOptions *options)
+{
+  GimpFillOptionsPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+
+  private = GET_PRIVATE (options);
+
+  if (private->undo_desc)
+    return private->undo_desc;
+
+  switch (private->style)
+    {
+    case GIMP_FILL_STYLE_SOLID:
+      return C_("undo-type", "Fill with Solid Color");
+
+    case GIMP_FILL_STYLE_PATTERN:
+      return C_("undo-type", "Fill with Pattern");
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+const Babl *
+gimp_fill_options_get_format (GimpFillOptions *options,
+                              GimpDrawable    *drawable)
+{
+  GimpContext *context;
+
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  context = GIMP_CONTEXT (options);
+
+  return gimp_layer_mode_get_format (gimp_context_get_paint_mode (context),
+                                     GIMP_LAYER_COLOR_SPACE_AUTO,
+                                     GIMP_LAYER_COLOR_SPACE_AUTO,
+                                     gimp_layer_mode_get_paint_composite_mode (
+                                       gimp_context_get_paint_mode (context)),
+                                     gimp_drawable_get_format (drawable));
+}
+
+GeglBuffer *
+gimp_fill_options_create_buffer (GimpFillOptions     *options,
+                                 GimpDrawable        *drawable,
+                                 const GeglRectangle *rect,
+                                 gint                 pattern_offset_x,
+                                 gint                 pattern_offset_y)
+{
+  GeglBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+  g_return_val_if_fail (gimp_fill_options_get_style (options) !=
+                        GIMP_FILL_STYLE_PATTERN ||
+                        gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL,
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (rect != NULL, NULL);
+
+  buffer = gegl_buffer_new (rect,
+                            gimp_fill_options_get_format (options, drawable));
+
+  gimp_fill_options_fill_buffer (options, drawable, buffer,
+                                 pattern_offset_x, pattern_offset_y);
+
+  return buffer;
+}
+
+void
+gimp_fill_options_fill_buffer (GimpFillOptions *options,
+                               GimpDrawable    *drawable,
+                               GeglBuffer      *buffer,
+                               gint             pattern_offset_x,
+                               gint             pattern_offset_y)
+{
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+  g_return_if_fail (gimp_fill_options_get_style (options) !=
+                    GIMP_FILL_STYLE_PATTERN ||
+                    gimp_context_get_pattern (GIMP_CONTEXT (options)) != NULL);
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  switch (gimp_fill_options_get_style (options))
+    {
+    case GIMP_FILL_STYLE_SOLID:
+      {
+        GimpRGB color;
+
+        gimp_context_get_foreground (GIMP_CONTEXT (options), &color);
+        gimp_palettes_add_color_history (GIMP_CONTEXT (options)->gimp, &color);
+
+        gimp_drawable_fill_buffer (drawable, buffer,
+                                   &color, NULL, 0, 0);
+      }
+      break;
+
+    case GIMP_FILL_STYLE_PATTERN:
+      {
+        GimpPattern *pattern;
+
+        pattern = gimp_context_get_pattern (GIMP_CONTEXT (options));
+
+        gimp_drawable_fill_buffer (drawable, buffer,
+                                   NULL, pattern,
+                                   pattern_offset_x,
+                                   pattern_offset_y);
+      }
+      break;
+    }
+}
diff --git a/app/core/gimpfilloptions.h b/app/core/gimpfilloptions.h
new file mode 100644
index 0000000..434530b
--- /dev/null
+++ b/app/core/gimpfilloptions.h
@@ -0,0 +1,95 @@
+/* The GIMP -- an image manipulation program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilloptions.h
+ * Copyright (C) 2003 Simon Budig
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILL_OPTIONS_H__
+#define __GIMP_FILL_OPTIONS_H__
+
+
+#include "gimpcontext.h"
+
+
+#define GIMP_TYPE_FILL_OPTIONS            (gimp_fill_options_get_type ())
+#define GIMP_FILL_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILL_OPTIONS, GimpFillOptions))
+#define GIMP_FILL_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILL_OPTIONS, GimpFillOptionsClass))
+#define GIMP_IS_FILL_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILL_OPTIONS))
+#define GIMP_IS_FILL_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILL_OPTIONS))
+#define GIMP_FILL_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILL_OPTIONS, GimpFillOptionsClass))
+
+
+typedef struct _GimpFillOptionsClass GimpFillOptionsClass;
+
+struct _GimpFillOptions
+{
+  GimpContext  parent_instance;
+};
+
+struct _GimpFillOptionsClass
+{
+  GimpContextClass  parent_class;
+};
+
+
+GType             gimp_fill_options_get_type         (void) G_GNUC_CONST;
+
+GimpFillOptions * gimp_fill_options_new              (Gimp                *gimp,
+                                                      GimpContext         *context,
+                                                      gboolean             use_context_color);
+
+GimpFillStyle     gimp_fill_options_get_style        (GimpFillOptions     *options);
+void              gimp_fill_options_set_style        (GimpFillOptions     *options,
+                                                      GimpFillStyle        style);
+
+gboolean          gimp_fill_options_get_antialias    (GimpFillOptions     *options);
+void              gimp_fill_options_set_antialias    (GimpFillOptions     *options,
+                                                      gboolean             antialias);
+
+gboolean          gimp_fill_options_get_feather      (GimpFillOptions     *options,
+                                                      gdouble             *radius);
+void              gimp_fill_options_set_feather      (GimpFillOptions     *options,
+                                                      gboolean             feather,
+                                                      gdouble              radius);
+
+gboolean          gimp_fill_options_set_by_fill_type (GimpFillOptions     *options,
+                                                      GimpContext         *context,
+                                                      GimpFillType         fill_type,
+                                                      GError             **error);
+gboolean          gimp_fill_options_set_by_fill_mode (GimpFillOptions     *options,
+                                                      GimpContext         *context,
+                                                      GimpBucketFillMode   fill_mode,
+                                                      GError             **error);
+
+const gchar     * gimp_fill_options_get_undo_desc    (GimpFillOptions     *options);
+
+const Babl      * gimp_fill_options_get_format       (GimpFillOptions     *options,
+                                                      GimpDrawable        *drawable);
+
+GeglBuffer      * gimp_fill_options_create_buffer    (GimpFillOptions     *options,
+                                                      GimpDrawable        *drawable,
+                                                      const GeglRectangle *rect,
+                                                      gint                 pattern_offset_x,
+                                                      gint                 pattern_offset_y);
+void              gimp_fill_options_fill_buffer      (GimpFillOptions     *options,
+                                                      GimpDrawable        *drawable,
+                                                      GeglBuffer          *buffer,
+                                                      gint                 pattern_offset_x,
+                                                      gint                 pattern_offset_y);
+
+
+#endif /* __GIMP_FILL_OPTIONS_H__ */
diff --git a/app/core/gimpfilter.c b/app/core/gimpfilter.c
new file mode 100644
index 0000000..f565d49
--- /dev/null
+++ b/app/core/gimpfilter.c
@@ -0,0 +1,315 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilter.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-memsize.h"
+#include "gimpfilter.h"
+#include "gimpmarshal.h"
+
+
+enum
+{
+  ACTIVE_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_ACTIVE,
+  PROP_IS_LAST_NODE
+};
+
+
+typedef struct _GimpFilterPrivate GimpFilterPrivate;
+
+struct _GimpFilterPrivate
+{
+  GeglNode       *node;
+
+  guint           active       : 1;
+  guint           is_last_node : 1;
+
+  GimpApplicator *applicator;
+};
+
+#define GET_PRIVATE(filter) ((GimpFilterPrivate *) gimp_filter_get_instance_private ((GimpFilter *) (filter)))
+
+
+/*  local function prototypes  */
+
+static void       gimp_filter_finalize      (GObject      *object);
+static void       gimp_filter_set_property  (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void       gimp_filter_get_property  (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+static gint64     gimp_filter_get_memsize   (GimpObject   *object,
+                                             gint64       *gui_size);
+
+static GeglNode * gimp_filter_real_get_node (GimpFilter   *filter);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpFilter, gimp_filter, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_filter_parent_class
+
+static guint gimp_filter_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_filter_class_init (GimpFilterClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  gimp_filter_signals[ACTIVE_CHANGED] =
+    g_signal_new ("active-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpFilterClass, active_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize         = gimp_filter_finalize;
+  object_class->set_property     = gimp_filter_set_property;
+  object_class->get_property     = gimp_filter_get_property;
+
+  gimp_object_class->get_memsize = gimp_filter_get_memsize;
+
+  klass->active_changed          = NULL;
+  klass->get_node                = gimp_filter_real_get_node;
+
+  g_object_class_install_property (object_class, PROP_ACTIVE,
+                                   g_param_spec_boolean ("active", NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_IS_LAST_NODE,
+                                   g_param_spec_boolean ("is-last-node",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_filter_init (GimpFilter *filter)
+{
+  GimpFilterPrivate *private = GET_PRIVATE (filter);
+
+  private->active = TRUE;
+}
+
+static void
+gimp_filter_finalize (GObject *object)
+{
+  GimpFilterPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->node);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_filter_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpFilter *filter = GIMP_FILTER (object);
+
+  switch (property_id)
+    {
+    case PROP_ACTIVE:
+      gimp_filter_set_active (filter, g_value_get_boolean (value));
+      break;
+    case PROP_IS_LAST_NODE:
+      gimp_filter_set_is_last_node (filter, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_filter_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpFilterPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_ACTIVE:
+      g_value_set_boolean (value, private->active);
+      break;
+    case PROP_IS_LAST_NODE:
+      g_value_set_boolean (value, private->is_last_node);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_filter_get_memsize (GimpObject *object,
+                         gint64     *gui_size)
+{
+  GimpFilterPrivate *private = GET_PRIVATE (object);
+  gint64             memsize = 0;
+
+  memsize += gimp_g_object_get_memsize (G_OBJECT (private->node));
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static GeglNode *
+gimp_filter_real_get_node (GimpFilter *filter)
+{
+  GimpFilterPrivate *private = GET_PRIVATE (filter);
+
+  private->node = gegl_node_new ();
+
+  return private->node;
+}
+
+
+/*  public functions  */
+
+GimpFilter *
+gimp_filter_new (const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_FILTER,
+                       "name", name,
+                       NULL);
+}
+
+GeglNode *
+gimp_filter_get_node (GimpFilter *filter)
+{
+  GimpFilterPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), NULL);
+
+  private = GET_PRIVATE (filter);
+
+  if (private->node)
+    return private->node;
+
+  return GIMP_FILTER_GET_CLASS (filter)->get_node (filter);
+}
+
+GeglNode *
+gimp_filter_peek_node (GimpFilter *filter)
+{
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), NULL);
+
+  return GET_PRIVATE (filter)->node;
+}
+
+void
+gimp_filter_set_active (GimpFilter *filter,
+                        gboolean    active)
+{
+  g_return_if_fail (GIMP_IS_FILTER (filter));
+
+  active = active ? TRUE : FALSE;
+
+  if (active != gimp_filter_get_active (filter))
+    {
+      GET_PRIVATE (filter)->active = active;
+
+      g_signal_emit (filter, gimp_filter_signals[ACTIVE_CHANGED], 0);
+
+      g_object_notify (G_OBJECT (filter), "active");
+    }
+}
+
+gboolean
+gimp_filter_get_active (GimpFilter *filter)
+{
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), FALSE);
+
+  return GET_PRIVATE (filter)->active;
+}
+
+void
+gimp_filter_set_is_last_node (GimpFilter *filter,
+                              gboolean    is_last_node)
+{
+  g_return_if_fail (GIMP_IS_FILTER (filter));
+
+  is_last_node = is_last_node ? TRUE : FALSE;
+
+  if (is_last_node != gimp_filter_get_is_last_node (filter))
+    {
+      GET_PRIVATE (filter)->is_last_node = is_last_node;
+
+      g_object_notify (G_OBJECT (filter), "is-last-node");
+    }
+}
+
+gboolean
+gimp_filter_get_is_last_node (GimpFilter *filter)
+{
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), FALSE);
+
+  return GET_PRIVATE (filter)->is_last_node;
+}
+
+void
+gimp_filter_set_applicator (GimpFilter     *filter,
+                            GimpApplicator *applicator)
+{
+  GimpFilterPrivate *private;
+
+  g_return_if_fail (GIMP_IS_FILTER (filter));
+
+  private = GET_PRIVATE (filter);
+
+  private->applicator = applicator;
+}
+
+GimpApplicator *
+gimp_filter_get_applicator (GimpFilter *filter)
+{
+  g_return_val_if_fail (GIMP_IS_FILTER (filter), NULL);
+
+  return GET_PRIVATE (filter)->applicator;
+}
diff --git a/app/core/gimpfilter.h b/app/core/gimpfilter.h
new file mode 100644
index 0000000..b1dc922
--- /dev/null
+++ b/app/core/gimpfilter.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilter.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_H__
+#define __GIMP_FILTER_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_FILTER            (gimp_filter_get_type ())
+#define GIMP_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILTER, GimpFilter))
+#define GIMP_FILTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILTER, GimpFilterClass))
+#define GIMP_IS_FILTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILTER))
+#define GIMP_IS_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILTER))
+#define GIMP_FILTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILTER, GimpFilterClass))
+
+
+typedef struct _GimpFilterClass GimpFilterClass;
+
+struct _GimpFilter
+{
+  GimpViewable  parent_instance;
+};
+
+struct _GimpFilterClass
+{
+  GimpViewableClass  parent_class;
+
+  /*  signals  */
+  void       (* active_changed) (GimpFilter *filter);
+
+  /*  virtual functions  */
+  GeglNode * (* get_node)       (GimpFilter *filter);
+};
+
+
+GType            gimp_filter_get_type         (void) G_GNUC_CONST;
+GimpFilter     * gimp_filter_new              (const gchar    *name);
+
+GeglNode       * gimp_filter_get_node         (GimpFilter     *filter);
+GeglNode       * gimp_filter_peek_node        (GimpFilter     *filter);
+
+void             gimp_filter_set_active       (GimpFilter     *filter,
+                                               gboolean        active);
+gboolean         gimp_filter_get_active       (GimpFilter     *filter);
+
+void             gimp_filter_set_is_last_node (GimpFilter     *filter,
+                                               gboolean        is_last_node);
+gboolean         gimp_filter_get_is_last_node (GimpFilter     *filter);
+
+void             gimp_filter_set_applicator   (GimpFilter     *filter,
+                                               GimpApplicator *applicator);
+GimpApplicator * gimp_filter_get_applicator   (GimpFilter     *filter);
+
+
+#endif /* __GIMP_FILTER_H__ */
diff --git a/app/core/gimpfilteredcontainer.c b/app/core/gimpfilteredcontainer.c
new file mode 100644
index 0000000..ec56593
--- /dev/null
+++ b/app/core/gimpfilteredcontainer.c
@@ -0,0 +1,373 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilteredcontainer.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *               2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "gimpfilteredcontainer.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SRC_CONTAINER,
+  PROP_FILTER_FUNC,
+  PROP_FILTER_DATA
+};
+
+
+static void     gimp_filtered_container_constructed     (GObject               *object);
+static void     gimp_filtered_container_dispose         (GObject               *object);
+static void     gimp_filtered_container_finalize        (GObject               *object);
+static void     gimp_filtered_container_set_property    (GObject               *object,
+                                                         guint                  property_id,
+                                                         const GValue          *value,
+                                                         GParamSpec            *pspec);
+static void     gimp_filtered_container_get_property    (GObject               *object,
+                                                         guint                  property_id,
+                                                         GValue                *value,
+                                                         GParamSpec            *pspec);
+
+static void     gimp_filtered_container_real_src_add    (GimpFilteredContainer *filtered_container,
+                                                         GimpObject            *object);
+static void     gimp_filtered_container_real_src_remove (GimpFilteredContainer *filtered_container,
+                                                         GimpObject            *object);
+static void     gimp_filtered_container_real_src_freeze (GimpFilteredContainer *filtered_container);
+static void     gimp_filtered_container_real_src_thaw   (GimpFilteredContainer *filtered_container);
+
+static gboolean gimp_filtered_container_object_matches  (GimpFilteredContainer *filtered_container,
+                                                         GimpObject            *object);
+static void     gimp_filtered_container_src_add         (GimpContainer         *src_container,
+                                                         GimpObject            *obj,
+                                                         GimpFilteredContainer *filtered_container);
+static void     gimp_filtered_container_src_remove      (GimpContainer         *src_container,
+                                                         GimpObject            *obj,
+                                                         GimpFilteredContainer *filtered_container);
+static void     gimp_filtered_container_src_freeze      (GimpContainer         *src_container,
+                                                         GimpFilteredContainer *filtered_container);
+static void     gimp_filtered_container_src_thaw        (GimpContainer         *src_container,
+                                                         GimpFilteredContainer *filtered_container);
+
+
+G_DEFINE_TYPE (GimpFilteredContainer, gimp_filtered_container, GIMP_TYPE_LIST)
+
+#define parent_class gimp_filtered_container_parent_class
+
+
+static void
+gimp_filtered_container_class_init (GimpFilteredContainerClass *klass)
+{
+  GObjectClass               *g_object_class = G_OBJECT_CLASS (klass);
+  GimpFilteredContainerClass *filtered_class = GIMP_FILTERED_CONTAINER_CLASS (klass);
+
+  g_object_class->constructed  = gimp_filtered_container_constructed;
+  g_object_class->dispose      = gimp_filtered_container_dispose;
+  g_object_class->finalize     = gimp_filtered_container_finalize;
+  g_object_class->set_property = gimp_filtered_container_set_property;
+  g_object_class->get_property = gimp_filtered_container_get_property;
+
+  filtered_class->src_add      = gimp_filtered_container_real_src_add;
+  filtered_class->src_remove   = gimp_filtered_container_real_src_remove;
+  filtered_class->src_freeze   = gimp_filtered_container_real_src_freeze;
+  filtered_class->src_thaw     = gimp_filtered_container_real_src_thaw;
+
+  g_object_class_install_property (g_object_class, PROP_SRC_CONTAINER,
+                                   g_param_spec_object ("src-container",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (g_object_class, PROP_FILTER_FUNC,
+                                   g_param_spec_pointer ("filter-func",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (g_object_class, PROP_FILTER_DATA,
+                                   g_param_spec_pointer ("filter-data",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_filtered_container_init (GimpFilteredContainer *filtered_container)
+{
+}
+
+static void
+gimp_filtered_container_constructed (GObject *object)
+{
+  GimpFilteredContainer *filtered_container = GIMP_FILTERED_CONTAINER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CONTAINER (filtered_container->src_container));
+
+  if (! gimp_container_frozen (filtered_container->src_container))
+    {
+      /*  a freeze/thaw can't hurt on a newly created container because
+       *  we can't have any views yet. This way we get away without
+       *  having a virtual function for initializing the container.
+       */
+      gimp_filtered_container_src_freeze (filtered_container->src_container,
+                                          filtered_container);
+      gimp_filtered_container_src_thaw (filtered_container->src_container,
+                                        filtered_container);
+    }
+}
+
+static void
+gimp_filtered_container_dispose (GObject *object)
+{
+  GimpFilteredContainer *filtered_container = GIMP_FILTERED_CONTAINER (object);
+
+  if (filtered_container->src_container)
+    {
+      g_signal_handlers_disconnect_by_func (filtered_container->src_container,
+                                            gimp_filtered_container_src_add,
+                                            filtered_container);
+      g_signal_handlers_disconnect_by_func (filtered_container->src_container,
+                                            gimp_filtered_container_src_remove,
+                                            filtered_container);
+      g_signal_handlers_disconnect_by_func (filtered_container->src_container,
+                                            gimp_filtered_container_src_freeze,
+                                            filtered_container);
+      g_signal_handlers_disconnect_by_func (filtered_container->src_container,
+                                            gimp_filtered_container_src_thaw,
+                                            filtered_container);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_filtered_container_finalize (GObject *object)
+{
+  GimpFilteredContainer *filtered_container = GIMP_FILTERED_CONTAINER (object);
+
+  g_clear_object (&filtered_container->src_container);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_filtered_container_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpFilteredContainer *filtered_container = GIMP_FILTERED_CONTAINER (object);
+
+  switch (property_id)
+    {
+    case PROP_SRC_CONTAINER:
+      filtered_container->src_container = g_value_dup_object (value);
+
+      g_signal_connect (filtered_container->src_container, "add",
+                        G_CALLBACK (gimp_filtered_container_src_add),
+                        filtered_container);
+      g_signal_connect (filtered_container->src_container, "remove",
+                        G_CALLBACK (gimp_filtered_container_src_remove),
+                        filtered_container);
+      g_signal_connect (filtered_container->src_container, "freeze",
+                        G_CALLBACK (gimp_filtered_container_src_freeze),
+                        filtered_container);
+      g_signal_connect (filtered_container->src_container, "thaw",
+                        G_CALLBACK (gimp_filtered_container_src_thaw),
+                        filtered_container);
+      break;
+
+    case PROP_FILTER_FUNC:
+      filtered_container->filter_func = g_value_get_pointer (value);
+      break;
+
+    case PROP_FILTER_DATA:
+      filtered_container->filter_data = g_value_get_pointer (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_filtered_container_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpFilteredContainer *filtered_container = GIMP_FILTERED_CONTAINER (object);
+
+  switch (property_id)
+    {
+    case PROP_SRC_CONTAINER:
+      g_value_set_object (value, filtered_container->src_container);
+      break;
+
+    case PROP_FILTER_FUNC:
+      g_value_set_pointer (value, filtered_container->filter_func);
+      break;
+
+    case PROP_FILTER_DATA:
+      g_value_set_pointer (value, filtered_container->filter_data);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_filtered_container_real_src_add (GimpFilteredContainer *filtered_container,
+                                      GimpObject            *object)
+{
+  if (gimp_filtered_container_object_matches (filtered_container, object))
+    {
+      gimp_container_add (GIMP_CONTAINER (filtered_container), object);
+    }
+}
+
+static void
+gimp_filtered_container_real_src_remove (GimpFilteredContainer *filtered_container,
+                                         GimpObject            *object)
+{
+  if (gimp_filtered_container_object_matches (filtered_container, object))
+    {
+      gimp_container_remove (GIMP_CONTAINER (filtered_container), object);
+    }
+}
+
+static void
+gimp_filtered_container_real_src_freeze (GimpFilteredContainer *filtered_container)
+{
+  gimp_container_clear (GIMP_CONTAINER (filtered_container));
+}
+
+static void
+gimp_filtered_container_real_src_thaw (GimpFilteredContainer *filtered_container)
+{
+  GList *list;
+
+  for (list = GIMP_LIST (filtered_container->src_container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpObject *object = list->data;
+
+      if (gimp_filtered_container_object_matches (filtered_container, object))
+        {
+          gimp_container_add (GIMP_CONTAINER (filtered_container), object);
+        }
+    }
+}
+
+/**
+ * gimp_filtered_container_new:
+ * @src_container: container to be filtered.
+ *
+ * Creates a new #GimpFilteredContainer object which creates filtered
+ * data view of #GimpTagged objects. It filters @src_container for objects
+ * containing all of the filtering tags. Synchronization with @src_container
+ * data is performed automatically.
+ *
+ * Return value: a new #GimpFilteredContainer object.
+ **/
+GimpContainer *
+gimp_filtered_container_new (GimpContainer        *src_container,
+                             GimpObjectFilterFunc  filter_func,
+                             gpointer              filter_data)
+{
+  GType        children_type;
+  GCompareFunc sort_func;
+
+  g_return_val_if_fail (GIMP_IS_LIST (src_container), NULL);
+
+  children_type = gimp_container_get_children_type (src_container);
+  sort_func     = GIMP_LIST (src_container)->sort_func;
+
+  return g_object_new (GIMP_TYPE_FILTERED_CONTAINER,
+                       "sort-func",     sort_func,
+                       "children-type", children_type,
+                       "policy",        GIMP_CONTAINER_POLICY_WEAK,
+                       "unique-names",  FALSE,
+                       "src-container", src_container,
+                       "filter-func",   filter_func,
+                       "filter-data",   filter_data,
+                       NULL);
+}
+
+static gboolean
+gimp_filtered_container_object_matches (GimpFilteredContainer *filtered_container,
+                                        GimpObject            *object)
+{
+  return (! filtered_container->filter_func ||
+          filtered_container->filter_func (object,
+                                           filtered_container->filter_data));
+}
+
+static void
+gimp_filtered_container_src_add (GimpContainer         *src_container,
+                                 GimpObject            *object,
+                                 GimpFilteredContainer *filtered_container)
+{
+  if (! gimp_container_frozen (filtered_container->src_container))
+    {
+      GIMP_FILTERED_CONTAINER_GET_CLASS (filtered_container)->src_add (filtered_container,
+                                                                       object);
+    }
+}
+
+static void
+gimp_filtered_container_src_remove (GimpContainer         *src_container,
+                                    GimpObject            *object,
+                                    GimpFilteredContainer *filtered_container)
+{
+  if (! gimp_container_frozen (filtered_container->src_container))
+    {
+      GIMP_FILTERED_CONTAINER_GET_CLASS (filtered_container)->src_remove (filtered_container,
+                                                                          object);
+    }
+}
+
+static void
+gimp_filtered_container_src_freeze (GimpContainer         *src_container,
+                                    GimpFilteredContainer *filtered_container)
+{
+  gimp_container_freeze (GIMP_CONTAINER (filtered_container));
+
+  GIMP_FILTERED_CONTAINER_GET_CLASS (filtered_container)->src_freeze (filtered_container);
+}
+
+static void
+gimp_filtered_container_src_thaw (GimpContainer         *src_container,
+                                  GimpFilteredContainer *filtered_container)
+{
+  GIMP_FILTERED_CONTAINER_GET_CLASS (filtered_container)->src_thaw (filtered_container);
+
+  gimp_container_thaw (GIMP_CONTAINER (filtered_container));
+}
diff --git a/app/core/gimpfilteredcontainer.h b/app/core/gimpfilteredcontainer.h
new file mode 100644
index 0000000..28803c8
--- /dev/null
+++ b/app/core/gimpfilteredcontainer.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilteredcontainer.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *               2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTERED_CONTAINER_H__
+#define __GIMP_FILTERED_CONTAINER_H__
+
+
+#include "gimplist.h"
+
+
+#define GIMP_TYPE_FILTERED_CONTAINER            (gimp_filtered_container_get_type ())
+#define GIMP_FILTERED_CONTAINER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILTERED_CONTAINER, GimpFilteredContainer))
+#define GIMP_FILTERED_CONTAINER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILTERED_CONTAINER, GimpFilteredContainerClass))
+#define GIMP_IS_FILTERED_CONTAINER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILTERED_CONTAINER))
+#define GIMP_IS_FILTERED_CONTAINER_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), GIMP_TYPE_FILTERED_CONTAINER))
+#define GIMP_FILTERED_CONTAINER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILTERED_CONTAINER, GimpFilteredContainerClass))
+
+
+typedef struct _GimpFilteredContainerClass GimpFilteredContainerClass;
+
+struct _GimpFilteredContainer
+{
+  GimpList              parent_instance;
+
+  GimpContainer        *src_container;
+  GimpObjectFilterFunc  filter_func;
+  gpointer              filter_data;
+};
+
+struct _GimpFilteredContainerClass
+{
+  GimpContainerClass  parent_class;
+
+  void (* src_add)    (GimpFilteredContainer *filtered_container,
+                       GimpObject            *object);
+  void (* src_remove) (GimpFilteredContainer *filtered_container,
+                       GimpObject            *object);
+  void (* src_freeze) (GimpFilteredContainer *filtered_container);
+  void (* src_thaw)   (GimpFilteredContainer *filtered_container);
+};
+
+
+GType           gimp_filtered_container_get_type (void) G_GNUC_CONST;
+
+GimpContainer * gimp_filtered_container_new      (GimpContainer        *src_container,
+                                                  GimpObjectFilterFunc  filter_func,
+                                                  gpointer              filter_data);
+
+
+#endif  /* __GIMP_FILTERED_CONTAINER_H__ */
diff --git a/app/core/gimpfilterstack.c b/app/core/gimpfilterstack.c
new file mode 100644
index 0000000..09d9cfd
--- /dev/null
+++ b/app/core/gimpfilterstack.c
@@ -0,0 +1,350 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilterstack.c
+ * Copyright (C) 2008-2013 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpfilter.h"
+#include "gimpfilterstack.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_filter_stack_constructed      (GObject         *object);
+static void   gimp_filter_stack_finalize         (GObject         *object);
+
+static void   gimp_filter_stack_add              (GimpContainer   *container,
+                                                  GimpObject      *object);
+static void   gimp_filter_stack_remove           (GimpContainer   *container,
+                                                  GimpObject      *object);
+static void   gimp_filter_stack_reorder          (GimpContainer   *container,
+                                                  GimpObject      *object,
+                                                  gint             new_index);
+
+static void   gimp_filter_stack_add_node         (GimpFilterStack *stack,
+                                                  GimpFilter      *filter);
+static void   gimp_filter_stack_remove_node      (GimpFilterStack *stack,
+                                                  GimpFilter      *filter);
+static void   gimp_filter_stack_update_last_node (GimpFilterStack *stack);
+
+static void   gimp_filter_stack_filter_active    (GimpFilter      *filter,
+                                                  GimpFilterStack *stack);
+
+
+G_DEFINE_TYPE (GimpFilterStack, gimp_filter_stack, GIMP_TYPE_LIST);
+
+#define parent_class gimp_filter_stack_parent_class
+
+
+static void
+gimp_filter_stack_class_init (GimpFilterStackClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GimpContainerClass *container_class = GIMP_CONTAINER_CLASS (klass);
+
+  object_class->constructed = gimp_filter_stack_constructed;
+  object_class->finalize    = gimp_filter_stack_finalize;
+
+  container_class->add      = gimp_filter_stack_add;
+  container_class->remove   = gimp_filter_stack_remove;
+  container_class->reorder  = gimp_filter_stack_reorder;
+}
+
+static void
+gimp_filter_stack_init (GimpFilterStack *stack)
+{
+}
+
+static void
+gimp_filter_stack_constructed (GObject *object)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+                            GIMP_TYPE_FILTER));
+
+  gimp_container_add_handler (container, "active-changed",
+                              G_CALLBACK (gimp_filter_stack_filter_active),
+                              container);
+}
+
+static void
+gimp_filter_stack_finalize (GObject *object)
+{
+  GimpFilterStack *stack = GIMP_FILTER_STACK (object);
+
+  g_clear_object (&stack->graph);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_filter_stack_add (GimpContainer *container,
+                       GimpObject    *object)
+{
+  GimpFilterStack *stack  = GIMP_FILTER_STACK (container);
+  GimpFilter      *filter = GIMP_FILTER (object);
+
+  GIMP_CONTAINER_CLASS (parent_class)->add (container, object);
+
+  if (gimp_filter_get_active (filter))
+    {
+      if (stack->graph)
+        {
+          gegl_node_add_child (stack->graph, gimp_filter_get_node (filter));
+          gimp_filter_stack_add_node (stack, filter);
+        }
+
+      gimp_filter_stack_update_last_node (stack);
+    }
+}
+
+static void
+gimp_filter_stack_remove (GimpContainer *container,
+                          GimpObject    *object)
+{
+  GimpFilterStack *stack  = GIMP_FILTER_STACK (container);
+  GimpFilter      *filter = GIMP_FILTER (object);
+
+  if (stack->graph && gimp_filter_get_active (filter))
+    {
+      gimp_filter_stack_remove_node (stack, filter);
+      gegl_node_remove_child (stack->graph, gimp_filter_get_node (filter));
+    }
+
+  GIMP_CONTAINER_CLASS (parent_class)->remove (container, object);
+
+  if (gimp_filter_get_active (filter))
+    {
+      gimp_filter_set_is_last_node (filter, FALSE);
+      gimp_filter_stack_update_last_node (stack);
+    }
+}
+
+static void
+gimp_filter_stack_reorder (GimpContainer *container,
+                           GimpObject    *object,
+                           gint           new_index)
+{
+  GimpFilterStack *stack  = GIMP_FILTER_STACK (container);
+  GimpFilter      *filter = GIMP_FILTER (object);
+
+  if (stack->graph && gimp_filter_get_active (filter))
+    gimp_filter_stack_remove_node (stack, filter);
+
+  GIMP_CONTAINER_CLASS (parent_class)->reorder (container, object, new_index);
+
+  if (gimp_filter_get_active (filter))
+    {
+      gimp_filter_stack_update_last_node (stack);
+
+      if (stack->graph)
+        gimp_filter_stack_add_node (stack, filter);
+    }
+}
+
+
+/*  public functions  */
+
+GimpContainer *
+gimp_filter_stack_new (GType filter_type)
+{
+  g_return_val_if_fail (g_type_is_a (filter_type, GIMP_TYPE_FILTER), NULL);
+
+  return g_object_new (GIMP_TYPE_FILTER_STACK,
+                       "name",          g_type_name (filter_type),
+                       "children-type", filter_type,
+                       "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                       NULL);
+}
+
+GeglNode *
+gimp_filter_stack_get_graph (GimpFilterStack *stack)
+{
+  GList    *list;
+  GeglNode *previous;
+  GeglNode *output;
+
+  g_return_val_if_fail (GIMP_IS_FILTER_STACK (stack), NULL);
+
+  if (stack->graph)
+    return stack->graph;
+
+  stack->graph = gegl_node_new ();
+
+  previous = gegl_node_get_input_proxy (stack->graph, "input");
+
+  for (list = GIMP_LIST (stack)->queue->tail;
+       list;
+       list = g_list_previous (list))
+    {
+      GimpFilter *filter = list->data;
+      GeglNode   *node;
+
+      if (! gimp_filter_get_active (filter))
+        continue;
+
+      node = gimp_filter_get_node (filter);
+
+      gegl_node_add_child (stack->graph, node);
+
+      gegl_node_connect_to (previous, "output",
+                            node,     "input");
+
+      previous = node;
+    }
+
+  output = gegl_node_get_output_proxy (stack->graph, "output");
+
+  gegl_node_connect_to (previous, "output",
+                        output,   "input");
+
+  return stack->graph;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_filter_stack_add_node (GimpFilterStack *stack,
+                            GimpFilter      *filter)
+{
+  GeglNode *node;
+  GeglNode *node_above = NULL;
+  GeglNode *node_below = NULL;
+  GList    *iter;
+
+  node = gimp_filter_get_node (filter);
+
+
+  iter = g_list_find (GIMP_LIST (stack)->queue->head, filter);
+
+  while ((iter = g_list_previous (iter)))
+    {
+      GimpFilter *filter_above = iter->data;
+
+      if (gimp_filter_get_active (filter_above))
+        {
+          node_above = gimp_filter_get_node (filter_above);
+
+          break;
+        }
+    }
+
+  if (! node_above)
+    node_above = gegl_node_get_output_proxy (stack->graph, "output");
+
+  node_below = gegl_node_get_producer (node_above, "input", NULL);
+
+  gegl_node_connect_to (node_below, "output",
+                        node,       "input");
+  gegl_node_connect_to (node,       "output",
+                        node_above, "input");
+}
+
+static void
+gimp_filter_stack_remove_node (GimpFilterStack *stack,
+                               GimpFilter      *filter)
+{
+  GeglNode *node;
+  GeglNode *node_above = NULL;
+  GeglNode *node_below = NULL;
+  GList    *iter;
+
+  node = gimp_filter_get_node (filter);
+
+  iter = g_list_find (GIMP_LIST (stack)->queue->head, filter);
+
+  while ((iter = g_list_previous (iter)))
+    {
+      GimpFilter *filter_above = iter->data;
+
+      if (gimp_filter_get_active (filter_above))
+        {
+          node_above = gimp_filter_get_node (filter_above);
+
+          break;
+        }
+    }
+
+  if (! node_above)
+    node_above = gegl_node_get_output_proxy (stack->graph, "output");
+
+  node_below = gegl_node_get_producer (node, "input", NULL);
+
+  gegl_node_disconnect (node, "input");
+
+  gegl_node_connect_to (node_below, "output",
+                        node_above, "input");
+}
+
+static void
+gimp_filter_stack_update_last_node (GimpFilterStack *stack)
+{
+  GList    *list;
+  gboolean  found_last = FALSE;
+
+  for (list = GIMP_LIST (stack)->queue->tail;
+       list;
+       list = g_list_previous (list))
+    {
+      GimpFilter *filter = list->data;
+
+      if (! found_last && gimp_filter_get_active (filter))
+        {
+          gimp_filter_set_is_last_node (filter, TRUE);
+          found_last = TRUE;
+        }
+      else
+        {
+          gimp_filter_set_is_last_node (filter, FALSE);
+        }
+    }
+}
+
+static void
+gimp_filter_stack_filter_active (GimpFilter      *filter,
+                                 GimpFilterStack *stack)
+{
+  if (stack->graph)
+    {
+      if (gimp_filter_get_active (filter))
+        {
+          gegl_node_add_child (stack->graph, gimp_filter_get_node (filter));
+          gimp_filter_stack_add_node (stack, filter);
+        }
+      else
+        {
+          gimp_filter_stack_remove_node (stack, filter);
+          gegl_node_remove_child (stack->graph, gimp_filter_get_node (filter));
+        }
+    }
+
+  gimp_filter_stack_update_last_node (stack);
+
+  if (! gimp_filter_get_active (filter))
+    gimp_filter_set_is_last_node (filter, FALSE);
+}
diff --git a/app/core/gimpfilterstack.h b/app/core/gimpfilterstack.h
new file mode 100644
index 0000000..3567f06
--- /dev/null
+++ b/app/core/gimpfilterstack.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilterstack.h
+ * Copyright (C) 2008-2013 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_STACK_H__
+#define __GIMP_FILTER_STACK_H__
+
+#include "gimplist.h"
+
+
+#define GIMP_TYPE_FILTER_STACK            (gimp_filter_stack_get_type ())
+#define GIMP_FILTER_STACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILTER_STACK, GimpFilterStack))
+#define GIMP_FILTER_STACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILTER_STACK, GimpFilterStackClass))
+#define GIMP_IS_FILTER_STACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILTER_STACK))
+#define GIMP_IS_FILTER_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILTER_STACK))
+
+
+typedef struct _GimpFilterStackClass GimpFilterStackClass;
+
+struct _GimpFilterStack
+{
+  GimpList  parent_instance;
+
+  GeglNode *graph;
+};
+
+struct _GimpFilterStackClass
+{
+  GimpListClass  parent_class;
+};
+
+
+GType           gimp_filter_stack_get_type  (void) G_GNUC_CONST;
+GimpContainer * gimp_filter_stack_new       (GType            filter_type);
+
+GeglNode *      gimp_filter_stack_get_graph (GimpFilterStack *stack);
+
+
+#endif  /*  __GIMP_FILTER_STACK_H__  */
diff --git a/app/core/gimpfloatingselectionundo.c b/app/core/gimpfloatingselectionundo.c
new file mode 100644
index 0000000..6ca28ab
--- /dev/null
+++ b/app/core/gimpfloatingselectionundo.c
@@ -0,0 +1,135 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpdrawable-floating-selection.h"
+#include "gimpfloatingselectionundo.h"
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayer-floating-selection.h"
+
+
+static void   gimp_floating_selection_undo_constructed (GObject             *object);
+
+static void   gimp_floating_selection_undo_pop         (GimpUndo            *undo,
+                                                        GimpUndoMode         undo_mode,
+                                                        GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpFloatingSelectionUndo, gimp_floating_selection_undo,
+               GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_floating_selection_undo_parent_class
+
+
+static void
+gimp_floating_selection_undo_class_init (GimpFloatingSelectionUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_floating_selection_undo_constructed;
+
+  undo_class->pop           = gimp_floating_selection_undo_pop;
+}
+
+static void
+gimp_floating_selection_undo_init (GimpFloatingSelectionUndo *undo)
+{
+}
+
+static void
+gimp_floating_selection_undo_constructed (GObject *object)
+{
+  GimpFloatingSelectionUndo *floating_sel_undo;
+  GimpLayer                 *layer;
+
+  floating_sel_undo = GIMP_FLOATING_SELECTION_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_LAYER (GIMP_ITEM_UNDO (object)->item));
+
+  layer = GIMP_LAYER (GIMP_ITEM_UNDO (object)->item);
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_FS_TO_LAYER:
+      floating_sel_undo->drawable = gimp_layer_get_floating_sel_drawable (layer);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_floating_selection_undo_pop (GimpUndo            *undo,
+                                  GimpUndoMode         undo_mode,
+                                  GimpUndoAccumulator *accum)
+{
+  GimpFloatingSelectionUndo *floating_sel_undo;
+  GimpLayer                 *floating_layer;
+
+  floating_sel_undo = GIMP_FLOATING_SELECTION_UNDO (undo);
+  floating_layer    = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_FS_TO_LAYER:
+      if (undo_mode == GIMP_UNDO_MODE_UNDO)
+        {
+          /*  Update the preview for the floating selection  */
+          gimp_viewable_invalidate_preview (GIMP_VIEWABLE (floating_layer));
+
+          gimp_layer_set_floating_sel_drawable (floating_layer,
+                                                floating_sel_undo->drawable);
+          gimp_image_set_active_layer (undo->image, floating_layer);
+
+          gimp_drawable_attach_floating_sel (gimp_layer_get_floating_sel_drawable (floating_layer),
+                                             floating_layer);
+        }
+      else
+        {
+          gimp_drawable_detach_floating_sel (gimp_layer_get_floating_sel_drawable (floating_layer));
+          gimp_layer_set_floating_sel_drawable (floating_layer, NULL);
+        }
+
+      /* When the floating selection is converted to/from a normal
+       * layer it does something resembling a name change, so emit the
+       * "name-changed" signal
+       */
+      gimp_object_name_changed (GIMP_OBJECT (floating_layer));
+
+      gimp_drawable_update (GIMP_DRAWABLE (floating_layer),
+                            0, 0,
+                            gimp_item_get_width  (GIMP_ITEM (floating_layer)),
+                            gimp_item_get_height (GIMP_ITEM (floating_layer)));
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
diff --git a/app/core/gimpfloatingselectionundo.h b/app/core/gimpfloatingselectionundo.h
new file mode 100644
index 0000000..4d9a626
--- /dev/null
+++ b/app/core/gimpfloatingselectionundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FLOATING_SELECTION_UNDO_H__
+#define __GIMP_FLOATING_SELECTION_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_FLOATING_SELECTION_UNDO            (gimp_floating_selection_undo_get_type ())
+#define GIMP_FLOATING_SELECTION_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FLOATING_SELECTION_UNDO, GimpFloatingSelectionUndo))
+#define GIMP_FLOATING_SELECTION_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FLOATING_SELECTION_UNDO, GimpFloatingSelectionUndoClass))
+#define GIMP_IS_FLOATING_SELECTION_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FLOATING_SELECTION_UNDO))
+#define GIMP_IS_FLOATING_SELECTION_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FLOATING_SELECTION_UNDO))
+#define GIMP_FLOATING_SELECTION_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FLOATING_SELECTION_UNDO, GimpFloatingSelectionUndoClass))
+
+
+typedef struct _GimpFloatingSelectionUndo      GimpFloatingSelectionUndo;
+typedef struct _GimpFloatingSelectionUndoClass GimpFloatingSelectionUndoClass;
+
+struct _GimpFloatingSelectionUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpDrawable *drawable;
+};
+
+struct _GimpFloatingSelectionUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_floating_selection_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_FLOATING_SELECTION_UNDO_H__ */
diff --git a/app/core/gimpgradient-load.c b/app/core/gimpgradient-load.c
new file mode 100644
index 0000000..1abe494
--- /dev/null
+++ b/app/core/gimpgradient-load.c
@@ -0,0 +1,575 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "config/gimpxmlparser.h"
+
+#include "gimp-utils.h"
+#include "gimpgradient.h"
+#include "gimpgradient-load.h"
+
+#include "gimp-intl.h"
+
+
+GList *
+gimp_gradient_load (GimpContext   *context,
+                    GFile         *file,
+                    GInputStream  *input,
+                    GError       **error)
+{
+  GimpGradient        *gradient = NULL;
+  GimpGradientSegment *prev;
+  gint                 num_segments;
+  gint                 i;
+  GDataInputStream    *data_input;
+  gchar               *line;
+  gsize                line_len;
+  gint                 linenum;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  data_input = g_data_input_stream_new (input);
+
+  linenum = 1;
+  line_len = 1024;
+  line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                  NULL, error);
+  if (! line)
+    goto failed;
+
+  if (! g_str_has_prefix (line, "GIMP Gradient"))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Not a GIMP gradient file."));
+      g_free (line);
+      goto failed;
+    }
+
+  g_free (line);
+
+  gradient = g_object_new (GIMP_TYPE_GRADIENT,
+                           "mime-type", "application/x-gimp-gradient",
+                           NULL);
+
+  linenum++;
+  line_len = 1024;
+  line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                  NULL, error);
+  if (! line)
+    goto failed;
+
+  if (g_str_has_prefix (line, "Name: "))
+    {
+      gchar *utf8;
+
+      utf8 = gimp_any_to_utf8 (g_strstrip (line + strlen ("Name: ")), -1,
+                               _("Invalid UTF-8 string in gradient file '%s'."),
+                               gimp_file_get_utf8_name (file));
+      gimp_object_take_name (GIMP_OBJECT (gradient), utf8);
+
+      g_free (line);
+
+      linenum++;
+      line_len = 1024;
+      line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                      NULL, error);
+      if (! line)
+        goto failed;
+    }
+  else /* old gradient format */
+    {
+      gimp_object_take_name (GIMP_OBJECT (gradient),
+                             g_path_get_basename (gimp_file_get_utf8_name (file)));
+    }
+
+  num_segments = atoi (line);
+
+  g_free (line);
+
+  if (num_segments < 1)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("File is corrupt."));
+      goto failed;
+    }
+
+  prev = NULL;
+
+  for (i = 0; i < num_segments; i++)
+    {
+      GimpGradientSegment *seg;
+      gchar               *end;
+      gint                 color;
+      gint                 type;
+      gint                 left_color_type;
+      gint                 right_color_type;
+
+      seg = gimp_gradient_segment_new ();
+
+      seg->prev = prev;
+
+      if (prev)
+        prev->next = seg;
+      else
+        gradient->segments = seg;
+
+      linenum++;
+      line_len = 1024;
+      line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                      NULL, error);
+      if (! line)
+        goto failed;
+
+      if (! gimp_ascii_strtod (line, &end, &seg->left)          ||
+          ! gimp_ascii_strtod (end,  &end, &seg->middle)        ||
+          ! gimp_ascii_strtod (end,  &end, &seg->right)         ||
+
+          ! gimp_ascii_strtod (end,  &end, &seg->left_color.r)  ||
+          ! gimp_ascii_strtod (end,  &end, &seg->left_color.g)  ||
+          ! gimp_ascii_strtod (end,  &end, &seg->left_color.b)  ||
+          ! gimp_ascii_strtod (end,  &end, &seg->left_color.a)  ||
+
+          ! gimp_ascii_strtod (end,  &end, &seg->right_color.r) ||
+          ! gimp_ascii_strtod (end,  &end, &seg->right_color.g) ||
+          ! gimp_ascii_strtod (end,  &end, &seg->right_color.b) ||
+          ! gimp_ascii_strtod (end,  &end, &seg->right_color.a))
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Corrupt segment %d."), i);
+          g_free (line);
+          goto failed;
+        }
+
+      switch (sscanf (end, "%d %d %d %d",
+                      &type, &color,
+                      &left_color_type, &right_color_type))
+        {
+        case 4:
+          seg->left_color_type  = (GimpGradientColor) left_color_type;
+          if (seg->left_color_type < GIMP_GRADIENT_COLOR_FIXED ||
+              seg->left_color_type > GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT)
+            {
+              g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                           _("Corrupt segment %d."), i);
+              g_free (line);
+              goto failed;
+            }
+
+          seg->right_color_type = (GimpGradientColor) right_color_type;
+          if (seg->right_color_type < GIMP_GRADIENT_COLOR_FIXED ||
+              seg->right_color_type > GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT)
+            {
+              g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                           _("Corrupt segment %d."), i);
+              g_free (line);
+              goto failed;
+            }
+          /* fall thru */
+
+        case 2:
+          seg->type  = (GimpGradientSegmentType) type;
+          if (seg->type < GIMP_GRADIENT_SEGMENT_LINEAR ||
+              seg->type > GIMP_GRADIENT_SEGMENT_STEP)
+            {
+              g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                           _("Corrupt segment %d."), i);
+              g_free (line);
+              goto failed;
+            }
+
+          seg->color = (GimpGradientSegmentColor) color;
+          if (seg->color < GIMP_GRADIENT_SEGMENT_RGB ||
+              seg->color > GIMP_GRADIENT_SEGMENT_HSV_CW)
+            {
+              g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                           _("Corrupt segment %d."), i);
+              g_free (line);
+              goto failed;
+            }
+          break;
+
+        default:
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Corrupt segment %d."), i);
+          g_free (line);
+          goto failed;
+        }
+
+      g_free (line);
+
+      if (seg->left   > seg->middle              ||
+          seg->middle > seg->right               ||
+          (  prev && (prev->right != seg->left)) ||
+          (! prev && (0.0         != seg->left)))
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Segments do not span the range 0-1."));
+          goto failed;
+        }
+
+      prev = seg;
+    }
+
+  if (prev->right != 1.0)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Segments do not span the range 0-1."));
+      goto failed;
+    }
+
+  g_object_unref (data_input);
+
+  return g_list_prepend (NULL, gradient);
+
+ failed:
+
+  g_object_unref (data_input);
+
+  if (gradient)
+    g_object_unref (gradient);
+
+  g_prefix_error (error, _("In line %d of gradient file: "), linenum);
+
+  return NULL;
+}
+
+
+/*  SVG gradient parser  */
+
+typedef struct
+{
+  GimpGradient *gradient;  /*  current gradient    */
+  GList        *gradients; /*  finished gradients  */
+  GList        *stops;
+} SvgParser;
+
+typedef struct
+{
+  gdouble       offset;
+  GimpRGB       color;
+} SvgStop;
+
+
+static void     svg_parser_start_element  (GMarkupParseContext  *context,
+                                           const gchar          *element_name,
+                                           const gchar         **attribute_names,
+                                           const gchar         **attribute_values,
+                                           gpointer              user_data,
+                                           GError              **error);
+static void      svg_parser_end_element   (GMarkupParseContext  *context,
+                                           const gchar          *element_name,
+                                           gpointer              user_data,
+                                           GError              **error);
+
+static GimpGradientSegment *
+                 svg_parser_gradient_segments   (GList          *stops);
+
+static SvgStop * svg_parse_gradient_stop        (const gchar   **names,
+                                                 const gchar   **values);
+
+
+static const GMarkupParser markup_parser =
+{
+  svg_parser_start_element,
+  svg_parser_end_element,
+  NULL,  /*  characters   */
+  NULL,  /*  passthrough  */
+  NULL   /*  error        */
+};
+
+
+GList *
+gimp_gradient_load_svg (GimpContext   *context,
+                        GFile         *file,
+                        GInputStream  *input,
+                        GError       **error)
+{
+  GimpXmlParser *xml_parser;
+  SvgParser      parser = { NULL, };
+  gboolean       success;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /* FIXME input */
+  g_input_stream_close (input, NULL, NULL);
+
+  xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
+
+  success = gimp_xml_parser_parse_gfile (xml_parser, file, error);
+
+  gimp_xml_parser_free (xml_parser);
+
+  if (success && ! parser.gradients)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("No linear gradients found."));
+    }
+
+  if (parser.gradient)
+    g_object_unref (parser.gradient);
+
+  if (parser.stops)
+    {
+      GList *list;
+
+      for (list = parser.stops; list; list = list->next)
+        g_slice_free (SvgStop, list->data);
+
+      g_list_free (parser.stops);
+    }
+
+  return g_list_reverse (parser.gradients);
+}
+
+static void
+svg_parser_start_element (GMarkupParseContext  *context,
+                          const gchar          *element_name,
+                          const gchar         **attribute_names,
+                          const gchar         **attribute_values,
+                          gpointer              user_data,
+                          GError              **error)
+{
+  SvgParser *parser = user_data;
+
+  if (! parser->gradient && strcmp (element_name, "linearGradient") == 0)
+    {
+      const gchar *name = NULL;
+
+      while (*attribute_names && *attribute_values)
+        {
+          if (strcmp (*attribute_names, "id") == 0 && *attribute_values)
+            name = *attribute_values;
+
+          attribute_names++;
+          attribute_values++;
+        }
+
+      parser->gradient = g_object_new (GIMP_TYPE_GRADIENT,
+                                       "name",      name,
+                                       "mime-type", "image/svg+xml",
+                                       NULL);
+    }
+  else if (parser->gradient && strcmp (element_name, "stop") == 0)
+    {
+      SvgStop *stop = svg_parse_gradient_stop (attribute_names,
+                                               attribute_values);
+
+      /*  The spec clearly states that each gradient stop's offset
+       *  value is required to be equal to or greater than the
+       *  previous gradient stop's offset value.
+       */
+      if (parser->stops)
+        stop->offset = MAX (stop->offset,
+                            ((SvgStop *) parser->stops->data)->offset);
+
+      parser->stops = g_list_prepend (parser->stops, stop);
+    }
+}
+
+static void
+svg_parser_end_element (GMarkupParseContext  *context,
+                        const gchar          *element_name,
+                        gpointer              user_data,
+                        GError              **error)
+{
+  SvgParser *parser = user_data;
+
+  if (parser->gradient &&
+      strcmp (element_name, "linearGradient") == 0)
+    {
+      GList *list;
+
+      parser->gradient->segments = svg_parser_gradient_segments (parser->stops);
+
+      for (list = parser->stops; list; list = list->next)
+        g_slice_free (SvgStop, list->data);
+
+      g_list_free (parser->stops);
+      parser->stops = NULL;
+
+      if (parser->gradient->segments)
+        parser->gradients = g_list_prepend (parser->gradients,
+                                            parser->gradient);
+      else
+        g_object_unref (parser->gradient);
+
+      parser->gradient = NULL;
+    }
+}
+
+static GimpGradientSegment *
+svg_parser_gradient_segments (GList *stops)
+{
+  GimpGradientSegment *segment;
+  SvgStop             *stop;
+  GList               *list;
+
+  if (! stops)
+    return NULL;
+
+  stop = stops->data;
+
+  segment = gimp_gradient_segment_new ();
+
+  segment->left_color  = stop->color;
+  segment->right_color = stop->color;
+
+  /*  the list of offsets is sorted from largest to smallest  */
+  for (list = g_list_next (stops); list; list = g_list_next (list))
+    {
+      GimpGradientSegment *next = segment;
+
+      segment->left   = stop->offset;
+      segment->middle = (segment->left + segment->right) / 2.0;
+
+      segment = gimp_gradient_segment_new ();
+
+      segment->next = next;
+      next->prev    = segment;
+
+      segment->right       = stop->offset;
+      segment->right_color = stop->color;
+
+      stop = list->data;
+
+      segment->left_color  = stop->color;
+    }
+
+  segment->middle = (segment->left + segment->right) / 2.0;
+
+  if (stop->offset > 0.0)
+    segment->right_color = stop->color;
+
+  /*  FIXME: remove empty segments here or add a GimpGradient API to do that
+   */
+
+  return segment;
+}
+
+static void
+svg_parse_gradient_stop_style_prop (SvgStop     *stop,
+                                    const gchar *name,
+                                    const gchar *value)
+{
+  if (strcmp (name, "stop-color") == 0)
+    {
+      gimp_rgb_parse_css (&stop->color, value, -1);
+    }
+  else if (strcmp (name, "stop-opacity") == 0)
+    {
+      gdouble opacity = g_ascii_strtod (value, NULL);
+
+      if (errno != ERANGE)
+        gimp_rgb_set_alpha (&stop->color, CLAMP (opacity, 0.0, 1.0));
+    }
+}
+
+/*  very simplistic CSS style parser  */
+static void
+svg_parse_gradient_stop_style (SvgStop     *stop,
+                               const gchar *style)
+{
+  const gchar *end;
+  const gchar *sep;
+
+  while (*style)
+    {
+      while (g_ascii_isspace (*style))
+        style++;
+
+      for (end = style; *end && *end != ';'; end++)
+        /* do nothing */;
+
+      for (sep = style; sep < end && *sep != ':'; sep++)
+        /* do nothing */;
+
+      if (end > sep && sep > style)
+        {
+          gchar *name;
+          gchar *value;
+
+          name = g_strndup (style, sep - style);
+          sep++;
+          value = g_strndup (sep, end - sep - (*end == ';' ? 1 : 0));
+
+          svg_parse_gradient_stop_style_prop (stop, name, value);
+
+          g_free (value);
+          g_free (name);
+        }
+
+      style = end;
+
+      if (*style == ';')
+        style++;
+    }
+}
+
+static SvgStop *
+svg_parse_gradient_stop (const gchar **names,
+                         const gchar **values)
+{
+  SvgStop *stop = g_slice_new0 (SvgStop);
+
+  gimp_rgb_set_alpha (&stop->color, 1.0);
+
+  while (*names && *values)
+    {
+      if (strcmp (*names, "offset") == 0)
+        {
+          gchar *end;
+
+          stop->offset = g_ascii_strtod (*values, &end);
+
+          if (end && *end == '%')
+            stop->offset /= 100.0;
+
+          stop->offset = CLAMP (stop->offset, 0.0, 1.0);
+        }
+      else if (strcmp (*names, "style") == 0)
+        {
+          svg_parse_gradient_stop_style (stop, *values);
+        }
+      else
+        {
+          svg_parse_gradient_stop_style_prop (stop, *names, *values);
+        }
+
+      names++;
+      values++;
+    }
+
+  return stop;
+}
diff --git a/app/core/gimpgradient-load.h b/app/core/gimpgradient-load.h
new file mode 100644
index 0000000..fcc648c
--- /dev/null
+++ b/app/core/gimpgradient-load.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRADIENT_LOAD_H__
+#define __GIMP_GRADIENT_LOAD_H__
+
+
+#define GIMP_GRADIENT_FILE_EXTENSION     ".ggr"
+#define GIMP_GRADIENT_SVG_FILE_EXTENSION ".svg"
+
+
+GList  * gimp_gradient_load     (GimpContext   *context,
+                                 GFile         *file,
+                                 GInputStream  *input,
+                                 GError       **error);
+GList  * gimp_gradient_load_svg (GimpContext   *context,
+                                 GFile         *file,
+                                 GInputStream  *input,
+                                 GError       **error);
+
+
+#endif /* __GIMP_GRADIENT_LOAD_H__ */
diff --git a/app/core/gimpgradient-save.c b/app/core/gimpgradient-save.c
new file mode 100644
index 0000000..deca2d2
--- /dev/null
+++ b/app/core/gimpgradient-save.c
@@ -0,0 +1,221 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpgradient.h"
+#include "gimpgradient-save.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+gimp_gradient_save (GimpData       *data,
+                    GOutputStream  *output,
+                    GError        **error)
+{
+  GimpGradient        *gradient = GIMP_GRADIENT (data);
+  GString             *string;
+  GimpGradientSegment *seg;
+  gint                 num_segments;
+
+  /* File format is:
+   *
+   *   GIMP Gradient
+   *   Name: name
+   *   number_of_segments
+   *   left middle right r0 g0 b0 a0 r1 g1 b1 a1 type coloring left_color_type
+   *   left middle right r0 g0 b0 a0 r1 g1 b1 a1 type coloring right_color_type
+   *   ...
+   */
+
+  string = g_string_new ("GIMP Gradient\n");
+
+  g_string_append_printf (string, "Name: %s\n",
+                          gimp_object_get_name (gradient));
+
+  /* Count number of segments */
+  num_segments = 0;
+  seg          = gradient->segments;
+
+  while (seg)
+    {
+      num_segments++;
+      seg = seg->next;
+    }
+
+  /* Write rest of file */
+  g_string_append_printf (string, "%d\n", num_segments);
+
+  for (seg = gradient->segments; seg; seg = seg->next)
+    {
+      gchar buf[11][G_ASCII_DTOSTR_BUF_SIZE];
+
+      g_ascii_dtostr (buf[0],  G_ASCII_DTOSTR_BUF_SIZE, seg->left);
+      g_ascii_dtostr (buf[1],  G_ASCII_DTOSTR_BUF_SIZE, seg->middle);
+      g_ascii_dtostr (buf[2],  G_ASCII_DTOSTR_BUF_SIZE, seg->right);
+      g_ascii_dtostr (buf[3],  G_ASCII_DTOSTR_BUF_SIZE, seg->left_color.r);
+      g_ascii_dtostr (buf[4],  G_ASCII_DTOSTR_BUF_SIZE, seg->left_color.g);
+      g_ascii_dtostr (buf[5],  G_ASCII_DTOSTR_BUF_SIZE, seg->left_color.b);
+      g_ascii_dtostr (buf[6],  G_ASCII_DTOSTR_BUF_SIZE, seg->left_color.a);
+      g_ascii_dtostr (buf[7],  G_ASCII_DTOSTR_BUF_SIZE, seg->right_color.r);
+      g_ascii_dtostr (buf[8],  G_ASCII_DTOSTR_BUF_SIZE, seg->right_color.g);
+      g_ascii_dtostr (buf[9],  G_ASCII_DTOSTR_BUF_SIZE, seg->right_color.b);
+      g_ascii_dtostr (buf[10], G_ASCII_DTOSTR_BUF_SIZE, seg->right_color.a);
+
+      g_string_append_printf (string,
+                              "%s %s %s %s %s %s %s %s %s %s %s %d %d %d %d\n",
+                              buf[0], buf[1], buf[2],   /* left, middle, right */
+                              buf[3], buf[4], buf[5], buf[6],  /* left color   */
+                              buf[7], buf[8], buf[9], buf[10], /* right color  */
+                              (gint) seg->type,
+                              (gint) seg->color,
+                              (gint) seg->left_color_type,
+                              (gint) seg->right_color_type);
+    }
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, error))
+    {
+      g_string_free (string, TRUE);
+
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+
+  return TRUE;
+}
+
+gboolean
+gimp_gradient_save_pov (GimpGradient  *gradient,
+                        GFile         *file,
+                        GError       **error)
+{
+  GOutputStream       *output;
+  GString             *string;
+  GimpGradientSegment *seg;
+  gchar                buf[G_ASCII_DTOSTR_BUF_SIZE];
+  gchar                color_buf[4][G_ASCII_DTOSTR_BUF_SIZE];
+  GError              *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, error));
+  if (! output)
+    return FALSE;
+
+  string = g_string_new ("/* color_map file created by GIMP */\n"
+                         "/* https://www.gimp.org/          */\n"
+                         "color_map {\n");
+
+  for (seg = gradient->segments; seg; seg = seg->next)
+    {
+      /* Left */
+      g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->left);
+      g_ascii_dtostr (color_buf[0], G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->left_color.r);
+      g_ascii_dtostr (color_buf[1], G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->left_color.g);
+      g_ascii_dtostr (color_buf[2], G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->left_color.b);
+      g_ascii_dtostr (color_buf[3], G_ASCII_DTOSTR_BUF_SIZE,
+                      1.0 - seg->left_color.a);
+
+      g_string_append_printf (string,
+                              "\t[%s color rgbt <%s, %s, %s, %s>]\n",
+                              buf,
+                              color_buf[0], color_buf[1],
+                              color_buf[2], color_buf[3]);
+
+      /* Middle */
+      g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->middle);
+      g_ascii_dtostr (color_buf[0], G_ASCII_DTOSTR_BUF_SIZE,
+                      (seg->left_color.r + seg->right_color.r) / 2.0);
+      g_ascii_dtostr (color_buf[1], G_ASCII_DTOSTR_BUF_SIZE,
+                      (seg->left_color.g + seg->right_color.g) / 2.0);
+      g_ascii_dtostr (color_buf[2], G_ASCII_DTOSTR_BUF_SIZE,
+                      (seg->left_color.b + seg->right_color.b) / 2.0);
+      g_ascii_dtostr (color_buf[3], G_ASCII_DTOSTR_BUF_SIZE,
+                      1.0 - (seg->left_color.a + seg->right_color.a) / 2.0);
+
+      g_string_append_printf (string,
+                              "\t[%s color rgbt <%s, %s, %s, %s>]\n",
+                              buf,
+                              color_buf[0], color_buf[1],
+                              color_buf[2], color_buf[3]);
+
+      /* Right */
+      g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->right);
+      g_ascii_dtostr (color_buf[0], G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->right_color.r);
+      g_ascii_dtostr (color_buf[1], G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->right_color.g);
+      g_ascii_dtostr (color_buf[2], G_ASCII_DTOSTR_BUF_SIZE,
+                      seg->right_color.b);
+      g_ascii_dtostr (color_buf[3], G_ASCII_DTOSTR_BUF_SIZE,
+                      1.0 - seg->right_color.a);
+
+      g_string_append_printf (string,
+                              "\t[%s color rgbt <%s, %s, %s, %s>]\n",
+                              buf,
+                              color_buf[0], color_buf[1],
+                              color_buf[2], color_buf[3]);
+    }
+
+  g_string_append_printf (string, "} /* color_map */\n");
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, &my_error))
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_WRITE,
+                   _("Writing POV file '%s' failed: %s"),
+                   gimp_file_get_utf8_name (file),
+                   my_error->message);
+      g_clear_error (&my_error);
+      g_string_free (string, TRUE);
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (output, cancellable, NULL);
+      g_object_unref (cancellable);
+      g_object_unref (output);
+
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+  g_object_unref (output);
+
+  return TRUE;
+}
diff --git a/app/core/gimpgradient-save.h b/app/core/gimpgradient-save.h
new file mode 100644
index 0000000..073bdd8
--- /dev/null
+++ b/app/core/gimpgradient-save.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRADIENT_SAVE_H__
+#define __GIMP_GRADIENT_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_gradient_save     (GimpData       *data,
+                                   GOutputStream  *output,
+                                   GError        **error);
+
+gboolean   gimp_gradient_save_pov (GimpGradient   *gradient,
+                                   GFile          *file,
+                                   GError        **error);
+
+
+#endif /* __GIMP_GRADIENT_SAVE_H__ */
diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c
new file mode 100644
index 0000000..8265225
--- /dev/null
+++ b/app/core/gimpgradient.c
@@ -0,0 +1,2297 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpcontext.h"
+#include "gimpgradient.h"
+#include "gimpgradient-load.h"
+#include "gimpgradient-save.h"
+#include "gimptagged.h"
+#include "gimptempbuf.h"
+
+
+#define EPSILON 1e-10
+
+
+static void          gimp_gradient_tagged_iface_init (GimpTaggedInterface *iface);
+static void          gimp_gradient_finalize          (GObject             *object);
+
+static gint64        gimp_gradient_get_memsize       (GimpObject          *object,
+                                                      gint64              *gui_size);
+
+static void          gimp_gradient_get_preview_size  (GimpViewable        *viewable,
+                                                      gint                 size,
+                                                      gboolean             popup,
+                                                      gboolean             dot_for_dot,
+                                                      gint                *width,
+                                                      gint                *height);
+static gboolean      gimp_gradient_get_popup_size    (GimpViewable        *viewable,
+                                                      gint                 width,
+                                                      gint                 height,
+                                                      gboolean             dot_for_dot,
+                                                      gint                *popup_width,
+                                                      gint                *popup_height);
+static GimpTempBuf * gimp_gradient_get_new_preview   (GimpViewable        *viewable,
+                                                      GimpContext         *context,
+                                                      gint                 width,
+                                                      gint                 height);
+
+static const gchar * gimp_gradient_get_extension     (GimpData            *data);
+static void          gimp_gradient_copy              (GimpData            *data,
+                                                      GimpData            *src_data);
+static gint          gimp_gradient_compare           (GimpData            *data1,
+                                                      GimpData            *data2);
+
+static gchar       * gimp_gradient_get_checksum      (GimpTagged          *tagged);
+
+static inline GimpGradientSegment *
+              gimp_gradient_get_segment_at_internal  (GimpGradient        *gradient,
+                                                      GimpGradientSegment *seg,
+                                                      gdouble              pos);
+static void          gimp_gradient_get_flat_color    (GimpContext         *context,
+                                                      const GimpRGB       *color,
+                                                      GimpGradientColor    color_type,
+                                                      GimpRGB             *flat_color);
+
+
+static inline gdouble  gimp_gradient_calc_linear_factor            (gdouble  middle,
+                                                                    gdouble  pos);
+static inline gdouble  gimp_gradient_calc_curved_factor            (gdouble  middle,
+                                                                    gdouble  pos);
+static inline gdouble  gimp_gradient_calc_sine_factor              (gdouble  middle,
+                                                                    gdouble  pos);
+static inline gdouble  gimp_gradient_calc_sphere_increasing_factor (gdouble  middle,
+                                                                    gdouble  pos);
+static inline gdouble  gimp_gradient_calc_sphere_decreasing_factor (gdouble  middle,
+                                                                    gdouble  pos);
+static inline gdouble  gimp_gradient_calc_step_factor              (gdouble  middle,
+                                                                    gdouble  pos);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpGradient, gimp_gradient, GIMP_TYPE_DATA,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_TAGGED,
+                                                gimp_gradient_tagged_iface_init))
+
+#define parent_class gimp_gradient_parent_class
+
+static const Babl *fish_srgb_to_linear_rgb = NULL;
+static const Babl *fish_linear_rgb_to_srgb = NULL;
+static const Babl *fish_srgb_to_cie_lab    = NULL;
+static const Babl *fish_cie_lab_to_srgb    = NULL;
+
+
+static void
+gimp_gradient_class_init (GimpGradientClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+
+  object_class->finalize            = gimp_gradient_finalize;
+
+  gimp_object_class->get_memsize    = gimp_gradient_get_memsize;
+
+  viewable_class->default_icon_name = "gimp-tool-gradient";
+  viewable_class->get_preview_size  = gimp_gradient_get_preview_size;
+  viewable_class->get_popup_size    = gimp_gradient_get_popup_size;
+  viewable_class->get_new_preview   = gimp_gradient_get_new_preview;
+
+  data_class->save                  = gimp_gradient_save;
+  data_class->get_extension         = gimp_gradient_get_extension;
+  data_class->copy                  = gimp_gradient_copy;
+  data_class->compare               = gimp_gradient_compare;
+
+  fish_srgb_to_linear_rgb = babl_fish (babl_format ("R'G'B' double"),
+                                       babl_format ("RGB double"));
+  fish_linear_rgb_to_srgb = babl_fish (babl_format ("RGB double"),
+                                       babl_format ("R'G'B' double"));
+  fish_srgb_to_cie_lab    = babl_fish (babl_format ("R'G'B' double"),
+                                       babl_format ("CIE Lab double"));
+  fish_cie_lab_to_srgb    = babl_fish (babl_format ("CIE Lab double"),
+                                       babl_format ("R'G'B' double"));
+}
+
+static void
+gimp_gradient_tagged_iface_init (GimpTaggedInterface *iface)
+{
+  iface->get_checksum = gimp_gradient_get_checksum;
+}
+
+static void
+gimp_gradient_init (GimpGradient *gradient)
+{
+  gradient->segments = NULL;
+}
+
+static void
+gimp_gradient_finalize (GObject *object)
+{
+  GimpGradient *gradient = GIMP_GRADIENT (object);
+
+  if (gradient->segments)
+    {
+      gimp_gradient_segments_free (gradient->segments);
+      gradient->segments = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_gradient_get_memsize (GimpObject *object,
+                           gint64     *gui_size)
+{
+  GimpGradient        *gradient = GIMP_GRADIENT (object);
+  GimpGradientSegment *segment;
+  gint64               memsize  = 0;
+
+  for (segment = gradient->segments; segment; segment = segment->next)
+    memsize += sizeof (GimpGradientSegment);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_gradient_get_preview_size (GimpViewable *viewable,
+                                gint          size,
+                                gboolean      popup,
+                                gboolean      dot_for_dot,
+                                gint         *width,
+                                gint         *height)
+{
+  *width  = size;
+  *height = 1 + size / 2;
+}
+
+static gboolean
+gimp_gradient_get_popup_size (GimpViewable *viewable,
+                              gint          width,
+                              gint          height,
+                              gboolean      dot_for_dot,
+                              gint         *popup_width,
+                              gint         *popup_height)
+{
+  if (width < 128 || height < 32)
+    {
+      *popup_width  = 128;
+      *popup_height =  32;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GimpTempBuf *
+gimp_gradient_get_new_preview (GimpViewable *viewable,
+                               GimpContext  *context,
+                               gint          width,
+                               gint          height)
+{
+  GimpGradient        *gradient = GIMP_GRADIENT (viewable);
+  GimpGradientSegment *seg      = NULL;
+  GimpTempBuf         *temp_buf;
+  guchar              *buf;
+  guchar              *p;
+  guchar              *row;
+  gint                 x, y;
+  gdouble              dx, cur_x;
+  GimpRGB              color;
+
+  dx    = 1.0 / (width - 1);
+  cur_x = 0.0;
+  p     = row = g_malloc (width * 4);
+
+  /* Create lines to fill the image */
+
+  for (x = 0; x < width; x++)
+    {
+      seg = gimp_gradient_get_color_at (gradient, context, seg, cur_x,
+                                        FALSE,
+                                        GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                        &color);
+
+      *p++ = ROUND (color.r * 255.0);
+      *p++ = ROUND (color.g * 255.0);
+      *p++ = ROUND (color.b * 255.0);
+      *p++ = ROUND (color.a * 255.0);
+
+      cur_x += dx;
+    }
+
+  temp_buf = gimp_temp_buf_new (width, height, babl_format ("R'G'B'A u8"));
+
+  buf = gimp_temp_buf_get_data (temp_buf);
+
+  for (y = 0; y < height; y++)
+    memcpy (buf + (width * y * 4), row, width * 4);
+
+  g_free (row);
+
+  return temp_buf;
+}
+
+static void
+gimp_gradient_copy (GimpData *data,
+                    GimpData *src_data)
+{
+  GimpGradient        *gradient     = GIMP_GRADIENT (data);
+  GimpGradient        *src_gradient = GIMP_GRADIENT (src_data);
+  GimpGradientSegment *head, *prev, *cur, *orig;
+
+  if (gradient->segments)
+    {
+      gimp_gradient_segments_free (gradient->segments);
+      gradient->segments = NULL;
+    }
+
+  prev = NULL;
+  orig = src_gradient->segments;
+  head = NULL;
+
+  while (orig)
+    {
+      cur = gimp_gradient_segment_new ();
+
+      *cur = *orig;  /* Copy everything */
+
+      cur->prev = prev;
+      cur->next = NULL;
+
+      if (prev)
+        prev->next = cur;
+      else
+        head = cur;  /* Remember head */
+
+      prev = cur;
+      orig = orig->next;
+    }
+
+  gradient->segments = head;
+
+  gimp_data_dirty (GIMP_DATA (gradient));
+}
+
+static gint
+gimp_gradient_compare (GimpData *data1,
+                       GimpData *data2)
+{
+  gboolean is_custom1;
+  gboolean is_custom2;
+
+  /* check whether data1 and data2 are the custom gradient, which is the only
+   * writable internal gradient.
+   */
+  is_custom1 = gimp_data_is_internal (data1) && gimp_data_is_writable (data1);
+  is_custom2 = gimp_data_is_internal (data2) && gimp_data_is_writable (data2);
+
+  /* order the custom gradient before all the other gradients; use the default
+   * ordering for the rest.
+   */
+  if (is_custom1)
+    {
+      if (is_custom2)
+        return 0;
+      else
+        return -1;
+    }
+  else if (is_custom2)
+    {
+      return +1;
+    }
+  else
+    return GIMP_DATA_CLASS (parent_class)->compare (data1, data2);
+}
+
+static gchar *
+gimp_gradient_get_checksum (GimpTagged *tagged)
+{
+  GimpGradient *gradient        = GIMP_GRADIENT (tagged);
+  gchar        *checksum_string = NULL;
+
+  if (gradient->segments)
+    {
+      GChecksum           *checksum = g_checksum_new (G_CHECKSUM_MD5);
+      GimpGradientSegment *segment  = gradient->segments;
+
+      while (segment)
+        {
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->left,
+                             sizeof (segment->left));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->middle,
+                             sizeof (segment->middle));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->right,
+                             sizeof (segment->right));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->left_color_type,
+                             sizeof (segment->left_color_type));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->left_color,
+                             sizeof (segment->left_color));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->right_color_type,
+                             sizeof (segment->right_color_type));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->right_color,
+                             sizeof (segment->right_color));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->type,
+                             sizeof (segment->type));
+          g_checksum_update (checksum,
+                             (const guchar *) &segment->color,
+                             sizeof (segment->color));
+
+          segment = segment->next;
+        }
+
+      checksum_string = g_strdup (g_checksum_get_string (checksum));
+
+      g_checksum_free (checksum);
+    }
+
+  return checksum_string;
+}
+
+
+/*  public functions  */
+
+GimpData *
+gimp_gradient_new (GimpContext *context,
+                   const gchar *name)
+{
+  GimpGradient *gradient;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (*name != '\0', NULL);
+
+  gradient = g_object_new (GIMP_TYPE_GRADIENT,
+                           "name", name,
+                           NULL);
+
+  gradient->segments = gimp_gradient_segment_new ();
+
+  return GIMP_DATA (gradient);
+}
+
+GimpData *
+gimp_gradient_get_standard (GimpContext *context)
+{
+  static GimpData *standard_gradient = NULL;
+
+  if (! standard_gradient)
+    {
+      standard_gradient = gimp_gradient_new (context, "Standard");
+
+      gimp_data_clean (standard_gradient);
+      gimp_data_make_internal (standard_gradient, "gimp-gradient-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_gradient),
+                                 (gpointer *) &standard_gradient);
+    }
+
+  return standard_gradient;
+}
+
+static const gchar *
+gimp_gradient_get_extension (GimpData *data)
+{
+  return GIMP_GRADIENT_FILE_EXTENSION;
+}
+
+/**
+ * gimp_gradient_get_color_at:
+ * @gradient:          a gradient
+ * @context:           a context
+ * @seg:               a segment to seed the search with (or %NULL)
+ * @pos:               position in the gradient (between 0.0 and 1.0)
+ * @reverse:           when %TRUE, use the reversed gradient
+ * @blend_color_space: color space to use for blending RGB segments
+ * @color:             returns the color
+ *
+ * If you are iterating over an gradient, you should pass the the
+ * return value from the last call for @seg.
+ *
+ * Return value: the gradient segment the color is from
+ **/
+GimpGradientSegment *
+gimp_gradient_get_color_at (GimpGradient                *gradient,
+                            GimpContext                 *context,
+                            GimpGradientSegment         *seg,
+                            gdouble                      pos,
+                            gboolean                     reverse,
+                            GimpGradientBlendColorSpace  blend_color_space,
+                            GimpRGB                     *color)
+{
+  gdouble  factor = 0.0;
+  gdouble  seg_len;
+  gdouble  middle;
+  GimpRGB  left_color;
+  GimpRGB  right_color;
+  GimpRGB  rgb;
+
+  /* type-check disabled to improve speed */
+  /* g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), NULL); */
+  g_return_val_if_fail (color != NULL, NULL);
+
+  pos = CLAMP (pos, 0.0, 1.0);
+
+  if (reverse)
+    pos = 1.0 - pos;
+
+  seg = gimp_gradient_get_segment_at_internal (gradient, seg, pos);
+
+  seg_len = seg->right - seg->left;
+
+  if (seg_len < EPSILON)
+    {
+      middle = 0.5;
+      pos    = 0.5;
+    }
+  else
+    {
+      middle = (seg->middle - seg->left) / seg_len;
+      pos    = (pos - seg->left) / seg_len;
+    }
+
+  switch (seg->type)
+    {
+    case GIMP_GRADIENT_SEGMENT_LINEAR:
+      factor = gimp_gradient_calc_linear_factor (middle, pos);
+      break;
+
+    case GIMP_GRADIENT_SEGMENT_CURVED:
+      factor = gimp_gradient_calc_curved_factor (middle, pos);
+      break;
+
+    case GIMP_GRADIENT_SEGMENT_SINE:
+      factor = gimp_gradient_calc_sine_factor (middle, pos);
+      break;
+
+    case GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING:
+      factor = gimp_gradient_calc_sphere_increasing_factor (middle, pos);
+      break;
+
+    case GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING:
+      factor = gimp_gradient_calc_sphere_decreasing_factor (middle, pos);
+      break;
+
+    case GIMP_GRADIENT_SEGMENT_STEP:
+      factor = gimp_gradient_calc_step_factor (middle, pos);
+      break;
+
+    default:
+      g_warning ("%s: Unknown gradient type %d.", G_STRFUNC, seg->type);
+      break;
+    }
+
+  /* Get left/right colors */
+
+  if (context)
+    {
+      gimp_gradient_segment_get_left_flat_color (gradient,
+                                                 context, seg, &left_color);
+
+      gimp_gradient_segment_get_right_flat_color (gradient,
+                                                  context, seg, &right_color);
+    }
+  else
+    {
+      left_color  = seg->left_color;
+      right_color = seg->right_color;
+    }
+
+  /* Calculate color components */
+
+  if (seg->color == GIMP_GRADIENT_SEGMENT_RGB)
+    {
+      switch (blend_color_space)
+        {
+        case GIMP_GRADIENT_BLEND_CIE_LAB:
+          babl_process (fish_srgb_to_cie_lab,
+                        &left_color, &left_color, 1);
+          babl_process (fish_srgb_to_cie_lab,
+                        &right_color, &right_color, 1);
+          break;
+
+        case GIMP_GRADIENT_BLEND_RGB_LINEAR:
+          babl_process (fish_srgb_to_linear_rgb,
+                        &left_color, &left_color, 1);
+          babl_process (fish_srgb_to_linear_rgb,
+                        &right_color, &right_color, 1);
+
+        case GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL:
+          break;
+        }
+
+      rgb.r = left_color.r + (right_color.r - left_color.r) * factor;
+      rgb.g = left_color.g + (right_color.g - left_color.g) * factor;
+      rgb.b = left_color.b + (right_color.b - left_color.b) * factor;
+
+      switch (blend_color_space)
+        {
+        case GIMP_GRADIENT_BLEND_CIE_LAB:
+          babl_process (fish_cie_lab_to_srgb,
+                        &rgb, &rgb, 1);
+          break;
+
+        case GIMP_GRADIENT_BLEND_RGB_LINEAR:
+          babl_process (fish_linear_rgb_to_srgb,
+                        &rgb, &rgb, 1);
+
+        case GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL:
+          break;
+        }
+    }
+  else
+    {
+      GimpHSV left_hsv;
+      GimpHSV right_hsv;
+
+      gimp_rgb_to_hsv (&left_color,  &left_hsv);
+      gimp_rgb_to_hsv (&right_color, &right_hsv);
+
+      left_hsv.s = left_hsv.s + (right_hsv.s - left_hsv.s) * factor;
+      left_hsv.v = left_hsv.v + (right_hsv.v - left_hsv.v) * factor;
+
+      switch (seg->color)
+        {
+        case GIMP_GRADIENT_SEGMENT_HSV_CCW:
+          if (left_hsv.h < right_hsv.h)
+            {
+              left_hsv.h += (right_hsv.h - left_hsv.h) * factor;
+            }
+          else
+            {
+              left_hsv.h += (1.0 - (left_hsv.h - right_hsv.h)) * factor;
+
+              if (left_hsv.h > 1.0)
+                left_hsv.h -= 1.0;
+            }
+          break;
+
+        case GIMP_GRADIENT_SEGMENT_HSV_CW:
+          if (right_hsv.h < left_hsv.h)
+            {
+              left_hsv.h -= (left_hsv.h - right_hsv.h) * factor;
+            }
+          else
+            {
+              left_hsv.h -= (1.0 - (right_hsv.h - left_hsv.h)) * factor;
+
+              if (left_hsv.h < 0.0)
+                left_hsv.h += 1.0;
+            }
+          break;
+
+        default:
+          g_warning ("%s: Unknown coloring mode %d",
+                     G_STRFUNC, (gint) seg->color);
+          break;
+        }
+
+      gimp_hsv_to_rgb (&left_hsv, &rgb);
+    }
+
+  /* Calculate alpha */
+
+  rgb.a = left_color.a + (right_color.a - left_color.a) * factor;
+
+  *color = rgb;
+
+  return seg;
+}
+
+GimpGradientSegment *
+gimp_gradient_get_segment_at (GimpGradient *gradient,
+                              gdouble       pos)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), NULL);
+
+  return gimp_gradient_get_segment_at_internal (gradient, NULL, pos);
+}
+
+gboolean
+gimp_gradient_has_fg_bg_segments (GimpGradient *gradient)
+{
+  GimpGradientSegment *segment;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), FALSE);
+
+  for (segment = gradient->segments; segment; segment = segment->next)
+    if (segment->left_color_type  != GIMP_GRADIENT_COLOR_FIXED ||
+        segment->right_color_type != GIMP_GRADIENT_COLOR_FIXED)
+      return TRUE;
+
+  return FALSE;
+}
+
+void
+gimp_gradient_split_at (GimpGradient                 *gradient,
+                        GimpContext                  *context,
+                        GimpGradientSegment          *seg,
+                        gdouble                       pos,
+                        GimpGradientBlendColorSpace   blend_color_space,
+                        GimpGradientSegment         **newl,
+                        GimpGradientSegment         **newr)
+{
+  GimpRGB              color;
+  GimpGradientSegment *newseg;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  pos = CLAMP (pos, 0.0, 1.0);
+  seg = gimp_gradient_get_segment_at_internal (gradient, seg, pos);
+
+  /* Get color at pos */
+  gimp_gradient_get_color_at (gradient, context, seg, pos,
+                              FALSE, blend_color_space, &color);
+
+  /* Create a new segment and insert it in the list */
+
+  newseg = gimp_gradient_segment_new ();
+
+  newseg->prev = seg;
+  newseg->next = seg->next;
+
+  seg->next = newseg;
+
+  if (newseg->next)
+    newseg->next->prev = newseg;
+
+  /* Set coordinates of new segment */
+
+  newseg->left   = pos;
+  newseg->right  = seg->right;
+  newseg->middle = (newseg->left + newseg->right) / 2.0;
+
+  /* Set coordinates of original segment */
+
+  seg->right  = newseg->left;
+  seg->middle = (seg->left + seg->right) / 2.0;
+
+  /* Set colors of both segments */
+
+  newseg->right_color_type = seg->right_color_type;
+  newseg->right_color      = seg->right_color;
+
+  seg->right_color_type = newseg->left_color_type = GIMP_GRADIENT_COLOR_FIXED;
+  seg->right_color      = newseg->left_color      = color;
+
+  /* Set parameters of new segment */
+
+  newseg->type  = seg->type;
+  newseg->color = seg->color;
+
+  /* Done */
+
+  if (newl) *newl = seg;
+  if (newr) *newr = newseg;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+GimpGradient *
+gimp_gradient_flatten (GimpGradient *gradient,
+                       GimpContext  *context)
+{
+  GimpGradient        *flat;
+  GimpGradientSegment *seg;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  flat = GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient)));
+
+  for (seg = flat->segments; seg; seg = seg->next)
+    {
+      gimp_gradient_segment_get_left_flat_color (gradient,
+                                                 context, seg,
+                                                 &seg->left_color);
+
+      seg->left_color_type = GIMP_GRADIENT_COLOR_FIXED;
+
+      gimp_gradient_segment_get_right_flat_color (gradient,
+                                                  context, seg,
+                                                  &seg->right_color);
+
+      seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED;
+    }
+
+  return flat;
+}
+
+
+/*  gradient segment functions  */
+
+GimpGradientSegment *
+gimp_gradient_segment_new (void)
+{
+  GimpGradientSegment *seg;
+
+  seg = g_slice_new0 (GimpGradientSegment);
+
+  seg->left   = 0.0;
+  seg->middle = 0.5;
+  seg->right  = 1.0;
+
+  seg->left_color_type = GIMP_GRADIENT_COLOR_FIXED;
+  gimp_rgba_set (&seg->left_color,  0.0, 0.0, 0.0, 1.0);
+
+  seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED;
+  gimp_rgba_set (&seg->right_color, 1.0, 1.0, 1.0, 1.0);
+
+  seg->type  = GIMP_GRADIENT_SEGMENT_LINEAR;
+  seg->color = GIMP_GRADIENT_SEGMENT_RGB;
+
+  seg->prev = seg->next = NULL;
+
+  return seg;
+}
+
+
+void
+gimp_gradient_segment_free (GimpGradientSegment *seg)
+{
+  g_return_if_fail (seg != NULL);
+
+  g_slice_free (GimpGradientSegment, seg);
+}
+
+void
+gimp_gradient_segments_free (GimpGradientSegment *seg)
+{
+  g_return_if_fail (seg != NULL);
+
+  g_slice_free_chain (GimpGradientSegment, seg, next);
+}
+
+GimpGradientSegment *
+gimp_gradient_segment_get_last (GimpGradientSegment *seg)
+{
+  if (! seg)
+    return NULL;
+
+  while (seg->next)
+    seg = seg->next;
+
+  return seg;
+}
+
+GimpGradientSegment *
+gimp_gradient_segment_get_first (GimpGradientSegment *seg)
+{
+  if (! seg)
+    return NULL;
+
+  while (seg->prev)
+    seg = seg->prev;
+
+  return seg;
+}
+
+GimpGradientSegment *
+gimp_gradient_segment_get_nth (GimpGradientSegment *seg,
+                               gint                 index)
+{
+  gint i = 0;
+
+  g_return_val_if_fail (index >= 0, NULL);
+
+  if (! seg)
+    return NULL;
+
+  while (seg && (i < index))
+    {
+      seg = seg->next;
+      i++;
+    }
+
+  if (i == index)
+    return seg;
+
+  return NULL;
+}
+
+void
+gimp_gradient_segment_split_midpoint (GimpGradient                 *gradient,
+                                      GimpContext                  *context,
+                                      GimpGradientSegment          *lseg,
+                                      GimpGradientBlendColorSpace   blend_color_space,
+                                      GimpGradientSegment         **newl,
+                                      GimpGradientSegment         **newr)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (lseg != NULL);
+  g_return_if_fail (newl != NULL);
+  g_return_if_fail (newr != NULL);
+
+  gimp_gradient_split_at (gradient, context, lseg, lseg->middle,
+                          blend_color_space, newl, newr);
+}
+
+void
+gimp_gradient_segment_split_uniform (GimpGradient                 *gradient,
+                                     GimpContext                  *context,
+                                     GimpGradientSegment          *lseg,
+                                     gint                          parts,
+                                     GimpGradientBlendColorSpace   blend_color_space,
+                                     GimpGradientSegment         **newl,
+                                     GimpGradientSegment         **newr)
+{
+  GimpGradientSegment *seg, *prev, *tmp;
+  gdouble              seg_len;
+  gint                 i;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (lseg != NULL);
+  g_return_if_fail (newl != NULL);
+  g_return_if_fail (newr != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  seg_len = (lseg->right - lseg->left) / parts; /* Length of divisions */
+
+  seg  = NULL;
+  prev = NULL;
+  tmp  = NULL;
+
+  for (i = 0; i < parts; i++)
+    {
+      seg = gimp_gradient_segment_new ();
+
+      if (i == 0)
+        tmp = seg; /* Remember first segment */
+
+      seg->left   = lseg->left + i * seg_len;
+      seg->right  = lseg->left + (i + 1) * seg_len;
+      seg->middle = (seg->left + seg->right) / 2.0;
+
+      seg->left_color_type  = GIMP_GRADIENT_COLOR_FIXED;
+      seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED;
+
+      gimp_gradient_get_color_at (gradient, context, lseg,
+                                  seg->left,  FALSE, blend_color_space,
+                                  &seg->left_color);
+      gimp_gradient_get_color_at (gradient, context, lseg,
+                                  seg->right, FALSE, blend_color_space,
+                                  &seg->right_color);
+
+      seg->type  = lseg->type;
+      seg->color = lseg->color;
+
+      seg->prev = prev;
+      seg->next = NULL;
+
+      if (prev)
+        prev->next = seg;
+
+      prev = seg;
+    }
+
+  /* Fix edges */
+
+  tmp->left_color_type = lseg->left_color_type;
+  tmp->left_color      = lseg->left_color;
+
+  seg->right_color_type = lseg->right_color_type;
+  seg->right_color      = lseg->right_color;
+
+  tmp->left  = lseg->left;
+  seg->right = lseg->right; /* To squish accumulative error */
+
+  /* Link in list */
+
+  tmp->prev = lseg->prev;
+  seg->next = lseg->next;
+
+  if (lseg->prev)
+    lseg->prev->next = tmp;
+  else
+    gradient->segments = tmp; /* We are on leftmost segment */
+
+  if (lseg->next)
+    lseg->next->prev = seg;
+
+  /* Done */
+  *newl = tmp;
+  *newr = seg;
+
+  /* Delete old segment */
+  gimp_gradient_segment_free (lseg);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_get_left_color (GimpGradient        *gradient,
+                                      GimpGradientSegment *seg,
+                                      GimpRGB             *color)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+  g_return_if_fail (color != NULL);
+
+  *color = seg->left_color;
+}
+
+void
+gimp_gradient_segment_set_left_color (GimpGradient        *gradient,
+                                      GimpGradientSegment *seg,
+                                      const GimpRGB       *color)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+  g_return_if_fail (color != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  gimp_gradient_segment_range_blend (gradient, seg, seg,
+                                     color, &seg->right_color,
+                                     TRUE, TRUE);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_get_right_color (GimpGradient        *gradient,
+                                       GimpGradientSegment *seg,
+                                       GimpRGB             *color)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+  g_return_if_fail (color != NULL);
+
+  *color = seg->right_color;
+}
+
+void
+gimp_gradient_segment_set_right_color (GimpGradient        *gradient,
+                                       GimpGradientSegment *seg,
+                                       const GimpRGB       *color)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+  g_return_if_fail (color != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  gimp_gradient_segment_range_blend (gradient, seg, seg,
+                                     &seg->left_color, color,
+                                     TRUE, TRUE);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+GimpGradientColor
+gimp_gradient_segment_get_left_color_type (GimpGradient        *gradient,
+                                           GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0);
+  g_return_val_if_fail (seg != NULL, 0);
+
+  return seg->left_color_type;
+}
+
+void
+gimp_gradient_segment_set_left_color_type (GimpGradient        *gradient,
+                                           GimpGradientSegment *seg,
+                                           GimpGradientColor    color_type)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  seg->left_color_type = color_type;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+GimpGradientColor
+gimp_gradient_segment_get_right_color_type (GimpGradient        *gradient,
+                                            GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0);
+  g_return_val_if_fail (seg != NULL, 0);
+
+  return seg->right_color_type;
+}
+
+void
+gimp_gradient_segment_set_right_color_type (GimpGradient        *gradient,
+                                            GimpGradientSegment *seg,
+                                            GimpGradientColor    color_type)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  seg->right_color_type = color_type;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_get_left_flat_color (GimpGradient        *gradient,
+                                           GimpContext         *context,
+                                           GimpGradientSegment *seg,
+                                           GimpRGB             *color)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+  g_return_if_fail (color != NULL);
+
+  gimp_gradient_get_flat_color (context,
+                                &seg->left_color, seg->left_color_type,
+                                color);
+}
+
+void
+gimp_gradient_segment_get_right_flat_color (GimpGradient        *gradient,
+                                            GimpContext         *context,
+                                            GimpGradientSegment *seg,
+                                            GimpRGB             *color)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (seg != NULL);
+  g_return_if_fail (color != NULL);
+
+  gimp_gradient_get_flat_color (context,
+                                &seg->right_color, seg->right_color_type,
+                                color);
+}
+
+gdouble
+gimp_gradient_segment_get_left_pos (GimpGradient        *gradient,
+                                    GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+  g_return_val_if_fail (seg != NULL, 0.0);
+
+  return seg->left;
+}
+
+gdouble
+gimp_gradient_segment_set_left_pos (GimpGradient        *gradient,
+                                    GimpGradientSegment *seg,
+                                    gdouble              pos)
+{
+  gdouble final_pos;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+  g_return_val_if_fail (seg != NULL, 0.0);
+
+  if (seg->prev == NULL)
+    {
+      final_pos = 0;
+    }
+  else
+    {
+      gimp_data_freeze (GIMP_DATA (gradient));
+
+      final_pos = seg->prev->right = seg->left =
+          CLAMP (pos,
+                 seg->prev->middle + EPSILON,
+                 seg->middle - EPSILON);
+
+      gimp_data_thaw (GIMP_DATA (gradient));
+    }
+
+  return final_pos;
+}
+
+gdouble
+gimp_gradient_segment_get_right_pos (GimpGradient        *gradient,
+                                     GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+  g_return_val_if_fail (seg != NULL, 0.0);
+
+  return seg->right;
+}
+
+gdouble
+gimp_gradient_segment_set_right_pos (GimpGradient        *gradient,
+                                     GimpGradientSegment *seg,
+                                     gdouble              pos)
+{
+  gdouble final_pos;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+  g_return_val_if_fail (seg != NULL, 0.0);
+
+  if (seg->next == NULL)
+    {
+      final_pos = 1.0;
+    }
+  else
+    {
+      gimp_data_freeze (GIMP_DATA (gradient));
+
+      final_pos = seg->next->left = seg->right =
+          CLAMP (pos,
+                 seg->middle + EPSILON,
+                 seg->next->middle - EPSILON);
+
+      gimp_data_thaw (GIMP_DATA (gradient));
+    }
+
+  return final_pos;
+}
+
+gdouble
+gimp_gradient_segment_get_middle_pos (GimpGradient        *gradient,
+                                      GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+  g_return_val_if_fail (seg != NULL, 0.0);
+
+  return seg->middle;
+}
+
+gdouble
+gimp_gradient_segment_set_middle_pos (GimpGradient        *gradient,
+                                      GimpGradientSegment *seg,
+                                      gdouble              pos)
+{
+  gdouble final_pos;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+  g_return_val_if_fail (seg != NULL, 0.0);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  final_pos = seg->middle =
+      CLAMP (pos,
+             seg->left + EPSILON,
+             seg->right - EPSILON);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+
+  return final_pos;
+}
+
+GimpGradientSegmentType
+gimp_gradient_segment_get_blending_function (GimpGradient        *gradient,
+                                             GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0);
+
+  return seg->type;
+}
+
+GimpGradientSegmentColor
+gimp_gradient_segment_get_coloring_type (GimpGradient        *gradient,
+                                         GimpGradientSegment *seg)
+{
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0);
+
+  return seg->color;
+}
+
+gint
+gimp_gradient_segment_range_get_n_segments (GimpGradient        *gradient,
+                                            GimpGradientSegment *range_l,
+                                            GimpGradientSegment *range_r)
+{
+  gint n_segments = 0;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0);
+  g_return_val_if_fail (range_l != NULL, 0);
+
+  for (; range_l != range_r; range_l = range_l->next)
+    n_segments++;
+
+  if (range_r != NULL)
+    n_segments++;
+
+  return n_segments;
+}
+
+void
+gimp_gradient_segment_range_compress (GimpGradient        *gradient,
+                                      GimpGradientSegment *range_l,
+                                      GimpGradientSegment *range_r,
+                                      gdouble              new_l,
+                                      gdouble              new_r)
+{
+  gdouble              orig_l, orig_r;
+  GimpGradientSegment *seg, *aseg;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (range_l != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! range_r)
+    range_r = gimp_gradient_segment_get_last (range_l);
+
+  orig_l = range_l->left;
+  orig_r = range_r->right;
+
+  if (orig_r - orig_l > EPSILON)
+    {
+      gdouble scale;
+
+      scale = (new_r - new_l) / (orig_r - orig_l);
+
+      seg = range_l;
+
+      do
+        {
+          if (seg->prev)
+            seg->left  = new_l + (seg->left - orig_l) * scale;
+          seg->middle  = new_l + (seg->middle - orig_l) * scale;
+          if (seg->next)
+            seg->right = new_l + (seg->right - orig_l) * scale;
+
+          /* Next */
+
+          aseg = seg;
+          seg  = seg->next;
+        }
+      while (aseg != range_r);
+    }
+  else
+    {
+      gint n;
+      gint i;
+
+      n = gimp_gradient_segment_range_get_n_segments (gradient,
+                                                      range_l, range_r);
+
+      for (i = 0, seg = range_l; i < n; i++, seg = seg->next)
+        {
+          if (seg->prev)
+            seg->left  = new_l + (new_r - new_l) * (i + 0.0) / n;
+          seg->middle  = new_l + (new_r - new_l) * (i + 0.5) / n;;
+          if (seg->next)
+            seg->right = new_l + (new_r - new_l) * (i + 1.0) / n;
+        }
+    }
+
+  /* Make sure that the left and right endpoints of the range are *exactly*
+   * equal to new_l and new_r; the above computations can introduce
+   * numerical inaccuracies.
+   */
+
+  range_l->left  = new_l;
+  range_l->right = new_r;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_blend (GimpGradient        *gradient,
+                                   GimpGradientSegment *lseg,
+                                   GimpGradientSegment *rseg,
+                                   const GimpRGB       *rgb1,
+                                   const GimpRGB       *rgb2,
+                                   gboolean             blend_colors,
+                                   gboolean             blend_opacity)
+{
+  GimpRGB              d;
+  gdouble              left, len;
+  GimpGradientSegment *seg;
+  GimpGradientSegment *aseg;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (lseg != NULL);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! rseg)
+    rseg = gimp_gradient_segment_get_last (lseg);
+
+  d.r = rgb2->r - rgb1->r;
+  d.g = rgb2->g - rgb1->g;
+  d.b = rgb2->b - rgb1->b;
+  d.a = rgb2->a - rgb1->a;
+
+  left  = lseg->left;
+  len   = rseg->right - left;
+
+  seg = lseg;
+
+  do
+    {
+      if (blend_colors)
+        {
+          seg->left_color.r  = rgb1->r + (seg->left - left) / len * d.r;
+          seg->left_color.g  = rgb1->g + (seg->left - left) / len * d.g;
+          seg->left_color.b  = rgb1->b + (seg->left - left) / len * d.b;
+
+          seg->right_color.r = rgb1->r + (seg->right - left) / len * d.r;
+          seg->right_color.g = rgb1->g + (seg->right - left) / len * d.g;
+          seg->right_color.b = rgb1->b + (seg->right - left) / len * d.b;
+        }
+
+      if (blend_opacity)
+        {
+          seg->left_color.a  = rgb1->a + (seg->left - left) / len * d.a;
+          seg->right_color.a = rgb1->a + (seg->right - left) / len * d.a;
+        }
+
+      aseg = seg;
+      seg = seg->next;
+    }
+  while (aseg != rseg);
+  gimp_data_thaw (GIMP_DATA (gradient));
+
+}
+
+void
+gimp_gradient_segment_range_set_blending_function (GimpGradient            *gradient,
+                                                   GimpGradientSegment     *start_seg,
+                                                   GimpGradientSegment     *end_seg,
+                                                   GimpGradientSegmentType  new_type)
+{
+  GimpGradientSegment *seg;
+  gboolean             reached_last_segment = FALSE;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  seg = start_seg;
+  while (seg && ! reached_last_segment)
+    {
+      if (seg == end_seg)
+        reached_last_segment = TRUE;
+
+      seg->type = new_type;
+      seg = seg->next;
+    }
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_set_coloring_type (GimpGradient             *gradient,
+                                               GimpGradientSegment      *start_seg,
+                                               GimpGradientSegment      *end_seg,
+                                               GimpGradientSegmentColor  new_color)
+{
+  GimpGradientSegment *seg;
+  gboolean             reached_last_segment = FALSE;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  seg = start_seg;
+  while (seg && ! reached_last_segment)
+    {
+      if (seg == end_seg)
+        reached_last_segment = TRUE;
+
+      seg->color = new_color;
+      seg = seg->next;
+    }
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_flip (GimpGradient         *gradient,
+                                  GimpGradientSegment  *start_seg,
+                                  GimpGradientSegment  *end_seg,
+                                  GimpGradientSegment **final_start_seg,
+                                  GimpGradientSegment **final_end_seg)
+{
+  GimpGradientSegment *oseg, *oaseg;
+  GimpGradientSegment *seg, *prev, *tmp;
+  GimpGradientSegment *lseg, *rseg;
+  gdouble              left, right;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  left  = start_seg->left;
+  right = end_seg->right;
+
+  /* Build flipped segments */
+
+  prev = NULL;
+  oseg = end_seg;
+  tmp  = NULL;
+
+  do
+    {
+      seg = gimp_gradient_segment_new ();
+
+      if (prev == NULL)
+        {
+          seg->left = left;
+          tmp = seg; /* Remember first segment */
+        }
+      else
+        seg->left = left + right - oseg->right;
+
+      seg->middle = left + right - oseg->middle;
+      seg->right  = left + right - oseg->left;
+
+      seg->left_color_type = oseg->right_color_type;
+      seg->left_color      = oseg->right_color;
+
+      seg->right_color_type = oseg->left_color_type;
+      seg->right_color      = oseg->left_color;
+
+      switch (oseg->type)
+        {
+        case GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING:
+          seg->type = GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING;
+          break;
+
+        case GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING:
+          seg->type = GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING;
+          break;
+
+        default:
+          seg->type = oseg->type;
+        }
+
+      switch (oseg->color)
+        {
+        case GIMP_GRADIENT_SEGMENT_HSV_CCW:
+          seg->color = GIMP_GRADIENT_SEGMENT_HSV_CW;
+          break;
+
+        case GIMP_GRADIENT_SEGMENT_HSV_CW:
+          seg->color = GIMP_GRADIENT_SEGMENT_HSV_CCW;
+          break;
+
+        default:
+          seg->color = oseg->color;
+        }
+
+      seg->prev = prev;
+      seg->next = NULL;
+
+      if (prev)
+        prev->next = seg;
+
+      prev = seg;
+
+      oaseg = oseg;
+      oseg  = oseg->prev; /* Move backwards! */
+    }
+  while (oaseg != start_seg);
+
+  seg->right = right; /* Squish accumulative error */
+
+  /* Free old segments */
+
+  lseg = start_seg->prev;
+  rseg = end_seg->next;
+
+  oseg = start_seg;
+
+  do
+    {
+      oaseg = oseg->next;
+      gimp_gradient_segment_free (oseg);
+      oseg = oaseg;
+    }
+  while (oaseg != rseg);
+
+  /* Link in new segments */
+
+  if (lseg)
+    lseg->next = tmp;
+  else
+    gradient->segments = tmp;
+
+  tmp->prev = lseg;
+
+  seg->next = rseg;
+
+  if (rseg)
+    rseg->prev = seg;
+
+  /* Reset selection */
+
+  if (final_start_seg)
+    *final_start_seg = tmp;
+
+  if (final_end_seg)
+    *final_end_seg = seg;
+
+  /* Done */
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_replicate (GimpGradient         *gradient,
+                                       GimpGradientSegment  *start_seg,
+                                       GimpGradientSegment  *end_seg,
+                                       gint                  replicate_times,
+                                       GimpGradientSegment **final_start_seg,
+                                       GimpGradientSegment **final_end_seg)
+{
+  gdouble              sel_left, sel_right, sel_len;
+  gdouble              new_left;
+  gdouble              factor;
+  GimpGradientSegment *prev, *seg, *tmp;
+  GimpGradientSegment *oseg, *oaseg;
+  GimpGradientSegment *lseg, *rseg;
+  gint                 i;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  if (replicate_times < 2)
+    {
+      *final_start_seg = start_seg;
+      *final_end_seg   = end_seg;
+      return;
+    }
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  /* Remember original parameters */
+  sel_left  = start_seg->left;
+  sel_right = end_seg->right;
+  sel_len   = sel_right - sel_left;
+
+  factor = 1.0 / replicate_times;
+
+  /* Build replicated segments */
+
+  prev = NULL;
+  seg  = NULL;
+  tmp  = NULL;
+
+  for (i = 0; i < replicate_times; i++)
+    {
+      /* Build one cycle */
+
+      new_left  = sel_left + i * factor * sel_len;
+
+      oseg = start_seg;
+
+      do
+        {
+          seg = gimp_gradient_segment_new ();
+
+          if (prev == NULL)
+            {
+              seg->left = sel_left;
+              tmp = seg; /* Remember first segment */
+            }
+          else
+            {
+              seg->left = new_left + factor * (oseg->left - sel_left);
+            }
+
+          seg->middle = new_left + factor * (oseg->middle - sel_left);
+          seg->right  = new_left + factor * (oseg->right - sel_left);
+
+          seg->left_color_type = oseg->left_color_type;
+          seg->left_color      = oseg->left_color;
+
+          seg->right_color_type = oseg->right_color_type;
+          seg->right_color      = oseg->right_color;
+
+          seg->type  = oseg->type;
+          seg->color = oseg->color;
+
+          seg->prev = prev;
+          seg->next = NULL;
+
+          if (prev)
+            prev->next = seg;
+
+          prev = seg;
+
+          oaseg = oseg;
+          oseg  = oseg->next;
+        }
+      while (oaseg != end_seg);
+    }
+
+  seg->right = sel_right; /* Squish accumulative error */
+
+  /* Free old segments */
+
+  lseg = start_seg->prev;
+  rseg = end_seg->next;
+
+  oseg = start_seg;
+
+  do
+    {
+      oaseg = oseg->next;
+      gimp_gradient_segment_free (oseg);
+      oseg = oaseg;
+    }
+  while (oaseg != rseg);
+
+  /* Link in new segments */
+
+  if (lseg)
+    lseg->next = tmp;
+  else
+    gradient->segments = tmp;
+
+  tmp->prev = lseg;
+
+  seg->next = rseg;
+
+  if (rseg)
+    rseg->prev = seg;
+
+  /* Reset selection */
+
+  if (final_start_seg)
+    *final_start_seg = tmp;
+
+  if (final_end_seg)
+    *final_end_seg = seg;
+
+  /* Done */
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_split_midpoint (GimpGradient                 *gradient,
+                                            GimpContext                  *context,
+                                            GimpGradientSegment          *start_seg,
+                                            GimpGradientSegment          *end_seg,
+                                            GimpGradientBlendColorSpace   blend_color_space,
+                                            GimpGradientSegment         **final_start_seg,
+                                            GimpGradientSegment         **final_end_seg)
+{
+  GimpGradientSegment *seg, *lseg, *rseg;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  seg = start_seg;
+
+  do
+    {
+      gimp_gradient_segment_split_midpoint (gradient, context,
+                                            seg, blend_color_space,
+                                            &lseg, &rseg);
+      seg = rseg->next;
+    }
+  while (lseg != end_seg);
+
+  if (final_start_seg)
+    *final_start_seg = start_seg;
+
+  if (final_end_seg)
+    *final_end_seg = rseg;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_split_uniform (GimpGradient                 *gradient,
+                                           GimpContext                  *context,
+                                           GimpGradientSegment          *start_seg,
+                                           GimpGradientSegment          *end_seg,
+                                           gint                          parts,
+                                           GimpGradientBlendColorSpace   blend_color_space,
+                                           GimpGradientSegment         **final_start_seg,
+                                           GimpGradientSegment         **final_end_seg)
+{
+  GimpGradientSegment *seg, *aseg, *lseg, *rseg, *lsel;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  if (parts < 2)
+    {
+      *final_start_seg = start_seg;
+      *final_end_seg   = end_seg;
+      return;
+    }
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  seg = start_seg;
+  lsel = NULL;
+
+  do
+    {
+      aseg = seg;
+
+      gimp_gradient_segment_split_uniform (gradient, context, seg,
+                                           parts, blend_color_space,
+                                           &lseg, &rseg);
+
+      if (seg == start_seg)
+        lsel = lseg;
+
+      seg = rseg->next;
+    }
+  while (aseg != end_seg);
+
+  if (final_start_seg)
+    *final_start_seg = lsel;
+
+  if (final_end_seg)
+    *final_end_seg = rseg;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_delete (GimpGradient         *gradient,
+                                    GimpGradientSegment  *start_seg,
+                                    GimpGradientSegment  *end_seg,
+                                    GimpGradientSegment **final_start_seg,
+                                    GimpGradientSegment **final_end_seg)
+{
+  GimpGradientSegment *lseg, *rseg, *seg, *aseg, *next;
+  gdouble              join;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  /* Remember segments to the left and to the right of the selection */
+
+  lseg = start_seg->prev;
+  rseg = end_seg->next;
+
+  /* Cannot delete all the segments in the gradient */
+
+  if ((lseg == NULL) && (rseg == NULL))
+    goto premature_return;
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  /* Calculate join point */
+
+  join = (start_seg->left +
+          end_seg->right) / 2.0;
+
+  if (lseg == NULL)
+    join = 0.0;
+  else if (rseg == NULL)
+    join = 1.0;
+
+  /* Move segments */
+
+  if (lseg != NULL)
+    gimp_gradient_segment_range_compress (gradient, lseg, lseg,
+                                          lseg->left, join);
+
+  if (rseg != NULL)
+    gimp_gradient_segment_range_compress (gradient, rseg, rseg,
+                                          join, rseg->right);
+
+  /* Link */
+
+  if (lseg)
+    lseg->next = rseg;
+
+  if (rseg)
+    rseg->prev = lseg;
+
+  /* Delete old segments */
+
+  seg = start_seg;
+
+  do
+    {
+      next = seg->next;
+      aseg = seg;
+
+      gimp_gradient_segment_free (seg);
+
+      seg = next;
+    }
+  while (aseg != end_seg);
+
+  /* Change selection */
+
+  if (rseg)
+    {
+      if (final_start_seg)
+        *final_start_seg = rseg;
+
+      if (final_end_seg)
+        *final_end_seg = rseg;
+    }
+  else
+    {
+      if (final_start_seg)
+        *final_start_seg = lseg;
+
+      if (final_end_seg)
+        *final_end_seg = lseg;
+    }
+
+  if (lseg == NULL)
+    gradient->segments = rseg;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+
+  return;
+
+ premature_return:
+  if (final_start_seg)
+    *final_start_seg = start_seg;
+  if (final_end_seg)
+    *final_end_seg = end_seg;
+}
+
+void
+gimp_gradient_segment_range_merge (GimpGradient         *gradient,
+                                   GimpGradientSegment  *start_seg,
+                                   GimpGradientSegment  *end_seg,
+                                   GimpGradientSegment **final_start_seg,
+                                   GimpGradientSegment **final_end_seg)
+{
+  GimpGradientSegment *seg;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  /* Copy the end segment's right position and color to the start segment */
+
+  start_seg->right            = end_seg->right;
+  start_seg->right_color_type = end_seg->right_color_type;
+  start_seg->right_color      = end_seg->right_color;
+
+  /* Center the start segment's midpoint */
+
+  start_seg->middle = (start_seg->left + start_seg->right) / 2.0;
+
+  /* Remove range segments past the start segment from the segment list */
+
+  start_seg->next = end_seg->next;
+
+  if (start_seg->next)
+    start_seg->next->prev = start_seg;
+
+  /* Merge the range's blend function and coloring type, and free the rest of
+   * the segments.
+   */
+
+  seg = end_seg;
+
+  while (seg != start_seg)
+    {
+      GimpGradientSegment *prev = seg->prev;
+
+      /* If the blend function and/or coloring type aren't uniform, reset them. */
+
+      if (seg->type != start_seg->type)
+        start_seg->type = GIMP_GRADIENT_SEGMENT_LINEAR;
+
+      if (seg->color != start_seg->color)
+        start_seg->color = GIMP_GRADIENT_SEGMENT_RGB;
+
+      gimp_gradient_segment_free (seg);
+
+      seg = prev;
+    }
+
+  if (final_start_seg)
+    *final_start_seg = start_seg;
+  if (final_end_seg)
+    *final_end_seg = start_seg;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_recenter_handles (GimpGradient        *gradient,
+                                              GimpGradientSegment *start_seg,
+                                              GimpGradientSegment *end_seg)
+{
+  GimpGradientSegment *seg, *aseg;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  seg = start_seg;
+
+  do
+    {
+      seg->middle = (seg->left + seg->right) / 2.0;
+
+      aseg = seg;
+      seg  = seg->next;
+    }
+  while (aseg != end_seg);
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+void
+gimp_gradient_segment_range_redistribute_handles (GimpGradient        *gradient,
+                                                  GimpGradientSegment *start_seg,
+                                                  GimpGradientSegment *end_seg)
+{
+  GimpGradientSegment *seg, *aseg;
+  gdouble              left, right, seg_len;
+  gint                 num_segs;
+  gint                 i;
+
+  g_return_if_fail (GIMP_IS_GRADIENT (gradient));
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! end_seg)
+    end_seg = gimp_gradient_segment_get_last (start_seg);
+
+  /* Count number of segments in selection */
+
+  num_segs = 0;
+  seg      = start_seg;
+
+  do
+    {
+      num_segs++;
+      aseg = seg;
+      seg  = seg->next;
+    }
+  while (aseg != end_seg);
+
+  /* Calculate new segment length */
+
+  left    = start_seg->left;
+  right   = end_seg->right;
+  seg_len = (right - left) / num_segs;
+
+  /* Redistribute */
+
+  seg = start_seg;
+
+  for (i = 0; i < num_segs; i++)
+    {
+      seg->left   = left + i * seg_len;
+      seg->right  = left + (i + 1) * seg_len;
+      seg->middle = (seg->left + seg->right) / 2.0;
+
+      seg = seg->next;
+    }
+
+  /* Fix endpoints to squish accumulative error */
+
+  start_seg->left  = left;
+  end_seg->right = right;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+gdouble
+gimp_gradient_segment_range_move (GimpGradient        *gradient,
+                                  GimpGradientSegment *range_l,
+                                  GimpGradientSegment *range_r,
+                                  gdouble              delta,
+                                  gboolean             control_compress)
+{
+  gdouble              lbound, rbound;
+  gint                 is_first, is_last;
+  GimpGradientSegment *seg, *aseg;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), 0.0);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (! range_r)
+    range_r = gimp_gradient_segment_get_last (range_l);
+
+  /* First or last segments in gradient? */
+
+  is_first = (range_l->prev == NULL);
+  is_last  = (range_r->next == NULL);
+
+  /* Calculate drag bounds */
+
+  if (! control_compress)
+    {
+      if (!is_first)
+        lbound = range_l->prev->middle + EPSILON;
+      else
+        lbound = range_l->left + EPSILON;
+
+      if (!is_last)
+        rbound = range_r->next->middle - EPSILON;
+      else
+        rbound = range_r->right - EPSILON;
+    }
+  else
+    {
+      if (!is_first)
+        lbound = range_l->prev->left + 2.0 * EPSILON;
+      else
+        lbound = range_l->left + EPSILON;
+
+      if (!is_last)
+        rbound = range_r->next->right - 2.0 * EPSILON;
+      else
+        rbound = range_r->right - EPSILON;
+    }
+
+  /* Fix the delta if necessary */
+
+  if (delta < 0.0)
+    {
+      if (!is_first)
+        {
+          if (range_l->left + delta < lbound)
+            delta = lbound - range_l->left;
+        }
+      else
+        if (range_l->middle + delta < lbound)
+          delta = lbound - range_l->middle;
+    }
+  else
+    {
+      if (!is_last)
+        {
+          if (range_r->right + delta > rbound)
+            delta = rbound - range_r->right;
+        }
+      else
+        if (range_r->middle + delta > rbound)
+          delta = rbound - range_r->middle;
+    }
+
+  /* Move all the segments inside the range */
+
+  seg = range_l;
+
+  do
+    {
+      if (!((seg == range_l) && is_first))
+        seg->left  += delta;
+
+      seg->middle  += delta;
+
+      if (!((seg == range_r) && is_last))
+        seg->right += delta;
+
+      /* Next */
+
+      aseg = seg;
+      seg  = seg->next;
+    }
+  while (aseg != range_r);
+
+  /* Fix the segments that surround the range */
+
+  if (!is_first)
+    {
+      if (! control_compress)
+        range_l->prev->right = range_l->left;
+      else
+        gimp_gradient_segment_range_compress (gradient,
+                                              range_l->prev, range_l->prev,
+                                              range_l->prev->left, range_l->left);
+    }
+
+  if (!is_last)
+    {
+      if (! control_compress)
+        range_r->next->left = range_r->right;
+      else
+        gimp_gradient_segment_range_compress (gradient,
+                                              range_r->next, range_r->next,
+                                              range_r->right, range_r->next->right);
+    }
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+
+  return delta;
+}
+
+
+/*  private functions  */
+
+static inline GimpGradientSegment *
+gimp_gradient_get_segment_at_internal (GimpGradient        *gradient,
+                                       GimpGradientSegment *seg,
+                                       gdouble              pos)
+{
+  /* handle FP imprecision at the edges of the gradient */
+  pos = CLAMP (pos, 0.0, 1.0);
+
+  if (! seg)
+    seg = gradient->segments;
+
+  if (pos >= seg->left)
+    {
+      while (seg->next && pos >= seg->right)
+        seg = seg->next;
+    }
+  else
+    {
+      do
+        seg = seg->prev;
+      while (pos < seg->left);
+    }
+
+  return seg;
+}
+
+static void
+gimp_gradient_get_flat_color (GimpContext       *context,
+                              const GimpRGB     *color,
+                              GimpGradientColor  color_type,
+                              GimpRGB           *flat_color)
+{
+  switch (color_type)
+    {
+    case GIMP_GRADIENT_COLOR_FIXED:
+      *flat_color = *color;
+      break;
+
+    case GIMP_GRADIENT_COLOR_FOREGROUND:
+    case GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT:
+      gimp_context_get_foreground (context, flat_color);
+
+      if (color_type == GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT)
+        gimp_rgb_set_alpha (flat_color, 0.0);
+      break;
+
+    case GIMP_GRADIENT_COLOR_BACKGROUND:
+    case GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT:
+      gimp_context_get_background (context, flat_color);
+
+      if (color_type == GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT)
+        gimp_rgb_set_alpha (flat_color, 0.0);
+      break;
+    }
+}
+
+static inline gdouble
+gimp_gradient_calc_linear_factor (gdouble middle,
+                                  gdouble pos)
+{
+  if (pos <= middle)
+    {
+      if (middle < EPSILON)
+        return 0.0;
+      else
+        return 0.5 * pos / middle;
+    }
+  else
+    {
+      pos -= middle;
+      middle = 1.0 - middle;
+
+      if (middle < EPSILON)
+        return 1.0;
+      else
+        return 0.5 + 0.5 * pos / middle;
+    }
+}
+
+static inline gdouble
+gimp_gradient_calc_curved_factor (gdouble middle,
+                                  gdouble pos)
+{
+  if (middle < EPSILON)
+    return 1.0;
+  else if (1.0 - middle < EPSILON)
+    return 0.0;
+
+  return exp (-G_LN2 * log (pos) / log (middle));
+}
+
+static inline gdouble
+gimp_gradient_calc_sine_factor (gdouble middle,
+                                gdouble pos)
+{
+  pos = gimp_gradient_calc_linear_factor (middle, pos);
+
+  return (sin ((-G_PI / 2.0) + G_PI * pos) + 1.0) / 2.0;
+}
+
+static inline gdouble
+gimp_gradient_calc_sphere_increasing_factor (gdouble middle,
+                                             gdouble pos)
+{
+  pos = gimp_gradient_calc_linear_factor (middle, pos) - 1.0;
+
+  /* Works for convex increasing and concave decreasing */
+  return sqrt (1.0 - pos * pos);
+}
+
+static inline gdouble
+gimp_gradient_calc_sphere_decreasing_factor (gdouble middle,
+                                             gdouble pos)
+{
+  pos = gimp_gradient_calc_linear_factor (middle, pos);
+
+  /* Works for convex decreasing and concave increasing */
+  return 1.0 - sqrt(1.0 - pos * pos);
+}
+
+static inline gdouble
+gimp_gradient_calc_step_factor (gdouble middle,
+                                gdouble pos)
+{
+  return pos >= middle;
+}
diff --git a/app/core/gimpgradient.h b/app/core/gimpgradient.h
new file mode 100644
index 0000000..8aa817d
--- /dev/null
+++ b/app/core/gimpgradient.h
@@ -0,0 +1,296 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRADIENT_H__
+#define __GIMP_GRADIENT_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_GRADIENT_DEFAULT_SAMPLE_SIZE 40
+
+
+struct _GimpGradientSegment
+{
+  gdouble                  left, middle, right;
+
+  GimpGradientColor        left_color_type;
+  GimpRGB                  left_color;
+  GimpGradientColor        right_color_type;
+  GimpRGB                  right_color;
+
+  GimpGradientSegmentType  type;          /*  Segment's blending function  */
+  GimpGradientSegmentColor color;         /*  Segment's coloring type      */
+
+  GimpGradientSegment     *prev;
+  GimpGradientSegment     *next;
+};
+
+
+#define GIMP_TYPE_GRADIENT            (gimp_gradient_get_type ())
+#define GIMP_GRADIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT, GimpGradient))
+#define GIMP_GRADIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT, GimpGradientClass))
+#define GIMP_IS_GRADIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT))
+#define GIMP_IS_GRADIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT))
+#define GIMP_GRADIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT, GimpGradientClass))
+
+
+typedef struct _GimpGradientClass GimpGradientClass;
+
+struct _GimpGradient
+{
+  GimpData             parent_instance;
+
+  GimpGradientSegment *segments;
+};
+
+struct _GimpGradientClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType                 gimp_gradient_get_type       (void) G_GNUC_CONST;
+
+GimpData            * gimp_gradient_new            (GimpContext   *context,
+                                                    const gchar   *name);
+GimpData            * gimp_gradient_get_standard   (GimpContext   *context);
+
+GimpGradientSegment * gimp_gradient_get_color_at   (GimpGradient        *gradient,
+                                                    GimpContext         *context,
+                                                    GimpGradientSegment *seg,
+                                                    gdouble              pos,
+                                                    gboolean             reverse,
+                                                    GimpGradientBlendColorSpace blend_color_space,
+                                                    GimpRGB             *color);
+GimpGradientSegment * gimp_gradient_get_segment_at (GimpGradient  *grad,
+                                                    gdouble        pos);
+void                  gimp_gradient_split_at       (GimpGradient         *gradient,
+                                                    GimpContext          *context,
+                                                    GimpGradientSegment  *seg,
+                                                    gdouble               pos,
+                                                    GimpGradientBlendColorSpace blend_color_space,
+                                                    GimpGradientSegment **newl,
+                                                    GimpGradientSegment **newr);
+
+gboolean          gimp_gradient_has_fg_bg_segments (GimpGradient  *gradient);
+GimpGradient    * gimp_gradient_flatten            (GimpGradient  *gradient,
+                                                    GimpContext   *context);
+
+
+/*  gradient segment functions  */
+
+GimpGradientSegment * gimp_gradient_segment_new       (void);
+GimpGradientSegment * gimp_gradient_segment_get_last  (GimpGradientSegment *seg);
+GimpGradientSegment * gimp_gradient_segment_get_first (GimpGradientSegment *seg);
+GimpGradientSegment * gimp_gradient_segment_get_nth   (GimpGradientSegment *seg,
+                                                       gint                 index);
+
+void                  gimp_gradient_segment_free      (GimpGradientSegment *seg);
+void                  gimp_gradient_segments_free     (GimpGradientSegment *seg);
+
+void    gimp_gradient_segment_split_midpoint  (GimpGradient         *gradient,
+                                               GimpContext          *context,
+                                               GimpGradientSegment  *lseg,
+                                               GimpGradientBlendColorSpace blend_color_space,
+                                               GimpGradientSegment **newl,
+                                               GimpGradientSegment **newr);
+void    gimp_gradient_segment_split_uniform   (GimpGradient         *gradient,
+                                               GimpContext          *context,
+                                               GimpGradientSegment  *lseg,
+                                               gint                  parts,
+                                               GimpGradientBlendColorSpace blend_color_space,
+                                               GimpGradientSegment **newl,
+                                               GimpGradientSegment **newr);
+
+/* Colors Setting/Getting Routines */
+void    gimp_gradient_segment_get_left_color  (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               GimpRGB              *color);
+
+void    gimp_gradient_segment_set_left_color  (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               const GimpRGB        *color);
+
+
+void    gimp_gradient_segment_get_right_color (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               GimpRGB              *color);
+
+void    gimp_gradient_segment_set_right_color (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               const GimpRGB        *color);
+
+
+GimpGradientColor
+gimp_gradient_segment_get_left_color_type     (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+
+void
+gimp_gradient_segment_set_left_color_type     (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               GimpGradientColor     color_type);
+
+
+GimpGradientColor
+gimp_gradient_segment_get_right_color_type    (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+
+void
+gimp_gradient_segment_set_right_color_type    (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               GimpGradientColor     color_type);
+
+
+void
+gimp_gradient_segment_get_left_flat_color     (GimpGradient         *gradient,
+                                               GimpContext          *context,
+                                               GimpGradientSegment  *seg,
+                                               GimpRGB              *color);
+
+
+void
+gimp_gradient_segment_get_right_flat_color    (GimpGradient         *gradient,
+                                               GimpContext          *context,
+                                               GimpGradientSegment  *seg,
+                                               GimpRGB              *color);
+
+
+/* Position Setting/Getting Routines */
+/* (Setters return the position after it was set) */
+gdouble gimp_gradient_segment_get_left_pos    (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+gdouble gimp_gradient_segment_set_left_pos    (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               gdouble               pos);
+
+gdouble gimp_gradient_segment_get_right_pos   (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+gdouble gimp_gradient_segment_set_right_pos   (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               gdouble               pos);
+
+gdouble gimp_gradient_segment_get_middle_pos  (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+gdouble gimp_gradient_segment_set_middle_pos  (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg,
+                                               gdouble               pos);
+
+/* Getting/Setting the Blending Function/Coloring Type */
+GimpGradientSegmentType
+gimp_gradient_segment_get_blending_function   (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+GimpGradientSegmentColor
+gimp_gradient_segment_get_coloring_type       (GimpGradient         *gradient,
+                                               GimpGradientSegment  *seg);
+
+/*
+ * If the second segment is NULL, these functions will process
+ * until the end of the string.
+ * */
+gint    gimp_gradient_segment_range_get_n_segments
+                                              (GimpGradient         *gradient,
+                                               GimpGradientSegment  *range_l,
+                                               GimpGradientSegment  *range_r);
+
+void    gimp_gradient_segment_range_compress  (GimpGradient         *gradient,
+                                               GimpGradientSegment  *range_l,
+                                               GimpGradientSegment  *range_r,
+                                               gdouble               new_l,
+                                               gdouble               new_r);
+void    gimp_gradient_segment_range_blend     (GimpGradient         *gradient,
+                                               GimpGradientSegment  *lseg,
+                                               GimpGradientSegment  *rseg,
+                                               const GimpRGB        *rgb1,
+                                               const GimpRGB        *rgb2,
+                                               gboolean              blend_colors,
+                                               gboolean              blend_opacity);
+
+void    gimp_gradient_segment_range_set_blending_function
+                                              (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               GimpGradientSegmentType new_type);
+
+void    gimp_gradient_segment_range_set_coloring_type
+                                              (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               GimpGradientSegmentColor new_color);
+
+void    gimp_gradient_segment_range_flip      (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               GimpGradientSegment **final_start_seg,
+                                               GimpGradientSegment **final_end_seg);
+
+void    gimp_gradient_segment_range_replicate (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               gint                  replicate_times,
+                                               GimpGradientSegment **final_start_seg,
+                                               GimpGradientSegment **final_end_seg);
+
+void    gimp_gradient_segment_range_split_midpoint
+                                              (GimpGradient         *gradient,
+                                               GimpContext          *context,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               GimpGradientBlendColorSpace blend_color_space,
+                                               GimpGradientSegment **final_start_seg,
+                                               GimpGradientSegment **final_end_seg);
+
+void    gimp_gradient_segment_range_split_uniform
+                                              (GimpGradient         *gradient,
+                                               GimpContext          *context,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               gint                  parts,
+                                               GimpGradientBlendColorSpace blend_color_space,
+                                               GimpGradientSegment **final_start_seg,
+                                               GimpGradientSegment **final_end_seg);
+
+void    gimp_gradient_segment_range_delete    (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               GimpGradientSegment **final_start_seg,
+                                               GimpGradientSegment **final_end_seg);
+
+void    gimp_gradient_segment_range_merge     (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg,
+                                               GimpGradientSegment **final_start_seg,
+                                               GimpGradientSegment **final_end_seg);
+
+void    gimp_gradient_segment_range_recenter_handles
+                                              (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg);
+void    gimp_gradient_segment_range_redistribute_handles
+                                              (GimpGradient         *gradient,
+                                               GimpGradientSegment  *start_seg,
+                                               GimpGradientSegment  *end_seg);
+
+gdouble gimp_gradient_segment_range_move      (GimpGradient         *gradient,
+                                               GimpGradientSegment  *range_l,
+                                               GimpGradientSegment  *range_r,
+                                               gdouble               delta,
+                                               gboolean              control_compress);
+
+
+#endif /* __GIMP_GRADIENT_H__ */
diff --git a/app/core/gimpgrid.c b/app/core/gimpgrid.c
new file mode 100644
index 0000000..d500113
--- /dev/null
+++ b/app/core/gimpgrid.c
@@ -0,0 +1,359 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGrid
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimpgrid.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_STYLE,
+  PROP_FGCOLOR,
+  PROP_BGCOLOR,
+  PROP_XSPACING,
+  PROP_YSPACING,
+  PROP_SPACING_UNIT,
+  PROP_XOFFSET,
+  PROP_YOFFSET,
+  PROP_OFFSET_UNIT
+};
+
+
+static void   gimp_grid_get_property (GObject      *object,
+                                      guint         property_id,
+                                      GValue       *value,
+                                      GParamSpec   *pspec);
+static void   gimp_grid_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpGrid, gimp_grid, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+
+static void
+gimp_grid_class_init (GimpGridClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GimpRGB       black;
+  GimpRGB       white;
+
+  object_class->get_property = gimp_grid_get_property;
+  object_class->set_property = gimp_grid_set_property;
+
+  gimp_rgba_set (&black, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&white, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_STYLE,
+                         "style",
+                         _("Line style"),
+                         _("Line style used for the grid."),
+                         GIMP_TYPE_GRID_STYLE,
+                         GIMP_GRID_SOLID,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_FGCOLOR,
+                        "fgcolor",
+                        _("Foreground color"),
+                        _("The foreground color of the grid."),
+                        TRUE, &black,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_BGCOLOR,
+                        "bgcolor",
+                        _("Background color"),
+                        _("The background color of the grid; "
+                          "only used in double dashed line style."),
+                        TRUE, &white,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_XSPACING,
+                           "xspacing",
+                           _("Spacing X"),
+                           _("Horizontal spacing of grid lines."),
+                           0.0, GIMP_MAX_IMAGE_SIZE, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_YSPACING,
+                           "yspacing",
+                           _("Spacing Y"),
+                           _("Vertical spacing of grid lines."),
+                           0.0, GIMP_MAX_IMAGE_SIZE, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_SPACING_UNIT,
+                         "spacing-unit",
+                         _("Spacing unit"),
+                         NULL,
+                         FALSE, FALSE, GIMP_UNIT_INCH,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_XOFFSET,
+                           "xoffset",
+                           _("Offset X"),
+                           _("Horizontal offset of the first grid "
+                             "line; this may be a negative number."),
+                           - GIMP_MAX_IMAGE_SIZE,
+                           GIMP_MAX_IMAGE_SIZE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_YOFFSET,
+                           "yoffset",
+                           _("Offset Y"),
+                           _("Vertical offset of the first grid "
+                             "line; this may be a negative number."),
+                           - GIMP_MAX_IMAGE_SIZE,
+                           GIMP_MAX_IMAGE_SIZE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_OFFSET_UNIT,
+                         "offset-unit",
+                         _("Offset unit"),
+                         NULL,
+                         FALSE, FALSE, GIMP_UNIT_INCH,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_grid_init (GimpGrid *grid)
+{
+}
+
+static void
+gimp_grid_get_property (GObject      *object,
+                        guint         property_id,
+                        GValue       *value,
+                        GParamSpec   *pspec)
+{
+  GimpGrid *grid = GIMP_GRID (object);
+
+  switch (property_id)
+    {
+    case PROP_STYLE:
+      g_value_set_enum (value, grid->style);
+      break;
+    case PROP_FGCOLOR:
+      g_value_set_boxed (value, &grid->fgcolor);
+      break;
+    case PROP_BGCOLOR:
+      g_value_set_boxed (value, &grid->bgcolor);
+      break;
+    case PROP_XSPACING:
+      g_value_set_double (value, grid->xspacing);
+      break;
+    case PROP_YSPACING:
+      g_value_set_double (value, grid->yspacing);
+      break;
+    case PROP_SPACING_UNIT:
+      g_value_set_int (value, grid->spacing_unit);
+      break;
+    case PROP_XOFFSET:
+      g_value_set_double (value, grid->xoffset);
+      break;
+    case PROP_YOFFSET:
+      g_value_set_double (value, grid->yoffset);
+      break;
+    case PROP_OFFSET_UNIT:
+      g_value_set_int (value, grid->offset_unit);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_grid_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpGrid *grid = GIMP_GRID (object);
+  GimpRGB  *color;
+
+  switch (property_id)
+    {
+    case PROP_STYLE:
+      grid->style = g_value_get_enum (value);
+      break;
+    case PROP_FGCOLOR:
+      color = g_value_get_boxed (value);
+      grid->fgcolor = *color;
+      break;
+    case PROP_BGCOLOR:
+      color = g_value_get_boxed (value);
+      grid->bgcolor = *color;
+      break;
+    case PROP_XSPACING:
+      grid->xspacing = g_value_get_double (value);
+      break;
+    case PROP_YSPACING:
+      grid->yspacing = g_value_get_double (value);
+      break;
+    case PROP_SPACING_UNIT:
+      grid->spacing_unit = g_value_get_int (value);
+      break;
+    case PROP_XOFFSET:
+      grid->xoffset = g_value_get_double (value);
+      break;
+    case PROP_YOFFSET:
+      grid->yoffset = g_value_get_double (value);
+      break;
+    case PROP_OFFSET_UNIT:
+      grid->offset_unit = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GimpGridStyle
+gimp_grid_get_style (GimpGrid *grid)
+{
+  g_return_val_if_fail (GIMP_IS_GRID (grid), GIMP_GRID_SOLID);
+
+  return grid->style;
+}
+
+void
+gimp_grid_get_fgcolor (GimpGrid *grid,
+                       GimpRGB  *fgcolor)
+{
+  g_return_if_fail (GIMP_IS_GRID (grid));
+  g_return_if_fail (fgcolor != NULL);
+
+  *fgcolor = grid->fgcolor;
+}
+
+void
+gimp_grid_get_bgcolor (GimpGrid *grid,
+                       GimpRGB  *bgcolor)
+{
+  g_return_if_fail (GIMP_IS_GRID (grid));
+  g_return_if_fail (bgcolor != NULL);
+
+  *bgcolor = grid->bgcolor;
+}
+
+void
+gimp_grid_get_spacing (GimpGrid *grid,
+                       gdouble  *xspacing,
+                       gdouble  *yspacing)
+{
+  g_return_if_fail (GIMP_IS_GRID (grid));
+
+  if (xspacing) *xspacing = grid->xspacing;
+  if (yspacing) *yspacing = grid->yspacing;
+}
+
+void
+gimp_grid_get_offset (GimpGrid *grid,
+                      gdouble  *xoffset,
+                      gdouble  *yoffset)
+{
+  g_return_if_fail (GIMP_IS_GRID (grid));
+
+  if (xoffset) *xoffset = grid->xoffset;
+  if (yoffset) *yoffset = grid->yoffset;
+}
+
+const gchar *
+gimp_grid_parasite_name (void)
+{
+  return "gimp-image-grid";
+}
+
+GimpParasite *
+gimp_grid_to_parasite (GimpGrid *grid)
+{
+  GimpParasite *parasite;
+  gchar        *str;
+
+  g_return_val_if_fail (GIMP_IS_GRID (grid), NULL);
+
+  str = gimp_config_serialize_to_string (GIMP_CONFIG (grid), NULL);
+  g_return_val_if_fail (str != NULL, NULL);
+
+  parasite = gimp_parasite_new (gimp_grid_parasite_name (),
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (str) + 1, str);
+  g_free (str);
+
+  return parasite;
+}
+
+GimpGrid *
+gimp_grid_from_parasite (const GimpParasite *parasite)
+{
+  GimpGrid    *grid;
+  const gchar *str;
+  GError      *error = NULL;
+
+  g_return_val_if_fail (parasite != NULL, NULL);
+  g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
+                                gimp_grid_parasite_name ()) == 0, NULL);
+
+  str = gimp_parasite_data (parasite);
+
+  if (! str)
+    {
+      g_warning ("Empty grid parasite");
+
+      return NULL;
+    }
+
+  grid = g_object_new (GIMP_TYPE_GRID, NULL);
+
+  if (! gimp_config_deserialize_string (GIMP_CONFIG (grid),
+                                        str,
+                                        gimp_parasite_data_size (parasite),
+                                        NULL,
+                                        &error))
+    {
+      g_warning ("Failed to deserialize grid parasite: %s", error->message);
+      g_error_free (error);
+    }
+
+  return grid;
+}
diff --git a/app/core/gimpgrid.h b/app/core/gimpgrid.h
new file mode 100644
index 0000000..b7d45b2
--- /dev/null
+++ b/app/core/gimpgrid.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGrid
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRID_H__
+#define __GIMP_GRID_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_GRID            (gimp_grid_get_type ())
+#define GIMP_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRID, GimpGrid))
+#define GIMP_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRID, GimpGridClass))
+#define GIMP_IS_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRID))
+#define GIMP_IS_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRID))
+#define GIMP_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRID, GimpGridClass))
+
+
+typedef struct _GimpGridClass  GimpGridClass;
+
+struct _GimpGrid
+{
+  GimpObject     parent_instance;
+
+  GimpGridStyle  style;
+  GimpRGB        fgcolor;
+  GimpRGB        bgcolor;
+  gdouble        xspacing;
+  gdouble        yspacing;
+  GimpUnit       spacing_unit;
+  gdouble        xoffset;
+  gdouble        yoffset;
+  GimpUnit       offset_unit;
+};
+
+
+struct _GimpGridClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType          gimp_grid_get_type               (void) G_GNUC_CONST;
+
+GimpGridStyle  gimp_grid_get_style              (GimpGrid           *grid);
+
+void           gimp_grid_get_fgcolor            (GimpGrid           *grid,
+                                                 GimpRGB            *fgcolor);
+void           gimp_grid_get_bgcolor            (GimpGrid           *grid,
+                                                 GimpRGB            *bgcolor);
+
+void           gimp_grid_get_spacing            (GimpGrid           *grid,
+                                                 gdouble            *xspacing,
+                                                 gdouble            *yspacing);
+void           gimp_grid_get_offset             (GimpGrid           *grid,
+                                                 gdouble            *xoffset,
+                                                 gdouble            *yoffset);
+
+const gchar  * gimp_grid_parasite_name          (void) G_GNUC_CONST;
+GimpParasite * gimp_grid_to_parasite            (GimpGrid           *grid);
+GimpGrid     * gimp_grid_from_parasite          (const GimpParasite *parasite);
+
+
+#endif /* __GIMP_GRID_H__ */
diff --git a/app/core/gimpgrouplayer.c b/app/core/gimpgrouplayer.c
new file mode 100644
index 0000000..b0de646
--- /dev/null
+++ b/app/core/gimpgrouplayer.c
@@ -0,0 +1,2297 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGroupLayer
+ * Copyright (C) 2009  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpdrawable-filters.h"
+#include "gimpgrouplayer.h"
+#include "gimpgrouplayerundo.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayerstack.h"
+#include "gimpobjectqueue.h"
+#include "gimppickable.h"
+#include "gimpprogress.h"
+#include "gimpprojectable.h"
+#include "gimpprojection.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _GimpGroupLayerPrivate GimpGroupLayerPrivate;
+
+struct _GimpGroupLayerPrivate
+{
+  GimpContainer  *children;
+  GimpProjection *projection;
+  GeglNode       *source_node;
+  GeglNode       *parent_source_node;
+  GeglNode       *graph;
+  GeglNode       *offset_node;
+  GeglRectangle   bounding_box;
+  gint            suspend_resize;
+  gint            suspend_mask;
+  GeglBuffer     *suspended_mask_buffer;
+  GeglRectangle   suspended_mask_bounds;
+  gint            direct_update;
+  gint            transforming;
+  gboolean        expanded;
+  gboolean        pass_through;
+
+  /*  hackish temp states to make the projection/tiles stuff work  */
+  const Babl     *convert_format;
+  gboolean        reallocate_projection;
+};
+
+#define GET_PRIVATE(item) ((GimpGroupLayerPrivate *) gimp_group_layer_get_instance_private ((GimpGroupLayer *) (item)))
+
+
+static void            gimp_projectable_iface_init   (GimpProjectableInterface  *iface);
+static void            gimp_pickable_iface_init      (GimpPickableInterface     *iface);
+
+static void            gimp_group_layer_finalize     (GObject         *object);
+static void            gimp_group_layer_set_property (GObject         *object,
+                                                      guint            property_id,
+                                                      const GValue    *value,
+                                                      GParamSpec      *pspec);
+static void            gimp_group_layer_get_property (GObject         *object,
+                                                      guint            property_id,
+                                                      GValue          *value,
+                                                      GParamSpec      *pspec);
+
+static gint64          gimp_group_layer_get_memsize  (GimpObject      *object,
+                                                      gint64          *gui_size);
+
+static void        gimp_group_layer_ancestry_changed (GimpViewable    *viewable);
+static gboolean        gimp_group_layer_get_size     (GimpViewable    *viewable,
+                                                      gint            *width,
+                                                      gint            *height);
+static GimpContainer * gimp_group_layer_get_children (GimpViewable    *viewable);
+static gboolean        gimp_group_layer_get_expanded (GimpViewable    *viewable);
+static void            gimp_group_layer_set_expanded (GimpViewable    *viewable,
+                                                      gboolean         expanded);
+
+static gboolean  gimp_group_layer_is_position_locked (GimpItem        *item);
+static GimpItem      * gimp_group_layer_duplicate    (GimpItem        *item,
+                                                      GType            new_type);
+static void            gimp_group_layer_convert      (GimpItem        *item,
+                                                      GimpImage       *dest_image,
+                                                      GType            old_type);
+static void         gimp_group_layer_start_transform (GimpItem        *item,
+                                                      gboolean         push_undo);
+static void           gimp_group_layer_end_transform (GimpItem        *item,
+                                                      gboolean         push_undo);
+static void            gimp_group_layer_resize       (GimpItem        *item,
+                                                      GimpContext     *context,
+                                                      GimpFillType     fill_type,
+                                                      gint             new_width,
+                                                      gint             new_height,
+                                                      gint             offset_x,
+                                                      gint             offset_y);
+static GimpTransformResize
+                       gimp_group_layer_get_clip     (GimpItem        *item,
+                                                      GimpTransformResize clip_result);
+
+static gint64      gimp_group_layer_estimate_memsize (GimpDrawable      *drawable,
+                                                      GimpComponentType  component_type,
+                                                      gint               width,
+                                                      gint               height);
+static void            gimp_group_layer_update_all   (GimpDrawable      *drawable);
+
+static void            gimp_group_layer_translate    (GimpLayer       *layer,
+                                                      gint             offset_x,
+                                                      gint             offset_y);
+static void            gimp_group_layer_scale        (GimpLayer       *layer,
+                                                      gint             new_width,
+                                                      gint             new_height,
+                                                      gint             new_offset_x,
+                                                      gint             new_offset_y,
+                                                      GimpInterpolationType  interp_type,
+                                                      GimpProgress    *progress);
+static void            gimp_group_layer_flip         (GimpLayer       *layer,
+                                                      GimpContext     *context,
+                                                      GimpOrientationType flip_type,
+                                                      gdouble          axis,
+                                                      gboolean         clip_result);
+static void            gimp_group_layer_rotate       (GimpLayer       *layer,
+                                                      GimpContext     *context,
+                                                      GimpRotationType rotate_type,
+                                                      gdouble          center_x,
+                                                      gdouble          center_y,
+                                                      gboolean         clip_result);
+static void            gimp_group_layer_transform    (GimpLayer       *layer,
+                                                      GimpContext     *context,
+                                                      const GimpMatrix3 *matrix,
+                                                      GimpTransformDirection direction,
+                                                      GimpInterpolationType  interpolation_type,
+                                                      GimpTransformResize clip_result,
+                                                      GimpProgress      *progress);
+static void            gimp_group_layer_convert_type (GimpLayer         *layer,
+                                                      GimpImage         *dest_image,
+                                                      const Babl        *new_format,
+                                                      GimpColorProfile  *dest_profile,
+                                                      GeglDitherMethod   layer_dither_type,
+                                                      GeglDitherMethod   mask_dither_type,
+                                                      gboolean           push_undo,
+                                                      GimpProgress      *progress);
+static GeglNode   * gimp_group_layer_get_source_node (GimpDrawable      *drawable);
+
+static void         gimp_group_layer_opacity_changed (GimpLayer         *layer);
+static void  gimp_group_layer_effective_mode_changed (GimpLayer         *layer);
+static void
+          gimp_group_layer_excludes_backdrop_changed (GimpLayer         *layer);
+static GeglRectangle
+                   gimp_group_layer_get_bounding_box (GimpLayer         *layer);
+static void      gimp_group_layer_get_effective_mode (GimpLayer         *layer,
+                                                      GimpLayerMode          *mode,
+                                                      GimpLayerColorSpace    *blend_space,
+                                                      GimpLayerColorSpace    *composite_space,
+                                                      GimpLayerCompositeMode *composite_mode);
+static gboolean
+              gimp_group_layer_get_excludes_backdrop (GimpLayer         *layer);
+
+static const Babl    * gimp_group_layer_get_format   (GimpProjectable *projectable);
+static GeglRectangle
+       gimp_group_layer_projectable_get_bounding_box (GimpProjectable *projectable);
+static GeglNode      * gimp_group_layer_get_graph    (GimpProjectable *projectable);
+static void            gimp_group_layer_begin_render (GimpProjectable *projectable);
+static void            gimp_group_layer_end_render   (GimpProjectable *projectable);
+
+static void          gimp_group_layer_pickable_flush (GimpPickable    *pickable);
+static gdouble       gimp_group_layer_get_opacity_at (GimpPickable    *pickable,
+                                                      gint             x,
+                                                      gint             y);
+
+
+static void            gimp_group_layer_child_add    (GimpContainer   *container,
+                                                      GimpLayer       *child,
+                                                      GimpGroupLayer  *group);
+static void            gimp_group_layer_child_remove (GimpContainer   *container,
+                                                      GimpLayer       *child,
+                                                      GimpGroupLayer  *group);
+static void            gimp_group_layer_child_move   (GimpLayer       *child,
+                                                      GParamSpec      *pspec,
+                                                      GimpGroupLayer  *group);
+static void            gimp_group_layer_child_resize (GimpLayer       *child,
+                                                      GimpGroupLayer  *group);
+static void    gimp_group_layer_child_active_changed (GimpLayer       *child,
+                                                      GimpGroupLayer  *group);
+static void
+       gimp_group_layer_child_effective_mode_changed (GimpLayer       *child,
+                                                      GimpGroupLayer  *group);
+static void
+    gimp_group_layer_child_excludes_backdrop_changed (GimpLayer       *child,
+                                                      GimpGroupLayer  *group);
+
+static void            gimp_group_layer_flush        (GimpGroupLayer  *group);
+static void            gimp_group_layer_update       (GimpGroupLayer  *group);
+static void            gimp_group_layer_update_size  (GimpGroupLayer  *group);
+static void        gimp_group_layer_update_mask_size (GimpGroupLayer  *group);
+static void      gimp_group_layer_update_source_node (GimpGroupLayer  *group);
+static void        gimp_group_layer_update_mode_node (GimpGroupLayer  *group);
+
+static void            gimp_group_layer_stack_update (GimpDrawableStack *stack,
+                                                      gint               x,
+                                                      gint               y,
+                                                      gint               width,
+                                                      gint               height,
+                                                      GimpGroupLayer    *group);
+static void            gimp_group_layer_proj_update  (GimpProjection    *proj,
+                                                      gboolean           now,
+                                                      gint               x,
+                                                      gint               y,
+                                                      gint               width,
+                                                      gint               height,
+                                                      GimpGroupLayer    *group);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpGroupLayer, gimp_group_layer, GIMP_TYPE_LAYER,
+                         G_ADD_PRIVATE (GimpGroupLayer)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROJECTABLE,
+                                                gimp_projectable_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_pickable_iface_init))
+
+
+#define parent_class gimp_group_layer_parent_class
+
+
+/* disable pass-through groups strength-reduction to normal groups.
+ * see gimp_group_layer_get_effective_mode().
+ */
+static gboolean no_pass_through_strength_reduction = FALSE;
+
+
+static void
+gimp_group_layer_class_init (GimpGroupLayerClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpItemClass     *item_class        = GIMP_ITEM_CLASS (klass);
+  GimpDrawableClass *drawable_class    = GIMP_DRAWABLE_CLASS (klass);
+  GimpLayerClass    *layer_class       = GIMP_LAYER_CLASS (klass);
+
+  object_class->set_property             = gimp_group_layer_set_property;
+  object_class->get_property             = gimp_group_layer_get_property;
+  object_class->finalize                 = gimp_group_layer_finalize;
+
+  gimp_object_class->get_memsize         = gimp_group_layer_get_memsize;
+
+  viewable_class->default_icon_name      = "gimp-group-layer";
+  viewable_class->ancestry_changed       = gimp_group_layer_ancestry_changed;
+  viewable_class->get_size               = gimp_group_layer_get_size;
+  viewable_class->get_children           = gimp_group_layer_get_children;
+  viewable_class->set_expanded           = gimp_group_layer_set_expanded;
+  viewable_class->get_expanded           = gimp_group_layer_get_expanded;
+
+  item_class->is_position_locked         = gimp_group_layer_is_position_locked;
+  item_class->duplicate                  = gimp_group_layer_duplicate;
+  item_class->convert                    = gimp_group_layer_convert;
+  item_class->start_transform            = gimp_group_layer_start_transform;
+  item_class->end_transform              = gimp_group_layer_end_transform;
+  item_class->resize                     = gimp_group_layer_resize;
+  item_class->get_clip                   = gimp_group_layer_get_clip;
+
+  item_class->default_name               = _("Layer Group");
+  item_class->rename_desc                = C_("undo-type", "Rename Layer Group");
+  item_class->translate_desc             = C_("undo-type", "Move Layer Group");
+  item_class->scale_desc                 = C_("undo-type", "Scale Layer Group");
+  item_class->resize_desc                = C_("undo-type", "Resize Layer Group");
+  item_class->flip_desc                  = C_("undo-type", "Flip Layer Group");
+  item_class->rotate_desc                = C_("undo-type", "Rotate Layer Group");
+  item_class->transform_desc             = C_("undo-type", "Transform Layer Group");
+
+  drawable_class->estimate_memsize       = gimp_group_layer_estimate_memsize;
+  drawable_class->update_all             = gimp_group_layer_update_all;
+  drawable_class->get_source_node        = gimp_group_layer_get_source_node;
+
+  layer_class->opacity_changed           = gimp_group_layer_opacity_changed;
+  layer_class->effective_mode_changed    = gimp_group_layer_effective_mode_changed;
+  layer_class->excludes_backdrop_changed = gimp_group_layer_excludes_backdrop_changed;
+  layer_class->translate                 = gimp_group_layer_translate;
+  layer_class->scale                     = gimp_group_layer_scale;
+  layer_class->flip                      = gimp_group_layer_flip;
+  layer_class->rotate                    = gimp_group_layer_rotate;
+  layer_class->transform                 = gimp_group_layer_transform;
+  layer_class->convert_type              = gimp_group_layer_convert_type;
+  layer_class->get_bounding_box          = gimp_group_layer_get_bounding_box;
+  layer_class->get_effective_mode        = gimp_group_layer_get_effective_mode;
+  layer_class->get_excludes_backdrop     = gimp_group_layer_get_excludes_backdrop;
+
+  if (g_getenv ("GIMP_NO_PASS_THROUGH_STRENGTH_REDUCTION"))
+    no_pass_through_strength_reduction = TRUE;
+}
+
+static void
+gimp_projectable_iface_init (GimpProjectableInterface *iface)
+{
+  iface->get_image          = (GimpImage * (*) (GimpProjectable *)) gimp_item_get_image;
+  iface->get_format         = gimp_group_layer_get_format;
+  iface->get_offset         = (void (*) (GimpProjectable*, gint*, gint*)) gimp_item_get_offset;
+  iface->get_bounding_box   = gimp_group_layer_projectable_get_bounding_box;
+  iface->get_graph          = gimp_group_layer_get_graph;
+  iface->begin_render       = gimp_group_layer_begin_render;
+  iface->end_render         = gimp_group_layer_end_render;
+  iface->invalidate_preview = (void (*) (GimpProjectable*)) gimp_viewable_invalidate_preview;
+}
+
+static void
+gimp_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->flush          = gimp_group_layer_pickable_flush;
+  iface->get_opacity_at = gimp_group_layer_get_opacity_at;
+}
+
+static void
+gimp_group_layer_init (GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+
+  private->children = gimp_layer_stack_new (GIMP_TYPE_LAYER);
+  private->expanded = TRUE;
+
+  g_signal_connect (private->children, "add",
+                    G_CALLBACK (gimp_group_layer_child_add),
+                    group);
+  g_signal_connect (private->children, "remove",
+                    G_CALLBACK (gimp_group_layer_child_remove),
+                    group);
+
+  gimp_container_add_handler (private->children, "notify::offset-x",
+                              G_CALLBACK (gimp_group_layer_child_move),
+                              group);
+  gimp_container_add_handler (private->children, "notify::offset-y",
+                              G_CALLBACK (gimp_group_layer_child_move),
+                              group);
+  gimp_container_add_handler (private->children, "size-changed",
+                              G_CALLBACK (gimp_group_layer_child_resize),
+                              group);
+  gimp_container_add_handler (private->children, "bounding-box-changed",
+                              G_CALLBACK (gimp_group_layer_child_resize),
+                              group);
+  gimp_container_add_handler (private->children, "active-changed",
+                              G_CALLBACK (gimp_group_layer_child_active_changed),
+                              group);
+  gimp_container_add_handler (private->children, "effective-mode-changed",
+                              G_CALLBACK (gimp_group_layer_child_effective_mode_changed),
+                              group);
+  gimp_container_add_handler (private->children, "excludes-backdrop-changed",
+                              G_CALLBACK (gimp_group_layer_child_excludes_backdrop_changed),
+                              group);
+
+  g_signal_connect (private->children, "update",
+                    G_CALLBACK (gimp_group_layer_stack_update),
+                    group);
+
+  private->projection = gimp_projection_new (GIMP_PROJECTABLE (group));
+  gimp_projection_set_priority (private->projection, 1);
+
+  g_signal_connect (private->projection, "update",
+                    G_CALLBACK (gimp_group_layer_proj_update),
+                    group);
+}
+
+static void
+gimp_group_layer_finalize (GObject *object)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (object);
+
+  if (private->children)
+    {
+      g_signal_handlers_disconnect_by_func (private->children,
+                                            gimp_group_layer_child_add,
+                                            object);
+      g_signal_handlers_disconnect_by_func (private->children,
+                                            gimp_group_layer_child_remove,
+                                            object);
+      g_signal_handlers_disconnect_by_func (private->children,
+                                            gimp_group_layer_stack_update,
+                                            object);
+
+      /* this is particularly important to avoid reallocating the projection
+       * in response to a "bounding-box-changed" signal, which can be emitted
+       * during layer destruction.  see issue #4584.
+       */
+      gimp_container_remove_handlers_by_data (private->children, object);
+
+      g_clear_object (&private->children);
+    }
+
+  g_clear_object (&private->projection);
+  g_clear_object (&private->source_node);
+  g_clear_object (&private->graph);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_group_layer_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_group_layer_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_group_layer_get_memsize (GimpObject *object,
+                              gint64     *gui_size)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (object);
+  gint64                 memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->children), gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->projection), gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_group_layer_ancestry_changed (GimpViewable *viewable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (viewable);
+
+  gimp_projection_set_priority (private->projection,
+                                gimp_viewable_get_depth (viewable) + 1);
+
+  GIMP_VIEWABLE_CLASS (parent_class)->ancestry_changed (viewable);
+}
+
+static gboolean
+gimp_group_layer_get_size (GimpViewable *viewable,
+                           gint         *width,
+                           gint         *height)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (viewable);
+
+  /*  return the size only if there are children ...  */
+  if (! gimp_container_is_empty (private->children))
+    {
+      return GIMP_VIEWABLE_CLASS (parent_class)->get_size (viewable,
+                                                           width, height);
+    }
+
+  /*  ... otherwise, return "no content"  */
+  return FALSE;
+}
+
+static GimpContainer *
+gimp_group_layer_get_children (GimpViewable *viewable)
+{
+  return GET_PRIVATE (viewable)->children;
+}
+
+static gboolean
+gimp_group_layer_get_expanded (GimpViewable *viewable)
+{
+  GimpGroupLayer *group = GIMP_GROUP_LAYER (viewable);
+
+  return GET_PRIVATE (group)->expanded;
+}
+
+static void
+gimp_group_layer_set_expanded (GimpViewable *viewable,
+                               gboolean      expanded)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (viewable);
+
+  if (private->expanded != expanded)
+    {
+      private->expanded = expanded;
+
+      gimp_viewable_expanded_changed (viewable);
+    }
+}
+
+static gboolean
+gimp_group_layer_is_position_locked (GimpItem *item)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (item);
+  GList                 *list;
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *child = list->data;
+
+      if (gimp_item_is_position_locked (child))
+        return TRUE;
+    }
+
+  return GIMP_ITEM_CLASS (parent_class)->is_position_locked (item);
+}
+
+static GimpItem *
+gimp_group_layer_duplicate (GimpItem *item,
+                            GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  if (GIMP_IS_GROUP_LAYER (new_item))
+    {
+      GimpGroupLayerPrivate *private     = GET_PRIVATE (item);
+      GimpGroupLayer        *new_group   = GIMP_GROUP_LAYER (new_item);
+      GimpGroupLayerPrivate *new_private = GET_PRIVATE (new_item);
+      gint                   position    = 0;
+      GList                 *list;
+
+      gimp_group_layer_suspend_resize (new_group, FALSE);
+
+      for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+           list;
+           list = g_list_next (list))
+        {
+          GimpItem      *child = list->data;
+          GimpItem      *new_child;
+          GimpLayerMask *mask;
+
+          new_child = gimp_item_duplicate (child, G_TYPE_FROM_INSTANCE (child));
+
+          gimp_object_set_name (GIMP_OBJECT (new_child),
+                                gimp_object_get_name (child));
+
+          mask = gimp_layer_get_mask (GIMP_LAYER (child));
+
+          if (mask)
+            {
+              GimpLayerMask *new_mask;
+
+              new_mask = gimp_layer_get_mask (GIMP_LAYER (new_child));
+
+              gimp_object_set_name (GIMP_OBJECT (new_mask),
+                                    gimp_object_get_name (mask));
+            }
+
+          gimp_viewable_set_parent (GIMP_VIEWABLE (new_child),
+                                    GIMP_VIEWABLE (new_group));
+
+          gimp_container_insert (new_private->children,
+                                 GIMP_OBJECT (new_child),
+                                 position++);
+        }
+
+      /*  force the projection to reallocate itself  */
+      GET_PRIVATE (new_group)->reallocate_projection = TRUE;
+
+      gimp_group_layer_resume_resize (new_group, FALSE);
+    }
+
+  return new_item;
+}
+
+static void
+gimp_group_layer_convert (GimpItem  *item,
+                          GimpImage *dest_image,
+                          GType      old_type)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (item);
+  GList                 *list;
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *child = list->data;
+
+      GIMP_ITEM_GET_CLASS (child)->convert (child, dest_image,
+                                            G_TYPE_FROM_INSTANCE (child));
+    }
+
+  GIMP_ITEM_CLASS (parent_class)->convert (item, dest_image, old_type);
+}
+
+static void
+gimp_group_layer_start_transform (GimpItem *item,
+                             gboolean  push_undo)
+{
+  _gimp_group_layer_start_transform (GIMP_GROUP_LAYER (item), push_undo);
+
+  if (GIMP_ITEM_CLASS (parent_class)->start_transform)
+    GIMP_ITEM_CLASS (parent_class)->start_transform (item, push_undo);
+}
+
+static void
+gimp_group_layer_end_transform (GimpItem *item,
+                           gboolean  push_undo)
+{
+  if (GIMP_ITEM_CLASS (parent_class)->end_transform)
+    GIMP_ITEM_CLASS (parent_class)->end_transform (item, push_undo);
+
+  _gimp_group_layer_end_transform (GIMP_GROUP_LAYER (item), push_undo);
+}
+
+static void
+gimp_group_layer_resize (GimpItem     *item,
+                         GimpContext  *context,
+                         GimpFillType  fill_type,
+                         gint          new_width,
+                         gint          new_height,
+                         gint          offset_x,
+                         gint          offset_y)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (item);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (item);
+  GList                 *list;
+  gint                   x, y;
+
+  /* we implement GimpItem::resize(), instead of GimpLayer::resize(), so that
+   * GimpLayer doesn't resize the mask.  note that gimp_item_resize() calls
+   * gimp_item_{start,end}_move(), and not gimp_item_{start,end}_transform(),
+   * so that mask resizing is handled by gimp_group_layer_update_size().
+   */
+
+  x = gimp_item_get_offset_x (item) - offset_x;
+  y = gimp_item_get_offset_y (item) - offset_y;
+
+  gimp_group_layer_suspend_resize (group, TRUE);
+
+  list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+
+  while (list)
+    {
+      GimpItem *child = list->data;
+      gint      child_width;
+      gint      child_height;
+      gint      child_x;
+      gint      child_y;
+
+      list = g_list_next (list);
+
+      if (gimp_rectangle_intersect (x,
+                                    y,
+                                    new_width,
+                                    new_height,
+                                    gimp_item_get_offset_x (child),
+                                    gimp_item_get_offset_y (child),
+                                    gimp_item_get_width  (child),
+                                    gimp_item_get_height (child),
+                                    &child_x,
+                                    &child_y,
+                                    &child_width,
+                                    &child_height))
+        {
+          gint child_offset_x = gimp_item_get_offset_x (child) - child_x;
+          gint child_offset_y = gimp_item_get_offset_y (child) - child_y;
+
+          gimp_item_resize (child, context, fill_type,
+                            child_width, child_height,
+                            child_offset_x, child_offset_y);
+        }
+      else if (gimp_item_is_attached (item))
+        {
+          gimp_image_remove_layer (gimp_item_get_image (item),
+                                   GIMP_LAYER (child),
+                                   TRUE, NULL);
+        }
+      else
+        {
+          gimp_container_remove (private->children, GIMP_OBJECT (child));
+        }
+    }
+
+  gimp_group_layer_resume_resize (group, TRUE);
+}
+
+static GimpTransformResize
+gimp_group_layer_get_clip (GimpItem            *item,
+                           GimpTransformResize  clip_result)
+{
+  /* TODO: add clipping support, by clipping all sublayers as a unit, instead
+   * of individually.
+   */
+  return GIMP_TRANSFORM_RESIZE_ADJUST;
+}
+
+static gint64
+gimp_group_layer_estimate_memsize (GimpDrawable      *drawable,
+                                   GimpComponentType  component_type,
+                                   gint               width,
+                                   gint               height)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (drawable);
+  GList                 *list;
+  GimpImageBaseType      base_type;
+  gint64                 memsize = 0;
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpDrawable *child = list->data;
+      gint          child_width;
+      gint          child_height;
+
+      child_width  = (gimp_item_get_width (GIMP_ITEM (child)) *
+                      width /
+                      gimp_item_get_width (GIMP_ITEM (drawable)));
+      child_height = (gimp_item_get_height (GIMP_ITEM (child)) *
+                      height /
+                      gimp_item_get_height (GIMP_ITEM (drawable)));
+
+      memsize += gimp_drawable_estimate_memsize (child,
+                                                 component_type,
+                                                 child_width,
+                                                 child_height);
+    }
+
+  base_type = gimp_drawable_get_base_type (drawable);
+
+  memsize += gimp_projection_estimate_memsize (base_type, component_type,
+                                               width, height);
+
+  return memsize +
+         GIMP_DRAWABLE_CLASS (parent_class)->estimate_memsize (drawable,
+                                                               component_type,
+                                                               width, height);
+}
+
+static void
+gimp_group_layer_update_all (GimpDrawable *drawable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (drawable);
+  GList                 *list;
+
+  /*  redirect stack updates to the drawable, rather than to the projection  */
+  private->direct_update++;
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpFilter *child = list->data;
+
+      if (gimp_filter_get_active (child))
+        gimp_drawable_update_all (GIMP_DRAWABLE (child));
+    }
+
+  /*  redirect stack updates back to the projection  */
+  private->direct_update--;
+}
+
+static void
+gimp_group_layer_translate (GimpLayer *layer,
+                            gint       offset_x,
+                            gint       offset_y)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+  gint                   x, y;
+  GList                 *list;
+
+  /*  don't use gimp_group_layer_suspend_resize(), but rather increment
+   *  private->suspend_resize directly, since we're translating the group layer
+   *  here, rather than relying on gimp_group_layer_update_size() to do it.
+   */
+  private->suspend_resize++;
+
+  /*  redirect stack updates to the drawable, rather than to the projection  */
+  private->direct_update++;
+
+  /*  translate the child layers *before* updating the group's offset, so that,
+   *  if this is a nested group, the parent's bounds still reflect the original
+   *  layer positions.  This prevents the original area of the child layers,
+   *  which is updated as part of their translation, from being clipped to the
+   *  post-translation parent bounds (see issue #3484).  The new area of the
+   *  child layers, which is likewise updated as part of translation, *may* get
+   *  clipped to the old parent bounds, but the corresponding region will be
+   *  updated anyway when the parent is resized, once we update the group's
+   *  offset.
+   */
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *child = list->data;
+
+      /*  don't push an undo here because undo will call us again  */
+      gimp_item_translate (child, offset_x, offset_y, FALSE);
+    }
+
+  gimp_item_get_offset (GIMP_ITEM (group), &x, &y);
+
+  x += offset_x;
+  y += offset_y;
+
+  /*  update the offset node  */
+  if (private->offset_node)
+    gegl_node_set (private->offset_node,
+                   "x", (gdouble) -x,
+                   "y", (gdouble) -y,
+                   NULL);
+
+  /*  invalidate the selection boundary because of a layer modification  */
+  gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (layer));
+
+  /*  update the group layer offset  */
+  gimp_item_set_offset (GIMP_ITEM (group), x, y);
+
+  /*  redirect stack updates back to the projection  */
+  private->direct_update--;
+
+  /*  don't use gimp_group_layer_resume_resize(), but rather decrement
+   *  private->suspend_resize directly, so that gimp_group_layer_update_size()
+   *  isn't called.
+   */
+  private->suspend_resize--;
+}
+
+static void
+gimp_group_layer_scale (GimpLayer             *layer,
+                        gint                   new_width,
+                        gint                   new_height,
+                        gint                   new_offset_x,
+                        gint                   new_offset_y,
+                        GimpInterpolationType  interpolation_type,
+                        GimpProgress          *progress)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+  GimpItem              *item    = GIMP_ITEM (layer);
+  GimpObjectQueue       *queue   = NULL;
+  GList                 *list;
+  gdouble                width_factor;
+  gdouble                height_factor;
+  gint                   old_offset_x;
+  gint                   old_offset_y;
+
+  width_factor  = (gdouble) new_width  / (gdouble) gimp_item_get_width  (item);
+  height_factor = (gdouble) new_height / (gdouble) gimp_item_get_height (item);
+
+  old_offset_x = gimp_item_get_offset_x (item);
+  old_offset_y = gimp_item_get_offset_y (item);
+
+  if (progress)
+    {
+      queue    = gimp_object_queue_new (progress);
+      progress = GIMP_PROGRESS (queue);
+
+      gimp_object_queue_push_container (queue, private->children);
+    }
+
+  gimp_group_layer_suspend_resize (group, TRUE);
+
+  list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+
+  while (list)
+    {
+      GimpItem *child = list->data;
+
+      list = g_list_next (list);
+
+      if (queue)
+        gimp_object_queue_pop (queue);
+
+      if (! gimp_item_scale_by_factors_with_origin (child,
+                                                    width_factor, height_factor,
+                                                    old_offset_x, old_offset_y,
+                                                    new_offset_x, new_offset_y,
+                                                    interpolation_type,
+                                                    progress))
+        {
+          /* new width or height are 0; remove item */
+          if (gimp_item_is_attached (item))
+            {
+              gimp_image_remove_layer (gimp_item_get_image (item),
+                                       GIMP_LAYER (child),
+                                       TRUE, NULL);
+            }
+          else
+            {
+              gimp_container_remove (private->children, GIMP_OBJECT (child));
+            }
+        }
+    }
+
+  gimp_group_layer_resume_resize (group, TRUE);
+
+  g_clear_object (&queue);
+}
+
+static void
+gimp_group_layer_flip (GimpLayer           *layer,
+                       GimpContext         *context,
+                       GimpOrientationType  flip_type,
+                       gdouble              axis,
+                       gboolean             clip_result)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+  GList                 *list;
+
+  gimp_group_layer_suspend_resize (group, TRUE);
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *child = list->data;
+
+      gimp_item_flip (child, context,
+                      flip_type, axis, clip_result);
+    }
+
+  gimp_group_layer_resume_resize (group, TRUE);
+}
+
+static void
+gimp_group_layer_rotate (GimpLayer        *layer,
+                         GimpContext      *context,
+                         GimpRotationType  rotate_type,
+                         gdouble           center_x,
+                         gdouble           center_y,
+                         gboolean          clip_result)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+  GList                 *list;
+
+  gimp_group_layer_suspend_resize (group, TRUE);
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *child = list->data;
+
+      gimp_item_rotate (child, context,
+                        rotate_type, center_x, center_y, clip_result);
+    }
+
+  gimp_group_layer_resume_resize (group, TRUE);
+}
+
+static void
+gimp_group_layer_transform (GimpLayer              *layer,
+                            GimpContext            *context,
+                            const GimpMatrix3      *matrix,
+                            GimpTransformDirection  direction,
+                            GimpInterpolationType   interpolation_type,
+                            GimpTransformResize     clip_result,
+                            GimpProgress           *progress)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+  GimpObjectQueue       *queue   = NULL;
+  GList                 *list;
+
+  if (progress)
+    {
+      queue    = gimp_object_queue_new (progress);
+      progress = GIMP_PROGRESS (queue);
+
+      gimp_object_queue_push_container (queue, private->children);
+    }
+
+  gimp_group_layer_suspend_resize (group, TRUE);
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *child = list->data;
+
+      if (queue)
+        gimp_object_queue_pop (queue);
+
+      gimp_item_transform (child, context,
+                           matrix, direction,
+                           interpolation_type,
+                           clip_result, progress);
+    }
+
+  gimp_group_layer_resume_resize (group, TRUE);
+
+  g_clear_object (&queue);
+}
+
+static const Babl *
+get_projection_format (GimpProjectable   *projectable,
+                       GimpImageBaseType  base_type,
+                       GimpPrecision      precision)
+{
+  GimpImage *image = gimp_item_get_image (GIMP_ITEM (projectable));
+
+  switch (base_type)
+    {
+    case GIMP_RGB:
+    case GIMP_INDEXED:
+      return gimp_image_get_format (image, GIMP_RGB, precision, TRUE);
+
+    case GIMP_GRAY:
+      return gimp_image_get_format (image, GIMP_GRAY, precision, TRUE);
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+static void
+gimp_group_layer_convert_type (GimpLayer        *layer,
+                               GimpImage        *dest_image,
+                               const Babl       *new_format,
+                               GimpColorProfile *dest_profile,
+                               GeglDitherMethod  layer_dither_type,
+                               GeglDitherMethod  mask_dither_type,
+                               gboolean          push_undo,
+                               GimpProgress     *progress)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+  GeglBuffer            *buffer;
+
+  if (push_undo)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (group));
+
+      gimp_image_undo_push_group_layer_convert (image, NULL, group);
+    }
+
+  /*  Need to temporarily set the projectable's format to the new
+   *  values so the projection will create its tiles with the right
+   *  depth
+   */
+  private->convert_format =
+    get_projection_format (GIMP_PROJECTABLE (group),
+                           gimp_babl_format_get_base_type (new_format),
+                           gimp_babl_format_get_precision (new_format));
+  gimp_projectable_structure_changed (GIMP_PROJECTABLE (group));
+  gimp_group_layer_flush (group);
+
+  buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (private->projection));
+
+  gimp_drawable_set_buffer_full (GIMP_DRAWABLE (group),
+                                 FALSE, NULL,
+                                 buffer, NULL,
+                                 TRUE);
+
+  /*  reset, the actual format is right now  */
+  private->convert_format = NULL;
+}
+
+static GeglNode *
+gimp_group_layer_get_source_node (GimpDrawable *drawable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (drawable);
+  GeglNode              *input;
+
+  g_warn_if_fail (private->source_node == NULL);
+
+  private->source_node = gegl_node_new ();
+
+  input = gegl_node_get_input_proxy (private->source_node, "input");
+
+  private->parent_source_node =
+    GIMP_DRAWABLE_CLASS (parent_class)->get_source_node (drawable);
+
+  gegl_node_add_child (private->source_node, private->parent_source_node);
+
+  g_object_unref (private->parent_source_node);
+
+  if (gegl_node_has_pad (private->parent_source_node, "input"))
+    {
+      gegl_node_connect_to (input,                       "output",
+                            private->parent_source_node, "input");
+    }
+
+  /* make sure we have a graph */
+  (void) gimp_group_layer_get_graph (GIMP_PROJECTABLE (drawable));
+
+  gegl_node_add_child (private->source_node, private->graph);
+
+  gimp_group_layer_update_source_node (GIMP_GROUP_LAYER (drawable));
+
+  return g_object_ref (private->source_node);
+}
+
+static void
+gimp_group_layer_opacity_changed (GimpLayer *layer)
+{
+  gimp_layer_update_effective_mode (layer);
+
+  if (GIMP_LAYER_CLASS (parent_class)->opacity_changed)
+    GIMP_LAYER_CLASS (parent_class)->opacity_changed (layer);
+}
+
+static void
+gimp_group_layer_effective_mode_changed (GimpLayer *layer)
+{
+  GimpGroupLayer        *group               = GIMP_GROUP_LAYER (layer);
+  GimpGroupLayerPrivate *private             = GET_PRIVATE (layer);
+  GimpLayerMode          mode;
+  gboolean               pass_through;
+  gboolean               update_bounding_box = FALSE;
+
+  gimp_layer_get_effective_mode (layer, &mode, NULL, NULL, NULL);
+
+  pass_through = (mode == GIMP_LAYER_MODE_PASS_THROUGH);
+
+  if (pass_through != private->pass_through)
+    {
+      if (private->pass_through && ! pass_through)
+        {
+          /* when switching from pass-through mode to a non-pass-through mode,
+           * flush the pickable in order to make sure the projection's buffer
+           * gets properly invalidated synchronously, so that it can be used
+           * as a source for the rest of the composition.
+           */
+          gimp_pickable_flush (GIMP_PICKABLE (private->projection));
+        }
+
+      private->pass_through = pass_through;
+
+      update_bounding_box = TRUE;
+    }
+
+  gimp_group_layer_update_source_node (group);
+  gimp_group_layer_update_mode_node (group);
+
+  if (update_bounding_box)
+    gimp_drawable_update_bounding_box (GIMP_DRAWABLE (group));
+
+  if (GIMP_LAYER_CLASS (parent_class)->effective_mode_changed)
+    GIMP_LAYER_CLASS (parent_class)->effective_mode_changed (layer);
+}
+
+static void
+gimp_group_layer_excludes_backdrop_changed (GimpLayer *layer)
+{
+  GimpGroupLayer *group = GIMP_GROUP_LAYER (layer);
+
+  gimp_group_layer_update_source_node (group);
+  gimp_group_layer_update_mode_node (group);
+
+  if (GIMP_LAYER_CLASS (parent_class)->excludes_backdrop_changed)
+    GIMP_LAYER_CLASS (parent_class)->excludes_backdrop_changed (layer);
+}
+
+static GeglRectangle
+gimp_group_layer_get_bounding_box (GimpLayer *layer)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+
+  /* for pass-through groups, use the group's calculated bounding box, instead
+   * of the source-node's bounding box, since we don't update the bounding box
+   * on all events that may affect the latter, and since it includes the
+   * bounding box of the backdrop.  this means we can't attach filters that may
+   * affect the bounding box to a pass-through group (since their effect weon't
+   * be reflected by the group's bounding box), but attaching filters to pass-
+   * through groups makes little sense anyway.
+   */
+  if (private->pass_through)
+    return private->bounding_box;
+  else
+    return GIMP_LAYER_CLASS (parent_class)->get_bounding_box (layer);
+}
+
+static void
+gimp_group_layer_get_effective_mode (GimpLayer              *layer,
+                                     GimpLayerMode          *mode,
+                                     GimpLayerColorSpace    *blend_space,
+                                     GimpLayerColorSpace    *composite_space,
+                                     GimpLayerCompositeMode *composite_mode)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+
+  /* try to strength-reduce pass-through groups to normal groups, which are
+   * cheaper.
+   */
+  if (gimp_layer_get_mode (layer) == GIMP_LAYER_MODE_PASS_THROUGH &&
+      ! no_pass_through_strength_reduction)
+    {
+      /* we perform the strength-reduction if:
+       *
+       *   - the group has no active children;
+       *
+       *   or,
+       *
+       *     - the group has a single active child; or,
+       *
+       *     - the effective mode of all the active children is normal, their
+       *       effective composite mode is UNION, and their effective blend and
+       *       composite spaces are equal;
+       *
+       *   - and,
+       *
+       *     - the group's opacity is 100%, and it has no mask (or the mask
+       *       isn't applied); or,
+       *
+       *     - the group's composite space equals the active children's
+       *       composite space.
+       */
+
+      GList    *list;
+      gboolean  reduce = TRUE;
+      gboolean  first  = TRUE;
+
+      *mode            = GIMP_LAYER_MODE_NORMAL;
+      *blend_space     = gimp_layer_get_real_blend_space (layer);
+      *composite_space = gimp_layer_get_real_composite_space (layer);
+      *composite_mode  = gimp_layer_get_real_composite_mode (layer);
+
+      for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+           list;
+           list = g_list_next (list))
+        {
+          GimpLayer *child = list->data;
+
+          if (! gimp_filter_get_active (GIMP_FILTER (child)))
+            continue;
+
+          if (first)
+            {
+              gimp_layer_get_effective_mode (child,
+                                             mode,
+                                             blend_space,
+                                             composite_space,
+                                             composite_mode);
+
+              if (*mode == GIMP_LAYER_MODE_NORMAL_LEGACY)
+                *mode = GIMP_LAYER_MODE_NORMAL;
+
+              first = FALSE;
+            }
+          else
+            {
+              GimpLayerMode          other_mode;
+              GimpLayerColorSpace    other_blend_space;
+              GimpLayerColorSpace    other_composite_space;
+              GimpLayerCompositeMode other_composite_mode;
+
+              if (*mode           != GIMP_LAYER_MODE_NORMAL ||
+                  *composite_mode != GIMP_LAYER_COMPOSITE_UNION)
+                {
+                  reduce = FALSE;
+
+                  break;
+                }
+
+              gimp_layer_get_effective_mode (child,
+                                             &other_mode,
+                                             &other_blend_space,
+                                             &other_composite_space,
+                                             &other_composite_mode);
+
+              if (other_mode == GIMP_LAYER_MODE_NORMAL_LEGACY)
+                other_mode = GIMP_LAYER_MODE_NORMAL;
+
+              if (other_mode            != *mode            ||
+                  other_blend_space     != *blend_space     ||
+                  other_composite_space != *composite_space ||
+                  other_composite_mode  != *composite_mode)
+                {
+                  reduce = FALSE;
+
+                  break;
+                }
+            }
+        }
+
+      if (reduce)
+        {
+          gboolean has_mask;
+
+          has_mask = gimp_layer_get_mask (layer) &&
+                     gimp_layer_get_apply_mask (layer);
+
+          if (first                                                  ||
+              (gimp_layer_get_opacity (layer) == GIMP_OPACITY_OPAQUE &&
+               ! has_mask)                                           ||
+              *composite_space == gimp_layer_get_real_composite_space (layer))
+            {
+              /* strength reduction succeeded! */
+              return;
+            }
+        }
+    }
+
+  /* strength-reduction failed.  chain up. */
+  GIMP_LAYER_CLASS (parent_class)->get_effective_mode (layer,
+                                                       mode,
+                                                       blend_space,
+                                                       composite_space,
+                                                       composite_mode);
+}
+
+static gboolean
+gimp_group_layer_get_excludes_backdrop (GimpLayer *layer)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (layer);
+
+  if (private->pass_through)
+    {
+      GList *list;
+
+      for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+           list;
+           list = g_list_next (list))
+        {
+          GimpFilter *child = list->data;
+
+          if (gimp_filter_get_active (child) &&
+              gimp_layer_get_excludes_backdrop (GIMP_LAYER (child)))
+            return TRUE;
+        }
+
+      return FALSE;
+    }
+  else
+    return GIMP_LAYER_CLASS (parent_class)->get_excludes_backdrop (layer);
+}
+
+static const Babl *
+gimp_group_layer_get_format (GimpProjectable *projectable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (projectable);
+  GimpImageBaseType      base_type;
+  GimpPrecision          precision;
+
+  if (private->convert_format)
+    return private->convert_format;
+
+  base_type = gimp_drawable_get_base_type (GIMP_DRAWABLE (projectable));
+  precision = gimp_drawable_get_precision (GIMP_DRAWABLE (projectable));
+
+  return get_projection_format (projectable, base_type, precision);
+}
+
+static GeglRectangle
+gimp_group_layer_projectable_get_bounding_box (GimpProjectable *projectable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (projectable);
+
+  return private->bounding_box;
+}
+
+static GeglNode *
+gimp_group_layer_get_graph (GimpProjectable *projectable)
+{
+  GimpGroupLayer        *group   = GIMP_GROUP_LAYER (projectable);
+  GimpGroupLayerPrivate *private = GET_PRIVATE (projectable);
+  GeglNode              *input;
+  GeglNode              *layers_node;
+  GeglNode              *output;
+  gint                   off_x;
+  gint                   off_y;
+
+  if (private->graph)
+    return private->graph;
+
+  private->graph = gegl_node_new ();
+
+  input = gegl_node_get_input_proxy (private->graph, "input");
+
+  layers_node =
+    gimp_filter_stack_get_graph (GIMP_FILTER_STACK (private->children));
+
+  gegl_node_add_child (private->graph, layers_node);
+
+  gegl_node_connect_to (input,       "output",
+                        layers_node, "input");
+
+  gimp_item_get_offset (GIMP_ITEM (group), &off_x, &off_y);
+
+  private->offset_node = gegl_node_new_child (private->graph,
+                                              "operation", "gegl:translate",
+                                              "x",         (gdouble) -off_x,
+                                              "y",         (gdouble) -off_y,
+                                              NULL);
+
+  gegl_node_connect_to (layers_node,          "output",
+                        private->offset_node, "input");
+
+  output = gegl_node_get_output_proxy (private->graph, "output");
+
+  gegl_node_connect_to (private->offset_node, "output",
+                        output,               "input");
+
+  return private->graph;
+}
+
+static void
+gimp_group_layer_begin_render (GimpProjectable *projectable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (projectable);
+
+  if (private->source_node == NULL)
+    return;
+
+  if (private->pass_through)
+    gegl_node_disconnect (private->graph, "input");
+}
+
+static void
+gimp_group_layer_end_render (GimpProjectable *projectable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (projectable);
+
+  if (private->source_node == NULL)
+    return;
+
+  if (private->pass_through)
+    {
+      GeglNode *input;
+
+      input = gegl_node_get_input_proxy (private->source_node, "input");
+
+      gegl_node_connect_to (input,          "output",
+                            private->graph, "input");
+    }
+}
+
+static void
+gimp_group_layer_pickable_flush (GimpPickable *pickable)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (pickable);
+
+  gimp_pickable_flush (GIMP_PICKABLE (private->projection));
+}
+
+static gdouble
+gimp_group_layer_get_opacity_at (GimpPickable *pickable,
+                                 gint          x,
+                                 gint          y)
+{
+  /* Only consider child layers as having content */
+
+  return GIMP_OPACITY_TRANSPARENT;
+}
+
+
+/*  public functions  */
+
+GimpLayer *
+gimp_group_layer_new (GimpImage *image)
+{
+  GimpGroupLayer *group;
+  const Babl     *format;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  format = gimp_image_get_layer_format (image, TRUE);
+
+  group = GIMP_GROUP_LAYER (gimp_drawable_new (GIMP_TYPE_GROUP_LAYER,
+                                               image, NULL,
+                                               0, 0, 1, 1,
+                                               format));
+
+  gimp_layer_set_mode (GIMP_LAYER (group),
+                       gimp_image_get_default_new_layer_mode (image),
+                       FALSE);
+
+  return GIMP_LAYER (group);
+}
+
+GimpProjection *
+gimp_group_layer_get_projection (GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+
+  return GET_PRIVATE (group)->projection;
+}
+
+void
+gimp_group_layer_suspend_resize (GimpGroupLayer *group,
+                                 gboolean        push_undo)
+{
+  GimpItem *item;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+
+  item = GIMP_ITEM (group);
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_group_layer_suspend_resize (gimp_item_get_image (item),
+                                                     NULL, group);
+
+  GET_PRIVATE (group)->suspend_resize++;
+}
+
+void
+gimp_group_layer_resume_resize (GimpGroupLayer *group,
+                                gboolean        push_undo)
+{
+  GimpGroupLayerPrivate *private;
+  GimpItem              *item;
+  GimpItem              *mask = NULL;
+  GeglBuffer            *mask_buffer;
+  GeglRectangle          mask_bounds;
+  GimpUndo              *undo;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+
+  private = GET_PRIVATE (group);
+
+  g_return_if_fail (private->suspend_resize > 0);
+
+  item = GIMP_ITEM (group);
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    {
+      undo =
+        gimp_image_undo_push_group_layer_resume_resize (gimp_item_get_image (item),
+                                                        NULL, group);
+
+      /* if there were any {suspend,resume}_mask() calls during the time the
+       * group's size was suspended, the resume_mask() calls will not have seen
+       * any changes to the mask, and will therefore won't restore the mask
+       * during undo.  if the group's bounding box did change while resize was
+       * suspended, and if there are no other {suspend,resume}_mask() blocks
+       * that will see the resized mask, we have to restore the mask during the
+       * resume_resize() undo.
+       *
+       * we ref the mask buffer here, and compare it to the mask buffer after
+       * updating the size.
+       */
+      if (private->suspend_resize == 1 && private->suspend_mask == 0)
+        {
+          mask = GIMP_ITEM (gimp_layer_get_mask (GIMP_LAYER (group)));
+
+          if (mask)
+            {
+              mask_buffer =
+                g_object_ref (gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)));
+
+              mask_bounds.x      = gimp_item_get_offset_x (mask);
+              mask_bounds.y      = gimp_item_get_offset_y (mask);
+              mask_bounds.width  = gimp_item_get_width    (mask);
+              mask_bounds.height = gimp_item_get_height   (mask);
+            }
+        }
+    }
+
+  private->suspend_resize--;
+
+  if (private->suspend_resize == 0)
+    {
+      gimp_group_layer_update_size (group);
+
+      if (mask)
+        {
+          /* if the mask changed, make sure it's restored during undo, as per
+           * the comment above.
+           */
+          if (gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)) != mask_buffer)
+            {
+              g_return_if_fail (undo != NULL);
+
+              GIMP_GROUP_LAYER_UNDO (undo)->mask_buffer = mask_buffer;
+              GIMP_GROUP_LAYER_UNDO (undo)->mask_bounds = mask_bounds;
+            }
+          else
+            {
+              g_object_unref (mask_buffer);
+            }
+        }
+    }
+}
+
+void
+gimp_group_layer_suspend_mask (GimpGroupLayer *group,
+                               gboolean        push_undo)
+{
+  GimpGroupLayerPrivate *private;
+  GimpItem              *item;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+
+  private = GET_PRIVATE (group);
+  item    = GIMP_ITEM (group);
+
+  /* avoid pushing an undo step if this is a nested suspend_mask() call, since
+   * the value of 'push_undo' in nested calls should be the same as that passed
+   * to the outermost call, and only pushing an undo step for the outermost
+   * call in this case is enough.  we can't support cases where the values of
+   * 'push_undo' in nested calls are different in a meaningful way, and
+   * avoiding undo steps for nested calls prevents us from storing multiple
+   * references to the suspend mask buffer on the undo stack.  while storing
+   * multiple references to the buffer doesn't waste any memory (since all the
+   * references are to the same buffer), it does cause the undo stack memory-
+   * usage estimation to overshoot, potentially resulting in undo steps being
+   * dropped unnecessarily.
+   */
+  if (! gimp_item_is_attached (item) || private->suspend_mask > 0)
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_group_layer_suspend_mask (gimp_item_get_image (item),
+                                                   NULL, group);
+
+  if (private->suspend_mask == 0)
+    {
+      if (gimp_layer_get_mask (GIMP_LAYER (group)))
+        {
+          GimpItem *mask = GIMP_ITEM (gimp_layer_get_mask (GIMP_LAYER (group)));
+
+          private->suspended_mask_buffer =
+            g_object_ref (gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)));
+
+          private->suspended_mask_bounds.x      = gimp_item_get_offset_x (mask);
+          private->suspended_mask_bounds.y      = gimp_item_get_offset_y (mask);
+          private->suspended_mask_bounds.width  = gimp_item_get_width    (mask);
+          private->suspended_mask_bounds.height = gimp_item_get_height   (mask);
+        }
+      else
+        {
+          private->suspended_mask_buffer = NULL;
+        }
+    }
+
+  private->suspend_mask++;
+}
+
+void
+gimp_group_layer_resume_mask (GimpGroupLayer *group,
+                              gboolean        push_undo)
+{
+  GimpGroupLayerPrivate *private;
+  GimpItem              *item;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+
+  private = GET_PRIVATE (group);
+
+  g_return_if_fail (private->suspend_mask > 0);
+
+  item = GIMP_ITEM (group);
+
+  /* avoid pushing an undo step if this is a nested resume_mask() call.  see
+   * the comment in gimp_group_layer_suspend_mask().
+   */
+  if (! gimp_item_is_attached (item) || private->suspend_mask > 1)
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_group_layer_resume_mask (gimp_item_get_image (item),
+                                                  NULL, group);
+
+  private->suspend_mask--;
+
+  if (private->suspend_mask == 0)
+    g_clear_object (&private->suspended_mask_buffer);
+}
+
+
+/*  protected functions  */
+
+void
+_gimp_group_layer_set_suspended_mask (GimpGroupLayer      *group,
+                                      GeglBuffer          *buffer,
+                                      const GeglRectangle *bounds)
+{
+  GimpGroupLayerPrivate *private;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+  g_return_if_fail (buffer != NULL);
+  g_return_if_fail (bounds != NULL);
+
+  private = GET_PRIVATE (group);
+
+  g_return_if_fail (private->suspend_mask > 0);
+
+  g_object_ref (buffer);
+
+  g_clear_object (&private->suspended_mask_buffer);
+
+  private->suspended_mask_buffer = buffer;
+  private->suspended_mask_bounds = *bounds;
+}
+
+GeglBuffer *
+_gimp_group_layer_get_suspended_mask (GimpGroupLayer *group,
+                                      GeglRectangle  *bounds)
+{
+  GimpGroupLayerPrivate *private;
+  GimpLayerMask         *mask;
+
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (bounds != NULL, NULL);
+
+  private = GET_PRIVATE (group);
+  mask    = gimp_layer_get_mask (GIMP_LAYER (group));
+
+  g_return_val_if_fail (private->suspend_mask > 0, NULL);
+
+  if (mask &&
+      gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)) !=
+      private->suspended_mask_buffer)
+    {
+      *bounds = private->suspended_mask_bounds;
+
+      return private->suspended_mask_buffer;
+    }
+
+  return NULL;
+}
+
+void
+_gimp_group_layer_start_transform (GimpGroupLayer *group,
+                                   gboolean        push_undo)
+{
+  GimpGroupLayerPrivate *private;
+  GimpItem              *item;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+
+  private = GET_PRIVATE (group);
+  item    = GIMP_ITEM (group);
+
+  g_return_if_fail (private->suspend_mask == 0);
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_group_layer_start_transform (gimp_item_get_image (item),
+                                                      NULL, group);
+
+  private->transforming++;
+}
+
+void
+_gimp_group_layer_end_transform (GimpGroupLayer *group,
+                                 gboolean        push_undo)
+{
+  GimpGroupLayerPrivate *private;
+  GimpItem              *item;
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (group));
+
+  private = GET_PRIVATE (group);
+  item    = GIMP_ITEM (group);
+
+  g_return_if_fail (private->suspend_mask == 0);
+  g_return_if_fail (private->transforming > 0);
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_group_layer_end_transform (gimp_item_get_image (item),
+                                                    NULL, group);
+
+  private->transforming--;
+
+  if (private->transforming == 0)
+    gimp_group_layer_update_mask_size (GIMP_GROUP_LAYER (item));
+}
+
+
+/*  private functions  */
+
+static void
+gimp_group_layer_child_add (GimpContainer  *container,
+                            GimpLayer      *child,
+                            GimpGroupLayer *group)
+{
+  gimp_group_layer_update (group);
+
+  if (gimp_filter_get_active (GIMP_FILTER (child)))
+    {
+      gimp_layer_update_effective_mode (GIMP_LAYER (group));
+
+      if (gimp_layer_get_excludes_backdrop (child))
+        gimp_layer_update_excludes_backdrop (GIMP_LAYER (group));
+    }
+}
+
+static void
+gimp_group_layer_child_remove (GimpContainer  *container,
+                               GimpLayer      *child,
+                               GimpGroupLayer *group)
+{
+  gimp_group_layer_update (group);
+
+  if (gimp_filter_get_active (GIMP_FILTER (child)))
+    {
+      gimp_layer_update_effective_mode (GIMP_LAYER (group));
+
+      if (gimp_layer_get_excludes_backdrop (child))
+        gimp_layer_update_excludes_backdrop (GIMP_LAYER (group));
+    }
+}
+
+static void
+gimp_group_layer_child_move (GimpLayer      *child,
+                             GParamSpec     *pspec,
+                             GimpGroupLayer *group)
+{
+  gimp_group_layer_update (group);
+}
+
+static void
+gimp_group_layer_child_resize (GimpLayer      *child,
+                               GimpGroupLayer *group)
+{
+  gimp_group_layer_update (group);
+}
+
+static void
+gimp_group_layer_child_active_changed (GimpLayer      *child,
+                                       GimpGroupLayer *group)
+{
+  gimp_layer_update_effective_mode (GIMP_LAYER (group));
+
+  if (gimp_layer_get_excludes_backdrop (child))
+    gimp_layer_update_excludes_backdrop (GIMP_LAYER (group));
+}
+
+static void
+gimp_group_layer_child_effective_mode_changed (GimpLayer      *child,
+                                               GimpGroupLayer *group)
+{
+  if (gimp_filter_get_active (GIMP_FILTER (child)))
+    gimp_layer_update_effective_mode (GIMP_LAYER (group));
+}
+
+static void
+gimp_group_layer_child_excludes_backdrop_changed (GimpLayer      *child,
+                                                  GimpGroupLayer *group)
+{
+  if (gimp_filter_get_active (GIMP_FILTER (child)))
+    gimp_layer_update_excludes_backdrop (GIMP_LAYER (group));
+}
+
+static void
+gimp_group_layer_flush (GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+
+  if (private->pass_through)
+    {
+      /*  flush the projectable, not the pickable, because the source
+       *  node of pass-through groups doesn't use the projection's
+       *  buffer, hence there's no need to invalidate it synchronously.
+       */
+      gimp_projectable_flush (GIMP_PROJECTABLE (group), TRUE);
+    }
+  else
+    {
+      /* make sure we have a buffer, and stop any idle rendering, which is
+       * initiated when a new buffer is allocated.  the call to
+       * gimp_pickable_flush() below causes any pending idle rendering to
+       * finish synchronously, so this needs to happen before.
+       */
+      gimp_pickable_get_buffer (GIMP_PICKABLE (private->projection));
+      gimp_projection_stop_rendering (private->projection);
+
+      /*  flush the pickable not the projectable because flushing the
+       *  pickable will finish all invalidation on the projection so it
+       *  can be used as source (note that it will still be constructed
+       *  when the actual read happens, so this it not a performance
+       *  problem)
+       */
+      gimp_pickable_flush (GIMP_PICKABLE (private->projection));
+    }
+}
+
+static void
+gimp_group_layer_update (GimpGroupLayer *group)
+{
+  if (GET_PRIVATE (group)->suspend_resize == 0)
+    {
+      gimp_group_layer_update_size (group);
+    }
+}
+
+static void
+gimp_group_layer_update_size (GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+  GimpItem              *item    = GIMP_ITEM (group);
+  GimpLayer             *layer   = GIMP_LAYER (group);
+  GimpItem              *mask    = GIMP_ITEM (gimp_layer_get_mask (layer));
+  GeglRectangle          old_bounds;
+  GeglRectangle          bounds;
+  GeglRectangle          old_bounding_box;
+  GeglRectangle          bounding_box;
+  gboolean               first   = TRUE;
+  gboolean               size_changed;
+  gboolean               resize_mask;
+  GList                 *list;
+
+  old_bounds.x      = gimp_item_get_offset_x (item);
+  old_bounds.y      = gimp_item_get_offset_y (item);
+  old_bounds.width  = gimp_item_get_width    (item);
+  old_bounds.height = gimp_item_get_height   (item);
+
+  bounds.x          = 0;
+  bounds.y          = 0;
+  bounds.width      = 1;
+  bounds.height     = 1;
+
+  old_bounding_box  = private->bounding_box;
+  bounding_box      = bounds;
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (private->children));
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem      *child = list->data;
+      GeglRectangle  child_bounds;
+      GeglRectangle  child_bounding_box;
+
+      if (! gimp_viewable_get_size (GIMP_VIEWABLE (child),
+                                    &child_bounds.width, &child_bounds.height))
+        {
+          /*  ignore children without content (empty group layers);
+           *  see bug 777017
+           */
+          continue;
+        }
+
+      gimp_item_get_offset (child, &child_bounds.x, &child_bounds.y);
+
+      child_bounding_box =
+        gimp_drawable_get_bounding_box (GIMP_DRAWABLE (child));
+
+      child_bounding_box.x += child_bounds.x;
+      child_bounding_box.y += child_bounds.y;
+
+      if (first)
+        {
+          bounds       = child_bounds;
+          bounding_box = child_bounding_box;
+
+          first = FALSE;
+        }
+      else
+        {
+          gegl_rectangle_bounding_box (&bounds,
+                                       &bounds, &child_bounds);
+          gegl_rectangle_bounding_box (&bounding_box,
+                                       &bounding_box, &child_bounding_box);
+        }
+    }
+
+  bounding_box.x -= bounds.x;
+  bounding_box.y -= bounds.y;
+
+  size_changed = ! (gegl_rectangle_equal (&bounds,       &old_bounds) &&
+                    gegl_rectangle_equal (&bounding_box, &old_bounding_box));
+
+  resize_mask = mask && ! gegl_rectangle_equal (&bounds, &old_bounds);
+
+  /* if we show the mask, invalidate the old mask area */
+  if (resize_mask && gimp_layer_get_show_mask (layer))
+    {
+      gimp_drawable_update (GIMP_DRAWABLE (group),
+                            gimp_item_get_offset_x (mask) - old_bounds.x,
+                            gimp_item_get_offset_y (mask) - old_bounds.y,
+                            gimp_item_get_width    (mask),
+                            gimp_item_get_height   (mask));
+    }
+
+  if (private->reallocate_projection || size_changed)
+    {
+      GeglBuffer *buffer;
+
+      /* if the graph is already constructed, set the offset node's
+       * coordinates first, so the graph is in the right state when
+       * the projection is reallocated, see bug #730550.
+       */
+      if (private->offset_node)
+        gegl_node_set (private->offset_node,
+                       "x", (gdouble) -bounds.x,
+                       "y", (gdouble) -bounds.y,
+                       NULL);
+
+      /* update our offset *before* calling gimp_pickable_get_buffer(), so
+       * that if our graph isn't constructed yet, the offset node picks
+       * up the right coordinates in gimp_group_layer_get_graph().
+       */
+      gimp_item_set_offset (item, bounds.x, bounds.y);
+
+      /* update the bounding box before updating the projection, so that it
+       * picks up the right size.
+       */
+      private->bounding_box = bounding_box;
+
+      if (private->reallocate_projection)
+        {
+          private->reallocate_projection = FALSE;
+
+          gimp_projectable_structure_changed (GIMP_PROJECTABLE (group));
+        }
+      else
+        {
+          /* when there's no need to reallocate the projection, we call
+           * gimp_projectable_bounds_changed(), rather than structure_chaned(),
+           * so that the projection simply copies the old content over to the
+           * new buffer with an offset, rather than re-renders the graph.
+           */
+          gimp_projectable_bounds_changed (GIMP_PROJECTABLE (group),
+                                           old_bounds.x, old_bounds.y);
+        }
+
+      buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (private->projection));
+
+      gimp_drawable_set_buffer_full (GIMP_DRAWABLE (group),
+                                     FALSE, NULL,
+                                     buffer, &bounds,
+                                     FALSE /* don't update the drawable, the
+                                            * flush() below will take care of
+                                            * that.
+                                            */);
+
+      gimp_group_layer_flush (group);
+    }
+
+  /* resize the mask if not transforming (in which case, GimpLayer takes care
+   * of the mask)
+   */
+  if (resize_mask && ! private->transforming)
+    gimp_group_layer_update_mask_size (group);
+
+  /* if we show the mask, invalidate the new mask area */
+  if (resize_mask && gimp_layer_get_show_mask (layer))
+    {
+      gimp_drawable_update (GIMP_DRAWABLE (group),
+                            gimp_item_get_offset_x (mask) - bounds.x,
+                            gimp_item_get_offset_y (mask) - bounds.y,
+                            gimp_item_get_width    (mask),
+                            gimp_item_get_height   (mask));
+    }
+}
+
+static void
+gimp_group_layer_update_mask_size (GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+  GimpItem              *item    = GIMP_ITEM (group);
+  GimpItem              *mask;
+  GeglBuffer            *buffer;
+  GeglBuffer            *mask_buffer;
+  GeglRectangle          bounds;
+  GeglRectangle          mask_bounds;
+  GeglRectangle          copy_bounds;
+  gboolean               intersect;
+
+  mask = GIMP_ITEM (gimp_layer_get_mask (GIMP_LAYER (group)));
+
+  if (! mask)
+    return;
+
+  bounds.x           = gimp_item_get_offset_x (item);
+  bounds.y           = gimp_item_get_offset_y (item);
+  bounds.width       = gimp_item_get_width    (item);
+  bounds.height      = gimp_item_get_height   (item);
+
+  mask_bounds.x      = gimp_item_get_offset_x (mask);
+  mask_bounds.y      = gimp_item_get_offset_y (mask);
+  mask_bounds.width  = gimp_item_get_width    (mask);
+  mask_bounds.height = gimp_item_get_height   (mask);
+
+  if (gegl_rectangle_equal (&bounds, &mask_bounds))
+    return;
+
+  buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, bounds.width, bounds.height),
+                            gimp_drawable_get_format (GIMP_DRAWABLE (mask)));
+
+  if (private->suspended_mask_buffer)
+    {
+      /* copy the suspended mask into the new mask */
+      mask_buffer = private->suspended_mask_buffer;
+      mask_bounds = private->suspended_mask_bounds;
+    }
+  else
+    {
+      /* copy the old mask into the new mask */
+      mask_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+    }
+
+  intersect = gimp_rectangle_intersect (bounds.x,
+                                        bounds.y,
+                                        bounds.width,
+                                        bounds.height,
+                                        mask_bounds.x,
+                                        mask_bounds.y,
+                                        mask_bounds.width,
+                                        mask_bounds.height,
+                                        &copy_bounds.x,
+                                        &copy_bounds.y,
+                                        &copy_bounds.width,
+                                        &copy_bounds.height);
+
+  if (intersect)
+    {
+      gimp_gegl_buffer_copy (mask_buffer,
+                             GEGL_RECTANGLE (copy_bounds.x - mask_bounds.x,
+                                             copy_bounds.y - mask_bounds.y,
+                                             copy_bounds.width,
+                                             copy_bounds.height),
+                             GEGL_ABYSS_NONE,
+                             buffer,
+                             GEGL_RECTANGLE (copy_bounds.x - bounds.x,
+                                             copy_bounds.y - bounds.y,
+                                             copy_bounds.width,
+                                             copy_bounds.height));
+    }
+
+  gimp_drawable_set_buffer_full (GIMP_DRAWABLE (mask),
+                                 FALSE, NULL,
+                                 buffer, &bounds,
+                                 TRUE);
+
+  g_object_unref (buffer);
+}
+
+static void
+gimp_group_layer_update_source_node (GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+  GeglNode              *input;
+  GeglNode              *output;
+
+  if (private->source_node == NULL)
+    return;
+
+  input  = gegl_node_get_input_proxy  (private->source_node, "input");
+  output = gegl_node_get_output_proxy (private->source_node, "output");
+
+  if (private->pass_through)
+    {
+      gegl_node_connect_to (input,          "output",
+                            private->graph, "input");
+      gegl_node_connect_to (private->graph, "output",
+                            output,         "input");
+    }
+  else
+    {
+      gegl_node_disconnect (private->graph, "input");
+
+      gegl_node_connect_to (private->parent_source_node, "output",
+                            output,                      "input");
+    }
+}
+
+static void
+gimp_group_layer_update_mode_node (GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+  GeglNode              *node;
+  GeglNode              *input;
+  GeglNode              *mode_node;
+
+  node      = gimp_filter_get_node (GIMP_FILTER (group));
+  input     = gegl_node_get_input_proxy (node, "input");
+  mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (group));
+
+  if (private->pass_through &&
+      gimp_layer_get_excludes_backdrop (GIMP_LAYER (group)))
+    {
+      gegl_node_disconnect (mode_node, "input");
+    }
+  else
+    {
+      gegl_node_connect_to (input,     "output",
+                            mode_node, "input");
+    }
+}
+
+static void
+gimp_group_layer_stack_update (GimpDrawableStack *stack,
+                               gint               x,
+                               gint               y,
+                               gint               width,
+                               gint               height,
+                               GimpGroupLayer    *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+
+#if 0
+  g_printerr ("%s (%s) %d, %d (%d, %d)\n",
+              G_STRFUNC, gimp_object_get_name (group),
+              x, y, width, height);
+#endif
+
+  if (! private->direct_update)
+    {
+      /*  the layer stack's update signal speaks in image coordinates,
+       *  pass to the projection as-is.
+       */
+      gimp_projectable_invalidate (GIMP_PROJECTABLE (group),
+                                   x, y, width, height);
+
+      gimp_group_layer_flush (group);
+    }
+
+  if (private->direct_update || private->pass_through)
+    {
+      /*  the layer stack's update signal speaks in image coordinates,
+       *  transform to layer coordinates when emitting our own update signal.
+       */
+      gimp_drawable_update (GIMP_DRAWABLE (group),
+                            x - gimp_item_get_offset_x (GIMP_ITEM (group)),
+                            y - gimp_item_get_offset_y (GIMP_ITEM (group)),
+                            width, height);
+    }
+}
+
+static void
+gimp_group_layer_proj_update (GimpProjection *proj,
+                              gboolean        now,
+                              gint            x,
+                              gint            y,
+                              gint            width,
+                              gint            height,
+                              GimpGroupLayer *group)
+{
+  GimpGroupLayerPrivate *private = GET_PRIVATE (group);
+
+#if 0
+  g_printerr ("%s (%s) %d, %d (%d, %d)\n",
+              G_STRFUNC, gimp_object_get_name (group),
+              x, y, width, height);
+#endif
+
+  if (! private->pass_through)
+    {
+      /* TODO: groups can currently have a gegl:transform op attached as a filter
+       * when using a transform tool, in which case the updated region needs
+       * undergo the same transformation.  more generally, when a drawable has
+       * filters they may influence the area affected by drawable updates.
+       *
+       * this needs to be addressed much more generally at some point, but for now
+       * we just resort to updating the entire group when it has a filter (i.e.,
+       * when it's being used with a transform tool).  we restrict this to groups,
+       * and don't do this more generally in gimp_drawable_update(), because this
+       * negatively impacts the performance of the warp tool, which does perform
+       * accurate drawable updates while using a filter.
+       */
+      if (gimp_drawable_has_filters (GIMP_DRAWABLE (group)))
+        {
+          width  = -1;
+          height = -1;
+        }
+
+      /*  the projection speaks in image coordinates, transform to layer
+       *  coordinates when emitting our own update signal.
+       */
+      gimp_drawable_update (GIMP_DRAWABLE (group),
+                            x - gimp_item_get_offset_x (GIMP_ITEM (group)),
+                            y - gimp_item_get_offset_y (GIMP_ITEM (group)),
+                            width, height);
+    }
+}
diff --git a/app/core/gimpgrouplayer.h b/app/core/gimpgrouplayer.h
new file mode 100644
index 0000000..5fef1e9
--- /dev/null
+++ b/app/core/gimpgrouplayer.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGroupLayer
+ * Copyright (C) 2009  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GROUP_LAYER_H__
+#define __GIMP_GROUP_LAYER_H__
+
+
+#include "core/gimplayer.h"
+
+
+#define GIMP_TYPE_GROUP_LAYER            (gimp_group_layer_get_type ())
+#define GIMP_GROUP_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GROUP_LAYER, GimpGroupLayer))
+#define GIMP_GROUP_LAYER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GROUP_LAYER, GimpGroupLayerClass))
+#define GIMP_IS_GROUP_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GROUP_LAYER))
+#define GIMP_IS_GROUP_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GROUP_LAYER))
+#define GIMP_GROUP_LAYER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GROUP_LAYER, GimpGroupLayerClass))
+
+
+typedef struct _GimpGroupLayerClass GimpGroupLayerClass;
+
+struct _GimpGroupLayer
+{
+  GimpLayer  parent_instance;
+};
+
+struct _GimpGroupLayerClass
+{
+  GimpLayerClass  parent_class;
+};
+
+
+GType            gimp_group_layer_get_type            (void) G_GNUC_CONST;
+
+GimpLayer      * gimp_group_layer_new                 (GimpImage           *image);
+
+GimpProjection * gimp_group_layer_get_projection      (GimpGroupLayer      *group);
+
+void             gimp_group_layer_suspend_resize      (GimpGroupLayer      *group,
+                                                       gboolean             push_undo);
+void             gimp_group_layer_resume_resize       (GimpGroupLayer      *group,
+                                                       gboolean             push_undo);
+
+void             gimp_group_layer_suspend_mask        (GimpGroupLayer      *group,
+                                                       gboolean             push_undo);
+void             gimp_group_layer_resume_mask         (GimpGroupLayer      *group,
+                                                       gboolean             push_undo);
+
+
+void             _gimp_group_layer_set_suspended_mask (GimpGroupLayer      *group,
+                                                       GeglBuffer          *buffer,
+                                                       const GeglRectangle *bounds);
+GeglBuffer     * _gimp_group_layer_get_suspended_mask (GimpGroupLayer      *group,
+                                                       GeglRectangle       *bounds);
+
+void             _gimp_group_layer_start_transform    (GimpGroupLayer      *group,
+                                                       gboolean             push_undo);
+void             _gimp_group_layer_end_transform      (GimpGroupLayer      *group,
+                                                       gboolean             push_undo);
+
+
+#endif /* __GIMP_GROUP_LAYER_H__ */
diff --git a/app/core/gimpgrouplayerundo.c b/app/core/gimpgrouplayerundo.c
new file mode 100644
index 0000000..7ea70f4
--- /dev/null
+++ b/app/core/gimpgrouplayerundo.c
@@ -0,0 +1,253 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpimage.h"
+#include "gimpgrouplayer.h"
+#include "gimpgrouplayerundo.h"
+
+
+static void     gimp_group_layer_undo_constructed (GObject             *object);
+
+static gint64   gimp_group_layer_undo_get_memsize (GimpObject          *object,
+                                                   gint64              *gui_size);
+
+static void     gimp_group_layer_undo_pop         (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode,
+                                                   GimpUndoAccumulator *accum);
+static void     gimp_group_layer_undo_free        (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpGroupLayerUndo, gimp_group_layer_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_group_layer_undo_parent_class
+
+
+static void
+gimp_group_layer_undo_class_init (GimpGroupLayerUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_group_layer_undo_constructed;
+
+  gimp_object_class->get_memsize = gimp_group_layer_undo_get_memsize;
+
+  undo_class->pop                = gimp_group_layer_undo_pop;
+  undo_class->free               = gimp_group_layer_undo_free;
+}
+
+static void
+gimp_group_layer_undo_init (GimpGroupLayerUndo *undo)
+{
+}
+
+static void
+gimp_group_layer_undo_constructed (GObject *object)
+{
+  GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (object);
+  GimpGroupLayer     *group;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_return_if_fail (GIMP_IS_GROUP_LAYER (GIMP_ITEM_UNDO (object)->item));
+
+  group = GIMP_GROUP_LAYER (GIMP_ITEM_UNDO (object)->item);
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE:
+    case GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE:
+    case GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK:
+    case GIMP_UNDO_GROUP_LAYER_START_TRANSFORM:
+    case GIMP_UNDO_GROUP_LAYER_END_TRANSFORM:
+      break;
+
+    case GIMP_UNDO_GROUP_LAYER_RESUME_MASK:
+      group_layer_undo->mask_buffer =
+        _gimp_group_layer_get_suspended_mask(group,
+                                             &group_layer_undo->mask_bounds);
+
+      if (group_layer_undo->mask_buffer)
+        g_object_ref (group_layer_undo->mask_buffer);
+      break;
+
+    case GIMP_UNDO_GROUP_LAYER_CONVERT:
+      group_layer_undo->prev_type = gimp_drawable_get_base_type (GIMP_DRAWABLE (group));
+      group_layer_undo->prev_precision = gimp_drawable_get_precision (GIMP_DRAWABLE (group));
+      group_layer_undo->prev_has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (group));
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static gint64
+gimp_group_layer_undo_get_memsize (GimpObject *object,
+                                   gint64     *gui_size)
+{
+  GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (object);
+  gint64              memsize       = 0;
+
+  memsize += gimp_gegl_buffer_get_memsize (group_layer_undo->mask_buffer);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_group_layer_undo_pop (GimpUndo            *undo,
+                           GimpUndoMode         undo_mode,
+                           GimpUndoAccumulator *accum)
+{
+  GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (undo);
+  GimpGroupLayer     *group;
+
+  group = GIMP_GROUP_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE:
+    case GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE:
+      if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+           undo->undo_type == GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE) ||
+          (undo_mode       == GIMP_UNDO_MODE_REDO &&
+           undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE))
+        {
+          /*  resume group layer auto-resizing  */
+
+          gimp_group_layer_resume_resize (group, FALSE);
+        }
+      else
+        {
+          /*  suspend group layer auto-resizing  */
+
+          gimp_group_layer_suspend_resize (group, FALSE);
+
+          if (undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE &&
+              group_layer_undo->mask_buffer)
+            {
+              GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (group));
+
+              gimp_drawable_set_buffer_full (GIMP_DRAWABLE (mask),
+                                             FALSE, NULL,
+                                             group_layer_undo->mask_buffer,
+                                             &group_layer_undo->mask_bounds,
+                                             TRUE);
+            }
+        }
+      break;
+
+    case GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK:
+    case GIMP_UNDO_GROUP_LAYER_RESUME_MASK:
+      if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+           undo->undo_type == GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK) ||
+          (undo_mode       == GIMP_UNDO_MODE_REDO &&
+           undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_MASK))
+        {
+          /*  resume group layer mask auto-resizing  */
+
+          gimp_group_layer_resume_mask (group, FALSE);
+        }
+      else
+        {
+          /*  suspend group layer mask auto-resizing  */
+
+          gimp_group_layer_suspend_mask (group, FALSE);
+
+          if (undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_MASK &&
+              group_layer_undo->mask_buffer)
+            {
+              _gimp_group_layer_set_suspended_mask (
+                group,
+                group_layer_undo->mask_buffer,
+                &group_layer_undo->mask_bounds);
+            }
+        }
+      break;
+
+    case GIMP_UNDO_GROUP_LAYER_START_TRANSFORM:
+    case GIMP_UNDO_GROUP_LAYER_END_TRANSFORM:
+      if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+           undo->undo_type == GIMP_UNDO_GROUP_LAYER_START_TRANSFORM) ||
+          (undo_mode       == GIMP_UNDO_MODE_REDO &&
+           undo->undo_type == GIMP_UNDO_GROUP_LAYER_END_TRANSFORM))
+        {
+          /*  end group layer transform operation  */
+
+          _gimp_group_layer_end_transform (group, FALSE);
+        }
+      else
+        {
+          /*  start group layer transform operation  */
+
+          _gimp_group_layer_start_transform (group, FALSE);
+        }
+      break;
+
+    case GIMP_UNDO_GROUP_LAYER_CONVERT:
+      {
+        GimpImageBaseType type;
+        GimpPrecision     precision;
+        gboolean          has_alpha;
+
+        type      = gimp_drawable_get_base_type (GIMP_DRAWABLE (group));
+        precision = gimp_drawable_get_precision (GIMP_DRAWABLE (group));
+        has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (group));
+
+        gimp_drawable_convert_type (GIMP_DRAWABLE (group),
+                                    gimp_item_get_image (GIMP_ITEM (group)),
+                                    group_layer_undo->prev_type,
+                                    group_layer_undo->prev_precision,
+                                    group_layer_undo->prev_has_alpha,
+                                    NULL,
+                                    0, 0,
+                                    FALSE, NULL);
+
+        group_layer_undo->prev_type      = type;
+        group_layer_undo->prev_precision = precision;
+        group_layer_undo->prev_has_alpha = has_alpha;
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_group_layer_undo_free (GimpUndo     *undo,
+                            GimpUndoMode  undo_mode)
+{
+  GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (undo);
+
+  g_clear_object (&group_layer_undo->mask_buffer);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpgrouplayerundo.h b/app/core/gimpgrouplayerundo.h
new file mode 100644
index 0000000..14c7043
--- /dev/null
+++ b/app/core/gimpgrouplayerundo.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GROUP_LAYER_UNDO_H__
+#define __GIMP_GROUP_LAYER_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_GROUP_LAYER_UNDO            (gimp_group_layer_undo_get_type ())
+#define GIMP_GROUP_LAYER_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GROUP_LAYER_UNDO, GimpGroupLayerUndo))
+#define GIMP_GROUP_LAYER_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GROUP_LAYER_UNDO, GimpGroupLayerUndoClass))
+#define GIMP_IS_GROUP_LAYER_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GROUP_LAYER_UNDO))
+#define GIMP_IS_GROUP_LAYER_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GROUP_LAYER_UNDO))
+#define GIMP_GROUP_LAYER_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GROUP_LAYER_UNDO, GimpGroupLayerUndoClass))
+
+
+typedef struct _GimpGroupLayerUndo      GimpGroupLayerUndo;
+typedef struct _GimpGroupLayerUndoClass GimpGroupLayerUndoClass;
+
+struct _GimpGroupLayerUndo
+{
+  GimpItemUndo       parent_instance;
+
+  GeglBuffer        *mask_buffer;
+  GeglRectangle      mask_bounds;
+
+  GimpImageBaseType  prev_type;
+  GimpPrecision      prev_precision;
+  gboolean           prev_has_alpha;
+};
+
+struct _GimpGroupLayerUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_group_layer_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_GROUP_LAYER_UNDO_H__ */
diff --git a/app/core/gimpguide.c b/app/core/gimpguide.c
new file mode 100644
index 0000000..1438958
--- /dev/null
+++ b/app/core/gimpguide.c
@@ -0,0 +1,242 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGuide
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpguide.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_POSITION,
+  PROP_STYLE
+};
+
+
+struct _GimpGuidePrivate
+{
+  GimpOrientationType  orientation;
+  gint                 position;
+
+  GimpGuideStyle       style;
+};
+
+
+static void   gimp_guide_get_property (GObject      *object,
+                                       guint         property_id,
+                                       GValue       *value,
+                                       GParamSpec   *pspec);
+static void   gimp_guide_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpGuide, gimp_guide, GIMP_TYPE_AUX_ITEM)
+
+
+static void
+gimp_guide_class_init (GimpGuideClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->get_property = gimp_guide_get_property;
+  object_class->set_property = gimp_guide_set_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ORIENTATION,
+                         "orientation",
+                         NULL, NULL,
+                         GIMP_TYPE_ORIENTATION_TYPE,
+                         GIMP_ORIENTATION_UNKNOWN,
+                         0);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_POSITION,
+                        "position",
+                        NULL, NULL,
+                        GIMP_GUIDE_POSITION_UNDEFINED,
+                        GIMP_MAX_IMAGE_SIZE,
+                        GIMP_GUIDE_POSITION_UNDEFINED,
+                        0);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_STYLE,
+                         "style",
+                         NULL, NULL,
+                         GIMP_TYPE_GUIDE_STYLE,
+                         GIMP_GUIDE_STYLE_NONE,
+                         0);
+}
+
+static void
+gimp_guide_init (GimpGuide *guide)
+{
+  guide->priv = gimp_guide_get_instance_private (guide);
+}
+
+static void
+gimp_guide_get_property (GObject    *object,
+                         guint       property_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GimpGuide *guide = GIMP_GUIDE (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, guide->priv->orientation);
+      break;
+    case PROP_POSITION:
+      g_value_set_int (value, guide->priv->position);
+      break;
+    case PROP_STYLE:
+      g_value_set_enum (value, guide->priv->style);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_guide_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GimpGuide *guide = GIMP_GUIDE (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      guide->priv->orientation = g_value_get_enum (value);
+      break;
+    case PROP_POSITION:
+      guide->priv->position = g_value_get_int (value);
+      break;
+    case PROP_STYLE:
+      guide->priv->style = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GimpGuide *
+gimp_guide_new (GimpOrientationType  orientation,
+                guint32              guide_ID)
+{
+  return g_object_new (GIMP_TYPE_GUIDE,
+                       "id",          guide_ID,
+                       "orientation", orientation,
+                       "style",       GIMP_GUIDE_STYLE_NORMAL,
+                       NULL);
+}
+
+/**
+ * gimp_guide_custom_new:
+ * @orientation:       the #GimpOrientationType
+ * @guide_ID:          the unique guide ID
+ * @guide_style:       the #GimpGuideStyle
+ *
+ * This function returns a new guide and will flag it as "custom".
+ * Custom guides are used for purpose "other" than the basic guides
+ * a user can create oneself, for instance as symmetry guides, to
+ * drive GEGL ops, etc.
+ * They are not saved in the XCF file. If an op, a symmetry or a plugin
+ * wishes to save its state, it has to do it internally.
+ * Moreover they don't follow guide snapping settings and never snap.
+ *
+ * Returns: the custom #GimpGuide.
+ **/
+GimpGuide *
+gimp_guide_custom_new (GimpOrientationType  orientation,
+                       guint32              guide_ID,
+                       GimpGuideStyle       guide_style)
+{
+  return g_object_new (GIMP_TYPE_GUIDE,
+                       "id",          guide_ID,
+                       "orientation", orientation,
+                       "style",       guide_style,
+                       NULL);
+}
+
+GimpOrientationType
+gimp_guide_get_orientation (GimpGuide *guide)
+{
+  g_return_val_if_fail (GIMP_IS_GUIDE (guide), GIMP_ORIENTATION_UNKNOWN);
+
+  return guide->priv->orientation;
+}
+
+void
+gimp_guide_set_orientation (GimpGuide           *guide,
+                            GimpOrientationType  orientation)
+{
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  guide->priv->orientation = orientation;
+
+  g_object_notify (G_OBJECT (guide), "orientation");
+}
+
+gint
+gimp_guide_get_position (GimpGuide *guide)
+{
+  g_return_val_if_fail (GIMP_IS_GUIDE (guide), GIMP_GUIDE_POSITION_UNDEFINED);
+
+  return guide->priv->position;
+}
+
+void
+gimp_guide_set_position (GimpGuide *guide,
+                         gint       position)
+{
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  guide->priv->position = position;
+
+  g_object_notify (G_OBJECT (guide), "position");
+}
+
+GimpGuideStyle
+gimp_guide_get_style (GimpGuide *guide)
+{
+  g_return_val_if_fail (GIMP_IS_GUIDE (guide), GIMP_GUIDE_STYLE_NONE);
+
+  return guide->priv->style;
+}
+
+gboolean
+gimp_guide_is_custom (GimpGuide *guide)
+{
+  g_return_val_if_fail (GIMP_IS_GUIDE (guide), FALSE);
+
+  return guide->priv->style != GIMP_GUIDE_STYLE_NORMAL;
+}
diff --git a/app/core/gimpguide.h b/app/core/gimpguide.h
new file mode 100644
index 0000000..285e8eb
--- /dev/null
+++ b/app/core/gimpguide.h
@@ -0,0 +1,75 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGuide
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GUIDE_H__
+#define __GIMP_GUIDE_H__
+
+
+#include "gimpauxitem.h"
+
+
+#define GIMP_GUIDE_POSITION_UNDEFINED G_MININT
+
+
+#define GIMP_TYPE_GUIDE            (gimp_guide_get_type ())
+#define GIMP_GUIDE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GUIDE, GimpGuide))
+#define GIMP_GUIDE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GUIDE, GimpGuideClass))
+#define GIMP_IS_GUIDE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GUIDE))
+#define GIMP_IS_GUIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GUIDE))
+#define GIMP_GUIDE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GUIDE, GimpGuideClass))
+
+
+typedef struct _GimpGuidePrivate GimpGuidePrivate;
+typedef struct _GimpGuideClass   GimpGuideClass;
+
+struct _GimpGuide
+{
+  GimpAuxItem       parent_instance;
+
+  GimpGuidePrivate *priv;
+};
+
+struct _GimpGuideClass
+{
+  GimpAuxItemClass  parent_class;
+};
+
+
+GType               gimp_guide_get_type         (void) G_GNUC_CONST;
+
+GimpGuide *         gimp_guide_new              (GimpOrientationType  orientation,
+                                                 guint32              guide_ID);
+GimpGuide *         gimp_guide_custom_new       (GimpOrientationType  orientation,
+                                                 guint32              guide_ID,
+                                                 GimpGuideStyle       guide_style);
+
+GimpOrientationType gimp_guide_get_orientation  (GimpGuide           *guide);
+void                gimp_guide_set_orientation  (GimpGuide           *guide,
+                                                 GimpOrientationType  orientation);
+
+gint                gimp_guide_get_position     (GimpGuide           *guide);
+void                gimp_guide_set_position     (GimpGuide           *guide,
+                                                 gint                 position);
+
+GimpGuideStyle      gimp_guide_get_style        (GimpGuide           *guide);
+gboolean            gimp_guide_is_custom        (GimpGuide           *guide);
+
+
+#endif /* __GIMP_GUIDE_H__ */
diff --git a/app/core/gimpguideundo.c b/app/core/gimpguideundo.c
new file mode 100644
index 0000000..c3e3de4
--- /dev/null
+++ b/app/core/gimpguideundo.c
@@ -0,0 +1,116 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpimage-guides.h"
+#include "gimpguide.h"
+#include "gimpguideundo.h"
+
+
+static void   gimp_guide_undo_constructed  (GObject            *object);
+
+static void   gimp_guide_undo_pop          (GimpUndo            *undo,
+                                            GimpUndoMode         undo_mode,
+                                            GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpGuideUndo, gimp_guide_undo,
+               GIMP_TYPE_AUX_ITEM_UNDO)
+
+#define parent_class gimp_guide_undo_parent_class
+
+
+static void
+gimp_guide_undo_class_init (GimpGuideUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_guide_undo_constructed;
+
+  undo_class->pop           = gimp_guide_undo_pop;
+}
+
+static void
+gimp_guide_undo_init (GimpGuideUndo *undo)
+{
+}
+
+static void
+gimp_guide_undo_constructed (GObject *object)
+{
+  GimpGuideUndo *guide_undo = GIMP_GUIDE_UNDO (object);
+  GimpGuide     *guide;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  guide = GIMP_GUIDE (GIMP_AUX_ITEM_UNDO (object)->aux_item);
+
+  gimp_assert (GIMP_IS_GUIDE (guide));
+
+  guide_undo->orientation = gimp_guide_get_orientation (guide);
+  guide_undo->position    = gimp_guide_get_position (guide);
+}
+
+static void
+gimp_guide_undo_pop (GimpUndo              *undo,
+                     GimpUndoMode           undo_mode,
+                     GimpUndoAccumulator   *accum)
+{
+  GimpGuideUndo       *guide_undo = GIMP_GUIDE_UNDO (undo);
+  GimpGuide           *guide;
+  GimpOrientationType  orientation;
+  gint                 position;
+  gboolean             moved = FALSE;
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  guide = GIMP_GUIDE (GIMP_AUX_ITEM_UNDO (undo)->aux_item);
+
+  orientation = gimp_guide_get_orientation (guide);
+  position    = gimp_guide_get_position (guide);
+
+  if (position == GIMP_GUIDE_POSITION_UNDEFINED)
+    {
+      gimp_image_add_guide (undo->image, guide, guide_undo->position);
+    }
+  else if (guide_undo->position == GIMP_GUIDE_POSITION_UNDEFINED)
+    {
+      gimp_image_remove_guide (undo->image, guide, FALSE);
+    }
+  else
+    {
+      gimp_guide_set_position (guide, guide_undo->position);
+
+      moved = TRUE;
+    }
+
+  gimp_guide_set_orientation (guide, guide_undo->orientation);
+
+  if (moved || guide_undo->orientation != orientation)
+    gimp_image_guide_moved (undo->image, guide);
+
+  guide_undo->position    = position;
+  guide_undo->orientation = orientation;
+}
diff --git a/app/core/gimpguideundo.h b/app/core/gimpguideundo.h
new file mode 100644
index 0000000..da77ff3
--- /dev/null
+++ b/app/core/gimpguideundo.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GUIDE_UNDO_H__
+#define __GIMP_GUIDE_UNDO_H__
+
+
+#include "gimpauxitemundo.h"
+
+
+#define GIMP_TYPE_GUIDE_UNDO            (gimp_guide_undo_get_type ())
+#define GIMP_GUIDE_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GUIDE_UNDO, GimpGuideUndo))
+#define GIMP_GUIDE_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GUIDE_UNDO, GimpGuideUndoClass))
+#define GIMP_IS_GUIDE_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GUIDE_UNDO))
+#define GIMP_IS_GUIDE_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GUIDE_UNDO))
+#define GIMP_GUIDE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GUIDE_UNDO, GimpGuideUndoClass))
+
+
+typedef struct _GimpGuideUndo      GimpGuideUndo;
+typedef struct _GimpGuideUndoClass GimpGuideUndoClass;
+
+struct _GimpGuideUndo
+{
+  GimpAuxItemUndo      parent_instance;
+
+  GimpOrientationType  orientation;
+  gint                 position;
+};
+
+struct _GimpGuideUndoClass
+{
+  GimpAuxItemUndoClass  parent_class;
+};
+
+
+GType   gimp_guide_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_GUIDE_UNDO_H__ */
diff --git a/app/core/gimphistogram.c b/app/core/gimphistogram.c
new file mode 100644
index 0000000..571679b
--- /dev/null
+++ b/app/core/gimphistogram.c
@@ -0,0 +1,1261 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphistogram module Copyright (C) 1999 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimp-atomic.h"
+#include "gimp-parallel.h"
+#include "gimpasync.h"
+#include "gimphistogram.h"
+#include "gimpwaitable.h"
+
+
+#define MAX_N_COMPONENTS   4
+#define N_DERIVED_CHANNELS 2
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+
+enum
+{
+  PROP_0,
+  PROP_N_COMPONENTS,
+  PROP_N_BINS,
+  PROP_VALUES
+};
+
+struct _GimpHistogramPrivate
+{
+  gboolean   linear;
+  gint       n_channels;
+  gint       n_bins;
+  gdouble   *values;
+  GimpAsync *calculate_async;
+};
+
+typedef struct
+{
+  /*  input  */
+  GimpHistogram *histogram;
+  GeglBuffer    *buffer;
+  GeglRectangle  buffer_rect;
+  GeglBuffer    *mask;
+  GeglRectangle  mask_rect;
+
+  /*  output  */
+  gint           n_components;
+  gint           n_bins;
+  gdouble       *values;
+} CalculateContext;
+
+typedef struct
+{
+  GimpAsync        *async;
+  CalculateContext *context;
+
+  const Babl       *format;
+  GSList           *values_list;
+} CalculateData;
+
+
+/*  local function prototypes  */
+
+static void       gimp_histogram_finalize                 (GObject              *object);
+static void       gimp_histogram_set_property             (GObject              *object,
+                                                           guint                 property_id,
+                                                           const GValue         *value,
+                                                           GParamSpec           *pspec);
+static void       gimp_histogram_get_property             (GObject              *object,
+                                                           guint                 property_id,
+                                                           GValue               *value,
+                                                           GParamSpec           *pspec);
+
+static gint64     gimp_histogram_get_memsize              (GimpObject           *object,
+                                                           gint64               *gui_size);
+
+static gboolean   gimp_histogram_map_channel              (GimpHistogram        *histogram,
+                                                           GimpHistogramChannel *channel);
+
+static void       gimp_histogram_set_values               (GimpHistogram        *histogram,
+                                                           gint                  n_components,
+                                                           gint                  n_bins,
+                                                           gdouble              *values);
+
+static void       gimp_histogram_calculate_internal       (GimpAsync            *async,
+                                                           CalculateContext     *context);
+static void       gimp_histogram_calculate_area           (const GeglRectangle  *area,
+                                                           CalculateData        *data);
+static void       gimp_histogram_calculate_async_callback (GimpAsync            *async,
+                                                           CalculateContext     *context);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpHistogram, gimp_histogram, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_histogram_parent_class
+
+
+static void
+gimp_histogram_class_init (GimpHistogramClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->finalize         = gimp_histogram_finalize;
+  object_class->set_property     = gimp_histogram_set_property;
+  object_class->get_property     = gimp_histogram_get_property;
+
+  gimp_object_class->get_memsize = gimp_histogram_get_memsize;
+
+  g_object_class_install_property (object_class, PROP_N_COMPONENTS,
+                                   g_param_spec_int ("n-components", NULL, NULL,
+                                                     0, MAX_N_COMPONENTS, 0,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_N_BINS,
+                                   g_param_spec_int ("n-bins", NULL, NULL,
+                                                     256, 1024, 1024,
+                                                     GIMP_PARAM_READABLE));
+
+  /* this is just for notifications */
+  g_object_class_install_property (object_class, PROP_VALUES,
+                                   g_param_spec_boolean ("values", NULL, NULL,
+                                                         FALSE,
+                                                         G_PARAM_READABLE));
+}
+
+static void
+gimp_histogram_init (GimpHistogram *histogram)
+{
+  histogram->priv = gimp_histogram_get_instance_private (histogram);
+}
+
+static void
+gimp_histogram_finalize (GObject *object)
+{
+  GimpHistogram *histogram = GIMP_HISTOGRAM (object);
+
+  gimp_histogram_clear_values (histogram, 0);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_histogram_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_histogram_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpHistogram *histogram = GIMP_HISTOGRAM (object);
+
+  switch (property_id)
+    {
+    case PROP_N_COMPONENTS:
+      g_value_set_int (value, gimp_histogram_n_components (histogram));
+      break;
+
+    case PROP_N_BINS:
+      g_value_set_int (value, histogram->priv->n_bins);
+      break;
+
+    case PROP_VALUES:
+      /* return a silly boolean */
+      g_value_set_boolean (value, histogram->priv->values != NULL);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_histogram_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpHistogram *histogram = GIMP_HISTOGRAM (object);
+  gint64         memsize   = 0;
+
+  if (histogram->priv->values)
+    memsize += (histogram->priv->n_channels *
+                histogram->priv->n_bins * sizeof (gdouble));
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+/*  public functions  */
+
+GimpHistogram *
+gimp_histogram_new (gboolean linear)
+{
+  GimpHistogram *histogram = g_object_new (GIMP_TYPE_HISTOGRAM, NULL);
+
+  histogram->priv->linear = linear;
+
+  return histogram;
+}
+
+/**
+ * gimp_histogram_duplicate:
+ * @histogram: a %GimpHistogram
+ *
+ * Creates a duplicate of @histogram. The duplicate has a reference
+ * count of 1 and contains the values from @histogram.
+ *
+ * Return value: a newly allocated %GimpHistogram
+ **/
+GimpHistogram *
+gimp_histogram_duplicate (GimpHistogram *histogram)
+{
+  GimpHistogram *dup;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), NULL);
+
+  if (histogram->priv->calculate_async)
+    gimp_waitable_wait (GIMP_WAITABLE (histogram->priv->calculate_async));
+
+  dup = gimp_histogram_new (histogram->priv->linear);
+
+  dup->priv->n_channels = histogram->priv->n_channels;
+  dup->priv->n_bins     = histogram->priv->n_bins;
+  dup->priv->values     = g_memdup (histogram->priv->values,
+                                    sizeof (gdouble) *
+                                    dup->priv->n_channels *
+                                    dup->priv->n_bins);
+
+  return dup;
+}
+
+void
+gimp_histogram_calculate (GimpHistogram       *histogram,
+                          GeglBuffer          *buffer,
+                          const GeglRectangle *buffer_rect,
+                          GeglBuffer          *mask,
+                          const GeglRectangle *mask_rect)
+{
+  CalculateContext context = {};
+
+  g_return_if_fail (GIMP_IS_HISTOGRAM (histogram));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+  g_return_if_fail (buffer_rect != NULL);
+
+  if (histogram->priv->calculate_async)
+    gimp_async_cancel_and_wait (histogram->priv->calculate_async);
+
+  context.histogram   = histogram;
+  context.buffer      = buffer;
+  context.buffer_rect = *buffer_rect;
+
+  if (mask)
+    {
+      context.mask = mask;
+
+      if (mask_rect)
+        context.mask_rect = *mask_rect;
+      else
+        context.mask_rect = *gegl_buffer_get_extent (mask);
+    }
+
+  gimp_histogram_calculate_internal (NULL, &context);
+
+  gimp_histogram_set_values (histogram,
+                             context.n_components, context.n_bins,
+                             context.values);
+}
+
+GimpAsync *
+gimp_histogram_calculate_async (GimpHistogram       *histogram,
+                                GeglBuffer          *buffer,
+                                const GeglRectangle *buffer_rect,
+                                GeglBuffer          *mask,
+                                const GeglRectangle *mask_rect)
+{
+  CalculateContext *context;
+  GeglRectangle     rect;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (buffer_rect != NULL, NULL);
+
+  if (histogram->priv->calculate_async)
+    gimp_async_cancel_and_wait (histogram->priv->calculate_async);
+
+  gegl_rectangle_align_to_buffer (&rect, buffer_rect, buffer,
+                                  GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+  context = g_slice_new0 (CalculateContext);
+
+  context->histogram   = histogram;
+  context->buffer      = gegl_buffer_new (&rect,
+                                          gegl_buffer_get_format (buffer));
+  context->buffer_rect = *buffer_rect;
+
+  gimp_gegl_buffer_copy (buffer, &rect, GEGL_ABYSS_NONE,
+                         context->buffer, NULL);
+
+  if (mask)
+    {
+      if (mask_rect)
+        context->mask_rect = *mask_rect;
+      else
+        context->mask_rect = *gegl_buffer_get_extent (mask);
+
+      gegl_rectangle_align_to_buffer (&rect, &context->mask_rect, mask,
+                                      GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      context->mask = gegl_buffer_new (&rect, gegl_buffer_get_format (mask));
+
+      gimp_gegl_buffer_copy (mask, &rect, GEGL_ABYSS_NONE,
+                             context->mask, NULL);
+    }
+
+  histogram->priv->calculate_async = gimp_parallel_run_async (
+    (GimpRunAsyncFunc) gimp_histogram_calculate_internal,
+    context);
+
+  gimp_async_add_callback (
+    histogram->priv->calculate_async,
+    (GimpAsyncCallback) gimp_histogram_calculate_async_callback,
+    context);
+
+  return histogram->priv->calculate_async;
+}
+
+void
+gimp_histogram_clear_values (GimpHistogram *histogram,
+                             gint           n_components)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM (histogram));
+
+  if (histogram->priv->calculate_async)
+    gimp_async_cancel_and_wait (histogram->priv->calculate_async);
+
+  gimp_histogram_set_values (histogram, n_components, 0, NULL);
+}
+
+
+#define HISTOGRAM_VALUE(c,i) (priv->values[(c) * priv->n_bins + (i)])
+
+
+gdouble
+gimp_histogram_get_maximum (GimpHistogram        *histogram,
+                            GimpHistogramChannel  channel)
+{
+  GimpHistogramPrivate *priv;
+  gdouble               max = 0.0;
+  gint                  x;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0.0);
+
+  priv = histogram->priv;
+
+  if (! priv->values ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0.0;
+    }
+
+  if (channel == GIMP_HISTOGRAM_RGB)
+    {
+      for (x = 0; x < priv->n_bins; x++)
+        {
+          max = MAX (max, HISTOGRAM_VALUE (GIMP_HISTOGRAM_RED,   x));
+          max = MAX (max, HISTOGRAM_VALUE (GIMP_HISTOGRAM_GREEN, x));
+          max = MAX (max, HISTOGRAM_VALUE (GIMP_HISTOGRAM_BLUE,  x));
+        }
+    }
+  else
+    {
+      for (x = 0; x < priv->n_bins; x++)
+        {
+          max = MAX (max, HISTOGRAM_VALUE (channel, x));
+        }
+    }
+
+  return max;
+}
+
+gdouble
+gimp_histogram_get_value (GimpHistogram        *histogram,
+                          GimpHistogramChannel  channel,
+                          gint                  bin)
+{
+  GimpHistogramPrivate *priv;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0.0);
+
+  priv = histogram->priv;
+
+  if (! priv->values                   ||
+      (bin < 0 || bin >= priv->n_bins) ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0.0;
+    }
+
+  if (channel == GIMP_HISTOGRAM_RGB)
+    {
+      gdouble min = HISTOGRAM_VALUE (GIMP_HISTOGRAM_RED, bin);
+
+      min = MIN (min, HISTOGRAM_VALUE (GIMP_HISTOGRAM_GREEN, bin));
+
+      return MIN (min, HISTOGRAM_VALUE (GIMP_HISTOGRAM_BLUE, bin));
+    }
+  else
+    {
+      return HISTOGRAM_VALUE (channel, bin);
+    }
+}
+
+gdouble
+gimp_histogram_get_component (GimpHistogram *histogram,
+                              gint           component,
+                              gint           bin)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0.0);
+
+  if (gimp_histogram_n_components (histogram) > 2)
+    component++;
+
+  return gimp_histogram_get_value (histogram, component, bin);
+}
+
+gint
+gimp_histogram_n_components (GimpHistogram *histogram)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0);
+
+  if (histogram->priv->n_channels > 0)
+    return histogram->priv->n_channels - N_DERIVED_CHANNELS;
+  else
+    return 0;
+}
+
+gint
+gimp_histogram_n_bins (GimpHistogram *histogram)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0);
+
+  return histogram->priv->n_bins;
+}
+
+gboolean
+gimp_histogram_has_channel (GimpHistogram        *histogram,
+                            GimpHistogramChannel  channel)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), FALSE);
+
+  switch (channel)
+    {
+    case GIMP_HISTOGRAM_VALUE:
+      return TRUE;
+
+    case GIMP_HISTOGRAM_RED:
+    case GIMP_HISTOGRAM_GREEN:
+    case GIMP_HISTOGRAM_BLUE:
+    case GIMP_HISTOGRAM_LUMINANCE:
+    case GIMP_HISTOGRAM_RGB:
+      return gimp_histogram_n_components (histogram) >= 3;
+
+    case GIMP_HISTOGRAM_ALPHA:
+      return gimp_histogram_n_components (histogram) == 2 ||
+             gimp_histogram_n_components (histogram) == 4;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+gdouble
+gimp_histogram_get_count (GimpHistogram        *histogram,
+                          GimpHistogramChannel  channel,
+                          gint                  start,
+                          gint                  end)
+{
+  GimpHistogramPrivate *priv;
+  gint                  i;
+  gdouble               count = 0.0;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0.0);
+
+  priv = histogram->priv;
+
+  if (! priv->values ||
+      start > end    ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0.0;
+    }
+
+  if (channel == GIMP_HISTOGRAM_RGB)
+    return (gimp_histogram_get_count (histogram,
+                                      GIMP_HISTOGRAM_RED, start, end)   +
+            gimp_histogram_get_count (histogram,
+                                      GIMP_HISTOGRAM_GREEN, start, end) +
+            gimp_histogram_get_count (histogram,
+                                      GIMP_HISTOGRAM_BLUE, start, end));
+
+  start = CLAMP (start, 0, priv->n_bins - 1);
+  end   = CLAMP (end,   0, priv->n_bins - 1);
+
+  for (i = start; i <= end; i++)
+    count += HISTOGRAM_VALUE (channel, i);
+
+  return count;
+}
+
+gdouble
+gimp_histogram_get_mean (GimpHistogram        *histogram,
+                         GimpHistogramChannel  channel,
+                         gint                  start,
+                         gint                  end)
+{
+  GimpHistogramPrivate *priv;
+  gint                  i;
+  gdouble               mean = 0.0;
+  gdouble               count;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0.0);
+
+  priv = histogram->priv;
+
+  if (! priv->values ||
+      start > end    ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0.0;
+    }
+
+  start = CLAMP (start, 0, priv->n_bins - 1);
+  end   = CLAMP (end,   0, priv->n_bins - 1);
+
+  if (channel == GIMP_HISTOGRAM_RGB)
+    {
+      for (i = start; i <= end; i++)
+        {
+          gdouble factor = (gdouble) i / (gdouble)  (priv->n_bins - 1);
+
+          mean += (factor * HISTOGRAM_VALUE (GIMP_HISTOGRAM_RED,   i) +
+                   factor * HISTOGRAM_VALUE (GIMP_HISTOGRAM_GREEN, i) +
+                   factor * HISTOGRAM_VALUE (GIMP_HISTOGRAM_BLUE,  i));
+        }
+    }
+  else
+    {
+      for (i = start; i <= end; i++)
+        {
+          gdouble factor = (gdouble) i / (gdouble)  (priv->n_bins - 1);
+
+          mean += factor * HISTOGRAM_VALUE (channel, i);
+        }
+    }
+
+  count = gimp_histogram_get_count (histogram, channel, start, end);
+
+  if (count > 0.0)
+    return mean / count;
+
+  return mean;
+}
+
+gdouble
+gimp_histogram_get_median (GimpHistogram         *histogram,
+                           GimpHistogramChannel   channel,
+                           gint                   start,
+                           gint                   end)
+{
+  GimpHistogramPrivate *priv;
+  gint                  i;
+  gdouble               sum = 0.0;
+  gdouble               count;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), -1.0);
+
+  priv = histogram->priv;
+
+  if (! priv->values ||
+      start > end    ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0.0;
+    }
+
+  start = CLAMP (start, 0, priv->n_bins - 1);
+  end   = CLAMP (end,   0, priv->n_bins - 1);
+
+  count = gimp_histogram_get_count (histogram, channel, start, end);
+
+  if (channel == GIMP_HISTOGRAM_RGB)
+    {
+      for (i = start; i <= end; i++)
+        {
+          sum += (HISTOGRAM_VALUE (GIMP_HISTOGRAM_RED,   i) +
+                  HISTOGRAM_VALUE (GIMP_HISTOGRAM_GREEN, i) +
+                  HISTOGRAM_VALUE (GIMP_HISTOGRAM_BLUE,  i));
+
+          if (sum * 2 > count)
+            return ((gdouble) i / (gdouble)  (priv->n_bins - 1));
+        }
+    }
+  else
+    {
+      for (i = start; i <= end; i++)
+        {
+          sum += HISTOGRAM_VALUE (channel, i);
+
+          if (sum * 2 > count)
+            return ((gdouble) i / (gdouble)  (priv->n_bins - 1));
+        }
+    }
+
+  return -1.0;
+}
+
+/*
+ * adapted from GNU ocrad 0.14 : page_image_io.cc : otsu_th
+ *
+ *  N. Otsu, "A threshold selection method from gray-level histograms,"
+ *  IEEE Trans. Systems, Man, and Cybernetics, vol. 9, no. 1, pp. 62-66, 1979.
+ */
+gdouble
+gimp_histogram_get_threshold (GimpHistogram        *histogram,
+                              GimpHistogramChannel  channel,
+                              gint                  start,
+                              gint                  end)
+{
+  GimpHistogramPrivate *priv;
+  gint                 i;
+  gint                 maxval;
+  gdouble             *hist      = NULL;
+  gdouble             *chist     = NULL;
+  gdouble             *cmom      = NULL;
+  gdouble              hist_max  = 0.0;
+  gdouble              chist_max = 0.0;
+  gdouble              cmom_max  = 0.0;
+  gdouble              bvar_max  = 0.0;
+  gint                 threshold = 127;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), -1);
+
+  priv = histogram->priv;
+
+  if (! priv->values ||
+      start > end    ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0;
+    }
+
+  start = CLAMP (start, 0, priv->n_bins - 1);
+  end   = CLAMP (end,   0, priv->n_bins - 1);
+
+  maxval = end - start;
+
+  hist  = g_newa (gdouble, maxval + 1);
+  chist = g_newa (gdouble, maxval + 1);
+  cmom  = g_newa (gdouble, maxval + 1);
+
+  if (channel == GIMP_HISTOGRAM_RGB)
+    {
+      for (i = start; i <= end; i++)
+        hist[i - start] = (HISTOGRAM_VALUE (GIMP_HISTOGRAM_RED,   i) +
+                           HISTOGRAM_VALUE (GIMP_HISTOGRAM_GREEN, i) +
+                           HISTOGRAM_VALUE (GIMP_HISTOGRAM_BLUE,  i));
+    }
+  else
+    {
+      for (i = start; i <= end; i++)
+        hist[i - start] = HISTOGRAM_VALUE (channel, i);
+    }
+
+  hist_max = hist[0];
+  chist[0] = hist[0];
+  cmom[0] = 0;
+
+  for (i = 1; i <= maxval; i++)
+    {
+      if (hist[i] > hist_max)
+        hist_max = hist[i];
+
+      chist[i] = chist[i-1] + hist[i];
+      cmom[i] = cmom[i-1] + i * hist[i];
+    }
+
+  chist_max = chist[maxval];
+  cmom_max = cmom[maxval];
+  bvar_max = 0;
+
+  for (i = 0; i < maxval; ++i)
+    {
+      if (chist[i] > 0 && chist[i] < chist_max)
+        {
+          gdouble bvar;
+
+          bvar = (gdouble) cmom[i] / chist[i];
+          bvar -= (cmom_max - cmom[i]) / (chist_max - chist[i]);
+          bvar *= bvar;
+          bvar *= chist[i];
+          bvar *= chist_max - chist[i];
+
+          if (bvar > bvar_max)
+            {
+              bvar_max = bvar;
+              threshold = start + i;
+            }
+        }
+    }
+
+  return threshold;
+}
+
+gdouble
+gimp_histogram_get_std_dev (GimpHistogram        *histogram,
+                            GimpHistogramChannel  channel,
+                            gint                  start,
+                            gint                  end)
+{
+  GimpHistogramPrivate *priv;
+  gint                  i;
+  gdouble               dev = 0.0;
+  gdouble               count;
+  gdouble               mean;
+
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM (histogram), 0.0);
+
+  priv = histogram->priv;
+
+  if (! priv->values ||
+      start > end    ||
+      ! gimp_histogram_map_channel (histogram, &channel))
+    {
+      return 0.0;
+    }
+
+  mean  = gimp_histogram_get_mean  (histogram, channel, start, end);
+  count = gimp_histogram_get_count (histogram, channel, start, end);
+
+  if (count == 0.0)
+    count = 1.0;
+
+  for (i = start; i <= end; i++)
+    {
+      gdouble value;
+
+      if (channel == GIMP_HISTOGRAM_RGB)
+        {
+          value = (HISTOGRAM_VALUE (GIMP_HISTOGRAM_RED,   i) +
+                   HISTOGRAM_VALUE (GIMP_HISTOGRAM_GREEN, i) +
+                   HISTOGRAM_VALUE (GIMP_HISTOGRAM_BLUE,  i));
+        }
+      else
+        {
+          value = gimp_histogram_get_value (histogram, channel, i);
+        }
+
+      dev += value * SQR (((gdouble) i / (gdouble)  (priv->n_bins - 1)) - mean);
+    }
+
+  return sqrt (dev / count);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_histogram_map_channel (GimpHistogram        *histogram,
+                            GimpHistogramChannel *channel)
+{
+  GimpHistogramPrivate *priv = histogram->priv;
+
+  if (*channel == GIMP_HISTOGRAM_RGB)
+    return gimp_histogram_n_components (histogram) >= 3;
+
+  switch (*channel)
+    {
+    case GIMP_HISTOGRAM_ALPHA:
+      if (gimp_histogram_n_components (histogram) == 2)
+        *channel = 1;
+      break;
+
+    case GIMP_HISTOGRAM_LUMINANCE:
+      *channel = gimp_histogram_n_components (histogram) + 1;
+      break;
+
+    default:
+      break;
+    }
+
+  return *channel < priv->n_channels;
+}
+
+static void
+gimp_histogram_set_values (GimpHistogram *histogram,
+                           gint           n_components,
+                           gint           n_bins,
+                           gdouble       *values)
+{
+  GimpHistogramPrivate *priv                = histogram->priv;
+  gint                  n_channels          = n_components;
+  gboolean              notify_n_components = FALSE;
+  gboolean              notify_n_bins       = FALSE;
+
+  if (n_channels > 0)
+    n_channels += N_DERIVED_CHANNELS;
+
+  if (n_channels != priv->n_channels)
+    {
+      priv->n_channels = n_channels;
+
+      notify_n_components = TRUE;
+    }
+
+  if (n_bins != priv->n_bins)
+    {
+      priv->n_bins = n_bins;
+
+      notify_n_bins = TRUE;
+    }
+
+  if (values != priv->values)
+    {
+      if (priv->values)
+        g_free (priv->values);
+
+      priv->values = values;
+    }
+
+  if (notify_n_components)
+    g_object_notify (G_OBJECT (histogram), "n-components");
+
+  if (notify_n_bins)
+    g_object_notify (G_OBJECT (histogram), "n-bins");
+
+  g_object_notify (G_OBJECT (histogram), "values");
+}
+
+static void
+gimp_histogram_calculate_internal (GimpAsync        *async,
+                                   CalculateContext *context)
+{
+  CalculateData         data;
+  GimpHistogramPrivate *priv;
+  const Babl           *format;
+
+  priv = context->histogram->priv;
+
+  format = gegl_buffer_get_format (context->buffer);
+
+  if (babl_format_get_type (format, 0) == babl_type ("u8"))
+    context->n_bins = 256;
+  else
+    context->n_bins = 1024;
+
+  if (babl_format_is_palette (format))
+    {
+      if (babl_format_has_alpha (format))
+        {
+          if (priv->linear)
+            format = babl_format ("RGB float");
+          else
+            format = babl_format ("R'G'B' float");
+        }
+      else
+        {
+          if (priv->linear)
+            format = babl_format ("RGBA float");
+          else
+            format = babl_format ("R'G'B'A float");
+        }
+    }
+  else
+    {
+      const Babl *model = babl_format_get_model (format);
+
+      if (model == babl_model ("Y") ||
+          model == babl_model ("Y'"))
+        {
+          if (priv->linear)
+            format = babl_format ("Y float");
+          else
+            format = babl_format ("Y' float");
+        }
+      else if (model == babl_model ("YA") ||
+               model == babl_model ("Y'A"))
+        {
+          if (priv->linear)
+            format = babl_format ("YA float");
+          else
+            format = babl_format ("Y'A float");
+        }
+      else if (model == babl_model ("RGB") ||
+               model == babl_model ("R'G'B'"))
+        {
+          if (priv->linear)
+            format = babl_format ("RGB float");
+          else
+            format = babl_format ("R'G'B' float");
+        }
+      else if (model == babl_model ("RGBA") ||
+               model == babl_model ("R'G'B'A"))
+        {
+          if (priv->linear)
+            format = babl_format ("RGBA float");
+          else
+            format = babl_format ("R'G'B'A float");
+        }
+      else
+        {
+          if (async)
+            gimp_async_abort (async);
+
+          g_return_if_reached ();
+        }
+    }
+
+  context->n_components = babl_format_get_n_components (format);
+
+  data.async       = async;
+  data.context     = context;
+  data.format      = format;
+  data.values_list = NULL;
+
+  gegl_parallel_distribute_area (
+    &context->buffer_rect, PIXELS_PER_THREAD, GEGL_SPLIT_STRATEGY_AUTO,
+    (GeglParallelDistributeAreaFunc) gimp_histogram_calculate_area,
+    &data);
+
+  if (! async || ! gimp_async_is_canceled (async))
+    {
+      gdouble *total_values = NULL;
+      gint     n_values     = (context->n_components + N_DERIVED_CHANNELS) *
+                              context->n_bins;
+      GSList  *iter;
+
+      for (iter = data.values_list; iter; iter = g_slist_next (iter))
+        {
+          gdouble *values = iter->data;
+
+          if (! total_values)
+            {
+              total_values = values;
+            }
+          else
+            {
+              gint i;
+
+              for (i = 0; i < n_values; i++)
+                total_values[i] += values[i];
+
+              g_free (values);
+            }
+        }
+
+      g_slist_free (data.values_list);
+
+      context->values = total_values;
+
+      if (async)
+        gimp_async_finish (async, NULL);
+    }
+  else
+    {
+      g_slist_free_full (data.values_list, g_free);
+
+      if (async)
+        gimp_async_abort (async);
+    }
+}
+
+static void
+gimp_histogram_calculate_area (const GeglRectangle *area,
+                               CalculateData       *data)
+{
+  GimpAsync            *async;
+  CalculateContext     *context;
+  GeglBufferIterator   *iter;
+  gdouble              *values;
+  gint                  n_components;
+  gint                  n_bins;
+  gfloat                n_bins_1f;
+  gfloat                temp;
+
+  async   = data->async;
+  context = data->context;
+
+  n_bins       = context->n_bins;
+  n_components = context->n_components;
+
+  values = g_new0 (gdouble, (n_components + N_DERIVED_CHANNELS) * n_bins);
+  gimp_atomic_slist_push_head (&data->values_list, values);
+
+  iter = gegl_buffer_iterator_new (context->buffer, area, 0,
+                                   data->format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+  if (context->mask)
+    {
+      GeglRectangle mask_area = *area;
+
+      mask_area.x += context->mask_rect.x - context->buffer_rect.x;
+      mask_area.y += context->mask_rect.y - context->buffer_rect.y;
+
+      gegl_buffer_iterator_add (iter, context->mask, &mask_area, 0,
+                                babl_format ("Y float"),
+                                GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+    }
+
+  n_bins_1f = n_bins - 1;
+
+#define VALUE(c,i) (*(temp = (i) * n_bins_1f,                                  \
+                      &values[(c) * n_bins +                                   \
+                              SIGNED_ROUND (SAFE_CLAMP (temp,                  \
+                                                        0.0f,                  \
+                                                        n_bins_1f))]))
+
+#define CHECK_CANCELED(length)                                                 \
+  G_STMT_START                                                                 \
+    {                                                                          \
+      if ((length) % 128 == 0 && async && gimp_async_is_canceled (async))      \
+        {                                                                      \
+          gegl_buffer_iterator_stop (iter);                                    \
+                                                                               \
+          return;                                                              \
+        }                                                                      \
+    }                                                                          \
+  G_STMT_END
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const gfloat *data   = iter->items[0].data;
+      gint          length = iter->length;
+      gfloat        max;
+      gfloat        luminance;
+
+      CHECK_CANCELED (0);
+
+      if (context->mask)
+        {
+          const gfloat *mask_data = iter->items[1].data;
+
+          switch (n_components)
+            {
+            case 1:
+              while (length--)
+                {
+                  const gdouble masked = *mask_data;
+
+                  VALUE (0, data[0]) += masked;
+
+                  data += n_components;
+                  mask_data += 1;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+
+            case 2:
+              while (length--)
+                {
+                  const gdouble masked = *mask_data;
+                  const gdouble weight = data[1];
+
+                  VALUE (0, data[0]) += weight * masked;
+                  VALUE (1, data[1]) += masked;
+
+                  data += n_components;
+                  mask_data += 1;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+
+            case 3: /* calculate separate value values */
+              while (length--)
+                {
+                  const gdouble masked = *mask_data;
+
+                  VALUE (1, data[0]) += masked;
+                  VALUE (2, data[1]) += masked;
+                  VALUE (3, data[2]) += masked;
+
+                  max = MAX (data[0], data[1]);
+                  max = MAX (data[2], max);
+                  VALUE (0, max) += masked;
+
+                  luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]);
+                  VALUE (4, luminance) += masked;
+
+                  data += n_components;
+                  mask_data += 1;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+
+            case 4: /* calculate separate value values */
+              while (length--)
+                {
+                  const gdouble masked = *mask_data;
+                  const gdouble weight = data[3];
+
+                  VALUE (1, data[0]) += weight * masked;
+                  VALUE (2, data[1]) += weight * masked;
+                  VALUE (3, data[2]) += weight * masked;
+                  VALUE (4, data[3]) += masked;
+
+                  max = MAX (data[0], data[1]);
+                  max = MAX (data[2], max);
+                  VALUE (0, max) += weight * masked;
+
+                  luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]);
+                  VALUE (5, luminance) += weight * masked;
+
+                  data += n_components;
+                  mask_data += 1;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+            }
+        }
+      else /* no mask */
+        {
+          switch (n_components)
+            {
+            case 1:
+              while (length--)
+                {
+                  VALUE (0, data[0]) += 1.0;
+
+                  data += n_components;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+
+            case 2:
+              while (length--)
+                {
+                  const gdouble weight = data[1];
+
+                  VALUE (0, data[0]) += weight;
+                  VALUE (1, data[1]) += 1.0;
+
+                  data += n_components;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+
+            case 3: /* calculate separate value values */
+              while (length--)
+                {
+                  VALUE (1, data[0]) += 1.0;
+                  VALUE (2, data[1]) += 1.0;
+                  VALUE (3, data[2]) += 1.0;
+
+                  max = MAX (data[0], data[1]);
+                  max = MAX (data[2], max);
+                  VALUE (0, max) += 1.0;
+
+                  luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]);
+                  VALUE (4, luminance) += 1.0;
+
+                  data += n_components;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+
+            case 4: /* calculate separate value values */
+              while (length--)
+                {
+                  const gdouble weight = data[3];
+
+                  VALUE (1, data[0]) += weight;
+                  VALUE (2, data[1]) += weight;
+                  VALUE (3, data[2]) += weight;
+                  VALUE (4, data[3]) += 1.0;
+
+                  max = MAX (data[0], data[1]);
+                  max = MAX (data[2], max);
+                  VALUE (0, max) += weight;
+
+                  luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]);
+                  VALUE (5, luminance) += weight;
+
+                  data += n_components;
+
+                  CHECK_CANCELED (length);
+                }
+              break;
+            }
+        }
+    }
+
+#undef VALUE
+#undef CHECK_CANCELED
+}
+
+static void
+gimp_histogram_calculate_async_callback (GimpAsync        *async,
+                                         CalculateContext *context)
+{
+  context->histogram->priv->calculate_async = NULL;
+
+  if (gimp_async_is_finished (async))
+    {
+      gimp_histogram_set_values (context->histogram,
+                                 context->n_components, context->n_bins,
+                                 context->values);
+    }
+
+  g_object_unref (context->buffer);
+  if (context->mask)
+    g_object_unref (context->mask);
+
+  g_slice_free (CalculateContext, context);
+}
diff --git a/app/core/gimphistogram.h b/app/core/gimphistogram.h
new file mode 100644
index 0000000..ba1e0ef
--- /dev/null
+++ b/app/core/gimphistogram.h
@@ -0,0 +1,105 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphistogram module Copyright (C) 1999 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HISTOGRAM_H__
+#define __GIMP_HISTOGRAM_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_HISTOGRAM            (gimp_histogram_get_type ())
+#define GIMP_HISTOGRAM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM, GimpHistogram))
+#define GIMP_HISTOGRAM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM, GimpHistogramClass))
+#define GIMP_IS_HISTOGRAM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HISTOGRAM))
+#define GIMP_IS_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HISTOGRAM))
+#define GIMP_HISTOGRAM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HISTOGRAM, GimpHistogramClass))
+
+
+typedef struct _GimpHistogramPrivate GimpHistogramPrivate;
+typedef struct _GimpHistogramClass   GimpHistogramClass;
+
+struct _GimpHistogram
+{
+  GimpObject            parent_instance;
+
+  GimpHistogramPrivate *priv;
+};
+
+struct _GimpHistogramClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType           gimp_histogram_get_type        (void) G_GNUC_CONST;
+
+GimpHistogram * gimp_histogram_new             (gboolean              linear);
+
+GimpHistogram * gimp_histogram_duplicate       (GimpHistogram        *histogram);
+
+void            gimp_histogram_calculate       (GimpHistogram        *histogram,
+                                                GeglBuffer           *buffer,
+                                                const GeglRectangle  *buffer_rect,
+                                                GeglBuffer           *mask,
+                                                const GeglRectangle  *mask_rect);
+GimpAsync     * gimp_histogram_calculate_async (GimpHistogram        *histogram,
+                                                GeglBuffer           *buffer,
+                                                const GeglRectangle  *buffer_rect,
+                                                GeglBuffer           *mask,
+                                                const GeglRectangle  *mask_rect);
+
+void            gimp_histogram_clear_values    (GimpHistogram        *histogram,
+                                                gint                  n_components);
+
+gdouble         gimp_histogram_get_maximum     (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel);
+gdouble         gimp_histogram_get_count       (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel,
+                                                gint                  start,
+                                                gint                  end);
+gdouble         gimp_histogram_get_mean        (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel,
+                                                gint                  start,
+                                                gint                  end);
+gdouble         gimp_histogram_get_median      (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel,
+                                                gint                  start,
+                                                gint                  end);
+gdouble         gimp_histogram_get_std_dev     (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel,
+                                                gint                  start,
+                                                gint                  end);
+gdouble         gimp_histogram_get_threshold   (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel,
+                                                gint                  start,
+                                                gint                  end);
+gdouble         gimp_histogram_get_value       (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel,
+                                                gint                  bin);
+gdouble         gimp_histogram_get_component   (GimpHistogram        *histogram,
+                                                gint                  component,
+                                                gint                  bin);
+gint            gimp_histogram_n_components    (GimpHistogram        *histogram);
+gint            gimp_histogram_n_bins          (GimpHistogram        *histogram);
+gboolean        gimp_histogram_has_channel     (GimpHistogram        *histogram,
+                                                GimpHistogramChannel  channel);
+
+
+#endif /* __GIMP_HISTOGRAM_H__ */
diff --git a/app/core/gimpidtable.c b/app/core/gimpidtable.c
new file mode 100644
index 0000000..b69a13d
--- /dev/null
+++ b/app/core/gimpidtable.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpidtable.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpidtable.h"
+
+
+#define GIMP_ID_TABLE_START_ID 1
+#define GIMP_ID_TABLE_END_ID   G_MAXINT
+
+
+struct _GimpIdTablePrivate
+{
+  GHashTable *id_table;
+  gint        next_id;
+};
+
+
+static void    gimp_id_table_finalize    (GObject    *object);
+static gint64  gimp_id_table_get_memsize (GimpObject *object,
+                                          gint64     *gui_size);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpIdTable, gimp_id_table, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_id_table_parent_class
+
+
+static void
+gimp_id_table_class_init (GimpIdTableClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->finalize         = gimp_id_table_finalize;
+
+  gimp_object_class->get_memsize = gimp_id_table_get_memsize;
+}
+
+static void
+gimp_id_table_init (GimpIdTable *id_table)
+{
+  id_table->priv = gimp_id_table_get_instance_private (id_table);
+
+  id_table->priv->id_table = g_hash_table_new (g_direct_hash, NULL);
+  id_table->priv->next_id  = GIMP_ID_TABLE_START_ID;
+}
+
+static void
+gimp_id_table_finalize (GObject *object)
+{
+  GimpIdTable *id_table = GIMP_ID_TABLE (object);
+
+  g_clear_pointer (&id_table->priv->id_table, g_hash_table_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_id_table_get_memsize (GimpObject *object,
+                           gint64     *gui_size)
+{
+  GimpIdTable *id_table = GIMP_ID_TABLE (object);
+  gint64       memsize  = 0;
+
+  memsize += gimp_g_hash_table_get_memsize (id_table->priv->id_table, 0);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+/**
+ * gimp_id_table_new:
+ *
+ * Returns: A new #GimpIdTable.
+ **/
+GimpIdTable *
+gimp_id_table_new (void)
+{
+  return g_object_new (GIMP_TYPE_ID_TABLE, NULL);
+}
+
+/**
+ * gimp_id_table_insert:
+ * @id_table: A #GimpIdTable
+ * @data: Data to insert and assign an id to
+ *
+ * Insert data in the id table. The data will get an, in this table,
+ * unused ID assigned to it that can be used to later lookup the data.
+ *
+ * Returns: The assigned ID.
+ **/
+gint
+gimp_id_table_insert (GimpIdTable *id_table, gpointer data)
+{
+  gint new_id;
+  gint start_id;
+
+  g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), 0);
+
+  start_id = id_table->priv->next_id;
+
+  do
+    {
+      new_id = id_table->priv->next_id++;
+
+      if (id_table->priv->next_id == GIMP_ID_TABLE_END_ID)
+        id_table->priv->next_id = GIMP_ID_TABLE_START_ID;
+
+      if (start_id == id_table->priv->next_id)
+        {
+          /* We looped once over all used ids. Very unlikely to happen.
+             And if it does, there is probably not much to be done.
+             It is just good design not to allow a theoretical infinite loop. */
+          g_error ("%s: out of ids!", G_STRFUNC);
+          break;
+        }
+    }
+  while (gimp_id_table_lookup (id_table, new_id));
+
+  return gimp_id_table_insert_with_id (id_table, new_id, data);
+}
+
+/**
+ * gimp_id_table_insert_with_id:
+ * @id_table: An #GimpIdTable
+ * @id: The ID to use. Must be greater than 0.
+ * @data: The data to associate with the id
+ *
+ * Insert data in the id table with a specific ID. If data already
+ * exsts with the given ID, this function fails.
+ *
+ * Returns: The used ID if successful, -1 if it was already in use.
+ **/
+gint
+gimp_id_table_insert_with_id (GimpIdTable *id_table, gint id, gpointer data)
+{
+  g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), 0);
+  g_return_val_if_fail (id > 0, 0);
+
+  if (gimp_id_table_lookup (id_table, id))
+    return -1;
+
+  g_hash_table_insert (id_table->priv->id_table, GINT_TO_POINTER (id), data);
+
+  return id;
+}
+
+/**
+ * gimp_id_table_replace:
+ * @id_table: An #GimpIdTable
+ * @id: The ID to use. Must be greater than 0.
+ * @data: The data to insert/replace
+ *
+ * Replaces (if an item with the given ID exists) or inserts a new
+ * entry in the id table.
+ **/
+void
+gimp_id_table_replace (GimpIdTable *id_table, gint id, gpointer data)
+{
+  g_return_if_fail (GIMP_IS_ID_TABLE (id_table));
+  g_return_if_fail (id > 0);
+
+  g_hash_table_replace (id_table->priv->id_table, GINT_TO_POINTER (id), data);
+}
+
+/**
+ * gimp_id_table_lookup:
+ * @id_table: An #GimpIdTable
+ * @id: The ID of the data to lookup
+ *
+ * Lookup data based on ID.
+ *
+ * Returns: The data, or NULL if no data with the given ID was found.
+ **/
+gpointer
+gimp_id_table_lookup (GimpIdTable *id_table, gint id)
+{
+  g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), NULL);
+
+  return g_hash_table_lookup (id_table->priv->id_table, GINT_TO_POINTER (id));
+}
+
+
+/**
+ * gimp_id_table_remove:
+ * @id_table: An #GimpIdTable
+ * @id: The ID of the data to remove.
+ *
+ * Remove the data from the table with the given ID.
+ *
+ * Returns: %TRUE if data with the ID existed and was successfully
+ *          removed, %FALSE otherwise.
+ **/
+gboolean
+gimp_id_table_remove (GimpIdTable *id_table, gint id)
+{
+  g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), FALSE);
+
+  g_return_val_if_fail (id_table != NULL, FALSE);
+
+  return g_hash_table_remove (id_table->priv->id_table, GINT_TO_POINTER (id));
+}
diff --git a/app/core/gimpidtable.h b/app/core/gimpidtable.h
new file mode 100644
index 0000000..88097fd
--- /dev/null
+++ b/app/core/gimpidtable.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpidtable.h
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ID_TABLE_H__
+#define __GIMP_ID_TABLE_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_ID_TABLE            (gimp_id_table_get_type ())
+#define GIMP_ID_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ID_TABLE, GimpIdTable))
+#define GIMP_ID_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ID_TABLE, GimpIdTableClass))
+#define GIMP_IS_ID_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ID_TABLE))
+#define GIMP_IS_ID_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ID_TABLE))
+#define GIMP_ID_TABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ID_TABLE, GimpIdTableClass))
+
+
+typedef struct _GimpIdTableClass   GimpIdTableClass;
+typedef struct _GimpIdTablePrivate GimpIdTablePrivate;
+
+struct _GimpIdTable
+{
+  GimpObject          parent_instance;
+
+  GimpIdTablePrivate *priv;
+};
+
+struct _GimpIdTableClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType          gimp_id_table_get_type       (void) G_GNUC_CONST;
+GimpIdTable *  gimp_id_table_new            (void);
+gint           gimp_id_table_insert         (GimpIdTable *id_table,
+                                             gpointer     data);
+gint           gimp_id_table_insert_with_id (GimpIdTable *id_table,
+                                             gint         id,
+                                             gpointer     data);
+void           gimp_id_table_replace        (GimpIdTable *id_table,
+                                             gint         id,
+                                             gpointer     data);
+gpointer       gimp_id_table_lookup         (GimpIdTable *id_table,
+                                             gint         id);
+gboolean       gimp_id_table_remove         (GimpIdTable *id_table,
+                                             gint         id);
+
+
+#endif  /*  __GIMP_ID_TABLE_H__  */
diff --git a/app/core/gimpimage-arrange.c b/app/core/gimpimage-arrange.c
new file mode 100644
index 0000000..6b6b05e
--- /dev/null
+++ b/app/core/gimpimage-arrange.c
@@ -0,0 +1,388 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpimage-arrange.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-undo.h"
+#include "gimpitem.h"
+#include "gimpguide.h"
+
+#include "gimp-intl.h"
+
+
+static GList * sort_by_offset  (GList             *list);
+static void    compute_offsets (GList             *list,
+                                GimpAlignmentType  alignment);
+static void    compute_offset  (GObject           *object,
+                                GimpAlignmentType  alignment);
+static gint    offset_compare  (gconstpointer      a,
+                                gconstpointer      b);
+
+
+/**
+ * gimp_image_arrange_objects:
+ * @image:                The #GimpImage to which the objects belong.
+ * @list:                 A #GList of objects to be aligned.
+ * @alignment:            The point on each target object to bring into alignment.
+ * @reference:            The #GObject to align the targets with, or #NULL.
+ * @reference_alignment:  The point on the reference object to align the target item with..
+ * @offset:               How much to shift the target from perfect alignment..
+ *
+ * This function shifts the positions of a set of target objects,
+ * which can be "items" or guides, to bring them into a specified type
+ * of alignment with a reference object, which can be an item, guide,
+ * or image.  If the requested alignment does not make sense (i.e.,
+ * trying to align a vertical guide vertically), nothing happens and
+ * no error message is generated.
+ *
+ * The objects in the list are sorted into increasing order before
+ * being arranged, where the order is defined by the type of alignment
+ * being requested.  If the @reference argument is #NULL, then the
+ * first object in the sorted list is used as reference.
+ *
+ * When there are multiple target objects, they are arranged so that
+ * the spacing between consecutive ones is given by the argument
+ * @offset but for HFILL and VFILL - in this case, @offset works as an
+ * internal margin for the distribution (and it can be negative).
+ */
+void
+gimp_image_arrange_objects (GimpImage         *image,
+                            GList             *list,
+                            GimpAlignmentType  alignment,
+                            GObject           *reference,
+                            GimpAlignmentType  reference_alignment,
+                            gint               offset)
+{
+  gboolean do_x = FALSE;
+  gboolean do_y = FALSE;
+  gint     z0   = 0;
+  GList   *object_list;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (G_IS_OBJECT (reference) || reference == NULL);
+
+  /* get offsets used for sorting */
+  switch (alignment)
+    {
+      /* order vertically for horizontal alignment */
+    case GIMP_ALIGN_LEFT:
+    case GIMP_ALIGN_HCENTER:
+    case GIMP_ALIGN_RIGHT:
+      do_x = TRUE;
+      compute_offsets (list, GIMP_ALIGN_TOP);
+      break;
+
+      /* order horizontally for horizontal arrangement */
+    case GIMP_ARRANGE_LEFT:
+    case GIMP_ARRANGE_HCENTER:
+    case GIMP_ARRANGE_RIGHT:
+    case GIMP_ARRANGE_HFILL:
+      do_x = TRUE;
+      compute_offsets (list, alignment);
+      break;
+
+      /* order horizontally for vertical alignment */
+    case GIMP_ALIGN_TOP:
+    case GIMP_ALIGN_VCENTER:
+    case GIMP_ALIGN_BOTTOM:
+      do_y = TRUE;
+      compute_offsets (list, GIMP_ALIGN_LEFT);
+      break;
+
+      /* order vertically for vertical arrangement */
+    case GIMP_ARRANGE_TOP:
+    case GIMP_ARRANGE_VCENTER:
+    case GIMP_ARRANGE_BOTTOM:
+    case GIMP_ARRANGE_VFILL:
+      do_y = TRUE;
+      compute_offsets (list, alignment);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  object_list = sort_by_offset (list);
+
+  /* now get offsets used for aligning */
+  compute_offsets (list, alignment);
+
+  if (reference == NULL)
+    {
+      reference = G_OBJECT (object_list->data);
+      object_list = g_list_next (object_list);
+      reference_alignment = alignment;
+    }
+  else
+    {
+      compute_offset (reference, reference_alignment);
+    }
+
+  z0 = GPOINTER_TO_INT (g_object_get_data (reference, "align-offset"));
+
+  if (object_list)
+    {
+      GList   *list;
+      gint     n;
+      gint     distr_width  = 0;
+      gint     distr_height = 0;
+      gdouble  fill_offset  = 0;
+
+      if (reference_alignment == GIMP_ARRANGE_HFILL)
+        {
+          distr_width = GPOINTER_TO_INT (g_object_get_data
+                                         (reference, "align-width"));
+          /* The offset parameter works as an internal margin */
+          fill_offset = (distr_width - 2 * offset) /
+                         (gint) g_list_length (object_list);
+        }
+      if (reference_alignment == GIMP_ARRANGE_VFILL)
+        {
+          distr_height = GPOINTER_TO_INT (g_object_get_data
+                                          (reference, "align-height"));
+          fill_offset = (distr_height - 2 * offset) /
+                         (gint) g_list_length (object_list);
+        }
+
+      /* FIXME: undo group type is wrong */
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_DISPLACE,
+                                   C_("undo-type", "Arrange Objects"));
+
+      for (list = object_list, n = 1;
+           list;
+           list = g_list_next (list), n++)
+        {
+          GObject *target     = list->data;
+          gint     xtranslate = 0;
+          gint     ytranslate = 0;
+          gint     z1;
+
+          z1 = GPOINTER_TO_INT (g_object_get_data (target, "align-offset"));
+
+          if (reference_alignment == GIMP_ARRANGE_HFILL)
+            {
+              gint width = GPOINTER_TO_INT (g_object_get_data (target,
+                                                               "align-width"));
+              xtranslate = ROUND (z0 - z1 + (n - 0.5) * fill_offset -
+                                  width / 2.0 + offset);
+            }
+          else if (reference_alignment == GIMP_ARRANGE_VFILL)
+            {
+              gint height = GPOINTER_TO_INT (g_object_get_data (target,
+                                                                "align-height"));
+              ytranslate =  ROUND (z0 - z1 + (n - 0.5) * fill_offset -
+                                   height / 2.0 + offset);
+            }
+          else /* the normal computing, when we don't depend on the
+                * width or height of the reference object
+                */
+            {
+              if (do_x)
+                xtranslate = z0 - z1 + n * offset;
+
+              if (do_y)
+                ytranslate = z0 - z1 + n * offset;
+            }
+
+          /* now actually align the target object */
+          if (GIMP_IS_ITEM (target))
+            {
+              gimp_item_translate (GIMP_ITEM (target),
+                                   xtranslate, ytranslate, TRUE);
+            }
+          else if (GIMP_IS_GUIDE (target))
+            {
+              GimpGuide *guide = GIMP_GUIDE (target);
+
+              switch (gimp_guide_get_orientation (guide))
+                {
+                case GIMP_ORIENTATION_VERTICAL:
+                  gimp_image_move_guide (image, guide, z1 + xtranslate, TRUE);
+                  break;
+
+                case GIMP_ORIENTATION_HORIZONTAL:
+                  gimp_image_move_guide (image, guide, z1 + ytranslate, TRUE);
+                  break;
+
+                default:
+                  break;
+                }
+            }
+        }
+
+      gimp_image_undo_group_end (image);
+    }
+
+  g_list_free (object_list);
+}
+
+static GList *
+sort_by_offset (GList *list)
+{
+  return g_list_sort (g_list_copy (list),
+                      offset_compare);
+
+}
+
+static gint
+offset_compare (gconstpointer a,
+                gconstpointer b)
+{
+  gint offset1 = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a),
+                                                     "align-offset"));
+  gint offset2 = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b),
+                                                     "align-offset"));
+
+  return offset1 - offset2;
+}
+
+/* this function computes the position of the alignment point
+ * for each object in the list, and attaches it to the
+ * object as object data.
+ */
+static void
+compute_offsets (GList             *list,
+                 GimpAlignmentType  alignment)
+{
+  GList *l;
+
+  for (l = list; l; l = g_list_next (l))
+    compute_offset (l->data, alignment);
+}
+
+static void
+compute_offset (GObject           *object,
+                GimpAlignmentType  alignment)
+{
+  gint object_offset_x = 0;
+  gint object_offset_y = 0;
+  gint object_height   = 0;
+  gint object_width    = 0;
+  gint offset          = 0;
+
+  if (GIMP_IS_IMAGE (object))
+    {
+      GimpImage *image = GIMP_IMAGE (object);
+
+      object_offset_x = 0;
+      object_offset_y = 0;
+      object_height   = gimp_image_get_height (image);
+      object_width    = gimp_image_get_width (image);
+    }
+  else if (GIMP_IS_ITEM (object))
+    {
+      GimpItem *item = GIMP_ITEM (object);
+      gint      off_x, off_y;
+
+      gimp_item_bounds (item,
+                        &object_offset_x,
+                        &object_offset_y,
+                        &object_width,
+                        &object_height);
+
+      gimp_item_get_offset (item, &off_x, &off_y);
+      object_offset_x += off_x;
+      object_offset_y += off_y;
+    }
+  else if (GIMP_IS_GUIDE (object))
+    {
+      GimpGuide *guide = GIMP_GUIDE (object);
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_VERTICAL:
+          object_offset_x = gimp_guide_get_position (guide);
+          object_width = 0;
+          break;
+
+        case GIMP_ORIENTATION_HORIZONTAL:
+          object_offset_y = gimp_guide_get_position (guide);
+          object_height = 0;
+          break;
+
+        default:
+          break;
+        }
+    }
+  else
+    {
+      g_printerr ("Alignment object is not an image, item or guide.\n");
+    }
+
+  switch (alignment)
+    {
+    case GIMP_ALIGN_LEFT:
+    case GIMP_ARRANGE_LEFT:
+    case GIMP_ARRANGE_HFILL:
+      offset = object_offset_x;
+      break;
+
+    case GIMP_ALIGN_HCENTER:
+    case GIMP_ARRANGE_HCENTER:
+      offset = object_offset_x + object_width / 2;
+      break;
+
+    case GIMP_ALIGN_RIGHT:
+    case GIMP_ARRANGE_RIGHT:
+      offset = object_offset_x + object_width;
+      break;
+
+    case GIMP_ALIGN_TOP:
+    case GIMP_ARRANGE_TOP:
+    case GIMP_ARRANGE_VFILL:
+      offset = object_offset_y;
+      break;
+
+    case GIMP_ALIGN_VCENTER:
+    case GIMP_ARRANGE_VCENTER:
+      offset = object_offset_y + object_height / 2;
+      break;
+
+    case GIMP_ALIGN_BOTTOM:
+    case GIMP_ARRANGE_BOTTOM:
+      offset = object_offset_y + object_height;
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  g_object_set_data (object, "align-offset",
+                     GINT_TO_POINTER (offset));
+
+  /* These are only used for HFILL and VFILL, but since the call to
+   * gimp_image_arrange_objects allows for two different alignments
+   * (object and reference_alignment) we better be on the safe side in
+   * case they differ.  (the current implementation of the align tool
+   * always pass the same value to both parameters)
+   */
+  g_object_set_data (object, "align-width",
+                     GINT_TO_POINTER (object_width));
+
+  g_object_set_data (object, "align-height",
+                     GINT_TO_POINTER (object_height));
+}
diff --git a/app/core/gimpimage-arrange.h b/app/core/gimpimage-arrange.h
new file mode 100644
index 0000000..1109a5d
--- /dev/null
+++ b/app/core/gimpimage-arrange.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_ARRANGE_H__
+#define __GIMP_IMAGE_ARRANGE_H__
+
+
+void gimp_image_arrange_objects (GimpImage         *image,
+                                 GList             *list,
+                                 GimpAlignmentType  alignment,
+                                 GObject           *reference,
+                                 GimpAlignmentType  reference_alignment,
+                                 gint               offset);
+
+#endif  /*  __GIMP_IMAGE_ARRANGE_H__  */
diff --git a/app/core/gimpimage-color-profile.c b/app/core/gimpimage-color-profile.c
new file mode 100644
index 0000000..a7030f3
--- /dev/null
+++ b/app/core/gimpimage-color-profile.c
@@ -0,0 +1,822 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-color-profile.c
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimpdrawable.h"
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_image_convert_profile_layers   (GimpImage                *image,
+                                                   GimpColorProfile         *src_profile,
+                                                   GimpColorProfile         *dest_profile,
+                                                   GimpColorRenderingIntent  intent,
+                                                   gboolean                  bpc,
+                                                   GimpProgress             *progress);
+static void   gimp_image_convert_profile_colormap (GimpImage                *image,
+                                                   GimpColorProfile         *src_profile,
+                                                   GimpColorProfile         *dest_profile,
+                                                   GimpColorRenderingIntent  intent,
+                                                   gboolean                  bpc,
+                                                   GimpProgress             *progress);
+
+static void   gimp_image_create_color_transforms  (GimpImage                *image);
+
+
+/*  public functions  */
+
+gboolean
+gimp_image_get_is_color_managed (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->is_color_managed;
+}
+
+void
+gimp_image_set_is_color_managed (GimpImage *image,
+                                 gboolean   is_color_managed,
+                                 gboolean   push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  is_color_managed = is_color_managed ? TRUE : FALSE;
+
+  if (is_color_managed != private->is_color_managed)
+    {
+      if (push_undo)
+        gimp_image_undo_push_image_color_managed (image, NULL);
+
+      private->is_color_managed = is_color_managed;
+
+      gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image));
+    }
+}
+
+gboolean
+gimp_image_validate_icc_parasite (GimpImage           *image,
+                                  const GimpParasite  *icc_parasite,
+                                  gboolean            *is_builtin,
+                                  GError             **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (icc_parasite != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (strcmp (gimp_parasite_name (icc_parasite),
+              GIMP_ICC_PROFILE_PARASITE_NAME) != 0)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("ICC profile validation failed: "
+                             "Parasite's name is not 'icc-profile'"));
+      return FALSE;
+    }
+
+  if (gimp_parasite_flags (icc_parasite) != (GIMP_PARASITE_PERSISTENT |
+                                             GIMP_PARASITE_UNDOABLE))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("ICC profile validation failed: "
+                             "Parasite's flags are not (PERSISTENT | UNDOABLE)"));
+      return FALSE;
+    }
+
+  return gimp_image_validate_icc_profile (image,
+                                          gimp_parasite_data (icc_parasite),
+                                          gimp_parasite_data_size (icc_parasite),
+                                          is_builtin,
+                                          error);
+}
+
+const GimpParasite *
+gimp_image_get_icc_parasite (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_parasite_find (image, GIMP_ICC_PROFILE_PARASITE_NAME);
+}
+
+void
+gimp_image_set_icc_parasite (GimpImage          *image,
+                             const GimpParasite *icc_parasite)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  if (icc_parasite)
+    {
+      g_return_if_fail (gimp_image_validate_icc_parasite (image, icc_parasite,
+                                                          NULL, NULL) == TRUE);
+
+      gimp_image_parasite_attach (image, icc_parasite, TRUE);
+    }
+  else
+    {
+      gimp_image_parasite_detach (image, GIMP_ICC_PROFILE_PARASITE_NAME, TRUE);
+    }
+}
+
+gboolean
+gimp_image_validate_icc_profile (GimpImage     *image,
+                                 const guint8  *data,
+                                 gsize          length,
+                                 gboolean      *is_builtin,
+                                 GError       **error)
+{
+  GimpColorProfile *profile;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (data != NULL || length == 0, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  profile = gimp_color_profile_new_from_icc_profile (data, length, error);
+
+  if (! profile)
+    {
+      g_prefix_error (error, _("ICC profile validation failed: "));
+      return FALSE;
+    }
+
+  if (! gimp_image_validate_color_profile (image, profile, is_builtin, error))
+    {
+      g_object_unref (profile);
+      return FALSE;
+    }
+
+  g_object_unref (profile);
+
+  return TRUE;
+}
+
+const guint8 *
+gimp_image_get_icc_profile (GimpImage *image,
+                            gsize     *length)
+{
+  const GimpParasite *parasite;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  parasite = gimp_image_parasite_find (image, GIMP_ICC_PROFILE_PARASITE_NAME);
+
+  if (parasite)
+    {
+      if (length)
+        *length = gimp_parasite_data_size (parasite);
+
+      return gimp_parasite_data (parasite);
+    }
+
+  if (length)
+    *length = 0;
+
+  return NULL;
+}
+
+gboolean
+gimp_image_set_icc_profile (GimpImage     *image,
+                            const guint8  *data,
+                            gsize          length,
+                            GError       **error)
+{
+  GimpParasite *parasite = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (data == NULL || length != 0, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (data)
+    {
+      gboolean is_builtin;
+
+      parasite = gimp_parasite_new (GIMP_ICC_PROFILE_PARASITE_NAME,
+                                    GIMP_PARASITE_PERSISTENT |
+                                    GIMP_PARASITE_UNDOABLE,
+                                    length, data);
+
+      if (! gimp_image_validate_icc_parasite (image, parasite, &is_builtin,
+                                              error))
+        {
+          gimp_parasite_free (parasite);
+          return FALSE;
+        }
+
+      /*  don't tag the image with the built-in profile  */
+      if (is_builtin)
+        {
+          gimp_parasite_free (parasite);
+          parasite = NULL;
+        }
+    }
+
+  gimp_image_set_icc_parasite (image, parasite);
+
+  if (parasite)
+    gimp_parasite_free (parasite);
+
+  return TRUE;
+}
+
+gboolean
+gimp_image_validate_color_profile (GimpImage        *image,
+                                   GimpColorProfile *profile,
+                                   gboolean         *is_builtin,
+                                   GError          **error)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_COLOR_PROFILE (profile), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  format = gimp_image_get_layer_format (image, TRUE);
+
+  return gimp_image_validate_color_profile_by_format (format,
+                                                      profile, is_builtin,
+                                                      error);
+}
+
+GimpColorProfile *
+gimp_image_get_color_profile (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->color_profile;
+}
+
+gboolean
+gimp_image_set_color_profile (GimpImage         *image,
+                              GimpColorProfile  *profile,
+                              GError           **error)
+{
+  const guint8 *data   = NULL;
+  gsize         length = 0;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (profile == NULL || GIMP_IS_COLOR_PROFILE (profile),
+                        FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (profile)
+    data = gimp_color_profile_get_icc_profile (profile, &length);
+
+  return gimp_image_set_icc_profile (image, data, length, error);
+}
+
+gboolean
+gimp_image_validate_color_profile_by_format (const Babl         *format,
+                                             GimpColorProfile   *profile,
+                                             gboolean           *is_builtin,
+                                             GError            **error)
+{
+  g_return_val_if_fail (format != NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_COLOR_PROFILE (profile), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_babl_format_get_base_type (format) == GIMP_GRAY)
+    {
+      if (! gimp_color_profile_is_gray (profile))
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("ICC profile validation failed: "
+                                 "Color profile is not for grayscale color space"));
+          return FALSE;
+        }
+    }
+  else
+    {
+      if (! gimp_color_profile_is_rgb (profile))
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("ICC profile validation failed: "
+                                 "Color profile is not for RGB color space"));
+          return FALSE;
+        }
+    }
+
+  if (is_builtin)
+    {
+      GimpColorProfile *builtin;
+
+      builtin = gimp_babl_format_get_color_profile (format);
+
+      *is_builtin = gimp_color_profile_is_equal (profile, builtin);
+    }
+
+  return TRUE;
+}
+
+GimpColorProfile *
+gimp_image_get_builtin_color_profile (GimpImage *image)
+{
+  const Babl *format;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  format = gimp_image_get_layer_format (image, FALSE);
+
+  return gimp_babl_format_get_color_profile (format);
+}
+
+gboolean
+gimp_image_convert_color_profile (GimpImage                *image,
+                                  GimpColorProfile         *dest_profile,
+                                  GimpColorRenderingIntent  intent,
+                                  gboolean                  bpc,
+                                  GimpProgress             *progress,
+                                  GError                  **error)
+{
+  GimpColorProfile *src_profile;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_COLOR_PROFILE (dest_profile), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_image_validate_color_profile (image, dest_profile, NULL, error))
+    return FALSE;
+
+  src_profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+  if (! src_profile || gimp_color_profile_is_equal (src_profile, dest_profile))
+    return TRUE;
+
+  if (progress)
+    gimp_progress_start (progress, FALSE,
+                         _("Converting from '%s' to '%s'"),
+                         gimp_color_profile_get_label (src_profile),
+                         gimp_color_profile_get_label (dest_profile));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CONVERT,
+                               _("Color profile conversion"));
+
+  switch (gimp_image_get_base_type (image))
+    {
+    case GIMP_RGB:
+    case GIMP_GRAY:
+      gimp_image_convert_profile_layers (image,
+                                         src_profile, dest_profile,
+                                         intent, bpc,
+                                         progress);
+      break;
+
+    case GIMP_INDEXED:
+      gimp_image_convert_profile_colormap (image,
+                                           src_profile, dest_profile,
+                                           intent, bpc,
+                                           progress);
+      break;
+    }
+
+  gimp_image_set_is_color_managed (image, TRUE, TRUE);
+  gimp_image_set_color_profile (image, dest_profile, NULL);
+  /*  omg...  */
+  gimp_image_parasite_detach (image, "icc-profile-name", TRUE);
+
+  gimp_image_undo_group_end (image);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  return TRUE;
+}
+
+void
+gimp_image_import_color_profile (GimpImage    *image,
+                                 GimpContext  *context,
+                                 GimpProgress *progress,
+                                 gboolean      interactive)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  if (gimp_image_get_is_color_managed (image) &&
+      gimp_image_get_color_profile (image))
+    {
+      GimpColorProfilePolicy     policy;
+      GimpColorProfile          *dest_profile = NULL;
+      GimpColorRenderingIntent   intent;
+      gboolean                   bpc;
+
+      policy = GIMP_DIALOG_CONFIG (image->gimp->config)->color_profile_policy;
+      intent = GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC;
+      bpc    = TRUE;
+
+      if (policy == GIMP_COLOR_PROFILE_POLICY_ASK)
+        {
+          if (interactive)
+            {
+              gboolean dont_ask = FALSE;
+
+              policy = gimp_query_profile_policy (image->gimp, image, context,
+                                                  &dest_profile,
+                                                  &intent, &bpc,
+                                                  &dont_ask);
+
+              if (dont_ask)
+                {
+                  g_object_set (G_OBJECT (image->gimp->config),
+                                "color-profile-policy", policy,
+                                NULL);
+                }
+            }
+          else
+            {
+              policy = GIMP_COLOR_PROFILE_POLICY_KEEP;
+            }
+        }
+
+      if (policy == GIMP_COLOR_PROFILE_POLICY_CONVERT)
+        {
+          if (! dest_profile)
+            {
+              dest_profile = gimp_image_get_builtin_color_profile (image);
+              g_object_ref (dest_profile);
+            }
+
+          gimp_image_convert_color_profile (image, dest_profile,
+                                            intent, bpc,
+                                            progress, NULL);
+
+          g_object_unref (dest_profile);
+        }
+    }
+}
+
+GimpColorTransform *
+gimp_image_get_color_transform_to_srgb_u8 (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  gimp_image_create_color_transforms (image);
+
+  if (private->is_color_managed)
+    return private->transform_to_srgb_u8;
+
+  return NULL;
+}
+
+GimpColorTransform *
+gimp_image_get_color_transform_from_srgb_u8 (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  gimp_image_create_color_transforms (image);
+
+  if (private->is_color_managed)
+    return private->transform_from_srgb_u8;
+
+  return NULL;
+}
+
+GimpColorTransform *
+gimp_image_get_color_transform_to_srgb_double (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  gimp_image_create_color_transforms (image);
+
+  if (private->is_color_managed)
+    return private->transform_to_srgb_double;
+
+  return NULL;
+}
+
+GimpColorTransform *
+gimp_image_get_color_transform_from_srgb_double (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  gimp_image_create_color_transforms (image);
+
+  if (private->is_color_managed)
+    return private->transform_from_srgb_double;
+
+  return NULL;
+}
+
+void
+gimp_image_color_profile_pixel_to_srgb (GimpImage  *image,
+                                        const Babl *pixel_format,
+                                        gpointer    pixel,
+                                        GimpRGB    *color)
+{
+  GimpColorTransform *transform;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  transform = gimp_image_get_color_transform_to_srgb_double (image);
+
+  if (transform)
+    {
+      gimp_color_transform_process_pixels (transform,
+                                           pixel_format,
+                                           pixel,
+                                           babl_format ("R'G'B'A double"),
+                                           color,
+                                           1);
+    }
+  else
+    {
+      gimp_rgba_set_pixel (color, pixel_format, pixel);
+    }
+}
+
+void
+gimp_image_color_profile_srgb_to_pixel (GimpImage     *image,
+                                        const GimpRGB *color,
+                                        const Babl    *pixel_format,
+                                        gpointer       pixel)
+{
+  GimpColorTransform *transform;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  transform = gimp_image_get_color_transform_from_srgb_double (image);
+
+  if (transform)
+    {
+      gimp_color_transform_process_pixels (transform,
+                                           babl_format ("R'G'B'A double"),
+                                           color,
+                                           pixel_format,
+                                           pixel,
+                                           1);
+    }
+  else
+    {
+      gimp_rgba_get_pixel (color, pixel_format, pixel);
+    }
+}
+
+
+/*  internal API  */
+
+void
+_gimp_image_free_color_profile (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_clear_object (&private->color_profile);
+
+  _gimp_image_free_color_transforms (image);
+}
+
+void
+_gimp_image_free_color_transforms (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_clear_object (&private->transform_to_srgb_u8);
+  g_clear_object (&private->transform_from_srgb_u8);
+  g_clear_object (&private->transform_to_srgb_double);
+  g_clear_object (&private->transform_from_srgb_double);
+
+  private->color_transforms_created = FALSE;
+}
+
+void
+_gimp_image_update_color_profile (GimpImage          *image,
+                                  const GimpParasite *icc_parasite)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  _gimp_image_free_color_profile (image);
+
+  if (icc_parasite)
+    {
+      private->color_profile =
+        gimp_color_profile_new_from_icc_profile (gimp_parasite_data (icc_parasite),
+                                                 gimp_parasite_data_size (icc_parasite),
+                                                 NULL);
+    }
+
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image));
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_convert_profile_layers (GimpImage                *image,
+                                   GimpColorProfile         *src_profile,
+                                   GimpColorProfile         *dest_profile,
+                                   GimpColorRenderingIntent  intent,
+                                   gboolean                  bpc,
+                                   GimpProgress             *progress)
+{
+  GimpObjectQueue *queue;
+  GList           *layers;
+  GList           *list;
+  GimpDrawable    *drawable;
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  layers = gimp_image_get_layer_list (image);
+
+  for (list = layers; list; list = g_list_next (list))
+    {
+      if (! gimp_viewable_get_children (list->data))
+        gimp_object_queue_push (queue, list->data);
+    }
+
+  g_list_free (layers);
+
+  while ((drawable = gimp_object_queue_pop (queue)))
+    {
+      GimpItem   *item = GIMP_ITEM (drawable);
+      GeglBuffer *buffer;
+      gboolean    alpha;
+
+      alpha = gimp_drawable_has_alpha (drawable);
+
+      buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                gimp_item_get_width  (item),
+                                                gimp_item_get_height (item)),
+                                gimp_image_get_layer_format (image, alpha));
+
+      gimp_drawable_push_undo (drawable, NULL, NULL,
+                               0, 0,
+                               gimp_item_get_width  (GIMP_ITEM (drawable)),
+                               gimp_item_get_height (GIMP_ITEM (drawable)));
+
+      gimp_gegl_convert_color_profile (gimp_drawable_get_buffer (drawable),
+                                       NULL,
+                                       src_profile,
+                                       buffer,
+                                       NULL,
+                                       dest_profile,
+                                       intent, bpc,
+                                       progress);
+
+      gimp_drawable_set_buffer (drawable, TRUE, NULL, buffer);
+      g_object_unref (buffer);
+    }
+
+  g_object_unref (queue);
+}
+
+static void
+gimp_image_convert_profile_colormap (GimpImage                *image,
+                                     GimpColorProfile         *src_profile,
+                                     GimpColorProfile         *dest_profile,
+                                     GimpColorRenderingIntent  intent,
+                                     gboolean                  bpc,
+                                     GimpProgress             *progress)
+{
+  GimpColorTransform      *transform;
+  GimpColorTransformFlags  flags = 0;
+  guchar                  *cmap;
+  gint                     n_colors;
+
+  n_colors = gimp_image_get_colormap_size (image);
+  cmap     = g_memdup (gimp_image_get_colormap (image), n_colors * 3);
+
+  if (bpc)
+    flags |= GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION;
+
+  transform = gimp_color_transform_new (src_profile,
+                                        babl_format ("R'G'B' u8"),
+                                        dest_profile,
+                                        babl_format ("R'G'B' u8"),
+                                        intent, flags);
+
+  if (transform)
+    {
+      gimp_color_transform_process_pixels (transform,
+                                           babl_format ("R'G'B' u8"), cmap,
+                                           babl_format ("R'G'B' u8"), cmap,
+                                           n_colors);
+      g_object_unref (transform);
+
+      gimp_image_set_colormap (image, cmap, n_colors, TRUE);
+    }
+  else
+    {
+      g_warning ("cmsCreateTransform() failed!");
+    }
+
+  g_free (cmap);
+}
+
+static void
+gimp_image_create_color_transforms (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->color_profile &&
+      ! private->color_transforms_created)
+    {
+      GimpColorProfile        *srgb_profile;
+      GimpColorTransformFlags  flags = 0;
+
+      srgb_profile = gimp_color_profile_new_rgb_srgb ();
+
+      flags |= GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE;
+      flags |= GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION;
+
+      private->transform_to_srgb_u8 =
+        gimp_color_transform_new (private->color_profile,
+                                  gimp_image_get_layer_format (image, TRUE),
+                                  srgb_profile,
+                                  babl_format ("R'G'B'A u8"),
+                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                  flags);
+
+      private->transform_from_srgb_u8 =
+        gimp_color_transform_new (srgb_profile,
+                                  babl_format ("R'G'B'A u8"),
+                                  private->color_profile,
+                                  gimp_image_get_layer_format (image, TRUE),
+                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                  flags);
+
+      private->transform_to_srgb_double =
+        gimp_color_transform_new (private->color_profile,
+                                  gimp_image_get_layer_format (image, TRUE),
+                                  srgb_profile,
+                                  babl_format ("R'G'B'A double"),
+                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                  flags);
+
+      private->transform_from_srgb_double =
+        gimp_color_transform_new (srgb_profile,
+                                  babl_format ("R'G'B'A double"),
+                                  private->color_profile,
+                                  gimp_image_get_layer_format (image, TRUE),
+                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                  flags);
+
+      g_object_unref (srgb_profile);
+
+      private->color_transforms_created = TRUE;
+    }
+}
diff --git a/app/core/gimpimage-color-profile.h b/app/core/gimpimage-color-profile.h
new file mode 100644
index 0000000..ae89038
--- /dev/null
+++ b/app/core/gimpimage-color-profile.h
@@ -0,0 +1,113 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-color-profile.h
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_COLOR_PROFILE_H__
+#define __GIMP_IMAGE_COLOR_PROFILE_H__
+
+
+#define GIMP_ICC_PROFILE_PARASITE_NAME "icc-profile"
+
+
+gboolean             gimp_image_get_is_color_managed   (GimpImage           *image);
+void                 gimp_image_set_is_color_managed   (GimpImage           *image,
+                                                        gboolean             is_color_managed,
+                                                        gboolean             push_undo);
+
+gboolean             gimp_image_validate_icc_parasite  (GimpImage           *image,
+                                                        const GimpParasite  *icc_parasite,
+                                                        gboolean            *is_builtin,
+                                                        GError             **error);
+const GimpParasite * gimp_image_get_icc_parasite       (GimpImage           *image);
+void                 gimp_image_set_icc_parasite       (GimpImage           *image,
+                                                        const GimpParasite  *icc_parasite);
+
+gboolean             gimp_image_validate_icc_profile   (GimpImage           *image,
+                                                        const guint8        *data,
+                                                        gsize                length,
+                                                        gboolean            *is_builtin,
+                                                        GError             **error);
+const guint8       * gimp_image_get_icc_profile        (GimpImage           *image,
+                                                        gsize               *length);
+gboolean             gimp_image_set_icc_profile        (GimpImage           *image,
+                                                        const guint8        *data,
+                                                        gsize                length,
+                                                        GError             **error);
+
+gboolean             gimp_image_validate_color_profile (GimpImage           *image,
+                                                        GimpColorProfile    *profile,
+                                                        gboolean            *is_builtin,
+                                                        GError             **error);
+GimpColorProfile   * gimp_image_get_color_profile      (GimpImage           *image);
+gboolean             gimp_image_set_color_profile      (GimpImage           *image,
+                                                        GimpColorProfile    *profile,
+                                                        GError             **error);
+
+gboolean             gimp_image_validate_color_profile_by_format
+                                                       (const Babl          *format,
+                                                        GimpColorProfile    *profile,
+                                                        gboolean            *is_builtin,
+                                                        GError             **error);
+
+GimpColorProfile   * gimp_image_get_builtin_color_profile
+                                                       (GimpImage           *image);
+
+gboolean             gimp_image_convert_color_profile  (GimpImage           *image,
+                                                        GimpColorProfile    *dest_profile,
+                                                        GimpColorRenderingIntent  intent,
+                                                        gboolean             bpc,
+                                                        GimpProgress        *progress,
+                                                        GError             **error);
+
+void                 gimp_image_import_color_profile   (GimpImage           *image,
+                                                        GimpContext         *context,
+                                                        GimpProgress        *progress,
+                                                        gboolean             interactive);
+
+GimpColorTransform * gimp_image_get_color_transform_to_srgb_u8
+                                                       (GimpImage           *image);
+GimpColorTransform * gimp_image_get_color_transform_from_srgb_u8
+                                                       (GimpImage           *image);
+
+GimpColorTransform * gimp_image_get_color_transform_to_srgb_double
+                                                       (GimpImage           *image);
+GimpColorTransform * gimp_image_get_color_transform_from_srgb_double
+                                                       (GimpImage           *image);
+
+void                 gimp_image_color_profile_pixel_to_srgb
+                                                       (GimpImage           *image,
+                                                        const Babl          *pixel_format,
+                                                        gpointer             pixel,
+                                                        GimpRGB             *color);
+void                 gimp_image_color_profile_srgb_to_pixel
+                                                       (GimpImage           *image,
+                                                        const GimpRGB       *color,
+                                                        const Babl          *pixel_format,
+                                                        gpointer             pixel);
+
+
+/*  internal API, to be called only from gimpimage.c  */
+
+void                 _gimp_image_free_color_profile    (GimpImage           *image);
+void                 _gimp_image_free_color_transforms (GimpImage           *image);
+void                 _gimp_image_update_color_profile  (GimpImage           *image,
+                                                        const GimpParasite  *icc_parasite);
+
+
+#endif /* __GIMP_IMAGE_COLOR_PROFILE_H__ */
diff --git a/app/core/gimpimage-colormap.c b/app/core/gimpimage-colormap.c
new file mode 100644
index 0000000..8bf40a9
--- /dev/null
+++ b/app/core/gimpimage-colormap.c
@@ -0,0 +1,362 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpcontainer.h"
+#include "gimpdatafactory.h"
+#include "gimpimage.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo-push.h"
+#include "gimppalette.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototype  */
+
+static void   gimp_image_colormap_set_palette_entry (GimpImage     *image,
+                                                     const GimpRGB *color,
+                                                     gint           index);
+
+
+/*  public functions  */
+
+void
+gimp_image_colormap_init (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpContainer    *palettes;
+  gchar            *palette_name;
+  gchar            *palette_id;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_if_fail (private->colormap == NULL);
+  g_return_if_fail (private->palette == NULL);
+
+  palette_name = g_strdup_printf (_("Colormap of Image #%d (%s)"),
+                                  gimp_image_get_ID (image),
+                                  gimp_image_get_display_name (image));
+  palette_id = g_strdup_printf ("gimp-indexed-image-palette-%d",
+                                gimp_image_get_ID (image));
+
+  private->n_colors = 0;
+  private->colormap = g_new0 (guchar, GIMP_IMAGE_COLORMAP_SIZE);
+  private->palette  = GIMP_PALETTE (gimp_palette_new (NULL, palette_name));
+
+  if (! private->babl_palette_rgb)
+    {
+      gchar *format_name = g_strdup_printf ("-gimp-indexed-format-%d",
+                                            gimp_image_get_ID (image));
+
+      babl_new_palette (format_name,
+                        &private->babl_palette_rgb,
+                        &private->babl_palette_rgba);
+
+      g_free (format_name);
+    }
+
+  gimp_palette_set_columns (private->palette, 16);
+
+  gimp_data_make_internal (GIMP_DATA (private->palette), palette_id);
+
+  palettes = gimp_data_factory_get_container (image->gimp->palette_factory);
+
+  gimp_container_add (palettes, GIMP_OBJECT (private->palette));
+
+  g_free (palette_name);
+  g_free (palette_id);
+}
+
+void
+gimp_image_colormap_dispose (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpContainer    *palettes;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_if_fail (private->colormap != NULL);
+  g_return_if_fail (GIMP_IS_PALETTE (private->palette));
+
+  palettes = gimp_data_factory_get_container (image->gimp->palette_factory);
+
+  gimp_container_remove (palettes, GIMP_OBJECT (private->palette));
+}
+
+void
+gimp_image_colormap_free (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_if_fail (private->colormap != NULL);
+  g_return_if_fail (GIMP_IS_PALETTE (private->palette));
+
+  g_clear_pointer (&private->colormap, g_free);
+  g_clear_object (&private->palette);
+
+  /* don't touch the image's babl_palettes because we might still have
+   * buffers with that palette on the undo stack, and on undoing the
+   * image back to indexed, we must have exactly these palettes around
+   */
+}
+
+const Babl *
+gimp_image_colormap_get_rgb_format (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->babl_palette_rgb;
+}
+
+const Babl *
+gimp_image_colormap_get_rgba_format (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->babl_palette_rgba;
+}
+
+GimpPalette *
+gimp_image_get_colormap_palette (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->palette;
+}
+
+const guchar *
+gimp_image_get_colormap (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->colormap;
+}
+
+gint
+gimp_image_get_colormap_size (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->n_colors;
+}
+
+void
+gimp_image_set_colormap (GimpImage    *image,
+                         const guchar *colormap,
+                         gint          n_colors,
+                         gboolean      push_undo)
+{
+  GimpImagePrivate *private;
+  GimpPaletteEntry *entry;
+  gint              i;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (colormap != NULL || n_colors == 0);
+  g_return_if_fail (n_colors >= 0 && n_colors <= 256);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (push_undo)
+    gimp_image_undo_push_image_colormap (image, C_("undo-type", "Set Colormap"));
+
+  if (private->colormap)
+    memset (private->colormap, 0, GIMP_IMAGE_COLORMAP_SIZE);
+  else
+    gimp_image_colormap_init (image);
+
+  if (colormap)
+    memcpy (private->colormap, colormap, n_colors * 3);
+
+  /* make sure the image's colormap always has at least one color.  when
+   * n_colors == 0, use black.
+   */
+  private->n_colors = MAX (n_colors, 1);
+
+  gimp_data_freeze (GIMP_DATA (private->palette));
+
+  while ((entry = gimp_palette_get_entry (private->palette, 0)))
+    gimp_palette_delete_entry (private->palette, entry);
+
+  for (i = 0; i < private->n_colors; i++)
+    gimp_image_colormap_set_palette_entry (image, NULL, i);
+
+  gimp_data_thaw (GIMP_DATA (private->palette));
+
+  gimp_image_colormap_changed (image, -1);
+}
+
+void
+gimp_image_unset_colormap (GimpImage *image,
+                           gboolean   push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (push_undo)
+    gimp_image_undo_push_image_colormap (image,
+                                         C_("undo-type", "Unset Colormap"));
+
+  if (private->colormap)
+    {
+      gimp_image_colormap_dispose (image);
+      gimp_image_colormap_free (image);
+    }
+
+  private->n_colors = 0;
+
+  gimp_image_colormap_changed (image, -1);
+}
+
+void
+gimp_image_get_colormap_entry (GimpImage *image,
+                               gint       color_index,
+                               GimpRGB   *color)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_if_fail (private->colormap != NULL);
+  g_return_if_fail (color_index >= 0 && color_index < private->n_colors);
+  g_return_if_fail (color != NULL);
+
+  gimp_rgba_set_uchar (color,
+                       private->colormap[color_index * 3],
+                       private->colormap[color_index * 3 + 1],
+                       private->colormap[color_index * 3 + 2],
+                       255);
+}
+
+void
+gimp_image_set_colormap_entry (GimpImage     *image,
+                               gint           color_index,
+                               const GimpRGB *color,
+                               gboolean       push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_if_fail (private->colormap != NULL);
+  g_return_if_fail (color_index >= 0 && color_index < private->n_colors);
+  g_return_if_fail (color != NULL);
+
+  if (push_undo)
+    gimp_image_undo_push_image_colormap (image,
+                                         C_("undo-type", "Change Colormap entry"));
+
+  gimp_rgb_get_uchar (color,
+                      &private->colormap[color_index * 3],
+                      &private->colormap[color_index * 3 + 1],
+                      &private->colormap[color_index * 3 + 2]);
+
+  if (private->palette)
+    gimp_image_colormap_set_palette_entry (image, color, color_index);
+
+  gimp_image_colormap_changed (image, color_index);
+}
+
+void
+gimp_image_add_colormap_entry (GimpImage     *image,
+                               const GimpRGB *color)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_if_fail (private->colormap != NULL);
+  g_return_if_fail (private->n_colors < 256);
+  g_return_if_fail (color != NULL);
+
+  gimp_image_undo_push_image_colormap (image,
+                                       C_("undo-type", "Add Color to Colormap"));
+
+  gimp_rgb_get_uchar (color,
+                      &private->colormap[private->n_colors * 3],
+                      &private->colormap[private->n_colors * 3 + 1],
+                      &private->colormap[private->n_colors * 3 + 2]);
+
+  private->n_colors++;
+
+  if (private->palette)
+    gimp_image_colormap_set_palette_entry (image, color, private->n_colors - 1);
+
+  gimp_image_colormap_changed (image, -1);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_colormap_set_palette_entry (GimpImage     *image,
+                                       const GimpRGB *c,
+                                       gint           index)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpRGB           color;
+  gchar             name[64];
+
+  /* Avoid converting to char then back to double if we have the
+   * original GimpRGB color.
+   */
+  if (c)
+    color = *c;
+  else
+    gimp_rgba_set_uchar (&color,
+                         private->colormap[3 * index + 0],
+                         private->colormap[3 * index + 1],
+                         private->colormap[3 * index + 2],
+                         255);
+
+  g_snprintf (name, sizeof (name), "#%d", index);
+
+  if (gimp_palette_get_n_colors (private->palette) < private->n_colors)
+    gimp_palette_add_entry (private->palette, index, name, &color);
+  else
+    gimp_palette_set_entry (private->palette, index, name, &color);
+}
diff --git a/app/core/gimpimage-colormap.h b/app/core/gimpimage-colormap.h
new file mode 100644
index 0000000..703f5a2
--- /dev/null
+++ b/app/core/gimpimage-colormap.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_COLORMAP_H__
+#define __GIMP_IMAGE_COLORMAP_H__
+
+
+#define GIMP_IMAGE_COLORMAP_SIZE 768
+
+
+void           gimp_image_colormap_init            (GimpImage     *image);
+void           gimp_image_colormap_dispose         (GimpImage     *image);
+void           gimp_image_colormap_free            (GimpImage     *image);
+
+const Babl   * gimp_image_colormap_get_rgb_format  (GimpImage     *image);
+const Babl   * gimp_image_colormap_get_rgba_format (GimpImage     *image);
+
+GimpPalette  * gimp_image_get_colormap_palette     (GimpImage     *image);
+
+const guchar * gimp_image_get_colormap             (GimpImage     *image);
+gint           gimp_image_get_colormap_size        (GimpImage     *image);
+void           gimp_image_set_colormap             (GimpImage     *image,
+                                                    const guchar  *colormap,
+                                                    gint           n_colors,
+                                                    gboolean       push_undo);
+void           gimp_image_unset_colormap           (GimpImage     *image,
+                                                    gboolean       push_undo);
+
+void           gimp_image_get_colormap_entry       (GimpImage     *image,
+                                                    gint           color_index,
+                                                    GimpRGB       *color);
+void           gimp_image_set_colormap_entry       (GimpImage     *image,
+                                                    gint           color_index,
+                                                    const GimpRGB *color,
+                                                    gboolean       push_undo);
+
+void           gimp_image_add_colormap_entry       (GimpImage     *image,
+                                                    const GimpRGB *color);
+
+
+#endif /* __GIMP_IMAGE_COLORMAP_H__ */
diff --git a/app/core/gimpimage-convert-data.h b/app/core/gimpimage-convert-data.h
new file mode 100644
index 0000000..dd0dd11
--- /dev/null
+++ b/app/core/gimpimage-convert-data.h
@@ -0,0 +1,143 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* Misc data definitions used by the convert.c code module.  Moved
+   out here simply to unclutter convert.c, mostly. */
+
+#ifndef __GIMP_IMAGE_CONVERT_DATA_H__
+#define __GIMP_IMAGE_CONVERT_DATA_H__
+
+#include <glib.h>
+
+/* 'web safe' palette. */
+static const guchar webpal[] =
+{
+  255,255,255,255,255,204,255,255,153,255,255,102,255,255,51,255,255,0,255,
+  204,255,255,204,204,255,204,153,255,204,102,255,204,51,255,204,0,255,153,
+  255,255,153,204,255,153,153,255,153,102,255,153,51,255,153,0,255,102,255,
+  255,102,204,255,102,153,255,102,102,255,102,51,255,102,0,255,51,255,255,
+  51,204,255,51,153,255,51,102,255,51,51,255,51,0,255,0,255,255,0,
+  204,255,0,153,255,0,102,255,0,51,255,0,0,204,255,255,204,255,204,
+  204,255,153,204,255,102,204,255,51,204,255,0,204,204,255,204,204,204,204,
+  204,153,204,204,102,204,204,51,204,204,0,204,153,255,204,153,204,204,153,
+  153,204,153,102,204,153,51,204,153,0,204,102,255,204,102,204,204,102,153,
+  204,102,102,204,102,51,204,102,0,204,51,255,204,51,204,204,51,153,204,
+  51,102,204,51,51,204,51,0,204,0,255,204,0,204,204,0,153,204,0,
+  102,204,0,51,204,0,0,153,255,255,153,255,204,153,255,153,153,255,102,
+  153,255,51,153,255,0,153,204,255,153,204,204,153,204,153,153,204,102,153,
+  204,51,153,204,0,153,153,255,153,153,204,153,153,153,153,153,102,153,153,
+  51,153,153,0,153,102,255,153,102,204,153,102,153,153,102,102,153,102,51,
+  153,102,0,153,51,255,153,51,204,153,51,153,153,51,102,153,51,51,153,
+  51,0,153,0,255,153,0,204,153,0,153,153,0,102,153,0,51,153,0,
+  0,102,255,255,102,255,204,102,255,153,102,255,102,102,255,51,102,255,0,
+  102,204,255,102,204,204,102,204,153,102,204,102,102,204,51,102,204,0,102,
+  153,255,102,153,204,102,153,153,102,153,102,102,153,51,102,153,0,102,102,
+  255,102,102,204,102,102,153,102,102,102,102,102,51,102,102,0,102,51,255,
+  102,51,204,102,51,153,102,51,102,102,51,51,102,51,0,102,0,255,102,
+  0,204,102,0,153,102,0,102,102,0,51,102,0,0,51,255,255,51,255,
+  204,51,255,153,51,255,102,51,255,51,51,255,0,51,204,255,51,204,204,
+  51,204,153,51,204,102,51,204,51,51,204,0,51,153,255,51,153,204,51,
+  153,153,51,153,102,51,153,51,51,153,0,51,102,255,51,102,204,51,102,
+  153,51,102,102,51,102,51,51,102,0,51,51,255,51,51,204,51,51,153,
+  51,51,102,51,51,51,51,51,0,51,0,255,51,0,204,51,0,153,51,
+  0,102,51,0,51,51,0,0,0,255,255,0,255,204,0,255,153,0,255,
+  102,0,255,51,0,255,0,0,204,255,0,204,204,0,204,153,0,204,102,
+  0,204,51,0,204,0,0,153,255,0,153,204,0,153,153,0,153,102,0,
+  153,51,0,153,0,0,102,255,0,102,204,0,102,153,0,102,102,0,102,
+  51,0,102,0,0,51,255,0,51,204,0,51,153,0,51,102,0,51,51,
+  0,51,0,0,0,255,0,0,204,0,0,153,0,0,102,0,0,51,0,0,0
+};
+
+
+/* the dither matrix, used for alpha dither and 'positional' dither */
+#define DM_WIDTH 32
+#define DM_WIDTHMASK ((DM_WIDTH)-1)
+#define DM_HEIGHT 32
+#define DM_HEIGHTMASK ((DM_HEIGHT)-1)
+/* matrix values should be scaled/biased to 1..255 range */
+/* this array is not const because it may be overwritten. */
+static guchar DM[32][32] = {
+  {  1,191, 48,239, 12,203, 60,251,  3,194, 51,242, 15,206, 63,254,  1,192, 49,240, 13,204, 61,252,  4,195, 52,243, 16,207, 64,255},
+  {128, 64,175,112,140, 76,187,124,131, 67,178,115,143, 79,190,127,128, 65,176,112,140, 77,188,124,131, 68,179,115,143, 80,191,127},
+  { 32,223, 16,207, 44,235, 28,219, 35,226, 19,210, 47,238, 31,222, 33,224, 17,208, 45,236, 29,220, 36,227, 20,211, 48,239, 32,223},
+  {159, 96,144, 80,171,108,155, 92,162, 99,146, 83,174,111,158, 95,160, 97,144, 81,172,109,156, 93,163,100,147, 84,175,111,159, 96},
+  {  8,199, 56,247,  4,195, 52,243, 11,202, 59,250,  7,198, 55,246,  9,200, 57,248,  5,196, 53,244, 12,203, 60,251,  8,199, 56,247},
+  {136, 72,183,120,132, 68,179,116,139, 75,186,123,135, 71,182,119,136, 73,184,120,132, 69,180,116,139, 76,187,123,135, 72,183,119},
+  { 40,231, 24,215, 36,227, 20,211, 43,234, 27,218, 39,230, 23,214, 41,232, 25,216, 37,228, 21,212, 44,235, 28,219, 40,231, 24,215},
+  {167,104,151, 88,163,100,147, 84,170,107,154, 91,166,103,150, 87,168,105,152, 89,164,101,148, 85,171,108,155, 92,167,104,151, 88},
+  {  2,193, 50,241, 14,205, 62,253,  1,192, 49,240, 13,204, 61,252,  3,194, 51,242, 15,206, 63,254,  2,193, 50,241, 14,205, 62,253},
+  {130, 66,177,114,142, 78,189,126,129, 65,176,113,141, 77,188,125,130, 67,178,114,142, 79,190,126,129, 66,177,113,141, 78,189,125},
+  { 34,225, 18,209, 46,237, 30,221, 33,224, 17,208, 45,236, 29,220, 35,226, 19,210, 47,238, 31,222, 34,225, 18,209, 46,237, 30,221},
+  {161, 98,146, 82,173,110,157, 94,160, 97,145, 81,172,109,156, 93,162, 99,146, 83,174,110,158, 95,161, 98,145, 82,173,109,157, 94},
+  { 10,201, 58,249,  6,197, 54,245,  9,200, 57,248,  5,196, 53,244, 11,202, 59,250,  7,198, 55,246, 10,201, 58,249,  6,197, 54,245},
+  {138, 74,185,122,134, 70,181,118,137, 73,184,121,133, 69,180,117,138, 75,186,122,134, 71,182,118,137, 74,185,121,133, 70,181,117},
+  { 42,233, 26,217, 38,229, 22,213, 41,232, 25,216, 37,228, 21,212, 43,234, 27,218, 39,230, 23,214, 42,233, 26,217, 38,229, 22,213},
+  {169,106,153, 90,165,102,149, 86,168,105,152, 89,164,101,148, 85,170,107,154, 91,166,103,150, 87,169,106,153, 90,165,102,149, 86},
+  {  1,192, 49,239, 13,204, 61,251,  4,195, 52,242, 16,207, 64,254,  1,191, 48,239, 13,203, 60,251,  4,194, 51,242, 16,206, 63,254},
+  {128, 65,176,112,140, 76,188,124,131, 68,179,115,143, 79,191,127,128, 64,176,112,140, 76,187,124,131, 67,179,115,143, 79,190,127},
+  { 33,223, 17,208, 45,235, 29,219, 36,226, 20,211, 48,238, 32,222, 33,223, 17,207, 44,235, 29,219, 36,226, 20,210, 47,238, 32,222},
+  {160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95,160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95},
+  {  9,200, 57,247,  5,196, 53,243, 12,203, 60,250,  8,199, 56,246,  9,199, 56,247,  5,195, 52,243, 12,202, 59,250,  8,198, 55,246},
+  {136, 73,184,120,132, 69,180,116,139, 75,187,123,135, 72,183,119,136, 72,183,120,132, 68,180,116,139, 75,186,123,135, 71,182,119},
+  { 41,231, 25,216, 37,227, 21,212, 44,234, 28,218, 40,230, 24,215, 40,231, 25,215, 37,227, 21,211, 43,234, 28,218, 39,230, 24,214},
+  {168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87,168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87},
+  {  3,194, 51,241, 15,206, 63,253,  2,193, 50,240, 14,205, 62,252,  3,193, 50,241, 15,205, 62,253,  2,192, 49,240, 14,204, 61,252},
+  {130, 67,178,114,142, 78,190,126,129, 66,177,113,141, 77,189,125,130, 66,178,114,142, 78,189,126,129, 65,177,113,141, 77,188,125},
+  { 35,225, 19,210, 47,237, 31,221, 34,224, 18,209, 46,236, 30,220, 35,225, 19,209, 46,237, 31,221, 34,224, 18,208, 45,236, 30,220},
+  {162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93,162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93},
+  { 11,202, 59,249,  7,198, 55,245, 10,201, 58,248,  6,197, 54,244, 11,201, 58,249,  7,197, 54,245, 10,200, 57,248,  6,196, 53,244},
+  {138, 74,186,122,134, 71,182,118,137, 73,185,121,133, 70,181,117,138, 74,185,122,134, 70,182,118,137, 73,184,121,133, 69,181,117},
+  { 43,233, 27,218, 39,229, 23,214, 42,232, 26,217, 38,228, 22,213, 42,233, 27,217, 38,229, 23,213, 41,232, 26,216, 37,228, 22,212},
+  {170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85,170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85}
+};
+
+static const guchar DM_ORIGINAL[32][32] = {
+  {  1,191, 48,239, 12,203, 60,251,  3,194, 51,242, 15,206, 63,254,  1,192, 49,240, 13,204, 61,252,  4,195, 52,243, 16,207, 64,255},
+  {128, 64,175,112,140, 76,187,124,131, 67,178,115,143, 79,190,127,128, 65,176,112,140, 77,188,124,131, 68,179,115,143, 80,191,127},
+  { 32,223, 16,207, 44,235, 28,219, 35,226, 19,210, 47,238, 31,222, 33,224, 17,208, 45,236, 29,220, 36,227, 20,211, 48,239, 32,223},
+  {159, 96,144, 80,171,108,155, 92,162, 99,146, 83,174,111,158, 95,160, 97,144, 81,172,109,156, 93,163,100,147, 84,175,111,159, 96},
+  {  8,199, 56,247,  4,195, 52,243, 11,202, 59,250,  7,198, 55,246,  9,200, 57,248,  5,196, 53,244, 12,203, 60,251,  8,199, 56,247},
+  {136, 72,183,120,132, 68,179,116,139, 75,186,123,135, 71,182,119,136, 73,184,120,132, 69,180,116,139, 76,187,123,135, 72,183,119},
+  { 40,231, 24,215, 36,227, 20,211, 43,234, 27,218, 39,230, 23,214, 41,232, 25,216, 37,228, 21,212, 44,235, 28,219, 40,231, 24,215},
+  {167,104,151, 88,163,100,147, 84,170,107,154, 91,166,103,150, 87,168,105,152, 89,164,101,148, 85,171,108,155, 92,167,104,151, 88},
+  {  2,193, 50,241, 14,205, 62,253,  1,192, 49,240, 13,204, 61,252,  3,194, 51,242, 15,206, 63,254,  2,193, 50,241, 14,205, 62,253},
+  {130, 66,177,114,142, 78,189,126,129, 65,176,113,141, 77,188,125,130, 67,178,114,142, 79,190,126,129, 66,177,113,141, 78,189,125},
+  { 34,225, 18,209, 46,237, 30,221, 33,224, 17,208, 45,236, 29,220, 35,226, 19,210, 47,238, 31,222, 34,225, 18,209, 46,237, 30,221},
+  {161, 98,146, 82,173,110,157, 94,160, 97,145, 81,172,109,156, 93,162, 99,146, 83,174,110,158, 95,161, 98,145, 82,173,109,157, 94},
+  { 10,201, 58,249,  6,197, 54,245,  9,200, 57,248,  5,196, 53,244, 11,202, 59,250,  7,198, 55,246, 10,201, 58,249,  6,197, 54,245},
+  {138, 74,185,122,134, 70,181,118,137, 73,184,121,133, 69,180,117,138, 75,186,122,134, 71,182,118,137, 74,185,121,133, 70,181,117},
+  { 42,233, 26,217, 38,229, 22,213, 41,232, 25,216, 37,228, 21,212, 43,234, 27,218, 39,230, 23,214, 42,233, 26,217, 38,229, 22,213},
+  {169,106,153, 90,165,102,149, 86,168,105,152, 89,164,101,148, 85,170,107,154, 91,166,103,150, 87,169,106,153, 90,165,102,149, 86},
+  {  1,192, 49,239, 13,204, 61,251,  4,195, 52,242, 16,207, 64,254,  1,191, 48,239, 13,203, 60,251,  4,194, 51,242, 16,206, 63,254},
+  {128, 65,176,112,140, 76,188,124,131, 68,179,115,143, 79,191,127,128, 64,176,112,140, 76,187,124,131, 67,179,115,143, 79,190,127},
+  { 33,223, 17,208, 45,235, 29,219, 36,226, 20,211, 48,238, 32,222, 33,223, 17,207, 44,235, 29,219, 36,226, 20,210, 47,238, 32,222},
+  {160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95,160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95},
+  {  9,200, 57,247,  5,196, 53,243, 12,203, 60,250,  8,199, 56,246,  9,199, 56,247,  5,195, 52,243, 12,202, 59,250,  8,198, 55,246},
+  {136, 73,184,120,132, 69,180,116,139, 75,187,123,135, 72,183,119,136, 72,183,120,132, 68,180,116,139, 75,186,123,135, 71,182,119},
+  { 41,231, 25,216, 37,227, 21,212, 44,234, 28,218, 40,230, 24,215, 40,231, 25,215, 37,227, 21,211, 43,234, 28,218, 39,230, 24,214},
+  {168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87,168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87},
+  {  3,194, 51,241, 15,206, 63,253,  2,193, 50,240, 14,205, 62,252,  3,193, 50,241, 15,205, 62,253,  2,192, 49,240, 14,204, 61,252},
+  {130, 67,178,114,142, 78,190,126,129, 66,177,113,141, 77,189,125,130, 66,178,114,142, 78,189,126,129, 65,177,113,141, 77,188,125},
+  { 35,225, 19,210, 47,237, 31,221, 34,224, 18,209, 46,236, 30,220, 35,225, 19,209, 46,237, 31,221, 34,224, 18,208, 45,236, 30,220},
+  {162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93,162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93},
+  { 11,202, 59,249,  7,198, 55,245, 10,201, 58,248,  6,197, 54,244, 11,201, 58,249,  7,197, 54,245, 10,200, 57,248,  6,196, 53,244},
+  {138, 74,186,122,134, 71,182,118,137, 73,185,121,133, 70,181,117,138, 74,185,122,134, 70,182,118,137, 73,184,121,133, 69,181,117},
+  { 43,233, 27,218, 39,229, 23,214, 42,232, 26,217, 38,228, 22,213, 42,233, 27,217, 38,229, 23,213, 41,232, 26,216, 37,228, 22,212},
+  {170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85,170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85}
+};
+
+#endif /* __GIMP_IMAGE_CONVERT_DATA_H__ */
diff --git a/app/core/gimpimage-convert-fsdither.h b/app/core/gimpimage-convert-fsdither.h
new file mode 100644
index 0000000..ebd9800
--- /dev/null
+++ b/app/core/gimpimage-convert-fsdither.h
@@ -0,0 +1,559 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_CONVERT_FSDITHER_H__
+#define __GIMP_IMAGE_CONVERT_FSDITHER_H__
+
+/* The following 5 arrays are used in performing floyd-steinberg
+ *  error diffusion dithering. The range array allows the quick
+ *  bounds checking of pixel values. The 4 error arrays contain
+ *  the error computations for the east, south-east, south and
+ *  south-west pixels surrounding the current pixel respectively.
+ */
+
+
+static const guchar range_array[] = {
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    1,    2,    3,
+    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
+   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
+   24,   25,   26,   27,   28,   29,   30,   31,   32,   33,
+   34,   35,   36,   37,   38,   39,   40,   41,   42,   43,
+   44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
+   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,
+   64,   65,   66,   67,   68,   69,   70,   71,   72,   73,
+   74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
+   84,   85,   86,   87,   88,   89,   90,   91,   92,   93,
+   94,   95,   96,   97,   98,   99,  100,  101,  102,  103,
+  104,  105,  106,  107,  108,  109,  110,  111,  112,  113,
+  114,  115,  116,  117,  118,  119,  120,  121,  122,  123,
+  124,  125,  126,  127,  128,  129,  130,  131,  132,  133,
+  134,  135,  136,  137,  138,  139,  140,  141,  142,  143,
+  144,  145,  146,  147,  148,  149,  150,  151,  152,  153,
+  154,  155,  156,  157,  158,  159,  160,  161,  162,  163,
+  164,  165,  166,  167,  168,  169,  170,  171,  172,  173,
+  174,  175,  176,  177,  178,  179,  180,  181,  182,  183,
+  184,  185,  186,  187,  188,  189,  190,  191,  192,  193,
+  194,  195,  196,  197,  198,  199,  200,  201,  202,  203,
+  204,  205,  206,  207,  208,  209,  210,  211,  212,  213,
+  214,  215,  216,  217,  218,  219,  220,  221,  222,  223,
+  224,  225,  226,  227,  228,  229,  230,  231,  232,  233,
+  234,  235,  236,  237,  238,  239,  240,  241,  242,  243,
+  244,  245,  246,  247,  248,  249,  250,  251,  252,  253,
+  254,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
+  255,  255,  255,  255,  255,
+};
+
+static const gshort floyd_steinberg_error1[] = {
+ -223, -223, -222, -222, -221, -221, -220, -220, -220, -219,
+ -219, -218, -218, -217, -217, -217, -216, -216, -215, -215,
+ -214, -214, -213, -213, -213, -212, -212, -211, -211, -210,
+ -210, -210, -209, -209, -208, -208, -207, -207, -206, -206,
+ -206, -205, -205, -204, -204, -203, -203, -203, -202, -202,
+ -201, -201, -200, -200, -199, -199, -199, -198, -198, -197,
+ -197, -196, -196, -196, -195, -195, -194, -194, -193, -193,
+ -192, -192, -192, -191, -191, -190, -190, -189, -189, -189,
+ -188, -188, -187, -187, -186, -186, -185, -185, -185, -184,
+ -184, -183, -183, -182, -182, -182, -181, -181, -180, -180,
+ -179, -179, -178, -178, -178, -177, -177, -176, -176, -175,
+ -175, -175, -174, -174, -173, -173, -172, -172, -171, -171,
+ -171, -170, -170, -169, -169, -168, -168, -168, -167, -167,
+ -166, -166, -165, -165, -164, -164, -164, -163, -163, -162,
+ -162, -161, -161, -161, -160, -160, -159, -159, -158, -158,
+ -157, -157, -157, -156, -156, -155, -155, -154, -154, -154,
+ -153, -153, -152, -152, -151, -151, -150, -150, -150, -149,
+ -149, -148, -148, -147, -147, -147, -146, -146, -145, -145,
+ -144, -144, -143, -143, -143, -142, -142, -141, -141, -140,
+ -140, -140, -139, -139, -138, -138, -137, -137, -136, -136,
+ -136, -135, -135, -134, -134, -133, -133, -133, -132, -132,
+ -131, -131, -130, -130, -129, -129, -129, -128, -128, -127,
+ -127, -126, -126, -126, -125, -125, -124, -124, -123, -123,
+ -122, -122, -122, -121, -121, -120, -120, -119, -119, -119,
+ -118, -118, -117, -117, -116, -116, -115, -115, -115, -114,
+ -114, -113, -113, -112, -112, -112, -111, -111, -110, -110,
+ -109, -109, -108, -108, -108, -107, -107, -106, -106, -105,
+ -105, -105, -104, -104, -103, -103, -102, -102, -101, -101,
+ -101, -100, -100,  -99,  -99,  -98,  -98,  -98,  -97,  -97,
+  -96,  -96,  -95,  -95,  -94,  -94,  -94,  -93,  -93,  -92,
+  -92,  -91,  -91,  -91,  -90,  -90,  -89,  -89,  -88,  -88,
+  -87,  -87,  -87,  -86,  -86,  -85,  -85,  -84,  -84,  -84,
+  -83,  -83,  -82,  -82,  -81,  -81,  -80,  -80,  -80,  -79,
+  -79,  -78,  -78,  -77,  -77,  -77,  -76,  -76,  -75,  -75,
+  -74,  -74,  -73,  -73,  -73,  -72,  -72,  -71,  -71,  -70,
+  -70,  -70,  -69,  -69,  -68,  -68,  -67,  -67,  -66,  -66,
+  -66,  -65,  -65,  -64,  -64,  -63,  -63,  -63,  -62,  -62,
+  -61,  -61,  -60,  -60,  -59,  -59,  -59,  -58,  -58,  -57,
+  -57,  -56,  -56,  -56,  -55,  -55,  -54,  -54,  -53,  -53,
+  -52,  -52,  -52,  -51,  -51,  -50,  -50,  -49,  -49,  -49,
+  -48,  -48,  -47,  -47,  -46,  -46,  -45,  -45,  -45,  -44,
+  -44,  -43,  -43,  -42,  -42,  -42,  -41,  -41,  -40,  -40,
+  -39,  -39,  -38,  -38,  -38,  -37,  -37,  -36,  -36,  -35,
+  -35,  -35,  -34,  -34,  -33,  -33,  -32,  -32,  -31,  -31,
+  -31,  -30,  -30,  -29,  -29,  -28,  -28,  -28,  -27,  -27,
+  -26,  -26,  -25,  -25,  -24,  -24,  -24,  -23,  -23,  -22,
+  -22,  -21,  -21,  -21,  -20,  -20,  -19,  -19,  -18,  -18,
+  -17,  -17,  -17,  -16,  -16,  -15,  -15,  -14,  -14,  -14,
+  -13,  -13,  -12,  -12,  -11,  -11,  -10,  -10,  -10,   -9,
+   -9,   -8,   -8,   -7,   -7,   -7,   -6,   -6,   -5,   -5,
+   -4,   -4,   -3,   -3,   -3,   -2,   -2,   -1,   -1,    0,
+    0,    0,    0,    0,    1,    1,    2,    2,    3,    3,
+    3,    4,    4,    5,    5,    6,    6,    7,    7,    7,
+    8,    8,    9,    9,   10,   10,   10,   11,   11,   12,
+   12,   13,   13,   14,   14,   14,   15,   15,   16,   16,
+   17,   17,   17,   18,   18,   19,   19,   20,   20,   21,
+   21,   21,   22,   22,   23,   23,   24,   24,   24,   25,
+   25,   26,   26,   27,   27,   28,   28,   28,   29,   29,
+   30,   30,   31,   31,   31,   32,   32,   33,   33,   34,
+   34,   35,   35,   35,   36,   36,   37,   37,   38,   38,
+   38,   39,   39,   40,   40,   41,   41,   42,   42,   42,
+   43,   43,   44,   44,   45,   45,   45,   46,   46,   47,
+   47,   48,   48,   49,   49,   49,   50,   50,   51,   51,
+   52,   52,   52,   53,   53,   54,   54,   55,   55,   56,
+   56,   56,   57,   57,   58,   58,   59,   59,   59,   60,
+   60,   61,   61,   62,   62,   63,   63,   63,   64,   64,
+   65,   65,   66,   66,   66,   67,   67,   68,   68,   69,
+   69,   70,   70,   70,   71,   71,   72,   72,   73,   73,
+   73,   74,   74,   75,   75,   76,   76,   77,   77,   77,
+   78,   78,   79,   79,   80,   80,   80,   81,   81,   82,
+   82,   83,   83,   84,   84,   84,   85,   85,   86,   86,
+   87,   87,   87,   88,   88,   89,   89,   90,   90,   91,
+   91,   91,   92,   92,   93,   93,   94,   94,   94,   95,
+   95,   96,   96,   97,   97,   98,   98,   98,   99,   99,
+  100,  100,  101,  101,  101,  102,  102,  103,  103,  104,
+  104,  105,  105,  105,  106,  106,  107,  107,  108,  108,
+  108,  109,  109,  110,  110,  111,  111,  112,  112,  112,
+  113,  113,  114,  114,  115,  115,  115,  116,  116,  117,
+  117,  118,  118,  119,  119,  119,  120,  120,  121,  121,
+  122,  122,  122,  123,  123,  124,  124,  125,  125,  126,
+  126,  126,  127,  127,  128,  128,  129,  129,  129,  130,
+  130,  131,  131,  132,  132,  133,  133,  133,  134,  134,
+  135,  135,  136,  136,  136,  137,  137,  138,  138,  139,
+  139,  140,  140,  140,  141,  141,  142,  142,  143,  143,
+  143,  144,  144,  145,  145,  146,  146,  147,  147,  147,
+  148,  148,  149,  149,  150,  150,  150,  151,  151,  152,
+  152,  153,  153,  154,  154,  154,  155,  155,  156,  156,
+  157,  157,  157,  158,  158,  159,  159,  160,  160,  161,
+  161,  161,  162,  162,  163,  163,  164,  164,  164,  165,
+  165,  166,  166,  167,  167,  168,  168,  168,  169,  169,
+  170,  170,  171,  171,  171,  172,  172,  173,  173,  174,
+  174,  175,  175,  175,  176,  176,  177,  177,  178,  178,
+  178,  179,  179,  180,  180,  181,  181,  182,  182,  182,
+  183,  183,  184,  184,  185,  185,  185,  186,  186,  187,
+  187,  188,  188,  189,  189,  189,  190,  190,  191,  191,
+  192,  192,  192,  193,  193,  194,  194,  195,  195,  196,
+  196,  196,  197,  197,  198,  198,  199,  199,  199,  200,
+  200,  201,  201,  202,  202,  203,  203,  203,  204,  204,
+  205,  205,  206,  206,  206,  207,  207,  208,  208,  209,
+  209,  210,  210,  210,  211,  211,  212,  212,  213,  213,
+  213,  214,  214,  215,  215,  216,  216,  217,  217,  217,
+  218,  218,  219,  219,  220,  220,  220,  221,  221,  222,
+  222,  223,  223,  224,  224,
+};
+
+static const gshort floyd_steinberg_error2[] = {
+  -95,  -95,  -95,  -95,  -95,  -94,  -94,  -94,  -94,  -94,
+  -93,  -93,  -93,  -93,  -93,  -93,  -92,  -92,  -92,  -92,
+  -92,  -91,  -91,  -91,  -91,  -91,  -90,  -90,  -90,  -90,
+  -90,  -90,  -89,  -89,  -89,  -89,  -89,  -88,  -88,  -88,
+  -88,  -88,  -87,  -87,  -87,  -87,  -87,  -87,  -86,  -86,
+  -86,  -86,  -86,  -85,  -85,  -85,  -85,  -85,  -84,  -84,
+  -84,  -84,  -84,  -84,  -83,  -83,  -83,  -83,  -83,  -82,
+  -82,  -82,  -82,  -82,  -81,  -81,  -81,  -81,  -81,  -81,
+  -80,  -80,  -80,  -80,  -80,  -79,  -79,  -79,  -79,  -79,
+  -78,  -78,  -78,  -78,  -78,  -78,  -77,  -77,  -77,  -77,
+  -77,  -76,  -76,  -76,  -76,  -76,  -75,  -75,  -75,  -75,
+  -75,  -75,  -74,  -74,  -74,  -74,  -74,  -73,  -73,  -73,
+  -73,  -73,  -72,  -72,  -72,  -72,  -72,  -72,  -71,  -71,
+  -71,  -71,  -71,  -70,  -70,  -70,  -70,  -70,  -69,  -69,
+  -69,  -69,  -69,  -69,  -68,  -68,  -68,  -68,  -68,  -67,
+  -67,  -67,  -67,  -67,  -66,  -66,  -66,  -66,  -66,  -66,
+  -65,  -65,  -65,  -65,  -65,  -64,  -64,  -64,  -64,  -64,
+  -63,  -63,  -63,  -63,  -63,  -63,  -62,  -62,  -62,  -62,
+  -62,  -61,  -61,  -61,  -61,  -61,  -60,  -60,  -60,  -60,
+  -60,  -60,  -59,  -59,  -59,  -59,  -59,  -58,  -58,  -58,
+  -58,  -58,  -57,  -57,  -57,  -57,  -57,  -57,  -56,  -56,
+  -56,  -56,  -56,  -55,  -55,  -55,  -55,  -55,  -54,  -54,
+  -54,  -54,  -54,  -54,  -53,  -53,  -53,  -53,  -53,  -52,
+  -52,  -52,  -52,  -52,  -51,  -51,  -51,  -51,  -51,  -51,
+  -50,  -50,  -50,  -50,  -50,  -49,  -49,  -49,  -49,  -49,
+  -48,  -48,  -48,  -48,  -48,  -48,  -47,  -47,  -47,  -47,
+  -47,  -46,  -46,  -46,  -46,  -46,  -45,  -45,  -45,  -45,
+  -45,  -45,  -44,  -44,  -44,  -44,  -44,  -43,  -43,  -43,
+  -43,  -43,  -42,  -42,  -42,  -42,  -42,  -42,  -41,  -41,
+  -41,  -41,  -41,  -40,  -40,  -40,  -40,  -40,  -39,  -39,
+  -39,  -39,  -39,  -39,  -38,  -38,  -38,  -38,  -38,  -37,
+  -37,  -37,  -37,  -37,  -36,  -36,  -36,  -36,  -36,  -36,
+  -35,  -35,  -35,  -35,  -35,  -34,  -34,  -34,  -34,  -34,
+  -33,  -33,  -33,  -33,  -33,  -33,  -32,  -32,  -32,  -32,
+  -32,  -31,  -31,  -31,  -31,  -31,  -30,  -30,  -30,  -30,
+  -30,  -30,  -29,  -29,  -29,  -29,  -29,  -28,  -28,  -28,
+  -28,  -28,  -27,  -27,  -27,  -27,  -27,  -27,  -26,  -26,
+  -26,  -26,  -26,  -25,  -25,  -25,  -25,  -25,  -24,  -24,
+  -24,  -24,  -24,  -24,  -23,  -23,  -23,  -23,  -23,  -22,
+  -22,  -22,  -22,  -22,  -21,  -21,  -21,  -21,  -21,  -21,
+  -20,  -20,  -20,  -20,  -20,  -19,  -19,  -19,  -19,  -19,
+  -18,  -18,  -18,  -18,  -18,  -18,  -17,  -17,  -17,  -17,
+  -17,  -16,  -16,  -16,  -16,  -16,  -15,  -15,  -15,  -15,
+  -15,  -15,  -14,  -14,  -14,  -14,  -14,  -13,  -13,  -13,
+  -13,  -13,  -12,  -12,  -12,  -12,  -12,  -12,  -11,  -11,
+  -11,  -11,  -11,  -10,  -10,  -10,  -10,  -10,   -9,   -9,
+   -9,   -9,   -9,   -9,   -8,   -8,   -8,   -8,   -8,   -7,
+   -7,   -7,   -7,   -7,   -6,   -6,   -6,   -6,   -6,   -6,
+   -5,   -5,   -5,   -5,   -5,   -4,   -4,   -4,   -4,   -4,
+   -3,   -3,   -3,   -3,   -3,   -3,   -2,   -2,   -2,   -2,
+   -2,   -1,   -1,   -1,   -1,   -1,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    1,    1,    1,
+    1,    1,    2,    2,    2,    2,    2,    3,    3,    3,
+    3,    3,    3,    4,    4,    4,    4,    4,    5,    5,
+    5,    5,    5,    6,    6,    6,    6,    6,    6,    7,
+    7,    7,    7,    7,    8,    8,    8,    8,    8,    9,
+    9,    9,    9,    9,    9,   10,   10,   10,   10,   10,
+   11,   11,   11,   11,   11,   12,   12,   12,   12,   12,
+   12,   13,   13,   13,   13,   13,   14,   14,   14,   14,
+   14,   15,   15,   15,   15,   15,   15,   16,   16,   16,
+   16,   16,   17,   17,   17,   17,   17,   18,   18,   18,
+   18,   18,   18,   19,   19,   19,   19,   19,   20,   20,
+   20,   20,   20,   21,   21,   21,   21,   21,   21,   22,
+   22,   22,   22,   22,   23,   23,   23,   23,   23,   24,
+   24,   24,   24,   24,   24,   25,   25,   25,   25,   25,
+   26,   26,   26,   26,   26,   27,   27,   27,   27,   27,
+   27,   28,   28,   28,   28,   28,   29,   29,   29,   29,
+   29,   30,   30,   30,   30,   30,   30,   31,   31,   31,
+   31,   31,   32,   32,   32,   32,   32,   33,   33,   33,
+   33,   33,   33,   34,   34,   34,   34,   34,   35,   35,
+   35,   35,   35,   36,   36,   36,   36,   36,   36,   37,
+   37,   37,   37,   37,   38,   38,   38,   38,   38,   39,
+   39,   39,   39,   39,   39,   40,   40,   40,   40,   40,
+   41,   41,   41,   41,   41,   42,   42,   42,   42,   42,
+   42,   43,   43,   43,   43,   43,   44,   44,   44,   44,
+   44,   45,   45,   45,   45,   45,   45,   46,   46,   46,
+   46,   46,   47,   47,   47,   47,   47,   48,   48,   48,
+   48,   48,   48,   49,   49,   49,   49,   49,   50,   50,
+   50,   50,   50,   51,   51,   51,   51,   51,   51,   52,
+   52,   52,   52,   52,   53,   53,   53,   53,   53,   54,
+   54,   54,   54,   54,   54,   55,   55,   55,   55,   55,
+   56,   56,   56,   56,   56,   57,   57,   57,   57,   57,
+   57,   58,   58,   58,   58,   58,   59,   59,   59,   59,
+   59,   60,   60,   60,   60,   60,   60,   61,   61,   61,
+   61,   61,   62,   62,   62,   62,   62,   63,   63,   63,
+   63,   63,   63,   64,   64,   64,   64,   64,   65,   65,
+   65,   65,   65,   66,   66,   66,   66,   66,   66,   67,
+   67,   67,   67,   67,   68,   68,   68,   68,   68,   69,
+   69,   69,   69,   69,   69,   70,   70,   70,   70,   70,
+   71,   71,   71,   71,   71,   72,   72,   72,   72,   72,
+   72,   73,   73,   73,   73,   73,   74,   74,   74,   74,
+   74,   75,   75,   75,   75,   75,   75,   76,   76,   76,
+   76,   76,   77,   77,   77,   77,   77,   78,   78,   78,
+   78,   78,   78,   79,   79,   79,   79,   79,   80,   80,
+   80,   80,   80,   81,   81,   81,   81,   81,   81,   82,
+   82,   82,   82,   82,   83,   83,   83,   83,   83,   84,
+   84,   84,   84,   84,   84,   85,   85,   85,   85,   85,
+   86,   86,   86,   86,   86,   87,   87,   87,   87,   87,
+   87,   88,   88,   88,   88,   88,   89,   89,   89,   89,
+   89,   90,   90,   90,   90,   90,   90,   91,   91,   91,
+   91,   91,   92,   92,   92,   92,   92,   93,   93,   93,
+   93,   93,   93,   94,   94,   94,   94,   94,   95,   95,
+   95,   95,   95,   96,   96,
+};
+
+static const gshort floyd_steinberg_error3[] = {
+ -159, -159, -159, -158, -158, -158, -157, -157, -157, -156,
+ -156, -156, -155, -155, -155, -155, -154, -154, -154, -153,
+ -153, -153, -152, -152, -152, -151, -151, -151, -150, -150,
+ -150, -150, -149, -149, -149, -148, -148, -148, -147, -147,
+ -147, -146, -146, -146, -145, -145, -145, -145, -144, -144,
+ -144, -143, -143, -143, -142, -142, -142, -141, -141, -141,
+ -140, -140, -140, -140, -139, -139, -139, -138, -138, -138,
+ -137, -137, -137, -136, -136, -136, -135, -135, -135, -135,
+ -134, -134, -134, -133, -133, -133, -132, -132, -132, -131,
+ -131, -131, -130, -130, -130, -130, -129, -129, -129, -128,
+ -128, -128, -127, -127, -127, -126, -126, -126, -125, -125,
+ -125, -125, -124, -124, -124, -123, -123, -123, -122, -122,
+ -122, -121, -121, -121, -120, -120, -120, -120, -119, -119,
+ -119, -118, -118, -118, -117, -117, -117, -116, -116, -116,
+ -115, -115, -115, -115, -114, -114, -114, -113, -113, -113,
+ -112, -112, -112, -111, -111, -111, -110, -110, -110, -110,
+ -109, -109, -109, -108, -108, -108, -107, -107, -107, -106,
+ -106, -106, -105, -105, -105, -105, -104, -104, -104, -103,
+ -103, -103, -102, -102, -102, -101, -101, -101, -100, -100,
+ -100, -100,  -99,  -99,  -99,  -98,  -98,  -98,  -97,  -97,
+  -97,  -96,  -96,  -96,  -95,  -95,  -95,  -95,  -94,  -94,
+  -94,  -93,  -93,  -93,  -92,  -92,  -92,  -91,  -91,  -91,
+  -90,  -90,  -90,  -90,  -89,  -89,  -89,  -88,  -88,  -88,
+  -87,  -87,  -87,  -86,  -86,  -86,  -85,  -85,  -85,  -85,
+  -84,  -84,  -84,  -83,  -83,  -83,  -82,  -82,  -82,  -81,
+  -81,  -81,  -80,  -80,  -80,  -80,  -79,  -79,  -79,  -78,
+  -78,  -78,  -77,  -77,  -77,  -76,  -76,  -76,  -75,  -75,
+  -75,  -75,  -74,  -74,  -74,  -73,  -73,  -73,  -72,  -72,
+  -72,  -71,  -71,  -71,  -70,  -70,  -70,  -70,  -69,  -69,
+  -69,  -68,  -68,  -68,  -67,  -67,  -67,  -66,  -66,  -66,
+  -65,  -65,  -65,  -65,  -64,  -64,  -64,  -63,  -63,  -63,
+  -62,  -62,  -62,  -61,  -61,  -61,  -60,  -60,  -60,  -60,
+  -59,  -59,  -59,  -58,  -58,  -58,  -57,  -57,  -57,  -56,
+  -56,  -56,  -55,  -55,  -55,  -55,  -54,  -54,  -54,  -53,
+  -53,  -53,  -52,  -52,  -52,  -51,  -51,  -51,  -50,  -50,
+  -50,  -50,  -49,  -49,  -49,  -48,  -48,  -48,  -47,  -47,
+  -47,  -46,  -46,  -46,  -45,  -45,  -45,  -45,  -44,  -44,
+  -44,  -43,  -43,  -43,  -42,  -42,  -42,  -41,  -41,  -41,
+  -40,  -40,  -40,  -40,  -39,  -39,  -39,  -38,  -38,  -38,
+  -37,  -37,  -37,  -36,  -36,  -36,  -35,  -35,  -35,  -35,
+  -34,  -34,  -34,  -33,  -33,  -33,  -32,  -32,  -32,  -31,
+  -31,  -31,  -30,  -30,  -30,  -30,  -29,  -29,  -29,  -28,
+  -28,  -28,  -27,  -27,  -27,  -26,  -26,  -26,  -25,  -25,
+  -25,  -25,  -24,  -24,  -24,  -23,  -23,  -23,  -22,  -22,
+  -22,  -21,  -21,  -21,  -20,  -20,  -20,  -20,  -19,  -19,
+  -19,  -18,  -18,  -18,  -17,  -17,  -17,  -16,  -16,  -16,
+  -15,  -15,  -15,  -15,  -14,  -14,  -14,  -13,  -13,  -13,
+  -12,  -12,  -12,  -11,  -11,  -11,  -10,  -10,  -10,  -10,
+   -9,   -9,   -9,   -8,   -8,   -8,   -7,   -7,   -7,   -6,
+   -6,   -6,   -5,   -5,   -5,   -5,   -4,   -4,   -4,   -3,
+   -3,   -3,   -2,   -2,   -2,   -1,   -1,   -1,    0,    0,
+    0,    0,    0,    0,    0,    1,    1,    1,    2,    2,
+    2,    3,    3,    3,    4,    4,    4,    5,    5,    5,
+    5,    6,    6,    6,    7,    7,    7,    8,    8,    8,
+    9,    9,    9,   10,   10,   10,   10,   11,   11,   11,
+   12,   12,   12,   13,   13,   13,   14,   14,   14,   15,
+   15,   15,   15,   16,   16,   16,   17,   17,   17,   18,
+   18,   18,   19,   19,   19,   20,   20,   20,   20,   21,
+   21,   21,   22,   22,   22,   23,   23,   23,   24,   24,
+   24,   25,   25,   25,   25,   26,   26,   26,   27,   27,
+   27,   28,   28,   28,   29,   29,   29,   30,   30,   30,
+   30,   31,   31,   31,   32,   32,   32,   33,   33,   33,
+   34,   34,   34,   35,   35,   35,   35,   36,   36,   36,
+   37,   37,   37,   38,   38,   38,   39,   39,   39,   40,
+   40,   40,   40,   41,   41,   41,   42,   42,   42,   43,
+   43,   43,   44,   44,   44,   45,   45,   45,   45,   46,
+   46,   46,   47,   47,   47,   48,   48,   48,   49,   49,
+   49,   50,   50,   50,   50,   51,   51,   51,   52,   52,
+   52,   53,   53,   53,   54,   54,   54,   55,   55,   55,
+   55,   56,   56,   56,   57,   57,   57,   58,   58,   58,
+   59,   59,   59,   60,   60,   60,   60,   61,   61,   61,
+   62,   62,   62,   63,   63,   63,   64,   64,   64,   65,
+   65,   65,   65,   66,   66,   66,   67,   67,   67,   68,
+   68,   68,   69,   69,   69,   70,   70,   70,   70,   71,
+   71,   71,   72,   72,   72,   73,   73,   73,   74,   74,
+   74,   75,   75,   75,   75,   76,   76,   76,   77,   77,
+   77,   78,   78,   78,   79,   79,   79,   80,   80,   80,
+   80,   81,   81,   81,   82,   82,   82,   83,   83,   83,
+   84,   84,   84,   85,   85,   85,   85,   86,   86,   86,
+   87,   87,   87,   88,   88,   88,   89,   89,   89,   90,
+   90,   90,   90,   91,   91,   91,   92,   92,   92,   93,
+   93,   93,   94,   94,   94,   95,   95,   95,   95,   96,
+   96,   96,   97,   97,   97,   98,   98,   98,   99,   99,
+   99,  100,  100,  100,  100,  101,  101,  101,  102,  102,
+  102,  103,  103,  103,  104,  104,  104,  105,  105,  105,
+  105,  106,  106,  106,  107,  107,  107,  108,  108,  108,
+  109,  109,  109,  110,  110,  110,  110,  111,  111,  111,
+  112,  112,  112,  113,  113,  113,  114,  114,  114,  115,
+  115,  115,  115,  116,  116,  116,  117,  117,  117,  118,
+  118,  118,  119,  119,  119,  120,  120,  120,  120,  121,
+  121,  121,  122,  122,  122,  123,  123,  123,  124,  124,
+  124,  125,  125,  125,  125,  126,  126,  126,  127,  127,
+  127,  128,  128,  128,  129,  129,  129,  130,  130,  130,
+  130,  131,  131,  131,  132,  132,  132,  133,  133,  133,
+  134,  134,  134,  135,  135,  135,  135,  136,  136,  136,
+  137,  137,  137,  138,  138,  138,  139,  139,  139,  140,
+  140,  140,  140,  141,  141,  141,  142,  142,  142,  143,
+  143,  143,  144,  144,  144,  145,  145,  145,  145,  146,
+  146,  146,  147,  147,  147,  148,  148,  148,  149,  149,
+  149,  150,  150,  150,  150,  151,  151,  151,  152,  152,
+  152,  153,  153,  153,  154,  154,  154,  155,  155,  155,
+  155,  156,  156,  156,  157,  157,  157,  158,  158,  158,
+  159,  159,  159,  160,  160,
+};
+
+static const gshort floyd_steinberg_error4[] = {
+  -34,  -33,  -33,  -33,  -33,  -33,  -34,  -33,  -32,  -33,
+  -33,  -33,  -33,  -33,  -32,  -31,  -33,  -32,  -32,  -32,
+  -32,  -32,  -33,  -32,  -31,  -32,  -32,  -32,  -32,  -32,
+  -31,  -30,  -32,  -31,  -31,  -31,  -31,  -31,  -32,  -31,
+  -30,  -31,  -31,  -31,  -31,  -31,  -30,  -29,  -31,  -30,
+  -30,  -30,  -30,  -30,  -31,  -30,  -29,  -30,  -30,  -30,
+  -30,  -30,  -29,  -28,  -30,  -29,  -29,  -29,  -29,  -29,
+  -30,  -29,  -28,  -29,  -29,  -29,  -29,  -29,  -28,  -27,
+  -29,  -28,  -28,  -28,  -28,  -28,  -29,  -28,  -27,  -28,
+  -28,  -28,  -28,  -28,  -27,  -26,  -28,  -27,  -27,  -27,
+  -27,  -27,  -28,  -27,  -26,  -27,  -27,  -27,  -27,  -27,
+  -26,  -25,  -27,  -26,  -26,  -26,  -26,  -26,  -27,  -26,
+  -25,  -26,  -26,  -26,  -26,  -26,  -25,  -24,  -26,  -25,
+  -25,  -25,  -25,  -25,  -26,  -25,  -24,  -25,  -25,  -25,
+  -25,  -25,  -24,  -23,  -25,  -24,  -24,  -24,  -24,  -24,
+  -25,  -24,  -23,  -24,  -24,  -24,  -24,  -24,  -23,  -22,
+  -24,  -23,  -23,  -23,  -23,  -23,  -24,  -23,  -22,  -23,
+  -23,  -23,  -23,  -23,  -22,  -21,  -23,  -22,  -22,  -22,
+  -22,  -22,  -23,  -22,  -21,  -22,  -22,  -22,  -22,  -22,
+  -21,  -20,  -22,  -21,  -21,  -21,  -21,  -21,  -22,  -21,
+  -20,  -21,  -21,  -21,  -21,  -21,  -20,  -19,  -21,  -20,
+  -20,  -20,  -20,  -20,  -21,  -20,  -19,  -20,  -20,  -20,
+  -20,  -20,  -19,  -18,  -20,  -19,  -19,  -19,  -19,  -19,
+  -20,  -19,  -18,  -19,  -19,  -19,  -19,  -19,  -18,  -17,
+  -19,  -18,  -18,  -18,  -18,  -18,  -19,  -18,  -17,  -18,
+  -18,  -18,  -18,  -18,  -17,  -16,  -18,  -17,  -17,  -17,
+  -17,  -17,  -18,  -17,  -16,  -17,  -17,  -17,  -17,  -17,
+  -16,  -15,  -17,  -16,  -16,  -16,  -16,  -16,  -17,  -16,
+  -15,  -16,  -16,  -16,  -16,  -16,  -15,  -14,  -16,  -15,
+  -15,  -15,  -15,  -15,  -16,  -15,  -14,  -15,  -15,  -15,
+  -15,  -15,  -14,  -13,  -15,  -14,  -14,  -14,  -14,  -14,
+  -15,  -14,  -13,  -14,  -14,  -14,  -14,  -14,  -13,  -12,
+  -14,  -13,  -13,  -13,  -13,  -13,  -14,  -13,  -12,  -13,
+  -13,  -13,  -13,  -13,  -12,  -11,  -13,  -12,  -12,  -12,
+  -12,  -12,  -13,  -12,  -11,  -12,  -12,  -12,  -12,  -12,
+  -11,  -10,  -12,  -11,  -11,  -11,  -11,  -11,  -12,  -11,
+  -10,  -11,  -11,  -11,  -11,  -11,  -10,   -9,  -11,  -10,
+  -10,  -10,  -10,  -10,  -11,  -10,   -9,  -10,  -10,  -10,
+  -10,  -10,   -9,   -8,  -10,   -9,   -9,   -9,   -9,   -9,
+  -10,   -9,   -8,   -9,   -9,   -9,   -9,   -9,   -8,   -7,
+   -9,   -8,   -8,   -8,   -8,   -8,   -9,   -8,   -7,   -8,
+   -8,   -8,   -8,   -8,   -7,   -6,   -8,   -7,   -7,   -7,
+   -7,   -7,   -8,   -7,   -6,   -7,   -7,   -7,   -7,   -7,
+   -6,   -5,   -7,   -6,   -6,   -6,   -6,   -6,   -7,   -6,
+   -5,   -6,   -6,   -6,   -6,   -6,   -5,   -4,   -6,   -5,
+   -5,   -5,   -5,   -5,   -6,   -5,   -4,   -5,   -5,   -5,
+   -5,   -5,   -4,   -3,   -5,   -4,   -4,   -4,   -4,   -4,
+   -5,   -4,   -3,   -4,   -4,   -4,   -4,   -4,   -3,   -2,
+   -4,   -3,   -3,   -3,   -3,   -3,   -4,   -3,   -2,   -3,
+   -3,   -3,   -3,   -3,   -2,   -1,   -3,   -2,   -2,   -2,
+   -2,   -2,   -3,   -2,   -1,   -2,   -2,   -2,   -2,   -2,
+   -1,    0,    1,    2,    2,    2,    2,    2,    1,    2,
+    3,    2,    2,    2,    2,    2,    3,    1,    2,    3,
+    3,    3,    3,    3,    2,    3,    4,    3,    3,    3,
+    3,    3,    4,    2,    3,    4,    4,    4,    4,    4,
+    3,    4,    5,    4,    4,    4,    4,    4,    5,    3,
+    4,    5,    5,    5,    5,    5,    4,    5,    6,    5,
+    5,    5,    5,    5,    6,    4,    5,    6,    6,    6,
+    6,    6,    5,    6,    7,    6,    6,    6,    6,    6,
+    7,    5,    6,    7,    7,    7,    7,    7,    6,    7,
+    8,    7,    7,    7,    7,    7,    8,    6,    7,    8,
+    8,    8,    8,    8,    7,    8,    9,    8,    8,    8,
+    8,    8,    9,    7,    8,    9,    9,    9,    9,    9,
+    8,    9,   10,    9,    9,    9,    9,    9,   10,    8,
+    9,   10,   10,   10,   10,   10,    9,   10,   11,   10,
+   10,   10,   10,   10,   11,    9,   10,   11,   11,   11,
+   11,   11,   10,   11,   12,   11,   11,   11,   11,   11,
+   12,   10,   11,   12,   12,   12,   12,   12,   11,   12,
+   13,   12,   12,   12,   12,   12,   13,   11,   12,   13,
+   13,   13,   13,   13,   12,   13,   14,   13,   13,   13,
+   13,   13,   14,   12,   13,   14,   14,   14,   14,   14,
+   13,   14,   15,   14,   14,   14,   14,   14,   15,   13,
+   14,   15,   15,   15,   15,   15,   14,   15,   16,   15,
+   15,   15,   15,   15,   16,   14,   15,   16,   16,   16,
+   16,   16,   15,   16,   17,   16,   16,   16,   16,   16,
+   17,   15,   16,   17,   17,   17,   17,   17,   16,   17,
+   18,   17,   17,   17,   17,   17,   18,   16,   17,   18,
+   18,   18,   18,   18,   17,   18,   19,   18,   18,   18,
+   18,   18,   19,   17,   18,   19,   19,   19,   19,   19,
+   18,   19,   20,   19,   19,   19,   19,   19,   20,   18,
+   19,   20,   20,   20,   20,   20,   19,   20,   21,   20,
+   20,   20,   20,   20,   21,   19,   20,   21,   21,   21,
+   21,   21,   20,   21,   22,   21,   21,   21,   21,   21,
+   22,   20,   21,   22,   22,   22,   22,   22,   21,   22,
+   23,   22,   22,   22,   22,   22,   23,   21,   22,   23,
+   23,   23,   23,   23,   22,   23,   24,   23,   23,   23,
+   23,   23,   24,   22,   23,   24,   24,   24,   24,   24,
+   23,   24,   25,   24,   24,   24,   24,   24,   25,   23,
+   24,   25,   25,   25,   25,   25,   24,   25,   26,   25,
+   25,   25,   25,   25,   26,   24,   25,   26,   26,   26,
+   26,   26,   25,   26,   27,   26,   26,   26,   26,   26,
+   27,   25,   26,   27,   27,   27,   27,   27,   26,   27,
+   28,   27,   27,   27,   27,   27,   28,   26,   27,   28,
+   28,   28,   28,   28,   27,   28,   29,   28,   28,   28,
+   28,   28,   29,   27,   28,   29,   29,   29,   29,   29,
+   28,   29,   30,   29,   29,   29,   29,   29,   30,   28,
+   29,   30,   30,   30,   30,   30,   29,   30,   31,   30,
+   30,   30,   30,   30,   31,   29,   30,   31,   31,   31,
+   31,   31,   30,   31,   32,   31,   31,   31,   31,   31,
+   32,   30,   31,   32,   32,   32,   32,   32,   31,   32,
+   33,   32,   32,   32,   32,   32,   33,   31,   32,   33,
+   33,   33,   33,   33,   32,   33,   34,   33,   33,   33,
+   33,   33,   34,   32,   33,
+};
+
+#endif /* __GIMP_IMAGE_CONVERT_FSDITHER_H__ */
diff --git a/app/core/gimpimage-convert-indexed.c b/app/core/gimpimage-convert-indexed.c
new file mode 100644
index 0000000..6a3eae3
--- /dev/null
+++ b/app/core/gimpimage-convert-indexed.c
@@ -0,0 +1,4567 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-convert-indexed.c
+ * Copyright (C) 1997-2004 Adam D. Moss <adam@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * 2005-09-04 - Switch 'positional' dither matrix to a 32x32 Bayer,
+ *  which generates results that compress somewhat better (and may look
+ *  worse or better depending on what you enjoy...).  [adam@gimp.org]
+ *
+ * 2004-12-12 - Use a slower but much nicer technique for finding the
+ *  two best colors to dither between when using fixed/positional
+ *  dither methods.  Makes positional dither much less lame.  [adam@gimp.org]
+ *
+ * 2002-02-10 - Quantizer version 3.0 (the rest of the commit started
+ *  a year ago -- whoops).  Divide colors within CIE L*a*b* space using
+ *  CPercep module (cpercep.[ch]), color-match and dither likewise,
+ *  change the underlying box selection criteria and division point
+ *  logic, bump luminance precision upwards, etc.etc.  Generally
+ *  chooses a much richer color set, especially for low numbers of
+ *  colors.  n.b.: Less luminance-sloppy in straight remapping which is
+ *  good for color but a bit worse for high-frequency detail (that's
+ *  partly what fs-dithering is for -- use it).  [adam@gimp.org]
+ *
+ * 2001-03-25 - Define accessor function/macro for histogram reads and
+ *  writes.  This slows us down a little because we avoid some of the
+ *  dirty tricks we used when we knew that the histogram was a straight
+ *  3d array, so I've recovered some of the speed loss by implementing
+ *  a 5d accessor function with good locality of reference.  This change
+ *  is the first step towards quantizing in a more interesting colorspace
+ *  than frumpy old RGB.  [Adam]
+ *
+ * 2000/01/30 - Use palette_selector instead of option_menu for custom
+ *  palette. Use libgimp callback functions.  [Sven]
+ *
+ * 99/09/01 - Created a low-bleed FS-dither option.  [Adam]
+ *
+ * 99/08/29 - Deterministic color dithering to arbitrary palettes.
+ *  Ideal for animations that are going to be delta-optimized or simply
+ *  don't want to look 'busy' in static areas.  Also a bunch of bugfixes
+ *  and tweaks.  [Adam]
+ *
+ * 99/08/28 - Deterministic alpha dithering over layers, reduced bleeding
+ *  of transparent values into opaque values, added optional stage to
+ *  remove duplicate or unused color entries from final colormap. [Adam]
+ *
+ * 99/02/24 - Many revisions to the box-cut quantizer used in RGB->INDEXED
+ *  conversion.  Box to be cut is chosen on the basis of possessing an axis
+ *  with the largest sum of weighted perceptible error, rather than based on
+ *  volume or population.  The box is split along this axis rather than its
+ *  longest axis, at the point of error mean rather than simply at its centre.
+ *  Error-limiting in the F-S dither has been disabled - it may become optional
+ *  again later.  If you're convinced that you have an image where the old
+ *  dither looks better, let me know.  [Adam]
+ *
+ * 99/01/10 - Hourglass... [Adam]
+ *
+ * 98/07/25 - Convert-to-indexed now remembers the last invocation's
+ *  settings.  Also, GRAY->INDEXED is more flexible.  [Adam]
+ *
+ * 98/07/05 - Sucked the warning about quantizing to too many colors into
+ *  a text widget embedded in the dialog, improved intelligence of dialog
+ *  to default 'custom palette' selection to 'Web' if available, and
+ *  in this case not bother to present the native WWW-palette radio
+ *  button.  [Adam]
+ *
+ * 98/04/13 - avoid a division by zero when converting an empty gray-scale
+ *  image (who would like to do such a thing anyway??)  [Sven ]
+ *
+ * 98/03/23 - fixed a longstanding fencepost - hopefully the *right*
+ *  way, *again*.  [Adam]
+ *
+ * 97/11/14 - added a proper pdb interface and support for dithering
+ *  to custom palettes (based on a patch by Eric Hernes) [Yosh]
+ *
+ * 97/11/04 - fixed the accidental use of the color-counting case
+ *  when palette_type is WEB or MONO. [Adam]
+ *
+ * 97/10/25 - color-counting implemented (could use some hashing, but
+ *  performance actually seems okay) - now RGB->INDEXED conversion isn't
+ *  destructive if it doesn't have to be. [Adam]
+ *
+ * 97/10/14 - fixed divide-by-zero when converting a completely transparent
+ *  RGB image to indexed. [Adam]
+ *
+ * 97/07/01 - started todo/revision log.  Put code back in to
+ *  eliminate full-alpha pixels from RGB histogram.
+ *  [Adam D. Moss - adam@gimp.org]
+ */
+
+  /* TODO for Convert:
+   *
+   * . Tweak, tweak, tweak.  Old RGB code was tuned muchly.
+   *
+   * . Re-enable Heckbert locality for matching, benchmark it
+   *
+   * . Try faster fixed-point sRGB<->L*a*b* pixel conversion (see cpercep.c)
+   *
+   * . Use palette of another open INDEXED image?
+   *
+   * . Do error-splitting trick for GREY->INDEXED (hardly worth it)
+   */
+
+  /* CODE READABILITY BUGS:
+   *
+   * . Most uses of variants of the R,G,B variable naming convention
+   *   are referring to L*a*b* co-ordinates, not RGB co-ordinates!
+   *
+   * . Each said variable is usually one of the following, but it is
+   *   rarely clear which one:
+   *     - (assumed sRGB) raw non-linear 8-bit RGB co-ordinates
+   *     - 'full'-precision (unshifted) 8-bit L*a*b* co-ordinates
+   *     - box-space (reduced-precision shifted L*a*b*) co-ordinates
+   */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp.h"
+#include "gimpcontainer.h"
+#include "gimpdrawable.h"
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimpobjectqueue.h"
+#include "gimppalette.h"
+#include "gimpprogress.h"
+
+#include "text/gimptextlayer.h"
+
+#include "gimpimage-convert-fsdither.h"
+#include "gimpimage-convert-data.h"
+#include "gimpimage-convert-indexed.h"
+
+#include "gimp-intl.h"
+
+
+/* basic memory/quality tradeoff */
+#define PRECISION_R 8
+#define PRECISION_G 6
+#define PRECISION_B 6
+
+#define HIST_R_ELEMS (1<<PRECISION_R)
+#define HIST_G_ELEMS (1<<PRECISION_G)
+#define HIST_B_ELEMS (1<<PRECISION_B)
+
+#define BITS_IN_SAMPLE 8
+
+#define R_SHIFT  (BITS_IN_SAMPLE-PRECISION_R)
+#define G_SHIFT  (BITS_IN_SAMPLE-PRECISION_G)
+#define B_SHIFT  (BITS_IN_SAMPLE-PRECISION_B)
+
+/* we've stretched our non-cubic L*a*b* volume to touch the
+ * faces of the logical cube we've allocated for it, so re-scale
+ * again in inverse proportion to get back to linear proportions.
+ */
+#define R_SCALE 13              /*  scale R (L*) distances by this much  */
+#define G_SCALE 24              /*  scale G (a*) distances by this much  */
+#define B_SCALE 26              /*  and B (b*) by this much              */
+
+
+typedef struct _Color Color;
+typedef struct _QuantizeObj QuantizeObj;
+
+typedef void (* Pass1Func)     (QuantizeObj *quantize_obj);
+typedef void (* Pass2InitFunc) (QuantizeObj *quantize_obj);
+typedef void (* Pass2Func)     (QuantizeObj *quantize_obj,
+                                GimpLayer   *layer,
+                                GeglBuffer  *new_buffer);
+typedef void (* CleanupFunc)   (QuantizeObj *quantize_obj);
+
+typedef guint64 ColorFreq;
+typedef ColorFreq * CFHistogram;
+
+typedef enum { AXIS_UNDEF, AXIS_RED, AXIS_BLUE, AXIS_GREEN } AxisType;
+
+typedef double etype;
+
+
+/*
+  We provide two different histogram access interfaces.  HIST_LIN()
+  accesses the histogram in histogram-native space, taking absolute
+  histogram co-ordinates.  HIST_RGB() accesses the histogram in RGB
+  space.  This latter takes unsigned 8-bit co-ordinates, internally
+  converts those co-ordinates to histogram-native space and returns
+  the access pointer to the corresponding histogram cell.
+
+  Using these two interfaces we can import RGB data into a more
+  interesting space and efficiently work in the latter space until
+  it is time to output the quantized values in RGB again.  For
+  this final conversion we implement the function lin_to_rgb().
+
+  We effectively pull our three-dimensional space into five dimensions
+  such that the most-entropic bits lay in the lowest bits of the resulting
+  array index.  This gives significantly better locality of reference
+  and hence a small speedup despite the extra work involved in calculating
+  the index.
+
+  Why not six dimensions?  The expansion of dimensionality is good for random
+  access such as histogram population and the query pattern typical of
+  dithering but we have some code which iterates in a scanning manner, for
+  which the expansion is suboptimal.  The compromise is to leave the B
+  dimension unmolested in the lower-order bits of the index, since this is
+  the dimension most commonly iterated through in the inner loop of the
+  scans.
+
+  --adam
+
+  RhGhRlGlB
+*/
+#define VOL_GBITS  (PRECISION_G)
+#define VOL_BBITS  (PRECISION_B)
+#define VOL_RBITS  (PRECISION_R)
+#define VOL_GBITSh (VOL_GBITS - 3)
+#define VOL_GBITSl (VOL_GBITS - VOL_GBITSh)
+#define VOL_BBITSh (VOL_BBITS - 4)
+#define VOL_BBITSl (VOL_BBITS - VOL_BBITSh)
+#define VOL_RBITSh (VOL_RBITS - 3)
+#define VOL_RBITSl (VOL_RBITS - VOL_RBITSh)
+#define VOL_GMASKh (((1<<VOL_GBITSh)-1) << VOL_GBITSl)
+#define VOL_GMASKl ((1<<VOL_GBITSl)-1)
+#define VOL_BMASKh (((1<<VOL_BBITSh)-1) << VOL_BBITSl)
+#define VOL_BMASKl ((1<<VOL_BBITSl)-1)
+#define VOL_RMASKh (((1<<VOL_RBITSh)-1) << VOL_RBITSl)
+#define VOL_RMASKl ((1<<VOL_RBITSl)-1)
+/* The 5d compromise thing. */
+#define REF_FUNC(r,g,b) \
+( \
+ (((r) & VOL_RMASKh) << (VOL_BBITS + VOL_GBITS)) | \
+ (((r) & VOL_RMASKl) << (VOL_GBITSl + VOL_BBITS)) | \
+ (((g) & VOL_GMASKh) << (VOL_RBITSl + VOL_BBITS)) | \
+ (((g) & VOL_GMASKl) << (VOL_BBITS)) | \
+ (b) \
+)
+/* The full-on 6d thing. */
+/*
+#define REF_FUNC(r,g,b) \
+( \
+ (((r) & VOL_RMASKh) << (VOL_BBITS + VOL_GBITS)) | \
+ (((r) & VOL_RMASKl) << (VOL_GBITSl + VOL_BBITSl)) | \
+ (((g) & VOL_GMASKh) << (VOL_RBITSl + VOL_BBITS)) | \
+ (((g) & VOL_GMASKl) << (VOL_BBITSl)) | \
+ (((b) & VOL_BMASKh) << (VOL_RBITSl + VOL_GBITSl)) | \
+ ((b) & VOL_BMASKl) \
+)
+*/
+/* The boring old 3d thing. */
+/*
+#define REF_FUNC(r,g,b) (((r)<<(PRECISION_G+PRECISION_B)) | ((g)<<(PRECISION_B)) | (b))
+*/
+
+/* You even get to choose whether you want the accessor function
+   implemented as a macro or an inline function.  Don't say I never
+   give you anything. */
+/*
+#define HIST_LIN(hist_ptr,r,g,b) (&(hist_ptr)[REF_FUNC((r),(g),(b))])
+*/
+static inline ColorFreq *
+HIST_LIN (ColorFreq  *hist_ptr,
+          const gint  r,
+          const gint  g,
+          const gint  b)
+{
+  return (&(hist_ptr) [REF_FUNC (r, g, b)]);
+}
+
+
+#define LOWA   (-86.181F)
+#define LOWB  (-107.858F)
+#define HIGHA   (98.237F)
+#define HIGHB   (94.480F)
+
+#if 1
+#define LRAT (2.55F)
+#define ARAT (255.0F / (HIGHA - LOWA))
+#define BRAT (255.0F / (HIGHB - LOWB))
+#else
+#define LRAT (1.0F)
+#define ARAT (1.0F)
+#define BRAT (1.0F)
+#endif
+
+static const Babl *rgb_to_lab_fish = NULL;
+static const Babl *lab_to_rgb_fish = NULL;
+
+static inline void
+rgb_to_unshifted_lin (const guchar  r,
+                      const guchar  g,
+                      const guchar  b,
+                      gint         *hr,
+                      gint         *hg,
+                      gint         *hb)
+{
+  gint   or, og, ob;
+  gfloat rgb[3] = { r / 255.0, g / 255.0, b / 255.0 };
+  gfloat lab[3];
+
+  babl_process (rgb_to_lab_fish, rgb, lab, 1);
+
+  /* fprintf(stderr, " %d-%d-%d -> %0.3f,%0.3f,%0.3f ", r, g, b, sL, sa, sb);*/
+
+  or = RINT(lab[0] * LRAT);
+  og = RINT((lab[1] - LOWA) * ARAT);
+  ob = RINT((lab[2] - LOWB) * BRAT);
+
+  *hr = CLAMP(or, 0, 255);
+  *hg = CLAMP(og, 0, 255);
+  *hb = CLAMP(ob, 0, 255);
+
+  /*  fprintf(stderr, " %d:%d:%d ", *hr, *hg, *hb); */
+}
+
+
+static inline void
+rgb_to_lin (const guchar  r,
+            const guchar  g,
+            const guchar  b,
+            gint         *hr,
+            gint         *hg,
+            gint         *hb)
+{
+  gint or, og, ob;
+
+  /*
+  double sL, sa, sb;
+  {
+    double low_l = 999.0, low_a = 999.9, low_b = 999.0;
+    double high_l = -999.0, high_a = -999.0, high_b = -999.0;
+
+    int r,g,b;
+
+    for (r=0; r<256; r++)
+      for (g=0; g<256; g++)
+        for (b=0; b<256; b++)
+          {
+            cpercep_rgb_to_space(r,g,b, &sL, &sa, &sb);
+
+            if (sL > high_l)
+              high_l = sL;
+            if (sL < low_l)
+              low_l = sL;
+            if (sa > high_a)
+              high_a = sa;
+            if (sa < low_a)
+              low_a = sa;
+            if (sb > high_b)
+              high_b = sb;
+            if (sb < low_b)
+              low_b = sb;
+          }
+
+    fprintf(stderr, " [L: %0.3f -> %0.3f / a: %0.3f -> %0.3f / b: %0.3f -> %0.3f]\t", low_l, high_l, low_a, high_a, low_b, high_b);
+
+    exit(-1);
+  }
+  */
+
+  rgb_to_unshifted_lin (r, g, b, &or, &og, &ob);
+
+#if 0
+#define RSDF(r) ((r) >= ((HIST_R_ELEMS-1) << R_SHIFT) ? HIST_R_ELEMS-1 : \
+                 ((r) + ((1<<R_SHIFT)>>1) ) >> R_SHIFT)
+#define GSDF(g) ((g) >= ((HIST_G_ELEMS-1) << G_SHIFT) ? HIST_G_ELEMS-1 : \
+                 ((g) + ((1<<G_SHIFT)>>1) ) >> G_SHIFT)
+#define BSDF(b) ((b) >= ((HIST_B_ELEMS-1) << B_SHIFT) ? HIST_B_ELEMS-1 : \
+                 ((b) + ((1<<B_SHIFT)>>1) ) >> B_SHIFT)
+#else
+#define RSDF(r) ((r) >> R_SHIFT)
+#define GSDF(g) ((g) >> G_SHIFT)
+#define BSDF(b) ((b) >> B_SHIFT)
+#endif
+
+  or = RSDF (or);
+  og = GSDF (og);
+  ob = BSDF (ob);
+
+  *hr = or;
+  *hg = og;
+  *hb = ob;
+}
+
+
+static inline ColorFreq *
+HIST_RGB (ColorFreq  *hist_ptr,
+          const gint  r,
+          const gint  g,
+          const gint  b)
+{
+  gint hr, hg, hb;
+
+  rgb_to_lin (r, g, b, &hr, &hg, &hb);
+
+  return HIST_LIN (hist_ptr, hr, hg, hb);
+}
+
+
+static inline void
+lin_to_rgb (const gdouble  hr,
+            const gdouble  hg,
+            const gdouble  hb,
+            guchar        *r,
+            guchar        *g,
+            guchar        *b)
+{
+  gfloat  rgb[3];
+  gfloat  lab[3];
+  gdouble ir, ig, ib;
+
+  ir = ((gdouble) (hr)) * 255.0F / (gdouble) (HIST_R_ELEMS - 1);
+  ig = ((gdouble)( hg)) * 255.0F / (gdouble) (HIST_G_ELEMS - 1);
+  ib = ((gdouble)( hb)) * 255.0F / (gdouble) (HIST_B_ELEMS - 1);
+
+  ir = ir / LRAT;
+  ig = (ig / ARAT) + LOWA;
+  ib = (ib / BRAT) + LOWB;
+
+  lab[0] = ir;
+  lab[1] = ig;
+  lab[2] = ib;
+
+  babl_process (lab_to_rgb_fish, lab, rgb, 1);
+
+  *r = RINT (CLAMP (rgb[0] * 255, 0.0F, 255.0F));
+  *g = RINT (CLAMP (rgb[1] * 255, 0.0F, 255.0F));
+  *b = RINT (CLAMP (rgb[2] * 255, 0.0F, 255.0F));
+}
+
+
+
+struct _Color
+{
+  gint red;
+  gint green;
+  gint blue;
+};
+
+struct _QuantizeObj
+{
+  Pass1Func     first_pass;       /* first pass over image data creates colormap  */
+  Pass2InitFunc second_pass_init; /* Initialize data which persists over invocations */
+  Pass2Func     second_pass;      /* second pass maps from image data to colormap */
+  CleanupFunc   delete_func;      /* function to clean up data associated with private */
+
+  GimpPalette  *custom_palette;           /* The custom palette, if any        */
+
+  gint          desired_number_of_colors; /* Number of colors we will allow    */
+  gint          actual_number_of_colors;  /* Number of colors actually needed  */
+  Color         cmap[256];                /* colormap created by quantization  */
+  Color         clin[256];                /* .. converted back to linear space */
+  guint64       index_used_count[256];    /* how many times an index was used  */
+  CFHistogram   histogram;                /* holds the histogram               */
+
+  gboolean      want_dither_alpha;
+  gint          error_freedom;            /* 0=much bleed, 1=controlled bleed */
+
+  GimpProgress *progress;
+};
+
+typedef struct
+{
+  /*  The bounds of the box (inclusive); expressed as histogram indexes  */
+  gint    Rmin, Rmax;
+  gint    Rhalferror;
+  gint    Gmin, Gmax;
+  gint    Ghalferror;
+  gint    Bmin, Bmax;
+  gint    Bhalferror;
+
+  /*  The volume (actually 2-norm) of the box  */
+  gint    volume;
+
+  /*  The number of nonzero histogram cells within this box  */
+  gint64  colorcount;
+
+  /* The sum of the weighted error within this box */
+  guint64 error;
+  /* The sum of the unweighted error within this box */
+  guint64 rerror;
+  guint64 gerror;
+  guint64 berror;
+
+} box, *boxptr;
+
+
+static void          zero_histogram_gray     (CFHistogram   histogram);
+static void          zero_histogram_rgb      (CFHistogram   histogram);
+static void          generate_histogram_gray (CFHistogram   hostogram,
+                                              GimpLayer    *layer,
+                                              gboolean      dither_alpha);
+static void          generate_histogram_rgb  (CFHistogram   histogram,
+                                              GimpLayer    *layer,
+                                              gint          col_limit,
+                                              gboolean      dither_alpha,
+                                              GimpProgress *progress);
+
+static QuantizeObj * initialize_median_cut   (GimpImageBaseType      old_type,
+                                              gint                   max_colors,
+                                              GimpConvertDitherType  dither_type,
+                                              GimpConvertPaletteType palette_type,
+                                              GimpPalette           *custom_palette,
+                                              gboolean               dither_alpha,
+                                              GimpProgress          *progress);
+
+static void          compute_color_lin8      (QuantizeObj           *quantobj,
+                                              CFHistogram            histogram,
+                                              boxptr                 boxp,
+                                              const int              icolor);
+
+
+static guchar    found_cols[MAXNUMCOLORS][3];
+static gint      num_found_cols;
+static gboolean  needs_quantize;
+static gboolean  had_white;
+static gboolean  had_black;
+
+
+/**********************************************************/
+typedef struct
+{
+  gint64 used_count;
+  guchar initial_index;
+} PalEntry;
+
+static int
+mapping_compare (const void *a,
+                 const void *b)
+{
+  PalEntry *m1 = (PalEntry *) a;
+  PalEntry *m2 = (PalEntry *) b;
+
+  return (m2->used_count - m1->used_count);
+}
+
+/* FWIW, the make_remap_table() and mapping_compare() function source
+ * and PalEntry may be re-used under the XFree86-style license.
+ * <adam@gimp.org>
+ */
+static void
+make_remap_table (const guchar  old_palette[],
+                  guchar        new_palette[],
+                  const guint64 index_used_count[],
+                  guchar        remap_table[],
+                  gint         *num_entries)
+{
+  gint      i, j, k;
+  guchar    temppal[256 * 3];
+  guint64   tempuse[256];
+  guint64   transmap[256];
+  PalEntry *palentries;
+  gint      used = 0;
+
+  memset (temppal, 0, 256 * 3);
+  memset (tempuse, 0, 256 * sizeof (guint64));
+  memset (transmap, 255, 256 * sizeof (guint64));
+
+  /* First pass - only collect entries which are marked as being used
+   * at all in index_used_count.
+   */
+  for (i = 0; i < *num_entries; i++)
+    {
+      if (index_used_count[i])
+        {
+          temppal[used*3 + 0] = old_palette[i*3 + 0];
+          temppal[used*3 + 1] = old_palette[i*3 + 1];
+          temppal[used*3 + 2] = old_palette[i*3 + 2];
+
+          tempuse[used] = index_used_count[i];
+          transmap[i] = used;
+
+          used++;
+        }
+    }
+
+  /* Second pass - remove duplicates. (O(n^3), could do better!) */
+  for (i = 0; i < used; i++)
+    {
+      for (j = 0; j < i; j++)
+        {
+          if ((temppal[i*3 + 1] == temppal[j*3 + 1]) &&
+              (temppal[i*3 + 0] == temppal[j*3 + 0]) &&
+              (temppal[i*3 + 2] == temppal[j*3 + 2]) &&
+              tempuse[j] &&
+              tempuse[i])
+            {
+              /* Move the 'used' tally from one to the other. */
+              tempuse[i] += tempuse[j];
+              /* zero one of them, deactivating its entry. */
+              tempuse[j] = 0;
+
+              /* change all mappings from this dead index to the live
+               * one.
+               */
+              for (k = 0; k < *num_entries; k++)
+                {
+                  if (index_used_count[k] && (transmap[k] == j))
+                    transmap[k] = i;
+                }
+            }
+        }
+    }
+
+  /* Third pass - rank all used indices to the beginning of the
+   * palette.
+   */
+  palentries = g_new (PalEntry, used);
+
+  for (i = 0; i < used; i++)
+    {
+      palentries[i].initial_index = i;
+      palentries[i].used_count    = tempuse[i];
+    }
+
+  qsort (palentries, used, sizeof (PalEntry), &mapping_compare);
+
+  for (i = 0; i < *num_entries; i++)
+    {
+      if (index_used_count[i])
+        {
+          for (j = 0; j < used; j++)
+            {
+              if ((transmap[i] == palentries[j].initial_index)
+                  && (palentries[j].used_count))
+                {
+                  remap_table[i] = j;
+                  break;
+                }
+            }
+        }
+    }
+  for (i = 0; i < *num_entries; i++)
+    {
+      if (index_used_count[i])
+        {
+          new_palette[remap_table[i] * 3 + 0] = old_palette[i * 3 + 0];
+          new_palette[remap_table[i] * 3 + 1] = old_palette[i * 3 + 1];
+          new_palette[remap_table[i] * 3 + 2] = old_palette[i * 3 + 2];
+        }
+    }
+
+  *num_entries = 0;
+
+  for (j = 0; j < used; j++)
+    {
+      if (palentries[j].used_count)
+        {
+          (*num_entries)++;
+        }
+    }
+
+  g_free (palentries);
+}
+
+static void
+remap_indexed_layer (GimpLayer    *layer,
+                     const guchar *remap_table,
+                     gint          num_entries)
+{
+  GeglBufferIterator *iter;
+  const Babl         *format;
+  gint                bpp;
+  gboolean            has_alpha;
+
+  format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+
+  bpp       = babl_format_get_bytes_per_pixel (format);
+  has_alpha = babl_format_has_alpha (format);
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, NULL,
+                                   GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE, 1);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      guchar *data   = iter->items[0].data;
+      gint    length = iter->length;
+
+      if (has_alpha)
+        {
+          while (length--)
+            {
+              if (data[ALPHA_I])
+                data[INDEXED] = remap_table[data[INDEXED]];
+              else
+                data[INDEXED] = 0;
+
+              data += bpp;
+            }
+        }
+      else
+        {
+          while (length--)
+            {
+              data[INDEXED] = remap_table[data[INDEXED]];
+
+              data += bpp;
+            }
+        }
+    }
+}
+
+static gint
+color_quicksort (const void *c1,
+                 const void *c2)
+{
+  Color *color1 = (Color *) c1;
+  Color *color2 = (Color *) c2;
+
+  gdouble v1 = GIMP_RGB_LUMINANCE (color1->red, color1->green, color1->blue);
+  gdouble v2 = GIMP_RGB_LUMINANCE (color2->red, color2->green, color2->blue);
+
+  if (v1 < v2)
+    return -1;
+  else if (v1 > v2)
+    return 1;
+  else
+    return 0;
+}
+
+gboolean
+gimp_image_convert_indexed (GimpImage               *image,
+                            GimpConvertPaletteType   palette_type,
+                            gint                     max_colors,
+                            gboolean                 remove_duplicates,
+                            GimpConvertDitherType    dither_type,
+                            gboolean                 dither_alpha,
+                            gboolean                 dither_text_layers,
+                            GimpPalette             *custom_palette,
+                            GimpProgress            *progress,
+                            GError                 **error)
+{
+  QuantizeObj       *quantobj     = NULL;
+  GimpObjectQueue   *queue        = NULL;
+  GimpProgress      *sub_progress = NULL;
+  GimpImageBaseType  old_type;
+  GList             *all_layers;
+  GList             *list;
+  GimpColorProfile  *dest_profile = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (gimp_image_get_base_type (image) != GIMP_INDEXED, FALSE);
+  g_return_val_if_fail (gimp_babl_is_valid (GIMP_INDEXED,
+                                            gimp_image_get_precision (image)),
+                        FALSE);
+  g_return_val_if_fail (custom_palette == NULL ||
+                        GIMP_IS_PALETTE (custom_palette), FALSE);
+  g_return_val_if_fail (custom_palette == NULL ||
+                        gimp_palette_get_n_colors (custom_palette) <= 256,
+                        FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (palette_type == GIMP_CONVERT_PALETTE_CUSTOM)
+    {
+      if (! custom_palette)
+        palette_type = GIMP_CONVERT_PALETTE_MONO;
+
+      if (gimp_palette_get_n_colors (custom_palette) == 0)
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("Cannot convert image: palette is empty."));
+          return FALSE;
+        }
+    }
+
+  gimp_set_busy (image->gimp);
+
+  all_layers = gimp_image_get_layer_list (image);
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CONVERT,
+                               C_("undo-type", "Convert Image to Indexed"));
+
+  /*  Push the image type to the stack  */
+  gimp_image_undo_push_image_type (image, NULL);
+
+  /*  Set the new base type  */
+  old_type = gimp_image_get_base_type (image);
+
+  g_object_set (image, "base-type", GIMP_INDEXED, NULL);
+
+  /* when converting from GRAY, convert to the new type's builtin
+   * profile.
+   */
+  if (old_type == GIMP_GRAY)
+    {
+      if (gimp_image_get_color_profile (image))
+        dest_profile = gimp_image_get_builtin_color_profile (image);
+    }
+
+  /*  Build histogram if necessary.  */
+  rgb_to_lab_fish = babl_fish (babl_format ("R'G'B' float"),
+                               babl_format ("CIE Lab float"));
+  lab_to_rgb_fish = babl_fish (babl_format ("CIE Lab float"),
+                               babl_format ("R'G'B' float"));
+
+  /* don't dither if the input is grayscale and we are simply mapping
+   * every color
+   */
+  if (old_type     == GIMP_GRAY &&
+      max_colors   == 256       &&
+      palette_type == GIMP_CONVERT_PALETTE_GENERATE)
+    {
+      dither_type = GIMP_CONVERT_DITHER_NONE;
+    }
+
+  if (progress)
+    {
+      queue        = gimp_object_queue_new (progress);
+      sub_progress = GIMP_PROGRESS (queue);
+
+      gimp_object_queue_push_list (queue, all_layers);
+    }
+
+  quantobj = initialize_median_cut (old_type, max_colors, dither_type,
+                                    palette_type, custom_palette,
+                                    dither_alpha,
+                                    sub_progress);
+
+  if (palette_type == GIMP_CONVERT_PALETTE_GENERATE)
+    {
+      if (old_type == GIMP_GRAY)
+        zero_histogram_gray (quantobj->histogram);
+      else
+        zero_histogram_rgb (quantobj->histogram);
+
+      /* To begin, assume that there are fewer colors in the image
+       *  than the user actually asked for.  In that case, we don't
+       *  need to quantize or color-dither.
+       */
+      needs_quantize = FALSE;
+      had_black = FALSE;
+      had_white = FALSE;
+      num_found_cols = 0;
+
+      /*  Build the histogram  */
+      for (list = all_layers;
+           list;
+           list = g_list_next (list))
+        {
+          GimpLayer *layer = list->data;
+
+          if (queue)
+            gimp_object_queue_pop (queue);
+
+          if (old_type == GIMP_GRAY)
+            {
+              generate_histogram_gray (quantobj->histogram,
+                                       layer, dither_alpha);
+            }
+          else
+            {
+              /* Note: generate_histogram_rgb may set needs_quantize
+               * if the image contains more colors than the limit
+               * specified by the user.
+               */
+              generate_histogram_rgb (quantobj->histogram,
+                                      layer, max_colors, dither_alpha,
+                                      sub_progress);
+            }
+        }
+    }
+
+  if (progress)
+    gimp_progress_set_text_literal (progress,
+                                    _("Converting to indexed colors (stage 2)"));
+
+  if (old_type == GIMP_RGB &&
+      ! needs_quantize     &&
+      palette_type == GIMP_CONVERT_PALETTE_GENERATE)
+    {
+      gint i;
+
+      /*  If this is an RGB image, and the user wanted a custom-built
+       *  generated palette, and this image has no more colors than
+       *  the user asked for, we don't need the first pass
+       *  (quantization).
+       *
+       *  There's also no point in dithering, since there's no error
+       *  to spread.  So we destroy the old quantobj and make a new
+       *  one with the remapping function set to a special LUT-based
+       *  no-dither remapper.
+       */
+
+      quantobj->delete_func (quantobj);
+      quantobj = initialize_median_cut (old_type, max_colors,
+                                        GIMP_CONVERT_DITHER_NODESTRUCT,
+                                        palette_type,
+                                        custom_palette,
+                                        dither_alpha,
+                                        sub_progress);
+      /* We can skip the first pass (palette creation) */
+
+      quantobj->actual_number_of_colors = num_found_cols;
+      for (i = 0; i < num_found_cols; i++)
+        {
+          quantobj->cmap[i].red   = found_cols[i][0];
+          quantobj->cmap[i].green = found_cols[i][1];
+          quantobj->cmap[i].blue  = found_cols[i][2];
+        }
+    }
+  else
+    {
+      quantobj->first_pass (quantobj);
+    }
+
+  if (palette_type == GIMP_CONVERT_PALETTE_GENERATE)
+    qsort (quantobj->cmap,
+           quantobj->actual_number_of_colors, sizeof (Color),
+           color_quicksort);
+
+  if (progress)
+    {
+      gimp_progress_set_text_literal (progress,
+                                      _("Converting to indexed colors (stage 3)"));
+
+      gimp_object_queue_clear (queue);
+      gimp_object_queue_push_list (queue, all_layers);
+    }
+
+  /* Initialise data which must persist across indexed layer iterations */
+  if (quantobj->second_pass_init)
+    quantobj->second_pass_init (quantobj);
+
+  /*  Set the generated palette on the image, we need it to
+   *  convert the layers. We optionally remove duplicate entries
+   *  after the layer conversion.
+   */
+  {
+    guchar colormap[GIMP_IMAGE_COLORMAP_SIZE];
+    gint   i, j;
+
+    for (i = 0, j = 0; i < quantobj->actual_number_of_colors; i++)
+      {
+        colormap[j++] = quantobj->cmap[i].red;
+        colormap[j++] = quantobj->cmap[i].green;
+        colormap[j++] = quantobj->cmap[i].blue;
+      }
+
+    gimp_image_set_colormap (image, colormap,
+                             quantobj->actual_number_of_colors, TRUE);
+  }
+
+  /*  Convert all layers  */
+  for (list = all_layers;
+       list;
+       list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+      gboolean   quantize;
+
+      if (queue)
+        gimp_object_queue_pop (queue);
+
+      if (gimp_item_is_text_layer (GIMP_ITEM (layer)))
+        quantize = dither_text_layers;
+      else
+        quantize = TRUE;
+
+      if (quantize)
+        {
+          GeglBuffer *new_buffer;
+          gboolean    has_alpha;
+
+          has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
+
+          new_buffer =
+            gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                             gimp_item_get_width  (GIMP_ITEM (layer)),
+                                             gimp_item_get_height (GIMP_ITEM (layer))),
+                             gimp_image_get_layer_format (image,
+                                                          has_alpha));
+
+          quantobj->second_pass (quantobj, layer, new_buffer);
+
+          gimp_drawable_set_buffer (GIMP_DRAWABLE (layer), TRUE, NULL,
+                                    new_buffer);
+          g_object_unref (new_buffer);
+        }
+      else
+        {
+          gimp_drawable_convert_type (GIMP_DRAWABLE (layer), image,
+                                      GIMP_INDEXED,
+                                      gimp_drawable_get_precision (GIMP_DRAWABLE (layer)),
+                                      gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)),
+                                      dest_profile,
+                                      GEGL_DITHER_NONE, GEGL_DITHER_NONE,
+                                      TRUE, sub_progress);
+        }
+    }
+
+  /*  Set the final palette on the image  */
+  if (remove_duplicates &&
+      (palette_type != GIMP_CONVERT_PALETTE_GENERATE) &&
+      (palette_type != GIMP_CONVERT_PALETTE_MONO))
+    {
+      guchar colormap[GIMP_IMAGE_COLORMAP_SIZE];
+      gint   i, j;
+      guchar old_palette[256 * 3];
+      guchar new_palette[256 * 3];
+      guchar remap_table[256];
+      gint   num_entries;
+
+      for (i = 0, j = 0; i < quantobj->actual_number_of_colors; i++)
+        {
+          old_palette[j++] = quantobj->cmap[i].red;
+          old_palette[j++] = quantobj->cmap[i].green;
+          old_palette[j++] = quantobj->cmap[i].blue;
+        }
+
+      num_entries = quantobj->actual_number_of_colors;
+
+      /* Generate a remapping table */
+      make_remap_table (old_palette, new_palette,
+                        quantobj->index_used_count,
+                        remap_table, &num_entries);
+
+      /*  Convert all layers  */
+      for (list = all_layers; list; list = g_list_next (list))
+        {
+          remap_indexed_layer (list->data, remap_table, num_entries);
+        }
+
+      for (i = 0, j = 0; i < num_entries; i++)
+        {
+          colormap[j] = new_palette[j]; j++;
+          colormap[j] = new_palette[j]; j++;
+          colormap[j] = new_palette[j]; j++;
+        }
+
+      gimp_image_set_colormap (image, colormap, num_entries, TRUE);
+    }
+
+  /*  When converting from GRAY, set the new profile.
+   */
+  if (old_type == GIMP_GRAY)
+    {
+      if (gimp_image_get_color_profile (image))
+        gimp_image_set_color_profile (image, dest_profile, NULL);
+      else
+        gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image));
+    }
+
+  /*  Delete the quantizer object, if there is one */
+  if (quantobj)
+    quantobj->delete_func (quantobj);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_mode_changed (image);
+  g_object_thaw_notify (G_OBJECT (image));
+
+  g_clear_object (&queue);
+
+  g_list_free (all_layers);
+
+  gimp_unset_busy (image->gimp);
+
+  return TRUE;
+}
+
+/*
+ *  Indexed color conversion machinery
+ */
+
+static void
+zero_histogram_gray (CFHistogram histogram)
+{
+  gint i;
+
+  for (i = 0; i < 256; i++)
+    histogram[i] = 0;
+}
+
+
+static void
+zero_histogram_rgb (CFHistogram histogram)
+{
+  memset (histogram, 0,
+          HIST_R_ELEMS * HIST_G_ELEMS * HIST_B_ELEMS * sizeof (ColorFreq));
+}
+
+
+static void
+generate_histogram_gray (CFHistogram  histogram,
+                         GimpLayer   *layer,
+                         gboolean     dither_alpha)
+{
+  GeglBufferIterator *iter;
+  const Babl         *format;
+  gint                bpp;
+  gboolean            has_alpha;
+
+  format = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+
+  g_return_if_fail (format == babl_format_with_space ("Y' u8", format) ||
+                    format == babl_format_with_space ("Y'A u8", format));
+
+  bpp       = babl_format_get_bytes_per_pixel (format);
+  has_alpha = babl_format_has_alpha (format);
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *data   = iter->items[0].data;
+      gint          length = iter->length;
+
+      if (has_alpha)
+        {
+          while (length--)
+            {
+              if (data[ALPHA_G] > 127)
+                histogram[*data]++;
+
+              data += bpp;
+            }
+        }
+      else
+        {
+          while (length--)
+            {
+              histogram[*data]++;
+
+              data += bpp;
+            }
+        }
+    }
+}
+
+static void
+check_white_or_black (const guchar *data)
+{
+  if (data[RED]   == 255 &&
+      data[GREEN] == 255 &&
+      data[BLUE]  == 255)
+    had_white = TRUE;
+  if (data[RED]  ==0 &&
+      data[GREEN]==0 &&
+      data[BLUE] ==0)
+    had_black = TRUE;
+}
+
+static void
+generate_histogram_rgb (CFHistogram   histogram,
+                        GimpLayer    *layer,
+                        gint          col_limit,
+                        gboolean      dither_alpha,
+                        GimpProgress *progress)
+{
+  GeglBufferIterator *iter;
+  const Babl         *format;
+  GeglRectangle      *roi;
+  ColorFreq          *colfreq;
+  gint                nfc_iter;
+  gint                row, col, coledge;
+  gint                offsetx, offsety;
+  gint64              layer_size;
+  gint64              total_size = 0;
+  gint                count      = 0;
+  gint                bpp;
+  gboolean            has_alpha;
+
+  format = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+
+  g_return_if_fail (format == babl_format ("R'G'B' u8") ||
+                    format == babl_format ("R'G'B'A u8"));
+
+  bpp       = babl_format_get_bytes_per_pixel (format);
+  has_alpha = babl_format_has_alpha (format);
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  layer_size = (gimp_item_get_width  (GIMP_ITEM (layer)) *
+                gimp_item_get_height (GIMP_ITEM (layer)));
+
+  /*  g_printerr ("col_limit = %d, nfc = %d\n", col_limit, num_found_cols); */
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+  roi = &iter->items[0].roi;
+
+  if (progress)
+    gimp_progress_set_value (progress, 0.0);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *data   = iter->items[0].data;
+      gint          length = iter->length;
+
+      total_size += length;
+
+      /* g_printerr (" [%d,%d - %d,%d]", srcPR.x, src_roi->y, offsetx, offsety); */
+
+      if (needs_quantize)
+        {
+          if (dither_alpha)
+            {
+              /* if alpha-dithering,
+                 we need to be deterministic w.r.t. offsets */
+
+              col = roi->x + offsetx;
+              coledge = col + roi->width;
+              row = roi->y + offsety;
+
+              while (length--)
+                {
+                  gboolean transparent = FALSE;
+
+                  if (has_alpha &&
+                      data[ALPHA] <
+                      DM[col & DM_WIDTHMASK][row & DM_HEIGHTMASK])
+                    transparent = TRUE;
+
+                  if (! transparent)
+                    {
+                      colfreq = HIST_RGB (histogram,
+                                          data[RED],
+                                          data[GREEN],
+                                          data[BLUE]);
+                      check_white_or_black (data);
+                      (*colfreq)++;
+                    }
+
+                  col++;
+                  if (col == coledge)
+                    {
+                      col = roi->x + offsetx;
+                      row++;
+                    }
+
+                  data += bpp;
+                }
+            }
+          else
+            {
+              while (length--)
+                {
+                  if ((has_alpha && ((data[ALPHA] > 127)))
+                      || (!has_alpha))
+                    {
+                      colfreq = HIST_RGB (histogram,
+                                          data[RED],
+                                          data[GREEN],
+                                          data[BLUE]);
+                      check_white_or_black (data);
+                      (*colfreq)++;
+                    }
+
+                  data += bpp;
+                }
+            }
+        }
+      else
+        {
+          /* if alpha-dithering, we need to be deterministic w.r.t. offsets */
+          col = roi->x + offsetx;
+          coledge = col + roi->width;
+          row = roi->y + offsety;
+
+          while (length--)
+            {
+              gboolean transparent = FALSE;
+
+              if (has_alpha)
+                {
+                  if (dither_alpha)
+                    {
+                      if (data[ALPHA] <
+                          DM[col & DM_WIDTHMASK][row & DM_HEIGHTMASK])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (data[ALPHA] <= 127)
+                        transparent = TRUE;
+                    }
+                }
+
+              if (! transparent)
+                {
+                  colfreq = HIST_RGB (histogram,
+                                      data[RED],
+                                      data[GREEN],
+                                      data[BLUE]);
+                  (*colfreq)++;
+
+                  if (!needs_quantize)
+                    {
+                      for (nfc_iter = 0;
+                           nfc_iter < num_found_cols;
+                           nfc_iter++)
+                        {
+                          if ((data[RED]   == found_cols[nfc_iter][0]) &&
+                              (data[GREEN] == found_cols[nfc_iter][1]) &&
+                              (data[BLUE]  == found_cols[nfc_iter][2]))
+                            goto already_found;
+                        }
+
+                      /* Color was not in the table of
+                       * existing colors
+                       */
+
+                      num_found_cols++;
+
+                      if (num_found_cols > col_limit)
+                        {
+                          /* There are more colors in the image than
+                           *  were allowed.  We switch to plain
+                           *  histogram calculation with a view to
+                           *  quantizing at a later stage.
+                           */
+                          needs_quantize = TRUE;
+                          /* g_print ("\nmax colors exceeded - needs quantize.\n");*/
+                          goto already_found;
+                        }
+                      else
+                        {
+                          /* Remember the new color we just found.
+                           */
+                          found_cols[num_found_cols-1][0] = data[RED];
+                          found_cols[num_found_cols-1][1] = data[GREEN];
+                          found_cols[num_found_cols-1][2] = data[BLUE];
+
+                          check_white_or_black (data);
+                        }
+                    }
+                }
+            already_found:
+
+              col++;
+              if (col == coledge)
+                {
+                  col = roi->x + offsetx;
+                  row++;
+                }
+
+              data += bpp;
+            }
+        }
+
+      if (progress && (count % 16 == 0))
+        gimp_progress_set_value (progress,
+                                 (gdouble) total_size / (gdouble) layer_size);
+    }
+
+/*  g_print ("O: col_limit = %d, nfc = %d\n", col_limit, num_found_cols);*/
+}
+
+
+
+static boxptr
+find_split_candidate (const boxptr  boxlist,
+                      const gint    numboxes,
+                      AxisType     *which_axis,
+                      const gint    desired_colors)
+{
+  boxptr  boxp;
+  gint    i;
+  etype   maxc = 0;
+  boxptr  which = NULL;
+  gdouble Lbias;
+
+  *which_axis = AXIS_UNDEF;
+
+  /* we only perform the initial L-split bias /at all/ if the final
+     number of desired colors is quite low, otherwise it all comes
+     out in the wash anyway and this initial bias generally only hurts
+     us in the long run. */
+  if (desired_colors <= 16)
+    {
+#define BIAS_FACTOR 2.66F
+#define BIAS_NUMBER 2 /* 0 */
+
+      /* we bias towards splitting across L* for first few colors */
+      Lbias = (numboxes > BIAS_NUMBER) ? 1.0F : ((gdouble) (BIAS_NUMBER + 1) -
+                                                 ((gdouble) numboxes)) /
+        ((gdouble) BIAS_NUMBER / BIAS_FACTOR);
+      /*Lbias = 1.0;
+        fprintf(stderr, " [[%d]] ", numboxes);
+        fprintf(stderr, "Using ramped L-split bias.\n");
+        fprintf(stderr, "R\n");
+      */
+    }
+  else
+    Lbias = 1.0F;
+
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++)
+    {
+      if (boxp->volume > 0)
+        {
+#ifndef _MSC_VER
+          etype rpe = (double)((boxp->rerror) * R_SCALE * R_SCALE);
+          etype gpe = (double)((boxp->gerror) * G_SCALE * G_SCALE);
+          etype bpe = (double)((boxp->berror) * B_SCALE * B_SCALE);
+#else
+          /*
+           * Sorry about the mess, otherwise would get :
+           * error C2520: conversion from unsigned __int64 to double
+           *              not implemented, use signed __int64
+           */
+          etype rpe = (double)(((__int64)boxp->rerror) * R_SCALE * R_SCALE);
+          etype gpe = (double)(((__int64)boxp->gerror) * G_SCALE * G_SCALE);
+          etype bpe = (double)(((__int64)boxp->berror) * B_SCALE * B_SCALE);
+#endif
+
+          if (Lbias * rpe > maxc &&
+              boxp->Rmin < boxp->Rmax)
+            {
+              which = boxp;
+              maxc  = Lbias * rpe;
+              *which_axis = AXIS_RED;
+            }
+
+          if (gpe > maxc &&
+              boxp->Gmin < boxp->Gmax)
+            {
+              which = boxp;
+              maxc  = gpe;
+              *which_axis = AXIS_GREEN;
+            }
+
+          if (bpe > maxc &&
+              boxp->Bmin < boxp->Bmax)
+            {
+              which = boxp;
+              maxc  = bpe;
+              *which_axis = AXIS_BLUE;
+            }
+        }
+    }
+
+  /*  fprintf(stderr, " %f,%p ", maxc, which); */
+  /*  fprintf(stderr, " %llu ", maxc); */
+
+  return which;
+}
+
+
+/* Find the splittable box with the largest (scaled) volume Returns
+ * NULL if no splittable boxes remain
+ */
+static boxptr
+find_biggest_volume (const boxptr boxlist,
+                     const gint   numboxes)
+{
+  boxptr boxp;
+  gint   i;
+  gint   maxv = 0;
+  boxptr which = NULL;
+
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++)
+    {
+      if (boxp->volume > maxv)
+        {
+          which = boxp;
+          maxv = boxp->volume;
+        }
+    }
+
+  return which;
+}
+
+
+/* Shrink the min/max bounds of a box to enclose only nonzero
+ * elements, and recompute its volume and population
+ */
+static void
+update_box_gray (const CFHistogram histogram,
+                 boxptr            boxp)
+{
+  gint      i, min, max, dist;
+  ColorFreq ccount;
+
+  min = boxp->Rmin;
+  max = boxp->Rmax;
+
+  if (max > min)
+    for (i = min; i <= max; i++)
+      {
+        if (histogram[i] != 0)
+          {
+            boxp->Rmin = min = i;
+            break;
+          }
+      }
+
+  if (max > min)
+    for (i = max; i >= min; i--)
+      {
+        if (histogram[i] != 0)
+          {
+            boxp->Rmax = max = i;
+            break;
+          }
+      }
+
+  /* Update box volume.
+   * We use 2-norm rather than real volume here; this biases the method
+   * against making long narrow boxes, and it has the side benefit that
+   * a box is splittable iff norm > 0.
+   * Since the differences are expressed in histogram-cell units,
+   * we have to shift back to JSAMPLE units to get consistent distances;
+   * after which, we scale according to the selected distance scale factors.
+   */
+  dist = max - min;
+  boxp->volume = dist * dist;
+
+  /* Now scan remaining volume of box and compute population */
+  ccount = 0;
+  for (i = min; i <= max; i++)
+    if (histogram[i] != 0)
+      ccount++;
+
+  boxp->colorcount = ccount;
+}
+
+
+/* Shrink the min/max bounds of a box to enclose only nonzero
+ * elements, and recompute its volume, population and error
+ */
+static void
+update_box_rgb (const CFHistogram histogram,
+                boxptr            boxp,
+                const gint        cells_remaining)
+{
+  gint      R, G, B;
+  gint      Rmin, Rmax, Gmin, Gmax, Bmin, Bmax;
+  gint      dist0, dist1, dist2;
+  ColorFreq ccount;
+  /*
+  guint64 tempRerror;
+  guint64 tempGerror;
+  guint64 tempBerror;
+  */
+  QuantizeObj dummyqo;
+  box         dummybox;
+
+  /* fprintf(stderr, "U"); */
+
+  Rmin = boxp->Rmin;  Rmax = boxp->Rmax;
+  Gmin = boxp->Gmin;  Gmax = boxp->Gmax;
+  Bmin = boxp->Bmin;  Bmax = boxp->Bmax;
+
+  if (Rmax > Rmin)
+    for (R = Rmin; R <= Rmax; R++)
+      for (G = Gmin; G <= Gmax; G++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              if (*HIST_LIN (histogram, R, G, B) != 0)
+                {
+                  boxp->Rmin = Rmin = R;
+                  goto have_Rmin;
+                }
+            }
+        }
+ have_Rmin:
+  if (Rmax > Rmin)
+    for (R = Rmax; R >= Rmin; R--)
+      for (G = Gmin; G <= Gmax; G++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              if (*HIST_LIN (histogram, R, G, B) != 0)
+                {
+                  boxp->Rmax = Rmax = R;
+                  goto have_Rmax;
+                }
+            }
+        }
+ have_Rmax:
+  if (Gmax > Gmin)
+    for (G = Gmin; G <= Gmax; G++)
+      for (R = Rmin; R <= Rmax; R++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              if (*HIST_LIN (histogram, R, G, B) != 0)
+                {
+                  boxp->Gmin = Gmin = G;
+                  goto have_Gmin;
+                }
+            }
+        }
+ have_Gmin:
+  if (Gmax > Gmin)
+    for (G = Gmax; G >= Gmin; G--)
+      for (R = Rmin; R <= Rmax; R++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              if (*HIST_LIN (histogram, R, G, B) != 0)
+                {
+                  boxp->Gmax = Gmax = G;
+                  goto have_Gmax;
+                }
+            }
+        }
+ have_Gmax:
+  if (Bmax > Bmin)
+    for (B = Bmin; B <= Bmax; B++)
+      for (R = Rmin; R <= Rmax; R++)
+        {
+          for (G = Gmin; G <= Gmax; G++)
+            {
+              if (*HIST_LIN (histogram, R, G, B) != 0)
+                {
+                  boxp->Bmin = Bmin = B;
+                  goto have_Bmin;
+                }
+            }
+        }
+ have_Bmin:
+  if (Bmax > Bmin)
+    for (B = Bmax; B >= Bmin; B--)
+      for (R = Rmin; R <= Rmax; R++)
+        {
+          for (G = Gmin; G <= Gmax; G++)
+            {
+              if (*HIST_LIN (histogram, R, G, B) != 0)
+                {
+                  boxp->Bmax = Bmax = B;
+                  goto have_Bmax;
+                }
+            }
+        }
+ have_Bmax:
+
+  /* Update box volume.
+   * We use 2-norm rather than real volume here; this biases the method
+   * against making long narrow boxes, and it has the side benefit that
+   * a box is splittable iff norm > 0. (ADM: note: this isn't true.)
+   * Since the differences are expressed in histogram-cell units,
+   * we have to shift back to JSAMPLE units to get consistent distances;
+   * after which, we scale according to the selected distance scale factors.
+   */
+  dist0 = ((1 + Rmax - Rmin) << R_SHIFT) * R_SCALE;
+  dist1 = ((1 + Gmax - Gmin) << G_SHIFT) * G_SCALE;
+  dist2 = ((1 + Bmax - Bmin) << B_SHIFT) * B_SCALE;
+  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
+  /*  boxp->volume = dist0 * dist1 * dist2; */
+
+  compute_color_lin8(&dummyqo, histogram, boxp, 0);
+
+  /*printf("(%d %d %d)\n", dummyqo.cmap[0].red,dummyqo.cmap[0].green,dummyqo.cmap[0].blue);
+    fflush(stdout);*/
+
+  /* Now scan remaining volume of box and compute population */
+  ccount = 0;
+  boxp->error = 0;
+  boxp->rerror = 0;
+  boxp->gerror = 0;
+  boxp->berror = 0;
+  for (R = Rmin; R <= Rmax; R++)
+    {
+      for (G = Gmin; G <= Gmax; G++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              ColorFreq freq_here;
+
+              freq_here = *HIST_LIN (histogram, R, G, B);
+
+              if (freq_here != 0)
+                {
+                  int ge, be, re;
+
+                  dummybox.Rmin = dummybox.Rmax = R;
+                  dummybox.Gmin = dummybox.Gmax = G;
+                  dummybox.Bmin = dummybox.Bmax = B;
+                  compute_color_lin8(&dummyqo, histogram, &dummybox, 1);
+
+                  re = dummyqo.cmap[0].red   - dummyqo.cmap[1].red;
+                  ge = dummyqo.cmap[0].green - dummyqo.cmap[1].green;
+                  be = dummyqo.cmap[0].blue  - dummyqo.cmap[1].blue;
+
+                  boxp->rerror += freq_here * (re) * (re);
+                  boxp->gerror += freq_here * (ge) * (ge);
+                  boxp->berror += freq_here * (be) * (be);
+
+                  ccount += freq_here;
+                }
+            }
+        }
+    }
+
+#if 0
+  fg d;flg fd;kg fld;gflkfld
+  /* Scan again, taking note of halfway error point for red axis */
+  tempRerror = 0;
+  boxp->Rhalferror = Rmin;
+#warning r<=?
+  for (R = Rmin; R <= Rmax; R++)
+    {
+      for (G = Gmin; G <= Gmax; G++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              ColorFreq freq_here;
+              freq_here = *HIST_LIN(histogram, R, G, B);
+              if (freq_here != 0)
+                {
+                  int re;
+                  int idist;
+                  double dist;
+
+                  dummybox.Rmin = dummybox.Rmax = R;
+                  dummybox.Gmin = dummybox.Gmax = G;
+                  dummybox.Bmin = dummybox.Bmax = B;
+                  compute_color_lin8(&dummyqo, histogram, &dummybox, 1);
+
+                  re = dummyqo.cmap[0].red   - dummyqo.cmap[1].red;
+
+                  tempRerror += freq_here * (re) * (re);
+
+                  if (tempRerror*2 >= boxp->rerror)
+                    goto green_axisscan;
+                  else
+                    boxp->Rhalferror = R;
+                }
+            }
+        }
+    }
+  fprintf(stderr, " D:");
+ green_axisscan:
+
+  fprintf(stderr, "<%d: %llu/%llu> ", R, tempRerror, boxp->rerror);
+  /* Scan again, taking note of halfway error point for green axis */
+  tempGerror = 0;
+  boxp->Ghalferror = Gmin;
+#warning G<=?
+  for (G = Gmin; G <= Gmax; G++)
+    {
+      for (R = Rmin; R <= Rmax; R++)
+        {
+          for (B = Bmin; B <= Bmax; B++)
+            {
+              ColorFreq freq_here;
+              freq_here = *HIST_LIN(histogram, R, G, B);
+              if (freq_here != 0)
+                {
+                  int ge;
+                  dummybox.Rmin = dummybox.Rmax = R;
+                  dummybox.Gmin = dummybox.Gmax = G;
+                  dummybox.Bmin = dummybox.Bmax = B;
+                  compute_color_lin8(&dummyqo, histogram, &dummybox, 1);
+
+                  ge = dummyqo.cmap[0].green - dummyqo.cmap[1].green;
+
+                  tempGerror += freq_here * (ge) * (ge);
+
+                  if (tempGerror*2 >= boxp->gerror)
+                    goto blue_axisscan;
+                  else
+                    boxp->Ghalferror = G;
+                }
+            }
+        }
+    }
+
+ blue_axisscan:
+  /* Scan again, taking note of halfway error point for blue axis */
+  tempBerror = 0;
+  boxp->Bhalferror = Bmin;
+#warning B<=?
+  for (B = Bmin; B <= Bmax; B++)
+    {
+      for (R = Rmin; R <= Rmax; R++)
+        {
+          for (G = Gmin; G <= Gmax; G++)
+            {
+              ColorFreq freq_here;
+              freq_here = *HIST_LIN(histogram, R, G, B);
+              if (freq_here != 0)
+                {
+                  int be;
+                  dummybox.Rmin = dummybox.Rmax = R;
+                  dummybox.Gmin = dummybox.Gmax = G;
+                  dummybox.Bmin = dummybox.Bmax = B;
+                  compute_color_lin8(&dummyqo, histogram, &dummybox, 1);
+
+                  be = dummyqo.cmap[0].blue  - dummyqo.cmap[1].blue;
+
+                  tempBerror += freq_here * (be) * (be);
+
+                  if (tempBerror*2 >= boxp->berror)
+                    goto finished_axesscan;
+                  else
+                    boxp->Bhalferror = B;
+                }
+            }
+        }
+    }
+ finished_axesscan:
+#else
+
+  boxp->Rhalferror = Rmin + (Rmax - Rmin + 1) / 2;
+  boxp->Ghalferror = Gmin + (Gmax - Gmin + 1) / 2;
+  boxp->Bhalferror = Bmin + (Bmax - Bmin + 1) / 2;
+
+  if (dist0 && dist1 && dist2)
+    {
+      AxisType longest_ax      = AXIS_UNDEF;
+      gint     longest_length  = 0;
+      gint     longest_length2 = 0;
+      gint     ratio;
+
+      /*
+        fprintf(stderr, "[%d,%d,%d=%d,%d,%d] ",
+        (Rmax - Rmin), (Gmax - Gmin), (Bmax - Bmin),
+        dist0, dist1, dist2);
+      */
+
+      if (dist0 >= longest_length)
+        {
+          longest_length2 = longest_length;
+          longest_length = dist0;
+          longest_ax = AXIS_RED;
+        }
+      else if (dist0 >= longest_length2)
+        {
+          longest_length2 = dist0;
+        }
+
+      if (dist1 >= longest_length)
+        {
+          longest_length2 = longest_length;
+          longest_length = dist1;
+          longest_ax = AXIS_GREEN;
+        }
+      else if (dist1 >= longest_length2)
+        {
+          longest_length2 = dist1;
+        }
+
+      if (dist2 >= longest_length)
+        {
+          longest_length2 = longest_length;
+          longest_length = dist2;
+          longest_ax = AXIS_BLUE;
+        }
+      else if (dist2 >= longest_length2)
+        {
+          longest_length2 = dist2;
+        }
+
+      if (longest_length2 == 0)
+        longest_length2 = 1;
+
+      ratio = (longest_length + longest_length2/2) / longest_length2;
+      /* fprintf(stderr, " ratio:(%d/%d)=%d ", longest_length, longest_length2, ratio);
+         fprintf(stderr, "C%d ", cells_remaining); */
+
+      if (ratio > cells_remaining + 1)
+        ratio = cells_remaining + 1;
+
+      if (ratio > 2)
+        {
+          switch (longest_ax)
+            {
+            case AXIS_RED:
+              if (Rmin + (Rmax - Rmin + ratio / 2) / ratio < Rmax)
+                {
+                  /* fprintf(stderr, "FR%d \007\n",ratio);*/
+                  boxp->Rhalferror = Rmin +  (Rmax - Rmin + ratio / 2) / ratio;
+                }
+              break;
+            case AXIS_GREEN:
+              if (Gmin + (Gmax - Gmin + ratio / 2) / ratio < Gmax)
+                {
+                  /* fprintf(stderr, "FG%d \007\n",ratio);*/
+                  boxp->Ghalferror = Gmin + (Gmax - Gmin + ratio / 2) / ratio;
+                }
+              break;
+            case AXIS_BLUE:
+              if (Bmin + (Bmax - Bmin + ratio / 2) / ratio < Bmax)
+                {
+                  /* fprintf(stderr, "FB%d \007\n",ratio);*/
+                  boxp->Bhalferror = Bmin + (Bmax - Bmin + ratio / 2) / ratio;
+                }
+              break;
+            default:
+              g_warning ("GRR, UNDEF LONGEST AXIS\007\n");
+            }
+        }
+    }
+
+  if (boxp->Rhalferror == Rmax)
+    boxp->Rhalferror = Rmin;
+  if (boxp->Ghalferror == Gmax)
+    boxp->Ghalferror = Gmin;
+  if (boxp->Bhalferror == Bmax)
+    boxp->Bhalferror = Bmin;
+
+  /*
+  boxp->Rhalferror = RSDF(dummyqo.cmap[0].red);
+  boxp->Ghalferror = GSDF(dummyqo.cmap[0].green);
+  boxp->Bhalferror = BSDF(dummyqo.cmap[0].blue);
+  */
+
+  /*
+  boxp->Rhalferror = (RSDF(dummyqo.cmap[0].red) + (Rmin+Rmax)/2)/2;
+  boxp->Ghalferror = (GSDF(dummyqo.cmap[0].green) + (Gmin+Gmax)/2)/2;
+  boxp->Bhalferror = (BSDF(dummyqo.cmap[0].blue) + (Bmin+Bmax)/2)/2;
+  */
+
+
+#endif
+  /*
+  fprintf(stderr, " %d,%d", dummyqo.cmap[0].blue, boxp->Bmax);
+
+  gimp_assert (boxp->Rhalferror >= boxp->Rmin);
+  gimp_assert (boxp->Rhalferror < boxp->Rmax);
+  gimp_assert (boxp->Ghalferror >= boxp->Gmin);
+  gimp_assert (boxp->Ghalferror < boxp->Gmax);
+  gimp_assert (boxp->Bhalferror >= boxp->Bmin);
+  gimp_assert (boxp->Bhalferror < boxp->Bmax);*/
+
+  /*boxp->error = (sqrt((double)(boxp->error/ccount)));*/
+  /*  boxp->rerror = (sqrt((double)((boxp->rerror)/ccount)));
+  boxp->gerror = (sqrt((double)((boxp->gerror)/ccount)));
+  boxp->berror = (sqrt((double)((boxp->berror)/ccount)));*/
+  /*printf(":%lld / %ld: ", boxp->error, ccount);
+  printf("(%d-%d-%d)(%d-%d-%d)(%d-%d-%d)\n",
+         Rmin, boxp->Rhalferror, Rmax,
+         Gmin, boxp->Ghalferror, Gmax,
+         Bmin, boxp->Bhalferror, Bmax
+         );
+         fflush(stdout);*/
+
+  boxp->colorcount = ccount;
+}
+
+
+/* Repeatedly select and split the largest box until we have enough
+ * boxes
+ */
+static gint
+median_cut_gray (CFHistogram histogram,
+                 boxptr      boxlist,
+                 gint        numboxes,
+                 gint        desired_colors)
+{
+  gint   lb;
+  boxptr b1, b2;
+
+  while (numboxes < desired_colors)
+    {
+      /* Select box to split.
+       * Current algorithm: by population for first half, then by volume.
+       */
+
+      b1 = find_biggest_volume (boxlist, numboxes);
+
+      if (b1 == NULL)           /* no splittable boxes left! */
+        break;
+
+      b2 = boxlist + numboxes;  /* where new box will go */
+      /* Copy the color bounds to the new box. */
+      b2->Rmax = b1->Rmax;
+      b2->Rmin = b1->Rmin;
+
+      /* Current algorithm: split at halfway point.
+       * (Since the box has been shrunk to minimum volume,
+       * any split will produce two nonempty subboxes.)
+       * Note that lb value is max for lower box, so must be < old max.
+       */
+      lb = (b1->Rmax + b1->Rmin) / 2;
+      b1->Rmax = lb;
+      b2->Rmin = lb + 1;
+
+      /* Update stats for boxes */
+      update_box_gray (histogram, b1);
+      update_box_gray (histogram, b2);
+      numboxes++;
+    }
+
+  return numboxes;
+}
+
+/* Repeatedly select and split the largest box until we have enough
+ * boxes
+ */
+static gint
+median_cut_rgb (CFHistogram   histogram,
+                boxptr        boxlist,
+                gint          numboxes,
+                gint          desired_colors,
+                GimpProgress *progress)
+{
+  gint     lb;
+  boxptr   b1, b2;
+  AxisType which_axis;
+
+  while (numboxes < desired_colors)
+    {
+      b1 = find_split_candidate (boxlist, numboxes, &which_axis, desired_colors);
+
+      if (b1 == NULL)           /* no splittable boxes left! */
+        break;
+
+      b2 = boxlist + numboxes;  /* where new box will go */
+      /* Copy the color bounds to the new box. */
+      b2->Rmax = b1->Rmax; b2->Gmax = b1->Gmax; b2->Bmax = b1->Bmax;
+      b2->Rmin = b1->Rmin; b2->Gmin = b1->Gmin; b2->Bmin = b1->Bmin;
+
+
+      /* Choose split point along selected axis, and update box bounds.
+       * Note that lb value is max for lower box, so must be < old max.
+       */
+      switch (which_axis)
+        {
+        case AXIS_RED:
+          lb = b1->Rhalferror;/* *0 + (b1->Rmax + b1->Rmin) / 2; */
+          b1->Rmax = lb;
+          b2->Rmin = lb+1;
+          g_return_val_if_fail (b1->Rmax >= b1->Rmin, numboxes);
+          g_return_val_if_fail (b2->Rmax >= b2->Rmin, numboxes);
+          break;
+        case AXIS_GREEN:
+          lb = b1->Ghalferror;/* *0 + (b1->Gmax + b1->Gmin) / 2; */
+          b1->Gmax = lb;
+          b2->Gmin = lb+1;
+          g_return_val_if_fail (b1->Gmax >= b1->Gmin, numboxes);
+          g_return_val_if_fail (b2->Gmax >= b2->Gmin, numboxes);
+          break;
+        case AXIS_BLUE:
+          lb = b1->Bhalferror;/* *0 + (b1->Bmax + b1->Bmin) / 2; */
+          b1->Bmax = lb;
+          b2->Bmin = lb+1;
+          g_return_val_if_fail (b1->Bmax >= b1->Bmin, numboxes);
+          g_return_val_if_fail (b2->Bmax >= b2->Bmin, numboxes);
+          break;
+        default:
+          g_error ("Uh-oh.");
+        }
+      /* Update stats for boxes */
+      numboxes++;
+
+      if (progress && (numboxes % 16 == 0))
+        gimp_progress_set_value (progress, (gdouble) numboxes / desired_colors);
+
+      update_box_rgb (histogram, b1, desired_colors - numboxes);
+      update_box_rgb (histogram, b2, desired_colors - numboxes);
+    }
+
+  return numboxes;
+}
+
+
+/* Compute representative color for a box, put it in colormap[icolor]
+ */
+static void
+compute_color_gray (QuantizeObj *quantobj,
+                    CFHistogram  histogram,
+                    boxptr       boxp,
+                    int          icolor)
+{
+  gint    i, min, max;
+  guint64 count;
+  guint64 total;
+  guint64 gtotal;
+
+  min = boxp->Rmin;
+  max = boxp->Rmax;
+
+  total = 0;
+  gtotal = 0;
+
+  for (i = min; i <= max; i++)
+    {
+      count = histogram[i];
+      if (count != 0)
+        {
+          total += count;
+          gtotal += i * count;
+        }
+    }
+
+  if (total != 0)
+    {
+      quantobj->cmap[icolor].red   =
+      quantobj->cmap[icolor].green =
+      quantobj->cmap[icolor].blue  = (gtotal + (total >> 1)) / total;
+    }
+  else
+    {
+      /* The only situation where total==0 is if the image was null or
+       *  all-transparent.  In that case we just put a dummy value in
+       *  the colormap.
+       */
+      quantobj->cmap[icolor].red   =
+      quantobj->cmap[icolor].green =
+      quantobj->cmap[icolor].blue  = 0;
+    }
+}
+
+
+/* Compute representative color for a box, put it in colormap[icolor]
+ */
+static void
+compute_color_rgb (QuantizeObj *quantobj,
+                   CFHistogram  histogram,
+                   boxptr       boxp,
+                   int          icolor)
+{
+  /* Current algorithm: mean weighted by pixels (not colors) */
+  /* Note it is important to get the rounding correct! */
+  gint      R, G, B;
+  gint      Rmin, Rmax;
+  gint      Gmin, Gmax;
+  gint      Bmin, Bmax;
+  ColorFreq total  = 0;
+  ColorFreq Rtotal = 0;
+  ColorFreq Gtotal = 0;
+  ColorFreq Btotal = 0;
+
+  Rmin = boxp->Rmin;  Rmax = boxp->Rmax;
+  Gmin = boxp->Gmin;  Gmax = boxp->Gmax;
+  Bmin = boxp->Bmin;  Bmax = boxp->Bmax;
+
+  for (R = Rmin; R <= Rmax; R++)
+    for (G = Gmin; G <= Gmax; G++)
+      {
+        for (B = Bmin; B <= Bmax; B++)
+          {
+            ColorFreq this_freq = *HIST_LIN (histogram, R, G, B);
+
+            if (this_freq != 0)
+              {
+                total += this_freq;
+                Rtotal += R * this_freq;
+                Gtotal += G * this_freq;
+                Btotal += B * this_freq;
+              }
+          }
+      }
+
+  if (total > 0)
+    {
+      guchar red, green, blue;
+
+      lin_to_rgb (/*(Rtotal + (total>>1)) / total,
+                    (Gtotal + (total>>1)) / total,
+                    (Btotal + (total>>1)) / total,*/
+                  (double)Rtotal / (double)total,
+                  (double)Gtotal / (double)total,
+                  (double)Btotal / (double)total,
+                  &red, &green, &blue);
+
+      quantobj->cmap[icolor].red   = red;
+      quantobj->cmap[icolor].green = green;
+      quantobj->cmap[icolor].blue  = blue;
+    }
+  else
+    {
+      /* The only situation where total==0 is if the image was null or
+       *  all-transparent.  In that case we just put a dummy value in
+       *  the colormap.
+       */
+      quantobj->cmap[icolor].red   = 0;
+      quantobj->cmap[icolor].green = 0;
+      quantobj->cmap[icolor].blue  = 0;
+    }
+}
+
+
+/* Compute representative color for a box, put it in colormap[icolor]
+ */
+static void
+compute_color_lin8 (QuantizeObj *quantobj,
+                    CFHistogram  histogram,
+                    boxptr       boxp,
+                    const gint   icolor)
+{
+  /* Current algorithm: mean weighted by pixels (not colors) */
+  /* Note it is important to get the rounding correct! */
+  gint      R, G, B;
+  gint      Rmin, Rmax;
+  gint      Gmin, Gmax;
+  gint      Bmin, Bmax;
+  ColorFreq total  = 0;
+  ColorFreq Rtotal = 0;
+  ColorFreq Gtotal = 0;
+  ColorFreq Btotal = 0;
+
+  Rmin = boxp->Rmin;  Rmax = boxp->Rmax;
+  Gmin = boxp->Gmin;  Gmax = boxp->Gmax;
+  Bmin = boxp->Bmin;  Bmax = boxp->Bmax;
+
+  for (R = Rmin; R <= Rmax; R++)
+    for (G = Gmin; G <= Gmax; G++)
+      {
+        for (B = Bmin; B <= Bmax; B++)
+          {
+            ColorFreq this_freq = *HIST_LIN (histogram, R, G, B);
+
+            if (this_freq != 0)
+              {
+                Rtotal += R * this_freq;
+                Gtotal += G * this_freq;
+                Btotal += B * this_freq;
+                total += this_freq;
+              }
+          }
+      }
+
+  if (total != 0)
+    {
+      quantobj->cmap[icolor].red   = ((Rtotal << R_SHIFT) + (total>>1)) / total;
+      quantobj->cmap[icolor].green = ((Gtotal << G_SHIFT) + (total>>1)) / total;
+      quantobj->cmap[icolor].blue  = ((Btotal << B_SHIFT) + (total>>1)) / total;
+    }
+  else
+    {
+      /* The only situation where total==0 is if the image was null or
+       *  all-transparent.  In that case we just put a dummy value in
+       *  the colormap.
+       */
+      g_warning ("eep.");
+      quantobj->cmap[icolor].red   = 0;
+      quantobj->cmap[icolor].green = 128;
+      quantobj->cmap[icolor].blue  = 128;
+    }
+}
+
+
+/* Master routine for color selection
+ */
+static void
+select_colors_gray (QuantizeObj *quantobj,
+                    CFHistogram  histogram)
+{
+  boxptr boxlist;
+  gint   numboxes;
+  gint   desired = quantobj->desired_number_of_colors;
+  gint   i;
+
+  /* Allocate workspace for box list */
+  boxlist = g_new (box, desired);
+
+  /* Initialize one box containing whole space */
+  numboxes = 1;
+  boxlist[0].Rmin = 0;
+  boxlist[0].Rmax = 255;
+  /* Shrink it to actually-used volume and set its statistics */
+  update_box_gray (histogram, boxlist);
+  /* Perform median-cut to produce final box list */
+  numboxes = median_cut_gray (histogram, boxlist, numboxes, desired);
+
+  quantobj->actual_number_of_colors = numboxes;
+  /* Compute the representative color for each box, fill colormap */
+  for (i = 0; i < numboxes; i++)
+    compute_color_gray (quantobj, histogram, boxlist + i, i);
+}
+
+
+/* Master routine for color selection
+ */
+static void
+select_colors_rgb (QuantizeObj *quantobj,
+                   CFHistogram  histogram)
+{
+  boxptr boxlist;
+  gint   numboxes;
+  gint   desired = quantobj->desired_number_of_colors;
+  gint  i;
+
+  /* Allocate workspace for box list */
+  boxlist = g_new (box, desired);
+
+  /* Initialize one box containing whole space */
+  numboxes = 1;
+  boxlist[0].Rmin = 0;
+  boxlist[0].Rmax = HIST_R_ELEMS - 1;
+  boxlist[0].Gmin = 0;
+  boxlist[0].Gmax = HIST_G_ELEMS - 1;
+  boxlist[0].Bmin = 0;
+  boxlist[0].Bmax = HIST_B_ELEMS - 1;
+  /* Shrink it to actually-used volume and set its statistics */
+  update_box_rgb (histogram, &boxlist[0], quantobj->desired_number_of_colors);
+  /* Perform median-cut to produce final box list */
+  numboxes = median_cut_rgb (histogram, boxlist, numboxes, desired,
+                             quantobj->progress);
+
+  quantobj->actual_number_of_colors = numboxes;
+  /* Compute the representative color for each box, fill colormap */
+  for (i = 0; i < numboxes; i++)
+    {
+      compute_color_rgb (quantobj, histogram, &boxlist[i], i);
+    }
+
+  g_free (boxlist);
+}
+
+
+/*
+ * These routines are concerned with the time-critical task of mapping input
+ * colors to the nearest color in the selected colormap.
+ *
+ * We re-use the histogram space as an "inverse color map", essentially a
+ * cache for the results of nearest-color searches.  All colors within a
+ * histogram cell will be mapped to the same colormap entry, namely the one
+ * closest to the cell's center.  This may not be quite the closest entry to
+ * the actual input color, but it's almost as good.  A zero in the cache
+ * indicates we haven't found the nearest color for that cell yet; the array
+ * is cleared to zeroes before starting the mapping pass.  When we find the
+ * nearest color for a cell, its colormap index plus one is recorded in the
+ * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
+ * when they need to use an unfilled entry in the cache.
+ *
+ * Our method of efficiently finding nearest colors is based on the "locally
+ * sorted search" idea described by Heckbert and on the incremental distance
+ * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
+ * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
+ * the distances from a given colormap entry to each cell of the histogram can
+ * be computed quickly using an incremental method: the differences between
+ * distances to adjacent cells themselves differ by a constant.  This allows a
+ * fairly fast implementation of the "brute force" approach of computing the
+ * distance from every colormap entry to every histogram cell.  Unfortunately,
+ * it needs a work array to hold the best-distance-so-far for each histogram
+ * cell (because the inner loop has to be over cells, not colormap entries).
+ * The work array elements have to be ints, so the work array would need
+ * 256Kb at our recommended precision.  This is not feasible in DOS machines.
+ *
+ * To get around these problems, we apply Thomas' method to compute the
+ * nearest colors for only the cells within a small subbox of the histogram.
+ * The work array need be only as big as the subbox, so the memory usage
+ * problem is solved.  Furthermore, we need not fill subboxes that are never
+ * referenced in pass2; many images use only part of the color gamut, so a
+ * fair amount of work is saved.  An additional advantage of this
+ * approach is that we can apply Heckbert's locality criterion to quickly
+ * eliminate colormap entries that are far away from the subbox; typically
+ * three-fourths of the colormap entries are rejected by Heckbert's criterion,
+ * and we need not compute their distances to individual cells in the subbox.
+ * The speed of this approach is heavily influenced by the subbox size: too
+ * small means too much overhead, too big loses because Heckbert's criterion
+ * can't eliminate as many colormap entries.  Empirically the best subbox
+ * size seems to be about 1/512th of the histogram (1/8th in each direction).
+ *
+ * Thomas' article also describes a refined method which is asymptotically
+ * faster than the brute-force method, but it is also far more complex and
+ * cannot efficiently be applied to small subboxes.  It is therefore not
+ * useful for programs intended to be portable to DOS machines.  On machines
+ * with plenty of memory, filling the whole histogram in one shot with Thomas'
+ * refined method might be faster than the present code --- but then again,
+ * it might not be any faster, and it's certainly more complicated.
+ */
+
+
+/* log2(histogram cells in update box) for each axis; this can be adjusted */
+/*#define BOX_R_LOG  (PRECISION_R-3)
+  #define BOX_G_LOG  (PRECISION_G-3)
+  #define BOX_B_LOG  (PRECISION_B-3)*/
+
+/*adam*/
+#define BOX_R_LOG 0
+#define BOX_G_LOG 0
+#define BOX_B_LOG 0
+
+#define BOX_R_ELEMS  (1<<BOX_R_LOG) /* # of hist cells in update box */
+#define BOX_G_ELEMS  (1<<BOX_G_LOG)
+#define BOX_B_ELEMS  (1<<BOX_B_LOG)
+
+#define BOX_R_SHIFT  (R_SHIFT + BOX_R_LOG)
+#define BOX_G_SHIFT  (G_SHIFT + BOX_G_LOG)
+#define BOX_B_SHIFT  (B_SHIFT + BOX_B_LOG)
+
+
+/*
+ * The next three routines implement inverse colormap filling.  They
+ * could all be folded into one big routine, but splitting them up
+ * this way saves some stack space (the mindist[] and bestdist[]
+ * arrays need not coexist) and may allow some compilers to produce
+ * better code by registerizing more inner-loop variables.
+ */
+
+/* Locate the colormap entries close enough to an update box to be
+ * candidates for the nearest entry to some cell(s) in the update box.
+ * The update box is specified by the center coordinates of its first
+ * cell.  The number of candidate colormap entries is returned, and
+ * their colormap indexes are placed in colorlist[].
+ *
+ * This routine uses Heckbert's "locally sorted search" criterion to
+ * select the colors that need further consideration.
+ */
+static gint
+find_nearby_colors (QuantizeObj *quantobj,
+                    int          minR,
+                    int          minG,
+                    int          minB,
+                    int          colorlist[])
+{
+  int numcolors = quantobj->actual_number_of_colors;
+  int maxR, maxG, maxB;
+  int centerR, centerG, centerB;
+  int i, x, ncolors;
+  int minmaxdist, min_dist, max_dist, tdist;
+  int mindist[MAXNUMCOLORS];    /* min distance to colormap entry i */
+
+  /* Compute true coordinates of update box's upper corner and center.
+   * Actually we compute the coordinates of the center of the upper-corner
+   * histogram cell, which are the upper bounds of the volume we care about.
+   * Note that since ">>" rounds down, the "center" values may be closer to
+   * min than to max; hence comparisons to them must be "<=", not "<".
+   */
+  maxR = minR + ((1 << BOX_R_SHIFT) - (1 << R_SHIFT));
+  centerR = (minR + maxR + 1) >> 1;
+  maxG = minG + ((1 << BOX_G_SHIFT) - (1 << G_SHIFT));
+  centerG = (minG + maxG + 1) >> 1;
+  maxB = minB + ((1 << BOX_B_SHIFT) - (1 << B_SHIFT));
+  centerB = (minB + maxB + 1) >> 1;
+
+  /* For each color in colormap, find:
+   *  1. its minimum squared-distance to any point in the update box
+   *     (zero if color is within update box);
+   *  2. its maximum squared-distance to any point in the update box.
+   * Both of these can be found by considering only the corners of the box.
+   * We save the minimum distance for each color in mindist[];
+   * only the smallest maximum distance is of interest.
+   */
+  minmaxdist = 0x7FFFFFFFL;
+
+  for (i = 0; i < numcolors; i++)
+    {
+      /* We compute the squared-R-distance term, then add in the other two. */
+      x = quantobj->clin[i].red;
+      if (x < minR)
+        {
+          tdist = (x - minR) * R_SCALE;
+          min_dist = tdist*tdist;
+          tdist = (x - maxR) * R_SCALE;
+          max_dist = tdist*tdist;
+        }
+      else if (x > maxR)
+        {
+          tdist = (x - maxR) * R_SCALE;
+          min_dist = tdist*tdist;
+          tdist = (x - minR) * R_SCALE;
+          max_dist = tdist*tdist;
+        }
+      else
+        {
+          /* within cell range so no contribution to min_dist */
+          min_dist = 0;
+          if (x <= centerR)
+            {
+              tdist = (x - maxR) * R_SCALE;
+              max_dist = tdist*tdist;
+            }
+          else
+            {
+              tdist = (x - minR) * R_SCALE;
+              max_dist = tdist*tdist;
+            }
+        }
+
+      x = quantobj->clin[i].green;
+      if (x < minG)
+        {
+          tdist = (x - minG) * G_SCALE;
+          min_dist += tdist*tdist;
+          tdist = (x - maxG) * G_SCALE;
+          max_dist += tdist*tdist;
+        }
+      else if (x > maxG)
+        {
+          tdist = (x - maxG) * G_SCALE;
+          min_dist += tdist*tdist;
+          tdist = (x - minG) * G_SCALE;
+          max_dist += tdist*tdist;
+        }
+      else
+        {
+          /* within cell range so no contribution to min_dist */
+          if (x <= centerG)
+            {
+              tdist = (x - maxG) * G_SCALE;
+              max_dist += tdist*tdist;
+            }
+          else
+            {
+              tdist = (x - minG) * G_SCALE;
+              max_dist += tdist*tdist;
+            }
+        }
+
+      x = quantobj->clin[i].blue;
+      if (x < minB)
+        {
+          tdist = (x - minB) * B_SCALE;
+          min_dist += tdist*tdist;
+          tdist = (x - maxB) * B_SCALE;
+          max_dist += tdist*tdist;
+        }
+      else if (x > maxB)
+        {
+          tdist = (x - maxB) * B_SCALE;
+          min_dist += tdist*tdist;
+          tdist = (x - minB) * B_SCALE;
+          max_dist += tdist*tdist;
+        }
+      else
+        {
+          /* within cell range so no contribution to min_dist */
+          if (x <= centerB)
+            {
+              tdist = (x - maxB) * B_SCALE;
+              max_dist += tdist*tdist;
+            }
+          else
+            {
+              tdist = (x - minB) * B_SCALE;
+              max_dist += tdist*tdist;
+            }
+        }
+
+      mindist[i] = min_dist;      /* save away the results */
+      if (max_dist < minmaxdist)
+        minmaxdist = max_dist;
+    }
+
+  /* Now we know that no cell in the update box is more than minmaxdist
+   * away from some colormap entry.  Therefore, only colors that are
+   * within minmaxdist of some part of the box need be considered.
+   */
+  ncolors = 0;
+  for (i = 0; i < numcolors; i++)
+    {
+      if (mindist[i] <= minmaxdist)
+        colorlist[ncolors++] = i;
+    }
+
+  return ncolors;
+}
+
+
+/* Find the closest colormap entry for each cell in the update box,
+ * given the list of candidate colors prepared by find_nearby_colors.
+ * Return the indexes of the closest entries in the bestcolor[] array.
+ * This routine uses Thomas' incremental distance calculation method
+ * to find the distance from a colormap entry to successive cells in
+ * the box.
+ */
+static void
+find_best_colors (QuantizeObj *quantobj,
+                  gint         minR,
+                  gint         minG,
+                  gint         minB,
+                  gint         numcolors,
+                  gint         colorlist[],
+                  gint         bestcolor[])
+{
+  gint  iR, iG, iB;
+  gint  i, icolor;
+  gint *bptr;           /* pointer into bestdist[] array */
+  gint *cptr;           /* pointer into bestcolor[] array */
+  gint  dist0, dist1;     /* initial distance values */
+  gint  dist2;            /* current distance in inner loop */
+  gint  xx0, xx1;         /* distance increments */
+  gint  xx2;
+  gint  inR, inG, inB;    /* initial values for increments */
+
+  /* This array holds the distance to the nearest-so-far color for each cell */
+  gint  bestdist[BOX_R_ELEMS * BOX_G_ELEMS * BOX_B_ELEMS] = { 0, };
+
+  /* Initialize best-distance for each cell of the update box */
+  bptr = bestdist;
+  for (i = BOX_R_ELEMS*BOX_G_ELEMS*BOX_B_ELEMS-1; i >= 0; i--)
+    *bptr++ = 0x7FFFFFFFL;
+
+  /* For each color selected by find_nearby_colors,
+   * compute its distance to the center of each cell in the box.
+   * If that's less than best-so-far, update best distance and color number.
+   */
+
+  /* Nominal steps between cell centers ("x" in Thomas article) */
+#define STEP_R  ((1 << R_SHIFT) * R_SCALE)
+#define STEP_G  ((1 << G_SHIFT) * G_SCALE)
+#define STEP_B  ((1 << B_SHIFT) * B_SCALE)
+
+  for (i = 0; i < numcolors; i++)
+    {
+      icolor = colorlist[i];
+      /* Compute (square of) distance from minR/G/B to this color */
+      inR = (minR - quantobj->clin[icolor].red) * R_SCALE;
+      dist0 = inR*inR;
+      /* special-case for L*==0: chroma diffs irrelevant */
+      /*    if (minR > 0 || quantobj->clin[icolor].red > 0) */
+      {
+        inG = (minG - quantobj->clin[icolor].green) * G_SCALE;
+        dist0 += inG*inG;
+        inB = (minB - quantobj->clin[icolor].blue) * B_SCALE;
+        dist0 += inB*inB;
+      }
+      /*    else
+            {
+            inG = 0;
+            inB = 0;
+            } */
+      /* Form the initial difference increments */
+      inR = inR * (2 * STEP_R) + STEP_R * STEP_R;
+      inG = inG * (2 * STEP_G) + STEP_G * STEP_G;
+      inB = inB * (2 * STEP_B) + STEP_B * STEP_B;
+      /* Now loop over all cells in box, updating distance per Thomas method */
+      bptr = bestdist;
+      cptr = bestcolor;
+      xx0 = inR;
+      for (iR = BOX_R_ELEMS-1; iR >= 0; iR--)
+        {
+          dist1 = dist0;
+          xx1 = inG;
+          for (iG = BOX_G_ELEMS-1; iG >= 0; iG--)
+            {
+              dist2 = dist1;
+              xx2 = inB;
+              for (iB = BOX_B_ELEMS-1; iB >= 0; iB--)
+                {
+                  if (dist2 < *bptr)
+                    {
+                      *bptr = dist2;
+                      *cptr = icolor;
+                    }
+                  dist2 += xx2;
+                  xx2 += 2 * STEP_B * STEP_B;
+                  bptr++;
+                  cptr++;
+                }
+              dist1 += xx1;
+              xx1 += 2 * STEP_G * STEP_G;
+            }
+          dist0 += xx0;
+          xx0 += 2 * STEP_R * STEP_R;
+        }
+    }
+}
+
+
+/* Fill the inverse-colormap entries in the update box that contains
+ * histogram cell R/G/B.  (Only that one cell MUST be filled, but we
+ * can fill as many others as we wish.)
+ */
+static void
+fill_inverse_cmap_gray (QuantizeObj *quantobj,
+                        CFHistogram  histogram,
+                        gint         pixel)
+{
+  Color *cmap = quantobj->cmap;
+  gint64 mindist;
+  gint   mindisti;
+  gint   i;
+
+  g_return_if_fail (quantobj->actual_number_of_colors > 0);
+
+  mindist  = G_MAXLONG;
+  mindisti = -1;
+
+  for (i = 0; i < quantobj->actual_number_of_colors; i++)
+    {
+      gint64 dist = ABS (pixel - cmap[i].red);
+
+      if (dist < mindist)
+        {
+          mindist  = dist;
+          mindisti = i;
+
+          if (mindist == 0)
+            break;
+        }
+    }
+
+  histogram[pixel] = mindisti + 1;
+}
+
+
+/* Fill the inverse-colormap entries in the update box that contains
+ * histogram cell R/G/B.  (Only that one cell MUST be filled, but we
+ * can fill as many others as we wish.)
+ */
+static void
+fill_inverse_cmap_rgb (QuantizeObj *quantobj,
+                       CFHistogram  histogram,
+                       gint         R,
+                       gint         G,
+                       gint         B)
+{
+  gint  minR, minG, minB; /* lower left corner of update box */
+  gint  iR, iG, iB;
+  gint *cptr;           /* pointer into bestcolor[] array */
+  /* This array lists the candidate colormap indexes. */
+  gint  colorlist[MAXNUMCOLORS];
+  gint  numcolors;                /* number of candidate colors */
+  /* This array holds the actually closest colormap index for each cell. */
+  gint  bestcolor[BOX_R_ELEMS * BOX_G_ELEMS * BOX_B_ELEMS] = { 0, };
+
+  /* Convert cell coordinates to update box id */
+  R >>= BOX_R_LOG;
+  G >>= BOX_G_LOG;
+  B >>= BOX_B_LOG;
+
+  /* Compute true coordinates of update box's origin corner.
+   * Actually we compute the coordinates of the center of the corner
+   * histogram cell, which are the lower bounds of the volume we care about.
+   */
+  minR = (R << BOX_R_SHIFT) + ((1 << R_SHIFT) >> 1);
+  minG = (G << BOX_G_SHIFT) + ((1 << G_SHIFT) >> 1);
+  minB = (B << BOX_B_SHIFT) + ((1 << B_SHIFT) >> 1);
+
+  /* Determine which colormap entries are close enough to be candidates
+   * for the nearest entry to some cell in the update box.
+   */
+  numcolors = find_nearby_colors (quantobj, minR, minG, minB, colorlist);
+
+  /* Determine the actually nearest colors. */
+  find_best_colors (quantobj, minR, minG, minB, numcolors, colorlist,
+                    bestcolor);
+
+  /* Save the best color numbers (plus 1) in the main cache array */
+  R <<= BOX_R_LOG;              /* convert id back to base cell indexes */
+  G <<= BOX_G_LOG;
+  B <<= BOX_B_LOG;
+  cptr = bestcolor;
+  for (iR = 0; iR < BOX_R_ELEMS; iR++)
+    {
+      for (iG = 0; iG < BOX_G_ELEMS; iG++)
+        {
+          for (iB = 0; iB < BOX_B_ELEMS; iB++)
+            {
+              *HIST_LIN (histogram, R + iR, G + iG, B + iB) = (*cptr++) + 1;
+            }
+        }
+    }
+}
+
+
+/*  This is pass 1  */
+
+static void
+median_cut_pass1_gray (QuantizeObj *quantobj)
+{
+  select_colors_gray (quantobj, quantobj->histogram);
+}
+
+static void
+snap_to_black_and_white (QuantizeObj *quantobj)
+{
+  /* find whitest and blackest colors in palette, if they are closer
+   * than 24 units of euclidian distance in sRGB snap them to pure
+   * black / white.
+   */
+#define POW2(a) ((a)*(a))
+  gint   desired  = quantobj->desired_number_of_colors;
+  gint   whitest  = 0;
+  gint   blackest = 0;
+
+  gint64 white_dist = POW2(255) * 3;
+  gint64 black_dist = POW2(255) * 3;
+  gint   i;
+
+  for (i = 0; i < desired; i ++)
+    {
+       int dist;
+
+       dist = POW2 (quantobj->cmap[i].red   - 255) +
+              POW2 (quantobj->cmap[i].green - 255) +
+              POW2( quantobj->cmap[i].blue  - 255);
+       if (dist < white_dist)
+         {
+           white_dist = dist;
+           whitest = i;
+         }
+
+       dist = POW2(quantobj->cmap[i].red   - 0) +
+              POW2(quantobj->cmap[i].green - 0) +
+              POW2(quantobj->cmap[i].blue  - 0);
+       if (dist < black_dist)
+         {
+           black_dist = dist;
+           blackest = i;
+         }
+    }
+
+  if (desired > 2 &&
+      had_white   &&
+      white_dist < POW2(128))
+  {
+     quantobj->cmap[whitest].red   =
+     quantobj->cmap[whitest].green =
+     quantobj->cmap[whitest].blue  = 255;
+  }
+  if (desired > 2 &&
+      had_black   &&
+      black_dist < POW2(128))
+  {
+     quantobj->cmap[blackest].red   =
+     quantobj->cmap[blackest].green =
+     quantobj->cmap[blackest].blue  = 0;
+  }
+#undef POW2
+}
+
+static void
+median_cut_pass1_rgb (QuantizeObj *quantobj)
+{
+  select_colors_rgb (quantobj, quantobj->histogram);
+  snap_to_black_and_white (quantobj);
+}
+
+
+static void
+monopal_pass1 (QuantizeObj *quantobj)
+{
+  quantobj->actual_number_of_colors = 2;
+
+  quantobj->cmap[0].red   = 0;
+  quantobj->cmap[0].green = 0;
+  quantobj->cmap[0].blue  = 0;
+  quantobj->cmap[1].red   = 255;
+  quantobj->cmap[1].green = 255;
+  quantobj->cmap[1].blue  = 255;
+}
+
+static void
+webpal_pass1 (QuantizeObj *quantobj)
+{
+  int i;
+
+  quantobj->actual_number_of_colors = 216;
+
+  for (i=0; i < 216; i++)
+    {
+      quantobj->cmap[i].red   = webpal[i * 3];
+      quantobj->cmap[i].green = webpal[i * 3 +1];
+      quantobj->cmap[i].blue  = webpal[i * 3 +2];
+    }
+}
+
+static void
+custompal_pass1 (QuantizeObj *quantobj)
+{
+  gint   i;
+  GList *list;
+
+  /* fprintf(stderr,
+             "custompal_pass1: using (theCustomPalette %s) from (file %s)\n",
+             theCustomPalette->name, theCustomPalette->filename); */
+
+  for (i = 0, list = gimp_palette_get_colors (quantobj->custom_palette);
+       list;
+       i++, list = g_list_next (list))
+    {
+      GimpPaletteEntry *entry = list->data;
+      guchar            r, g, b;
+
+      gimp_rgb_get_uchar (&entry->color, &r, &g, &b);
+
+      quantobj->cmap[i].red   = (gint) r;
+      quantobj->cmap[i].green = (gint) g;
+      quantobj->cmap[i].blue  = (gint) b;
+    }
+
+  quantobj -> actual_number_of_colors = i;
+}
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ */
+
+static void
+median_cut_pass2_no_dither_gray (QuantizeObj *quantobj,
+                                 GimpLayer   *layer,
+                                 GeglBuffer  *new_buffer)
+{
+  GeglBufferIterator *iter;
+  CFHistogram         histogram = quantobj->histogram;
+  ColorFreq          *cachep;
+  const Babl         *src_format;
+  const Babl         *dest_format;
+  GeglRectangle      *src_roi;
+  gint                src_bpp;
+  gint                dest_bpp;
+  gint                has_alpha;
+  guint64            *index_used_count = quantobj->index_used_count;
+  gboolean            dither_alpha     = quantobj->want_dither_alpha;
+  gint                offsetx, offsety;
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, NULL,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+  src_roi = &iter->items[0].roi;
+
+  gegl_buffer_iterator_add (iter, new_buffer,
+                            NULL, 0, NULL,
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *src  = iter->items[0].data;
+      guchar       *dest = iter->items[1].data;
+      gint          row;
+
+      for (row = 0; row < src_roi->height; row++)
+        {
+          gint col;
+
+          for (col = 0; col < src_roi->width; col++)
+            {
+              /* get pixel value and index into the cache */
+              gint pixel = src[GRAY];
+
+              cachep = &histogram[pixel];
+              /* If we have not seen this color before, find nearest
+               * colormap entry and update the cache
+               */
+              if (*cachep == 0)
+                fill_inverse_cmap_gray (quantobj, histogram, pixel);
+
+              if (has_alpha)
+                {
+                  gboolean transparent = FALSE;
+
+                  if (dither_alpha)
+                    {
+                      gint dither_x = (col + offsetx + src_roi->x) & DM_WIDTHMASK;
+                      gint dither_y = (row + offsety + src_roi->y) & DM_HEIGHTMASK;
+
+                      if ((src[ALPHA_G]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[ALPHA_G] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                      index_used_count[dest[INDEXED] = *cachep - 1]++;
+                    }
+                }
+              else
+                {
+                  /* Now emit the colormap index for this cell */
+                  index_used_count[dest[INDEXED] = *cachep - 1]++;
+                }
+
+              src  += src_bpp;
+              dest += dest_bpp;
+            }
+        }
+    }
+}
+
+static void
+median_cut_pass2_fixed_dither_gray (QuantizeObj *quantobj,
+                                    GimpLayer   *layer,
+                                    GeglBuffer  *new_buffer)
+{
+  GeglBufferIterator *iter;
+  CFHistogram         histogram = quantobj->histogram;
+  ColorFreq          *cachep;
+  const Babl         *src_format;
+  const Babl         *dest_format;
+  GeglRectangle      *src_roi;
+  gint                src_bpp;
+  gint                dest_bpp;
+  gboolean            has_alpha;
+  gint                pixval1 = 0;
+  gint                pixval2 = 0;
+  gint                err1;
+  gint                err2;
+  Color              *color1;
+  Color              *color2;
+  guint64            *index_used_count = quantobj->index_used_count;
+  gboolean            dither_alpha     = quantobj->want_dither_alpha;
+  gint                offsetx, offsety;
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, NULL,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+  src_roi = &iter->items[0].roi;
+
+  gegl_buffer_iterator_add (iter, new_buffer,
+                            NULL, 0, NULL,
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *src  = iter->items[0].data;
+      guchar       *dest = iter->items[1].data;
+      gint          row;
+
+      for (row = 0; row < src_roi->height; row++)
+        {
+          gint col;
+
+          for (col = 0; col < src_roi->width; col++)
+            {
+              gint       pixel;
+              const gint dmval =
+                DM[(col + offsetx + src_roi->x) & DM_WIDTHMASK]
+                [(row + offsety + src_roi->y) & DM_HEIGHTMASK];
+
+              /* get pixel value and index into the cache */
+              pixel = src[GRAY];
+
+              cachep = &histogram[pixel];
+              /* If we have not seen this color before, find nearest
+               * colormap entry and update the cache
+               */
+              if (*cachep == 0)
+                fill_inverse_cmap_gray (quantobj, histogram, pixel);
+
+              pixval1 = *cachep - 1;
+              color1 = &quantobj->cmap[pixval1];
+
+              if (quantobj->actual_number_of_colors > 2)
+                {
+                  const int re = src[GRAY] - (int)color1->red;
+                  int RV = src[GRAY] + re;
+
+                  do
+                    {
+                      const gint R = CLAMP0255 (RV);
+
+                      cachep = &histogram[R];
+                      /* If we have not seen this color before, find
+                       * nearest colormap entry and update the cache
+                       */
+                      if (*cachep == 0)
+                        fill_inverse_cmap_gray (quantobj, histogram, R);
+
+                      pixval2 = *cachep - 1;
+                      RV += re;
+                    }
+                  while ((pixval1 == pixval2) &&
+                         (! (RV>255 || RV<0) ) &&
+                         re);
+                }
+              else
+                {
+                  /* not enough colors to bother looking for an 'alternative'
+                     color (we may fail to do so anyway), so decide that
+                     the alternative color is simply the other cmap entry. */
+                  pixval2 = (pixval1 + 1) %
+                    (quantobj->actual_number_of_colors);
+                }
+
+              /* always deterministically sort pixval1 and pixval2, to
+                 avoid artifacts in the dither range due to inverting our
+                 relative color viewpoint -- most obvious in 1-bit dither. */
+              if (pixval1 > pixval2)
+                {
+                  gint tmpval = pixval1;
+                  pixval1 = pixval2;
+                  pixval2 = tmpval;
+                  color1 = &quantobj->cmap[pixval1];
+                }
+
+              color2 = &quantobj->cmap[pixval2];
+
+              err1 = ABS(color1->red - src[GRAY]);
+              err2 = ABS(color2->red - src[GRAY]);
+              if (err1 || err2)
+                {
+                  const int proportion2 = (256 * 255 * err2) / (err1 + err2);
+
+                  if ((dmval * 256) > proportion2)
+                    {
+                      pixval1 = pixval2; /* use color2 instead of color1*/
+                    }
+                }
+
+              if (has_alpha)
+                {
+                  gboolean transparent = FALSE;
+
+                  if (dither_alpha)
+                    {
+                      if (src[ALPHA_G] < dmval)
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[ALPHA_G] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                      index_used_count[dest[INDEXED] = pixval1]++;
+                    }
+                }
+              else
+                {
+                  /* Now emit the colormap index for this cell, barfbarf */
+                  index_used_count[dest[INDEXED] = pixval1]++;
+                }
+
+              src  += src_bpp;
+              dest += dest_bpp;
+            }
+        }
+    }
+}
+
+static void
+median_cut_pass2_no_dither_rgb (QuantizeObj *quantobj,
+                                GimpLayer   *layer,
+                                GeglBuffer  *new_buffer)
+{
+  GeglBufferIterator *iter;
+  CFHistogram         histogram = quantobj->histogram;
+  ColorFreq          *cachep;
+  const Babl         *src_format;
+  const Babl         *dest_format;
+  GeglRectangle      *src_roi;
+  gint                src_bpp;
+  gint                dest_bpp;
+  gint                has_alpha;
+  gint                R, G, B;
+  gint                red_pix          = RED;
+  gint                green_pix        = GREEN;
+  gint                blue_pix         = BLUE;
+  gint                alpha_pix        = ALPHA;
+  gboolean            dither_alpha     = quantobj->want_dither_alpha;
+  gint                offsetx, offsety;
+  guint64            *index_used_count = quantobj->index_used_count;
+  gint64              total_size       = 0;
+  gint64              layer_size;
+  gint                count            = 0;
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  /*  In the case of web/mono palettes, we actually force
+   *   grayscale drawables through the rgb pass2 functions
+   */
+  if (gimp_drawable_is_gray (GIMP_DRAWABLE (layer)))
+    {
+      red_pix = green_pix = blue_pix = GRAY;
+      alpha_pix = ALPHA_G;
+    }
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, NULL,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+  src_roi = &iter->items[0].roi;
+
+  gegl_buffer_iterator_add (iter, new_buffer,
+                            NULL, 0, NULL,
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  layer_size = (gimp_item_get_width  (GIMP_ITEM (layer)) *
+                gimp_item_get_height (GIMP_ITEM (layer)));
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *src  = iter->items[0].data;
+      guchar       *dest = iter->items[1].data;
+      gint          row;
+
+      total_size += src_roi->height * src_roi->width;
+
+      for (row = 0; row < src_roi->height; row++)
+        {
+          gint col;
+
+          for (col = 0; col < src_roi->width; col++)
+            {
+              if (has_alpha)
+                {
+                  gboolean transparent = FALSE;
+
+                  if (dither_alpha)
+                    {
+                      gint dither_x = (col + offsetx + src_roi->x) & DM_WIDTHMASK;
+                      gint dither_y = (row + offsety + src_roi->y) & DM_HEIGHTMASK;
+
+                      if ((src[alpha_pix]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[alpha_pix] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                      goto next_pixel;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                    }
+                }
+
+              /* get pixel value and index into the cache */
+              rgb_to_lin (src[red_pix], src[green_pix], src[blue_pix],
+                          &R, &G, &B);
+
+              cachep = HIST_LIN (histogram, R, G, B);
+              /* If we have not seen this color before, find nearest
+               * colormap entry and update the cache
+               */
+              if (*cachep == 0)
+                fill_inverse_cmap_rgb (quantobj, histogram, R, G, B);
+
+              /* Now emit the colormap index for this cell, barfbarf */
+              index_used_count[dest[INDEXED] = *cachep - 1]++;
+
+            next_pixel:
+
+              src  += src_bpp;
+              dest += dest_bpp;
+            }
+        }
+
+      if (quantobj->progress && (count % 16 == 0))
+         gimp_progress_set_value (quantobj->progress,
+                                  (gdouble) total_size / (gdouble) layer_size);
+    }
+}
+
+static void
+median_cut_pass2_fixed_dither_rgb (QuantizeObj *quantobj,
+                                   GimpLayer   *layer,
+                                   GeglBuffer  *new_buffer)
+{
+  GeglBufferIterator *iter;
+  CFHistogram         histogram = quantobj->histogram;
+  ColorFreq          *cachep;
+  const Babl         *src_format;
+  const Babl         *dest_format;
+  GeglRectangle      *src_roi;
+  gint                src_bpp;
+  gint                dest_bpp;
+  gint                has_alpha;
+  gint                pixval1 = 0;
+  gint                pixval2 = 0;
+  Color              *color1;
+  Color              *color2;
+  gint                R, G, B;
+  gint                err1;
+  gint                err2;
+  gint                red_pix          = RED;
+  gint                green_pix        = GREEN;
+  gint                blue_pix         = BLUE;
+  gint                alpha_pix        = ALPHA;
+  gboolean            dither_alpha     = quantobj->want_dither_alpha;
+  gint                offsetx, offsety;
+  guint64            *index_used_count = quantobj->index_used_count;
+  gint64              total_size       = 0;
+  gint64              layer_size;
+  gint                count            = 0;
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  /*  In the case of web/mono palettes, we actually force
+   *   grayscale drawables through the rgb pass2 functions
+   */
+  if (gimp_drawable_is_gray (GIMP_DRAWABLE (layer)))
+    {
+      red_pix = green_pix = blue_pix = GRAY;
+      alpha_pix = ALPHA_G;
+    }
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, NULL,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+  src_roi = &iter->items[0].roi;
+
+  gegl_buffer_iterator_add (iter, new_buffer,
+                            NULL, 0, NULL,
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  layer_size = (gimp_item_get_width  (GIMP_ITEM (layer)) *
+                gimp_item_get_height (GIMP_ITEM (layer)));
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *src  = iter->items[0].data;
+      guchar       *dest = iter->items[1].data;
+      gint          row;
+
+      total_size += src_roi->height * src_roi->width;
+
+      for (row = 0; row < src_roi->height; row++)
+        {
+          gint col;
+
+          for (col = 0; col < src_roi->width; col++)
+            {
+              const int dmval =
+                DM[(col + offsetx + src_roi->x) & DM_WIDTHMASK]
+                [(row + offsety + src_roi->y) & DM_HEIGHTMASK];
+
+              if (has_alpha)
+                {
+                  gboolean transparent = FALSE;
+
+                  if (dither_alpha)
+                    {
+                      if (src[alpha_pix] < dmval)
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[alpha_pix] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                      goto next_pixel;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                    }
+                }
+
+              /* get pixel value and index into the cache */
+              rgb_to_lin (src[red_pix], src[green_pix], src[blue_pix],
+                          &R, &G, &B);
+
+              cachep = HIST_LIN (histogram, R, G, B);
+              /* If we have not seen this color before, find nearest
+               * colormap entry and update the cache
+               */
+              if (*cachep == 0)
+                fill_inverse_cmap_rgb (quantobj, histogram, R, G, B);
+
+              /* We now try to find a color which, when mixed in some
+               * fashion with the closest match, yields something
+               * closer to the desired color.  We do this by
+               * repeatedly extrapolating the color vector from one to
+               * the other until we find another color cell.  Then we
+               * assess the distance of both mixer colors from the
+               * intended color to determine their relative
+               * probabilities of being chosen.
+               */
+              pixval1 = *cachep - 1;
+              color1 = &quantobj->cmap[pixval1];
+
+              if (quantobj->actual_number_of_colors > 2)
+                {
+                  const gint re = src[red_pix]   - (gint) color1->red;
+                  const gint ge = src[green_pix] - (gint) color1->green;
+                  const gint be = src[blue_pix]  - (gint) color1->blue;
+                  gint       RV = src[red_pix]   + re;
+                  gint       GV = src[green_pix] + ge;
+                  gint       BV = src[blue_pix]  + be;
+
+                  do
+                    {
+                      rgb_to_lin ((CLAMP0255(RV)),
+                                  (CLAMP0255(GV)),
+                                  (CLAMP0255(BV)),
+                                  &R, &G, &B);
+
+                      cachep = HIST_LIN (histogram, R, G, B);
+                      /* If we have not seen this color before, find
+                       * nearest colormap entry and update the cache
+                       */
+                      if (*cachep == 0)
+                        fill_inverse_cmap_rgb (quantobj, histogram, R, G, B);
+
+                      pixval2 = *cachep - 1;
+                      RV += re;  GV += ge;  BV += be;
+                    }
+                  while ((pixval1 == pixval2) &&
+                         (!( (RV>255 || RV<0) || (GV>255 || GV<0) || (BV>255 || BV<0) )) &&
+                         (re || ge || be));
+                }
+
+              if (quantobj->actual_number_of_colors <= 2
+                  /* || pixval1 == pixval2 */) {
+                /* not enough colors to bother looking for an 'alternative'
+                   color (we may fail to do so anyway), so decide that
+                   the alternative color is simply the other cmap entry. */
+                pixval2 = (pixval1 + 1) %
+                  (quantobj->actual_number_of_colors);
+              }
+
+              /* always deterministically sort pixval1 and pixval2, to
+                 avoid artifacts in the dither range due to inverting our
+                 relative color viewpoint -- most obvious in 1-bit dither. */
+              if (pixval1 > pixval2)
+                {
+                  gint tmpval = pixval1;
+                  pixval1 = pixval2;
+                  pixval2 = tmpval;
+                  color1 = &quantobj->cmap[pixval1];
+                }
+
+              color2 = &quantobj->cmap[pixval2];
+
+              /* now figure out the relative probabilites of choosing
+                 either of our candidates. */
+#define DISTP(R1,G1,B1,R2,G2,B2,D) do {D = sqrt( 30*SQR((R1)-(R2)) + \
+                                                 59*SQR((G1)-(G2)) + \
+                                                 11*SQR((B1)-(B2)) ); }while(0)
+#define LIN_DISTP(R1,G1,B1,R2,G2,B2,D) do { \
+                int spacer1, spaceg1, spaceb1; \
+                int spacer2, spaceg2, spaceb2; \
+                rgb_to_unshifted_lin (R1,G1,B1, &spacer1, &spaceg1, &spaceb1); \
+                rgb_to_unshifted_lin (R2,G2,B2, &spacer2, &spaceg2, &spaceb2); \
+                D = sqrt(R_SCALE * SQR((spacer1)-(spacer2)) +           \
+                         G_SCALE * SQR((spaceg1)-(spaceg2)) + \
+                         B_SCALE * SQR((spaceb1)-(spaceb2))); \
+              } while(0)
+
+              /* although LIN_DISTP is more correct, DISTP is much faster and
+                 barely distinguishable. */
+              DISTP (color1->red, color1->green, color1->blue,
+                     src[red_pix], src[green_pix], src[blue_pix],
+                     err1);
+              DISTP (color2->red, color2->green, color2->blue,
+                     src[red_pix], src[green_pix], src[blue_pix],
+                     err2);
+
+              if (err1 || err2)
+                {
+                  const int proportion2 = (255 * err2) / (err1 + err2);
+                  if (dmval > proportion2)
+                    {
+                      pixval1 = pixval2; /* use color2 instead of color1*/
+                    }
+                }
+
+              /* Now emit the colormap index for this cell, barfbarf */
+              index_used_count[dest[INDEXED] = pixval1]++;
+
+            next_pixel:
+
+              src  += src_bpp;
+              dest += dest_bpp;
+            }
+        }
+
+      if (quantobj->progress && (count % 16 == 0))
+        gimp_progress_set_value (quantobj->progress,
+                                 (gdouble) total_size / (gdouble) layer_size);
+    }
+}
+
+static void
+median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
+                                        GimpLayer   *layer,
+                                        GeglBuffer  *new_buffer)
+{
+  GeglBufferIterator *iter;
+  const Babl         *src_format;
+  const Babl         *dest_format;
+  GeglRectangle      *src_roi;
+  gint                src_bpp;
+  gint                dest_bpp;
+  gint                has_alpha;
+  gboolean            dither_alpha = quantobj->want_dither_alpha;
+  gint                red_pix      = RED;
+  gint                green_pix    = GREEN;
+  gint                blue_pix     = BLUE;
+  gint                alpha_pix    = ALPHA;
+  gint                lastindex    = 0;
+  gint                lastred      = -1;
+  gint                lastgreen    = -1;
+  gint                lastblue     = -1;
+  gint                offsetx, offsety;
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                   NULL, 0, NULL,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+  src_roi = &iter->items[0].roi;
+
+  gegl_buffer_iterator_add (iter, new_buffer,
+                            NULL, 0, NULL,
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *src  = iter->items[0].data;
+      guchar       *dest = iter->items[1].data;
+      gint          row;
+
+      for (row = 0; row < src_roi->height; row++)
+        {
+          gint col;
+
+          for (col = 0; col < src_roi->width; col++)
+            {
+              gboolean transparent = FALSE;
+
+              if (has_alpha)
+                {
+                  if (dither_alpha)
+                    {
+                      gint dither_x = (col + src_roi->x + offsetx) & DM_WIDTHMASK;
+                      gint dither_y = (row + src_roi->y + offsety) & DM_HEIGHTMASK;
+
+                      if ((src[alpha_pix]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[alpha_pix] < 128)
+                        transparent = TRUE;
+                    }
+                }
+
+              if (! transparent)
+                {
+                  if ((lastred   == src[red_pix]) &&
+                      (lastgreen == src[green_pix]) &&
+                      (lastblue  == src[blue_pix]))
+                    {
+                      /*  same pixel color as last time  */
+                      dest[INDEXED] = lastindex;
+                      if (has_alpha)
+                        dest[ALPHA_I] = 255;
+                    }
+                  else
+                    {
+                      gint i;
+
+                      for (i = 0 ;
+                           i < quantobj->actual_number_of_colors;
+                           i++)
+                        {
+                          if ((quantobj->cmap[i].green == src[green_pix]) &&
+                              (quantobj->cmap[i].red   == src[red_pix]) &&
+                              (quantobj->cmap[i].blue  == src[blue_pix]))
+                          {
+                            lastred   = src[red_pix];
+                            lastgreen = src[green_pix];
+                            lastblue  = src[blue_pix];
+                            lastindex = i;
+
+                            goto got_color;
+                          }
+                        }
+                      g_error ("Non-existant color was expected to "
+                               "be in non-destructive colormap.");
+                    got_color:
+                      dest[INDEXED] = lastindex;
+                      if (has_alpha)
+                        dest[ALPHA_I] = 255;
+                    }
+                }
+              else
+                { /*  have alpha, and transparent  */
+                  dest[ALPHA_I] = 0;
+                }
+
+              src  += src_bpp;
+              dest += dest_bpp;
+            }
+        }
+    }
+}
+
+
+/*
+ * Initialize the error-limiting transfer function (lookup table).
+ * The raw F-S error computation can potentially compute error values of up to
+ * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
+ * much less, otherwise obviously wrong pixels will be created.  (Typical
+ * effects include weird fringes at color-area boundaries, isolated bright
+ * pixels in a dark area, etc.)  The standard advice for avoiding this problem
+ * is to ensure that the "corners" of the color cube are allocated as output
+ * colors; then repeated errors in the same direction cannot cause cascading
+ * error buildup.  However, that only prevents the error from getting
+ * completely out of hand; Aaron Giles reports that error limiting improves
+ * the results even with corner colors allocated.
+ * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
+ * well, but the smoother transfer function used below is even better.  Thanks
+ * to Aaron Giles for this idea.
+ */
+
+static gint *
+init_error_limit (const int error_freedom)
+/* Allocate and fill in the error_limiter table */
+{
+  gint *table;
+  gint  inp, out;
+
+  /* #define STEPSIZE 16 */
+  /* #define STEPSIZE 200 */
+
+  table = g_new (gint, 255 * 2 + 1);
+  table += 255;                 /* so we can index -255 ... +255 */
+
+  if (error_freedom == 0)
+    {
+      /* Coarse function, much bleeding. */
+
+      const gint STEPSIZE = 190;
+
+      for (inp = 0; inp < STEPSIZE; inp++)
+        {
+          table[inp] = inp;
+          table[-inp] = -inp;
+        }
+
+      for (; inp <= 255; inp++)
+        {
+          table[inp] = STEPSIZE;
+          table[-inp] = -STEPSIZE;
+        }
+
+      return (table);
+    }
+  else
+    {
+      /* Smooth function, bleeding more constrained */
+
+      const gint STEPSIZE = 24;
+
+      /* Map errors 1:1 up to +- STEPSIZE */
+      out = 0;
+      for (inp = 0; inp < STEPSIZE; inp++, out++)
+        {
+          table[inp] = out;
+          table[-inp] = -out;
+        }
+
+      /* Map errors 1:2 up to +- 3*STEPSIZE */
+      for (; inp < STEPSIZE*3; inp++, out += (inp&1) ? 0 : 1)
+        {
+          table[inp] = out;
+          table[-inp] = -out;
+        }
+
+      /* Clamp the rest to final out value (which is STEPSIZE*2) */
+      for (; inp <= 255; inp++)
+        {
+          table[inp] = out;
+          table[-inp] = -out;
+        }
+
+      return table;
+    }
+}
+
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ * Perform floyd-steinberg dithering.
+ */
+
+static void
+median_cut_pass2_fs_dither_gray (QuantizeObj *quantobj,
+                                 GimpLayer   *layer,
+                                 GeglBuffer  *new_buffer)
+{
+  GeglBuffer   *src_buffer;
+  CFHistogram   histogram = quantobj->histogram;
+  ColorFreq    *cachep;
+  Color        *color;
+  gint         *error_limiter;
+  const gshort *fs_err1, *fs_err2;
+  const gshort *fs_err3, *fs_err4;
+  const guchar *range_limiter;
+  const Babl   *src_format;
+  const Babl   *dest_format;
+  gint          src_bpp;
+  gint          dest_bpp;
+  guchar       *src_buf, *dest_buf;
+  gint         *next_row, *prev_row;
+  gint         *nr, *pr;
+  gint         *tmp;
+  gint          pixel;
+  gint          pixele;
+  gint          row, col;
+  gint          index;
+  gint          step_dest, step_src;
+  gint          odd_row;
+  gboolean      has_alpha;
+  gint          offsetx, offsety;
+  gboolean      dither_alpha = quantobj->want_dither_alpha;
+  gint          width, height;
+  guint64      *index_used_count = quantobj->index_used_count;
+
+  src_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  width  = gimp_item_get_width  (GIMP_ITEM (layer));
+  height = gimp_item_get_height (GIMP_ITEM (layer));
+
+  error_limiter = init_error_limit (quantobj->error_freedom);
+  range_limiter = range_array + 256;
+
+  src_buf  = g_malloc (width * src_bpp);
+  dest_buf = g_malloc (width * dest_bpp);
+
+  next_row = g_new (gint, width + 2);
+  prev_row = g_new0 (gint, width + 2);
+
+  fs_err1 = floyd_steinberg_error1 + 511;
+  fs_err2 = floyd_steinberg_error2 + 511;
+  fs_err3 = floyd_steinberg_error3 + 511;
+  fs_err4 = floyd_steinberg_error4 + 511;
+
+  odd_row = 0;
+
+  for (row = 0; row < height; row++)
+    {
+      const guchar *src;
+      guchar       *dest;
+
+      gegl_buffer_get (src_buffer, GEGL_RECTANGLE (0, row, width, 1),
+                       1.0, NULL, src_buf,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      src  = src_buf;
+      dest = dest_buf;
+
+      nr = next_row;
+      pr = prev_row + 1;
+
+      if (odd_row)
+        {
+          step_dest = -dest_bpp;
+          step_src  = -src_bpp;
+
+          src  += (width * src_bpp) - src_bpp;
+          dest += (width * dest_bpp) - dest_bpp;
+
+          nr += width + 1;
+          pr += width;
+
+          *(nr - 1) = 0;
+        }
+      else
+        {
+          step_dest = dest_bpp;
+          step_src  = src_bpp;
+
+          *(nr + 1) = 0;
+        }
+
+      *nr = 0;
+
+      for (col = 0; col < width; col++)
+        {
+          pixel = range_limiter[src[GRAY] + error_limiter[*pr]];
+
+          cachep = &histogram[pixel];
+          /* If we have not seen this color before, find nearest
+           * colormap entry and update the cache
+           */
+          if (*cachep == 0)
+            fill_inverse_cmap_gray (quantobj, histogram, pixel);
+
+          if (has_alpha)
+            {
+              gboolean transparent = FALSE;
+
+              if (odd_row)
+                {
+                  if (dither_alpha)
+                    {
+                      gint dither_x = ((width-col)+offsetx-1) & DM_WIDTHMASK;
+                      gint dither_y = (row+offsety) & DM_HEIGHTMASK;
+
+                      if ((src[ALPHA_G]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[ALPHA_G] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                      pr--;
+                      nr--;
+                      *(nr - 1) = 0;
+                      goto next_pixel;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                    }
+                }
+              else
+                {
+                  if (dither_alpha)
+                    {
+                      gint dither_x = (col + offsetx) & DM_WIDTHMASK;
+                      gint dither_y = (row + offsety) & DM_HEIGHTMASK;
+
+                      if ((src[ALPHA_G]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[ALPHA_G] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                      pr++;
+                      nr++;
+                      *(nr + 1) = 0;
+                      goto next_pixel;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                    }
+                }
+            }
+
+          index = *cachep - 1;
+          index_used_count[dest[INDEXED] = index]++;
+
+          color = &quantobj->cmap[index];
+          pixele = pixel - color->red;
+
+          if (odd_row)
+            {
+              *(--pr) += fs_err1[pixele];
+              *nr-- += fs_err2[pixele];
+              *nr += fs_err3[pixele];
+              *(nr-1) = fs_err4[pixele];
+            }
+          else
+            {
+              *(++pr) += fs_err1[pixele];
+              *nr++ += fs_err2[pixele];
+              *nr += fs_err3[pixele];
+              *(nr+1) = fs_err4[pixele];
+            }
+
+        next_pixel:
+
+          dest += step_dest;
+          src += step_src;
+        }
+
+      tmp = next_row;
+      next_row = prev_row;
+      prev_row = tmp;
+
+      odd_row = !odd_row;
+
+      gegl_buffer_set (new_buffer, GEGL_RECTANGLE (0, row, width, 1),
+                       0, NULL, dest_buf,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  g_free (error_limiter - 255); /* good lord. */
+  g_free (next_row);
+  g_free (prev_row);
+  g_free (src_buf);
+  g_free (dest_buf);
+}
+
+static void
+median_cut_pass2_rgb_init (QuantizeObj *quantobj)
+{
+  int i;
+
+  zero_histogram_rgb (quantobj->histogram);
+
+  /* Mark all indices as currently unused */
+  memset (quantobj->index_used_count, 0, 256 * sizeof (guint64));
+
+  /* Make a version of our discovered colormap in linear space */
+  for (i = 0; i < quantobj->actual_number_of_colors; i++)
+    {
+      rgb_to_unshifted_lin (quantobj->cmap[i].red,
+                            quantobj->cmap[i].green,
+                            quantobj->cmap[i].blue,
+                            &quantobj->clin[i].red,
+                            &quantobj->clin[i].green,
+                            &quantobj->clin[i].blue);
+    }
+}
+
+static void
+median_cut_pass2_gray_init (QuantizeObj *quantobj)
+{
+  zero_histogram_gray (quantobj->histogram);
+
+  /* Mark all indices as currently unused */
+  memset (quantobj->index_used_count, 0, 256 * sizeof (guint64));
+}
+
+static void
+median_cut_pass2_fs_dither_rgb (QuantizeObj *quantobj,
+                                GimpLayer   *layer,
+                                GeglBuffer  *new_buffer)
+{
+  GeglBuffer   *src_buffer;
+  CFHistogram   histogram = quantobj->histogram;
+  ColorFreq    *cachep;
+  Color        *color;
+  gint         *error_limiter;
+  const gshort *fs_err1, *fs_err2;
+  const gshort *fs_err3, *fs_err4;
+  const guchar *range_limiter;
+  const Babl   *src_format;
+  const Babl   *dest_format;
+  gint          src_bpp;
+  gint          dest_bpp;
+  guchar       *src_buf, *dest_buf;
+  gint         *red_n_row, *red_p_row;
+  gint         *grn_n_row, *grn_p_row;
+  gint         *blu_n_row, *blu_p_row;
+  gint         *rnr, *rpr;
+  gint         *gnr, *gpr;
+  gint         *bnr, *bpr;
+  gint         *tmp;
+  gint          re, ge, be;
+  gint          row, col;
+  gint          index;
+  gint          step_dest, step_src;
+  gint          odd_row;
+  gboolean      has_alpha;
+  gint          width, height;
+  gint          red_pix   = RED;
+  gint          green_pix = GREEN;
+  gint          blue_pix  = BLUE;
+  gint          alpha_pix = ALPHA;
+  gint          offsetx, offsety;
+  gboolean      dither_alpha     = quantobj->want_dither_alpha;
+  guint64      *index_used_count = quantobj->index_used_count;
+  gint          global_rmax = 0, global_rmin = G_MAXINT;
+  gint          global_gmax = 0, global_gmin = G_MAXINT;
+  gint          global_bmax = 0, global_bmin = G_MAXINT;
+
+  src_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
+
+  /*  In the case of web/mono palettes, we actually force
+   *   grayscale drawables through the rgb pass2 functions
+   */
+  if (gimp_drawable_is_gray (GIMP_DRAWABLE (layer)))
+    red_pix = green_pix = blue_pix = GRAY;
+
+  src_format  = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+  dest_format = gegl_buffer_get_format (new_buffer);
+
+  src_bpp  = babl_format_get_bytes_per_pixel (src_format);
+  dest_bpp = babl_format_get_bytes_per_pixel (dest_format);
+
+  has_alpha = babl_format_has_alpha (src_format);
+
+  width  = gimp_item_get_width  (GIMP_ITEM (layer));
+  height = gimp_item_get_height (GIMP_ITEM (layer));
+
+  error_limiter = init_error_limit (quantobj->error_freedom);
+  range_limiter = range_array + 256;
+
+  /* find the bounding box of the palette colors --
+     we use this for hard-clamping our error-corrected
+     values so that we can't continuously accelerate outside
+     of our attainable gamut, which looks icky. */
+  for (index = 0; index < quantobj->actual_number_of_colors; index++)
+    {
+      global_rmax = MAX(global_rmax, quantobj->clin[index].red);
+      global_rmin = MIN(global_rmin, quantobj->clin[index].red);
+      global_gmax = MAX(global_gmax, quantobj->clin[index].green);
+      global_gmin = MIN(global_gmin, quantobj->clin[index].green);
+      global_bmax = MAX(global_bmax, quantobj->clin[index].blue);
+      global_bmin = MIN(global_bmin, quantobj->clin[index].blue);
+    }
+
+  src_buf  = g_malloc (width * src_bpp);
+  dest_buf = g_malloc (width * dest_bpp);
+
+  red_n_row = g_new (gint, width + 2);
+  red_p_row = g_new0 (gint, width + 2);
+  grn_n_row = g_new (gint, width + 2);
+  grn_p_row = g_new0 (gint, width + 2);
+  blu_n_row = g_new (gint, width + 2);
+  blu_p_row = g_new0 (gint, width + 2);
+
+  fs_err1 = floyd_steinberg_error1 + 511;
+  fs_err2 = floyd_steinberg_error2 + 511;
+  fs_err3 = floyd_steinberg_error3 + 511;
+  fs_err4 = floyd_steinberg_error4 + 511;
+
+  odd_row = 0;
+
+  for (row = 0; row < height; row++)
+    {
+      const guchar *src;
+      guchar       *dest;
+
+      gegl_buffer_get (src_buffer, GEGL_RECTANGLE (0, row, width, 1),
+                       1.0, NULL, src_buf,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      src  = src_buf;
+      dest = dest_buf;
+
+      rnr = red_n_row;
+      gnr = grn_n_row;
+      bnr = blu_n_row;
+      rpr = red_p_row + 1;
+      gpr = grn_p_row + 1;
+      bpr = blu_p_row + 1;
+
+      if (odd_row)
+        {
+          step_dest = -dest_bpp;
+          step_src  = -src_bpp;
+
+          src += (width * src_bpp) - src_bpp;
+          dest += (width * dest_bpp) - dest_bpp;
+
+          rnr += width + 1;
+          gnr += width + 1;
+          bnr += width + 1;
+          rpr += width;
+          gpr += width;
+          bpr += width;
+
+          *(rnr - 1) = *(gnr - 1) = *(bnr - 1) = 0;
+        }
+      else
+        {
+          step_dest = dest_bpp;
+          step_src  = src_bpp;
+
+          *(rnr + 1) = *(gnr + 1) = *(bnr + 1) = 0;
+        }
+
+      *rnr = *gnr = *bnr = 0;
+
+      for (col = 0; col < width; col++)
+        {
+          if (has_alpha)
+            {
+              gboolean transparent = FALSE;
+
+              if (odd_row)
+                {
+                  if (dither_alpha)
+                    {
+                      gint dither_x = ((width-col)+offsetx-1) & DM_WIDTHMASK;
+                      gint dither_y = (row+offsety) & DM_HEIGHTMASK;
+
+                      if ((src[alpha_pix]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[alpha_pix] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                      rpr--; gpr--; bpr--;
+                      rnr--; gnr--; bnr--;
+                      *(rnr - 1) = *(gnr - 1) = *(bnr - 1) = 0;
+                      goto next_pixel;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                    }
+                }
+              else
+                {
+                  if (dither_alpha)
+                    {
+                      gint dither_x = (col + offsetx) & DM_WIDTHMASK;
+                      gint dither_y = (row + offsety) & DM_HEIGHTMASK;
+
+                      if ((src[alpha_pix]) < DM[dither_x][dither_y])
+                        transparent = TRUE;
+                    }
+                  else
+                    {
+                      if (src[alpha_pix] <= 127)
+                        transparent = TRUE;
+                    }
+
+                  if (transparent)
+                    {
+                      dest[ALPHA_I] = 0;
+                      rpr++; gpr++; bpr++;
+                      rnr++; gnr++; bnr++;
+                      *(rnr + 1) = *(gnr + 1) = *(bnr + 1) = 0;
+                      goto next_pixel;
+                    }
+                  else
+                    {
+                      dest[ALPHA_I] = 255;
+                    }
+                }
+            }
+
+#if 0
+          /* hmm. */
+
+          r = range_limiter[src[red_pix] + error_limiter[*rpr]];
+          g = range_limiter[src[green_pix] + error_limiter[*gpr]];
+          b = range_limiter[src[blue_pix] + error_limiter[*bpr]];
+
+          re = r >> R_SHIFT;
+          ge = g >> G_SHIFT;
+          be = b >> B_SHIFT;
+
+          rgb_to_lin (r, g, b, &re, &ge, &be);
+#endif
+          rgb_to_unshifted_lin (src[red_pix], src[green_pix], src[blue_pix],
+                                &re, &ge, &be);
+
+          /*
+            re = CLAMP(re, global_rmin, global_rmax);
+            ge = CLAMP(ge, global_gmin, global_gmax);
+            be = CLAMP(be, global_bmin, global_bmax);*/
+
+          re = range_limiter[re + error_limiter[*rpr]];
+          ge = range_limiter[ge + error_limiter[*gpr]];
+          be = range_limiter[be + error_limiter[*bpr]];
+
+          cachep = HIST_LIN (histogram,
+                             RSDF (re),
+                             GSDF (ge),
+                             BSDF (be));
+          /* If we have not seen this color before, find nearest
+           * colormap entry and update the cache
+           */
+          if (*cachep == 0)
+            fill_inverse_cmap_rgb (quantobj, histogram,
+                                   RSDF (re),
+                                   GSDF (ge),
+                                   BSDF (be));
+
+          index = *cachep - 1;
+          index_used_count[index]++;
+          dest[INDEXED] = index;
+
+          /*if (re > global_rmax)
+            re = (re + 3*global_rmax) / 4;
+          else if (re < global_rmin)
+          re = (re + 3*global_rmin) / 4;*/
+
+          /* We constrain chroma error extra-hard so that it
+             doesn't run away and steal the thunder from the
+             lightness error where all the detail usually is. */
+          if (ge > global_gmax)
+            ge = (ge + 3*global_gmax) / 4;
+          else if (ge < global_gmin)
+            ge = (ge + 3*global_gmin) / 4;
+          if (be > global_bmax)
+            be = (be + 3*global_bmax) / 4;
+          else if (be < global_bmin)
+            be = (be + 3*global_bmin) / 4;
+
+          color = &quantobj->clin[index];
+
+#if 0
+          if ((re > 0 && re < 255) /* HMM &&
+              ge >= 0 && ge <= 255 &&
+              be >= 0 && be <= 255*/)
+            {
+              ge = ge - color->green;
+              be = be - color->blue;
+              re = re - color->red;
+            }
+          else
+            {
+              /* color pretty much undefined now; nullify error. */
+              re = ge = be = 0;
+            }
+#endif
+
+          if (re <= 0 || re >= 255)
+            re = ge = be = 0;
+          else
+            {
+              re = re - color->red;
+              ge = ge - color->green;
+              be = be - color->blue;
+            }
+
+          if (odd_row)
+            {
+              *(--rpr) += fs_err1[re];
+              *(--gpr) += fs_err1[ge];
+              *(--bpr) += fs_err1[be];
+
+              *rnr-- += fs_err2[re];
+              *gnr-- += fs_err2[ge];
+              *bnr-- += fs_err2[be];
+
+              *rnr += fs_err3[re];
+              *gnr += fs_err3[ge];
+              *bnr += fs_err3[be];
+
+              *(rnr-1) = fs_err4[re];
+              *(gnr-1) = fs_err4[ge];
+              *(bnr-1) = fs_err4[be];
+            }
+          else
+            {
+              *(++rpr) += fs_err1[re];
+              *(++gpr) += fs_err1[ge];
+              *(++bpr) += fs_err1[be];
+
+              *rnr++ += fs_err2[re];
+              *gnr++ += fs_err2[ge];
+              *bnr++ += fs_err2[be];
+
+              *rnr += fs_err3[re];
+              *gnr += fs_err3[ge];
+              *bnr += fs_err3[be];
+
+              *(rnr+1) = fs_err4[re];
+              *(gnr+1) = fs_err4[ge];
+              *(bnr+1) = fs_err4[be];
+            }
+
+        next_pixel:
+
+          dest += step_dest;
+          src += step_src;
+        }
+
+      tmp = red_n_row;
+      red_n_row = red_p_row;
+      red_p_row = tmp;
+
+      tmp = grn_n_row;
+      grn_n_row = grn_p_row;
+      grn_p_row = tmp;
+
+      tmp = blu_n_row;
+      blu_n_row = blu_p_row;
+      blu_p_row = tmp;
+
+      odd_row = !odd_row;
+
+      gegl_buffer_set (new_buffer, GEGL_RECTANGLE (0, row, width, 1),
+                       0, NULL, dest_buf,
+                       GEGL_AUTO_ROWSTRIDE);
+
+      if (quantobj->progress && (row % 16 == 0))
+        gimp_progress_set_value (quantobj->progress,
+                                 (gdouble) row / (gdouble) height);
+    }
+
+  g_free (error_limiter - 255);
+  g_free (red_n_row);
+  g_free (red_p_row);
+  g_free (grn_n_row);
+  g_free (grn_p_row);
+  g_free (blu_n_row);
+  g_free (blu_p_row);
+  g_free (src_buf);
+  g_free (dest_buf);
+}
+
+
+static void
+delete_median_cut (QuantizeObj *quantobj)
+{
+  g_free (quantobj->histogram);
+  g_free (quantobj);
+}
+
+
+void
+gimp_image_convert_indexed_set_dither_matrix (const guchar *matrix,
+                                              gint          width,
+                                              gint          height)
+{
+  gint x;
+  gint y;
+
+  /* if matrix is invalid, restore the default matrix */
+  if (matrix == NULL || width == 0 || height == 0)
+    {
+      matrix = (const guchar *) DM_ORIGINAL;
+      width  = DM_WIDTH;
+      height = DM_HEIGHT;
+    }
+
+  g_return_if_fail ((DM_WIDTH % width) == 0);
+  g_return_if_fail ((DM_HEIGHT % height) == 0);
+
+  for (y = 0; y < DM_HEIGHT; y++)
+    {
+      for (x = 0; x < DM_WIDTH; x++)
+        {
+          DM[x][y] = matrix[((x % width) * height) + (y % height)];
+        }
+    }
+}
+
+
+/**************************************************************/
+static QuantizeObj *
+initialize_median_cut (GimpImageBaseType       type,
+                       gint                    num_colors,
+                       GimpConvertDitherType   dither_type,
+                       GimpConvertPaletteType  palette_type,
+                       GimpPalette            *custom_palette,
+                       gboolean                want_dither_alpha,
+                       GimpProgress           *progress)
+{
+  QuantizeObj *quantobj;
+
+  /* Initialize the data structures */
+  quantobj = g_new (QuantizeObj, 1);
+
+  if (type == GIMP_GRAY && palette_type == GIMP_CONVERT_PALETTE_GENERATE)
+    quantobj->histogram = g_new (ColorFreq, 256);
+  else
+    quantobj->histogram = g_new (ColorFreq,
+                                 HIST_R_ELEMS * HIST_G_ELEMS * HIST_B_ELEMS);
+
+  quantobj->custom_palette           = custom_palette;
+  quantobj->desired_number_of_colors = num_colors;
+  quantobj->want_dither_alpha        = want_dither_alpha;
+  quantobj->progress                 = progress;
+
+  switch (type)
+    {
+    case GIMP_GRAY:
+      switch (palette_type)
+        {
+        case GIMP_CONVERT_PALETTE_GENERATE:
+          quantobj->first_pass = median_cut_pass1_gray;
+          break;
+        case GIMP_CONVERT_PALETTE_WEB:
+          quantobj->first_pass = webpal_pass1;
+          break;
+        case GIMP_CONVERT_PALETTE_CUSTOM:
+          quantobj->first_pass = custompal_pass1;
+          needs_quantize = TRUE;
+          break;
+        case GIMP_CONVERT_PALETTE_MONO:
+        default:
+          quantobj->first_pass = monopal_pass1;
+        }
+
+      if (palette_type == GIMP_CONVERT_PALETTE_WEB ||
+          palette_type == GIMP_CONVERT_PALETTE_CUSTOM)
+        {
+          switch (dither_type)
+            {
+            case GIMP_CONVERT_DITHER_NODESTRUCT:
+            default:
+              g_warning("Uh-oh, bad dither type, W1");
+            case GIMP_CONVERT_DITHER_NONE:
+              quantobj->second_pass_init = median_cut_pass2_rgb_init;
+              quantobj->second_pass = median_cut_pass2_no_dither_rgb;
+              break;
+            case GIMP_CONVERT_DITHER_FS:
+              quantobj->error_freedom = 0;
+              quantobj->second_pass_init = median_cut_pass2_rgb_init;
+              quantobj->second_pass = median_cut_pass2_fs_dither_rgb;
+              break;
+            case GIMP_CONVERT_DITHER_FS_LOWBLEED:
+              quantobj->error_freedom = 1;
+              quantobj->second_pass_init = median_cut_pass2_rgb_init;
+              quantobj->second_pass = median_cut_pass2_fs_dither_rgb;
+              break;
+            case GIMP_CONVERT_DITHER_FIXED:
+              quantobj->second_pass_init = median_cut_pass2_rgb_init;
+              quantobj->second_pass = median_cut_pass2_fixed_dither_rgb;
+              break;
+            }
+        }
+      else
+        {
+          switch (dither_type)
+            {
+            case GIMP_CONVERT_DITHER_NODESTRUCT:
+            default:
+              g_warning("Uh-oh, bad dither type, W2");
+            case GIMP_CONVERT_DITHER_NONE:
+              quantobj->second_pass_init = median_cut_pass2_gray_init;
+              quantobj->second_pass = median_cut_pass2_no_dither_gray;
+              break;
+            case GIMP_CONVERT_DITHER_FS:
+              quantobj->error_freedom = 0;
+              quantobj->second_pass_init = median_cut_pass2_gray_init;
+              quantobj->second_pass = median_cut_pass2_fs_dither_gray;
+              break;
+            case GIMP_CONVERT_DITHER_FS_LOWBLEED:
+              quantobj->error_freedom = 1;
+              quantobj->second_pass_init = median_cut_pass2_gray_init;
+              quantobj->second_pass = median_cut_pass2_fs_dither_gray;
+              break;
+            case GIMP_CONVERT_DITHER_FIXED:
+              quantobj->second_pass_init = median_cut_pass2_gray_init;
+              quantobj->second_pass = median_cut_pass2_fixed_dither_gray;
+              break;
+            }
+        }
+      break;
+
+    case GIMP_RGB:
+      switch (palette_type)
+        {
+        case GIMP_CONVERT_PALETTE_GENERATE:
+          quantobj->first_pass = median_cut_pass1_rgb;
+          break;
+        case GIMP_CONVERT_PALETTE_WEB:
+          quantobj->first_pass = webpal_pass1;
+          needs_quantize = TRUE;
+          break;
+        case GIMP_CONVERT_PALETTE_CUSTOM:
+          quantobj->first_pass = custompal_pass1;
+          needs_quantize = TRUE;
+          break;
+        case GIMP_CONVERT_PALETTE_MONO:
+        default:
+          quantobj->first_pass = monopal_pass1;
+        }
+
+      switch (dither_type)
+        {
+        case GIMP_CONVERT_DITHER_NONE:
+          quantobj->second_pass_init = median_cut_pass2_rgb_init;
+          quantobj->second_pass = median_cut_pass2_no_dither_rgb;
+          break;
+        case GIMP_CONVERT_DITHER_FS:
+          quantobj->error_freedom = 0;
+          quantobj->second_pass_init = median_cut_pass2_rgb_init;
+          quantobj->second_pass = median_cut_pass2_fs_dither_rgb;
+          break;
+        case GIMP_CONVERT_DITHER_FS_LOWBLEED:
+          quantobj->error_freedom = 1;
+          quantobj->second_pass_init = median_cut_pass2_rgb_init;
+          quantobj->second_pass = median_cut_pass2_fs_dither_rgb;
+          break;
+        case GIMP_CONVERT_DITHER_NODESTRUCT:
+          quantobj->second_pass_init = NULL;
+          quantobj->second_pass = median_cut_pass2_nodestruct_dither_rgb;
+          break;
+        case GIMP_CONVERT_DITHER_FIXED:
+          quantobj->second_pass_init = median_cut_pass2_rgb_init;
+          quantobj->second_pass = median_cut_pass2_fixed_dither_rgb;
+          break;
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  quantobj->delete_func = delete_median_cut;
+
+  return quantobj;
+}
diff --git a/app/core/gimpimage-convert-indexed.h b/app/core/gimpimage-convert-indexed.h
new file mode 100644
index 0000000..ba51f02
--- /dev/null
+++ b/app/core/gimpimage-convert-indexed.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_CONVERT_INDEXED_H__
+#define __GIMP_IMAGE_CONVERT_INDEXED_H__
+
+
+#define MAXNUMCOLORS 256
+
+
+gboolean   gimp_image_convert_indexed      (GimpImage               *image,
+                                            GimpConvertPaletteType   palette_type,
+                                            gint                     max_colors,
+                                            gboolean                 remove_duplicates,
+                                            GimpConvertDitherType    dither_type,
+                                            gboolean                 dither_alpha,
+                                            gboolean                 dither_text_layers,
+                                            GimpPalette             *custom_palette,
+                                            GimpProgress            *progress,
+                                            GError                 **error);
+
+void  gimp_image_convert_indexed_set_dither_matrix (const guchar *matrix,
+                                                    gint          width,
+                                                    gint          height);
+
+
+#endif  /*  __GIMP_IMAGE_CONVERT_INDEXED_H__  */
diff --git a/app/core/gimpimage-convert-precision.c b/app/core/gimpimage-convert-precision.c
new file mode 100644
index 0000000..71a613c
--- /dev/null
+++ b/app/core/gimpimage-convert-precision.c
@@ -0,0 +1,304 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-convert-precision.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-operation.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-convert-precision.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+
+#include "text/gimptextlayer.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_image_convert_precision (GimpImage        *image,
+                              GimpPrecision     precision,
+                              GeglDitherMethod  layer_dither_type,
+                              GeglDitherMethod  text_layer_dither_type,
+                              GeglDitherMethod  mask_dither_type,
+                              GimpProgress     *progress)
+{
+  GimpColorProfile *old_profile;
+  GimpColorProfile *new_profile = NULL;
+  const Babl       *old_format;
+  const Babl       *new_format;
+  GimpObjectQueue  *queue;
+  GimpProgress     *sub_progress;
+  GList            *layers;
+  GimpDrawable     *drawable;
+  const gchar      *undo_desc    = NULL;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (precision != gimp_image_get_precision (image));
+  g_return_if_fail (gimp_babl_is_valid (gimp_image_get_base_type (image),
+                                        precision));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  switch (precision)
+    {
+    case GIMP_PRECISION_U8_LINEAR:
+      undo_desc = C_("undo-type", "Convert Image to 8 bit linear integer");
+      break;
+    case GIMP_PRECISION_U8_GAMMA:
+      undo_desc = C_("undo-type", "Convert Image to 8 bit gamma integer");
+      break;
+    case GIMP_PRECISION_U16_LINEAR:
+      undo_desc = C_("undo-type", "Convert Image to 16 bit linear integer");
+      break;
+    case GIMP_PRECISION_U16_GAMMA:
+      undo_desc = C_("undo-type", "Convert Image to 16 bit gamma integer");
+      break;
+    case GIMP_PRECISION_U32_LINEAR:
+      undo_desc = C_("undo-type", "Convert Image to 32 bit linear integer");
+      break;
+    case GIMP_PRECISION_U32_GAMMA:
+      undo_desc = C_("undo-type", "Convert Image to 32 bit gamma integer");
+      break;
+    case GIMP_PRECISION_HALF_LINEAR:
+      undo_desc = C_("undo-type", "Convert Image to 16 bit linear floating point");
+      break;
+    case GIMP_PRECISION_HALF_GAMMA:
+      undo_desc = C_("undo-type", "Convert Image to 16 bit gamma floating point");
+      break;
+    case GIMP_PRECISION_FLOAT_LINEAR:
+      undo_desc = C_("undo-type", "Convert Image to 32 bit linear floating point");
+      break;
+    case GIMP_PRECISION_FLOAT_GAMMA:
+      undo_desc = C_("undo-type", "Convert Image to 32 bit gamma floating point");
+      break;
+    case GIMP_PRECISION_DOUBLE_LINEAR:
+      undo_desc = C_("undo-type", "Convert Image to 64 bit linear floating point");
+      break;
+    case GIMP_PRECISION_DOUBLE_GAMMA:
+      undo_desc = C_("undo-type", "Convert Image to 64 bit gamma floating point");
+      break;
+    }
+
+  if (progress)
+    gimp_progress_start (progress, FALSE, "%s", undo_desc);
+
+  queue        = gimp_object_queue_new (progress);
+  sub_progress = GIMP_PROGRESS (queue);
+
+  layers = gimp_image_get_layer_list (image);
+  gimp_object_queue_push_list (queue, layers);
+  g_list_free (layers);
+
+  gimp_object_queue_push (queue, gimp_image_get_mask (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_channels (image));
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CONVERT,
+                               undo_desc);
+
+  /*  Push the image precision to the stack  */
+  gimp_image_undo_push_image_precision (image, NULL);
+
+  old_profile = gimp_image_get_color_profile (image);
+  old_format  = gimp_image_get_layer_format (image, FALSE);
+
+  gimp_image_set_converting (image, TRUE);
+
+  /*  Set the new precision  */
+  g_object_set (image, "precision", precision, NULL);
+
+  new_format = gimp_image_get_layer_format (image, FALSE);
+
+  if (old_profile)
+    {
+      if (gimp_babl_format_get_linear (old_format) !=
+          gimp_babl_format_get_linear (new_format))
+        {
+          /* when converting between linear and gamma, we create a new
+           * profile using the original profile's chromacities and
+           * whitepoint, but a linear/sRGB-gamma TRC.
+           */
+
+          if (gimp_babl_format_get_linear (new_format))
+            {
+              new_profile =
+                gimp_color_profile_new_linear_from_color_profile (old_profile);
+            }
+          else
+            {
+              new_profile =
+                gimp_color_profile_new_srgb_trc_from_color_profile (old_profile);
+            }
+
+          /* if a new profile cannot be be generated, convert to the
+           * builtin profile, which is better than leaving the user with
+           * broken colors
+           */
+          if (! new_profile)
+            {
+              new_profile = gimp_image_get_builtin_color_profile (image);
+              g_object_ref (new_profile);
+            }
+        }
+
+      if (! new_profile)
+        new_profile = g_object_ref (old_profile);
+    }
+
+  while ((drawable = gimp_object_queue_pop (queue)))
+    {
+      if (drawable == GIMP_DRAWABLE (gimp_image_get_mask (image)))
+        {
+          GeglBuffer *buffer;
+
+          gimp_image_undo_push_mask_precision (image, NULL,
+                                               GIMP_CHANNEL (drawable));
+
+          buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                    gimp_image_get_width  (image),
+                                                    gimp_image_get_height (image)),
+                                    gimp_image_get_mask_format (image));
+
+          gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                                 GEGL_ABYSS_NONE,
+                                 buffer, NULL);
+
+          gimp_drawable_set_buffer (drawable, FALSE, NULL, buffer);
+          g_object_unref (buffer);
+
+          gimp_progress_set_value (sub_progress, 1.0);
+        }
+      else
+        {
+          gint dither_type;
+
+          if (gimp_item_is_text_layer (GIMP_ITEM (drawable)))
+            dither_type = text_layer_dither_type;
+          else
+            dither_type = layer_dither_type;
+
+          gimp_drawable_convert_type (drawable, image,
+                                      gimp_drawable_get_base_type (drawable),
+                                      precision,
+                                      gimp_drawable_has_alpha (drawable),
+                                      new_profile,
+                                      dither_type,
+                                      mask_dither_type,
+                                      TRUE, sub_progress);
+        }
+    }
+
+  if (new_profile)
+    {
+      if (new_profile != old_profile)
+        gimp_image_set_color_profile (image, new_profile, NULL);
+
+      g_object_unref (new_profile);
+    }
+
+  gimp_image_set_converting (image, FALSE);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_precision_changed (image);
+  g_object_thaw_notify (G_OBJECT (image));
+
+  g_object_unref (queue);
+
+  if (progress)
+    gimp_progress_end (progress);
+}
+
+void
+gimp_image_convert_dither_u8 (GimpImage    *image,
+                              GimpProgress *progress)
+{
+  GeglNode *dither;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  dither = gegl_node_new_child (NULL,
+                                "operation", "gegl:noise-rgb",
+                                "red",       1.0 / 256.0,
+                                "green",     1.0 / 256.0,
+                                "blue",      1.0 / 256.0,
+                                "linear",    FALSE,
+                                "gaussian",  FALSE,
+                                NULL);
+
+  if (dither)
+    {
+      GimpObjectQueue *queue;
+      GimpProgress    *sub_progress;
+      GList           *layers;
+      GList           *list;
+      GimpDrawable    *drawable;
+
+      if (progress)
+        gimp_progress_start (progress, FALSE, "%s", _("Dithering"));
+
+      queue        = gimp_object_queue_new (progress);
+      sub_progress = GIMP_PROGRESS (queue);
+
+      layers = gimp_image_get_layer_list (image);
+
+      for (list = layers; list; list = g_list_next (list))
+        {
+          if (! gimp_viewable_get_children (list->data) &&
+              ! gimp_item_is_text_layer (list->data))
+            {
+              gimp_object_queue_push (queue, list->data);
+            }
+        }
+
+      g_list_free (layers);
+
+      while ((drawable = gimp_object_queue_pop (queue)))
+        {
+          gimp_drawable_apply_operation (drawable, sub_progress,
+                                         _("Dithering"),
+                                         dither);
+        }
+
+      g_object_unref (queue);
+
+      if (progress)
+        gimp_progress_end (progress);
+
+      g_object_unref (dither);
+    }
+}
diff --git a/app/core/gimpimage-convert-precision.h b/app/core/gimpimage-convert-precision.h
new file mode 100644
index 0000000..cd3a010
--- /dev/null
+++ b/app/core/gimpimage-convert-precision.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-convert-precision.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_CONVERT_PRECISION_H__
+#define __GIMP_IMAGE_CONVERT_PRECISION_H__
+
+
+void   gimp_image_convert_precision (GimpImage        *image,
+                                     GimpPrecision     precision,
+                                     GeglDitherMethod  layer_dither_type,
+                                     GeglDitherMethod  text_layer_dither_type,
+                                     GeglDitherMethod  mask_dither_type,
+                                     GimpProgress     *progress);
+
+void   gimp_image_convert_dither_u8 (GimpImage        *image,
+                                     GimpProgress     *progress);
+
+
+#endif  /*  __GIMP_IMAGE_CONVERT_PRECISION_H__  */
diff --git a/app/core/gimpimage-convert-type.c b/app/core/gimpimage-convert-type.c
new file mode 100644
index 0000000..4298a49
--- /dev/null
+++ b/app/core/gimpimage-convert-type.c
@@ -0,0 +1,162 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimp.h"
+#include "gimpdrawable.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-convert-type.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+gimp_image_convert_type (GimpImage          *image,
+                         GimpImageBaseType   new_type,
+                         GimpColorProfile   *dest_profile,
+                         GimpProgress       *progress,
+                         GError            **error)
+{
+  GimpImageBaseType  old_type;
+  const Babl        *new_layer_format;
+  GimpObjectQueue   *queue;
+  GList             *all_layers;
+  GimpDrawable      *drawable;
+  const gchar       *undo_desc = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (new_type != gimp_image_get_base_type (image), FALSE);
+  g_return_val_if_fail (new_type != GIMP_INDEXED, FALSE);
+  g_return_val_if_fail (gimp_babl_is_valid (new_type,
+                                            gimp_image_get_precision (image)),
+                        FALSE);
+  g_return_val_if_fail (dest_profile == NULL || GIMP_IS_COLOR_PROFILE (dest_profile),
+                        FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  new_layer_format = gimp_babl_format (new_type,
+                                       gimp_image_get_precision (image),
+                                       TRUE);
+
+  if (dest_profile &&
+      ! gimp_image_validate_color_profile_by_format (new_layer_format,
+                                                     dest_profile,
+                                                     NULL, error))
+    {
+      return FALSE;
+    }
+
+  switch (new_type)
+    {
+    case GIMP_RGB:
+      undo_desc = C_("undo-type", "Convert Image to RGB");
+      break;
+
+    case GIMP_GRAY:
+      undo_desc = C_("undo-type", "Convert Image to Grayscale");
+      break;
+
+    default:
+      g_return_val_if_reached (FALSE);
+    }
+
+  gimp_set_busy (image->gimp);
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  all_layers = gimp_image_get_layer_list (image);
+  gimp_object_queue_push_list (queue, all_layers);
+  g_list_free (all_layers);
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CONVERT,
+                               undo_desc);
+
+  /*  Push the image type to the stack  */
+  gimp_image_undo_push_image_type (image, NULL);
+
+  /*  Set the new base type  */
+  old_type = gimp_image_get_base_type (image);
+
+  g_object_set (image, "base-type", new_type, NULL);
+
+  /*  When converting to/from GRAY, convert to the new type's builtin
+   *  profile if none was passed.
+   */
+  if (old_type == GIMP_GRAY ||
+      new_type == GIMP_GRAY)
+    {
+      if (! dest_profile && gimp_image_get_color_profile (image))
+        dest_profile = gimp_image_get_builtin_color_profile (image);
+    }
+
+  while ((drawable = gimp_object_queue_pop (queue)))
+    {
+      gimp_drawable_convert_type (drawable, image,
+                                  new_type,
+                                  gimp_drawable_get_precision (drawable),
+                                  gimp_drawable_has_alpha (drawable),
+                                  dest_profile,
+                                  GEGL_DITHER_NONE, GEGL_DITHER_NONE,
+                                  TRUE, progress);
+    }
+
+  if (old_type == GIMP_INDEXED)
+    gimp_image_unset_colormap (image, TRUE);
+
+  /*  When converting to/from GRAY, set the new profile.
+   */
+  if (old_type == GIMP_GRAY ||
+      new_type == GIMP_GRAY)
+    {
+      if (gimp_image_get_color_profile (image))
+        gimp_image_set_color_profile (image, dest_profile, NULL);
+      else
+        gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image));
+    }
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_mode_changed (image);
+  g_object_thaw_notify (G_OBJECT (image));
+
+  g_object_unref (queue);
+
+  gimp_unset_busy (image->gimp);
+
+  return TRUE;
+}
diff --git a/app/core/gimpimage-convert-type.h b/app/core/gimpimage-convert-type.h
new file mode 100644
index 0000000..53c6950
--- /dev/null
+++ b/app/core/gimpimage-convert-type.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_CONVERT_TYPE_H__
+#define __GIMP_IMAGE_CONVERT_TYPE_H__
+
+
+gboolean   gimp_image_convert_type (GimpImage          *image,
+                                    GimpImageBaseType   new_type,
+                                    GimpColorProfile   *dest_profile,
+                                    GimpProgress       *progress,
+                                    GError            **error);
+
+
+#endif  /*  __GIMP_IMAGE_CONVERT_TYPE_H__  */
diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c
new file mode 100644
index 0000000..c6814d4
--- /dev/null
+++ b/app/core/gimpimage-crop.c
@@ -0,0 +1,234 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-crop.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimpsamplepoint.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_image_crop (GimpImage    *image,
+                 GimpContext  *context,
+                 GimpFillType  fill_type,
+                 gint          x,
+                 gint          y,
+                 gint          width,
+                 gint          height,
+                 gboolean      crop_layers)
+{
+  GList *list;
+  gint   previous_width;
+  gint   previous_height;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  previous_width  = gimp_image_get_width  (image);
+  previous_height = gimp_image_get_height (image);
+
+  /*  Make sure new width and height are non-zero  */
+  if (width < 1 || height < 1)
+    return;
+
+  gimp_set_busy (image->gimp);
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  if (crop_layers)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CROP,
+                                 C_("undo-type", "Crop Image"));
+  else
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE,
+                                 C_("undo-type", "Resize Image"));
+
+  /*  Push the image size to the stack  */
+  gimp_image_undo_push_image_size (image, NULL,
+                                   x, y, width, height);
+
+  /*  Set the new width and height  */
+  g_object_set (image,
+                "width",  width,
+                "height", height,
+                NULL);
+
+  /*  Resize all channels  */
+  for (list = gimp_image_get_channel_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      gimp_item_resize (item, context, GIMP_FILL_TRANSPARENT,
+                        width, height, -x, -y);
+    }
+
+  /*  Resize all vectors  */
+  for (list = gimp_image_get_vectors_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      gimp_item_resize (item, context, GIMP_FILL_TRANSPARENT,
+                        width, height, -x, -y);
+    }
+
+  /*  Don't forget the selection mask!  */
+  gimp_item_resize (GIMP_ITEM (gimp_image_get_mask (image)),
+                    context, GIMP_FILL_TRANSPARENT,
+                    width, height, -x, -y);
+
+  /*  crop all layers  */
+  list = gimp_image_get_layer_iter (image);
+
+  while (list)
+    {
+      GimpItem *item = list->data;
+
+      list = g_list_next (list);
+
+      gimp_item_translate (item, -x, -y, TRUE);
+
+      if (crop_layers && ! gimp_item_is_content_locked (item))
+        {
+          gint off_x, off_y;
+          gint lx1, ly1, lx2, ly2;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+
+          lx1 = CLAMP (off_x, 0, gimp_image_get_width  (image));
+          ly1 = CLAMP (off_y, 0, gimp_image_get_height (image));
+          lx2 = CLAMP (gimp_item_get_width  (item) + off_x,
+                       0, gimp_image_get_width (image));
+          ly2 = CLAMP (gimp_item_get_height (item) + off_y,
+                       0, gimp_image_get_height (image));
+
+          width  = lx2 - lx1;
+          height = ly2 - ly1;
+
+          if (width > 0 && height > 0)
+            {
+              gimp_item_resize (item, context, fill_type,
+                                width, height,
+                                -(lx1 - off_x),
+                                -(ly1 - off_y));
+            }
+          else
+            {
+              gimp_image_remove_layer (image, GIMP_LAYER (item),
+                                       TRUE, NULL);
+            }
+        }
+    }
+
+  /*  Reposition or remove guides  */
+  list = gimp_image_get_guides (image);
+
+  while (list)
+    {
+      GimpGuide *guide        = list->data;
+      gboolean   remove_guide = FALSE;
+      gint       position     = gimp_guide_get_position (guide);
+
+      list = g_list_next (list);
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          position -= y;
+          if ((position < 0) || (position > height))
+            remove_guide = TRUE;
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          position -= x;
+          if ((position < 0) || (position > width))
+            remove_guide = TRUE;
+          break;
+
+        default:
+          break;
+        }
+
+      if (remove_guide)
+        gimp_image_remove_guide (image, guide, TRUE);
+      else if (position != gimp_guide_get_position (guide))
+        gimp_image_move_guide (image, guide, position, TRUE);
+    }
+
+  /*  Reposition or remove sample points  */
+  list = gimp_image_get_sample_points (image);
+
+  while (list)
+    {
+      GimpSamplePoint *sample_point        = list->data;
+      gboolean         remove_sample_point = FALSE;
+      gint             old_x;
+      gint             old_y;
+      gint             new_x;
+      gint             new_y;
+
+      list = g_list_next (list);
+
+      gimp_sample_point_get_position (sample_point, &old_x, &old_y);
+      new_x = old_x;
+      new_y = old_y;
+
+      new_y -= y;
+      if ((new_y < 0) || (new_y > height))
+       remove_sample_point = TRUE;
+
+      new_x -= x;
+      if ((new_x < 0) || (new_x > width))
+        remove_sample_point = TRUE;
+
+      if (remove_sample_point)
+        gimp_image_remove_sample_point (image, sample_point, TRUE);
+      else if (new_x != old_x || new_y != old_y)
+        gimp_image_move_sample_point (image, sample_point,
+                                      new_x, new_y, TRUE);
+    }
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_size_changed_detailed (image,
+                                    -x, -y,
+                                    previous_width, previous_height);
+
+  g_object_thaw_notify (G_OBJECT (image));
+
+  gimp_unset_busy (image->gimp);
+}
diff --git a/app/core/gimpimage-crop.h b/app/core/gimpimage-crop.h
new file mode 100644
index 0000000..19304da
--- /dev/null
+++ b/app/core/gimpimage-crop.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_CROP_H__
+#define __GIMP_IMAGE_CROP_H__
+
+
+void   gimp_image_crop (GimpImage    *image,
+                        GimpContext  *context,
+                        GimpFillType  fill_type,
+                        gint          x,
+                        gint          y,
+                        gint          width,
+                        gint          height,
+                        gboolean      crop_layers);
+
+
+#endif  /* __GIMP_IMAGE_CROP_H__ */
diff --git a/app/core/gimpimage-duplicate.c b/app/core/gimpimage-duplicate.c
new file mode 100644
index 0000000..4dcaedd
--- /dev/null
+++ b/app/core/gimpimage-duplicate.c
@@ -0,0 +1,535 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-duplicate.h"
+#include "gimpimage-grid.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-metadata.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-sample-points.h"
+#include "gimpitemstack.h"
+#include "gimplayer.h"
+#include "gimplayermask.h"
+#include "gimplayer-floating-selection.h"
+#include "gimpparasitelist.h"
+#include "gimpsamplepoint.h"
+
+
+static void          gimp_image_duplicate_resolution       (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_save_source_file (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_colormap         (GimpImage *image,
+                                                            GimpImage *new_image);
+static GimpItem    * gimp_image_duplicate_item             (GimpItem  *item,
+                                                            GimpImage *new_image);
+static GimpLayer   * gimp_image_duplicate_layers           (GimpImage *image,
+                                                            GimpImage *new_image);
+static GimpChannel * gimp_image_duplicate_channels         (GimpImage *image,
+                                                            GimpImage *new_image);
+static GimpVectors * gimp_image_duplicate_vectors          (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_floating_sel     (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_mask             (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_components       (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_guides           (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_sample_points    (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_grid             (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_metadata         (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_quick_mask       (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_parasites        (GimpImage *image,
+                                                            GimpImage *new_image);
+static void          gimp_image_duplicate_color_profile    (GimpImage *image,
+                                                            GimpImage *new_image);
+
+
+GimpImage *
+gimp_image_duplicate (GimpImage *image)
+{
+  GimpImage    *new_image;
+  GimpLayer    *active_layer;
+  GimpChannel  *active_channel;
+  GimpVectors  *active_vectors;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  gimp_set_busy_until_idle (image->gimp);
+
+  /*  Create a new image  */
+  new_image = gimp_create_image (image->gimp,
+                                 gimp_image_get_width  (image),
+                                 gimp_image_get_height (image),
+                                 gimp_image_get_base_type (image),
+                                 gimp_image_get_precision (image),
+                                 FALSE);
+  gimp_image_undo_disable (new_image);
+
+  /*  Store the source uri to be used by the save dialog  */
+  gimp_image_duplicate_save_source_file (image, new_image);
+
+  /*  Copy the colormap if necessary  */
+  gimp_image_duplicate_colormap (image, new_image);
+
+  /*  Copy resolution information  */
+  gimp_image_duplicate_resolution (image, new_image);
+
+  /*  Copy parasites first so we have a color profile  */
+  gimp_image_duplicate_parasites (image, new_image);
+  gimp_image_duplicate_color_profile (image, new_image);
+
+  /*  Copy the layers  */
+  active_layer = gimp_image_duplicate_layers (image, new_image);
+
+  /*  Copy the channels  */
+  active_channel = gimp_image_duplicate_channels (image, new_image);
+
+  /*  Copy any vectors  */
+  active_vectors = gimp_image_duplicate_vectors (image, new_image);
+
+  /*  Copy floating layer  */
+  gimp_image_duplicate_floating_sel (image, new_image);
+
+  /*  Copy the selection mask  */
+  gimp_image_duplicate_mask (image, new_image);
+
+  /*  Set active layer, active channel, active vectors  */
+  if (active_layer)
+    gimp_image_set_active_layer (new_image, active_layer);
+
+  if (active_channel)
+    gimp_image_set_active_channel (new_image, active_channel);
+
+  if (active_vectors)
+    gimp_image_set_active_vectors (new_image, active_vectors);
+
+  /*  Copy state of all color components  */
+  gimp_image_duplicate_components (image, new_image);
+
+  /*  Copy any guides  */
+  gimp_image_duplicate_guides (image, new_image);
+
+  /*  Copy any sample points  */
+  gimp_image_duplicate_sample_points (image, new_image);
+
+  /*  Copy the grid  */
+  gimp_image_duplicate_grid (image, new_image);
+
+  /*  Copy the metadata  */
+  gimp_image_duplicate_metadata (image, new_image);
+
+  /*  Copy the quick mask info  */
+  gimp_image_duplicate_quick_mask (image, new_image);
+
+  gimp_image_undo_enable (new_image);
+
+  /*  Explicitly mark image as dirty, so that its dirty time is set  */
+  gimp_image_dirty (new_image, GIMP_DIRTY_ALL);
+
+  return new_image;
+}
+
+static void
+gimp_image_duplicate_resolution (GimpImage *image,
+                                 GimpImage *new_image)
+{
+  gdouble xres;
+  gdouble yres;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+  gimp_image_set_resolution (new_image, xres, yres);
+  gimp_image_set_unit (new_image, gimp_image_get_unit (image));
+}
+
+static void
+gimp_image_duplicate_save_source_file (GimpImage *image,
+                                       GimpImage *new_image)
+{
+  GFile *file = gimp_image_get_file (image);
+
+  if (file)
+    g_object_set_data_full (G_OBJECT (new_image), "gimp-image-source-file",
+                            g_object_ref (file),
+                            (GDestroyNotify) g_object_unref);
+}
+
+static void
+gimp_image_duplicate_colormap (GimpImage *image,
+                               GimpImage *new_image)
+{
+  if (gimp_image_get_base_type (new_image) == GIMP_INDEXED)
+    gimp_image_set_colormap (new_image,
+                             gimp_image_get_colormap (image),
+                             gimp_image_get_colormap_size (image),
+                             FALSE);
+}
+
+static GimpItem *
+gimp_image_duplicate_item (GimpItem  *item,
+                           GimpImage *new_image)
+{
+  GimpItem *new_item;
+
+  new_item = gimp_item_convert (item, new_image,
+                                G_TYPE_FROM_INSTANCE (item));
+
+  /*  Make sure the copied item doesn't say: "<old item> copy"  */
+  gimp_object_set_name (GIMP_OBJECT (new_item),
+                        gimp_object_get_name (item));
+
+  return new_item;
+}
+
+static GimpLayer *
+gimp_image_duplicate_layers (GimpImage *image,
+                             GimpImage *new_image)
+{
+  GimpLayer *active_layer = NULL;
+  GList     *list;
+  gint       count;
+
+  for (list = gimp_image_get_layer_iter (image), count = 0;
+       list;
+       list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+      GimpLayer *new_layer;
+
+      if (gimp_layer_is_floating_sel (layer))
+        continue;
+
+      new_layer = GIMP_LAYER (gimp_image_duplicate_item (GIMP_ITEM (layer),
+                                                         new_image));
+
+      /*  Make sure that if the layer has a layer mask,
+       *  its name isn't screwed up
+       */
+      if (new_layer->mask)
+        gimp_object_set_name (GIMP_OBJECT (new_layer->mask),
+                              gimp_object_get_name (layer->mask));
+
+      if (gimp_image_get_active_layer (image) == layer)
+        active_layer = new_layer;
+
+      gimp_image_add_layer (new_image, new_layer,
+                            NULL, count++, FALSE);
+    }
+
+  return active_layer;
+}
+
+static GimpChannel *
+gimp_image_duplicate_channels (GimpImage *image,
+                               GimpImage *new_image)
+{
+  GimpChannel *active_channel = NULL;
+  GList       *list;
+  gint         count;
+
+  for (list = gimp_image_get_channel_iter (image), count = 0;
+       list;
+       list = g_list_next (list))
+    {
+      GimpChannel  *channel = list->data;
+      GimpChannel  *new_channel;
+
+      new_channel = GIMP_CHANNEL (gimp_image_duplicate_item (GIMP_ITEM (channel),
+                                                             new_image));
+
+      if (gimp_image_get_active_channel (image) == channel)
+        active_channel = new_channel;
+
+      gimp_image_add_channel (new_image, new_channel,
+                              NULL, count++, FALSE);
+    }
+
+  return active_channel;
+}
+
+static GimpVectors *
+gimp_image_duplicate_vectors (GimpImage *image,
+                              GimpImage *new_image)
+{
+  GimpVectors *active_vectors = NULL;
+  GList       *list;
+  gint         count;
+
+  for (list = gimp_image_get_vectors_iter (image), count = 0;
+       list;
+       list = g_list_next (list))
+    {
+      GimpVectors  *vectors = list->data;
+      GimpVectors  *new_vectors;
+
+      new_vectors = GIMP_VECTORS (gimp_image_duplicate_item (GIMP_ITEM (vectors),
+                                                             new_image));
+
+      if (gimp_image_get_active_vectors (image) == vectors)
+        active_vectors = new_vectors;
+
+      gimp_image_add_vectors (new_image, new_vectors,
+                              NULL, count++, FALSE);
+    }
+
+  return active_vectors;
+}
+
+static void
+gimp_image_duplicate_floating_sel (GimpImage *image,
+                                   GimpImage *new_image)
+{
+  GimpLayer     *floating_sel;
+  GimpDrawable  *floating_sel_drawable;
+  GList         *floating_sel_path;
+  GimpItemStack *new_item_stack;
+  GimpLayer     *new_floating_sel;
+  GimpDrawable  *new_floating_sel_drawable;
+
+  floating_sel = gimp_image_get_floating_selection (image);
+
+  if (! floating_sel)
+    return;
+
+  floating_sel_drawable = gimp_layer_get_floating_sel_drawable (floating_sel);
+
+  if (GIMP_IS_LAYER_MASK (floating_sel_drawable))
+    {
+      GimpLayer *layer;
+
+      layer = gimp_layer_mask_get_layer (GIMP_LAYER_MASK (floating_sel_drawable));
+
+      floating_sel_path = gimp_item_get_path (GIMP_ITEM (layer));
+
+      new_item_stack = GIMP_ITEM_STACK (gimp_image_get_layers (new_image));
+    }
+  else
+    {
+      floating_sel_path = gimp_item_get_path (GIMP_ITEM (floating_sel_drawable));
+
+      if (GIMP_IS_LAYER (floating_sel_drawable))
+        new_item_stack = GIMP_ITEM_STACK (gimp_image_get_layers (new_image));
+      else
+        new_item_stack = GIMP_ITEM_STACK (gimp_image_get_channels (new_image));
+    }
+
+  /*  adjust path[0] for the floating layer missing in new_image  */
+  floating_sel_path->data =
+    GUINT_TO_POINTER (GPOINTER_TO_UINT (floating_sel_path->data) - 1);
+
+  if (GIMP_IS_LAYER (floating_sel_drawable))
+    {
+      new_floating_sel =
+        GIMP_LAYER (gimp_image_duplicate_item (GIMP_ITEM (floating_sel),
+                                               new_image));
+    }
+  else
+    {
+      /*  can't use gimp_item_convert() for floating selections of channels
+       *  or layer masks because they maybe don't have a normal layer's type
+       */
+      new_floating_sel =
+        GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (floating_sel),
+                                         G_TYPE_FROM_INSTANCE (floating_sel)));
+      gimp_item_set_image (GIMP_ITEM (new_floating_sel), new_image);
+
+      gimp_object_set_name (GIMP_OBJECT (new_floating_sel),
+                            gimp_object_get_name (floating_sel));
+    }
+
+  /*  Make sure the copied layer doesn't say: "<old layer> copy"  */
+  gimp_object_set_name (GIMP_OBJECT (new_floating_sel),
+                        gimp_object_get_name (floating_sel));
+
+  new_floating_sel_drawable =
+    GIMP_DRAWABLE (gimp_item_stack_get_item_by_path (new_item_stack,
+                                                     floating_sel_path));
+
+  if (GIMP_IS_LAYER_MASK (floating_sel_drawable))
+    new_floating_sel_drawable =
+      GIMP_DRAWABLE (gimp_layer_get_mask (GIMP_LAYER (new_floating_sel_drawable)));
+
+  floating_sel_attach (new_floating_sel, new_floating_sel_drawable);
+
+  g_list_free (floating_sel_path);
+}
+
+static void
+gimp_image_duplicate_mask (GimpImage *image,
+                           GimpImage *new_image)
+{
+  GimpDrawable *mask;
+  GimpDrawable *new_mask;
+
+  mask     = GIMP_DRAWABLE (gimp_image_get_mask (image));
+  new_mask = GIMP_DRAWABLE (gimp_image_get_mask (new_image));
+
+  gimp_gegl_buffer_copy (gimp_drawable_get_buffer (mask), NULL, GEGL_ABYSS_NONE,
+                         gimp_drawable_get_buffer (new_mask), NULL);
+
+  GIMP_CHANNEL (new_mask)->bounds_known   = FALSE;
+  GIMP_CHANNEL (new_mask)->boundary_known = FALSE;
+}
+
+static void
+gimp_image_duplicate_components (GimpImage *image,
+                                 GimpImage *new_image)
+{
+  GimpImagePrivate *private     = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpImagePrivate *new_private = GIMP_IMAGE_GET_PRIVATE (new_image);
+  gint              count;
+
+  for (count = 0; count < MAX_CHANNELS; count++)
+    {
+      new_private->visible[count] = private->visible[count];
+      new_private->active[count]  = private->active[count];
+    }
+}
+
+static void
+gimp_image_duplicate_guides (GimpImage *image,
+                             GimpImage *new_image)
+{
+  GList *list;
+
+  for (list = gimp_image_get_guides (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpGuide *guide    = list->data;
+      gint       position = gimp_guide_get_position (guide);
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          gimp_image_add_hguide (new_image, position, FALSE);
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          gimp_image_add_vguide (new_image, position, FALSE);
+          break;
+
+        default:
+          g_error ("Unknown guide orientation.\n");
+        }
+    }
+}
+
+static void
+gimp_image_duplicate_sample_points (GimpImage *image,
+                                    GimpImage *new_image)
+{
+  GList *list;
+
+  for (list = gimp_image_get_sample_points (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpSamplePoint *sample_point = list->data;
+      gint             x;
+      gint             y;
+
+      gimp_sample_point_get_position (sample_point, &x, &y);
+
+      gimp_image_add_sample_point_at_pos (new_image, x, y, FALSE);
+    }
+}
+
+static void
+gimp_image_duplicate_grid (GimpImage *image,
+                           GimpImage *new_image)
+{
+  if (gimp_image_get_grid (image))
+    gimp_image_set_grid (new_image, gimp_image_get_grid (image), FALSE);
+}
+
+static void
+gimp_image_duplicate_metadata (GimpImage *image,
+                               GimpImage *new_image)
+{
+  GimpMetadata *metadata = gimp_image_get_metadata (image);
+
+  if (metadata)
+    {
+      metadata = gimp_metadata_duplicate (metadata);
+      gimp_image_set_metadata (new_image, metadata, FALSE);
+      g_object_unref (metadata);
+    }
+}
+
+static void
+gimp_image_duplicate_quick_mask (GimpImage *image,
+                                 GimpImage *new_image)
+{
+  GimpImagePrivate *private     = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpImagePrivate *new_private = GIMP_IMAGE_GET_PRIVATE (new_image);
+
+  new_private->quick_mask_state    = private->quick_mask_state;
+  new_private->quick_mask_inverted = private->quick_mask_inverted;
+  new_private->quick_mask_color    = private->quick_mask_color;
+}
+
+static void
+gimp_image_duplicate_parasites (GimpImage *image,
+                                GimpImage *new_image)
+{
+  GimpImagePrivate *private     = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpImagePrivate *new_private = GIMP_IMAGE_GET_PRIVATE (new_image);
+
+  if (private->parasites)
+    {
+      g_object_unref (new_private->parasites);
+      new_private->parasites = gimp_parasite_list_copy (private->parasites);
+    }
+}
+
+static void
+gimp_image_duplicate_color_profile (GimpImage *image,
+                                    GimpImage *new_image)
+{
+  GimpColorProfile *profile          = gimp_image_get_color_profile (image);
+  gboolean          is_color_managed = gimp_image_get_is_color_managed (image);
+
+  gimp_image_set_color_profile    (new_image, profile, NULL);
+  gimp_image_set_is_color_managed (new_image, is_color_managed, FALSE);
+}
diff --git a/app/core/gimpimage-duplicate.h b/app/core/gimpimage-duplicate.h
new file mode 100644
index 0000000..cbf55a2
--- /dev/null
+++ b/app/core/gimpimage-duplicate.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_DUPLICATE_H__
+#define __GIMP_IMAGE_DUPLICATE_H__
+
+
+GimpImage * gimp_image_duplicate (GimpImage *image);
+
+
+#endif  /*  __GIMP_IMAGE_DUPLICATE_H__  */
diff --git a/app/core/gimpimage-flip.c b/app/core/gimpimage-flip.c
new file mode 100644
index 0000000..5db05fe
--- /dev/null
+++ b/app/core/gimpimage-flip.c
@@ -0,0 +1,276 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-flip.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitem.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+#include "gimpsamplepoint.h"
+
+
+/*  local function prototypes  */
+
+static void    gimp_image_flip_guides        (GimpImage           *image,
+                                              GimpOrientationType  flip_type,
+                                              gdouble              axis);
+static void    gimp_image_flip_sample_points (GimpImage           *image,
+                                              GimpOrientationType  flip_type,
+                                              gdouble              axis);
+
+
+/*  private functions  */
+
+static void
+gimp_image_flip_guides (GimpImage           *image,
+                        GimpOrientationType  flip_type,
+                        gdouble              axis)
+{
+  gint   width  = gimp_image_get_width  (image);
+  gint   height = gimp_image_get_height (image);
+  GList *iter;
+
+  for (iter = gimp_image_get_guides (image); iter;)
+    {
+      GimpGuide *guide    = iter->data;
+      gint       position = gimp_guide_get_position (guide);
+
+      iter = g_list_next (iter);
+
+      position = SIGNED_ROUND (2.0 * axis - position);
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          if (flip_type == GIMP_ORIENTATION_VERTICAL)
+            {
+              if (position >= 0 && position <= height)
+                gimp_image_move_guide (image, guide, position, TRUE);
+              else
+                gimp_image_remove_guide (image, guide, TRUE);
+            }
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          if (flip_type == GIMP_ORIENTATION_HORIZONTAL)
+            {
+              if (position >= 0 && position <= width)
+                gimp_image_move_guide (image, guide, position, TRUE);
+              else
+                gimp_image_remove_guide (image, guide, TRUE);
+            }
+          break;
+
+        case GIMP_ORIENTATION_UNKNOWN:
+          g_return_if_reached ();
+        }
+    }
+}
+
+static void
+gimp_image_flip_sample_points (GimpImage           *image,
+                               GimpOrientationType  flip_type,
+                               gdouble              axis)
+{
+  gint   width  = gimp_image_get_width  (image);
+  gint   height = gimp_image_get_height (image);
+  GList *iter;
+
+  for (iter = gimp_image_get_sample_points (image); iter;)
+    {
+      GimpSamplePoint *sample_point = iter->data;
+      gint             x;
+      gint             y;
+
+      iter = g_list_next (iter);
+
+      gimp_sample_point_get_position (sample_point, &x, &y);
+
+      switch (flip_type)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          x = SIGNED_ROUND (2.0 * axis - x);
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          y = SIGNED_ROUND (2.0 * axis - y);
+          break;
+
+        case GIMP_ORIENTATION_UNKNOWN:
+          g_return_if_reached ();
+        }
+
+      if (x >= 0 && x < width &&
+          y >= 0 && y < height)
+        {
+          gimp_image_move_sample_point (image, sample_point, x, y, TRUE);
+        }
+      else
+        {
+          gimp_image_remove_sample_point (image, sample_point, TRUE);
+        }
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_image_flip (GimpImage           *image,
+                 GimpContext         *context,
+                 GimpOrientationType  flip_type,
+                 GimpProgress        *progress)
+{
+  gdouble axis = 0.0;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  switch (flip_type)
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      axis = gimp_image_get_width (image) / 2.0;
+      break;
+
+    case GIMP_ORIENTATION_VERTICAL:
+      axis = gimp_image_get_height (image) / 2.0;
+      break;
+
+    case GIMP_ORIENTATION_UNKNOWN:
+      g_return_if_reached ();
+    }
+
+  gimp_image_flip_full (image, context, flip_type, axis,
+                        GIMP_TRANSFORM_RESIZE_CLIP, progress);
+}
+
+void
+gimp_image_flip_full (GimpImage           *image,
+                      GimpContext         *context,
+                      GimpOrientationType  flip_type,
+                      gdouble              axis,
+                      gboolean             clip_result,
+                      GimpProgress        *progress)
+{
+  GimpObjectQueue *queue;
+  GimpItem        *item;
+  gint             width;
+  gint             height;
+  gint             offset_x = 0;
+  gint             offset_y = 0;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  width  = gimp_image_get_width  (image);
+  height = gimp_image_get_height (image);
+
+  if (! clip_result)
+    {
+      switch (flip_type)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          offset_x = SIGNED_ROUND (2.0 * axis - width);
+          axis     = width / 2.0;
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          offset_y = SIGNED_ROUND (2.0 * axis - height);
+          axis     = height / 2.0;
+          break;
+
+        case GIMP_ORIENTATION_UNKNOWN:
+          g_return_if_reached ();
+        }
+    }
+
+  gimp_set_busy (image->gimp);
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  gimp_object_queue_push_container (queue, gimp_image_get_layers (image));
+  gimp_object_queue_push (queue, gimp_image_get_mask (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_channels (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_vectors (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_FLIP, NULL);
+
+  /*  Flip all layers, channels (including selection mask), and vectors  */
+  while ((item = gimp_object_queue_pop (queue)))
+    {
+      gboolean clip = FALSE;
+
+      if (GIMP_IS_CHANNEL (item))
+        clip = clip_result;
+
+      gimp_item_flip (item, context, flip_type, axis, clip);
+
+      gimp_progress_set_value (progress, 1.0);
+    }
+
+  /*  Flip all Guides  */
+  gimp_image_flip_guides (image, flip_type, axis);
+
+  /*  Flip all sample points  */
+  gimp_image_flip_sample_points (image, flip_type, axis);
+
+  if (offset_x || offset_y)
+    {
+      gimp_image_undo_push_image_size (image,
+                                       NULL,
+                                       offset_x,
+                                       offset_y,
+                                       width,
+                                       height);
+    }
+
+  gimp_image_undo_group_end (image);
+
+  g_object_unref (queue);
+
+  if (offset_x || offset_y)
+    {
+      gimp_image_size_changed_detailed (image,
+                                        -offset_x,
+                                        -offset_y,
+                                        width,
+                                        height);
+    }
+
+  gimp_unset_busy (image->gimp);
+}
diff --git a/app/core/gimpimage-flip.h b/app/core/gimpimage-flip.h
new file mode 100644
index 0000000..5fa6ce6
--- /dev/null
+++ b/app/core/gimpimage-flip.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_FLIP_H__
+#define __GIMP_IMAGE_FLIP_H__
+
+
+void   gimp_image_flip      (GimpImage           *image,
+                             GimpContext         *context,
+                             GimpOrientationType  flip_type,
+                             GimpProgress        *progress);
+void   gimp_image_flip_full (GimpImage           *image,
+                             GimpContext         *context,
+                             GimpOrientationType  flip_type,
+                             gdouble              axis,
+                             gboolean             clip_result,
+                             GimpProgress        *progress);
+
+
+#endif /* __GIMP_IMAGE_FLIP_H__ */
diff --git a/app/core/gimpimage-grid.c b/app/core/gimpimage-grid.c
new file mode 100644
index 0000000..dec1850
--- /dev/null
+++ b/app/core/gimpimage-grid.c
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGrid
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpgrid.h"
+#include "gimpimage.h"
+#include "gimpimage-grid.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo-push.h"
+
+#include "gimp-intl.h"
+
+
+GimpGrid *
+gimp_image_get_grid (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->grid;
+}
+
+void
+gimp_image_set_grid (GimpImage *image,
+                     GimpGrid  *grid,
+                     gboolean   push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GRID (grid));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (gimp_config_is_equal_to (GIMP_CONFIG (private->grid), GIMP_CONFIG (grid)))
+    return;
+
+  if (push_undo)
+    gimp_image_undo_push_image_grid (image,
+                                     C_("undo-type", "Grid"), private->grid);
+
+  gimp_config_sync (G_OBJECT (grid), G_OBJECT (private->grid), 0);
+}
diff --git a/app/core/gimpimage-grid.h b/app/core/gimpimage-grid.h
new file mode 100644
index 0000000..c2a4a3f
--- /dev/null
+++ b/app/core/gimpimage-grid.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * GimpGrid
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_GRID_H__
+#define __GIMP_IMAGE_GRID_H__
+
+
+GimpGrid * gimp_image_get_grid (GimpImage *image);
+void       gimp_image_set_grid (GimpImage *image,
+                                GimpGrid  *grid,
+                                gboolean   push_undo);
+
+
+#endif /* __GIMP_IMAGE_GRID_H__ */
diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c
new file mode 100644
index 0000000..a265d1e
--- /dev/null
+++ b/app/core/gimpimage-guides.c
@@ -0,0 +1,216 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpimage.h"
+#include "gimpguide.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo-push.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GimpGuide *
+gimp_image_add_hguide (GimpImage *image,
+                       gint       position,
+                       gboolean   push_undo)
+{
+  GimpGuide *guide;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (position >= 0 &&
+                        position <= gimp_image_get_height (image), NULL);
+
+  guide = gimp_guide_new (GIMP_ORIENTATION_HORIZONTAL,
+                          image->gimp->next_guide_ID++);
+
+  if (push_undo)
+    gimp_image_undo_push_guide (image,
+                                C_("undo-type", "Add Horizontal Guide"), guide);
+
+  gimp_image_add_guide (image, guide, position);
+  g_object_unref (G_OBJECT (guide));
+
+  return guide;
+}
+
+GimpGuide *
+gimp_image_add_vguide (GimpImage *image,
+                       gint       position,
+                       gboolean   push_undo)
+{
+  GimpGuide *guide;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (position >= 0 &&
+                        position <= gimp_image_get_width (image), NULL);
+
+  guide = gimp_guide_new (GIMP_ORIENTATION_VERTICAL,
+                          image->gimp->next_guide_ID++);
+
+  if (push_undo)
+    gimp_image_undo_push_guide (image,
+                                C_("undo-type", "Add Vertical Guide"), guide);
+
+  gimp_image_add_guide (image, guide, position);
+  g_object_unref (guide);
+
+  return guide;
+}
+
+void
+gimp_image_add_guide (GimpImage *image,
+                      GimpGuide *guide,
+                      gint       position)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->guides = g_list_prepend (private->guides, guide);
+
+  gimp_guide_set_position (guide, position);
+  g_object_ref (guide);
+
+  gimp_image_guide_added (image, guide);
+}
+
+void
+gimp_image_remove_guide (GimpImage *image,
+                         GimpGuide *guide,
+                         gboolean   push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (gimp_guide_is_custom (guide))
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_guide (image, C_("undo-type", "Remove Guide"), guide);
+
+  private->guides = g_list_remove (private->guides, guide);
+  gimp_aux_item_removed (GIMP_AUX_ITEM (guide));
+
+  gimp_image_guide_removed (image, guide);
+
+  gimp_guide_set_position (guide, GIMP_GUIDE_POSITION_UNDEFINED);
+  g_object_unref (guide);
+}
+
+void
+gimp_image_move_guide (GimpImage *image,
+                       GimpGuide *guide,
+                       gint       position,
+                       gboolean   push_undo)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+  g_return_if_fail (position >= 0);
+
+  if (gimp_guide_get_orientation (guide) == GIMP_ORIENTATION_HORIZONTAL)
+    g_return_if_fail (position <= gimp_image_get_height (image));
+  else
+    g_return_if_fail (position <= gimp_image_get_width (image));
+
+  if (gimp_guide_is_custom (guide))
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_guide (image, C_("undo-type", "Move Guide"), guide);
+
+  gimp_guide_set_position (guide, position);
+
+  gimp_image_guide_moved (image, guide);
+}
+
+GList *
+gimp_image_get_guides (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->guides;
+}
+
+GimpGuide *
+gimp_image_get_guide (GimpImage *image,
+                      guint32    id)
+{
+  GList *guides;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  for (guides = GIMP_IMAGE_GET_PRIVATE (image)->guides;
+       guides;
+       guides = g_list_next (guides))
+    {
+      GimpGuide *guide = guides->data;
+
+      if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (guide)) == id)
+        return guide;
+    }
+
+  return NULL;
+}
+
+GimpGuide *
+gimp_image_get_next_guide (GimpImage *image,
+                           guint32    id,
+                           gboolean  *guide_found)
+{
+  GList *guides;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (guide_found != NULL, NULL);
+
+  if (id == 0)
+    *guide_found = TRUE;
+  else
+    *guide_found = FALSE;
+
+  for (guides = GIMP_IMAGE_GET_PRIVATE (image)->guides;
+       guides;
+       guides = g_list_next (guides))
+    {
+      GimpGuide *guide = guides->data;
+
+      if (*guide_found) /* this is the first guide after the found one */
+        return guide;
+
+      if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (guide)) == id) /* found it, next one will be returned */
+        *guide_found = TRUE;
+    }
+
+  return NULL;
+}
diff --git a/app/core/gimpimage-guides.h b/app/core/gimpimage-guides.h
new file mode 100644
index 0000000..7f9706e
--- /dev/null
+++ b/app/core/gimpimage-guides.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_GUIDES_H__
+#define __GIMP_IMAGE_GUIDES_H__
+
+
+/*  public guide adding API
+ */
+GimpGuide * gimp_image_add_hguide     (GimpImage *image,
+                                       gint       position,
+                                       gboolean   push_undo);
+GimpGuide * gimp_image_add_vguide     (GimpImage *image,
+                                       gint       position,
+                                       gboolean   push_undo);
+
+/*  internal guide adding API, does not check the guide's position and
+ *  is publicly declared only to be used from undo
+ */
+void        gimp_image_add_guide      (GimpImage *image,
+                                       GimpGuide *guide,
+                                       gint       position);
+
+void        gimp_image_remove_guide   (GimpImage *image,
+                                       GimpGuide *guide,
+                                       gboolean   push_undo);
+void        gimp_image_move_guide     (GimpImage *image,
+                                       GimpGuide *guide,
+                                       gint       position,
+                                       gboolean   push_undo);
+
+GList     * gimp_image_get_guides     (GimpImage *image);
+GimpGuide * gimp_image_get_guide      (GimpImage *image,
+                                       guint32    id);
+GimpGuide * gimp_image_get_next_guide (GimpImage *image,
+                                       guint32    id,
+                                       gboolean  *guide_found);
+
+
+#endif /* __GIMP_IMAGE_GUIDES_H__ */
diff --git a/app/core/gimpimage-item-list.c b/app/core/gimpimage-item-list.c
new file mode 100644
index 0000000..6b6bad4
--- /dev/null
+++ b/app/core/gimpimage-item-list.c
@@ -0,0 +1,401 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpcontext.h"
+#include "gimpimage.h"
+#include "gimpimage-item-list.h"
+#include "gimpimage-undo.h"
+#include "gimpitem.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+gboolean
+gimp_image_item_list_bounds (GimpImage *image,
+                             GList     *list,
+                             gint      *x,
+                             gint      *y,
+                             gint      *width,
+                             gint      *height)
+{
+  GList    *l;
+  gboolean  bounds = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (x != 0, FALSE);
+  g_return_val_if_fail (y != 0, FALSE);
+  g_return_val_if_fail (width != 0, FALSE);
+  g_return_val_if_fail (height != 0, FALSE);
+
+  for (l = list; l; l = g_list_next (l))
+    {
+      GimpItem *item = l->data;
+      gint      tmp_x, tmp_y;
+      gint      tmp_w, tmp_h;
+
+      if (gimp_item_bounds (item, &tmp_x, &tmp_y, &tmp_w, &tmp_h))
+        {
+          gint off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+
+          if (bounds)
+            {
+              gimp_rectangle_union (*x, *y, *width, *height,
+                                    tmp_x + off_x, tmp_y + off_y,
+                                    tmp_w, tmp_h,
+                                    x, y, width, height);
+            }
+          else
+            {
+              *x      = tmp_x + off_x;
+              *y      = tmp_y + off_y;
+              *width  = tmp_w;
+              *height = tmp_h;
+
+              bounds = TRUE;
+            }
+        }
+    }
+
+  if (! bounds)
+    {
+      *x      = 0;
+      *y      = 0;
+      *width  = gimp_image_get_width  (image);
+      *height = gimp_image_get_height (image);
+    }
+
+  return bounds;
+}
+
+void
+gimp_image_item_list_translate (GimpImage *image,
+                                GList     *list,
+                                gint       offset_x,
+                                gint       offset_y,
+                                gboolean   push_undo)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  if (list)
+    {
+      GList *l;
+
+      if (list->next)
+        {
+          if (push_undo)
+            {
+              gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_DISPLACE,
+                                           C_("undo-type", "Translate Items"));
+            }
+
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_start_transform (GIMP_ITEM (l->data), push_undo);
+        }
+
+      for (l = list; l; l = g_list_next (l))
+        gimp_item_translate (GIMP_ITEM (l->data),
+                             offset_x, offset_y, push_undo);
+
+      if (list->next)
+        {
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_end_transform (GIMP_ITEM (l->data), push_undo);
+
+          if (push_undo)
+            gimp_image_undo_group_end (image);
+        }
+    }
+}
+
+void
+gimp_image_item_list_flip (GimpImage           *image,
+                           GList               *list,
+                           GimpContext         *context,
+                           GimpOrientationType  flip_type,
+                           gdouble              axis,
+                           gboolean             clip_result)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (list)
+    {
+      GList *l;
+
+      if (list->next)
+        {
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
+                                       C_("undo-type", "Flip Items"));
+
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_start_transform (GIMP_ITEM (l->data), TRUE);
+        }
+
+      for (l = list; l; l = g_list_next (l))
+        {
+          GimpItem *item = l->data;
+
+          gimp_item_flip (item, context,
+                          flip_type, axis,
+                          gimp_item_get_clip (item, clip_result));
+        }
+
+      if (list->next)
+        {
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_end_transform (GIMP_ITEM (l->data), TRUE);
+
+          gimp_image_undo_group_end (image);
+        }
+    }
+}
+
+void
+gimp_image_item_list_rotate (GimpImage        *image,
+                             GList            *list,
+                             GimpContext      *context,
+                             GimpRotationType  rotate_type,
+                             gdouble           center_x,
+                             gdouble           center_y,
+                             gboolean          clip_result)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (list)
+    {
+      GList *l;
+
+      if (list->next)
+        {
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
+                                       C_("undo-type", "Rotate Items"));
+
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_start_transform (GIMP_ITEM (l->data), TRUE);
+        }
+
+      for (l = list; l; l = g_list_next (l))
+        {
+          GimpItem *item = l->data;
+
+          gimp_item_rotate (item, context,
+                            rotate_type, center_x, center_y,
+                            gimp_item_get_clip (item, clip_result));
+        }
+
+      if (list->next)
+        {
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_end_transform (GIMP_ITEM (l->data), TRUE);
+
+          gimp_image_undo_group_end (image);
+        }
+    }
+}
+
+void
+gimp_image_item_list_transform (GimpImage              *image,
+                                GList                  *list,
+                                GimpContext            *context,
+                                const GimpMatrix3      *matrix,
+                                GimpTransformDirection  direction,
+                                GimpInterpolationType   interpolation_type,
+                                GimpTransformResize     clip_result,
+                                GimpProgress           *progress)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  if (list)
+    {
+      GimpObjectQueue *queue = NULL;
+      GList           *l;
+
+      if (progress)
+        {
+          queue    = gimp_object_queue_new (progress);
+          progress = GIMP_PROGRESS (queue);
+
+          gimp_object_queue_push_list (queue, list);
+        }
+
+      if (list->next)
+        {
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
+                                       C_("undo-type", "Transform Items"));
+
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_start_transform (GIMP_ITEM (l->data), TRUE);
+        }
+
+      for (l = list; l; l = g_list_next (l))
+        {
+          GimpItem *item = l->data;
+
+          if (queue)
+            gimp_object_queue_pop (queue);
+
+          gimp_item_transform (item, context,
+                               matrix, direction,
+                               interpolation_type,
+                               gimp_item_get_clip (item, clip_result),
+                               progress);
+        }
+
+      if (list->next)
+        {
+          for (l = list; l; l = g_list_next (l))
+            gimp_item_end_transform (GIMP_ITEM (l->data), TRUE);
+
+          gimp_image_undo_group_end (image);
+        }
+
+      g_clear_object (&queue);
+    }
+}
+
+/**
+ * gimp_image_item_list_get_list:
+ * @image:   An @image.
+ * @type:    Which type of items to return.
+ * @set:     Set the returned items are part of.
+ *
+ * This function returns a #GList of #GimpItem<!-- -->s for which the
+ * @type and @set criterions match.
+ *
+ * Return value: The list of items.
+ **/
+GList *
+gimp_image_item_list_get_list (GimpImage        *image,
+                               GimpItemTypeMask  type,
+                               GimpItemSet       set)
+{
+  GList *all_items;
+  GList *list;
+  GList *return_list = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  if (type & GIMP_ITEM_TYPE_LAYERS)
+    {
+      all_items = gimp_image_get_layer_list (image);
+
+      for (list = all_items; list; list = g_list_next (list))
+        {
+          GimpItem *item = list->data;
+
+          if (gimp_item_is_in_set (item, set))
+            return_list = g_list_prepend (return_list, item);
+        }
+
+      g_list_free (all_items);
+    }
+
+  if (type & GIMP_ITEM_TYPE_CHANNELS)
+    {
+      all_items = gimp_image_get_channel_list (image);
+
+      for (list = all_items; list; list = g_list_next (list))
+        {
+          GimpItem *item = list->data;
+
+          if (gimp_item_is_in_set (item, set))
+            return_list = g_list_prepend (return_list, item);
+        }
+
+      g_list_free (all_items);
+    }
+
+  if (type & GIMP_ITEM_TYPE_VECTORS)
+    {
+      all_items = gimp_image_get_vectors_list (image);
+
+      for (list = all_items; list; list = g_list_next (list))
+        {
+          GimpItem *item = list->data;
+
+          if (gimp_item_is_in_set (item, set))
+            return_list = g_list_prepend (return_list, item);
+        }
+
+      g_list_free (all_items);
+    }
+
+  return g_list_reverse (return_list);
+}
+
+static GList *
+gimp_image_item_list_remove_children (GList          *list,
+                                      const GimpItem *parent)
+{
+  GList *l = list;
+
+  while (l)
+    {
+      GimpItem *item = l->data;
+
+      l = g_list_next (l);
+
+      if (gimp_viewable_is_ancestor (GIMP_VIEWABLE (parent),
+                                     GIMP_VIEWABLE (item)))
+        {
+          list = g_list_remove (list, item);
+        }
+    }
+
+  return list;
+}
+
+GList *
+gimp_image_item_list_filter (GList *list)
+{
+  GList *l;
+
+  if (! list)
+    return NULL;
+
+  for (l = list; l; l = g_list_next (l))
+    {
+      GimpItem *item = l->data;
+      GList    *next;
+
+      next = gimp_image_item_list_remove_children (g_list_next (l), item);
+
+      l->next = next;
+      if (next)
+        next->prev = l;
+    }
+
+  return list;
+}
diff --git a/app/core/gimpimage-item-list.h b/app/core/gimpimage-item-list.h
new file mode 100644
index 0000000..cd69637
--- /dev/null
+++ b/app/core/gimpimage-item-list.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_ITEM_LIST_H__
+#define __GIMP_IMAGE_ITEM_LIST_H__
+
+
+gboolean   gimp_image_item_list_bounds    (GimpImage              *image,
+                                           GList                  *list,
+                                           gint                   *x,
+                                           gint                   *y,
+                                           gint                   *width,
+                                           gint                   *height);
+
+void       gimp_image_item_list_translate (GimpImage              *image,
+                                           GList                  *list,
+                                           gint                    offset_x,
+                                           gint                    offset_y,
+                                           gboolean                push_undo);
+void       gimp_image_item_list_flip      (GimpImage              *image,
+                                           GList                  *list,
+                                           GimpContext            *context,
+                                           GimpOrientationType     flip_type,
+                                           gdouble                 axis,
+                                           gboolean                clip_result);
+void       gimp_image_item_list_rotate    (GimpImage              *image,
+                                           GList                  *list,
+                                           GimpContext            *context,
+                                           GimpRotationType        rotate_type,
+                                           gdouble                 center_x,
+                                           gdouble                 center_y,
+                                           gboolean                clip_result);
+void       gimp_image_item_list_transform (GimpImage              *image,
+                                           GList                  *list,
+                                           GimpContext            *context,
+                                           const GimpMatrix3      *matrix,
+                                           GimpTransformDirection  direction,
+                                           GimpInterpolationType   interpolation_type,
+                                           GimpTransformResize     clip_result,
+                                           GimpProgress           *progress);
+
+GList    * gimp_image_item_list_get_list  (GimpImage              *image,
+                                           GimpItemTypeMask        type,
+                                           GimpItemSet             set);
+
+GList    * gimp_image_item_list_filter    (GList                  *list);
+
+
+#endif /* __GIMP_IMAGE_ITEM_LIST_H__ */
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
new file mode 100644
index 0000000..3d96860
--- /dev/null
+++ b/app/core/gimpimage-merge.c
@@ -0,0 +1,745 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl-compat.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimperror.h"
+#include "gimpgrouplayer.h"
+#include "gimpimage.h"
+#include "gimpimage-merge.h"
+#include "gimpimage-undo.h"
+#include "gimpitemstack.h"
+#include "gimplayer-floating-selection.h"
+#include "gimplayer-new.h"
+#include "gimplayermask.h"
+#include "gimpmarshal.h"
+#include "gimpparasitelist.h"
+#include "gimppickable.h"
+#include "gimpprogress.h"
+#include "gimpprojectable.h"
+#include "gimpundostack.h"
+
+#include "gimp-intl.h"
+
+
+static GimpLayer * gimp_image_merge_layers (GimpImage     *image,
+                                            GimpContainer *container,
+                                            GSList        *merge_list,
+                                            GimpContext   *context,
+                                            GimpMergeType  merge_type,
+                                            const gchar   *undo_desc,
+                                            GimpProgress  *progress);
+
+
+/*  public functions  */
+
+GimpLayer *
+gimp_image_merge_visible_layers (GimpImage     *image,
+                                 GimpContext   *context,
+                                 GimpMergeType  merge_type,
+                                 gboolean       merge_active_group,
+                                 gboolean       discard_invisible,
+                                 GimpProgress  *progress)
+{
+  GimpContainer *container;
+  GList         *list;
+  GSList        *merge_list     = NULL;
+  GSList        *invisible_list = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  if (merge_active_group)
+    {
+      GimpLayer *active_layer = gimp_image_get_active_layer (image);
+
+      /*  if the active layer is the floating selection, get the
+       *  underlying drawable, but only if it is a layer
+       */
+      if (active_layer && gimp_layer_is_floating_sel (active_layer))
+        {
+          GimpDrawable *fs_drawable;
+
+          fs_drawable = gimp_layer_get_floating_sel_drawable (active_layer);
+
+          if (GIMP_IS_LAYER (fs_drawable))
+            active_layer = GIMP_LAYER (fs_drawable);
+        }
+
+      if (active_layer)
+        container = gimp_item_get_container (GIMP_ITEM (active_layer));
+      else
+        container = gimp_image_get_layers (image);
+    }
+  else
+    {
+      container = gimp_image_get_layers (image);
+    }
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (container));
+       list;
+       list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+
+      if (gimp_layer_is_floating_sel (layer))
+        continue;
+
+      if (gimp_item_get_visible (GIMP_ITEM (layer)))
+        {
+          merge_list = g_slist_append (merge_list, layer);
+        }
+      else if (discard_invisible)
+        {
+          invisible_list = g_slist_append (invisible_list, layer);
+        }
+    }
+
+  if (merge_list)
+    {
+      GimpLayer   *layer;
+      const gchar *undo_desc = C_("undo-type", "Merge Visible Layers");
+
+      gimp_set_busy (image->gimp);
+
+      gimp_image_undo_group_start (image,
+                                   GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
+                                   undo_desc);
+
+      /* if there's a floating selection, anchor it */
+      if (gimp_image_get_floating_selection (image))
+        floating_sel_anchor (gimp_image_get_floating_selection (image));
+
+      layer = gimp_image_merge_layers (image,
+                                       container,
+                                       merge_list, context, merge_type,
+                                       undo_desc, progress);
+      g_slist_free (merge_list);
+
+      if (invisible_list)
+        {
+          GSList *list;
+
+          for (list = invisible_list; list; list = g_slist_next (list))
+            gimp_image_remove_layer (image, list->data, TRUE, NULL);
+
+          g_slist_free (invisible_list);
+        }
+
+      gimp_image_undo_group_end (image);
+
+      gimp_unset_busy (image->gimp);
+
+      return layer;
+    }
+
+  return gimp_image_get_active_layer (image);
+}
+
+GimpLayer *
+gimp_image_flatten (GimpImage     *image,
+                    GimpContext   *context,
+                    GimpProgress  *progress,
+                    GError       **error)
+{
+  GList     *list;
+  GSList    *merge_list = NULL;
+  GimpLayer *layer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  for (list = gimp_image_get_layer_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      layer = list->data;
+
+      if (gimp_layer_is_floating_sel (layer))
+        continue;
+
+      if (gimp_item_get_visible (GIMP_ITEM (layer)))
+        merge_list = g_slist_append (merge_list, layer);
+    }
+
+  if (merge_list)
+    {
+      const gchar *undo_desc = C_("undo-type", "Flatten Image");
+
+      gimp_set_busy (image->gimp);
+
+      gimp_image_undo_group_start (image,
+                                   GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
+                                   undo_desc);
+
+      /* if there's a floating selection, anchor it */
+      if (gimp_image_get_floating_selection (image))
+        floating_sel_anchor (gimp_image_get_floating_selection (image));
+
+      layer = gimp_image_merge_layers (image,
+                                       gimp_image_get_layers (image),
+                                       merge_list, context,
+                                       GIMP_FLATTEN_IMAGE,
+                                       undo_desc, progress);
+      g_slist_free (merge_list);
+
+      gimp_image_alpha_changed (image);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_unset_busy (image->gimp);
+
+      return layer;
+    }
+
+  g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                       _("Cannot flatten an image without any visible layer."));
+  return NULL;
+}
+
+GimpLayer *
+gimp_image_merge_down (GimpImage      *image,
+                       GimpLayer      *current_layer,
+                       GimpContext    *context,
+                       GimpMergeType   merge_type,
+                       GimpProgress   *progress,
+                       GError        **error)
+{
+  GimpLayer   *layer;
+  GList       *list;
+  GList       *layer_list = NULL;
+  GSList      *merge_list = NULL;
+  const gchar *undo_desc;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (current_layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (current_layer)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (gimp_layer_is_floating_sel (current_layer))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot merge down a floating selection."));
+      return NULL;
+    }
+
+  if (! gimp_item_get_visible (GIMP_ITEM (current_layer)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot merge down an invisible layer."));
+      return NULL;
+    }
+
+  for (list = gimp_item_get_container_iter (GIMP_ITEM (current_layer));
+       list;
+       list = g_list_next (list))
+    {
+      layer = list->data;
+
+      if (layer == current_layer)
+        break;
+    }
+
+  for (layer_list = g_list_next (list);
+       layer_list;
+       layer_list = g_list_next (layer_list))
+    {
+      layer = layer_list->data;
+
+      if (gimp_item_get_visible (GIMP_ITEM (layer)))
+        {
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+            {
+              g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                                   _("Cannot merge down to a layer group."));
+              return NULL;
+            }
+
+          if (gimp_item_is_content_locked (GIMP_ITEM (layer)))
+            {
+              g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                                   _("The layer to merge down to is locked."));
+              return NULL;
+            }
+
+          merge_list = g_slist_append (NULL, layer);
+          break;
+        }
+    }
+
+  if (! merge_list)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("There is no visible layer to merge down to."));
+      return NULL;
+    }
+
+  merge_list = g_slist_prepend (merge_list, current_layer);
+
+  undo_desc = C_("undo-type", "Merge Down");
+
+  gimp_set_busy (image->gimp);
+
+  gimp_image_undo_group_start (image,
+                               GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
+                               undo_desc);
+
+  layer = gimp_image_merge_layers (image,
+                                   gimp_item_get_container (GIMP_ITEM (current_layer)),
+                                   merge_list, context, merge_type,
+                                   undo_desc, progress);
+  g_slist_free (merge_list);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_unset_busy (image->gimp);
+
+  return layer;
+}
+
+GimpLayer *
+gimp_image_merge_group_layer (GimpImage      *image,
+                              GimpGroupLayer *group)
+{
+  GimpLayer *parent;
+  GimpLayer *layer;
+  gint       index;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+  g_return_val_if_fail (gimp_item_get_image (GIMP_ITEM (group)) == image, NULL);
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
+                               C_("undo-type", "Merge Layer Group"));
+
+  parent = gimp_layer_get_parent (GIMP_LAYER (group));
+  index  = gimp_item_get_index (GIMP_ITEM (group));
+
+  /* if this is a pass-through group, change its mode to NORMAL *before*
+   * duplicating it, since PASS_THROUGH mode is invalid for regular layers.
+   * see bug #793714.
+   */
+  if (gimp_layer_get_mode (GIMP_LAYER (group)) == GIMP_LAYER_MODE_PASS_THROUGH)
+    {
+      GimpLayerColorSpace    blend_space;
+      GimpLayerColorSpace    composite_space;
+      GimpLayerCompositeMode composite_mode;
+
+      /* keep the group's current blend space, composite space, and composite
+       * mode.
+       */
+      blend_space     = gimp_layer_get_blend_space     (GIMP_LAYER (group));
+      composite_space = gimp_layer_get_composite_space (GIMP_LAYER (group));
+      composite_mode  = gimp_layer_get_composite_mode  (GIMP_LAYER (group));
+
+      gimp_layer_set_mode            (GIMP_LAYER (group), GIMP_LAYER_MODE_NORMAL, TRUE);
+      gimp_layer_set_blend_space     (GIMP_LAYER (group), blend_space,            TRUE);
+      gimp_layer_set_composite_space (GIMP_LAYER (group), composite_space,        TRUE);
+      gimp_layer_set_composite_mode  (GIMP_LAYER (group), composite_mode,         TRUE);
+    }
+
+  layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (group),
+                                           GIMP_TYPE_LAYER));
+
+  gimp_object_set_name (GIMP_OBJECT (layer), gimp_object_get_name (group));
+
+  gimp_image_remove_layer (image, GIMP_LAYER (group), TRUE, NULL);
+  gimp_image_add_layer (image, layer, parent, index, TRUE);
+
+  gimp_image_undo_group_end (image);
+
+  return layer;
+}
+
+
+/* merging vectors */
+
+GimpVectors *
+gimp_image_merge_visible_vectors (GimpImage  *image,
+                                  GError    **error)
+{
+  GList       *list;
+  GList       *merge_list = NULL;
+  GimpVectors *vectors;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  for (list = gimp_image_get_vectors_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      vectors = list->data;
+
+      if (gimp_item_get_visible (GIMP_ITEM (vectors)))
+        merge_list = g_list_prepend (merge_list, vectors);
+    }
+
+  merge_list = g_list_reverse (merge_list);
+
+  if (merge_list && merge_list->next)
+    {
+      GimpVectors *target_vectors;
+      gchar       *name;
+      gint         pos;
+
+      gimp_set_busy (image->gimp);
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE,
+                                   C_("undo-type", "Merge Visible Paths"));
+
+      vectors = GIMP_VECTORS (merge_list->data);
+
+      name = g_strdup (gimp_object_get_name (vectors));
+      pos = gimp_item_get_index (GIMP_ITEM (vectors));
+
+      target_vectors = GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
+                                                          GIMP_TYPE_VECTORS));
+      gimp_image_remove_vectors (image, vectors, TRUE, NULL);
+
+      for (list = g_list_next (merge_list);
+           list;
+           list = g_list_next (list))
+        {
+          vectors = list->data;
+
+          gimp_vectors_add_strokes (vectors, target_vectors);
+          gimp_image_remove_vectors (image, vectors, TRUE, NULL);
+        }
+
+      gimp_object_take_name (GIMP_OBJECT (target_vectors), name);
+
+      g_list_free (merge_list);
+
+      /* FIXME tree */
+      gimp_image_add_vectors (image, target_vectors, NULL, pos, TRUE);
+      gimp_unset_busy (image->gimp);
+
+      gimp_image_undo_group_end (image);
+
+      return target_vectors;
+    }
+  else
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Not enough visible paths for a merge. "
+                             "There must be at least two."));
+      return NULL;
+    }
+}
+
+
+/*  private functions  */
+
+static GimpLayer *
+gimp_image_merge_layers (GimpImage     *image,
+                         GimpContainer *container,
+                         GSList        *merge_list,
+                         GimpContext   *context,
+                         GimpMergeType  merge_type,
+                         const gchar   *undo_desc,
+                         GimpProgress  *progress)
+{
+  GimpLayer        *parent;
+  gint              x1, y1;
+  gint              x2, y2;
+  GSList           *layers;
+  GimpLayer        *layer;
+  GimpLayer        *top_layer;
+  GimpLayer        *bottom_layer;
+  GimpLayer        *merge_layer;
+  gint              position;
+  GeglNode         *node;
+  GeglNode         *source_node;
+  GeglNode         *flatten_node;
+  GeglNode         *offset_node;
+  GeglNode         *last_node;
+  GeglNode         *last_node_source;
+  GimpParasiteList *parasites;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  top_layer = merge_list->data;
+  parent    = gimp_layer_get_parent (top_layer);
+
+  /*  Make sure the image's graph is constructed, so that top-level layers have
+   *  a parent node.
+   */
+  (void) gimp_projectable_get_graph (GIMP_PROJECTABLE (image));
+
+  /*  Make sure the parent's graph is constructed, so that the top layer has a
+   *  parent node, even if it is the child of a group layer (in particular, of
+   *  an invisible group layer, whose graph may not have been constructed as a
+   *  result of the above call.  see issue #2095.)
+   */
+  if (parent)
+    (void) gimp_filter_get_node (GIMP_FILTER (parent));
+
+  /*  Build our graph inside the top-layer's parent node  */
+  source_node = gimp_filter_get_node (GIMP_FILTER (top_layer));
+  node = gegl_node_get_parent (source_node);
+
+  g_return_val_if_fail (node, NULL);
+
+  /*  Get the layer extents  */
+  x1 = y1 = 0;
+  x2 = y2 = 0;
+  for (layers = merge_list; layers; layers = g_slist_next (layers))
+    {
+      gint off_x, off_y;
+
+      layer = layers->data;
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+
+      switch (merge_type)
+        {
+        case GIMP_EXPAND_AS_NECESSARY:
+        case GIMP_CLIP_TO_IMAGE:
+          if (layers == merge_list)
+            {
+              x1 = off_x;
+              y1 = off_y;
+              x2 = off_x + gimp_item_get_width  (GIMP_ITEM (layer));
+              y2 = off_y + gimp_item_get_height (GIMP_ITEM (layer));
+            }
+          else
+            {
+              if (off_x < x1)
+                x1 = off_x;
+              if (off_y < y1)
+                y1 = off_y;
+              if ((off_x + gimp_item_get_width (GIMP_ITEM (layer))) > x2)
+                x2 = (off_x + gimp_item_get_width (GIMP_ITEM (layer)));
+              if ((off_y + gimp_item_get_height (GIMP_ITEM (layer))) > y2)
+                y2 = (off_y + gimp_item_get_height (GIMP_ITEM (layer)));
+            }
+
+          if (merge_type == GIMP_CLIP_TO_IMAGE)
+            {
+              x1 = CLAMP (x1, 0, gimp_image_get_width  (image));
+              y1 = CLAMP (y1, 0, gimp_image_get_height (image));
+              x2 = CLAMP (x2, 0, gimp_image_get_width  (image));
+              y2 = CLAMP (y2, 0, gimp_image_get_height (image));
+            }
+          break;
+
+        case GIMP_CLIP_TO_BOTTOM_LAYER:
+          if (layers->next == NULL)
+            {
+              x1 = off_x;
+              y1 = off_y;
+              x2 = off_x + gimp_item_get_width  (GIMP_ITEM (layer));
+              y2 = off_y + gimp_item_get_height (GIMP_ITEM (layer));
+            }
+          break;
+
+        case GIMP_FLATTEN_IMAGE:
+          if (layers->next == NULL)
+            {
+              x1 = 0;
+              y1 = 0;
+              x2 = gimp_image_get_width  (image);
+              y2 = gimp_image_get_height (image);
+            }
+          break;
+        }
+    }
+
+  if ((x2 - x1) == 0 || (y2 - y1) == 0)
+    return NULL;
+
+  bottom_layer = layer;
+
+  flatten_node = NULL;
+
+  if (merge_type == GIMP_FLATTEN_IMAGE ||
+      (gimp_drawable_is_indexed (GIMP_DRAWABLE (layer)) &&
+       ! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer))))
+    {
+      GimpRGB bg;
+
+      merge_layer = gimp_layer_new (image, (x2 - x1), (y2 - y1),
+                                    gimp_image_get_layer_format (image, FALSE),
+                                    gimp_object_get_name (bottom_layer),
+                                    GIMP_OPACITY_OPAQUE,
+                                    gimp_image_get_default_new_layer_mode (image));
+
+      if (! merge_layer)
+        {
+          g_warning ("%s: could not allocate merge layer", G_STRFUNC);
+
+          return NULL;
+        }
+
+      /*  get the background for compositing  */
+      gimp_context_get_background (context, &bg);
+      gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (layer),
+                                         &bg, &bg);
+
+      flatten_node = gimp_gegl_create_flatten_node (
+        &bg, gimp_layer_get_real_composite_space (bottom_layer));
+    }
+  else
+    {
+      /*  The final merged layer inherits the name of the bottom most layer
+       *  and the resulting layer has an alpha channel whether or not the
+       *  original did. Opacity is set to 100% and the MODE is set to normal.
+       */
+
+      merge_layer =
+        gimp_layer_new (image, (x2 - x1), (y2 - y1),
+                        gimp_drawable_get_format_with_alpha (GIMP_DRAWABLE (bottom_layer)),
+                        gimp_object_get_name (bottom_layer),
+                        GIMP_OPACITY_OPAQUE,
+                        gimp_image_get_default_new_layer_mode (image));
+
+      if (! merge_layer)
+        {
+          g_warning ("%s: could not allocate merge layer", G_STRFUNC);
+
+          return NULL;
+        }
+    }
+
+  if (merge_type == GIMP_FLATTEN_IMAGE)
+    {
+      position = 0;
+    }
+  else
+    {
+      /*  Find the index in the layer list of the bottom layer--we need this
+       *  in order to add the final, merged layer to the layer list correctly
+       */
+      position =
+        gimp_container_get_n_children (container) -
+        gimp_container_get_child_index (container, GIMP_OBJECT (bottom_layer));
+    }
+
+  gimp_item_set_offset (GIMP_ITEM (merge_layer), x1, y1);
+
+  offset_node = gegl_node_new_child (node,
+                                     "operation", "gegl:translate",
+                                     "x",         (gdouble) -x1,
+                                     "y",         (gdouble) -y1,
+                                     NULL);
+
+  if (flatten_node)
+    {
+      gegl_node_add_child (node, flatten_node);
+      g_object_unref (flatten_node);
+
+      gegl_node_link_many (source_node, flatten_node, offset_node, NULL);
+    }
+  else
+    {
+      gegl_node_link_many (source_node, offset_node, NULL);
+    }
+
+  /*  Disconnect the bottom-layer node's input  */
+  last_node        = gimp_filter_get_node (GIMP_FILTER (bottom_layer));
+  last_node_source = gegl_node_get_producer (last_node, "input", NULL);
+
+  gegl_node_disconnect (last_node, "input");
+
+  /*  Render the graph into the merge layer  */
+  gimp_gegl_apply_operation (NULL, progress, undo_desc, offset_node,
+                             gimp_drawable_get_buffer (
+                               GIMP_DRAWABLE (merge_layer)),
+                             NULL, FALSE);
+
+  /*  Reconnect the bottom-layer node's input  */
+  if (last_node_source)
+    gegl_node_link (last_node_source, last_node);
+
+  /*  Clean up the graph  */
+  gegl_node_remove_child (node, offset_node);
+
+  if (flatten_node)
+    gegl_node_remove_child (node, flatten_node);
+
+  /* Copy the tattoo and parasites of the bottom layer to the new layer */
+  gimp_item_set_tattoo (GIMP_ITEM (merge_layer),
+                        gimp_item_get_tattoo (GIMP_ITEM (bottom_layer)));
+
+  parasites = gimp_item_get_parasites (GIMP_ITEM (bottom_layer));
+  parasites = gimp_parasite_list_copy (parasites);
+  gimp_item_set_parasites (GIMP_ITEM (merge_layer), parasites);
+  g_object_unref (parasites);
+
+  /*  Remove the merged layers from the image  */
+  for (layers = merge_list; layers; layers = g_slist_next (layers))
+    gimp_image_remove_layer (image, layers->data, TRUE, NULL);
+
+  gimp_item_set_visible (GIMP_ITEM (merge_layer), TRUE, FALSE);
+
+  /*  if the type is flatten, remove all the remaining layers  */
+  if (merge_type == GIMP_FLATTEN_IMAGE)
+    {
+      GList *list = gimp_image_get_layer_iter (image);
+
+      while (list)
+        {
+          layer = list->data;
+
+          list = g_list_next (list);
+          gimp_image_remove_layer (image, layer, TRUE, NULL);
+        }
+
+      gimp_image_add_layer (image, merge_layer, parent,
+                            position, TRUE);
+    }
+  else
+    {
+      /*  Add the layer to the image  */
+      gimp_image_add_layer (image, merge_layer, parent,
+                            gimp_container_get_n_children (container) -
+                            position + 1,
+                            TRUE);
+    }
+
+  gimp_drawable_update (GIMP_DRAWABLE (merge_layer), 0, 0, -1, -1);
+
+  return merge_layer;
+}
diff --git a/app/core/gimpimage-merge.h b/app/core/gimpimage-merge.h
new file mode 100644
index 0000000..93aab4e
--- /dev/null
+++ b/app/core/gimpimage-merge.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_MERGE_H__
+#define __GIMP_IMAGE_MERGE_H__
+
+
+GimpLayer   * gimp_image_merge_visible_layers  (GimpImage      *image,
+                                                GimpContext    *context,
+                                                GimpMergeType   merge_type,
+                                                gboolean        merge_active_group,
+                                                gboolean        discard_invisible,
+                                                GimpProgress   *progress);
+GimpLayer   * gimp_image_merge_down            (GimpImage      *image,
+                                                GimpLayer      *current_layer,
+                                                GimpContext    *context,
+                                                GimpMergeType   merge_type,
+                                                GimpProgress   *progress,
+                                                GError        **error);
+GimpLayer   * gimp_image_merge_group_layer     (GimpImage      *image,
+                                                GimpGroupLayer *group);
+
+GimpLayer   * gimp_image_flatten               (GimpImage      *image,
+                                                GimpContext    *context,
+                                                GimpProgress   *progress,
+                                                GError        **error);
+
+GimpVectors * gimp_image_merge_visible_vectors (GimpImage      *image,
+                                                GError        **error);
+
+
+#endif /* __GIMP_IMAGE_MERGE_H__ */
diff --git a/app/core/gimpimage-metadata.c b/app/core/gimpimage-metadata.c
new file mode 100644
index 0000000..ae0774f
--- /dev/null
+++ b/app/core/gimpimage-metadata.c
@@ -0,0 +1,184 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-metadata.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo-push.h"
+
+
+/* public functions */
+
+
+GimpMetadata *
+gimp_image_get_metadata (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return private->metadata;
+}
+
+void
+gimp_image_set_metadata (GimpImage    *image,
+                         GimpMetadata *metadata,
+                         gboolean      push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (metadata != private->metadata)
+    {
+      if (push_undo)
+        gimp_image_undo_push_image_metadata (image, NULL);
+
+      g_set_object (&private->metadata, metadata);
+
+      if (private->metadata)
+        {
+          gimp_image_metadata_update_pixel_size      (image);
+          gimp_image_metadata_update_bits_per_sample (image);
+          gimp_image_metadata_update_resolution      (image);
+          gimp_image_metadata_update_colorspace      (image);
+        }
+
+      g_object_notify (G_OBJECT (image), "metadata");
+    }
+}
+
+void
+gimp_image_metadata_update_pixel_size (GimpImage *image)
+{
+  GimpMetadata *metadata;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  metadata = gimp_image_get_metadata (image);
+
+  if (metadata)
+    {
+      gimp_metadata_set_pixel_size (metadata,
+                                    gimp_image_get_width  (image),
+                                    gimp_image_get_height (image));
+    }
+}
+
+void
+gimp_image_metadata_update_bits_per_sample (GimpImage *image)
+{
+  GimpMetadata *metadata;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  metadata = gimp_image_get_metadata (image);
+
+  if (metadata)
+    {
+      switch (gimp_image_get_component_type (image))
+        {
+        case GIMP_COMPONENT_TYPE_U8:
+          gimp_metadata_set_bits_per_sample (metadata, 8);
+          break;
+
+        case GIMP_COMPONENT_TYPE_U16:
+        case GIMP_COMPONENT_TYPE_HALF:
+          gimp_metadata_set_bits_per_sample (metadata, 16);
+          break;
+
+        case GIMP_COMPONENT_TYPE_U32:
+        case GIMP_COMPONENT_TYPE_FLOAT:
+          gimp_metadata_set_bits_per_sample (metadata, 32);
+          break;
+
+        case GIMP_COMPONENT_TYPE_DOUBLE:
+          gimp_metadata_set_bits_per_sample (metadata, 64);
+          break;
+        }
+    }
+}
+
+void
+gimp_image_metadata_update_resolution (GimpImage *image)
+{
+  GimpMetadata *metadata;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  metadata = gimp_image_get_metadata (image);
+
+  if (metadata)
+    {
+      gdouble xres, yres;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+      gimp_metadata_set_resolution (metadata, xres, yres,
+                                    gimp_image_get_unit (image));
+    }
+}
+
+void
+gimp_image_metadata_update_colorspace (GimpImage *image)
+{
+  GimpMetadata *metadata;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  metadata = gimp_image_get_metadata (image);
+
+  if (metadata)
+    {
+      /*  See the discussions in issue #3532 and issue #301  */
+
+      GimpColorProfile       *profile = gimp_image_get_color_profile (image);
+      GimpMetadataColorspace  space   = GIMP_METADATA_COLORSPACE_UNSPECIFIED;
+
+      if (profile)
+        {
+          static GimpColorProfile *adobe = NULL;
+
+          if (! adobe)
+            adobe = gimp_color_profile_new_rgb_adobe ();
+
+          if (gimp_color_profile_is_equal (profile, adobe))
+            space = GIMP_METADATA_COLORSPACE_ADOBERGB;
+        }
+      else
+        {
+          space = GIMP_METADATA_COLORSPACE_SRGB;
+        }
+
+      gimp_metadata_set_colorspace (metadata, space);
+    }
+}
diff --git a/app/core/gimpimage-metadata.h b/app/core/gimpimage-metadata.h
new file mode 100644
index 0000000..2a74be8
--- /dev/null
+++ b/app/core/gimpimage-metadata.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_METADATA_H__
+#define __GIMP_IMAGE_METADATA_H__
+
+
+GimpMetadata * gimp_image_get_metadata                    (GimpImage    *image);
+void           gimp_image_set_metadata                    (GimpImage    *image,
+                                                           GimpMetadata *metadata,
+                                                           gboolean      push_undo);
+
+void           gimp_image_metadata_update_pixel_size      (GimpImage    *image);
+void           gimp_image_metadata_update_bits_per_sample (GimpImage    *image);
+void           gimp_image_metadata_update_resolution      (GimpImage    *image);
+void           gimp_image_metadata_update_colorspace      (GimpImage    *image);
+
+
+#endif /* __GIMP_IMAGE_METADATA_H__ */
diff --git a/app/core/gimpimage-new.c b/app/core/gimpimage-new.c
new file mode 100644
index 0000000..4d0fa7b
--- /dev/null
+++ b/app/core/gimpimage-new.c
@@ -0,0 +1,393 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimp.h"
+#include "gimpbuffer.h"
+#include "gimpchannel.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-fill.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-new.h"
+#include "gimpimage-undo.h"
+#include "gimplayer.h"
+#include "gimplayer-new.h"
+#include "gimptemplate.h"
+
+#include "gimp-intl.h"
+
+
+GimpTemplate *
+gimp_image_new_get_last_template (Gimp      *gimp,
+                                  GimpImage *image)
+{
+  GimpTemplate *template;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
+
+  template = gimp_template_new ("image new values");
+
+  if (image)
+    {
+      gimp_config_sync (G_OBJECT (gimp->config->default_image),
+                        G_OBJECT (template), 0);
+      gimp_template_set_from_image (template, image);
+    }
+  else
+    {
+      gimp_config_sync (G_OBJECT (gimp->image_new_last_template),
+                        G_OBJECT (template), 0);
+    }
+
+  return template;
+}
+
+void
+gimp_image_new_set_last_template (Gimp         *gimp,
+                                  GimpTemplate *template)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_TEMPLATE (template));
+
+  gimp_config_sync (G_OBJECT (template),
+                    G_OBJECT (gimp->image_new_last_template), 0);
+}
+
+GimpImage *
+gimp_image_new_from_template (Gimp         *gimp,
+                              GimpTemplate *template,
+                              GimpContext  *context)
+{
+  GimpImage         *image;
+  GimpLayer         *layer;
+  GimpColorProfile  *profile;
+  gint               width, height;
+  gboolean           has_alpha;
+  const gchar       *comment;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  image = gimp_create_image (gimp,
+                             gimp_template_get_width (template),
+                             gimp_template_get_height (template),
+                             gimp_template_get_base_type (template),
+                             gimp_template_get_precision (template),
+                             FALSE);
+
+  gimp_image_undo_disable (image);
+
+  comment = gimp_template_get_comment (template);
+
+  if (comment)
+    {
+      GimpParasite *parasite;
+
+      parasite = gimp_parasite_new ("gimp-comment",
+                                    GIMP_PARASITE_PERSISTENT,
+                                    strlen (comment) + 1,
+                                    comment);
+      gimp_image_parasite_attach (image, parasite, FALSE);
+      gimp_parasite_free (parasite);
+    }
+
+  gimp_image_set_resolution (image,
+                             gimp_template_get_resolution_x (template),
+                             gimp_template_get_resolution_y (template));
+  gimp_image_set_unit (image, gimp_template_get_resolution_unit (template));
+
+  gimp_image_set_is_color_managed (image,
+                                   gimp_template_get_color_managed (template),
+                                   FALSE);
+  profile = gimp_template_get_color_profile (template);
+  gimp_image_set_color_profile (image, profile, NULL);
+  if (profile)
+    g_object_unref (profile);
+
+  width  = gimp_image_get_width (image);
+  height = gimp_image_get_height (image);
+
+  if (gimp_template_get_fill_type (template) == GIMP_FILL_TRANSPARENT)
+    has_alpha = TRUE;
+  else
+    has_alpha = FALSE;
+
+  layer = gimp_layer_new (image, width, height,
+                          gimp_image_get_layer_format (image, has_alpha),
+                          _("Background"),
+                          GIMP_OPACITY_OPAQUE,
+                          gimp_image_get_default_new_layer_mode (image));
+
+  gimp_drawable_fill (GIMP_DRAWABLE (layer),
+                      context, gimp_template_get_fill_type (template));
+
+  gimp_image_add_layer (image, layer, NULL, 0, FALSE);
+
+  gimp_image_undo_enable (image);
+  gimp_image_clean_all (image);
+
+  return image;
+}
+
+GimpImage *
+gimp_image_new_from_drawable (Gimp         *gimp,
+                              GimpDrawable *drawable)
+{
+  GimpItem          *item;
+  GimpImage         *image;
+  GimpImage         *new_image;
+  GimpLayer         *new_layer;
+  GType              new_type;
+  gint               off_x, off_y;
+  GimpImageBaseType  type;
+  gdouble            xres;
+  gdouble            yres;
+  GimpColorProfile  *profile;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+
+  item  = GIMP_ITEM (drawable);
+  image = gimp_item_get_image (item);
+
+  type = gimp_drawable_get_base_type (drawable);
+
+  new_image = gimp_create_image (gimp,
+                                 gimp_item_get_width  (item),
+                                 gimp_item_get_height (item),
+                                 type,
+                                 gimp_drawable_get_precision (drawable),
+                                 TRUE);
+  gimp_image_undo_disable (new_image);
+
+  if (type == GIMP_INDEXED)
+    gimp_image_set_colormap (new_image,
+                             gimp_image_get_colormap (image),
+                             gimp_image_get_colormap_size (image),
+                             FALSE);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+  gimp_image_set_resolution (new_image, xres, yres);
+  gimp_image_set_unit (new_image, gimp_image_get_unit (image));
+
+  gimp_image_set_is_color_managed (new_image,
+                                   gimp_image_get_is_color_managed (image),
+                                   FALSE);
+  profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (drawable));
+  gimp_image_set_color_profile (new_image, profile, NULL);
+
+  if (GIMP_IS_LAYER (drawable))
+    new_type = G_TYPE_FROM_INSTANCE (drawable);
+  else
+    new_type = GIMP_TYPE_LAYER;
+
+  new_layer = GIMP_LAYER (gimp_item_convert (GIMP_ITEM (drawable),
+                                             new_image, new_type));
+
+  gimp_object_set_name (GIMP_OBJECT (new_layer),
+                        gimp_object_get_name (drawable));
+
+  gimp_item_get_offset (GIMP_ITEM (new_layer), &off_x, &off_y);
+  gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE);
+  gimp_item_set_visible (GIMP_ITEM (new_layer), TRUE, FALSE);
+  gimp_item_set_linked (GIMP_ITEM (new_layer), FALSE, FALSE);
+  gimp_layer_set_mode (new_layer,
+                       gimp_image_get_default_new_layer_mode (new_image),
+                       FALSE);
+  gimp_layer_set_opacity (new_layer, GIMP_OPACITY_OPAQUE, FALSE);
+  if (gimp_layer_can_lock_alpha (new_layer))
+    gimp_layer_set_lock_alpha (new_layer, FALSE, FALSE);
+
+  gimp_image_add_layer (new_image, new_layer, NULL, 0, TRUE);
+
+  gimp_image_undo_enable (new_image);
+
+  return new_image;
+}
+
+GimpImage *
+gimp_image_new_from_component (Gimp            *gimp,
+                               GimpImage       *image,
+                               GimpChannelType  component)
+{
+  GimpImage   *new_image;
+  GimpChannel *channel;
+  GimpLayer   *layer;
+  const gchar *desc;
+  gdouble      xres;
+  gdouble      yres;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  new_image = gimp_create_image (gimp,
+                                 gimp_image_get_width  (image),
+                                 gimp_image_get_height (image),
+                                 GIMP_GRAY,
+                                 gimp_image_get_precision (image),
+                                 TRUE);
+
+  gimp_image_undo_disable (new_image);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+  gimp_image_set_resolution (new_image, xres, yres);
+  gimp_image_set_unit (new_image, gimp_image_get_unit (image));
+
+  channel = gimp_channel_new_from_component (image, component, NULL, NULL);
+
+  layer = GIMP_LAYER (gimp_item_convert (GIMP_ITEM (channel),
+                                         new_image, GIMP_TYPE_LAYER));
+  g_object_unref (channel);
+
+  gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
+                       NULL, NULL, &desc, NULL);
+  gimp_object_take_name (GIMP_OBJECT (layer),
+                         g_strdup_printf (_("%s Channel Copy"), desc));
+
+  gimp_image_add_layer (new_image, layer, NULL, 0, TRUE);
+
+  gimp_image_undo_enable (new_image);
+
+  return new_image;
+}
+
+GimpImage *
+gimp_image_new_from_buffer (Gimp       *gimp,
+                            GimpBuffer *buffer)
+{
+  GimpImage        *image;
+  GimpLayer        *layer;
+  const Babl       *format;
+  gboolean          has_alpha;
+  gdouble           res_x;
+  gdouble           res_y;
+  GimpColorProfile *profile;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
+
+  format    = gimp_buffer_get_format (buffer);
+  has_alpha = babl_format_has_alpha (format);
+
+  image = gimp_create_image (gimp,
+                             gimp_buffer_get_width  (buffer),
+                             gimp_buffer_get_height (buffer),
+                             gimp_babl_format_get_base_type (format),
+                             gimp_babl_format_get_precision (format),
+                             TRUE);
+  gimp_image_undo_disable (image);
+
+  if (gimp_buffer_get_resolution (buffer, &res_x, &res_y))
+    {
+      gimp_image_set_resolution (image, res_x, res_y);
+      gimp_image_set_unit (image, gimp_buffer_get_unit (buffer));
+    }
+
+  profile = gimp_buffer_get_color_profile (buffer);
+  gimp_image_set_color_profile (image, profile, NULL);
+
+  layer = gimp_layer_new_from_buffer (buffer, image,
+                                      gimp_image_get_layer_format (image,
+                                                                   has_alpha),
+                                      _("Pasted Layer"),
+                                      GIMP_OPACITY_OPAQUE,
+                                      gimp_image_get_default_new_layer_mode (image));
+
+  gimp_image_add_layer (image, layer, NULL, 0, TRUE);
+
+  gimp_image_undo_enable (image);
+
+  return image;
+}
+
+GimpImage *
+gimp_image_new_from_pixbuf (Gimp        *gimp,
+                            GdkPixbuf   *pixbuf,
+                            const gchar *layer_name)
+{
+  GimpImage         *new_image;
+  GimpLayer         *layer;
+  GimpImageBaseType  base_type;
+  gboolean           has_alpha = FALSE;
+  guint8            *icc_data;
+  gsize              icc_len;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+  switch (gdk_pixbuf_get_n_channels (pixbuf))
+    {
+    case 2: has_alpha = TRUE;
+    case 1: base_type = GIMP_GRAY;
+      break;
+
+    case 4: has_alpha = TRUE;
+    case 3: base_type = GIMP_RGB;
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+
+  new_image = gimp_create_image (gimp,
+                                 gdk_pixbuf_get_width  (pixbuf),
+                                 gdk_pixbuf_get_height (pixbuf),
+                                 base_type,
+                                 GIMP_PRECISION_U8_GAMMA,
+                                 FALSE);
+
+  gimp_image_undo_disable (new_image);
+
+  icc_data = gimp_pixbuf_get_icc_profile (pixbuf, &icc_len);
+  if (icc_data)
+    {
+      gimp_image_set_icc_profile (new_image, icc_data, icc_len, NULL);
+      g_free (icc_data);
+    }
+
+  layer = gimp_layer_new_from_pixbuf (pixbuf, new_image,
+                                      gimp_image_get_layer_format (new_image,
+                                                                   has_alpha),
+                                      layer_name,
+                                      GIMP_OPACITY_OPAQUE,
+                                      gimp_image_get_default_new_layer_mode (new_image));
+
+  gimp_image_add_layer (new_image, layer, NULL, 0, TRUE);
+
+  gimp_image_undo_enable (new_image);
+
+  return new_image;
+}
diff --git a/app/core/gimpimage-new.h b/app/core/gimpimage-new.h
new file mode 100644
index 0000000..6efd3cc
--- /dev/null
+++ b/app/core/gimpimage-new.h
@@ -0,0 +1,42 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_NEW_H__
+#define __GIMP_IMAGE_NEW_H__
+
+
+GimpTemplate * gimp_image_new_get_last_template (Gimp            *gimp,
+                                                 GimpImage       *image);
+void           gimp_image_new_set_last_template (Gimp            *gimp,
+                                                 GimpTemplate    *template);
+
+GimpImage    * gimp_image_new_from_template     (Gimp            *gimp,
+                                                 GimpTemplate    *template,
+                                                 GimpContext     *context);
+GimpImage    * gimp_image_new_from_drawable     (Gimp            *gimp,
+                                                 GimpDrawable    *drawable);
+GimpImage    * gimp_image_new_from_component    (Gimp            *gimp,
+                                                 GimpImage       *image,
+                                                 GimpChannelType  component);
+GimpImage    * gimp_image_new_from_buffer       (Gimp            *gimp,
+                                                 GimpBuffer      *buffer);
+GimpImage    * gimp_image_new_from_pixbuf       (Gimp            *gimp,
+                                                 GdkPixbuf       *pixbuf,
+                                                 const gchar     *layer_name);
+
+
+#endif /* __GIMP_IMAGE_NEW__ */
diff --git a/app/core/gimpimage-pick-color.c b/app/core/gimpimage-pick-color.c
new file mode 100644
index 0000000..f8168cb
--- /dev/null
+++ b/app/core/gimpimage-pick-color.c
@@ -0,0 +1,147 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpchannel.h"
+#include "gimpdrawable.h"
+#include "gimpimage.h"
+#include "gimpimage-pick-color.h"
+#include "gimplayer.h"
+#include "gimppickable.h"
+
+
+gboolean
+gimp_image_pick_color (GimpImage     *image,
+                       GimpDrawable  *drawable,
+                       gint           x,
+                       gint           y,
+                       gboolean       show_all,
+                       gboolean       sample_merged,
+                       gboolean       sample_average,
+                       gdouble        average_radius,
+                       const Babl   **sample_format,
+                       gpointer       pixel,
+                       GimpRGB       *color)
+{
+  GimpPickable *pickable;
+  gboolean      result;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (drawable == NULL ||
+                        gimp_item_get_image (GIMP_ITEM (drawable)) == image,
+                        FALSE);
+
+  if (sample_merged && drawable)
+    {
+      if ((GIMP_IS_LAYER (drawable) &&
+           gimp_image_get_n_layers (image) == 1) ||
+          (GIMP_IS_CHANNEL (drawable) &&
+           gimp_image_get_n_channels (image) == 1))
+        {
+          /* Let's add a special exception when an image has only one
+           * layer. This was useful in particular for indexed image as
+           * it allows to pick the right index value even when "Sample
+           * merged" is checked. There are more possible exceptions, but
+           * we can't just take them all in considerations unless we
+           * want to make code extra-complicated).
+           * See #3041.
+           */
+          sample_merged = FALSE;
+        }
+    }
+
+  if (! sample_merged)
+    {
+      if (! drawable)
+        drawable = gimp_image_get_active_drawable (image);
+
+      if (! drawable)
+        return FALSE;
+    }
+
+  if (sample_merged)
+    {
+      if (! show_all)
+        pickable = GIMP_PICKABLE (image);
+      else
+        pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+    }
+  else
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+      x -= off_x;
+      y -= off_y;
+
+      pickable = GIMP_PICKABLE (drawable);
+    }
+
+  /* Do *not* call gimp_pickable_flush() here because it's too expensive
+   * to call it unconditionally each time e.g. the cursor view is updated.
+   * Instead, call gimp_pickable_flush() in the callers if needed.
+   */
+
+  if (sample_format)
+    *sample_format = gimp_pickable_get_format (pickable);
+
+  result = gimp_pickable_pick_color (pickable, x, y,
+                                     sample_average &&
+                                     ! (show_all && sample_merged),
+                                     average_radius,
+                                     pixel, color);
+
+  if (show_all && sample_merged)
+    {
+      const Babl *format    = babl_format ("RaGaBaA double");
+      gdouble     sample[4] = {};
+
+      if (! result)
+        memset (pixel, 0, babl_format_get_bytes_per_pixel (*sample_format));
+
+      if (sample_average)
+        {
+          GeglBuffer *buffer = gimp_pickable_get_buffer (pickable);
+          gint        radius = floor (average_radius);
+
+          gimp_gegl_average_color (buffer,
+                                   GEGL_RECTANGLE (x - radius,
+                                                   y - radius,
+                                                   2 * radius + 1,
+                                                   2 * radius + 1),
+                                   FALSE, GEGL_ABYSS_NONE, format, sample);
+        }
+
+      if (! result || sample_average)
+        gimp_pickable_pixel_to_srgb (pickable, format, sample, color);
+
+      result = TRUE;
+    }
+
+  return result;
+}
diff --git a/app/core/gimpimage-pick-color.h b/app/core/gimpimage-pick-color.h
new file mode 100644
index 0000000..1ca2947
--- /dev/null
+++ b/app/core/gimpimage-pick-color.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_IMAGE_PICK_COLOR_H__
+#define  __GIMP_IMAGE_PICK_COLOR_H__
+
+
+gboolean   gimp_image_pick_color (GimpImage     *image,
+                                  GimpDrawable  *drawable,
+                                  gint           x,
+                                  gint           y,
+                                  gboolean       show_all,
+                                  gboolean       sample_merged,
+                                  gboolean       sample_average,
+                                  gdouble        average_radius,
+                                  const Babl   **sample_format,
+                                  gpointer       pixel,
+                                  GimpRGB       *color);
+
+
+#endif  /* __GIMP_IMAGE_PICK_COLOR_H__ */
diff --git a/app/core/gimpimage-pick-item.c b/app/core/gimpimage-pick-item.c
new file mode 100644
index 0000000..b2257f3
--- /dev/null
+++ b/app/core/gimpimage-pick-item.c
@@ -0,0 +1,381 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpgrouplayer.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-pick-item.h"
+#include "gimpimage-private.h"
+#include "gimppickable.h"
+#include "gimpsamplepoint.h"
+
+#include "text/gimptextlayer.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+
+
+GimpLayer *
+gimp_image_pick_layer (GimpImage *image,
+                       gint       x,
+                       gint       y,
+                       GimpLayer *previously_picked)
+{
+  GList *all_layers;
+  GList *list;
+  gint   off_x, off_y;
+  gint   tries = 1;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  all_layers = gimp_image_get_layer_list (image);
+
+  if (previously_picked)
+    {
+      gimp_item_get_offset (GIMP_ITEM (previously_picked), &off_x, &off_y);
+      if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (previously_picked),
+                                        x - off_x, y - off_y) <= 0.25)
+        previously_picked = NULL;
+      else
+        tries++;
+    }
+
+  while (tries)
+    {
+      for (list = all_layers; list; list = g_list_next (list))
+        {
+          GimpLayer *layer = list->data;
+
+          if (previously_picked)
+            {
+              /* Take the first layer with a pixel at given coordinates
+               * after the previously picked one.
+               */
+              if (layer == previously_picked)
+                previously_picked = NULL;
+              continue;
+            }
+
+          gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+
+          if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (layer),
+                                            x - off_x, y - off_y) > 0.25)
+            {
+              g_list_free (all_layers);
+
+              return layer;
+            }
+        }
+      tries--;
+    }
+
+  g_list_free (all_layers);
+
+  return NULL;
+}
+
+GimpLayer *
+gimp_image_pick_layer_by_bounds (GimpImage *image,
+                                 gint       x,
+                                 gint       y)
+{
+  GList *all_layers;
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  all_layers = gimp_image_get_layer_list (image);
+
+  for (list = all_layers; list; list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+
+      if (gimp_item_is_visible (GIMP_ITEM (layer)))
+        {
+          gint off_x, off_y;
+          gint width, height;
+
+          gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+          width  = gimp_item_get_width  (GIMP_ITEM (layer));
+          height = gimp_item_get_height (GIMP_ITEM (layer));
+
+          if (x >= off_x        &&
+              y >= off_y        &&
+              x < off_x + width &&
+              y < off_y + height)
+            {
+              g_list_free (all_layers);
+
+              return layer;
+            }
+        }
+    }
+
+  g_list_free (all_layers);
+
+  return NULL;
+}
+
+GimpTextLayer *
+gimp_image_pick_text_layer (GimpImage *image,
+                            gint       x,
+                            gint       y)
+{
+  GList *all_layers;
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  all_layers = gimp_image_get_layer_list (image);
+
+  for (list = all_layers; list; list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+      gint       off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+
+      if (GIMP_IS_TEXT_LAYER (layer) &&
+          x >= off_x &&
+          y >= off_y &&
+          x <  off_x + gimp_item_get_width  (GIMP_ITEM (layer)) &&
+          y <  off_y + gimp_item_get_height (GIMP_ITEM (layer)) &&
+          gimp_item_is_visible (GIMP_ITEM (layer)))
+        {
+          g_list_free (all_layers);
+
+          return GIMP_TEXT_LAYER (layer);
+        }
+      else if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (layer),
+                                             x - off_x, y - off_y) > 0.25)
+        {
+          /*  a normal layer covers any possible text layers below,
+           *  bail out
+           */
+
+          break;
+        }
+    }
+
+  g_list_free (all_layers);
+
+  return NULL;
+}
+
+GimpVectors *
+gimp_image_pick_vectors (GimpImage *image,
+                         gdouble    x,
+                         gdouble    y,
+                         gdouble    epsilon_x,
+                         gdouble    epsilon_y)
+{
+  GimpVectors *ret = NULL;
+  GList       *all_vectors;
+  GList       *list;
+  gdouble      mindist = G_MAXDOUBLE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  all_vectors = gimp_image_get_vectors_list (image);
+
+  for (list = all_vectors; list; list = g_list_next (list))
+    {
+      GimpVectors *vectors = list->data;
+
+      if (gimp_item_is_visible (GIMP_ITEM (vectors)))
+        {
+          GimpStroke *stroke = NULL;
+          GimpCoords  coords = GIMP_COORDS_DEFAULT_VALUES;
+
+          while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+            {
+              gdouble dist;
+
+              coords.x = x;
+              coords.y = y;
+
+              dist = gimp_stroke_nearest_point_get (stroke, &coords, 1.0,
+                                                    NULL, NULL, NULL, NULL);
+
+              if (dist >= 0.0 &&
+                  dist <  MIN (epsilon_y, mindist))
+                {
+                  mindist = dist;
+                  ret     = vectors;
+                }
+            }
+        }
+    }
+
+  g_list_free (all_vectors);
+
+  return ret;
+}
+
+static GimpGuide *
+gimp_image_pick_guide_internal (GimpImage           *image,
+                                gdouble              x,
+                                gdouble              y,
+                                gdouble              epsilon_x,
+                                gdouble              epsilon_y,
+                                GimpOrientationType  orientation)
+{
+  GList     *list;
+  GimpGuide *ret     = NULL;
+  gdouble    mindist = G_MAXDOUBLE;
+
+  for (list = GIMP_IMAGE_GET_PRIVATE (image)->guides;
+       list;
+       list = g_list_next (list))
+    {
+      GimpGuide *guide    = list->data;
+      gint       position = gimp_guide_get_position (guide);
+      gdouble    dist;
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          if (orientation == GIMP_ORIENTATION_HORIZONTAL ||
+              orientation == GIMP_ORIENTATION_UNKNOWN)
+            {
+              dist = ABS (position - y);
+              if (dist < MIN (epsilon_y, mindist))
+                {
+                  mindist = dist;
+                  ret = guide;
+                }
+            }
+          break;
+
+        /* mindist always is in vertical resolution to make it comparable */
+        case GIMP_ORIENTATION_VERTICAL:
+          if (orientation == GIMP_ORIENTATION_VERTICAL ||
+              orientation == GIMP_ORIENTATION_UNKNOWN)
+            {
+              dist = ABS (position - x);
+              if (dist < MIN (epsilon_x, mindist / epsilon_y * epsilon_x))
+                {
+                  mindist = dist * epsilon_y / epsilon_x;
+                  ret = guide;
+                }
+            }
+          break;
+
+        default:
+          continue;
+        }
+    }
+
+  return ret;
+}
+
+GimpGuide *
+gimp_image_pick_guide (GimpImage *image,
+                       gdouble    x,
+                       gdouble    y,
+                       gdouble    epsilon_x,
+                       gdouble    epsilon_y)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (epsilon_x > 0 && epsilon_y > 0, NULL);
+
+  return gimp_image_pick_guide_internal (image, x, y, epsilon_x, epsilon_y,
+                                         GIMP_ORIENTATION_UNKNOWN);
+}
+
+GList *
+gimp_image_pick_guides (GimpImage *image,
+                        gdouble    x,
+                        gdouble    y,
+                        gdouble    epsilon_x,
+                        gdouble    epsilon_y)
+{
+  GimpGuide *guide;
+  GList     *result = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (epsilon_x > 0 && epsilon_y > 0, NULL);
+
+  guide = gimp_image_pick_guide_internal (image, x, y, epsilon_x, epsilon_y,
+                                          GIMP_ORIENTATION_HORIZONTAL);
+
+  if (guide)
+    result = g_list_append (result, guide);
+
+  guide = gimp_image_pick_guide_internal (image, x, y, epsilon_x, epsilon_y,
+                                          GIMP_ORIENTATION_VERTICAL);
+
+  if (guide)
+    result = g_list_append (result, guide);
+
+  return result;
+}
+
+GimpSamplePoint *
+gimp_image_pick_sample_point (GimpImage *image,
+                              gdouble    x,
+                              gdouble    y,
+                              gdouble    epsilon_x,
+                              gdouble    epsilon_y)
+{
+  GList           *list;
+  GimpSamplePoint *ret     = NULL;
+  gdouble          mindist = G_MAXDOUBLE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (epsilon_x > 0 && epsilon_y > 0, NULL);
+
+  if (x < 0 || x >= gimp_image_get_width  (image) ||
+      y < 0 || y >= gimp_image_get_height (image))
+    {
+      return NULL;
+    }
+
+  for (list = GIMP_IMAGE_GET_PRIVATE (image)->sample_points;
+       list;
+       list = g_list_next (list))
+    {
+      GimpSamplePoint *sample_point = list->data;
+      gint             sp_x;
+      gint             sp_y;
+      gdouble          dist;
+
+      gimp_sample_point_get_position (sample_point, &sp_x, &sp_y);
+
+      if (sp_x < 0 || sp_y < 0)
+        continue;
+
+      dist = hypot ((sp_x + 0.5) - x,
+                    (sp_y + 0.5) - y);
+      if (dist < MIN (epsilon_y, mindist))
+        {
+          mindist = dist;
+          ret = sample_point;
+        }
+    }
+
+  return ret;
+}
diff --git a/app/core/gimpimage-pick-item.h b/app/core/gimpimage-pick-item.h
new file mode 100644
index 0000000..46da4ef
--- /dev/null
+++ b/app/core/gimpimage-pick-item.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PICK_ITEM_H__
+#define __GIMP_IMAGE_PICK_ITEM_H__
+
+
+GimpLayer       * gimp_image_pick_layer           (GimpImage *image,
+                                                   gint       x,
+                                                   gint       y,
+                                                   GimpLayer *previously_picked);
+GimpLayer       * gimp_image_pick_layer_by_bounds (GimpImage *image,
+                                                   gint       x,
+                                                   gint       y);
+GimpTextLayer   * gimp_image_pick_text_layer      (GimpImage *image,
+                                                   gint       x,
+                                                   gint       y);
+
+GimpVectors     * gimp_image_pick_vectors         (GimpImage *image,
+                                                   gdouble    x,
+                                                   gdouble    y,
+                                                   gdouble    epsilon_x,
+                                                   gdouble    epsilon_y);
+
+GimpGuide       * gimp_image_pick_guide           (GimpImage *image,
+                                                   gdouble    x,
+                                                   gdouble    y,
+                                                   gdouble    epsilon_x,
+                                                   gdouble    epsilon_y);
+GList           * gimp_image_pick_guides          (GimpImage *image,
+                                                   gdouble    x,
+                                                   gdouble    y,
+                                                   gdouble    epsilon_x,
+                                                   gdouble    epsilon_y);
+
+GimpSamplePoint * gimp_image_pick_sample_point    (GimpImage *image,
+                                                   gdouble    x,
+                                                   gdouble    y,
+                                                   gdouble    epsilon_x,
+                                                   gdouble    epsilon_y);
+
+
+#endif /* __GIMP_IMAGE_PICK_ITEM_H__ */
diff --git a/app/core/gimpimage-preview.c b/app/core/gimpimage-preview.c
new file mode 100644
index 0000000..e28865e
--- /dev/null
+++ b/app/core/gimpimage-preview.c
@@ -0,0 +1,214 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-preview.h"
+#include "gimppickable.h"
+#include "gimpprojectable.h"
+#include "gimpprojection.h"
+#include "gimptempbuf.h"
+
+
+const Babl *
+gimp_image_get_preview_format (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  switch (gimp_image_get_base_type (image))
+    {
+    case GIMP_RGB:
+    case GIMP_GRAY:
+      return gimp_babl_format_change_component_type (
+        gimp_projectable_get_format (GIMP_PROJECTABLE (image)),
+        GIMP_COMPONENT_TYPE_U8);
+
+    case GIMP_INDEXED:
+      return babl_format ("R'G'B'A u8");
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+void
+gimp_image_get_preview_size (GimpViewable *viewable,
+                             gint          size,
+                             gboolean      is_popup,
+                             gboolean      dot_for_dot,
+                             gint         *width,
+                             gint         *height)
+{
+  GimpImage *image = GIMP_IMAGE (viewable);
+  gdouble    xres;
+  gdouble    yres;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  gimp_viewable_calc_preview_size (gimp_image_get_width  (image),
+                                   gimp_image_get_height (image),
+                                   size,
+                                   size,
+                                   dot_for_dot,
+                                   xres,
+                                   yres,
+                                   width,
+                                   height,
+                                   NULL);
+}
+
+gboolean
+gimp_image_get_popup_size (GimpViewable *viewable,
+                           gint          width,
+                           gint          height,
+                           gboolean      dot_for_dot,
+                           gint         *popup_width,
+                           gint         *popup_height)
+{
+  GimpImage *image = GIMP_IMAGE (viewable);
+
+  if (gimp_image_get_width  (image) > width ||
+      gimp_image_get_height (image) > height)
+    {
+      gboolean scaling_up;
+
+      gimp_viewable_calc_preview_size (gimp_image_get_width  (image),
+                                       gimp_image_get_height (image),
+                                       width  * 2,
+                                       height * 2,
+                                       dot_for_dot, 1.0, 1.0,
+                                       popup_width,
+                                       popup_height,
+                                       &scaling_up);
+
+      if (scaling_up)
+        {
+          *popup_width  = gimp_image_get_width  (image);
+          *popup_height = gimp_image_get_height (image);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+GimpTempBuf *
+gimp_image_get_new_preview (GimpViewable *viewable,
+                            GimpContext  *context,
+                            gint          width,
+                            gint          height)
+{
+  GimpImage   *image = GIMP_IMAGE (viewable);
+  const Babl  *format;
+  GimpTempBuf *buf;
+  gdouble      scale_x;
+  gdouble      scale_y;
+
+  scale_x = (gdouble) width  / (gdouble) gimp_image_get_width  (image);
+  scale_y = (gdouble) height / (gdouble) gimp_image_get_height (image);
+
+  format = gimp_image_get_preview_format (image);
+
+  buf = gimp_temp_buf_new (width, height, format);
+
+  gegl_buffer_get (gimp_pickable_get_buffer (GIMP_PICKABLE (image)),
+                   GEGL_RECTANGLE (0, 0, width, height),
+                   MIN (scale_x, scale_y),
+                   gimp_temp_buf_get_format (buf),
+                   gimp_temp_buf_get_data (buf),
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+  return buf;
+}
+
+GdkPixbuf *
+gimp_image_get_new_pixbuf (GimpViewable *viewable,
+                           GimpContext  *context,
+                           gint          width,
+                           gint          height)
+{
+  GimpImage          *image = GIMP_IMAGE (viewable);
+  GdkPixbuf          *pixbuf;
+  gdouble             scale_x;
+  gdouble             scale_y;
+  GimpColorTransform *transform;
+
+  scale_x = (gdouble) width  / (gdouble) gimp_image_get_width  (image);
+  scale_y = (gdouble) height / (gdouble) gimp_image_get_height (image);
+
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                           width, height);
+
+  transform = gimp_image_get_color_transform_to_srgb_u8 (image);
+
+  if (transform)
+    {
+      GimpTempBuf *temp_buf;
+      GeglBuffer  *src_buf;
+      GeglBuffer  *dest_buf;
+
+      temp_buf = gimp_temp_buf_new (width, height,
+                                    gimp_pickable_get_format (GIMP_PICKABLE (image)));
+
+      gegl_buffer_get (gimp_pickable_get_buffer (GIMP_PICKABLE (image)),
+                       GEGL_RECTANGLE (0, 0, width, height),
+                       MIN (scale_x, scale_y),
+                       gimp_temp_buf_get_format (temp_buf),
+                       gimp_temp_buf_get_data (temp_buf),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+      src_buf  = gimp_temp_buf_create_buffer (temp_buf);
+      dest_buf = gimp_pixbuf_create_buffer (pixbuf);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      gimp_color_transform_process_buffer (transform,
+                                           src_buf,
+                                           GEGL_RECTANGLE (0, 0,
+                                                           width, height),
+                                           dest_buf,
+                                           GEGL_RECTANGLE (0, 0, 0, 0));
+
+      g_object_unref (src_buf);
+      g_object_unref (dest_buf);
+    }
+  else
+    {
+      gegl_buffer_get (gimp_pickable_get_buffer (GIMP_PICKABLE (image)),
+                       GEGL_RECTANGLE (0, 0, width, height),
+                       MIN (scale_x, scale_y),
+                       gimp_pixbuf_get_format (pixbuf),
+                       gdk_pixbuf_get_pixels (pixbuf),
+                       gdk_pixbuf_get_rowstride (pixbuf),
+                       GEGL_ABYSS_CLAMP);
+    }
+
+  return pixbuf;
+}
diff --git a/app/core/gimpimage-preview.h b/app/core/gimpimage-preview.h
new file mode 100644
index 0000000..f8b22c0
--- /dev/null
+++ b/app/core/gimpimage-preview.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PREVIEW_H__
+#define __GIMP_IMAGE_PREVIEW_H__
+
+
+const Babl  * gimp_image_get_preview_format (GimpImage    *image);
+
+
+/*
+ *  virtual functions of GimpImage -- don't call directly
+ */
+
+void          gimp_image_get_preview_size   (GimpViewable *viewable,
+                                             gint          size,
+                                             gboolean      is_popup,
+                                             gboolean      dot_for_dot,
+                                             gint         *width,
+                                             gint         *height);
+gboolean      gimp_image_get_popup_size     (GimpViewable *viewable,
+                                             gint          width,
+                                             gint          height,
+                                             gboolean      dot_for_dot,
+                                             gint         *popup_width,
+                                             gint         *popup_height);
+GimpTempBuf * gimp_image_get_new_preview    (GimpViewable *viewable,
+                                             GimpContext  *context,
+                                             gint          width,
+                                             gint          height);
+GdkPixbuf   * gimp_image_get_new_pixbuf     (GimpViewable *viewable,
+                                             GimpContext  *context,
+                                             gint          width,
+                                             gint          height);
+
+
+#endif /* __GIMP_IMAGE_PREVIEW_H__ */
diff --git a/app/core/gimpimage-private.h b/app/core/gimpimage-private.h
new file mode 100644
index 0000000..77687f0
--- /dev/null
+++ b/app/core/gimpimage-private.h
@@ -0,0 +1,149 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PRIVATE_H__
+#define __GIMP_IMAGE_PRIVATE_H__
+
+
+typedef struct _GimpImageFlushAccumulator GimpImageFlushAccumulator;
+
+struct _GimpImageFlushAccumulator
+{
+  gboolean alpha_changed;
+  gboolean mask_changed;
+  gboolean floating_selection_changed;
+  gboolean preview_invalidated;
+};
+
+
+struct _GimpImagePrivate
+{
+  gint               ID;                    /*  provides a unique ID         */
+
+  GimpPlugInProcedure *load_proc;           /*  procedure used for loading   */
+  GimpPlugInProcedure *save_proc;           /*  last save procedure used     */
+  GimpPlugInProcedure *export_proc;         /*  last export procedure used   */
+
+  gchar             *display_name;          /*  display basename             */
+  gchar             *display_path;          /*  display full path            */
+  gint               width;                 /*  width in pixels              */
+  gint               height;                /*  height in pixels             */
+  gdouble            xresolution;           /*  image x-res, in dpi          */
+  gdouble            yresolution;           /*  image y-res, in dpi          */
+  GimpUnit           resolution_unit;       /*  resolution unit              */
+  gboolean           resolution_set;        /*  resolution explicitly set    */
+  GimpImageBaseType  base_type;             /*  base gimp_image type         */
+  GimpPrecision      precision;             /*  image's precision            */
+  GimpLayerMode      new_layer_mode;        /*  default mode of new layers   */
+
+  gint               show_all;              /*  render full image content    */
+  GeglRectangle      bounding_box;          /*  image content bounding box   */
+  gint               bounding_box_freeze_count;
+  gboolean           bounding_box_update_pending;
+  GeglBuffer        *pickable_buffer;
+
+  guchar            *colormap;              /*  colormap (for indexed)       */
+  gint               n_colors;              /*  # of colors (for indexed)    */
+  GimpPalette       *palette;               /*  palette of colormap          */
+  const Babl        *babl_palette_rgb;      /*  palette's RGB Babl format    */
+  const Babl        *babl_palette_rgba;     /*  palette's RGBA Babl format   */
+
+  gboolean           is_color_managed;      /*  is this image color managed  */
+  GimpColorProfile  *color_profile;         /*  image's color profile        */
+  gboolean           converting;            /*  color model or profile in middle of conversion?  */
+
+  /*  Cached color transforms: from layer to sRGB u8 and double, and back    */
+  gboolean            color_transforms_created;
+  GimpColorTransform *transform_to_srgb_u8;
+  GimpColorTransform *transform_from_srgb_u8;
+  GimpColorTransform *transform_to_srgb_double;
+  GimpColorTransform *transform_from_srgb_double;
+
+  GimpMetadata      *metadata;              /*  image's metadata             */
+
+  GFile             *file;                  /*  the image's XCF file         */
+  GFile             *imported_file;         /*  the image's source file      */
+  GFile             *exported_file;         /*  the image's export file      */
+  GFile             *save_a_copy_file;      /*  the image's save-a-copy file */
+  GFile             *untitled_file;         /*  a file saying "Untitled"     */
+
+  gboolean           xcf_compression;       /*  XCF compression enabled?     */
+
+  gint               dirty;                 /*  dirty flag -- # of ops       */
+  gint64             dirty_time;            /*  time when image became dirty */
+  gint               export_dirty;          /*  'dirty' but for export       */
+
+  gint               undo_freeze_count;     /*  counts the _freeze's         */
+
+  gint               instance_count;        /*  number of instances          */
+  gint               disp_count;            /*  number of displays           */
+
+  GimpTattoo         tattoo_state;          /*  the last used tattoo         */
+
+  GimpProjection    *projection;            /*  projection layers & channels */
+  GeglNode          *graph;                 /*  GEGL projection graph        */
+  GeglNode          *visible_mask;          /*  component visibility node    */
+
+  GList             *symmetries;            /*  Painting symmetries          */
+  GimpSymmetry      *active_symmetry;       /*  Active symmetry              */
+
+  GList             *guides;                /*  guides                       */
+  GimpGrid          *grid;                  /*  grid                         */
+  GList             *sample_points;         /*  color sample points          */
+
+  /*  Layer/Channel attributes  */
+  GimpItemTree      *layers;                /*  the tree of layers           */
+  GimpItemTree      *channels;              /*  the tree of masks            */
+  GimpItemTree      *vectors;               /*  the tree of vectors          */
+  GSList            *layer_stack;           /*  the layers in MRU order      */
+
+  GQuark             layer_offset_x_handler;
+  GQuark             layer_offset_y_handler;
+  GQuark             layer_bounding_box_handler;
+  GQuark             layer_alpha_handler;
+  GQuark             channel_name_changed_handler;
+  GQuark             channel_color_changed_handler;
+
+  GimpLayer         *floating_sel;          /*  the FS layer                 */
+  GimpChannel       *selection_mask;        /*  the selection mask channel   */
+
+  GimpParasiteList  *parasites;             /*  Plug-in parasite data        */
+
+  gboolean           visible[MAX_CHANNELS]; /*  visible channels             */
+  gboolean           active[MAX_CHANNELS];  /*  active channels              */
+
+  gboolean           quick_mask_state;      /*  TRUE if quick mask is on       */
+  gboolean           quick_mask_inverted;   /*  TRUE if quick mask is inverted */
+  GimpRGB            quick_mask_color;      /*  rgba triplet of the color      */
+
+  /*  Undo apparatus  */
+  GimpUndoStack     *undo_stack;            /*  stack for undo operations    */
+  GimpUndoStack     *redo_stack;            /*  stack for redo operations    */
+  gint               group_count;           /*  nested undo groups           */
+  GimpUndoType       pushing_undo_group;    /*  undo group status flag       */
+
+  /*  Signal emission accumulator  */
+  GimpImageFlushAccumulator  flush_accum;
+};
+
+#define GIMP_IMAGE_GET_PRIVATE(image) (((GimpImage *) (image))->priv)
+
+void   gimp_image_take_mask (GimpImage   *image,
+                             GimpChannel *mask);
+
+
+#endif  /* __GIMP_IMAGE_PRIVATE_H__ */
diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c
new file mode 100644
index 0000000..9473bde
--- /dev/null
+++ b/app/core/gimpimage-quick-mask.c
@@ -0,0 +1,212 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpimage.h"
+#include "gimpimage-private.h"
+#include "gimpimage-quick-mask.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimplayer-floating-selection.h"
+
+#include "gimp-intl.h"
+
+
+#define CHANNEL_WAS_ACTIVE (0x2)
+
+
+/*  public functions  */
+
+void
+gimp_image_set_quick_mask_state (GimpImage *image,
+                                 gboolean   active)
+{
+  GimpImagePrivate *private;
+  GimpChannel      *selection;
+  GimpChannel      *mask;
+  gboolean          channel_was_active;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  if (active == gimp_image_get_quick_mask_state (image))
+    return;
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  Keep track of the state so that we can make the right drawable
+   *  active again when deactiviting quick mask (see bug #134371).
+   */
+  if (private->quick_mask_state)
+    channel_was_active = (private->quick_mask_state & CHANNEL_WAS_ACTIVE) != 0;
+  else
+    channel_was_active = gimp_image_get_active_channel (image) != NULL;
+
+  /*  Set private->quick_mask_state early so we can return early when
+   *  being called recursively.
+   */
+  private->quick_mask_state = (active
+                               ? TRUE | (channel_was_active ?
+                                         CHANNEL_WAS_ACTIVE : 0)
+                               : FALSE);
+
+  selection = gimp_image_get_mask (image);
+  mask      = gimp_image_get_quick_mask (image);
+
+  if (active)
+    {
+      if (! mask)
+        {
+          GimpLayer *floating_sel;
+
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,
+                                       C_("undo-type", "Enable Quick Mask"));
+
+          floating_sel = gimp_image_get_floating_selection (image);
+
+          if (floating_sel)
+            floating_sel_to_layer (floating_sel, NULL);
+
+          mask = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection),
+                                                    GIMP_TYPE_CHANNEL));
+
+          if (! gimp_channel_is_empty (selection))
+            gimp_channel_clear (selection, NULL, TRUE);
+
+          gimp_channel_set_color (mask, &private->quick_mask_color, FALSE);
+          gimp_item_rename (GIMP_ITEM (mask), GIMP_IMAGE_QUICK_MASK_NAME,
+                            NULL);
+
+          if (private->quick_mask_inverted)
+            gimp_channel_invert (mask, FALSE);
+
+          gimp_image_add_channel (image, mask, NULL, 0, TRUE);
+
+          gimp_image_undo_group_end (image);
+        }
+    }
+  else
+    {
+      if (mask)
+        {
+          GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
+
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,
+                                       C_("undo-type", "Disable Quick Mask"));
+
+          if (private->quick_mask_inverted)
+            gimp_channel_invert (mask, TRUE);
+
+          if (floating_sel &&
+              gimp_layer_get_floating_sel_drawable (floating_sel) == GIMP_DRAWABLE (mask))
+            floating_sel_anchor (floating_sel);
+
+          gimp_item_to_selection (GIMP_ITEM (mask),
+                                  GIMP_CHANNEL_OP_REPLACE,
+                                  TRUE, FALSE, 0.0, 0.0);
+          gimp_image_remove_channel (image, mask, TRUE, NULL);
+
+          if (! channel_was_active)
+            gimp_image_unset_active_channel (image);
+
+          gimp_image_undo_group_end (image);
+        }
+    }
+
+  gimp_image_quick_mask_changed (image);
+}
+
+gboolean
+gimp_image_get_quick_mask_state (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->quick_mask_state;
+}
+
+void
+gimp_image_set_quick_mask_color (GimpImage     *image,
+                                 const GimpRGB *color)
+{
+  GimpChannel *quick_mask;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (color != NULL);
+
+  GIMP_IMAGE_GET_PRIVATE (image)->quick_mask_color = *color;
+
+  quick_mask = gimp_image_get_quick_mask (image);
+  if (quick_mask)
+    gimp_channel_set_color (quick_mask, color, TRUE);
+}
+
+void
+gimp_image_get_quick_mask_color (GimpImage *image,
+                                 GimpRGB   *color)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (color != NULL);
+
+  *color = GIMP_IMAGE_GET_PRIVATE (image)->quick_mask_color;
+}
+
+GimpChannel *
+gimp_image_get_quick_mask (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_get_channel_by_name (image, GIMP_IMAGE_QUICK_MASK_NAME);
+}
+
+void
+gimp_image_quick_mask_invert (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->quick_mask_state)
+    {
+      GimpChannel *quick_mask = gimp_image_get_quick_mask (image);
+
+      if (quick_mask)
+        gimp_channel_invert (quick_mask, TRUE);
+    }
+
+  private->quick_mask_inverted = ! private->quick_mask_inverted;
+}
+
+gboolean
+gimp_image_get_quick_mask_inverted (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->quick_mask_inverted;
+}
diff --git a/app/core/gimpimage-quick-mask.h b/app/core/gimpimage-quick-mask.h
new file mode 100644
index 0000000..0eca62e
--- /dev/null
+++ b/app/core/gimpimage-quick-mask.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_QUICK_MASK_H__
+#define __GIMP_IMAGE_QUICK_MASK_H__
+
+
+/*  don't change this string, it's used to identify the Quick Mask
+ *  when opening files.
+ */
+#define GIMP_IMAGE_QUICK_MASK_NAME "Qmask"
+
+
+void          gimp_image_set_quick_mask_state    (GimpImage     *image,
+                                                  gboolean       active);
+gboolean      gimp_image_get_quick_mask_state    (GimpImage     *image);
+
+void          gimp_image_set_quick_mask_color    (GimpImage     *image,
+                                                  const GimpRGB *color);
+void          gimp_image_get_quick_mask_color    (GimpImage     *image,
+                                                  GimpRGB       *color);
+
+GimpChannel * gimp_image_get_quick_mask          (GimpImage     *image);
+
+void          gimp_image_quick_mask_invert       (GimpImage     *image);
+gboolean      gimp_image_get_quick_mask_inverted (GimpImage     *image);
+
+
+#endif /* __GIMP_IMAGE_QUICK_MASK_H__ */
diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c
new file mode 100644
index 0000000..e1c46ca
--- /dev/null
+++ b/app/core/gimpimage-resize.c
@@ -0,0 +1,327 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-item-list.h"
+#include "gimpimage-resize.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+#include "gimpsamplepoint.h"
+
+#include "text/gimptextlayer.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_image_resize (GimpImage    *image,
+                   GimpContext  *context,
+                   gint          new_width,
+                   gint          new_height,
+                   gint          offset_x,
+                   gint          offset_y,
+                   GimpProgress *progress)
+{
+  gimp_image_resize_with_layers (image, context, GIMP_FILL_TRANSPARENT,
+                                 new_width, new_height, offset_x, offset_y,
+                                 GIMP_ITEM_SET_NONE, TRUE,
+                                 progress);
+}
+
+void
+gimp_image_resize_with_layers (GimpImage    *image,
+                               GimpContext  *context,
+                               GimpFillType  fill_type,
+                               gint          new_width,
+                               gint          new_height,
+                               gint          offset_x,
+                               gint          offset_y,
+                               GimpItemSet   layer_set,
+                               gboolean      resize_text_layers,
+                               GimpProgress *progress)
+{
+  GimpObjectQueue *queue;
+  GList           *resize_layers;
+  GList           *list;
+  GimpItem        *item;
+  gint             old_width, old_height;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (new_width > 0 && new_height > 0);
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  gimp_set_busy (image->gimp);
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE,
+                               C_("undo-type", "Resize Image"));
+
+  resize_layers = gimp_image_item_list_get_list (image,
+                                                 GIMP_ITEM_TYPE_LAYERS,
+                                                 layer_set);
+
+  old_width  = gimp_image_get_width  (image);
+  old_height = gimp_image_get_height (image);
+
+  /*  Push the image size to the stack  */
+  gimp_image_undo_push_image_size (image, NULL,
+                                   -offset_x, -offset_y,
+                                   new_width, new_height);
+
+  /*  Set the new width and height  */
+  g_object_set (image,
+                "width",  new_width,
+                "height", new_height,
+                NULL);
+
+  /*  Reposition all layers  */
+  for (list = gimp_image_get_layer_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      gimp_item_translate (item, offset_x, offset_y, TRUE);
+    }
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  for (list = resize_layers; list; list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      /*  group layers can't be resized here  */
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (item)))
+        continue;
+
+      if (! resize_text_layers && gimp_item_is_text_layer (item))
+        continue;
+
+      /* note that we call gimp_item_start_move(), and not
+       * gimp_item_start_transform().  see the comment in gimp_item_resize()
+       * for more information.
+       */
+      gimp_item_start_move (item, TRUE);
+
+      gimp_object_queue_push (queue, item);
+    }
+
+  g_list_free (resize_layers);
+  
+  gimp_object_queue_push (queue, gimp_image_get_mask (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_channels (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_vectors (image));
+
+  /*  Resize all resize_layers, channels (including selection mask), and
+   *  vectors
+   */
+  while ((item = gimp_object_queue_pop (queue)))
+    {
+      if (GIMP_IS_LAYER (item))
+        {
+          gint old_offset_x;
+          gint old_offset_y;
+
+          gimp_item_get_offset (item, &old_offset_x, &old_offset_y);
+
+          gimp_item_resize (item, context, fill_type,
+                            new_width, new_height,
+                            old_offset_x, old_offset_y);
+
+          gimp_item_end_move (item, TRUE);
+        }
+      else
+        {
+          gimp_item_resize (item, context, GIMP_FILL_TRANSPARENT,
+                            new_width, new_height, offset_x, offset_y);
+        }
+    }
+
+  /*  Reposition or remove all guides  */
+  list = gimp_image_get_guides (image);
+
+  while (list)
+    {
+      GimpGuide *guide        = list->data;
+      gboolean   remove_guide = FALSE;
+      gint       new_position = gimp_guide_get_position (guide);
+
+      list = g_list_next (list);
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          new_position += offset_y;
+          if (new_position < 0 || new_position > new_height)
+            remove_guide = TRUE;
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          new_position += offset_x;
+          if (new_position < 0 || new_position > new_width)
+            remove_guide = TRUE;
+          break;
+
+        default:
+          break;
+        }
+
+      if (remove_guide)
+        gimp_image_remove_guide (image, guide, TRUE);
+      else if (new_position != gimp_guide_get_position (guide))
+        gimp_image_move_guide (image, guide, new_position, TRUE);
+    }
+
+  /*  Reposition or remove sample points  */
+  list = gimp_image_get_sample_points (image);
+
+  while (list)
+    {
+      GimpSamplePoint *sample_point        = list->data;
+      gboolean         remove_sample_point = FALSE;
+      gint             old_x;
+      gint             old_y;
+      gint             new_x;
+      gint             new_y;
+
+      list = g_list_next (list);
+
+      gimp_sample_point_get_position (sample_point, &old_x, &old_y);
+
+      new_y = old_y + offset_y;
+      if ((new_y < 0) || (new_y >= new_height))
+        remove_sample_point = TRUE;
+
+      new_x = old_x + offset_x;
+      if ((new_x < 0) || (new_x >= new_width))
+        remove_sample_point = TRUE;
+
+      if (remove_sample_point)
+        gimp_image_remove_sample_point (image, sample_point, TRUE);
+      else if (new_x != old_x || new_y != old_y)
+        gimp_image_move_sample_point (image, sample_point,
+                                      new_x, new_y, TRUE);
+    }
+
+  g_object_unref (queue);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_size_changed_detailed (image,
+                                    offset_x, offset_y,
+                                    old_width, old_height);
+
+  g_object_thaw_notify (G_OBJECT (image));
+
+  gimp_unset_busy (image->gimp);
+}
+
+void
+gimp_image_resize_to_layers (GimpImage    *image,
+                             GimpContext  *context,
+                             gint         *offset_x,
+                             gint         *offset_y,
+                             gint         *new_width,
+                             gint         *new_height,
+                             GimpProgress *progress)
+{
+  GList    *list;
+  GimpItem *item;
+  gint      x, y;
+  gint      width, height;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  list = gimp_image_get_layer_iter (image);
+
+  if (! list)
+    return;
+
+  /* figure out starting values */
+  item = list->data;
+
+  x      = gimp_item_get_offset_x (item);
+  y      = gimp_item_get_offset_y (item);
+  width  = gimp_item_get_width  (item);
+  height = gimp_item_get_height (item);
+
+  /*  Respect all layers  */
+  for (list = g_list_next (list); list; list = g_list_next (list))
+    {
+      item = list->data;
+
+      gimp_rectangle_union (x, y,
+                            width, height,
+                            gimp_item_get_offset_x (item),
+                            gimp_item_get_offset_y (item),
+                            gimp_item_get_width  (item),
+                            gimp_item_get_height (item),
+                            &x, &y,
+                            &width, &height);
+    }
+
+  gimp_image_resize (image, context,
+                     width, height, -x, -y,
+                     progress);
+  if (offset_x)
+    *offset_x = -x;
+  if (offset_y)
+    *offset_y = -y;
+  if (new_width)
+    *new_width = width;
+  if (new_height)
+    *new_height = height;
+}
+
+void
+gimp_image_resize_to_selection (GimpImage    *image,
+                                GimpContext  *context,
+                                GimpProgress *progress)
+{
+  GimpChannel *selection = gimp_image_get_mask (image);
+  gint         x, y, w, h;
+
+  if (gimp_item_bounds (GIMP_ITEM (selection), &x, &y, &w, &h))
+    {
+      gimp_image_resize (image, context,
+                         w, h, -x, -y,
+                         progress);
+    }
+}
diff --git a/app/core/gimpimage-resize.h b/app/core/gimpimage-resize.h
new file mode 100644
index 0000000..edcc64c
--- /dev/null
+++ b/app/core/gimpimage-resize.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_RESIZE_H__
+#define __GIMP_IMAGE_RESIZE_H__
+
+
+void   gimp_image_resize              (GimpImage    *image,
+                                       GimpContext  *context,
+                                       gint          new_width,
+                                       gint          new_height,
+                                       gint          offset_x,
+                                       gint          offset_y,
+                                       GimpProgress *progress);
+
+void   gimp_image_resize_with_layers  (GimpImage    *image,
+                                       GimpContext  *context,
+                                       GimpFillType  fill_type,
+                                       gint          new_width,
+                                       gint          new_height,
+                                       gint          offset_x,
+                                       gint          offset_y,
+                                       GimpItemSet   layer_set,
+                                       gboolean      resize_text_layers,
+                                       GimpProgress *progress);
+
+void   gimp_image_resize_to_layers    (GimpImage    *image,
+                                       GimpContext  *context,
+                                       gint         *offset_x,
+                                       gint         *offset_y,
+                                       gint         *new_width,
+                                       gint         *new_height,
+                                       GimpProgress *progress);
+void   gimp_image_resize_to_selection (GimpImage    *image,
+                                       GimpContext  *context,
+                                       GimpProgress *progress);
+
+
+#endif /* __GIMP_IMAGE_RESIZE_H__ */
diff --git a/app/core/gimpimage-rotate.c b/app/core/gimpimage-rotate.c
new file mode 100644
index 0000000..682319f
--- /dev/null
+++ b/app/core/gimpimage-rotate.c
@@ -0,0 +1,377 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-rotate.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitem.h"
+#include "gimplayer.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+#include "gimpsamplepoint.h"
+
+
+static void  gimp_image_rotate_item_offset   (GimpImage        *image,
+                                              GimpRotationType  rotate_type,
+                                              GimpItem         *item,
+                                              gint              off_x,
+                                              gint              off_y);
+static void  gimp_image_rotate_guides        (GimpImage        *image,
+                                              GimpRotationType  rotate_type);
+static void  gimp_image_rotate_sample_points (GimpImage        *image,
+                                              GimpRotationType  rotate_type);
+
+
+void
+gimp_image_rotate (GimpImage        *image,
+                   GimpContext      *context,
+                   GimpRotationType  rotate_type,
+                   GimpProgress     *progress)
+{
+  GimpObjectQueue *queue;
+  GimpItem        *item;
+  GList           *list;
+  gdouble          center_x;
+  gdouble          center_y;
+  gint             new_image_width;
+  gint             new_image_height;
+  gint             previous_image_width;
+  gint             previous_image_height;
+  gint             offset_x;
+  gint             offset_y;
+  gboolean         size_changed;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  previous_image_width  = gimp_image_get_width  (image);
+  previous_image_height = gimp_image_get_height (image);
+
+  center_x              = previous_image_width  / 2.0;
+  center_y              = previous_image_height / 2.0;
+
+  /*  Resize the image (if needed)  */
+  switch (rotate_type)
+    {
+    case GIMP_ROTATE_90:
+    case GIMP_ROTATE_270:
+      new_image_width  = gimp_image_get_height (image);
+      new_image_height = gimp_image_get_width  (image);
+      size_changed     = TRUE;
+      offset_x         = (gimp_image_get_width  (image) - new_image_width)  / 2;
+      offset_y         = (gimp_image_get_height (image) - new_image_height) / 2;
+      break;
+
+    case GIMP_ROTATE_180:
+      new_image_width  = gimp_image_get_width  (image);
+      new_image_height = gimp_image_get_height (image);
+      size_changed     = FALSE;
+      offset_x         = 0;
+      offset_y         = 0;
+      break;
+
+    default:
+      g_return_if_reached ();
+      return;
+    }
+
+  gimp_set_busy (image->gimp);
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  gimp_object_queue_push_container (queue, gimp_image_get_layers (image));
+  gimp_object_queue_push (queue, gimp_image_get_mask (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_channels (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_vectors (image));
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ROTATE, NULL);
+
+  /*  Rotate all layers, channels (including selection mask), and vectors  */
+  while ((item = gimp_object_queue_pop (queue)))
+    {
+      gint off_x;
+      gint off_y;
+
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      gimp_item_rotate (item, context, rotate_type, center_x, center_y, FALSE);
+
+      if (GIMP_IS_LAYER (item))
+        {
+          gimp_image_rotate_item_offset (image, rotate_type, item, off_x, off_y);
+        }
+      else
+        {
+          gimp_item_set_offset (item, 0, 0);
+
+          if (GIMP_IS_VECTORS (item))
+            {
+              gimp_item_set_size (item, new_image_width, new_image_height);
+
+              gimp_item_translate (item,
+                                   (new_image_width  - gimp_image_get_width  (image)) / 2,
+                                   (new_image_height - gimp_image_get_height (image)) / 2,
+                                   FALSE);
+            }
+        }
+
+      gimp_progress_set_value (progress, 1.0);
+    }
+
+  /*  Rotate all Guides  */
+  gimp_image_rotate_guides (image, rotate_type);
+
+  /*  Rotate all sample points  */
+  gimp_image_rotate_sample_points (image, rotate_type);
+
+  /*  Resize the image (if needed)  */
+  if (size_changed)
+    {
+      gdouble xres;
+      gdouble yres;
+
+      gimp_image_undo_push_image_size (image,
+                                       NULL,
+                                       offset_x,
+                                       offset_y,
+                                       new_image_width,
+                                       new_image_height);
+
+      g_object_set (image,
+                    "width",  new_image_width,
+                    "height", new_image_height,
+                    NULL);
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      if (xres != yres)
+        gimp_image_set_resolution (image, yres, xres);
+    }
+
+  /*  Notify guide movements  */
+  for (list = gimp_image_get_guides (image);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_image_guide_moved (image, list->data);
+    }
+
+  /*  Notify sample point movements  */
+  for (list = gimp_image_get_sample_points (image);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_image_sample_point_moved (image, list->data);
+    }
+
+  gimp_image_undo_group_end (image);
+
+  g_object_unref (queue);
+
+  if (size_changed)
+    gimp_image_size_changed_detailed (image,
+                                      -offset_x,
+                                      -offset_y,
+                                      previous_image_width,
+                                      previous_image_height);
+
+  g_object_thaw_notify (G_OBJECT (image));
+
+  gimp_unset_busy (image->gimp);
+}
+
+
+static void
+gimp_image_rotate_item_offset (GimpImage        *image,
+                               GimpRotationType  rotate_type,
+                               GimpItem         *item,
+                               gint              off_x,
+                               gint              off_y)
+{
+  gint x = 0;
+  gint y = 0;
+
+  switch (rotate_type)
+    {
+    case GIMP_ROTATE_90:
+      x = gimp_image_get_height (image) - off_y - gimp_item_get_width (item);
+      y = off_x;
+      break;
+
+    case GIMP_ROTATE_270:
+      x = off_y;
+      y = gimp_image_get_width (image) - off_x - gimp_item_get_height (item);
+      break;
+
+    case GIMP_ROTATE_180:
+      return;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  x -= off_x;
+  y -= off_y;
+
+  if (x || y)
+    gimp_item_translate (item, x, y, FALSE);
+}
+
+static void
+gimp_image_rotate_guides (GimpImage        *image,
+                          GimpRotationType  rotate_type)
+{
+  GList *list;
+
+  /*  Rotate all Guides  */
+  for (list = gimp_image_get_guides (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpGuide           *guide       = list->data;
+      GimpOrientationType  orientation = gimp_guide_get_orientation (guide);
+      gint                 position    = gimp_guide_get_position (guide);
+
+      switch (rotate_type)
+        {
+        case GIMP_ROTATE_90:
+          switch (orientation)
+            {
+            case GIMP_ORIENTATION_HORIZONTAL:
+              gimp_image_undo_push_guide (image, NULL, guide);
+              gimp_guide_set_orientation (guide, GIMP_ORIENTATION_VERTICAL);
+              gimp_guide_set_position (guide,
+                                       gimp_image_get_height (image) - position);
+              break;
+
+            case GIMP_ORIENTATION_VERTICAL:
+              gimp_image_undo_push_guide (image, NULL, guide);
+              gimp_guide_set_orientation (guide, GIMP_ORIENTATION_HORIZONTAL);
+              break;
+
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_ROTATE_180:
+          switch (orientation)
+            {
+            case GIMP_ORIENTATION_HORIZONTAL:
+              gimp_image_move_guide (image, guide,
+                                     gimp_image_get_height (image) - position,
+                                     TRUE);
+              break;
+
+            case GIMP_ORIENTATION_VERTICAL:
+              gimp_image_move_guide (image, guide,
+                                     gimp_image_get_width (image) - position,
+                                     TRUE);
+              break;
+
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_ROTATE_270:
+          switch (orientation)
+            {
+            case GIMP_ORIENTATION_HORIZONTAL:
+              gimp_image_undo_push_guide (image, NULL, guide);
+              gimp_guide_set_orientation (guide, GIMP_ORIENTATION_VERTICAL);
+              break;
+
+            case GIMP_ORIENTATION_VERTICAL:
+              gimp_image_undo_push_guide (image, NULL, guide);
+              gimp_guide_set_orientation (guide, GIMP_ORIENTATION_HORIZONTAL);
+              gimp_guide_set_position (guide,
+                                       gimp_image_get_width (image) - position);
+              break;
+
+            default:
+              break;
+            }
+          break;
+        }
+    }
+}
+
+
+static void
+gimp_image_rotate_sample_points (GimpImage        *image,
+                                 GimpRotationType  rotate_type)
+{
+  GList *list;
+
+  /*  Rotate all sample points  */
+  for (list = gimp_image_get_sample_points (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpSamplePoint *sample_point = list->data;
+      gint             old_x;
+      gint             old_y;
+
+      gimp_image_undo_push_sample_point (image, NULL, sample_point);
+
+      gimp_sample_point_get_position (sample_point, &old_x, &old_y);
+
+      switch (rotate_type)
+        {
+        case GIMP_ROTATE_90:
+          gimp_sample_point_set_position (sample_point,
+                                          gimp_image_get_height (image) - old_y,
+                                          old_x);
+          break;
+
+        case GIMP_ROTATE_180:
+          gimp_sample_point_set_position (sample_point,
+                                          gimp_image_get_width  (image) - old_x,
+                                          gimp_image_get_height (image) - old_y);
+          break;
+
+        case GIMP_ROTATE_270:
+          gimp_sample_point_set_position (sample_point,
+                                          old_y,
+                                          gimp_image_get_width (image) - old_x);
+          break;
+        }
+    }
+}
diff --git a/app/core/gimpimage-rotate.h b/app/core/gimpimage-rotate.h
new file mode 100644
index 0000000..cad0de8
--- /dev/null
+++ b/app/core/gimpimage-rotate.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_ROTATE_H__
+#define __GIMP_IMAGE_ROTATE_H__
+
+
+void   gimp_image_rotate (GimpImage        *image,
+                          GimpContext      *context,
+                          GimpRotationType  rotate_type,
+                          GimpProgress     *progress);
+
+
+#endif /* __GIMP_IMAGE_ROTATE_H__ */
diff --git a/app/core/gimpimage-sample-points.c b/app/core/gimpimage-sample-points.c
new file mode 100644
index 0000000..24fc66f
--- /dev/null
+++ b/app/core/gimpimage-sample-points.c
@@ -0,0 +1,213 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpimage.h"
+#include "gimpimage-private.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-undo-push.h"
+#include "gimpsamplepoint.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GimpSamplePoint *
+gimp_image_add_sample_point_at_pos (GimpImage *image,
+                                    gint       x,
+                                    gint       y,
+                                    gboolean   push_undo)
+{
+  GimpSamplePoint *sample_point;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (x >= 0 && x < gimp_image_get_width  (image), NULL);
+  g_return_val_if_fail (y >= 0 && y < gimp_image_get_height (image), NULL);
+
+  sample_point = gimp_sample_point_new (image->gimp->next_sample_point_ID++);
+
+  if (push_undo)
+    gimp_image_undo_push_sample_point (image, C_("undo-type", "Add Sample Point"),
+                                       sample_point);
+
+  gimp_image_add_sample_point (image, sample_point, x, y);
+  g_object_unref (sample_point);
+
+  return sample_point;
+}
+
+void
+gimp_image_add_sample_point (GimpImage       *image,
+                             GimpSamplePoint *sample_point,
+                             gint             x,
+                             gint             y)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->sample_points = g_list_append (private->sample_points, sample_point);
+
+  gimp_sample_point_set_position (sample_point, x, y);
+  g_object_ref (sample_point);
+
+  gimp_image_sample_point_added (image, sample_point);
+}
+
+void
+gimp_image_remove_sample_point (GimpImage       *image,
+                                GimpSamplePoint *sample_point,
+                                gboolean         push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (push_undo)
+    gimp_image_undo_push_sample_point (image,
+                                       C_("undo-type", "Remove Sample Point"),
+                                       sample_point);
+
+  private->sample_points = g_list_remove (private->sample_points, sample_point);
+  gimp_aux_item_removed (GIMP_AUX_ITEM (sample_point));
+
+  gimp_image_sample_point_removed (image, sample_point);
+
+  gimp_sample_point_set_position (sample_point,
+                                  GIMP_SAMPLE_POINT_POSITION_UNDEFINED,
+                                  GIMP_SAMPLE_POINT_POSITION_UNDEFINED);
+  g_object_unref (sample_point);
+}
+
+void
+gimp_image_move_sample_point (GimpImage       *image,
+                              GimpSamplePoint *sample_point,
+                              gint             x,
+                              gint             y,
+                              gboolean         push_undo)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+  g_return_if_fail (x >= 0);
+  g_return_if_fail (y >= 0);
+  g_return_if_fail (x < gimp_image_get_width  (image));
+  g_return_if_fail (y < gimp_image_get_height (image));
+
+  if (push_undo)
+    gimp_image_undo_push_sample_point (image,
+                                       C_("undo-type", "Move Sample Point"),
+                                       sample_point);
+
+  gimp_sample_point_set_position (sample_point, x, y);
+
+  gimp_image_sample_point_moved (image, sample_point);
+}
+
+void
+gimp_image_set_sample_point_pick_mode (GimpImage         *image,
+                                       GimpSamplePoint   *sample_point,
+                                       GimpColorPickMode  pick_mode,
+                                       gboolean           push_undo)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  if (push_undo)
+    gimp_image_undo_push_sample_point (image,
+                                       C_("undo-type",
+                                          "Set Sample Point Pick Mode"),
+                                       sample_point);
+
+  gimp_sample_point_set_pick_mode (sample_point, pick_mode);
+
+  /* well... */
+  gimp_image_sample_point_moved (image, sample_point);
+}
+
+GList *
+gimp_image_get_sample_points (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->sample_points;
+}
+
+GimpSamplePoint *
+gimp_image_get_sample_point (GimpImage *image,
+                             guint32    id)
+{
+  GList *sample_points;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  for (sample_points = GIMP_IMAGE_GET_PRIVATE (image)->sample_points;
+       sample_points;
+       sample_points = g_list_next (sample_points))
+    {
+      GimpSamplePoint *sample_point = sample_points->data;
+
+      if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (sample_point)) == id)
+        return sample_point;
+    }
+
+  return NULL;
+}
+
+GimpSamplePoint *
+gimp_image_get_next_sample_point (GimpImage *image,
+                                  guint32    id,
+                                  gboolean  *sample_point_found)
+{
+  GList *sample_points;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (sample_point_found != NULL, NULL);
+
+  if (id == 0)
+    *sample_point_found = TRUE;
+  else
+    *sample_point_found = FALSE;
+
+  for (sample_points = GIMP_IMAGE_GET_PRIVATE (image)->sample_points;
+       sample_points;
+       sample_points = g_list_next (sample_points))
+    {
+      GimpSamplePoint *sample_point = sample_points->data;
+
+      if (*sample_point_found) /* this is the first guide after the found one */
+        return sample_point;
+
+      if (gimp_aux_item_get_ID (GIMP_AUX_ITEM (sample_point)) == id) /* found it, next one will be returned */
+        *sample_point_found = TRUE;
+    }
+
+  return NULL;
+}
diff --git a/app/core/gimpimage-sample-points.h b/app/core/gimpimage-sample-points.h
new file mode 100644
index 0000000..c84a02b
--- /dev/null
+++ b/app/core/gimpimage-sample-points.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_SAMPLE_POINTS_H__
+#define __GIMP_IMAGE_SAMPLE_POINTS_H__
+
+
+/*  public sample point adding API
+ */
+GimpSamplePoint * gimp_image_add_sample_point_at_pos (GimpImage        *image,
+                                                      gint              x,
+                                                      gint              y,
+                                                      gboolean          push_undo);
+
+/*  internal sample point adding API, does not check the sample
+ *  point's position and is publicly declared only to be used from
+ *  undo
+ */
+void              gimp_image_add_sample_point        (GimpImage       *image,
+                                                      GimpSamplePoint *sample_point,
+                                                      gint             x,
+                                                      gint             y);
+
+void              gimp_image_remove_sample_point     (GimpImage       *image,
+                                                      GimpSamplePoint *sample_point,
+                                                      gboolean         push_undo);
+void              gimp_image_move_sample_point       (GimpImage       *image,
+                                                      GimpSamplePoint *sample_point,
+                                                      gint             x,
+                                                      gint             y,
+                                                      gboolean         push_undo);
+void              gimp_image_set_sample_point_pick_mode
+                                                     (GimpImage       *image,
+                                                      GimpSamplePoint *sample_point,
+                                                      GimpColorPickMode pick_mode,
+                                                      gboolean         push_undo);
+
+GList           * gimp_image_get_sample_points       (GimpImage       *image);
+GimpSamplePoint * gimp_image_get_sample_point        (GimpImage       *image,
+                                                      guint32          id);
+GimpSamplePoint * gimp_image_get_next_sample_point   (GimpImage       *image,
+                                                      guint32          id,
+                                                      gboolean        *sample_point_found);
+
+
+#endif /* __GIMP_IMAGE_SAMPLE_POINTS_H__ */
diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c
new file mode 100644
index 0000000..04ae6fb
--- /dev/null
+++ b/app/core/gimpimage-scale.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpcontainer.h"
+#include "gimpguide.h"
+#include "gimpgrouplayer.h"
+#include "gimpimage.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-scale.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+#include "gimpprojection.h"
+#include "gimpsamplepoint.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+void
+gimp_image_scale (GimpImage             *image,
+                  gint                   new_width,
+                  gint                   new_height,
+                  GimpInterpolationType  interpolation_type,
+                  GimpProgress          *progress)
+{
+  GimpObjectQueue *queue;
+  GimpItem        *item;
+  GList           *list;
+  gint             old_width;
+  gint             old_height;
+  gint             offset_x;
+  gint             offset_y;
+  gdouble          img_scale_w = 1.0;
+  gdouble          img_scale_h = 1.0;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (new_width > 0 && new_height > 0);
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  gimp_set_busy (image->gimp);
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  gimp_object_queue_push_container (queue, gimp_image_get_layers (image));
+  gimp_object_queue_push (queue, gimp_image_get_mask (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_channels (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_vectors (image));
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE,
+                               C_("undo-type", "Scale Image"));
+
+  old_width   = gimp_image_get_width  (image);
+  old_height  = gimp_image_get_height (image);
+  img_scale_w = (gdouble) new_width  / (gdouble) old_width;
+  img_scale_h = (gdouble) new_height / (gdouble) old_height;
+
+  offset_x = (old_width  - new_width)  / 2;
+  offset_y = (old_height - new_height) / 2;
+
+  /*  Push the image size to the stack  */
+  gimp_image_undo_push_image_size (image,
+                                   NULL,
+                                   offset_x,
+                                   offset_y,
+                                   new_width,
+                                   new_height);
+
+  /*  Set the new width and height early, so below image item setters
+   *  (esp. guides and sample points) don't choke about moving stuff
+   *  out of the image
+   */
+  g_object_set (image,
+                "width",  new_width,
+                "height", new_height,
+                NULL);
+
+  /*  Scale all layers, channels (including selection mask), and vectors  */
+  while ((item = gimp_object_queue_pop (queue)))
+    {
+      if (! gimp_item_scale_by_factors (item,
+                                        img_scale_w, img_scale_h,
+                                        interpolation_type, progress))
+        {
+          /* Since 0 < img_scale_w, img_scale_h, failure due to one or more
+           * vanishing scaled layer dimensions. Implicit delete implemented
+           * here. Upstream warning implemented in resize_check_layer_scaling(),
+           * which offers the user the chance to bail out.
+           */
+          g_return_if_fail (GIMP_IS_LAYER (item));
+          gimp_image_remove_layer (image, GIMP_LAYER (item), TRUE, NULL);
+        }
+    }
+
+  /*  Scale all Guides  */
+  for (list = gimp_image_get_guides (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpGuide *guide    = list->data;
+      gint       position = gimp_guide_get_position (guide);
+
+      switch (gimp_guide_get_orientation (guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          gimp_image_move_guide (image, guide,
+                                 (position * new_height) / old_height,
+                                 TRUE);
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          gimp_image_move_guide (image, guide,
+                                 (position * new_width) / old_width,
+                                 TRUE);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  /*  Scale all sample points  */
+  for (list = gimp_image_get_sample_points (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpSamplePoint *sample_point = list->data;
+      gint             x;
+      gint             y;
+
+      gimp_sample_point_get_position (sample_point, &x, &y);
+
+      gimp_image_move_sample_point (image, sample_point,
+                                    x * new_width  / old_width,
+                                    y * new_height / old_height,
+                                    TRUE);
+    }
+
+  gimp_image_undo_group_end (image);
+
+  g_object_unref (queue);
+
+  gimp_image_size_changed_detailed (image,
+                                    -offset_x,
+                                    -offset_y,
+                                    old_width,
+                                    old_height);
+
+  g_object_thaw_notify (G_OBJECT (image));
+
+  gimp_unset_busy (image->gimp);
+}
+
+/**
+ * gimp_image_scale_check:
+ * @image:      A #GimpImage.
+ * @new_width:   The new width.
+ * @new_height:  The new height.
+ * @max_memsize: The maximum new memory size.
+ * @new_memsize: The new memory size.
+ *
+ * Inventory the layer list in image and check that it may be
+ * scaled to @new_height and @new_width without problems.
+ *
+ * Return value: #GIMP_IMAGE_SCALE_OK if scaling the image will shrink none
+ *               of its layers completely away, and the new image size
+ *               is smaller than @max_memsize.
+ *               #GIMP_IMAGE_SCALE_TOO_SMALL if scaling would remove some
+ *               existing layers.
+ *               #GIMP_IMAGE_SCALE_TOO_BIG if the new image size would
+ *               exceed the maximum specified in the preferences.
+ **/
+GimpImageScaleCheckType
+gimp_image_scale_check (GimpImage *image,
+                        gint       new_width,
+                        gint       new_height,
+                        gint64     max_memsize,
+                        gint64    *new_memsize)
+{
+  GList  *all_layers;
+  GList  *list;
+  gint64  current_size;
+  gint64  undo_size;
+  gint64  redo_size;
+  gint64  new_size;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_IMAGE_SCALE_TOO_SMALL);
+  g_return_val_if_fail (new_memsize != NULL, GIMP_IMAGE_SCALE_TOO_SMALL);
+
+  current_size = gimp_object_get_memsize (GIMP_OBJECT (image), NULL);
+
+  new_size = gimp_image_estimate_memsize (image,
+                                          gimp_image_get_component_type (image),
+                                          new_width, new_height);
+
+  undo_size = gimp_object_get_memsize (GIMP_OBJECT (gimp_image_get_undo_stack (image)), NULL);
+  redo_size = gimp_object_get_memsize (GIMP_OBJECT (gimp_image_get_redo_stack (image)), NULL);
+
+  current_size -= undo_size + redo_size;
+  new_size     -= undo_size + redo_size;
+
+  GIMP_LOG (IMAGE_SCALE,
+            "old_size = %"G_GINT64_FORMAT"  new_size = %"G_GINT64_FORMAT,
+            current_size, new_size);
+
+  *new_memsize = new_size;
+
+  if (new_size > current_size && new_size > max_memsize)
+    return GIMP_IMAGE_SCALE_TOO_BIG;
+
+  all_layers = gimp_image_get_layer_list (image);
+
+  for (list = all_layers; list; list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      /*  group layers are updated automatically  */
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (item)))
+        continue;
+
+      if (! gimp_item_check_scaling (item, new_width, new_height))
+        {
+          g_list_free (all_layers);
+
+          return GIMP_IMAGE_SCALE_TOO_SMALL;
+        }
+    }
+
+  g_list_free (all_layers);
+
+  return GIMP_IMAGE_SCALE_OK;
+}
diff --git a/app/core/gimpimage-scale.h b/app/core/gimpimage-scale.h
new file mode 100644
index 0000000..1073e38
--- /dev/null
+++ b/app/core/gimpimage-scale.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_SCALE_H__
+#define __GIMP_IMAGE_SCALE_H__
+
+
+void   gimp_image_scale         (GimpImage             *image,
+                                 gint                   new_width,
+                                 gint                   new_height,
+                                 GimpInterpolationType  interpolation_type,
+                                 GimpProgress          *progress);
+
+GimpImageScaleCheckType
+       gimp_image_scale_check   (GimpImage             *image,
+                                 gint                   new_width,
+                                 gint                   new_height,
+                                 gint64                 max_memsize,
+                                 gint64                *new_memsize);
+
+
+#endif /* __GIMP_IMAGE_SCALE_H__ */
diff --git a/app/core/gimpimage-snap.c b/app/core/gimpimage-snap.c
new file mode 100644
index 0000000..e35b646
--- /dev/null
+++ b/app/core/gimpimage-snap.c
@@ -0,0 +1,719 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpgrid.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-grid.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-snap.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean  gimp_image_snap_distance (const gdouble  unsnapped,
+                                           const gdouble  nearest,
+                                           const gdouble  epsilon,
+                                           gdouble       *mindist,
+                                           gdouble       *target);
+
+
+
+/*  public functions  */
+
+gboolean
+gimp_image_snap_x (GimpImage *image,
+                   gdouble    x,
+                   gdouble   *tx,
+                   gdouble    epsilon_x,
+                   gboolean   snap_to_guides,
+                   gboolean   snap_to_grid,
+                   gboolean   snap_to_canvas)
+{
+  gdouble   mindist = G_MAXDOUBLE;
+  gboolean  snapped = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (tx != NULL, FALSE);
+
+  *tx = x;
+
+  if (! gimp_image_get_guides (image)) snap_to_guides = FALSE;
+  if (! gimp_image_get_grid (image))   snap_to_grid   = FALSE;
+
+  if (! (snap_to_guides || snap_to_grid || snap_to_canvas))
+    return FALSE;
+
+  if (x < -epsilon_x || x >= (gimp_image_get_width (image) + epsilon_x))
+    return FALSE;
+
+  if (snap_to_guides)
+    {
+      GList *list;
+
+      for (list = gimp_image_get_guides (image); list; list = g_list_next (list))
+        {
+          GimpGuide *guide    = list->data;
+          gint       position = gimp_guide_get_position (guide);
+
+          if (gimp_guide_is_custom (guide))
+            continue;
+
+          if (gimp_guide_get_orientation (guide) == GIMP_ORIENTATION_VERTICAL)
+            {
+              snapped |= gimp_image_snap_distance (x, position,
+                                                   epsilon_x,
+                                                   &mindist, tx);
+            }
+        }
+    }
+
+  if (snap_to_grid)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+      gdouble   xspacing;
+      gdouble   xoffset;
+
+      gimp_grid_get_spacing (grid, &xspacing, NULL);
+      gimp_grid_get_offset  (grid, &xoffset,  NULL);
+
+      if (xspacing > 0.0)
+        {
+          gdouble nearest;
+
+          nearest = xoffset + RINT ((x - xoffset) / xspacing) * xspacing;
+
+          snapped |= gimp_image_snap_distance (x, nearest,
+                                               epsilon_x,
+                                               &mindist, tx);
+        }
+    }
+
+  if (snap_to_canvas)
+    {
+      snapped |= gimp_image_snap_distance (x, 0,
+                                           epsilon_x,
+                                           &mindist, tx);
+      snapped |= gimp_image_snap_distance (x, gimp_image_get_width (image),
+                                           epsilon_x,
+                                           &mindist, tx);
+    }
+
+  return snapped;
+}
+
+gboolean
+gimp_image_snap_y (GimpImage *image,
+                   gdouble    y,
+                   gdouble   *ty,
+                   gdouble    epsilon_y,
+                   gboolean   snap_to_guides,
+                   gboolean   snap_to_grid,
+                   gboolean   snap_to_canvas)
+{
+  gdouble    mindist = G_MAXDOUBLE;
+  gboolean   snapped = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (ty != NULL, FALSE);
+
+  *ty = y;
+
+  if (! gimp_image_get_guides (image)) snap_to_guides = FALSE;
+  if (! gimp_image_get_grid (image))   snap_to_grid   = FALSE;
+
+  if (! (snap_to_guides || snap_to_grid || snap_to_canvas))
+    return FALSE;
+
+  if (y < -epsilon_y || y >= (gimp_image_get_height (image) + epsilon_y))
+    return FALSE;
+
+  if (snap_to_guides)
+    {
+      GList *list;
+
+      for (list = gimp_image_get_guides (image); list; list = g_list_next (list))
+        {
+          GimpGuide *guide    = list->data;
+          gint       position = gimp_guide_get_position (guide);
+
+          if (gimp_guide_is_custom (guide))
+            continue;
+
+          if (gimp_guide_get_orientation (guide) == GIMP_ORIENTATION_HORIZONTAL)
+            {
+              snapped |= gimp_image_snap_distance (y, position,
+                                                   epsilon_y,
+                                                   &mindist, ty);
+            }
+        }
+    }
+
+  if (snap_to_grid)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+      gdouble   yspacing;
+      gdouble   yoffset;
+
+      gimp_grid_get_spacing (grid, NULL, &yspacing);
+      gimp_grid_get_offset  (grid, NULL, &yoffset);
+
+      if (yspacing > 0.0)
+        {
+          gdouble nearest;
+
+          nearest = yoffset + RINT ((y - yoffset) / yspacing) * yspacing;
+
+          snapped |= gimp_image_snap_distance (y, nearest,
+                                               epsilon_y,
+                                               &mindist, ty);
+        }
+    }
+
+  if (snap_to_canvas)
+    {
+      snapped |= gimp_image_snap_distance (y, 0,
+                                           epsilon_y,
+                                           &mindist, ty);
+      snapped |= gimp_image_snap_distance (y, gimp_image_get_height (image),
+                                           epsilon_y,
+                                           &mindist, ty);
+    }
+
+  return snapped;
+}
+
+gboolean
+gimp_image_snap_point (GimpImage *image,
+                       gdouble    x,
+                       gdouble    y,
+                       gdouble   *tx,
+                       gdouble   *ty,
+                       gdouble    epsilon_x,
+                       gdouble    epsilon_y,
+                       gboolean   snap_to_guides,
+                       gboolean   snap_to_grid,
+                       gboolean   snap_to_canvas,
+                       gboolean   snap_to_vectors,
+                       gboolean   show_all)
+{
+  gdouble  mindist_x = G_MAXDOUBLE;
+  gdouble  mindist_y = G_MAXDOUBLE;
+  gboolean snapped   = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (tx != NULL, FALSE);
+  g_return_val_if_fail (ty != NULL, FALSE);
+
+  *tx = x;
+  *ty = y;
+
+  if (! gimp_image_get_guides (image))         snap_to_guides  = FALSE;
+  if (! gimp_image_get_grid (image))           snap_to_grid    = FALSE;
+  if (! gimp_image_get_active_vectors (image)) snap_to_vectors = FALSE;
+
+  if (! (snap_to_guides || snap_to_grid || snap_to_canvas || snap_to_vectors))
+    return FALSE;
+
+  if (! show_all &&
+      (x < -epsilon_x || x >= (gimp_image_get_width  (image) + epsilon_x) ||
+       y < -epsilon_y || y >= (gimp_image_get_height (image) + epsilon_y)))
+    {
+      /* Off-canvas grid is invisible unless "show all" option is
+       * enabled. So let's not snap to the invisible grid.
+       */
+      snap_to_grid   = FALSE;
+      snap_to_canvas = FALSE;
+    }
+
+  if (snap_to_guides)
+    {
+      GList *list;
+
+      for (list = gimp_image_get_guides (image); list; list = g_list_next (list))
+        {
+          GimpGuide *guide    = list->data;
+          gint       position = gimp_guide_get_position (guide);
+
+          if (gimp_guide_is_custom (guide))
+            continue;
+
+          switch (gimp_guide_get_orientation (guide))
+            {
+            case GIMP_ORIENTATION_HORIZONTAL:
+              snapped |= gimp_image_snap_distance (y, position,
+                                                   epsilon_y,
+                                                   &mindist_y, ty);
+              break;
+
+            case GIMP_ORIENTATION_VERTICAL:
+              snapped |= gimp_image_snap_distance (x, position,
+                                                   epsilon_x,
+                                                   &mindist_x, tx);
+              break;
+
+            default:
+              break;
+            }
+        }
+    }
+
+  if (snap_to_grid)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+      gdouble   xspacing, yspacing;
+      gdouble   xoffset, yoffset;
+
+      gimp_grid_get_spacing (grid, &xspacing, &yspacing);
+      gimp_grid_get_offset  (grid, &xoffset,  &yoffset);
+
+      if (xspacing > 0.0)
+        {
+          gdouble nearest;
+
+          nearest = xoffset + RINT ((x - xoffset) / xspacing) * xspacing;
+
+          snapped |= gimp_image_snap_distance (x, nearest,
+                                               epsilon_x,
+                                               &mindist_x, tx);
+        }
+
+      if (yspacing > 0.0)
+        {
+          gdouble nearest;
+
+          nearest = yoffset + RINT ((y - yoffset) / yspacing) * yspacing;
+
+          snapped |= gimp_image_snap_distance (y, nearest,
+                                               epsilon_y,
+                                               &mindist_y, ty);
+        }
+    }
+
+  if (snap_to_canvas)
+    {
+      snapped |= gimp_image_snap_distance (x, 0,
+                                           epsilon_x,
+                                           &mindist_x, tx);
+      snapped |= gimp_image_snap_distance (x, gimp_image_get_width (image),
+                                           epsilon_x,
+                                           &mindist_x, tx);
+
+      snapped |= gimp_image_snap_distance (y, 0,
+                                           epsilon_y,
+                                           &mindist_y, ty);
+      snapped |= gimp_image_snap_distance (y, gimp_image_get_height (image),
+                                           epsilon_y,
+                                           &mindist_y, ty);
+    }
+
+  if (snap_to_vectors)
+    {
+      GimpVectors *vectors = gimp_image_get_active_vectors (image);
+      GimpStroke  *stroke  = NULL;
+      GimpCoords   coords  = { 0, 0, 0, 0, 0 };
+
+      coords.x = x;
+      coords.y = y;
+
+      while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+        {
+          GimpCoords nearest;
+
+          if (gimp_stroke_nearest_point_get (stroke, &coords, 1.0,
+                                             &nearest,
+                                             NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (x, nearest.x,
+                                                   epsilon_x,
+                                                   &mindist_x, tx);
+              snapped |= gimp_image_snap_distance (y, nearest.y,
+                                                   epsilon_y,
+                                                   &mindist_y, ty);
+            }
+        }
+    }
+
+  return snapped;
+}
+
+gboolean
+gimp_image_snap_rectangle (GimpImage *image,
+                           gdouble    x1,
+                           gdouble    y1,
+                           gdouble    x2,
+                           gdouble    y2,
+                           gdouble   *tx1,
+                           gdouble   *ty1,
+                           gdouble    epsilon_x,
+                           gdouble    epsilon_y,
+                           gboolean   snap_to_guides,
+                           gboolean   snap_to_grid,
+                           gboolean   snap_to_canvas,
+                           gboolean   snap_to_vectors)
+{
+  gdouble  nx, ny;
+  gdouble  mindist_x = G_MAXDOUBLE;
+  gdouble  mindist_y = G_MAXDOUBLE;
+  gdouble  x_center  = (x1 + x2) / 2.0;
+  gdouble  y_center  = (y1 + y2) / 2.0;
+  gboolean snapped   = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (tx1 != NULL, FALSE);
+  g_return_val_if_fail (ty1 != NULL, FALSE);
+
+  *tx1 = x1;
+  *ty1 = y1;
+
+  if (! gimp_image_get_guides (image))         snap_to_guides  = FALSE;
+  if (! gimp_image_get_grid (image))           snap_to_grid    = FALSE;
+  if (! gimp_image_get_active_vectors (image)) snap_to_vectors = FALSE;
+
+  if (! (snap_to_guides || snap_to_grid || snap_to_canvas || snap_to_vectors))
+    return FALSE;
+
+  /*  left edge  */
+  if (gimp_image_snap_x (image, x1, &nx,
+                         MIN (epsilon_x, mindist_x),
+                         snap_to_guides,
+                         snap_to_grid,
+                         snap_to_canvas))
+    {
+      mindist_x = ABS (nx - x1);
+      *tx1 = nx;
+      snapped = TRUE;
+    }
+
+  /*  right edge  */
+  if (gimp_image_snap_x (image, x2, &nx,
+                         MIN (epsilon_x, mindist_x),
+                         snap_to_guides,
+                         snap_to_grid,
+                         snap_to_canvas))
+    {
+      mindist_x = ABS (nx - x2);
+      *tx1 = RINT (x1 + (nx - x2));
+      snapped = TRUE;
+    }
+
+  /*  center, vertical  */
+  if (gimp_image_snap_x (image, x_center, &nx,
+                         MIN (epsilon_x, mindist_x),
+                         snap_to_guides,
+                         snap_to_grid,
+                         snap_to_canvas))
+    {
+      mindist_x = ABS (nx - x_center);
+      *tx1 = RINT (x1 + (nx - x_center));
+      snapped = TRUE;
+    }
+
+  /*  top edge  */
+  if (gimp_image_snap_y (image, y1, &ny,
+                         MIN (epsilon_y, mindist_y),
+                         snap_to_guides,
+                         snap_to_grid,
+                         snap_to_canvas))
+    {
+      mindist_y = ABS (ny - y1);
+      *ty1 = ny;
+      snapped = TRUE;
+    }
+
+  /*  bottom edge  */
+  if (gimp_image_snap_y (image, y2, &ny,
+                         MIN (epsilon_y, mindist_y),
+                         snap_to_guides,
+                         snap_to_grid,
+                         snap_to_canvas))
+    {
+      mindist_y = ABS (ny - y2);
+      *ty1 = RINT (y1 + (ny - y2));
+      snapped = TRUE;
+    }
+
+  /*  center, horizontal  */
+  if (gimp_image_snap_y (image, y_center, &ny,
+                         MIN (epsilon_y, mindist_y),
+                         snap_to_guides,
+                         snap_to_grid,
+                         snap_to_canvas))
+    {
+      mindist_y = ABS (ny - y_center);
+      *ty1 = RINT (y1 + (ny - y_center));
+      snapped = TRUE;
+    }
+
+  if (snap_to_vectors)
+    {
+      GimpVectors *vectors = gimp_image_get_active_vectors (image);
+      GimpStroke  *stroke  = NULL;
+      GimpCoords   coords1 = GIMP_COORDS_DEFAULT_VALUES;
+      GimpCoords   coords2 = GIMP_COORDS_DEFAULT_VALUES;
+
+      while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+        {
+          GimpCoords nearest;
+          gdouble    dist;
+
+          /*  top edge  */
+
+          coords1.x = x1;
+          coords1.y = y1;
+          coords2.x = x2;
+          coords2.y = y1;
+
+          if (gimp_stroke_nearest_tangent_get (stroke, &coords1, &coords2,
+                                               1.0, &nearest,
+                                               NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (y1, nearest.y,
+                                                   epsilon_y,
+                                                   &mindist_y, ty1);
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords1, &coords2,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (x1, nearest.x,
+                                                   epsilon_x,
+                                                   &mindist_x, tx1);
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords2, &coords1,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              dist = ABS (nearest.x - x2);
+
+              if (dist < MIN (epsilon_x, mindist_x))
+                {
+                  mindist_x = dist;
+                  *tx1 = RINT (x1 + (nearest.x - x2));
+                  snapped = TRUE;
+                }
+            }
+
+          /*  bottom edge  */
+
+          coords1.x = x1;
+          coords1.y = y2;
+          coords2.x = x2;
+          coords2.y = y2;
+
+          if (gimp_stroke_nearest_tangent_get (stroke, &coords1, &coords2,
+                                               1.0, &nearest,
+                                               NULL, NULL, NULL) >= 0)
+            {
+              dist = ABS (nearest.y - y2);
+
+              if (dist < MIN (epsilon_y, mindist_y))
+                {
+                  mindist_y = dist;
+                  *ty1 = RINT (y1 + (nearest.y - y2));
+                  snapped = TRUE;
+                }
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords1, &coords2,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (x1, nearest.x,
+                                                   epsilon_x,
+                                                   &mindist_x, tx1);
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords2, &coords1,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              dist = ABS (nearest.x - x2);
+
+              if (dist < MIN (epsilon_x, mindist_x))
+                {
+                  mindist_x = dist;
+                  *tx1 = RINT (x1 + (nearest.x - x2));
+                  snapped = TRUE;
+                }
+            }
+
+          /*  left edge  */
+
+          coords1.x = x1;
+          coords1.y = y1;
+          coords2.x = x1;
+          coords2.y = y2;
+
+          if (gimp_stroke_nearest_tangent_get (stroke, &coords1, &coords2,
+                                               1.0, &nearest,
+                                               NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (x1, nearest.x,
+                                                   epsilon_x,
+                                                   &mindist_x, tx1);
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords1, &coords2,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (y1, nearest.y,
+                                                   epsilon_y,
+                                                   &mindist_y, ty1);
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords2, &coords1,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              dist = ABS (nearest.y - y2);
+
+              if (dist < MIN (epsilon_y, mindist_y))
+                {
+                  mindist_y = dist;
+                  *ty1 = RINT (y1 + (nearest.y - y2));
+                  snapped = TRUE;
+                }
+            }
+
+          /*  right edge  */
+
+          coords1.x = x2;
+          coords1.y = y1;
+          coords2.x = x2;
+          coords2.y = y2;
+
+          if (gimp_stroke_nearest_tangent_get (stroke, &coords1, &coords2,
+                                               1.0, &nearest,
+                                               NULL, NULL, NULL) >= 0)
+            {
+              dist = ABS (nearest.x - x2);
+
+              if (dist < MIN (epsilon_x, mindist_x))
+                {
+                  mindist_x = dist;
+                  *tx1 = RINT (x1 + (nearest.x - x2));
+                  snapped = TRUE;
+                }
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords1, &coords2,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              snapped |= gimp_image_snap_distance (y1, nearest.y,
+                                                   epsilon_y,
+                                                   &mindist_y, ty1);
+            }
+
+          if (gimp_stroke_nearest_intersection_get (stroke, &coords2, &coords1,
+                                                    1.0, &nearest,
+                                                    NULL, NULL, NULL) >= 0)
+            {
+              dist = ABS (nearest.y - y2);
+
+              if (dist < MIN (epsilon_y, mindist_y))
+                {
+                  mindist_y = dist;
+                  *ty1 = RINT (y1 + (nearest.y - y2));
+                  snapped = TRUE;
+                }
+            }
+
+          /*  center  */
+
+          coords1.x = x_center;
+          coords1.y = y_center;
+
+          if (gimp_stroke_nearest_point_get (stroke, &coords1, 1.0,
+                                             &nearest,
+                                             NULL, NULL, NULL) >= 0)
+            {
+              if (gimp_image_snap_distance (x_center, nearest.x,
+                                            epsilon_x,
+                                            &mindist_x, &nx))
+                {
+                  mindist_x = ABS (nx - x_center);
+                  *tx1 = RINT (x1 + (nx - x_center));
+                  snapped = TRUE;
+                }
+
+              if (gimp_image_snap_distance (y_center, nearest.y,
+                                            epsilon_y,
+                                            &mindist_y, &ny))
+                {
+                  mindist_y = ABS (ny - y_center);
+                  *ty1 = RINT (y1 + (ny - y_center));
+                  snapped = TRUE;
+               }
+            }
+        }
+    }
+
+  return snapped;
+}
+
+/* private functions */
+
+/**
+ * gimp_image_snap_distance:
+ * @unsnapped: One coordinate of the unsnapped position
+ * @nearest:  One coordinate of a snapping position candidate
+ * @epsilon:  The snapping threshold
+ * @mindist:  The distance to the currently closest snapping target
+ * @target:   The currently closest snapping target
+ *
+ * Finds out if snapping occurs from position to a snapping candidate
+ * and sets the target accordingly.
+ *
+ * Return value: %TRUE if snapping occurred, %FALSE otherwise
+ */
+static gboolean
+gimp_image_snap_distance (const gdouble  unsnapped,
+                          const gdouble  nearest,
+                          const gdouble  epsilon,
+                          gdouble       *mindist,
+                          gdouble       *target)
+{
+  const gdouble dist = ABS (nearest - unsnapped);
+
+  if (dist < MIN (epsilon, *mindist))
+    {
+      *mindist = dist;
+      *target = nearest;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/core/gimpimage-snap.h b/app/core/gimpimage-snap.h
new file mode 100644
index 0000000..b0d5e4b
--- /dev/null
+++ b/app/core/gimpimage-snap.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_SNAP_H__
+#define __GIMP_IMAGE_SNAP_H__
+
+
+gboolean    gimp_image_snap_x         (GimpImage *image,
+                                       gdouble    x,
+                                       gdouble   *tx,
+                                       gdouble    epsilon_x,
+                                       gboolean   snap_to_guides,
+                                       gboolean   snap_to_grid,
+                                       gboolean   snap_to_canvas);
+gboolean    gimp_image_snap_y         (GimpImage *image,
+                                       gdouble    y,
+                                       gdouble   *ty,
+                                       gdouble    epsilon_y,
+                                       gboolean   snap_to_guides,
+                                       gboolean   snap_to_grid,
+                                       gboolean   snap_to_canvas);
+gboolean    gimp_image_snap_point     (GimpImage *image,
+                                       gdouble    x,
+                                       gdouble    y,
+                                       gdouble   *tx,
+                                       gdouble   *ty,
+                                       gdouble    epsilon_x,
+                                       gdouble    epsilon_y,
+                                       gboolean   snap_to_guides,
+                                       gboolean   snap_to_grid,
+                                       gboolean   snap_to_canvas,
+                                       gboolean   snap_to_vectors,
+                                       gboolean   show_all);
+gboolean    gimp_image_snap_rectangle (GimpImage *image,
+                                       gdouble    x1,
+                                       gdouble    y1,
+                                       gdouble    x2,
+                                       gdouble    y2,
+                                       gdouble   *tx1,
+                                       gdouble   *ty1,
+                                       gdouble    epsilon_x,
+                                       gdouble    epsilon_y,
+                                       gboolean   snap_to_guides,
+                                       gboolean   snap_to_grid,
+                                       gboolean   snap_to_canvas,
+                                       gboolean   snap_to_vectors);
+
+
+#endif /* __GIMP_IMAGE_SNAP_H__ */
diff --git a/app/core/gimpimage-symmetry.c b/app/core/gimpimage-symmetry.c
new file mode 100644
index 0000000..366f63e
--- /dev/null
+++ b/app/core/gimpimage-symmetry.c
@@ -0,0 +1,189 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-symmetry.c
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "gimpsymmetry.h"
+#include "gimpimage.h"
+#include "gimpimage-private.h"
+#include "gimpimage-symmetry.h"
+#include "gimpsymmetry-mandala.h"
+#include "gimpsymmetry-mirror.h"
+#include "gimpsymmetry-tiling.h"
+
+
+/**
+ * gimp_image_symmetry_list:
+ *
+ * Returns a list of #GType of all existing symmetries.
+ **/
+GList *
+gimp_image_symmetry_list (void)
+{
+  GList *list = NULL;
+
+  list = g_list_prepend (list, GINT_TO_POINTER (GIMP_TYPE_MIRROR));
+  list = g_list_prepend (list, GINT_TO_POINTER (GIMP_TYPE_TILING));
+  list = g_list_prepend (list, GINT_TO_POINTER (GIMP_TYPE_MANDALA));
+
+  return list;
+}
+
+/**
+ * gimp_image_symmetry_new:
+ * @image: the #GimpImage
+ * @type:  the #GType of the symmetry
+ *
+ * Creates a new #GimpSymmetry of @type attached to @image.
+ * @type must be a subtype of `GIMP_TYPE_SYMMETRY`.
+ * Note that using the base @type `GIMP_TYPE_SYMMETRY` creates an
+ * identity transformation.
+ *
+ * Returns: the new #GimpSymmetry.
+ **/
+GimpSymmetry *
+gimp_image_symmetry_new (GimpImage *image,
+                         GType      type)
+{
+  GimpSymmetry *sym = NULL;
+
+  g_return_val_if_fail (g_type_is_a (type, GIMP_TYPE_SYMMETRY), NULL);
+
+  sym = g_object_new (type,
+                      "image", image,
+                      NULL);
+
+  return sym;
+}
+
+/**
+ * gimp_image_symmetry_add:
+ * @image: the #GimpImage
+ * @type:  the #GType of the symmetry
+ *
+ * Add a symmetry of type @type to @image and make it the
+ * active transformation.
+ **/
+void
+gimp_image_symmetry_add (GimpImage    *image,
+                         GimpSymmetry *sym)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SYMMETRY (sym));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->symmetries = g_list_prepend (private->symmetries,
+                                        g_object_ref (sym));
+}
+
+/**
+ * gimp_image_symmetry_remove:
+ * @image:   the #GimpImage
+ * @sym: the #GimpSymmetry
+ *
+ * Remove @sym from the list of symmetries of @image.
+ * If it was the active transformation, unselect it first.
+ **/
+void
+gimp_image_symmetry_remove (GimpImage    *image,
+                            GimpSymmetry *sym)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_SYMMETRY (sym));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->active_symmetry == sym)
+    gimp_image_set_active_symmetry (image, GIMP_TYPE_SYMMETRY);
+
+  private->symmetries = g_list_remove (private->symmetries, sym);
+  g_object_unref (sym);
+}
+
+/**
+ * gimp_image_symmetry_get:
+ * @image: the #GimpImage
+ *
+ * Returns: the list of #GimpSymmetry set on @image.
+ * The returned list belongs to @image and should not be freed.
+ **/
+GList *
+gimp_image_symmetry_get (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return private->symmetries;
+}
+
+/**
+ * gimp_image_set_active_symmetry:
+ * @image: the #GimpImage
+ * @type:  the #GType of the symmetry
+ *
+ * Select the symmetry of type @type.
+ * Using the GType allows to select a transformation without
+ * knowing whether one of the same @type was already created.
+ *
+ * Returns TRUE on success, FALSE if no such symmetry was found.
+ **/
+gboolean
+gimp_image_set_active_symmetry (GimpImage *image,
+                                GType      type)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  g_object_set (image,
+                "symmetry", type,
+                NULL);
+
+  return TRUE;
+}
+
+/**
+ * gimp_image_get_active_symmetry:
+ * @image: the #GimpImage
+ *
+ * Returns the #GimpSymmetry transformation active on @image.
+ **/
+GimpSymmetry *
+gimp_image_get_active_symmetry (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return private->active_symmetry;
+}
diff --git a/app/core/gimpimage-symmetry.h b/app/core/gimpimage-symmetry.h
new file mode 100644
index 0000000..9211382
--- /dev/null
+++ b/app/core/gimpimage-symmetry.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-symmetry.h
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_SYMMETRY_H__
+#define __GIMP_IMAGE_SYMMETRY_H__
+
+
+GList        * gimp_image_symmetry_list       (void);
+
+GimpSymmetry * gimp_image_symmetry_new        (GimpImage    *image,
+                                               GType         type);
+void           gimp_image_symmetry_add        (GimpImage    *image,
+                                               GimpSymmetry *sym);
+void           gimp_image_symmetry_remove     (GimpImage    *image,
+                                               GimpSymmetry *sym);
+GList        * gimp_image_symmetry_get        (GimpImage    *image);
+
+gboolean       gimp_image_set_active_symmetry (GimpImage    *image,
+                                               GType         type);
+GimpSymmetry * gimp_image_get_active_symmetry (GimpImage    *image);
+
+
+#endif  /*  __GIMP_IMAGE_SYMMETRY_H__  */
diff --git a/app/core/gimpimage-transform.c b/app/core/gimpimage-transform.c
new file mode 100644
index 0000000..afe4cfc
--- /dev/null
+++ b/app/core/gimpimage-transform.c
@@ -0,0 +1,338 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimage-transform.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp.h"
+#include "gimp-transform-resize.h"
+#include "gimp-transform-utils.h"
+#include "gimpchannel.h"
+#include "gimpcontext.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-transform.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitem.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+#include "gimpsamplepoint.h"
+
+
+#define EPSILON 1e-6
+
+
+/*  local function prototypes  */
+
+static void    gimp_image_transform_guides        (GimpImage           *image,
+                                                   const GimpMatrix3   *matrix,
+                                                   const GeglRectangle *old_bounds);
+static void    gimp_image_transform_sample_points (GimpImage           *image,
+                                                   const GimpMatrix3   *matrix,
+                                                   const GeglRectangle *old_bounds);
+
+
+/*  private functions  */
+
+static void
+gimp_image_transform_guides (GimpImage           *image,
+                             const GimpMatrix3   *matrix,
+                             const GeglRectangle *old_bounds)
+{
+  GList *iter;
+
+  for (iter = gimp_image_get_guides (image); iter;)
+    {
+      GimpGuide           *guide           = iter->data;
+      GimpOrientationType  old_orientation = gimp_guide_get_orientation (guide);
+      gint                 old_position    = gimp_guide_get_position (guide);
+      GimpOrientationType  new_orientation;
+      gint                 new_position;
+      GimpVector2          vertices[2];
+      gint                 n_vertices;
+      GimpVector2          diff;
+
+      iter = g_list_next (iter);
+
+      switch (old_orientation)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          vertices[0].x = old_bounds->x;
+          vertices[0].y = old_bounds->y + old_position;
+
+          vertices[1].x = old_bounds->x + old_bounds->width / 2.0;
+          vertices[1].y = old_bounds->y + old_position;
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          vertices[0].x = old_bounds->x + old_position;
+          vertices[0].y = old_bounds->y;
+
+          vertices[1].x = old_bounds->x + old_position;
+          vertices[1].y = old_bounds->y + old_bounds->height / 2.0;
+          break;
+
+        case GIMP_ORIENTATION_UNKNOWN:
+          g_return_if_reached ();
+        }
+
+      gimp_transform_polygon (matrix,
+                              vertices, 2, FALSE,
+                              vertices, &n_vertices);
+
+      if (n_vertices < 2)
+        {
+          gimp_image_remove_guide (image, guide, TRUE);
+
+          continue;
+        }
+
+      gimp_vector2_sub (&diff, &vertices[1], &vertices[0]);
+
+      if (gimp_vector2_length (&diff) <= EPSILON)
+        {
+          gimp_image_remove_guide (image, guide, TRUE);
+
+          continue;
+        }
+
+      if (fabs (diff.x) >= fabs (diff.y))
+        {
+          new_orientation = GIMP_ORIENTATION_HORIZONTAL;
+          new_position    = SIGNED_ROUND (vertices[1].y);
+
+          if (new_position < 0 || new_position > gimp_image_get_height (image))
+            {
+              gimp_image_remove_guide (image, guide, TRUE);
+
+              continue;
+            }
+        }
+      else
+        {
+          new_orientation = GIMP_ORIENTATION_VERTICAL;
+          new_position    = SIGNED_ROUND (vertices[1].x);
+
+          if (new_position < 0 || new_position > gimp_image_get_width (image))
+            {
+              gimp_image_remove_guide (image, guide, TRUE);
+
+              continue;
+            }
+        }
+
+      if (new_orientation != old_orientation ||
+          new_position    != old_position)
+        {
+          gimp_image_undo_push_guide (image, NULL, guide);
+
+          gimp_guide_set_orientation (guide, new_orientation);
+          gimp_guide_set_position    (guide, new_position);
+
+          gimp_image_guide_moved (image, guide);
+        }
+    }
+}
+
+static void
+gimp_image_transform_sample_points (GimpImage           *image,
+                                    const GimpMatrix3   *matrix,
+                                    const GeglRectangle *old_bounds)
+{
+  GList *iter;
+
+  for (iter = gimp_image_get_sample_points (image); iter;)
+    {
+      GimpSamplePoint     *sample_point = iter->data;
+      gint                 old_x;
+      gint                 old_y;
+      gint                 new_x;
+      gint                 new_y;
+      GimpVector2          vertices[1];
+      gint                 n_vertices;
+
+      iter = g_list_next (iter);
+
+      gimp_sample_point_get_position (sample_point, &old_x, &old_y);
+
+      vertices[0].x = old_x;
+      vertices[0].y = old_y;
+
+      gimp_transform_polygon (matrix,
+                              vertices, 1, FALSE,
+                              vertices, &n_vertices);
+
+      if (n_vertices < 1)
+        {
+          gimp_image_remove_sample_point (image, sample_point, TRUE);
+
+          continue;
+        }
+
+      new_x = SIGNED_ROUND (vertices[0].x);
+      new_y = SIGNED_ROUND (vertices[0].y);
+
+      if (new_x < 0 || new_x >= gimp_image_get_width  (image) ||
+          new_y < 0 || new_y >= gimp_image_get_height (image))
+        {
+          gimp_image_remove_sample_point (image, sample_point, TRUE);
+
+          continue;
+        }
+
+      if (new_x != old_x || new_y != old_y)
+        gimp_image_move_sample_point (image, sample_point, new_x, new_y, TRUE);
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_image_transform (GimpImage              *image,
+                      GimpContext            *context,
+                      const GimpMatrix3      *matrix,
+                      GimpTransformDirection  direction,
+                      GimpInterpolationType   interpolation_type,
+                      GimpTransformResize     clip_result,
+                      GimpProgress           *progress)
+{
+  GimpObjectQueue *queue;
+  GimpItem        *item;
+  GimpMatrix3      transform;
+  GeglRectangle    old_bounds;
+  GeglRectangle    new_bounds;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (matrix != NULL);
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  gimp_set_busy (image->gimp);
+
+  old_bounds.x      = 0;
+  old_bounds.y      = 0;
+  old_bounds.width  = gimp_image_get_width  (image);
+  old_bounds.height = gimp_image_get_height (image);
+
+  transform = *matrix;
+
+  if (direction == GIMP_TRANSFORM_BACKWARD)
+    gimp_matrix3_invert (&transform);
+
+  gimp_transform_resize_boundary (&transform, clip_result,
+
+                                  old_bounds.x,
+                                  old_bounds.y,
+                                  old_bounds.x + old_bounds.width,
+                                  old_bounds.y + old_bounds.height,
+
+                                  &new_bounds.x,
+                                  &new_bounds.y,
+                                  &new_bounds.width,
+                                  &new_bounds.height);
+
+  new_bounds.width  -= new_bounds.x;
+  new_bounds.height -= new_bounds.y;
+
+  gimp_matrix3_translate (&transform,
+                          old_bounds.x - new_bounds.x,
+                          old_bounds.y - new_bounds.y);
+
+  queue    = gimp_object_queue_new (progress);
+  progress = GIMP_PROGRESS (queue);
+
+  gimp_object_queue_push_container (queue, gimp_image_get_layers (image));
+  gimp_object_queue_push (queue, gimp_image_get_mask (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_channels (image));
+  gimp_object_queue_push_container (queue, gimp_image_get_vectors (image));
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_TRANSFORM, NULL);
+
+  /*  Transform all layers, channels (including selection mask), and vectors  */
+  while ((item = gimp_object_queue_pop (queue)))
+    {
+      GimpTransformResize clip = GIMP_TRANSFORM_RESIZE_ADJUST;
+
+      if (GIMP_IS_CHANNEL (item))
+        clip = clip_result;
+
+      gimp_item_transform (item,
+                           context,
+                           &transform, direction,
+                           interpolation_type, clip,
+                           progress);
+
+      if (GIMP_IS_VECTORS (item))
+        gimp_item_set_size (item, new_bounds.width, new_bounds.height);
+    }
+
+  /*  Resize the image (if needed)  */
+  if (! gegl_rectangle_equal (&new_bounds, &old_bounds))
+    {
+      gimp_image_undo_push_image_size (image,
+                                       NULL,
+                                       new_bounds.x,
+                                       new_bounds.y,
+                                       new_bounds.width,
+                                       new_bounds.height);
+
+      g_object_set (image,
+                    "width",  new_bounds.width,
+                    "height", new_bounds.height,
+                    NULL);
+    }
+
+  /*  Transform all Guides  */
+  gimp_image_transform_guides (image, &transform, &old_bounds);
+
+  /*  Transform all sample points  */
+  gimp_image_transform_sample_points (image, &transform, &old_bounds);
+
+  gimp_image_undo_group_end (image);
+
+  g_object_unref (queue);
+
+  if (! gegl_rectangle_equal (&new_bounds, &old_bounds))
+    {
+      gimp_image_size_changed_detailed (image,
+                                        old_bounds.x - new_bounds.x,
+                                        old_bounds.y - new_bounds.y,
+                                        old_bounds.width,
+                                        old_bounds.height);
+    }
+
+  g_object_thaw_notify (G_OBJECT (image));
+
+  gimp_unset_busy (image->gimp);
+}
diff --git a/app/core/gimpimage-transform.h b/app/core/gimpimage-transform.h
new file mode 100644
index 0000000..63a851d
--- /dev/null
+++ b/app/core/gimpimage-transform.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * gimpimage-transform.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_TRANSFORM_H__
+#define __GIMP_IMAGE_TRANSFORM_H__
+
+
+void   gimp_image_transform (GimpImage              *image,
+                             GimpContext            *context,
+                             const GimpMatrix3      *matrix,
+                             GimpTransformDirection  direction,
+                             GimpInterpolationType   interpolation_type,
+                             GimpTransformResize     clip_result,
+                             GimpProgress           *progress);
+
+
+#endif /* __GIMP_IMAGE_TRANSFORM_H__ */
diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c
new file mode 100644
index 0000000..b96c4b4
--- /dev/null
+++ b/app/core/gimpimage-undo-push.c
@@ -0,0 +1,1060 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpchannelpropundo.h"
+#include "gimpchannelundo.h"
+#include "gimpdrawablemodundo.h"
+#include "gimpdrawableundo.h"
+#include "gimpfloatingselectionundo.h"
+#include "gimpgrid.h"
+#include "gimpgrouplayer.h"
+#include "gimpgrouplayerundo.h"
+#include "gimpguide.h"
+#include "gimpguideundo.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpimageundo.h"
+#include "gimpitempropundo.h"
+#include "gimplayermask.h"
+#include "gimplayermaskpropundo.h"
+#include "gimplayermaskundo.h"
+#include "gimplayerpropundo.h"
+#include "gimplayerundo.h"
+#include "gimpmaskundo.h"
+#include "gimpsamplepoint.h"
+#include "gimpsamplepointundo.h"
+#include "gimpselection.h"
+
+#include "text/gimptextlayer.h"
+#include "text/gimptextundo.h"
+
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectorsmodundo.h"
+#include "vectors/gimpvectorspropundo.h"
+#include "vectors/gimpvectorsundo.h"
+
+#include "gimp-intl.h"
+
+
+/**************************/
+/*  Image Property Undos  */
+/**************************/
+
+GimpUndo *
+gimp_image_undo_push_image_type (GimpImage   *image,
+                                 const gchar *undo_desc)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_TYPE, undo_desc,
+                               GIMP_DIRTY_IMAGE,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_precision (GimpImage   *image,
+                                      const gchar *undo_desc)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_PRECISION, undo_desc,
+                               GIMP_DIRTY_IMAGE,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_size (GimpImage   *image,
+                                 const gchar *undo_desc,
+                                 gint         previous_origin_x,
+                                 gint         previous_origin_y,
+                                 gint         previous_width,
+                                 gint         previous_height)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_SIZE, undo_desc,
+                               GIMP_DIRTY_IMAGE | GIMP_DIRTY_IMAGE_SIZE,
+                               "previous-origin-x", previous_origin_x,
+                               "previous-origin-y", previous_origin_y,
+                               "previous-width",    previous_width,
+                               "previous-height",   previous_height,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_resolution (GimpImage   *image,
+                                       const gchar *undo_desc)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_RESOLUTION, undo_desc,
+                               GIMP_DIRTY_IMAGE,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_grid (GimpImage   *image,
+                                 const gchar *undo_desc,
+                                 GimpGrid    *grid)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GRID (grid), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_GRID, undo_desc,
+                               GIMP_DIRTY_IMAGE_META,
+                               "grid", grid,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_colormap (GimpImage   *image,
+                                     const gchar *undo_desc)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_COLORMAP, undo_desc,
+                               GIMP_DIRTY_IMAGE,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_color_managed (GimpImage   *image,
+                                          const gchar *undo_desc)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_COLOR_MANAGED, undo_desc,
+                               GIMP_DIRTY_IMAGE,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_metadata (GimpImage   *image,
+                                     const gchar *undo_desc)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_IMAGE_METADATA, undo_desc,
+                               GIMP_DIRTY_IMAGE_META,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_parasite (GimpImage          *image,
+                                     const gchar        *undo_desc,
+                                     const GimpParasite *parasite)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (parasite != NULL, NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_PARASITE_ATTACH, undo_desc,
+                               GIMP_DIRTY_IMAGE_META,
+                               "parasite-name", gimp_parasite_name (parasite),
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_image_parasite_remove (GimpImage   *image,
+                                            const gchar *undo_desc,
+                                            const gchar *name)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+                               GIMP_UNDO_PARASITE_REMOVE, undo_desc,
+                               GIMP_DIRTY_IMAGE_META,
+                               "parasite-name", name,
+                               NULL);
+}
+
+
+/********************************/
+/*  Guide & Sample Point Undos  */
+/********************************/
+
+GimpUndo *
+gimp_image_undo_push_guide (GimpImage   *image,
+                            const gchar *undo_desc,
+                            GimpGuide   *guide)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GUIDE (guide), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GUIDE_UNDO,
+                               GIMP_UNDO_GUIDE, undo_desc,
+                               GIMP_DIRTY_IMAGE_META,
+                               "aux-item", guide,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_sample_point (GimpImage       *image,
+                                   const gchar     *undo_desc,
+                                   GimpSamplePoint *sample_point)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_SAMPLE_POINT (sample_point), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_SAMPLE_POINT_UNDO,
+                               GIMP_UNDO_SAMPLE_POINT, undo_desc,
+                               GIMP_DIRTY_IMAGE_META,
+                               "aux-item", sample_point,
+                               NULL);
+}
+
+
+/********************/
+/*  Drawable Undos  */
+/********************/
+
+GimpUndo *
+gimp_image_undo_push_drawable (GimpImage    *image,
+                               const gchar  *undo_desc,
+                               GimpDrawable *drawable,
+                               GeglBuffer   *buffer,
+                               gint          x,
+                               gint          y)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  item = GIMP_ITEM (drawable);
+
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_DRAWABLE_UNDO,
+                               GIMP_UNDO_DRAWABLE, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",   item,
+                               "buffer", buffer,
+                               "x",      x,
+                               "y",      y,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_drawable_mod (GimpImage    *image,
+                                   const gchar  *undo_desc,
+                                   GimpDrawable *drawable,
+                                   gboolean      copy_buffer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_DRAWABLE_MOD_UNDO,
+                               GIMP_UNDO_DRAWABLE_MOD, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",        drawable,
+                               "copy-buffer", copy_buffer,
+                               NULL);
+}
+
+
+/****************/
+/*  Mask Undos  */
+/****************/
+
+GimpUndo *
+gimp_image_undo_push_mask (GimpImage   *image,
+                           const gchar *undo_desc,
+                           GimpChannel *mask)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CHANNEL (mask), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (mask)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_MASK_UNDO,
+                               GIMP_UNDO_MASK, undo_desc,
+                               GIMP_IS_SELECTION (mask) ?
+                               GIMP_DIRTY_SELECTION :
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item", mask,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_mask_precision (GimpImage   *image,
+                                     const gchar *undo_desc,
+                                     GimpChannel *mask)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CHANNEL (mask), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (mask)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_MASK_UNDO,
+                               GIMP_UNDO_MASK, undo_desc,
+                               GIMP_IS_SELECTION (mask) ?
+                               GIMP_DIRTY_SELECTION :
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",           mask,
+                               "convert-format", TRUE,
+                               NULL);
+}
+
+
+/****************/
+/*  Item Undos  */
+/****************/
+
+GimpUndo *
+gimp_image_undo_push_item_reorder (GimpImage   *image,
+                                   const gchar *undo_desc,
+                                   GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_REORDER, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_rename (GimpImage   *image,
+                                  const gchar *undo_desc,
+                                  GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_RENAME, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_displace (GimpImage   *image,
+                                    const gchar *undo_desc,
+                                    GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_DISPLACE, undo_desc,
+                               GIMP_IS_DRAWABLE (item) ?
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE :
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_VECTORS,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_visibility (GimpImage   *image,
+                                      const gchar *undo_desc,
+                                      GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_VISIBILITY, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_linked (GimpImage   *image,
+                                  const gchar *undo_desc,
+                                  GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_LINKED, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_color_tag (GimpImage   *image,
+                                     const gchar *undo_desc,
+                                     GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_COLOR_TAG, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_lock_content (GimpImage   *image,
+                                        const gchar *undo_desc,
+                                        GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_LOCK_CONTENT, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_lock_position (GimpImage   *image,
+                                         const gchar *undo_desc,
+                                         GimpItem    *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_ITEM_LOCK_POSITION, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", item,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_parasite (GimpImage          *image,
+                                    const gchar        *undo_desc,
+                                    GimpItem           *item,
+                                    const GimpParasite *parasite)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+  g_return_val_if_fail (parasite != NULL, NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_PARASITE_ATTACH, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item",          item,
+                               "parasite-name", gimp_parasite_name (parasite),
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_item_parasite_remove (GimpImage   *image,
+                                           const gchar *undo_desc,
+                                           GimpItem    *item,
+                                           const gchar *name)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_ITEM_PROP_UNDO,
+                               GIMP_UNDO_PARASITE_REMOVE, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item",          item,
+                               "parasite-name", name,
+                               NULL);
+}
+
+
+/*****************/
+/*  Layer Undos  */
+/*****************/
+
+GimpUndo *
+gimp_image_undo_push_layer_add (GimpImage   *image,
+                                const gchar *undo_desc,
+                                GimpLayer   *layer,
+                                GimpLayer   *prev_layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (! gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+  g_return_val_if_fail (prev_layer == NULL || GIMP_IS_LAYER (prev_layer),
+                        NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_UNDO,
+                               GIMP_UNDO_LAYER_ADD, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",       layer,
+                               "prev-layer", prev_layer,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_remove (GimpImage   *image,
+                                   const gchar *undo_desc,
+                                   GimpLayer   *layer,
+                                   GimpLayer   *prev_parent,
+                                   gint         prev_position,
+                                   GimpLayer   *prev_layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+  g_return_val_if_fail (prev_parent == NULL || GIMP_IS_LAYER (prev_parent),
+                        NULL);
+  g_return_val_if_fail (prev_layer == NULL || GIMP_IS_LAYER (prev_layer),
+                        NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_UNDO,
+                               GIMP_UNDO_LAYER_REMOVE, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",          layer,
+                               "prev-parent",   prev_parent,
+                               "prev-position", prev_position,
+                               "prev-layer",    prev_layer,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_mode (GimpImage   *image,
+                                 const gchar *undo_desc,
+                                 GimpLayer   *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_PROP_UNDO,
+                               GIMP_UNDO_LAYER_MODE, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", layer,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_opacity (GimpImage   *image,
+                                    const gchar *undo_desc,
+                                    GimpLayer   *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_PROP_UNDO,
+                               GIMP_UNDO_LAYER_OPACITY, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", layer,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_lock_alpha (GimpImage   *image,
+                                       const gchar *undo_desc,
+                                       GimpLayer   *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_PROP_UNDO,
+                               GIMP_UNDO_LAYER_LOCK_ALPHA, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", layer,
+                               NULL);
+}
+
+
+/***********************/
+/*  Group Layer Undos  */
+/***********************/
+
+GimpUndo *
+gimp_image_undo_push_group_layer_suspend_resize (GimpImage      *image,
+                                                 const gchar    *undo_desc,
+                                                 GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  group,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_group_layer_resume_resize (GimpImage      *image,
+                                                const gchar    *undo_desc,
+                                                GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  group,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_group_layer_suspend_mask (GimpImage      *image,
+                                               const gchar    *undo_desc,
+                                               GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  group,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_group_layer_resume_mask (GimpImage      *image,
+                                              const gchar    *undo_desc,
+                                              GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_RESUME_MASK, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  group,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_group_layer_start_transform (GimpImage      *image,
+                                                  const gchar    *undo_desc,
+                                                  GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_START_TRANSFORM, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  group,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_group_layer_end_transform (GimpImage      *image,
+                                                const gchar    *undo_desc,
+                                                GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_END_TRANSFORM, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  group,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_group_layer_convert (GimpImage      *image,
+                                          const gchar    *undo_desc,
+                                          GimpGroupLayer *group)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_GROUP_LAYER (group), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (group)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_GROUP_LAYER_UNDO,
+                               GIMP_UNDO_GROUP_LAYER_CONVERT, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item", group,
+                               NULL);
+}
+
+
+/**********************/
+/*  Text Layer Undos  */
+/**********************/
+
+GimpUndo *
+gimp_image_undo_push_text_layer (GimpImage        *image,
+                                 const gchar      *undo_desc,
+                                 GimpTextLayer    *layer,
+                                 const GParamSpec *pspec)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_TEXT_UNDO,
+                               GIMP_UNDO_TEXT_LAYER, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item",  layer,
+                               "param", pspec,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_text_layer_modified (GimpImage     *image,
+                                          const gchar   *undo_desc,
+                                          GimpTextLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_TEXT_UNDO,
+                               GIMP_UNDO_TEXT_LAYER_MODIFIED, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", layer,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_text_layer_convert (GimpImage     *image,
+                                         const gchar   *undo_desc,
+                                         GimpTextLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_TEXT_UNDO,
+                               GIMP_UNDO_TEXT_LAYER_CONVERT, undo_desc,
+                               GIMP_DIRTY_ITEM,
+                               "item", layer,
+                               NULL);
+}
+
+
+/**********************/
+/*  Layer Mask Undos  */
+/**********************/
+
+GimpUndo *
+gimp_image_undo_push_layer_mask_add (GimpImage     *image,
+                                     const gchar   *undo_desc,
+                                     GimpLayer     *layer,
+                                     GimpLayerMask *mask)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER_MASK (mask), NULL);
+  g_return_val_if_fail (! gimp_item_is_attached (GIMP_ITEM (mask)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_MASK_UNDO,
+                               GIMP_UNDO_LAYER_MASK_ADD, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",       layer,
+                               "layer-mask", mask,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_mask_remove (GimpImage     *image,
+                                        const gchar   *undo_desc,
+                                        GimpLayer     *layer,
+                                        GimpLayerMask *mask)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER_MASK (mask), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (mask)), NULL);
+  g_return_val_if_fail (gimp_layer_mask_get_layer (mask) == layer, NULL);
+  g_return_val_if_fail (gimp_layer_get_mask (layer) == mask, NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_MASK_UNDO,
+                               GIMP_UNDO_LAYER_MASK_REMOVE, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",       layer,
+                               "layer-mask", mask,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_mask_apply (GimpImage   *image,
+                                       const gchar *undo_desc,
+                                       GimpLayer   *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_MASK_PROP_UNDO,
+                               GIMP_UNDO_LAYER_MASK_APPLY, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", layer,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_layer_mask_show (GimpImage   *image,
+                                      const gchar *undo_desc,
+                                      GimpLayer   *layer)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_LAYER_MASK_PROP_UNDO,
+                               GIMP_UNDO_LAYER_MASK_SHOW, undo_desc,
+                               GIMP_DIRTY_ITEM_META,
+                               "item", layer,
+                               NULL);
+}
+
+
+/*******************/
+/*  Channel Undos  */
+/*******************/
+
+GimpUndo *
+gimp_image_undo_push_channel_add (GimpImage   *image,
+                                  const gchar *undo_desc,
+                                  GimpChannel *channel,
+                                  GimpChannel *prev_channel)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), NULL);
+  g_return_val_if_fail (! gimp_item_is_attached (GIMP_ITEM (channel)), NULL);
+  g_return_val_if_fail (prev_channel == NULL || GIMP_IS_CHANNEL (prev_channel),
+                        NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_CHANNEL_UNDO,
+                               GIMP_UNDO_CHANNEL_ADD, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",         channel,
+                               "prev-channel", prev_channel,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_channel_remove (GimpImage   *image,
+                                     const gchar *undo_desc,
+                                     GimpChannel *channel,
+                                     GimpChannel *prev_parent,
+                                     gint         prev_position,
+                                     GimpChannel *prev_channel)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)), NULL);
+  g_return_val_if_fail (prev_parent == NULL || GIMP_IS_CHANNEL (prev_parent),
+                        NULL);
+  g_return_val_if_fail (prev_channel == NULL || GIMP_IS_CHANNEL (prev_channel),
+                        NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_CHANNEL_UNDO,
+                               GIMP_UNDO_CHANNEL_REMOVE, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",          channel,
+                               "prev-parent",   prev_parent,
+                               "prev-position", prev_position,
+                               "prev-channel",  prev_channel,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_channel_color (GimpImage   *image,
+                                    const gchar *undo_desc,
+                                    GimpChannel *channel)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CHANNEL (channel), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_CHANNEL_PROP_UNDO,
+                               GIMP_UNDO_CHANNEL_COLOR, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE,
+                               "item", channel,
+                               NULL);
+}
+
+
+/*******************/
+/*  Vectors Undos  */
+/*******************/
+
+GimpUndo *
+gimp_image_undo_push_vectors_add (GimpImage   *image,
+                                  const gchar *undo_desc,
+                                  GimpVectors *vectors,
+                                  GimpVectors *prev_vectors)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (! gimp_item_is_attached (GIMP_ITEM (vectors)), NULL);
+  g_return_val_if_fail (prev_vectors == NULL || GIMP_IS_VECTORS (prev_vectors),
+                        NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_VECTORS_UNDO,
+                               GIMP_UNDO_VECTORS_ADD, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",         vectors,
+                               "prev-vectors", prev_vectors,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_vectors_remove (GimpImage   *image,
+                                     const gchar *undo_desc,
+                                     GimpVectors *vectors,
+                                     GimpVectors *prev_parent,
+                                     gint         prev_position,
+                                     GimpVectors *prev_vectors)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (vectors)), NULL);
+  g_return_val_if_fail (prev_parent == NULL || GIMP_IS_VECTORS (prev_parent),
+                        NULL);
+  g_return_val_if_fail (prev_vectors == NULL || GIMP_IS_VECTORS (prev_vectors),
+                        NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_VECTORS_UNDO,
+                               GIMP_UNDO_VECTORS_REMOVE, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item",          vectors,
+                               "prev-parent",   prev_parent,
+                               "prev-position", prev_position,
+                               "prev-vectors",  prev_vectors,
+                               NULL);
+}
+
+GimpUndo *
+gimp_image_undo_push_vectors_mod (GimpImage   *image,
+                                  const gchar *undo_desc,
+                                  GimpVectors *vectors)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (vectors)), NULL);
+
+  return gimp_image_undo_push (image, GIMP_TYPE_VECTORS_MOD_UNDO,
+                               GIMP_UNDO_VECTORS_MOD, undo_desc,
+                               GIMP_DIRTY_ITEM | GIMP_DIRTY_VECTORS,
+                               "item", vectors,
+                               NULL);
+}
+
+
+/******************************/
+/*  Floating Selection Undos  */
+/******************************/
+
+GimpUndo *
+gimp_image_undo_push_fs_to_layer (GimpImage    *image,
+                                  const gchar  *undo_desc,
+                                  GimpLayer    *floating_layer)
+{
+  GimpUndo *undo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER (floating_layer), NULL);
+
+  undo = gimp_image_undo_push (image, GIMP_TYPE_FLOATING_SELECTION_UNDO,
+                               GIMP_UNDO_FS_TO_LAYER, undo_desc,
+                               GIMP_DIRTY_IMAGE_STRUCTURE,
+                               "item", floating_layer,
+                               NULL);
+
+  return undo;
+}
+
+
+/******************************************************************************/
+/*  Something for which programmer is too lazy to write an undo function for  */
+/******************************************************************************/
+
+static void
+undo_pop_cantundo (GimpUndo            *undo,
+                   GimpUndoMode         undo_mode,
+                   GimpUndoAccumulator *accum)
+{
+  switch (undo_mode)
+    {
+    case GIMP_UNDO_MODE_UNDO:
+      gimp_message (undo->image->gimp, NULL, GIMP_MESSAGE_WARNING,
+                    _("Can't undo %s"), gimp_object_get_name (undo));
+      break;
+
+    case GIMP_UNDO_MODE_REDO:
+      break;
+    }
+}
+
+GimpUndo *
+gimp_image_undo_push_cantundo (GimpImage   *image,
+                               const gchar *undo_desc)
+{
+  GimpUndo *undo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  /* This is the sole purpose of this type of undo: the ability to
+   * mark an image as having been mutated, without really providing
+   * any adequate undo facility.
+   */
+
+  undo = gimp_image_undo_push (image, GIMP_TYPE_UNDO,
+                               GIMP_UNDO_CANT, undo_desc,
+                               GIMP_DIRTY_ALL,
+                               NULL);
+
+  if (undo)
+    g_signal_connect (undo, "pop",
+                      G_CALLBACK (undo_pop_cantundo),
+                      NULL);
+
+  return undo;
+}
diff --git a/app/core/gimpimage-undo-push.h b/app/core/gimpimage-undo-push.h
new file mode 100644
index 0000000..f06fcd8
--- /dev/null
+++ b/app/core/gimpimage-undo-push.h
@@ -0,0 +1,256 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_UNDO_PUSH_H__
+#define __GIMP_IMAGE_UNDO_PUSH_H__
+
+
+/*  image undos  */
+
+GimpUndo * gimp_image_undo_push_image_type          (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+GimpUndo * gimp_image_undo_push_image_precision     (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+GimpUndo * gimp_image_undo_push_image_size          (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     gint           previous_origin_x,
+                                                     gint           previous_origin_y,
+                                                     gint           previous_width,
+                                                     gint           prevoius_height);
+GimpUndo * gimp_image_undo_push_image_resolution    (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+GimpUndo * gimp_image_undo_push_image_grid          (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpGrid      *grid);
+GimpUndo * gimp_image_undo_push_image_colormap      (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+GimpUndo * gimp_image_undo_push_image_color_managed (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+GimpUndo * gimp_image_undo_push_image_metadata      (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+GimpUndo * gimp_image_undo_push_image_parasite      (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     const GimpParasite *parasite);
+GimpUndo * gimp_image_undo_push_image_parasite_remove (GimpImage   *image,
+                                                     const gchar   *undo_desc,
+                                                     const gchar   *name);
+
+
+/*  guide & sample point undos  */
+
+GimpUndo * gimp_image_undo_push_guide               (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpGuide     *guide);
+GimpUndo * gimp_image_undo_push_sample_point        (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpSamplePoint *sample_point);
+
+
+/*  drawable undos  */
+
+GimpUndo * gimp_image_undo_push_drawable            (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpDrawable  *drawable,
+                                                     GeglBuffer    *buffer,
+                                                     gint           x,
+                                                     gint           y);
+GimpUndo * gimp_image_undo_push_drawable_mod        (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpDrawable  *drawable,
+                                                     gboolean       copy_buffer);
+
+
+/*  mask undos  */
+
+GimpUndo * gimp_image_undo_push_mask                (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpChannel   *mask);
+GimpUndo * gimp_image_undo_push_mask_precision      (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpChannel   *mask);
+
+
+/*  item undos  */
+
+GimpUndo * gimp_image_undo_push_item_reorder        (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_rename         (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_displace       (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_visibility     (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_linked         (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_color_tag      (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_lock_content   (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_lock_position  (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item);
+GimpUndo * gimp_image_undo_push_item_parasite       (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item,
+                                                     const GimpParasite *parasite);
+GimpUndo * gimp_image_undo_push_item_parasite_remove(GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpItem      *item,
+                                                     const gchar   *name);
+
+
+/*  layer undos  */
+
+GimpUndo * gimp_image_undo_push_layer_add           (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer,
+                                                     GimpLayer     *prev_layer);
+GimpUndo * gimp_image_undo_push_layer_remove        (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer,
+                                                     GimpLayer     *prev_parent,
+                                                     gint           prev_position,
+                                                     GimpLayer     *prev_layer);
+GimpUndo * gimp_image_undo_push_layer_mode          (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer);
+GimpUndo * gimp_image_undo_push_layer_opacity       (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer);
+GimpUndo * gimp_image_undo_push_layer_lock_alpha    (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer);
+
+
+/*  group layer undos  */
+
+GimpUndo *
+    gimp_image_undo_push_group_layer_suspend_resize (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+GimpUndo *
+     gimp_image_undo_push_group_layer_resume_resize (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+GimpUndo *
+      gimp_image_undo_push_group_layer_suspend_mask (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+GimpUndo *
+       gimp_image_undo_push_group_layer_resume_mask (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+GimpUndo *
+   gimp_image_undo_push_group_layer_start_transform (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+GimpUndo *
+     gimp_image_undo_push_group_layer_end_transform (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+GimpUndo * gimp_image_undo_push_group_layer_convert (GimpImage      *image,
+                                                     const gchar    *undo_desc,
+                                                     GimpGroupLayer *group);
+
+
+/*  text layer undos  */
+
+GimpUndo * gimp_image_undo_push_text_layer          (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpTextLayer *layer,
+                                                     const GParamSpec *pspec);
+GimpUndo * gimp_image_undo_push_text_layer_modified (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpTextLayer *layer);
+GimpUndo * gimp_image_undo_push_text_layer_convert  (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpTextLayer *layer);
+
+
+/*  layer mask undos  */
+
+GimpUndo * gimp_image_undo_push_layer_mask_add      (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer,
+                                                     GimpLayerMask *mask);
+GimpUndo * gimp_image_undo_push_layer_mask_remove   (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer,
+                                                     GimpLayerMask *mask);
+GimpUndo * gimp_image_undo_push_layer_mask_apply    (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer);
+GimpUndo * gimp_image_undo_push_layer_mask_show     (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *layer);
+
+
+/*  channel undos  */
+
+GimpUndo * gimp_image_undo_push_channel_add         (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpChannel   *channel,
+                                                     GimpChannel   *prev_channel);
+GimpUndo * gimp_image_undo_push_channel_remove      (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpChannel   *channel,
+                                                     GimpChannel   *prev_parent,
+                                                     gint           prev_position,
+                                                     GimpChannel   *prev_channel);
+GimpUndo * gimp_image_undo_push_channel_color       (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpChannel   *channel);
+
+
+/*  vectors undos  */
+
+GimpUndo * gimp_image_undo_push_vectors_add         (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpVectors   *vectors,
+                                                     GimpVectors   *prev_vectors);
+GimpUndo * gimp_image_undo_push_vectors_remove      (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpVectors   *vectors,
+                                                     GimpVectors   *prev_parent,
+                                                     gint           prev_position,
+                                                     GimpVectors   *prev_vectors);
+GimpUndo * gimp_image_undo_push_vectors_mod         (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpVectors   *vectors);
+
+
+/*  floating selection undos  */
+
+GimpUndo * gimp_image_undo_push_fs_to_layer         (GimpImage     *image,
+                                                     const gchar   *undo_desc,
+                                                     GimpLayer     *floating_layer);
+
+
+/*  EEK undo  */
+
+GimpUndo * gimp_image_undo_push_cantundo            (GimpImage     *image,
+                                                     const gchar   *undo_desc);
+
+
+#endif  /* __GIMP_IMAGE_UNDO_PUSH_H__ */
diff --git a/app/core/gimpimage-undo.c b/app/core/gimpimage-undo.c
new file mode 100644
index 0000000..fbf808b
--- /dev/null
+++ b/app/core/gimpimage-undo.c
@@ -0,0 +1,695 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimp-utils.h"
+#include "gimpimage.h"
+#include "gimpimage-private.h"
+#include "gimpimage-undo.h"
+#include "gimpitem.h"
+#include "gimplist.h"
+#include "gimpundostack.h"
+
+
+/*  local function prototypes  */
+
+static void          gimp_image_undo_pop_stack       (GimpImage     *image,
+                                                      GimpUndoStack *undo_stack,
+                                                      GimpUndoStack *redo_stack,
+                                                      GimpUndoMode   undo_mode);
+static void          gimp_image_undo_free_space      (GimpImage     *image);
+static void          gimp_image_undo_free_redo       (GimpImage     *image);
+
+static GimpDirtyMask gimp_image_undo_dirty_from_type (GimpUndoType   undo_type);
+
+
+/*  public functions  */
+
+gboolean
+gimp_image_undo_is_enabled (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return (GIMP_IMAGE_GET_PRIVATE (image)->undo_freeze_count == 0);
+}
+
+gboolean
+gimp_image_undo_enable (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  /*  Free all undo steps as they are now invalidated  */
+  gimp_image_undo_free (image);
+
+  return gimp_image_undo_thaw (image);
+}
+
+gboolean
+gimp_image_undo_disable (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return gimp_image_undo_freeze (image);
+}
+
+gboolean
+gimp_image_undo_freeze (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->undo_freeze_count++;
+
+  if (private->undo_freeze_count == 1)
+    gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_FREEZE, NULL);
+
+  return TRUE;
+}
+
+gboolean
+gimp_image_undo_thaw (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_val_if_fail (private->undo_freeze_count > 0, FALSE);
+
+  private->undo_freeze_count--;
+
+  if (private->undo_freeze_count == 0)
+    gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_THAW, NULL);
+
+  return TRUE;
+}
+
+gboolean
+gimp_image_undo (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_val_if_fail (private->pushing_undo_group == GIMP_UNDO_GROUP_NONE,
+                        FALSE);
+
+  gimp_image_undo_pop_stack (image,
+                             private->undo_stack,
+                             private->redo_stack,
+                             GIMP_UNDO_MODE_UNDO);
+
+  return TRUE;
+}
+
+gboolean
+gimp_image_redo (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_val_if_fail (private->pushing_undo_group == GIMP_UNDO_GROUP_NONE,
+                        FALSE);
+
+  gimp_image_undo_pop_stack (image,
+                             private->redo_stack,
+                             private->undo_stack,
+                             GIMP_UNDO_MODE_REDO);
+
+  return TRUE;
+}
+
+/*
+ * this function continues to undo as long as it only sees certain
+ * undo types, in particular visibility changes.
+ */
+gboolean
+gimp_image_strong_undo (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpUndo         *undo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_val_if_fail (private->pushing_undo_group == GIMP_UNDO_GROUP_NONE,
+                        FALSE);
+
+  undo = gimp_undo_stack_peek (private->undo_stack);
+
+  gimp_image_undo (image);
+
+  while (gimp_undo_is_weak (undo))
+    {
+      undo = gimp_undo_stack_peek (private->undo_stack);
+      if (gimp_undo_is_weak (undo))
+        gimp_image_undo (image);
+    }
+
+  return TRUE;
+}
+
+/*
+ * this function continues to redo as long as it only sees certain
+ * undo types, in particular visibility changes.  Note that the
+ * order of events is set up to make it exactly reverse
+ * gimp_image_strong_undo().
+ */
+gboolean
+gimp_image_strong_redo (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpUndo         *undo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_return_val_if_fail (private->pushing_undo_group == GIMP_UNDO_GROUP_NONE,
+                        FALSE);
+
+  undo = gimp_undo_stack_peek (private->redo_stack);
+
+  gimp_image_redo (image);
+
+  while (gimp_undo_is_weak (undo))
+    {
+      undo = gimp_undo_stack_peek (private->redo_stack);
+      if (gimp_undo_is_weak (undo))
+        gimp_image_redo (image);
+    }
+
+  return TRUE;
+}
+
+GimpUndoStack *
+gimp_image_get_undo_stack (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->undo_stack;
+}
+
+GimpUndoStack *
+gimp_image_get_redo_stack (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->redo_stack;
+}
+
+void
+gimp_image_undo_free (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  Emit the UNDO_FREE event before actually freeing everything
+   *  so the views can properly detach from the undo items
+   */
+  gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_FREE, NULL);
+
+  gimp_undo_free (GIMP_UNDO (private->undo_stack), GIMP_UNDO_MODE_UNDO);
+  gimp_undo_free (GIMP_UNDO (private->redo_stack), GIMP_UNDO_MODE_REDO);
+
+  /* If the image was dirty, but could become clean by redo-ing
+   * some actions, then it should now become 'infinitely' dirty.
+   * This is because we've just nuked the actions that would allow
+   * the image to become clean again.
+   */
+  if (private->dirty < 0)
+    private->dirty = 100000;
+
+  /* The same applies to the case where the image would become clean
+   * due to undo actions, but since user can't undo without an undo
+   * stack, that's not so much a problem.
+   */
+}
+
+gint
+gimp_image_get_undo_group_count (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->group_count;
+}
+
+gboolean
+gimp_image_undo_group_start (GimpImage    *image,
+                             GimpUndoType  undo_type,
+                             const gchar  *name)
+{
+  GimpImagePrivate *private;
+  GimpUndoStack    *undo_group;
+  GimpDirtyMask     dirty_mask;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (undo_type >  GIMP_UNDO_GROUP_FIRST &&
+                        undo_type <= GIMP_UNDO_GROUP_LAST, FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! name)
+    name = gimp_undo_type_to_name (undo_type);
+
+  dirty_mask = gimp_image_undo_dirty_from_type (undo_type);
+
+  /* Notify listeners that the image will be modified */
+  if (private->group_count == 0 && dirty_mask != GIMP_DIRTY_NONE)
+    gimp_image_dirty (image, dirty_mask);
+
+  if (private->undo_freeze_count > 0)
+    return FALSE;
+
+  private->group_count++;
+
+  /*  If we're already in a group...ignore  */
+  if (private->group_count > 1)
+    return TRUE;
+
+  /*  nuke the redo stack  */
+  gimp_image_undo_free_redo (image);
+
+  undo_group = gimp_undo_stack_new (image);
+
+  gimp_object_set_name (GIMP_OBJECT (undo_group), name);
+  GIMP_UNDO (undo_group)->undo_type  = undo_type;
+  GIMP_UNDO (undo_group)->dirty_mask = dirty_mask;
+
+  gimp_undo_stack_push_undo (private->undo_stack, GIMP_UNDO (undo_group));
+
+  private->pushing_undo_group = undo_type;
+
+  return TRUE;
+}
+
+gboolean
+gimp_image_undo_group_end (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->undo_freeze_count > 0)
+    return FALSE;
+
+  g_return_val_if_fail (private->group_count > 0, FALSE);
+
+  private->group_count--;
+
+  if (private->group_count == 0)
+    {
+      private->pushing_undo_group = GIMP_UNDO_GROUP_NONE;
+
+      /* Do it here, since undo_push doesn't emit this event while in
+       * the middle of a group
+       */
+      gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_PUSHED,
+                             gimp_undo_stack_peek (private->undo_stack));
+
+      gimp_image_undo_free_space (image);
+    }
+
+  return TRUE;
+}
+
+GimpUndo *
+gimp_image_undo_push (GimpImage     *image,
+                      GType          object_type,
+                      GimpUndoType   undo_type,
+                      const gchar   *name,
+                      GimpDirtyMask  dirty_mask,
+                      ...)
+{
+  GimpImagePrivate  *private;
+  gint               n_properties = 0;
+  gchar            **names        = NULL;
+  GValue            *values       = NULL;
+  va_list            args;
+  GimpUndo          *undo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (g_type_is_a (object_type, GIMP_TYPE_UNDO), NULL);
+  g_return_val_if_fail (undo_type > GIMP_UNDO_GROUP_LAST, NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /* Does this undo dirty the image?  If so, we always want to mark
+   * image dirty, even if we can't actually push the undo.
+   */
+  if (dirty_mask != GIMP_DIRTY_NONE)
+    gimp_image_dirty (image, dirty_mask);
+
+  if (private->undo_freeze_count > 0)
+    return NULL;
+
+  if (! name)
+    name = gimp_undo_type_to_name (undo_type);
+
+  names = gimp_properties_append (object_type,
+                                  &n_properties, names, &values,
+                                  "name",       name,
+                                  "image",      image,
+                                  "undo-type",  undo_type,
+                                  "dirty-mask", dirty_mask,
+                                  NULL);
+
+  va_start (args, dirty_mask);
+  names = gimp_properties_append_valist (object_type,
+                                         &n_properties, names, &values,
+                                         args);
+  va_end (args);
+
+  undo = (GimpUndo *) g_object_new_with_properties (object_type,
+                                                    n_properties,
+                                                    (const gchar **) names,
+                                                    (const GValue *) values);
+
+  gimp_properties_free (n_properties, names, values);
+
+  /*  nuke the redo stack  */
+  gimp_image_undo_free_redo (image);
+
+  if (private->pushing_undo_group == GIMP_UNDO_GROUP_NONE)
+    {
+      gimp_undo_stack_push_undo (private->undo_stack, undo);
+
+      gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_PUSHED, undo);
+
+      gimp_image_undo_free_space (image);
+
+      /*  freeing undo space may have freed the newly pushed undo  */
+      if (gimp_undo_stack_peek (private->undo_stack) == undo)
+        return undo;
+    }
+  else
+    {
+      GimpUndoStack *undo_group;
+
+      undo_group = GIMP_UNDO_STACK (gimp_undo_stack_peek (private->undo_stack));
+
+      gimp_undo_stack_push_undo (undo_group, undo);
+
+      return undo;
+    }
+
+  return NULL;
+}
+
+GimpUndo *
+gimp_image_undo_can_compress (GimpImage    *image,
+                              GType         object_type,
+                              GimpUndoType  undo_type)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (gimp_image_is_dirty (image) &&
+      ! gimp_undo_stack_peek (private->redo_stack))
+    {
+      GimpUndo *undo = gimp_undo_stack_peek (private->undo_stack);
+
+      if (undo && undo->undo_type == undo_type &&
+          g_type_is_a (G_TYPE_FROM_INSTANCE (undo), object_type))
+        {
+          return undo;
+        }
+    }
+
+  return NULL;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_undo_pop_stack (GimpImage     *image,
+                           GimpUndoStack *undo_stack,
+                           GimpUndoStack *redo_stack,
+                           GimpUndoMode   undo_mode)
+{
+  GimpUndo            *undo;
+  GimpUndoAccumulator  accum = { 0, };
+
+  g_object_freeze_notify (G_OBJECT (image));
+
+  undo = gimp_undo_stack_pop_undo (undo_stack, undo_mode, &accum);
+
+  if (undo)
+    {
+      if (GIMP_IS_UNDO_STACK (undo))
+        gimp_list_reverse (GIMP_LIST (GIMP_UNDO_STACK (undo)->undos));
+
+      gimp_undo_stack_push_undo (redo_stack, undo);
+
+      if (accum.mode_changed)
+        gimp_image_mode_changed (image);
+
+      if (accum.precision_changed)
+        gimp_image_precision_changed (image);
+
+      if (accum.size_changed)
+        gimp_image_size_changed_detailed (image,
+                                          accum.previous_origin_x,
+                                          accum.previous_origin_y,
+                                          accum.previous_width,
+                                          accum.previous_height);
+
+      if (accum.resolution_changed)
+        gimp_image_resolution_changed (image);
+
+      if (accum.unit_changed)
+        gimp_image_unit_changed (image);
+
+      /* let others know that we just popped an action */
+      gimp_image_undo_event (image,
+                             (undo_mode == GIMP_UNDO_MODE_UNDO) ?
+                             GIMP_UNDO_EVENT_UNDO : GIMP_UNDO_EVENT_REDO,
+                             undo);
+    }
+
+  g_object_thaw_notify (G_OBJECT (image));
+}
+
+static void
+gimp_image_undo_free_space (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpContainer    *container;
+  gint              min_undo_levels;
+  gint              max_undo_levels;
+  gint64            undo_size;
+
+  container = private->undo_stack->undos;
+
+  min_undo_levels = image->gimp->config->levels_of_undo;
+  max_undo_levels = 1024; /* FIXME */
+  undo_size       = image->gimp->config->undo_size;
+
+#ifdef DEBUG_IMAGE_UNDO
+  g_printerr ("undo_steps: %d    undo_bytes: %ld\n",
+              gimp_container_get_n_children (container),
+              (glong) gimp_object_get_memsize (GIMP_OBJECT (container), NULL));
+#endif
+
+  /*  keep at least min_undo_levels undo steps  */
+  if (gimp_container_get_n_children (container) <= min_undo_levels)
+    return;
+
+  while ((gimp_object_get_memsize (GIMP_OBJECT (container), NULL) > undo_size) ||
+         (gimp_container_get_n_children (container) > max_undo_levels))
+    {
+      GimpUndo *freed = gimp_undo_stack_free_bottom (private->undo_stack,
+                                                     GIMP_UNDO_MODE_UNDO);
+
+#ifdef DEBUG_IMAGE_UNDO
+      g_printerr ("freed one step: undo_steps: %d    undo_bytes: %ld\n",
+                  gimp_container_get_n_children (container),
+                  (glong) gimp_object_get_memsize (GIMP_OBJECT (container),
+                                                   NULL));
+#endif
+
+      gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_EXPIRED, freed);
+
+      g_object_unref (freed);
+
+      if (gimp_container_get_n_children (container) <= min_undo_levels)
+        return;
+    }
+}
+
+static void
+gimp_image_undo_free_redo (GimpImage *image)
+{
+  GimpImagePrivate *private   = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpContainer    *container = private->redo_stack->undos;
+
+#ifdef DEBUG_IMAGE_UNDO
+  g_printerr ("redo_steps: %d    redo_bytes: %ld\n",
+              gimp_container_get_n_children (container),
+              (glong) gimp_object_get_memsize (GIMP_OBJECT (container), NULL));
+#endif
+
+  if (gimp_container_is_empty (container))
+    return;
+
+  while (gimp_container_get_n_children (container) > 0)
+    {
+      GimpUndo *freed = gimp_undo_stack_free_bottom (private->redo_stack,
+                                                     GIMP_UNDO_MODE_REDO);
+
+#ifdef DEBUG_IMAGE_UNDO
+      g_printerr ("freed one step: redo_steps: %d    redo_bytes: %ld\n",
+                  gimp_container_get_n_children (container),
+                  (glong )gimp_object_get_memsize (GIMP_OBJECT (container),
+                                                   NULL));
+#endif
+
+      gimp_image_undo_event (image, GIMP_UNDO_EVENT_REDO_EXPIRED, freed);
+
+      g_object_unref (freed);
+    }
+
+  /* We need to use <= here because the undo counter has already been
+   * incremented at this point.
+   */
+  if (private->dirty <= 0)
+    {
+      /* If the image was dirty, but could become clean by redo-ing
+       * some actions, then it should now become 'infinitely' dirty.
+       * This is because we've just nuked the actions that would allow
+       * the image to become clean again.
+       */
+      private->dirty = 100000;
+    }
+}
+
+static GimpDirtyMask
+gimp_image_undo_dirty_from_type (GimpUndoType undo_type)
+{
+  switch (undo_type)
+    {
+    case GIMP_UNDO_GROUP_IMAGE_SCALE:
+    case GIMP_UNDO_GROUP_IMAGE_RESIZE:
+    case GIMP_UNDO_GROUP_IMAGE_FLIP:
+    case GIMP_UNDO_GROUP_IMAGE_ROTATE:
+    case GIMP_UNDO_GROUP_IMAGE_TRANSFORM:
+    case GIMP_UNDO_GROUP_IMAGE_CROP:
+      return GIMP_DIRTY_IMAGE | GIMP_DIRTY_IMAGE_SIZE;
+
+    case GIMP_UNDO_GROUP_IMAGE_CONVERT:
+      return GIMP_DIRTY_IMAGE | GIMP_DIRTY_DRAWABLE;
+
+    case GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE:
+      return GIMP_DIRTY_IMAGE_STRUCTURE | GIMP_DIRTY_DRAWABLE;
+
+    case GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE:
+      return GIMP_DIRTY_IMAGE_STRUCTURE | GIMP_DIRTY_VECTORS;
+
+    case GIMP_UNDO_GROUP_IMAGE_QUICK_MASK: /* FIXME */
+      return GIMP_DIRTY_IMAGE_STRUCTURE | GIMP_DIRTY_SELECTION;
+
+    case GIMP_UNDO_GROUP_IMAGE_GRID:
+    case GIMP_UNDO_GROUP_GUIDE:
+      return GIMP_DIRTY_IMAGE_META;
+
+    case GIMP_UNDO_GROUP_DRAWABLE:
+    case GIMP_UNDO_GROUP_DRAWABLE_MOD:
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE;
+
+    case GIMP_UNDO_GROUP_MASK: /* FIXME */
+      return GIMP_DIRTY_SELECTION;
+
+    case GIMP_UNDO_GROUP_ITEM_VISIBILITY:
+    case GIMP_UNDO_GROUP_ITEM_LINKED:
+    case GIMP_UNDO_GROUP_ITEM_PROPERTIES:
+      return GIMP_DIRTY_ITEM_META;
+
+    case GIMP_UNDO_GROUP_ITEM_DISPLACE: /* FIXME */
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE | GIMP_DIRTY_VECTORS;
+
+    case GIMP_UNDO_GROUP_ITEM_SCALE: /* FIXME */
+    case GIMP_UNDO_GROUP_ITEM_RESIZE: /* FIXME */
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE | GIMP_DIRTY_VECTORS;
+
+    case GIMP_UNDO_GROUP_LAYER_ADD_MASK:
+    case GIMP_UNDO_GROUP_LAYER_APPLY_MASK:
+      return GIMP_DIRTY_IMAGE_STRUCTURE;
+
+    case GIMP_UNDO_GROUP_FS_TO_LAYER:
+    case GIMP_UNDO_GROUP_FS_FLOAT:
+    case GIMP_UNDO_GROUP_FS_ANCHOR:
+      return GIMP_DIRTY_IMAGE_STRUCTURE;
+
+    case GIMP_UNDO_GROUP_EDIT_PASTE:
+      return GIMP_DIRTY_IMAGE_STRUCTURE;
+
+    case GIMP_UNDO_GROUP_EDIT_CUT:
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE;
+
+    case GIMP_UNDO_GROUP_TEXT:
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE;
+
+    case GIMP_UNDO_GROUP_TRANSFORM: /* FIXME */
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE | GIMP_DIRTY_VECTORS;
+
+    case GIMP_UNDO_GROUP_PAINT:
+      return GIMP_DIRTY_ITEM | GIMP_DIRTY_DRAWABLE;
+
+    case GIMP_UNDO_GROUP_PARASITE_ATTACH:
+    case GIMP_UNDO_GROUP_PARASITE_REMOVE:
+      return GIMP_DIRTY_IMAGE_META | GIMP_DIRTY_ITEM_META;
+
+    case GIMP_UNDO_GROUP_VECTORS_IMPORT:
+      return GIMP_DIRTY_IMAGE_STRUCTURE | GIMP_DIRTY_VECTORS;
+
+    case GIMP_UNDO_GROUP_MISC:
+      return GIMP_DIRTY_ALL;
+
+    default:
+      break;
+    }
+
+  return GIMP_DIRTY_ALL;
+}
diff --git a/app/core/gimpimage-undo.h b/app/core/gimpimage-undo.h
new file mode 100644
index 0000000..34bd2f4
--- /dev/null
+++ b/app/core/gimpimage-undo.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE__UNDO_H__
+#define __GIMP_IMAGE__UNDO_H__
+
+
+gboolean        gimp_image_undo_is_enabled      (GimpImage     *image);
+gboolean        gimp_image_undo_enable          (GimpImage     *image);
+gboolean        gimp_image_undo_disable         (GimpImage     *image);
+gboolean        gimp_image_undo_freeze          (GimpImage     *image);
+gboolean        gimp_image_undo_thaw            (GimpImage     *image);
+
+gboolean        gimp_image_undo                 (GimpImage     *image);
+gboolean        gimp_image_redo                 (GimpImage     *image);
+
+gboolean        gimp_image_strong_undo          (GimpImage     *image);
+gboolean        gimp_image_strong_redo          (GimpImage     *image);
+
+GimpUndoStack * gimp_image_get_undo_stack       (GimpImage     *image);
+GimpUndoStack * gimp_image_get_redo_stack       (GimpImage     *image);
+
+void            gimp_image_undo_free            (GimpImage     *image);
+
+gint            gimp_image_get_undo_group_count (GimpImage     *image);
+gboolean        gimp_image_undo_group_start     (GimpImage     *image,
+                                                 GimpUndoType   undo_type,
+                                                 const gchar   *name);
+gboolean        gimp_image_undo_group_end       (GimpImage     *image);
+
+GimpUndo      * gimp_image_undo_push            (GimpImage     *image,
+                                                 GType          object_type,
+                                                 GimpUndoType   undo_type,
+                                                 const gchar   *name,
+                                                 GimpDirtyMask  dirty_mask,
+                                                 ...) G_GNUC_NULL_TERMINATED;
+
+GimpUndo      * gimp_image_undo_can_compress    (GimpImage     *image,
+                                                 GType          object_type,
+                                                 GimpUndoType   undo_type);
+
+
+#endif /* __GIMP_IMAGE__UNDO_H__ */
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
new file mode 100644
index 0000000..9908d1b
--- /dev/null
+++ b/app/core/gimpimage.c
@@ -0,0 +1,5191 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <time.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+#include <gexiv2/gexiv2.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimp.h"
+#include "gimp-memsize.h"
+#include "gimp-parasites.h"
+#include "gimp-utils.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-floating-selection.h"
+#include "gimpdrawablestack.h"
+#include "gimpgrid.h"
+#include "gimperror.h"
+#include "gimpguide.h"
+#include "gimpidtable.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-item-list.h"
+#include "gimpimage-metadata.h"
+#include "gimpimage-sample-points.h"
+#include "gimpimage-preview.h"
+#include "gimpimage-private.h"
+#include "gimpimage-quick-mask.h"
+#include "gimpimage-symmetry.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitemtree.h"
+#include "gimplayer.h"
+#include "gimplayer-floating-selection.h"
+#include "gimplayermask.h"
+#include "gimplayerstack.h"
+#include "gimpmarshal.h"
+#include "gimpparasitelist.h"
+#include "gimppickable.h"
+#include "gimpprojectable.h"
+#include "gimpprojection.h"
+#include "gimpsamplepoint.h"
+#include "gimpselection.h"
+#include "gimpsymmetry.h"
+#include "gimptempbuf.h"
+#include "gimptemplate.h"
+#include "gimpundostack.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+#ifdef DEBUG
+#define TRC(x) g_printerr x
+#else
+#define TRC(x)
+#endif
+
+
+enum
+{
+  MODE_CHANGED,
+  PRECISION_CHANGED,
+  ALPHA_CHANGED,
+  FLOATING_SELECTION_CHANGED,
+  ACTIVE_LAYER_CHANGED,
+  ACTIVE_CHANNEL_CHANGED,
+  ACTIVE_VECTORS_CHANGED,
+  LINKED_ITEMS_CHANGED,
+  COMPONENT_VISIBILITY_CHANGED,
+  COMPONENT_ACTIVE_CHANGED,
+  MASK_CHANGED,
+  RESOLUTION_CHANGED,
+  SIZE_CHANGED_DETAILED,
+  UNIT_CHANGED,
+  QUICK_MASK_CHANGED,
+  SELECTION_INVALIDATE,
+  CLEAN,
+  DIRTY,
+  SAVING,
+  SAVED,
+  EXPORTED,
+  GUIDE_ADDED,
+  GUIDE_REMOVED,
+  GUIDE_MOVED,
+  SAMPLE_POINT_ADDED,
+  SAMPLE_POINT_REMOVED,
+  SAMPLE_POINT_MOVED,
+  PARASITE_ATTACHED,
+  PARASITE_DETACHED,
+  COLORMAP_CHANGED,
+  UNDO_EVENT,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_ID,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_BASE_TYPE,
+  PROP_PRECISION,
+  PROP_METADATA,
+  PROP_BUFFER,
+  PROP_SYMMETRY,
+  PROP_CONVERTING,
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_color_managed_iface_init    (GimpColorManagedInterface *iface);
+static void     gimp_projectable_iface_init      (GimpProjectableInterface  *iface);
+static void     gimp_pickable_iface_init         (GimpPickableInterface     *iface);
+
+static void     gimp_image_constructed           (GObject           *object);
+static void     gimp_image_set_property          (GObject           *object,
+                                                  guint              property_id,
+                                                  const GValue      *value,
+                                                  GParamSpec        *pspec);
+static void     gimp_image_get_property          (GObject           *object,
+                                                  guint              property_id,
+                                                  GValue            *value,
+                                                  GParamSpec        *pspec);
+static void     gimp_image_dispose               (GObject           *object);
+static void     gimp_image_finalize              (GObject           *object);
+
+static void     gimp_image_name_changed          (GimpObject        *object);
+static gint64   gimp_image_get_memsize           (GimpObject        *object,
+                                                  gint64            *gui_size);
+
+static gboolean gimp_image_get_size              (GimpViewable      *viewable,
+                                                  gint              *width,
+                                                  gint              *height);
+static void     gimp_image_size_changed          (GimpViewable      *viewable);
+static gchar  * gimp_image_get_description       (GimpViewable      *viewable,
+                                                  gchar            **tooltip);
+
+static void     gimp_image_real_mode_changed     (GimpImage         *image);
+static void     gimp_image_real_precision_changed(GimpImage         *image);
+static void     gimp_image_real_resolution_changed(GimpImage        *image);
+static void     gimp_image_real_size_changed_detailed
+                                                 (GimpImage         *image,
+                                                  gint               previous_origin_x,
+                                                  gint               previous_origin_y,
+                                                  gint               previous_width,
+                                                  gint               previous_height);
+static void     gimp_image_real_unit_changed     (GimpImage         *image);
+static void     gimp_image_real_colormap_changed (GimpImage         *image,
+                                                  gint               color_index);
+
+static const guint8 *
+        gimp_image_color_managed_get_icc_profile (GimpColorManaged  *managed,
+                                                  gsize             *len);
+static GimpColorProfile *
+      gimp_image_color_managed_get_color_profile (GimpColorManaged  *managed);
+static void
+        gimp_image_color_managed_profile_changed (GimpColorManaged  *managed);
+
+static void        gimp_image_projectable_flush  (GimpProjectable   *projectable,
+                                                  gboolean           invalidate_preview);
+static GeglRectangle gimp_image_get_bounding_box (GimpProjectable   *projectable);
+static GeglNode   * gimp_image_get_graph         (GimpProjectable   *projectable);
+static GimpImage  * gimp_image_get_image         (GimpProjectable   *projectable);
+static const Babl * gimp_image_get_proj_format   (GimpProjectable   *projectable);
+
+static void         gimp_image_pickable_flush    (GimpPickable      *pickable);
+static GeglBuffer * gimp_image_get_buffer        (GimpPickable      *pickable);
+static gboolean     gimp_image_get_pixel_at      (GimpPickable      *pickable,
+                                                  gint               x,
+                                                  gint               y,
+                                                  const Babl        *format,
+                                                  gpointer           pixel);
+static gdouble      gimp_image_get_opacity_at    (GimpPickable      *pickable,
+                                                  gint               x,
+                                                  gint               y);
+static void         gimp_image_get_pixel_average (GimpPickable      *pickable,
+                                                  const GeglRectangle *rect,
+                                                  const Babl        *format,
+                                                  gpointer           pixel);
+static void         gimp_image_pixel_to_srgb     (GimpPickable      *pickable,
+                                                  const Babl        *format,
+                                                  gpointer           pixel,
+                                                  GimpRGB           *color);
+static void         gimp_image_srgb_to_pixel     (GimpPickable      *pickable,
+                                                  const GimpRGB     *color,
+                                                  const Babl        *format,
+                                                  gpointer           pixel);
+
+static void     gimp_image_projection_buffer_notify
+                                                 (GimpProjection    *projection,
+                                                  const GParamSpec  *pspec,
+                                                  GimpImage         *image);
+static void     gimp_image_mask_update           (GimpDrawable      *drawable,
+                                                  gint               x,
+                                                  gint               y,
+                                                  gint               width,
+                                                  gint               height,
+                                                  GimpImage         *image);
+static void     gimp_image_layers_changed        (GimpContainer     *container,
+                                                  GimpChannel       *channel,
+                                                  GimpImage         *image);
+static void     gimp_image_layer_offset_changed  (GimpDrawable      *drawable,
+                                                  const GParamSpec  *pspec,
+                                                  GimpImage         *image);
+static void     gimp_image_layer_bounding_box_changed
+                                                 (GimpDrawable      *drawable,
+                                                  GimpImage         *image);
+static void     gimp_image_layer_alpha_changed   (GimpDrawable      *drawable,
+                                                  GimpImage         *image);
+static void     gimp_image_channel_add           (GimpContainer     *container,
+                                                  GimpChannel       *channel,
+                                                  GimpImage         *image);
+static void     gimp_image_channel_remove        (GimpContainer     *container,
+                                                  GimpChannel       *channel,
+                                                  GimpImage         *image);
+static void     gimp_image_channel_name_changed  (GimpChannel       *channel,
+                                                  GimpImage         *image);
+static void     gimp_image_channel_color_changed (GimpChannel       *channel,
+                                                  GimpImage         *image);
+static void     gimp_image_active_layer_notify   (GimpItemTree      *tree,
+                                                  const GParamSpec  *pspec,
+                                                  GimpImage         *image);
+static void     gimp_image_active_channel_notify (GimpItemTree      *tree,
+                                                  const GParamSpec  *pspec,
+                                                  GimpImage         *image);
+static void     gimp_image_active_vectors_notify (GimpItemTree      *tree,
+                                                  const GParamSpec  *pspec,
+                                                  GimpImage         *image);
+
+static void     gimp_image_freeze_bounding_box   (GimpImage         *image);
+static void     gimp_image_thaw_bounding_box     (GimpImage         *image);
+static void     gimp_image_update_bounding_box   (GimpImage         *image);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpImage, gimp_image, GIMP_TYPE_VIEWABLE,
+                         G_ADD_PRIVATE (GimpImage)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
+                                                gimp_color_managed_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROJECTABLE,
+                                                gimp_projectable_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_pickable_iface_init))
+
+#define parent_class gimp_image_parent_class
+
+static guint gimp_image_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_image_class_init (GimpImageClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+
+  gimp_image_signals[MODE_CHANGED] =
+    g_signal_new ("mode-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, mode_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[PRECISION_CHANGED] =
+    g_signal_new ("precision-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, precision_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[ALPHA_CHANGED] =
+    g_signal_new ("alpha-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[FLOATING_SELECTION_CHANGED] =
+    g_signal_new ("floating-selection-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[ACTIVE_LAYER_CHANGED] =
+    g_signal_new ("active-layer-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
+    g_signal_new ("active-channel-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[ACTIVE_VECTORS_CHANGED] =
+    g_signal_new ("active-vectors-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, active_vectors_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[LINKED_ITEMS_CHANGED] =
+    g_signal_new ("linked-items-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, linked_items_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
+    g_signal_new ("component-visibility-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_CHANNEL_TYPE);
+
+  gimp_image_signals[COMPONENT_ACTIVE_CHANGED] =
+    g_signal_new ("component-active-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_CHANNEL_TYPE);
+
+  gimp_image_signals[MASK_CHANGED] =
+    g_signal_new ("mask-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, mask_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[RESOLUTION_CHANGED] =
+    g_signal_new ("resolution-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[SIZE_CHANGED_DETAILED] =
+    g_signal_new ("size-changed-detailed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, size_changed_detailed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT_INT_INT,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  gimp_image_signals[UNIT_CHANGED] =
+    g_signal_new ("unit-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, unit_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[QUICK_MASK_CHANGED] =
+    g_signal_new ("quick-mask-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, quick_mask_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[SELECTION_INVALIDATE] =
+    g_signal_new ("selection-invalidate",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, selection_invalidate),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[CLEAN] =
+    g_signal_new ("clean",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, clean),
+                  NULL, NULL,
+                  gimp_marshal_VOID__FLAGS,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DIRTY_MASK);
+
+  gimp_image_signals[DIRTY] =
+    g_signal_new ("dirty",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, dirty),
+                  NULL, NULL,
+                  gimp_marshal_VOID__FLAGS,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DIRTY_MASK);
+
+  gimp_image_signals[SAVING] =
+    g_signal_new ("saving",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, saving),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_image_signals[SAVED] =
+    g_signal_new ("saved",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, saved),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_FILE);
+
+  gimp_image_signals[EXPORTED] =
+    g_signal_new ("exported",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, exported),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_FILE);
+
+  gimp_image_signals[GUIDE_ADDED] =
+    g_signal_new ("guide-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, guide_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_GUIDE);
+
+  gimp_image_signals[GUIDE_REMOVED] =
+    g_signal_new ("guide-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, guide_removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_GUIDE);
+
+  gimp_image_signals[GUIDE_MOVED] =
+    g_signal_new ("guide-moved",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, guide_moved),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_GUIDE);
+
+  gimp_image_signals[SAMPLE_POINT_ADDED] =
+    g_signal_new ("sample-point-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, sample_point_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_SAMPLE_POINT);
+
+  gimp_image_signals[SAMPLE_POINT_REMOVED] =
+    g_signal_new ("sample-point-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, sample_point_removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_SAMPLE_POINT);
+
+  gimp_image_signals[SAMPLE_POINT_MOVED] =
+    g_signal_new ("sample-point-moved",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, sample_point_moved),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_SAMPLE_POINT);
+
+  gimp_image_signals[PARASITE_ATTACHED] =
+    g_signal_new ("parasite-attached",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, parasite_attached),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  gimp_image_signals[PARASITE_DETACHED] =
+    g_signal_new ("parasite-detached",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, parasite_detached),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  gimp_image_signals[COLORMAP_CHANGED] =
+    g_signal_new ("colormap-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+
+  gimp_image_signals[UNDO_EVENT] =
+    g_signal_new ("undo-event",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageClass, undo_event),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM_OBJECT,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_UNDO_EVENT,
+                  GIMP_TYPE_UNDO);
+
+  object_class->constructed           = gimp_image_constructed;
+  object_class->set_property          = gimp_image_set_property;
+  object_class->get_property          = gimp_image_get_property;
+  object_class->dispose               = gimp_image_dispose;
+  object_class->finalize              = gimp_image_finalize;
+
+  gimp_object_class->name_changed     = gimp_image_name_changed;
+  gimp_object_class->get_memsize      = gimp_image_get_memsize;
+
+  viewable_class->default_icon_name   = "gimp-image";
+  viewable_class->get_size            = gimp_image_get_size;
+  viewable_class->size_changed        = gimp_image_size_changed;
+  viewable_class->get_preview_size    = gimp_image_get_preview_size;
+  viewable_class->get_popup_size      = gimp_image_get_popup_size;
+  viewable_class->get_new_preview     = gimp_image_get_new_preview;
+  viewable_class->get_new_pixbuf      = gimp_image_get_new_pixbuf;
+  viewable_class->get_description     = gimp_image_get_description;
+
+  klass->mode_changed                 = gimp_image_real_mode_changed;
+  klass->precision_changed            = gimp_image_real_precision_changed;
+  klass->alpha_changed                = NULL;
+  klass->floating_selection_changed   = NULL;
+  klass->active_layer_changed         = NULL;
+  klass->active_channel_changed       = NULL;
+  klass->active_vectors_changed       = NULL;
+  klass->linked_items_changed         = NULL;
+  klass->component_visibility_changed = NULL;
+  klass->component_active_changed     = NULL;
+  klass->mask_changed                 = NULL;
+  klass->resolution_changed           = gimp_image_real_resolution_changed;
+  klass->size_changed_detailed        = gimp_image_real_size_changed_detailed;
+  klass->unit_changed                 = gimp_image_real_unit_changed;
+  klass->quick_mask_changed           = NULL;
+  klass->selection_invalidate         = NULL;
+
+  klass->clean                        = NULL;
+  klass->dirty                        = NULL;
+  klass->saving                       = NULL;
+  klass->saved                        = NULL;
+  klass->exported                     = NULL;
+  klass->guide_added                  = NULL;
+  klass->guide_removed                = NULL;
+  klass->guide_moved                  = NULL;
+  klass->sample_point_added           = NULL;
+  klass->sample_point_removed         = NULL;
+  klass->sample_point_moved           = NULL;
+  klass->parasite_attached            = NULL;
+  klass->parasite_detached            = NULL;
+  klass->colormap_changed             = gimp_image_real_colormap_changed;
+  klass->undo_event                   = NULL;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ID,
+                                   g_param_spec_int ("id", NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width", NULL, NULL,
+                                                     1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_int ("height", NULL, NULL,
+                                                     1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BASE_TYPE,
+                                   g_param_spec_enum ("base-type", NULL, NULL,
+                                                      GIMP_TYPE_IMAGE_BASE_TYPE,
+                                                      GIMP_RGB,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PRECISION,
+                                   g_param_spec_enum ("precision", NULL, NULL,
+                                                      GIMP_TYPE_PRECISION,
+                                                      GIMP_PRECISION_U8_GAMMA,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_METADATA,
+                                   g_param_spec_object ("metadata", NULL, NULL,
+                                                        GEXIV2_TYPE_METADATA,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_override_property (object_class, PROP_BUFFER, "buffer");
+
+  g_object_class_install_property (object_class, PROP_SYMMETRY,
+                                   g_param_spec_gtype ("symmetry",
+                                                       NULL, _("Symmetry"),
+                                                       GIMP_TYPE_SYMMETRY,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONVERTING,
+                                   g_param_spec_boolean ("converting",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
+{
+  iface->get_icc_profile   = gimp_image_color_managed_get_icc_profile;
+  iface->get_color_profile = gimp_image_color_managed_get_color_profile;
+  iface->profile_changed   = gimp_image_color_managed_profile_changed;
+}
+
+static void
+gimp_projectable_iface_init (GimpProjectableInterface *iface)
+{
+  iface->flush              = gimp_image_projectable_flush;
+  iface->get_image          = gimp_image_get_image;
+  iface->get_format         = gimp_image_get_proj_format;
+  iface->get_bounding_box   = gimp_image_get_bounding_box;
+  iface->get_graph          = gimp_image_get_graph;
+  iface->invalidate_preview = (void (*) (GimpProjectable*)) gimp_viewable_invalidate_preview;
+}
+
+static void
+gimp_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->flush                 = gimp_image_pickable_flush;
+  iface->get_image             = (GimpImage  * (*) (GimpPickable *pickable)) gimp_image_get_image;
+  iface->get_format            = (const Babl * (*) (GimpPickable *pickable)) gimp_image_get_proj_format;
+  iface->get_format_with_alpha = (const Babl * (*) (GimpPickable *pickable)) gimp_image_get_proj_format;
+  iface->get_buffer            = gimp_image_get_buffer;
+  iface->get_pixel_at          = gimp_image_get_pixel_at;
+  iface->get_opacity_at        = gimp_image_get_opacity_at;
+  iface->get_pixel_average     = gimp_image_get_pixel_average;
+  iface->pixel_to_srgb         = gimp_image_pixel_to_srgb;
+  iface->srgb_to_pixel         = gimp_image_srgb_to_pixel;
+}
+
+static void
+gimp_image_init (GimpImage *image)
+{
+  GimpImagePrivate *private = gimp_image_get_instance_private (image);
+  gint              i;
+
+  image->priv = private;
+
+  private->ID                  = 0;
+
+  private->load_proc           = NULL;
+  private->save_proc           = NULL;
+
+  private->width               = 0;
+  private->height              = 0;
+  private->xresolution         = 1.0;
+  private->yresolution         = 1.0;
+  private->resolution_set      = FALSE;
+  private->resolution_unit     = GIMP_UNIT_INCH;
+  private->base_type           = GIMP_RGB;
+  private->precision           = GIMP_PRECISION_U8_GAMMA;
+  private->new_layer_mode      = -1;
+
+  private->show_all            = 0;
+  private->bounding_box.x      = 0;
+  private->bounding_box.y      = 0;
+  private->bounding_box.width  = 0;
+  private->bounding_box.height = 0;
+  private->pickable_buffer     = NULL;
+
+  private->colormap            = NULL;
+  private->n_colors            = 0;
+  private->palette             = NULL;
+
+  private->is_color_managed    = TRUE;
+
+  private->metadata            = NULL;
+
+  private->dirty               = 1;
+  private->dirty_time          = 0;
+  private->undo_freeze_count   = 0;
+
+  private->export_dirty        = 1;
+
+  private->instance_count      = 0;
+  private->disp_count          = 0;
+
+  private->tattoo_state        = 0;
+
+  private->projection          = gimp_projection_new (GIMP_PROJECTABLE (image));
+
+  private->symmetries          = NULL;
+  private->active_symmetry     = NULL;
+
+  private->guides              = NULL;
+  private->grid                = NULL;
+  private->sample_points       = NULL;
+
+  private->layers              = gimp_item_tree_new (image,
+                                                     GIMP_TYPE_LAYER_STACK,
+                                                     GIMP_TYPE_LAYER);
+  private->channels            = gimp_item_tree_new (image,
+                                                     GIMP_TYPE_DRAWABLE_STACK,
+                                                     GIMP_TYPE_CHANNEL);
+  private->vectors             = gimp_item_tree_new (image,
+                                                     GIMP_TYPE_ITEM_STACK,
+                                                     GIMP_TYPE_VECTORS);
+  private->layer_stack         = NULL;
+
+  g_signal_connect (private->projection, "notify::buffer",
+                    G_CALLBACK (gimp_image_projection_buffer_notify),
+                    image);
+
+  g_signal_connect (private->layers, "notify::active-item",
+                    G_CALLBACK (gimp_image_active_layer_notify),
+                    image);
+  g_signal_connect (private->channels, "notify::active-item",
+                    G_CALLBACK (gimp_image_active_channel_notify),
+                    image);
+  g_signal_connect (private->vectors, "notify::active-item",
+                    G_CALLBACK (gimp_image_active_vectors_notify),
+                    image);
+
+  g_signal_connect_swapped (private->layers->container, "update",
+                            G_CALLBACK (gimp_image_invalidate),
+                            image);
+
+  private->layer_offset_x_handler =
+    gimp_container_add_handler (private->layers->container, "notify::offset-x",
+                                G_CALLBACK (gimp_image_layer_offset_changed),
+                                image);
+  private->layer_offset_y_handler =
+    gimp_container_add_handler (private->layers->container, "notify::offset-y",
+                                G_CALLBACK (gimp_image_layer_offset_changed),
+                                image);
+  private->layer_bounding_box_handler =
+    gimp_container_add_handler (private->layers->container, "bounding-box-changed",
+                                G_CALLBACK (gimp_image_layer_bounding_box_changed),
+                                image);
+  private->layer_alpha_handler =
+    gimp_container_add_handler (private->layers->container, "alpha-changed",
+                                G_CALLBACK (gimp_image_layer_alpha_changed),
+                                image);
+
+  g_signal_connect (private->layers->container, "add",
+                    G_CALLBACK (gimp_image_layers_changed),
+                    image);
+  g_signal_connect (private->layers->container, "remove",
+                    G_CALLBACK (gimp_image_layers_changed),
+                    image);
+
+  g_signal_connect_swapped (private->channels->container, "update",
+                            G_CALLBACK (gimp_image_invalidate),
+                            image);
+
+  private->channel_name_changed_handler =
+    gimp_container_add_handler (private->channels->container, "name-changed",
+                                G_CALLBACK (gimp_image_channel_name_changed),
+                                image);
+  private->channel_color_changed_handler =
+    gimp_container_add_handler (private->channels->container, "color-changed",
+                                G_CALLBACK (gimp_image_channel_color_changed),
+                                image);
+
+  g_signal_connect (private->channels->container, "add",
+                    G_CALLBACK (gimp_image_channel_add),
+                    image);
+  g_signal_connect (private->channels->container, "remove",
+                    G_CALLBACK (gimp_image_channel_remove),
+                    image);
+
+  private->floating_sel        = NULL;
+  private->selection_mask      = NULL;
+
+  private->parasites           = gimp_parasite_list_new ();
+
+  for (i = 0; i < MAX_CHANNELS; i++)
+    {
+      private->visible[i] = TRUE;
+      private->active[i]  = TRUE;
+    }
+
+  private->quick_mask_state    = FALSE;
+  private->quick_mask_inverted = FALSE;
+  gimp_rgba_set (&private->quick_mask_color, 1.0, 0.0, 0.0, 0.5);
+
+  private->undo_stack          = gimp_undo_stack_new (image);
+  private->redo_stack          = gimp_undo_stack_new (image);
+  private->group_count         = 0;
+  private->pushing_undo_group  = GIMP_UNDO_GROUP_NONE;
+
+  private->flush_accum.alpha_changed              = FALSE;
+  private->flush_accum.mask_changed               = FALSE;
+  private->flush_accum.floating_selection_changed = FALSE;
+  private->flush_accum.preview_invalidated        = FALSE;
+}
+
+static void
+gimp_image_constructed (GObject *object)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpChannel      *selection;
+  GimpCoreConfig   *config;
+  GimpTemplate     *template;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (image->gimp));
+
+  config = image->gimp->config;
+
+  private->ID = gimp_id_table_insert (image->gimp->image_table, image);
+
+  template = config->default_image;
+
+  private->xresolution     = gimp_template_get_resolution_x (template);
+  private->yresolution     = gimp_template_get_resolution_y (template);
+  private->resolution_unit = gimp_template_get_resolution_unit (template);
+
+  private->grid = gimp_config_duplicate (GIMP_CONFIG (config->default_grid));
+
+  private->quick_mask_color = config->quick_mask_color;
+
+  gimp_image_update_bounding_box (image);
+
+  if (private->base_type == GIMP_INDEXED)
+    gimp_image_colormap_init (image);
+
+  selection = gimp_selection_new (image,
+                                  gimp_image_get_width  (image),
+                                  gimp_image_get_height (image));
+  gimp_image_take_mask (image, selection);
+
+  g_signal_connect_object (config, "notify::transparency-type",
+                           G_CALLBACK (gimp_item_stack_invalidate_previews),
+                           private->layers->container, G_CONNECT_SWAPPED);
+  g_signal_connect_object (config, "notify::transparency-size",
+                           G_CALLBACK (gimp_item_stack_invalidate_previews),
+                           private->layers->container, G_CONNECT_SWAPPED);
+  g_signal_connect_object (config, "notify::layer-previews",
+                           G_CALLBACK (gimp_viewable_size_changed),
+                           image, G_CONNECT_SWAPPED);
+  g_signal_connect_object (config, "notify::group-layer-previews",
+                           G_CALLBACK (gimp_viewable_size_changed),
+                           image, G_CONNECT_SWAPPED);
+
+  gimp_container_add (image->gimp->images, GIMP_OBJECT (image));
+}
+
+static void
+gimp_image_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      image->gimp = g_value_get_object (value);
+      break;
+
+    case PROP_WIDTH:
+      private->width = g_value_get_int (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_int (value);
+      break;
+
+    case PROP_BASE_TYPE:
+      private->base_type = g_value_get_enum (value);
+      _gimp_image_free_color_transforms (image);
+      break;
+
+    case PROP_PRECISION:
+      private->precision = g_value_get_enum (value);
+      _gimp_image_free_color_transforms (image);
+      break;
+
+    case PROP_SYMMETRY:
+      {
+        GList *iter;
+        GType  type = g_value_get_gtype (value);
+
+        if (private->active_symmetry)
+          g_object_set (private->active_symmetry,
+                        "active", FALSE,
+                        NULL);
+        private->active_symmetry = NULL;
+
+        for (iter = private->symmetries; iter; iter = g_list_next (iter))
+          {
+            GimpSymmetry *sym = iter->data;
+
+            if (type == G_TYPE_FROM_INSTANCE (sym))
+              private->active_symmetry = iter->data;
+          }
+
+        if (! private->active_symmetry &&
+            g_type_is_a (type, GIMP_TYPE_SYMMETRY))
+          {
+            GimpSymmetry *sym = gimp_image_symmetry_new (image, type);
+
+            gimp_image_symmetry_add (image, sym);
+            g_object_unref (sym);
+
+            private->active_symmetry = sym;
+          }
+
+        if (private->active_symmetry)
+          g_object_set (private->active_symmetry,
+                        "active", TRUE,
+                        NULL);
+      }
+      break;
+
+    case PROP_CONVERTING:
+      private->converting = g_value_get_boolean (value);
+      break;
+
+    case PROP_ID:
+    case PROP_METADATA:
+    case PROP_BUFFER:
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_get_property (GObject    *object,
+                         guint       property_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, image->gimp);
+      break;
+    case PROP_ID:
+      g_value_set_int (value, private->ID);
+      break;
+    case PROP_WIDTH:
+      g_value_set_int (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_int (value, private->height);
+      break;
+    case PROP_BASE_TYPE:
+      g_value_set_enum (value, private->base_type);
+      break;
+    case PROP_PRECISION:
+      g_value_set_enum (value, private->precision);
+      break;
+    case PROP_METADATA:
+      g_value_set_object (value, gimp_image_get_metadata (image));
+      break;
+    case PROP_BUFFER:
+      g_value_set_object (value, gimp_image_get_buffer (GIMP_PICKABLE (image)));
+      break;
+    case PROP_SYMMETRY:
+      g_value_set_gtype (value,
+                         private->active_symmetry ?
+                         G_TYPE_FROM_INSTANCE (private->active_symmetry) :
+                         G_TYPE_NONE);
+      break;
+    case PROP_CONVERTING:
+      g_value_set_boolean (value, private->converting);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_dispose (GObject *object)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->colormap)
+    gimp_image_colormap_dispose (image);
+
+  gimp_image_undo_free (image);
+
+  g_signal_handlers_disconnect_by_func (private->layers->container,
+                                        gimp_image_invalidate,
+                                        image);
+
+  gimp_container_remove_handler (private->layers->container,
+                                 private->layer_offset_x_handler);
+  gimp_container_remove_handler (private->layers->container,
+                                 private->layer_offset_y_handler);
+  gimp_container_remove_handler (private->layers->container,
+                                 private->layer_bounding_box_handler);
+  gimp_container_remove_handler (private->layers->container,
+                                 private->layer_alpha_handler);
+
+  g_signal_handlers_disconnect_by_func (private->layers->container,
+                                        gimp_image_layers_changed,
+                                        image);
+
+  g_signal_handlers_disconnect_by_func (private->channels->container,
+                                        gimp_image_invalidate,
+                                        image);
+
+  gimp_container_remove_handler (private->channels->container,
+                                 private->channel_name_changed_handler);
+  gimp_container_remove_handler (private->channels->container,
+                                 private->channel_color_changed_handler);
+
+  g_signal_handlers_disconnect_by_func (private->channels->container,
+                                        gimp_image_channel_add,
+                                        image);
+  g_signal_handlers_disconnect_by_func (private->channels->container,
+                                        gimp_image_channel_remove,
+                                        image);
+
+  g_object_run_dispose (G_OBJECT (private->layers));
+  g_object_run_dispose (G_OBJECT (private->channels));
+  g_object_run_dispose (G_OBJECT (private->vectors));
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_image_finalize (GObject *object)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_clear_object (&private->projection);
+  g_clear_object (&private->graph);
+  private->visible_mask = NULL;
+
+  if (private->colormap)
+    gimp_image_colormap_free (image);
+
+  if (private->color_profile)
+    _gimp_image_free_color_profile (image);
+
+  g_clear_object (&private->pickable_buffer);
+  g_clear_object (&private->metadata);
+  g_clear_object (&private->file);
+  g_clear_object (&private->imported_file);
+  g_clear_object (&private->exported_file);
+  g_clear_object (&private->save_a_copy_file);
+  g_clear_object (&private->untitled_file);
+  g_clear_object (&private->layers);
+  g_clear_object (&private->channels);
+  g_clear_object (&private->vectors);
+
+  if (private->layer_stack)
+    {
+      g_slist_free (private->layer_stack);
+      private->layer_stack = NULL;
+    }
+
+  g_clear_object (&private->selection_mask);
+  g_clear_object (&private->parasites);
+
+  if (private->guides)
+    {
+      g_list_free_full (private->guides, (GDestroyNotify) g_object_unref);
+      private->guides = NULL;
+    }
+
+  if (private->symmetries)
+    {
+      g_list_free_full (private->symmetries, g_object_unref);
+      private->symmetries = NULL;
+    }
+
+  g_clear_object (&private->grid);
+
+  if (private->sample_points)
+    {
+      g_list_free_full (private->sample_points,
+                        (GDestroyNotify) g_object_unref);
+      private->sample_points = NULL;
+    }
+
+  g_clear_object (&private->undo_stack);
+  g_clear_object (&private->redo_stack);
+
+  if (image->gimp && image->gimp->image_table)
+    {
+      gimp_id_table_remove (image->gimp->image_table, private->ID);
+      image->gimp = NULL;
+    }
+
+  g_clear_pointer (&private->display_name, g_free);
+  g_clear_pointer (&private->display_path, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_image_name_changed (GimpObject *object)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  const gchar      *name;
+
+  if (GIMP_OBJECT_CLASS (parent_class)->name_changed)
+    GIMP_OBJECT_CLASS (parent_class)->name_changed (object);
+
+  g_clear_pointer (&private->display_name, g_free);
+  g_clear_pointer (&private->display_path, g_free);
+
+  /* We never want the empty string as a name, so change empty strings
+   * to NULL strings (without emitting the "name-changed" signal
+   * again)
+   */
+  name = gimp_object_get_name (object);
+  if (name && strlen (name) == 0)
+    {
+      gimp_object_name_free (object);
+      name = NULL;
+    }
+
+  g_clear_object (&private->file);
+
+  if (name)
+    private->file = g_file_new_for_uri (name);
+}
+
+static gint64
+gimp_image_get_memsize (GimpObject *object,
+                        gint64     *gui_size)
+{
+  GimpImage        *image   = GIMP_IMAGE (object);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  gint64            memsize = 0;
+
+  if (gimp_image_get_colormap (image))
+    memsize += GIMP_IMAGE_COLORMAP_SIZE;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->palette),
+                                      gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->projection),
+                                      gui_size);
+
+  memsize += gimp_g_list_get_memsize (gimp_image_get_guides (image),
+                                      sizeof (GimpGuide));
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->grid), gui_size);
+
+  memsize += gimp_g_list_get_memsize (gimp_image_get_sample_points (image),
+                                      sizeof (GimpSamplePoint));
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->layers),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->channels),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->vectors),
+                                      gui_size);
+
+  memsize += gimp_g_slist_get_memsize (private->layer_stack, 0);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->selection_mask),
+                                      gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->parasites),
+                                      gui_size);
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->undo_stack),
+                                      gui_size);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->redo_stack),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_image_get_size (GimpViewable *viewable,
+                     gint         *width,
+                     gint         *height)
+{
+  GimpImage *image = GIMP_IMAGE (viewable);
+
+  *width  = gimp_image_get_width  (image);
+  *height = gimp_image_get_height (image);
+
+  return TRUE;
+}
+
+static void
+gimp_image_size_changed (GimpViewable *viewable)
+{
+  GimpImage *image = GIMP_IMAGE (viewable);
+  GList     *all_items;
+  GList     *list;
+
+  if (GIMP_VIEWABLE_CLASS (parent_class)->size_changed)
+    GIMP_VIEWABLE_CLASS (parent_class)->size_changed (viewable);
+
+  all_items = gimp_image_get_layer_list (image);
+  for (list = all_items; list; list = g_list_next (list))
+    {
+      GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (list->data));
+
+      gimp_viewable_size_changed (GIMP_VIEWABLE (list->data));
+
+      if (mask)
+        gimp_viewable_size_changed (GIMP_VIEWABLE (mask));
+    }
+  g_list_free (all_items);
+
+  all_items = gimp_image_get_channel_list (image);
+  g_list_free_full (all_items, (GDestroyNotify) gimp_viewable_size_changed);
+
+  all_items = gimp_image_get_vectors_list (image);
+  g_list_free_full (all_items, (GDestroyNotify) gimp_viewable_size_changed);
+
+  gimp_viewable_size_changed (GIMP_VIEWABLE (gimp_image_get_mask (image)));
+
+  gimp_image_metadata_update_pixel_size (image);
+
+  g_clear_object (&GIMP_IMAGE_GET_PRIVATE (image)->pickable_buffer);
+
+  gimp_image_update_bounding_box (image);
+}
+
+static gchar *
+gimp_image_get_description (GimpViewable  *viewable,
+                            gchar        **tooltip)
+{
+  GimpImage *image = GIMP_IMAGE (viewable);
+
+  if (tooltip)
+    *tooltip = g_strdup (gimp_image_get_display_path (image));
+
+  return g_strdup_printf ("%s-%d",
+                          gimp_image_get_display_name (image),
+                          gimp_image_get_ID (image));
+}
+
+static void
+gimp_image_real_mode_changed (GimpImage *image)
+{
+  gimp_projectable_structure_changed (GIMP_PROJECTABLE (image));
+}
+
+static void
+gimp_image_real_precision_changed (GimpImage *image)
+{
+  gimp_image_metadata_update_bits_per_sample (image);
+
+  gimp_projectable_structure_changed (GIMP_PROJECTABLE (image));
+}
+
+static void
+gimp_image_real_resolution_changed (GimpImage *image)
+{
+  gimp_image_metadata_update_resolution (image);
+}
+
+static void
+gimp_image_real_size_changed_detailed (GimpImage *image,
+                                       gint       previous_origin_x,
+                                       gint       previous_origin_y,
+                                       gint       previous_width,
+                                       gint       previous_height)
+{
+  /* Whenever GimpImage::size-changed-detailed is emitted, so is
+   * GimpViewable::size-changed. Clients choose what signal to listen
+   * to depending on how much info they need.
+   */
+  gimp_viewable_size_changed (GIMP_VIEWABLE (image));
+}
+
+static void
+gimp_image_real_unit_changed (GimpImage *image)
+{
+  gimp_image_metadata_update_resolution (image);
+}
+
+static void
+gimp_image_real_colormap_changed (GimpImage *image,
+                                  gint       color_index)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->colormap && private->n_colors > 0)
+    {
+      babl_palette_set_palette (private->babl_palette_rgb,
+                                gimp_babl_format (GIMP_RGB,
+                                                  private->precision, FALSE),
+                                private->colormap,
+                                private->n_colors);
+      babl_palette_set_palette (private->babl_palette_rgba,
+                                gimp_babl_format (GIMP_RGB,
+                                                  private->precision, FALSE),
+                                private->colormap,
+                                private->n_colors);
+    }
+
+  if (gimp_image_get_base_type (image) == GIMP_INDEXED)
+    {
+      /* A colormap alteration affects the whole image */
+      gimp_image_invalidate_all (image);
+
+      gimp_item_stack_invalidate_previews (GIMP_ITEM_STACK (private->layers->container));
+    }
+}
+
+static const guint8 *
+gimp_image_color_managed_get_icc_profile (GimpColorManaged *managed,
+                                          gsize            *len)
+{
+  return gimp_image_get_icc_profile (GIMP_IMAGE (managed), len);
+}
+
+static GimpColorProfile *
+gimp_image_color_managed_get_color_profile (GimpColorManaged *managed)
+{
+  GimpImage        *image   = GIMP_IMAGE (managed);
+  GimpColorProfile *profile = NULL;
+
+  if (gimp_image_get_is_color_managed (image))
+    profile = gimp_image_get_color_profile (image);
+
+  if (! profile)
+    profile = gimp_image_get_builtin_color_profile (image);
+
+  return profile;
+}
+
+static void
+gimp_image_color_managed_profile_changed (GimpColorManaged *managed)
+{
+  GimpImage     *image  = GIMP_IMAGE (managed);
+  GimpItemStack *layers = GIMP_ITEM_STACK (gimp_image_get_layers (image));
+
+  gimp_image_metadata_update_colorspace (image);
+
+  gimp_projectable_structure_changed (GIMP_PROJECTABLE (image));
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (image));
+  gimp_item_stack_profile_changed (layers);
+}
+
+static void
+gimp_image_projectable_flush (GimpProjectable *projectable,
+                              gboolean         invalidate_preview)
+{
+  GimpImage        *image   = GIMP_IMAGE (projectable);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->flush_accum.alpha_changed)
+    {
+      gimp_image_alpha_changed (image);
+      private->flush_accum.alpha_changed = FALSE;
+    }
+
+  if (private->flush_accum.mask_changed)
+    {
+      gimp_image_mask_changed (image);
+      private->flush_accum.mask_changed = FALSE;
+    }
+
+  if (private->flush_accum.floating_selection_changed)
+    {
+      gimp_image_floating_selection_changed (image);
+      private->flush_accum.floating_selection_changed = FALSE;
+    }
+
+  if (private->flush_accum.preview_invalidated)
+    {
+      /*  don't invalidate the preview here, the projection does this when
+       *  it is completely constructed.
+       */
+      private->flush_accum.preview_invalidated = FALSE;
+    }
+}
+
+static GimpImage *
+gimp_image_get_image (GimpProjectable *projectable)
+{
+  return GIMP_IMAGE (projectable);
+}
+
+static const Babl *
+gimp_image_get_proj_format (GimpProjectable *projectable)
+{
+  GimpImage        *image   = GIMP_IMAGE (projectable);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  switch (private->base_type)
+    {
+    case GIMP_RGB:
+    case GIMP_INDEXED:
+      return gimp_image_get_format (image, GIMP_RGB,
+                                    gimp_image_get_precision (image), TRUE);
+
+    case GIMP_GRAY:
+      return gimp_image_get_format (image, GIMP_GRAY,
+                                    gimp_image_get_precision (image), TRUE);
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+static void
+gimp_image_pickable_flush (GimpPickable *pickable)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (pickable);
+
+  return gimp_pickable_flush (GIMP_PICKABLE (private->projection));
+}
+
+static GeglBuffer *
+gimp_image_get_buffer (GimpPickable *pickable)
+{
+  GimpImage        *image   = GIMP_IMAGE (pickable);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! private->pickable_buffer)
+    {
+      GeglBuffer *buffer;
+
+      buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (private->projection));
+
+      if (! private->show_all)
+        {
+          private->pickable_buffer = g_object_ref (buffer);
+        }
+      else
+        {
+          private->pickable_buffer = gegl_buffer_create_sub_buffer (
+            buffer,
+            GEGL_RECTANGLE (0, 0,
+                            gimp_image_get_width  (image),
+                            gimp_image_get_height (image)));
+        }
+    }
+
+  return private->pickable_buffer;
+}
+
+static gboolean
+gimp_image_get_pixel_at (GimpPickable *pickable,
+                         gint          x,
+                         gint          y,
+                         const Babl   *format,
+                         gpointer      pixel)
+{
+  GimpImage        *image   = GIMP_IMAGE (pickable);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (x >= 0                            &&
+      y >= 0                            &&
+      x < gimp_image_get_width  (image) &&
+      y < gimp_image_get_height (image))
+    {
+      return gimp_pickable_get_pixel_at (GIMP_PICKABLE (private->projection),
+                                         x, y, format, pixel);
+    }
+
+  return FALSE;
+}
+
+static gdouble
+gimp_image_get_opacity_at (GimpPickable *pickable,
+                           gint          x,
+                           gint          y)
+{
+  GimpImage        *image   = GIMP_IMAGE (pickable);
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (x >= 0                            &&
+      y >= 0                            &&
+      x < gimp_image_get_width  (image) &&
+      y < gimp_image_get_height (image))
+    {
+      return gimp_pickable_get_opacity_at (GIMP_PICKABLE (private->projection),
+                                           x, y);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_image_get_pixel_average (GimpPickable        *pickable,
+                              const GeglRectangle *rect,
+                              const Babl          *format,
+                              gpointer             pixel)
+{
+  GeglBuffer *buffer = gimp_pickable_get_buffer (pickable);
+
+  return gimp_gegl_average_color (buffer, rect, TRUE, GEGL_ABYSS_NONE, format,
+                                  pixel);
+}
+
+static void
+gimp_image_pixel_to_srgb (GimpPickable *pickable,
+                          const Babl   *format,
+                          gpointer      pixel,
+                          GimpRGB      *color)
+{
+  gimp_image_color_profile_pixel_to_srgb (GIMP_IMAGE (pickable),
+                                          format, pixel, color);
+}
+
+static void
+gimp_image_srgb_to_pixel (GimpPickable  *pickable,
+                          const GimpRGB *color,
+                          const Babl    *format,
+                          gpointer       pixel)
+{
+  gimp_image_color_profile_srgb_to_pixel (GIMP_IMAGE (pickable),
+                                          color, format, pixel);
+}
+
+static GeglRectangle
+gimp_image_get_bounding_box (GimpProjectable *projectable)
+{
+  GimpImage *image = GIMP_IMAGE (projectable);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->bounding_box;
+}
+
+static GeglNode *
+gimp_image_get_graph (GimpProjectable *projectable)
+{
+  GimpImage         *image   = GIMP_IMAGE (projectable);
+  GimpImagePrivate  *private = GIMP_IMAGE_GET_PRIVATE (image);
+  GeglNode          *layers_node;
+  GeglNode          *channels_node;
+  GeglNode          *output;
+  GimpComponentMask  mask;
+
+  if (private->graph)
+    return private->graph;
+
+  private->graph = gegl_node_new ();
+
+  layers_node =
+    gimp_filter_stack_get_graph (GIMP_FILTER_STACK (private->layers->container));
+
+  gegl_node_add_child (private->graph, layers_node);
+
+  mask = ~gimp_image_get_visible_mask (image) & GIMP_COMPONENT_MASK_ALL;
+
+  private->visible_mask =
+    gegl_node_new_child (private->graph,
+                         "operation", "gimp:mask-components",
+                         "mask",      mask,
+                         "alpha",     1.0,
+                         NULL);
+
+  gegl_node_connect_to (layers_node,           "output",
+                        private->visible_mask, "input");
+
+  channels_node =
+    gimp_filter_stack_get_graph (GIMP_FILTER_STACK (private->channels->container));
+
+  gegl_node_add_child (private->graph, channels_node);
+
+  gegl_node_connect_to (private->visible_mask, "output",
+                        channels_node,         "input");
+
+  output = gegl_node_get_output_proxy (private->graph, "output");
+
+  gegl_node_connect_to (channels_node, "output",
+                        output,        "input");
+
+  return private->graph;
+}
+
+static void
+gimp_image_projection_buffer_notify (GimpProjection   *projection,
+                                     const GParamSpec *pspec,
+                                     GimpImage        *image)
+{
+  g_clear_object (&GIMP_IMAGE_GET_PRIVATE (image)->pickable_buffer);
+}
+
+static void
+gimp_image_mask_update (GimpDrawable *drawable,
+                        gint          x,
+                        gint          y,
+                        gint          width,
+                        gint          height,
+                        GimpImage    *image)
+{
+  GIMP_IMAGE_GET_PRIVATE (image)->flush_accum.mask_changed = TRUE;
+}
+
+static void
+gimp_image_layers_changed (GimpContainer *container,
+                           GimpChannel   *channel,
+                           GimpImage     *image)
+{
+  gimp_image_update_bounding_box (image);
+}
+
+static void
+gimp_image_layer_offset_changed (GimpDrawable     *drawable,
+                                 const GParamSpec *pspec,
+                                 GimpImage        *image)
+{
+  gimp_image_update_bounding_box (image);
+}
+
+static void
+gimp_image_layer_bounding_box_changed (GimpDrawable *drawable,
+                                       GimpImage    *image)
+{
+  gimp_image_update_bounding_box (image);
+}
+
+static void
+gimp_image_layer_alpha_changed (GimpDrawable *drawable,
+                                GimpImage    *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (gimp_container_get_n_children (private->layers->container) == 1)
+    private->flush_accum.alpha_changed = TRUE;
+}
+
+static void
+gimp_image_channel_add (GimpContainer *container,
+                        GimpChannel   *channel,
+                        GimpImage     *image)
+{
+  if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
+                gimp_object_get_name (channel)))
+    {
+      gimp_image_set_quick_mask_state (image, TRUE);
+    }
+}
+
+static void
+gimp_image_channel_remove (GimpContainer *container,
+                           GimpChannel   *channel,
+                           GimpImage     *image)
+{
+  if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
+                gimp_object_get_name (channel)))
+    {
+      gimp_image_set_quick_mask_state (image, FALSE);
+    }
+}
+
+static void
+gimp_image_channel_name_changed (GimpChannel *channel,
+                                 GimpImage   *image)
+{
+  if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
+                gimp_object_get_name (channel)))
+    {
+      gimp_image_set_quick_mask_state (image, TRUE);
+    }
+  else if (gimp_image_get_quick_mask_state (image) &&
+           ! gimp_image_get_quick_mask (image))
+    {
+      gimp_image_set_quick_mask_state (image, FALSE);
+    }
+}
+
+static void
+gimp_image_channel_color_changed (GimpChannel *channel,
+                                  GimpImage   *image)
+{
+  if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
+                gimp_object_get_name (channel)))
+    {
+      GIMP_IMAGE_GET_PRIVATE (image)->quick_mask_color = channel->color;
+    }
+}
+
+static void
+gimp_image_active_layer_notify (GimpItemTree     *tree,
+                                const GParamSpec *pspec,
+                                GimpImage        *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpLayer        *layer   = gimp_image_get_active_layer (image);
+
+  if (layer)
+    {
+      /*  Configure the layer stack to reflect this change  */
+      private->layer_stack = g_slist_remove (private->layer_stack, layer);
+      private->layer_stack = g_slist_prepend (private->layer_stack, layer);
+    }
+
+  g_signal_emit (image, gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
+
+  if (layer && gimp_image_get_active_channel (image))
+    gimp_image_set_active_channel (image, NULL);
+}
+
+static void
+gimp_image_active_channel_notify (GimpItemTree     *tree,
+                                  const GParamSpec *pspec,
+                                  GimpImage        *image)
+{
+  GimpChannel *channel = gimp_image_get_active_channel (image);
+
+  g_signal_emit (image, gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
+
+  if (channel && gimp_image_get_active_layer (image))
+    gimp_image_set_active_layer (image, NULL);
+}
+
+static void
+gimp_image_active_vectors_notify (GimpItemTree     *tree,
+                                  const GParamSpec *pspec,
+                                  GimpImage        *image)
+{
+  g_signal_emit (image, gimp_image_signals[ACTIVE_VECTORS_CHANGED], 0);
+}
+
+static void
+gimp_image_freeze_bounding_box (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->bounding_box_freeze_count++;
+}
+
+static void
+gimp_image_thaw_bounding_box (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->bounding_box_freeze_count--;
+
+  if (private->bounding_box_freeze_count == 0 &&
+      private->bounding_box_update_pending)
+    {
+      private->bounding_box_update_pending = FALSE;
+
+      gimp_image_update_bounding_box (image);
+    }
+}
+
+static void
+gimp_image_update_bounding_box (GimpImage *image)
+{
+  GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+  GeglRectangle     bounding_box;
+
+  if (private->bounding_box_freeze_count > 0)
+    {
+      private->bounding_box_update_pending = TRUE;
+
+      return;
+    }
+
+  bounding_box.x      = 0;
+  bounding_box.y      = 0;
+  bounding_box.width  = gimp_image_get_width  (image);
+  bounding_box.height = gimp_image_get_height (image);
+
+  if (private->show_all)
+    {
+      GList *iter;
+
+      for (iter = gimp_image_get_layer_iter (image);
+           iter;
+           iter = g_list_next (iter))
+        {
+          GimpLayer     *layer = iter->data;
+          GeglRectangle  layer_bounding_box;
+          gint           offset_x;
+          gint           offset_y;
+
+          gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+
+          layer_bounding_box = gimp_drawable_get_bounding_box (
+            GIMP_DRAWABLE (layer));
+
+          layer_bounding_box.x += offset_x;
+          layer_bounding_box.y += offset_y;
+
+          gegl_rectangle_bounding_box (&bounding_box,
+                                       &bounding_box, &layer_bounding_box);
+        }
+    }
+
+  if (! gegl_rectangle_equal (&bounding_box, &private->bounding_box))
+    {
+      private->bounding_box = bounding_box;
+
+      gimp_projectable_bounds_changed (GIMP_PROJECTABLE (image), 0, 0);
+    }
+}
+
+
+/*  public functions  */
+
+GimpImage *
+gimp_image_new (Gimp              *gimp,
+                gint               width,
+                gint               height,
+                GimpImageBaseType  base_type,
+                GimpPrecision      precision)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (gimp_babl_is_valid (base_type, precision), NULL);
+
+  return g_object_new (GIMP_TYPE_IMAGE,
+                       "gimp",      gimp,
+                       "width",     width,
+                       "height",    height,
+                       "base-type", base_type,
+                       "precision", precision,
+                       NULL);
+}
+
+gint64
+gimp_image_estimate_memsize (GimpImage         *image,
+                             GimpComponentType  component_type,
+                             gint               width,
+                             gint               height)
+{
+  GList  *drawables;
+  GList  *list;
+  gint    current_width;
+  gint    current_height;
+  gint64  current_size;
+  gint64  scalable_size = 0;
+  gint64  scaled_size   = 0;
+  gint64  new_size;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  current_width  = gimp_image_get_width (image);
+  current_height = gimp_image_get_height (image);
+  current_size   = gimp_object_get_memsize (GIMP_OBJECT (image), NULL);
+
+  /*  the part of the image's memsize that scales linearly with the image  */
+  drawables = gimp_image_item_list_get_list (image,
+                                             GIMP_ITEM_TYPE_LAYERS |
+                                             GIMP_ITEM_TYPE_CHANNELS,
+                                             GIMP_ITEM_SET_ALL);
+
+  gimp_image_item_list_filter (drawables);
+
+  drawables = g_list_prepend (drawables, gimp_image_get_mask (image));
+
+  for (list = drawables; list; list = g_list_next (list))
+    {
+      GimpDrawable *drawable = list->data;
+      gdouble       drawable_width;
+      gdouble       drawable_height;
+
+      drawable_width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+      drawable_height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+      scalable_size += gimp_drawable_estimate_memsize (drawable,
+                                                       gimp_drawable_get_component_type (drawable),
+                                                       drawable_width,
+                                                       drawable_height);
+
+      scaled_size += gimp_drawable_estimate_memsize (drawable,
+                                                     component_type,
+                                                     drawable_width * width /
+                                                     current_width,
+                                                     drawable_height * height /
+                                                     current_height);
+    }
+
+  g_list_free (drawables);
+
+  scalable_size +=
+    gimp_projection_estimate_memsize (gimp_image_get_base_type (image),
+                                      gimp_image_get_component_type (image),
+                                      gimp_image_get_width (image),
+                                      gimp_image_get_height (image));
+
+  scaled_size +=
+    gimp_projection_estimate_memsize (gimp_image_get_base_type (image),
+                                      component_type,
+                                      width, height);
+
+  GIMP_LOG (IMAGE_SCALE,
+            "scalable_size = %"G_GINT64_FORMAT"  scaled_size = %"G_GINT64_FORMAT,
+            scalable_size, scaled_size);
+
+  new_size = current_size - scalable_size + scaled_size;
+
+  return new_size;
+}
+
+GimpImageBaseType
+gimp_image_get_base_type (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), -1);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->base_type;
+}
+
+GimpComponentType
+gimp_image_get_component_type (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), -1);
+
+  return gimp_babl_component_type (GIMP_IMAGE_GET_PRIVATE (image)->precision);
+}
+
+GimpPrecision
+gimp_image_get_precision (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), -1);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->precision;
+}
+
+const Babl *
+gimp_image_get_format (GimpImage         *image,
+                       GimpImageBaseType  base_type,
+                       GimpPrecision      precision,
+                       gboolean           with_alpha)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  switch (base_type)
+    {
+    case GIMP_RGB:
+    case GIMP_GRAY:
+      return gimp_babl_format (base_type, precision, with_alpha);
+
+    case GIMP_INDEXED:
+      if (precision == GIMP_PRECISION_U8_GAMMA)
+        {
+          if (with_alpha)
+            return gimp_image_colormap_get_rgba_format (image);
+          else
+            return gimp_image_colormap_get_rgb_format (image);
+        }
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+const Babl *
+gimp_image_get_layer_format (GimpImage *image,
+                             gboolean   with_alpha)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_image_get_format (image,
+                                gimp_image_get_base_type (image),
+                                gimp_image_get_precision (image),
+                                with_alpha);
+}
+
+const Babl *
+gimp_image_get_channel_format (GimpImage *image)
+{
+  GimpPrecision precision;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  precision = gimp_image_get_precision (image);
+
+  if (precision == GIMP_PRECISION_U8_GAMMA)
+    return gimp_image_get_format (image, GIMP_GRAY,
+                                  gimp_image_get_precision (image),
+                                  FALSE);
+
+  return gimp_babl_mask_format (precision);
+}
+
+const Babl *
+gimp_image_get_mask_format (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_babl_mask_format (gimp_image_get_precision (image));
+}
+
+GimpLayerMode
+gimp_image_get_default_new_layer_mode (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_LAYER_MODE_NORMAL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->new_layer_mode == -1)
+    {
+      GList *layers = gimp_image_get_layer_list (image);
+
+      if (layers)
+        {
+          GList *list;
+
+          for (list = layers; list; list = g_list_next (list))
+            {
+              GimpLayer     *layer = list->data;
+              GimpLayerMode  mode  = gimp_layer_get_mode (layer);
+
+              if (! gimp_layer_mode_is_legacy (mode))
+                {
+                  /*  any non-legacy layer switches the mode to non-legacy
+                   */
+                  private->new_layer_mode = GIMP_LAYER_MODE_NORMAL;
+                  break;
+                }
+            }
+
+          /*  only if all layers are legacy, the mode is also legacy
+           */
+          if (! list)
+            private->new_layer_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
+
+          g_list_free (layers);
+        }
+      else
+        {
+          /*  empty images are never considered legacy
+           */
+          private->new_layer_mode = GIMP_LAYER_MODE_NORMAL;
+        }
+    }
+
+  return private->new_layer_mode;
+}
+
+void
+gimp_image_unset_default_new_layer_mode (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->new_layer_mode = -1;
+}
+
+gint
+gimp_image_get_ID (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), -1);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->ID;
+}
+
+GimpImage *
+gimp_image_get_by_ID (Gimp *gimp,
+                      gint  image_id)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->image_table == NULL)
+    return NULL;
+
+  return (GimpImage *) gimp_id_table_lookup (gimp->image_table, image_id);
+}
+
+void
+gimp_image_set_file (GimpImage *image,
+                     GFile     *file)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->file != file)
+    {
+      gimp_object_take_name (GIMP_OBJECT (image),
+                             file ? g_file_get_uri (file) : NULL);
+    }
+}
+
+/**
+ * gimp_image_get_untitled_file:
+ *
+ * Returns: A #GFile saying "Untitled" for newly created images.
+ **/
+GFile *
+gimp_image_get_untitled_file (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! private->untitled_file)
+    private->untitled_file = g_file_new_for_uri (_("Untitled"));
+
+  return private->untitled_file;
+}
+
+/**
+ * gimp_image_get_file_or_untitled:
+ * @image: A #GimpImage.
+ *
+ * Get the file of the XCF image, or the "Untitled" file if there is no file.
+ *
+ * Returns: A #GFile.
+ **/
+GFile *
+gimp_image_get_file_or_untitled (GimpImage *image)
+{
+  GFile *file;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  file = gimp_image_get_file (image);
+
+  if (! file)
+    file = gimp_image_get_untitled_file (image);
+
+  return file;
+}
+
+/**
+ * gimp_image_get_file:
+ * @image: A #GimpImage.
+ *
+ * Get the file of the XCF image, or NULL if there is no file.
+ *
+ * Returns: The file, or NULL.
+ **/
+GFile *
+gimp_image_get_file (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->file;
+}
+
+/**
+ * gimp_image_get_imported_file:
+ * @image: A #GimpImage.
+ *
+ * Returns: The file of the imported image, or NULL if the image has
+ * been saved as XCF after it was imported.
+ **/
+GFile *
+gimp_image_get_imported_file (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->imported_file;
+}
+
+/**
+ * gimp_image_get_exported_file:
+ * @image: A #GimpImage.
+ *
+ * Returns: The file of the image last exported from this XCF file, or
+ * NULL if the image has never been exported.
+ **/
+GFile *
+gimp_image_get_exported_file (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->exported_file;
+}
+
+/**
+ * gimp_image_get_save_a_copy_file:
+ * @image: A #GimpImage.
+ *
+ * Returns: The URI of the last copy that was saved of this XCF file.
+ **/
+GFile *
+gimp_image_get_save_a_copy_file (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->save_a_copy_file;
+}
+
+/**
+ * gimp_image_get_any_file:
+ * @image: A #GimpImage.
+ *
+ * Returns: The XCF file, the imported file, or the exported file, in
+ * that order of precedence.
+ **/
+GFile *
+gimp_image_get_any_file (GimpImage *image)
+{
+  GFile *file;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  file = gimp_image_get_file (image);
+  if (! file)
+    {
+      file = gimp_image_get_imported_file (image);
+      if (! file)
+        {
+          file = gimp_image_get_exported_file (image);
+        }
+    }
+
+  return file;
+}
+
+/**
+ * gimp_image_set_imported_uri:
+ * @image: A #GimpImage.
+ * @file:
+ *
+ * Sets the URI this file was imported from.
+ **/
+void
+gimp_image_set_imported_file (GimpImage *image,
+                              GFile     *file)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (g_set_object (&private->imported_file, file))
+    {
+      gimp_object_name_changed (GIMP_OBJECT (image));
+    }
+
+  if (! private->resolution_set && file != NULL)
+    {
+      /* Unlike new files (which follow technological progress and will
+       * use higher default resolution, or explicitly chosen templates),
+       * imported files have a more backward-compatible value.
+       *
+       * 72 PPI is traditionnally the default value when none other had
+       * been explicitly set (for instance it is the default when no
+       * resolution metadata was set in Exif version 2.32, and below,
+       * standard). This historical value will only ever apply to loaded
+       * images. New images will continue having more modern or
+       * templated defaults.
+       */
+      private->xresolution     = 72.0;
+      private->yresolution     = 72.0;
+      private->resolution_unit = GIMP_UNIT_INCH;
+    }
+}
+
+/**
+ * gimp_image_set_exported_file:
+ * @image: A #GimpImage.
+ * @file:
+ *
+ * Sets the file this image was last exported to. Note that saving as
+ * XCF is not "exporting".
+ **/
+void
+gimp_image_set_exported_file (GimpImage *image,
+                              GFile     *file)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (g_set_object (&private->exported_file, file))
+    {
+      gimp_object_name_changed (GIMP_OBJECT (image));
+    }
+}
+
+/**
+ * gimp_image_set_save_a_copy_file:
+ * @image: A #GimpImage.
+ * @uri:
+ *
+ * Set the URI to the last copy this XCF file was saved to through the
+ * "save a copy" action.
+ **/
+void
+gimp_image_set_save_a_copy_file (GimpImage *image,
+                                 GFile     *file)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  g_set_object (&private->save_a_copy_file, file);
+}
+
+static gchar *
+gimp_image_format_display_uri (GimpImage *image,
+                               gboolean   basename)
+{
+  const gchar *uri_format    = NULL;
+  const gchar *export_status = NULL;
+  GFile       *file          = NULL;
+  GFile       *source        = NULL;
+  GFile       *dest          = NULL;
+  GFile       *display_file  = NULL;
+  gboolean     is_imported;
+  gboolean     is_exported;
+  gchar       *display_uri   = NULL;
+  gchar       *format_string;
+  gchar       *tmp;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  file   = gimp_image_get_file (image);
+  source = gimp_image_get_imported_file (image);
+  dest   = gimp_image_get_exported_file (image);
+
+  is_imported = (source != NULL);
+  is_exported = (dest   != NULL);
+
+  if (file)
+    {
+      display_file = g_object_ref (file);
+      uri_format   = "%s";
+    }
+  else
+    {
+      if (is_imported)
+        display_file = source;
+
+      /* Calculate filename suffix */
+      if (! gimp_image_is_export_dirty (image))
+        {
+          if (is_exported)
+            {
+              display_file  = dest;
+              export_status = _(" (exported)");
+            }
+          else if (is_imported)
+            {
+              export_status = _(" (overwritten)");
+            }
+          else
+            {
+              g_warning ("Unexpected code path, Save+export implementation is buggy!");
+            }
+        }
+      else if (is_imported)
+        {
+          export_status = _(" (imported)");
+        }
+
+      if (display_file)
+        display_file = gimp_file_with_new_extension (display_file, NULL);
+
+      uri_format = "[%s]";
+    }
+
+  if (! display_file)
+    display_file = g_object_ref (gimp_image_get_untitled_file (image));
+
+  if (basename)
+    display_uri = g_path_get_basename (gimp_file_get_utf8_name (display_file));
+  else
+    display_uri = g_strdup (gimp_file_get_utf8_name (display_file));
+
+  g_object_unref (display_file);
+
+  format_string = g_strconcat (uri_format, export_status, NULL);
+
+  tmp = g_strdup_printf (format_string, display_uri);
+  g_free (display_uri);
+  display_uri = tmp;
+
+  g_free (format_string);
+
+  return display_uri;
+}
+
+const gchar *
+gimp_image_get_display_name (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! private->display_name)
+    private->display_name = gimp_image_format_display_uri (image, TRUE);
+
+  return private->display_name;
+}
+
+const gchar *
+gimp_image_get_display_path (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! private->display_path)
+    private->display_path = gimp_image_format_display_uri (image, FALSE);
+
+  return private->display_path;
+}
+
+void
+gimp_image_set_load_proc (GimpImage           *image,
+                          GimpPlugInProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->load_proc = proc;
+}
+
+GimpPlugInProcedure *
+gimp_image_get_load_proc (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->load_proc;
+}
+
+void
+gimp_image_set_save_proc (GimpImage           *image,
+                          GimpPlugInProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->save_proc = proc;
+}
+
+GimpPlugInProcedure *
+gimp_image_get_save_proc (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->save_proc;
+}
+
+void
+gimp_image_set_export_proc (GimpImage           *image,
+                            GimpPlugInProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->export_proc = proc;
+}
+
+GimpPlugInProcedure *
+gimp_image_get_export_proc (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->export_proc;
+}
+
+gint
+gimp_image_get_xcf_version (GimpImage    *image,
+                            gboolean      zlib_compression,
+                            gint         *gimp_version,
+                            const gchar **version_string,
+                            gchar       **version_reason)
+{
+  GList       *layers;
+  GList       *list;
+  GList       *reasons = NULL;
+  gint         version = 0;  /* default to oldest */
+  const gchar *enum_desc;
+
+#define ADD_REASON(_reason)                                       \
+  if (version_reason) {                                           \
+    gchar *tmp = _reason;                                         \
+    if (g_list_find_custom (reasons, tmp, (GCompareFunc) strcmp)) \
+      g_free (tmp);                                               \
+    else                                                          \
+      reasons = g_list_prepend (reasons, tmp); }
+
+  /* need version 1 for colormaps */
+  if (gimp_image_get_colormap (image))
+    version = 1;
+
+  layers = gimp_image_get_layer_list (image);
+
+  for (list = layers; list; list = g_list_next (list))
+    {
+      GimpLayer *layer = GIMP_LAYER (list->data);
+
+      switch (gimp_layer_get_mode (layer))
+        {
+          /*  Modes that exist since ancient times  */
+        case GIMP_LAYER_MODE_NORMAL_LEGACY:
+        case GIMP_LAYER_MODE_DISSOLVE:
+        case GIMP_LAYER_MODE_BEHIND_LEGACY:
+        case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
+        case GIMP_LAYER_MODE_SCREEN_LEGACY:
+        case GIMP_LAYER_MODE_OVERLAY_LEGACY:
+        case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
+        case GIMP_LAYER_MODE_ADDITION_LEGACY:
+        case GIMP_LAYER_MODE_SUBTRACT_LEGACY:
+        case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
+        case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
+        case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
+        case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
+        case GIMP_LAYER_MODE_HSL_COLOR_LEGACY:
+        case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
+        case GIMP_LAYER_MODE_DIVIDE_LEGACY:
+        case GIMP_LAYER_MODE_DODGE_LEGACY:
+        case GIMP_LAYER_MODE_BURN_LEGACY:
+        case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
+          break;
+
+          /*  Since 2.6  */
+        case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
+        case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
+        case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
+        case GIMP_LAYER_MODE_COLOR_ERASE_LEGACY:
+          gimp_enum_get_value (GIMP_TYPE_LAYER_MODE,
+                               gimp_layer_get_mode (layer),
+                               NULL, NULL, &enum_desc, NULL);
+          ADD_REASON (g_strdup_printf (_("Layer mode '%s' was added in %s"),
+                                       enum_desc, "GIMP 2.6"));
+          version = MAX (2, version);
+          break;
+
+          /*  Since 2.10  */
+        case GIMP_LAYER_MODE_OVERLAY:
+        case GIMP_LAYER_MODE_LCH_HUE:
+        case GIMP_LAYER_MODE_LCH_CHROMA:
+        case GIMP_LAYER_MODE_LCH_COLOR:
+        case GIMP_LAYER_MODE_LCH_LIGHTNESS:
+          gimp_enum_get_value (GIMP_TYPE_LAYER_MODE,
+                               gimp_layer_get_mode (layer),
+                               NULL, NULL, &enum_desc, NULL);
+          ADD_REASON (g_strdup_printf (_("Layer mode '%s' was added in %s"),
+                                       enum_desc, "GIMP 2.10"));
+          version = MAX (9, version);
+          break;
+
+          /*  Since 2.10  */
+        case GIMP_LAYER_MODE_NORMAL:
+        case GIMP_LAYER_MODE_BEHIND:
+        case GIMP_LAYER_MODE_MULTIPLY:
+        case GIMP_LAYER_MODE_SCREEN:
+        case GIMP_LAYER_MODE_DIFFERENCE:
+        case GIMP_LAYER_MODE_ADDITION:
+        case GIMP_LAYER_MODE_SUBTRACT:
+        case GIMP_LAYER_MODE_DARKEN_ONLY:
+        case GIMP_LAYER_MODE_LIGHTEN_ONLY:
+        case GIMP_LAYER_MODE_HSV_HUE:
+        case GIMP_LAYER_MODE_HSV_SATURATION:
+        case GIMP_LAYER_MODE_HSL_COLOR:
+        case GIMP_LAYER_MODE_HSV_VALUE:
+        case GIMP_LAYER_MODE_DIVIDE:
+        case GIMP_LAYER_MODE_DODGE:
+        case GIMP_LAYER_MODE_BURN:
+        case GIMP_LAYER_MODE_HARDLIGHT:
+        case GIMP_LAYER_MODE_SOFTLIGHT:
+        case GIMP_LAYER_MODE_GRAIN_EXTRACT:
+        case GIMP_LAYER_MODE_GRAIN_MERGE:
+        case GIMP_LAYER_MODE_VIVID_LIGHT:
+        case GIMP_LAYER_MODE_PIN_LIGHT:
+        case GIMP_LAYER_MODE_LINEAR_LIGHT:
+        case GIMP_LAYER_MODE_HARD_MIX:
+        case GIMP_LAYER_MODE_EXCLUSION:
+        case GIMP_LAYER_MODE_LINEAR_BURN:
+        case GIMP_LAYER_MODE_LUMA_DARKEN_ONLY:
+        case GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY:
+        case GIMP_LAYER_MODE_LUMINANCE:
+        case GIMP_LAYER_MODE_COLOR_ERASE:
+        case GIMP_LAYER_MODE_ERASE:
+        case GIMP_LAYER_MODE_MERGE:
+        case GIMP_LAYER_MODE_SPLIT:
+        case GIMP_LAYER_MODE_PASS_THROUGH:
+          gimp_enum_get_value (GIMP_TYPE_LAYER_MODE,
+                               gimp_layer_get_mode (layer),
+                               NULL, NULL, &enum_desc, NULL);
+          ADD_REASON (g_strdup_printf (_("Layer mode '%s' was added in %s"),
+                                       enum_desc, "GIMP 2.10"));
+          version = MAX (10, version);
+          break;
+
+          /*  Just here instead of default so we get compiler warnings  */
+        case GIMP_LAYER_MODE_REPLACE:
+        case GIMP_LAYER_MODE_ANTI_ERASE:
+        case GIMP_LAYER_MODE_SEPARATOR:
+          break;
+        }
+
+      /* need version 3 for layer trees */
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+        {
+          ADD_REASON (g_strdup_printf (_("Layer groups were added in %s"),
+                                       "GIMP 2.8"));
+          version = MAX (3, version);
+
+          /* need version 13 for group layers with masks */
+          if (gimp_layer_get_mask (layer))
+            {
+              ADD_REASON (g_strdup_printf (_("Masks on layer groups were "
+                                             "added in %s"), "GIMP 2.10"));
+              version = MAX (13, version);
+            }
+        }
+    }
+
+  g_list_free (layers);
+
+  /* version 6 for new metadata has been dropped since they are
+   * saved through parasites, which is compatible with older versions.
+   */
+
+  /* need version 7 for != 8-bit gamma images */
+  if (gimp_image_get_precision (image) != GIMP_PRECISION_U8_GAMMA)
+    {
+      ADD_REASON (g_strdup_printf (_("High bit-depth images were added "
+                                     "in %s"), "GIMP 2.10"));
+      version = MAX (7, version);
+    }
+
+  /* need version 12 for > 8-bit images for proper endian swapping */
+  if (gimp_image_get_precision (image) > GIMP_PRECISION_U8_GAMMA)
+    version = MAX (12, version);
+
+  /* need version 8 for zlib compression */
+  if (zlib_compression)
+    {
+      ADD_REASON (g_strdup_printf (_("Internal zlib compression was "
+                                     "added in %s"), "GIMP 2.10"));
+      version = MAX (8, version);
+    }
+
+  /* if version is 10 (lots of new layer modes), go to version 11 with
+   * 64 bit offsets right away
+   */
+  if (version == 10)
+    version = 11;
+
+  /* use the image's in-memory size as an upper bound to estimate the
+   * need for 64 bit file offsets inside the XCF, this is a *very*
+   * conservative estimate and should never fail
+   */
+  if (gimp_object_get_memsize (GIMP_OBJECT (image), NULL) >= ((gint64) 1 << 32))
+    {
+      ADD_REASON (g_strdup_printf (_("Support for image files larger than "
+                                     "4GB was added in %s"), "GIMP 2.10"));
+      version = MAX (11, version);
+    }
+
+#undef ADD_REASON
+
+  switch (version)
+    {
+    case 0:
+    case 1:
+    case 2:
+      if (gimp_version)   *gimp_version   = 206;
+      if (version_string) *version_string = "GIMP 2.6";
+      break;
+
+    case 3:
+      if (gimp_version)   *gimp_version   = 208;
+      if (version_string) *version_string = "GIMP 2.8";
+      break;
+
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+    case 11:
+    case 12:
+    case 13:
+      if (gimp_version)   *gimp_version   = 210;
+      if (version_string) *version_string = "GIMP 2.10";
+      break;
+    }
+
+  if (version_reason && reasons)
+    {
+      GString *reason = g_string_new (NULL);
+
+      reasons = g_list_sort (reasons, (GCompareFunc) strcmp);
+
+      for (list = reasons; list; list = g_list_next (list))
+        {
+          g_string_append (reason, list->data);
+          if (g_list_next (list))
+            g_string_append_c (reason, '\n');
+        }
+
+      *version_reason = g_string_free (reason, FALSE);
+    }
+  if (reasons)
+    g_list_free_full (reasons, g_free);
+
+  return version;
+}
+
+void
+gimp_image_set_xcf_compression (GimpImage *image,
+                                gboolean   compression)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->xcf_compression = compression;
+}
+
+gboolean
+gimp_image_get_xcf_compression (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->xcf_compression;
+}
+
+void
+gimp_image_set_resolution (GimpImage *image,
+                           gdouble    xresolution,
+                           gdouble    yresolution)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /* don't allow to set the resolution out of bounds */
+  if (xresolution < GIMP_MIN_RESOLUTION || xresolution > GIMP_MAX_RESOLUTION ||
+      yresolution < GIMP_MIN_RESOLUTION || yresolution > GIMP_MAX_RESOLUTION)
+    return;
+
+  private->resolution_set = TRUE;
+
+  if ((ABS (private->xresolution - xresolution) >= 1e-5) ||
+      (ABS (private->yresolution - yresolution) >= 1e-5))
+    {
+      gimp_image_undo_push_image_resolution (image,
+                                             C_("undo-type", "Change Image Resolution"));
+
+      private->xresolution = xresolution;
+      private->yresolution = yresolution;
+
+      gimp_image_resolution_changed (image);
+      gimp_image_size_changed_detailed (image,
+                                        0,
+                                        0,
+                                        gimp_image_get_width (image),
+                                        gimp_image_get_height (image));
+    }
+}
+
+void
+gimp_image_get_resolution (GimpImage *image,
+                           gdouble   *xresolution,
+                           gdouble   *yresolution)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (xresolution != NULL && yresolution != NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  *xresolution = private->xresolution;
+  *yresolution = private->yresolution;
+}
+
+void
+gimp_image_resolution_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[RESOLUTION_CHANGED], 0);
+}
+
+void
+gimp_image_set_unit (GimpImage *image,
+                     GimpUnit   unit)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (unit > GIMP_UNIT_PIXEL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->resolution_unit != unit)
+    {
+      gimp_image_undo_push_image_resolution (image,
+                                             C_("undo-type", "Change Image Unit"));
+
+      private->resolution_unit = unit;
+      gimp_image_unit_changed (image);
+    }
+}
+
+GimpUnit
+gimp_image_get_unit (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_UNIT_INCH);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->resolution_unit;
+}
+
+void
+gimp_image_unit_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[UNIT_CHANGED], 0);
+}
+
+gint
+gimp_image_get_width (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->width;
+}
+
+gint
+gimp_image_get_height (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->height;
+}
+
+gboolean
+gimp_image_has_alpha (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpLayer        *layer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), TRUE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  layer = GIMP_LAYER (gimp_container_get_first_child (private->layers->container));
+
+  return ((gimp_image_get_n_layers (image) > 1) ||
+          (layer && gimp_drawable_has_alpha (GIMP_DRAWABLE (layer))));
+}
+
+gboolean
+gimp_image_is_empty (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), TRUE);
+
+  return gimp_container_is_empty (GIMP_IMAGE_GET_PRIVATE (image)->layers->container);
+}
+
+void
+gimp_image_set_floating_selection (GimpImage *image,
+                                   GimpLayer *floating_sel)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (floating_sel == NULL || GIMP_IS_LAYER (floating_sel));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->floating_sel != floating_sel)
+    {
+      private->floating_sel = floating_sel;
+
+      private->flush_accum.floating_selection_changed = TRUE;
+    }
+}
+
+GimpLayer *
+gimp_image_get_floating_selection (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->floating_sel;
+}
+
+void
+gimp_image_floating_selection_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[FLOATING_SELECTION_CHANGED], 0);
+}
+
+GimpChannel *
+gimp_image_get_mask (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->selection_mask;
+}
+
+void
+gimp_image_mask_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[MASK_CHANGED], 0);
+}
+
+void
+gimp_image_take_mask (GimpImage   *image,
+                      GimpChannel *mask)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SELECTION (mask));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (private->selection_mask)
+    g_object_unref (private->selection_mask);
+
+  private->selection_mask = g_object_ref_sink (mask);
+
+  g_signal_connect (private->selection_mask, "update",
+                    G_CALLBACK (gimp_image_mask_update),
+                    image);
+}
+
+
+/*  image components  */
+
+const Babl *
+gimp_image_get_component_format (GimpImage       *image,
+                                 GimpChannelType  channel)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  switch (channel)
+    {
+    case GIMP_CHANNEL_RED:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_image_get_precision (image),
+                                         RED);
+
+    case GIMP_CHANNEL_GREEN:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_image_get_precision (image),
+                                         GREEN);
+
+    case GIMP_CHANNEL_BLUE:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_image_get_precision (image),
+                                         BLUE);
+
+    case GIMP_CHANNEL_ALPHA:
+      return gimp_babl_component_format (GIMP_RGB,
+                                         gimp_image_get_precision (image),
+                                         ALPHA);
+
+    case GIMP_CHANNEL_GRAY:
+      return gimp_babl_component_format (GIMP_GRAY,
+                                         gimp_image_get_precision (image),
+                                         GRAY);
+
+    case GIMP_CHANNEL_INDEXED:
+      return babl_format ("Y u8"); /* will extract grayscale, the best
+                                    * we can do here */
+    }
+
+  return NULL;
+}
+
+gint
+gimp_image_get_component_index (GimpImage       *image,
+                                GimpChannelType  channel)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), -1);
+
+  switch (channel)
+    {
+    case GIMP_CHANNEL_RED:     return RED;
+    case GIMP_CHANNEL_GREEN:   return GREEN;
+    case GIMP_CHANNEL_BLUE:    return BLUE;
+    case GIMP_CHANNEL_GRAY:    return GRAY;
+    case GIMP_CHANNEL_INDEXED: return INDEXED;
+    case GIMP_CHANNEL_ALPHA:
+      switch (gimp_image_get_base_type (image))
+        {
+        case GIMP_RGB:     return ALPHA;
+        case GIMP_GRAY:    return ALPHA_G;
+        case GIMP_INDEXED: return ALPHA_I;
+        }
+    }
+
+  return -1;
+}
+
+void
+gimp_image_set_component_active (GimpImage       *image,
+                                 GimpChannelType  channel,
+                                 gboolean         active)
+{
+  GimpImagePrivate *private;
+  gint              index = -1;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  index = gimp_image_get_component_index (image, channel);
+
+  if (index != -1 && active != private->active[index])
+    {
+      private->active[index] = active ? TRUE : FALSE;
+
+      /*  If there is an active channel and we mess with the components,
+       *  the active channel gets unset...
+       */
+      gimp_image_unset_active_channel (image);
+
+      g_signal_emit (image,
+                     gimp_image_signals[COMPONENT_ACTIVE_CHANGED], 0,
+                     channel);
+    }
+}
+
+gboolean
+gimp_image_get_component_active (GimpImage       *image,
+                                 GimpChannelType  channel)
+{
+  gint index = -1;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  index = gimp_image_get_component_index (image, channel);
+
+  if (index != -1)
+    return GIMP_IMAGE_GET_PRIVATE (image)->active[index];
+
+  return FALSE;
+}
+
+void
+gimp_image_get_active_array (GimpImage *image,
+                             gboolean  *components)
+{
+  GimpImagePrivate *private;
+  gint              i;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (components != NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  for (i = 0; i < MAX_CHANNELS; i++)
+    components[i] = private->active[i];
+}
+
+GimpComponentMask
+gimp_image_get_active_mask (GimpImage *image)
+{
+  GimpImagePrivate  *private;
+  GimpComponentMask  mask = 0;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  switch (gimp_image_get_base_type (image))
+    {
+    case GIMP_RGB:
+      mask |= (private->active[RED])   ? GIMP_COMPONENT_MASK_RED   : 0;
+      mask |= (private->active[GREEN]) ? GIMP_COMPONENT_MASK_GREEN : 0;
+      mask |= (private->active[BLUE])  ? GIMP_COMPONENT_MASK_BLUE  : 0;
+      mask |= (private->active[ALPHA]) ? GIMP_COMPONENT_MASK_ALPHA : 0;
+      break;
+
+    case GIMP_GRAY:
+    case GIMP_INDEXED:
+      mask |= (private->active[GRAY])    ? GIMP_COMPONENT_MASK_RED   : 0;
+      mask |= (private->active[GRAY])    ? GIMP_COMPONENT_MASK_GREEN : 0;
+      mask |= (private->active[GRAY])    ? GIMP_COMPONENT_MASK_BLUE  : 0;
+      mask |= (private->active[ALPHA_G]) ? GIMP_COMPONENT_MASK_ALPHA : 0;
+      break;
+    }
+
+  return mask;
+}
+
+void
+gimp_image_set_component_visible (GimpImage       *image,
+                                  GimpChannelType  channel,
+                                  gboolean         visible)
+{
+  GimpImagePrivate *private;
+  gint              index = -1;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  index = gimp_image_get_component_index (image, channel);
+
+  if (index != -1 && visible != private->visible[index])
+    {
+      private->visible[index] = visible ? TRUE : FALSE;
+
+      if (private->visible_mask)
+        {
+          GimpComponentMask mask;
+
+          mask = ~gimp_image_get_visible_mask (image) & GIMP_COMPONENT_MASK_ALL;
+
+          gegl_node_set (private->visible_mask,
+                         "mask", mask,
+                         NULL);
+        }
+
+      g_signal_emit (image,
+                     gimp_image_signals[COMPONENT_VISIBILITY_CHANGED], 0,
+                     channel);
+
+      gimp_image_invalidate_all (image);
+    }
+}
+
+gboolean
+gimp_image_get_component_visible (GimpImage       *image,
+                                  GimpChannelType  channel)
+{
+  gint index = -1;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  index = gimp_image_get_component_index (image, channel);
+
+  if (index != -1)
+    return GIMP_IMAGE_GET_PRIVATE (image)->visible[index];
+
+  return FALSE;
+}
+
+void
+gimp_image_get_visible_array (GimpImage *image,
+                              gboolean  *components)
+{
+  GimpImagePrivate *private;
+  gint              i;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (components != NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  for (i = 0; i < MAX_CHANNELS; i++)
+    components[i] = private->visible[i];
+}
+
+GimpComponentMask
+gimp_image_get_visible_mask (GimpImage *image)
+{
+  GimpImagePrivate  *private;
+  GimpComponentMask  mask = 0;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  switch (gimp_image_get_base_type (image))
+    {
+    case GIMP_RGB:
+      mask |= (private->visible[RED])   ? GIMP_COMPONENT_MASK_RED   : 0;
+      mask |= (private->visible[GREEN]) ? GIMP_COMPONENT_MASK_GREEN : 0;
+      mask |= (private->visible[BLUE])  ? GIMP_COMPONENT_MASK_BLUE  : 0;
+      mask |= (private->visible[ALPHA]) ? GIMP_COMPONENT_MASK_ALPHA : 0;
+      break;
+
+    case GIMP_GRAY:
+    case GIMP_INDEXED:
+      mask |= (private->visible[GRAY])  ? GIMP_COMPONENT_MASK_RED   : 0;
+      mask |= (private->visible[GRAY])  ? GIMP_COMPONENT_MASK_GREEN : 0;
+      mask |= (private->visible[GRAY])  ? GIMP_COMPONENT_MASK_BLUE  : 0;
+      mask |= (private->visible[ALPHA]) ? GIMP_COMPONENT_MASK_ALPHA : 0;
+      break;
+    }
+
+  return mask;
+}
+
+
+/*  emitting image signals  */
+
+void
+gimp_image_mode_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[MODE_CHANGED], 0);
+}
+
+void
+gimp_image_precision_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[PRECISION_CHANGED], 0);
+}
+
+void
+gimp_image_alpha_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[ALPHA_CHANGED], 0);
+}
+
+void
+gimp_image_linked_items_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[LINKED_ITEMS_CHANGED], 0);
+}
+
+void
+gimp_image_invalidate (GimpImage *image,
+                       gint       x,
+                       gint       y,
+                       gint       width,
+                       gint       height)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  gimp_projectable_invalidate (GIMP_PROJECTABLE (image),
+                               x, y, width, height);
+
+  GIMP_IMAGE_GET_PRIVATE (image)->flush_accum.preview_invalidated = TRUE;
+}
+
+void
+gimp_image_invalidate_all (GimpImage *image)
+{
+  const GeglRectangle *bounding_box;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  bounding_box = &GIMP_IMAGE_GET_PRIVATE (image)->bounding_box;
+
+  gimp_image_invalidate (image,
+                         bounding_box->x,     bounding_box->y,
+                         bounding_box->width, bounding_box->height);
+}
+
+void
+gimp_image_guide_added (GimpImage *image,
+                        GimpGuide *guide)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  g_signal_emit (image, gimp_image_signals[GUIDE_ADDED], 0,
+                 guide);
+}
+
+void
+gimp_image_guide_removed (GimpImage *image,
+                          GimpGuide *guide)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  g_signal_emit (image, gimp_image_signals[GUIDE_REMOVED], 0,
+                 guide);
+}
+
+void
+gimp_image_guide_moved (GimpImage *image,
+                        GimpGuide *guide)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  g_signal_emit (image, gimp_image_signals[GUIDE_MOVED], 0,
+                 guide);
+}
+
+void
+gimp_image_sample_point_added (GimpImage       *image,
+                               GimpSamplePoint *sample_point)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  g_signal_emit (image, gimp_image_signals[SAMPLE_POINT_ADDED], 0,
+                 sample_point);
+}
+
+void
+gimp_image_sample_point_removed (GimpImage       *image,
+                                 GimpSamplePoint *sample_point)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  g_signal_emit (image, gimp_image_signals[SAMPLE_POINT_REMOVED], 0,
+                 sample_point);
+}
+
+void
+gimp_image_sample_point_moved (GimpImage       *image,
+                               GimpSamplePoint *sample_point)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  g_signal_emit (image, gimp_image_signals[SAMPLE_POINT_MOVED], 0,
+                 sample_point);
+}
+
+/**
+ * gimp_image_size_changed_detailed:
+ * @image:
+ * @previous_origin_x:
+ * @previous_origin_y:
+ *
+ * Emits the size-changed-detailed signal that is typically used to adjust the
+ * position of the image in the display shell on various operations,
+ * e.g. crop.
+ *
+ * This function makes sure that GimpViewable::size-changed is also emitted.
+ **/
+void
+gimp_image_size_changed_detailed (GimpImage *image,
+                                  gint       previous_origin_x,
+                                  gint       previous_origin_y,
+                                  gint       previous_width,
+                                  gint       previous_height)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[SIZE_CHANGED_DETAILED], 0,
+                 previous_origin_x,
+                 previous_origin_y,
+                 previous_width,
+                 previous_height);
+}
+
+void
+gimp_image_colormap_changed (GimpImage *image,
+                             gint       color_index)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (color_index >= -1 &&
+                    color_index < GIMP_IMAGE_GET_PRIVATE (image)->n_colors);
+
+  g_signal_emit (image, gimp_image_signals[COLORMAP_CHANGED], 0,
+                 color_index);
+}
+
+void
+gimp_image_selection_invalidate (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[SELECTION_INVALIDATE], 0);
+}
+
+void
+gimp_image_quick_mask_changed (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[QUICK_MASK_CHANGED], 0);
+}
+
+void
+gimp_image_undo_event (GimpImage     *image,
+                       GimpUndoEvent  event,
+                       GimpUndo      *undo)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (((event == GIMP_UNDO_EVENT_UNDO_FREE   ||
+                      event == GIMP_UNDO_EVENT_UNDO_FREEZE ||
+                      event == GIMP_UNDO_EVENT_UNDO_THAW) && undo == NULL) ||
+                    GIMP_IS_UNDO (undo));
+
+  g_signal_emit (image, gimp_image_signals[UNDO_EVENT], 0, event, undo);
+}
+
+
+/*  dirty counters  */
+
+/* NOTE about the image->dirty counter:
+ *   If 0, then the image is clean (ie, copy on disk is the same as the one
+ *      in memory).
+ *   If positive, then that's the number of dirtying operations done
+ *       on the image since the last save.
+ *   If negative, then user has hit undo and gone back in time prior
+ *       to the saved copy.  Hitting redo will eventually come back to
+ *       the saved copy.
+ *
+ *   The image is dirty (ie, needs saving) if counter is non-zero.
+ *
+ *   If the counter is around 100000, this is due to undo-ing back
+ *   before a saved version, then changing the image (thus destroying
+ *   the redo stack).  Once this has happened, it's impossible to get
+ *   the image back to the state on disk, since the redo info has been
+ *   freed.  See gimpimage-undo.c for the gory details.
+ */
+
+/*
+ * NEVER CALL gimp_image_dirty() directly!
+ *
+ * If your code has just dirtied the image, push an undo instead.
+ * Failing that, push the trivial undo which tells the user the
+ * command is not undoable: undo_push_cantundo() (But really, it would
+ * be best to push a proper undo).  If you just dirty the image
+ * without pushing an undo then the dirty count is increased, but
+ * popping that many undo actions won't lead to a clean image.
+ */
+
+gint
+gimp_image_dirty (GimpImage     *image,
+                  GimpDirtyMask  dirty_mask)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->dirty++;
+  private->export_dirty++;
+
+  if (! private->dirty_time)
+    private->dirty_time = time (NULL);
+
+  g_signal_emit (image, gimp_image_signals[DIRTY], 0, dirty_mask);
+
+  TRC (("dirty %d -> %d\n", private->dirty - 1, private->dirty));
+
+  return private->dirty;
+}
+
+gint
+gimp_image_clean (GimpImage     *image,
+                  GimpDirtyMask  dirty_mask)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->dirty--;
+  private->export_dirty--;
+
+  g_signal_emit (image, gimp_image_signals[CLEAN], 0, dirty_mask);
+
+  TRC (("clean %d -> %d\n", private->dirty + 1, private->dirty));
+
+  return private->dirty;
+}
+
+void
+gimp_image_clean_all (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->dirty      = 0;
+  private->dirty_time = 0;
+
+  g_signal_emit (image, gimp_image_signals[CLEAN], 0, GIMP_DIRTY_ALL);
+
+  gimp_object_name_changed (GIMP_OBJECT (image));
+}
+
+void
+gimp_image_export_clean_all (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->export_dirty = 0;
+
+  g_signal_emit (image, gimp_image_signals[CLEAN], 0, GIMP_DIRTY_ALL);
+
+  gimp_object_name_changed (GIMP_OBJECT (image));
+}
+
+/**
+ * gimp_image_is_dirty:
+ * @image:
+ *
+ * Returns: True if the image is dirty, false otherwise.
+ **/
+gint
+gimp_image_is_dirty (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->dirty != 0;
+}
+
+/**
+ * gimp_image_is_export_dirty:
+ * @image:
+ *
+ * Returns: True if the image export is dirty, false otherwise.
+ **/
+gboolean
+gimp_image_is_export_dirty (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->export_dirty != 0;
+}
+
+gint64
+gimp_image_get_dirty_time (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->dirty_time;
+}
+
+/**
+ * gimp_image_saving:
+ * @image:
+ *
+ * Emits the "saving" signal, indicating that @image is about to be saved,
+ * or exported.
+ */
+void
+gimp_image_saving (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_emit (image, gimp_image_signals[SAVING], 0);
+}
+
+/**
+ * gimp_image_saved:
+ * @image:
+ * @file:
+ *
+ * Emits the "saved" signal, indicating that @image was saved to the
+ * location specified by @file.
+ */
+void
+gimp_image_saved (GimpImage *image,
+                  GFile     *file)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (G_IS_FILE (file));
+
+  g_signal_emit (image, gimp_image_signals[SAVED], 0, file);
+}
+
+/**
+ * gimp_image_exported:
+ * @image:
+ * @file:
+ *
+ * Emits the "exported" signal, indicating that @image was exported to the
+ * location specified by @file.
+ */
+void
+gimp_image_exported (GimpImage *image,
+                     GFile     *file)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (G_IS_FILE (file));
+
+  g_signal_emit (image, gimp_image_signals[EXPORTED], 0, file);
+}
+
+
+/*  flush this image's displays  */
+
+void
+gimp_image_flush (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  gimp_projectable_flush (GIMP_PROJECTABLE (image),
+                          GIMP_IMAGE_GET_PRIVATE (image)->flush_accum.preview_invalidated);
+}
+
+
+/*  display / instance counters  */
+
+gint
+gimp_image_get_display_count (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->disp_count;
+}
+
+void
+gimp_image_inc_display_count (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->disp_count++;
+}
+
+void
+gimp_image_dec_display_count (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->disp_count--;
+}
+
+gint
+gimp_image_get_instance_count (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->instance_count;
+}
+
+void
+gimp_image_inc_instance_count (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->instance_count++;
+}
+
+void
+gimp_image_inc_show_all_count (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->show_all++;
+
+  if (GIMP_IMAGE_GET_PRIVATE (image)->show_all == 1)
+    {
+      g_clear_object (&GIMP_IMAGE_GET_PRIVATE (image)->pickable_buffer);
+
+      gimp_image_update_bounding_box (image);
+    }
+}
+
+void
+gimp_image_dec_show_all_count (GimpImage *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_IMAGE_GET_PRIVATE (image)->show_all--;
+
+  if (GIMP_IMAGE_GET_PRIVATE (image)->show_all == 0)
+    {
+      g_clear_object (&GIMP_IMAGE_GET_PRIVATE (image)->pickable_buffer);
+
+      gimp_image_update_bounding_box (image);
+    }
+}
+
+
+/*  parasites  */
+
+const GimpParasite *
+gimp_image_parasite_find (GimpImage   *image,
+                          const gchar *name)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_parasite_list_find (GIMP_IMAGE_GET_PRIVATE (image)->parasites,
+                                  name);
+}
+
+static void
+list_func (gchar          *key,
+           GimpParasite   *p,
+           gchar        ***cur)
+{
+  *(*cur)++ = (gchar *) g_strdup (key);
+}
+
+gchar **
+gimp_image_parasite_list (GimpImage *image,
+                          gint      *count)
+{
+  GimpImagePrivate  *private;
+  gchar            **list;
+  gchar            **cur;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  *count = gimp_parasite_list_length (private->parasites);
+  cur = list = g_new (gchar *, *count);
+
+  gimp_parasite_list_foreach (private->parasites, (GHFunc) list_func, &cur);
+
+  return list;
+}
+
+gboolean
+gimp_image_parasite_validate (GimpImage           *image,
+                              const GimpParasite  *parasite,
+                              GError             **error)
+{
+  const gchar *name;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (parasite != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  name = gimp_parasite_name (parasite);
+
+  if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)
+    {
+      return gimp_image_validate_icc_parasite (image, parasite, NULL, error);
+    }
+  else if (strcmp (name, "gimp-comment") == 0)
+    {
+      const gchar *data   = gimp_parasite_data (parasite);
+      gssize       length = gimp_parasite_data_size (parasite);
+      gboolean     valid  = FALSE;
+
+      if (length > 0)
+        {
+          if (data[length - 1] == '\0')
+            valid = g_utf8_validate (data, -1, NULL);
+          else
+            valid = g_utf8_validate (data, length, NULL);
+        }
+
+      if (! valid)
+        {
+          g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                       _("'gimp-comment' parasite validation failed: "
+                         "comment contains invalid UTF-8"));
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+void
+gimp_image_parasite_attach (GimpImage          *image,
+                            const GimpParasite *parasite,
+                            gboolean            push_undo)
+{
+  GimpImagePrivate *private;
+  GimpParasite      copy;
+  const gchar      *name;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (parasite != NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  name = gimp_parasite_name (parasite);
+
+  /*  this is so ugly and is only for the PDB  */
+  if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)
+    {
+      GimpColorProfile *profile;
+      GimpColorProfile *builtin;
+
+      profile =
+        gimp_color_profile_new_from_icc_profile (gimp_parasite_data (parasite),
+                                                 gimp_parasite_data_size (parasite),
+                                                 NULL);
+      builtin = gimp_image_get_builtin_color_profile (image);
+
+      if (gimp_color_profile_is_equal (profile, builtin))
+        {
+          /* setting the builtin profile is equal to removing the profile */
+          gimp_image_parasite_detach (image, GIMP_ICC_PROFILE_PARASITE_NAME,
+                                      push_undo);
+          g_object_unref (profile);
+          return;
+        }
+
+      g_object_unref (profile);
+    }
+
+  /*  make a temporary copy of the GimpParasite struct because
+   *  gimp_parasite_shift_parent() changes it
+   */
+  copy = *parasite;
+
+  /*  only set the dirty bit manually if we can be saved and the new
+   *  parasite differs from the current one and we aren't undoable
+   */
+  if (push_undo && gimp_parasite_is_undoable (&copy))
+    gimp_image_undo_push_image_parasite (image,
+                                         C_("undo-type", "Attach Parasite to Image"),
+                                         &copy);
+
+  /*  We used to push a cantundo on the stack here. This made the undo stack
+   *  unusable (NULL on the stack) and prevented people from undoing after a
+   *  save (since most save plug-ins attach an undoable comment parasite).
+   *  Now we simply attach the parasite without pushing an undo. That way
+   *  it's undoable but does not block the undo system.   --Sven
+   */
+  gimp_parasite_list_add (private->parasites, &copy);
+
+  if (push_undo && gimp_parasite_has_flag (&copy, GIMP_PARASITE_ATTACH_PARENT))
+    {
+      gimp_parasite_shift_parent (&copy);
+      gimp_parasite_attach (image->gimp, &copy);
+    }
+
+  if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)
+    _gimp_image_update_color_profile (image, parasite);
+
+  g_signal_emit (image, gimp_image_signals[PARASITE_ATTACHED], 0,
+                 name);
+}
+
+void
+gimp_image_parasite_detach (GimpImage   *image,
+                            const gchar *name,
+                            gboolean     push_undo)
+{
+  GimpImagePrivate   *private;
+  const GimpParasite *parasite;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (name != NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! (parasite = gimp_parasite_list_find (private->parasites, name)))
+    return;
+
+  if (push_undo && gimp_parasite_is_undoable (parasite))
+    gimp_image_undo_push_image_parasite_remove (image,
+                                                C_("undo-type", "Remove Parasite from Image"),
+                                                name);
+
+  gimp_parasite_list_remove (private->parasites, name);
+
+  if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)
+    _gimp_image_update_color_profile (image, NULL);
+
+  g_signal_emit (image, gimp_image_signals[PARASITE_DETACHED], 0,
+                 name);
+}
+
+
+/*  tattoos  */
+
+GimpTattoo
+gimp_image_get_new_tattoo (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->tattoo_state++;
+
+  if (G_UNLIKELY (private->tattoo_state == 0))
+    g_warning ("%s: Tattoo state corrupted (integer overflow).", G_STRFUNC);
+
+  return private->tattoo_state;
+}
+
+GimpTattoo
+gimp_image_get_tattoo_state (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->tattoo_state;
+}
+
+gboolean
+gimp_image_set_tattoo_state (GimpImage  *image,
+                             GimpTattoo  val)
+{
+  GList      *all_items;
+  GList      *list;
+  gboolean    retval = TRUE;
+  GimpTattoo  maxval = 0;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  /* Check that the layer tattoos don't overlap with channel or vector ones */
+  all_items = gimp_image_get_layer_list (image);
+
+  for (list = all_items; list; list = g_list_next (list))
+    {
+      GimpTattoo ltattoo;
+
+      ltattoo = gimp_item_get_tattoo (GIMP_ITEM (list->data));
+      if (ltattoo > maxval)
+        maxval = ltattoo;
+
+      if (gimp_image_get_channel_by_tattoo (image, ltattoo))
+        retval = FALSE; /* Oopps duplicated tattoo in channel */
+
+      if (gimp_image_get_vectors_by_tattoo (image, ltattoo))
+        retval = FALSE; /* Oopps duplicated tattoo in vectors */
+    }
+
+  g_list_free (all_items);
+
+  /* Now check that the channel and vectors tattoos don't overlap */
+  all_items = gimp_image_get_channel_list (image);
+
+  for (list = all_items; list; list = g_list_next (list))
+    {
+      GimpTattoo ctattoo;
+
+      ctattoo = gimp_item_get_tattoo (GIMP_ITEM (list->data));
+      if (ctattoo > maxval)
+        maxval = ctattoo;
+
+      if (gimp_image_get_vectors_by_tattoo (image, ctattoo))
+        retval = FALSE; /* Oopps duplicated tattoo in vectors */
+    }
+
+  g_list_free (all_items);
+
+  /* Find the max tattoo value in the vectors */
+  all_items = gimp_image_get_vectors_list (image);
+
+  for (list = all_items; list; list = g_list_next (list))
+    {
+      GimpTattoo vtattoo;
+
+      vtattoo = gimp_item_get_tattoo (GIMP_ITEM (list->data));
+      if (vtattoo > maxval)
+        maxval = vtattoo;
+    }
+
+  g_list_free (all_items);
+
+  if (val < maxval)
+    retval = FALSE;
+
+  /* Must check if the state is valid */
+  if (retval == TRUE)
+    GIMP_IMAGE_GET_PRIVATE (image)->tattoo_state = val;
+
+  return retval;
+}
+
+
+/*  projection  */
+
+GimpProjection *
+gimp_image_get_projection (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->projection;
+}
+
+
+/*  layers / channels / vectors  */
+
+GimpItemTree *
+gimp_image_get_layer_tree (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->layers;
+}
+
+GimpItemTree *
+gimp_image_get_channel_tree (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->channels;
+}
+
+GimpItemTree *
+gimp_image_get_vectors_tree (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->vectors;
+}
+
+GimpContainer *
+gimp_image_get_layers (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->layers->container;
+}
+
+GimpContainer *
+gimp_image_get_channels (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->channels->container;
+}
+
+GimpContainer *
+gimp_image_get_vectors (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return GIMP_IMAGE_GET_PRIVATE (image)->vectors->container;
+}
+
+gint
+gimp_image_get_n_layers (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_layers (image));
+
+  return gimp_item_stack_get_n_items (stack);
+}
+
+gint
+gimp_image_get_n_channels (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_channels (image));
+
+  return gimp_item_stack_get_n_items (stack);
+}
+
+gint
+gimp_image_get_n_vectors (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_vectors (image));
+
+  return gimp_item_stack_get_n_items (stack);
+}
+
+GList *
+gimp_image_get_layer_iter (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_layers (image));
+
+  return gimp_item_stack_get_item_iter (stack);
+}
+
+GList *
+gimp_image_get_channel_iter (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_channels (image));
+
+  return gimp_item_stack_get_item_iter (stack);
+}
+
+GList *
+gimp_image_get_vectors_iter (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_vectors (image));
+
+  return gimp_item_stack_get_item_iter (stack);
+}
+
+GList *
+gimp_image_get_layer_list (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_layers (image));
+
+  return gimp_item_stack_get_item_list (stack);
+}
+
+GList *
+gimp_image_get_channel_list (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_channels (image));
+
+  return gimp_item_stack_get_item_list (stack);
+}
+
+GList *
+gimp_image_get_vectors_list (GimpImage *image)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_vectors (image));
+
+  return gimp_item_stack_get_item_list (stack);
+}
+
+
+/*  active drawable, layer, channel, vectors  */
+
+GimpDrawable *
+gimp_image_get_active_drawable (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpItem         *active_channel;
+  GimpItem         *active_layer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  active_channel = gimp_item_tree_get_active_item (private->channels);
+  active_layer   = gimp_item_tree_get_active_item (private->layers);
+
+  /*  If there is an active channel (a saved selection, etc.),
+   *  we ignore the active layer
+   */
+  if (active_channel)
+    {
+      return GIMP_DRAWABLE (active_channel);
+    }
+  else if (active_layer)
+    {
+      GimpLayer     *layer = GIMP_LAYER (active_layer);
+      GimpLayerMask *mask  = gimp_layer_get_mask (layer);
+
+      if (mask && gimp_layer_get_edit_mask (layer))
+        return GIMP_DRAWABLE (mask);
+      else
+        return GIMP_DRAWABLE (layer);
+    }
+
+  return NULL;
+}
+
+GimpLayer *
+gimp_image_get_active_layer (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return GIMP_LAYER (gimp_item_tree_get_active_item (private->layers));
+}
+
+GimpChannel *
+gimp_image_get_active_channel (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return GIMP_CHANNEL (gimp_item_tree_get_active_item (private->channels));
+}
+
+GimpVectors *
+gimp_image_get_active_vectors (GimpImage *image)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return GIMP_VECTORS (gimp_item_tree_get_active_item (private->vectors));
+}
+
+GimpLayer *
+gimp_image_set_active_layer (GimpImage *image,
+                             GimpLayer *layer)
+{
+  GimpImagePrivate *private;
+  GimpLayer        *floating_sel;
+  GimpLayer        *active_layer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (layer == NULL || GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (layer == NULL ||
+                        (gimp_item_is_attached (GIMP_ITEM (layer)) &&
+                         gimp_item_get_image (GIMP_ITEM (layer)) == image),
+                        NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  floating_sel = gimp_image_get_floating_selection (image);
+
+  /*  Make sure the floating_sel always is the active layer  */
+  if (floating_sel && layer != floating_sel)
+    return floating_sel;
+
+  active_layer = gimp_image_get_active_layer (image);
+
+  if (layer != active_layer)
+    {
+      /*  Don't cache selection info for the previous active layer  */
+      if (active_layer)
+        gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (active_layer));
+
+      gimp_item_tree_set_active_item (private->layers, GIMP_ITEM (layer));
+    }
+
+  return gimp_image_get_active_layer (image);
+}
+
+GimpChannel *
+gimp_image_set_active_channel (GimpImage   *image,
+                               GimpChannel *channel)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (channel == NULL || GIMP_IS_CHANNEL (channel), NULL);
+  g_return_val_if_fail (channel == NULL ||
+                        (gimp_item_is_attached (GIMP_ITEM (channel)) &&
+                         gimp_item_get_image (GIMP_ITEM (channel)) == image),
+                        NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  Not if there is a floating selection  */
+  if (channel && gimp_image_get_floating_selection (image))
+    return NULL;
+
+  if (channel != gimp_image_get_active_channel (image))
+    {
+      gimp_item_tree_set_active_item (private->channels, GIMP_ITEM (channel));
+    }
+
+  return gimp_image_get_active_channel (image);
+}
+
+GimpChannel *
+gimp_image_unset_active_channel (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GimpChannel      *channel;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  channel = gimp_image_get_active_channel (image);
+
+  if (channel)
+    {
+      gimp_image_set_active_channel (image, NULL);
+
+      if (private->layer_stack)
+        gimp_image_set_active_layer (image, private->layer_stack->data);
+    }
+
+  return channel;
+}
+
+GimpVectors *
+gimp_image_set_active_vectors (GimpImage   *image,
+                               GimpVectors *vectors)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (vectors == NULL ||
+                        (gimp_item_is_attached (GIMP_ITEM (vectors)) &&
+                         gimp_item_get_image (GIMP_ITEM (vectors)) == image),
+                        NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (vectors != gimp_image_get_active_vectors (image))
+    {
+      gimp_item_tree_set_active_item (private->vectors, GIMP_ITEM (vectors));
+    }
+
+  return gimp_image_get_active_vectors (image);
+}
+
+
+/*  layer, channel, vectors by tattoo  */
+
+GimpLayer *
+gimp_image_get_layer_by_tattoo (GimpImage  *image,
+                                GimpTattoo  tattoo)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_layers (image));
+
+  return GIMP_LAYER (gimp_item_stack_get_item_by_tattoo (stack, tattoo));
+}
+
+GimpChannel *
+gimp_image_get_channel_by_tattoo (GimpImage  *image,
+                                  GimpTattoo  tattoo)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_channels (image));
+
+  return GIMP_CHANNEL (gimp_item_stack_get_item_by_tattoo (stack, tattoo));
+}
+
+GimpVectors *
+gimp_image_get_vectors_by_tattoo (GimpImage  *image,
+                                  GimpTattoo  tattoo)
+{
+  GimpItemStack *stack;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  stack = GIMP_ITEM_STACK (gimp_image_get_vectors (image));
+
+  return GIMP_VECTORS (gimp_item_stack_get_item_by_tattoo (stack, tattoo));
+}
+
+
+/*  layer, channel, vectors by name  */
+
+GimpLayer *
+gimp_image_get_layer_by_name (GimpImage   *image,
+                              const gchar *name)
+{
+  GimpItemTree *tree;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  tree = gimp_image_get_layer_tree (image);
+
+  return GIMP_LAYER (gimp_item_tree_get_item_by_name (tree, name));
+}
+
+GimpChannel *
+gimp_image_get_channel_by_name (GimpImage   *image,
+                                const gchar *name)
+{
+  GimpItemTree *tree;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  tree = gimp_image_get_channel_tree (image);
+
+  return GIMP_CHANNEL (gimp_item_tree_get_item_by_name (tree, name));
+}
+
+GimpVectors *
+gimp_image_get_vectors_by_name (GimpImage   *image,
+                                const gchar *name)
+{
+  GimpItemTree *tree;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  tree = gimp_image_get_vectors_tree (image);
+
+  return GIMP_VECTORS (gimp_item_tree_get_item_by_name (tree, name));
+}
+
+
+/*  items  */
+
+gboolean
+gimp_image_reorder_item (GimpImage   *image,
+                         GimpItem    *item,
+                         GimpItem    *new_parent,
+                         gint         new_index,
+                         gboolean     push_undo,
+                         const gchar *undo_desc)
+{
+  GimpItemTree *tree;
+  gboolean      result;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (gimp_item_get_image (item) == image, FALSE);
+
+  tree = gimp_item_get_tree (item);
+
+  g_return_val_if_fail (tree != NULL, FALSE);
+
+  if (push_undo)
+    {
+      if (! undo_desc)
+        undo_desc = GIMP_ITEM_GET_CLASS (item)->reorder_desc;
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ITEM_REORDER,
+                                   undo_desc);
+    }
+
+  gimp_image_freeze_bounding_box (image);
+
+  gimp_item_start_move (item, push_undo);
+
+  /*  item and new_parent are type-checked in GimpItemTree
+   */
+  result = gimp_item_tree_reorder_item (tree, item,
+                                        new_parent, new_index,
+                                        push_undo, undo_desc);
+
+  gimp_item_end_move (item, push_undo);
+
+  gimp_image_thaw_bounding_box (image);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+
+  return result;
+}
+
+gboolean
+gimp_image_raise_item (GimpImage *image,
+                       GimpItem  *item,
+                       GError    **error)
+{
+  gint index;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  index = gimp_item_get_index (item);
+
+  g_return_val_if_fail (index != -1, FALSE);
+
+  if (index == 0)
+    {
+      g_set_error_literal (error,  GIMP_ERROR, GIMP_FAILED,
+                           GIMP_ITEM_GET_CLASS (item)->raise_failed);
+      return FALSE;
+    }
+
+  return gimp_image_reorder_item (image, item,
+                                  gimp_item_get_parent (item), index - 1,
+                                  TRUE, GIMP_ITEM_GET_CLASS (item)->raise_desc);
+}
+
+gboolean
+gimp_image_raise_item_to_top (GimpImage *image,
+                              GimpItem  *item)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return gimp_image_reorder_item (image, item,
+                                  gimp_item_get_parent (item), 0,
+                                  TRUE, GIMP_ITEM_GET_CLASS (item)->raise_to_top_desc);
+}
+
+gboolean
+gimp_image_lower_item (GimpImage *image,
+                       GimpItem  *item,
+                       GError    **error)
+{
+  GimpContainer *container;
+  gint           index;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  container = gimp_item_get_container (item);
+
+  g_return_val_if_fail (container != NULL, FALSE);
+
+  index = gimp_item_get_index (item);
+
+  if (index == gimp_container_get_n_children (container) - 1)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           GIMP_ITEM_GET_CLASS (item)->lower_failed);
+      return FALSE;
+    }
+
+  return gimp_image_reorder_item (image, item,
+                                  gimp_item_get_parent (item), index + 1,
+                                  TRUE, GIMP_ITEM_GET_CLASS (item)->lower_desc);
+}
+
+gboolean
+gimp_image_lower_item_to_bottom (GimpImage *image,
+                                  GimpItem *item)
+{
+  GimpContainer *container;
+  gint           length;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  container = gimp_item_get_container (item);
+
+  g_return_val_if_fail (container != NULL, FALSE);
+
+  length = gimp_container_get_n_children (container);
+
+  return gimp_image_reorder_item (image, item,
+                                  gimp_item_get_parent (item), length - 1,
+                                  TRUE, GIMP_ITEM_GET_CLASS (item)->lower_to_bottom_desc);
+}
+
+
+/*  layers  */
+
+gboolean
+gimp_image_add_layer (GimpImage *image,
+                      GimpLayer *layer,
+                      GimpLayer *parent,
+                      gint       position,
+                      gboolean   push_undo)
+{
+  GimpImagePrivate *private;
+  gboolean          old_has_alpha;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  item and parent are type-checked in GimpItemTree
+   */
+  if (! gimp_item_tree_get_insert_pos (private->layers,
+                                       (GimpItem *) layer,
+                                       (GimpItem **) &parent,
+                                       &position))
+    return FALSE;
+
+  gimp_image_unset_default_new_layer_mode (image);
+
+  /*  If there is a floating selection (and this isn't it!),
+   *  make sure the insert position is greater than 0
+   */
+  if (parent == NULL && position == 0 &&
+      gimp_image_get_floating_selection (image))
+    position = 1;
+
+  old_has_alpha = gimp_image_has_alpha (image);
+
+  if (push_undo)
+    gimp_image_undo_push_layer_add (image, C_("undo-type", "Add Layer"),
+                                    layer,
+                                    gimp_image_get_active_layer (image));
+
+  gimp_item_tree_add_item (private->layers, GIMP_ITEM (layer),
+                           GIMP_ITEM (parent), position);
+
+  gimp_image_set_active_layer (image, layer);
+
+  /*  If the layer is a floating selection, attach it to the drawable  */
+  if (gimp_layer_is_floating_sel (layer))
+    gimp_drawable_attach_floating_sel (gimp_layer_get_floating_sel_drawable (layer),
+                                       layer);
+
+  if (old_has_alpha != gimp_image_has_alpha (image))
+    private->flush_accum.alpha_changed = TRUE;
+
+  return TRUE;
+}
+
+void
+gimp_image_remove_layer (GimpImage *image,
+                         GimpLayer *layer,
+                         gboolean   push_undo,
+                         GimpLayer *new_active)
+{
+  GimpImagePrivate *private;
+  GimpLayer        *active_layer;
+  gboolean          old_has_alpha;
+  const gchar      *undo_desc;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)));
+  g_return_if_fail (gimp_item_get_image (GIMP_ITEM (layer)) == image);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  gimp_image_unset_default_new_layer_mode (image);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE,
+                                 C_("undo-type", "Remove Layer"));
+
+  gimp_item_start_move (GIMP_ITEM (layer), push_undo);
+
+  if (gimp_drawable_get_floating_sel (GIMP_DRAWABLE (layer)))
+    {
+      if (! push_undo)
+        {
+          g_warning ("%s() was called from an undo function while the layer "
+                     "had a floating selection. Please report this at "
+                     "https://www.gimp.org/bugs/", G_STRFUNC);
+          return;
+        }
+
+      gimp_image_remove_layer (image,
+                               gimp_drawable_get_floating_sel (GIMP_DRAWABLE (layer)),
+                               TRUE, NULL);
+    }
+
+  active_layer = gimp_image_get_active_layer (image);
+
+  old_has_alpha = gimp_image_has_alpha (image);
+
+  if (gimp_layer_is_floating_sel (layer))
+    {
+      undo_desc = C_("undo-type", "Remove Floating Selection");
+
+      gimp_drawable_detach_floating_sel (gimp_layer_get_floating_sel_drawable (layer));
+    }
+  else
+    {
+      undo_desc = C_("undo-type", "Remove Layer");
+    }
+
+  if (push_undo)
+    gimp_image_undo_push_layer_remove (image, undo_desc, layer,
+                                       gimp_layer_get_parent (layer),
+                                       gimp_item_get_index (GIMP_ITEM (layer)),
+                                       active_layer);
+
+  g_object_ref (layer);
+
+  /*  Make sure we're not caching any old selection info  */
+  if (layer == active_layer)
+    gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (layer));
+
+  private->layer_stack = g_slist_remove (private->layer_stack, layer);
+
+  /*  Also remove all children of a group layer from the layer_stack  */
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+    {
+      GimpContainer *stack = gimp_viewable_get_children (GIMP_VIEWABLE (layer));
+      GList         *children;
+      GList         *list;
+
+      children = gimp_item_stack_get_item_list (GIMP_ITEM_STACK (stack));
+
+      for (list = children; list; list = g_list_next (list))
+        {
+          private->layer_stack = g_slist_remove (private->layer_stack,
+                                                 list->data);
+        }
+
+      g_list_free (children);
+    }
+
+  new_active =
+    GIMP_LAYER (gimp_item_tree_remove_item (private->layers,
+                                            GIMP_ITEM (layer),
+                                            GIMP_ITEM (new_active)));
+
+  if (gimp_layer_is_floating_sel (layer))
+    {
+      /*  If this was the floating selection, activate the underlying drawable
+       */
+      floating_sel_activate_drawable (layer);
+    }
+  else if (active_layer &&
+           (layer == active_layer ||
+            gimp_viewable_is_ancestor (GIMP_VIEWABLE (layer),
+                                       GIMP_VIEWABLE (active_layer))))
+    {
+      gimp_image_set_active_layer (image, new_active);
+    }
+
+  gimp_item_end_move (GIMP_ITEM (layer), push_undo);
+
+  g_object_unref (layer);
+
+  if (old_has_alpha != gimp_image_has_alpha (image))
+    private->flush_accum.alpha_changed = TRUE;
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+void
+gimp_image_add_layers (GimpImage   *image,
+                       GList       *layers,
+                       GimpLayer   *parent,
+                       gint         position,
+                       gint         x,
+                       gint         y,
+                       gint         width,
+                       gint         height,
+                       const gchar *undo_desc)
+{
+  GimpImagePrivate *private;
+  GList            *list;
+  gint              layers_x      = G_MAXINT;
+  gint              layers_y      = G_MAXINT;
+  gint              layers_width  = 0;
+  gint              layers_height = 0;
+  gint              offset_x;
+  gint              offset_y;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (layers != NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  item and parent are type-checked in GimpItemTree
+   */
+  if (! gimp_item_tree_get_insert_pos (private->layers,
+                                       (GimpItem *) layers->data,
+                                       (GimpItem **) &parent,
+                                       &position))
+    return;
+
+  for (list = layers; list; list = g_list_next (list))
+    {
+      GimpItem *item = GIMP_ITEM (list->data);
+      gint      off_x, off_y;
+
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      layers_x = MIN (layers_x, off_x);
+      layers_y = MIN (layers_y, off_y);
+
+      layers_width  = MAX (layers_width,
+                           off_x + gimp_item_get_width (item)  - layers_x);
+      layers_height = MAX (layers_height,
+                           off_y + gimp_item_get_height (item) - layers_y);
+    }
+
+  offset_x = x + (width  - layers_width)  / 2 - layers_x;
+  offset_y = y + (height - layers_height) / 2 - layers_y;
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_LAYER_ADD, undo_desc);
+
+  for (list = layers; list; list = g_list_next (list))
+    {
+      GimpItem *new_item = GIMP_ITEM (list->data);
+
+      gimp_item_translate (new_item, offset_x, offset_y, FALSE);
+
+      gimp_image_add_layer (image, GIMP_LAYER (new_item),
+                            parent, position, TRUE);
+      position++;
+    }
+
+  if (layers)
+    gimp_image_set_active_layer (image, layers->data);
+
+  gimp_image_undo_group_end (image);
+}
+
+
+/*  channels  */
+
+gboolean
+gimp_image_add_channel (GimpImage   *image,
+                        GimpChannel *channel,
+                        GimpChannel *parent,
+                        gint         position,
+                        gboolean     push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  item and parent are type-checked in GimpItemTree
+   */
+  if (! gimp_item_tree_get_insert_pos (private->channels,
+                                       (GimpItem *) channel,
+                                       (GimpItem **) &parent,
+                                       &position))
+    return FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_channel_add (image, C_("undo-type", "Add Channel"),
+                                      channel,
+                                      gimp_image_get_active_channel (image));
+
+  gimp_item_tree_add_item (private->channels, GIMP_ITEM (channel),
+                           GIMP_ITEM (parent), position);
+
+  gimp_image_set_active_channel (image, channel);
+
+  return TRUE;
+}
+
+void
+gimp_image_remove_channel (GimpImage   *image,
+                           GimpChannel *channel,
+                           gboolean     push_undo,
+                           GimpChannel *new_active)
+{
+  GimpImagePrivate *private;
+  GimpChannel      *active_channel;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CHANNEL (channel));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
+  g_return_if_fail (gimp_item_get_image (GIMP_ITEM (channel)) == image);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE,
+                                 C_("undo-type", "Remove Channel"));
+
+  gimp_item_start_move (GIMP_ITEM (channel), push_undo);
+
+  if (gimp_drawable_get_floating_sel (GIMP_DRAWABLE (channel)))
+    {
+      if (! push_undo)
+        {
+          g_warning ("%s() was called from an undo function while the channel "
+                     "had a floating selection. Please report this at "
+                     "https://www.gimp.org/bugs/", G_STRFUNC);
+          return;
+        }
+
+      gimp_image_remove_layer (image,
+                               gimp_drawable_get_floating_sel (GIMP_DRAWABLE (channel)),
+                               TRUE, NULL);
+    }
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  active_channel = gimp_image_get_active_channel (image);
+
+  if (push_undo)
+    gimp_image_undo_push_channel_remove (image, C_("undo-type", "Remove Channel"), channel,
+                                         gimp_channel_get_parent (channel),
+                                         gimp_item_get_index (GIMP_ITEM (channel)),
+                                         active_channel);
+
+  g_object_ref (channel);
+
+  new_active =
+    GIMP_CHANNEL (gimp_item_tree_remove_item (private->channels,
+                                              GIMP_ITEM (channel),
+                                              GIMP_ITEM (new_active)));
+
+  if (active_channel &&
+      (channel == active_channel ||
+       gimp_viewable_is_ancestor (GIMP_VIEWABLE (channel),
+                                  GIMP_VIEWABLE (active_channel))))
+    {
+      if (new_active)
+        gimp_image_set_active_channel (image, new_active);
+      else
+        gimp_image_unset_active_channel (image);
+    }
+
+  gimp_item_end_move (GIMP_ITEM (channel), push_undo);
+
+  g_object_unref (channel);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+
+/*  vectors  */
+
+gboolean
+gimp_image_add_vectors (GimpImage   *image,
+                        GimpVectors *vectors,
+                        GimpVectors *parent,
+                        gint         position,
+                        gboolean     push_undo)
+{
+  GimpImagePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  /*  item and parent are type-checked in GimpItemTree
+   */
+  if (! gimp_item_tree_get_insert_pos (private->vectors,
+                                       (GimpItem *) vectors,
+                                       (GimpItem **) &parent,
+                                       &position))
+    return FALSE;
+
+  if (push_undo)
+    gimp_image_undo_push_vectors_add (image, C_("undo-type", "Add Path"),
+                                      vectors,
+                                      gimp_image_get_active_vectors (image));
+
+  gimp_item_tree_add_item (private->vectors, GIMP_ITEM (vectors),
+                           GIMP_ITEM (parent), position);
+
+  gimp_image_set_active_vectors (image, vectors);
+
+  return TRUE;
+}
+
+void
+gimp_image_remove_vectors (GimpImage   *image,
+                           GimpVectors *vectors,
+                           gboolean     push_undo,
+                           GimpVectors *new_active)
+{
+  GimpImagePrivate *private;
+  GimpVectors      *active_vectors;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (vectors)));
+  g_return_if_fail (gimp_item_get_image (GIMP_ITEM (vectors)) == image);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE,
+                                 C_("undo-type", "Remove Path"));
+
+  gimp_item_start_move (GIMP_ITEM (vectors), push_undo);
+
+  active_vectors = gimp_image_get_active_vectors (image);
+
+  if (push_undo)
+    gimp_image_undo_push_vectors_remove (image, C_("undo-type", "Remove Path"), vectors,
+                                         gimp_vectors_get_parent (vectors),
+                                         gimp_item_get_index (GIMP_ITEM (vectors)),
+                                         active_vectors);
+
+  g_object_ref (vectors);
+
+  new_active =
+    GIMP_VECTORS (gimp_item_tree_remove_item (private->vectors,
+                                              GIMP_ITEM (vectors),
+                                              GIMP_ITEM (new_active)));
+
+  if (active_vectors &&
+      (vectors == active_vectors ||
+       gimp_viewable_is_ancestor (GIMP_VIEWABLE (vectors),
+                                  GIMP_VIEWABLE (active_vectors))))
+    {
+      gimp_image_set_active_vectors (image, new_active);
+    }
+
+  gimp_item_end_move (GIMP_ITEM (vectors), push_undo);
+
+  g_object_unref (vectors);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+gboolean
+gimp_image_coords_in_active_pickable (GimpImage        *image,
+                                      const GimpCoords *coords,
+                                      gboolean          show_all,
+                                      gboolean          sample_merged,
+                                      gboolean          selected_only)
+{
+  gint     x, y;
+  gboolean in_pickable = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  x = floor (coords->x);
+  y = floor (coords->y);
+
+  if (sample_merged)
+    {
+      if (show_all || (x >= 0 && x < gimp_image_get_width  (image) &&
+                       y >= 0 && y < gimp_image_get_height (image)))
+        {
+          in_pickable = TRUE;
+        }
+    }
+  else
+    {
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+      if (drawable)
+        {
+          GimpItem *item = GIMP_ITEM (drawable);
+          gint      off_x, off_y;
+          gint      d_x, d_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+
+          d_x = x - off_x;
+          d_y = y - off_y;
+
+          if (d_x >= 0 && d_x < gimp_item_get_width  (item) &&
+              d_y >= 0 && d_y < gimp_item_get_height (item))
+            in_pickable = TRUE;
+        }
+    }
+
+  if (in_pickable && selected_only)
+    {
+      GimpChannel *selection = gimp_image_get_mask (image);
+
+      if (! gimp_channel_is_empty (selection) &&
+          ! gimp_pickable_get_opacity_at (GIMP_PICKABLE (selection),
+                                          x, y))
+        {
+          in_pickable = FALSE;
+        }
+    }
+
+  return in_pickable;
+}
+
+void
+gimp_image_invalidate_previews (GimpImage *image)
+{
+  GimpItemStack *layers;
+  GimpItemStack *channels;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  layers   = GIMP_ITEM_STACK (gimp_image_get_layers (image));
+  channels = GIMP_ITEM_STACK (gimp_image_get_channels (image));
+
+  gimp_item_stack_invalidate_previews (layers);
+  gimp_item_stack_invalidate_previews (channels);
+}
+
+/* Sets the image into a "converting" state, which is there to warn other code
+ * (such as shell render code) that the image properties might be in an
+ * inconsistent state. For instance when converting to another precision with
+ * gimp_image_convert_precision(), the babl format may be updated first, and the
+ * profile later, after all drawables are converted. Rendering the image
+ * in-between would at best render broken previews (at worst, crash, e.g.
+ * because we depend on allocated data which might have become too small).
+ */
+void
+gimp_image_set_converting (GimpImage *image,
+                           gboolean   converting)
+{
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_object_set (image,
+                "converting", converting,
+                NULL);
+}
+
+gboolean
+gimp_image_get_converting (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  return private->converting;
+}
diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h
new file mode 100644
index 0000000..50654ab
--- /dev/null
+++ b/app/core/gimpimage.h
@@ -0,0 +1,463 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_H__
+#define __GIMP_IMAGE_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_IMAGE_ACTIVE_PARENT ((gpointer) 1)
+
+
+#define GIMP_TYPE_IMAGE            (gimp_image_get_type ())
+#define GIMP_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE, GimpImage))
+#define GIMP_IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE, GimpImageClass))
+#define GIMP_IS_IMAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE))
+#define GIMP_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE))
+#define GIMP_IMAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE, GimpImageClass))
+
+
+typedef struct _GimpImageClass   GimpImageClass;
+typedef struct _GimpImagePrivate GimpImagePrivate;
+
+struct _GimpImage
+{
+  GimpViewable      parent_instance;
+
+  Gimp             *gimp;  /*  the GIMP the image belongs to  */
+
+  GimpImagePrivate *priv;
+};
+
+struct _GimpImageClass
+{
+  GimpViewableClass  parent_class;
+
+  /*  signals  */
+  void (* mode_changed)                 (GimpImage            *image);
+  void (* precision_changed)            (GimpImage            *image);
+  void (* alpha_changed)                (GimpImage            *image);
+  void (* floating_selection_changed)   (GimpImage            *image);
+  void (* active_layer_changed)         (GimpImage            *image);
+  void (* active_channel_changed)       (GimpImage            *image);
+  void (* active_vectors_changed)       (GimpImage            *image);
+  void (* linked_items_changed)         (GimpImage            *image);
+  void (* component_visibility_changed) (GimpImage            *image,
+                                         GimpChannelType       channel);
+  void (* component_active_changed)     (GimpImage            *image,
+                                         GimpChannelType       channel);
+  void (* mask_changed)                 (GimpImage            *image);
+  void (* resolution_changed)           (GimpImage            *image);
+  void (* size_changed_detailed)        (GimpImage            *image,
+                                         gint                  previous_origin_x,
+                                         gint                  previous_origin_y,
+                                         gint                  previous_width,
+                                         gint                  previous_height);
+  void (* unit_changed)                 (GimpImage            *image);
+  void (* quick_mask_changed)           (GimpImage            *image);
+  void (* selection_invalidate)         (GimpImage            *image);
+
+  void (* clean)                        (GimpImage            *image,
+                                         GimpDirtyMask         dirty_mask);
+  void (* dirty)                        (GimpImage            *image,
+                                         GimpDirtyMask         dirty_mask);
+  void (* saving)                       (GimpImage            *image);
+  void (* saved)                        (GimpImage            *image,
+                                         GFile                *file);
+  void (* exported)                     (GimpImage            *image,
+                                         GFile                *file);
+
+  void (* guide_added)                  (GimpImage            *image,
+                                         GimpGuide            *guide);
+  void (* guide_removed)                (GimpImage            *image,
+                                         GimpGuide            *guide);
+  void (* guide_moved)                  (GimpImage            *image,
+                                         GimpGuide            *guide);
+  void (* sample_point_added)           (GimpImage            *image,
+                                         GimpSamplePoint      *sample_point);
+  void (* sample_point_removed)         (GimpImage            *image,
+                                         GimpSamplePoint      *sample_point);
+  void (* sample_point_moved)           (GimpImage            *image,
+                                         GimpSamplePoint      *sample_point);
+  void (* parasite_attached)            (GimpImage            *image,
+                                         const gchar          *name);
+  void (* parasite_detached)            (GimpImage            *image,
+                                         const gchar          *name);
+  void (* colormap_changed)             (GimpImage            *image,
+                                         gint                  color_index);
+  void (* undo_event)                   (GimpImage            *image,
+                                         GimpUndoEvent         event,
+                                         GimpUndo             *undo);
+};
+
+
+GType           gimp_image_get_type              (void) G_GNUC_CONST;
+
+GimpImage     * gimp_image_new                   (Gimp               *gimp,
+                                                  gint                width,
+                                                  gint                height,
+                                                  GimpImageBaseType   base_type,
+                                                  GimpPrecision       precision);
+
+gint64          gimp_image_estimate_memsize      (GimpImage          *image,
+                                                  GimpComponentType   component_type,
+                                                  gint                width,
+                                                  gint                height);
+
+GimpImageBaseType  gimp_image_get_base_type      (GimpImage          *image);
+GimpComponentType  gimp_image_get_component_type (GimpImage          *image);
+GimpPrecision      gimp_image_get_precision      (GimpImage          *image);
+
+const Babl    * gimp_image_get_format            (GimpImage          *image,
+                                                  GimpImageBaseType   base_type,
+                                                  GimpPrecision       precision,
+                                                  gboolean            with_alpha);
+const Babl    * gimp_image_get_layer_format      (GimpImage          *image,
+                                                  gboolean            with_alpha);
+const Babl    * gimp_image_get_channel_format    (GimpImage          *image);
+const Babl    * gimp_image_get_mask_format       (GimpImage          *image);
+
+GimpLayerMode   gimp_image_get_default_new_layer_mode
+                                                 (GimpImage          *image);
+void            gimp_image_unset_default_new_layer_mode
+                                                 (GimpImage          *image);
+
+gint            gimp_image_get_ID                (GimpImage          *image);
+GimpImage     * gimp_image_get_by_ID             (Gimp               *gimp,
+                                                  gint                id);
+
+GFile         * gimp_image_get_file              (GimpImage          *image);
+GFile         * gimp_image_get_untitled_file     (GimpImage          *image);
+GFile         * gimp_image_get_file_or_untitled  (GimpImage          *image);
+GFile         * gimp_image_get_imported_file     (GimpImage          *image);
+GFile         * gimp_image_get_exported_file     (GimpImage          *image);
+GFile         * gimp_image_get_save_a_copy_file  (GimpImage          *image);
+GFile         * gimp_image_get_any_file          (GimpImage          *image);
+
+void            gimp_image_set_file              (GimpImage          *image,
+                                                  GFile              *file);
+void            gimp_image_set_imported_file     (GimpImage          *image,
+                                                  GFile              *file);
+void            gimp_image_set_exported_file     (GimpImage          *image,
+                                                  GFile              *file);
+void            gimp_image_set_save_a_copy_file  (GimpImage          *image,
+                                                  GFile              *file);
+
+const gchar   * gimp_image_get_display_name      (GimpImage          *image);
+const gchar   * gimp_image_get_display_path      (GimpImage          *image);
+
+void            gimp_image_set_load_proc         (GimpImage          *image,
+                                                  GimpPlugInProcedure *proc);
+GimpPlugInProcedure * gimp_image_get_load_proc   (GimpImage          *image);
+void            gimp_image_set_save_proc         (GimpImage          *image,
+                                                  GimpPlugInProcedure *proc);
+GimpPlugInProcedure * gimp_image_get_save_proc   (GimpImage          *image);
+void            gimp_image_saving                (GimpImage          *image);
+void            gimp_image_saved                 (GimpImage          *image,
+                                                  GFile              *file);
+void            gimp_image_set_export_proc       (GimpImage          *image,
+                                                  GimpPlugInProcedure *proc);
+GimpPlugInProcedure * gimp_image_get_export_proc (GimpImage          *image);
+void            gimp_image_exported              (GimpImage          *image,
+                                                  GFile              *file);
+
+gint            gimp_image_get_xcf_version       (GimpImage          *image,
+                                                  gboolean            zlib_compression,
+                                                  gint               *gimp_version,
+                                                  const gchar       **version_string,
+                                                  gchar             **version_reason);
+
+void            gimp_image_set_xcf_compression   (GimpImage          *image,
+                                                  gboolean            compression);
+gboolean        gimp_image_get_xcf_compression   (GimpImage          *image);
+
+void            gimp_image_set_resolution        (GimpImage          *image,
+                                                  gdouble             xres,
+                                                  gdouble             yres);
+void            gimp_image_get_resolution        (GimpImage          *image,
+                                                  gdouble            *xres,
+                                                  gdouble            *yres);
+void            gimp_image_resolution_changed    (GimpImage          *image);
+
+void            gimp_image_set_unit              (GimpImage          *image,
+                                                  GimpUnit            unit);
+GimpUnit        gimp_image_get_unit              (GimpImage          *image);
+void            gimp_image_unit_changed          (GimpImage          *image);
+
+gint            gimp_image_get_width             (GimpImage          *image);
+gint            gimp_image_get_height            (GimpImage          *image);
+
+gboolean        gimp_image_has_alpha             (GimpImage          *image);
+gboolean        gimp_image_is_empty              (GimpImage          *image);
+
+void           gimp_image_set_floating_selection (GimpImage          *image,
+                                                  GimpLayer          *floating_sel);
+GimpLayer    * gimp_image_get_floating_selection (GimpImage          *image);
+void       gimp_image_floating_selection_changed (GimpImage          *image);
+
+GimpChannel   * gimp_image_get_mask              (GimpImage          *image);
+void            gimp_image_mask_changed          (GimpImage          *image);
+
+
+/*  image components  */
+
+const Babl    * gimp_image_get_component_format  (GimpImage          *image,
+                                                  GimpChannelType     channel);
+gint            gimp_image_get_component_index   (GimpImage          *image,
+                                                  GimpChannelType     channel);
+
+void            gimp_image_set_component_active  (GimpImage          *image,
+                                                  GimpChannelType     type,
+                                                  gboolean            active);
+gboolean        gimp_image_get_component_active  (GimpImage          *image,
+                                                  GimpChannelType     type);
+void            gimp_image_get_active_array      (GimpImage          *image,
+                                                  gboolean           *components);
+GimpComponentMask gimp_image_get_active_mask     (GimpImage          *image);
+
+void            gimp_image_set_component_visible (GimpImage          *image,
+                                                  GimpChannelType     type,
+                                                  gboolean            visible);
+gboolean        gimp_image_get_component_visible (GimpImage          *image,
+                                                  GimpChannelType     type);
+void            gimp_image_get_visible_array     (GimpImage          *image,
+                                                  gboolean           *components);
+GimpComponentMask gimp_image_get_visible_mask    (GimpImage          *image);
+
+
+/*  emitting image signals  */
+
+void            gimp_image_mode_changed          (GimpImage          *image);
+void            gimp_image_precision_changed     (GimpImage          *image);
+void            gimp_image_alpha_changed         (GimpImage          *image);
+void            gimp_image_linked_items_changed  (GimpImage          *image);
+void            gimp_image_invalidate            (GimpImage          *image,
+                                                  gint                x,
+                                                  gint                y,
+                                                  gint                width,
+                                                  gint                height);
+void            gimp_image_invalidate_all        (GimpImage          *image);
+void            gimp_image_guide_added           (GimpImage          *image,
+                                                  GimpGuide          *guide);
+void            gimp_image_guide_removed         (GimpImage          *image,
+                                                  GimpGuide          *guide);
+void            gimp_image_guide_moved           (GimpImage          *image,
+                                                  GimpGuide          *guide);
+
+void            gimp_image_sample_point_added    (GimpImage          *image,
+                                                  GimpSamplePoint    *sample_point);
+void            gimp_image_sample_point_removed  (GimpImage          *image,
+                                                  GimpSamplePoint    *sample_point);
+void            gimp_image_sample_point_moved    (GimpImage          *image,
+                                                  GimpSamplePoint    *sample_point);
+void            gimp_image_colormap_changed      (GimpImage          *image,
+                                                  gint                col);
+void            gimp_image_selection_invalidate  (GimpImage          *image);
+void            gimp_image_quick_mask_changed    (GimpImage          *image);
+void            gimp_image_size_changed_detailed (GimpImage          *image,
+                                                  gint                previous_origin_x,
+                                                  gint                previous_origin_y,
+                                                  gint                previous_width,
+                                                  gint                previous_height);
+void            gimp_image_undo_event            (GimpImage          *image,
+                                                  GimpUndoEvent       event,
+                                                  GimpUndo           *undo);
+
+
+/*  dirty counters  */
+
+gint            gimp_image_dirty                 (GimpImage          *image,
+                                                  GimpDirtyMask       dirty_mask);
+gint            gimp_image_clean                 (GimpImage          *image,
+                                                  GimpDirtyMask       dirty_mask);
+void            gimp_image_clean_all             (GimpImage          *image);
+void            gimp_image_export_clean_all      (GimpImage          *image);
+gint            gimp_image_is_dirty              (GimpImage          *image);
+gboolean        gimp_image_is_export_dirty       (GimpImage          *image);
+gint64          gimp_image_get_dirty_time        (GimpImage          *image);
+
+
+/*  flush this image's displays  */
+
+void            gimp_image_flush                 (GimpImage          *image);
+
+
+/*  display / instance counters  */
+
+gint            gimp_image_get_display_count     (GimpImage          *image);
+void            gimp_image_inc_display_count     (GimpImage          *image);
+void            gimp_image_dec_display_count     (GimpImage          *image);
+
+gint            gimp_image_get_instance_count    (GimpImage          *image);
+void            gimp_image_inc_instance_count    (GimpImage          *image);
+
+void            gimp_image_inc_show_all_count    (GimpImage          *image);
+void            gimp_image_dec_show_all_count    (GimpImage          *image);
+
+
+/*  parasites  */
+
+const GimpParasite * gimp_image_parasite_find    (GimpImage          *image,
+                                                  const gchar        *name);
+gchar        ** gimp_image_parasite_list         (GimpImage          *image,
+                                                  gint               *count);
+gboolean        gimp_image_parasite_validate     (GimpImage          *image,
+                                                  const GimpParasite *parasite,
+                                                  GError            **error);
+void            gimp_image_parasite_attach       (GimpImage          *image,
+                                                  const GimpParasite *parasite,
+                                                  gboolean            push_undo);
+void            gimp_image_parasite_detach       (GimpImage          *image,
+                                                  const gchar        *name,
+                                                  gboolean            push_undo);
+
+
+/*  tattoos  */
+
+GimpTattoo      gimp_image_get_new_tattoo        (GimpImage          *image);
+gboolean        gimp_image_set_tattoo_state      (GimpImage          *image,
+                                                  GimpTattoo          val);
+GimpTattoo      gimp_image_get_tattoo_state      (GimpImage          *image);
+
+
+/*  projection  */
+
+GimpProjection * gimp_image_get_projection       (GimpImage          *image);
+
+
+/*  layers / channels / vectors  */
+
+GimpItemTree  * gimp_image_get_layer_tree        (GimpImage          *image);
+GimpItemTree  * gimp_image_get_channel_tree      (GimpImage          *image);
+GimpItemTree  * gimp_image_get_vectors_tree      (GimpImage          *image);
+
+GimpContainer * gimp_image_get_layers            (GimpImage          *image);
+GimpContainer * gimp_image_get_channels          (GimpImage          *image);
+GimpContainer * gimp_image_get_vectors           (GimpImage          *image);
+
+gint            gimp_image_get_n_layers          (GimpImage          *image);
+gint            gimp_image_get_n_channels        (GimpImage          *image);
+gint            gimp_image_get_n_vectors         (GimpImage          *image);
+
+GList         * gimp_image_get_layer_iter        (GimpImage          *image);
+GList         * gimp_image_get_channel_iter      (GimpImage          *image);
+GList         * gimp_image_get_vectors_iter      (GimpImage          *image);
+
+GList         * gimp_image_get_layer_list        (GimpImage          *image);
+GList         * gimp_image_get_channel_list      (GimpImage          *image);
+GList         * gimp_image_get_vectors_list      (GimpImage          *image);
+
+GimpDrawable  * gimp_image_get_active_drawable   (GimpImage          *image);
+GimpLayer     * gimp_image_get_active_layer      (GimpImage          *image);
+GimpChannel   * gimp_image_get_active_channel    (GimpImage          *image);
+GimpVectors   * gimp_image_get_active_vectors    (GimpImage          *image);
+
+GimpLayer     * gimp_image_set_active_layer      (GimpImage          *image,
+                                                  GimpLayer          *layer);
+GimpChannel   * gimp_image_set_active_channel    (GimpImage          *image,
+                                                  GimpChannel        *channel);
+GimpChannel   * gimp_image_unset_active_channel  (GimpImage          *image);
+GimpVectors   * gimp_image_set_active_vectors    (GimpImage          *image,
+                                                  GimpVectors        *vectors);
+
+GimpLayer     * gimp_image_get_layer_by_tattoo   (GimpImage          *image,
+                                                  GimpTattoo          tattoo);
+GimpChannel   * gimp_image_get_channel_by_tattoo (GimpImage          *image,
+                                                  GimpTattoo          tattoo);
+GimpVectors   * gimp_image_get_vectors_by_tattoo (GimpImage          *image,
+                                                  GimpTattoo          tattoo);
+
+GimpLayer     * gimp_image_get_layer_by_name     (GimpImage          *image,
+                                                  const gchar        *name);
+GimpChannel   * gimp_image_get_channel_by_name   (GimpImage          *image,
+                                                  const gchar        *name);
+GimpVectors   * gimp_image_get_vectors_by_name   (GimpImage          *image,
+                                                  const gchar        *name);
+
+gboolean        gimp_image_reorder_item          (GimpImage          *image,
+                                                  GimpItem           *item,
+                                                  GimpItem           *new_parent,
+                                                  gint                new_index,
+                                                  gboolean            push_undo,
+                                                  const gchar        *undo_desc);
+gboolean        gimp_image_raise_item            (GimpImage          *image,
+                                                  GimpItem           *item,
+                                                  GError            **error);
+gboolean        gimp_image_raise_item_to_top     (GimpImage          *image,
+                                                  GimpItem           *item);
+gboolean        gimp_image_lower_item            (GimpImage          *image,
+                                                  GimpItem           *item,
+                                                  GError            **error);
+gboolean        gimp_image_lower_item_to_bottom  (GimpImage          *image,
+                                                  GimpItem           *item);
+
+gboolean        gimp_image_add_layer             (GimpImage          *image,
+                                                  GimpLayer          *layer,
+                                                  GimpLayer          *parent,
+                                                  gint                position,
+                                                  gboolean            push_undo);
+void            gimp_image_remove_layer          (GimpImage          *image,
+                                                  GimpLayer          *layer,
+                                                  gboolean            push_undo,
+                                                  GimpLayer          *new_active);
+
+void            gimp_image_add_layers            (GimpImage          *image,
+                                                  GList              *layers,
+                                                  GimpLayer          *parent,
+                                                  gint                position,
+                                                  gint                x,
+                                                  gint                y,
+                                                  gint                width,
+                                                  gint                height,
+                                                  const gchar        *undo_desc);
+
+gboolean        gimp_image_add_channel           (GimpImage          *image,
+                                                  GimpChannel        *channel,
+                                                  GimpChannel        *parent,
+                                                  gint                position,
+                                                  gboolean            push_undo);
+void            gimp_image_remove_channel        (GimpImage          *image,
+                                                  GimpChannel        *channel,
+                                                  gboolean            push_undo,
+                                                  GimpChannel        *new_active);
+
+gboolean        gimp_image_add_vectors           (GimpImage          *image,
+                                                  GimpVectors        *vectors,
+                                                  GimpVectors        *parent,
+                                                  gint                position,
+                                                  gboolean            push_undo);
+void            gimp_image_remove_vectors        (GimpImage          *image,
+                                                  GimpVectors        *vectors,
+                                                  gboolean            push_undo,
+                                                  GimpVectors        *new_active);
+
+gboolean    gimp_image_coords_in_active_pickable (GimpImage          *image,
+                                                  const GimpCoords   *coords,
+                                                  gboolean            show_all,
+                                                  gboolean            sample_merged,
+                                                  gboolean            selected_only);
+
+void            gimp_image_invalidate_previews   (GimpImage          *image);
+
+void            gimp_image_set_converting        (GimpImage          *image,
+                                                  gboolean            converting);
+gboolean        gimp_image_get_converting        (GimpImage          *image);
+
+
+#endif /* __GIMP_IMAGE_H__ */
diff --git a/app/core/gimpimagefile.c b/app/core/gimpimagefile.c
new file mode 100644
index 0000000..cf079d8
--- /dev/null
+++ b/app/core/gimpimagefile.c
@@ -0,0 +1,1078 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimagefile.c
+ *
+ * Copyright (C) 2001-2004  Sven Neumann <sven@gimp.org>
+ *                          Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpthumb/gimpthumb.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpimage.h"
+#include "gimpimagefile.h"
+#include "gimpmarshal.h"
+#include "gimppickable.h"
+#include "gimpprogress.h"
+
+#include "file/file-open.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  INFO_CHANGED,
+  LAST_SIGNAL
+};
+
+
+typedef struct _GimpImagefilePrivate GimpImagefilePrivate;
+
+struct _GimpImagefilePrivate
+{
+  Gimp          *gimp;
+
+  GFile         *file;
+  GimpThumbnail *thumbnail;
+  GIcon         *icon;
+  GCancellable  *icon_cancellable;
+
+  gchar         *description;
+  gboolean       static_desc;
+};
+
+#define GET_PRIVATE(imagefile) ((GimpImagefilePrivate *) gimp_imagefile_get_instance_private ((GimpImagefile *) (imagefile)))
+
+
+static void        gimp_imagefile_dispose          (GObject        *object);
+static void        gimp_imagefile_finalize         (GObject        *object);
+
+static void        gimp_imagefile_name_changed     (GimpObject     *object);
+
+static GdkPixbuf * gimp_imagefile_get_new_pixbuf   (GimpViewable   *viewable,
+                                                    GimpContext    *context,
+                                                    gint            width,
+                                                    gint            height);
+static gchar     * gimp_imagefile_get_description  (GimpViewable   *viewable,
+                                                    gchar         **tooltip);
+
+static void        gimp_imagefile_info_changed     (GimpImagefile  *imagefile);
+static void        gimp_imagefile_notify_thumbnail (GimpImagefile  *imagefile,
+                                                    GParamSpec     *pspec);
+
+static void        gimp_imagefile_icon_callback    (GObject        *source_object,
+                                                    GAsyncResult   *result,
+                                                    gpointer        data);
+
+static GdkPixbuf * gimp_imagefile_load_thumb       (GimpImagefile  *imagefile,
+                                                    gint            width,
+                                                    gint            height);
+static gboolean    gimp_imagefile_save_thumb       (GimpImagefile  *imagefile,
+                                                    GimpImage      *image,
+                                                    gint            size,
+                                                    gboolean        replace,
+                                                    GError        **error);
+
+static void     gimp_thumbnail_set_info_from_image (GimpThumbnail  *thumbnail,
+                                                    const gchar    *mime_type,
+                                                    GimpImage      *image);
+static void     gimp_thumbnail_set_info            (GimpThumbnail  *thumbnail,
+                                                    const gchar    *mime_type,
+                                                    gint            width,
+                                                    gint            height,
+                                                    const Babl     *format,
+                                                    gint            num_layers);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpImagefile, gimp_imagefile, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_imagefile_parent_class
+
+static guint gimp_imagefile_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_imagefile_class_init (GimpImagefileClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  gchar             *creator;
+
+  gimp_imagefile_signals[INFO_CHANGED] =
+    g_signal_new ("info-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImagefileClass, info_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose               = gimp_imagefile_dispose;
+  object_class->finalize              = gimp_imagefile_finalize;
+
+  gimp_object_class->name_changed     = gimp_imagefile_name_changed;
+
+  viewable_class->name_changed_signal = "info-changed";
+  viewable_class->get_new_pixbuf      = gimp_imagefile_get_new_pixbuf;
+  viewable_class->get_description     = gimp_imagefile_get_description;
+
+  g_type_class_ref (GIMP_TYPE_IMAGE_TYPE);
+
+  creator = g_strdup_printf ("gimp-%d.%d",
+                             GIMP_MAJOR_VERSION, GIMP_MINOR_VERSION);
+
+  gimp_thumb_init (creator, NULL);
+
+  g_free (creator);
+}
+
+static void
+gimp_imagefile_init (GimpImagefile *imagefile)
+{
+  GimpImagefilePrivate *private = GET_PRIVATE (imagefile);
+
+  private->thumbnail = gimp_thumbnail_new ();
+
+  g_signal_connect_object (private->thumbnail, "notify",
+                           G_CALLBACK (gimp_imagefile_notify_thumbnail),
+                           imagefile, G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_imagefile_dispose (GObject *object)
+{
+  GimpImagefilePrivate *private = GET_PRIVATE (object);
+
+  if (private->icon_cancellable)
+    {
+      g_cancellable_cancel (private->icon_cancellable);
+      g_clear_object (&private->icon_cancellable);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_imagefile_finalize (GObject *object)
+{
+  GimpImagefilePrivate *private = GET_PRIVATE (object);
+
+  if (private->description)
+    {
+      if (! private->static_desc)
+        g_free (private->description);
+
+      private->description = NULL;
+    }
+
+  g_clear_object (&private->thumbnail);
+  g_clear_object (&private->icon);
+  g_clear_object (&private->file);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_imagefile_name_changed (GimpObject *object)
+{
+  GimpImagefilePrivate *private = GET_PRIVATE (object);
+
+  if (GIMP_OBJECT_CLASS (parent_class)->name_changed)
+    GIMP_OBJECT_CLASS (parent_class)->name_changed (object);
+
+  gimp_thumbnail_set_uri (private->thumbnail, gimp_object_get_name (object));
+
+  g_clear_object (&private->file);
+
+  if (gimp_object_get_name (object))
+    private->file = g_file_new_for_uri (gimp_object_get_name (object));
+}
+
+static GdkPixbuf *
+gimp_imagefile_get_new_pixbuf (GimpViewable *viewable,
+                               GimpContext  *context,
+                               gint          width,
+                               gint          height)
+{
+  GimpImagefile *imagefile = GIMP_IMAGEFILE (viewable);
+
+  if (! gimp_object_get_name (imagefile))
+    return NULL;
+
+  return gimp_imagefile_load_thumb (imagefile, width, height);
+}
+
+static gchar *
+gimp_imagefile_get_description (GimpViewable   *viewable,
+                                gchar         **tooltip)
+{
+  GimpImagefile        *imagefile = GIMP_IMAGEFILE (viewable);
+  GimpImagefilePrivate *private   = GET_PRIVATE (imagefile);
+  GimpThumbnail        *thumbnail = private->thumbnail;
+  gchar                *basename;
+
+  if (! private->file)
+    return NULL;
+
+  if (tooltip)
+    {
+      const gchar *name;
+      const gchar *desc;
+
+      name = gimp_file_get_utf8_name (private->file);
+      desc = gimp_imagefile_get_desc_string (imagefile);
+
+      if (desc)
+        *tooltip = g_strdup_printf ("%s\n%s", name, desc);
+      else
+        *tooltip = g_strdup (name);
+    }
+
+  basename = g_path_get_basename (gimp_file_get_utf8_name (private->file));
+
+  if (thumbnail->image_width > 0 && thumbnail->image_height > 0)
+    {
+      gchar *tmp = basename;
+
+      basename = g_strdup_printf ("%s (%d × %d)",
+                                  tmp,
+                                  thumbnail->image_width,
+                                  thumbnail->image_height);
+      g_free (tmp);
+    }
+
+  return basename;
+}
+
+
+/*  public functions  */
+
+GimpImagefile *
+gimp_imagefile_new (Gimp  *gimp,
+                    GFile *file)
+{
+  GimpImagefile *imagefile;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
+
+  imagefile = g_object_new (GIMP_TYPE_IMAGEFILE, NULL);
+
+  GET_PRIVATE (imagefile)->gimp = gimp;
+
+  if (file)
+    {
+      gimp_object_take_name (GIMP_OBJECT (imagefile), g_file_get_uri (file));
+
+      /* file member gets created by gimp_imagefile_name_changed() */
+    }
+
+  return imagefile;
+}
+
+GFile *
+gimp_imagefile_get_file (GimpImagefile *imagefile)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), NULL);
+
+  return GET_PRIVATE (imagefile)->file;
+}
+
+void
+gimp_imagefile_set_file (GimpImagefile *imagefile,
+                         GFile         *file)
+{
+  g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  if (GET_PRIVATE (imagefile)->file != file)
+    {
+      gimp_object_take_name (GIMP_OBJECT (imagefile),
+                             file ? g_file_get_uri (file) : NULL);
+    }
+}
+
+GimpThumbnail *
+gimp_imagefile_get_thumbnail (GimpImagefile *imagefile)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), NULL);
+
+  return GET_PRIVATE (imagefile)->thumbnail;
+}
+
+GIcon *
+gimp_imagefile_get_gicon (GimpImagefile *imagefile)
+{
+  GimpImagefilePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), NULL);
+
+  private = GET_PRIVATE (imagefile);
+
+  if (private->icon)
+    return private->icon;
+
+  if (private->file && ! private->icon_cancellable)
+    {
+      private->icon_cancellable = g_cancellable_new ();
+
+      g_file_query_info_async (private->file, "standard::icon",
+                               G_FILE_QUERY_INFO_NONE,
+                               G_PRIORITY_DEFAULT,
+                               private->icon_cancellable,
+                               gimp_imagefile_icon_callback,
+                               imagefile);
+    }
+
+  return NULL;
+}
+
+void
+gimp_imagefile_set_mime_type (GimpImagefile *imagefile,
+                              const gchar   *mime_type)
+{
+  g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile));
+
+  g_object_set (GET_PRIVATE (imagefile)->thumbnail,
+                "image-mimetype", mime_type,
+                NULL);
+}
+
+void
+gimp_imagefile_update (GimpImagefile *imagefile)
+{
+  GimpImagefilePrivate *private;
+  gchar                *uri;
+
+  g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile));
+
+  private = GET_PRIVATE (imagefile);
+
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (imagefile));
+
+  g_object_get (private->thumbnail,
+                "image-uri", &uri,
+                NULL);
+
+  if (uri)
+    {
+      GimpImagefile *documents_imagefile = (GimpImagefile *)
+        gimp_container_get_child_by_name (private->gimp->documents, uri);
+
+      if (documents_imagefile != imagefile &&
+          GIMP_IS_IMAGEFILE (documents_imagefile))
+        gimp_viewable_invalidate_preview (GIMP_VIEWABLE (documents_imagefile));
+
+      g_free (uri);
+    }
+}
+
+gboolean
+gimp_imagefile_create_thumbnail (GimpImagefile  *imagefile,
+                                 GimpContext    *context,
+                                 GimpProgress   *progress,
+                                 gint            size,
+                                 gboolean        replace,
+                                 GError        **error)
+{
+  GimpImagefilePrivate *private;
+  GimpThumbnail        *thumbnail;
+  GimpThumbState        image_state;
+
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* thumbnailing is disabled, we successfully did nothing */
+  if (size < 1)
+    return TRUE;
+
+  private = GET_PRIVATE (imagefile);
+
+  thumbnail = private->thumbnail;
+
+  gimp_thumbnail_set_uri (thumbnail,
+                          gimp_object_get_name (imagefile));
+
+  image_state = gimp_thumbnail_peek_image (thumbnail);
+
+  if (image_state == GIMP_THUMB_STATE_REMOTE ||
+      image_state >= GIMP_THUMB_STATE_EXISTS)
+    {
+      GimpImage     *image;
+      gboolean       success;
+      gint           width      = 0;
+      gint           height     = 0;
+      const gchar   *mime_type  = NULL;
+      const Babl    *format     = NULL;
+      gint           num_layers = -1;
+
+      /*  we only want to attempt thumbnailing on readable, regular files  */
+      if (g_file_is_native (private->file))
+        {
+          GFileInfo *file_info;
+          gboolean   regular;
+          gboolean   readable;
+
+          file_info = g_file_query_info (private->file,
+                                         G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                         G_FILE_ATTRIBUTE_ACCESS_CAN_READ,
+                                         G_FILE_QUERY_INFO_NONE,
+                                         NULL, NULL);
+
+          regular  = (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR);
+          readable = g_file_info_get_attribute_boolean (file_info,
+                                                        G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
+
+          g_object_unref (file_info);
+
+          if (! (regular && readable))
+            return TRUE;
+        }
+
+      g_object_ref (imagefile);
+
+      /* don't pass the error, we're only interested in errors from
+       * actual thumbnail saving
+       */
+      image = file_open_thumbnail (private->gimp, context, progress,
+                                   private->file, size,
+                                   &mime_type, &width, &height,
+                                   &format, &num_layers, NULL);
+
+      if (image)
+        {
+          gimp_thumbnail_set_info (private->thumbnail,
+                                   mime_type, width, height,
+                                   format, num_layers);
+        }
+      else
+        {
+          GimpPDBStatusType  status;
+
+          /* don't pass the error, we're only interested in errors
+           * from actual thumbnail saving
+           */
+          image = file_open_image (private->gimp, context, progress,
+                                   private->file,
+                                   private->file,
+                                   FALSE, NULL, GIMP_RUN_NONINTERACTIVE,
+                                   &status, &mime_type, NULL);
+
+          if (image)
+            gimp_thumbnail_set_info_from_image (private->thumbnail,
+                                                mime_type, image);
+        }
+
+      if (image)
+        {
+          success = gimp_imagefile_save_thumb (imagefile,
+                                               image, size, replace,
+                                               error);
+
+          g_object_unref (image);
+        }
+      else
+        {
+          success = gimp_thumbnail_save_failure (thumbnail,
+                                                 "GIMP " GIMP_VERSION,
+                                                 error);
+          gimp_imagefile_update (imagefile);
+        }
+
+      g_object_unref (imagefile);
+
+      if (! success)
+        {
+          g_object_set (thumbnail,
+                        "thumb-state", GIMP_THUMB_STATE_FAILED,
+                        NULL);
+        }
+
+      return success;
+    }
+
+  return TRUE;
+}
+
+/*  The weak version doesn't ref the imagefile but deals gracefully
+ *  with an imagefile that is destroyed while the thumbnail is
+ *  created. This allows one to use this function w/o the need to
+ *  block the user interface.
+ */
+void
+gimp_imagefile_create_thumbnail_weak (GimpImagefile *imagefile,
+                                      GimpContext   *context,
+                                      GimpProgress  *progress,
+                                      gint           size,
+                                      gboolean       replace)
+{
+  GimpImagefilePrivate *private;
+  GimpImagefile        *local;
+
+  g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile));
+
+  if (size < 1)
+    return;
+
+  private = GET_PRIVATE (imagefile);
+
+  if (! private->file)
+    return;
+
+  local = gimp_imagefile_new (private->gimp, private->file);
+
+  g_object_add_weak_pointer (G_OBJECT (imagefile), (gpointer) &imagefile);
+
+  if (! gimp_imagefile_create_thumbnail (local, context, progress, size, replace,
+                                         NULL))
+    {
+      /* The weak version works on a local copy so the thumbnail
+       * status of the actual image is not properly updated in case of
+       * creation failure, thus it would end up in a generic
+       * GIMP_THUMB_STATE_NOT_FOUND, which is less informative.
+       */
+      g_object_set (private->thumbnail,
+                    "thumb-state", GIMP_THUMB_STATE_FAILED,
+                    NULL);
+    }
+
+  if (imagefile)
+    {
+      GFile *file = gimp_imagefile_get_file (imagefile);
+
+      if (file && g_file_equal (file, gimp_imagefile_get_file (local)))
+        {
+          gimp_imagefile_update (imagefile);
+        }
+
+      g_object_remove_weak_pointer (G_OBJECT (imagefile),
+                                    (gpointer) &imagefile);
+    }
+
+  g_object_unref (local);
+}
+
+gboolean
+gimp_imagefile_check_thumbnail (GimpImagefile *imagefile)
+{
+  GimpImagefilePrivate *private;
+  gint                  size;
+
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), FALSE);
+
+  private = GET_PRIVATE (imagefile);
+
+  size = private->gimp->config->thumbnail_size;
+
+  if (size > 0)
+    {
+      GimpThumbState  state;
+
+      state = gimp_thumbnail_check_thumb (private->thumbnail, size);
+
+      return (state == GIMP_THUMB_STATE_OK);
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_imagefile_save_thumbnail (GimpImagefile  *imagefile,
+                               const gchar    *mime_type,
+                               GimpImage      *image,
+                               GError        **error)
+{
+  GimpImagefilePrivate *private;
+  gint                  size;
+  gboolean              success = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  private = GET_PRIVATE (imagefile);
+
+  size = private->gimp->config->thumbnail_size;
+
+  if (size > 0)
+    {
+      gimp_thumbnail_set_info_from_image (private->thumbnail,
+                                          mime_type, image);
+
+      success = gimp_imagefile_save_thumb (imagefile,
+                                           image, size, FALSE,
+                                           error);
+    }
+
+  return success;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_imagefile_info_changed (GimpImagefile *imagefile)
+{
+  GimpImagefilePrivate *private = GET_PRIVATE (imagefile);
+
+  if (private->description)
+    {
+      if (! private->static_desc)
+        g_free (private->description);
+
+      private->description = NULL;
+    }
+
+  g_clear_object (&private->icon);
+
+  g_signal_emit (imagefile, gimp_imagefile_signals[INFO_CHANGED], 0);
+}
+
+static void
+gimp_imagefile_notify_thumbnail (GimpImagefile *imagefile,
+                                 GParamSpec    *pspec)
+{
+  if (strcmp (pspec->name, "image-state") == 0 ||
+      strcmp (pspec->name, "thumb-state") == 0)
+    {
+      gimp_imagefile_info_changed (imagefile);
+    }
+}
+
+static void
+gimp_imagefile_icon_callback (GObject      *source_object,
+                              GAsyncResult *result,
+                              gpointer      data)
+{
+  GimpImagefile        *imagefile;
+  GimpImagefilePrivate *private;
+  GFile                *file  = G_FILE (source_object);
+  GError               *error = NULL;
+  GFileInfo            *file_info;
+
+  file_info = g_file_query_info_finish (file, result, &error);
+
+  if (error)
+    {
+      /* we were cancelled from dispose() and the imagefile is
+       * long gone, bail out
+       */
+      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        {
+          g_clear_error (&error);
+          return;
+        }
+
+#ifdef GIMP_UNSTABLE
+      g_printerr ("%s: %s\n", G_STRFUNC, error->message);
+#endif
+
+      g_clear_error (&error);
+    }
+
+  imagefile = GIMP_IMAGEFILE (data);
+  private   = GET_PRIVATE (imagefile);
+
+  if (file_info)
+    {
+      private->icon = g_object_ref (g_file_info_get_icon (file_info));
+      g_object_unref (file_info);
+    }
+
+  g_clear_object (&private->icon_cancellable);
+
+  if (private->icon)
+    gimp_viewable_invalidate_preview (GIMP_VIEWABLE (imagefile));
+}
+
+const gchar *
+gimp_imagefile_get_desc_string (GimpImagefile *imagefile)
+{
+  GimpImagefilePrivate *private;
+  GimpThumbnail        *thumbnail;
+
+  g_return_val_if_fail (GIMP_IS_IMAGEFILE (imagefile), NULL);
+
+  private = GET_PRIVATE (imagefile);
+
+  if (private->description)
+    return (const gchar *) private->description;
+
+  thumbnail = private->thumbnail;
+
+  switch (thumbnail->image_state)
+    {
+    case GIMP_THUMB_STATE_UNKNOWN:
+      private->description = NULL;
+      private->static_desc = TRUE;
+      break;
+
+    case GIMP_THUMB_STATE_FOLDER:
+      private->description = (gchar *) _("Folder");
+      private->static_desc = TRUE;
+      break;
+
+    case GIMP_THUMB_STATE_SPECIAL:
+      private->description = (gchar *) _("Special File");
+      private->static_desc = TRUE;
+      break;
+
+    case GIMP_THUMB_STATE_NOT_FOUND:
+      private->description =
+        (gchar *) g_strerror (thumbnail->image_not_found_errno);
+      private->static_desc = TRUE;
+      break;
+
+    default:
+      {
+        GString *str = g_string_new (NULL);
+
+        if (thumbnail->image_state == GIMP_THUMB_STATE_REMOTE)
+          {
+            g_string_append (str, _("Remote File"));
+          }
+
+        if (thumbnail->image_filesize > 0)
+          {
+            gchar *size = g_format_size (thumbnail->image_filesize);
+
+            if (str->len > 0)
+              g_string_append_c (str, '\n');
+
+            g_string_append (str, size);
+            g_free (size);
+          }
+
+        switch (thumbnail->thumb_state)
+          {
+          case GIMP_THUMB_STATE_NOT_FOUND:
+            if (str->len > 0)
+              g_string_append_c (str, '\n');
+            g_string_append (str, _("Click to create preview"));
+            break;
+
+          case GIMP_THUMB_STATE_EXISTS:
+            if (str->len > 0)
+              g_string_append_c (str, '\n');
+            g_string_append (str, _("Loading preview..."));
+            break;
+
+          case GIMP_THUMB_STATE_OLD:
+            if (str->len > 0)
+              g_string_append_c (str, '\n');
+            g_string_append (str, _("Preview is out of date"));
+            break;
+
+          case GIMP_THUMB_STATE_FAILED:
+            if (str->len > 0)
+              g_string_append_c (str, '\n');
+            g_string_append (str, _("Cannot create preview"));
+            break;
+
+          case GIMP_THUMB_STATE_OK:
+            {
+              if (thumbnail->image_state == GIMP_THUMB_STATE_REMOTE)
+                {
+                  if (str->len > 0)
+                    g_string_append_c (str, '\n');
+
+                  g_string_append (str, _("(Preview may be out of date)"));
+                }
+
+              if (thumbnail->image_width > 0 && thumbnail->image_height > 0)
+                {
+                  if (str->len > 0)
+                    g_string_append_c (str, '\n');
+
+                  g_string_append_printf (str,
+                                          ngettext ("%d × %d pixel",
+                                                    "%d × %d pixels",
+                                                    thumbnail->image_height),
+                                          thumbnail->image_width,
+                                          thumbnail->image_height);
+                }
+
+              if (thumbnail->image_type)
+                {
+                  if (str->len > 0)
+                    g_string_append_c (str, '\n');
+
+                  g_string_append (str, gettext (thumbnail->image_type));
+                }
+
+              if (thumbnail->image_num_layers > 0)
+                {
+                  if (thumbnail->image_type)
+                    g_string_append_len (str, ", ", 2);
+                  else if (str->len > 0)
+                    g_string_append_c (str, '\n');
+
+                  g_string_append_printf (str,
+                                          ngettext ("%d layer",
+                                                    "%d layers",
+                                                    thumbnail->image_num_layers),
+                                          thumbnail->image_num_layers);
+                }
+            }
+            break;
+
+          default:
+            break;
+          }
+
+        private->description = g_string_free (str, FALSE);
+        private->static_desc = FALSE;
+      }
+    }
+
+  return (const gchar *) private->description;
+}
+
+static GdkPixbuf *
+gimp_imagefile_load_thumb (GimpImagefile *imagefile,
+                           gint           width,
+                           gint           height)
+{
+  GimpImagefilePrivate *private   = GET_PRIVATE (imagefile);
+  GimpThumbnail        *thumbnail = private->thumbnail;
+  GdkPixbuf            *pixbuf    = NULL;
+  GError               *error     = NULL;
+  gint                  size      = MAX (width, height);
+  gint                  pixbuf_width;
+  gint                  pixbuf_height;
+  gint                  preview_width;
+  gint                  preview_height;
+
+  if (gimp_thumbnail_peek_thumb (thumbnail, size) < GIMP_THUMB_STATE_EXISTS)
+    return NULL;
+
+  if (thumbnail->image_state == GIMP_THUMB_STATE_NOT_FOUND)
+    return NULL;
+
+  pixbuf = gimp_thumbnail_load_thumb (thumbnail, size, &error);
+
+  if (! pixbuf)
+    {
+      if (error)
+        {
+          gimp_message (private->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        _("Could not open thumbnail '%s': %s"),
+                        thumbnail->thumb_filename, error->message);
+          g_clear_error (&error);
+        }
+
+      return NULL;
+    }
+
+  pixbuf_width  = gdk_pixbuf_get_width  (pixbuf);
+  pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+
+  gimp_viewable_calc_preview_size (pixbuf_width,
+                                   pixbuf_height,
+                                   width,
+                                   height,
+                                   TRUE, 1.0, 1.0,
+                                   &preview_width,
+                                   &preview_height,
+                                   NULL);
+
+  if (preview_width < pixbuf_width || preview_height < pixbuf_height)
+    {
+      GdkPixbuf *scaled = gdk_pixbuf_scale_simple (pixbuf,
+                                                   preview_width,
+                                                   preview_height,
+                                                   GDK_INTERP_BILINEAR);
+      g_object_unref (pixbuf);
+      pixbuf = scaled;
+
+      pixbuf_width  = preview_width;
+      pixbuf_height = preview_height;
+    }
+
+  if (gdk_pixbuf_get_n_channels (pixbuf) != 3)
+    {
+      GdkPixbuf *tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                       pixbuf_width, pixbuf_height);
+
+      gdk_pixbuf_composite_color (pixbuf, tmp,
+                                  0, 0, pixbuf_width, pixbuf_height,
+                                  0.0, 0.0, 1.0, 1.0,
+                                  GDK_INTERP_NEAREST, 255,
+                                  0, 0, GIMP_CHECK_SIZE_SM,
+                                  0x66666666, 0x99999999);
+
+      g_object_unref (pixbuf);
+      pixbuf = tmp;
+    }
+
+  return pixbuf;
+}
+
+static gboolean
+gimp_imagefile_save_thumb (GimpImagefile  *imagefile,
+                           GimpImage      *image,
+                           gint            size,
+                           gboolean        replace,
+                           GError        **error)
+{
+  GimpImagefilePrivate *private   = GET_PRIVATE (imagefile);
+  GimpThumbnail        *thumbnail = private->thumbnail;
+  GdkPixbuf            *pixbuf;
+  gint                  width, height;
+  gboolean              success = FALSE;
+
+  if (size < 1)
+    return TRUE;
+
+  if (gimp_image_get_width  (image) <= size &&
+      gimp_image_get_height (image) <= size)
+    {
+      width  = gimp_image_get_width  (image);
+      height = gimp_image_get_height (image);
+
+      size = MAX (width, height);
+    }
+  else
+    {
+      if (gimp_image_get_width (image) < gimp_image_get_height (image))
+        {
+          height = size;
+          width  = MAX (1, (size * gimp_image_get_width (image) /
+                            gimp_image_get_height (image)));
+        }
+      else
+        {
+          width  = size;
+          height = MAX (1, (size * gimp_image_get_height (image) /
+                            gimp_image_get_width (image)));
+        }
+    }
+
+  /*  we need the projection constructed NOW, not some time later  */
+  gimp_pickable_flush (GIMP_PICKABLE (image));
+
+  pixbuf = gimp_viewable_get_new_pixbuf (GIMP_VIEWABLE (image),
+                                         /* random context, unused */
+                                         gimp_get_user_context (image->gimp),
+                                         width, height);
+
+  /*  when layer previews are disabled, we won't get a pixbuf  */
+  if (! pixbuf)
+    return TRUE;
+
+  success = gimp_thumbnail_save_thumb (thumbnail,
+                                       pixbuf,
+                                       "GIMP " GIMP_VERSION,
+                                       error);
+
+  g_object_unref (pixbuf);
+
+  if (success)
+    {
+      if (replace)
+        gimp_thumbnail_delete_others (thumbnail, size);
+      else
+        gimp_thumbnail_delete_failure (thumbnail);
+
+      gimp_imagefile_update (imagefile);
+    }
+
+  return success;
+}
+
+static void
+gimp_thumbnail_set_info_from_image (GimpThumbnail *thumbnail,
+                                    const gchar   *mime_type,
+                                    GimpImage     *image)
+{
+  const Babl *format;
+
+  /*  peek the thumbnail to make sure that mtime and filesize are set  */
+  gimp_thumbnail_peek_image (thumbnail);
+
+  format = gimp_image_get_layer_format (image,
+                                        gimp_image_has_alpha (image));
+
+  g_object_set (thumbnail,
+                "image-mimetype",   mime_type,
+                "image-width",      gimp_image_get_width  (image),
+                "image-height",     gimp_image_get_height (image),
+                "image-type",       gimp_babl_format_get_description (format),
+                "image-num-layers", gimp_image_get_n_layers (image),
+                NULL);
+}
+
+/**
+ * gimp_thumbnail_set_info:
+ * @thumbnail: #GimpThumbnail object
+ * @mime_type:  MIME type of the image associated with this thumbnail
+ * @width:      width of the image associated with this thumbnail
+ * @height:     height of the image associated with this thumbnail
+ * @format:     format of the image (or NULL if the type is not known)
+ * @num_layers: number of layers in the image
+ *              (or -1 if the number of layers is not known)
+ *
+ * Set information about the image associated with the @thumbnail object.
+ */
+static void
+gimp_thumbnail_set_info (GimpThumbnail *thumbnail,
+                         const gchar   *mime_type,
+                         gint           width,
+                         gint           height,
+                         const Babl    *format,
+                         gint           num_layers)
+{
+  /*  peek the thumbnail to make sure that mtime and filesize are set  */
+  gimp_thumbnail_peek_image (thumbnail);
+
+  g_object_set (thumbnail,
+                "image-mimetype", mime_type,
+                "image-width",    width,
+                "image-height",   height,
+                NULL);
+
+  if (format)
+    g_object_set (thumbnail,
+                  "image-type", gimp_babl_format_get_description (format),
+                  NULL);
+
+  if (num_layers != -1)
+    g_object_set (thumbnail,
+                  "image-num-layers", num_layers,
+                  NULL);
+}
diff --git a/app/core/gimpimagefile.h b/app/core/gimpimagefile.h
new file mode 100644
index 0000000..9ea29b0
--- /dev/null
+++ b/app/core/gimpimagefile.h
@@ -0,0 +1,90 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimagefile.h
+ *
+ * Thumbnail handling according to the Thumbnail Managing Standard.
+ * https://specifications.freedesktop.org/thumbnail-spec/
+ *
+ * Copyright (C) 2001-2002  Sven Neumann <sven@gimp.org>
+ *                          Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGEFILE_H__
+#define __GIMP_IMAGEFILE_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_IMAGEFILE            (gimp_imagefile_get_type ())
+#define GIMP_IMAGEFILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGEFILE, GimpImagefile))
+#define GIMP_IMAGEFILE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGEFILE, GimpImagefileClass))
+#define GIMP_IS_IMAGEFILE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGEFILE))
+#define GIMP_IS_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGEFILE))
+#define GIMP_IMAGEFILE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGEFILE, GimpImagefileClass))
+
+
+typedef struct _GimpImagefileClass GimpImagefileClass;
+
+struct _GimpImagefile
+{
+  GimpViewable  parent_instance;
+};
+
+struct _GimpImagefileClass
+{
+  GimpViewableClass   parent_class;
+
+  void (* info_changed) (GimpImagefile *imagefile);
+};
+
+
+GType           gimp_imagefile_get_type              (void) G_GNUC_CONST;
+
+GimpImagefile * gimp_imagefile_new                   (Gimp           *gimp,
+                                                      GFile          *file);
+
+GFile         * gimp_imagefile_get_file              (GimpImagefile  *imagefile);
+void            gimp_imagefile_set_file              (GimpImagefile  *imagefile,
+                                                      GFile          *file);
+
+GimpThumbnail * gimp_imagefile_get_thumbnail         (GimpImagefile  *imagefile);
+GIcon         * gimp_imagefile_get_gicon             (GimpImagefile  *imagefile);
+
+void            gimp_imagefile_set_mime_type         (GimpImagefile  *imagefile,
+                                                      const gchar    *mime_type);
+void            gimp_imagefile_update                (GimpImagefile  *imagefile);
+gboolean        gimp_imagefile_create_thumbnail      (GimpImagefile  *imagefile,
+                                                      GimpContext    *context,
+                                                      GimpProgress   *progress,
+                                                      gint            size,
+                                                      gboolean        replace,
+                                                      GError        **error);
+void            gimp_imagefile_create_thumbnail_weak (GimpImagefile  *imagefile,
+                                                      GimpContext    *context,
+                                                      GimpProgress   *progress,
+                                                      gint            size,
+                                                      gboolean        replace);
+gboolean        gimp_imagefile_check_thumbnail       (GimpImagefile  *imagefile);
+gboolean        gimp_imagefile_save_thumbnail        (GimpImagefile  *imagefile,
+                                                      const gchar    *mime_type,
+                                                      GimpImage      *image,
+                                                      GError        **error);
+const gchar   * gimp_imagefile_get_desc_string       (GimpImagefile  *imagefile);
+
+
+#endif /* __GIMP_IMAGEFILE_H__ */
diff --git a/app/core/gimpimageproxy.c b/app/core/gimpimageproxy.c
new file mode 100644
index 0000000..6007d6c
--- /dev/null
+++ b/app/core/gimpimageproxy.c
@@ -0,0 +1,877 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimageproxy.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-preview.h"
+#include "gimpimageproxy.h"
+#include "gimppickable.h"
+#include "gimpprojectable.h"
+#include "gimptempbuf.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE,
+  PROP_SHOW_ALL,
+  PROP_BUFFER
+};
+
+
+struct _GimpImageProxyPrivate
+{
+  GimpImage     *image;
+  gboolean       show_all;
+
+  GeglRectangle  bounding_box;
+  gboolean       frozen;
+};
+
+
+/*  local function prototypes  */
+
+static void               gimp_image_proxy_pickable_iface_init      (GimpPickableInterface      *iface);
+static void               gimp_image_proxy_color_managed_iface_init (GimpColorManagedInterface  *iface);
+
+static void               gimp_image_proxy_finalize                 (GObject                    *object);
+static void               gimp_image_proxy_set_property             (GObject                    *object,
+                                                                     guint                       property_id,
+                                                                     const GValue               *value,
+                                                                     GParamSpec                 *pspec);
+static void               gimp_image_proxy_get_property             (GObject                    *object,
+                                                                     guint                       property_id,
+                                                                     GValue                     *value,
+                                                                     GParamSpec                 *pspec);
+
+static gboolean           gimp_image_proxy_get_size                 (GimpViewable               *viewable,
+                                                                     gint                       *width,
+                                                                     gint                       *height);
+static void               gimp_image_proxy_get_preview_size         (GimpViewable               *viewable,
+                                                                     gint                        size,
+                                                                     gboolean                    is_popup,
+                                                                     gboolean                    dot_for_dot,
+                                                                     gint                       *width,
+                                                                     gint                       *height);
+static gboolean           gimp_image_proxy_get_popup_size           (GimpViewable               *viewable,
+                                                                     gint                        width,
+                                                                     gint                        height,
+                                                                     gboolean                    dot_for_dot,
+                                                                     gint                       *popup_width,
+                                                                     gint                       *popup_height);
+static GimpTempBuf      * gimp_image_proxy_get_new_preview          (GimpViewable               *viewable,
+                                                                     GimpContext                *context,
+                                                                     gint                        width,
+                                                                     gint                        height);
+static GdkPixbuf        * gimp_image_proxy_get_new_pixbuf           (GimpViewable               *viewable,
+                                                                     GimpContext                *context,
+                                                                     gint                        width,
+                                                                     gint                        height);
+static gchar            * gimp_image_proxy_get_description          (GimpViewable               *viewable,
+                                                                     gchar                     **tooltip);
+
+static void               gimp_image_proxy_flush                    (GimpPickable               *pickable);
+static const Babl       * gimp_image_proxy_get_format               (GimpPickable               *pickable);
+static const Babl       * gimp_image_proxy_get_format_with_alpha    (GimpPickable               *pickable);
+static GeglBuffer       * gimp_image_proxy_get_buffer               (GimpPickable               *pickable);
+static gboolean           gimp_image_proxy_get_pixel_at             (GimpPickable               *pickable,
+                                                                     gint                        x,
+                                                                     gint                        y,
+                                                                     const Babl                 *format,
+                                                                     gpointer                    pixel);
+static gdouble            gimp_image_proxy_get_opacity_at           (GimpPickable               *pickable,
+                                                                     gint                        x,
+                                                                     gint                        y);
+static void               gimp_image_proxy_get_pixel_average        (GimpPickable               *pickable,
+                                                                     const GeglRectangle        *rect,
+                                                                     const Babl                 *format,
+                                                                     gpointer                    pixel);
+static void               gimp_image_proxy_pixel_to_srgb            (GimpPickable               *pickable,
+                                                                     const Babl                 *format,
+                                                                     gpointer                    pixel,
+                                                                     GimpRGB                    *color);
+static void               gimp_image_proxy_srgb_to_pixel            (GimpPickable               *pickable,
+                                                                     const GimpRGB              *color,
+                                                                     const Babl                 *format,
+                                                                     gpointer                    pixel);
+
+static const guint8     * gimp_image_proxy_get_icc_profile          (GimpColorManaged           *managed,
+                                                                     gsize                      *len);
+static GimpColorProfile * gimp_image_proxy_get_color_profile        (GimpColorManaged           *managed);
+static void               gimp_image_proxy_profile_changed          (GimpColorManaged           *managed);
+
+static void               gimp_image_proxy_image_frozen_notify      (GimpImage                  *image,
+                                                                     const GParamSpec           *pspec,
+                                                                     GimpImageProxy             *image_proxy);
+static void               gimp_image_proxy_image_invalidate_preview (GimpImage                  *image,
+                                                                     GimpImageProxy             *image_proxy);
+static void               gimp_image_proxy_image_size_changed       (GimpImage                  *image,
+                                                                     GimpImageProxy             *image_proxy);
+static void               gimp_image_proxy_image_bounds_changed     (GimpImage                  *image,
+                                                                     gint                        old_x,
+                                                                     gint                        old_y,
+                                                                     GimpImageProxy             *image_proxy);
+static void               gimp_image_proxy_image_profile_changed    (GimpImage                  *image,
+                                                                     GimpImageProxy             *image_proxy);
+
+static void               gimp_image_proxy_set_image                (GimpImageProxy             *image_proxy,
+                                                                     GimpImage                  *image);
+static GimpPickable     * gimp_image_proxy_get_pickable             (GimpImageProxy             *image_proxy);
+static void               gimp_image_proxy_update_bounding_box      (GimpImageProxy             *image_proxy);
+static void               gimp_image_proxy_update_frozen            (GimpImageProxy             *image_proxy);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpImageProxy, gimp_image_proxy, GIMP_TYPE_VIEWABLE,
+                         G_ADD_PRIVATE (GimpImageProxy)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_image_proxy_pickable_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
+                                                gimp_image_proxy_color_managed_iface_init))
+
+#define parent_class gimp_image_proxy_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_image_proxy_class_init (GimpImageProxyClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->finalize            = gimp_image_proxy_finalize;
+  object_class->set_property        = gimp_image_proxy_set_property;
+  object_class->get_property        = gimp_image_proxy_get_property;
+
+  viewable_class->default_icon_name = "gimp-image";
+  viewable_class->get_size          = gimp_image_proxy_get_size;
+  viewable_class->get_preview_size  = gimp_image_proxy_get_preview_size;
+  viewable_class->get_popup_size    = gimp_image_proxy_get_popup_size;
+  viewable_class->get_new_preview   = gimp_image_proxy_get_new_preview;
+  viewable_class->get_new_pixbuf    = gimp_image_proxy_get_new_pixbuf;
+  viewable_class->get_description   = gimp_image_proxy_get_description;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SHOW_ALL,
+                                   g_param_spec_boolean ("show-all",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_override_property (object_class, PROP_BUFFER, "buffer");
+}
+
+static void
+gimp_image_proxy_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->flush                 = gimp_image_proxy_flush;
+  iface->get_image             = (gpointer) gimp_image_proxy_get_image;
+  iface->get_format            = gimp_image_proxy_get_format;
+  iface->get_format_with_alpha = gimp_image_proxy_get_format_with_alpha;
+  iface->get_buffer            = gimp_image_proxy_get_buffer;
+  iface->get_pixel_at          = gimp_image_proxy_get_pixel_at;
+  iface->get_opacity_at        = gimp_image_proxy_get_opacity_at;
+  iface->get_pixel_average     = gimp_image_proxy_get_pixel_average;
+  iface->pixel_to_srgb         = gimp_image_proxy_pixel_to_srgb;
+  iface->srgb_to_pixel         = gimp_image_proxy_srgb_to_pixel;
+}
+
+static void
+gimp_image_proxy_color_managed_iface_init (GimpColorManagedInterface *iface)
+{
+  iface->get_icc_profile   = gimp_image_proxy_get_icc_profile;
+  iface->get_color_profile = gimp_image_proxy_get_color_profile;
+  iface->profile_changed   = gimp_image_proxy_profile_changed;
+}
+
+static void
+gimp_image_proxy_init (GimpImageProxy *image_proxy)
+{
+  image_proxy->priv = gimp_image_proxy_get_instance_private (image_proxy);
+}
+
+static void
+gimp_image_proxy_finalize (GObject *object)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (object);
+
+  gimp_image_proxy_set_image (image_proxy, NULL);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_image_proxy_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      gimp_image_proxy_set_image (image_proxy,
+                                  g_value_get_object (value));
+      break;
+
+    case PROP_SHOW_ALL:
+      gimp_image_proxy_set_show_all (image_proxy,
+                                     g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_proxy_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value,
+                          gimp_image_proxy_get_image (image_proxy));
+      break;
+
+    case PROP_SHOW_ALL:
+      g_value_set_boolean (value,
+                           gimp_image_proxy_get_show_all (image_proxy));
+      break;
+
+    case PROP_BUFFER:
+      g_value_set_object (value,
+                          gimp_pickable_get_buffer (
+                            GIMP_PICKABLE (image_proxy)));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_image_proxy_get_size (GimpViewable *viewable,
+                           gint         *width,
+                           gint         *height)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (viewable);
+
+  *width  = image_proxy->priv->bounding_box.width;
+  *height = image_proxy->priv->bounding_box.height;
+
+  return TRUE;
+}
+
+static void
+gimp_image_proxy_get_preview_size (GimpViewable *viewable,
+                                   gint          size,
+                                   gboolean      is_popup,
+                                   gboolean      dot_for_dot,
+                                   gint         *width,
+                                   gint         *height)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (viewable);
+  GimpImage      *image       = image_proxy->priv->image;
+  gdouble         xres;
+  gdouble         yres;
+  gint            viewable_width;
+  gint            viewable_height;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  gimp_viewable_get_size (viewable, &viewable_width, &viewable_height);
+
+  gimp_viewable_calc_preview_size (viewable_width,
+                                   viewable_height,
+                                   size,
+                                   size,
+                                   dot_for_dot,
+                                   xres,
+                                   yres,
+                                   width,
+                                   height,
+                                   NULL);
+}
+
+static gboolean
+gimp_image_proxy_get_popup_size (GimpViewable *viewable,
+                                 gint          width,
+                                 gint          height,
+                                 gboolean      dot_for_dot,
+                                 gint         *popup_width,
+                                 gint         *popup_height)
+{
+  gint viewable_width;
+  gint viewable_height;
+
+  gimp_viewable_get_size (viewable, &viewable_width, &viewable_height);
+
+  if (viewable_width > width || viewable_height > height)
+    {
+      gboolean scaling_up;
+
+      gimp_viewable_calc_preview_size (viewable_width,
+                                       viewable_height,
+                                       width  * 2,
+                                       height * 2,
+                                       dot_for_dot, 1.0, 1.0,
+                                       popup_width,
+                                       popup_height,
+                                       &scaling_up);
+
+      if (scaling_up)
+        {
+          *popup_width  = viewable_width;
+          *popup_height = viewable_height;
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GimpTempBuf *
+gimp_image_proxy_get_new_preview (GimpViewable *viewable,
+                                  GimpContext  *context,
+                                  gint          width,
+                                  gint          height)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (viewable);
+  GimpImage      *image       = image_proxy->priv->image;
+  GimpPickable   *pickable;
+  const Babl     *format;
+  GeglRectangle   bounding_box;
+  GimpTempBuf    *buf;
+  gdouble         scale_x;
+  gdouble         scale_y;
+  gdouble         scale;
+
+  pickable     = gimp_image_proxy_get_pickable     (image_proxy);
+  bounding_box = gimp_image_proxy_get_bounding_box (image_proxy);
+
+  scale_x = (gdouble) width  / (gdouble) bounding_box.width;
+  scale_y = (gdouble) height / (gdouble) bounding_box.height;
+
+  scale   = MIN (scale_x, scale_y);
+
+  format = gimp_image_get_preview_format (image);
+
+  buf = gimp_temp_buf_new (width, height, format);
+
+  gegl_buffer_get (gimp_pickable_get_buffer (pickable),
+                   GEGL_RECTANGLE (bounding_box.x * scale,
+                                   bounding_box.y * scale,
+                                   width,
+                                   height),
+                   scale,
+                   gimp_temp_buf_get_format (buf),
+                   gimp_temp_buf_get_data (buf),
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+  return buf;
+}
+
+static GdkPixbuf *
+gimp_image_proxy_get_new_pixbuf (GimpViewable *viewable,
+                                 GimpContext  *context,
+                                 gint          width,
+                                 gint          height)
+{
+  GimpImageProxy     *image_proxy = GIMP_IMAGE_PROXY (viewable);
+  GimpImage          *image       = image_proxy->priv->image;
+  GimpPickable       *pickable;
+  GeglRectangle       bounding_box;
+  GdkPixbuf          *pixbuf;
+  gdouble             scale_x;
+  gdouble             scale_y;
+  gdouble             scale;
+  GimpColorTransform *transform;
+
+  pickable     = gimp_image_proxy_get_pickable     (image_proxy);
+  bounding_box = gimp_image_proxy_get_bounding_box (image_proxy);
+
+  scale_x = (gdouble) width  / (gdouble) bounding_box.width;
+  scale_y = (gdouble) height / (gdouble) bounding_box.height;
+
+  scale   = MIN (scale_x, scale_y);
+
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                           width, height);
+
+  transform = gimp_image_get_color_transform_to_srgb_u8 (image);
+
+  if (transform)
+    {
+      GimpTempBuf *temp_buf;
+      GeglBuffer  *src_buf;
+      GeglBuffer  *dest_buf;
+
+      temp_buf = gimp_temp_buf_new (width, height,
+                                    gimp_pickable_get_format (pickable));
+
+      gegl_buffer_get (gimp_pickable_get_buffer (pickable),
+                       GEGL_RECTANGLE (bounding_box.x * scale,
+                                       bounding_box.y * scale,
+                                       width,
+                                       height),
+                       scale,
+                       gimp_temp_buf_get_format (temp_buf),
+                       gimp_temp_buf_get_data (temp_buf),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_CLAMP);
+
+      src_buf  = gimp_temp_buf_create_buffer (temp_buf);
+      dest_buf = gimp_pixbuf_create_buffer (pixbuf);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      gimp_color_transform_process_buffer (transform,
+                                           src_buf,
+                                           GEGL_RECTANGLE (0, 0,
+                                                           width, height),
+                                           dest_buf,
+                                           GEGL_RECTANGLE (0, 0, 0, 0));
+
+      g_object_unref (src_buf);
+      g_object_unref (dest_buf);
+    }
+  else
+    {
+      gegl_buffer_get (gimp_pickable_get_buffer (pickable),
+                       GEGL_RECTANGLE (bounding_box.x * scale,
+                                       bounding_box.y * scale,
+                                       width,
+                                       height),
+                       scale,
+                       gimp_pixbuf_get_format (pixbuf),
+                       gdk_pixbuf_get_pixels (pixbuf),
+                       gdk_pixbuf_get_rowstride (pixbuf),
+                       GEGL_ABYSS_CLAMP);
+    }
+
+  return pixbuf;
+}
+
+static gchar *
+gimp_image_proxy_get_description (GimpViewable  *viewable,
+                                  gchar        **tooltip)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (viewable);
+  GimpImage      *image       = image_proxy->priv->image;
+
+  if (tooltip)
+    *tooltip = g_strdup (gimp_image_get_display_path (image));
+
+  return g_strdup_printf ("%s-%d",
+                          gimp_image_get_display_name (image),
+                          gimp_image_get_ID (image));
+}
+
+static void
+gimp_image_proxy_flush (GimpPickable *pickable)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  gimp_pickable_flush (proxy_pickable);
+}
+
+static const Babl *
+gimp_image_proxy_get_format (GimpPickable *pickable)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  return gimp_pickable_get_format (proxy_pickable);
+}
+
+static const Babl *
+gimp_image_proxy_get_format_with_alpha (GimpPickable *pickable)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  return gimp_pickable_get_format_with_alpha (proxy_pickable);
+}
+
+static GeglBuffer *
+gimp_image_proxy_get_buffer (GimpPickable *pickable)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  return gimp_pickable_get_buffer (proxy_pickable);
+}
+
+static gboolean
+gimp_image_proxy_get_pixel_at (GimpPickable *pickable,
+                               gint          x,
+                               gint          y,
+                               const Babl   *format,
+                               gpointer      pixel)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  return gimp_pickable_get_pixel_at (proxy_pickable, x, y, format, pixel);
+}
+
+static gdouble
+gimp_image_proxy_get_opacity_at (GimpPickable *pickable,
+                                 gint          x,
+                                 gint          y)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  return gimp_pickable_get_opacity_at (proxy_pickable, x, y);
+}
+
+static void
+gimp_image_proxy_get_pixel_average (GimpPickable        *pickable,
+                                    const GeglRectangle *rect,
+                                    const Babl          *format,
+                                    gpointer             pixel)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  gimp_pickable_get_pixel_average (proxy_pickable, rect, format, pixel);
+}
+
+static void
+gimp_image_proxy_pixel_to_srgb (GimpPickable *pickable,
+                                const Babl   *format,
+                                gpointer      pixel,
+                                GimpRGB      *color)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  gimp_pickable_pixel_to_srgb (proxy_pickable, format, pixel, color);
+}
+
+static void
+gimp_image_proxy_srgb_to_pixel (GimpPickable  *pickable,
+                                const GimpRGB *color,
+                                const Babl    *format,
+                                gpointer       pixel)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (pickable);
+  GimpPickable   *proxy_pickable;
+
+  proxy_pickable = gimp_image_proxy_get_pickable (image_proxy);
+
+  gimp_pickable_srgb_to_pixel (proxy_pickable, color, format, pixel);
+}
+
+static const guint8 *
+gimp_image_proxy_get_icc_profile (GimpColorManaged *managed,
+                                  gsize            *len)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (managed);
+
+  return gimp_color_managed_get_icc_profile (
+    GIMP_COLOR_MANAGED (image_proxy->priv->image),
+    len);
+}
+
+static GimpColorProfile *
+gimp_image_proxy_get_color_profile (GimpColorManaged *managed)
+{
+  GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (managed);
+
+  return gimp_color_managed_get_color_profile (
+    GIMP_COLOR_MANAGED (image_proxy->priv->image));
+}
+
+static void
+gimp_image_proxy_profile_changed (GimpColorManaged *managed)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (managed));
+}
+
+static void
+gimp_image_proxy_image_frozen_notify (GimpImage        *image,
+                                      const GParamSpec *pspec,
+                                      GimpImageProxy   *image_proxy)
+{
+  gimp_image_proxy_update_frozen (image_proxy);
+}
+
+static void
+gimp_image_proxy_image_invalidate_preview (GimpImage      *image,
+                                           GimpImageProxy *image_proxy)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (image_proxy));
+}
+
+static void
+gimp_image_proxy_image_size_changed (GimpImage      *image,
+                                     GimpImageProxy *image_proxy)
+{
+  gimp_image_proxy_update_bounding_box (image_proxy);
+}
+
+static void
+gimp_image_proxy_image_bounds_changed (GimpImage      *image,
+                                       gint            old_x,
+                                       gint            old_y,
+                                       GimpImageProxy *image_proxy)
+{
+  gimp_image_proxy_update_bounding_box (image_proxy);
+}
+
+static void
+gimp_image_proxy_image_profile_changed (GimpImage      *image,
+                                        GimpImageProxy *image_proxy)
+{
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image_proxy));
+}
+
+static void
+gimp_image_proxy_set_image (GimpImageProxy *image_proxy,
+                            GimpImage      *image)
+{
+  if (image_proxy->priv->image)
+    {
+      g_signal_handlers_disconnect_by_func (
+        image_proxy->priv->image,
+        gimp_image_proxy_image_frozen_notify,
+        image_proxy);
+      g_signal_handlers_disconnect_by_func (
+        image_proxy->priv->image,
+        gimp_image_proxy_image_invalidate_preview,
+        image_proxy);
+      g_signal_handlers_disconnect_by_func (
+        image_proxy->priv->image,
+        gimp_image_proxy_image_size_changed,
+        image_proxy);
+      g_signal_handlers_disconnect_by_func (
+        image_proxy->priv->image,
+        gimp_image_proxy_image_bounds_changed,
+        image_proxy);
+      g_signal_handlers_disconnect_by_func (
+        image_proxy->priv->image,
+        gimp_image_proxy_image_profile_changed,
+        image_proxy);
+
+      g_object_unref (image_proxy->priv->image);
+    }
+
+  image_proxy->priv->image = image;
+
+  if (image_proxy->priv->image)
+    {
+      g_object_ref (image_proxy->priv->image);
+
+      g_signal_connect (
+        image_proxy->priv->image, "notify::frozen",
+        G_CALLBACK (gimp_image_proxy_image_frozen_notify),
+        image_proxy);
+      g_signal_connect (
+        image_proxy->priv->image, "invalidate-preview",
+        G_CALLBACK (gimp_image_proxy_image_invalidate_preview),
+        image_proxy);
+      g_signal_connect (
+        image_proxy->priv->image, "size-changed",
+        G_CALLBACK (gimp_image_proxy_image_size_changed),
+        image_proxy);
+      g_signal_connect (
+        image_proxy->priv->image, "bounds-changed",
+        G_CALLBACK (gimp_image_proxy_image_bounds_changed),
+        image_proxy);
+      g_signal_connect (
+        image_proxy->priv->image, "profile-changed",
+        G_CALLBACK (gimp_image_proxy_image_profile_changed),
+        image_proxy);
+
+      gimp_image_proxy_update_bounding_box (image_proxy);
+      gimp_image_proxy_update_frozen (image_proxy);
+
+      gimp_viewable_invalidate_preview (GIMP_VIEWABLE (image_proxy));
+    }
+}
+
+static GimpPickable *
+gimp_image_proxy_get_pickable (GimpImageProxy *image_proxy)
+{
+  GimpImage *image = image_proxy->priv->image;
+
+  if (! image_proxy->priv->show_all)
+    return GIMP_PICKABLE (image);
+  else
+    return GIMP_PICKABLE (gimp_image_get_projection (image));
+}
+
+static void
+gimp_image_proxy_update_bounding_box (GimpImageProxy *image_proxy)
+{
+  GimpImage     *image = image_proxy->priv->image;
+  GeglRectangle  bounding_box;
+
+  if (gimp_viewable_preview_is_frozen (GIMP_VIEWABLE (image_proxy)))
+    return;
+
+  if (! image_proxy->priv->show_all)
+    {
+      bounding_box.x      = 0;
+      bounding_box.y      = 0;
+      bounding_box.width  = gimp_image_get_width  (image);
+      bounding_box.height = gimp_image_get_height (image);
+    }
+  else
+    {
+      bounding_box = gimp_projectable_get_bounding_box (
+        GIMP_PROJECTABLE (image));
+    }
+
+  if (! gegl_rectangle_equal (&bounding_box,
+                              &image_proxy->priv->bounding_box))
+    {
+      image_proxy->priv->bounding_box = bounding_box;
+
+      gimp_viewable_size_changed (GIMP_VIEWABLE (image_proxy));
+    }
+}
+
+static void
+gimp_image_proxy_update_frozen (GimpImageProxy *image_proxy)
+{
+  gboolean frozen;
+
+  frozen = gimp_viewable_preview_is_frozen (
+    GIMP_VIEWABLE (image_proxy->priv->image));
+
+  if (frozen != image_proxy->priv->frozen)
+    {
+      image_proxy->priv->frozen = frozen;
+
+      if (frozen)
+        {
+          gimp_viewable_preview_freeze (GIMP_VIEWABLE (image_proxy));
+        }
+      else
+        {
+          gimp_viewable_preview_thaw (GIMP_VIEWABLE (image_proxy));
+
+          gimp_image_proxy_update_bounding_box (image_proxy);
+        }
+    }
+}
+
+
+/*  public functions  */
+
+
+GimpImageProxy *
+gimp_image_proxy_new (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return g_object_new (GIMP_TYPE_IMAGE_PROXY,
+                       "image", image,
+                       NULL);
+}
+
+GimpImage *
+gimp_image_proxy_get_image (GimpImageProxy *image_proxy)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE_PROXY (image_proxy), NULL);
+
+  return image_proxy->priv->image;
+}
+
+void
+gimp_image_proxy_set_show_all (GimpImageProxy *image_proxy,
+                               gboolean        show_all)
+{
+  g_return_if_fail (GIMP_IS_IMAGE_PROXY (image_proxy));
+
+  if (show_all != image_proxy->priv->show_all)
+    {
+      image_proxy->priv->show_all = show_all;
+
+      gimp_image_proxy_update_bounding_box (image_proxy);
+    }
+}
+
+gboolean
+gimp_image_proxy_get_show_all (GimpImageProxy *image_proxy)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE_PROXY (image_proxy), FALSE);
+
+  return image_proxy->priv->show_all;
+}
+
+GeglRectangle
+gimp_image_proxy_get_bounding_box (GimpImageProxy *image_proxy)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE_PROXY (image_proxy),
+                        *GEGL_RECTANGLE (0, 0, 0, 0));
+
+  return image_proxy->priv->bounding_box;
+}
diff --git a/app/core/gimpimageproxy.h b/app/core/gimpimageproxy.h
new file mode 100644
index 0000000..a6c9922
--- /dev/null
+++ b/app/core/gimpimageproxy.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimageproxy.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PROXY_H__
+#define __GIMP_IMAGE_PROXY_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_IMAGE_PROXY            (gimp_image_proxy_get_type ())
+#define GIMP_IMAGE_PROXY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PROXY, GimpImageProxy))
+#define GIMP_IMAGE_PROXY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PROXY, GimpImageProxyClass))
+#define GIMP_IS_IMAGE_PROXY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_PROXY))
+#define GIMP_IS_IMAGE_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_PROXY))
+#define GIMP_IMAGE_PROXY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_PROXY, GimpImageProxyClass))
+
+
+typedef struct _GimpImageProxyPrivate GimpImageProxyPrivate;
+typedef struct _GimpImageProxyClass   GimpImageProxyClass;
+
+struct _GimpImageProxy
+{
+  GimpViewable           parent_instance;
+
+  GimpImageProxyPrivate *priv;
+};
+
+struct _GimpImageProxyClass
+{
+  GimpViewableClass  parent_class;
+};
+
+
+GType            gimp_image_proxy_get_type         (void) G_GNUC_CONST;
+
+GimpImageProxy * gimp_image_proxy_new              (GimpImage      *image);
+
+GimpImage      * gimp_image_proxy_get_image        (GimpImageProxy *image_proxy);
+              
+void             gimp_image_proxy_set_show_all     (GimpImageProxy *image_proxy,
+                                                    gboolean        show_all);
+gboolean         gimp_image_proxy_get_show_all     (GimpImageProxy *image_proxy);
+              
+GeglRectangle    gimp_image_proxy_get_bounding_box (GimpImageProxy *image_proxy);
+
+
+#endif /* __GIMP_IMAGE_PROXY_H__ */
diff --git a/app/core/gimpimageundo.c b/app/core/gimpimageundo.c
new file mode 100644
index 0000000..8aa9e11
--- /dev/null
+++ b/app/core/gimpimageundo.c
@@ -0,0 +1,535 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpdrawable.h"
+#include "gimpgrid.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimpimage-colormap.h"
+#include "gimpimage-grid.h"
+#include "gimpimage-metadata.h"
+#include "gimpimage-private.h"
+#include "gimpimageundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PREVIOUS_ORIGIN_X,
+  PROP_PREVIOUS_ORIGIN_Y,
+  PROP_PREVIOUS_WIDTH,
+  PROP_PREVIOUS_HEIGHT,
+  PROP_GRID,
+  PROP_PARASITE_NAME
+};
+
+
+static void     gimp_image_undo_constructed  (GObject             *object);
+static void     gimp_image_undo_set_property (GObject             *object,
+                                              guint                property_id,
+                                              const GValue        *value,
+                                              GParamSpec          *pspec);
+static void     gimp_image_undo_get_property (GObject             *object,
+                                              guint                property_id,
+                                              GValue              *value,
+                                              GParamSpec          *pspec);
+
+static gint64   gimp_image_undo_get_memsize  (GimpObject          *object,
+                                              gint64              *gui_size);
+
+static void     gimp_image_undo_pop          (GimpUndo            *undo,
+                                              GimpUndoMode         undo_mode,
+                                              GimpUndoAccumulator *accum);
+static void     gimp_image_undo_free         (GimpUndo            *undo,
+                                              GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpImageUndo, gimp_image_undo, GIMP_TYPE_UNDO)
+
+#define parent_class gimp_image_undo_parent_class
+
+
+static void
+gimp_image_undo_class_init (GimpImageUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_image_undo_constructed;
+  object_class->set_property     = gimp_image_undo_set_property;
+  object_class->get_property     = gimp_image_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_image_undo_get_memsize;
+
+  undo_class->pop                = gimp_image_undo_pop;
+  undo_class->free               = gimp_image_undo_free;
+
+  g_object_class_install_property (object_class, PROP_PREVIOUS_ORIGIN_X,
+                                   g_param_spec_int ("previous-origin-x",
+                                                     NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE,
+                                                     0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_PREVIOUS_ORIGIN_Y,
+                                   g_param_spec_int ("previous-origin-y",
+                                                     NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE,
+                                                     0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_PREVIOUS_WIDTH,
+                                   g_param_spec_int ("previous-width",
+                                                     NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE,
+                                                     0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_PREVIOUS_HEIGHT,
+                                   g_param_spec_int ("previous-height",
+                                                     NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE,
+                                                     0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_GRID,
+                                   g_param_spec_object ("grid", NULL, NULL,
+                                                        GIMP_TYPE_GRID,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PARASITE_NAME,
+                                   g_param_spec_string ("parasite-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_image_undo_init (GimpImageUndo *undo)
+{
+}
+
+static void
+gimp_image_undo_constructed (GObject *object)
+{
+  GimpImageUndo *image_undo = GIMP_IMAGE_UNDO (object);
+  GimpImage     *image;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  image = GIMP_UNDO (object)->image;
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_IMAGE_TYPE:
+      image_undo->base_type = gimp_image_get_base_type (image);
+      break;
+
+    case GIMP_UNDO_IMAGE_PRECISION:
+      image_undo->precision = gimp_image_get_precision (image);
+      break;
+
+    case GIMP_UNDO_IMAGE_SIZE:
+      image_undo->width  = gimp_image_get_width  (image);
+      image_undo->height = gimp_image_get_height (image);
+      break;
+
+    case GIMP_UNDO_IMAGE_RESOLUTION:
+      gimp_image_get_resolution (image,
+                                 &image_undo->xresolution,
+                                 &image_undo->yresolution);
+      image_undo->resolution_unit = gimp_image_get_unit (image);
+      break;
+
+    case GIMP_UNDO_IMAGE_GRID:
+      gimp_assert (GIMP_IS_GRID (image_undo->grid));
+      break;
+
+    case GIMP_UNDO_IMAGE_COLORMAP:
+      image_undo->num_colors = gimp_image_get_colormap_size (image);
+      image_undo->colormap   = g_memdup (gimp_image_get_colormap (image),
+                                         GIMP_IMAGE_COLORMAP_SIZE);
+      break;
+
+    case GIMP_UNDO_IMAGE_COLOR_MANAGED:
+      image_undo->is_color_managed = gimp_image_get_is_color_managed (image);
+      break;
+
+    case GIMP_UNDO_IMAGE_METADATA:
+      image_undo->metadata =
+        gimp_metadata_duplicate (gimp_image_get_metadata (image));
+      break;
+
+    case GIMP_UNDO_PARASITE_ATTACH:
+    case GIMP_UNDO_PARASITE_REMOVE:
+      gimp_assert (image_undo->parasite_name != NULL);
+
+      image_undo->parasite = gimp_parasite_copy
+        (gimp_image_parasite_find (image, image_undo->parasite_name));
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_image_undo_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpImageUndo *image_undo = GIMP_IMAGE_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREVIOUS_ORIGIN_X:
+      image_undo->previous_origin_x = g_value_get_int (value);
+      break;
+    case PROP_PREVIOUS_ORIGIN_Y:
+      image_undo->previous_origin_y = g_value_get_int (value);
+      break;
+    case PROP_PREVIOUS_WIDTH:
+      image_undo->previous_width = g_value_get_int (value);
+      break;
+    case PROP_PREVIOUS_HEIGHT:
+      image_undo->previous_height = g_value_get_int (value);
+      break;
+    case PROP_GRID:
+      {
+        GimpGrid *grid = g_value_get_object (value);
+
+        if (grid)
+          image_undo->grid = gimp_config_duplicate (GIMP_CONFIG (grid));
+      }
+      break;
+    case PROP_PARASITE_NAME:
+      image_undo->parasite_name = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_undo_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpImageUndo *image_undo = GIMP_IMAGE_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREVIOUS_ORIGIN_X:
+      g_value_set_int (value, image_undo->previous_origin_x);
+      break;
+    case PROP_PREVIOUS_ORIGIN_Y:
+      g_value_set_int (value, image_undo->previous_origin_y);
+      break;
+    case PROP_PREVIOUS_WIDTH:
+      g_value_set_int (value, image_undo->previous_width);
+      break;
+    case PROP_PREVIOUS_HEIGHT:
+      g_value_set_int (value, image_undo->previous_height);
+      break;
+    case PROP_GRID:
+      g_value_set_object (value, image_undo->grid);
+       break;
+    case PROP_PARASITE_NAME:
+      g_value_set_string (value, image_undo->parasite_name);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_image_undo_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpImageUndo *image_undo = GIMP_IMAGE_UNDO (object);
+  gint64         memsize    = 0;
+
+  if (image_undo->colormap)
+    memsize += GIMP_IMAGE_COLORMAP_SIZE;
+
+  if (image_undo->metadata)
+    memsize += gimp_g_object_get_memsize (G_OBJECT (image_undo->metadata));
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (image_undo->grid),
+                                      gui_size);
+  memsize += gimp_string_get_memsize (image_undo->parasite_name);
+  memsize += gimp_parasite_get_memsize (image_undo->parasite, gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_image_undo_pop (GimpUndo            *undo,
+                     GimpUndoMode         undo_mode,
+                     GimpUndoAccumulator *accum)
+{
+  GimpImageUndo    *image_undo = GIMP_IMAGE_UNDO (undo);
+  GimpImage        *image      = undo->image;
+  GimpImagePrivate *private    = GIMP_IMAGE_GET_PRIVATE (image);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_IMAGE_TYPE:
+      {
+        GimpImageBaseType base_type;
+
+        base_type = image_undo->base_type;
+        image_undo->base_type = gimp_image_get_base_type (image);
+        g_object_set (image, "base-type", base_type, NULL);
+
+        gimp_image_colormap_changed (image, -1);
+
+        if (image_undo->base_type != gimp_image_get_base_type (image))
+          {
+            if ((image_undo->base_type            == GIMP_GRAY) ||
+                (gimp_image_get_base_type (image) == GIMP_GRAY))
+              {
+                /* in case there was no profile undo, we need to emit
+                 * profile-changed anyway
+                 */
+                gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image));
+              }
+
+            accum->mode_changed = TRUE;
+          }
+      }
+      break;
+
+    case GIMP_UNDO_IMAGE_PRECISION:
+      {
+        GimpPrecision precision;
+
+        precision = image_undo->precision;
+        image_undo->precision = gimp_image_get_precision (image);
+        g_object_set (image, "precision", precision, NULL);
+
+        if (image_undo->precision != gimp_image_get_precision (image))
+          accum->precision_changed = TRUE;
+      }
+      break;
+
+    case GIMP_UNDO_IMAGE_SIZE:
+      {
+        gint width;
+        gint height;
+        gint previous_origin_x;
+        gint previous_origin_y;
+        gint previous_width;
+        gint previous_height;
+
+        width             = image_undo->width;
+        height            = image_undo->height;
+        previous_origin_x = image_undo->previous_origin_x;
+        previous_origin_y = image_undo->previous_origin_y;
+        previous_width    = image_undo->previous_width;
+        previous_height   = image_undo->previous_height;
+
+        /* Transform to a redo */
+        image_undo->width             = gimp_image_get_width  (image);
+        image_undo->height            = gimp_image_get_height (image);
+        image_undo->previous_origin_x = -previous_origin_x;
+        image_undo->previous_origin_y = -previous_origin_y;
+        image_undo->previous_width    = width;
+        image_undo->previous_height   = height;
+
+        g_object_set (image,
+                      "width",  width,
+                      "height", height,
+                      NULL);
+
+        gimp_drawable_invalidate_boundary
+          (GIMP_DRAWABLE (gimp_image_get_mask (image)));
+
+        if (gimp_image_get_width  (image) != image_undo->width ||
+            gimp_image_get_height (image) != image_undo->height)
+          {
+            accum->size_changed      = TRUE;
+            accum->previous_origin_x = previous_origin_x;
+            accum->previous_origin_y = previous_origin_y;
+            accum->previous_width    = previous_width;
+            accum->previous_height   = previous_height;
+          }
+      }
+      break;
+
+    case GIMP_UNDO_IMAGE_RESOLUTION:
+      {
+        gdouble xres;
+        gdouble yres;
+
+        gimp_image_get_resolution (image, &xres, &yres);
+
+        if (ABS (image_undo->xresolution - xres) >= 1e-5 ||
+            ABS (image_undo->yresolution - yres) >= 1e-5)
+          {
+            private->xresolution = image_undo->xresolution;
+            private->yresolution = image_undo->yresolution;
+
+            image_undo->xresolution = xres;
+            image_undo->yresolution = yres;
+
+            accum->resolution_changed = TRUE;
+          }
+      }
+
+      if (image_undo->resolution_unit != gimp_image_get_unit (image))
+        {
+          GimpUnit unit;
+
+          unit = gimp_image_get_unit (image);
+          private->resolution_unit = image_undo->resolution_unit;
+          image_undo->resolution_unit = unit;
+
+          accum->unit_changed = TRUE;
+        }
+      break;
+
+    case GIMP_UNDO_IMAGE_GRID:
+      {
+        GimpGrid *grid;
+
+        grid = gimp_config_duplicate (GIMP_CONFIG (gimp_image_get_grid (image)));
+
+        gimp_image_set_grid (image, image_undo->grid, FALSE);
+
+        g_object_unref (image_undo->grid);
+        image_undo->grid = grid;
+      }
+      break;
+
+    case GIMP_UNDO_IMAGE_COLORMAP:
+      {
+        guchar *colormap;
+        gint    num_colors;
+
+        num_colors = gimp_image_get_colormap_size (image);
+        colormap   = g_memdup (gimp_image_get_colormap (image),
+                               GIMP_IMAGE_COLORMAP_SIZE);
+
+        if (image_undo->colormap)
+          gimp_image_set_colormap (image,
+                                   image_undo->colormap, image_undo->num_colors,
+                                   FALSE);
+        else
+          gimp_image_unset_colormap (image, FALSE);
+
+        if (image_undo->colormap)
+          g_free (image_undo->colormap);
+
+        image_undo->num_colors = num_colors;
+        image_undo->colormap   = colormap;
+      }
+      break;
+
+    case GIMP_UNDO_IMAGE_COLOR_MANAGED:
+      {
+        gboolean is_color_managed;
+
+        is_color_managed = gimp_image_get_is_color_managed (image);
+        gimp_image_set_is_color_managed (image, image_undo->is_color_managed,
+                                         FALSE);
+        image_undo->is_color_managed = is_color_managed;
+      }
+      break;
+
+    case GIMP_UNDO_IMAGE_METADATA:
+      {
+        GimpMetadata *metadata;
+
+        metadata = gimp_metadata_duplicate (gimp_image_get_metadata (image));
+
+        gimp_image_set_metadata (image, image_undo->metadata, FALSE);
+
+        if (image_undo->metadata)
+          g_object_unref (image_undo->metadata);
+        image_undo->metadata = metadata;
+      }
+      break;
+
+    case GIMP_UNDO_PARASITE_ATTACH:
+    case GIMP_UNDO_PARASITE_REMOVE:
+      {
+        GimpParasite *parasite = image_undo->parasite;
+
+        image_undo->parasite = gimp_parasite_copy
+          (gimp_image_parasite_find (image, image_undo->parasite_name));
+
+        if (parasite)
+          gimp_image_parasite_attach (image, parasite, FALSE);
+        else
+          gimp_image_parasite_detach (image, image_undo->parasite_name, FALSE);
+
+        if (parasite)
+          gimp_parasite_free (parasite);
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_image_undo_free (GimpUndo     *undo,
+                      GimpUndoMode  undo_mode)
+{
+  GimpImageUndo *image_undo = GIMP_IMAGE_UNDO (undo);
+
+  g_clear_object (&image_undo->grid);
+  g_clear_pointer (&image_undo->colormap, g_free);
+  g_clear_object (&image_undo->metadata);
+  g_clear_pointer (&image_undo->parasite_name, g_free);
+  g_clear_pointer (&image_undo->parasite, gimp_parasite_free);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpimageundo.h b/app/core/gimpimageundo.h
new file mode 100644
index 0000000..0290b40
--- /dev/null
+++ b/app/core/gimpimageundo.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_UNDO_H__
+#define __GIMP_IMAGE_UNDO_H__
+
+
+#include "gimpundo.h"
+
+
+#define GIMP_TYPE_IMAGE_UNDO            (gimp_image_undo_get_type ())
+#define GIMP_IMAGE_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_UNDO, GimpImageUndo))
+#define GIMP_IMAGE_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_UNDO, GimpImageUndoClass))
+#define GIMP_IS_IMAGE_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_UNDO))
+#define GIMP_IS_IMAGE_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_UNDO))
+#define GIMP_IMAGE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_UNDO, GimpImageUndoClass))
+
+
+typedef struct _GimpImageUndo      GimpImageUndo;
+typedef struct _GimpImageUndoClass GimpImageUndoClass;
+
+struct _GimpImageUndo
+{
+  GimpUndo           parent_instance;
+
+  GimpImageBaseType  base_type;
+  GimpPrecision      precision;
+  gint               width;
+  gint               height;
+  gint               previous_origin_x;
+  gint               previous_origin_y;
+  gint               previous_width;
+  gint               previous_height;
+  gdouble            xresolution;
+  gdouble            yresolution;
+  GimpUnit           resolution_unit;
+  GimpGrid          *grid;
+  gint               num_colors;
+  guchar            *colormap;
+  gboolean           is_color_managed;
+  GimpMetadata      *metadata;
+  gchar             *parasite_name;
+  GimpParasite      *parasite;
+};
+
+struct _GimpImageUndoClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType   gimp_image_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_IMAGE_UNDO_H__ */
diff --git a/app/core/gimpitem-exclusive.c b/app/core/gimpitem-exclusive.c
new file mode 100644
index 0000000..5cdb45f
--- /dev/null
+++ b/app/core/gimpitem-exclusive.c
@@ -0,0 +1,276 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpitem-exclusive.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpcontext.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitem.h"
+#include "gimpitem-exclusive.h"
+#include "gimpitemstack.h"
+#include "gimpitemtree.h"
+#include "gimpundostack.h"
+
+#include "gimp-intl.h"
+
+
+static GList * gimp_item_exclusive_get_ancestry (GimpItem     *item);
+static void    gimp_item_exclusive_get_lists    (GimpItem     *item,
+                                                 const gchar  *property,
+                                                 GList       **on,
+                                                 GList       **off);
+
+
+/*  public functions  */
+
+void
+gimp_item_toggle_exclusive_visible (GimpItem    *item,
+                                    GimpContext *context)
+{
+  GList *ancestry;
+  GList *on;
+  GList *off;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  ancestry = gimp_item_exclusive_get_ancestry (item);
+  gimp_item_exclusive_get_lists (item, "visible", &on, &off);
+
+  if (on || off || ! gimp_item_is_visible (item))
+    {
+      GimpImage *image = gimp_item_get_image (item);
+      GimpUndo  *undo;
+      gboolean   push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_UNDO_STACK,
+                                           GIMP_UNDO_GROUP_ITEM_VISIBILITY);
+
+      if (undo && (g_object_get_data (G_OBJECT (undo), "exclusive-visible-item") ==
+                   (gpointer) item))
+        push_undo = FALSE;
+
+      if (push_undo)
+        {
+          if (gimp_image_undo_group_start (image,
+                                           GIMP_UNDO_GROUP_ITEM_VISIBILITY,
+                                           _("Set Item Exclusive Visible")))
+            {
+              undo = gimp_image_undo_can_compress (image, GIMP_TYPE_UNDO_STACK,
+                                                   GIMP_UNDO_GROUP_ITEM_VISIBILITY);
+
+              if (undo)
+                g_object_set_data (G_OBJECT (undo), "exclusive-visible-item",
+                                   (gpointer) item);
+            }
+
+          for (list = ancestry; list; list = g_list_next (list))
+            gimp_image_undo_push_item_visibility (image, NULL, list->data);
+
+          for (list = on; list; list = g_list_next (list))
+            gimp_image_undo_push_item_visibility (image, NULL, list->data);
+
+          for (list = off; list; list = g_list_next (list))
+            gimp_image_undo_push_item_visibility (image, NULL, list->data);
+
+          gimp_image_undo_group_end (image);
+        }
+      else
+        {
+          gimp_undo_refresh_preview (undo, context);
+        }
+
+      for (list = ancestry; list; list = g_list_next (list))
+        gimp_item_set_visible (list->data, TRUE, FALSE);
+
+      if (on)
+        {
+          for (list = on; list; list = g_list_next (list))
+            gimp_item_set_visible (list->data, FALSE, FALSE);
+        }
+      else if (off)
+        {
+          for (list = off; list; list = g_list_next (list))
+            gimp_item_set_visible (list->data, TRUE, FALSE);
+        }
+
+      g_list_free (on);
+      g_list_free (off);
+    }
+
+  g_list_free (ancestry);
+}
+
+void
+gimp_item_toggle_exclusive_linked (GimpItem    *item,
+                                   GimpContext *context)
+{
+  GList *on  = NULL;
+  GList *off = NULL;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  for (list = gimp_item_get_container_iter (item);
+       list;
+       list = g_list_next (list))
+    {
+      GimpItem *other = list->data;
+
+      if (other != item)
+        {
+          if (gimp_item_get_linked (other))
+            on = g_list_prepend (on, other);
+          else
+            off = g_list_prepend (off, other);
+        }
+    }
+
+  if (on || off || ! gimp_item_get_linked (item))
+    {
+      GimpImage *image = gimp_item_get_image (item);
+      GimpUndo  *undo;
+      gboolean   push_undo = TRUE;
+
+      undo = gimp_image_undo_can_compress (image, GIMP_TYPE_UNDO_STACK,
+                                           GIMP_UNDO_GROUP_ITEM_LINKED);
+
+      if (undo && (g_object_get_data (G_OBJECT (undo), "exclusive-linked-item") ==
+                   (gpointer) item))
+        push_undo = FALSE;
+
+      if (push_undo)
+        {
+          if (gimp_image_undo_group_start (image,
+                                           GIMP_UNDO_GROUP_ITEM_LINKED,
+                                           _("Set Item Exclusive Linked")))
+            {
+              undo = gimp_image_undo_can_compress (image, GIMP_TYPE_UNDO_STACK,
+                                                   GIMP_UNDO_GROUP_ITEM_LINKED);
+
+              if (undo)
+                g_object_set_data (G_OBJECT (undo), "exclusive-linked-item",
+                                   (gpointer) item);
+            }
+
+          gimp_image_undo_push_item_linked (image, NULL, item);
+
+          for (list = on; list; list = g_list_next (list))
+            gimp_image_undo_push_item_linked (image, NULL, list->data);
+
+          for (list = off; list; list = g_list_next (list))
+            gimp_image_undo_push_item_linked (image, NULL, list->data);
+
+          gimp_image_undo_group_end (image);
+        }
+      else
+        {
+          gimp_undo_refresh_preview (undo, context);
+        }
+
+      if (off || ! gimp_item_get_linked (item))
+        {
+          gimp_item_set_linked (item, TRUE, FALSE);
+
+          for (list = off; list; list = g_list_next (list))
+            gimp_item_set_linked (list->data, TRUE, FALSE);
+        }
+      else
+        {
+          for (list = on; list; list = g_list_next (list))
+            gimp_item_set_linked (list->data, FALSE, FALSE);
+        }
+
+      g_list_free (on);
+      g_list_free (off);
+    }
+}
+
+
+/*  private functions  */
+
+static GList *
+gimp_item_exclusive_get_ancestry (GimpItem *item)
+{
+  GimpViewable *parent;
+  GList        *ancestry = NULL;
+
+  for (parent = GIMP_VIEWABLE (item);
+       parent;
+       parent = gimp_viewable_get_parent (parent))
+    {
+      ancestry = g_list_prepend (ancestry, parent);
+    }
+
+  return ancestry;
+}
+
+static void
+gimp_item_exclusive_get_lists (GimpItem     *item,
+                               const gchar  *property,
+                               GList       **on,
+                               GList       **off)
+{
+  GimpItemTree *tree;
+  GList        *items;
+  GList        *list;
+
+  *on  = NULL;
+  *off = NULL;
+
+  tree = gimp_item_get_tree (item);
+
+  items = gimp_item_stack_get_item_list (GIMP_ITEM_STACK (tree->container));
+
+  for (list = items; list; list = g_list_next (list))
+    {
+      GimpItem *other = list->data;
+
+      if (other != item)
+        {
+          /* we are only interested in same level items.
+           */
+          if (gimp_viewable_get_parent (GIMP_VIEWABLE (other)) ==
+              gimp_viewable_get_parent (GIMP_VIEWABLE (item)))
+            {
+              gboolean value;
+
+              g_object_get (other, property, &value, NULL);
+
+              if (value)
+                *on = g_list_prepend (*on, other);
+              else
+                *off = g_list_prepend (*off, other);
+            }
+        }
+    }
+
+  g_list_free (items);
+}
diff --git a/app/core/gimpitem-exclusive.h b/app/core/gimpitem-exclusive.h
new file mode 100644
index 0000000..98838c5
--- /dev/null
+++ b/app/core/gimpitem-exclusive.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpitem-exclusive.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_EXCLUSIVE_H__
+#define __GIMP_ITEM_EXCLUSIVE_H__
+
+
+void   gimp_item_toggle_exclusive_visible (GimpItem    *item,
+                                           GimpContext *context);
+void   gimp_item_toggle_exclusive_linked  (GimpItem    *item,
+                                           GimpContext *context);
+
+
+#endif /* __GIMP_ITEM_EXCLUSIVE_H__ */
diff --git a/app/core/gimpitem-linked.c b/app/core/gimpitem-linked.c
new file mode 100644
index 0000000..9c876e3
--- /dev/null
+++ b/app/core/gimpitem-linked.c
@@ -0,0 +1,187 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpcontext.h"
+#include "gimpimage.h"
+#include "gimpimage-item-list.h"
+#include "gimpimage-undo.h"
+#include "gimpitem.h"
+#include "gimpitem-linked.h"
+#include "gimplist.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+gboolean
+gimp_item_linked_is_locked (GimpItem *item)
+{
+  GList    *list;
+  GList    *l;
+  gboolean  locked = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (gimp_item_get_linked (item) == TRUE, FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (item), FALSE);
+
+  list = gimp_image_item_list_get_list (gimp_item_get_image (item),
+                                        GIMP_ITEM_TYPE_ALL,
+                                        GIMP_ITEM_SET_LINKED);
+
+  list = gimp_image_item_list_filter (list);
+
+  for (l = list; l && ! locked; l = g_list_next (l))
+    {
+      /* We must not use gimp_item_is_position_locked(), especially
+       * since a child implementation may call the current function and
+       * end up in infinite loop.
+       * We are only interested in the value of `lock_position` flag.
+       */
+      if (gimp_item_get_lock_position (l->data))
+        locked = TRUE;
+    }
+
+  g_list_free (list);
+
+  return locked;
+}
+
+void
+gimp_item_linked_translate (GimpItem *item,
+                            gint      offset_x,
+                            gint      offset_y,
+                            gboolean  push_undo)
+{
+  GimpImage *image;
+  GList     *items;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_get_linked (item) == TRUE);
+  g_return_if_fail (gimp_item_is_attached (item));
+
+  image = gimp_item_get_image (item);
+
+  items = gimp_image_item_list_get_list (image,
+                                         GIMP_ITEM_TYPE_ALL,
+                                         GIMP_ITEM_SET_LINKED);
+
+  items = gimp_image_item_list_filter (items);
+
+  gimp_image_item_list_translate (gimp_item_get_image (item), items,
+                                  offset_x, offset_y, push_undo);
+
+  g_list_free (items);
+}
+
+void
+gimp_item_linked_flip (GimpItem            *item,
+                       GimpContext         *context,
+                       GimpOrientationType  flip_type,
+                       gdouble              axis,
+                       gboolean             clip_result)
+{
+  GimpImage *image;
+  GList     *items;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (gimp_item_get_linked (item) == TRUE);
+  g_return_if_fail (gimp_item_is_attached (item));
+
+  image = gimp_item_get_image (item);
+
+  items = gimp_image_item_list_get_list (image,
+                                         GIMP_ITEM_TYPE_ALL,
+                                         GIMP_ITEM_SET_LINKED);
+  items = gimp_image_item_list_filter (items);
+
+  gimp_image_item_list_flip (image, items, context,
+                             flip_type, axis, clip_result);
+
+  g_list_free (items);
+}
+
+void
+gimp_item_linked_rotate (GimpItem         *item,
+                         GimpContext      *context,
+                         GimpRotationType  rotate_type,
+                         gdouble           center_x,
+                         gdouble           center_y,
+                         gboolean          clip_result)
+{
+  GimpImage *image;
+  GList     *items;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (gimp_item_get_linked (item) == TRUE);
+  g_return_if_fail (gimp_item_is_attached (item));
+
+  image = gimp_item_get_image (item);
+
+  items = gimp_image_item_list_get_list (image,
+                                         GIMP_ITEM_TYPE_ALL,
+                                         GIMP_ITEM_SET_LINKED);
+  items = gimp_image_item_list_filter (items);
+
+  gimp_image_item_list_rotate (image, items, context,
+                               rotate_type, center_x, center_y, clip_result);
+
+  g_list_free (items);
+}
+
+void
+gimp_item_linked_transform (GimpItem               *item,
+                            GimpContext            *context,
+                            const GimpMatrix3      *matrix,
+                            GimpTransformDirection  direction,
+                            GimpInterpolationType   interpolation_type,
+                            GimpTransformResize     clip_result,
+                            GimpProgress           *progress)
+{
+  GimpImage *image;
+  GList     *items;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (gimp_item_get_linked (item) == TRUE);
+  g_return_if_fail (gimp_item_is_attached (item));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  image = gimp_item_get_image (item);
+
+  items = gimp_image_item_list_get_list (image,
+                                         GIMP_ITEM_TYPE_ALL,
+                                         GIMP_ITEM_SET_LINKED);
+  items = gimp_image_item_list_filter (items);
+
+  gimp_image_item_list_transform (image, items, context,
+                                  matrix, direction,
+                                  interpolation_type,
+                                  clip_result, progress);
+
+  g_list_free (items);
+}
diff --git a/app/core/gimpitem-linked.h b/app/core/gimpitem-linked.h
new file mode 100644
index 0000000..c82d85a
--- /dev/null
+++ b/app/core/gimpitem-linked.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_LINKED_H__
+#define __GIMP_ITEM_LINKED_H__
+
+
+gboolean gimp_item_linked_is_locked (GimpItem               *item);
+
+void     gimp_item_linked_translate (GimpItem               *item,
+                                     gint                    offset_x,
+                                     gint                    offset_y,
+                                     gboolean                push_undo);
+void     gimp_item_linked_flip      (GimpItem               *item,
+                                     GimpContext            *context,
+                                     GimpOrientationType     flip_type,
+                                     gdouble                 axis,
+                                     gboolean                clip_result);
+void     gimp_item_linked_rotate    (GimpItem               *item,
+                                     GimpContext            *context,
+                                     GimpRotationType        rotate_type,
+                                     gdouble                 center_x,
+                                     gdouble                 center_y,
+                                     gboolean                clip_result);
+void     gimp_item_linked_transform (GimpItem               *item,
+                                     GimpContext            *context,
+                                     const GimpMatrix3      *matrix,
+                                     GimpTransformDirection  direction,
+                                     GimpInterpolationType   interpolation_type,
+                                     GimpTransformResize     clip_result,
+                                     GimpProgress           *progress);
+
+
+#endif /* __GIMP_ITEM_LINKED_H__ */
diff --git a/app/core/gimpitem-preview.c b/app/core/gimpitem-preview.c
new file mode 100644
index 0000000..f24017b
--- /dev/null
+++ b/app/core/gimpitem-preview.c
@@ -0,0 +1,133 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimpimage.h"
+#include "gimpitem.h"
+#include "gimpitem-preview.h"
+
+
+/*  public functions  */
+
+void
+gimp_item_get_preview_size (GimpViewable *viewable,
+                            gint          size,
+                            gboolean      is_popup,
+                            gboolean      dot_for_dot,
+                            gint         *width,
+                            gint         *height)
+{
+  GimpItem  *item  = GIMP_ITEM (viewable);
+  GimpImage *image = gimp_item_get_image (item);
+
+  if (image && ! image->gimp->config->layer_previews && ! is_popup)
+    {
+      *width  = size;
+      *height = size;
+      return;
+    }
+
+  if (image && ! is_popup)
+    {
+      gdouble xres;
+      gdouble yres;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      gimp_viewable_calc_preview_size (gimp_image_get_width  (image),
+                                       gimp_image_get_height (image),
+                                       size,
+                                       size,
+                                       dot_for_dot,
+                                       xres,
+                                       yres,
+                                       width,
+                                       height,
+                                       NULL);
+    }
+  else
+    {
+      gimp_viewable_calc_preview_size (gimp_item_get_width  (item),
+                                       gimp_item_get_height (item),
+                                       size,
+                                       size,
+                                       dot_for_dot, 1.0, 1.0,
+                                       width,
+                                       height,
+                                       NULL);
+    }
+}
+
+gboolean
+gimp_item_get_popup_size (GimpViewable *viewable,
+                          gint          width,
+                          gint          height,
+                          gboolean      dot_for_dot,
+                          gint         *popup_width,
+                          gint         *popup_height)
+{
+  GimpItem  *item  = GIMP_ITEM (viewable);
+  GimpImage *image = gimp_item_get_image (item);
+
+  if (image && ! image->gimp->config->layer_previews)
+    return FALSE;
+
+  if (gimp_item_get_width  (item) > width ||
+      gimp_item_get_height (item) > height)
+    {
+      gboolean scaling_up;
+      gdouble  xres = 1.0;
+      gdouble  yres = 1.0;
+
+      if (image)
+        gimp_image_get_resolution (image, &xres, &yres);
+
+      gimp_viewable_calc_preview_size (gimp_item_get_width  (item),
+                                       gimp_item_get_height (item),
+                                       width  * 2,
+                                       height * 2,
+                                       dot_for_dot,
+                                       xres,
+                                       yres,
+                                       popup_width,
+                                       popup_height,
+                                       &scaling_up);
+
+      if (scaling_up)
+        {
+          *popup_width  = gimp_item_get_width  (item);
+          *popup_height = gimp_item_get_height (item);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/core/gimpitem-preview.h b/app/core/gimpitem-preview.h
new file mode 100644
index 0000000..6bfed24
--- /dev/null
+++ b/app/core/gimpitem-preview.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM__PREVIEW_H__
+#define __GIMP_ITEM__PREVIEW_H__
+
+
+/*
+ *  virtual functions of GimpItem -- don't call directly
+ */
+
+void      gimp_item_get_preview_size (GimpViewable *viewable,
+                                      gint          size,
+                                      gboolean      is_popup,
+                                      gboolean      dot_for_dot,
+                                      gint         *width,
+                                      gint         *height);
+gboolean  gimp_item_get_popup_size   (GimpViewable *viewable,
+                                      gint          width,
+                                      gint          height,
+                                      gboolean      dot_for_dot,
+                                      gint         *popup_width,
+                                      gint         *popup_height);
+
+
+#endif /* __GIMP_ITEM__PREVIEW_H__ */
diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c
new file mode 100644
index 0000000..c0f732c
--- /dev/null
+++ b/app/core/gimpitem.c
@@ -0,0 +1,2689 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-parasites.h"
+#include "gimpchannel.h"
+#include "gimpcontainer.h"
+#include "gimpidtable.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitem.h"
+#include "gimpitem-linked.h"
+#include "gimpitem-preview.h"
+#include "gimpitemtree.h"
+#include "gimplist.h"
+#include "gimpmarshal.h"
+#include "gimpparasitelist.h"
+#include "gimpprogress.h"
+#include "gimpstrokeoptions.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  REMOVED,
+  VISIBILITY_CHANGED,
+  LINKED_CHANGED,
+  COLOR_TAG_CHANGED,
+  LOCK_CONTENT_CHANGED,
+  LOCK_POSITION_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE,
+  PROP_ID,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_OFFSET_X,
+  PROP_OFFSET_Y,
+  PROP_VISIBLE,
+  PROP_LINKED,
+  PROP_COLOR_TAG,
+  PROP_LOCK_CONTENT,
+  PROP_LOCK_POSITION
+};
+
+
+typedef struct _GimpItemPrivate GimpItemPrivate;
+
+struct _GimpItemPrivate
+{
+  gint              ID;                          /*  provides a unique ID        */
+  guint32           tattoo;                      /*  provides a permanent ID     */
+
+  GimpImage        *image;                       /*  item owner                  */
+
+  GimpParasiteList *parasites;                   /*  Plug-in parasite data       */
+
+  gint              width, height;               /*  size in pixels              */
+  gint              offset_x, offset_y;          /*  pixel offset in image       */
+
+  guint             visible                : 1;  /*  item visibility             */
+  guint             bind_visible_to_active : 1;  /*  visibility bound to active  */
+
+  guint             linked                 : 1;  /*  control linkage             */
+  guint             lock_content           : 1;  /*  content editability         */
+  guint             lock_position          : 1;  /*  content movability          */
+
+  guint             removed                : 1;  /*  removed from the image?     */
+
+  GimpColorTag      color_tag;                   /*  color tag                   */
+
+  GList            *offset_nodes;                /*  offset nodes to manage      */
+};
+
+#define GET_PRIVATE(item) ((GimpItemPrivate *) gimp_item_get_instance_private ((GimpItem *) (item)))
+
+
+/*  local function prototypes  */
+
+static void       gimp_item_constructed             (GObject        *object);
+static void       gimp_item_finalize                (GObject        *object);
+static void       gimp_item_set_property            (GObject        *object,
+                                                     guint           property_id,
+                                                     const GValue   *value,
+                                                     GParamSpec     *pspec);
+static void       gimp_item_get_property            (GObject        *object,
+                                                     guint           property_id,
+                                                     GValue         *value,
+                                                     GParamSpec     *pspec);
+
+static gint64     gimp_item_get_memsize             (GimpObject     *object,
+                                                     gint64         *gui_size);
+
+static gboolean   gimp_item_real_is_content_locked  (GimpItem       *item);
+static gboolean   gimp_item_real_is_position_locked (GimpItem       *item);
+static gboolean   gimp_item_real_bounds             (GimpItem       *item,
+                                                     gdouble        *x,
+                                                     gdouble        *y,
+                                                     gdouble        *width,
+                                                     gdouble        *height);
+static GimpItem * gimp_item_real_duplicate          (GimpItem       *item,
+                                                     GType           new_type);
+static void       gimp_item_real_convert            (GimpItem       *item,
+                                                     GimpImage      *dest_image,
+                                                     GType           old_type);
+static gboolean   gimp_item_real_rename             (GimpItem       *item,
+                                                     const gchar    *new_name,
+                                                     const gchar    *undo_desc,
+                                                     GError        **error);
+static void       gimp_item_real_start_transform    (GimpItem       *item,
+                                                     gboolean        push_undo);
+static void       gimp_item_real_end_transform      (GimpItem       *item,
+                                                     gboolean        push_undo);
+static void       gimp_item_real_translate          (GimpItem       *item,
+                                                     gdouble         offset_x,
+                                                     gdouble         offset_y,
+                                                     gboolean        push_undo);
+static void       gimp_item_real_scale              (GimpItem       *item,
+                                                     gint            new_width,
+                                                     gint            new_height,
+                                                     gint            new_offset_x,
+                                                     gint            new_offset_y,
+                                                     GimpInterpolationType interpolation,
+                                                     GimpProgress   *progress);
+static void       gimp_item_real_resize             (GimpItem       *item,
+                                                     GimpContext    *context,
+                                                     GimpFillType    fill_type,
+                                                     gint            new_width,
+                                                     gint            new_height,
+                                                     gint            offset_x,
+                                                     gint            offset_y);
+static GimpTransformResize
+                  gimp_item_real_get_clip           (GimpItem       *item,
+                                                     GimpTransformResize clip_result);
+
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpItem, gimp_item, GIMP_TYPE_FILTER)
+
+#define parent_class gimp_item_parent_class
+
+static guint gimp_item_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_item_class_init (GimpItemClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+
+  gimp_item_signals[REMOVED] =
+    g_signal_new ("removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpItemClass, removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_item_signals[VISIBILITY_CHANGED] =
+    g_signal_new ("visibility-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpItemClass, visibility_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_item_signals[LINKED_CHANGED] =
+    g_signal_new ("linked-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpItemClass, linked_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_item_signals[COLOR_TAG_CHANGED] =
+    g_signal_new ("color-tag-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpItemClass, color_tag_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_item_signals[LOCK_CONTENT_CHANGED] =
+    g_signal_new ("lock-content-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpItemClass, lock_content_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_item_signals[LOCK_POSITION_CHANGED] =
+    g_signal_new ("lock-position-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpItemClass, lock_position_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->constructed        = gimp_item_constructed;
+  object_class->finalize           = gimp_item_finalize;
+  object_class->set_property       = gimp_item_set_property;
+  object_class->get_property       = gimp_item_get_property;
+
+  gimp_object_class->get_memsize   = gimp_item_get_memsize;
+
+  viewable_class->name_editable    = TRUE;
+  viewable_class->get_preview_size = gimp_item_get_preview_size;
+  viewable_class->get_popup_size   = gimp_item_get_popup_size;
+
+  klass->removed                   = NULL;
+  klass->visibility_changed        = NULL;
+  klass->linked_changed            = NULL;
+  klass->color_tag_changed         = NULL;
+  klass->lock_content_changed      = NULL;
+  klass->lock_position_changed     = NULL;
+
+  klass->unset_removed             = NULL;
+  klass->is_attached               = NULL;
+  klass->is_content_locked         = gimp_item_real_is_content_locked;
+  klass->is_position_locked        = gimp_item_real_is_position_locked;
+  klass->get_tree                  = NULL;
+  klass->bounds                    = gimp_item_real_bounds;
+  klass->duplicate                 = gimp_item_real_duplicate;
+  klass->convert                   = gimp_item_real_convert;
+  klass->rename                    = gimp_item_real_rename;
+  klass->start_move                = NULL;
+  klass->end_move                  = NULL;
+  klass->start_transform           = gimp_item_real_start_transform;
+  klass->end_transform             = gimp_item_real_end_transform;
+  klass->translate                 = gimp_item_real_translate;
+  klass->scale                     = gimp_item_real_scale;
+  klass->resize                    = gimp_item_real_resize;
+  klass->flip                      = NULL;
+  klass->rotate                    = NULL;
+  klass->transform                 = NULL;
+  klass->get_clip                  = gimp_item_real_get_clip;
+  klass->fill                      = NULL;
+  klass->stroke                    = NULL;
+  klass->to_selection              = NULL;
+
+  klass->default_name              = NULL;
+  klass->rename_desc               = NULL;
+  klass->translate_desc            = NULL;
+  klass->scale_desc                = NULL;
+  klass->resize_desc               = NULL;
+  klass->flip_desc                 = NULL;
+  klass->rotate_desc               = NULL;
+  klass->transform_desc            = NULL;
+  klass->fill_desc                 = NULL;
+  klass->stroke_desc               = NULL;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image", NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_ID,
+                                   g_param_spec_int ("id", NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width", NULL, NULL,
+                                                     1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_int ("height", NULL, NULL,
+                                                     1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_X,
+                                   g_param_spec_int ("offset-x", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_Y,
+                                   g_param_spec_int ("offset-y", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_VISIBLE,
+                                   g_param_spec_boolean ("visible", NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_LINKED,
+                                   g_param_spec_boolean ("linked", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_COLOR_TAG,
+                                   g_param_spec_enum ("color-tag", NULL, NULL,
+                                                      GIMP_TYPE_COLOR_TAG,
+                                                      GIMP_COLOR_TAG_NONE,
+                                                      GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_LOCK_CONTENT,
+                                   g_param_spec_boolean ("lock-content",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_LOCK_POSITION,
+                                   g_param_spec_boolean ("lock-position",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_item_init (GimpItem *item)
+{
+  GimpItemPrivate *private = GET_PRIVATE (item);
+
+  g_object_force_floating (G_OBJECT (item));
+
+  private->parasites              = gimp_parasite_list_new ();
+  private->visible                = TRUE;
+  private->bind_visible_to_active = TRUE;
+}
+
+static void
+gimp_item_constructed (GObject *object)
+{
+  GimpItemPrivate *private = GET_PRIVATE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_IMAGE (private->image));
+  gimp_assert (private->ID != 0);
+}
+
+static void
+gimp_item_finalize (GObject *object)
+{
+  GimpItemPrivate *private = GET_PRIVATE (object);
+
+  if (private->offset_nodes)
+    {
+      g_list_free_full (private->offset_nodes,
+                        (GDestroyNotify) g_object_unref);
+      private->offset_nodes = NULL;
+    }
+
+  if (private->image && private->image->gimp)
+    {
+      gimp_id_table_remove (private->image->gimp->item_table, private->ID);
+      private->image = NULL;
+    }
+
+  g_clear_object (&private->parasites);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_item_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpItem *item = GIMP_ITEM (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      gimp_item_set_image (item, g_value_get_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_item_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GimpItemPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, private->image);
+      break;
+    case PROP_ID:
+      g_value_set_int (value, private->ID);
+      break;
+    case PROP_WIDTH:
+      g_value_set_int (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_int (value, private->height);
+      break;
+    case PROP_OFFSET_X:
+      g_value_set_int (value, private->offset_x);
+      break;
+    case PROP_OFFSET_Y:
+      g_value_set_int (value, private->offset_y);
+      break;
+    case PROP_VISIBLE:
+      g_value_set_boolean (value, private->visible);
+      break;
+    case PROP_LINKED:
+      g_value_set_boolean (value, private->linked);
+      break;
+    case PROP_COLOR_TAG:
+      g_value_set_enum (value, private->color_tag);
+      break;
+    case PROP_LOCK_CONTENT:
+      g_value_set_boolean (value, private->lock_content);
+      break;
+    case PROP_LOCK_POSITION:
+      g_value_set_boolean (value, private->lock_position);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_item_get_memsize (GimpObject *object,
+                       gint64     *gui_size)
+{
+  GimpItemPrivate *private = GET_PRIVATE (object);
+  gint64           memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (private->parasites),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_item_real_is_content_locked (GimpItem *item)
+{
+  GimpItem *parent = gimp_item_get_parent (item);
+
+  if (parent && gimp_item_is_content_locked (parent))
+    return TRUE;
+
+  return GET_PRIVATE (item)->lock_content;
+}
+
+static gboolean
+gimp_item_real_is_position_locked (GimpItem *item)
+{
+  if (gimp_item_get_linked (item))
+    if (gimp_item_linked_is_locked (item))
+      return TRUE;
+
+  return GET_PRIVATE (item)->lock_position;
+}
+
+static gboolean
+gimp_item_real_bounds (GimpItem *item,
+                       gdouble  *x,
+                       gdouble  *y,
+                       gdouble  *width,
+                       gdouble  *height)
+{
+  GimpItemPrivate *private = GET_PRIVATE (item);
+
+  *x      = 0;
+  *y      = 0;
+  *width  = private->width;
+  *height = private->height;
+
+  return TRUE;
+}
+
+static GimpItem *
+gimp_item_real_duplicate (GimpItem *item,
+                          GType     new_type)
+{
+  GimpItemPrivate *private;
+  GimpItem        *new_item;
+  gchar           *new_name;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  private = GET_PRIVATE (item);
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (private->image), NULL);
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_ITEM), NULL);
+
+  /*  formulate the new name  */
+  {
+    const gchar *name;
+    gint         len;
+
+    name = gimp_object_get_name (item);
+
+    g_return_val_if_fail (name != NULL, NULL);
+
+    len = strlen (_("copy"));
+
+    if ((strlen (name) >= len &&
+         strcmp (&name[strlen (name) - len], _("copy")) == 0) ||
+        g_regex_match_simple ("#([0-9]+)\\s*$", name, 0, 0))
+      {
+        /* don't have redundant "copy"s */
+        new_name = g_strdup (name);
+      }
+    else
+      {
+        new_name = g_strdup_printf (_("%s copy"), name);
+      }
+  }
+
+  new_item = gimp_item_new (new_type,
+                            gimp_item_get_image (item), new_name,
+                            private->offset_x, private->offset_y,
+                            gimp_item_get_width  (item),
+                            gimp_item_get_height (item));
+
+  g_free (new_name);
+
+  gimp_viewable_set_expanded (GIMP_VIEWABLE (new_item),
+                              gimp_viewable_get_expanded (GIMP_VIEWABLE (item)));
+
+  g_object_unref (GET_PRIVATE (new_item)->parasites);
+  GET_PRIVATE (new_item)->parasites = gimp_parasite_list_copy (private->parasites);
+
+  gimp_item_set_visible   (new_item, gimp_item_get_visible   (item), FALSE);
+  gimp_item_set_linked    (new_item, gimp_item_get_linked    (item), FALSE);
+  gimp_item_set_color_tag (new_item, gimp_item_get_color_tag (item), FALSE);
+
+  if (gimp_item_can_lock_content (new_item))
+    gimp_item_set_lock_content (new_item, gimp_item_get_lock_content (item),
+                                FALSE);
+
+  if (gimp_item_can_lock_position (new_item))
+    gimp_item_set_lock_position (new_item, gimp_item_get_lock_position (item),
+                                 FALSE);
+
+  return new_item;
+}
+
+static void
+gimp_item_real_convert (GimpItem  *item,
+                        GimpImage *dest_image,
+                        GType      old_type)
+{
+  gimp_item_set_image (item, dest_image);
+}
+
+static gboolean
+gimp_item_real_rename (GimpItem     *item,
+                       const gchar  *new_name,
+                       const gchar  *undo_desc,
+                       GError      **error)
+{
+  if (gimp_item_is_attached (item))
+    gimp_item_tree_rename_item (gimp_item_get_tree (item), item,
+                                new_name, TRUE, undo_desc);
+  else
+    gimp_object_set_name (GIMP_OBJECT (item), new_name);
+
+  return TRUE;
+}
+
+static void
+gimp_item_real_translate (GimpItem *item,
+                          gdouble   offset_x,
+                          gdouble   offset_y,
+                          gboolean  push_undo)
+{
+  GimpItemPrivate *private = GET_PRIVATE (item);
+
+  gimp_item_set_offset (item,
+                        private->offset_x + SIGNED_ROUND (offset_x),
+                        private->offset_y + SIGNED_ROUND (offset_y));
+}
+
+static void
+gimp_item_real_start_transform (GimpItem *item,
+                                gboolean  push_undo)
+{
+  gimp_item_start_move (item, push_undo);
+}
+
+static void
+gimp_item_real_end_transform (GimpItem *item,
+                                gboolean  push_undo)
+{
+  gimp_item_end_move (item, push_undo);
+}
+
+static void
+gimp_item_real_scale (GimpItem              *item,
+                      gint                   new_width,
+                      gint                   new_height,
+                      gint                   new_offset_x,
+                      gint                   new_offset_y,
+                      GimpInterpolationType  interpolation,
+                      GimpProgress          *progress)
+{
+  GimpItemPrivate *private = GET_PRIVATE (item);
+
+  if (private->width != new_width)
+    {
+      private->width = new_width;
+      g_object_notify (G_OBJECT (item), "width");
+    }
+
+  if (private->height != new_height)
+    {
+      private->height = new_height;
+      g_object_notify (G_OBJECT (item), "height");
+    }
+
+  gimp_item_set_offset (item, new_offset_x, new_offset_y);
+}
+
+static void
+gimp_item_real_resize (GimpItem     *item,
+                       GimpContext  *context,
+                       GimpFillType  fill_type,
+                       gint          new_width,
+                       gint          new_height,
+                       gint          offset_x,
+                       gint          offset_y)
+{
+  GimpItemPrivate *private = GET_PRIVATE (item);
+
+  if (private->width != new_width)
+    {
+      private->width = new_width;
+      g_object_notify (G_OBJECT (item), "width");
+    }
+
+  if (private->height != new_height)
+    {
+      private->height = new_height;
+      g_object_notify (G_OBJECT (item), "height");
+    }
+
+  gimp_item_set_offset (item,
+                        private->offset_x - offset_x,
+                        private->offset_y - offset_y);
+}
+
+static GimpTransformResize
+gimp_item_real_get_clip (GimpItem            *item,
+                         GimpTransformResize  clip_result)
+{
+  if (gimp_item_get_lock_position (item))
+    return GIMP_TRANSFORM_RESIZE_CLIP;
+  else
+    return clip_result;
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_item_new:
+ * @type:     The new item's type.
+ * @image:    The new item's #GimpImage.
+ * @name:     The name to assign the item.
+ * @offset_x: The X offset to assign the item.
+ * @offset_y: The Y offset to assign the item.
+ * @width:    The width to assign the item.
+ * @height:   The height to assign the item.
+ *
+ * Return value: The newly created item.
+ */
+GimpItem *
+gimp_item_new (GType        type,
+               GimpImage   *image,
+               const gchar *name,
+               gint         offset_x,
+               gint         offset_y,
+               gint         width,
+               gint         height)
+{
+  GimpItem        *item;
+  GimpItemPrivate *private;
+
+  g_return_val_if_fail (g_type_is_a (type, GIMP_TYPE_ITEM), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (width > 0 && height > 0, NULL);
+
+  item = g_object_new (type,
+                       "image", image,
+                       NULL);
+
+  private = GET_PRIVATE (item);
+
+  private->width  = width;
+  private->height = height;
+  gimp_item_set_offset (item, offset_x, offset_y);
+
+  if (name && strlen (name))
+    gimp_object_set_name (GIMP_OBJECT (item), name);
+  else
+    gimp_object_set_static_name (GIMP_OBJECT (item),
+                                 GIMP_ITEM_GET_CLASS (item)->default_name);
+
+  return item;
+}
+
+/**
+ * gimp_item_remove:
+ * @item: the #GimpItem to remove.
+ *
+ * This function sets the 'removed' flag on @item to #TRUE, and emits
+ * a 'removed' signal on the item.
+ */
+void
+gimp_item_removed (GimpItem *item)
+{
+  GimpContainer *children;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  GET_PRIVATE (item)->removed = TRUE;
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+  if (children)
+    gimp_container_foreach (children, (GFunc) gimp_item_removed, NULL);
+
+  g_signal_emit (item, gimp_item_signals[REMOVED], 0);
+}
+
+/**
+ * gimp_item_is_removed:
+ * @item: the #GimpItem to check.
+ *
+ * Returns: %TRUE if the 'removed' flag is set for @item, %FALSE otherwise.
+ */
+gboolean
+gimp_item_is_removed (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GET_PRIVATE (item)->removed;
+}
+
+/**
+ * gimp_item_unset_removed:
+ * @item: a #GimpItem which was on the undo stack
+ *
+ * Unsets an item's "removed" state. This function is called when an
+ * item was on the undo stack and is added back to its parent
+ * container during and undo or redo. It must never be called from
+ * anywhere else.
+ **/
+void
+gimp_item_unset_removed (GimpItem *item)
+{
+  GimpContainer *children;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_removed (item));
+
+  GET_PRIVATE (item)->removed = FALSE;
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+  if (children)
+    gimp_container_foreach (children, (GFunc) gimp_item_unset_removed, NULL);
+
+  if (GIMP_ITEM_GET_CLASS (item)->unset_removed)
+    GIMP_ITEM_GET_CLASS (item)->unset_removed (item);
+}
+
+/**
+ * gimp_item_is_attached:
+ * @item: The #GimpItem to check.
+ *
+ * Returns: %TRUE if the item is attached to an image, %FALSE otherwise.
+ */
+gboolean
+gimp_item_is_attached (GimpItem *item)
+{
+  GimpItem *parent;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  parent = gimp_item_get_parent (item);
+
+  if (parent)
+    return gimp_item_is_attached (parent);
+
+  return GIMP_ITEM_GET_CLASS (item)->is_attached (item);
+}
+
+GimpItem *
+gimp_item_get_parent (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  return GIMP_ITEM (gimp_viewable_get_parent (GIMP_VIEWABLE (item)));
+}
+
+GimpItemTree *
+gimp_item_get_tree (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  if (GIMP_ITEM_GET_CLASS (item)->get_tree)
+    return GIMP_ITEM_GET_CLASS (item)->get_tree (item);
+
+  return NULL;
+}
+
+GimpContainer *
+gimp_item_get_container (GimpItem *item)
+{
+  GimpItem     *parent;
+  GimpItemTree *tree;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  parent = gimp_item_get_parent (item);
+
+  if (parent)
+    return gimp_viewable_get_children (GIMP_VIEWABLE (parent));
+
+  tree = gimp_item_get_tree (item);
+
+  if (tree)
+    return tree->container;
+
+  return NULL;
+}
+
+GList *
+gimp_item_get_container_iter (GimpItem *item)
+{
+  GimpContainer *container;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  container = gimp_item_get_container (item);
+
+  if (container)
+    return GIMP_LIST (container)->queue->head;
+
+  return NULL;
+}
+
+gint
+gimp_item_get_index (GimpItem *item)
+{
+  GimpContainer *container;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
+
+  container = gimp_item_get_container (item);
+
+  if (container)
+    return gimp_container_get_child_index (container, GIMP_OBJECT (item));
+
+  return -1;
+}
+
+GList *
+gimp_item_get_path (GimpItem *item)
+{
+  GimpContainer *container;
+  GList         *path = NULL;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (item), NULL);
+
+  container = gimp_item_get_container (item);
+
+  while (container)
+    {
+      guint32 index = gimp_container_get_child_index (container,
+                                                      GIMP_OBJECT (item));
+
+      path = g_list_prepend (path, GUINT_TO_POINTER (index));
+
+      item = gimp_item_get_parent (item);
+
+      if (item)
+        container = gimp_item_get_container (item);
+      else
+        container = NULL;
+    }
+
+  return path;
+}
+
+gboolean
+gimp_item_bounds (GimpItem *item,
+                  gint     *x,
+                  gint     *y,
+                  gint     *width,
+                  gint     *height)
+{
+  gdouble  tmp_x, tmp_y, tmp_width, tmp_height;
+  gboolean retval;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  retval = GIMP_ITEM_GET_CLASS (item)->bounds (item,
+                                               &tmp_x, &tmp_y,
+                                               &tmp_width, &tmp_height);
+
+  if (x)      *x      = floor (tmp_x);
+  if (y)      *y      = floor (tmp_y);
+  if (width)  *width  = ceil (tmp_x + tmp_width)  - floor (tmp_x);
+  if (height) *height = ceil (tmp_y + tmp_height) - floor (tmp_y);
+
+  return retval;
+}
+
+gboolean
+gimp_item_bounds_f (GimpItem *item,
+                    gdouble  *x,
+                    gdouble  *y,
+                    gdouble  *width,
+                    gdouble  *height)
+{
+  gdouble  tmp_x, tmp_y, tmp_width, tmp_height;
+  gboolean retval;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  retval = GIMP_ITEM_GET_CLASS (item)->bounds (item,
+                                               &tmp_x, &tmp_y,
+                                               &tmp_width, &tmp_height);
+
+  if (x)      *x      = tmp_x;
+  if (y)      *y      = tmp_y;
+  if (width)  *width  = tmp_width;
+  if (height) *height = tmp_height;
+
+  return retval;
+}
+
+/**
+ * gimp_item_duplicate:
+ * @item:     The #GimpItem to duplicate.
+ * @new_type: The type to make the new item.
+ *
+ * Returns: the newly created item.
+ */
+GimpItem *
+gimp_item_duplicate (GimpItem *item,
+                     GType     new_type)
+{
+  GimpItemPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  private = GET_PRIVATE (item);
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (private->image), NULL);
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_ITEM), NULL);
+
+  return GIMP_ITEM_GET_CLASS (item)->duplicate (item, new_type);
+}
+
+/**
+ * gimp_item_convert:
+ * @item:       The #GimpItem to convert.
+ * @dest_image: The #GimpImage in which to place the converted item.
+ * @new_type:   The type to convert the item to.
+ *
+ * Returns: the new item that results from the conversion.
+ */
+GimpItem *
+gimp_item_convert (GimpItem  *item,
+                   GimpImage *dest_image,
+                   GType      new_type)
+{
+  GimpItem *new_item;
+  GType     old_type;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (GET_PRIVATE (item)->image), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_ITEM), NULL);
+
+  old_type = G_TYPE_FROM_INSTANCE (item);
+
+  new_item = gimp_item_duplicate (item, new_type);
+
+  if (new_item)
+    GIMP_ITEM_GET_CLASS (new_item)->convert (new_item, dest_image, old_type);
+
+  return new_item;
+}
+
+/**
+ * gimp_item_rename:
+ * @item:     The #GimpItem to rename.
+ * @new_name: The new name to give the item.
+ * @error:    Return location for error message.
+ *
+ * This function assigns a new name to the item, if the desired name is
+ * different from the name it already has, and pushes an entry onto the
+ * undo stack for the item's image.  If @new_name is NULL or empty, the
+ * default name for the item's class is used.  If the name is changed,
+ * the GimpObject::name-changed signal is emitted for the item.
+ *
+ * Returns: %TRUE if the @item could be renamed, %FALSE otherwise.
+ */
+gboolean
+gimp_item_rename (GimpItem     *item,
+                  const gchar  *new_name,
+                  GError      **error)
+{
+  GimpItemClass *item_class;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+
+  if (! new_name || ! *new_name)
+    new_name = item_class->default_name;
+
+  if (strcmp (new_name, gimp_object_get_name (item)))
+    return item_class->rename (item, new_name, item_class->rename_desc, error);
+
+  return TRUE;
+}
+
+/**
+ * gimp_item_get_width:
+ * @item: The #GimpItem to check.
+ *
+ * Returns: The width of the item.
+ */
+gint
+gimp_item_get_width (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
+
+  return GET_PRIVATE (item)->width;
+}
+
+/**
+ * gimp_item_get_height:
+ * @item: The #GimpItem to check.
+ *
+ * Returns: The height of the item.
+ */
+gint
+gimp_item_get_height (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
+
+  return GET_PRIVATE (item)->height;
+}
+
+void
+gimp_item_set_size (GimpItem *item,
+                    gint      width,
+                    gint      height)
+{
+  GimpItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  private = GET_PRIVATE (item);
+
+  if (private->width  != width ||
+      private->height != height)
+    {
+      g_object_freeze_notify (G_OBJECT (item));
+
+      if (private->width != width)
+        {
+          private->width = width;
+          g_object_notify (G_OBJECT (item), "width");
+        }
+
+      if (private->height != height)
+        {
+          private->height = height;
+          g_object_notify (G_OBJECT (item), "height");
+        }
+
+      g_object_thaw_notify (G_OBJECT (item));
+
+      gimp_viewable_size_changed (GIMP_VIEWABLE (item));
+    }
+}
+
+/**
+ * gimp_item_get_offset:
+ * @item:     The #GimpItem to check.
+ * @offset_x: Return location for the item's X offset.
+ * @offset_y: Return location for the item's Y offset.
+ *
+ * Reveals the X and Y offsets of the item.
+ */
+void
+gimp_item_get_offset (GimpItem *item,
+                      gint     *offset_x,
+                      gint     *offset_y)
+{
+  GimpItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  private = GET_PRIVATE (item);
+
+  if (offset_x) *offset_x = private->offset_x;
+  if (offset_y) *offset_y = private->offset_y;
+}
+
+void
+gimp_item_set_offset (GimpItem *item,
+                      gint      offset_x,
+                      gint      offset_y)
+{
+  GimpItemPrivate *private;
+  GList           *list;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  private = GET_PRIVATE (item);
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  if (private->offset_x != offset_x)
+    {
+      private->offset_x = offset_x;
+      g_object_notify (G_OBJECT (item), "offset-x");
+    }
+
+  if (private->offset_y != offset_y)
+    {
+      private->offset_y = offset_y;
+      g_object_notify (G_OBJECT (item), "offset-y");
+    }
+
+  for (list = private->offset_nodes; list; list = g_list_next (list))
+    {
+      GeglNode *node = list->data;
+
+      gegl_node_set (node,
+                     "x", (gdouble) private->offset_x,
+                     "y", (gdouble) private->offset_y,
+                     NULL);
+    }
+
+  g_object_thaw_notify (G_OBJECT (item));
+}
+
+gint
+gimp_item_get_offset_x (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), 0);
+
+  return GET_PRIVATE (item)->offset_x;
+}
+
+gint
+gimp_item_get_offset_y (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), 0);
+
+  return GET_PRIVATE (item)->offset_y;
+}
+
+void
+gimp_item_start_move (GimpItem *item,
+                      gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  if (GIMP_ITEM_GET_CLASS (item)->start_move)
+    GIMP_ITEM_GET_CLASS (item)->start_move (item, push_undo);
+}
+
+void
+gimp_item_end_move (GimpItem *item,
+                    gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  if (GIMP_ITEM_GET_CLASS (item)->end_move)
+    GIMP_ITEM_GET_CLASS (item)->end_move (item, push_undo);
+}
+
+void
+gimp_item_start_transform (GimpItem *item,
+                           gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  if (GIMP_ITEM_GET_CLASS (item)->start_transform)
+    GIMP_ITEM_GET_CLASS (item)->start_transform (item, push_undo);
+}
+
+void
+gimp_item_end_transform (GimpItem *item,
+                         gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  if (GIMP_ITEM_GET_CLASS (item)->end_transform)
+    GIMP_ITEM_GET_CLASS (item)->end_transform (item, push_undo);
+}
+
+/**
+ * gimp_item_translate:
+ * @item:      The #GimpItem to move.
+ * @offset_x:  Increment to the X offset of the item.
+ * @offset_y:  Increment to the Y offset of the item.
+ * @push_undo: If #TRUE, create an entry in the image's undo stack
+ *             for this action.
+ *
+ * Adds the specified increments to the X and Y offsets for the item.
+ */
+void
+gimp_item_translate (GimpItem *item,
+                     gdouble   offset_x,
+                     gdouble   offset_y,
+                     gboolean  push_undo)
+{
+  GimpItemClass *item_class;
+  GimpImage     *image;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+  image = gimp_item_get_image (item);
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_DISPLACE,
+                                 item_class->translate_desc);
+
+  gimp_item_start_transform (item, push_undo);
+
+  item_class->translate (item, offset_x, offset_y, push_undo);
+
+  gimp_item_end_transform (item, push_undo);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+/**
+ * gimp_item_check_scaling:
+ * @item:       Item to check
+ * @new_width:  proposed width of item, in pixels
+ * @new_height: proposed height of item, in pixels
+ *
+ * Scales item dimensions, then snaps them to pixel centers
+ *
+ * Returns: #FALSE if any dimension reduces to zero as a result
+ *          of this; otherwise, returns #TRUE.
+ **/
+gboolean
+gimp_item_check_scaling (GimpItem *item,
+                         gint      new_width,
+                         gint      new_height)
+{
+  GimpItemPrivate *private;
+  GimpImage       *image;
+  gdouble          img_scale_w;
+  gdouble          img_scale_h;
+  gint             new_item_offset_x;
+  gint             new_item_offset_y;
+  gint             new_item_width;
+  gint             new_item_height;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  private = GET_PRIVATE (item);
+  image   = gimp_item_get_image (item);
+
+  img_scale_w       = ((gdouble) new_width /
+                       (gdouble) gimp_image_get_width (image));
+  img_scale_h       = ((gdouble) new_height /
+                       (gdouble) gimp_image_get_height (image));
+  new_item_offset_x = SIGNED_ROUND (img_scale_w * private->offset_x);
+  new_item_offset_y = SIGNED_ROUND (img_scale_h * private->offset_y);
+  new_item_width    = SIGNED_ROUND (img_scale_w * (private->offset_x +
+                                                   gimp_item_get_width (item))) -
+                      new_item_offset_x;
+  new_item_height   = SIGNED_ROUND (img_scale_h * (private->offset_y +
+                                                   gimp_item_get_height (item))) -
+                      new_item_offset_y;
+
+  return (new_item_width > 0 && new_item_height > 0);
+}
+
+void
+gimp_item_scale (GimpItem              *item,
+                 gint                   new_width,
+                 gint                   new_height,
+                 gint                   new_offset_x,
+                 gint                   new_offset_y,
+                 GimpInterpolationType  interpolation,
+                 GimpProgress          *progress)
+{
+  GimpItemClass *item_class;
+  GimpImage     *image;
+  gboolean       push_undo;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  if (new_width < 1 || new_height < 1)
+    return;
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+  image = gimp_item_get_image (item);
+
+  push_undo = gimp_item_is_attached (item);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_SCALE,
+                                 item_class->scale_desc);
+
+  gimp_item_start_transform (item, push_undo);
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  item_class->scale (item, new_width, new_height, new_offset_x, new_offset_y,
+                     interpolation, progress);
+
+  g_object_thaw_notify (G_OBJECT (item));
+
+  gimp_item_end_transform (item, push_undo);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+/**
+ * gimp_item_scale_by_factors:
+ * @item:     Item to be transformed by explicit width and height factors.
+ * @w_factor: scale factor to apply to width and horizontal offset
+ * @h_factor: scale factor to apply to height and vertical offset
+ * @interpolation:
+ * @progress:
+ *
+ * Scales item dimensions and offsets by uniform width and
+ * height factors.
+ *
+ * Use gimp_item_scale_by_factors() in circumstances when the same
+ * width and height scaling factors are to be uniformly applied to a
+ * set of items. In this context, the item's dimensions and offsets
+ * from the sides of the containing image all change by these
+ * predetermined factors. By fiat, the fixed point of the transform is
+ * the upper left hand corner of the image. Returns #FALSE if a
+ * requested scale factor is zero or if a scaling zero's out a item
+ * dimension; returns #TRUE otherwise.
+ *
+ * Use gimp_item_scale() in circumstances where new item width
+ * and height dimensions are predetermined instead.
+ *
+ * Side effects: Undo set created for item. Old item imagery
+ *               scaled & painted to new item tiles.
+ *
+ * Returns: #TRUE, if the scaled item has positive dimensions
+ *          #FALSE if the scaled item has at least one zero dimension
+ **/
+gboolean
+gimp_item_scale_by_factors (GimpItem              *item,
+                            gdouble                w_factor,
+                            gdouble                h_factor,
+                            GimpInterpolationType  interpolation,
+                            GimpProgress          *progress)
+{
+  return gimp_item_scale_by_factors_with_origin (item,
+                                                 w_factor, h_factor,
+                                                 0, 0, 0, 0,
+                                                 interpolation, progress);
+}
+
+/**
+ * gimp_item_scale_by_factors:
+ * @item:         Item to be transformed by explicit width and height factors.
+ * @w_factor:     scale factor to apply to width and horizontal offset
+ * @h_factor:     scale factor to apply to height and vertical offset
+ * @origin_x:     x-coordinate of the transformation input origin
+ * @origin_y:     y-coordinate of the transformation input origin
+ * @new_origin_x: x-coordinate of the transformation output origin
+ * @new_origin_y: y-coordinate of the transformation output origin
+ * @interpolation:
+ * @progress:
+ *
+ * Same as gimp_item_scale_by_factors(), but with the option to specify
+ * custom input and output points of origin for the transformation.
+ *
+ * Returns: #TRUE, if the scaled item has positive dimensions
+ *          #FALSE if the scaled item has at least one zero dimension
+ **/
+gboolean
+gimp_item_scale_by_factors_with_origin (GimpItem              *item,
+                                        gdouble                w_factor,
+                                        gdouble                h_factor,
+                                        gint                   origin_x,
+                                        gint                   origin_y,
+                                        gint                   new_origin_x,
+                                        gint                   new_origin_y,
+                                        GimpInterpolationType  interpolation,
+                                        GimpProgress          *progress)
+{
+  GimpItemPrivate *private;
+  GimpContainer   *children;
+  gint             new_width, new_height;
+  gint             new_offset_x, new_offset_y;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+
+  private = GET_PRIVATE (item);
+
+  if (w_factor <= 0.0 || h_factor <= 0.0)
+    {
+      g_warning ("%s: requested width or height scale is non-positive",
+                 G_STRFUNC);
+      return FALSE;
+    }
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+  /* avoid discarding empty layer groups */
+  if (children && gimp_container_is_empty (children))
+    return TRUE;
+
+  new_offset_x = SIGNED_ROUND (w_factor * (private->offset_x - origin_x));
+  new_offset_y = SIGNED_ROUND (h_factor * (private->offset_y - origin_y));
+  new_width    = SIGNED_ROUND (w_factor * (private->offset_x - origin_x +
+                                           gimp_item_get_width (item))) -
+                 new_offset_x;
+  new_height   = SIGNED_ROUND (h_factor * (private->offset_y - origin_y +
+                                           gimp_item_get_height (item))) -
+                 new_offset_y;
+
+  new_offset_x += new_origin_x;
+  new_offset_y += new_origin_y;
+
+  if (new_width > 0 && new_height > 0)
+    {
+      gimp_item_scale (item,
+                       new_width, new_height,
+                       new_offset_x, new_offset_y,
+                       interpolation, progress);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_item_scale_by_origin:
+ * @item:         The item to be transformed by width & height scale factors
+ * @new_width:    The width that item will acquire
+ * @new_height:   The height that the item will acquire
+ * @interpolation:
+ * @progress:
+ * @local_origin: sets fixed point of the scaling transform. See below.
+ *
+ * Sets item dimensions to new_width and
+ * new_height. Derives vertical and horizontal scaling
+ * transforms from new width and height. If local_origin is
+ * #TRUE, the fixed point of the scaling transform coincides
+ * with the item's center point.  Otherwise, the fixed
+ * point is taken to be [-GimpItem::offset_x, -GimpItem::->offset_y].
+ *
+ * Since this function derives scale factors from new and
+ * current item dimensions, these factors will vary from
+ * item to item because of aliasing artifacts; factor
+ * variations among items can be quite large where item
+ * dimensions approach pixel dimensions. Use
+ * gimp_item_scale_by_factors() where constant scales are to
+ * be uniformly applied to a number of items.
+ *
+ * Side effects: undo set created for item.
+ *               Old item imagery scaled
+ *               & painted to new item tiles
+ **/
+void
+gimp_item_scale_by_origin (GimpItem              *item,
+                           gint                   new_width,
+                           gint                   new_height,
+                           GimpInterpolationType  interpolation,
+                           GimpProgress          *progress,
+                           gboolean               local_origin)
+{
+  GimpItemPrivate *private;
+  gint             new_offset_x, new_offset_y;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  private = GET_PRIVATE (item);
+
+  if (new_width == 0 || new_height == 0)
+    {
+      g_warning ("%s: requested width or height equals zero", G_STRFUNC);
+      return;
+    }
+
+  if (local_origin)
+    {
+      new_offset_x = (private->offset_x +
+                      ((gimp_item_get_width  (item) - new_width)  / 2.0));
+      new_offset_y = (private->offset_y +
+                      ((gimp_item_get_height (item) - new_height) / 2.0));
+    }
+  else
+    {
+      new_offset_x = (gint) (((gdouble) new_width *
+                              (gdouble) private->offset_x /
+                              (gdouble) gimp_item_get_width (item)));
+
+      new_offset_y = (gint) (((gdouble) new_height *
+                              (gdouble) private->offset_y /
+                              (gdouble) gimp_item_get_height (item)));
+    }
+
+  gimp_item_scale (item,
+                   new_width, new_height,
+                   new_offset_x, new_offset_y,
+                   interpolation, progress);
+}
+
+void
+gimp_item_resize (GimpItem     *item,
+                  GimpContext  *context,
+                  GimpFillType  fill_type,
+                  gint          new_width,
+                  gint          new_height,
+                  gint          offset_x,
+                  gint          offset_y)
+{
+  GimpItemClass *item_class;
+  GimpImage     *image;
+  gboolean       push_undo;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (new_width < 1 || new_height < 1)
+    return;
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+  image = gimp_item_get_image (item);
+
+  push_undo = gimp_item_is_attached (item);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
+                                 item_class->resize_desc);
+
+  /* note that we call gimp_item_start_move(), and not
+   * gimp_item_start_transform().  whether or not a resize operation should be
+   * considered a transform operation, or a move operation, depends on the
+   * intended use of these functions by subclasses.  atm, we only use
+   * gimp_item_{start,end}_transform() to suspend mask resizing in group
+   * layers, which should not happen when reisizing a group, hence the call to
+   * gimp_item_start_move().
+   *
+   * see the comment in gimp_group_layer_resize() for more information.
+   */
+  gimp_item_start_move (item, push_undo);
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  item_class->resize (item, context, fill_type,
+                      new_width, new_height, offset_x, offset_y);
+
+  g_object_thaw_notify (G_OBJECT (item));
+
+  gimp_item_end_move (item, push_undo);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+void
+gimp_item_flip (GimpItem            *item,
+                GimpContext         *context,
+                GimpOrientationType  flip_type,
+                gdouble              axis,
+                gboolean             clip_result)
+{
+  GimpItemClass *item_class;
+  GimpImage     *image;
+  gboolean       push_undo;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+  image = gimp_item_get_image (item);
+
+  push_undo = gimp_item_is_attached (item);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
+                                 item_class->flip_desc);
+
+  gimp_item_start_transform (item, push_undo);
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  item_class->flip (item, context, flip_type, axis, clip_result);
+
+  g_object_thaw_notify (G_OBJECT (item));
+
+  gimp_item_end_transform (item, push_undo);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+void
+gimp_item_rotate (GimpItem         *item,
+                  GimpContext      *context,
+                  GimpRotationType  rotate_type,
+                  gdouble           center_x,
+                  gdouble           center_y,
+                  gboolean          clip_result)
+{
+  GimpItemClass *item_class;
+  GimpImage     *image;
+  gboolean       push_undo;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+  image = gimp_item_get_image (item);
+
+  push_undo = gimp_item_is_attached (item);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
+                                 item_class->rotate_desc);
+
+  gimp_item_start_transform (item, push_undo);
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  item_class->rotate (item, context, rotate_type, center_x, center_y,
+                      clip_result);
+
+  g_object_thaw_notify (G_OBJECT (item));
+
+  gimp_item_end_transform (item, push_undo);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+void
+gimp_item_transform (GimpItem               *item,
+                     GimpContext            *context,
+                     const GimpMatrix3      *matrix,
+                     GimpTransformDirection  direction,
+                     GimpInterpolationType   interpolation,
+                     GimpTransformResize     clip_result,
+                     GimpProgress           *progress)
+{
+  GimpItemClass *item_class;
+  GimpImage     *image;
+  gboolean       push_undo;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (matrix != NULL);
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+  image = gimp_item_get_image (item);
+
+  push_undo = gimp_item_is_attached (item);
+
+  if (push_undo)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
+                                 item_class->transform_desc);
+
+  gimp_item_start_transform (item, push_undo);
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  item_class->transform (item, context, matrix, direction, interpolation,
+                         clip_result, progress);
+
+  g_object_thaw_notify (G_OBJECT (item));
+
+  gimp_item_end_transform (item, push_undo);
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+}
+
+GimpTransformResize
+gimp_item_get_clip (GimpItem            *item,
+                    GimpTransformResize  clip_result)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), GIMP_TRANSFORM_RESIZE_ADJUST);
+
+  return GIMP_ITEM_GET_CLASS (item)->get_clip (item, clip_result);
+}
+
+gboolean
+gimp_item_fill (GimpItem        *item,
+                GimpDrawable    *drawable,
+                GimpFillOptions *fill_options,
+                gboolean         push_undo,
+                GimpProgress    *progress,
+                GError         **error)
+{
+  GimpItemClass *item_class;
+  gboolean       retval = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (fill_options), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+
+  if (item_class->fill)
+    {
+      GimpImage *image = gimp_item_get_image (item);
+
+      if (push_undo)
+        gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_PAINT,
+                                     item_class->fill_desc);
+
+      retval = item_class->fill (item, drawable, fill_options, push_undo,
+                                 progress, error);
+
+      if (push_undo)
+        gimp_image_undo_group_end (image);
+    }
+
+  return retval;
+}
+
+gboolean
+gimp_item_stroke (GimpItem          *item,
+                  GimpDrawable      *drawable,
+                  GimpContext       *context,
+                  GimpStrokeOptions *stroke_options,
+                  GimpPaintOptions  *paint_options,
+                  gboolean           push_undo,
+                  GimpProgress      *progress,
+                  GError           **error)
+{
+  GimpItemClass *item_class;
+  gboolean       retval = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (stroke_options), FALSE);
+  g_return_val_if_fail (paint_options == NULL ||
+                        GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+
+  if (item_class->stroke)
+    {
+      GimpImage *image = gimp_item_get_image (item);
+
+      gimp_stroke_options_prepare (stroke_options, context, paint_options);
+
+      if (push_undo)
+        gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_PAINT,
+                                     item_class->stroke_desc);
+
+      retval = item_class->stroke (item, drawable, stroke_options, push_undo,
+                                   progress, error);
+
+      if (push_undo)
+        gimp_image_undo_group_end (image);
+
+      gimp_stroke_options_finish (stroke_options);
+    }
+
+  return retval;
+}
+
+void
+gimp_item_to_selection (GimpItem       *item,
+                        GimpChannelOps  op,
+                        gboolean        antialias,
+                        gboolean        feather,
+                        gdouble         feather_radius_x,
+                        gdouble         feather_radius_y)
+{
+  GimpItemClass *item_class;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+
+  item_class = GIMP_ITEM_GET_CLASS (item);
+
+  if (item_class->to_selection)
+    item_class->to_selection (item, op, antialias,
+                              feather, feather_radius_x, feather_radius_y);
+}
+
+void
+gimp_item_add_offset_node (GimpItem *item,
+                           GeglNode *node)
+{
+  GimpItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GEGL_IS_NODE (node));
+
+  private = GET_PRIVATE (item);
+
+  g_return_if_fail (g_list_find (private->offset_nodes, node) == NULL);
+
+  gegl_node_set (node,
+                 "x", (gdouble) private->offset_x,
+                 "y", (gdouble) private->offset_y,
+                 NULL);
+
+  private->offset_nodes = g_list_append (private->offset_nodes,
+                                         g_object_ref (node));
+}
+
+void
+gimp_item_remove_offset_node (GimpItem *item,
+                              GeglNode *node)
+{
+  GimpItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GEGL_IS_NODE (node));
+
+  private = GET_PRIVATE (item);
+
+  g_return_if_fail (g_list_find (private->offset_nodes, node) != NULL);
+
+  private->offset_nodes = g_list_remove (private->offset_nodes, node);
+  g_object_unref (node);
+}
+
+gint
+gimp_item_get_ID (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
+
+  return GET_PRIVATE (item)->ID;
+}
+
+GimpItem *
+gimp_item_get_by_ID (Gimp *gimp,
+                     gint  item_id)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp->item_table == NULL)
+    return NULL;
+
+  return (GimpItem *) gimp_id_table_lookup (gimp->item_table, item_id);
+}
+
+GimpTattoo
+gimp_item_get_tattoo (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), 0);
+
+  return GET_PRIVATE (item)->tattoo;
+}
+
+void
+gimp_item_set_tattoo (GimpItem   *item,
+                      GimpTattoo  tattoo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  GET_PRIVATE (item)->tattoo = tattoo;
+}
+
+GimpImage *
+gimp_item_get_image (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  return GET_PRIVATE (item)->image;
+}
+
+void
+gimp_item_set_image (GimpItem  *item,
+                     GimpImage *image)
+{
+  GimpItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (! gimp_item_is_attached (item));
+  g_return_if_fail (! gimp_item_is_removed (item));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GET_PRIVATE (item);
+
+  if (image == private->image)
+    return;
+
+  g_object_freeze_notify (G_OBJECT (item));
+
+  if (private->ID == 0)
+    {
+      private->ID = gimp_id_table_insert (image->gimp->item_table, item);
+
+      g_object_notify (G_OBJECT (item), "id");
+    }
+
+  if (private->tattoo == 0 || private->image != image)
+    {
+      private->tattoo = gimp_image_get_new_tattoo (image);
+    }
+
+  private->image = image;
+  g_object_notify (G_OBJECT (item), "image");
+
+  g_object_thaw_notify (G_OBJECT (item));
+}
+
+/**
+ * gimp_item_replace_item:
+ * @item: a newly allocated #GimpItem
+ * @replace: the #GimpItem to be replaced by @item
+ *
+ * This function shouly only be called right after @item has been
+ * newly allocated.
+ *
+ * Replaces @replace by @item, as far as possible within the #GimpItem
+ * class. The new @item takes over @replace's ID, tattoo, offset, size
+ * etc. and all these properties are set to %NULL on @replace.
+ *
+ * This function *only* exists to allow subclasses to do evil hacks
+ * like in XCF text layer loading. Don't ever use this function if you
+ * are not sure.
+ *
+ * After this function returns, @replace has become completely
+ * unusable, should only be used to steal everything it has (like its
+ * drawable properties if it's a drawable), and then be destroyed.
+ **/
+void
+gimp_item_replace_item (GimpItem *item,
+                        GimpItem *replace)
+{
+  GimpItemPrivate *private;
+  gint             offset_x;
+  gint             offset_y;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (! gimp_item_is_attached (item));
+  g_return_if_fail (! gimp_item_is_removed (item));
+  g_return_if_fail (GIMP_IS_ITEM (replace));
+
+  private = GET_PRIVATE (item);
+
+  gimp_object_set_name (GIMP_OBJECT (item), gimp_object_get_name (replace));
+
+  if (private->ID)
+    gimp_id_table_remove (gimp_item_get_image (item)->gimp->item_table,
+                          gimp_item_get_ID (item));
+
+  private->ID = gimp_item_get_ID (replace);
+  gimp_id_table_replace (gimp_item_get_image (item)->gimp->item_table,
+                         gimp_item_get_ID (item),
+                         item);
+
+  /* Set image before tattoo so that the explicitly set tattoo overrides
+   * the one implicitly set when setting the image
+   */
+  gimp_item_set_image (item, gimp_item_get_image (replace));
+  GET_PRIVATE (replace)->image  = NULL;
+
+  gimp_item_set_tattoo (item, gimp_item_get_tattoo (replace));
+  gimp_item_set_tattoo (replace, 0);
+
+  g_object_unref (private->parasites);
+  private->parasites = GET_PRIVATE (replace)->parasites;
+  GET_PRIVATE (replace)->parasites = NULL;
+
+  gimp_item_get_offset (replace, &offset_x, &offset_y);
+  gimp_item_set_offset (item, offset_x, offset_y);
+
+  gimp_item_set_size (item,
+                      gimp_item_get_width  (replace),
+                      gimp_item_get_height (replace));
+
+  gimp_item_set_visible       (item, gimp_item_get_visible (replace), FALSE);
+  gimp_item_set_linked        (item, gimp_item_get_linked (replace), FALSE);
+  gimp_item_set_color_tag     (item, gimp_item_get_color_tag (replace), FALSE);
+  gimp_item_set_lock_content  (item, gimp_item_get_lock_content (replace), FALSE);
+  gimp_item_set_lock_position (item, gimp_item_get_lock_position (replace), FALSE);
+}
+
+/**
+ * gimp_item_set_parasites:
+ * @item: a #GimpItem
+ * @parasites: a #GimpParasiteList
+ *
+ * Set an @item's #GimpParasiteList. It's usually never needed to
+ * fiddle with an item's parasite list directly. This function exists
+ * for special purposes only, like when creating items from unusual
+ * sources.
+ **/
+void
+gimp_item_set_parasites (GimpItem         *item,
+                         GimpParasiteList *parasites)
+{
+  GimpItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (GIMP_IS_PARASITE_LIST (parasites));
+
+  private = GET_PRIVATE (item);
+
+  g_set_object (&private->parasites, parasites);
+}
+
+/**
+ * gimp_item_get_parasites:
+ * @item: a #GimpItem
+ *
+ * Get an @item's #GimpParasiteList. It's usually never needed to
+ * fiddle with an item's parasite list directly. This function exists
+ * for special purposes only, like when saving an item to XCF.
+ *
+ * Return value: The @item's #GimpParasiteList.
+ **/
+GimpParasiteList *
+gimp_item_get_parasites (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  return GET_PRIVATE (item)->parasites;
+}
+
+gboolean
+gimp_item_parasite_validate (GimpItem            *item,
+                             const GimpParasite  *parasite,
+                             GError             **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (parasite != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return TRUE;
+}
+
+void
+gimp_item_parasite_attach (GimpItem           *item,
+                           const GimpParasite *parasite,
+                           gboolean            push_undo)
+{
+  GimpItemPrivate *private;
+  GimpParasite     copy;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (parasite != NULL);
+
+  private = GET_PRIVATE (item);
+
+  /*  make a temporary copy of the GimpParasite struct because
+   *  gimp_parasite_shift_parent() changes it
+   */
+  copy = *parasite;
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    {
+      /*  only set the dirty bit manually if we can be saved and the new
+       *  parasite differs from the current one and we aren't undoable
+       */
+      if (gimp_parasite_is_undoable (&copy))
+        {
+          /* do a group in case we have attach_parent set */
+          gimp_image_undo_group_start (private->image,
+                                       GIMP_UNDO_GROUP_PARASITE_ATTACH,
+                                       C_("undo-type", "Attach Parasite"));
+
+          gimp_image_undo_push_item_parasite (private->image, NULL, item, &copy);
+        }
+      else if (gimp_parasite_is_persistent (&copy) &&
+               ! gimp_parasite_compare (&copy,
+                                        gimp_item_parasite_find
+                                        (item, gimp_parasite_name (&copy))))
+        {
+          gimp_image_undo_push_cantundo (private->image,
+                                         C_("undo-type", "Attach Parasite to Item"));
+        }
+    }
+
+  gimp_parasite_list_add (private->parasites, &copy);
+
+  if (gimp_parasite_has_flag (&copy, GIMP_PARASITE_ATTACH_PARENT))
+    {
+      gimp_parasite_shift_parent (&copy);
+      gimp_image_parasite_attach (private->image, &copy, TRUE);
+    }
+  else if (gimp_parasite_has_flag (&copy, GIMP_PARASITE_ATTACH_GRANDPARENT))
+    {
+      gimp_parasite_shift_parent (&copy);
+      gimp_parasite_shift_parent (&copy);
+      gimp_parasite_attach (private->image->gimp, &copy);
+    }
+
+  if (gimp_item_is_attached (item) &&
+      gimp_parasite_is_undoable (&copy))
+    {
+      gimp_image_undo_group_end (private->image);
+    }
+}
+
+void
+gimp_item_parasite_detach (GimpItem    *item,
+                           const gchar *name,
+                           gboolean     push_undo)
+{
+  GimpItemPrivate    *private;
+  const GimpParasite *parasite;
+
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (name != NULL);
+
+  private = GET_PRIVATE (item);
+
+  parasite = gimp_parasite_list_find (private->parasites, name);
+
+  if (! parasite)
+    return;
+
+  if (! gimp_item_is_attached (item))
+    push_undo = FALSE;
+
+  if (push_undo)
+    {
+      if (gimp_parasite_is_undoable (parasite))
+        {
+          gimp_image_undo_push_item_parasite_remove (private->image,
+                                                     C_("undo-type", "Remove Parasite from Item"),
+                                                     item,
+                                                     gimp_parasite_name (parasite));
+        }
+      else if (gimp_parasite_is_persistent (parasite))
+        {
+          gimp_image_undo_push_cantundo (private->image,
+                                         C_("undo-type", "Remove Parasite from Item"));
+        }
+    }
+
+  gimp_parasite_list_remove (private->parasites, name);
+}
+
+const GimpParasite *
+gimp_item_parasite_find (GimpItem    *item,
+                         const gchar *name)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+
+  return gimp_parasite_list_find (GET_PRIVATE (item)->parasites, name);
+}
+
+static void
+gimp_item_parasite_list_foreach_func (gchar          *name,
+                                      GimpParasite   *parasite,
+                                      gchar        ***cur)
+{
+  *(*cur)++ = (gchar *) g_strdup (name);
+}
+
+gchar **
+gimp_item_parasite_list (GimpItem *item,
+                         gint     *count)
+{
+  GimpItemPrivate  *private;
+  gchar           **list;
+  gchar           **cur;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (count != NULL, NULL);
+
+  private = GET_PRIVATE (item);
+
+  *count = gimp_parasite_list_length (private->parasites);
+
+  cur = list = g_new (gchar *, *count);
+
+  gimp_parasite_list_foreach (private->parasites,
+                              (GHFunc) gimp_item_parasite_list_foreach_func,
+                              &cur);
+
+  return list;
+}
+
+void
+gimp_item_set_visible (GimpItem *item,
+                       gboolean  visible,
+                       gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  visible = visible ? TRUE : FALSE;
+
+  if (gimp_item_get_visible (item) != visible)
+    {
+      if (push_undo && gimp_item_is_attached (item))
+        {
+          GimpImage *image = gimp_item_get_image (item);
+
+          if (image)
+            gimp_image_undo_push_item_visibility (image, NULL, item);
+        }
+
+      GET_PRIVATE (item)->visible = visible;
+
+      if (GET_PRIVATE (item)->bind_visible_to_active)
+        gimp_filter_set_active (GIMP_FILTER (item), visible);
+
+      g_signal_emit (item, gimp_item_signals[VISIBILITY_CHANGED], 0);
+
+      g_object_notify (G_OBJECT (item), "visible");
+    }
+}
+
+gboolean
+gimp_item_get_visible (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GET_PRIVATE (item)->visible;
+}
+
+gboolean
+gimp_item_is_visible (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  if (gimp_item_get_visible (item))
+    {
+      GimpItem *parent;
+
+      parent = GIMP_ITEM (gimp_viewable_get_parent (GIMP_VIEWABLE (item)));
+
+      if (parent)
+        return gimp_item_is_visible (parent);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_item_bind_visible_to_active (GimpItem *item,
+                                  gboolean  bind)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  GET_PRIVATE (item)->bind_visible_to_active = bind;
+
+  if (bind)
+    gimp_filter_set_active (GIMP_FILTER (item), gimp_item_get_visible (item));
+}
+
+void
+gimp_item_set_linked (GimpItem *item,
+                      gboolean  linked,
+                      gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  linked = linked ? TRUE : FALSE;
+
+  if (gimp_item_get_linked (item) != linked)
+    {
+      GimpImage *image       = gimp_item_get_image (item);
+      gboolean   is_attached = gimp_item_is_attached (item);
+
+      if (push_undo && is_attached && image)
+        gimp_image_undo_push_item_linked (image, NULL, item);
+
+      GET_PRIVATE (item)->linked = linked;
+
+      g_signal_emit (item, gimp_item_signals[LINKED_CHANGED], 0);
+
+      if (is_attached && image)
+        gimp_image_linked_items_changed (image);
+
+      g_object_notify (G_OBJECT (item), "linked");
+    }
+}
+
+gboolean
+gimp_item_get_linked (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GET_PRIVATE (item)->linked;
+}
+
+void
+gimp_item_set_color_tag (GimpItem     *item,
+                         GimpColorTag  color_tag,
+                         gboolean      push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  if (gimp_item_get_color_tag (item) != color_tag)
+    {
+      if (push_undo && gimp_item_is_attached (item))
+        {
+          GimpImage *image = gimp_item_get_image (item);
+
+          if (image)
+            gimp_image_undo_push_item_color_tag (image, NULL, item);
+        }
+
+      GET_PRIVATE (item)->color_tag = color_tag;
+
+      g_signal_emit (item, gimp_item_signals[COLOR_TAG_CHANGED], 0);
+
+      g_object_notify (G_OBJECT (item), "color-tag");
+    }
+}
+
+GimpColorTag
+gimp_item_get_color_tag (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), GIMP_COLOR_TAG_NONE);
+
+  return GET_PRIVATE (item)->color_tag;
+}
+
+GimpColorTag
+gimp_item_get_merged_color_tag (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), GIMP_COLOR_TAG_NONE);
+
+  if (gimp_item_get_color_tag (item) == GIMP_COLOR_TAG_NONE)
+    {
+      GimpItem *parent;
+
+      parent = GIMP_ITEM (gimp_viewable_get_parent (GIMP_VIEWABLE (item)));
+
+      if (parent)
+        return gimp_item_get_merged_color_tag (parent);
+    }
+
+  return gimp_item_get_color_tag (item);
+}
+
+void
+gimp_item_set_lock_content (GimpItem *item,
+                            gboolean  lock_content,
+                            gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_can_lock_content (item));
+
+  lock_content = lock_content ? TRUE : FALSE;
+
+  if (gimp_item_get_lock_content (item) != lock_content)
+    {
+      if (push_undo && gimp_item_is_attached (item))
+        {
+          /* Right now I don't think this should be pushed. */
+#if 0
+          GimpImage *image = gimp_item_get_image (item);
+
+          gimp_image_undo_push_item_lock_content (image, NULL, item);
+#endif
+        }
+
+      GET_PRIVATE (item)->lock_content = lock_content;
+
+      g_signal_emit (item, gimp_item_signals[LOCK_CONTENT_CHANGED], 0);
+
+      g_object_notify (G_OBJECT (item), "lock-content");
+    }
+}
+
+gboolean
+gimp_item_get_lock_content (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GET_PRIVATE (item)->lock_content;
+}
+
+gboolean
+gimp_item_can_lock_content (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return TRUE;
+}
+
+gboolean
+gimp_item_is_content_locked (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GIMP_ITEM_GET_CLASS (item)->is_content_locked (item);
+}
+
+void
+gimp_item_set_lock_position (GimpItem *item,
+                             gboolean  lock_position,
+                             gboolean  push_undo)
+{
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_can_lock_position (item));
+
+  lock_position = lock_position ? TRUE : FALSE;
+
+  if (gimp_item_get_lock_position (item) != lock_position)
+    {
+      if (push_undo && gimp_item_is_attached (item))
+        {
+          GimpImage *image = gimp_item_get_image (item);
+
+          gimp_image_undo_push_item_lock_position (image, NULL, item);
+        }
+
+      GET_PRIVATE (item)->lock_position = lock_position;
+
+      g_signal_emit (item, gimp_item_signals[LOCK_POSITION_CHANGED], 0);
+
+      g_object_notify (G_OBJECT (item), "lock-position");
+    }
+}
+
+gboolean
+gimp_item_get_lock_position (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GET_PRIVATE (item)->lock_position;
+}
+
+gboolean
+gimp_item_can_lock_position (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (item)))
+    return FALSE;
+
+  return TRUE;
+}
+
+gboolean
+gimp_item_is_position_locked (GimpItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  return GIMP_ITEM_GET_CLASS (item)->is_position_locked (item);
+}
+
+gboolean
+gimp_item_mask_bounds (GimpItem *item,
+                       gint     *x1,
+                       gint     *y1,
+                       gint     *x2,
+                       gint     *y2)
+{
+  GimpImage   *image;
+  GimpChannel *selection;
+  gint         x, y, width, height;
+  gboolean     retval;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (item), FALSE);
+
+  image     = gimp_item_get_image (item);
+  selection = gimp_image_get_mask (image);
+
+  /* check for is_empty() before intersecting so we ignore the
+   * selection if it is suspended (like when stroking)
+   */
+  if (GIMP_ITEM (selection) != item       &&
+      ! gimp_channel_is_empty (selection) &&
+      gimp_item_bounds (GIMP_ITEM (selection), &x, &y, &width, &height))
+    {
+      gint off_x, off_y;
+      gint x2, y2;
+
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      x2 = x + width;
+      y2 = y + height;
+
+      x  = CLAMP (x  - off_x, 0, gimp_item_get_width  (item));
+      y  = CLAMP (y  - off_y, 0, gimp_item_get_height (item));
+      x2 = CLAMP (x2 - off_x, 0, gimp_item_get_width  (item));
+      y2 = CLAMP (y2 - off_y, 0, gimp_item_get_height (item));
+
+      width  = x2 - x;
+      height = y2 - y;
+
+      retval = TRUE;
+    }
+  else
+    {
+      x      = 0;
+      y      = 0;
+      width  = gimp_item_get_width  (item);
+      height = gimp_item_get_height (item);
+
+      retval = FALSE;
+    }
+
+  if (x1) *x1 = x;
+  if (y1) *y1 = y;
+  if (x2) *x2 = x + width;
+  if (y2) *y2 = y + height;
+
+  return retval;
+}
+
+/**
+ * gimp_item_mask_intersect:
+ * @item:   a #GimpItem
+ * @x:      return location for x
+ * @y:      return location for y
+ * @width:  return location for the width
+ * @height: return location for the height
+ *
+ * Intersect the area of the @item and its image's selection mask.
+ * The computed area is the bounding box of he selection within the
+ * item.
+ **/
+gboolean
+gimp_item_mask_intersect (GimpItem *item,
+                          gint     *x,
+                          gint     *y,
+                          gint     *width,
+                          gint     *height)
+{
+  GimpImage   *image;
+  GimpChannel *selection;
+  gint         tmp_x, tmp_y;
+  gint         tmp_width, tmp_height;
+  gboolean     retval;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (item), FALSE);
+
+  image     = gimp_item_get_image (item);
+  selection = gimp_image_get_mask (image);
+
+  /* check for is_empty() before intersecting so we ignore the
+   * selection if it is suspended (like when stroking)
+   */
+  if (GIMP_ITEM (selection) != item       &&
+      ! gimp_channel_is_empty (selection) &&
+      gimp_item_bounds (GIMP_ITEM (selection),
+                        &tmp_x, &tmp_y, &tmp_width, &tmp_height))
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      retval = gimp_rectangle_intersect (tmp_x - off_x, tmp_y - off_y,
+                                         tmp_width, tmp_height,
+                                         0, 0,
+                                         gimp_item_get_width  (item),
+                                         gimp_item_get_height (item),
+                                         &tmp_x, &tmp_y,
+                                         &tmp_width, &tmp_height);
+    }
+  else
+    {
+      tmp_x      = 0;
+      tmp_y      = 0;
+      tmp_width  = gimp_item_get_width  (item);
+      tmp_height = gimp_item_get_height (item);
+
+      retval = TRUE;
+    }
+
+  if (x)      *x      = tmp_x;
+  if (y)      *y      = tmp_y;
+  if (width)  *width  = tmp_width;
+  if (height) *height = tmp_height;
+
+  return retval;
+}
+
+gboolean
+gimp_item_is_in_set (GimpItem    *item,
+                     GimpItemSet  set)
+{
+  GimpItemPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+
+  private = GET_PRIVATE (item);
+
+  switch (set)
+    {
+    case GIMP_ITEM_SET_NONE:
+      return FALSE;
+
+    case GIMP_ITEM_SET_ALL:
+      return TRUE;
+
+    case GIMP_ITEM_SET_IMAGE_SIZED:
+      return (gimp_item_get_width  (item) == gimp_image_get_width  (private->image) &&
+              gimp_item_get_height (item) == gimp_image_get_height (private->image));
+
+    case GIMP_ITEM_SET_VISIBLE:
+      return gimp_item_get_visible (item);
+
+    case GIMP_ITEM_SET_LINKED:
+      return gimp_item_get_linked (item);
+    }
+
+  return FALSE;
+}
diff --git a/app/core/gimpitem.h b/app/core/gimpitem.h
new file mode 100644
index 0000000..6bc56e3
--- /dev/null
+++ b/app/core/gimpitem.h
@@ -0,0 +1,405 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_H__
+#define __GIMP_ITEM_H__
+
+
+#include "gimpfilter.h"
+
+
+#define GIMP_TYPE_ITEM            (gimp_item_get_type ())
+#define GIMP_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM, GimpItem))
+#define GIMP_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM, GimpItemClass))
+#define GIMP_IS_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM))
+#define GIMP_IS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM))
+#define GIMP_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ITEM, GimpItemClass))
+
+
+typedef struct _GimpItemClass GimpItemClass;
+
+struct _GimpItem
+{
+  GimpFilter  parent_instance;
+};
+
+struct _GimpItemClass
+{
+  GimpFilterClass  parent_class;
+
+  /*  signals  */
+  void            (* removed)               (GimpItem            *item);
+  void            (* visibility_changed)    (GimpItem            *item);
+  void            (* linked_changed)        (GimpItem            *item);
+  void            (* color_tag_changed)     (GimpItem            *item);
+  void            (* lock_content_changed)  (GimpItem            *item);
+  void            (* lock_position_changed) (GimpItem            *item);
+
+  /*  virtual functions  */
+  void            (* unset_removed)      (GimpItem               *item);
+  gboolean        (* is_attached)        (GimpItem               *item);
+  gboolean        (* is_content_locked)  (GimpItem               *item);
+  gboolean        (* is_position_locked) (GimpItem               *item);
+  GimpItemTree  * (* get_tree)           (GimpItem               *item);
+  gboolean        (* bounds)             (GimpItem               *item,
+                                          gdouble                *x,
+                                          gdouble                *y,
+                                          gdouble                *width,
+                                          gdouble                *height);
+  GimpItem      * (* duplicate)          (GimpItem               *item,
+                                          GType                   new_type);
+  void            (* convert)            (GimpItem               *item,
+                                          GimpImage              *dest_image,
+                                          GType                   old_type);
+  gboolean        (* rename)             (GimpItem               *item,
+                                          const gchar            *new_name,
+                                          const gchar            *undo_desc,
+                                          GError                **error);
+  void            (* start_move)         (GimpItem               *item,
+                                          gboolean                push_undo);
+  void            (* end_move)           (GimpItem               *item,
+                                          gboolean                push_undo);
+  void            (* start_transform)    (GimpItem               *item,
+                                          gboolean                push_undo);
+  void            (* end_transform)      (GimpItem               *item,
+                                          gboolean                push_undo);
+  void            (* translate)          (GimpItem               *item,
+                                          gdouble                 offset_x,
+                                          gdouble                 offset_y,
+                                          gboolean                push_undo);
+  void            (* scale)              (GimpItem               *item,
+                                          gint                    new_width,
+                                          gint                    new_height,
+                                          gint                    new_offset_x,
+                                          gint                    new_offset_y,
+                                          GimpInterpolationType   interpolation_type,
+                                          GimpProgress           *progress);
+  void            (* resize)             (GimpItem               *item,
+                                          GimpContext            *context,
+                                          GimpFillType            fill_type,
+                                          gint                    new_width,
+                                          gint                    new_height,
+                                          gint                    offset_x,
+                                          gint                    offset_y);
+  void            (* flip)               (GimpItem               *item,
+                                          GimpContext            *context,
+                                          GimpOrientationType     flip_type,
+                                          gdouble                 axis,
+                                          gboolean                clip_result);
+  void            (* rotate)             (GimpItem               *item,
+                                          GimpContext            *context,
+                                          GimpRotationType        rotate_type,
+                                          gdouble                 center_x,
+                                          gdouble                 center_y,
+                                          gboolean                clip_result);
+  void            (* transform)          (GimpItem               *item,
+                                          GimpContext            *context,
+                                          const GimpMatrix3      *matrix,
+                                          GimpTransformDirection  direction,
+                                          GimpInterpolationType   interpolation_type,
+                                          GimpTransformResize     clip_result,
+                                          GimpProgress           *progress);
+  GimpTransformResize (* get_clip)       (GimpItem               *item,
+                                          GimpTransformResize     clip_result);
+  gboolean        (* fill)               (GimpItem               *item,
+                                          GimpDrawable           *drawable,
+                                          GimpFillOptions        *fill_options,
+                                          gboolean                push_undo,
+                                          GimpProgress           *progress,
+                                          GError                **error);
+  gboolean        (* stroke)             (GimpItem               *item,
+                                          GimpDrawable           *drawable,
+                                          GimpStrokeOptions      *stroke_options,
+                                          gboolean                push_undo,
+                                          GimpProgress           *progress,
+                                          GError                **error);
+  void            (* to_selection)       (GimpItem               *item,
+                                          GimpChannelOps          op,
+                                          gboolean                antialias,
+                                          gboolean                feather,
+                                          gdouble                 feather_radius_x,
+                                          gdouble                 feather_radius_y);
+
+  const gchar *default_name;
+  const gchar *rename_desc;
+  const gchar *translate_desc;
+  const gchar *scale_desc;
+  const gchar *resize_desc;
+  const gchar *flip_desc;
+  const gchar *rotate_desc;
+  const gchar *transform_desc;
+  const gchar *to_selection_desc;
+  const gchar *fill_desc;
+  const gchar *stroke_desc;
+
+  const gchar *reorder_desc;
+  const gchar *raise_desc;
+  const gchar *raise_to_top_desc;
+  const gchar *lower_desc;
+  const gchar *lower_to_bottom_desc;
+
+  const gchar *raise_failed;
+  const gchar *lower_failed;
+};
+
+
+GType           gimp_item_get_type           (void) G_GNUC_CONST;
+
+GimpItem      * gimp_item_new                (GType               type,
+                                              GimpImage          *image,
+                                              const gchar        *name,
+                                              gint                offset_x,
+                                              gint                offset_y,
+                                              gint                width,
+                                              gint                height);
+
+void            gimp_item_removed            (GimpItem           *item);
+gboolean        gimp_item_is_removed         (GimpItem           *item);
+void            gimp_item_unset_removed      (GimpItem           *item);
+
+gboolean        gimp_item_is_attached        (GimpItem           *item);
+
+GimpItem      * gimp_item_get_parent         (GimpItem           *item);
+
+GimpItemTree  * gimp_item_get_tree           (GimpItem           *item);
+GimpContainer * gimp_item_get_container      (GimpItem           *item);
+GList         * gimp_item_get_container_iter (GimpItem           *item);
+gint            gimp_item_get_index          (GimpItem           *item);
+GList         * gimp_item_get_path           (GimpItem           *item);
+
+gboolean        gimp_item_bounds             (GimpItem           *item,
+                                              gint               *x,
+                                              gint               *y,
+                                              gint               *width,
+                                              gint               *height);
+gboolean        gimp_item_bounds_f           (GimpItem           *item,
+                                              gdouble            *x,
+                                              gdouble            *y,
+                                              gdouble            *width,
+                                              gdouble            *height);
+
+GimpItem      * gimp_item_duplicate          (GimpItem           *item,
+                                              GType               new_type);
+GimpItem      * gimp_item_convert            (GimpItem           *item,
+                                              GimpImage          *dest_image,
+                                              GType               new_type);
+
+gboolean        gimp_item_rename             (GimpItem           *item,
+                                              const gchar        *new_name,
+                                              GError            **error);
+
+gint            gimp_item_get_width          (GimpItem           *item);
+gint            gimp_item_get_height         (GimpItem           *item);
+void            gimp_item_set_size           (GimpItem           *item,
+                                              gint                width,
+                                              gint                height);
+
+void            gimp_item_get_offset         (GimpItem           *item,
+                                              gint               *offset_x,
+                                              gint               *offset_y);
+void            gimp_item_set_offset         (GimpItem           *item,
+                                              gint                offset_x,
+                                              gint                offset_y);
+gint            gimp_item_get_offset_x       (GimpItem           *item);
+gint            gimp_item_get_offset_y       (GimpItem           *item);
+
+void            gimp_item_start_move         (GimpItem           *item,
+                                              gboolean            push_undo);
+void            gimp_item_end_move           (GimpItem           *item,
+                                              gboolean            push_undo);
+
+void            gimp_item_start_transform    (GimpItem           *item,
+                                              gboolean            push_undo);
+void            gimp_item_end_transform      (GimpItem           *item,
+                                              gboolean            push_undo);
+
+void            gimp_item_translate          (GimpItem           *item,
+                                              gdouble             offset_x,
+                                              gdouble             offset_y,
+                                              gboolean            push_undo);
+
+gboolean        gimp_item_check_scaling      (GimpItem           *item,
+                                              gint                new_width,
+                                              gint                new_height);
+void            gimp_item_scale              (GimpItem           *item,
+                                              gint                new_width,
+                                              gint                new_height,
+                                              gint                new_offset_x,
+                                              gint                new_offset_y,
+                                              GimpInterpolationType interpolation,
+                                              GimpProgress       *progress);
+gboolean        gimp_item_scale_by_factors   (GimpItem           *item,
+                                              gdouble             w_factor,
+                                              gdouble             h_factor,
+                                              GimpInterpolationType interpolation,
+                                              GimpProgress       *progress);
+gboolean
+      gimp_item_scale_by_factors_with_origin (GimpItem           *item,
+                                              gdouble             w_factor,
+                                              gdouble             h_factor,
+                                              gint                origin_x,
+                                              gint                origin_y,
+                                              gint                new_origin_x,
+                                              gint                new_origin_y,
+                                              GimpInterpolationType interpolation,
+                                              GimpProgress       *progress);
+void            gimp_item_scale_by_origin    (GimpItem           *item,
+                                              gint                new_width,
+                                              gint                new_height,
+                                              GimpInterpolationType interpolation,
+                                              GimpProgress       *progress,
+                                              gboolean            local_origin);
+void            gimp_item_resize             (GimpItem           *item,
+                                              GimpContext        *context,
+                                              GimpFillType        fill_type,
+                                              gint                new_width,
+                                              gint                new_height,
+                                              gint                offset_x,
+                                              gint                offset_y);
+void            gimp_item_resize_to_image    (GimpItem           *item);
+
+void            gimp_item_flip               (GimpItem           *item,
+                                              GimpContext        *context,
+                                              GimpOrientationType flip_type,
+                                              gdouble             axis,
+                                              gboolean            clip_result);
+void            gimp_item_rotate             (GimpItem           *item,
+                                              GimpContext        *context,
+                                              GimpRotationType    rotate_type,
+                                              gdouble             center_x,
+                                              gdouble             center_y,
+                                              gboolean            clip_result);
+void            gimp_item_transform          (GimpItem           *item,
+                                              GimpContext        *context,
+                                              const GimpMatrix3  *matrix,
+                                              GimpTransformDirection direction,
+                                              GimpInterpolationType interpolation_type,
+                                              GimpTransformResize clip_result,
+                                              GimpProgress       *progress);
+GimpTransformResize   gimp_item_get_clip     (GimpItem           *item,
+                                              GimpTransformResize clip_result);
+
+gboolean        gimp_item_fill               (GimpItem           *item,
+                                              GimpDrawable       *drawable,
+                                              GimpFillOptions    *fill_options,
+                                              gboolean            push_undo,
+                                              GimpProgress       *progress,
+                                              GError            **error);
+gboolean        gimp_item_stroke             (GimpItem           *item,
+                                              GimpDrawable       *drawable,
+                                              GimpContext        *context,
+                                              GimpStrokeOptions  *stroke_options,
+                                              GimpPaintOptions   *paint_options,
+                                              gboolean            push_undo,
+                                              GimpProgress       *progress,
+                                              GError            **error);
+
+void            gimp_item_to_selection       (GimpItem           *item,
+                                              GimpChannelOps      op,
+                                              gboolean            antialias,
+                                              gboolean            feather,
+                                              gdouble             feather_radius_x,
+                                              gdouble             feather_radius_y);
+
+void            gimp_item_add_offset_node    (GimpItem           *item,
+                                              GeglNode           *node);
+void            gimp_item_remove_offset_node (GimpItem           *item,
+                                              GeglNode           *node);
+
+gint            gimp_item_get_ID             (GimpItem           *item);
+GimpItem      * gimp_item_get_by_ID          (Gimp               *gimp,
+                                              gint                id);
+
+GimpTattoo      gimp_item_get_tattoo         (GimpItem           *item);
+void            gimp_item_set_tattoo         (GimpItem           *item,
+                                              GimpTattoo          tattoo);
+
+GimpImage     * gimp_item_get_image          (GimpItem           *item);
+void            gimp_item_set_image          (GimpItem           *item,
+                                              GimpImage          *image);
+
+void            gimp_item_replace_item       (GimpItem           *item,
+                                              GimpItem           *replace);
+
+void               gimp_item_set_parasites   (GimpItem           *item,
+                                              GimpParasiteList   *parasites);
+GimpParasiteList * gimp_item_get_parasites   (GimpItem           *item);
+
+gboolean        gimp_item_parasite_validate  (GimpItem           *item,
+                                              const GimpParasite *parasite,
+                                              GError            **error);
+void            gimp_item_parasite_attach    (GimpItem           *item,
+                                              const GimpParasite *parasite,
+                                              gboolean            push_undo);
+void            gimp_item_parasite_detach    (GimpItem           *item,
+                                              const gchar        *name,
+                                              gboolean            push_undo);
+const GimpParasite * gimp_item_parasite_find (GimpItem           *item,
+                                              const gchar        *name);
+gchar        ** gimp_item_parasite_list      (GimpItem           *item,
+                                              gint               *count);
+
+void            gimp_item_set_visible        (GimpItem           *item,
+                                              gboolean            visible,
+                                              gboolean            push_undo);
+gboolean        gimp_item_get_visible        (GimpItem           *item);
+gboolean        gimp_item_is_visible         (GimpItem           *item);
+
+void        gimp_item_bind_visible_to_active (GimpItem           *item,
+                                              gboolean            bind);
+
+void            gimp_item_set_linked         (GimpItem           *item,
+                                              gboolean            linked,
+                                              gboolean            push_undo);
+gboolean        gimp_item_get_linked         (GimpItem           *item);
+
+void            gimp_item_set_color_tag      (GimpItem           *item,
+                                              GimpColorTag        color_tag,
+                                              gboolean            push_undo);
+GimpColorTag    gimp_item_get_color_tag      (GimpItem           *item);
+GimpColorTag  gimp_item_get_merged_color_tag (GimpItem           *item);
+
+void            gimp_item_set_lock_content   (GimpItem           *item,
+                                              gboolean            lock_content,
+                                              gboolean            push_undo);
+gboolean        gimp_item_get_lock_content   (GimpItem           *item);
+gboolean        gimp_item_can_lock_content   (GimpItem           *item);
+gboolean        gimp_item_is_content_locked  (GimpItem           *item);
+
+void            gimp_item_set_lock_position  (GimpItem          *item,
+                                              gboolean           lock_position,
+                                              gboolean           push_undo);
+gboolean        gimp_item_get_lock_position  (GimpItem          *item);
+gboolean        gimp_item_can_lock_position  (GimpItem          *item);
+gboolean        gimp_item_is_position_locked (GimpItem          *item);
+
+gboolean        gimp_item_mask_bounds        (GimpItem           *item,
+                                              gint               *x1,
+                                              gint               *y1,
+                                              gint               *x2,
+                                              gint               *y2);
+gboolean        gimp_item_mask_intersect     (GimpItem           *item,
+                                              gint               *x,
+                                              gint               *y,
+                                              gint               *width,
+                                              gint               *height);
+
+gboolean        gimp_item_is_in_set          (GimpItem           *item,
+                                              GimpItemSet         set);
+
+
+#endif /* __GIMP_ITEM_H__ */
diff --git a/app/core/gimpitempropundo.c b/app/core/gimpitempropundo.c
new file mode 100644
index 0000000..241b8aa
--- /dev/null
+++ b/app/core/gimpitempropundo.c
@@ -0,0 +1,358 @@
+/* Gimp - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpitem.h"
+#include "gimpitemtree.h"
+#include "gimpitempropundo.h"
+#include "gimpparasitelist.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PARASITE_NAME
+};
+
+
+static void     gimp_item_prop_undo_constructed  (GObject             *object);
+static void     gimp_item_prop_undo_set_property (GObject             *object,
+                                                  guint                property_id,
+                                                  const GValue        *value,
+                                                  GParamSpec          *pspec);
+static void     gimp_item_prop_undo_get_property (GObject             *object,
+                                                  guint                property_id,
+                                                  GValue              *value,
+                                                  GParamSpec          *pspec);
+
+static gint64   gimp_item_prop_undo_get_memsize  (GimpObject          *object,
+                                                  gint64              *gui_size);
+
+static void     gimp_item_prop_undo_pop          (GimpUndo            *undo,
+                                                  GimpUndoMode         undo_mode,
+                                                  GimpUndoAccumulator *accum);
+static void     gimp_item_prop_undo_free         (GimpUndo            *undo,
+                                                  GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpItemPropUndo, gimp_item_prop_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_item_prop_undo_parent_class
+
+
+static void
+gimp_item_prop_undo_class_init (GimpItemPropUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_item_prop_undo_constructed;
+  object_class->set_property     = gimp_item_prop_undo_set_property;
+  object_class->get_property     = gimp_item_prop_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_item_prop_undo_get_memsize;
+
+  undo_class->pop                = gimp_item_prop_undo_pop;
+  undo_class->free               = gimp_item_prop_undo_free;
+
+  g_object_class_install_property (object_class, PROP_PARASITE_NAME,
+                                   g_param_spec_string ("parasite-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_item_prop_undo_init (GimpItemPropUndo *undo)
+{
+}
+
+static void
+gimp_item_prop_undo_constructed (GObject *object)
+{
+  GimpItemPropUndo *item_prop_undo = GIMP_ITEM_PROP_UNDO (object);
+  GimpItem         *item;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  item = GIMP_ITEM_UNDO (object)->item;
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_ITEM_REORDER:
+      item_prop_undo->parent   = gimp_item_get_parent (item);
+      item_prop_undo->position = gimp_item_get_index (item);
+      break;
+
+    case GIMP_UNDO_ITEM_RENAME:
+      item_prop_undo->name = g_strdup (gimp_object_get_name (item));
+      break;
+
+    case GIMP_UNDO_ITEM_DISPLACE:
+      gimp_item_get_offset (item,
+                            &item_prop_undo->offset_x,
+                            &item_prop_undo->offset_y);
+      break;
+
+    case GIMP_UNDO_ITEM_VISIBILITY:
+      item_prop_undo->visible = gimp_item_get_visible (item);
+      break;
+
+    case GIMP_UNDO_ITEM_LINKED:
+      item_prop_undo->linked = gimp_item_get_linked (item);
+      break;
+
+    case GIMP_UNDO_ITEM_COLOR_TAG:
+      item_prop_undo->color_tag = gimp_item_get_color_tag (item);
+      break;
+
+    case GIMP_UNDO_ITEM_LOCK_CONTENT:
+      item_prop_undo->lock_content = gimp_item_get_lock_content (item);
+      break;
+
+    case GIMP_UNDO_ITEM_LOCK_POSITION:
+      item_prop_undo->lock_position = gimp_item_get_lock_position (item);
+      break;
+
+    case GIMP_UNDO_PARASITE_ATTACH:
+    case GIMP_UNDO_PARASITE_REMOVE:
+      gimp_assert (item_prop_undo->parasite_name != NULL);
+
+      item_prop_undo->parasite = gimp_parasite_copy
+        (gimp_item_parasite_find (item, item_prop_undo->parasite_name));
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_item_prop_undo_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpItemPropUndo *item_prop_undo = GIMP_ITEM_PROP_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PARASITE_NAME:
+      item_prop_undo->parasite_name = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_item_prop_undo_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpItemPropUndo *item_prop_undo = GIMP_ITEM_PROP_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PARASITE_NAME:
+      g_value_set_string (value, item_prop_undo->parasite_name);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_item_prop_undo_get_memsize (GimpObject *object,
+                                 gint64     *gui_size)
+{
+  GimpItemPropUndo *item_prop_undo = GIMP_ITEM_PROP_UNDO (object);
+  gint64            memsize        = 0;
+
+  memsize += gimp_string_get_memsize (item_prop_undo->name);
+  memsize += gimp_string_get_memsize (item_prop_undo->parasite_name);
+  memsize += gimp_parasite_get_memsize (item_prop_undo->parasite, NULL);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_item_prop_undo_pop (GimpUndo            *undo,
+                         GimpUndoMode         undo_mode,
+                         GimpUndoAccumulator *accum)
+{
+  GimpItemPropUndo *item_prop_undo = GIMP_ITEM_PROP_UNDO (undo);
+  GimpItem         *item           = GIMP_ITEM_UNDO (undo)->item;
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_ITEM_REORDER:
+      {
+        GimpItem *parent;
+        gint      position;
+
+        parent   = gimp_item_get_parent (item);
+        position = gimp_item_get_index (item);
+
+        gimp_item_tree_reorder_item (gimp_item_get_tree (item), item,
+                                     item_prop_undo->parent,
+                                     item_prop_undo->position,
+                                     FALSE, NULL);
+
+        item_prop_undo->parent   = parent;
+        item_prop_undo->position = position;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_RENAME:
+      {
+        gchar *name;
+
+        name = g_strdup (gimp_object_get_name (item));
+
+        gimp_item_tree_rename_item (gimp_item_get_tree (item), item,
+                                    item_prop_undo->name,
+                                    FALSE, NULL);
+
+        g_free (item_prop_undo->name);
+        item_prop_undo->name = name;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_DISPLACE:
+      {
+        gint offset_x;
+        gint offset_y;
+
+        gimp_item_get_offset (item, &offset_x, &offset_y);
+
+        gimp_item_translate (item,
+                             item_prop_undo->offset_x - offset_x,
+                             item_prop_undo->offset_y - offset_y,
+                             FALSE);
+
+        item_prop_undo->offset_x = offset_x;
+        item_prop_undo->offset_y = offset_y;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_VISIBILITY:
+      {
+        gboolean visible;
+
+        visible = gimp_item_get_visible (item);
+        gimp_item_set_visible (item, item_prop_undo->visible, FALSE);
+        item_prop_undo->visible = visible;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_LINKED:
+      {
+        gboolean linked;
+
+        linked = gimp_item_get_linked (item);
+        gimp_item_set_linked (item, item_prop_undo->linked, FALSE);
+        item_prop_undo->linked = linked;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_COLOR_TAG:
+      {
+        GimpColorTag color_tag;
+
+        color_tag = gimp_item_get_color_tag (item);
+        gimp_item_set_color_tag (item, item_prop_undo->color_tag, FALSE);
+        item_prop_undo->color_tag = color_tag;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_LOCK_CONTENT:
+      {
+        gboolean lock_content;
+
+        lock_content = gimp_item_get_lock_content (item);
+        gimp_item_set_lock_content (item, item_prop_undo->lock_content, FALSE);
+        item_prop_undo->lock_content = lock_content;
+      }
+      break;
+
+    case GIMP_UNDO_ITEM_LOCK_POSITION:
+      {
+        gboolean lock_position;
+
+        lock_position = gimp_item_get_lock_position (item);
+        gimp_item_set_lock_position (item, item_prop_undo->lock_position, FALSE);
+        item_prop_undo->lock_position = lock_position;
+      }
+      break;
+
+    case GIMP_UNDO_PARASITE_ATTACH:
+    case GIMP_UNDO_PARASITE_REMOVE:
+      {
+        GimpParasite *parasite;
+
+        parasite = item_prop_undo->parasite;
+
+        item_prop_undo->parasite = gimp_parasite_copy
+          (gimp_item_parasite_find (item, item_prop_undo->parasite_name));
+
+        if (parasite)
+          gimp_item_parasite_attach (item, parasite, FALSE);
+        else
+          gimp_item_parasite_detach (item, item_prop_undo->parasite_name, FALSE);
+
+        if (parasite)
+          gimp_parasite_free (parasite);
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_item_prop_undo_free (GimpUndo     *undo,
+                          GimpUndoMode  undo_mode)
+{
+  GimpItemPropUndo *item_prop_undo = GIMP_ITEM_PROP_UNDO (undo);
+
+  g_clear_pointer (&item_prop_undo->name,          g_free);
+  g_clear_pointer (&item_prop_undo->parasite_name, g_free);
+  g_clear_pointer (&item_prop_undo->parasite,      gimp_parasite_free);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpitempropundo.h b/app/core/gimpitempropundo.h
new file mode 100644
index 0000000..8f96e46
--- /dev/null
+++ b/app/core/gimpitempropundo.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_PROP_UNDO_H__
+#define __GIMP_ITEM_PROP_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_ITEM_PROP_UNDO            (gimp_item_prop_undo_get_type ())
+#define GIMP_ITEM_PROP_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM_PROP_UNDO, GimpItemPropUndo))
+#define GIMP_ITEM_PROP_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM_PROP_UNDO, GimpItemPropUndoClass))
+#define GIMP_IS_ITEM_PROP_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM_PROP_UNDO))
+#define GIMP_IS_ITEM_PROP_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM_PROP_UNDO))
+#define GIMP_ITEM_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ITEM_PROP_UNDO, GimpItemPropUndoClass))
+
+
+typedef struct _GimpItemPropUndo      GimpItemPropUndo;
+typedef struct _GimpItemPropUndoClass GimpItemPropUndoClass;
+
+struct _GimpItemPropUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpItem     *parent;
+  gint          position;
+  gchar        *name;
+  gint          offset_x;
+  gint          offset_y;
+  guint         visible       : 1;
+  guint         linked        : 1;
+  guint         lock_content  : 1;
+  guint         lock_position : 1;
+  GimpColorTag  color_tag;
+  gchar        *parasite_name;
+  GimpParasite *parasite;
+};
+
+struct _GimpItemPropUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_item_prop_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_ITEM_PROP_UNDO_H__ */
diff --git a/app/core/gimpitemstack.c b/app/core/gimpitemstack.c
new file mode 100644
index 0000000..c7f2fe1
--- /dev/null
+++ b/app/core/gimpitemstack.c
@@ -0,0 +1,348 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemstack.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimpitem.h"
+#include "gimpitemstack.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_item_stack_constructed (GObject       *object);
+
+static void   gimp_item_stack_add         (GimpContainer *container,
+                                           GimpObject    *object);
+static void   gimp_item_stack_remove      (GimpContainer *container,
+                                           GimpObject    *object);
+
+
+G_DEFINE_TYPE (GimpItemStack, gimp_item_stack, GIMP_TYPE_FILTER_STACK)
+
+#define parent_class gimp_item_stack_parent_class
+
+
+static void
+gimp_item_stack_class_init (GimpItemStackClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GimpContainerClass *container_class = GIMP_CONTAINER_CLASS (klass);
+
+  object_class->constructed = gimp_item_stack_constructed;
+
+  container_class->add      = gimp_item_stack_add;
+  container_class->remove   = gimp_item_stack_remove;
+}
+
+static void
+gimp_item_stack_init (GimpItemStack *stack)
+{
+}
+
+static void
+gimp_item_stack_constructed (GObject *object)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+                         GIMP_TYPE_ITEM));
+}
+
+static void
+gimp_item_stack_add (GimpContainer *container,
+                     GimpObject    *object)
+{
+  g_object_ref_sink (object);
+
+  GIMP_CONTAINER_CLASS (parent_class)->add (container, object);
+
+  g_object_unref (object);
+}
+
+static void
+gimp_item_stack_remove (GimpContainer *container,
+                        GimpObject    *object)
+{
+  GIMP_CONTAINER_CLASS (parent_class)->remove (container, object);
+}
+
+
+/*  public functions  */
+
+GimpContainer *
+gimp_item_stack_new (GType item_type)
+{
+  g_return_val_if_fail (g_type_is_a (item_type, GIMP_TYPE_ITEM), NULL);
+
+  return g_object_new (GIMP_TYPE_ITEM_STACK,
+                       "name",          g_type_name (item_type),
+                       "children-type", item_type,
+                       "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                       NULL);
+}
+
+gint
+gimp_item_stack_get_n_items (GimpItemStack *stack)
+{
+  GList *list;
+  gint   n_items = 0;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), 0);
+
+  for (list = GIMP_LIST (stack)->queue->head; list; list = g_list_next (list))
+    {
+      GimpItem      *item = list->data;
+      GimpContainer *children;
+
+      n_items++;
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+      if (children)
+        n_items += gimp_item_stack_get_n_items (GIMP_ITEM_STACK (children));
+    }
+
+  return n_items;
+}
+
+gboolean
+gimp_item_stack_is_flat (GimpItemStack *stack)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), TRUE);
+
+  for (list = GIMP_LIST (stack)->queue->head; list; list = g_list_next (list))
+    {
+      GimpViewable *viewable = list->data;
+
+      if (gimp_viewable_get_children (viewable))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+GList *
+gimp_item_stack_get_item_iter (GimpItemStack *stack)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), NULL);
+
+  return GIMP_LIST (stack)->queue->head;
+}
+
+GList *
+gimp_item_stack_get_item_list (GimpItemStack *stack)
+{
+  GList *list;
+  GList *result = NULL;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), NULL);
+
+  for (list = GIMP_LIST (stack)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpViewable  *viewable = list->data;
+      GimpContainer *children;
+
+      result = g_list_prepend (result, viewable);
+
+      children = gimp_viewable_get_children (viewable);
+
+      if (children)
+        {
+          GList *child_list;
+
+          child_list = gimp_item_stack_get_item_list (GIMP_ITEM_STACK (children));
+
+          while (child_list)
+            {
+              result = g_list_prepend (result, child_list->data);
+
+              child_list = g_list_remove (child_list, child_list->data);
+            }
+        }
+    }
+
+  return g_list_reverse (result);
+}
+
+GimpItem *
+gimp_item_stack_get_item_by_tattoo (GimpItemStack *stack,
+                                    GimpTattoo     tattoo)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), NULL);
+
+  for (list = GIMP_LIST (stack)->queue->head; list; list = g_list_next (list))
+    {
+      GimpItem      *item = list->data;
+      GimpContainer *children;
+
+      if (gimp_item_get_tattoo (item) == tattoo)
+        return item;
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+      if (children)
+        {
+          item = gimp_item_stack_get_item_by_tattoo (GIMP_ITEM_STACK (children),
+                                                     tattoo);
+
+          if (item)
+            return item;
+        }
+    }
+
+  return NULL;
+}
+
+GimpItem *
+gimp_item_stack_get_item_by_path (GimpItemStack *stack,
+                                  GList         *path)
+{
+  GimpContainer *container;
+  GimpItem      *item = NULL;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), NULL);
+  g_return_val_if_fail (path != NULL, NULL);
+
+  container = GIMP_CONTAINER (stack);
+
+  while (path)
+    {
+      guint32 i = GPOINTER_TO_UINT (path->data);
+
+      item = GIMP_ITEM (gimp_container_get_child_by_index (container, i));
+
+      g_return_val_if_fail (GIMP_IS_ITEM (item), item);
+
+      if (path->next)
+        {
+          container = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+          g_return_val_if_fail (GIMP_IS_ITEM_STACK (container), item);
+        }
+
+      path = path->next;
+    }
+
+  return item;
+}
+
+GimpItem *
+gimp_item_stack_get_parent_by_path (GimpItemStack *stack,
+                                    GList         *path,
+                                    gint          *index)
+{
+  GimpItem *parent = NULL;
+  guint32   i;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_STACK (stack), NULL);
+  g_return_val_if_fail (path != NULL, NULL);
+
+  i = GPOINTER_TO_UINT (path->data);
+
+  if (index)
+    *index = i;
+
+  while (path->next)
+    {
+      GimpObject    *child;
+      GimpContainer *children;
+
+      child = gimp_container_get_child_by_index (GIMP_CONTAINER (stack), i);
+
+      g_return_val_if_fail (GIMP_IS_ITEM (child), parent);
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (child));
+
+      g_return_val_if_fail (GIMP_IS_ITEM_STACK (children), parent);
+
+      parent = GIMP_ITEM (child);
+      stack  = GIMP_ITEM_STACK (children);
+
+      path = path->next;
+
+      i = GPOINTER_TO_UINT (path->data);
+
+      if (index)
+        *index = i;
+    }
+
+  return parent;
+}
+
+static void
+gimp_item_stack_viewable_invalidate_previews (GimpViewable *viewable)
+{
+  GimpContainer *children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    gimp_item_stack_invalidate_previews (GIMP_ITEM_STACK (children));
+
+  gimp_viewable_invalidate_preview (viewable);
+}
+
+void
+gimp_item_stack_invalidate_previews (GimpItemStack *stack)
+{
+  g_return_if_fail (GIMP_IS_ITEM_STACK (stack));
+
+  gimp_container_foreach (GIMP_CONTAINER (stack),
+                          (GFunc) gimp_item_stack_viewable_invalidate_previews,
+                          NULL);
+}
+
+static void
+gimp_item_stack_viewable_profile_changed (GimpViewable *viewable)
+{
+  GimpContainer *children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    gimp_item_stack_profile_changed (GIMP_ITEM_STACK (children));
+
+  if (GIMP_IS_COLOR_MANAGED (viewable))
+    gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (viewable));
+}
+
+void
+gimp_item_stack_profile_changed (GimpItemStack *stack)
+{
+  g_return_if_fail (GIMP_IS_ITEM_STACK (stack));
+
+  gimp_container_foreach (GIMP_CONTAINER (stack),
+                          (GFunc) gimp_item_stack_viewable_profile_changed,
+                          NULL);
+}
diff --git a/app/core/gimpitemstack.h b/app/core/gimpitemstack.h
new file mode 100644
index 0000000..b476076
--- /dev/null
+++ b/app/core/gimpitemstack.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemstack.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_STACK_H__
+#define __GIMP_ITEM_STACK_H__
+
+#include "gimpfilterstack.h"
+
+
+#define GIMP_TYPE_ITEM_STACK            (gimp_item_stack_get_type ())
+#define GIMP_ITEM_STACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM_STACK, GimpItemStack))
+#define GIMP_ITEM_STACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM_STACK, GimpItemStackClass))
+#define GIMP_IS_ITEM_STACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM_STACK))
+#define GIMP_IS_ITEM_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM_STACK))
+
+
+typedef struct _GimpItemStackClass GimpItemStackClass;
+
+struct _GimpItemStack
+{
+  GimpFilterStack  parent_instance;
+};
+
+struct _GimpItemStackClass
+{
+  GimpFilterStackClass  parent_class;
+};
+
+
+GType           gimp_item_stack_get_type            (void) G_GNUC_CONST;
+GimpContainer * gimp_item_stack_new                 (GType          item_type);
+
+gint            gimp_item_stack_get_n_items         (GimpItemStack *stack);
+gboolean        gimp_item_stack_is_flat             (GimpItemStack *stack);
+GList         * gimp_item_stack_get_item_iter       (GimpItemStack *stack);
+GList         * gimp_item_stack_get_item_list       (GimpItemStack *stack);
+GimpItem      * gimp_item_stack_get_item_by_tattoo  (GimpItemStack *stack,
+                                                     GimpTattoo     tattoo);
+GimpItem      * gimp_item_stack_get_item_by_path    (GimpItemStack *stack,
+                                                     GList         *path);
+GimpItem      * gimp_item_stack_get_parent_by_path  (GimpItemStack *stack,
+                                                     GList         *path,
+                                                     gint          *index);
+
+void            gimp_item_stack_invalidate_previews (GimpItemStack *stack);
+void            gimp_item_stack_profile_changed     (GimpItemStack *stack);
+
+
+#endif  /*  __GIMP_ITEM_STACK_H__  */
diff --git a/app/core/gimpitemtree.c b/app/core/gimpitemtree.c
new file mode 100644
index 0000000..7746afa
--- /dev/null
+++ b/app/core/gimpitemtree.c
@@ -0,0 +1,714 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemtree.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpimage-undo-push.h"
+#include "gimpitem.h"
+#include "gimpitemstack.h"
+#include "gimpitemtree.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE,
+  PROP_CONTAINER_TYPE,
+  PROP_ITEM_TYPE,
+  PROP_ACTIVE_ITEM
+};
+
+
+typedef struct _GimpItemTreePrivate GimpItemTreePrivate;
+
+struct _GimpItemTreePrivate
+{
+  GimpImage  *image;
+
+  GType       container_type;
+  GType       item_type;
+
+  GimpItem   *active_item;
+
+  GHashTable *name_hash;
+};
+
+#define GIMP_ITEM_TREE_GET_PRIVATE(object) \
+        ((GimpItemTreePrivate *) gimp_item_tree_get_instance_private ((GimpItemTree *) (object)))
+
+
+/*  local function prototypes  */
+
+static void     gimp_item_tree_constructed   (GObject      *object);
+static void     gimp_item_tree_dispose       (GObject      *object);
+static void     gimp_item_tree_finalize      (GObject      *object);
+static void     gimp_item_tree_set_property  (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+static void     gimp_item_tree_get_property  (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+
+static gint64   gimp_item_tree_get_memsize   (GimpObject   *object,
+                                              gint64       *gui_size);
+
+static void     gimp_item_tree_uniquefy_name (GimpItemTree *tree,
+                                              GimpItem     *item,
+                                              const gchar  *new_name);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpItemTree, gimp_item_tree, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_item_tree_parent_class
+
+
+static void
+gimp_item_tree_class_init (GimpItemTreeClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->constructed      = gimp_item_tree_constructed;
+  object_class->dispose          = gimp_item_tree_dispose;
+  object_class->finalize         = gimp_item_tree_finalize;
+  object_class->set_property     = gimp_item_tree_set_property;
+  object_class->get_property     = gimp_item_tree_get_property;
+
+  gimp_object_class->get_memsize = gimp_item_tree_get_memsize;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONTAINER_TYPE,
+                                   g_param_spec_gtype ("container-type",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_ITEM_STACK,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ITEM_TYPE,
+                                   g_param_spec_gtype ("item-type",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_ITEM,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ACTIVE_ITEM,
+                                   g_param_spec_object ("active-item",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_ITEM,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_item_tree_init (GimpItemTree *tree)
+{
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  private->name_hash = g_hash_table_new (g_str_hash, g_str_equal);
+}
+
+static void
+gimp_item_tree_constructed (GObject *object)
+{
+  GimpItemTree        *tree    = GIMP_ITEM_TREE (object);
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_IMAGE (private->image));
+  gimp_assert (g_type_is_a (private->container_type, GIMP_TYPE_ITEM_STACK));
+  gimp_assert (g_type_is_a (private->item_type,      GIMP_TYPE_ITEM));
+  gimp_assert (private->item_type != GIMP_TYPE_ITEM);
+
+  tree->container = g_object_new (private->container_type,
+                                  "name",          g_type_name (private->item_type),
+                                  "children-type", private->item_type,
+                                  "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                                  NULL);
+}
+
+static void
+gimp_item_tree_dispose (GObject *object)
+{
+  GimpItemTree        *tree    = GIMP_ITEM_TREE (object);
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  gimp_item_tree_set_active_item (tree, NULL);
+
+  gimp_container_foreach (tree->container,
+                          (GFunc) gimp_item_removed, NULL);
+
+  gimp_container_clear (tree->container);
+  g_hash_table_remove_all (private->name_hash);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_item_tree_finalize (GObject *object)
+{
+  GimpItemTree        *tree    = GIMP_ITEM_TREE (object);
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_clear_pointer (&private->name_hash, g_hash_table_unref);
+  g_clear_object (&tree->container);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_item_tree_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      private->image = g_value_get_object (value); /* don't ref */
+      break;
+    case PROP_CONTAINER_TYPE:
+      private->container_type = g_value_get_gtype (value);
+      break;
+    case PROP_ITEM_TYPE:
+      private->item_type = g_value_get_gtype (value);
+      break;
+    case PROP_ACTIVE_ITEM:
+      private->active_item = g_value_get_object (value); /* don't ref */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_item_tree_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, private->image);
+      break;
+    case PROP_CONTAINER_TYPE:
+      g_value_set_gtype (value, private->container_type);
+      break;
+    case PROP_ITEM_TYPE:
+      g_value_set_gtype (value, private->item_type);
+      break;
+    case PROP_ACTIVE_ITEM:
+      g_value_set_object (value, private->active_item);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_item_tree_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpItemTree *tree    = GIMP_ITEM_TREE (object);
+  gint64        memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (tree->container), gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+
+/*  public functions  */
+
+GimpItemTree *
+gimp_item_tree_new (GimpImage *image,
+                    GType      container_type,
+                    GType      item_type)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (g_type_is_a (container_type, GIMP_TYPE_ITEM_STACK), NULL);
+  g_return_val_if_fail (g_type_is_a (item_type, GIMP_TYPE_ITEM), NULL);
+
+  return g_object_new (GIMP_TYPE_ITEM_TREE,
+                       "image",          image,
+                       "container-type", container_type,
+                       "item-type",      item_type,
+                       NULL);
+}
+
+GimpItem *
+gimp_item_tree_get_active_item (GimpItemTree *tree)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE (tree), NULL);
+
+  return GIMP_ITEM_TREE_GET_PRIVATE (tree)->active_item;
+}
+
+void
+gimp_item_tree_set_active_item (GimpItemTree *tree,
+                                GimpItem     *item)
+{
+  GimpItemTreePrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM_TREE (tree));
+
+  private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_return_if_fail (item == NULL ||
+                    G_TYPE_CHECK_INSTANCE_TYPE (item, private->item_type));
+  g_return_if_fail (item == NULL || gimp_item_get_tree (item) == tree);
+
+  if (item != private->active_item)
+    {
+      private->active_item = item;
+
+      g_object_notify (G_OBJECT (tree), "active-item");
+    }
+}
+
+GimpItem *
+gimp_item_tree_get_item_by_name (GimpItemTree *tree,
+                                 const gchar  *name)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE (tree), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_hash_table_lookup (GIMP_ITEM_TREE_GET_PRIVATE (tree)->name_hash,
+                              name);
+}
+
+gboolean
+gimp_item_tree_get_insert_pos (GimpItemTree  *tree,
+                               GimpItem      *item,
+                               GimpItem     **parent,
+                               gint          *position)
+{
+  GimpItemTreePrivate *private;
+  GimpContainer       *container;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE (tree), FALSE);
+  g_return_val_if_fail (parent != NULL, FALSE);
+
+  private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (item, private->item_type),
+                        FALSE);
+  g_return_val_if_fail (! gimp_item_is_attached (item), FALSE);
+  g_return_val_if_fail (gimp_item_get_image (item) == private->image, FALSE);
+  g_return_val_if_fail (*parent == NULL ||
+                        *parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        G_TYPE_CHECK_INSTANCE_TYPE (*parent, private->item_type),
+                        FALSE);
+  g_return_val_if_fail (*parent == NULL ||
+                        *parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_item_get_tree (*parent) == tree, FALSE);
+  g_return_val_if_fail (*parent == NULL ||
+                        *parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_viewable_get_children (GIMP_VIEWABLE (*parent)),
+                        FALSE);
+  g_return_val_if_fail (position != NULL, FALSE);
+
+  /*  if we want to insert in the active item's parent container  */
+  if (*parent == GIMP_IMAGE_ACTIVE_PARENT)
+    {
+      if (private->active_item)
+        {
+          /*  if the active item is a branch, add to the top of that
+           *  branch; add to the active item's parent container
+           *  otherwise
+           */
+          if (gimp_viewable_get_children (GIMP_VIEWABLE (private->active_item)))
+            {
+              *parent   = private->active_item;
+              *position = 0;
+            }
+          else
+            {
+              *parent = gimp_item_get_parent (private->active_item);
+            }
+        }
+      else
+        {
+          /*  use the toplevel container if there is no active item  */
+          *parent = NULL;
+        }
+    }
+
+  if (*parent)
+    container = gimp_viewable_get_children (GIMP_VIEWABLE (*parent));
+  else
+    container = tree->container;
+
+  /*  if we want to add on top of the active item  */
+  if (*position == -1)
+    {
+      if (private->active_item)
+        *position =
+          gimp_container_get_child_index (container,
+                                          GIMP_OBJECT (private->active_item));
+
+      /*  if the active item is not in the specified parent container,
+       *  fall back to index 0
+       */
+      if (*position == -1)
+        *position = 0;
+    }
+
+  /*  don't add at a non-existing index  */
+  *position = CLAMP (*position, 0, gimp_container_get_n_children (container));
+
+  return TRUE;
+}
+
+void
+gimp_item_tree_add_item (GimpItemTree *tree,
+                         GimpItem     *item,
+                         GimpItem     *parent,
+                         gint          position)
+{
+  GimpItemTreePrivate *private;
+  GimpContainer       *container;
+  GimpContainer       *children;
+
+  g_return_if_fail (GIMP_IS_ITEM_TREE (tree));
+
+  private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (item, private->item_type));
+  g_return_if_fail (! gimp_item_is_attached (item));
+  g_return_if_fail (gimp_item_get_image (item) == private->image);
+  g_return_if_fail (parent == NULL ||
+                    G_TYPE_CHECK_INSTANCE_TYPE (parent, private->item_type));
+  g_return_if_fail (parent == NULL || gimp_item_get_tree (parent) == tree);
+  g_return_if_fail (parent == NULL ||
+                    gimp_viewable_get_children (GIMP_VIEWABLE (parent)));
+
+  gimp_item_tree_uniquefy_name (tree, item, NULL);
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+  if (children)
+    {
+      GList *list = gimp_item_stack_get_item_list (GIMP_ITEM_STACK (children));
+
+      while (list)
+        {
+          gimp_item_tree_uniquefy_name (tree, list->data, NULL);
+
+          list = g_list_remove (list, list->data);
+        }
+    }
+
+  if (parent)
+    container = gimp_viewable_get_children (GIMP_VIEWABLE (parent));
+  else
+    container = tree->container;
+
+  if (parent)
+    gimp_viewable_set_parent (GIMP_VIEWABLE (item),
+                              GIMP_VIEWABLE (parent));
+
+  gimp_container_insert (container, GIMP_OBJECT (item), position);
+
+  /*  if the item came from the undo stack, reset its "removed" state  */
+  if (gimp_item_is_removed (item))
+    gimp_item_unset_removed (item);
+}
+
+GimpItem *
+gimp_item_tree_remove_item (GimpItemTree *tree,
+                            GimpItem     *item,
+                            GimpItem     *new_active)
+{
+  GimpItemTreePrivate *private;
+  GimpItem            *parent;
+  GimpContainer       *container;
+  GimpContainer       *children;
+  gint                 index;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE (tree), NULL);
+
+  private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (item, private->item_type),
+                        NULL);
+  g_return_val_if_fail (gimp_item_get_tree (item) == tree, NULL);
+
+  parent    = gimp_item_get_parent (item);
+  container = gimp_item_get_container (item);
+  index     = gimp_item_get_index (item);
+
+  g_object_ref (item);
+
+  g_hash_table_remove (private->name_hash,
+                       gimp_object_get_name (item));
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+  if (children)
+    {
+      GList *list = gimp_item_stack_get_item_list (GIMP_ITEM_STACK (children));
+
+      while (list)
+        {
+          g_hash_table_remove (private->name_hash,
+                               gimp_object_get_name (list->data));
+
+          list = g_list_remove (list, list->data);
+        }
+    }
+
+  gimp_container_remove (container, GIMP_OBJECT (item));
+
+  if (parent)
+    gimp_viewable_set_parent (GIMP_VIEWABLE (item), NULL);
+
+  gimp_item_removed (item);
+
+  if (! new_active)
+    {
+      gint n_children = gimp_container_get_n_children (container);
+
+      if (n_children > 0)
+        {
+          index = CLAMP (index, 0, n_children - 1);
+
+          new_active =
+            GIMP_ITEM (gimp_container_get_child_by_index (container, index));
+        }
+      else if (parent)
+        {
+          new_active = parent;
+        }
+    }
+
+  g_object_unref (item);
+
+  return new_active;
+}
+
+gboolean
+gimp_item_tree_reorder_item (GimpItemTree *tree,
+                             GimpItem     *item,
+                             GimpItem     *new_parent,
+                             gint          new_index,
+                             gboolean      push_undo,
+                             const gchar  *undo_desc)
+{
+  GimpItemTreePrivate *private;
+  GimpContainer       *container;
+  GimpContainer       *new_container;
+  gint                 n_items;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE (tree), FALSE);
+
+  private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (item, private->item_type),
+                        FALSE);
+  g_return_val_if_fail (gimp_item_get_tree (item) == tree, FALSE);
+  g_return_val_if_fail (new_parent == NULL ||
+                        G_TYPE_CHECK_INSTANCE_TYPE (new_parent,
+                                                    private->item_type),
+                        FALSE);
+  g_return_val_if_fail (new_parent == NULL ||
+                        gimp_item_get_tree (new_parent) == tree, FALSE);
+  g_return_val_if_fail (new_parent == NULL ||
+                        gimp_viewable_get_children (GIMP_VIEWABLE (new_parent)),
+                        FALSE);
+  g_return_val_if_fail (item != new_parent, FALSE);
+  g_return_val_if_fail (new_parent == NULL ||
+                        ! gimp_viewable_is_ancestor (GIMP_VIEWABLE (item),
+                                                     GIMP_VIEWABLE (new_parent)),
+                        FALSE);
+
+  container = gimp_item_get_container (item);
+
+  if (new_parent)
+    new_container = gimp_viewable_get_children (GIMP_VIEWABLE (new_parent));
+  else
+    new_container = tree->container;
+
+  n_items = gimp_container_get_n_children (new_container);
+
+  if (new_container == container)
+    n_items--;
+
+  new_index = CLAMP (new_index, 0, n_items);
+
+  if (new_container != container ||
+      new_index     != gimp_item_get_index (item))
+    {
+      if (push_undo)
+        gimp_image_undo_push_item_reorder (private->image, undo_desc, item);
+
+      if (new_container != container)
+        {
+          g_object_ref (item);
+
+          gimp_container_remove (container, GIMP_OBJECT (item));
+
+          gimp_viewable_set_parent (GIMP_VIEWABLE (item),
+                                    GIMP_VIEWABLE (new_parent));
+
+          gimp_container_insert (new_container, GIMP_OBJECT (item), new_index);
+
+          g_object_unref (item);
+        }
+      else
+        {
+          gimp_container_reorder (container, GIMP_OBJECT (item), new_index);
+        }
+    }
+
+  return TRUE;
+}
+
+void
+gimp_item_tree_rename_item (GimpItemTree *tree,
+                            GimpItem     *item,
+                            const gchar  *new_name,
+                            gboolean      push_undo,
+                            const gchar  *undo_desc)
+{
+  GimpItemTreePrivate *private;
+
+  g_return_if_fail (GIMP_IS_ITEM_TREE (tree));
+
+  private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (item, private->item_type));
+  g_return_if_fail (gimp_item_get_tree (item) == tree);
+  g_return_if_fail (new_name != NULL);
+
+  if (strcmp (new_name, gimp_object_get_name (item)))
+    {
+      if (push_undo)
+        gimp_image_undo_push_item_rename (gimp_item_get_image (item),
+                                          undo_desc, item);
+
+      gimp_item_tree_uniquefy_name (tree, item, new_name);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_item_tree_uniquefy_name (GimpItemTree *tree,
+                              GimpItem     *item,
+                              const gchar  *new_name)
+{
+  GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+  if (new_name)
+    {
+      g_hash_table_remove (private->name_hash,
+                           gimp_object_get_name (item));
+
+      gimp_object_set_name (GIMP_OBJECT (item), new_name);
+    }
+
+  /* Remove any trailing whitespace. */
+  if (gimp_object_get_name (item))
+    {
+      gchar *name = g_strchomp (g_strdup (gimp_object_get_name (item)));
+
+      gimp_object_take_name (GIMP_OBJECT (item), name);
+    }
+
+  if (g_hash_table_lookup (private->name_hash,
+                           gimp_object_get_name (item)))
+    {
+      gchar      *name        = g_strdup (gimp_object_get_name (item));
+      gchar      *new_name    = NULL;
+      gint        number      = 0;
+      gint        precision   = 1;
+      GRegex     *end_numbers = g_regex_new (" ?#([0-9]+)\\s*$", 0, 0, NULL);
+      GMatchInfo *match_info  = NULL;
+
+      if (g_regex_match (end_numbers, name, 0, &match_info))
+        {
+          gchar *match;
+          gint   start_pos;
+
+          match  = g_match_info_fetch (match_info, 1);
+          if (match && match[0] == '0')
+            {
+              precision = strlen (match);
+            }
+          number = atoi (match);
+          g_free (match);
+
+          g_match_info_fetch_pos (match_info, 0,
+                                  &start_pos, NULL);
+          name[start_pos] = '\0';
+        }
+      g_match_info_free (match_info);
+      g_regex_unref (end_numbers);
+
+      do
+        {
+          number++;
+
+          g_free (new_name);
+
+          new_name = g_strdup_printf ("%s #%.*d",
+                                      name,
+                                      precision,
+                                      number);
+        }
+      while (g_hash_table_lookup (private->name_hash, new_name));
+
+      g_free (name);
+
+      gimp_object_take_name (GIMP_OBJECT (item), new_name);
+    }
+
+  g_hash_table_insert (private->name_hash,
+                       (gpointer) gimp_object_get_name (item),
+                       item);
+}
diff --git a/app/core/gimpitemtree.h b/app/core/gimpitemtree.h
new file mode 100644
index 0000000..4d3c6ea
--- /dev/null
+++ b/app/core/gimpitemtree.h
@@ -0,0 +1,89 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemtree.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_TREE_H__
+#define __GIMP_ITEM_TREE_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_ITEM_TREE            (gimp_item_tree_get_type ())
+#define GIMP_ITEM_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM_TREE, GimpItemTree))
+#define GIMP_ITEM_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM_TREE, GimpItemTreeClass))
+#define GIMP_IS_ITEM_TREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM_TREE))
+#define GIMP_IS_ITEM_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM_TREE))
+
+
+typedef struct _GimpItemTreeClass GimpItemTreeClass;
+
+struct _GimpItemTree
+{
+  GimpObject     parent_instance;
+
+  GimpContainer *container;
+};
+
+struct _GimpItemTreeClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType          gimp_item_tree_get_type         (void) G_GNUC_CONST;
+GimpItemTree * gimp_item_tree_new              (GimpImage     *image,
+                                                GType          container_type,
+                                                GType          item_type);
+
+GimpItem     * gimp_item_tree_get_active_item  (GimpItemTree  *tree);
+void           gimp_item_tree_set_active_item  (GimpItemTree  *tree,
+                                                GimpItem      *item);
+
+GimpItem     * gimp_item_tree_get_item_by_name (GimpItemTree  *tree,
+                                                const gchar   *name);
+
+gboolean       gimp_item_tree_get_insert_pos   (GimpItemTree  *tree,
+                                                GimpItem      *item,
+                                                GimpItem     **parent,
+                                                gint          *position);
+
+void           gimp_item_tree_add_item         (GimpItemTree  *tree,
+                                                GimpItem      *item,
+                                                GimpItem      *parent,
+                                                gint           position);
+GimpItem     * gimp_item_tree_remove_item      (GimpItemTree  *tree,
+                                                GimpItem      *item,
+                                                GimpItem      *new_active);
+
+gboolean       gimp_item_tree_reorder_item     (GimpItemTree  *tree,
+                                                GimpItem      *item,
+                                                GimpItem      *new_parent,
+                                                gint           new_index,
+                                                gboolean       push_undo,
+                                                const gchar   *undo_desc);
+
+void           gimp_item_tree_rename_item      (GimpItemTree  *tree,
+                                                GimpItem      *item,
+                                                const gchar   *new_name,
+                                                gboolean       push_undo,
+                                                const gchar   *undo_desc);
+
+
+#endif  /*  __GIMP_ITEM_TREE_H__  */
diff --git a/app/core/gimpitemundo.c b/app/core/gimpitemundo.c
new file mode 100644
index 0000000..0a50d43
--- /dev/null
+++ b/app/core/gimpitemundo.c
@@ -0,0 +1,139 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpitem.h"
+#include "gimpitemundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ITEM
+};
+
+
+static void   gimp_item_undo_constructed  (GObject      *object);
+static void   gimp_item_undo_set_property (GObject      *object,
+                                           guint         property_id,
+                                           const GValue *value,
+                                           GParamSpec   *pspec);
+static void   gimp_item_undo_get_property (GObject      *object,
+                                           guint         property_id,
+                                           GValue       *value,
+                                           GParamSpec   *pspec);
+
+static void   gimp_item_undo_free         (GimpUndo     *undo,
+                                           GimpUndoMode  undo_mode);
+
+
+G_DEFINE_TYPE (GimpItemUndo, gimp_item_undo, GIMP_TYPE_UNDO)
+
+#define parent_class gimp_item_undo_parent_class
+
+
+static void
+gimp_item_undo_class_init (GimpItemUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed  = gimp_item_undo_constructed;
+  object_class->set_property = gimp_item_undo_set_property;
+  object_class->get_property = gimp_item_undo_get_property;
+
+  undo_class->free           = gimp_item_undo_free;
+
+  g_object_class_install_property (object_class, PROP_ITEM,
+                                   g_param_spec_object ("item", NULL, NULL,
+                                                        GIMP_TYPE_ITEM,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_item_undo_init (GimpItemUndo *undo)
+{
+}
+
+static void
+gimp_item_undo_constructed (GObject *object)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_ITEM (item_undo->item));
+}
+
+static void
+gimp_item_undo_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_ITEM:
+      item_undo->item = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_item_undo_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_ITEM:
+      g_value_set_object (value, item_undo->item);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_item_undo_free (GimpUndo     *undo,
+                     GimpUndoMode  undo_mode)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (undo);
+
+  g_clear_object (&item_undo->item);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpitemundo.h b/app/core/gimpitemundo.h
new file mode 100644
index 0000000..91fe8d6
--- /dev/null
+++ b/app/core/gimpitemundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_UNDO_H__
+#define __GIMP_ITEM_UNDO_H__
+
+
+#include "gimpundo.h"
+
+
+#define GIMP_TYPE_ITEM_UNDO            (gimp_item_undo_get_type ())
+#define GIMP_ITEM_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM_UNDO, GimpItemUndo))
+#define GIMP_ITEM_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM_UNDO, GimpItemUndoClass))
+#define GIMP_IS_ITEM_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM_UNDO))
+#define GIMP_IS_ITEM_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM_UNDO))
+#define GIMP_ITEM_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ITEM_UNDO, GimpItemUndoClass))
+
+
+typedef struct _GimpItemUndo      GimpItemUndo;
+typedef struct _GimpItemUndoClass GimpItemUndoClass;
+
+struct _GimpItemUndo
+{
+  GimpUndo  parent_instance;
+
+  GimpItem *item;  /* the item this undo is for */
+};
+
+struct _GimpItemUndoClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType   gimp_item_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_ITEM_UNDO_H__ */
diff --git a/app/core/gimplayer-floating-selection.c b/app/core/gimplayer-floating-selection.c
new file mode 100644
index 0000000..80222a2
--- /dev/null
+++ b/app/core/gimplayer-floating-selection.c
@@ -0,0 +1,332 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpboundary.h"
+#include "gimpdrawable-filters.h"
+#include "gimpdrawable-floating-selection.h"
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimplayer-floating-selection.h"
+#include "gimplayermask.h"
+
+#include "gimp-intl.h"
+
+
+/* public functions  */
+
+void
+floating_sel_attach (GimpLayer    *layer,
+                     GimpDrawable *drawable)
+{
+  GimpImage *image;
+  GimpLayer *floating_sel;
+  GimpLayer *parent   = NULL;
+  gint       position = 0;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (drawable != GIMP_DRAWABLE (layer));
+  g_return_if_fail (gimp_item_get_image (GIMP_ITEM (layer)) ==
+                    gimp_item_get_image (GIMP_ITEM (drawable)));
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  floating_sel = gimp_image_get_floating_selection (image);
+
+  /*  If there is already a floating selection, anchor it  */
+  if (floating_sel)
+    {
+      floating_sel_anchor (floating_sel);
+
+      /*  if we were pasting to the old floating selection, paste now
+       *  to the drawable
+       */
+      if (drawable == (GimpDrawable *) floating_sel)
+        drawable = gimp_image_get_active_drawable (image);
+    }
+
+  gimp_layer_set_lock_alpha (layer, TRUE, FALSE);
+
+  gimp_layer_set_floating_sel_drawable (layer, drawable);
+
+  /*  Floating selection layer placement, default to the top of the
+   *  layers stack; parent and position are adapted according to the
+   *  drawable associated with the floating selection.
+   */
+
+  if (GIMP_IS_LAYER_MASK (drawable))
+    {
+       GimpLayer *tmp = gimp_layer_mask_get_layer (GIMP_LAYER_MASK (drawable));
+
+       parent   = GIMP_LAYER (gimp_item_get_parent (GIMP_ITEM (tmp)));
+       position = gimp_item_get_index (GIMP_ITEM (tmp));
+    }
+  else if (GIMP_IS_LAYER (drawable))
+    {
+      parent   = GIMP_LAYER (gimp_item_get_parent (GIMP_ITEM (drawable)));
+      position = gimp_item_get_index (GIMP_ITEM (drawable));
+    }
+
+  gimp_image_add_layer (image, layer, parent, position, TRUE);
+}
+
+void
+floating_sel_anchor (GimpLayer *layer)
+{
+  GimpImage     *image;
+  GimpDrawable  *drawable;
+  GimpFilter    *filter = NULL;
+  GeglRectangle  bounding_box;
+  GeglRectangle  dr_bounding_box;
+  gint           off_x, off_y;
+  gint           dr_off_x, dr_off_y;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (gimp_layer_is_floating_sel (layer));
+
+  /* Don't let gimp_image_remove_layer free the layer while we still need it */
+  g_object_ref (layer);
+
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_FS_ANCHOR,
+                               C_("undo-type", "Anchor Floating Selection"));
+
+  drawable = gimp_layer_get_floating_sel_drawable (layer);
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+  gimp_item_get_offset (GIMP_ITEM (drawable), &dr_off_x, &dr_off_y);
+
+  bounding_box    = gimp_drawable_get_bounding_box (GIMP_DRAWABLE (layer));
+  dr_bounding_box = gimp_drawable_get_bounding_box (drawable);
+
+  bounding_box.x    += off_x;
+  bounding_box.y    += off_y;
+
+  dr_bounding_box.x += dr_off_x;
+  dr_bounding_box.y += dr_off_y;
+
+  if (gimp_item_get_visible (GIMP_ITEM (layer)) &&
+      gegl_rectangle_intersect (NULL, &bounding_box, &dr_bounding_box))
+    {
+      filter = gimp_drawable_get_floating_sel_filter (drawable);
+    }
+
+  if (filter)
+    {
+      gimp_drawable_merge_filter (drawable, filter, NULL, NULL,
+                                  NULL, FALSE, FALSE, FALSE);
+    }
+
+  gimp_image_remove_layer (image, layer, TRUE, NULL);
+
+  gimp_image_undo_group_end (image);
+
+  /*  invalidate the boundaries  */
+  gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (gimp_image_get_mask (image)));
+
+  g_object_unref (layer);
+}
+
+gboolean
+floating_sel_to_layer (GimpLayer  *layer,
+                       GError    **error)
+{
+  GimpItem  *item;
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+  g_return_val_if_fail (gimp_layer_is_floating_sel (layer), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  item  = GIMP_ITEM (layer);
+  image = gimp_item_get_image (item);
+
+  /*  Check if the floating layer belongs to a channel  */
+  if (GIMP_IS_CHANNEL (gimp_layer_get_floating_sel_drawable (layer)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot create a new layer from the floating "
+                             "selection because it belongs to a layer mask "
+                             "or channel."));
+      return FALSE;
+    }
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_FS_TO_LAYER,
+                               C_("undo-type", "Floating Selection to Layer"));
+
+  gimp_image_undo_push_fs_to_layer (image, NULL, layer);
+
+  gimp_drawable_detach_floating_sel (gimp_layer_get_floating_sel_drawable (layer));
+  gimp_layer_set_floating_sel_drawable (layer, NULL);
+
+  gimp_item_set_visible (item, TRUE, TRUE);
+  gimp_layer_set_lock_alpha (layer, FALSE, TRUE);
+
+  gimp_image_undo_group_end (image);
+
+  /* When the floating selection is converted to/from a normal layer
+   * it does something resembling a name change, so emit the
+   * "name-changed" signal
+   */
+  gimp_object_name_changed (GIMP_OBJECT (layer));
+
+  gimp_drawable_update (GIMP_DRAWABLE (layer),
+                        0, 0,
+                        gimp_item_get_width  (item),
+                        gimp_item_get_height (item));
+
+  return TRUE;
+}
+
+void
+floating_sel_activate_drawable (GimpLayer *layer)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (gimp_layer_is_floating_sel (layer));
+
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  drawable = gimp_layer_get_floating_sel_drawable (layer);
+
+  /*  set the underlying drawable to active  */
+  if (GIMP_IS_LAYER_MASK (drawable))
+    {
+      GimpLayerMask *mask = GIMP_LAYER_MASK (drawable);
+
+      gimp_image_set_active_layer (image, gimp_layer_mask_get_layer (mask));
+    }
+  else if (GIMP_IS_CHANNEL (drawable))
+    {
+      gimp_image_set_active_channel (image, GIMP_CHANNEL (drawable));
+    }
+  else
+    {
+      gimp_image_set_active_layer (image, GIMP_LAYER (drawable));
+    }
+}
+
+const GimpBoundSeg *
+floating_sel_boundary (GimpLayer *layer,
+                       gint      *n_segs)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (gimp_layer_is_floating_sel (layer), NULL);
+  g_return_val_if_fail (n_segs != NULL, NULL);
+
+  if (layer->fs.boundary_known == FALSE)
+    {
+      gint width, height;
+      gint off_x, off_y;
+
+      width  = gimp_item_get_width  (GIMP_ITEM (layer));
+      height = gimp_item_get_height (GIMP_ITEM (layer));
+      gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+
+      if (layer->fs.segs)
+        g_free (layer->fs.segs);
+
+      if (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+        {
+          GeglBuffer *buffer;
+          gint        i;
+
+          /*  find the segments  */
+          buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
+
+          layer->fs.segs = gimp_boundary_find (buffer, NULL,
+                                               babl_format ("A float"),
+                                               GIMP_BOUNDARY_WITHIN_BOUNDS,
+                                               0, 0, width, height,
+                                               GIMP_BOUNDARY_HALF_WAY,
+                                               &layer->fs.num_segs);
+
+          /*  offset the segments  */
+          for (i = 0; i < layer->fs.num_segs; i++)
+            {
+              layer->fs.segs[i].x1 += off_x;
+              layer->fs.segs[i].y1 += off_y;
+              layer->fs.segs[i].x2 += off_x;
+              layer->fs.segs[i].y2 += off_y;
+            }
+        }
+      else
+        {
+          layer->fs.num_segs = 4;
+          layer->fs.segs     = g_new0 (GimpBoundSeg, 4);
+
+          /* top */
+          layer->fs.segs[0].x1 = off_x;
+          layer->fs.segs[0].y1 = off_y;
+          layer->fs.segs[0].x2 = off_x + width;
+          layer->fs.segs[0].y2 = off_y;
+
+          /* left */
+          layer->fs.segs[1].x1 = off_x;
+          layer->fs.segs[1].y1 = off_y;
+          layer->fs.segs[1].x2 = off_x;
+          layer->fs.segs[1].y2 = off_y + height;
+
+          /* right */
+          layer->fs.segs[2].x1 = off_x + width;
+          layer->fs.segs[2].y1 = off_y;
+          layer->fs.segs[2].x2 = off_x + width;
+          layer->fs.segs[2].y2 = off_y + height;
+
+          /* bottom */
+          layer->fs.segs[3].x1 = off_x;
+          layer->fs.segs[3].y1 = off_y + height;
+          layer->fs.segs[3].x2 = off_x + width;
+          layer->fs.segs[3].y2 = off_y + height;
+        }
+
+      layer->fs.boundary_known = TRUE;
+    }
+
+  *n_segs = layer->fs.num_segs;
+
+  return layer->fs.segs;
+}
+
+void
+floating_sel_invalidate (GimpLayer *layer)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (gimp_layer_is_floating_sel (layer));
+
+  /*  Invalidate the attached-to drawable's preview  */
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gimp_layer_get_floating_sel_drawable (layer)));
+
+  /*  Invalidate the boundary  */
+  layer->fs.boundary_known = FALSE;
+}
diff --git a/app/core/gimplayer-floating-selection.h b/app/core/gimplayer-floating-selection.h
new file mode 100644
index 0000000..e111c1a
--- /dev/null
+++ b/app/core/gimplayer-floating-selection.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_FLOATING_SELECTION_H__
+#define __GIMP_LAYER_FLOATING_SELECTION_H__
+
+
+void                 floating_sel_attach            (GimpLayer     *layer,
+                                                     GimpDrawable  *drawable);
+void                 floating_sel_anchor            (GimpLayer     *layer);
+gboolean             floating_sel_to_layer          (GimpLayer     *layer,
+                                                     GError       **error);
+void                 floating_sel_activate_drawable (GimpLayer     *layer);
+const GimpBoundSeg * floating_sel_boundary          (GimpLayer     *layer,
+                                                     gint          *n_segs);
+void                 floating_sel_invalidate        (GimpLayer     *layer);
+
+
+#endif /* __GIMP_LAYER_FLOATING_SELECTION_H__ */
diff --git a/app/core/gimplayer-new.c b/app/core/gimplayer-new.c
new file mode 100644
index 0000000..7ea2450
--- /dev/null
+++ b/app/core/gimplayer-new.c
@@ -0,0 +1,253 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimpbuffer.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimplayer.h"
+#include "gimplayer-new.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_layer_new_convert_buffer (GimpLayer         *layer,
+                                             GeglBuffer        *src_buffer,
+                                             GimpColorProfile  *src_profile,
+                                             GError           **error);
+
+
+/*  public functions  */
+
+GimpLayer *
+gimp_layer_new (GimpImage     *image,
+                gint           width,
+                gint           height,
+                const Babl    *format,
+                const gchar   *name,
+                gdouble        opacity,
+                GimpLayerMode  mode)
+{
+  GimpLayer *layer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (width > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+
+  layer = GIMP_LAYER (gimp_drawable_new (GIMP_TYPE_LAYER,
+                                         image, name,
+                                         0, 0, width, height,
+                                         format));
+
+  gimp_layer_set_opacity (layer, opacity, FALSE);
+  gimp_layer_set_mode (layer, mode, FALSE);
+
+  return layer;
+}
+
+/**
+ * gimp_layer_new_from_buffer:
+ * @buffer:     The buffer to make the new layer from.
+ * @dest_image: The image the new layer will be added to.
+ * @format:     The #Babl format of the new layer.
+ * @name:       The new layer's name.
+ * @opacity:    The new layer's opacity.
+ * @mode:       The new layer's mode.
+ *
+ * Copies %buffer to a layer taking into consideration the
+ * possibility of transforming the contents to meet the requirements
+ * of the target image type
+ *
+ * Return value: The new layer.
+ **/
+GimpLayer *
+gimp_layer_new_from_buffer (GimpBuffer    *buffer,
+                            GimpImage     *dest_image,
+                            const Babl    *format,
+                            const gchar   *name,
+                            gdouble        opacity,
+                            GimpLayerMode  mode)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+
+  return gimp_layer_new_from_gegl_buffer (gimp_buffer_get_buffer (buffer),
+                                          dest_image, format,
+                                          name, opacity, mode,
+                                          gimp_buffer_get_color_profile (buffer));
+}
+
+/**
+ * gimp_layer_new_from_gegl_buffer:
+ * @buffer:     The buffer to make the new layer from.
+ * @dest_image: The image the new layer will be added to.
+ * @format:     The #Babl format of the new layer.
+ * @name:       The new layer's name.
+ * @opacity:    The new layer's opacity.
+ * @mode:       The new layer's mode.
+ *
+ * Copies %buffer to a layer taking into consideration the
+ * possibility of transforming the contents to meet the requirements
+ * of the target image type
+ *
+ * Return value: The new layer.
+ **/
+GimpLayer *
+gimp_layer_new_from_gegl_buffer (GeglBuffer       *buffer,
+                                 GimpImage        *dest_image,
+                                 const Babl       *format,
+                                 const gchar      *name,
+                                 gdouble           opacity,
+                                 GimpLayerMode     mode,
+                                 GimpColorProfile *buffer_profile)
+{
+  GimpLayer           *layer;
+  const GeglRectangle *extent;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+  g_return_val_if_fail (buffer_profile == NULL ||
+                        GIMP_IS_COLOR_PROFILE (buffer_profile), NULL);
+
+  extent = gegl_buffer_get_extent (buffer);
+
+  /*  do *not* use the buffer's format because this function gets
+   *  buffers of any format passed, and converts them
+   */
+  layer = gimp_layer_new (dest_image,
+                          extent->width, extent->height,
+                          format,
+                          name, opacity, mode);
+
+  if (extent->x != 0 || extent->y != 0)
+    gimp_item_translate (GIMP_ITEM (layer), extent->x, extent->y, FALSE);
+
+  gimp_layer_new_convert_buffer (layer, buffer, buffer_profile, NULL);
+
+  return layer;
+}
+
+/**
+ * gimp_layer_new_from_pixbuf:
+ * @pixbuf:     The pixbuf to make the new layer from.
+ * @dest_image: The image the new layer will be added to.
+ * @format:     The #Babl format of the new layer.
+ * @name:       The new layer's name.
+ * @opacity:    The new layer's opacity.
+ * @mode:       The new layer's mode.
+ *
+ * Copies %pixbuf to a layer taking into consideration the
+ * possibility of transforming the contents to meet the requirements
+ * of the target image type
+ *
+ * Return value: The new layer.
+ **/
+GimpLayer *
+gimp_layer_new_from_pixbuf (GdkPixbuf     *pixbuf,
+                            GimpImage     *dest_image,
+                            const Babl    *format,
+                            const gchar   *name,
+                            gdouble        opacity,
+                            GimpLayerMode  mode)
+{
+  GimpLayer        *layer;
+  GeglBuffer       *buffer;
+  guint8           *icc_data;
+  gsize             icc_len;
+  GimpColorProfile *profile = NULL;
+
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+
+  layer = gimp_layer_new (dest_image,
+                          gdk_pixbuf_get_width  (pixbuf),
+                          gdk_pixbuf_get_height (pixbuf),
+                          format, name, opacity, mode);
+
+  buffer = gimp_pixbuf_create_buffer (pixbuf);
+
+  icc_data = gimp_pixbuf_get_icc_profile (pixbuf, &icc_len);
+  if (icc_data)
+    {
+      profile = gimp_color_profile_new_from_icc_profile (icc_data, icc_len,
+                                                         NULL);
+      g_free (icc_data);
+    }
+
+  gimp_layer_new_convert_buffer (layer, buffer, profile, NULL);
+
+  if (profile)
+    g_object_unref (profile);
+
+  g_object_unref (buffer);
+
+  return layer;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_layer_new_convert_buffer (GimpLayer         *layer,
+                               GeglBuffer        *src_buffer,
+                               GimpColorProfile  *src_profile,
+                               GError           **error)
+{
+  GimpDrawable     *drawable    = GIMP_DRAWABLE (layer);
+  GimpImage        *image       = gimp_item_get_image (GIMP_ITEM (layer));
+  GeglBuffer       *dest_buffer = gimp_drawable_get_buffer (drawable);
+  GimpColorProfile *dest_profile;
+
+  if (! gimp_image_get_is_color_managed (image))
+    {
+      gimp_gegl_buffer_copy (src_buffer, NULL, GEGL_ABYSS_NONE,
+                             dest_buffer, NULL);
+      return;
+    }
+
+  if (! src_profile)
+    {
+      const Babl *src_format = gegl_buffer_get_format (src_buffer);
+
+      src_profile = gimp_babl_format_get_color_profile (src_format);
+    }
+
+  dest_profile =
+    gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (layer));
+
+  gimp_gegl_convert_color_profile (src_buffer,  NULL, src_profile,
+                                   dest_buffer, NULL, dest_profile,
+                                   GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                   TRUE, NULL);
+}
diff --git a/app/core/gimplayer-new.h b/app/core/gimplayer-new.h
new file mode 100644
index 0000000..58b3aa9
--- /dev/null
+++ b/app/core/gimplayer-new.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_NEW_H__
+#define __GIMP_LAYER_NEW_H__
+
+
+GimpLayer * gimp_layer_new                  (GimpImage        *image,
+                                             gint              width,
+                                             gint              height,
+                                             const Babl       *format,
+                                             const gchar      *name,
+                                             gdouble           opacity,
+                                             GimpLayerMode     mode);
+
+GimpLayer * gimp_layer_new_from_buffer      (GimpBuffer       *buffer,
+                                             GimpImage        *dest_image,
+                                             const Babl       *format,
+                                             const gchar      *name,
+                                             gdouble           opacity,
+                                             GimpLayerMode     mode);
+GimpLayer * gimp_layer_new_from_gegl_buffer (GeglBuffer       *buffer,
+                                             GimpImage        *dest_image,
+                                             const Babl       *format,
+                                             const gchar      *name,
+                                             gdouble           opacity,
+                                             GimpLayerMode     mode,
+                                             GimpColorProfile *buffer_profile);
+GimpLayer * gimp_layer_new_from_pixbuf      (GdkPixbuf        *pixbuf,
+                                             GimpImage        *dest_image,
+                                             const Babl       *format,
+                                             const gchar      *name,
+                                             gdouble           opacity,
+                                             GimpLayerMode     mode);
+
+
+#endif /* __GIMP_LAYER_NEW_H__ */
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
new file mode 100644
index 0000000..3887007
--- /dev/null
+++ b/app/core/gimplayer.c
@@ -0,0 +1,2943 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-nodes.h"
+
+#include "gimpboundary.h"
+#include "gimpchannel-select.h"
+#include "gimpcontext.h"
+#include "gimpcontainer.h"
+#include "gimpdrawable-floating-selection.h"
+#include "gimperror.h"
+#include "gimpgrouplayer.h"
+#include "gimpimage-undo-push.h"
+#include "gimpimage-undo.h"
+#include "gimpimage.h"
+#include "gimpimage-color-profile.h"
+#include "gimplayer-floating-selection.h"
+#include "gimplayer.h"
+#include "gimplayermask.h"
+#include "gimpmarshal.h"
+#include "gimpobjectqueue.h"
+#include "gimppickable.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  OPACITY_CHANGED,
+  MODE_CHANGED,
+  BLEND_SPACE_CHANGED,
+  COMPOSITE_SPACE_CHANGED,
+  COMPOSITE_MODE_CHANGED,
+  EFFECTIVE_MODE_CHANGED,
+  EXCLUDES_BACKDROP_CHANGED,
+  LOCK_ALPHA_CHANGED,
+  MASK_CHANGED,
+  APPLY_MASK_CHANGED,
+  EDIT_MASK_CHANGED,
+  SHOW_MASK_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_OPACITY,
+  PROP_MODE,
+  PROP_BLEND_SPACE,
+  PROP_COMPOSITE_SPACE,
+  PROP_COMPOSITE_MODE,
+  PROP_EXCLUDES_BACKDROP,
+  PROP_LOCK_ALPHA,
+  PROP_MASK,
+  PROP_FLOATING_SELECTION
+};
+
+
+static void       gimp_color_managed_iface_init (GimpColorManagedInterface *iface);
+static void       gimp_pickable_iface_init      (GimpPickableInterface     *iface);
+
+static void       gimp_layer_set_property       (GObject            *object,
+                                                 guint               property_id,
+                                                 const GValue       *value,
+                                                 GParamSpec         *pspec);
+static void       gimp_layer_get_property       (GObject            *object,
+                                                 guint               property_id,
+                                                 GValue             *value,
+                                                 GParamSpec         *pspec);
+static void       gimp_layer_dispose            (GObject            *object);
+static void       gimp_layer_finalize           (GObject            *object);
+static void       gimp_layer_notify             (GObject            *object,
+                                                 GParamSpec         *pspec);
+
+static void       gimp_layer_name_changed       (GimpObject         *object);
+static gint64     gimp_layer_get_memsize        (GimpObject         *object,
+                                                 gint64             *gui_size);
+
+static void       gimp_layer_invalidate_preview (GimpViewable       *viewable);
+static gchar    * gimp_layer_get_description    (GimpViewable       *viewable,
+                                                 gchar             **tooltip);
+
+static GeglNode * gimp_layer_get_node           (GimpFilter         *filter);
+
+static void       gimp_layer_removed            (GimpItem           *item);
+static void       gimp_layer_unset_removed      (GimpItem           *item);
+static gboolean   gimp_layer_is_attached        (GimpItem           *item);
+static GimpItemTree * gimp_layer_get_tree       (GimpItem           *item);
+static GimpItem * gimp_layer_duplicate          (GimpItem           *item,
+                                                 GType               new_type);
+static void       gimp_layer_convert            (GimpItem           *item,
+                                                 GimpImage          *dest_image,
+                                                 GType               old_type);
+static gboolean   gimp_layer_rename             (GimpItem           *item,
+                                                 const gchar        *new_name,
+                                                 const gchar        *undo_desc,
+                                                 GError            **error);
+static void       gimp_layer_start_move         (GimpItem           *item,
+                                                 gboolean            push_undo);
+static void       gimp_layer_end_move           (GimpItem           *item,
+                                                 gboolean            push_undo);
+static void       gimp_layer_translate          (GimpItem           *item,
+                                                 gdouble             offset_x,
+                                                 gdouble             offset_y,
+                                                 gboolean            push_undo);
+static void       gimp_layer_scale              (GimpItem           *item,
+                                                 gint                new_width,
+                                                 gint                new_height,
+                                                 gint                new_offset_x,
+                                                 gint                new_offset_y,
+                                                 GimpInterpolationType  interp_type,
+                                                 GimpProgress       *progress);
+static void       gimp_layer_resize             (GimpItem           *item,
+                                                 GimpContext        *context,
+                                                 GimpFillType        fill_type,
+                                                 gint                new_width,
+                                                 gint                new_height,
+                                                 gint                offset_x,
+                                                 gint                offset_y);
+static void       gimp_layer_flip               (GimpItem           *item,
+                                                 GimpContext        *context,
+                                                 GimpOrientationType flip_type,
+                                                 gdouble             axis,
+                                                 gboolean            clip_result);
+static void       gimp_layer_rotate             (GimpItem           *item,
+                                                 GimpContext        *context,
+                                                 GimpRotationType    rotate_type,
+                                                 gdouble             center_x,
+                                                 gdouble             center_y,
+                                                 gboolean            clip_result);
+static void       gimp_layer_transform          (GimpItem           *item,
+                                                 GimpContext        *context,
+                                                 const GimpMatrix3  *matrix,
+                                                 GimpTransformDirection direction,
+                                                 GimpInterpolationType  interpolation_type,
+                                                 GimpTransformResize clip_result,
+                                                 GimpProgress       *progress);
+static void       gimp_layer_to_selection       (GimpItem           *item,
+                                                 GimpChannelOps      op,
+                                                 gboolean            antialias,
+                                                 gboolean            feather,
+                                                 gdouble             feather_radius_x,
+                                                 gdouble             feather_radius_y);
+
+static void       gimp_layer_alpha_changed      (GimpDrawable       *drawable);
+static gint64     gimp_layer_estimate_memsize   (GimpDrawable       *drawable,
+                                                 GimpComponentType   component_type,
+                                                 gint                width,
+                                                 gint                height);
+static gboolean   gimp_layer_supports_alpha     (GimpDrawable       *drawable);
+static void       gimp_layer_convert_type       (GimpDrawable       *drawable,
+                                                 GimpImage          *dest_image,
+                                                 const Babl         *new_format,
+                                                 GimpColorProfile   *dest_profile,
+                                                 GeglDitherMethod    layer_dither_type,
+                                                 GeglDitherMethod    mask_dither_type,
+                                                 gboolean            push_undo,
+                                                 GimpProgress       *progress);
+static void    gimp_layer_invalidate_boundary   (GimpDrawable       *drawable);
+static void    gimp_layer_get_active_components (GimpDrawable       *drawable,
+                                                 gboolean           *active);
+static GimpComponentMask
+               gimp_layer_get_active_mask       (GimpDrawable       *drawable);
+static void    gimp_layer_set_buffer            (GimpDrawable       *drawable,
+                                                 gboolean            push_undo,
+                                                 const gchar        *undo_desc,
+                                                 GeglBuffer         *buffer,
+                                                 const GeglRectangle *bounds);
+static GeglRectangle
+               gimp_layer_get_bounding_box      (GimpDrawable       *drawable);
+
+static GimpColorProfile *
+               gimp_layer_get_color_profile     (GimpColorManaged   *managed);
+
+static gdouble gimp_layer_get_opacity_at        (GimpPickable       *pickable,
+                                                 gint                x,
+                                                 gint                y);
+static void    gimp_layer_pixel_to_srgb         (GimpPickable       *pickable,
+                                                 const Babl         *format,
+                                                 gpointer            pixel,
+                                                 GimpRGB            *color);
+static void    gimp_layer_srgb_to_pixel         (GimpPickable       *pickable,
+                                                 const GimpRGB      *color,
+                                                 const Babl         *format,
+                                                 gpointer            pixel);
+
+static void       gimp_layer_real_translate     (GimpLayer          *layer,
+                                                 gint                offset_x,
+                                                 gint                offset_y);
+static void       gimp_layer_real_scale         (GimpLayer          *layer,
+                                                 gint                new_width,
+                                                 gint                new_height,
+                                                 gint                new_offset_x,
+                                                 gint                new_offset_y,
+                                                 GimpInterpolationType  interp_type,
+                                                 GimpProgress       *progress);
+static void       gimp_layer_real_resize        (GimpLayer          *layer,
+                                                 GimpContext        *context,
+                                                 GimpFillType        fill_type,
+                                                 gint                new_width,
+                                                 gint                new_height,
+                                                 gint                offset_x,
+                                                 gint                offset_y);
+static void       gimp_layer_real_flip          (GimpLayer          *layer,
+                                                 GimpContext        *context,
+                                                 GimpOrientationType flip_type,
+                                                 gdouble             axis,
+                                                 gboolean            clip_result);
+static void       gimp_layer_real_rotate        (GimpLayer          *layer,
+                                                 GimpContext        *context,
+                                                 GimpRotationType    rotate_type,
+                                                 gdouble             center_x,
+                                                 gdouble             center_y,
+                                                 gboolean            clip_result);
+static void       gimp_layer_real_transform     (GimpLayer          *layer,
+                                                 GimpContext        *context,
+                                                 const GimpMatrix3  *matrix,
+                                                 GimpTransformDirection direction,
+                                                 GimpInterpolationType  interpolation_type,
+                                                 GimpTransformResize clip_result,
+                                                 GimpProgress       *progress);
+static void       gimp_layer_real_convert_type  (GimpLayer          *layer,
+                                                 GimpImage          *dest_image,
+                                                 const Babl         *new_format,
+                                                 GimpColorProfile   *dest_profile,
+                                                 GeglDitherMethod    layer_dither_type,
+                                                 GeglDitherMethod    mask_dither_type,
+                                                 gboolean            push_undo,
+                                                 GimpProgress       *progress);
+static GeglRectangle
+               gimp_layer_real_get_bounding_box (GimpLayer          *layer);
+static void  gimp_layer_real_get_effective_mode (GimpLayer          *layer,
+                                                 GimpLayerMode          *mode,
+                                                 GimpLayerColorSpace    *blend_space,
+                                                 GimpLayerColorSpace    *composite_space,
+                                                 GimpLayerCompositeMode *composite_mode);
+static gboolean
+          gimp_layer_real_get_excludes_backdrop (GimpLayer          *layer);
+
+static void       gimp_layer_layer_mask_update  (GimpDrawable       *layer_mask,
+                                                 gint                x,
+                                                 gint                y,
+                                                 gint                width,
+                                                 gint                height,
+                                                 GimpLayer          *layer);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpLayer, gimp_layer, GIMP_TYPE_DRAWABLE,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
+                                                gimp_color_managed_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_pickable_iface_init))
+
+#define parent_class gimp_layer_parent_class
+
+static guint layer_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_layer_class_init (GimpLayerClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpFilterClass   *filter_class      = GIMP_FILTER_CLASS (klass);
+  GimpItemClass     *item_class        = GIMP_ITEM_CLASS (klass);
+  GimpDrawableClass *drawable_class    = GIMP_DRAWABLE_CLASS (klass);
+
+  layer_signals[OPACITY_CHANGED] =
+    g_signal_new ("opacity-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, opacity_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[MODE_CHANGED] =
+    g_signal_new ("mode-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, mode_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[BLEND_SPACE_CHANGED] =
+    g_signal_new ("blend-space-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, blend_space_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[COMPOSITE_SPACE_CHANGED] =
+    g_signal_new ("composite-space-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, composite_space_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[COMPOSITE_MODE_CHANGED] =
+    g_signal_new ("composite-mode-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, composite_mode_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[EFFECTIVE_MODE_CHANGED] =
+    g_signal_new ("effective-mode-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, effective_mode_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[EXCLUDES_BACKDROP_CHANGED] =
+    g_signal_new ("excludes-backdrop-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, excludes_backdrop_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[LOCK_ALPHA_CHANGED] =
+    g_signal_new ("lock-alpha-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, lock_alpha_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[MASK_CHANGED] =
+    g_signal_new ("mask-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, mask_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[APPLY_MASK_CHANGED] =
+    g_signal_new ("apply-mask-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, apply_mask_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[EDIT_MASK_CHANGED] =
+    g_signal_new ("edit-mask-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, edit_mask_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  layer_signals[SHOW_MASK_CHANGED] =
+    g_signal_new ("show-mask-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLayerClass, show_mask_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->set_property          = gimp_layer_set_property;
+  object_class->get_property          = gimp_layer_get_property;
+  object_class->dispose               = gimp_layer_dispose;
+  object_class->finalize              = gimp_layer_finalize;
+  object_class->notify                = gimp_layer_notify;
+
+  gimp_object_class->name_changed     = gimp_layer_name_changed;
+  gimp_object_class->get_memsize      = gimp_layer_get_memsize;
+
+  viewable_class->default_icon_name   = "gimp-layer";
+  viewable_class->invalidate_preview  = gimp_layer_invalidate_preview;
+  viewable_class->get_description     = gimp_layer_get_description;
+
+  filter_class->get_node              = gimp_layer_get_node;
+
+  item_class->removed                 = gimp_layer_removed;
+  item_class->unset_removed           = gimp_layer_unset_removed;
+  item_class->is_attached             = gimp_layer_is_attached;
+  item_class->get_tree                = gimp_layer_get_tree;
+  item_class->duplicate               = gimp_layer_duplicate;
+  item_class->convert                 = gimp_layer_convert;
+  item_class->rename                  = gimp_layer_rename;
+  item_class->start_move              = gimp_layer_start_move;
+  item_class->end_move                = gimp_layer_end_move;
+  item_class->translate               = gimp_layer_translate;
+  item_class->scale                   = gimp_layer_scale;
+  item_class->resize                  = gimp_layer_resize;
+  item_class->flip                    = gimp_layer_flip;
+  item_class->rotate                  = gimp_layer_rotate;
+  item_class->transform               = gimp_layer_transform;
+  item_class->to_selection            = gimp_layer_to_selection;
+  item_class->default_name            = _("Layer");
+  item_class->rename_desc             = C_("undo-type", "Rename Layer");
+  item_class->translate_desc          = C_("undo-type", "Move Layer");
+  item_class->scale_desc              = C_("undo-type", "Scale Layer");
+  item_class->resize_desc             = C_("undo-type", "Resize Layer");
+  item_class->flip_desc               = C_("undo-type", "Flip Layer");
+  item_class->rotate_desc             = C_("undo-type", "Rotate Layer");
+  item_class->transform_desc          = C_("undo-type", "Transform Layer");
+  item_class->to_selection_desc       = C_("undo-type", "Alpha to Selection");
+  item_class->reorder_desc            = C_("undo-type", "Reorder Layer");
+  item_class->raise_desc              = C_("undo-type", "Raise Layer");
+  item_class->raise_to_top_desc       = C_("undo-type", "Raise Layer to Top");
+  item_class->lower_desc              = C_("undo-type", "Lower Layer");
+  item_class->lower_to_bottom_desc    = C_("undo-type", "Lower Layer to Bottom");
+  item_class->raise_failed            = _("Layer cannot be raised higher.");
+  item_class->lower_failed            = _("Layer cannot be lowered more.");
+
+  drawable_class->alpha_changed         = gimp_layer_alpha_changed;
+  drawable_class->estimate_memsize      = gimp_layer_estimate_memsize;
+  drawable_class->supports_alpha        = gimp_layer_supports_alpha;
+  drawable_class->convert_type          = gimp_layer_convert_type;
+  drawable_class->invalidate_boundary   = gimp_layer_invalidate_boundary;
+  drawable_class->get_active_components = gimp_layer_get_active_components;
+  drawable_class->get_active_mask       = gimp_layer_get_active_mask;
+  drawable_class->set_buffer            = gimp_layer_set_buffer;
+  drawable_class->get_bounding_box      = gimp_layer_get_bounding_box;
+
+  klass->opacity_changed              = NULL;
+  klass->mode_changed                 = NULL;
+  klass->blend_space_changed          = NULL;
+  klass->composite_space_changed      = NULL;
+  klass->composite_mode_changed       = NULL;
+  klass->excludes_backdrop_changed    = NULL;
+  klass->lock_alpha_changed           = NULL;
+  klass->mask_changed                 = NULL;
+  klass->apply_mask_changed           = NULL;
+  klass->edit_mask_changed            = NULL;
+  klass->show_mask_changed            = NULL;
+  klass->translate                    = gimp_layer_real_translate;
+  klass->scale                        = gimp_layer_real_scale;
+  klass->resize                       = gimp_layer_real_resize;
+  klass->flip                         = gimp_layer_real_flip;
+  klass->rotate                       = gimp_layer_real_rotate;
+  klass->transform                    = gimp_layer_real_transform;
+  klass->convert_type                 = gimp_layer_real_convert_type;
+  klass->get_bounding_box             = gimp_layer_real_get_bounding_box;
+  klass->get_effective_mode           = gimp_layer_real_get_effective_mode;
+  klass->get_excludes_backdrop        = gimp_layer_real_get_excludes_backdrop;
+
+  g_object_class_install_property (object_class, PROP_OPACITY,
+                                   g_param_spec_double ("opacity", NULL, NULL,
+                                                        GIMP_OPACITY_TRANSPARENT,
+                                                        GIMP_OPACITY_OPAQUE,
+                                                        GIMP_OPACITY_OPAQUE,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_MODE,
+                                   g_param_spec_enum ("mode", NULL, NULL,
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_BLEND_SPACE,
+                                   g_param_spec_enum ("blend-space",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                      GIMP_LAYER_COLOR_SPACE_AUTO,
+                                                      GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_COMPOSITE_SPACE,
+                                   g_param_spec_enum ("composite-space",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                      GIMP_LAYER_COLOR_SPACE_AUTO,
+                                                      GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_COMPOSITE_MODE,
+                                   g_param_spec_enum ("composite-mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_COMPOSITE_MODE,
+                                                      GIMP_LAYER_COMPOSITE_AUTO,
+                                                      GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_EXCLUDES_BACKDROP,
+                                   g_param_spec_boolean ("excludes-backdrop",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_LOCK_ALPHA,
+                                   g_param_spec_boolean ("lock-alpha",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_MASK,
+                                   g_param_spec_object ("mask",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_LAYER_MASK,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_FLOATING_SELECTION,
+                                   g_param_spec_boolean ("floating-selection",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_layer_init (GimpLayer *layer)
+{
+  layer->opacity                   = GIMP_OPACITY_OPAQUE;
+  layer->mode                      = GIMP_LAYER_MODE_NORMAL;
+  layer->blend_space               = GIMP_LAYER_COLOR_SPACE_AUTO;
+  layer->composite_space           = GIMP_LAYER_COLOR_SPACE_AUTO;
+  layer->composite_mode            = GIMP_LAYER_COMPOSITE_AUTO;
+  layer->effective_mode            = layer->mode;
+  layer->effective_blend_space     = gimp_layer_get_real_blend_space (layer);
+  layer->effective_composite_space = gimp_layer_get_real_composite_space (layer);
+  layer->effective_composite_mode  = gimp_layer_get_real_composite_mode (layer);
+  layer->excludes_backdrop         = FALSE;
+  layer->lock_alpha                = FALSE;
+
+  layer->mask       = NULL;
+  layer->apply_mask = TRUE;
+  layer->edit_mask  = TRUE;
+  layer->show_mask  = FALSE;
+
+  /*  floating selection  */
+  layer->fs.drawable       = NULL;
+  layer->fs.boundary_known = FALSE;
+  layer->fs.segs           = NULL;
+  layer->fs.num_segs       = 0;
+}
+
+static void
+gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
+{
+  iface->get_color_profile = gimp_layer_get_color_profile;
+}
+
+static void
+gimp_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->get_opacity_at = gimp_layer_get_opacity_at;
+  iface->pixel_to_srgb  = gimp_layer_pixel_to_srgb;
+  iface->srgb_to_pixel  = gimp_layer_srgb_to_pixel;
+}
+
+static void
+gimp_layer_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_get_property (GObject    *object,
+                         guint       property_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GimpLayer *layer = GIMP_LAYER (object);
+
+  switch (property_id)
+    {
+    case PROP_OPACITY:
+      g_value_set_double (value, gimp_layer_get_opacity (layer));
+      break;
+    case PROP_MODE:
+      g_value_set_enum (value, gimp_layer_get_mode (layer));
+      break;
+    case PROP_BLEND_SPACE:
+      g_value_set_enum (value, gimp_layer_get_blend_space (layer));
+      break;
+    case PROP_COMPOSITE_SPACE:
+      g_value_set_enum (value, gimp_layer_get_composite_space (layer));
+      break;
+    case PROP_COMPOSITE_MODE:
+      g_value_set_enum (value, gimp_layer_get_composite_mode (layer));
+      break;
+    case PROP_EXCLUDES_BACKDROP:
+      g_value_set_boolean (value, gimp_layer_get_excludes_backdrop (layer));
+      break;
+    case PROP_LOCK_ALPHA:
+      g_value_set_boolean (value, gimp_layer_get_lock_alpha (layer));
+      break;
+    case PROP_MASK:
+      g_value_set_object (value, gimp_layer_get_mask (layer));
+      break;
+    case PROP_FLOATING_SELECTION:
+      g_value_set_boolean (value, gimp_layer_is_floating_sel (layer));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_dispose (GObject *object)
+{
+  GimpLayer *layer = GIMP_LAYER (object);
+
+  if (layer->mask)
+    g_signal_handlers_disconnect_by_func (layer->mask,
+                                          gimp_layer_layer_mask_update,
+                                          layer);
+
+  if (gimp_layer_is_floating_sel (layer))
+    {
+      GimpDrawable *fs_drawable = gimp_layer_get_floating_sel_drawable (layer);
+
+      /* only detach if this is actually the drawable's fs because the
+       * layer might be on the undo stack and not attached to anything
+       */
+      if (gimp_drawable_get_floating_sel (fs_drawable) == layer)
+        gimp_drawable_detach_floating_sel (fs_drawable);
+
+      gimp_layer_set_floating_sel_drawable (layer, NULL);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_layer_finalize (GObject *object)
+{
+  GimpLayer *layer = GIMP_LAYER (object);
+
+  g_clear_object (&layer->mask);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_layer_update_mode_node (GimpLayer *layer)
+{
+  GeglNode               *mode_node;
+  GimpLayerMode           visible_mode;
+  GimpLayerColorSpace     visible_blend_space;
+  GimpLayerColorSpace     visible_composite_space;
+  GimpLayerCompositeMode  visible_composite_mode;
+
+  mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (layer));
+
+  if (layer->mask && layer->show_mask)
+    {
+      visible_mode            = GIMP_LAYER_MODE_NORMAL;
+      visible_blend_space     = GIMP_LAYER_COLOR_SPACE_AUTO;
+      visible_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+      visible_composite_mode  = GIMP_LAYER_COMPOSITE_AUTO;
+
+      /* This makes sure that masks of LEGACY-mode layers are
+       * composited in PERCEPTUAL space, and non-LEGACY layers in
+       * LINEAR space, or whatever composite space was chosen in the
+       * layer attributes dialog
+       */
+      visible_composite_space = gimp_layer_get_real_composite_space (layer);
+    }
+  else
+    {
+      visible_mode            = layer->effective_mode;
+      visible_blend_space     = layer->effective_blend_space;
+      visible_composite_space = layer->effective_composite_space;
+      visible_composite_mode  = layer->effective_composite_mode;
+    }
+
+  gimp_gegl_mode_node_set_mode (mode_node,
+                                visible_mode,
+                                visible_blend_space,
+                                visible_composite_space,
+                                visible_composite_mode);
+  gimp_gegl_mode_node_set_opacity (mode_node, layer->opacity);
+}
+
+static void
+gimp_layer_notify (GObject    *object,
+                   GParamSpec *pspec)
+{
+  if (! strcmp (pspec->name, "is-last-node") &&
+      gimp_filter_peek_node (GIMP_FILTER (object)))
+    {
+      gimp_layer_update_mode_node (GIMP_LAYER (object));
+
+      gimp_drawable_update (GIMP_DRAWABLE (object), 0, 0, -1, -1);
+    }
+}
+
+static void
+gimp_layer_name_changed (GimpObject *object)
+{
+  GimpLayer *layer = GIMP_LAYER (object);
+
+  if (GIMP_OBJECT_CLASS (parent_class)->name_changed)
+    GIMP_OBJECT_CLASS (parent_class)->name_changed (object);
+
+  if (layer->mask)
+    {
+      gchar *mask_name = g_strdup_printf (_("%s mask"),
+                                          gimp_object_get_name (object));
+
+      gimp_object_take_name (GIMP_OBJECT (layer->mask), mask_name);
+    }
+}
+
+static gint64
+gimp_layer_get_memsize (GimpObject *object,
+                        gint64     *gui_size)
+{
+  GimpLayer *layer   = GIMP_LAYER (object);
+  gint64     memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (layer->mask), gui_size);
+
+  *gui_size += layer->fs.num_segs * sizeof (GimpBoundSeg);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_layer_invalidate_preview (GimpViewable *viewable)
+{
+  GimpLayer *layer = GIMP_LAYER (viewable);
+
+  GIMP_VIEWABLE_CLASS (parent_class)->invalidate_preview (viewable);
+
+  if (gimp_layer_is_floating_sel (layer))
+    floating_sel_invalidate (layer);
+}
+
+static gchar *
+gimp_layer_get_description (GimpViewable  *viewable,
+                            gchar        **tooltip)
+{
+  if (gimp_layer_is_floating_sel (GIMP_LAYER (viewable)))
+    {
+      return g_strdup_printf (_("Floating Selection\n(%s)"),
+                              gimp_object_get_name (viewable));
+    }
+
+  return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable,
+                                                              tooltip);
+}
+
+static GeglNode *
+gimp_layer_get_node (GimpFilter *filter)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (filter);
+  GimpLayer    *layer    = GIMP_LAYER (filter);
+  GeglNode     *node;
+  GeglNode     *input;
+  GeglNode     *source;
+  GeglNode     *mode_node;
+  gboolean      source_node_hijacked = FALSE;
+
+  node = GIMP_FILTER_CLASS (parent_class)->get_node (filter);
+
+  input = gegl_node_get_input_proxy (node, "input");
+
+  source = gimp_drawable_get_source_node (drawable);
+
+  /* if the source node already has a parent, we are a floating
+   * selection and the source node has been hijacked by the fs'
+   * drawable
+   */
+  if (gegl_node_get_parent (source))
+    source_node_hijacked = TRUE;
+
+  if (! source_node_hijacked)
+    gegl_node_add_child (node, source);
+
+  gegl_node_connect_to (input,  "output",
+                        source, "input");
+
+  g_warn_if_fail (layer->layer_offset_node == NULL);
+  g_warn_if_fail (layer->mask_offset_node == NULL);
+
+  /* the mode node connects it all, and has aux and aux2 inputs for
+   * the layer and its mask
+   */
+  mode_node = gimp_drawable_get_mode_node (drawable);
+  gimp_layer_update_mode_node (layer);
+
+  /* the layer's offset node */
+  layer->layer_offset_node = gegl_node_new_child (node,
+                                                  "operation", "gegl:translate",
+                                                  NULL);
+  gimp_item_add_offset_node (GIMP_ITEM (layer), layer->layer_offset_node);
+
+  /* the layer mask's offset node */
+  layer->mask_offset_node = gegl_node_new_child (node,
+                                                 "operation", "gegl:translate",
+                                                  NULL);
+  gimp_item_add_offset_node (GIMP_ITEM (layer), layer->mask_offset_node);
+
+  if (! source_node_hijacked)
+    {
+      gegl_node_connect_to (source,                   "output",
+                            layer->layer_offset_node, "input");
+    }
+
+  if (! (layer->mask && gimp_layer_get_show_mask (layer)))
+    {
+      gegl_node_connect_to (layer->layer_offset_node, "output",
+                            mode_node,                "aux");
+    }
+
+  if (layer->mask)
+    {
+      GeglNode *mask;
+
+      mask = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer->mask));
+
+      gegl_node_connect_to (mask,                    "output",
+                            layer->mask_offset_node, "input");
+
+      if (gimp_layer_get_show_mask (layer))
+        {
+          gegl_node_connect_to (layer->mask_offset_node, "output",
+                                mode_node,               "aux");
+        }
+      else if (gimp_layer_get_apply_mask (layer))
+        {
+          gegl_node_connect_to (layer->mask_offset_node, "output",
+                                mode_node,               "aux2");
+        }
+    }
+
+  return node;
+}
+
+static void
+gimp_layer_removed (GimpItem *item)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+
+  if (layer->mask)
+    gimp_item_removed (GIMP_ITEM (layer->mask));
+
+  if (GIMP_ITEM_CLASS (parent_class)->removed)
+    GIMP_ITEM_CLASS (parent_class)->removed (item);
+}
+
+static void
+gimp_layer_unset_removed (GimpItem *item)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+
+  if (layer->mask)
+    gimp_item_unset_removed (GIMP_ITEM (layer->mask));
+
+  if (GIMP_ITEM_CLASS (parent_class)->unset_removed)
+    GIMP_ITEM_CLASS (parent_class)->unset_removed (item);
+}
+
+static gboolean
+gimp_layer_is_attached (GimpItem *item)
+{
+  GimpImage *image = gimp_item_get_image (item);
+
+  return (GIMP_IS_IMAGE (image) &&
+          gimp_container_have (gimp_image_get_layers (image),
+                               GIMP_OBJECT (item)));
+}
+
+static GimpItemTree *
+gimp_layer_get_tree (GimpItem *item)
+{
+  if (gimp_item_is_attached (item))
+    {
+      GimpImage *image = gimp_item_get_image (item);
+
+      return gimp_image_get_layer_tree (image);
+    }
+
+  return NULL;
+}
+
+static GimpItem *
+gimp_layer_duplicate (GimpItem *item,
+                      GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  if (GIMP_IS_LAYER (new_item))
+    {
+      GimpLayer *layer     = GIMP_LAYER (item);
+      GimpLayer *new_layer = GIMP_LAYER (new_item);
+
+      gimp_layer_set_mode            (new_layer,
+                                      gimp_layer_get_mode (layer), FALSE);
+      gimp_layer_set_blend_space     (new_layer,
+                                      gimp_layer_get_blend_space (layer), FALSE);
+      gimp_layer_set_composite_space (new_layer,
+                                      gimp_layer_get_composite_space (layer), FALSE);
+      gimp_layer_set_composite_mode  (new_layer,
+                                      gimp_layer_get_composite_mode (layer), FALSE);
+      gimp_layer_set_opacity         (new_layer,
+                                      gimp_layer_get_opacity (layer), FALSE);
+
+      if (gimp_layer_can_lock_alpha (new_layer))
+        gimp_layer_set_lock_alpha (new_layer,
+                                   gimp_layer_get_lock_alpha (layer), FALSE);
+
+      /*  duplicate the layer mask if necessary  */
+      if (layer->mask)
+        {
+          GimpItem *mask;
+
+          mask = gimp_item_duplicate (GIMP_ITEM (layer->mask),
+                                      G_TYPE_FROM_INSTANCE (layer->mask));
+          gimp_layer_add_mask (new_layer, GIMP_LAYER_MASK (mask), FALSE, NULL);
+
+          new_layer->apply_mask = layer->apply_mask;
+          new_layer->edit_mask  = layer->edit_mask;
+          new_layer->show_mask  = layer->show_mask;
+        }
+    }
+
+  return new_item;
+}
+
+static void
+gimp_layer_convert (GimpItem  *item,
+                    GimpImage *dest_image,
+                    GType      old_type)
+{
+  GimpLayer         *layer    = GIMP_LAYER (item);
+  GimpDrawable      *drawable = GIMP_DRAWABLE (item);
+  GimpImageBaseType  old_base_type;
+  GimpImageBaseType  new_base_type;
+  GimpPrecision      old_precision;
+  GimpPrecision      new_precision;
+  GimpColorProfile  *dest_profile = NULL;
+
+  old_base_type = gimp_drawable_get_base_type (drawable);
+  new_base_type = gimp_image_get_base_type (dest_image);
+
+  old_precision = gimp_drawable_get_precision (drawable);
+  new_precision = gimp_image_get_precision (dest_image);
+
+  if (g_type_is_a (old_type, GIMP_TYPE_LAYER) &&
+      gimp_image_get_is_color_managed (dest_image))
+    {
+      GimpColorProfile *src_profile =
+        gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (item));
+
+      dest_profile =
+        gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (dest_image));
+
+      if (gimp_color_profile_is_equal (dest_profile, src_profile))
+        dest_profile = NULL;
+    }
+
+  if (old_base_type != new_base_type ||
+      old_precision != new_precision ||
+      dest_profile)
+    {
+      gimp_drawable_convert_type (drawable, dest_image,
+                                  new_base_type,
+                                  new_precision,
+                                  gimp_drawable_has_alpha (drawable),
+                                  dest_profile,
+                                  GEGL_DITHER_NONE, GEGL_DITHER_NONE,
+                                  FALSE, NULL);
+    }
+
+  if (layer->mask)
+    gimp_item_set_image (GIMP_ITEM (layer->mask), dest_image);
+
+  GIMP_ITEM_CLASS (parent_class)->convert (item, dest_image, old_type);
+}
+
+static gboolean
+gimp_layer_rename (GimpItem     *item,
+                   const gchar  *new_name,
+                   const gchar  *undo_desc,
+                   GError      **error)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+  GimpImage *image = gimp_item_get_image (item);
+  gboolean   attached;
+  gboolean   floating_sel;
+
+  attached     = gimp_item_is_attached (item);
+  floating_sel = gimp_layer_is_floating_sel (layer);
+
+  if (floating_sel)
+    {
+      if (GIMP_IS_CHANNEL (gimp_layer_get_floating_sel_drawable (layer)))
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("Cannot create a new layer from the floating "
+                                 "selection because it belongs to a layer mask "
+                                 "or channel."));
+          return FALSE;
+        }
+
+      if (attached)
+        {
+          gimp_image_undo_group_start (image,
+                                       GIMP_UNDO_GROUP_ITEM_PROPERTIES,
+                                       undo_desc);
+
+          floating_sel_to_layer (layer, NULL);
+        }
+    }
+
+  GIMP_ITEM_CLASS (parent_class)->rename (item, new_name, undo_desc, error);
+
+  if (attached && floating_sel)
+    gimp_image_undo_group_end (image);
+
+  return TRUE;
+}
+
+static void
+gimp_layer_start_move (GimpItem *item,
+                       gboolean  push_undo)
+{
+  GimpLayer *layer     = GIMP_LAYER (item);
+  GimpLayer *ancestor  = layer;
+  GSList    *ancestors = NULL;
+
+  /* suspend mask cropping for all of the layer's ancestors */
+  while ((ancestor = gimp_layer_get_parent (ancestor)))
+    {
+      gimp_group_layer_suspend_mask (GIMP_GROUP_LAYER (ancestor), push_undo);
+
+      ancestors = g_slist_prepend (ancestors, g_object_ref (ancestor));
+    }
+
+  /* we keep the ancestor list around, so that we can resume mask cropping for
+   * the same set of groups in gimp_layer_end_move().  note that
+   * gimp_image_remove_layer() calls start_move() before removing the layer,
+   * while it's still part of the layer tree, and end_move() afterwards, when
+   * it's no longer part of the layer tree, and hence we can't use get_parent()
+   * in end_move() to get the same set of ancestors.
+   */
+  layer->move_stack = g_slist_prepend (layer->move_stack, ancestors);
+
+  if (GIMP_ITEM_CLASS (parent_class)->start_move)
+    GIMP_ITEM_CLASS (parent_class)->start_move (item, push_undo);
+}
+
+static void
+gimp_layer_end_move (GimpItem *item,
+                     gboolean  push_undo)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+  GSList    *ancestors;
+  GSList    *iter;
+
+  g_return_if_fail (layer->move_stack != NULL);
+
+  if (GIMP_ITEM_CLASS (parent_class)->end_move)
+    GIMP_ITEM_CLASS (parent_class)->end_move (item, push_undo);
+
+  ancestors = layer->move_stack->data;
+
+  layer->move_stack = g_slist_remove (layer->move_stack, ancestors);
+
+  /* resume mask cropping for all of the layer's ancestors */
+  for (iter = ancestors; iter; iter = g_slist_next (iter))
+    {
+      GimpGroupLayer *ancestor = iter->data;
+
+      gimp_group_layer_resume_mask (ancestor, push_undo);
+
+      g_object_unref (ancestor);
+    }
+
+  g_slist_free (ancestors);
+}
+
+static void
+gimp_layer_translate (GimpItem *item,
+                      gdouble   offset_x,
+                      gdouble   offset_y,
+                      gboolean  push_undo)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+
+  if (push_undo)
+    gimp_image_undo_push_item_displace (gimp_item_get_image (item), NULL, item);
+
+  GIMP_LAYER_GET_CLASS (layer)->translate (layer,
+                                           SIGNED_ROUND (offset_x),
+                                           SIGNED_ROUND (offset_y));
+
+  if (layer->mask)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (item, &off_x, &off_y);
+      gimp_item_set_offset (GIMP_ITEM (layer->mask), off_x, off_y);
+
+      gimp_viewable_invalidate_preview (GIMP_VIEWABLE (layer->mask));
+    }
+}
+
+static void
+gimp_layer_scale (GimpItem              *item,
+                  gint                   new_width,
+                  gint                   new_height,
+                  gint                   new_offset_x,
+                  gint                   new_offset_y,
+                  GimpInterpolationType  interpolation_type,
+                  GimpProgress          *progress)
+{
+  GimpLayer       *layer = GIMP_LAYER (item);
+  GimpObjectQueue *queue = NULL;
+
+  if (progress && layer->mask)
+    {
+      GimpLayerMask *mask;
+
+      queue    = gimp_object_queue_new (progress);
+      progress = GIMP_PROGRESS (queue);
+
+      /* temporarily set layer->mask to NULL, so that its size won't be counted
+       * when pushing the layer to the queue.
+       */
+      mask        = layer->mask;
+      layer->mask = NULL;
+
+      gimp_object_queue_push (queue, layer);
+      gimp_object_queue_push (queue, mask);
+
+      layer->mask = mask;
+    }
+
+  if (queue)
+    gimp_object_queue_pop (queue);
+
+  GIMP_LAYER_GET_CLASS (layer)->scale (layer, new_width, new_height,
+                                       new_offset_x, new_offset_y,
+                                       interpolation_type, progress);
+
+  if (layer->mask)
+    {
+      if (queue)
+        gimp_object_queue_pop (queue);
+
+      gimp_item_scale (GIMP_ITEM (layer->mask),
+                       new_width, new_height,
+                       new_offset_x, new_offset_y,
+                       interpolation_type, progress);
+    }
+
+  g_clear_object (&queue);
+}
+
+static void
+gimp_layer_resize (GimpItem     *item,
+                   GimpContext  *context,
+                   GimpFillType  fill_type,
+                   gint          new_width,
+                   gint          new_height,
+                   gint          offset_x,
+                   gint          offset_y)
+{
+  GimpLayer *layer  = GIMP_LAYER (item);
+
+  GIMP_LAYER_GET_CLASS (layer)->resize (layer, context, fill_type,
+                                        new_width, new_height,
+                                        offset_x, offset_y);
+
+  if (layer->mask)
+    gimp_item_resize (GIMP_ITEM (layer->mask), context, GIMP_FILL_TRANSPARENT,
+                      new_width, new_height, offset_x, offset_y);
+}
+
+static void
+gimp_layer_flip (GimpItem            *item,
+                 GimpContext         *context,
+                 GimpOrientationType  flip_type,
+                 gdouble              axis,
+                 gboolean             clip_result)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+
+  GIMP_LAYER_GET_CLASS (layer)->flip (layer, context, flip_type, axis,
+                                      clip_result);
+
+  if (layer->mask)
+    gimp_item_flip (GIMP_ITEM (layer->mask), context,
+                    flip_type, axis, clip_result);
+}
+
+static void
+gimp_layer_rotate (GimpItem         *item,
+                   GimpContext      *context,
+                   GimpRotationType  rotate_type,
+                   gdouble           center_x,
+                   gdouble           center_y,
+                   gboolean          clip_result)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+
+  GIMP_LAYER_GET_CLASS (layer)->rotate (layer, context,
+                                        rotate_type, center_x, center_y,
+                                        clip_result);
+
+  if (layer->mask)
+    gimp_item_rotate (GIMP_ITEM (layer->mask), context,
+                      rotate_type, center_x, center_y, clip_result);
+}
+
+static void
+gimp_layer_transform (GimpItem               *item,
+                      GimpContext            *context,
+                      const GimpMatrix3      *matrix,
+                      GimpTransformDirection  direction,
+                      GimpInterpolationType   interpolation_type,
+                      GimpTransformResize     clip_result,
+                      GimpProgress           *progress)
+{
+  GimpLayer       *layer = GIMP_LAYER (item);
+  GimpObjectQueue *queue = NULL;
+
+  if (progress && layer->mask)
+    {
+      GimpLayerMask *mask;
+
+      queue    = gimp_object_queue_new (progress);
+      progress = GIMP_PROGRESS (queue);
+
+      /* temporarily set layer->mask to NULL, so that its size won't be counted
+       * when pushing the layer to the queue.
+       */
+      mask        = layer->mask;
+      layer->mask = NULL;
+
+      gimp_object_queue_push (queue, layer);
+      gimp_object_queue_push (queue, mask);
+
+      layer->mask = mask;
+    }
+
+  if (queue)
+    gimp_object_queue_pop (queue);
+
+  GIMP_LAYER_GET_CLASS (layer)->transform (layer, context, matrix, direction,
+                                           interpolation_type,
+                                           clip_result,
+                                           progress);
+
+  if (layer->mask)
+    {
+      if (queue)
+        gimp_object_queue_pop (queue);
+
+      gimp_item_transform (GIMP_ITEM (layer->mask), context,
+                           matrix, direction,
+                           interpolation_type,
+                           clip_result, progress);
+    }
+
+  g_clear_object (&queue);
+}
+
+static void
+gimp_layer_to_selection (GimpItem       *item,
+                         GimpChannelOps  op,
+                         gboolean        antialias,
+                         gboolean        feather,
+                         gdouble         feather_radius_x,
+                         gdouble         feather_radius_y)
+{
+  GimpLayer *layer = GIMP_LAYER (item);
+  GimpImage *image = gimp_item_get_image (item);
+
+  gimp_channel_select_alpha (gimp_image_get_mask (image),
+                             GIMP_DRAWABLE (layer),
+                             op,
+                             feather, feather_radius_x, feather_radius_y);
+}
+
+static void
+gimp_layer_alpha_changed (GimpDrawable *drawable)
+{
+  if (GIMP_DRAWABLE_CLASS (parent_class)->alpha_changed)
+    GIMP_DRAWABLE_CLASS (parent_class)->alpha_changed (drawable);
+
+  /* When we add/remove alpha, whatever cached color transforms in
+   * view renderers need to be recreated because they cache the wrong
+   * lcms formats. See bug 478528.
+   */
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (drawable));
+}
+
+static gint64
+gimp_layer_estimate_memsize (GimpDrawable      *drawable,
+                             GimpComponentType  component_type,
+                             gint               width,
+                             gint               height)
+{
+  GimpLayer *layer   = GIMP_LAYER (drawable);
+  gint64     memsize = 0;
+
+  if (layer->mask)
+    memsize += gimp_drawable_estimate_memsize (GIMP_DRAWABLE (layer->mask),
+                                               component_type,
+                                               width, height);
+
+  return memsize +
+         GIMP_DRAWABLE_CLASS (parent_class)->estimate_memsize (drawable,
+                                                               component_type,
+                                                               width, height);
+}
+
+static gboolean
+gimp_layer_supports_alpha (GimpDrawable *drawable)
+{
+  return TRUE;
+}
+
+static void
+gimp_layer_convert_type (GimpDrawable     *drawable,
+                         GimpImage        *dest_image,
+                         const Babl       *new_format,
+                         GimpColorProfile *dest_profile,
+                         GeglDitherMethod  layer_dither_type,
+                         GeglDitherMethod  mask_dither_type,
+                         gboolean          push_undo,
+                         GimpProgress     *progress)
+{
+  GimpLayer       *layer = GIMP_LAYER (drawable);
+  GimpObjectQueue *queue = NULL;
+  gboolean         convert_mask;
+
+  convert_mask = layer->mask &&
+                 gimp_babl_format_get_precision (new_format) !=
+                 gimp_drawable_get_precision (GIMP_DRAWABLE (layer->mask));
+
+  if (progress && convert_mask)
+    {
+      GimpLayerMask *mask;
+
+      queue    = gimp_object_queue_new (progress);
+      progress = GIMP_PROGRESS (queue);
+
+      /* temporarily set layer->mask to NULL, so that its size won't be counted
+       * when pushing the layer to the queue.
+       */
+      mask        = layer->mask;
+      layer->mask = NULL;
+
+      gimp_object_queue_push (queue, layer);
+      gimp_object_queue_push (queue, mask);
+
+      layer->mask = mask;
+    }
+
+  if (queue)
+    gimp_object_queue_pop (queue);
+
+  GIMP_LAYER_GET_CLASS (layer)->convert_type (layer, dest_image, new_format,
+                                              dest_profile, layer_dither_type,
+                                              mask_dither_type, push_undo,
+                                              progress);
+
+  if (convert_mask)
+    {
+      if (queue)
+        gimp_object_queue_pop (queue);
+
+      gimp_drawable_convert_type (GIMP_DRAWABLE (layer->mask), dest_image,
+                                  GIMP_GRAY,
+                                  gimp_babl_format_get_precision (new_format),
+                                  gimp_drawable_has_alpha (GIMP_DRAWABLE (layer->mask)),
+                                  NULL,
+                                  layer_dither_type, mask_dither_type,
+                                  push_undo, progress);
+    }
+
+  g_clear_object (&queue);
+}
+
+static void
+gimp_layer_invalidate_boundary (GimpDrawable *drawable)
+{
+  GimpLayer *layer = GIMP_LAYER (drawable);
+
+  if (gimp_item_is_attached (GIMP_ITEM (drawable)) &&
+      gimp_item_is_visible (GIMP_ITEM (drawable)))
+    {
+      GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+      GimpChannel *mask  = gimp_image_get_mask (image);
+
+      /*  Turn the current selection off  */
+      gimp_image_selection_invalidate (image);
+
+      /*  Only bother with the bounds if there is a selection  */
+      if (! gimp_channel_is_empty (mask))
+        {
+          mask->bounds_known   = FALSE;
+          mask->boundary_known = FALSE;
+        }
+    }
+
+  if (gimp_layer_is_floating_sel (layer))
+    floating_sel_invalidate (layer);
+}
+
+static void
+gimp_layer_get_active_components (GimpDrawable *drawable,
+                                  gboolean     *active)
+{
+  GimpLayer  *layer  = GIMP_LAYER (drawable);
+  GimpImage  *image  = gimp_item_get_image (GIMP_ITEM (drawable));
+  const Babl *format = gimp_drawable_get_format (drawable);
+
+  /*  first copy the image active channels  */
+  gimp_image_get_active_array (image, active);
+
+  if (gimp_drawable_has_alpha (drawable) && layer->lock_alpha)
+    active[babl_format_get_n_components (format) - 1] = FALSE;
+}
+
+static GimpComponentMask
+gimp_layer_get_active_mask (GimpDrawable *drawable)
+{
+  GimpLayer         *layer = GIMP_LAYER (drawable);
+  GimpImage         *image = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpComponentMask  mask  = gimp_image_get_active_mask (image);
+
+  if (gimp_drawable_has_alpha (drawable) && layer->lock_alpha)
+    mask &= ~GIMP_COMPONENT_MASK_ALPHA;
+
+  return mask;
+}
+
+static void
+gimp_layer_set_buffer (GimpDrawable        *drawable,
+                       gboolean             push_undo,
+                       const gchar         *undo_desc,
+                       GeglBuffer          *buffer,
+                       const GeglRectangle *bounds)
+{
+  GeglBuffer *old_buffer = gimp_drawable_get_buffer (drawable);
+  gint        old_linear = -1;
+
+  if (old_buffer)
+    old_linear = gimp_drawable_get_linear (drawable);
+
+  GIMP_DRAWABLE_CLASS (parent_class)->set_buffer (drawable,
+                                                  push_undo, undo_desc,
+                                                  buffer, bounds);
+
+  if (gimp_filter_peek_node (GIMP_FILTER (drawable)))
+    {
+      if (gimp_drawable_get_linear (drawable) != old_linear)
+        gimp_layer_update_mode_node (GIMP_LAYER (drawable));
+    }
+}
+
+static GeglRectangle
+gimp_layer_get_bounding_box (GimpDrawable *drawable)
+{
+  GimpLayer     *layer = GIMP_LAYER (drawable);
+  GimpLayerMask *mask  = gimp_layer_get_mask (layer);
+  GeglRectangle  bounding_box;
+
+  if (mask && gimp_layer_get_show_mask (layer))
+    {
+      bounding_box = gimp_drawable_get_bounding_box (GIMP_DRAWABLE (mask));
+    }
+  else
+    {
+      bounding_box = GIMP_LAYER_GET_CLASS (layer)->get_bounding_box (layer);
+
+      if (mask && gimp_layer_get_apply_mask (layer))
+        {
+          GeglRectangle mask_bounding_box;
+
+          mask_bounding_box = gimp_drawable_get_bounding_box (
+            GIMP_DRAWABLE (mask));
+
+          gegl_rectangle_intersect (&bounding_box,
+                                    &bounding_box, &mask_bounding_box);
+        }
+    }
+
+  return bounding_box;
+}
+
+static GimpColorProfile *
+gimp_layer_get_color_profile (GimpColorManaged *managed)
+{
+  GimpImage *image = gimp_item_get_image (GIMP_ITEM (managed));
+
+  return gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+}
+
+static gdouble
+gimp_layer_get_opacity_at (GimpPickable *pickable,
+                           gint          x,
+                           gint          y)
+{
+  GimpLayer *layer = GIMP_LAYER (pickable);
+  gdouble    value = GIMP_OPACITY_TRANSPARENT;
+
+  if (x >= 0 && x < gimp_item_get_width  (GIMP_ITEM (layer)) &&
+      y >= 0 && y < gimp_item_get_height (GIMP_ITEM (layer)) &&
+      gimp_item_is_visible (GIMP_ITEM (layer)))
+    {
+      if (! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+        {
+          value = GIMP_OPACITY_OPAQUE;
+        }
+      else
+        {
+          gegl_buffer_sample (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                              x, y, NULL, &value, babl_format ("A double"),
+                              GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+        }
+
+      if (gimp_layer_get_mask (layer) &&
+          gimp_layer_get_apply_mask (layer))
+        {
+          gdouble mask_value;
+
+          mask_value = gimp_pickable_get_opacity_at (GIMP_PICKABLE (layer->mask),
+                                                     x, y);
+
+          value *= mask_value;
+        }
+    }
+
+  return value;
+}
+
+static void
+gimp_layer_pixel_to_srgb (GimpPickable *pickable,
+                          const Babl   *format,
+                          gpointer      pixel,
+                          GimpRGB      *color)
+{
+  GimpImage *image = gimp_item_get_image (GIMP_ITEM (pickable));
+
+  gimp_pickable_pixel_to_srgb (GIMP_PICKABLE (image), format, pixel, color);
+}
+
+static void
+gimp_layer_srgb_to_pixel (GimpPickable  *pickable,
+                          const GimpRGB *color,
+                          const Babl    *format,
+                          gpointer       pixel)
+{
+  GimpImage *image = gimp_item_get_image (GIMP_ITEM (pickable));
+
+  gimp_pickable_srgb_to_pixel (GIMP_PICKABLE (image), color, format, pixel);
+}
+
+static void
+gimp_layer_real_translate (GimpLayer *layer,
+                           gint       offset_x,
+                           gint       offset_y)
+{
+  /*  update the old region  */
+  gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+
+  /*  invalidate the selection boundary because of a layer modification  */
+  gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (layer));
+
+  GIMP_ITEM_CLASS (parent_class)->translate (GIMP_ITEM (layer),
+                                             offset_x, offset_y,
+                                             FALSE);
+
+  /*  update the new region  */
+  gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+}
+
+static void
+gimp_layer_real_scale (GimpLayer             *layer,
+                       gint                   new_width,
+                       gint                   new_height,
+                       gint                   new_offset_x,
+                       gint                   new_offset_y,
+                       GimpInterpolationType  interpolation_type,
+                       GimpProgress          *progress)
+{
+  GIMP_ITEM_CLASS (parent_class)->scale (GIMP_ITEM (layer),
+                                         new_width, new_height,
+                                         new_offset_x, new_offset_y,
+                                         interpolation_type, progress);
+}
+
+static void
+gimp_layer_real_resize (GimpLayer    *layer,
+                        GimpContext  *context,
+                        GimpFillType  fill_type,
+                        gint          new_width,
+                        gint          new_height,
+                        gint          offset_x,
+                        gint          offset_y)
+{
+  if (fill_type == GIMP_FILL_TRANSPARENT &&
+      ! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    {
+      fill_type = GIMP_FILL_BACKGROUND;
+    }
+
+  GIMP_ITEM_CLASS (parent_class)->resize (GIMP_ITEM (layer),
+                                          context, fill_type,
+                                          new_width, new_height,
+                                          offset_x, offset_y);
+}
+
+static void
+gimp_layer_real_flip (GimpLayer           *layer,
+                      GimpContext         *context,
+                      GimpOrientationType  flip_type,
+                      gdouble              axis,
+                      gboolean             clip_result)
+{
+  GIMP_ITEM_CLASS (parent_class)->flip (GIMP_ITEM (layer),
+                                        context, flip_type, axis, clip_result);
+}
+
+static void
+gimp_layer_real_rotate (GimpLayer        *layer,
+                        GimpContext      *context,
+                        GimpRotationType  rotate_type,
+                        gdouble           center_x,
+                        gdouble           center_y,
+                        gboolean          clip_result)
+{
+  GIMP_ITEM_CLASS (parent_class)->rotate (GIMP_ITEM (layer),
+                                          context, rotate_type,
+                                          center_x, center_y,
+                                          clip_result);
+}
+
+static void
+gimp_layer_real_transform (GimpLayer              *layer,
+                           GimpContext            *context,
+                           const GimpMatrix3      *matrix,
+                           GimpTransformDirection  direction,
+                           GimpInterpolationType   interpolation_type,
+                           GimpTransformResize     clip_result,
+                           GimpProgress           *progress)
+{
+  /* FIXME: make interpolated transformations work on layers without alpha */
+  if (interpolation_type != GIMP_INTERPOLATION_NONE &&
+      ! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    gimp_layer_add_alpha (layer);
+
+  GIMP_ITEM_CLASS (parent_class)->transform (GIMP_ITEM (layer),
+                                             context, matrix, direction,
+                                             interpolation_type,
+                                             clip_result,
+                                             progress);
+}
+
+static void
+gimp_layer_real_convert_type (GimpLayer        *layer,
+                              GimpImage        *dest_image,
+                              const Babl       *new_format,
+                              GimpColorProfile *dest_profile,
+                              GeglDitherMethod  layer_dither_type,
+                              GeglDitherMethod  mask_dither_type,
+                              gboolean          push_undo,
+                              GimpProgress     *progress)
+{
+  GimpDrawable *drawable = GIMP_DRAWABLE (layer);
+  GeglBuffer   *src_buffer;
+  GeglBuffer   *dest_buffer;
+
+  if (layer_dither_type == GEGL_DITHER_NONE)
+    {
+      src_buffer = g_object_ref (gimp_drawable_get_buffer (drawable));
+    }
+  else
+    {
+      gint bits;
+
+      src_buffer =
+        gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                         gimp_item_get_width  (GIMP_ITEM (layer)),
+                                         gimp_item_get_height (GIMP_ITEM (layer))),
+                         gimp_drawable_get_format (drawable));
+
+      bits = (babl_format_get_bytes_per_pixel (new_format) * 8 /
+              babl_format_get_n_components (new_format));
+
+      gimp_gegl_apply_dither (gimp_drawable_get_buffer (drawable),
+                              NULL, NULL,
+                              src_buffer, 1 << bits, layer_dither_type);
+    }
+
+  dest_buffer =
+    gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                     gimp_item_get_width  (GIMP_ITEM (layer)),
+                                     gimp_item_get_height (GIMP_ITEM (layer))),
+                     new_format);
+
+  if (dest_profile)
+    {
+      GimpColorProfile *src_profile =
+        gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (layer));
+
+      gimp_gegl_convert_color_profile (src_buffer,  NULL, src_profile,
+                                       dest_buffer, NULL, dest_profile,
+                                       GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                       TRUE, progress);
+    }
+  else
+    {
+      gimp_gegl_buffer_copy (src_buffer, NULL, GEGL_ABYSS_NONE,
+                             dest_buffer, NULL);
+    }
+
+  gimp_drawable_set_buffer (drawable, push_undo, NULL, dest_buffer);
+
+  g_object_unref (src_buffer);
+  g_object_unref (dest_buffer);
+}
+
+static GeglRectangle
+gimp_layer_real_get_bounding_box (GimpLayer *layer)
+{
+  return GIMP_DRAWABLE_CLASS (parent_class)->get_bounding_box (
+    GIMP_DRAWABLE (layer));
+}
+
+static void
+gimp_layer_real_get_effective_mode (GimpLayer              *layer,
+                                    GimpLayerMode          *mode,
+                                    GimpLayerColorSpace    *blend_space,
+                                    GimpLayerColorSpace    *composite_space,
+                                    GimpLayerCompositeMode *composite_mode)
+{
+  *mode            = gimp_layer_get_mode (layer);
+  *blend_space     = gimp_layer_get_real_blend_space (layer);
+  *composite_space = gimp_layer_get_real_composite_space (layer);
+  *composite_mode  = gimp_layer_get_real_composite_mode (layer);
+}
+
+static gboolean
+gimp_layer_real_get_excludes_backdrop (GimpLayer *layer)
+{
+  GimpLayerCompositeRegion included_region;
+
+  included_region = gimp_layer_mode_get_included_region (layer->mode,
+                                                         layer->effective_composite_mode);
+
+  return ! (included_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION);
+}
+
+static void
+gimp_layer_layer_mask_update (GimpDrawable *drawable,
+                              gint          x,
+                              gint          y,
+                              gint          width,
+                              gint          height,
+                              GimpLayer    *layer)
+{
+  if (gimp_layer_get_apply_mask (layer) ||
+      gimp_layer_get_show_mask (layer))
+    {
+      gimp_drawable_update (GIMP_DRAWABLE (layer),
+                            x, y, width, height);
+    }
+}
+
+
+/*  public functions  */
+
+GimpLayer *
+gimp_layer_get_parent (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+
+  return GIMP_LAYER (gimp_viewable_get_parent (GIMP_VIEWABLE (layer)));
+}
+
+GimpLayerMask *
+gimp_layer_get_mask (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+
+  return layer->mask;
+}
+
+GimpLayerMask *
+gimp_layer_add_mask (GimpLayer      *layer,
+                     GimpLayerMask  *mask,
+                     gboolean        push_undo,
+                     GError        **error)
+{
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (GIMP_IS_LAYER_MASK (mask), NULL);
+  g_return_val_if_fail (gimp_item_get_image (GIMP_ITEM (layer)) ==
+                        gimp_item_get_image (GIMP_ITEM (mask)), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! gimp_item_is_attached (GIMP_ITEM (layer)))
+    push_undo = FALSE;
+
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  if (layer->mask)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Unable to add a layer mask since "
+                             "the layer already has one."));
+      return NULL;
+    }
+
+  if ((gimp_item_get_width (GIMP_ITEM (layer)) !=
+       gimp_item_get_width (GIMP_ITEM (mask))) ||
+      (gimp_item_get_height (GIMP_ITEM (layer)) !=
+       gimp_item_get_height (GIMP_ITEM (mask))))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot add layer mask of different "
+                             "dimensions than specified layer."));
+      return NULL;
+    }
+
+  if (push_undo)
+    gimp_image_undo_push_layer_mask_add (image, C_("undo-type", "Add Layer Mask"),
+                                         layer, mask);
+
+  layer->mask = g_object_ref_sink (mask);
+  layer->apply_mask = TRUE;
+  layer->edit_mask  = TRUE;
+  layer->show_mask  = FALSE;
+
+  gimp_layer_mask_set_layer (mask, layer);
+
+  if (gimp_filter_peek_node (GIMP_FILTER (layer)))
+    {
+      GeglNode *mode_node;
+      GeglNode *mask;
+
+      mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (layer));
+
+      mask = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer->mask));
+
+      gegl_node_connect_to (mask,                    "output",
+                            layer->mask_offset_node, "input");
+
+      if (layer->show_mask)
+        {
+          gegl_node_connect_to (layer->mask_offset_node, "output",
+                                mode_node,               "aux");
+        }
+      else
+        {
+          gegl_node_connect_to (layer->mask_offset_node, "output",
+                                mode_node,               "aux2");
+        }
+
+      gimp_layer_update_mode_node (layer);
+    }
+
+  gimp_drawable_update_bounding_box (GIMP_DRAWABLE (layer));
+
+  gimp_layer_update_effective_mode (layer);
+  gimp_layer_update_excludes_backdrop (layer);
+
+  if (gimp_layer_get_apply_mask (layer) ||
+      gimp_layer_get_show_mask (layer))
+    {
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+    }
+
+  g_signal_connect (mask, "update",
+                    G_CALLBACK (gimp_layer_layer_mask_update),
+                    layer);
+
+  g_signal_emit (layer, layer_signals[MASK_CHANGED], 0);
+
+  g_object_notify (G_OBJECT (layer), "mask");
+
+  /*  if the mask came from the undo stack, reset its "removed" state  */
+  if (gimp_item_is_removed (GIMP_ITEM (mask)))
+    gimp_item_unset_removed (GIMP_ITEM (mask));
+
+  return layer->mask;
+}
+
+GimpLayerMask *
+gimp_layer_create_mask (GimpLayer       *layer,
+                        GimpAddMaskType  add_mask_type,
+                        GimpChannel     *channel)
+{
+  GimpDrawable  *drawable;
+  GimpItem      *item;
+  GimpLayerMask *mask;
+  GimpImage     *image;
+  gchar         *mask_name;
+  GimpRGB        black = { 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE };
+
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (add_mask_type != GIMP_ADD_MASK_CHANNEL ||
+                        GIMP_IS_CHANNEL (channel), NULL);
+
+  drawable = GIMP_DRAWABLE (layer);
+  item     = GIMP_ITEM (layer);
+  image    = gimp_item_get_image (item);
+
+  mask_name = g_strdup_printf (_("%s mask"),
+                               gimp_object_get_name (layer));
+
+  mask = gimp_layer_mask_new (image,
+                              gimp_item_get_width  (item),
+                              gimp_item_get_height (item),
+                              mask_name, &black);
+
+  g_free (mask_name);
+
+  switch (add_mask_type)
+    {
+    case GIMP_ADD_MASK_WHITE:
+      gimp_channel_all (GIMP_CHANNEL (mask), FALSE);
+      break;
+
+    case GIMP_ADD_MASK_BLACK:
+      gimp_channel_clear (GIMP_CHANNEL (mask), NULL, FALSE);
+      break;
+
+    case GIMP_ADD_MASK_ALPHA:
+    case GIMP_ADD_MASK_ALPHA_TRANSFER:
+      if (gimp_drawable_has_alpha (drawable))
+        {
+          GeglBuffer *dest_buffer;
+          const Babl *component_format;
+
+          dest_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+          component_format =
+            gimp_image_get_component_format (image, GIMP_CHANNEL_ALPHA);
+
+          gegl_buffer_set_format (dest_buffer, component_format);
+          gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                                 GEGL_ABYSS_NONE,
+                                 dest_buffer, NULL);
+          gegl_buffer_set_format (dest_buffer, NULL);
+
+          if (add_mask_type == GIMP_ADD_MASK_ALPHA_TRANSFER)
+            {
+              gimp_drawable_push_undo (drawable,
+                                       C_("undo-type", "Transfer Alpha to Mask"),
+                                       NULL,
+                                       0, 0,
+                                       gimp_item_get_width  (item),
+                                       gimp_item_get_height (item));
+
+              gimp_gegl_apply_set_alpha (gimp_drawable_get_buffer (drawable),
+                                         NULL, NULL,
+                                         gimp_drawable_get_buffer (drawable),
+                                         1.0);
+            }
+        }
+      break;
+
+    case GIMP_ADD_MASK_SELECTION:
+    case GIMP_ADD_MASK_CHANNEL:
+      {
+        gboolean channel_empty;
+        gint     offset_x, offset_y;
+        gint     copy_x, copy_y;
+        gint     copy_width, copy_height;
+
+        if (add_mask_type == GIMP_ADD_MASK_SELECTION)
+          channel = GIMP_CHANNEL (gimp_image_get_mask (image));
+
+        channel_empty = gimp_channel_is_empty (channel);
+
+        gimp_item_get_offset (item, &offset_x, &offset_y);
+
+        gimp_rectangle_intersect (0, 0,
+                                  gimp_image_get_width  (image),
+                                  gimp_image_get_height (image),
+                                  offset_x, offset_y,
+                                  gimp_item_get_width  (item),
+                                  gimp_item_get_height (item),
+                                  &copy_x, &copy_y,
+                                  &copy_width, &copy_height);
+
+        if (copy_width  < gimp_item_get_width  (item) ||
+            copy_height < gimp_item_get_height (item) ||
+            channel_empty)
+          gimp_channel_clear (GIMP_CHANNEL (mask), NULL, FALSE);
+
+        if ((copy_width || copy_height) && ! channel_empty)
+          {
+            GeglBuffer *src;
+            GeglBuffer *dest;
+            const Babl *format;
+
+            src  = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
+            dest = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+            format = gegl_buffer_get_format (src);
+
+            /* make sure no gamma conversion happens */
+            gegl_buffer_set_format (dest, format);
+            gimp_gegl_buffer_copy (src,
+                                   GEGL_RECTANGLE (copy_x, copy_y,
+                                                   copy_width, copy_height),
+                                   GEGL_ABYSS_NONE,
+                                   dest,
+                                   GEGL_RECTANGLE (copy_x - offset_x,
+                                                   copy_y - offset_y,
+                                                   0, 0));
+            gegl_buffer_set_format (dest, NULL);
+
+            GIMP_CHANNEL (mask)->bounds_known = FALSE;
+          }
+      }
+      break;
+
+    case GIMP_ADD_MASK_COPY:
+      {
+        GeglBuffer *src_buffer;
+        GeglBuffer *dest_buffer;
+
+        if (! gimp_drawable_is_gray (drawable))
+          {
+            const Babl *copy_format =
+              gimp_image_get_format (image, GIMP_GRAY,
+                                     gimp_drawable_get_precision (drawable),
+                                     gimp_drawable_has_alpha (drawable));
+
+            src_buffer =
+              gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                               gimp_item_get_width  (item),
+                                               gimp_item_get_height (item)),
+                               copy_format);
+
+            gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                                   GEGL_ABYSS_NONE,
+                                   src_buffer, NULL);
+          }
+        else
+          {
+            src_buffer = gimp_drawable_get_buffer (drawable);
+            g_object_ref (src_buffer);
+          }
+
+        dest_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+
+        if (gimp_drawable_has_alpha (drawable))
+          {
+            GimpRGB background;
+
+            gimp_rgba_set (&background, 0.0, 0.0, 0.0, 0.0);
+
+            gimp_gegl_apply_flatten (src_buffer, NULL, NULL,
+                                     dest_buffer, &background,
+                                     GIMP_LAYER_COLOR_SPACE_RGB_LINEAR);
+          }
+        else
+          {
+            gimp_gegl_buffer_copy (src_buffer, NULL, GEGL_ABYSS_NONE,
+                                   dest_buffer, NULL);
+          }
+
+        g_object_unref (src_buffer);
+      }
+
+      GIMP_CHANNEL (mask)->bounds_known = FALSE;
+      break;
+    }
+
+  return mask;
+}
+
+void
+gimp_layer_apply_mask (GimpLayer         *layer,
+                       GimpMaskApplyMode  mode,
+                       gboolean           push_undo)
+{
+  GimpItem      *item;
+  GimpImage     *image;
+  GimpLayerMask *mask;
+  gboolean       view_changed = FALSE;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  mask = gimp_layer_get_mask (layer);
+
+  if (! mask)
+    return;
+
+  /*  APPLY can not be done to group layers  */
+  g_return_if_fail (! gimp_viewable_get_children (GIMP_VIEWABLE (layer)) ||
+                    mode == GIMP_MASK_DISCARD);
+
+  /*  APPLY can only be done to layers with an alpha channel  */
+  g_return_if_fail (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)) ||
+                    mode == GIMP_MASK_DISCARD || push_undo == TRUE);
+
+  item  = GIMP_ITEM (layer);
+  image = gimp_item_get_image (item);
+
+  if (! image)
+    return;
+
+  if (push_undo)
+    {
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_LAYER_APPLY_MASK,
+                                   (mode == GIMP_MASK_APPLY) ?
+                                   C_("undo-type", "Apply Layer Mask") :
+                                   C_("undo-type", "Delete Layer Mask"));
+
+      gimp_image_undo_push_layer_mask_show (image, NULL, layer);
+      gimp_image_undo_push_layer_mask_apply (image, NULL, layer);
+      gimp_image_undo_push_layer_mask_remove (image, NULL, layer, mask);
+
+      if (mode == GIMP_MASK_APPLY &&
+          ! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+        {
+          gimp_layer_add_alpha (layer);
+        }
+    }
+
+  /*  check if applying the mask changes the projection  */
+  if (gimp_layer_get_show_mask (layer)                                   ||
+      (mode == GIMP_MASK_APPLY   && ! gimp_layer_get_apply_mask (layer)) ||
+      (mode == GIMP_MASK_DISCARD &&   gimp_layer_get_apply_mask (layer)))
+    {
+      view_changed = TRUE;
+    }
+
+  if (mode == GIMP_MASK_APPLY)
+    {
+      GeglBuffer *mask_buffer;
+      GeglBuffer *dest_buffer;
+
+      if (push_undo)
+        gimp_drawable_push_undo (GIMP_DRAWABLE (layer), NULL,
+                                 NULL,
+                                 0, 0,
+                                 gimp_item_get_width  (item),
+                                 gimp_item_get_height (item));
+
+      /*  Combine the current layer's alpha channel and the mask  */
+      mask_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+      dest_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
+
+      gimp_gegl_apply_opacity (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                               NULL, NULL, dest_buffer,
+                               mask_buffer, 0, 0, 1.0);
+    }
+
+  g_signal_handlers_disconnect_by_func (mask,
+                                        gimp_layer_layer_mask_update,
+                                        layer);
+
+  gimp_item_removed (GIMP_ITEM (mask));
+  g_object_unref (mask);
+  layer->mask = NULL;
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+
+  if (gimp_filter_peek_node (GIMP_FILTER (layer)))
+    {
+      GeglNode *mode_node;
+
+      mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (layer));
+
+      if (layer->show_mask)
+        {
+          gegl_node_connect_to (layer->layer_offset_node, "output",
+                                mode_node,                "aux");
+        }
+      else
+        {
+          gegl_node_disconnect (mode_node, "aux2");
+        }
+
+      gimp_layer_update_mode_node (layer);
+    }
+
+  gimp_drawable_update_bounding_box (GIMP_DRAWABLE (layer));
+
+  gimp_layer_update_effective_mode (layer);
+  gimp_layer_update_excludes_backdrop (layer);
+
+  /*  If applying actually changed the view  */
+  if (view_changed)
+    {
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+    }
+  else
+    {
+      gimp_viewable_invalidate_preview (GIMP_VIEWABLE (layer));
+    }
+
+  g_signal_emit (layer, layer_signals[MASK_CHANGED], 0);
+
+  g_object_notify (G_OBJECT (layer), "mask");
+}
+
+void
+gimp_layer_set_apply_mask (GimpLayer *layer,
+                           gboolean   apply,
+                           gboolean   push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (layer->mask != NULL);
+
+  if (layer->apply_mask != apply)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
+        gimp_image_undo_push_layer_mask_apply (image,
+                                               apply ?
+                                               C_("undo-type", "Enable Layer Mask") :
+                                               C_("undo-type", "Disable Layer Mask"),
+                                               layer);
+
+      layer->apply_mask = apply ? TRUE : FALSE;
+
+      if (gimp_filter_peek_node (GIMP_FILTER (layer)) &&
+          ! gimp_layer_get_show_mask (layer))
+        {
+          GeglNode *mode_node;
+
+          mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (layer));
+
+          if (layer->apply_mask)
+            {
+              gegl_node_connect_to (layer->mask_offset_node, "output",
+                                    mode_node,               "aux2");
+            }
+          else
+            {
+              gegl_node_disconnect (mode_node, "aux2");
+            }
+        }
+
+      gimp_drawable_update_bounding_box (GIMP_DRAWABLE (layer));
+
+      gimp_layer_update_effective_mode (layer);
+      gimp_layer_update_excludes_backdrop (layer);
+
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+
+      g_signal_emit (layer, layer_signals[APPLY_MASK_CHANGED], 0);
+    }
+}
+
+gboolean
+gimp_layer_get_apply_mask (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+  g_return_val_if_fail (layer->mask, FALSE);
+
+  return layer->apply_mask;
+}
+
+void
+gimp_layer_set_edit_mask (GimpLayer *layer,
+                          gboolean   edit)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (layer->mask != NULL);
+
+  if (layer->edit_mask != edit)
+    {
+      layer->edit_mask = edit ? TRUE : FALSE;
+
+      g_signal_emit (layer, layer_signals[EDIT_MASK_CHANGED], 0);
+    }
+}
+
+gboolean
+gimp_layer_get_edit_mask (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+  g_return_val_if_fail (layer->mask, FALSE);
+
+  return layer->edit_mask;
+}
+
+void
+gimp_layer_set_show_mask (GimpLayer *layer,
+                          gboolean   show,
+                          gboolean   push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (layer->mask != NULL);
+
+  if (layer->show_mask != show)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+      if (push_undo)
+        gimp_image_undo_push_layer_mask_show (image,
+                                              C_("undo-type", "Show Layer Mask"),
+                                              layer);
+
+      layer->show_mask = show ? TRUE : FALSE;
+
+      if (gimp_filter_peek_node (GIMP_FILTER (layer)))
+        {
+          GeglNode *mode_node;
+
+          mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (layer));
+
+          if (layer->show_mask)
+            {
+              gegl_node_disconnect (mode_node, "aux2");
+
+              gegl_node_connect_to (layer->mask_offset_node, "output",
+                                    mode_node,               "aux");
+            }
+          else
+            {
+              gegl_node_connect_to (layer->layer_offset_node, "output",
+                                    mode_node,                "aux");
+
+              if (gimp_layer_get_apply_mask (layer))
+                {
+                  gegl_node_connect_to (layer->mask_offset_node, "output",
+                                        mode_node,               "aux2");
+                }
+            }
+
+          gimp_layer_update_mode_node (layer);
+        }
+
+      gimp_drawable_update_bounding_box (GIMP_DRAWABLE (layer));
+
+      gimp_layer_update_effective_mode (layer);
+      gimp_layer_update_excludes_backdrop (layer);
+
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+
+      g_signal_emit (layer, layer_signals[SHOW_MASK_CHANGED], 0);
+    }
+}
+
+gboolean
+gimp_layer_get_show_mask (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+  g_return_val_if_fail (layer->mask, FALSE);
+
+  return layer->show_mask;
+}
+
+void
+gimp_layer_add_alpha (GimpLayer *layer)
+{
+  GimpItem     *item;
+  GimpDrawable *drawable;
+  GeglBuffer   *new_buffer;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    return;
+
+  item     = GIMP_ITEM (layer);
+  drawable = GIMP_DRAWABLE (layer);
+
+  new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                gimp_item_get_width  (item),
+                                                gimp_item_get_height (item)),
+                                gimp_drawable_get_format_with_alpha (drawable));
+
+  gimp_gegl_buffer_copy (
+    gimp_drawable_get_buffer (drawable), NULL, GEGL_ABYSS_NONE,
+    new_buffer, NULL);
+
+  gimp_drawable_set_buffer (GIMP_DRAWABLE (layer),
+                            gimp_item_is_attached (GIMP_ITEM (layer)),
+                            C_("undo-type", "Add Alpha Channel"),
+                            new_buffer);
+  g_object_unref (new_buffer);
+}
+
+void
+gimp_layer_remove_alpha (GimpLayer   *layer,
+                         GimpContext *context)
+{
+  GeglBuffer *new_buffer;
+  GimpRGB     background;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  if (! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    return;
+
+  new_buffer =
+    gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                     gimp_item_get_width  (GIMP_ITEM (layer)),
+                                     gimp_item_get_height (GIMP_ITEM (layer))),
+                     gimp_drawable_get_format_without_alpha (GIMP_DRAWABLE (layer)));
+
+  gimp_context_get_background (context, &background);
+  gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (layer),
+                                     &background, &background);
+
+  gimp_gegl_apply_flatten (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                           NULL, NULL,
+                           new_buffer, &background,
+                           gimp_layer_get_real_composite_space (layer));
+
+  gimp_drawable_set_buffer (GIMP_DRAWABLE (layer),
+                            gimp_item_is_attached (GIMP_ITEM (layer)),
+                            C_("undo-type", "Remove Alpha Channel"),
+                            new_buffer);
+  g_object_unref (new_buffer);
+}
+
+void
+gimp_layer_resize_to_image (GimpLayer    *layer,
+                            GimpContext  *context,
+                            GimpFillType  fill_type)
+{
+  GimpImage *image;
+  gint       offset_x;
+  gint       offset_y;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
+                               C_("undo-type", "Layer to Image Size"));
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+  gimp_item_resize (GIMP_ITEM (layer), context, fill_type,
+                    gimp_image_get_width  (image),
+                    gimp_image_get_height (image),
+                    offset_x, offset_y);
+
+  gimp_image_undo_group_end (image);
+}
+
+/**********************/
+/*  access functions  */
+/**********************/
+
+GimpDrawable *
+gimp_layer_get_floating_sel_drawable (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+
+  return layer->fs.drawable;
+}
+
+void
+gimp_layer_set_floating_sel_drawable (GimpLayer    *layer,
+                                      GimpDrawable *drawable)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable));
+
+  if (g_set_object (&layer->fs.drawable, drawable))
+    {
+      if (layer->fs.segs)
+        {
+          g_clear_pointer (&layer->fs.segs, g_free);
+          layer->fs.num_segs = 0;
+        }
+
+      g_object_notify (G_OBJECT (layer), "floating-selection");
+    }
+}
+
+gboolean
+gimp_layer_is_floating_sel (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+
+  return (gimp_layer_get_floating_sel_drawable (layer) != NULL);
+}
+
+void
+gimp_layer_set_opacity (GimpLayer *layer,
+                        gdouble    opacity,
+                        gboolean   push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  opacity = CLAMP (opacity, GIMP_OPACITY_TRANSPARENT, GIMP_OPACITY_OPAQUE);
+
+  if (layer->opacity != opacity)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+          gimp_image_undo_push_layer_opacity (image, NULL, layer);
+        }
+
+      layer->opacity = opacity;
+
+      g_signal_emit (layer, layer_signals[OPACITY_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "opacity");
+
+      if (gimp_filter_peek_node (GIMP_FILTER (layer)))
+        gimp_layer_update_mode_node (layer);
+
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+    }
+}
+
+gdouble
+gimp_layer_get_opacity (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_OPACITY_OPAQUE);
+
+  return layer->opacity;
+}
+
+void
+gimp_layer_set_mode (GimpLayer     *layer,
+                     GimpLayerMode  mode,
+                     gboolean       push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)) == NULL)
+    {
+      g_return_if_fail (gimp_layer_mode_get_context (mode) &
+                        GIMP_LAYER_MODE_CONTEXT_LAYER);
+    }
+  else
+    {
+      g_return_if_fail (gimp_layer_mode_get_context (mode) &
+                        GIMP_LAYER_MODE_CONTEXT_GROUP);
+    }
+
+  if (layer->mode != mode)
+    {
+      if (gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+          gimp_image_unset_default_new_layer_mode (image);
+
+          if (push_undo)
+            gimp_image_undo_push_layer_mode (image, NULL, layer);
+        }
+
+      g_object_freeze_notify (G_OBJECT (layer));
+
+      layer->mode = mode;
+
+      g_signal_emit (layer, layer_signals[MODE_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "mode");
+
+      /*  when changing modes, we always switch to AUTO blend and
+       *  composite in order to avoid confusion
+       */
+      if (layer->blend_space != GIMP_LAYER_COLOR_SPACE_AUTO)
+        {
+          layer->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+
+          g_signal_emit (layer, layer_signals[BLEND_SPACE_CHANGED], 0);
+          g_object_notify (G_OBJECT (layer), "blend-space");
+        }
+
+      if (layer->composite_space != GIMP_LAYER_COLOR_SPACE_AUTO)
+        {
+          layer->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+
+          g_signal_emit (layer, layer_signals[COMPOSITE_SPACE_CHANGED], 0);
+          g_object_notify (G_OBJECT (layer), "composite-space");
+        }
+
+      if (layer->composite_mode != GIMP_LAYER_COMPOSITE_AUTO)
+        {
+          layer->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
+
+          g_signal_emit (layer, layer_signals[COMPOSITE_MODE_CHANGED], 0);
+          g_object_notify (G_OBJECT (layer), "composite-mode");
+        }
+
+      g_object_thaw_notify (G_OBJECT (layer));
+
+      gimp_layer_update_effective_mode (layer);
+      gimp_layer_update_excludes_backdrop (layer);
+    }
+}
+
+GimpLayerMode
+gimp_layer_get_mode (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_MODE_NORMAL);
+
+  return layer->mode;
+}
+
+void
+gimp_layer_set_blend_space (GimpLayer           *layer,
+                            GimpLayerColorSpace  blend_space,
+                            gboolean             push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (! gimp_layer_mode_is_blend_space_mutable (layer->mode))
+    return;
+
+  if (layer->blend_space != blend_space)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+          gimp_image_undo_push_layer_mode (image, NULL, layer);
+        }
+
+      layer->blend_space = blend_space;
+
+      g_signal_emit (layer, layer_signals[BLEND_SPACE_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "blend-space");
+
+      gimp_layer_update_effective_mode (layer);
+    }
+}
+
+GimpLayerColorSpace
+gimp_layer_get_blend_space (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_COLOR_SPACE_AUTO);
+
+  return layer->blend_space;
+}
+
+GimpLayerColorSpace
+gimp_layer_get_real_blend_space (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_COLOR_SPACE_RGB_LINEAR);
+
+  if (layer->blend_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+    return gimp_layer_mode_get_blend_space (layer->mode);
+  else
+    return layer->blend_space;
+}
+
+void
+gimp_layer_set_composite_space (GimpLayer           *layer,
+                                GimpLayerColorSpace  composite_space,
+                                gboolean             push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (! gimp_layer_mode_is_composite_space_mutable (layer->mode))
+    return;
+
+  if (layer->composite_space != composite_space)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+          gimp_image_undo_push_layer_mode (image, NULL, layer);
+        }
+
+      layer->composite_space = composite_space;
+
+      g_signal_emit (layer, layer_signals[COMPOSITE_SPACE_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "composite-space");
+
+      gimp_layer_update_effective_mode (layer);
+    }
+}
+
+GimpLayerColorSpace
+gimp_layer_get_composite_space (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_COLOR_SPACE_AUTO);
+
+  return layer->composite_space;
+}
+
+GimpLayerColorSpace
+gimp_layer_get_real_composite_space (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_COLOR_SPACE_RGB_LINEAR);
+
+  if (layer->composite_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+    return gimp_layer_mode_get_composite_space (layer->mode);
+  else
+    return layer->composite_space;
+}
+
+void
+gimp_layer_set_composite_mode (GimpLayer              *layer,
+                               GimpLayerCompositeMode  composite_mode,
+                               gboolean                push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (! gimp_layer_mode_is_composite_mode_mutable (layer->mode))
+    return;
+
+  if (layer->composite_mode != composite_mode)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+          gimp_image_undo_push_layer_mode (image, NULL, layer);
+        }
+
+      layer->composite_mode = composite_mode;
+
+      g_signal_emit (layer, layer_signals[COMPOSITE_MODE_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "composite-mode");
+
+      gimp_layer_update_effective_mode (layer);
+      gimp_layer_update_excludes_backdrop (layer);
+    }
+}
+
+GimpLayerCompositeMode
+gimp_layer_get_composite_mode (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_COMPOSITE_AUTO);
+
+  return layer->composite_mode;
+}
+
+GimpLayerCompositeMode
+gimp_layer_get_real_composite_mode (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_COMPOSITE_UNION);
+
+  if (layer->composite_mode == GIMP_LAYER_COMPOSITE_AUTO)
+    return gimp_layer_mode_get_composite_mode (layer->mode);
+  else
+    return layer->composite_mode;
+}
+
+void
+gimp_layer_get_effective_mode (GimpLayer              *layer,
+                               GimpLayerMode          *mode,
+                               GimpLayerColorSpace    *blend_space,
+                               GimpLayerColorSpace    *composite_space,
+                               GimpLayerCompositeMode *composite_mode)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (mode)            *mode            = layer->effective_mode;
+  if (blend_space)     *blend_space     = layer->effective_blend_space;
+  if (composite_space) *composite_space = layer->effective_composite_space;
+  if (composite_mode)  *composite_mode  = layer->effective_composite_mode;
+}
+
+gboolean
+gimp_layer_get_excludes_backdrop (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+
+  return layer->excludes_backdrop;
+}
+
+void
+gimp_layer_set_lock_alpha (GimpLayer *layer,
+                           gboolean   lock_alpha,
+                           gboolean   push_undo)
+{
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+  g_return_if_fail (gimp_layer_can_lock_alpha (layer));
+
+  lock_alpha = lock_alpha ? TRUE : FALSE;
+
+  if (layer->lock_alpha != lock_alpha)
+    {
+      if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+          gimp_image_undo_push_layer_lock_alpha (image, NULL, layer);
+        }
+
+      layer->lock_alpha = lock_alpha;
+
+      g_signal_emit (layer, layer_signals[LOCK_ALPHA_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "lock-alpha");
+    }
+}
+
+gboolean
+gimp_layer_get_lock_alpha (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+
+  return layer->lock_alpha;
+}
+
+gboolean
+gimp_layer_can_lock_alpha (GimpLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+    return FALSE;
+
+  return TRUE;
+}
+
+
+/*  protected functions  */
+
+void
+gimp_layer_update_effective_mode (GimpLayer *layer)
+{
+  GimpLayerMode          mode;
+  GimpLayerColorSpace    blend_space;
+  GimpLayerColorSpace    composite_space;
+  GimpLayerCompositeMode composite_mode;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  if (layer->mask && layer->show_mask)
+    {
+      mode            = GIMP_LAYER_MODE_NORMAL;
+      blend_space     = GIMP_LAYER_COLOR_SPACE_AUTO;
+      composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+      composite_mode  = GIMP_LAYER_COMPOSITE_AUTO;
+
+      /* This makes sure that masks of LEGACY-mode layers are
+       * composited in PERCEPTUAL space, and non-LEGACY layers in
+       * LINEAR space, or whatever composite space was chosen in the
+       * layer attributes dialog
+       */
+      composite_space = gimp_layer_get_real_composite_space (layer);
+    }
+  else
+    {
+      GIMP_LAYER_GET_CLASS (layer)->get_effective_mode (layer,
+                                                        &mode,
+                                                        &blend_space,
+                                                        &composite_space,
+                                                        &composite_mode);
+    }
+
+  if (mode            != layer->effective_mode            ||
+      blend_space     != layer->effective_blend_space     ||
+      composite_space != layer->effective_composite_space ||
+      composite_mode  != layer->effective_composite_mode)
+    {
+      layer->effective_mode            = mode;
+      layer->effective_blend_space     = blend_space;
+      layer->effective_composite_space = composite_space;
+      layer->effective_composite_mode  = composite_mode;
+
+      g_signal_emit (layer, layer_signals[EFFECTIVE_MODE_CHANGED], 0);
+
+      if (gimp_filter_peek_node (GIMP_FILTER (layer)))
+        gimp_layer_update_mode_node (layer);
+
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+    }
+}
+
+void
+gimp_layer_update_excludes_backdrop (GimpLayer *layer)
+{
+  gboolean excludes_backdrop;
+
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  excludes_backdrop =
+    GIMP_LAYER_GET_CLASS (layer)->get_excludes_backdrop (layer);
+
+  if (excludes_backdrop != layer->excludes_backdrop)
+    {
+      layer->excludes_backdrop = excludes_backdrop;
+
+      g_signal_emit (layer, layer_signals[EXCLUDES_BACKDROP_CHANGED], 0);
+      g_object_notify (G_OBJECT (layer), "excludes-backdrop");
+    }
+}
diff --git a/app/core/gimplayer.h b/app/core/gimplayer.h
new file mode 100644
index 0000000..f8c9d82
--- /dev/null
+++ b/app/core/gimplayer.h
@@ -0,0 +1,243 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_H__
+#define __GIMP_LAYER_H__
+
+
+#include "gimpdrawable.h"
+
+
+#define GIMP_TYPE_LAYER            (gimp_layer_get_type ())
+#define GIMP_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER, GimpLayer))
+#define GIMP_LAYER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER, GimpLayerClass))
+#define GIMP_IS_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER))
+#define GIMP_IS_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER))
+#define GIMP_LAYER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER, GimpLayerClass))
+
+
+typedef struct _GimpLayerClass GimpLayerClass;
+
+struct _GimpLayer
+{
+  GimpDrawable            parent_instance;
+
+  gdouble                 opacity;                    /*  layer opacity                     */
+  GimpLayerMode           mode;                       /*  layer combination mode            */
+  GimpLayerColorSpace     blend_space;                /*  layer blend space                 */
+  GimpLayerColorSpace     composite_space;            /*  layer composite space             */
+  GimpLayerCompositeMode  composite_mode;             /*  layer composite mode              */
+  GimpLayerMode           effective_mode;             /*  layer effective combination mode  */
+  GimpLayerColorSpace     effective_blend_space;      /*  layer effective blend space       */
+  GimpLayerColorSpace     effective_composite_space;  /*  layer effective composite space   */
+  GimpLayerCompositeMode  effective_composite_mode;   /*  layer effective composite mode    */
+  gboolean                excludes_backdrop;          /*  layer clips backdrop              */
+  gboolean                lock_alpha;                 /*  lock the alpha channel            */
+
+  GimpLayerMask          *mask;                       /*  possible layer mask               */
+  gboolean                apply_mask;                 /*  controls mask application         */
+  gboolean                edit_mask;                  /*  edit mask or layer?               */
+  gboolean                show_mask;                  /*  show mask or layer?               */
+
+  GSList                 *move_stack;                 /*  ancestors affected by move        */
+
+  GeglNode               *layer_offset_node;
+  GeglNode               *mask_offset_node;
+
+  /*  Floating selections  */
+  struct
+  {
+    GimpDrawable *drawable;           /*  floating sel is attached to    */
+    gboolean      boundary_known;     /*  is the current boundary valid  */
+    GimpBoundSeg *segs;               /*  boundary of floating sel       */
+    gint          num_segs;           /*  number of segs in boundary     */
+  } fs;
+};
+
+struct _GimpLayerClass
+{
+  GimpDrawableClass  parent_class;
+
+  /*  signals  */
+  void          (* opacity_changed)           (GimpLayer              *layer);
+  void          (* mode_changed)              (GimpLayer              *layer);
+  void          (* blend_space_changed)       (GimpLayer              *layer);
+  void          (* composite_space_changed)   (GimpLayer              *layer);
+  void          (* composite_mode_changed)    (GimpLayer              *layer);
+  void          (* effective_mode_changed)    (GimpLayer              *layer);
+  void          (* excludes_backdrop_changed) (GimpLayer              *layer);
+  void          (* lock_alpha_changed)        (GimpLayer              *layer);
+  void          (* mask_changed)              (GimpLayer              *layer);
+  void          (* apply_mask_changed)        (GimpLayer              *layer);
+  void          (* edit_mask_changed)         (GimpLayer              *layer);
+  void          (* show_mask_changed)         (GimpLayer              *layer);
+
+  /*  virtual functions  */
+  void          (* translate)                 (GimpLayer              *layer,
+                                               gint                    offset_x,
+                                               gint                    offset_y);
+  void          (* scale)                     (GimpLayer              *layer,
+                                               gint                    new_width,
+                                               gint                    new_height,
+                                               gint                    new_offset_x,
+                                               gint                    new_offset_y,
+                                               GimpInterpolationType   interpolation_type,
+                                               GimpProgress           *progress);
+  void          (* resize)                    (GimpLayer              *layer,
+                                               GimpContext            *context,
+                                               GimpFillType            fill_type,
+                                               gint                    new_width,
+                                               gint                    new_height,
+                                               gint                    offset_x,
+                                               gint                    offset_y);
+  void          (* flip)                      (GimpLayer              *layer,
+                                               GimpContext            *context,
+                                               GimpOrientationType     flip_type,
+                                               gdouble                 axis,
+                                               gboolean                clip_result);
+  void          (* rotate)                    (GimpLayer              *layer,
+                                               GimpContext            *context,
+                                               GimpRotationType        rotate_type,
+                                               gdouble                 center_x,
+                                               gdouble                 center_y,
+                                               gboolean                clip_result);
+  void          (* transform)                 (GimpLayer              *layer,
+                                               GimpContext            *context,
+                                               const GimpMatrix3      *matrix,
+                                               GimpTransformDirection  direction,
+                                               GimpInterpolationType   interpolation_type,
+                                               GimpTransformResize     clip_result,
+                                               GimpProgress           *progress);
+  void          (* convert_type)              (GimpLayer              *layer,
+                                               GimpImage              *dest_image,
+                                               const Babl             *new_format,
+                                               GimpColorProfile       *dest_profile,
+                                               GeglDitherMethod        layer_dither_type,
+                                               GeglDitherMethod        mask_dither_type,
+                                               gboolean                push_undo,
+                                               GimpProgress           *progress);
+  GeglRectangle (* get_bounding_box)          (GimpLayer              *layer);
+  void          (* get_effective_mode)        (GimpLayer              *layer,
+                                               GimpLayerMode          *mode,
+                                               GimpLayerColorSpace    *blend_space,
+                                               GimpLayerColorSpace    *composite_space,
+                                               GimpLayerCompositeMode *composite_mode);
+  gboolean      (* get_excludes_backdrop)     (GimpLayer              *layer);
+};
+
+
+/*  function declarations  */
+
+GType           gimp_layer_get_type            (void) G_GNUC_CONST;
+
+GimpLayer     * gimp_layer_get_parent          (GimpLayer            *layer);
+
+GimpLayerMask * gimp_layer_get_mask            (GimpLayer            *layer);
+GimpLayerMask * gimp_layer_create_mask         (GimpLayer            *layer,
+                                                GimpAddMaskType       mask_type,
+                                                GimpChannel          *channel);
+GimpLayerMask * gimp_layer_add_mask            (GimpLayer            *layer,
+                                                GimpLayerMask        *mask,
+                                                gboolean              push_undo,
+                                                GError              **error);
+void            gimp_layer_apply_mask          (GimpLayer            *layer,
+                                                GimpMaskApplyMode     mode,
+                                                gboolean              push_undo);
+
+void            gimp_layer_set_apply_mask      (GimpLayer           *layer,
+                                                gboolean             apply,
+                                                gboolean             push_undo);
+gboolean        gimp_layer_get_apply_mask      (GimpLayer           *layer);
+
+void            gimp_layer_set_edit_mask       (GimpLayer           *layer,
+                                                gboolean             edit);
+gboolean        gimp_layer_get_edit_mask       (GimpLayer           *layer);
+
+void            gimp_layer_set_show_mask       (GimpLayer           *layer,
+                                                gboolean             show,
+                                                gboolean             push_undo);
+gboolean        gimp_layer_get_show_mask       (GimpLayer           *layer);
+
+void            gimp_layer_add_alpha           (GimpLayer            *layer);
+void            gimp_layer_remove_alpha        (GimpLayer            *layer,
+                                                GimpContext          *context);
+
+void            gimp_layer_resize_to_image     (GimpLayer            *layer,
+                                                GimpContext          *context,
+                                                GimpFillType          fill_type);
+
+GimpDrawable * gimp_layer_get_floating_sel_drawable (GimpLayer       *layer);
+void           gimp_layer_set_floating_sel_drawable (GimpLayer       *layer,
+                                                     GimpDrawable    *drawable);
+gboolean        gimp_layer_is_floating_sel     (GimpLayer            *layer);
+
+void            gimp_layer_set_opacity         (GimpLayer            *layer,
+                                                gdouble               opacity,
+                                                gboolean              push_undo);
+gdouble         gimp_layer_get_opacity         (GimpLayer            *layer);
+
+void            gimp_layer_set_mode            (GimpLayer            *layer,
+                                                GimpLayerMode         mode,
+                                                gboolean              push_undo);
+GimpLayerMode   gimp_layer_get_mode            (GimpLayer            *layer);
+
+void            gimp_layer_set_blend_space     (GimpLayer            *layer,
+                                                GimpLayerColorSpace   blend_space,
+                                                gboolean              push_undo);
+GimpLayerColorSpace
+                gimp_layer_get_blend_space     (GimpLayer            *layer);
+GimpLayerColorSpace
+               gimp_layer_get_real_blend_space (GimpLayer            *layer);
+
+void            gimp_layer_set_composite_space (GimpLayer            *layer,
+                                                GimpLayerColorSpace   composite_space,
+                                                gboolean              push_undo);
+GimpLayerColorSpace
+                gimp_layer_get_composite_space (GimpLayer            *layer);
+GimpLayerColorSpace
+           gimp_layer_get_real_composite_space (GimpLayer            *layer);
+
+void            gimp_layer_set_composite_mode  (GimpLayer            *layer,
+                                                GimpLayerCompositeMode  composite_mode,
+                                                gboolean              push_undo);
+GimpLayerCompositeMode
+                gimp_layer_get_composite_mode  (GimpLayer            *layer);
+GimpLayerCompositeMode
+           gimp_layer_get_real_composite_mode  (GimpLayer            *layer);
+
+void            gimp_layer_get_effective_mode  (GimpLayer            *layer,
+                                                GimpLayerMode          *mode,
+                                                GimpLayerColorSpace    *blend_space,
+                                                GimpLayerColorSpace    *composite_space,
+                                                GimpLayerCompositeMode *composite_mode);
+
+gboolean      gimp_layer_get_excludes_backdrop (GimpLayer            *layer);
+
+void            gimp_layer_set_lock_alpha      (GimpLayer            *layer,
+                                                gboolean              lock_alpha,
+                                                gboolean              push_undo);
+gboolean        gimp_layer_get_lock_alpha      (GimpLayer            *layer);
+gboolean        gimp_layer_can_lock_alpha      (GimpLayer            *layer);
+
+
+/*  protected  */
+
+void          gimp_layer_update_effective_mode (GimpLayer            *layer);
+void       gimp_layer_update_excludes_backdrop (GimpLayer            *layer);
+
+
+#endif /* __GIMP_LAYER_H__ */
diff --git a/app/core/gimplayermask.c b/app/core/gimplayermask.c
new file mode 100644
index 0000000..ec0dbfb
--- /dev/null
+++ b/app/core/gimplayermask.c
@@ -0,0 +1,297 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayermask.h"
+
+#include "gimp-intl.h"
+
+
+static void            gimp_layer_mask_preview_freeze       (GimpViewable      *viewable);
+static void            gimp_layer_mask_preview_thaw         (GimpViewable      *viewable);
+
+static gboolean        gimp_layer_mask_is_attached          (GimpItem          *item);
+static gboolean        gimp_layer_mask_is_content_locked    (GimpItem          *item);
+static gboolean        gimp_layer_mask_is_position_locked   (GimpItem          *item);
+static GimpItemTree  * gimp_layer_mask_get_tree             (GimpItem          *item);
+static GimpItem      * gimp_layer_mask_duplicate            (GimpItem          *item,
+                                                             GType              new_type);
+static gboolean        gimp_layer_mask_rename               (GimpItem          *item,
+                                                             const gchar       *new_name,
+                                                             const gchar       *undo_desc,
+                                                             GError           **error);
+
+static void            gimp_layer_mask_bounding_box_changed (GimpDrawable      *drawable);
+static void            gimp_layer_mask_convert_type         (GimpDrawable      *drawable,
+                                                             GimpImage         *dest_image,
+                                                             const Babl        *new_format,
+                                                             GimpColorProfile  *dest_profile,
+                                                             GeglDitherMethod   layer_dither_type,
+                                                             GeglDitherMethod   mask_dither_type,
+                                                             gboolean           push_undo,
+                                                             GimpProgress      *progress);
+
+
+G_DEFINE_TYPE (GimpLayerMask, gimp_layer_mask, GIMP_TYPE_CHANNEL)
+
+#define parent_class gimp_layer_mask_parent_class
+
+
+static void
+gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
+{
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+  GimpItemClass     *item_class     = GIMP_ITEM_CLASS (klass);
+  GimpDrawableClass *drawable_class = GIMP_DRAWABLE_CLASS (klass);
+
+  viewable_class->default_icon_name = "gimp-layer-mask";
+
+  viewable_class->preview_freeze       = gimp_layer_mask_preview_freeze;
+  viewable_class->preview_thaw         = gimp_layer_mask_preview_thaw;
+
+  item_class->is_attached              = gimp_layer_mask_is_attached;
+  item_class->is_content_locked        = gimp_layer_mask_is_content_locked;
+  item_class->is_position_locked       = gimp_layer_mask_is_position_locked;
+  item_class->get_tree                 = gimp_layer_mask_get_tree;
+  item_class->duplicate                = gimp_layer_mask_duplicate;
+  item_class->rename                   = gimp_layer_mask_rename;
+  item_class->translate_desc           = C_("undo-type", "Move Layer Mask");
+  item_class->to_selection_desc        = C_("undo-type", "Layer Mask to Selection");
+
+  drawable_class->bounding_box_changed = gimp_layer_mask_bounding_box_changed;
+  drawable_class->convert_type         = gimp_layer_mask_convert_type;
+}
+
+static void
+gimp_layer_mask_init (GimpLayerMask *layer_mask)
+{
+  layer_mask->layer = NULL;
+}
+
+static void
+gimp_layer_mask_preview_freeze (GimpViewable *viewable)
+{
+  GimpLayerMask *mask  = GIMP_LAYER_MASK (viewable);
+  GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
+
+  if (layer)
+    {
+      GimpViewable *parent = gimp_viewable_get_parent (GIMP_VIEWABLE (layer));
+
+      if (! parent && gimp_item_is_attached (GIMP_ITEM (layer)))
+        parent = GIMP_VIEWABLE (gimp_item_get_image (GIMP_ITEM (layer)));
+
+      if (parent)
+        gimp_viewable_preview_freeze (parent);
+    }
+}
+
+static void
+gimp_layer_mask_preview_thaw (GimpViewable *viewable)
+{
+  GimpLayerMask *mask  = GIMP_LAYER_MASK (viewable);
+  GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
+
+  if (layer)
+    {
+      GimpViewable *parent = gimp_viewable_get_parent (GIMP_VIEWABLE (layer));
+
+      if (! parent && gimp_item_is_attached (GIMP_ITEM (layer)))
+        parent = GIMP_VIEWABLE (gimp_item_get_image (GIMP_ITEM (layer)));
+
+      if (parent)
+        gimp_viewable_preview_thaw (parent);
+    }
+}
+
+static gboolean
+gimp_layer_mask_is_content_locked (GimpItem *item)
+{
+  GimpLayerMask *mask  = GIMP_LAYER_MASK (item);
+  GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
+
+  if (layer)
+    return gimp_item_is_content_locked (GIMP_ITEM (layer));
+
+  return FALSE;
+}
+
+static gboolean
+gimp_layer_mask_is_position_locked (GimpItem *item)
+{
+  GimpLayerMask *mask  = GIMP_LAYER_MASK (item);
+  GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
+
+  if (layer)
+    return gimp_item_is_position_locked (GIMP_ITEM (layer));
+
+  return FALSE;
+}
+
+static gboolean
+gimp_layer_mask_is_attached (GimpItem *item)
+{
+  GimpLayerMask *mask  = GIMP_LAYER_MASK (item);
+  GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
+
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          GIMP_IS_LAYER (layer)                      &&
+          gimp_layer_get_mask (layer) == mask        &&
+          gimp_item_is_attached (GIMP_ITEM (layer)));
+}
+
+static GimpItemTree *
+gimp_layer_mask_get_tree (GimpItem *item)
+{
+  return NULL;
+}
+
+static GimpItem *
+gimp_layer_mask_duplicate (GimpItem *item,
+                           GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  return new_item;
+}
+
+static gboolean
+gimp_layer_mask_rename (GimpItem     *item,
+                        const gchar  *new_name,
+                        const gchar  *undo_desc,
+                        GError      **error)
+{
+  /* reject renaming, layer masks are always named "<layer name> mask"  */
+
+  g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+               _("Cannot rename layer masks."));
+
+  return FALSE;
+}
+
+static void
+gimp_layer_mask_bounding_box_changed (GimpDrawable *drawable)
+{
+  GimpLayerMask *mask  = GIMP_LAYER_MASK (drawable);
+  GimpLayer     *layer = gimp_layer_mask_get_layer (mask);
+
+  if (GIMP_DRAWABLE_CLASS (parent_class)->bounding_box_changed)
+    GIMP_DRAWABLE_CLASS (parent_class)->bounding_box_changed (drawable);
+
+  if (layer)
+    gimp_drawable_update_bounding_box (GIMP_DRAWABLE (layer));
+}
+
+static void
+gimp_layer_mask_convert_type (GimpDrawable      *drawable,
+                              GimpImage         *dest_image,
+                              const Babl        *new_format,
+                              GimpColorProfile  *dest_profile,
+                              GeglDitherMethod   layer_dither_type,
+                              GeglDitherMethod   mask_dither_type,
+                              gboolean           push_undo,
+                              GimpProgress      *progress)
+{
+  new_format =
+    gimp_babl_mask_format (gimp_babl_format_get_precision (new_format));
+
+  GIMP_DRAWABLE_CLASS (parent_class)->convert_type (drawable, dest_image,
+                                                    new_format,
+                                                    dest_profile,
+                                                    layer_dither_type,
+                                                    mask_dither_type,
+                                                    push_undo,
+                                                    progress);
+}
+
+GimpLayerMask *
+gimp_layer_mask_new (GimpImage     *image,
+                     gint           width,
+                     gint           height,
+                     const gchar   *name,
+                     const GimpRGB *color)
+{
+  GimpLayerMask *layer_mask;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (width > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+  g_return_val_if_fail (color != NULL, NULL);
+
+  layer_mask =
+    GIMP_LAYER_MASK (gimp_drawable_new (GIMP_TYPE_LAYER_MASK,
+                                        image, name,
+                                        0, 0, width, height,
+                                        gimp_image_get_mask_format (image)));
+
+  /*  set the layer_mask color and opacity  */
+  gimp_channel_set_color (GIMP_CHANNEL (layer_mask), color, FALSE);
+  gimp_channel_set_show_masked (GIMP_CHANNEL (layer_mask), TRUE);
+
+  /*  selection mask variables  */
+  GIMP_CHANNEL (layer_mask)->x2 = width;
+  GIMP_CHANNEL (layer_mask)->y2 = height;
+
+  return layer_mask;
+}
+
+void
+gimp_layer_mask_set_layer (GimpLayerMask *layer_mask,
+                           GimpLayer     *layer)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MASK (layer_mask));
+  g_return_if_fail (layer == NULL || GIMP_IS_LAYER (layer));
+
+  layer_mask->layer = layer;
+
+  if (layer)
+    {
+      gchar *mask_name;
+      gint   offset_x;
+      gint   offset_y;
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+      gimp_item_set_offset (GIMP_ITEM (layer_mask), offset_x, offset_y);
+
+      mask_name = g_strdup_printf (_("%s mask"), gimp_object_get_name (layer));
+
+      gimp_object_take_name (GIMP_OBJECT (layer_mask), mask_name);
+    }
+}
+
+GimpLayer *
+gimp_layer_mask_get_layer (GimpLayerMask *layer_mask)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER_MASK (layer_mask), NULL);
+
+  return layer_mask->layer;
+}
diff --git a/app/core/gimplayermask.h b/app/core/gimplayermask.h
new file mode 100644
index 0000000..5ee77fd
--- /dev/null
+++ b/app/core/gimplayermask.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_MASK_H__
+#define __GIMP_LAYER_MASK_H__
+
+
+#include "gimpchannel.h"
+
+
+#define GIMP_TYPE_LAYER_MASK            (gimp_layer_mask_get_type ())
+#define GIMP_LAYER_MASK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_MASK, GimpLayerMask))
+#define GIMP_LAYER_MASK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_MASK, GimpLayerMaskClass))
+#define GIMP_IS_LAYER_MASK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_MASK))
+#define GIMP_IS_LAYER_MASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK))
+#define GIMP_LAYER_MASK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_MASK, GimpLayerMaskClass))
+
+
+typedef struct _GimpLayerMaskClass  GimpLayerMaskClass;
+
+struct _GimpLayerMask
+{
+  GimpChannel  parent_instance;
+
+  GimpLayer   *layer;
+};
+
+struct _GimpLayerMaskClass
+{
+  GimpChannelClass  parent_class;
+};
+
+
+GType           gimp_layer_mask_get_type  (void) G_GNUC_CONST;
+
+GimpLayerMask * gimp_layer_mask_new       (GimpImage     *image,
+                                           gint           width,
+                                           gint           height,
+                                           const gchar   *name,
+                                           const GimpRGB *color);
+
+void            gimp_layer_mask_set_layer (GimpLayerMask *layer_mask,
+                                           GimpLayer     *layer);
+GimpLayer     * gimp_layer_mask_get_layer (GimpLayerMask *layer_mask);
+
+
+#endif /* __GIMP_LAYER_MASK_H__ */
diff --git a/app/core/gimplayermaskpropundo.c b/app/core/gimplayermaskpropundo.c
new file mode 100644
index 0000000..7913202
--- /dev/null
+++ b/app/core/gimplayermaskpropundo.c
@@ -0,0 +1,122 @@
+/* Gimp - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimplayer.h"
+#include "gimplayermaskpropundo.h"
+
+
+static void   gimp_layer_mask_prop_undo_constructed (GObject             *object);
+
+static void   gimp_layer_mask_prop_undo_pop         (GimpUndo            *undo,
+                                                     GimpUndoMode         undo_mode,
+                                                     GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpLayerMaskPropUndo, gimp_layer_mask_prop_undo,
+               GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_layer_mask_prop_undo_parent_class
+
+
+static void
+gimp_layer_mask_prop_undo_class_init (GimpLayerMaskPropUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_layer_mask_prop_undo_constructed;
+
+  undo_class->pop           = gimp_layer_mask_prop_undo_pop;
+}
+
+static void
+gimp_layer_mask_prop_undo_init (GimpLayerMaskPropUndo *undo)
+{
+}
+
+static void
+gimp_layer_mask_prop_undo_constructed (GObject *object)
+{
+  GimpLayerMaskPropUndo *layer_mask_prop_undo;
+  GimpLayer             *layer;
+
+  layer_mask_prop_undo = GIMP_LAYER_MASK_PROP_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_LAYER (GIMP_ITEM_UNDO (object)->item));
+
+  layer = GIMP_LAYER (GIMP_ITEM_UNDO (object)->item);
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_LAYER_MASK_APPLY:
+      layer_mask_prop_undo->apply = gimp_layer_get_apply_mask (layer);
+      break;
+
+    case GIMP_UNDO_LAYER_MASK_SHOW:
+      layer_mask_prop_undo->show = gimp_layer_get_show_mask (layer);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_layer_mask_prop_undo_pop (GimpUndo            *undo,
+                               GimpUndoMode         undo_mode,
+                               GimpUndoAccumulator *accum)
+{
+  GimpLayerMaskPropUndo *layer_mask_prop_undo = GIMP_LAYER_MASK_PROP_UNDO (undo);
+  GimpLayer             *layer                = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_LAYER_MASK_APPLY:
+      {
+        gboolean apply;
+
+        apply = gimp_layer_get_apply_mask (layer);
+        gimp_layer_set_apply_mask (layer, layer_mask_prop_undo->apply, FALSE);
+        layer_mask_prop_undo->apply = apply;
+      }
+      break;
+
+    case GIMP_UNDO_LAYER_MASK_SHOW:
+      {
+        gboolean show;
+
+        show = gimp_layer_get_show_mask (layer);
+        gimp_layer_set_show_mask (layer, layer_mask_prop_undo->show, FALSE);
+        layer_mask_prop_undo->show = show;
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
diff --git a/app/core/gimplayermaskpropundo.h b/app/core/gimplayermaskpropundo.h
new file mode 100644
index 0000000..a416e43
--- /dev/null
+++ b/app/core/gimplayermaskpropundo.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_MASK_PROP_UNDO_H__
+#define __GIMP_LAYER_MASK_PROP_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_LAYER_MASK_PROP_UNDO            (gimp_layer_mask_prop_undo_get_type ())
+#define GIMP_LAYER_MASK_PROP_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_MASK_PROP_UNDO, GimpLayerMaskPropUndo))
+#define GIMP_LAYER_MASK_PROP_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_MASK_PROP_UNDO, GimpLayerMaskPropUndoClass))
+#define GIMP_IS_LAYER_MASK_PROP_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_MASK_PROP_UNDO))
+#define GIMP_IS_LAYER_MASK_PROP_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK_PROP_UNDO))
+#define GIMP_LAYER_MASK_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_MASK_PROP_UNDO, GimpLayerMaskPropUndoClass))
+
+
+typedef struct _GimpLayerMaskPropUndo      GimpLayerMaskPropUndo;
+typedef struct _GimpLayerMaskPropUndoClass GimpLayerMaskPropUndoClass;
+
+struct _GimpLayerMaskPropUndo
+{
+  GimpItemUndo  parent_instance;
+
+  gboolean      apply;
+  gboolean      show;
+};
+
+struct _GimpLayerMaskPropUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_layer_mask_prop_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_LAYER_MASK_PROP_UNDO_H__ */
diff --git a/app/core/gimplayermaskundo.c b/app/core/gimplayermaskundo.c
new file mode 100644
index 0000000..cc49eb7
--- /dev/null
+++ b/app/core/gimplayermaskundo.c
@@ -0,0 +1,195 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayermask.h"
+#include "gimplayermaskundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LAYER_MASK
+};
+
+
+static void     gimp_layer_mask_undo_constructed  (GObject             *object);
+static void     gimp_layer_mask_undo_set_property (GObject             *object,
+                                                   guint                property_id,
+                                                   const GValue        *value,
+                                                   GParamSpec          *pspec);
+static void     gimp_layer_mask_undo_get_property (GObject             *object,
+                                                   guint                property_id,
+                                                   GValue              *value,
+                                                   GParamSpec          *pspec);
+
+static gint64   gimp_layer_mask_undo_get_memsize  (GimpObject          *object,
+                                                   gint64              *gui_size);
+
+static void     gimp_layer_mask_undo_pop          (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode,
+                                                   GimpUndoAccumulator *accum);
+static void     gimp_layer_mask_undo_free         (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpLayerMaskUndo, gimp_layer_mask_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_layer_mask_undo_parent_class
+
+
+static void
+gimp_layer_mask_undo_class_init (GimpLayerMaskUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_layer_mask_undo_constructed;
+  object_class->set_property     = gimp_layer_mask_undo_set_property;
+  object_class->get_property     = gimp_layer_mask_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_layer_mask_undo_get_memsize;
+
+  undo_class->pop                = gimp_layer_mask_undo_pop;
+  undo_class->free               = gimp_layer_mask_undo_free;
+
+  g_object_class_install_property (object_class, PROP_LAYER_MASK,
+                                   g_param_spec_object ("layer-mask", NULL, NULL,
+                                                        GIMP_TYPE_LAYER_MASK,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_layer_mask_undo_init (GimpLayerMaskUndo *undo)
+{
+}
+
+static void
+gimp_layer_mask_undo_constructed (GObject *object)
+{
+  GimpLayerMaskUndo *layer_mask_undo = GIMP_LAYER_MASK_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_LAYER (GIMP_ITEM_UNDO (object)->item));
+  gimp_assert (GIMP_IS_LAYER_MASK (layer_mask_undo->layer_mask));
+}
+
+static void
+gimp_layer_mask_undo_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpLayerMaskUndo *layer_mask_undo = GIMP_LAYER_MASK_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER_MASK:
+      layer_mask_undo->layer_mask = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_mask_undo_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpLayerMaskUndo *layer_mask_undo = GIMP_LAYER_MASK_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER_MASK:
+      g_value_set_object (value, layer_mask_undo->layer_mask);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_layer_mask_undo_get_memsize (GimpObject *object,
+                                  gint64     *gui_size)
+{
+  GimpLayerMaskUndo *layer_mask_undo = GIMP_LAYER_MASK_UNDO (object);
+  GimpLayer         *layer           = GIMP_LAYER (GIMP_ITEM_UNDO (object)->item);
+  gint64             memsize         = 0;
+
+  /* don't use !gimp_item_is_attached() here */
+  if (gimp_layer_get_mask (layer) != layer_mask_undo->layer_mask)
+    memsize += gimp_object_get_memsize (GIMP_OBJECT (layer_mask_undo->layer_mask),
+                                        gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_layer_mask_undo_pop (GimpUndo            *undo,
+                          GimpUndoMode         undo_mode,
+                          GimpUndoAccumulator *accum)
+{
+  GimpLayerMaskUndo *layer_mask_undo = GIMP_LAYER_MASK_UNDO (undo);
+  GimpLayer         *layer           = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+       undo->undo_type == GIMP_UNDO_LAYER_MASK_ADD) ||
+      (undo_mode       == GIMP_UNDO_MODE_REDO &&
+       undo->undo_type == GIMP_UNDO_LAYER_MASK_REMOVE))
+    {
+      /*  remove layer mask  */
+
+      gimp_layer_apply_mask (layer, GIMP_MASK_DISCARD, FALSE);
+    }
+  else
+    {
+      /*  restore layer mask  */
+
+      gimp_layer_add_mask (layer, layer_mask_undo->layer_mask, FALSE, NULL);
+    }
+}
+
+static void
+gimp_layer_mask_undo_free (GimpUndo     *undo,
+                           GimpUndoMode  undo_mode)
+{
+  GimpLayerMaskUndo *layer_mask_undo = GIMP_LAYER_MASK_UNDO (undo);
+
+  g_clear_object (&layer_mask_undo->layer_mask);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimplayermaskundo.h b/app/core/gimplayermaskundo.h
new file mode 100644
index 0000000..c8591c1
--- /dev/null
+++ b/app/core/gimplayermaskundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_MASK_UNDO_H__
+#define __GIMP_LAYER_MASK_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_LAYER_MASK_UNDO            (gimp_layer_mask_undo_get_type ())
+#define GIMP_LAYER_MASK_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_MASK_UNDO, GimpLayerMaskUndo))
+#define GIMP_LAYER_MASK_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_MASK_UNDO, GimpLayerMaskUndoClass))
+#define GIMP_IS_LAYER_MASK_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_MASK_UNDO))
+#define GIMP_IS_LAYER_MASK_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MASK_UNDO))
+#define GIMP_LAYER_MASK_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_MASK_UNDO, GimpLayerMaskUndoClass))
+
+
+typedef struct _GimpLayerMaskUndo      GimpLayerMaskUndo;
+typedef struct _GimpLayerMaskUndoClass GimpLayerMaskUndoClass;
+
+struct _GimpLayerMaskUndo
+{
+  GimpItemUndo   parent_instance;
+
+  GimpLayerMask *layer_mask;
+};
+
+struct _GimpLayerMaskUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_layer_mask_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_LAYER_MASK_UNDO_H__ */
diff --git a/app/core/gimplayerpropundo.c b/app/core/gimplayerpropundo.c
new file mode 100644
index 0000000..73e3e02
--- /dev/null
+++ b/app/core/gimplayerpropundo.c
@@ -0,0 +1,157 @@
+/* Gimp - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayerpropundo.h"
+
+
+static void   gimp_layer_prop_undo_constructed (GObject             *object);
+
+static void   gimp_layer_prop_undo_pop         (GimpUndo            *undo,
+                                                GimpUndoMode         undo_mode,
+                                                GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpLayerPropUndo, gimp_layer_prop_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_layer_prop_undo_parent_class
+
+
+static void
+gimp_layer_prop_undo_class_init (GimpLayerPropUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_layer_prop_undo_constructed;
+
+  undo_class->pop           = gimp_layer_prop_undo_pop;
+}
+
+static void
+gimp_layer_prop_undo_init (GimpLayerPropUndo *undo)
+{
+}
+
+static void
+gimp_layer_prop_undo_constructed (GObject *object)
+{
+  GimpLayerPropUndo *layer_prop_undo = GIMP_LAYER_PROP_UNDO (object);
+  GimpLayer         *layer;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_LAYER (GIMP_ITEM_UNDO (object)->item));
+
+  layer = GIMP_LAYER (GIMP_ITEM_UNDO (object)->item);
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_LAYER_MODE:
+      layer_prop_undo->mode            = gimp_layer_get_mode (layer);
+      layer_prop_undo->blend_space     = gimp_layer_get_blend_space (layer);
+      layer_prop_undo->composite_space = gimp_layer_get_composite_space (layer);
+      layer_prop_undo->composite_mode  = gimp_layer_get_composite_mode (layer);
+      break;
+
+    case GIMP_UNDO_LAYER_OPACITY:
+      layer_prop_undo->opacity = gimp_layer_get_opacity (layer);
+      break;
+
+    case GIMP_UNDO_LAYER_LOCK_ALPHA:
+      layer_prop_undo->lock_alpha = gimp_layer_get_lock_alpha (layer);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_layer_prop_undo_pop (GimpUndo            *undo,
+                          GimpUndoMode         undo_mode,
+                          GimpUndoAccumulator *accum)
+{
+  GimpLayerPropUndo *layer_prop_undo = GIMP_LAYER_PROP_UNDO (undo);
+  GimpLayer         *layer           = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_LAYER_MODE:
+      {
+        GimpLayerMode          mode;
+        GimpLayerColorSpace    blend_space;
+        GimpLayerColorSpace    composite_space;
+        GimpLayerCompositeMode composite_mode;
+
+        mode            = gimp_layer_get_mode (layer);
+        blend_space     = gimp_layer_get_blend_space (layer);
+        composite_space = gimp_layer_get_composite_space (layer);
+        composite_mode  = gimp_layer_get_composite_mode (layer);
+
+        gimp_layer_set_mode            (layer, layer_prop_undo->mode,
+                                        FALSE);
+        gimp_layer_set_blend_space     (layer, layer_prop_undo->blend_space,
+                                        FALSE);
+        gimp_layer_set_composite_space (layer, layer_prop_undo->composite_space,
+                                        FALSE);
+        gimp_layer_set_composite_mode  (layer, layer_prop_undo->composite_mode,
+                                        FALSE);
+
+        layer_prop_undo->mode            = mode;
+        layer_prop_undo->blend_space     = blend_space;
+        layer_prop_undo->composite_space = composite_space;
+        layer_prop_undo->composite_mode  = composite_mode;
+      }
+      break;
+
+    case GIMP_UNDO_LAYER_OPACITY:
+      {
+        gdouble opacity;
+
+        opacity = gimp_layer_get_opacity (layer);
+        gimp_layer_set_opacity (layer, layer_prop_undo->opacity, FALSE);
+        layer_prop_undo->opacity = opacity;
+      }
+      break;
+
+    case GIMP_UNDO_LAYER_LOCK_ALPHA:
+      {
+        gboolean lock_alpha;
+
+        lock_alpha = gimp_layer_get_lock_alpha (layer);
+        gimp_layer_set_lock_alpha (layer, layer_prop_undo->lock_alpha, FALSE);
+        layer_prop_undo->lock_alpha = lock_alpha;
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
diff --git a/app/core/gimplayerpropundo.h b/app/core/gimplayerpropundo.h
new file mode 100644
index 0000000..5a3b478
--- /dev/null
+++ b/app/core/gimplayerpropundo.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_PROP_UNDO_H__
+#define __GIMP_LAYER_PROP_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_LAYER_PROP_UNDO            (gimp_layer_prop_undo_get_type ())
+#define GIMP_LAYER_PROP_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_PROP_UNDO, GimpLayerPropUndo))
+#define GIMP_LAYER_PROP_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_PROP_UNDO, GimpLayerPropUndoClass))
+#define GIMP_IS_LAYER_PROP_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_PROP_UNDO))
+#define GIMP_IS_LAYER_PROP_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_PROP_UNDO))
+#define GIMP_LAYER_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_PROP_UNDO, GimpLayerPropUndoClass))
+
+
+typedef struct _GimpLayerPropUndo      GimpLayerPropUndo;
+typedef struct _GimpLayerPropUndoClass GimpLayerPropUndoClass;
+
+struct _GimpLayerPropUndo
+{
+  GimpItemUndo            parent_instance;
+
+  GimpLayerMode           mode;
+  GimpLayerColorSpace     blend_space;
+  GimpLayerColorSpace     composite_space;
+  GimpLayerCompositeMode  composite_mode;
+  gdouble                 opacity;
+  gboolean                lock_alpha;
+};
+
+struct _GimpLayerPropUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_layer_prop_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_LAYER_PROP_UNDO_H__ */
diff --git a/app/core/gimplayerstack.c b/app/core/gimplayerstack.c
new file mode 100644
index 0000000..1540189
--- /dev/null
+++ b/app/core/gimplayerstack.c
@@ -0,0 +1,243 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimplayerstack.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimplayer.h"
+#include "gimplayerstack.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_layer_stack_constructed             (GObject       *object);
+
+static void   gimp_layer_stack_add                     (GimpContainer *container,
+                                                        GimpObject    *object);
+static void   gimp_layer_stack_remove                  (GimpContainer *container,
+                                                        GimpObject    *object);
+static void   gimp_layer_stack_reorder                 (GimpContainer *container,
+                                                        GimpObject    *object,
+                                                        gint           new_index);
+
+static void   gimp_layer_stack_layer_active            (GimpLayer      *layer,
+                                                        GimpLayerStack *stack);
+static void   gimp_layer_stack_layer_excludes_backdrop (GimpLayer      *layer,
+                                                        GimpLayerStack *stack);
+
+static void   gimp_layer_stack_update_backdrop         (GimpLayerStack *stack,
+                                                        GimpLayer      *layer,
+                                                        gboolean        ignore_active,
+                                                        gboolean        ignore_excludes_backdrop);
+static void   gimp_layer_stack_update_range            (GimpLayerStack *stack,
+                                                        gint            first,
+                                                        gint            last);
+
+
+G_DEFINE_TYPE (GimpLayerStack, gimp_layer_stack, GIMP_TYPE_DRAWABLE_STACK)
+
+#define parent_class gimp_layer_stack_parent_class
+
+
+static void
+gimp_layer_stack_class_init (GimpLayerStackClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GimpContainerClass *container_class = GIMP_CONTAINER_CLASS (klass);
+
+  object_class->constructed = gimp_layer_stack_constructed;
+
+  container_class->add      = gimp_layer_stack_add;
+  container_class->remove   = gimp_layer_stack_remove;
+  container_class->reorder  = gimp_layer_stack_reorder;
+}
+
+static void
+gimp_layer_stack_init (GimpLayerStack *stack)
+{
+}
+
+static void
+gimp_layer_stack_constructed (GObject *object)
+{
+  GimpContainer *container = GIMP_CONTAINER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+                            GIMP_TYPE_LAYER));
+
+  gimp_container_add_handler (container, "active-changed",
+                              G_CALLBACK (gimp_layer_stack_layer_active),
+                              container);
+  gimp_container_add_handler (container, "excludes-backdrop-changed",
+                              G_CALLBACK (gimp_layer_stack_layer_excludes_backdrop),
+                              container);
+}
+
+static void
+gimp_layer_stack_add (GimpContainer *container,
+                      GimpObject    *object)
+{
+  GimpLayerStack *stack = GIMP_LAYER_STACK (container);
+
+  GIMP_CONTAINER_CLASS (parent_class)->add (container, object);
+
+  gimp_layer_stack_update_backdrop (stack, GIMP_LAYER (object), FALSE, FALSE);
+}
+
+static void
+gimp_layer_stack_remove (GimpContainer *container,
+                         GimpObject    *object)
+{
+  GimpLayerStack *stack = GIMP_LAYER_STACK (container);
+  gboolean        update_backdrop;
+  gint            index;
+
+  update_backdrop = gimp_filter_get_active (GIMP_FILTER (object)) &&
+                    gimp_layer_get_excludes_backdrop (GIMP_LAYER (object));
+
+  if (update_backdrop)
+    index = gimp_container_get_child_index (container, object);
+
+  GIMP_CONTAINER_CLASS (parent_class)->remove (container, object);
+
+  if (update_backdrop)
+    gimp_layer_stack_update_range (stack, index, -1);
+}
+
+static void
+gimp_layer_stack_reorder (GimpContainer *container,
+                          GimpObject    *object,
+                          gint           new_index)
+{
+  GimpLayerStack *stack = GIMP_LAYER_STACK (container);
+  gboolean        update_backdrop;
+  gint            index;
+
+  update_backdrop = gimp_filter_get_active (GIMP_FILTER (object)) &&
+                    gimp_layer_get_excludes_backdrop (GIMP_LAYER (object));
+
+  if (update_backdrop)
+    index = gimp_container_get_child_index (container, object);
+
+  GIMP_CONTAINER_CLASS (parent_class)->reorder (container, object, new_index);
+
+  if (update_backdrop)
+    gimp_layer_stack_update_range (stack, index, new_index);
+}
+
+
+/*  public functions  */
+
+GimpContainer *
+gimp_layer_stack_new (GType layer_type)
+{
+  g_return_val_if_fail (g_type_is_a (layer_type, GIMP_TYPE_LAYER), NULL);
+
+  return g_object_new (GIMP_TYPE_LAYER_STACK,
+                       "name",          g_type_name (layer_type),
+                       "children-type", layer_type,
+                       "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_layer_stack_layer_active (GimpLayer      *layer,
+                               GimpLayerStack *stack)
+{
+  gimp_layer_stack_update_backdrop (stack, layer, TRUE, FALSE);
+}
+
+static void
+gimp_layer_stack_layer_excludes_backdrop (GimpLayer      *layer,
+                                          GimpLayerStack *stack)
+{
+  gimp_layer_stack_update_backdrop (stack, layer, FALSE, TRUE);
+}
+
+static void
+gimp_layer_stack_update_backdrop (GimpLayerStack *stack,
+                                  GimpLayer      *layer,
+                                  gboolean        ignore_active,
+                                  gboolean        ignore_excludes_backdrop)
+{
+  if ((ignore_active            || gimp_filter_get_active (GIMP_FILTER (layer))) &&
+      (ignore_excludes_backdrop || gimp_layer_get_excludes_backdrop (layer)))
+    {
+      gint index;
+
+      index = gimp_container_get_child_index (GIMP_CONTAINER (stack),
+                                              GIMP_OBJECT (layer));
+
+      gimp_layer_stack_update_range (stack, index + 1, -1);
+    }
+}
+
+static void
+gimp_layer_stack_update_range (GimpLayerStack *stack,
+                               gint            first,
+                               gint            last)
+{
+  GList *iter;
+
+  g_return_if_fail (first >= 0 && last >= -1);
+
+  /* if the range is reversed, flip first and last; note that last == -1 is
+   * used to update all layers from first onward.
+   */
+  if (last >= 0 && last < first)
+    {
+      gint temp = first;
+
+      first = last + 1;
+      last  = temp + 1;
+    }
+
+  iter = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (stack));
+
+  for (iter = g_list_nth (iter, first);
+       iter && first != last;
+       iter = g_list_next (iter), first++)
+    {
+      GimpItem *item = iter->data;
+
+      if (gimp_filter_get_active (GIMP_FILTER (item)))
+        {
+          GeglRectangle bounding_box;
+
+          bounding_box = gimp_drawable_get_bounding_box (GIMP_DRAWABLE (item));
+
+          bounding_box.x += gimp_item_get_offset_x (item);
+          bounding_box.y += gimp_item_get_offset_y (item);
+
+          gimp_drawable_stack_update (GIMP_DRAWABLE_STACK (stack),
+                                      bounding_box.x,     bounding_box.y,
+                                      bounding_box.width, bounding_box.height);
+        }
+    }
+}
diff --git a/app/core/gimplayerstack.h b/app/core/gimplayerstack.h
new file mode 100644
index 0000000..598d21c
--- /dev/null
+++ b/app/core/gimplayerstack.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimplayerstack.h
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_STACK_H__
+#define __GIMP_LAYER_STACK_H__
+
+#include "gimpdrawablestack.h"
+
+
+#define GIMP_TYPE_LAYER_STACK            (gimp_layer_stack_get_type ())
+#define GIMP_LAYER_STACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_STACK, GimpLayerStack))
+#define GIMP_LAYER_STACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_STACK, GimpLayerStackClass))
+#define GIMP_IS_LAYER_STACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_STACK))
+#define GIMP_IS_LAYER_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_STACK))
+
+
+typedef struct _GimpLayerStackClass GimpLayerStackClass;
+
+struct _GimpLayerStack
+{
+  GimpDrawableStack  parent_instance;
+};
+
+struct _GimpLayerStackClass
+{
+  GimpDrawableStackClass  parent_class;
+};
+
+
+GType           gimp_layer_stack_get_type  (void) G_GNUC_CONST;
+GimpContainer * gimp_layer_stack_new       (GType layer_type);
+
+
+#endif  /*  __GIMP_LAYER_STACK_H__  */
diff --git a/app/core/gimplayerundo.c b/app/core/gimplayerundo.c
new file mode 100644
index 0000000..64a1de3
--- /dev/null
+++ b/app/core/gimplayerundo.c
@@ -0,0 +1,212 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayerundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PREV_PARENT,
+  PROP_PREV_POSITION,
+  PROP_PREV_LAYER
+};
+
+
+static void     gimp_layer_undo_constructed  (GObject             *object);
+static void     gimp_layer_undo_set_property (GObject             *object,
+                                              guint                property_id,
+                                              const GValue        *value,
+                                              GParamSpec          *pspec);
+static void     gimp_layer_undo_get_property (GObject             *object,
+                                              guint                property_id,
+                                              GValue              *value,
+                                              GParamSpec          *pspec);
+
+static gint64   gimp_layer_undo_get_memsize  (GimpObject          *object,
+                                              gint64              *gui_size);
+
+static void     gimp_layer_undo_pop          (GimpUndo            *undo,
+                                              GimpUndoMode         undo_mode,
+                                              GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpLayerUndo, gimp_layer_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_layer_undo_parent_class
+
+
+static void
+gimp_layer_undo_class_init (GimpLayerUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_layer_undo_constructed;
+  object_class->set_property     = gimp_layer_undo_set_property;
+  object_class->get_property     = gimp_layer_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_layer_undo_get_memsize;
+
+  undo_class->pop                = gimp_layer_undo_pop;
+
+  g_object_class_install_property (object_class, PROP_PREV_PARENT,
+                                   g_param_spec_object ("prev-parent",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_LAYER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PREV_POSITION,
+                                   g_param_spec_int ("prev-position", NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PREV_LAYER,
+                                   g_param_spec_object ("prev-layer", NULL, NULL,
+                                                        GIMP_TYPE_LAYER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_layer_undo_init (GimpLayerUndo *undo)
+{
+}
+
+static void
+gimp_layer_undo_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_LAYER (GIMP_ITEM_UNDO (object)->item));
+}
+
+static void
+gimp_layer_undo_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpLayerUndo *layer_undo = GIMP_LAYER_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREV_PARENT:
+      layer_undo->prev_parent = g_value_get_object (value);
+      break;
+    case PROP_PREV_POSITION:
+      layer_undo->prev_position = g_value_get_int (value);
+      break;
+    case PROP_PREV_LAYER:
+      layer_undo->prev_layer = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_undo_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpLayerUndo *layer_undo = GIMP_LAYER_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREV_PARENT:
+      g_value_set_object (value, layer_undo->prev_parent);
+      break;
+    case PROP_PREV_POSITION:
+      g_value_set_int (value, layer_undo->prev_position);
+      break;
+    case PROP_PREV_LAYER:
+      g_value_set_object (value, layer_undo->prev_layer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_layer_undo_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (object);
+  gint64        memsize   = 0;
+
+  if (! gimp_item_is_attached (item_undo->item))
+    memsize += gimp_object_get_memsize (GIMP_OBJECT (item_undo->item),
+                                        gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_layer_undo_pop (GimpUndo            *undo,
+                     GimpUndoMode         undo_mode,
+                     GimpUndoAccumulator *accum)
+{
+  GimpLayerUndo *layer_undo = GIMP_LAYER_UNDO (undo);
+  GimpLayer     *layer      = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+       undo->undo_type == GIMP_UNDO_LAYER_ADD) ||
+      (undo_mode       == GIMP_UNDO_MODE_REDO &&
+       undo->undo_type == GIMP_UNDO_LAYER_REMOVE))
+    {
+      /*  remove layer  */
+
+      /*  record the current parent and position  */
+      layer_undo->prev_parent   = gimp_layer_get_parent (layer);
+      layer_undo->prev_position = gimp_item_get_index (GIMP_ITEM (layer));
+
+      gimp_image_remove_layer (undo->image, layer, FALSE,
+                               layer_undo->prev_layer);
+    }
+  else
+    {
+      /*  restore layer  */
+
+      /*  record the active layer  */
+      layer_undo->prev_layer = gimp_image_get_active_layer (undo->image);
+
+      gimp_image_add_layer (undo->image, layer,
+                            layer_undo->prev_parent,
+                            layer_undo->prev_position, FALSE);
+    }
+}
diff --git a/app/core/gimplayerundo.h b/app/core/gimplayerundo.h
new file mode 100644
index 0000000..700fce8
--- /dev/null
+++ b/app/core/gimplayerundo.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_UNDO_H__
+#define __GIMP_LAYER_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_LAYER_UNDO            (gimp_layer_undo_get_type ())
+#define GIMP_LAYER_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_UNDO, GimpLayerUndo))
+#define GIMP_LAYER_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_UNDO, GimpLayerUndoClass))
+#define GIMP_IS_LAYER_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_UNDO))
+#define GIMP_IS_LAYER_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_UNDO))
+#define GIMP_LAYER_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_UNDO, GimpLayerUndoClass))
+
+
+typedef struct _GimpLayerUndo      GimpLayerUndo;
+typedef struct _GimpLayerUndoClass GimpLayerUndoClass;
+
+struct _GimpLayerUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpLayer    *prev_parent;
+  gint          prev_position;   /*  former position in list  */
+  GimpLayer    *prev_layer;      /*  previous active layer    */
+};
+
+struct _GimpLayerUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_layer_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_LAYER_UNDO_H__ */
diff --git a/app/core/gimplineart.c b/app/core/gimplineart.c
new file mode 100644
index 0000000..bf8460c
--- /dev/null
+++ b/app/core/gimplineart.c
@@ -0,0 +1,2979 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2017 Sébastien Fourey & David Tchumperlé
+ * Copyright (C) 2018 Jehan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp-parallel.h"
+#include "gimp-priorities.h"
+#include "gimp-utils.h" /* GIMP_TIMER */
+#include "gimpasync.h"
+#include "gimpcancelable.h"
+#include "gimpdrawable.h"
+#include "gimpimage.h"
+#include "gimplineart.h"
+#include "gimpmarshal.h"
+#include "gimppickable.h"
+#include "gimpprojection.h"
+#include "gimpviewable.h"
+#include "gimpwaitable.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  COMPUTING_START,
+  COMPUTING_END,
+  LAST_SIGNAL,
+};
+
+enum
+{
+  PROP_0,
+  PROP_SELECT_TRANSPARENT,
+  PROP_MAX_GROW,
+  PROP_THRESHOLD,
+  PROP_SPLINE_MAX_LEN,
+  PROP_SEGMENT_MAX_LEN,
+};
+
+typedef struct _GimpLineArtPrivate GimpLineArtPrivate;
+
+struct _GimpLineArtPrivate
+{
+  gboolean      frozen;
+  gboolean      compute_after_thaw;
+
+  GimpAsync    *async;
+
+  gint          idle_id;
+
+  GimpPickable *input;
+  GeglBuffer   *closed;
+  gfloat       *distmap;
+
+  /* Used in the closing step. */
+  gboolean      select_transparent;
+  gdouble       threshold;
+  gint          spline_max_len;
+  gint          segment_max_len;
+  gboolean      max_len_bound;
+
+  /* Used in the grow step. */
+  gint          max_grow;
+};
+
+typedef struct
+{
+  GeglBuffer  *buffer;
+
+  gboolean     select_transparent;
+  gdouble      threshold;
+  gint         spline_max_len;
+  gint         segment_max_len;
+} LineArtData;
+
+typedef struct
+{
+  GeglBuffer *closed;
+  gfloat     *distmap;
+} LineArtResult;
+
+static int DeltaX[4] = {+1, -1, 0, 0};
+static int DeltaY[4] = {0, 0, +1, -1};
+
+static const GimpVector2 Direction2Normal[4] =
+{
+    {  1.0f,  0.0f },
+    { -1.0f,  0.0f },
+    {  0.0f,  1.0f },
+    {  0.0f, -1.0f }
+};
+
+typedef enum _Direction
+{
+  XPlusDirection  = 0,
+  XMinusDirection = 1,
+  YPlusDirection  = 2,
+  YMinusDirection = 3
+} Direction;
+
+typedef GimpVector2 Pixel;
+
+typedef struct _SplineCandidate
+{
+  Pixel p1;
+  Pixel p2;
+  float quality;
+} SplineCandidate;
+
+typedef struct _Edgel
+{
+  gint      x, y;
+  Direction direction;
+
+  gfloat    x_normal;
+  gfloat    y_normal;
+  gfloat    curvature;
+  guint     next, previous;
+} Edgel;
+
+
+static void            gimp_line_art_finalize                  (GObject               *object);
+static void            gimp_line_art_set_property              (GObject                *object,
+                                                                guint                   property_id,
+                                                                const GValue           *value,
+                                                                GParamSpec             *pspec);
+static void            gimp_line_art_get_property              (GObject                *object,
+                                                                guint                   property_id,
+                                                                GValue                 *value,
+                                                                GParamSpec             *pspec);
+
+/* Functions for asynchronous computation. */
+
+static void            gimp_line_art_compute                   (GimpLineArt            *line_art);
+static void            gimp_line_art_compute_cb                (GimpAsync              *async,
+                                                                GimpLineArt            *line_art);
+
+static GimpAsync     * gimp_line_art_prepare_async             (GimpLineArt            *line_art,
+                                                                gint                    priority);
+static void            gimp_line_art_prepare_async_func        (GimpAsync              *async,
+                                                                LineArtData            *data);
+static LineArtData   * line_art_data_new                       (GeglBuffer             *buffer,
+                                                                GimpLineArt            *line_art);
+static void            line_art_data_free                      (LineArtData            *data);
+static LineArtResult * line_art_result_new                     (GeglBuffer             *line_art,
+                                                                gfloat                 *distmap);
+static void            line_art_result_free                    (LineArtResult          *result);
+
+static gboolean        gimp_line_art_idle                      (GimpLineArt            *line_art);
+static void            gimp_line_art_input_invalidate_preview  (GimpViewable           *viewable,
+                                                                GimpLineArt            *line_art);
+
+
+/* All actual computation functions. */
+
+static GeglBuffer    * gimp_line_art_close                     (GeglBuffer             *buffer,
+                                                                gboolean                select_transparent,
+                                                                gdouble                 stroke_threshold,
+                                                                gint                    spline_max_length,
+                                                                gint                    segment_max_length,
+                                                                gint                    minimal_lineart_area,
+                                                                gint                    normal_estimate_mask_size,
+                                                                gfloat                  end_point_rate,
+                                                                gfloat                  spline_max_angle,
+                                                                gint                    end_point_connectivity,
+                                                                gfloat                  spline_roundness,
+                                                                gboolean                allow_self_intersections,
+                                                                gint                    created_regions_significant_area,
+                                                                gint                    created_regions_minimum_area,
+                                                                gboolean                small_segments_from_spline_sources,
+                                                                gfloat                **lineart_distmap,
+                                                                GimpAsync              *async);
+
+static void            gimp_lineart_denoise                    (GeglBuffer             *buffer,
+                                                                int                     size,
+                                                                GimpAsync              *async);
+static void            gimp_lineart_compute_normals_curvatures (GeglBuffer             *mask,
+                                                                gfloat                 *normals,
+                                                                gfloat                 *curvatures,
+                                                                gfloat                 *smoothed_curvatures,
+                                                                int                     normal_estimate_mask_size,
+                                                                GimpAsync              *async);
+static gfloat        * gimp_lineart_get_smooth_curvatures      (GArray                 *edgelset,
+                                                                GimpAsync              *async);
+static GArray        * gimp_lineart_curvature_extremums        (gfloat                 *curvatures,
+                                                                gfloat                 *smoothed_curvatures,
+                                                                gint                    curvatures_width,
+                                                                gint                    curvatures_height,
+                                                                GimpAsync              *async);
+static gint            gimp_spline_candidate_cmp               (const SplineCandidate  *a,
+                                                                const SplineCandidate  *b,
+                                                                gpointer                user_data);
+static GList         * gimp_lineart_find_spline_candidates     (GArray                 *max_positions,
+                                                                gfloat                 *normals,
+                                                                gint                    width,
+                                                                gint                    distance_threshold,
+                                                                gfloat                  max_angle_deg,
+                                                                GimpAsync              *async);
+
+static GArray        * gimp_lineart_discrete_spline            (Pixel                   p0,
+                                                                GimpVector2             n0,
+                                                                Pixel                   p1,
+                                                                GimpVector2             n1);
+
+static gint            gimp_number_of_transitions               (GArray                 *pixels,
+                                                                 GeglBuffer             *buffer);
+static gboolean        gimp_line_art_allow_closure              (GeglBuffer             *mask,
+                                                                 GArray                 *pixels,
+                                                                 GList                 **fill_pixels,
+                                                                 int                     significant_size,
+                                                                 int                     minimum_size);
+static GArray        * gimp_lineart_line_segment_until_hit      (const GeglBuffer       *buffer,
+                                                                 Pixel                   start,
+                                                                 GimpVector2             direction,
+                                                                 int                     size);
+static gfloat        * gimp_lineart_estimate_strokes_radii      (GeglBuffer             *mask,
+                                                                 GimpAsync              *async);
+static void            gimp_line_art_simple_fill                (GeglBuffer             *buffer,
+                                                                 gint                    x,
+                                                                 gint                    y,
+                                                                 gint                   *counter);
+
+/* Some callback-type functions. */
+
+static guint           visited_hash_fun                         (Pixel                  *key);
+static gboolean        visited_equal_fun                        (Pixel                  *e1,
+                                                                 Pixel                  *e2);
+
+static inline gboolean border_in_direction                      (GeglBuffer             *mask,
+                                                                 Pixel                   p,
+                                                                 int                     direction);
+static inline GimpVector2 pair2normal                           (Pixel                   p,
+                                                                 gfloat                 *normals,
+                                                                 gint                    width);
+
+/* Edgel */
+
+static Edgel    * gimp_edgel_new                  (int                x,
+                                                   int                y,
+                                                   Direction          direction);
+static void       gimp_edgel_init                 (Edgel             *edgel);
+static void       gimp_edgel_clear                (Edgel            **edgel);
+static int        gimp_edgel_cmp                  (const Edgel       *e1,
+                                                   const Edgel       *e2);
+static guint      edgel2index_hash_fun            (Edgel              *key);
+static gboolean   edgel2index_equal_fun           (Edgel              *e1,
+                                                   Edgel              *e2);
+
+static glong      gimp_edgel_track_mark           (GeglBuffer         *mask,
+                                                   Edgel               edgel,
+                                                   long                size_limit);
+static glong      gimp_edgel_region_area          (const GeglBuffer   *mask,
+                                                   Edgel               start_edgel);
+
+/* Edgel set */
+
+static GArray   * gimp_edgelset_new               (GeglBuffer         *buffer,
+                                                   GimpAsync          *async);
+static void       gimp_edgelset_add               (GArray             *set,
+                                                   int                 x,
+                                                   int                 y,
+                                                   Direction           direction,
+                                                   GHashTable         *edgel2index);
+static void       gimp_edgelset_init_normals      (GArray             *set);
+static void       gimp_edgelset_smooth_normals    (GArray             *set,
+                                                   int                 mask_size,
+                                                   GimpAsync          *async);
+static void       gimp_edgelset_compute_curvature (GArray             *set,
+                                                   GimpAsync          *async);
+
+static void       gimp_edgelset_build_graph       (GArray            *set,
+                                                   GeglBuffer        *buffer,
+                                                   GHashTable        *edgel2index,
+                                                   GimpAsync         *async);
+static void       gimp_edgelset_next8             (const GeglBuffer  *buffer,
+                                                   Edgel             *it,
+                                                   Edgel             *n);
+
+G_DEFINE_TYPE_WITH_CODE (GimpLineArt, gimp_line_art, GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpLineArt))
+
+static guint gimp_line_art_signals[LAST_SIGNAL] = { 0 };
+
+static void
+gimp_line_art_class_init (GimpLineArtClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  gimp_line_art_signals[COMPUTING_START] =
+    g_signal_new ("computing-start",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLineArtClass, computing_start),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+  gimp_line_art_signals[COMPUTING_END] =
+    g_signal_new ("computing-end",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpLineArtClass, computing_end),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize     = gimp_line_art_finalize;
+  object_class->set_property = gimp_line_art_set_property;
+  object_class->get_property = gimp_line_art_get_property;
+
+  g_object_class_install_property (object_class, PROP_SELECT_TRANSPARENT,
+                                   g_param_spec_boolean ("select-transparent",
+                                                         _("Select transparent pixels instead of gray ones"),
+                                                         _("Select transparent pixels instead of gray ones"),
+                                                         TRUE,
+                                                         G_PARAM_CONSTRUCT | GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_THRESHOLD,
+                                   g_param_spec_double ("threshold",
+                                                        _("Line art detection threshold"),
+                                                        _("Threshold to detect contour (higher values will include more pixels)"),
+                                                        0.0, 1.0, 0.92,
+                                                        G_PARAM_CONSTRUCT | GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_MAX_GROW,
+                                   g_param_spec_int ("max-grow",
+                                                     _("Maximum growing size"),
+                                                     _("Maximum number of pixels grown under the line art"),
+                                                     1, 100, 3,
+                                                     G_PARAM_CONSTRUCT | GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SPLINE_MAX_LEN,
+                                   g_param_spec_int ("spline-max-length",
+                                                     _("Maximum curved closing length"),
+                                                     _("Maximum curved length (in pixels) to close the line art"),
+                                                     0, 1000, 100,
+                                                     G_PARAM_CONSTRUCT | GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SEGMENT_MAX_LEN,
+                                   g_param_spec_int ("segment-max-length",
+                                                     _("Maximum straight closing length"),
+                                                     _("Maximum straight length (in pixels) to close the line art"),
+                                                     0, 1000, 100,
+                                                     G_PARAM_CONSTRUCT | GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_line_art_init (GimpLineArt *line_art)
+{
+  line_art->priv = gimp_line_art_get_instance_private (line_art);
+}
+
+static void
+gimp_line_art_finalize (GObject *object)
+{
+  GimpLineArt *line_art = GIMP_LINE_ART (object);
+
+  line_art->priv->frozen = FALSE;
+
+  gimp_line_art_set_input (line_art, NULL);
+}
+
+static void
+gimp_line_art_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpLineArt *line_art = GIMP_LINE_ART (object);
+
+  switch (property_id)
+    {
+    case PROP_SELECT_TRANSPARENT:
+      if (line_art->priv->select_transparent != g_value_get_boolean (value))
+        {
+          line_art->priv->select_transparent = g_value_get_boolean (value);
+          gimp_line_art_compute (line_art);
+        }
+      break;
+    case PROP_MAX_GROW:
+      line_art->priv->max_grow = g_value_get_int (value);
+      break;
+    case PROP_THRESHOLD:
+      if (line_art->priv->threshold != g_value_get_double (value))
+        {
+          line_art->priv->threshold = g_value_get_double (value);
+          gimp_line_art_compute (line_art);
+        }
+      break;
+    case PROP_SPLINE_MAX_LEN:
+      if (line_art->priv->spline_max_len != g_value_get_int (value))
+        {
+          line_art->priv->spline_max_len = g_value_get_int (value);
+          if (line_art->priv->max_len_bound)
+            line_art->priv->segment_max_len = line_art->priv->spline_max_len;
+          gimp_line_art_compute (line_art);
+        }
+      break;
+    case PROP_SEGMENT_MAX_LEN:
+      if (line_art->priv->segment_max_len != g_value_get_int (value))
+        {
+          line_art->priv->segment_max_len = g_value_get_int (value);
+          if (line_art->priv->max_len_bound)
+            line_art->priv->spline_max_len = line_art->priv->segment_max_len;
+          gimp_line_art_compute (line_art);
+        }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_line_art_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpLineArt *line_art = GIMP_LINE_ART (object);
+
+  switch (property_id)
+    {
+    case PROP_SELECT_TRANSPARENT:
+      g_value_set_boolean (value, line_art->priv->select_transparent);
+      break;
+    case PROP_MAX_GROW:
+      g_value_set_int (value, line_art->priv->max_grow);
+      break;
+    case PROP_THRESHOLD:
+      g_value_set_double (value, line_art->priv->threshold);
+      break;
+    case PROP_SPLINE_MAX_LEN:
+      g_value_set_int (value, line_art->priv->spline_max_len);
+      break;
+    case PROP_SEGMENT_MAX_LEN:
+      g_value_set_int (value, line_art->priv->segment_max_len);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/* Public functions */
+
+GimpLineArt *
+gimp_line_art_new (void)
+{
+  return g_object_new (GIMP_TYPE_LINE_ART,
+                       NULL);
+}
+
+void
+gimp_line_art_bind_gap_length (GimpLineArt *line_art,
+                               gboolean     bound)
+{
+  line_art->priv->max_len_bound = bound;
+}
+
+void
+gimp_line_art_set_input (GimpLineArt  *line_art,
+                         GimpPickable *pickable)
+{
+  g_return_if_fail (pickable == NULL || GIMP_IS_VIEWABLE (pickable));
+
+  if (pickable != line_art->priv->input)
+    {
+      if (line_art->priv->input)
+        g_signal_handlers_disconnect_by_data (line_art->priv->input, line_art);
+
+      g_set_object (&line_art->priv->input, pickable);
+
+      gimp_line_art_compute (line_art);
+
+      if (pickable)
+        {
+          g_signal_connect (pickable, "invalidate-preview",
+                            G_CALLBACK (gimp_line_art_input_invalidate_preview),
+                            line_art);
+        }
+    }
+}
+
+GimpPickable *
+gimp_line_art_get_input (GimpLineArt *line_art)
+{
+  return line_art->priv->input;
+}
+
+void
+gimp_line_art_freeze (GimpLineArt *line_art)
+{
+  g_return_if_fail (! line_art->priv->frozen);
+
+  line_art->priv->frozen             = TRUE;
+  line_art->priv->compute_after_thaw = FALSE;
+}
+
+void
+gimp_line_art_thaw (GimpLineArt *line_art)
+{
+  g_return_if_fail (line_art->priv->frozen);
+
+  line_art->priv->frozen = FALSE;
+  if (line_art->priv->compute_after_thaw)
+    {
+      gimp_line_art_compute (line_art);
+      line_art->priv->compute_after_thaw = FALSE;
+    }
+}
+
+gboolean
+gimp_line_art_is_frozen (GimpLineArt *line_art)
+{
+  return line_art->priv->frozen;
+}
+
+GeglBuffer *
+gimp_line_art_get (GimpLineArt  *line_art,
+                   gfloat      **distmap)
+{
+  g_return_val_if_fail (line_art->priv->input, NULL);
+
+  if (line_art->priv->async)
+    {
+      gimp_waitable_wait (GIMP_WAITABLE (line_art->priv->async));
+    }
+  else if (! line_art->priv->closed)
+    {
+      gimp_line_art_compute (line_art);
+      if (line_art->priv->async)
+        gimp_waitable_wait (GIMP_WAITABLE (line_art->priv->async));
+    }
+
+  g_return_val_if_fail (line_art->priv->closed, NULL);
+
+  if (distmap)
+    *distmap = line_art->priv->distmap;
+
+  return line_art->priv->closed;
+}
+
+/* Functions for asynchronous computation. */
+
+static void
+gimp_line_art_compute (GimpLineArt *line_art)
+{
+  if (line_art->priv->frozen)
+    {
+      line_art->priv->compute_after_thaw = TRUE;
+      return;
+    }
+
+  if (line_art->priv->async)
+    {
+      /* we cancel the async, but don't wait for it to finish, since
+       * it might take a while to respond.  instead gimp_line_art_compute_cb()
+       * bails if the async has been canceled, to avoid accessing the line art.
+       */
+      g_signal_emit (line_art, gimp_line_art_signals[COMPUTING_END], 0);
+      gimp_cancelable_cancel (GIMP_CANCELABLE (line_art->priv->async));
+      g_clear_object (&line_art->priv->async);
+    }
+
+  if (line_art->priv->idle_id)
+    {
+      g_source_remove (line_art->priv->idle_id);
+      line_art->priv->idle_id = 0;
+    }
+
+  g_clear_object (&line_art->priv->closed);
+  g_clear_pointer (&line_art->priv->distmap, g_free);
+
+  if (line_art->priv->input)
+    {
+      /* gimp_line_art_prepare_async() will flush the pickable, which
+       * may trigger this signal handler, and will leak a line art (as
+       * line_art->priv->async has not been set yet).
+       */
+      g_signal_handlers_block_by_func (
+        line_art->priv->input,
+        G_CALLBACK (gimp_line_art_input_invalidate_preview),
+        line_art);
+      line_art->priv->async = gimp_line_art_prepare_async (line_art, +1);
+      g_signal_emit (line_art, gimp_line_art_signals[COMPUTING_START], 0);
+      g_signal_handlers_unblock_by_func (
+        line_art->priv->input,
+        G_CALLBACK (gimp_line_art_input_invalidate_preview),
+        line_art);
+
+      gimp_async_add_callback_for_object (line_art->priv->async,
+                                          (GimpAsyncCallback) gimp_line_art_compute_cb,
+                                          line_art, line_art);
+    }
+}
+
+static void
+gimp_line_art_compute_cb (GimpAsync   *async,
+                          GimpLineArt *line_art)
+{
+  if (gimp_async_is_canceled (async))
+    return;
+
+  if (gimp_async_is_finished (async))
+    {
+      LineArtResult *result;
+
+      result = gimp_async_get_result (async);
+
+      line_art->priv->closed  = g_object_ref (result->closed);
+      line_art->priv->distmap = result->distmap;
+      result->distmap  = NULL;
+      g_signal_emit (line_art, gimp_line_art_signals[COMPUTING_END], 0);
+    }
+
+  g_clear_object (&line_art->priv->async);
+}
+
+static GimpAsync *
+gimp_line_art_prepare_async (GimpLineArt *line_art,
+                             gint         priority)
+{
+  GeglBuffer  *buffer;
+  GimpAsync   *async;
+  LineArtData *data;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (line_art->priv->input), NULL);
+
+  gimp_pickable_flush (line_art->priv->input);
+
+  buffer = gimp_gegl_buffer_dup (
+    gimp_pickable_get_buffer (line_art->priv->input));
+
+  data  = line_art_data_new (buffer, line_art);
+
+  g_object_unref (buffer);
+
+  async = gimp_parallel_run_async_full (
+    priority,
+    (GimpRunAsyncFunc) gimp_line_art_prepare_async_func,
+    data, (GDestroyNotify) line_art_data_free);
+
+  return async;
+}
+
+static void
+gimp_line_art_prepare_async_func (GimpAsync   *async,
+                                  LineArtData *data)
+{
+  GeglBuffer *buffer;
+  GeglBuffer *closed  = NULL;
+  gfloat     *distmap = NULL;
+  gint        buffer_x;
+  gint        buffer_y;
+  gboolean    has_alpha;
+  gboolean    select_transparent = FALSE;
+
+  has_alpha = babl_format_has_alpha (gegl_buffer_get_format (data->buffer));
+
+  if (has_alpha)
+    {
+      if (data->select_transparent)
+        {
+          /*  don't select transparent regions if there are no fully
+           *  transparent pixels.
+           */
+          GeglBufferIterator *gi;
+
+          gi = gegl_buffer_iterator_new (data->buffer, NULL, 0,
+                                         babl_format ("A u8"),
+                                         GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 3);
+          while (gegl_buffer_iterator_next (gi))
+            {
+              guint8 *p = (guint8*) gi->items[0].data;
+              gint    k;
+
+              if (gimp_async_is_canceled (async))
+                {
+                  gegl_buffer_iterator_stop (gi);
+
+                  gimp_async_abort (async);
+
+                  line_art_data_free (data);
+
+                  return;
+                }
+
+              for (k = 0; k < gi->length; k++)
+                {
+                  if (! *p)
+                    {
+                      select_transparent = TRUE;
+                      break;
+                    }
+                  p++;
+                }
+              if (select_transparent)
+                break;
+            }
+          if (select_transparent)
+            gegl_buffer_iterator_stop (gi);
+        }
+    }
+
+  buffer   = data->buffer;
+  buffer_x = gegl_buffer_get_x (data->buffer);
+  buffer_y = gegl_buffer_get_y (data->buffer);
+
+  if (buffer_x != 0 || buffer_y != 0)
+    {
+      buffer = g_object_new (GEGL_TYPE_BUFFER,
+                             "source",  buffer,
+                             "shift-x", buffer_x,
+                             "shift-y", buffer_y,
+                             NULL);
+    }
+
+  /* For smart selection, we generate a binarized image with close
+   * regions, then run a composite selection with no threshold on
+   * this intermediate buffer.
+   */
+  GIMP_TIMER_START();
+
+  closed = gimp_line_art_close (buffer,
+                                select_transparent,
+                                data->threshold,
+                                data->spline_max_len,
+                                data->segment_max_len,
+                                /*minimal_lineart_area,*/
+                                5,
+                                /*normal_estimate_mask_size,*/
+                                5,
+                                /*end_point_rate,*/
+                                0.85,
+                                /*spline_max_angle,*/
+                                90.0,
+                                /*end_point_connectivity,*/
+                                2,
+                                /*spline_roundness,*/
+                                1.0,
+                                /*allow_self_intersections,*/
+                                TRUE,
+                                /*created_regions_significant_area,*/
+                                4,
+                                /*created_regions_minimum_area,*/
+                                100,
+                                /*small_segments_from_spline_sources,*/
+                                TRUE,
+                                &distmap,
+                                async);
+
+  GIMP_TIMER_END("close line-art");
+
+  if (buffer != data->buffer)
+    g_object_unref (buffer);
+
+  if (! gimp_async_is_stopped (async))
+    {
+      if (buffer_x != 0 || buffer_y != 0)
+        {
+          buffer = g_object_new (GEGL_TYPE_BUFFER,
+                                 "source",  closed,
+                                 "shift-x", -buffer_x,
+                                 "shift-y", -buffer_y,
+                                 NULL);
+
+          g_object_unref (closed);
+
+          closed = buffer;
+        }
+
+      gimp_async_finish_full (async,
+                              line_art_result_new (closed, distmap),
+                              (GDestroyNotify) line_art_result_free);
+    }
+
+  line_art_data_free (data);
+}
+
+static LineArtData *
+line_art_data_new (GeglBuffer  *buffer,
+                   GimpLineArt *line_art)
+{
+  LineArtData *data = g_slice_new (LineArtData);
+
+  data->buffer             = g_object_ref (buffer);
+  data->select_transparent = line_art->priv->select_transparent;
+  data->threshold          = line_art->priv->threshold;
+  data->spline_max_len     = line_art->priv->spline_max_len;
+  data->segment_max_len    = line_art->priv->segment_max_len;
+
+  return data;
+}
+
+static void
+line_art_data_free (LineArtData *data)
+{
+  g_object_unref (data->buffer);
+
+  g_slice_free (LineArtData, data);
+}
+
+static LineArtResult *
+line_art_result_new (GeglBuffer *closed,
+                     gfloat     *distmap)
+{
+  LineArtResult *data;
+
+  data = g_slice_new (LineArtResult);
+  data->closed  = closed;
+  data->distmap = distmap;
+
+  return data;
+}
+
+static void
+line_art_result_free (LineArtResult *data)
+{
+  g_object_unref (data->closed);
+  g_clear_pointer (&data->distmap, g_free);
+
+  g_slice_free (LineArtResult, data);
+}
+
+static gboolean
+gimp_line_art_idle (GimpLineArt *line_art)
+{
+  line_art->priv->idle_id = 0;
+
+  gimp_line_art_compute (line_art);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_line_art_input_invalidate_preview (GimpViewable *viewable,
+                                        GimpLineArt  *line_art)
+{
+  if (! line_art->priv->idle_id)
+    {
+      line_art->priv->idle_id = g_idle_add_full (
+        GIMP_PRIORITY_VIEWABLE_IDLE,
+        (GSourceFunc) gimp_line_art_idle,
+        line_art, NULL);
+    }
+}
+
+/* All actual computation functions. */
+
+/**
+ * gimp_line_art_close:
+ * @buffer: the input #GeglBuffer.
+ * @select_transparent: whether we binarize the alpha channel or the
+ *                      luminosity.
+ * @stroke_threshold: [0-1] threshold value for detecting stroke pixels
+ *                    (higher values will detect more stroke pixels).
+ * @spline_max_length: the maximum length for creating splines between
+ *                     end points.
+ * @segment_max_length: the maximum length for creating segments
+ *                      between end points. Unlike splines, segments
+ *                      are straight lines.
+ * @minimal_lineart_area: the minimum size in number pixels for area to
+ *                        be considered as line art.
+ * @normal_estimate_mask_size:
+ * @end_point_rate: threshold to estimate if a curvature is an end-point
+ *                  in [0-1] range value.
+ * @spline_max_angle: the maximum angle between end point normals for
+ *                    creating splines between them.
+ * @end_point_connectivity:
+ * @spline_roundness:
+ * @allow_self_intersections: whether to allow created splines and
+ *                            segments to intersect.
+ * @created_regions_significant_area:
+ * @created_regions_minimum_area:
+ * @small_segments_from_spline_sources:
+ * @closed_distmap: a distance map of the closed line art pixels.
+ * @async: the #GimpAsync associated with the computation
+ *
+ * Creates a binarized version of the strokes of @buffer, detected either
+ * with luminosity (light means background) or alpha values depending on
+ * @select_transparent. This binary version of the strokes will have closed
+ * regions allowing adequate selection of "nearly closed regions".
+ * This algorithm is meant for digital painting (and in particular on the
+ * sketch-only step), and therefore will likely produce unexpected results on
+ * other types of input.
+ *
+ * The algorithm is the first step from the research paper "A Fast and
+ * Efficient Semi-guided Algorithm for Flat Coloring Line-arts", by Sébastian
+ * Fourey, David Tschumperlé, David Revoy.
+ * https://hal.archives-ouvertes.fr/hal-01891876
+ *
+ * Returns: a new #GeglBuffer of format "Y u8" representing the
+ *          binarized @line_art. If @lineart_distmap is not #NULL, a
+ *          newly allocated float buffer is returned, which can be used
+ *          for overflowing created masks later.
+ */
+static GeglBuffer *
+gimp_line_art_close (GeglBuffer  *buffer,
+                     gboolean     select_transparent,
+                     gdouble      stroke_threshold,
+                     gint         spline_max_length,
+                     gint         segment_max_length,
+                     gint         minimal_lineart_area,
+                     gint         normal_estimate_mask_size,
+                     gfloat       end_point_rate,
+                     gfloat       spline_max_angle,
+                     gint         end_point_connectivity,
+                     gfloat       spline_roundness,
+                     gboolean     allow_self_intersections,
+                     gint         created_regions_significant_area,
+                     gint         created_regions_minimum_area,
+                     gboolean     small_segments_from_spline_sources,
+                     gfloat     **closed_distmap,
+                     GimpAsync   *async)
+{
+  const Babl         *gray_format;
+  GeglBufferIterator *gi;
+  GeglBuffer         *closed  = NULL;
+  GeglBuffer         *strokes = NULL;
+  guchar              max_value = 0;
+  gint                width  = gegl_buffer_get_width (buffer);
+  gint                height = gegl_buffer_get_height (buffer);
+  gint                i;
+
+  if (select_transparent)
+    /* Keep alpha channel as gray levels */
+    gray_format = babl_format ("A u8");
+  else
+    /* Keep luminance */
+    gray_format = babl_format ("Y' u8");
+
+  /* Transform the line art from any format to gray. */
+  strokes = gegl_buffer_new (gegl_buffer_get_extent (buffer),
+                             gray_format);
+  gimp_gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE, strokes, NULL);
+  gegl_buffer_set_format (strokes, babl_format ("Y' u8"));
+
+  if (! select_transparent)
+    {
+      /* Compute the biggest value */
+      gi = gegl_buffer_iterator_new (strokes, NULL, 0, NULL,
+                                     GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+      while (gegl_buffer_iterator_next (gi))
+        {
+          guchar *data = (guchar*) gi->items[0].data;
+          gint    k;
+
+          if (gimp_async_is_canceled (async))
+            {
+              gegl_buffer_iterator_stop (gi);
+
+              gimp_async_abort (async);
+
+              goto end1;
+            }
+
+          for (k = 0; k < gi->length; k++)
+            {
+              if (*data > max_value)
+                max_value = *data;
+              data++;
+            }
+        }
+    }
+
+  /* Make the image binary: 1 is stroke, 0 background */
+  gi = gegl_buffer_iterator_new (strokes, NULL, 0, NULL,
+                                 GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE, 1);
+  while (gegl_buffer_iterator_next (gi))
+    {
+      guchar *data = (guchar*) gi->items[0].data;
+      gint    k;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gegl_buffer_iterator_stop (gi);
+
+          gimp_async_abort (async);
+
+          goto end1;
+        }
+
+      for (k = 0; k < gi->length; k++)
+        {
+          if (! select_transparent)
+            /* Negate the value. */
+            *data = max_value - *data;
+          /* Apply a threshold. */
+          if (*data > (guchar) (255.0f * (1.0f - stroke_threshold)))
+            *data = 1;
+          else
+            *data = 0;
+          data++;
+        }
+    }
+
+  /* Denoise (remove small connected components) */
+  gimp_lineart_denoise (strokes, minimal_lineart_area, async);
+  if (gimp_async_is_stopped (async))
+    goto end1;
+
+  closed = g_object_ref (strokes);
+
+  if (spline_max_length > 0 || segment_max_length > 0)
+    {
+      GArray     *keypoints           = NULL;
+      GHashTable *visited             = NULL;
+      gfloat     *radii               = NULL;
+      gfloat     *normals             = NULL;
+      gfloat     *curvatures          = NULL;
+      gfloat     *smoothed_curvatures = NULL;
+      gfloat      threshold;
+      gfloat      clamped_threshold;
+      GList      *fill_pixels         = NULL;
+      GList      *iter;
+
+      normals             = g_new0 (gfloat, width * height * 2);
+      curvatures          = g_new0 (gfloat, width * height);
+      smoothed_curvatures = g_new0 (gfloat, width * height);
+
+      /* Estimate normals & curvature */
+      gimp_lineart_compute_normals_curvatures (strokes, normals, curvatures,
+                                               smoothed_curvatures,
+                                               normal_estimate_mask_size,
+                                               async);
+      if (gimp_async_is_stopped (async))
+        goto end2;
+
+      radii = gimp_lineart_estimate_strokes_radii (strokes, async);
+      if (gimp_async_is_stopped (async))
+        goto end2;
+      threshold = 1.0f - end_point_rate;
+      clamped_threshold = MAX (0.25f, threshold);
+      for (i = 0; i < width; i++)
+        {
+          gint j;
+
+          if (gimp_async_is_canceled (async))
+            {
+              gimp_async_abort (async);
+
+              goto end2;
+            }
+
+          for (j = 0; j < height; j++)
+            {
+              if (smoothed_curvatures[i + j * width] >= (threshold / MAX (1.0f, radii[i + j * width])) ||
+                  curvatures[i + j * width] >= clamped_threshold)
+                curvatures[i + j * width] = 1.0;
+              else
+                curvatures[i + j * width] = 0.0;
+            }
+        }
+      g_clear_pointer (&radii, g_free);
+
+      keypoints = gimp_lineart_curvature_extremums (curvatures, smoothed_curvatures,
+                                                    width, height, async);
+      if (gimp_async_is_stopped (async))
+        goto end2;
+
+      visited = g_hash_table_new_full ((GHashFunc) visited_hash_fun,
+                                       (GEqualFunc) visited_equal_fun,
+                                       (GDestroyNotify) g_free, NULL);
+
+      if (spline_max_length > 0)
+        {
+          GList           *candidates;
+          SplineCandidate *candidate;
+
+          candidates = gimp_lineart_find_spline_candidates (keypoints, normals, width,
+                                                            spline_max_length,
+                                                            spline_max_angle,
+                                                            async);
+          if (gimp_async_is_stopped (async))
+            goto end3;
+
+          g_object_unref (closed);
+          closed = gimp_gegl_buffer_dup (strokes);
+
+          /* Draw splines */
+          while (candidates)
+            {
+              Pixel    *p1;
+              Pixel    *p2;
+              gboolean  inserted = FALSE;
+
+              if (gimp_async_is_canceled (async))
+                {
+                  gimp_async_abort (async);
+
+                  goto end3;
+                }
+
+              p1 = g_new (Pixel, 1);
+              p2 = g_new (Pixel, 1);
+
+              candidate = (SplineCandidate *) candidates->data;
+              p1->x = candidate->p1.x;
+              p1->y = candidate->p1.y;
+              p2->x = candidate->p2.x;
+              p2->y = candidate->p2.y;
+
+              g_free (candidate);
+              candidates = g_list_delete_link (candidates, candidates);
+
+              if ((! g_hash_table_contains (visited, p1) ||
+                   GPOINTER_TO_INT (g_hash_table_lookup (visited, p1)) < end_point_connectivity) &&
+                  (! g_hash_table_contains (visited, p2) ||
+                   GPOINTER_TO_INT (g_hash_table_lookup (visited, p2)) < end_point_connectivity))
+                {
+                  GArray      *discrete_curve;
+                  GimpVector2  vect1 = pair2normal (*p1, normals, width);
+                  GimpVector2  vect2 = pair2normal (*p2, normals, width);
+                  gfloat       distance = gimp_vector2_length_val (gimp_vector2_sub_val (*p1, *p2));
+                  gint         transitions;
+
+                  gimp_vector2_mul (&vect1, distance);
+                  gimp_vector2_mul (&vect1, spline_roundness);
+                  gimp_vector2_mul (&vect2, distance);
+                  gimp_vector2_mul (&vect2, spline_roundness);
+
+                  discrete_curve = gimp_lineart_discrete_spline (*p1, vect1, *p2, vect2);
+
+                  transitions = allow_self_intersections ?
+                    gimp_number_of_transitions (discrete_curve, strokes) :
+                    gimp_number_of_transitions (discrete_curve, closed);
+
+                  if (transitions == 2 &&
+                      gimp_line_art_allow_closure (closed, discrete_curve,
+                                                   &fill_pixels,
+                                                   created_regions_significant_area,
+                                                   created_regions_minimum_area))
+                    {
+                      for (i = 0; i < discrete_curve->len; i++)
+                        {
+                          Pixel p = g_array_index (discrete_curve, Pixel, i);
+
+                          if (p.x >= 0 && p.x < gegl_buffer_get_width (closed) &&
+                              p.y >= 0 && p.y < gegl_buffer_get_height (closed))
+                            {
+                              guchar val = 2;
+
+                              gegl_buffer_set (closed, GEGL_RECTANGLE ((gint) p.x, (gint) p.y, 1, 1), 0,
+                                               NULL, &val, GEGL_AUTO_ROWSTRIDE);
+                            }
+                        }
+                      g_hash_table_replace (visited, p1,
+                                            GINT_TO_POINTER (GPOINTER_TO_INT (g_hash_table_lookup (visited, p1)) + 1));
+                      g_hash_table_replace (visited, p2,
+                                            GINT_TO_POINTER (GPOINTER_TO_INT (g_hash_table_lookup (visited, p2)) + 1));
+                      inserted = TRUE;
+                    }
+                  g_array_free (discrete_curve, TRUE);
+                }
+              if (! inserted)
+                {
+                  g_free (p1);
+                  g_free (p2);
+                }
+            }
+
+ end3:
+          g_list_free_full (candidates, g_free);
+
+          if (gimp_async_is_stopped (async))
+            goto end2;
+        }
+
+      g_clear_object (&strokes);
+
+      /* Draw straight line segments */
+      if (segment_max_length > 0)
+        {
+          Pixel *point;
+
+          point = (Pixel *) keypoints->data;
+          for (i = 0; i < keypoints->len; i++)
+            {
+              Pixel    *p;
+              gboolean  inserted = FALSE;
+
+              if (gimp_async_is_canceled (async))
+                {
+                  gimp_async_abort (async);
+
+                  goto end2;
+                }
+
+              p  = g_new (Pixel, 1);
+              *p = *point;
+
+              if (! g_hash_table_contains (visited, p) ||
+                  (small_segments_from_spline_sources &&
+                   GPOINTER_TO_INT (g_hash_table_lookup (visited, p)) < end_point_connectivity))
+                {
+                  GArray *segment = gimp_lineart_line_segment_until_hit (closed, *point,
+                                                                         pair2normal (*point, normals, width),
+                                                                         segment_max_length);
+
+                  if (segment->len &&
+                      gimp_line_art_allow_closure (closed, segment, &fill_pixels,
+                                                   created_regions_significant_area,
+                                                   created_regions_minimum_area))
+                    {
+                      gint j;
+
+                      for (j = 0; j < segment->len; j++)
+                        {
+                          Pixel  p2 = g_array_index (segment, Pixel, j);
+                          guchar val = 2;
+
+                          gegl_buffer_set (closed, GEGL_RECTANGLE ((gint) p2.x, (gint) p2.y, 1, 1), 0,
+                                           NULL, &val, GEGL_AUTO_ROWSTRIDE);
+                        }
+                      g_hash_table_replace (visited, p,
+                                            GINT_TO_POINTER (GPOINTER_TO_INT (g_hash_table_lookup (visited, p)) + 1));
+                      inserted = TRUE;
+                    }
+                  g_array_free (segment, TRUE);
+                }
+              if (! inserted)
+                g_free (p);
+              point++;
+            }
+        }
+
+      for (iter = fill_pixels; iter; iter = iter->next)
+        {
+          Pixel *p        = iter->data;
+          gint   fill_max = created_regions_significant_area - 1;
+
+          if (gimp_async_is_canceled (async))
+            {
+              gimp_async_abort (async);
+
+              goto end2;
+            }
+
+          /* XXX A best approach would be to generalize
+           * gimp_drawable_bucket_fill() to work on any buffer (the code
+           * is already mostly there) rather than reimplementing a naive
+           * bucket fill.
+           * This is mostly a quick'n dirty first implementation which I
+           * will improve later.
+           */
+          gimp_line_art_simple_fill (closed, (gint) p->x, (gint) p->y, &fill_max);
+        }
+
+ end2:
+      g_list_free_full (fill_pixels, g_free);
+      g_free (normals);
+      g_free (curvatures);
+      g_free (smoothed_curvatures);
+      g_clear_pointer (&radii, g_free);
+      if (keypoints)
+        g_array_free (keypoints, TRUE);
+      g_clear_pointer (&visited, g_hash_table_destroy);
+
+      if (gimp_async_is_stopped (async))
+        goto end1;
+    }
+  else
+    {
+      g_clear_object (&strokes);
+    }
+
+  if (closed_distmap)
+    {
+      GeglNode   *graph;
+      GeglNode   *input;
+      GeglNode   *op;
+
+      /* Flooding needs a distance map for closed line art. */
+      *closed_distmap = g_new (gfloat, width * height);
+
+      graph = gegl_node_new ();
+      input = gegl_node_new_child (graph,
+                                   "operation", "gegl:buffer-source",
+                                   "buffer", closed,
+                                   NULL);
+      op  = gegl_node_new_child (graph,
+                                 "operation", "gegl:distance-transform",
+                                 "metric",    GEGL_DISTANCE_METRIC_EUCLIDEAN,
+                                 "normalize", FALSE,
+                                 NULL);
+      gegl_node_connect_to (input, "output",
+                            op, "input");
+      gegl_node_blit (op, 1.0, gegl_buffer_get_extent (closed),
+                      NULL, *closed_distmap,
+                      GEGL_AUTO_ROWSTRIDE, GEGL_BLIT_DEFAULT);
+      g_object_unref (graph);
+    }
+
+ end1:
+  g_clear_object (&strokes);
+
+  if (gimp_async_is_stopped (async))
+    g_clear_object (&closed);
+
+  return closed;
+}
+
+static void
+gimp_lineart_denoise (GeglBuffer *buffer,
+                      int         minimum_area,
+                      GimpAsync  *async)
+{
+  /* Keep connected regions with significant area. */
+  GArray   *region;
+  GQueue   *q       = g_queue_new ();
+  gint      width   = gegl_buffer_get_width (buffer);
+  gint      height  = gegl_buffer_get_height (buffer);
+  gboolean *visited = g_new0 (gboolean, width * height);
+  gint      x, y;
+
+  region = g_array_sized_new (TRUE, TRUE, sizeof (Pixel *), minimum_area);
+
+  for (y = 0; y < height; ++y)
+    for (x = 0; x < width; ++x)
+      {
+        guchar has_stroke;
+
+        if (gimp_async_is_canceled (async))
+          {
+            gimp_async_abort (async);
+
+            goto end;
+          }
+
+        gegl_buffer_sample (buffer, x, y, NULL, &has_stroke, NULL,
+                            GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+        if (has_stroke && ! visited[x + y * width])
+          {
+            Pixel *p = g_new (Pixel, 1);
+            gint   regionSize = 0;
+
+            p->x = x;
+            p->y = y;
+
+            g_queue_push_tail (q, p);
+            visited[x + y * width] = TRUE;
+
+            while (! g_queue_is_empty (q))
+              {
+                Pixel *p;
+                gint   p2x;
+                gint   p2y;
+
+                if (gimp_async_is_canceled (async))
+                  {
+                    gimp_async_abort (async);
+
+                    goto end;
+                  }
+
+                p = (Pixel *) g_queue_pop_head (q);
+
+                p2x = p->x + 1;
+                p2y = p->y;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x +p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x - 1;
+                p2y = p->y;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x;
+                p2y = p->y - 1;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x;
+                p2y = p->y + 1;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x + 1;
+                p2y = p->y + 1;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x - 1;
+                p2y = p->y - 1;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x - 1;
+                p2y = p->y + 1;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+                p2x = p->x + 1;
+                p2y = p->y - 1;
+                if (p2x >= 0 && p2x < width && p2y >= 0 && p2y < height)
+                  {
+                    gegl_buffer_sample (buffer, p2x, p2y, NULL, &has_stroke, NULL,
+                                        GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                    if (has_stroke && ! visited[p2x + p2y * width])
+                      {
+                        Pixel *p2 = g_new (Pixel, 1);
+
+                        p2->x = p2x;
+                        p2->y = p2y;
+                        g_queue_push_tail (q, p2);
+                        visited[p2x + p2y * width] = TRUE;
+                      }
+                  }
+
+                ++regionSize;
+                if (regionSize < minimum_area)
+                  g_array_append_val (region, *p);
+                g_free (p);
+              }
+            if (regionSize < minimum_area)
+              {
+                Pixel *pixel = (Pixel *) region->data;
+                gint   i = 0;
+
+                for (; i < region->len; i++)
+                  {
+                    guchar val = 0;
+                    gegl_buffer_set (buffer, GEGL_RECTANGLE (pixel->x, pixel->y, 1, 1), 0,
+                                     NULL, &val, GEGL_AUTO_ROWSTRIDE);
+                    pixel++;
+                  }
+              }
+            g_array_remove_range (region, 0, region->len);
+          }
+      }
+
+ end:
+  g_array_free (region, TRUE);
+  g_queue_free_full (q, g_free);
+  g_free (visited);
+}
+
+static void
+gimp_lineart_compute_normals_curvatures (GeglBuffer *mask,
+                                         gfloat     *normals,
+                                         gfloat     *curvatures,
+                                         gfloat     *smoothed_curvatures,
+                                         int         normal_estimate_mask_size,
+                                         GimpAsync  *async)
+{
+  gfloat  *edgels_curvatures  = NULL;
+  gfloat  *smoothed_curvature;
+  GArray  *es                 = NULL;
+  Edgel  **e;
+  gint     width              = gegl_buffer_get_width (mask);
+
+  es = gimp_edgelset_new (mask, async);
+  if (gimp_async_is_stopped (async))
+    goto end;
+
+  e = (Edgel **) es->data;
+
+  gimp_edgelset_smooth_normals (es, normal_estimate_mask_size, async);
+  if (gimp_async_is_stopped (async))
+    goto end;
+
+  gimp_edgelset_compute_curvature (es, async);
+  if (gimp_async_is_stopped (async))
+    goto end;
+
+  while (*e)
+    {
+      const float curvature = ((*e)->curvature > 0.0f) ? (*e)->curvature : 0.0f;
+      const float w         = MAX (1e-8f, curvature * curvature);
+
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          goto end;
+        }
+
+      normals[((*e)->x + (*e)->y * width) * 2] += w * (*e)->x_normal;
+      normals[((*e)->x + (*e)->y * width) * 2 + 1] += w * (*e)->y_normal;
+      curvatures[(*e)->x + (*e)->y * width] = MAX (curvature,
+                                                   curvatures[(*e)->x + (*e)->y * width]);
+      e++;
+    }
+  for (int y = 0; y < gegl_buffer_get_height (mask); ++y)
+    {
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          goto end;
+        }
+
+      for (int x = 0; x < gegl_buffer_get_width (mask); ++x)
+        {
+          const float _angle = atan2f (normals[(x + y * width) * 2 + 1],
+                                       normals[(x + y * width) * 2]);
+          normals[(x + y * width) * 2] = cosf (_angle);
+          normals[(x + y * width) * 2 + 1] = sinf (_angle);
+        }
+    }
+
+  /* Smooth curvatures on edgels, then take maximum on each pixel. */
+  edgels_curvatures = gimp_lineart_get_smooth_curvatures (es, async);
+  if (gimp_async_is_stopped (async))
+    goto end;
+
+  smoothed_curvature = edgels_curvatures;
+
+  e = (Edgel **) es->data;
+  while (*e)
+    {
+      gfloat *pixel_curvature = &smoothed_curvatures[(*e)->x + (*e)->y * width];
+
+      if (*pixel_curvature < *smoothed_curvature)
+        *pixel_curvature = *smoothed_curvature;
+
+      ++smoothed_curvature;
+      e++;
+    }
+
+ end:
+  g_free (edgels_curvatures);
+
+  if (es)
+    g_array_free (es, TRUE);
+}
+
+static gfloat *
+gimp_lineart_get_smooth_curvatures (GArray    *edgelset,
+                                    GimpAsync *async)
+{
+  Edgel  **e;
+  gfloat  *smoothed_curvatures = g_new0 (gfloat, edgelset->len);
+  gfloat   weights[9];
+  gfloat   smoothed_curvature;
+  gfloat   weights_sum;
+  gint     idx = 0;
+
+  weights[0] = 1.0f;
+  for (int i = 1; i <= 8; ++i)
+    weights[i] = expf (-(i * i) / 30.0f);
+
+  e = (Edgel **) edgelset->data;
+  while (*e)
+    {
+      Edgel *edgel_before = g_array_index (edgelset, Edgel*, (*e)->previous);
+      Edgel *edgel_after  = g_array_index (edgelset, Edgel*, (*e)->next);
+      int    n = 5;
+      int    i = 1;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          g_free (smoothed_curvatures);
+
+          return NULL;
+        }
+
+      smoothed_curvature = (*e)->curvature;
+      weights_sum = weights[0];
+      while (n-- && (edgel_after != edgel_before))
+        {
+          smoothed_curvature += weights[i] * edgel_before->curvature;
+          smoothed_curvature += weights[i] * edgel_after->curvature;
+          edgel_before = g_array_index (edgelset, Edgel*, edgel_before->previous);
+          edgel_after  = g_array_index (edgelset, Edgel*, edgel_after->next);
+          weights_sum += 2 * weights[i];
+          i++;
+        }
+      smoothed_curvature /= weights_sum;
+      smoothed_curvatures[idx++] = smoothed_curvature;
+
+      e++;
+    }
+
+  return smoothed_curvatures;
+}
+
+/**
+ * Keep one pixel per connected component of curvature extremums.
+ */
+static GArray *
+gimp_lineart_curvature_extremums (gfloat    *curvatures,
+                                  gfloat    *smoothed_curvatures,
+                                  gint       width,
+                                  gint       height,
+                                  GimpAsync *async)
+{
+  gboolean *visited = g_new0 (gboolean, width * height);
+  GQueue   *q       = g_queue_new ();
+  GArray   *max_positions;
+
+  max_positions = g_array_new (FALSE, TRUE, sizeof (Pixel));
+
+  for (int y = 0; y < height; ++y)
+    {
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          goto end;
+        }
+
+      for (int x = 0; x < width; ++x)
+        {
+          if ((curvatures[x + y * width] > 0.0) && ! visited[x + y * width])
+            {
+              Pixel  *p = g_new (Pixel, 1);
+              Pixel   max_smoothed_curvature_pixel;
+              Pixel   max_raw_curvature_pixel;
+              gfloat  max_smoothed_curvature;
+              gfloat  max_raw_curvature;
+
+              max_smoothed_curvature_pixel = gimp_vector2_new (-1.0, -1.0);
+              max_smoothed_curvature       = 0.0f;
+
+              max_raw_curvature_pixel = gimp_vector2_new (x, y);
+              max_raw_curvature       = curvatures[x + y * width];
+
+              p->x = x;
+              p->y = y;
+              g_queue_push_tail (q, p);
+              visited[x + y * width] = TRUE;
+
+              while (! g_queue_is_empty (q))
+                {
+                  gfloat sc;
+                  gfloat c;
+                  gint   p2x;
+                  gint   p2y;
+
+                  if (gimp_async_is_canceled (async))
+                    {
+                      gimp_async_abort (async);
+
+                      goto end;
+                    }
+
+                  p  = (Pixel *) g_queue_pop_head (q);
+                  sc = smoothed_curvatures[(gint) p->x + (gint) p->y * width];
+                  c  = curvatures[(gint) p->x + (gint) p->y * width];
+
+                  curvatures[(gint) p->x + (gint) p->y * width] = 0.0f;
+
+                  p2x = (gint) p->x + 1;
+                  p2y = (gint) p->y;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x - 1;
+                  p2y = p->y;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x;
+                  p2y = p->y - 1;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x;
+                  p2y = p->y + 1;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x + 1;
+                  p2y = p->y + 1;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x - 1;
+                  p2y = p->y - 1;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x - 1;
+                  p2y = p->y + 1;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  p2x = p->x + 1;
+                  p2y = p->y - 1;
+                  if (p2x >= 0 && p2x < width    &&
+                      p2y >= 0 && p2y < height   &&
+                      curvatures[p2x + p2y * width] > 0.0 &&
+                      ! visited[p2x + p2y * width])
+                    {
+                      Pixel *p2 = g_new (Pixel, 1);
+
+                      p2->x = p2x;
+                      p2->y = p2y;
+                      g_queue_push_tail (q, p2);
+                      visited[p2x + p2y * width] = TRUE;
+                    }
+
+                  if (sc > max_smoothed_curvature)
+                    {
+                      max_smoothed_curvature_pixel = *p;
+                      max_smoothed_curvature = sc;
+                    }
+                  if (c > max_raw_curvature)
+                    {
+                      max_raw_curvature_pixel = *p;
+                      max_raw_curvature = c;
+                    }
+                  g_free (p);
+                }
+              if (max_smoothed_curvature > 0.0f)
+                {
+                  curvatures[(gint) max_smoothed_curvature_pixel.x + (gint) max_smoothed_curvature_pixel.y * width] = max_smoothed_curvature;
+                  g_array_append_val (max_positions, max_smoothed_curvature_pixel);
+                }
+              else
+                {
+                  curvatures[(gint) max_raw_curvature_pixel.x + (gint) max_raw_curvature_pixel.y * width] = max_raw_curvature;
+                  g_array_append_val (max_positions, max_raw_curvature_pixel);
+                }
+            }
+        }
+    }
+
+ end:
+  g_queue_free_full (q, g_free);
+  g_free (visited);
+
+  if (gimp_async_is_stopped (async))
+    {
+      g_array_free (max_positions, TRUE);
+      max_positions = NULL;
+    }
+
+  return max_positions;
+}
+
+static gint
+gimp_spline_candidate_cmp (const SplineCandidate *a,
+                           const SplineCandidate *b,
+                           gpointer               user_data)
+{
+  /* This comparison actually returns the opposite of common comparison
+   * functions on purpose, as we want the first element on the list to
+   * be the "bigger".
+   */
+  if (a->quality < b->quality)
+    return 1;
+  else if (a->quality > b->quality)
+    return -1;
+  else
+    return 0;
+}
+
+static GList *
+gimp_lineart_find_spline_candidates (GArray    *max_positions,
+                                     gfloat    *normals,
+                                     gint       width,
+                                     gint       distance_threshold,
+                                     gfloat     max_angle_deg,
+                                     GimpAsync *async)
+{
+  GList       *candidates = NULL;
+  const float  CosMin     = cosf (M_PI * (max_angle_deg / 180.0));
+  gint         i;
+
+  for (i = 0; i < max_positions->len; i++)
+    {
+      Pixel p1 = g_array_index (max_positions, Pixel, i);
+      gint  j;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          g_list_free_full (candidates, g_free);
+
+          return NULL;
+        }
+
+      for (j = i + 1; j < max_positions->len; j++)
+        {
+          Pixel       p2 = g_array_index (max_positions, Pixel, j);
+          const float distance = gimp_vector2_length_val (gimp_vector2_sub_val (p1, p2));
+
+          if (distance <= distance_threshold)
+            {
+              GimpVector2 normalP1;
+              GimpVector2 normalP2;
+              GimpVector2 p1f;
+              GimpVector2 p2f;
+              GimpVector2 p1p2;
+              float       cosN;
+              float       qualityA;
+              float       qualityB;
+              float       qualityC;
+              float       quality;
+
+              normalP1 = gimp_vector2_new (normals[((gint) p1.x + (gint) p1.y * width) * 2],
+                                           normals[((gint) p1.x + (gint) p1.y * width) * 2 + 1]);
+              normalP2 = gimp_vector2_new (normals[((gint) p2.x + (gint) p2.y * width) * 2],
+                                           normals[((gint) p2.x + (gint) p2.y * width) * 2 + 1]);
+              p1f = gimp_vector2_new (p1.x, p1.y);
+              p2f = gimp_vector2_new (p2.x, p2.y);
+              p1p2 = gimp_vector2_sub_val (p2f, p1f);
+
+              cosN = gimp_vector2_inner_product_val (normalP1, (gimp_vector2_neg_val (normalP2)));
+              qualityA = MAX (0.0f, 1 - distance / distance_threshold);
+              qualityB = MAX (0.0f,
+                              (float) (gimp_vector2_inner_product_val (normalP1, p1p2) - gimp_vector2_inner_product_val (normalP2, p1p2)) /
+                              distance);
+              qualityC = MAX (0.0f, cosN - CosMin);
+              quality = qualityA * qualityB * qualityC;
+              if (quality > 0)
+                {
+                  SplineCandidate *candidate = g_new (SplineCandidate, 1);
+
+                  candidate->p1      = p1;
+                  candidate->p2      = p2;
+                  candidate->quality = quality;
+
+                  candidates = g_list_insert_sorted_with_data (candidates, candidate,
+                                                               (GCompareDataFunc) gimp_spline_candidate_cmp,
+                                                               NULL);
+                }
+            }
+        }
+    }
+  return candidates;
+}
+
+static GArray *
+gimp_lineart_discrete_spline (Pixel       p0,
+                              GimpVector2 n0,
+                              Pixel       p1,
+                              GimpVector2 n1)
+{
+  GArray       *points = g_array_new (FALSE, TRUE, sizeof (Pixel));
+  const double  a0 = 2 * p0.x - 2 * p1.x + n0.x - n1.x;
+  const double  b0 = -3 * p0.x + 3 * p1.x - 2 * n0.x + n1.x;
+  const double  c0 = n0.x;
+  const double  d0 = p0.x;
+  const double  a1 = 2 * p0.y - 2 * p1.y + n0.y - n1.y;
+  const double  b1 = -3 * p0.y + 3 * p1.y - 2 * n0.y + n1.y;
+  const double  c1 = n0.y;
+  const double  d1 = p0.y;
+
+  double        t = 0.0;
+  const double  dtMin = 1.0 / MAX (fabs (p0.x - p1.x), fabs (p0.y - p1.y));
+  Pixel         point = gimp_vector2_new ((gint) round (d0), (gint) round (d1));
+
+  g_array_append_val (points, point);
+
+  while (t <= 1.0)
+    {
+      const double t2 = t * t;
+      const double t3 = t * t2;
+      double       dx;
+      double       dy;
+      Pixel        p = gimp_vector2_new ((gint) round (a0 * t3 + b0 * t2 + c0 * t + d0),
+                                         (gint) round (a1 * t3 + b1 * t2 + c1 * t + d1));
+
+      /* create gimp_vector2_neq () ? */
+      if (g_array_index (points, Pixel, points->len - 1).x != p.x ||
+          g_array_index (points, Pixel, points->len - 1).y != p.y)
+        {
+          g_array_append_val (points, p);
+        }
+      dx = fabs (3 * a0 * t * t + 2 * b0 * t + c0) + 1e-8;
+      dy = fabs (3 * a1 * t * t + 2 * b1 * t + c1) + 1e-8;
+      t += MIN (dtMin, 0.75 / MAX (dx, dy));
+    }
+  if (g_array_index (points, Pixel, points->len - 1).x != p1.x ||
+      g_array_index (points, Pixel, points->len - 1).y != p1.y)
+    {
+      g_array_append_val (points, p1);
+    }
+  return points;
+}
+
+static gint
+gimp_number_of_transitions (GArray     *pixels,
+                            GeglBuffer *buffer)
+{
+  int result = 0;
+
+  if (pixels->len > 0)
+    {
+      Pixel    it = g_array_index (pixels, Pixel, 0);
+      guchar   value;
+      gboolean previous;
+      gint     i;
+
+      gegl_buffer_sample (buffer, (gint) it.x, (gint) it.y, NULL, &value, NULL,
+                          GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+      previous = (gboolean) value;
+
+      /* Starts at the second element. */
+      for (i = 1; i < pixels->len; i++)
+        {
+          it = g_array_index (pixels, Pixel, i);
+
+          gegl_buffer_sample (buffer, (gint) it.x, (gint) it.y, NULL, &value, NULL,
+                              GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+          result += ((gboolean) value != previous);
+          previous = (gboolean) value;
+        }
+    }
+
+  return result;
+}
+
+/**
+ * gimp_line_art_allow_closure:
+ * @mask: the current state of line art closure.
+ * @pixels: the pixels of a candidate closure (spline or segment).
+ * @fill_pixels: #GList of unsignificant pixels to bucket fill.
+ * @significant_size: number of pixels for area to be considered
+ *                    "significant".
+ * @minimum_size: number of pixels for area to be allowed.
+ *
+ * Checks whether adding the set of points @pixels to @mask will create
+ * 4-connected background regions whose size (i.e. number of pixels)
+ * will be below @minimum_size. If it creates such small areas, the
+ * function will refuse this candidate spline/segment, with the
+ * exception of very small areas under @significant_size. These
+ * micro-area are considered "unsignificant" and accepted (because they
+ * can be created in some conditions, for instance when created curves
+ * cross or start from a same endpoint), and one pixel for each
+ * micro-area will be added to @fill_pixels to be later filled along
+ * with the candidate pixels.
+ *
+ * Returns: #TRUE if @pixels should be added to @mask, #FALSE otherwise.
+ */
+static gboolean
+gimp_line_art_allow_closure (GeglBuffer *mask,
+                             GArray     *pixels,
+                             GList     **fill_pixels,
+                             int         significant_size,
+                             int         minimum_size)
+{
+  /* A theorem from the paper is that a zone with more than
+   * `2 * (@minimum_size - 1)` edgels (border pixels) will have more
+   * than @minimum_size pixels.
+   * Since we are following the edges of the area, we can therefore stop
+   * earlier if we reach this number of edgels.
+   */
+  const glong max_edgel_count = 2 * minimum_size;
+
+  Pixel      *p = (Pixel*) pixels->data;
+  GList      *fp = NULL;
+  gint        i;
+
+  /* Mark pixels */
+  for (i = 0; i < pixels->len; i++)
+    {
+      if (p->x >= 0 && p->x < gegl_buffer_get_width (mask) &&
+          p->y >= 0 && p->y < gegl_buffer_get_height (mask))
+        {
+          guchar val;
+
+          gegl_buffer_sample (mask, (gint) p->x, (gint) p->y, NULL, &val,
+                              NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+          val = val ? 3 : 2;
+          gegl_buffer_set (mask, GEGL_RECTANGLE ((gint) p->x, (gint) p->y, 1, 1), 0,
+                           NULL, &val, GEGL_AUTO_ROWSTRIDE);
+        }
+      p++;
+    }
+
+  for (i = 0; i < pixels->len; i++)
+    {
+      Pixel p = g_array_index (pixels, Pixel, i);
+
+      for (int direction = 0; direction < 4; ++direction)
+        {
+          if (p.x >= 0 && p.x < gegl_buffer_get_width (mask) &&
+              p.y >= 0 && p.y < gegl_buffer_get_height (mask) &&
+              border_in_direction (mask, p, direction))
+            {
+              Edgel  e;
+              guchar val;
+              glong  count;
+              glong  area;
+
+              gegl_buffer_sample (mask, (gint) p.x, (gint) p.y, NULL, &val,
+                                  NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+              if ((gboolean) (val & (4 << direction)))
+                continue;
+
+              gimp_edgel_init (&e);
+              e.x = p.x;
+              e.y = p.y;
+              e.direction = direction;
+
+              count = gimp_edgel_track_mark (mask, e, max_edgel_count);
+              if ((count != -1) && (count <= max_edgel_count))
+                {
+                  area = gimp_edgel_region_area (mask, e);
+
+                  if (area >= significant_size && area < minimum_size)
+                    {
+                      gint j;
+
+                      /* Remove marks */
+                      for (j = 0; j < pixels->len; j++)
+                        {
+                          Pixel p2 = g_array_index (pixels, Pixel, j);
+
+                          if (p2.x >= 0 && p2.x < gegl_buffer_get_width (mask) &&
+                              p2.y >= 0 && p2.y < gegl_buffer_get_height (mask))
+                            {
+                              guchar val;
+
+                              gegl_buffer_sample (mask, (gint) p2.x, (gint) p2.y, NULL, &val,
+                                                  NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+                              val &= 1;
+                              gegl_buffer_set (mask, GEGL_RECTANGLE ((gint) p2.x, (gint) p2.y, 1, 1), 0,
+                                               NULL, &val, GEGL_AUTO_ROWSTRIDE);
+                            }
+                        }
+                      g_list_free_full (fp, g_free);
+
+                      return FALSE;
+                    }
+                  else if (area > 0 && area < significant_size)
+                    {
+                      Pixel *np = g_new (Pixel, 1);
+
+                      np->x = direction == XPlusDirection ? p.x + 1 : (direction == XMinusDirection ? p.x - 1 : p.x);
+                      np->y = direction == YPlusDirection ? p.y + 1 : (direction == YMinusDirection ? p.y - 1 : p.y);
+
+                      if (np->x >= 0 && np->x < gegl_buffer_get_width (mask) &&
+                          np->y >= 0 && np->y < gegl_buffer_get_height (mask))
+                        fp = g_list_prepend (fp, np);
+                      else
+                        g_free (np);
+                    }
+                }
+            }
+        }
+    }
+
+  *fill_pixels = g_list_concat (*fill_pixels, fp);
+  /* Remove marks */
+  for (i = 0; i < pixels->len; i++)
+    {
+      Pixel p = g_array_index (pixels, Pixel, i);
+
+      if (p.x >= 0 && p.x < gegl_buffer_get_width (mask) &&
+          p.y >= 0 && p.y < gegl_buffer_get_height (mask))
+        {
+          guchar val;
+
+          gegl_buffer_sample (mask, (gint) p.x, (gint) p.y, NULL, &val,
+                              NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+          val &= 1;
+          gegl_buffer_set (mask, GEGL_RECTANGLE ((gint) p.x, (gint) p.y, 1, 1), 0,
+                           NULL, &val, GEGL_AUTO_ROWSTRIDE);
+        }
+    }
+  return TRUE;
+}
+
+static GArray *
+gimp_lineart_line_segment_until_hit (const GeglBuffer *mask,
+                                     Pixel             start,
+                                     GimpVector2       direction,
+                                     int               size)
+{
+  GeglBuffer  *buffer = (GeglBuffer *) mask;
+  gboolean     out = FALSE;
+  GArray      *points = g_array_new (FALSE, TRUE, sizeof (Pixel));
+  int          tmax;
+  GimpVector2  p0 = gimp_vector2_new (start.x, start.y);
+
+  gimp_vector2_mul (&direction, (gdouble) size);
+  direction.x = round (direction.x);
+  direction.y = round (direction.y);
+
+  tmax = MAX (abs ((int) direction.x), abs ((int) direction.y));
+
+  for (int t = 0; t <= tmax; ++t)
+    {
+      GimpVector2 v = gimp_vector2_add_val (p0, gimp_vector2_mul_val (direction, (float)t / tmax));
+      Pixel       p;
+
+      p.x = (gint) round (v.x);
+      p.y = (gint) round (v.y);
+      if (p.x >= 0 && p.x < gegl_buffer_get_width (buffer) &&
+          p.y >= 0 && p.y < gegl_buffer_get_height (buffer))
+        {
+          guchar val;
+          gegl_buffer_sample (buffer, p.x, p.y, NULL, &val,
+                              NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+          if (out && val)
+            {
+              return points;
+            }
+          out = ! val;
+        }
+      else if (out)
+        {
+          return points;
+        }
+      else
+        {
+          g_array_free (points, TRUE);
+          return g_array_new (FALSE, TRUE, sizeof (Pixel));
+        }
+      g_array_append_val (points, p);
+    }
+
+  g_array_free (points, TRUE);
+  return g_array_new (FALSE, TRUE, sizeof (Pixel));
+}
+
+static gfloat *
+gimp_lineart_estimate_strokes_radii (GeglBuffer *mask,
+                                     GimpAsync  *async)
+{
+  GeglBufferIterator *gi;
+  gfloat             *dist;
+  gfloat             *thickness;
+  GeglNode           *graph;
+  GeglNode           *input;
+  GeglNode           *op;
+  gint                width  = gegl_buffer_get_width (mask);
+  gint                height = gegl_buffer_get_height (mask);
+
+  /* Compute a distance map for the line art. */
+  dist = g_new (gfloat, width * height);
+
+  graph = gegl_node_new ();
+  input = gegl_node_new_child (graph,
+                               "operation", "gegl:buffer-source",
+                               "buffer", mask,
+                               NULL);
+  op  = gegl_node_new_child (graph,
+                             "operation", "gegl:distance-transform",
+                             "metric",    GEGL_DISTANCE_METRIC_EUCLIDEAN,
+                             "normalize", FALSE,
+                             NULL);
+  gegl_node_connect_to (input, "output", op, "input");
+  gegl_node_blit (op, 1.0, gegl_buffer_get_extent (mask),
+                  NULL, dist, GEGL_AUTO_ROWSTRIDE, GEGL_BLIT_DEFAULT);
+  g_object_unref (graph);
+
+  thickness = g_new0 (gfloat, width * height);
+  gi = gegl_buffer_iterator_new (mask, NULL, 0, NULL,
+                                 GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+  while (gegl_buffer_iterator_next (gi))
+    {
+      guint8 *m = (guint8*) gi->items[0].data;
+      gint    startx = gi->items[0].roi.x;
+      gint    starty = gi->items[0].roi.y;
+      gint    endy   = starty + gi->items[0].roi.height;
+      gint    endx   = startx + gi->items[0].roi.width;
+      gint    x;
+      gint    y;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gegl_buffer_iterator_stop (gi);
+
+          gimp_async_abort (async);
+
+          goto end;
+        }
+
+      for (y = starty; y < endy; y++)
+        for (x = startx; x < endx; x++)
+          {
+            if (*m && dist[x + y * width] == 1.0)
+              {
+                gint     dx = x;
+                gint     dy = y;
+                gfloat   d  = 1.0;
+                gfloat   nd;
+                gboolean neighbour_thicker = TRUE;
+
+                while (neighbour_thicker)
+                  {
+                    gint px = dx - 1;
+                    gint py = dy - 1;
+                    gint nx = dx + 1;
+                    gint ny = dy + 1;
+
+                    neighbour_thicker = FALSE;
+                    if (px >= 0)
+                      {
+                        if ((nd = dist[px + dy * width]) > d)
+                          {
+                            d = nd;
+                            dx = px;
+                            neighbour_thicker = TRUE;
+                            continue;
+                          }
+                        if (py >= 0 && (nd = dist[px + py * width]) > d)
+                          {
+                            d = nd;
+                            dx = px;
+                            dy = py;
+                            neighbour_thicker = TRUE;
+                            continue;
+                          }
+                        if (ny < height && (nd = dist[px + ny * width]) > d)
+                          {
+                            d = nd;
+                            dx = px;
+                            dy = ny;
+                            neighbour_thicker = TRUE;
+                            continue;
+                          }
+                      }
+                    if (nx < width)
+                      {
+                        if ((nd = dist[nx + dy * width]) > d)
+                          {
+                            d = nd;
+                            dx = nx;
+                            neighbour_thicker = TRUE;
+                            continue;
+                          }
+                        if (py >= 0 && (nd = dist[nx + py * width]) > d)
+                          {
+                            d = nd;
+                            dx = nx;
+                            dy = py;
+                            neighbour_thicker = TRUE;
+                            continue;
+                          }
+                        if (ny < height && (nd = dist[nx + ny * width]) > d)
+                          {
+                            d = nd;
+                            dx = nx;
+                            dy = ny;
+                            neighbour_thicker = TRUE;
+                            continue;
+                          }
+                      }
+                    if (py > 0 && (nd = dist[dx + py * width]) > d)
+                      {
+                        d = nd;
+                        dy = py;
+                        neighbour_thicker = TRUE;
+                        continue;
+                      }
+                    if (ny < height && (nd = dist[dx + ny * width]) > d)
+                      {
+                        d = nd;
+                        dy = ny;
+                        neighbour_thicker = TRUE;
+                        continue;
+                      }
+                  }
+                thickness[(gint) x + (gint) y * width] = d;
+              }
+            m++;
+          }
+    }
+
+ end:
+  g_free (dist);
+
+  if (gimp_async_is_stopped (async))
+    g_clear_pointer (&thickness, g_free);
+
+  return thickness;
+}
+
+static void
+gimp_line_art_simple_fill (GeglBuffer *buffer,
+                           gint        x,
+                           gint        y,
+                           gint       *counter)
+{
+  guchar val;
+
+  if (x < 0 || x >= gegl_buffer_get_width (buffer)  ||
+      y < 0 || y >= gegl_buffer_get_height (buffer) ||
+      *counter <= 0)
+    return;
+
+  gegl_buffer_sample (buffer, x, y, NULL, &val,
+                      NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+  if (! val)
+    {
+      val = 1;
+      gegl_buffer_set (buffer, GEGL_RECTANGLE (x, y, 1, 1), 0,
+                       NULL, &val, GEGL_AUTO_ROWSTRIDE);
+      (*counter)--;
+      gimp_line_art_simple_fill (buffer, x + 1, y, counter);
+      gimp_line_art_simple_fill (buffer, x - 1, y, counter);
+      gimp_line_art_simple_fill (buffer, x, y + 1, counter);
+      gimp_line_art_simple_fill (buffer, x, y - 1, counter);
+    }
+}
+
+static guint
+visited_hash_fun (Pixel *key)
+{
+  /* Cantor pairing function. */
+  return (key->x + key->y) * (key->x + key->y + 1) / 2 + key->y;
+}
+
+static gboolean
+visited_equal_fun (Pixel *e1,
+                   Pixel *e2)
+{
+  return (e1->x == e2->x && e1->y == e2->y);
+}
+
+static inline gboolean
+border_in_direction (GeglBuffer *mask,
+                     Pixel       p,
+                     int         direction)
+{
+  gint px = (gint) p.x + DeltaX[direction];
+  gint py = (gint) p.y + DeltaY[direction];
+
+  if (px >= 0 && px < gegl_buffer_get_width (mask) &&
+      py >= 0 && py < gegl_buffer_get_height (mask))
+    {
+      guchar val;
+
+      gegl_buffer_sample (mask, px, py, NULL, &val,
+                          NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+      return ! ((gboolean) val);
+    }
+  return TRUE;
+}
+
+static inline GimpVector2
+pair2normal (Pixel   p,
+             gfloat *normals,
+             gint    width)
+{
+  return gimp_vector2_new (normals[((gint) p.x + (gint) p.y * width) * 2],
+                           normals[((gint) p.x + (gint) p.y * width) * 2 + 1]);
+}
+/* Edgel functions */
+
+static Edgel *
+gimp_edgel_new (int       x,
+                int       y,
+                Direction direction)
+{
+  Edgel *edgel = g_new (Edgel, 1);
+
+  edgel->x         = x;
+  edgel->y         = y;
+  edgel->direction = direction;
+
+  gimp_edgel_init (edgel);
+
+  return edgel;
+}
+
+static void
+gimp_edgel_init (Edgel *edgel)
+{
+  edgel->x_normal  = 0;
+  edgel->y_normal  = 0;
+  edgel->curvature = 0;
+  edgel->next      = edgel->previous = G_MAXUINT;
+}
+
+static void
+gimp_edgel_clear (Edgel **edgel)
+{
+  g_clear_pointer (edgel, g_free);
+}
+
+static int
+gimp_edgel_cmp (const Edgel* e1,
+                const Edgel* e2)
+{
+  gimp_assert (e1 && e2);
+
+  if ((e1->x == e2->x) && (e1->y == e2->y) &&
+      (e1->direction == e2->direction))
+    return 0;
+  else if ((e1->y < e2->y) || (e1->y == e2->y && e1->x < e2->x) ||
+           (e1->y == e2->y && e1->x == e2->x && e1->direction < e2->direction))
+    return -1;
+  else
+    return 1;
+}
+
+static guint
+edgel2index_hash_fun (Edgel *key)
+{
+  /* Cantor pairing function.
+   * Was not sure how to use the direction though. :-/
+   */
+  return (key->x + key->y) * (key->x + key->y + 1) / 2 + key->y * key->direction;
+}
+
+static gboolean
+edgel2index_equal_fun (Edgel *e1,
+                       Edgel *e2)
+{
+  return (e1->x == e2->x && e1->y == e2->y &&
+          e1->direction == e2->direction);
+}
+
+/**
+ * @mask;
+ * @edgel:
+ * @size_limit:
+ *
+ * Track a border, marking inner pixels with a bit corresponding to the
+ * edgel traversed (4 << direction) for direction in {0,1,2,3}.
+ * Stop tracking after @size_limit edgels have been visited.
+ *
+ * Returns: Number of visited edgels, or -1 if an already visited edgel
+ *          has been encountered.
+ */
+static glong
+gimp_edgel_track_mark (GeglBuffer *mask,
+                       Edgel       edgel,
+                       long        size_limit)
+{
+  Edgel start = edgel;
+  long  count = 1;
+
+  do
+    {
+      guchar val;
+
+      gimp_edgelset_next8 (mask, &edgel, &edgel);
+      gegl_buffer_sample (mask, edgel.x, edgel.y, NULL, &val,
+                          NULL, GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+      if (val & 2)
+        {
+          /* Only mark pixels of the spline/segment */
+          if (val & (4 << edgel.direction))
+            return -1;
+
+          /* Mark edgel in pixel (1 == In Mask, 2 == Spline/Segment) */
+          val |= (4 << edgel.direction);
+          gegl_buffer_set (mask, GEGL_RECTANGLE (edgel.x, edgel.y, 1, 1), 0,
+                           NULL, &val, GEGL_AUTO_ROWSTRIDE);
+        }
+      if (gimp_edgel_cmp (&edgel, &start) != 0)
+        ++count;
+    }
+  while (gimp_edgel_cmp (&edgel, &start) != 0 && count <= size_limit);
+
+  return count;
+}
+
+/**
+ * gimp_edgel_region_area:
+ * @mask: current state of closed line art buffer.
+ * @start_edgel: edgel to follow.
+ *
+ * Follows a line border, starting from @start_edgel to compute the area
+ * enclosed by this border.
+ * Unfortunately this may return a negative area when the line does not
+ * close a zone. In this case, there is an uncertaincy on the size of
+ * the created zone, and we should consider it a big size.
+ *
+ * Returns: the area enclosed by the followed line, or a negative value
+ * if the zone is not closed (hence actual area unknown).
+ */
+static glong
+gimp_edgel_region_area (const GeglBuffer *mask,
+                        Edgel             start_edgel)
+{
+  Edgel edgel = start_edgel;
+  glong area = 0;
+
+  do
+    {
+      if (edgel.direction == XPlusDirection)
+        area -= edgel.x;
+      else if (edgel.direction == XMinusDirection)
+        area += edgel.x - 1;
+
+      gimp_edgelset_next8 (mask, &edgel, &edgel);
+    }
+  while (gimp_edgel_cmp (&edgel, &start_edgel) != 0);
+
+  return area;
+}
+
+/* Edgel sets */
+
+static GArray *
+gimp_edgelset_new (GeglBuffer *buffer,
+                   GimpAsync  *async)
+{
+  GeglBufferIterator *gi;
+  GArray             *set;
+  GHashTable         *edgel2index;
+  gint                width  = gegl_buffer_get_width (buffer);
+  gint                height = gegl_buffer_get_height (buffer);
+
+  set = g_array_new (TRUE, TRUE, sizeof (Edgel *));
+  g_array_set_clear_func (set, (GDestroyNotify) gimp_edgel_clear);
+
+  if (width <= 1 || height <= 1)
+    return set;
+
+  edgel2index = g_hash_table_new ((GHashFunc) edgel2index_hash_fun,
+                                  (GEqualFunc) edgel2index_equal_fun);
+
+  gi = gegl_buffer_iterator_new (buffer, GEGL_RECTANGLE (0, 0, width, height),
+                                 0, NULL, GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 5);
+  gegl_buffer_iterator_add (gi, buffer, GEGL_RECTANGLE (0, -1, width, height),
+                            0, NULL, GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+  gegl_buffer_iterator_add (gi, buffer, GEGL_RECTANGLE (0, 1, width, height),
+                            0, NULL, GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+  gegl_buffer_iterator_add (gi, buffer, GEGL_RECTANGLE (-1, 0, width, height),
+                            0, NULL, GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+  gegl_buffer_iterator_add (gi, buffer, GEGL_RECTANGLE (1, 0, width, height),
+                            0, NULL, GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+  while (gegl_buffer_iterator_next (gi))
+    {
+      guint8 *p      = (guint8*) gi->items[0].data;
+      guint8 *prevy  = (guint8*) gi->items[1].data;
+      guint8 *nexty  = (guint8*) gi->items[2].data;
+      guint8 *prevx  = (guint8*) gi->items[3].data;
+      guint8 *nextx  = (guint8*) gi->items[4].data;
+      gint    startx = gi->items[0].roi.x;
+      gint    starty = gi->items[0].roi.y;
+      gint    endy   = starty + gi->items[0].roi.height;
+      gint    endx   = startx + gi->items[0].roi.width;
+      gint    x;
+      gint    y;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gegl_buffer_iterator_stop (gi);
+
+          gimp_async_abort (async);
+
+          goto end;
+        }
+
+      for (y = starty; y < endy; y++)
+        for (x = startx; x < endx; x++)
+          {
+            if (*(p++))
+              {
+                if (! *prevy)
+                  gimp_edgelset_add (set, x, y, YMinusDirection, edgel2index);
+                if (! *nexty)
+                  gimp_edgelset_add (set, x, y, YPlusDirection, edgel2index);
+                if (! *prevx)
+                  gimp_edgelset_add (set, x, y, XMinusDirection, edgel2index);
+                if (! *nextx)
+                  gimp_edgelset_add (set, x, y, XPlusDirection, edgel2index);
+              }
+            prevy++;
+            nexty++;
+            prevx++;
+            nextx++;
+          }
+    }
+
+  gimp_edgelset_build_graph (set, buffer, edgel2index, async);
+  if (gimp_async_is_stopped (async))
+    goto end;
+
+  gimp_edgelset_init_normals (set);
+
+ end:
+  g_hash_table_destroy (edgel2index);
+
+  if (gimp_async_is_stopped (async))
+    {
+      g_array_free (set, TRUE);
+      set = NULL;
+    }
+
+  return set;
+}
+
+static void
+gimp_edgelset_add (GArray     *set,
+                   int         x,
+                   int         y,
+                   Direction   direction,
+                   GHashTable *edgel2index)
+{
+  Edgel         *edgel    = gimp_edgel_new (x, y, direction);
+  unsigned long  position = set->len;
+
+  g_array_append_val (set, edgel);
+  g_hash_table_insert (edgel2index, edgel, GUINT_TO_POINTER (position));
+}
+
+static void
+gimp_edgelset_init_normals (GArray *set)
+{
+  Edgel **e = (Edgel**) set->data;
+
+  while (*e)
+    {
+      GimpVector2 n = Direction2Normal[(*e)->direction];
+
+      (*e)->x_normal = n.x;
+      (*e)->y_normal = n.y;
+      e++;
+    }
+}
+
+static void
+gimp_edgelset_smooth_normals (GArray    *set,
+                              int        mask_size,
+                              GimpAsync *async)
+{
+  const gfloat sigma = mask_size * 0.775;
+  const gfloat den   = 2 * sigma * sigma;
+  gfloat       weights[65];
+  GimpVector2  smoothed_normal;
+  gint         i;
+
+  gimp_assert (mask_size <= 65);
+
+  weights[0] = 1.0f;
+  for (int i = 1; i <= mask_size; ++i)
+    weights[i] = expf (-(i * i) / den);
+
+  for (i = 0; i < set->len; i++)
+    {
+      Edgel *it           = g_array_index (set, Edgel*, i);
+      Edgel *edgel_before = g_array_index (set, Edgel*, it->previous);
+      Edgel *edgel_after  = g_array_index (set, Edgel*, it->next);
+      int    n = mask_size;
+      int    i = 1;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          return;
+        }
+
+      smoothed_normal = Direction2Normal[it->direction];
+      while (n-- && (edgel_after != edgel_before))
+        {
+          smoothed_normal = gimp_vector2_add_val (smoothed_normal,
+                                                  gimp_vector2_mul_val (Direction2Normal[edgel_before->direction], weights[i]));
+          smoothed_normal = gimp_vector2_add_val (smoothed_normal,
+                                                  gimp_vector2_mul_val (Direction2Normal[edgel_after->direction], weights[i]));
+          edgel_before = g_array_index (set, Edgel *, edgel_before->previous);
+          edgel_after  = g_array_index (set, Edgel *, edgel_after->next);
+          ++i;
+        }
+      gimp_vector2_normalize (&smoothed_normal);
+      it->x_normal = smoothed_normal.x;
+      it->y_normal = smoothed_normal.y;
+    }
+}
+
+static void
+gimp_edgelset_compute_curvature (GArray    *set,
+                                 GimpAsync *async)
+{
+  gint i;
+
+  for (i = 0; i < set->len; i++)
+    {
+      Edgel       *it       = g_array_index (set, Edgel*, i);
+      Edgel       *previous = g_array_index (set, Edgel *, it->previous);
+      Edgel       *next     = g_array_index (set, Edgel *, it->next);
+      GimpVector2  n_prev   = gimp_vector2_new (previous->x_normal, previous->y_normal);
+      GimpVector2  n_next   = gimp_vector2_new (next->x_normal, next->y_normal);
+      GimpVector2  diff     = gimp_vector2_mul_val (gimp_vector2_sub_val (n_next, n_prev),
+                                                    0.5);
+      const float  c        = gimp_vector2_length_val (diff);
+      const float  crossp   = n_prev.x * n_next.y - n_prev.y * n_next.x;
+
+      it->curvature = (crossp > 0.0f) ? c : -c;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          return;
+        }
+    }
+}
+
+static void
+gimp_edgelset_build_graph (GArray     *set,
+                           GeglBuffer *buffer,
+                           GHashTable *edgel2index,
+                           GimpAsync  *async)
+{
+  Edgel edgel;
+  gint  i;
+
+  for (i = 0; i < set->len; i++)
+    {
+      Edgel *neighbor;
+      Edgel *it = g_array_index (set, Edgel *, i);
+      guint  neighbor_pos;
+
+      if (gimp_async_is_canceled (async))
+        {
+          gimp_async_abort (async);
+
+          return;
+        }
+
+      gimp_edgelset_next8 (buffer, it, &edgel);
+
+      gimp_assert (g_hash_table_contains (edgel2index, &edgel));
+      neighbor_pos = GPOINTER_TO_UINT (g_hash_table_lookup (edgel2index, &edgel));
+      it->next = neighbor_pos;
+      neighbor = g_array_index (set, Edgel *, neighbor_pos);
+      neighbor->previous = i;
+    }
+}
+
+static void
+gimp_edgelset_next8 (const GeglBuffer *buffer,
+                     Edgel            *it,
+                     Edgel            *n)
+{
+  guint8 pixels[9];
+
+  n->x         = it->x;
+  n->y         = it->y;
+  n->direction = it->direction;
+
+  gegl_buffer_get ((GeglBuffer *) buffer,
+                   GEGL_RECTANGLE (n->x - 1, n->y - 1, 3, 3),
+                   1.0, NULL, pixels, GEGL_AUTO_ROWSTRIDE,
+                   GEGL_ABYSS_NONE);
+  switch (n->direction)
+    {
+    case XPlusDirection:
+      if (pixels[8])
+        {
+          ++(n->y);
+          ++(n->x);
+          n->direction = YMinusDirection;
+        }
+      else if (pixels[7])
+        {
+          ++(n->y);
+        }
+      else
+        {
+          n->direction = YPlusDirection;
+        }
+      break;
+    case YMinusDirection:
+      if (pixels[2])
+        {
+          ++(n->x);
+          --(n->y);
+          n->direction = XMinusDirection;
+        }
+      else if (pixels[5])
+        {
+          ++(n->x);
+        }
+      else
+        {
+          n->direction = XPlusDirection;
+        }
+      break;
+    case XMinusDirection:
+      if (pixels[0])
+        {
+          --(n->x);
+          --(n->y);
+          n->direction = YPlusDirection;
+        }
+      else if (pixels[1])
+        {
+          --(n->y);
+        }
+      else
+        {
+          n->direction = YMinusDirection;
+        }
+      break;
+    case YPlusDirection:
+      if (pixels[6])
+        {
+          --(n->x);
+          ++(n->y);
+          n->direction = XPlusDirection;
+        }
+      else if (pixels[3])
+        {
+          --(n->x);
+        }
+      else
+        {
+          n->direction = XMinusDirection;
+        }
+      break;
+    default:
+      g_return_if_reached ();
+      break;
+    }
+}
diff --git a/app/core/gimplineart.h b/app/core/gimplineart.h
new file mode 100644
index 0000000..cdec1ee
--- /dev/null
+++ b/app/core/gimplineart.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2017 Sébastien Fourey & David Tchumperlé
+ * Copyright (C) 2018 Jehan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LINEART__
+#define __GIMP_LINEART__
+
+
+#include "gimpobject.h"
+
+#define GIMP_TYPE_LINE_ART            (gimp_line_art_get_type ())
+#define GIMP_LINE_ART(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LINE_ART, GimpLineArt))
+#define GIMP_LINE_ART_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LINE_ART, GimpLineArtClass))
+#define GIMP_IS_LINE_ART(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LINE_ART))
+#define GIMP_IS_LINE_ART_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LINE_ART))
+#define GIMP_LINE_ART_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LINE_ART, GimpLineArtClass))
+
+
+typedef struct _GimpLineArtClass   GimpLineArtClass;
+typedef struct _GimpLineArtPrivate GimpLineArtPrivate;
+
+struct _GimpLineArt
+{
+  GimpObject          parent_instance;
+
+  GimpLineArtPrivate *priv;
+};
+
+struct _GimpLineArtClass
+{
+  GimpObjectClass     parent_class;
+
+  /* Signals */
+
+  void (* computing_start) (GimpLineArt *line_art);
+  void (* computing_end)   (GimpLineArt *line_art);
+};
+
+
+GType                gimp_line_art_get_type         (void) G_GNUC_CONST;
+
+GimpLineArt        * gimp_line_art_new              (void);
+
+void                 gimp_line_art_bind_gap_length  (GimpLineArt  *line_art,
+                                                     gboolean      bound);
+
+void                 gimp_line_art_set_input        (GimpLineArt  *line_art,
+                                                     GimpPickable *pickable);
+GimpPickable       * gimp_line_art_get_input        (GimpLineArt  *line_art);
+void                 gimp_line_art_freeze           (GimpLineArt  *line_art);
+void                 gimp_line_art_thaw             (GimpLineArt  *line_art);
+gboolean             gimp_line_art_is_frozen        (GimpLineArt  *line_art);
+
+GeglBuffer         * gimp_line_art_get              (GimpLineArt  *line_art,
+                                                     gfloat      **distmap);
+
+#endif /* __GIMP_LINEART__ */
diff --git a/app/core/gimplist.c b/app/core/gimplist.c
new file mode 100644
index 0000000..0fbca1f
--- /dev/null
+++ b/app/core/gimplist.c
@@ -0,0 +1,691 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimplist.c
+ * Copyright (C) 2001-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h> /* strcmp */
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimplist.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_UNIQUE_NAMES,
+  PROP_SORT_FUNC,
+  PROP_APPEND
+};
+
+
+static void         gimp_list_finalize           (GObject                 *object);
+static void         gimp_list_set_property       (GObject                 *object,
+                                                  guint                    property_id,
+                                                  const GValue            *value,
+                                                  GParamSpec              *pspec);
+static void         gimp_list_get_property       (GObject                 *object,
+                                                  guint                    property_id,
+                                                  GValue                  *value,
+                                                  GParamSpec              *pspec);
+
+static gint64       gimp_list_get_memsize        (GimpObject              *object,
+                                                  gint64                  *gui_size);
+
+static void         gimp_list_add                (GimpContainer           *container,
+                                                  GimpObject              *object);
+static void         gimp_list_remove             (GimpContainer           *container,
+                                                  GimpObject              *object);
+static void         gimp_list_reorder            (GimpContainer           *container,
+                                                  GimpObject              *object,
+                                                  gint                     new_index);
+static void         gimp_list_clear              (GimpContainer           *container);
+static gboolean     gimp_list_have               (GimpContainer           *container,
+                                                  GimpObject              *object);
+static void         gimp_list_foreach            (GimpContainer           *container,
+                                                  GFunc                    func,
+                                                  gpointer                 user_data);
+static GimpObject * gimp_list_search             (GimpContainer           *container,
+                                                  GimpContainerSearchFunc  func,
+                                                  gpointer                 user_data);
+static gboolean     gimp_list_get_unique_names   (GimpContainer           *container);
+static GimpObject * gimp_list_get_child_by_name  (GimpContainer           *container,
+                                                  const gchar             *name);
+static GimpObject * gimp_list_get_child_by_index (GimpContainer           *container,
+                                                  gint                     index);
+static gint         gimp_list_get_child_index    (GimpContainer           *container,
+                                                  GimpObject              *object);
+
+static void         gimp_list_uniquefy_name      (GimpList                *gimp_list,
+                                                  GimpObject              *object);
+static void         gimp_list_object_renamed     (GimpObject              *object,
+                                                  GimpList                *list);
+
+
+G_DEFINE_TYPE (GimpList, gimp_list, GIMP_TYPE_CONTAINER)
+
+#define parent_class gimp_list_parent_class
+
+
+static void
+gimp_list_class_init (GimpListClass *klass)
+{
+  GObjectClass       *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass    *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpContainerClass *container_class   = GIMP_CONTAINER_CLASS (klass);
+
+  object_class->finalize              = gimp_list_finalize;
+  object_class->set_property          = gimp_list_set_property;
+  object_class->get_property          = gimp_list_get_property;
+
+  gimp_object_class->get_memsize      = gimp_list_get_memsize;
+
+  container_class->add                = gimp_list_add;
+  container_class->remove             = gimp_list_remove;
+  container_class->reorder            = gimp_list_reorder;
+  container_class->clear              = gimp_list_clear;
+  container_class->have               = gimp_list_have;
+  container_class->foreach            = gimp_list_foreach;
+  container_class->search             = gimp_list_search;
+  container_class->get_unique_names   = gimp_list_get_unique_names;
+  container_class->get_child_by_name  = gimp_list_get_child_by_name;
+  container_class->get_child_by_index = gimp_list_get_child_by_index;
+  container_class->get_child_index    = gimp_list_get_child_index;
+
+  g_object_class_install_property (object_class, PROP_UNIQUE_NAMES,
+                                   g_param_spec_boolean ("unique-names",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SORT_FUNC,
+                                   g_param_spec_pointer ("sort-func",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_APPEND,
+                                   g_param_spec_boolean ("append",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_list_init (GimpList *list)
+{
+  list->queue        = g_queue_new ();
+  list->unique_names = FALSE;
+  list->sort_func    = NULL;
+  list->append       = FALSE;
+}
+
+static void
+gimp_list_finalize (GObject *object)
+{
+  GimpList *list = GIMP_LIST (object);
+
+  if (list->queue)
+    {
+      g_queue_free (list->queue);
+      list->queue = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_list_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpList *list = GIMP_LIST (object);
+
+  switch (property_id)
+    {
+    case PROP_UNIQUE_NAMES:
+      list->unique_names = g_value_get_boolean (value);
+      break;
+    case PROP_SORT_FUNC:
+      gimp_list_set_sort_func (list, g_value_get_pointer (value));
+      break;
+    case PROP_APPEND:
+      list->append = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_list_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GimpList *list = GIMP_LIST (object);
+
+  switch (property_id)
+    {
+    case PROP_UNIQUE_NAMES:
+      g_value_set_boolean (value, list->unique_names);
+      break;
+    case PROP_SORT_FUNC:
+      g_value_set_pointer (value, list->sort_func);
+      break;
+    case PROP_APPEND:
+      g_value_set_boolean (value, list->append);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_list_get_memsize (GimpObject *object,
+                       gint64     *gui_size)
+{
+  GimpList *list    = GIMP_LIST (object);
+  gint64    memsize = 0;
+
+  if (gimp_container_get_policy (GIMP_CONTAINER (list)) ==
+      GIMP_CONTAINER_POLICY_STRONG)
+    {
+      memsize += gimp_g_queue_get_memsize_foreach (list->queue,
+                                                   (GimpMemsizeFunc) gimp_object_get_memsize,
+                                                   gui_size);
+    }
+  else
+    {
+      memsize += gimp_g_queue_get_memsize (list->queue, 0);
+    }
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gint
+gimp_list_sort_func (gconstpointer a,
+                     gconstpointer b,
+                     gpointer      user_data)
+{
+  GCompareFunc func = user_data;
+
+  return func (a, b);
+}
+
+static void
+gimp_list_add (GimpContainer *container,
+               GimpObject    *object)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  if (list->unique_names)
+    gimp_list_uniquefy_name (list, object);
+
+  if (list->unique_names || list->sort_func)
+    g_signal_connect (object, "name-changed",
+                      G_CALLBACK (gimp_list_object_renamed),
+                      list);
+
+  if (list->sort_func)
+    {
+      g_queue_insert_sorted (list->queue, object, gimp_list_sort_func,
+                             list->sort_func);
+    }
+  else if (list->append)
+    {
+      g_queue_push_tail (list->queue, object);
+    }
+  else
+    {
+      g_queue_push_head (list->queue, object);
+    }
+
+  GIMP_CONTAINER_CLASS (parent_class)->add (container, object);
+}
+
+static void
+gimp_list_remove (GimpContainer *container,
+                  GimpObject    *object)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  if (list->unique_names || list->sort_func)
+    g_signal_handlers_disconnect_by_func (object,
+                                          gimp_list_object_renamed,
+                                          list);
+
+  g_queue_remove (list->queue, object);
+
+  GIMP_CONTAINER_CLASS (parent_class)->remove (container, object);
+}
+
+static void
+gimp_list_reorder (GimpContainer *container,
+                   GimpObject    *object,
+                   gint           new_index)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  g_queue_remove (list->queue, object);
+
+  if (new_index == gimp_container_get_n_children (container) - 1)
+    g_queue_push_tail (list->queue, object);
+  else
+    g_queue_push_nth (list->queue, object, new_index);
+}
+
+static void
+gimp_list_clear (GimpContainer *container)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  while (g_queue_peek_head (list->queue))
+    gimp_container_remove (container, g_queue_peek_head (list->queue));
+}
+
+static gboolean
+gimp_list_have (GimpContainer *container,
+                GimpObject    *object)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  return g_queue_find (list->queue, object) ? TRUE : FALSE;
+}
+
+static void
+gimp_list_foreach (GimpContainer *container,
+                   GFunc          func,
+                   gpointer       user_data)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  g_queue_foreach (list->queue, func, user_data);
+}
+
+static GimpObject *
+gimp_list_search (GimpContainer           *container,
+                  GimpContainerSearchFunc  func,
+                  gpointer                 user_data)
+{
+  GimpList *list = GIMP_LIST (container);
+  GList    *iter;
+
+  iter = list->queue->head;
+
+  while (iter)
+    {
+      GimpObject *object = iter->data;
+
+      iter = g_list_next (iter);
+
+      if (func (object, user_data))
+        return object;
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_list_get_unique_names (GimpContainer *container)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  return list->unique_names;
+}
+
+static GimpObject *
+gimp_list_get_child_by_name (GimpContainer *container,
+                             const gchar   *name)
+{
+  GimpList *list = GIMP_LIST (container);
+  GList    *glist;
+
+  for (glist = list->queue->head; glist; glist = g_list_next (glist))
+    {
+      GimpObject *object = glist->data;
+
+      if (! strcmp (gimp_object_get_name (object), name))
+        return object;
+    }
+
+  return NULL;
+}
+
+static GimpObject *
+gimp_list_get_child_by_index (GimpContainer *container,
+                              gint           index)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  return g_queue_peek_nth (list->queue, index);
+}
+
+static gint
+gimp_list_get_child_index (GimpContainer *container,
+                           GimpObject    *object)
+{
+  GimpList *list = GIMP_LIST (container);
+
+  return g_queue_index (list->queue, (gpointer) object);
+}
+
+/**
+ * gimp_list_new:
+ * @children_type: the #GType of objects the list is going to hold
+ * @unique_names:  if the list should ensure that all its children
+ *                 have unique names.
+ *
+ * Creates a new #GimpList object. Since #GimpList is a #GimpContainer
+ * implementation, it holds GimpObjects. Thus @children_type must be
+ * GIMP_TYPE_OBJECT or a type derived from it.
+ *
+ * The returned list has the #GIMP_CONTAINER_POLICY_STRONG.
+ *
+ * Return value: a new #GimpList object
+ **/
+GimpContainer *
+gimp_list_new (GType    children_type,
+               gboolean unique_names)
+{
+  GimpList *list;
+
+  g_return_val_if_fail (g_type_is_a (children_type, GIMP_TYPE_OBJECT), NULL);
+
+  list = g_object_new (GIMP_TYPE_LIST,
+                       "children-type", children_type,
+                       "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                       "unique-names",  unique_names ? TRUE : FALSE,
+                       NULL);
+
+  /* for debugging purposes only */
+  gimp_object_set_static_name (GIMP_OBJECT (list), g_type_name (children_type));
+
+  return GIMP_CONTAINER (list);
+}
+
+/**
+ * gimp_list_new_weak:
+ * @children_type: the #GType of objects the list is going to hold
+ * @unique_names:  if the list should ensure that all its children
+ *                 have unique names.
+ *
+ * Creates a new #GimpList object. Since #GimpList is a #GimpContainer
+ * implementation, it holds GimpObjects. Thus @children_type must be
+ * GIMP_TYPE_OBJECT or a type derived from it.
+ *
+ * The returned list has the #GIMP_CONTAINER_POLICY_WEAK.
+ *
+ * Return value: a new #GimpList object
+ **/
+GimpContainer *
+gimp_list_new_weak (GType    children_type,
+                    gboolean unique_names)
+{
+  GimpList *list;
+
+  g_return_val_if_fail (g_type_is_a (children_type, GIMP_TYPE_OBJECT), NULL);
+
+  list = g_object_new (GIMP_TYPE_LIST,
+                       "children-type", children_type,
+                       "policy",        GIMP_CONTAINER_POLICY_WEAK,
+                       "unique-names",  unique_names ? TRUE : FALSE,
+                       NULL);
+
+  /* for debugging purposes only */
+  gimp_object_set_static_name (GIMP_OBJECT (list), g_type_name (children_type));
+
+  return GIMP_CONTAINER (list);
+}
+
+/**
+ * gimp_list_reverse:
+ * @list: a #GimpList
+ *
+ * Reverses the order of elements in a #GimpList.
+ **/
+void
+gimp_list_reverse (GimpList *list)
+{
+  g_return_if_fail (GIMP_IS_LIST (list));
+
+  if (gimp_container_get_n_children (GIMP_CONTAINER (list)) > 1)
+    {
+      gimp_container_freeze (GIMP_CONTAINER (list));
+      g_queue_reverse (list->queue);
+      gimp_container_thaw (GIMP_CONTAINER (list));
+    }
+}
+
+/**
+ * gimp_list_set_sort_func:
+ * @list:      a #GimpList
+ * @sort_func: a #GCompareFunc
+ *
+ * Sorts the elements of @list using gimp_list_sort() and remembers the
+ * passed @sort_func in order to keep the list ordered across inserting
+ * or renaming children.
+ **/
+void
+gimp_list_set_sort_func (GimpList     *list,
+                         GCompareFunc  sort_func)
+{
+  g_return_if_fail (GIMP_IS_LIST (list));
+
+  if (sort_func != list->sort_func)
+    {
+      if (sort_func)
+        gimp_list_sort (list, sort_func);
+
+      list->sort_func = sort_func;
+      g_object_notify (G_OBJECT (list), "sort-func");
+    }
+}
+
+/**
+ * gimp_list_get_sort_func:
+ * @list: a #GimpList
+ *
+ * Returns the @list's sort function, see gimp_list_set_sort_func().
+ *
+ * Return Value: The @list's sort function.
+ **/
+GCompareFunc
+gimp_list_get_sort_func (GimpList*list)
+{
+  g_return_val_if_fail (GIMP_IS_LIST (list), NULL);
+
+  return list->sort_func;
+}
+
+/**
+ * gimp_list_sort:
+ * @list: a #GimpList
+ * @sort_func: a #GCompareFunc
+ *
+ * Sorts the elements of a #GimpList according to the given @sort_func.
+ * See g_list_sort() for a detailed description of this function.
+ **/
+void
+gimp_list_sort (GimpList     *list,
+                GCompareFunc  sort_func)
+{
+  g_return_if_fail (GIMP_IS_LIST (list));
+  g_return_if_fail (sort_func != NULL);
+
+  if (gimp_container_get_n_children (GIMP_CONTAINER (list)) > 1)
+    {
+      gimp_container_freeze (GIMP_CONTAINER (list));
+      g_queue_sort (list->queue, gimp_list_sort_func, sort_func);
+      gimp_container_thaw (GIMP_CONTAINER (list));
+    }
+}
+
+/**
+ * gimp_list_sort_by_name:
+ * @list: a #GimpList
+ *
+ * Sorts the #GimpObject elements of a #GimpList by their names.
+ **/
+void
+gimp_list_sort_by_name (GimpList *list)
+{
+  g_return_if_fail (GIMP_IS_LIST (list));
+
+  gimp_list_sort (list, (GCompareFunc) gimp_object_name_collate);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_list_uniquefy_name (GimpList   *gimp_list,
+                         GimpObject *object)
+{
+  gchar *name = (gchar *) gimp_object_get_name (object);
+  GList *list;
+
+  if (! name)
+    return;
+
+  for (list = gimp_list->queue->head; list; list = g_list_next (list))
+    {
+      GimpObject  *object2 = list->data;
+      const gchar *name2   = gimp_object_get_name (object2);
+
+      if (object != object2 &&
+          name2             &&
+          ! strcmp (name, name2))
+        break;
+    }
+
+  if (list)
+    {
+      gchar *ext;
+      gchar *new_name   = NULL;
+      gint   unique_ext = 0;
+
+      name = g_strdup (name);
+
+      ext = strrchr (name, '#');
+
+      if (ext)
+        {
+          gchar ext_str[8];
+
+          unique_ext = atoi (ext + 1);
+
+          g_snprintf (ext_str, sizeof (ext_str), "%d", unique_ext);
+
+          /*  check if the extension really is of the form "#<n>"  */
+          if (! strcmp (ext_str, ext + 1))
+            {
+              if (ext > name && *(ext - 1) == ' ')
+                ext--;
+
+              *ext = '\0';
+            }
+          else
+            {
+              unique_ext = 0;
+            }
+        }
+
+      do
+        {
+          unique_ext++;
+
+          g_free (new_name);
+
+          new_name = g_strdup_printf ("%s #%d", name, unique_ext);
+
+          for (list = gimp_list->queue->head; list; list = g_list_next (list))
+            {
+              GimpObject  *object2 = list->data;
+              const gchar *name2   = gimp_object_get_name (object2);
+
+              if (object != object2 &&
+                  name2             &&
+                  ! strcmp (new_name, name2))
+                break;
+            }
+        }
+      while (list);
+
+      g_free (name);
+
+      gimp_object_take_name (object, new_name);
+    }
+}
+
+static void
+gimp_list_object_renamed (GimpObject *object,
+                          GimpList   *list)
+{
+  if (list->unique_names)
+    {
+      g_signal_handlers_block_by_func (object,
+                                       gimp_list_object_renamed,
+                                       list);
+
+      gimp_list_uniquefy_name (list, object);
+
+      g_signal_handlers_unblock_by_func (object,
+                                         gimp_list_object_renamed,
+                                         list);
+    }
+
+  if (list->sort_func)
+    {
+      GList *glist;
+      gint   old_index;
+      gint   new_index = 0;
+
+      old_index = g_queue_index (list->queue, object);
+
+      for (glist = list->queue->head; glist; glist = g_list_next (glist))
+        {
+          GimpObject *object2 = GIMP_OBJECT (glist->data);
+
+          if (object == object2)
+            continue;
+
+          if (list->sort_func (object, object2) > 0)
+            new_index++;
+          else
+            break;
+        }
+
+      if (new_index != old_index)
+        gimp_container_reorder (GIMP_CONTAINER (list), object, new_index);
+    }
+}
diff --git a/app/core/gimplist.h b/app/core/gimplist.h
new file mode 100644
index 0000000..194493e
--- /dev/null
+++ b/app/core/gimplist.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimplist.h
+ * Copyright (C) 2001-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LIST_H__
+#define __GIMP_LIST_H__
+
+
+#include "gimpcontainer.h"
+
+
+#define GIMP_TYPE_LIST            (gimp_list_get_type ())
+#define GIMP_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LIST, GimpList))
+#define GIMP_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LIST, GimpListClass))
+#define GIMP_IS_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LIST))
+#define GIMP_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LIST))
+#define GIMP_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LIST, GimpListClass))
+
+
+typedef struct _GimpListClass GimpListClass;
+
+struct _GimpList
+{
+  GimpContainer  parent_instance;
+
+  GQueue        *queue;
+  gboolean       unique_names;
+  GCompareFunc   sort_func;
+  gboolean       append;
+};
+
+struct _GimpListClass
+{
+  GimpContainerClass  parent_class;
+};
+
+
+GType           gimp_list_get_type      (void) G_GNUC_CONST;
+
+GimpContainer * gimp_list_new           (GType         children_type,
+                                         gboolean      unique_names);
+GimpContainer * gimp_list_new_weak      (GType         children_type,
+                                         gboolean      unique_names);
+
+void            gimp_list_reverse       (GimpList     *list);
+void            gimp_list_set_sort_func (GimpList     *list,
+                                         GCompareFunc  sort_func);
+GCompareFunc    gimp_list_get_sort_func (GimpList     *list);
+void            gimp_list_sort          (GimpList     *list,
+                                         GCompareFunc  sort_func);
+void            gimp_list_sort_by_name  (GimpList     *list);
+
+
+#endif  /* __GIMP_LIST_H__ */
diff --git a/app/core/gimpmarshal.c b/app/core/gimpmarshal.c
new file mode 100644
index 0000000..e4efb99
--- /dev/null
+++ b/app/core/gimpmarshal.c
@@ -0,0 +1,1901 @@
+/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
+#include <glib-object.h>
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+/* BOOLEAN: BOOLEAN (../../../app/core/gimpmarshal.list:25) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__BOOLEAN (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__BOOLEAN (GClosure     *closure,
+                               GValue       *return_value,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN) (gpointer data1,
+                                                     gboolean arg1,
+                                                     gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__BOOLEAN callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boolean (param_values + 1),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: DOUBLE (../../../app/core/gimpmarshal.list:26) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__DOUBLE (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__DOUBLE (GClosure     *closure,
+                              GValue       *return_value,
+                              guint         n_param_values,
+                              const GValue *param_values,
+                              gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__DOUBLE) (gpointer data1,
+                                                    gdouble arg1,
+                                                    gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__DOUBLE callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_double (param_values + 1),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: ENUM, INT (../../../app/core/gimpmarshal.list:27) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__ENUM_INT (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__ENUM_INT (GClosure     *closure,
+                                GValue       *return_value,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__ENUM_INT) (gpointer data1,
+                                                      gint arg1,
+                                                      gint arg2,
+                                                      gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__ENUM_INT callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__ENUM_INT) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_enum (param_values + 1),
+                       g_marshal_value_peek_int (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: INT, UINT, ENUM (../../../app/core/gimpmarshal.list:28) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__INT_UINT_ENUM (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__INT_UINT_ENUM (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint G_GNUC_UNUSED,
+                                     gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__INT_UINT_ENUM) (gpointer data1,
+                                                           gint arg1,
+                                                           guint arg2,
+                                                           gint arg3,
+                                                           gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__INT_UINT_ENUM callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__INT_UINT_ENUM) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_int (param_values + 1),
+                       g_marshal_value_peek_uint (param_values + 2),
+                       g_marshal_value_peek_enum (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: OBJECT (../../../app/core/gimpmarshal.list:29) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__OBJECT (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__OBJECT (GClosure     *closure,
+                              GValue       *return_value,
+                              guint         n_param_values,
+                              const GValue *param_values,
+                              gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer data1,
+                                                    gpointer arg1,
+                                                    gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__OBJECT callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_object (param_values + 1),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: OBJECT, POINTER (../../../app/core/gimpmarshal.list:30) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__OBJECT_POINTER (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__OBJECT_POINTER (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint G_GNUC_UNUSED,
+                                      gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT_POINTER) (gpointer data1,
+                                                            gpointer arg1,
+                                                            gpointer arg2,
+                                                            gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__OBJECT_POINTER callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_object (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: OBJECT, POINTER, STRING (../../../app/core/gimpmarshal.list:31) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure     *closure,
+                                                  GValue       *return_value,
+                                                  guint         n_param_values,
+                                                  const GValue *param_values,
+                                                  gpointer      invocation_hint,
+                                                  gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint G_GNUC_UNUSED,
+                                             gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT_POINTER_STRING) (gpointer data1,
+                                                                   gpointer arg1,
+                                                                   gpointer arg2,
+                                                                   gpointer arg3,
+                                                                   gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__OBJECT_POINTER_STRING callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__OBJECT_POINTER_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_object (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       g_marshal_value_peek_string (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: STRING (../../../app/core/gimpmarshal.list:32) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__STRING (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__STRING (GClosure     *closure,
+                              GValue       *return_value,
+                              guint         n_param_values,
+                              const GValue *param_values,
+                              gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING) (gpointer data1,
+                                                    gpointer arg1,
+                                                    gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__STRING callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN: STRING, FLAGS (../../../app/core/gimpmarshal.list:33) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_BOOLEAN__STRING_FLAGS (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_BOOLEAN__STRING_FLAGS (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint G_GNUC_UNUSED,
+                                    gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_FLAGS) (gpointer data1,
+                                                          gpointer arg1,
+                                                          guint arg2,
+                                                          gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__STRING_FLAGS callback;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_flags (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* INT: DOUBLE (../../../app/core/gimpmarshal.list:35) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_INT__DOUBLE (GClosure     *closure,
+                               GValue       *return_value,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint,
+                               gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_INT__DOUBLE (GClosure     *closure,
+                          GValue       *return_value,
+                          guint         n_param_values,
+                          const GValue *param_values,
+                          gpointer      invocation_hint G_GNUC_UNUSED,
+                          gpointer      marshal_data)
+{
+  typedef gint (*GMarshalFunc_INT__DOUBLE) (gpointer data1,
+                                            gdouble arg1,
+                                            gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_INT__DOUBLE callback;
+  gint v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_INT__DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_double (param_values + 1),
+                       data2);
+
+  g_value_set_int (return_value, v_return);
+}
+
+/* VOID: BOOLEAN (../../../app/core/gimpmarshal.list:37) */
+#define gimp_marshal_VOID__BOOLEAN	g_cclosure_marshal_VOID__BOOLEAN
+
+/* VOID: BOOLEAN, INT, INT, INT, INT (../../../app/core/gimpmarshal.list:38) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__BOOLEAN_INT_INT_INT_INT (GClosure     *closure,
+                                                 GValue       *return_value,
+                                                 guint         n_param_values,
+                                                 const GValue *param_values,
+                                                 gpointer      invocation_hint,
+                                                 gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__BOOLEAN_INT_INT_INT_INT (GClosure     *closure,
+                                            GValue       *return_value G_GNUC_UNUSED,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint G_GNUC_UNUSED,
+                                            gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__BOOLEAN_INT_INT_INT_INT) (gpointer data1,
+                                                              gboolean arg1,
+                                                              gint arg2,
+                                                              gint arg3,
+                                                              gint arg4,
+                                                              gint arg5,
+                                                              gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__BOOLEAN_INT_INT_INT_INT callback;
+
+  g_return_if_fail (n_param_values == 6);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__BOOLEAN_INT_INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_boolean (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_int (param_values + 3),
+            g_marshal_value_peek_int (param_values + 4),
+            g_marshal_value_peek_int (param_values + 5),
+            data2);
+}
+
+/* VOID: BOXED (../../../app/core/gimpmarshal.list:39) */
+#define gimp_marshal_VOID__BOXED	g_cclosure_marshal_VOID__BOXED
+
+/* VOID: BOXED, ENUM (../../../app/core/gimpmarshal.list:40) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__BOXED_ENUM (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__BOXED_ENUM (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__BOXED_ENUM) (gpointer data1,
+                                                 gpointer arg1,
+                                                 gint arg2,
+                                                 gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__BOXED_ENUM callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__BOXED_ENUM) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_boxed (param_values + 1),
+            g_marshal_value_peek_enum (param_values + 2),
+            data2);
+}
+
+/* VOID: DOUBLE (../../../app/core/gimpmarshal.list:41) */
+#define gimp_marshal_VOID__DOUBLE	g_cclosure_marshal_VOID__DOUBLE
+
+/* VOID: DOUBLE, DOUBLE (../../../app/core/gimpmarshal.list:42) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__DOUBLE_DOUBLE (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__DOUBLE_DOUBLE (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1,
+                                                    gdouble arg1,
+                                                    gdouble arg2,
+                                                    gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__DOUBLE_DOUBLE callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__DOUBLE_DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_double (param_values + 1),
+            g_marshal_value_peek_double (param_values + 2),
+            data2);
+}
+
+/* VOID: DOUBLE, DOUBLE, DOUBLE, DOUBLE (../../../app/core/gimpmarshal.list:43) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE (GClosure     *closure,
+                                                     GValue       *return_value,
+                                                     guint         n_param_values,
+                                                     const GValue *param_values,
+                                                     gpointer      invocation_hint,
+                                                     gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE (GClosure     *closure,
+                                                GValue       *return_value G_GNUC_UNUSED,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                                gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE) (gpointer data1,
+                                                                  gdouble arg1,
+                                                                  gdouble arg2,
+                                                                  gdouble arg3,
+                                                                  gdouble arg4,
+                                                                  gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE callback;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_double (param_values + 1),
+            g_marshal_value_peek_double (param_values + 2),
+            g_marshal_value_peek_double (param_values + 3),
+            g_marshal_value_peek_double (param_values + 4),
+            data2);
+}
+
+/* VOID: ENUM (../../../app/core/gimpmarshal.list:44) */
+#define gimp_marshal_VOID__ENUM	g_cclosure_marshal_VOID__ENUM
+
+/* VOID: ENUM, INT (../../../app/core/gimpmarshal.list:45) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__ENUM_INT (GClosure     *closure,
+                                  GValue       *return_value,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint,
+                                  gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__ENUM_INT (GClosure     *closure,
+                             GValue       *return_value G_GNUC_UNUSED,
+                             guint         n_param_values,
+                             const GValue *param_values,
+                             gpointer      invocation_hint G_GNUC_UNUSED,
+                             gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM_INT) (gpointer data1,
+                                               gint arg1,
+                                               gint arg2,
+                                               gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__ENUM_INT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_enum (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            data2);
+}
+
+/* VOID: ENUM, INT, BOOLEAN (../../../app/core/gimpmarshal.list:46) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__ENUM_INT_BOOLEAN (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__ENUM_INT_BOOLEAN (GClosure     *closure,
+                                     GValue       *return_value G_GNUC_UNUSED,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint G_GNUC_UNUSED,
+                                     gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM_INT_BOOLEAN) (gpointer data1,
+                                                       gint arg1,
+                                                       gint arg2,
+                                                       gboolean arg3,
+                                                       gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__ENUM_INT_BOOLEAN callback;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM_INT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_enum (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_boolean (param_values + 3),
+            data2);
+}
+
+/* VOID: ENUM, OBJECT (../../../app/core/gimpmarshal.list:47) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__ENUM_OBJECT (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__ENUM_OBJECT (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM_OBJECT) (gpointer data1,
+                                                  gint arg1,
+                                                  gpointer arg2,
+                                                  gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__ENUM_OBJECT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_enum (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/* VOID: ENUM, POINTER (../../../app/core/gimpmarshal.list:48) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__ENUM_POINTER (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__ENUM_POINTER (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM_POINTER) (gpointer data1,
+                                                   gint arg1,
+                                                   gpointer arg2,
+                                                   gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__ENUM_POINTER callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_enum (param_values + 1),
+            g_marshal_value_peek_pointer (param_values + 2),
+            data2);
+}
+
+/* VOID: FLAGS (../../../app/core/gimpmarshal.list:49) */
+#define gimp_marshal_VOID__FLAGS	g_cclosure_marshal_VOID__FLAGS
+
+/* VOID: INT (../../../app/core/gimpmarshal.list:50) */
+#define gimp_marshal_VOID__INT	g_cclosure_marshal_VOID__INT
+
+/* VOID: INT, BOOLEAN (../../../app/core/gimpmarshal.list:51) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__INT_BOOLEAN (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__INT_BOOLEAN (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_BOOLEAN) (gpointer data1,
+                                                  gint arg1,
+                                                  gboolean arg2,
+                                                  gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_BOOLEAN callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_boolean (param_values + 2),
+            data2);
+}
+
+/* VOID: INT, INT (../../../app/core/gimpmarshal.list:52) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__INT_INT (GClosure     *closure,
+                                 GValue       *return_value,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint,
+                                 gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__INT_INT (GClosure     *closure,
+                            GValue       *return_value G_GNUC_UNUSED,
+                            guint         n_param_values,
+                            const GValue *param_values,
+                            gpointer      invocation_hint G_GNUC_UNUSED,
+                            gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
+                                              gint arg1,
+                                              gint arg2,
+                                              gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_INT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            data2);
+}
+
+/* VOID: INT, INT, INT, INT (../../../app/core/gimpmarshal.list:53) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
+                                    GValue       *return_value G_GNUC_UNUSED,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint G_GNUC_UNUSED,
+                                    gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1,
+                                                      gint arg1,
+                                                      gint arg2,
+                                                      gint arg3,
+                                                      gint arg4,
+                                                      gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_INT_INT_INT callback;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_int (param_values + 3),
+            g_marshal_value_peek_int (param_values + 4),
+            data2);
+}
+
+/* VOID: INT, INT, BOOLEAN, BOOLEAN (../../../app/core/gimpmarshal.list:54) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__INT_INT_BOOLEAN_BOOLEAN (GClosure     *closure,
+                                                 GValue       *return_value,
+                                                 guint         n_param_values,
+                                                 const GValue *param_values,
+                                                 gpointer      invocation_hint,
+                                                 gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__INT_INT_BOOLEAN_BOOLEAN (GClosure     *closure,
+                                            GValue       *return_value G_GNUC_UNUSED,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint G_GNUC_UNUSED,
+                                            gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT_BOOLEAN_BOOLEAN) (gpointer data1,
+                                                              gint arg1,
+                                                              gint arg2,
+                                                              gboolean arg3,
+                                                              gboolean arg4,
+                                                              gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_INT_BOOLEAN_BOOLEAN callback;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_boolean (param_values + 3),
+            g_marshal_value_peek_boolean (param_values + 4),
+            data2);
+}
+
+/* VOID: INT, OBJECT (../../../app/core/gimpmarshal.list:55) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__INT_OBJECT (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__INT_OBJECT (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1,
+                                                 gint arg1,
+                                                 gpointer arg2,
+                                                 gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_OBJECT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/* VOID: OBJECT (../../../app/core/gimpmarshal.list:56) */
+#define gimp_marshal_VOID__OBJECT	g_cclosure_marshal_VOID__OBJECT
+
+/* VOID: OBJECT, BOOLEAN (../../../app/core/gimpmarshal.list:57) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__OBJECT_BOOLEAN (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__OBJECT_BOOLEAN (GClosure     *closure,
+                                   GValue       *return_value G_GNUC_UNUSED,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                   gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1,
+                                                     gpointer arg1,
+                                                     gboolean arg2,
+                                                     gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__OBJECT_BOOLEAN callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_boolean (param_values + 2),
+            data2);
+}
+
+/* VOID: OBJECT, INT (../../../app/core/gimpmarshal.list:58) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__OBJECT_INT (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__OBJECT_INT (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_INT) (gpointer data1,
+                                                 gpointer arg1,
+                                                 gint arg2,
+                                                 gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__OBJECT_INT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            data2);
+}
+
+/* VOID: OBJECT, OBJECT (../../../app/core/gimpmarshal.list:59) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
+                                                    gpointer arg1,
+                                                    gpointer arg2,
+                                                    gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__OBJECT_OBJECT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/* VOID: OBJECT, POINTER (../../../app/core/gimpmarshal.list:60) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                   GValue       *return_value G_GNUC_UNUSED,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                   gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer data1,
+                                                     gpointer arg1,
+                                                     gpointer arg2,
+                                                     gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__OBJECT_POINTER callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_pointer (param_values + 2),
+            data2);
+}
+
+/* VOID: OBJECT, STRING, STRING (../../../app/core/gimpmarshal.list:61) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__OBJECT_STRING_STRING (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__OBJECT_STRING_STRING (GClosure     *closure,
+                                         GValue       *return_value G_GNUC_UNUSED,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint G_GNUC_UNUSED,
+                                         gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_STRING_STRING) (gpointer data1,
+                                                           gpointer arg1,
+                                                           gpointer arg2,
+                                                           gpointer arg3,
+                                                           gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__OBJECT_STRING_STRING callback;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_string (param_values + 2),
+            g_marshal_value_peek_string (param_values + 3),
+            data2);
+}
+
+/* VOID: POINTER (../../../app/core/gimpmarshal.list:62) */
+#define gimp_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
+
+/* VOID: POINTER, BOXED (../../../app/core/gimpmarshal.list:63) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__POINTER_BOXED (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__POINTER_BOXED (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__POINTER_BOXED) (gpointer data1,
+                                                    gpointer arg1,
+                                                    gpointer arg2,
+                                                    gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__POINTER_BOXED callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_pointer (param_values + 1),
+            g_marshal_value_peek_boxed (param_values + 2),
+            data2);
+}
+
+/* VOID: POINTER, ENUM (../../../app/core/gimpmarshal.list:64) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__POINTER_ENUM (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__POINTER_ENUM (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__POINTER_ENUM) (gpointer data1,
+                                                   gpointer arg1,
+                                                   gint arg2,
+                                                   gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__POINTER_ENUM callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__POINTER_ENUM) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_pointer (param_values + 1),
+            g_marshal_value_peek_enum (param_values + 2),
+            data2);
+}
+
+/* VOID: POINTER, FLAGS, BOOLEAN (../../../app/core/gimpmarshal.list:65) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__POINTER_FLAGS_BOOLEAN (GClosure     *closure,
+                                               GValue       *return_value,
+                                               guint         n_param_values,
+                                               const GValue *param_values,
+                                               gpointer      invocation_hint,
+                                               gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__POINTER_FLAGS_BOOLEAN (GClosure     *closure,
+                                          GValue       *return_value G_GNUC_UNUSED,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint G_GNUC_UNUSED,
+                                          gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__POINTER_FLAGS_BOOLEAN) (gpointer data1,
+                                                            gpointer arg1,
+                                                            guint arg2,
+                                                            gboolean arg3,
+                                                            gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__POINTER_FLAGS_BOOLEAN callback;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__POINTER_FLAGS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_pointer (param_values + 1),
+            g_marshal_value_peek_flags (param_values + 2),
+            g_marshal_value_peek_boolean (param_values + 3),
+            data2);
+}
+
+/* VOID: POINTER, OBJECT, ENUM, POINTER, POINTER, BOXED (../../../app/core/gimpmarshal.list:66) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED (GClosure     *closure,
+                                                                   GValue       *return_value,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint,
+                                                                   gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED (GClosure     *closure,
+                                                              GValue       *return_value G_GNUC_UNUSED,
+                                                              guint         n_param_values,
+                                                              const GValue *param_values,
+                                                              gpointer      invocation_hint G_GNUC_UNUSED,
+                                                              gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED) (gpointer data1,
+                                                                                gpointer arg1,
+                                                                                gpointer arg2,
+                                                                                gint arg3,
+                                                                                gpointer arg4,
+                                                                                gpointer arg5,
+                                                                                gpointer arg6,
+                                                                                gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED callback;
+
+  g_return_if_fail (n_param_values == 7);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_pointer (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            g_marshal_value_peek_enum (param_values + 3),
+            g_marshal_value_peek_pointer (param_values + 4),
+            g_marshal_value_peek_pointer (param_values + 5),
+            g_marshal_value_peek_boxed (param_values + 6),
+            data2);
+}
+
+/* VOID: POINTER, UINT, FLAGS (../../../app/core/gimpmarshal.list:67) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__POINTER_UINT_FLAGS (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__POINTER_UINT_FLAGS (GClosure     *closure,
+                                       GValue       *return_value G_GNUC_UNUSED,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                       gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__POINTER_UINT_FLAGS) (gpointer data1,
+                                                         gpointer arg1,
+                                                         guint arg2,
+                                                         guint arg3,
+                                                         gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__POINTER_UINT_FLAGS callback;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__POINTER_UINT_FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_pointer (param_values + 1),
+            g_marshal_value_peek_uint (param_values + 2),
+            g_marshal_value_peek_flags (param_values + 3),
+            data2);
+}
+
+/* VOID: STRING (../../../app/core/gimpmarshal.list:68) */
+#define gimp_marshal_VOID__STRING	g_cclosure_marshal_VOID__STRING
+
+/* VOID: STRING, BOOLEAN, UINT, FLAGS (../../../app/core/gimpmarshal.list:69) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS (GClosure     *closure,
+                                                   GValue       *return_value,
+                                                   guint         n_param_values,
+                                                   const GValue *param_values,
+                                                   gpointer      invocation_hint,
+                                                   gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS (GClosure     *closure,
+                                              GValue       *return_value G_GNUC_UNUSED,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint G_GNUC_UNUSED,
+                                              gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN_UINT_FLAGS) (gpointer data1,
+                                                                gpointer arg1,
+                                                                gboolean arg2,
+                                                                guint arg3,
+                                                                guint arg4,
+                                                                gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__STRING_BOOLEAN_UINT_FLAGS callback;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING_BOOLEAN_UINT_FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_string (param_values + 1),
+            g_marshal_value_peek_boolean (param_values + 2),
+            g_marshal_value_peek_uint (param_values + 3),
+            g_marshal_value_peek_flags (param_values + 4),
+            data2);
+}
+
+/* VOID: STRING, DOUBLE, STRING, DOUBLE, STRING (../../../app/core/gimpmarshal.list:70) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING (GClosure     *closure,
+                                                            GValue       *return_value,
+                                                            guint         n_param_values,
+                                                            const GValue *param_values,
+                                                            gpointer      invocation_hint,
+                                                            gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING (GClosure     *closure,
+                                                       GValue       *return_value G_GNUC_UNUSED,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                                       gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING) (gpointer data1,
+                                                                         gpointer arg1,
+                                                                         gdouble arg2,
+                                                                         gpointer arg3,
+                                                                         gdouble arg4,
+                                                                         gpointer arg5,
+                                                                         gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING callback;
+
+  g_return_if_fail (n_param_values == 6);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_string (param_values + 1),
+            g_marshal_value_peek_double (param_values + 2),
+            g_marshal_value_peek_string (param_values + 3),
+            g_marshal_value_peek_double (param_values + 4),
+            g_marshal_value_peek_string (param_values + 5),
+            data2);
+}
+
+/* VOID: STRING, FLAGS (../../../app/core/gimpmarshal.list:71) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__STRING_FLAGS (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__STRING_FLAGS (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__STRING_FLAGS) (gpointer data1,
+                                                   gpointer arg1,
+                                                   guint arg2,
+                                                   gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__STRING_FLAGS callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING_FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_string (param_values + 1),
+            g_marshal_value_peek_flags (param_values + 2),
+            data2);
+}
+
+/* VOID: STRING, STRING, STRING (../../../app/core/gimpmarshal.list:72) */
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+extern
+void gimp_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+G_END_DECLS
+void
+gimp_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
+                                         GValue       *return_value G_GNUC_UNUSED,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint G_GNUC_UNUSED,
+                                         gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1,
+                                                           gpointer arg1,
+                                                           gpointer arg2,
+                                                           gpointer arg3,
+                                                           gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__STRING_STRING_STRING callback;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_string (param_values + 1),
+            g_marshal_value_peek_string (param_values + 2),
+            g_marshal_value_peek_string (param_values + 3),
+            data2);
+}
+
+/* VOID: VARIANT (../../../app/core/gimpmarshal.list:73) */
+#define gimp_marshal_VOID__VARIANT	g_cclosure_marshal_VOID__VARIANT
+
+/* VOID: VOID (../../../app/core/gimpmarshal.list:74) */
+#define gimp_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
+
diff --git a/app/core/gimpmarshal.h b/app/core/gimpmarshal.h
new file mode 100644
index 0000000..e8247a2
--- /dev/null
+++ b/app/core/gimpmarshal.h
@@ -0,0 +1,378 @@
+/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
+#ifndef __GIMP_MARSHAL_MARSHAL_H__
+#define __GIMP_MARSHAL_MARSHAL_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* BOOLEAN: BOOLEAN (../../../app/core/gimpmarshal.list:25) */
+extern
+void gimp_marshal_BOOLEAN__BOOLEAN (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+
+/* BOOLEAN: DOUBLE (../../../app/core/gimpmarshal.list:26) */
+extern
+void gimp_marshal_BOOLEAN__DOUBLE (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+
+/* BOOLEAN: ENUM, INT (../../../app/core/gimpmarshal.list:27) */
+extern
+void gimp_marshal_BOOLEAN__ENUM_INT (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+
+/* BOOLEAN: INT, UINT, ENUM (../../../app/core/gimpmarshal.list:28) */
+extern
+void gimp_marshal_BOOLEAN__INT_UINT_ENUM (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+
+/* BOOLEAN: OBJECT (../../../app/core/gimpmarshal.list:29) */
+extern
+void gimp_marshal_BOOLEAN__OBJECT (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+
+/* BOOLEAN: OBJECT, POINTER (../../../app/core/gimpmarshal.list:30) */
+extern
+void gimp_marshal_BOOLEAN__OBJECT_POINTER (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+/* BOOLEAN: OBJECT, POINTER, STRING (../../../app/core/gimpmarshal.list:31) */
+extern
+void gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure     *closure,
+                                                  GValue       *return_value,
+                                                  guint         n_param_values,
+                                                  const GValue *param_values,
+                                                  gpointer      invocation_hint,
+                                                  gpointer      marshal_data);
+
+/* BOOLEAN: STRING (../../../app/core/gimpmarshal.list:32) */
+extern
+void gimp_marshal_BOOLEAN__STRING (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+
+/* BOOLEAN: STRING, FLAGS (../../../app/core/gimpmarshal.list:33) */
+extern
+void gimp_marshal_BOOLEAN__STRING_FLAGS (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
+
+/* INT: DOUBLE (../../../app/core/gimpmarshal.list:35) */
+extern
+void gimp_marshal_INT__DOUBLE (GClosure     *closure,
+                               GValue       *return_value,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint,
+                               gpointer      marshal_data);
+
+/* VOID: BOOLEAN (../../../app/core/gimpmarshal.list:37) */
+#define gimp_marshal_VOID__BOOLEAN	g_cclosure_marshal_VOID__BOOLEAN
+
+/* VOID: BOOLEAN, INT, INT, INT, INT (../../../app/core/gimpmarshal.list:38) */
+extern
+void gimp_marshal_VOID__BOOLEAN_INT_INT_INT_INT (GClosure     *closure,
+                                                 GValue       *return_value,
+                                                 guint         n_param_values,
+                                                 const GValue *param_values,
+                                                 gpointer      invocation_hint,
+                                                 gpointer      marshal_data);
+
+/* VOID: BOXED (../../../app/core/gimpmarshal.list:39) */
+#define gimp_marshal_VOID__BOXED	g_cclosure_marshal_VOID__BOXED
+
+/* VOID: BOXED, ENUM (../../../app/core/gimpmarshal.list:40) */
+extern
+void gimp_marshal_VOID__BOXED_ENUM (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+
+/* VOID: DOUBLE (../../../app/core/gimpmarshal.list:41) */
+#define gimp_marshal_VOID__DOUBLE	g_cclosure_marshal_VOID__DOUBLE
+
+/* VOID: DOUBLE, DOUBLE (../../../app/core/gimpmarshal.list:42) */
+extern
+void gimp_marshal_VOID__DOUBLE_DOUBLE (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+
+/* VOID: DOUBLE, DOUBLE, DOUBLE, DOUBLE (../../../app/core/gimpmarshal.list:43) */
+extern
+void gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE (GClosure     *closure,
+                                                     GValue       *return_value,
+                                                     guint         n_param_values,
+                                                     const GValue *param_values,
+                                                     gpointer      invocation_hint,
+                                                     gpointer      marshal_data);
+
+/* VOID: ENUM (../../../app/core/gimpmarshal.list:44) */
+#define gimp_marshal_VOID__ENUM	g_cclosure_marshal_VOID__ENUM
+
+/* VOID: ENUM, INT (../../../app/core/gimpmarshal.list:45) */
+extern
+void gimp_marshal_VOID__ENUM_INT (GClosure     *closure,
+                                  GValue       *return_value,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint,
+                                  gpointer      marshal_data);
+
+/* VOID: ENUM, INT, BOOLEAN (../../../app/core/gimpmarshal.list:46) */
+extern
+void gimp_marshal_VOID__ENUM_INT_BOOLEAN (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+
+/* VOID: ENUM, OBJECT (../../../app/core/gimpmarshal.list:47) */
+extern
+void gimp_marshal_VOID__ENUM_OBJECT (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+
+/* VOID: ENUM, POINTER (../../../app/core/gimpmarshal.list:48) */
+extern
+void gimp_marshal_VOID__ENUM_POINTER (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+
+/* VOID: FLAGS (../../../app/core/gimpmarshal.list:49) */
+#define gimp_marshal_VOID__FLAGS	g_cclosure_marshal_VOID__FLAGS
+
+/* VOID: INT (../../../app/core/gimpmarshal.list:50) */
+#define gimp_marshal_VOID__INT	g_cclosure_marshal_VOID__INT
+
+/* VOID: INT, BOOLEAN (../../../app/core/gimpmarshal.list:51) */
+extern
+void gimp_marshal_VOID__INT_BOOLEAN (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+
+/* VOID: INT, INT (../../../app/core/gimpmarshal.list:52) */
+extern
+void gimp_marshal_VOID__INT_INT (GClosure     *closure,
+                                 GValue       *return_value,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint,
+                                 gpointer      marshal_data);
+
+/* VOID: INT, INT, INT, INT (../../../app/core/gimpmarshal.list:53) */
+extern
+void gimp_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
+
+/* VOID: INT, INT, BOOLEAN, BOOLEAN (../../../app/core/gimpmarshal.list:54) */
+extern
+void gimp_marshal_VOID__INT_INT_BOOLEAN_BOOLEAN (GClosure     *closure,
+                                                 GValue       *return_value,
+                                                 guint         n_param_values,
+                                                 const GValue *param_values,
+                                                 gpointer      invocation_hint,
+                                                 gpointer      marshal_data);
+
+/* VOID: INT, OBJECT (../../../app/core/gimpmarshal.list:55) */
+extern
+void gimp_marshal_VOID__INT_OBJECT (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+
+/* VOID: OBJECT (../../../app/core/gimpmarshal.list:56) */
+#define gimp_marshal_VOID__OBJECT	g_cclosure_marshal_VOID__OBJECT
+
+/* VOID: OBJECT, BOOLEAN (../../../app/core/gimpmarshal.list:57) */
+extern
+void gimp_marshal_VOID__OBJECT_BOOLEAN (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
+/* VOID: OBJECT, INT (../../../app/core/gimpmarshal.list:58) */
+extern
+void gimp_marshal_VOID__OBJECT_INT (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+
+/* VOID: OBJECT, OBJECT (../../../app/core/gimpmarshal.list:59) */
+extern
+void gimp_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+
+/* VOID: OBJECT, POINTER (../../../app/core/gimpmarshal.list:60) */
+extern
+void gimp_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
+/* VOID: OBJECT, STRING, STRING (../../../app/core/gimpmarshal.list:61) */
+extern
+void gimp_marshal_VOID__OBJECT_STRING_STRING (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID: POINTER (../../../app/core/gimpmarshal.list:62) */
+#define gimp_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
+
+/* VOID: POINTER, BOXED (../../../app/core/gimpmarshal.list:63) */
+extern
+void gimp_marshal_VOID__POINTER_BOXED (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+
+/* VOID: POINTER, ENUM (../../../app/core/gimpmarshal.list:64) */
+extern
+void gimp_marshal_VOID__POINTER_ENUM (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+
+/* VOID: POINTER, FLAGS, BOOLEAN (../../../app/core/gimpmarshal.list:65) */
+extern
+void gimp_marshal_VOID__POINTER_FLAGS_BOOLEAN (GClosure     *closure,
+                                               GValue       *return_value,
+                                               guint         n_param_values,
+                                               const GValue *param_values,
+                                               gpointer      invocation_hint,
+                                               gpointer      marshal_data);
+
+/* VOID: POINTER, OBJECT, ENUM, POINTER, POINTER, BOXED (../../../app/core/gimpmarshal.list:66) */
+extern
+void gimp_marshal_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED (GClosure     *closure,
+                                                                   GValue       *return_value,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint,
+                                                                   gpointer      marshal_data);
+
+/* VOID: POINTER, UINT, FLAGS (../../../app/core/gimpmarshal.list:67) */
+extern
+void gimp_marshal_VOID__POINTER_UINT_FLAGS (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID: STRING (../../../app/core/gimpmarshal.list:68) */
+#define gimp_marshal_VOID__STRING	g_cclosure_marshal_VOID__STRING
+
+/* VOID: STRING, BOOLEAN, UINT, FLAGS (../../../app/core/gimpmarshal.list:69) */
+extern
+void gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS (GClosure     *closure,
+                                                   GValue       *return_value,
+                                                   guint         n_param_values,
+                                                   const GValue *param_values,
+                                                   gpointer      invocation_hint,
+                                                   gpointer      marshal_data);
+
+/* VOID: STRING, DOUBLE, STRING, DOUBLE, STRING (../../../app/core/gimpmarshal.list:70) */
+extern
+void gimp_marshal_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING (GClosure     *closure,
+                                                            GValue       *return_value,
+                                                            guint         n_param_values,
+                                                            const GValue *param_values,
+                                                            gpointer      invocation_hint,
+                                                            gpointer      marshal_data);
+
+/* VOID: STRING, FLAGS (../../../app/core/gimpmarshal.list:71) */
+extern
+void gimp_marshal_VOID__STRING_FLAGS (GClosure     *closure,
+                                      GValue       *return_value,
+                                      guint         n_param_values,
+                                      const GValue *param_values,
+                                      gpointer      invocation_hint,
+                                      gpointer      marshal_data);
+
+/* VOID: STRING, STRING, STRING (../../../app/core/gimpmarshal.list:72) */
+extern
+void gimp_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID: VARIANT (../../../app/core/gimpmarshal.list:73) */
+#define gimp_marshal_VOID__VARIANT	g_cclosure_marshal_VOID__VARIANT
+
+/* VOID: VOID (../../../app/core/gimpmarshal.list:74) */
+#define gimp_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
+
+
+G_END_DECLS
+
+#endif /* __GIMP_MARSHAL_MARSHAL_H__ */
diff --git a/app/core/gimpmarshal.list b/app/core/gimpmarshal.list
new file mode 100644
index 0000000..f09116e
--- /dev/null
+++ b/app/core/gimpmarshal.list
@@ -0,0 +1,74 @@
+# see glib-genmarshal(1) for a detailed description of the file format,
+# possible parameter types are:
+#   VOID        indicates   no   return   type,  or  no  extra
+#               parameters. if VOID is used as  the  parameter
+#               list, no additional parameters may be present.
+#   BOOLEAN     for boolean types (gboolean)
+#   CHAR        for signed char types (gchar)
+#   UCHAR       for unsigned char types (guchar)
+#   INT         for signed integer types (gint)
+#   UINT        for unsigned integer types (guint)
+#   LONG        for signed long integer types (glong)
+#   ULONG       for unsigned long integer types (gulong)
+#   ENUM        for enumeration types (gint)
+#   FLAGS       for flag enumeration types (guint)
+#   FLOAT       for single-precision float types (gfloat)
+#   DOUBLE      for double-precision float types (gdouble)
+#   STRING      for string types (gchar*)
+#   BOXED       for boxed (anonymous but reference counted) types (GBoxed*)
+#   POINTER     for anonymous pointer types (gpointer)
+#   PARAM       for GParamSpec or derived types  (GParamSpec*)
+#   OBJECT      for GObject or derived types (GObject*)
+#   NONE        deprecated alias for VOID
+#   BOOL        deprecated alias for BOOLEAN
+
+BOOLEAN: BOOLEAN
+BOOLEAN: DOUBLE
+BOOLEAN: ENUM, INT
+BOOLEAN: INT, UINT, ENUM
+BOOLEAN: OBJECT
+BOOLEAN: OBJECT, POINTER
+BOOLEAN: OBJECT, POINTER, STRING
+BOOLEAN: STRING
+BOOLEAN: STRING, FLAGS
+
+INT: DOUBLE
+
+VOID: BOOLEAN
+VOID: BOOLEAN, INT, INT, INT, INT
+VOID: BOXED
+VOID: BOXED, ENUM
+VOID: DOUBLE
+VOID: DOUBLE, DOUBLE
+VOID: DOUBLE, DOUBLE, DOUBLE, DOUBLE
+VOID: ENUM
+VOID: ENUM, INT
+VOID: ENUM, INT, BOOLEAN
+VOID: ENUM, OBJECT
+VOID: ENUM, POINTER
+VOID: FLAGS
+VOID: INT
+VOID: INT, BOOLEAN
+VOID: INT, INT
+VOID: INT, INT, INT, INT
+VOID: INT, INT, BOOLEAN, BOOLEAN
+VOID: INT, OBJECT
+VOID: OBJECT
+VOID: OBJECT, BOOLEAN
+VOID: OBJECT, INT
+VOID: OBJECT, OBJECT
+VOID: OBJECT, POINTER
+VOID: OBJECT, STRING, STRING
+VOID: POINTER
+VOID: POINTER, BOXED
+VOID: POINTER, ENUM
+VOID: POINTER, FLAGS, BOOLEAN
+VOID: POINTER, OBJECT, ENUM, POINTER, POINTER, BOXED
+VOID: POINTER, UINT, FLAGS
+VOID: STRING
+VOID: STRING, BOOLEAN, UINT, FLAGS
+VOID: STRING, DOUBLE, STRING, DOUBLE, STRING
+VOID: STRING, FLAGS
+VOID: STRING, STRING, STRING
+VOID: VARIANT
+VOID: VOID
diff --git a/app/core/gimpmaskundo.c b/app/core/gimpmaskundo.c
new file mode 100644
index 0000000..d388ee5
--- /dev/null
+++ b/app/core/gimpmaskundo.c
@@ -0,0 +1,292 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimp-memsize.h"
+#include "gimpchannel.h"
+#include "gimpmaskundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONVERT_FORMAT
+};
+
+
+static void     gimp_mask_undo_constructed  (GObject             *object);
+static void     gimp_mask_undo_set_property (GObject             *object,
+                                             guint                property_id,
+                                             const GValue        *value,
+                                             GParamSpec          *pspec);
+static void     gimp_mask_undo_get_property (GObject             *object,
+                                             guint                property_id,
+                                             GValue              *value,
+                                             GParamSpec          *pspec);
+
+static gint64   gimp_mask_undo_get_memsize  (GimpObject          *object,
+                                             gint64              *gui_size);
+
+static void     gimp_mask_undo_pop          (GimpUndo            *undo,
+                                             GimpUndoMode         undo_mode,
+                                             GimpUndoAccumulator *accum);
+static void     gimp_mask_undo_free         (GimpUndo            *undo,
+                                             GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpMaskUndo, gimp_mask_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_mask_undo_parent_class
+
+
+static void
+gimp_mask_undo_class_init (GimpMaskUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_mask_undo_constructed;
+  object_class->set_property     = gimp_mask_undo_set_property;
+  object_class->get_property     = gimp_mask_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_mask_undo_get_memsize;
+
+  undo_class->pop                = gimp_mask_undo_pop;
+  undo_class->free               = gimp_mask_undo_free;
+
+  g_object_class_install_property (object_class, PROP_CONVERT_FORMAT,
+                                   g_param_spec_boolean ("convert-format",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_mask_undo_init (GimpMaskUndo *undo)
+{
+}
+
+static void
+gimp_mask_undo_constructed (GObject *object)
+{
+  GimpMaskUndo *mask_undo = GIMP_MASK_UNDO (object);
+  GimpItem     *item;
+  GimpDrawable *drawable;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CHANNEL (GIMP_ITEM_UNDO (object)->item));
+
+  item     = GIMP_ITEM_UNDO (object)->item;
+  drawable = GIMP_DRAWABLE (item);
+
+  mask_undo->format = gimp_drawable_get_format (drawable);
+
+  if (gimp_item_bounds (item,
+                        &mask_undo->bounds.x,
+                        &mask_undo->bounds.y,
+                        &mask_undo->bounds.width,
+                        &mask_undo->bounds.height))
+    {
+      GeglBuffer    *buffer = gimp_drawable_get_buffer (drawable);
+      GeglRectangle  rect;
+
+      gegl_rectangle_align_to_buffer (&rect, &mask_undo->bounds, buffer,
+                                      GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      mask_undo->buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                           rect.width,
+                                                           rect.height),
+                                           mask_undo->format);
+
+      gimp_gegl_buffer_copy (buffer, &rect, GEGL_ABYSS_NONE,
+                             mask_undo->buffer, GEGL_RECTANGLE (0, 0, 0, 0));
+
+      mask_undo->x = rect.x;
+      mask_undo->y = rect.y;
+    }
+}
+
+static void
+gimp_mask_undo_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpMaskUndo *mask_undo = GIMP_MASK_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_CONVERT_FORMAT:
+      mask_undo->convert_format = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mask_undo_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpMaskUndo *mask_undo = GIMP_MASK_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_CONVERT_FORMAT:
+      g_value_set_boolean (value, mask_undo->convert_format);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_mask_undo_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpMaskUndo *mask_undo = GIMP_MASK_UNDO (object);
+  gint64        memsize   = 0;
+
+  memsize += gimp_gegl_buffer_get_memsize (mask_undo->buffer);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_mask_undo_pop (GimpUndo            *undo,
+                    GimpUndoMode         undo_mode,
+                    GimpUndoAccumulator *accum)
+{
+  GimpMaskUndo  *mask_undo  = GIMP_MASK_UNDO (undo);
+  GimpItem      *item       = GIMP_ITEM_UNDO (undo)->item;
+  GimpDrawable  *drawable   = GIMP_DRAWABLE (item);
+  GimpChannel   *channel    = GIMP_CHANNEL (item);
+  GeglBuffer    *new_buffer = NULL;
+  GeglRectangle  bounds     = {};
+  GeglRectangle  rect       = {};
+  const Babl    *format;
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  format = gimp_drawable_get_format (drawable);
+
+  if (gimp_item_bounds (item,
+                        &bounds.x,
+                        &bounds.y,
+                        &bounds.width,
+                        &bounds.height))
+    {
+      GeglBuffer *buffer = gimp_drawable_get_buffer (drawable);
+
+      gegl_rectangle_align_to_buffer (&rect, &bounds, buffer,
+                                      GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                    rect.width, rect.height),
+                                    format);
+
+      gimp_gegl_buffer_copy (buffer, &rect, GEGL_ABYSS_NONE,
+                             new_buffer, GEGL_RECTANGLE (0, 0, 0, 0));
+
+      gegl_buffer_clear (buffer, &rect);
+    }
+
+  if (mask_undo->convert_format)
+    {
+      GeglBuffer *buffer;
+      gint        width  = gimp_item_get_width  (item);
+      gint        height = gimp_item_get_height (item);
+
+      buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
+                                mask_undo->format);
+
+      gimp_drawable_set_buffer (drawable, FALSE, NULL, buffer);
+      g_object_unref (buffer);
+    }
+
+  if (mask_undo->buffer)
+    {
+      gimp_gegl_buffer_copy (mask_undo->buffer,
+                             NULL,
+                             GEGL_ABYSS_NONE,
+                             gimp_drawable_get_buffer (drawable),
+                             GEGL_RECTANGLE (mask_undo->x, mask_undo->y, 0, 0));
+
+      g_object_unref (mask_undo->buffer);
+    }
+
+  /* invalidate the current bounds and boundary of the mask */
+  gimp_drawable_invalidate_boundary (drawable);
+
+  if (mask_undo->buffer)
+    {
+      channel->empty = FALSE;
+      channel->x1    = mask_undo->bounds.x;
+      channel->y1    = mask_undo->bounds.y;
+      channel->x2    = mask_undo->bounds.x + mask_undo->bounds.width;
+      channel->y2    = mask_undo->bounds.y + mask_undo->bounds.height;
+    }
+  else
+    {
+      channel->empty = TRUE;
+      channel->x1    = 0;
+      channel->y1    = 0;
+      channel->x2    = gimp_item_get_width  (item);
+      channel->y2    = gimp_item_get_height (item);
+    }
+
+  /* we know the bounds */
+  channel->bounds_known = TRUE;
+
+  /*  set the new mask undo parameters  */
+  mask_undo->format = format;
+  mask_undo->buffer = new_buffer;
+  mask_undo->bounds = bounds;
+  mask_undo->x      = rect.x;
+  mask_undo->y      = rect.y;
+
+  gimp_drawable_update (drawable, 0, 0, -1, -1);
+}
+
+static void
+gimp_mask_undo_free (GimpUndo     *undo,
+                     GimpUndoMode  undo_mode)
+{
+  GimpMaskUndo *mask_undo = GIMP_MASK_UNDO (undo);
+
+  g_clear_object (&mask_undo->buffer);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/core/gimpmaskundo.h b/app/core/gimpmaskundo.h
new file mode 100644
index 0000000..53b92e8
--- /dev/null
+++ b/app/core/gimpmaskundo.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MASK_UNDO_H__
+#define __GIMP_MASK_UNDO_H__
+
+
+#include "gimpitemundo.h"
+
+
+#define GIMP_TYPE_MASK_UNDO            (gimp_mask_undo_get_type ())
+#define GIMP_MASK_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MASK_UNDO, GimpMaskUndo))
+#define GIMP_MASK_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MASK_UNDO, GimpMaskUndoClass))
+#define GIMP_IS_MASK_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MASK_UNDO))
+#define GIMP_IS_MASK_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MASK_UNDO))
+#define GIMP_MASK_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MASK_UNDO, GimpMaskUndoClass))
+
+
+typedef struct _GimpMaskUndo      GimpMaskUndo;
+typedef struct _GimpMaskUndoClass GimpMaskUndoClass;
+
+struct _GimpMaskUndo
+{
+  GimpItemUndo   parent_instance;
+
+  gboolean       convert_format;
+
+  const Babl    *format;
+  GeglBuffer    *buffer;
+  GeglRectangle  bounds;
+  gint           x;
+  gint           y;
+};
+
+struct _GimpMaskUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_mask_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_MASK_UNDO_H__ */
diff --git a/app/core/gimpmybrush-load.c b/app/core/gimpmybrush-load.c
new file mode 100644
index 0000000..1dbb9f5
--- /dev/null
+++ b/app/core/gimpmybrush-load.c
@@ -0,0 +1,153 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmybrush-load.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include <mypaint-brush.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpmybrush.h"
+#include "gimpmybrush-load.h"
+#include "gimpmybrush-private.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GList *
+gimp_mybrush_load (GimpContext   *context,
+                   GFile         *file,
+                   GInputStream  *input,
+                   GError       **error)
+{
+  GimpMybrush  *brush = NULL;
+  MyPaintBrush *mypaint_brush;
+  GdkPixbuf    *pixbuf;
+  GFileInfo    *info;
+  guint64       size;
+  guchar       *buffer;
+  gchar        *path;
+  gchar        *basename;
+  gchar        *preview_filename;
+  gchar        *p;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  info = g_file_query_info (file,
+                            G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                            G_FILE_QUERY_INFO_NONE,
+                            NULL, error);
+  if (! info)
+    return NULL;
+
+  size = g_file_info_get_attribute_uint64 (info,
+                                           G_FILE_ATTRIBUTE_STANDARD_SIZE);
+  g_object_unref (info);
+
+  if (size > 32768)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("MyPaint brush file is unreasonably large, skipping."));
+      return NULL;
+    }
+
+  buffer = g_new0 (guchar, size + 1);
+
+  if (! g_input_stream_read_all (input, buffer, size, NULL, NULL, error))
+    {
+      g_free (buffer);
+      return NULL;
+    }
+
+  mypaint_brush = mypaint_brush_new ();
+  mypaint_brush_from_defaults (mypaint_brush);
+
+  if (! mypaint_brush_from_string (mypaint_brush, (const gchar *) buffer))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Failed to deserialize MyPaint brush."));
+      mypaint_brush_unref (mypaint_brush);
+      g_free (buffer);
+      return NULL;
+    }
+
+  path = g_file_get_path (file);
+  basename = g_strndup (path, strlen (path) - 4);
+  g_free (path);
+
+  preview_filename = g_strconcat (basename, "_prev.png", NULL);
+  g_free (basename);
+
+  pixbuf = gdk_pixbuf_new_from_file_at_size (preview_filename,
+                                             48, 48, error);
+  g_free (preview_filename);
+
+  basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+
+  basename[strlen (basename) - 4] = '\0';
+  for (p = basename; *p; p++)
+    if (*p == '_' || *p == '-')
+      *p = ' ';
+
+  brush = g_object_new (GIMP_TYPE_MYBRUSH,
+                        "name",        basename,
+                        "mime-type",   "image/x-gimp-myb",
+                        "icon-pixbuf", pixbuf,
+                        NULL);
+
+  g_free (basename);
+
+  if (pixbuf)
+    g_object_unref (pixbuf);
+
+  brush->priv->brush_json = (gchar *) buffer;
+
+  brush->priv->radius =
+    mypaint_brush_get_base_value (mypaint_brush,
+                                  MYPAINT_BRUSH_SETTING_RADIUS_LOGARITHMIC);
+
+  brush->priv->opaque =
+    mypaint_brush_get_base_value (mypaint_brush,
+                                  MYPAINT_BRUSH_SETTING_OPAQUE);
+
+  brush->priv->hardness =
+    mypaint_brush_get_base_value (mypaint_brush,
+                                  MYPAINT_BRUSH_SETTING_HARDNESS);
+
+  brush->priv->eraser =
+    mypaint_brush_get_base_value (mypaint_brush,
+                                  MYPAINT_BRUSH_SETTING_ERASER) > 0.5f;
+
+  brush->priv->offset_by_random =
+    mypaint_brush_get_base_value (mypaint_brush,
+                                  MYPAINT_BRUSH_SETTING_OFFSET_BY_RANDOM);
+
+  mypaint_brush_unref (mypaint_brush);
+
+  return g_list_prepend (NULL, brush);
+}
diff --git a/app/core/gimpmybrush-load.h b/app/core/gimpmybrush-load.h
new file mode 100644
index 0000000..4afe203
--- /dev/null
+++ b/app/core/gimpmybrush-load.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmybrush-load.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MYBRUSH_LOAD_H__
+#define __GIMP_MYBRUSH_LOAD_H__
+
+
+#define GIMP_MYBRUSH_FILE_EXTENSION ".myb"
+
+
+GList * gimp_mybrush_load (GimpContext   *context,
+                           GFile         *file,
+                           GInputStream  *input,
+                           GError       **error);
+
+
+#endif /* __GIMP_MYBRUSH_LOAD_H__ */
diff --git a/app/core/gimpmybrush-private.h b/app/core/gimpmybrush-private.h
new file mode 100644
index 0000000..7966c0b
--- /dev/null
+++ b/app/core/gimpmybrush-private.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmybrush-private.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MYBRUSH_PRIVATE_H__
+#define __GIMP_MYBRUSH_PRIVATE_H__
+
+
+struct _GimpMybrushPrivate
+{
+  gchar   *brush_json;
+  gdouble  radius;
+  gdouble  opaque;
+  gdouble  hardness;
+  gdouble  offset_by_random;
+  gboolean eraser;
+};
+
+
+#endif /* __GIMP_MYBRUSH_PRIVATE_H__ */
diff --git a/app/core/gimpmybrush.c b/app/core/gimpmybrush.c
new file mode 100644
index 0000000..a26c86b
--- /dev/null
+++ b/app/core/gimpmybrush.c
@@ -0,0 +1,281 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmybrush.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpmybrush.h"
+#include "gimpmybrush-load.h"
+#include "gimpmybrush-private.h"
+#include "gimptagged.h"
+
+#include "gimp-intl.h"
+
+
+static void          gimp_mybrush_tagged_iface_init     (GimpTaggedInterface  *iface);
+
+static void          gimp_mybrush_finalize              (GObject              *object);
+static void          gimp_mybrush_set_property          (GObject              *object,
+                                                         guint                 property_id,
+                                                         const GValue         *value,
+                                                         GParamSpec           *pspec);
+static void          gimp_mybrush_get_property          (GObject              *object,
+                                                         guint                 property_id,
+                                                         GValue               *value,
+                                                         GParamSpec           *pspec);
+
+static gint64        gimp_mybrush_get_memsize           (GimpObject           *object,
+                                                         gint64               *gui_size);
+
+static gchar       * gimp_mybrush_get_description       (GimpViewable         *viewable,
+                                                         gchar               **tooltip);
+
+static void          gimp_mybrush_dirty                 (GimpData             *data);
+static const gchar * gimp_mybrush_get_extension         (GimpData             *data);
+
+static gchar       * gimp_mybrush_get_checksum          (GimpTagged           *tagged);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpMybrush, gimp_mybrush, GIMP_TYPE_DATA,
+                         G_ADD_PRIVATE (GimpMybrush)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_TAGGED,
+                                                gimp_mybrush_tagged_iface_init))
+
+#define parent_class gimp_mybrush_parent_class
+
+
+static void
+gimp_mybrush_class_init (GimpMybrushClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+
+  object_class->finalize            = gimp_mybrush_finalize;
+  object_class->get_property        = gimp_mybrush_get_property;
+  object_class->set_property        = gimp_mybrush_set_property;
+
+  gimp_object_class->get_memsize    = gimp_mybrush_get_memsize;
+
+  viewable_class->default_icon_name = "gimp-tool-mypaint-brush";
+  viewable_class->get_description   = gimp_mybrush_get_description;
+
+  data_class->dirty                 = gimp_mybrush_dirty;
+  data_class->get_extension         = gimp_mybrush_get_extension;
+}
+
+static void
+gimp_mybrush_tagged_iface_init (GimpTaggedInterface *iface)
+{
+  iface->get_checksum = gimp_mybrush_get_checksum;
+}
+
+static void
+gimp_mybrush_init (GimpMybrush *brush)
+{
+  brush->priv = gimp_mybrush_get_instance_private (brush);
+
+  brush->priv->radius   = 1.0;
+  brush->priv->opaque   = 1.0;
+  brush->priv->hardness = 1.0;
+  brush->priv->eraser   = FALSE;
+}
+
+static void
+gimp_mybrush_finalize (GObject *object)
+{
+  GimpMybrush *brush = GIMP_MYBRUSH (object);
+
+  g_clear_pointer (&brush->priv->brush_json, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_mybrush_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mybrush_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_mybrush_get_memsize (GimpObject *object,
+                          gint64     *gui_size)
+{
+  GimpMybrush *brush   = GIMP_MYBRUSH (object);
+  gint64       memsize = 0;
+
+  memsize += gimp_string_get_memsize (brush->priv->brush_json);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gchar *
+gimp_mybrush_get_description (GimpViewable  *viewable,
+                              gchar        **tooltip)
+{
+  GimpMybrush *brush = GIMP_MYBRUSH (viewable);
+
+  return g_strdup_printf ("%s",
+                          gimp_object_get_name (brush));
+}
+
+static void
+gimp_mybrush_dirty (GimpData *data)
+{
+  GIMP_DATA_CLASS (parent_class)->dirty (data);
+}
+
+static const gchar *
+gimp_mybrush_get_extension (GimpData *data)
+{
+  return GIMP_MYBRUSH_FILE_EXTENSION;
+}
+
+static gchar *
+gimp_mybrush_get_checksum (GimpTagged *tagged)
+{
+  GimpMybrush *brush           = GIMP_MYBRUSH (tagged);
+  gchar       *checksum_string = NULL;
+
+  if (brush->priv->brush_json)
+    {
+      GChecksum *checksum = g_checksum_new (G_CHECKSUM_MD5);
+
+      g_checksum_update (checksum,
+                         (const guchar *) brush->priv->brush_json,
+                         strlen (brush->priv->brush_json));
+
+      checksum_string = g_strdup (g_checksum_get_string (checksum));
+
+      g_checksum_free (checksum);
+    }
+
+  return checksum_string;
+}
+
+/*  public functions  */
+
+GimpData *
+gimp_mybrush_new (GimpContext *context,
+                  const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_MYBRUSH,
+                       "name",      name,
+                       "mime-type", "image/x-gimp-myb",
+                       NULL);
+}
+
+GimpData *
+gimp_mybrush_get_standard (GimpContext *context)
+{
+  static GimpData *standard_mybrush = NULL;
+
+  if (! standard_mybrush)
+    {
+      standard_mybrush = gimp_mybrush_new (context, "Standard");
+
+      gimp_data_clean (standard_mybrush);
+      gimp_data_make_internal (standard_mybrush, "gimp-mybrush-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_mybrush),
+                                 (gpointer *) &standard_mybrush);
+    }
+
+  return standard_mybrush;
+}
+
+const gchar *
+gimp_mybrush_get_brush_json (GimpMybrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_MYBRUSH (brush), NULL);
+
+  return brush->priv->brush_json;
+}
+
+gdouble
+gimp_mybrush_get_radius (GimpMybrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_MYBRUSH (brush), 1.0);
+
+  return brush->priv->radius;
+}
+
+gdouble
+gimp_mybrush_get_opaque (GimpMybrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_MYBRUSH (brush), 1.0);
+
+  return brush->priv->opaque;
+}
+
+gdouble
+gimp_mybrush_get_hardness (GimpMybrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_MYBRUSH (brush), 1.0);
+
+  return brush->priv->hardness;
+}
+
+gdouble
+gimp_mybrush_get_offset_by_random (GimpMybrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_MYBRUSH (brush), 1.0);
+
+  return brush->priv->offset_by_random;
+}
+
+gboolean
+gimp_mybrush_get_is_eraser (GimpMybrush *brush)
+{
+  g_return_val_if_fail (GIMP_IS_MYBRUSH (brush), FALSE);
+
+  return brush->priv->eraser;
+}
diff --git a/app/core/gimpmybrush.h b/app/core/gimpmybrush.h
new file mode 100644
index 0000000..2dad734
--- /dev/null
+++ b/app/core/gimpmybrush.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmybrush.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MYBRUSH_H__
+#define __GIMP_MYBRUSH_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_MYBRUSH            (gimp_mybrush_get_type ())
+#define GIMP_MYBRUSH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MYBRUSH, GimpMybrush))
+#define GIMP_MYBRUSH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MYBRUSH, GimpMybrushClass))
+#define GIMP_IS_MYBRUSH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MYBRUSH))
+#define GIMP_IS_MYBRUSH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MYBRUSH))
+#define GIMP_MYBRUSH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MYBRUSH, GimpMybrushClass))
+
+
+typedef struct _GimpMybrushPrivate GimpMybrushPrivate;
+typedef struct _GimpMybrushClass   GimpMybrushClass;
+
+struct _GimpMybrush
+{
+  GimpData            parent_instance;
+
+  GimpMybrushPrivate *priv;
+};
+
+struct _GimpMybrushClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType         gimp_mybrush_get_type             (void) G_GNUC_CONST;
+
+GimpData    * gimp_mybrush_new                  (GimpContext *context,
+                                                 const gchar *name);
+GimpData    * gimp_mybrush_get_standard         (GimpContext *context);
+
+const gchar * gimp_mybrush_get_brush_json       (GimpMybrush *brush);
+
+gdouble       gimp_mybrush_get_radius           (GimpMybrush *brush);
+gdouble       gimp_mybrush_get_opaque           (GimpMybrush *brush);
+gdouble       gimp_mybrush_get_hardness         (GimpMybrush *brush);
+gdouble       gimp_mybrush_get_offset_by_random (GimpMybrush *brush);
+gboolean      gimp_mybrush_get_is_eraser        (GimpMybrush *brush);
+
+
+#endif /* __GIMP_MYBRUSH_H__ */
diff --git a/app/core/gimpobject.c b/app/core/gimpobject.c
new file mode 100644
index 0000000..0f3baf7
--- /dev/null
+++ b/app/core/gimpobject.c
@@ -0,0 +1,512 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpmarshal.h"
+#include "gimpobject.h"
+
+#include "gimp-debug.h"
+
+
+enum
+{
+  DISCONNECT,
+  NAME_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_NAME
+};
+
+
+struct _GimpObjectPrivate
+{
+  gchar *name;
+  gchar *normalized;
+  guint  static_name  : 1;
+  guint  disconnected : 1;
+};
+
+
+static void    gimp_object_constructed      (GObject         *object);
+static void    gimp_object_dispose          (GObject         *object);
+static void    gimp_object_finalize         (GObject         *object);
+static void    gimp_object_set_property     (GObject         *object,
+                                             guint            property_id,
+                                             const GValue    *value,
+                                             GParamSpec      *pspec);
+static void    gimp_object_get_property     (GObject         *object,
+                                             guint            property_id,
+                                             GValue          *value,
+                                             GParamSpec      *pspec);
+static gint64  gimp_object_real_get_memsize (GimpObject      *object,
+                                             gint64          *gui_size);
+static void    gimp_object_name_normalize   (GimpObject      *object);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpObject, gimp_object, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpObject))
+
+#define parent_class gimp_object_parent_class
+
+static guint object_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_object_class_init (GimpObjectClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_signals[DISCONNECT] =
+    g_signal_new ("disconnect",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpObjectClass, disconnect),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_signals[NAME_CHANGED] =
+    g_signal_new ("name-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpObjectClass, name_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->constructed  = gimp_object_constructed;
+  object_class->dispose      = gimp_object_dispose;
+  object_class->finalize     = gimp_object_finalize;
+  object_class->set_property = gimp_object_set_property;
+  object_class->get_property = gimp_object_get_property;
+
+  klass->disconnect          = NULL;
+  klass->name_changed        = NULL;
+  klass->get_memsize         = gimp_object_real_get_memsize;
+
+  g_object_class_install_property (object_class, PROP_NAME,
+                                   g_param_spec_string ("name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_object_init (GimpObject *object)
+{
+  object->p = gimp_object_get_instance_private (object);
+
+  object->p->name       = NULL;
+  object->p->normalized = NULL;
+}
+
+static void
+gimp_object_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_debug_add_instance (object, G_OBJECT_GET_CLASS (object));
+}
+
+static void
+gimp_object_dispose (GObject *object)
+{
+  GimpObject *gimp_object = GIMP_OBJECT (object);
+
+  if (! gimp_object->p->disconnected)
+    {
+      g_signal_emit (object, object_signals[DISCONNECT], 0);
+
+      gimp_object->p->disconnected = TRUE;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_object_finalize (GObject *object)
+{
+  gimp_object_name_free (GIMP_OBJECT (object));
+
+  gimp_debug_remove_instance (object);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_object_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpObject *gimp_object = GIMP_OBJECT (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      gimp_object_set_name (gimp_object, g_value_get_string (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_object_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpObject *gimp_object = GIMP_OBJECT (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      if (gimp_object->p->static_name)
+        g_value_set_static_string (value, gimp_object->p->name);
+      else
+        g_value_set_string (value, gimp_object->p->name);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_object_set_name:
+ * @object: a #GimpObject
+ * @name: the @object's new name
+ *
+ * Sets the @object's name. Takes care of freeing the old name and
+ * emitting the ::name_changed signal if the old and new name differ.
+ **/
+void
+gimp_object_set_name (GimpObject  *object,
+                      const gchar *name)
+{
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  if (! g_strcmp0 (object->p->name, name))
+    return;
+
+  gimp_object_name_free (object);
+
+  object->p->name = g_strdup (name);
+  object->p->static_name = FALSE;
+
+  gimp_object_name_changed (object);
+  g_object_notify (G_OBJECT (object), "name");
+}
+
+/**
+ * gimp_object_set_name_safe:
+ * @object: a #GimpObject
+ * @name: the @object's new name
+ *
+ * A safe version of gimp_object_set_name() that takes care of
+ * handling newlines and overly long names. The actual name set
+ * may be different to the @name you pass.
+ **/
+void
+gimp_object_set_name_safe (GimpObject  *object,
+                           const gchar *name)
+{
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  if (! g_strcmp0 (object->p->name, name))
+    return;
+
+  gimp_object_name_free (object);
+
+  object->p->name = gimp_utf8_strtrim (name, 30);
+  object->p->static_name = FALSE;
+
+  gimp_object_name_changed (object);
+  g_object_notify (G_OBJECT (object), "name");
+}
+
+void
+gimp_object_set_static_name (GimpObject  *object,
+                             const gchar *name)
+{
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  if (! g_strcmp0 (object->p->name, name))
+    return;
+
+  gimp_object_name_free (object);
+
+  object->p->name = (gchar *) name;
+  object->p->static_name = TRUE;
+
+  gimp_object_name_changed (object);
+  g_object_notify (G_OBJECT (object), "name");
+}
+
+void
+gimp_object_take_name (GimpObject *object,
+                       gchar      *name)
+{
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  if (! g_strcmp0 (object->p->name, name))
+    {
+      g_free (name);
+      return;
+    }
+
+  gimp_object_name_free (object);
+
+  object->p->name = name;
+  object->p->static_name = FALSE;
+
+  gimp_object_name_changed (object);
+  g_object_notify (G_OBJECT (object), "name");
+}
+
+/**
+ * gimp_object_get_name:
+ * @object: a #GimpObject
+ *
+ * This function gives access to the name of a GimpObject. The
+ * returned name belongs to the object and must not be freed.
+ *
+ * Return value: a pointer to the @object's name
+ **/
+const gchar *
+gimp_object_get_name (gconstpointer object)
+{
+  const GimpObject *object_typed = object;
+  g_return_val_if_fail (GIMP_IS_OBJECT (object_typed), NULL);
+
+  return object_typed->p->name;
+}
+
+/**
+ * gimp_object_name_changed:
+ * @object: a #GimpObject
+ *
+ * Causes the ::name-changed signal to be emitted.
+ **/
+void
+gimp_object_name_changed (GimpObject *object)
+{
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  g_signal_emit (object, object_signals[NAME_CHANGED], 0);
+}
+
+/**
+ * gimp_object_name_free:
+ * @object: a #GimpObject
+ *
+ * Frees the name of @object and sets the name pointer to %NULL. Also
+ * takes care of the normalized name that the object might be caching.
+ *
+ * In general you should be using gimp_object_set_name() instead. But
+ * if you ever need to free the object name but don't want the
+ * ::name-changed signal to be emitted, then use this function. Never
+ * ever free the object name directly!
+ **/
+void
+gimp_object_name_free (GimpObject *object)
+{
+  if (object->p->normalized)
+    {
+      if (object->p->normalized != object->p->name)
+        g_free (object->p->normalized);
+
+      object->p->normalized = NULL;
+    }
+
+  if (object->p->name)
+    {
+      if (! object->p->static_name)
+        g_free (object->p->name);
+
+      object->p->name = NULL;
+      object->p->static_name = FALSE;
+    }
+}
+
+/**
+ * gimp_object_name_collate:
+ * @object1: a #GimpObject
+ * @object2: another #GimpObject
+ *
+ * Compares two object names for ordering using the linguistically
+ * correct rules for the current locale. It caches the normalized
+ * version of the object name to speed up subsequent calls.
+ *
+ * Return value: -1 if object1 compares before object2,
+ *                0 if they compare equal,
+ *                1 if object1 compares after object2.
+ **/
+gint
+gimp_object_name_collate (GimpObject *object1,
+                          GimpObject *object2)
+{
+  if (! object1->p->normalized)
+    gimp_object_name_normalize (object1);
+
+  if (! object2->p->normalized)
+    gimp_object_name_normalize (object2);
+
+  return strcmp (object1->p->normalized, object2->p->normalized);
+}
+
+static void
+gimp_object_name_normalize (GimpObject *object)
+{
+  g_return_if_fail (object->p->normalized == NULL);
+
+  if (object->p->name)
+    {
+      gchar *key = g_utf8_collate_key (object->p->name, -1);
+
+      if (strcmp (key, object->p->name))
+        {
+          object->p->normalized = key;
+        }
+      else
+        {
+          g_free (key);
+          object->p->normalized = object->p->name;
+        }
+    }
+}
+
+
+#define DEBUG_MEMSIZE 1
+
+#ifdef DEBUG_MEMSIZE
+gboolean gimp_debug_memsize = FALSE;
+#endif
+
+gint64
+gimp_object_get_memsize (GimpObject *object,
+                         gint64     *gui_size)
+{
+  gint64 my_size     = 0;
+  gint64 my_gui_size = 0;
+
+  g_return_val_if_fail (object == NULL || GIMP_IS_OBJECT (object), 0);
+
+  if (! object)
+    {
+      if (gui_size)
+        *gui_size = 0;
+
+      return 0;
+    }
+
+#ifdef DEBUG_MEMSIZE
+  if (gimp_debug_memsize)
+    {
+      static gint   indent_level     = 0;
+      static GList *aggregation_tree = NULL;
+      static gchar  indent_buf[256];
+
+      gint64  memsize;
+      gint64  gui_memsize = 0;
+      gint    i;
+      gint    my_indent_level;
+      gchar  *object_size;
+
+      indent_level++;
+
+      my_indent_level = indent_level;
+
+      memsize = GIMP_OBJECT_GET_CLASS (object)->get_memsize (object,
+                                                             &gui_memsize);
+
+      indent_level--;
+
+      for (i = 0; i < MIN (my_indent_level * 2, sizeof (indent_buf) - 1); i++)
+        indent_buf[i] = ' ';
+
+      indent_buf[i] = '\0';
+
+      object_size = g_strdup_printf ("%s%s \"%s\": "
+                                     "%" G_GINT64_FORMAT
+                                     "(%" G_GINT64_FORMAT ")\n",
+                                     indent_buf,
+                                     g_type_name (G_TYPE_FROM_INSTANCE (object)),
+                                     object->p->name ? object->p->name : "anonymous",
+                                     memsize,
+                                     gui_memsize);
+
+      aggregation_tree = g_list_prepend (aggregation_tree, object_size);
+
+      if (indent_level == 0)
+        {
+          GList *list;
+
+          for (list = aggregation_tree; list; list = g_list_next (list))
+            {
+              g_print ("%s", (gchar *) list->data);
+              g_free (list->data);
+            }
+
+          g_list_free (aggregation_tree);
+          aggregation_tree = NULL;
+        }
+
+      return memsize;
+    }
+#endif /* DEBUG_MEMSIZE */
+
+  my_size = GIMP_OBJECT_GET_CLASS (object)->get_memsize (object,
+                                                         &my_gui_size);
+
+  if (gui_size)
+    *gui_size = my_gui_size;
+
+  return my_size;
+}
+
+static gint64
+gimp_object_real_get_memsize (GimpObject *object,
+                              gint64     *gui_size)
+{
+  gint64 memsize = 0;
+
+  if (! object->p->static_name)
+    memsize += gimp_string_get_memsize (object->p->name);
+
+  return memsize + gimp_g_object_get_memsize ((GObject *) object);
+}
diff --git a/app/core/gimpobject.h b/app/core/gimpobject.h
new file mode 100644
index 0000000..17401c5
--- /dev/null
+++ b/app/core/gimpobject.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OBJECT_H__
+#define __GIMP_OBJECT_H__
+
+
+#define GIMP_TYPE_OBJECT            (gimp_object_get_type ())
+#define GIMP_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OBJECT, GimpObject))
+#define GIMP_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OBJECT, GimpObjectClass))
+#define GIMP_IS_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OBJECT))
+#define GIMP_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT))
+#define GIMP_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OBJECT, GimpObjectClass))
+
+
+typedef struct _GimpObjectPrivate  GimpObjectPrivate;
+typedef struct _GimpObjectClass    GimpObjectClass;
+
+struct _GimpObject
+{
+  GObject            parent_instance;
+
+  GimpObjectPrivate *p;
+};
+
+struct _GimpObjectClass
+{
+  GObjectClass  parent_class;
+
+  /*  signals  */
+  void    (* disconnect)   (GimpObject *object);
+  void    (* name_changed) (GimpObject *object);
+
+  /*  virtual functions  */
+  gint64  (* get_memsize)  (GimpObject *object,
+                            gint64     *gui_size);
+};
+
+
+GType         gimp_object_get_type        (void) G_GNUC_CONST;
+
+void          gimp_object_set_name        (GimpObject       *object,
+                                           const gchar      *name);
+void          gimp_object_set_name_safe   (GimpObject       *object,
+                                           const gchar      *name);
+void          gimp_object_set_static_name (GimpObject       *object,
+                                           const gchar      *name);
+void          gimp_object_take_name       (GimpObject       *object,
+                                           gchar            *name);
+const gchar * gimp_object_get_name        (gconstpointer     object);
+void          gimp_object_name_changed    (GimpObject       *object);
+void          gimp_object_name_free       (GimpObject       *object);
+
+gint          gimp_object_name_collate    (GimpObject       *object1,
+                                           GimpObject       *object2);
+gint64        gimp_object_get_memsize     (GimpObject       *object,
+                                           gint64           *gui_size);
+
+
+#endif  /* __GIMP_OBJECT_H__ */
diff --git a/app/core/gimpobjectqueue.c b/app/core/gimpobjectqueue.c
new file mode 100644
index 0000000..edadc09
--- /dev/null
+++ b/app/core/gimpobjectqueue.c
@@ -0,0 +1,198 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "gimpcontainer.h"
+#include "gimpobject.h"
+#include "gimpobjectqueue.h"
+#include "gimpprogress.h"
+
+
+typedef struct
+{
+  GimpObject *object;
+  gint64      memsize;
+} Item;
+
+
+static void   gimp_object_queue_dispose      (GObject         *object);
+
+static void   gimp_object_queue_push_swapped (gpointer         object,
+                                              GimpObjectQueue *queue);
+
+static Item * gimp_object_queue_item_new     (GimpObject      *object);
+static void   gimp_object_queue_item_free    (Item            *item);
+
+
+G_DEFINE_TYPE (GimpObjectQueue, gimp_object_queue, GIMP_TYPE_SUB_PROGRESS);
+
+#define parent_class gimp_object_queue_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_object_queue_class_init (GimpObjectQueueClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_object_queue_dispose;
+}
+
+static void
+gimp_object_queue_init (GimpObjectQueue *queue)
+{
+  g_queue_init (&queue->items);
+
+  queue->processed_memsize = 0;
+  queue->total_memsize     = 0;
+}
+
+static void
+gimp_object_queue_dispose (GObject *object)
+{
+  gimp_object_queue_clear (GIMP_OBJECT_QUEUE (object));
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_object_queue_push_swapped (gpointer         object,
+                                GimpObjectQueue *queue)
+{
+  gimp_object_queue_push (queue, object);
+}
+
+static Item *
+gimp_object_queue_item_new (GimpObject *object)
+{
+  Item *item = g_slice_new (Item);
+
+  item->object  = object;
+  item->memsize = gimp_object_get_memsize (object, NULL);
+
+  return item;
+}
+
+static void
+gimp_object_queue_item_free (Item *item)
+{
+  g_slice_free (Item, item);
+}
+
+
+/*  public functions  */
+
+
+GimpObjectQueue *
+gimp_object_queue_new (GimpProgress *progress)
+{
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  return g_object_new (GIMP_TYPE_OBJECT_QUEUE,
+                       "progress", progress,
+                       NULL);
+}
+
+void
+gimp_object_queue_clear (GimpObjectQueue *queue)
+{
+  Item *item;
+
+  g_return_if_fail (GIMP_IS_OBJECT_QUEUE (queue));
+
+  while ((item = g_queue_pop_head (&queue->items)))
+    gimp_object_queue_item_free (item);
+
+  queue->processed_memsize = 0;
+  queue->total_memsize     = 0;
+
+  gimp_sub_progress_set_range (GIMP_SUB_PROGRESS (queue), 0.0, 1.0);
+}
+
+void
+gimp_object_queue_push (GimpObjectQueue *queue,
+                        gpointer         object)
+{
+  Item *item;
+
+  g_return_if_fail (GIMP_IS_OBJECT_QUEUE (queue));
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  item = gimp_object_queue_item_new (GIMP_OBJECT (object));
+
+  g_queue_push_tail (&queue->items, item);
+
+  queue->total_memsize += item->memsize;
+}
+
+void
+gimp_object_queue_push_container (GimpObjectQueue *queue,
+                                  GimpContainer   *container)
+{
+  g_return_if_fail (GIMP_IS_OBJECT_QUEUE (queue));
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_object_queue_push_swapped,
+                          queue);
+}
+
+void
+gimp_object_queue_push_list (GimpObjectQueue *queue,
+                             GList           *list)
+{
+  g_return_if_fail (GIMP_IS_OBJECT_QUEUE (queue));
+
+  g_list_foreach (list,
+                  (GFunc) gimp_object_queue_push_swapped,
+                  queue);
+}
+
+gpointer
+gimp_object_queue_pop (GimpObjectQueue *queue)
+{
+  Item       *item;
+  GimpObject *object;
+
+  g_return_val_if_fail (GIMP_IS_OBJECT_QUEUE (queue), NULL);
+
+  item = g_queue_pop_head (&queue->items);
+
+  if (! item)
+    return NULL;
+
+  object = item->object;
+
+  gimp_sub_progress_set_range (GIMP_SUB_PROGRESS (queue),
+                               (gdouble) queue->processed_memsize  /
+                               (gdouble) queue->total_memsize,
+                               (gdouble) (queue->processed_memsize +
+                                          item->memsize)              /
+                               (gdouble) queue->total_memsize);
+  queue->processed_memsize += item->memsize;
+
+  gimp_object_queue_item_free (item);
+
+  return object;
+}
diff --git a/app/core/gimpobjectqueue.h b/app/core/gimpobjectqueue.h
new file mode 100644
index 0000000..024754f
--- /dev/null
+++ b/app/core/gimpobjectqueue.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OBJECT_QUEUE_H__
+#define __GIMP_OBJECT_QUEUE_H__
+
+
+#include "gimpsubprogress.h"
+
+
+#define GIMP_TYPE_OBJECT_QUEUE            (gimp_object_queue_get_type ())
+#define GIMP_OBJECT_QUEUE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OBJECT_QUEUE, GimpObjectQueue))
+#define GIMP_OBJECT_QUEUE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OBJECT_QUEUE, GimpObjectQueueClass))
+#define GIMP_IS_OBJECT_QUEUE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OBJECT_QUEUE))
+#define GIMP_IS_OBJECT_QUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT_QUEUE))
+#define GIMP_OBJECT_QUEUE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OBJECT_QUEUE, GimpObjectQueueClass))
+
+
+typedef struct _GimpObjectQueueClass GimpObjectQueueClass;
+
+struct _GimpObjectQueue
+{
+  GimpSubProgress  parent_instance;
+
+  GQueue           items;
+  gint64           processed_memsize;
+  gint64           total_memsize;
+};
+
+struct _GimpObjectQueueClass
+{
+  GimpSubProgressClass  parent_class;
+};
+
+
+GType             gimp_object_queue_get_type       (void) G_GNUC_CONST;
+
+GimpObjectQueue * gimp_object_queue_new            (GimpProgress    *progress);
+
+void              gimp_object_queue_clear          (GimpObjectQueue *queue);
+
+void              gimp_object_queue_push           (GimpObjectQueue *queue,
+                                                    gpointer         object);
+void              gimp_object_queue_push_container (GimpObjectQueue *queue,
+                                                    GimpContainer   *container);
+void              gimp_object_queue_push_list      (GimpObjectQueue *queue,
+                                                    GList           *list);
+
+gpointer          gimp_object_queue_pop            (GimpObjectQueue *queue);
+
+
+#endif /* __GIMP_OBJECT_QUEUE_H__ */
diff --git a/app/core/gimppaintinfo.c b/app/core/gimppaintinfo.c
new file mode 100644
index 0000000..c7d6d81
--- /dev/null
+++ b/app/core/gimppaintinfo.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "gimp.h"
+#include "gimppaintinfo.h"
+
+
+static void    gimp_paint_info_dispose         (GObject       *object);
+static void    gimp_paint_info_finalize        (GObject       *object);
+static gchar * gimp_paint_info_get_description (GimpViewable  *viewable,
+                                                gchar        **tooltip);
+
+
+G_DEFINE_TYPE (GimpPaintInfo, gimp_paint_info, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_paint_info_parent_class
+
+
+static void
+gimp_paint_info_class_init (GimpPaintInfoClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->dispose           = gimp_paint_info_dispose;
+  object_class->finalize          = gimp_paint_info_finalize;
+
+  viewable_class->get_description = gimp_paint_info_get_description;
+}
+
+static void
+gimp_paint_info_init (GimpPaintInfo *paint_info)
+{
+  paint_info->gimp          = NULL;
+  paint_info->paint_type    = G_TYPE_NONE;
+  paint_info->blurb         = NULL;
+  paint_info->paint_options = NULL;
+}
+
+static void
+gimp_paint_info_dispose (GObject *object)
+{
+  GimpPaintInfo *paint_info = GIMP_PAINT_INFO (object);
+
+  if (paint_info->paint_options)
+    {
+      g_object_run_dispose (G_OBJECT (paint_info->paint_options));
+      g_clear_object (&paint_info->paint_options);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_paint_info_finalize (GObject *object)
+{
+  GimpPaintInfo *paint_info = GIMP_PAINT_INFO (object);
+
+  g_clear_pointer (&paint_info->blurb, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gchar *
+gimp_paint_info_get_description (GimpViewable  *viewable,
+                                 gchar        **tooltip)
+{
+  GimpPaintInfo *paint_info = GIMP_PAINT_INFO (viewable);
+
+  return g_strdup (paint_info->blurb);
+}
+
+GimpPaintInfo *
+gimp_paint_info_new (Gimp        *gimp,
+                     GType        paint_type,
+                     GType        paint_options_type,
+                     const gchar *identifier,
+                     const gchar *blurb,
+                     const gchar *icon_name)
+{
+  GimpPaintInfo *paint_info;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+  g_return_val_if_fail (blurb != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+
+  paint_info = g_object_new (GIMP_TYPE_PAINT_INFO,
+                             "name",      identifier,
+                             "icon-name", icon_name,
+                             NULL);
+
+  paint_info->gimp               = gimp;
+  paint_info->paint_type         = paint_type;
+  paint_info->paint_options_type = paint_options_type;
+  paint_info->blurb              = g_strdup (blurb);
+
+  paint_info->paint_options      = gimp_paint_options_new (paint_info);
+
+  return paint_info;
+}
+
+void
+gimp_paint_info_set_standard (Gimp          *gimp,
+                              GimpPaintInfo *paint_info)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (! paint_info || GIMP_IS_PAINT_INFO (paint_info));
+
+  g_set_object (&gimp->standard_paint_info, paint_info);
+}
+
+GimpPaintInfo *
+gimp_paint_info_get_standard (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp->standard_paint_info;
+}
diff --git a/app/core/gimppaintinfo.h b/app/core/gimppaintinfo.h
new file mode 100644
index 0000000..c67b326
--- /dev/null
+++ b/app/core/gimppaintinfo.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_INFO_H__
+#define __GIMP_PAINT_INFO_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_PAINT_INFO            (gimp_paint_info_get_type ())
+#define GIMP_PAINT_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINT_INFO, GimpPaintInfo))
+#define GIMP_PAINT_INFO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINT_INFO, GimpPaintInfoClass))
+#define GIMP_IS_PAINT_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINT_INFO))
+#define GIMP_IS_PAINT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINT_INFO))
+#define GIMP_PAINT_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINT_INFO, GimpPaintInfoClass))
+
+
+typedef struct _GimpPaintInfoClass GimpPaintInfoClass;
+
+struct _GimpPaintInfo
+{
+  GimpViewable      parent_instance;
+
+  Gimp             *gimp;
+
+  GType             paint_type;
+  GType             paint_options_type;
+
+  gchar            *blurb;
+
+  GimpPaintOptions *paint_options;
+};
+
+struct _GimpPaintInfoClass
+{
+  GimpViewableClass  parent_class;
+};
+
+
+GType           gimp_paint_info_get_type     (void) G_GNUC_CONST;
+
+GimpPaintInfo * gimp_paint_info_new          (Gimp          *gimp,
+                                              GType          paint_type,
+                                              GType          paint_options_type,
+                                              const gchar   *identifier,
+                                              const gchar   *blurb,
+                                              const gchar   *icon_name);
+
+void            gimp_paint_info_set_standard (Gimp          *gimp,
+                                              GimpPaintInfo *paint_info);
+GimpPaintInfo * gimp_paint_info_get_standard (Gimp          *gimp);
+
+
+#endif  /*  __GIMP_PAINT_INFO_H__  */
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
new file mode 100644
index 0000000..aaa44ea
--- /dev/null
+++ b/app/core/gimppalette-import.c
@@ -0,0 +1,566 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimpchannel.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpgradient.h"
+#include "gimpimage.h"
+#include "gimpimage-colormap.h"
+#include "gimppalette.h"
+#include "gimppalette-import.h"
+#include "gimppalette-load.h"
+#include "gimppickable.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_IMAGE_COLORS (10000 * 2)
+
+
+/*  create a palette from a gradient  ****************************************/
+
+GimpPalette *
+gimp_palette_import_from_gradient (GimpGradient                *gradient,
+                                   GimpContext                 *context,
+                                   gboolean                     reverse,
+                                   GimpGradientBlendColorSpace  blend_color_space,
+                                   const gchar                 *palette_name,
+                                   gint                         n_colors)
+{
+  GimpPalette         *palette;
+  GimpGradientSegment *seg = NULL;
+  gdouble              dx, cur_x;
+  GimpRGB              color;
+  gint                 i;
+
+  g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (palette_name != NULL, NULL);
+  g_return_val_if_fail (n_colors > 1, NULL);
+
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+
+  dx = 1.0 / (n_colors - 1);
+
+  for (i = 0, cur_x = 0; i < n_colors; i++, cur_x += dx)
+    {
+      seg = gimp_gradient_get_color_at (gradient, context,
+                                        seg, cur_x, reverse, blend_color_space,
+                                        &color);
+      gimp_palette_add_entry (palette, -1, NULL, &color);
+    }
+
+  return palette;
+}
+
+
+/*  create a palette from a non-indexed image  *******************************/
+
+typedef struct _ImgColors ImgColors;
+
+struct _ImgColors
+{
+  guint  count;
+  guint  r_adj;
+  guint  g_adj;
+  guint  b_adj;
+  guchar r;
+  guchar g;
+  guchar b;
+};
+
+static gint count_color_entries = 0;
+
+static GHashTable *
+gimp_palette_import_store_colors (GHashTable *table,
+                                  guchar     *colors,
+                                  guchar     *colors_real,
+                                  gint        n_colors)
+{
+  gpointer   found_color = NULL;
+  ImgColors *new_color;
+  guint      key_colors = colors[0] * 256 * 256 + colors[1] * 256 + colors[2];
+
+  if (table == NULL)
+    {
+      table = g_hash_table_new (g_direct_hash, g_direct_equal);
+      count_color_entries = 0;
+    }
+  else
+    {
+      found_color = g_hash_table_lookup (table, GUINT_TO_POINTER (key_colors));
+    }
+
+  if (found_color == NULL)
+    {
+      if (count_color_entries > MAX_IMAGE_COLORS)
+        {
+          /* Don't add any more new ones */
+          return table;
+        }
+
+      count_color_entries++;
+
+      new_color = g_slice_new (ImgColors);
+
+      new_color->count = 1;
+      new_color->r_adj = 0;
+      new_color->g_adj = 0;
+      new_color->b_adj = 0;
+      new_color->r     = colors[0];
+      new_color->g     = colors[1];
+      new_color->b     = colors[2];
+
+      g_hash_table_insert (table, GUINT_TO_POINTER (key_colors), new_color);
+    }
+  else
+    {
+      new_color = found_color;
+
+      if (new_color->count < (G_MAXINT - 1))
+        new_color->count++;
+
+      /* Now do the adjustments ...*/
+      new_color->r_adj += (colors_real[0] - colors[0]);
+      new_color->g_adj += (colors_real[1] - colors[1]);
+      new_color->b_adj += (colors_real[2] - colors[2]);
+
+      /* Boundary conditions */
+      if(new_color->r_adj > (G_MAXINT - 255))
+        new_color->r_adj /= new_color->count;
+
+      if(new_color->g_adj > (G_MAXINT - 255))
+        new_color->g_adj /= new_color->count;
+
+      if(new_color->b_adj > (G_MAXINT - 255))
+        new_color->b_adj /= new_color->count;
+    }
+
+  return table;
+}
+
+static void
+gimp_palette_import_create_list (gpointer key,
+                                 gpointer value,
+                                 gpointer user_data)
+{
+  GSList    **list      = user_data;
+  ImgColors  *color_tab = value;
+
+  *list = g_slist_prepend (*list, color_tab);
+}
+
+static gint
+gimp_palette_import_sort_colors (gconstpointer a,
+                                 gconstpointer b)
+{
+  const ImgColors *s1 = a;
+  const ImgColors *s2 = b;
+
+  if(s1->count > s2->count)
+    return -1;
+  if(s1->count < s2->count)
+    return 1;
+
+  return 0;
+}
+
+static void
+gimp_palette_import_create_image_palette (gpointer data,
+                                          gpointer user_data)
+{
+  GimpPalette *palette   = user_data;
+  ImgColors   *color_tab = data;
+  gint         n_colors;
+  gchar       *lab;
+  GimpRGB      color;
+
+  n_colors = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (palette),
+                                                 "import-n-colors"));
+
+  if (gimp_palette_get_n_colors (palette) >= n_colors)
+    return;
+
+  /* TRANSLATORS: the "%s" is an item title and "%u" is the number of
+     occurrences for this item. */
+  lab = g_strdup_printf (_("%s (occurs %u)"),
+                         _("Untitled"),
+                         color_tab->count);
+
+  /* Adjust the colors to the mean of the the sample */
+  gimp_rgba_set_uchar
+    (&color,
+     (guchar) color_tab->r + (color_tab->r_adj / color_tab->count),
+     (guchar) color_tab->g + (color_tab->g_adj / color_tab->count),
+     (guchar) color_tab->b + (color_tab->b_adj / color_tab->count),
+     255);
+
+  gimp_palette_add_entry (palette, -1, lab, &color);
+
+  g_free (lab);
+}
+
+static GimpPalette *
+gimp_palette_import_make_palette (GHashTable  *table,
+                                  const gchar *palette_name,
+                                  GimpContext *context,
+                                  gint         n_colors)
+{
+  GimpPalette *palette;
+  GSList      *list = NULL;
+  GSList      *iter;
+
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+
+  if (! table)
+    return palette;
+
+  g_hash_table_foreach (table, gimp_palette_import_create_list, &list);
+  list = g_slist_sort (list, gimp_palette_import_sort_colors);
+
+  g_object_set_data (G_OBJECT (palette), "import-n-colors",
+                     GINT_TO_POINTER (n_colors));
+
+  g_slist_foreach (list, gimp_palette_import_create_image_palette, palette);
+
+  g_object_set_data (G_OBJECT (palette), "import-n-colors", NULL);
+
+  /*  Free up used memory
+   *  Note the same structure is on both the hash list and the sorted
+   *  list. So only delete it once.
+   */
+  g_hash_table_destroy (table);
+
+  for (iter = list; iter; iter = iter->next)
+    g_slice_free (ImgColors, iter->data);
+
+  g_slist_free (list);
+
+  return palette;
+}
+
+static GHashTable *
+gimp_palette_import_extract (GimpImage     *image,
+                             GimpPickable  *pickable,
+                             gint           pickable_off_x,
+                             gint           pickable_off_y,
+                             gboolean       selection_only,
+                             gint           x,
+                             gint           y,
+                             gint           width,
+                             gint           height,
+                             gint           n_colors,
+                             gint           threshold)
+{
+  GeglBuffer         *buffer;
+  GeglBufferIterator *iter;
+  GeglRectangle      *mask_roi = NULL;
+  GeglRectangle       rect     = { x, y, width, height };
+  GHashTable         *colors   = NULL;
+  const Babl         *format;
+  gint                bpp;
+  gint                mask_bpp = 0;
+
+  buffer = gimp_pickable_get_buffer (pickable);
+  format = babl_format ("R'G'B'A u8");
+
+  iter = gegl_buffer_iterator_new (buffer, &rect, 0, format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+  bpp = babl_format_get_bytes_per_pixel (format);
+
+  if (selection_only &&
+      ! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      GimpDrawable *mask = GIMP_DRAWABLE (gimp_image_get_mask (image));
+
+      rect.x = x + pickable_off_x;
+      rect.y = y + pickable_off_y;
+
+      buffer = gimp_drawable_get_buffer (mask);
+      format = babl_format ("Y u8");
+
+      gegl_buffer_iterator_add (iter, buffer, &rect, 0, format,
+                                GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+      mask_roi = &iter->items[1].roi;
+      mask_bpp = babl_format_get_bytes_per_pixel (format);
+    }
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guchar *data      = iter->items[0].data;
+      const guchar *mask_data = NULL;
+      gint          length    = iter->length;
+
+      if (mask_roi)
+        mask_data = iter->items[1].data;
+
+      while (length--)
+        {
+          /*  ignore unselected, and completely transparent pixels  */
+          if ((! mask_data || *mask_data) && data[ALPHA])
+            {
+              guchar rgba[MAX_CHANNELS]     = { 0, };
+              guchar rgb_real[MAX_CHANNELS] = { 0, };
+
+              memcpy (rgba, data, 4);
+              memcpy (rgb_real, rgba, 4);
+
+              rgba[0] = (rgba[0] / threshold) * threshold;
+              rgba[1] = (rgba[1] / threshold) * threshold;
+              rgba[2] = (rgba[2] / threshold) * threshold;
+
+              colors = gimp_palette_import_store_colors (colors,
+                                                         rgba, rgb_real,
+                                                         n_colors);
+            }
+
+          data += bpp;
+
+          if (mask_data)
+            mask_data += mask_bpp;
+        }
+    }
+
+  return colors;
+}
+
+GimpPalette *
+gimp_palette_import_from_image (GimpImage   *image,
+                                GimpContext *context,
+                                const gchar *palette_name,
+                                gint         n_colors,
+                                gint         threshold,
+                                gboolean     selection_only)
+{
+  GHashTable *colors;
+  gint        x, y;
+  gint        width, height;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (palette_name != NULL, NULL);
+  g_return_val_if_fail (n_colors > 1, NULL);
+  g_return_val_if_fail (threshold > 0, NULL);
+
+  gimp_pickable_flush (GIMP_PICKABLE (image));
+
+  if (selection_only)
+    {
+      gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                        &x, &y, &width, &height);
+    }
+  else
+    {
+      x      = 0;
+      y      = 0;
+      width  = gimp_image_get_width  (image);
+      height = gimp_image_get_height (image);
+    }
+
+  colors = gimp_palette_import_extract (image,
+                                        GIMP_PICKABLE (image),
+                                        0, 0,
+                                        selection_only,
+                                        x, y, width, height,
+                                        n_colors, threshold);
+
+  return gimp_palette_import_make_palette (colors, palette_name, context,
+                                           n_colors);
+}
+
+
+/*  create a palette from an indexed image  **********************************/
+
+GimpPalette *
+gimp_palette_import_from_indexed_image (GimpImage   *image,
+                                        GimpContext *context,
+                                        const gchar *palette_name)
+{
+  GimpPalette  *palette;
+  const guchar *colormap;
+  guint         n_colors;
+  gint          count;
+  GimpRGB       color;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (gimp_image_get_base_type (image) == GIMP_INDEXED, NULL);
+  g_return_val_if_fail (palette_name != NULL, NULL);
+
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+
+  colormap = gimp_image_get_colormap (image);
+  n_colors = gimp_image_get_colormap_size (image);
+
+  for (count = 0; count < n_colors; ++count)
+    {
+      gchar name[256];
+
+      g_snprintf (name, sizeof (name), _("Index %d"), count);
+
+      gimp_rgba_set_uchar (&color,
+                           colormap[count * 3 + 0],
+                           colormap[count * 3 + 1],
+                           colormap[count * 3 + 2],
+                           255);
+
+      gimp_palette_add_entry (palette, -1, name, &color);
+    }
+
+  return palette;
+}
+
+
+/*  create a palette from a drawable  ****************************************/
+
+GimpPalette *
+gimp_palette_import_from_drawable (GimpDrawable *drawable,
+                                   GimpContext  *context,
+                                   const gchar  *palette_name,
+                                   gint          n_colors,
+                                   gint          threshold,
+                                   gboolean      selection_only)
+{
+  GHashTable *colors = NULL;
+  gint        x, y;
+  gint        width, height;
+  gint        off_x, off_y;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (palette_name != NULL, NULL);
+  g_return_val_if_fail (n_colors > 1, NULL);
+  g_return_val_if_fail (threshold > 0, NULL);
+
+  if (selection_only)
+    {
+      if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                      &x, &y, &width, &height))
+        return NULL;
+    }
+  else
+    {
+      x      = 0;
+      y      = 0;
+      width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+      height = gimp_item_get_height (GIMP_ITEM (drawable));
+    }
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  colors =
+    gimp_palette_import_extract (gimp_item_get_image (GIMP_ITEM (drawable)),
+                                 GIMP_PICKABLE (drawable),
+                                 off_x, off_y,
+                                 selection_only,
+                                 x, y, width, height,
+                                 n_colors, threshold);
+
+  return gimp_palette_import_make_palette (colors, palette_name, context,
+                                           n_colors);
+}
+
+
+/*  create a palette from a file  **********************************/
+
+GimpPalette *
+gimp_palette_import_from_file (GimpContext  *context,
+                               GFile        *file,
+                               const gchar  *palette_name,
+                               GError      **error)
+{
+  GList        *palette_list = NULL;
+  GInputStream *input;
+  GError       *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (palette_name != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+  if (! input)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
+                   _("Could not open '%s' for reading: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+      g_clear_error (&my_error);
+      return NULL;
+    }
+
+  switch (gimp_palette_load_detect_format (file, input))
+    {
+    case GIMP_PALETTE_FILE_FORMAT_GPL:
+      palette_list = gimp_palette_load (context, file, input, error);
+      break;
+
+    case GIMP_PALETTE_FILE_FORMAT_ACT:
+      palette_list = gimp_palette_load_act (context, file, input, error);
+      break;
+
+    case GIMP_PALETTE_FILE_FORMAT_RIFF_PAL:
+      palette_list = gimp_palette_load_riff (context, file, input, error);
+      break;
+
+    case GIMP_PALETTE_FILE_FORMAT_PSP_PAL:
+      palette_list = gimp_palette_load_psp (context, file, input, error);
+      break;
+
+    case GIMP_PALETTE_FILE_FORMAT_ACO:
+      palette_list = gimp_palette_load_aco (context, file, input, error);
+      break;
+
+    case GIMP_PALETTE_FILE_FORMAT_CSS:
+      palette_list = gimp_palette_load_css (context, file, input, error);
+      break;
+
+    default:
+      g_set_error (error,
+                   GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Unknown type of palette file: %s"),
+                   gimp_file_get_utf8_name (file));
+      break;
+    }
+
+  g_object_unref (input);
+
+  if (palette_list)
+    {
+      GimpPalette *palette = g_object_ref (palette_list->data);
+
+      gimp_object_set_name (GIMP_OBJECT (palette), palette_name);
+
+      g_list_free_full (palette_list, (GDestroyNotify) g_object_unref);
+
+      return palette;
+    }
+
+  return NULL;
+}
diff --git a/app/core/gimppalette-import.h b/app/core/gimppalette-import.h
new file mode 100644
index 0000000..9cd3901
--- /dev/null
+++ b/app/core/gimppalette-import.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_IMPORT__
+#define __GIMP_PALETTE_IMPORT__
+
+
+GimpPalette * gimp_palette_import_from_gradient      (GimpGradient *gradient,
+                                                      GimpContext  *context,
+                                                      gboolean      reverse,
+                                                      GimpGradientBlendColorSpace  blend_color_space,
+                                                      const gchar  *palette_name,
+                                                      gint          n_colors);
+GimpPalette * gimp_palette_import_from_image         (GimpImage    *image,
+                                                      GimpContext  *context,
+                                                      const gchar  *palette_name,
+                                                      gint          n_colors,
+                                                      gint          threshold,
+                                                      gboolean      selection_only);
+GimpPalette * gimp_palette_import_from_indexed_image (GimpImage    *image,
+                                                      GimpContext  *context,
+                                                      const gchar  *palette_name);
+GimpPalette * gimp_palette_import_from_drawable      (GimpDrawable *drawable,
+                                                      GimpContext  *context,
+                                                      const gchar  *palette_name,
+                                                      gint          n_colors,
+                                                      gint          threshold,
+                                                      gboolean      selection_only);
+GimpPalette * gimp_palette_import_from_file          (GimpContext  *context,
+                                                      GFile        *file,
+                                                      const gchar  *palette_name,
+                                                      GError      **error);
+
+#endif  /* __GIMP_PALETTE_IMPORT_H__ */
diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
new file mode 100644
index 0000000..32a1fc1
--- /dev/null
+++ b/app/core/gimppalette-load.c
@@ -0,0 +1,702 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp-utils.h"
+#include "gimppalette.h"
+#include "gimppalette-load.h"
+
+#include "gimp-intl.h"
+
+
+GList *
+gimp_palette_load (GimpContext   *context,
+                   GFile         *file,
+                   GInputStream  *input,
+                   GError       **error)
+{
+  GimpPalette      *palette = NULL;
+  GimpPaletteEntry *entry;
+  GDataInputStream *data_input;
+  gchar            *str;
+  gsize             str_len;
+  gchar            *tok;
+  gint              r, g, b;
+  gint              linenum;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  data_input = g_data_input_stream_new (input);
+
+  r = g = b = 0;
+
+  linenum = 1;
+  str_len = 1024;
+  str = gimp_data_input_stream_read_line_always (data_input, &str_len,
+                                                 NULL, error);
+  if (! str)
+    goto failed;
+
+  if (! g_str_has_prefix (str, "GIMP Palette"))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Missing magic header."));
+      g_free (str);
+      goto failed;
+    }
+
+  g_free (str);
+
+  palette = g_object_new (GIMP_TYPE_PALETTE,
+                          "mime-type", "application/x-gimp-palette",
+                          NULL);
+
+  linenum++;
+  str_len = 1024;
+  str = gimp_data_input_stream_read_line_always (data_input, &str_len,
+                                                 NULL, error);
+  if (! str)
+    goto failed;
+
+  if (g_str_has_prefix (str, "Name: "))
+    {
+      gchar *utf8;
+
+      utf8 = gimp_any_to_utf8 (g_strstrip (str + strlen ("Name: ")), -1,
+                               _("Invalid UTF-8 string in palette file '%s'"),
+                               gimp_file_get_utf8_name (file));
+      gimp_object_take_name (GIMP_OBJECT (palette), utf8);
+      g_free (str);
+
+      linenum++;
+      str_len = 1024;
+      str = gimp_data_input_stream_read_line_always (data_input, &str_len,
+                                                     NULL, error);
+      if (! str)
+        goto failed;
+
+      if (g_str_has_prefix (str, "Columns: "))
+        {
+          gint columns;
+
+          if (! gimp_ascii_strtoi (g_strstrip (str + strlen ("Columns: ")),
+                                   NULL, 10, &columns))
+            {
+              g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                           _("Invalid column count."));
+              g_free (str);
+              goto failed;
+            }
+
+          if (columns < 0 || columns > 256)
+            {
+              g_message (_("Reading palette file '%s': "
+                           "Invalid number of columns in line %d. "
+                           "Using default value."),
+                         gimp_file_get_utf8_name (file), linenum);
+              columns = 0;
+            }
+
+          gimp_palette_set_columns (palette, columns);
+          g_free (str);
+
+          linenum++;
+          str_len = 1024;
+          str = gimp_data_input_stream_read_line_always (data_input, &str_len,
+                                                         NULL, error);
+          if (! str)
+            goto failed;
+        }
+    }
+  else /* old palette format */
+    {
+      gimp_object_take_name (GIMP_OBJECT (palette),
+                             g_path_get_basename (gimp_file_get_utf8_name (file)));
+    }
+
+  while (str)
+    {
+      GError *my_error = NULL;
+
+      if (str[0] != '#' && str[0] != '\0')
+        {
+          tok = strtok (str, " \t");
+          if (tok)
+            r = atoi (tok);
+          else
+            g_message (_("Reading palette file '%s': "
+                         "Missing RED component in line %d."),
+                       gimp_file_get_utf8_name (file), linenum);
+
+          tok = strtok (NULL, " \t");
+          if (tok)
+            g = atoi (tok);
+          else
+            g_message (_("Reading palette file '%s': "
+                         "Missing GREEN component in line %d."),
+                       gimp_file_get_utf8_name (file), linenum);
+
+          tok = strtok (NULL, " \t");
+          if (tok)
+            b = atoi (tok);
+          else
+            g_message (_("Reading palette file '%s': "
+                         "Missing BLUE component in line %d."),
+                       gimp_file_get_utf8_name (file), linenum);
+
+          /* optional name */
+          tok = strtok (NULL, "\n");
+
+          if (r < 0 || r > 255 ||
+              g < 0 || g > 255 ||
+              b < 0 || b > 255)
+            g_message (_("Reading palette file '%s': "
+                         "RGB value out of range in line %d."),
+                       gimp_file_get_utf8_name (file), linenum);
+
+          /* don't call gimp_palette_add_entry here, it's rather inefficient */
+          entry = g_slice_new0 (GimpPaletteEntry);
+
+          gimp_rgba_set_uchar (&entry->color,
+                               (guchar) r,
+                               (guchar) g,
+                               (guchar) b,
+                               255);
+
+          entry->name     = g_strdup (tok ? tok : _("Untitled"));
+          entry->position = gimp_palette_get_n_colors (palette);
+
+          palette->colors = g_list_prepend (palette->colors, entry);
+          palette->n_colors++;
+        }
+
+      g_free (str);
+
+      linenum++;
+      str_len = 1024;
+      str = g_data_input_stream_read_line (data_input, &str_len,
+                                           NULL, &my_error);
+      if (! str && my_error)
+        {
+          g_message (_("Reading palette file '%s': "
+                       "Read %d colors from truncated file: %s"),
+                     gimp_file_get_utf8_name (file),
+                     g_list_length (palette->colors),
+                     my_error->message);
+          g_clear_error (&my_error);
+        }
+    }
+
+  palette->colors = g_list_reverse (palette->colors);
+
+  g_object_unref (data_input);
+
+  return g_list_prepend (NULL, palette);
+
+ failed:
+
+  g_object_unref (data_input);
+
+  if (palette)
+    g_object_unref (palette);
+
+  g_prefix_error (error, _("In line %d of palette file: "), linenum);
+
+  return NULL;
+}
+
+GList *
+gimp_palette_load_act (GimpContext   *context,
+                       GFile         *file,
+                       GInputStream  *input,
+                       GError       **error)
+{
+  GimpPalette *palette;
+  gchar       *palette_name;
+  guchar       color_bytes[3];
+  gsize        bytes_read;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+  g_free (palette_name);
+
+  while (g_input_stream_read_all (input, color_bytes, sizeof (color_bytes),
+                                  &bytes_read, NULL, NULL) &&
+         bytes_read == sizeof (color_bytes))
+    {
+      GimpRGB color;
+
+      gimp_rgba_set_uchar (&color,
+                           color_bytes[0],
+                           color_bytes[1],
+                           color_bytes[2],
+                           255);
+      gimp_palette_add_entry (palette, -1, NULL, &color);
+    }
+
+  return g_list_prepend (NULL, palette);
+}
+
+GList *
+gimp_palette_load_riff (GimpContext   *context,
+                        GFile         *file,
+                        GInputStream  *input,
+                        GError       **error)
+{
+  GimpPalette *palette;
+  gchar       *palette_name;
+  guchar       color_bytes[4];
+  gsize        bytes_read;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+  g_free (palette_name);
+
+  if (! g_seekable_seek (G_SEEKABLE (input), 28, G_SEEK_SET, NULL, error))
+    {
+      g_object_unref (palette);
+      return NULL;
+    }
+
+  while (g_input_stream_read_all (input, color_bytes, sizeof (color_bytes),
+                                  &bytes_read, NULL, NULL) &&
+         bytes_read == sizeof (color_bytes))
+    {
+      GimpRGB color;
+
+      gimp_rgba_set_uchar (&color,
+                           color_bytes[0],
+                           color_bytes[1],
+                           color_bytes[2],
+                           255);
+      gimp_palette_add_entry (palette, -1, NULL, &color);
+    }
+
+  return g_list_prepend (NULL, palette);
+}
+
+GList *
+gimp_palette_load_psp (GimpContext   *context,
+                       GFile         *file,
+                       GInputStream  *input,
+                       GError       **error)
+{
+  GimpPalette *palette;
+  gchar       *palette_name;
+  guchar       color_bytes[4];
+  gint         number_of_colors;
+  gsize        bytes_read;
+  gint         i, j;
+  gboolean     color_ok;
+  gchar        buffer[4096];
+  /*Maximum valid file size: 256 * 4 * 3 + 256 * 2  ~= 3650 bytes */
+  gchar      **lines;
+  gchar      **ascii_colors;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+  g_free (palette_name);
+
+  if (! g_seekable_seek (G_SEEKABLE (input), 16, G_SEEK_SET, NULL, error))
+    {
+      g_object_unref (palette);
+      return NULL;
+    }
+
+  if (! g_input_stream_read_all (input, buffer, sizeof (buffer) - 1,
+                                 &bytes_read, NULL, error))
+    {
+      g_object_unref (palette);
+      return NULL;
+    }
+
+  buffer[bytes_read] = '\0';
+
+  lines = g_strsplit (buffer, "\x0d\x0a", -1);
+
+  number_of_colors = atoi (lines[0]);
+
+  for (i = 0; i < number_of_colors; i++)
+    {
+      if (lines[i + 1] == NULL)
+        {
+          g_printerr ("Premature end of file reading %s.",
+                      gimp_file_get_utf8_name (file));
+          break;
+        }
+
+      ascii_colors = g_strsplit (lines[i + 1], " ", 3);
+      color_ok = TRUE;
+
+      for (j = 0 ; j < 3; j++)
+        {
+          if (ascii_colors[j] == NULL)
+            {
+              g_printerr ("Corrupted palette file %s.",
+                          gimp_file_get_utf8_name (file));
+              color_ok = FALSE;
+              break;
+            }
+
+          color_bytes[j] = atoi (ascii_colors[j]);
+        }
+
+      if (color_ok)
+        {
+          GimpRGB color;
+
+          gimp_rgba_set_uchar (&color,
+                               color_bytes[0],
+                               color_bytes[1],
+                               color_bytes[2],
+                               255);
+          gimp_palette_add_entry (palette, -1, NULL, &color);
+        }
+
+      g_strfreev (ascii_colors);
+    }
+
+  g_strfreev (lines);
+
+  return g_list_prepend (NULL, palette);
+}
+
+GList *
+gimp_palette_load_aco (GimpContext   *context,
+                       GFile         *file,
+                       GInputStream  *input,
+                       GError       **error)
+{
+  GimpPalette *palette;
+  gchar       *palette_name;
+  gint         format_version;
+  gint         number_of_colors;
+  gint         i;
+  gchar        header[4];
+  gsize        bytes_read;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! g_input_stream_read_all (input, header, sizeof (header),
+                                 &bytes_read, NULL, error) ||
+      bytes_read != sizeof (header))
+    {
+      g_prefix_error (error,
+                      _("Could not read header from palette file '%s': "),
+                      gimp_file_get_utf8_name (file));
+      return NULL;
+    }
+
+  palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
+  palette = GIMP_PALETTE (gimp_palette_new (context, palette_name));
+  g_free (palette_name);
+
+  format_version   = header[1] + (header[0] << 8);
+  number_of_colors = header[3] + (header[2] << 8);
+
+  for (i = 0; i < number_of_colors; i++)
+    {
+      gchar     color_info[10];
+      gint      color_space;
+      gint      w, x, y, z;
+      gboolean  color_ok = FALSE;
+      GimpRGB   color;
+      GError   *my_error = NULL;
+
+      if (! g_input_stream_read_all (input, color_info, sizeof (color_info),
+                                     &bytes_read, NULL, &my_error) ||
+          bytes_read != sizeof (color_info))
+        {
+          if (palette->colors)
+            {
+              g_message (_("Reading palette file '%s': "
+                           "Read %d colors from truncated file: %s"),
+                         gimp_file_get_utf8_name (file),
+                         g_list_length (palette->colors),
+                         my_error ?
+                         my_error->message : _("Premature end of file."));
+              g_clear_error (&my_error);
+              break;
+            }
+
+          g_propagate_error (error, my_error);
+          g_object_unref (palette);
+
+          return NULL;
+        }
+
+      color_space = color_info[1] + (color_info[0] << 8);
+
+      w = (guchar) color_info[3] + ((guchar) color_info[2] << 8);
+      x = (guchar) color_info[5] + ((guchar) color_info[4] << 8);
+      y = (guchar) color_info[7] + ((guchar) color_info[6] << 8);
+      z = (guchar) color_info[9] + ((guchar) color_info[8] << 8);
+
+      if (color_space == 0) /* RGB */
+        {
+          gdouble R = ((gdouble) w) / 65536.0;
+          gdouble G = ((gdouble) x) / 65536.0;
+          gdouble B = ((gdouble) y) / 65536.0;
+
+          gimp_rgba_set (&color, R, G, B, 1.0);
+
+          color_ok = TRUE;
+        }
+      else if (color_space == 1) /* HSV */
+        {
+          GimpHSV hsv;
+
+          gdouble H = ((gdouble) w) / 65536.0;
+          gdouble S = ((gdouble) x) / 65536.0;
+          gdouble V = ((gdouble) y) / 65536.0;
+
+          gimp_hsva_set (&hsv, H, S, V, 1.0);
+          gimp_hsv_to_rgb (&hsv, &color);
+
+          color_ok = TRUE;
+        }
+      else if (color_space == 2) /* CMYK */
+        {
+          GimpCMYK cmyk;
+
+          gdouble C = 1.0 - (((gdouble) w) / 65536.0);
+          gdouble M = 1.0 - (((gdouble) x) / 65536.0);
+          gdouble Y = 1.0 - (((gdouble) y) / 65536.0);
+          gdouble K = 1.0 - (((gdouble) z) / 65536.0);
+
+          gimp_cmyka_set (&cmyk, C, M, Y, K, 1.0);
+          gimp_cmyk_to_rgb (&cmyk, &color);
+
+          color_ok = TRUE;
+        }
+      else if (color_space == 8) /* Grayscale */
+        {
+          gdouble K = 1.0 - (((gdouble) w) / 10000.0);
+
+          gimp_rgba_set (&color, K, K, K, 1.0);
+
+          color_ok = TRUE;
+        }
+      else if (color_space == 9) /* Wide? CMYK */
+        {
+          GimpCMYK cmyk;
+
+          gdouble C = 1.0 - (((gdouble) w) / 10000.0);
+          gdouble M = 1.0 - (((gdouble) x) / 10000.0);
+          gdouble Y = 1.0 - (((gdouble) y) / 10000.0);
+          gdouble K = 1.0 - (((gdouble) z) / 10000.0);
+
+          gimp_cmyka_set (&cmyk, C, M, Y, K, 1.0);
+          gimp_cmyk_to_rgb (&cmyk, &color);
+
+          color_ok = TRUE;
+        }
+      else
+        {
+          g_printerr ("Unsupported color space (%d) in ACO file %s\n",
+                      color_space, gimp_file_get_utf8_name (file));
+        }
+
+      if (format_version == 2)
+        {
+          gchar format2_preamble[4];
+          gint  number_of_chars;
+
+          if (! g_input_stream_read_all (input,
+                                         format2_preamble,
+                                         sizeof (format2_preamble),
+                                         &bytes_read, NULL, error) ||
+              bytes_read != sizeof (format2_preamble))
+            {
+              g_object_unref (palette);
+              return NULL;
+            }
+
+          number_of_chars = format2_preamble[3] + (format2_preamble[2] << 8);
+
+          if (! g_seekable_seek (G_SEEKABLE (input), number_of_chars * 2,
+                                 G_SEEK_SET, NULL, error))
+            {
+              g_object_unref (palette);
+              return NULL;
+            }
+        }
+
+      if (color_ok)
+        gimp_palette_add_entry (palette, -1, NULL, &color);
+    }
+
+  return g_list_prepend (NULL, palette);
+}
+
+
+GList *
+gimp_palette_load_css (GimpContext   *context,
+                       GFile         *file,
+                       GInputStream  *input,
+                       GError       **error)
+{
+  GimpPalette      *palette;
+  GDataInputStream *data_input;
+  gchar            *name;
+  GRegex           *regex;
+  gchar            *buf;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  regex = g_regex_new (".*color.*:(?P<param>.*);", G_REGEX_CASELESS, 0, error);
+  if (! regex)
+    return NULL;
+
+  name = g_path_get_basename (gimp_file_get_utf8_name (file));
+  palette = GIMP_PALETTE (gimp_palette_new (context, name));
+  g_free (name);
+
+  data_input = g_data_input_stream_new (input);
+
+  do
+    {
+      gsize  buf_len = 1024;
+
+      buf = g_data_input_stream_read_line (data_input, &buf_len, NULL, NULL);
+
+      if (buf)
+        {
+          GMatchInfo *matches;
+
+          if (g_regex_match (regex, buf, 0, &matches))
+            {
+              GimpRGB  color;
+              gchar   *word = g_match_info_fetch_named (matches, "param");
+
+              if (gimp_rgb_parse_css (&color, word, -1))
+                {
+                  if (! gimp_palette_find_entry (palette, &color, NULL))
+                    {
+                      gimp_palette_add_entry (palette, -1, NULL, &color);
+                    }
+                }
+
+              g_free (word);
+            }
+          g_match_info_free (matches);
+          g_free (buf);
+        }
+    }
+  while (buf);
+
+  g_regex_unref (regex);
+  g_object_unref (data_input);
+
+  return g_list_prepend (NULL, palette);
+}
+
+GimpPaletteFileFormat
+gimp_palette_load_detect_format (GFile        *file,
+                                 GInputStream *input)
+{
+  GimpPaletteFileFormat format = GIMP_PALETTE_FILE_FORMAT_UNKNOWN;
+  gchar                 header[16];
+  gsize                 bytes_read;
+
+  if (g_input_stream_read_all (input, &header, sizeof (header),
+                               &bytes_read, NULL, NULL) &&
+      bytes_read == sizeof (header))
+    {
+      if (g_str_has_prefix (header + 0, "RIFF") &&
+          g_str_has_prefix (header + 8, "PAL data"))
+        {
+          format = GIMP_PALETTE_FILE_FORMAT_RIFF_PAL;
+        }
+      else if (g_str_has_prefix (header, "GIMP Palette"))
+        {
+          format = GIMP_PALETTE_FILE_FORMAT_GPL;
+        }
+      else if (g_str_has_prefix (header, "JASC-PAL"))
+        {
+          format = GIMP_PALETTE_FILE_FORMAT_PSP_PAL;
+        }
+    }
+
+  if (format == GIMP_PALETTE_FILE_FORMAT_UNKNOWN)
+    {
+      gchar *lower = g_ascii_strdown (gimp_file_get_utf8_name (file), -1);
+
+      if (g_str_has_suffix (lower, ".aco"))
+        {
+          format = GIMP_PALETTE_FILE_FORMAT_ACO;
+        }
+      else if (g_str_has_suffix (lower, ".css"))
+        {
+          format = GIMP_PALETTE_FILE_FORMAT_CSS;
+        }
+
+      g_free (lower);
+    }
+
+  if (format == GIMP_PALETTE_FILE_FORMAT_UNKNOWN)
+    {
+      GFileInfo *info = g_file_query_info (file,
+                                           G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                           G_FILE_QUERY_INFO_NONE,
+                                           NULL, NULL);
+
+      if (info)
+        {
+          goffset size = g_file_info_get_size (info);
+
+          if (size == 768)
+            format = GIMP_PALETTE_FILE_FORMAT_ACT;
+
+          g_object_unref (info);
+        }
+    }
+
+  g_seekable_seek (G_SEEKABLE (input), 0, G_SEEK_SET, NULL, NULL);
+
+  return format;
+}
diff --git a/app/core/gimppalette-load.h b/app/core/gimppalette-load.h
new file mode 100644
index 0000000..0dececf
--- /dev/null
+++ b/app/core/gimppalette-load.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_LOAD_H__
+#define __GIMP_PALETTE_LOAD_H__
+
+
+#define GIMP_PALETTE_FILE_EXTENSION ".gpl"
+
+
+typedef enum
+{
+  GIMP_PALETTE_FILE_FORMAT_UNKNOWN,
+  GIMP_PALETTE_FILE_FORMAT_GPL,      /* GIMP palette                        */
+  GIMP_PALETTE_FILE_FORMAT_RIFF_PAL, /* RIFF palette                        */
+  GIMP_PALETTE_FILE_FORMAT_ACT,      /* Photoshop binary color palette      */
+  GIMP_PALETTE_FILE_FORMAT_PSP_PAL,  /* JASC's Paint Shop Pro color palette */
+  GIMP_PALETTE_FILE_FORMAT_ACO,      /* Photoshop ACO color file            */
+  GIMP_PALETTE_FILE_FORMAT_CSS       /* Cascaded Stylesheet file (CSS)      */
+} GimpPaletteFileFormat;
+
+
+GList               * gimp_palette_load               (GimpContext   *context,
+                                                       GFile         *file,
+                                                       GInputStream  *input,
+                                                       GError       **error);
+GList               * gimp_palette_load_act           (GimpContext   *context,
+                                                       GFile         *file,
+                                                       GInputStream  *input,
+                                                       GError       **error);
+GList               * gimp_palette_load_riff          (GimpContext   *context,
+                                                       GFile         *file,
+                                                       GInputStream  *input,
+                                                       GError       **error);
+GList               * gimp_palette_load_psp           (GimpContext   *context,
+                                                       GFile         *file,
+                                                       GInputStream  *input,
+                                                       GError       **error);
+GList               * gimp_palette_load_aco           (GimpContext   *context,
+                                                       GFile         *file,
+                                                       GInputStream  *input,
+                                                       GError       **error);
+GList               * gimp_palette_load_css           (GimpContext   *context,
+                                                       GFile         *file,
+                                                       GInputStream  *input,
+                                                       GError       **error);
+
+GimpPaletteFileFormat gimp_palette_load_detect_format (GFile         *file,
+                                                       GInputStream  *input);
+
+
+#endif /* __GIMP_PALETTE_H__ */
diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c
new file mode 100644
index 0000000..59556bf
--- /dev/null
+++ b/app/core/gimppalette-save.c
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimppalette.h"
+#include "gimppalette-save.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+gimp_palette_save (GimpData       *data,
+                   GOutputStream  *output,
+                   GError        **error)
+{
+  GimpPalette *palette = GIMP_PALETTE (data);
+  GString     *string;
+  GList       *list;
+
+  string = g_string_new ("GIMP Palette\n");
+
+  g_string_append_printf (string,
+                          "Name: %s\n"
+                          "Columns: %d\n"
+                          "#\n",
+                          gimp_object_get_name (palette),
+                          CLAMP (gimp_palette_get_columns (palette), 0, 256));
+
+  for (list = gimp_palette_get_colors (palette);
+       list;
+       list = g_list_next (list))
+    {
+      GimpPaletteEntry *entry = list->data;
+      guchar            r, g, b;
+
+      gimp_rgb_get_uchar (&entry->color, &r, &g, &b);
+
+      g_string_append_printf (string, "%3d %3d %3d\t%s\n",
+                              r, g, b, entry->name);
+    }
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, error))
+    {
+      g_string_free (string, TRUE);
+
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+
+  return TRUE;
+}
diff --git a/app/core/gimppalette-save.h b/app/core/gimppalette-save.h
new file mode 100644
index 0000000..e72c448
--- /dev/null
+++ b/app/core/gimppalette-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_SAVE_H__
+#define __GIMP_PALETTE_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_palette_save (GimpData       *data,
+                              GOutputStream  *output,
+                              GError        **error);
+
+
+#endif /* __GIMP_PALETTE_SAVE_H__ */
diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c
new file mode 100644
index 0000000..f5b848c
--- /dev/null
+++ b/app/core/gimppalette.c
@@ -0,0 +1,721 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimppalette.h"
+#include "gimppalette-load.h"
+#include "gimppalette-save.h"
+#include "gimptagged.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+#define RGB_EPSILON 1e-6
+
+
+/*  local function prototypes  */
+
+static void          gimp_palette_tagged_iface_init (GimpTaggedInterface  *iface);
+
+static void          gimp_palette_finalize          (GObject              *object);
+
+static gint64        gimp_palette_get_memsize       (GimpObject           *object,
+                                                     gint64               *gui_size);
+
+static void          gimp_palette_get_preview_size  (GimpViewable         *viewable,
+                                                     gint                  size,
+                                                     gboolean              popup,
+                                                     gboolean              dot_for_dot,
+                                                     gint                 *width,
+                                                     gint                 *height);
+static gboolean      gimp_palette_get_popup_size    (GimpViewable         *viewable,
+                                                     gint                  width,
+                                                     gint                  height,
+                                                     gboolean              dot_for_dot,
+                                                     gint                 *popup_width,
+                                                     gint                 *popup_height);
+static GimpTempBuf * gimp_palette_get_new_preview   (GimpViewable         *viewable,
+                                                     GimpContext          *context,
+                                                     gint                  width,
+                                                     gint                  height);
+static gchar       * gimp_palette_get_description   (GimpViewable         *viewable,
+                                                     gchar               **tooltip);
+static const gchar * gimp_palette_get_extension     (GimpData             *data);
+static void          gimp_palette_copy              (GimpData             *data,
+                                                     GimpData             *src_data);
+
+static void          gimp_palette_entry_free        (GimpPaletteEntry     *entry);
+static gint64        gimp_palette_entry_get_memsize (GimpPaletteEntry     *entry,
+                                                     gint64               *gui_size);
+static gchar       * gimp_palette_get_checksum      (GimpTagged           *tagged);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpPalette, gimp_palette, GIMP_TYPE_DATA,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_TAGGED,
+                                                gimp_palette_tagged_iface_init))
+
+#define parent_class gimp_palette_parent_class
+
+
+static void
+gimp_palette_class_init (GimpPaletteClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+
+  object_class->finalize            = gimp_palette_finalize;
+
+  gimp_object_class->get_memsize    = gimp_palette_get_memsize;
+
+  viewable_class->default_icon_name = "gtk-select-color";
+  viewable_class->get_preview_size  = gimp_palette_get_preview_size;
+  viewable_class->get_popup_size    = gimp_palette_get_popup_size;
+  viewable_class->get_new_preview   = gimp_palette_get_new_preview;
+  viewable_class->get_description   = gimp_palette_get_description;
+
+  data_class->save                  = gimp_palette_save;
+  data_class->get_extension         = gimp_palette_get_extension;
+  data_class->copy                  = gimp_palette_copy;
+}
+
+static void
+gimp_palette_tagged_iface_init (GimpTaggedInterface *iface)
+{
+  iface->get_checksum = gimp_palette_get_checksum;
+}
+
+static void
+gimp_palette_init (GimpPalette *palette)
+{
+  palette->colors    = NULL;
+  palette->n_colors  = 0;
+  palette->n_columns = 0;
+}
+
+static void
+gimp_palette_finalize (GObject *object)
+{
+  GimpPalette *palette = GIMP_PALETTE (object);
+
+  if (palette->colors)
+    {
+      g_list_free_full (palette->colors,
+                        (GDestroyNotify) gimp_palette_entry_free);
+      palette->colors = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_palette_get_memsize (GimpObject *object,
+                          gint64     *gui_size)
+{
+  GimpPalette *palette = GIMP_PALETTE (object);
+  gint64       memsize = 0;
+
+  memsize += gimp_g_list_get_memsize_foreach (palette->colors,
+                                              (GimpMemsizeFunc)
+                                              gimp_palette_entry_get_memsize,
+                                              gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_palette_get_preview_size (GimpViewable *viewable,
+                               gint          size,
+                               gboolean      popup,
+                               gboolean      dot_for_dot,
+                               gint         *width,
+                               gint         *height)
+{
+  *width  = size;
+  *height = 1 + size / 2;
+}
+
+static gboolean
+gimp_palette_get_popup_size (GimpViewable *viewable,
+                             gint          width,
+                             gint          height,
+                             gboolean      dot_for_dot,
+                             gint         *popup_width,
+                             gint         *popup_height)
+{
+  GimpPalette *palette = GIMP_PALETTE (viewable);
+  gint         p_width;
+  gint         p_height;
+
+  if (! palette->n_colors)
+    return FALSE;
+
+  if (palette->n_columns)
+    p_width = palette->n_columns;
+  else
+    p_width = MIN (palette->n_colors, 16);
+
+  p_height = MAX (1, palette->n_colors / p_width);
+
+  if (p_width * 4 > width || p_height * 4 > height)
+    {
+      *popup_width  = p_width  * 4;
+      *popup_height = p_height * 4;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GimpTempBuf *
+gimp_palette_get_new_preview (GimpViewable *viewable,
+                              GimpContext  *context,
+                              gint          width,
+                              gint          height)
+{
+  GimpPalette *palette  = GIMP_PALETTE (viewable);
+  GimpTempBuf *temp_buf;
+  guchar      *buf;
+  guchar      *b;
+  GList       *list;
+  gint         columns;
+  gint         rows;
+  gint         cell_size;
+  gint         x, y;
+
+  temp_buf = gimp_temp_buf_new (width, height, babl_format ("R'G'B' u8"));
+  memset (gimp_temp_buf_get_data (temp_buf), 255, width * height * 3);
+
+  if (palette->n_columns > 1)
+    cell_size = MAX (4, width / palette->n_columns);
+  else
+    cell_size = 4;
+
+  columns = width  / cell_size;
+  rows    = height / cell_size;
+
+  buf = gimp_temp_buf_get_data (temp_buf);
+  b   = g_new (guchar, width * 3);
+
+  list = palette->colors;
+
+  for (y = 0; y < rows && list; y++)
+    {
+      gint i;
+
+      memset (b, 255, width * 3);
+
+      for (x = 0; x < columns && list; x++)
+        {
+          GimpPaletteEntry *entry = list->data;
+
+          list = g_list_next (list);
+
+          gimp_rgb_get_uchar (&entry->color,
+                              &b[x * cell_size * 3 + 0],
+                              &b[x * cell_size * 3 + 1],
+                              &b[x * cell_size * 3 + 2]);
+
+          for (i = 1; i < cell_size; i++)
+            {
+              b[(x * cell_size + i) * 3 + 0] = b[(x * cell_size) * 3 + 0];
+              b[(x * cell_size + i) * 3 + 1] = b[(x * cell_size) * 3 + 1];
+              b[(x * cell_size + i) * 3 + 2] = b[(x * cell_size) * 3 + 2];
+            }
+        }
+
+      for (i = 0; i < cell_size; i++)
+        memcpy (buf + ((y * cell_size + i) * width) * 3, b, width * 3);
+    }
+
+  g_free (b);
+
+  return temp_buf;
+}
+
+static gchar *
+gimp_palette_get_description (GimpViewable  *viewable,
+                              gchar        **tooltip)
+{
+  GimpPalette *palette = GIMP_PALETTE (viewable);
+
+  return g_strdup_printf ("%s (%d)",
+                          gimp_object_get_name (palette),
+                          palette->n_colors);
+}
+
+GimpData *
+gimp_palette_new (GimpContext *context,
+                  const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (*name != '\0', NULL);
+
+  return g_object_new (GIMP_TYPE_PALETTE,
+                       "name", name,
+                       NULL);
+}
+
+GimpData *
+gimp_palette_get_standard (GimpContext *context)
+{
+  static GimpData *standard_palette = NULL;
+
+  if (! standard_palette)
+    {
+      standard_palette = gimp_palette_new (context, "Standard");
+
+      gimp_data_clean (standard_palette);
+      gimp_data_make_internal (standard_palette, "gimp-palette-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_palette),
+                                 (gpointer *) &standard_palette);
+    }
+
+  return standard_palette;
+}
+
+static const gchar *
+gimp_palette_get_extension (GimpData *data)
+{
+  return GIMP_PALETTE_FILE_EXTENSION;
+}
+
+static void
+gimp_palette_copy (GimpData *data,
+                   GimpData *src_data)
+{
+  GimpPalette *palette     = GIMP_PALETTE (data);
+  GimpPalette *src_palette = GIMP_PALETTE (src_data);
+  GList       *list;
+
+  gimp_data_freeze (data);
+
+  if (palette->colors)
+    {
+      g_list_free_full (palette->colors,
+                        (GDestroyNotify) gimp_palette_entry_free);
+      palette->colors = NULL;
+    }
+
+  palette->n_colors  = 0;
+  palette->n_columns = src_palette->n_columns;
+
+  for (list = src_palette->colors; list; list = g_list_next (list))
+    {
+      GimpPaletteEntry *entry = list->data;
+
+      gimp_palette_add_entry (palette, -1, entry->name, &entry->color);
+    }
+
+  gimp_data_thaw (data);
+}
+
+static gchar *
+gimp_palette_get_checksum (GimpTagged *tagged)
+{
+  GimpPalette *palette         = GIMP_PALETTE (tagged);
+  gchar       *checksum_string = NULL;
+
+  if (palette->n_colors > 0)
+    {
+      GChecksum *checksum       = g_checksum_new (G_CHECKSUM_MD5);
+      GList     *color_iterator = palette->colors;
+
+      g_checksum_update (checksum, (const guchar *) &palette->n_colors, sizeof (palette->n_colors));
+      g_checksum_update (checksum, (const guchar *) &palette->n_columns, sizeof (palette->n_columns));
+
+      while (color_iterator)
+        {
+          GimpPaletteEntry *entry = (GimpPaletteEntry *) color_iterator->data;
+
+          g_checksum_update (checksum, (const guchar *) &entry->color, sizeof (entry->color));
+          if (entry->name)
+            g_checksum_update (checksum, (const guchar *) entry->name, strlen (entry->name));
+
+          color_iterator = g_list_next (color_iterator);
+        }
+
+      checksum_string = g_strdup (g_checksum_get_string (checksum));
+
+      g_checksum_free (checksum);
+    }
+
+  return checksum_string;
+}
+
+
+/*  public functions  */
+
+GList *
+gimp_palette_get_colors (GimpPalette *palette)
+{
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), NULL);
+
+  return palette->colors;
+}
+
+gint
+gimp_palette_get_n_colors (GimpPalette *palette)
+{
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), 0);
+
+  return palette->n_colors;
+}
+
+void
+gimp_palette_move_entry (GimpPalette      *palette,
+                         GimpPaletteEntry *entry,
+                         gint              position)
+{
+  GList *list;
+  gint   pos = 0;
+
+  g_return_if_fail (GIMP_IS_PALETTE (palette));
+  g_return_if_fail (entry != NULL);
+
+  if (g_list_find (palette->colors, entry))
+    {
+      pos = entry->position;
+
+      if (entry->position == position)
+        return;
+
+      entry->position = position;
+      palette->colors = g_list_remove (palette->colors,
+                                       entry);
+      palette->colors = g_list_insert (palette->colors,
+                                       entry, position);
+
+      if (pos < position)
+        {
+          for (list = g_list_nth (palette->colors, pos);
+               list && pos < position;
+               list = g_list_next (list))
+            {
+              entry = (GimpPaletteEntry *) list->data;
+
+              entry->position = pos++;
+            }
+        }
+      else
+        {
+          for (list = g_list_nth (palette->colors, position + 1);
+               list && position < pos;
+               list = g_list_next (list))
+            {
+              entry = (GimpPaletteEntry *) list->data;
+
+              entry->position += 1;
+              pos--;
+            }
+        }
+
+      gimp_data_dirty (GIMP_DATA (palette));
+    }
+}
+
+GimpPaletteEntry *
+gimp_palette_add_entry (GimpPalette   *palette,
+                        gint           position,
+                        const gchar   *name,
+                        const GimpRGB *color)
+{
+  GimpPaletteEntry *entry;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), NULL);
+  g_return_val_if_fail (color != NULL, NULL);
+
+  entry = g_slice_new0 (GimpPaletteEntry);
+
+  entry->color = *color;
+  entry->name  = g_strdup (name ? name : _("Untitled"));
+
+  if (position < 0 || position >= palette->n_colors)
+    {
+      entry->position = palette->n_colors;
+      palette->colors = g_list_append (palette->colors, entry);
+    }
+  else
+    {
+      GList *list;
+
+      entry->position = position;
+      palette->colors = g_list_insert (palette->colors, entry, position);
+
+      /* renumber the displaced entries */
+      for (list = g_list_nth (palette->colors, position + 1);
+           list;
+           list = g_list_next (list))
+        {
+          GimpPaletteEntry *entry2 = list->data;
+
+          entry2->position += 1;
+        }
+    }
+
+  palette->n_colors += 1;
+
+  gimp_data_dirty (GIMP_DATA (palette));
+
+  return entry;
+}
+
+void
+gimp_palette_delete_entry (GimpPalette      *palette,
+                           GimpPaletteEntry *entry)
+{
+  GList *list;
+  gint   pos = 0;
+
+  g_return_if_fail (GIMP_IS_PALETTE (palette));
+  g_return_if_fail (entry != NULL);
+
+  if (g_list_find (palette->colors, entry))
+    {
+      pos = entry->position;
+      gimp_palette_entry_free (entry);
+
+      palette->colors = g_list_remove (palette->colors, entry);
+
+      palette->n_colors--;
+
+      for (list = g_list_nth (palette->colors, pos);
+           list;
+           list = g_list_next (list))
+        {
+          entry = (GimpPaletteEntry *) list->data;
+
+          entry->position = pos++;
+        }
+
+      gimp_data_dirty (GIMP_DATA (palette));
+    }
+}
+
+gboolean
+gimp_palette_set_entry (GimpPalette   *palette,
+                        gint           position,
+                        const gchar   *name,
+                        const GimpRGB *color)
+{
+  GimpPaletteEntry *entry;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+
+  entry = gimp_palette_get_entry (palette, position);
+
+  if (! entry)
+    return FALSE;
+
+  entry->color = *color;
+
+  if (entry->name)
+    g_free (entry->name);
+
+  entry->name = g_strdup (name);
+
+  gimp_data_dirty (GIMP_DATA (palette));
+
+  return TRUE;
+}
+
+gboolean
+gimp_palette_set_entry_color (GimpPalette   *palette,
+                              gint           position,
+                              const GimpRGB *color)
+{
+  GimpPaletteEntry *entry;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+
+  entry = gimp_palette_get_entry (palette, position);
+
+  if (! entry)
+    return FALSE;
+
+  entry->color = *color;
+
+  gimp_data_dirty (GIMP_DATA (palette));
+
+  return TRUE;
+}
+
+gboolean
+gimp_palette_set_entry_name (GimpPalette *palette,
+                             gint         position,
+                             const gchar *name)
+{
+  GimpPaletteEntry *entry;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), FALSE);
+
+  entry = gimp_palette_get_entry (palette, position);
+
+  if (! entry)
+    return FALSE;
+
+  if (entry->name)
+    g_free (entry->name);
+
+  entry->name = g_strdup (name);
+
+  gimp_data_dirty (GIMP_DATA (palette));
+
+  return TRUE;
+}
+
+GimpPaletteEntry *
+gimp_palette_get_entry (GimpPalette *palette,
+                        gint         position)
+{
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), NULL);
+
+  return g_list_nth_data (palette->colors, position);
+}
+
+void
+gimp_palette_set_columns (GimpPalette *palette,
+                          gint         columns)
+{
+  g_return_if_fail (GIMP_IS_PALETTE (palette));
+
+  columns = CLAMP (columns, 0, 64);
+
+  if (palette->n_columns != columns)
+    {
+      palette->n_columns = columns;
+
+      gimp_data_dirty (GIMP_DATA (palette));
+    }
+}
+
+gint
+gimp_palette_get_columns (GimpPalette *palette)
+{
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), 0);
+
+  return palette->n_columns;
+}
+
+GimpPaletteEntry *
+gimp_palette_find_entry (GimpPalette      *palette,
+                         const GimpRGB    *color,
+                         GimpPaletteEntry *start_from)
+{
+  GimpPaletteEntry *entry;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE (palette), NULL);
+  g_return_val_if_fail (color != NULL, NULL);
+
+  if (! start_from)
+    {
+      GList *list;
+
+      /* search from the start */
+
+      for (list = palette->colors; list; list = g_list_next (list))
+        {
+          entry = (GimpPaletteEntry *) list->data;
+          if (gimp_rgb_distance (&entry->color, color) < RGB_EPSILON)
+            return entry;
+        }
+    }
+  else if (gimp_rgb_distance (&start_from->color, color) < RGB_EPSILON)
+    {
+      return start_from;
+    }
+  else
+    {
+      GList *old = g_list_find (palette->colors, start_from);
+      GList *next;
+      GList *prev;
+
+      g_return_val_if_fail (old != NULL, NULL);
+
+      next = old->next;
+      prev = old->prev;
+
+      /* proximity-based search */
+
+      while (next || prev)
+        {
+          if (next)
+            {
+              entry = (GimpPaletteEntry *) next->data;
+              if (gimp_rgb_distance (&entry->color, color) < RGB_EPSILON)
+                return entry;
+
+              next = next->next;
+            }
+
+          if (prev)
+            {
+              entry = (GimpPaletteEntry *) prev->data;
+              if (gimp_rgb_distance (&entry->color, color) < RGB_EPSILON)
+                return entry;
+
+              prev = prev->prev;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_palette_entry_free (GimpPaletteEntry *entry)
+{
+  g_return_if_fail (entry != NULL);
+
+  g_free (entry->name);
+
+  g_slice_free (GimpPaletteEntry, entry);
+}
+
+static gint64
+gimp_palette_entry_get_memsize (GimpPaletteEntry *entry,
+                                gint64           *gui_size)
+{
+  gint64 memsize = sizeof (GimpPaletteEntry);
+
+  memsize += gimp_string_get_memsize (entry->name);
+
+  return memsize;
+}
diff --git a/app/core/gimppalette.h b/app/core/gimppalette.h
new file mode 100644
index 0000000..5bc6d8c
--- /dev/null
+++ b/app/core/gimppalette.h
@@ -0,0 +1,103 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_H__
+#define __GIMP_PALETTE_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_PALETTE            (gimp_palette_get_type ())
+#define GIMP_PALETTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PALETTE, GimpPalette))
+#define GIMP_PALETTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PALETTE, GimpPaletteClass))
+#define GIMP_IS_PALETTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PALETTE))
+#define GIMP_IS_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PALETTE))
+#define GIMP_PALETTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PALETTE, GimpPaletteClass))
+
+
+struct _GimpPaletteEntry
+{
+  GimpRGB  color;
+  gchar   *name;
+
+  /* EEK */
+  gint     position;
+};
+
+
+typedef struct _GimpPaletteClass GimpPaletteClass;
+
+struct _GimpPalette
+{
+  GimpData  parent_instance;
+
+  GList    *colors;
+  gint      n_colors;
+
+  gint      n_columns;
+};
+
+struct _GimpPaletteClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType              gimp_palette_get_type        (void) G_GNUC_CONST;
+
+GimpData         * gimp_palette_new             (GimpContext      *context,
+                                                 const gchar      *name);
+GimpData         * gimp_palette_get_standard    (GimpContext      *context);
+
+GList            * gimp_palette_get_colors      (GimpPalette      *palette);
+gint               gimp_palette_get_n_colors    (GimpPalette      *palette);
+
+void               gimp_palette_move_entry      (GimpPalette      *palette,
+                                                 GimpPaletteEntry *entry,
+                                                 gint              position);
+
+GimpPaletteEntry * gimp_palette_add_entry       (GimpPalette      *palette,
+                                                 gint              position,
+                                                 const gchar      *name,
+                                                 const GimpRGB    *color);
+void               gimp_palette_delete_entry    (GimpPalette      *palette,
+                                                 GimpPaletteEntry *entry);
+
+gboolean           gimp_palette_set_entry       (GimpPalette      *palette,
+                                                 gint              position,
+                                                 const gchar      *name,
+                                                 const GimpRGB    *color);
+gboolean           gimp_palette_set_entry_color (GimpPalette      *palette,
+                                                 gint              position,
+                                                 const GimpRGB    *color);
+gboolean           gimp_palette_set_entry_name  (GimpPalette      *palette,
+                                                 gint              position,
+                                                 const gchar      *name);
+GimpPaletteEntry * gimp_palette_get_entry       (GimpPalette      *palette,
+                                                 gint              position);
+
+void               gimp_palette_set_columns     (GimpPalette      *palette,
+                                                 gint              columns);
+gint               gimp_palette_get_columns     (GimpPalette      *palette);
+
+GimpPaletteEntry * gimp_palette_find_entry      (GimpPalette      *palette,
+                                                 const GimpRGB    *color,
+                                                 GimpPaletteEntry *start_from);
+
+
+#endif /* __GIMP_PALETTE_H__ */
diff --git a/app/core/gimppalettemru.c b/app/core/gimppalettemru.c
new file mode 100644
index 0000000..f68c469
--- /dev/null
+++ b/app/core/gimppalettemru.c
@@ -0,0 +1,230 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppalettemru.c
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimppalettemru.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_N_COLORS 256
+#define RGBA_EPSILON 1e-4
+
+enum
+{
+  COLOR_HISTORY = 1
+};
+
+
+G_DEFINE_TYPE (GimpPaletteMru, gimp_palette_mru, GIMP_TYPE_PALETTE)
+
+#define parent_class gimp_palette_mru_parent_class
+
+
+static void
+gimp_palette_mru_class_init (GimpPaletteMruClass *klass)
+{
+}
+
+static void
+gimp_palette_mru_init (GimpPaletteMru *palette)
+{
+}
+
+
+/*  public functions  */
+
+GimpData *
+gimp_palette_mru_new (const gchar *name)
+{
+  GimpPaletteMru *palette;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (*name != '\0', NULL);
+
+  palette = g_object_new (GIMP_TYPE_PALETTE_MRU,
+                          "name",      name,
+                          "mime-type", "application/x-gimp-palette",
+                          NULL);
+
+  return GIMP_DATA (palette);
+}
+
+void
+gimp_palette_mru_load (GimpPaletteMru *mru,
+                       GFile          *file)
+{
+  GimpPalette *palette;
+  GScanner    *scanner;
+  GTokenType   token;
+
+  g_return_if_fail (GIMP_IS_PALETTE_MRU (mru));
+  g_return_if_fail (G_IS_FILE (file));
+
+  palette = GIMP_PALETTE (mru);
+
+  scanner = gimp_scanner_new_gfile (file, NULL);
+  if (! scanner)
+    return;
+
+  g_scanner_scope_add_symbol (scanner, 0, "color-history",
+                              GINT_TO_POINTER (COLOR_HISTORY));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          if (scanner->value.v_symbol == GINT_TO_POINTER (COLOR_HISTORY))
+            {
+              while (g_scanner_peek_next_token (scanner) == G_TOKEN_LEFT_PAREN)
+                {
+                  GimpRGB color;
+
+                  if (! gimp_scanner_parse_color (scanner, &color))
+                    goto end;
+
+                  gimp_palette_add_entry (palette, -1,
+                                          _("History Color"), &color);
+
+                  if (gimp_palette_get_n_colors (palette) == MAX_N_COLORS)
+                    goto end;
+                }
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+ end:
+  gimp_scanner_destroy (scanner);
+}
+
+void
+gimp_palette_mru_save (GimpPaletteMru *mru,
+                       GFile          *file)
+{
+  GimpPalette      *palette;
+  GimpConfigWriter *writer;
+  GList            *list;
+
+  g_return_if_fail (GIMP_IS_PALETTE_MRU (mru));
+  g_return_if_fail (G_IS_FILE (file));
+
+  writer = gimp_config_writer_new_gfile (file,
+                                         TRUE,
+                                         "GIMP colorrc\n\n"
+                                         "This file holds a list of "
+                                         "recently used colors.",
+                                         NULL);
+  if (! writer)
+    return;
+
+  palette = GIMP_PALETTE (mru);
+
+  gimp_config_writer_open (writer, "color-history");
+
+  for (list = palette->colors; list; list = g_list_next (list))
+    {
+      GimpPaletteEntry *entry = list->data;
+      gchar             buf[4][G_ASCII_DTOSTR_BUF_SIZE];
+
+      g_ascii_dtostr (buf[0], G_ASCII_DTOSTR_BUF_SIZE, entry->color.r);
+      g_ascii_dtostr (buf[1], G_ASCII_DTOSTR_BUF_SIZE, entry->color.g);
+      g_ascii_dtostr (buf[2], G_ASCII_DTOSTR_BUF_SIZE, entry->color.b);
+      g_ascii_dtostr (buf[3], G_ASCII_DTOSTR_BUF_SIZE, entry->color.a);
+
+      gimp_config_writer_open (writer, "color-rgba");
+      gimp_config_writer_printf (writer, "%s %s %s %s",
+                                 buf[0], buf[1], buf[2], buf[3]);
+      gimp_config_writer_close (writer);
+    }
+
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_finish (writer, "end of colorrc", NULL);
+}
+
+void
+gimp_palette_mru_add (GimpPaletteMru *mru,
+                      const GimpRGB  *color)
+{
+  GimpPalette *palette;
+  GList       *list;
+
+  g_return_if_fail (GIMP_IS_PALETTE_MRU (mru));
+  g_return_if_fail (color != NULL);
+
+  palette = GIMP_PALETTE (mru);
+
+  /*  is the added color already there?  */
+  for (list = gimp_palette_get_colors (palette);
+       list;
+       list = g_list_next (list))
+    {
+      GimpPaletteEntry *entry = list->data;
+
+      if (gimp_rgba_distance (&entry->color, color) < RGBA_EPSILON)
+        {
+          gimp_palette_move_entry (palette, entry, 0);
+
+          /*  Even though they are nearly the same color, let's make them
+           *  exactly equal.
+           */
+          gimp_palette_set_entry_color (palette, 0, color);
+
+          return;
+        }
+    }
+
+  if (gimp_palette_get_n_colors (palette) == MAX_N_COLORS)
+    {
+      gimp_palette_delete_entry (palette,
+                                 gimp_palette_get_entry (palette,
+                                                         MAX_N_COLORS - 1));
+    }
+
+  gimp_palette_add_entry (palette, 0, _("History Color"), color);
+}
diff --git a/app/core/gimppalettemru.h b/app/core/gimppalettemru.h
new file mode 100644
index 0000000..0525553
--- /dev/null
+++ b/app/core/gimppalettemru.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppalettemru.h
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_MRU_H__
+#define __GIMP_PALETTE_MRU_H__
+
+
+#include "gimppalette.h"
+
+
+#define GIMP_TYPE_PALETTE_MRU            (gimp_palette_mru_get_type ())
+#define GIMP_PALETTE_MRU(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PALETTE_MRU, GimpPaletteMru))
+#define GIMP_PALETTE_MRU_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PALETTE_MRU, GimpPaletteMruClass))
+#define GIMP_IS_PALETTE_MRU(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PALETTE_MRU))
+#define GIMP_IS_PALETTE_MRU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PALETTE_MRU))
+#define GIMP_PALETTE_MRU_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PALETTE_MRU, GimpPaletteMruClass))
+
+
+typedef struct _GimpPaletteMruClass GimpPaletteMruClass;
+
+struct _GimpPaletteMru
+{
+  GimpPalette  parent_instance;
+};
+
+struct _GimpPaletteMruClass
+{
+  GimpPaletteClass  parent_class;
+};
+
+
+GType      gimp_palette_mru_get_type (void) G_GNUC_CONST;
+
+GimpData * gimp_palette_mru_new      (const gchar    *name);
+
+void       gimp_palette_mru_load     (GimpPaletteMru *mru,
+                                      GFile          *file);
+void       gimp_palette_mru_save     (GimpPaletteMru *mru,
+                                      GFile          *file);
+
+void       gimp_palette_mru_add      (GimpPaletteMru *mru,
+                                      const GimpRGB  *color);
+
+
+#endif  /*  __GIMP_PALETTE_MRU_H__  */
diff --git a/app/core/gimpparamspecs-desc.c b/app/core/gimpparamspecs-desc.c
new file mode 100644
index 0000000..a59f14f
--- /dev/null
+++ b/app/core/gimpparamspecs-desc.c
@@ -0,0 +1,193 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpparamspecs.h"
+#include "gimpparamspecs-desc.h"
+
+
+static inline const gchar *
+gimp_param_spec_get_blurb (GParamSpec *pspec)
+{
+  const gchar *blurb = g_param_spec_get_blurb (pspec);
+
+  return blurb ? blurb : "";
+}
+
+static gchar *
+gimp_param_spec_boolean_desc (GParamSpec *pspec)
+{
+  const gchar *blurb = gimp_param_spec_get_blurb (pspec);
+
+  return g_strconcat (blurb, " (TRUE or FALSE)", NULL);
+}
+
+static gchar *
+gimp_param_spec_int32_desc (GParamSpec *pspec)
+{
+  GParamSpecInt *ispec = G_PARAM_SPEC_INT (pspec);
+  const gchar   *blurb = gimp_param_spec_get_blurb (pspec);
+
+  if (ispec->minimum == G_MININT32 && ispec->maximum == G_MAXINT32)
+    return g_strdup (blurb);
+
+  if (ispec->minimum == G_MININT32)
+    return g_strdup_printf ("%s (%s <= %d)", blurb,
+                            g_param_spec_get_name (pspec),
+                            ispec->maximum);
+
+  if (ispec->maximum == G_MAXINT32)
+    return g_strdup_printf ("%s (%s >= %d)", blurb,
+                            g_param_spec_get_name (pspec),
+                            ispec->minimum);
+
+  return g_strdup_printf ("%s (%d <= %s <= %d)", blurb,
+                          ispec->minimum,
+                          g_param_spec_get_name (pspec),
+                          ispec->maximum);
+}
+
+static gchar *
+gimp_param_spec_double_desc (GParamSpec *pspec)
+{
+  GParamSpecDouble *dspec = G_PARAM_SPEC_DOUBLE (pspec);
+  const gchar      *blurb = gimp_param_spec_get_blurb (pspec);
+
+  if (dspec->minimum == - G_MAXDOUBLE && dspec->maximum == G_MAXDOUBLE)
+    return g_strdup (blurb);
+
+  if (dspec->minimum == - G_MAXDOUBLE)
+    return g_strdup_printf ("%s (%s <= %g)", blurb,
+                            g_param_spec_get_name (pspec),
+                            dspec->maximum);
+
+  if (dspec->maximum == G_MAXDOUBLE)
+    return g_strdup_printf ("%s (%s >= %g)", blurb,
+                            g_param_spec_get_name (pspec),
+                            dspec->minimum);
+
+  return g_strdup_printf ("%s (%g <= %s <= %g)", blurb,
+                          dspec->minimum,
+                          g_param_spec_get_name (pspec),
+                          dspec->maximum);
+}
+
+static gchar *
+gimp_param_spec_enum_desc (GParamSpec *pspec)
+{
+  const gchar    *blurb      = gimp_param_spec_get_blurb (pspec);
+  GString        *str        = g_string_new (blurb);
+  GEnumClass     *enum_class = g_type_class_peek (pspec->value_type);
+  GEnumValue     *enum_value;
+  GSList         *excluded;
+  gint            i, n;
+
+  if (GIMP_IS_PARAM_SPEC_ENUM (pspec))
+    excluded = GIMP_PARAM_SPEC_ENUM (pspec)->excluded_values;
+  else
+    excluded = NULL;
+
+  g_string_append (str, " { ");
+
+  for (i = 0, n = 0, enum_value = enum_class->values;
+       i < enum_class->n_values;
+       i++, enum_value++)
+    {
+      GSList *list;
+      gchar  *name;
+
+      for (list = excluded; list; list = list->next)
+        {
+          gint value = GPOINTER_TO_INT (list->data);
+
+          if (value == enum_value->value)
+            break;
+        }
+
+      if (list)
+        continue;
+
+      if (n > 0)
+        g_string_append (str, ", ");
+
+      if (G_LIKELY (g_str_has_prefix (enum_value->value_name, "GIMP_")))
+        name = gimp_canonicalize_identifier (enum_value->value_name + 5);
+      else
+        name = gimp_canonicalize_identifier (enum_value->value_name);
+
+      g_string_append (str, name);
+      g_free (name);
+
+      g_string_append_printf (str, " (%d)", enum_value->value);
+
+      n++;
+    }
+
+  g_string_append (str, " }");
+
+  return g_string_free (str, FALSE);
+}
+
+/**
+ * gimp_param_spec_get_desc:
+ * @pspec: a #GParamSpec
+ *
+ * This function creates a description of the passed @pspec, which is
+ * suitable for use in the PDB.  Actually, it currently only deals with
+ * parameter types used in the PDB and should not be used for anything
+ * else.
+ *
+ * Return value: A newly allocated string describing the parameter.
+ */
+gchar *
+gimp_param_spec_get_desc (GParamSpec *pspec)
+{
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+  if (GIMP_IS_PARAM_SPEC_UNIT (pspec))
+    {
+    }
+  else if (GIMP_IS_PARAM_SPEC_INT32 (pspec))
+    {
+      return gimp_param_spec_int32_desc (pspec);
+    }
+  else
+    {
+      switch (G_TYPE_FUNDAMENTAL (pspec->value_type))
+        {
+        case G_TYPE_BOOLEAN:
+          return gimp_param_spec_boolean_desc (pspec);
+
+        case G_TYPE_DOUBLE:
+          return gimp_param_spec_double_desc (pspec);
+
+        case G_TYPE_ENUM:
+          return gimp_param_spec_enum_desc (pspec);
+        }
+    }
+
+  return g_strdup (g_param_spec_get_blurb (pspec));
+}
diff --git a/app/core/gimpparamspecs-desc.h b/app/core/gimpparamspecs-desc.h
new file mode 100644
index 0000000..1e6ea2d
--- /dev/null
+++ b/app/core/gimpparamspecs-desc.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARAM_SPECS_DESC_H__
+#define __GIMP_PARAM_SPECS_DESC_H__
+
+
+gchar * gimp_param_spec_get_desc (GParamSpec *pspec);
+
+
+#endif  /*  __GIMP_PARAM_SPECS_DESC_H__  */
diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c
new file mode 100644
index 0000000..ff0587b
--- /dev/null
+++ b/app/core/gimpparamspecs-duplicate.c
@@ -0,0 +1,269 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpparamspecs-duplicate.c
+ * Copyright (C) 2008-2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gegl-paramspecs.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimpparamspecs.h"
+#include "gimpparamspecs-duplicate.h"
+
+
+/* FIXME: this code is not yet general as it should be (gegl tool only atm) */
+
+GParamSpec *
+gimp_param_spec_duplicate (GParamSpec *pspec)
+{
+  GParamSpec  *copy = NULL;
+  GParamFlags  flags;
+
+  g_return_val_if_fail (pspec != NULL, NULL);
+
+  flags = pspec->flags;
+
+  if (! gimp_gegl_param_spec_has_key (pspec, "role", "output-extent"))
+    flags |= GIMP_CONFIG_PARAM_SERIALIZE;
+
+  if (G_IS_PARAM_SPEC_STRING (pspec))
+    {
+      GParamSpecString *spec = G_PARAM_SPEC_STRING (pspec);
+
+      if (GEGL_IS_PARAM_SPEC_FILE_PATH (pspec))
+        {
+          copy = gimp_param_spec_config_path (pspec->name,
+                                              g_param_spec_get_nick (pspec),
+                                              g_param_spec_get_blurb (pspec),
+                                              GIMP_CONFIG_PATH_FILE,
+                                              spec->default_value,
+                                              flags);
+        }
+      else
+        {
+          copy = g_param_spec_string (pspec->name,
+                                      g_param_spec_get_nick (pspec),
+                                      g_param_spec_get_blurb (pspec),
+                                      spec->default_value,
+                                      flags);
+        }
+    }
+  else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
+    {
+      GParamSpecBoolean *spec = G_PARAM_SPEC_BOOLEAN (pspec);
+
+      copy = g_param_spec_boolean (pspec->name,
+                                   g_param_spec_get_nick (pspec),
+                                   g_param_spec_get_blurb (pspec),
+                                   spec->default_value,
+                                   flags);
+    }
+  else if (G_IS_PARAM_SPEC_ENUM (pspec))
+    {
+      GParamSpecEnum *spec = G_PARAM_SPEC_ENUM (pspec);
+
+      copy = g_param_spec_enum (pspec->name,
+                                g_param_spec_get_nick (pspec),
+                                g_param_spec_get_blurb (pspec),
+                                G_TYPE_FROM_CLASS (spec->enum_class),
+                                spec->default_value,
+                                flags);
+    }
+  else if (GEGL_IS_PARAM_SPEC_DOUBLE (pspec))
+    {
+      GeglParamSpecDouble *gspec = GEGL_PARAM_SPEC_DOUBLE (pspec);
+      GParamSpecDouble    *spec  = G_PARAM_SPEC_DOUBLE (pspec);
+
+      copy = gegl_param_spec_double (pspec->name,
+                                     g_param_spec_get_nick (pspec),
+                                     g_param_spec_get_blurb (pspec),
+                                     spec->minimum,
+                                     spec->maximum,
+                                     spec->default_value,
+                                     gspec->ui_minimum,
+                                     gspec->ui_maximum,
+                                     gspec->ui_gamma,
+                                     flags);
+      gegl_param_spec_double_set_steps (GEGL_PARAM_SPEC_DOUBLE (copy),
+                                        gspec->ui_step_small,
+                                        gspec->ui_step_big);
+      gegl_param_spec_double_set_digits (GEGL_PARAM_SPEC_DOUBLE (copy),
+                                         gspec->ui_digits);
+    }
+  else if (G_IS_PARAM_SPEC_DOUBLE (pspec))
+    {
+      GParamSpecDouble *spec = G_PARAM_SPEC_DOUBLE (pspec);
+
+      copy = g_param_spec_double (pspec->name,
+                                  g_param_spec_get_nick (pspec),
+                                  g_param_spec_get_blurb (pspec),
+                                  spec->minimum,
+                                  spec->maximum,
+                                  spec->default_value,
+                                  flags);
+    }
+  else if (G_IS_PARAM_SPEC_FLOAT (pspec))
+    {
+      GParamSpecFloat *spec = G_PARAM_SPEC_FLOAT (pspec);
+
+      copy = g_param_spec_float (pspec->name,
+                                 g_param_spec_get_nick (pspec),
+                                 g_param_spec_get_blurb (pspec),
+                                 spec->minimum,
+                                 spec->maximum,
+                                 spec->default_value,
+                                 flags);
+    }
+  else if (GEGL_IS_PARAM_SPEC_INT (pspec))
+    {
+      GeglParamSpecInt *gspec = GEGL_PARAM_SPEC_INT (pspec);
+      GParamSpecInt    *spec  = G_PARAM_SPEC_INT (pspec);
+
+      copy = gegl_param_spec_int (pspec->name,
+                                  g_param_spec_get_nick (pspec),
+                                  g_param_spec_get_blurb (pspec),
+                                  spec->minimum,
+                                  spec->maximum,
+                                  spec->default_value,
+                                  gspec->ui_minimum,
+                                  gspec->ui_maximum,
+                                  gspec->ui_gamma,
+                                  flags);
+      gegl_param_spec_int_set_steps (GEGL_PARAM_SPEC_INT (copy),
+                                     gspec->ui_step_small,
+                                     gspec->ui_step_big);
+    }
+  else if (GEGL_IS_PARAM_SPEC_SEED (pspec))
+    {
+      GParamSpecUInt    *spec  = G_PARAM_SPEC_UINT (pspec);
+      GeglParamSpecSeed *gspec = GEGL_PARAM_SPEC_SEED (pspec);
+
+      copy = gegl_param_spec_seed (pspec->name,
+                                   g_param_spec_get_nick (pspec),
+                                   g_param_spec_get_blurb (pspec),
+                                   pspec->flags |
+                                   GIMP_CONFIG_PARAM_SERIALIZE);
+
+      G_PARAM_SPEC_UINT (copy)->minimum = spec->minimum;
+      G_PARAM_SPEC_UINT (copy)->maximum = spec->maximum;
+
+      GEGL_PARAM_SPEC_SEED (copy)->ui_minimum = gspec->ui_minimum;
+      GEGL_PARAM_SPEC_SEED (copy)->ui_maximum = gspec->ui_maximum;
+    }
+  else if (G_IS_PARAM_SPEC_INT (pspec))
+    {
+      GParamSpecInt *spec = G_PARAM_SPEC_INT (pspec);
+
+      copy = g_param_spec_int (pspec->name,
+                               g_param_spec_get_nick (pspec),
+                               g_param_spec_get_blurb (pspec),
+                               spec->minimum,
+                               spec->maximum,
+                               spec->default_value,
+                               flags);
+    }
+  else if (G_IS_PARAM_SPEC_UINT (pspec))
+    {
+      GParamSpecUInt *spec = G_PARAM_SPEC_UINT (pspec);
+
+      copy = g_param_spec_uint (pspec->name,
+                                g_param_spec_get_nick (pspec),
+                                g_param_spec_get_blurb (pspec),
+                                spec->minimum,
+                                spec->maximum,
+                                spec->default_value,
+                                flags);
+    }
+  else if (GIMP_IS_PARAM_SPEC_RGB (pspec))
+    {
+      GValue  value = G_VALUE_INIT;
+      GimpRGB color;
+
+      g_value_init (&value, GIMP_TYPE_RGB);
+      g_param_value_set_default (pspec, &value);
+      gimp_value_get_rgb (&value, &color);
+      g_value_unset (&value);
+
+      copy = gimp_param_spec_rgb (pspec->name,
+                                  g_param_spec_get_nick (pspec),
+                                  g_param_spec_get_blurb (pspec),
+                                  gimp_param_spec_rgb_has_alpha (pspec),
+                                  &color,
+                                  flags);
+    }
+  else if (GEGL_IS_PARAM_SPEC_COLOR (pspec))
+    {
+      GeglColor *gegl_color;
+      GimpRGB    gimp_color;
+      gdouble    r = 0.0;
+      gdouble    g = 0.0;
+      gdouble    b = 0.0;
+      gdouble    a = 1.0;
+      GValue     value = G_VALUE_INIT;
+
+      g_value_init (&value, GEGL_TYPE_COLOR);
+      g_param_value_set_default (pspec, &value);
+
+      gegl_color = g_value_get_object (&value);
+      if (gegl_color)
+        gegl_color_get_rgba (gegl_color, &r, &g, &b, &a);
+
+      gimp_rgba_set (&gimp_color, r, g, b, a);
+
+      g_value_unset (&value);
+
+      copy = gimp_param_spec_rgb (pspec->name,
+                                  g_param_spec_get_nick (pspec),
+                                  g_param_spec_get_blurb (pspec),
+                                  TRUE,
+                                  &gimp_color,
+                                  flags);
+    }
+  else if (G_IS_PARAM_SPEC_OBJECT (pspec) ||
+           G_IS_PARAM_SPEC_POINTER (pspec))
+    {
+      /*  silently ignore object properties  */
+    }
+  else
+    {
+      g_warning ("%s: not supported: %s (%s)\n", G_STRFUNC,
+                 g_type_name (G_TYPE_FROM_INSTANCE (pspec)), pspec->name);
+    }
+
+  if (copy)
+    {
+      GQuark      quark = g_quark_from_static_string ("gegl-property-keys");
+      GHashTable *keys  = g_param_spec_get_qdata (pspec, quark);
+
+      if (keys)
+        g_param_spec_set_qdata_full (copy, quark, g_hash_table_ref (keys),
+                                     (GDestroyNotify) g_hash_table_unref);
+    }
+
+  return copy;
+}
diff --git a/app/core/gimpparamspecs-duplicate.h b/app/core/gimpparamspecs-duplicate.h
new file mode 100644
index 0000000..2bb1432
--- /dev/null
+++ b/app/core/gimpparamspecs-duplicate.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpparamspecs-duplicate.h
+ * Copyright (C) 2008-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARAM_SPECS_DUPLICATE_H__
+#define __GIMP_PARAM_SPECS_DUPLICATE_H__
+
+
+GParamSpec * gimp_param_spec_duplicate (GParamSpec *pspec);
+
+
+#endif  /*  __GIMP_PARAM_SPECS_DUPLICATE_H__  */
diff --git a/app/core/gimpparamspecs.c b/app/core/gimpparamspecs.c
new file mode 100644
index 0000000..17ba6a5
--- /dev/null
+++ b/app/core/gimpparamspecs.c
@@ -0,0 +1,2925 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpimage.h"
+#include "gimplayer.h"
+#include "gimplayermask.h"
+#include "gimpparamspecs.h"
+#include "gimpselection.h"
+
+#include "vectors/gimpvectors.h"
+
+
+/*
+ * GIMP_TYPE_INT32
+ */
+
+GType
+gimp_int32_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpInt32", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_INT32
+ */
+
+static void   gimp_param_int32_class_init (GParamSpecClass *klass);
+static void   gimp_param_int32_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_int32_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_int32_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecInt32),
+        0,
+        (GInstanceInitFunc) gimp_param_int32_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_INT,
+                                     "GimpParamInt32", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_int32_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_INT32;
+}
+
+static void
+gimp_param_int32_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_int32 (const gchar *name,
+                       const gchar *nick,
+                       const gchar *blurb,
+                       gint         minimum,
+                       gint         maximum,
+                       gint         default_value,
+                       GParamFlags  flags)
+{
+  GParamSpecInt *ispec;
+
+  g_return_val_if_fail (minimum >= G_MININT32, NULL);
+  g_return_val_if_fail (maximum <= G_MAXINT32, NULL);
+  g_return_val_if_fail (default_value >= minimum &&
+                        default_value <= maximum, NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_INT32,
+                                 name, nick, blurb, flags);
+
+  ispec->minimum       = minimum;
+  ispec->maximum       = maximum;
+  ispec->default_value = default_value;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+
+/*
+ * GIMP_TYPE_INT16
+ */
+
+GType
+gimp_int16_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpInt16", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_INT16
+ */
+
+static void   gimp_param_int16_class_init (GParamSpecClass *klass);
+static void   gimp_param_int16_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_int16_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_int16_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecInt16),
+        0,
+        (GInstanceInitFunc) gimp_param_int16_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_INT,
+                                     "GimpParamInt16", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_int16_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_INT16;
+}
+
+static void
+gimp_param_int16_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_int16 (const gchar *name,
+                       const gchar *nick,
+                       const gchar *blurb,
+                       gint         minimum,
+                       gint         maximum,
+                       gint         default_value,
+                       GParamFlags  flags)
+{
+  GParamSpecInt *ispec;
+
+  g_return_val_if_fail (minimum >= G_MININT16, NULL);
+  g_return_val_if_fail (maximum <= G_MAXINT16, NULL);
+  g_return_val_if_fail (default_value >= minimum &&
+                        default_value <= maximum, NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_INT16,
+                                 name, nick, blurb, flags);
+
+  ispec->minimum       = minimum;
+  ispec->maximum       = maximum;
+  ispec->default_value = default_value;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+
+/*
+ * GIMP_TYPE_INT8
+ */
+
+GType
+gimp_int8_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_UINT, "GimpInt8", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_INT8
+ */
+
+static void   gimp_param_int8_class_init (GParamSpecClass *klass);
+static void   gimp_param_int8_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_int8_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_int8_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecInt8),
+        0,
+        (GInstanceInitFunc) gimp_param_int8_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_UINT,
+                                     "GimpParamInt8", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_int8_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_INT8;
+}
+
+static void
+gimp_param_int8_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_int8 (const gchar *name,
+                      const gchar *nick,
+                      const gchar *blurb,
+                      guint        minimum,
+                      guint        maximum,
+                      guint        default_value,
+                      GParamFlags  flags)
+{
+  GParamSpecInt *ispec;
+
+  g_return_val_if_fail (maximum <= G_MAXUINT8, NULL);
+  g_return_val_if_fail (default_value >= minimum &&
+                        default_value <= maximum, NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_INT8,
+                                 name, nick, blurb, flags);
+
+  ispec->minimum       = minimum;
+  ispec->maximum       = maximum;
+  ispec->default_value = default_value;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_STRING
+ */
+
+static void       gimp_param_string_class_init (GParamSpecClass *klass);
+static void       gimp_param_string_init       (GParamSpec      *pspec);
+static gboolean   gimp_param_string_validate   (GParamSpec      *pspec,
+                                                GValue          *value);
+
+static GParamSpecClass * gimp_param_string_parent_class = NULL;
+
+GType
+gimp_param_string_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_string_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecString),
+        0,
+        (GInstanceInitFunc) gimp_param_string_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_STRING,
+                                     "GimpParamString", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_string_class_init (GParamSpecClass *klass)
+{
+  gimp_param_string_parent_class = g_type_class_peek_parent (klass);
+
+  klass->value_type     = G_TYPE_STRING;
+  klass->value_validate = gimp_param_string_validate;
+}
+
+static void
+gimp_param_string_init (GParamSpec *pspec)
+{
+  GimpParamSpecString *sspec = GIMP_PARAM_SPEC_STRING (pspec);
+
+  G_PARAM_SPEC_STRING (pspec)->ensure_non_null = TRUE;
+
+  sspec->allow_non_utf8 = FALSE;
+  sspec->non_empty      = FALSE;
+}
+
+static gboolean
+gimp_param_string_validate (GParamSpec *pspec,
+                            GValue     *value)
+{
+  GimpParamSpecString *sspec  = GIMP_PARAM_SPEC_STRING (pspec);
+  gchar               *string = value->data[0].v_pointer;
+
+  if (gimp_param_string_parent_class->value_validate (pspec, value))
+    return TRUE;
+
+  if (string)
+    {
+      gchar *s;
+
+      if (sspec->non_empty && ! string[0])
+        {
+          if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
+            g_free (string);
+          else
+            value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
+
+          value->data[0].v_pointer = g_strdup ("none");
+          return TRUE;
+        }
+
+      if (! sspec->allow_non_utf8 &&
+          ! g_utf8_validate (string, -1, (const gchar **) &s))
+        {
+          if (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
+            {
+              value->data[0].v_pointer = g_strdup (string);
+              value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
+              string = value->data[0].v_pointer;
+            }
+
+          for (s = string; *s; s++)
+            if (*s < ' ')
+              *s = '?';
+
+          return TRUE;
+        }
+    }
+  else if (sspec->non_empty)
+    {
+      value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
+      value->data[0].v_pointer = g_strdup ("none");
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+GParamSpec *
+gimp_param_spec_string (const gchar *name,
+                        const gchar *nick,
+                        const gchar *blurb,
+                        gboolean     allow_non_utf8,
+                        gboolean     null_ok,
+                        gboolean     non_empty,
+                        const gchar *default_value,
+                        GParamFlags  flags)
+{
+  GimpParamSpecString *sspec;
+
+  g_return_val_if_fail (! (null_ok && non_empty), NULL);
+
+  sspec = g_param_spec_internal (GIMP_TYPE_PARAM_STRING,
+                                 name, nick, blurb, flags);
+
+  if (sspec)
+    {
+      g_free (G_PARAM_SPEC_STRING (sspec)->default_value);
+      G_PARAM_SPEC_STRING (sspec)->default_value = g_strdup (default_value);
+
+      G_PARAM_SPEC_STRING (sspec)->ensure_non_null = null_ok ? FALSE : TRUE;
+
+      sspec->allow_non_utf8 = allow_non_utf8 ? TRUE : FALSE;
+      sspec->non_empty      = non_empty      ? TRUE : FALSE;
+    }
+
+  return G_PARAM_SPEC (sspec);
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_ENUM
+ */
+
+static void       gimp_param_enum_class_init (GParamSpecClass *klass);
+static void       gimp_param_enum_init       (GParamSpec      *pspec);
+static void       gimp_param_enum_finalize   (GParamSpec      *pspec);
+static gboolean   gimp_param_enum_validate   (GParamSpec      *pspec,
+                                              GValue          *value);
+
+GType
+gimp_param_enum_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_enum_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecEnum),
+        0,
+        (GInstanceInitFunc) gimp_param_enum_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_ENUM,
+                                     "GimpParamEnum", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_enum_class_init (GParamSpecClass *klass)
+{
+  klass->value_type     = G_TYPE_ENUM;
+  klass->finalize       = gimp_param_enum_finalize;
+  klass->value_validate = gimp_param_enum_validate;
+}
+
+static void
+gimp_param_enum_init (GParamSpec *pspec)
+{
+  GimpParamSpecEnum *espec = GIMP_PARAM_SPEC_ENUM (pspec);
+
+  espec->excluded_values = NULL;
+}
+
+static void
+gimp_param_enum_finalize (GParamSpec *pspec)
+{
+  GimpParamSpecEnum *espec = GIMP_PARAM_SPEC_ENUM (pspec);
+  GParamSpecClass   *parent_class;
+
+  parent_class = g_type_class_peek (g_type_parent (GIMP_TYPE_PARAM_ENUM));
+
+  g_slist_free (espec->excluded_values);
+
+  parent_class->finalize (pspec);
+}
+
+static gboolean
+gimp_param_enum_validate (GParamSpec *pspec,
+                          GValue     *value)
+{
+  GimpParamSpecEnum *espec  = GIMP_PARAM_SPEC_ENUM (pspec);
+  GParamSpecClass   *parent_class;
+  GSList            *list;
+
+  parent_class = g_type_class_peek (g_type_parent (GIMP_TYPE_PARAM_ENUM));
+
+  if (parent_class->value_validate (pspec, value))
+    return TRUE;
+
+  for (list = espec->excluded_values; list; list = g_slist_next (list))
+    {
+      if (GPOINTER_TO_INT (list->data) == value->data[0].v_long)
+        {
+          value->data[0].v_long = G_PARAM_SPEC_ENUM (pspec)->default_value;
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+GParamSpec *
+gimp_param_spec_enum (const gchar *name,
+                      const gchar *nick,
+                      const gchar *blurb,
+                      GType        enum_type,
+                      gint         default_value,
+                      GParamFlags  flags)
+{
+  GimpParamSpecEnum *espec;
+  GEnumClass        *enum_class;
+
+  g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL);
+
+  enum_class = g_type_class_ref (enum_type);
+
+  g_return_val_if_fail (g_enum_get_value (enum_class, default_value) != NULL,
+                        NULL);
+
+  espec = g_param_spec_internal (GIMP_TYPE_PARAM_ENUM,
+                                 name, nick, blurb, flags);
+
+  G_PARAM_SPEC_ENUM (espec)->enum_class    = enum_class;
+  G_PARAM_SPEC_ENUM (espec)->default_value = default_value;
+  G_PARAM_SPEC (espec)->value_type         = enum_type;
+
+  return G_PARAM_SPEC (espec);
+}
+
+void
+gimp_param_spec_enum_exclude_value (GimpParamSpecEnum *espec,
+                                    gint               value)
+{
+  g_return_if_fail (GIMP_IS_PARAM_SPEC_ENUM (espec));
+  g_return_if_fail (g_enum_get_value (G_PARAM_SPEC_ENUM (espec)->enum_class,
+                                      value) != NULL);
+
+  espec->excluded_values = g_slist_prepend (espec->excluded_values,
+                                            GINT_TO_POINTER (value));
+}
+
+
+/*
+ * GIMP_TYPE_IMAGE_ID
+ */
+
+GType
+gimp_image_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpImageID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_IMAGE_ID
+ */
+
+static void       gimp_param_image_id_class_init  (GParamSpecClass *klass);
+static void       gimp_param_image_id_init        (GParamSpec      *pspec);
+static void       gimp_param_image_id_set_default (GParamSpec      *pspec,
+                                                   GValue          *value);
+static gboolean   gimp_param_image_id_validate    (GParamSpec      *pspec,
+                                                   GValue          *value);
+static gint       gimp_param_image_id_values_cmp  (GParamSpec      *pspec,
+                                                   const GValue    *value1,
+                                                   const GValue    *value2);
+
+GType
+gimp_param_image_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_image_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecImageID),
+        0,
+        (GInstanceInitFunc) gimp_param_image_id_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_INT,
+                                     "GimpParamImageID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_image_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type        = GIMP_TYPE_IMAGE_ID;
+  klass->value_set_default = gimp_param_image_id_set_default;
+  klass->value_validate    = gimp_param_image_id_validate;
+  klass->values_cmp        = gimp_param_image_id_values_cmp;
+}
+
+static void
+gimp_param_image_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecImageID *ispec = GIMP_PARAM_SPEC_IMAGE_ID (pspec);
+
+  ispec->gimp    = NULL;
+  ispec->none_ok = FALSE;
+}
+
+static void
+gimp_param_image_id_set_default (GParamSpec *pspec,
+                                 GValue     *value)
+{
+  value->data[0].v_int = -1;
+}
+
+static gboolean
+gimp_param_image_id_validate (GParamSpec *pspec,
+                              GValue     *value)
+{
+  GimpParamSpecImageID *ispec    = GIMP_PARAM_SPEC_IMAGE_ID (pspec);
+  gint                  image_id = value->data[0].v_int;
+  GimpImage            *image;
+
+  if (ispec->none_ok && (image_id == 0 || image_id == -1))
+    return FALSE;
+
+  image = gimp_image_get_by_ID (ispec->gimp, image_id);
+
+  if (! GIMP_IS_IMAGE (image))
+    {
+      value->data[0].v_int = -1;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_param_image_id_values_cmp (GParamSpec   *pspec,
+                                const GValue *value1,
+                                const GValue *value2)
+{
+  gint image_id1 = value1->data[0].v_int;
+  gint image_id2 = value2->data[0].v_int;
+
+  /*  try to return at least *something*, it's useless anyway...  */
+
+  if (image_id1 < image_id2)
+    return -1;
+  else if (image_id1 > image_id2)
+    return 1;
+  else
+    return 0;
+}
+
+GParamSpec *
+gimp_param_spec_image_id (const gchar *name,
+                          const gchar *nick,
+                          const gchar *blurb,
+                          Gimp        *gimp,
+                          gboolean     none_ok,
+                          GParamFlags  flags)
+{
+  GimpParamSpecImageID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_IMAGE_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpImage *
+gimp_value_get_image (const GValue *value,
+                      Gimp         *gimp)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_IMAGE_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp_image_get_by_ID (gimp, value->data[0].v_int);
+}
+
+void
+gimp_value_set_image (GValue    *value,
+                      GimpImage *image)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_IMAGE_ID (value));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  value->data[0].v_int = image ? gimp_image_get_ID (image) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_ITEM_ID
+ */
+
+GType
+gimp_item_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpItemID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_ITEM_ID
+ */
+
+static void       gimp_param_item_id_class_init  (GParamSpecClass *klass);
+static void       gimp_param_item_id_init        (GParamSpec      *pspec);
+static void       gimp_param_item_id_set_default (GParamSpec      *pspec,
+                                                  GValue          *value);
+static gboolean   gimp_param_item_id_validate    (GParamSpec      *pspec,
+                                                  GValue          *value);
+static gint       gimp_param_item_id_values_cmp  (GParamSpec      *pspec,
+                                                  const GValue    *value1,
+                                                  const GValue    *value2);
+
+GType
+gimp_param_item_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_item_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecItemID),
+        0,
+        (GInstanceInitFunc) gimp_param_item_id_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_INT,
+                                     "GimpParamItemID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_item_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type        = GIMP_TYPE_ITEM_ID;
+  klass->value_set_default = gimp_param_item_id_set_default;
+  klass->value_validate    = gimp_param_item_id_validate;
+  klass->values_cmp        = gimp_param_item_id_values_cmp;
+}
+
+static void
+gimp_param_item_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->gimp      = NULL;
+  ispec->item_type = GIMP_TYPE_ITEM;
+  ispec->none_ok   = FALSE;
+}
+
+static void
+gimp_param_item_id_set_default (GParamSpec *pspec,
+                                GValue     *value)
+{
+  value->data[0].v_int = -1;
+}
+
+static gboolean
+gimp_param_item_id_validate (GParamSpec *pspec,
+                             GValue     *value)
+{
+  GimpParamSpecItemID *ispec   = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+  gint                 item_id = value->data[0].v_int;
+  GimpItem            *item;
+
+  if (ispec->none_ok && (item_id == 0 || item_id == -1))
+    return FALSE;
+
+  item = gimp_item_get_by_ID (ispec->gimp, item_id);
+
+  if (! item || ! g_type_is_a (G_TYPE_FROM_INSTANCE (item), ispec->item_type))
+    {
+      value->data[0].v_int = -1;
+      return TRUE;
+    }
+  else if (gimp_item_is_removed (item))
+    {
+      value->data[0].v_int = -1;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_param_item_id_values_cmp (GParamSpec   *pspec,
+                               const GValue *value1,
+                               const GValue *value2)
+{
+  gint item_id1 = value1->data[0].v_int;
+  gint item_id2 = value2->data[0].v_int;
+
+  /*  try to return at least *something*, it's useless anyway...  */
+
+  if (item_id1 < item_id2)
+    return -1;
+  else if (item_id1 > item_id2)
+    return 1;
+  else
+    return 0;
+}
+
+GParamSpec *
+gimp_param_spec_item_id (const gchar *name,
+                         const gchar *nick,
+                         const gchar *blurb,
+                         Gimp        *gimp,
+                         gboolean     none_ok,
+                         GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_ITEM_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpItem *
+gimp_value_get_item (const GValue *value,
+                     Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_ITEM_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_ITEM (item))
+    return NULL;
+
+  return item;
+}
+
+void
+gimp_value_set_item (GValue   *value,
+                     GimpItem *item)
+{
+  g_return_if_fail (item == NULL || GIMP_IS_ITEM (item));
+
+  /* FIXME remove hack as soon as bug #375864 is fixed */
+
+  if (GIMP_VALUE_HOLDS_ITEM_ID (value))
+    {
+      value->data[0].v_int = item ? gimp_item_get_ID (item) : -1;
+    }
+  else if (GIMP_VALUE_HOLDS_DRAWABLE_ID (value) &&
+           (item == NULL || GIMP_IS_DRAWABLE (item)))
+    {
+      gimp_value_set_drawable (value, GIMP_DRAWABLE (item));
+    }
+  else if (GIMP_VALUE_HOLDS_LAYER_ID (value) &&
+           (item == NULL || GIMP_IS_LAYER (item)))
+    {
+      gimp_value_set_layer (value, GIMP_LAYER (item));
+    }
+  else if (GIMP_VALUE_HOLDS_CHANNEL_ID (value) &&
+           (item == NULL || GIMP_IS_CHANNEL (item)))
+    {
+      gimp_value_set_channel (value, GIMP_CHANNEL (item));
+    }
+  else if (GIMP_VALUE_HOLDS_LAYER_MASK_ID (value) &&
+           (item == NULL || GIMP_IS_LAYER_MASK (item)))
+    {
+      gimp_value_set_layer_mask (value, GIMP_LAYER_MASK (item));
+    }
+  else if (GIMP_VALUE_HOLDS_SELECTION_ID (value) &&
+           (item == NULL || GIMP_IS_SELECTION (item)))
+    {
+      gimp_value_set_selection (value, GIMP_SELECTION (item));
+    }
+  else if (GIMP_VALUE_HOLDS_VECTORS_ID (value) &&
+           (item == NULL || GIMP_IS_VECTORS (item)))
+    {
+      gimp_value_set_vectors (value, GIMP_VECTORS (item));
+    }
+  else
+    {
+      g_return_if_reached ();
+    }
+}
+
+
+/*
+ * GIMP_TYPE_DRAWABLE_ID
+ */
+
+GType
+gimp_drawable_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpDrawableID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_DRAWABLE_ID
+ */
+
+static void   gimp_param_drawable_id_class_init (GParamSpecClass *klass);
+static void   gimp_param_drawable_id_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_drawable_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_drawable_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecDrawableID),
+        0,
+        (GInstanceInitFunc) gimp_param_drawable_id_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_ITEM_ID,
+                                     "GimpParamDrawableID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_drawable_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_DRAWABLE_ID;
+}
+
+static void
+gimp_param_drawable_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->item_type = GIMP_TYPE_DRAWABLE;
+}
+
+GParamSpec *
+gimp_param_spec_drawable_id (const gchar *name,
+                             const gchar *nick,
+                             const gchar *blurb,
+                             Gimp        *gimp,
+                             gboolean     none_ok,
+                             GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_DRAWABLE_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpDrawable *
+gimp_value_get_drawable (const GValue *value,
+                         Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_DRAWABLE_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_DRAWABLE (item))
+    return NULL;
+
+  return GIMP_DRAWABLE (item);
+}
+
+void
+gimp_value_set_drawable (GValue       *value,
+                         GimpDrawable *drawable)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_DRAWABLE_ID (value));
+  g_return_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable));
+
+  value->data[0].v_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_LAYER_ID
+ */
+
+GType
+gimp_layer_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpLayerID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_LAYER_ID
+ */
+
+static void   gimp_param_layer_id_class_init (GParamSpecClass *klass);
+static void   gimp_param_layer_id_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_layer_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_layer_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecLayerID),
+        0,
+        (GInstanceInitFunc) gimp_param_layer_id_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_DRAWABLE_ID,
+                                     "GimpParamLayerID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_layer_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_LAYER_ID;
+}
+
+static void
+gimp_param_layer_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->item_type = GIMP_TYPE_LAYER;
+}
+
+GParamSpec *
+gimp_param_spec_layer_id (const gchar *name,
+                          const gchar *nick,
+                          const gchar *blurb,
+                          Gimp        *gimp,
+                          gboolean     none_ok,
+                          GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_LAYER_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpLayer *
+gimp_value_get_layer (const GValue *value,
+                      Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_LAYER_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_LAYER (item))
+    return NULL;
+
+  return GIMP_LAYER (item);
+}
+
+void
+gimp_value_set_layer (GValue    *value,
+                      GimpLayer *layer)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_LAYER_ID (value));
+  g_return_if_fail (layer == NULL || GIMP_IS_LAYER (layer));
+
+  value->data[0].v_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_CHANNEL_ID
+ */
+
+GType
+gimp_channel_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpChannelID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_CHANNEL_ID
+ */
+
+static void   gimp_param_channel_id_class_init (GParamSpecClass *klass);
+static void   gimp_param_channel_id_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_channel_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_channel_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecChannelID),
+        0,
+        (GInstanceInitFunc) gimp_param_channel_id_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_DRAWABLE_ID,
+                                     "GimpParamChannelID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_channel_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_CHANNEL_ID;
+}
+
+static void
+gimp_param_channel_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->item_type = GIMP_TYPE_CHANNEL;
+}
+
+GParamSpec *
+gimp_param_spec_channel_id (const gchar *name,
+                            const gchar *nick,
+                            const gchar *blurb,
+                            Gimp        *gimp,
+                            gboolean     none_ok,
+                            GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_CHANNEL_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpChannel *
+gimp_value_get_channel (const GValue *value,
+                        Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_CHANNEL_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_CHANNEL (item))
+    return NULL;
+
+  return GIMP_CHANNEL (item);
+}
+
+void
+gimp_value_set_channel (GValue      *value,
+                        GimpChannel *channel)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_CHANNEL_ID (value));
+  g_return_if_fail (channel == NULL || GIMP_IS_CHANNEL (channel));
+
+  value->data[0].v_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_LAYER_MASK_ID
+ */
+
+GType
+gimp_layer_mask_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpLayerMaskID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_LAYER_MASK_ID
+ */
+
+static void   gimp_param_layer_mask_id_class_init (GParamSpecClass *klass);
+static void   gimp_param_layer_mask_id_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_layer_mask_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_layer_mask_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecLayerMaskID),
+        0,
+        (GInstanceInitFunc) gimp_param_layer_mask_id_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_CHANNEL_ID,
+                                     "GimpParamLayerMaskID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_layer_mask_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_LAYER_MASK_ID;
+}
+
+static void
+gimp_param_layer_mask_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->item_type = GIMP_TYPE_LAYER_MASK;
+}
+
+GParamSpec *
+gimp_param_spec_layer_mask_id (const gchar *name,
+                               const gchar *nick,
+                               const gchar *blurb,
+                               Gimp        *gimp,
+                               gboolean     none_ok,
+                               GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_LAYER_MASK_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpLayerMask *
+gimp_value_get_layer_mask (const GValue *value,
+                           Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_LAYER_MASK_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_LAYER_MASK (item))
+    return NULL;
+
+  return GIMP_LAYER_MASK (item);
+}
+
+void
+gimp_value_set_layer_mask (GValue        *value,
+                           GimpLayerMask *layer_mask)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_LAYER_MASK_ID (value));
+  g_return_if_fail (layer_mask == NULL || GIMP_IS_LAYER_MASK (layer_mask));
+
+  value->data[0].v_int = layer_mask ? gimp_item_get_ID (GIMP_ITEM (layer_mask)) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_SELECTION_ID
+ */
+
+GType
+gimp_selection_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpSelectionID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_SELECTION_ID
+ */
+
+static void   gimp_param_selection_id_class_init (GParamSpecClass *klass);
+static void   gimp_param_selection_id_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_selection_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_selection_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecSelectionID),
+        0,
+        (GInstanceInitFunc) gimp_param_selection_id_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_CHANNEL_ID,
+                                     "GimpParamSelectionID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_selection_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_SELECTION_ID;
+}
+
+static void
+gimp_param_selection_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->item_type = GIMP_TYPE_SELECTION;
+}
+
+GParamSpec *
+gimp_param_spec_selection_id (const gchar *name,
+                              const gchar *nick,
+                              const gchar *blurb,
+                              Gimp        *gimp,
+                              gboolean     none_ok,
+                              GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_SELECTION_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpSelection *
+gimp_value_get_selection (const GValue *value,
+                          Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_SELECTION_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_SELECTION (item))
+    return NULL;
+
+  return GIMP_SELECTION (item);
+}
+
+void
+gimp_value_set_selection (GValue        *value,
+                          GimpSelection *selection)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_SELECTION_ID (value));
+  g_return_if_fail (selection == NULL || GIMP_IS_SELECTION (selection));
+
+  value->data[0].v_int = selection ? gimp_item_get_ID (GIMP_ITEM (selection)) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_VECTORS_ID
+ */
+
+GType
+gimp_vectors_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpVectorsID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_VECTORS_ID
+ */
+
+static void   gimp_param_vectors_id_class_init (GParamSpecClass *klass);
+static void   gimp_param_vectors_id_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_vectors_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_vectors_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecVectorsID),
+        0,
+        (GInstanceInitFunc) gimp_param_vectors_id_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_ITEM_ID,
+                                     "GimpParamVectorsID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_vectors_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_VECTORS_ID;
+}
+
+static void
+gimp_param_vectors_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecItemID *ispec = GIMP_PARAM_SPEC_ITEM_ID (pspec);
+
+  ispec->item_type = GIMP_TYPE_VECTORS;
+}
+
+GParamSpec *
+gimp_param_spec_vectors_id (const gchar *name,
+                            const gchar *nick,
+                            const gchar *blurb,
+                            Gimp        *gimp,
+                            gboolean     none_ok,
+                            GParamFlags  flags)
+{
+  GimpParamSpecItemID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_VECTORS_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpVectors *
+gimp_value_get_vectors (const GValue *value,
+                        Gimp         *gimp)
+{
+  GimpItem *item;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_VECTORS_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  item = gimp_item_get_by_ID (gimp, value->data[0].v_int);
+
+  if (item && ! GIMP_IS_VECTORS (item))
+    return NULL;
+
+  return GIMP_VECTORS (item);
+}
+
+void
+gimp_value_set_vectors (GValue      *value,
+                        GimpVectors *vectors)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_VECTORS_ID (value));
+  g_return_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors));
+
+  value->data[0].v_int = vectors ? gimp_item_get_ID (GIMP_ITEM (vectors)) : -1;
+}
+
+
+/*
+ * GIMP_TYPE_DISPLAY_ID
+ */
+
+GType
+gimp_display_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info = { 0, };
+
+      type = g_type_register_static (G_TYPE_INT, "GimpDisplayID", &info, 0);
+    }
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_DISPLAY_ID
+ */
+
+static void       gimp_param_display_id_class_init  (GParamSpecClass *klass);
+static void       gimp_param_display_id_init        (GParamSpec      *pspec);
+static void       gimp_param_display_id_set_default (GParamSpec      *pspec,
+                                                     GValue          *value);
+static gboolean   gimp_param_display_id_validate    (GParamSpec      *pspec,
+                                                     GValue          *value);
+static gint       gimp_param_display_id_values_cmp  (GParamSpec      *pspec,
+                                                     const GValue    *value1,
+                                                     const GValue    *value2);
+
+GType
+gimp_param_display_id_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_display_id_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecDisplayID),
+        0,
+        (GInstanceInitFunc) gimp_param_display_id_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_INT,
+                                     "GimpParamDisplayID", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_display_id_class_init (GParamSpecClass *klass)
+{
+  klass->value_type        = GIMP_TYPE_DISPLAY_ID;
+  klass->value_set_default = gimp_param_display_id_set_default;
+  klass->value_validate    = gimp_param_display_id_validate;
+  klass->values_cmp        = gimp_param_display_id_values_cmp;
+}
+
+static void
+gimp_param_display_id_init (GParamSpec *pspec)
+{
+  GimpParamSpecDisplayID *ispec = GIMP_PARAM_SPEC_DISPLAY_ID (pspec);
+
+  ispec->gimp    = NULL;
+  ispec->none_ok = FALSE;
+}
+
+static void
+gimp_param_display_id_set_default (GParamSpec *pspec,
+                                   GValue     *value)
+{
+  value->data[0].v_int = -1;
+}
+
+static gboolean
+gimp_param_display_id_validate (GParamSpec *pspec,
+                                GValue     *value)
+{
+  GimpParamSpecDisplayID *ispec      = GIMP_PARAM_SPEC_DISPLAY_ID (pspec);
+  gint                    display_id = value->data[0].v_int;
+  GimpObject             *display;
+
+  if (ispec->none_ok && (display_id == 0 || display_id == -1))
+    return FALSE;
+
+  display = gimp_get_display_by_ID (ispec->gimp, display_id);
+
+  if (! GIMP_IS_OBJECT (display))
+    {
+      value->data[0].v_int = -1;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_param_display_id_values_cmp (GParamSpec   *pspec,
+                                  const GValue *value1,
+                                  const GValue *value2)
+{
+  gint display_id1 = value1->data[0].v_int;
+  gint display_id2 = value2->data[0].v_int;
+
+  /*  try to return at least *something*, it's useless anyway...  */
+
+  if (display_id1 < display_id2)
+    return -1;
+  else if (display_id1 > display_id2)
+    return 1;
+  else
+    return 0;
+}
+
+GParamSpec *
+gimp_param_spec_display_id (const gchar *name,
+                            const gchar *nick,
+                            const gchar *blurb,
+                            Gimp        *gimp,
+                            gboolean     none_ok,
+                            GParamFlags  flags)
+{
+  GimpParamSpecDisplayID *ispec;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  ispec = g_param_spec_internal (GIMP_TYPE_PARAM_DISPLAY_ID,
+                                 name, nick, blurb, flags);
+
+  ispec->gimp    = gimp;
+  ispec->none_ok = none_ok ? TRUE : FALSE;
+
+  return G_PARAM_SPEC (ispec);
+}
+
+GimpObject *
+gimp_value_get_display (const GValue *value,
+                        Gimp         *gimp)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_DISPLAY_ID (value), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp_get_display_by_ID (gimp, value->data[0].v_int);
+}
+
+void
+gimp_value_set_display (GValue     *value,
+                        GimpObject *display)
+{
+  gint id = -1;
+
+  g_return_if_fail (GIMP_VALUE_HOLDS_DISPLAY_ID (value));
+  g_return_if_fail (display == NULL || GIMP_IS_OBJECT (display));
+
+  if (display)
+    g_object_get (display, "id", &id, NULL);
+
+  value->data[0].v_int = id;
+}
+
+
+/*
+ * GIMP_TYPE_ARRAY
+ */
+
+GimpArray *
+gimp_array_new (const guint8 *data,
+                gsize         length,
+                gboolean      static_data)
+{
+  GimpArray *array;
+
+  g_return_val_if_fail ((data == NULL && length == 0) ||
+                        (data != NULL && length  > 0), NULL);
+
+  array = g_slice_new0 (GimpArray);
+
+  array->data        = static_data ? (guint8 *) data : g_memdup (data, length);
+  array->length      = length;
+  array->static_data = static_data;
+
+  return array;
+}
+
+GimpArray *
+gimp_array_copy (const GimpArray *array)
+{
+  if (array)
+    return gimp_array_new (array->data, array->length, FALSE);
+
+  return NULL;
+}
+
+void
+gimp_array_free (GimpArray *array)
+{
+  if (array)
+    {
+      if (! array->static_data)
+        g_free (array->data);
+
+      g_slice_free (GimpArray, array);
+    }
+}
+
+GType
+gimp_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpArray",
+                                         (GBoxedCopyFunc) gimp_array_copy,
+                                         (GBoxedFreeFunc) gimp_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_ARRAY
+ */
+
+static void       gimp_param_array_class_init  (GParamSpecClass *klass);
+static void       gimp_param_array_init        (GParamSpec      *pspec);
+static gboolean   gimp_param_array_validate    (GParamSpec      *pspec,
+                                                GValue          *value);
+static gint       gimp_param_array_values_cmp  (GParamSpec      *pspec,
+                                                const GValue    *value1,
+                                                const GValue    *value2);
+
+GType
+gimp_param_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_array_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_BOXED,
+                                     "GimpParamArray", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type     = GIMP_TYPE_ARRAY;
+  klass->value_validate = gimp_param_array_validate;
+  klass->values_cmp     = gimp_param_array_values_cmp;
+}
+
+static void
+gimp_param_array_init (GParamSpec *pspec)
+{
+}
+
+static gboolean
+gimp_param_array_validate (GParamSpec *pspec,
+                           GValue     *value)
+{
+  GimpArray *array = value->data[0].v_pointer;
+
+  if (array)
+    {
+      if ((array->data == NULL && array->length != 0) ||
+          (array->data != NULL && array->length == 0))
+        {
+          g_value_set_boxed (value, NULL);
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_param_array_values_cmp (GParamSpec   *pspec,
+                             const GValue *value1,
+                             const GValue *value2)
+{
+  GimpArray *array1 = value1->data[0].v_pointer;
+  GimpArray *array2 = value2->data[0].v_pointer;
+
+  /*  try to return at least *something*, it's useless anyway...  */
+
+  if (! array1)
+    return array2 != NULL ? -1 : 0;
+  else if (! array2)
+    return array1 != NULL ? 1 : 0;
+  else if (array1->length < array2->length)
+    return -1;
+  else if (array1->length > array2->length)
+    return 1;
+
+  return 0;
+}
+
+GParamSpec *
+gimp_param_spec_array (const gchar *name,
+                       const gchar *nick,
+                       const gchar *blurb,
+                       GParamFlags  flags)
+{
+  GimpParamSpecArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+static const guint8 *
+gimp_value_get_array (const GValue *value)
+{
+  GimpArray *array = value->data[0].v_pointer;
+
+  if (array)
+    return array->data;
+
+  return NULL;
+}
+
+static guint8 *
+gimp_value_dup_array (const GValue *value)
+{
+  GimpArray *array = value->data[0].v_pointer;
+
+  if (array)
+    return g_memdup (array->data, array->length);
+
+  return NULL;
+}
+
+static void
+gimp_value_set_array (GValue       *value,
+                      const guint8 *data,
+                      gsize         length)
+{
+  GimpArray *array = gimp_array_new (data, length, FALSE);
+
+  g_value_take_boxed (value, array);
+}
+
+static void
+gimp_value_set_static_array (GValue       *value,
+                             const guint8 *data,
+                             gsize         length)
+{
+  GimpArray *array = gimp_array_new (data, length, TRUE);
+
+  g_value_take_boxed (value, array);
+}
+
+static void
+gimp_value_take_array (GValue *value,
+                       guint8 *data,
+                       gsize   length)
+{
+  GimpArray *array = gimp_array_new (data, length, TRUE);
+
+  array->static_data = FALSE;
+
+  g_value_take_boxed (value, array);
+}
+
+
+/*
+ * GIMP_TYPE_INT8_ARRAY
+ */
+
+GType
+gimp_int8_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpInt8Array",
+                                         (GBoxedCopyFunc) gimp_array_copy,
+                                         (GBoxedFreeFunc) gimp_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_INT8_ARRAY
+ */
+
+static void   gimp_param_int8_array_class_init (GParamSpecClass *klass);
+static void   gimp_param_int8_array_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_int8_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_int8_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_int8_array_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_ARRAY,
+                                     "GimpParamInt8Array", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_int8_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_INT8_ARRAY;
+}
+
+static void
+gimp_param_int8_array_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_int8_array (const gchar *name,
+                            const gchar *nick,
+                            const gchar *blurb,
+                            GParamFlags  flags)
+{
+  GimpParamSpecArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_INT8_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+const guint8 *
+gimp_value_get_int8array (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_INT8_ARRAY (value), NULL);
+
+  return gimp_value_get_array (value);
+}
+
+guint8 *
+gimp_value_dup_int8array (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_INT8_ARRAY (value), NULL);
+
+  return gimp_value_dup_array (value);
+}
+
+void
+gimp_value_set_int8array (GValue       *value,
+                          const guint8 *data,
+                          gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT8_ARRAY (value));
+
+  gimp_value_set_array (value, data, length);
+}
+
+void
+gimp_value_set_static_int8array (GValue       *value,
+                                 const guint8 *data,
+                                 gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT8_ARRAY (value));
+
+  gimp_value_set_static_array (value, data, length);
+}
+
+void
+gimp_value_take_int8array (GValue *value,
+                           guint8 *data,
+                           gsize   length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT8_ARRAY (value));
+
+  gimp_value_take_array (value, data, length);
+}
+
+
+/*
+ * GIMP_TYPE_INT16_ARRAY
+ */
+
+GType
+gimp_int16_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpInt16Array",
+                                         (GBoxedCopyFunc) gimp_array_copy,
+                                         (GBoxedFreeFunc) gimp_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_INT16_ARRAY
+ */
+
+static void   gimp_param_int16_array_class_init (GParamSpecClass *klass);
+static void   gimp_param_int16_array_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_int16_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_int16_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_int16_array_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_ARRAY,
+                                     "GimpParamInt16Array", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_int16_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_INT16_ARRAY;
+}
+
+static void
+gimp_param_int16_array_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_int16_array (const gchar *name,
+                             const gchar *nick,
+                             const gchar *blurb,
+                             GParamFlags  flags)
+{
+  GimpParamSpecArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_INT16_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+const gint16 *
+gimp_value_get_int16array (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value), NULL);
+
+  return (const gint16 *) gimp_value_get_array (value);
+}
+
+gint16 *
+gimp_value_dup_int16array (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value), NULL);
+
+  return (gint16 *) gimp_value_dup_array (value);
+}
+
+void
+gimp_value_set_int16array (GValue       *value,
+                           const gint16 *data,
+                           gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value));
+
+  gimp_value_set_array (value, (const guint8 *) data,
+                        length * sizeof (gint16));
+}
+
+void
+gimp_value_set_static_int16array (GValue       *value,
+                                  const gint16 *data,
+                                  gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value));
+
+  gimp_value_set_static_array (value, (const guint8 *) data,
+                               length * sizeof (gint16));
+}
+
+void
+gimp_value_take_int16array (GValue *value,
+                            gint16 *data,
+                            gsize   length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value));
+
+  gimp_value_take_array (value, (guint8 *) data,
+                         length * sizeof (gint16));
+}
+
+
+/*
+ * GIMP_TYPE_INT32_ARRAY
+ */
+
+GType
+gimp_int32_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpInt32Array",
+                                         (GBoxedCopyFunc) gimp_array_copy,
+                                         (GBoxedFreeFunc) gimp_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_INT32_ARRAY
+ */
+
+static void   gimp_param_int32_array_class_init (GParamSpecClass *klass);
+static void   gimp_param_int32_array_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_int32_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_int32_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_int32_array_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_ARRAY,
+                                     "GimpParamInt32Array", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_int32_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_INT32_ARRAY;
+}
+
+static void
+gimp_param_int32_array_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_int32_array (const gchar *name,
+                             const gchar *nick,
+                             const gchar *blurb,
+                             GParamFlags  flags)
+{
+  GimpParamSpecArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_INT32_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+const gint32 *
+gimp_value_get_int32array (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value), NULL);
+
+  return (const gint32 *) gimp_value_get_array (value);
+}
+
+gint32 *
+gimp_value_dup_int32array (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value), NULL);
+
+  return (gint32 *) gimp_value_dup_array (value);
+}
+
+void
+gimp_value_set_int32array (GValue       *value,
+                           const gint32 *data,
+                           gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value));
+
+  gimp_value_set_array (value, (const guint8 *) data,
+                        length * sizeof (gint32));
+}
+
+void
+gimp_value_set_static_int32array (GValue       *value,
+                                  const gint32 *data,
+                                  gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value));
+
+  gimp_value_set_static_array (value, (const guint8 *) data,
+                               length * sizeof (gint32));
+}
+
+void
+gimp_value_take_int32array (GValue *value,
+                            gint32 *data,
+                            gsize   length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value));
+
+  gimp_value_take_array (value, (guint8 *) data,
+                         length * sizeof (gint32));
+}
+
+
+/*
+ * GIMP_TYPE_FLOAT_ARRAY
+ */
+
+GType
+gimp_float_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpFloatArray",
+                                         (GBoxedCopyFunc) gimp_array_copy,
+                                         (GBoxedFreeFunc) gimp_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_FLOAT_ARRAY
+ */
+
+static void   gimp_param_float_array_class_init (GParamSpecClass *klass);
+static void   gimp_param_float_array_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_float_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_float_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_float_array_init
+      };
+
+      type = g_type_register_static (GIMP_TYPE_PARAM_ARRAY,
+                                     "GimpParamFloatArray", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_float_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_FLOAT_ARRAY;
+}
+
+static void
+gimp_param_float_array_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_float_array (const gchar *name,
+                             const gchar *nick,
+                             const gchar *blurb,
+                             GParamFlags  flags)
+{
+  GimpParamSpecArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_FLOAT_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+const gdouble *
+gimp_value_get_floatarray (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value), NULL);
+
+  return (const gdouble *) gimp_value_get_array (value);
+}
+
+gdouble *
+gimp_value_dup_floatarray (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value), NULL);
+
+  return (gdouble *) gimp_value_dup_array (value);
+}
+
+void
+gimp_value_set_floatarray (GValue        *value,
+                           const gdouble *data,
+                           gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value));
+
+  gimp_value_set_array (value, (const guint8 *) data,
+                        length * sizeof (gdouble));
+}
+
+void
+gimp_value_set_static_floatarray (GValue        *value,
+                                  const gdouble *data,
+                                  gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value));
+
+  gimp_value_set_static_array (value, (const guint8 *) data,
+                               length * sizeof (gdouble));
+}
+
+void
+gimp_value_take_floatarray (GValue  *value,
+                            gdouble *data,
+                            gsize    length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value));
+
+  gimp_value_take_array (value, (guint8 *) data,
+                         length * sizeof (gdouble));
+}
+
+
+/*
+ * GIMP_TYPE_STRING_ARRAY
+ */
+
+GimpArray *
+gimp_string_array_new (const gchar **data,
+                       gsize         length,
+                       gboolean      static_data)
+{
+  GimpArray *array;
+
+  g_return_val_if_fail ((data == NULL && length == 0) ||
+                        (data != NULL && length  > 0), NULL);
+
+  array = g_slice_new0 (GimpArray);
+
+  if (! static_data)
+    {
+      gchar **tmp = g_new (gchar *, length);
+      gint    i;
+
+      for (i = 0; i < length; i++)
+        tmp[i] = g_strdup (data[i]);
+
+      array->data = (guint8 *) tmp;
+    }
+  else
+    {
+      array->data = (guint8 *) data;
+    }
+
+  array->length      = length;
+  array->static_data = static_data;
+
+  return array;
+}
+
+GimpArray *
+gimp_string_array_copy (const GimpArray *array)
+{
+  if (array)
+    return gimp_string_array_new ((const gchar **) array->data,
+                                  array->length, FALSE);
+
+  return NULL;
+}
+
+void
+gimp_string_array_free (GimpArray *array)
+{
+  if (array)
+    {
+      if (! array->static_data)
+        {
+          gchar **tmp = (gchar **) array->data;
+          gint    i;
+
+          for (i = 0; i < array->length; i++)
+            g_free (tmp[i]);
+
+          g_free (array->data);
+        }
+
+      g_slice_free (GimpArray, array);
+    }
+}
+
+GType
+gimp_string_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpStringArray",
+                                         (GBoxedCopyFunc) gimp_string_array_copy,
+                                         (GBoxedFreeFunc) gimp_string_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_STRING_ARRAY
+ */
+
+static void       gimp_param_string_array_class_init  (GParamSpecClass *klass);
+static void       gimp_param_string_array_init        (GParamSpec      *pspec);
+static gboolean   gimp_param_string_array_validate    (GParamSpec      *pspec,
+                                                       GValue          *value);
+static gint       gimp_param_string_array_values_cmp  (GParamSpec      *pspec,
+                                                       const GValue    *value1,
+                                                       const GValue    *value2);
+
+GType
+gimp_param_string_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_string_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_string_array_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_BOXED,
+                                     "GimpParamStringArray", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_string_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type     = GIMP_TYPE_STRING_ARRAY;
+  klass->value_validate = gimp_param_string_array_validate;
+  klass->values_cmp     = gimp_param_string_array_values_cmp;
+}
+
+static void
+gimp_param_string_array_init (GParamSpec *pspec)
+{
+}
+
+static gboolean
+gimp_param_string_array_validate (GParamSpec *pspec,
+                                  GValue     *value)
+{
+  GimpArray *array = value->data[0].v_pointer;
+
+  if (array)
+    {
+      if ((array->data == NULL && array->length != 0) ||
+          (array->data != NULL && array->length == 0))
+        {
+          g_value_set_boxed (value, NULL);
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_param_string_array_values_cmp (GParamSpec   *pspec,
+                                    const GValue *value1,
+                                    const GValue *value2)
+{
+  GimpArray *array1 = value1->data[0].v_pointer;
+  GimpArray *array2 = value2->data[0].v_pointer;
+
+  /*  try to return at least *something*, it's useless anyway...  */
+
+  if (! array1)
+    return array2 != NULL ? -1 : 0;
+  else if (! array2)
+    return array1 != NULL ? 1 : 0;
+  else if (array1->length < array2->length)
+    return -1;
+  else if (array1->length > array2->length)
+    return 1;
+
+  return 0;
+}
+
+GParamSpec *
+gimp_param_spec_string_array (const gchar *name,
+                              const gchar *nick,
+                              const gchar *blurb,
+                              GParamFlags  flags)
+{
+  GimpParamSpecStringArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_STRING_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+const gchar **
+gimp_value_get_stringarray (const GValue *value)
+{
+  GimpArray *array;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_STRING_ARRAY (value), NULL);
+
+  array = value->data[0].v_pointer;
+
+  if (array)
+    return (const gchar **) array->data;
+
+  return NULL;
+}
+
+gchar **
+gimp_value_dup_stringarray (const GValue *value)
+{
+  GimpArray *array;
+
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_STRING_ARRAY (value), NULL);
+
+  array = value->data[0].v_pointer;
+
+  if (array)
+    {
+      gchar **ret = g_memdup (array->data, array->length * sizeof (gchar *));
+      gint    i;
+
+      for (i = 0; i < array->length; i++)
+        ret[i] = g_strdup (ret[i]);
+
+      return ret;
+    }
+
+  return NULL;
+}
+
+void
+gimp_value_set_stringarray (GValue       *value,
+                            const gchar **data,
+                            gsize         length)
+{
+  GimpArray *array;
+
+  g_return_if_fail (GIMP_VALUE_HOLDS_STRING_ARRAY (value));
+
+  array = gimp_string_array_new (data, length, FALSE);
+
+  g_value_take_boxed (value, array);
+}
+
+void
+gimp_value_set_static_stringarray (GValue       *value,
+                                   const gchar **data,
+                                   gsize         length)
+{
+  GimpArray *array;
+
+  g_return_if_fail (GIMP_VALUE_HOLDS_STRING_ARRAY (value));
+
+  array = gimp_string_array_new (data, length, TRUE);
+
+  g_value_take_boxed (value, array);
+}
+
+void
+gimp_value_take_stringarray (GValue  *value,
+                             gchar  **data,
+                             gsize    length)
+{
+  GimpArray *array;
+
+  g_return_if_fail (GIMP_VALUE_HOLDS_STRING_ARRAY (value));
+
+  array = gimp_string_array_new ((const gchar **) data, length, TRUE);
+  array->static_data = FALSE;
+
+  g_value_take_boxed (value, array);
+}
+
+
+/*
+ * GIMP_TYPE_COLOR_ARRAY
+ */
+
+GType
+gimp_color_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    type = g_boxed_type_register_static ("GimpColorArray",
+                                         (GBoxedCopyFunc) gimp_array_copy,
+                                         (GBoxedFreeFunc) gimp_array_free);
+
+  return type;
+}
+
+
+/*
+ * GIMP_TYPE_PARAM_COLOR_ARRAY
+ */
+
+static void  gimp_param_color_array_class_init (GParamSpecClass *klass);
+static void  gimp_param_color_array_init       (GParamSpec      *pspec);
+
+GType
+gimp_param_color_array_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GParamSpecClass),
+        NULL, NULL,
+        (GClassInitFunc) gimp_param_color_array_class_init,
+        NULL, NULL,
+        sizeof (GimpParamSpecArray),
+        0,
+        (GInstanceInitFunc) gimp_param_color_array_init
+      };
+
+      type = g_type_register_static (G_TYPE_PARAM_BOXED,
+                                     "GimpParamColorArray", &info, 0);
+    }
+
+  return type;
+}
+
+static void
+gimp_param_color_array_class_init (GParamSpecClass *klass)
+{
+  klass->value_type = GIMP_TYPE_COLOR_ARRAY;
+}
+
+static void
+gimp_param_color_array_init (GParamSpec *pspec)
+{
+}
+
+GParamSpec *
+gimp_param_spec_color_array (const gchar *name,
+                             const gchar *nick,
+                             const gchar *blurb,
+                             GParamFlags  flags)
+{
+  GimpParamSpecColorArray *array_spec;
+
+  array_spec = g_param_spec_internal (GIMP_TYPE_PARAM_COLOR_ARRAY,
+                                      name, nick, blurb, flags);
+
+  return G_PARAM_SPEC (array_spec);
+}
+
+const GimpRGB *
+gimp_value_get_colorarray (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_COLOR_ARRAY (value), NULL);
+
+  return (const GimpRGB *) gimp_value_get_array (value);
+}
+
+GimpRGB *
+gimp_value_dup_colorarray (const GValue *value)
+{
+  g_return_val_if_fail (GIMP_VALUE_HOLDS_COLOR_ARRAY (value), NULL);
+
+  return (GimpRGB *) gimp_value_dup_array (value);
+}
+
+void
+gimp_value_set_colorarray (GValue        *value,
+                           const GimpRGB *data,
+                           gsize         length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_COLOR_ARRAY (value));
+
+  gimp_value_set_array (value, (const guint8 *) data,
+                        length * sizeof (GimpRGB));
+}
+
+void
+gimp_value_set_static_colorarray (GValue        *value,
+                                  const GimpRGB *data,
+                                  gsize          length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_COLOR_ARRAY (value));
+
+  gimp_value_set_static_array (value, (const guint8 *) data,
+                               length * sizeof (GimpRGB));
+}
+
+void
+gimp_value_take_colorarray (GValue  *value,
+                            GimpRGB *data,
+                            gsize    length)
+{
+  g_return_if_fail (GIMP_VALUE_HOLDS_COLOR_ARRAY (value));
+
+  gimp_value_take_array (value, (guint8 *) data,
+                         length * sizeof (GimpRGB));
+}
diff --git a/app/core/gimpparamspecs.h b/app/core/gimpparamspecs.h
new file mode 100644
index 0000000..abfb56f
--- /dev/null
+++ b/app/core/gimpparamspecs.h
@@ -0,0 +1,904 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARAM_SPECS_H__
+#define __GIMP_PARAM_SPECS_H__
+
+
+/*
+ * Keep in sync with libgimpconfig/gimpconfig-params.h
+ */
+#define GIMP_PARAM_NO_VALIDATE (1 << (6 + G_PARAM_USER_SHIFT))
+
+
+/*
+ * GIMP_TYPE_INT32
+ */
+
+#define GIMP_TYPE_INT32               (gimp_int32_get_type ())
+#define GIMP_VALUE_HOLDS_INT32(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                       GIMP_TYPE_INT32))
+
+GType   gimp_int32_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_INT32
+ */
+
+#define GIMP_TYPE_PARAM_INT32           (gimp_param_int32_get_type ())
+#define GIMP_PARAM_SPEC_INT32(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT32, GimpParamSpecInt32))
+#define GIMP_IS_PARAM_SPEC_INT32(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT32))
+
+typedef struct _GimpParamSpecInt32 GimpParamSpecInt32;
+
+struct _GimpParamSpecInt32
+{
+  GParamSpecInt parent_instance;
+};
+
+GType        gimp_param_int32_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_int32     (const gchar *name,
+                                        const gchar *nick,
+                                        const gchar *blurb,
+                                        gint         minimum,
+                                        gint         maximum,
+                                        gint         default_value,
+                                        GParamFlags  flags);
+
+
+/*
+ * GIMP_TYPE_INT16
+ */
+
+#define GIMP_TYPE_INT16               (gimp_int16_get_type ())
+#define GIMP_VALUE_HOLDS_INT16(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                       GIMP_TYPE_INT16))
+
+GType   gimp_int16_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_INT16
+ */
+
+#define GIMP_TYPE_PARAM_INT16           (gimp_param_int16_get_type ())
+#define GIMP_PARAM_SPEC_INT16(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT16, GimpParamSpecInt16))
+#define GIMP_IS_PARAM_SPEC_INT16(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT16))
+
+typedef struct _GimpParamSpecInt16 GimpParamSpecInt16;
+
+struct _GimpParamSpecInt16
+{
+  GParamSpecInt parent_instance;
+};
+
+GType        gimp_param_int16_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_int16     (const gchar *name,
+                                        const gchar *nick,
+                                        const gchar *blurb,
+                                        gint         minimum,
+                                        gint         maximum,
+                                        gint         default_value,
+                                        GParamFlags  flags);
+
+
+/*
+ * GIMP_TYPE_INT8
+ */
+
+#define GIMP_TYPE_INT8               (gimp_int8_get_type ())
+#define GIMP_VALUE_HOLDS_INT8(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                      GIMP_TYPE_INT8))
+
+GType   gimp_int8_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_INT8
+ */
+
+#define GIMP_TYPE_PARAM_INT8           (gimp_param_int8_get_type ())
+#define GIMP_PARAM_SPEC_INT8(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT8, GimpParamSpecInt8))
+#define GIMP_IS_PARAM_SPEC_INT8(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT8))
+
+typedef struct _GimpParamSpecInt8 GimpParamSpecInt8;
+
+struct _GimpParamSpecInt8
+{
+  GParamSpecUInt parent_instance;
+};
+
+GType        gimp_param_int8_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_int8     (const gchar *name,
+                                       const gchar *nick,
+                                       const gchar *blurb,
+                                       guint        minimum,
+                                       guint        maximum,
+                                       guint        default_value,
+                                       GParamFlags  flags);
+
+
+/*
+ * GIMP_TYPE_PARAM_STRING
+ */
+
+#define GIMP_TYPE_PARAM_STRING           (gimp_param_string_get_type ())
+#define GIMP_PARAM_SPEC_STRING(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_STRING, GimpParamSpecString))
+#define GIMP_IS_PARAM_SPEC_STRING(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_STRING))
+
+typedef struct _GimpParamSpecString GimpParamSpecString;
+
+struct _GimpParamSpecString
+{
+  GParamSpecString parent_instance;
+
+  guint            allow_non_utf8 : 1;
+  guint            non_empty      : 1;
+};
+
+GType        gimp_param_string_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_string     (const gchar *name,
+                                         const gchar *nick,
+                                         const gchar *blurb,
+                                         gboolean     allow_non_utf8,
+                                         gboolean     null_ok,
+                                         gboolean     non_empty,
+                                         const gchar *default_value,
+                                         GParamFlags  flags);
+
+
+/*
+ * GIMP_TYPE_PARAM_ENUM
+ */
+
+#define GIMP_TYPE_PARAM_ENUM           (gimp_param_enum_get_type ())
+#define GIMP_PARAM_SPEC_ENUM(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_ENUM, GimpParamSpecEnum))
+
+#define GIMP_IS_PARAM_SPEC_ENUM(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_ENUM))
+
+typedef struct _GimpParamSpecEnum GimpParamSpecEnum;
+
+struct _GimpParamSpecEnum
+{
+  GParamSpecEnum  parent_instance;
+
+  GSList         *excluded_values;
+};
+
+GType        gimp_param_enum_get_type     (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_enum         (const gchar       *name,
+                                           const gchar       *nick,
+                                           const gchar       *blurb,
+                                           GType              enum_type,
+                                           gint               default_value,
+                                           GParamFlags        flags);
+
+void   gimp_param_spec_enum_exclude_value (GimpParamSpecEnum *espec,
+                                           gint               value);
+
+
+/*
+ * GIMP_TYPE_IMAGE_ID
+ */
+
+#define GIMP_TYPE_IMAGE_ID               (gimp_image_id_get_type ())
+#define GIMP_VALUE_HOLDS_IMAGE_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                          GIMP_TYPE_IMAGE_ID))
+
+GType   gimp_image_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_IMAGE_ID
+ */
+
+#define GIMP_TYPE_PARAM_IMAGE_ID           (gimp_param_image_id_get_type ())
+#define GIMP_PARAM_SPEC_IMAGE_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_IMAGE_ID, GimpParamSpecImageID))
+#define GIMP_IS_PARAM_SPEC_IMAGE_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_IMAGE_ID))
+
+typedef struct _GimpParamSpecImageID GimpParamSpecImageID;
+
+struct _GimpParamSpecImageID
+{
+  GParamSpecInt  parent_instance;
+
+  Gimp          *gimp;
+  gboolean       none_ok;
+};
+
+GType        gimp_param_image_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_image_id     (const gchar  *name,
+                                           const gchar  *nick,
+                                           const gchar  *blurb,
+                                           Gimp         *gimp,
+                                           gboolean      none_ok,
+                                           GParamFlags   flags);
+
+GimpImage  * gimp_value_get_image         (const GValue *value,
+                                           Gimp         *gimp);
+void         gimp_value_set_image         (GValue       *value,
+                                           GimpImage    *image);
+
+
+
+/*
+ * GIMP_TYPE_ITEM_ID
+ */
+
+#define GIMP_TYPE_ITEM_ID               (gimp_item_id_get_type ())
+#define GIMP_VALUE_HOLDS_ITEM_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                         GIMP_TYPE_ITEM_ID))
+
+GType   gimp_item_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_ITEM_ID
+ */
+
+#define GIMP_TYPE_PARAM_ITEM_ID           (gimp_param_item_id_get_type ())
+#define GIMP_PARAM_SPEC_ITEM_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_ITEM_ID, GimpParamSpecItemID))
+#define GIMP_IS_PARAM_SPEC_ITEM_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_ITEM_ID))
+
+typedef struct _GimpParamSpecItemID GimpParamSpecItemID;
+
+struct _GimpParamSpecItemID
+{
+  GParamSpecInt  parent_instance;
+
+  Gimp          *gimp;
+  GType          item_type;
+  gboolean       none_ok;
+};
+
+GType        gimp_param_item_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_item_id     (const gchar  *name,
+                                          const gchar  *nick,
+                                          const gchar  *blurb,
+                                          Gimp         *gimp,
+                                          gboolean      none_ok,
+                                          GParamFlags   flags);
+
+GimpItem   * gimp_value_get_item         (const GValue *value,
+                                          Gimp         *gimp);
+void         gimp_value_set_item         (GValue       *value,
+                                          GimpItem     *item);
+
+
+/*
+ * GIMP_TYPE_DRAWABLE_ID
+ */
+
+#define GIMP_TYPE_DRAWABLE_ID               (gimp_drawable_id_get_type ())
+#define GIMP_VALUE_HOLDS_DRAWABLE_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                             GIMP_TYPE_DRAWABLE_ID))
+
+GType   gimp_drawable_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_DRAWABLE_ID
+ */
+
+#define GIMP_TYPE_PARAM_DRAWABLE_ID           (gimp_param_drawable_id_get_type ())
+#define GIMP_PARAM_SPEC_DRAWABLE_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_DRAWABLE_ID, GimpParamSpecDrawableID))
+#define GIMP_IS_PARAM_SPEC_DRAWABLE_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_DRAWABLE_ID))
+
+typedef struct _GimpParamSpecDrawableID GimpParamSpecDrawableID;
+
+struct _GimpParamSpecDrawableID
+{
+  GimpParamSpecItemID parent_instance;
+};
+
+GType         gimp_param_drawable_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec  * gimp_param_spec_drawable_id     (const gchar  *name,
+                                               const gchar  *nick,
+                                               const gchar  *blurb,
+                                               Gimp         *gimp,
+                                               gboolean      none_ok,
+                                               GParamFlags   flags);
+
+GimpDrawable * gimp_value_get_drawable        (const GValue *value,
+                                               Gimp         *gimp);
+void           gimp_value_set_drawable        (GValue       *value,
+                                               GimpDrawable *drawable);
+
+
+/*
+ * GIMP_TYPE_LAYER_ID
+ */
+
+#define GIMP_TYPE_LAYER_ID               (gimp_layer_id_get_type ())
+#define GIMP_VALUE_HOLDS_LAYER_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                          GIMP_TYPE_LAYER_ID))
+
+GType   gimp_layer_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_LAYER_ID
+ */
+
+#define GIMP_TYPE_PARAM_LAYER_ID           (gimp_param_layer_id_get_type ())
+#define GIMP_PARAM_SPEC_LAYER_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_LAYER_ID, GimpParamSpecLayerID))
+#define GIMP_IS_PARAM_SPEC_LAYER_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_LAYER_ID))
+
+typedef struct _GimpParamSpecLayerID GimpParamSpecLayerID;
+
+struct _GimpParamSpecLayerID
+{
+  GimpParamSpecDrawableID parent_instance;
+};
+
+GType        gimp_param_layer_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_layer_id     (const gchar  *name,
+                                           const gchar  *nick,
+                                           const gchar  *blurb,
+                                           Gimp         *gimp,
+                                           gboolean      none_ok,
+                                           GParamFlags   flags);
+
+GimpLayer  * gimp_value_get_layer         (const GValue *value,
+                                           Gimp         *gimp);
+void         gimp_value_set_layer         (GValue       *value,
+                                           GimpLayer    *layer);
+
+
+/*
+ * GIMP_TYPE_CHANNEL_ID
+ */
+
+#define GIMP_TYPE_CHANNEL_ID               (gimp_channel_id_get_type ())
+#define GIMP_VALUE_HOLDS_CHANNEL_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                            GIMP_TYPE_CHANNEL_ID))
+
+GType   gimp_channel_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_CHANNEL_ID
+ */
+
+#define GIMP_TYPE_PARAM_CHANNEL_ID           (gimp_param_channel_id_get_type ())
+#define GIMP_PARAM_SPEC_CHANNEL_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_CHANNEL_ID, GimpParamSpecChannelID))
+#define GIMP_IS_PARAM_SPEC_CHANNEL_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_CHANNEL_ID))
+
+typedef struct _GimpParamSpecChannelID GimpParamSpecChannelID;
+
+struct _GimpParamSpecChannelID
+{
+  GimpParamSpecDrawableID parent_instance;
+};
+
+GType         gimp_param_channel_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec  * gimp_param_spec_channel_id     (const gchar  *name,
+                                              const gchar  *nick,
+                                              const gchar  *blurb,
+                                              Gimp         *gimp,
+                                              gboolean      none_ok,
+                                              GParamFlags   flags);
+
+GimpChannel * gimp_value_get_channel         (const GValue *value,
+                                              Gimp         *gimp);
+void          gimp_value_set_channel         (GValue       *value,
+                                              GimpChannel  *channel);
+
+
+/*
+ * GIMP_TYPE_LAYER_MASK_ID
+ */
+
+#define GIMP_TYPE_LAYER_MASK_ID               (gimp_layer_mask_id_get_type ())
+#define GIMP_VALUE_HOLDS_LAYER_MASK_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                               GIMP_TYPE_LAYER_MASK_ID))
+
+GType   gimp_layer_mask_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_LAYER_MASK_ID
+ */
+
+#define GIMP_TYPE_PARAM_LAYER_MASK_ID           (gimp_param_layer_mask_id_get_type ())
+#define GIMP_PARAM_SPEC_LAYER_MASK_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_LAYER_MASK_ID, GimpParamSpecLayerMaskID))
+#define GIMP_IS_PARAM_SPEC_LAYER_MASK_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_LAYER_MASK_ID))
+
+typedef struct _GimpParamSpecLayerMaskID GimpParamSpecLayerMaskID;
+
+struct _GimpParamSpecLayerMaskID
+{
+  GimpParamSpecChannelID parent_instance;
+};
+
+GType           gimp_param_layer_mask_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec    * gimp_param_spec_layer_mask_id     (const gchar   *name,
+                                                   const gchar   *nick,
+                                                   const gchar   *blurb,
+                                                   Gimp          *gimp,
+                                                   gboolean       none_ok,
+                                                   GParamFlags    flags);
+
+GimpLayerMask * gimp_value_get_layer_mask         (const GValue  *value,
+                                                   Gimp          *gimp);
+void            gimp_value_set_layer_mask         (GValue        *value,
+                                                   GimpLayerMask *layer_mask);
+
+
+/*
+ * GIMP_TYPE_SELECTION_ID
+ */
+
+#define GIMP_TYPE_SELECTION_ID               (gimp_selection_id_get_type ())
+#define GIMP_VALUE_HOLDS_SELECTION_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                              GIMP_TYPE_SELECTION_ID))
+
+GType   gimp_selection_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_SELECTION_ID
+ */
+
+#define GIMP_TYPE_PARAM_SELECTION_ID           (gimp_param_selection_id_get_type ())
+#define GIMP_PARAM_SPEC_SELECTION_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_SELECTION_ID, GimpParamSpecSelectionID))
+#define GIMP_IS_PARAM_SPEC_SELECTION_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_SELECTION_ID))
+
+typedef struct _GimpParamSpecSelectionID GimpParamSpecSelectionID;
+
+struct _GimpParamSpecSelectionID
+{
+  GimpParamSpecChannelID parent_instance;
+};
+
+GType           gimp_param_selection_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec    * gimp_param_spec_selection_id     (const gchar   *name,
+                                                  const gchar   *nick,
+                                                  const gchar   *blurb,
+                                                  Gimp          *gimp,
+                                                  gboolean       none_ok,
+                                                  GParamFlags    flags);
+
+GimpSelection * gimp_value_get_selection         (const GValue  *value,
+                                                  Gimp          *gimp);
+void            gimp_value_set_selection         (GValue        *value,
+                                                  GimpSelection *selection);
+
+
+/*
+ * GIMP_TYPE_VECTORS_ID
+ */
+
+#define GIMP_TYPE_VECTORS_ID               (gimp_vectors_id_get_type ())
+#define GIMP_VALUE_HOLDS_VECTORS_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                            GIMP_TYPE_VECTORS_ID))
+
+GType   gimp_vectors_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_VECTORS_ID
+ */
+
+#define GIMP_TYPE_PARAM_VECTORS_ID           (gimp_param_vectors_id_get_type ())
+#define GIMP_PARAM_SPEC_VECTORS_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_VECTORS_ID, GimpParamSpecVectorsID))
+#define GIMP_IS_PARAM_SPEC_VECTORS_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_VECTORS_ID))
+
+typedef struct _GimpParamSpecVectorsID GimpParamSpecVectorsID;
+
+struct _GimpParamSpecVectorsID
+{
+  GimpParamSpecItemID parent_instance;
+};
+
+GType         gimp_param_vectors_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec  * gimp_param_spec_vectors_id     (const gchar  *name,
+                                              const gchar  *nick,
+                                              const gchar  *blurb,
+                                              Gimp         *gimp,
+                                              gboolean      none_ok,
+                                              GParamFlags   flags);
+
+GimpVectors * gimp_value_get_vectors         (const GValue *value,
+                                              Gimp         *gimp);
+void          gimp_value_set_vectors         (GValue       *value,
+                                              GimpVectors  *vectors);
+
+
+/*
+ * GIMP_TYPE_DISPLAY_ID
+ */
+
+#define GIMP_TYPE_DISPLAY_ID               (gimp_display_id_get_type ())
+#define GIMP_VALUE_HOLDS_DISPLAY_ID(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
+                                            GIMP_TYPE_DISPLAY_ID))
+
+GType   gimp_display_id_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_DISPLAY_ID
+ */
+
+#define GIMP_TYPE_PARAM_DISPLAY_ID           (gimp_param_display_id_get_type ())
+#define GIMP_PARAM_SPEC_DISPLAY_ID(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_DISPLAY_ID, GimpParamSpecDisplayID))
+#define GIMP_IS_PARAM_SPEC_DISPLAY_ID(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_DISPLAY_ID))
+
+typedef struct _GimpParamSpecDisplayID GimpParamSpecDisplayID;
+
+struct _GimpParamSpecDisplayID
+{
+  GParamSpecInt  parent_instance;
+
+  Gimp          *gimp;
+  gboolean       none_ok;
+};
+
+GType        gimp_param_display_id_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_display_id     (const gchar  *name,
+                                             const gchar  *nick,
+                                             const gchar  *blurb,
+                                             Gimp         *gimp,
+                                             gboolean      none_ok,
+                                             GParamFlags   flags);
+
+GimpObject * gimp_value_get_display         (const GValue *value,
+                                             Gimp         *gimp);
+void         gimp_value_set_display         (GValue       *value,
+                                             GimpObject   *display);
+
+
+/*
+ * GIMP_TYPE_ARRAY
+ */
+
+typedef struct _GimpArray GimpArray;
+
+struct _GimpArray
+{
+  guint8   *data;
+  gsize     length;
+  gboolean  static_data;
+};
+
+GimpArray * gimp_array_new  (const guint8    *data,
+                             gsize            length,
+                             gboolean         static_data);
+GimpArray * gimp_array_copy (const GimpArray *array);
+void        gimp_array_free (GimpArray       *array);
+
+#define GIMP_TYPE_ARRAY               (gimp_array_get_type ())
+#define GIMP_VALUE_HOLDS_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_ARRAY))
+
+GType   gimp_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_ARRAY           (gimp_param_array_get_type ())
+#define GIMP_PARAM_SPEC_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_ARRAY, GimpParamSpecArray))
+#define GIMP_IS_PARAM_SPEC_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_ARRAY))
+
+typedef struct _GimpParamSpecArray GimpParamSpecArray;
+
+struct _GimpParamSpecArray
+{
+  GParamSpecBoxed parent_instance;
+};
+
+GType        gimp_param_array_get_type (void) G_GNUC_CONST;
+
+GParamSpec * gimp_param_spec_array     (const gchar  *name,
+                                        const gchar  *nick,
+                                        const gchar  *blurb,
+                                        GParamFlags   flags);
+
+
+/*
+ * GIMP_TYPE_INT8_ARRAY
+ */
+
+#define GIMP_TYPE_INT8_ARRAY               (gimp_int8_array_get_type ())
+#define GIMP_VALUE_HOLDS_INT8_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_INT8_ARRAY))
+
+GType   gimp_int8_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_INT8_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_INT8_ARRAY           (gimp_param_int8_array_get_type ())
+#define GIMP_PARAM_SPEC_INT8_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT8_ARRAY, GimpParamSpecInt8Array))
+#define GIMP_IS_PARAM_SPEC_INT8_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT8_ARRAY))
+
+typedef struct _GimpParamSpecInt8Array GimpParamSpecInt8Array;
+
+struct _GimpParamSpecInt8Array
+{
+  GimpParamSpecArray parent_instance;
+};
+
+GType          gimp_param_int8_array_get_type  (void) G_GNUC_CONST;
+
+GParamSpec   * gimp_param_spec_int8_array      (const gchar  *name,
+                                                const gchar  *nick,
+                                                const gchar  *blurb,
+                                                GParamFlags   flags);
+
+const guint8 * gimp_value_get_int8array        (const GValue *value);
+guint8       * gimp_value_dup_int8array        (const GValue *value);
+void           gimp_value_set_int8array        (GValue       *value,
+                                                const guint8 *array,
+                                                gsize         length);
+void           gimp_value_set_static_int8array (GValue       *value,
+                                                const guint8 *array,
+                                                gsize         length);
+void           gimp_value_take_int8array       (GValue       *value,
+                                                guint8       *array,
+                                                gsize         length);
+
+
+/*
+ * GIMP_TYPE_INT16_ARRAY
+ */
+
+#define GIMP_TYPE_INT16_ARRAY               (gimp_int16_array_get_type ())
+#define GIMP_VALUE_HOLDS_INT16_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_INT16_ARRAY))
+
+GType   gimp_int16_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_INT16_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_INT16_ARRAY           (gimp_param_int16_array_get_type ())
+#define GIMP_PARAM_SPEC_INT16_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT16_ARRAY, GimpParamSpecInt16Array))
+#define GIMP_IS_PARAM_SPEC_INT16_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT16_ARRAY))
+
+typedef struct _GimpParamSpecInt16Array GimpParamSpecInt16Array;
+
+struct _GimpParamSpecInt16Array
+{
+  GimpParamSpecArray parent_instance;
+};
+
+GType          gimp_param_int16_array_get_type  (void) G_GNUC_CONST;
+
+GParamSpec   * gimp_param_spec_int16_array      (const gchar  *name,
+                                                 const gchar  *nick,
+                                                 const gchar  *blurb,
+                                                 GParamFlags   flags);
+
+const gint16 * gimp_value_get_int16array        (const GValue *value);
+gint16       * gimp_value_dup_int16array        (const GValue *value);
+void           gimp_value_set_int16array        (GValue       *value,
+                                                 const gint16 *array,
+                                                 gsize         length);
+void           gimp_value_set_static_int16array (GValue       *value,
+                                                 const gint16 *array,
+                                                 gsize         length);
+void           gimp_value_take_int16array       (GValue       *value,
+                                                 gint16       *array,
+                                                 gsize         length);
+
+
+/*
+ * GIMP_TYPE_INT32_ARRAY
+ */
+
+#define GIMP_TYPE_INT32_ARRAY               (gimp_int32_array_get_type ())
+#define GIMP_VALUE_HOLDS_INT32_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_INT32_ARRAY))
+
+GType   gimp_int32_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_INT32_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_INT32_ARRAY           (gimp_param_int32_array_get_type ())
+#define GIMP_PARAM_SPEC_INT32_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT32_ARRAY, GimpParamSpecInt32Array))
+#define GIMP_IS_PARAM_SPEC_INT32_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT32_ARRAY))
+
+typedef struct _GimpParamSpecInt32Array GimpParamSpecInt32Array;
+
+struct _GimpParamSpecInt32Array
+{
+  GimpParamSpecArray parent_instance;
+};
+
+GType          gimp_param_int32_array_get_type  (void) G_GNUC_CONST;
+
+GParamSpec   * gimp_param_spec_int32_array      (const gchar  *name,
+                                                 const gchar  *nick,
+                                                 const gchar  *blurb,
+                                                 GParamFlags   flags);
+
+const gint32 * gimp_value_get_int32array        (const GValue *value);
+gint32       * gimp_value_dup_int32array        (const GValue *value);
+void           gimp_value_set_int32array        (GValue       *value,
+                                                 const gint32 *array,
+                                                 gsize         length);
+void           gimp_value_set_static_int32array (GValue       *value,
+                                                 const gint32 *array,
+                                                 gsize         length);
+void           gimp_value_take_int32array       (GValue       *value,
+                                                 gint32       *array,
+                                                 gsize         length);
+
+
+/*
+ * GIMP_TYPE_FLOAT_ARRAY
+ */
+
+#define GIMP_TYPE_FLOAT_ARRAY               (gimp_float_array_get_type ())
+#define GIMP_VALUE_HOLDS_FLOAT_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_FLOAT_ARRAY))
+
+GType   gimp_float_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_FLOAT_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_FLOAT_ARRAY           (gimp_param_float_array_get_type ())
+#define GIMP_PARAM_SPEC_FLOAT_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_FLOAT_ARRAY, GimpParamSpecFloatArray))
+#define GIMP_IS_PARAM_SPEC_FLOAT_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_FLOAT_ARRAY))
+
+typedef struct _GimpParamSpecFloatArray GimpParamSpecFloatArray;
+
+struct _GimpParamSpecFloatArray
+{
+  GimpParamSpecArray parent_instance;
+};
+
+GType           gimp_param_float_array_get_type  (void) G_GNUC_CONST;
+
+GParamSpec    * gimp_param_spec_float_array      (const gchar  *name,
+                                                  const gchar  *nick,
+                                                  const gchar  *blurb,
+                                                  GParamFlags   flags);
+
+const gdouble * gimp_value_get_floatarray        (const GValue  *value);
+gdouble       * gimp_value_dup_floatarray        (const GValue  *value);
+void            gimp_value_set_floatarray        (GValue        *value,
+                                                  const gdouble *array,
+                                                  gsize         length);
+void            gimp_value_set_static_floatarray (GValue        *value,
+                                                  const gdouble *array,
+                                                  gsize         length);
+void            gimp_value_take_floatarray       (GValue        *value,
+                                                  gdouble       *array,
+                                                  gsize         length);
+
+
+/*
+ * GIMP_TYPE_STRING_ARRAY
+ */
+
+GimpArray * gimp_string_array_new  (const gchar     **data,
+                                    gsize             length,
+                                    gboolean          static_data);
+GimpArray * gimp_string_array_copy (const GimpArray  *array);
+void        gimp_string_array_free (GimpArray        *array);
+
+#define GIMP_TYPE_STRING_ARRAY               (gimp_string_array_get_type ())
+#define GIMP_VALUE_HOLDS_STRING_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_STRING_ARRAY))
+
+GType   gimp_string_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_STRING_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_STRING_ARRAY           (gimp_param_string_array_get_type ())
+#define GIMP_PARAM_SPEC_STRING_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_STRING_ARRAY, GimpParamSpecStringArray))
+#define GIMP_IS_PARAM_SPEC_STRING_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_STRING_ARRAY))
+
+typedef struct _GimpParamSpecStringArray GimpParamSpecStringArray;
+
+struct _GimpParamSpecStringArray
+{
+  GParamSpecBoxed parent_instance;
+};
+
+GType          gimp_param_string_array_get_type  (void) G_GNUC_CONST;
+
+GParamSpec   * gimp_param_spec_string_array      (const gchar  *name,
+                                                  const gchar  *nick,
+                                                  const gchar  *blurb,
+                                                  GParamFlags   flags);
+
+const gchar ** gimp_value_get_stringarray        (const GValue *value);
+gchar       ** gimp_value_dup_stringarray        (const GValue *value);
+void           gimp_value_set_stringarray        (GValue       *value,
+                                                  const gchar **array,
+                                                  gsize         length);
+void           gimp_value_set_static_stringarray (GValue       *value,
+                                                  const gchar **array,
+                                                  gsize         length);
+void           gimp_value_take_stringarray       (GValue       *value,
+                                                  gchar       **array,
+                                                  gsize         length);
+
+
+/*
+ * GIMP_TYPE_COLOR_ARRAY
+ */
+
+#define GIMP_TYPE_COLOR_ARRAY               (gimp_color_array_get_type ())
+#define GIMP_VALUE_HOLDS_COLOR_ARRAY(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_COLOR_ARRAY))
+
+GType   gimp_color_array_get_type           (void) G_GNUC_CONST;
+
+
+/*
+ * GIMP_TYPE_PARAM_COLOR_ARRAY
+ */
+
+#define GIMP_TYPE_PARAM_COLOR_ARRAY           (gimp_param_color_array_get_type ())
+#define GIMP_PARAM_SPEC_COLOR_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_COLOR_ARRAY, GimpParamSpecColorArray))
+#define GIMP_IS_PARAM_SPEC_COLOR_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_COLOR_ARRAY))
+
+typedef struct _GimpParamSpecColorArray GimpParamSpecColorArray;
+
+struct _GimpParamSpecColorArray
+{
+  GParamSpecBoxed parent_instance;
+};
+
+GType           gimp_param_color_array_get_type  (void) G_GNUC_CONST;
+
+GParamSpec    * gimp_param_spec_color_array      (const gchar   *name,
+                                                  const gchar   *nick,
+                                                  const gchar   *blurb,
+                                                  GParamFlags    flags);
+
+const GimpRGB * gimp_value_get_colorarray        (const GValue  *value);
+GimpRGB       * gimp_value_dup_colorarray        (const GValue  *value);
+void            gimp_value_set_colorarray        (GValue        *value,
+                                                  const GimpRGB *array,
+                                                  gsize          length);
+void            gimp_value_set_static_colorarray (GValue        *value,
+                                                  const GimpRGB *array,
+                                                  gsize          length);
+void            gimp_value_take_colorarray       (GValue        *value,
+                                                  GimpRGB       *array,
+                                                  gsize          length);
+
+
+#endif  /*  __GIMP_PARAM_SPECS_H__  */
diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c
new file mode 100644
index 0000000..70a81fa
--- /dev/null
+++ b/app/core/gimpparasitelist.c
@@ -0,0 +1,453 @@
+/* parasitelist.c: Copyright 1998 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpmarshal.h"
+#include "gimpparasitelist.h"
+
+
+enum
+{
+  ADD,
+  REMOVE,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_parasite_list_finalize          (GObject     *object);
+static gint64   gimp_parasite_list_get_memsize       (GimpObject  *object,
+                                                      gint64      *gui_size);
+
+static void     gimp_parasite_list_config_iface_init (gpointer     iface,
+                                                      gpointer     iface_data);
+static gboolean gimp_parasite_list_serialize    (GimpConfig       *list,
+                                                 GimpConfigWriter *writer,
+                                                 gpointer          data);
+static gboolean gimp_parasite_list_deserialize  (GimpConfig       *list,
+                                                 GScanner         *scanner,
+                                                 gint              nest_level,
+                                                 gpointer          data);
+
+static void     parasite_serialize           (const gchar      *key,
+                                              GimpParasite     *parasite,
+                                              GimpConfigWriter *writer);
+static void     parasite_copy                (const gchar      *key,
+                                              GimpParasite     *parasite,
+                                              GimpParasiteList *list);
+static gboolean parasite_free                (const gchar      *key,
+                                              GimpParasite     *parasite,
+                                              gpointer          unused);
+static void     parasite_count_if_persistent (const gchar      *key,
+                                              GimpParasite     *parasite,
+                                              gint             *count);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpParasiteList, gimp_parasite_list, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_parasite_list_config_iface_init))
+
+#define parent_class gimp_parasite_list_parent_class
+
+static guint        parasite_list_signals[LAST_SIGNAL] = { 0 };
+static const gchar  parasite_symbol[]                  = "parasite";
+
+
+static void
+gimp_parasite_list_class_init (GimpParasiteListClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  parasite_list_signals[ADD] =
+    g_signal_new ("add",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpParasiteListClass, add),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  parasite_list_signals[REMOVE] =
+    g_signal_new ("remove",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpParasiteListClass, remove),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  object_class->finalize         = gimp_parasite_list_finalize;
+
+  gimp_object_class->get_memsize = gimp_parasite_list_get_memsize;
+
+  klass->add                     = NULL;
+  klass->remove                  = NULL;
+}
+
+static void
+gimp_parasite_list_config_iface_init (gpointer  iface,
+                                      gpointer  iface_data)
+{
+  GimpConfigInterface *config_iface = (GimpConfigInterface *) iface;
+
+  config_iface->serialize   = gimp_parasite_list_serialize;
+  config_iface->deserialize = gimp_parasite_list_deserialize;
+}
+
+static void
+gimp_parasite_list_init (GimpParasiteList *list)
+{
+  list->table = NULL;
+}
+
+static void
+gimp_parasite_list_finalize (GObject *object)
+{
+  GimpParasiteList *list = GIMP_PARASITE_LIST (object);
+
+  if (list->table)
+    {
+      g_hash_table_foreach_remove (list->table, (GHRFunc) parasite_free, NULL);
+      g_hash_table_destroy (list->table);
+      list->table = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_parasite_list_get_memsize (GimpObject *object,
+                                gint64     *gui_size)
+{
+  GimpParasiteList *list    = GIMP_PARASITE_LIST (object);
+  gint64            memsize = 0;
+
+  memsize += gimp_g_hash_table_get_memsize_foreach (list->table,
+                                                    (GimpMemsizeFunc)
+                                                    gimp_parasite_get_memsize,
+                                                    gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_parasite_list_serialize (GimpConfig       *list,
+                              GimpConfigWriter *writer,
+                              gpointer          data)
+{
+  if (GIMP_PARASITE_LIST (list)->table)
+    g_hash_table_foreach (GIMP_PARASITE_LIST (list)->table,
+                          (GHFunc) parasite_serialize,
+                          writer);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_parasite_list_deserialize (GimpConfig *list,
+                                GScanner   *scanner,
+                                gint        nest_level,
+                                gpointer    data)
+{
+  GTokenType token;
+
+  g_scanner_scope_add_symbol (scanner, 0,
+                              parasite_symbol, (gpointer) parasite_symbol);
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          if (scanner->value.v_symbol == parasite_symbol)
+            {
+              gchar        *parasite_name      = NULL;
+              gint          parasite_flags     = 0;
+              guint8       *parasite_data      = NULL;
+              gint          parasite_data_size = 0;
+              GimpParasite *parasite;
+
+              token = G_TOKEN_STRING;
+
+              if (g_scanner_peek_next_token (scanner) != token)
+                break;
+
+              if (! gimp_scanner_parse_string (scanner, &parasite_name))
+                break;
+
+              token = G_TOKEN_INT;
+
+              if (g_scanner_peek_next_token (scanner) != token)
+                goto cleanup;
+
+              if (! gimp_scanner_parse_int (scanner, &parasite_flags))
+                goto cleanup;
+
+              token = G_TOKEN_INT;
+
+              if (g_scanner_peek_next_token (scanner) != token)
+                {
+                  /*  old format -- plain string  */
+
+                  gchar *str;
+
+                  if (g_scanner_peek_next_token (scanner) != G_TOKEN_STRING)
+                    goto cleanup;
+
+                  if (! gimp_scanner_parse_string (scanner, &str))
+                    goto cleanup;
+
+                  parasite_data_size = strlen (str);
+                  parasite_data      = (guint8 *) str;
+                }
+              else
+                {
+                  /*  new format -- properly encoded binary data  */
+
+                  if (! gimp_scanner_parse_int (scanner, &parasite_data_size))
+                    goto cleanup;
+
+                  token = G_TOKEN_STRING;
+
+                  if (g_scanner_peek_next_token (scanner) != token)
+                    goto cleanup;
+
+                  if (! gimp_scanner_parse_data (scanner, parasite_data_size,
+                                                 &parasite_data))
+                    goto cleanup;
+                }
+
+              parasite = gimp_parasite_new (parasite_name,
+                                            parasite_flags,
+                                            parasite_data_size,
+                                            parasite_data);
+              gimp_parasite_list_add (GIMP_PARASITE_LIST (list),
+                                      parasite);  /* adds a copy */
+              gimp_parasite_free (parasite);
+
+              token = G_TOKEN_RIGHT_PAREN;
+
+              g_free (parasite_data);
+            cleanup:
+              g_free (parasite_name);
+            }
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+  return gimp_config_deserialize_return (scanner, token, nest_level);
+}
+
+GimpParasiteList *
+gimp_parasite_list_new (void)
+{
+  GimpParasiteList *list;
+
+  list = g_object_new (GIMP_TYPE_PARASITE_LIST, NULL);
+
+  return list;
+}
+
+GimpParasiteList *
+gimp_parasite_list_copy (GimpParasiteList *list)
+{
+  GimpParasiteList *newlist;
+
+  g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), NULL);
+
+  newlist = gimp_parasite_list_new ();
+
+  if (list->table)
+    g_hash_table_foreach (list->table, (GHFunc) parasite_copy, newlist);
+
+  return newlist;
+}
+
+void
+gimp_parasite_list_add (GimpParasiteList   *list,
+                        const GimpParasite *parasite)
+{
+  GimpParasite *copy;
+
+  g_return_if_fail (GIMP_IS_PARASITE_LIST (list));
+  g_return_if_fail (parasite != NULL);
+  g_return_if_fail (parasite->name != NULL);
+
+  if (list->table == NULL)
+    list->table = g_hash_table_new (g_str_hash, g_str_equal);
+
+  gimp_parasite_list_remove (list, parasite->name);
+  copy = gimp_parasite_copy (parasite);
+  g_hash_table_insert (list->table, copy->name, copy);
+
+  g_signal_emit (list, parasite_list_signals[ADD], 0, copy);
+}
+
+void
+gimp_parasite_list_remove (GimpParasiteList *list,
+                           const gchar      *name)
+{
+  g_return_if_fail (GIMP_IS_PARASITE_LIST (list));
+
+  if (list->table)
+    {
+      GimpParasite *parasite;
+
+      parasite = (GimpParasite *) gimp_parasite_list_find (list, name);
+
+      if (parasite)
+        {
+          g_hash_table_remove (list->table, name);
+
+          g_signal_emit (list, parasite_list_signals[REMOVE], 0, parasite);
+
+          gimp_parasite_free (parasite);
+        }
+    }
+}
+
+gint
+gimp_parasite_list_length (GimpParasiteList *list)
+{
+  g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), 0);
+
+  if (! list->table)
+    return 0;
+
+  return g_hash_table_size (list->table);
+}
+
+gint
+gimp_parasite_list_persistent_length (GimpParasiteList *list)
+{
+  gint len = 0;
+
+  g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), 0);
+
+  if (! list->table)
+    return 0;
+
+  gimp_parasite_list_foreach (list,
+                              (GHFunc) parasite_count_if_persistent, &len);
+
+  return len;
+}
+
+void
+gimp_parasite_list_foreach (GimpParasiteList *list,
+                            GHFunc            function,
+                            gpointer          user_data)
+{
+  g_return_if_fail (GIMP_IS_PARASITE_LIST (list));
+
+  if (! list->table)
+    return;
+
+  g_hash_table_foreach (list->table, function, user_data);
+}
+
+const GimpParasite *
+gimp_parasite_list_find (GimpParasiteList *list,
+                         const gchar      *name)
+{
+  g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), NULL);
+
+  if (list->table)
+    return (GimpParasite *) g_hash_table_lookup (list->table, name);
+
+  return NULL;
+}
+
+
+static void
+parasite_serialize (const gchar      *key,
+                    GimpParasite     *parasite,
+                    GimpConfigWriter *writer)
+{
+  if (! gimp_parasite_is_persistent (parasite))
+    return;
+
+  gimp_config_writer_open (writer, parasite_symbol);
+
+  gimp_config_writer_printf (writer, "\"%s\" %lu %lu",
+                             gimp_parasite_name (parasite),
+                             gimp_parasite_flags (parasite),
+                             gimp_parasite_data_size (parasite));
+
+  gimp_config_writer_data (writer,
+                           gimp_parasite_data_size (parasite),
+                           gimp_parasite_data (parasite));
+
+  gimp_config_writer_close (writer);
+  gimp_config_writer_linefeed (writer);
+}
+
+static void
+parasite_copy (const gchar      *key,
+               GimpParasite     *parasite,
+               GimpParasiteList *list)
+{
+  gimp_parasite_list_add (list, parasite);
+}
+
+static gboolean
+parasite_free (const gchar  *key,
+               GimpParasite *parasite,
+               gpointer     unused)
+{
+  gimp_parasite_free (parasite);
+
+  return TRUE;
+}
+
+static void
+parasite_count_if_persistent (const gchar  *key,
+                              GimpParasite *parasite,
+                              gint         *count)
+{
+  if (gimp_parasite_is_persistent (parasite))
+    *count = *count + 1;
+}
diff --git a/app/core/gimpparasitelist.h b/app/core/gimpparasitelist.h
new file mode 100644
index 0000000..1762753
--- /dev/null
+++ b/app/core/gimpparasitelist.h
@@ -0,0 +1,69 @@
+/* parasitelist.h: Copyright 1998 Jay Cox <jaycox@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARASITE_LIST_H__
+#define __GIMP_PARASITE_LIST_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_PARASITE_LIST            (gimp_parasite_list_get_type ())
+#define GIMP_PARASITE_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PARASITE_LIST, GimpParasiteList))
+#define GIMP_PARASITE_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PARASITE_LIST, GimpParasiteListClass))
+#define GIMP_IS_PARASITE_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PARASITE_LIST))
+#define GIMP_IS_PARASITE_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PARASITE_LIST))
+#define GIMP_PARASITE_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PARASITE_LIST, GimpParasiteListClass))
+
+
+typedef struct _GimpParasiteListClass GimpParasiteListClass;
+
+struct _GimpParasiteList
+{
+  GimpObject  object;
+
+  GHashTable *table;
+};
+
+struct _GimpParasiteListClass
+{
+  GimpObjectClass parent_class;
+
+  void (* add)    (GimpParasiteList *list,
+                   GimpParasite     *parasite);
+  void (* remove) (GimpParasiteList *list,
+                   GimpParasite     *parasite);
+};
+
+
+GType                gimp_parasite_list_get_type (void) G_GNUC_CONST;
+
+GimpParasiteList   * gimp_parasite_list_new      (void);
+GimpParasiteList   * gimp_parasite_list_copy     (GimpParasiteList       *list);
+void                 gimp_parasite_list_add      (GimpParasiteList       *list,
+                                                  const GimpParasite     *parasite);
+void                 gimp_parasite_list_remove   (GimpParasiteList       *list,
+                                                  const gchar            *name);
+gint                 gimp_parasite_list_length   (GimpParasiteList       *list);
+gint                 gimp_parasite_list_persistent_length (GimpParasiteList *list);
+void                 gimp_parasite_list_foreach  (GimpParasiteList       *list,
+                                                  GHFunc                  function,
+                                                  gpointer                user_data);
+const GimpParasite * gimp_parasite_list_find     (GimpParasiteList       *list,
+                                                  const gchar            *name);
+
+
+#endif  /*  __GIMP_PARASITE_LIST_H__  */
diff --git a/app/core/gimppattern-header.h b/app/core/gimppattern-header.h
new file mode 100644
index 0000000..e11b3c9
--- /dev/null
+++ b/app/core/gimppattern-header.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_HEADER_H__
+#define __GIMP_PATTERN_HEADER_H__
+
+
+#define GIMP_PATTERN_MAGIC    (('G' << 24) + ('P' << 16) + \
+                               ('A' << 8)  + ('T' << 0))
+#define GIMP_PATTERN_MAX_SIZE 10000 /* Max size in either dimension in px */
+#define GIMP_PATTERN_MAX_NAME 256   /* Max length of the pattern's name   */
+
+
+/*  All field entries are MSB  */
+
+typedef struct _GimpPatternHeader GimpPatternHeader;
+
+struct _GimpPatternHeader
+{
+  guint32   header_size;  /*  = sizeof (GimpPatternHeader) + pattern name  */
+  guint32   version;      /*  pattern file version #  */
+  guint32   width;        /*  width of pattern  */
+  guint32   height;       /*  height of pattern  */
+  guint32   bytes;        /*  depth of pattern in bytes  */
+  guint32   magic_number; /*  GIMP pattern magic number  */
+};
+
+/*  In a pattern file, next comes the pattern name, null-terminated.
+ *  After that comes the pattern data -- width * height * bytes bytes
+ *  of it...
+ */
+
+
+#endif  /* __GIMP_PATTERN_HEADER_H__ */
diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c
new file mode 100644
index 0000000..27f057f
--- /dev/null
+++ b/app/core/gimppattern-load.c
@@ -0,0 +1,220 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gimppattern.h"
+#include "gimppattern-header.h"
+#include "gimppattern-load.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+GList *
+gimp_pattern_load (GimpContext   *context,
+                   GFile         *file,
+                   GInputStream  *input,
+                   GError       **error)
+{
+  GimpPattern       *pattern = NULL;
+  const Babl        *format  = NULL;
+  GimpPatternHeader  header;
+  gsize              size;
+  gsize              bytes_read;
+  gsize              bn_size;
+  gchar             *name = NULL;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /*  read the size  */
+  if (! g_input_stream_read_all (input, &header, sizeof (header),
+                                 &bytes_read, NULL, error) ||
+      bytes_read != sizeof (header))
+    {
+      g_prefix_error (error, _("File appears truncated: "));
+      goto error;
+    }
+
+  /*  rearrange the bytes in each unsigned int  */
+  header.header_size  = g_ntohl (header.header_size);
+  header.version      = g_ntohl (header.version);
+  header.width        = g_ntohl (header.width);
+  header.height       = g_ntohl (header.height);
+  header.bytes        = g_ntohl (header.bytes);
+  header.magic_number = g_ntohl (header.magic_number);
+
+  /*  Check for correct file format */
+  if (header.magic_number != GIMP_PATTERN_MAGIC ||
+      header.version      != 1                  ||
+      header.header_size  <= sizeof (header))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Unknown pattern format version %d."),
+                   header.version);
+      goto error;
+    }
+
+  /*  Check for supported bit depths  */
+  if (header.bytes < 1 || header.bytes > 4)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Unsupported pattern depth %d.\n"
+                     "GIMP Patterns must be GRAY or RGB."),
+                   header.bytes);
+      goto error;
+    }
+
+  /*  Validate dimensions  */
+  if ((header.width  == 0) || (header.width  > GIMP_PATTERN_MAX_SIZE) ||
+      (header.height == 0) || (header.height > GIMP_PATTERN_MAX_SIZE) ||
+      (G_MAXSIZE / header.width / header.height / header.bytes < 1))
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Invalid header data in '%s': width=%lu (maximum %lu), "
+                     "height=%lu (maximum %lu), bytes=%lu"),
+                   gimp_file_get_utf8_name (file),
+                   (gulong) header.width,  (gulong) GIMP_PATTERN_MAX_SIZE,
+                   (gulong) header.height, (gulong) GIMP_PATTERN_MAX_SIZE,
+                   (gulong) header.bytes);
+      goto error;
+    }
+
+  /*  Read in the pattern name  */
+  if ((bn_size = (header.header_size - sizeof (header))))
+    {
+      gchar *utf8;
+
+      if (bn_size > GIMP_PATTERN_MAX_NAME)
+        {
+          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                       _("Invalid header data in '%s': "
+                         "Pattern name is too long: %lu"),
+                       gimp_file_get_utf8_name (file),
+                       (gulong) bn_size);
+          goto error;
+        }
+
+      name = g_new0 (gchar, bn_size + 1);
+
+      if (! g_input_stream_read_all (input, name, bn_size,
+                                     &bytes_read, NULL, error) ||
+          bytes_read != bn_size)
+        {
+          g_prefix_error (error, _("File appears truncated."));
+          g_free (name);
+          goto error;
+        }
+
+      utf8 = gimp_any_to_utf8 (name, bn_size - 1,
+                               _("Invalid UTF-8 string in pattern file '%s'."),
+                               gimp_file_get_utf8_name (file));
+      g_free (name);
+      name = utf8;
+    }
+
+  if (! name)
+    name = g_strdup (_("Unnamed"));
+
+  pattern = g_object_new (GIMP_TYPE_PATTERN,
+                          "name",      name,
+                          "mime-type", "image/x-gimp-pat",
+                          NULL);
+
+  g_free (name);
+
+  switch (header.bytes)
+    {
+    case 1: format = babl_format ("Y' u8");      break;
+    case 2: format = babl_format ("Y'A u8");     break;
+    case 3: format = babl_format ("R'G'B' u8");  break;
+    case 4: format = babl_format ("R'G'B'A u8"); break;
+    }
+
+  pattern->mask = gimp_temp_buf_new (header.width, header.height, format);
+  size = (gsize) header.width * header.height * header.bytes;
+
+  if (! g_input_stream_read_all (input,
+                                 gimp_temp_buf_get_data (pattern->mask), size,
+                                 &bytes_read, NULL, error) ||
+      bytes_read != size)
+    {
+      g_prefix_error (error, _("File appears truncated."));
+      goto error;
+    }
+
+  return g_list_prepend (NULL, pattern);
+
+ error:
+
+  if (pattern)
+    g_object_unref (pattern);
+
+  g_prefix_error (error, _("Fatal parse error in pattern file: "));
+
+  return NULL;
+}
+
+GList *
+gimp_pattern_load_pixbuf (GimpContext   *context,
+                          GFile         *file,
+                          GInputStream  *input,
+                          GError       **error)
+{
+  GimpPattern *pattern;
+  GdkPixbuf   *pixbuf;
+  gchar       *name;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  pixbuf = gdk_pixbuf_new_from_stream (input, NULL, error);
+  if (! pixbuf)
+    return NULL;
+
+  name = g_strdup (gdk_pixbuf_get_option (pixbuf, "tEXt::Title"));
+
+  if (! name)
+    name = g_strdup (gdk_pixbuf_get_option (pixbuf, "tEXt::Comment"));
+
+  if (! name)
+    name = g_path_get_basename (gimp_file_get_utf8_name (file));
+
+  pattern = g_object_new (GIMP_TYPE_PATTERN,
+                          "name",      name,
+                          "mime-type", NULL, /* FIXME!! */
+                          NULL);
+  g_free (name);
+
+  pattern->mask = gimp_temp_buf_new_from_pixbuf (pixbuf, NULL);
+
+  g_object_unref (pixbuf);
+
+  return g_list_prepend (NULL, pattern);
+}
diff --git a/app/core/gimppattern-load.h b/app/core/gimppattern-load.h
new file mode 100644
index 0000000..8e7fc8a
--- /dev/null
+++ b/app/core/gimppattern-load.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_LOAD_H__
+#define __GIMP_PATTERN_LOAD_H__
+
+
+#define GIMP_PATTERN_FILE_EXTENSION ".pat"
+
+
+GList * gimp_pattern_load        (GimpContext   *context,
+                                  GFile         *file,
+                                  GInputStream  *input,
+                                  GError       **error);
+GList * gimp_pattern_load_pixbuf (GimpContext   *context,
+                                  GFile         *file,
+                                  GInputStream  *input,
+                                  GError       **error);
+
+
+#endif /* __GIMP_PATTERN_LOAD_H__ */
diff --git a/app/core/gimppattern-save.c b/app/core/gimppattern-save.c
new file mode 100644
index 0000000..b9ded3e
--- /dev/null
+++ b/app/core/gimppattern-save.c
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "gimppattern.h"
+#include "gimppattern-header.h"
+#include "gimppattern-save.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+gimp_pattern_save (GimpData       *data,
+                   GOutputStream  *output,
+                   GError        **error)
+{
+  GimpPattern       *pattern = GIMP_PATTERN (data);
+  GimpTempBuf       *mask    = gimp_pattern_get_mask (pattern);
+  const Babl        *format  = gimp_temp_buf_get_format (mask);
+  GimpPatternHeader  header;
+  const gchar       *name;
+  gint               width;
+  gint               height;
+
+  name   = gimp_object_get_name (pattern);
+  width  = gimp_temp_buf_get_width  (mask);
+  height = gimp_temp_buf_get_height (mask);
+
+  if (width > GIMP_PATTERN_MAX_SIZE || height > GIMP_PATTERN_MAX_SIZE)
+    {
+      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
+                   _("Unsupported pattern dimensions %d x %d.\n"
+                     "GIMP Patterns have a maximum size of %d x %d."),
+                   width, height,
+                   GIMP_PATTERN_MAX_SIZE, GIMP_PATTERN_MAX_SIZE);
+      return FALSE;
+    }
+  header.header_size  = g_htonl (sizeof (GimpPatternHeader) +
+                                 strlen (name) + 1);
+  header.version      = g_htonl (1);
+  header.width        = g_htonl (width);
+  header.height       = g_htonl (height);
+  header.bytes        = g_htonl (babl_format_get_bytes_per_pixel (format));
+  header.magic_number = g_htonl (GIMP_PATTERN_MAGIC);
+
+  if (! g_output_stream_write_all (output, &header, sizeof (header),
+                                   NULL, NULL, error))
+    {
+      return FALSE;
+    }
+
+  if (! g_output_stream_write_all (output, name, strlen (name) + 1,
+                                   NULL, NULL, error))
+    {
+      return FALSE;
+    }
+
+  if (! g_output_stream_write_all (output,
+                                   gimp_temp_buf_get_data (mask),
+                                   gimp_temp_buf_get_data_size (mask),
+                                   NULL, NULL, error))
+    {
+      return FALSE;
+    }
+
+  return TRUE;
+}
diff --git a/app/core/gimppattern-save.h b/app/core/gimppattern-save.h
new file mode 100644
index 0000000..d3c657c
--- /dev/null
+++ b/app/core/gimppattern-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_SAVE_H__
+#define __GIMP_PATTERN_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_pattern_save (GimpData       *data,
+                              GOutputStream  *output,
+                              GError        **error);
+
+
+#endif  /*  __GIMP_PATTERN_SAVE_H__  */
diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c
new file mode 100644
index 0000000..3177211
--- /dev/null
+++ b/app/core/gimppattern.c
@@ -0,0 +1,287 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimppattern.h"
+#include "gimppattern-load.h"
+#include "gimppattern-save.h"
+#include "gimptagged.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+static void          gimp_pattern_tagged_iface_init (GimpTaggedInterface  *iface);
+static void          gimp_pattern_finalize          (GObject              *object);
+
+static gint64        gimp_pattern_get_memsize       (GimpObject           *object,
+                                                     gint64               *gui_size);
+
+static gboolean      gimp_pattern_get_size          (GimpViewable         *viewable,
+                                                     gint                 *width,
+                                                     gint                 *height);
+static GimpTempBuf * gimp_pattern_get_new_preview   (GimpViewable         *viewable,
+                                                     GimpContext          *context,
+                                                     gint                  width,
+                                                     gint                  height);
+static gchar       * gimp_pattern_get_description   (GimpViewable         *viewable,
+                                                     gchar               **tooltip);
+
+static const gchar * gimp_pattern_get_extension     (GimpData             *data);
+static void          gimp_pattern_copy              (GimpData             *data,
+                                                     GimpData             *src_data);
+
+static gchar       * gimp_pattern_get_checksum      (GimpTagged           *tagged);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpPattern, gimp_pattern, GIMP_TYPE_DATA,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_TAGGED,
+                                                gimp_pattern_tagged_iface_init))
+
+#define parent_class gimp_pattern_parent_class
+
+
+static void
+gimp_pattern_class_init (GimpPatternClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpDataClass     *data_class        = GIMP_DATA_CLASS (klass);
+
+  object_class->finalize            = gimp_pattern_finalize;
+
+  gimp_object_class->get_memsize    = gimp_pattern_get_memsize;
+
+  viewable_class->default_icon_name = "gimp-tool-bucket-fill";
+  viewable_class->get_size          = gimp_pattern_get_size;
+  viewable_class->get_new_preview   = gimp_pattern_get_new_preview;
+  viewable_class->get_description   = gimp_pattern_get_description;
+
+  data_class->save                  = gimp_pattern_save;
+  data_class->get_extension         = gimp_pattern_get_extension;
+  data_class->copy                  = gimp_pattern_copy;
+}
+
+static void
+gimp_pattern_tagged_iface_init (GimpTaggedInterface *iface)
+{
+  iface->get_checksum = gimp_pattern_get_checksum;
+}
+
+static void
+gimp_pattern_init (GimpPattern *pattern)
+{
+  pattern->mask = NULL;
+}
+
+static void
+gimp_pattern_finalize (GObject *object)
+{
+  GimpPattern *pattern = GIMP_PATTERN (object);
+
+  g_clear_pointer (&pattern->mask, gimp_temp_buf_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_pattern_get_memsize (GimpObject *object,
+                          gint64     *gui_size)
+{
+  GimpPattern *pattern = GIMP_PATTERN (object);
+  gint64       memsize = 0;
+
+  memsize += gimp_temp_buf_get_memsize (pattern->mask);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_pattern_get_size (GimpViewable *viewable,
+                       gint         *width,
+                       gint         *height)
+{
+  GimpPattern *pattern = GIMP_PATTERN (viewable);
+
+  *width  = gimp_temp_buf_get_width  (pattern->mask);
+  *height = gimp_temp_buf_get_height (pattern->mask);
+
+  return TRUE;
+}
+
+static GimpTempBuf *
+gimp_pattern_get_new_preview (GimpViewable *viewable,
+                              GimpContext  *context,
+                              gint          width,
+                              gint          height)
+{
+  GimpPattern *pattern = GIMP_PATTERN (viewable);
+  GimpTempBuf *temp_buf;
+  GeglBuffer  *src_buffer;
+  GeglBuffer  *dest_buffer;
+  gint         copy_width;
+  gint         copy_height;
+
+  copy_width  = MIN (width,  gimp_temp_buf_get_width  (pattern->mask));
+  copy_height = MIN (height, gimp_temp_buf_get_height (pattern->mask));
+
+  temp_buf = gimp_temp_buf_new (copy_width, copy_height,
+                                gimp_temp_buf_get_format (pattern->mask));
+
+  src_buffer  = gimp_temp_buf_create_buffer (pattern->mask);
+  dest_buffer = gimp_temp_buf_create_buffer (temp_buf);
+
+  gimp_gegl_buffer_copy (src_buffer,
+                         GEGL_RECTANGLE (0, 0, copy_width, copy_height),
+                         GEGL_ABYSS_NONE,
+                         dest_buffer, GEGL_RECTANGLE (0, 0, 0, 0));
+
+  g_object_unref (src_buffer);
+  g_object_unref (dest_buffer);
+
+  return temp_buf;
+}
+
+static gchar *
+gimp_pattern_get_description (GimpViewable  *viewable,
+                              gchar        **tooltip)
+{
+  GimpPattern *pattern = GIMP_PATTERN (viewable);
+
+  return g_strdup_printf ("%s (%d × %d)",
+                          gimp_object_get_name (pattern),
+                          gimp_temp_buf_get_width  (pattern->mask),
+                          gimp_temp_buf_get_height (pattern->mask));
+}
+
+static const gchar *
+gimp_pattern_get_extension (GimpData *data)
+{
+  return GIMP_PATTERN_FILE_EXTENSION;
+}
+
+static void
+gimp_pattern_copy (GimpData *data,
+                   GimpData *src_data)
+{
+  GimpPattern *pattern     = GIMP_PATTERN (data);
+  GimpPattern *src_pattern = GIMP_PATTERN (src_data);
+
+  g_clear_pointer (&pattern->mask, gimp_temp_buf_unref);
+  pattern->mask = gimp_temp_buf_copy (src_pattern->mask);
+
+  gimp_data_dirty (data);
+}
+
+static gchar *
+gimp_pattern_get_checksum (GimpTagged *tagged)
+{
+  GimpPattern *pattern         = GIMP_PATTERN (tagged);
+  gchar       *checksum_string = NULL;
+
+  if (pattern->mask)
+    {
+      GChecksum *checksum = g_checksum_new (G_CHECKSUM_MD5);
+
+      g_checksum_update (checksum, gimp_temp_buf_get_data (pattern->mask),
+                         gimp_temp_buf_get_data_size (pattern->mask));
+
+      checksum_string = g_strdup (g_checksum_get_string (checksum));
+
+      g_checksum_free (checksum);
+    }
+
+  return checksum_string;
+}
+
+GimpData *
+gimp_pattern_new (GimpContext *context,
+                  const gchar *name)
+{
+  GimpPattern *pattern;
+  guchar      *data;
+  gint         row, col;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (name[0] != '\n', NULL);
+
+  pattern = g_object_new (GIMP_TYPE_PATTERN,
+                          "name", name,
+                          NULL);
+
+  pattern->mask = gimp_temp_buf_new (32, 32, babl_format ("R'G'B' u8"));
+
+  data = gimp_temp_buf_get_data (pattern->mask);
+
+  for (row = 0; row < gimp_temp_buf_get_height (pattern->mask); row++)
+    for (col = 0; col < gimp_temp_buf_get_width (pattern->mask); col++)
+      {
+        memset (data, (col % 2) && (row % 2) ? 255 : 0, 3);
+        data += 3;
+      }
+
+  return GIMP_DATA (pattern);
+}
+
+GimpData *
+gimp_pattern_get_standard (GimpContext *context)
+{
+  static GimpData *standard_pattern = NULL;
+
+  if (! standard_pattern)
+    {
+      standard_pattern = gimp_pattern_new (context, "Standard");
+
+      gimp_data_clean (standard_pattern);
+      gimp_data_make_internal (standard_pattern, "gimp-pattern-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_pattern),
+                                 (gpointer *) &standard_pattern);
+    }
+
+  return standard_pattern;
+}
+
+GimpTempBuf *
+gimp_pattern_get_mask (GimpPattern *pattern)
+{
+  g_return_val_if_fail (GIMP_IS_PATTERN (pattern), NULL);
+
+  return pattern->mask;
+}
+
+GeglBuffer *
+gimp_pattern_create_buffer (GimpPattern *pattern)
+{
+  g_return_val_if_fail (GIMP_IS_PATTERN (pattern), NULL);
+
+  return gimp_temp_buf_create_buffer (pattern->mask);
+}
diff --git a/app/core/gimppattern.h b/app/core/gimppattern.h
new file mode 100644
index 0000000..14cc099
--- /dev/null
+++ b/app/core/gimppattern.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_H__
+#define __GIMP_PATTERN_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_PATTERN            (gimp_pattern_get_type ())
+#define GIMP_PATTERN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATTERN, GimpPattern))
+#define GIMP_PATTERN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATTERN, GimpPatternClass))
+#define GIMP_IS_PATTERN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PATTERN))
+#define GIMP_IS_PATTERN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PATTERN))
+#define GIMP_PATTERN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PATTERN, GimpPatternClass))
+
+
+typedef struct _GimpPatternClass GimpPatternClass;
+
+struct _GimpPattern
+{
+  GimpData     parent_instance;
+
+  GimpTempBuf *mask;
+};
+
+struct _GimpPatternClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType         gimp_pattern_get_type      (void) G_GNUC_CONST;
+
+GimpData    * gimp_pattern_new           (GimpContext *context,
+                                          const gchar *name);
+GimpData    * gimp_pattern_get_standard  (GimpContext *context);
+
+GimpTempBuf * gimp_pattern_get_mask      (GimpPattern *pattern);
+GeglBuffer  * gimp_pattern_create_buffer (GimpPattern *pattern);
+
+
+#endif /* __GIMP_PATTERN_H__ */
diff --git a/app/core/gimppatternclipboard.c b/app/core/gimppatternclipboard.c
new file mode 100644
index 0000000..9dd6a1f
--- /dev/null
+++ b/app/core/gimppatternclipboard.c
@@ -0,0 +1,213 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppatternclipboard.c
+ * Copyright (C) 2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpbuffer.h"
+#include "gimppatternclipboard.h"
+#include "gimpimage.h"
+#include "gimppickable.h"
+#include "gimptempbuf.h"
+
+#include "gimp-intl.h"
+
+
+#define PATTERN_MAX_SIZE 1024
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_pattern_clipboard_constructed  (GObject      *object);
+static void       gimp_pattern_clipboard_set_property (GObject      *object,
+                                                       guint         property_id,
+                                                       const GValue *value,
+                                                       GParamSpec   *pspec);
+static void       gimp_pattern_clipboard_get_property (GObject      *object,
+                                                       guint         property_id,
+                                                       GValue       *value,
+                                                       GParamSpec   *pspec);
+static GimpData * gimp_pattern_clipboard_duplicate    (GimpData     *data);
+
+static void       gimp_pattern_clipboard_changed      (Gimp         *gimp,
+                                                       GimpPattern  *pattern);
+
+
+G_DEFINE_TYPE (GimpPatternClipboard, gimp_pattern_clipboard, GIMP_TYPE_PATTERN)
+
+#define parent_class gimp_pattern_clipboard_parent_class
+
+
+static void
+gimp_pattern_clipboard_class_init (GimpPatternClipboardClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpDataClass *data_class   = GIMP_DATA_CLASS (klass);
+
+  object_class->constructed  = gimp_pattern_clipboard_constructed;
+  object_class->set_property = gimp_pattern_clipboard_set_property;
+  object_class->get_property = gimp_pattern_clipboard_get_property;
+
+  data_class->duplicate      = gimp_pattern_clipboard_duplicate;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_pattern_clipboard_init (GimpPatternClipboard *pattern)
+{
+}
+
+static void
+gimp_pattern_clipboard_constructed (GObject *object)
+{
+  GimpPatternClipboard *pattern = GIMP_PATTERN_CLIPBOARD (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (pattern->gimp));
+
+  g_signal_connect_object (pattern->gimp, "clipboard-changed",
+                           G_CALLBACK (gimp_pattern_clipboard_changed),
+                           pattern, 0);
+
+  gimp_pattern_clipboard_changed (pattern->gimp, GIMP_PATTERN (pattern));
+}
+
+static void
+gimp_pattern_clipboard_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpPatternClipboard *pattern = GIMP_PATTERN_CLIPBOARD (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      pattern->gimp = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pattern_clipboard_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpPatternClipboard *pattern = GIMP_PATTERN_CLIPBOARD (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, pattern->gimp);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpData *
+gimp_pattern_clipboard_duplicate (GimpData *data)
+{
+  GimpData *new = g_object_new (GIMP_TYPE_PATTERN, NULL);
+
+  gimp_data_copy (new, data);
+
+  return new;
+}
+
+GimpData *
+gimp_pattern_clipboard_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_PATTERN_CLIPBOARD,
+                       "name", _("Clipboard Image"),
+                       "gimp", gimp,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_pattern_clipboard_changed (Gimp        *gimp,
+                                GimpPattern *pattern)
+{
+  GimpObject *paste;
+  GeglBuffer *buffer = NULL;
+
+  g_clear_pointer (&pattern->mask, gimp_temp_buf_unref);
+
+  paste = gimp_get_clipboard_object (gimp);
+
+  if (GIMP_IS_IMAGE (paste))
+    {
+      gimp_pickable_flush (GIMP_PICKABLE (paste));
+      buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
+    }
+  else if (GIMP_IS_BUFFER (paste))
+    {
+      buffer = gimp_buffer_get_buffer (GIMP_BUFFER (paste));
+    }
+
+  if (buffer)
+    {
+      gint width  = MIN (gegl_buffer_get_width  (buffer), PATTERN_MAX_SIZE);
+      gint height = MIN (gegl_buffer_get_height (buffer), PATTERN_MAX_SIZE);
+
+      pattern->mask = gimp_temp_buf_new (width, height,
+                                         gegl_buffer_get_format (buffer));
+
+      gegl_buffer_get (buffer,
+                       GEGL_RECTANGLE (0, 0, width, height), 1.0,
+                       NULL,
+                       gimp_temp_buf_get_data (pattern->mask),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+    }
+  else
+    {
+      pattern->mask = gimp_temp_buf_new (16, 16, babl_format ("R'G'B' u8"));
+      memset (gimp_temp_buf_get_data (pattern->mask), 255, 16 * 16 * 3);
+    }
+
+  gimp_data_dirty (GIMP_DATA (pattern));
+}
diff --git a/app/core/gimppatternclipboard.h b/app/core/gimppatternclipboard.h
new file mode 100644
index 0000000..2707291
--- /dev/null
+++ b/app/core/gimppatternclipboard.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppatternclipboard.h
+ * Copyright (C) 2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_CLIPBOARD_H__
+#define __GIMP_PATTERN_CLIPBOARD_H__
+
+
+#include "gimppattern.h"
+
+
+#define GIMP_TYPE_PATTERN_CLIPBOARD            (gimp_pattern_clipboard_get_type ())
+#define GIMP_PATTERN_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATTERN_CLIPBOARD, GimpPatternClipboard))
+#define GIMP_PATTERN_CLIPBOARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATTERN_CLIPBOARD, GimpPatternClipboardClass))
+#define GIMP_IS_PATTERN_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PATTERN_CLIPBOARD))
+#define GIMP_IS_PATTERN_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PATTERN_CLIPBOARD))
+#define GIMP_PATTERN_CLIPBOARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PATTERN_CLIPBOARD, GimpPatternClipboardClass))
+
+
+typedef struct _GimpPatternClipboardClass GimpPatternClipboardClass;
+
+struct _GimpPatternClipboard
+{
+  GimpPattern  parent_instance;
+
+  Gimp        *gimp;
+};
+
+struct _GimpPatternClipboardClass
+{
+  GimpPatternClass  parent_class;
+};
+
+
+GType      gimp_pattern_clipboard_get_type (void) G_GNUC_CONST;
+
+GimpData * gimp_pattern_clipboard_new      (Gimp *gimp);
+
+
+#endif  /*  __GIMP_PATTERN_CLIPBOARD_H__  */
diff --git a/app/core/gimppdbprogress.c b/app/core/gimppdbprogress.c
new file mode 100644
index 0000000..85147e8
--- /dev/null
+++ b/app/core/gimppdbprogress.c
@@ -0,0 +1,408 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppdbprogress.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimp.h"
+#include "gimpparamspecs.h"
+#include "gimppdbprogress.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PDB,
+  PROP_CONTEXT,
+  PROP_CALLBACK_NAME
+};
+
+
+static void      gimp_pdb_progress_class_init     (GimpPdbProgressClass *klass);
+static void      gimp_pdb_progress_init           (GimpPdbProgress      *progress,
+                                                   GimpPdbProgressClass *klass);
+static void gimp_pdb_progress_progress_iface_init (GimpProgressInterface *iface);
+
+static void      gimp_pdb_progress_constructed    (GObject            *object);
+static void      gimp_pdb_progress_dispose        (GObject            *object);
+static void      gimp_pdb_progress_finalize       (GObject            *object);
+static void      gimp_pdb_progress_set_property   (GObject            *object,
+                                                   guint               property_id,
+                                                   const GValue       *value,
+                                                   GParamSpec         *pspec);
+
+static GimpProgress * gimp_pdb_progress_progress_start   (GimpProgress *progress,
+                                                          gboolean      cancellable,
+                                                          const gchar  *message);
+static void     gimp_pdb_progress_progress_end           (GimpProgress *progress);
+static gboolean gimp_pdb_progress_progress_is_active     (GimpProgress *progress);
+static void     gimp_pdb_progress_progress_set_text      (GimpProgress *progress,
+                                                          const gchar  *message);
+static void     gimp_pdb_progress_progress_set_value     (GimpProgress *progress,
+                                                          gdouble       percentage);
+static gdouble  gimp_pdb_progress_progress_get_value     (GimpProgress *progress);
+static void     gimp_pdb_progress_progress_pulse         (GimpProgress *progress);
+static guint32  gimp_pdb_progress_progress_get_window_id (GimpProgress *progress);
+
+
+static GObjectClass *parent_class = NULL;
+
+
+GType
+gimp_pdb_progress_get_type (void)
+{
+  static GType type = 0;
+
+  if (! type)
+    {
+      const GTypeInfo info =
+      {
+        sizeof (GimpPdbProgressClass),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gimp_pdb_progress_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data     */
+        sizeof (GimpPdbProgress),
+        0,              /* n_preallocs    */
+        (GInstanceInitFunc) gimp_pdb_progress_init,
+      };
+
+      const GInterfaceInfo progress_iface_info =
+      {
+        (GInterfaceInitFunc) gimp_pdb_progress_progress_iface_init,
+        NULL,           /* iface_finalize */
+        NULL            /* iface_data     */
+      };
+
+      type = g_type_register_static (G_TYPE_OBJECT,
+                                     "GimpPdbProgress",
+                                     &info, 0);
+
+      g_type_add_interface_static (type, GIMP_TYPE_PROGRESS,
+                                   &progress_iface_info);
+    }
+
+  return type;
+}
+
+static void
+gimp_pdb_progress_class_init (GimpPdbProgressClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->constructed  = gimp_pdb_progress_constructed;
+  object_class->dispose      = gimp_pdb_progress_dispose;
+  object_class->finalize     = gimp_pdb_progress_finalize;
+  object_class->set_property = gimp_pdb_progress_set_property;
+
+  g_object_class_install_property (object_class, PROP_PDB,
+                                   g_param_spec_object ("pdb", NULL, NULL,
+                                                        GIMP_TYPE_PDB,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CALLBACK_NAME,
+                                   g_param_spec_string ("callback-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_pdb_progress_init (GimpPdbProgress      *progress,
+                        GimpPdbProgressClass *klass)
+{
+  klass->progresses = g_list_prepend (klass->progresses, progress);
+}
+
+static void
+gimp_pdb_progress_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start         = gimp_pdb_progress_progress_start;
+  iface->end           = gimp_pdb_progress_progress_end;
+  iface->is_active     = gimp_pdb_progress_progress_is_active;
+  iface->set_text      = gimp_pdb_progress_progress_set_text;
+  iface->set_value     = gimp_pdb_progress_progress_set_value;
+  iface->get_value     = gimp_pdb_progress_progress_get_value;
+  iface->pulse         = gimp_pdb_progress_progress_pulse;
+  iface->get_window_id = gimp_pdb_progress_progress_get_window_id;
+}
+
+static void
+gimp_pdb_progress_constructed (GObject *object)
+{
+  GimpPdbProgress *progress = GIMP_PDB_PROGRESS (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_PDB (progress->pdb));
+  gimp_assert (GIMP_IS_CONTEXT (progress->context));
+}
+
+static void
+gimp_pdb_progress_dispose (GObject *object)
+{
+  GimpPdbProgressClass *klass = GIMP_PDB_PROGRESS_GET_CLASS (object);
+
+  klass->progresses = g_list_remove (klass->progresses, object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_pdb_progress_finalize (GObject *object)
+{
+  GimpPdbProgress *progress = GIMP_PDB_PROGRESS (object);
+
+  g_clear_object (&progress->pdb);
+  g_clear_object (&progress->context);
+  g_clear_pointer (&progress->callback_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_pdb_progress_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpPdbProgress *progress = GIMP_PDB_PROGRESS (object);
+
+  switch (property_id)
+    {
+    case PROP_PDB:
+      if (progress->pdb)
+        g_object_unref (progress->pdb);
+      progress->pdb = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTEXT:
+      if (progress->context)
+        g_object_unref (progress->context);
+      progress->context = g_value_dup_object (value);
+      break;
+
+    case PROP_CALLBACK_NAME:
+      if (progress->callback_name)
+        g_free (progress->callback_name);
+      progress->callback_name = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gdouble
+gimp_pdb_progress_run_callback (GimpPdbProgress     *progress,
+                                GimpProgressCommand  command,
+                                const gchar         *text,
+                                gdouble              value)
+{
+  gdouble retval = 0;
+
+  if (progress->callback_name && ! progress->callback_busy)
+    {
+      GimpValueArray *return_vals;
+
+      progress->callback_busy = TRUE;
+
+      return_vals =
+        gimp_pdb_execute_procedure_by_name (progress->pdb,
+                                            progress->context,
+                                            NULL, NULL,
+                                            progress->callback_name,
+                                            GIMP_TYPE_INT32, command,
+                                            G_TYPE_STRING,   text,
+                                            G_TYPE_DOUBLE,   value,
+                                            G_TYPE_NONE);
+
+      if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) !=
+          GIMP_PDB_SUCCESS)
+        {
+          gimp_message (progress->context->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        _("Unable to run %s callback. "
+                          "The corresponding plug-in may have crashed."),
+                        g_type_name (G_TYPE_FROM_INSTANCE (progress)));
+        }
+      else if (gimp_value_array_length (return_vals) >= 2 &&
+               G_VALUE_HOLDS_DOUBLE (gimp_value_array_index (return_vals, 1)))
+        {
+          retval = g_value_get_double (gimp_value_array_index (return_vals, 1));
+        }
+
+      gimp_value_array_unref (return_vals);
+
+      progress->callback_busy = FALSE;
+    }
+
+  return retval;
+}
+
+static GimpProgress *
+gimp_pdb_progress_progress_start (GimpProgress *progress,
+                                  gboolean      cancellable,
+                                  const gchar  *message)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  if (! pdb_progress->active)
+    {
+      gimp_pdb_progress_run_callback (pdb_progress,
+                                      GIMP_PROGRESS_COMMAND_START,
+                                      message, 0.0);
+
+      pdb_progress->active = TRUE;
+      pdb_progress->value  = 0.0;
+
+      return progress;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_pdb_progress_progress_end (GimpProgress *progress)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  if (pdb_progress->active)
+    {
+      gimp_pdb_progress_run_callback (pdb_progress,
+                                      GIMP_PROGRESS_COMMAND_END,
+                                      NULL, 0.0);
+
+      pdb_progress->active = FALSE;
+      pdb_progress->value  = 0.0;
+    }
+}
+
+static gboolean
+gimp_pdb_progress_progress_is_active (GimpProgress *progress)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  return pdb_progress->active;
+}
+
+static void
+gimp_pdb_progress_progress_set_text (GimpProgress *progress,
+                                     const gchar  *message)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  if (pdb_progress->active)
+    gimp_pdb_progress_run_callback (pdb_progress,
+                                    GIMP_PROGRESS_COMMAND_SET_TEXT,
+                                    message, 0.0);
+}
+
+static void
+gimp_pdb_progress_progress_set_value (GimpProgress *progress,
+                                      gdouble       percentage)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  if (pdb_progress->active)
+    {
+      gimp_pdb_progress_run_callback (pdb_progress,
+                                      GIMP_PROGRESS_COMMAND_SET_VALUE,
+                                      NULL, percentage);
+      pdb_progress->value = percentage;
+    }
+}
+
+static gdouble
+gimp_pdb_progress_progress_get_value (GimpProgress *progress)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  return pdb_progress->value;
+
+}
+
+static void
+gimp_pdb_progress_progress_pulse (GimpProgress *progress)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  if (pdb_progress->active)
+    gimp_pdb_progress_run_callback (pdb_progress,
+                                    GIMP_PROGRESS_COMMAND_PULSE,
+                                    NULL, 0.0);
+}
+
+static guint32
+gimp_pdb_progress_progress_get_window_id (GimpProgress *progress)
+{
+  GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
+
+  return (guint32)
+    gimp_pdb_progress_run_callback (pdb_progress,
+                                    GIMP_PROGRESS_COMMAND_GET_WINDOW,
+                                    NULL, 0.0);
+}
+
+GimpPdbProgress *
+gimp_pdb_progress_get_by_callback (GimpPdbProgressClass *klass,
+                                   const gchar          *callback_name)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_PDB_PROGRESS_CLASS (klass), NULL);
+  g_return_val_if_fail (callback_name != NULL, NULL);
+
+  for (list = klass->progresses; list; list = g_list_next (list))
+    {
+      GimpPdbProgress *progress = list->data;
+
+      if (! g_strcmp0 (callback_name, progress->callback_name))
+        return progress;
+    }
+
+  return NULL;
+}
diff --git a/app/core/gimppdbprogress.h b/app/core/gimppdbprogress.h
new file mode 100644
index 0000000..4057332
--- /dev/null
+++ b/app/core/gimppdbprogress.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppdbprogress.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_PROGRESS_H__
+#define __GIMP_PDB_PROGRESS_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_PDB_PROGRESS            (gimp_pdb_progress_get_type ())
+#define GIMP_PDB_PROGRESS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PDB_PROGRESS, GimpPdbProgress))
+#define GIMP_PDB_PROGRESS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PDB_PROGRESS, GimpPdbProgressClass))
+#define GIMP_IS_PDB_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PDB_PROGRESS))
+#define GIMP_IS_PDB_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PDB_PROGRESS))
+#define GIMP_PDB_PROGRESS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PDB_PROGRESS, GimpPdbProgressClass))
+
+
+typedef struct _GimpPdbProgressClass  GimpPdbProgressClass;
+
+struct _GimpPdbProgress
+{
+  GObject      object;
+
+  gboolean     active;
+  gdouble      value;
+
+  GimpPDB     *pdb;
+  GimpContext *context;
+  gchar       *callback_name;
+  gboolean     callback_busy;
+};
+
+struct _GimpPdbProgressClass
+{
+  GObjectClass  parent_class;
+
+  GList        *progresses;
+};
+
+
+GType             gimp_pdb_progress_get_type        (void) G_GNUC_CONST;
+
+GimpPdbProgress * gimp_pdb_progress_get_by_callback (GimpPdbProgressClass *klass,
+                                                     const gchar          *callback_name);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_PDB_PROGRESS_H__ */
diff --git a/app/core/gimppickable-auto-shrink.c b/app/core/gimppickable-auto-shrink.c
new file mode 100644
index 0000000..7ddbee2
--- /dev/null
+++ b/app/core/gimppickable-auto-shrink.c
@@ -0,0 +1,312 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpimage.h"
+#include "gimppickable.h"
+#include "gimppickable-auto-shrink.h"
+
+
+typedef enum
+{
+  AUTO_SHRINK_NOTHING = 0,
+  AUTO_SHRINK_ALPHA   = 1,
+  AUTO_SHRINK_COLOR   = 2
+} AutoShrinkType;
+
+
+typedef gboolean (* ColorsEqualFunc) (guchar *col1,
+                                      guchar *col2);
+
+
+/*  local function prototypes  */
+
+static AutoShrinkType   gimp_pickable_guess_bgcolor (GimpPickable *pickable,
+                                                     guchar       *color,
+                                                     gint          x1,
+                                                     gint          x2,
+                                                     gint          y1,
+                                                     gint          y2);
+static gboolean         gimp_pickable_colors_equal  (guchar       *col1,
+                                                     guchar       *col2);
+static gboolean         gimp_pickable_colors_alpha  (guchar       *col1,
+                                                     guchar       *col2);
+
+
+/*  public functions  */
+
+GimpAutoShrink
+gimp_pickable_auto_shrink (GimpPickable *pickable,
+                           gint          start_x,
+                           gint          start_y,
+                           gint          start_width,
+                           gint          start_height,
+                           gint         *shrunk_x,
+                           gint         *shrunk_y,
+                           gint         *shrunk_width,
+                           gint         *shrunk_height)
+{
+  GeglBuffer      *buffer;
+  GeglRectangle    rect;
+  ColorsEqualFunc  colors_equal_func;
+  guchar           bgcolor[MAX_CHANNELS] = { 0, 0, 0, 0 };
+  guchar          *buf = NULL;
+  gint             x1, y1, x2, y2;
+  gint             width, height;
+  const Babl      *format;
+  gint             x, y, abort;
+  GimpAutoShrink   retval = GIMP_AUTO_SHRINK_UNSHRINKABLE;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), FALSE);
+  g_return_val_if_fail (shrunk_x != NULL, FALSE);
+  g_return_val_if_fail (shrunk_y != NULL, FALSE);
+  g_return_val_if_fail (shrunk_width != NULL, FALSE);
+  g_return_val_if_fail (shrunk_height != NULL, FALSE);
+
+  gimp_set_busy (gimp_pickable_get_image (pickable)->gimp);
+
+  /* You should always keep in mind that x2 and y2 are the NOT the
+   * coordinates of the bottomright corner of the area to be
+   * cropped. They point at the pixel located one to the right and one
+   * to the bottom.
+   */
+
+  gimp_pickable_flush (pickable);
+
+  buffer = gimp_pickable_get_buffer (pickable);
+
+  x1 = MAX (start_x, 0);
+  y1 = MAX (start_y, 0);
+  x2 = MIN (start_x + start_width,  gegl_buffer_get_width  (buffer));
+  y2 = MIN (start_y + start_height, gegl_buffer_get_height (buffer));
+
+  /* By default, return the start values */
+  *shrunk_x      = x1;
+  *shrunk_y      = y1;
+  *shrunk_width  = x2 - x1;
+  *shrunk_height = y2 - y1;
+
+  format = babl_format ("R'G'B'A u8");
+
+  switch (gimp_pickable_guess_bgcolor (pickable, bgcolor,
+                                       x1, x2 - 1, y1, y2 - 1))
+    {
+    case AUTO_SHRINK_ALPHA:
+      colors_equal_func = gimp_pickable_colors_alpha;
+      break;
+    case AUTO_SHRINK_COLOR:
+      colors_equal_func = gimp_pickable_colors_equal;
+      break;
+    default:
+      goto FINISH;
+      break;
+    }
+
+  width  = x2 - x1;
+  height = y2 - y1;
+
+  /* The following could be optimized further by processing
+   * the smaller side first instead of defaulting to width    --Sven
+   */
+
+  buf = g_malloc (MAX (width, height) * 4);
+
+  /* Check how many of the top lines are uniform/transparent. */
+  rect.x      = x1;
+  rect.y      = 0;
+  rect.width  = width;
+  rect.height = 1;
+
+  abort = FALSE;
+  for (y = y1; y < y2 && !abort; y++)
+    {
+      rect.y = y;
+      gegl_buffer_get (buffer, &rect, 1.0, format, buf,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      for (x = 0; x < width && !abort; x++)
+        abort = ! colors_equal_func (bgcolor, buf + x * 4);
+    }
+  if (y == y2 && !abort)
+    {
+      retval = GIMP_AUTO_SHRINK_EMPTY;
+      goto FINISH;
+    }
+  y1 = y - 1;
+
+  /* Check how many of the bottom lines are uniform/transparent. */
+  rect.x      = x1;
+  rect.y      = 0;
+  rect.width  = width;
+  rect.height = 1;
+
+  abort = FALSE;
+  for (y = y2; y > y1 && !abort; y--)
+    {
+      rect.y = y - 1;
+      gegl_buffer_get (buffer, &rect, 1.0, format, buf,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      for (x = 0; x < width && !abort; x++)
+        abort = ! colors_equal_func  (bgcolor, buf + x * 4);
+    }
+  y2 = y + 1;
+
+  /* compute a new height for the next operations */
+  height = y2 - y1;
+
+  /* Check how many of the left lines are uniform/transparent. */
+  rect.x      = 0;
+  rect.y      = y1;
+  rect.width  = 1;
+  rect.height = height;
+
+  abort = FALSE;
+  for (x = x1; x < x2 && !abort; x++)
+    {
+      rect.x = x;
+      gegl_buffer_get (buffer, &rect, 1.0, format, buf,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      for (y = 0; y < height && !abort; y++)
+        abort = ! colors_equal_func (bgcolor, buf + y * 4);
+    }
+  x1 = x - 1;
+
+  /* Check how many of the right lines are uniform/transparent. */
+  rect.x      = 0;
+  rect.y      = y1;
+  rect.width  = 1;
+  rect.height = height;
+
+  abort = FALSE;
+  for (x = x2; x > x1 && !abort; x--)
+    {
+      rect.x = x - 1;
+      gegl_buffer_get (buffer, &rect, 1.0, format, buf,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      for (y = 0; y < height && !abort; y++)
+        abort = ! colors_equal_func (bgcolor, buf + y * 4);
+    }
+  x2 = x + 1;
+
+  if (x1      != start_x     ||
+      y1      != start_y     ||
+      x2 - x1 != start_width ||
+      y2 - y1 != start_height)
+    {
+      *shrunk_x      = x1;
+      *shrunk_y      = y1;
+      *shrunk_width  = x2 - x1;
+      *shrunk_height = y2 - y1;
+
+      retval = GIMP_AUTO_SHRINK_SHRINK;
+    }
+
+ FINISH:
+
+  g_free (buf);
+  gimp_unset_busy (gimp_pickable_get_image (pickable)->gimp);
+
+  return retval;
+}
+
+
+/*  private functions  */
+
+static AutoShrinkType
+gimp_pickable_guess_bgcolor (GimpPickable *pickable,
+                             guchar       *color,
+                             gint          x1,
+                             gint          x2,
+                             gint          y1,
+                             gint          y2)
+{
+  const Babl *format = babl_format ("R'G'B'A u8");
+  guchar      tl[4];
+  guchar      tr[4];
+  guchar      bl[4];
+  guchar      br[4];
+  gint        i;
+
+  for (i = 0; i < 4; i++)
+    color[i] = 0;
+
+  /* First check if there's transparency to crop. If not, guess the
+   * background-color to see if at least 2 corners are equal.
+   */
+
+  if (! gimp_pickable_get_pixel_at (pickable, x1, y1, format, tl) ||
+      ! gimp_pickable_get_pixel_at (pickable, x1, y2, format, tr) ||
+      ! gimp_pickable_get_pixel_at (pickable, x2, y1, format, bl) ||
+      ! gimp_pickable_get_pixel_at (pickable, x2, y2, format, br))
+    {
+      return AUTO_SHRINK_NOTHING;
+    }
+
+  if ((tl[ALPHA] == 0 && tr[ALPHA] == 0) ||
+      (tl[ALPHA] == 0 && bl[ALPHA] == 0) ||
+      (tr[ALPHA] == 0 && br[ALPHA] == 0) ||
+      (bl[ALPHA] == 0 && br[ALPHA] == 0))
+    {
+      return AUTO_SHRINK_ALPHA;
+    }
+
+  if (gimp_pickable_colors_equal (tl, tr) ||
+      gimp_pickable_colors_equal (tl, bl))
+    {
+      memcpy (color, tl, 4);
+      return AUTO_SHRINK_COLOR;
+    }
+
+  if (gimp_pickable_colors_equal (br, bl) ||
+      gimp_pickable_colors_equal (br, tr))
+    {
+      memcpy (color, br, 4);
+      return AUTO_SHRINK_COLOR;
+    }
+
+  return AUTO_SHRINK_NOTHING;
+}
+
+static gboolean
+gimp_pickable_colors_equal (guchar *col1,
+                            guchar *col2)
+{
+  gint b;
+
+  for (b = 0; b < 4; b++)
+    {
+      if (col1[b] != col2[b])
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_pickable_colors_alpha (guchar *dummy,
+                            guchar *col)
+{
+  return (col[ALPHA] == 0);
+}
diff --git a/app/core/gimppickable-auto-shrink.h b/app/core/gimppickable-auto-shrink.h
new file mode 100644
index 0000000..2f2eaa0
--- /dev/null
+++ b/app/core/gimppickable-auto-shrink.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PICKABLE_AUTO_SHRINK_H__
+#define __GIMP_PICKABLE_AUTO_SHRINK_H__
+
+
+typedef enum
+{
+  GIMP_AUTO_SHRINK_SHRINK,
+  GIMP_AUTO_SHRINK_EMPTY,
+  GIMP_AUTO_SHRINK_UNSHRINKABLE
+} GimpAutoShrink;
+
+
+GimpAutoShrink   gimp_pickable_auto_shrink (GimpPickable *pickable,
+                                            gint         x,
+                                            gint         y,
+                                            gint         width,
+                                            gint         height,
+                                            gint        *shrunk_x,
+                                            gint        *shrunk_y,
+                                            gint        *shrunk_width,
+                                            gint        *shrunk_height);
+
+
+#endif  /* __GIMP_PICKABLE_AUTO_SHRINK_H__ */
diff --git a/app/core/gimppickable-contiguous-region.cc b/app/core/gimppickable-contiguous-region.cc
new file mode 100644
index 0000000..ea30d0c
--- /dev/null
+++ b/app/core/gimppickable-contiguous-region.cc
@@ -0,0 +1,1123 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+extern "C"
+{
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimp-parallel.h"
+#include "gimp-utils.h" /* GIMP_TIMER */
+#include "gimpasync.h"
+#include "gimplineart.h"
+#include "gimppickable.h"
+#include "gimppickable-contiguous-region.h"
+
+
+#define EPSILON 1e-6
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+
+typedef struct
+{
+  gint   x;
+  gint   y;
+  gint   level;
+} BorderPixel;
+
+
+/*  local function prototypes  */
+
+static const Babl * choose_format         (GeglBuffer          *buffer,
+                                           GimpSelectCriterion  select_criterion,
+                                           gint                *n_components,
+                                           gboolean            *has_alpha);
+static gfloat   pixel_difference          (const gfloat        *col1,
+                                           const gfloat        *col2,
+                                           gboolean             antialias,
+                                           gfloat               threshold,
+                                           gint                 n_components,
+                                           gboolean             has_alpha,
+                                           gboolean             select_transparent,
+                                           GimpSelectCriterion  select_criterion);
+static void     push_segment              (GQueue              *segment_queue,
+                                           gint                 y,
+                                           gint                 old_y,
+                                           gint                 start,
+                                           gint                 end,
+                                           gint                 new_y,
+                                           gint                 new_start,
+                                           gint                 new_end);
+static void     pop_segment               (GQueue              *segment_queue,
+                                           gint                *y,
+                                           gint                *old_y,
+                                           gint                *start,
+                                           gint                *end);
+static gboolean find_contiguous_segment   (const gfloat        *col,
+                                           GeglBuffer          *src_buffer,
+                                           GeglSampler         *src_sampler,
+                                           const GeglRectangle *src_extent,
+                                           GeglBuffer          *mask_buffer,
+                                           const Babl          *src_format,
+                                           const Babl          *mask_format,
+                                           gint                 n_components,
+                                           gboolean             has_alpha,
+                                           gboolean             select_transparent,
+                                           GimpSelectCriterion  select_criterion,
+                                           gboolean             antialias,
+                                           gfloat               threshold,
+                                           gint                 initial_x,
+                                           gint                 initial_y,
+                                           gint                *start,
+                                           gint                *end,
+                                           gfloat              *row);
+static void     find_contiguous_region    (GeglBuffer          *src_buffer,
+                                           GeglBuffer          *mask_buffer,
+                                           const Babl          *format,
+                                           gint                 n_components,
+                                           gboolean             has_alpha,
+                                           gboolean             select_transparent,
+                                           GimpSelectCriterion  select_criterion,
+                                           gboolean             antialias,
+                                           gfloat               threshold,
+                                           gboolean             diagonal_neighbors,
+                                           gint                 x,
+                                           gint                 y,
+                                           const gfloat        *col);
+
+static void            line_art_queue_pixel (GQueue              *queue,
+                                             gint                 x,
+                                             gint                 y,
+                                             gint                 level);
+
+
+/*  public functions  */
+
+GeglBuffer *
+gimp_pickable_contiguous_region_by_seed (GimpPickable        *pickable,
+                                         gboolean             antialias,
+                                         gfloat               threshold,
+                                         gboolean             select_transparent,
+                                         GimpSelectCriterion  select_criterion,
+                                         gboolean             diagonal_neighbors,
+                                         gint                 x,
+                                         gint                 y)
+{
+  GeglBuffer    *src_buffer;
+  GeglBuffer    *mask_buffer;
+  const Babl    *format;
+  GeglRectangle  extent;
+  gint           n_components;
+  gboolean       has_alpha;
+  gfloat         start_col[MAX_CHANNELS];
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+
+  gimp_pickable_flush (pickable);
+  src_buffer = gimp_pickable_get_buffer (pickable);
+
+  format = choose_format (src_buffer, select_criterion,
+                          &n_components, &has_alpha);
+  gegl_buffer_sample (src_buffer, x, y, NULL, start_col, format,
+                      GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+  if (has_alpha)
+    {
+      if (select_transparent)
+        {
+          /*  don't select transparent regions if the start pixel isn't
+           *  fully transparent
+           */
+          if (start_col[n_components - 1] > 0)
+            select_transparent = FALSE;
+        }
+    }
+  else
+    {
+      select_transparent = FALSE;
+    }
+
+  extent = *gegl_buffer_get_extent (src_buffer);
+
+  mask_buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
+
+  if (x >= extent.x && x < (extent.x + extent.width) &&
+      y >= extent.y && y < (extent.y + extent.height))
+    {
+      GIMP_TIMER_START();
+
+      find_contiguous_region (src_buffer, mask_buffer,
+                              format, n_components, has_alpha,
+                              select_transparent, select_criterion,
+                              antialias, threshold, diagonal_neighbors,
+                              x, y, start_col);
+
+      GIMP_TIMER_END("foo");
+    }
+
+  return mask_buffer;
+}
+
+GeglBuffer *
+gimp_pickable_contiguous_region_by_color (GimpPickable        *pickable,
+                                          gboolean             antialias,
+                                          gfloat               threshold,
+                                          gboolean             select_transparent,
+                                          GimpSelectCriterion  select_criterion,
+                                          const GimpRGB       *color)
+{
+  /*  Scan over the pickable's active layer, finding pixels within the
+   *  specified threshold from the given R, G, & B values.  If
+   *  antialiasing is on, use the same antialiasing scheme as in
+   *  fuzzy_select.  Modify the pickable's mask to reflect the
+   *  additional selection
+   */
+  GeglBuffer *src_buffer;
+  GeglBuffer *mask_buffer;
+  const Babl *format;
+  gint        n_components;
+  gboolean    has_alpha;
+  gfloat      start_col[MAX_CHANNELS];
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+  g_return_val_if_fail (color != NULL, NULL);
+
+  /* increase the threshold by EPSILON, to allow for conversion errors,
+   * especially when threshold == 0 (see issue #1554.)  we need to do this
+   * here, but not in the other functions, since the input color gets converted
+   * to the format in which we perform the comparison through a different path
+   * than the pickable's pixels, which can introduce error.
+   */
+  threshold += EPSILON;
+
+  gimp_pickable_flush (pickable);
+
+  src_buffer = gimp_pickable_get_buffer (pickable);
+
+  format = choose_format (src_buffer, select_criterion,
+                          &n_components, &has_alpha);
+
+  gimp_rgba_get_pixel (color, format, start_col);
+
+  if (has_alpha)
+    {
+      if (select_transparent)
+        {
+          /*  don't select transparency if "color" isn't fully transparent
+           */
+          if (start_col[n_components - 1] > 0.0)
+            select_transparent = FALSE;
+        }
+    }
+  else
+    {
+      select_transparent = FALSE;
+    }
+
+  mask_buffer = gegl_buffer_new (gegl_buffer_get_extent (src_buffer),
+                                 babl_format ("Y float"));
+
+  gegl_parallel_distribute_area (
+    gegl_buffer_get_extent (src_buffer), PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *area)
+    {
+      GeglBufferIterator *iter;
+
+      iter = gegl_buffer_iterator_new (src_buffer,
+                                       area, 0, format,
+                                       GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, mask_buffer,
+                                area, 0, babl_format ("Y float"),
+                                GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const gfloat *src   = (const gfloat *) iter->items[0].data;
+          gfloat       *dest  = (      gfloat *) iter->items[1].data;
+          gint          count = iter->length;
+
+          while (count--)
+            {
+              /*  Find how closely the colors match  */
+              *dest = pixel_difference (start_col, src,
+                                        antialias,
+                                        threshold,
+                                        n_components,
+                                        has_alpha,
+                                        select_transparent,
+                                        select_criterion);
+
+              src  += n_components;
+              dest += 1;
+            }
+        }
+    });
+
+  return mask_buffer;
+}
+
+GeglBuffer *
+gimp_pickable_contiguous_region_by_line_art (GimpPickable *pickable,
+                                             GimpLineArt  *line_art,
+                                             gint          x,
+                                             gint          y)
+{
+  GeglBuffer    *src_buffer;
+  GeglBuffer    *mask_buffer;
+  const Babl    *format  = babl_format ("Y float");
+  gfloat        *distmap = NULL;
+  GeglRectangle  extent;
+  gboolean       free_line_art = FALSE;
+  gboolean       filled        = FALSE;
+  guchar         start_col;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable) || GIMP_IS_LINE_ART (line_art), NULL);
+
+  if (! line_art)
+    {
+      /* It is much better experience to pre-compute the line art,
+       * but it may not be always possible (for instance when
+       * selecting/filling through a PDB call).
+       */
+      line_art = gimp_line_art_new ();
+      gimp_line_art_set_input (line_art, pickable);
+      free_line_art = TRUE;
+    }
+
+  src_buffer = gimp_line_art_get (line_art, &distmap);
+  g_return_val_if_fail (src_buffer && distmap, NULL);
+
+  gegl_buffer_sample (src_buffer, x, y, NULL, &start_col, NULL,
+                      GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+  extent = *gegl_buffer_get_extent (src_buffer);
+
+  mask_buffer = gegl_buffer_new (&extent, format);
+
+  if (start_col)
+    {
+      if (start_col == 1)
+        {
+          /* As a special exception, if you fill over a line art pixel, only
+           * fill the pixel and exit
+           */
+          gfloat col = 1.0;
+
+          gegl_buffer_set (mask_buffer, GEGL_RECTANGLE (x, y, 1, 1),
+                           0, format, &col, GEGL_AUTO_ROWSTRIDE);
+        }
+      else /* start_col == 2 */
+        {
+          /* If you fill over a closure pixel, let's fill on all sides
+           * of the start point. Otherwise we get a very weird result
+           * with only a single pixel filled in the middle of an empty
+           * region (since closure pixels are invisible by nature).
+           */
+          gfloat col = 0.0;
+
+          if (x - 1 >= extent.x && x - 1 < extent.x + extent.width &&
+              y - 1 >= extent.y && y - 1 < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x - 1, y - 1, &col);
+          if (x - 1 >= extent.x && x - 1 < extent.x + extent.width &&
+              y >= extent.y && y < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x - 1, y, &col);
+          if (x - 1 >= extent.x && x - 1 < extent.x + extent.width &&
+              y + 1 >= extent.y && y + 1 < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x - 1, y + 1, &col);
+          if (x >= extent.x && x < extent.x + extent.width &&
+              y - 1 >= extent.y && y - 1 < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x, y - 1, &col);
+          if (x >= extent.x && x < extent.x + extent.width &&
+              y + 1 >= extent.y && y + 1 < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x, y + 1, &col);
+          if (x + 1 >= extent.x && x + 1 < extent.x + extent.width &&
+              y - 1 >= extent.y && y - 1 < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x + 1, y - 1, &col);
+          if (x + 1 >= extent.x && x + 1 < extent.x + extent.width &&
+              y >= extent.y && y < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x + 1, y, &col);
+          if (x + 1 >= extent.x && x + 1 < extent.x + extent.width &&
+              y + 1 >= extent.y && y + 1 < (extent.y + extent.height))
+            find_contiguous_region (src_buffer, mask_buffer,
+                                    format, 1, FALSE,
+                                    FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                                    FALSE, 0.0, FALSE,
+                                    x + 1, y + 1, &col);
+          filled = TRUE;
+        }
+    }
+  else if (x >= extent.x && x < (extent.x + extent.width) &&
+           y >= extent.y && y < (extent.y + extent.height))
+    {
+      gfloat col = 0.0;
+
+      find_contiguous_region (src_buffer, mask_buffer,
+                              format, 1, FALSE,
+                              FALSE, GIMP_SELECT_CRITERION_COMPOSITE,
+                              FALSE, 0.0, FALSE,
+                              x, y, &col);
+      filled = TRUE;
+    }
+
+  if (filled)
+    {
+      GQueue *queue  = g_queue_new ();
+      gfloat *mask;
+      gint    width  = gegl_buffer_get_width (src_buffer);
+      gint    height = gegl_buffer_get_height (src_buffer);
+      gint    line_art_max_grow;
+      gint    nx, ny;
+
+      GIMP_TIMER_START();
+      /* The last step of the line art algorithm is to make sure that
+       * selections does not leave "holes" between its borders and the
+       * line arts, while not stepping over as well.
+       * I used to run the "gegl:watershed-transform" operation to flood
+       * the stroke pixels, but for such simple need, this simple code
+       * is so much faster while producing better results.
+       */
+      mask = g_new (gfloat, width * height);
+      gegl_buffer_get (mask_buffer, NULL, 1.0, NULL,
+                       mask, GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      for (y = 0; y < height; y++)
+        for (x = 0; x < width; x++)
+          {
+            if (distmap[x + y * width] == 1.0)
+              {
+                if (x > 0)
+                  {
+                    nx = x - 1;
+                    if (y > 0)
+                      {
+                        ny = y - 1;
+                        if (mask[nx + ny * width] != 0.0)
+                          {
+                            line_art_queue_pixel (queue, x, y, 1);
+                            continue;
+                          }
+                      }
+                    ny = y;
+                    if (mask[nx + ny * width] != 0.0)
+                      {
+                        line_art_queue_pixel (queue, x, y, 1);
+                        continue;
+                      }
+                    if (y < height - 1)
+                      {
+                        ny = y + 1;
+                        if (mask[nx + ny * width] != 0.0)
+                          {
+                            line_art_queue_pixel (queue, x, y, 1);
+                            continue;
+                          }
+                      }
+                  }
+                if (x < width - 1)
+                  {
+                    nx = x + 1;
+                    if (y > 0)
+                      {
+                        ny = y - 1;
+                        if (mask[nx + ny * width] != 0.0)
+                          {
+                            line_art_queue_pixel (queue, x, y, 1);
+                            continue;
+                          }
+                      }
+                    ny = y;
+                    if (mask[nx + ny * width] != 0.0)
+                      {
+                        line_art_queue_pixel (queue, x, y, 1);
+                        continue;
+                      }
+                    if (y < height - 1)
+                      {
+                        ny = y + 1;
+                        if (mask[nx + ny * width] != 0.0)
+                          {
+                            line_art_queue_pixel (queue, x, y, 1);
+                            continue;
+                          }
+                      }
+                  }
+                nx = x;
+                if (y > 0)
+                  {
+                    ny = y - 1;
+                    if (mask[nx + ny * width] != 0.0)
+                      {
+                        line_art_queue_pixel (queue, x, y, 1);
+                        continue;
+                      }
+                  }
+                if (y < height - 1)
+                  {
+                    ny = y + 1;
+                    if (mask[nx + ny * width] != 0.0)
+                      {
+                        line_art_queue_pixel (queue, x, y, 1);
+                        continue;
+                      }
+                  }
+              }
+          }
+
+      g_object_get (line_art,
+                    "max-grow", &line_art_max_grow,
+                    NULL);
+      while (! g_queue_is_empty (queue))
+        {
+          BorderPixel *c = (BorderPixel *) g_queue_pop_head (queue);
+
+          if (mask[c->x + c->y * width] != 1.0)
+            {
+              mask[c->x + c->y * width] = 1.0;
+              if (c->level >= line_art_max_grow)
+                /* Do not overflood under line arts. */
+                continue;
+              if (c->x > 0)
+                {
+                  nx = c->x - 1;
+                  if (c->y > 0)
+                    {
+                      ny = c->y - 1;
+                      if (mask[nx + ny * width] == 0.0 &&
+                          distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                        line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                    }
+                  ny = c->y;
+                  if (mask[nx + ny * width] == 0.0 &&
+                      distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                    line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                  if (c->y < height - 1)
+                    {
+                      ny = c->y + 1;
+                      if (mask[nx + ny * width] == 0.0 &&
+                          distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                        line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                    }
+                }
+              if (c->x < width - 1)
+                {
+                  nx = c->x + 1;
+                  if (c->y > 0)
+                    {
+                      ny = c->y - 1;
+                      if (mask[nx + ny * width] == 0.0 &&
+                          distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                        line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                    }
+                  ny = c->y;
+                  if (mask[nx + ny * width] == 0.0 &&
+                      distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                    line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                  if (c->y < height - 1)
+                    {
+                      ny = c->y + 1;
+                      if (mask[nx + ny * width] == 0.0 &&
+                          distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                        line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                    }
+                }
+              nx = c->x;
+              if (c->y > 0)
+                {
+                  ny = c->y - 1;
+                  if (mask[nx + ny * width] == 0.0 &&
+                      distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                    line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                }
+              if (c->y < height - 1)
+                {
+                  ny = c->y + 1;
+                  if (mask[nx + ny * width] == 0.0 &&
+                      distmap[nx + ny * width] > distmap[c->x + c->y * width])
+                    line_art_queue_pixel (queue, nx, ny, c->level + 1);
+                }
+            }
+          g_free (c);
+        }
+      g_queue_free (queue);
+      gegl_buffer_set (mask_buffer, gegl_buffer_get_extent (mask_buffer),
+                       0, NULL, mask, GEGL_AUTO_ROWSTRIDE);
+      g_free (mask);
+
+      GIMP_TIMER_END("watershed line art");
+    }
+  if (free_line_art)
+    g_clear_object (&line_art);
+
+  return mask_buffer;
+}
+
+/*  private functions  */
+
+static const Babl *
+choose_format (GeglBuffer          *buffer,
+               GimpSelectCriterion  select_criterion,
+               gint                *n_components,
+               gboolean            *has_alpha)
+{
+  const Babl *format = gegl_buffer_get_format (buffer);
+
+  *has_alpha = babl_format_has_alpha (format);
+
+  switch (select_criterion)
+    {
+    case GIMP_SELECT_CRITERION_COMPOSITE:
+      if (babl_format_is_palette (format))
+        format = babl_format ("R'G'B'A float");
+      else
+        format = gimp_babl_format (gimp_babl_format_get_base_type (format),
+                                   GIMP_PRECISION_FLOAT_GAMMA,
+                                   *has_alpha);
+      break;
+
+    case GIMP_SELECT_CRITERION_R:
+    case GIMP_SELECT_CRITERION_G:
+    case GIMP_SELECT_CRITERION_B:
+    case GIMP_SELECT_CRITERION_A:
+      format = babl_format ("R'G'B'A float");
+      break;
+
+    case GIMP_SELECT_CRITERION_H:
+    case GIMP_SELECT_CRITERION_S:
+    case GIMP_SELECT_CRITERION_V:
+      format = babl_format ("HSVA float");
+      break;
+
+    case GIMP_SELECT_CRITERION_LCH_L:
+      format = babl_format ("CIE L alpha float");
+      break;
+
+    case GIMP_SELECT_CRITERION_LCH_C:
+    case GIMP_SELECT_CRITERION_LCH_H:
+      format = babl_format ("CIE LCH(ab) alpha float");
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+      break;
+    }
+
+  *n_components = babl_format_get_n_components (format);
+
+  return format;
+}
+
+static gfloat
+pixel_difference (const gfloat        *col1,
+                  const gfloat        *col2,
+                  gboolean             antialias,
+                  gfloat               threshold,
+                  gint                 n_components,
+                  gboolean             has_alpha,
+                  gboolean             select_transparent,
+                  GimpSelectCriterion  select_criterion)
+{
+  gfloat max = 0.0;
+
+  /*  if there is an alpha channel, never select transparent regions  */
+  if (! select_transparent && has_alpha && col2[n_components - 1] == 0.0)
+    return 0.0;
+
+  if (select_transparent && has_alpha)
+    {
+      max = fabs (col1[n_components - 1] - col2[n_components - 1]);
+    }
+  else
+    {
+      gfloat diff;
+      gint   b;
+
+      if (has_alpha)
+        n_components--;
+
+      switch (select_criterion)
+        {
+        case GIMP_SELECT_CRITERION_COMPOSITE:
+          for (b = 0; b < n_components; b++)
+            {
+              diff = fabs (col1[b] - col2[b]);
+              if (diff > max)
+                max = diff;
+            }
+          break;
+
+        case GIMP_SELECT_CRITERION_R:
+          max = fabs (col1[0] - col2[0]);
+          break;
+
+        case GIMP_SELECT_CRITERION_G:
+          max = fabs (col1[1] - col2[1]);
+          break;
+
+        case GIMP_SELECT_CRITERION_B:
+          max = fabs (col1[2] - col2[2]);
+          break;
+
+        case GIMP_SELECT_CRITERION_A:
+          max = fabs (col1[3] - col2[3]);
+          break;
+
+        case GIMP_SELECT_CRITERION_H:
+          if (col1[1] > EPSILON)
+            {
+              if (col2[1] > EPSILON)
+                {
+                  max = fabs (col1[0] - col2[0]);
+                  max = MIN (max, 1.0 - max);
+                }
+              else
+                {
+                  /* "infinite" difference.  anything >> 1 will do. */
+                  max = 10.0;
+                }
+            }
+          else
+            {
+              if (col2[1] > EPSILON)
+                {
+                  /* "infinite" difference.  anything >> 1 will do. */
+                  max = 10.0;
+                }
+              else
+                {
+                  max = 0.0;
+                }
+            }
+          break;
+
+        case GIMP_SELECT_CRITERION_S:
+          max = fabs (col1[1] - col2[1]);
+          break;
+
+        case GIMP_SELECT_CRITERION_V:
+          max = fabs (col1[2] - col2[2]);
+          break;
+
+        case GIMP_SELECT_CRITERION_LCH_L:
+          max = fabs (col1[0] - col2[0]) / 100.0;
+          break;
+
+        case GIMP_SELECT_CRITERION_LCH_C:
+          max = fabs (col1[1] - col2[1]) / 100.0;
+          break;
+
+        case GIMP_SELECT_CRITERION_LCH_H:
+          if (col1[1] > 100.0 * EPSILON)
+            {
+              if (col2[1] > 100.0 * EPSILON)
+                {
+                  max = fabs (col1[2] - col2[2]) / 360.0;
+                  max = MIN (max, 1.0 - max);
+                }
+              else
+                {
+                  /* "infinite" difference.  anything >> 1 will do. */
+                  max = 10.0;
+                }
+            }
+          else
+            {
+              if (col2[1] > 100.0 * EPSILON)
+                {
+                  /* "infinite" difference.  anything >> 1 will do. */
+                  max = 10.0;
+                }
+              else
+                {
+                  max = 0.0;
+                }
+            }
+          break;
+        }
+    }
+
+  if (antialias && threshold > 0.0)
+    {
+      gfloat aa = 1.5 - (max / threshold);
+
+      if (aa <= 0.0)
+        return 0.0;
+      else if (aa < 0.5)
+        return aa * 2.0;
+      else
+        return 1.0;
+    }
+  else
+    {
+      if (max > threshold)
+        return 0.0;
+      else
+        return 1.0;
+    }
+}
+
+static void
+push_segment (GQueue *segment_queue,
+              gint    y,
+              gint    old_y,
+              gint    start,
+              gint    end,
+              gint    new_y,
+              gint    new_start,
+              gint    new_end)
+{
+  /* To avoid excessive memory allocation (y, old_y, start, end) tuples are
+   * stored in interleaved format:
+   *
+   * [y1] [old_y1] [start1] [end1] [y2] [old_y2] [start2] [end2]
+   */
+
+  if (new_y != old_y)
+    {
+      /* If the new segment's y-coordinate is different than the old (source)
+       * segment's y-coordinate, push the entire segment.
+       */
+      g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_y));
+      g_queue_push_tail (segment_queue, GINT_TO_POINTER (y));
+      g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_start));
+      g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_end));
+    }
+  else
+    {
+      /* Otherwise, only push the set-difference between the new segment and
+       * the source segment (since we've already scanned the source segment.)
+       * Note that the `+ 1` and `- 1` terms of the end/start coordinates below
+       * are only necessary when `diagonal_neighbors` is on (and otherwise make
+       * the segments slightly larger than necessary), but, meh...
+       */
+      if (new_start < start)
+        {
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_y));
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (y));
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_start));
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (start + 1));
+        }
+
+      if (new_end > end)
+        {
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_y));
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (y));
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (end - 1));
+          g_queue_push_tail (segment_queue, GINT_TO_POINTER (new_end));
+        }
+    }
+}
+
+static void
+pop_segment (GQueue *segment_queue,
+             gint   *y,
+             gint   *old_y,
+             gint   *start,
+             gint   *end)
+{
+  *y     = GPOINTER_TO_INT (g_queue_pop_head (segment_queue));
+  *old_y = GPOINTER_TO_INT (g_queue_pop_head (segment_queue));
+  *start = GPOINTER_TO_INT (g_queue_pop_head (segment_queue));
+  *end   = GPOINTER_TO_INT (g_queue_pop_head (segment_queue));
+}
+
+/* #define FETCH_ROW 1 */
+
+static gboolean
+find_contiguous_segment (const gfloat        *col,
+                         GeglBuffer          *src_buffer,
+                         GeglSampler         *src_sampler,
+                         const GeglRectangle *src_extent,
+                         GeglBuffer          *mask_buffer,
+                         const Babl          *src_format,
+                         const Babl          *mask_format,
+                         gint                 n_components,
+                         gboolean             has_alpha,
+                         gboolean             select_transparent,
+                         GimpSelectCriterion  select_criterion,
+                         gboolean             antialias,
+                         gfloat               threshold,
+                         gint                 initial_x,
+                         gint                 initial_y,
+                         gint                *start,
+                         gint                *end,
+                         gfloat              *row)
+{
+  gfloat *s;
+  gfloat  mask_row_buf[src_extent->width];
+  gfloat *mask_row = mask_row_buf - src_extent->x;
+  gfloat  diff;
+
+#ifdef FETCH_ROW
+  gegl_buffer_get (src_buffer, GEGL_RECTANGLE (0, initial_y, width, 1), 1.0,
+                   src_format,
+                   row, GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+  s = row + initial_x * n_components;
+#else
+  s = (gfloat *) g_alloca (n_components * sizeof (gfloat));
+
+  gegl_sampler_get (src_sampler,
+                    initial_x, initial_y, NULL, s, GEGL_ABYSS_NONE);
+#endif
+
+  diff = pixel_difference (col, s, antialias, threshold,
+                           n_components, has_alpha, select_transparent,
+                           select_criterion);
+
+  /* check the starting pixel */
+  if (! diff)
+    return FALSE;
+
+  mask_row[initial_x] = diff;
+
+  *start = initial_x - 1;
+#ifdef FETCH_ROW
+  s = row + *start * n_components;
+#endif
+
+  while (*start >= src_extent->x)
+    {
+#ifndef FETCH_ROW
+      gegl_sampler_get (src_sampler,
+                        *start, initial_y, NULL, s, GEGL_ABYSS_NONE);
+#endif
+
+      diff = pixel_difference (col, s, antialias, threshold,
+                               n_components, has_alpha, select_transparent,
+                               select_criterion);
+      if (diff == 0.0)
+        break;
+
+      mask_row[*start] = diff;
+
+      (*start)--;
+#ifdef FETCH_ROW
+      s -= n_components;
+#endif
+    }
+
+  *end = initial_x + 1;
+#ifdef FETCH_ROW
+  s = row + *end * n_components;
+#endif
+
+  while (*end < src_extent->x + src_extent->width)
+    {
+#ifndef FETCH_ROW
+      gegl_sampler_get (src_sampler,
+                        *end, initial_y, NULL, s, GEGL_ABYSS_NONE);
+#endif
+
+      diff = pixel_difference (col, s, antialias, threshold,
+                               n_components, has_alpha, select_transparent,
+                               select_criterion);
+      if (diff == 0.0)
+        break;
+
+      mask_row[*end] = diff;
+
+      (*end)++;
+#ifdef FETCH_ROW
+      s += n_components;
+#endif
+    }
+
+  gegl_buffer_set (mask_buffer, GEGL_RECTANGLE (*start + 1, initial_y,
+                                                *end - *start - 1, 1),
+                   0, mask_format, &mask_row[*start + 1],
+                   GEGL_AUTO_ROWSTRIDE);
+
+  return TRUE;
+}
+
+static void
+find_contiguous_region (GeglBuffer          *src_buffer,
+                        GeglBuffer          *mask_buffer,
+                        const Babl          *format,
+                        gint                 n_components,
+                        gboolean             has_alpha,
+                        gboolean             select_transparent,
+                        GimpSelectCriterion  select_criterion,
+                        gboolean             antialias,
+                        gfloat               threshold,
+                        gboolean             diagonal_neighbors,
+                        gint                 x,
+                        gint                 y,
+                        const gfloat        *col)
+{
+  const Babl          *mask_format = babl_format ("Y float");
+  GeglSampler         *src_sampler;
+  const GeglRectangle *src_extent;
+  gint                 old_y;
+  gint                 start, end;
+  gint                 new_start, new_end;
+  GQueue              *segment_queue;
+  gfloat              *row = NULL;
+
+  src_extent = gegl_buffer_get_extent (src_buffer);
+
+#ifdef FETCH_ROW
+  row = g_new (gfloat, src_extent->width * n_components);
+#endif
+
+  src_sampler = gegl_buffer_sampler_new (src_buffer,
+                                         format, GEGL_SAMPLER_NEAREST);
+
+  segment_queue = g_queue_new ();
+
+  push_segment (segment_queue,
+                y, /* dummy values: */ -1, 0, 0,
+                y, x - 1, x + 1);
+
+  do
+    {
+      pop_segment (segment_queue,
+                   &y, &old_y, &start, &end);
+
+      for (x = start + 1; x < end; x++)
+        {
+          gfloat val;
+
+          gegl_buffer_get (mask_buffer, GEGL_RECTANGLE (x, y, 1, 1), 1.0,
+                           mask_format, &val, GEGL_AUTO_ROWSTRIDE,
+                           GEGL_ABYSS_NONE);
+
+          if (val != 0.0)
+            {
+              /* If the current pixel is selected, then we've already visited
+               * the next pixel.  (Note that we assume that the maximal image
+               * width is sufficiently low that `x` won't overflow.)
+               */
+              x++;
+              continue;
+            }
+
+          if (! find_contiguous_segment (col,
+                                         src_buffer, src_sampler, src_extent,
+                                         mask_buffer,
+                                         format, mask_format,
+                                         n_components,
+                                         has_alpha,
+                                         select_transparent, select_criterion,
+                                         antialias, threshold, x, y,
+                                         &new_start, &new_end,
+                                         row))
+            continue;
+
+          /* We can skip directly to `new_end + 1` on the next iteration, since
+           * we've just selected all pixels in the range `[x, new_end)`, and
+           * the pixel at `new_end` is above threshold.  (Note that we assume
+           * that the maximal image width is sufficiently low that `x` won't
+           * overflow.)
+           */
+          x = new_end;
+
+          if (diagonal_neighbors)
+            {
+              if (new_start >= src_extent->x)
+                new_start--;
+
+              if (new_end < src_extent->x + src_extent->width)
+                new_end++;
+            }
+
+          if (y + 1 < src_extent->y + src_extent->height)
+            {
+              push_segment (segment_queue,
+                            y, old_y, start, end,
+                            y + 1, new_start, new_end);
+            }
+
+          if (y - 1 >= src_extent->y)
+            {
+              push_segment (segment_queue,
+                            y, old_y, start, end,
+                            y - 1, new_start, new_end);
+            }
+
+        }
+    }
+  while (! g_queue_is_empty (segment_queue));
+
+  g_queue_free (segment_queue);
+
+  g_object_unref (src_sampler);
+
+#ifdef FETCH_ROW
+  g_free (row);
+#endif
+}
+
+static void
+line_art_queue_pixel (GQueue *queue,
+                      gint    x,
+                      gint    y,
+                      gint    level)
+{
+  BorderPixel *p = g_new (BorderPixel, 1);
+
+  p->x      = x;
+  p->y      = y;
+  p->level  = level;
+
+  g_queue_push_head (queue, p);
+}
+
+} /* extern "C" */
diff --git a/app/core/gimppickable-contiguous-region.h b/app/core/gimppickable-contiguous-region.h
new file mode 100644
index 0000000..26cbe74
--- /dev/null
+++ b/app/core/gimppickable-contiguous-region.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PICKABLE_CONTIGUOUS_REGION_H__
+#define __GIMP_PICKABLE_CONTIGUOUS_REGION_H__
+
+
+GeglBuffer * gimp_pickable_contiguous_region_by_seed                (GimpPickable        *pickable,
+                                                                     gboolean             antialias,
+                                                                     gfloat               threshold,
+                                                                     gboolean             select_transparent,
+                                                                     GimpSelectCriterion  select_criterion,
+                                                                     gboolean             diagonal_neighbors,
+                                                                     gint                 x,
+                                                                     gint                 y);
+
+GeglBuffer * gimp_pickable_contiguous_region_by_color               (GimpPickable        *pickable,
+                                                                     gboolean             antialias,
+                                                                     gfloat               threshold,
+                                                                     gboolean             select_transparent,
+                                                                     GimpSelectCriterion  select_criterion,
+                                                                     const GimpRGB       *color);
+
+GeglBuffer * gimp_pickable_contiguous_region_by_line_art            (GimpPickable        *pickable,
+                                                                     GimpLineArt         *line_art,
+                                                                     gint                 x,
+                                                                     gint                 y);
+
+#endif  /*  __GIMP_PICKABLE_CONTIGUOUS_REGION_H__ */
diff --git a/app/core/gimppickable.c b/app/core/gimppickable.c
new file mode 100644
index 0000000..2949def
--- /dev/null
+++ b/app/core/gimppickable.c
@@ -0,0 +1,378 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppickable.c
+ * Copyright (C) 2004  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains an interface for pixel objects that their color at
+ * a given position can be picked. Also included is a utility for
+ * sampling an average area (which uses the implemented picking
+ * functions).
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpobject.h"
+#include "gimpimage.h"
+#include "gimppickable.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_pickable_real_get_pixel_average (GimpPickable          *pickable,
+                                                    const GeglRectangle   *rect,
+                                                    const Babl            *format,
+                                                    gpointer               pixel);
+
+
+G_DEFINE_INTERFACE (GimpPickable, gimp_pickable, GIMP_TYPE_OBJECT)
+
+
+/*  private functions  */
+
+
+static void
+gimp_pickable_default_init (GimpPickableInterface *iface)
+{
+  iface->get_pixel_average = gimp_pickable_real_get_pixel_average;
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_object ("buffer",
+                                                            NULL, NULL,
+                                                            GEGL_TYPE_BUFFER,
+                                                            GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_pickable_real_get_pixel_average (GimpPickable        *pickable,
+                                      const GeglRectangle *rect,
+                                      const Babl          *format,
+                                      gpointer             pixel)
+{
+  const Babl *average_format = babl_format ("RaGaBaA double");
+  gdouble     average[4]     = {};
+  gint        n              = 0;
+  gint        x;
+  gint        y;
+  gint        c;
+
+  for (y = rect->y; y < rect->y + rect->height; y++)
+    {
+      for (x = rect->x; x < rect->x + rect->width; x++)
+        {
+          gdouble sample[4];
+
+          if (gimp_pickable_get_pixel_at (pickable,
+                                          x, y, average_format, sample))
+            {
+              for (c = 0; c < 4; c++)
+                average[c] += sample[c];
+
+              n++;
+            }
+        }
+    }
+
+  if (n > 0)
+    {
+      for (c = 0; c < 4; c++)
+        average[c] /= n;
+    }
+
+  babl_process (babl_fish (average_format, format), average, pixel, 1);
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_pickable_flush (GimpPickable *pickable)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_if_fail (GIMP_IS_PICKABLE (pickable));
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->flush)
+    pickable_iface->flush (pickable);
+}
+
+GimpImage *
+gimp_pickable_get_image (GimpPickable *pickable)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_image)
+    return pickable_iface->get_image (pickable);
+
+  return NULL;
+}
+
+const Babl *
+gimp_pickable_get_format (GimpPickable *pickable)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_format)
+    return pickable_iface->get_format (pickable);
+
+  return NULL;
+}
+
+const Babl *
+gimp_pickable_get_format_with_alpha (GimpPickable *pickable)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_format_with_alpha)
+    return pickable_iface->get_format_with_alpha (pickable);
+
+  return NULL;
+}
+
+GeglBuffer *
+gimp_pickable_get_buffer (GimpPickable *pickable)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_buffer)
+    return pickable_iface->get_buffer (pickable);
+
+  return NULL;
+}
+
+gboolean
+gimp_pickable_get_pixel_at (GimpPickable *pickable,
+                            gint          x,
+                            gint          y,
+                            const Babl   *format,
+                            gpointer      pixel)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), FALSE);
+  g_return_val_if_fail (pixel != NULL, FALSE);
+
+  if (! format)
+    format = gimp_pickable_get_format (pickable);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_pixel_at)
+    return pickable_iface->get_pixel_at (pickable, x, y, format, pixel);
+
+  return FALSE;
+}
+
+void
+gimp_pickable_get_pixel_average (GimpPickable        *pickable,
+                                 const GeglRectangle *rect,
+                                 const Babl          *format,
+                                 gpointer             pixel)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_if_fail (GIMP_IS_PICKABLE (pickable));
+  g_return_if_fail (rect != NULL);
+  g_return_if_fail (pixel != NULL);
+
+  if (! format)
+    format = gimp_pickable_get_format (pickable);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_pixel_average)
+    pickable_iface->get_pixel_average (pickable, rect, format, pixel);
+  else
+    memset (pixel, 0, babl_format_get_bytes_per_pixel (format));
+}
+
+gboolean
+gimp_pickable_get_color_at (GimpPickable *pickable,
+                            gint          x,
+                            gint          y,
+                            GimpRGB      *color)
+{
+  gdouble pixel[4];
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+
+  if (! gimp_pickable_get_pixel_at (pickable, x, y, NULL, pixel))
+    return FALSE;
+
+  gimp_pickable_pixel_to_srgb (pickable, NULL, pixel, color);
+
+  return TRUE;
+}
+
+gdouble
+gimp_pickable_get_opacity_at (GimpPickable *pickable,
+                              gint          x,
+                              gint          y)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), GIMP_OPACITY_TRANSPARENT);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->get_opacity_at)
+    return pickable_iface->get_opacity_at (pickable, x, y);
+
+  return GIMP_OPACITY_TRANSPARENT;
+}
+
+void
+gimp_pickable_pixel_to_srgb (GimpPickable *pickable,
+                             const Babl   *format,
+                             gpointer      pixel,
+                             GimpRGB      *color)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_if_fail (GIMP_IS_PICKABLE (pickable));
+  g_return_if_fail (pixel != NULL);
+  g_return_if_fail (color != NULL);
+
+  if (! format)
+    format = gimp_pickable_get_format (pickable);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->pixel_to_srgb)
+    {
+      pickable_iface->pixel_to_srgb (pickable, format, pixel, color);
+    }
+  else
+    {
+      gimp_rgba_set_pixel (color, format, pixel);
+    }
+}
+
+void
+gimp_pickable_srgb_to_pixel (GimpPickable  *pickable,
+                             const GimpRGB *color,
+                             const Babl    *format,
+                             gpointer       pixel)
+{
+  GimpPickableInterface *pickable_iface;
+
+  g_return_if_fail (GIMP_IS_PICKABLE (pickable));
+  g_return_if_fail (color != NULL);
+  g_return_if_fail (pixel != NULL);
+
+  if (! format)
+    format = gimp_pickable_get_format (pickable);
+
+  pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+
+  if (pickable_iface->srgb_to_pixel)
+    {
+      pickable_iface->srgb_to_pixel (pickable, color, format, pixel);
+    }
+  else
+    {
+      gimp_rgba_get_pixel (color, format, pixel);
+    }
+}
+
+void
+gimp_pickable_srgb_to_image_color (GimpPickable  *pickable,
+                                   const GimpRGB *color,
+                                   GimpRGB       *image_color)
+{
+  g_return_if_fail (GIMP_IS_PICKABLE (pickable));
+  g_return_if_fail (color != NULL);
+  g_return_if_fail (image_color != NULL);
+
+  gimp_pickable_srgb_to_pixel (pickable,
+                               color,
+                               babl_format ("R'G'B'A double"),
+                               image_color);
+}
+
+gboolean
+gimp_pickable_pick_color (GimpPickable *pickable,
+                          gint          x,
+                          gint          y,
+                          gboolean      sample_average,
+                          gdouble       average_radius,
+                          gpointer      pixel,
+                          GimpRGB      *color)
+{
+  const Babl *format;
+  gdouble     sample[4];
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+
+  format = gimp_pickable_get_format (pickable);
+
+  if (! gimp_pickable_get_pixel_at (pickable, x, y, format, sample))
+    return FALSE;
+
+  if (pixel)
+    memcpy (pixel, sample, babl_format_get_bytes_per_pixel (format));
+
+  if (sample_average)
+    {
+      gint radius = floor (average_radius);
+
+      format = babl_format ("RaGaBaA double");
+
+      gimp_pickable_get_pixel_average (pickable,
+                                       GEGL_RECTANGLE (x - radius,
+                                                       y - radius,
+                                                       2 * radius + 1,
+                                                       2 * radius + 1),
+                                       format, sample);
+    }
+
+  gimp_pickable_pixel_to_srgb (pickable, format, sample, color);
+
+  return TRUE;
+}
diff --git a/app/core/gimppickable.h b/app/core/gimppickable.h
new file mode 100644
index 0000000..c8c77c9
--- /dev/null
+++ b/app/core/gimppickable.h
@@ -0,0 +1,110 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppickable.h
+ * Copyright (C) 2004  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PICKABLE_H__
+#define __GIMP_PICKABLE_H__
+
+
+#define GIMP_TYPE_PICKABLE               (gimp_pickable_get_type ())
+#define GIMP_IS_PICKABLE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PICKABLE))
+#define GIMP_PICKABLE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PICKABLE, GimpPickable))
+#define GIMP_PICKABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_PICKABLE, GimpPickableInterface))
+
+
+typedef struct _GimpPickableInterface GimpPickableInterface;
+
+struct _GimpPickableInterface
+{
+  GTypeInterface base_iface;
+
+  /*  virtual functions  */
+  void            (* flush)                 (GimpPickable        *pickable);
+  GimpImage     * (* get_image)             (GimpPickable        *pickable);
+  const Babl    * (* get_format)            (GimpPickable        *pickable);
+  const Babl    * (* get_format_with_alpha) (GimpPickable        *pickable);
+  GeglBuffer    * (* get_buffer)            (GimpPickable        *pickable);
+  gboolean        (* get_pixel_at)          (GimpPickable        *pickable,
+                                             gint                 x,
+                                             gint                 y,
+                                             const Babl          *format,
+                                             gpointer             pixel);
+  gdouble         (* get_opacity_at)        (GimpPickable        *pickable,
+                                             gint                 x,
+                                             gint                 y);
+  void            (* get_pixel_average)     (GimpPickable        *pickable,
+                                             const GeglRectangle *rect,
+                                             const Babl          *format,
+                                             gpointer             pixel);
+  void            (* pixel_to_srgb)         (GimpPickable        *pickable,
+                                             const Babl          *format,
+                                             gpointer             pixel,
+                                             GimpRGB             *color);
+  void            (* srgb_to_pixel)         (GimpPickable        *pickable,
+                                             const GimpRGB       *color,
+                                             const Babl          *format,
+                                             gpointer             pixel);
+};
+
+
+GType           gimp_pickable_get_type              (void) G_GNUC_CONST;
+
+void            gimp_pickable_flush                 (GimpPickable        *pickable);
+GimpImage     * gimp_pickable_get_image             (GimpPickable        *pickable);
+const Babl    * gimp_pickable_get_format            (GimpPickable        *pickable);
+const Babl    * gimp_pickable_get_format_with_alpha (GimpPickable        *pickable);
+GeglBuffer    * gimp_pickable_get_buffer            (GimpPickable        *pickable);
+gboolean        gimp_pickable_get_pixel_at          (GimpPickable        *pickable,
+                                                     gint                 x,
+                                                     gint                 y,
+                                                     const Babl          *format,
+                                                     gpointer             pixel);
+gboolean        gimp_pickable_get_color_at          (GimpPickable        *pickable,
+                                                     gint                 x,
+                                                     gint                 y,
+                                                     GimpRGB             *color);
+gdouble         gimp_pickable_get_opacity_at        (GimpPickable        *pickable,
+                                                     gint                 x,
+                                                     gint                 y);
+void            gimp_pickable_get_pixel_average     (GimpPickable        *pickable,
+                                                     const GeglRectangle *rect,
+                                                     const Babl          *format,
+                                                     gpointer             pixel);
+void            gimp_pickable_pixel_to_srgb         (GimpPickable        *pickable,
+                                                     const Babl          *format,
+                                                     gpointer             pixel,
+                                                     GimpRGB             *color);
+void            gimp_pickable_srgb_to_pixel         (GimpPickable        *pickable,
+                                                     const GimpRGB       *color,
+                                                     const Babl          *format,
+                                                     gpointer             pixel);
+void            gimp_pickable_srgb_to_image_color   (GimpPickable        *pickable,
+                                                     const GimpRGB       *color,
+                                                     GimpRGB             *image_color);
+
+gboolean        gimp_pickable_pick_color            (GimpPickable        *pickable,
+                                                     gint                 x,
+                                                     gint                 y,
+                                                     gboolean             sample_average,
+                                                     gdouble              average_radius,
+                                                     gpointer             pixel,
+                                                     GimpRGB             *color);
+
+
+#endif  /* __GIMP_PICKABLE_H__ */
diff --git a/app/core/gimpprogress.c b/app/core/gimpprogress.c
new file mode 100644
index 0000000..6b8bf46
--- /dev/null
+++ b/app/core/gimpprogress.c
@@ -0,0 +1,266 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprogress.c
+ * Copyright (C) 2004  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpmarshal.h"
+#include "gimpprogress.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  CANCEL,
+  LAST_SIGNAL
+};
+
+
+G_DEFINE_INTERFACE (GimpProgress, gimp_progress, G_TYPE_OBJECT)
+
+
+static guint progress_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  private functions  */
+
+
+static void
+gimp_progress_default_init (GimpProgressInterface *progress_iface)
+{
+  progress_signals[CANCEL] =
+    g_signal_new ("cancel",
+                  G_TYPE_FROM_INTERFACE (progress_iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpProgressInterface, cancel),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+}
+
+
+/*  public functions  */
+
+
+GimpProgress *
+gimp_progress_start (GimpProgress *progress,
+                     gboolean      cancellable,
+                     const gchar  *format,
+                     ...)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->start)
+    {
+      GimpProgress *ret;
+      va_list       args;
+      gchar        *text;
+
+      va_start (args, format);
+      text = g_strdup_vprintf (format, args);
+      va_end (args);
+
+      ret = progress_iface->start (progress, cancellable, text);
+
+      g_free (text);
+
+      return ret;
+    }
+
+  return NULL;
+}
+
+void
+gimp_progress_end (GimpProgress *progress)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->end)
+    progress_iface->end (progress);
+}
+
+gboolean
+gimp_progress_is_active (GimpProgress *progress)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), FALSE);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->is_active)
+    return progress_iface->is_active (progress);
+
+  return FALSE;
+}
+
+void
+gimp_progress_set_text (GimpProgress *progress,
+                        const gchar  *format,
+                        ...)
+{
+  va_list  args;
+  gchar   *message;
+
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (format != NULL);
+
+  va_start (args, format);
+  message = g_strdup_vprintf (format, args);
+  va_end (args);
+
+  gimp_progress_set_text_literal (progress, message);
+
+  g_free (message);
+}
+
+void
+gimp_progress_set_text_literal (GimpProgress *progress,
+                                const gchar  *message)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (message != NULL);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->set_text)
+    progress_iface->set_text (progress, message);
+}
+
+void
+gimp_progress_set_value (GimpProgress *progress,
+                         gdouble       percentage)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+
+  percentage = CLAMP (percentage, 0.0, 1.0);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->set_value)
+    progress_iface->set_value (progress, percentage);
+}
+
+gdouble
+gimp_progress_get_value (GimpProgress *progress)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), 0.0);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->get_value)
+    return progress_iface->get_value (progress);
+
+  return 0.0;
+}
+
+void
+gimp_progress_pulse (GimpProgress *progress)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->pulse)
+    progress_iface->pulse (progress);
+}
+
+guint32
+gimp_progress_get_window_id (GimpProgress *progress)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), 0);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->get_window_id)
+    return progress_iface->get_window_id (progress);
+
+  return 0;
+}
+
+gboolean
+gimp_progress_message (GimpProgress        *progress,
+                       Gimp                *gimp,
+                       GimpMessageSeverity  severity,
+                       const gchar         *domain,
+                       const gchar         *message)
+{
+  GimpProgressInterface *progress_iface;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (domain != NULL, FALSE);
+  g_return_val_if_fail (message != NULL, FALSE);
+
+  progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
+
+  if (progress_iface->message)
+    return progress_iface->message (progress, gimp, severity, domain, message);
+
+  return FALSE;
+}
+
+void
+gimp_progress_cancel (GimpProgress *progress)
+{
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+
+  g_signal_emit (progress, progress_signals[CANCEL], 0);
+}
+
+void
+gimp_progress_update_and_flush (gint     min,
+                                gint     max,
+                                gint     current,
+                                gpointer data)
+{
+  gimp_progress_set_value (GIMP_PROGRESS (data),
+                           (gdouble) (current - min) / (gdouble) (max - min));
+
+  while (g_main_context_pending (NULL))
+    g_main_context_iteration (NULL, TRUE);
+}
diff --git a/app/core/gimpprogress.h b/app/core/gimpprogress.h
new file mode 100644
index 0000000..488f050
--- /dev/null
+++ b/app/core/gimpprogress.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprogress.h
+ * Copyright (C) 2004  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROGRESS_H__
+#define __GIMP_PROGRESS_H__
+
+
+#define GIMP_TYPE_PROGRESS               (gimp_progress_get_type ())
+#define GIMP_IS_PROGRESS(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROGRESS))
+#define GIMP_PROGRESS(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROGRESS, GimpProgress))
+#define GIMP_PROGRESS_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_PROGRESS, GimpProgressInterface))
+
+
+typedef struct _GimpProgressInterface GimpProgressInterface;
+
+struct _GimpProgressInterface
+{
+  GTypeInterface base_iface;
+
+  /*  virtual functions  */
+  GimpProgress * (* start)         (GimpProgress        *progress,
+                                    gboolean             cancellable,
+                                    const gchar         *message);
+  void           (* end)           (GimpProgress        *progress);
+  gboolean       (* is_active)     (GimpProgress        *progress);
+
+  void           (* set_text)      (GimpProgress        *progress,
+                                    const gchar         *message);
+  void           (* set_value)     (GimpProgress        *progress,
+                                    gdouble              percentage);
+  gdouble        (* get_value)     (GimpProgress        *progress);
+  void           (* pulse)         (GimpProgress        *progress);
+
+  guint32        (* get_window_id) (GimpProgress        *progress);
+
+  gboolean       (* message)       (GimpProgress        *progress,
+                                    Gimp                *gimp,
+                                    GimpMessageSeverity  severity,
+                                    const gchar         *domain,
+                                    const gchar         *message);
+
+  /*  signals  */
+  void           (* cancel)        (GimpProgress        *progress);
+};
+
+
+GType          gimp_progress_get_type         (void) G_GNUC_CONST;
+
+GimpProgress * gimp_progress_start            (GimpProgress        *progress,
+                                               gboolean             cancellable,
+                                               const gchar         *format,
+                                               ...) G_GNUC_PRINTF (3, 4);
+void           gimp_progress_end              (GimpProgress        *progress);
+gboolean       gimp_progress_is_active        (GimpProgress        *progress);
+
+void           gimp_progress_set_text         (GimpProgress        *progress,
+                                               const gchar         *format,
+                                               ...) G_GNUC_PRINTF (2, 3);
+void           gimp_progress_set_text_literal (GimpProgress        *progress,
+                                               const gchar         *message);
+void           gimp_progress_set_value        (GimpProgress        *progress,
+                                               gdouble              percentage);
+gdouble        gimp_progress_get_value        (GimpProgress        *progress);
+void           gimp_progress_pulse            (GimpProgress        *progress);
+
+guint32        gimp_progress_get_window_id    (GimpProgress        *progress);
+
+gboolean       gimp_progress_message          (GimpProgress        *progress,
+                                               Gimp                *gimp,
+                                               GimpMessageSeverity  severity,
+                                               const gchar         *domain,
+                                               const gchar         *message);
+
+void           gimp_progress_cancel           (GimpProgress        *progress);
+
+void           gimp_progress_update_and_flush (gint                 min,
+                                               gint                 max,
+                                               gint                 current,
+                                               gpointer             data);
+
+
+#endif /* __GIMP_PROGRESS_H__ */
diff --git a/app/core/gimpprojectable.c b/app/core/gimpprojectable.c
new file mode 100644
index 0000000..8814c98
--- /dev/null
+++ b/app/core/gimpprojectable.c
@@ -0,0 +1,262 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprojectable.c
+ * Copyright (C) 2008  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpmarshal.h"
+#include "gimpprojectable.h"
+#include "gimpviewable.h"
+
+
+enum
+{
+  INVALIDATE,
+  FLUSH,
+  STRUCTURE_CHANGED,
+  BOUNDS_CHANGED,
+  LAST_SIGNAL
+};
+
+
+G_DEFINE_INTERFACE (GimpProjectable, gimp_projectable, GIMP_TYPE_VIEWABLE)
+
+
+static guint projectable_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  private functions  */
+
+
+static void
+gimp_projectable_default_init (GimpProjectableInterface *iface)
+{
+  projectable_signals[INVALIDATE] =
+    g_signal_new ("invalidate",
+                  G_TYPE_FROM_CLASS (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpProjectableInterface, invalidate),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT_INT_INT,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  projectable_signals[FLUSH] =
+    g_signal_new ("flush",
+                  G_TYPE_FROM_CLASS (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpProjectableInterface, flush),
+                  NULL, NULL,
+                  gimp_marshal_VOID__BOOLEAN,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_BOOLEAN);
+
+  projectable_signals[STRUCTURE_CHANGED] =
+    g_signal_new ("structure-changed",
+                  G_TYPE_FROM_CLASS (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpProjectableInterface, structure_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  projectable_signals[BOUNDS_CHANGED] =
+    g_signal_new ("bounds-changed",
+                  G_TYPE_FROM_CLASS (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpProjectableInterface, bounds_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+}
+
+
+/*  public functions  */
+
+void
+gimp_projectable_invalidate (GimpProjectable *projectable,
+                             gint             x,
+                             gint             y,
+                             gint             width,
+                             gint             height)
+{
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  g_signal_emit (projectable, projectable_signals[INVALIDATE], 0,
+                 x, y, width, height);
+}
+
+void
+gimp_projectable_flush (GimpProjectable *projectable,
+                        gboolean         preview_invalidated)
+{
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  g_signal_emit (projectable, projectable_signals[FLUSH], 0,
+                 preview_invalidated);
+}
+
+void
+gimp_projectable_structure_changed (GimpProjectable *projectable)
+{
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  g_signal_emit (projectable, projectable_signals[STRUCTURE_CHANGED], 0);
+}
+
+void
+gimp_projectable_bounds_changed (GimpProjectable *projectable,
+                                 gint             old_x,
+                                 gint             old_y)
+{
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  g_signal_emit (projectable, projectable_signals[BOUNDS_CHANGED], 0,
+                 old_x, old_y);
+}
+
+GimpImage *
+gimp_projectable_get_image (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_PROJECTABLE (projectable), NULL);
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->get_image)
+    return iface->get_image (projectable);
+
+  return NULL;
+}
+
+const Babl *
+gimp_projectable_get_format (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_PROJECTABLE (projectable), NULL);
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->get_format)
+    return iface->get_format (projectable);
+
+  return 0;
+}
+
+void
+gimp_projectable_get_offset (GimpProjectable *projectable,
+                             gint            *x,
+                             gint            *y)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+  g_return_if_fail (x != NULL);
+  g_return_if_fail (y != NULL);
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  *x = 0;
+  *y = 0;
+
+  if (iface->get_offset)
+    iface->get_offset (projectable, x, y);
+}
+
+GeglRectangle
+gimp_projectable_get_bounding_box (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+  GeglRectangle             result = {};
+
+  g_return_val_if_fail (GIMP_IS_PROJECTABLE (projectable), result);
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->get_bounding_box)
+    result = iface->get_bounding_box (projectable);
+
+  return result;
+}
+
+GeglNode *
+gimp_projectable_get_graph (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_PROJECTABLE (projectable), NULL);
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->get_graph)
+    return iface->get_graph (projectable);
+
+  return NULL;
+}
+
+void
+gimp_projectable_begin_render (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->begin_render)
+    iface->begin_render (projectable);
+}
+
+void
+gimp_projectable_end_render (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->end_render)
+    iface->end_render (projectable);
+}
+
+void
+gimp_projectable_invalidate_preview (GimpProjectable *projectable)
+{
+  GimpProjectableInterface *iface;
+
+  g_return_if_fail (GIMP_IS_PROJECTABLE (projectable));
+
+  iface = GIMP_PROJECTABLE_GET_INTERFACE (projectable);
+
+  if (iface->invalidate_preview)
+    iface->invalidate_preview (projectable);
+}
diff --git a/app/core/gimpprojectable.h b/app/core/gimpprojectable.h
new file mode 100644
index 0000000..955f3a4
--- /dev/null
+++ b/app/core/gimpprojectable.h
@@ -0,0 +1,90 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpprojectable.h
+ * Copyright (C) 2008  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROJECTABLE_H__
+#define __GIMP_PROJECTABLE_H__
+
+
+#define GIMP_TYPE_PROJECTABLE               (gimp_projectable_get_type ())
+#define GIMP_IS_PROJECTABLE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROJECTABLE))
+#define GIMP_PROJECTABLE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROJECTABLE, GimpProjectable))
+#define GIMP_PROJECTABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_PROJECTABLE, GimpProjectableInterface))
+
+
+typedef struct _GimpProjectableInterface GimpProjectableInterface;
+
+struct _GimpProjectableInterface
+{
+  GTypeInterface base_iface;
+
+  /*  signals  */
+  void         (* invalidate)         (GimpProjectable *projectable,
+                                       gint             x,
+                                       gint             y,
+                                       gint             width,
+                                       gint             height);
+  void         (* flush)              (GimpProjectable *projectable,
+                                       gboolean         invalidate_preview);
+  void         (* structure_changed)  (GimpProjectable *projectable);
+  void         (* bounds_changed)     (GimpProjectable *projectable,
+                                       gint             old_x,
+                                       gint             old_y);
+
+  /*  virtual functions  */
+  GimpImage  * (* get_image)          (GimpProjectable *projectable);
+  const Babl * (* get_format)         (GimpProjectable *projectable);
+  void         (* get_offset)         (GimpProjectable *projectable,
+                                       gint            *x,
+                                       gint            *y);
+  GeglRectangle (* get_bounding_box)  (GimpProjectable *projectable);
+  GeglNode   * (* get_graph)          (GimpProjectable *projectable);
+  void         (* begin_render)       (GimpProjectable *projectable);
+  void         (* end_render)         (GimpProjectable *projectable);
+  void         (* invalidate_preview) (GimpProjectable *projectable);
+};
+
+
+GType        gimp_projectable_get_type           (void) G_GNUC_CONST;
+
+void         gimp_projectable_invalidate         (GimpProjectable *projectable,
+                                                  gint             x,
+                                                  gint             y,
+                                                  gint             width,
+                                                  gint             height);
+void         gimp_projectable_flush              (GimpProjectable *projectable,
+                                                  gboolean         preview_invalidated);
+void         gimp_projectable_structure_changed  (GimpProjectable *projectable);
+void         gimp_projectable_bounds_changed     (GimpProjectable *projectable,
+                                                  gint             old_x,
+                                                  gint             old_y);
+
+GimpImage  * gimp_projectable_get_image          (GimpProjectable *projectable);
+const Babl * gimp_projectable_get_format         (GimpProjectable *projectable);
+void         gimp_projectable_get_offset         (GimpProjectable *projectable,
+                                                  gint            *x,
+                                                  gint            *y);
+GeglRectangle gimp_projectable_get_bounding_box  (GimpProjectable *projectable);
+GeglNode   * gimp_projectable_get_graph          (GimpProjectable *projectable);
+void         gimp_projectable_begin_render       (GimpProjectable *projectable);
+void         gimp_projectable_end_render         (GimpProjectable *projectable);
+void         gimp_projectable_invalidate_preview (GimpProjectable *projectable);
+
+
+#endif  /* __GIMP_PROJECTABLE_H__ */
diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c
new file mode 100644
index 0000000..c249b55
--- /dev/null
+++ b/app/core/gimpprojection.c
@@ -0,0 +1,1132 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp.h"
+#include "gimp-memsize.h"
+#include "gimpchunkiterator.h"
+#include "gimpimage.h"
+#include "gimpmarshal.h"
+#include "gimppickable.h"
+#include "gimpprojectable.h"
+#include "gimpprojection.h"
+#include "gimptilehandlerprojectable.h"
+
+#include "gimp-log.h"
+#include "gimp-priorities.h"
+
+
+/*  chunk size for area updates  */
+#define GIMP_PROJECTION_UPDATE_CHUNK_WIDTH  32
+#define GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT 32
+
+
+enum
+{
+  UPDATE,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_BUFFER
+};
+
+
+struct _GimpProjectionPrivate
+{
+  GimpProjectable           *projectable;
+
+  GeglBuffer                *buffer;
+  GimpTileHandlerValidate   *validate_handler;
+
+  gint                       priority;
+
+  cairo_region_t            *update_region;
+  GeglRectangle              priority_rect;
+  GimpChunkIterator         *iter;
+  guint                      idle_id;
+
+  gboolean                   invalidate_preview;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_projection_pickable_iface_init (GimpPickableInterface  *iface);
+
+static void        gimp_projection_finalize              (GObject         *object);
+static void        gimp_projection_set_property          (GObject         *object,
+                                                          guint            property_id,
+                                                          const GValue    *value,
+                                                          GParamSpec      *pspec);
+static void        gimp_projection_get_property          (GObject         *object,
+                                                          guint            property_id,
+                                                          GValue          *value,
+                                                          GParamSpec      *pspec);
+
+static gint64      gimp_projection_get_memsize           (GimpObject      *object,
+                                                          gint64          *gui_size);
+
+static void        gimp_projection_pickable_flush        (GimpPickable    *pickable);
+static GimpImage * gimp_projection_get_image             (GimpPickable    *pickable);
+static const Babl * gimp_projection_get_format           (GimpPickable    *pickable);
+static GeglBuffer * gimp_projection_get_buffer           (GimpPickable    *pickable);
+static gboolean    gimp_projection_get_pixel_at          (GimpPickable    *pickable,
+                                                          gint             x,
+                                                          gint             y,
+                                                          const Babl      *format,
+                                                          gpointer         pixel);
+static gdouble     gimp_projection_get_opacity_at        (GimpPickable    *pickable,
+                                                          gint             x,
+                                                          gint             y);
+static void        gimp_projection_get_pixel_average     (GimpPickable    *pickable,
+                                                          const GeglRectangle *rect,
+                                                          const Babl      *format,
+                                                          gpointer         pixel);
+static void        gimp_projection_pixel_to_srgb         (GimpPickable    *pickable,
+                                                          const Babl      *format,
+                                                          gpointer         pixel,
+                                                          GimpRGB         *color);
+static void        gimp_projection_srgb_to_pixel         (GimpPickable    *pickable,
+                                                          const GimpRGB   *color,
+                                                          const Babl      *format,
+                                                          gpointer         pixel);
+
+static void        gimp_projection_allocate_buffer       (GimpProjection  *proj);
+static void        gimp_projection_free_buffer           (GimpProjection  *proj);
+static void        gimp_projection_add_update_area       (GimpProjection  *proj,
+                                                          gint             x,
+                                                          gint             y,
+                                                          gint             w,
+                                                          gint             h);
+static void        gimp_projection_flush_whenever        (GimpProjection  *proj,
+                                                          gboolean         now,
+                                                          gboolean         direct);
+static void        gimp_projection_update_priority_rect  (GimpProjection  *proj);
+static void        gimp_projection_chunk_render_start    (GimpProjection  *proj);
+static void        gimp_projection_chunk_render_stop     (GimpProjection  *proj,
+                                                          gboolean         merge);
+static gboolean    gimp_projection_chunk_render_callback (GimpProjection  *proj);
+static gboolean    gimp_projection_chunk_render_iteration(GimpProjection  *proj);
+static void        gimp_projection_paint_area            (GimpProjection  *proj,
+                                                          gboolean         now,
+                                                          gint             x,
+                                                          gint             y,
+                                                          gint             w,
+                                                          gint             h);
+
+static void        gimp_projection_projectable_invalidate(GimpProjectable *projectable,
+                                                          gint             x,
+                                                          gint             y,
+                                                          gint             w,
+                                                          gint             h,
+                                                          GimpProjection  *proj);
+static void        gimp_projection_projectable_flush     (GimpProjectable *projectable,
+                                                          gboolean         invalidate_preview,
+                                                          GimpProjection  *proj);
+static void
+           gimp_projection_projectable_structure_changed (GimpProjectable *projectable,
+                                                          GimpProjection  *proj);
+static void   gimp_projection_projectable_bounds_changed (GimpProjectable *projectable,
+                                                          gint             old_x,
+                                                          gint             old_y,
+                                                          GimpProjection  *proj);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpProjection, gimp_projection, GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpProjection)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
+                                                gimp_projection_pickable_iface_init))
+
+#define parent_class gimp_projection_parent_class
+
+static guint projection_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_projection_class_init (GimpProjectionClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  projection_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpProjectionClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__BOOLEAN_INT_INT_INT_INT,
+                  G_TYPE_NONE, 5,
+                  G_TYPE_BOOLEAN,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  object_class->finalize         = gimp_projection_finalize;
+  object_class->set_property     = gimp_projection_set_property;
+  object_class->get_property     = gimp_projection_get_property;
+
+  gimp_object_class->get_memsize = gimp_projection_get_memsize;
+
+  g_object_class_override_property (object_class, PROP_BUFFER, "buffer");
+}
+
+static void
+gimp_projection_init (GimpProjection *proj)
+{
+  proj->priv = gimp_projection_get_instance_private (proj);
+}
+
+static void
+gimp_projection_pickable_iface_init (GimpPickableInterface *iface)
+{
+  iface->flush                 = gimp_projection_pickable_flush;
+  iface->get_image             = gimp_projection_get_image;
+  iface->get_format            = gimp_projection_get_format;
+  iface->get_format_with_alpha = gimp_projection_get_format; /* sic */
+  iface->get_buffer            = gimp_projection_get_buffer;
+  iface->get_pixel_at          = gimp_projection_get_pixel_at;
+  iface->get_opacity_at        = gimp_projection_get_opacity_at;
+  iface->get_pixel_average     = gimp_projection_get_pixel_average;
+  iface->pixel_to_srgb         = gimp_projection_pixel_to_srgb;
+  iface->srgb_to_pixel         = gimp_projection_srgb_to_pixel;
+}
+
+static void
+gimp_projection_finalize (GObject *object)
+{
+  GimpProjection *proj = GIMP_PROJECTION (object);
+
+  gimp_projection_free_buffer (proj);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_projection_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_projection_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpProjection *projection = GIMP_PROJECTION (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      g_value_set_object (value, projection->priv->buffer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_projection_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpProjection *projection = GIMP_PROJECTION (object);
+  gint64          memsize    = 0;
+
+  memsize += gimp_gegl_pyramid_get_memsize (projection->priv->buffer);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+/**
+ * gimp_projection_estimate_memsize:
+ * @type:           the projectable's base type
+ * @component_type: the projectable's component type
+ * @width:          projection width
+ * @height:         projection height
+ *
+ * Calculates a rough estimate of the memory that is required for the
+ * projection of an image with the given @width and @height.
+ *
+ * Return value: a rough estimate of the memory requirements.
+ **/
+gint64
+gimp_projection_estimate_memsize (GimpImageBaseType type,
+                                  GimpComponentType component_type,
+                                  gint              width,
+                                  gint              height)
+{
+  const Babl *format;
+  gint64      bytes;
+
+  if (type == GIMP_INDEXED)
+    type = GIMP_RGB;
+
+  format = gimp_babl_format (type,
+                             gimp_babl_precision (component_type, FALSE),
+                             TRUE);
+  bytes  = babl_format_get_bytes_per_pixel (format);
+
+  /* The pyramid levels constitute a geometric sum with a ratio of 1/4. */
+  return bytes * (gint64) width * (gint64) height * 1.33;
+}
+
+
+static void
+gimp_projection_pickable_flush (GimpPickable *pickable)
+{
+  GimpProjection *proj = GIMP_PROJECTION (pickable);
+
+  /* create the buffer if it doesn't exist */
+  gimp_projection_get_buffer (pickable);
+
+  gimp_projection_finish_draw (proj);
+  gimp_projection_flush_now (proj, FALSE);
+
+  if (proj->priv->invalidate_preview)
+    {
+      /* invalidate the preview here since it is constructed from
+       * the projection
+       */
+      proj->priv->invalidate_preview = FALSE;
+
+      gimp_projectable_invalidate_preview (proj->priv->projectable);
+    }
+}
+
+static GimpImage *
+gimp_projection_get_image (GimpPickable *pickable)
+{
+  GimpProjection *proj = GIMP_PROJECTION (pickable);
+
+  return gimp_projectable_get_image (proj->priv->projectable);
+}
+
+static const Babl *
+gimp_projection_get_format (GimpPickable *pickable)
+{
+  GimpProjection *proj = GIMP_PROJECTION (pickable);
+
+  return gimp_projectable_get_format (proj->priv->projectable);
+}
+
+static GeglBuffer *
+gimp_projection_get_buffer (GimpPickable *pickable)
+{
+  GimpProjection *proj = GIMP_PROJECTION (pickable);
+
+  if (! proj->priv->buffer)
+    {
+      GeglRectangle bounding_box;
+
+      bounding_box =
+        gimp_projectable_get_bounding_box (proj->priv->projectable);
+
+      gimp_projection_allocate_buffer (proj);
+
+      /*  This used to call gimp_tile_handler_validate_invalidate()
+       *  which forced the entire projection to be constructed in one
+       *  go for new images, causing a potentially huge delay. Now we
+       *  initially validate stuff the normal way, which makes the
+       *  image appear incrementally, but it keeps everything
+       *  responsive.
+       */
+      gimp_projection_add_update_area (proj,
+                                       bounding_box.x,     bounding_box.y,
+                                       bounding_box.width, bounding_box.height);
+      proj->priv->invalidate_preview = TRUE;
+      gimp_projection_flush (proj);
+    }
+
+  return proj->priv->buffer;
+}
+
+static gboolean
+gimp_projection_get_pixel_at (GimpPickable *pickable,
+                              gint          x,
+                              gint          y,
+                              const Babl   *format,
+                              gpointer      pixel)
+{
+  GimpProjection *proj   = GIMP_PROJECTION (pickable);
+  GeglBuffer     *buffer = gimp_projection_get_buffer (pickable);
+  GeglRectangle   bounding_box;
+
+  bounding_box = gimp_projectable_get_bounding_box (proj->priv->projectable);
+
+  if (x <  bounding_box.x                      ||
+      y <  bounding_box.y                      ||
+      x >= bounding_box.x + bounding_box.width ||
+      y >= bounding_box.y + bounding_box.height)
+    {
+      return FALSE;
+    }
+
+  gegl_buffer_sample (buffer, x, y, NULL, pixel, format,
+                      GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+  return TRUE;
+}
+
+static gdouble
+gimp_projection_get_opacity_at (GimpPickable *pickable,
+                                gint          x,
+                                gint          y)
+{
+  return GIMP_OPACITY_OPAQUE;
+}
+
+static void
+gimp_projection_get_pixel_average (GimpPickable        *pickable,
+                                   const GeglRectangle *rect,
+                                   const Babl          *format,
+                                   gpointer             pixel)
+{
+  GeglBuffer *buffer = gimp_projection_get_buffer (pickable);
+
+  return gimp_gegl_average_color (buffer, rect, TRUE, GEGL_ABYSS_NONE, format,
+                                  pixel);
+}
+
+static void
+gimp_projection_pixel_to_srgb (GimpPickable *pickable,
+                               const Babl   *format,
+                               gpointer      pixel,
+                               GimpRGB      *color)
+{
+  GimpProjection *proj  = GIMP_PROJECTION (pickable);
+  GimpImage      *image = gimp_projectable_get_image (proj->priv->projectable);
+
+  gimp_pickable_pixel_to_srgb (GIMP_PICKABLE (image), format, pixel, color);
+}
+
+static void
+gimp_projection_srgb_to_pixel (GimpPickable  *pickable,
+                               const GimpRGB *color,
+                               const Babl    *format,
+                               gpointer       pixel)
+{
+  GimpProjection *proj  = GIMP_PROJECTION (pickable);
+  GimpImage      *image = gimp_projectable_get_image (proj->priv->projectable);
+
+  gimp_pickable_srgb_to_pixel (GIMP_PICKABLE (image), color, format, pixel);
+}
+
+
+/*  public functions  */
+
+GimpProjection *
+gimp_projection_new (GimpProjectable *projectable)
+{
+  GimpProjection *proj;
+
+  g_return_val_if_fail (GIMP_IS_PROJECTABLE (projectable), NULL);
+
+  proj = g_object_new (GIMP_TYPE_PROJECTION, NULL);
+
+  proj->priv->projectable = projectable;
+
+  g_signal_connect_object (projectable, "invalidate",
+                           G_CALLBACK (gimp_projection_projectable_invalidate),
+                           proj, 0);
+  g_signal_connect_object (projectable, "flush",
+                           G_CALLBACK (gimp_projection_projectable_flush),
+                           proj, 0);
+  g_signal_connect_object (projectable, "structure-changed",
+                           G_CALLBACK (gimp_projection_projectable_structure_changed),
+                           proj, 0);
+  g_signal_connect_object (projectable, "bounds-changed",
+                           G_CALLBACK (gimp_projection_projectable_bounds_changed),
+                           proj, 0);
+
+  return proj;
+}
+
+void
+gimp_projection_set_priority (GimpProjection *proj,
+                              gint            priority)
+{
+  g_return_if_fail (GIMP_IS_PROJECTION (proj));
+
+  proj->priv->priority = priority;
+}
+
+gint
+gimp_projection_get_priority (GimpProjection *proj)
+{
+  g_return_val_if_fail (GIMP_IS_PROJECTION (proj), 0);
+
+  return proj->priv->priority;
+}
+
+void
+gimp_projection_set_priority_rect (GimpProjection *proj,
+                                   gint            x,
+                                   gint            y,
+                                   gint            w,
+                                   gint            h)
+{
+  g_return_if_fail (GIMP_IS_PROJECTION (proj));
+
+  proj->priv->priority_rect = *GEGL_RECTANGLE (x, y, w, h);
+
+  gimp_projection_update_priority_rect (proj);
+}
+
+void
+gimp_projection_stop_rendering (GimpProjection *proj)
+{
+  g_return_if_fail (GIMP_IS_PROJECTION (proj));
+
+  gimp_projection_chunk_render_stop (proj, TRUE);
+}
+
+void
+gimp_projection_flush (GimpProjection *proj)
+{
+  g_return_if_fail (GIMP_IS_PROJECTION (proj));
+
+  /* Construct in chunks */
+  gimp_projection_flush_whenever (proj, FALSE, FALSE);
+}
+
+void
+gimp_projection_flush_now (GimpProjection *proj,
+                           gboolean        direct)
+{
+  g_return_if_fail (GIMP_IS_PROJECTION (proj));
+
+  /* Construct NOW */
+  gimp_projection_flush_whenever (proj, TRUE, direct);
+}
+
+void
+gimp_projection_finish_draw (GimpProjection *proj)
+{
+  g_return_if_fail (GIMP_IS_PROJECTION (proj));
+
+  if (proj->priv->iter)
+    {
+      gimp_chunk_iterator_set_priority_rect (proj->priv->iter, NULL);
+
+      gimp_tile_handler_validate_begin_validate (proj->priv->validate_handler);
+
+      while (gimp_projection_chunk_render_iteration (proj));
+
+      gimp_tile_handler_validate_end_validate (proj->priv->validate_handler);
+
+      gimp_projection_chunk_render_stop (proj, FALSE);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_projection_allocate_buffer (GimpProjection *proj)
+{
+  const Babl    *format;
+  GeglRectangle  bounding_box;
+
+  if (proj->priv->buffer)
+    return;
+
+  format       = gimp_projection_get_format (GIMP_PICKABLE (proj));
+  bounding_box =
+    gimp_projectable_get_bounding_box (proj->priv->projectable);
+
+  proj->priv->buffer = gegl_buffer_new (&bounding_box, format);
+
+  proj->priv->validate_handler =
+    GIMP_TILE_HANDLER_VALIDATE (
+      gimp_tile_handler_projectable_new (proj->priv->projectable));
+
+  gimp_tile_handler_validate_assign (proj->priv->validate_handler,
+                                     proj->priv->buffer);
+
+  g_object_notify (G_OBJECT (proj), "buffer");
+}
+
+static void
+gimp_projection_free_buffer (GimpProjection  *proj)
+{
+  gimp_projection_chunk_render_stop (proj, FALSE);
+
+  g_clear_pointer (&proj->priv->update_region, cairo_region_destroy);
+
+  if (proj->priv->buffer)
+    {
+      gimp_tile_handler_validate_unassign (proj->priv->validate_handler,
+                                           proj->priv->buffer);
+
+      g_clear_object (&proj->priv->buffer);
+      g_clear_object (&proj->priv->validate_handler);
+
+      g_object_notify (G_OBJECT (proj), "buffer");
+    }
+}
+
+static void
+gimp_projection_add_update_area (GimpProjection *proj,
+                                 gint            x,
+                                 gint            y,
+                                 gint            w,
+                                 gint            h)
+{
+  cairo_rectangle_int_t rect;
+  GeglRectangle         bounding_box;
+
+  bounding_box = gimp_projectable_get_bounding_box (proj->priv->projectable);
+
+  /*  align the rectangle to the UPDATE_CHUNK_WIDTH x UPDATE_CHUNK_HEIGHT grid,
+   *  to decrease the complexity of the update area.
+   */
+  w = ceil  ((gdouble) (x + w) / GIMP_PROJECTION_UPDATE_CHUNK_WIDTH ) * GIMP_PROJECTION_UPDATE_CHUNK_WIDTH;
+  h = ceil  ((gdouble) (y + h) / GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT) * GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT;
+  x = floor ((gdouble) x       / GIMP_PROJECTION_UPDATE_CHUNK_WIDTH ) * GIMP_PROJECTION_UPDATE_CHUNK_WIDTH;
+  y = floor ((gdouble) y       / GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT) * GIMP_PROJECTION_UPDATE_CHUNK_HEIGHT;
+
+  w -= x;
+  h -= y;
+
+  if (gegl_rectangle_intersect ((GeglRectangle *) &rect,
+                                GEGL_RECTANGLE (x, y, w, h), &bounding_box))
+    {
+      if (proj->priv->update_region)
+        cairo_region_union_rectangle (proj->priv->update_region, &rect);
+      else
+        proj->priv->update_region = cairo_region_create_rectangle (&rect);
+    }
+}
+
+static void
+gimp_projection_flush_whenever (GimpProjection *proj,
+                                gboolean        now,
+                                gboolean        direct)
+{
+  if (proj->priv->update_region)
+    {
+      /* Make sure we have a buffer */
+      gimp_projection_allocate_buffer (proj);
+
+      if (now)  /* Synchronous */
+        {
+          gint n_rects = cairo_region_num_rectangles (proj->priv->update_region);
+          gint i;
+
+          for (i = 0; i < n_rects; i++)
+            {
+              cairo_rectangle_int_t rect;
+
+              cairo_region_get_rectangle (proj->priv->update_region,
+                                          i, &rect);
+
+              gimp_projection_paint_area (proj,
+                                          direct,
+                                          rect.x,
+                                          rect.y,
+                                          rect.width,
+                                          rect.height);
+            }
+
+          /*  Free the update region  */
+          g_clear_pointer (&proj->priv->update_region, cairo_region_destroy);
+        }
+      else  /* Asynchronous */
+        {
+          /*  Consumes the update region  */
+          gimp_projection_chunk_render_start (proj);
+        }
+    }
+  else if (! now && ! proj->priv->iter && proj->priv->invalidate_preview)
+    {
+      /* invalidate the preview here since it is constructed from
+       * the projection
+       */
+      proj->priv->invalidate_preview = FALSE;
+
+      gimp_projectable_invalidate_preview (proj->priv->projectable);
+    }
+}
+
+static void
+gimp_projection_update_priority_rect (GimpProjection *proj)
+{
+  if (proj->priv->iter)
+    {
+      GeglRectangle rect;
+      GeglRectangle bounding_box;
+      gint          off_x, off_y;
+
+      rect = proj->priv->priority_rect;
+
+      gimp_projectable_get_offset (proj->priv->projectable, &off_x, &off_y);
+      bounding_box = gimp_projectable_get_bounding_box (proj->priv->projectable);
+
+      /*  subtract the projectable's offsets because the list of update
+       *  areas is in tile-pyramid coordinates, but our external API is
+       *  always in terms of image coordinates.
+       */
+      rect.x -= off_x;
+      rect.y -= off_y;
+
+      gegl_rectangle_intersect (&rect, &rect, &bounding_box);
+
+      gimp_chunk_iterator_set_priority_rect (proj->priv->iter, &rect);
+    }
+}
+
+static void
+gimp_projection_chunk_render_start (GimpProjection *proj)
+{
+  cairo_region_t *region             = proj->priv->update_region;
+  gboolean        invalidate_preview = FALSE;
+
+  if (proj->priv->iter)
+    {
+      region = gimp_chunk_iterator_stop (proj->priv->iter, FALSE);
+
+      proj->priv->iter = NULL;
+
+      if (cairo_region_is_empty (region))
+        invalidate_preview = proj->priv->invalidate_preview;
+
+      if (proj->priv->update_region)
+        {
+          cairo_region_union (region, proj->priv->update_region);
+
+          cairo_region_destroy (proj->priv->update_region);
+        }
+    }
+
+  proj->priv->update_region = NULL;
+
+  if (region && ! cairo_region_is_empty (region))
+    {
+      proj->priv->iter = gimp_chunk_iterator_new (region);
+
+      gimp_projection_update_priority_rect (proj);
+
+      if (! proj->priv->idle_id)
+        {
+          proj->priv->idle_id = g_idle_add_full (
+            GIMP_PRIORITY_PROJECTION_IDLE + proj->priv->priority,
+            (GSourceFunc) gimp_projection_chunk_render_callback,
+            proj, NULL);
+        }
+    }
+  else
+    {
+      if (region)
+        cairo_region_destroy (region);
+
+      if (proj->priv->idle_id)
+        {
+          g_source_remove (proj->priv->idle_id);
+          proj->priv->idle_id = 0;
+        }
+
+      if (invalidate_preview)
+        {
+          /* invalidate the preview here since it is constructed from
+           * the projection
+           */
+          proj->priv->invalidate_preview = FALSE;
+
+          gimp_projectable_invalidate_preview (proj->priv->projectable);
+        }
+    }
+}
+
+static void
+gimp_projection_chunk_render_stop (GimpProjection *proj,
+                                   gboolean        merge)
+{
+  if (proj->priv->idle_id)
+    {
+      g_source_remove (proj->priv->idle_id);
+      proj->priv->idle_id = 0;
+    }
+
+  if (proj->priv->iter)
+    {
+      if (merge)
+        {
+          cairo_region_t *region;
+
+          region = gimp_chunk_iterator_stop (proj->priv->iter, FALSE);
+
+          if (proj->priv->update_region)
+            {
+              cairo_region_union (proj->priv->update_region, region);
+
+              cairo_region_destroy (region);
+            }
+          else
+            {
+              proj->priv->update_region = region;
+            }
+        }
+      else
+        {
+          gimp_chunk_iterator_stop (proj->priv->iter, TRUE);
+        }
+
+      proj->priv->iter = NULL;
+    }
+}
+
+static gboolean
+gimp_projection_chunk_render_callback (GimpProjection *proj)
+{
+  if (gimp_projection_chunk_render_iteration (proj))
+    {
+      return G_SOURCE_CONTINUE;
+    }
+  else
+    {
+      proj->priv->idle_id = 0;
+
+      return G_SOURCE_REMOVE;
+    }
+}
+
+static gboolean
+gimp_projection_chunk_render_iteration (GimpProjection *proj)
+{
+  if (gimp_chunk_iterator_next (proj->priv->iter))
+    {
+      GeglRectangle rect;
+
+      gimp_tile_handler_validate_begin_validate (proj->priv->validate_handler);
+
+      while (gimp_chunk_iterator_get_rect (proj->priv->iter, &rect))
+        {
+          gimp_projection_paint_area (proj, TRUE,
+                                      rect.x, rect.y, rect.width, rect.height);
+        }
+
+      gimp_tile_handler_validate_end_validate (proj->priv->validate_handler);
+
+      /* Still work to do. */
+      return TRUE;
+    }
+  else
+    {
+      proj->priv->iter = NULL;
+
+      if (proj->priv->invalidate_preview)
+        {
+          /* invalidate the preview here since it is constructed from
+           * the projection
+           */
+          proj->priv->invalidate_preview = FALSE;
+
+          gimp_projectable_invalidate_preview (proj->priv->projectable);
+        }
+
+      /* FINISHED */
+      return FALSE;
+    }
+}
+
+static void
+gimp_projection_paint_area (GimpProjection *proj,
+                            gboolean        now,
+                            gint            x,
+                            gint            y,
+                            gint            w,
+                            gint            h)
+{
+  gint          off_x, off_y;
+  GeglRectangle bounding_box;
+  GeglRectangle rect;
+
+  gimp_projectable_get_offset (proj->priv->projectable, &off_x, &off_y);
+  bounding_box = gimp_projectable_get_bounding_box (proj->priv->projectable);
+
+  if (gegl_rectangle_intersect (&rect,
+                                GEGL_RECTANGLE (x, y, w, h), &bounding_box))
+    {
+      if (now)
+        {
+          gimp_tile_handler_validate_validate (
+            proj->priv->validate_handler,
+            proj->priv->buffer,
+            &rect,
+            FALSE, FALSE);
+        }
+      else
+        {
+          gimp_tile_handler_validate_invalidate (
+            proj->priv->validate_handler,
+            &rect);
+        }
+
+      /*  add the projectable's offsets because the list of update areas
+       *  is in tile-pyramid coordinates, but our external API is always
+       *  in terms of image coordinates.
+       */
+      g_signal_emit (proj, projection_signals[UPDATE], 0,
+                     now,
+                     rect.x + off_x,
+                     rect.y + off_y,
+                     rect.width,
+                     rect.height);
+    }
+}
+
+
+/*  image callbacks  */
+
+static void
+gimp_projection_projectable_invalidate (GimpProjectable *projectable,
+                                        gint             x,
+                                        gint             y,
+                                        gint             w,
+                                        gint             h,
+                                        GimpProjection  *proj)
+{
+  gint off_x, off_y;
+
+  gimp_projectable_get_offset (proj->priv->projectable, &off_x, &off_y);
+
+  /*  subtract the projectable's offsets because the list of update
+   *  areas is in tile-pyramid coordinates, but our external API is
+   *  always in terms of image coordinates.
+   */
+  x -= off_x;
+  y -= off_y;
+
+  gimp_projection_add_update_area (proj, x, y, w, h);
+}
+
+static void
+gimp_projection_projectable_flush (GimpProjectable *projectable,
+                                   gboolean         invalidate_preview,
+                                   GimpProjection  *proj)
+{
+  if (invalidate_preview)
+    proj->priv->invalidate_preview = TRUE;
+
+  gimp_projection_flush (proj);
+}
+
+static void
+gimp_projection_projectable_structure_changed (GimpProjectable *projectable,
+                                               GimpProjection  *proj)
+{
+  GeglRectangle bounding_box;
+
+  gimp_projection_free_buffer (proj);
+
+  bounding_box = gimp_projectable_get_bounding_box (projectable);
+
+  gimp_projection_add_update_area (proj,
+                                   bounding_box.x,     bounding_box.y,
+                                   bounding_box.width, bounding_box.height);
+}
+
+static void
+gimp_projection_projectable_bounds_changed (GimpProjectable *projectable,
+                                            gint             old_x,
+                                            gint             old_y,
+                                            GimpProjection  *proj)
+{
+  GeglBuffer              *old_buffer = proj->priv->buffer;
+  GimpTileHandlerValidate *old_validate_handler;
+  GeglRectangle            old_bounding_box;
+  GeglRectangle            bounding_box;
+  GeglRectangle            old_bounds;
+  GeglRectangle            bounds;
+  GeglRectangle            int_bounds;
+  gint                     x, y;
+  gint                     dx, dy;
+
+  if (! old_buffer)
+    {
+      gimp_projection_projectable_structure_changed (projectable, proj);
+
+      return;
+    }
+
+  old_bounding_box = *gegl_buffer_get_extent (old_buffer);
+
+  gimp_projectable_get_offset (projectable, &x, &y);
+  bounding_box = gimp_projectable_get_bounding_box (projectable);
+
+  if (x == old_x && y == old_y &&
+      gegl_rectangle_equal (&bounding_box, &old_bounding_box))
+    {
+      return;
+    }
+
+  old_bounds    = old_bounding_box;
+  old_bounds.x += old_x;
+  old_bounds.y += old_y;
+
+  bounds        = bounding_box;
+  bounds.x     += x;
+  bounds.y     += y;
+
+  if (! gegl_rectangle_intersect (&int_bounds, &bounds, &old_bounds))
+    {
+      gimp_projection_projectable_structure_changed (projectable, proj);
+
+      return;
+    }
+
+  dx = x - old_x;
+  dy = y - old_y;
+
+#if 1
+  /* FIXME:  when there's an offset between the new bounds and the old bounds,
+   * use gimp_projection_projectable_structure_changed(), instead of copying a
+   * shifted version of the old buffer, since the synchronous copy can take a
+   * notable amount of time for big buffers, when the offset is such that tiles
+   * are not COW-ed.  while gimp_projection_projectable_structure_changed()
+   * causes the projection to be re-rendered, which is overall slower, it's
+   * done asynchronously.
+   *
+   * this needs to be improved.
+   */
+  if (dx || dy)
+    {
+      gimp_projection_projectable_structure_changed (projectable, proj);
+
+      return;
+    }
+#endif
+
+  /* reallocate the buffer, and copy the old buffer to the corresponding
+   * region of the new buffer.
+   */
+
+  gimp_projection_chunk_render_stop (proj, TRUE);
+
+  if (dx == 0 && dy == 0)
+    {
+      gimp_tile_handler_validate_buffer_set_extent (old_buffer, &bounding_box);
+    }
+  else
+    {
+      old_validate_handler = proj->priv->validate_handler;
+
+      proj->priv->buffer           = NULL;
+      proj->priv->validate_handler = NULL;
+
+      gimp_projection_allocate_buffer (proj);
+
+      gimp_tile_handler_validate_buffer_copy (
+        old_buffer,
+        GEGL_RECTANGLE (int_bounds.x - old_x,
+                        int_bounds.y - old_y,
+                        int_bounds.width,
+                        int_bounds.height),
+        proj->priv->buffer,
+        GEGL_RECTANGLE (int_bounds.x - x,
+                        int_bounds.y - y,
+                        int_bounds.width,
+                        int_bounds.height));
+
+      gimp_tile_handler_validate_unassign (old_validate_handler,
+                                           old_buffer);
+
+      g_object_unref (old_validate_handler);
+      g_object_unref (old_buffer);
+    }
+
+  if (proj->priv->update_region)
+    {
+      cairo_region_translate (proj->priv->update_region, dx, dy);
+      cairo_region_intersect_rectangle (
+        proj->priv->update_region,
+        (const cairo_rectangle_int_t *) &bounding_box);
+    }
+
+  int_bounds.x -= x;
+  int_bounds.y -= y;
+
+  if (int_bounds.x > bounding_box.x)
+    {
+      gimp_projection_add_update_area (proj,
+                                       bounding_box.x,
+                                       bounding_box.y,
+                                       int_bounds.x - bounding_box.x,
+                                       bounding_box.height);
+    }
+  if (int_bounds.y > bounding_box.y)
+    {
+      gimp_projection_add_update_area (proj,
+                                       bounding_box.x,
+                                       bounding_box.y,
+                                       bounding_box.width,
+                                       int_bounds.y - bounding_box.y);
+    }
+  if (int_bounds.x + int_bounds.width < bounding_box.x + bounding_box.width)
+    {
+      gimp_projection_add_update_area (proj,
+                                       int_bounds.x + int_bounds.width,
+                                       bounding_box.y,
+                                       bounding_box.x + bounding_box.width -
+                                       (int_bounds.x  + int_bounds.width),
+                                       bounding_box.height);
+    }
+  if (int_bounds.y + int_bounds.height < bounding_box.y + bounding_box.height)
+    {
+      gimp_projection_add_update_area (proj,
+                                       bounding_box.x,
+                                       int_bounds.y + int_bounds.height,
+                                       bounding_box.width,
+                                       bounding_box.y + bounding_box.height -
+                                       (int_bounds.y  + int_bounds.height));
+    }
+
+  proj->priv->invalidate_preview = TRUE;
+}
diff --git a/app/core/gimpprojection.h b/app/core/gimpprojection.h
new file mode 100644
index 0000000..8c9baf6
--- /dev/null
+++ b/app/core/gimpprojection.h
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROJECTION_H__
+#define __GIMP_PROJECTION_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_PROJECTION            (gimp_projection_get_type ())
+#define GIMP_PROJECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROJECTION, GimpProjection))
+#define GIMP_PROJECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PROJECTION, GimpProjectionClass))
+#define GIMP_IS_PROJECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROJECTION))
+#define GIMP_IS_PROJECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PROJECTION))
+#define GIMP_PROJECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PROJECTION, GimpProjectionClass))
+
+
+typedef struct _GimpProjectionPrivate GimpProjectionPrivate;
+typedef struct _GimpProjectionClass   GimpProjectionClass;
+
+struct _GimpProjection
+{
+  GimpObject             parent_instance;
+
+  GimpProjectionPrivate *priv;
+};
+
+struct _GimpProjectionClass
+{
+  GimpObjectClass  parent_class;
+
+  void (* update) (GimpProjection *proj,
+                   gboolean        now,
+                   gint            x,
+                   gint            y,
+                   gint            width,
+                   gint            height);
+};
+
+
+GType            gimp_projection_get_type          (void) G_GNUC_CONST;
+
+GimpProjection * gimp_projection_new               (GimpProjectable   *projectable);
+
+void             gimp_projection_set_priority      (GimpProjection    *projection,
+                                                    gint               priority);
+gint             gimp_projection_get_priority      (GimpProjection    *projection);
+
+void             gimp_projection_set_priority_rect (GimpProjection    *proj,
+                                                    gint               x,
+                                                    gint               y,
+                                                    gint               width,
+                                                    gint               height);
+
+void             gimp_projection_stop_rendering    (GimpProjection    *proj);
+
+void             gimp_projection_flush             (GimpProjection    *proj);
+void             gimp_projection_flush_now         (GimpProjection    *proj,
+                                                    gboolean           direct);
+void             gimp_projection_finish_draw       (GimpProjection    *proj);
+
+gint64           gimp_projection_estimate_memsize  (GimpImageBaseType  type,
+                                                    GimpComponentType  component_type,
+                                                    gint               width,
+                                                    gint               height);
+
+
+#endif /*  __GIMP_PROJECTION_H__  */
diff --git a/app/core/gimpsamplepoint.c b/app/core/gimpsamplepoint.c
new file mode 100644
index 0000000..f0fe377
--- /dev/null
+++ b/app/core/gimpsamplepoint.c
@@ -0,0 +1,215 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpsamplepoint.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_POSITION_X,
+  PROP_POSITION_Y,
+  PROP_PICK_MODE
+};
+
+
+struct _GimpSamplePointPrivate
+{
+  gint              position_x;
+  gint              position_y;
+  GimpColorPickMode pick_mode;
+};
+
+
+static void   gimp_sample_point_get_property (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+static void   gimp_sample_point_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSamplePoint, gimp_sample_point,
+                            GIMP_TYPE_AUX_ITEM)
+
+
+static void
+gimp_sample_point_class_init (GimpSamplePointClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->get_property = gimp_sample_point_get_property;
+  object_class->set_property = gimp_sample_point_set_property;
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_POSITION_X,
+                        "position-x",
+                        NULL, NULL,
+                        GIMP_SAMPLE_POINT_POSITION_UNDEFINED,
+                        GIMP_MAX_IMAGE_SIZE,
+                        GIMP_SAMPLE_POINT_POSITION_UNDEFINED,
+                        0);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_POSITION_Y,
+                        "position-y",
+                        NULL, NULL,
+                        GIMP_SAMPLE_POINT_POSITION_UNDEFINED,
+                        GIMP_MAX_IMAGE_SIZE,
+                        GIMP_SAMPLE_POINT_POSITION_UNDEFINED,
+                        0);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PICK_MODE,
+                         "pick-mode",
+                         NULL, NULL,
+                         GIMP_TYPE_COLOR_PICK_MODE,
+                         GIMP_COLOR_PICK_MODE_PIXEL,
+                         0);
+}
+
+static void
+gimp_sample_point_init (GimpSamplePoint *sample_point)
+{
+  sample_point->priv = gimp_sample_point_get_instance_private (sample_point);
+}
+
+static void
+gimp_sample_point_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpSamplePoint *sample_point = GIMP_SAMPLE_POINT (object);
+
+  switch (property_id)
+    {
+    case PROP_POSITION_X:
+      g_value_set_int (value, sample_point->priv->position_x);
+      break;
+    case PROP_POSITION_Y:
+      g_value_set_int (value, sample_point->priv->position_y);
+      break;
+    case PROP_PICK_MODE:
+      g_value_set_enum (value, sample_point->priv->pick_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_sample_point_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpSamplePoint *sample_point = GIMP_SAMPLE_POINT (object);
+
+  switch (property_id)
+    {
+    case PROP_POSITION_X:
+      sample_point->priv->position_x = g_value_get_int (value);
+      break;
+    case PROP_POSITION_Y:
+      sample_point->priv->position_y = g_value_get_int (value);
+      break;
+    case PROP_PICK_MODE:
+      sample_point->priv->pick_mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GimpSamplePoint *
+gimp_sample_point_new (guint32 sample_point_ID)
+{
+  return g_object_new (GIMP_TYPE_SAMPLE_POINT,
+                       "id", sample_point_ID,
+                       NULL);
+}
+
+void
+gimp_sample_point_get_position (GimpSamplePoint *sample_point,
+                                gint            *position_x,
+                                gint            *position_y)
+{
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+  g_return_if_fail (position_x != NULL);
+  g_return_if_fail (position_y != NULL);
+
+  *position_x = sample_point->priv->position_x;
+  *position_y = sample_point->priv->position_y;
+}
+
+void
+gimp_sample_point_set_position (GimpSamplePoint *sample_point,
+                                gint             position_x,
+                                gint             position_y)
+{
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  if (sample_point->priv->position_x != position_x ||
+      sample_point->priv->position_y != position_y)
+    {
+      sample_point->priv->position_x = position_x;
+      sample_point->priv->position_y = position_y;
+
+      g_object_freeze_notify (G_OBJECT (sample_point));
+
+      g_object_notify (G_OBJECT (sample_point), "position-x");
+      g_object_notify (G_OBJECT (sample_point), "position-y");
+
+      g_object_thaw_notify (G_OBJECT (sample_point));
+    }
+}
+
+GimpColorPickMode
+gimp_sample_point_get_pick_mode (GimpSamplePoint *sample_point)
+{
+  g_return_val_if_fail (GIMP_IS_SAMPLE_POINT (sample_point),
+                        GIMP_COLOR_PICK_MODE_PIXEL);
+
+  return sample_point->priv->pick_mode;
+}
+
+void
+gimp_sample_point_set_pick_mode (GimpSamplePoint   *sample_point,
+                                 GimpColorPickMode  pick_mode)
+{
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  if (sample_point->priv->pick_mode != pick_mode)
+    {
+      sample_point->priv->pick_mode = pick_mode;
+
+      g_object_notify (G_OBJECT (sample_point), "pick-mode");
+    }
+}
diff --git a/app/core/gimpsamplepoint.h b/app/core/gimpsamplepoint.h
new file mode 100644
index 0000000..dddd328
--- /dev/null
+++ b/app/core/gimpsamplepoint.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SAMPLE_POINT_H__
+#define __GIMP_SAMPLE_POINT_H__
+
+
+#include "gimpauxitem.h"
+
+
+#define GIMP_SAMPLE_POINT_POSITION_UNDEFINED G_MININT
+
+
+#define GIMP_TYPE_SAMPLE_POINT            (gimp_sample_point_get_type ())
+#define GIMP_SAMPLE_POINT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SAMPLE_POINT, GimpSamplePoint))
+#define GIMP_SAMPLE_POINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SAMPLE_POINT, GimpSamplePointClass))
+#define GIMP_IS_SAMPLE_POINT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SAMPLE_POINT))
+#define GIMP_IS_SAMPLE_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SAMPLE_POINT))
+#define GIMP_SAMPLE_POINT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SAMPLE_POINT, GimpSamplePointClass))
+
+
+typedef struct _GimpSamplePointPrivate GimpSamplePointPrivate;
+typedef struct _GimpSamplePointClass   GimpSamplePointClass;
+
+struct _GimpSamplePoint
+{
+  GimpAuxItem             parent_instance;
+
+  GimpSamplePointPrivate *priv;
+};
+
+struct _GimpSamplePointClass
+{
+  GimpAuxItemClass  parent_class;
+};
+
+
+GType             gimp_sample_point_get_type      (void) G_GNUC_CONST;
+
+GimpSamplePoint * gimp_sample_point_new           (guint32            sample_point_ID);
+
+void              gimp_sample_point_get_position  (GimpSamplePoint   *sample_point,
+                                                   gint              *position_x,
+                                                   gint              *position_y);
+void              gimp_sample_point_set_position  (GimpSamplePoint   *sample_point,
+                                                   gint               position_x,
+                                                   gint               position_y);
+
+GimpColorPickMode gimp_sample_point_get_pick_mode (GimpSamplePoint   *sample_point);
+void              gimp_sample_point_set_pick_mode (GimpSamplePoint   *sample_point,
+                                                   GimpColorPickMode  pick_mode);
+
+
+#endif /* __GIMP_SAMPLE_POINT_H__ */
diff --git a/app/core/gimpsamplepointundo.c b/app/core/gimpsamplepointundo.c
new file mode 100644
index 0000000..89cd8ae
--- /dev/null
+++ b/app/core/gimpsamplepointundo.c
@@ -0,0 +1,121 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimpimage-sample-points.h"
+#include "gimpsamplepoint.h"
+#include "gimpsamplepointundo.h"
+
+
+static void   gimp_sample_point_undo_constructed  (GObject             *object);
+
+static void   gimp_sample_point_undo_pop          (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode,
+                                                   GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpSamplePointUndo, gimp_sample_point_undo,
+               GIMP_TYPE_AUX_ITEM_UNDO)
+
+#define parent_class gimp_sample_point_undo_parent_class
+
+
+static void
+gimp_sample_point_undo_class_init (GimpSamplePointUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_sample_point_undo_constructed;
+
+  undo_class->pop           = gimp_sample_point_undo_pop;
+}
+
+static void
+gimp_sample_point_undo_init (GimpSamplePointUndo *undo)
+{
+}
+
+static void
+gimp_sample_point_undo_constructed (GObject *object)
+{
+  GimpSamplePointUndo *sample_point_undo = GIMP_SAMPLE_POINT_UNDO (object);
+  GimpSamplePoint     *sample_point;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  sample_point = GIMP_SAMPLE_POINT (GIMP_AUX_ITEM_UNDO (object)->aux_item);
+
+  gimp_assert (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  gimp_sample_point_get_position (sample_point,
+                                  &sample_point_undo->x,
+                                  &sample_point_undo->y);
+  sample_point_undo->pick_mode = gimp_sample_point_get_pick_mode (sample_point);
+}
+
+static void
+gimp_sample_point_undo_pop (GimpUndo              *undo,
+                            GimpUndoMode           undo_mode,
+                            GimpUndoAccumulator   *accum)
+{
+  GimpSamplePointUndo *sample_point_undo = GIMP_SAMPLE_POINT_UNDO (undo);
+  GimpSamplePoint     *sample_point;
+  gint                 x;
+  gint                 y;
+  GimpColorPickMode    pick_mode;
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  sample_point = GIMP_SAMPLE_POINT (GIMP_AUX_ITEM_UNDO (undo)->aux_item);
+
+  gimp_sample_point_get_position (sample_point, &x, &y);
+  pick_mode = gimp_sample_point_get_pick_mode (sample_point);
+
+  if (x == GIMP_SAMPLE_POINT_POSITION_UNDEFINED)
+    {
+      gimp_image_add_sample_point (undo->image,
+                                   sample_point,
+                                   sample_point_undo->x,
+                                   sample_point_undo->y);
+    }
+  else if (sample_point_undo->x == GIMP_SAMPLE_POINT_POSITION_UNDEFINED)
+    {
+      gimp_image_remove_sample_point (undo->image, sample_point, FALSE);
+    }
+  else
+    {
+      gimp_sample_point_set_position (sample_point,
+                                      sample_point_undo->x,
+                                      sample_point_undo->y);
+      gimp_sample_point_set_pick_mode (sample_point,
+                                       sample_point_undo->pick_mode);
+
+      gimp_image_sample_point_moved (undo->image, sample_point);
+    }
+
+  sample_point_undo->x         = x;
+  sample_point_undo->y         = y;
+  sample_point_undo->pick_mode = pick_mode;
+}
diff --git a/app/core/gimpsamplepointundo.h b/app/core/gimpsamplepointundo.h
new file mode 100644
index 0000000..10a3e90
--- /dev/null
+++ b/app/core/gimpsamplepointundo.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SAMPLE_POINT_UNDO_H__
+#define __GIMP_SAMPLE_POINT_UNDO_H__
+
+
+#include "gimpauxitemundo.h"
+
+
+#define GIMP_TYPE_SAMPLE_POINT_UNDO            (gimp_sample_point_undo_get_type ())
+#define GIMP_SAMPLE_POINT_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SAMPLE_POINT_UNDO, GimpSamplePointUndo))
+#define GIMP_SAMPLE_POINT_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SAMPLE_POINT_UNDO, GimpSamplePointUndoClass))
+#define GIMP_IS_SAMPLE_POINT_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SAMPLE_POINT_UNDO))
+#define GIMP_IS_SAMPLE_POINT_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SAMPLE_POINT_UNDO))
+#define GIMP_SAMPLE_POINT_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SAMPLE_POINT_UNDO, GimpSamplePointUndoClass))
+
+
+typedef struct _GimpSamplePointUndo      GimpSamplePointUndo;
+typedef struct _GimpSamplePointUndoClass GimpSamplePointUndoClass;
+
+struct _GimpSamplePointUndo
+{
+  GimpAuxItemUndo    parent_instance;
+
+  gint               x;
+  gint               y;
+  GimpColorPickMode  pick_mode;
+};
+
+struct _GimpSamplePointUndoClass
+{
+  GimpAuxItemUndoClass  parent_class;
+};
+
+
+GType   gimp_sample_point_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_SAMPLE_POINT_UNDO_H__ */
diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c
new file mode 100644
index 0000000..ed5859c
--- /dev/null
+++ b/app/core/gimpscanconvert.c
@@ -0,0 +1,647 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include <cairo.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimpboundary.h"
+#include "gimpbezierdesc.h"
+#include "gimpscanconvert.h"
+
+
+struct _GimpScanConvert
+{
+  gdouble         ratio_xy;
+
+  gboolean        clip;
+  gint            clip_x;
+  gint            clip_y;
+  gint            clip_w;
+  gint            clip_h;
+
+  /* stroking options */
+  gboolean        do_stroke;
+  gdouble         width;
+  GimpJoinStyle   join;
+  GimpCapStyle    cap;
+  gdouble         miter;
+  gdouble         dash_offset;
+  GArray         *dash_info;
+
+  GArray         *path_data;
+};
+
+
+/*  public functions  */
+
+/**
+ * gimp_scan_convert_new:
+ *
+ * Create a new scan conversion context.
+ *
+ * Return value: a newly allocated #GimpScanConvert context.
+ */
+GimpScanConvert *
+gimp_scan_convert_new (void)
+{
+  GimpScanConvert *sc = g_slice_new0 (GimpScanConvert);
+
+  sc->path_data = g_array_new (FALSE, FALSE, sizeof (cairo_path_data_t));
+  sc->ratio_xy = 1.0;
+
+  return sc;
+}
+
+GimpScanConvert *
+gimp_scan_convert_new_from_boundary (const GimpBoundSeg *bound_segs,
+                                     gint                n_bound_segs,
+                                     gint                offset_x,
+                                     gint                offset_y)
+{
+  g_return_val_if_fail (bound_segs == NULL || n_bound_segs != 0, NULL);
+
+  if (bound_segs)
+    {
+      GimpBoundSeg *stroke_segs;
+      gint          n_stroke_segs;
+
+      stroke_segs = gimp_boundary_sort (bound_segs, n_bound_segs,
+                                        &n_stroke_segs);
+
+      if (stroke_segs)
+        {
+          GimpBezierDesc *bezier;
+
+          bezier = gimp_bezier_desc_new_from_bound_segs (stroke_segs,
+                                                         n_bound_segs,
+                                                         n_stroke_segs);
+
+          g_free (stroke_segs);
+
+          if (bezier)
+            {
+              GimpScanConvert *scan_convert;
+
+              scan_convert = gimp_scan_convert_new ();
+
+              gimp_bezier_desc_translate (bezier, offset_x, offset_y);
+              gimp_scan_convert_add_bezier (scan_convert, bezier);
+
+              gimp_bezier_desc_free (bezier);
+
+              return scan_convert;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+/**
+ * gimp_scan_convert_free:
+ * @sc: a #GimpScanConvert context
+ *
+ * Frees the resources allocated for @sc.
+ */
+void
+gimp_scan_convert_free (GimpScanConvert *sc)
+{
+  g_return_if_fail (sc != NULL);
+
+  if (sc->path_data)
+    g_array_free (sc->path_data, TRUE);
+
+  if (sc->dash_info)
+    g_array_free (sc->dash_info, TRUE);
+
+  g_slice_free (GimpScanConvert, sc);
+}
+
+/**
+ * gimp_scan_convert_set_pixel_ratio:
+ * @sc:       a #GimpScanConvert context
+ * @ratio_xy: the aspect ratio of the major coordinate axes
+ *
+ * Sets the pixel aspect ratio.
+ */
+void
+gimp_scan_convert_set_pixel_ratio (GimpScanConvert *sc,
+                                   gdouble          ratio_xy)
+{
+  g_return_if_fail (sc != NULL);
+
+  /* we only need the relative resolution */
+  sc->ratio_xy = ratio_xy;
+}
+
+/**
+ * gimp_scan_convert_set_clip_rectangle
+ * @sc:     a #GimpScanConvert context
+ * @x:      horizontal offset of clip rectangle
+ * @y:      vertical offset of clip rectangle
+ * @width:  width of clip rectangle
+ * @height: height of clip rectangle
+ *
+ * Sets a clip rectangle on @sc. Subsequent render operations will be
+ * restricted to this area.
+ */
+void
+gimp_scan_convert_set_clip_rectangle (GimpScanConvert *sc,
+                                      gint             x,
+                                      gint             y,
+                                      gint             width,
+                                      gint             height)
+{
+  g_return_if_fail (sc != NULL);
+
+  sc->clip   = TRUE;
+  sc->clip_x = x;
+  sc->clip_y = y;
+  sc->clip_w = width;
+  sc->clip_h = height;
+}
+
+/**
+ * gimp_scan_convert_add_polyline:
+ * @sc:       a #GimpScanConvert context
+ * @n_points: number of points to add
+ * @points:   array of points to add
+ * @closed:   whether to close the polyline and make it a polygon
+ *
+ * Add a polyline with @n_points @points that may be open or closed.
+ *
+ * Please note that you should use gimp_scan_convert_stroke() if you
+ * specify open polygons.
+ */
+void
+gimp_scan_convert_add_polyline (GimpScanConvert   *sc,
+                                guint              n_points,
+                                const GimpVector2 *points,
+                                gboolean           closed)
+{
+  GimpVector2        prev = { 0.0, 0.0, };
+  cairo_path_data_t  pd;
+  gint               i;
+
+  g_return_if_fail (sc != NULL);
+  g_return_if_fail (points != NULL);
+  g_return_if_fail (n_points > 0);
+
+  for (i = 0; i < n_points; i++)
+    {
+      /* compress multiple identical coordinates */
+      if (i == 0 ||
+          prev.x != points[i].x ||
+          prev.y != points[i].y)
+        {
+          pd.header.type = (i == 0) ? CAIRO_PATH_MOVE_TO : CAIRO_PATH_LINE_TO;
+          pd.header.length = 2;
+          sc->path_data = g_array_append_val (sc->path_data, pd);
+
+          pd.point.x = points[i].x;
+          pd.point.y = points[i].y;
+          sc->path_data = g_array_append_val (sc->path_data, pd);
+          prev = points[i];
+        }
+    }
+
+  /* close the polyline when needed */
+  if (closed)
+    {
+      pd.header.type = CAIRO_PATH_CLOSE_PATH;
+      pd.header.length = 1;
+      sc->path_data = g_array_append_val (sc->path_data, pd);
+    }
+}
+
+/**
+ * gimp_scan_convert_add_polyline:
+ * @sc:     a #GimpScanConvert context
+ * @bezier: a #GimpBezierDesc
+ *
+ * Adds a @bezier path to @sc.
+ *
+ * Please note that you should use gimp_scan_convert_stroke() if you
+ * specify open paths.
+ **/
+void
+gimp_scan_convert_add_bezier (GimpScanConvert       *sc,
+                              const GimpBezierDesc  *bezier)
+{
+  g_return_if_fail (sc != NULL);
+  g_return_if_fail (bezier != NULL);
+
+  sc->path_data = g_array_append_vals (sc->path_data,
+                                       bezier->data, bezier->num_data);
+}
+
+/**
+ * gimp_scan_convert_stroke:
+ * @sc:          a #GimpScanConvert context
+ * @width:       line width in pixels
+ * @join:        how lines should be joined
+ * @cap:         how to render the end of lines
+ * @miter:       convert a mitered join to a bevelled join if the miter would
+ *               extend to a distance of more than @miter times @width from
+ *               the actual join point
+ * @dash_offset: offset to apply on the dash pattern
+ * @dash_info:   dash pattern or %NULL for a solid line
+ *
+ * Stroke the content of a GimpScanConvert. The next
+ * gimp_scan_convert_render() will result in the outline of the
+ * polygon defined with the commands above.
+ *
+ * You cannot add additional polygons after this command.
+ *
+ * Note that if you have nonstandard resolution, "width" gives the
+ * width (in pixels) for a vertical stroke, i.e. use the X resolution
+ * to calculate the width of a stroke when operating with real world
+ * units.
+ */
+void
+gimp_scan_convert_stroke (GimpScanConvert *sc,
+                          gdouble          width,
+                          GimpJoinStyle    join,
+                          GimpCapStyle     cap,
+                          gdouble          miter,
+                          gdouble          dash_offset,
+                          GArray          *dash_info)
+{
+  sc->do_stroke = TRUE;
+  sc->width     = width;
+  sc->join      = join;
+  sc->cap       = cap;
+  sc->miter     = miter;
+
+  if (sc->dash_info)
+    {
+      g_array_free (sc->dash_info, TRUE);
+      sc->dash_info = NULL;
+    }
+
+  if (dash_info && dash_info->len >= 2)
+    {
+      gint          n_dashes;
+      gdouble      *dashes;
+      gint          i;
+
+      dash_offset = dash_offset * MAX (width, 1.0);
+
+      n_dashes = dash_info->len;
+      dashes = g_new (gdouble, dash_info->len);
+
+      for (i = 0; i < dash_info->len ; i++)
+        dashes[i] = MAX (width, 1.0) * g_array_index (dash_info, gdouble, i);
+
+      /* correct 0.0 in the first element (starts with a gap) */
+
+      if (dashes[0] == 0.0)
+        {
+          gdouble first;
+
+          first = dashes[1];
+
+          /* shift the pattern to really starts with a dash and
+           * use the offset to skip into it.
+           */
+          for (i = 0; i < dash_info->len - 2; i++)
+            {
+              dashes[i] = dashes[i+2];
+              dash_offset += dashes[i];
+            }
+
+          if (dash_info->len % 2 == 1)
+            {
+              dashes[dash_info->len - 2] = first;
+              n_dashes --;
+            }
+          else if (dash_info->len > 2)
+           {
+             dashes [dash_info->len - 3] += first;
+             n_dashes -= 2;
+           }
+        }
+
+      /* correct odd number of dash specifiers */
+
+      if (n_dashes % 2 == 1)
+        {
+          gdouble last;
+
+          last = dashes[n_dashes - 1];
+          dashes[0]   += last;
+          dash_offset += last;
+          n_dashes --;
+        }
+
+      if (n_dashes >= 2)
+        {
+          sc->dash_info = g_array_sized_new (FALSE, FALSE,
+                                             sizeof (gdouble), n_dashes);
+          sc->dash_info = g_array_append_vals (sc->dash_info, dashes, n_dashes);
+          sc->dash_offset = dash_offset;
+        }
+
+      g_free (dashes);
+    }
+}
+
+
+/**
+ * gimp_scan_convert_render:
+ * @sc:        a #GimpScanConvert context
+ * @buffer:    the #GeglBuffer to render to
+ * @off_x:     horizontal offset into the @buffer
+ * @off_y:     vertical offset into the @buffer
+ * @antialias: whether to apply antialiasiing
+ *
+ * This is a wrapper around gimp_scan_convert_render_full() that replaces the
+ * content of the @buffer with a rendered form of the path passed in.
+ *
+ * You cannot add additional polygons after this command.
+ */
+void
+gimp_scan_convert_render (GimpScanConvert *sc,
+                          GeglBuffer      *buffer,
+                          gint             off_x,
+                          gint             off_y,
+                          gboolean         antialias)
+{
+  gimp_scan_convert_render_full (sc, buffer, off_x, off_y,
+                                 TRUE, antialias, 1.0);
+}
+
+/**
+ * gimp_scan_convert_render_value:
+ * @sc:     a #GimpScanConvert context
+ * @buffer: the #GeglBuffer to render to
+ * @off_x:  horizontal offset into the @buffer
+ * @off_y:  vertical offset into the @buffer
+ * @value:  value to use for covered pixels
+ *
+ * This is a wrapper around gimp_scan_convert_render_full() that
+ * doesn't do antialiasing but gives control over the value that
+ * should be used for pixels covered by the scan conversion. Uncovered
+ * pixels are set to zero.
+ *
+ * You cannot add additional polygons after this command.
+ */
+void
+gimp_scan_convert_render_value (GimpScanConvert *sc,
+                                GeglBuffer      *buffer,
+                                gint             off_x,
+                                gint             off_y,
+                                gdouble          value)
+{
+  gimp_scan_convert_render_full (sc, buffer, off_x, off_y,
+                                 TRUE, FALSE, value);
+}
+
+/**
+ * gimp_scan_convert_compose:
+ * @sc:     a #GimpScanConvert context
+ * @buffer: the #GeglBuffer to render to
+ * @off_x:  horizontal offset into the @buffer
+ * @off_y:  vertical offset into the @buffer
+ *
+ * This is a wrapper around of gimp_scan_convert_render_full() that composes
+ * the (aliased) scan conversion on top of the content of the @buffer.
+ *
+ * You cannot add additional polygons after this command.
+ */
+void
+gimp_scan_convert_compose (GimpScanConvert *sc,
+                           GeglBuffer      *buffer,
+                           gint             off_x,
+                           gint             off_y)
+{
+  gimp_scan_convert_render_full (sc, buffer, off_x, off_y,
+                                 FALSE, FALSE, 1.0);
+}
+
+/**
+ * gimp_scan_convert_compose_value:
+ * @sc:     a #GimpScanConvert context
+ * @buffer: the #GeglBuffer to render to
+ * @off_x:  horizontal offset into the @buffer
+ * @off_y:  vertical offset into the @buffer
+ * @value:  value to use for covered pixels
+ *
+ * This is a wrapper around gimp_scan_convert_render_full() that
+ * composes the (aliased) scan conversion with value @value on top of the
+ * content of the @buffer.
+ *
+ * You cannot add additional polygons after this command.
+ */
+void
+gimp_scan_convert_compose_value (GimpScanConvert *sc,
+                                 GeglBuffer      *buffer,
+                                 gint             off_x,
+                                 gint             off_y,
+                                 gdouble          value)
+{
+  gimp_scan_convert_render_full (sc, buffer, off_x, off_y,
+                                 FALSE, FALSE, value);
+}
+
+/**
+ * gimp_scan_convert_render_full:
+ * @sc:        a #GimpScanConvert context
+ * @buffer:    the #GeglBuffer to render to
+ * @off_x:     horizontal offset into the @buffer
+ * @off_y:     vertical offset into the @buffer
+ * @replace:   if true the original content of the @buffer gets estroyed
+ * @antialias: if true the rendering happens antialiased
+ * @value:     value to use for covered pixels
+ *
+ * This function renders the area described by the path to the
+ * @buffer, taking the offset @off_x and @off_y in the buffer into
+ * account.  The rendering can happen antialiased and be rendered on
+ * top of existing content or replacing it completely. The @value
+ * specifies the opacity value to be used for the objects in the @sc.
+ *
+ * You cannot add additional polygons after this command.
+ */
+void
+gimp_scan_convert_render_full (GimpScanConvert *sc,
+                               GeglBuffer      *buffer,
+                               gint             off_x,
+                               gint             off_y,
+                               gboolean         replace,
+                               gboolean         antialias,
+                               gdouble          value)
+{
+  const Babl         *format;
+  guchar             *shared_buf      = NULL;
+  gsize               shared_buf_size = 0;
+  GeglBufferIterator *iter;
+  GeglRectangle      *roi;
+  cairo_t            *cr;
+  cairo_surface_t    *surface;
+  cairo_path_t        path;
+  gint                bpp;
+  gint                x, y;
+  gint                width, height;
+
+  g_return_if_fail (sc != NULL);
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  x      = gegl_buffer_get_x      (buffer);
+  y      = gegl_buffer_get_y      (buffer);
+  width  = gegl_buffer_get_width  (buffer);
+  height = gegl_buffer_get_height (buffer);
+
+  if (sc->clip && ! gimp_rectangle_intersect (x, y, width, height,
+                                              sc->clip_x, sc->clip_y,
+                                              sc->clip_w, sc->clip_h,
+                                              &x, &y, &width, &height))
+    return;
+
+  path.status   = CAIRO_STATUS_SUCCESS;
+  path.data     = (cairo_path_data_t *) sc->path_data->data;
+  path.num_data = sc->path_data->len;
+
+  format = babl_format ("Y u8");
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
+                                   GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE, 1);
+  roi = &iter->items[0].roi;
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      guchar     *data    = iter->items[0].data;
+      guchar     *tmp_buf = NULL;
+      const gint  stride  = cairo_format_stride_for_width (CAIRO_FORMAT_A8,
+                                                           roi->width);
+
+      /*  cairo rowstrides are always multiples of 4, whereas
+       *  maskPR.rowstride can be anything, so to be able to create an
+       *  image surface, we maybe have to create our own temporary
+       *  buffer
+       */
+      if (roi->width * bpp != stride)
+        {
+          if (shared_buf_size < stride * roi->height)
+            {
+              shared_buf_size = stride * roi->height;
+              g_free (shared_buf);
+              shared_buf = g_malloc (shared_buf_size);
+            }
+          tmp_buf = shared_buf;
+
+          if (! replace)
+            {
+              const guchar *src  = data;
+              guchar       *dest = tmp_buf;
+              gint          i;
+
+              for (i = 0; i < roi->height; i++)
+                {
+                  memcpy (dest, src, roi->width * bpp);
+
+                  src  += roi->width * bpp;
+                  dest += stride;
+                }
+            }
+        }
+
+      surface = cairo_image_surface_create_for_data (tmp_buf ?
+                                                     tmp_buf : data,
+                                                     CAIRO_FORMAT_A8,
+                                                     roi->width, roi->height,
+                                                     stride);
+
+      cairo_surface_set_device_offset (surface,
+                                       -off_x - roi->x,
+                                       -off_y - roi->y);
+      cr = cairo_create (surface);
+      cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+
+      if (replace)
+        {
+          cairo_set_source_rgba (cr, 0, 0, 0, 0);
+          cairo_paint (cr);
+        }
+
+      cairo_set_source_rgba (cr, 0, 0, 0, value);
+      cairo_append_path (cr, &path);
+
+      cairo_set_antialias (cr, antialias ?
+                           CAIRO_ANTIALIAS_GRAY : CAIRO_ANTIALIAS_NONE);
+      cairo_set_miter_limit (cr, sc->miter);
+
+      if (sc->do_stroke)
+        {
+          cairo_set_line_cap (cr,
+                              sc->cap == GIMP_CAP_BUTT ? CAIRO_LINE_CAP_BUTT :
+                              sc->cap == GIMP_CAP_ROUND ? CAIRO_LINE_CAP_ROUND :
+                              CAIRO_LINE_CAP_SQUARE);
+          cairo_set_line_join (cr,
+                               sc->join == GIMP_JOIN_MITER ? CAIRO_LINE_JOIN_MITER :
+                               sc->join == GIMP_JOIN_ROUND ? CAIRO_LINE_JOIN_ROUND :
+                               CAIRO_LINE_JOIN_BEVEL);
+
+          cairo_set_line_width (cr, sc->width);
+
+          if (sc->dash_info)
+            cairo_set_dash (cr,
+                            (double *) sc->dash_info->data,
+                            sc->dash_info->len,
+                            sc->dash_offset);
+
+          cairo_scale (cr, 1.0, sc->ratio_xy);
+          cairo_stroke (cr);
+        }
+      else
+        {
+          cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+          cairo_fill (cr);
+        }
+
+      cairo_destroy (cr);
+      cairo_surface_destroy (surface);
+
+      if (tmp_buf)
+        {
+          const guchar *src  = tmp_buf;
+          guchar       *dest = data;
+          gint          i;
+
+          for (i = 0; i < roi->height; i++)
+            {
+              memcpy (dest, src, roi->width * bpp);
+
+              src  += stride;
+              dest += roi->width * bpp;
+            }
+        }
+    }
+
+  g_free (shared_buf);
+}
diff --git a/app/core/gimpscanconvert.h b/app/core/gimpscanconvert.h
new file mode 100644
index 0000000..9df4da1
--- /dev/null
+++ b/app/core/gimpscanconvert.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SCAN_CONVERT_H__
+#define __GIMP_SCAN_CONVERT_H__
+
+
+GimpScanConvert *
+          gimp_scan_convert_new               (void);
+
+GimpScanConvert *
+          gimp_scan_convert_new_from_boundary (const GimpBoundSeg *bound_segs,
+                                               gint                n_bound_segs,
+                                               gint                offset_x,
+                                               gint                offset_y);
+
+void      gimp_scan_convert_free               (GimpScanConvert   *sc);
+void      gimp_scan_convert_set_pixel_ratio    (GimpScanConvert   *sc,
+                                                gdouble            ratio_xy);
+void      gimp_scan_convert_set_clip_rectangle (GimpScanConvert   *sc,
+                                                gint               x,
+                                                gint               y,
+                                                gint               width,
+                                                gint               height);
+void      gimp_scan_convert_add_polyline       (GimpScanConvert   *sc,
+                                                guint              n_points,
+                                                const GimpVector2 *points,
+                                                gboolean           closed);
+void      gimp_scan_convert_add_bezier         (GimpScanConvert      *sc,
+                                                const GimpBezierDesc *bezier);
+void      gimp_scan_convert_stroke             (GimpScanConvert   *sc,
+                                                gdouble            width,
+                                                GimpJoinStyle      join,
+                                                GimpCapStyle       cap,
+                                                gdouble            miter,
+                                                gdouble            dash_offset,
+                                                GArray            *dash_info);
+void      gimp_scan_convert_render_full        (GimpScanConvert   *sc,
+                                                GeglBuffer        *buffer,
+                                                gint               off_x,
+                                                gint               off_y,
+                                                gboolean           replace,
+                                                gboolean           antialias,
+                                                gdouble            value);
+
+void      gimp_scan_convert_render             (GimpScanConvert   *sc,
+                                                GeglBuffer        *buffer,
+                                                gint               off_x,
+                                                gint               off_y,
+                                                gboolean           antialias);
+void      gimp_scan_convert_render_value       (GimpScanConvert   *sc,
+                                                GeglBuffer        *buffer,
+                                                gint               off_x,
+                                                gint               off_y,
+                                                gdouble            value);
+void      gimp_scan_convert_compose            (GimpScanConvert   *sc,
+                                                GeglBuffer        *buffer,
+                                                gint               off_x,
+                                                gint               off_y);
+void      gimp_scan_convert_compose_value      (GimpScanConvert   *sc,
+                                                GeglBuffer        *buffer,
+                                                gint               off_x,
+                                                gint               off_y,
+                                                gdouble            value);
+
+
+#endif /* __GIMP_SCAN_CONVERT_H__ */
diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c
new file mode 100644
index 0000000..5f66b98
--- /dev/null
+++ b/app/core/gimpselection.c
@@ -0,0 +1,863 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimpdrawable-edit.h"
+#include "gimpdrawable-private.h"
+#include "gimperror.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpimage-undo-push.h"
+#include "gimplayer.h"
+#include "gimplayer-new.h"
+#include "gimplayermask.h"
+#include "gimplayer-floating-selection.h"
+#include "gimppickable.h"
+#include "gimpselection.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean   gimp_selection_is_attached   (GimpItem            *item);
+static GimpItemTree * gimp_selection_get_tree  (GimpItem            *item);
+static void       gimp_selection_translate     (GimpItem            *item,
+                                                gdouble              offset_x,
+                                                gdouble              offset_y,
+                                                gboolean             push_undo);
+static void       gimp_selection_scale         (GimpItem            *item,
+                                                gint                 new_width,
+                                                gint                 new_height,
+                                                gint                 new_offset_x,
+                                                gint                 new_offset_y,
+                                                GimpInterpolationType interp_type,
+                                                GimpProgress        *progress);
+static void       gimp_selection_resize        (GimpItem            *item,
+                                                GimpContext         *context,
+                                                GimpFillType         fill_type,
+                                                gint                 new_width,
+                                                gint                 new_height,
+                                                gint                 offset_x,
+                                                gint                 offset_y);
+static void       gimp_selection_flip          (GimpItem            *item,
+                                                GimpContext         *context,
+                                                GimpOrientationType  flip_type,
+                                                gdouble              axis,
+                                                gboolean             clip_result);
+static void       gimp_selection_rotate        (GimpItem            *item,
+                                                GimpContext         *context,
+                                                GimpRotationType     rotation_type,
+                                                gdouble              center_x,
+                                                gdouble              center_y,
+                                                gboolean             clip_result);
+static gboolean   gimp_selection_fill          (GimpItem            *item,
+                                                GimpDrawable        *drawable,
+                                                GimpFillOptions     *fill_options,
+                                                gboolean             push_undo,
+                                                GimpProgress        *progress,
+                                                GError             **error);
+static gboolean   gimp_selection_stroke        (GimpItem            *item,
+                                                GimpDrawable        *drawable,
+                                                GimpStrokeOptions   *stroke_options,
+                                                gboolean             push_undo,
+                                                GimpProgress        *progress,
+                                                GError             **error);
+static void       gimp_selection_convert_type  (GimpDrawable        *drawable,
+                                                GimpImage           *dest_image,
+                                                const Babl          *new_format,
+                                                GimpColorProfile    *dest_profile,
+                                                GeglDitherMethod     layer_dither_type,
+                                                GeglDitherMethod     mask_dither_type,
+                                                gboolean             push_undo,
+                                                GimpProgress        *progress);
+static void gimp_selection_invalidate_boundary (GimpDrawable        *drawable);
+
+static gboolean   gimp_selection_boundary      (GimpChannel         *channel,
+                                                const GimpBoundSeg **segs_in,
+                                                const GimpBoundSeg **segs_out,
+                                                gint                *num_segs_in,
+                                                gint                *num_segs_out,
+                                                gint                 x1,
+                                                gint                 y1,
+                                                gint                 x2,
+                                                gint                 y2);
+static gboolean   gimp_selection_is_empty      (GimpChannel         *channel);
+static void       gimp_selection_feather       (GimpChannel         *channel,
+                                                gdouble              radius_x,
+                                                gdouble              radius_y,
+                                                gboolean             edge_lock,
+                                                gboolean             push_undo);
+static void       gimp_selection_sharpen       (GimpChannel         *channel,
+                                                gboolean             push_undo);
+static void       gimp_selection_clear         (GimpChannel         *channel,
+                                                const gchar         *undo_desc,
+                                                gboolean             push_undo);
+static void       gimp_selection_all           (GimpChannel         *channel,
+                                                gboolean             push_undo);
+static void       gimp_selection_invert        (GimpChannel         *channel,
+                                                gboolean             push_undo);
+static void       gimp_selection_border        (GimpChannel         *channel,
+                                                gint                 radius_x,
+                                                gint                 radius_y,
+                                                GimpChannelBorderStyle style,
+                                                gboolean             edge_lock,
+                                                gboolean             push_undo);
+static void       gimp_selection_grow          (GimpChannel         *channel,
+                                                gint                 radius_x,
+                                                gint                 radius_y,
+                                                gboolean             push_undo);
+static void       gimp_selection_shrink        (GimpChannel         *channel,
+                                                gint                 radius_x,
+                                                gint                 radius_y,
+                                                gboolean             edge_lock,
+                                                gboolean             push_undo);
+static void       gimp_selection_flood         (GimpChannel         *channel,
+                                                gboolean             push_undo);
+
+
+G_DEFINE_TYPE (GimpSelection, gimp_selection, GIMP_TYPE_CHANNEL)
+
+#define parent_class gimp_selection_parent_class
+
+
+static void
+gimp_selection_class_init (GimpSelectionClass *klass)
+{
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+  GimpItemClass     *item_class     = GIMP_ITEM_CLASS (klass);
+  GimpDrawableClass *drawable_class = GIMP_DRAWABLE_CLASS (klass);
+  GimpChannelClass  *channel_class  = GIMP_CHANNEL_CLASS (klass);
+
+  viewable_class->default_icon_name   = "gimp-selection";
+
+  item_class->is_attached             = gimp_selection_is_attached;
+  item_class->get_tree                = gimp_selection_get_tree;
+  item_class->translate               = gimp_selection_translate;
+  item_class->scale                   = gimp_selection_scale;
+  item_class->resize                  = gimp_selection_resize;
+  item_class->flip                    = gimp_selection_flip;
+  item_class->rotate                  = gimp_selection_rotate;
+  item_class->fill                    = gimp_selection_fill;
+  item_class->stroke                  = gimp_selection_stroke;
+  item_class->default_name            = _("Selection Mask");
+  item_class->translate_desc          = C_("undo-type", "Move Selection");
+  item_class->fill_desc               = C_("undo-type", "Fill Selection");
+  item_class->stroke_desc             = C_("undo-type", "Stroke Selection");
+
+  drawable_class->convert_type        = gimp_selection_convert_type;
+  drawable_class->invalidate_boundary = gimp_selection_invalidate_boundary;
+
+  channel_class->boundary             = gimp_selection_boundary;
+  channel_class->is_empty             = gimp_selection_is_empty;
+  channel_class->feather              = gimp_selection_feather;
+  channel_class->sharpen              = gimp_selection_sharpen;
+  channel_class->clear                = gimp_selection_clear;
+  channel_class->all                  = gimp_selection_all;
+  channel_class->invert               = gimp_selection_invert;
+  channel_class->border               = gimp_selection_border;
+  channel_class->grow                 = gimp_selection_grow;
+  channel_class->shrink               = gimp_selection_shrink;
+  channel_class->flood                = gimp_selection_flood;
+
+  channel_class->feather_desc         = C_("undo-type", "Feather Selection");
+  channel_class->sharpen_desc         = C_("undo-type", "Sharpen Selection");
+  channel_class->clear_desc           = C_("undo-type", "Select None");
+  channel_class->all_desc             = C_("undo-type", "Select All");
+  channel_class->invert_desc          = C_("undo-type", "Invert Selection");
+  channel_class->border_desc          = C_("undo-type", "Border Selection");
+  channel_class->grow_desc            = C_("undo-type", "Grow Selection");
+  channel_class->shrink_desc          = C_("undo-type", "Shrink Selection");
+  channel_class->flood_desc           = C_("undo-type", "Remove Holes");
+}
+
+static void
+gimp_selection_init (GimpSelection *selection)
+{
+}
+
+static gboolean
+gimp_selection_is_attached (GimpItem *item)
+{
+  return (GIMP_IS_IMAGE (gimp_item_get_image (item)) &&
+          gimp_image_get_mask (gimp_item_get_image (item)) ==
+          GIMP_CHANNEL (item));
+}
+
+static GimpItemTree *
+gimp_selection_get_tree (GimpItem *item)
+{
+  return NULL;
+}
+
+static void
+gimp_selection_translate (GimpItem *item,
+                          gdouble   offset_x,
+                          gdouble   offset_y,
+                          gboolean  push_undo)
+{
+  GIMP_ITEM_CLASS (parent_class)->translate (item, offset_x, offset_y,
+                                             push_undo);
+}
+
+static void
+gimp_selection_scale (GimpItem              *item,
+                      gint                   new_width,
+                      gint                   new_height,
+                      gint                   new_offset_x,
+                      gint                   new_offset_y,
+                      GimpInterpolationType  interp_type,
+                      GimpProgress          *progress)
+{
+  GIMP_ITEM_CLASS (parent_class)->scale (item, new_width, new_height,
+                                         new_offset_x, new_offset_y,
+                                         interp_type, progress);
+
+  gimp_item_set_offset (item, 0, 0);
+}
+
+static void
+gimp_selection_resize (GimpItem     *item,
+                       GimpContext  *context,
+                       GimpFillType  fill_type,
+                       gint          new_width,
+                       gint          new_height,
+                       gint          offset_x,
+                       gint          offset_y)
+{
+  GIMP_ITEM_CLASS (parent_class)->resize (item, context, GIMP_FILL_TRANSPARENT,
+                                          new_width, new_height,
+                                          offset_x, offset_y);
+
+  gimp_item_set_offset (item, 0, 0);
+}
+
+static void
+gimp_selection_flip (GimpItem            *item,
+                     GimpContext         *context,
+                     GimpOrientationType  flip_type,
+                     gdouble              axis,
+                     gboolean             clip_result)
+{
+  GIMP_ITEM_CLASS (parent_class)->flip (item, context, flip_type, axis, TRUE);
+}
+
+static void
+gimp_selection_rotate (GimpItem         *item,
+                       GimpContext      *context,
+                       GimpRotationType  rotation_type,
+                       gdouble           center_x,
+                       gdouble           center_y,
+                       gboolean          clip_result)
+{
+  GIMP_ITEM_CLASS (parent_class)->rotate (item, context, rotation_type,
+                                          center_x, center_y,
+                                          clip_result);
+}
+
+static gboolean
+gimp_selection_fill (GimpItem         *item,
+                     GimpDrawable     *drawable,
+                     GimpFillOptions  *fill_options,
+                     gboolean          push_undo,
+                     GimpProgress     *progress,
+                     GError          **error)
+{
+  GimpSelection      *selection = GIMP_SELECTION (item);
+  const GimpBoundSeg *dummy_in;
+  const GimpBoundSeg *dummy_out;
+  gint                num_dummy_in;
+  gint                num_dummy_out;
+  gboolean            retval;
+
+  if (! gimp_channel_boundary (GIMP_CHANNEL (selection),
+                               &dummy_in, &dummy_out,
+                               &num_dummy_in, &num_dummy_out,
+                               0, 0, 0, 0))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("There is no selection to fill."));
+      return FALSE;
+    }
+
+  gimp_selection_suspend (selection);
+
+  retval = GIMP_ITEM_CLASS (parent_class)->fill (item, drawable,
+                                                 fill_options,
+                                                 push_undo, progress, error);
+
+  gimp_selection_resume (selection);
+
+  return retval;
+}
+
+static gboolean
+gimp_selection_stroke (GimpItem           *item,
+                       GimpDrawable       *drawable,
+                       GimpStrokeOptions  *stroke_options,
+                       gboolean            push_undo,
+                       GimpProgress       *progress,
+                       GError            **error)
+{
+  GimpSelection      *selection = GIMP_SELECTION (item);
+  const GimpBoundSeg *dummy_in;
+  const GimpBoundSeg *dummy_out;
+  gint                num_dummy_in;
+  gint                num_dummy_out;
+  gboolean            retval;
+
+  if (! gimp_channel_boundary (GIMP_CHANNEL (selection),
+                               &dummy_in, &dummy_out,
+                               &num_dummy_in, &num_dummy_out,
+                               0, 0, 0, 0))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("There is no selection to stroke."));
+      return FALSE;
+    }
+
+  gimp_selection_suspend (selection);
+
+  retval = GIMP_ITEM_CLASS (parent_class)->stroke (item, drawable,
+                                                   stroke_options,
+                                                   push_undo, progress, error);
+
+  gimp_selection_resume (selection);
+
+  return retval;
+}
+
+static void
+gimp_selection_convert_type (GimpDrawable      *drawable,
+                             GimpImage         *dest_image,
+                             const Babl        *new_format,
+                             GimpColorProfile  *dest_profile,
+                             GeglDitherMethod   layer_dither_type,
+                             GeglDitherMethod   mask_dither_type,
+                             gboolean           push_undo,
+                             GimpProgress      *progress)
+{
+  new_format =
+    gimp_babl_mask_format (gimp_babl_format_get_precision (new_format));
+
+  GIMP_DRAWABLE_CLASS (parent_class)->convert_type (drawable, dest_image,
+                                                    new_format,
+                                                    dest_profile,
+                                                    layer_dither_type,
+                                                    mask_dither_type,
+                                                    push_undo,
+                                                    progress);
+}
+
+static void
+gimp_selection_invalidate_boundary (GimpDrawable *drawable)
+{
+  GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpLayer *layer;
+
+  /*  Turn the current selection off  */
+  gimp_image_selection_invalidate (image);
+
+  GIMP_DRAWABLE_CLASS (parent_class)->invalidate_boundary (drawable);
+
+  /*  If there is a floating selection, update it's area...
+   *  we need to do this since this selection mask can act as an additional
+   *  mask in the composition of the floating selection
+   */
+  layer = gimp_image_get_active_layer (image);
+
+  if (layer && gimp_layer_is_floating_sel (layer))
+    {
+      gimp_drawable_update (GIMP_DRAWABLE (layer), 0, 0, -1, -1);
+    }
+
+#if 0
+  /*  invalidate the preview  */
+  drawable->private->preview_valid = FALSE;
+#endif
+}
+
+static gboolean
+gimp_selection_boundary (GimpChannel         *channel,
+                         const GimpBoundSeg **segs_in,
+                         const GimpBoundSeg **segs_out,
+                         gint                *num_segs_in,
+                         gint                *num_segs_out,
+                         gint                 unused1,
+                         gint                 unused2,
+                         gint                 unused3,
+                         gint                 unused4)
+{
+  GimpImage    *image = gimp_item_get_image (GIMP_ITEM (channel));
+  GimpDrawable *drawable;
+  GimpLayer    *layer;
+
+  if ((layer = gimp_image_get_floating_selection (image)))
+    {
+      /*  If there is a floating selection, then
+       *  we need to do some slightly different boundaries.
+       *  Instead of inside and outside boundaries being defined
+       *  by the extents of the layer, the inside boundary (the one
+       *  that actually marches and is black/white) is the boundary of
+       *  the floating selection.  The outside boundary (doesn't move,
+       *  is black/gray) is defined as the normal selection mask
+       */
+
+      /*  Find the selection mask boundary  */
+      GIMP_CHANNEL_CLASS (parent_class)->boundary (channel,
+                                                   segs_in, segs_out,
+                                                   num_segs_in, num_segs_out,
+                                                   0, 0, 0, 0);
+
+      /*  Find the floating selection boundary  */
+      *segs_in = floating_sel_boundary (layer, num_segs_in);
+
+      return TRUE;
+    }
+  else if ((drawable = gimp_image_get_active_drawable (image)) &&
+           GIMP_IS_CHANNEL (drawable))
+    {
+      /*  Otherwise, return the boundary...if a channel is active  */
+
+      return GIMP_CHANNEL_CLASS (parent_class)->boundary (channel,
+                                                          segs_in, segs_out,
+                                                          num_segs_in,
+                                                          num_segs_out,
+                                                          0, 0,
+                                                          gimp_image_get_width  (image),
+                                                          gimp_image_get_height (image));
+    }
+  else if ((layer = gimp_image_get_active_layer (image)))
+    {
+      /*  If a layer is active, we return multiple boundaries based
+       *  on the extents
+       */
+
+      gint x1, y1;
+      gint x2, y2;
+      gint offset_x;
+      gint offset_y;
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+
+      x1 = CLAMP (offset_x, 0, gimp_image_get_width  (image));
+      y1 = CLAMP (offset_y, 0, gimp_image_get_height (image));
+      x2 = CLAMP (offset_x + gimp_item_get_width (GIMP_ITEM (layer)),
+                  0, gimp_image_get_width (image));
+      y2 = CLAMP (offset_y + gimp_item_get_height (GIMP_ITEM (layer)),
+                  0, gimp_image_get_height (image));
+
+      return GIMP_CHANNEL_CLASS (parent_class)->boundary (channel,
+                                                          segs_in, segs_out,
+                                                          num_segs_in,
+                                                          num_segs_out,
+                                                          x1, y1, x2, y2);
+    }
+
+  *segs_in      = NULL;
+  *segs_out     = NULL;
+  *num_segs_in  = 0;
+  *num_segs_out = 0;
+
+  return FALSE;
+}
+
+static gboolean
+gimp_selection_is_empty (GimpChannel *channel)
+{
+  GimpSelection *selection = GIMP_SELECTION (channel);
+
+  /*  in order to allow stroking of selections, we need to pretend here
+   *  that the selection mask is empty so that it doesn't mask the paint
+   *  during the stroke operation.
+   */
+  if (selection->suspend_count > 0)
+    return TRUE;
+
+  return GIMP_CHANNEL_CLASS (parent_class)->is_empty (channel);
+}
+
+static void
+gimp_selection_feather (GimpChannel *channel,
+                        gdouble      radius_x,
+                        gdouble      radius_y,
+                        gboolean     edge_lock,
+                        gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->feather (channel, radius_x, radius_y,
+                                              edge_lock, push_undo);
+}
+
+static void
+gimp_selection_sharpen (GimpChannel *channel,
+                        gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->sharpen (channel, push_undo);
+}
+
+static void
+gimp_selection_clear (GimpChannel *channel,
+                      const gchar *undo_desc,
+                      gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->clear (channel, undo_desc, push_undo);
+}
+
+static void
+gimp_selection_all (GimpChannel *channel,
+                    gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->all (channel, push_undo);
+}
+
+static void
+gimp_selection_invert (GimpChannel *channel,
+                       gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->invert (channel, push_undo);
+}
+
+static void
+gimp_selection_border (GimpChannel            *channel,
+                       gint                    radius_x,
+                       gint                    radius_y,
+                       GimpChannelBorderStyle  style,
+                       gboolean                edge_lock,
+                       gboolean                push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->border (channel,
+                                             radius_x, radius_y,
+                                             style, edge_lock,
+                                             push_undo);
+}
+
+static void
+gimp_selection_grow (GimpChannel *channel,
+                     gint         radius_x,
+                     gint         radius_y,
+                     gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->grow (channel,
+                                           radius_x, radius_y,
+                                           push_undo);
+}
+
+static void
+gimp_selection_shrink (GimpChannel *channel,
+                       gint         radius_x,
+                       gint         radius_y,
+                       gboolean     edge_lock,
+                       gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->shrink (channel,
+                                             radius_x, radius_y, edge_lock,
+                                             push_undo);
+}
+
+static void
+gimp_selection_flood (GimpChannel *channel,
+                      gboolean     push_undo)
+{
+  GIMP_CHANNEL_CLASS (parent_class)->flood (channel, push_undo);
+}
+
+
+/*  public functions  */
+
+GimpChannel *
+gimp_selection_new (GimpImage *image,
+                    gint       width,
+                    gint       height)
+{
+  GimpRGB      black = { 0.0, 0.0, 0.0, 0.5 };
+  GimpChannel *channel;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (width > 0 && height > 0, NULL);
+
+  channel = GIMP_CHANNEL (gimp_drawable_new (GIMP_TYPE_SELECTION,
+                                             image, NULL,
+                                             0, 0, width, height,
+                                             gimp_image_get_mask_format (image)));
+
+  gimp_channel_set_color (channel, &black, FALSE);
+  gimp_channel_set_show_masked (channel, TRUE);
+
+  channel->x2 = width;
+  channel->y2 = height;
+
+  return channel;
+}
+
+gint
+gimp_selection_suspend (GimpSelection *selection)
+{
+  g_return_val_if_fail (GIMP_IS_SELECTION (selection), 0);
+
+  selection->suspend_count++;
+
+  return selection->suspend_count;
+}
+
+gint
+gimp_selection_resume (GimpSelection *selection)
+{
+  g_return_val_if_fail (GIMP_IS_SELECTION (selection), 0);
+  g_return_val_if_fail (selection->suspend_count > 0, 0);
+
+  selection->suspend_count--;
+
+  return selection->suspend_count;
+}
+
+GeglBuffer *
+gimp_selection_extract (GimpSelection *selection,
+                        GimpPickable  *pickable,
+                        GimpContext   *context,
+                        gboolean       cut_image,
+                        gboolean       keep_indexed,
+                        gboolean       add_alpha,
+                        gint          *offset_x,
+                        gint          *offset_y,
+                        GError       **error)
+{
+  GimpImage  *image;
+  GeglBuffer *src_buffer;
+  GeglBuffer *dest_buffer;
+  const Babl *src_format;
+  const Babl *dest_format;
+  gint        x1, y1, x2, y2;
+  gboolean    non_empty;
+  gint        off_x, off_y;
+
+  g_return_val_if_fail (GIMP_IS_SELECTION (selection), NULL);
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+  if (GIMP_IS_ITEM (pickable))
+    g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (pickable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  image = gimp_pickable_get_image (pickable);
+
+  /*  If there are no bounds, then just extract the entire image
+   *  This may not be the correct behavior, but after getting rid
+   *  of floating selections, it's still tempting to "cut" or "copy"
+   *  a small layer and expect it to work, even though there is no
+   *  actual selection mask
+   */
+  if (GIMP_IS_DRAWABLE (pickable))
+    {
+      non_empty = gimp_item_mask_bounds (GIMP_ITEM (pickable),
+                                         &x1, &y1, &x2, &y2);
+
+      gimp_item_get_offset (GIMP_ITEM (pickable), &off_x, &off_y);
+    }
+  else
+    {
+      non_empty = gimp_item_bounds (GIMP_ITEM (selection),
+                                    &x1, &y1, &x2, &y2);
+      x2 += x1;
+      y2 += y1;
+
+      off_x = 0;
+      off_y = 0;
+
+      /* can't cut from non-drawables, fall back to copy */
+      cut_image = FALSE;
+    }
+
+  if (non_empty && ((x1 == x2) || (y1 == y2)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Unable to cut or copy because the "
+                             "selected region is empty."));
+      return NULL;
+    }
+
+  /*  If there is a selection, we must add alpha because the selection
+   *  could have any shape.
+   */
+  if (non_empty)
+    add_alpha = TRUE;
+
+  src_format = gimp_pickable_get_format (pickable);
+
+  /*  How many bytes in the temp buffer?  */
+  if (babl_format_is_palette (src_format) && ! keep_indexed)
+    {
+      dest_format = gimp_image_get_format (image, GIMP_RGB,
+                                           gimp_image_get_precision (image),
+                                           add_alpha ||
+                                           babl_format_has_alpha (src_format));
+    }
+  else
+    {
+      if (add_alpha)
+        dest_format = gimp_pickable_get_format_with_alpha (pickable);
+      else
+        dest_format = src_format;
+    }
+
+  gimp_pickable_flush (pickable);
+
+  src_buffer = gimp_pickable_get_buffer (pickable);
+
+  /*  Allocate the temp buffer  */
+  dest_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, x2 - x1, y2 - y1),
+                                 dest_format);
+
+  /*  First, copy the pixels, possibly doing INDEXED->RGB and adding alpha  */
+  gimp_gegl_buffer_copy (src_buffer,  GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1),
+                         GEGL_ABYSS_NONE,
+                         dest_buffer, GEGL_RECTANGLE (0, 0, 0, 0));
+
+  if (non_empty)
+    {
+      /*  If there is a selection, mask the dest_buffer with it  */
+
+      GeglBuffer *mask_buffer;
+
+      mask_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (selection));
+
+      gimp_gegl_apply_opacity (dest_buffer, NULL, NULL, dest_buffer,
+                               mask_buffer,
+                               - (off_x + x1),
+                               - (off_y + y1),
+                               1.0);
+
+      if (cut_image)
+        {
+          gimp_drawable_edit_clear (GIMP_DRAWABLE (pickable), context);
+        }
+    }
+  else if (cut_image)
+    {
+      /*  If we're cutting without selection, remove either the layer
+       *  (or floating selection), the layer mask, or the channel
+       */
+      if (GIMP_IS_LAYER (pickable))
+        {
+          gimp_image_remove_layer (image, GIMP_LAYER (pickable),
+                                   TRUE, NULL);
+        }
+      else if (GIMP_IS_LAYER_MASK (pickable))
+        {
+          gimp_layer_apply_mask (gimp_layer_mask_get_layer (GIMP_LAYER_MASK (pickable)),
+                                 GIMP_MASK_DISCARD, TRUE);
+        }
+      else if (GIMP_IS_CHANNEL (pickable))
+        {
+          gimp_image_remove_channel (image, GIMP_CHANNEL (pickable),
+                                     TRUE, NULL);
+        }
+    }
+
+  *offset_x = x1 + off_x;
+  *offset_y = y1 + off_y;
+
+  return dest_buffer;
+}
+
+GimpLayer *
+gimp_selection_float (GimpSelection *selection,
+                      GimpDrawable  *drawable,
+                      GimpContext   *context,
+                      gboolean       cut_image,
+                      gint           off_x,
+                      gint           off_y,
+                      GError       **error)
+{
+  GimpImage        *image;
+  GimpLayer        *layer;
+  GeglBuffer       *buffer;
+  GimpColorProfile *profile;
+  gint              x1, y1;
+  gint              x2, y2;
+
+  g_return_val_if_fail (GIMP_IS_SELECTION (selection), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (selection));
+
+  /*  Make sure there is a region to float...  */
+  if (! gimp_item_mask_bounds (GIMP_ITEM (drawable), &x1, &y1, &x2, &y2) ||
+      (x1 == x2 || y1 == y2))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot float selection because the selected "
+                             "region is empty."));
+      return NULL;
+    }
+
+  /*  Start an undo group  */
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_FS_FLOAT,
+                               C_("undo-type", "Float Selection"));
+
+  /*  Cut or copy the selected region  */
+  buffer = gimp_selection_extract (selection, GIMP_PICKABLE (drawable), context,
+                                   cut_image, FALSE, TRUE,
+                                   &x1, &y1, NULL);
+
+  profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (drawable));
+
+  /*  Clear the selection  */
+  gimp_channel_clear (GIMP_CHANNEL (selection), NULL, TRUE);
+
+  /* Create a new layer from the buffer, using the drawable's type
+   *  because it may be different from the image's type if we cut from
+   *  a channel or layer mask
+   */
+  layer = gimp_layer_new_from_gegl_buffer (buffer, image,
+                                           gimp_drawable_get_format_with_alpha (drawable),
+                                           _("Floated Layer"),
+                                           GIMP_OPACITY_OPAQUE,
+                                           gimp_image_get_default_new_layer_mode (image),
+                                           profile);
+
+  /*  Set the offsets  */
+  gimp_item_set_offset (GIMP_ITEM (layer), x1 + off_x, y1 + off_y);
+
+  /*  Free the temp buffer  */
+  g_object_unref (buffer);
+
+  /*  Add the floating layer to the image  */
+  floating_sel_attach (layer, drawable);
+
+  /*  End an undo group  */
+  gimp_image_undo_group_end (image);
+
+  /*  invalidate the image's boundary variables  */
+  GIMP_CHANNEL (selection)->boundary_known = FALSE;
+
+  return layer;
+}
diff --git a/app/core/gimpselection.h b/app/core/gimpselection.h
new file mode 100644
index 0000000..64a2962
--- /dev/null
+++ b/app/core/gimpselection.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SELECTION_H__
+#define __GIMP_SELECTION_H__
+
+
+#include "gimpchannel.h"
+
+
+#define GIMP_TYPE_SELECTION            (gimp_selection_get_type ())
+#define GIMP_SELECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SELECTION, GimpSelection))
+#define GIMP_SELECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SELECTION, GimpSelectionClass))
+#define GIMP_IS_SELECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SELECTION))
+#define GIMP_IS_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SELECTION))
+#define GIMP_SELECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SELECTION, GimpSelectionClass))
+
+
+typedef struct _GimpSelectionClass GimpSelectionClass;
+
+struct _GimpSelection
+{
+  GimpChannel parent_instance;
+
+  gint        suspend_count;
+};
+
+struct _GimpSelectionClass
+{
+  GimpChannelClass parent_class;
+};
+
+
+GType         gimp_selection_get_type (void) G_GNUC_CONST;
+
+GimpChannel * gimp_selection_new      (GimpImage     *image,
+                                       gint           width,
+                                       gint           height);
+
+gint          gimp_selection_suspend  (GimpSelection *selection);
+gint          gimp_selection_resume   (GimpSelection *selection);
+
+GeglBuffer  * gimp_selection_extract  (GimpSelection *selection,
+                                       GimpPickable  *pickable,
+                                       GimpContext   *context,
+                                       gboolean       cut_image,
+                                       gboolean       keep_indexed,
+                                       gboolean       add_alpha,
+                                       gint          *offset_x,
+                                       gint          *offset_y,
+                                       GError       **error);
+
+GimpLayer   * gimp_selection_float    (GimpSelection *selection,
+                                       GimpDrawable  *drawable,
+                                       GimpContext   *context,
+                                       gboolean       cut_image,
+                                       gint           off_x,
+                                       gint           off_y,
+                                       GError       **error);
+
+
+#endif /* __GIMP_SELECTION_H__ */
diff --git a/app/core/gimpsettings.c b/app/core/gimpsettings.c
new file mode 100644
index 0000000..ee21a36
--- /dev/null
+++ b/app/core/gimpsettings.c
@@ -0,0 +1,195 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsettings.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpsettings.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TIME
+};
+
+
+static void    gimp_settings_get_property    (GObject       *object,
+                                              guint          property_id,
+                                              GValue        *value,
+                                              GParamSpec    *pspec);
+static void    gimp_settings_set_property    (GObject       *object,
+                                              guint          property_id,
+                                              const GValue  *value,
+                                              GParamSpec    *pspec);
+
+static gchar * gimp_settings_get_description (GimpViewable  *viewable,
+                                              gchar        **tooltip);
+
+
+G_DEFINE_TYPE (GimpSettings, gimp_settings, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_settings_parent_class
+
+
+static void
+gimp_settings_class_init (GimpSettingsClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->set_property      = gimp_settings_set_property;
+  object_class->get_property      = gimp_settings_get_property;
+
+  viewable_class->get_description = gimp_settings_get_description;
+  viewable_class->name_editable   = TRUE;
+
+  GIMP_CONFIG_PROP_INT64 (object_class, PROP_TIME,
+                          "time",
+                          "Time",
+                          "Time of settings creation",
+                          0, G_MAXINT64, 0, 0);
+}
+
+static void
+gimp_settings_init (GimpSettings *settings)
+{
+}
+
+static void
+gimp_settings_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpSettings *settings = GIMP_SETTINGS (object);
+
+  switch (property_id)
+    {
+    case PROP_TIME:
+      g_value_set_int64 (value, settings->time);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_settings_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpSettings *settings = GIMP_SETTINGS (object);
+
+  switch (property_id)
+    {
+    case PROP_TIME:
+      settings->time = g_value_get_int64 (value);
+
+      if (settings->time > 0)
+        {
+          GDateTime *utc   = g_date_time_new_from_unix_utc (settings->time);
+          GDateTime *local = g_date_time_to_local (utc);
+          gchar     *name;
+
+          name = g_date_time_format (local, "%Y-%m-%d %H:%M:%S");
+          gimp_object_take_name (GIMP_OBJECT (settings), name);
+
+          g_date_time_unref (local);
+          g_date_time_unref (utc);
+        }
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gchar *
+gimp_settings_get_description (GimpViewable  *viewable,
+                               gchar        **tooltip)
+{
+  GimpSettings *settings = GIMP_SETTINGS (viewable);
+
+  if (settings->time > 0)
+    {
+      if (tooltip)
+        *tooltip = g_strdup ("You can rename automatic presets "
+                             "to make them permanently saved");
+
+      return g_strdup_printf (_("Last used: %s"),
+                              gimp_object_get_name (settings));
+    }
+
+  return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable,
+                                                              tooltip);
+}
+
+
+/*  public functions  */
+
+gint
+gimp_settings_compare (GimpSettings *a,
+                       GimpSettings *b)
+{
+  const gchar *name_a = gimp_object_get_name (a);
+  const gchar *name_b = gimp_object_get_name (b);
+
+  if (a->time > 0 && b->time > 0)
+    {
+      return - strcmp (name_a, name_b);
+    }
+  else if (a->time > 0)
+    {
+      return -1;
+    }
+  else if (b->time > 0)
+    {
+      return 1;
+    }
+  else if (name_a && name_b)
+    {
+      return strcmp (name_a, name_b);
+    }
+  else if (name_a)
+    {
+      return 1;
+    }
+  else if (name_b)
+    {
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/app/core/gimpsettings.h b/app/core/gimpsettings.h
new file mode 100644
index 0000000..73aa96f
--- /dev/null
+++ b/app/core/gimpsettings.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsettings.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SETTINGS_H__
+#define __GIMP_SETTINGS_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_SETTINGS            (gimp_settings_get_type ())
+#define GIMP_SETTINGS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SETTINGS, GimpSettings))
+#define GIMP_SETTINGS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_SETTINGS, GimpSettingsClass))
+#define GIMP_IS_SETTINGS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SETTINGS))
+#define GIMP_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_SETTINGS))
+#define GIMP_SETTINGS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_SETTINGS, GimpSettingsClass))
+
+
+typedef struct _GimpSettingsClass GimpSettingsClass;
+
+struct _GimpSettings
+{
+  GimpViewable  parent_instance;
+
+  gint64        time;
+};
+
+struct _GimpSettingsClass
+{
+  GimpViewableClass  parent_class;
+};
+
+
+GType   gimp_settings_get_type (void) G_GNUC_CONST;
+
+gint    gimp_settings_compare  (GimpSettings *a,
+                                GimpSettings *b);
+
+
+#endif /* __GIMP_SETTINGS_H__ */
diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c
new file mode 100644
index 0000000..3bb5c92
--- /dev/null
+++ b/app/core/gimpstrokeoptions.c
@@ -0,0 +1,638 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpstrokeoptions.c
+ * Copyright (C) 2003 Simon Budig
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimpdashpattern.h"
+#include "gimpmarshal.h"
+#include "gimppaintinfo.h"
+#include "gimpparamspecs.h"
+#include "gimpstrokeoptions.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+
+  PROP_METHOD,
+
+  PROP_STYLE,
+  PROP_WIDTH,
+  PROP_UNIT,
+  PROP_CAP_STYLE,
+  PROP_JOIN_STYLE,
+  PROP_MITER_LIMIT,
+  PROP_ANTIALIAS,
+  PROP_DASH_UNIT,
+  PROP_DASH_OFFSET,
+  PROP_DASH_INFO,
+
+  PROP_PAINT_OPTIONS,
+  PROP_EMULATE_DYNAMICS
+};
+
+enum
+{
+  DASH_INFO_CHANGED,
+  LAST_SIGNAL
+};
+
+
+typedef struct _GimpStrokeOptionsPrivate GimpStrokeOptionsPrivate;
+
+struct _GimpStrokeOptionsPrivate
+{
+  GimpStrokeMethod  method;
+
+  /*  options for method == LIBART  */
+  gdouble           width;
+  GimpUnit          unit;
+
+  GimpCapStyle      cap_style;
+  GimpJoinStyle     join_style;
+
+  gdouble           miter_limit;
+
+  gdouble           dash_offset;
+  GArray           *dash_info;
+
+  /*  options for method == PAINT_TOOL  */
+  GimpPaintOptions *paint_options;
+  gboolean          emulate_dynamics;
+};
+
+#define GET_PRIVATE(options) \
+        ((GimpStrokeOptionsPrivate *) gimp_stroke_options_get_instance_private ((GimpStrokeOptions *) (options)))
+
+
+static void   gimp_stroke_options_config_iface_init (gpointer      iface,
+                                                     gpointer      iface_data);
+
+static void   gimp_stroke_options_finalize          (GObject      *object);
+static void   gimp_stroke_options_set_property      (GObject      *object,
+                                                     guint         property_id,
+                                                     const GValue *value,
+                                                     GParamSpec   *pspec);
+static void   gimp_stroke_options_get_property      (GObject      *object,
+                                                     guint         property_id,
+                                                     GValue       *value,
+                                                     GParamSpec   *pspec);
+
+static GimpConfig * gimp_stroke_options_duplicate   (GimpConfig   *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpStrokeOptions, gimp_stroke_options,
+                         GIMP_TYPE_FILL_OPTIONS,
+                         G_ADD_PRIVATE (GimpStrokeOptions)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_stroke_options_config_iface_init))
+
+#define parent_class gimp_stroke_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+static guint stroke_options_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_stroke_options_class_init (GimpStrokeOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GParamSpec   *array_spec;
+
+  object_class->finalize     = gimp_stroke_options_finalize;
+  object_class->set_property = gimp_stroke_options_set_property;
+  object_class->get_property = gimp_stroke_options_get_property;
+
+  klass->dash_info_changed = NULL;
+
+  stroke_options_signals[DASH_INFO_CHANGED] =
+    g_signal_new ("dash-info-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpStrokeOptionsClass, dash_info_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DASH_PRESET);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_METHOD,
+                         "method",
+                         _("Method"),
+                         NULL,
+                         GIMP_TYPE_STROKE_METHOD,
+                         GIMP_STROKE_LINE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_WIDTH,
+                           "width",
+                           _("Line width"),
+                           NULL,
+                           0.0, 2000.0, 6.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_UNIT,
+                         "unit",
+                         _("Unit"),
+                         NULL,
+                         TRUE, FALSE, GIMP_UNIT_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CAP_STYLE,
+                         "cap-style",
+                         _("Cap style"),
+                         NULL,
+                         GIMP_TYPE_CAP_STYLE, GIMP_CAP_BUTT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_JOIN_STYLE,
+                         "join-style",
+                         _("Join style"),
+                         NULL,
+                         GIMP_TYPE_JOIN_STYLE, GIMP_JOIN_MITER,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_MITER_LIMIT,
+                           "miter-limit",
+                           _("Miter limit"),
+                           _("Convert a mitered join to a bevelled "
+                             "join if the miter would extend to a "
+                             "distance of more than miter-limit * "
+                             "line-width from the actual join point."),
+                           0.0, 100.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_DASH_OFFSET,
+                           "dash-offset",
+                           _("Dash offset"),
+                           NULL,
+                           0.0, 2000.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  array_spec = g_param_spec_double ("dash-length", NULL, NULL,
+                                    0.0, 2000.0, 1.0, GIMP_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_DASH_INFO,
+                                   gimp_param_spec_value_array ("dash-info",
+                                                                NULL, NULL,
+                                                                array_spec,
+                                                                GIMP_PARAM_STATIC_STRINGS |
+                                                                GIMP_CONFIG_PARAM_FLAGS));
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_PAINT_OPTIONS,
+                           "paint-options",
+                           NULL, NULL,
+                           GIMP_TYPE_PAINT_OPTIONS,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_EMULATE_DYNAMICS,
+                            "emulate-brush-dynamics",
+                            _("Emulate brush dynamics"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_stroke_options_config_iface_init (gpointer  iface,
+                                       gpointer  iface_data)
+{
+  GimpConfigInterface *config_iface = (GimpConfigInterface *) iface;
+
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  if (! parent_config_iface)
+    parent_config_iface = g_type_default_interface_peek (GIMP_TYPE_CONFIG);
+
+  config_iface->duplicate = gimp_stroke_options_duplicate;
+}
+
+static void
+gimp_stroke_options_init (GimpStrokeOptions *options)
+{
+}
+
+static void
+gimp_stroke_options_finalize (GObject *object)
+{
+  GimpStrokeOptionsPrivate *private = GET_PRIVATE (object);
+
+  if (private->dash_info)
+    {
+      gimp_dash_pattern_free (private->dash_info);
+      private->dash_info = NULL;
+    }
+
+  g_clear_object (&private->paint_options);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_stroke_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpStrokeOptions        *options = GIMP_STROKE_OPTIONS (object);
+  GimpStrokeOptionsPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_METHOD:
+      private->method = g_value_get_enum (value);
+      break;
+
+    case PROP_WIDTH:
+      private->width = g_value_get_double (value);
+      break;
+    case PROP_UNIT:
+      private->unit = g_value_get_int (value);
+      break;
+    case PROP_CAP_STYLE:
+      private->cap_style = g_value_get_enum (value);
+      break;
+    case PROP_JOIN_STYLE:
+      private->join_style = g_value_get_enum (value);
+      break;
+    case PROP_MITER_LIMIT:
+      private->miter_limit = g_value_get_double (value);
+      break;
+    case PROP_DASH_OFFSET:
+      private->dash_offset = g_value_get_double (value);
+      break;
+    case PROP_DASH_INFO:
+      {
+        GimpValueArray *value_array = g_value_get_boxed (value);
+        GArray         *pattern;
+
+        pattern = gimp_dash_pattern_from_value_array (value_array);
+        gimp_stroke_options_take_dash_pattern (options, GIMP_DASH_CUSTOM,
+                                               pattern);
+      }
+      break;
+
+    case PROP_PAINT_OPTIONS:
+      if (private->paint_options)
+        g_object_unref (private->paint_options);
+      private->paint_options = g_value_dup_object (value);
+      break;
+    case PROP_EMULATE_DYNAMICS:
+      private->emulate_dynamics = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_stroke_options_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpStrokeOptionsPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_METHOD:
+      g_value_set_enum (value, private->method);
+      break;
+
+    case PROP_WIDTH:
+      g_value_set_double (value, private->width);
+      break;
+    case PROP_UNIT:
+      g_value_set_int (value, private->unit);
+      break;
+    case PROP_CAP_STYLE:
+      g_value_set_enum (value, private->cap_style);
+      break;
+    case PROP_JOIN_STYLE:
+      g_value_set_enum (value, private->join_style);
+      break;
+    case PROP_MITER_LIMIT:
+      g_value_set_double (value, private->miter_limit);
+      break;
+    case PROP_DASH_OFFSET:
+      g_value_set_double (value, private->dash_offset);
+      break;
+    case PROP_DASH_INFO:
+      {
+        GimpValueArray *value_array;
+
+        value_array = gimp_dash_pattern_to_value_array (private->dash_info);
+        g_value_take_boxed (value, value_array);
+      }
+      break;
+
+    case PROP_PAINT_OPTIONS:
+      g_value_set_object (value, private->paint_options);
+      break;
+    case PROP_EMULATE_DYNAMICS:
+      g_value_set_boolean (value, private->emulate_dynamics);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpConfig *
+gimp_stroke_options_duplicate (GimpConfig *config)
+{
+  GimpStrokeOptions        *options = GIMP_STROKE_OPTIONS (config);
+  GimpStrokeOptionsPrivate *private = GET_PRIVATE (options);
+  GimpStrokeOptions        *new_options;
+
+  new_options = GIMP_STROKE_OPTIONS (parent_config_iface->duplicate (config));
+
+  if (private->paint_options)
+    {
+      GObject *paint_options;
+
+      paint_options = gimp_config_duplicate (GIMP_CONFIG (private->paint_options));
+      g_object_set (new_options, "paint-options", paint_options, NULL);
+      g_object_unref (paint_options);
+    }
+
+  return GIMP_CONFIG (new_options);
+}
+
+
+/*  public functions  */
+
+GimpStrokeOptions *
+gimp_stroke_options_new (Gimp        *gimp,
+                         GimpContext *context,
+                         gboolean     use_context_color)
+{
+  GimpPaintInfo     *paint_info = NULL;
+  GimpStrokeOptions *options;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (use_context_color == FALSE || context != NULL, NULL);
+
+  if (context)
+    paint_info = gimp_context_get_paint_info (context);
+
+  if (! paint_info)
+    paint_info = gimp_paint_info_get_standard (gimp);
+
+  options = g_object_new (GIMP_TYPE_STROKE_OPTIONS,
+                          "gimp",       gimp,
+                          "paint-info", paint_info,
+                          NULL);
+
+  if (use_context_color)
+    {
+      gimp_context_define_properties (GIMP_CONTEXT (options),
+                                      GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                                      GIMP_CONTEXT_PROP_MASK_PATTERN,
+                                      FALSE);
+
+      gimp_context_set_parent (GIMP_CONTEXT (options), context);
+    }
+
+  return options;
+}
+
+GimpStrokeMethod
+gimp_stroke_options_get_method (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options),
+                        GIMP_STROKE_LINE);
+
+  return GET_PRIVATE (options)->method;
+}
+
+gdouble
+gimp_stroke_options_get_width (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), 1.0);
+
+  return GET_PRIVATE (options)->width;
+}
+
+GimpUnit
+gimp_stroke_options_get_unit (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), GIMP_UNIT_PIXEL);
+
+  return GET_PRIVATE (options)->unit;
+}
+
+GimpCapStyle
+gimp_stroke_options_get_cap_style (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), GIMP_CAP_BUTT);
+
+  return GET_PRIVATE (options)->cap_style;
+}
+
+GimpJoinStyle
+gimp_stroke_options_get_join_style (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), GIMP_JOIN_MITER);
+
+  return GET_PRIVATE (options)->join_style;
+}
+
+gdouble
+gimp_stroke_options_get_miter_limit (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), 1.0);
+
+  return GET_PRIVATE (options)->miter_limit;
+}
+
+gdouble
+gimp_stroke_options_get_dash_offset (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), 0.0);
+
+  return GET_PRIVATE (options)->dash_offset;
+}
+
+GArray *
+gimp_stroke_options_get_dash_info (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), NULL);
+
+  return GET_PRIVATE (options)->dash_info;
+}
+
+GimpPaintOptions *
+gimp_stroke_options_get_paint_options (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), NULL);
+
+  return GET_PRIVATE (options)->paint_options;
+}
+
+gboolean
+gimp_stroke_options_get_emulate_dynamics (GimpStrokeOptions *options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), FALSE);
+
+  return GET_PRIVATE (options)->emulate_dynamics;
+}
+
+/**
+ * gimp_stroke_options_take_dash_pattern:
+ * @options: a #GimpStrokeOptions object
+ * @preset: a value out of the #GimpDashPreset enum
+ * @pattern: a #GArray or %NULL if @preset is not %GIMP_DASH_CUSTOM
+ *
+ * Sets the dash pattern. Either a @preset is passed and @pattern is
+ * %NULL or @preset is %GIMP_DASH_CUSTOM and @pattern is the #GArray
+ * to use as the dash pattern. Note that this function takes ownership
+ * of the passed pattern.
+ */
+void
+gimp_stroke_options_take_dash_pattern (GimpStrokeOptions *options,
+                                       GimpDashPreset     preset,
+                                       GArray            *pattern)
+{
+  GimpStrokeOptionsPrivate *private;
+
+  g_return_if_fail (GIMP_IS_STROKE_OPTIONS (options));
+  g_return_if_fail (preset == GIMP_DASH_CUSTOM || pattern == NULL);
+
+  private = GET_PRIVATE (options);
+
+  if (preset != GIMP_DASH_CUSTOM)
+    pattern = gimp_dash_pattern_new_from_preset (preset);
+
+  if (private->dash_info)
+    gimp_dash_pattern_free (private->dash_info);
+
+  private->dash_info = pattern;
+
+  g_object_notify (G_OBJECT (options), "dash-info");
+
+  g_signal_emit (options, stroke_options_signals [DASH_INFO_CHANGED], 0,
+                 preset);
+}
+
+void
+gimp_stroke_options_prepare (GimpStrokeOptions *options,
+                             GimpContext       *context,
+                             GimpPaintOptions  *paint_options)
+{
+  GimpStrokeOptionsPrivate *private;
+
+  g_return_if_fail (GIMP_IS_STROKE_OPTIONS (options));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (paint_options == NULL ||
+                    GIMP_IS_PAINT_OPTIONS (paint_options));
+
+  private = GET_PRIVATE (options);
+
+  switch (private->method)
+    {
+    case GIMP_STROKE_LINE:
+      break;
+
+    case GIMP_STROKE_PAINT_METHOD:
+      {
+        GimpPaintInfo *paint_info = GIMP_CONTEXT (options)->paint_info;
+
+        if (paint_options)
+          {
+            g_return_if_fail (paint_info == paint_options->paint_info);
+
+            /*  undefine the paint-relevant context properties and get them
+             *  from the passed context
+             */
+            gimp_context_define_properties (GIMP_CONTEXT (paint_options),
+                                            GIMP_CONTEXT_PROP_MASK_PAINT,
+                                            FALSE);
+            gimp_context_set_parent (GIMP_CONTEXT (paint_options), context);
+
+            g_object_ref (paint_options);
+          }
+        else
+          {
+            GimpCoreConfig      *config       = context->gimp->config;
+            GimpContextPropMask  global_props = 0;
+
+            paint_options =
+              gimp_config_duplicate (GIMP_CONFIG (paint_info->paint_options));
+
+            /*  FG and BG are always shared between all tools  */
+            global_props |= GIMP_CONTEXT_PROP_MASK_FOREGROUND;
+            global_props |= GIMP_CONTEXT_PROP_MASK_BACKGROUND;
+
+            if (config->global_brush)
+              global_props |= GIMP_CONTEXT_PROP_MASK_BRUSH;
+            if (config->global_dynamics)
+              global_props |= GIMP_CONTEXT_PROP_MASK_DYNAMICS;
+            if (config->global_pattern)
+              global_props |= GIMP_CONTEXT_PROP_MASK_PATTERN;
+            if (config->global_palette)
+              global_props |= GIMP_CONTEXT_PROP_MASK_PALETTE;
+            if (config->global_gradient)
+              global_props |= GIMP_CONTEXT_PROP_MASK_GRADIENT;
+            if (config->global_font)
+              global_props |= GIMP_CONTEXT_PROP_MASK_FONT;
+
+            gimp_context_copy_properties (context,
+                                          GIMP_CONTEXT (paint_options),
+                                          global_props);
+          }
+
+        g_object_set (options, "paint-options", paint_options, NULL);
+        g_object_unref (paint_options);
+      }
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+void
+gimp_stroke_options_finish (GimpStrokeOptions *options)
+{
+  g_return_if_fail (GIMP_IS_STROKE_OPTIONS (options));
+
+  g_object_set (options, "paint-options", NULL, NULL);
+}
diff --git a/app/core/gimpstrokeoptions.h b/app/core/gimpstrokeoptions.h
new file mode 100644
index 0000000..f5210e8
--- /dev/null
+++ b/app/core/gimpstrokeoptions.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpstrokeoptions.h
+ * Copyright (C) 2003 Simon Budig
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_STROKE_OPTIONS_H__
+#define __GIMP_STROKE_OPTIONS_H__
+
+
+#include "gimpfilloptions.h"
+
+
+#define GIMP_TYPE_STROKE_OPTIONS            (gimp_stroke_options_get_type ())
+#define GIMP_STROKE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STROKE_OPTIONS, GimpStrokeOptions))
+#define GIMP_STROKE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STROKE_OPTIONS, GimpStrokeOptionsClass))
+#define GIMP_IS_STROKE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_STROKE_OPTIONS))
+#define GIMP_IS_STROKE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_STROKE_OPTIONS))
+#define GIMP_STROKE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_STROKE_OPTIONS, GimpStrokeOptionsClass))
+
+
+typedef struct _GimpStrokeOptionsClass GimpStrokeOptionsClass;
+
+struct _GimpStrokeOptions
+{
+  GimpFillOptions  parent_instance;
+};
+
+struct _GimpStrokeOptionsClass
+{
+  GimpFillOptionsClass  parent_class;
+
+  void (* dash_info_changed) (GimpStrokeOptions *stroke_options,
+                              GimpDashPreset     preset);
+};
+
+
+GType               gimp_stroke_options_get_type             (void) G_GNUC_CONST;
+
+GimpStrokeOptions * gimp_stroke_options_new                  (Gimp              *gimp,
+                                                              GimpContext       *context,
+                                                              gboolean           use_context_color);
+
+GimpStrokeMethod    gimp_stroke_options_get_method           (GimpStrokeOptions *options);
+
+gdouble             gimp_stroke_options_get_width            (GimpStrokeOptions *options);
+GimpUnit            gimp_stroke_options_get_unit             (GimpStrokeOptions *options);
+GimpCapStyle        gimp_stroke_options_get_cap_style        (GimpStrokeOptions *options);
+GimpJoinStyle       gimp_stroke_options_get_join_style       (GimpStrokeOptions *options);
+gdouble             gimp_stroke_options_get_miter_limit      (GimpStrokeOptions *options);
+gdouble             gimp_stroke_options_get_dash_offset      (GimpStrokeOptions *options);
+GArray            * gimp_stroke_options_get_dash_info        (GimpStrokeOptions *options);
+
+GimpPaintOptions  * gimp_stroke_options_get_paint_options    (GimpStrokeOptions *options);
+gboolean            gimp_stroke_options_get_emulate_dynamics (GimpStrokeOptions *options);
+
+void                gimp_stroke_options_take_dash_pattern    (GimpStrokeOptions *options,
+                                                              GimpDashPreset     preset,
+                                                              GArray            *pattern);
+
+void                gimp_stroke_options_prepare              (GimpStrokeOptions *options,
+                                                              GimpContext       *context,
+                                                              GimpPaintOptions  *paint_options);
+void                gimp_stroke_options_finish               (GimpStrokeOptions *options);
+
+
+#endif /* __GIMP_STROKE_OPTIONS_H__ */
diff --git a/app/core/gimpsubprogress.c b/app/core/gimpsubprogress.c
new file mode 100644
index 0000000..3183f61
--- /dev/null
+++ b/app/core/gimpsubprogress.c
@@ -0,0 +1,317 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "core/gimpsubprogress.h"
+#include "core/gimpprogress.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PROGRESS
+};
+
+
+static void           gimp_sub_progress_iface_init    (GimpProgressInterface *iface);
+
+static void           gimp_sub_progress_finalize      (GObject             *object);
+static void           gimp_sub_progress_set_property  (GObject             *object,
+                                                       guint                property_id,
+                                                       const GValue        *value,
+                                                       GParamSpec          *pspec);
+static void           gimp_sub_progress_get_property  (GObject             *object,
+                                                       guint                property_id,
+                                                       GValue              *value,
+                                                       GParamSpec          *pspec);
+
+static GimpProgress * gimp_sub_progress_start         (GimpProgress        *progress,
+                                                       gboolean             cancellable,
+                                                       const gchar         *message);
+static void           gimp_sub_progress_end           (GimpProgress        *progress);
+static gboolean       gimp_sub_progress_is_active     (GimpProgress        *progress);
+static void           gimp_sub_progress_set_text      (GimpProgress        *progress,
+                                                       const gchar         *message);
+static void           gimp_sub_progress_set_value     (GimpProgress        *progress,
+                                                       gdouble              percentage);
+static gdouble        gimp_sub_progress_get_value     (GimpProgress        *progress);
+static void           gimp_sub_progress_pulse         (GimpProgress        *progress);
+static guint32        gimp_sub_progress_get_window_id (GimpProgress        *progress);
+static gboolean       gimp_sub_progress_message       (GimpProgress        *progress,
+                                                       Gimp                *gimp,
+                                                       GimpMessageSeverity  severity,
+                                                       const gchar         *domain,
+                                                       const gchar         *message);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpSubProgress, gimp_sub_progress, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_sub_progress_iface_init))
+
+#define parent_class gimp_sub_progress_parent_class
+
+
+static void
+gimp_sub_progress_class_init (GimpSubProgressClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_sub_progress_finalize;
+  object_class->set_property = gimp_sub_progress_set_property;
+  object_class->get_property = gimp_sub_progress_get_property;
+
+  g_object_class_install_property (object_class, PROP_PROGRESS,
+                                   g_param_spec_object ("progress",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_PROGRESS,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_sub_progress_init (GimpSubProgress *sub)
+{
+  sub->progress = NULL;
+  sub->start    = 0.0;
+  sub->end      = 1.0;
+}
+
+static void
+gimp_sub_progress_finalize (GObject *object)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (object);
+
+  g_clear_object (&sub->progress);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_sub_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start         = gimp_sub_progress_start;
+  iface->end           = gimp_sub_progress_end;
+  iface->is_active     = gimp_sub_progress_is_active;
+  iface->set_text      = gimp_sub_progress_set_text;
+  iface->set_value     = gimp_sub_progress_set_value;
+  iface->get_value     = gimp_sub_progress_get_value;
+  iface->pulse         = gimp_sub_progress_pulse;
+  iface->get_window_id = gimp_sub_progress_get_window_id;
+  iface->message       = gimp_sub_progress_message;
+}
+
+static void
+gimp_sub_progress_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (object);
+
+  switch (property_id)
+    {
+    case PROP_PROGRESS:
+      g_return_if_fail (sub->progress == NULL);
+      sub->progress = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_sub_progress_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (object);
+
+  switch (property_id)
+    {
+    case PROP_PROGRESS:
+      g_value_set_object (value, sub->progress);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpProgress *
+gimp_sub_progress_start (GimpProgress *progress,
+                         gboolean      cancellable,
+                         const gchar  *message)
+{
+  /* does nothing */
+  return NULL;
+}
+
+static void
+gimp_sub_progress_end (GimpProgress *progress)
+{
+  /* does nothing */
+}
+
+static gboolean
+gimp_sub_progress_is_active (GimpProgress *progress)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
+
+  if (sub->progress)
+    return gimp_progress_is_active (sub->progress);
+
+  return FALSE;
+}
+
+static void
+gimp_sub_progress_set_text (GimpProgress *progress,
+                            const gchar  *message)
+{
+  /* does nothing */
+}
+
+static void
+gimp_sub_progress_set_value (GimpProgress *progress,
+                             gdouble       percentage)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
+
+  if (sub->progress)
+    gimp_progress_set_value (sub->progress,
+                             sub->start + percentage * (sub->end - sub->start));
+}
+
+static gdouble
+gimp_sub_progress_get_value (GimpProgress *progress)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
+
+  if (sub->progress)
+    return gimp_progress_get_value (sub->progress);
+
+  return 0.0;
+}
+
+static void
+gimp_sub_progress_pulse (GimpProgress *progress)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
+
+  if (sub->progress)
+    gimp_progress_pulse (sub->progress);
+}
+
+static guint32
+gimp_sub_progress_get_window_id (GimpProgress *progress)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
+
+  if (sub->progress)
+    return gimp_progress_get_window_id (sub->progress);
+
+  return 0;
+}
+
+static gboolean
+gimp_sub_progress_message (GimpProgress        *progress,
+                           Gimp                *gimp,
+                           GimpMessageSeverity  severity,
+                           const gchar         *domain,
+                           const gchar         *message)
+{
+  GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
+
+  if (sub->progress)
+    return gimp_progress_message (sub->progress,
+                                  gimp, severity, domain, message);
+
+  return FALSE;
+}
+
+/**
+ * gimp_sub_progress_new:
+ * @progress: parent progress or %NULL
+ *
+ * GimpSubProgress implements the GimpProgress interface and can be
+ * used wherever a GimpProgress is needed. It maps progress
+ * information to a sub-range of its parent @progress. This is useful
+ * when an action breaks down into multiple sub-actions that itself
+ * need a #GimpProgress pointer. See gimp_image_scale() for an example.
+ *
+ * Return value: a new #GimpProgress object
+ */
+GimpProgress *
+gimp_sub_progress_new (GimpProgress *progress)
+{
+  GimpSubProgress *sub;
+
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+
+  sub = g_object_new (GIMP_TYPE_SUB_PROGRESS,
+                      "progress", progress,
+                      NULL);
+
+  return GIMP_PROGRESS (sub);
+}
+
+/**
+ * gimp_sub_progress_set_range:
+ * @start: start value of range on the parent process
+ * @end:   end value of range on the parent process
+ *
+ * Sets a range on the parent progress that this @progress should be
+ * mapped to.
+ */
+void
+gimp_sub_progress_set_range (GimpSubProgress *progress,
+                             gdouble          start,
+                             gdouble          end)
+{
+  g_return_if_fail (GIMP_IS_SUB_PROGRESS (progress));
+  g_return_if_fail (start < end);
+
+  progress->start = start;
+  progress->end   = end;
+}
+
+/**
+ * gimp_sub_progress_set_step:
+ * @index:     step index
+ * @num_steps: number of steps
+ *
+ * A more convenient form of gimp_sub_progress_set_range().
+ */
+void
+gimp_sub_progress_set_step (GimpSubProgress *progress,
+                            gint             index,
+                            gint             num_steps)
+{
+  g_return_if_fail (GIMP_IS_SUB_PROGRESS (progress));
+  g_return_if_fail (index < num_steps && num_steps > 0);
+
+  progress->start = (gdouble) index / num_steps;
+  progress->end   = (gdouble) (index + 1) / num_steps;
+}
diff --git a/app/core/gimpsubprogress.h b/app/core/gimpsubprogress.h
new file mode 100644
index 0000000..c031182
--- /dev/null
+++ b/app/core/gimpsubprogress.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SUB_PROGRESS_H__
+#define __GIMP_SUB_PROGRESS_H__
+
+
+#define GIMP_TYPE_SUB_PROGRESS            (gimp_sub_progress_get_type ())
+#define GIMP_SUB_PROGRESS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SUB_PROGRESS, GimpSubProgress))
+#define GIMP_SUB_PROGRESS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SUB_PROGRESS, GimpSubProgressClass))
+#define GIMP_IS_SUB_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SUB_PROGRESS))
+#define GIMP_IS_SUB_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SUB_PROGRESS))
+#define GIMP_SUB_PROGRESS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SUB_PROGRESS, GimpSubProgressClass))
+
+
+typedef struct _GimpSubProgressClass GimpSubProgressClass;
+
+struct _GimpSubProgress
+{
+  GObject       parent_instance;
+
+  GimpProgress *progress;
+  gdouble       start;
+  gdouble       end;
+};
+
+struct _GimpSubProgressClass
+{
+  GObjectClass  parent_class;
+};
+
+
+GType          gimp_sub_progress_get_type (void) G_GNUC_CONST;
+
+GimpProgress * gimp_sub_progress_new       (GimpProgress    *progress);
+void           gimp_sub_progress_set_range (GimpSubProgress *progress,
+                                            gdouble          start,
+                                            gdouble          end);
+void           gimp_sub_progress_set_step  (GimpSubProgress *progress,
+                                            gint             index,
+                                            gint             num_steps);
+
+
+
+#endif /* __GIMP_SUB_PROGRESS_H__ */
diff --git a/app/core/gimpsymmetry-mandala.c b/app/core/gimpsymmetry-mandala.c
new file mode 100644
index 0000000..668819a
--- /dev/null
+++ b/app/core/gimpsymmetry-mandala.c
@@ -0,0 +1,574 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry-mandala.c
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-cairo.h"
+#include "gimpdrawable.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-symmetry.h"
+#include "gimpitem.h"
+#include "gimpsymmetry-mandala.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CENTER_X,
+  PROP_CENTER_Y,
+  PROP_SIZE,
+  PROP_DISABLE_TRANSFORMATION,
+  PROP_ENABLE_REFLECTION,
+};
+
+
+/* Local function prototypes */
+
+static void       gimp_mandala_constructed        (GObject      *object);
+static void       gimp_mandala_finalize           (GObject      *object);
+static void       gimp_mandala_set_property       (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void       gimp_mandala_get_property       (GObject      *object,
+                                                   guint         property_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+static void       gimp_mandala_active_changed     (GimpSymmetry *sym);
+
+static void       gimp_mandala_add_guide          (GimpMandala         *mandala,
+                                                   GimpOrientationType  orientation);
+static void       gimp_mandala_remove_guide       (GimpMandala         *mandala,
+                                                   GimpOrientationType  orientation);
+static void       gimp_mandala_guide_removed_cb   (GObject      *object,
+                                                   GimpMandala  *mandala);
+static void       gimp_mandala_guide_position_cb  (GObject      *object,
+                                                   GParamSpec   *pspec,
+                                                   GimpMandala  *mandala);
+
+static void       gimp_mandala_update_strokes     (GimpSymmetry *mandala,
+                                                   GimpDrawable *drawable,
+                                                   GimpCoords   *origin);
+static void       gimp_mandala_get_transform      (GimpSymmetry *mandala,
+                                                   gint          stroke,
+                                                   gdouble      *angle,
+                                                   gboolean     *reflect);
+static void    gimp_mandala_image_size_changed_cb (GimpImage    *image,
+                                                   gint          previous_origin_x,
+                                                   gint          previous_origin_y,
+                                                   gint          previous_width,
+                                                   gint          previous_height,
+                                                   GimpSymmetry *sym);
+
+
+G_DEFINE_TYPE (GimpMandala, gimp_mandala, GIMP_TYPE_SYMMETRY)
+
+#define parent_class gimp_mandala_parent_class
+
+
+static void
+gimp_mandala_class_init (GimpMandalaClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpSymmetryClass *symmetry_class = GIMP_SYMMETRY_CLASS (klass);
+  GParamSpec        *pspec;
+
+  object_class->constructed         = gimp_mandala_constructed;
+  object_class->finalize            = gimp_mandala_finalize;
+  object_class->set_property        = gimp_mandala_set_property;
+  object_class->get_property        = gimp_mandala_get_property;
+
+  symmetry_class->label             = _("Mandala");
+  symmetry_class->update_strokes    = gimp_mandala_update_strokes;
+  symmetry_class->get_transform     = gimp_mandala_get_transform;
+  symmetry_class->active_changed    = gimp_mandala_active_changed;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_CENTER_X,
+                           "center-x",
+                           _("Center abscissa"),
+                           NULL,
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "center-x");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate");
+  gegl_param_spec_set_property_key (pspec, "axis", "x");
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_CENTER_Y,
+                           "center-y",
+                           _("Center ordinate"),
+                           NULL,
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "center-y");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate");
+  gegl_param_spec_set_property_key (pspec, "axis", "y");
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_SIZE,
+                        "size",
+                        _("Number of points"),
+                        NULL,
+                        1, 100, 6.0,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DISABLE_TRANSFORMATION,
+                            "disable-transformation",
+                            _("Disable brush transform"),
+                            _("Disable brush rotation"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ENABLE_REFLECTION,
+                            "enable-reflection",
+                            _("Kaleidoscope"),
+                            _("Reflect consecutive strokes"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_SYMMETRY_PARAM_GUI);
+}
+
+static void
+gimp_mandala_init (GimpMandala *mandala)
+{
+}
+
+static void
+gimp_mandala_constructed (GObject *object)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (object);
+
+  g_signal_connect_object (sym->image, "size-changed-detailed",
+                           G_CALLBACK (gimp_mandala_image_size_changed_cb),
+                           sym, 0);
+}
+
+static void
+gimp_mandala_finalize (GObject *object)
+{
+  GimpMandala  *mandala = GIMP_MANDALA (object);
+
+  g_clear_object (&mandala->horizontal_guide);
+  g_clear_object (&mandala->vertical_guide);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_mandala_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GimpMandala *mandala = GIMP_MANDALA (object);
+  GimpImage   *image   = GIMP_SYMMETRY (mandala)->image;
+
+  switch (property_id)
+    {
+    case PROP_CENTER_X:
+      if (g_value_get_double (value) > 0.0 &&
+          g_value_get_double (value) < (gdouble) gimp_image_get_width (image))
+        {
+          mandala->center_x = g_value_get_double (value);
+
+          if (mandala->vertical_guide)
+            {
+              g_signal_handlers_block_by_func (mandala->vertical_guide,
+                                               gimp_mandala_guide_position_cb,
+                                               mandala);
+              gimp_image_move_guide (image, mandala->vertical_guide,
+                                     mandala->center_x,
+                                     FALSE);
+              g_signal_handlers_unblock_by_func (mandala->vertical_guide,
+                                                 gimp_mandala_guide_position_cb,
+                                                 mandala);
+            }
+        }
+      break;
+
+    case PROP_CENTER_Y:
+      if (g_value_get_double (value) > 0.0 &&
+          g_value_get_double (value) < (gdouble) gimp_image_get_height (image))
+        {
+          mandala->center_y = g_value_get_double (value);
+
+          if (mandala->horizontal_guide)
+            {
+              g_signal_handlers_block_by_func (mandala->horizontal_guide,
+                                               gimp_mandala_guide_position_cb,
+                                               mandala);
+              gimp_image_move_guide (image, mandala->horizontal_guide,
+                                     mandala->center_y,
+                                     FALSE);
+              g_signal_handlers_unblock_by_func (mandala->horizontal_guide,
+                                                 gimp_mandala_guide_position_cb,
+                                                 mandala);
+            }
+        }
+      break;
+
+    case PROP_SIZE:
+      mandala->size = g_value_get_int (value);
+      break;
+
+    case PROP_DISABLE_TRANSFORMATION:
+      mandala->disable_transformation = g_value_get_boolean (value);
+      break;
+
+    case PROP_ENABLE_REFLECTION:
+      mandala->enable_reflection = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mandala_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GimpMandala *mandala = GIMP_MANDALA (object);
+
+  switch (property_id)
+    {
+    case PROP_CENTER_X:
+      g_value_set_double (value, mandala->center_x);
+      break;
+    case PROP_CENTER_Y:
+      g_value_set_double (value, mandala->center_y);
+      break;
+    case PROP_SIZE:
+      g_value_set_int (value, mandala->size);
+      break;
+    case PROP_DISABLE_TRANSFORMATION:
+      g_value_set_boolean (value, mandala->disable_transformation);
+      break;
+    case PROP_ENABLE_REFLECTION:
+      g_value_set_boolean (value, mandala->enable_reflection);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mandala_active_changed (GimpSymmetry *sym)
+{
+  GimpMandala *mandala = GIMP_MANDALA (sym);
+
+  if (sym->active)
+    {
+      if (! mandala->horizontal_guide)
+        gimp_mandala_add_guide (mandala, GIMP_ORIENTATION_HORIZONTAL);
+
+      if (! mandala->vertical_guide)
+        gimp_mandala_add_guide (mandala, GIMP_ORIENTATION_VERTICAL);
+    }
+  else
+    {
+      if (mandala->horizontal_guide)
+        gimp_mandala_remove_guide (mandala, GIMP_ORIENTATION_HORIZONTAL);
+
+      if (mandala->vertical_guide)
+        gimp_mandala_remove_guide (mandala, GIMP_ORIENTATION_VERTICAL);
+    }
+}
+
+static void
+gimp_mandala_add_guide (GimpMandala         *mandala,
+                        GimpOrientationType  orientation)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (mandala);
+  GimpImage    *image;
+  Gimp         *gimp;
+  GimpGuide    *guide;
+  gint          position;
+
+  image = sym->image;
+  gimp  = image->gimp;
+
+  guide = gimp_guide_custom_new (orientation,
+                                 gimp->next_guide_ID++,
+                                 GIMP_GUIDE_STYLE_MANDALA);
+
+  if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+    {
+      mandala->horizontal_guide = guide;
+
+      /* Mandala guide position at first activation is at canvas middle. */
+      if (mandala->center_y < 1.0)
+        mandala->center_y = (gdouble) gimp_image_get_height (image) / 2.0;
+
+      position = (gint) mandala->center_y;
+    }
+  else
+    {
+      mandala->vertical_guide = guide;
+
+      /* Mandala guide position at first activation is at canvas middle. */
+      if (mandala->center_x < 1.0)
+        mandala->center_x = (gdouble) gimp_image_get_width (image) / 2.0;
+
+      position = (gint) mandala->center_x;
+    }
+
+  g_signal_connect (guide, "removed",
+                    G_CALLBACK (gimp_mandala_guide_removed_cb),
+                    mandala);
+
+  gimp_image_add_guide (image, guide, position);
+
+  g_signal_connect (guide, "notify::position",
+                    G_CALLBACK (gimp_mandala_guide_position_cb),
+                    mandala);
+}
+
+static void
+gimp_mandala_remove_guide (GimpMandala         *mandala,
+                           GimpOrientationType  orientation)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (mandala);
+  GimpImage    *image;
+  GimpGuide    *guide;
+
+  image = sym->image;
+  guide = (orientation == GIMP_ORIENTATION_HORIZONTAL) ?
+    mandala->horizontal_guide : mandala->vertical_guide;
+
+  g_signal_handlers_disconnect_by_func (guide,
+                                        gimp_mandala_guide_removed_cb,
+                                        mandala);
+  g_signal_handlers_disconnect_by_func (guide,
+                                        gimp_mandala_guide_position_cb,
+                                        mandala);
+
+  gimp_image_remove_guide (image, guide, FALSE);
+  g_object_unref (guide);
+
+  if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+    mandala->horizontal_guide = NULL;
+  else
+    mandala->vertical_guide = NULL;
+}
+
+static void
+gimp_mandala_guide_removed_cb (GObject     *object,
+                               GimpMandala *mandala)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (mandala);
+
+  g_signal_handlers_disconnect_by_func (object,
+                                        gimp_mandala_guide_removed_cb,
+                                        mandala);
+  g_signal_handlers_disconnect_by_func (object,
+                                        gimp_mandala_guide_position_cb,
+                                        mandala);
+
+  if (GIMP_GUIDE (object) == mandala->horizontal_guide)
+    {
+      g_object_unref (mandala->horizontal_guide);
+
+      mandala->horizontal_guide = NULL;
+      mandala->center_y         = 0.0;
+
+      gimp_mandala_remove_guide (mandala, GIMP_ORIENTATION_VERTICAL);
+    }
+  else if (GIMP_GUIDE (object) == mandala->vertical_guide)
+    {
+      g_object_unref (mandala->vertical_guide);
+      mandala->vertical_guide = NULL;
+      mandala->center_x       = 0.0;
+
+      gimp_mandala_remove_guide (mandala, GIMP_ORIENTATION_HORIZONTAL);
+    }
+
+  gimp_image_symmetry_remove (sym->image, sym);
+}
+
+static void
+gimp_mandala_guide_position_cb (GObject     *object,
+                                GParamSpec  *pspec,
+                                GimpMandala *mandala)
+{
+  GimpGuide *guide = GIMP_GUIDE (object);
+
+  if (guide == mandala->horizontal_guide)
+    {
+      g_object_set (G_OBJECT (mandala),
+                    "center-y", (gdouble) gimp_guide_get_position (guide),
+                    NULL);
+    }
+  else if (guide == mandala->vertical_guide)
+    {
+      g_object_set (G_OBJECT (mandala),
+                    "center-x", (gdouble) gimp_guide_get_position (guide),
+                    NULL);
+    }
+}
+
+static void
+gimp_mandala_update_strokes (GimpSymmetry *sym,
+                             GimpDrawable *drawable,
+                             GimpCoords   *origin)
+{
+  GimpMandala *mandala = GIMP_MANDALA (sym);
+  GimpCoords  *coords;
+  GimpMatrix3  matrix;
+  gdouble      slice_angle;
+  gdouble      mid_slice_angle = 0.0;
+  gdouble      center_x, center_y;
+  gint         offset_x, offset_y;
+  gint         i;
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
+
+  center_x = mandala->center_x - offset_x;
+  center_y = mandala->center_y - offset_y;
+
+  g_list_free_full (sym->strokes, g_free);
+  sym->strokes = NULL;
+
+  coords = g_memdup (sym->origin, sizeof (GimpCoords));
+  sym->strokes = g_list_prepend (sym->strokes, coords);
+
+  /* The angle of each slice, in radians. */
+  slice_angle = 2.0 * G_PI / mandala->size;
+
+  if (mandala->enable_reflection)
+    {
+      /* Find out in which slice the user is currently drawing. */
+      gdouble angle = atan2 (sym->origin->y - center_y,
+                             sym->origin->x - center_x);
+      gint slice_no = (int) floor(angle/slice_angle);
+
+      /* Angle where the middle of that slice is. */
+      mid_slice_angle = slice_no * slice_angle + slice_angle / 2.0;
+    }
+
+  for (i = 1; i < mandala->size; i++)
+    {
+      gdouble new_x, new_y;
+
+      coords = g_memdup (sym->origin, sizeof (GimpCoords));
+      gimp_matrix3_identity (&matrix);
+      gimp_matrix3_translate (&matrix,
+                              -center_x,
+                              -center_y);
+      if (mandala->enable_reflection && i % 2 == 1)
+        {
+          /* Reflecting over the mid_slice_angle axis, reflects slice without changing position. */
+          gimp_matrix3_rotate(&matrix, -mid_slice_angle);
+          gimp_matrix3_scale (&matrix, 1, -1);
+          gimp_matrix3_rotate(&matrix, mid_slice_angle - i * slice_angle);
+        }
+      else
+        {
+          gimp_matrix3_rotate (&matrix, - i * slice_angle);
+        }
+      gimp_matrix3_translate (&matrix,
+                              +center_x,
+                              +center_y);
+      gimp_matrix3_transform_point (&matrix,
+                                    coords->x,
+                                    coords->y,
+                                    &new_x,
+                                    &new_y);
+      coords->x = new_x;
+      coords->y = new_y;
+      sym->strokes = g_list_prepend (sym->strokes, coords);
+    }
+
+  sym->strokes = g_list_reverse (sym->strokes);
+
+  g_signal_emit_by_name (sym, "strokes-updated", sym->image);
+}
+
+static void
+gimp_mandala_get_transform (GimpSymmetry *sym,
+                            gint          stroke,
+                            gdouble      *angle,
+                            gboolean     *reflect)
+{
+  GimpMandala *mandala = GIMP_MANDALA (sym);
+  gdouble     slice_angle;
+
+  if (mandala->disable_transformation)
+    return;
+
+  slice_angle = 360.0 / mandala->size;
+
+  if (mandala->enable_reflection && stroke % 2 == 1)
+    {
+      /* Find out in which slice the user is currently drawing. */
+      gdouble origin_angle = gimp_rad_to_deg (atan2 (sym->origin->y - mandala->center_y,
+                                                     sym->origin->x - mandala->center_x));
+      gint slice_no = (int) floor(origin_angle/slice_angle);
+
+      /* Angle where the middle of that slice is. */
+      gdouble mid_slice_angle = slice_no * slice_angle + slice_angle / 2.0;
+
+      *angle = 180.0 - (-2 * mid_slice_angle + stroke * slice_angle) ;
+      *reflect = TRUE;
+    }
+  else
+    {
+      *angle = stroke * slice_angle;
+    }
+}
+
+static void
+gimp_mandala_image_size_changed_cb (GimpImage    *image,
+                                    gint          previous_origin_x,
+                                    gint          previous_origin_y,
+                                    gint          previous_width,
+                                    gint          previous_height,
+                                    GimpSymmetry *sym)
+{
+  if (previous_width != gimp_image_get_width (image) ||
+      previous_height != gimp_image_get_height (image))
+    {
+      g_signal_emit_by_name (sym, "gui-param-changed", sym->image);
+    }
+}
diff --git a/app/core/gimpsymmetry-mandala.h b/app/core/gimpsymmetry-mandala.h
new file mode 100644
index 0000000..0978a40
--- /dev/null
+++ b/app/core/gimpsymmetry-mandala.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry-mandala.h
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MANDALA_H__
+#define __GIMP_MANDALA_H__
+
+
+#include "gimpsymmetry.h"
+
+
+#define GIMP_TYPE_MANDALA            (gimp_mandala_get_type ())
+#define GIMP_MANDALA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MANDALA, GimpMandala))
+#define GIMP_MANDALA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MANDALA, GimpMandalaClass))
+#define GIMP_IS_MANDALA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MANDALA))
+#define GIMP_IS_MANDALA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MANDALA))
+#define GIMP_MANDALA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MANDALA, GimpMandalaClass))
+
+
+typedef struct _GimpMandalaClass GimpMandalaClass;
+
+struct _GimpMandala
+{
+  GimpSymmetry  parent_instance;
+
+  gdouble       center_x;
+  gdouble       center_y;
+  gint          size;
+  gboolean      disable_transformation;
+  gboolean      enable_reflection;
+
+  GimpGuide    *horizontal_guide;
+  GimpGuide    *vertical_guide;
+};
+
+struct _GimpMandalaClass
+{
+  GimpSymmetryClass  parent_class;
+};
+
+
+GType   gimp_mandala_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MANDALA_H__  */
diff --git a/app/core/gimpsymmetry-mirror.c b/app/core/gimpsymmetry-mirror.c
new file mode 100644
index 0000000..66a0eaa
--- /dev/null
+++ b/app/core/gimpsymmetry-mirror.c
@@ -0,0 +1,738 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry-mirror.c
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimp-cairo.h"
+#include "gimpbrush.h"
+#include "gimpguide.h"
+#include "gimpimage.h"
+#include "gimpimage-guides.h"
+#include "gimpimage-symmetry.h"
+#include "gimpitem.h"
+#include "gimpsymmetry-mirror.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_HORIZONTAL_SYMMETRY,
+  PROP_VERTICAL_SYMMETRY,
+  PROP_POINT_SYMMETRY,
+  PROP_DISABLE_TRANSFORMATION,
+  PROP_MIRROR_POSITION_X,
+  PROP_MIRROR_POSITION_Y
+};
+
+
+/* Local function prototypes */
+
+static void       gimp_mirror_constructed             (GObject             *object);
+static void       gimp_mirror_finalize                (GObject             *object);
+static void       gimp_mirror_set_property            (GObject             *object,
+                                                       guint                property_id,
+                                                       const GValue        *value,
+                                                       GParamSpec          *pspec);
+static void       gimp_mirror_get_property            (GObject             *object,
+                                                       guint                property_id,
+                                                       GValue              *value,
+                                                       GParamSpec          *pspec);
+
+static void       gimp_mirror_update_strokes          (GimpSymmetry        *mirror,
+                                                       GimpDrawable        *drawable,
+                                                       GimpCoords          *origin);
+static void       gimp_mirror_get_transform           (GimpSymmetry        *mirror,
+                                                       gint                 stroke,
+                                                       gdouble             *angle,
+                                                       gboolean            *reflect);
+static void       gimp_mirror_reset                   (GimpMirror          *mirror);
+static void       gimp_mirror_add_guide               (GimpMirror          *mirror,
+                                                       GimpOrientationType  orientation);
+static void       gimp_mirror_remove_guide            (GimpMirror          *mirror,
+                                                       GimpOrientationType  orientation);
+static void       gimp_mirror_guide_removed_cb        (GObject             *object,
+                                                       GimpMirror          *mirror);
+static void       gimp_mirror_guide_position_cb       (GObject             *object,
+                                                       GParamSpec          *pspec,
+                                                       GimpMirror          *mirror);
+static void       gimp_mirror_active_changed          (GimpSymmetry        *sym);
+static void       gimp_mirror_set_horizontal_symmetry (GimpMirror          *mirror,
+                                                       gboolean             active);
+static void       gimp_mirror_set_vertical_symmetry   (GimpMirror          *mirror,
+                                                       gboolean             active);
+static void       gimp_mirror_set_point_symmetry      (GimpMirror          *mirror,
+                                                       gboolean             active);
+
+static void       gimp_mirror_image_size_changed_cb   (GimpImage           *image,
+                                                       gint                 previous_origin_x,
+                                                       gint                 previous_origin_y,
+                                                       gint                 previous_width,
+                                                       gint                 previous_height,
+                                                       GimpSymmetry        *sym);
+
+G_DEFINE_TYPE (GimpMirror, gimp_mirror, GIMP_TYPE_SYMMETRY)
+
+#define parent_class gimp_mirror_parent_class
+
+
+static void
+gimp_mirror_class_init (GimpMirrorClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpSymmetryClass *symmetry_class = GIMP_SYMMETRY_CLASS (klass);
+  GParamSpec        *pspec;
+
+  object_class->constructed         = gimp_mirror_constructed;
+  object_class->finalize            = gimp_mirror_finalize;
+  object_class->set_property        = gimp_mirror_set_property;
+  object_class->get_property        = gimp_mirror_get_property;
+
+  symmetry_class->label             = _("Mirror");
+  symmetry_class->update_strokes    = gimp_mirror_update_strokes;
+  symmetry_class->get_transform     = gimp_mirror_get_transform;
+  symmetry_class->active_changed    = gimp_mirror_active_changed;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_HORIZONTAL_SYMMETRY,
+                            "horizontal-symmetry",
+                            _("Horizontal Symmetry"),
+                            _("Reflect the initial stroke across a horizontal axis"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VERTICAL_SYMMETRY,
+                            "vertical-symmetry",
+                            _("Vertical Symmetry"),
+                            _("Reflect the initial stroke across a vertical axis"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_POINT_SYMMETRY,
+                            "point-symmetry",
+                            _("Central Symmetry"),
+                            _("Invert the initial stroke through a point"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DISABLE_TRANSFORMATION,
+                            "disable-transformation",
+                            _("Disable brush transform"),
+                            _("Disable brush reflection"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_MIRROR_POSITION_X,
+                           "mirror-position-x",
+                           _("Vertical axis position"),
+                           NULL,
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "mirror-position-x");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate");
+  gegl_param_spec_set_property_key (pspec, "axis", "x");
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_MIRROR_POSITION_Y,
+                           "mirror-position-y",
+                           _("Horizontal axis position"),
+                           NULL,
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "mirror-position-y");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate");
+  gegl_param_spec_set_property_key (pspec, "axis", "y");
+}
+
+static void
+gimp_mirror_init (GimpMirror *mirror)
+{
+}
+
+static void
+gimp_mirror_constructed (GObject *object)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (object);
+
+  g_signal_connect_object (sym->image, "size-changed-detailed",
+                           G_CALLBACK (gimp_mirror_image_size_changed_cb),
+                           sym, 0);
+}
+
+static void
+gimp_mirror_finalize (GObject *object)
+{
+  GimpMirror *mirror = GIMP_MIRROR (object);
+
+  g_clear_object (&mirror->horizontal_guide);
+  g_clear_object (&mirror->vertical_guide);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_mirror_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpMirror *mirror = GIMP_MIRROR (object);
+  GimpImage  *image  = GIMP_SYMMETRY (mirror)->image;
+
+  switch (property_id)
+    {
+    case PROP_HORIZONTAL_SYMMETRY:
+      gimp_mirror_set_horizontal_symmetry (mirror,
+                                           g_value_get_boolean (value));
+      break;
+
+    case PROP_VERTICAL_SYMMETRY:
+      gimp_mirror_set_vertical_symmetry (mirror,
+                                         g_value_get_boolean (value));
+      break;
+
+    case PROP_POINT_SYMMETRY:
+      gimp_mirror_set_point_symmetry (mirror,
+                                      g_value_get_boolean (value));
+      break;
+
+    case PROP_DISABLE_TRANSFORMATION:
+      mirror->disable_transformation = g_value_get_boolean (value);
+      break;
+
+    case PROP_MIRROR_POSITION_X:
+      if (g_value_get_double (value) >= 0.0 &&
+          g_value_get_double (value) < (gdouble) gimp_image_get_width (image))
+        {
+          mirror->mirror_position_x = g_value_get_double (value);
+
+          if (mirror->vertical_guide)
+            {
+              g_signal_handlers_block_by_func (mirror->vertical_guide,
+                                               gimp_mirror_guide_position_cb,
+                                               mirror);
+              gimp_image_move_guide (image, mirror->vertical_guide,
+                                     mirror->mirror_position_x,
+                                     FALSE);
+              g_signal_handlers_unblock_by_func (mirror->vertical_guide,
+                                                 gimp_mirror_guide_position_cb,
+                                                 mirror);
+            }
+        }
+      break;
+
+    case PROP_MIRROR_POSITION_Y:
+      if (g_value_get_double (value) >= 0.0 &&
+          g_value_get_double (value) < (gdouble) gimp_image_get_height (image))
+        {
+          mirror->mirror_position_y = g_value_get_double (value);
+
+          if (mirror->horizontal_guide)
+            {
+              g_signal_handlers_block_by_func (mirror->horizontal_guide,
+                                               gimp_mirror_guide_position_cb,
+                                               mirror);
+              gimp_image_move_guide (image, mirror->horizontal_guide,
+                                     mirror->mirror_position_y,
+                                     FALSE);
+              g_signal_handlers_unblock_by_func (mirror->horizontal_guide,
+                                                 gimp_mirror_guide_position_cb,
+                                                 mirror);
+            }
+        }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mirror_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpMirror *mirror = GIMP_MIRROR (object);
+
+  switch (property_id)
+    {
+    case PROP_HORIZONTAL_SYMMETRY:
+      g_value_set_boolean (value, mirror->horizontal_mirror);
+      break;
+    case PROP_VERTICAL_SYMMETRY:
+      g_value_set_boolean (value, mirror->vertical_mirror);
+      break;
+    case PROP_POINT_SYMMETRY:
+      g_value_set_boolean (value, mirror->point_symmetry);
+      break;
+    case PROP_DISABLE_TRANSFORMATION:
+      g_value_set_boolean (value, mirror->disable_transformation);
+      break;
+    case PROP_MIRROR_POSITION_X:
+      g_value_set_double (value, mirror->mirror_position_x);
+      break;
+    case PROP_MIRROR_POSITION_Y:
+      g_value_set_double (value, mirror->mirror_position_y);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mirror_update_strokes (GimpSymmetry *sym,
+                            GimpDrawable *drawable,
+                            GimpCoords   *origin)
+{
+  GimpMirror *mirror  = GIMP_MIRROR (sym);
+  GList      *strokes = NULL;
+  GimpCoords *coords;
+  gdouble     mirror_position_x, mirror_position_y;
+  gint        offset_x,          offset_y;
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
+
+  mirror_position_x = mirror->mirror_position_x - offset_x;
+  mirror_position_y = mirror->mirror_position_y - offset_y;
+
+  g_list_free_full (sym->strokes, g_free);
+  strokes = g_list_prepend (strokes,
+                            g_memdup (origin, sizeof (GimpCoords)));
+
+  if (mirror->horizontal_mirror)
+    {
+      coords = g_memdup (origin, sizeof (GimpCoords));
+      coords->y = 2.0 * mirror_position_y - origin->y;
+      strokes = g_list_prepend (strokes, coords);
+    }
+
+  if (mirror->vertical_mirror)
+    {
+      coords = g_memdup (origin, sizeof (GimpCoords));
+      coords->x = 2.0 * mirror_position_x - origin->x;
+      strokes = g_list_prepend (strokes, coords);
+    }
+
+  if (mirror->point_symmetry)
+    {
+      coords = g_memdup (origin, sizeof (GimpCoords));
+      coords->x = 2.0 * mirror_position_x - origin->x;
+      coords->y = 2.0 * mirror_position_y - origin->y;
+      strokes = g_list_prepend (strokes, coords);
+    }
+
+  sym->strokes = g_list_reverse (strokes);
+
+  g_signal_emit_by_name (sym, "strokes-updated", sym->image);
+}
+
+static void
+gimp_mirror_get_transform (GimpSymmetry *sym,
+                           gint          stroke,
+                           gdouble      *angle,
+                           gboolean     *reflect)
+{
+  GimpMirror *mirror = GIMP_MIRROR (sym);
+
+  if (mirror->disable_transformation)
+    return;
+
+  if (! mirror->horizontal_mirror && stroke >= 1)
+    stroke++;
+
+  if (! mirror->vertical_mirror && stroke >= 2)
+    stroke++;
+
+  switch (stroke)
+    {
+    /* original */
+    case 0:
+      break;
+
+    /* horizontal */
+    case 1:
+      *angle   = 180.0;
+      *reflect = TRUE;
+      break;
+
+    /* vertical */
+    case 2:
+      *reflect = TRUE;
+      break;
+
+    /* central */
+    case 3:
+      *angle   = 180.0;
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
+
+static void
+gimp_mirror_reset (GimpMirror *mirror)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (mirror);
+
+  if (sym->origin)
+    {
+      gimp_symmetry_set_origin (sym, sym->drawable,
+                                sym->origin);
+    }
+}
+
+static void
+gimp_mirror_add_guide (GimpMirror          *mirror,
+                       GimpOrientationType  orientation)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (mirror);
+  GimpImage    *image;
+  Gimp         *gimp;
+  GimpGuide    *guide;
+  gdouble       position;
+
+  image = sym->image;
+  gimp  = image->gimp;
+
+  guide = gimp_guide_custom_new (orientation,
+                                 gimp->next_guide_ID++,
+                                 GIMP_GUIDE_STYLE_MIRROR);
+
+  if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+    {
+      /* Mirror guide position at first activation is at canvas middle. */
+      if (mirror->mirror_position_y < 1.0)
+        position = gimp_image_get_height (image) / 2.0;
+      else
+        position = mirror->mirror_position_y;
+
+      g_object_set (mirror,
+                    "mirror-position-y", position,
+                    NULL);
+
+      mirror->horizontal_guide = guide;
+    }
+  else
+    {
+      /* Mirror guide position at first activation is at canvas middle. */
+      if (mirror->mirror_position_x < 1.0)
+        position = gimp_image_get_width (image) / 2.0;
+      else
+        position = mirror->mirror_position_x;
+
+      g_object_set (mirror,
+                    "mirror-position-x", position,
+                    NULL);
+
+      mirror->vertical_guide = guide;
+    }
+
+  g_signal_connect (guide, "removed",
+                    G_CALLBACK (gimp_mirror_guide_removed_cb),
+                    mirror);
+
+  gimp_image_add_guide (image, guide, (gint) position);
+
+  g_signal_connect (guide, "notify::position",
+                    G_CALLBACK (gimp_mirror_guide_position_cb),
+                    mirror);
+}
+
+static void
+gimp_mirror_remove_guide (GimpMirror          *mirror,
+                          GimpOrientationType  orientation)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (mirror);
+  GimpImage    *image;
+  GimpGuide    *guide;
+
+  image = sym->image;
+  guide = (orientation == GIMP_ORIENTATION_HORIZONTAL) ?
+    mirror->horizontal_guide : mirror->vertical_guide;
+
+  /* The guide may have already been removed, for instance from GUI. */
+  if (guide)
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (guide),
+                                            gimp_mirror_guide_removed_cb,
+                                            mirror);
+      g_signal_handlers_disconnect_by_func (G_OBJECT (guide),
+                                            gimp_mirror_guide_position_cb,
+                                            mirror);
+
+      gimp_image_remove_guide (image, guide, FALSE);
+      g_object_unref (guide);
+
+      if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+        mirror->horizontal_guide = NULL;
+      else
+        mirror->vertical_guide = NULL;
+    }
+}
+
+static void
+gimp_mirror_guide_removed_cb (GObject    *object,
+                              GimpMirror *mirror)
+{
+  GimpSymmetry *symmetry = GIMP_SYMMETRY (mirror);
+
+  g_signal_handlers_disconnect_by_func (object,
+                                        gimp_mirror_guide_removed_cb,
+                                        mirror);
+  g_signal_handlers_disconnect_by_func (object,
+                                        gimp_mirror_guide_position_cb,
+                                        mirror);
+
+  if (GIMP_GUIDE (object) == mirror->horizontal_guide)
+    {
+      g_object_unref (mirror->horizontal_guide);
+      mirror->horizontal_guide    = NULL;
+
+      g_object_set (mirror,
+                    "horizontal-symmetry", FALSE,
+                    NULL);
+      g_object_set (mirror,
+                    "point-symmetry", FALSE,
+                    NULL);
+      g_object_set (mirror,
+                    "mirror-position-y", 0.0,
+                    NULL);
+
+      if (mirror->vertical_guide &&
+          ! mirror->vertical_mirror)
+        {
+          g_signal_handlers_disconnect_by_func (G_OBJECT (mirror->vertical_guide),
+                                                gimp_mirror_guide_removed_cb,
+                                                mirror);
+          g_signal_handlers_disconnect_by_func (G_OBJECT (mirror->vertical_guide),
+                                                gimp_mirror_guide_position_cb,
+                                                mirror);
+
+          gimp_image_remove_guide (symmetry->image,
+                                   mirror->vertical_guide,
+                                   FALSE);
+          g_clear_object (&mirror->vertical_guide);
+        }
+    }
+  else if (GIMP_GUIDE (object) == mirror->vertical_guide)
+    {
+      g_object_unref (mirror->vertical_guide);
+      mirror->vertical_guide    = NULL;
+
+      g_object_set (mirror,
+                    "vertical-symmetry", FALSE,
+                    NULL);
+      g_object_set (mirror,
+                    "point-symmetry", FALSE,
+                    NULL);
+      g_object_set (mirror,
+                    "mirror-position-x", 0.0,
+                    NULL);
+
+      if (mirror->horizontal_guide &&
+          ! mirror->horizontal_mirror)
+        {
+          g_signal_handlers_disconnect_by_func (G_OBJECT (mirror->horizontal_guide),
+                                                gimp_mirror_guide_removed_cb,
+                                                mirror);
+          g_signal_handlers_disconnect_by_func (G_OBJECT (mirror->horizontal_guide),
+                                                gimp_mirror_guide_position_cb,
+                                                mirror);
+
+          gimp_image_remove_guide (symmetry->image,
+                                   mirror->horizontal_guide,
+                                   FALSE);
+          g_clear_object (&mirror->horizontal_guide);
+        }
+    }
+
+  if (mirror->horizontal_guide == NULL &&
+      mirror->vertical_guide   == NULL)
+    {
+      gimp_image_symmetry_remove (symmetry->image,
+                                  GIMP_SYMMETRY (mirror));
+    }
+  else
+    {
+      gimp_mirror_reset (mirror);
+      g_signal_emit_by_name (mirror, "gui-param-changed",
+                             GIMP_SYMMETRY (mirror)->image);
+    }
+}
+
+static void
+gimp_mirror_guide_position_cb (GObject    *object,
+                               GParamSpec *pspec,
+                               GimpMirror *mirror)
+{
+  GimpGuide *guide = GIMP_GUIDE (object);
+
+  if (guide == mirror->horizontal_guide)
+    {
+      g_object_set (mirror,
+                    "mirror-position-y", (gdouble) gimp_guide_get_position (guide),
+                    NULL);
+    }
+  else if (guide == mirror->vertical_guide)
+    {
+      g_object_set (mirror,
+                    "mirror-position-x", (gdouble) gimp_guide_get_position (guide),
+                    NULL);
+    }
+}
+
+static void
+gimp_mirror_active_changed (GimpSymmetry *sym)
+{
+  GimpMirror *mirror = GIMP_MIRROR (sym);
+
+  if (sym->active)
+    {
+      if ((mirror->horizontal_mirror || mirror->point_symmetry) &&
+          ! mirror->horizontal_guide)
+        gimp_mirror_add_guide (mirror, GIMP_ORIENTATION_HORIZONTAL);
+
+      if ((mirror->vertical_mirror || mirror->point_symmetry) &&
+          ! mirror->vertical_guide)
+        gimp_mirror_add_guide (mirror, GIMP_ORIENTATION_VERTICAL);
+    }
+  else
+    {
+      if (mirror->horizontal_guide)
+        gimp_mirror_remove_guide (mirror, GIMP_ORIENTATION_HORIZONTAL);
+
+      if (mirror->vertical_guide)
+        gimp_mirror_remove_guide (mirror, GIMP_ORIENTATION_VERTICAL);
+    }
+}
+
+static void
+gimp_mirror_set_horizontal_symmetry (GimpMirror *mirror,
+                                     gboolean    active)
+{
+  if (active == mirror->horizontal_mirror)
+    return;
+
+  mirror->horizontal_mirror = active;
+
+  if (active)
+    {
+      if (! mirror->horizontal_guide)
+        gimp_mirror_add_guide (mirror, GIMP_ORIENTATION_HORIZONTAL);
+    }
+  else if (! mirror->point_symmetry)
+    {
+      gimp_mirror_remove_guide (mirror, GIMP_ORIENTATION_HORIZONTAL);
+    }
+
+  gimp_mirror_reset (mirror);
+}
+
+static void
+gimp_mirror_set_vertical_symmetry (GimpMirror *mirror,
+                                   gboolean    active)
+{
+  if (active == mirror->vertical_mirror)
+    return;
+
+  mirror->vertical_mirror = active;
+
+  if (active)
+    {
+      if (! mirror->vertical_guide)
+        gimp_mirror_add_guide (mirror, GIMP_ORIENTATION_VERTICAL);
+    }
+  else if (! mirror->point_symmetry)
+    {
+      gimp_mirror_remove_guide (mirror, GIMP_ORIENTATION_VERTICAL);
+    }
+
+  gimp_mirror_reset (mirror);
+}
+
+static void
+gimp_mirror_set_point_symmetry (GimpMirror *mirror,
+                                gboolean    active)
+{
+  if (active == mirror->point_symmetry)
+    return;
+
+  mirror->point_symmetry = active;
+
+  if (active)
+    {
+      /* Show the horizontal guide unless already shown */
+      if (! mirror->horizontal_guide)
+        gimp_mirror_add_guide (mirror, GIMP_ORIENTATION_HORIZONTAL);
+
+      /* Show the vertical guide unless already shown */
+      if (! mirror->vertical_guide)
+        gimp_mirror_add_guide (mirror, GIMP_ORIENTATION_VERTICAL);
+    }
+  else
+    {
+      /* Remove the horizontal guide unless needed by horizontal mirror */
+      if (! mirror->horizontal_mirror)
+        gimp_mirror_remove_guide (mirror, GIMP_ORIENTATION_HORIZONTAL);
+
+      /* Remove the vertical guide unless needed by vertical mirror */
+      if (! mirror->vertical_mirror)
+        gimp_mirror_remove_guide (mirror, GIMP_ORIENTATION_VERTICAL);
+    }
+
+  gimp_mirror_reset (mirror);
+}
+
+static void
+gimp_mirror_image_size_changed_cb (GimpImage    *image,
+                                   gint          previous_origin_x,
+                                   gint          previous_origin_y,
+                                   gint          previous_width,
+                                   gint          previous_height,
+                                   GimpSymmetry *sym)
+{
+  if (previous_width != gimp_image_get_width (image) ||
+      previous_height != gimp_image_get_height (image))
+    {
+      g_signal_emit_by_name (sym, "gui-param-changed", sym->image);
+    }
+}
diff --git a/app/core/gimpsymmetry-mirror.h b/app/core/gimpsymmetry-mirror.h
new file mode 100644
index 0000000..f9ac26a
--- /dev/null
+++ b/app/core/gimpsymmetry-mirror.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry-mirror.h
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MIRROR_H__
+#define __GIMP_MIRROR_H__
+
+
+#include "gimpsymmetry.h"
+
+
+#define GIMP_TYPE_MIRROR            (gimp_mirror_get_type ())
+#define GIMP_MIRROR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MIRROR, GimpMirror))
+#define GIMP_MIRROR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MIRROR, GimpMirrorClass))
+#define GIMP_IS_MIRROR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MIRROR))
+#define GIMP_IS_MIRROR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MIRROR))
+#define GIMP_MIRROR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MIRROR, GimpMirrorClass))
+
+
+typedef struct _GimpMirrorClass GimpMirrorClass;
+
+struct _GimpMirror
+{
+  GimpSymmetry  parent_instance;
+
+  gboolean      horizontal_mirror;
+  gboolean      vertical_mirror;
+  gboolean      point_symmetry;
+  gboolean      disable_transformation;
+
+  gdouble       mirror_position_y;
+  gdouble       mirror_position_x;
+  GimpGuide    *horizontal_guide;
+  GimpGuide    *vertical_guide;
+};
+
+struct _GimpMirrorClass
+{
+  GimpSymmetryClass  parent_class;
+};
+
+
+GType   gimp_mirror_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MIRROR_H__  */
diff --git a/app/core/gimpsymmetry-tiling.c b/app/core/gimpsymmetry-tiling.c
new file mode 100644
index 0000000..555f584
--- /dev/null
+++ b/app/core/gimpsymmetry-tiling.c
@@ -0,0 +1,442 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry-tiling.c
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpdrawable.h"
+#include "gimpimage.h"
+#include "gimpitem.h"
+#include "gimpsymmetry-tiling.h"
+
+#include "gimp-intl.h"
+
+
+/* Using same epsilon as in GLIB. */
+#define G_DOUBLE_EPSILON        (1e-90)
+
+enum
+{
+  PROP_0,
+
+  PROP_INTERVAL_X,
+  PROP_INTERVAL_Y,
+  PROP_SHIFT,
+  PROP_MAX_X,
+  PROP_MAX_Y
+};
+
+
+/* Local function prototypes */
+
+static void       gimp_tiling_constructed        (GObject      *object);
+static void       gimp_tiling_finalize           (GObject      *object);
+static void       gimp_tiling_set_property       (GObject      *object,
+                                                  guint         property_id,
+                                                  const GValue *value,
+                                                  GParamSpec   *pspec);
+static void       gimp_tiling_get_property       (GObject      *object,
+                                                  guint         property_id,
+                                                  GValue       *value,
+                                                  GParamSpec   *pspec);
+
+static void       gimp_tiling_update_strokes     (GimpSymmetry *tiling,
+                                                  GimpDrawable *drawable,
+                                                  GimpCoords   *origin);
+static void    gimp_tiling_image_size_changed_cb (GimpImage    *image,
+                                                  gint          previous_origin_x,
+                                                  gint          previous_origin_y,
+                                                  gint          previous_width,
+                                                  gint          previous_height,
+                                                  GimpSymmetry *sym);
+
+
+G_DEFINE_TYPE (GimpTiling, gimp_tiling, GIMP_TYPE_SYMMETRY)
+
+#define parent_class gimp_tiling_parent_class
+
+
+static void
+gimp_tiling_class_init (GimpTilingClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpSymmetryClass *symmetry_class = GIMP_SYMMETRY_CLASS (klass);
+  GParamSpec        *pspec;
+
+  object_class->constructed       = gimp_tiling_constructed;
+  object_class->finalize          = gimp_tiling_finalize;
+  object_class->set_property      = gimp_tiling_set_property;
+  object_class->get_property      = gimp_tiling_get_property;
+
+  symmetry_class->label           = _("Tiling");
+  symmetry_class->update_strokes  = gimp_tiling_update_strokes;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_INTERVAL_X,
+                           "interval-x",
+                           _("Interval X"),
+                           _("Interval on the X axis (pixels)"),
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "interval-x");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-distance");
+  gegl_param_spec_set_property_key (pspec, "axis", "x");
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_INTERVAL_Y,
+                           "interval-y",
+                           _("Interval Y"),
+                           _("Interval on the Y axis (pixels)"),
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "interval-y");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-distance");
+  gegl_param_spec_set_property_key (pspec, "axis", "y");
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SHIFT,
+                           "shift",
+                           _("Shift"),
+                           _("X-shift between lines (pixels)"),
+                           0.0, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_SYMMETRY_PARAM_GUI);
+
+  pspec = g_object_class_find_property (object_class, "shift");
+  gegl_param_spec_set_property_key (pspec, "unit", "pixel-distance");
+  gegl_param_spec_set_property_key (pspec, "axis", "x");
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_MAX_X,
+                        "max-x",
+                        _("Max strokes X"),
+                        _("Maximum number of strokes on the X axis"),
+                        0, 100, 0,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_SYMMETRY_PARAM_GUI);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_MAX_Y,
+                        "max-y",
+                        _("Max strokes Y"),
+                        _("Maximum number of strokes on the Y axis"),
+                        0, 100, 0,
+                        GIMP_PARAM_STATIC_STRINGS |
+                        GIMP_SYMMETRY_PARAM_GUI);
+}
+
+static void
+gimp_tiling_init (GimpTiling *tiling)
+{
+}
+
+static void
+gimp_tiling_constructed (GObject *object)
+{
+  GimpSymmetry *sym    = GIMP_SYMMETRY (object);
+  GimpTiling   *tiling = GIMP_TILING (object);
+
+  g_signal_connect_object (sym->image, "size-changed-detailed",
+                           G_CALLBACK (gimp_tiling_image_size_changed_cb),
+                           sym, 0);
+
+  /* Set reasonable defaults. */
+  tiling->interval_x = gimp_image_get_width (sym->image) / 2;
+  tiling->interval_y = gimp_image_get_height (sym->image) / 2;
+}
+
+static void
+gimp_tiling_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tiling_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpTiling   *tiling = GIMP_TILING (object);
+  GimpSymmetry *sym    = GIMP_SYMMETRY (tiling);
+
+  switch (property_id)
+    {
+    case PROP_INTERVAL_X:
+      if (sym->image)
+        {
+          gdouble new_x = g_value_get_double (value);
+
+          if (new_x < gimp_image_get_width (sym->image))
+            {
+              tiling->interval_x = new_x;
+
+              if (tiling->interval_x <= tiling->shift + G_DOUBLE_EPSILON)
+                {
+                  GValue val = G_VALUE_INIT;
+
+                  g_value_init (&val, G_TYPE_DOUBLE);
+                  g_value_set_double (&val, 0.0);
+                  g_object_set_property (G_OBJECT (object), "shift", &val);
+                }
+              if (sym->drawable)
+                gimp_tiling_update_strokes (sym, sym->drawable, sym->origin);
+            }
+        }
+      break;
+
+    case PROP_INTERVAL_Y:
+        {
+          gdouble new_y = g_value_get_double (value);
+
+          if (new_y < gimp_image_get_height (sym->image))
+            {
+              tiling->interval_y = new_y;
+
+              if (tiling->interval_y <= G_DOUBLE_EPSILON)
+                {
+                  GValue val = G_VALUE_INIT;
+
+                  g_value_init (&val, G_TYPE_DOUBLE);
+                  g_value_set_double (&val, 0.0);
+                  g_object_set_property (G_OBJECT (object), "shift", &val);
+                }
+              if (sym->drawable)
+                gimp_tiling_update_strokes (sym, sym->drawable, sym->origin);
+            }
+        }
+      break;
+
+    case PROP_SHIFT:
+        {
+          gdouble new_shift = g_value_get_double (value);
+
+          if (new_shift == 0.0 ||
+              (tiling->interval_y != 0.0 && new_shift < tiling->interval_x))
+            {
+              tiling->shift = new_shift;
+              if (sym->drawable)
+                gimp_tiling_update_strokes (sym, sym->drawable, sym->origin);
+            }
+        }
+      break;
+
+    case PROP_MAX_X:
+      tiling->max_x = g_value_get_int (value);
+      if (sym->drawable)
+        gimp_tiling_update_strokes (sym, sym->drawable, sym->origin);
+      break;
+
+    case PROP_MAX_Y:
+      tiling->max_y = g_value_get_int (value);
+      if (sym->drawable)
+        gimp_tiling_update_strokes (sym, sym->drawable, sym->origin);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tiling_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpTiling *tiling = GIMP_TILING (object);
+
+  switch (property_id)
+    {
+    case PROP_INTERVAL_X:
+      g_value_set_double (value, tiling->interval_x);
+      break;
+    case PROP_INTERVAL_Y:
+      g_value_set_double (value, tiling->interval_y);
+      break;
+    case PROP_SHIFT:
+      g_value_set_double (value, tiling->shift);
+      break;
+    case PROP_MAX_X:
+      g_value_set_int (value, tiling->max_x);
+      break;
+    case PROP_MAX_Y:
+      g_value_set_int (value, tiling->max_y);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tiling_update_strokes (GimpSymmetry *sym,
+                            GimpDrawable *drawable,
+                            GimpCoords   *origin)
+{
+  GimpTiling *tiling  = GIMP_TILING (sym);
+  GList      *strokes = NULL;
+  GimpCoords *coords;
+  gdouble     width;
+  gdouble     height;
+  gdouble     startx = origin->x;
+  gdouble     starty = origin->y;
+  gdouble     x;
+  gdouble     y;
+  gint        x_count;
+  gint        y_count;
+
+  g_list_free_full (sym->strokes, g_free);
+  sym->strokes = NULL;
+
+  width  = gimp_item_get_width (GIMP_ITEM (drawable));
+  height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  if (sym->stateful)
+    {
+      /* While I can compute exactly the right number of strokes to
+       * paint on-canvas for stateless tools, stateful tools need to
+       * always have the same number and order of strokes. For this
+       * reason, I compute strokes to fill 2 times the width and height.
+       * This makes the symmetry less efficient with stateful tools, but
+       * also weird behavior may happen if you decide to paint out of
+       * canvas and expect tiling to work in-canvas since it won't
+       * actually be infinite (as no new strokes can be added while
+       * painting since we are stateful).
+       */
+      gint i, j;
+
+      if (tiling->interval_x < 1.0)
+        {
+          x_count = 1;
+        }
+      else if (tiling->max_x == 0)
+        {
+          x_count = (gint) ceil (width / tiling->interval_x);
+          startx -= tiling->interval_x * (gdouble) x_count;
+          x_count = 2 * x_count + 1;
+        }
+      else
+        {
+          x_count = tiling->max_x;
+        }
+
+      if (tiling->interval_y < 1.0)
+        {
+          y_count = 1;
+        }
+      else if (tiling->max_y == 0)
+        {
+          y_count = (gint) ceil (height / tiling->interval_y);
+          starty -= tiling->interval_y * (gdouble) y_count;
+          y_count = 2 * y_count + 1;
+        }
+      else
+        {
+          y_count = tiling->max_y;
+        }
+
+      for (i = 0, x = startx; i < x_count; i++)
+        {
+          for (j = 0, y = starty; j < y_count; j++)
+            {
+              coords = g_memdup (origin, sizeof (GimpCoords));
+              coords->x = x;
+              coords->y = y;
+              strokes = g_list_prepend (strokes, coords);
+
+              y += tiling->interval_y;
+            }
+          x += tiling->interval_x;
+        }
+    }
+  else
+    {
+      if (origin->x > 0 && tiling->max_x == 0 && tiling->interval_x >= 1.0)
+        startx = fmod (origin->x, tiling->interval_x) - tiling->interval_x;
+
+      if (origin->y > 0 && tiling->max_y == 0 && tiling->interval_y >= 1.0)
+        {
+          starty = fmod (origin->y, tiling->interval_y) - tiling->interval_y;
+
+          if (tiling->shift > 0.0)
+            startx -= tiling->shift * floor (origin->y / tiling->interval_y + 1);
+        }
+
+      for (y_count = 0, y = starty; y < height + tiling->interval_y;
+           y_count++, y += tiling->interval_y)
+        {
+          if (tiling->max_y && y_count >= tiling->max_y)
+            break;
+
+          for (x_count = 0, x = startx; x < width + tiling->interval_x;
+               x_count++, x += tiling->interval_x)
+            {
+              if (tiling->max_x && x_count >= tiling->max_x)
+                break;
+
+              coords = g_memdup (origin, sizeof (GimpCoords));
+              coords->x = x;
+              coords->y = y;
+              strokes = g_list_prepend (strokes, coords);
+
+              if (tiling->interval_x < 1.0)
+                break;
+            }
+
+          if (tiling->max_x || startx + tiling->shift <= 0.0)
+            startx = startx + tiling->shift;
+          else
+            startx = startx - tiling->interval_x + tiling->shift;
+
+          if (tiling->interval_y < 1.0)
+            break;
+        }
+    }
+
+  sym->strokes = strokes;
+
+  g_signal_emit_by_name (sym, "strokes-updated", sym->image);
+}
+
+static void
+gimp_tiling_image_size_changed_cb (GimpImage    *image,
+                                   gint          previous_origin_x,
+                                   gint          previous_origin_y,
+                                   gint          previous_width,
+                                   gint          previous_height,
+                                   GimpSymmetry *sym)
+{
+  if (previous_width  != gimp_image_get_width  (image) ||
+      previous_height != gimp_image_get_height (image))
+    {
+      g_signal_emit_by_name (sym, "gui-param-changed", sym->image);
+    }
+}
diff --git a/app/core/gimpsymmetry-tiling.h b/app/core/gimpsymmetry-tiling.h
new file mode 100644
index 0000000..7fbff71
--- /dev/null
+++ b/app/core/gimpsymmetry-tiling.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry-tiling.h
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TILING_H__
+#define __GIMP_TILING_H__
+
+
+#include "gimpsymmetry.h"
+
+
+#define GIMP_TYPE_TILING            (gimp_tiling_get_type ())
+#define GIMP_TILING(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TILING, GimpTiling))
+#define GIMP_TILING_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TILING, GimpTilingClass))
+#define GIMP_IS_TILING(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TILING))
+#define GIMP_IS_TILING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TILING))
+#define GIMP_TILING_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TILING, GimpTilingClass))
+
+
+typedef struct _GimpTilingClass GimpTilingClass;
+
+struct _GimpTiling
+{
+  GimpSymmetry  parent_instance;
+
+  gdouble       interval_x;
+  gdouble       interval_y;
+  gdouble       shift;
+  gint          max_x;
+  gint          max_y;
+};
+
+struct _GimpTilingClass
+{
+  GimpSymmetryClass  parent_class;
+};
+
+
+GType   gimp_tiling_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_TILING_H__  */
diff --git a/app/core/gimpsymmetry.c b/app/core/gimpsymmetry.c
new file mode 100644
index 0000000..e0bc23b
--- /dev/null
+++ b/app/core/gimpsymmetry.c
@@ -0,0 +1,591 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry.c
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-nodes.h"
+
+#include "gimpdrawable.h"
+#include "gimpimage.h"
+#include "gimpimage-symmetry.h"
+#include "gimpitem.h"
+#include "gimpsymmetry.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  STROKES_UPDATED,
+  GUI_PARAM_CHANGED,
+  ACTIVE_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE,
+  PROP_ACTIVE,
+  PROP_VERSION,
+};
+
+
+/* Local function prototypes */
+
+static void       gimp_symmetry_finalize            (GObject      *object);
+static void       gimp_symmetry_set_property        (GObject      *object,
+                                                     guint         property_id,
+                                                     const GValue *value,
+                                                     GParamSpec   *pspec);
+static void       gimp_symmetry_get_property        (GObject      *object,
+                                                     guint         property_id,
+                                                     GValue       *value,
+                                                     GParamSpec   *pspec);
+
+static void       gimp_symmetry_real_update_strokes (GimpSymmetry *sym,
+                                                     GimpDrawable *drawable,
+                                                     GimpCoords   *origin);
+static void       gimp_symmetry_real_get_transform  (GimpSymmetry *sym,
+                                                     gint          stroke,
+                                                     gdouble      *angle,
+                                                     gboolean     *reflect);
+static gboolean   gimp_symmetry_real_update_version (GimpSymmetry *sym);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpSymmetry, gimp_symmetry, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+#define parent_class gimp_symmetry_parent_class
+
+static guint gimp_symmetry_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_symmetry_class_init (GimpSymmetryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  /* This signal should likely be emitted at the end of
+   * update_strokes() if stroke coordinates were changed.
+   */
+  gimp_symmetry_signals[STROKES_UPDATED] =
+    g_signal_new ("strokes-updated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE,
+                  1, GIMP_TYPE_IMAGE);
+
+  /* This signal should be emitted when you request a change in the
+   * settings UI. For instance adding some settings (therefore having
+   * a dynamic UI), or changing scale min/max extremes, etc.
+   */
+  gimp_symmetry_signals[GUI_PARAM_CHANGED] =
+    g_signal_new ("gui-param-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE,
+                  1, GIMP_TYPE_IMAGE);
+
+  gimp_symmetry_signals[ACTIVE_CHANGED] =
+    g_signal_new ("active-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpSymmetryClass, active_changed),
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize     = gimp_symmetry_finalize;
+  object_class->set_property = gimp_symmetry_set_property;
+  object_class->get_property = gimp_symmetry_get_property;
+
+  klass->label               = _("None");
+  klass->update_strokes      = gimp_symmetry_real_update_strokes;
+  klass->get_transform       = gimp_symmetry_real_get_transform;
+  klass->active_changed      = NULL;
+  klass->update_version      = gimp_symmetry_real_update_version;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ACTIVE,
+                            "active",
+                            _("Active"),
+                            _("Activate symmetry painting"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_VERSION,
+                        "version",
+                        "Symmetry version",
+                        "Version of the symmetry object",
+                        -1, G_MAXINT, 0,
+                        GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_symmetry_init (GimpSymmetry *sym)
+{
+}
+
+static void
+gimp_symmetry_finalize (GObject *object)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (object);
+
+  gimp_symmetry_clear_origin (sym);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_symmetry_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      sym->image = g_value_get_object (value);
+      break;
+    case PROP_ACTIVE:
+      sym->active = g_value_get_boolean (value);
+      g_signal_emit (sym, gimp_symmetry_signals[ACTIVE_CHANGED], 0,
+                     sym->active);
+      break;
+    case PROP_VERSION:
+      sym->version = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_symmetry_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpSymmetry *sym = GIMP_SYMMETRY (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, sym->image);
+      break;
+    case PROP_ACTIVE:
+      g_value_set_boolean (value, sym->active);
+      break;
+    case PROP_VERSION:
+      g_value_set_int (value, sym->version);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_symmetry_real_update_strokes (GimpSymmetry *sym,
+                                   GimpDrawable *drawable,
+                                   GimpCoords   *origin)
+{
+  /* The basic symmetry just uses the origin as is. */
+  sym->strokes = g_list_prepend (sym->strokes,
+                                 g_memdup (origin, sizeof (GimpCoords)));
+}
+
+static void
+gimp_symmetry_real_get_transform (GimpSymmetry *sym,
+                                  gint          stroke,
+                                  gdouble      *angle,
+                                  gboolean     *reflect)
+{
+  /* The basic symmetry does nothing, since no transformation of the
+   * brush painting happen. */
+}
+
+static gboolean
+gimp_symmetry_real_update_version (GimpSymmetry *symmetry)
+{
+  /* Currently all symmetries are at version 0. So all this check has to
+   * do is verify that we are at version 0.
+   * If one of the child symmetry bumps its version, it will have to
+   * override the update_version() virtual function and do any necessary
+   * update there (for instance new properties, modified properties, or
+   * whatnot).
+   */
+  gint version;
+
+  g_object_get (symmetry,
+                "version", &version,
+                NULL);
+
+  return (version == 0);
+}
+
+/***** Public Functions *****/
+
+/**
+ * gimp_symmetry_set_stateful:
+ * @sym:      the #GimpSymmetry
+ * @stateful: whether the symmetry should be stateful or stateless.
+ *
+ * By default, symmetry is made stateless, which means in particular
+ * that the size of points can change from one stroke to the next, and
+ * in particular you cannot map the coordinates from a stroke to the
+ * next. I.e. stroke N at time T+1 is not necessarily the continuation
+ * of stroke N at time T.
+ * To obtain corresponding strokes, stateful tools, such as MyPaint
+ * brushes or the ink tool, need to run this function. They should reset
+ * to stateless behavior once finished painting.
+ *
+ * One of the first consequence of being stateful is that the number of
+ * strokes cannot be changed, so more strokes than possible on canvas
+ * may be computed, and oppositely it will be possible to end up in
+ * cases with missing strokes (e.g. a tiling, theoretically infinite,
+ * won't be for the ink tool if one draws too far out of canvas).
+ **/
+void
+gimp_symmetry_set_stateful (GimpSymmetry *symmetry,
+                            gboolean      stateful)
+{
+  symmetry->stateful = stateful;
+}
+
+/**
+ * gimp_symmetry_set_origin:
+ * @sym:      the #GimpSymmetry
+ * @drawable: the #GimpDrawable where painting will happen
+ * @origin:   new base coordinates.
+ *
+ * Set the symmetry to new origin coordinates and drawable.
+ **/
+void
+gimp_symmetry_set_origin (GimpSymmetry *sym,
+                          GimpDrawable *drawable,
+                          GimpCoords   *origin)
+{
+  g_return_if_fail (GIMP_IS_SYMMETRY (sym));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_get_image (GIMP_ITEM (drawable)) == sym->image);
+
+  if (drawable != sym->drawable)
+    {
+      if (sym->drawable)
+        g_object_unref (sym->drawable);
+      sym->drawable = g_object_ref (drawable);
+    }
+
+  if (origin != sym->origin)
+    {
+      g_free (sym->origin);
+      sym->origin = g_memdup (origin, sizeof (GimpCoords));
+    }
+
+  g_list_free_full (sym->strokes, g_free);
+  sym->strokes = NULL;
+
+  GIMP_SYMMETRY_GET_CLASS (sym)->update_strokes (sym, drawable, origin);
+}
+
+/**
+ * gimp_symmetry_clear_origin:
+ * @sym: the #GimpSymmetry
+ *
+ * Clear the symmetry's origin coordinates and drawable.
+ **/
+void
+gimp_symmetry_clear_origin (GimpSymmetry *sym)
+{
+  g_return_if_fail (GIMP_IS_SYMMETRY (sym));
+
+  g_clear_object (&sym->drawable);
+
+  g_clear_pointer (&sym->origin, g_free);
+
+  g_list_free_full (sym->strokes, g_free);
+  sym->strokes = NULL;
+}
+
+/**
+ * gimp_symmetry_get_origin:
+ * @sym: the #GimpSymmetry
+ *
+ * Returns: the origin stroke coordinates.
+ * The returned value is owned by the #GimpSymmetry and must not be freed.
+ **/
+GimpCoords *
+gimp_symmetry_get_origin (GimpSymmetry *sym)
+{
+  g_return_val_if_fail (GIMP_IS_SYMMETRY (sym), NULL);
+
+  return sym->origin;
+}
+
+/**
+ * gimp_symmetry_get_size:
+ * @sym: the #GimpSymmetry
+ *
+ * Returns: the total number of strokes.
+ **/
+gint
+gimp_symmetry_get_size (GimpSymmetry *sym)
+{
+  g_return_val_if_fail (GIMP_IS_SYMMETRY (sym), 0);
+
+  return g_list_length (sym->strokes);
+}
+
+/**
+ * gimp_symmetry_get_coords:
+ * @sym:    the #GimpSymmetry
+ * @stroke: the stroke number
+ *
+ * Returns: the coordinates of the stroke number @stroke.
+ * The returned value is owned by the #GimpSymmetry and must not be freed.
+ **/
+GimpCoords *
+gimp_symmetry_get_coords (GimpSymmetry *sym,
+                          gint          stroke)
+{
+  g_return_val_if_fail (GIMP_IS_SYMMETRY (sym), NULL);
+
+  return g_list_nth_data (sym->strokes, stroke);
+}
+
+/**
+ * gimp_symmetry_get_transform:
+ * @sym:     the #GimpSymmetry
+ * @stroke:  the stroke number
+ * @angle:   output pointer to the transformation rotation angle,
+ *           in degrees (ccw)
+ * @reflect: output pointer to the transformation reflection flag
+ *
+ * Returns: the transformation to apply to the paint content for stroke
+ * number @stroke.  The transformation is comprised of rotation, possibly
+ * followed by horizontal reflection, around the stroke coordinates.
+ **/
+void
+gimp_symmetry_get_transform (GimpSymmetry *sym,
+                             gint          stroke,
+                             gdouble      *angle,
+                             gboolean     *reflect)
+{
+  g_return_if_fail (GIMP_IS_SYMMETRY (sym));
+  g_return_if_fail (angle != NULL);
+  g_return_if_fail (reflect != NULL);
+
+  *angle   = 0.0;
+  *reflect = FALSE;
+
+  GIMP_SYMMETRY_GET_CLASS (sym)->get_transform (sym,
+                                                stroke,
+                                                angle,
+                                                reflect);
+}
+
+/**
+ * gimp_symmetry_get_matrix:
+ * @sym:     the #GimpSymmetry
+ * @stroke:  the stroke number
+ * @matrix:  output pointer to the transformation matrix
+ *
+ * Returns: the transformation matrix to apply to the paint content for stroke
+ * number @stroke.
+ **/
+void
+gimp_symmetry_get_matrix (GimpSymmetry *sym,
+                          gint          stroke,
+                          GimpMatrix3  *matrix)
+{
+  gdouble  angle;
+  gboolean reflect;
+
+  g_return_if_fail (GIMP_IS_SYMMETRY (sym));
+  g_return_if_fail (matrix != NULL);
+
+  gimp_symmetry_get_transform (sym, stroke, &angle, &reflect);
+
+  gimp_matrix3_identity (matrix);
+  gimp_matrix3_rotate (matrix, -gimp_deg_to_rad (angle));
+  if (reflect)
+    gimp_matrix3_scale (matrix, -1.0, 1.0);
+}
+
+/**
+ * gimp_symmetry_get_operation:
+ * @sym:          the #GimpSymmetry
+ * @stroke:       the stroke number
+ *
+ * Returns: the transformation operation to apply to the paint content for
+ * stroke number @stroke, or NULL for the identity transformation.
+ *
+ * The returned #GeglNode should be freed by the caller.
+ **/
+GeglNode *
+gimp_symmetry_get_operation (GimpSymmetry *sym,
+                             gint          stroke)
+{
+  GimpMatrix3 matrix;
+
+  g_return_val_if_fail (GIMP_IS_SYMMETRY (sym), NULL);
+
+  gimp_symmetry_get_matrix (sym, stroke, &matrix);
+
+  if (gimp_matrix3_is_identity (&matrix))
+    return NULL;
+
+  return gimp_gegl_create_transform_node (&matrix);
+}
+
+/*
+ * gimp_symmetry_parasite_name:
+ * @type: the #GimpSymmetry's #GType
+ *
+ * Returns: a newly allocated string.
+ */
+gchar *
+gimp_symmetry_parasite_name (GType type)
+{
+  return g_strconcat ("gimp-image-symmetry:", g_type_name (type), NULL);
+}
+
+GimpParasite *
+gimp_symmetry_to_parasite (const GimpSymmetry *sym)
+{
+  GimpParasite *parasite;
+  gchar        *parasite_name;
+  gchar        *str;
+
+  g_return_val_if_fail (GIMP_IS_SYMMETRY (sym), NULL);
+
+  str = gimp_config_serialize_to_string (GIMP_CONFIG (sym), NULL);
+  g_return_val_if_fail (str != NULL, NULL);
+
+  parasite_name = gimp_symmetry_parasite_name (G_TYPE_FROM_INSTANCE (sym));
+  parasite = gimp_parasite_new (parasite_name,
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (str) + 1, str);
+  g_free (parasite_name);
+  g_free (str);
+
+  return parasite;
+}
+
+GimpSymmetry *
+gimp_symmetry_from_parasite (const GimpParasite *parasite,
+                             GimpImage          *image,
+                             GType               type)
+{
+  GimpSymmetry    *symmetry;
+  gchar           *parasite_name;
+  const gchar     *str;
+  GError          *error = NULL;
+
+  parasite_name = gimp_symmetry_parasite_name (type);
+
+  g_return_val_if_fail (parasite != NULL, NULL);
+  g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
+                                parasite_name) == 0,
+                        NULL);
+
+  str = gimp_parasite_data (parasite);
+
+  if (! str)
+    {
+      g_warning ("Empty symmetry parasite \"%s\"", parasite_name);
+
+      return NULL;
+    }
+
+  symmetry = gimp_image_symmetry_new (image, type);
+
+  g_object_set (symmetry,
+                "version", -1,
+                NULL);
+
+  if (! gimp_config_deserialize_string (GIMP_CONFIG (symmetry),
+                                        str,
+                                        gimp_parasite_data_size (parasite),
+                                        NULL,
+                                        &error))
+    {
+      g_printerr ("Failed to deserialize symmetry parasite: %s\n"
+                  "\t- parasite name: %s\n\t- parasite data: %s\n",
+                  error->message, parasite_name, str);
+      g_error_free (error);
+
+      g_object_unref (symmetry);
+      symmetry = NULL;
+    }
+  g_free (parasite_name);
+
+  if (symmetry)
+    {
+      gint version;
+
+      g_object_get (symmetry,
+                    "version", &version,
+                    NULL);
+      if (version == -1)
+        {
+          /* If version has not been updated, let's assume this parasite was
+           * not representing symmetry settings.
+           */
+          g_object_unref (symmetry);
+          symmetry = NULL;
+        }
+      else if (GIMP_SYMMETRY_GET_CLASS (symmetry)->update_version (symmetry) &&
+               ! GIMP_SYMMETRY_GET_CLASS (symmetry)->update_version (symmetry))
+        {
+          g_object_unref (symmetry);
+          symmetry = NULL;
+        }
+    }
+
+  return symmetry;
+}
diff --git a/app/core/gimpsymmetry.h b/app/core/gimpsymmetry.h
new file mode 100644
index 0000000..9474662
--- /dev/null
+++ b/app/core/gimpsymmetry.h
@@ -0,0 +1,106 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetry.h
+ * Copyright (C) 2015 Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SYMMETRY_H__
+#define __GIMP_SYMMETRY_H__
+
+
+#include "gimpobject.h"
+
+
+/* shift one more than GIMP_CONFIG_PARAM_IGNORE */
+#define GIMP_SYMMETRY_PARAM_GUI (1 << (6 + G_PARAM_USER_SHIFT))
+
+
+#define GIMP_TYPE_SYMMETRY            (gimp_symmetry_get_type ())
+#define GIMP_SYMMETRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SYMMETRY, GimpSymmetry))
+#define GIMP_SYMMETRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SYMMETRY, GimpSymmetryClass))
+#define GIMP_IS_SYMMETRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SYMMETRY))
+#define GIMP_IS_SYMMETRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SYMMETRY))
+#define GIMP_SYMMETRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SYMMETRY, GimpSymmetryClass))
+
+
+typedef struct _GimpSymmetryClass   GimpSymmetryClass;
+
+struct _GimpSymmetry
+{
+  GimpObject    parent_instance;
+
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  GimpCoords   *origin;
+  gboolean      active;
+  gint          version;
+
+  GList        *strokes;
+  gboolean      stateful;
+};
+
+struct _GimpSymmetryClass
+{
+  GimpObjectClass  parent_class;
+
+  const gchar * label;
+
+  /* Virtual functions */
+  void       (* update_strokes)             (GimpSymmetry       *symmetry,
+                                             GimpDrawable       *drawable,
+                                             GimpCoords         *origin);
+  void       (* get_transform)              (GimpSymmetry       *symmetry,
+                                             gint                stroke,
+                                             gdouble            *angle,
+                                             gboolean           *reflect);
+  void       (* active_changed)             (GimpSymmetry       *symmetry);
+
+  gboolean   (* update_version)             (GimpSymmetry       *symmetry);
+};
+
+
+GType          gimp_symmetry_get_type       (void) G_GNUC_CONST;
+
+void           gimp_symmetry_set_stateful   (GimpSymmetry       *symmetry,
+                                             gboolean            stateful);
+void           gimp_symmetry_set_origin     (GimpSymmetry       *symmetry,
+                                             GimpDrawable       *drawable,
+                                             GimpCoords         *origin);
+void           gimp_symmetry_clear_origin   (GimpSymmetry       *symmetry);
+
+GimpCoords   * gimp_symmetry_get_origin     (GimpSymmetry       *symmetry);
+gint           gimp_symmetry_get_size       (GimpSymmetry       *symmetry);
+GimpCoords   * gimp_symmetry_get_coords     (GimpSymmetry       *symmetry,
+                                             gint                stroke);
+void           gimp_symmetry_get_transform  (GimpSymmetry       *symmetry,
+                                             gint                stroke,
+                                             gdouble            *angle,
+                                             gboolean           *reflect);
+void           gimp_symmetry_get_matrix     (GimpSymmetry       *symmetry,
+                                             gint                stroke,
+                                             GimpMatrix3        *matrix);
+GeglNode     * gimp_symmetry_get_operation  (GimpSymmetry       *symmetry,
+                                             gint                stroke);
+
+gchar        * gimp_symmetry_parasite_name  (GType               type);
+GimpParasite * gimp_symmetry_to_parasite    (const GimpSymmetry *symmetry);
+GimpSymmetry * gimp_symmetry_from_parasite  (const GimpParasite *parasite,
+                                             GimpImage          *image,
+                                             GType               type);
+
+
+#endif  /*  __GIMP_SYMMETRY_H__  */
diff --git a/app/core/gimptag.c b/app/core/gimptag.c
new file mode 100644
index 0000000..95c4954
--- /dev/null
+++ b/app/core/gimptag.c
@@ -0,0 +1,442 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptag.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <string.h>
+
+#include "core-types.h"
+
+#include "gimptag.h"
+
+
+#define GIMP_TAG_INTERNAL_PREFIX "gimp:"
+
+
+G_DEFINE_TYPE (GimpTag, gimp_tag, G_TYPE_OBJECT)
+
+#define parent_class gimp_tag_parent_class
+
+
+static void
+gimp_tag_class_init (GimpTagClass *klass)
+{
+}
+
+static void
+gimp_tag_init (GimpTag *tag)
+{
+  tag->tag         = 0;
+  tag->collate_key = 0;
+  tag->internal    = FALSE;
+}
+
+/**
+ * gimp_tag_new:
+ * @tag_string: a tag name.
+ *
+ * If given tag name is not valid, an attempt will be made to fix it.
+ *
+ * Return value: a new #GimpTag object, or NULL if tag string is invalid and
+ * cannot be fixed.
+ **/
+GimpTag *
+gimp_tag_new (const char *tag_string)
+{
+  GimpTag *tag;
+  gchar   *tag_name;
+  gchar   *case_folded;
+  gchar   *collate_key;
+
+  g_return_val_if_fail (tag_string != NULL, NULL);
+
+  tag_name = gimp_tag_string_make_valid (tag_string);
+  if (! tag_name)
+    return NULL;
+
+  tag = g_object_new (GIMP_TYPE_TAG, NULL);
+
+  tag->tag = g_quark_from_string (tag_name);
+
+  case_folded = g_utf8_casefold (tag_name, -1);
+  collate_key = g_utf8_collate_key (case_folded, -1);
+  tag->collate_key = g_quark_from_string (collate_key);
+  g_free (collate_key);
+  g_free (case_folded);
+  g_free (tag_name);
+
+  return tag;
+}
+
+/**
+ * gimp_tag_try_new:
+ * @tag_string: a tag name.
+ *
+ * Similar to gimp_tag_new(), but returns NULL if tag is surely not equal
+ * to any of currently created tags. It is useful for tag querying to avoid
+ * unneeded comparisons. If tag is created, however, it does not mean that
+ * it would necessarily match with some other tag.
+ *
+ * Return value: new #GimpTag object, or NULL if tag will not match with any
+ * other #GimpTag.
+ **/
+GimpTag *
+gimp_tag_try_new (const char *tag_string)
+{
+  GimpTag *tag;
+  gchar   *tag_name;
+  gchar   *case_folded;
+  gchar   *collate_key;
+  GQuark   tag_quark;
+  GQuark   collate_key_quark;
+
+  tag_name = gimp_tag_string_make_valid (tag_string);
+  if (! tag_name)
+    return NULL;
+
+  case_folded = g_utf8_casefold (tag_name, -1);
+  collate_key = g_utf8_collate_key (case_folded, -1);
+  collate_key_quark = g_quark_try_string (collate_key);
+  g_free (collate_key);
+  g_free (case_folded);
+
+  if (! collate_key_quark)
+    {
+      g_free (tag_name);
+      return NULL;
+    }
+
+  tag_quark = g_quark_from_string (tag_name);
+  g_free (tag_name);
+  if (! tag_quark)
+    return NULL;
+
+  tag = g_object_new (GIMP_TYPE_TAG, NULL);
+  tag->tag = tag_quark;
+  tag->collate_key = collate_key_quark;
+
+  return tag;
+}
+
+/**
+ * gimp_tag_get_internal:
+ * @tag: a gimp tag.
+ *
+ * Retrieve internal status of the tag.
+ *
+ * Return value: internal status of tag. Internal tags are not saved.
+ **/
+gboolean
+gimp_tag_get_internal (GimpTag *tag)
+{
+  g_return_val_if_fail (GIMP_IS_TAG (tag), FALSE);
+
+  return tag->internal;
+}
+
+/**
+ * gimp_tag_set_internal:
+ * @tag: a gimp tag.
+ * @internal: desired tag internal status
+ *
+ * Set internal status of the tag. Internal tags are usually automatically
+ * generated and will not be saved into users tag cache.
+ *
+ **/
+void
+gimp_tag_set_internal (GimpTag *tag, gboolean internal)
+{
+  g_return_if_fail (GIMP_IS_TAG (tag));
+
+  tag->internal = internal;
+}
+
+
+/**
+ * gimp_tag_get_name:
+ * @tag: a gimp tag.
+ *
+ * Retrieve name of the tag.
+ *
+ * Return value: name of tag.
+ **/
+const gchar *
+gimp_tag_get_name (GimpTag *tag)
+{
+  g_return_val_if_fail (GIMP_IS_TAG (tag), NULL);
+
+  return g_quark_to_string (tag->tag);
+}
+
+/**
+ * gimp_tag_get_hash:
+ * @tag: a gimp tag.
+ *
+ * Hashing function which is useful, for example, to store #GimpTag in
+ * a #GHashTable.
+ *
+ * Return value: hash value for tag.
+ **/
+guint
+gimp_tag_get_hash (GimpTag *tag)
+{
+  g_return_val_if_fail (GIMP_IS_TAG (tag), -1);
+
+  return tag->collate_key;
+}
+
+/**
+ * gimp_tag_equals:
+ * @tag:   a gimp tag.
+ * @other: another gimp tag to compare with.
+ *
+ * Compares tags for equality according to tag comparison rules.
+ *
+ * Return value: TRUE if tags are equal, FALSE otherwise.
+ **/
+gboolean
+gimp_tag_equals (GimpTag *tag,
+                 GimpTag *other)
+{
+  g_return_val_if_fail (GIMP_IS_TAG (tag), FALSE);
+  g_return_val_if_fail (GIMP_IS_TAG (other), FALSE);
+
+  return tag->collate_key == other->collate_key;
+}
+
+/**
+ * gimp_tag_compare_func:
+ * @p1: pointer to left-hand #GimpTag object.
+ * @p2: pointer to right-hand #GimpTag object.
+ *
+ * Compares tags according to tag comparison rules. Useful for sorting
+ * functions.
+ *
+ * Return value: meaning of return value is the same as in strcmp().
+ **/
+int
+gimp_tag_compare_func (const void *p1,
+                       const void *p2)
+{
+  GimpTag      *t1 = GIMP_TAG (p1);
+  GimpTag      *t2 = GIMP_TAG (p2);
+
+  return g_strcmp0 (g_quark_to_string (t1->collate_key),
+                    g_quark_to_string (t2->collate_key));
+}
+
+/**
+ * gimp_tag_compare_with_string:
+ * @tag:        a #GimpTag object.
+ * @tag_string: the string to compare to.
+ *
+ * Compares tag and a string according to tag comparison rules. Similar to
+ * gimp_tag_compare_func(), but can be used without creating temporary tag
+ * object.
+ *
+ * Return value: meaning of return value is the same as in strcmp().
+ **/
+gint
+gimp_tag_compare_with_string (GimpTag     *tag,
+                              const gchar *tag_string)
+{
+  gchar        *case_folded;
+  const gchar  *collate_key;
+  gchar        *collate_key2;
+  gint          result;
+
+  g_return_val_if_fail (GIMP_IS_TAG (tag), 0);
+  g_return_val_if_fail (tag_string != NULL, 0);
+
+  collate_key = g_quark_to_string (tag->collate_key);
+  case_folded = g_utf8_casefold (tag_string, -1);
+  collate_key2 = g_utf8_collate_key (case_folded, -1);
+  result = g_strcmp0 (collate_key, collate_key2);
+  g_free (collate_key2);
+  g_free (case_folded);
+
+  return result;
+}
+
+/**
+ * gimp_tag_has_prefix:
+ * @tag:           a #GimpTag object.
+ * @prefix_string: the prefix to compare to.
+ *
+ * Compares tag and a prefix according to tag comparison rules. Similar to
+ * gimp_tag_compare_with_string(), but does not work on the collate key
+ * because that can't be matched partially.
+ *
+ * Return value: wheher #tag starts with @prefix_string.
+ **/
+gboolean
+gimp_tag_has_prefix (GimpTag     *tag,
+                     const gchar *prefix_string)
+{
+  gchar    *case_folded1;
+  gchar    *case_folded2;
+  gboolean  has_prefix;
+
+  g_return_val_if_fail (GIMP_IS_TAG (tag), FALSE);
+  g_return_val_if_fail (prefix_string != NULL, FALSE);
+
+  case_folded1 = g_utf8_casefold (g_quark_to_string (tag->tag), -1);
+  case_folded2 = g_utf8_casefold (prefix_string, -1);
+
+  has_prefix = g_str_has_prefix (case_folded1, case_folded2);
+
+  g_free (case_folded1);
+  g_free (case_folded2);
+
+  g_printerr ("'%s' has prefix '%s': %d\n",
+              g_quark_to_string (tag->tag), prefix_string, has_prefix);
+
+  return has_prefix;
+}
+
+/**
+ * gimp_tag_string_make_valid:
+ * @tag_string: a text string.
+ *
+ * Tries to create a valid tag string from given @tag_string.
+ *
+ * Return value: a newly allocated tag string in case given @tag_string was
+ * valid or could be fixed, otherwise NULL. Allocated value should be freed
+ * using g_free().
+ **/
+gchar *
+gimp_tag_string_make_valid (const gchar *tag_string)
+{
+  gchar    *tag;
+  GString  *buffer;
+  gchar    *tag_cursor;
+  gunichar  c;
+
+  g_return_val_if_fail (tag_string, NULL);
+
+  tag = g_utf8_normalize (tag_string, -1, G_NORMALIZE_ALL);
+  if (! tag)
+    return NULL;
+
+  tag = g_strstrip (tag);
+  if (! *tag)
+    {
+      g_free (tag);
+      return NULL;
+    }
+
+  buffer = g_string_new ("");
+  tag_cursor = tag;
+  if (g_str_has_prefix (tag_cursor, GIMP_TAG_INTERNAL_PREFIX))
+    {
+      tag_cursor += strlen (GIMP_TAG_INTERNAL_PREFIX);
+    }
+  do
+    {
+      c = g_utf8_get_char (tag_cursor);
+      tag_cursor = g_utf8_next_char (tag_cursor);
+      if (g_unichar_isprint (c)
+          && ! gimp_tag_is_tag_separator (c))
+        {
+          g_string_append_unichar (buffer, c);
+        }
+    } while (c);
+
+  g_free (tag);
+  tag = g_string_free (buffer, FALSE);
+  tag = g_strstrip (tag);
+
+  if (! *tag)
+    {
+      g_free (tag);
+      return NULL;
+    }
+
+  return tag;
+}
+
+/**
+ * gimp_tag_is_tag_separator:
+ * @c: Unicode character.
+ *
+ * Defines a set of characters that are considered tag separators. The
+ * tag separators are hand-picked from the set of characters with the
+ * Terminal_Punctuation property as specified in the version 5.1.0 of
+ * the Unicode Standard.
+ *
+ * Return value: %TRUE if the character is a tag separator.
+ */
+gboolean
+gimp_tag_is_tag_separator (gunichar c)
+{
+  switch (c)
+    {
+    case 0x002C: /* COMMA */
+    case 0x060C: /* ARABIC COMMA */
+    case 0x07F8: /* NKO COMMA */
+    case 0x1363: /* ETHIOPIC COMMA */
+    case 0x1802: /* MONGOLIAN COMMA */
+    case 0x1808: /* MONGOLIAN MANCHU COMMA */
+    case 0x3001: /* IDEOGRAPHIC COMMA */
+    case 0xA60D: /* VAI COMMA */
+    case 0xFE50: /* SMALL COMMA */
+    case 0xFF0C: /* FULLWIDTH COMMA */
+    case 0xFF64: /* HALFWIDTH IDEOGRAPHIC COMMA */
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+/**
+ * gimp_tag_or_null_ref:
+ * @tag: a #GimpTag
+ *
+ * A simple wrapper around g_object_ref() that silently accepts #NULL.
+ **/
+void
+gimp_tag_or_null_ref (GimpTag *tag_or_null)
+{
+  if (tag_or_null)
+    {
+      g_return_if_fail (GIMP_IS_TAG (tag_or_null));
+
+      g_object_ref (tag_or_null);
+    }
+}
+
+/**
+ * gimp_tag_or_null_unref:
+ * @tag: a #GimpTag
+ *
+ * A simple wrapper around g_object_unref() that silently accepts #NULL.
+ **/
+void
+gimp_tag_or_null_unref (GimpTag *tag_or_null)
+{
+  if (tag_or_null)
+    {
+      g_return_if_fail (GIMP_IS_TAG (tag_or_null));
+
+      g_object_unref (tag_or_null);
+    }
+}
diff --git a/app/core/gimptag.h b/app/core/gimptag.h
new file mode 100644
index 0000000..0cd6c32
--- /dev/null
+++ b/app/core/gimptag.h
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptag.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAG_H__
+#define __GIMP_TAG_H__
+
+
+#include <glib-object.h>
+
+
+#define GIMP_TYPE_TAG            (gimp_tag_get_type ())
+#define GIMP_TAG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TAG, GimpTag))
+#define GIMP_TAG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TAG, GimpTagClass))
+#define GIMP_IS_TAG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TAG))
+#define GIMP_IS_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TAG))
+#define GIMP_TAG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TAG, GimpTagClass))
+
+
+typedef struct _GimpTagClass    GimpTagClass;
+
+struct _GimpTag
+{
+  GObject parent_instance;
+
+  GQuark  tag;
+  GQuark  collate_key;
+
+  gboolean internal; /* Tags that are not serialized to disk */
+};
+
+struct _GimpTagClass
+{
+  GObjectClass parent_class;
+};
+
+GType         gimp_tag_get_type            (void) G_GNUC_CONST;
+
+GimpTag     * gimp_tag_new                 (const gchar *tag_string);
+GimpTag     * gimp_tag_try_new             (const gchar *tag_string);
+
+const gchar * gimp_tag_get_name            (GimpTag     *tag);
+guint         gimp_tag_get_hash            (GimpTag     *tag);
+
+gboolean      gimp_tag_get_internal        (GimpTag     *tag);
+void          gimp_tag_set_internal        (GimpTag     *tag,
+                                            gboolean     internal);
+
+gboolean      gimp_tag_equals              (GimpTag     *tag,
+                                            GimpTag     *other);
+gint          gimp_tag_compare_func        (const void  *p1,
+                                            const void  *p2);
+gint          gimp_tag_compare_with_string (GimpTag     *tag,
+                                            const gchar *tag_string);
+gboolean      gimp_tag_has_prefix          (GimpTag     *tag,
+                                            const gchar *prefix_string);
+gchar       * gimp_tag_string_make_valid   (const gchar *tag_string);
+gboolean      gimp_tag_is_tag_separator    (gunichar     c);
+
+void          gimp_tag_or_null_ref         (GimpTag     *tag_or_null);
+void          gimp_tag_or_null_unref       (GimpTag     *tag_or_null);
+
+
+#endif /* __GIMP_TAG_H__ */
diff --git a/app/core/gimptagcache.c b/app/core/gimptagcache.c
new file mode 100644
index 0000000..a0e4534
--- /dev/null
+++ b/app/core/gimptagcache.c
@@ -0,0 +1,646 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagcache.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "config/gimpxmlparser.h"
+
+#include "gimp-memsize.h"
+#include "gimpcontext.h"
+#include "gimpdata.h"
+#include "gimplist.h"
+#include "gimptag.h"
+#include "gimptagcache.h"
+#include "gimptagged.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_TAG_CACHE_FILE  "tags.xml"
+
+/* #define DEBUG_GIMP_TAG_CACHE  1 */
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+
+typedef struct
+{
+  GQuark  identifier;
+  GQuark  checksum;
+  GList  *tags;
+  guint   referenced : 1;
+} GimpTagCacheRecord;
+
+typedef struct
+{
+  GArray             *records;
+  GimpTagCacheRecord  current_record;
+} GimpTagCacheParseData;
+
+struct _GimpTagCachePrivate
+{
+  GArray *records;
+  GList  *containers;
+};
+
+
+static void          gimp_tag_cache_finalize           (GObject                *object);
+
+static gint64        gimp_tag_cache_get_memsize        (GimpObject             *object,
+                                                        gint64                 *gui_size);
+static void          gimp_tag_cache_object_initialize  (GimpTagged             *tagged,
+                                                        GimpTagCache           *cache);
+static void          gimp_tag_cache_add_object         (GimpTagCache           *cache,
+                                                        GimpTagged             *tagged);
+
+static void          gimp_tag_cache_load_start_element (GMarkupParseContext    *context,
+                                                        const gchar            *element_name,
+                                                        const gchar           **attribute_names,
+                                                        const gchar           **attribute_values,
+                                                        gpointer                user_data,
+                                                        GError                **error);
+static void          gimp_tag_cache_load_end_element   (GMarkupParseContext    *context,
+                                                        const gchar            *element_name,
+                                                        gpointer                user_data,
+                                                        GError                **error);
+static void          gimp_tag_cache_load_text          (GMarkupParseContext    *context,
+                                                        const gchar            *text,
+                                                        gsize                   text_len,
+                                                        gpointer                user_data,
+                                                        GError                **error);
+static  void         gimp_tag_cache_load_error         (GMarkupParseContext    *context,
+                                                        GError                 *error,
+                                                        gpointer                user_data);
+static const gchar * gimp_tag_cache_attribute_name_to_value
+                                                       (const gchar           **attribute_names,
+                                                        const gchar           **attribute_values,
+                                                        const gchar            *name);
+
+static GQuark        gimp_tag_cache_get_error_domain   (void);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpTagCache, gimp_tag_cache, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_tag_cache_parent_class
+
+
+static void
+gimp_tag_cache_class_init (GimpTagCacheClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->finalize         = gimp_tag_cache_finalize;
+
+  gimp_object_class->get_memsize = gimp_tag_cache_get_memsize;
+}
+
+static void
+gimp_tag_cache_init (GimpTagCache *cache)
+{
+  cache->priv = gimp_tag_cache_get_instance_private (cache);
+
+  cache->priv->records    = g_array_new (FALSE, FALSE,
+                                         sizeof (GimpTagCacheRecord));
+  cache->priv->containers = NULL;
+}
+
+static void
+gimp_tag_cache_finalize (GObject *object)
+{
+  GimpTagCache *cache = GIMP_TAG_CACHE (object);
+
+  if (cache->priv->records)
+    {
+      gint i;
+
+      for (i = 0; i < cache->priv->records->len; i++)
+        {
+          GimpTagCacheRecord *rec = &g_array_index (cache->priv->records,
+                                                    GimpTagCacheRecord, i);
+
+          g_list_free_full (rec->tags, (GDestroyNotify) g_object_unref);
+        }
+
+      g_array_free (cache->priv->records, TRUE);
+      cache->priv->records = NULL;
+    }
+
+  if (cache->priv->containers)
+    {
+      g_list_free (cache->priv->containers);
+      cache->priv->containers = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_tag_cache_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpTagCache *cache   = GIMP_TAG_CACHE (object);
+  gint64        memsize = 0;
+
+  memsize += gimp_g_list_get_memsize (cache->priv->containers, 0);
+  memsize += cache->priv->records->len * sizeof (GimpTagCacheRecord);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+/**
+ * gimp_tag_cache_new:
+ *
+ * Return value: creates new GimpTagCache object.
+ **/
+GimpTagCache *
+gimp_tag_cache_new (void)
+{
+  return g_object_new (GIMP_TYPE_TAG_CACHE, NULL);
+}
+
+static void
+gimp_tag_cache_container_add_callback (GimpTagCache  *cache,
+                                       GimpTagged    *tagged,
+                                       GimpContainer *not_used)
+{
+  gimp_tag_cache_add_object (cache, tagged);
+}
+
+/**
+ * gimp_tag_cache_add_container:
+ * @cache:      a GimpTagCache object.
+ * @container:  container containing GimpTagged objects.
+ *
+ * Adds container of GimpTagged objects to tag cache. Before calling this
+ * function tag cache must be loaded using gimp_tag_cache_load(). When tag
+ * cache is saved to file, tags are collected from objects in priv->containers.
+ **/
+void
+gimp_tag_cache_add_container (GimpTagCache  *cache,
+                              GimpContainer *container)
+{
+  g_return_if_fail (GIMP_IS_TAG_CACHE (cache));
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  cache->priv->containers = g_list_append (cache->priv->containers, container);
+  gimp_container_foreach (container, (GFunc) gimp_tag_cache_object_initialize,
+                          cache);
+
+  g_signal_connect_swapped (container, "add",
+                            G_CALLBACK (gimp_tag_cache_container_add_callback),
+                            cache);
+}
+
+static void
+gimp_tag_cache_add_object (GimpTagCache *cache,
+                           GimpTagged   *tagged)
+{
+  gchar  *identifier;
+  GQuark  identifier_quark = 0;
+  gchar  *checksum;
+  GQuark  checksum_quark = 0;
+  GList  *list;
+  gint    i;
+
+  identifier = gimp_tagged_get_identifier (tagged);
+
+  if (identifier)
+    {
+      identifier_quark = g_quark_try_string (identifier);
+      g_free (identifier);
+    }
+
+  if (identifier_quark)
+    {
+      for (i = 0; i < cache->priv->records->len; i++)
+        {
+          GimpTagCacheRecord *rec = &g_array_index (cache->priv->records,
+                                                    GimpTagCacheRecord, i);
+
+          if (rec->identifier == identifier_quark)
+            {
+              for (list = rec->tags; list; list = g_list_next (list))
+                {
+                  gimp_tagged_add_tag (tagged, GIMP_TAG (list->data));
+                }
+
+              rec->referenced = TRUE;
+              return;
+            }
+        }
+    }
+
+  checksum = gimp_tagged_get_checksum (tagged);
+
+  if (checksum)
+    {
+      checksum_quark = g_quark_try_string (checksum);
+      g_free (checksum);
+    }
+
+  if (checksum_quark)
+    {
+      for (i = 0; i < cache->priv->records->len; i++)
+        {
+          GimpTagCacheRecord *rec = &g_array_index (cache->priv->records,
+                                                    GimpTagCacheRecord, i);
+
+          if (rec->checksum == checksum_quark)
+            {
+#if DEBUG_GIMP_TAG_CACHE
+              g_printerr ("remapping identifier: %s ==> %s\n",
+                          rec->identifier ? g_quark_to_string (rec->identifier) : "(NULL)",
+                          identifier_quark ? g_quark_to_string (identifier_quark) : "(NULL)");
+#endif
+
+              rec->identifier = identifier_quark;
+
+              for (list = rec->tags; list; list = g_list_next (list))
+                {
+                  gimp_tagged_add_tag (tagged, GIMP_TAG (list->data));
+                }
+
+              rec->referenced = TRUE;
+              return;
+            }
+        }
+    }
+
+}
+
+static void
+gimp_tag_cache_object_initialize (GimpTagged   *tagged,
+                                  GimpTagCache *cache)
+{
+  gimp_tag_cache_add_object (cache, tagged);
+}
+
+static void
+gimp_tag_cache_tagged_to_cache_record_foreach (GimpTagged  *tagged,
+                                               GList      **cache_records)
+{
+  gchar *identifier = gimp_tagged_get_identifier (tagged);
+
+  if (identifier)
+    {
+      GimpTagCacheRecord *cache_rec = g_new (GimpTagCacheRecord, 1);
+      gchar              *checksum;
+
+      checksum = gimp_tagged_get_checksum (tagged);
+
+      cache_rec->identifier = g_quark_from_string (identifier);
+      cache_rec->checksum   = g_quark_from_string (checksum);
+      cache_rec->tags       = g_list_copy (gimp_tagged_get_tags (tagged));
+
+      g_free (checksum);
+
+      *cache_records = g_list_prepend (*cache_records, cache_rec);
+    }
+
+  g_free (identifier);
+}
+
+/**
+ * gimp_tag_cache_save:
+ * @cache:      a GimpTagCache object.
+ *
+ * Saves tag cache to cache file.
+ **/
+void
+gimp_tag_cache_save (GimpTagCache *cache)
+{
+  GString       *buf;
+  GList         *saved_records;
+  GList         *iterator;
+  GFile         *file;
+  GOutputStream *output;
+  GError        *error = NULL;
+  gint           i;
+
+  g_return_if_fail (GIMP_IS_TAG_CACHE (cache));
+
+  saved_records = NULL;
+  for (i = 0; i < cache->priv->records->len; i++)
+    {
+      GimpTagCacheRecord *current_record = &g_array_index (cache->priv->records,
+                                                           GimpTagCacheRecord, i);
+
+      if (! current_record->referenced && current_record->tags)
+        {
+          /* keep tagged objects which have tags assigned
+           * but were not loaded.
+           */
+          GimpTagCacheRecord *record_copy = g_new (GimpTagCacheRecord, 1);
+
+          record_copy->identifier = current_record->identifier;
+          record_copy->checksum   = current_record->checksum;
+          record_copy->tags       = g_list_copy (current_record->tags);
+
+          saved_records = g_list_prepend (saved_records, record_copy);
+        }
+    }
+
+  for (iterator = cache->priv->containers;
+       iterator;
+       iterator = g_list_next (iterator))
+    {
+      gimp_container_foreach (GIMP_CONTAINER (iterator->data),
+                              (GFunc) gimp_tag_cache_tagged_to_cache_record_foreach,
+                              &saved_records);
+    }
+
+  saved_records = g_list_reverse (saved_records);
+
+  buf = g_string_new ("");
+  g_string_append (buf, "<?xml version='1.0' encoding='UTF-8'?>\n");
+  g_string_append (buf, "<tags>\n");
+
+  for (iterator = saved_records; iterator; iterator = g_list_next (iterator))
+    {
+      GimpTagCacheRecord *cache_rec = iterator->data;
+      GList              *tag_iterator;
+      gchar              *identifier_string;
+      gchar              *tag_string;
+
+      identifier_string = g_markup_escape_text (g_quark_to_string (cache_rec->identifier), -1);
+      g_string_append_printf (buf, "\n  <resource identifier=\"%s\" checksum=\"%s\">\n",
+                              identifier_string,
+                              g_quark_to_string (cache_rec->checksum));
+      g_free (identifier_string);
+
+      for (tag_iterator = cache_rec->tags;
+           tag_iterator;
+           tag_iterator = g_list_next (tag_iterator))
+        {
+          GimpTag *tag = GIMP_TAG (tag_iterator->data);
+
+          if (! gimp_tag_get_internal (tag))
+            {
+              tag_string = g_markup_escape_text (gimp_tag_get_name (tag), -1);
+              g_string_append_printf (buf, "    <tag>%s</tag>\n", tag_string);
+              g_free (tag_string);
+            }
+        }
+
+      g_string_append (buf, "  </resource>\n");
+    }
+
+  g_string_append (buf, "</tags>\n");
+
+  file = gimp_directory_file (GIMP_TAG_CACHE_FILE, NULL);
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, &error));
+  if (! output)
+    {
+      g_printerr ("%s\n", error->message);
+    }
+  else if (! g_output_stream_write_all (output, buf->str, buf->len,
+                                        NULL, NULL, &error))
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      g_printerr (_("Error writing '%s': %s\n"),
+                  gimp_file_get_utf8_name (file), error->message);
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (output, cancellable, NULL);
+      g_object_unref (cancellable);
+    }
+  else if (! g_output_stream_close (output, NULL, &error))
+    {
+      g_printerr (_("Error closing '%s': %s\n"),
+                  gimp_file_get_utf8_name (file), error->message);
+    }
+
+  if (output)
+    g_object_unref (output);
+
+  g_clear_error (&error);
+  g_object_unref (file);
+  g_string_free (buf, TRUE);
+
+  for (iterator = saved_records;
+       iterator;
+       iterator = g_list_next (iterator))
+    {
+      GimpTagCacheRecord *cache_rec = iterator->data;
+
+      g_list_free (cache_rec->tags);
+      g_free (cache_rec);
+    }
+
+  g_list_free (saved_records);
+}
+
+/**
+ * gimp_tag_cache_load:
+ * @cache:      a GimpTagCache object.
+ *
+ * Loads tag cache from file.
+ **/
+void
+gimp_tag_cache_load (GimpTagCache *cache)
+{
+  GFile                 *file;
+  GMarkupParser          markup_parser;
+  GimpXmlParser         *xml_parser;
+  GimpTagCacheParseData  parse_data;
+  GError                *error = NULL;
+
+  g_return_if_fail (GIMP_IS_TAG_CACHE (cache));
+
+  /* clear any previous priv->records */
+  cache->priv->records = g_array_set_size (cache->priv->records, 0);
+
+  parse_data.records = g_array_new (FALSE, FALSE, sizeof (GimpTagCacheRecord));
+  memset (&parse_data.current_record, 0, sizeof (GimpTagCacheRecord));
+
+  markup_parser.start_element = gimp_tag_cache_load_start_element;
+  markup_parser.end_element   = gimp_tag_cache_load_end_element;
+  markup_parser.text          = gimp_tag_cache_load_text;
+  markup_parser.passthrough   = NULL;
+  markup_parser.error         = gimp_tag_cache_load_error;
+
+  xml_parser = gimp_xml_parser_new (&markup_parser, &parse_data);
+
+  file = gimp_directory_file (GIMP_TAG_CACHE_FILE, NULL);
+
+  if (gimp_xml_parser_parse_gfile (xml_parser, file, &error))
+    {
+      cache->priv->records = g_array_append_vals (cache->priv->records,
+                                                  parse_data.records->data,
+                                                  parse_data.records->len);
+    }
+  else
+    {
+      g_printerr ("Failed to parse tag cache: %s\n",
+                  error ? error->message : "WTF unknown error");
+    }
+
+  g_object_unref (file);
+  gimp_xml_parser_free (xml_parser);
+  g_array_free (parse_data.records, TRUE);
+}
+
+static  void
+gimp_tag_cache_load_start_element (GMarkupParseContext *context,
+                                   const gchar         *element_name,
+                                   const gchar        **attribute_names,
+                                   const gchar        **attribute_values,
+                                   gpointer             user_data,
+                                   GError             **error)
+{
+  GimpTagCacheParseData *parse_data = user_data;
+
+  if (! strcmp (element_name, "resource"))
+    {
+      const gchar *identifier;
+      const gchar *checksum;
+
+      identifier = gimp_tag_cache_attribute_name_to_value (attribute_names,
+                                                           attribute_values,
+                                                           "identifier");
+      checksum   = gimp_tag_cache_attribute_name_to_value (attribute_names,
+                                                           attribute_values,
+                                                           "checksum");
+
+      if (! identifier)
+        {
+          g_set_error (error,
+                       gimp_tag_cache_get_error_domain (),
+                       1001,
+                       "Resource tag does not contain required attribute identifier.");
+          return;
+        }
+
+      memset (&parse_data->current_record, 0, sizeof (GimpTagCacheRecord));
+
+      parse_data->current_record.identifier = g_quark_from_string (identifier);
+      parse_data->current_record.checksum   = g_quark_from_string (checksum);
+    }
+}
+
+static void
+gimp_tag_cache_load_end_element (GMarkupParseContext *context,
+                                 const gchar         *element_name,
+                                 gpointer             user_data,
+                                 GError             **error)
+{
+  GimpTagCacheParseData *parse_data = user_data;
+
+  if (strcmp (element_name, "resource") == 0)
+    {
+      parse_data->records = g_array_append_val (parse_data->records,
+                                                parse_data->current_record);
+      memset (&parse_data->current_record, 0, sizeof (GimpTagCacheRecord));
+    }
+}
+
+static void
+gimp_tag_cache_load_text (GMarkupParseContext  *context,
+                          const gchar          *text,
+                          gsize                 text_len,
+                          gpointer              user_data,
+                          GError              **error)
+{
+  GimpTagCacheParseData *parse_data = user_data;
+  const gchar           *current_element;
+  gchar                  buffer[2048];
+  GimpTag               *tag;
+
+  current_element = g_markup_parse_context_get_element (context);
+
+  if (g_strcmp0 (current_element, "tag") == 0)
+    {
+      if (text_len >= sizeof (buffer))
+        {
+          g_set_error (error, gimp_tag_cache_get_error_domain (), 1002,
+                       "Tag value is too long.");
+          return;
+        }
+
+      memcpy (buffer, text, text_len);
+      buffer[text_len] = '\0';
+
+      tag = gimp_tag_new (buffer);
+      if (tag)
+        {
+          parse_data->current_record.tags = g_list_append (parse_data->current_record.tags,
+                                                           tag);
+        }
+      else
+        {
+          g_warning ("dropping invalid tag '%s' from '%s'\n", buffer,
+                     g_quark_to_string (parse_data->current_record.identifier));
+        }
+    }
+}
+
+static  void
+gimp_tag_cache_load_error (GMarkupParseContext *context,
+                           GError              *error,
+                           gpointer             user_data)
+{
+  g_printerr ("Tag cache parse error: %s\n", error->message);
+}
+
+static const gchar*
+gimp_tag_cache_attribute_name_to_value (const gchar **attribute_names,
+                                        const gchar **attribute_values,
+                                        const gchar  *name)
+{
+  while (*attribute_names)
+    {
+      if (! strcmp (*attribute_names, name))
+        {
+          return *attribute_values;
+        }
+
+      attribute_names++;
+      attribute_values++;
+    }
+
+  return NULL;
+}
+
+static GQuark
+gimp_tag_cache_get_error_domain (void)
+{
+  return g_quark_from_static_string ("gimp-tag-cache-error-quark");
+}
diff --git a/app/core/gimptagcache.h b/app/core/gimptagcache.h
new file mode 100644
index 0000000..4c3a465
--- /dev/null
+++ b/app/core/gimptagcache.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagcache.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAG_CACHE_H__
+#define __GIMP_TAG_CACHE_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_TAG_CACHE            (gimp_tag_cache_get_type ())
+#define GIMP_TAG_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TAG_CACHE, GimpTagCache))
+#define GIMP_TAG_CACHE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TAG_CACHE, GimpTagCacheClass))
+#define GIMP_IS_TAG_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TAG_CACHE))
+#define GIMP_IS_TAG_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TAG_CACHE))
+#define GIMP_TAG_CACHE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TAG_CACHE, GimpTagCacheClass))
+
+
+typedef struct _GimpTagCacheClass   GimpTagCacheClass;
+typedef struct _GimpTagCachePrivate GimpTagCachePrivate;
+
+struct _GimpTagCache
+{
+  GimpObject           parent_instance;
+
+  GimpTagCachePrivate *priv;
+};
+
+struct _GimpTagCacheClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType           gimp_tag_cache_get_type      (void) G_GNUC_CONST;
+
+GimpTagCache *  gimp_tag_cache_new           (void);
+
+void            gimp_tag_cache_save          (GimpTagCache  *cache);
+void            gimp_tag_cache_load          (GimpTagCache  *cache);
+
+void            gimp_tag_cache_add_container (GimpTagCache  *cache,
+                                              GimpContainer *container);
+
+
+#endif  /*  __GIMP_TAG_CACHE_H__  */
diff --git a/app/core/gimptagged.c b/app/core/gimptagged.c
new file mode 100644
index 0000000..7875f9a
--- /dev/null
+++ b/app/core/gimptagged.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagged.c
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core-types.h"
+
+#include "gimpmarshal.h"
+#include "gimptag.h"
+#include "gimptagged.h"
+
+
+enum
+{
+  TAG_ADDED,
+  TAG_REMOVED,
+  LAST_SIGNAL
+};
+
+
+G_DEFINE_INTERFACE (GimpTagged, gimp_tagged, G_TYPE_OBJECT)
+
+
+static guint gimp_tagged_signals[LAST_SIGNAL] = { 0, };
+
+
+/*  private functions  */
+
+
+static void
+gimp_tagged_default_init (GimpTaggedInterface *iface)
+{
+  gimp_tagged_signals[TAG_ADDED] =
+    g_signal_new ("tag-added",
+                  GIMP_TYPE_TAGGED,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpTaggedInterface, tag_added),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_TAG);
+
+  gimp_tagged_signals[TAG_REMOVED] =
+    g_signal_new ("tag-removed",
+                  GIMP_TYPE_TAGGED,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpTaggedInterface, tag_removed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_TAG);
+}
+
+
+/*  public functions  */
+
+
+/**
+ * gimp_tagged_add_tag:
+ * @tagged: an object that implements the %GimpTagged interface
+ * @tag:    a %GimpTag
+ *
+ * Adds @tag to the @tagged object. The GimpTagged::tag-added signal
+ * is emitted if and only if the @tag was not already assigned to this
+ * object.
+ **/
+void
+gimp_tagged_add_tag (GimpTagged *tagged,
+                     GimpTag    *tag)
+{
+  g_return_if_fail (GIMP_IS_TAGGED (tagged));
+  g_return_if_fail (GIMP_IS_TAG (tag));
+
+  if (GIMP_TAGGED_GET_INTERFACE (tagged)->add_tag (tagged, tag))
+    {
+      g_signal_emit (tagged, gimp_tagged_signals[TAG_ADDED], 0, tag);
+    }
+}
+
+/**
+ * gimp_tagged_remove_tag:
+ * @tagged: an object that implements the %GimpTagged interface
+ * @tag:    a %GimpTag
+ *
+ * Removes @tag from the @tagged object. The GimpTagged::tag-removed
+ * signal is emitted if and only if the @tag was actually assigned to
+ * this object.
+ **/
+void
+gimp_tagged_remove_tag (GimpTagged *tagged,
+                        GimpTag    *tag)
+{
+  GList *tag_iter;
+
+  g_return_if_fail (GIMP_IS_TAGGED (tagged));
+  g_return_if_fail (GIMP_IS_TAG (tag));
+
+  for (tag_iter = gimp_tagged_get_tags (tagged);
+       tag_iter;
+       tag_iter = g_list_next (tag_iter))
+    {
+      GimpTag *tag_ref = tag_iter->data;
+
+      if (gimp_tag_equals (tag_ref, tag))
+        {
+          g_object_ref (tag_ref);
+
+          if (GIMP_TAGGED_GET_INTERFACE (tagged)->remove_tag (tagged, tag_ref))
+            {
+              g_signal_emit (tagged, gimp_tagged_signals[TAG_REMOVED], 0,
+                             tag_ref);
+            }
+
+          g_object_unref (tag_ref);
+
+          return;
+        }
+    }
+}
+
+/**
+ * gimp_tagged_set_tags:
+ * @tagged: an object that implements the %GimpTagged interface
+ * @tags:   a list of tags
+ *
+ * Sets the list of tags assigned to this object. The passed list of
+ * tags is copied and should be freed by the caller.
+ **/
+void
+gimp_tagged_set_tags (GimpTagged *tagged,
+                      GList      *tags)
+{
+  GList *old_tags;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TAGGED (tagged));
+
+  old_tags = g_list_copy (gimp_tagged_get_tags (tagged));
+
+  for (list = old_tags; list; list = g_list_next (list))
+    {
+      gimp_tagged_remove_tag (tagged, list->data);
+    }
+
+  g_list_free (old_tags);
+
+  for (list = tags; list; list = g_list_next (list))
+    {
+      g_return_if_fail (GIMP_IS_TAG (list->data));
+
+      gimp_tagged_add_tag (tagged, list->data);
+    }
+}
+
+/**
+ * gimp_tagged_get_tags:
+ * @tagged: an object that implements the %GimpTagged interface
+ *
+ * Returns the list of tags assigned to this object. The returned %GList
+ * is owned by the @tagged object and must not be modified or destroyed.
+ *
+ * Return value: a list of tags
+ **/
+GList *
+gimp_tagged_get_tags (GimpTagged *tagged)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED (tagged), NULL);
+
+  return GIMP_TAGGED_GET_INTERFACE (tagged)->get_tags (tagged);
+}
+
+/**
+ * gimp_tagged_get_identifier:
+ * @tagged: an object that implements the %GimpTagged interface
+ *
+ * Returns an identifier string which uniquely identifies the tagged
+ * object. Two different objects must have unique identifiers but may
+ * have the same checksum (which will be the case if one object is a
+ * copy of the other). The identifier must be the same across
+ * sessions, so for example an instance pointer cannot be used as an
+ * identifier.
+ *
+ * Return value: a newly allocated string containing unique identifier
+ * of the object. It must be freed using #g_free.
+ **/
+gchar *
+gimp_tagged_get_identifier (GimpTagged *tagged)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED (tagged), NULL);
+
+  return GIMP_TAGGED_GET_INTERFACE (tagged)->get_identifier (tagged);
+}
+
+/**
+ * gimp_tagged_get_checksum:
+ * @tagged: an object that implements the %GimpTagged interface
+ *
+ * Returns the checksum of the @tagged object. It is used to remap the
+ * tags for an object for which the identifier has changed, for
+ * example if the user has renamed a data file since the last session.
+ *
+ * If the object does not want to support such remapping (objects not
+ * stored in file for example) it can return #NULL.
+ *
+ * Return value: checksum string if object needs identifier remapping,
+ * #NULL otherwise. Returned string must be freed with #g_free().
+ **/
+gchar *
+gimp_tagged_get_checksum (GimpTagged *tagged)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED (tagged), FALSE);
+
+  return GIMP_TAGGED_GET_INTERFACE (tagged)->get_checksum (tagged);
+}
+
+/**
+ * gimp_tagged_has_tag:
+ * @tagged: an object that implements the %GimpTagged interface
+ * @tag:    a %GimpTag
+ *
+ * Return value: #TRUE if the object has @tag, #FALSE otherwise.
+ **/
+gboolean
+gimp_tagged_has_tag (GimpTagged *tagged,
+                     GimpTag    *tag)
+{
+  GList *tag_iter;
+
+  g_return_val_if_fail (GIMP_IS_TAGGED (tagged), FALSE);
+  g_return_val_if_fail (GIMP_IS_TAG (tag), FALSE);
+
+  for (tag_iter = gimp_tagged_get_tags (tagged);
+       tag_iter;
+       tag_iter = g_list_next (tag_iter))
+    {
+      if (gimp_tag_equals (tag_iter->data, tag))
+        return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/core/gimptagged.h b/app/core/gimptagged.h
new file mode 100644
index 0000000..32251e9
--- /dev/null
+++ b/app/core/gimptagged.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimptagged.h
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAGGED_H__
+#define __GIMP_TAGGED_H__
+
+
+#define GIMP_TYPE_TAGGED               (gimp_tagged_get_type ())
+#define GIMP_IS_TAGGED(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TAGGED))
+#define GIMP_TAGGED(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TAGGED, GimpTagged))
+#define GIMP_TAGGED_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_TAGGED, GimpTaggedInterface))
+
+
+typedef struct _GimpTaggedInterface GimpTaggedInterface;
+
+struct _GimpTaggedInterface
+{
+  GTypeInterface base_iface;
+
+  /*  signals            */
+  void       (* tag_added)      (GimpTagged *tagged,
+                                 GimpTag    *tag);
+  void       (* tag_removed)    (GimpTagged *tagged,
+                                 GimpTag    *tag);
+
+  /*  virtual functions  */
+  gboolean   (* add_tag)        (GimpTagged *tagged,
+                                 GimpTag    *tag);
+  gboolean   (* remove_tag)     (GimpTagged *tagged,
+                                 GimpTag    *tag);
+  GList    * (* get_tags)       (GimpTagged *tagged);
+  gchar    * (* get_identifier) (GimpTagged *tagged);
+  gchar    * (* get_checksum)   (GimpTagged *tagged);
+};
+
+
+GType      gimp_tagged_get_type       (void) G_GNUC_CONST;
+
+void       gimp_tagged_add_tag        (GimpTagged *tagged,
+                                       GimpTag    *tag);
+void       gimp_tagged_remove_tag     (GimpTagged *tagged,
+                                       GimpTag    *tag);
+
+void       gimp_tagged_set_tags       (GimpTagged *tagged,
+                                       GList      *tags);
+GList    * gimp_tagged_get_tags       (GimpTagged *tagged);
+
+gchar    * gimp_tagged_get_identifier (GimpTagged *tagged);
+gchar    * gimp_tagged_get_checksum   (GimpTagged *tagged);
+
+gboolean   gimp_tagged_has_tag        (GimpTagged *tagged,
+                                       GimpTag    *tag);
+
+
+#endif  /* __GIMP_TAGGED_H__ */
diff --git a/app/core/gimptaggedcontainer.c b/app/core/gimptaggedcontainer.c
new file mode 100644
index 0000000..93ea58b
--- /dev/null
+++ b/app/core/gimptaggedcontainer.c
@@ -0,0 +1,483 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimptaggedcontainer.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpmarshal.h"
+#include "gimptag.h"
+#include "gimptagged.h"
+#include "gimptaggedcontainer.h"
+
+
+enum
+{
+  TAG_COUNT_CHANGED,
+  LAST_SIGNAL
+};
+
+
+static void      gimp_tagged_container_dispose            (GObject               *object);
+static gint64    gimp_tagged_container_get_memsize        (GimpObject            *object,
+                                                           gint64                *gui_size);
+
+static void      gimp_tagged_container_clear              (GimpContainer         *container);
+
+static void      gimp_tagged_container_src_add            (GimpFilteredContainer *filtered_container,
+                                                           GimpObject            *object);
+static void      gimp_tagged_container_src_remove         (GimpFilteredContainer *filtered_container,
+                                                           GimpObject            *object);
+static void      gimp_tagged_container_src_freeze         (GimpFilteredContainer *filtered_container);
+static void      gimp_tagged_container_src_thaw           (GimpFilteredContainer *filtered_container);
+
+static gboolean  gimp_tagged_container_object_matches     (GimpTaggedContainer   *tagged_container,
+                                                           GimpObject            *object);
+
+static void      gimp_tagged_container_tag_added          (GimpTagged            *tagged,
+                                                           GimpTag               *tag,
+                                                           GimpTaggedContainer   *tagged_container);
+static void      gimp_tagged_container_tag_removed        (GimpTagged            *tagged,
+                                                           GimpTag               *tag,
+                                                           GimpTaggedContainer   *tagged_container);
+static void      gimp_tagged_container_ref_tag            (GimpTaggedContainer   *tagged_container,
+                                                           GimpTag               *tag);
+static void      gimp_tagged_container_unref_tag          (GimpTaggedContainer   *tagged_container,
+                                                           GimpTag               *tag);
+static void      gimp_tagged_container_tag_count_changed  (GimpTaggedContainer   *tagged_container,
+                                                           gint                   tag_count);
+
+
+G_DEFINE_TYPE (GimpTaggedContainer, gimp_tagged_container,
+               GIMP_TYPE_FILTERED_CONTAINER)
+
+#define parent_class gimp_tagged_container_parent_class
+
+static guint gimp_tagged_container_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_tagged_container_class_init (GimpTaggedContainerClass *klass)
+{
+  GObjectClass               *g_object_class    = G_OBJECT_CLASS (klass);
+  GimpObjectClass            *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpContainerClass         *container_class   = GIMP_CONTAINER_CLASS (klass);
+  GimpFilteredContainerClass *filtered_class    = GIMP_FILTERED_CONTAINER_CLASS (klass);
+
+  g_object_class->dispose        = gimp_tagged_container_dispose;
+
+  gimp_object_class->get_memsize = gimp_tagged_container_get_memsize;
+
+  container_class->clear         = gimp_tagged_container_clear;
+
+  filtered_class->src_add        = gimp_tagged_container_src_add;
+  filtered_class->src_remove     = gimp_tagged_container_src_remove;
+  filtered_class->src_freeze     = gimp_tagged_container_src_freeze;
+  filtered_class->src_thaw       = gimp_tagged_container_src_thaw;
+
+  klass->tag_count_changed       = gimp_tagged_container_tag_count_changed;
+
+  gimp_tagged_container_signals[TAG_COUNT_CHANGED] =
+    g_signal_new ("tag-count-changed",
+                  GIMP_TYPE_TAGGED_CONTAINER,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpTaggedContainerClass, tag_count_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+}
+
+static void
+gimp_tagged_container_init (GimpTaggedContainer *tagged_container)
+{
+  tagged_container->tag_ref_counts =
+    g_hash_table_new_full ((GHashFunc) gimp_tag_get_hash,
+                           (GEqualFunc) gimp_tag_equals,
+                           (GDestroyNotify) g_object_unref,
+                           (GDestroyNotify) NULL);
+}
+
+static void
+gimp_tagged_container_dispose (GObject *object)
+{
+  GimpTaggedContainer *tagged_container = GIMP_TAGGED_CONTAINER (object);
+
+  if (tagged_container->filter)
+    {
+      g_list_free_full (tagged_container->filter,
+                        (GDestroyNotify) gimp_tag_or_null_unref);
+      tagged_container->filter = NULL;
+    }
+
+  g_clear_pointer (&tagged_container->tag_ref_counts, g_hash_table_unref);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static gint64
+gimp_tagged_container_get_memsize (GimpObject *object,
+                                   gint64     *gui_size)
+{
+  gint64 memsize = 0;
+
+  /* FIXME take members into account */
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_tagged_container_clear (GimpContainer *container)
+{
+  GimpFilteredContainer *filtered_container = GIMP_FILTERED_CONTAINER (container);
+  GimpTaggedContainer   *tagged_container   = GIMP_TAGGED_CONTAINER (container);
+  GList                 *list;
+
+  for (list = GIMP_LIST (filtered_container->src_container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      g_signal_handlers_disconnect_by_func (list->data,
+                                            gimp_tagged_container_tag_added,
+                                            tagged_container);
+      g_signal_handlers_disconnect_by_func (list->data,
+                                            gimp_tagged_container_tag_removed,
+                                            tagged_container);
+    }
+
+  if (tagged_container->tag_ref_counts)
+    {
+      g_hash_table_remove_all (tagged_container->tag_ref_counts);
+      tagged_container->tag_count = 0;
+    }
+
+  GIMP_CONTAINER_CLASS (parent_class)->clear (container);
+}
+
+static void
+gimp_tagged_container_src_add (GimpFilteredContainer *filtered_container,
+                               GimpObject            *object)
+{
+  GimpTaggedContainer *tagged_container = GIMP_TAGGED_CONTAINER (filtered_container);
+  GList               *list;
+
+  for (list = gimp_tagged_get_tags (GIMP_TAGGED (object));
+       list;
+       list = g_list_next (list))
+    {
+      gimp_tagged_container_ref_tag (tagged_container, list->data);
+    }
+
+  g_signal_connect (object, "tag-added",
+                    G_CALLBACK (gimp_tagged_container_tag_added),
+                    tagged_container);
+  g_signal_connect (object, "tag-removed",
+                    G_CALLBACK (gimp_tagged_container_tag_removed),
+                    tagged_container);
+
+  if (gimp_tagged_container_object_matches (tagged_container, object))
+    {
+      gimp_container_add (GIMP_CONTAINER (tagged_container), object);
+    }
+}
+
+static void
+gimp_tagged_container_src_remove (GimpFilteredContainer *filtered_container,
+                                  GimpObject            *object)
+{
+  GimpTaggedContainer *tagged_container = GIMP_TAGGED_CONTAINER (filtered_container);
+  GList               *list;
+
+  g_signal_handlers_disconnect_by_func (object,
+                                        gimp_tagged_container_tag_added,
+                                        tagged_container);
+  g_signal_handlers_disconnect_by_func (object,
+                                        gimp_tagged_container_tag_removed,
+                                        tagged_container);
+
+  for (list = gimp_tagged_get_tags (GIMP_TAGGED (object));
+       list;
+       list = g_list_next (list))
+    {
+      gimp_tagged_container_unref_tag (tagged_container, list->data);
+    }
+
+  if (gimp_tagged_container_object_matches (tagged_container, object))
+    {
+      gimp_container_remove (GIMP_CONTAINER (tagged_container), object);
+    }
+}
+
+static void
+gimp_tagged_container_src_freeze (GimpFilteredContainer *filtered_container)
+{
+  gimp_container_clear (GIMP_CONTAINER (filtered_container));
+}
+
+static void
+gimp_tagged_container_src_thaw (GimpFilteredContainer *filtered_container)
+{
+  GList *list;
+
+  for (list = GIMP_LIST (filtered_container->src_container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      gimp_tagged_container_src_add (filtered_container, list->data);
+    }
+}
+
+/**
+ * gimp_tagged_container_new:
+ * @src_container: container to be filtered.
+ *
+ * Creates a new #GimpTaggedContainer object which creates filtered
+ * data view of #GimpTagged objects. It filters @src_container for
+ * objects containing all of the filtering tags. Synchronization with
+ * @src_container data is performed automatically.
+ *
+ * Return value: a new #GimpTaggedContainer object.
+ **/
+GimpContainer *
+gimp_tagged_container_new (GimpContainer *src_container)
+{
+  GimpTaggedContainer *tagged_container;
+  GType                children_type;
+  GCompareFunc         sort_func;
+
+  g_return_val_if_fail (GIMP_IS_LIST (src_container), NULL);
+
+  children_type = gimp_container_get_children_type (src_container);
+  sort_func     = GIMP_LIST (src_container)->sort_func;
+
+  tagged_container = g_object_new (GIMP_TYPE_TAGGED_CONTAINER,
+                                   "sort-func",     sort_func,
+                                   "children-type", children_type,
+                                   "policy",        GIMP_CONTAINER_POLICY_WEAK,
+                                   "unique-names",  FALSE,
+                                   "src-container", src_container,
+                                   NULL);
+
+  return GIMP_CONTAINER (tagged_container);
+}
+
+/**
+ * gimp_tagged_container_set_filter:
+ * @tagged_container: a #GimpTaggedContainer object.
+ * @tags:             list of #GimpTag objects.
+ *
+ * Sets list of tags to be used for filtering. Only objects which have
+ * all of the tags assigned match filtering criteria.
+ **/
+void
+gimp_tagged_container_set_filter (GimpTaggedContainer *tagged_container,
+                                  GList               *tags)
+{
+  GList *new_filter;
+
+  g_return_if_fail (GIMP_IS_TAGGED_CONTAINER (tagged_container));
+
+  if (tags)
+    {
+      GList *list;
+
+      for (list = tags; list; list = g_list_next (list))
+        g_return_if_fail (list->data == NULL || GIMP_IS_TAG (list->data));
+    }
+
+  if (! gimp_container_frozen (GIMP_FILTERED_CONTAINER (tagged_container)->src_container))
+    {
+      gimp_tagged_container_src_freeze (GIMP_FILTERED_CONTAINER (tagged_container));
+    }
+
+  /*  ref new tags first, they could be the same as the old ones  */
+  new_filter = g_list_copy (tags);
+  g_list_foreach (new_filter, (GFunc) gimp_tag_or_null_ref, NULL);
+
+  g_list_free_full (tagged_container->filter,
+                    (GDestroyNotify) gimp_tag_or_null_unref);
+  tagged_container->filter = new_filter;
+
+  if (! gimp_container_frozen (GIMP_FILTERED_CONTAINER (tagged_container)->src_container))
+    {
+      gimp_tagged_container_src_thaw (GIMP_FILTERED_CONTAINER (tagged_container));
+    }
+}
+
+/**
+ * gimp_tagged_container_get_filter:
+ * @tagged_container: a #GimpTaggedContainer object.
+ *
+ * Returns current tag filter. Tag filter is a list of GimpTag objects, which
+ * must be contained by each object matching filter criteria.
+ *
+ * Return value: a list of GimpTag objects used as filter. This value should
+ *               not be modified or freed.
+ **/
+const GList *
+gimp_tagged_container_get_filter (GimpTaggedContainer *tagged_container)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED_CONTAINER (tagged_container), NULL);
+
+  return tagged_container->filter;
+}
+
+static gboolean
+gimp_tagged_container_object_matches (GimpTaggedContainer *tagged_container,
+                                      GimpObject          *object)
+{
+  GList *filter_tags;
+
+  for (filter_tags = tagged_container->filter;
+       filter_tags;
+       filter_tags = g_list_next (filter_tags))
+    {
+      if (! filter_tags->data)
+        {
+          /* invalid tag - does not match */
+          return FALSE;
+        }
+
+      if (! gimp_tagged_has_tag (GIMP_TAGGED (object),
+                                 filter_tags->data))
+        {
+          /* match for the tag was not found.
+           * since query is of type AND, it whole fails.
+           */
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_tagged_container_tag_added (GimpTagged          *tagged,
+                                 GimpTag             *tag,
+                                 GimpTaggedContainer *tagged_container)
+{
+  gimp_tagged_container_ref_tag (tagged_container, tag);
+
+  if (gimp_tagged_container_object_matches (tagged_container,
+                                            GIMP_OBJECT (tagged)) &&
+      ! gimp_container_have (GIMP_CONTAINER (tagged_container),
+                             GIMP_OBJECT (tagged)))
+    {
+      gimp_container_add (GIMP_CONTAINER (tagged_container),
+                          GIMP_OBJECT (tagged));
+    }
+}
+
+static void
+gimp_tagged_container_tag_removed (GimpTagged          *tagged,
+                                   GimpTag             *tag,
+                                   GimpTaggedContainer *tagged_container)
+{
+  gimp_tagged_container_unref_tag (tagged_container, tag);
+
+  if (! gimp_tagged_container_object_matches (tagged_container,
+                                              GIMP_OBJECT (tagged)) &&
+      gimp_container_have (GIMP_CONTAINER (tagged_container),
+                           GIMP_OBJECT (tagged)))
+    {
+      gimp_container_remove (GIMP_CONTAINER (tagged_container),
+                             GIMP_OBJECT (tagged));
+    }
+}
+
+static void
+gimp_tagged_container_ref_tag (GimpTaggedContainer *tagged_container,
+                               GimpTag             *tag)
+{
+  gint ref_count;
+
+  ref_count = GPOINTER_TO_INT (g_hash_table_lookup (tagged_container->tag_ref_counts,
+                                                    tag));
+  ref_count++;
+  g_hash_table_insert (tagged_container->tag_ref_counts,
+                       g_object_ref (tag),
+                       GINT_TO_POINTER (ref_count));
+
+  if (ref_count == 1)
+    {
+      tagged_container->tag_count++;
+      g_signal_emit (tagged_container,
+                     gimp_tagged_container_signals[TAG_COUNT_CHANGED], 0,
+                     tagged_container->tag_count);
+    }
+}
+
+static void
+gimp_tagged_container_unref_tag (GimpTaggedContainer *tagged_container,
+                                 GimpTag             *tag)
+{
+  gint ref_count;
+
+  ref_count = GPOINTER_TO_INT (g_hash_table_lookup (tagged_container->tag_ref_counts,
+                                                    tag));
+  ref_count--;
+
+  if (ref_count > 0)
+    {
+      g_hash_table_insert (tagged_container->tag_ref_counts,
+                           g_object_ref (tag),
+                           GINT_TO_POINTER (ref_count));
+    }
+  else
+    {
+      if (g_hash_table_remove (tagged_container->tag_ref_counts, tag))
+        {
+          tagged_container->tag_count--;
+          g_signal_emit (tagged_container,
+                         gimp_tagged_container_signals[TAG_COUNT_CHANGED], 0,
+                         tagged_container->tag_count);
+        }
+    }
+}
+
+static void
+gimp_tagged_container_tag_count_changed (GimpTaggedContainer *container,
+                                         gint                 tag_count)
+{
+}
+
+/**
+ * gimp_tagged_container_get_tag_count:
+ * @container:  a #GimpTaggedContainer object.
+ *
+ * Get number of distinct tags that are currently assigned to all
+ * objects in the container. The count is independent of currently
+ * used filter, it is provided for all available objects (ie. empty
+ * filter).
+ *
+ * Return value: number of distinct tags assigned to all objects in the
+ *               container.
+ **/
+gint
+gimp_tagged_container_get_tag_count (GimpTaggedContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED_CONTAINER (container), 0);
+
+  return container->tag_count;
+}
diff --git a/app/core/gimptaggedcontainer.h b/app/core/gimptaggedcontainer.h
new file mode 100644
index 0000000..02beeeb
--- /dev/null
+++ b/app/core/gimptaggedcontainer.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimptaggedcontainer.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAGGED_CONTAINER_H__
+#define __GIMP_TAGGED_CONTAINER_H__
+
+
+#include "gimpfilteredcontainer.h"
+
+
+#define GIMP_TYPE_TAGGED_CONTAINER            (gimp_tagged_container_get_type ())
+#define GIMP_TAGGED_CONTAINER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TAGGED_CONTAINER, GimpTaggedContainer))
+#define GIMP_TAGGED_CONTAINER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TAGGED_CONTAINER, GimpTaggedContainerClass))
+#define GIMP_IS_TAGGED_CONTAINER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TAGGED_CONTAINER))
+#define GIMP_IS_TAGGED_CONTAINER_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), GIMP_TYPE_TAGGED_CONTAINER))
+#define GIMP_TAGGED_CONTAINER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TAGGED_CONTAINER, GimpTaggedContainerClass))
+
+
+typedef struct _GimpTaggedContainerClass GimpTaggedContainerClass;
+
+struct _GimpTaggedContainer
+{
+  GimpFilteredContainer  parent_instance;
+
+  GList                 *filter;
+  GHashTable            *tag_ref_counts;
+  gint                   tag_count;
+};
+
+struct _GimpTaggedContainerClass
+{
+  GimpFilteredContainerClass  parent_class;
+
+  void (* tag_count_changed) (GimpTaggedContainer *container,
+                              gint                 count);
+};
+
+
+GType           gimp_tagged_container_get_type      (void) G_GNUC_CONST;
+
+GimpContainer * gimp_tagged_container_new           (GimpContainer       *src_container);
+
+void            gimp_tagged_container_set_filter    (GimpTaggedContainer *tagged_container,
+                                                     GList               *tags);
+const GList   * gimp_tagged_container_get_filter    (GimpTaggedContainer *tagged_container);
+
+gint            gimp_tagged_container_get_tag_count (GimpTaggedContainer *container);
+
+
+#endif  /* __GIMP_TAGGED_CONTAINER_H__ */
diff --git a/app/core/gimptempbuf.c b/app/core/gimptempbuf.c
new file mode 100644
index 0000000..2879be9
--- /dev/null
+++ b/app/core/gimptempbuf.c
@@ -0,0 +1,450 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gegl-utils.h>
+#include <glib/gstdio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "core-types.h"
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "gimptempbuf.h"
+
+
+#define LOCK_DATA_ALIGNMENT 16
+
+
+struct _GimpTempBuf
+{
+  gint        ref_count;
+  gint        width;
+  gint        height;
+  const Babl *format;
+  guchar     *data;
+};
+
+typedef struct
+{
+  const Babl     *format;
+  GeglAccessMode  access_mode;
+} LockData;
+
+G_STATIC_ASSERT (sizeof (LockData) <= LOCK_DATA_ALIGNMENT);
+
+
+/*  local variables  */
+
+static guintptr gimp_temp_buf_total_memsize = 0;
+
+
+/*  public functions  */
+
+GimpTempBuf *
+gimp_temp_buf_new (gint        width,
+                   gint        height,
+                   const Babl *format)
+{
+  GimpTempBuf *temp;
+  gint         bpp;
+
+  g_return_val_if_fail (format != NULL, NULL);
+
+  bpp = babl_format_get_bytes_per_pixel (format);
+
+  g_return_val_if_fail (width > 0 && height > 0 && bpp > 0, NULL);
+  g_return_val_if_fail (G_MAXSIZE / width / height / bpp > 0, NULL);
+
+  temp = g_slice_new (GimpTempBuf);
+
+  temp->ref_count = 1;
+  temp->width     = width;
+  temp->height    = height;
+  temp->format    = format;
+  temp->data      = gegl_malloc ((gsize) width * height * bpp);
+
+  g_atomic_pointer_add (&gimp_temp_buf_total_memsize,
+                        +gimp_temp_buf_get_memsize (temp));
+
+  return temp;
+}
+
+GimpTempBuf *
+gimp_temp_buf_new_from_pixbuf (GdkPixbuf  *pixbuf,
+                               const Babl *f_or_null)
+{
+  const Babl   *format = f_or_null;
+  const Babl   *fish   = NULL;
+  GimpTempBuf  *temp_buf;
+  const guchar *pixels;
+  gint          width;
+  gint          height;
+  gint          rowstride;
+  gint          bpp;
+  guchar       *data;
+  gint          i;
+
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+  if (! format)
+    format = gimp_pixbuf_get_format (pixbuf);
+
+  pixels    = gdk_pixbuf_get_pixels (pixbuf);
+  width     = gdk_pixbuf_get_width (pixbuf);
+  height    = gdk_pixbuf_get_height (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+
+  temp_buf  = gimp_temp_buf_new (width, height, format);
+  data      = gimp_temp_buf_get_data (temp_buf);
+
+  bpp       = babl_format_get_bytes_per_pixel (format);
+
+  if (gimp_pixbuf_get_format (pixbuf) != format)
+    fish = babl_fish (gimp_pixbuf_get_format (pixbuf), format);
+
+  for (i = 0; i < height; i++)
+    {
+      if (fish)
+        babl_process (fish, pixels, data, width);
+      else
+        memcpy (data, pixels, width * bpp);
+
+      data   += width * bpp;
+      pixels += rowstride;
+    }
+
+  return temp_buf;
+}
+
+GimpTempBuf *
+gimp_temp_buf_copy (const GimpTempBuf *src)
+{
+  GimpTempBuf *dest;
+
+  g_return_val_if_fail (src != NULL, NULL);
+
+  dest = gimp_temp_buf_new (src->width, src->height, src->format);
+
+  memcpy (gimp_temp_buf_get_data (dest),
+          gimp_temp_buf_get_data (src),
+          gimp_temp_buf_get_data_size (src));
+
+  return dest;
+}
+
+GimpTempBuf *
+gimp_temp_buf_ref (const GimpTempBuf *buf)
+{
+  g_return_val_if_fail (buf != NULL, NULL);
+
+  g_atomic_int_inc ((gint *) &buf->ref_count);
+
+  return (GimpTempBuf *) buf;
+}
+
+void
+gimp_temp_buf_unref (const GimpTempBuf *buf)
+{
+  g_return_if_fail (buf != NULL);
+  g_return_if_fail (buf->ref_count > 0);
+
+  if (g_atomic_int_dec_and_test ((gint *) &buf->ref_count))
+    {
+      g_atomic_pointer_add (&gimp_temp_buf_total_memsize,
+                            -gimp_temp_buf_get_memsize (buf));
+
+
+      if (buf->data)
+        gegl_free (buf->data);
+
+      g_slice_free (GimpTempBuf, (GimpTempBuf *) buf);
+    }
+}
+
+GimpTempBuf *
+gimp_temp_buf_scale (const GimpTempBuf *src,
+                     gint               new_width,
+                     gint               new_height)
+{
+  GimpTempBuf  *dest;
+  const guchar *src_data;
+  guchar       *dest_data;
+  gdouble       x_ratio;
+  gdouble       y_ratio;
+  gint          bytes;
+  gint          loop1;
+  gint          loop2;
+
+  g_return_val_if_fail (src != NULL, NULL);
+  g_return_val_if_fail (new_width > 0 && new_height > 0, NULL);
+
+  if (new_width == src->width && new_height == src->height)
+    return gimp_temp_buf_copy (src);
+
+  dest = gimp_temp_buf_new (new_width,
+                            new_height,
+                            src->format);
+
+  src_data  = gimp_temp_buf_get_data (src);
+  dest_data = gimp_temp_buf_get_data (dest);
+
+  x_ratio = (gdouble) src->width  / (gdouble) new_width;
+  y_ratio = (gdouble) src->height / (gdouble) new_height;
+
+  bytes = babl_format_get_bytes_per_pixel (src->format);
+
+  for (loop1 = 0 ; loop1 < new_height ; loop1++)
+    {
+      for (loop2 = 0 ; loop2 < new_width ; loop2++)
+        {
+          const guchar *src_pixel;
+          guchar       *dest_pixel;
+          gint          i;
+
+          src_pixel = src_data +
+            (gint) (loop2 * x_ratio) * bytes +
+            (gint) (loop1 * y_ratio) * bytes * src->width;
+
+          dest_pixel = dest_data +
+            (loop2 + loop1 * new_width) * bytes;
+
+          for (i = 0 ; i < bytes; i++)
+            *dest_pixel++ = *src_pixel++;
+        }
+    }
+
+  return dest;
+}
+
+gint
+gimp_temp_buf_get_width (const GimpTempBuf *buf)
+{
+  return buf->width;
+}
+
+gint
+gimp_temp_buf_get_height (const GimpTempBuf *buf)
+{
+  return buf->height;
+}
+
+const Babl *
+gimp_temp_buf_get_format (const GimpTempBuf *buf)
+{
+  return buf->format;
+}
+
+void
+gimp_temp_buf_set_format (GimpTempBuf *buf,
+                          const Babl  *format)
+{
+  g_return_if_fail (babl_format_get_bytes_per_pixel (buf->format) ==
+                    babl_format_get_bytes_per_pixel (format));
+
+  buf->format = format;
+}
+
+guchar *
+gimp_temp_buf_get_data (const GimpTempBuf *buf)
+{
+  return buf->data;
+}
+
+gsize
+gimp_temp_buf_get_data_size (const GimpTempBuf *buf)
+{
+  return (gsize) babl_format_get_bytes_per_pixel (buf->format) *
+                 buf->width * buf->height;
+}
+
+guchar *
+gimp_temp_buf_data_clear (GimpTempBuf *buf)
+{
+  memset (buf->data, 0, gimp_temp_buf_get_data_size (buf));
+
+  return buf->data;
+}
+
+gpointer
+gimp_temp_buf_lock (const GimpTempBuf *buf,
+                    const Babl        *format,
+                    GeglAccessMode     access_mode)
+{
+  guchar   *data;
+  LockData *lock_data;
+  gint      n_pixels;
+  gint      bpp;
+
+  g_return_val_if_fail (buf != NULL, NULL);
+
+  if (! format || format == buf->format)
+    return gimp_temp_buf_get_data (buf);
+
+  n_pixels = buf->width * buf->height;
+  bpp      = babl_format_get_bytes_per_pixel (format);
+
+  data = gegl_scratch_alloc (LOCK_DATA_ALIGNMENT + n_pixels * bpp);
+
+  if ((guintptr) data % LOCK_DATA_ALIGNMENT)
+    {
+      g_free (data);
+
+      g_return_val_if_reached (NULL);
+    }
+
+  lock_data              = (LockData *) data;
+  lock_data->format      = format;
+  lock_data->access_mode = access_mode;
+
+  data += LOCK_DATA_ALIGNMENT;
+
+  if (access_mode & GEGL_ACCESS_READ)
+    {
+      babl_process (babl_fish (buf->format, format),
+                    gimp_temp_buf_get_data (buf),
+                    data,
+                    n_pixels);
+    }
+
+  return data;
+}
+
+void
+gimp_temp_buf_unlock (const GimpTempBuf *buf,
+                      gconstpointer      data)
+{
+  LockData *lock_data;
+
+  g_return_if_fail (buf != NULL);
+  g_return_if_fail (data != NULL);
+
+  if (data == buf->data)
+    return;
+
+  lock_data = (LockData *) ((const guint8 *) data - LOCK_DATA_ALIGNMENT);
+
+  if (lock_data->access_mode & GEGL_ACCESS_WRITE)
+    {
+      babl_process (babl_fish (lock_data->format, buf->format),
+                    data,
+                    gimp_temp_buf_get_data (buf),
+                    buf->width * buf->height);
+    }
+
+  gegl_scratch_free (lock_data);
+}
+
+gsize
+gimp_temp_buf_get_memsize (const GimpTempBuf *buf)
+{
+  if (buf)
+    return (sizeof (GimpTempBuf) + gimp_temp_buf_get_data_size (buf));
+
+  return 0;
+}
+
+GeglBuffer *
+gimp_temp_buf_create_buffer (const GimpTempBuf *temp_buf)
+{
+  GeglBuffer *buffer;
+
+  g_return_val_if_fail (temp_buf != NULL, NULL);
+
+  buffer =
+    gegl_buffer_linear_new_from_data (gimp_temp_buf_get_data (temp_buf),
+                                      temp_buf->format,
+                                      GEGL_RECTANGLE (0, 0,
+                                                      temp_buf->width,
+                                                      temp_buf->height),
+                                      GEGL_AUTO_ROWSTRIDE,
+                                      (GDestroyNotify) gimp_temp_buf_unref,
+                                      gimp_temp_buf_ref (temp_buf));
+
+  g_object_set_data (G_OBJECT (buffer),
+                     "gimp-temp-buf", (GimpTempBuf *) temp_buf);
+
+  return buffer;
+}
+
+GdkPixbuf *
+gimp_temp_buf_create_pixbuf (const GimpTempBuf *temp_buf)
+{
+  GdkPixbuf    *pixbuf;
+  const Babl   *format;
+  const Babl   *fish = NULL;
+  const guchar *data;
+  gint          width;
+  gint          height;
+  gint          bpp;
+  guchar       *pixels;
+  gint          rowstride;
+  gint          i;
+
+  g_return_val_if_fail (temp_buf != NULL, NULL);
+
+  data      = gimp_temp_buf_get_data (temp_buf);
+  format    = gimp_temp_buf_get_format (temp_buf);
+  width     = gimp_temp_buf_get_width (temp_buf);
+  height    = gimp_temp_buf_get_height (temp_buf);
+  bpp       = babl_format_get_bytes_per_pixel (format);
+
+  pixbuf    = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+                              babl_format_has_alpha (format),
+                              8, width, height);
+
+  pixels    = gdk_pixbuf_get_pixels (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+
+  if (format != gimp_pixbuf_get_format (pixbuf))
+    fish = babl_fish (format, gimp_pixbuf_get_format (pixbuf));
+
+  for (i = 0; i < height; i++)
+    {
+      if (fish)
+        babl_process (fish, data, pixels, width);
+      else
+        memcpy (pixels, data, width * bpp);
+
+      data   += width * bpp;
+      pixels += rowstride;
+    }
+
+  return pixbuf;
+}
+
+GimpTempBuf *
+gimp_gegl_buffer_get_temp_buf (GeglBuffer *buffer)
+{
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  return g_object_get_data (G_OBJECT (buffer), "gimp-temp-buf");
+}
+
+
+/*  public functions (stats)  */
+
+guint64
+gimp_temp_buf_get_total_memsize (void)
+{
+  return gimp_temp_buf_total_memsize;
+}
diff --git a/app/core/gimptempbuf.h b/app/core/gimptempbuf.h
new file mode 100644
index 0000000..d5228f5
--- /dev/null
+++ b/app/core/gimptempbuf.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEMP_BUF_H__
+#define __GIMP_TEMP_BUF_H__
+
+
+GimpTempBuf * gimp_temp_buf_new               (gint               width,
+                                               gint               height,
+                                               const Babl        *format) G_GNUC_WARN_UNUSED_RESULT;
+GimpTempBuf * gimp_temp_buf_new_from_pixbuf   (GdkPixbuf         *pixbuf,
+                                               const Babl        *f_or_null) G_GNUC_WARN_UNUSED_RESULT;
+GimpTempBuf * gimp_temp_buf_copy              (const GimpTempBuf *src) G_GNUC_WARN_UNUSED_RESULT;
+
+GimpTempBuf * gimp_temp_buf_ref               (const GimpTempBuf *buf);
+void          gimp_temp_buf_unref             (const GimpTempBuf *buf);
+
+GimpTempBuf * gimp_temp_buf_scale             (const GimpTempBuf *buf,
+                                               gint               width,
+                                               gint               height) G_GNUC_WARN_UNUSED_RESULT;
+
+gint          gimp_temp_buf_get_width         (const GimpTempBuf *buf);
+gint          gimp_temp_buf_get_height        (const GimpTempBuf *buf);
+
+const Babl  * gimp_temp_buf_get_format        (const GimpTempBuf *buf);
+void          gimp_temp_buf_set_format        (GimpTempBuf       *buf,
+                                               const Babl        *format);
+
+guchar      * gimp_temp_buf_get_data          (const GimpTempBuf *buf);
+gsize         gimp_temp_buf_get_data_size     (const GimpTempBuf *buf);
+
+guchar      * gimp_temp_buf_data_clear        (GimpTempBuf       *buf);
+
+gpointer      gimp_temp_buf_lock              (const GimpTempBuf *buf,
+                                               const Babl        *format,
+                                               GeglAccessMode     access_mode) G_GNUC_WARN_UNUSED_RESULT;
+void          gimp_temp_buf_unlock            (const GimpTempBuf *buf,
+                                               gconstpointer      data);
+
+gsize         gimp_temp_buf_get_memsize       (const GimpTempBuf *buf);
+
+GeglBuffer  * gimp_temp_buf_create_buffer     (const GimpTempBuf *temp_buf) G_GNUC_WARN_UNUSED_RESULT;
+GdkPixbuf   * gimp_temp_buf_create_pixbuf     (const GimpTempBuf *temp_buf) G_GNUC_WARN_UNUSED_RESULT;
+
+GimpTempBuf * gimp_gegl_buffer_get_temp_buf   (GeglBuffer        *buffer);
+
+
+/*  stats  */
+
+guint64       gimp_temp_buf_get_total_memsize (void);
+
+
+#endif  /*  __GIMP_TEMP_BUF_H__  */
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
new file mode 100644
index 0000000..1459493
--- /dev/null
+++ b/app/core/gimptemplate.c
@@ -0,0 +1,595 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimptemplate.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains the definition of the image template objects.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimpimage.h"
+#include "gimpprojection.h"
+#include "gimptemplate.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_RESOLUTION 300.0
+
+enum
+{
+  PROP_0,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_UNIT,
+  PROP_XRESOLUTION,
+  PROP_YRESOLUTION,
+  PROP_RESOLUTION_UNIT,
+  PROP_BASE_TYPE,
+  PROP_PRECISION,
+  PROP_COMPONENT_TYPE,
+  PROP_LINEAR,
+  PROP_COLOR_MANAGED,
+  PROP_COLOR_PROFILE,
+  PROP_FILL_TYPE,
+  PROP_COMMENT,
+  PROP_FILENAME
+};
+
+
+typedef struct _GimpTemplatePrivate GimpTemplatePrivate;
+
+struct _GimpTemplatePrivate
+{
+  gint               width;
+  gint               height;
+  GimpUnit           unit;
+
+  gdouble            xresolution;
+  gdouble            yresolution;
+  GimpUnit           resolution_unit;
+
+  GimpImageBaseType  base_type;
+  GimpPrecision      precision;
+
+  gboolean           color_managed;
+  GFile             *color_profile;
+
+  GimpFillType       fill_type;
+
+  gchar             *comment;
+  gchar             *filename;
+
+  guint64            initial_size;
+};
+
+#define GET_PRIVATE(template) ((GimpTemplatePrivate *) gimp_template_get_instance_private ((GimpTemplate *) (template)))
+
+
+static void      gimp_template_finalize     (GObject      *object);
+static void      gimp_template_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void      gimp_template_get_property (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+static void      gimp_template_notify       (GObject      *object,
+                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpTemplate, gimp_template, GIMP_TYPE_VIEWABLE,
+                         G_ADD_PRIVATE (GimpTemplate)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+#define parent_class gimp_template_parent_class
+
+
+static void
+gimp_template_class_init (GimpTemplateClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->finalize     = gimp_template_finalize;
+
+  object_class->set_property = gimp_template_set_property;
+  object_class->get_property = gimp_template_get_property;
+  object_class->notify       = gimp_template_notify;
+
+  viewable_class->default_icon_name = "gimp-template";
+  viewable_class->name_editable     = TRUE;
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_WIDTH,
+                        "width",
+                        _("Width"),
+                        NULL,
+                        GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
+                        GIMP_DEFAULT_IMAGE_WIDTH,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_HEIGHT,
+                        "height",
+                        _("Height"),
+                        NULL,
+                        GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
+                        GIMP_DEFAULT_IMAGE_HEIGHT,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_UNIT,
+                         "unit",
+                         _("Unit"),
+                         _("The unit used for coordinate display "
+                           "when not in dot-for-dot mode."),
+                         TRUE, FALSE, GIMP_UNIT_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RESOLUTION (object_class, PROP_XRESOLUTION,
+                               "xresolution",
+                               _("Resolution X"),
+                               _("The horizontal image resolution."),
+                               DEFAULT_RESOLUTION,
+                               GIMP_PARAM_STATIC_STRINGS |
+                               GIMP_TEMPLATE_PARAM_COPY_FIRST);
+
+  GIMP_CONFIG_PROP_RESOLUTION (object_class, PROP_YRESOLUTION,
+                               "yresolution",
+                               _("Resolution X"),
+                               _("The vertical image resolution."),
+                               DEFAULT_RESOLUTION,
+                               GIMP_PARAM_STATIC_STRINGS |
+                               GIMP_TEMPLATE_PARAM_COPY_FIRST);
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_RESOLUTION_UNIT,
+                         "resolution-unit",
+                         _("Resolution unit"),
+                         NULL,
+                         FALSE, FALSE, GIMP_UNIT_INCH,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BASE_TYPE,
+                         "image-type", /* serialized name */
+                         _("Image type"),
+                         NULL,
+                         GIMP_TYPE_IMAGE_BASE_TYPE, GIMP_RGB,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PRECISION,
+                         "precision",
+                         _("Precision"),
+                         NULL,
+                         GIMP_TYPE_PRECISION, GIMP_PRECISION_U8_GAMMA,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, PROP_COMPONENT_TYPE,
+                                   g_param_spec_enum ("component-type",
+                                                      _("Precision"),
+                                                      NULL,
+                                                      GIMP_TYPE_COMPONENT_TYPE,
+                                                      GIMP_COMPONENT_TYPE_U8,
+                                                      G_PARAM_READWRITE |
+                                                      GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_LINEAR,
+                                   g_param_spec_boolean ("linear",
+                                                         _("Gamma"),
+                                                         NULL,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         GIMP_PARAM_STATIC_STRINGS));
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COLOR_MANAGED,
+                            "color-managed",
+                            _("Color managed"),
+                            _("Whether the image is color managed. "
+                              "Disabling color management is equivalent to "
+                              "choosing a built-in sRGB profile. Better "
+                              "leave color management enabled."),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_COLOR_PROFILE,
+                           "color-profile",
+                           _("Color profile"),
+                           NULL,
+                           G_TYPE_FILE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_TYPE,
+                         "fill-type",
+                         _("Fill type"),
+                         NULL,
+                         GIMP_TYPE_FILL_TYPE, GIMP_FILL_BACKGROUND,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_COMMENT,
+                           "comment",
+                           _("Comment"),
+                           NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_FILENAME,
+                           "filename",
+                           _("Filename"),
+                           NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_template_init (GimpTemplate *template)
+{
+}
+
+static void
+gimp_template_finalize (GObject *object)
+{
+  GimpTemplatePrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->color_profile);
+  g_clear_pointer (&private->comment,  g_free);
+  g_clear_pointer (&private->filename, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_template_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpTemplatePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_WIDTH:
+      private->width = g_value_get_int (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_int (value);
+      break;
+    case PROP_UNIT:
+      private->unit = g_value_get_int (value);
+      break;
+    case PROP_XRESOLUTION:
+      private->xresolution = g_value_get_double (value);
+      break;
+    case PROP_YRESOLUTION:
+      private->yresolution = g_value_get_double (value);
+      break;
+    case PROP_RESOLUTION_UNIT:
+      private->resolution_unit = g_value_get_int (value);
+      break;
+    case PROP_BASE_TYPE:
+      private->base_type = g_value_get_enum (value);
+      break;
+    case PROP_PRECISION:
+      private->precision = g_value_get_enum (value);
+      g_object_notify (object, "component-type");
+      g_object_notify (object, "linear");
+      break;
+    case PROP_COMPONENT_TYPE:
+      private->precision =
+        gimp_babl_precision (g_value_get_enum (value),
+                             gimp_babl_linear (private->precision));
+      g_object_notify (object, "precision");
+      break;
+    case PROP_LINEAR:
+      private->precision =
+        gimp_babl_precision (gimp_babl_component_type (private->precision),
+                             g_value_get_boolean (value));
+      g_object_notify (object, "precision");
+      break;
+    case PROP_COLOR_MANAGED:
+      private->color_managed = g_value_get_boolean (value);
+      break;
+    case PROP_COLOR_PROFILE:
+      if (private->color_profile)
+        g_object_unref (private->color_profile);
+      private->color_profile = g_value_dup_object (value);
+      break;
+    case PROP_FILL_TYPE:
+      private->fill_type = g_value_get_enum (value);
+      break;
+    case PROP_COMMENT:
+      if (private->comment)
+        g_free (private->comment);
+      private->comment = g_value_dup_string (value);
+      break;
+    case PROP_FILENAME:
+      if (private->filename)
+        g_free (private->filename);
+      private->filename = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_template_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpTemplatePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_WIDTH:
+      g_value_set_int (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_int (value, private->height);
+      break;
+    case PROP_UNIT:
+      g_value_set_int (value, private->unit);
+      break;
+    case PROP_XRESOLUTION:
+      g_value_set_double (value, private->xresolution);
+      break;
+    case PROP_YRESOLUTION:
+      g_value_set_double (value, private->yresolution);
+      break;
+    case PROP_RESOLUTION_UNIT:
+      g_value_set_int (value, private->resolution_unit);
+      break;
+    case PROP_BASE_TYPE:
+      g_value_set_enum (value, private->base_type);
+      break;
+    case PROP_PRECISION:
+      g_value_set_enum (value, private->precision);
+      break;
+    case PROP_COMPONENT_TYPE:
+      g_value_set_enum (value, gimp_babl_component_type (private->precision));
+      break;
+    case PROP_LINEAR:
+      g_value_set_boolean (value, gimp_babl_linear (private->precision));
+      break;
+    case PROP_COLOR_MANAGED:
+      g_value_set_boolean (value, private->color_managed);
+      break;
+    case PROP_COLOR_PROFILE:
+      g_value_set_object (value, private->color_profile);
+      break;
+    case PROP_FILL_TYPE:
+      g_value_set_enum (value, private->fill_type);
+      break;
+    case PROP_COMMENT:
+      g_value_set_string (value, private->comment);
+      break;
+    case PROP_FILENAME:
+      g_value_set_string (value, private->filename);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_template_notify (GObject    *object,
+                      GParamSpec *pspec)
+{
+  GimpTemplatePrivate *private = GET_PRIVATE (object);
+  const Babl          *format;
+  gint                 bytes;
+
+  if (G_OBJECT_CLASS (parent_class)->notify)
+    G_OBJECT_CLASS (parent_class)->notify (object, pspec);
+
+  /* the initial layer */
+  format = gimp_babl_format (private->base_type,
+                             private->precision,
+                             private->fill_type == GIMP_FILL_TRANSPARENT);
+  bytes = babl_format_get_bytes_per_pixel (format);
+
+  /* the selection */
+  format = gimp_babl_mask_format (private->precision);
+  bytes += babl_format_get_bytes_per_pixel (format);
+
+  private->initial_size = ((guint64) bytes          *
+                           (guint64) private->width *
+                           (guint64) private->height);
+
+  private->initial_size +=
+    gimp_projection_estimate_memsize (private->base_type,
+                                      gimp_babl_component_type (private->precision),
+                                      private->width, private->height);
+}
+
+
+/*  public functions  */
+
+GimpTemplate *
+gimp_template_new (const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_TEMPLATE,
+                       "name", name,
+                       NULL);
+}
+
+void
+gimp_template_set_from_image (GimpTemplate *template,
+                              GimpImage    *image)
+{
+  gdouble             xresolution;
+  gdouble             yresolution;
+  GimpImageBaseType   base_type;
+  const GimpParasite *parasite;
+  gchar              *comment = NULL;
+
+  g_return_if_fail (GIMP_IS_TEMPLATE (template));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  gimp_image_get_resolution (image, &xresolution, &yresolution);
+
+  base_type = gimp_image_get_base_type (image);
+
+  if (base_type == GIMP_INDEXED)
+    base_type = GIMP_RGB;
+
+  parasite =  gimp_image_parasite_find (image, "gimp-comment");
+  if (parasite)
+    comment = g_strndup (gimp_parasite_data (parasite),
+                         gimp_parasite_data_size (parasite));
+
+  g_object_set (template,
+                "width",           gimp_image_get_width (image),
+                "height",          gimp_image_get_height (image),
+                "xresolution",     xresolution,
+                "yresolution",     yresolution,
+                "resolution-unit", gimp_image_get_unit (image),
+                "image-type",      base_type,
+                "precision",       gimp_image_get_precision (image),
+                "comment",         comment,
+                NULL);
+
+  if (comment)
+    g_free (comment);
+}
+
+gint
+gimp_template_get_width (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), 0);
+
+  return GET_PRIVATE (template)->width;
+}
+
+gint
+gimp_template_get_height (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), 0);
+
+  return GET_PRIVATE (template)->height;
+}
+
+GimpUnit
+gimp_template_get_unit (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_UNIT_INCH);
+
+  return GET_PRIVATE (template)->unit;
+}
+
+gdouble
+gimp_template_get_resolution_x (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), 1.0);
+
+  return GET_PRIVATE (template)->xresolution;
+}
+
+gdouble
+gimp_template_get_resolution_y (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), 1.0);
+
+  return GET_PRIVATE (template)->yresolution;
+}
+
+GimpUnit
+gimp_template_get_resolution_unit (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_UNIT_INCH);
+
+  return GET_PRIVATE (template)->resolution_unit;
+}
+
+GimpImageBaseType
+gimp_template_get_base_type (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_RGB);
+
+  return GET_PRIVATE (template)->base_type;
+}
+
+GimpPrecision
+gimp_template_get_precision (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_PRECISION_U8_GAMMA);
+
+  return GET_PRIVATE (template)->precision;
+}
+
+gboolean
+gimp_template_get_color_managed (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), FALSE);
+
+  return GET_PRIVATE (template)->color_managed;
+}
+
+GimpColorProfile *
+gimp_template_get_color_profile (GimpTemplate *template)
+{
+  GimpTemplatePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), FALSE);
+
+  private = GET_PRIVATE (template);
+
+  if (private->color_profile)
+    return gimp_color_profile_new_from_file (private->color_profile, NULL);
+
+  return NULL;
+}
+
+GimpFillType
+gimp_template_get_fill_type (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_FILL_BACKGROUND);
+
+  return GET_PRIVATE (template)->fill_type;
+}
+
+const gchar *
+gimp_template_get_comment (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), NULL);
+
+  return GET_PRIVATE (template)->comment;
+}
+
+guint64
+gimp_template_get_initial_size (GimpTemplate *template)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), 0);
+
+  return GET_PRIVATE (template)->initial_size;
+}
diff --git a/app/core/gimptemplate.h b/app/core/gimptemplate.h
new file mode 100644
index 0000000..671a247
--- /dev/null
+++ b/app/core/gimptemplate.h
@@ -0,0 +1,97 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimptemplate.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEMPLATE_H__
+#define __GIMP_TEMPLATE_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TEMPLATE_PARAM_COPY_FIRST (1 << (8 + G_PARAM_USER_SHIFT))
+
+#ifdef GIMP_UNSTABLE
+/* Uncommon ratio, with at least one odd value, to encourage testing
+ * GIMP with unusual numbers.
+ * It also has to be a higher resolution, to push GIMP a little further
+ * in tests. */
+#define GIMP_DEFAULT_IMAGE_WIDTH   2001
+#define GIMP_DEFAULT_IMAGE_HEIGHT  1984
+#else
+/* 1366x768 is the most common screen resolution in 2016.
+ * 1920x1080 is the second most common.
+ * Since GIMP targets advanced graphics artists, let's go for the
+ * highest common dimension.
+ */
+#define GIMP_DEFAULT_IMAGE_WIDTH   1920
+#define GIMP_DEFAULT_IMAGE_HEIGHT  1080
+#endif
+
+
+#define GIMP_TYPE_TEMPLATE            (gimp_template_get_type ())
+#define GIMP_TEMPLATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPLATE, GimpTemplate))
+#define GIMP_TEMPLATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPLATE, GimpTemplateClass))
+#define GIMP_IS_TEMPLATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEMPLATE))
+#define GIMP_IS_TEMPLATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEMPLATE))
+#define GIMP_TEMPLATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEMPLATE, GimpTemplateClass))
+
+
+typedef struct _GimpTemplateClass GimpTemplateClass;
+
+struct _GimpTemplate
+{
+  GimpViewable  parent_instance;
+};
+
+struct _GimpTemplateClass
+{
+  GimpViewableClass  parent_instance;
+};
+
+
+GType               gimp_template_get_type            (void) G_GNUC_CONST;
+
+GimpTemplate      * gimp_template_new                 (const gchar  *name);
+
+void                gimp_template_set_from_image      (GimpTemplate *template,
+                                                       GimpImage    *image);
+
+gint                gimp_template_get_width           (GimpTemplate *template);
+gint                gimp_template_get_height          (GimpTemplate *template);
+GimpUnit            gimp_template_get_unit            (GimpTemplate *template);
+
+gdouble             gimp_template_get_resolution_x    (GimpTemplate *template);
+gdouble             gimp_template_get_resolution_y    (GimpTemplate *template);
+GimpUnit            gimp_template_get_resolution_unit (GimpTemplate *template);
+
+GimpImageBaseType   gimp_template_get_base_type       (GimpTemplate *template);
+GimpPrecision       gimp_template_get_precision       (GimpTemplate *template);
+
+gboolean            gimp_template_get_color_managed   (GimpTemplate *template);
+GimpColorProfile  * gimp_template_get_color_profile   (GimpTemplate *template);
+
+GimpFillType        gimp_template_get_fill_type       (GimpTemplate *template);
+
+const gchar       * gimp_template_get_comment         (GimpTemplate *template);
+
+guint64             gimp_template_get_initial_size    (GimpTemplate *template);
+
+
+#endif /* __GIMP_TEMPLATE__ */
diff --git a/app/core/gimptilehandlerprojectable.c b/app/core/gimptilehandlerprojectable.c
new file mode 100644
index 0000000..4b9e86b
--- /dev/null
+++ b/app/core/gimptilehandlerprojectable.c
@@ -0,0 +1,91 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <cairo.h>
+
+#include "core-types.h"
+
+#include "gimpprojectable.h"
+
+#include "gimptilehandlerprojectable.h"
+
+
+static void   gimp_tile_handler_projectable_begin_validate (GimpTileHandlerValidate *validate);
+static void   gimp_tile_handler_projectable_end_validate   (GimpTileHandlerValidate *validate);
+
+
+G_DEFINE_TYPE (GimpTileHandlerProjectable, gimp_tile_handler_projectable,
+               GIMP_TYPE_TILE_HANDLER_VALIDATE)
+
+#define parent_class gimp_tile_handler_projectable_parent_class
+
+
+static void
+gimp_tile_handler_projectable_class_init (GimpTileHandlerProjectableClass *klass)
+{
+  GimpTileHandlerValidateClass *validate_class;
+
+  validate_class = GIMP_TILE_HANDLER_VALIDATE_CLASS (klass);
+
+  validate_class->begin_validate = gimp_tile_handler_projectable_begin_validate;
+  validate_class->end_validate   = gimp_tile_handler_projectable_end_validate;
+}
+
+static void
+gimp_tile_handler_projectable_init (GimpTileHandlerProjectable *projectable)
+{
+}
+
+static void
+gimp_tile_handler_projectable_begin_validate (GimpTileHandlerValidate *validate)
+{
+  GimpTileHandlerProjectable *handler = GIMP_TILE_HANDLER_PROJECTABLE (validate);
+
+  GIMP_TILE_HANDLER_VALIDATE_CLASS (parent_class)->begin_validate (validate);
+
+  gimp_projectable_begin_render (handler->projectable);
+}
+
+static void
+gimp_tile_handler_projectable_end_validate (GimpTileHandlerValidate *validate)
+{
+  GimpTileHandlerProjectable *handler = GIMP_TILE_HANDLER_PROJECTABLE (validate);
+
+  gimp_projectable_end_render (handler->projectable);
+
+  GIMP_TILE_HANDLER_VALIDATE_CLASS (parent_class)->end_validate (validate);
+}
+
+GeglTileHandler *
+gimp_tile_handler_projectable_new (GimpProjectable *projectable)
+{
+  GimpTileHandlerProjectable *handler;
+
+  g_return_val_if_fail (GIMP_IS_PROJECTABLE (projectable), NULL);
+
+  handler = g_object_new (GIMP_TYPE_TILE_HANDLER_PROJECTABLE, NULL);
+
+  GIMP_TILE_HANDLER_VALIDATE (handler)->graph =
+    g_object_ref (gimp_projectable_get_graph (projectable));
+
+  handler->projectable = projectable;
+
+  return GEGL_TILE_HANDLER (handler);
+}
diff --git a/app/core/gimptilehandlerprojectable.h b/app/core/gimptilehandlerprojectable.h
new file mode 100644
index 0000000..57af4b6
--- /dev/null
+++ b/app/core/gimptilehandlerprojectable.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TILE_HANDLER_PROJECTABLE_H__
+#define __GIMP_TILE_HANDLER_PROJECTABLE_H__
+
+
+#include "gegl/gimptilehandlervalidate.h"
+
+
+/***
+ * GimpTileHandlerProjectable is a GeglTileHandler that renders a
+ * projectable, calling the projectable's begin_render() and end_render()
+ * before/after the actual rendering.
+ *
+ * Note that the tile handler does not own a reference to the projectable.
+ * It's the user's responsibility to manage the handler's and projectable's
+ * lifetime.
+ */
+
+#define GIMP_TYPE_TILE_HANDLER_PROJECTABLE            (gimp_tile_handler_projectable_get_type ())
+#define GIMP_TILE_HANDLER_PROJECTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TILE_HANDLER_PROJECTABLE, GimpTileHandlerProjectable))
+#define GIMP_TILE_HANDLER_PROJECTABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_TILE_HANDLER_PROJECTABLE, GimpTileHandlerProjectableClass))
+#define GIMP_IS_TILE_HANDLER_PROJECTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TILE_HANDLER_PROJECTABLE))
+#define GIMP_IS_TILE_HANDLER_PROJECTABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_TILE_HANDLER_PROJECTABLE))
+#define GIMP_TILE_HANDLER_PROJECTABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_TILE_HANDLER_PROJECTABLE, GimpTileHandlerProjectableClass))
+
+
+typedef struct _GimpTileHandlerProjectable      GimpTileHandlerProjectable;
+typedef struct _GimpTileHandlerProjectableClass GimpTileHandlerProjectableClass;
+
+struct _GimpTileHandlerProjectable
+{
+  GimpTileHandlerValidate  parent_instance;
+
+  GimpProjectable         *projectable;
+};
+
+struct _GimpTileHandlerProjectableClass
+{
+  GimpTileHandlerValidateClass  parent_class;
+};
+
+
+GType             gimp_tile_handler_projectable_get_type (void) G_GNUC_CONST;
+
+GeglTileHandler * gimp_tile_handler_projectable_new      (GimpProjectable *projectable);
+
+
+#endif /* __GIMP_TILE_HANDLER_PROJECTABLE_H__ */
diff --git a/app/core/gimptoolgroup.c b/app/core/gimptoolgroup.c
new file mode 100644
index 0000000..aa8e3bc
--- /dev/null
+++ b/app/core/gimptoolgroup.c
@@ -0,0 +1,413 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolgroup.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimplist.h"
+#include "gimpmarshal.h"
+#include "gimptoolgroup.h"
+#include "gimptoolinfo.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  ACTIVE_TOOL_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_ACTIVE_TOOL,
+  PROP_CHILDREN
+};
+
+
+struct _GimpToolGroupPrivate
+{
+  gchar         *active_tool;
+  GimpContainer *children;
+};
+
+
+/*  local function prototypes  */
+
+
+static void            gimp_tool_group_finalize        (GObject        *object);
+static void            gimp_tool_group_get_property    (GObject        *object,
+                                                        guint           property_id,
+                                                        GValue         *value,
+                                                        GParamSpec     *pspec);
+static void            gimp_tool_group_set_property    (GObject        *object,
+                                                        guint           property_id,
+                                                        const GValue   *value,
+                                                        GParamSpec     *pspec);
+
+static gint64          gimp_tool_group_get_memsize     (GimpObject     *object,
+                                                        gint64         *gui_size);
+
+static gchar         * gimp_tool_group_get_description (GimpViewable   *viewable,
+                                                        gchar         **tooltip);
+static GimpContainer * gimp_tool_group_get_children    (GimpViewable   *viewable);
+static void            gimp_tool_group_set_expanded    (GimpViewable   *viewable,
+                                                        gboolean        expand);
+static gboolean        gimp_tool_group_get_expanded    (GimpViewable   *viewable);
+
+static void            gimp_tool_group_child_add       (GimpContainer  *container,
+                                                        GimpToolInfo   *tool_info,
+                                                        GimpToolGroup  *tool_group);
+static void            gimp_tool_group_child_remove    (GimpContainer  *container,
+                                                        GimpToolInfo   *tool_info,
+                                                        GimpToolGroup  *tool_group);
+
+static void            gimp_tool_group_shown_changed   (GimpToolItem   *tool_item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolGroup, gimp_tool_group, GIMP_TYPE_TOOL_ITEM)
+
+#define parent_class gimp_tool_group_parent_class
+
+static guint gimp_tool_group_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  private functions  */
+
+static void
+gimp_tool_group_class_init (GimpToolGroupClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpToolItemClass *tool_item_class   = GIMP_TOOL_ITEM_CLASS (klass);
+
+  gimp_tool_group_signals[ACTIVE_TOOL_CHANGED] =
+    g_signal_new ("active-tool-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolGroupClass, active_tool_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize            = gimp_tool_group_finalize;
+  object_class->get_property        = gimp_tool_group_get_property;
+  object_class->set_property        = gimp_tool_group_set_property;
+
+  gimp_object_class->get_memsize    = gimp_tool_group_get_memsize;
+
+  viewable_class->default_icon_name = "folder";
+  viewable_class->get_description   = gimp_tool_group_get_description;
+  viewable_class->get_children      = gimp_tool_group_get_children;
+  viewable_class->get_expanded      = gimp_tool_group_get_expanded;
+  viewable_class->set_expanded      = gimp_tool_group_set_expanded;
+
+  tool_item_class->shown_changed    = gimp_tool_group_shown_changed;
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_ACTIVE_TOOL,
+                           "active-tool", NULL, NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_CHILDREN,
+                           "children", NULL, NULL,
+                           GIMP_TYPE_CONTAINER,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+}
+
+static void
+gimp_tool_group_init (GimpToolGroup *tool_group)
+{
+  tool_group->priv = gimp_tool_group_get_instance_private (tool_group);
+
+  tool_group->priv->children = g_object_new (
+    GIMP_TYPE_LIST,
+    "children-type", GIMP_TYPE_TOOL_INFO,
+    "append",        TRUE,
+    NULL);
+
+  g_signal_connect (tool_group->priv->children, "add",
+                    G_CALLBACK (gimp_tool_group_child_add),
+                    tool_group);
+  g_signal_connect (tool_group->priv->children, "remove",
+                    G_CALLBACK (gimp_tool_group_child_remove),
+                    tool_group);
+}
+
+static void
+gimp_tool_group_finalize (GObject *object)
+{
+  GimpToolGroup *tool_group = GIMP_TOOL_GROUP (object);
+
+  g_clear_pointer (&tool_group->priv->active_tool, g_free);
+
+  g_clear_object (&tool_group->priv->children);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_group_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpToolGroup *tool_group = GIMP_TOOL_GROUP (object);
+
+  switch (property_id)
+    {
+    case PROP_ACTIVE_TOOL:
+      g_value_set_string (value, tool_group->priv->active_tool);
+      break;
+
+    case PROP_CHILDREN:
+      g_value_set_object (value, tool_group->priv->children);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_group_set_property_add_tool (GimpToolInfo  *tool_info,
+                                       GimpToolGroup *tool_group)
+{
+  gimp_container_add (tool_group->priv->children, GIMP_OBJECT (tool_info));
+}
+
+static void
+gimp_tool_group_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpToolGroup *tool_group = GIMP_TOOL_GROUP (object);
+
+  switch (property_id)
+    {
+    case PROP_ACTIVE_TOOL:
+      g_free (tool_group->priv->active_tool);
+
+      tool_group->priv->active_tool = g_value_dup_string (value);
+      break;
+
+    case PROP_CHILDREN:
+      {
+        GimpContainer *container = g_value_get_object (value);
+
+        gimp_container_clear (tool_group->priv->children);
+
+        if (! container)
+          break;
+
+        gimp_container_foreach (container,
+                                (GFunc) gimp_tool_group_set_property_add_tool,
+                                tool_group);
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_tool_group_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpToolGroup *tool_group = GIMP_TOOL_GROUP (object);
+  gint64         memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (tool_group->priv->children),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gchar *
+gimp_tool_group_get_description (GimpViewable  *viewable,
+                                 gchar        **tooltip)
+{
+  /* Translators: this is a noun */
+  return g_strdup (C_("tool-item", "Group"));
+}
+
+static GimpContainer *
+gimp_tool_group_get_children (GimpViewable *viewable)
+{
+  GimpToolGroup *tool_group = GIMP_TOOL_GROUP (viewable);
+
+  return tool_group->priv->children;
+}
+
+static void
+gimp_tool_group_set_expanded (GimpViewable *viewable,
+                              gboolean      expand)
+{
+  if (! expand)
+    gimp_viewable_expanded_changed (viewable);
+}
+
+static gboolean
+gimp_tool_group_get_expanded (GimpViewable *viewable)
+{
+  return TRUE;
+}
+
+static void
+gimp_tool_group_child_add (GimpContainer *container,
+                           GimpToolInfo  *tool_info,
+                           GimpToolGroup *tool_group)
+{
+  g_return_if_fail (
+    gimp_viewable_get_parent (GIMP_VIEWABLE (tool_info)) == NULL);
+
+  gimp_viewable_set_parent (GIMP_VIEWABLE (tool_info),
+                            GIMP_VIEWABLE (tool_group));
+
+  if (! tool_group->priv->active_tool)
+    gimp_tool_group_set_active_tool_info (tool_group, tool_info);
+}
+
+static void
+gimp_tool_group_child_remove (GimpContainer *container,
+                              GimpToolInfo  *tool_info,
+                              GimpToolGroup *tool_group)
+{
+  gimp_viewable_set_parent (GIMP_VIEWABLE (tool_info), NULL);
+
+  if (! g_strcmp0 (tool_group->priv->active_tool,
+                   gimp_object_get_name (GIMP_OBJECT (tool_info))))
+    {
+      GimpToolInfo *active_tool_info = NULL;
+
+      if (! gimp_container_is_empty (tool_group->priv->children))
+        {
+          active_tool_info = GIMP_TOOL_INFO (
+            gimp_container_get_first_child (tool_group->priv->children));
+        }
+
+      gimp_tool_group_set_active_tool_info (tool_group, active_tool_info);
+    }
+}
+
+static void
+gimp_tool_group_shown_changed (GimpToolItem *tool_item)
+{
+  GimpToolGroup *tool_group = GIMP_TOOL_GROUP (tool_item);
+  GList         *iter;
+
+  if (GIMP_TOOL_ITEM_CLASS (parent_class)->shown_changed)
+    GIMP_TOOL_ITEM_CLASS (parent_class)->shown_changed (tool_item);
+
+  for (iter = GIMP_LIST (tool_group->priv->children)->queue->head;
+       iter;
+       iter = g_list_next (iter))
+    {
+      GimpToolItem *tool_item = iter->data;
+
+      if (gimp_tool_item_get_visible (tool_item))
+        gimp_tool_item_shown_changed (tool_item);
+    }
+}
+
+
+/*  public functions  */
+
+GimpToolGroup *
+gimp_tool_group_new (void)
+{
+  GimpToolGroup *tool_group;
+
+  tool_group = g_object_new (GIMP_TYPE_TOOL_GROUP, NULL);
+
+  gimp_object_set_static_name (GIMP_OBJECT (tool_group), "tool group");
+
+  return tool_group;
+}
+
+void
+gimp_tool_group_set_active_tool (GimpToolGroup *tool_group,
+                                 const gchar   *tool_name)
+{
+  g_return_if_fail (GIMP_IS_TOOL_GROUP (tool_group));
+
+  if (g_strcmp0 (tool_group->priv->active_tool, tool_name))
+    {
+      g_return_if_fail (tool_name == NULL ||
+                        gimp_container_get_child_by_name (
+                          tool_group->priv->children, tool_name) != NULL);
+
+      g_free (tool_group->priv->active_tool);
+
+      tool_group->priv->active_tool = g_strdup (tool_name);;
+
+      g_signal_emit (tool_group,
+                     gimp_tool_group_signals[ACTIVE_TOOL_CHANGED], 0);
+
+      g_object_notify (G_OBJECT (tool_group), "active-tool");
+    }
+}
+
+const gchar *
+gimp_tool_group_get_active_tool (GimpToolGroup *tool_group)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GROUP (tool_group), NULL);
+
+  return tool_group->priv->active_tool;
+}
+
+void
+gimp_tool_group_set_active_tool_info (GimpToolGroup *tool_group,
+                                      GimpToolInfo  *tool_info)
+{
+  g_return_if_fail (GIMP_IS_TOOL_GROUP (tool_group));
+  g_return_if_fail (tool_info == NULL || GIMP_IS_TOOL_INFO (tool_info));
+
+  gimp_tool_group_set_active_tool (
+    tool_group,
+    tool_info ? gimp_object_get_name (GIMP_OBJECT (tool_info)) : NULL);
+}
+
+GimpToolInfo *
+gimp_tool_group_get_active_tool_info (GimpToolGroup *tool_group)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GROUP (tool_group), NULL);
+
+  return GIMP_TOOL_INFO (
+    gimp_container_get_child_by_name (tool_group->priv->children,
+                                      tool_group->priv->active_tool));
+}
diff --git a/app/core/gimptoolgroup.h b/app/core/gimptoolgroup.h
new file mode 100644
index 0000000..ef4d979
--- /dev/null
+++ b/app/core/gimptoolgroup.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolgroup.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_GROUP_H__
+#define __GIMP_TOOL_GROUP_H__
+
+
+#include "gimptoolitem.h"
+
+
+#define GIMP_TYPE_TOOL_GROUP            (gimp_tool_group_get_type ())
+#define GIMP_TOOL_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_GROUP, GimpToolGroup))
+#define GIMP_TOOL_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_GROUP, GimpToolGroupClass))
+#define GIMP_IS_TOOL_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_GROUP))
+#define GIMP_IS_TOOL_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_GROUP))
+#define GIMP_TOOL_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_GROUP, GimpToolGroupClass))
+
+
+typedef struct _GimpToolGroupPrivate GimpToolGroupPrivate;
+typedef struct _GimpToolGroupClass   GimpToolGroupClass;
+
+struct _GimpToolGroup
+{
+  GimpToolItem          parent_instance;
+
+  GimpToolGroupPrivate *priv;
+};
+
+struct _GimpToolGroupClass
+{
+  GimpToolItemClass  parent_class;
+
+  /*  signals  */
+  void (* active_tool_changed) (GimpToolGroup *tool_group);
+};
+
+
+GType           gimp_tool_group_get_type             (void) G_GNUC_CONST;
+
+GimpToolGroup * gimp_tool_group_new                  (void);
+
+void            gimp_tool_group_set_active_tool      (GimpToolGroup *tool_group,
+                                                      const gchar   *tool_name);
+const gchar   * gimp_tool_group_get_active_tool      (GimpToolGroup *tool_group);
+
+void            gimp_tool_group_set_active_tool_info (GimpToolGroup *tool_group,
+                                                      GimpToolInfo  *tool_info);
+GimpToolInfo  * gimp_tool_group_get_active_tool_info (GimpToolGroup *tool_group);
+
+
+#endif  /*  __GIMP_TOOL_GROUP_H__  */
diff --git a/app/core/gimptoolinfo.c b/app/core/gimptoolinfo.c
new file mode 100644
index 0000000..34d93c3
--- /dev/null
+++ b/app/core/gimptoolinfo.c
@@ -0,0 +1,263 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpdatafactory.h"
+#include "gimpfilteredcontainer.h"
+#include "gimppaintinfo.h"
+#include "gimptoolinfo.h"
+#include "gimptooloptions.h"
+#include "gimptoolpreset.h"
+
+
+static void    gimp_tool_info_dispose         (GObject       *object);
+static void    gimp_tool_info_finalize        (GObject       *object);
+
+static gchar * gimp_tool_info_get_description (GimpViewable  *viewable,
+                                               gchar        **tooltip);
+
+
+G_DEFINE_TYPE (GimpToolInfo, gimp_tool_info, GIMP_TYPE_TOOL_ITEM)
+
+#define parent_class gimp_tool_info_parent_class
+
+
+static void
+gimp_tool_info_class_init (GimpToolInfoClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->dispose           = gimp_tool_info_dispose;
+  object_class->finalize          = gimp_tool_info_finalize;
+
+  viewable_class->get_description = gimp_tool_info_get_description;
+}
+
+static void
+gimp_tool_info_init (GimpToolInfo *tool_info)
+{
+}
+
+static void
+gimp_tool_info_dispose (GObject *object)
+{
+  GimpToolInfo *tool_info = GIMP_TOOL_INFO (object);
+
+  if (tool_info->tool_options)
+    {
+      g_object_run_dispose (G_OBJECT (tool_info->tool_options));
+      g_clear_object (&tool_info->tool_options);
+    }
+
+  g_clear_object (&tool_info->presets);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tool_info_finalize (GObject *object)
+{
+  GimpToolInfo *tool_info = GIMP_TOOL_INFO (object);
+
+  g_clear_pointer (&tool_info->label,       g_free);
+  g_clear_pointer (&tool_info->tooltip,     g_free);
+  g_clear_pointer (&tool_info->menu_label,  g_free);
+  g_clear_pointer (&tool_info->menu_accel,  g_free);
+  g_clear_pointer (&tool_info->help_domain, g_free);
+  g_clear_pointer (&tool_info->help_id,     g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gchar *
+gimp_tool_info_get_description (GimpViewable  *viewable,
+                                gchar        **tooltip)
+{
+  GimpToolInfo *tool_info = GIMP_TOOL_INFO (viewable);
+
+  if (tooltip)
+    *tooltip = g_strdup (tool_info->tooltip);
+
+  return g_strdup (tool_info->label);
+}
+
+static gboolean
+gimp_tool_info_filter_preset (GimpObject *object,
+                              gpointer    user_data)
+{
+  GimpToolPreset *preset    = GIMP_TOOL_PRESET (object);
+  GimpToolInfo   *tool_info = user_data;
+
+  return preset->tool_options->tool_info == tool_info;
+}
+
+GimpToolInfo *
+gimp_tool_info_new (Gimp                *gimp,
+                    GType                tool_type,
+                    GType                tool_options_type,
+                    GimpContextPropMask  context_props,
+                    const gchar         *identifier,
+                    const gchar         *label,
+                    const gchar         *tooltip,
+                    const gchar         *menu_label,
+                    const gchar         *menu_accel,
+                    const gchar         *help_domain,
+                    const gchar         *help_id,
+                    const gchar         *paint_core_name,
+                    const gchar         *icon_name)
+{
+  GimpPaintInfo *paint_info;
+  GimpToolInfo  *tool_info;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+  g_return_val_if_fail (label != NULL, NULL);
+  g_return_val_if_fail (tooltip != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (paint_core_name != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+
+  paint_info = (GimpPaintInfo *)
+    gimp_container_get_child_by_name (gimp->paint_info_list, paint_core_name);
+
+  g_return_val_if_fail (GIMP_IS_PAINT_INFO (paint_info), NULL);
+
+  tool_info = g_object_new (GIMP_TYPE_TOOL_INFO,
+                            "name",      identifier,
+                            "icon-name", icon_name,
+                            NULL);
+
+  tool_info->gimp              = gimp;
+  tool_info->tool_type         = tool_type;
+  tool_info->tool_options_type = tool_options_type;
+  tool_info->context_props     = context_props;
+
+  tool_info->label             = g_strdup (label);
+  tool_info->tooltip           = g_strdup (tooltip);
+
+  tool_info->menu_label        = g_strdup (menu_label);
+  tool_info->menu_accel        = g_strdup (menu_accel);
+
+  tool_info->help_domain       = g_strdup (help_domain);
+  tool_info->help_id           = g_strdup (help_id);
+
+  tool_info->paint_info        = paint_info;
+
+  if (tool_info->tool_options_type == paint_info->paint_options_type)
+    {
+      tool_info->tool_options = g_object_ref (GIMP_TOOL_OPTIONS (paint_info->paint_options));
+    }
+  else
+    {
+      tool_info->tool_options = g_object_new (tool_info->tool_options_type,
+                                              "gimp", gimp,
+                                              "name", identifier,
+                                              NULL);
+    }
+
+  g_object_set (tool_info->tool_options,
+                "tool",      tool_info,
+                "tool-info", tool_info, NULL);
+
+  gimp_tool_options_set_gui_mode (tool_info->tool_options, TRUE);
+
+  if (tool_info->tool_options_type != GIMP_TYPE_TOOL_OPTIONS)
+    {
+      GimpContainer *presets;
+
+      presets = gimp_data_factory_get_container (gimp->tool_preset_factory);
+
+      tool_info->presets =
+        gimp_filtered_container_new (presets,
+                                     gimp_tool_info_filter_preset,
+                                     tool_info);
+    }
+
+  return tool_info;
+}
+
+void
+gimp_tool_info_set_standard (Gimp         *gimp,
+                             GimpToolInfo *tool_info)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (! tool_info || GIMP_IS_TOOL_INFO (tool_info));
+
+  g_set_object (&gimp->standard_tool_info, tool_info);
+}
+
+GimpToolInfo *
+gimp_tool_info_get_standard (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return gimp->standard_tool_info;
+}
+
+gchar *
+gimp_tool_info_get_action_name (GimpToolInfo *tool_info)
+{
+  const gchar *identifier;
+  gchar       *tmp;
+  gchar       *name;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
+
+  identifier = gimp_object_get_name (GIMP_OBJECT (tool_info));
+
+  g_return_val_if_fail (g_str_has_prefix (identifier, "gimp-"), NULL);
+  g_return_val_if_fail (g_str_has_suffix (identifier, "-tool"), NULL);
+
+  tmp = g_strndup (identifier + strlen ("gimp-"),
+                    strlen (identifier) - strlen ("gimp--tool"));
+
+  name = g_strdup_printf ("tools-%s", tmp);
+
+  g_free (tmp);
+
+  return name;
+}
+
+GFile *
+gimp_tool_info_get_options_file (GimpToolInfo *tool_info,
+                                 const gchar  *suffix)
+{
+  gchar *basename;
+  GFile *file;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
+
+  /* also works for a NULL suffix */
+  basename = g_strconcat (gimp_object_get_name (tool_info), suffix, NULL);
+
+  file = gimp_directory_file ("tool-options", basename, NULL);
+  g_free (basename);
+
+  return file;
+}
diff --git a/app/core/gimptoolinfo.h b/app/core/gimptoolinfo.h
new file mode 100644
index 0000000..fc028b7
--- /dev/null
+++ b/app/core/gimptoolinfo.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_INFO_H__
+#define __GIMP_TOOL_INFO_H__
+
+
+#include "gimptoolitem.h"
+
+
+#define GIMP_TYPE_TOOL_INFO            (gimp_tool_info_get_type ())
+#define GIMP_TOOL_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_INFO, GimpToolInfo))
+#define GIMP_TOOL_INFO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_INFO, GimpToolInfoClass))
+#define GIMP_IS_TOOL_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_INFO))
+#define GIMP_IS_TOOL_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_INFO))
+#define GIMP_TOOL_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_INFO, GimpToolInfoClass))
+
+
+typedef struct _GimpToolInfoClass GimpToolInfoClass;
+
+struct _GimpToolInfo
+{
+  GimpToolItem         parent_instance;
+
+  Gimp                *gimp;
+
+  GType                tool_type;
+  GType                tool_options_type;
+  GimpContextPropMask  context_props;
+
+  gchar               *label;
+  gchar               *tooltip;
+
+  gchar               *menu_label;
+  gchar               *menu_accel;
+
+  gchar               *help_domain;
+  gchar               *help_id;
+
+  gboolean             hidden;
+  gboolean             experimental;
+
+  GimpToolOptions     *tool_options;
+  GimpPaintInfo       *paint_info;
+
+  GimpContainer       *presets;
+};
+
+struct _GimpToolInfoClass
+{
+  GimpToolItemClass  parent_class;
+};
+
+
+GType          gimp_tool_info_get_type         (void) G_GNUC_CONST;
+
+GimpToolInfo * gimp_tool_info_new              (Gimp                *gimp,
+                                                GType                tool_type,
+                                                GType                tool_options_type,
+                                                GimpContextPropMask  context_props,
+                                                const gchar         *identifier,
+                                                const gchar         *label,
+                                                const gchar         *tooltip,
+                                                const gchar         *menu_label,
+                                                const gchar         *menu_accel,
+                                                const gchar         *help_domain,
+                                                const gchar         *help_id,
+                                                const gchar         *paint_core_name,
+                                                const gchar         *icon_name);
+
+void           gimp_tool_info_set_standard     (Gimp                *gimp,
+                                                GimpToolInfo        *tool_info);
+GimpToolInfo * gimp_tool_info_get_standard     (Gimp                *gimp);
+
+gchar        * gimp_tool_info_get_action_name (GimpToolInfo         *tool_info);
+
+GFile        * gimp_tool_info_get_options_file (GimpToolInfo        *tool_info,
+                                                const gchar         *suffix);
+
+
+#endif  /*  __GIMP_TOOL_INFO_H__  */
diff --git a/app/core/gimptoolitem.c b/app/core/gimptoolitem.c
new file mode 100644
index 0000000..984597b
--- /dev/null
+++ b/app/core/gimptoolitem.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolitem.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimptoolitem.h"
+
+
+enum
+{
+  VISIBLE_CHANGED,
+  SHOWN_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_VISIBLE,
+  PROP_SHOWN
+};
+
+
+struct _GimpToolItemPrivate
+{
+  gboolean visible;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_tool_item_get_property  (GObject      *object,
+                                            guint         property_id,
+                                            GValue       *value,
+                                            GParamSpec   *pspec);
+static void   gimp_tool_item_set_property  (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolItem, gimp_tool_item, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_tool_item_parent_class
+
+static guint gimp_tool_item_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  private functions  */
+
+static void
+gimp_tool_item_class_init (GimpToolItemClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  gimp_tool_item_signals[VISIBLE_CHANGED] =
+    g_signal_new ("visible-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolItemClass, visible_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_tool_item_signals[SHOWN_CHANGED] =
+    g_signal_new ("shown-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolItemClass, shown_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->get_property = gimp_tool_item_get_property;
+  object_class->set_property = gimp_tool_item_set_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VISIBLE,
+                            "visible", NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, PROP_SHOWN,
+                                   g_param_spec_boolean ("shown", NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_tool_item_init (GimpToolItem *tool_item)
+{
+  tool_item->priv = gimp_tool_item_get_instance_private (tool_item);
+}
+
+static void
+gimp_tool_item_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpToolItem *tool_item = GIMP_TOOL_ITEM (object);
+
+  switch (property_id)
+    {
+    case PROP_VISIBLE:
+      g_value_set_boolean (value, tool_item->priv->visible);
+      break;
+    case PROP_SHOWN:
+      g_value_set_boolean (value, gimp_tool_item_get_shown (tool_item));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_item_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpToolItem *tool_item = GIMP_TOOL_ITEM (object);
+
+  switch (property_id)
+    {
+    case PROP_VISIBLE:
+      gimp_tool_item_set_visible (tool_item, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_tool_item_set_visible (GimpToolItem *tool_item,
+                            gboolean      visible)
+{
+  g_return_if_fail (GIMP_IS_TOOL_ITEM (tool_item));
+
+  if (visible != tool_item->priv->visible)
+    {
+      gboolean old_shown;
+
+      g_object_freeze_notify (G_OBJECT (tool_item));
+
+      old_shown = gimp_tool_item_get_shown (tool_item);
+
+      tool_item->priv->visible = visible;
+
+      g_signal_emit (tool_item, gimp_tool_item_signals[VISIBLE_CHANGED], 0);
+
+      if (gimp_tool_item_get_shown (tool_item) != old_shown)
+        gimp_tool_item_shown_changed (tool_item);
+
+      g_object_notify (G_OBJECT (tool_item), "visible");
+
+      g_object_thaw_notify (G_OBJECT (tool_item));
+    }
+}
+
+gboolean
+gimp_tool_item_get_visible (GimpToolItem *tool_item)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_ITEM (tool_item), FALSE);
+
+  return tool_item->priv->visible;
+}
+
+gboolean
+gimp_tool_item_get_shown (GimpToolItem *tool_item)
+{
+  GimpToolItem *parent;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_ITEM (tool_item), FALSE);
+
+  parent = GIMP_TOOL_ITEM (
+    gimp_viewable_get_parent (GIMP_VIEWABLE (tool_item)));
+
+  return tool_item->priv->visible &&
+         (! parent || gimp_tool_item_get_shown (parent));
+}
+
+
+/*  protected functions  */
+
+void
+gimp_tool_item_shown_changed (GimpToolItem *tool_item)
+{
+  g_signal_emit (tool_item, gimp_tool_item_signals[SHOWN_CHANGED], 0);
+
+  g_object_notify (G_OBJECT (tool_item), "shown");
+}
diff --git a/app/core/gimptoolitem.h b/app/core/gimptoolitem.h
new file mode 100644
index 0000000..3f19f49
--- /dev/null
+++ b/app/core/gimptoolitem.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolitem.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_ITEM_H__
+#define __GIMP_TOOL_ITEM_H__
+
+
+#include "gimpviewable.h"
+
+
+#define GIMP_TYPE_TOOL_ITEM            (gimp_tool_item_get_type ())
+#define GIMP_TOOL_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_ITEM, GimpToolItem))
+#define GIMP_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_ITEM, GimpToolItemClass))
+#define GIMP_IS_TOOL_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_ITEM))
+#define GIMP_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_ITEM))
+#define GIMP_TOOL_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_ITEM, GimpToolItemClass))
+
+
+typedef struct _GimpToolItemPrivate GimpToolItemPrivate;
+typedef struct _GimpToolItemClass   GimpToolItemClass;
+
+struct _GimpToolItem
+{
+  GimpViewable         parent_instance;
+
+  GimpToolItemPrivate *priv;
+};
+
+struct _GimpToolItemClass
+{
+  GimpViewableClass  parent_class;
+
+  /*  signals  */
+  void (* visible_changed) (GimpToolItem *tool_item);
+  void (* shown_changed)   (GimpToolItem *tool_item);
+};
+
+
+GType      gimp_tool_item_get_type      (void) G_GNUC_CONST;
+                                        
+void       gimp_tool_item_set_visible   (GimpToolItem *tool_item,
+                                         gboolean      visible);
+gboolean   gimp_tool_item_get_visible   (GimpToolItem *tool_item);
+                                        
+gboolean   gimp_tool_item_get_shown     (GimpToolItem *tool_item);
+
+
+/*  protected  */
+
+void       gimp_tool_item_shown_changed (GimpToolItem *tool_item);
+
+
+#endif  /*  __GIMP_TOOL_ITEM_H__  */
diff --git a/app/core/gimptooloptions.c b/app/core/gimptooloptions.c
new file mode 100644
index 0000000..8a19d6e
--- /dev/null
+++ b/app/core/gimptooloptions.c
@@ -0,0 +1,378 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimperror.h"
+#include "gimptoolinfo.h"
+#include "gimptooloptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TOOL,
+  PROP_TOOL_INFO
+};
+
+
+static void   gimp_tool_options_config_iface_init (GimpConfigInterface *iface);
+
+static void   gimp_tool_options_dispose           (GObject         *object);
+static void   gimp_tool_options_set_property      (GObject         *object,
+                                                   guint            property_id,
+                                                   const GValue    *value,
+                                                   GParamSpec      *pspec);
+static void   gimp_tool_options_get_property      (GObject         *object,
+                                                   guint            property_id,
+                                                   GValue          *value,
+                                                   GParamSpec      *pspec);
+
+static void   gimp_tool_options_config_reset      (GimpConfig      *config);
+
+static void   gimp_tool_options_tool_notify       (GimpToolOptions *options,
+                                                   GParamSpec      *pspec);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpToolOptions, gimp_tool_options, GIMP_TYPE_CONTEXT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_tool_options_config_iface_init))
+
+#define parent_class gimp_tool_options_parent_class
+
+
+static void
+gimp_tool_options_class_init (GimpToolOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_tool_options_dispose;
+  object_class->set_property = gimp_tool_options_set_property;
+  object_class->get_property = gimp_tool_options_get_property;
+
+  g_object_class_override_property (object_class, PROP_TOOL, "tool");
+
+  g_object_class_install_property (object_class, PROP_TOOL_INFO,
+                                   g_param_spec_object ("tool-info",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TOOL_INFO,
+                                                        GIMP_PARAM_READWRITE));
+
+}
+
+static void
+gimp_tool_options_init (GimpToolOptions *options)
+{
+  options->tool_info = NULL;
+
+  g_signal_connect (options, "notify::tool",
+                    G_CALLBACK (gimp_tool_options_tool_notify),
+                    NULL);
+}
+
+static void
+gimp_tool_options_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->reset = gimp_tool_options_config_reset;
+}
+
+static void
+gimp_tool_options_dispose (GObject *object)
+{
+  GimpToolOptions *options = GIMP_TOOL_OPTIONS (object);
+
+  g_clear_object (&options->tool_info);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+/*  This is such a horrible hack, but necessary because we
+ *  a) load an option's tool-info from disk in many cases
+ *  b) screwed up in the past and saved the wrong tool-info in some cases
+ */
+static GimpToolInfo *
+gimp_tool_options_check_tool_info (GimpToolOptions *options,
+                                   GimpToolInfo    *tool_info,
+                                   gboolean         warn)
+{
+  if (tool_info && G_OBJECT_TYPE (options) == tool_info->tool_options_type)
+    {
+      return tool_info;
+    }
+  else
+    {
+      GList *list;
+
+      for (list = gimp_get_tool_info_iter (GIMP_CONTEXT (options)->gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpToolInfo *new_info = list->data;
+
+          if (G_OBJECT_TYPE (options) == new_info->tool_options_type)
+            {
+              if (warn)
+                g_printerr ("%s: correcting bogus deserialized tool "
+                            "type '%s' with right type '%s'\n",
+                            g_type_name (G_OBJECT_TYPE (options)),
+                            tool_info ? gimp_object_get_name (tool_info) : "NULL",
+                            gimp_object_get_name (new_info));
+
+              return new_info;
+            }
+        }
+
+      g_return_val_if_reached (NULL);
+    }
+}
+
+static void
+gimp_tool_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpToolOptions *options = GIMP_TOOL_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TOOL:
+      {
+        GimpToolInfo *tool_info = g_value_get_object (value);
+        GimpToolInfo *context_tool;
+
+        context_tool = gimp_context_get_tool (GIMP_CONTEXT (options));
+
+        g_return_if_fail (context_tool == NULL ||
+                          context_tool == tool_info);
+
+        tool_info = gimp_tool_options_check_tool_info (options, tool_info, TRUE);
+
+        if (! context_tool)
+          gimp_context_set_tool (GIMP_CONTEXT (options), tool_info);
+      }
+      break;
+
+    case PROP_TOOL_INFO:
+      {
+        GimpToolInfo *tool_info = g_value_get_object (value);
+
+        g_return_if_fail (options->tool_info == NULL ||
+                          options->tool_info == tool_info);
+
+        tool_info = gimp_tool_options_check_tool_info (options, tool_info, TRUE);
+
+        if (! options->tool_info)
+          {
+            options->tool_info = g_object_ref (tool_info);
+
+            gimp_context_set_serialize_properties (GIMP_CONTEXT (options),
+                                                   tool_info->context_props);
+          }
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpToolOptions *options = GIMP_TOOL_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TOOL:
+      g_value_set_object (value, gimp_context_get_tool (GIMP_CONTEXT (options)));
+      break;
+
+    case PROP_TOOL_INFO:
+      g_value_set_object (value, options->tool_info);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_options_config_reset (GimpConfig *config)
+{
+  gchar *name = g_strdup (gimp_object_get_name (config));
+
+  gimp_config_reset_properties (G_OBJECT (config));
+
+  gimp_object_take_name (GIMP_OBJECT (config), name);
+}
+
+static void
+gimp_tool_options_tool_notify (GimpToolOptions *options,
+                               GParamSpec      *pspec)
+{
+  GimpToolInfo *tool_info = gimp_context_get_tool (GIMP_CONTEXT (options));
+  GimpToolInfo *new_info;
+
+  new_info = gimp_tool_options_check_tool_info (options, tool_info, FALSE);
+
+  if (tool_info && new_info != tool_info)
+    g_warning ("%s: 'tool' property on %s was set to bogus value "
+               "'%s', it MUST be '%s'.",
+               G_STRFUNC,
+               g_type_name (G_OBJECT_TYPE (options)),
+               gimp_object_get_name (tool_info),
+               gimp_object_get_name (new_info));
+}
+
+
+/*  public functions  */
+
+void
+gimp_tool_options_set_gui_mode (GimpToolOptions *tool_options,
+                                gboolean         gui_mode)
+{
+  g_return_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options));
+
+  tool_options->gui_mode = gui_mode ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_options_get_gui_mode (GimpToolOptions *tool_options)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options), FALSE);
+
+  return tool_options->gui_mode;
+}
+
+gboolean
+gimp_tool_options_serialize (GimpToolOptions  *tool_options,
+                             GError          **error)
+{
+  GFile    *file;
+  gchar    *header;
+  gchar    *footer;
+  gboolean  retval;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file = gimp_tool_info_get_options_file (tool_options->tool_info, NULL);
+
+  if (tool_options->tool_info->gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  header = g_strdup_printf ("GIMP %s options",
+                            gimp_object_get_name (tool_options->tool_info));
+  footer = g_strdup_printf ("end of %s options",
+                            gimp_object_get_name (tool_options->tool_info));
+
+  retval = gimp_config_serialize_to_gfile (GIMP_CONFIG (tool_options),
+                                           file,
+                                           header, footer,
+                                           NULL,
+                                           error);
+
+  g_free (header);
+  g_free (footer);
+
+  g_object_unref (file);
+
+  return retval;
+}
+
+gboolean
+gimp_tool_options_deserialize (GimpToolOptions  *tool_options,
+                               GError          **error)
+{
+  GFile    *file;
+  gboolean  retval;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file = gimp_tool_info_get_options_file (tool_options->tool_info, NULL);
+
+  if (tool_options->tool_info->gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  retval = gimp_config_deserialize_gfile (GIMP_CONFIG (tool_options),
+                                          file,
+                                          NULL,
+                                          error);
+
+  g_object_unref (file);
+
+  return retval;
+}
+
+gboolean
+gimp_tool_options_delete (GimpToolOptions  *tool_options,
+                          GError          **error)
+{
+  GFile    *file;
+  GError   *my_error = NULL;
+  gboolean  success  = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file = gimp_tool_info_get_options_file (tool_options->tool_info, NULL);
+
+  if (tool_options->tool_info->gimp->be_verbose)
+    g_print ("Deleting '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! g_file_delete (file, NULL, &my_error) &&
+      my_error->code != G_IO_ERROR_NOT_FOUND)
+    {
+      success = FALSE;
+
+      g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                   _("Deleting \"%s\" failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+    }
+
+  g_clear_error (&my_error);
+  g_object_unref (file);
+
+  return success;
+}
+
+void
+gimp_tool_options_create_folder (void)
+{
+  GFile *file = gimp_directory_file ("tool-options", NULL);
+
+  g_file_make_directory (file, NULL, NULL);
+  g_object_unref (file);
+}
diff --git a/app/core/gimptooloptions.h b/app/core/gimptooloptions.h
new file mode 100644
index 0000000..f59aa52
--- /dev/null
+++ b/app/core/gimptooloptions.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_OPTIONS_H__
+#define __GIMP_TOOL_OPTIONS_H__
+
+
+#include "gimpcontext.h"
+
+
+#define GIMP_TYPE_TOOL_OPTIONS            (gimp_tool_options_get_type ())
+#define GIMP_TOOL_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_OPTIONS, GimpToolOptions))
+#define GIMP_TOOL_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_OPTIONS, GimpToolOptionsClass))
+#define GIMP_IS_TOOL_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_OPTIONS))
+#define GIMP_IS_TOOL_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_OPTIONS))
+#define GIMP_TOOL_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_OPTIONS, GimpToolOptionsClass))
+
+
+typedef struct _GimpToolOptionsClass GimpToolOptionsClass;
+
+struct _GimpToolOptions
+{
+  GimpContext   parent_instance;
+
+  GimpToolInfo *tool_info;
+
+  /*  if TRUE this instance is the main tool options object used for
+   *  the GUI, this is not exactly clean, but there are some things
+   *  (like linking brush properties to the active brush, or properly
+   *  maintaining global brush, pattern etc.) that can only be done
+   *  right in the object, and not by signal connections from the GUI,
+   *  or upon switching tools, all of which was much more horrible.
+   */
+  gboolean      gui_mode;
+};
+
+struct _GimpToolOptionsClass
+{
+  GimpContextClass parent_class;
+};
+
+
+GType      gimp_tool_options_get_type      (void) G_GNUC_CONST;
+
+void       gimp_tool_options_set_gui_mode  (GimpToolOptions   *tool_options,
+                                            gboolean           gui_mode);
+gboolean   gimp_tool_options_get_gui_mode  (GimpToolOptions   *tool_options);
+
+gboolean   gimp_tool_options_serialize     (GimpToolOptions   *tool_options,
+                                            GError           **error);
+gboolean   gimp_tool_options_deserialize   (GimpToolOptions   *tool_options,
+                                            GError           **error);
+
+gboolean   gimp_tool_options_delete        (GimpToolOptions   *tool_options,
+                                            GError           **error);
+void       gimp_tool_options_create_folder (void);
+
+
+#endif  /*  __GIMP_TOOL_OPTIONS_H__  */
diff --git a/app/core/gimptoolpreset-load.c b/app/core/gimptoolpreset-load.c
new file mode 100644
index 0000000..386ac09
--- /dev/null
+++ b/app/core/gimptoolpreset-load.c
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpcontext.h"
+#include "gimptoolpreset.h"
+#include "gimptoolpreset-load.h"
+
+#include "gimp-intl.h"
+
+
+GList *
+gimp_tool_preset_load (GimpContext   *context,
+                       GFile         *file,
+                       GInputStream  *input,
+                       GError       **error)
+{
+  GimpToolPreset *tool_preset;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  tool_preset = g_object_new (GIMP_TYPE_TOOL_PRESET,
+                              "gimp", context->gimp,
+                              NULL);
+
+  if (gimp_config_deserialize_stream (GIMP_CONFIG (tool_preset),
+                                      input,
+                                      NULL, error))
+    {
+      if (GIMP_IS_CONTEXT (tool_preset->tool_options))
+        {
+          return g_list_prepend (NULL, tool_preset);
+        }
+      else
+        {
+          g_set_error_literal (error,
+                               GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+                               _("Tool preset file is corrupt."));
+        }
+    }
+
+  g_object_unref (tool_preset);
+
+  return NULL;
+}
diff --git a/app/core/gimptoolpreset-load.h b/app/core/gimptoolpreset-load.h
new file mode 100644
index 0000000..9a016df
--- /dev/null
+++ b/app/core/gimptoolpreset-load.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PRESET_LOAD_H__
+#define __GIMP_TOOL_PRESET_LOAD_H__
+
+
+#define GIMP_TOOL_PRESET_FILE_EXTENSION ".gtp"
+
+
+GList * gimp_tool_preset_load (GimpContext   *context,
+                               GFile         *file,
+                               GInputStream  *input,
+                               GError       **error);
+
+
+#endif /* __GIMP_TOOL_PRESET_LOAD_H__ */
diff --git a/app/core/gimptoolpreset-save.c b/app/core/gimptoolpreset-save.c
new file mode 100644
index 0000000..0afd024
--- /dev/null
+++ b/app/core/gimptoolpreset-save.c
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimptoolpreset.h"
+#include "gimptoolpreset-save.h"
+
+
+gboolean
+gimp_tool_preset_save (GimpData       *data,
+                       GOutputStream  *output,
+                       GError        **error)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_PRESET (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return gimp_config_serialize_to_stream (GIMP_CONFIG (data),
+                                          output,
+                                          "GIMP tool preset file",
+                                          "end of GIMP tool preset file",
+                                          NULL, error);
+}
diff --git a/app/core/gimptoolpreset-save.h b/app/core/gimptoolpreset-save.h
new file mode 100644
index 0000000..d78ef64
--- /dev/null
+++ b/app/core/gimptoolpreset-save.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PRESET_SAVE_H__
+#define __GIMP_TOOL_PRESET_SAVE_H__
+
+
+/*  don't call this function directly, use gimp_data_save() instead  */
+gboolean   gimp_tool_preset_save (GimpData       *data,
+                                  GOutputStream  *output,
+                                  GError        **error);
+
+
+#endif /* __GIMP_TOOL_PRESET_SAVE_H__ */
diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c
new file mode 100644
index 0000000..6ab2eb7
--- /dev/null
+++ b/app/core/gimptoolpreset.c
@@ -0,0 +1,705 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimptoolinfo.h"
+#include "gimptooloptions.h"
+#include "gimptoolpreset.h"
+#include "gimptoolpreset-load.h"
+#include "gimptoolpreset-save.h"
+
+#include "gimp-intl.h"
+
+
+/*  The defaults are "everything except color", which is problematic
+ *  with gradients, which is why we special case the gradient tool in
+ *  gimp_tool_preset_set_options().
+ */
+#define DEFAULT_USE_FG_BG              FALSE
+#define DEFAULT_USE_OPACITY_PAINT_MODE TRUE
+#define DEFAULT_USE_BRUSH              TRUE
+#define DEFAULT_USE_DYNAMICS           TRUE
+#define DEFAULT_USE_MYBRUSH            TRUE
+#define DEFAULT_USE_GRADIENT           FALSE
+#define DEFAULT_USE_PATTERN            TRUE
+#define DEFAULT_USE_PALETTE            FALSE
+#define DEFAULT_USE_FONT               TRUE
+
+enum
+{
+  PROP_0,
+  PROP_NAME,
+  PROP_GIMP,
+  PROP_TOOL_OPTIONS,
+  PROP_USE_FG_BG,
+  PROP_USE_OPACITY_PAINT_MODE,
+  PROP_USE_BRUSH,
+  PROP_USE_DYNAMICS,
+  PROP_USE_MYBRUSH,
+  PROP_USE_GRADIENT,
+  PROP_USE_PATTERN,
+  PROP_USE_PALETTE,
+  PROP_USE_FONT
+};
+
+
+static void          gimp_tool_preset_config_iface_init    (GimpConfigInterface *iface);
+
+static void          gimp_tool_preset_constructed          (GObject          *object);
+static void          gimp_tool_preset_finalize             (GObject          *object);
+static void          gimp_tool_preset_set_property         (GObject          *object,
+                                                            guint             property_id,
+                                                            const GValue     *value,
+                                                            GParamSpec       *pspec);
+static void          gimp_tool_preset_get_property         (GObject          *object,
+                                                            guint             property_id,
+                                                            GValue           *value,
+                                                            GParamSpec       *pspec);
+static void
+             gimp_tool_preset_dispatch_properties_changed  (GObject          *object,
+                                                            guint             n_pspecs,
+                                                            GParamSpec      **pspecs);
+
+static const gchar * gimp_tool_preset_get_extension        (GimpData         *data);
+
+static gboolean      gimp_tool_preset_deserialize_property (GimpConfig       *config,
+                                                            guint             property_id,
+                                                            GValue           *value,
+                                                            GParamSpec       *pspec,
+                                                            GScanner         *scanner,
+                                                            GTokenType       *expected);
+
+static void          gimp_tool_preset_set_options          (GimpToolPreset   *preset,
+                                                            GimpToolOptions  *options);
+static void          gimp_tool_preset_options_notify       (GObject          *tool_options,
+                                                            const GParamSpec *pspec,
+                                                            GimpToolPreset   *preset);
+static void     gimp_tool_preset_options_prop_name_changed (GimpContext         *tool_options,
+                                                            GimpContextPropType  prop,
+                                                            GimpToolPreset      *preset);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpToolPreset, gimp_tool_preset, GIMP_TYPE_DATA,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_tool_preset_config_iface_init))
+
+#define parent_class gimp_tool_preset_parent_class
+
+
+static void
+gimp_tool_preset_class_init (GimpToolPresetClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpDataClass *data_class   = GIMP_DATA_CLASS (klass);
+
+  object_class->constructed                 = gimp_tool_preset_constructed;
+  object_class->finalize                    = gimp_tool_preset_finalize;
+  object_class->set_property                = gimp_tool_preset_set_property;
+  object_class->get_property                = gimp_tool_preset_get_property;
+  object_class->dispatch_properties_changed = gimp_tool_preset_dispatch_properties_changed;
+
+  data_class->save                          = gimp_tool_preset_save;
+  data_class->get_extension                 = gimp_tool_preset_get_extension;
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_NAME,
+                           "name",
+                           NULL, NULL,
+                           "Unnamed",
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_TOOL_OPTIONS,
+                           "tool-options",
+                           NULL, NULL,
+                           GIMP_TYPE_TOOL_OPTIONS,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_FG_BG,
+                            "use-fg-bg",
+                            _("Apply stored FG/BG"),
+                            NULL,
+                            DEFAULT_USE_FG_BG,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_OPACITY_PAINT_MODE,
+                            "use-opacity-paint-mode",
+                            _("Apply stored opacity/paint mode"),
+                            NULL,
+                            DEFAULT_USE_OPACITY_PAINT_MODE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_BRUSH,
+                            "use-brush",
+                            _("Apply stored brush"),
+                            NULL,
+                            DEFAULT_USE_BRUSH,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_DYNAMICS,
+                            "use-dynamics",
+                            _("Apply stored dynamics"),
+                            NULL,
+                            DEFAULT_USE_DYNAMICS,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_MYBRUSH,
+                            "use-mypaint-brush",
+                            _("Apply stored MyPaint brush"),
+                            NULL,
+                            DEFAULT_USE_MYBRUSH,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_PATTERN,
+                            "use-pattern",
+                            _("Apply stored pattern"),
+                            NULL,
+                            DEFAULT_USE_PATTERN,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_PALETTE,
+                            "use-palette",
+                            _("Apply stored palette"),
+                            NULL,
+                            DEFAULT_USE_PALETTE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_GRADIENT,
+                            "use-gradient",
+                            _("Apply stored gradient"),
+                            NULL,
+                            DEFAULT_USE_GRADIENT,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_FONT,
+                            "use-font",
+                            _("Apply stored font"),
+                            NULL,
+                            DEFAULT_USE_FONT,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_tool_preset_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->deserialize_property = gimp_tool_preset_deserialize_property;
+}
+
+static void
+gimp_tool_preset_init (GimpToolPreset *tool_preset)
+{
+}
+
+static void
+gimp_tool_preset_constructed (GObject *object)
+{
+  GimpToolPreset *preset = GIMP_TOOL_PRESET (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_return_if_fail (GIMP_IS_GIMP (preset->gimp));
+}
+
+static void
+gimp_tool_preset_finalize (GObject *object)
+{
+  GimpToolPreset *tool_preset = GIMP_TOOL_PRESET (object);
+
+  gimp_tool_preset_set_options (tool_preset, NULL);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_preset_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpToolPreset *tool_preset = GIMP_TOOL_PRESET (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      gimp_object_set_name (GIMP_OBJECT (tool_preset),
+                            g_value_get_string (value));
+      break;
+
+    case PROP_GIMP:
+      tool_preset->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    case PROP_TOOL_OPTIONS:
+      gimp_tool_preset_set_options (tool_preset,
+                                    GIMP_TOOL_OPTIONS (g_value_get_object (value)));
+      break;
+
+    case PROP_USE_FG_BG:
+      tool_preset->use_fg_bg = g_value_get_boolean (value);
+      break;
+    case PROP_USE_OPACITY_PAINT_MODE:
+      tool_preset->use_opacity_paint_mode = g_value_get_boolean (value);
+      break;
+    case PROP_USE_BRUSH:
+      tool_preset->use_brush = g_value_get_boolean (value);
+      break;
+    case PROP_USE_DYNAMICS:
+      tool_preset->use_dynamics = g_value_get_boolean (value);
+      break;
+    case PROP_USE_MYBRUSH:
+      tool_preset->use_mybrush = g_value_get_boolean (value);
+      break;
+    case PROP_USE_PATTERN:
+      tool_preset->use_pattern = g_value_get_boolean (value);
+      break;
+    case PROP_USE_PALETTE:
+      tool_preset->use_palette = g_value_get_boolean (value);
+      break;
+    case PROP_USE_GRADIENT:
+      tool_preset->use_gradient = g_value_get_boolean (value);
+      break;
+    case PROP_USE_FONT:
+      tool_preset->use_font = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_preset_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpToolPreset *tool_preset = GIMP_TOOL_PRESET (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      g_value_set_string (value, gimp_object_get_name (tool_preset));
+      break;
+
+    case PROP_GIMP:
+      g_value_set_object (value, tool_preset->gimp);
+      break;
+
+    case PROP_TOOL_OPTIONS:
+      g_value_set_object (value, tool_preset->tool_options);
+      break;
+
+    case PROP_USE_FG_BG:
+      g_value_set_boolean (value, tool_preset->use_fg_bg);
+      break;
+    case PROP_USE_OPACITY_PAINT_MODE:
+      g_value_set_boolean (value, tool_preset->use_opacity_paint_mode);
+      break;
+    case PROP_USE_BRUSH:
+      g_value_set_boolean (value, tool_preset->use_brush);
+      break;
+    case PROP_USE_MYBRUSH:
+      g_value_set_boolean (value, tool_preset->use_mybrush);
+      break;
+    case PROP_USE_DYNAMICS:
+      g_value_set_boolean (value, tool_preset->use_dynamics);
+      break;
+    case PROP_USE_PATTERN:
+      g_value_set_boolean (value, tool_preset->use_pattern);
+      break;
+    case PROP_USE_PALETTE:
+      g_value_set_boolean (value, tool_preset->use_palette);
+      break;
+    case PROP_USE_GRADIENT:
+      g_value_set_boolean (value, tool_preset->use_gradient);
+      break;
+    case PROP_USE_FONT:
+      g_value_set_boolean (value, tool_preset->use_font);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_preset_dispatch_properties_changed (GObject     *object,
+                                              guint        n_pspecs,
+                                              GParamSpec **pspecs)
+{
+  gint i;
+
+  G_OBJECT_CLASS (parent_class)->dispatch_properties_changed (object,
+                                                              n_pspecs, pspecs);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      if (pspecs[i]->flags & GIMP_CONFIG_PARAM_SERIALIZE)
+        {
+          gimp_data_dirty (GIMP_DATA (object));
+          break;
+        }
+    }
+}
+
+static const gchar *
+gimp_tool_preset_get_extension (GimpData *data)
+{
+  return GIMP_TOOL_PRESET_FILE_EXTENSION;
+}
+
+static gboolean
+gimp_tool_preset_deserialize_property (GimpConfig *config,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec,
+                                       GScanner   *scanner,
+                                       GTokenType *expected)
+{
+  GimpToolPreset *tool_preset = GIMP_TOOL_PRESET (config);
+
+  switch (property_id)
+    {
+    case PROP_TOOL_OPTIONS:
+      {
+        GObject             *options;
+        gchar               *type_name;
+        GType                type;
+        GimpContextPropMask  serialize_props;
+
+        if (! gimp_scanner_parse_string (scanner, &type_name))
+          {
+            *expected = G_TOKEN_STRING;
+            break;
+          }
+
+        if (! (type_name && *type_name))
+          {
+            g_scanner_error (scanner, "GimpToolOptions type name is empty");
+            *expected = G_TOKEN_NONE;
+            g_free (type_name);
+            break;
+          }
+
+        if (! strcmp (type_name, "GimpTransformOptions"))
+          {
+            g_printerr ("Correcting tool options type GimpTransformOptions "
+                        "to GimpTransformGridOptions\n");
+            g_free (type_name);
+            type_name = g_strdup ("GimpTransformGridOptions");
+          }
+
+        type = g_type_from_name (type_name);
+
+        if (! type)
+          {
+            g_scanner_error (scanner,
+                             "unable to determine type of '%s'",
+                             type_name);
+            *expected = G_TOKEN_NONE;
+            g_free (type_name);
+            break;
+          }
+
+        if (! g_type_is_a (type, GIMP_TYPE_TOOL_OPTIONS))
+          {
+            g_scanner_error (scanner,
+                             "'%s' is not a subclass of GimpToolOptions",
+                             type_name);
+            *expected = G_TOKEN_NONE;
+            g_free (type_name);
+            break;
+          }
+
+        g_free (type_name);
+
+        options = g_object_new (type,
+                                "gimp", tool_preset->gimp,
+                                NULL);
+
+        /*  Initialize all GimpContext object properties that can be
+         *  used by presets with some non-NULL object, so loading a
+         *  broken preset won't leave us with NULL objects that have
+         *  bad effects. See bug #742159.
+         */
+        gimp_context_copy_properties (gimp_get_user_context (tool_preset->gimp),
+                                      GIMP_CONTEXT (options),
+                                      GIMP_CONTEXT_PROP_MASK_BRUSH    |
+                                      GIMP_CONTEXT_PROP_MASK_DYNAMICS |
+                                      GIMP_CONTEXT_PROP_MASK_MYBRUSH  |
+                                      GIMP_CONTEXT_PROP_MASK_PATTERN  |
+                                      GIMP_CONTEXT_PROP_MASK_GRADIENT |
+                                      GIMP_CONTEXT_PROP_MASK_PALETTE  |
+                                      GIMP_CONTEXT_PROP_MASK_FONT);
+
+        if (! GIMP_CONFIG_GET_INTERFACE (options)->deserialize (GIMP_CONFIG (options),
+                                                                scanner, 1,
+                                                                NULL))
+          {
+            *expected = G_TOKEN_NONE;
+            g_object_unref (options);
+            break;
+          }
+
+        /* we need both tool and tool-info on the options */
+        if (gimp_context_get_tool (GIMP_CONTEXT (options)))
+          {
+            g_object_set (options,
+                          "tool-info",
+                          gimp_context_get_tool (GIMP_CONTEXT (options)),
+                          NULL);
+          }
+        else if (GIMP_TOOL_OPTIONS (options)->tool_info)
+          {
+            g_object_set (options,
+                          "tool", GIMP_TOOL_OPTIONS (options)->tool_info,
+                          NULL);
+          }
+        else
+          {
+            /* if we have none, the options set_property() logic will
+             * replace the NULL with its best guess
+             */
+            g_object_set (options,
+                          "tool",      NULL,
+                          "tool-info", NULL,
+                          NULL);
+          }
+
+        serialize_props =
+          gimp_context_get_serialize_properties (GIMP_CONTEXT (options));
+
+        gimp_context_set_serialize_properties (GIMP_CONTEXT (options),
+                                               serialize_props |
+                                               GIMP_CONTEXT_PROP_MASK_TOOL);
+
+        g_value_take_object (value, options);
+      }
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_tool_preset_set_options (GimpToolPreset  *preset,
+                              GimpToolOptions *options)
+{
+  if (preset->tool_options)
+    {
+      g_signal_handlers_disconnect_by_func (preset->tool_options,
+                                            gimp_tool_preset_options_notify,
+                                            preset);
+
+      g_signal_handlers_disconnect_by_func (preset->tool_options,
+                                            gimp_tool_preset_options_prop_name_changed,
+                                            preset);
+
+      g_clear_object (&preset->tool_options);
+    }
+
+  if (options)
+    {
+      GimpContextPropMask serialize_props;
+
+      preset->tool_options =
+        GIMP_TOOL_OPTIONS (gimp_config_duplicate (GIMP_CONFIG (options)));
+
+      serialize_props =
+        gimp_context_get_serialize_properties (GIMP_CONTEXT (preset->tool_options));
+
+      gimp_context_set_serialize_properties (GIMP_CONTEXT (preset->tool_options),
+                                             serialize_props |
+                                             GIMP_CONTEXT_PROP_MASK_TOOL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_FOREGROUND) &&
+          ! (serialize_props & GIMP_CONTEXT_PROP_MASK_BACKGROUND))
+        g_object_set (preset, "use-fg-bg", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_OPACITY) &&
+          ! (serialize_props & GIMP_CONTEXT_PROP_MASK_PAINT_MODE))
+        g_object_set (preset, "use-opacity-paint-mode", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_BRUSH))
+        g_object_set (preset, "use-brush", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS))
+        g_object_set (preset, "use-dynamics", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_MYBRUSH))
+        g_object_set (preset, "use-mypaint-brush", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_GRADIENT))
+        g_object_set (preset, "use-gradient", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_PATTERN))
+        g_object_set (preset, "use-pattern", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_PALETTE))
+        g_object_set (preset, "use-palette", FALSE, NULL);
+
+      if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_FONT))
+        g_object_set (preset, "use-font", FALSE, NULL);
+
+      /*  see comment above the DEFAULT defines at the top of the file  */
+      if (! g_strcmp0 ("gimp-gradient-tool",
+                       gimp_object_get_name (preset->tool_options->tool_info)))
+        g_object_set (preset, "use-gradient", TRUE, NULL);
+
+      g_signal_connect (preset->tool_options, "notify",
+                        G_CALLBACK (gimp_tool_preset_options_notify),
+                        preset);
+
+      g_signal_connect (preset->tool_options, "prop-name-changed",
+                        G_CALLBACK (gimp_tool_preset_options_prop_name_changed),
+                        preset);
+    }
+
+  g_object_notify (G_OBJECT (preset), "tool-options");
+}
+
+static void
+gimp_tool_preset_options_notify (GObject          *tool_options,
+                                 const GParamSpec *pspec,
+                                 GimpToolPreset   *preset)
+{
+  if (pspec->owner_type == GIMP_TYPE_CONTEXT)
+    {
+      GimpContextPropMask serialize_props;
+
+      serialize_props =
+        gimp_context_get_serialize_properties (GIMP_CONTEXT (tool_options));
+
+      if ((1 << pspec->param_id) & serialize_props)
+        {
+          g_object_notify (G_OBJECT (preset), "tool-options");
+        }
+    }
+  else if (pspec->flags & GIMP_CONFIG_PARAM_SERIALIZE)
+    {
+      g_object_notify (G_OBJECT (preset), "tool-options");
+    }
+}
+
+static void
+gimp_tool_preset_options_prop_name_changed (GimpContext         *tool_options,
+                                            GimpContextPropType  prop,
+                                            GimpToolPreset      *preset)
+{
+  GimpContextPropMask serialize_props;
+
+  serialize_props =
+    gimp_context_get_serialize_properties (GIMP_CONTEXT (preset->tool_options));
+
+  if ((1 << prop) & serialize_props)
+    {
+      g_object_notify (G_OBJECT (preset), "tool-options");
+    }
+}
+
+
+/*  public functions  */
+
+GimpData *
+gimp_tool_preset_new (GimpContext *context,
+                      const gchar *unused)
+{
+  GimpToolInfo *tool_info;
+  const gchar  *icon_name;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  tool_info = gimp_context_get_tool (context);
+
+  g_return_val_if_fail (tool_info != NULL, NULL);
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+
+  return g_object_new (GIMP_TYPE_TOOL_PRESET,
+                       "name",         tool_info->label,
+                       "icon-name",    icon_name,
+                       "gimp",         context->gimp,
+                       "tool-options", tool_info->tool_options,
+                       NULL);
+}
+
+GimpContextPropMask
+gimp_tool_preset_get_prop_mask (GimpToolPreset *preset)
+{
+  GimpContextPropMask serialize_props;
+  GimpContextPropMask use_props = 0;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_PRESET (preset), 0);
+
+  serialize_props =
+    gimp_context_get_serialize_properties (GIMP_CONTEXT (preset->tool_options));
+
+  if (preset->use_fg_bg)
+    {
+      use_props |= (GIMP_CONTEXT_PROP_MASK_FOREGROUND & serialize_props);
+      use_props |= (GIMP_CONTEXT_PROP_MASK_BACKGROUND & serialize_props);
+    }
+
+  if (preset->use_opacity_paint_mode)
+    {
+      use_props |= (GIMP_CONTEXT_PROP_MASK_OPACITY    & serialize_props);
+      use_props |= (GIMP_CONTEXT_PROP_MASK_PAINT_MODE & serialize_props);
+    }
+
+  if (preset->use_brush)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_BRUSH & serialize_props);
+
+  if (preset->use_dynamics)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_DYNAMICS & serialize_props);
+
+  if (preset->use_mybrush)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_MYBRUSH & serialize_props);
+
+  if (preset->use_pattern)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_PATTERN & serialize_props);
+
+  if (preset->use_palette)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_PALETTE & serialize_props);
+
+  if (preset->use_gradient)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_GRADIENT & serialize_props);
+
+  if (preset->use_font)
+    use_props |= (GIMP_CONTEXT_PROP_MASK_FONT & serialize_props);
+
+  return use_props;
+}
diff --git a/app/core/gimptoolpreset.h b/app/core/gimptoolpreset.h
new file mode 100644
index 0000000..bf2cceb
--- /dev/null
+++ b/app/core/gimptoolpreset.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PRESET_H__
+#define __GIMP_TOOL_PRESET_H__
+
+
+#include "gimpdata.h"
+
+
+#define GIMP_TYPE_TOOL_PRESET            (gimp_tool_preset_get_type ())
+#define GIMP_TOOL_PRESET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_PRESET, GimpToolPreset))
+#define GIMP_TOOL_PRESET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_PRESET, GimpToolPresetClass))
+#define GIMP_IS_TOOL_PRESET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_PRESET))
+#define GIMP_IS_TOOL_PRESET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_PRESET))
+#define GIMP_TOOL_PRESET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_PRESET, GimpToolPresetClass))
+
+
+typedef struct _GimpToolPresetClass GimpToolPresetClass;
+
+struct _GimpToolPreset
+{
+  GimpData         parent_instance;
+
+  Gimp            *gimp;
+  GimpToolOptions *tool_options;
+
+  gboolean         use_fg_bg;
+  gboolean         use_opacity_paint_mode;
+  gboolean         use_brush;
+  gboolean         use_dynamics;
+  gboolean         use_mybrush;
+  gboolean         use_gradient;
+  gboolean         use_pattern;
+  gboolean         use_palette;
+  gboolean         use_font;
+};
+
+struct _GimpToolPresetClass
+{
+  GimpDataClass  parent_class;
+};
+
+
+GType                 gimp_tool_preset_get_type      (void) G_GNUC_CONST;
+
+GimpData            * gimp_tool_preset_new           (GimpContext    *context,
+                                                      const gchar    *unused);
+
+GimpContextPropMask   gimp_tool_preset_get_prop_mask (GimpToolPreset *preset);
+
+
+#endif  /*  __GIMP_TOOL_PRESET_H__  */
diff --git a/app/core/gimptreehandler.c b/app/core/gimptreehandler.c
new file mode 100644
index 0000000..b26768e
--- /dev/null
+++ b/app/core/gimptreehandler.c
@@ -0,0 +1,238 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTreeHandler
+ * Copyright (C) 2009  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpcontainer.h"
+#include "gimptreehandler.h"
+#include "gimpviewable.h"
+
+
+static void   gimp_tree_handler_dispose          (GObject         *object);
+
+static void   gimp_tree_handler_freeze           (GimpTreeHandler *handler,
+                                                  GimpContainer   *container);
+static void   gimp_tree_handler_thaw             (GimpTreeHandler *handler,
+                                                  GimpContainer   *container);
+
+static void   gimp_tree_handler_add_container    (GimpTreeHandler *handler,
+                                                  GimpContainer   *container);
+static void   gimp_tree_handler_add_foreach      (GimpViewable    *viewable,
+                                                  GimpTreeHandler *handler);
+static void   gimp_tree_handler_add              (GimpTreeHandler *handler,
+                                                  GimpViewable    *viewable,
+                                                  GimpContainer   *container);
+
+static void   gimp_tree_handler_remove_container (GimpTreeHandler *handler,
+                                                  GimpContainer   *container);
+static void   gimp_tree_handler_remove_foreach   (GimpViewable    *viewable,
+                                                  GimpTreeHandler *handler);
+static void   gimp_tree_handler_remove           (GimpTreeHandler *handler,
+                                                  GimpViewable    *viewable,
+                                                  GimpContainer   *container);
+
+
+G_DEFINE_TYPE (GimpTreeHandler, gimp_tree_handler, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_tree_handler_parent_class
+
+
+static void
+gimp_tree_handler_class_init (GimpTreeHandlerClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_tree_handler_dispose;
+}
+
+static void
+gimp_tree_handler_init (GimpTreeHandler *handler)
+{
+}
+
+static void
+gimp_tree_handler_dispose (GObject *object)
+{
+  GimpTreeHandler *handler = GIMP_TREE_HANDLER (object);
+
+  if (handler->container)
+    {
+      g_signal_handlers_disconnect_by_func (handler->container,
+                                            gimp_tree_handler_freeze,
+                                            handler);
+      g_signal_handlers_disconnect_by_func (handler->container,
+                                            gimp_tree_handler_thaw,
+                                            handler);
+
+      if (! gimp_container_frozen (handler->container))
+        gimp_tree_handler_remove_container (handler, handler->container);
+
+      g_clear_object (&handler->container);
+      g_clear_pointer (&handler->signal_name, g_free);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+
+/*  public functions  */
+
+GimpTreeHandler *
+gimp_tree_handler_connect (GimpContainer *container,
+                           const gchar   *signal_name,
+                           GCallback      callback,
+                           gpointer       user_data)
+{
+  GimpTreeHandler *handler;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (signal_name != NULL, NULL);
+
+  handler = g_object_new (GIMP_TYPE_TREE_HANDLER, NULL);
+
+  handler->container   = g_object_ref (container);
+  handler->signal_name = g_strdup (signal_name);
+  handler->callback    = callback;
+  handler->user_data   = user_data;
+
+  if (! gimp_container_frozen (container))
+    gimp_tree_handler_add_container (handler, container);
+
+  g_signal_connect_object (container, "freeze",
+                           G_CALLBACK (gimp_tree_handler_freeze),
+                           handler,
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (container, "thaw",
+                           G_CALLBACK (gimp_tree_handler_thaw),
+                           handler,
+                           G_CONNECT_SWAPPED);
+
+  return handler;
+}
+
+void
+gimp_tree_handler_disconnect (GimpTreeHandler *handler)
+{
+  g_return_if_fail (GIMP_IS_TREE_HANDLER (handler));
+
+  g_object_run_dispose (G_OBJECT (handler));
+  g_object_unref (handler);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tree_handler_freeze (GimpTreeHandler *handler,
+                          GimpContainer   *container)
+{
+  gimp_tree_handler_remove_container (handler, container);
+}
+
+static void
+gimp_tree_handler_thaw (GimpTreeHandler *handler,
+                        GimpContainer   *container)
+{
+  gimp_tree_handler_add_container (handler, container);
+}
+
+static void
+gimp_tree_handler_add_container (GimpTreeHandler *handler,
+                                 GimpContainer   *container)
+{
+  gimp_container_foreach (container,
+                          (GFunc) gimp_tree_handler_add_foreach,
+                          handler);
+
+  g_signal_connect_object (container, "add",
+                           G_CALLBACK (gimp_tree_handler_add),
+                           handler,
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_tree_handler_remove),
+                           handler,
+                           G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_tree_handler_add_foreach (GimpViewable    *viewable,
+                               GimpTreeHandler *handler)
+{
+  gimp_tree_handler_add (handler, viewable, NULL);
+}
+
+static void
+gimp_tree_handler_add (GimpTreeHandler *handler,
+                       GimpViewable    *viewable,
+                       GimpContainer   *unused)
+{
+  GimpContainer *children = gimp_viewable_get_children (viewable);
+
+  g_signal_connect (viewable,
+                    handler->signal_name,
+                    handler->callback,
+                    handler->user_data);
+
+  if (children)
+    gimp_tree_handler_add_container (handler, children);
+}
+
+static void
+gimp_tree_handler_remove_container (GimpTreeHandler *handler,
+                                    GimpContainer   *container)
+{
+  g_signal_handlers_disconnect_by_func (container,
+                                        gimp_tree_handler_add,
+                                        handler);
+  g_signal_handlers_disconnect_by_func (container,
+                                        gimp_tree_handler_remove,
+                                        handler);
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_tree_handler_remove_foreach,
+                          handler);
+}
+
+static void
+gimp_tree_handler_remove_foreach (GimpViewable    *viewable,
+                                  GimpTreeHandler *handler)
+{
+  gimp_tree_handler_remove (handler, viewable, NULL);
+}
+
+static void
+gimp_tree_handler_remove (GimpTreeHandler *handler,
+                          GimpViewable    *viewable,
+                          GimpContainer   *unused)
+{
+  GimpContainer *children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    gimp_tree_handler_remove_container (handler, children);
+
+  g_signal_handlers_disconnect_by_func (viewable,
+                                        handler->callback,
+                                        handler->user_data);
+}
diff --git a/app/core/gimptreehandler.h b/app/core/gimptreehandler.h
new file mode 100644
index 0000000..27497c4
--- /dev/null
+++ b/app/core/gimptreehandler.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTreeHandler
+ * Copyright (C) 2009  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TREE_HANDLER_H__
+#define __GIMP_TREE_HANDLER_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_TREE_HANDLER            (gimp_tree_handler_get_type ())
+#define GIMP_TREE_HANDLER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TREE_HANDLER, GimpTreeHandler))
+#define GIMP_TREE_HANDLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TREE_HANDLER, GimpTreeHandlerClass))
+#define GIMP_IS_TREE_HANDLER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TREE_HANDLER))
+#define GIMP_IS_TREE_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TREE_HANDLER))
+#define GIMP_TREE_HANDLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TREE_HANDLER, GimpTreeHandlerClass))
+
+
+typedef struct _GimpTreeHandlerClass GimpTreeHandlerClass;
+
+struct _GimpTreeHandler
+{
+  GimpObject     parent_instance;
+
+  GimpContainer *container;
+
+  gchar         *signal_name;
+  GCallback      callback;
+  gpointer       user_data;
+};
+
+struct _GimpTreeHandlerClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType             gimp_tree_handler_get_type   (void) G_GNUC_CONST;
+
+GimpTreeHandler * gimp_tree_handler_connect    (GimpContainer   *container,
+                                                const gchar     *signal_name,
+                                                GCallback        callback,
+                                                gpointer         user_data);
+void              gimp_tree_handler_disconnect (GimpTreeHandler *handler);
+
+
+#endif /* __GIMP_TREE_HANDLER_H__ */
diff --git a/app/core/gimptreeproxy.c b/app/core/gimptreeproxy.c
new file mode 100644
index 0000000..76fad91
--- /dev/null
+++ b/app/core/gimptreeproxy.c
@@ -0,0 +1,634 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptreeproxy.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimpviewable.h"
+#include "gimptreeproxy.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTAINER,
+  PROP_FLAT
+};
+
+
+struct _GimpTreeProxyPrivate
+{
+  GimpContainer *container;
+  gboolean       flat;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_tree_proxy_dispose             (GObject      *object);
+static void   gimp_tree_proxy_set_property        (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void   gimp_tree_proxy_get_property        (GObject      *object,
+                                                   guint         property_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+
+static void   gimp_tree_proxy_container_add       (GimpContainer *container,
+                                                   GimpObject    *object,
+                                                   GimpTreeProxy *tree_proxy);
+static void   gimp_tree_proxy_container_remove    (GimpContainer *container,
+                                                   GimpObject    *object,
+                                                   GimpTreeProxy *tree_proxy);
+static void   gimp_tree_proxy_container_reorder   (GimpContainer *container,
+                                                   GimpObject    *object,
+                                                   gint           new_index,
+                                                   GimpTreeProxy *tree_proxy);
+static void   gimp_tree_proxy_container_freeze    (GimpContainer *container,
+                                                   GimpTreeProxy *tree_proxy);
+static void   gimp_tree_proxy_container_thaw      (GimpContainer *container,
+                                                   GimpTreeProxy *tree_proxy);
+
+static gint   gimp_tree_proxy_add_container       (GimpTreeProxy *tree_proxy,
+                                                   GimpContainer *container,
+                                                   gint           index);
+static void   gimp_tree_proxy_remove_container    (GimpTreeProxy *tree_proxy,
+                                                   GimpContainer *container);
+
+static gint   gimp_tree_proxy_add_object          (GimpTreeProxy *tree_proxy,
+                                                   GimpObject    *object,
+                                                   gint           index);
+static void   gimp_tree_proxy_remove_object       (GimpTreeProxy *tree_proxy,
+                                                   GimpObject    *object);
+
+static gint   gimp_tree_proxy_find_container      (GimpTreeProxy *tree_proxy,
+                                                   GimpContainer *container);
+static gint   gimp_tree_proxy_find_object         (GimpContainer *container,
+                                                   GimpObject    *object);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpTreeProxy, gimp_tree_proxy, GIMP_TYPE_LIST)
+
+#define parent_class gimp_tree_proxy_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_tree_proxy_class_init (GimpTreeProxyClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_tree_proxy_dispose;
+  object_class->set_property = gimp_tree_proxy_set_property;
+  object_class->get_property = gimp_tree_proxy_get_property;
+
+  g_object_class_install_property (object_class, PROP_CONTAINER,
+                                   g_param_spec_object ("container", NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_FLAT,
+                                   g_param_spec_boolean ("flat", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_tree_proxy_init (GimpTreeProxy *tree_proxy)
+{
+  tree_proxy->priv = gimp_tree_proxy_get_instance_private (tree_proxy);
+}
+
+static void
+gimp_tree_proxy_dispose (GObject *object)
+{
+  GimpTreeProxy *tree_proxy = GIMP_TREE_PROXY (object);
+
+  gimp_tree_proxy_set_container (tree_proxy, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);;
+}
+
+static void
+gimp_tree_proxy_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpTreeProxy *tree_proxy = GIMP_TREE_PROXY (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTAINER:
+      gimp_tree_proxy_set_container (tree_proxy, g_value_get_object (value));
+      break;
+
+    case PROP_FLAT:
+      gimp_tree_proxy_set_flat (tree_proxy, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tree_proxy_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpTreeProxy *tree_proxy = GIMP_TREE_PROXY (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTAINER:
+      g_value_set_object (value, tree_proxy->priv->container);
+      break;
+
+    case PROP_FLAT:
+      g_value_set_boolean (value, tree_proxy->priv->flat);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tree_proxy_container_add (GimpContainer *container,
+                               GimpObject    *object,
+                               GimpTreeProxy *tree_proxy)
+{
+  gint index;
+
+  if (tree_proxy->priv->flat)
+    {
+      index = gimp_tree_proxy_find_container (tree_proxy, container) +
+              gimp_tree_proxy_find_object    (container,  object);
+    }
+  else
+    {
+      index = gimp_container_get_child_index (container, object);
+    }
+
+  gimp_tree_proxy_add_object (tree_proxy, object, index);
+}
+
+static void
+gimp_tree_proxy_container_remove (GimpContainer *container,
+                                  GimpObject    *object,
+                                  GimpTreeProxy *tree_proxy)
+{
+  gimp_tree_proxy_remove_object (tree_proxy, object);
+}
+
+static void
+gimp_tree_proxy_container_reorder (GimpContainer *container,
+                                   GimpObject    *object,
+                                   gint           new_index,
+                                   GimpTreeProxy *tree_proxy)
+{
+  gint index;
+
+  if (tree_proxy->priv->flat)
+    {
+      index = gimp_tree_proxy_find_container (tree_proxy, container) +
+              gimp_tree_proxy_find_object    (container,  object);
+
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (object)))
+        {
+          gimp_container_freeze (GIMP_CONTAINER (tree_proxy));
+
+          gimp_tree_proxy_remove_object (tree_proxy, object);
+          gimp_tree_proxy_add_object    (tree_proxy, object, index);
+
+          gimp_container_thaw (GIMP_CONTAINER (tree_proxy));
+
+          return;
+        }
+    }
+  else
+    {
+      index = new_index;
+    }
+
+  gimp_container_reorder (GIMP_CONTAINER (tree_proxy), object, index);
+}
+
+static void
+gimp_tree_proxy_container_freeze (GimpContainer *container,
+                                  GimpTreeProxy *tree_proxy)
+{
+  gimp_container_freeze (GIMP_CONTAINER (tree_proxy));
+}
+
+static void
+gimp_tree_proxy_container_thaw (GimpContainer *container,
+                                GimpTreeProxy *tree_proxy)
+{
+  gimp_container_thaw (GIMP_CONTAINER (tree_proxy));
+}
+
+typedef struct
+{
+  GimpTreeProxy *tree_proxy;
+  gint           index;
+} AddContainerData;
+
+static void
+gimp_tree_proxy_add_container_func (GimpObject       *object,
+                                    AddContainerData *data)
+{
+  data->index = gimp_tree_proxy_add_object (data->tree_proxy,
+                                            object, data->index);
+}
+
+static gint
+gimp_tree_proxy_add_container (GimpTreeProxy *tree_proxy,
+                               GimpContainer *container,
+                               gint           index)
+{
+  AddContainerData data;
+
+  g_signal_connect (container, "add",
+                    G_CALLBACK (gimp_tree_proxy_container_add),
+                    tree_proxy);
+  g_signal_connect (container, "remove",
+                    G_CALLBACK (gimp_tree_proxy_container_remove),
+                    tree_proxy);
+  g_signal_connect (container, "reorder",
+                    G_CALLBACK (gimp_tree_proxy_container_reorder),
+                    tree_proxy);
+  g_signal_connect (container, "freeze",
+                    G_CALLBACK (gimp_tree_proxy_container_freeze),
+                    tree_proxy);
+  g_signal_connect (container, "thaw",
+                    G_CALLBACK (gimp_tree_proxy_container_thaw),
+                    tree_proxy);
+
+  data.tree_proxy = tree_proxy;
+  data.index      = index;
+
+  gimp_container_freeze (GIMP_CONTAINER (tree_proxy));
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_tree_proxy_add_container_func,
+                          &data);
+
+  gimp_container_thaw (GIMP_CONTAINER (tree_proxy));
+
+  return data.index;
+}
+
+static void
+gimp_tree_proxy_remove_container_func (GimpObject    *object,
+                                       GimpTreeProxy *tree_proxy)
+{
+  gimp_tree_proxy_remove_object (tree_proxy, object);
+}
+
+static void
+gimp_tree_proxy_remove_container (GimpTreeProxy *tree_proxy,
+                                  GimpContainer *container)
+{
+  gimp_container_freeze (GIMP_CONTAINER (tree_proxy));
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_tree_proxy_remove_container_func,
+                          tree_proxy);
+
+  gimp_container_thaw (GIMP_CONTAINER (tree_proxy));
+
+  g_signal_handlers_disconnect_by_func (
+    container,
+    gimp_tree_proxy_container_add,
+    tree_proxy);
+  g_signal_handlers_disconnect_by_func (
+    container,
+    gimp_tree_proxy_container_remove,
+    tree_proxy);
+  g_signal_handlers_disconnect_by_func (
+    container,
+    gimp_tree_proxy_container_reorder,
+    tree_proxy);
+  g_signal_handlers_disconnect_by_func (
+    container,
+    gimp_tree_proxy_container_freeze,
+    tree_proxy);
+  g_signal_handlers_disconnect_by_func (
+    container,
+    gimp_tree_proxy_container_thaw,
+    tree_proxy);
+}
+
+static gint
+gimp_tree_proxy_add_object (GimpTreeProxy *tree_proxy,
+                            GimpObject    *object,
+                            gint           index)
+{
+  if (index == gimp_container_get_n_children (GIMP_CONTAINER (tree_proxy)))
+    index = -1;
+
+  if (tree_proxy->priv->flat)
+    {
+      GimpContainer *children;
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (object));
+
+      if (children)
+        return gimp_tree_proxy_add_container (tree_proxy, children, index);
+    }
+
+  if (index >= 0)
+    {
+      gimp_container_insert (GIMP_CONTAINER (tree_proxy), object, index);
+
+      return index + 1;
+    }
+  else
+    {
+      gimp_container_add (GIMP_CONTAINER (tree_proxy), object);
+
+      return index;
+    }
+}
+
+static void
+gimp_tree_proxy_remove_object (GimpTreeProxy *tree_proxy,
+                               GimpObject    *object)
+{
+  if (tree_proxy->priv->flat)
+    {
+      GimpContainer *children;
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (object));
+
+      if (children)
+        return gimp_tree_proxy_remove_container (tree_proxy, children);
+    }
+
+  gimp_container_remove (GIMP_CONTAINER (tree_proxy), object);
+}
+
+typedef struct
+{
+  GimpContainer *container;
+  gint           index;
+} FindContainerData;
+
+static gboolean
+gimp_tree_proxy_find_container_search_func (GimpObject        *object,
+                                            FindContainerData *data)
+{
+  GimpContainer *children;
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (object));
+
+  if (children)
+    {
+      if (children == data->container)
+        return TRUE;
+
+      return gimp_container_search (
+        children,
+        (GimpContainerSearchFunc) gimp_tree_proxy_find_container_search_func,
+        data) != NULL;
+    }
+
+  data->index++;
+
+  return FALSE;
+}
+
+static gint
+gimp_tree_proxy_find_container (GimpTreeProxy *tree_proxy,
+                                GimpContainer *container)
+{
+  FindContainerData data;
+
+  if (container == tree_proxy->priv->container)
+    return 0;
+
+  data.container = container;
+  data.index     = 0;
+
+  if (gimp_container_search (
+        tree_proxy->priv->container,
+        (GimpContainerSearchFunc) gimp_tree_proxy_find_container_search_func,
+        &data))
+    {
+      return data.index;
+    }
+
+  g_return_val_if_reached (0);
+}
+
+typedef struct
+{
+  GimpObject *object;
+  gint        index;
+} FindObjectData;
+
+static gboolean
+gimp_tree_proxy_find_object_search_func (GimpObject     *object,
+                                         FindObjectData *data)
+{
+  GimpContainer *children;
+
+  if (object == data->object)
+    return TRUE;
+
+  children = gimp_viewable_get_children (GIMP_VIEWABLE (object));
+
+  if (children)
+    {
+      return gimp_container_search (
+        children,
+        (GimpContainerSearchFunc) gimp_tree_proxy_find_object_search_func,
+        data) != NULL;
+    }
+
+  data->index++;
+
+  return FALSE;
+}
+
+static gint
+gimp_tree_proxy_find_object (GimpContainer *container,
+                             GimpObject    *object)
+{
+  FindObjectData data;
+
+  data.object = object;
+  data.index  = 0;
+
+  if (gimp_container_search (
+        container,
+        (GimpContainerSearchFunc) gimp_tree_proxy_find_object_search_func,
+        &data))
+    {
+      return data.index;
+    }
+
+  g_return_val_if_reached (0);
+}
+
+
+/*  public functions  */
+
+GimpContainer *
+gimp_tree_proxy_new (GType children_type)
+{
+  GTypeClass *children_class;
+
+  children_class = g_type_class_ref (children_type);
+
+  g_return_val_if_fail (G_TYPE_CHECK_CLASS_TYPE (children_class,
+                                                 GIMP_TYPE_VIEWABLE),
+                        NULL);
+
+  g_type_class_unref (children_class);
+
+  return g_object_new (GIMP_TYPE_TREE_PROXY,
+                       "children-type", children_type,
+                       "policy",        GIMP_CONTAINER_POLICY_WEAK,
+                       "append",        TRUE,
+                       NULL);
+}
+
+GimpContainer *
+gimp_tree_proxy_new_for_container (GimpContainer *container)
+{
+  GimpTreeProxy *tree_proxy;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+
+  tree_proxy = GIMP_TREE_PROXY (
+    gimp_tree_proxy_new (gimp_container_get_children_type (container)));
+
+  gimp_tree_proxy_set_container (tree_proxy, container);
+
+  return GIMP_CONTAINER (tree_proxy);
+}
+
+void
+gimp_tree_proxy_set_container (GimpTreeProxy *tree_proxy,
+                               GimpContainer *container)
+{
+  g_return_if_fail (GIMP_IS_TREE_PROXY (tree_proxy));
+  g_return_if_fail (container == NULL || GIMP_IS_CONTAINER (container));
+
+  if (container)
+    {
+      GTypeClass *children_class;
+
+      children_class = g_type_class_ref (
+        gimp_container_get_children_type (container));
+
+      g_return_if_fail (
+        G_TYPE_CHECK_CLASS_TYPE (
+          children_class,
+          gimp_container_get_children_type (GIMP_CONTAINER (tree_proxy))));
+
+      g_type_class_unref (children_class);
+    }
+
+  if (container != tree_proxy->priv->container)
+    {
+      gimp_container_freeze (GIMP_CONTAINER (tree_proxy));
+
+      if (tree_proxy->priv->container)
+        {
+          gimp_tree_proxy_remove_container (tree_proxy,
+                                            tree_proxy->priv->container);
+        }
+
+      g_set_object (&tree_proxy->priv->container, container);
+
+      if (tree_proxy->priv->container)
+        {
+          gimp_tree_proxy_add_container (tree_proxy,
+                                         tree_proxy->priv->container,
+                                         -1);
+        }
+
+      gimp_container_thaw (GIMP_CONTAINER (tree_proxy));
+
+      g_object_notify (G_OBJECT (tree_proxy), "container");
+    }
+}
+
+GimpContainer *
+gimp_tree_proxy_get_container (GimpTreeProxy *tree_proxy)
+{
+  g_return_val_if_fail (GIMP_IS_TREE_PROXY (tree_proxy), NULL);
+
+  return tree_proxy->priv->container;
+}
+
+void
+gimp_tree_proxy_set_flat (GimpTreeProxy *tree_proxy,
+                          gboolean       flat)
+{
+  g_return_if_fail (GIMP_IS_TREE_PROXY (tree_proxy));
+
+  if (flat != tree_proxy->priv->flat)
+    {
+      gimp_container_freeze (GIMP_CONTAINER (tree_proxy));
+
+      if (tree_proxy->priv->container)
+        {
+          gimp_tree_proxy_remove_container (tree_proxy,
+                                            tree_proxy->priv->container);
+        }
+
+      tree_proxy->priv->flat = flat;
+
+      if (tree_proxy->priv->container)
+        {
+          gimp_tree_proxy_add_container (tree_proxy,
+                                         tree_proxy->priv->container,
+                                         -1);
+        }
+
+      gimp_container_thaw (GIMP_CONTAINER (tree_proxy));
+
+      g_object_notify (G_OBJECT (tree_proxy), "flat");
+    }
+}
+
+gboolean
+gimp_tree_proxy_get_flat (GimpTreeProxy *tree_proxy)
+{
+  g_return_val_if_fail (GIMP_IS_TREE_PROXY (tree_proxy), FALSE);
+
+  return tree_proxy->priv->flat;
+}
diff --git a/app/core/gimptreeproxy.h b/app/core/gimptreeproxy.h
new file mode 100644
index 0000000..8ae39f8
--- /dev/null
+++ b/app/core/gimptreeproxy.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptreeproxy.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TREE_PROXY_H__
+#define __GIMP_TREE_PROXY_H__
+
+
+#include "gimplist.h"
+
+
+#define GIMP_TYPE_TREE_PROXY            (gimp_tree_proxy_get_type ())
+#define GIMP_TREE_PROXY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TREE_PROXY, GimpTreeProxy))
+#define GIMP_TREE_PROXY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TREE_PROXY, GimpTreeProxyClass))
+#define GIMP_IS_TREE_PROXY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TREE_PROXY))
+#define GIMP_IS_TREE_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TREE_PROXY))
+#define GIMP_TREE_PROXY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TREE_PROXY, GimpTreeProxyClass))
+
+
+typedef struct _GimpTreeProxyPrivate GimpTreeProxyPrivate;
+typedef struct _GimpTreeProxyClass   GimpTreeProxyClass;
+
+struct _GimpTreeProxy
+{
+  GimpList              parent_instance;
+
+  GimpTreeProxyPrivate *priv;
+};
+
+struct _GimpTreeProxyClass
+{
+  GimpListClass  parent_class;
+};
+
+
+GType           gimp_tree_proxy_get_type (void) G_GNUC_CONST;
+
+GimpContainer * gimp_tree_proxy_new               (GType          children_type);
+GimpContainer * gimp_tree_proxy_new_for_container (GimpContainer *container);
+
+void            gimp_tree_proxy_set_container     (GimpTreeProxy *tree_proxy,
+                                                   GimpContainer *container);
+GimpContainer * gimp_tree_proxy_get_container     (GimpTreeProxy *tree_proxy);
+
+void            gimp_tree_proxy_set_flat          (GimpTreeProxy *tree_proxy,
+                                                   gboolean       flat);
+gboolean        gimp_tree_proxy_get_flat          (GimpTreeProxy *tree_proxy);
+
+
+#endif  /*  __GIMP_TREE_PROXY_H__  */
diff --git a/app/core/gimptriviallycancelablewaitable.c b/app/core/gimptriviallycancelablewaitable.c
new file mode 100644
index 0000000..d90a9cb
--- /dev/null
+++ b/app/core/gimptriviallycancelablewaitable.c
@@ -0,0 +1,92 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptriviallycancelablewaitable.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpcancelable.h"
+#include "gimptriviallycancelablewaitable.h"
+#include "gimpwaitable.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_trivially_cancelable_waitable_cancelable_iface_init (GimpCancelableInterface *iface);
+
+static void   gimp_trivially_cancelable_waitable_cancel                (GimpCancelable          *cancelable);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpTriviallyCancelableWaitable, gimp_trivially_cancelable_waitable, GIMP_TYPE_UNCANCELABLE_WAITABLE,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CANCELABLE,
+                                                gimp_trivially_cancelable_waitable_cancelable_iface_init))
+
+#define parent_class gimp_trivially_cancelable_waitable_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_trivially_cancelable_waitable_class_init (GimpTriviallyCancelableWaitableClass *klass)
+{
+}
+
+static void
+gimp_trivially_cancelable_waitable_cancelable_iface_init (GimpCancelableInterface *iface)
+{
+  iface->cancel = gimp_trivially_cancelable_waitable_cancel;
+}
+
+static void
+gimp_trivially_cancelable_waitable_init (GimpTriviallyCancelableWaitable *trivially_cancelable_waitable)
+{
+}
+
+static void
+gimp_trivially_cancelable_waitable_cancel (GimpCancelable *cancelable)
+{
+  GimpUncancelableWaitable *uncancelable_waitable =
+    GIMP_UNCANCELABLE_WAITABLE (cancelable);
+
+  g_clear_object (&uncancelable_waitable->waitable);
+}
+
+
+/*  public functions  */
+
+
+GimpWaitable *
+gimp_trivially_cancelable_waitable_new (GimpWaitable *waitable)
+{
+  GimpUncancelableWaitable *uncancelable_waitable;
+
+  g_return_val_if_fail (GIMP_IS_WAITABLE (waitable), NULL);
+
+  uncancelable_waitable = g_object_new (GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE,
+                                        NULL);
+
+  uncancelable_waitable->waitable = g_object_ref (waitable);
+
+  return GIMP_WAITABLE (uncancelable_waitable);
+}
diff --git a/app/core/gimptriviallycancelablewaitable.h b/app/core/gimptriviallycancelablewaitable.h
new file mode 100644
index 0000000..bb09a52
--- /dev/null
+++ b/app/core/gimptriviallycancelablewaitable.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptriviallycancelablewaitable.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRIVIALLY_CANCELABLE_WAITABLE_H__
+#define __GIMP_TRIVIALLY_CANCELABLE_WAITABLE_H__
+
+
+#include "gimpuncancelablewaitable.h"
+
+
+#define GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE            (gimp_trivially_cancelable_waitable_get_type ())
+#define GIMP_TRIVIALLY_CANCELABLE_WAITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE, GimpTriviallyCancelableWaitable))
+#define GIMP_TRIVIALLY_CANCELABLE_WAITABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE, GimpTriviallyCancelableWaitableClass))
+#define GIMP_IS_TRIVIALLY_CANCELABLE_WAITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE))
+#define GIMP_IS_TRIVIALLY_CANCELABLE_WAITABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE))
+#define GIMP_TRIVIALLY_CANCELABLE_WAITABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRIVIALLY_CANCELABLE_WAITABLE, GimpTriviallyCancelableWaitableClass))
+
+
+typedef struct _GimpTriviallyCancelableWaitablePrivate GimpTriviallyCancelableWaitablePrivate;
+typedef struct _GimpTriviallyCancelableWaitableClass   GimpTriviallyCancelableWaitableClass;
+
+struct _GimpTriviallyCancelableWaitable
+{
+  GimpUncancelableWaitable                parent_instance;
+
+  GimpTriviallyCancelableWaitablePrivate *priv;
+};
+
+struct _GimpTriviallyCancelableWaitableClass
+{
+  GimpUncancelableWaitableClass  parent_class;
+};
+
+
+GType          gimp_trivially_cancelable_waitable_get_type (void) G_GNUC_CONST;
+
+GimpWaitable * gimp_trivially_cancelable_waitable_new      (GimpWaitable *waitable);
+
+
+#endif /* __GIMP_TRIVIALLY_CANCELABLE_WAITABLE_H__ */
diff --git a/app/core/gimpuncancelablewaitable.c b/app/core/gimpuncancelablewaitable.c
new file mode 100644
index 0000000..596efed
--- /dev/null
+++ b/app/core/gimpuncancelablewaitable.c
@@ -0,0 +1,137 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpuncancelablewaitable.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpuncancelablewaitable.h"
+#include "gimpwaitable.h"
+
+
+/*  local function prototypes  */
+
+static void       gimp_uncancelable_waitable_waitable_iface_init (GimpWaitableInterface   *iface);
+
+static void       gimp_uncancelable_waitable_finalize            (GObject                 *object);
+
+static void       gimp_uncancelable_waitable_wait                (GimpWaitable            *waitable);
+static gboolean   gimp_uncancelable_waitable_try_wait            (GimpWaitable            *waitable);
+static gboolean   gimp_uncancelable_waitable_wait_until          (GimpWaitable            *waitable,
+                                                                  gint64                   end_time);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpUncancelableWaitable, gimp_uncancelable_waitable, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_WAITABLE,
+                                                gimp_uncancelable_waitable_waitable_iface_init))
+
+#define parent_class gimp_uncancelable_waitable_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_uncancelable_waitable_class_init (GimpUncancelableWaitableClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_uncancelable_waitable_finalize;
+}
+
+static void
+gimp_uncancelable_waitable_waitable_iface_init (GimpWaitableInterface *iface)
+{
+  iface->wait       = gimp_uncancelable_waitable_wait;
+  iface->try_wait   = gimp_uncancelable_waitable_try_wait;
+  iface->wait_until = gimp_uncancelable_waitable_wait_until;
+}
+
+static void
+gimp_uncancelable_waitable_init (GimpUncancelableWaitable *uncancelable_waitable)
+{
+}
+
+static void
+gimp_uncancelable_waitable_finalize (GObject *object)
+{
+  GimpUncancelableWaitable *uncancelable_waitable =
+    GIMP_UNCANCELABLE_WAITABLE (object);
+
+  g_clear_object (&uncancelable_waitable->waitable);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_uncancelable_waitable_wait (GimpWaitable *waitable)
+{
+  GimpUncancelableWaitable *uncancelable_waitable =
+    GIMP_UNCANCELABLE_WAITABLE (waitable);
+
+  if (uncancelable_waitable->waitable)
+    gimp_waitable_wait (uncancelable_waitable->waitable);
+}
+
+static gboolean
+gimp_uncancelable_waitable_try_wait (GimpWaitable *waitable)
+{
+  GimpUncancelableWaitable *uncancelable_waitable =
+    GIMP_UNCANCELABLE_WAITABLE (waitable);
+
+  if (uncancelable_waitable->waitable)
+    return gimp_waitable_try_wait (uncancelable_waitable->waitable);
+  else
+    return TRUE;
+}
+
+static gboolean
+gimp_uncancelable_waitable_wait_until (GimpWaitable *waitable,
+                                gint64        end_time)
+{
+  GimpUncancelableWaitable *uncancelable_waitable =
+    GIMP_UNCANCELABLE_WAITABLE (waitable);
+
+  if (uncancelable_waitable->waitable)
+    return gimp_waitable_wait_until (uncancelable_waitable->waitable, end_time);
+  else
+    return TRUE;
+}
+
+
+/*  public functions  */
+
+
+GimpWaitable *
+gimp_uncancelable_waitable_new (GimpWaitable *waitable)
+{
+  GimpUncancelableWaitable *uncancelable_waitable;
+
+  g_return_val_if_fail (GIMP_IS_WAITABLE (waitable), NULL);
+
+  uncancelable_waitable = g_object_new (GIMP_TYPE_UNCANCELABLE_WAITABLE, NULL);
+
+  uncancelable_waitable->waitable = g_object_ref (waitable);
+
+  return GIMP_WAITABLE (uncancelable_waitable);
+}
diff --git a/app/core/gimpuncancelablewaitable.h b/app/core/gimpuncancelablewaitable.h
new file mode 100644
index 0000000..90b26ff
--- /dev/null
+++ b/app/core/gimpuncancelablewaitable.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpuncancelablewaitable.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UNCANCELABLE_WAITABLE_H__
+#define __GIMP_UNCANCELABLE_WAITABLE_H__
+
+
+#define GIMP_TYPE_UNCANCELABLE_WAITABLE            (gimp_uncancelable_waitable_get_type ())
+#define GIMP_UNCANCELABLE_WAITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNCANCELABLE_WAITABLE, GimpUncancelableWaitable))
+#define GIMP_UNCANCELABLE_WAITABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNCANCELABLE_WAITABLE, GimpUncancelableWaitableClass))
+#define GIMP_IS_UNCANCELABLE_WAITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UNCANCELABLE_WAITABLE))
+#define GIMP_IS_UNCANCELABLE_WAITABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNCANCELABLE_WAITABLE))
+#define GIMP_UNCANCELABLE_WAITABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNCANCELABLE_WAITABLE, GimpUncancelableWaitableClass))
+
+
+typedef struct _GimpUncancelableWaitablePrivate GimpUncancelableWaitablePrivate;
+typedef struct _GimpUncancelableWaitableClass   GimpUncancelableWaitableClass;
+
+struct _GimpUncancelableWaitable
+{
+  GObject       parent_instance;
+
+  GimpWaitable *waitable;
+};
+
+struct _GimpUncancelableWaitableClass
+{
+  GObjectClass  parent_class;
+};
+
+
+GType          gimp_uncancelable_waitable_get_type (void) G_GNUC_CONST;
+
+GimpWaitable * gimp_uncancelable_waitable_new      (GimpWaitable *waitable);
+
+
+#endif /* __GIMP_UNCANCELABLE_WAITABLE_H__ */
diff --git a/app/core/gimpundo.c b/app/core/gimpundo.c
new file mode 100644
index 0000000..68bbae0
--- /dev/null
+++ b/app/core/gimpundo.c
@@ -0,0 +1,585 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <time.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gimp.h"
+#include "gimpcontext.h"
+#include "gimpimage.h"
+#include "gimpimage-undo.h"
+#include "gimpmarshal.h"
+#include "gimptempbuf.h"
+#include "gimpundo.h"
+#include "gimpundostack.h"
+
+#include "gimp-priorities.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  POP,
+  FREE,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE,
+  PROP_TIME,
+  PROP_UNDO_TYPE,
+  PROP_DIRTY_MASK
+};
+
+
+static void          gimp_undo_constructed         (GObject             *object);
+static void          gimp_undo_finalize            (GObject             *object);
+static void          gimp_undo_set_property        (GObject             *object,
+                                                    guint                property_id,
+                                                    const GValue        *value,
+                                                    GParamSpec          *pspec);
+static void          gimp_undo_get_property        (GObject             *object,
+                                                    guint                property_id,
+                                                    GValue              *value,
+                                                    GParamSpec          *pspec);
+
+static gint64        gimp_undo_get_memsize         (GimpObject          *object,
+                                                    gint64              *gui_size);
+
+static gboolean      gimp_undo_get_popup_size      (GimpViewable        *viewable,
+                                                    gint                 width,
+                                                    gint                 height,
+                                                    gboolean             dot_for_dot,
+                                                    gint                *popup_width,
+                                                    gint                *popup_height);
+static GimpTempBuf * gimp_undo_get_new_preview     (GimpViewable        *viewable,
+                                                    GimpContext         *context,
+                                                    gint                 width,
+                                                    gint                 height);
+
+static void          gimp_undo_real_pop            (GimpUndo            *undo,
+                                                    GimpUndoMode         undo_mode,
+                                                    GimpUndoAccumulator *accum);
+static void          gimp_undo_real_free           (GimpUndo            *undo,
+                                                    GimpUndoMode         undo_mode);
+
+static gboolean      gimp_undo_create_preview_idle (gpointer             data);
+static void       gimp_undo_create_preview_private (GimpUndo            *undo,
+                                                    GimpContext         *context);
+
+
+G_DEFINE_TYPE (GimpUndo, gimp_undo, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_undo_parent_class
+
+static guint undo_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_undo_class_init (GimpUndoClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+
+  undo_signals[POP] =
+    g_signal_new ("pop",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpUndoClass, pop),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM_POINTER,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_UNDO_MODE,
+                  G_TYPE_POINTER);
+
+  undo_signals[FREE] =
+    g_signal_new ("free",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpUndoClass, free),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_UNDO_MODE);
+
+  object_class->constructed         = gimp_undo_constructed;
+  object_class->finalize            = gimp_undo_finalize;
+  object_class->set_property        = gimp_undo_set_property;
+  object_class->get_property        = gimp_undo_get_property;
+
+  gimp_object_class->get_memsize    = gimp_undo_get_memsize;
+
+  viewable_class->default_icon_name = "edit-undo";
+  viewable_class->get_popup_size    = gimp_undo_get_popup_size;
+  viewable_class->get_new_preview   = gimp_undo_get_new_preview;
+
+  klass->pop                        = gimp_undo_real_pop;
+  klass->free                       = gimp_undo_real_free;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image", NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_TIME,
+                                   g_param_spec_uint ("time", NULL, NULL,
+                                                      0, G_MAXUINT, 0,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_UNDO_TYPE,
+                                   g_param_spec_enum ("undo-type", NULL, NULL,
+                                                      GIMP_TYPE_UNDO_TYPE,
+                                                      GIMP_UNDO_GROUP_NONE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DIRTY_MASK,
+                                   g_param_spec_flags ("dirty-mask",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_DIRTY_MASK,
+                                                       GIMP_DIRTY_NONE,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_undo_init (GimpUndo *undo)
+{
+  undo->time = time (NULL);
+}
+
+static void
+gimp_undo_constructed (GObject *object)
+{
+  GimpUndo *undo = GIMP_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_IMAGE (undo->image));
+}
+
+static void
+gimp_undo_finalize (GObject *object)
+{
+  GimpUndo *undo = GIMP_UNDO (object);
+
+  if (undo->preview_idle_id)
+    {
+      g_source_remove (undo->preview_idle_id);
+      undo->preview_idle_id = 0;
+    }
+
+  g_clear_pointer (&undo->preview, gimp_temp_buf_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_undo_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpUndo *undo = GIMP_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      /* don't ref */
+      undo->image = g_value_get_object (value);
+      break;
+    case PROP_TIME:
+      undo->time = g_value_get_uint (value);
+      break;
+    case PROP_UNDO_TYPE:
+      undo->undo_type = g_value_get_enum (value);
+      break;
+    case PROP_DIRTY_MASK:
+      undo->dirty_mask = g_value_get_flags (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_undo_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GimpUndo *undo = GIMP_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, undo->image);
+      break;
+    case PROP_TIME:
+      g_value_set_uint (value, undo->time);
+      break;
+    case PROP_UNDO_TYPE:
+      g_value_set_enum (value, undo->undo_type);
+      break;
+    case PROP_DIRTY_MASK:
+      g_value_set_flags (value, undo->dirty_mask);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_undo_get_memsize (GimpObject *object,
+                       gint64     *gui_size)
+{
+  GimpUndo *undo    = GIMP_UNDO (object);
+  gint64    memsize = 0;
+
+  *gui_size += gimp_temp_buf_get_memsize (undo->preview);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_undo_get_popup_size (GimpViewable *viewable,
+                          gint          width,
+                          gint          height,
+                          gboolean      dot_for_dot,
+                          gint         *popup_width,
+                          gint         *popup_height)
+{
+  GimpUndo *undo = GIMP_UNDO (viewable);
+
+  if (undo->preview &&
+      (gimp_temp_buf_get_width  (undo->preview) > width ||
+       gimp_temp_buf_get_height (undo->preview) > height))
+    {
+      *popup_width  = gimp_temp_buf_get_width  (undo->preview);
+      *popup_height = gimp_temp_buf_get_height (undo->preview);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GimpTempBuf *
+gimp_undo_get_new_preview (GimpViewable *viewable,
+                           GimpContext  *context,
+                           gint          width,
+                           gint          height)
+{
+  GimpUndo *undo = GIMP_UNDO (viewable);
+
+  if (undo->preview)
+    {
+      gint preview_width;
+      gint preview_height;
+
+      gimp_viewable_calc_preview_size (gimp_temp_buf_get_width  (undo->preview),
+                                       gimp_temp_buf_get_height (undo->preview),
+                                       width,
+                                       height,
+                                       TRUE, 1.0, 1.0,
+                                       &preview_width,
+                                       &preview_height,
+                                       NULL);
+
+      if (preview_width  < gimp_temp_buf_get_width  (undo->preview) &&
+          preview_height < gimp_temp_buf_get_height (undo->preview))
+        {
+          return gimp_temp_buf_scale (undo->preview,
+                                      preview_width, preview_height);
+        }
+
+      return gimp_temp_buf_copy (undo->preview);
+    }
+
+  return NULL;
+}
+
+static void
+gimp_undo_real_pop (GimpUndo            *undo,
+                    GimpUndoMode         undo_mode,
+                    GimpUndoAccumulator *accum)
+{
+}
+
+static void
+gimp_undo_real_free (GimpUndo     *undo,
+                     GimpUndoMode  undo_mode)
+{
+}
+
+void
+gimp_undo_pop (GimpUndo            *undo,
+               GimpUndoMode         undo_mode,
+               GimpUndoAccumulator *accum)
+{
+  g_return_if_fail (GIMP_IS_UNDO (undo));
+  g_return_if_fail (accum != NULL);
+
+  if (undo->dirty_mask != GIMP_DIRTY_NONE)
+    {
+      switch (undo_mode)
+        {
+        case GIMP_UNDO_MODE_UNDO:
+          gimp_image_clean (undo->image, undo->dirty_mask);
+          break;
+
+        case GIMP_UNDO_MODE_REDO:
+          gimp_image_dirty (undo->image, undo->dirty_mask);
+          break;
+        }
+    }
+
+  g_signal_emit (undo, undo_signals[POP], 0, undo_mode, accum);
+}
+
+void
+gimp_undo_free (GimpUndo     *undo,
+                GimpUndoMode  undo_mode)
+{
+  g_return_if_fail (GIMP_IS_UNDO (undo));
+
+  g_signal_emit (undo, undo_signals[FREE], 0, undo_mode);
+}
+
+typedef struct _GimpUndoIdle GimpUndoIdle;
+
+struct _GimpUndoIdle
+{
+  GimpUndo    *undo;
+  GimpContext *context;
+};
+
+static void
+gimp_undo_idle_free (GimpUndoIdle *idle)
+{
+  if (idle->context)
+    g_object_unref (idle->context);
+
+  g_slice_free (GimpUndoIdle, idle);
+}
+
+void
+gimp_undo_create_preview (GimpUndo    *undo,
+                          GimpContext *context,
+                          gboolean     create_now)
+{
+  g_return_if_fail (GIMP_IS_UNDO (undo));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  if (undo->preview || undo->preview_idle_id)
+    return;
+
+  if (create_now)
+    {
+      gimp_undo_create_preview_private (undo, context);
+    }
+  else
+    {
+      GimpUndoIdle *idle = g_slice_new0 (GimpUndoIdle);
+
+      idle->undo = undo;
+
+      if (context)
+        idle->context = g_object_ref (context);
+
+      undo->preview_idle_id =
+        g_idle_add_full (GIMP_PRIORITY_VIEWABLE_IDLE,
+                         gimp_undo_create_preview_idle, idle,
+                         (GDestroyNotify) gimp_undo_idle_free);
+    }
+}
+
+static gboolean
+gimp_undo_create_preview_idle (gpointer data)
+{
+  GimpUndoIdle *idle   = data;
+  GimpUndoStack *stack = gimp_image_get_undo_stack (idle->undo->image);
+
+  if (idle->undo == gimp_undo_stack_peek (stack))
+    {
+      gimp_undo_create_preview_private (idle->undo, idle->context);
+    }
+
+  idle->undo->preview_idle_id = 0;
+
+  return FALSE;
+}
+
+static void
+gimp_undo_create_preview_private (GimpUndo    *undo,
+                                  GimpContext *context)
+{
+  GimpImage    *image = undo->image;
+  GimpViewable *preview_viewable;
+  GimpViewSize  preview_size;
+  gint          width;
+  gint          height;
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_GROUP_IMAGE_QUICK_MASK:
+    case GIMP_UNDO_GROUP_MASK:
+    case GIMP_UNDO_MASK:
+      preview_viewable = GIMP_VIEWABLE (gimp_image_get_mask (image));
+      break;
+
+    default:
+      preview_viewable = GIMP_VIEWABLE (image);
+      break;
+    }
+
+  preview_size = image->gimp->config->undo_preview_size;
+
+  if (gimp_image_get_width  (image) <= preview_size &&
+      gimp_image_get_height (image) <= preview_size)
+    {
+      width  = gimp_image_get_width  (image);
+      height = gimp_image_get_height (image);
+    }
+  else
+    {
+      if (gimp_image_get_width (image) > gimp_image_get_height (image))
+        {
+          width  = preview_size;
+          height = MAX (1, (gimp_image_get_height (image) * preview_size /
+                            gimp_image_get_width (image)));
+        }
+      else
+        {
+          height = preview_size;
+          width  = MAX (1, (gimp_image_get_width (image) * preview_size /
+                            gimp_image_get_height (image)));
+        }
+    }
+
+  undo->preview = gimp_viewable_get_new_preview (preview_viewable, context,
+                                                 width, height);
+
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (undo));
+}
+
+void
+gimp_undo_refresh_preview (GimpUndo    *undo,
+                           GimpContext *context)
+{
+  g_return_if_fail (GIMP_IS_UNDO (undo));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  if (undo->preview_idle_id)
+    return;
+
+  if (undo->preview)
+    {
+      g_clear_pointer (&undo->preview, gimp_temp_buf_unref);
+      gimp_undo_create_preview (undo, context, FALSE);
+    }
+}
+
+const gchar *
+gimp_undo_type_to_name (GimpUndoType type)
+{
+  const gchar *desc;
+
+  if (gimp_enum_get_value (GIMP_TYPE_UNDO_TYPE, type, NULL, NULL, &desc, NULL))
+    return desc;
+  else
+    return "";
+}
+
+gboolean
+gimp_undo_is_weak (GimpUndo *undo)
+{
+  if (! undo)
+    return FALSE;
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_GROUP_ITEM_VISIBILITY:
+    case GIMP_UNDO_GROUP_ITEM_PROPERTIES:
+    case GIMP_UNDO_GROUP_LAYER_APPLY_MASK:
+    case GIMP_UNDO_ITEM_VISIBILITY:
+    case GIMP_UNDO_LAYER_MODE:
+    case GIMP_UNDO_LAYER_OPACITY:
+    case GIMP_UNDO_LAYER_MASK_APPLY:
+    case GIMP_UNDO_LAYER_MASK_SHOW:
+      return TRUE;
+      break;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_undo_get_age:
+ * @undo:
+ *
+ * Return value: the time in seconds since this undo item was created
+ */
+gint
+gimp_undo_get_age (GimpUndo *undo)
+{
+  guint now = time (NULL);
+
+  g_return_val_if_fail (GIMP_IS_UNDO (undo), 0);
+  g_return_val_if_fail (now >= undo->time, 0);
+
+  return now - undo->time;
+}
+
+/**
+ * gimp_undo_reset_age:
+ * @undo:
+ *
+ * Changes the creation time of this undo item to the current time.
+ */
+void
+gimp_undo_reset_age (GimpUndo *undo)
+{
+  g_return_if_fail (GIMP_IS_UNDO (undo));
+
+  undo->time = time (NULL);
+
+  g_object_notify (G_OBJECT (undo), "time");
+}
diff --git a/app/core/gimpundo.h b/app/core/gimpundo.h
new file mode 100644
index 0000000..03d03c2
--- /dev/null
+++ b/app/core/gimpundo.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UNDO_H__
+#define __GIMP_UNDO_H__
+
+
+#include "gimpviewable.h"
+
+
+struct _GimpUndoAccumulator
+{
+  gboolean mode_changed;
+  gboolean precision_changed;
+
+  gboolean size_changed;
+  gint     previous_origin_x;
+  gint     previous_origin_y;
+  gint     previous_width;
+  gint     previous_height;
+
+  gboolean resolution_changed;
+
+  gboolean unit_changed;
+};
+
+
+#define GIMP_TYPE_UNDO            (gimp_undo_get_type ())
+#define GIMP_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNDO, GimpUndo))
+#define GIMP_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNDO, GimpUndoClass))
+#define GIMP_IS_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UNDO))
+#define GIMP_IS_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNDO))
+#define GIMP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNDO, GimpUndoClass))
+
+
+typedef struct _GimpUndoClass GimpUndoClass;
+
+struct _GimpUndo
+{
+  GimpViewable      parent_instance;
+
+  GimpImage        *image;          /* the image this undo is part of     */
+  guint             time;           /* time of undo step construction     */
+
+  GimpUndoType      undo_type;      /* undo type                          */
+  GimpDirtyMask     dirty_mask;     /* affected parts of the image        */
+
+  GimpTempBuf      *preview;
+  guint             preview_idle_id;
+};
+
+struct _GimpUndoClass
+{
+  GimpViewableClass  parent_class;
+
+  void (* pop)  (GimpUndo            *undo,
+                 GimpUndoMode         undo_mode,
+                 GimpUndoAccumulator *accum);
+  void (* free) (GimpUndo            *undo,
+                 GimpUndoMode         undo_mode);
+};
+
+
+GType         gimp_undo_get_type        (void) G_GNUC_CONST;
+
+void          gimp_undo_pop             (GimpUndo            *undo,
+                                         GimpUndoMode         undo_mode,
+                                         GimpUndoAccumulator *accum);
+void          gimp_undo_free            (GimpUndo            *undo,
+                                         GimpUndoMode         undo_mode);
+
+void          gimp_undo_create_preview  (GimpUndo            *undo,
+                                         GimpContext         *context,
+                                         gboolean             create_now);
+void          gimp_undo_refresh_preview (GimpUndo            *undo,
+                                         GimpContext         *context);
+
+const gchar * gimp_undo_type_to_name    (GimpUndoType         type);
+
+gboolean      gimp_undo_is_weak         (GimpUndo            *undo);
+gint          gimp_undo_get_age         (GimpUndo            *undo);
+void          gimp_undo_reset_age       (GimpUndo            *undo);
+
+
+#endif /* __GIMP_UNDO_H__ */
diff --git a/app/core/gimpundostack.c b/app/core/gimpundostack.c
new file mode 100644
index 0000000..666ed9b
--- /dev/null
+++ b/app/core/gimpundostack.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpimage.h"
+#include "gimplist.h"
+#include "gimpundo.h"
+#include "gimpundostack.h"
+
+
+static void    gimp_undo_stack_finalize    (GObject             *object);
+
+static gint64  gimp_undo_stack_get_memsize (GimpObject          *object,
+                                            gint64              *gui_size);
+
+static void    gimp_undo_stack_pop         (GimpUndo            *undo,
+                                            GimpUndoMode         undo_mode,
+                                            GimpUndoAccumulator *accum);
+static void    gimp_undo_stack_free        (GimpUndo            *undo,
+                                            GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpUndoStack, gimp_undo_stack, GIMP_TYPE_UNDO)
+
+#define parent_class gimp_undo_stack_parent_class
+
+
+static void
+gimp_undo_stack_class_init (GimpUndoStackClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->finalize         = gimp_undo_stack_finalize;
+
+  gimp_object_class->get_memsize = gimp_undo_stack_get_memsize;
+
+  undo_class->pop                = gimp_undo_stack_pop;
+  undo_class->free               = gimp_undo_stack_free;
+}
+
+static void
+gimp_undo_stack_init (GimpUndoStack *stack)
+{
+  stack->undos = gimp_list_new (GIMP_TYPE_UNDO, FALSE);
+}
+
+static void
+gimp_undo_stack_finalize (GObject *object)
+{
+  GimpUndoStack *stack = GIMP_UNDO_STACK (object);
+
+  g_clear_object (&stack->undos);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_undo_stack_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpUndoStack *stack   = GIMP_UNDO_STACK (object);
+  gint64         memsize = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (stack->undos), gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_undo_stack_pop (GimpUndo            *undo,
+                     GimpUndoMode         undo_mode,
+                     GimpUndoAccumulator *accum)
+{
+  GimpUndoStack *stack = GIMP_UNDO_STACK (undo);
+  GList         *list;
+
+  for (list = GIMP_LIST (stack->undos)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpUndo *child = list->data;
+
+      gimp_undo_pop (child, undo_mode, accum);
+    }
+}
+
+static void
+gimp_undo_stack_free (GimpUndo     *undo,
+                      GimpUndoMode  undo_mode)
+{
+  GimpUndoStack *stack = GIMP_UNDO_STACK (undo);
+  GList         *list;
+
+  for (list = GIMP_LIST (stack->undos)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpUndo *child = list->data;
+
+      gimp_undo_free (child, undo_mode);
+      g_object_unref (child);
+    }
+
+  gimp_container_clear (stack->undos);
+}
+
+GimpUndoStack *
+gimp_undo_stack_new (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return g_object_new (GIMP_TYPE_UNDO_STACK,
+                       "image", image,
+                       NULL);
+}
+
+void
+gimp_undo_stack_push_undo (GimpUndoStack *stack,
+                           GimpUndo      *undo)
+{
+  g_return_if_fail (GIMP_IS_UNDO_STACK (stack));
+  g_return_if_fail (GIMP_IS_UNDO (undo));
+
+  gimp_container_add (stack->undos, GIMP_OBJECT (undo));
+}
+
+GimpUndo *
+gimp_undo_stack_pop_undo (GimpUndoStack       *stack,
+                          GimpUndoMode         undo_mode,
+                          GimpUndoAccumulator *accum)
+{
+  GimpUndo *undo;
+
+  g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), NULL);
+  g_return_val_if_fail (accum != NULL, NULL);
+
+  undo = GIMP_UNDO (gimp_container_get_first_child (stack->undos));
+
+  if (undo)
+    {
+      gimp_container_remove (stack->undos, GIMP_OBJECT (undo));
+      gimp_undo_pop (undo, undo_mode, accum);
+
+      return undo;
+    }
+
+  return NULL;
+}
+
+GimpUndo *
+gimp_undo_stack_free_bottom (GimpUndoStack *stack,
+                             GimpUndoMode   undo_mode)
+{
+  GimpUndo *undo;
+
+  g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), NULL);
+
+  undo = GIMP_UNDO (gimp_container_get_last_child (stack->undos));
+
+  if (undo)
+    {
+      gimp_container_remove (stack->undos, GIMP_OBJECT (undo));
+      gimp_undo_free (undo, undo_mode);
+
+      return undo;
+    }
+
+  return NULL;
+}
+
+GimpUndo *
+gimp_undo_stack_peek (GimpUndoStack *stack)
+{
+  g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), NULL);
+
+  return GIMP_UNDO (gimp_container_get_first_child (stack->undos));
+}
+
+gint
+gimp_undo_stack_get_depth (GimpUndoStack *stack)
+{
+  g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), 0);
+
+  return gimp_container_get_n_children (stack->undos);
+}
diff --git a/app/core/gimpundostack.h b/app/core/gimpundostack.h
new file mode 100644
index 0000000..8432df0
--- /dev/null
+++ b/app/core/gimpundostack.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UNDO_STACK_H__
+#define __GIMP_UNDO_STACK_H__
+
+
+#include "gimpundo.h"
+
+
+#define GIMP_TYPE_UNDO_STACK            (gimp_undo_stack_get_type ())
+#define GIMP_UNDO_STACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNDO_STACK, GimpUndoStack))
+#define GIMP_UNDO_STACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNDO_STACK, GimpUndoStackClass))
+#define GIMP_IS_UNDO_STACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UNDO_STACK))
+#define GIMP_IS_UNDO_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNDO_STACK))
+#define GIMP_UNDO_STACK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNDO_STACK, GimpUndoStackClass))
+
+
+typedef struct _GimpUndoStackClass GimpUndoStackClass;
+
+struct _GimpUndoStack
+{
+  GimpUndo       parent_instance;
+
+  GimpContainer *undos;
+};
+
+struct _GimpUndoStackClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType           gimp_undo_stack_get_type    (void) G_GNUC_CONST;
+
+GimpUndoStack * gimp_undo_stack_new         (GimpImage           *image);
+
+void            gimp_undo_stack_push_undo   (GimpUndoStack       *stack,
+                                             GimpUndo            *undo);
+GimpUndo      * gimp_undo_stack_pop_undo    (GimpUndoStack       *stack,
+                                             GimpUndoMode         undo_mode,
+                                             GimpUndoAccumulator *accum);
+
+GimpUndo      * gimp_undo_stack_free_bottom (GimpUndoStack       *stack,
+                                             GimpUndoMode         undo_mode);
+GimpUndo      * gimp_undo_stack_peek        (GimpUndoStack       *stack);
+gint            gimp_undo_stack_get_depth   (GimpUndoStack       *stack);
+
+
+#endif /* __GIMP_UNDO_STACK_H__ */
diff --git a/app/core/gimpunit.c b/app/core/gimpunit.c
new file mode 100644
index 0000000..3fad305
--- /dev/null
+++ b/app/core/gimpunit.c
@@ -0,0 +1,305 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpunit.c
+ * Copyright (C) 1999-2000 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains the definition of the size unit objects. The
+ * factor of the units is relative to inches (which have a factor of 1).
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core-types.h"
+
+#include "gimp.h"
+#include "gimpunit.h"
+
+#include "gimp-intl.h"
+
+
+/* internal structures */
+
+typedef struct
+{
+  gboolean  delete_on_exit;
+  gdouble   factor;
+  gint      digits;
+  gchar    *identifier;
+  gchar    *symbol;
+  gchar    *abbreviation;
+  gchar    *singular;
+  gchar    *plural;
+} GimpUnitDef;
+
+
+/*  these are the built-in units
+ */
+static const GimpUnitDef gimp_unit_defs[GIMP_UNIT_END] =
+{
+  /* pseudo unit */
+  { FALSE,  0.0, 0, "pixels",      "px", "px",
+    NC_("unit-singular", "pixel"),      NC_("unit-plural", "pixels")      },
+
+  /* standard units */
+  { FALSE,  1.0, 2, "inches",      "''", "in",
+    NC_("unit-singular", "inch"),       NC_("unit-plural", "inches")      },
+
+  { FALSE, 25.4, 1, "millimeters", "mm", "mm",
+    NC_("unit-singular", "millimeter"), NC_("unit-plural", "millimeters") },
+
+  /* professional units */
+  { FALSE, 72.0, 0, "points",      "pt", "pt",
+    NC_("unit-singular", "point"),      NC_("unit-plural", "points")      },
+
+  { FALSE,  6.0, 1, "picas",       "pc", "pc",
+    NC_("unit-singular", "pica"),       NC_("unit-plural", "picas")       }
+};
+
+/*  not a unit at all but kept here to have the strings in one place
+ */
+static const GimpUnitDef gimp_unit_percent =
+{
+    FALSE,  0.0, 0, "percent",     "%",  "%",
+    NC_("singular", "percent"),    NC_("plural", "percent")
+};
+
+
+/* private functions */
+
+static GimpUnitDef *
+_gimp_unit_get_user_unit (Gimp     *gimp,
+                          GimpUnit  unit)
+{
+  return g_list_nth_data (gimp->user_units, unit - GIMP_UNIT_END);
+}
+
+
+/* public functions */
+
+gint
+_gimp_unit_get_number_of_units (Gimp *gimp)
+{
+  return GIMP_UNIT_END + gimp->n_user_units;
+}
+
+gint
+_gimp_unit_get_number_of_built_in_units (Gimp *gimp)
+{
+  return GIMP_UNIT_END;
+}
+
+GimpUnit
+_gimp_unit_new (Gimp        *gimp,
+                const gchar *identifier,
+                gdouble      factor,
+                gint         digits,
+                const gchar *symbol,
+                const gchar *abbreviation,
+                const gchar *singular,
+                const gchar *plural)
+{
+  GimpUnitDef *user_unit = g_slice_new0 (GimpUnitDef);
+
+  user_unit->delete_on_exit = TRUE;
+  user_unit->factor         = factor;
+  user_unit->digits         = digits;
+  user_unit->identifier     = g_strdup (identifier);
+  user_unit->symbol         = g_strdup (symbol);
+  user_unit->abbreviation   = g_strdup (abbreviation);
+  user_unit->singular       = g_strdup (singular);
+  user_unit->plural         = g_strdup (plural);
+
+  gimp->user_units = g_list_append (gimp->user_units, user_unit);
+  gimp->n_user_units++;
+
+  return GIMP_UNIT_END + gimp->n_user_units - 1;
+}
+
+gboolean
+_gimp_unit_get_deletion_flag (Gimp     *gimp,
+                              GimpUnit  unit)
+{
+  g_return_val_if_fail (unit < (GIMP_UNIT_END + gimp->n_user_units), FALSE);
+
+  if (unit < GIMP_UNIT_END)
+    return FALSE;
+
+  return _gimp_unit_get_user_unit (gimp, unit)->delete_on_exit;
+}
+
+void
+_gimp_unit_set_deletion_flag (Gimp     *gimp,
+                              GimpUnit  unit,
+                              gboolean  deletion_flag)
+{
+  g_return_if_fail ((unit >= GIMP_UNIT_END) &&
+                    (unit < (GIMP_UNIT_END + gimp->n_user_units)));
+
+  _gimp_unit_get_user_unit (gimp, unit)->delete_on_exit =
+    deletion_flag ? TRUE : FALSE;
+}
+
+gdouble
+_gimp_unit_get_factor (Gimp     *gimp,
+                       GimpUnit  unit)
+{
+  g_return_val_if_fail (unit < (GIMP_UNIT_END + gimp->n_user_units) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].factor);
+
+  if (unit < GIMP_UNIT_END)
+    return gimp_unit_defs[unit].factor;
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return gimp_unit_percent.factor;
+
+  return _gimp_unit_get_user_unit (gimp, unit)->factor;
+}
+
+gint
+_gimp_unit_get_digits (Gimp     *gimp,
+                       GimpUnit  unit)
+{
+  g_return_val_if_fail (unit < (GIMP_UNIT_END + gimp->n_user_units) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].digits);
+
+  if (unit < GIMP_UNIT_END)
+    return gimp_unit_defs[unit].digits;
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return gimp_unit_percent.digits;
+
+  return _gimp_unit_get_user_unit (gimp, unit)->digits;
+}
+
+const gchar *
+_gimp_unit_get_identifier (Gimp     *gimp,
+                           GimpUnit  unit)
+{
+  g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].identifier);
+
+  if (unit < GIMP_UNIT_END)
+    return gimp_unit_defs[unit].identifier;
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return gimp_unit_percent.identifier;
+
+  return _gimp_unit_get_user_unit (gimp, unit)->identifier;
+}
+
+const gchar *
+_gimp_unit_get_symbol (Gimp     *gimp,
+                       GimpUnit  unit)
+{
+  g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].symbol);
+
+  if (unit < GIMP_UNIT_END)
+    return gimp_unit_defs[unit].symbol;
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return gimp_unit_percent.symbol;
+
+  return _gimp_unit_get_user_unit (gimp, unit)->symbol;
+}
+
+const gchar *
+_gimp_unit_get_abbreviation (Gimp     *gimp,
+                             GimpUnit  unit)
+{
+  g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].abbreviation);
+
+  if (unit < GIMP_UNIT_END)
+    return gimp_unit_defs[unit].abbreviation;
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return gimp_unit_percent.abbreviation;
+
+  return _gimp_unit_get_user_unit (gimp, unit)->abbreviation;
+}
+
+const gchar *
+_gimp_unit_get_singular (Gimp     *gimp,
+                         GimpUnit  unit)
+{
+  g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].singular);
+
+  if (unit < GIMP_UNIT_END)
+    return g_dpgettext2 (NULL, "unit-singular", gimp_unit_defs[unit].singular);
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return g_dpgettext2 (NULL, "unit-singular", gimp_unit_percent.singular);
+
+  return _gimp_unit_get_user_unit (gimp, unit)->singular;
+}
+
+const gchar *
+_gimp_unit_get_plural (Gimp     *gimp,
+                       GimpUnit  unit)
+{
+  g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) ||
+                        (unit == GIMP_UNIT_PERCENT),
+                        gimp_unit_defs[GIMP_UNIT_INCH].plural);
+
+  if (unit < GIMP_UNIT_END)
+    return g_dpgettext2 (NULL, "unit-plural", gimp_unit_defs[unit].plural);
+
+  if (unit == GIMP_UNIT_PERCENT)
+    return g_dpgettext2 (NULL, "unit-plural", gimp_unit_percent.plural);
+
+  return _gimp_unit_get_user_unit (gimp, unit)->plural;
+}
+
+
+/* The sole purpose of this function is to release the allocated
+ * memory. It must only be used from gimp_units_exit().
+ */
+void
+gimp_user_units_free (Gimp *gimp)
+{
+  GList *list;
+
+  for (list = gimp->user_units; list; list = g_list_next (list))
+    {
+      GimpUnitDef *user_unit = list->data;
+
+      g_free (user_unit->identifier);
+      g_free (user_unit->symbol);
+      g_free (user_unit->abbreviation);
+      g_free (user_unit->singular);
+      g_free (user_unit->plural);
+
+      g_slice_free (GimpUnitDef, user_unit);
+    }
+
+  g_list_free (gimp->user_units);
+  gimp->user_units   = NULL;
+  gimp->n_user_units = 0;
+}
diff --git a/app/core/gimpunit.h b/app/core/gimpunit.h
new file mode 100644
index 0000000..60dbc75
--- /dev/null
+++ b/app/core/gimpunit.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_UNIT_H__
+#define __APP_GIMP_UNIT_H__
+
+
+gint          _gimp_unit_get_number_of_units          (Gimp        *gimp);
+gint          _gimp_unit_get_number_of_built_in_units (Gimp        *gimp) G_GNUC_CONST;
+
+GimpUnit      _gimp_unit_new                          (Gimp        *gimp,
+                                                       const gchar *identifier,
+                                                       gdouble      factor,
+                                                       gint         digits,
+                                                       const gchar *symbol,
+                                                       const gchar *abbreviation,
+                                                       const gchar *singular,
+                                                       const gchar *plural);
+
+gboolean      _gimp_unit_get_deletion_flag            (Gimp        *gimp,
+                                                       GimpUnit     unit);
+void          _gimp_unit_set_deletion_flag            (Gimp        *gimp,
+                                                       GimpUnit     unit,
+                                                       gboolean     deletion_flag);
+
+gdouble       _gimp_unit_get_factor                   (Gimp        *gimp,
+                                                       GimpUnit     unit);
+
+gint          _gimp_unit_get_digits                   (Gimp        *gimp,
+                                                       GimpUnit     unit);
+
+const gchar * _gimp_unit_get_identifier               (Gimp        *gimp,
+                                                       GimpUnit     unit);
+
+const gchar * _gimp_unit_get_symbol                   (Gimp        *gimp,
+                                                       GimpUnit     unit);
+const gchar * _gimp_unit_get_abbreviation             (Gimp        *gimp,
+                                                       GimpUnit     unit);
+const gchar * _gimp_unit_get_singular                 (Gimp        *gimp,
+                                                       GimpUnit     unit);
+const gchar * _gimp_unit_get_plural                   (Gimp        *gimp,
+                                                       GimpUnit     unit);
+
+void           gimp_user_units_free                   (Gimp        *gimp);
+
+
+#endif  /*  __APP_GIMP_UNIT_H__  */
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
new file mode 100644
index 0000000..5b547a2
--- /dev/null
+++ b/app/core/gimpviewable.c
@@ -0,0 +1,1430 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewable.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimp-memsize.h"
+#include "gimpcontainer.h"
+#include "gimpcontext.h"
+#include "gimpmarshal.h"
+#include "gimptempbuf.h"
+#include "gimpviewable.h"
+
+#include "icons/Color/gimp-core-pixbufs.c"
+
+
+enum
+{
+  PROP_0,
+  PROP_STOCK_ID, /* compat */
+  PROP_ICON_NAME,
+  PROP_ICON_PIXBUF,
+  PROP_FROZEN
+};
+
+enum
+{
+  INVALIDATE_PREVIEW,
+  SIZE_CHANGED,
+  EXPANDED_CHANGED,
+  ANCESTRY_CHANGED,
+  LAST_SIGNAL
+};
+
+
+typedef struct _GimpViewablePrivate GimpViewablePrivate;
+
+struct _GimpViewablePrivate
+{
+  gchar        *icon_name;
+  GdkPixbuf    *icon_pixbuf;
+  gint          freeze_count;
+  gboolean      invalidate_pending;
+  gboolean      size_changed_prending;
+  GimpViewable *parent;
+  gint          depth;
+
+  GimpTempBuf  *preview_temp_buf;
+  GdkPixbuf    *preview_pixbuf;
+};
+
+#define GET_PRIVATE(viewable) ((GimpViewablePrivate *) gimp_viewable_get_instance_private ((GimpViewable *) (viewable)))
+
+
+static void    gimp_viewable_config_iface_init (GimpConfigInterface *iface);
+
+static void    gimp_viewable_finalize               (GObject        *object);
+static void    gimp_viewable_set_property           (GObject        *object,
+                                                     guint           property_id,
+                                                     const GValue   *value,
+                                                     GParamSpec     *pspec);
+static void    gimp_viewable_get_property           (GObject        *object,
+                                                     guint           property_id,
+                                                     GValue         *value,
+                                                     GParamSpec     *pspec);
+
+static gint64  gimp_viewable_get_memsize             (GimpObject    *object,
+                                                      gint64        *gui_size);
+
+static void    gimp_viewable_real_invalidate_preview (GimpViewable  *viewable);
+static void    gimp_viewable_real_ancestry_changed   (GimpViewable  *viewable);
+
+static GdkPixbuf * gimp_viewable_real_get_new_pixbuf (GimpViewable  *viewable,
+                                                      GimpContext   *context,
+                                                      gint           width,
+                                                      gint           height);
+static void    gimp_viewable_real_get_preview_size   (GimpViewable  *viewable,
+                                                      gint           size,
+                                                      gboolean       popup,
+                                                      gboolean       dot_for_dot,
+                                                      gint          *width,
+                                                      gint          *height);
+static gboolean gimp_viewable_real_get_popup_size    (GimpViewable  *viewable,
+                                                      gint           width,
+                                                      gint           height,
+                                                      gboolean       dot_for_dot,
+                                                      gint          *popup_width,
+                                                      gint          *popup_height);
+static gchar * gimp_viewable_real_get_description    (GimpViewable  *viewable,
+                                                      gchar        **tooltip);
+static gboolean gimp_viewable_real_is_name_editable  (GimpViewable  *viewable);
+static GimpContainer * gimp_viewable_real_get_children (GimpViewable *viewable);
+
+static gboolean gimp_viewable_serialize_property     (GimpConfig    *config,
+                                                      guint          property_id,
+                                                      const GValue  *value,
+                                                      GParamSpec    *pspec,
+                                                      GimpConfigWriter *writer);
+static gboolean gimp_viewable_deserialize_property   (GimpConfig       *config,
+                                                      guint             property_id,
+                                                      GValue           *value,
+                                                      GParamSpec       *pspec,
+                                                      GScanner         *scanner,
+                                                      GTokenType       *expected);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpViewable, gimp_viewable, GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpViewable)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_viewable_config_iface_init))
+
+#define parent_class gimp_viewable_parent_class
+
+static guint viewable_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_viewable_class_init (GimpViewableClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  viewable_signals[INVALIDATE_PREVIEW] =
+    g_signal_new ("invalidate-preview",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewableClass, invalidate_preview),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  viewable_signals[SIZE_CHANGED] =
+    g_signal_new ("size-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewableClass, size_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  viewable_signals[EXPANDED_CHANGED] =
+    g_signal_new ("expanded-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewableClass, expanded_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  viewable_signals[ANCESTRY_CHANGED] =
+    g_signal_new ("ancestry-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewableClass, ancestry_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize         = gimp_viewable_finalize;
+  object_class->get_property     = gimp_viewable_get_property;
+  object_class->set_property     = gimp_viewable_set_property;
+
+  gimp_object_class->get_memsize = gimp_viewable_get_memsize;
+
+  klass->default_icon_name       = "gimp-question";
+  klass->name_changed_signal     = "name-changed";
+  klass->name_editable           = FALSE;
+
+  klass->invalidate_preview      = gimp_viewable_real_invalidate_preview;
+  klass->size_changed            = NULL;
+  klass->expanded_changed        = NULL;
+  klass->ancestry_changed        = gimp_viewable_real_ancestry_changed;
+
+  klass->get_size                = NULL;
+  klass->get_preview_size        = gimp_viewable_real_get_preview_size;
+  klass->get_popup_size          = gimp_viewable_real_get_popup_size;
+  klass->get_preview             = NULL;
+  klass->get_new_preview         = NULL;
+  klass->get_pixbuf              = NULL;
+  klass->get_new_pixbuf          = gimp_viewable_real_get_new_pixbuf;
+  klass->get_description         = gimp_viewable_real_get_description;
+  klass->is_name_editable        = gimp_viewable_real_is_name_editable;
+  klass->preview_freeze          = NULL;
+  klass->preview_thaw            = NULL;
+  klass->get_children            = gimp_viewable_real_get_children;
+  klass->set_expanded            = NULL;
+  klass->get_expanded            = NULL;
+
+  /* compat property */
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_STOCK_ID, "stock-id",
+                           NULL, NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_ICON_NAME, "icon-name",
+                           NULL, NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_ICON_PIXBUF,
+                           "icon-pixbuf",
+                           NULL, NULL,
+                           GDK_TYPE_PIXBUF,
+                           G_PARAM_CONSTRUCT |
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, PROP_FROZEN,
+                                   g_param_spec_boolean ("frozen",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_viewable_init (GimpViewable *viewable)
+{
+}
+
+static void
+gimp_viewable_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->deserialize_property = gimp_viewable_deserialize_property;
+  iface->serialize_property   = gimp_viewable_serialize_property;
+}
+
+static void
+gimp_viewable_finalize (GObject *object)
+{
+  GimpViewablePrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->icon_name, g_free);
+  g_clear_object (&private->icon_pixbuf);
+  g_clear_pointer (&private->preview_temp_buf, gimp_temp_buf_unref);
+  g_clear_object (&private->preview_pixbuf);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_viewable_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpViewable        *viewable = GIMP_VIEWABLE (object);
+  GimpViewablePrivate *private  = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_STOCK_ID:
+      if (! g_value_get_string (value))
+        break;
+    case PROP_ICON_NAME:
+      gimp_viewable_set_icon_name (viewable, g_value_get_string (value));
+      break;
+    case PROP_ICON_PIXBUF:
+      if (private->icon_pixbuf)
+        g_object_unref (private->icon_pixbuf);
+      private->icon_pixbuf = g_value_dup_object (value);
+      gimp_viewable_invalidate_preview (viewable);
+      break;
+    case PROP_FROZEN:
+      /* read-only, fall through */
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_viewable_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpViewable        *viewable = GIMP_VIEWABLE (object);
+  GimpViewablePrivate *private  = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_STOCK_ID:
+    case PROP_ICON_NAME:
+      g_value_set_string (value, gimp_viewable_get_icon_name (viewable));
+      break;
+    case PROP_ICON_PIXBUF:
+      g_value_set_object (value, private->icon_pixbuf);
+      break;
+    case PROP_FROZEN:
+      g_value_set_boolean (value, gimp_viewable_preview_is_frozen (viewable));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_viewable_get_memsize (GimpObject *object,
+                           gint64     *gui_size)
+{
+  GimpViewablePrivate *private = GET_PRIVATE (object);
+
+  *gui_size += gimp_temp_buf_get_memsize (private->preview_temp_buf);
+
+  if (private->preview_pixbuf)
+    {
+      *gui_size +=
+        (gimp_g_object_get_memsize (G_OBJECT (private->preview_pixbuf)) +
+         (gsize) gdk_pixbuf_get_height (private->preview_pixbuf) *
+         gdk_pixbuf_get_rowstride (private->preview_pixbuf));
+    }
+
+  return GIMP_OBJECT_CLASS (parent_class)->get_memsize (object, gui_size);
+}
+
+static void
+gimp_viewable_real_invalidate_preview (GimpViewable *viewable)
+{
+  GimpViewablePrivate *private = GET_PRIVATE (viewable);
+
+  g_clear_pointer (&private->preview_temp_buf, gimp_temp_buf_unref);
+  g_clear_object (&private->preview_pixbuf);
+}
+
+static void
+gimp_viewable_real_ancestry_changed_propagate (GimpViewable *viewable,
+                                               GimpViewable *parent)
+{
+  GimpViewablePrivate *private = GET_PRIVATE (viewable);
+
+  private->depth = gimp_viewable_get_depth (parent) + 1;
+
+  g_signal_emit (viewable, viewable_signals[ANCESTRY_CHANGED], 0);
+}
+
+static void
+gimp_viewable_real_ancestry_changed (GimpViewable *viewable)
+{
+  GimpContainer *children;
+
+  children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    {
+      gimp_container_foreach (children,
+                              (GFunc) gimp_viewable_real_ancestry_changed_propagate,
+                              viewable);
+    }
+}
+
+static void
+gimp_viewable_real_get_preview_size (GimpViewable *viewable,
+                                     gint          size,
+                                     gboolean      popup,
+                                     gboolean      dot_for_dot,
+                                     gint         *width,
+                                     gint         *height)
+{
+  *width  = size;
+  *height = size;
+}
+
+static gboolean
+gimp_viewable_real_get_popup_size (GimpViewable *viewable,
+                                   gint          width,
+                                   gint          height,
+                                   gboolean      dot_for_dot,
+                                   gint         *popup_width,
+                                   gint         *popup_height)
+{
+  gint w, h;
+
+  if (gimp_viewable_get_size (viewable, &w, &h))
+    {
+      if (w > width || h > height)
+        {
+          *popup_width  = w;
+          *popup_height = h;
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static GdkPixbuf *
+gimp_viewable_real_get_new_pixbuf (GimpViewable *viewable,
+                                   GimpContext  *context,
+                                   gint          width,
+                                   gint          height)
+{
+  GimpViewablePrivate *private = GET_PRIVATE (viewable);
+  GdkPixbuf           *pixbuf  = NULL;
+  GimpTempBuf         *temp_buf;
+
+  temp_buf = gimp_viewable_get_preview (viewable, context, width, height);
+
+  if (temp_buf)
+    {
+      pixbuf = gimp_temp_buf_create_pixbuf (temp_buf);
+    }
+  else if (private->icon_pixbuf)
+    {
+      pixbuf = gdk_pixbuf_scale_simple (private->icon_pixbuf,
+                                        width,
+                                        height,
+                                        GDK_INTERP_BILINEAR);
+    }
+
+  return pixbuf;
+}
+
+static gchar *
+gimp_viewable_real_get_description (GimpViewable  *viewable,
+                                    gchar        **tooltip)
+{
+  return g_strdup (gimp_object_get_name (viewable));
+}
+
+static gboolean
+gimp_viewable_real_is_name_editable (GimpViewable *viewable)
+{
+  return GIMP_VIEWABLE_GET_CLASS (viewable)->name_editable;
+}
+
+static GimpContainer *
+gimp_viewable_real_get_children (GimpViewable *viewable)
+{
+  return NULL;
+}
+
+static gboolean
+gimp_viewable_serialize_property (GimpConfig       *config,
+                                  guint             property_id,
+                                  const GValue     *value,
+                                  GParamSpec       *pspec,
+                                  GimpConfigWriter *writer)
+{
+  GimpViewablePrivate *private = GET_PRIVATE (config);
+
+  switch (property_id)
+    {
+    case PROP_STOCK_ID:
+      return TRUE;
+
+    case PROP_ICON_NAME:
+      if (private->icon_name)
+        {
+          gimp_config_writer_open (writer, pspec->name);
+          gimp_config_writer_string (writer, private->icon_name);
+          gimp_config_writer_close (writer);
+        }
+      return TRUE;
+
+    case PROP_ICON_PIXBUF:
+      {
+        GdkPixbuf *icon_pixbuf = g_value_get_object (value);
+
+        if (icon_pixbuf)
+          {
+            gchar  *pixbuffer;
+            gsize   pixbuffer_size;
+            GError *error = NULL;
+
+            if (gdk_pixbuf_save_to_buffer (icon_pixbuf,
+                                           &pixbuffer,
+                                           &pixbuffer_size,
+                                           "png", &error, NULL))
+              {
+                gchar *pixbuffer_enc;
+
+                pixbuffer_enc = g_base64_encode ((guchar *)pixbuffer,
+                                                 pixbuffer_size);
+                gimp_config_writer_open (writer, "icon-pixbuf");
+                gimp_config_writer_string (writer, pixbuffer_enc);
+                gimp_config_writer_close (writer);
+
+                g_free (pixbuffer_enc);
+                g_free (pixbuffer);
+              }
+          }
+      }
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_viewable_deserialize_property (GimpConfig *config,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec,
+                                    GScanner   *scanner,
+                                    GTokenType *expected)
+{
+  switch (property_id)
+    {
+    case PROP_ICON_PIXBUF:
+      {
+        GdkPixbuf *icon_pixbuf = NULL;
+        gchar     *encoded_image;
+
+        if (! gimp_scanner_parse_string (scanner, &encoded_image))
+          {
+            *expected = G_TOKEN_STRING;
+            return TRUE;
+          }
+
+        if (encoded_image && strlen (encoded_image) > 0)
+          {
+            gsize   out_len;
+            guchar *decoded_image = g_base64_decode (encoded_image, &out_len);
+
+            if (decoded_image)
+              {
+                GInputStream *stream;
+
+                stream = g_memory_input_stream_new_from_data (decoded_image,
+                                                              out_len, NULL);
+                icon_pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL);
+                g_object_unref (stream);
+
+                g_free (decoded_image);
+              }
+          }
+
+        g_free (encoded_image);
+
+        g_value_take_object (value, icon_pixbuf);
+      }
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_viewable_invalidate_preview:
+ * @viewable: a viewable object
+ *
+ * Causes any cached preview to be marked as invalid, so that a new
+ * preview will be generated at the next attempt to display one.
+ **/
+void
+gimp_viewable_invalidate_preview (GimpViewable *viewable)
+{
+  GimpViewablePrivate *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GET_PRIVATE (viewable);
+
+  if (private->freeze_count == 0)
+    g_signal_emit (viewable, viewable_signals[INVALIDATE_PREVIEW], 0);
+  else
+    private->invalidate_pending = TRUE;
+}
+
+/**
+ * gimp_viewable_size_changed:
+ * @viewable: a viewable object
+ *
+ * This function sends a signal that is handled at a lower level in the
+ * object hierarchy, and provides a mechanism by which objects derived
+ * from #GimpViewable can respond to size changes.
+ **/
+void
+gimp_viewable_size_changed (GimpViewable *viewable)
+{
+  GimpViewablePrivate *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GET_PRIVATE (viewable);
+
+  if (private->freeze_count == 0)
+    g_signal_emit (viewable, viewable_signals[SIZE_CHANGED], 0);
+  else
+    private->size_changed_prending = TRUE;
+}
+
+/**
+ * gimp_viewable_expanded_changed:
+ * @viewable: a viewable object
+ *
+ * This function sends a signal that is handled at a lower level in the
+ * object hierarchy, and provides a mechanism by which objects derived
+ * from #GimpViewable can respond to expanded state changes.
+ **/
+void
+gimp_viewable_expanded_changed (GimpViewable *viewable)
+{
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  g_signal_emit (viewable, viewable_signals[EXPANDED_CHANGED], 0);
+}
+
+/**
+ * gimp_viewable_calc_preview_size:
+ * @aspect_width:   unscaled width of the preview for an item.
+ * @aspect_height:  unscaled height of the preview for an item.
+ * @width:          maximum available width for scaled preview.
+ * @height:         maximum available height for scaled preview.
+ * @dot_for_dot:    if #TRUE, ignore any differences in axis resolution.
+ * @xresolution:    resolution in the horizontal direction.
+ * @yresolution:    resolution in the vertical direction.
+ * @return_width:   place to return the calculated preview width.
+ * @return_height:  place to return the calculated preview height.
+ * @scaling_up:     returns #TRUE here if the calculated preview size
+ *                  is larger than the viewable itself.
+ *
+ * A utility function, for calculating the dimensions of a preview
+ * based on the information specified in the arguments.  The arguments
+ * @aspect_width and @aspect_height are the dimensions of the unscaled
+ * preview.  The arguments @width and @height represent the maximum
+ * width and height that the scaled preview must fit into. The
+ * preview is scaled to be as large as possible without exceeding
+ * these constraints.
+ *
+ * If @dot_for_dot is #TRUE, and @xresolution and @yresolution are
+ * different, then these results are corrected for the difference in
+ * resolution on the two axes, so that the requested aspect ratio
+ * applies to the appearance of the display rather than to pixel
+ * counts.
+ **/
+void
+gimp_viewable_calc_preview_size (gint       aspect_width,
+                                 gint       aspect_height,
+                                 gint       width,
+                                 gint       height,
+                                 gboolean   dot_for_dot,
+                                 gdouble    xresolution,
+                                 gdouble    yresolution,
+                                 gint      *return_width,
+                                 gint      *return_height,
+                                 gboolean  *scaling_up)
+{
+  gdouble xratio;
+  gdouble yratio;
+
+  if (aspect_width > aspect_height)
+    {
+      xratio = yratio = (gdouble) width / (gdouble) aspect_width;
+    }
+  else
+    {
+      xratio = yratio = (gdouble) height / (gdouble) aspect_height;
+    }
+
+  if (! dot_for_dot && xresolution != yresolution)
+    {
+      yratio *= xresolution / yresolution;
+    }
+
+  width  = RINT (xratio * (gdouble) aspect_width);
+  height = RINT (yratio * (gdouble) aspect_height);
+
+  if (width  < 1) width  = 1;
+  if (height < 1) height = 1;
+
+  if (return_width)  *return_width  = width;
+  if (return_height) *return_height = height;
+  if (scaling_up)    *scaling_up    = (xratio > 1.0) || (yratio > 1.0);
+}
+
+gboolean
+gimp_viewable_get_size (GimpViewable  *viewable,
+                        gint          *width,
+                        gint          *height)
+{
+  GimpViewableClass *viewable_class;
+  gboolean           retval = FALSE;
+  gint               w      = 0;
+  gint               h      = 0;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  viewable_class = GIMP_VIEWABLE_GET_CLASS (viewable);
+
+  if (viewable_class->get_size)
+    retval = viewable_class->get_size (viewable, &w, &h);
+
+  if (width)  *width  = w;
+  if (height) *height = h;
+
+  return retval;
+}
+
+/**
+ * gimp_viewable_get_preview_size:
+ * @viewable:    the object for which to calculate the preview size.
+ * @size:        requested size for preview.
+ * @popup:       %TRUE if the preview is intended for a popup window.
+ * @dot_for_dot: If #TRUE, ignore any differences in X and Y resolution.
+ * @width:       return location for the the calculated width.
+ * @height:      return location for the calculated height.
+ *
+ * Retrieve the size of a viewable's preview.  By default, this
+ * simply returns the value of the @size argument for both the @width
+ * and @height, but this can be overridden in objects derived from
+ * #GimpViewable.  If either the width or height exceeds
+ * #GIMP_VIEWABLE_MAX_PREVIEW_SIZE, they are silently truncated.
+ **/
+void
+gimp_viewable_get_preview_size (GimpViewable *viewable,
+                                gint          size,
+                                gboolean      popup,
+                                gboolean      dot_for_dot,
+                                gint         *width,
+                                gint         *height)
+{
+  gint w, h;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+  g_return_if_fail (size > 0);
+
+  GIMP_VIEWABLE_GET_CLASS (viewable)->get_preview_size (viewable, size,
+                                                        popup, dot_for_dot,
+                                                        &w, &h);
+
+  w = MIN (w, GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+  h = MIN (h, GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+
+  if (width)  *width  = w;
+  if (height) *height = h;
+
+}
+
+/**
+ * gimp_viewable_get_popup_size:
+ * @viewable:     the object for which to calculate the popup size.
+ * @width:        the width of the preview from which the popup will be shown.
+ * @height:       the height of the preview from which the popup will be shown.
+ * @dot_for_dot:  If #TRUE, ignore any differences in X and Y resolution.
+ * @popup_width:  return location for the calculated popup width.
+ * @popup_height: return location for the calculated popup height.
+ *
+ * Calculate the size of a viewable's preview, for use in making a
+ * popup. The arguments @width and @height specify the size of the
+ * preview from which the popup will be shown.
+ *
+ * Returns: Whether the viewable wants a popup to be shown. Usually
+ *          %TRUE if the passed preview size is smaller than the viewable
+ *          size, and %FALSE if the viewable completely fits into the
+ *          original preview.
+ **/
+gboolean
+gimp_viewable_get_popup_size (GimpViewable *viewable,
+                              gint          width,
+                              gint          height,
+                              gboolean      dot_for_dot,
+                              gint         *popup_width,
+                              gint         *popup_height)
+{
+  gint w, h;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  if (GIMP_VIEWABLE_GET_CLASS (viewable)->get_popup_size (viewable,
+                                                          width, height,
+                                                          dot_for_dot,
+                                                          &w, &h))
+    {
+      if (w < 1) w = 1;
+      if (h < 1) h = 1;
+
+      /*  limit the popup to 2 * GIMP_VIEWABLE_MAX_POPUP_SIZE
+       *  on each axis.
+       */
+      if ((w > (2 * GIMP_VIEWABLE_MAX_POPUP_SIZE)) ||
+          (h > (2 * GIMP_VIEWABLE_MAX_POPUP_SIZE)))
+        {
+          gimp_viewable_calc_preview_size (w, h,
+                                           2 * GIMP_VIEWABLE_MAX_POPUP_SIZE,
+                                           2 * GIMP_VIEWABLE_MAX_POPUP_SIZE,
+                                           dot_for_dot, 1.0, 1.0,
+                                           &w, &h, NULL);
+        }
+
+      /*  limit the number of pixels to
+       *  GIMP_VIEWABLE_MAX_POPUP_SIZE ^ 2
+       */
+      if ((w * h) > SQR (GIMP_VIEWABLE_MAX_POPUP_SIZE))
+        {
+          gdouble factor;
+
+          factor = sqrt (((gdouble) (w * h) /
+                          (gdouble) SQR (GIMP_VIEWABLE_MAX_POPUP_SIZE)));
+
+          w = RINT ((gdouble) w / factor);
+          h = RINT ((gdouble) h / factor);
+        }
+
+      if (w < 1) w = 1;
+      if (h < 1) h = 1;
+
+      if (popup_width)  *popup_width  = w;
+      if (popup_height) *popup_height = h;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_viewable_get_preview:
+ * @viewable: The viewable object to get a preview for.
+ * @context:  The context to render the preview for.
+ * @width:    desired width for the preview
+ * @height:   desired height for the preview
+ *
+ * Gets a preview for a viewable object, by running through a variety
+ * of methods until it finds one that works.  First, if an
+ * implementation exists of a "get_preview" method, it is tried, and
+ * the result is returned if it is not #NULL.  Second, the function
+ * checks to see whether there is a cached preview with the correct
+ * dimensions; if so, it is returned.  If neither of these works, then
+ * the function looks for an implementation of the "get_new_preview"
+ * method, and executes it, caching the result.  If everything fails,
+ * #NULL is returned.
+ *
+ * Returns: A #GimpTempBuf containing the preview image, or #NULL if
+ *          none can be found or created.
+ **/
+GimpTempBuf *
+gimp_viewable_get_preview (GimpViewable *viewable,
+                           GimpContext  *context,
+                           gint          width,
+                           gint          height)
+{
+  GimpViewablePrivate *private;
+  GimpViewableClass   *viewable_class;
+  GimpTempBuf         *temp_buf = NULL;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (width  > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  private = GET_PRIVATE (viewable);
+
+  if (G_UNLIKELY (context == NULL))
+    g_warning ("%s: context is NULL", G_STRFUNC);
+
+  viewable_class = GIMP_VIEWABLE_GET_CLASS (viewable);
+
+  if (viewable_class->get_preview)
+    temp_buf = viewable_class->get_preview (viewable, context, width, height);
+
+  if (temp_buf)
+    return temp_buf;
+
+  if (private->preview_temp_buf)
+    {
+      if (gimp_temp_buf_get_width  (private->preview_temp_buf) == width &&
+          gimp_temp_buf_get_height (private->preview_temp_buf) == height)
+        {
+          return private->preview_temp_buf;
+        }
+
+      g_clear_pointer (&private->preview_temp_buf, gimp_temp_buf_unref);
+    }
+
+  if (viewable_class->get_new_preview)
+    temp_buf = viewable_class->get_new_preview (viewable, context,
+                                                width, height);
+
+  private->preview_temp_buf = temp_buf;
+
+  return temp_buf;
+}
+
+/**
+ * gimp_viewable_get_new_preview:
+ * @viewable: The viewable object to get a preview for.
+ * @width:    desired width for the preview
+ * @height:   desired height for the preview
+ *
+ * Gets a new preview for a viewable object.  Similar to
+ * gimp_viewable_get_preview(), except that it tries things in a
+ * different order, first looking for a "get_new_preview" method, and
+ * then if that fails for a "get_preview" method.  This function does
+ * not look for a cached preview.
+ *
+ * Returns: A #GimpTempBuf containing the preview image, or #NULL if
+ *          none can be found or created.
+ **/
+GimpTempBuf *
+gimp_viewable_get_new_preview (GimpViewable *viewable,
+                               GimpContext  *context,
+                               gint          width,
+                               gint          height)
+{
+  GimpViewableClass *viewable_class;
+  GimpTempBuf       *temp_buf = NULL;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (width  > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  if (G_UNLIKELY (context == NULL))
+    g_warning ("%s: context is NULL", G_STRFUNC);
+
+  viewable_class = GIMP_VIEWABLE_GET_CLASS (viewable);
+
+  if (viewable_class->get_new_preview)
+    temp_buf = viewable_class->get_new_preview (viewable, context,
+                                                width, height);
+
+  if (temp_buf)
+    return temp_buf;
+
+  if (viewable_class->get_preview)
+    temp_buf = viewable_class->get_preview (viewable, context,
+                                            width, height);
+
+  if (temp_buf)
+    return gimp_temp_buf_copy (temp_buf);
+
+  return NULL;
+}
+
+/**
+ * gimp_viewable_get_dummy_preview:
+ * @viewable: viewable object for which to get a dummy preview.
+ * @width:    width of the preview.
+ * @height:   height of the preview.
+ * @bpp:      bytes per pixel for the preview, must be 3 or 4.
+ *
+ * Creates a dummy preview the fits into the specified dimensions,
+ * containing a default "question" symbol.  This function is used to
+ * generate a preview in situations where layer previews have been
+ * disabled in the current Gimp configuration.
+ *
+ * Returns: a #GimpTempBuf containing the preview image.
+ **/
+GimpTempBuf *
+gimp_viewable_get_dummy_preview (GimpViewable *viewable,
+                                 gint          width,
+                                 gint          height,
+                                 const Babl   *format)
+{
+  GdkPixbuf   *pixbuf;
+  GimpTempBuf *buf;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (width  > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+
+  pixbuf = gimp_viewable_get_dummy_pixbuf (viewable, width, height,
+                                           babl_format_has_alpha (format));
+
+  buf = gimp_temp_buf_new_from_pixbuf (pixbuf, format);
+
+  g_object_unref (pixbuf);
+
+  return buf;
+}
+
+/**
+ * gimp_viewable_get_pixbuf:
+ * @viewable: The viewable object to get a pixbuf preview for.
+ * @context:  The context to render the preview for.
+ * @width:    desired width for the preview
+ * @height:   desired height for the preview
+ *
+ * Gets a preview for a viewable object, by running through a variety
+ * of methods until it finds one that works.  First, if an
+ * implementation exists of a "get_pixbuf" method, it is tried, and
+ * the result is returned if it is not #NULL.  Second, the function
+ * checks to see whether there is a cached preview with the correct
+ * dimensions; if so, it is returned.  If neither of these works, then
+ * the function looks for an implementation of the "get_new_pixbuf"
+ * method, and executes it, caching the result.  If everything fails,
+ * #NULL is returned.
+ *
+ * Returns: A #GdkPixbuf containing the preview pixbuf, or #NULL if none can
+ *          be found or created.
+ **/
+GdkPixbuf *
+gimp_viewable_get_pixbuf (GimpViewable *viewable,
+                          GimpContext  *context,
+                          gint          width,
+                          gint          height)
+{
+  GimpViewablePrivate *private;
+  GimpViewableClass   *viewable_class;
+  GdkPixbuf           *pixbuf = NULL;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (width  > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  private = GET_PRIVATE (viewable);
+
+  if (G_UNLIKELY (context == NULL))
+    g_warning ("%s: context is NULL", G_STRFUNC);
+
+  viewable_class = GIMP_VIEWABLE_GET_CLASS (viewable);
+
+  if (viewable_class->get_pixbuf)
+    pixbuf = viewable_class->get_pixbuf (viewable, context, width, height);
+
+  if (pixbuf)
+    return pixbuf;
+
+  if (private->preview_pixbuf)
+    {
+      if (gdk_pixbuf_get_width  (private->preview_pixbuf) == width &&
+          gdk_pixbuf_get_height (private->preview_pixbuf) == height)
+        {
+          return private->preview_pixbuf;
+        }
+
+      g_clear_object (&private->preview_pixbuf);
+    }
+
+  if (viewable_class->get_new_pixbuf)
+    pixbuf = viewable_class->get_new_pixbuf (viewable, context, width, height);
+
+  private->preview_pixbuf = pixbuf;
+
+  return pixbuf;
+}
+
+/**
+ * gimp_viewable_get_new_pixbuf:
+ * @viewable: The viewable object to get a new pixbuf preview for.
+ * @context:  The context to render the preview for.
+ * @width:    desired width for the pixbuf
+ * @height:   desired height for the pixbuf
+ *
+ * Gets a new preview for a viewable object.  Similar to
+ * gimp_viewable_get_pixbuf(), except that it tries things in a
+ * different order, first looking for a "get_new_pixbuf" method, and
+ * then if that fails for a "get_pixbuf" method.  This function does
+ * not look for a cached pixbuf.
+ *
+ * Returns: A #GdkPixbuf containing the preview, or #NULL if none can
+ *          be created.
+ **/
+GdkPixbuf *
+gimp_viewable_get_new_pixbuf (GimpViewable *viewable,
+                              GimpContext  *context,
+                              gint          width,
+                              gint          height)
+{
+  GimpViewableClass *viewable_class;
+  GdkPixbuf         *pixbuf = NULL;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (width  > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  if (G_UNLIKELY (context == NULL))
+    g_warning ("%s: context is NULL", G_STRFUNC);
+
+  viewable_class = GIMP_VIEWABLE_GET_CLASS (viewable);
+
+  if (viewable_class->get_new_pixbuf)
+    pixbuf = viewable_class->get_new_pixbuf (viewable, context, width, height);
+
+  if (pixbuf)
+    return pixbuf;
+
+  if (viewable_class->get_pixbuf)
+    pixbuf = viewable_class->get_pixbuf (viewable, context, width, height);
+
+  if (pixbuf)
+    return gdk_pixbuf_copy (pixbuf);
+
+  return NULL;
+}
+
+/**
+ * gimp_viewable_get_dummy_pixbuf:
+ * @viewable: the viewable object for which to create a dummy representation.
+ * @width:    maximum permitted width for the pixbuf.
+ * @height:   maximum permitted height for the pixbuf.
+ * @bpp:      bytes per pixel for the pixbuf, must equal 3 or 4.
+ *
+ * Creates a pixbuf containing a default "question" symbol, sized to
+ * fit into the specified dimensions.  The depth of the pixbuf must be
+ * 3 or 4 because #GdkPixbuf does not support grayscale.  This
+ * function is used to generate a preview in situations where
+ * previewing has been disabled in the current Gimp configuration.
+ * [Note: this function is currently unused except internally to
+ * #GimpViewable -- consider making it static?]
+ *
+ * Returns: the created #GdkPixbuf.
+ **/
+GdkPixbuf *
+gimp_viewable_get_dummy_pixbuf (GimpViewable  *viewable,
+                                gint           width,
+                                gint           height,
+                                gboolean       with_alpha)
+{
+  GdkPixbuf *icon;
+  GdkPixbuf *pixbuf;
+  GError    *error = NULL;
+  gdouble    ratio;
+  gint       w, h;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (width  > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  icon = gdk_pixbuf_new_from_resource ("/org/gimp/icons/64/gimp-question.png",
+                                       &error);
+  if (! icon)
+    {
+      g_critical ("Failed to create icon image: %s", error->message);
+      g_clear_error (&error);
+      return NULL;
+    }
+
+  w = gdk_pixbuf_get_width (icon);
+  h = gdk_pixbuf_get_height (icon);
+
+  ratio = (gdouble) MIN (width, height) / (gdouble) MAX (w, h);
+  ratio = MIN (ratio, 1.0);
+
+  w = RINT (ratio * (gdouble) w);
+  h = RINT (ratio * (gdouble) h);
+
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, with_alpha, 8, width, height);
+  gdk_pixbuf_fill (pixbuf, 0xffffffff);
+
+  if (w && h)
+    gdk_pixbuf_composite (icon, pixbuf,
+                          (width - w) / 2, (height - h) / 2, w, h,
+                          (width - w) / 2, (height - h) / 2, ratio, ratio,
+                          GDK_INTERP_BILINEAR, 0xFF);
+
+  g_object_unref (icon);
+
+  return pixbuf;
+}
+
+/**
+ * gimp_viewable_get_description:
+ * @viewable: viewable object for which to retrieve a description.
+ * @tooltip:  return location for an optional tooltip string.
+ *
+ * Retrieves a string containing a description of the viewable object,
+ * By default, it simply returns the name of the object, but this can
+ * be overridden by object types that inherit from #GimpViewable.
+ *
+ * Returns: a copy of the description string.  This should be freed
+ *          when it is no longer needed.
+ **/
+gchar *
+gimp_viewable_get_description (GimpViewable  *viewable,
+                               gchar        **tooltip)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+
+  if (tooltip)
+    *tooltip = NULL;
+
+  return GIMP_VIEWABLE_GET_CLASS (viewable)->get_description (viewable,
+                                                              tooltip);
+}
+
+/**
+ * gimp_viewable_is_name_editable:
+ * @viewable: viewable object for which to retrieve a description.
+ *
+ * Returns: whether the viewable's name is editable by the user.
+ **/
+gboolean
+gimp_viewable_is_name_editable (GimpViewable *viewable)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  return GIMP_VIEWABLE_GET_CLASS (viewable)->is_name_editable (viewable);
+}
+
+/**
+ * gimp_viewable_get_icon_name:
+ * @viewable: viewable object for which to retrieve a icon name.
+ *
+ * Gets the current value of the object's icon name, for use in
+ * constructing an iconic representation of the object.
+ *
+ * Returns: a pointer to the string containing the icon name.  The
+ *          contents must not be altered or freed.
+ **/
+const gchar *
+gimp_viewable_get_icon_name (GimpViewable *viewable)
+{
+  GimpViewablePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+
+  private = GET_PRIVATE (viewable);
+
+  if (private->icon_name)
+    return (const gchar *) private->icon_name;
+
+  return GIMP_VIEWABLE_GET_CLASS (viewable)->default_icon_name;
+}
+
+/**
+ * gimp_viewable_set_icon_name:
+ * @viewable: viewable object to assign the specified icon name.
+ * @icon_name: string containing an icon name identifier.
+ *
+ * Seta the object's icon name, for use in constructing iconic smbols
+ * of the object.  The contents of @icon_name are copied, so you can
+ * free it when you are done with it.
+ **/
+void
+gimp_viewable_set_icon_name (GimpViewable *viewable,
+                             const gchar  *icon_name)
+{
+  GimpViewablePrivate *private;
+  GimpViewableClass   *viewable_class;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GET_PRIVATE (viewable);
+
+  g_clear_pointer (&private->icon_name, g_free);
+
+  viewable_class = GIMP_VIEWABLE_GET_CLASS (viewable);
+
+  if (icon_name)
+    {
+      if (viewable_class->default_icon_name == NULL ||
+          strcmp (icon_name, viewable_class->default_icon_name))
+        private->icon_name = g_strdup (icon_name);
+    }
+
+  gimp_viewable_invalidate_preview (viewable);
+
+  g_object_notify (G_OBJECT (viewable), "icon-name");
+}
+
+void
+gimp_viewable_preview_freeze (GimpViewable *viewable)
+{
+  GimpViewablePrivate *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GET_PRIVATE (viewable);
+
+  private->freeze_count++;
+
+  if (private->freeze_count == 1)
+    {
+      if (GIMP_VIEWABLE_GET_CLASS (viewable)->preview_freeze)
+        GIMP_VIEWABLE_GET_CLASS (viewable)->preview_freeze (viewable);
+
+      g_object_notify (G_OBJECT (viewable), "frozen");
+    }
+}
+
+void
+gimp_viewable_preview_thaw (GimpViewable *viewable)
+{
+  GimpViewablePrivate *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GET_PRIVATE (viewable);
+
+  g_return_if_fail (private->freeze_count > 0);
+
+  private->freeze_count--;
+
+  if (private->freeze_count == 0)
+    {
+      if (private->size_changed_prending)
+        {
+          private->size_changed_prending = FALSE;
+
+          gimp_viewable_size_changed (viewable);
+        }
+
+      if (private->invalidate_pending)
+        {
+          private->invalidate_pending = FALSE;
+
+          gimp_viewable_invalidate_preview (viewable);
+        }
+
+      g_object_notify (G_OBJECT (viewable), "frozen");
+
+      if (GIMP_VIEWABLE_GET_CLASS (viewable)->preview_thaw)
+        GIMP_VIEWABLE_GET_CLASS (viewable)->preview_thaw (viewable);
+    }
+}
+
+gboolean
+gimp_viewable_preview_is_frozen (GimpViewable *viewable)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  return GET_PRIVATE (viewable)->freeze_count != 0;
+}
+
+GimpViewable *
+gimp_viewable_get_parent (GimpViewable *viewable)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+
+  return GET_PRIVATE (viewable)->parent;
+}
+
+void
+gimp_viewable_set_parent (GimpViewable *viewable,
+                          GimpViewable *parent)
+{
+  GimpViewablePrivate *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+  g_return_if_fail (parent == NULL || GIMP_IS_VIEWABLE (parent));
+
+  private = GET_PRIVATE (viewable);
+
+  if (parent != private->parent)
+    {
+      private->parent = parent;
+      private->depth  = parent ? gimp_viewable_get_depth (parent) + 1 : 0;
+
+      g_signal_emit (viewable, viewable_signals[ANCESTRY_CHANGED], 0);
+    }
+}
+
+gint
+gimp_viewable_get_depth (GimpViewable *viewable)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), 0);
+
+  return GET_PRIVATE (viewable)->depth;
+}
+
+GimpContainer *
+gimp_viewable_get_children (GimpViewable *viewable)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+
+  return GIMP_VIEWABLE_GET_CLASS (viewable)->get_children (viewable);
+}
+
+gboolean
+gimp_viewable_get_expanded (GimpViewable *viewable)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  if (GIMP_VIEWABLE_GET_CLASS (viewable)->get_expanded)
+    return GIMP_VIEWABLE_GET_CLASS (viewable)->get_expanded (viewable);
+
+  return FALSE;
+}
+
+void
+gimp_viewable_set_expanded (GimpViewable *viewable,
+                            gboolean       expanded)
+{
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  if (GIMP_VIEWABLE_GET_CLASS (viewable)->set_expanded)
+    GIMP_VIEWABLE_GET_CLASS (viewable)->set_expanded (viewable, expanded);
+}
+
+gboolean
+gimp_viewable_is_ancestor (GimpViewable *ancestor,
+                           GimpViewable *descendant)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (ancestor), FALSE);
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (descendant), FALSE);
+
+  while (descendant)
+    {
+      GimpViewable *parent = gimp_viewable_get_parent (descendant);
+
+      if (parent == ancestor)
+        return TRUE;
+
+      descendant = parent;
+    }
+
+  return FALSE;
+}
diff --git a/app/core/gimpviewable.h b/app/core/gimpviewable.h
new file mode 100644
index 0000000..249750e
--- /dev/null
+++ b/app/core/gimpviewable.h
@@ -0,0 +1,201 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewable.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEWABLE_H__
+#define __GIMP_VIEWABLE_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_VIEWABLE_MAX_PREVIEW_SIZE 2048
+#define GIMP_VIEWABLE_MAX_POPUP_SIZE    256
+#define GIMP_VIEWABLE_MAX_BUTTON_SIZE    64
+#define GIMP_VIEWABLE_MAX_MENU_SIZE      48
+
+
+#define GIMP_TYPE_VIEWABLE            (gimp_viewable_get_type ())
+#define GIMP_VIEWABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEWABLE, GimpViewable))
+#define GIMP_VIEWABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEWABLE, GimpViewableClass))
+#define GIMP_IS_VIEWABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VIEWABLE))
+#define GIMP_IS_VIEWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEWABLE))
+#define GIMP_VIEWABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEWABLE, GimpViewableClass))
+
+
+typedef struct _GimpViewableClass GimpViewableClass;
+
+struct _GimpViewable
+{
+  GimpObject  parent_instance;
+};
+
+struct _GimpViewableClass
+{
+  GimpObjectClass  parent_class;
+
+  const gchar     *default_icon_name;
+  const gchar     *name_changed_signal;
+  gboolean         name_editable;
+
+  /*  signals  */
+  void            (* invalidate_preview) (GimpViewable  *viewable);
+  void            (* size_changed)       (GimpViewable  *viewable);
+  void            (* expanded_changed)   (GimpViewable  *viewable);
+  void            (* ancestry_changed)   (GimpViewable  *viewable);
+
+  /*  virtual functions  */
+  gboolean        (* get_size)           (GimpViewable  *viewable,
+                                          gint          *width,
+                                          gint          *height);
+  void            (* get_preview_size)   (GimpViewable  *viewable,
+                                          gint           size,
+                                          gboolean       is_popup,
+                                          gboolean       dot_for_dot,
+                                          gint          *width,
+                                          gint          *height);
+  gboolean        (* get_popup_size)     (GimpViewable  *viewable,
+                                          gint           width,
+                                          gint           height,
+                                          gboolean       dot_for_dot,
+                                          gint          *popup_width,
+                                          gint          *popup_height);
+  GimpTempBuf   * (* get_preview)        (GimpViewable  *viewable,
+                                          GimpContext   *context,
+                                          gint           width,
+                                          gint           height);
+  GimpTempBuf   * (* get_new_preview)    (GimpViewable  *viewable,
+                                          GimpContext   *context,
+                                          gint           width,
+                                          gint           height);
+  GdkPixbuf     * (* get_pixbuf)         (GimpViewable  *viewable,
+                                          GimpContext   *context,
+                                          gint           width,
+                                          gint           height);
+  GdkPixbuf     * (* get_new_pixbuf)     (GimpViewable  *viewable,
+                                          GimpContext   *context,
+                                          gint           width,
+                                          gint           height);
+  gchar         * (* get_description)    (GimpViewable  *viewable,
+                                          gchar        **tooltip);
+
+  gboolean        (* is_name_editable)   (GimpViewable  *viewable);
+
+  void            (* preview_freeze)     (GimpViewable  *viewable);
+  void            (* preview_thaw)       (GimpViewable  *viewable);
+
+  GimpContainer * (* get_children)       (GimpViewable  *viewable);
+
+  void            (* set_expanded)       (GimpViewable  *viewable,
+                                          gboolean       expand);
+  gboolean        (* get_expanded)       (GimpViewable  *viewable);
+};
+
+
+GType           gimp_viewable_get_type           (void) G_GNUC_CONST;
+
+void            gimp_viewable_invalidate_preview (GimpViewable  *viewable);
+void            gimp_viewable_size_changed       (GimpViewable  *viewable);
+void            gimp_viewable_expanded_changed   (GimpViewable  *viewable);
+
+void            gimp_viewable_calc_preview_size  (gint           aspect_width,
+                                                  gint           aspect_height,
+                                                  gint           width,
+                                                  gint           height,
+                                                  gboolean       dot_for_dot,
+                                                  gdouble        xresolution,
+                                                  gdouble        yresolution,
+                                                  gint          *return_width,
+                                                  gint          *return_height,
+                                                  gboolean      *scaling_up);
+
+gboolean        gimp_viewable_get_size           (GimpViewable  *viewable,
+                                                  gint          *width,
+                                                  gint          *height);
+void            gimp_viewable_get_preview_size   (GimpViewable  *viewable,
+                                                  gint           size,
+                                                  gboolean       popup,
+                                                  gboolean       dot_for_dot,
+                                                  gint          *width,
+                                                  gint          *height);
+gboolean        gimp_viewable_get_popup_size     (GimpViewable  *viewable,
+                                                  gint           width,
+                                                  gint           height,
+                                                  gboolean       dot_for_dot,
+                                                  gint          *popup_width,
+                                                  gint          *popup_height);
+
+GimpTempBuf   * gimp_viewable_get_preview        (GimpViewable  *viewable,
+                                                  GimpContext   *context,
+                                                  gint           width,
+                                                  gint           height);
+GimpTempBuf   * gimp_viewable_get_new_preview    (GimpViewable  *viewable,
+                                                  GimpContext   *context,
+                                                  gint           width,
+                                                  gint           height);
+
+GimpTempBuf   * gimp_viewable_get_dummy_preview  (GimpViewable  *viewable,
+                                                  gint           width,
+                                                  gint           height,
+                                                  const Babl    *format);
+
+GdkPixbuf     * gimp_viewable_get_pixbuf         (GimpViewable  *viewable,
+                                                  GimpContext   *context,
+                                                  gint           width,
+                                                  gint           height);
+GdkPixbuf     * gimp_viewable_get_new_pixbuf     (GimpViewable  *viewable,
+                                                  GimpContext   *context,
+                                                  gint           width,
+                                                  gint           height);
+
+GdkPixbuf     * gimp_viewable_get_dummy_pixbuf   (GimpViewable  *viewable,
+                                                  gint           width,
+                                                  gint           height,
+                                                  gboolean       with_alpha);
+
+gchar         * gimp_viewable_get_description    (GimpViewable  *viewable,
+                                                  gchar        **tooltip);
+
+gboolean        gimp_viewable_is_name_editable   (GimpViewable  *viewable);
+
+const gchar   * gimp_viewable_get_icon_name      (GimpViewable  *viewable);
+void            gimp_viewable_set_icon_name      (GimpViewable  *viewable,
+                                                  const gchar   *icon_name);
+
+void            gimp_viewable_preview_freeze     (GimpViewable  *viewable);
+void            gimp_viewable_preview_thaw       (GimpViewable  *viewable);
+gboolean        gimp_viewable_preview_is_frozen  (GimpViewable  *viewable);
+
+GimpViewable  * gimp_viewable_get_parent         (GimpViewable  *viewable);
+void            gimp_viewable_set_parent         (GimpViewable  *viewable,
+                                                  GimpViewable  *parent);
+
+gint            gimp_viewable_get_depth          (GimpViewable  *viewable);
+
+GimpContainer * gimp_viewable_get_children       (GimpViewable  *viewable);
+
+gboolean        gimp_viewable_get_expanded       (GimpViewable  *viewable);
+void            gimp_viewable_set_expanded       (GimpViewable  *viewable,
+                                                  gboolean       expanded);
+
+gboolean        gimp_viewable_is_ancestor        (GimpViewable  *ancestor,
+                                                  GimpViewable  *descendant);
+
+
+#endif  /* __GIMP_VIEWABLE_H__ */
diff --git a/app/core/gimpwaitable.c b/app/core/gimpwaitable.c
new file mode 100644
index 0000000..4607f74
--- /dev/null
+++ b/app/core/gimpwaitable.c
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwaitable.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpwaitable.h"
+
+
+G_DEFINE_INTERFACE (GimpWaitable, gimp_waitable, G_TYPE_OBJECT)
+
+
+/*  private functions  */
+
+
+static void
+gimp_waitable_default_init (GimpWaitableInterface *iface)
+{
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_waitable_wait (GimpWaitable *waitable)
+{
+  GimpWaitableInterface *iface;
+
+  g_return_if_fail (GIMP_IS_WAITABLE (waitable));
+
+  iface = GIMP_WAITABLE_GET_INTERFACE (waitable);
+
+  if (iface->wait)
+    iface->wait (waitable);
+}
+
+gboolean
+gimp_waitable_try_wait (GimpWaitable *waitable)
+{
+  GimpWaitableInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_WAITABLE (waitable), FALSE);
+
+  iface = GIMP_WAITABLE_GET_INTERFACE (waitable);
+
+  if (iface->try_wait)
+    {
+      return iface->try_wait (waitable);
+    }
+  else
+    {
+      gimp_waitable_wait (waitable);
+
+      return TRUE;
+    }
+}
+
+gboolean
+gimp_waitable_wait_until (GimpWaitable *waitable,
+                          gint64        end_time)
+{
+  GimpWaitableInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_WAITABLE (waitable), FALSE);
+
+  iface = GIMP_WAITABLE_GET_INTERFACE (waitable);
+
+  if (iface->wait_until)
+    {
+      return iface->wait_until (waitable, end_time);
+    }
+  else
+    {
+      gimp_waitable_wait (waitable);
+
+      return TRUE;
+    }
+}
+
+gboolean
+gimp_waitable_wait_for (GimpWaitable *waitable,
+                        gint64        wait_duration)
+{
+  g_return_val_if_fail (GIMP_IS_WAITABLE (waitable), FALSE);
+
+  if (wait_duration <= 0)
+    {
+      return gimp_waitable_try_wait (waitable);
+    }
+  else
+    {
+      return gimp_waitable_wait_until (waitable,
+                                       g_get_monotonic_time () + wait_duration);
+    }
+}
diff --git a/app/core/gimpwaitable.h b/app/core/gimpwaitable.h
new file mode 100644
index 0000000..b85bece
--- /dev/null
+++ b/app/core/gimpwaitable.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpwaitable.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_WAITABLE_H__
+#define __GIMP_WAITABLE_H__
+
+
+#define GIMP_TYPE_WAITABLE               (gimp_waitable_get_type ())
+#define GIMP_IS_WAITABLE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_WAITABLE))
+#define GIMP_WAITABLE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WAITABLE, GimpWaitable))
+#define GIMP_WAITABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_WAITABLE, GimpWaitableInterface))
+
+
+typedef struct _GimpWaitableInterface GimpWaitableInterface;
+
+struct _GimpWaitableInterface
+{
+  GTypeInterface base_iface;
+
+  /*  virtual functions  */
+  void       (* wait)       (GimpWaitable *waitable);
+  gboolean   (* try_wait)   (GimpWaitable *waitable);
+  gboolean   (* wait_until) (GimpWaitable *waitable,
+                             gint64        end_time);
+};
+
+
+GType      gimp_waitable_get_type   (void) G_GNUC_CONST;
+
+void       gimp_waitable_wait       (GimpWaitable *waitable);
+gboolean   gimp_waitable_try_wait   (GimpWaitable *waitable);
+gboolean   gimp_waitable_wait_until (GimpWaitable *waitable,
+                                     gint64        end_time);
+gboolean   gimp_waitable_wait_for   (GimpWaitable *waitable,
+                                     gint64        wait_duration);
+
+
+#endif  /* __GIMP_WAITABLE_H__ */
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
new file mode 100644
index 0000000..a8d0768
--- /dev/null
+++ b/app/dialogs/Makefile.am
@@ -0,0 +1,120 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Dialogs\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappdialogs.a
+
+libappdialogs_a_sources = \
+	dialogs-types.h			\
+	dialogs.c			\
+	dialogs.h			\
+	dialogs-constructors.c		\
+	dialogs-constructors.h		\
+	\
+	about-dialog.c			\
+	about-dialog.h			\
+	action-search-dialog.c		\
+	action-search-dialog.h		\
+	channel-options-dialog.c	\
+	channel-options-dialog.h	\
+	color-profile-dialog.c		\
+	color-profile-dialog.h		\
+	color-profile-import-dialog.c	\
+	color-profile-import-dialog.h	\
+	convert-indexed-dialog.c	\
+	convert-indexed-dialog.h	\
+	convert-precision-dialog.c	\
+	convert-precision-dialog.h	\
+	data-delete-dialog.c		\
+	data-delete-dialog.h		\
+	file-open-dialog.c		\
+	file-open-dialog.h		\
+	file-open-location-dialog.c	\
+	file-open-location-dialog.h	\
+	file-save-dialog.c		\
+	file-save-dialog.h		\
+	fill-dialog.c			\
+	fill-dialog.h			\
+	grid-dialog.h                   \
+	grid-dialog.c                   \
+	image-merge-layers-dialog.c	\
+	image-merge-layers-dialog.h	\
+	image-new-dialog.c		\
+	image-new-dialog.h		\
+	image-properties-dialog.c	\
+	image-properties-dialog.h	\
+	image-scale-dialog.c		\
+	image-scale-dialog.h		\
+	input-devices-dialog.c		\
+	input-devices-dialog.h		\
+	item-options-dialog.c		\
+	item-options-dialog.h		\
+	keyboard-shortcuts-dialog.c	\
+	keyboard-shortcuts-dialog.h	\
+	layer-add-mask-dialog.c		\
+	layer-add-mask-dialog.h		\
+	layer-options-dialog.c		\
+	layer-options-dialog.h		\
+	lebl-dialog.c			\
+	lebl-dialog.h			\
+	module-dialog.c			\
+	module-dialog.h			\
+	palette-import-dialog.c		\
+	palette-import-dialog.h		\
+	preferences-dialog.c		\
+	preferences-dialog.h		\
+	preferences-dialog-utils.c	\
+	preferences-dialog-utils.h	\
+	print-size-dialog.c		\
+	print-size-dialog.h		\
+	quit-dialog.c			\
+	quit-dialog.h			\
+	resize-dialog.c			\
+	resize-dialog.h			\
+	resolution-calibrate-dialog.c	\
+	resolution-calibrate-dialog.h	\
+	scale-dialog.c			\
+	scale-dialog.h			\
+	stroke-dialog.c			\
+	stroke-dialog.h			\
+	template-options-dialog.c	\
+	template-options-dialog.h	\
+	tips-dialog.c			\
+	tips-dialog.h			\
+	tips-parser.c			\
+	tips-parser.h			\
+	user-install-dialog.c		\
+	user-install-dialog.h		\
+	vectors-export-dialog.c		\
+	vectors-export-dialog.h		\
+	vectors-import-dialog.c		\
+	vectors-import-dialog.h		\
+	vectors-options-dialog.c	\
+	vectors-options-dialog.h
+
+libappdialogs_a_built_sources = \
+	authors.h
+
+libappdialogs_a_SOURCES = \
+	$(libappdialogs_a_built_sources) $(libappdialogs_a_sources)
+
+EXTRA_DIST = \
+	authors.xsl
+
+
+$(srcdir)/about-dialog.c: authors.h
+
+authors.h: $(top_srcdir)/authors.xml $(srcdir)/authors.xsl
+if HAVE_XSLTPROC
+	$(XSLTPROC) $(srcdir)/authors.xsl $< > $(@) || rm -f $(@)
+else
+	@echo "*** xsltproc is required to regenerate $(@) ***"; exit 1;
+endif
diff --git a/app/dialogs/Makefile.in b/app/dialogs/Makefile.in
new file mode 100644
index 0000000..e3cad86
--- /dev/null
+++ b/app/dialogs/Makefile.in
@@ -0,0 +1,1197 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/dialogs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappdialogs_a_AR = $(AR) $(ARFLAGS)
+libappdialogs_a_LIBADD =
+am__objects_1 =
+am__objects_2 = dialogs.$(OBJEXT) dialogs-constructors.$(OBJEXT) \
+	about-dialog.$(OBJEXT) action-search-dialog.$(OBJEXT) \
+	channel-options-dialog.$(OBJEXT) \
+	color-profile-dialog.$(OBJEXT) \
+	color-profile-import-dialog.$(OBJEXT) \
+	convert-indexed-dialog.$(OBJEXT) \
+	convert-precision-dialog.$(OBJEXT) \
+	data-delete-dialog.$(OBJEXT) file-open-dialog.$(OBJEXT) \
+	file-open-location-dialog.$(OBJEXT) file-save-dialog.$(OBJEXT) \
+	fill-dialog.$(OBJEXT) grid-dialog.$(OBJEXT) \
+	image-merge-layers-dialog.$(OBJEXT) image-new-dialog.$(OBJEXT) \
+	image-properties-dialog.$(OBJEXT) image-scale-dialog.$(OBJEXT) \
+	input-devices-dialog.$(OBJEXT) item-options-dialog.$(OBJEXT) \
+	keyboard-shortcuts-dialog.$(OBJEXT) \
+	layer-add-mask-dialog.$(OBJEXT) layer-options-dialog.$(OBJEXT) \
+	lebl-dialog.$(OBJEXT) module-dialog.$(OBJEXT) \
+	palette-import-dialog.$(OBJEXT) preferences-dialog.$(OBJEXT) \
+	preferences-dialog-utils.$(OBJEXT) print-size-dialog.$(OBJEXT) \
+	quit-dialog.$(OBJEXT) resize-dialog.$(OBJEXT) \
+	resolution-calibrate-dialog.$(OBJEXT) scale-dialog.$(OBJEXT) \
+	stroke-dialog.$(OBJEXT) template-options-dialog.$(OBJEXT) \
+	tips-dialog.$(OBJEXT) tips-parser.$(OBJEXT) \
+	user-install-dialog.$(OBJEXT) vectors-export-dialog.$(OBJEXT) \
+	vectors-import-dialog.$(OBJEXT) \
+	vectors-options-dialog.$(OBJEXT)
+am_libappdialogs_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappdialogs_a_OBJECTS = $(am_libappdialogs_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/about-dialog.Po \
+	./$(DEPDIR)/action-search-dialog.Po \
+	./$(DEPDIR)/channel-options-dialog.Po \
+	./$(DEPDIR)/color-profile-dialog.Po \
+	./$(DEPDIR)/color-profile-import-dialog.Po \
+	./$(DEPDIR)/convert-indexed-dialog.Po \
+	./$(DEPDIR)/convert-precision-dialog.Po \
+	./$(DEPDIR)/data-delete-dialog.Po \
+	./$(DEPDIR)/dialogs-constructors.Po ./$(DEPDIR)/dialogs.Po \
+	./$(DEPDIR)/file-open-dialog.Po \
+	./$(DEPDIR)/file-open-location-dialog.Po \
+	./$(DEPDIR)/file-save-dialog.Po ./$(DEPDIR)/fill-dialog.Po \
+	./$(DEPDIR)/grid-dialog.Po \
+	./$(DEPDIR)/image-merge-layers-dialog.Po \
+	./$(DEPDIR)/image-new-dialog.Po \
+	./$(DEPDIR)/image-properties-dialog.Po \
+	./$(DEPDIR)/image-scale-dialog.Po \
+	./$(DEPDIR)/input-devices-dialog.Po \
+	./$(DEPDIR)/item-options-dialog.Po \
+	./$(DEPDIR)/keyboard-shortcuts-dialog.Po \
+	./$(DEPDIR)/layer-add-mask-dialog.Po \
+	./$(DEPDIR)/layer-options-dialog.Po ./$(DEPDIR)/lebl-dialog.Po \
+	./$(DEPDIR)/module-dialog.Po \
+	./$(DEPDIR)/palette-import-dialog.Po \
+	./$(DEPDIR)/preferences-dialog-utils.Po \
+	./$(DEPDIR)/preferences-dialog.Po \
+	./$(DEPDIR)/print-size-dialog.Po ./$(DEPDIR)/quit-dialog.Po \
+	./$(DEPDIR)/resize-dialog.Po \
+	./$(DEPDIR)/resolution-calibrate-dialog.Po \
+	./$(DEPDIR)/scale-dialog.Po ./$(DEPDIR)/stroke-dialog.Po \
+	./$(DEPDIR)/template-options-dialog.Po \
+	./$(DEPDIR)/tips-dialog.Po ./$(DEPDIR)/tips-parser.Po \
+	./$(DEPDIR)/user-install-dialog.Po \
+	./$(DEPDIR)/vectors-export-dialog.Po \
+	./$(DEPDIR)/vectors-import-dialog.Po \
+	./$(DEPDIR)/vectors-options-dialog.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappdialogs_a_SOURCES)
+DIST_SOURCES = $(libappdialogs_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Dialogs\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappdialogs.a
+libappdialogs_a_sources = \
+	dialogs-types.h			\
+	dialogs.c			\
+	dialogs.h			\
+	dialogs-constructors.c		\
+	dialogs-constructors.h		\
+	\
+	about-dialog.c			\
+	about-dialog.h			\
+	action-search-dialog.c		\
+	action-search-dialog.h		\
+	channel-options-dialog.c	\
+	channel-options-dialog.h	\
+	color-profile-dialog.c		\
+	color-profile-dialog.h		\
+	color-profile-import-dialog.c	\
+	color-profile-import-dialog.h	\
+	convert-indexed-dialog.c	\
+	convert-indexed-dialog.h	\
+	convert-precision-dialog.c	\
+	convert-precision-dialog.h	\
+	data-delete-dialog.c		\
+	data-delete-dialog.h		\
+	file-open-dialog.c		\
+	file-open-dialog.h		\
+	file-open-location-dialog.c	\
+	file-open-location-dialog.h	\
+	file-save-dialog.c		\
+	file-save-dialog.h		\
+	fill-dialog.c			\
+	fill-dialog.h			\
+	grid-dialog.h                   \
+	grid-dialog.c                   \
+	image-merge-layers-dialog.c	\
+	image-merge-layers-dialog.h	\
+	image-new-dialog.c		\
+	image-new-dialog.h		\
+	image-properties-dialog.c	\
+	image-properties-dialog.h	\
+	image-scale-dialog.c		\
+	image-scale-dialog.h		\
+	input-devices-dialog.c		\
+	input-devices-dialog.h		\
+	item-options-dialog.c		\
+	item-options-dialog.h		\
+	keyboard-shortcuts-dialog.c	\
+	keyboard-shortcuts-dialog.h	\
+	layer-add-mask-dialog.c		\
+	layer-add-mask-dialog.h		\
+	layer-options-dialog.c		\
+	layer-options-dialog.h		\
+	lebl-dialog.c			\
+	lebl-dialog.h			\
+	module-dialog.c			\
+	module-dialog.h			\
+	palette-import-dialog.c		\
+	palette-import-dialog.h		\
+	preferences-dialog.c		\
+	preferences-dialog.h		\
+	preferences-dialog-utils.c	\
+	preferences-dialog-utils.h	\
+	print-size-dialog.c		\
+	print-size-dialog.h		\
+	quit-dialog.c			\
+	quit-dialog.h			\
+	resize-dialog.c			\
+	resize-dialog.h			\
+	resolution-calibrate-dialog.c	\
+	resolution-calibrate-dialog.h	\
+	scale-dialog.c			\
+	scale-dialog.h			\
+	stroke-dialog.c			\
+	stroke-dialog.h			\
+	template-options-dialog.c	\
+	template-options-dialog.h	\
+	tips-dialog.c			\
+	tips-dialog.h			\
+	tips-parser.c			\
+	tips-parser.h			\
+	user-install-dialog.c		\
+	user-install-dialog.h		\
+	vectors-export-dialog.c		\
+	vectors-export-dialog.h		\
+	vectors-import-dialog.c		\
+	vectors-import-dialog.h		\
+	vectors-options-dialog.c	\
+	vectors-options-dialog.h
+
+libappdialogs_a_built_sources = \
+	authors.h
+
+libappdialogs_a_SOURCES = \
+	$(libappdialogs_a_built_sources) $(libappdialogs_a_sources)
+
+EXTRA_DIST = \
+	authors.xsl
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/dialogs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/dialogs/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappdialogs.a: $(libappdialogs_a_OBJECTS) $(libappdialogs_a_DEPENDENCIES) $(EXTRA_libappdialogs_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappdialogs.a
+	$(AM_V_AR)$(libappdialogs_a_AR) libappdialogs.a $(libappdialogs_a_OBJECTS) $(libappdialogs_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappdialogs.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action-search-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel-options-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color-profile-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color-profile-import-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert-indexed-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert-precision-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-delete-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-constructors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-open-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-open-location-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-save-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fill-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-merge-layers-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-new-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-properties-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-scale-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input-devices-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item-options-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard-shortcuts-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer-add-mask-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer-options-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebl-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-import-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences-dialog-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-size-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quit-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resize-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolution-calibrate-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stroke-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template-options-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tips-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tips-parser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user-install-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-export-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-import-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-options-dialog.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/about-dialog.Po
+	-rm -f ./$(DEPDIR)/action-search-dialog.Po
+	-rm -f ./$(DEPDIR)/channel-options-dialog.Po
+	-rm -f ./$(DEPDIR)/color-profile-dialog.Po
+	-rm -f ./$(DEPDIR)/color-profile-import-dialog.Po
+	-rm -f ./$(DEPDIR)/convert-indexed-dialog.Po
+	-rm -f ./$(DEPDIR)/convert-precision-dialog.Po
+	-rm -f ./$(DEPDIR)/data-delete-dialog.Po
+	-rm -f ./$(DEPDIR)/dialogs-constructors.Po
+	-rm -f ./$(DEPDIR)/dialogs.Po
+	-rm -f ./$(DEPDIR)/file-open-dialog.Po
+	-rm -f ./$(DEPDIR)/file-open-location-dialog.Po
+	-rm -f ./$(DEPDIR)/file-save-dialog.Po
+	-rm -f ./$(DEPDIR)/fill-dialog.Po
+	-rm -f ./$(DEPDIR)/grid-dialog.Po
+	-rm -f ./$(DEPDIR)/image-merge-layers-dialog.Po
+	-rm -f ./$(DEPDIR)/image-new-dialog.Po
+	-rm -f ./$(DEPDIR)/image-properties-dialog.Po
+	-rm -f ./$(DEPDIR)/image-scale-dialog.Po
+	-rm -f ./$(DEPDIR)/input-devices-dialog.Po
+	-rm -f ./$(DEPDIR)/item-options-dialog.Po
+	-rm -f ./$(DEPDIR)/keyboard-shortcuts-dialog.Po
+	-rm -f ./$(DEPDIR)/layer-add-mask-dialog.Po
+	-rm -f ./$(DEPDIR)/layer-options-dialog.Po
+	-rm -f ./$(DEPDIR)/lebl-dialog.Po
+	-rm -f ./$(DEPDIR)/module-dialog.Po
+	-rm -f ./$(DEPDIR)/palette-import-dialog.Po
+	-rm -f ./$(DEPDIR)/preferences-dialog-utils.Po
+	-rm -f ./$(DEPDIR)/preferences-dialog.Po
+	-rm -f ./$(DEPDIR)/print-size-dialog.Po
+	-rm -f ./$(DEPDIR)/quit-dialog.Po
+	-rm -f ./$(DEPDIR)/resize-dialog.Po
+	-rm -f ./$(DEPDIR)/resolution-calibrate-dialog.Po
+	-rm -f ./$(DEPDIR)/scale-dialog.Po
+	-rm -f ./$(DEPDIR)/stroke-dialog.Po
+	-rm -f ./$(DEPDIR)/template-options-dialog.Po
+	-rm -f ./$(DEPDIR)/tips-dialog.Po
+	-rm -f ./$(DEPDIR)/tips-parser.Po
+	-rm -f ./$(DEPDIR)/user-install-dialog.Po
+	-rm -f ./$(DEPDIR)/vectors-export-dialog.Po
+	-rm -f ./$(DEPDIR)/vectors-import-dialog.Po
+	-rm -f ./$(DEPDIR)/vectors-options-dialog.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/about-dialog.Po
+	-rm -f ./$(DEPDIR)/action-search-dialog.Po
+	-rm -f ./$(DEPDIR)/channel-options-dialog.Po
+	-rm -f ./$(DEPDIR)/color-profile-dialog.Po
+	-rm -f ./$(DEPDIR)/color-profile-import-dialog.Po
+	-rm -f ./$(DEPDIR)/convert-indexed-dialog.Po
+	-rm -f ./$(DEPDIR)/convert-precision-dialog.Po
+	-rm -f ./$(DEPDIR)/data-delete-dialog.Po
+	-rm -f ./$(DEPDIR)/dialogs-constructors.Po
+	-rm -f ./$(DEPDIR)/dialogs.Po
+	-rm -f ./$(DEPDIR)/file-open-dialog.Po
+	-rm -f ./$(DEPDIR)/file-open-location-dialog.Po
+	-rm -f ./$(DEPDIR)/file-save-dialog.Po
+	-rm -f ./$(DEPDIR)/fill-dialog.Po
+	-rm -f ./$(DEPDIR)/grid-dialog.Po
+	-rm -f ./$(DEPDIR)/image-merge-layers-dialog.Po
+	-rm -f ./$(DEPDIR)/image-new-dialog.Po
+	-rm -f ./$(DEPDIR)/image-properties-dialog.Po
+	-rm -f ./$(DEPDIR)/image-scale-dialog.Po
+	-rm -f ./$(DEPDIR)/input-devices-dialog.Po
+	-rm -f ./$(DEPDIR)/item-options-dialog.Po
+	-rm -f ./$(DEPDIR)/keyboard-shortcuts-dialog.Po
+	-rm -f ./$(DEPDIR)/layer-add-mask-dialog.Po
+	-rm -f ./$(DEPDIR)/layer-options-dialog.Po
+	-rm -f ./$(DEPDIR)/lebl-dialog.Po
+	-rm -f ./$(DEPDIR)/module-dialog.Po
+	-rm -f ./$(DEPDIR)/palette-import-dialog.Po
+	-rm -f ./$(DEPDIR)/preferences-dialog-utils.Po
+	-rm -f ./$(DEPDIR)/preferences-dialog.Po
+	-rm -f ./$(DEPDIR)/print-size-dialog.Po
+	-rm -f ./$(DEPDIR)/quit-dialog.Po
+	-rm -f ./$(DEPDIR)/resize-dialog.Po
+	-rm -f ./$(DEPDIR)/resolution-calibrate-dialog.Po
+	-rm -f ./$(DEPDIR)/scale-dialog.Po
+	-rm -f ./$(DEPDIR)/stroke-dialog.Po
+	-rm -f ./$(DEPDIR)/template-options-dialog.Po
+	-rm -f ./$(DEPDIR)/tips-dialog.Po
+	-rm -f ./$(DEPDIR)/tips-parser.Po
+	-rm -f ./$(DEPDIR)/user-install-dialog.Po
+	-rm -f ./$(DEPDIR)/vectors-export-dialog.Po
+	-rm -f ./$(DEPDIR)/vectors-import-dialog.Po
+	-rm -f ./$(DEPDIR)/vectors-options-dialog.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(srcdir)/about-dialog.c: authors.h
+
+authors.h: $(top_srcdir)/authors.xml $(srcdir)/authors.xsl
+@HAVE_XSLTPROC_TRUE@	$(XSLTPROC) $(srcdir)/authors.xsl $< > $(@) || rm -f $(@)
+@HAVE_XSLTPROC_FALSE@	@echo "*** xsltproc is required to regenerate $(@) ***"; exit 1;
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
new file mode 100644
index 0000000..5db0fc4
--- /dev/null
+++ b/app/dialogs/about-dialog.c
@@ -0,0 +1,879 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "pdb/gimppdb.h"
+
+#include "about.h"
+#include "git-version.h"
+
+#include "about-dialog.h"
+#include "authors.h"
+#include "gimp-update.h"
+#include "gimp-version.h"
+
+#include "gimp-intl.h"
+
+
+/* The first authors are the creators and maintainers, don't shuffle
+ * them
+ */
+#define START_INDEX (G_N_ELEMENTS (creators)    - 1 /*NULL*/ + \
+                     G_N_ELEMENTS (maintainers) - 1 /*NULL*/)
+
+
+typedef struct
+{
+  GtkWidget   *dialog;
+
+  GtkWidget      *update_frame;
+  GimpCoreConfig *config;
+
+  GtkWidget   *anim_area;
+  PangoLayout *layout;
+
+  gint         n_authors;
+  gint         shuffle[G_N_ELEMENTS (authors) - 1];  /* NULL terminated */
+
+  guint        timer;
+
+  gint         index;
+  gint         animstep;
+  gint         textrange[2];
+  gint         state;
+  gboolean     visible;
+} GimpAboutDialog;
+
+
+static void        about_dialog_map           (GtkWidget       *widget,
+                                               GimpAboutDialog *dialog);
+static void        about_dialog_unmap         (GtkWidget       *widget,
+                                               GimpAboutDialog *dialog);
+static GdkPixbuf * about_dialog_load_logo     (void);
+static void        about_dialog_add_animation (GtkWidget       *vbox,
+                                               GimpAboutDialog *dialog);
+static gboolean    about_dialog_anim_expose   (GtkWidget       *widget,
+                                               GdkEventExpose  *event,
+                                               GimpAboutDialog *dialog);
+static void        about_dialog_add_update    (GimpAboutDialog *dialog,
+                                               GimpCoreConfig  *config);
+static void        about_dialog_reshuffle     (GimpAboutDialog *dialog);
+static gboolean    about_dialog_timer         (gpointer         data);
+
+#ifdef GIMP_UNSTABLE
+static void        about_dialog_add_unstable_message
+                                              (GtkWidget       *vbox);
+#endif /* GIMP_UNSTABLE */
+
+static void        about_dialog_last_release_changed
+                                              (GimpCoreConfig   *config,
+                                               const GParamSpec *pspec,
+                                               GimpAboutDialog  *dialog);
+static void        about_dialog_download_clicked
+                                              (GtkButton   *button,
+                                               const gchar *link);
+
+GtkWidget *
+about_dialog_create (GimpCoreConfig *config)
+{
+  static GimpAboutDialog dialog;
+
+  g_return_val_if_fail (GIMP_IS_CORE_CONFIG (config), NULL);
+
+  if (! dialog.dialog)
+    {
+      GtkWidget *widget;
+      GtkWidget *container;
+      GdkPixbuf *pixbuf;
+      GList     *children;
+      gchar     *copyright;
+      gchar     *version;
+
+      dialog.n_authors = G_N_ELEMENTS (authors) - 1;
+      dialog.config    = config;
+
+      pixbuf = about_dialog_load_logo ();
+
+      copyright = g_strdup_printf (GIMP_COPYRIGHT, GIMP_GIT_LAST_COMMIT_YEAR);
+      if (gimp_version_get_revision () > 0)
+        /* Translators: the %s is GIMP version, the %d is the
+         * installer/package revision.
+         * For instance: "2.10.18 (revision 2)"
+         */
+        version = g_strdup_printf (_("%s (revision %d)"), GIMP_VERSION,
+                                   gimp_version_get_revision ());
+      else
+        version = g_strdup (GIMP_VERSION);
+
+      widget = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                             "role",               "gimp-about",
+                             "window-position",    GTK_WIN_POS_CENTER,
+                             "title",              _("About GIMP"),
+                             "program-name",       GIMP_ACRONYM,
+                             "version",            version,
+                             "copyright",          copyright,
+                             "comments",           GIMP_NAME,
+                             "license",            GIMP_LICENSE,
+                             "wrap-license",       TRUE,
+                             "logo",               pixbuf,
+                             "website",            "https://www.gimp.org/",
+                             "website-label",      _("Visit the GIMP website"),
+                             "authors",            authors,
+                             "artists",            artists,
+                             "documenters",        documenters,
+                             /* Translators: insert your names here,
+                                separated by newline */
+                             "translator-credits", _("translator-credits"),
+                             NULL);
+
+      if (pixbuf)
+        g_object_unref (pixbuf);
+
+      g_free (copyright);
+      g_free (version);
+
+      dialog.dialog = widget;
+
+      g_object_add_weak_pointer (G_OBJECT (widget), (gpointer) &dialog.dialog);
+
+      g_signal_connect (widget, "response",
+                        G_CALLBACK (gtk_widget_destroy),
+                        NULL);
+
+      g_signal_connect (widget, "map",
+                        G_CALLBACK (about_dialog_map),
+                        &dialog);
+      g_signal_connect (widget, "unmap",
+                        G_CALLBACK (about_dialog_unmap),
+                        &dialog);
+
+      /*  kids, don't try this at home!  */
+      container = gtk_dialog_get_content_area (GTK_DIALOG (widget));
+      children = gtk_container_get_children (GTK_CONTAINER (container));
+
+      if (GTK_IS_BOX (children->data))
+        {
+          about_dialog_add_animation (children->data, &dialog);
+#ifdef GIMP_UNSTABLE
+          about_dialog_add_unstable_message (children->data);
+#endif /* GIMP_UNSTABLE */
+          about_dialog_add_update (&dialog, config);
+        }
+      else
+        g_warning ("%s: ooops, no box in this container?", G_STRLOC);
+
+      g_list_free (children);
+    }
+
+  gtk_window_present (GTK_WINDOW (dialog.dialog));
+
+  return dialog.dialog;
+}
+
+static void
+about_dialog_map (GtkWidget       *widget,
+                  GimpAboutDialog *dialog)
+{
+  gimp_update_refresh (dialog->config);
+
+  if (dialog->layout && dialog->timer == 0)
+    {
+      dialog->state    = 0;
+      dialog->index    = 0;
+      dialog->animstep = 0;
+      dialog->visible  = FALSE;
+
+      about_dialog_reshuffle (dialog);
+
+      dialog->timer = g_timeout_add (800, about_dialog_timer, dialog);
+    }
+}
+
+static void
+about_dialog_unmap (GtkWidget       *widget,
+                    GimpAboutDialog *dialog)
+{
+  if (dialog->timer)
+    {
+      g_source_remove (dialog->timer);
+      dialog->timer = 0;
+    }
+}
+
+static GdkPixbuf *
+about_dialog_load_logo (void)
+{
+  GdkPixbuf    *pixbuf = NULL;
+  GFile        *file;
+  GInputStream *input;
+
+  file = gimp_data_directory_file ("images",
+#ifdef GIMP_UNSTABLE
+                                   "gimp-devel-logo.png",
+#else
+                                   "gimp-logo.png",
+#endif
+                                   NULL);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, NULL));
+  g_object_unref (file);
+
+  if (input)
+    {
+      pixbuf = gdk_pixbuf_new_from_stream (input, NULL, NULL);
+      g_object_unref (input);
+    }
+
+  return pixbuf;
+}
+
+static void
+about_dialog_add_animation (GtkWidget       *vbox,
+                            GimpAboutDialog *dialog)
+{
+  gint  height;
+
+  dialog->anim_area = gtk_drawing_area_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), dialog->anim_area, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (vbox), dialog->anim_area, 5);
+  gtk_widget_show (dialog->anim_area);
+
+  dialog->layout = gtk_widget_create_pango_layout (dialog->anim_area, NULL);
+  g_object_weak_ref (G_OBJECT (dialog->anim_area),
+                     (GWeakNotify) g_object_unref, dialog->layout);
+
+  pango_layout_get_pixel_size (dialog->layout, NULL, &height);
+
+  gtk_widget_set_size_request (dialog->anim_area, -1, 2 * height);
+
+  g_signal_connect (dialog->anim_area, "expose-event",
+                    G_CALLBACK (about_dialog_anim_expose),
+                    dialog);
+}
+
+static void
+about_dialog_add_update (GimpAboutDialog *dialog,
+                         GimpCoreConfig  *config)
+{
+  GtkWidget *container;
+  GList     *children;
+  GtkWidget *vbox;
+
+  GtkWidget *frame;
+  GtkWidget *box;
+  GtkWidget *box2;
+  GtkWidget *label;
+  GtkWidget *button;
+  GtkWidget *button_image;
+  GtkWidget *button_label;
+  GDateTime *datetime;
+  gchar     *date;
+  gchar     *text;
+
+  if (dialog->update_frame)
+    {
+      gtk_widget_destroy (dialog->update_frame);
+      dialog->update_frame = NULL;
+    }
+
+  /* Get the dialog vbox. */
+  container = gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog));
+  children = gtk_container_get_children (GTK_CONTAINER (container));
+  g_return_if_fail (GTK_IS_BOX (children->data));
+  vbox = children->data;
+  g_list_free (children);
+
+  /* The preferred localized date representation without the time. */
+  datetime = g_date_time_new_from_unix_local (config->last_release_timestamp);
+  date = g_date_time_format (datetime, "%x");
+  g_date_time_unref (datetime);
+
+  /* The update frame. */
+  frame = gtk_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 2);
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box);
+
+  /* Button in the frame. */
+  button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_container_add (GTK_CONTAINER (button), box2);
+  gtk_widget_show (box2);
+
+  button_image = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_DIALOG);
+  gtk_box_pack_start (GTK_BOX (box2), button_image, FALSE, FALSE, 0);
+  gtk_widget_show (button_image);
+
+  button_label = gtk_label_new (NULL);
+  gtk_box_pack_start (GTK_BOX (box2), button_label, FALSE, FALSE, 0);
+  gtk_container_child_set (GTK_CONTAINER (box2), button_label, "expand", TRUE, NULL);
+  gtk_widget_show (button_label);
+
+  if (config->last_known_release != NULL)
+    {
+      /* There is a newer version. */
+      gchar *comment = NULL;
+
+      /* We want the frame to stand out. */
+      label = gtk_label_new (NULL);
+      text = g_strdup_printf ("<tt><b><big>%s</big></b></tt>",
+                              _("Update available!"));
+      gtk_label_set_markup (GTK_LABEL (label), text);
+      g_free (text);
+      gtk_widget_show (label);
+      gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+      gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_OUT);
+      gtk_box_reorder_child (GTK_BOX (vbox), frame, 3);
+
+      /* Button is an update link. */
+      gtk_image_set_from_icon_name (GTK_IMAGE (button_image),
+                                    "software-update-available",
+                                    GTK_ICON_SIZE_DIALOG);
+      g_signal_connect (button, "clicked",
+                        (GCallback) about_dialog_download_clicked,
+                        "https://www.gimp.org/downloads/");
+
+      if (config->last_revision > 0)
+        {
+          /* This is actually a new revision of current version. */
+          text = g_strdup_printf (_("Download GIMP %s revision %d (released on %s)\n"),
+                                  config->last_known_release,
+                                  config->last_revision,
+                                  date);
+
+          /* Finally an optional release comment. */
+          if (config->last_release_comment)
+            {
+              /* Translators: <> tags are Pango markup. Please keep these
+               * markups in your translation. */
+              comment = g_strdup_printf (_("<u>Release comment</u>: <i>%s</i>"), config->last_release_comment);
+            }
+        }
+      else
+        {
+          text = g_strdup_printf (_("Download GIMP %s (released on %s)\n"),
+                                  config->last_known_release, date);
+        }
+      gtk_label_set_text (GTK_LABEL (button_label), text);
+      g_free (text);
+      g_free (date);
+
+      if (comment)
+        {
+          label = gtk_label_new (NULL);
+          gtk_label_set_max_width_chars (GTK_LABEL (label), 80);
+          gtk_label_set_markup (GTK_LABEL (label), comment);
+          gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+          g_free (comment);
+
+          gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+          gtk_widget_show (label);
+        }
+    }
+  else
+    {
+      /* Button is a "Check for updates" action. */
+      gtk_image_set_from_icon_name (GTK_IMAGE (button_image),
+                                    "view-refresh",
+                                    GTK_ICON_SIZE_MENU);
+      gtk_label_set_text (GTK_LABEL (button_label), _("Check for updates"));
+      g_signal_connect_swapped (button, "clicked",
+                                (GCallback) gimp_update_check, config);
+
+    }
+
+  gtk_box_reorder_child (GTK_BOX (vbox), frame, 4);
+
+  /* Last check date box. */
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_container_add (GTK_CONTAINER (box), box2);
+  gtk_widget_show (box2);
+
+  /* Show a small "Check for updates" button only if the big one has
+   * been replaced by a download button.
+   */
+  if (config->last_known_release != NULL)
+    {
+      button = gtk_button_new ();
+      button_image = gtk_image_new_from_icon_name ("view-refresh", GTK_ICON_SIZE_MENU);
+      gtk_container_add (GTK_CONTAINER (button), button_image);
+      gtk_widget_set_tooltip_text (button, _("Check for updates"));
+      gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0);
+      g_signal_connect_swapped (button, "clicked",
+                                (GCallback) gimp_update_check, config);
+      gtk_widget_show (button);
+      gtk_widget_show (button_image);
+    }
+
+  if (config->check_update_timestamp > 0)
+    {
+      gchar *subtext;
+      gchar *time;
+
+      datetime = g_date_time_new_from_unix_local (config->check_update_timestamp);
+      date = g_date_time_format (datetime, "%x");
+      time = g_date_time_format (datetime, "%X");
+      /* Translators: first string is the date in the locale's date
+       * representation (e.g., 12/31/99), second is the time in the
+       * locale's time representation (e.g., 23:13:48).
+       */
+      subtext = g_strdup_printf (_("Last checked on %s at %s"), date, time);
+      g_date_time_unref (datetime);
+      g_free (date);
+      g_free (time);
+
+      text = g_strdup_printf ("<i>%s</i>", subtext);
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label), text);
+      gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+      gtk_box_pack_start (GTK_BOX (box2), label, FALSE, FALSE, 0);
+      gtk_container_child_set (GTK_CONTAINER (box2), label, "expand", TRUE, NULL);
+      gtk_widget_show (label);
+      g_free (text);
+      g_free (subtext);
+    }
+
+  gtk_widget_show (box);
+  gtk_widget_show (frame);
+
+  dialog->update_frame = frame;
+  g_object_add_weak_pointer (G_OBJECT (frame), (gpointer) &dialog->update_frame);
+
+  /* Reconstruct the dialog when release info changes. */
+  g_signal_connect (config, "notify::last-known-release",
+                    (GCallback) about_dialog_last_release_changed,
+                    dialog);
+}
+
+static void
+about_dialog_reshuffle (GimpAboutDialog *dialog)
+{
+  GRand *gr = g_rand_new ();
+  gint   i;
+
+  for (i = 0; i < dialog->n_authors; i++)
+    dialog->shuffle[i] = i;
+
+  for (i = START_INDEX; i < dialog->n_authors; i++)
+    {
+      gint j = g_rand_int_range (gr, START_INDEX, dialog->n_authors);
+
+      if (i != j)
+        {
+          gint t;
+
+          t = dialog->shuffle[j];
+          dialog->shuffle[j] = dialog->shuffle[i];
+          dialog->shuffle[i] = t;
+        }
+    }
+
+  g_rand_free (gr);
+}
+
+static gboolean
+about_dialog_anim_expose (GtkWidget       *widget,
+                          GdkEventExpose  *event,
+                          GimpAboutDialog *dialog)
+{
+  GtkStyle      *style = gtk_widget_get_style (widget);
+  cairo_t       *cr;
+  GtkAllocation  allocation;
+  gint           x, y;
+  gint           width, height;
+
+  if (! dialog->visible)
+    return FALSE;
+
+  cr = gdk_cairo_create (event->window);
+
+  gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+
+  gtk_widget_get_allocation (widget, &allocation);
+  pango_layout_get_pixel_size (dialog->layout, &width, &height);
+
+  x = (allocation.width  - width)  / 2;
+  y = (allocation.height - height) / 2;
+
+  if (dialog->textrange[1] > 0)
+    {
+      GdkRegion *covered_region;
+
+      covered_region = gdk_pango_layout_get_clip_region (dialog->layout,
+                                                         x, y,
+                                                         dialog->textrange, 1);
+
+      gdk_region_intersect (covered_region, event->region);
+
+      gdk_cairo_region (cr, covered_region);
+      cairo_clip (cr);
+
+      gdk_region_destroy (covered_region);
+    }
+
+  cairo_move_to (cr, x, y);
+
+  pango_cairo_show_layout (cr, dialog->layout);
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static gchar *
+insert_spacers (const gchar *string)
+{
+  GString  *str = g_string_new (NULL);
+  gchar    *normalized;
+  gchar    *ptr;
+  gunichar  unichr;
+
+  normalized = g_utf8_normalize (string, -1, G_NORMALIZE_DEFAULT_COMPOSE);
+  ptr = normalized;
+
+  while ((unichr = g_utf8_get_char (ptr)))
+    {
+      g_string_append_unichar (str, unichr);
+      g_string_append_unichar (str, 0x200b);  /* ZERO WIDTH SPACE */
+      ptr = g_utf8_next_char (ptr);
+    }
+
+  g_free (normalized);
+
+  return g_string_free (str, FALSE);
+}
+
+static inline void
+mix_colors (const GdkColor *start,
+            const GdkColor *end,
+            GdkColor       *target,
+            gdouble         pos)
+{
+  target->red   = start->red   * (1.0 - pos) + end->red   * pos;
+  target->green = start->green * (1.0 - pos) + end->green * pos;
+  target->blue  = start->blue  * (1.0 - pos) + end->blue  * pos;
+}
+
+static void
+decorate_text (GimpAboutDialog *dialog,
+               gint             anim_type,
+               gdouble          time)
+{
+  GtkStyle       *style = gtk_widget_get_style (dialog->anim_area);
+  const gchar    *text;
+  const gchar    *ptr;
+  gint            letter_count = 0;
+  gint            text_length  = 0;
+  gint            text_bytelen = 0;
+  gint            cluster_start, cluster_end;
+  gunichar        unichr;
+  PangoAttrList  *attrlist = NULL;
+  PangoAttribute *attr;
+  PangoRectangle  irect = {0, 0, 0, 0};
+  PangoRectangle  lrect = {0, 0, 0, 0};
+  GdkColor        mix;
+
+  mix_colors (style->bg + GTK_STATE_NORMAL,
+              style->fg + GTK_STATE_NORMAL, &mix, time);
+
+  text = pango_layout_get_text (dialog->layout);
+  g_return_if_fail (text != NULL);
+
+  text_length = g_utf8_strlen (text, -1);
+  text_bytelen = strlen (text);
+
+  attrlist = pango_attr_list_new ();
+
+  dialog->textrange[0] = 0;
+  dialog->textrange[1] = text_bytelen;
+
+  switch (anim_type)
+    {
+    case 0: /* Fade in */
+      attr = pango_attr_foreground_new (mix.red, mix.green, mix.blue);
+      attr->start_index = 0;
+      attr->end_index = text_bytelen;
+      pango_attr_list_insert (attrlist, attr);
+      break;
+
+    case 1: /* Fade in, spread */
+      attr = pango_attr_foreground_new (mix.red, mix.green, mix.blue);
+      attr->start_index = 0;
+      attr->end_index = text_bytelen;
+      pango_attr_list_change (attrlist, attr);
+
+      ptr = text;
+
+      cluster_start = 0;
+      while ((unichr = g_utf8_get_char (ptr)))
+        {
+          ptr = g_utf8_next_char (ptr);
+          cluster_end = (ptr - text);
+
+          if (unichr == 0x200b)
+            {
+              lrect.width = (1.0 - time) * 15.0 * PANGO_SCALE + 0.5;
+              attr = pango_attr_shape_new (&irect, &lrect);
+              attr->start_index = cluster_start;
+              attr->end_index = cluster_end;
+              pango_attr_list_change (attrlist, attr);
+            }
+          cluster_start = cluster_end;
+        }
+      break;
+
+    case 2: /* Fade in, sinewave */
+      attr = pango_attr_foreground_new (mix.red, mix.green, mix.blue);
+      attr->start_index = 0;
+      attr->end_index = text_bytelen;
+      pango_attr_list_change (attrlist, attr);
+
+      ptr = text;
+
+      cluster_start = 0;
+
+      while ((unichr = g_utf8_get_char (ptr)))
+        {
+          if (unichr == 0x200b)
+            {
+              cluster_end = ptr - text;
+              attr = pango_attr_rise_new ((1.0 -time) * 18000 *
+                                          sin (4.0 * time +
+                                               (float) letter_count * 0.7));
+              attr->start_index = cluster_start;
+              attr->end_index = cluster_end;
+              pango_attr_list_change (attrlist, attr);
+
+              letter_count++;
+              cluster_start = cluster_end;
+            }
+
+          ptr = g_utf8_next_char (ptr);
+        }
+      break;
+
+    case 3: /* letterwise Fade in */
+      ptr = text;
+
+      letter_count  = 0;
+      cluster_start = 0;
+
+      while ((unichr = g_utf8_get_char (ptr)))
+        {
+          gint    border = (text_length + 15) * time - 15;
+          gdouble pos;
+
+          if (letter_count < border)
+            pos = 0;
+          else if (letter_count > border + 15)
+            pos = 1;
+          else
+            pos = ((gdouble) (letter_count - border)) / 15;
+
+          mix_colors (style->fg + GTK_STATE_NORMAL,
+                      style->bg + GTK_STATE_NORMAL,
+                      &mix, pos);
+
+          ptr = g_utf8_next_char (ptr);
+
+          cluster_end = ptr - text;
+
+          attr = pango_attr_foreground_new (mix.red, mix.green, mix.blue);
+          attr->start_index = cluster_start;
+          attr->end_index = cluster_end;
+          pango_attr_list_change (attrlist, attr);
+
+          if (pos < 1.0)
+            dialog->textrange[1] = cluster_end;
+
+          letter_count++;
+          cluster_start = cluster_end;
+        }
+
+      break;
+
+    default:
+      g_printerr ("Unknown animation type %d\n", anim_type);
+    }
+
+  pango_layout_set_attributes (dialog->layout, attrlist);
+  pango_attr_list_unref (attrlist);
+}
+
+static gboolean
+about_dialog_timer (gpointer data)
+{
+  GimpAboutDialog *dialog  = data;
+  gint             timeout = 0;
+
+  if (dialog->animstep == 0)
+    {
+      gchar *text = NULL;
+
+      dialog->visible = TRUE;
+
+      switch (dialog->state)
+        {
+        case 0:
+          dialog->timer = g_timeout_add (30, about_dialog_timer, dialog);
+          dialog->state += 1;
+          return FALSE;
+
+        case 1:
+          text = insert_spacers (_("GIMP is brought to you by"));
+          dialog->state += 1;
+          break;
+
+        case 2:
+          if (! (dialog->index < dialog->n_authors))
+            dialog->index = 0;
+
+          text = insert_spacers (authors[dialog->shuffle[dialog->index]]);
+          dialog->index += 1;
+          break;
+
+        default:
+          g_return_val_if_reached (TRUE);
+          break;
+        }
+
+      g_return_val_if_fail (text != NULL, TRUE);
+
+      pango_layout_set_text (dialog->layout, text, -1);
+      pango_layout_set_attributes (dialog->layout, NULL);
+
+      g_free (text);
+    }
+
+  if (dialog->animstep < 16)
+    {
+      decorate_text (dialog, 2, ((gfloat) dialog->animstep) / 15.0);
+    }
+  else if (dialog->animstep == 16)
+    {
+      timeout = 800;
+    }
+  else if (dialog->animstep == 17)
+    {
+      timeout = 30;
+    }
+  else if (dialog->animstep < 33)
+    {
+      decorate_text (dialog, 1,
+                     1.0 - ((gfloat) (dialog->animstep - 17)) / 15.0);
+    }
+  else if (dialog->animstep == 33)
+    {
+      dialog->visible = FALSE;
+      timeout = 300;
+    }
+  else
+    {
+      dialog->visible  = FALSE;
+      dialog->animstep = -1;
+      timeout = 30;
+    }
+
+  dialog->animstep++;
+
+  gtk_widget_queue_draw (dialog->anim_area);
+
+  if (timeout > 0)
+    {
+      dialog->timer = g_timeout_add (timeout, about_dialog_timer, dialog);
+      return FALSE;
+    }
+
+  /* else keep the current timeout */
+  return TRUE;
+}
+
+#ifdef GIMP_UNSTABLE
+
+static void
+about_dialog_add_unstable_message (GtkWidget *vbox)
+{
+  GtkWidget *label;
+  gchar     *text;
+
+  text = g_strdup_printf (_("This is an unstable development release\n"
+                            "commit %s"), GIMP_GIT_VERSION_ABBREV);
+  label = gtk_label_new (text);
+  g_free (text);
+
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (vbox), label, 2);
+  gtk_widget_show (label);
+}
+
+#endif /* GIMP_UNSTABLE */
+
+static void
+about_dialog_last_release_changed (GimpCoreConfig   *config,
+                                   const GParamSpec *pspec,
+                                   GimpAboutDialog  *dialog)
+{
+  g_signal_handlers_disconnect_by_func (config,
+                                        (GCallback) about_dialog_last_release_changed,
+                                        dialog);
+  if (! dialog->dialog)
+    return;
+
+  about_dialog_add_update (dialog, config);
+}
+
+static void
+about_dialog_download_clicked (GtkButton   *button,
+                               const gchar *link)
+{
+  GtkWidget *window;
+
+  window = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW);
+
+  if (window)
+    gtk_show_uri (gdk_screen_get_default (),
+                  link,
+                  gtk_get_current_event_time(),
+                  NULL);
+}
diff --git a/app/dialogs/about-dialog.h b/app/dialogs/about-dialog.h
new file mode 100644
index 0000000..516d7da
--- /dev/null
+++ b/app/dialogs/about-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ABOUT_DIALOG_H__
+#define __ABOUT_DIALOG_H__
+
+
+GtkWidget * about_dialog_create (GimpCoreConfig *config);
+
+
+#endif /* __ABOUT_DIALOG_H__ */
diff --git a/app/dialogs/action-search-dialog.c b/app/dialogs/action-search-dialog.c
new file mode 100644
index 0000000..7b1d434
--- /dev/null
+++ b/app/dialogs/action-search-dialog.c
@@ -0,0 +1,358 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * action-search-dialog.c
+ * Copyright (C) 2012-2013 Srihari Sriraman
+ *                         Suhas V
+ *                         Vidyashree K
+ *                         Zeeshan Ali Ansari
+ * Copyright (C) 2013-2015 Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpaction-history.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpsearchpopup.h"
+#include "widgets/gimpuimanager.h"
+
+#include "action-search-dialog.h"
+
+#include "gimp-intl.h"
+
+
+static void         action_search_history_and_actions      (GimpSearchPopup   *popup,
+                                                            const gchar       *keyword,
+                                                            gpointer           data);
+static gboolean     action_search_match_keyword            (GimpAction        *action,
+                                                            const gchar*       keyword,
+                                                            gint              *section,
+                                                            Gimp              *gimp);
+
+
+/* Public Functions */
+
+GtkWidget *
+action_search_dialog_create (Gimp *gimp)
+{
+  GtkWidget *dialog;
+
+  dialog = gimp_search_popup_new (gimp,
+                                  "gimp-action-search-dialog",
+                                  _("Search Actions"),
+                                  action_search_history_and_actions,
+                                  gimp);
+  return dialog;
+}
+
+/* Private Functions */
+
+static void
+action_search_history_and_actions (GimpSearchPopup *popup,
+                                   const gchar     *keyword,
+                                   gpointer         data)
+{
+  GimpUIManager *manager;
+  GList         *list;
+  GList         *history_actions = NULL;
+  Gimp          *gimp;
+
+  g_return_if_fail (GIMP_IS_GIMP (data));
+
+  gimp = GIMP (data);
+  manager = gimp_ui_managers_from_name ("<Image>")->data;
+
+  if (g_strcmp0 (keyword, "") == 0)
+    return;
+
+  history_actions = gimp_action_history_search (gimp,
+                                                action_search_match_keyword,
+                                                keyword);
+
+  /* First put on top of the list any matching action of user history. */
+  for (list = history_actions; list; list = g_list_next (list))
+    {
+      gimp_search_popup_add_result (popup, list->data, 0);
+    }
+
+  /* Now check other actions. */
+  for (list = gimp_ui_manager_get_action_groups (manager);
+       list;
+       list = g_list_next (list))
+    {
+      GList           *list2;
+      GimpActionGroup *group   = list->data;
+      GList           *actions = NULL;
+
+      actions = gimp_action_group_list_actions (group);
+      actions = g_list_sort (actions, (GCompareFunc) gimp_action_name_compare);
+
+      for (list2 = actions; list2; list2 = g_list_next (list2))
+        {
+          const gchar *name;
+          GimpAction  *action       = list2->data;
+          gboolean     is_redundant = FALSE;
+          gint         section;
+
+          name = gimp_action_get_name (action);
+
+          /* The action search dialog doesn't show any non-historized
+           * actions, with a few exceptions.  See the difference between
+           * gimp_action_history_is_blacklisted_action() and
+           * gimp_action_history_is_excluded_action().
+           */
+          if (gimp_action_history_is_blacklisted_action (name))
+            continue;
+
+          if (! gimp_action_is_visible (action)    ||
+              (! gimp_action_is_sensitive (action) &&
+               ! GIMP_GUI_CONFIG (gimp->config)->search_show_unavailable))
+            continue;
+
+          if (action_search_match_keyword (action, keyword, &section, gimp))
+            {
+              GList *list3;
+
+              /* A matching action. Check if we have not already added
+               * it as an history action.
+               */
+              for (list3 = history_actions; list3; list3 = g_list_next (list3))
+                {
+                  if (strcmp (gimp_action_get_name (list3->data),
+                              name) == 0)
+                    {
+                      is_redundant = TRUE;
+                      break;
+                    }
+                }
+
+              if (! is_redundant)
+                {
+                  gimp_search_popup_add_result (popup, action, section);
+                }
+            }
+        }
+
+      g_list_free (actions);
+   }
+
+  g_list_free_full (history_actions, (GDestroyNotify) g_object_unref);
+}
+
+static gboolean
+action_search_match_keyword (GimpAction  *action,
+                             const gchar *keyword,
+                             gint        *section,
+                             Gimp        *gimp)
+{
+  gboolean   matched = FALSE;
+  gchar    **key_tokens;
+  gchar    **label_tokens;
+  gchar    **label_alternates = NULL;
+  gchar    *tmp;
+
+  if (keyword == NULL)
+    {
+      /* As a special exception, a NULL keyword means any action
+       * matches.
+       */
+      if (section)
+        {
+          *section = 0;
+        }
+      return TRUE;
+    }
+
+  key_tokens   = g_str_tokenize_and_fold (keyword, gimp->config->language, NULL);
+  tmp          = gimp_strip_uline (gimp_action_get_label (action));
+  label_tokens = g_str_tokenize_and_fold (tmp, gimp->config->language, &label_alternates);
+  g_free (tmp);
+
+  /* Try to match the keyword as an initialism of the action's label.
+   * For instance 'gb' will match 'Gaussian Blur...'
+   */
+  if (g_strv_length (key_tokens) == 1)
+    {
+      gchar **search_tokens[] = {label_tokens, label_alternates};
+      gint    i;
+
+      for (i = 0; i < G_N_ELEMENTS (search_tokens); i++)
+        {
+          const gchar  *key_token;
+          gchar       **label_tokens;
+
+          for (key_token = key_tokens[0], label_tokens = search_tokens[i];
+               *key_token && *label_tokens;
+               key_token = g_utf8_find_next_char (key_token, NULL), label_tokens++)
+            {
+              gunichar key_char   = g_utf8_get_char (key_token);
+              gunichar label_char = g_utf8_get_char (*label_tokens);
+
+              if (key_char != label_char)
+                break;
+            }
+
+          if (! *key_token)
+            {
+              matched = TRUE;
+
+              if (section)
+                {
+                  /* full match is better than a partial match */
+                  *section = ! *label_tokens ? 1 : 4;
+                }
+              else
+                {
+                  break;
+                }
+            }
+        }
+    }
+
+  if (! matched && g_strv_length (label_tokens) > 0)
+    {
+      gint     previous_matched = -1;
+      gboolean match_start;
+      gboolean match_ordered;
+      gint     i;
+
+      matched       = TRUE;
+      match_start   = TRUE;
+      match_ordered = TRUE;
+      for (i = 0; key_tokens[i] != NULL; i++)
+        {
+          gint j;
+          for (j = 0; label_tokens[j] != NULL; j++)
+            {
+              if (g_str_has_prefix (label_tokens[j], key_tokens[i]))
+                {
+                  goto one_matched;
+                }
+            }
+          for (j = 0; label_alternates[j] != NULL; j++)
+            {
+              if (g_str_has_prefix (label_alternates[j], key_tokens[i]))
+                {
+                  goto one_matched;
+                }
+            }
+          matched = FALSE;
+one_matched:
+          if (previous_matched > j)
+            match_ordered = FALSE;
+          previous_matched = j;
+
+          if (i != j)
+            match_start = FALSE;
+
+          continue;
+        }
+
+      if (matched && section)
+        {
+          /* If the key is the label start, this is a nicer match.
+           * Then if key tokens are found in the same order in the label.
+           * Finally we show at the end if the key tokens are found with a different order. */
+          *section = match_ordered ? (match_start ? 1 : 2) : 3;
+        }
+    }
+
+  if (! matched && key_tokens[0] && g_utf8_strlen (key_tokens[0], -1) > 2 &&
+      gimp_action_get_tooltip (action) != NULL)
+    {
+      gchar    **tooltip_tokens;
+      gchar    **tooltip_alternates = NULL;
+      gboolean   mixed_match;
+      gint       i;
+
+      tooltip_tokens = g_str_tokenize_and_fold (gimp_action_get_tooltip (action),
+                                                gimp->config->language, &tooltip_alternates);
+
+      if (g_strv_length (tooltip_tokens) > 0)
+        {
+          matched     = TRUE;
+          mixed_match = FALSE;
+
+          for (i = 0; key_tokens[i] != NULL; i++)
+            {
+              gint j;
+              for (j = 0; tooltip_tokens[j] != NULL; j++)
+                {
+                  if (g_str_has_prefix (tooltip_tokens[j], key_tokens[i]))
+                    {
+                      goto one_tooltip_matched;
+                    }
+                }
+              for (j = 0; tooltip_alternates[j] != NULL; j++)
+                {
+                  if (g_str_has_prefix (tooltip_alternates[j], key_tokens[i]))
+                    {
+                      goto one_tooltip_matched;
+                    }
+                }
+              for (j = 0; label_tokens[j] != NULL; j++)
+                {
+                  if (g_str_has_prefix (label_tokens[j], key_tokens[i]))
+                    {
+                      mixed_match = TRUE;
+                      goto one_tooltip_matched;
+                    }
+                }
+              for (j = 0; label_alternates[j] != NULL; j++)
+                {
+                  if (g_str_has_prefix (label_alternates[j], key_tokens[i]))
+                    {
+                      mixed_match = TRUE;
+                      goto one_tooltip_matched;
+                    }
+                }
+              matched = FALSE;
+one_tooltip_matched:
+              continue;
+            }
+          if (matched && section)
+            {
+              /* Matching the tooltip is section 4. We don't go looking
+               * for start of string or token order for tooltip match.
+               * But if the match is mixed on tooltip and label (there are
+               * no match for *only* label or *only* tooltip), this is
+               * section 5. */
+              *section = mixed_match ? 6 : 5;
+            }
+        }
+      g_strfreev (tooltip_tokens);
+      g_strfreev (tooltip_alternates);
+    }
+
+  g_strfreev (key_tokens);
+  g_strfreev (label_tokens);
+  g_strfreev (label_alternates);
+
+  return matched;
+}
diff --git a/app/dialogs/action-search-dialog.h b/app/dialogs/action-search-dialog.h
new file mode 100644
index 0000000..7fa3e06
--- /dev/null
+++ b/app/dialogs/action-search-dialog.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * action-search-dialog.c
+ * Copyright (C) 2012-2013 Srihari Sriraman
+ *                         Suhas V
+ *                         Vidyashree K
+ *                         Zeeshan Ali Ansari
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ACTION_SEARCH_DIALOG_H__
+#define __ACTION_SEARCH_DIALOG_H__
+
+GtkWidget * action_search_dialog_create (Gimp *gimp);
+
+#endif /* __ACTION_SEARCH_DIALOG_H__ */
diff --git a/app/dialogs/authors.h b/app/dialogs/authors.h
new file mode 100644
index 0000000..2829c05
--- /dev/null
+++ b/app/dialogs/authors.h
@@ -0,0 +1,189 @@
+
+/* NOTE: This file is auto-generated from authors.xml, do not edit it. */
+
+static const gchar * const creators[] =
+{
+  "Spencer Kimball",
+  "Peter Mattis",
+  NULL
+};
+
+static const gchar * const maintainers[] =
+{
+  "Michael Natterer",
+  "Jehan",
+  NULL
+};
+
+static const gchar * const authors[] =
+{
+  "Spencer Kimball",
+  "Peter Mattis",
+  "Michael Natterer",
+  "Jehan",
+  "Fredrik Alströmer",
+  "Rob Antonishen",
+  "Timm Bäder",
+  "Jerry Baker",
+  "Daniel P. Berrange",
+  "Jacob Boerema",
+  "Hendrik Boom",
+  "Richard Bowers",
+  "Hans Breuer",
+  "Simon Budig",
+  "João S. O. Bueno",
+  "Seth Burgess",
+  "Marco Ciampa",
+  "Winston Chang",
+  "Lars-Peter Clausen",
+  "Sven Claussner",
+  "Kevin Cozens",
+  "Jeremiah Darais",
+  "Alexia Death",
+  "Nicholas Doyle",
+  "Marek Dvoroznak",
+  "Daniel Eddeland",
+  "Ulf-D. Ehlert",
+  "Gil Eliyahu",
+  "Tobias Ellinghaus",
+  "Ell",
+  "Dirk Farin",
+  "Richard Gitschlag",
+  "Saul Goode",
+  "David Gowers",
+  "Niels De Graef",
+  "Cameron Gregory",
+  "Stanislav Grinkov",
+  "Eric Grivel",
+  "Stephen Griffiths",
+  "Julien Hardelin",
+  "Tim Harder",
+  "Michael Henning",
+  "Lukasz Hladowski",
+  "Éric Hoffman",
+  "Patrick Horgan",
+  "Daniel Hornung",
+  "Christopher Howard",
+  "Alexander Hämmerle",
+  "HJ Imbens",
+  "Barak Itkin",
+  "Javier Jardón",
+  "Tim Jedlicka",
+  "Róman Joost",
+  "Alexander Jones",
+  "Aurimas Juška",
+  "Povilas Kanapickas",
+  "Malay Keshav",
+  "Øyvind Kolås",
+  "Lloyd Konneker",
+  "Kretynofil",
+  "Christian Krippendorf",
+  "Hartmut Kuhse",
+  "Eric Lamarque",
+  "Simone Karin Lehmann",
+  "Dave Lichterman",
+  "Adrian Likins",
+  "lillolollo",
+  "Tor Lillqvist",
+  "Nikc M.",
+  "Mikael Magnusson",
+  "Luidnel Maignan",
+  "Thomas Manni",
+  "Pascal Massimino",
+  "Johannes Matschke",
+  "Takeshi Matsuyama",
+  "Téo Mazars",
+  "Robert McHardy",
+  "Richard McLean",
+  "Jörn Meier",
+  "Mike Melancon",
+  "Christopher Montgomery",
+  "Simon Müller",
+  "Tobias Mueller",
+  "Michael Muré",
+  "Lionel N.",
+  "Sven Neumann",
+  "Andreas Neustifter",
+  "Jon Nordby",
+  "Martin Nordholts",
+  "Daniel Novomesky",
+  "David Odin",
+  "Nelson A. de Oliveira",
+  "Victor Oliveira",
+  "Yoshio Ono",
+  "Nathan Osman",
+  "Benjamin Otte",
+  "Petr Ovtchenkov",
+  "Juan Palacios",
+  "Ville Pätsi",
+  "Akkana Peck",
+  "Félix Piédallu",
+  "Nils Philippsen",
+  "Mircea Purdea",
+  "Liam Quin",
+  "John Ralls",
+  "Dennis Ranke",
+  "Debarshi Ray",
+  "Martin Renold",
+  "Kristian Rietveld",
+  "Gilles Rochefort",
+  "Marco Rossini",
+  "Karthikeyan S",
+  "Daniel Sabo",
+  "Oleksii Samorukov",
+  "Enrico Schröder",
+  "Michael Schumacher",
+  "Elad Shahar",
+  "shark0r",
+  "Peter Sikking",
+  "RyōTa SimaMoto",
+  "SHIRAKAWA Akira",
+  "Jernej Simončič",
+  "Manish Singh",
+  "Mukund Sivaraman",
+  "Ville Sokk",
+  "Jakub Steiner",
+  "Omari Stephens",
+  "Tobias Stoeckmann",
+  "Elle Stone",
+  "Bogdan Szczurek",
+  "Tal Trachtman",
+  "Mason Thomas",
+  "Benoit Touchette",
+  "Andreas Turtschan",
+  "Massimo Valentini",
+  "Thorsten Vollmer",
+  "Clayton Walker",
+  "Rupert Weber",
+  "Alexis Wilhelm",
+  "woob",
+  "Andrew Wyatt",
+  "Yoshinori Yamakawa",
+  "Mihail Zenkov",
+  "Zhenfeng Zhao",
+  "Simon Zilliken",
+  "Przemyslaw Zych",
+  NULL
+};
+
+static const gchar * const artists[] =
+{
+  "Alexia Death",
+  "Philipp Haegi",
+  "Aryeom Han",
+  "Ville Pätsi",
+  "Klaus Staedtler",
+  "Jakub Steiner",
+  NULL
+};
+
+static const gchar * const documenters[] =
+{
+  "Marco Ciampa",
+  "Sven Claussner",
+  "Ulf-D. Ehlert",
+  "Julien Hardelin",
+  "Róman Joost",
+  "Alexandre Prokoudine",
+  NULL
+};
diff --git a/app/dialogs/authors.xsl b/app/dialogs/authors.xsl
new file mode 100644
index 0000000..322eb8d
--- /dev/null
+++ b/app/dialogs/authors.xsl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--  XSL transformation to create a header file from authors.xml  -->
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+  <xsl:output method="text" />
+
+  <xsl:template name="recent-contributor">
+    <xsl:param name="role" />
+    <xsl:apply-templates select="dc:contributor[contains(@role, $role) and
+                                 ((number(@last-active) >= 2             and
+                                  number(substring-after(@last-active, &quot;.&quot;)) >= 8) or
+                                  number(@last-active) >= 3)]" />
+  </xsl:template>
+
+  <xsl:template match="/dc:gimp-authors">
+<xsl:text>
+/* NOTE: This file is auto-generated from authors.xml, do not edit it. */
+
+static const gchar * const creators[] =
+{
+</xsl:text>
+  <xsl:apply-templates select="dc:creator" />
+<xsl:text>  NULL
+};
+</xsl:text>
+
+<xsl:text>
+static const gchar * const maintainers[] =
+{
+</xsl:text>
+  <xsl:apply-templates select="dc:maintainer" />
+<xsl:text>  NULL
+};
+</xsl:text>
+
+<xsl:text>
+static const gchar * const authors[] =
+{
+</xsl:text>
+  <xsl:apply-templates select="dc:creator" />
+  <xsl:apply-templates select="dc:maintainer" />
+  <xsl:call-template name="recent-contributor">
+    <xsl:with-param name="role" select="'author'"/>
+  </xsl:call-template>
+<xsl:text>  NULL
+};
+</xsl:text>
+
+<xsl:text>
+static const gchar * const artists[] =
+{
+</xsl:text>
+  <xsl:call-template name="recent-contributor">
+    <xsl:with-param name="role" select="'artist'"/>
+  </xsl:call-template>
+<xsl:text>  NULL
+};
+</xsl:text>
+
+<xsl:text>
+static const gchar * const documenters[] =
+{
+</xsl:text>
+  <xsl:call-template name="recent-contributor">
+    <xsl:with-param name="role" select="'documenter'"/>
+  </xsl:call-template>
+<xsl:text>  NULL
+};
+</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="dc:creator">  "<xsl:apply-templates />",
+</xsl:template>
+  <xsl:template match="dc:maintainer">  "<xsl:apply-templates />",
+</xsl:template>
+  <xsl:template match="dc:contributor">  "<xsl:apply-templates />",
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
new file mode 100644
index 0000000..733bf3a
--- /dev/null
+++ b/app/dialogs/channel-options-dialog.c
@@ -0,0 +1,247 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "channel-options-dialog.h"
+#include "item-options-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _ChannelOptionsDialog ChannelOptionsDialog;
+
+struct _ChannelOptionsDialog
+{
+  GimpChannelOptionsCallback  callback;
+  gpointer                    user_data;
+
+  GtkWidget                  *color_panel;
+  GtkWidget                  *save_sel_toggle;
+};
+
+
+/*  local function prototypes  */
+
+static void channel_options_dialog_free     (ChannelOptionsDialog *private);
+static void channel_options_dialog_callback (GtkWidget            *dialog,
+                                             GimpImage            *image,
+                                             GimpItem             *item,
+                                             GimpContext          *context,
+                                             const gchar          *item_name,
+                                             gboolean              item_visible,
+                                             gboolean              item_linked,
+                                             GimpColorTag          item_color_tag,
+                                             gboolean              item_lock_content,
+                                             gboolean              item_lock_position,
+                                             gpointer              user_data);
+static void channel_options_opacity_changed (GtkAdjustment        *adjustment,
+                                             GimpColorButton      *color_button);
+static void channel_options_color_changed   (GimpColorButton      *color_button,
+                                             GtkAdjustment        *adjustment);
+
+
+/*  public functions  */
+
+GtkWidget *
+channel_options_dialog_new (GimpImage                  *image,
+                            GimpChannel                *channel,
+                            GimpContext                *context,
+                            GtkWidget                  *parent,
+                            const gchar                *title,
+                            const gchar                *role,
+                            const gchar                *icon_name,
+                            const gchar                *desc,
+                            const gchar                *help_id,
+                            const gchar                *color_label,
+                            const gchar                *opacity_label,
+                            gboolean                    show_from_sel,
+                            const gchar                *channel_name,
+                            const GimpRGB              *channel_color,
+                            gboolean                    channel_visible,
+                            gboolean                    channel_linked,
+                            GimpColorTag                channel_color_tag,
+                            gboolean                    channel_lock_content,
+                            gboolean                    channel_lock_position,
+                            GimpChannelOptionsCallback  callback,
+                            gpointer                    user_data)
+{
+  ChannelOptionsDialog *private;
+  GtkWidget            *dialog;
+  GtkAdjustment        *opacity_adj;
+  GtkWidget            *scale;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (channel == NULL || GIMP_IS_CHANNEL (channel), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (role != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (desc != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (channel_color != NULL, NULL);
+  g_return_val_if_fail (color_label != NULL, NULL);
+  g_return_val_if_fail (opacity_label != NULL, NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (ChannelOptionsDialog);
+
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  dialog = item_options_dialog_new (image, GIMP_ITEM (channel), context,
+                                    parent, title, role,
+                                    icon_name, desc, help_id,
+                                    channel_name ? _("Channel _name:") : NULL,
+                                    GIMP_ICON_TOOL_PAINTBRUSH,
+                                    _("Lock _pixels"),
+                                    _("Lock position and _size"),
+                                    channel_name,
+                                    channel_visible,
+                                    channel_linked,
+                                    channel_color_tag,
+                                    channel_lock_content,
+                                    channel_lock_position,
+                                    channel_options_dialog_callback,
+                                    private);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) channel_options_dialog_free, private);
+
+  opacity_adj = (GtkAdjustment *)
+                gtk_adjustment_new (channel_color->a * 100.0,
+                                    0.0, 100.0, 1.0, 10.0, 0);
+  scale = gimp_spin_scale_new (opacity_adj, NULL, 1);
+  gtk_widget_set_size_request (scale, 200, -1);
+  item_options_dialog_add_widget (dialog,
+                                  opacity_label, scale);
+
+  private->color_panel = gimp_color_panel_new (color_label,
+                                               channel_color,
+                                               GIMP_COLOR_AREA_LARGE_CHECKS,
+                                               24, 24);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (private->color_panel),
+                                context);
+
+  g_signal_connect (opacity_adj, "value-changed",
+                    G_CALLBACK (channel_options_opacity_changed),
+                    private->color_panel);
+
+  g_signal_connect (private->color_panel, "color-changed",
+                    G_CALLBACK (channel_options_color_changed),
+                    opacity_adj);
+
+  item_options_dialog_add_widget (dialog,
+                                  NULL, private->color_panel);
+
+  if (show_from_sel)
+    {
+      private->save_sel_toggle =
+        gtk_check_button_new_with_mnemonic (_("Initialize from _selection"));
+
+      item_options_dialog_add_widget (dialog,
+                                      NULL, private->save_sel_toggle);
+    }
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+channel_options_dialog_free (ChannelOptionsDialog *private)
+{
+  g_slice_free (ChannelOptionsDialog, private);
+}
+
+static void
+channel_options_dialog_callback (GtkWidget    *dialog,
+                                 GimpImage    *image,
+                                 GimpItem     *item,
+                                 GimpContext  *context,
+                                 const gchar  *item_name,
+                                 gboolean      item_visible,
+                                 gboolean      item_linked,
+                                 GimpColorTag  item_color_tag,
+                                 gboolean      item_lock_content,
+                                 gboolean      item_lock_position,
+                                 gpointer      user_data)
+{
+  ChannelOptionsDialog *private = user_data;
+  GimpRGB               color;
+  gboolean              save_selection = FALSE;
+
+  gimp_color_button_get_color (GIMP_COLOR_BUTTON (private->color_panel),
+                               &color);
+
+  if (private->save_sel_toggle)
+    save_selection =
+      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (private->save_sel_toggle));
+
+  private->callback (dialog,
+                     image,
+                     GIMP_CHANNEL (item),
+                     context,
+                     item_name,
+                     &color,
+                     save_selection,
+                     item_visible,
+                     item_linked,
+                     item_color_tag,
+                     item_lock_content,
+                     item_lock_position,
+                     private->user_data);
+}
+
+static void
+channel_options_opacity_changed (GtkAdjustment   *adjustment,
+                                 GimpColorButton *color_button)
+{
+  GimpRGB color;
+
+  gimp_color_button_get_color (color_button, &color);
+  gimp_rgb_set_alpha (&color, gtk_adjustment_get_value (adjustment) / 100.0);
+  gimp_color_button_set_color (color_button, &color);
+}
+
+static void
+channel_options_color_changed (GimpColorButton *button,
+                               GtkAdjustment   *adjustment)
+{
+  GimpRGB color;
+
+  gimp_color_button_get_color (button, &color);
+  gtk_adjustment_set_value (adjustment, color.a * 100.0);
+}
diff --git a/app/dialogs/channel-options-dialog.h b/app/dialogs/channel-options-dialog.h
new file mode 100644
index 0000000..a1de490
--- /dev/null
+++ b/app/dialogs/channel-options-dialog.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CHANNEL_OPTIONS_DIALOG_H__
+#define __CHANNEL_OPTIONS_DIALOG_H__
+
+
+typedef void (* GimpChannelOptionsCallback) (GtkWidget     *dialog,
+                                             GimpImage     *image,
+                                             GimpChannel   *channel,
+                                             GimpContext   *context,
+                                             const gchar   *channel_name,
+                                             const GimpRGB *channel_color,
+                                             gboolean       save_selection,
+                                             gboolean       channel_visible,
+                                             gboolean       channel_linked,
+                                             GimpColorTag   channel_color_tag,
+                                             gboolean       channel_lock_content,
+                                             gboolean       channel_lock_position,
+                                             gpointer       user_data);
+
+
+GtkWidget * channel_options_dialog_new (GimpImage                  *image,
+                                        GimpChannel                *channel,
+                                        GimpContext                *context,
+                                        GtkWidget                  *parent,
+                                        const gchar                *title,
+                                        const gchar                *role,
+                                        const gchar                *icon_name,
+                                        const gchar                *desc,
+                                        const gchar                *help_id,
+                                        const gchar                *color_label,
+                                        const gchar                *opacity_label,
+                                        gboolean                    show_from_sel,
+                                        const gchar                *channel_name,
+                                        const GimpRGB              *channel_color,
+                                        gboolean                    channel_visible,
+                                        gboolean                    channel_linked,
+                                        GimpColorTag                channel_color_tag,
+                                        gboolean                    channel_lock_content,
+                                        gboolean                    channel_lock_position,
+                                        GimpChannelOptionsCallback  callback,
+                                        gpointer                    user_data);
+
+
+#endif /* __CHANNEL_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/color-profile-dialog.c b/app/dialogs/color-profile-dialog.c
new file mode 100644
index 0000000..225b811
--- /dev/null
+++ b/app/dialogs/color-profile-dialog.c
@@ -0,0 +1,494 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * color-profile-dialog.h
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * Partly based on the lcms plug-in
+ * Copyright (C) 2006, 2007  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-constructors.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "color-profile-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  ColorProfileDialogType    dialog_type;
+  GimpImage                *image;
+  GimpColorProfile         *current_profile;
+  GimpColorProfile         *default_profile;
+  GimpColorRenderingIntent  intent;
+  gboolean                  bpc;
+  GimpColorProfileCallback  callback;
+  gpointer                  user_data;
+
+  GimpColorConfig          *config;
+  GtkWidget                *dialog;
+  GtkWidget                *main_vbox;
+  GtkWidget                *combo;
+  GtkWidget                *dest_view;
+
+} ProfileDialog;
+
+
+static void        color_profile_dialog_free     (ProfileDialog *private);
+static GtkWidget * color_profile_combo_box_new   (ProfileDialog *private);
+static void        color_profile_dialog_response (GtkWidget     *dialog,
+                                                  gint           response_id,
+                                                  ProfileDialog *private);
+static void        color_profile_dest_changed    (GtkWidget     *combo,
+                                                  ProfileDialog *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+color_profile_dialog_new (ColorProfileDialogType    dialog_type,
+                          GimpImage                *image,
+                          GimpContext              *context,
+                          GtkWidget                *parent,
+                          GimpColorProfile         *current_profile,
+                          GimpColorProfile         *default_profile,
+                          GimpColorRenderingIntent  intent,
+                          gboolean                  bpc,
+                          GimpColorProfileCallback  callback,
+                          gpointer                  user_data)
+{
+  ProfileDialog *private;
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *expander;
+  GtkWidget     *label;
+  const gchar   *dest_label;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (current_profile == NULL ||
+                        GIMP_IS_COLOR_PROFILE (current_profile), NULL);
+  g_return_val_if_fail (default_profile == NULL ||
+                        GIMP_IS_COLOR_PROFILE (default_profile), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (ProfileDialog);
+
+  private->dialog_type     = dialog_type;
+  private->image           = image;
+  private->current_profile = current_profile;
+  private->default_profile = default_profile;
+  private->intent          = intent;
+  private->bpc             = bpc;
+  private->callback        = callback;
+  private->user_data       = user_data;
+  private->config          = image->gimp->config->color_management;
+
+  switch (dialog_type)
+    {
+    case COLOR_PROFILE_DIALOG_ASSIGN_PROFILE:
+      dialog =
+        gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                  _("Assign ICC Color Profile"),
+                                  "gimp-image-color-profile-assign",
+                                  NULL,
+                                  _("Assign a color profile to the image"),
+                                  parent,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN,
+
+                                  _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                  _("_Assign"), GTK_RESPONSE_OK,
+
+                                  NULL);
+      dest_label = _("Assign");
+      break;
+
+    case COLOR_PROFILE_DIALOG_CONVERT_TO_PROFILE:
+      dialog =
+        gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                  _("Convert to ICC Color Profile"),
+                                  "gimp-image-color-profile-convert",
+                                  NULL,
+                                  _("Convert the image to a color profile"),
+                                  parent,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT,
+
+                                  _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                                  _("C_onvert"), GTK_RESPONSE_OK,
+
+                                  NULL);
+      dest_label = _("Convert to");
+      break;
+
+    case COLOR_PROFILE_DIALOG_CONVERT_TO_RGB:
+      dialog =
+        gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                  _("RGB Conversion"),
+                                  "gimp-image-convert-rgb",
+                                  GIMP_ICON_CONVERT_RGB,
+                                  _("Convert Image to RGB"),
+                                  parent,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_IMAGE_CONVERT_RGB,
+
+                                  _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                                  _("C_onvert"), GTK_RESPONSE_OK,
+
+                                  NULL);
+      dest_label = _("Convert to");
+      break;
+
+    case COLOR_PROFILE_DIALOG_CONVERT_TO_GRAY:
+      dialog =
+        gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                  _("Grayscale Conversion"),
+                                  "gimp-image-convert-gray",
+                                  GIMP_ICON_CONVERT_GRAYSCALE,
+                                  _("Convert Image to Grayscale"),
+                                  parent,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_IMAGE_CONVERT_GRAYSCALE,
+
+                                  _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                                  _("C_onvert"), GTK_RESPONSE_OK,
+
+                                  NULL);
+      dest_label = _("Convert to");
+      break;
+
+    case COLOR_PROFILE_DIALOG_SELECT_SOFTPROOF_PROFILE:
+      dialog =
+        gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                  _("Soft-Proof Profile"),
+                                  "gimp-select-softproof-profile",
+                                  GIMP_ICON_DOCUMENT_PRINT,
+                                  _("Select Soft-Proof Profile"),
+                                  parent,
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_VIEW_COLOR_MANAGEMENT,
+
+                                  _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                  _("_Select"), GTK_RESPONSE_OK,
+
+                                  NULL);
+      dest_label = _("New Color Profile");
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+
+  private->dialog = dialog;
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) color_profile_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (color_profile_dialog_response),
+                    private);
+
+  private->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (private->main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      private->main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (private->main_vbox);
+
+  frame = gimp_frame_new (_("Current Color Profile"));
+  gtk_box_pack_start (GTK_BOX (private->main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  label = gimp_color_profile_label_new (private->current_profile);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_widget_show (label);
+
+  frame = gimp_frame_new (dest_label);
+  gtk_box_pack_start (GTK_BOX (private->main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  private->combo = color_profile_combo_box_new (private);
+  gtk_box_pack_start (GTK_BOX (vbox), private->combo, FALSE, FALSE, 0);
+  gtk_widget_show (private->combo);
+
+  expander = gtk_expander_new_with_mnemonic (_("Profile _details"));
+  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+  gtk_widget_show (expander);
+
+  private->dest_view = gimp_color_profile_view_new ();
+  gtk_container_add (GTK_CONTAINER (expander), private->dest_view);
+  gtk_widget_show (private->dest_view);
+
+  g_signal_connect (private->combo, "changed",
+                    G_CALLBACK (color_profile_dest_changed),
+                    private);
+
+  color_profile_dest_changed (private->combo, private);
+
+  if (dialog_type == COLOR_PROFILE_DIALOG_CONVERT_TO_PROFILE)
+    {
+      GtkWidget *vbox;
+      GtkWidget *hbox;
+      GtkWidget *combo;
+      GtkWidget *toggle;
+
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+      gtk_box_pack_start (GTK_BOX (private->main_vbox), vbox, FALSE, FALSE, 0);
+      gtk_widget_show (vbox);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      label = gtk_label_new_with_mnemonic (_("_Rendering Intent:"));
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+
+      combo = gimp_enum_combo_box_new (GIMP_TYPE_COLOR_RENDERING_INTENT);
+      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+      gtk_widget_show (combo);
+
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  private->intent,
+                                  G_CALLBACK (gimp_int_combo_box_get_active),
+                                  &private->intent);
+
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+      toggle =
+        gtk_check_button_new_with_mnemonic (_("_Black Point Compensation"));
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), private->bpc);
+      gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
+      gtk_widget_show (toggle);
+
+      g_signal_connect (toggle, "toggled",
+                        G_CALLBACK (gimp_toggle_button_update),
+                        &private->bpc);
+    }
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+color_profile_dialog_free (ProfileDialog *private)
+{
+  g_slice_free (ProfileDialog, private);
+}
+
+static GtkWidget *
+color_profile_combo_box_new (ProfileDialog *private)
+{
+  GtkListStore *store;
+  GtkWidget    *combo;
+  GtkWidget    *chooser;
+  gchar        *history;
+
+  history = gimp_personal_rc_file ("profilerc");
+  store = gimp_color_profile_store_new (history);
+  g_free (history);
+
+  if (private->default_profile)
+    {
+      GimpImageBaseType  base_type;
+      GimpPrecision      precision;
+      GError            *error = NULL;
+
+      switch (private->dialog_type)
+        {
+        case COLOR_PROFILE_DIALOG_ASSIGN_PROFILE:
+        case COLOR_PROFILE_DIALOG_CONVERT_TO_PROFILE:
+          base_type = gimp_image_get_base_type (private->image);
+          break;
+
+        case COLOR_PROFILE_DIALOG_CONVERT_TO_RGB:
+          base_type = GIMP_RGB;
+          break;
+
+        case COLOR_PROFILE_DIALOG_CONVERT_TO_GRAY:
+          base_type = GIMP_GRAY;
+          break;
+
+        default:
+          g_return_val_if_reached (NULL);
+        }
+
+      precision = gimp_image_get_precision (private->image);
+
+      if (! gimp_color_profile_store_add_defaults (GIMP_COLOR_PROFILE_STORE (store),
+                                                   private->config,
+                                                   base_type,
+                                                   precision,
+                                                   &error))
+        {
+          gimp_message (private->image->gimp, G_OBJECT (private->dialog),
+                        GIMP_MESSAGE_ERROR,
+                        "%s", error->message);
+          g_clear_error (&error);
+        }
+    }
+  else
+    {
+      gimp_color_profile_store_add_file (GIMP_COLOR_PROFILE_STORE (store),
+                                         NULL, NULL);
+    }
+
+  chooser =
+    gimp_color_profile_chooser_dialog_new (_("Select Destination Profile"),
+                                           NULL,
+                                           GTK_FILE_CHOOSER_ACTION_OPEN);
+
+  gimp_color_profile_chooser_dialog_connect_path (chooser,
+                                                  G_OBJECT (private->image->gimp->config),
+                                                  "color-profile-path");
+
+  combo = gimp_color_profile_combo_box_new_with_model (chooser,
+                                                       GTK_TREE_MODEL (store));
+  g_object_unref (store);
+
+  gimp_color_profile_combo_box_set_active_file (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
+                                                NULL, NULL);
+
+  return combo;
+}
+
+static void
+color_profile_dialog_response (GtkWidget     *dialog,
+                               gint           response_id,
+                               ProfileDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpColorProfile *profile = NULL;
+      GFile            *file;
+
+      file = gimp_color_profile_combo_box_get_active_file (GIMP_COLOR_PROFILE_COMBO_BOX (private->combo));
+
+      if (file)
+        {
+          GError *error = NULL;
+
+          profile = gimp_color_profile_new_from_file (file, &error);
+          g_object_unref (file);
+
+          if (! profile)
+            {
+              gimp_message (private->image->gimp, G_OBJECT (dialog),
+                            GIMP_MESSAGE_ERROR,
+                            "%s", error->message);
+              g_clear_error (&error);
+
+              return;
+            }
+        }
+      else if (private->default_profile)
+        {
+          profile = g_object_ref (private->default_profile);
+        }
+
+      private->callback (dialog,
+                         private->image,
+                         profile,
+                         file,
+                         private->intent,
+                         private->bpc,
+                         private->user_data);
+
+      if (profile)
+        g_object_unref (profile);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
+
+static void
+color_profile_dest_changed (GtkWidget     *combo,
+                            ProfileDialog *private)
+{
+  GimpColorProfile *dest_profile = NULL;
+  GFile            *file;
+
+  file = gimp_color_profile_combo_box_get_active_file (GIMP_COLOR_PROFILE_COMBO_BOX (combo));
+
+  if (file)
+    {
+      GError *error = NULL;
+
+      dest_profile = gimp_color_profile_new_from_file (file, &error);
+      g_object_unref (file);
+
+      if (! dest_profile)
+        {
+          gimp_color_profile_view_set_error (GIMP_COLOR_PROFILE_VIEW (private->dest_view),
+                                             error->message);
+          g_clear_error (&error);
+        }
+    }
+  else if (private->default_profile)
+    {
+      dest_profile = g_object_ref (private->default_profile);
+    }
+  else
+    {
+      gimp_color_profile_view_set_error (GIMP_COLOR_PROFILE_VIEW (private->dest_view),
+                                         C_("profile", "None"));
+    }
+
+  if (dest_profile)
+    {
+      gimp_color_profile_view_set_profile (GIMP_COLOR_PROFILE_VIEW (private->dest_view),
+                                           dest_profile);
+      g_object_unref (dest_profile);
+    }
+}
diff --git a/app/dialogs/color-profile-dialog.h b/app/dialogs/color-profile-dialog.h
new file mode 100644
index 0000000..5f3921d
--- /dev/null
+++ b/app/dialogs/color-profile-dialog.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * color-profile-dialog.h
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __COLOR_PROFILE_DIALOG_H__
+#define __COLOR_PROFILE_DIALOG_H__
+
+
+typedef enum
+{
+  COLOR_PROFILE_DIALOG_ASSIGN_PROFILE,
+  COLOR_PROFILE_DIALOG_CONVERT_TO_PROFILE,
+  COLOR_PROFILE_DIALOG_CONVERT_TO_RGB,
+  COLOR_PROFILE_DIALOG_CONVERT_TO_GRAY,
+  COLOR_PROFILE_DIALOG_SELECT_SOFTPROOF_PROFILE
+} ColorProfileDialogType;
+
+
+typedef void (* GimpColorProfileCallback) (GtkWidget                *dialog,
+                                           GimpImage                *image,
+                                           GimpColorProfile         *new_profile,
+                                           GFile                    *new_file,
+                                           GimpColorRenderingIntent  intent,
+                                           gboolean                  bpc,
+                                           gpointer                  user_data);
+
+
+GtkWidget * color_profile_dialog_new (ColorProfileDialogType    dialog_type,
+                                      GimpImage                *image,
+                                      GimpContext              *context,
+                                      GtkWidget                *parent,
+                                      GimpColorProfile         *current_profile,
+                                      GimpColorProfile         *default_profile,
+                                      GimpColorRenderingIntent  intent,
+                                      gboolean                  bpc,
+                                      GimpColorProfileCallback  callback,
+                                      gpointer                  user_data);
+
+
+#endif  /*  __COLOR_PROFILE_DIALOG_H__  */
diff --git a/app/dialogs/color-profile-import-dialog.c b/app/dialogs/color-profile-import-dialog.c
new file mode 100644
index 0000000..86f2be3
--- /dev/null
+++ b/app/dialogs/color-profile-import-dialog.c
@@ -0,0 +1,216 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * color-profile-import-dialog.h
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * Partly based on the lcms plug-in
+ * Copyright (C) 2006, 2007  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-constructors.h"
+
+#include "color-profile-import-dialog.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GimpColorProfilePolicy
+color_profile_import_dialog_run (GimpImage                 *image,
+                                 GimpContext               *context,
+                                 GtkWidget                 *parent,
+                                 GimpColorProfile         **dest_profile,
+                                 GimpColorRenderingIntent  *intent,
+                                 gboolean                  *bpc,
+                                 gboolean                  *dont_ask)
+{
+  GtkWidget              *dialog;
+  GtkWidget              *main_vbox;
+  GtkWidget              *vbox;
+  GtkWidget              *frame;
+  GtkWidget              *label;
+  GtkWidget              *intent_combo;
+  GtkWidget              *bpc_toggle;
+  GtkWidget              *dont_ask_toggle;
+  GimpColorProfile       *src_profile;
+  GimpColorProfilePolicy  policy;
+  const gchar            *title;
+  const gchar            *frame_title;
+  gchar                  *text;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_COLOR_PROFILE_POLICY_KEEP);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_COLOR_PROFILE_POLICY_KEEP);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent),
+                        GIMP_COLOR_PROFILE_POLICY_KEEP);
+  g_return_val_if_fail (dest_profile != NULL, GIMP_COLOR_PROFILE_POLICY_KEEP);
+
+  src_profile   = gimp_image_get_color_profile (image);
+  *dest_profile = gimp_image_get_builtin_color_profile (image);
+
+  if (gimp_image_get_base_type (image) == GIMP_GRAY)
+    {
+      title       = _("Convert to Grayscale Working Space?");
+      frame_title = _("Convert the image to the built-in grayscale color profile?");
+    }
+  else
+    {
+      title       = _("Convert to RGB Working Space?");
+      frame_title = _("Convert the image to the built-in sRGB color profile?");
+    }
+
+  dialog =
+    gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                              title,
+                              "gimp-image-color-profile-import",
+                              NULL,
+                              _("Import the image from a color profile"),
+                              parent,
+                              gimp_standard_help_func,
+                              GIMP_HELP_IMAGE_COLOR_PROFILE_IMPORT,
+
+                              _("_Keep"),    GTK_RESPONSE_CANCEL,
+                              _("C_onvert"), GTK_RESPONSE_OK,
+
+                              NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+  text = g_strdup_printf (_("The image '%s' has an embedded color profile"),
+                          gimp_image_get_display_name (image));
+  frame = gimp_frame_new (text);
+  g_free (text);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  label = gimp_color_profile_label_new (src_profile);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_widget_show (label);
+
+  frame = gimp_frame_new (frame_title);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  label = gimp_color_profile_label_new (*dest_profile);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_widget_show (label);
+
+  if (intent && bpc)
+    {
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+      gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+      gtk_widget_show (vbox);
+    }
+  else
+    {
+      vbox = main_vbox;
+    }
+
+  if (intent)
+    {
+      GtkWidget *hbox;
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      label = gtk_label_new_with_mnemonic (_("_Rendering Intent:"));
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+
+      intent_combo = gimp_enum_combo_box_new (GIMP_TYPE_COLOR_RENDERING_INTENT);
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (intent_combo),
+                                     *intent);
+      gtk_box_pack_start (GTK_BOX (hbox), intent_combo, TRUE, TRUE, 0);
+      gtk_widget_show (intent_combo);
+
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), intent_combo);
+    }
+
+  if (bpc)
+    {
+      bpc_toggle =
+        gtk_check_button_new_with_mnemonic (_("_Black Point Compensation"));
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bpc_toggle), *bpc);
+      gtk_box_pack_start (GTK_BOX (vbox), bpc_toggle, FALSE, FALSE, 0);
+      gtk_widget_show (bpc_toggle);
+    }
+
+  if (dont_ask)
+    {
+      dont_ask_toggle =
+        gtk_check_button_new_with_mnemonic (_("_Don't ask me again"));
+      gtk_box_pack_end (GTK_BOX (main_vbox), dont_ask_toggle, FALSE, FALSE, 0);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dont_ask_toggle), FALSE);
+      gtk_widget_show (dont_ask_toggle);
+    }
+
+  switch (gtk_dialog_run (GTK_DIALOG (dialog)))
+    {
+    case GTK_RESPONSE_OK:
+      policy = GIMP_COLOR_PROFILE_POLICY_CONVERT;
+      g_object_ref (*dest_profile);
+      break;
+
+    default:
+      policy = GIMP_COLOR_PROFILE_POLICY_KEEP;
+      break;
+    }
+
+  if (intent)
+    gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (intent_combo),
+                                   (gint *) intent);
+
+  if (bpc)
+    *bpc = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (bpc_toggle));
+
+  if (dont_ask)
+    *dont_ask = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dont_ask_toggle));
+
+  gtk_widget_destroy (dialog);
+
+  return policy;
+}
diff --git a/app/dialogs/color-profile-import-dialog.h b/app/dialogs/color-profile-import-dialog.h
new file mode 100644
index 0000000..2b91d4c
--- /dev/null
+++ b/app/dialogs/color-profile-import-dialog.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * color-profile-import-dialog.h
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __COLOR_PROFILE_IMPORT_DIALOG_H__
+#define __COLOR_PROFILE_IMPORT_DIALOG_H__
+
+
+GimpColorProfilePolicy
+    color_profile_import_dialog_run (GimpImage                 *image,
+                                     GimpContext               *context,
+                                     GtkWidget                 *parent,
+                                     GimpColorProfile         **dest_profile,
+                                     GimpColorRenderingIntent  *intent,
+                                     gboolean                  *bpc,
+                                     gboolean                  *dont_ask);
+
+
+#endif  /*  __COLOR_PROFILE_IMPORT_DIALOG_H__  */
diff --git a/app/dialogs/convert-indexed-dialog.c b/app/dialogs/convert-indexed-dialog.c
new file mode 100644
index 0000000..95b705d
--- /dev/null
+++ b/app/dialogs/convert-indexed-dialog.c
@@ -0,0 +1,436 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+#include "core/gimppalette.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "convert-indexed-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _IndexedDialog IndexedDialog;
+
+struct _IndexedDialog
+{
+  GimpImage                  *image;
+  GimpConvertPaletteType      palette_type;
+  gint                        max_colors;
+  gboolean                    remove_duplicates;
+  GimpConvertDitherType       dither_type;
+  gboolean                    dither_alpha;
+  gboolean                    dither_text_layers;
+  GimpPalette                *custom_palette;
+  GimpConvertIndexedCallback  callback;
+  gpointer                    user_data;
+
+  GtkWidget                  *dialog;
+  GimpContext                *context;
+  GimpContainer              *container;
+  GtkWidget                  *duplicates_toggle;
+};
+
+
+static void        convert_dialog_free            (IndexedDialog *private);
+static void        convert_dialog_response        (GtkWidget     *widget,
+                                                   gint           response_id,
+                                                   IndexedDialog *private);
+static GtkWidget * convert_dialog_palette_box     (IndexedDialog *private);
+static gboolean    convert_dialog_palette_filter  (GimpObject    *object,
+                                                   gpointer       user_data);
+static void        convert_dialog_palette_changed (GimpContext   *context,
+                                                   GimpPalette   *palette,
+                                                   IndexedDialog *private);
+static void        convert_dialog_type_update     (GtkWidget     *widget,
+                                                   IndexedDialog *private);
+
+
+
+/*  public functions  */
+
+GtkWidget *
+convert_indexed_dialog_new (GimpImage                  *image,
+                            GimpContext                *context,
+                            GtkWidget                  *parent,
+                            GimpConvertPaletteType      palette_type,
+                            gint                        max_colors,
+                            gboolean                    remove_duplicates,
+                            GimpConvertDitherType       dither_type,
+                            gboolean                    dither_alpha,
+                            gboolean                    dither_text_layers,
+                            GimpPalette                *custom_palette,
+                            GimpConvertIndexedCallback  callback,
+                            gpointer                    user_data)
+{
+  IndexedDialog *private;
+  GtkWidget     *dialog;
+  GtkWidget     *button;
+  GtkWidget     *main_vbox;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *label;
+  GtkAdjustment *adjustment;
+  GtkWidget     *spinbutton;
+  GtkWidget     *frame;
+  GtkWidget     *toggle;
+  GtkWidget     *palette_box;
+  GtkWidget     *combo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (custom_palette == NULL ||
+                        GIMP_IS_PALETTE (custom_palette), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (IndexedDialog);
+
+  private->image              = image;
+  private->palette_type       = palette_type;
+  private->max_colors         = max_colors;
+  private->remove_duplicates  = remove_duplicates;
+  private->dither_type        = dither_type;
+  private->dither_alpha       = dither_alpha;
+  private->dither_text_layers = dither_text_layers;
+  private->custom_palette     = custom_palette;
+  private->callback           = callback;
+  private->user_data          = user_data;
+
+  private->dialog = dialog =
+    gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                              _("Indexed Color Conversion"),
+                              "gimp-image-convert-indexed",
+                              GIMP_ICON_CONVERT_INDEXED,
+                              _("Convert Image to Indexed Colors"),
+                              parent,
+                              gimp_standard_help_func,
+                              GIMP_HELP_IMAGE_CONVERT_INDEXED,
+
+                              _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                              _("C_onvert"), GTK_RESPONSE_OK,
+
+                              NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) convert_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (convert_dialog_response),
+                    private);
+
+  palette_box = convert_dialog_palette_box (private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+
+  /*  palette  */
+
+  frame =
+    gimp_enum_radio_frame_new_with_range (GIMP_TYPE_CONVERT_PALETTE_TYPE,
+                                          GIMP_CONVERT_PALETTE_GENERATE,
+                                          (palette_box ?
+                                           GIMP_CONVERT_PALETTE_CUSTOM :
+                                           GIMP_CONVERT_PALETTE_MONO),
+                                          gtk_label_new (_("Colormap")),
+                                          G_CALLBACK (convert_dialog_type_update),
+                                          private,
+                                          &button);
+
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (button),
+                                   private->palette_type);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  max n_colors  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gimp_enum_radio_frame_add (GTK_FRAME (frame), hbox,
+                             GIMP_CONVERT_PALETTE_GENERATE, TRUE);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("_Maximum number of colors:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  if (private->max_colors == 256 && gimp_image_has_alpha (image))
+    private->max_colors = 255;
+
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (private->max_colors, 2, 256, 1, 8, 0);
+  spinbutton = gimp_spin_button_new (adjustment, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  g_signal_connect (adjustment, "value-changed",
+                    G_CALLBACK (gimp_int_adjustment_update),
+                    &private->max_colors);
+
+  /*  custom palette  */
+  if (palette_box)
+    {
+      gimp_enum_radio_frame_add (GTK_FRAME (frame), palette_box,
+                                 GIMP_CONVERT_PALETTE_CUSTOM, TRUE);
+      gtk_widget_show (palette_box);
+    }
+
+  vbox = gtk_bin_get_child (GTK_BIN (frame));
+
+  private->duplicates_toggle = toggle =
+    gtk_check_button_new_with_mnemonic (_("_Remove unused and duplicate "
+                                          "colors from colormap"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
+                                private->remove_duplicates);
+  gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 3);
+  gtk_widget_show (toggle);
+
+  if (private->palette_type == GIMP_CONVERT_PALETTE_GENERATE ||
+      private->palette_type == GIMP_CONVERT_PALETTE_MONO)
+    gtk_widget_set_sensitive (toggle, FALSE);
+
+  g_signal_connect (toggle, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->remove_duplicates);
+
+  /*  dithering  */
+
+  frame = gimp_frame_new (_("Dithering"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("Color _dithering:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  combo = gimp_enum_combo_box_new (GIMP_TYPE_CONVERT_DITHER_TYPE);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                              private->dither_type,
+                              G_CALLBACK (gimp_int_combo_box_get_active),
+                              &private->dither_type);
+
+  toggle =
+    gtk_check_button_new_with_mnemonic (_("Enable dithering of _transparency"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
+                                private->dither_alpha);
+  gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
+  gtk_widget_show (toggle);
+
+  g_signal_connect (toggle, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->dither_alpha);
+
+
+  toggle =
+    gtk_check_button_new_with_mnemonic (_("Enable dithering of text _layers"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
+                                private->dither_text_layers);
+  gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
+  gtk_widget_show (toggle);
+
+  g_signal_connect (toggle, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->dither_text_layers);
+
+  gimp_help_set_help_data (toggle,
+                           _("Dithering text layers will make them uneditable"),
+                           NULL);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+convert_dialog_free (IndexedDialog *private)
+{
+  if (private->container)
+    g_object_unref (private->container);
+
+  if (private->context)
+    g_object_unref (private->context);
+
+  g_slice_free (IndexedDialog, private);
+}
+
+static void
+convert_dialog_response (GtkWidget     *dialog,
+                         gint           response_id,
+                         IndexedDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      private->callback (dialog,
+                         private->image,
+                         private->palette_type,
+                         private->max_colors,
+                         private->remove_duplicates,
+                         private->dither_type,
+                         private->dither_alpha,
+                         private->dither_text_layers,
+                         private->custom_palette,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
+
+static GtkWidget *
+convert_dialog_palette_box (IndexedDialog *private)
+{
+  Gimp        *gimp = private->image->gimp;
+  GList       *list;
+  GimpPalette *web_palette  = NULL;
+  gboolean     custom_found = FALSE;
+
+  /* We can't dither to > 256 colors */
+  private->container =
+    gimp_container_filter (gimp_data_factory_get_container (gimp->palette_factory),
+                           convert_dialog_palette_filter,
+                           NULL);
+
+  if (gimp_container_is_empty (private->container))
+    {
+      g_object_unref (private->container);
+      private->container = NULL;
+      return NULL;
+    }
+
+  private->context = gimp_context_new (gimp, "convert-dialog", NULL);
+
+  for (list = GIMP_LIST (private->container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpPalette *palette = list->data;
+
+      /* Preferentially, the initial default is 'Web' if available */
+      if (web_palette == NULL &&
+          g_ascii_strcasecmp (gimp_object_get_name (palette), "Web") == 0)
+        {
+          web_palette = palette;
+        }
+
+      if (private->custom_palette == palette)
+        custom_found = TRUE;
+    }
+
+  if (! custom_found)
+    {
+      if (web_palette)
+        private->custom_palette = web_palette;
+      else
+        private->custom_palette = GIMP_LIST (private->container)->queue->head->data;
+    }
+
+  gimp_context_set_palette (private->context, private->custom_palette);
+
+  g_signal_connect (private->context, "palette-changed",
+                    G_CALLBACK (convert_dialog_palette_changed),
+                    private);
+
+  return gimp_palette_box_new (private->container, private->context, NULL, 4);
+}
+
+static gboolean
+convert_dialog_palette_filter (GimpObject *object,
+                               gpointer    user_data)
+{
+  GimpPalette *palette = GIMP_PALETTE (object);
+
+  return (gimp_palette_get_n_colors (palette) > 0 &&
+          gimp_palette_get_n_colors (palette) <= 256);
+}
+
+static void
+convert_dialog_palette_changed (GimpContext   *context,
+                                GimpPalette   *palette,
+                                IndexedDialog *private)
+{
+  if (! palette)
+    return;
+
+  if (gimp_palette_get_n_colors (palette) > 256)
+    {
+      gimp_message (private->image->gimp, G_OBJECT (private->dialog),
+                    GIMP_MESSAGE_WARNING,
+                    _("Cannot convert to a palette "
+                      "with more than 256 colors."));
+    }
+  else
+    {
+      private->custom_palette = palette;
+    }
+}
+
+static void
+convert_dialog_type_update (GtkWidget     *widget,
+                            IndexedDialog *private)
+{
+  gimp_radio_button_update (widget, &private->palette_type);
+
+  if (private->duplicates_toggle)
+    gtk_widget_set_sensitive (private->duplicates_toggle,
+                              private->palette_type !=
+                              GIMP_CONVERT_PALETTE_GENERATE &&
+                              private->palette_type !=
+                              GIMP_CONVERT_PALETTE_MONO);
+}
diff --git a/app/dialogs/convert-indexed-dialog.h b/app/dialogs/convert-indexed-dialog.h
new file mode 100644
index 0000000..df0ca50
--- /dev/null
+++ b/app/dialogs/convert-indexed-dialog.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONVERT_INDEXED_DIALOG_H__
+#define __CONVERT_INDEXED_DIALOG_H__
+
+
+typedef void (* GimpConvertIndexedCallback) (GtkWidget              *dialog,
+                                             GimpImage              *image,
+                                             GimpConvertPaletteType  palette_type,
+                                             gint                    max_colors,
+                                             gboolean                remove_duplicates,
+                                             GimpConvertDitherType   dither_type,
+                                             gboolean                dither_alpha,
+                                             gboolean                dither_text_layers,
+                                             GimpPalette            *custom_palette,
+                                             gpointer                user_data);
+
+
+GtkWidget * convert_indexed_dialog_new (GimpImage                  *image,
+                                        GimpContext                *context,
+                                        GtkWidget                  *parent,
+                                        GimpConvertPaletteType      palette_type,
+                                        gint                        max_colors,
+                                        gboolean                    remove_duplicates,
+                                        GimpConvertDitherType       dither_type,
+                                        gboolean                    dither_alpha,
+                                        gboolean                    dither_text_layers,
+                                        GimpPalette                *custom_palette,
+                                        GimpConvertIndexedCallback  callback,
+                                        gpointer                    user_data);
+
+
+#endif  /*  __CONVERT_INDEXED_DIALOG_H__  */
diff --git a/app/dialogs/convert-precision-dialog.c b/app/dialogs/convert-precision-dialog.c
new file mode 100644
index 0000000..180106b
--- /dev/null
+++ b/app/dialogs/convert-precision-dialog.c
@@ -0,0 +1,342 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "convert-precision-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _ConvertDialog ConvertDialog;
+
+struct _ConvertDialog
+{
+  GimpImage                    *image;
+  GimpComponentType             component_type;
+  gboolean                      linear;
+  GeglDitherMethod              layer_dither_method;
+  GeglDitherMethod              text_layer_dither_method;
+  GeglDitherMethod              channel_dither_method;
+  GimpConvertPrecisionCallback  callback;
+  gpointer                      user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void   convert_precision_dialog_free     (ConvertDialog    *private);
+static void   convert_precision_dialog_response (GtkWidget        *widget,
+                                                 gint              response_id,
+                                                 ConvertDialog    *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+convert_precision_dialog_new (GimpImage                    *image,
+                              GimpContext                  *context,
+                              GtkWidget                    *parent,
+                              GimpComponentType             component_type,
+                              GeglDitherMethod              layer_dither_method,
+                              GeglDitherMethod              text_layer_dither_method,
+                              GeglDitherMethod              channel_dither_method,
+                              GimpConvertPrecisionCallback  callback,
+                              gpointer                      user_data)
+
+{
+  ConvertDialog *private;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *vbox;
+  GtkWidget     *frame;
+  const gchar   *enum_desc;
+  gchar         *blurb;
+  const Babl    *old_format;
+  const Babl    *new_format;
+  gint           old_bits;
+  gint           new_bits;
+  gboolean       dither;
+  gboolean       linear;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  /* random formats with the right precision */
+  old_format = gimp_image_get_layer_format (image, FALSE);
+  new_format = gimp_babl_format (GIMP_RGB,
+                                 gimp_babl_precision (component_type, FALSE),
+                                 FALSE);
+
+  old_bits = (babl_format_get_bytes_per_pixel (old_format) * 8 /
+              babl_format_get_n_components (old_format));
+  new_bits = (babl_format_get_bytes_per_pixel (new_format) * 8 /
+              babl_format_get_n_components (new_format));
+
+  /*  don't dither if we are converting to a higher bit depth,
+   *  or to more than MAX_DITHER_BITS.
+   */
+  dither = (new_bits <  old_bits &&
+            new_bits <= CONVERT_PRECISION_DIALOG_MAX_DITHER_BITS);
+
+  /* when changing this logic, also change the same switch()
+   * in gimptemplateeditor.h
+   */
+  switch (component_type)
+    {
+    case GIMP_COMPONENT_TYPE_U8:
+      /* default to gamma when converting 8 bit */
+      linear = FALSE;
+      break;
+
+    case GIMP_COMPONENT_TYPE_U16:
+    case GIMP_COMPONENT_TYPE_U32:
+    default:
+      /* leave gamma alone by default when converting to 16/32 bit int */
+      linear = gimp_babl_format_get_linear (old_format);
+      break;
+
+    case GIMP_COMPONENT_TYPE_HALF:
+    case GIMP_COMPONENT_TYPE_FLOAT:
+    case GIMP_COMPONENT_TYPE_DOUBLE:
+      /* default to linear when converting to floating point */
+      linear = TRUE;
+      break;
+    }
+
+  private = g_slice_new0 (ConvertDialog);
+
+  private->image                    = image;
+  private->component_type           = component_type;
+  private->linear                   = linear;
+  private->layer_dither_method      = layer_dither_method;
+  private->text_layer_dither_method = text_layer_dither_method;
+  private->channel_dither_method    = channel_dither_method;
+  private->callback                 = callback;
+  private->user_data                = user_data;
+
+  gimp_enum_get_value (GIMP_TYPE_COMPONENT_TYPE, component_type,
+                       NULL, NULL, &enum_desc, NULL);
+
+  blurb = g_strdup_printf (_("Convert Image to %s"), enum_desc);
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+#if PENDING_TRANSLATION
+                                     _("Encoding Conversion"),
+#endif
+                                     _("Precision Conversion"),
+                                     "gimp-image-convert-precision",
+                                     GIMP_ICON_CONVERT_PRECISION,
+                                     blurb,
+                                     parent,
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_IMAGE_CONVERT_PRECISION,
+
+                                     _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                                     _("C_onvert"), GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  g_free (blurb);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) convert_precision_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (convert_precision_dialog_response),
+                    private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+
+  /*  gamma  */
+
+  frame = gimp_frame_new (_("Gamma"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gimp_int_radio_group_new (FALSE, NULL,
+                                   G_CALLBACK (gimp_radio_button_update),
+                                   &private->linear,
+                                   linear,
+
+                                   _("Perceptual gamma (sRGB)"), FALSE, NULL,
+                                   _("Linear light"),            TRUE,  NULL,
+
+                                   NULL);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+
+  /*  dithering  */
+
+  if (dither)
+    {
+      GtkWidget    *hbox;
+      GtkWidget    *label;
+      GtkWidget    *combo;
+      GtkSizeGroup *size_group;
+
+      frame = gimp_frame_new (_("Dithering"));
+      gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+      gtk_widget_show (frame);
+
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+      gtk_container_add (GTK_CONTAINER (frame), vbox);
+      gtk_widget_show (vbox);
+
+      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+      /*  layers  */
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      label = gtk_label_new_with_mnemonic (_("_Layers:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_size_group_add_widget (size_group, label);
+      gtk_widget_show (label);
+
+      combo = gimp_enum_combo_box_new (GEGL_TYPE_DITHER_METHOD);
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+      gtk_widget_show (combo);
+
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  private->layer_dither_method,
+                                  G_CALLBACK (gimp_int_combo_box_get_active),
+                                  &private->layer_dither_method);
+
+      /*  text layers  */
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      label = gtk_label_new_with_mnemonic (_("_Text Layers:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_size_group_add_widget (size_group, label);
+      gtk_widget_show (label);
+
+      combo = gimp_enum_combo_box_new (GEGL_TYPE_DITHER_METHOD);
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+      gtk_widget_show (combo);
+
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  private->text_layer_dither_method,
+                                  G_CALLBACK (gimp_int_combo_box_get_active),
+                                  &private->text_layer_dither_method);
+
+      gimp_help_set_help_data (combo,
+                               _("Dithering text layers will make them "
+                                 "uneditable"),
+                               NULL);
+
+      /*  channels  */
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      label = gtk_label_new_with_mnemonic (_("_Channels and Masks:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_size_group_add_widget (size_group, label);
+      gtk_widget_show (label);
+
+      combo = gimp_enum_combo_box_new (GEGL_TYPE_DITHER_METHOD);
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+      gtk_widget_show (combo);
+
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  private->channel_dither_method,
+                                  G_CALLBACK (gimp_int_combo_box_get_active),
+                                  &private->channel_dither_method);
+
+      g_object_unref (size_group);
+    }
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+convert_precision_dialog_free (ConvertDialog *private)
+{
+  g_slice_free (ConvertDialog, private);
+}
+
+static void
+convert_precision_dialog_response (GtkWidget     *dialog,
+                                   gint           response_id,
+                                   ConvertDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpPrecision precision = gimp_babl_precision (private->component_type,
+                                                     private->linear);
+
+      private->callback (dialog,
+                         private->image,
+                         precision,
+                         private->layer_dither_method,
+                         private->text_layer_dither_method,
+                         private->channel_dither_method,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
diff --git a/app/dialogs/convert-precision-dialog.h b/app/dialogs/convert-precision-dialog.h
new file mode 100644
index 0000000..7d4ebcd
--- /dev/null
+++ b/app/dialogs/convert-precision-dialog.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONVERT_PRECISION_DIALOG_H__
+#define __CONVERT_PRECISION_DIALOG_H__
+
+
+/*  Don't offer dithering when converting down to more than this
+ *  number of bits per component. Note that gegl:dither would
+ *  do 16 bit, so this is a limitation of the GUI to values that make
+ *  sense. See bug #735895.
+ */
+#define CONVERT_PRECISION_DIALOG_MAX_DITHER_BITS 8
+
+
+typedef void (* GimpConvertPrecisionCallback) (GtkWidget        *dialog,
+                                               GimpImage        *image,
+                                               GimpPrecision     precision,
+                                               GeglDitherMethod  layer_dither_method,
+                                               GeglDitherMethod  text_layer_dither_method,
+                                               GeglDitherMethod  channel_dither_method,
+                                               gpointer          user_data);
+
+
+GtkWidget * convert_precision_dialog_new (GimpImage                    *image,
+                                          GimpContext                  *context,
+                                          GtkWidget                    *parent,
+                                          GimpComponentType             component_type,
+                                          GeglDitherMethod              layer_dither_method,
+                                          GeglDitherMethod              text_layer_dither_method,
+                                          GeglDitherMethod              channel_dither_method,
+                                          GimpConvertPrecisionCallback  callback,
+                                          gpointer                      user_data);
+
+
+#endif  /*  __CONVERT_PRECISION_DIALOG_H__  */
diff --git a/app/dialogs/data-delete-dialog.c b/app/dialogs/data-delete-dialog.c
new file mode 100644
index 0000000..77b73a8
--- /dev/null
+++ b/app/dialogs/data-delete-dialog.c
@@ -0,0 +1,159 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+#include "core/gimpdatafactory.h"
+
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+
+#include "data-delete-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _DataDeleteDialog DataDeleteDialog;
+
+struct _DataDeleteDialog
+{
+  GimpDataFactory *factory;
+  GimpData        *data;
+  GimpContext     *context;
+  GtkWidget       *parent;
+};
+
+
+/*  local function prototypes  */
+
+static void  data_delete_dialog_response (GtkWidget        *dialog,
+                                          gint              response_id,
+                                          DataDeleteDialog *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+data_delete_dialog_new (GimpDataFactory *factory,
+                        GimpData        *data,
+                        GimpContext     *context,
+                        GtkWidget       *parent)
+{
+  DataDeleteDialog *private;
+  GtkWidget        *dialog;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_DATA (data), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+
+  private = g_slice_new0 (DataDeleteDialog);
+
+  private->factory = factory;
+  private->data    = data;
+  private->context = context;
+  private->parent  = parent;
+
+  dialog = gimp_message_dialog_new (_("Delete Object"), "edit-delete",
+                                    gtk_widget_get_toplevel (parent), 0,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("_Delete"), GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect_object (data, "disconnect",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, G_CONNECT_SWAPPED);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (data_delete_dialog_response),
+                    private);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Delete '%s'?"),
+                                     gimp_object_get_name (data));
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("Are you sure you want to remove '%s' "
+                               "from the list and delete it on disk?"),
+                             gimp_object_get_name (data));
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+data_delete_dialog_response (GtkWidget        *dialog,
+                             gint              response_id,
+                             DataDeleteDialog *private)
+{
+  gtk_widget_destroy (dialog);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpDataFactory *factory    = private->factory;
+      GimpData        *data       = private->data;
+      GimpContainer   *container;
+      GimpObject      *new_active = NULL;
+      GError          *error      = NULL;
+
+      container = gimp_data_factory_get_container (factory);
+
+      if (private->context &&
+          GIMP_OBJECT (data) ==
+          gimp_context_get_by_type (private->context,
+                                    gimp_container_get_children_type (container)))
+        {
+          new_active = gimp_container_get_neighbor_of (container,
+                                                       GIMP_OBJECT (data));
+        }
+
+      if (! gimp_data_factory_data_delete (factory, data, TRUE, &error))
+        {
+          gimp_message (gimp_data_factory_get_gimp (factory),
+                        G_OBJECT (private->parent), GIMP_MESSAGE_ERROR,
+                        "%s", error->message);
+          g_clear_error (&error);
+        }
+
+      if (new_active)
+        gimp_context_set_by_type (private->context,
+                                  gimp_container_get_children_type (container),
+                                  new_active);
+    }
+
+  g_slice_free (DataDeleteDialog, private);
+}
diff --git a/app/dialogs/data-delete-dialog.h b/app/dialogs/data-delete-dialog.h
new file mode 100644
index 0000000..1b41a96
--- /dev/null
+++ b/app/dialogs/data-delete-dialog.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DATA_DELETE_DIALOG_H__
+#define __DATA_DELETE_DIALOG_H__
+
+
+GtkWidget * data_delete_dialog_new (GimpDataFactory *factory,
+                                    GimpData        *data,
+                                    GimpContext     *context,
+                                    GtkWidget       *parent);
+
+
+#endif /* __DATA_DELETE_DIALOG_H__ */
diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c
new file mode 100644
index 0000000..f80a3e8
--- /dev/null
+++ b/app/dialogs/dialogs-constructors.c
@@ -0,0 +1,894 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "widgets/gimpbrusheditor.h"
+#include "widgets/gimpbrushfactoryview.h"
+#include "widgets/gimpbufferview.h"
+#include "widgets/gimpchanneltreeview.h"
+#include "widgets/gimpcoloreditor.h"
+#include "widgets/gimpcolormapeditor.h"
+#include "widgets/gimpcriticaldialog.h"
+#include "widgets/gimpdashboard.h"
+#include "widgets/gimpdevicestatus.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimpdocumentview.h"
+#include "widgets/gimpdynamicseditor.h"
+#include "widgets/gimpdynamicsfactoryview.h"
+#include "widgets/gimperrorconsole.h"
+#include "widgets/gimperrordialog.h"
+#include "widgets/gimpfontfactoryview.h"
+#include "widgets/gimpgradienteditor.h"
+#include "widgets/gimphistogrameditor.h"
+#include "widgets/gimpimageview.h"
+#include "widgets/gimplayertreeview.h"
+#include "widgets/gimpmenudock.h"
+#include "widgets/gimppaletteeditor.h"
+#include "widgets/gimppatternfactoryview.h"
+#include "widgets/gimpsamplepointeditor.h"
+#include "widgets/gimpselectioneditor.h"
+#include "widgets/gimpsymmetryeditor.h"
+#include "widgets/gimptemplateview.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimptooloptionseditor.h"
+#include "widgets/gimptoolpresetfactoryview.h"
+#include "widgets/gimptoolpreseteditor.h"
+#include "widgets/gimpundoeditor.h"
+#include "widgets/gimpvectorstreeview.h"
+
+#include "display/gimpcursorview.h"
+#include "display/gimpnavigationeditor.h"
+
+#include "about-dialog.h"
+#include "action-search-dialog.h"
+#include "dialogs.h"
+#include "dialogs-constructors.h"
+#include "file-open-dialog.h"
+#include "file-open-location-dialog.h"
+#include "file-save-dialog.h"
+#include "image-new-dialog.h"
+#include "input-devices-dialog.h"
+#include "keyboard-shortcuts-dialog.h"
+#include "module-dialog.h"
+#include "palette-import-dialog.h"
+#include "preferences-dialog.h"
+#include "quit-dialog.h"
+#include "tips-dialog.h"
+
+#include "gimp-intl.h"
+
+
+/**********************/
+/*  toplevel dialogs  */
+/**********************/
+
+GtkWidget *
+dialogs_image_new_new (GimpDialogFactory *factory,
+                       GimpContext       *context,
+                       GimpUIManager     *ui_manager,
+                       gint               view_size)
+{
+  return image_new_dialog_new (context);
+}
+
+GtkWidget *
+dialogs_file_open_new (GimpDialogFactory *factory,
+                       GimpContext       *context,
+                       GimpUIManager     *ui_manager,
+                       gint               view_size)
+{
+  return file_open_dialog_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_file_open_location_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return file_open_location_dialog_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_file_save_new (GimpDialogFactory *factory,
+                       GimpContext       *context,
+                       GimpUIManager     *ui_manager,
+                       gint               view_size)
+{
+  return file_save_dialog_new (context->gimp, FALSE);
+}
+
+GtkWidget *
+dialogs_file_export_new (GimpDialogFactory *factory,
+                         GimpContext       *context,
+                         GimpUIManager     *ui_manager,
+                         gint               view_size)
+{
+  return file_save_dialog_new (context->gimp, TRUE);
+}
+
+GtkWidget *
+dialogs_preferences_get (GimpDialogFactory *factory,
+                         GimpContext       *context,
+                         GimpUIManager     *ui_manager,
+                         gint               view_size)
+{
+  return preferences_dialog_create (context->gimp);
+}
+
+GtkWidget *
+dialogs_keyboard_shortcuts_get (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return keyboard_shortcuts_dialog_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_input_devices_get (GimpDialogFactory *factory,
+                           GimpContext       *context,
+                           GimpUIManager     *ui_manager,
+                           gint               view_size)
+{
+  return input_devices_dialog_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_module_get (GimpDialogFactory *factory,
+                    GimpContext       *context,
+                    GimpUIManager     *ui_manager,
+                    gint               view_size)
+{
+  return module_dialog_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_palette_import_get (GimpDialogFactory *factory,
+                            GimpContext       *context,
+                            GimpUIManager     *ui_manager,
+                            gint               view_size)
+{
+  return palette_import_dialog_new (context);
+}
+
+GtkWidget *
+dialogs_tips_get (GimpDialogFactory *factory,
+                  GimpContext       *context,
+                  GimpUIManager     *ui_manager,
+                  gint               view_size)
+{
+  return tips_dialog_create (context->gimp);
+}
+
+GtkWidget *
+dialogs_about_get (GimpDialogFactory *factory,
+                   GimpContext       *context,
+                   GimpUIManager     *ui_manager,
+                   gint               view_size)
+{
+  return about_dialog_create (context->gimp->edit_config);
+}
+
+GtkWidget *
+dialogs_action_search_get (GimpDialogFactory *factory,
+                           GimpContext       *context,
+                           GimpUIManager     *ui_manager,
+                           gint               view_size)
+{
+  return action_search_dialog_create (context->gimp);
+}
+
+GtkWidget *
+dialogs_error_get (GimpDialogFactory *factory,
+                   GimpContext       *context,
+                   GimpUIManager     *ui_manager,
+                   gint               view_size)
+{
+  return gimp_error_dialog_new (_("GIMP Message"));
+}
+
+GtkWidget *
+dialogs_critical_get (GimpDialogFactory *factory,
+                      GimpContext       *context,
+                      GimpUIManager     *ui_manager,
+                      gint               view_size)
+{
+  return gimp_critical_dialog_new (_("GIMP Debug"),
+                                   context->gimp->config->last_known_release,
+                                   context->gimp->config->last_release_timestamp);
+}
+
+GtkWidget *
+dialogs_close_all_get (GimpDialogFactory *factory,
+                       GimpContext       *context,
+                       GimpUIManager     *ui_manager,
+                       gint               view_size)
+{
+  return close_all_dialog_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_quit_get (GimpDialogFactory *factory,
+                  GimpContext       *context,
+                  GimpUIManager     *ui_manager,
+                  gint               view_size)
+{
+  return quit_dialog_new (context->gimp);
+}
+
+
+/***********/
+/*  docks  */
+/***********/
+
+GtkWidget *
+dialogs_toolbox_new (GimpDialogFactory *factory,
+                     GimpContext       *context,
+                     GimpUIManager     *ui_manager,
+                     gint               view_size)
+{
+  return gimp_toolbox_new (factory,
+                           context,
+                           ui_manager);
+}
+
+GtkWidget *
+dialogs_toolbox_dock_window_new (GimpDialogFactory *factory,
+                                 GimpContext       *context,
+                                 GimpUIManager     *ui_manager,
+                                 gint               view_size)
+{
+  static gint  role_serial = 1;
+  GtkWidget   *dock;
+  gchar       *role;
+
+  role = g_strdup_printf ("gimp-toolbox-%d", role_serial++);
+  dock = gimp_dock_window_new (role,
+                               "<Toolbox>",
+                               TRUE,
+                               factory,
+                               context);
+  g_free (role);
+
+  return dock;
+}
+
+GtkWidget *
+dialogs_dock_new (GimpDialogFactory *factory,
+                  GimpContext       *context,
+                  GimpUIManager     *ui_manager,
+                  gint               view_size)
+{
+  return gimp_menu_dock_new ();
+}
+
+GtkWidget *
+dialogs_dock_window_new (GimpDialogFactory *factory,
+                         GimpContext       *context,
+                         GimpUIManager     *ui_manager,
+                         gint               view_size)
+{
+  static gint  role_serial = 1;
+  GtkWidget   *dock;
+  gchar       *role;
+
+  role = g_strdup_printf ("gimp-dock-%d", role_serial++);
+  dock = gimp_dock_window_new (role,
+                               "<Dock>",
+                               FALSE,
+                               factory,
+                               context);
+  g_free (role);
+
+  return dock;
+}
+
+
+/***************/
+/*  dockables  */
+/***************/
+
+/*****  singleton dialogs  *****/
+
+GtkWidget *
+dialogs_tool_options_new (GimpDialogFactory *factory,
+                          GimpContext       *context,
+                          GimpUIManager     *ui_manager,
+                          gint               view_size)
+{
+  return gimp_tool_options_editor_new (context->gimp,
+                                       gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_device_status_new (GimpDialogFactory *factory,
+                           GimpContext       *context,
+                           GimpUIManager     *ui_manager,
+                           gint               view_size)
+{
+  return gimp_device_status_new (context->gimp);
+}
+
+GtkWidget *
+dialogs_error_console_new (GimpDialogFactory *factory,
+                           GimpContext       *context,
+                           GimpUIManager     *ui_manager,
+                           gint               view_size)
+{
+  return gimp_error_console_new (context->gimp,
+                                 gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_cursor_view_new (GimpDialogFactory *factory,
+                         GimpContext       *context,
+                         GimpUIManager     *ui_manager,
+                         gint               view_size)
+{
+  return gimp_cursor_view_new (gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_dashboard_new (GimpDialogFactory *factory,
+                       GimpContext       *context,
+                       GimpUIManager     *ui_manager,
+                       gint               view_size)
+{
+  return gimp_dashboard_new (context->gimp,
+                             gimp_dialog_factory_get_menu_factory (factory));
+}
+
+
+/*****  list views  *****/
+
+GtkWidget *
+dialogs_image_list_view_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_image_view_new (GIMP_VIEW_TYPE_LIST,
+                              context->gimp->images,
+                              context,
+                              view_size, 1,
+                              gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_brush_list_view_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_brush_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                      context->gimp->brush_factory,
+                                      context,
+                                      TRUE,
+                                      view_size, 1,
+                                      gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_dynamics_list_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_dynamics_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                         context->gimp->dynamics_factory,
+                                         context,
+                                         view_size, 1,
+                                         gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_mypaint_brush_list_view_new (GimpDialogFactory *factory,
+                                     GimpContext       *context,
+                                     GimpUIManager     *ui_manager,
+                                     gint               view_size)
+{
+  return gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                     context->gimp->mybrush_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory),
+                                     "<MyPaintBrushes>",
+                                     "/mypaint-brushes-popup",
+                                     "mypaint-brushes");
+}
+
+GtkWidget *
+dialogs_pattern_list_view_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  return gimp_pattern_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                        context->gimp->pattern_factory,
+                                        context,
+                                        view_size, 1,
+                                        gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_gradient_list_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                     context->gimp->gradient_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory),
+                                     "<Gradients>",
+                                     "/gradients-popup",
+                                     "gradients");
+}
+
+GtkWidget *
+dialogs_palette_list_view_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  return gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                     context->gimp->palette_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory),
+                                     "<Palettes>",
+                                     "/palettes-popup",
+                                     "palettes");
+}
+
+GtkWidget *
+dialogs_font_list_view_new (GimpDialogFactory *factory,
+                            GimpContext       *context,
+                            GimpUIManager     *ui_manager,
+                            gint               view_size)
+{
+  return gimp_font_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                     context->gimp->font_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_buffer_list_view_new (GimpDialogFactory *factory,
+                              GimpContext       *context,
+                              GimpUIManager     *ui_manager,
+                              gint               view_size)
+{
+  return gimp_buffer_view_new (GIMP_VIEW_TYPE_LIST,
+                               context->gimp->named_buffers,
+                               context,
+                               view_size, 1,
+                               gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_tool_preset_list_view_new (GimpDialogFactory *factory,
+                                   GimpContext       *context,
+                                   GimpUIManager     *ui_manager,
+                                   gint               view_size)
+{
+  return gimp_tool_preset_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                            context->gimp->tool_preset_factory,
+                                            context,
+                                            view_size, 1,
+                                            gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_document_list_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_document_view_new (GIMP_VIEW_TYPE_LIST,
+                                 context->gimp->documents,
+                                 context,
+                                 view_size, 0,
+                                 gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_template_list_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_template_view_new (GIMP_VIEW_TYPE_LIST,
+                                 context->gimp->templates,
+                                 context,
+                                 view_size, 0,
+                                 gimp_dialog_factory_get_menu_factory (factory));
+}
+
+
+/*****  grid views  *****/
+
+GtkWidget *
+dialogs_image_grid_view_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_image_view_new (GIMP_VIEW_TYPE_GRID,
+                              context->gimp->images,
+                              context,
+                              view_size, 1,
+                              gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_brush_grid_view_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_brush_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                      context->gimp->brush_factory,
+                                      context,
+                                      TRUE,
+                                      view_size, 1,
+                                      gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_dynamics_grid_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_dynamics_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                         context->gimp->dynamics_factory,
+                                         context,
+                                         view_size, 1,
+                                         gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_mypaint_brush_grid_view_new (GimpDialogFactory *factory,
+                                     GimpContext       *context,
+                                     GimpUIManager     *ui_manager,
+                                     gint               view_size)
+{
+  return gimp_data_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                     context->gimp->mybrush_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory),
+                                     "<MyPaintBrushes>",
+                                     "/mypaint-brushes-popup",
+                                     "mypaint-brushes");
+}
+
+GtkWidget *
+dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  return gimp_pattern_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                        context->gimp->pattern_factory,
+                                        context,
+                                        view_size, 1,
+                                        gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_data_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                     context->gimp->gradient_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory),
+                                     "<Gradients>",
+                                     "/gradients-popup",
+                                     "gradients");
+}
+
+GtkWidget *
+dialogs_palette_grid_view_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  return gimp_data_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                     context->gimp->palette_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory),
+                                     "<Palettes>",
+                                     "/palettes-popup",
+                                     "palettes");
+}
+
+GtkWidget *
+dialogs_font_grid_view_new (GimpDialogFactory *factory,
+                            GimpContext       *context,
+                            GimpUIManager     *ui_manager,
+                            gint               view_size)
+{
+  return gimp_font_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                     context->gimp->font_factory,
+                                     context,
+                                     view_size, 1,
+                                     gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
+                              GimpContext       *context,
+                              GimpUIManager     *ui_manager,
+                              gint               view_size)
+{
+  return gimp_buffer_view_new (GIMP_VIEW_TYPE_GRID,
+                               context->gimp->named_buffers,
+                               context,
+                               view_size, 1,
+                               gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_tool_preset_grid_view_new (GimpDialogFactory *factory,
+                                   GimpContext       *context,
+                                   GimpUIManager     *ui_manager,
+                                   gint               view_size)
+{
+  return gimp_tool_preset_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                            context->gimp->tool_preset_factory,
+                                            context,
+                                            view_size, 1,
+                                            gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_document_grid_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_document_view_new (GIMP_VIEW_TYPE_GRID,
+                                 context->gimp->documents,
+                                 context,
+                                 view_size, 0,
+                                 gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_template_grid_view_new (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_template_view_new (GIMP_VIEW_TYPE_GRID,
+                                 context->gimp->templates,
+                                 context,
+                                 view_size, 0,
+                                 gimp_dialog_factory_get_menu_factory (factory));
+}
+
+
+/*****  image related dialogs  *****/
+
+GtkWidget *
+dialogs_layer_list_view_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  if (view_size < 1)
+    view_size = context->gimp->config->layer_preview_size;
+
+  return gimp_item_tree_view_new (GIMP_TYPE_LAYER_TREE_VIEW,
+                                  view_size, 2,
+                                  gimp_context_get_image (context),
+                                  gimp_dialog_factory_get_menu_factory (factory),
+                                  "<Layers>",
+                                  "/layers-popup");
+}
+
+GtkWidget *
+dialogs_channel_list_view_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  if (view_size < 1)
+    view_size = context->gimp->config->layer_preview_size;
+
+  return gimp_item_tree_view_new (GIMP_TYPE_CHANNEL_TREE_VIEW,
+                                  view_size, 1,
+                                  gimp_context_get_image (context),
+                                  gimp_dialog_factory_get_menu_factory (factory),
+                                  "<Channels>",
+                                  "/channels-popup");
+}
+
+GtkWidget *
+dialogs_vectors_list_view_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  if (view_size < 1)
+    view_size = context->gimp->config->layer_preview_size;
+
+  return gimp_item_tree_view_new (GIMP_TYPE_VECTORS_TREE_VIEW,
+                                  view_size, 1,
+                                  gimp_context_get_image (context),
+                                  gimp_dialog_factory_get_menu_factory (factory),
+                                  "<Vectors>",
+                                  "/vectors-popup");
+}
+
+GtkWidget *
+dialogs_colormap_editor_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_colormap_editor_new (gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_histogram_editor_new (GimpDialogFactory *factory,
+                              GimpContext       *context,
+                              GimpUIManager     *ui_manager,
+                              gint               view_size)
+{
+  return gimp_histogram_editor_new ();
+}
+
+GtkWidget *
+dialogs_selection_editor_new (GimpDialogFactory *factory,
+                              GimpContext       *context,
+                              GimpUIManager     *ui_manager,
+                              gint               view_size)
+{
+  return gimp_selection_editor_new (gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_symmetry_editor_new (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_symmetry_editor_new (gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_undo_editor_new (GimpDialogFactory *factory,
+                         GimpContext       *context,
+                         GimpUIManager     *ui_manager,
+                         gint               view_size)
+{
+  return gimp_undo_editor_new (context->gimp->config,
+                               gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_sample_point_editor_new (GimpDialogFactory *factory,
+                                 GimpContext       *context,
+                                 GimpUIManager     *ui_manager,
+                                 gint               view_size)
+{
+  return gimp_sample_point_editor_new (gimp_dialog_factory_get_menu_factory (factory));
+}
+
+
+/*****  display related dialogs  *****/
+
+GtkWidget *
+dialogs_navigation_editor_new (GimpDialogFactory *factory,
+                               GimpContext       *context,
+                               GimpUIManager     *ui_manager,
+                               gint               view_size)
+{
+  return gimp_navigation_editor_new (gimp_dialog_factory_get_menu_factory (factory));
+}
+
+
+/*****  misc dockables  *****/
+
+GtkWidget *
+dialogs_color_editor_new (GimpDialogFactory *factory,
+                          GimpContext       *context,
+                          GimpUIManager     *ui_manager,
+                          gint               view_size)
+{
+  return gimp_color_editor_new (context);
+}
+
+
+/*************/
+/*  editors  */
+/*************/
+
+GtkWidget *
+dialogs_brush_editor_get (GimpDialogFactory *factory,
+                          GimpContext       *context,
+                          GimpUIManager     *ui_manager,
+                          gint               view_size)
+{
+  return gimp_brush_editor_new (context,
+                                gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_dynamics_editor_get (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_dynamics_editor_new (context,
+                                   gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_gradient_editor_get (GimpDialogFactory *factory,
+                             GimpContext       *context,
+                             GimpUIManager     *ui_manager,
+                             gint               view_size)
+{
+  return gimp_gradient_editor_new (context,
+                                   gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_palette_editor_get (GimpDialogFactory *factory,
+                            GimpContext       *context,
+                            GimpUIManager     *ui_manager,
+                            gint               view_size)
+{
+  return gimp_palette_editor_new (context,
+                                  gimp_dialog_factory_get_menu_factory (factory));
+}
+
+GtkWidget *
+dialogs_tool_preset_editor_get (GimpDialogFactory *factory,
+                                GimpContext       *context,
+                                GimpUIManager     *ui_manager,
+                                gint               view_size)
+{
+  return gimp_tool_preset_editor_new (context,
+                                      gimp_dialog_factory_get_menu_factory (factory));
+}
diff --git a/app/dialogs/dialogs-constructors.h b/app/dialogs/dialogs-constructors.h
new file mode 100644
index 0000000..bbe4159
--- /dev/null
+++ b/app/dialogs/dialogs-constructors.h
@@ -0,0 +1,308 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DIALOGS_CONSTRUCTORS_H__
+#define __DIALOGS_CONSTRUCTORS_H__
+
+
+/*  toplevel dialogs  */
+
+GtkWidget * dialogs_image_new_new               (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_file_open_new               (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_file_open_location_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_file_save_new               (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_file_export_new             (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_preferences_get             (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_input_devices_get           (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_keyboard_shortcuts_get      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_module_get                  (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_palette_import_get          (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_tips_get                    (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_about_get                   (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_action_search_get           (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_error_get                   (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_critical_get                (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_close_all_get               (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_quit_get                    (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+
+/*  docks  */
+
+GtkWidget * dialogs_toolbox_new                 (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_toolbox_dock_window_new     (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_dock_new                    (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_dock_window_new             (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+
+/*  dockables  */
+
+GtkWidget * dialogs_tool_options_new            (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_device_status_new           (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_error_console_new           (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_cursor_view_new             (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_dashboard_new               (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+GtkWidget * dialogs_image_list_view_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_brush_list_view_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_dynamics_list_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_mypaint_brush_list_view_new (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_pattern_list_view_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_gradient_list_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_palette_list_view_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_font_list_view_new          (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_buffer_list_view_new        (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_tool_preset_list_view_new   (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_document_list_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_template_list_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+GtkWidget * dialogs_image_grid_view_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_brush_grid_view_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_dynamics_grid_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_mypaint_brush_grid_view_new (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_pattern_grid_view_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_gradient_grid_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_palette_grid_view_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_font_grid_view_new          (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_buffer_grid_view_new        (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_tool_preset_grid_view_new   (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_document_grid_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_template_grid_view_new      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+GtkWidget * dialogs_layer_list_view_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_channel_list_view_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_vectors_list_view_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_path_list_view_new          (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_colormap_editor_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_histogram_editor_new        (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_selection_editor_new        (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_symmetry_editor_new         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_undo_editor_new             (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_sample_point_editor_new     (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+GtkWidget * dialogs_navigation_editor_new       (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+GtkWidget * dialogs_color_editor_new            (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+GtkWidget * dialogs_brush_editor_get            (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_dynamics_editor_get         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_gradient_editor_get         (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_palette_editor_get          (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+GtkWidget * dialogs_tool_preset_editor_get      (GimpDialogFactory *factory,
+                                                 GimpContext       *context,
+                                                 GimpUIManager     *ui_manager,
+                                                 gint               view_size);
+
+
+#endif /* __DIALOGS_CONSTRUCTORS_H__ */
diff --git a/app/dialogs/dialogs-types.h b/app/dialogs/dialogs-types.h
new file mode 100644
index 0000000..afdd025
--- /dev/null
+++ b/app/dialogs/dialogs-types.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DIALOGS_TYPES_H__
+#define __DIALOGS_TYPES_H__
+
+
+#include "display/display-types.h"
+
+
+typedef void (* GimpScaleCallback) (GtkWidget             *dialog,
+                                    GimpViewable          *viewable,
+                                    gint                   width,
+                                    gint                   height,
+                                    GimpUnit               unit,
+                                    GimpInterpolationType  interpolation,
+                                    gdouble                xresolution,
+                                    gdouble                yresolution,
+                                    GimpUnit               resolution_unit,
+                                    gpointer               user_data);
+
+
+#endif /* __DIALOGS_TYPES_H__ */
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
new file mode 100644
index 0000000..064f2c4
--- /dev/null
+++ b/app/dialogs/dialogs.c
@@ -0,0 +1,749 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * dialogs.c
+ * Copyright (C) 2010 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpsessioninfo-aux.h"
+#include "widgets/gimpsessionmanaged.h"
+#include "widgets/gimptoolbox.h"
+
+#include "dialogs.h"
+#include "dialogs-constructors.h"
+
+#include "gimp-log.h"
+
+#include "gimp-intl.h"
+
+
+GimpContainer *global_recent_docks = NULL;
+
+
+#define FOREIGN(id, singleton, remember_size) \
+  { id                     /* identifier       */, \
+    NULL                   /* name             */, \
+    NULL                   /* blurb            */, \
+    NULL                   /* icon_name        */, \
+    NULL                   /* help_id          */, \
+    NULL                   /* new_func         */, \
+    dialogs_restore_dialog /* restore_func     */, \
+    0                      /* view_size        */, \
+    singleton              /* singleton        */, \
+    TRUE                   /* session_managed  */, \
+    remember_size          /* remember_size    */, \
+    FALSE                  /* remember_if_open */, \
+    TRUE                   /* hideable         */, \
+    FALSE                  /* image_window     */, \
+    FALSE                  /* dockable         */}
+
+#define IMAGE_WINDOW(id, singleton, remember_size) \
+  { id                     /* identifier       */, \
+    NULL                   /* name             */, \
+    NULL                   /* blurb            */, \
+    NULL                   /* icon_name        */, \
+    NULL                   /* help_id          */, \
+    NULL                   /* new_func         */, \
+    dialogs_restore_window /* restore_func     */, \
+    0                      /* view_size        */, \
+    singleton              /* singleton        */, \
+    TRUE                   /* session_managed  */, \
+    remember_size          /* remember_size    */, \
+    TRUE                   /* remember_if_open */, \
+    FALSE                  /* hideable         */, \
+    TRUE                   /* image_window     */, \
+    FALSE                  /* dockable         */}
+
+#define TOPLEVEL(id, new_func, singleton, session_managed, remember_size) \
+  { id                     /* identifier       */, \
+    NULL                   /* name             */, \
+    NULL                   /* blurb            */, \
+    NULL                   /* icon_name        */, \
+    NULL                   /* help_id          */, \
+    new_func               /* new_func         */, \
+    dialogs_restore_dialog /* restore_func     */, \
+    0                      /* view_size        */, \
+    singleton              /* singleton        */, \
+    session_managed        /* session_managed  */, \
+    remember_size          /* remember_size    */, \
+    FALSE                  /* remember_if_open */, \
+    TRUE                   /* hideable         */, \
+    FALSE                  /* image_window     */, \
+    FALSE                  /* dockable         */}
+
+#define DOCKABLE(id, name, blurb, icon_name, help_id, new_func, view_size, singleton) \
+  { id                     /* identifier       */, \
+    name                   /* name             */, \
+    blurb                  /* blurb            */, \
+    icon_name              /* icon_name        */, \
+    help_id                /* help_id          */, \
+    new_func               /* new_func         */, \
+    NULL                   /* restore_func     */, \
+    view_size              /* view_size        */, \
+    singleton              /* singleton        */, \
+    FALSE                  /* session_managed  */, \
+    FALSE                  /* remember_size    */, \
+    TRUE                   /* remember_if_open */, \
+    TRUE                   /* hideable         */, \
+    FALSE                  /* image_window     */, \
+    TRUE                   /* dockable         */}
+
+#define DOCK(id, new_func) \
+  { id                     /* identifier       */, \
+    NULL                   /* name             */, \
+    NULL                   /* blurb            */, \
+    NULL                   /* icon_name        */, \
+    NULL                   /* help_id          */, \
+    new_func               /* new_func         */, \
+    dialogs_restore_dialog /* restore_func     */, \
+    0                      /* view_size        */, \
+    FALSE                  /* singleton        */, \
+    FALSE                  /* session_managed  */, \
+    FALSE                  /* remember_size    */, \
+    FALSE                  /* remember_if_open */, \
+    TRUE                   /* hideable         */, \
+    FALSE                  /* image_window     */, \
+    FALSE                  /* dockable         */}
+
+#define DOCK_WINDOW(id, new_func) \
+  { id                     /* identifier       */, \
+    NULL                   /* name             */, \
+    NULL                   /* blurb            */, \
+    NULL                   /* icon_name        */, \
+    NULL                   /* help_id          */, \
+    new_func               /* new_func         */, \
+    dialogs_restore_dialog /* restore_func     */, \
+    0                      /* view_size        */, \
+    FALSE                  /* singleton        */, \
+    TRUE                   /* session_managed  */, \
+    TRUE                   /* remember_size    */, \
+    TRUE                   /* remember_if_open */, \
+    TRUE                   /* hideable         */, \
+    FALSE                  /* image_window     */, \
+    FALSE                  /* dockable         */}
+
+#define LISTGRID(id, new_func, name, blurb, icon_name, help_id, view_size) \
+  { "gimp-"#id"-list"             /* identifier       */,  \
+    name                          /* name             */,  \
+    blurb                         /* blurb            */,  \
+    icon_name                     /* icon_name        */,  \
+    help_id                       /* help_id          */,  \
+    dialogs_##new_func##_list_view_new /* new_func         */,  \
+    NULL                          /* restore_func     */,  \
+    view_size                     /* view_size        */,  \
+    FALSE                         /* singleton        */,  \
+    FALSE                         /* session_managed  */,  \
+    FALSE                         /* remember_size    */,  \
+    TRUE                          /* remember_if_open */,  \
+    TRUE                          /* hideable         */,  \
+    FALSE                         /* image_window     */,  \
+    TRUE                          /* dockable         */}, \
+  { "gimp-"#id"-grid"             /* identifier       */,  \
+    name                          /* name             */,  \
+    blurb                         /* blurb            */,  \
+    icon_name                     /* icon_name        */,  \
+    help_id                       /* help_id          */,  \
+    dialogs_##new_func##_grid_view_new /* new_func         */,  \
+    NULL                          /* restore_func     */,  \
+    view_size                     /* view_size        */,  \
+    FALSE                         /* singleton        */,  \
+    FALSE                         /* session_managed  */,  \
+    FALSE                         /* remember_size    */,  \
+    TRUE                          /* remember_if_open */,  \
+    TRUE                          /* hideable         */,  \
+    FALSE                         /* image_window     */,  \
+    TRUE                          /* dockable         */}
+
+#define LIST(id, new_func, name, blurb, icon_name, help_id, view_size) \
+  { "gimp-"#id"-list"                   /* identifier       */, \
+    name                                /* name             */, \
+    blurb                               /* blurb            */, \
+    icon_name                            /* icon_name         */, \
+    help_id                             /* help_id          */, \
+    dialogs_##new_func##_list_view_new  /* new_func         */, \
+    NULL                                /* restore_func     */, \
+    view_size                           /* view_size        */, \
+    FALSE                               /* singleton        */, \
+    FALSE                               /* session_managed  */, \
+    FALSE                               /* remember_size    */, \
+    TRUE                                /* remember_if_open */, \
+    TRUE                                /* hideable         */, \
+    FALSE                               /* image_window     */, \
+    TRUE                                /* dockable         */}
+
+
+static GtkWidget * dialogs_restore_dialog (GimpDialogFactory *factory,
+                                           GdkScreen         *screen,
+                                           gint               monitor,
+                                           GimpSessionInfo   *info);
+static GtkWidget * dialogs_restore_window (GimpDialogFactory *factory,
+                                           GdkScreen         *screen,
+                                           gint               monitor,
+                                           GimpSessionInfo   *info);
+
+
+static const GimpDialogFactoryEntry entries[] =
+{
+  /*  foreign toplevels without constructor  */
+  FOREIGN ("gimp-brightness-contrast-tool-dialog", TRUE,  FALSE),
+  FOREIGN ("gimp-color-balance-tool-dialog",       TRUE,  FALSE),
+  FOREIGN ("gimp-color-picker-tool-dialog",        TRUE,  TRUE),
+  FOREIGN ("gimp-colorize-tool-dialog",            TRUE,  FALSE),
+  FOREIGN ("gimp-crop-tool-dialog",                TRUE,  FALSE),
+  FOREIGN ("gimp-curves-tool-dialog",              TRUE,  TRUE),
+  FOREIGN ("gimp-desaturate-tool-dialog",          TRUE,  FALSE),
+  FOREIGN ("gimp-foreground-select-tool-dialog",   TRUE,  FALSE),
+  FOREIGN ("gimp-gegl-tool-dialog",                TRUE,  FALSE),
+  FOREIGN ("gimp-gradient-tool-dialog",            TRUE,  FALSE),
+  FOREIGN ("gimp-hue-saturation-tool-dialog",      TRUE,  FALSE),
+  FOREIGN ("gimp-levels-tool-dialog",              TRUE,  TRUE),
+  FOREIGN ("gimp-measure-tool-dialog",             TRUE,  FALSE),
+  FOREIGN ("gimp-offset-tool-dialog",              TRUE,  FALSE),
+  FOREIGN ("gimp-operation-tool-dialog",           TRUE,  FALSE),
+  FOREIGN ("gimp-posterize-tool-dialog",           TRUE,  FALSE),
+  FOREIGN ("gimp-rotate-tool-dialog",              TRUE,  FALSE),
+  FOREIGN ("gimp-scale-tool-dialog",               TRUE,  FALSE),
+  FOREIGN ("gimp-shear-tool-dialog",               TRUE,  FALSE),
+  FOREIGN ("gimp-text-tool-dialog",                TRUE,  TRUE),
+  FOREIGN ("gimp-threshold-tool-dialog",           TRUE,  FALSE),
+  FOREIGN ("gimp-transform-3d-tool-dialog",        TRUE,  FALSE),
+  FOREIGN ("gimp-perspective-tool-dialog",         TRUE,  FALSE),
+  FOREIGN ("gimp-unified-transform-tool-dialog",   TRUE,  FALSE),
+  FOREIGN ("gimp-handle-transform-tool-dialog",    TRUE,  FALSE),
+
+  FOREIGN ("gimp-toolbox-color-dialog",            TRUE,  FALSE),
+  FOREIGN ("gimp-gradient-editor-color-dialog",    TRUE,  FALSE),
+  FOREIGN ("gimp-palette-editor-color-dialog",     TRUE,  FALSE),
+  FOREIGN ("gimp-colormap-editor-color-dialog",    TRUE,  FALSE),
+
+  FOREIGN ("gimp-controller-editor-dialog",        FALSE, TRUE),
+  FOREIGN ("gimp-controller-action-dialog",        FALSE, TRUE),
+
+  /*  ordinary toplevels  */
+  TOPLEVEL ("gimp-image-new-dialog",
+            dialogs_image_new_new,          FALSE, TRUE, FALSE),
+  TOPLEVEL ("gimp-file-open-dialog",
+            dialogs_file_open_new,          TRUE,  TRUE, TRUE),
+  TOPLEVEL ("gimp-file-open-location-dialog",
+            dialogs_file_open_location_new, FALSE, TRUE, FALSE),
+  TOPLEVEL ("gimp-file-save-dialog",
+            dialogs_file_save_new,          FALSE, TRUE, TRUE),
+  TOPLEVEL ("gimp-file-export-dialog",
+            dialogs_file_export_new,        FALSE, TRUE, TRUE),
+
+  /*  singleton toplevels  */
+  TOPLEVEL ("gimp-preferences-dialog",
+            dialogs_preferences_get,        TRUE, TRUE,  TRUE),
+  TOPLEVEL ("gimp-input-devices-dialog",
+            dialogs_input_devices_get,      TRUE, TRUE,  FALSE),
+  TOPLEVEL ("gimp-keyboard-shortcuts-dialog",
+            dialogs_keyboard_shortcuts_get, TRUE, TRUE,  TRUE),
+  TOPLEVEL ("gimp-module-dialog",
+            dialogs_module_get,             TRUE, TRUE,  TRUE),
+  TOPLEVEL ("gimp-palette-import-dialog",
+            dialogs_palette_import_get,     TRUE, TRUE,  TRUE),
+  TOPLEVEL ("gimp-tips-dialog",
+            dialogs_tips_get,               TRUE, FALSE, FALSE),
+  TOPLEVEL ("gimp-about-dialog",
+            dialogs_about_get,              TRUE, FALSE, FALSE),
+  TOPLEVEL ("gimp-action-search-dialog",
+            dialogs_action_search_get,      TRUE, TRUE,  TRUE),
+  TOPLEVEL ("gimp-error-dialog",
+            dialogs_error_get,              TRUE, FALSE, FALSE),
+  TOPLEVEL ("gimp-critical-dialog",
+            dialogs_critical_get,           TRUE, FALSE, FALSE),
+  TOPLEVEL ("gimp-close-all-dialog",
+            dialogs_close_all_get,          TRUE, FALSE, FALSE),
+  TOPLEVEL ("gimp-quit-dialog",
+            dialogs_quit_get,               TRUE, FALSE, FALSE),
+
+  /*  docks  */
+  DOCK ("gimp-dock",
+        dialogs_dock_new),
+  DOCK ("gimp-toolbox",
+        dialogs_toolbox_new),
+
+  /*  dock windows  */
+  DOCK_WINDOW ("gimp-dock-window",
+               dialogs_dock_window_new),
+  DOCK_WINDOW ("gimp-toolbox-window",
+               dialogs_toolbox_dock_window_new),
+
+  /*  singleton dockables  */
+  DOCKABLE ("gimp-tool-options",
+            N_("Tool Options"), NULL, GIMP_ICON_DIALOG_TOOL_OPTIONS,
+            GIMP_HELP_TOOL_OPTIONS_DIALOG,
+            dialogs_tool_options_new, 0, TRUE),
+  DOCKABLE ("gimp-device-status",
+            N_("Devices"), N_("Device Status"), GIMP_ICON_DIALOG_DEVICE_STATUS,
+            GIMP_HELP_DEVICE_STATUS_DIALOG,
+            dialogs_device_status_new, 0, TRUE),
+  DOCKABLE ("gimp-error-console",
+            N_("Errors"), N_("Error Console"), GIMP_ICON_DIALOG_WARNING,
+            GIMP_HELP_ERRORS_DIALOG,
+            dialogs_error_console_new, 0, TRUE),
+  DOCKABLE ("gimp-cursor-view",
+            N_("Pointer"), N_("Pointer Information"), GIMP_ICON_CURSOR,
+            GIMP_HELP_POINTER_INFO_DIALOG,
+            dialogs_cursor_view_new, 0, TRUE),
+  DOCKABLE ("gimp-dashboard",
+            N_("Dashboard"), N_("Dashboard"), GIMP_ICON_DIALOG_DASHBOARD,
+            GIMP_HELP_DASHBOARD_DIALOG,
+            dialogs_dashboard_new, 0, TRUE),
+
+  /*  list & grid views  */
+  LISTGRID (image, image,
+            N_("Images"), NULL, GIMP_ICON_DIALOG_IMAGES,
+            GIMP_HELP_IMAGE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (brush, brush,
+            N_("Brushes"), NULL, GIMP_ICON_BRUSH,
+            GIMP_HELP_BRUSH_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (dynamics, dynamics,
+            N_("Paint Dynamics"), NULL, GIMP_ICON_DYNAMICS,
+            GIMP_HELP_DYNAMICS_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (mypaint-brush, mypaint_brush,
+            N_("MyPaint Brushes"), NULL, GIMP_ICON_MYPAINT_BRUSH,
+            GIMP_HELP_MYPAINT_BRUSH_DIALOG, GIMP_VIEW_SIZE_LARGE),
+  LISTGRID (pattern, pattern,
+            N_("Patterns"), NULL, GIMP_ICON_PATTERN,
+            GIMP_HELP_PATTERN_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (gradient, gradient,
+            N_("Gradients"), NULL, GIMP_ICON_GRADIENT,
+            GIMP_HELP_GRADIENT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (palette, palette,
+            N_("Palettes"), NULL, GIMP_ICON_PALETTE,
+            GIMP_HELP_PALETTE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (font, font,
+            N_("Fonts"), NULL, GIMP_ICON_FONT,
+            GIMP_HELP_FONT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (buffer, buffer,
+            N_("Buffers"), NULL, GIMP_ICON_BUFFER,
+            GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (tool-preset, tool_preset,
+            N_("Tool Presets"), NULL, GIMP_ICON_TOOL_PRESET,
+            GIMP_HELP_TOOL_PRESET_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+  LISTGRID (document, document,
+            N_("History"), N_("Document History"), GIMP_ICON_DOCUMENT_OPEN_RECENT,
+            GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE),
+  LISTGRID (template, template,
+            N_("Templates"), N_("Image Templates"), GIMP_ICON_TEMPLATE,
+            GIMP_HELP_TEMPLATE_DIALOG, GIMP_VIEW_SIZE_SMALL),
+
+  /*  image related  */
+  DOCKABLE ("gimp-layer-list",
+            N_("Layers"), NULL, GIMP_ICON_DIALOG_LAYERS,
+            GIMP_HELP_LAYER_DIALOG,
+            dialogs_layer_list_view_new, 0, FALSE),
+  DOCKABLE ("gimp-channel-list",
+            N_("Channels"), NULL, GIMP_ICON_DIALOG_CHANNELS,
+            GIMP_HELP_CHANNEL_DIALOG,
+            dialogs_channel_list_view_new, 0, FALSE),
+  DOCKABLE ("gimp-vectors-list",
+            N_("Paths"), NULL, GIMP_ICON_DIALOG_PATHS,
+            GIMP_HELP_PATH_DIALOG,
+            dialogs_vectors_list_view_new, 0, FALSE),
+  DOCKABLE ("gimp-indexed-palette",
+            N_("Colormap"), NULL, GIMP_ICON_COLORMAP,
+            GIMP_HELP_INDEXED_PALETTE_DIALOG,
+            dialogs_colormap_editor_new, 0, FALSE),
+  DOCKABLE ("gimp-histogram-editor",
+            N_("Histogram"), NULL, GIMP_ICON_HISTOGRAM,
+            GIMP_HELP_HISTOGRAM_DIALOG,
+            dialogs_histogram_editor_new, 0, FALSE),
+  DOCKABLE ("gimp-selection-editor",
+            N_("Selection"), N_("Selection Editor"), GIMP_ICON_SELECTION,
+            GIMP_HELP_SELECTION_DIALOG,
+            dialogs_selection_editor_new, 0, FALSE),
+  DOCKABLE ("gimp-symmetry-editor",
+            N_("Symmetry Painting"), NULL, GIMP_ICON_SYMMETRY,
+            GIMP_HELP_SYMMETRY_DIALOG,
+            dialogs_symmetry_editor_new, 0, FALSE),
+  DOCKABLE ("gimp-undo-history",
+            N_("Undo"), N_("Undo History"), GIMP_ICON_DIALOG_UNDO_HISTORY,
+            GIMP_HELP_UNDO_DIALOG,
+            dialogs_undo_editor_new, 0, FALSE),
+  DOCKABLE ("gimp-sample-point-editor",
+            N_("Sample Points"), N_("Sample Points"), GIMP_ICON_SAMPLE_POINT,
+            GIMP_HELP_SAMPLE_POINT_DIALOG,
+            dialogs_sample_point_editor_new, 0, FALSE),
+
+  /*  display related  */
+  DOCKABLE ("gimp-navigation-view",
+            N_("Navigation"), N_("Display Navigation"), GIMP_ICON_DIALOG_NAVIGATION,
+            GIMP_HELP_NAVIGATION_DIALOG,
+            dialogs_navigation_editor_new, 0, FALSE),
+
+  /*  editors  */
+  DOCKABLE ("gimp-color-editor",
+            N_("FG/BG"), N_("FG/BG Color"), GIMP_ICON_COLORS_DEFAULT,
+            GIMP_HELP_COLOR_DIALOG,
+            dialogs_color_editor_new, 0, FALSE),
+
+  /*  singleton editors  */
+  DOCKABLE ("gimp-brush-editor",
+            N_("Brush Editor"), NULL, GIMP_ICON_BRUSH,
+            GIMP_HELP_BRUSH_EDITOR_DIALOG,
+            dialogs_brush_editor_get, 0, TRUE),
+  DOCKABLE ("gimp-dynamics-editor",
+            N_("Paint Dynamics Editor"), NULL, GIMP_ICON_DYNAMICS,
+            GIMP_HELP_DYNAMICS_EDITOR_DIALOG,
+            dialogs_dynamics_editor_get, 0, TRUE),
+  DOCKABLE ("gimp-gradient-editor",
+            N_("Gradient Editor"), NULL, GIMP_ICON_GRADIENT,
+            GIMP_HELP_GRADIENT_EDITOR_DIALOG,
+            dialogs_gradient_editor_get, 0, TRUE),
+  DOCKABLE ("gimp-palette-editor",
+            N_("Palette Editor"), NULL, GIMP_ICON_PALETTE,
+            GIMP_HELP_PALETTE_EDITOR_DIALOG,
+            dialogs_palette_editor_get, 0, TRUE),
+  DOCKABLE ("gimp-tool-preset-editor",
+            N_("Tool Preset Editor"), NULL, GIMP_ICON_TOOL_PRESET,
+            GIMP_HELP_TOOL_PRESET_EDITOR_DIALOG,
+            dialogs_tool_preset_editor_get, 0, TRUE),
+
+  /*  image windows  */
+  IMAGE_WINDOW ("gimp-empty-image-window",
+                TRUE, TRUE),
+  IMAGE_WINDOW ("gimp-single-image-window",
+                TRUE, TRUE)
+};
+
+/**
+ * dialogs_restore_dialog:
+ * @factory:
+ * @screen:
+ * @monitor:
+ * @info:
+ *
+ * Creates a top level widget based on the given session info object
+ * in which other widgets later can be be put, typically also restored
+ * from the same session info object.
+ *
+ * Returns:
+ **/
+static GtkWidget *
+dialogs_restore_dialog (GimpDialogFactory *factory,
+                        GdkScreen         *screen,
+                        gint               monitor,
+                        GimpSessionInfo   *info)
+{
+  GtkWidget      *dialog;
+  GimpCoreConfig *config = gimp_dialog_factory_get_context (factory)->gimp->config;
+
+  GIMP_LOG (DIALOG_FACTORY, "restoring toplevel \"%s\" (info %p)",
+            gimp_session_info_get_factory_entry (info)->identifier,
+            info);
+
+  dialog =
+    gimp_dialog_factory_dialog_new (factory, screen, monitor,
+                                    NULL /*ui_manager*/,
+                                    gimp_session_info_get_factory_entry (info)->identifier,
+                                    gimp_session_info_get_factory_entry (info)->view_size,
+                                    ! GIMP_GUI_CONFIG (config)->hide_docks);
+
+  g_object_set_data (G_OBJECT (dialog), GIMP_DIALOG_VISIBILITY_KEY,
+                     GINT_TO_POINTER (GIMP_GUI_CONFIG (config)->hide_docks ?
+                                      GIMP_DIALOG_VISIBILITY_HIDDEN :
+                                      GIMP_DIALOG_VISIBILITY_VISIBLE));
+
+  return dialog;
+}
+
+/**
+ * dialogs_restore_window:
+ * @factory:
+ * @screen:
+ * @monitor:
+ * @info:
+ *
+ * "restores" the image window. We don't really restore anything since
+ * the image window is created earlier, so we just look for and return
+ * the already-created image window.
+ *
+ * Returns:
+ **/
+static GtkWidget *
+dialogs_restore_window (GimpDialogFactory *factory,
+                        GdkScreen         *screen,
+                        gint               monitor,
+                        GimpSessionInfo   *info)
+{
+  Gimp             *gimp    = gimp_dialog_factory_get_context (factory)->gimp;
+  GimpDisplay      *display = GIMP_DISPLAY (gimp_get_empty_display (gimp));
+  GimpDisplayShell *shell   = gimp_display_get_shell (display);
+  GtkWidget        *dialog;
+
+  dialog = GTK_WIDGET (gimp_display_shell_get_window (shell));
+
+  return dialog;
+}
+
+
+/*  public functions  */
+
+void
+dialogs_init (Gimp            *gimp,
+              GimpMenuFactory *menu_factory)
+{
+  GimpDialogFactory *factory = NULL;
+  gint               i       = 0;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_MENU_FACTORY (menu_factory));
+
+  factory = gimp_dialog_factory_new ("toplevel",
+                                     gimp_get_user_context (gimp),
+                                     menu_factory);
+  gimp_dialog_factory_set_singleton (factory);
+
+  for (i = 0; i < G_N_ELEMENTS (entries); i++)
+    gimp_dialog_factory_register_entry (factory,
+                                        entries[i].identifier,
+                                        gettext (entries[i].name),
+                                        gettext (entries[i].blurb),
+                                        entries[i].icon_name,
+                                        entries[i].help_id,
+                                        entries[i].new_func,
+                                        entries[i].restore_func,
+                                        entries[i].view_size,
+                                        entries[i].singleton,
+                                        entries[i].session_managed,
+                                        entries[i].remember_size,
+                                        entries[i].remember_if_open,
+                                        entries[i].hideable,
+                                        entries[i].image_window,
+                                        entries[i].dockable);
+
+  global_recent_docks = gimp_list_new (GIMP_TYPE_SESSION_INFO, FALSE);
+}
+
+void
+dialogs_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp_dialog_factory_get_singleton ())
+    {
+      /* run dispose manually so the factory destroys its dialogs, which
+       * might in turn directly or indirectly ref the factory
+       */
+      g_object_run_dispose (G_OBJECT (gimp_dialog_factory_get_singleton ()));
+
+      g_object_unref (gimp_dialog_factory_get_singleton ());
+      gimp_dialog_factory_set_singleton (NULL);
+    }
+
+  g_clear_object (&global_recent_docks);
+}
+
+static void
+dialogs_ensure_factory_entry_on_recent_dock (GimpSessionInfo *info)
+{
+  if (! gimp_session_info_get_factory_entry (info))
+    {
+      GimpDialogFactoryEntry *entry = NULL;
+
+      /* The recent docks container only contains session infos for
+       * dock windows
+       */
+      entry = gimp_dialog_factory_find_entry (gimp_dialog_factory_get_singleton (),
+                                              "gimp-dock-window");
+
+      gimp_session_info_set_factory_entry (info, entry);
+    }
+}
+
+static GFile *
+dialogs_get_dockrc_file (void)
+{
+  const gchar *basename;
+
+  basename = g_getenv ("GIMP_TESTING_DOCKRC_NAME");
+  if (! basename)
+    basename = "dockrc";
+
+  return gimp_directory_file (basename, NULL);
+}
+
+void
+dialogs_load_recent_docks (Gimp *gimp)
+{
+  GFile  *file;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  file = dialogs_get_dockrc_file ();
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (global_recent_docks),
+                                       file,
+                                       NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+
+      g_clear_error (&error);
+    }
+
+  g_object_unref (file);
+
+  /* In GIMP 2.6 dockrc did not contain the factory entries for the
+   * session infos, so set that up manually if needed
+   */
+  gimp_container_foreach (global_recent_docks,
+                          (GFunc) dialogs_ensure_factory_entry_on_recent_dock,
+                          NULL);
+
+  gimp_list_reverse (GIMP_LIST (global_recent_docks));
+}
+
+void
+dialogs_save_recent_docks (Gimp *gimp)
+{
+  GFile  *file;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  file = dialogs_get_dockrc_file ();
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (global_recent_docks),
+                                        file,
+                                        "recently closed docks",
+                                        "end of recently closed docks",
+                                        NULL, &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_clear_error (&error);
+    }
+
+  g_object_unref (file);
+}
+
+GtkWidget *
+dialogs_get_toolbox (void)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (gimp_dialog_factory_get_singleton ()), NULL);
+
+  for (list = gimp_dialog_factory_get_open_dialogs (gimp_dialog_factory_get_singleton ());
+       list;
+       list = g_list_next (list))
+    {
+      if (GIMP_IS_DOCK_WINDOW (list->data) &&
+          gimp_dock_window_has_toolbox (list->data))
+        return list->data;
+    }
+
+  return NULL;
+}
+
+GtkWidget *
+dialogs_get_dialog (GObject     *attach_object,
+                    const gchar *attach_key)
+{
+  g_return_val_if_fail (G_IS_OBJECT (attach_object), NULL);
+  g_return_val_if_fail (attach_key != NULL, NULL);
+
+  return g_object_get_data (attach_object, attach_key);
+}
+
+void
+dialogs_attach_dialog (GObject     *attach_object,
+                       const gchar *attach_key,
+                       GtkWidget   *dialog)
+{
+  g_return_if_fail (G_IS_OBJECT (attach_object));
+  g_return_if_fail (attach_key != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+
+  g_object_set_data (attach_object, attach_key, dialog);
+  g_object_set_data (G_OBJECT (dialog), "gimp-dialogs-attach-key",
+                     (gpointer) attach_key);
+
+  g_signal_connect_object (dialog, "destroy",
+                           G_CALLBACK (dialogs_detach_dialog),
+                           attach_object,
+                           G_CONNECT_SWAPPED);
+}
+
+void
+dialogs_detach_dialog (GObject   *attach_object,
+                       GtkWidget *dialog)
+{
+  const gchar *attach_key;
+
+  g_return_if_fail (G_IS_OBJECT (attach_object));
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+
+  attach_key = g_object_get_data (G_OBJECT (dialog),
+                                  "gimp-dialogs-attach-key");
+
+  g_return_if_fail (attach_key != NULL);
+
+  g_object_set_data (attach_object, attach_key, NULL);
+
+  g_signal_handlers_disconnect_by_func (dialog,
+                                        dialogs_detach_dialog,
+                                        attach_object);
+}
+
+void
+dialogs_destroy_dialog (GObject     *attach_object,
+                        const gchar *attach_key)
+{
+  GtkWidget *dialog;
+
+  g_return_if_fail (G_IS_OBJECT (attach_object));
+  g_return_if_fail (attach_key != NULL);
+
+  dialog = g_object_get_data (attach_object, attach_key);
+
+  if (dialog)
+    gtk_widget_destroy (dialog);
+}
diff --git a/app/dialogs/dialogs.h b/app/dialogs/dialogs.h
new file mode 100644
index 0000000..387dfa2
--- /dev/null
+++ b/app/dialogs/dialogs.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DIALOGS_H__
+#define __DIALOGS_H__
+
+
+extern GimpDialogFactory *global_dialog_factory;
+extern GimpContainer     *global_recent_docks;
+
+
+void        dialogs_init              (Gimp            *gimp,
+                                       GimpMenuFactory *menu_factory);
+void        dialogs_exit              (Gimp            *gimp);
+
+void        dialogs_load_recent_docks (Gimp            *gimp);
+void        dialogs_save_recent_docks (Gimp            *gimp);
+
+GtkWidget * dialogs_get_toolbox       (void);
+
+
+/* attaching dialogs to arbitrary objects, and detaching them
+ * automatically upon destruction
+ */
+GtkWidget * dialogs_get_dialog        (GObject         *attach_object,
+                                       const gchar     *attach_key);
+void        dialogs_attach_dialog     (GObject         *attach_object,
+                                       const gchar     *attach_key,
+                                       GtkWidget       *dialog);
+void        dialogs_detach_dialog     (GObject         *attach_object,
+                                       GtkWidget       *dialog);
+void        dialogs_destroy_dialog    (GObject         *attach_object,
+                                       const gchar     *attach_key);
+
+
+#endif /* __DIALOGS_H__ */
diff --git a/app/dialogs/file-open-dialog.c b/app/dialogs/file-open-dialog.c
new file mode 100644
index 0000000..9b4c5e9
--- /dev/null
+++ b/app/dialogs/file-open-dialog.c
@@ -0,0 +1,276 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer.h"
+#include "core/gimpprogress.h"
+
+#include "file/file-open.h"
+#include "file/gimp-file.h"
+
+#include "widgets/gimpfiledialog.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpopendialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "file-open-dialog.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void       file_open_dialog_response    (GtkWidget           *dialog,
+                                                gint                 response_id,
+                                                Gimp                *gimp);
+static GimpImage *file_open_dialog_open_image  (GtkWidget           *dialog,
+                                                Gimp                *gimp,
+                                                GFile               *file,
+                                                GimpPlugInProcedure *load_proc);
+static gboolean   file_open_dialog_open_layers (GtkWidget           *dialog,
+                                                GimpImage           *image,
+                                                GFile               *file,
+                                                GimpPlugInProcedure *load_proc);
+
+
+/*  public functions  */
+
+GtkWidget *
+file_open_dialog_new (Gimp *gimp)
+{
+  GtkWidget           *dialog;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  dialog = gimp_open_dialog_new (gimp);
+
+  gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+
+  gimp_file_dialog_load_state (GIMP_FILE_DIALOG (dialog),
+                               "gimp-file-open-dialog-state");
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (file_open_dialog_response),
+                    gimp);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+file_open_dialog_response (GtkWidget *dialog,
+                           gint       response_id,
+                           Gimp      *gimp)
+{
+  GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog);
+  GimpOpenDialog *open_dialog = GIMP_OPEN_DIALOG (dialog);
+  GSList         *files;
+  GSList         *list;
+  gboolean        success = FALSE;
+
+  gimp_file_dialog_save_state (GIMP_FILE_DIALOG (dialog),
+                               "gimp-file-open-dialog-state");
+
+  if (response_id != GTK_RESPONSE_OK)
+    {
+      if (! file_dialog->busy)
+        gtk_widget_destroy (dialog);
+
+      return;
+    }
+
+  files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (dialog));
+
+  if (files)
+    g_object_set_data_full (G_OBJECT (gimp), GIMP_FILE_OPEN_LAST_FILE_KEY,
+                            g_object_ref (files->data),
+                            (GDestroyNotify) g_object_unref);
+
+  gimp_file_dialog_set_sensitive (file_dialog, FALSE);
+
+  /* When we are going to open new image windows, unset the transient
+   * window. We don't need it since we will use gdk_window_raise() to
+   * keep the dialog on top. And if we don't do it, then the dialog
+   * will pull the image window it was invoked from on top of all the
+   * new opened image windows, and we don't want that to happen.
+   */
+  if (! open_dialog->open_as_layers)
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), NULL);
+
+  if (file_dialog->image)
+    g_object_ref (file_dialog->image);
+
+  for (list = files; list; list = g_slist_next (list))
+    {
+      GFile *file = list->data;
+
+      if (open_dialog->open_as_layers)
+        {
+          if (! file_dialog->image)
+            {
+              gimp_open_dialog_set_image (
+                open_dialog,
+                file_open_dialog_open_image (dialog,
+                                             gimp,
+                                             file,
+                                             file_dialog->file_proc),
+                TRUE);
+
+              if (file_dialog->image)
+                {
+                  g_object_ref (file_dialog->image);
+                  success = TRUE;
+                }
+            }
+          else if (file_open_dialog_open_layers (dialog,
+                                                 file_dialog->image,
+                                                 file,
+                                                 file_dialog->file_proc))
+            {
+              success = TRUE;
+            }
+        }
+      else
+        {
+          if (file_open_dialog_open_image (dialog,
+                                           gimp,
+                                           file,
+                                           file_dialog->file_proc))
+            {
+              success = TRUE;
+
+              /* Make the dialog stay on top of all images we open if
+               * we open say 10 at once
+               */
+              gdk_window_raise (gtk_widget_get_window (dialog));
+            }
+        }
+
+      if (file_dialog->canceled)
+        break;
+    }
+
+  if (success)
+    {
+      if (file_dialog->image)
+        {
+          if (open_dialog->open_as_layers)
+            gimp_image_flush (file_dialog->image);
+
+          g_object_unref (file_dialog->image);
+        }
+
+      gtk_widget_destroy (dialog);
+    }
+  else
+    {
+      if (file_dialog->image)
+        g_object_unref (file_dialog->image);
+
+      gimp_file_dialog_set_sensitive (file_dialog, TRUE);
+    }
+
+  g_slist_free_full (files, (GDestroyNotify) g_object_unref);
+}
+
+static GimpImage *
+file_open_dialog_open_image (GtkWidget           *dialog,
+                             Gimp                *gimp,
+                             GFile               *file,
+                             GimpPlugInProcedure *load_proc)
+{
+  GimpImage         *image;
+  GimpPDBStatusType  status;
+  GError            *error = NULL;
+
+  image = file_open_with_proc_and_display (gimp,
+                                           gimp_get_user_context (gimp),
+                                           GIMP_PROGRESS (dialog),
+                                           file, file, FALSE,
+                                           load_proc,
+                                           G_OBJECT (gtk_widget_get_screen (dialog)),
+                                           gimp_widget_get_monitor (dialog),
+                                           &status, &error);
+
+  if (! image && status != GIMP_PDB_CANCEL)
+    {
+      gimp_message (gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+                    _("Opening '%s' failed:\n\n%s"),
+                    gimp_file_get_utf8_name (file), error->message);
+      g_clear_error (&error);
+    }
+
+  return image;
+}
+
+static gboolean
+file_open_dialog_open_layers (GtkWidget           *dialog,
+                              GimpImage           *image,
+                              GFile               *file,
+                              GimpPlugInProcedure *load_proc)
+{
+  GList             *new_layers;
+  GimpPDBStatusType  status;
+  GError            *error = NULL;
+
+  new_layers = file_open_layers (image->gimp,
+                                 gimp_get_user_context (image->gimp),
+                                 GIMP_PROGRESS (dialog),
+                                 image, FALSE,
+                                 file, GIMP_RUN_INTERACTIVE, load_proc,
+                                 &status, &error);
+
+  if (new_layers)
+    {
+      gimp_image_add_layers (image, new_layers,
+                             GIMP_IMAGE_ACTIVE_PARENT, -1,
+                             0, 0,
+                             gimp_image_get_width (image),
+                             gimp_image_get_height (image),
+                             _("Open layers"));
+
+      g_list_free (new_layers);
+
+      return TRUE;
+    }
+  else if (status != GIMP_PDB_CANCEL)
+    {
+      gimp_message (image->gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+                    _("Opening '%s' failed:\n\n%s"),
+                    gimp_file_get_utf8_name (file), error->message);
+      g_clear_error (&error);
+    }
+
+  return FALSE;
+}
diff --git a/app/dialogs/file-open-dialog.h b/app/dialogs/file-open-dialog.h
new file mode 100644
index 0000000..fba4896
--- /dev/null
+++ b/app/dialogs/file-open-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_OPEN_DIALOG_H__
+#define __FILE_OPEN_DIALOG_H__
+
+
+GtkWidget * file_open_dialog_new (Gimp *gimp);
+
+
+#endif /* __FILE_OPEN_DIALOG_H__ */
diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c
new file mode 100644
index 0000000..dcdffc9
--- /dev/null
+++ b/app/dialogs/file-open-location-dialog.c
@@ -0,0 +1,289 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpprogress.h"
+
+#include "file/file-open.h"
+#include "file/file-utils.h"
+
+#include "widgets/gimpcontainerentry.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpprogressbox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "file-open-location-dialog.h"
+
+#include "gimp-intl.h"
+
+
+static void      file_open_location_response   (GtkDialog          *dialog,
+                                                gint                response_id,
+                                                Gimp               *gimp);
+
+static gboolean  file_open_location_completion (GtkEntryCompletion *completion,
+                                                const gchar        *key,
+                                                GtkTreeIter        *iter,
+                                                gpointer            data);
+
+
+/*  public functions  */
+
+GtkWidget *
+file_open_location_dialog_new (Gimp *gimp)
+{
+  GimpContext        *context;
+  GtkWidget          *dialog;
+  GtkWidget          *hbox;
+  GtkWidget          *vbox;
+  GtkWidget          *image;
+  GtkWidget          *label;
+  GtkWidget          *entry;
+  GtkEntryCompletion *completion;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  dialog = gimp_dialog_new (_("Open Location"),
+                            "gimp-file-open-location",
+                            NULL, 0,
+                            gimp_standard_help_func,
+                            GIMP_HELP_FILE_OPEN_LOCATION,
+
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Open"),   GTK_RESPONSE_OK,
+
+                            NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG(dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (file_open_location_response),
+                    gimp);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_WEB, GTK_ICON_SIZE_BUTTON);
+  gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  label = gtk_label_new (_("Enter location (URI):"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  /* we don't want the context to affect the entry, so create
+   * a scratch one instead of using e.g. the user context
+   */
+  context = gimp_context_new (gimp, "file-open-location-dialog", NULL);
+  entry = gimp_container_entry_new (gimp->documents, context,
+                                    GIMP_VIEW_SIZE_SMALL, 0);
+  g_object_unref (context);
+
+  completion = gtk_entry_get_completion (GTK_ENTRY (entry));
+  gtk_entry_completion_set_match_func (completion,
+                                       file_open_location_completion,
+                                       NULL, NULL);
+
+  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+  gtk_widget_set_size_request (entry, 400, -1);
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  g_object_set_data (G_OBJECT (dialog), "location-entry", entry);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+file_open_location_response (GtkDialog *dialog,
+                             gint       response_id,
+                             Gimp      *gimp)
+{
+  GtkWidget   *entry;
+  GtkWidget   *box;
+  const gchar *text = NULL;
+
+  box = g_object_get_data (G_OBJECT (dialog), "progress-box");
+
+  if (response_id != GTK_RESPONSE_OK)
+    {
+      if (box && GIMP_PROGRESS_BOX (box)->active)
+        gimp_progress_cancel (GIMP_PROGRESS (box));
+      else
+        gtk_widget_destroy (GTK_WIDGET (dialog));
+
+      return;
+    }
+
+  entry = g_object_get_data (G_OBJECT (dialog), "location-entry");
+  text = gtk_entry_get_text (GTK_ENTRY (entry));
+
+  if (text && strlen (text))
+    {
+      GimpImage         *image;
+      gchar             *filename;
+      GFile             *file;
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+
+      filename = g_filename_from_uri (text, NULL, NULL);
+
+      if (filename)
+        {
+          file = g_file_new_for_uri (text);
+          g_free (filename);
+        }
+      else
+        {
+          file = file_utils_filename_to_file (gimp, text, &error);
+        }
+
+      if (!box)
+        {
+          box = gimp_progress_box_new ();
+          gtk_container_set_border_width (GTK_CONTAINER (box), 12);
+          gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                            box, FALSE, FALSE, 0);
+
+          g_object_set_data (G_OBJECT (dialog), "progress-box", box);
+        }
+
+      if (file)
+        {
+          GFile *entered_file = g_file_new_for_uri (text);
+
+          /* should not fail but does, see issue #3093 */
+          if (! entered_file)
+            entered_file = g_object_ref (file);
+
+          gtk_widget_show (box);
+
+          gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
+          gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);
+
+          image = file_open_with_proc_and_display (gimp,
+                                                   gimp_get_user_context (gimp),
+                                                   GIMP_PROGRESS (box),
+                                                   file, entered_file,
+                                                   FALSE, NULL,
+                                                   G_OBJECT (gtk_widget_get_screen (entry)),
+                                                   gimp_widget_get_monitor (entry),
+                                                   &status, &error);
+
+          gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, TRUE);
+          gtk_editable_set_editable (GTK_EDITABLE (entry), TRUE);
+
+          g_object_unref (entered_file);
+
+          if (image == NULL && status != GIMP_PDB_CANCEL)
+            {
+              gimp_message (gimp, G_OBJECT (box), GIMP_MESSAGE_ERROR,
+                            _("Opening '%s' failed:\n\n%s"),
+                            gimp_file_get_utf8_name (file), error->message);
+              g_clear_error (&error);
+            }
+
+          g_object_unref (file);
+
+          if (image != NULL)
+            {
+              gtk_widget_destroy (GTK_WIDGET (dialog));
+              return;
+            }
+        }
+      else
+        {
+          gimp_message (gimp, G_OBJECT (box), GIMP_MESSAGE_ERROR,
+                        _("Opening '%s' failed:\n\n%s"),
+                        text,
+                        /* error should never be NULL, also issue #3093 */
+                        error ? error->message : _("Invalid URI"));
+          g_clear_error (&error);
+        }
+    }
+}
+
+static gboolean
+file_open_location_completion (GtkEntryCompletion *completion,
+                               const gchar        *key,
+                               GtkTreeIter        *iter,
+                               gpointer            data)
+{
+  GtkTreeModel *model = gtk_entry_completion_get_model (completion);
+  gchar        *name;
+  gchar        *normalized;
+  gchar        *case_normalized;
+  gboolean      match;
+
+  gtk_tree_model_get (model, iter,
+                      1, &name,
+                      -1);
+
+  if (! name)
+    return FALSE;
+
+  normalized = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
+  case_normalized = g_utf8_casefold (normalized, -1);
+
+  match = (strncmp (key, case_normalized, strlen (key)) == 0);
+
+  if (! match)
+    {
+      const gchar *colon = strchr (case_normalized, ':');
+
+      if (colon && strlen (colon) > 2 && colon[1] == '/' && colon[2] == '/')
+        match = (strncmp (key, colon + 3, strlen (key)) == 0);
+    }
+
+  g_free (normalized);
+  g_free (case_normalized);
+  g_free (name);
+
+  return match;
+}
diff --git a/app/dialogs/file-open-location-dialog.h b/app/dialogs/file-open-location-dialog.h
new file mode 100644
index 0000000..b2926cd
--- /dev/null
+++ b/app/dialogs/file-open-location-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_OPEN_LOCATION_DIALOG_H__
+#define __FILE_OPEN_LOCATION_DIALOG_H__
+
+
+GtkWidget * file_open_location_dialog_new (Gimp *gimp);
+
+
+#endif /* __FILE_OPEN_LOCATION_DIALOG_H__ */
diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
new file mode 100644
index 0000000..a7aa857
--- /dev/null
+++ b/app/dialogs/file-save-dialog.c
@@ -0,0 +1,816 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "file/file-save.h"
+#include "file/gimp-file.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpexportdialog.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpsavedialog.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "file-save-dialog.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  CHECK_URI_FAIL,
+  CHECK_URI_OK,
+  CHECK_URI_SWITCH_DIALOGS
+} CheckUriResult;
+
+
+/*  local function prototypes  */
+
+static GtkFileChooserConfirmation
+                 file_save_dialog_confirm_overwrite         (GtkWidget            *dialog,
+                                                             Gimp                 *gimp);
+static void      file_save_dialog_response                  (GtkWidget            *dialog,
+                                                             gint                  response_id,
+                                                             Gimp                 *gimp);
+static CheckUriResult file_save_dialog_check_file           (GtkWidget            *save_dialog,
+                                                             Gimp                 *gimp,
+                                                             GFile               **ret_file,
+                                                             gchar               **ret_basename,
+                                                             GimpPlugInProcedure **ret_save_proc);
+static gboolean  file_save_dialog_no_overwrite_confirmation (GimpFileDialog       *dialog,
+                                                             Gimp                 *gimp);
+static GimpPlugInProcedure *
+                 file_save_dialog_find_procedure            (GimpFileDialog       *dialog,
+                                                             GFile                *file);
+static gboolean  file_save_dialog_switch_dialogs            (GimpFileDialog       *file_dialog,
+                                                             Gimp                 *gimp,
+                                                             const gchar          *basename);
+static gboolean  file_save_dialog_use_extension             (GtkWidget            *save_dialog,
+                                                             GFile                *file);
+
+
+/*  public functions  */
+
+GtkWidget *
+file_save_dialog_new (Gimp     *gimp,
+                      gboolean  export)
+{
+  GtkWidget *dialog;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (! export)
+    {
+      dialog = gimp_save_dialog_new (gimp);
+
+      gimp_file_dialog_load_state (GIMP_FILE_DIALOG (dialog),
+                                   "gimp-file-save-dialog-state");
+    }
+  else
+    {
+      dialog = gimp_export_dialog_new (gimp);
+
+      gimp_file_dialog_load_state (GIMP_FILE_DIALOG (dialog),
+                                   "gimp-file-export-dialog-state");
+    }
+
+  g_signal_connect (dialog, "confirm-overwrite",
+                    G_CALLBACK (file_save_dialog_confirm_overwrite),
+                    gimp);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (file_save_dialog_response),
+                    gimp);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static GtkFileChooserConfirmation
+file_save_dialog_confirm_overwrite (GtkWidget *dialog,
+                                    Gimp      *gimp)
+{
+  GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog);
+
+  if (file_save_dialog_no_overwrite_confirmation (file_dialog, gimp))
+    /* The URI will not be accepted whatever happens, so don't
+     * bother asking the user about overwriting files
+     */
+    return GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME;
+  else
+    return GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM;
+}
+
+static void
+file_save_dialog_response (GtkWidget *dialog,
+                           gint       response_id,
+                           Gimp      *gimp)
+{
+  GimpFileDialog      *file_dialog = GIMP_FILE_DIALOG (dialog);
+  GFile               *file;
+  gchar               *basename;
+  GimpPlugInProcedure *save_proc;
+
+  if (GIMP_IS_SAVE_DIALOG (dialog))
+    {
+      gimp_file_dialog_save_state (file_dialog, "gimp-file-save-dialog-state");
+    }
+  else /* GIMP_IS_EXPORT_DIALOG (dialog) */
+    {
+      gimp_file_dialog_save_state (file_dialog, "gimp-file-export-dialog-state");
+    }
+
+  if (response_id != GTK_RESPONSE_OK)
+    {
+      if (! file_dialog->busy)
+        gtk_widget_destroy (dialog);
+
+      return;
+    }
+
+  g_object_ref (file_dialog);
+  g_object_ref (file_dialog->image);
+
+  switch (file_save_dialog_check_file (dialog, gimp,
+                                       &file, &basename, &save_proc))
+    {
+    case CHECK_URI_FAIL:
+      break;
+
+    case CHECK_URI_OK:
+      {
+        gboolean xcf_compression = FALSE;
+
+        gimp_file_dialog_set_sensitive (file_dialog, FALSE);
+
+        if (GIMP_IS_SAVE_DIALOG (dialog))
+          {
+            xcf_compression = GIMP_SAVE_DIALOG (dialog)->compression;
+          }
+
+        if (file_save_dialog_save_image (GIMP_PROGRESS (dialog),
+                                         gimp,
+                                         file_dialog->image,
+                                         file,
+                                         save_proc,
+                                         GIMP_RUN_INTERACTIVE,
+                                         GIMP_IS_SAVE_DIALOG (dialog) &&
+                                         ! GIMP_SAVE_DIALOG (dialog)->save_a_copy,
+                                         FALSE,
+                                         GIMP_IS_EXPORT_DIALOG (dialog),
+                                         xcf_compression,
+                                         FALSE))
+          {
+            /* Save was successful, now store the URI in a couple of
+             * places that depend on it being the user that made a
+             * save. Lower-level URI management is handled in
+             * file_save()
+             */
+            if (GIMP_IS_SAVE_DIALOG (dialog))
+              {
+                if (GIMP_SAVE_DIALOG (dialog)->save_a_copy)
+                  gimp_image_set_save_a_copy_file (file_dialog->image, file);
+
+                g_object_set_data_full (G_OBJECT (file_dialog->image->gimp),
+                                        GIMP_FILE_SAVE_LAST_FILE_KEY,
+                                        g_object_ref (file),
+                                        (GDestroyNotify) g_object_unref);
+              }
+            else
+              {
+                g_object_set_data_full (G_OBJECT (file_dialog->image->gimp),
+                                        GIMP_FILE_EXPORT_LAST_FILE_KEY,
+                                        g_object_ref (file),
+                                        (GDestroyNotify) g_object_unref);
+              }
+
+            /*  make sure the menus are updated with the keys we've just set  */
+            gimp_image_flush (file_dialog->image);
+
+            /* Handle close-after-saving */
+            if (GIMP_IS_SAVE_DIALOG (dialog)                  &&
+                GIMP_SAVE_DIALOG (dialog)->close_after_saving &&
+                GIMP_SAVE_DIALOG (dialog)->display_to_close)
+              {
+                GimpDisplay *display = GIMP_DISPLAY (GIMP_SAVE_DIALOG (dialog)->display_to_close);
+
+                if (! gimp_image_is_dirty (gimp_display_get_image (display)))
+                  {
+                    gimp_display_close (display);
+                  }
+              }
+
+            gtk_widget_destroy (dialog);
+          }
+
+        g_object_unref (file);
+        g_free (basename);
+
+        gimp_file_dialog_set_sensitive (file_dialog, TRUE);
+      }
+      break;
+
+    case CHECK_URI_SWITCH_DIALOGS:
+      file_dialog->busy = TRUE; /* prevent destruction */
+      gtk_dialog_response (GTK_DIALOG (dialog), FILE_SAVE_RESPONSE_OTHER_DIALOG);
+      file_dialog->busy = FALSE;
+
+      gtk_widget_destroy (dialog);
+      break;
+    }
+
+  g_object_unref (file_dialog->image);
+  g_object_unref (file_dialog);
+}
+
+/* IMPORTANT: When changing this function, keep
+ * file_save_dialog_no_overwrite_confirmation() up to date. It is
+ * difficult to move logic to a common place due to how the dialog is
+ * implemented in GTK+ in combination with how we use it.
+ */
+static CheckUriResult
+file_save_dialog_check_file (GtkWidget            *dialog,
+                             Gimp                 *gimp,
+                             GFile               **ret_file,
+                             gchar               **ret_basename,
+                             GimpPlugInProcedure **ret_save_proc)
+{
+  GimpFileDialog      *file_dialog = GIMP_FILE_DIALOG (dialog);
+  GFile               *file;
+  gchar               *uri;
+  gchar               *basename;
+  GFile               *basename_file;
+  GimpPlugInProcedure *save_proc;
+  GimpPlugInProcedure *uri_proc;
+  GimpPlugInProcedure *basename_proc;
+
+  file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+
+  if (! file)
+    return CHECK_URI_FAIL;
+
+  basename      = g_path_get_basename (gimp_file_get_utf8_name (file));
+  basename_file = g_file_new_for_uri (basename);
+
+  save_proc     = file_dialog->file_proc;
+  uri_proc      = file_save_dialog_find_procedure (file_dialog, file);
+  basename_proc = file_save_dialog_find_procedure (file_dialog, basename_file);
+
+  g_object_unref (basename_file);
+
+  uri = g_file_get_uri (file);
+
+  GIMP_LOG (SAVE_DIALOG, "URI = %s", uri);
+  GIMP_LOG (SAVE_DIALOG, "basename = %s", basename);
+  GIMP_LOG (SAVE_DIALOG, "selected save_proc: %s",
+            save_proc ?
+            gimp_procedure_get_label (GIMP_PROCEDURE (save_proc)) : "NULL");
+  GIMP_LOG (SAVE_DIALOG, "URI save_proc: %s",
+            uri_proc ?
+            gimp_procedure_get_label (GIMP_PROCEDURE (uri_proc)) : "NULL");
+  GIMP_LOG (SAVE_DIALOG, "basename save_proc: %s",
+            basename_proc ?
+            gimp_procedure_get_label (GIMP_PROCEDURE (basename_proc)) : "NULL");
+
+  g_free (uri);
+
+  /*  first check if the user entered an extension at all  */
+  if (! basename_proc)
+    {
+      GIMP_LOG (SAVE_DIALOG, "basename has no valid extension");
+
+      if (! strchr (basename, '.'))
+        {
+          const gchar *ext = NULL;
+
+          GIMP_LOG (SAVE_DIALOG, "basename has no '.', trying to add extension");
+
+          if (! save_proc && GIMP_IS_SAVE_DIALOG (dialog))
+            {
+              ext = "xcf";
+            }
+          else if (save_proc && save_proc->extensions_list)
+            {
+              ext = save_proc->extensions_list->data;
+            }
+
+          if (ext)
+            {
+              gchar *ext_basename;
+              gchar *dirname;
+              gchar *filename;
+              gchar *utf8;
+
+              GIMP_LOG (SAVE_DIALOG, "appending .%s to basename", ext);
+
+              ext_basename = g_strconcat (basename, ".", ext, NULL);
+
+              g_free (basename);
+              basename = ext_basename;
+
+              dirname  = g_path_get_dirname (gimp_file_get_utf8_name (file));
+              filename = g_build_filename (dirname, basename, NULL);
+              g_free (dirname);
+
+              utf8 = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
+              gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
+                                                 utf8);
+              g_free (utf8);
+
+              g_free (filename);
+
+              GIMP_LOG (SAVE_DIALOG,
+                        "set basename to %s, rerunning response and bailing out",
+                        basename);
+
+              /*  call the response callback again, so the
+               *  overwrite-confirm logic can check the changed uri
+               */
+              gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+              goto fail;
+            }
+          else
+            {
+              GIMP_LOG (SAVE_DIALOG,
+                        "save_proc has no extensions, continuing without");
+
+              /*  there may be file formats with no extension at all, use
+               *  the selected proc in this case.
+               */
+              basename_proc = save_proc;
+
+              if (! uri_proc)
+                uri_proc = basename_proc;
+            }
+
+          if (! basename_proc)
+            {
+              GIMP_LOG (SAVE_DIALOG,
+                        "unable to figure save_proc, bailing out");
+
+              if (file_save_dialog_switch_dialogs (file_dialog, gimp, basename))
+                {
+                  goto switch_dialogs;
+                }
+
+              goto fail;
+            }
+        }
+      else if (save_proc && ! save_proc->extensions_list)
+        {
+          GIMP_LOG (SAVE_DIALOG,
+                    "basename has '.', but save_proc has no extensions, "
+                    "accepting random extension");
+
+          /*  accept any random extension if the file format has
+           *  no extensions at all
+           */
+          basename_proc = save_proc;
+
+          if (! uri_proc)
+            uri_proc = basename_proc;
+        }
+    }
+
+  /*  then check if the selected format matches the entered extension  */
+  if (! save_proc)
+    {
+      GIMP_LOG (SAVE_DIALOG, "no save_proc was selected from the list");
+
+      if (! basename_proc)
+        {
+          GIMP_LOG (SAVE_DIALOG,
+                    "basename has no useful extension, bailing out");
+
+          if (file_save_dialog_switch_dialogs (file_dialog, gimp, basename))
+            {
+              goto switch_dialogs;
+            }
+
+          goto fail;
+        }
+
+      GIMP_LOG (SAVE_DIALOG, "use URI's proc '%s' so indirect saving works",
+                gimp_procedure_get_label (GIMP_PROCEDURE (uri_proc)));
+
+      /*  use the URI's proc if no save proc was selected  */
+      save_proc = uri_proc;
+    }
+  else
+    {
+      GIMP_LOG (SAVE_DIALOG, "save_proc '%s' was selected from the list",
+                gimp_procedure_get_label (GIMP_PROCEDURE (save_proc)));
+
+      if (save_proc != basename_proc)
+        {
+          GIMP_LOG (SAVE_DIALOG, "however the basename's proc is '%s'",
+                    gimp_procedure_get_label (GIMP_PROCEDURE (basename_proc)));
+
+          if (uri_proc != basename_proc)
+            {
+              GIMP_LOG (SAVE_DIALOG,
+                        "that's impossible for remote URIs, bailing out");
+
+              /*  remote URI  */
+
+              gimp_message (gimp, G_OBJECT (dialog), GIMP_MESSAGE_WARNING,
+                            _("Saving remote files needs to determine the "
+                              "file format from the file extension. "
+                              "Please enter a file extension that matches "
+                              "the selected file format or enter no file "
+                              "extension at all."));
+
+              goto fail;
+            }
+          else
+            {
+              GIMP_LOG (SAVE_DIALOG,
+                        "ask the user if she really wants that filename");
+
+              /*  local URI  */
+
+              if (! file_save_dialog_use_extension (dialog, file))
+                {
+                  goto fail;
+                }
+            }
+        }
+      else if (save_proc != uri_proc)
+        {
+          GIMP_LOG (SAVE_DIALOG,
+                    "use URI's proc '%s' so indirect saving works",
+                    gimp_procedure_get_label (GIMP_PROCEDURE (uri_proc)));
+
+          /*  need to use the URI's proc for saving because e.g.
+           *  the GIF plug-in can't save a GIF to sftp://
+           */
+          save_proc = uri_proc;
+        }
+    }
+
+  if (! save_proc)
+    {
+      g_warning ("%s: EEEEEEK", G_STRFUNC);
+
+      return CHECK_URI_FAIL;
+    }
+
+  *ret_file      = file;
+  *ret_basename  = basename;
+  *ret_save_proc = save_proc;
+
+  return CHECK_URI_OK;
+
+ fail:
+
+  g_object_unref (file);
+  g_free (basename);
+
+  return CHECK_URI_FAIL;
+
+ switch_dialogs:
+
+  g_object_unref (file);
+  g_free (basename);
+
+  return CHECK_URI_SWITCH_DIALOGS;
+}
+
+/*
+ * IMPORTANT: Keep this up to date with file_save_dialog_check_uri().
+ */
+static gboolean
+file_save_dialog_no_overwrite_confirmation (GimpFileDialog *file_dialog,
+                                            Gimp           *gimp)
+{
+  GFile               *file;
+  gchar               *basename;
+  GFile               *basename_file;
+  GimpPlugInProcedure *basename_proc;
+  GimpPlugInProcedure *save_proc;
+  gboolean             uri_will_change;
+  gboolean             unknown_ext;
+
+  file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (file_dialog));
+
+  if (! file)
+    return FALSE;
+
+  basename      = g_path_get_basename (gimp_file_get_utf8_name (file));
+  basename_file = g_file_new_for_uri (basename);
+
+  save_proc     = file_dialog->file_proc;
+  basename_proc = file_save_dialog_find_procedure (file_dialog, basename_file);
+
+  g_object_unref (basename_file);
+
+  uri_will_change = (! basename_proc &&
+                     ! strchr (basename, '.') &&
+                     (! save_proc || save_proc->extensions_list));
+
+  unknown_ext     = (! save_proc &&
+                     ! basename_proc);
+
+  g_free (basename);
+  g_object_unref (file);
+
+  return uri_will_change || unknown_ext;
+}
+
+static GimpPlugInProcedure *
+file_save_dialog_find_procedure (GimpFileDialog *file_dialog,
+                                 GFile          *file)
+{
+  GimpPlugInManager      *manager = file_dialog->gimp->plug_in_manager;
+  GimpFileProcedureGroup  group;
+
+  if (GIMP_IS_SAVE_DIALOG (file_dialog))
+    group = GIMP_FILE_PROCEDURE_GROUP_SAVE;
+  else
+    group = GIMP_FILE_PROCEDURE_GROUP_EXPORT;
+
+  return gimp_plug_in_manager_file_procedure_find (manager, group, file, NULL);
+}
+
+static gboolean
+file_save_other_dialog_activated (GtkWidget   *label,
+                                  const gchar *uri,
+                                  GtkDialog   *dialog)
+{
+  gtk_dialog_response (dialog, FILE_SAVE_RESPONSE_OTHER_DIALOG);
+
+  return TRUE;
+}
+
+static gboolean
+file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog,
+                                 Gimp           *gimp,
+                                 const gchar    *basename)
+{
+  GimpPlugInProcedure    *proc_in_other_group;
+  GimpFileProcedureGroup  other_group;
+  GFile                  *file;
+  gboolean                switch_dialogs = FALSE;
+
+  file = g_file_new_for_uri (basename);
+
+  if (GIMP_IS_EXPORT_DIALOG (file_dialog))
+    other_group = GIMP_FILE_PROCEDURE_GROUP_SAVE;
+  else
+    other_group = GIMP_FILE_PROCEDURE_GROUP_EXPORT;
+
+  proc_in_other_group =
+    gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                              other_group, file, NULL);
+
+  g_object_unref (file);
+
+  if (proc_in_other_group)
+    {
+      GtkWidget   *dialog;
+      const gchar *primary;
+      const gchar *message;
+      const gchar *link;
+
+      if (GIMP_IS_EXPORT_DIALOG (file_dialog))
+        {
+          primary = _("The given filename cannot be used for exporting");
+          message = _("You can use this dialog to export to various file formats. "
+                      "If you want to save the image to the GIMP XCF format, use "
+                      "File→Save instead.");
+          link    = _("Take me to the Save dialog");
+        }
+      else
+        {
+          primary = _("The given filename cannot be used for saving");
+          message = _("You can use this dialog to save to the GIMP XCF "
+                      "format. Use File→Export to export to other file formats.");
+          link    = _("Take me to the Export dialog");
+        }
+
+      dialog = gimp_message_dialog_new (_("Extension Mismatch"),
+                                        GIMP_ICON_DIALOG_WARNING,
+                                        GTK_WIDGET (file_dialog),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        gimp_standard_help_func, NULL,
+
+                                        _("_OK"), GTK_RESPONSE_OK,
+
+                                        NULL);
+
+      gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                         "%s", primary);
+
+      gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                 "%s", message);
+
+      if (GIMP_IS_EXPORT_DIALOG (file_dialog) ||
+          (! GIMP_SAVE_DIALOG (file_dialog)->save_a_copy &&
+          ! GIMP_SAVE_DIALOG (file_dialog)->close_after_saving))
+        {
+          GtkWidget *label;
+          gchar     *markup;
+
+          markup = g_strdup_printf ("<a href=\"other-dialog\">%s</a>", link);
+          label = gtk_label_new (markup);
+          g_free (markup);
+
+          gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+          gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+          gtk_box_pack_start (GTK_BOX (GIMP_MESSAGE_DIALOG (dialog)->box), label,
+                              FALSE, FALSE, 0);
+          gtk_widget_show (label);
+
+          g_signal_connect (label, "activate-link",
+                            G_CALLBACK (file_save_other_dialog_activated),
+                            dialog);
+        }
+
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog),
+                                         GTK_RESPONSE_CANCEL, FALSE);
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog),
+                                         GTK_RESPONSE_OK, FALSE);
+
+      g_object_ref (dialog);
+
+      if (gimp_dialog_run (GIMP_DIALOG (dialog)) == FILE_SAVE_RESPONSE_OTHER_DIALOG)
+        {
+          switch_dialogs = TRUE;
+        }
+
+      gtk_widget_destroy (dialog);
+      g_object_unref (dialog);
+
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog),
+                                         GTK_RESPONSE_CANCEL, TRUE);
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog),
+                                         GTK_RESPONSE_OK, TRUE);
+    }
+  else
+    {
+      gimp_message (gimp, G_OBJECT (file_dialog), GIMP_MESSAGE_WARNING,
+                    _("The given filename does not have any known "
+                      "file extension. Please enter a known file "
+                      "extension or select a file format from the "
+                      "file format list."));
+    }
+
+  return switch_dialogs;
+}
+
+static gboolean
+file_save_dialog_use_extension (GtkWidget *save_dialog,
+                                GFile     *file)
+{
+  GtkWidget *dialog;
+  gboolean   use_name = FALSE;
+
+  dialog = gimp_message_dialog_new (_("Extension Mismatch"),
+                                    GIMP_ICON_DIALOG_QUESTION,
+                                    save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("_Save"),   GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("The given file extension does "
+                                       "not match the chosen file type."));
+
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("Do you want to save the image using this "
+                               "name anyway?"));
+
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog),
+                                     GTK_RESPONSE_CANCEL, FALSE);
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog),
+                                     GTK_RESPONSE_OK, FALSE);
+
+  g_object_ref (dialog);
+
+  use_name = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
+
+  gtk_widget_destroy (dialog);
+  g_object_unref (dialog);
+
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog),
+                                     GTK_RESPONSE_CANCEL, TRUE);
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog),
+                                     GTK_RESPONSE_OK, TRUE);
+
+  return use_name;
+}
+
+gboolean
+file_save_dialog_save_image (GimpProgress        *progress,
+                             Gimp                *gimp,
+                             GimpImage           *image,
+                             GFile               *file,
+                             GimpPlugInProcedure *save_proc,
+                             GimpRunMode          run_mode,
+                             gboolean             change_saved_state,
+                             gboolean             export_backward,
+                             gboolean             export_forward,
+                             gboolean             xcf_compression,
+                             gboolean             verbose_cancel)
+{
+  GimpPDBStatusType  status;
+  GError            *error   = NULL;
+  GList             *list;
+  gboolean           success = FALSE;
+
+  for (list = gimp_action_groups_from_name ("file");
+       list;
+       list = g_list_next (list))
+    {
+      gimp_action_group_set_action_sensitive (list->data, "file-quit", FALSE);
+    }
+
+  gimp_image_set_xcf_compression (image, xcf_compression);
+
+  status = file_save (gimp, image, progress, file,
+                      save_proc, run_mode,
+                      change_saved_state, export_backward, export_forward,
+                      &error);
+
+  switch (status)
+    {
+    case GIMP_PDB_SUCCESS:
+      success = TRUE;
+      break;
+
+    case GIMP_PDB_CANCEL:
+      if (verbose_cancel)
+        gimp_message_literal (gimp,
+                              G_OBJECT (progress), GIMP_MESSAGE_INFO,
+                              _("Saving canceled"));
+      break;
+
+    default:
+      {
+        gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                      _("Saving '%s' failed:\n\n%s"),
+                      gimp_file_get_utf8_name (file),
+                      error ? error->message : _("Unknown error"));
+        g_clear_error (&error);
+      }
+      break;
+    }
+
+  for (list = gimp_action_groups_from_name ("file");
+       list;
+       list = g_list_next (list))
+    {
+      gimp_action_group_set_action_sensitive (list->data, "file-quit", TRUE);
+    }
+
+  return success;
+}
diff --git a/app/dialogs/file-save-dialog.h b/app/dialogs/file-save-dialog.h
new file mode 100644
index 0000000..92f69cb
--- /dev/null
+++ b/app/dialogs/file-save-dialog.h
@@ -0,0 +1,42 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_SAVE_DIALOG_H__
+#define __FILE_SAVE_DIALOG_H__
+
+
+#define FILE_SAVE_RESPONSE_OTHER_DIALOG -23
+
+
+GtkWidget * file_save_dialog_new        (Gimp                *gimp,
+                                         gboolean             export);
+
+gboolean    file_save_dialog_save_image (GimpProgress        *progress_and_handler,
+                                         Gimp                *gimp,
+                                         GimpImage           *image,
+                                         GFile               *file,
+                                         GimpPlugInProcedure *write_proc,
+                                         GimpRunMode          run_mode,
+                                         gboolean             save_a_copy,
+                                         gboolean             export_backward,
+                                         gboolean             export_forward,
+                                         gboolean             xcf_compression,
+                                         gboolean             verbose_cancel);
+
+
+
+#endif /* __FILE_SAVE_DIALOG_H__ */
diff --git a/app/dialogs/fill-dialog.c b/app/dialogs/fill-dialog.c
new file mode 100644
index 0000000..a74bfd1
--- /dev/null
+++ b/app/dialogs/fill-dialog.c
@@ -0,0 +1,183 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * fill-dialog.c
+ * Copyright (C) 2016  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpfilloptions.h"
+
+#include "widgets/gimpfilleditor.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "fill-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+
+typedef struct _FillDialog FillDialog;
+
+struct _FillDialog
+{
+  GimpItem         *item;
+  GimpDrawable     *drawable;
+  GimpContext      *context;
+  GimpFillOptions  *options;
+  GimpFillCallback  callback;
+  gpointer          user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void  fill_dialog_free     (FillDialog *private);
+static void  fill_dialog_response (GtkWidget  *dialog,
+                                   gint        response_id,
+                                   FillDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+fill_dialog_new (GimpItem         *item,
+                 GimpDrawable     *drawable,
+                 GimpContext      *context,
+                 const gchar      *title,
+                 const gchar      *icon_name,
+                 const gchar      *help_id,
+                 GtkWidget        *parent,
+                 GimpFillOptions  *options,
+                 GimpFillCallback  callback,
+                 gpointer          user_data)
+{
+  FillDialog *private;
+  GtkWidget  *dialog;
+  GtkWidget  *main_vbox;
+  GtkWidget  *fill_editor;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (FillDialog);
+
+  private->item      = item;
+  private->drawable  = drawable;
+  private->context   = context;
+  private->options   = gimp_fill_options_new (context->gimp, context, TRUE);
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (private->options), 0);
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (item), context,
+                                     title, "gimp-fill-options",
+                                     icon_name,
+                                     _("Choose Fill Style"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     help_id,
+
+                                     _("_Reset"),  RESPONSE_RESET,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Fill"),   GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) fill_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (fill_dialog_response),
+                    private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+  fill_editor = gimp_fill_editor_new (private->options, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), fill_editor, FALSE, FALSE, 0);
+  gtk_widget_show (fill_editor);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+fill_dialog_free (FillDialog *private)
+{
+  g_object_unref (private->options);
+
+  g_slice_free (FillDialog, private);
+}
+
+static void
+fill_dialog_response (GtkWidget  *dialog,
+                      gint        response_id,
+                      FillDialog *private)
+{
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gimp_config_reset (GIMP_CONFIG (private->options));
+      break;
+
+    case GTK_RESPONSE_OK:
+      private->callback (dialog,
+                         private->item,
+                         private->drawable,
+                         private->context,
+                         private->options,
+                         private->user_data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
diff --git a/app/dialogs/fill-dialog.h b/app/dialogs/fill-dialog.h
new file mode 100644
index 0000000..35570cb
--- /dev/null
+++ b/app/dialogs/fill-dialog.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * fill-dialog.h
+ * Copyright (C) 2016  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILL_DIALOG_H__
+#define __FILL_DIALOG_H__
+
+
+typedef void (* GimpFillCallback) (GtkWidget       *dialog,
+                                   GimpItem        *item,
+                                   GimpDrawable    *drawable,
+                                   GimpContext     *context,
+                                   GimpFillOptions *options,
+                                   gpointer         user_data);
+
+
+GtkWidget * fill_dialog_new (GimpItem         *item,
+                             GimpDrawable     *drawable,
+                             GimpContext      *context,
+                             const gchar      *title,
+                             const gchar      *icon_name,
+                             const gchar      *help_id,
+                             GtkWidget        *parent,
+                             GimpFillOptions  *options,
+                             GimpFillCallback  callback,
+                             gpointer          user_data);
+
+
+#endif  /*  __FILL_DIALOG_H__  */
diff --git a/app/dialogs/grid-dialog.c b/app/dialogs/grid-dialog.c
new file mode 100644
index 0000000..622ff97
--- /dev/null
+++ b/app/dialogs/grid-dialog.c
@@ -0,0 +1,173 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpgrid.h"
+
+#include "widgets/gimpgrideditor.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "grid-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define GRID_RESPONSE_RESET 1
+
+
+typedef struct _GridDialog GridDialog;
+
+struct _GridDialog
+{
+  GimpImage *image;
+  GimpGrid  *grid;
+  GimpGrid  *grid_backup;
+};
+
+
+/*  local functions  */
+
+static void   grid_dialog_free     (GridDialog *private);
+static void   grid_dialog_response (GtkWidget  *dialog,
+                                    gint        response_id,
+                                    GridDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+grid_dialog_new (GimpImage   *image,
+                 GimpContext *context,
+                 GtkWidget   *parent)
+{
+  GridDialog *private;
+  GtkWidget  *dialog;
+  GtkWidget  *editor;
+  gdouble     xres;
+  gdouble     yres;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+
+  private = g_slice_new0 (GridDialog);
+
+  private->image       = image;
+  private->grid        = gimp_image_get_grid (image);
+  private->grid_backup = gimp_config_duplicate (GIMP_CONFIG (private->grid));
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                     _("Configure Grid"), "gimp-grid-configure",
+                                     GIMP_ICON_GRID, _("Configure Image Grid"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_IMAGE_GRID,
+
+                                     _("_Reset"),  GRID_RESPONSE_RESET,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_OK"),     GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GRID_RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) grid_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (grid_dialog_response),
+                    private);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  editor = gimp_grid_editor_new (private->grid, context, xres, yres);
+  gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      editor, TRUE, TRUE, 0);
+
+  gtk_widget_show (editor);
+
+  return dialog;
+}
+
+
+/*  local functions  */
+
+static void
+grid_dialog_free (GridDialog *private)
+{
+  g_object_unref (private->grid_backup);
+
+  g_slice_free (GridDialog, private);
+}
+
+static void
+grid_dialog_response (GtkWidget  *dialog,
+                      gint        response_id,
+                      GridDialog *private)
+{
+  switch (response_id)
+    {
+    case GRID_RESPONSE_RESET:
+      gimp_config_sync (G_OBJECT (private->image->gimp->config->default_grid),
+                        G_OBJECT (private->grid), 0);
+      break;
+
+    case GTK_RESPONSE_OK:
+      if (! gimp_config_is_equal_to (GIMP_CONFIG (private->grid_backup),
+                                     GIMP_CONFIG (private->grid)))
+        {
+          gimp_image_undo_push_image_grid (private->image, _("Grid"),
+                                           private->grid_backup);
+          gimp_image_flush (private->image);
+        }
+
+      gtk_widget_destroy (dialog);
+      break;
+
+    default:
+      gimp_image_set_grid (private->image, private->grid_backup, FALSE);
+      gtk_widget_destroy (dialog);
+    }
+}
diff --git a/app/dialogs/grid-dialog.h b/app/dialogs/grid-dialog.h
new file mode 100644
index 0000000..19670f9
--- /dev/null
+++ b/app/dialogs/grid-dialog.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GRID_DIALOG_H__
+#define __GRID_DIALOG_H__
+
+
+GtkWidget * grid_dialog_new (GimpImage   *image,
+                             GimpContext *context,
+                             GtkWidget   *parent);
+
+
+#endif  /*  __GRID_DIALOG_H__  */
diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c
new file mode 100644
index 0000000..ce6ceac
--- /dev/null
+++ b/app/dialogs/image-merge-layers-dialog.c
@@ -0,0 +1,192 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpitemstack.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "image-merge-layers-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _ImageMergeLayersDialog ImageMergeLayersDialog;
+
+struct _ImageMergeLayersDialog
+{
+  GimpImage               *image;
+  GimpContext             *context;
+  GimpMergeType            merge_type;
+  gboolean                 merge_active_group;
+  gboolean                 discard_invisible;
+  GimpMergeLayersCallback  callback;
+  gpointer                 user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void  image_merge_layers_dialog_free     (ImageMergeLayersDialog *private);
+static void  image_merge_layers_dialog_response (GtkWidget              *dialog,
+                                                 gint                    response_id,
+                                                 ImageMergeLayersDialog *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+image_merge_layers_dialog_new (GimpImage               *image,
+                               GimpContext             *context,
+                               GtkWidget               *parent,
+                               GimpMergeType            merge_type,
+                               gboolean                 merge_active_group,
+                               gboolean                 discard_invisible,
+                               GimpMergeLayersCallback  callback,
+                               gpointer                 user_data)
+{
+  ImageMergeLayersDialog *private;
+  GtkWidget              *dialog;
+  GtkWidget              *vbox;
+  GtkWidget              *frame;
+  GtkWidget              *button;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  private = g_slice_new0 (ImageMergeLayersDialog);
+
+  private->image              = image;
+  private->context            = context;
+  private->merge_type         = merge_type;
+  private->merge_active_group = merge_active_group;
+  private->discard_invisible  = discard_invisible;
+  private->callback           = callback;
+  private->user_data          = user_data;
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                     _("Merge Layers"), "gimp-image-merge-layers",
+                                     GIMP_ICON_LAYER_MERGE_DOWN,
+                                     _("Layers Merge Options"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_IMAGE_MERGE_LAYERS,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Merge"),  GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) image_merge_layers_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (image_merge_layers_dialog_response),
+                    private);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  frame =
+    gimp_enum_radio_frame_new_with_range (GIMP_TYPE_MERGE_TYPE,
+                                          GIMP_EXPAND_AS_NECESSARY,
+                                          GIMP_CLIP_TO_BOTTOM_LAYER,
+                                          gtk_label_new (_("Final, Merged Layer should be:")),
+                                          G_CALLBACK (gimp_radio_button_update),
+                                          &private->merge_type,
+                                          &button);
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (button),
+                                   private->merge_type);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  button = gtk_check_button_new_with_mnemonic (_("Merge within active _group only"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->merge_active_group);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->merge_active_group);
+
+  if (gimp_item_stack_is_flat (GIMP_ITEM_STACK (gimp_image_get_layers (image))))
+    gtk_widget_set_sensitive (button, FALSE);
+
+  button = gtk_check_button_new_with_mnemonic (_("_Discard invisible layers"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->discard_invisible);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->discard_invisible);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+image_merge_layers_dialog_free (ImageMergeLayersDialog *private)
+{
+  g_slice_free (ImageMergeLayersDialog, private);
+}
+
+static void
+image_merge_layers_dialog_response (GtkWidget              *dialog,
+                                    gint                    response_id,
+                                    ImageMergeLayersDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      private->callback (dialog,
+                         private->image,
+                         private->context,
+                         private->merge_type,
+                         private->merge_active_group,
+                         private->discard_invisible,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
diff --git a/app/dialogs/image-merge-layers-dialog.h b/app/dialogs/image-merge-layers-dialog.h
new file mode 100644
index 0000000..ee96515
--- /dev/null
+++ b/app/dialogs/image-merge-layers-dialog.h
@@ -0,0 +1,42 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_MERGE_LAYERS_DIALOG_H__
+#define __IMAGE_MERGE_LAYERS_DIALOG_H__
+
+
+typedef void (* GimpMergeLayersCallback) (GtkWidget     *dialog,
+                                          GimpImage     *image,
+                                          GimpContext   *context,
+                                          GimpMergeType  merge_type,
+                                          gboolean       merge_active_group,
+                                          gboolean       discard_invisible,
+                                          gpointer       user_data);
+
+
+GtkWidget *
+  image_merge_layers_dialog_new (GimpImage               *image,
+                                 GimpContext             *context,
+                                 GtkWidget               *parent,
+                                 GimpMergeType            merge_type,
+                                 gboolean                 merge_active_group,
+                                 gboolean                 discard_invisible,
+                                 GimpMergeLayersCallback  callback,
+                                 gpointer                 user_data);
+
+
+#endif /* __IMAGE_MERGE_LAYERS_DIALOG_H__ */
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
new file mode 100644
index 0000000..3650329
--- /dev/null
+++ b/app/dialogs/image-new-dialog.c
@@ -0,0 +1,380 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-new.h"
+#include "core/gimptemplate.h"
+
+#include "widgets/gimpcontainercombobox.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimptemplateeditor.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "image-new-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+typedef struct
+{
+  GtkWidget    *dialog;
+  GtkWidget    *confirm_dialog;
+
+  GtkWidget    *combo;
+  GtkWidget    *editor;
+
+  GimpContext  *context;
+  GimpTemplate *template;
+} ImageNewDialog;
+
+
+/*  local function prototypes  */
+
+static void   image_new_dialog_free      (ImageNewDialog *private);
+static void   image_new_dialog_response  (GtkWidget      *widget,
+                                          gint            response_id,
+                                          ImageNewDialog *private);
+static void   image_new_template_changed (GimpContext    *context,
+                                          GimpTemplate   *template,
+                                          ImageNewDialog *private);
+static void   image_new_confirm_dialog   (ImageNewDialog *private);
+static void   image_new_create_image     (ImageNewDialog *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+image_new_dialog_new (GimpContext *context)
+{
+  ImageNewDialog *private;
+  GtkWidget      *dialog;
+  GtkWidget      *main_vbox;
+  GtkWidget      *hbox;
+  GtkWidget      *label;
+  GimpSizeEntry  *entry;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  private = g_slice_new0 (ImageNewDialog);
+
+  private->context  = gimp_context_new (context->gimp, "image-new-dialog",
+                                        context);
+  private->template = g_object_new (GIMP_TYPE_TEMPLATE, NULL);
+
+  private->dialog = dialog =
+    gimp_dialog_new (_("Create a New Image"),
+                     "gimp-image-new",
+                     NULL, 0,
+                     gimp_standard_help_func, GIMP_HELP_FILE_NEW,
+
+                     _("_Reset"),  RESPONSE_RESET,
+                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                     _("_OK"),     GTK_RESPONSE_OK,
+
+                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_set_data_full (G_OBJECT (dialog),
+                          "gimp-image-new-dialog", private,
+                          (GDestroyNotify) image_new_dialog_free);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (image_new_dialog_response),
+                    private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+  /*  The template combo  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("_Template:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  private->combo = g_object_new (GIMP_TYPE_CONTAINER_COMBO_BOX,
+                                 "container",         context->gimp->templates,
+                                 "context",           private->context,
+                                 "view-size",         16,
+                                 "view-border-width", 0,
+                                 "ellipsize",         PANGO_ELLIPSIZE_NONE,
+                                 "focus-on-click",    FALSE,
+                                 NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), private->combo, TRUE, TRUE, 0);
+  gtk_widget_show (private->combo);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), private->combo);
+
+  g_signal_connect (private->context, "template-changed",
+                    G_CALLBACK (image_new_template_changed),
+                    private);
+
+  /*  Template editor  */
+  private->editor = gimp_template_editor_new (private->template, context->gimp,
+                                              FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), private->editor, FALSE, FALSE, 0);
+  gtk_widget_show (private->editor);
+
+  entry = GIMP_SIZE_ENTRY (gimp_template_editor_get_size_se (GIMP_TEMPLATE_EDITOR (private->editor)));
+  gimp_size_entry_set_activates_default (entry, TRUE);
+  gimp_size_entry_grab_focus (entry);
+
+  image_new_template_changed (private->context,
+                              gimp_context_get_template (private->context),
+                              private);
+
+  return dialog;
+}
+
+void
+image_new_dialog_set (GtkWidget    *dialog,
+                      GimpImage    *image,
+                      GimpTemplate *template)
+{
+  ImageNewDialog *private;
+
+  g_return_if_fail (GIMP_IS_DIALOG (dialog));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+  g_return_if_fail (template == NULL || GIMP_IS_TEMPLATE (template));
+
+  private = g_object_get_data (G_OBJECT (dialog), "gimp-image-new-dialog");
+
+  g_return_if_fail (private != NULL);
+
+  gimp_context_set_template (private->context, template);
+
+  if (! template)
+    {
+      template = gimp_image_new_get_last_template (private->context->gimp,
+                                                   image);
+
+      image_new_template_changed (private->context, template, private);
+
+      g_object_unref (template);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+image_new_dialog_free (ImageNewDialog *private)
+{
+  g_object_unref (private->context);
+  g_object_unref (private->template);
+
+  g_slice_free (ImageNewDialog, private);
+}
+
+static void
+image_new_dialog_response (GtkWidget      *dialog,
+                           gint            response_id,
+                           ImageNewDialog *private)
+{
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gimp_config_sync (G_OBJECT (private->context->gimp->config->default_image),
+                        G_OBJECT (private->template), 0);
+      gimp_context_set_template (private->context, NULL);
+      break;
+
+    case GTK_RESPONSE_OK:
+      if (gimp_template_get_initial_size (private->template) >
+          GIMP_GUI_CONFIG (private->context->gimp->config)->max_new_image_size)
+        image_new_confirm_dialog (private);
+      else
+        image_new_create_image (private);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
+
+static void
+image_new_template_changed (GimpContext    *context,
+                            GimpTemplate   *template,
+                            ImageNewDialog *private)
+{
+  GimpTemplateEditor *editor;
+  GtkWidget          *chain;
+  gdouble             xres, yres;
+  gchar              *comment;
+
+  if (! template)
+    return;
+
+  editor = GIMP_TEMPLATE_EDITOR (private->editor);
+  chain  = gimp_template_editor_get_resolution_chain (editor);
+
+  xres = gimp_template_get_resolution_x (template);
+  yres = gimp_template_get_resolution_y (template);
+
+  gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (chain),
+                                ABS (xres - yres) < GIMP_MIN_RESOLUTION);
+
+  comment = (gchar *) gimp_template_get_comment (template);
+
+  if (! comment || ! strlen (comment))
+    comment = g_strdup (gimp_template_get_comment (private->template));
+  else
+    comment = NULL;
+
+  /*  make sure the resolution values are copied first (see bug #546924)  */
+  gimp_config_sync (G_OBJECT (template), G_OBJECT (private->template),
+                    GIMP_TEMPLATE_PARAM_COPY_FIRST);
+  gimp_config_sync (G_OBJECT (template), G_OBJECT (private->template), 0);
+
+  if (comment)
+    {
+      g_object_set (private->template,
+                    "comment", comment,
+                    NULL);
+
+      g_free (comment);
+    }
+}
+
+
+/*  the confirm dialog  */
+
+static void
+image_new_confirm_response (GtkWidget      *dialog,
+                            gint            response_id,
+                            ImageNewDialog *private)
+{
+  gtk_widget_destroy (dialog);
+
+  private->confirm_dialog = NULL;
+
+  if (response_id == GTK_RESPONSE_OK)
+    image_new_create_image (private);
+  else
+    gtk_widget_set_sensitive (private->dialog, TRUE);
+}
+
+static void
+image_new_confirm_dialog (ImageNewDialog *private)
+{
+  GimpGuiConfig *config;
+  GtkWidget     *dialog;
+  gchar         *size;
+
+  if (private->confirm_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (private->confirm_dialog));
+      return;
+    }
+
+  private->confirm_dialog =
+    dialog = gimp_message_dialog_new (_("Confirm Image Size"),
+                                      GIMP_ICON_DIALOG_WARNING,
+                                      private->dialog,
+                                      GTK_DIALOG_DESTROY_WITH_PARENT,
+                                      gimp_standard_help_func, NULL,
+
+                                      _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                      _("_OK"),     GTK_RESPONSE_OK,
+
+                                      NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (private->confirm_dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (image_new_confirm_response),
+                    private);
+
+  size = g_format_size (gimp_template_get_initial_size (private->template));
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("You are trying to create an image "
+                                       "with a size of %s."), size);
+  g_free (size);
+
+  config = GIMP_GUI_CONFIG (private->context->gimp->config);
+  size = g_format_size (config->max_new_image_size);
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                              _("An image of the chosen size will use more "
+                                "memory than what is configured as "
+                                "\"Maximum new image size\" in the Preferences "
+                                "dialog (currently %s)."), size);
+  g_free (size);
+
+  gtk_widget_set_sensitive (private->dialog, FALSE);
+
+  gtk_widget_show (dialog);
+}
+
+static void
+image_new_create_image (ImageNewDialog *private)
+{
+  GimpTemplate *template = g_object_ref (private->template);
+  Gimp         *gimp     = private->context->gimp;
+  GimpImage    *image;
+
+  gtk_widget_hide (private->dialog);
+
+  image = gimp_image_new_from_template (gimp, template,
+                                        gimp_get_user_context (gimp));
+  gimp_create_display (gimp, image, gimp_template_get_unit (template), 1.0,
+                       G_OBJECT (gtk_widget_get_screen (private->dialog)),
+                       gimp_widget_get_monitor (private->dialog));
+  g_object_unref (image);
+
+  gtk_widget_destroy (private->dialog);
+
+  gimp_image_new_set_last_template (gimp, template);
+
+  g_object_unref (template);
+}
diff --git a/app/dialogs/image-new-dialog.h b/app/dialogs/image-new-dialog.h
new file mode 100644
index 0000000..e619cb7
--- /dev/null
+++ b/app/dialogs/image-new-dialog.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_NEW_DIALOG_H__
+#define __IMAGE_NEW_DIALOG_H__
+
+
+GtkWidget * image_new_dialog_new (GimpContext  *context);
+
+void        image_new_dialog_set (GtkWidget    *dialog,
+                                  GimpImage    *image,
+                                  GimpTemplate *template);
+
+
+#endif /* __IMAGE_NEW_DIALOG_H__ */
diff --git a/app/dialogs/image-properties-dialog.c b/app/dialogs/image-properties-dialog.c
new file mode 100644
index 0000000..bbfcdaf
--- /dev/null
+++ b/app/dialogs/image-properties-dialog.c
@@ -0,0 +1,100 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * image-properties-dialog.c
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpimagecommenteditor.h"
+#include "widgets/gimpimagepropview.h"
+#include "widgets/gimpimageprofileview.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "image-properties-dialog.h"
+
+#include "gimp-intl.h"
+
+
+GtkWidget *
+image_properties_dialog_new (GimpImage   *image,
+                             GimpContext *context,
+                             GtkWidget   *parent)
+{
+  GtkWidget *dialog;
+  GtkWidget *notebook;
+  GtkWidget *view;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                     _("Image Properties"),
+                                     "gimp-image-properties",
+                                     "dialog-information",
+                                     _("Image Properties"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_IMAGE_PROPERTIES,
+
+                                     _("_Close"), GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+
+  notebook = gtk_notebook_new ();
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      notebook, FALSE, FALSE, 0);
+  gtk_widget_show (notebook);
+
+  view = gimp_image_prop_view_new (image);
+  gtk_container_set_border_width (GTK_CONTAINER (view), 12);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                            view, gtk_label_new_with_mnemonic (_("_Properties")));
+  gtk_widget_show (view);
+
+  view = gimp_image_profile_view_new (image);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                            view, gtk_label_new_with_mnemonic (_("C_olor Profile")));
+  gtk_widget_show (view);
+
+  view = gimp_image_comment_editor_new (image);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                            view, gtk_label_new_with_mnemonic (_("Co_mment")));
+  gtk_widget_show (view);
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
+
+  return dialog;
+}
diff --git a/app/dialogs/image-properties-dialog.h b/app/dialogs/image-properties-dialog.h
new file mode 100644
index 0000000..57a14ff
--- /dev/null
+++ b/app/dialogs/image-properties-dialog.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * image-properties-dialog.h
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_PROPERTIES_DIALOG_H__
+#define __IMAGE_PROPERTIES_DIALOG_H__
+
+
+GtkWidget * image_properties_dialog_new (GimpImage   *image,
+                                         GimpContext *context,
+                                         GtkWidget   *parent);
+
+
+#endif  /*  __IMAGE_PROPERTIES_DIALOG_H__  */
diff --git a/app/dialogs/image-scale-dialog.c b/app/dialogs/image-scale-dialog.c
new file mode 100644
index 0000000..36b6a3f
--- /dev/null
+++ b/app/dialogs/image-scale-dialog.c
@@ -0,0 +1,291 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-scale.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+
+#include "scale-dialog.h"
+
+#include "image-scale-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  GtkWidget             *dialog;
+
+  GimpImage             *image;
+
+  gint                   width;
+  gint                   height;
+  GimpUnit               unit;
+  GimpInterpolationType  interpolation;
+  gdouble                xresolution;
+  gdouble                yresolution;
+  GimpUnit               resolution_unit;
+
+  GimpScaleCallback      callback;
+  gpointer               user_data;
+} ImageScaleDialog;
+
+
+/*  local function prototypes  */
+
+static void        image_scale_dialog_free      (ImageScaleDialog      *private);
+static void        image_scale_callback         (GtkWidget             *widget,
+                                                 GimpViewable          *viewable,
+                                                 gint                   width,
+                                                 gint                   height,
+                                                 GimpUnit               unit,
+                                                 GimpInterpolationType  interpolation,
+                                                 gdouble                xresolution,
+                                                 gdouble                yresolution,
+                                                 GimpUnit               resolution_unit,
+                                                 gpointer               data);
+
+static GtkWidget * image_scale_confirm_dialog   (ImageScaleDialog      *private);
+static void        image_scale_confirm_large    (ImageScaleDialog      *private,
+                                                 gint64                 new_memsize,
+                                                 gint64                 max_memsize);
+static void        image_scale_confirm_small    (ImageScaleDialog      *private);
+static void        image_scale_confirm_response (GtkWidget             *widget,
+                                                 gint                   response_id,
+                                                 ImageScaleDialog      *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+image_scale_dialog_new (GimpImage             *image,
+                        GimpContext           *context,
+                        GtkWidget             *parent,
+                        GimpUnit               unit,
+                        GimpInterpolationType  interpolation,
+                        GimpScaleCallback      callback,
+                        gpointer               user_data)
+{
+  ImageScaleDialog *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (ImageScaleDialog);
+
+  private->image     = image;
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  private->dialog = scale_dialog_new (GIMP_VIEWABLE (image), context,
+                                      C_("dialog-title", "Scale Image"),
+                                      "gimp-image-scale",
+                                      parent,
+                                      gimp_standard_help_func,
+                                      GIMP_HELP_IMAGE_SCALE,
+                                      unit,
+                                      interpolation,
+                                      image_scale_callback,
+                                      private);
+
+  g_object_weak_ref (G_OBJECT (private->dialog),
+                     (GWeakNotify) image_scale_dialog_free, private);
+
+  return private->dialog;
+}
+
+
+/*  private functions  */
+
+static void
+image_scale_dialog_free (ImageScaleDialog *private)
+{
+  g_slice_free (ImageScaleDialog, private);
+}
+
+static void
+image_scale_callback (GtkWidget             *widget,
+                      GimpViewable          *viewable,
+                      gint                   width,
+                      gint                   height,
+                      GimpUnit               unit,
+                      GimpInterpolationType  interpolation,
+                      gdouble                xresolution,
+                      gdouble                yresolution,
+                      GimpUnit               resolution_unit,
+                      gpointer               data)
+{
+  ImageScaleDialog        *private = data;
+  GimpImage               *image   = GIMP_IMAGE (viewable);
+  GimpImageScaleCheckType  scale_check;
+  gint64                   max_memsize;
+  gint64                   new_memsize;
+
+  private->width           = width;
+  private->height          = height;
+  private->unit            = unit;
+  private->interpolation   = interpolation;
+  private->xresolution     = xresolution;
+  private->yresolution     = yresolution;
+  private->resolution_unit = resolution_unit;
+
+  gtk_widget_set_sensitive (widget, FALSE);
+
+  max_memsize = GIMP_GUI_CONFIG (image->gimp->config)->max_new_image_size;
+
+  scale_check = gimp_image_scale_check (image,
+                                        width, height, max_memsize,
+                                        &new_memsize);
+  switch (scale_check)
+    {
+    case GIMP_IMAGE_SCALE_TOO_BIG:
+      image_scale_confirm_large (private, new_memsize, max_memsize);
+      break;
+
+    case GIMP_IMAGE_SCALE_TOO_SMALL:
+      image_scale_confirm_small (private);
+      break;
+
+    case GIMP_IMAGE_SCALE_OK:
+      private->callback (private->dialog,
+                         GIMP_VIEWABLE (private->image),
+                         private->width,
+                         private->height,
+                         private->unit,
+                         private->interpolation,
+                         private->xresolution,
+                         private->yresolution,
+                         private->resolution_unit,
+                         private->user_data);
+      break;
+    }
+}
+
+static GtkWidget *
+image_scale_confirm_dialog (ImageScaleDialog *private)
+{
+  GtkWidget *widget;
+
+  widget = gimp_message_dialog_new (_("Confirm Scaling"),
+                                    GIMP_ICON_DIALOG_WARNING,
+                                    private->dialog,
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func,
+                                    GIMP_HELP_IMAGE_SCALE_WARNING,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("_Scale"),  GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (widget),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (widget, "response",
+                    G_CALLBACK (image_scale_confirm_response),
+                    private);
+
+  return widget;
+}
+
+static void
+image_scale_confirm_large (ImageScaleDialog *private,
+                           gint64            new_memsize,
+                           gint64            max_memsize)
+{
+  GtkWidget *widget = image_scale_confirm_dialog (private);
+  gchar     *size;
+
+  size = g_format_size (new_memsize);
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (widget)->box,
+                                     _("You are trying to create an image "
+                                       "with a size of %s."), size);
+  g_free (size);
+
+  size = g_format_size (max_memsize);
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (widget)->box,
+                             _("Scaling the image to the chosen size will "
+                               "make it use more memory than what is "
+                               "configured as \"Maximum Image Size\" in the "
+                               "Preferences dialog (currently %s)."), size);
+  g_free (size);
+
+  gtk_widget_show (widget);
+}
+
+static void
+image_scale_confirm_small (ImageScaleDialog *private)
+{
+  GtkWidget *widget = image_scale_confirm_dialog (private);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (widget)->box,
+                                     _("Scaling the image to the chosen size "
+                                       "will shrink some layers completely "
+                                       "away."));
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (widget)->box,
+                             _("Is this what you want to do?"));
+
+  gtk_widget_show (widget);
+}
+
+static void
+image_scale_confirm_response (GtkWidget        *widget,
+                              gint              response_id,
+                              ImageScaleDialog *private)
+{
+  gtk_widget_destroy (widget);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      private->callback (private->dialog,
+                         GIMP_VIEWABLE (private->image),
+                         private->width,
+                         private->height,
+                         private->unit,
+                         private->interpolation,
+                         private->xresolution,
+                         private->yresolution,
+                         private->resolution_unit,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (private->dialog, TRUE);
+    }
+}
diff --git a/app/dialogs/image-scale-dialog.h b/app/dialogs/image-scale-dialog.h
new file mode 100644
index 0000000..fe3d257
--- /dev/null
+++ b/app/dialogs/image-scale-dialog.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_SCALE_DIALOG_H__
+#define __IMAGE_SCALE_DIALOG_H__
+
+
+GtkWidget * image_scale_dialog_new (GimpImage             *image,
+                                    GimpContext           *context,
+                                    GtkWidget             *parent,
+                                    GimpUnit               unit,
+                                    GimpInterpolationType  interpolation,
+                                    GimpScaleCallback      callback,
+                                    gpointer               user_data);
+
+
+#endif /* __IMAGE_SCALE_DIALOG_H__ */
diff --git a/app/dialogs/input-devices-dialog.c b/app/dialogs/input-devices-dialog.c
new file mode 100644
index 0000000..ace9431
--- /dev/null
+++ b/app/dialogs/input-devices-dialog.c
@@ -0,0 +1,102 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpdeviceeditor.h"
+#include "widgets/gimpdevices.h"
+#include "widgets/gimphelp-ids.h"
+
+#include "input-devices-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_SAVE 1
+
+
+/*  local function prototypes  */
+
+static void   input_devices_dialog_response (GtkWidget *dialog,
+                                             guint      response_id,
+                                             Gimp      *gimp);
+
+
+/*  public functions  */
+
+GtkWidget *
+input_devices_dialog_new (Gimp *gimp)
+{
+  GtkWidget *dialog;
+  GtkWidget *content_area;
+  GtkWidget *editor;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  dialog = gimp_dialog_new (_("Configure Input Devices"),
+                            "gimp-input-devices-dialog",
+                            NULL, 0,
+                            gimp_standard_help_func,
+                            GIMP_HELP_INPUT_DEVICES,
+
+                            _("_Save"),  RESPONSE_SAVE,
+                            _("_Close"), GTK_RESPONSE_CLOSE,
+
+                            NULL);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (input_devices_dialog_response),
+                    gimp);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  editor = gimp_device_editor_new (gimp);
+  gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
+  gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+input_devices_dialog_response (GtkWidget *dialog,
+                               guint      response_id,
+                               Gimp      *gimp)
+{
+  switch (response_id)
+    {
+    case RESPONSE_SAVE:
+      gimp_devices_save (gimp, TRUE);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
diff --git a/app/dialogs/input-devices-dialog.h b/app/dialogs/input-devices-dialog.h
new file mode 100644
index 0000000..54d50d2
--- /dev/null
+++ b/app/dialogs/input-devices-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __INPUT_DEVICES_DIALOG_H__
+#define __INPUT_DEVICES_DIALOG_H__
+
+
+GtkWidget * input_devices_dialog_new (Gimp *gimp);
+
+
+#endif /* __INPUT_DEVICES_DIALOG_H__ */
diff --git a/app/dialogs/item-options-dialog.c b/app/dialogs/item-options-dialog.c
new file mode 100644
index 0000000..84493d9
--- /dev/null
+++ b/app/dialogs/item-options-dialog.c
@@ -0,0 +1,491 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "item-options-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _ItemOptionsDialog ItemOptionsDialog;
+
+struct _ItemOptionsDialog
+{
+  GimpImage               *image;
+  GimpItem                *item;
+  GimpContext             *context;
+  gboolean                 visible;
+  gboolean                 linked;
+  GimpColorTag             color_tag;
+  gboolean                 lock_content;
+  gboolean                 lock_position;
+  GimpItemOptionsCallback  callback;
+  gpointer                 user_data;
+
+  GtkWidget               *left_vbox;
+  GtkWidget               *left_table;
+  gint                     table_row;
+  GtkWidget               *name_entry;
+  GtkWidget               *right_frame;
+  GtkWidget               *right_vbox;
+  GtkWidget               *lock_position_toggle;
+};
+
+
+/*  local function prototypes  */
+
+static void        item_options_dialog_free     (ItemOptionsDialog *private);
+static void        item_options_dialog_response (GtkWidget         *dialog,
+                                                 gint               response_id,
+                                                 ItemOptionsDialog *private);
+static GtkWidget * check_button_with_icon_new    (const gchar      *label,
+                                                  const gchar      *icon_name,
+                                                  GtkBox           *vbox);
+
+
+/*  public functions  */
+
+GtkWidget *
+item_options_dialog_new (GimpImage               *image,
+                         GimpItem                *item,
+                         GimpContext             *context,
+                         GtkWidget               *parent,
+                         const gchar             *title,
+                         const gchar             *role,
+                         const gchar             *icon_name,
+                         const gchar             *desc,
+                         const gchar             *help_id,
+                         const gchar             *name_label,
+                         const gchar             *lock_content_icon_name,
+                         const gchar             *lock_content_label,
+                         const gchar             *lock_position_label,
+                         const gchar             *item_name,
+                         gboolean                 item_visible,
+                         gboolean                 item_linked,
+                         GimpColorTag             item_color_tag,
+                         gboolean                 item_lock_content,
+                         gboolean                 item_lock_position,
+                         GimpItemOptionsCallback  callback,
+                         gpointer                 user_data)
+{
+  ItemOptionsDialog *private;
+  GtkWidget         *dialog;
+  GimpViewable      *viewable;
+  GtkWidget         *main_hbox;
+  GtkWidget         *table;
+  GtkWidget         *button;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (item == NULL || GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (role != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (desc != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (ItemOptionsDialog);
+
+  private->image         = image;
+  private->item          = item;
+  private->context       = context;
+  private->visible       = item_visible;
+  private->linked        = item_linked;
+  private->color_tag     = item_color_tag;
+  private->lock_content  = item_lock_content;
+  private->lock_position = item_lock_position;
+  private->callback      = callback;
+  private->user_data     = user_data;
+
+  if (item)
+    viewable = GIMP_VIEWABLE (item);
+  else
+    viewable = GIMP_VIEWABLE (image);
+
+  dialog = gimp_viewable_dialog_new (viewable, context,
+                                     title, role, icon_name, desc,
+                                     parent,
+                                     gimp_standard_help_func, help_id,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_OK"),     GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (item_options_dialog_response),
+                    private);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) item_options_dialog_free, private);
+
+  g_object_set_data (G_OBJECT (dialog), "item-options-dialog-private", private);
+
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_hbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_hbox);
+
+  private->left_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_box_pack_start (GTK_BOX (main_hbox), private->left_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (private->left_vbox);
+
+  private->left_table = table = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_box_pack_start (GTK_BOX (private->left_vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  /*  The name label and entry  */
+  if (name_label)
+    {
+      GtkWidget *hbox;
+      GtkWidget *radio;
+      GtkWidget *radio_box;
+      GList     *children;
+      GList     *list;
+
+      private->name_entry = gtk_entry_new ();
+      gtk_entry_set_activates_default (GTK_ENTRY (private->name_entry), TRUE);
+      gtk_entry_set_text (GTK_ENTRY (private->name_entry), item_name);
+      gimp_table_attach_aligned (GTK_TABLE (table), 0, private->table_row++,
+                                 name_label, 0.0, 0.5,
+                                 private->name_entry, 1, FALSE);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gimp_table_attach_aligned (GTK_TABLE (table), 0, private->table_row++,
+                                 _("Color tag:"), 0.0, 0.5,
+                                 hbox, 1, TRUE);
+
+      radio_box = gimp_enum_radio_box_new (GIMP_TYPE_COLOR_TAG,
+                                           G_CALLBACK (gimp_radio_button_update),
+                                           &private->color_tag,
+                                           &radio);
+      gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (radio),
+                                       private->color_tag);
+
+      children = gtk_container_get_children (GTK_CONTAINER (radio_box));
+
+      for (list = children;
+           list;
+           list = g_list_next (list))
+        {
+          GimpColorTag  color_tag;
+          GimpRGB       color;
+          GtkWidget    *image;
+
+          radio = list->data;
+
+          g_object_ref (radio);
+          gtk_container_remove (GTK_CONTAINER (radio_box), radio);
+          g_object_set (radio, "draw-indicator", FALSE, NULL);
+          gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0);
+          g_object_unref (radio);
+
+          gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (radio)));
+
+          color_tag = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (radio),
+                                                          "gimp-item-data"));
+
+          if (gimp_get_color_tag_color (color_tag, &color, FALSE))
+            {
+              GtkSettings *settings = gtk_widget_get_settings (dialog);
+              gint         w, h;
+
+              image = gimp_color_area_new (&color, GIMP_COLOR_AREA_FLAT, 0);
+              gimp_color_area_set_color_config (GIMP_COLOR_AREA (image),
+                                                context->gimp->config->color_management);
+              gtk_icon_size_lookup_for_settings (settings,
+                                                 GTK_ICON_SIZE_MENU, &w, &h);
+              gtk_widget_set_size_request (image, w, h);
+            }
+          else
+            {
+              image = gtk_image_new_from_icon_name (GIMP_ICON_CLOSE,
+                                                    GTK_ICON_SIZE_MENU);
+            }
+
+          gtk_container_add (GTK_CONTAINER (radio), image);
+          gtk_widget_show (image);
+        }
+
+      g_list_free (children);
+      gtk_widget_destroy (radio_box);
+    }
+
+  /*  The switches frame & vbox  */
+
+  private->right_frame = gimp_frame_new (_("Switches"));
+  gtk_box_pack_start (GTK_BOX (main_hbox), private->right_frame,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (private->right_frame);
+
+  private->right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (private->right_frame), private->right_vbox);
+  gtk_widget_show (private->right_vbox);
+
+  button = check_button_with_icon_new (_("_Visible"),
+                                       GIMP_ICON_VISIBLE,
+                                       GTK_BOX (private->right_vbox));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->visible);
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->visible);
+
+  button = check_button_with_icon_new (_("_Linked"),
+                                       GIMP_ICON_LINKED,
+                                       GTK_BOX (private->right_vbox));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->linked);
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->linked);
+
+  button = check_button_with_icon_new (lock_content_label,
+                                       lock_content_icon_name,
+                                       GTK_BOX (private->right_vbox));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->lock_content);
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->lock_content);
+
+  button = check_button_with_icon_new (lock_position_label,
+                                       GIMP_ICON_TOOL_MOVE,
+                                       GTK_BOX (private->right_vbox));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->lock_position);
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->lock_position);
+
+  private->lock_position_toggle = button;
+
+  return dialog;
+}
+
+GtkWidget *
+item_options_dialog_get_vbox (GtkWidget *dialog)
+{
+  ItemOptionsDialog *private;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog), NULL);
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_val_if_fail (private != NULL, NULL);
+
+  return private->left_vbox;
+}
+
+GtkWidget *
+item_options_dialog_get_table (GtkWidget *dialog,
+                               gint      *next_row)
+{
+  ItemOptionsDialog *private;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog), NULL);
+  g_return_val_if_fail (next_row != NULL, NULL);
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_val_if_fail (private != NULL, NULL);
+
+  *next_row = private->table_row;
+
+  return private->left_table;
+}
+
+GtkWidget *
+item_options_dialog_get_name_entry (GtkWidget *dialog)
+{
+  ItemOptionsDialog *private;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog), NULL);
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_val_if_fail (private != NULL, NULL);
+
+  return private->name_entry;
+}
+
+GtkWidget *
+item_options_dialog_get_lock_position (GtkWidget *dialog)
+{
+  ItemOptionsDialog *private;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog), NULL);
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_val_if_fail (private != NULL, NULL);
+
+  return private->lock_position_toggle;
+}
+
+void
+item_options_dialog_add_widget (GtkWidget   *dialog,
+                                const gchar *label,
+                                GtkWidget   *widget)
+{
+  ItemOptionsDialog *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_if_fail (private != NULL);
+
+  gimp_table_attach_aligned (GTK_TABLE (private->left_table),
+                             0, private->table_row++,
+                             label, 0.0, 0.5,
+                             widget, 1, FALSE);
+}
+
+GtkWidget *
+item_options_dialog_add_switch (GtkWidget   *dialog,
+                                const gchar *icon_name,
+                                const gchar *label)
+{
+  ItemOptionsDialog *private;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (label != NULL, NULL);
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_val_if_fail (private != NULL, NULL);
+
+  return check_button_with_icon_new (label, icon_name,
+                                     GTK_BOX (private->right_vbox));
+}
+
+void
+item_options_dialog_set_switches_visible (GtkWidget *dialog,
+                                          gboolean   visible)
+{
+  ItemOptionsDialog *private;
+
+  g_return_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog));
+
+  private = g_object_get_data (G_OBJECT (dialog),
+                               "item-options-dialog-private");
+
+  g_return_if_fail (private != NULL);
+
+  gtk_widget_set_visible (private->right_frame, visible);
+}
+
+
+/*  private functions  */
+
+static void
+item_options_dialog_free (ItemOptionsDialog *private)
+{
+  g_slice_free (ItemOptionsDialog, private);
+}
+
+static void
+item_options_dialog_response (GtkWidget         *dialog,
+                              gint               response_id,
+                              ItemOptionsDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      const gchar *name = NULL;
+
+      if (private->name_entry)
+        name = gtk_entry_get_text (GTK_ENTRY (private->name_entry));
+
+      private->callback (dialog,
+                         private->image,
+                         private->item,
+                         private->context,
+                         name,
+                         private->visible,
+                         private->linked,
+                         private->color_tag,
+                         private->lock_content,
+                         private->lock_position,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
+
+static GtkWidget *
+check_button_with_icon_new (const gchar *label,
+                            const gchar *icon_name,
+                            GtkBox      *vbox)
+{
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkWidget *image;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (vbox, hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (label);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  return button;
+}
diff --git a/app/dialogs/item-options-dialog.h b/app/dialogs/item-options-dialog.h
new file mode 100644
index 0000000..f7aa75f
--- /dev/null
+++ b/app/dialogs/item-options-dialog.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ITEM_OPTIONS_DIALOG_H__
+#define __ITEM_OPTIONS_DIALOG_H__
+
+
+typedef void (* GimpItemOptionsCallback) (GtkWidget    *dialog,
+                                          GimpImage    *image,
+                                          GimpItem     *item,
+                                          GimpContext  *context,
+                                          const gchar  *item_name,
+                                          gboolean      item_visible,
+                                          gboolean      item_linked,
+                                          GimpColorTag  item_color_tag,
+                                          gboolean      item_lock_content,
+                                          gboolean      item_lock_position,
+                                          gpointer      user_data);
+
+
+GtkWidget * item_options_dialog_new (GimpImage               *image,
+                                     GimpItem                *item,
+                                     GimpContext             *context,
+                                     GtkWidget               *parent,
+                                     const gchar             *title,
+                                     const gchar             *role,
+                                     const gchar             *icon_name,
+                                     const gchar             *desc,
+                                     const gchar             *help_id,
+                                     const gchar             *name_label,
+                                     const gchar             *lock_content_icon_name,
+                                     const gchar             *lock_content_label,
+                                     const gchar             *lock_position_label,
+                                     const gchar             *item_name,
+                                     gboolean                 item_visible,
+                                     gboolean                 item_linked,
+                                     GimpColorTag             item_color_tag,
+                                     gboolean                 item_lock_content,
+                                     gboolean                 item_lock_position,
+                                     GimpItemOptionsCallback  callback,
+                                     gpointer                 user_data);
+
+GtkWidget * item_options_dialog_get_vbox             (GtkWidget   *dialog);
+GtkWidget * item_options_dialog_get_table            (GtkWidget   *dialog,
+                                                      gint        *next_row);
+GtkWidget * item_options_dialog_get_name_entry       (GtkWidget   *dialog);
+GtkWidget * item_options_dialog_get_lock_position    (GtkWidget   *dialog);
+
+void        item_options_dialog_add_widget           (GtkWidget   *dialog,
+                                                      const gchar *label,
+                                                      GtkWidget   *widget);
+GtkWidget * item_options_dialog_add_switch           (GtkWidget   *dialog,
+                                                      const gchar *icon_name,
+                                                      const gchar *label);
+
+void        item_options_dialog_set_switches_visible (GtkWidget   *dialog,
+                                                      gboolean     visible);
+
+
+#endif /* __ITEM_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/keyboard-shortcuts-dialog.c b/app/dialogs/keyboard-shortcuts-dialog.c
new file mode 100644
index 0000000..9fd354b
--- /dev/null
+++ b/app/dialogs/keyboard-shortcuts-dialog.c
@@ -0,0 +1,122 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpactioneditor.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+
+#include "menus/menus.h"
+
+#include "keyboard-shortcuts-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_SAVE 1
+
+
+/*  local function prototypes  */
+
+static void   keyboard_shortcuts_dialog_response (GtkWidget *dialog,
+                                                  gint       response,
+                                                  Gimp      *gimp);
+
+
+/*  public functions  */
+
+GtkWidget *
+keyboard_shortcuts_dialog_new (Gimp *gimp)
+{
+  GtkWidget *dialog;
+  GtkWidget *vbox;
+  GtkWidget *editor;
+  GtkWidget *box;
+  GtkWidget *button;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  dialog = gimp_dialog_new (_("Configure Keyboard Shortcuts"),
+                            "gimp-keyboard-shortcuts-dialog",
+                            NULL, 0,
+                            gimp_standard_help_func,
+                            GIMP_HELP_KEYBOARD_SHORTCUTS,
+
+                            _("_Save"),  RESPONSE_SAVE,
+                            _("_Close"), GTK_RESPONSE_CLOSE,
+
+                            NULL);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (keyboard_shortcuts_dialog_response),
+                    gimp);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  editor = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data,
+                                   NULL, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+  box = gimp_hint_box_new (_("To edit a shortcut key, click on the "
+                             "corresponding row and type a new "
+                             "accelerator, or press backspace to "
+                             "clear."));
+  gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  button = gimp_prop_check_button_new (G_OBJECT (gimp->config), "save-accels",
+                                       _("S_ave keyboard shortcuts on exit"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+keyboard_shortcuts_dialog_response (GtkWidget *dialog,
+                                    gint       response,
+                                    Gimp      *gimp)
+{
+  switch (response)
+    {
+    case RESPONSE_SAVE:
+      menus_save (gimp, TRUE);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
diff --git a/app/dialogs/keyboard-shortcuts-dialog.h b/app/dialogs/keyboard-shortcuts-dialog.h
new file mode 100644
index 0000000..3c79912
--- /dev/null
+++ b/app/dialogs/keyboard-shortcuts-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __KEYBOARD_SHORTCUTS_DIALOG_H__
+#define __KEYBOARD_SHORTCUTS_DIALOG_H__
+
+
+GtkWidget * keyboard_shortcuts_dialog_new (Gimp *gimp);
+
+
+#endif /* __KEYBOARD_SHORTCUTS_DIALOG_H__ */
diff --git a/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c
new file mode 100644
index 0000000..475d8ab
--- /dev/null
+++ b/app/dialogs/layer-add-mask-dialog.c
@@ -0,0 +1,229 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+
+#include "widgets/gimpcontainercombobox.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "layer-add-mask-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _LayerAddMaskDialog LayerAddMaskDialog;
+
+struct _LayerAddMaskDialog
+{
+  GimpLayer           *layer;
+  GimpAddMaskType      add_mask_type;
+  GimpChannel         *channel;
+  gboolean             invert;
+  GimpAddMaskCallback  callback;
+  gpointer             user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void       layer_add_mask_dialog_free             (LayerAddMaskDialog *private);
+static void       layer_add_mask_dialog_response         (GtkWidget          *dialog,
+                                                          gint                response_id,
+                                                          LayerAddMaskDialog *private);
+static gboolean   layer_add_mask_dialog_channel_selected (GimpContainerView  *view,
+                                                          GimpViewable       *viewable,
+                                                          gpointer            insert_data,
+                                                          LayerAddMaskDialog *dialog);
+
+
+/*  public functions  */
+
+GtkWidget *
+layer_add_mask_dialog_new (GimpLayer           *layer,
+                           GimpContext         *context,
+                           GtkWidget           *parent,
+                           GimpAddMaskType      add_mask_type,
+                           gboolean             invert,
+                           GimpAddMaskCallback  callback,
+                           gpointer             user_data)
+{
+  LayerAddMaskDialog *private;
+  GtkWidget          *dialog;
+  GtkWidget          *vbox;
+  GtkWidget          *frame;
+  GtkWidget          *combo;
+  GtkWidget          *button;
+  GimpImage          *image;
+  GimpChannel        *channel;
+
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  private = g_slice_new0 (LayerAddMaskDialog);
+
+  private->layer         = layer;
+  private->add_mask_type = add_mask_type;
+  private->invert        = invert;
+  private->callback      = callback;
+  private->user_data     = user_data;
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (layer), context,
+                                     _("Add Layer Mask"), "gimp-layer-add-mask",
+                                     GIMP_ICON_LAYER_MASK,
+                                     _("Add a Mask to the Layer"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     GIMP_HELP_LAYER_MASK_ADD,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Add"),    GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) layer_add_mask_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (layer_add_mask_dialog_response),
+                    private);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  frame =
+    gimp_enum_radio_frame_new (GIMP_TYPE_ADD_MASK_TYPE,
+                               gtk_label_new (_("Initialize Layer Mask to:")),
+                               G_CALLBACK (gimp_radio_button_update),
+                               &private->add_mask_type,
+                               &button);
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (button),
+                                   private->add_mask_type);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  combo = gimp_container_combo_box_new (gimp_image_get_channels (image),
+                                        context,
+                                        GIMP_VIEW_SIZE_SMALL, 1);
+  gimp_enum_radio_frame_add (GTK_FRAME (frame), combo,
+                             GIMP_ADD_MASK_CHANNEL, TRUE);
+  gtk_widget_show (combo);
+
+  g_signal_connect (combo, "select-item",
+                    G_CALLBACK (layer_add_mask_dialog_channel_selected),
+                    private);
+
+  channel = gimp_image_get_active_channel (image);
+
+  if (! channel)
+    channel = GIMP_CHANNEL (gimp_container_get_first_child (gimp_image_get_channels (image)));
+
+  gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo),
+                                   GIMP_VIEWABLE (channel));
+
+  button = gtk_check_button_new_with_mnemonic (_("In_vert mask"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), private->invert);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->invert);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+layer_add_mask_dialog_free (LayerAddMaskDialog *private)
+{
+  g_slice_free (LayerAddMaskDialog, private);
+}
+
+static void
+layer_add_mask_dialog_response (GtkWidget          *dialog,
+                                gint                response_id,
+                                LayerAddMaskDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (private->layer));
+
+      if (private->add_mask_type == GIMP_ADD_MASK_CHANNEL &&
+          ! private->channel)
+        {
+          gimp_message_literal (image->gimp,
+                                G_OBJECT (dialog), GIMP_MESSAGE_WARNING,
+                                _("Please select a channel first"));
+          return;
+        }
+
+      private->callback (dialog,
+                         private->layer,
+                         private->add_mask_type,
+                         private->channel,
+                         private->invert,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
+
+static gboolean
+layer_add_mask_dialog_channel_selected (GimpContainerView  *view,
+                                        GimpViewable       *viewable,
+                                        gpointer            insert_data,
+                                        LayerAddMaskDialog *private)
+{
+  private->channel = GIMP_CHANNEL (viewable);
+
+  return TRUE;
+}
diff --git a/app/dialogs/layer-add-mask-dialog.h b/app/dialogs/layer-add-mask-dialog.h
new file mode 100644
index 0000000..ecdd9d3
--- /dev/null
+++ b/app/dialogs/layer-add-mask-dialog.h
@@ -0,0 +1,39 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LAYER_ADD_MASK_DIALOG_H__
+#define __LAYER_ADD_MASK_DIALOG_H__
+
+
+typedef void (* GimpAddMaskCallback) (GtkWidget       *dialog,
+                                      GimpLayer       *layer,
+                                      GimpAddMaskType  add_mask_type,
+                                      GimpChannel     *channel,
+                                      gboolean         invert,
+                                      gpointer         user_data);
+
+
+GtkWidget * layer_add_mask_dialog_new (GimpLayer           *layer,
+                                       GimpContext         *context,
+                                       GtkWidget           *parent,
+                                       GimpAddMaskType      add_mask_type,
+                                       gboolean             invert,
+                                       GimpAddMaskCallback  callback,
+                                       gpointer             user_data);
+
+
+#endif /* __LAYER_ADD_MASK_DIALOG_H__ */
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
new file mode 100644
index 0000000..f392ed1
--- /dev/null
+++ b/app/dialogs/layer-options-dialog.c
@@ -0,0 +1,592 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable-filters.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+
+#include "text/gimptext.h"
+#include "text/gimptextlayer.h"
+
+#include "widgets/gimpcontainertreeview.h"
+#include "widgets/gimplayermodebox.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "item-options-dialog.h"
+#include "layer-options-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _LayerOptionsDialog LayerOptionsDialog;
+
+struct _LayerOptionsDialog
+{
+  GimpLayer                *layer;
+  GimpLayerMode             mode;
+  GimpLayerColorSpace       blend_space;
+  GimpLayerColorSpace       composite_space;
+  GimpLayerCompositeMode    composite_mode;
+  gdouble                   opacity;
+  GimpFillType              fill_type;
+  gboolean                  lock_alpha;
+  gboolean                  rename_text_layers;
+  GimpLayerOptionsCallback  callback;
+  gpointer                  user_data;
+
+  GtkWidget                *mode_box;
+  GtkWidget                *blend_space_combo;
+  GtkWidget                *composite_space_combo;
+  GtkWidget                *composite_mode_combo;
+  GtkWidget                *size_se;
+  GtkWidget                *offset_se;
+};
+
+
+/*  local function prototypes  */
+
+static void   layer_options_dialog_free           (LayerOptionsDialog *private);
+static void   layer_options_dialog_callback       (GtkWidget          *dialog,
+                                                   GimpImage          *image,
+                                                   GimpItem           *item,
+                                                   GimpContext        *context,
+                                                   const gchar        *item_name,
+                                                   gboolean            item_visible,
+                                                   gboolean            item_linked,
+                                                   GimpColorTag        item_color_tag,
+                                                   gboolean            item_lock_content,
+                                                   gboolean            item_lock_position,
+                                                   gpointer            user_data);
+static void
+     layer_options_dialog_update_mode_sensitivity (LayerOptionsDialog *private);
+static void   layer_options_dialog_mode_notify    (GtkWidget          *widget,
+                                                   const GParamSpec   *pspec,
+                                                   LayerOptionsDialog *private);
+static void   layer_options_dialog_rename_toggled (GtkWidget          *widget,
+                                                   LayerOptionsDialog *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+layer_options_dialog_new (GimpImage                *image,
+                          GimpLayer                *layer,
+                          GimpContext              *context,
+                          GtkWidget                *parent,
+                          const gchar              *title,
+                          const gchar              *role,
+                          const gchar              *icon_name,
+                          const gchar              *desc,
+                          const gchar              *help_id,
+                          const gchar              *layer_name,
+                          GimpLayerMode             layer_mode,
+                          GimpLayerColorSpace       layer_blend_space,
+                          GimpLayerColorSpace       layer_composite_space,
+                          GimpLayerCompositeMode    layer_composite_mode,
+                          gdouble                   layer_opacity,
+                          GimpFillType              layer_fill_type,
+                          gboolean                  layer_visible,
+                          gboolean                  layer_linked,
+                          GimpColorTag              layer_color_tag,
+                          gboolean                  layer_lock_content,
+                          gboolean                  layer_lock_position,
+                          gboolean                  layer_lock_alpha,
+                          GimpLayerOptionsCallback  callback,
+                          gpointer                  user_data)
+{
+  LayerOptionsDialog   *private;
+  GtkWidget            *dialog;
+  GtkWidget            *table;
+  GtkListStore         *space_model;
+  GtkWidget            *combo;
+  GtkWidget            *scale;
+  GtkWidget            *label;
+  GtkAdjustment        *adjustment;
+  GtkWidget            *spinbutton;
+  GtkWidget            *button;
+  GimpLayerModeContext  mode_context;
+  gdouble               xres;
+  gdouble               yres;
+  gint                  row = 0;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (layer == NULL || GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+
+  private = g_slice_new0 (LayerOptionsDialog);
+
+  private->layer              = layer;
+  private->mode               = layer_mode;
+  private->blend_space        = layer_blend_space;
+  private->composite_space    = layer_composite_space;
+  private->composite_mode     = layer_composite_mode;
+  private->opacity            = layer_opacity * 100.0;
+  private->fill_type          = layer_fill_type;
+  private->lock_alpha         = layer_lock_alpha;
+  private->rename_text_layers = FALSE;
+  private->callback           = callback;
+  private->user_data          = user_data;
+
+  if (layer && gimp_item_is_text_layer (GIMP_ITEM (layer)))
+    private->rename_text_layers = GIMP_TEXT_LAYER (layer)->auto_rename;
+
+  dialog = item_options_dialog_new (image, GIMP_ITEM (layer), context,
+                                    parent, title, role,
+                                    icon_name, desc, help_id,
+                                    _("Layer _name:"),
+                                    GIMP_ICON_TOOL_PAINTBRUSH,
+                                    _("Lock _pixels"),
+                                    _("Lock position and _size"),
+                                    layer_name,
+                                    layer_visible,
+                                    layer_linked,
+                                    layer_color_tag,
+                                    layer_lock_content,
+                                    layer_lock_position,
+                                    layer_options_dialog_callback,
+                                    private);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) layer_options_dialog_free, private);
+
+  if (! layer || gimp_viewable_get_children (GIMP_VIEWABLE (layer)) == NULL)
+    mode_context = GIMP_LAYER_MODE_CONTEXT_LAYER;
+  else
+    mode_context = GIMP_LAYER_MODE_CONTEXT_GROUP;
+
+  private->mode_box = gimp_layer_mode_box_new (mode_context);
+  item_options_dialog_add_widget (dialog, _("_Mode:"), private->mode_box);
+  gimp_layer_mode_box_set_mode (GIMP_LAYER_MODE_BOX (private->mode_box),
+                                private->mode);
+
+  g_signal_connect (private->mode_box, "notify::layer-mode",
+                    G_CALLBACK (layer_options_dialog_mode_notify),
+                    private);
+
+  space_model =
+    gimp_enum_store_new_with_range (GIMP_TYPE_LAYER_COLOR_SPACE,
+                                    GIMP_LAYER_COLOR_SPACE_AUTO,
+                                    GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL);
+
+  private->blend_space_combo = combo =
+    gimp_enum_combo_box_new_with_model (GIMP_ENUM_STORE (space_model));
+  item_options_dialog_add_widget (dialog, _("_Blend space:"), combo);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                       "gimp-layer-color-space");
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                              private->blend_space,
+                              G_CALLBACK (gimp_int_combo_box_get_active),
+                              &private->blend_space);
+
+  private->composite_space_combo = combo =
+    gimp_enum_combo_box_new_with_model (GIMP_ENUM_STORE (space_model));
+  item_options_dialog_add_widget (dialog, _("Compos_ite space:"), combo);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                       "gimp-layer-color-space");
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                              private->composite_space,
+                              G_CALLBACK (gimp_int_combo_box_get_active),
+                              &private->composite_space);
+
+  g_object_unref (space_model);
+
+  private->composite_mode_combo = combo =
+    gimp_enum_combo_box_new (GIMP_TYPE_LAYER_COMPOSITE_MODE);
+  item_options_dialog_add_widget (dialog, _("Composite mo_de:"), combo);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                       "gimp-layer-composite");
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                              private->composite_mode,
+                              G_CALLBACK (gimp_int_combo_box_get_active),
+                              &private->composite_mode);
+
+  /*  set the sensitivity of above 3 menus  */
+  layer_options_dialog_update_mode_sensitivity (private);
+
+  adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (private->opacity, 0.0, 100.0,
+                                                   1.0, 10.0, 0.0));
+  scale = gimp_spin_scale_new (adjustment, NULL, 1);
+  item_options_dialog_add_widget (dialog, _("_Opacity:"), scale);
+
+  g_signal_connect (adjustment, "value-changed",
+                    G_CALLBACK (gimp_double_adjustment_update),
+                    &private->opacity);
+
+  table = item_options_dialog_get_table (dialog, &row);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  if (! layer)
+    {
+      /*  The size labels  */
+      label = gtk_label_new (_("Width:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                        GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+      gtk_widget_show (label);
+
+      label = gtk_label_new (_("Height:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2,
+                        GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+      gtk_widget_show (label);
+
+      /*  The size sizeentry  */
+      adjustment = (GtkAdjustment *)
+        gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+      spinbutton = gimp_spin_button_new (adjustment, 1.0, 2);
+      gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+      gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10);
+
+      private->size_se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
+                                              TRUE, TRUE, FALSE, 10,
+                                              GIMP_SIZE_ENTRY_UPDATE_SIZE);
+      gtk_table_set_col_spacing (GTK_TABLE (private->size_se), 1, 4);
+      gtk_table_set_row_spacing (GTK_TABLE (private->size_se), 0, 2);
+
+      gimp_size_entry_add_field (GIMP_SIZE_ENTRY (private->size_se),
+                                 GTK_SPIN_BUTTON (spinbutton), NULL);
+      gtk_table_attach_defaults (GTK_TABLE (private->size_se), spinbutton,
+                                 1, 2, 0, 1);
+      gtk_widget_show (spinbutton);
+
+      gtk_table_attach (GTK_TABLE (table), private->size_se, 1, 2, row, row + 2,
+                        GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+      gtk_widget_show (private->size_se);
+
+      gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (private->size_se),
+                                GIMP_UNIT_PIXEL);
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                      xres, FALSE);
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                      yres, FALSE);
+
+      gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                             GIMP_MIN_IMAGE_SIZE,
+                                             GIMP_MAX_IMAGE_SIZE);
+      gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                             GIMP_MIN_IMAGE_SIZE,
+                                             GIMP_MAX_IMAGE_SIZE);
+
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                0, gimp_image_get_width  (image));
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                0, gimp_image_get_height (image));
+
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                  gimp_image_get_width  (image));
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                  gimp_image_get_height (image));
+
+      row += 2;
+    }
+
+  /*  The offset labels  */
+  label = gtk_label_new (_("Offset X:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("Offset Y:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /*  The offset sizeentry  */
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (0, 1, 1, 1, 10, 0);
+  spinbutton = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10);
+
+  private->offset_se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
+                                            TRUE, TRUE, FALSE, 10,
+                                            GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_col_spacing (GTK_TABLE (private->offset_se), 1, 4);
+  gtk_table_set_row_spacing (GTK_TABLE (private->offset_se), 0, 2);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (private->offset_se),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (private->offset_se), spinbutton,
+                             1, 2, 0, 1);
+  gtk_widget_show (spinbutton);
+
+  gtk_table_attach (GTK_TABLE (table), private->offset_se, 1, 2, row, row + 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (private->offset_se);
+
+  gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (private->offset_se),
+                            GIMP_UNIT_PIXEL);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->offset_se), 0,
+                                  xres, FALSE);
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->offset_se), 1,
+                                  yres, FALSE);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (private->offset_se), 0,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (private->offset_se), 1,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (private->offset_se), 0,
+                            0, gimp_image_get_width  (image));
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (private->offset_se), 1,
+                            0, gimp_image_get_height (image));
+
+  if (layer)
+    {
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 0,
+                                  gimp_item_get_offset_x (GIMP_ITEM (layer)));
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 1,
+                                  gimp_item_get_offset_y (GIMP_ITEM (layer)));
+    }
+  else
+    {
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 0, 0);
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 1, 0);
+    }
+
+  row += 2;
+
+  /*  set the spacings after adding widgets or GtkTable will warn  */
+  gtk_table_set_row_spacing (GTK_TABLE (table), 3, 4);
+  if (! layer)
+    gtk_table_set_row_spacing (GTK_TABLE (table), 5, 4);
+
+  if (! layer)
+    {
+      /*  The fill type  */
+      combo = gimp_enum_combo_box_new (GIMP_TYPE_FILL_TYPE);
+      gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                                 _("_Fill with:"), 0.0, 0.5,
+                                 combo, 1, FALSE);
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  private->fill_type,
+                                  G_CALLBACK (gimp_int_combo_box_get_active),
+                                  &private->fill_type);
+    }
+
+  if (layer)
+    {
+      GtkWidget     *left_vbox = item_options_dialog_get_vbox (dialog);
+      GtkWidget     *frame;
+      GimpContainer *filters;
+      GtkWidget     *view;
+
+      frame = gimp_frame_new (_("Active Filters"));
+      gtk_box_pack_start (GTK_BOX (left_vbox), frame, TRUE, TRUE, 0);
+      gtk_widget_show (frame);
+
+      filters = gimp_drawable_get_filters (GIMP_DRAWABLE (layer));
+
+      view = gimp_container_tree_view_new (filters, context,
+                                           GIMP_VIEW_SIZE_SMALL, 0);
+      gtk_container_add (GTK_CONTAINER (frame), view);
+      gtk_widget_show (view);
+    }
+
+  button = item_options_dialog_get_lock_position (dialog);
+
+  if (private->size_se)
+    g_object_bind_property (G_OBJECT (button),           "active",
+                            G_OBJECT (private->size_se), "sensitive",
+                            G_BINDING_SYNC_CREATE |
+                            G_BINDING_INVERT_BOOLEAN);
+
+  g_object_bind_property (G_OBJECT (button),             "active",
+                          G_OBJECT (private->offset_se), "sensitive",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_INVERT_BOOLEAN);
+
+  button = item_options_dialog_add_switch (dialog,
+                                           GIMP_ICON_TRANSPARENCY,
+                                           _("Lock _alpha"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->lock_alpha);
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->lock_alpha);
+
+  /*  For text layers add a toggle to control "auto-rename"  */
+  if (layer && gimp_item_is_text_layer (GIMP_ITEM (layer)))
+    {
+      button = item_options_dialog_add_switch (dialog,
+                                               GIMP_ICON_TOOL_TEXT,
+                                               _("Set name from _text"));
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                    private->rename_text_layers);
+      g_signal_connect (button, "toggled",
+                        G_CALLBACK (gimp_toggle_button_update),
+                        &private->rename_text_layers);
+
+      g_signal_connect (button, "toggled",
+                        G_CALLBACK (layer_options_dialog_rename_toggled),
+                        private);
+    }
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+layer_options_dialog_free (LayerOptionsDialog *private)
+{
+  g_slice_free (LayerOptionsDialog, private);
+}
+
+static void
+layer_options_dialog_callback (GtkWidget    *dialog,
+                               GimpImage    *image,
+                               GimpItem     *item,
+                               GimpContext  *context,
+                               const gchar  *item_name,
+                               gboolean      item_visible,
+                               gboolean      item_linked,
+                               GimpColorTag  item_color_tag,
+                               gboolean      item_lock_content,
+                               gboolean      item_lock_position,
+                               gpointer      user_data)
+{
+  LayerOptionsDialog *private = user_data;
+  gint                width   = 0;
+  gint                height  = 0;
+  gint                offset_x;
+  gint                offset_y;
+
+  if (private->size_se)
+    {
+      width =
+        RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (private->size_se),
+                                          0));
+      height =
+        RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (private->size_se),
+                                          1));
+    }
+
+  offset_x =
+    RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (private->offset_se),
+                                      0));
+  offset_y =
+    RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (private->offset_se),
+                                      1));
+
+  private->callback (dialog,
+                     image,
+                     GIMP_LAYER (item),
+                     context,
+                     item_name,
+                     private->mode,
+                     private->blend_space,
+                     private->composite_space,
+                     private->composite_mode,
+                     private->opacity / 100.0,
+                     private->fill_type,
+                     width,
+                     height,
+                     offset_x,
+                     offset_y,
+                     item_visible,
+                     item_linked,
+                     item_color_tag,
+                     item_lock_content,
+                     item_lock_position,
+                     private->lock_alpha,
+                     private->rename_text_layers,
+                     private->user_data);
+}
+
+static void
+layer_options_dialog_update_mode_sensitivity (LayerOptionsDialog *private)
+{
+  gboolean mutable;
+
+  mutable = gimp_layer_mode_is_blend_space_mutable (private->mode);
+  gtk_widget_set_sensitive (private->blend_space_combo, mutable);
+
+  mutable = gimp_layer_mode_is_composite_space_mutable (private->mode);
+  gtk_widget_set_sensitive (private->composite_space_combo, mutable);
+
+  mutable = gimp_layer_mode_is_composite_mode_mutable (private->mode);
+  gtk_widget_set_sensitive (private->composite_mode_combo, mutable);
+}
+
+static void
+layer_options_dialog_mode_notify (GtkWidget          *widget,
+                                  const GParamSpec   *pspec,
+                                  LayerOptionsDialog *private)
+{
+  private->mode = gimp_layer_mode_box_get_mode (GIMP_LAYER_MODE_BOX (widget));
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->blend_space_combo),
+                                 GIMP_LAYER_COLOR_SPACE_AUTO);
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->composite_space_combo),
+                                 GIMP_LAYER_COLOR_SPACE_AUTO);
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->composite_mode_combo),
+                                 GIMP_LAYER_COMPOSITE_AUTO);
+
+  layer_options_dialog_update_mode_sensitivity (private);
+}
+
+static void
+layer_options_dialog_rename_toggled (GtkWidget          *widget,
+                                     LayerOptionsDialog *private)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) &&
+      gimp_item_is_text_layer (GIMP_ITEM (private->layer)))
+    {
+      GimpTextLayer *text_layer = GIMP_TEXT_LAYER (private->layer);
+      GimpText      *text       = gimp_text_layer_get_text (text_layer);
+
+      if (text && text->text)
+        {
+          GtkWidget *dialog;
+          GtkWidget *name_entry;
+          gchar     *name = gimp_utf8_strtrim (text->text, 30);
+
+          dialog = gtk_widget_get_toplevel (widget);
+
+          name_entry = item_options_dialog_get_name_entry (dialog);
+
+          gtk_entry_set_text (GTK_ENTRY (name_entry), name);
+
+          g_free (name);
+        }
+    }
+}
diff --git a/app/dialogs/layer-options-dialog.h b/app/dialogs/layer-options-dialog.h
new file mode 100644
index 0000000..ceb0502
--- /dev/null
+++ b/app/dialogs/layer-options-dialog.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LAYER_OPTIONS_DIALOG_H__
+#define __LAYER_OPTIONS_DIALOG_H__
+
+
+typedef void (* GimpLayerOptionsCallback) (GtkWidget              *dialog,
+                                           GimpImage              *image,
+                                           GimpLayer              *layer,
+                                           GimpContext            *context,
+                                           const gchar            *layer_name,
+                                           GimpLayerMode           layer_mode,
+                                           GimpLayerColorSpace     layer_blend_space,
+                                           GimpLayerColorSpace     layer_composite_space,
+                                           GimpLayerCompositeMode  layer_composite_mode,
+                                           gdouble                 layer_opacity,
+                                           GimpFillType            layer_fill_type,
+                                           gint                    layer_width,
+                                           gint                    layer_height,
+                                           gint                    layer_offset_x,
+                                           gint                    layer_offset_y,
+                                           gboolean                layer_visible,
+                                           gboolean                layer_linked,
+                                           GimpColorTag            layer_color_tag,
+                                           gboolean                layer_lock_content,
+                                           gboolean                layer_lock_position,
+                                           gboolean                layer_lock_alpha,
+                                           gboolean                rename_text_layer,
+                                           gpointer                user_data);
+
+
+GtkWidget * layer_options_dialog_new (GimpImage                *image,
+                                      GimpLayer                *layer,
+                                      GimpContext              *context,
+                                      GtkWidget                *parent,
+                                      const gchar              *title,
+                                      const gchar              *role,
+                                      const gchar              *icon_name,
+                                      const gchar              *desc,
+                                      const gchar              *help_id,
+                                      const gchar              *layer_name,
+                                      GimpLayerMode             layer_mode,
+                                      GimpLayerColorSpace       layer_blend_space,
+                                      GimpLayerColorSpace       layer_composite_space,
+                                      GimpLayerCompositeMode    layer_composite_mode,
+                                      gdouble                   layer_opacity,
+                                      GimpFillType              layer_fill_type,
+                                      gboolean                  layer_visible,
+                                      gboolean                  layer_linked,
+                                      GimpColorTag              layer_color_tag,
+                                      gboolean                  layer_lock_content,
+                                      gboolean                  layer_lock_position,
+                                      gboolean                  layer_lock_alpha,
+                                      GimpLayerOptionsCallback  callback,
+                                      gpointer                  user_data);
+
+
+#endif /* __LAYER_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/lebl-dialog.c b/app/dialogs/lebl-dialog.c
new file mode 100644
index 0000000..53bd492
--- /dev/null
+++ b/app/dialogs/lebl-dialog.c
@@ -0,0 +1,869 @@
+#include "config.h"
+
+#include <string.h>
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "lebl-dialog.h"
+
+#include "gimp-intl.h"
+
+/* phish code */
+#define PHSHFRAMES 8
+#define PHSHORIGWIDTH 288
+#define PHSHORIGHEIGHT 22
+#define PHSHWIDTH (PHSHORIGWIDTH/PHSHFRAMES)
+#define PHSHHEIGHT PHSHORIGHEIGHT
+#define PHSHCHECKTIMEOUT (g_random_int()%120*1000)
+#define PHSHTIMEOUT 120
+#define PHSHHIDETIMEOUT 80
+#define PHSHXS 5
+#define PHSHYS ((g_random_int() % 2) + 1)
+#define PHSHXSHIDEFACTOR 2.5
+#define PHSHYSHIDEFACTOR 2.5
+#define PHSHPIXELSTOREMOVE(p) (p[3] < 55 || p[2] > 200)
+
+static void
+phsh_unsea(GdkPixbuf *gp)
+{
+        guchar *pixels = gdk_pixbuf_get_pixels (gp);
+        int rs = gdk_pixbuf_get_rowstride (gp);
+	int w = gdk_pixbuf_get_width (gp);
+        int h = gdk_pixbuf_get_height (gp);
+        int x, y;
+
+        for (y = 0; y < h; y++, pixels += rs) {
+                guchar *p = pixels;
+                for (x = 0; x < w; x++, p+=4) {
+                        if (PHSHPIXELSTOREMOVE(p))
+                               p[3] = 0;
+                }
+        }
+}
+
+static GdkPixbuf *
+get_phsh_frame (GdkPixbuf *pb, int frame)
+{
+        GdkPixbuf *newpb;
+
+        newpb = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+				PHSHWIDTH, PHSHHEIGHT);
+        gdk_pixbuf_copy_area (pb, frame * PHSHWIDTH, 0,
+			      PHSHWIDTH, PHSHHEIGHT, newpb, 0, 0);
+
+	return newpb;
+}
+
+typedef struct {
+	gboolean live;
+	int x, y;
+} InvGoat;
+
+typedef struct {
+	gboolean good;
+	int y;
+	int x;
+} InvShot;
+
+
+static GtkWidget *geginv = NULL;
+static GtkWidget *geginv_canvas = NULL;
+static GtkWidget *geginv_label = NULL;
+static GdkPixbuf *inv_goat1 = NULL;
+static GdkPixbuf *inv_goat2 = NULL;
+static GdkPixbuf *inv_phsh1 = NULL;
+static GdkPixbuf *inv_phsh2 = NULL;
+static int inv_phsh_state = 0;
+static int inv_goat_state = 0;
+static int inv_width = 0;
+static int inv_height = 0;
+static int inv_goat_width = 0;
+static int inv_goat_height = 0;
+static int inv_phsh_width = 0;
+static int inv_phsh_height = 0;
+#define INV_ROWS 3
+#define INV_COLS 5
+static InvGoat invs[INV_COLS][INV_ROWS] = { { { FALSE, 0, 0 } } };
+static int inv_num = INV_ROWS * INV_COLS;
+static double inv_factor = 1.0;
+static int inv_our_x = 0;
+static int inv_x = 0;
+static int inv_y = 0;
+static int inv_first_col = 0;
+static int inv_last_col = INV_COLS-1;
+static int inv_level = 0;
+static int inv_lives = 0;
+static gboolean inv_do_pause = FALSE;
+static gboolean inv_reverse = FALSE;
+static gboolean inv_game_over = FALSE;
+static gboolean inv_left_pressed = FALSE;
+static gboolean inv_right_pressed = FALSE;
+static gboolean inv_fire_pressed = FALSE;
+static gboolean inv_left_released = FALSE;
+static gboolean inv_right_released = FALSE;
+static gboolean inv_fire_released = FALSE;
+static gboolean inv_paused = FALSE;
+static GSList *inv_shots = NULL;
+static guint inv_draw_idle = 0;
+
+static void
+inv_show_status (void)
+{
+	gchar *s, *t, *u, *v, *w;
+	if (geginv == NULL)
+		return;
+
+	if (inv_game_over) {
+		t = g_strdup_printf (_("<b>GAME OVER</b> at level %d!"),
+				     inv_level+1);
+		u = g_strdup_printf ("<big>%s</big>", t);
+		/* Translators: the first and third strings are similar to a
+		 * title, and the second string is a small information text.
+		 * The spaces are there only to separate all the strings, so
+		 try to keep them as is. */
+		s = g_strdup_printf (_("%1$s   %2$s   %3$s"),
+				     u, _("Press 'q' to quit"), u);
+		g_free (t);
+		g_free (u);
+
+	} else if (inv_paused) {
+		t = g_strdup_printf("<big><b>%s</b></big>", _("Paused"));
+		/* Translators: the first string is a title and the second
+		 * string is a small information text. */
+		s = g_strdup_printf (_("%1$s\t%2$s"),
+				     t, _("Press 'p' to unpause"));
+		g_free (t);
+
+	} else {
+		t = g_strdup_printf ("<b>%d</b>", inv_level+1);
+		u = g_strdup_printf ("<b>%d</b>", inv_lives);
+		v = g_strdup_printf (_("Level: %s,  Lives: %s"), t, u);
+		w = g_strdup_printf ("<big>%s</big>", v);
+		/* Translators: the first string is a title and the second
+		 * string is a small information text. */
+		s = g_strdup_printf (_("%1$s\t%2$s"), w,
+				     _("Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"));
+		g_free (t);
+		g_free (u);
+		g_free (v);
+		g_free (w);
+
+	}
+	gtk_label_set_markup (GTK_LABEL (geginv_label), s);
+
+	g_free (s);
+}
+
+static gboolean
+inv_draw (gpointer data)
+{
+        inv_draw_idle = 0;
+
+        if (geginv)
+                gtk_widget_queue_draw (data);
+
+        return FALSE;
+}
+
+static void
+inv_queue_draw (GtkWidget *window)
+{
+       if (inv_draw_idle == 0)
+               inv_draw_idle = g_idle_add (inv_draw, window);
+}
+
+static void
+inv_draw_explosion (int x, int y)
+{
+        cairo_t *cr;
+        int i;
+
+        if ( ! gtk_widget_is_drawable (geginv_canvas))
+                return;
+
+        cr = gdk_cairo_create ( gtk_widget_get_window (geginv_canvas));
+
+        cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
+
+        for (i = 5; i < 100; i += 5) {
+                cairo_arc (cr, x, y, i, 0, 2 * G_PI);
+                cairo_fill (cr);
+                gdk_flush ();
+                g_usleep (50000);
+        }
+
+        cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+
+        for (i = 5; i < 100; i += 5) {
+                cairo_arc (cr, x, y, i, 0, 2 * G_PI);
+                cairo_fill (cr);
+                gdk_flush ();
+                g_usleep (50000);
+        }
+
+        cairo_destroy (cr);
+
+	inv_queue_draw (geginv);
+}
+
+
+static void
+inv_do_game_over (void)
+{
+	GSList *li;
+
+	inv_game_over = TRUE;
+
+	for (li = inv_shots; li != NULL; li = li->next) {
+		InvShot *shot = li->data;
+		shot->good = FALSE;
+	}
+
+	inv_queue_draw (geginv);
+
+	inv_show_status ();
+}
+
+
+static GdkPixbuf *
+pb_scale (GdkPixbuf *pb, double scale)
+{
+	int w, h;
+
+	if (scale == 1.0)
+		return (GdkPixbuf *)g_object_ref ((GObject *)pb);
+
+	w = gdk_pixbuf_get_width (pb) * scale;
+	h = gdk_pixbuf_get_height (pb) * scale;
+
+	return gdk_pixbuf_scale_simple (pb, w, h,
+					GDK_INTERP_BILINEAR);
+}
+
+static void
+refind_first_and_last (void)
+{
+	int i, j;
+
+	for (i = 0; i < INV_COLS; i++) {
+		gboolean all_null = TRUE;
+		for (j = 0; j < INV_ROWS; j++) {
+			if (invs[i][j].live) {
+				all_null = FALSE;
+				break;
+			}
+		}
+		if ( ! all_null) {
+			inv_first_col = i;
+			break;
+		}
+	}
+
+	for (i = INV_COLS-1; i >= 0; i--) {
+		gboolean all_null = TRUE;
+		for (j = 0; j < INV_ROWS; j++) {
+			if (invs[i][j].live) {
+				all_null = FALSE;
+				break;
+			}
+		}
+		if ( ! all_null) {
+			inv_last_col = i;
+			break;
+		}
+	}
+}
+
+static void
+whack_gegl (int i, int j)
+{
+	if ( ! invs[i][j].live)
+		return;
+
+	invs[i][j].live = FALSE;
+	inv_num --;
+
+	if (inv_num > 0) {
+		refind_first_and_last ();
+	} else {
+		inv_x = 70;
+		inv_y = 70;
+		inv_first_col = 0;
+		inv_last_col = INV_COLS-1;
+		inv_reverse = FALSE;
+
+		g_slist_foreach (inv_shots, (GFunc)g_free, NULL);
+		g_slist_free (inv_shots);
+		inv_shots = NULL;
+
+		for (i = 0; i < INV_COLS; i++) {
+			for (j = 0; j < INV_ROWS; j++) {
+				invs[i][j].live = TRUE;
+				invs[i][j].x = 70 + i * 100;
+				invs[i][j].y = 70 + j * 80;
+			}
+		}
+		inv_num = INV_ROWS * INV_COLS;
+
+		inv_level ++;
+
+		inv_show_status ();
+	}
+
+	inv_queue_draw (geginv);
+}
+
+static gboolean
+geginv_timeout (gpointer data)
+{
+	int i, j;
+	int limitx1;
+	int limitx2;
+	int speed;
+	int shots;
+	int max_shots;
+
+	if (inv_paused)
+		return TRUE;
+
+	if (geginv != data ||
+	    inv_num <= 0 ||
+	    inv_y > 700)
+		return FALSE;
+
+	limitx1 = 70 - (inv_first_col * 100);
+	limitx2 = 800 - 70 - (inv_last_col * 100);
+
+	if (inv_game_over) {
+		inv_y += 30;
+	} else {
+		if (inv_num < (INV_COLS*INV_ROWS)/3)
+			speed = 45+2*inv_level;
+		else if (inv_num < (2*INV_COLS*INV_ROWS)/3)
+			speed = 30+2*inv_level;
+		else
+			speed = 15+2*inv_level;
+
+		if (inv_reverse) {
+			inv_x -= speed;
+			if (inv_x < limitx1) {
+				inv_reverse = FALSE;
+				inv_x = (limitx1 + (limitx1 - inv_x));
+				inv_y += 30+inv_level;
+			}
+		} else {
+			inv_x += speed;
+			if (inv_x > limitx2) {
+				inv_reverse = TRUE;
+				inv_x = (limitx2 - (inv_x - limitx2));
+				inv_y += 30+inv_level;
+			}
+		}
+	}
+
+	for (i = 0; i < INV_COLS; i++) {
+		for (j = 0; j < INV_ROWS; j++) {
+			if (invs[i][j].live) {
+				invs[i][j].x = inv_x + i * 100;
+				invs[i][j].y = inv_y + j * 80;
+
+				if ( ! inv_game_over &&
+				    invs[i][j].y >= 570) {
+					inv_do_game_over ();
+				} else if ( ! inv_game_over &&
+					   invs[i][j].y >= 530 &&
+					   invs[i][j].x + 40 > inv_our_x - 25 &&
+					   invs[i][j].x - 40 < inv_our_x + 25) {
+					whack_gegl (i,j);
+					inv_lives --;
+					inv_draw_explosion (inv_our_x, 550);
+					if (inv_lives <= 0) {
+						inv_do_game_over ();
+					} else {
+						g_slist_foreach (inv_shots, (GFunc)g_free, NULL);
+						g_slist_free (inv_shots);
+						inv_shots = NULL;
+						inv_our_x = 400;
+						inv_do_pause = TRUE;
+						inv_show_status ();
+					}
+				}
+			}
+		}
+	}
+
+	shots = 0;
+	max_shots = (g_random_int () >> 3) % (2+inv_level);
+	while ( ! inv_game_over && shots < MIN (max_shots, inv_num)) {
+		int i = (g_random_int () >> 3) % INV_COLS;
+		for (j = INV_ROWS-1; j >= 0; j--) {
+			if (invs[i][j].live) {
+				InvShot *shot = g_new0 (InvShot, 1);
+
+				shot->good = FALSE;
+				shot->x = invs[i][j].x + (g_random_int () % 6) - 3;
+				shot->y = invs[i][j].y + inv_goat_height/2 + (g_random_int () % 3);
+
+				inv_shots = g_slist_prepend (inv_shots, shot);
+				shots++;
+				break;
+			}
+		}
+	}
+
+	inv_goat_state = (inv_goat_state+1) % 2;
+
+	inv_queue_draw (geginv);
+
+	g_timeout_add (((inv_num/4)+1) * 100, geginv_timeout, geginv);
+
+	return FALSE;
+}
+
+static gboolean
+find_gegls (int x, int y)
+{
+	int i, j;
+
+	/* FIXME: this is stupid, we can do better */
+	for (i = 0; i < INV_COLS; i++) {
+		for (j = 0; j < INV_ROWS; j++) {
+			int ix = invs[i][j].x;
+			int iy = invs[i][j].y;
+
+			if ( ! invs[i][j].live)
+				continue;
+
+			if (y >= iy - 30 &&
+			    y <= iy + 30 &&
+			    x >= ix - 40 &&
+			    x <= ix + 40) {
+				whack_gegl (i, j);
+				return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+
+static gboolean
+geginv_move_timeout (gpointer data)
+{
+	GSList *li;
+	static int shot_inhibit = 0;
+
+	if (inv_paused)
+		return TRUE;
+
+	if (geginv != data ||
+	    inv_num <= 0 ||
+	    inv_y > 700)
+		return FALSE;
+
+	inv_phsh_state = (inv_phsh_state+1)%10;
+
+	/* we will be drawing something */
+	if (inv_shots != NULL)
+		inv_queue_draw (geginv);
+
+	li = inv_shots;
+	while (li != NULL) {
+		InvShot *shot = li->data;
+
+		if (shot->good) {
+			shot->y -= 30;
+			if (find_gegls (shot->x, shot->y) ||
+			    shot->y <= 0) {
+				GSList *list = li;
+				/* we were restarted */
+				if (inv_shots == NULL)
+					return TRUE;
+				li = li->next;
+				g_free (shot);
+				inv_shots = g_slist_delete_link (inv_shots, list);
+				continue;
+			}
+		} else /* bad */ {
+			shot->y += 30;
+			if ( ! inv_game_over &&
+			    shot->y >= 535 &&
+			    shot->y <= 565 &&
+			    shot->x >= inv_our_x - 25 &&
+			    shot->x <= inv_our_x + 25) {
+				inv_lives --;
+				inv_draw_explosion (inv_our_x, 550);
+				if (inv_lives <= 0) {
+					inv_do_game_over ();
+				} else {
+					g_slist_foreach (inv_shots, (GFunc)g_free, NULL);
+					g_slist_free (inv_shots);
+					inv_shots = NULL;
+					inv_our_x = 400;
+					inv_do_pause = TRUE;
+					inv_show_status ();
+					return TRUE;
+				}
+			}
+
+			if (shot->y >= 600) {
+				GSList *list = li;
+				li = li->next;
+				g_free (shot);
+				inv_shots = g_slist_delete_link (inv_shots, list);
+				continue;
+			}
+		}
+
+		li = li->next;
+	}
+
+	if ( ! inv_game_over) {
+		if (inv_left_pressed && inv_our_x > 100) {
+			inv_our_x -= 20;
+			inv_queue_draw (geginv);
+		} else if (inv_right_pressed && inv_our_x < 700) {
+			inv_our_x += 20;
+			inv_queue_draw (geginv);
+		}
+	}
+
+	if (shot_inhibit > 0)
+		shot_inhibit--;
+
+	if ( ! inv_game_over && inv_fire_pressed && shot_inhibit == 0) {
+		InvShot *shot = g_new0 (InvShot, 1);
+
+		shot->good = TRUE;
+		shot->x = inv_our_x;
+		shot->y = 540;
+
+		inv_shots = g_slist_prepend (inv_shots, shot);
+
+		shot_inhibit = 5;
+
+		inv_queue_draw (geginv);
+	}
+
+	if (inv_left_released)
+		inv_left_pressed = FALSE;
+	if (inv_right_released)
+		inv_right_pressed = FALSE;
+	if (inv_fire_released)
+		inv_fire_pressed = FALSE;
+
+	return TRUE;
+}
+
+static gboolean
+inv_key_press (GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+	switch (event->keyval) {
+	case GDK_KEY_Left:
+	case GDK_KEY_KP_Left:
+	case GDK_KEY_Pointer_Left:
+		inv_left_pressed = TRUE;
+		inv_left_released = FALSE;
+		return TRUE;
+	case GDK_KEY_Right:
+	case GDK_KEY_KP_Right:
+	case GDK_KEY_Pointer_Right:
+		inv_right_pressed = TRUE;
+		inv_right_released = FALSE;
+		return TRUE;
+	case GDK_KEY_space:
+	case GDK_KEY_KP_Space:
+		inv_fire_pressed = TRUE;
+		inv_fire_released = FALSE;
+		return TRUE;
+	default:
+		break;
+	}
+	return FALSE;
+}
+
+static gboolean
+inv_key_release (GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+	switch (event->keyval) {
+	case GDK_KEY_Left:
+	case GDK_KEY_KP_Left:
+	case GDK_KEY_Pointer_Left:
+		inv_left_released = TRUE;
+		return TRUE;
+	case GDK_KEY_Right:
+	case GDK_KEY_KP_Right:
+	case GDK_KEY_Pointer_Right:
+		inv_right_released = TRUE;
+		return TRUE;
+	case GDK_KEY_space:
+	case GDK_KEY_KP_Space:
+		inv_fire_released = TRUE;
+		return TRUE;
+	case GDK_KEY_q:
+	case GDK_KEY_Q:
+		gtk_widget_destroy (widget);
+		return TRUE;
+	case GDK_KEY_p:
+	case GDK_KEY_P:
+		inv_paused = ! inv_paused;
+		inv_show_status ();
+		return TRUE;
+	default:
+		break;
+	}
+	return FALSE;
+}
+
+static gboolean
+ensure_creatures (void)
+{
+        GdkPixbuf *pb, *pb1;
+
+	if (inv_goat1 != NULL)
+		return TRUE;
+
+	pb = gdk_pixbuf_new_from_resource ("/org/gimp/lebl-dialog/wanda.png",
+                                           NULL);
+	if (pb == NULL)
+		return FALSE;
+
+	pb1 = get_phsh_frame (pb, 1);
+	inv_phsh1 = pb_scale (pb1, inv_factor);
+	g_object_unref (G_OBJECT (pb1));
+	phsh_unsea (inv_phsh1);
+
+	pb1 = get_phsh_frame (pb, 2);
+	inv_phsh2 = pb_scale (pb1, inv_factor);
+	g_object_unref (G_OBJECT (pb1));
+	phsh_unsea (inv_phsh2);
+
+	g_object_unref (G_OBJECT (pb));
+
+	pb = gdk_pixbuf_new_from_resource ("/org/gimp/lebl-dialog/gegl-1.png",
+                                           NULL);
+	if (pb == NULL) {
+		g_object_unref (G_OBJECT (inv_phsh1));
+		g_object_unref (G_OBJECT (inv_phsh2));
+		return FALSE;
+	}
+
+	inv_goat1 = pb_scale (pb, inv_factor * 0.66);
+	g_object_unref (pb);
+
+	pb = gdk_pixbuf_new_from_resource ("/org/gimp/lebl-dialog/gegl-2.png",
+                                           NULL);
+	if (pb == NULL) {
+		g_object_unref (G_OBJECT (inv_goat1));
+		g_object_unref (G_OBJECT (inv_phsh1));
+		g_object_unref (G_OBJECT (inv_phsh2));
+		return FALSE;
+	}
+
+	inv_goat2 = pb_scale (pb, inv_factor * 0.66);
+	g_object_unref (pb);
+
+	inv_goat_width = gdk_pixbuf_get_width (inv_goat1);
+	inv_goat_height = gdk_pixbuf_get_height (inv_goat1);
+	inv_phsh_width = gdk_pixbuf_get_width (inv_phsh1);
+	inv_phsh_height = gdk_pixbuf_get_height (inv_phsh1);
+
+	return TRUE;
+}
+
+static void
+geginv_destroyed (GtkWidget *w, gpointer data)
+{
+	geginv = NULL;
+}
+
+static gboolean
+inv_expose (GtkWidget *widget, GdkEventExpose *event)
+{
+        cairo_t *cr;
+	GdkPixbuf *goat;
+	GSList *li;
+	int i, j;
+
+	if (geginv == NULL) {
+		inv_draw_idle = 0;
+		return TRUE;
+	}
+
+	if ( ! gtk_widget_is_drawable (geginv_canvas))
+		return TRUE;
+
+        cr = gdk_cairo_create (gtk_widget_get_window (geginv_canvas));
+
+        cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+        cairo_paint (cr);
+
+	if (inv_goat_state == 0)
+		goat = inv_goat1;
+	else
+		goat = inv_goat2;
+
+	for (i = 0; i < INV_COLS; i++) {
+		for (j = 0; j < INV_ROWS; j++) {
+			int x, y;
+			if ( ! invs[i][j].live)
+				continue;
+
+			x = invs[i][j].x*inv_factor - inv_goat_width/2,
+			y = invs[i][j].y*inv_factor - inv_goat_height/2,
+
+                        gdk_cairo_set_source_pixbuf (cr, goat, x, y);
+                        cairo_rectangle (cr,
+                                         x, y,
+                                         inv_goat_width,
+                                         inv_goat_height);
+                        cairo_fill (cr);
+		}
+	}
+
+	for (li = inv_shots; li != NULL; li = li->next) {
+		InvShot *shot = li->data;
+
+                cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+                cairo_rectangle (cr,
+                                 (shot->x-1)*inv_factor,
+                                 (shot->y-4)*inv_factor,
+                                 3, 8);
+                cairo_fill (cr);
+	}
+
+	if ( ! inv_game_over) {
+		GdkPixbuf *phsh;
+
+		if (inv_phsh_state < 5) {
+			phsh = inv_phsh1;
+		} else {
+			phsh = inv_phsh2;
+		}
+
+                gdk_cairo_set_source_pixbuf (cr, phsh,
+                                             inv_our_x*inv_factor - inv_phsh_width/2,
+                                             550*inv_factor - inv_phsh_height/2);
+                cairo_rectangle (cr,
+                                 inv_our_x*inv_factor - inv_phsh_width/2,
+                                 550*inv_factor - inv_phsh_height/2,
+                                 inv_phsh_width,
+                                 inv_phsh_height);
+                cairo_fill (cr);
+	}
+
+        cairo_destroy (cr);
+
+	gdk_flush ();
+
+	if (inv_do_pause) {
+		g_usleep (G_USEC_PER_SEC);
+		inv_do_pause = FALSE;
+	}
+
+	inv_draw_idle = 0;
+	return TRUE;
+}
+
+gboolean gimp_lebl_dialog (void);
+
+gboolean
+gimp_lebl_dialog (void)
+{
+	GtkWidget *vbox;
+	int i, j;
+
+	if (geginv != NULL) {
+		gtk_window_present (GTK_WINDOW (geginv));
+		return FALSE;
+	}
+
+	inv_width = 800;
+	inv_height = 600;
+
+	if (inv_width > gdk_screen_get_width (gdk_screen_get_default ()) * 0.9) {
+		inv_width = gdk_screen_get_width (gdk_screen_get_default ()) * 0.9;
+		inv_height = inv_width * (600.0/800.0);
+	}
+
+	if (inv_height > gdk_screen_get_height (gdk_screen_get_default ()) * 0.9) {
+		inv_height = gdk_screen_get_height (gdk_screen_get_default ()) * 0.9;
+		inv_width = inv_height * (800.0/600.0);
+	}
+
+	inv_factor = (double)inv_width / 800.0;
+
+	if ( ! ensure_creatures ())
+		return FALSE;
+
+	geginv = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_position (GTK_WINDOW (geginv), GTK_WIN_POS_CENTER);
+	gtk_window_set_title (GTK_WINDOW (geginv), _("Killer GEGLs from Outer Space"));
+	g_object_set (G_OBJECT (geginv), "resizable", FALSE, NULL);
+	g_signal_connect (G_OBJECT (geginv), "destroy",
+			  G_CALLBACK (geginv_destroyed),
+			  NULL);
+
+	geginv_canvas = gtk_drawing_area_new ();
+	gtk_widget_set_size_request (geginv_canvas, inv_width, inv_height);
+
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	gtk_container_add (GTK_CONTAINER (geginv), vbox);
+	gtk_box_pack_start (GTK_BOX (vbox), geginv_canvas, TRUE, TRUE, 0);
+
+	geginv_label = gtk_label_new ("");
+	gtk_box_pack_start (GTK_BOX (vbox), geginv_label, FALSE, FALSE, 0);
+
+	inv_our_x = 400;
+	inv_x = 70;
+	inv_y = 70;
+	inv_first_col = 0;
+	inv_level = 0;
+	inv_lives = 3;
+	inv_last_col = INV_COLS-1;
+	inv_reverse = FALSE;
+	inv_game_over = FALSE;
+	inv_left_pressed = FALSE;
+	inv_right_pressed = FALSE;
+	inv_fire_pressed = FALSE;
+	inv_left_released = FALSE;
+	inv_right_released = FALSE;
+	inv_fire_released = FALSE;
+	inv_paused = FALSE;
+
+	gtk_widget_add_events (geginv, GDK_KEY_RELEASE_MASK);
+
+	g_signal_connect (G_OBJECT (geginv), "key_press_event",
+			  G_CALLBACK (inv_key_press), NULL);
+	g_signal_connect (G_OBJECT (geginv), "key_release_event",
+			  G_CALLBACK (inv_key_release), NULL);
+	g_signal_connect (G_OBJECT (geginv_canvas), "expose_event",
+			  G_CALLBACK (inv_expose), NULL);
+
+	g_slist_foreach (inv_shots, (GFunc)g_free, NULL);
+	g_slist_free (inv_shots);
+	inv_shots = NULL;
+
+	for (i = 0; i < INV_COLS; i++) {
+		for (j = 0; j < INV_ROWS; j++) {
+			invs[i][j].live = TRUE;
+			invs[i][j].x = 70 + i * 100;
+			invs[i][j].y = 70 + j * 80;
+		}
+	}
+	inv_num = INV_ROWS * INV_COLS;
+
+	g_timeout_add (((inv_num/4)+1) * 100, geginv_timeout, geginv);
+	g_timeout_add (90, geginv_move_timeout, geginv);
+
+	inv_show_status ();
+
+	gtk_widget_show_all (geginv);
+  return FALSE;
+}
diff --git a/app/dialogs/lebl-dialog.h b/app/dialogs/lebl-dialog.h
new file mode 100644
index 0000000..e1d5797
--- /dev/null
+++ b/app/dialogs/lebl-dialog.h
@@ -0,0 +1,15397 @@
+#include <gio/gio.h>
+
+#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
+# define SECTION __attribute__ ((section (".gresource.lebl_dialog"), aligned (8)))
+#else
+# define SECTION
+#endif
+
+static const SECTION union { const guint8 data[121880]; const double alignment; void * const ptr;}  lebl_dialog_resource_data = { {
+  0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x28, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b,
+  0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x4c, 0x00, 0xe8, 0x00, 0x00, 0x00,
+  0xec, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0xec, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x4c, 0x00, 0xf0, 0x00, 0x00, 0x00,
+  0xf4, 0x00, 0x00, 0x00, 0x42, 0x94, 0x5a, 0xe4,
+  0x06, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00,
+  0x0a, 0x00, 0x76, 0x00, 0x00, 0x01, 0x00, 0x00,
+  0x08, 0xa2, 0x00, 0x00, 0xc3, 0xac, 0x6c, 0xe4,
+  0x06, 0x00, 0x00, 0x00, 0x08, 0xa2, 0x00, 0x00,
+  0x0a, 0x00, 0x76, 0x00, 0x18, 0xa2, 0x00, 0x00,
+  0xc0, 0x78, 0x01, 0x00, 0x27, 0x85, 0xb8, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x78, 0x01, 0x00,
+  0x05, 0x00, 0x4c, 0x00, 0xc8, 0x78, 0x01, 0x00,
+  0xcc, 0x78, 0x01, 0x00, 0xd0, 0x92, 0xb4, 0x63,
+  0x06, 0x00, 0x00, 0x00, 0xcc, 0x78, 0x01, 0x00,
+  0x09, 0x00, 0x76, 0x00, 0xd8, 0x78, 0x01, 0x00,
+  0x00, 0xdc, 0x01, 0x00, 0xb2, 0xd2, 0x44, 0xee,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x01, 0x00,
+  0x0c, 0x00, 0x4c, 0x00, 0x0c, 0xdc, 0x01, 0x00,
+  0x18, 0xdc, 0x01, 0x00, 0x6f, 0x72, 0x67, 0x2f,
+  0x04, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x67, 0x65, 0x67, 0x6c,
+  0x2d, 0x31, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00,
+  0xf8, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x64, 0x6b, 0x50, 0x00, 0x00, 0xa0, 0xf8,
+  0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x8c,
+  0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x68,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc5, 0xc9, 0xc5, 0xd2, 0xd6, 0xd2,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xf9, 0xfa, 0xf9, 0x74, 0x77,
+  0x74, 0x56, 0x58, 0x56, 0xc3, 0xc6, 0xc3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x97, 0x9a, 0x97, 0x21, 0x21, 0x21,
+  0x3c, 0x3d, 0x3c, 0xaa, 0xad, 0xaa, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd1, 0xd4, 0xd1, 0x8e, 0x91, 0x8e,
+  0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe9, 0xec,
+  0xe9, 0x66, 0x68, 0x66, 0x27, 0x27, 0x27, 0x43,
+  0x44, 0x43, 0x9e, 0xa2, 0x9e, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x96, 0x99,
+  0x96, 0x1c, 0x1d, 0x1c, 0x8c, 0x8e, 0x8c, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xba, 0xbe, 0xba,
+  0x49, 0x4b, 0x49, 0x5b, 0x5d, 0x5b, 0x49, 0x4a,
+  0x49, 0xb0, 0xb3, 0xb0, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x8a, 0x8c, 0x8a, 0x2d, 0x2e, 0x2d,
+  0x5b, 0x5d, 0x5b, 0xdf, 0xe3, 0xdf, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x6c, 0x6f, 0x6c, 0x6e,
+  0x71, 0x6e, 0x87, 0x8a, 0x87, 0x59, 0x5b, 0x59,
+  0xbf, 0xc2, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0x78, 0x7a,
+  0x78, 0x5c, 0x5d, 0x5c, 0x4b, 0x4d, 0x4b, 0xc8,
+  0xcb, 0xc8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xac, 0xaf, 0xac, 0x5a, 0x5c, 0x5a, 0xc1, 0xc5,
+  0xc1, 0x8a, 0x8d, 0x8a, 0x60, 0x62, 0x60, 0xcd,
+  0xd0, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf,
+  0xe2, 0xdf, 0x60, 0x62, 0x60, 0x82, 0x85, 0x82,
+  0x56, 0x58, 0x56, 0xa9, 0xac, 0xa9, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd9, 0xdd, 0xd9, 0x5f,
+  0x61, 0x5f, 0x97, 0x9a, 0x97, 0xd5, 0xd8, 0xd5,
+  0x66, 0x68, 0x66, 0x86, 0x89, 0x86, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0x68, 0x6a,
+  0x68, 0x9d, 0xa0, 0x9d, 0x6a, 0x6c, 0x6a, 0x90,
+  0x93, 0x90, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x8e, 0x90, 0x8e, 0x6e, 0x71,
+  0x6e, 0xec, 0xf0, 0xec, 0xa8, 0xab, 0xa8, 0x56,
+  0x59, 0x56, 0xde, 0xe2, 0xde, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xde,
+  0xe2, 0xde, 0x6f, 0x71, 0x6f, 0xaf, 0xb2, 0xaf,
+  0x75, 0x78, 0x75, 0x73, 0x76, 0x73, 0xfc, 0xfc,
+  0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc5,
+  0xc9, 0xc5, 0x51, 0x54, 0x51, 0xc8, 0xcc, 0xc8,
+  0xde, 0xe2, 0xde, 0x64, 0x66, 0x64, 0xa9, 0xac,
+  0xa9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xce, 0xd2, 0xce, 0x6a, 0x6c,
+  0x6a, 0xc3, 0xc7, 0xc3, 0x79, 0x7b, 0x79, 0x74,
+  0x76, 0x74, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xed, 0xf0, 0xed, 0x65, 0x67,
+  0x65, 0x8d, 0x8f, 0x8d, 0xeb, 0xef, 0xeb, 0x98,
+  0x9b, 0x98, 0x69, 0x6b, 0x69, 0xe4, 0xe8, 0xe4,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb9,
+  0xbc, 0xb9, 0x65, 0x67, 0x65, 0xd0, 0xd3, 0xd0,
+  0x7c, 0x7e, 0x7c, 0x8c, 0x8e, 0x8c, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x9a, 0x9d, 0x9a, 0x60, 0x61, 0x60,
+  0xe3, 0xe6, 0xe3, 0xd4, 0xd8, 0xd4, 0x57, 0x59,
+  0x57, 0xc4, 0xc7, 0xc4, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x92, 0x94, 0x92, 0x71, 0x73,
+  0x71, 0xd5, 0xd9, 0xd5, 0x61, 0x64, 0x61, 0xa3,
+  0xa6, 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd0, 0xd3,
+  0xd0, 0x54, 0x55, 0x54, 0xc8, 0xcb, 0xc8, 0xff,
+  0xff, 0xff, 0x70, 0x72, 0x70, 0x91, 0x94, 0x91,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0x60,
+  0x62, 0x60, 0x92, 0x94, 0x92, 0xd8, 0xdb, 0xd8,
+  0x51, 0x52, 0x51, 0xb1, 0xb4, 0xb1, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd0, 0xd3, 0xd0, 0xe1, 0xe5,
+  0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xf5, 0xf7, 0xf5, 0x59, 0x5b, 0x59,
+  0xb4, 0xb7, 0xb4, 0xff, 0xff, 0xff, 0x9b, 0x9e,
+  0x9b, 0x5f, 0x61, 0x5f, 0xd6, 0xda, 0xd6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9e, 0xa0, 0x9e, 0x59, 0x5b, 0x59, 0xcd, 0xd1,
+  0xcd, 0xca, 0xce, 0xca, 0x57, 0x59, 0x57, 0xc7,
+  0xca, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xba, 0xbd, 0xba, 0x9c, 0x9e, 0x9c, 0xd2, 0xd5,
+  0xd2, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0x5e,
+  0x60, 0x5e, 0xa5, 0xa8, 0xa5, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x66, 0x68, 0x66, 0xb4, 0xb7, 0xb4, 0xff,
+  0xff, 0xff, 0xc7, 0xcb, 0xc7, 0x5f, 0x60, 0x5f,
+  0xbb, 0xbd, 0xbb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xbb, 0xbf, 0xbb, 0x63, 0x65, 0x63, 0xac,
+  0xaf, 0xac, 0xeb, 0xef, 0xeb, 0x9b, 0x9d, 0x9b,
+  0x70, 0x72, 0x70, 0xe9, 0xec, 0xe9, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd9, 0xdd, 0xd9, 0x6a, 0x6c, 0x6a, 0x3a,
+  0x3b, 0x3a, 0x88, 0x8a, 0x88, 0xdc, 0xe0, 0xdc,
+  0x8a, 0x8d, 0x8a, 0x2b, 0x2b, 0x2b, 0x9a, 0x9c,
+  0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xdd, 0xe1, 0xdd, 0x57, 0x59, 0x57,
+  0xbc, 0xc0, 0xbc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc0, 0xc3, 0xc0, 0xdf, 0xe3, 0xdf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa4, 0xa7, 0xa4, 0x66, 0x68, 0x66,
+  0xa8, 0xab, 0xa8, 0xf2, 0xf6, 0xf2, 0xe0, 0xe4,
+  0xe0, 0x69, 0x6b, 0x69, 0xa7, 0xa9, 0xa7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xc2, 0xbf,
+  0x5a, 0x5c, 0x5a, 0x66, 0x68, 0x66, 0x66, 0x68,
+  0x66, 0x8c, 0x8e, 0x8c, 0x50, 0x52, 0x50, 0x4d,
+  0x4f, 0x4d, 0x9e, 0xa1, 0x9e, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb6, 0xb9,
+  0xb6, 0x61, 0x64, 0x61, 0xdc, 0xe0, 0xdc, 0xff,
+  0xff, 0xff, 0xed, 0xf0, 0xed, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xee, 0xf0, 0xee, 0x98, 0x9b, 0x98, 0x57, 0x59,
+  0x57, 0xa8, 0xab, 0xa8, 0xed, 0xf1, 0xed, 0xf4,
+  0xf8, 0xf4, 0xb1, 0xb4, 0xb1, 0x57, 0x59, 0x57,
+  0xd7, 0xdb, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xa7, 0xaa, 0xa7, 0x71, 0x74, 0x71, 0xa2,
+  0xa4, 0xa2, 0x2a, 0x2b, 0x2a, 0x47, 0x49, 0x47,
+  0xa2, 0xa5, 0xa2, 0x72, 0x74, 0x72, 0x9e, 0xa1,
+  0x9e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xba, 0xbe, 0xba, 0xa3, 0xa6, 0xa3,
+  0xee, 0xf2, 0xee, 0xe1, 0xe4, 0xe1, 0x82, 0x85,
+  0x82, 0x80, 0x83, 0x80, 0xba, 0xbd, 0xba, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xe3, 0xdf,
+  0x95, 0x97, 0x95, 0xc5, 0xc8, 0xc5, 0xff, 0xff,
+  0xff, 0xdd, 0xe0, 0xdd, 0x85, 0x88, 0x85, 0x5b,
+  0x5d, 0x5b, 0xa9, 0xab, 0xa9, 0xec, 0xf0, 0xec,
+  0xf8, 0xfc, 0xf8, 0xe3, 0xe7, 0xe3, 0x76, 0x78,
+  0x76, 0x7d, 0x80, 0x7d, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x82, 0x7f,
+  0x7a, 0x7d, 0x7a, 0xc7, 0xcb, 0xc7, 0x64, 0x66,
+  0x64, 0x8d, 0x90, 0x8d, 0xdf, 0xe3, 0xdf, 0x7b,
+  0x7d, 0x7b, 0x9a, 0x9d, 0x9a, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdc, 0xe0,
+  0xdc, 0xe4, 0xe8, 0xe4, 0xac, 0xae, 0xac, 0x9f,
+  0xa2, 0x9f, 0xae, 0xb1, 0xae, 0x7b, 0x7d, 0x7b,
+  0x54, 0x56, 0x54, 0xb6, 0xb9, 0xb6, 0xff, 0xff,
+  0xff, 0xe0, 0xe4, 0xe0, 0x7a, 0x7c, 0x7a, 0x5d,
+  0x5f, 0x5d, 0x9d, 0xa0, 0x9d, 0xcc, 0xd0, 0xcc,
+  0x8b, 0x8d, 0x8b, 0xc5, 0xc9, 0xc5, 0xf3, 0xf6,
+  0xf3, 0xf8, 0xfc, 0xf8, 0xee, 0xf2, 0xee, 0x92,
+  0x95, 0x92, 0x59, 0x5b, 0x59, 0xc2, 0xc6, 0xc2,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7,
+  0xf5, 0x5b, 0x5d, 0x5b, 0xa2, 0xa5, 0xa2, 0xf0,
+  0xf4, 0xf0, 0xe8, 0xec, 0xe8, 0xee, 0xf2, 0xee,
+  0xf2, 0xf6, 0xf2, 0x7c, 0x7e, 0x7c, 0x8f, 0x92,
+  0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbe,
+  0xc1, 0xbe, 0x84, 0x87, 0x84, 0xc5, 0xc9, 0xc5,
+  0x63, 0x65, 0x63, 0x98, 0x9b, 0x98, 0xf5, 0xf9,
+  0xf5, 0xe3, 0xe7, 0xe3, 0x60, 0x61, 0x60, 0x4d,
+  0x4f, 0x4d, 0xaa, 0xad, 0xaa, 0xef, 0xf3, 0xef,
+  0xe9, 0xed, 0xe9, 0xa0, 0xa3, 0xa0, 0x4f, 0x51,
+  0x4f, 0xd6, 0xd9, 0xd6, 0xed, 0xf1, 0xed, 0xf6,
+  0xfa, 0xf6, 0xf4, 0xf8, 0xf4, 0xdd, 0xe1, 0xdd,
+  0x99, 0x9c, 0x99, 0x4e, 0x50, 0x4e, 0xa2, 0xa5,
+  0xa2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc6, 0xc9, 0xc6, 0x57, 0x59, 0x57,
+  0xc1, 0xc4, 0xc1, 0xeb, 0xee, 0xeb, 0xeb, 0xef,
+  0xeb, 0xeb, 0xef, 0xeb, 0xe9, 0xed, 0xe9, 0x7f,
+  0x81, 0x7f, 0x9f, 0xa1, 0x9f, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc6, 0xc9, 0xc6, 0x6a, 0x6c, 0x6a, 0x8c, 0x8f,
+  0x8c, 0xc6, 0xca, 0xc6, 0x63, 0x65, 0x63, 0xbb,
+  0xbe, 0xbb, 0xf8, 0xfc, 0xf8, 0xeb, 0xef, 0xeb,
+  0x70, 0x72, 0x70, 0x1f, 0x1f, 0x1f, 0x99, 0x9c,
+  0x99, 0xf1, 0xf5, 0xf1, 0xf8, 0xfc, 0xf8, 0xce,
+  0xd1, 0xce, 0x55, 0x57, 0x55, 0xcc, 0xd0, 0xcc,
+  0xf7, 0xfb, 0xf7, 0xe7, 0xeb, 0xe7, 0xaa, 0xac,
+  0xaa, 0x6c, 0x6e, 0x6c, 0x56, 0x58, 0x56, 0xa5,
+  0xa8, 0xa5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x95, 0x97,
+  0x95, 0x31, 0x32, 0x31, 0x69, 0x6b, 0x69, 0x7a,
+  0x7c, 0x7a, 0x79, 0x7a, 0x79, 0x79, 0x7b, 0x79,
+  0x89, 0x8b, 0x89, 0x69, 0x6b, 0x69, 0x94, 0x97,
+  0x94, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xdc, 0xdf, 0xdc, 0x72, 0x74, 0x72, 0x8f,
+  0x92, 0x8f, 0xe5, 0xe8, 0xe5, 0xdb, 0xde, 0xdb,
+  0x61, 0x63, 0x61, 0xa7, 0xab, 0xa7, 0xf0, 0xf4,
+  0xf0, 0xc5, 0xc8, 0xc5, 0x4a, 0x4c, 0x4a, 0x2b,
+  0x2b, 0x2b, 0xaa, 0xad, 0xaa, 0xf0, 0xf4, 0xf0,
+  0xf6, 0xfa, 0xf6, 0xcc, 0xd0, 0xcc, 0x55, 0x57,
+  0x55, 0xbd, 0xc1, 0xbd, 0xb1, 0xb4, 0xb1, 0x6e,
+  0x6f, 0x6e, 0x59, 0x5a, 0x59, 0x8d, 0x8f, 0x8d,
+  0xcb, 0xcf, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9,
+  0xfa, 0xf9, 0x72, 0x75, 0x72, 0x57, 0x59, 0x57,
+  0x77, 0x79, 0x77, 0x87, 0x89, 0x87, 0x83, 0x85,
+  0x83, 0x85, 0x88, 0x85, 0x90, 0x92, 0x90, 0x6b,
+  0x6d, 0x6b, 0x95, 0x98, 0x95, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd2, 0xd6, 0xd2, 0x76, 0x79, 0x76,
+  0x7f, 0x82, 0x7f, 0xe0, 0xe3, 0xe0, 0xff, 0xff,
+  0xff, 0xed, 0xf0, 0xed, 0x6d, 0x70, 0x6d, 0x76,
+  0x79, 0x76, 0x94, 0x97, 0x94, 0x5d, 0x5f, 0x5d,
+  0x65, 0x67, 0x65, 0x68, 0x6b, 0x68, 0x5b, 0x5d,
+  0x5b, 0xa3, 0xa6, 0xa3, 0xbc, 0xbf, 0xbc, 0x88,
+  0x8b, 0x88, 0x47, 0x49, 0x47, 0xad, 0xb0, 0xad,
+  0x76, 0x79, 0x76, 0x87, 0x8a, 0x87, 0xd1, 0xd4,
+  0xd1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xca, 0xcd, 0xca, 0x5c, 0x5e,
+  0x5c, 0xc7, 0xca, 0xc7, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x71, 0x73, 0x71, 0x9e, 0xa1,
+  0x9e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0x74, 0x76,
+  0x74, 0x73, 0x75, 0x73, 0xd9, 0xdd, 0xd9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa5, 0xa8, 0xa5, 0x58, 0x5a, 0x58, 0x6b, 0x6d,
+  0x6b, 0x9a, 0x9d, 0x9a, 0xd6, 0xd9, 0xd6, 0xd7,
+  0xda, 0xd7, 0x8d, 0x90, 0x8d, 0x66, 0x68, 0x66,
+  0x62, 0x64, 0x62, 0x54, 0x56, 0x54, 0x3f, 0x40,
+  0x3f, 0xab, 0xae, 0xab, 0xd7, 0xdb, 0xd7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa2,
+  0xa4, 0xa2, 0x5b, 0x5d, 0x5b, 0xf2, 0xf3, 0xf2,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a,
+  0x6c, 0x6a, 0x9c, 0xa0, 0x9c, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdd, 0xe1, 0xdd, 0x68,
+  0x6a, 0x68, 0x63, 0x65, 0x63, 0xcc, 0xd0, 0xcc,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd2,
+  0xd6, 0xd2, 0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xdb, 0xdf, 0xdb, 0xc6, 0xca, 0xc6, 0x8c,
+  0x8f, 0x8c, 0x36, 0x36, 0x36, 0x60, 0x62, 0x60,
+  0xda, 0xde, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf9, 0xfa, 0xf9, 0x79, 0x7b, 0x79, 0x80, 0x83,
+  0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x5d, 0x5f, 0x5d, 0xa1, 0xa4,
+  0xa1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd2, 0xd6, 0xd2,
+  0x6f, 0x71, 0x6f, 0x63, 0x65, 0x63, 0xcb, 0xcf,
+  0xcb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa3, 0xa7, 0xa3, 0x56, 0x59, 0x56, 0x8d, 0x90,
+  0x8d, 0x59, 0x5c, 0x59, 0xac, 0xaf, 0xac, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd6, 0xd9, 0xd6, 0x68,
+  0x6a, 0x68, 0xab, 0xae, 0xab, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x64,
+  0x66, 0x64, 0xb1, 0xb5, 0xb1, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe9, 0xec,
+  0xe9, 0x79, 0x7b, 0x79, 0x5b, 0x5d, 0x5b, 0xcd,
+  0xd1, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc4, 0xc7, 0xc4, 0x4f, 0x51, 0x4f, 0x8d,
+  0x8f, 0x8d, 0xe1, 0xe5, 0xe1, 0x81, 0x84, 0x81,
+  0x7a, 0x7d, 0x7a, 0xf1, 0xf3, 0xf1, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb4, 0xb7, 0xb4, 0x67, 0x69, 0x67, 0xcd, 0xd1,
+  0xcd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe1, 0xe5, 0xe1, 0x63, 0x64, 0x63, 0xbc, 0xbf,
+  0xbc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x96, 0x99, 0x96, 0x65, 0x68, 0x65,
+  0xc3, 0xc7, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd1, 0xd5, 0xd1, 0x6b, 0x6d, 0x6b,
+  0x8f, 0x92, 0x8f, 0xf1, 0xf3, 0xf1, 0xff, 0xff,
+  0xff, 0xbb, 0xbe, 0xbb, 0x63, 0x66, 0x63, 0xc8,
+  0xcb, 0xc8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x86, 0x89, 0x86, 0x81,
+  0x84, 0x81, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcd, 0xd1, 0xcd, 0x59,
+  0x5a, 0x59, 0xcb, 0xcf, 0xcb, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xb0, 0xb4, 0xb0, 0x4d, 0x4f,
+  0x4d, 0xad, 0xb0, 0xad, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xcd, 0xd1, 0xcd, 0x68, 0x6a,
+  0x68, 0x66, 0x68, 0x66, 0xe9, 0xec, 0xe9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xe4, 0xe8, 0xe4,
+  0x72, 0x74, 0x72, 0x8d, 0x8f, 0x8d, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xe9, 0xec, 0xe9,
+  0x5b, 0x5c, 0x5b, 0xa4, 0xa6, 0xa4, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbd, 0xc0, 0xbd, 0x4f, 0x50, 0x4f, 0xd0, 0xd4,
+  0xd0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd2, 0xd5, 0xd2, 0x62,
+  0x64, 0x62, 0x9f, 0xa2, 0x9f, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7b,
+  0x7e, 0x7b, 0x67, 0x69, 0x67, 0xc7, 0xcb, 0xc7,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa0, 0xa3, 0xa0, 0x57,
+  0x59, 0x57, 0xdf, 0xe3, 0xdf, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc4, 0xc7, 0xc4, 0x4f, 0x51, 0x4f, 0xc4,
+  0xc8, 0xc4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbb, 0xbe, 0xbb, 0x65,
+  0x67, 0x65, 0xdc, 0xe0, 0xdc, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x96, 0x98, 0x96, 0x5b, 0x5d, 0x5b, 0xfc, 0xfc,
+  0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x99, 0x9c, 0x99, 0x5c, 0x5e, 0x5c, 0xc5, 0xc9,
+  0xc5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xcf, 0xd2, 0xcf, 0x52, 0x54, 0x52, 0xb2, 0xb5,
+  0xb2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x9d, 0xa0, 0x9d,
+  0x6f, 0x71, 0x6f, 0xed, 0xf0, 0xed, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa9, 0xac, 0xa9, 0x7a, 0x7c, 0x7a, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x85, 0x87, 0x85, 0x7e,
+  0x81, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc,
+  0xfc, 0x92, 0x95, 0x92, 0x42, 0x43, 0x42, 0xac,
+  0xaf, 0xac, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x92,
+  0x95, 0x92, 0x6a, 0x6c, 0x6a, 0xdd, 0xe0, 0xdd,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe9, 0xec,
+  0xe9, 0x6e, 0x70, 0x6e, 0xa2, 0xa5, 0xa2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x8b, 0x8e, 0x8b, 0x7b,
+  0x7e, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x88, 0x8a, 0x88, 0x89, 0x8c, 0x89, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa7, 0xaa, 0xa7, 0x58, 0x5a, 0x58,
+  0x50, 0x51, 0x50, 0xb3, 0xb7, 0xb3, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd9, 0xdd, 0xd9, 0x63, 0x65,
+  0x63, 0x9c, 0x9f, 0x9c, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc4, 0xc8, 0xc4, 0x5c, 0x5e, 0x5c,
+  0xd0, 0xd4, 0xd0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x7e, 0x81, 0x7e, 0x89, 0x8c, 0x89, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4,
+  0xba, 0xbd, 0xba, 0xa5, 0xa8, 0xa5, 0xb7, 0xba,
+  0xb7, 0xc0, 0xc4, 0xc0, 0xcf, 0xd3, 0xcf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x84, 0x86, 0x84, 0x78,
+  0x7a, 0x78, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xc7, 0xcb, 0xc7, 0x53, 0x55,
+  0x53, 0x94, 0x97, 0x94, 0x8b, 0x8d, 0x8b, 0x69,
+  0x6b, 0x69, 0xdf, 0xe3, 0xdf, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa1, 0xa4, 0xa1, 0x61, 0x63, 0x61,
+  0xba, 0xbd, 0xba, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9b, 0x9e,
+  0x9b, 0x6e, 0x70, 0x6e, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x7b, 0x7e, 0x7b, 0xa6,
+  0xa9, 0xa6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd6, 0xda, 0xd6, 0x8e, 0x91,
+  0x8e, 0x58, 0x5a, 0x58, 0x5a, 0x5c, 0x5a, 0x72,
+  0x74, 0x72, 0x6f, 0x71, 0x6f, 0x5c, 0x5e, 0x5c,
+  0x53, 0x54, 0x53, 0x90, 0x93, 0x90, 0xed, 0xf0,
+  0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x90, 0x93, 0x90, 0x64, 0x67, 0x64, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbb, 0xbe, 0xbb, 0x56,
+  0x58, 0x56, 0x82, 0x85, 0x82, 0xe4, 0xe8, 0xe4,
+  0xda, 0xde, 0xda, 0x55, 0x58, 0x55, 0xa5, 0xa9,
+  0xa5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7,
+  0xf5, 0x91, 0x94, 0x91, 0x5e, 0x60, 0x5e, 0xb1,
+  0xb4, 0xb1, 0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
+  0xe4, 0xe0, 0x73, 0x76, 0x73, 0x9b, 0x9e, 0x9b,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xdd, 0xe1, 0xdd,
+  0x64, 0x67, 0x64, 0xb8, 0xbc, 0xb8, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd7, 0xdb, 0xd7, 0x95, 0x98, 0x95, 0x5d,
+  0x5f, 0x5d, 0x6a, 0x6d, 0x6a, 0xa7, 0xaa, 0xa7,
+  0xd5, 0xd9, 0xd5, 0xff, 0xff, 0xff, 0xf9, 0xfa,
+  0xf9, 0xd6, 0xda, 0xd6, 0xa5, 0xa8, 0xa5, 0x55,
+  0x57, 0x55, 0xa1, 0xa4, 0xa1, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbc, 0xbf, 0xbc, 0x53,
+  0x55, 0x53, 0xd2, 0xd6, 0xd2, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xca, 0xcd, 0xca,
+  0x66, 0x69, 0x66, 0x75, 0x78, 0x75, 0xe1, 0xe4,
+  0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x90,
+  0x93, 0x90, 0x6e, 0x70, 0x6e, 0xd4, 0xd8, 0xd4,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xe1, 0xe4, 0xe1,
+  0xa1, 0xa4, 0xa1, 0x57, 0x59, 0x57, 0x94, 0x96,
+  0x94, 0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xc5, 0xc8, 0xc5, 0x67, 0x69,
+  0x67, 0xc3, 0xc6, 0xc3, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd2, 0xd6, 0xd2, 0x55, 0x57, 0x55, 0xbf,
+  0xc3, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe9, 0xec, 0xe9, 0xc5,
+  0xc9, 0xc5, 0x9b, 0x9e, 0x9b, 0x6e, 0x70, 0x6e,
+  0x6d, 0x6f, 0x6d, 0xa1, 0xa4, 0xa1, 0xdd, 0xe1,
+  0xdd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x8e, 0x90, 0x8e, 0x6e, 0x70,
+  0x6e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe0, 0xe4, 0xe0, 0x5b, 0x5d, 0x5b, 0x9a, 0x9c,
+  0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7,
+  0xf5, 0x72, 0x74, 0x72, 0x7d, 0x7f, 0x7d, 0xd8,
+  0xdb, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0x61, 0x63,
+  0x61, 0x9d, 0xa0, 0x9d, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa3,
+  0xa7, 0xa3, 0x61, 0x63, 0x61, 0x79, 0x7b, 0x79,
+  0xd5, 0xd8, 0xd5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9a,
+  0x9d, 0x9a, 0x73, 0x76, 0x73, 0xe0, 0xe4, 0xe0,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0xc6, 0xc3,
+  0x59, 0x5b, 0x59, 0xd0, 0xd4, 0xd0, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xe9, 0xec,
+  0xe9, 0xdc, 0xe0, 0xdc, 0xdb, 0xdf, 0xdb, 0xdb,
+  0xdf, 0xdb, 0xdb, 0xdf, 0xdb, 0xdb, 0xdf, 0xdb,
+  0xd8, 0xdc, 0xd8, 0xcd, 0xd0, 0xcd, 0xca, 0xcd,
+  0xca, 0xca, 0xcd, 0xca, 0xca, 0xcd, 0xca, 0xca,
+  0xcd, 0xca, 0xd0, 0xd4, 0xd0, 0xdb, 0xdf, 0xdb,
+  0xdb, 0xdf, 0xdb, 0xdb, 0xdf, 0xdb, 0xdb, 0xdf,
+  0xdb, 0xdb, 0xdf, 0xdb, 0xdb, 0xdf, 0xdb, 0xdb,
+  0xdf, 0xdb, 0xdb, 0xdf, 0xdb, 0xce, 0xd2, 0xce,
+  0xc9, 0xcc, 0xc9, 0xbc, 0xbf, 0xbc, 0xb5, 0xb9,
+  0xb5, 0xaa, 0xad, 0xaa, 0xa7, 0xaa, 0xa7, 0xa4,
+  0xa7, 0xa4, 0x90, 0x93, 0x90, 0x75, 0x77, 0x75,
+  0x68, 0x6a, 0x68, 0x5b, 0x5d, 0x5b, 0x6d, 0x70,
+  0x6d, 0xa0, 0xa3, 0xa0, 0xd3, 0xd6, 0xd3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb3,
+  0xb6, 0xb3, 0x4b, 0x4c, 0x4b, 0xe0, 0xe3, 0xe0,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa3,
+  0xa6, 0xa3, 0x5f, 0x61, 0x5f, 0xd1, 0xd4, 0xd1,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd4,
+  0xd8, 0xd4, 0x85, 0x88, 0x85, 0x77, 0x79, 0x77,
+  0xd9, 0xdd, 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa1, 0xa4, 0xa1, 0x60, 0x62, 0x60,
+  0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcc, 0xcf,
+  0xcc, 0x71, 0x73, 0x71, 0x5c, 0x5d, 0x5c, 0x8b,
+  0x8e, 0x8b, 0xbb, 0xbe, 0xbb, 0xdb, 0xdf, 0xdb,
+  0xe2, 0xe5, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xe0, 0xe3, 0xe0, 0xdc, 0xe0, 0xdc, 0xdc,
+  0xe0, 0xdc, 0xcd, 0xd1, 0xcd, 0xbc, 0xbf, 0xbc,
+  0xaf, 0xb3, 0xaf, 0x5f, 0x60, 0x5f, 0x9c, 0x9e,
+  0x9c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xab, 0xae, 0xab, 0x4b, 0x4d, 0x4b, 0x95,
+  0x98, 0x95, 0x95, 0x98, 0x95, 0x84, 0x86, 0x84,
+  0x7a, 0x7d, 0x7a, 0x7f, 0x81, 0x7f, 0x81, 0x83,
+  0x81, 0x80, 0x83, 0x80, 0x73, 0x75, 0x73, 0x6d,
+  0x6f, 0x6d, 0x65, 0x67, 0x65, 0x5a, 0x5c, 0x5a,
+  0x5c, 0x5f, 0x5c, 0x63, 0x66, 0x63, 0x63, 0x66,
+  0x63, 0x63, 0x66, 0x63, 0x67, 0x6a, 0x67, 0x6c,
+  0x6e, 0x6c, 0x6c, 0x6e, 0x6c, 0x6c, 0x6e, 0x6c,
+  0x6c, 0x6e, 0x6c, 0x6a, 0x6c, 0x6a, 0x64, 0x66,
+  0x64, 0x6d, 0x70, 0x6d, 0x65, 0x67, 0x65, 0x63,
+  0x66, 0x63, 0x63, 0x66, 0x63, 0x63, 0x66, 0x63,
+  0x63, 0x66, 0x63, 0x63, 0x66, 0x63, 0x65, 0x67,
+  0x65, 0x62, 0x64, 0x62, 0x65, 0x67, 0x65, 0x62,
+  0x63, 0x62, 0x5d, 0x5e, 0x5d, 0x5a, 0x5c, 0x5a,
+  0x64, 0x66, 0x64, 0x6d, 0x70, 0x6d, 0x84, 0x86,
+  0x84, 0x8a, 0x8d, 0x8a, 0xa2, 0xa5, 0xa2, 0xc7,
+  0xcb, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xcb, 0xcf, 0xcb, 0x57, 0x59,
+  0x57, 0xd6, 0xda, 0xd6, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0x6b, 0x6e,
+  0x6b, 0x73, 0x75, 0x73, 0xbf, 0xc2, 0xbf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbc, 0xbf, 0xbc, 0x5e, 0x5f, 0x5e, 0x65, 0x67,
+  0x65, 0xd8, 0xdc, 0xd8, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xda, 0xde,
+  0xda, 0x61, 0x62, 0x61, 0xaf, 0xb2, 0xaf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde,
+  0xa1, 0xa4, 0xa1, 0x6b, 0x6e, 0x6b, 0x60, 0x61,
+  0x60, 0x64, 0x66, 0x64, 0x6e, 0x70, 0x6e, 0x86,
+  0x89, 0x86, 0x94, 0x97, 0x94, 0x94, 0x96, 0x94,
+  0x94, 0x96, 0x94, 0x91, 0x94, 0x91, 0x91, 0x94,
+  0x91, 0x91, 0x94, 0x91, 0x93, 0x96, 0x93, 0x92,
+  0x95, 0x92, 0x84, 0x86, 0x84, 0x68, 0x6b, 0x68,
+  0x66, 0x68, 0x66, 0x6e, 0x70, 0x6e, 0x6a, 0x6d,
+  0x6a, 0x60, 0x62, 0x60, 0x50, 0x52, 0x50, 0x4b,
+  0x4c, 0x4b, 0xc7, 0xcb, 0xc7, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x96, 0x99, 0x96,
+  0x43, 0x44, 0x43, 0x6f, 0x72, 0x6f, 0x76, 0x79,
+  0x76, 0x76, 0x78, 0x76, 0x75, 0x78, 0x75, 0x83,
+  0x86, 0x83, 0x8a, 0x8c, 0x8a, 0x94, 0x97, 0x94,
+  0xa5, 0xa8, 0xa5, 0xac, 0xaf, 0xac, 0xab, 0xae,
+  0xab, 0xb2, 0xb5, 0xb2, 0xb8, 0xbb, 0xb8, 0xbf,
+  0xc3, 0xbf, 0xbf, 0xc3, 0xbf, 0xbf, 0xc3, 0xbf,
+  0xc6, 0xca, 0xc6, 0xd4, 0xd8, 0xd4, 0xd7, 0xda,
+  0xd7, 0xd7, 0xda, 0xd7, 0xd7, 0xda, 0xd7, 0xd5,
+  0xd8, 0xd5, 0xc9, 0xcc, 0xc9, 0xca, 0xcd, 0xca,
+  0xc1, 0xc4, 0xc1, 0xbf, 0xc3, 0xbf, 0xbf, 0xc3,
+  0xbf, 0xbf, 0xc3, 0xbf, 0xbf, 0xc3, 0xbf, 0xbf,
+  0xc3, 0xbf, 0xc1, 0xc4, 0xc1, 0xc7, 0xcb, 0xc7,
+  0xd0, 0xd3, 0xd0, 0xd7, 0xda, 0xd7, 0xd7, 0xda,
+  0xd7, 0xd9, 0xdd, 0xd9, 0xde, 0xe2, 0xde, 0xe4,
+  0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd2,
+  0xd6, 0xd2, 0x5a, 0x5c, 0x5a, 0xcb, 0xcf, 0xcb,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc1, 0xc5, 0xc1, 0x70, 0x72, 0x70,
+  0x58, 0x5a, 0x58, 0x7a, 0x7c, 0x7a, 0xa5, 0xa8,
+  0xa5, 0x93, 0x97, 0x93, 0x4f, 0x51, 0x4f, 0x38,
+  0x39, 0x38, 0x63, 0x65, 0x63, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x90, 0x92, 0x90,
+  0x6b, 0x6d, 0x6b, 0xe1, 0xe4, 0xe1, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdd,
+  0xe1, 0xdd, 0xc9, 0xcc, 0xc9, 0xa1, 0xa4, 0xa1,
+  0x99, 0x9b, 0x99, 0x97, 0x9a, 0x97, 0x81, 0x84,
+  0x81, 0x7f, 0x81, 0x7f, 0x7f, 0x81, 0x7f, 0x73,
+  0x76, 0x73, 0x73, 0x76, 0x73, 0x73, 0x76, 0x73,
+  0x7c, 0x7e, 0x7c, 0x87, 0x8a, 0x87, 0x99, 0x9c,
+  0x99, 0x99, 0x9c, 0x99, 0xa4, 0xa7, 0xa4, 0xb1,
+  0xb4, 0xb1, 0xc3, 0xc7, 0xc3, 0xc3, 0xc6, 0xc3,
+  0x70, 0x73, 0x70, 0x7b, 0x7d, 0x7b, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x82, 0x85, 0x82, 0x7d, 0x80, 0x7d, 0xdf,
+  0xe3, 0xdf, 0xf1, 0xf3, 0xf1, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xba, 0xbe, 0xba, 0x52, 0x54,
+  0x52, 0xdb, 0xdf, 0xdb, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc9, 0xcc, 0xc9, 0x87,
+  0x8a, 0x87, 0x63, 0x65, 0x63, 0x52, 0x54, 0x52,
+  0x72, 0x74, 0x72, 0xa5, 0xa8, 0xa5, 0x4e, 0x50,
+  0x4e, 0xd9, 0xdd, 0xd9, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd9, 0xdc, 0xd9, 0x53, 0x55, 0x53, 0xa8,
+  0xab, 0xa8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc4, 0xc8, 0xc4, 0x55, 0x58, 0x55, 0xbc,
+  0xbf, 0xbc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xdd, 0xe1, 0xdd, 0x70, 0x73, 0x70,
+  0xa5, 0xa8, 0xa5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb8, 0xbb, 0xb8, 0x6b,
+  0x6d, 0x6b, 0x7e, 0x81, 0x7e, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd6, 0xda,
+  0xd6, 0x7b, 0x7e, 0x7b, 0x7d, 0x7f, 0x7d, 0xc3,
+  0xc7, 0xc3, 0x52, 0x54, 0x52, 0xc5, 0xc9, 0xc5,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x77, 0x7a, 0x77, 0x75, 0x78, 0x75, 0xf5, 0xf7,
+  0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x96, 0x99, 0x96,
+  0x6c, 0x6e, 0x6c, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xce, 0xd1,
+  0xce, 0x68, 0x6a, 0x68, 0xc0, 0xc3, 0xc0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd4, 0xd7, 0xd4, 0x90, 0x92, 0x90,
+  0x5b, 0x5d, 0x5b, 0x81, 0x84, 0x81, 0xd6, 0xd9,
+  0xd6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xda, 0xde, 0xda, 0x5e, 0x60, 0x5e,
+  0xb4, 0xb7, 0xb4, 0xde, 0xe1, 0xde, 0x58, 0x5a,
+  0x58, 0x9e, 0xa1, 0x9e, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa7, 0xaa, 0xa7, 0x59,
+  0x5b, 0x59, 0xcf, 0xd3, 0xcf, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd9, 0xdc,
+  0xd9, 0x6a, 0x6c, 0x6a, 0x9a, 0x9c, 0x9a, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xb2, 0xb5, 0xb2, 0x69, 0x6b, 0x69,
+  0xd3, 0xd7, 0xd3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf7, 0xf5, 0x9b, 0x9e, 0x9b, 0x60, 0x62,
+  0x60, 0x6b, 0x6e, 0x6b, 0xb8, 0xbb, 0xb8, 0xed,
+  0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0xa3,
+  0xa0, 0x5b, 0x5d, 0x5b, 0xe5, 0xe8, 0xe5, 0xec,
+  0xf0, 0xec, 0x73, 0x75, 0x73, 0x92, 0x95, 0x92,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd4, 0xd7, 0xd4, 0x5d, 0x5e, 0x5d, 0x9f, 0xa2,
+  0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x9a, 0x9d, 0x9a, 0x64, 0x66, 0x64,
+  0xd3, 0xd6, 0xd3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8b, 0x8d,
+  0x8b, 0x73, 0x75, 0x73, 0xf5, 0xf7, 0xf5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xcc, 0xd0, 0xcc, 0x74, 0x76, 0x74, 0x62,
+  0x64, 0x62, 0xa1, 0xa4, 0xa1, 0xe0, 0xe4, 0xe0,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9,
+  0xfa, 0xf9, 0x76, 0x78, 0x76, 0x8c, 0x8e, 0x8c,
+  0xf6, 0xfa, 0xf6, 0xf4, 0xf8, 0xf4, 0x91, 0x94,
+  0x91, 0x82, 0x85, 0x82, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x82,
+  0x85, 0x82, 0x75, 0x78, 0x75, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xe9, 0xec, 0xe9, 0x61, 0x63,
+  0x61, 0x95, 0x98, 0x95, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x75, 0x77, 0x75, 0x87, 0x8a, 0x87,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xf1, 0xf3, 0xf1, 0x7c, 0x7f, 0x7c,
+  0x68, 0x6a, 0x68, 0xd8, 0xdb, 0xd8, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd8, 0xdc, 0xd8, 0x61, 0x63,
+  0x61, 0xae, 0xb0, 0xae, 0xf8, 0xfc, 0xf8, 0xf4,
+  0xf8, 0xf4, 0x91, 0x95, 0x91, 0x79, 0x7b, 0x79,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xb5, 0xb8, 0xb5, 0x56, 0x59,
+  0x56, 0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xac,
+  0xaf, 0xac, 0x59, 0x5c, 0x59, 0xce, 0xd2, 0xce,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0x5d, 0x5f,
+  0x5d, 0xa5, 0xa8, 0xa5, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc6, 0xc9,
+  0xc6, 0x60, 0x62, 0x60, 0xb6, 0xba, 0xb6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb4,
+  0xb7, 0xb4, 0x5f, 0x61, 0x5f, 0xd4, 0xd7, 0xd4,
+  0xf8, 0xfc, 0xf8, 0xe1, 0xe5, 0xe1, 0x6c, 0x6e,
+  0x6c, 0x9f, 0xa2, 0x9f, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd4,
+  0xd8, 0xd4, 0x57, 0x59, 0x57, 0xbc, 0xc0, 0xbc,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd7, 0xdb, 0xd7, 0x61, 0x62, 0x61, 0x9e, 0xa1,
+  0x9e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3,
+  0xc7, 0xc3, 0x56, 0x58, 0x56, 0xce, 0xd1, 0xce,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa0, 0xa3, 0xa0, 0x5a, 0x5b, 0x5a,
+  0xdc, 0xdf, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x93, 0x97, 0x93, 0x70, 0x72,
+  0x70, 0xe4, 0xe7, 0xe4, 0xef, 0xf3, 0xef, 0xa2,
+  0xa6, 0xa2, 0x55, 0x57, 0x55, 0xd5, 0xd8, 0xd5,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6e, 0x71,
+  0x6e, 0x97, 0x9a, 0x97, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa1, 0xa4, 0xa1, 0x5b,
+  0x5d, 0x5b, 0xdb, 0xdf, 0xdb, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xa0, 0xa3, 0xa0, 0x69, 0x6b,
+  0x69, 0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa4, 0xa7,
+  0xa4, 0x5c, 0x5e, 0x5c, 0xdc, 0xdf, 0xdc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x74,
+  0x77, 0x74, 0x85, 0x87, 0x85, 0xec, 0xf0, 0xec,
+  0xbe, 0xc2, 0xbe, 0x55, 0x58, 0x55, 0x8a, 0x8d,
+  0x8a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x97, 0x9a, 0x97, 0x84, 0x86, 0x84,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xdb, 0xde, 0xdb,
+  0x6b, 0x6d, 0x6b, 0x8d, 0x90, 0x8d, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e,
+  0x81, 0x7e, 0x83, 0x86, 0x83, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xb8, 0xbc, 0xb8, 0x68, 0x6a, 0x68,
+  0xd8, 0xdc, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x5b, 0x5d, 0x5b, 0x9b, 0x9e,
+  0x9b, 0xbf, 0xc3, 0xbf, 0x60, 0x62, 0x60, 0x93,
+  0x96, 0x93, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa7, 0xaa,
+  0xa7, 0x69, 0x6b, 0x69, 0xed, 0xf0, 0xed, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x9c, 0x9f, 0x9c, 0x64, 0x65, 0x64, 0xd2,
+  0xd5, 0xd2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe2, 0xdf, 0x64, 0x66, 0x64, 0xa4, 0xa7,
+  0xa4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd0, 0xd3,
+  0xd0, 0x66, 0x68, 0x66, 0xc3, 0xc7, 0xc3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xda, 0xdd, 0xda, 0x4a,
+  0x4c, 0x4a, 0x82, 0x85, 0x82, 0x66, 0x69, 0x66,
+  0x93, 0x95, 0x93, 0xed, 0xf0, 0xed, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa7, 0xaa, 0xa7, 0x65, 0x66, 0x65,
+  0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xed, 0xf0, 0xed, 0x63, 0x65, 0x63,
+  0x93, 0x96, 0x93, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc7, 0xcb, 0xc7, 0x55,
+  0x57, 0x55, 0xc8, 0xcb, 0xc8, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd3, 0xd7, 0xd3, 0x5a, 0x5c, 0x5a,
+  0xb1, 0xb5, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc1, 0xc5, 0xc1, 0x39, 0x3a, 0x39, 0x43, 0x45,
+  0x43, 0x83, 0x85, 0x83, 0xf9, 0xfa, 0xf9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa7, 0xaa,
+  0xa7, 0x68, 0x6b, 0x68, 0xed, 0xf0, 0xed, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc2, 0xc5,
+  0xc2, 0x5e, 0x60, 0x5e, 0xcd, 0xd1, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0x5b, 0x5d, 0x5b, 0xf1, 0xf3,
+  0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xe2,
+  0xdf, 0x6f, 0x71, 0x6f, 0xac, 0xaf, 0xac, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe3, 0xe0, 0xb0,
+  0xb3, 0xb0, 0xb0, 0xb3, 0xb0, 0xf9, 0xfa, 0xf9,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x91, 0x93, 0x91, 0x82, 0x85, 0x82,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xe0, 0xe4, 0xe0, 0xc3, 0xc6, 0xc3,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9d, 0xa0, 0x9d, 0x8f,
+  0x92, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x81, 0x83, 0x81,
+  0x82, 0x84, 0x82, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x74, 0x76,
+  0x74, 0x8f, 0x92, 0x8f, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd5, 0xd9, 0xd5, 0xdc, 0xe0, 0xdc, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x9c, 0xa0, 0x9c, 0x65, 0x67, 0x65, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5,
+  0xf7, 0xf5, 0x6b, 0x6e, 0x6b, 0xab, 0xae, 0xab,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xc6, 0xca, 0xc6,
+  0x58, 0x59, 0x58, 0xd1, 0xd5, 0xd1, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xcd, 0xd0, 0xcd, 0x54, 0x56,
+  0x54, 0xcd, 0xd1, 0xcd, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xfc, 0xfc, 0xfc, 0x70, 0x72, 0x70, 0x99,
+  0x9c, 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0,
+  0xc3, 0xc0, 0x57, 0x58, 0x57, 0xdb, 0xdf, 0xdb,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x98, 0x9b, 0x98, 0x64, 0x66, 0x64, 0xe9, 0xec,
+  0xe9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xa6, 0xa9, 0xa6, 0x62, 0x64,
+  0x62, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc8, 0xcb, 0xc8, 0x52,
+  0x54, 0x52, 0xc5, 0xc9, 0xc5, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8a,
+  0x8c, 0x8a, 0x72, 0x75, 0x72, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x67, 0x6a, 0x67, 0x93, 0x95,
+  0x93, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf3, 0xf1, 0x71, 0x73, 0x71, 0x8c, 0x8e,
+  0x8c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8c,
+  0x8e, 0x8c, 0x6d, 0x6f, 0x6d, 0xe4, 0xe8, 0xe4,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdd, 0xe1, 0xdd, 0x66,
+  0x69, 0x66, 0xa7, 0xaa, 0xa7, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xc3, 0xc6, 0xc3, 0x60, 0x62,
+  0x60, 0xc5, 0xc9, 0xc5, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd2, 0xd6, 0xd2, 0x6a, 0x6c, 0x6a, 0xc0, 0xc4,
+  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xe1, 0xe4,
+  0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdd,
+  0xe1, 0xdd, 0x65, 0x67, 0x65, 0x93, 0x96, 0x93,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc6, 0xca, 0xc6, 0x62,
+  0x64, 0x62, 0xc2, 0xc6, 0xc2, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe4, 0xe0, 0x8d,
+  0x90, 0x8d, 0x71, 0x74, 0x71, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xcc, 0xd0, 0xcc, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x98, 0x9b,
+  0x98, 0x68, 0x6a, 0x68, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x97, 0x9b, 0x97, 0x65, 0x68, 0x65, 0xd6, 0xda,
+  0xd6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xe9, 0xec, 0xe9, 0xbf, 0xc3, 0xbf,
+  0x77, 0x79, 0x77, 0x36, 0x37, 0x36, 0x37, 0x38,
+  0x37, 0xe1, 0xe5, 0xe1, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xaf, 0xb2, 0xaf, 0x58,
+  0x5a, 0x58, 0xb0, 0xb2, 0xb0, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc5, 0xc8, 0xc5, 0x4f, 0x51, 0x4f,
+  0xc5, 0xc8, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xdf, 0xe3, 0xdf, 0x59, 0x5b, 0x59, 0x9f,
+  0xa2, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe3, 0xdf, 0xa3, 0xa6, 0xa3, 0x67, 0x6a,
+  0x67, 0x5d, 0x5e, 0x5d, 0x7f, 0x82, 0x7f, 0x78,
+  0x7a, 0x78, 0x4a, 0x4b, 0x4a, 0xe9, 0xec, 0xe9,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x60, 0x62, 0x60, 0x41, 0x42, 0x41, 0x53, 0x55,
+  0x53, 0xce, 0xd1, 0xce, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7,
+  0xf5, 0x69, 0x6c, 0x69, 0x87, 0x89, 0x87, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xaa, 0xad, 0xaa,
+  0x60, 0x61, 0x60, 0xd8, 0xdc, 0xd8, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xca, 0xcd,
+  0xca, 0xa1, 0xa3, 0xa1, 0x6e, 0x70, 0x6e, 0x5f,
+  0x62, 0x5f, 0x90, 0x92, 0x90, 0xcd, 0xd0, 0xcd,
+  0xff, 0xff, 0xff, 0x9f, 0xa2, 0x9f, 0x66, 0x69,
+  0x66, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc3, 0xc7, 0xc3, 0x52, 0x53, 0x52, 0xa7,
+  0xaa, 0xa7, 0x6f, 0x72, 0x6f, 0x76, 0x78, 0x76,
+  0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xa2, 0xa6, 0xa2,
+  0x57, 0x59, 0x57, 0xda, 0xde, 0xda, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xf3,
+  0xf1, 0x70, 0x72, 0x70, 0x92, 0x95, 0x92, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc9, 0xcc, 0xc9, 0x92,
+  0x95, 0x92, 0x5b, 0x5d, 0x5b, 0x6a, 0x6c, 0x6a,
+  0x8e, 0x91, 0x8e, 0xce, 0xd2, 0xce, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x89,
+  0x8c, 0x89, 0x7a, 0x7c, 0x7a, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x8b, 0x8e, 0x8b,
+  0x79, 0x7b, 0x79, 0xf9, 0xfa, 0xf9, 0xc8, 0xcc,
+  0xc8, 0x5a, 0x5c, 0x5a, 0xa4, 0xa7, 0xa4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd9, 0xdd, 0xd9, 0x57, 0x59, 0x57, 0xb7,
+  0xba, 0xb7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xbf, 0xc2, 0xbf, 0x56, 0x58, 0x56,
+  0xd1, 0xd5, 0xd1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc,
+  0xe1, 0xe5, 0xe1, 0xe1, 0xe5, 0xe1, 0xe1, 0xe5,
+  0xe1, 0xe4, 0xe8, 0xe4, 0xf5, 0xf7, 0xf5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdc, 0xe0, 0xdc, 0xc5,
+  0xc9, 0xc5, 0x9a, 0x9d, 0x9a, 0x69, 0x6b, 0x69,
+  0x5d, 0x5f, 0x5d, 0x6d, 0x6f, 0x6d, 0xb0, 0xb4,
+  0xb0, 0xe0, 0xe4, 0xe0, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf3, 0xf1, 0x77, 0x79, 0x77, 0x91, 0x95,
+  0x91, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xd3,
+  0xcf, 0x58, 0x5a, 0x58, 0xb8, 0xbb, 0xb8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xa5, 0xa8, 0xa5,
+  0x5f, 0x60, 0x5f, 0xc5, 0xc8, 0xc5, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x7c, 0x7f, 0x7c, 0x88, 0x8a, 0x88, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x92,
+  0x8f, 0x68, 0x6a, 0x68, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf,
+  0xe2, 0xdf, 0xb0, 0xb4, 0xb0, 0xd9, 0xdc, 0xd9,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc0, 0xc3, 0xc0, 0xb7, 0xbb, 0xb7, 0x99, 0x9b,
+  0x99, 0x82, 0x84, 0x82, 0x73, 0x76, 0x73, 0x73,
+  0x76, 0x73, 0x73, 0x76, 0x73, 0x76, 0x78, 0x76,
+  0x7b, 0x7d, 0x7b, 0x80, 0x82, 0x80, 0x84, 0x87,
+  0x84, 0x82, 0x85, 0x82, 0x7d, 0x80, 0x7d, 0x8f,
+  0x92, 0x8f, 0x9d, 0xa0, 0x9d, 0xae, 0xb1, 0xae,
+  0xb6, 0xb9, 0xb6, 0xb5, 0xb8, 0xb5, 0xb5, 0xb8,
+  0xb5, 0xb6, 0xb9, 0xb6, 0xbf, 0xc3, 0xbf, 0xc4,
+  0xc7, 0xc4, 0xc8, 0xcb, 0xc8, 0xc8, 0xcb, 0xc8,
+  0xc8, 0xcb, 0xc8, 0xc8, 0xcb, 0xc8, 0xc8, 0xcb,
+  0xc8, 0xc8, 0xcb, 0xc8, 0xc8, 0xcb, 0xc8, 0xc8,
+  0xcb, 0xc8, 0xc8, 0xcb, 0xc8, 0xc4, 0xc7, 0xc4,
+  0xc1, 0xc4, 0xc1, 0xc1, 0xc4, 0xc1, 0xb7, 0xba,
+  0xb7, 0xb5, 0xb8, 0xb5, 0xb6, 0xb9, 0xb6, 0xa3,
+  0xa7, 0xa3, 0x8c, 0x8f, 0x8c, 0x81, 0x84, 0x81,
+  0x64, 0x66, 0x64, 0x5e, 0x60, 0x5e, 0x45, 0x46,
+  0x45, 0x63, 0x64, 0x63, 0xc1, 0xc4, 0xc1, 0xf5,
+  0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd9, 0xdd, 0xd9, 0x69,
+  0x6b, 0x69, 0xab, 0xae, 0xab, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xa1, 0xa4, 0xa1, 0x63, 0x65, 0x63,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xde, 0xe2, 0xde, 0x70, 0x72, 0x70, 0x70,
+  0x72, 0x70, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xac, 0xaf, 0xac, 0x62,
+  0x64, 0x62, 0xd2, 0xd5, 0xd2, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe5,
+  0xe8, 0xe5, 0x69, 0x6b, 0x69, 0x88, 0x8b, 0x88,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x9d, 0xa0, 0x9d, 0x3b, 0x3d,
+  0x3b, 0x9f, 0xa2, 0x9f, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd5, 0xd8, 0xd5, 0x67, 0x69, 0x67, 0x8b,
+  0x8e, 0x8b, 0x7c, 0x7f, 0x7c, 0x9e, 0xa1, 0x9e,
+  0xab, 0xae, 0xab, 0xab, 0xae, 0xab, 0xab, 0xae,
+  0xab, 0xab, 0xae, 0xab, 0xa4, 0xa7, 0xa4, 0x92,
+  0x94, 0x92, 0x88, 0x8a, 0x88, 0x82, 0x84, 0x82,
+  0x73, 0x75, 0x73, 0x77, 0x79, 0x77, 0x7c, 0x7e,
+  0x7c, 0x78, 0x7b, 0x78, 0x69, 0x6b, 0x69, 0x63,
+  0x65, 0x63, 0x5c, 0x5e, 0x5c, 0x50, 0x52, 0x50,
+  0x5b, 0x5d, 0x5b, 0x60, 0x62, 0x60, 0x65, 0x67,
+  0x65, 0x65, 0x67, 0x65, 0x65, 0x67, 0x65, 0x65,
+  0x67, 0x65, 0x65, 0x67, 0x65, 0x64, 0x66, 0x64,
+  0x50, 0x51, 0x50, 0x4d, 0x4e, 0x4d, 0x61, 0x63,
+  0x61, 0x60, 0x62, 0x60, 0x5d, 0x5f, 0x5d, 0x5d,
+  0x5f, 0x5d, 0x58, 0x5a, 0x58, 0x60, 0x62, 0x60,
+  0x68, 0x6a, 0x68, 0x6b, 0x6e, 0x6b, 0x75, 0x77,
+  0x75, 0x83, 0x86, 0x83, 0x9e, 0xa2, 0x9e, 0xc0,
+  0xc4, 0xc0, 0x9e, 0xa1, 0x9e, 0x73, 0x76, 0x73,
+  0xed, 0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xce, 0xd2, 0xce, 0x59, 0x5b, 0x59, 0xb5, 0xb8,
+  0xb5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0x6e, 0x71,
+  0x6e, 0x8c, 0x8f, 0x8c, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbd, 0xc0, 0xbd, 0x50, 0x52, 0x50, 0xad, 0xb1,
+  0xad, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd1, 0xd5, 0xd1, 0x59, 0x5b, 0x59, 0xa5, 0xa8,
+  0xa5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xce, 0xd1, 0xce, 0x63, 0x66,
+  0x63, 0xbb, 0xbe, 0xbb, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe1, 0xe5, 0xe1, 0x59,
+  0x5a, 0x59, 0x3a, 0x3b, 0x3a, 0x83, 0x86, 0x83,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xc8, 0xcb, 0xc8,
+  0x5b, 0x5e, 0x5b, 0xcf, 0xd2, 0xcf, 0xfc, 0xfc,
+  0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc,
+  0xde, 0xe2, 0xde, 0xdb, 0xde, 0xdb, 0xd8, 0xdb,
+  0xd8, 0xd0, 0xd3, 0xd0, 0xd0, 0xd4, 0xd0, 0xd1,
+  0xd4, 0xd1, 0xd1, 0xd4, 0xd1, 0xd1, 0xd4, 0xd1,
+  0xd1, 0xd4, 0xd1, 0xd1, 0xd4, 0xd1, 0xd1, 0xd4,
+  0xd1, 0xcb, 0xcf, 0xcb, 0x62, 0x64, 0x62, 0x76,
+  0x78, 0x76, 0xc8, 0xcb, 0xc8, 0xd1, 0xd4, 0xd1,
+  0xd1, 0xd4, 0xd1, 0xd1, 0xd4, 0xd1, 0xd4, 0xd7,
+  0xd4, 0xd9, 0xdd, 0xd9, 0xdd, 0xe1, 0xdd, 0xe9,
+  0xec, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc8, 0xcb,
+  0xc8, 0x54, 0x56, 0x54, 0xcd, 0xd0, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xca, 0xce, 0xca, 0x63,
+  0x66, 0x63, 0xc4, 0xc7, 0xc4, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xae,
+  0xb1, 0xae, 0x5f, 0x61, 0x5f, 0xca, 0xce, 0xca,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9b,
+  0x9d, 0x9b, 0x60, 0x62, 0x60, 0xda, 0xde, 0xda,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x86,
+  0x89, 0x86, 0x74, 0x77, 0x74, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xad,
+  0xb0, 0xad, 0x67, 0x69, 0x67, 0xd9, 0xdd, 0xd9,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x96, 0x99, 0x96, 0x6b, 0x6d, 0x6b, 0x7f, 0x81,
+  0x7f, 0x62, 0x64, 0x62, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc8, 0xcb, 0xc8, 0x4d, 0x4f, 0x4d, 0xcb,
+  0xce, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x61, 0x62, 0x61, 0x9a, 0x9d, 0x9a, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xe9, 0xec, 0xe9, 0x63, 0x65, 0x63,
+  0xb9, 0xbc, 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb9, 0xbd, 0xb9, 0x6c, 0x6f, 0x6c, 0xd6, 0xda,
+  0xd6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x7c, 0x7e, 0x7c, 0x87, 0x89,
+  0x87, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0x5a, 0x5c,
+  0x5a, 0xa4, 0xa7, 0xa4, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xbc, 0xbf, 0xbc, 0x58, 0x5a,
+  0x58, 0xdc, 0xe0, 0xdc, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x88, 0x8b, 0x88, 0x79, 0x7b,
+  0x79, 0xf2, 0xf3, 0xf2, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd1, 0xd5, 0xd1, 0x5d, 0x5f, 0x5d, 0xb0,
+  0xb3, 0xb0, 0xbb, 0xbe, 0xbb, 0x53, 0x54, 0x53,
+  0xd5, 0xd9, 0xd5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xc8, 0xcb, 0xc8,
+  0x44, 0x46, 0x44, 0xc4, 0xc7, 0xc4, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xfc, 0xfc, 0xfc, 0x5b, 0x5d, 0x5b, 0xa5,
+  0xa8, 0xa5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x67, 0x69, 0x67, 0x9a, 0x9d, 0x9a, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa2, 0xa5, 0xa2, 0x66,
+  0x68, 0x66, 0xde, 0xe2, 0xde, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd8, 0xdb, 0xd8, 0x57,
+  0x59, 0x57, 0xb5, 0xb8, 0xb5, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x8b, 0x8e, 0x8b, 0x79, 0x7c, 0x79,
+  0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdd,
+  0xe1, 0xdd, 0x60, 0x62, 0x60, 0xb1, 0xb4, 0xb1,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0x5e,
+  0x5f, 0x5e, 0xa7, 0xaa, 0xa7, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x93, 0x96, 0x93,
+  0x62, 0x63, 0x62, 0xe1, 0xe5, 0xe1, 0xda, 0xdd,
+  0xda, 0x5e, 0x60, 0x5e, 0xb4, 0xb8, 0xb4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xca, 0xce, 0xca, 0x49, 0x4a, 0x49, 0xc4,
+  0xc7, 0xc4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xd3, 0xcf,
+  0x51, 0x52, 0x51, 0xbd, 0xc0, 0xbd, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x7b, 0x7d, 0x7b,
+  0x85, 0x87, 0x85, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x98, 0x9b, 0x98, 0x6c, 0x6e, 0x6c, 0xe4, 0xe8,
+  0xe4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa1, 0xa3, 0xa1, 0x6a, 0x6b, 0x6a, 0xe2, 0xe5,
+  0xe2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbe, 0xc1,
+  0xbe, 0x5b, 0x5d, 0x5b, 0xba, 0xbd, 0xba, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x91, 0x94,
+  0x91, 0x73, 0x76, 0x73, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd0, 0xd3, 0xd0, 0x52, 0x54, 0x52, 0xc5, 0xc9,
+  0xc5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcc, 0xd0,
+  0xcc, 0x62, 0x64, 0x62, 0xa3, 0xa6, 0xa3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x7b, 0x78,
+  0x87, 0x8a, 0x87, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd3, 0xd6, 0xd3,
+  0x58, 0x5a, 0x58, 0xc4, 0xc7, 0xc4, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xbd, 0xc0, 0xbd, 0x4c, 0x4d, 0x4c, 0xcf,
+  0xd2, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x95, 0x99, 0x95, 0x68, 0x6b, 0x68, 0xe0,
+  0xe4, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x96, 0x99, 0x96, 0x80,
+  0x83, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xdd, 0xe0, 0xdd, 0x5d, 0x5f, 0x5d, 0x9a,
+  0x9d, 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xf9, 0xfa, 0xf9, 0x7b, 0x7e, 0x7b,
+  0x73, 0x75, 0x73, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc7, 0xcb, 0xc7, 0x4a, 0x4c, 0x4a,
+  0xc6, 0xc9, 0xc6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xab, 0xaf, 0xab, 0x5d,
+  0x5f, 0x5d, 0xde, 0xe2, 0xde, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x95, 0x98, 0x95, 0x6a, 0x6c, 0x6a,
+  0xd6, 0xd9, 0xd6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xa0, 0xa4, 0xa0, 0x63, 0x65, 0x63, 0xe1,
+  0xe5, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd7, 0xdb, 0xd7, 0x60, 0x61, 0x60, 0xc4,
+  0xc7, 0xc4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xbb, 0xbe, 0xbb,
+  0x5e, 0x60, 0x5e, 0xd9, 0xdc, 0xd9, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xb2, 0xb4, 0xb2,
+  0x68, 0x6a, 0x68, 0xd5, 0xd9, 0xd5, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x82, 0x84, 0x82, 0x82, 0x84, 0x82, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xbf, 0xbc,
+  0x52, 0x54, 0x52, 0xce, 0xd2, 0xce, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xaf, 0xb3, 0xaf, 0x4b, 0x4d, 0x4b, 0xd8,
+  0xdb, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x5f, 0x60, 0x5f, 0xa6, 0xa9, 0xa6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x7e, 0x80, 0x7e, 0x8a, 0x8d, 0x8a, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xdf, 0xe3, 0xdf, 0x58, 0x5a,
+  0x58, 0x9e, 0xa1, 0x9e, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xba, 0xbe, 0xba,
+  0x55, 0x56, 0x55, 0xd4, 0xd7, 0xd4, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde,
+  0x67, 0x69, 0x67, 0xb7, 0xba, 0xb7, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xa9, 0xac, 0xa9, 0x65, 0x67, 0x65, 0xde,
+  0xe2, 0xde, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc7, 0xca, 0xc7, 0x61, 0x62, 0x61, 0xc3,
+  0xc6, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x79, 0x7b, 0x79, 0x90,
+  0x93, 0x90, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x8f, 0x91, 0x8f, 0x76, 0x78, 0x76, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xdc, 0xe0, 0xdc,
+  0x62, 0x64, 0x62, 0x99, 0x9c, 0x99, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x8a, 0x8c, 0x8a,
+  0x7c, 0x7e, 0x7c, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd4, 0xd8, 0xd4, 0x57, 0x59, 0x57, 0xbe,
+  0xc1, 0xbe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa7,
+  0xaa, 0xa7, 0x63, 0x65, 0x63, 0xdc, 0xdf, 0xdc,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xdf, 0xe3, 0xdf, 0x57, 0x58, 0x57, 0xb5,
+  0xb8, 0xb5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xe9, 0xec, 0xe9, 0x6d, 0x6f, 0x6d, 0xac,
+  0xb0, 0xac, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xa7, 0xaa, 0xa7,
+  0x70, 0x72, 0x70, 0xf1, 0xf3, 0xf1, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd1, 0xd5, 0xd1,
+  0x63, 0x65, 0x63, 0xb8, 0xbc, 0xb8, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x63, 0x66, 0x63, 0x91, 0x94, 0x91, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xdc, 0xdf, 0xdc, 0x6d, 0x6f, 0x6d,
+  0xa5, 0xa9, 0xa5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xab, 0xae, 0xab, 0x61,
+  0x63, 0x61, 0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xae, 0xb1, 0xae, 0x5f, 0x61, 0x5f, 0xd7,
+  0xdb, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xb9, 0xbd, 0xb9,
+  0x54, 0x56, 0x54, 0xdc, 0xdf, 0xdc, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdc, 0xdf, 0xdc, 0x63, 0x65, 0x63, 0x98, 0x9b,
+  0x98, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x6b, 0x6d, 0x6b, 0x95, 0x98, 0x95, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x76, 0x78, 0x76, 0xa6, 0xa9, 0xa6, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xb6, 0xb9, 0xb6, 0x5f, 0x61, 0x5f, 0xd9,
+  0xdd, 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd7, 0xdb, 0xd7, 0x6e, 0x70, 0x6e, 0xba,
+  0xbd, 0xba, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x64, 0x66, 0x64, 0x9c,
+  0x9f, 0x9c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xbf,
+  0xbc, 0x64, 0x66, 0x64, 0xcd, 0xd0, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdb, 0xdf, 0xdb, 0x55, 0x57, 0x55, 0xaf, 0xb2,
+  0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xc2, 0xc6, 0xc2,
+  0x55, 0x57, 0x55, 0xbb, 0xbe, 0xbb, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x91, 0x94, 0x91, 0x67, 0x6a, 0x67, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa2, 0xa5, 0xa2, 0x58,
+  0x5a, 0x58, 0xdc, 0xdf, 0xdc, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x89, 0x8c, 0x89, 0x76,
+  0x78, 0x76, 0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x71, 0x73, 0x71, 0x95,
+  0x98, 0x95, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd5, 0xd8, 0xd5,
+  0x52, 0x54, 0x52, 0xb0, 0xb3, 0xb0, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xd3, 0xcf,
+  0x63, 0x65, 0x63, 0xb9, 0xbc, 0xb9, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x67, 0x69, 0x67, 0xa2, 0xa5, 0xa2, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x98, 0x9b, 0x98, 0x6b, 0x6e, 0x6b,
+  0xe1, 0xe5, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x84,
+  0x87, 0x84, 0x7f, 0x81, 0x7f, 0xfc, 0xfc, 0xfc,
+  0xff, 0xff, 0xff, 0xe5, 0xe8, 0xe5, 0xbc, 0xc0,
+  0xbc, 0x67, 0x69, 0x67, 0x2e, 0x2e, 0x2e, 0x97,
+  0x9a, 0x97, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xf5, 0xf7, 0xf5, 0x76, 0x78, 0x76,
+  0x8e, 0x91, 0x8e, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd8, 0xdc, 0xd8,
+  0x66, 0x69, 0x66, 0x93, 0x96, 0x93, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb3, 0xb6, 0xb3, 0x63, 0x65, 0x63, 0xd2, 0xd5,
+  0xd2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x6b, 0x6d, 0x6b, 0x82, 0x84, 0x82, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x78, 0x7b, 0x78, 0x7a,
+  0x7d, 0x7a, 0xdd, 0xe0, 0xdd, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xaa, 0xad, 0xaa, 0x5c, 0x5e, 0x5c, 0xca,
+  0xcd, 0xca, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x6b, 0x6d, 0x6b, 0xb9,
+  0xbd, 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x75,
+  0x72, 0x8d, 0x90, 0x8d, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xb9, 0xbd, 0xb9, 0x5c, 0x5e,
+  0x5c, 0xab, 0xae, 0xab, 0x97, 0x9a, 0x97, 0x69,
+  0x6b, 0x69, 0x5c, 0x5e, 0x5c, 0x7e, 0x80, 0x7e,
+  0x68, 0x69, 0x68, 0x6e, 0x71, 0x6e, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdc, 0xe0,
+  0xdc, 0x68, 0x6a, 0x68, 0xaf, 0xb2, 0xaf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xa2, 0xa5, 0xa2, 0x60, 0x62, 0x60, 0xce,
+  0xd1, 0xce, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xce, 0xd1, 0xce, 0x62,
+  0x64, 0x62, 0xb8, 0xbb, 0xb8, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x7a, 0x7d, 0x7a, 0x84,
+  0x87, 0x84, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc3, 0xc6, 0xc3, 0x5e, 0x60, 0x5e, 0x8a, 0x8c,
+  0x8a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x70, 0x72, 0x70,
+  0x85, 0x87, 0x85, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde,
+  0x61, 0x63, 0x61, 0xc4, 0xc8, 0xc4, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x67, 0x69, 0x67, 0xac, 0xaf, 0xac,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf,
+  0xe3, 0xdf, 0x69, 0x6a, 0x69, 0x42, 0x44, 0x42,
+  0x62, 0x64, 0x62, 0x99, 0x9b, 0x99, 0xca, 0xcd,
+  0xca, 0xe8, 0xec, 0xe8, 0xa6, 0xa9, 0xa6, 0x53,
+  0x55, 0x53, 0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc3, 0xc7, 0xc3, 0x66, 0x68, 0x66,
+  0xcf, 0xd2, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xf9, 0xfa, 0xf9, 0x61, 0x63, 0x61,
+  0x91, 0x94, 0x91, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe4, 0xe8, 0xe4, 0x6e, 0x70, 0x6e, 0x95, 0x98,
+  0x95, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x8c, 0x8e, 0x8c, 0x87, 0x89, 0x87, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaf,
+  0xb2, 0xaf, 0x59, 0x5b, 0x59, 0xac, 0xaf, 0xac,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x99, 0x9c,
+  0x99, 0x61, 0x63, 0x61, 0xcc, 0xd0, 0xcc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd6, 0xda, 0xd6, 0x56, 0x58, 0x56, 0xc3,
+  0xc7, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xd1, 0xd5, 0xd1, 0x50, 0x52,
+  0x50, 0xc4, 0xc7, 0xc4, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x98, 0x9b,
+  0x98, 0x44, 0x46, 0x44, 0xcb, 0xce, 0xcb, 0xf1,
+  0xf5, 0xf1, 0xf7, 0xfb, 0xf7, 0xf7, 0xfb, 0xf7,
+  0xcb, 0xcf, 0xcb, 0x57, 0x5a, 0x57, 0xd7, 0xda,
+  0xd7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa6, 0xaa,
+  0xa6, 0x68, 0x6b, 0x68, 0xdc, 0xe0, 0xdc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb2, 0xb5,
+  0xb2, 0x59, 0x5b, 0x59, 0xd2, 0xd5, 0xd2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8c,
+  0x8f, 0x8c, 0x6e, 0x71, 0x6e, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x91, 0x94, 0x91, 0x7e,
+  0x81, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xdb, 0xdf, 0xdb, 0x5e, 0x60,
+  0x5e, 0x3a, 0x3b, 0x3a, 0x86, 0x89, 0x86, 0xc1,
+  0xc4, 0xc1, 0xde, 0xe2, 0xde, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0x8b,
+  0x8e, 0x8b, 0x36, 0x38, 0x36, 0x7d, 0x80, 0x7d,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xd2, 0xd6, 0xd2,
+  0x48, 0x4a, 0x48, 0x93, 0x96, 0x93, 0xb4, 0xb7,
+  0xb4, 0xba, 0xbe, 0xba, 0xc6, 0xc9, 0xc6, 0x93,
+  0x96, 0x93, 0x52, 0x54, 0x52, 0xd4, 0xd8, 0xd4,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd4, 0xd7, 0xd4, 0x5a, 0x5c, 0x5a,
+  0xc1, 0xc4, 0xc1, 0xef, 0xf3, 0xef, 0xd6, 0xda,
+  0xd6, 0xed, 0xf1, 0xed, 0xe2, 0xe6, 0xe2, 0x60,
+  0x62, 0x60, 0xaf, 0xb2, 0xaf, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x8e, 0x91, 0x8e, 0x7c, 0x7f, 0x7c,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x7a, 0x7c, 0x7a, 0x8a, 0x8c, 0x8a,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xa0, 0xa3, 0xa0, 0x5e, 0x60,
+  0x5e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0x67, 0x69, 0x67, 0xe1, 0xe5,
+  0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb5,
+  0xb8, 0xb5, 0x4f, 0x50, 0x4f, 0x8d, 0x8f, 0x8d,
+  0x6b, 0x6d, 0x6b, 0x57, 0x59, 0x57, 0x6d, 0x6f,
+  0x6d, 0x92, 0x95, 0x92, 0xa5, 0xa8, 0xa5, 0xa7,
+  0xaa, 0xa7, 0xa0, 0xa3, 0xa0, 0x8a, 0x8d, 0x8a,
+  0x5d, 0x5f, 0x5d, 0x51, 0x53, 0x51, 0x6f, 0x72,
+  0x6f, 0x69, 0x6b, 0x69, 0xdd, 0xe1, 0xdd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xca, 0xcd, 0xca, 0x30, 0x32, 0x30, 0x57,
+  0x58, 0x57, 0x65, 0x67, 0x65, 0x68, 0x6a, 0x68,
+  0x6d, 0x6f, 0x6d, 0x3c, 0x3d, 0x3c, 0x5e, 0x60,
+  0x5e, 0xe9, 0xec, 0xe9, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x7c, 0x7e, 0x7c, 0x89, 0x8c, 0x89, 0xb7,
+  0xbb, 0xb7, 0x5d, 0x60, 0x5d, 0x93, 0x96, 0x93,
+  0xca, 0xcd, 0xca, 0x75, 0x78, 0x75, 0x8d, 0x90,
+  0x8d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x77, 0x79,
+  0x77, 0x82, 0x85, 0x82, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xc8, 0xcb, 0xc8, 0x56, 0x57,
+  0x56, 0xc5, 0xc9, 0xc5, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3,
+  0xc7, 0xc3, 0x51, 0x53, 0x51, 0xcf, 0xd3, 0xcf,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb1, 0xb3, 0xb1, 0x4f,
+  0x51, 0x4f, 0xd6, 0xda, 0xd6, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x96, 0x99, 0x96, 0x6c, 0x6f,
+  0x6c, 0xb1, 0xb4, 0xb1, 0x82, 0x84, 0x82, 0xb2,
+  0xb5, 0xb2, 0xa0, 0xa3, 0xa0, 0x81, 0x84, 0x81,
+  0x65, 0x67, 0x65, 0x66, 0x69, 0x66, 0x71, 0x74,
+  0x71, 0x82, 0x84, 0x82, 0x70, 0x73, 0x70, 0x73,
+  0x76, 0x73, 0xb3, 0xb6, 0xb3, 0x59, 0x5b, 0x59,
+  0xcb, 0xce, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xc8, 0xcb, 0xc8,
+  0x50, 0x53, 0x50, 0xb8, 0xbc, 0xb8, 0xd7, 0xda,
+  0xd7, 0xd7, 0xda, 0xd7, 0xd2, 0xd5, 0xd2, 0x74,
+  0x76, 0x74, 0x79, 0x7c, 0x79, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xb2, 0xb5, 0xb2,
+  0x58, 0x5a, 0x58, 0x73, 0x75, 0x73, 0x53, 0x55,
+  0x53, 0x64, 0x67, 0x64, 0x57, 0x5a, 0x57, 0x46,
+  0x48, 0x46, 0x6e, 0x70, 0x6e, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x73, 0x76, 0x73, 0x9c, 0x9f, 0x9c,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x98,
+  0x9b, 0x98, 0x6e, 0x70, 0x6e, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0x63, 0x65,
+  0x63, 0xab, 0xae, 0xab, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb8, 0xbb, 0xb8, 0x57, 0x59, 0x57, 0xd5, 0xd8,
+  0xd5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7b,
+  0x7d, 0x7b, 0x80, 0x81, 0x80, 0x95, 0x98, 0x95,
+  0x76, 0x79, 0x76, 0xee, 0xf0, 0xee, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa8, 0xab, 0xa8, 0x6f, 0x71, 0x6f, 0xd1, 0xd5,
+  0xd1, 0x5d, 0x5f, 0x5d, 0xa1, 0xa4, 0xa1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xc8, 0xcb, 0xc8, 0x5f, 0x62, 0x5f, 0xd4,
+  0xd8, 0xd4, 0xf0, 0xf4, 0xf0, 0xf4, 0xf8, 0xf4,
+  0xe8, 0xec, 0xe8, 0x73, 0x75, 0x73, 0x9a, 0x9d,
+  0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xe1, 0xe5, 0xe1, 0x48, 0x4a, 0x48, 0x31,
+  0x33, 0x31, 0x85, 0x87, 0x85, 0xe1, 0xe5, 0xe1,
+  0xa1, 0xa4, 0xa1, 0x49, 0x4a, 0x49, 0x74, 0x76,
+  0x74, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x66, 0x68,
+  0x66, 0xaf, 0xb2, 0xaf, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xed, 0xf0, 0xed, 0x71, 0x73, 0x71, 0x91, 0x93,
+  0x91, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x7f, 0x81, 0x7f, 0x83, 0x86, 0x83,
+  0xf9, 0xfa, 0xf9, 0xdb, 0xdf, 0xdb, 0xae, 0xb1,
+  0xae, 0x8d, 0x8f, 0x8d, 0x9f, 0xa2, 0x9f, 0x5c,
+  0x5d, 0x5c, 0xc6, 0xc9, 0xc6, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xa6, 0xa9, 0xa6, 0x58, 0x5a,
+  0x58, 0x5b, 0x5d, 0x5b, 0x92, 0x95, 0x92, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa8, 0xac, 0xa8, 0x68,
+  0x6b, 0x68, 0xc8, 0xcb, 0xc8, 0x56, 0x58, 0x56,
+  0x90, 0x93, 0x90, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xba, 0xbd, 0xba,
+  0x5e, 0x61, 0x5e, 0xb4, 0xb7, 0xb4, 0x96, 0x98,
+  0x96, 0xc9, 0xcc, 0xc9, 0xd9, 0xdd, 0xd9, 0x56,
+  0x58, 0x56, 0xaf, 0xb2, 0xaf, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x6b, 0x6d, 0x6b, 0x20, 0x21, 0x20, 0xa5, 0xa8,
+  0xa5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd3,
+  0xd7, 0xd3, 0xd8, 0xdb, 0xd8, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x5e, 0x5f, 0x5e, 0x91, 0x93, 0x91,
+  0xdc, 0xe0, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcf, 0xd2, 0xcf, 0x5f,
+  0x61, 0x5f, 0xb3, 0xb5, 0xb3, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa9, 0xac,
+  0xa9, 0x40, 0x41, 0x40, 0x71, 0x74, 0x71, 0x60,
+  0x61, 0x60, 0x5f, 0x61, 0x5f, 0x87, 0x89, 0x87,
+  0xbd, 0xc0, 0xbd, 0x50, 0x52, 0x50, 0xa8, 0xab,
+  0xa8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf,
+  0xe3, 0xdf, 0x85, 0x88, 0x85, 0x57, 0x59, 0x57,
+  0xb9, 0xbc, 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc3, 0xc6, 0xc3, 0x57, 0x59, 0x57, 0x61, 0x62,
+  0x61, 0x41, 0x43, 0x41, 0x9e, 0xa1, 0x9e, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xa9, 0xac, 0xa9, 0x5a, 0x5c, 0x5a, 0x69,
+  0x6b, 0x69, 0x35, 0x36, 0x35, 0x72, 0x75, 0x72,
+  0xbc, 0xc0, 0xbc, 0x61, 0x62, 0x61, 0xd1, 0xd5,
+  0xd1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9d, 0xa0, 0x9d, 0x39,
+  0x3a, 0x39, 0xb4, 0xb7, 0xb4, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4f, 0x51,
+  0x4f, 0x34, 0x35, 0x34, 0x54, 0x56, 0x54, 0x80,
+  0x83, 0x80, 0xae, 0xb1, 0xae, 0xcc, 0xd0, 0xcc,
+  0xab, 0xae, 0xab, 0x64, 0x67, 0x64, 0xd4, 0xd8,
+  0xd4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xd1, 0xd4, 0xd1, 0x3a, 0x3b, 0x3a,
+  0x6a, 0x6c, 0x6a, 0xb3, 0xb6, 0xb3, 0xe3, 0xe7,
+  0xe3, 0xf5, 0xf9, 0xf5, 0xed, 0xf1, 0xed, 0x66,
+  0x68, 0x66, 0x9c, 0x9f, 0x9c, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3,
+  0xc6, 0xc3, 0xa9, 0xac, 0xa9, 0xb4, 0xb7, 0xb4,
+  0xe5, 0xe8, 0xe5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xa3, 0xa6, 0xa3,
+  0x23, 0x24, 0x23, 0x4b, 0x4c, 0x4b, 0x9b, 0x9e,
+  0x9b, 0x52, 0x54, 0x52, 0x66, 0x68, 0x66, 0x4b,
+  0x4d, 0x4b, 0xe1, 0xe5, 0xe1, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdb, 0xdf, 0xdb, 0xbf, 0xc2, 0xbf, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x5d, 0x5f, 0x5d, 0x89, 0x8b, 0x89,
+  0x9f, 0xa1, 0x9f, 0x70, 0x72, 0x70, 0x61, 0x63,
+  0x61, 0x57, 0x59, 0x57, 0x4f, 0x51, 0x4f, 0x70,
+  0x72, 0x70, 0xed, 0xf0, 0xed, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xed, 0xf0,
+  0xed, 0x56, 0x57, 0x56, 0xa9, 0xac, 0xa9, 0xf4,
+  0xf8, 0xf4, 0xf7, 0xfb, 0xf7, 0xf7, 0xfb, 0xf7,
+  0xf5, 0xf9, 0xf5, 0x77, 0x79, 0x77, 0x79, 0x7c,
+  0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x91, 0x93, 0x91, 0x19, 0x1a, 0x19, 0x8d,
+  0x90, 0x8d, 0xf1, 0xf3, 0xf1, 0x89, 0x8d, 0x89,
+  0x35, 0x36, 0x35, 0x4d, 0x4f, 0x4d, 0xfc, 0xfc,
+  0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x63, 0x65,
+  0x63, 0xb2, 0xb5, 0xb2, 0xf2, 0xf6, 0xf2, 0xe7,
+  0xeb, 0xe7, 0xd7, 0xda, 0xd7, 0xb3, 0xb6, 0xb3,
+  0x49, 0x4b, 0x49, 0x7e, 0x80, 0x7e, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x74, 0x72,
+  0x90, 0x92, 0x90, 0xe5, 0xe9, 0xe5, 0xb3, 0xb6,
+  0xb3, 0xb3, 0xb7, 0xb3, 0xe7, 0xeb, 0xe7, 0x97,
+  0x9b, 0x97, 0x6f, 0x72, 0x6f, 0xe0, 0xe4, 0xe0,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xac, 0xaf, 0xac,
+  0x64, 0x66, 0x64, 0xd2, 0xd6, 0xd2, 0xff, 0xff,
+  0xff, 0xd2, 0xd5, 0xd2, 0x50, 0x52, 0x50, 0x65,
+  0x67, 0x65, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x66, 0x68, 0x66, 0xaf, 0xb2, 0xaf,
+  0xef, 0xf3, 0xef, 0xe5, 0xe9, 0xe5, 0xf4, 0xf8,
+  0xf4, 0xed, 0xf1, 0xed, 0x67, 0x69, 0x67, 0xa9,
+  0xad, 0xa9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x92, 0x94, 0x92, 0x70, 0x72, 0x70, 0xb9,
+  0xbc, 0xb9, 0x3f, 0x40, 0x3f, 0x44, 0x45, 0x44,
+  0x7e, 0x80, 0x7e, 0x98, 0x9a, 0x98, 0x58, 0x5a,
+  0x58, 0xca, 0xcd, 0xca, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa5, 0xa8, 0xa5, 0xa7, 0xaa, 0xa7, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x69, 0x6b,
+  0x69, 0xa1, 0xa4, 0xa1, 0xb9, 0xbc, 0xb9, 0x72,
+  0x73, 0x72, 0xca, 0xcd, 0xca, 0xe0, 0xe4, 0xe0,
+  0x57, 0x59, 0x57, 0xb7, 0xbb, 0xb7, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xb6, 0xb9, 0xb6,
+  0x5d, 0x5f, 0x5d, 0x76, 0x78, 0x76, 0x56, 0x58,
+  0x56, 0xa7, 0xaa, 0xa7, 0x6c, 0x6e, 0x6c, 0x42,
+  0x44, 0x42, 0x47, 0x48, 0x47, 0xc1, 0xc5, 0xc1,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x77, 0x7a, 0x77, 0x8b, 0x8e, 0x8b,
+  0x6a, 0x6c, 0x6a, 0x2a, 0x2a, 0x2a, 0x81, 0x83,
+  0x81, 0xbf, 0xc3, 0xbf, 0x57, 0x59, 0x57, 0xca,
+  0xcd, 0xca, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xd3, 0xd6, 0xd3, 0x59, 0x5a, 0x59, 0x34,
+  0x35, 0x34, 0x99, 0x9c, 0x99, 0xff, 0xff, 0xff,
+  0xd4, 0xd7, 0xd4, 0x6a, 0x6d, 0x6a, 0x3a, 0x3c,
+  0x3a, 0xa8, 0xab, 0xa8, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x75, 0x77,
+  0x75, 0x4a, 0x4b, 0x4a, 0x4b, 0x4d, 0x4b, 0x95,
+  0x98, 0x95, 0x5b, 0x5c, 0x5b, 0x78, 0x7a, 0x78,
+  0x5a, 0x5c, 0x5a, 0xdd, 0xe0, 0xdd, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0xf3, 0xf2,
+  0x67, 0x6a, 0x67, 0x31, 0x32, 0x31, 0xd4, 0xd7,
+  0xd4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xc6, 0xc9, 0xc6, 0xe1, 0xe5, 0xe1,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0x6a, 0x6d, 0x6a, 0x1e, 0x1f, 0x1e,
+  0x7d, 0x7f, 0x7d, 0xde, 0xe2, 0xde, 0x76, 0x78,
+  0x76, 0x30, 0x31, 0x30, 0x64, 0x65, 0x64, 0xed,
+  0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa6, 0xaa, 0xa6, 0x7f,
+  0x82, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x6b,
+  0x6a, 0x37, 0x39, 0x37, 0xc1, 0xc4, 0xc1, 0xff,
+  0xff, 0xff, 0xb2, 0xb6, 0xb2, 0x2c, 0x2d, 0x2c,
+  0x7f, 0x81, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xbf, 0xc3, 0xbf, 0xaf, 0xb2, 0xaf,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xba, 0xbd, 0xba, 0xd1, 0xd4, 0xd1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29,
+  0x67, 0x65, 0x67, 0x6c, 0x2d, 0x32, 0x2e, 0x70,
+  0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x98, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x64, 0x6b, 0x50, 0x00, 0x00, 0xd6, 0x98,
+  0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x02, 0x10,
+  0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x68,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc5, 0xc9, 0xc5, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf9, 0xfa, 0xf9, 0xff,
+  0x74, 0x77, 0x74, 0xff, 0x56, 0x58, 0x56, 0xff,
+  0xc3, 0xc6, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x97, 0x9a, 0x97, 0xff, 0x21, 0x21, 0x21, 0xff,
+  0x3c, 0x3d, 0x3c, 0xff, 0xaa, 0xad, 0xaa, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0x8e, 0x91, 0x8e, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0x27, 0x27, 0x27, 0xff, 0x43, 0x44, 0x43, 0xff,
+  0x9e, 0xa2, 0x9e, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x96, 0x99, 0x96, 0xff, 0x1c, 0x1d, 0x1c, 0xff,
+  0x8c, 0x8e, 0x8c, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xba, 0xbe, 0xba, 0xff,
+  0x49, 0x4b, 0x49, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0x49, 0x4a, 0x49, 0xff, 0xb0, 0xb3, 0xb0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x8a, 0x8c, 0x8a, 0xff, 0x2d, 0x2e, 0x2d, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0xdf, 0xe3, 0xdf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x6c, 0x6f, 0x6c, 0xff, 0x6e, 0x71, 0x6e, 0xff,
+  0x87, 0x8a, 0x87, 0xff, 0x59, 0x5b, 0x59, 0xff,
+  0xbf, 0xc2, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0x78, 0x7a, 0x78, 0xff, 0x5c, 0x5d, 0x5c, 0xff,
+  0x4b, 0x4d, 0x4b, 0xff, 0xc8, 0xcb, 0xc8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xac, 0xaf, 0xac, 0xff, 0x5a, 0x5c, 0x5a, 0xff,
+  0xc1, 0xc5, 0xc1, 0xff, 0x8a, 0x8d, 0x8a, 0xff,
+  0x60, 0x62, 0x60, 0xff, 0xcd, 0xd0, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdf, 0xe2, 0xdf, 0xff,
+  0x60, 0x62, 0x60, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0x56, 0x58, 0x56, 0xff, 0xa9, 0xac, 0xa9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd9, 0xdd, 0xd9, 0xff, 0x5f, 0x61, 0x5f, 0xff,
+  0x97, 0x9a, 0x97, 0xff, 0xd5, 0xd8, 0xd5, 0xff,
+  0x66, 0x68, 0x66, 0xff, 0x86, 0x89, 0x86, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0xff,
+  0x68, 0x6a, 0x68, 0xff, 0x9d, 0xa0, 0x9d, 0xff,
+  0x6a, 0x6c, 0x6a, 0xff, 0x90, 0x93, 0x90, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x8e, 0x90, 0x8e, 0xff,
+  0x6e, 0x71, 0x6e, 0xff, 0xec, 0xf0, 0xec, 0xff,
+  0xa8, 0xab, 0xa8, 0xff, 0x56, 0x59, 0x56, 0xff,
+  0xde, 0xe2, 0xde, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0xff,
+  0x6f, 0x71, 0x6f, 0xff, 0xaf, 0xb2, 0xaf, 0xff,
+  0x75, 0x78, 0x75, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc5, 0xc9, 0xc5, 0xff,
+  0x51, 0x54, 0x51, 0xff, 0xc8, 0xcc, 0xc8, 0xff,
+  0xde, 0xe2, 0xde, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xa9, 0xac, 0xa9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xce, 0xd2, 0xce, 0xff,
+  0x6a, 0x6c, 0x6a, 0xff, 0xc3, 0xc7, 0xc3, 0xff,
+  0x79, 0x7b, 0x79, 0xff, 0x74, 0x76, 0x74, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xf0, 0xed, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x8d, 0x8f, 0x8d, 0xff,
+  0xeb, 0xef, 0xeb, 0xff, 0x98, 0x9b, 0x98, 0xff,
+  0x69, 0x6b, 0x69, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb9, 0xbc, 0xb9, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0xd0, 0xd3, 0xd0, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0x8c, 0x8e, 0x8c, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9a, 0x9d, 0x9a, 0xff, 0x60, 0x61, 0x60, 0xff,
+  0xe3, 0xe6, 0xe3, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0x57, 0x59, 0x57, 0xff, 0xc4, 0xc7, 0xc4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x92, 0x94, 0x92, 0xff,
+  0x71, 0x73, 0x71, 0xff, 0xd5, 0xd9, 0xd5, 0xff,
+  0x61, 0x64, 0x61, 0xff, 0xa3, 0xa6, 0xa3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd0, 0xd3, 0xd0, 0xff, 0x54, 0x55, 0x54, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x70, 0x72, 0x70, 0xff, 0x91, 0x94, 0x91, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0x92, 0x94, 0x92, 0xff, 0xd8, 0xdb, 0xd8, 0xff,
+  0x51, 0x52, 0x51, 0xff, 0xb1, 0xb4, 0xb1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0x59, 0x5b, 0x59, 0xff,
+  0xb4, 0xb7, 0xb4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9b, 0x9e, 0x9b, 0xff, 0x5f, 0x61, 0x5f, 0xff,
+  0xd6, 0xda, 0xd6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9e, 0xa0, 0x9e, 0xff, 0x59, 0x5b, 0x59, 0xff,
+  0xcd, 0xd1, 0xcd, 0xff, 0xca, 0xce, 0xca, 0xff,
+  0x57, 0x59, 0x57, 0xff, 0xc7, 0xca, 0xc7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0xb4, 0xb7, 0xb4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc7, 0xcb, 0xc7, 0xff, 0x5f, 0x60, 0x5f, 0xff,
+  0xbb, 0xbd, 0xbb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbb, 0xbf, 0xbb, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xeb, 0xef, 0xeb, 0xff, 0x9b, 0x9d, 0x9b, 0xff,
+  0x70, 0x72, 0x70, 0xff, 0xe9, 0xec, 0xe9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0xbc, 0xc0, 0xbc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc0, 0xc3, 0xc0, 0xff,
+  0xdf, 0xe3, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa4, 0xa7, 0xa4, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0xa8, 0xab, 0xa8, 0xff, 0xf2, 0xf6, 0xf2, 0xff,
+  0xe0, 0xe4, 0xe0, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0xa7, 0xa9, 0xa7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf9, 0xfa, 0xf9, 0xff, 0xed, 0xef, 0xed, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb6, 0xb9, 0xb6, 0xff, 0x61, 0x64, 0x61, 0xff,
+  0xdc, 0xe0, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xed, 0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xee, 0xf0, 0xee, 0xff, 0x98, 0x9b, 0x98, 0xff,
+  0x57, 0x59, 0x57, 0xff, 0xa8, 0xab, 0xa8, 0xff,
+  0xed, 0xf1, 0xed, 0xff, 0xf4, 0xf8, 0xf4, 0xff,
+  0xb1, 0xb4, 0xb1, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0xd7, 0xdb, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdd, 0xdf, 0xdd, 0xff, 0xae, 0xb1, 0xae, 0xff,
+  0xc7, 0xc9, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xba, 0xbe, 0xba, 0xff, 0xa3, 0xa6, 0xa3, 0xff,
+  0xee, 0xf2, 0xee, 0xff, 0xe1, 0xe4, 0xe1, 0xff,
+  0x82, 0x85, 0x82, 0xff, 0x80, 0x83, 0x80, 0xff,
+  0xba, 0xbd, 0xba, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdf, 0xe3, 0xdf, 0xff,
+  0x95, 0x97, 0x95, 0xff, 0xc5, 0xc8, 0xc5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdd, 0xe0, 0xdd, 0xff,
+  0x85, 0x88, 0x85, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0xa9, 0xab, 0xa9, 0xff, 0xec, 0xf0, 0xec, 0xff,
+  0xf8, 0xfc, 0xf8, 0xff, 0xe3, 0xe7, 0xe3, 0xff,
+  0x76, 0x78, 0x76, 0xff, 0x7d, 0x80, 0x7d, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xd2, 0xd5, 0xd2, 0xff, 0x4d, 0x4f, 0x4d, 0xff,
+  0x85, 0x87, 0x85, 0xff, 0xd8, 0xd9, 0xd8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdc, 0xe0, 0xdc, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xac, 0xae, 0xac, 0xff, 0x9f, 0xa2, 0x9f, 0xff,
+  0xae, 0xb1, 0xae, 0xff, 0x7b, 0x7d, 0x7b, 0xff,
+  0x54, 0x56, 0x54, 0xff, 0xb6, 0xb9, 0xb6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe4, 0xe0, 0xff,
+  0x7a, 0x7c, 0x7a, 0xff, 0x5d, 0x5f, 0x5d, 0xff,
+  0x9d, 0xa0, 0x9d, 0xff, 0xcc, 0xd0, 0xcc, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0xc5, 0xc9, 0xc5, 0xff,
+  0xf3, 0xf6, 0xf3, 0xff, 0xf8, 0xfc, 0xf8, 0xff,
+  0xee, 0xf2, 0xee, 0xff, 0x92, 0x95, 0x92, 0xff,
+  0x59, 0x5b, 0x59, 0xff, 0xc2, 0xc6, 0xc2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xee, 0xef, 0xee, 0xff, 0xf6, 0xf6, 0xf6, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0x61, 0x63, 0x61, 0xff,
+  0x57, 0x58, 0x57, 0xff, 0x9f, 0xa2, 0x9f, 0xff,
+  0xee, 0xee, 0xee, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbe, 0xc1, 0xbe, 0xff,
+  0x84, 0x87, 0x84, 0xff, 0xc5, 0xc9, 0xc5, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0x98, 0x9b, 0x98, 0xff,
+  0xf5, 0xf9, 0xf5, 0xff, 0xe3, 0xe7, 0xe3, 0xff,
+  0x60, 0x61, 0x60, 0xff, 0x4d, 0x4f, 0x4d, 0xff,
+  0xaa, 0xad, 0xaa, 0xff, 0xef, 0xf3, 0xef, 0xff,
+  0xe9, 0xed, 0xe9, 0xff, 0xa0, 0xa3, 0xa0, 0xff,
+  0x4f, 0x51, 0x4f, 0xff, 0xd6, 0xd9, 0xd6, 0xff,
+  0xed, 0xf1, 0xed, 0xff, 0xf6, 0xfa, 0xf6, 0xff,
+  0xf4, 0xf8, 0xf4, 0xff, 0xdd, 0xe1, 0xdd, 0xff,
+  0x99, 0x9c, 0x99, 0xff, 0x4e, 0x50, 0x4e, 0xff,
+  0xa2, 0xa5, 0xa2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcc, 0xcd, 0xcc, 0xff,
+  0xa1, 0xa3, 0xa1, 0xff, 0xa7, 0xaa, 0xa7, 0xff,
+  0xbf, 0xc2, 0xbf, 0xff, 0x5e, 0x60, 0x5e, 0xff,
+  0x6c, 0x6e, 0x6c, 0xff, 0x85, 0x88, 0x85, 0xff,
+  0xb2, 0xb4, 0xb2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc6, 0xc9, 0xc6, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0x8c, 0x8f, 0x8c, 0xff, 0xc6, 0xca, 0xc6, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xbb, 0xbe, 0xbb, 0xff,
+  0xf8, 0xfc, 0xf8, 0xff, 0xeb, 0xef, 0xeb, 0xff,
+  0x70, 0x72, 0x70, 0xff, 0x1f, 0x1f, 0x1f, 0xff,
+  0x99, 0x9c, 0x99, 0xff, 0xf1, 0xf5, 0xf1, 0xff,
+  0xf8, 0xfc, 0xf8, 0xff, 0xce, 0xd1, 0xce, 0xff,
+  0x55, 0x57, 0x55, 0xff, 0xcc, 0xd0, 0xcc, 0xff,
+  0xf7, 0xfb, 0xf7, 0xff, 0xe7, 0xeb, 0xe7, 0xff,
+  0xaa, 0xac, 0xaa, 0xff, 0x6c, 0x6e, 0x6c, 0xff,
+  0x56, 0x58, 0x56, 0xff, 0xa5, 0xa8, 0xa5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf5, 0xf5, 0xff, 0x9b, 0x9d, 0x9b, 0xff,
+  0x45, 0x46, 0x45, 0xff, 0x67, 0x69, 0x67, 0xff,
+  0x6b, 0x6d, 0x6b, 0xff, 0x63, 0x66, 0x63, 0xff,
+  0xb6, 0xb9, 0xb6, 0xff, 0x8b, 0x8d, 0x8b, 0xff,
+  0x8b, 0x8e, 0x8b, 0xff, 0xc2, 0xc4, 0xc2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdc, 0xdf, 0xdc, 0xff,
+  0x72, 0x74, 0x72, 0xff, 0x8f, 0x92, 0x8f, 0xff,
+  0xe5, 0xe8, 0xe5, 0xff, 0xdb, 0xde, 0xdb, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0xa7, 0xab, 0xa7, 0xff,
+  0xf0, 0xf4, 0xf0, 0xff, 0xc5, 0xc8, 0xc5, 0xff,
+  0x4a, 0x4c, 0x4a, 0xff, 0x2b, 0x2b, 0x2b, 0xff,
+  0xaa, 0xad, 0xaa, 0xff, 0xf0, 0xf4, 0xf0, 0xff,
+  0xf6, 0xfa, 0xf6, 0xff, 0xcc, 0xd0, 0xcc, 0xff,
+  0x55, 0x57, 0x55, 0xff, 0xbd, 0xc1, 0xbd, 0xff,
+  0xb1, 0xb4, 0xb1, 0xff, 0x6e, 0x6f, 0x6e, 0xff,
+  0x59, 0x5a, 0x59, 0xff, 0x8d, 0x8f, 0x8d, 0xff,
+  0xcb, 0xcf, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf3, 0xf1, 0xff, 0xa8, 0xab, 0xa8, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0x7d, 0x7f, 0x7d, 0xff,
+  0x40, 0x42, 0x40, 0xff, 0x62, 0x64, 0x62, 0xff,
+  0xbb, 0xbe, 0xbb, 0xff, 0xd2, 0xd5, 0xd2, 0xff,
+  0x7e, 0x80, 0x7e, 0xff, 0x99, 0x9b, 0x99, 0xff,
+  0xdc, 0xdd, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd2, 0xd6, 0xd2, 0xff, 0x76, 0x79, 0x76, 0xff,
+  0x7f, 0x82, 0x7f, 0xff, 0xe0, 0xe3, 0xe0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xf0, 0xed, 0xff,
+  0x6d, 0x70, 0x6d, 0xff, 0x76, 0x79, 0x76, 0xff,
+  0x94, 0x97, 0x94, 0xff, 0x5d, 0x5f, 0x5d, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x68, 0x6b, 0x68, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0xa3, 0xa6, 0xa3, 0xff,
+  0xbc, 0xbf, 0xbc, 0xff, 0x88, 0x8b, 0x88, 0xff,
+  0x47, 0x49, 0x47, 0xff, 0xad, 0xb0, 0xad, 0xff,
+  0x76, 0x79, 0x76, 0xff, 0x87, 0x8a, 0x87, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcb, 0xcd, 0xcb, 0xff,
+  0x84, 0x86, 0x84, 0xff, 0x8a, 0x8d, 0x8a, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x97, 0x99, 0x97, 0xff,
+  0xea, 0xee, 0xea, 0xff, 0xed, 0xf1, 0xed, 0xff,
+  0xaf, 0xb2, 0xaf, 0xff, 0x79, 0x7b, 0x79, 0xff,
+  0x9c, 0x9f, 0x9c, 0xff, 0xf2, 0xf2, 0xf2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0x74, 0x76, 0x74, 0xff, 0x73, 0x75, 0x73, 0xff,
+  0xd9, 0xdd, 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0x58, 0x5a, 0x58, 0xff,
+  0x6b, 0x6d, 0x6b, 0xff, 0x9a, 0x9d, 0x9a, 0xff,
+  0xd6, 0xd9, 0xd6, 0xff, 0xd7, 0xda, 0xd7, 0xff,
+  0x8d, 0x90, 0x8d, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0x62, 0x64, 0x62, 0xff, 0x54, 0x56, 0x54, 0xff,
+  0x3f, 0x40, 0x3f, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0xd7, 0xdb, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xed, 0xed, 0xff,
+  0x96, 0x99, 0x96, 0xff, 0x7b, 0x7e, 0x7b, 0xff,
+  0xc3, 0xc7, 0xc3, 0xff, 0xec, 0xf0, 0xec, 0xff,
+  0xeb, 0xef, 0xeb, 0xff, 0xc2, 0xc5, 0xc2, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0x75, 0x77, 0x75, 0xff,
+  0x80, 0x83, 0x80, 0xff, 0xb8, 0xba, 0xb8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0x68, 0x6a, 0x68, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xcc, 0xd0, 0xcc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xc6, 0xca, 0xc6, 0xff, 0x8c, 0x8f, 0x8c, 0xff,
+  0x36, 0x36, 0x36, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0xda, 0xde, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc3, 0xc4, 0xc3, 0xff, 0x70, 0x72, 0x70, 0xff,
+  0xb1, 0xb4, 0xb1, 0xff, 0xe5, 0xe8, 0xe5, 0xff,
+  0xa9, 0xab, 0xa9, 0xff, 0x7b, 0x7d, 0x7b, 0xff,
+  0x85, 0x88, 0x85, 0xff, 0xb1, 0xb3, 0xb1, 0xff,
+  0x80, 0x82, 0x80, 0xff, 0x8e, 0x91, 0x8e, 0xff,
+  0xce, 0xd0, 0xce, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0x6f, 0x71, 0x6f, 0xff, 0x63, 0x65, 0x63, 0xff,
+  0xcb, 0xcf, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa3, 0xa7, 0xa3, 0xff, 0x56, 0x59, 0x56, 0xff,
+  0x8d, 0x90, 0x8d, 0xff, 0x59, 0x5c, 0x59, 0xff,
+  0xac, 0xaf, 0xac, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf6, 0xf7, 0xf6, 0xff, 0x85, 0x87, 0x85, 0xff,
+  0x7b, 0x7d, 0x7b, 0xff, 0x81, 0x83, 0x81, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0x83, 0x85, 0x83, 0xff,
+  0xca, 0xcb, 0xca, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd3, 0xd4, 0xd3, 0xff, 0x6b, 0x6e, 0x6b, 0xff,
+  0x9b, 0x9e, 0x9b, 0xff, 0xe7, 0xe8, 0xe7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0x79, 0x7b, 0x79, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0xcd, 0xd1, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc4, 0xc7, 0xc4, 0xff,
+  0x4f, 0x51, 0x4f, 0xff, 0x8d, 0x8f, 0x8d, 0xff,
+  0xe1, 0xe5, 0xe1, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0x7a, 0x7d, 0x7a, 0xff, 0xf1, 0xf3, 0xf1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf3, 0xf3, 0xf3, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0x3f, 0x40, 0x3f, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0x98, 0x99, 0x98, 0xff, 0xe5, 0xe5, 0xe5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xad, 0xae, 0xad, 0xff,
+  0x7a, 0x7d, 0x7a, 0xff, 0xbe, 0xc1, 0xbe, 0xff,
+  0xfa, 0xfb, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x96, 0x99, 0x96, 0xff, 0x65, 0x68, 0x65, 0xff,
+  0xc3, 0xc7, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd1, 0xd5, 0xd1, 0xff, 0x6b, 0x6d, 0x6b, 0xff,
+  0x8f, 0x92, 0x8f, 0xff, 0xf1, 0xf3, 0xf1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbb, 0xbe, 0xbb, 0xff,
+  0x63, 0x66, 0x63, 0xff, 0xc8, 0xcb, 0xc8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc9, 0xca, 0xc9, 0xff,
+  0x6d, 0x70, 0x6d, 0xff, 0x88, 0x8b, 0x88, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x89, 0x8b, 0x89, 0xff, 0x93, 0x95, 0x93, 0xff,
+  0xda, 0xdd, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb0, 0xb4, 0xb0, 0xff,
+  0x4d, 0x4f, 0x4d, 0xff, 0xad, 0xb0, 0xad, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcd, 0xd1, 0xcd, 0xff,
+  0x68, 0x6a, 0x68, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0x72, 0x74, 0x72, 0xff, 0x8d, 0x8f, 0x8d, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0x8a, 0x8c, 0x8a, 0xff, 0x95, 0x97, 0x95, 0xff,
+  0xf0, 0xf1, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf7, 0xf8, 0xf7, 0xff,
+  0xc9, 0xcd, 0xc9, 0xff, 0x60, 0x61, 0x60, 0xff,
+  0xaf, 0xb2, 0xaf, 0xff, 0xeb, 0xed, 0xeb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd2, 0xd5, 0xd2, 0xff, 0x62, 0x64, 0x62, 0xff,
+  0x9f, 0xa2, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x7b, 0x7e, 0x7b, 0xff,
+  0x67, 0x69, 0x67, 0xff, 0xc7, 0xcb, 0xc7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa0, 0xa3, 0xa0, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0xdf, 0xe3, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf3, 0xf2, 0xff,
+  0xb0, 0xb3, 0xb0, 0xff, 0x63, 0x65, 0x63, 0xff,
+  0xd2, 0xd3, 0xd2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe2, 0xe4, 0xe2, 0xff, 0x9a, 0x9c, 0x9a, 0xff,
+  0x6b, 0x6c, 0x6b, 0xff, 0xd7, 0xdb, 0xd7, 0xff,
+  0xfb, 0xfc, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x96, 0x98, 0x96, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x99, 0x9c, 0x99, 0xff, 0x5c, 0x5e, 0x5c, 0xff,
+  0xc5, 0xc9, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xcf, 0xd2, 0xcf, 0xff, 0x52, 0x54, 0x52, 0xff,
+  0xb2, 0xb5, 0xb2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xcb, 0xcc, 0xcb, 0xff, 0x7e, 0x80, 0x7e, 0xff,
+  0x9f, 0xa1, 0x9f, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcc, 0xce, 0xcc, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0xa5, 0xa7, 0xa5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x85, 0x87, 0x85, 0xff, 0x7e, 0x81, 0x7e, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0x92, 0x95, 0x92, 0xff,
+  0x42, 0x43, 0x42, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x92, 0x95, 0x92, 0xff,
+  0x6a, 0x6c, 0x6a, 0xff, 0xdd, 0xe0, 0xdd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0x8f, 0x91, 0x8f, 0xff,
+  0x8f, 0x92, 0x8f, 0xff, 0xd9, 0xdc, 0xd9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf3, 0xf2, 0xff,
+  0xac, 0xaf, 0xac, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0xca, 0xcb, 0xca, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x88, 0x8a, 0x88, 0xff, 0x89, 0x8c, 0x89, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x58, 0x5a, 0x58, 0xff,
+  0x50, 0x51, 0x50, 0xff, 0xb3, 0xb7, 0xb3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd9, 0xdd, 0xd9, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0x9c, 0x9f, 0x9c, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf4, 0xf4, 0xf4, 0xff, 0xbb, 0xbe, 0xbb, 0xff,
+  0x6d, 0x6f, 0x6d, 0xff, 0xcc, 0xce, 0xcc, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd5, 0xd6, 0xd5, 0xff, 0x85, 0x88, 0x85, 0xff,
+  0x88, 0x8b, 0x88, 0xff, 0xf4, 0xf4, 0xf4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0xba, 0xbd, 0xba, 0xff, 0xa5, 0xa8, 0xa5, 0xff,
+  0xb7, 0xba, 0xb7, 0xff, 0xc0, 0xc4, 0xc0, 0xff,
+  0xcf, 0xd3, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x84, 0x86, 0x84, 0xff, 0x78, 0x7a, 0x78, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc7, 0xcb, 0xc7, 0xff,
+  0x53, 0x55, 0x53, 0xff, 0x94, 0x97, 0x94, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0xdf, 0xe3, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0x61, 0x63, 0x61, 0xff,
+  0xba, 0xbd, 0xba, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd1, 0xd2, 0xd1, 0xff,
+  0x88, 0x8b, 0x88, 0xff, 0xa0, 0xa3, 0xa0, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbd, 0xbf, 0xbd, 0xff,
+  0x7c, 0x7f, 0x7c, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd6, 0xda, 0xd6, 0xff,
+  0x8e, 0x91, 0x8e, 0xff, 0x58, 0x5a, 0x58, 0xff,
+  0x5a, 0x5c, 0x5a, 0xff, 0x72, 0x74, 0x72, 0xff,
+  0x6f, 0x71, 0x6f, 0xff, 0x5c, 0x5e, 0x5c, 0xff,
+  0x53, 0x54, 0x53, 0xff, 0x90, 0x93, 0x90, 0xff,
+  0xed, 0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0x64, 0x67, 0x64, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbb, 0xbe, 0xbb, 0xff, 0x56, 0x58, 0x56, 0xff,
+  0x82, 0x85, 0x82, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xda, 0xde, 0xda, 0xff, 0x55, 0x58, 0x55, 0xff,
+  0xa5, 0xa9, 0xa5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0x91, 0x94, 0x91, 0xff,
+  0x5e, 0x60, 0x5e, 0xff, 0xb1, 0xb4, 0xb1, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe4, 0xe0, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0x9b, 0x9e, 0x9b, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0xff,
+  0x64, 0x67, 0x64, 0xff, 0xb8, 0xbc, 0xb8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd7, 0xdb, 0xd7, 0xff,
+  0x95, 0x98, 0x95, 0xff, 0x5d, 0x5f, 0x5d, 0xff,
+  0x6a, 0x6d, 0x6a, 0xff, 0xa7, 0xaa, 0xa7, 0xff,
+  0xd5, 0xd9, 0xd5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf9, 0xfa, 0xf9, 0xff, 0xd6, 0xda, 0xd6, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0x55, 0x57, 0x55, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbc, 0xbf, 0xbc, 0xff, 0x53, 0x55, 0x53, 0xff,
+  0xd2, 0xd6, 0xd2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xca, 0xcd, 0xca, 0xff,
+  0x66, 0x69, 0x66, 0xff, 0x75, 0x78, 0x75, 0xff,
+  0xe1, 0xe4, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x90, 0x93, 0x90, 0xff,
+  0x6e, 0x70, 0x6e, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe1, 0xe4, 0xe1, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0x94, 0x96, 0x94, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc5, 0xc8, 0xc5, 0xff,
+  0x67, 0x69, 0x67, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0x55, 0x57, 0x55, 0xff, 0xbf, 0xc3, 0xbf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0xc5, 0xc9, 0xc5, 0xff,
+  0x9b, 0x9e, 0x9b, 0xff, 0x6e, 0x70, 0x6e, 0xff,
+  0x6d, 0x6f, 0x6d, 0xff, 0xa1, 0xa4, 0xa1, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x8e, 0x90, 0x8e, 0xff,
+  0x6e, 0x70, 0x6e, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe0, 0xe4, 0xe0, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0x9a, 0x9c, 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0x72, 0x74, 0x72, 0xff,
+  0x7d, 0x7f, 0x7d, 0xff, 0xd8, 0xdb, 0xd8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0x9d, 0xa0, 0x9d, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa3, 0xa7, 0xa3, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0x79, 0x7b, 0x79, 0xff,
+  0xd5, 0xd8, 0xd5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9a, 0x9d, 0x9a, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0xe0, 0xe4, 0xe0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0x59, 0x5b, 0x59, 0xff, 0xd0, 0xd4, 0xd0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0xdc, 0xe0, 0xdc, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xd8, 0xdc, 0xd8, 0xff, 0xcd, 0xd0, 0xcd, 0xff,
+  0xca, 0xcd, 0xca, 0xff, 0xca, 0xcd, 0xca, 0xff,
+  0xca, 0xcd, 0xca, 0xff, 0xca, 0xcd, 0xca, 0xff,
+  0xd0, 0xd4, 0xd0, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xce, 0xd2, 0xce, 0xff,
+  0xc9, 0xcc, 0xc9, 0xff, 0xbc, 0xbf, 0xbc, 0xff,
+  0xb5, 0xb9, 0xb5, 0xff, 0xaa, 0xad, 0xaa, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0xa4, 0xa7, 0xa4, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0x75, 0x77, 0x75, 0xff,
+  0x68, 0x6a, 0x68, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0x6d, 0x70, 0x6d, 0xff, 0xa0, 0xa3, 0xa0, 0xff,
+  0xd3, 0xd6, 0xd3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb3, 0xb6, 0xb3, 0xff,
+  0x4b, 0x4c, 0x4b, 0xff, 0xe0, 0xe3, 0xe0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa3, 0xa6, 0xa3, 0xff,
+  0x5f, 0x61, 0x5f, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0x85, 0x88, 0x85, 0xff, 0x77, 0x79, 0x77, 0xff,
+  0xd9, 0xdd, 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xcc, 0xcf, 0xcc, 0xff, 0x71, 0x73, 0x71, 0xff,
+  0x5c, 0x5d, 0x5c, 0xff, 0x8b, 0x8e, 0x8b, 0xff,
+  0xbb, 0xbe, 0xbb, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xe2, 0xe5, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe3, 0xe0, 0xff,
+  0xdc, 0xe0, 0xdc, 0xff, 0xdc, 0xe0, 0xdc, 0xff,
+  0xcd, 0xd1, 0xcd, 0xff, 0xbc, 0xbf, 0xbc, 0xff,
+  0xaf, 0xb3, 0xaf, 0xff, 0x5f, 0x60, 0x5f, 0xff,
+  0x9c, 0x9e, 0x9c, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0x4b, 0x4d, 0x4b, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0x95, 0x98, 0x95, 0xff, 0x84, 0x86, 0x84, 0xff,
+  0x7a, 0x7d, 0x7a, 0xff, 0x7f, 0x81, 0x7f, 0xff,
+  0x81, 0x83, 0x81, 0xff, 0x80, 0x83, 0x80, 0xff,
+  0x73, 0x75, 0x73, 0xff, 0x6d, 0x6f, 0x6d, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x5a, 0x5c, 0x5a, 0xff,
+  0x5c, 0x5f, 0x5c, 0xff, 0x63, 0x66, 0x63, 0xff,
+  0x63, 0x66, 0x63, 0xff, 0x63, 0x66, 0x63, 0xff,
+  0x67, 0x6a, 0x67, 0xff, 0x6c, 0x6e, 0x6c, 0xff,
+  0x6c, 0x6e, 0x6c, 0xff, 0x6c, 0x6e, 0x6c, 0xff,
+  0x6c, 0x6e, 0x6c, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0x64, 0x66, 0x64, 0xff, 0x6d, 0x70, 0x6d, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x63, 0x66, 0x63, 0xff,
+  0x63, 0x66, 0x63, 0xff, 0x63, 0x66, 0x63, 0xff,
+  0x63, 0x66, 0x63, 0xff, 0x63, 0x66, 0x63, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x62, 0x64, 0x62, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x62, 0x63, 0x62, 0xff,
+  0x5d, 0x5e, 0x5d, 0xff, 0x5a, 0x5c, 0x5a, 0xff,
+  0x64, 0x66, 0x64, 0xff, 0x6d, 0x70, 0x6d, 0xff,
+  0x84, 0x86, 0x84, 0xff, 0x8a, 0x8d, 0x8a, 0xff,
+  0xa2, 0xa5, 0xa2, 0xff, 0xc7, 0xcb, 0xc7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcb, 0xcf, 0xcb, 0xff,
+  0x57, 0x59, 0x57, 0xff, 0xd6, 0xda, 0xd6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0x6b, 0x6e, 0x6b, 0xff, 0x73, 0x75, 0x73, 0xff,
+  0xbf, 0xc2, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbc, 0xbf, 0xbc, 0xff, 0x5e, 0x5f, 0x5e, 0xff,
+  0x97, 0x99, 0x97, 0xff, 0xe1, 0xe4, 0xe1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xda, 0xde, 0xda, 0xff, 0x61, 0x62, 0x61, 0xff,
+  0xaf, 0xb2, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xde, 0xe2, 0xde, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0x6b, 0x6e, 0x6b, 0xff,
+  0x60, 0x61, 0x60, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0x6e, 0x70, 0x6e, 0xff, 0x86, 0x89, 0x86, 0xff,
+  0x94, 0x97, 0x94, 0xff, 0x94, 0x96, 0x94, 0xff,
+  0x94, 0x96, 0x94, 0xff, 0x91, 0x94, 0x91, 0xff,
+  0x91, 0x94, 0x91, 0xff, 0x91, 0x94, 0x91, 0xff,
+  0x93, 0x96, 0x93, 0xff, 0x92, 0x95, 0x92, 0xff,
+  0x84, 0x86, 0x84, 0xff, 0x68, 0x6b, 0x68, 0xff,
+  0x66, 0x68, 0x66, 0xff, 0x6e, 0x70, 0x6e, 0xff,
+  0x6a, 0x6d, 0x6a, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0x50, 0x52, 0x50, 0xff, 0x4b, 0x4c, 0x4b, 0xff,
+  0xc7, 0xcb, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x96, 0x99, 0x96, 0xff,
+  0x43, 0x44, 0x43, 0xff, 0x6f, 0x72, 0x6f, 0xff,
+  0x76, 0x79, 0x76, 0xff, 0x76, 0x78, 0x76, 0xff,
+  0x75, 0x78, 0x75, 0xff, 0x83, 0x86, 0x83, 0xff,
+  0x8a, 0x8c, 0x8a, 0xff, 0x94, 0x97, 0x94, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0xb2, 0xb5, 0xb2, 0xff,
+  0xb8, 0xbb, 0xb8, 0xff, 0xbf, 0xc3, 0xbf, 0xff,
+  0xbf, 0xc3, 0xbf, 0xff, 0xbf, 0xc3, 0xbf, 0xff,
+  0xc6, 0xca, 0xc6, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0xd7, 0xda, 0xd7, 0xff, 0xd7, 0xda, 0xd7, 0xff,
+  0xd7, 0xda, 0xd7, 0xff, 0xd5, 0xd8, 0xd5, 0xff,
+  0xc9, 0xcc, 0xc9, 0xff, 0xca, 0xcd, 0xca, 0xff,
+  0xc1, 0xc4, 0xc1, 0xff, 0xbf, 0xc3, 0xbf, 0xff,
+  0xbf, 0xc3, 0xbf, 0xff, 0xbf, 0xc3, 0xbf, 0xff,
+  0xbf, 0xc3, 0xbf, 0xff, 0xbf, 0xc3, 0xbf, 0xff,
+  0xc1, 0xc4, 0xc1, 0xff, 0xc7, 0xcb, 0xc7, 0xff,
+  0xd0, 0xd3, 0xd0, 0xff, 0xd7, 0xda, 0xd7, 0xff,
+  0xd7, 0xda, 0xd7, 0xff, 0xd9, 0xdd, 0xd9, 0xff,
+  0xde, 0xe2, 0xde, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0x5a, 0x5c, 0x5a, 0xff, 0xcb, 0xcf, 0xcb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc1, 0xc5, 0xc1, 0xff, 0x70, 0x72, 0x70, 0xff,
+  0x58, 0x5a, 0x58, 0xff, 0x7a, 0x7c, 0x7a, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0x93, 0x97, 0x93, 0xff,
+  0x49, 0x4b, 0x49, 0xff, 0x71, 0x73, 0x71, 0xff,
+  0x91, 0x93, 0x91, 0xff, 0xe2, 0xe5, 0xe2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x90, 0x92, 0x90, 0xff,
+  0x6b, 0x6d, 0x6b, 0xff, 0xe1, 0xe4, 0xe1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdd, 0xe1, 0xdd, 0xff,
+  0xc9, 0xcc, 0xc9, 0xff, 0xa1, 0xa4, 0xa1, 0xff,
+  0x99, 0x9b, 0x99, 0xff, 0x97, 0x9a, 0x97, 0xff,
+  0x81, 0x84, 0x81, 0xff, 0x7f, 0x81, 0x7f, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0x87, 0x8a, 0x87, 0xff,
+  0x99, 0x9c, 0x99, 0xff, 0x99, 0x9c, 0x99, 0xff,
+  0xa4, 0xa7, 0xa4, 0xff, 0xb1, 0xb4, 0xb1, 0xff,
+  0xc3, 0xc7, 0xc3, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0x70, 0x73, 0x70, 0xff, 0x7b, 0x7d, 0x7b, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0x7d, 0x80, 0x7d, 0xff, 0xdf, 0xe3, 0xdf, 0xff,
+  0xf1, 0xf3, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xba, 0xbe, 0xba, 0xff,
+  0x52, 0x54, 0x52, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc9, 0xcc, 0xc9, 0xff, 0x87, 0x8a, 0x87, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xbc, 0xbd, 0xbc, 0xff,
+  0xa9, 0xaa, 0xa9, 0xff, 0xa5, 0xa8, 0xa5, 0xff,
+  0x5a, 0x5c, 0x5a, 0xff, 0xaf, 0xb3, 0xaf, 0xff,
+  0xe9, 0xeb, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd9, 0xdc, 0xd9, 0xff,
+  0x53, 0x55, 0x53, 0xff, 0xa8, 0xab, 0xa8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc4, 0xc8, 0xc4, 0xff,
+  0x55, 0x58, 0x55, 0xff, 0xbc, 0xbf, 0xbc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0x70, 0x73, 0x70, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb8, 0xbb, 0xb8, 0xff, 0x6b, 0x6d, 0x6b, 0xff,
+  0x7e, 0x81, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf3, 0xf1, 0xff, 0xa6, 0xa7, 0xa6, 0xff,
+  0x8c, 0x8d, 0x8c, 0xff, 0xa4, 0xa7, 0xa4, 0xff,
+  0x95, 0x98, 0x95, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0xb5, 0xb7, 0xb5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x77, 0x7a, 0x77, 0xff, 0x75, 0x78, 0x75, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x96, 0x99, 0x96, 0xff,
+  0x6c, 0x6e, 0x6c, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xce, 0xd1, 0xce, 0xff, 0x68, 0x6a, 0x68, 0xff,
+  0xc0, 0xc3, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd4, 0xd7, 0xd4, 0xff, 0x90, 0x92, 0x90, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0xd6, 0xd9, 0xd6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0x78, 0x7a, 0x78, 0xff, 0xaf, 0xb1, 0xaf, 0xff,
+  0xdf, 0xe2, 0xdf, 0xff, 0x75, 0x77, 0x75, 0xff,
+  0x8b, 0x8e, 0x8b, 0xff, 0xdd, 0xde, 0xdd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x59, 0x5b, 0x59, 0xff,
+  0xcf, 0xd3, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd9, 0xdc, 0xd9, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0x9a, 0x9c, 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb2, 0xb5, 0xb2, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0xd3, 0xd7, 0xd3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0x9b, 0x9e, 0x9b, 0xff,
+  0x60, 0x62, 0x60, 0xff, 0x6b, 0x6e, 0x6b, 0xff,
+  0xb8, 0xbb, 0xb8, 0xff, 0xed, 0xf0, 0xed, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe2, 0xe0, 0xff,
+  0x75, 0x78, 0x75, 0xff, 0xaf, 0xb2, 0xaf, 0xff,
+  0xeb, 0xee, 0xeb, 0xff, 0xbd, 0xc0, 0xbd, 0xff,
+  0x8b, 0x8e, 0x8b, 0xff, 0xa1, 0xa3, 0xa1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd4, 0xd7, 0xd4, 0xff, 0x5d, 0x5e, 0x5d, 0xff,
+  0x9f, 0xa2, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9a, 0x9d, 0x9a, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xd3, 0xd6, 0xd3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0x73, 0x75, 0x73, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcc, 0xd0, 0xcc, 0xff,
+  0x74, 0x76, 0x74, 0xff, 0x62, 0x64, 0x62, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0xe0, 0xe4, 0xe0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdc, 0xde, 0xdc, 0xff,
+  0x87, 0x89, 0x87, 0xff, 0x95, 0x97, 0x95, 0xff,
+  0xf6, 0xfa, 0xf6, 0xff, 0xf0, 0xf4, 0xf0, 0xff,
+  0x97, 0x9b, 0x97, 0xff, 0x86, 0x88, 0x86, 0xff,
+  0xe2, 0xe3, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0x75, 0x78, 0x75, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe9, 0xec, 0xe9, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x75, 0x77, 0x75, 0xff, 0x87, 0x8a, 0x87, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf3, 0xf1, 0xff, 0x7c, 0x7f, 0x7c, 0xff,
+  0x68, 0x6a, 0x68, 0xff, 0xd8, 0xdb, 0xd8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0x93, 0x95, 0x93, 0xff,
+  0xe1, 0xe4, 0xe1, 0xff, 0xf1, 0xf5, 0xf1, 0xff,
+  0xac, 0xb0, 0xac, 0xff, 0x82, 0x84, 0x82, 0xff,
+  0xd5, 0xd7, 0xd5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb5, 0xb8, 0xb5, 0xff,
+  0x56, 0x59, 0x56, 0xff, 0xdd, 0xe1, 0xdd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0x59, 0x5c, 0x59, 0xff, 0xce, 0xd2, 0xce, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0xa5, 0xa8, 0xa5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc6, 0xc9, 0xc6, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0xb6, 0xba, 0xb6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf4, 0xf2, 0xff,
+  0xa2, 0xa5, 0xa2, 0xff, 0x82, 0x84, 0x82, 0xff,
+  0xd8, 0xdc, 0xd8, 0xff, 0xf0, 0xf4, 0xf0, 0xff,
+  0xb0, 0xb3, 0xb0, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0xdc, 0xdd, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd4, 0xd8, 0xd4, 0xff,
+  0x57, 0x59, 0x57, 0xff, 0xbc, 0xc0, 0xbc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd7, 0xdb, 0xd7, 0xff, 0x61, 0x62, 0x61, 0xff,
+  0x9e, 0xa1, 0x9e, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc3, 0xc7, 0xc3, 0xff,
+  0x56, 0x58, 0x56, 0xff, 0xce, 0xd1, 0xce, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa0, 0xa3, 0xa0, 0xff, 0x5a, 0x5b, 0x5a, 0xff,
+  0xdc, 0xdf, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0xb7, 0xbb, 0xb7, 0xff, 0x69, 0x6c, 0x69, 0xff,
+  0xcb, 0xcd, 0xcb, 0xff, 0xe6, 0xea, 0xe6, 0xff,
+  0x98, 0x9b, 0x98, 0xff, 0x74, 0x77, 0x74, 0xff,
+  0xdb, 0xdc, 0xdb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x6e, 0x71, 0x6e, 0xff, 0x97, 0x9a, 0x97, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0xdb, 0xdf, 0xdb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa0, 0xa3, 0xa0, 0xff,
+  0x69, 0x6b, 0x69, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa4, 0xa7, 0xa4, 0xff, 0x5c, 0x5e, 0x5c, 0xff,
+  0xdc, 0xdf, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc5, 0xc7, 0xc5, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0xa6, 0xa9, 0xa6, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0x8a, 0x8d, 0x8a, 0xff, 0x97, 0x9a, 0x97, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x97, 0x9a, 0x97, 0xff, 0x84, 0x86, 0x84, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdb, 0xde, 0xdb, 0xff,
+  0x6b, 0x6d, 0x6b, 0xff, 0x8d, 0x90, 0x8d, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x7e, 0x81, 0x7e, 0xff,
+  0x83, 0x86, 0x83, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb8, 0xbc, 0xb8, 0xff, 0x68, 0x6a, 0x68, 0xff,
+  0xd8, 0xdc, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xed, 0xed, 0xed, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x8e, 0x90, 0x8e, 0xff, 0xba, 0xbe, 0xba, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0xc0, 0xc3, 0xc0, 0xff,
+  0xf9, 0xfa, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0xed, 0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9c, 0x9f, 0x9c, 0xff,
+  0x64, 0x65, 0x64, 0xff, 0xd2, 0xd5, 0xd2, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe2, 0xdf, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xa4, 0xa7, 0xa4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd0, 0xd3, 0xd0, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0xc3, 0xc7, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9d, 0x9e, 0x9d, 0xff,
+  0x72, 0x75, 0x72, 0xff, 0x7e, 0x81, 0x7e, 0xff,
+  0x82, 0x85, 0x82, 0xff, 0xe4, 0xe5, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x65, 0x66, 0x65, 0xff,
+  0xe4, 0xe8, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xed, 0xf0, 0xed, 0xff, 0x63, 0x65, 0x63, 0xff,
+  0x93, 0x96, 0x93, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc7, 0xcb, 0xc7, 0xff, 0x55, 0x57, 0x55, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd3, 0xd7, 0xd3, 0xff, 0x5a, 0x5c, 0x5a, 0xff,
+  0xb1, 0xb5, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xc7, 0xc9, 0xc7, 0xff,
+  0x47, 0x49, 0x47, 0xff, 0x51, 0x54, 0x51, 0xff,
+  0x91, 0x93, 0x91, 0xff, 0xf1, 0xf2, 0xf1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x68, 0x6b, 0x68, 0xff,
+  0xed, 0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc2, 0xc5, 0xc2, 0xff, 0x5e, 0x60, 0x5e, 0xff,
+  0xcd, 0xd1, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0xf1, 0xf3, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe2, 0xdf, 0xff, 0x6f, 0x71, 0x6f, 0xff,
+  0xac, 0xaf, 0xac, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd6, 0xd9, 0xd6, 0xff,
+  0x7f, 0x82, 0x7f, 0xff, 0x89, 0x8b, 0x89, 0xff,
+  0xd3, 0xd5, 0xd3, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x91, 0x93, 0x91, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe0, 0xe4, 0xe0, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9d, 0xa0, 0x9d, 0xff, 0x8f, 0x92, 0x8f, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x81, 0x83, 0x81, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf3, 0xf4, 0xf3, 0xff,
+  0xdc, 0xdf, 0xdc, 0xff, 0xdc, 0xdd, 0xdc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x74, 0x76, 0x74, 0xff, 0x8f, 0x92, 0x8f, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd5, 0xd9, 0xd5, 0xff, 0xdc, 0xe0, 0xdc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9c, 0xa0, 0x9c, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0x6b, 0x6e, 0x6b, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc6, 0xca, 0xc6, 0xff,
+  0x58, 0x59, 0x58, 0xff, 0xd1, 0xd5, 0xd1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcd, 0xd0, 0xcd, 0xff,
+  0x54, 0x56, 0x54, 0xff, 0xcd, 0xd1, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0x70, 0x72, 0x70, 0xff, 0x99, 0x9c, 0x99, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc0, 0xc3, 0xc0, 0xff,
+  0x57, 0x58, 0x57, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x98, 0x9b, 0x98, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0x62, 0x64, 0x62, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0x52, 0x54, 0x52, 0xff,
+  0xc5, 0xc9, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x8a, 0x8c, 0x8a, 0xff,
+  0x72, 0x75, 0x72, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe0, 0xe0, 0xe0, 0xff, 0x6b, 0x6d, 0x6b, 0xff,
+  0x8f, 0x91, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf3, 0xf1, 0xff, 0x71, 0x73, 0x71, 0xff,
+  0x8c, 0x8e, 0x8c, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xce, 0xcf, 0xce, 0xff, 0x88, 0x8a, 0x88, 0xff,
+  0xa9, 0xab, 0xa9, 0xff, 0xe8, 0xea, 0xe8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0x66, 0x69, 0x66, 0xff,
+  0xa7, 0xaa, 0xa7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xf8, 0xf8, 0xf8, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe6, 0xe7, 0xe6, 0xff, 0x9b, 0x9e, 0x9b, 0xff,
+  0x81, 0x84, 0x81, 0xff, 0xc6, 0xc7, 0xc6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xef, 0xf1, 0xef, 0xff, 0x7a, 0x7c, 0x7a, 0xff,
+  0xc0, 0xc4, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0xc4, 0xc6, 0xc4, 0xff,
+  0xb1, 0xb3, 0xb1, 0xff, 0xf0, 0xf0, 0xf0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0xce, 0xd0, 0xce, 0xff,
+  0x84, 0x87, 0x84, 0xff, 0x94, 0x96, 0x94, 0xff,
+  0xf9, 0xfa, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdb, 0xdc, 0xdb, 0xff,
+  0xa9, 0xac, 0xa9, 0xff, 0x74, 0x76, 0x74, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9c, 0x9e, 0x9c, 0xff, 0x5e, 0x60, 0x5e, 0xff,
+  0x56, 0x58, 0x56, 0xff, 0xe5, 0xe6, 0xe5, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfb, 0xfc, 0xfb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf5, 0xf5, 0xff,
+  0xae, 0xb1, 0xae, 0xff, 0x5d, 0x5f, 0x5d, 0xff,
+  0xc3, 0xc6, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf6, 0xf5, 0xff,
+  0xda, 0xdc, 0xda, 0xff, 0x8b, 0x8e, 0x8b, 0xff,
+  0x69, 0x6b, 0x69, 0xff, 0xad, 0xb1, 0xad, 0xff,
+  0xdb, 0xdd, 0xdb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0x87, 0x89, 0x87, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0x5d, 0x5e, 0x5d, 0xff,
+  0x45, 0x46, 0x45, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe7, 0xe8, 0xe7, 0xff, 0xc7, 0xca, 0xc7, 0xff,
+  0xeb, 0xec, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xea, 0xec, 0xea, 0xff, 0x73, 0x75, 0x73, 0xff,
+  0x80, 0x82, 0x80, 0xff, 0xe6, 0xe7, 0xe6, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xd4, 0xd7, 0xd4, 0xff,
+  0x87, 0x8a, 0x87, 0xff, 0x7a, 0x7d, 0x7a, 0xff,
+  0xac, 0xae, 0xac, 0xff, 0xfa, 0xfa, 0xfa, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe3, 0xdf, 0xff, 0xa3, 0xa6, 0xa3, 0xff,
+  0x67, 0x6a, 0x67, 0xff, 0xc8, 0xc9, 0xc8, 0xff,
+  0xcf, 0xd0, 0xcf, 0xff, 0x87, 0x89, 0x87, 0xff,
+  0x6f, 0x71, 0x6f, 0xff, 0xf3, 0xf4, 0xf3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf6, 0xf6, 0xf6, 0xff,
+  0xa1, 0xa3, 0xa1, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0x91, 0x93, 0x91, 0xff, 0xdd, 0xde, 0xdd, 0xff,
+  0xfa, 0xfb, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xb6, 0xb9, 0xb6, 0xff,
+  0x6e, 0x70, 0x6e, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xee, 0xef, 0xee, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc8, 0xca, 0xc8, 0xff, 0x93, 0x96, 0x93, 0xff,
+  0x7d, 0x7f, 0x7d, 0xff, 0xb7, 0xb9, 0xb7, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xca, 0xcd, 0xca, 0xff, 0xa1, 0xa3, 0xa1, 0xff,
+  0x6e, 0x70, 0x6e, 0xff, 0x5f, 0x62, 0x5f, 0xff,
+  0xb5, 0xb6, 0xb5, 0xff, 0xf9, 0xf9, 0xf9, 0xff,
+  0xdf, 0xe0, 0xdf, 0xff, 0x89, 0x8c, 0x89, 0xff,
+  0x96, 0x98, 0x96, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xcb, 0xcd, 0xcb, 0xff,
+  0x7b, 0x7d, 0x7b, 0xff, 0x7a, 0x7a, 0x7a, 0xff,
+  0x59, 0x5b, 0x59, 0xff, 0x92, 0x94, 0x92, 0xff,
+  0xd2, 0xd5, 0xd2, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe7, 0xe9, 0xe7, 0xff,
+  0x96, 0x99, 0x96, 0xff, 0x87, 0x89, 0x87, 0xff,
+  0xd1, 0xd2, 0xd1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0xd6, 0xd6, 0xd6, 0xff,
+  0x7f, 0x82, 0x7f, 0xff, 0x75, 0x77, 0x75, 0xff,
+  0xc5, 0xc8, 0xc5, 0xff, 0xed, 0xee, 0xed, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xef, 0xef, 0xef, 0xff, 0xcf, 0xd1, 0xcf, 0xff,
+  0xdc, 0xdd, 0xdc, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc9, 0xcc, 0xc9, 0xff, 0x92, 0x95, 0x92, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0x8e, 0x91, 0x8e, 0xff, 0xce, 0xd2, 0xce, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfa, 0xfb, 0xfa, 0xff,
+  0xc4, 0xc6, 0xc4, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0xb4, 0xb6, 0xb4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe2, 0xe3, 0xe2, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0x8f, 0x90, 0x8f, 0xff, 0xd1, 0xd3, 0xd1, 0xff,
+  0x9c, 0x9f, 0x9c, 0xff, 0x7f, 0x81, 0x7f, 0xff,
+  0x91, 0x93, 0x91, 0xff, 0xd6, 0xd8, 0xd6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xd2, 0xd3, 0xd2, 0xff, 0x85, 0x87, 0x85, 0xff,
+  0x9d, 0x9e, 0x9d, 0xff, 0xec, 0xed, 0xec, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xf7, 0xff,
+  0xcd, 0xd0, 0xcd, 0xff, 0x72, 0x74, 0x72, 0xff,
+  0x8e, 0x90, 0x8e, 0xff, 0xc4, 0xc5, 0xc4, 0xff,
+  0xf6, 0xf7, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xdb, 0xdd, 0xdb, 0xff, 0x68, 0x6b, 0x68, 0xff,
+  0xb6, 0xb9, 0xb6, 0xff, 0xf3, 0xf3, 0xf3, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xe1, 0xe5, 0xe1, 0xff, 0xe1, 0xe5, 0xe1, 0xff,
+  0xe1, 0xe5, 0xe1, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0xf5, 0xf7, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdc, 0xe0, 0xdc, 0xff, 0xc5, 0xc9, 0xc5, 0xff,
+  0x9a, 0x9d, 0x9a, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0x6d, 0x6f, 0x6d, 0xff,
+  0xb0, 0xb4, 0xb0, 0xff, 0xe0, 0xe4, 0xe0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xef, 0xed, 0xff,
+  0xa4, 0xa7, 0xa4, 0xff, 0x88, 0x8b, 0x88, 0xff,
+  0xcf, 0xd1, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf3, 0xf2, 0xff,
+  0xb2, 0xb5, 0xb2, 0xff, 0x83, 0x85, 0x83, 0xff,
+  0xbc, 0xbd, 0xbc, 0xff, 0xfc, 0xfd, 0xfc, 0xff,
+  0xed, 0xef, 0xed, 0xff, 0xbd, 0xbf, 0xbd, 0xff,
+  0x82, 0x85, 0x82, 0xff, 0x8c, 0x8e, 0x8c, 0xff,
+  0xd7, 0xd9, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf2, 0xf2, 0xf2, 0xff, 0xa8, 0xab, 0xa8, 0xff,
+  0x6b, 0x6d, 0x6b, 0xff, 0xc0, 0xc3, 0xc0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xb9, 0xbb, 0xb9, 0xff,
+  0x85, 0x88, 0x85, 0xff, 0x80, 0x83, 0x80, 0xff,
+  0xcd, 0xd0, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xde, 0xe0, 0xde, 0xff, 0x8a, 0x8d, 0x8a, 0xff,
+  0x8e, 0x91, 0x8e, 0xff, 0xde, 0xe0, 0xde, 0xff,
+  0xe0, 0xe0, 0xe0, 0xff, 0x82, 0x84, 0x82, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0x76, 0x78, 0x76, 0xff,
+  0x7b, 0x7d, 0x7b, 0xff, 0x80, 0x82, 0x80, 0xff,
+  0x84, 0x87, 0x84, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0x7d, 0x80, 0x7d, 0xff, 0x8f, 0x92, 0x8f, 0xff,
+  0x9d, 0xa0, 0x9d, 0xff, 0xae, 0xb1, 0xae, 0xff,
+  0xb6, 0xb9, 0xb6, 0xff, 0xb5, 0xb8, 0xb5, 0xff,
+  0xb5, 0xb8, 0xb5, 0xff, 0xb6, 0xb9, 0xb6, 0xff,
+  0xbf, 0xc3, 0xbf, 0xff, 0xc4, 0xc7, 0xc4, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xc8, 0xcb, 0xc8, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xc8, 0xcb, 0xc8, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xc8, 0xcb, 0xc8, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xc8, 0xcb, 0xc8, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xc4, 0xc7, 0xc4, 0xff,
+  0xc1, 0xc4, 0xc1, 0xff, 0xc1, 0xc4, 0xc1, 0xff,
+  0xb7, 0xba, 0xb7, 0xff, 0xb5, 0xb8, 0xb5, 0xff,
+  0xb6, 0xb9, 0xb6, 0xff, 0xa3, 0xa7, 0xa3, 0xff,
+  0x8c, 0x8f, 0x8c, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0x64, 0x66, 0x64, 0xff, 0x5e, 0x60, 0x5e, 0xff,
+  0x45, 0x46, 0x45, 0xff, 0x63, 0x64, 0x63, 0xff,
+  0xc1, 0xc4, 0xc1, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe3, 0xe0, 0xff,
+  0x87, 0x8a, 0x87, 0xff, 0x93, 0x96, 0x93, 0xff,
+  0xe2, 0xe3, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd3, 0xd5, 0xd3, 0xff,
+  0x84, 0x87, 0x84, 0xff, 0x9e, 0xa0, 0x9e, 0xff,
+  0xe6, 0xe7, 0xe6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf6, 0xf6, 0xf6, 0xff,
+  0xb9, 0xbd, 0xb9, 0xff, 0x6e, 0x70, 0x6e, 0xff,
+  0x83, 0x84, 0x83, 0xff, 0xf7, 0xf8, 0xf7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0x71, 0x73, 0x71, 0xff, 0x88, 0x8b, 0x88, 0xff,
+  0xf4, 0xf4, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe3, 0xe5, 0xe3, 0xff,
+  0xad, 0xb0, 0xad, 0xff, 0x78, 0x7b, 0x78, 0xff,
+  0x86, 0x89, 0x86, 0xff, 0xd8, 0xdb, 0xd8, 0xff,
+  0xf4, 0xf5, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd8, 0xda, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf4, 0xf5, 0xf4, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf2, 0xf2, 0xf2, 0xff, 0xb5, 0xb8, 0xb5, 0xff,
+  0x52, 0x55, 0x52, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xcf, 0xd0, 0xcf, 0xff,
+  0xba, 0xbc, 0xba, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0xa4, 0xa7, 0xa4, 0xff, 0x92, 0x94, 0x92, 0xff,
+  0x88, 0x8a, 0x88, 0xff, 0x82, 0x84, 0x82, 0xff,
+  0x73, 0x75, 0x73, 0xff, 0x77, 0x79, 0x77, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0x78, 0x7b, 0x78, 0xff,
+  0x69, 0x6b, 0x69, 0xff, 0x63, 0x65, 0x63, 0xff,
+  0x5c, 0x5e, 0x5c, 0xff, 0x50, 0x52, 0x50, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x65, 0x67, 0x65, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x65, 0x67, 0x65, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0x50, 0x51, 0x50, 0xff, 0x4d, 0x4e, 0x4d, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0x5d, 0x5f, 0x5d, 0xff,
+  0x58, 0x5a, 0x58, 0xff, 0x60, 0x62, 0x60, 0xff,
+  0x68, 0x6a, 0x68, 0xff, 0x6b, 0x6e, 0x6b, 0xff,
+  0x75, 0x77, 0x75, 0xff, 0x83, 0x86, 0x83, 0xff,
+  0x9e, 0xa2, 0x9e, 0xff, 0xc0, 0xc4, 0xc0, 0xff,
+  0x9e, 0xa1, 0x9e, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0xed, 0xf0, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd7, 0xda, 0xd7, 0xff,
+  0x79, 0x7c, 0x79, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0xee, 0xef, 0xee, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xee, 0xf0, 0xee, 0xff, 0xa2, 0xa5, 0xa2, 0xff,
+  0x7c, 0x7f, 0x7c, 0xff, 0xd1, 0xd2, 0xd1, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf2, 0xf1, 0xff, 0xae, 0xb0, 0xae, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0x9d, 0xa1, 0x9d, 0xff,
+  0xe9, 0xea, 0xe9, 0xff, 0xfc, 0xfd, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb2, 0xb4, 0xb2, 0xff, 0x75, 0x77, 0x75, 0xff,
+  0xc1, 0xc4, 0xc1, 0xff, 0xf6, 0xf7, 0xf6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xeb, 0xeb, 0xeb, 0xff, 0xaa, 0xae, 0xaa, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0xdc, 0xdd, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe2, 0xdf, 0xff, 0xa9, 0xab, 0xa9, 0xff,
+  0xbb, 0xbd, 0xbb, 0xff, 0xd8, 0xda, 0xd8, 0xff,
+  0xb5, 0xb9, 0xb5, 0xff, 0xd7, 0xd8, 0xd7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd6, 0xd8, 0xd6, 0xff,
+  0x72, 0x74, 0x72, 0xff, 0x8f, 0x91, 0x8f, 0xff,
+  0xe1, 0xe2, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xde, 0xe2, 0xde, 0xff, 0xdb, 0xde, 0xdb, 0xff,
+  0xd8, 0xdb, 0xd8, 0xff, 0xd0, 0xd3, 0xd0, 0xff,
+  0xd0, 0xd4, 0xd0, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0xcb, 0xcf, 0xcb, 0xff,
+  0x62, 0x64, 0x62, 0xff, 0x76, 0x78, 0x76, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xd4, 0xd7, 0xd4, 0xff, 0xd9, 0xdd, 0xd9, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0xe9, 0xec, 0xe9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0x54, 0x56, 0x54, 0xff,
+  0xcd, 0xd0, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc4, 0xc7, 0xc4, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0xc2, 0xc5, 0xc2, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc8, 0xca, 0xc8, 0xff, 0x76, 0x78, 0x76, 0xff,
+  0x9d, 0xa0, 0x9d, 0xff, 0xed, 0xee, 0xed, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf0, 0xf1, 0xf0, 0xff,
+  0xaf, 0xb0, 0xaf, 0xff, 0x73, 0x75, 0x73, 0xff,
+  0xaa, 0xad, 0xaa, 0xff, 0xeb, 0xec, 0xeb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xdf, 0xe1, 0xdf, 0xff, 0x8e, 0x90, 0x8e, 0xff,
+  0x92, 0x95, 0x92, 0xff, 0xdc, 0xde, 0xdc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xf2, 0xf4, 0xf2, 0xff,
+  0x9f, 0xa1, 0x9f, 0xff, 0x7a, 0x7d, 0x7a, 0xff,
+  0x9c, 0x9e, 0x9c, 0xff, 0xe7, 0xe9, 0xe7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe2, 0xe4, 0xe2, 0xff, 0xb9, 0xbb, 0xb9, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0x6d, 0x6e, 0x6d, 0xff,
+  0xf0, 0xf0, 0xf0, 0xff, 0xdc, 0xdd, 0xdc, 0xff,
+  0x47, 0x49, 0x47, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xee, 0xed, 0xff,
+  0xab, 0xaf, 0xab, 0xff, 0x65, 0x67, 0x65, 0xff,
+  0xc9, 0xcb, 0xc9, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x61, 0x62, 0x61, 0xff, 0x9a, 0x9d, 0x9a, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xec, 0xe9, 0xff, 0x63, 0x65, 0x63, 0xff,
+  0xb9, 0xbc, 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0x69, 0x6b, 0x69, 0xff, 0xda, 0xde, 0xda, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x91, 0x93, 0x91, 0xff, 0x78, 0x7a, 0x78, 0xff,
+  0xdb, 0xdd, 0xdb, 0xff, 0xfc, 0xfd, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xeb, 0xe9, 0xff, 0x9c, 0x9f, 0x9c, 0xff,
+  0x80, 0x82, 0x80, 0xff, 0xc5, 0xc7, 0xc5, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf6, 0xf7, 0xf6, 0xff, 0xc2, 0xc4, 0xc2, 0xff,
+  0x83, 0x86, 0x83, 0xff, 0xa7, 0xa9, 0xa7, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe2, 0xe4, 0xe2, 0xff, 0xa9, 0xad, 0xa9, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0x9a, 0x9d, 0x9a, 0xff,
+  0xfa, 0xfa, 0xfa, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xea, 0xeb, 0xea, 0xff, 0xcc, 0xce, 0xcc, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0x66, 0x68, 0x66, 0xff,
+  0x99, 0x9b, 0x99, 0xff, 0xce, 0xcf, 0xce, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x73, 0x73, 0x73, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0xb9, 0xba, 0xb9, 0xff, 0xf9, 0xfa, 0xf9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xda, 0xdd, 0xda, 0xff, 0x79, 0x7b, 0x79, 0xff,
+  0xa3, 0xa5, 0xa3, 0xff, 0xe5, 0xe6, 0xe5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0x5b, 0x5d, 0x5b, 0xff, 0xa5, 0xa8, 0xa5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x67, 0x69, 0x67, 0xff,
+  0x9a, 0x9d, 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf1, 0xf1, 0xf1, 0xff, 0x94, 0x97, 0x94, 0xff,
+  0x79, 0x7b, 0x79, 0xff, 0xe5, 0xe8, 0xe5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xd5, 0xd8, 0xd5, 0xff,
+  0x67, 0x69, 0x67, 0xff, 0xa7, 0xaa, 0xa7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xd9, 0xda, 0xd9, 0xff,
+  0x8b, 0x8e, 0x8b, 0xff, 0x8f, 0x91, 0x8f, 0xff,
+  0xdf, 0xe1, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xef, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xcd, 0xd0, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe6, 0xe7, 0xe6, 0xff,
+  0xad, 0xb1, 0xad, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0xaa, 0xad, 0xaa, 0xff, 0xe1, 0xe2, 0xe1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf7, 0xf8, 0xf7, 0xff, 0xe7, 0xe9, 0xe7, 0xff,
+  0xa2, 0xa5, 0xa2, 0xff, 0x78, 0x7a, 0x78, 0xff,
+  0x86, 0x89, 0x86, 0xff, 0xaa, 0xac, 0xaa, 0xff,
+  0xe1, 0xe3, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd6, 0xd6, 0xd6, 0xff, 0x87, 0x8a, 0x87, 0xff,
+  0x69, 0x6a, 0x69, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0xfc, 0xfd, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xee, 0xef, 0xee, 0xff, 0xb0, 0xb4, 0xb0, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0xc1, 0xc4, 0xc1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcf, 0xd3, 0xcf, 0xff,
+  0x51, 0x52, 0x51, 0xff, 0xbd, 0xc0, 0xbd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x7b, 0x7d, 0x7b, 0xff,
+  0x85, 0x87, 0x85, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe4, 0xe4, 0xe4, 0xff, 0x90, 0x93, 0x90, 0xff,
+  0x98, 0x9a, 0x98, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xed, 0xed, 0xed, 0xff, 0x9e, 0xa0, 0x9e, 0xff,
+  0x79, 0x7b, 0x79, 0xff, 0xd7, 0xda, 0xd7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf6, 0xf5, 0xff,
+  0xbc, 0xbe, 0xbc, 0xff, 0x6e, 0x70, 0x6e, 0xff,
+  0x9d, 0x9f, 0x9d, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xec, 0xee, 0xec, 0xff, 0x5f, 0x60, 0x5f, 0xff,
+  0xa2, 0xa5, 0xa2, 0xff, 0xfa, 0xfa, 0xfa, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0x7e, 0x82, 0x7e, 0xff, 0xa1, 0xa4, 0xa1, 0xff,
+  0xe1, 0xe3, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xf3, 0xf4, 0xf3, 0xff,
+  0xc2, 0xc5, 0xc2, 0xff, 0x87, 0x8a, 0x87, 0xff,
+  0x7b, 0x7d, 0x7b, 0xff, 0x95, 0x97, 0x95, 0xff,
+  0xce, 0xd0, 0xce, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xce, 0xd0, 0xce, 0xff,
+  0x7b, 0x7d, 0x7b, 0xff, 0x93, 0x97, 0x93, 0xff,
+  0xd4, 0xd5, 0xd4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xe3, 0xe7, 0xe3, 0xff,
+  0x7d, 0x80, 0x7d, 0xff, 0x9d, 0xa0, 0x9d, 0xff,
+  0xe3, 0xe4, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbd, 0xc0, 0xbd, 0xff,
+  0x4c, 0x4d, 0x4c, 0xff, 0xcf, 0xd2, 0xcf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x95, 0x99, 0x95, 0xff,
+  0x68, 0x6b, 0x68, 0xff, 0xe0, 0xe4, 0xe0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd0, 0xd1, 0xd0, 0xff, 0x85, 0x87, 0x85, 0xff,
+  0xb0, 0xb1, 0xb0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf3, 0xf4, 0xf3, 0xff,
+  0xb7, 0xba, 0xb7, 0xff, 0x77, 0x79, 0x77, 0xff,
+  0xac, 0xae, 0xac, 0xff, 0xf6, 0xf7, 0xf6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfa, 0xfb, 0xfa, 0xff, 0x95, 0x99, 0x95, 0xff,
+  0x62, 0x64, 0x62, 0xff, 0xd4, 0xd6, 0xd4, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x9c, 0x9d, 0x9c, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0xd9, 0xda, 0xd9, 0xff,
+  0xfb, 0xfc, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb9, 0xba, 0xb9, 0xff, 0x7f, 0x82, 0x7f, 0xff,
+  0x97, 0x99, 0x97, 0xff, 0xf1, 0xf2, 0xf1, 0xff,
+  0xfb, 0xfc, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf7, 0xf8, 0xf7, 0xff,
+  0xce, 0xd0, 0xce, 0xff, 0x9c, 0x9e, 0x9c, 0xff,
+  0x7e, 0x80, 0x7e, 0xff, 0x7c, 0x7f, 0x7c, 0xff,
+  0xc2, 0xc5, 0xc2, 0xff, 0xf1, 0xf1, 0xf1, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf3, 0xf2, 0xff,
+  0xc6, 0xc8, 0xc6, 0xff, 0x7b, 0x7e, 0x7b, 0xff,
+  0x8a, 0x8d, 0x8a, 0xff, 0xe8, 0xeb, 0xe8, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf6, 0xf7, 0xf6, 0xff,
+  0xbc, 0xbe, 0xbc, 0xff, 0x87, 0x89, 0x87, 0xff,
+  0xb8, 0xba, 0xb8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xbb, 0xbe, 0xbb, 0xff,
+  0x5e, 0x60, 0x5e, 0xff, 0xd9, 0xdc, 0xd9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb2, 0xb4, 0xb2, 0xff,
+  0x68, 0x6a, 0x68, 0xff, 0xd5, 0xd9, 0xd5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xbc, 0xbd, 0xbc, 0xff, 0x84, 0x86, 0x84, 0xff,
+  0xc4, 0xc5, 0xc4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe1, 0xe0, 0xff,
+  0x8f, 0x91, 0x8f, 0xff, 0x85, 0x88, 0x85, 0xff,
+  0xd9, 0xdb, 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcf, 0xd2, 0xcf, 0xff,
+  0x75, 0x78, 0x75, 0xff, 0x94, 0x97, 0x94, 0xff,
+  0xe2, 0xe3, 0xe2, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc9, 0xcb, 0xc9, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0xa1, 0xa4, 0xa1, 0xff,
+  0xe9, 0xeb, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe1, 0xe0, 0xff,
+  0x75, 0x78, 0x75, 0xff, 0x8c, 0x8f, 0x8c, 0xff,
+  0xde, 0xdf, 0xde, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xdb, 0xdd, 0xdb, 0xff, 0xae, 0xb2, 0xae, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0x5c, 0x5e, 0x5c, 0xff,
+  0xad, 0xb0, 0xad, 0xff, 0xde, 0xdf, 0xde, 0xff,
+  0xf6, 0xf7, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xae, 0xb1, 0xae, 0xff,
+  0x72, 0x75, 0x72, 0xff, 0xab, 0xae, 0xab, 0xff,
+  0xea, 0xec, 0xea, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfa, 0xfa, 0xfa, 0xff, 0x78, 0x7a, 0x78, 0xff,
+  0x89, 0x8c, 0x89, 0xff, 0xe4, 0xe4, 0xe4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa9, 0xac, 0xa9, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0xde, 0xe2, 0xde, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc7, 0xca, 0xc7, 0xff,
+  0x61, 0x62, 0x61, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa0, 0xa1, 0xa0, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0xd4, 0xd5, 0xd4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xbe, 0xbf, 0xbe, 0xff,
+  0x81, 0x83, 0x81, 0xff, 0xb9, 0xba, 0xb9, 0xff,
+  0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf3, 0xf2, 0xff,
+  0xb6, 0xb8, 0xb6, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0xa6, 0xa9, 0xa6, 0xff, 0xec, 0xee, 0xec, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe3, 0xe5, 0xe3, 0xff,
+  0x95, 0x98, 0x95, 0xff, 0x77, 0x79, 0x77, 0xff,
+  0xcd, 0xcf, 0xcd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x8a, 0x8c, 0x8a, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0xca, 0xcc, 0xca, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xef, 0xf0, 0xef, 0xff, 0xdc, 0xdd, 0xdc, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0x97, 0x99, 0x97, 0xff, 0xc9, 0xca, 0xc9, 0xff,
+  0xf1, 0xf2, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe0, 0xe2, 0xe0, 0xff,
+  0x9f, 0xa2, 0x9f, 0xff, 0x70, 0x71, 0x70, 0xff,
+  0xbf, 0xc2, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xaf, 0xb0, 0xaf, 0xff,
+  0x78, 0x7a, 0x78, 0xff, 0xb1, 0xb2, 0xb1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa7, 0xaa, 0xa7, 0xff,
+  0x70, 0x72, 0x70, 0xff, 0xf1, 0xf3, 0xf1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd1, 0xd5, 0xd1, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xb8, 0xbc, 0xb8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x8c, 0x8d, 0x8c, 0xff, 0x8b, 0x8e, 0x8b, 0xff,
+  0xe3, 0xe4, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe3, 0xe5, 0xe3, 0xff, 0x8f, 0x91, 0x8f, 0xff,
+  0x91, 0x94, 0x91, 0xff, 0xdf, 0xe0, 0xdf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe9, 0xea, 0xe9, 0xff, 0xa4, 0xa7, 0xa4, 0xff,
+  0x76, 0x78, 0x76, 0xff, 0xc7, 0xc9, 0xc7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xe9, 0xeb, 0xe9, 0xff, 0xb7, 0xba, 0xb7, 0xff,
+  0x5d, 0x5e, 0x5d, 0xff, 0x4a, 0x4a, 0x4a, 0xff,
+  0xa0, 0xa3, 0xa0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb3, 0xb4, 0xb3, 0xff, 0x63, 0x64, 0x63, 0xff,
+  0xa3, 0xa6, 0xa3, 0xff, 0xf6, 0xf7, 0xf6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfa, 0xfa, 0xfa, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
+  0xa8, 0xaa, 0xa8, 0xff, 0x76, 0x78, 0x76, 0xff,
+  0x87, 0x89, 0x87, 0xff, 0xb3, 0xb5, 0xb3, 0xff,
+  0xe4, 0xe5, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe5, 0xe9, 0xe5, 0xff, 0x7a, 0x7c, 0x7a, 0xff,
+  0x8b, 0x8e, 0x8b, 0xff, 0xd4, 0xd6, 0xd4, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xed, 0xed, 0xff,
+  0x7e, 0x81, 0x7e, 0xff, 0x86, 0x88, 0x86, 0xff,
+  0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb6, 0xb9, 0xb6, 0xff,
+  0x5f, 0x61, 0x5f, 0xff, 0xd9, 0xdd, 0xd9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd7, 0xdb, 0xd7, 0xff,
+  0x6e, 0x70, 0x6e, 0xff, 0xba, 0xbd, 0xba, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x7b, 0x7d, 0x7b, 0xff, 0x98, 0x9b, 0x98, 0xff,
+  0xf1, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc4, 0xc7, 0xc4, 0xff, 0x74, 0x77, 0x74, 0xff,
+  0xb5, 0xb8, 0xb5, 0xff, 0xf3, 0xf4, 0xf3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xde, 0xe0, 0xde, 0xff,
+  0x7e, 0x81, 0x7e, 0xff, 0x8e, 0x90, 0x8e, 0xff,
+  0xeb, 0xeb, 0xeb, 0xff, 0xd3, 0xd4, 0xd3, 0xff,
+  0x9b, 0x9e, 0x9b, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x7c, 0x7e, 0x7c, 0xff, 0x70, 0x71, 0x70, 0xff,
+  0x67, 0x6a, 0x67, 0xff, 0xf9, 0xfa, 0xf9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe9, 0xea, 0xe9, 0xff,
+  0x5c, 0x5e, 0x5c, 0xff, 0x40, 0x41, 0x40, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0xeb, 0xed, 0xeb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xcc, 0xce, 0xcc, 0xff, 0x91, 0x92, 0x91, 0xff,
+  0x81, 0x83, 0x81, 0xff, 0x9a, 0x9c, 0x9a, 0xff,
+  0xde, 0xe0, 0xde, 0xff, 0xfb, 0xfb, 0xfb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc6, 0xc7, 0xc6, 0xff,
+  0x81, 0x84, 0x81, 0xff, 0x8f, 0x91, 0x8f, 0xff,
+  0xe3, 0xe5, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb6, 0xb7, 0xb6, 0xff, 0x88, 0x8a, 0x88, 0xff,
+  0xba, 0xbc, 0xba, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xd5, 0xd8, 0xd5, 0xff,
+  0x52, 0x54, 0x52, 0xff, 0xb0, 0xb3, 0xb0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xcf, 0xd3, 0xcf, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xba, 0xbd, 0xba, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x6d, 0x6f, 0x6d, 0xff, 0xb1, 0xb5, 0xb1, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x9a, 0x9c, 0x9a, 0xff, 0x6e, 0x71, 0x6e, 0xff,
+  0xd6, 0xda, 0xd6, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb3, 0xb6, 0xb3, 0xff, 0x61, 0x63, 0x61, 0xff,
+  0x93, 0x95, 0x93, 0xff, 0x83, 0x86, 0x83, 0xff,
+  0x83, 0x85, 0x83, 0xff, 0xaa, 0xad, 0xaa, 0xff,
+  0xdc, 0xe0, 0xdc, 0xff, 0xb4, 0xb7, 0xb4, 0xff,
+  0x64, 0x67, 0x64, 0xff, 0xcb, 0xce, 0xcb, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x96, 0x97, 0x96, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0x8c, 0x8e, 0x8c, 0xff,
+  0x74, 0x76, 0x74, 0xff, 0x93, 0x96, 0x93, 0xff,
+  0xe3, 0xe4, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf0, 0xf2, 0xf0, 0xff, 0xc1, 0xc3, 0xc1, 0xff,
+  0x8a, 0x8c, 0x8a, 0xff, 0x73, 0x75, 0x73, 0xff,
+  0xc5, 0xc8, 0xc5, 0xff, 0xed, 0xee, 0xed, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xb0, 0xb2, 0xb0, 0xff, 0x70, 0x73, 0x70, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0xe7, 0xe8, 0xe7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe6, 0xe7, 0xe6, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0x71, 0x73, 0x71, 0xff, 0xda, 0xde, 0xda, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x78, 0x7b, 0x78, 0xff, 0x7a, 0x7d, 0x7a, 0xff,
+  0xdd, 0xe0, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xaa, 0xad, 0xaa, 0xff,
+  0x5c, 0x5e, 0x5c, 0xff, 0xd1, 0xd4, 0xd1, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xd1, 0xd5, 0xd1, 0xff,
+  0x6d, 0x6f, 0x6d, 0xff, 0xc7, 0xcb, 0xc7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf5, 0xf5, 0xff,
+  0x73, 0x76, 0x73, 0xff, 0x93, 0x96, 0x93, 0xff,
+  0xfb, 0xfc, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe0, 0xe4, 0xe0, 0xff, 0x85, 0x86, 0x85, 0xff,
+  0x4e, 0x50, 0x4e, 0xff, 0x75, 0x78, 0x75, 0xff,
+  0xbc, 0xbf, 0xbc, 0xff, 0xe5, 0xe9, 0xe5, 0xff,
+  0xf5, 0xf9, 0xf5, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0x84, 0x87, 0x84, 0xff, 0x9d, 0xa0, 0x9d, 0xff,
+  0xe5, 0xe7, 0xe5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc7, 0xc8, 0xc7, 0xff, 0x75, 0x77, 0x75, 0xff,
+  0xb4, 0xb7, 0xb4, 0xff, 0xda, 0xde, 0xda, 0xff,
+  0x97, 0x99, 0x97, 0xff, 0x76, 0x79, 0x76, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0xd4, 0xd7, 0xd4, 0xff,
+  0xc0, 0xc2, 0xc0, 0xff, 0x6c, 0x6e, 0x6c, 0xff,
+  0x8b, 0x8d, 0x8b, 0xff, 0xd1, 0xd2, 0xd1, 0xff,
+  0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe1, 0xe3, 0xe1, 0xff, 0xa1, 0xa4, 0xa1, 0xff,
+  0x7d, 0x80, 0x7d, 0xff, 0xb3, 0xb5, 0xb3, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc1, 0xc3, 0xc1, 0xff,
+  0x74, 0x77, 0x74, 0xff, 0x9b, 0x9e, 0x9b, 0xff,
+  0xe9, 0xeb, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc3, 0xc6, 0xc3, 0xff, 0x5e, 0x60, 0x5e, 0xff,
+  0x8a, 0x8c, 0x8a, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x70, 0x72, 0x70, 0xff,
+  0x85, 0x87, 0x85, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf6, 0xf5, 0xff, 0xb9, 0xbc, 0xb9, 0xff,
+  0x70, 0x72, 0x70, 0xff, 0xd0, 0xd3, 0xd0, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xd9, 0xda, 0xd9, 0xff,
+  0x72, 0x74, 0x72, 0xff, 0xba, 0xbd, 0xba, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfb, 0xfc, 0xfb, 0xff, 0xc2, 0xc4, 0xc2, 0xff,
+  0x6f, 0x71, 0x6f, 0xff, 0x8f, 0x92, 0x8f, 0xff,
+  0xdc, 0xe0, 0xdc, 0xff, 0xe7, 0xeb, 0xe7, 0xff,
+  0xe4, 0xe8, 0xe4, 0xff, 0xe3, 0xe7, 0xe3, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0x82, 0x84, 0x82, 0xff,
+  0xc5, 0xc7, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf6, 0xf7, 0xf6, 0xff,
+  0x7a, 0x7c, 0x7a, 0xff, 0x96, 0x99, 0x96, 0xff,
+  0xcf, 0xd2, 0xcf, 0xff, 0xec, 0xf0, 0xec, 0xff,
+  0xe3, 0xe7, 0xe3, 0xff, 0x9f, 0xa1, 0x9f, 0xff,
+  0x58, 0x5a, 0x58, 0xff, 0x83, 0x86, 0x83, 0xff,
+  0x7d, 0x80, 0x7d, 0xff, 0x90, 0x92, 0x90, 0xff,
+  0xc9, 0xcb, 0xc9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xe1, 0xe5, 0xe1, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0x78, 0x7b, 0x78, 0xff,
+  0xdb, 0xdc, 0xdb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe6, 0xe7, 0xe6, 0xff,
+  0x9f, 0xa1, 0x9f, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0xd1, 0xd4, 0xd1, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xaf, 0xb2, 0xaf, 0xff,
+  0x59, 0x5b, 0x59, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x99, 0x9c, 0x99, 0xff, 0x61, 0x63, 0x61, 0xff,
+  0xcc, 0xd0, 0xcc, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xef, 0xf0, 0xef, 0xff, 0xa2, 0xa5, 0xa2, 0xff,
+  0x66, 0x69, 0x66, 0xff, 0xaf, 0xb2, 0xaf, 0xff,
+  0xd4, 0xd6, 0xd4, 0xff, 0xe1, 0xe3, 0xe1, 0xff,
+  0xdc, 0xde, 0xdc, 0xff, 0xa0, 0xa3, 0xa0, 0xff,
+  0x74, 0x76, 0x74, 0xff, 0xd5, 0xd7, 0xd5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xee, 0xed, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0x80, 0x82, 0x80, 0xff,
+  0xb4, 0xb8, 0xb4, 0xff, 0xb1, 0xb5, 0xb1, 0xff,
+  0x7b, 0x7f, 0x7b, 0xff, 0x9f, 0xa2, 0x9f, 0xff,
+  0x9b, 0x9e, 0x9b, 0xff, 0x69, 0x6c, 0x69, 0xff,
+  0x9b, 0x9c, 0x9b, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xad, 0xae, 0xad, 0xff,
+  0x7d, 0x80, 0x7d, 0xff, 0x93, 0x96, 0x93, 0xff,
+  0xaf, 0xb2, 0xaf, 0xff, 0xb0, 0xb3, 0xb0, 0xff,
+  0xf0, 0xf4, 0xf0, 0xff, 0xd2, 0xd6, 0xd2, 0xff,
+  0x78, 0x7a, 0x78, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0x84, 0x87, 0x84, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xc6, 0xc7, 0xc6, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0x93, 0x95, 0x93, 0xff, 0xec, 0xed, 0xec, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xeb, 0xeb, 0xeb, 0xff,
+  0xac, 0xaf, 0xac, 0xff, 0x6d, 0x6f, 0x6d, 0xff,
+  0x98, 0x9a, 0x98, 0xff, 0xdc, 0xdd, 0xdc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0x5e, 0x60, 0x5e, 0xff, 0x3a, 0x3b, 0x3a, 0xff,
+  0x86, 0x89, 0x86, 0xff, 0xc1, 0xc4, 0xc1, 0xff,
+  0xde, 0xe2, 0xde, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd4, 0xd8, 0xd4, 0xff, 0x8b, 0x8e, 0x8b, 0xff,
+  0x36, 0x38, 0x36, 0xff, 0x7d, 0x80, 0x7d, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe5, 0xe7, 0xe5, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0x4a, 0x4b, 0x4a, 0xff, 0x72, 0x74, 0x72, 0xff,
+  0x88, 0x8b, 0x88, 0xff, 0x98, 0x9b, 0x98, 0xff,
+  0x92, 0x95, 0x92, 0xff, 0x6d, 0x70, 0x6d, 0xff,
+  0x8a, 0x8d, 0x8a, 0xff, 0xe6, 0xe8, 0xe6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff,
+  0xe7, 0xe7, 0xe7, 0xff, 0x89, 0x8c, 0x89, 0xff,
+  0x77, 0x79, 0x77, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0x57, 0x59, 0x57, 0xff, 0x68, 0x6b, 0x68, 0xff,
+  0x65, 0x68, 0x65, 0xff, 0x4a, 0x4c, 0x4a, 0xff,
+  0x7a, 0x7c, 0x7a, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd3, 0xd4, 0xd3, 0xff, 0x68, 0x6a, 0x68, 0xff,
+  0x50, 0x51, 0x50, 0xff, 0x62, 0x64, 0x62, 0xff,
+  0x4b, 0x4b, 0x4b, 0xff, 0x88, 0x8a, 0x88, 0xff,
+  0xd9, 0xdc, 0xd9, 0xff, 0xd0, 0xd3, 0xd0, 0xff,
+  0x60, 0x62, 0x60, 0xff, 0x7e, 0x81, 0x7e, 0xff,
+  0xd5, 0xd7, 0xd5, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf5, 0xf5, 0xf5, 0xff, 0xb4, 0xb7, 0xb4, 0xff,
+  0x58, 0x5a, 0x58, 0xff, 0xb0, 0xb3, 0xb0, 0xff,
+  0xed, 0xed, 0xed, 0xff, 0xf8, 0xf8, 0xf8, 0xff,
+  0xd4, 0xd6, 0xd4, 0xff, 0x99, 0x9c, 0x99, 0xff,
+  0x99, 0x9c, 0x99, 0xff, 0x97, 0x9a, 0x97, 0xff,
+  0x6a, 0x6c, 0x6a, 0xff, 0xaf, 0xb1, 0xaf, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xb5, 0xb8, 0xb5, 0xff,
+  0x4f, 0x50, 0x4f, 0xff, 0x8d, 0x8f, 0x8d, 0xff,
+  0x6b, 0x6d, 0x6b, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0x6d, 0x6f, 0x6d, 0xff, 0x92, 0x95, 0x92, 0xff,
+  0xa5, 0xa8, 0xa5, 0xff, 0xa7, 0xaa, 0xa7, 0xff,
+  0xa0, 0xa3, 0xa0, 0xff, 0x8a, 0x8d, 0x8a, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0x51, 0x53, 0x51, 0xff,
+  0x6f, 0x72, 0x6f, 0xff, 0x69, 0x6b, 0x69, 0xff,
+  0xdd, 0xe1, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xde, 0xe0, 0xde, 0xff, 0x80, 0x82, 0x80, 0xff,
+  0x80, 0x83, 0x80, 0xff, 0xa9, 0xac, 0xa9, 0xff,
+  0xa7, 0xa9, 0xa7, 0xff, 0x9a, 0x9d, 0x9a, 0xff,
+  0x6b, 0x6c, 0x6b, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0xac, 0xae, 0xac, 0xff, 0xf4, 0xf6, 0xf4, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfe, 0xfe, 0xfe, 0xff, 0xc0, 0xc3, 0xc0, 0xff,
+  0x53, 0x55, 0x53, 0xff, 0x48, 0x4a, 0x48, 0xff,
+  0x7a, 0x7c, 0x7a, 0xff, 0xdb, 0xdf, 0xdb, 0xff,
+  0xb9, 0xbc, 0xb9, 0xff, 0x87, 0x89, 0x87, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0xf6, 0xf6, 0xf6, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x83, 0x84, 0x83, 0xff, 0x3c, 0x3e, 0x3c, 0xff,
+  0x4e, 0x50, 0x4e, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x71, 0x73, 0x71, 0xff, 0x7e, 0x80, 0x7e, 0xff,
+  0xc7, 0xca, 0xc7, 0xff, 0x7b, 0x7d, 0x7b, 0xff,
+  0x8e, 0x91, 0x8e, 0xff, 0xcd, 0xcf, 0xcd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe3, 0xe6, 0xe3, 0xff,
+  0x9b, 0x9e, 0x9b, 0xff, 0x82, 0x85, 0x82, 0xff,
+  0xb4, 0xb6, 0xb4, 0xff, 0xd7, 0xd9, 0xd7, 0xff,
+  0x8e, 0x90, 0x8e, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xb5, 0xb8, 0xb5, 0xff, 0xe4, 0xe8, 0xe4, 0xff,
+  0x7f, 0x82, 0x7f, 0xff, 0x80, 0x83, 0x80, 0xff,
+  0xd1, 0xd2, 0xd1, 0xff, 0xf9, 0xfa, 0xf9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x96, 0x99, 0x96, 0xff,
+  0x6c, 0x6f, 0x6c, 0xff, 0xb1, 0xb4, 0xb1, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0xb2, 0xb5, 0xb2, 0xff,
+  0xa0, 0xa3, 0xa0, 0xff, 0x81, 0x84, 0x81, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0x66, 0x69, 0x66, 0xff,
+  0x71, 0x74, 0x71, 0xff, 0x82, 0x84, 0x82, 0xff,
+  0x70, 0x73, 0x70, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0xb3, 0xb6, 0xb3, 0xff, 0x59, 0x5b, 0x59, 0xff,
+  0xcb, 0xce, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xd7, 0xd9, 0xd7, 0xff, 0x7c, 0x7f, 0x7c, 0xff,
+  0xad, 0xb1, 0xad, 0xff, 0xdf, 0xe3, 0xdf, 0xff,
+  0xe7, 0xea, 0xe7, 0xff, 0xde, 0xe2, 0xde, 0xff,
+  0x94, 0x97, 0x94, 0xff, 0x7c, 0x7e, 0x7c, 0xff,
+  0xd3, 0xd4, 0xd3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xf0, 0xed, 0xff,
+  0x77, 0x79, 0x77, 0xff, 0x33, 0x34, 0x33, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0xe8, 0xe9, 0xe8, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xec, 0xed, 0xec, 0xff,
+  0xed, 0xef, 0xed, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe5, 0xe7, 0xe5, 0xff,
+  0x9a, 0x9d, 0x9a, 0xff, 0x64, 0x66, 0x64, 0xff,
+  0xab, 0xad, 0xab, 0xff, 0xd7, 0xda, 0xd7, 0xff,
+  0x7f, 0x81, 0x7f, 0xff, 0x6c, 0x6e, 0x6c, 0xff,
+  0x80, 0x83, 0x80, 0xff, 0x76, 0x78, 0x76, 0xff,
+  0xc6, 0xc9, 0xc6, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfb, 0xfc, 0xfb, 0xff,
+  0xeb, 0xeb, 0xeb, 0xff, 0x8a, 0x8c, 0x8a, 0xff,
+  0x58, 0x59, 0x58, 0xff, 0x6a, 0x6c, 0x6a, 0xff,
+  0x84, 0x86, 0x84, 0xff, 0xcb, 0xcf, 0xcb, 0xff,
+  0xf1, 0xf5, 0xf1, 0xff, 0xf5, 0xf9, 0xf5, 0xff,
+  0xc0, 0xc3, 0xc0, 0xff, 0x81, 0x85, 0x81, 0xff,
+  0x8d, 0x90, 0x8d, 0xff, 0xde, 0xe1, 0xde, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x7b, 0x7d, 0x7b, 0xff,
+  0x80, 0x81, 0x80, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0x76, 0x79, 0x76, 0xff, 0xee, 0xf0, 0xee, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa8, 0xab, 0xa8, 0xff, 0x6f, 0x71, 0x6f, 0xff,
+  0xd1, 0xd5, 0xd1, 0xff, 0x5d, 0x5f, 0x5d, 0xff,
+  0xa1, 0xa4, 0xa1, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc4, 0xc7, 0xc4, 0xff, 0x6e, 0x71, 0x6e, 0xff,
+  0xab, 0xae, 0xab, 0xff, 0xb5, 0xb8, 0xb5, 0xff,
+  0xd6, 0xda, 0xd6, 0xff, 0xe1, 0xe5, 0xe1, 0xff,
+  0x82, 0x85, 0x82, 0xff, 0x94, 0x97, 0x94, 0xff,
+  0xe9, 0xea, 0xe9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xb2, 0xb3, 0xb2, 0xff, 0x54, 0x56, 0x54, 0xff,
+  0x7d, 0x7f, 0x7d, 0xff, 0xde, 0xdf, 0xde, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xda, 0xdb, 0xda, 0xff, 0xea, 0xeb, 0xea, 0xff,
+  0xf1, 0xf2, 0xf1, 0xff, 0xda, 0xdc, 0xda, 0xff,
+  0x72, 0x75, 0x72, 0xff, 0x40, 0x41, 0x40, 0xff,
+  0x5d, 0x5f, 0x5d, 0xff, 0xc0, 0xc3, 0xc0, 0xff,
+  0xee, 0xef, 0xee, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xce, 0xd0, 0xce, 0xff,
+  0x79, 0x7b, 0x79, 0xff, 0x51, 0x52, 0x51, 0xff,
+  0xa0, 0xa3, 0xa0, 0xff, 0xec, 0xf0, 0xec, 0xff,
+  0xe6, 0xea, 0xe6, 0xff, 0xce, 0xd2, 0xce, 0xff,
+  0xdf, 0xe3, 0xdf, 0xff, 0x99, 0x9c, 0x99, 0xff,
+  0x64, 0x66, 0x64, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xec, 0xed, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xa6, 0xa9, 0xa6, 0xff,
+  0x58, 0x5a, 0x58, 0xff, 0x5b, 0x5d, 0x5b, 0xff,
+  0x92, 0x95, 0x92, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xa8, 0xac, 0xa8, 0xff, 0x68, 0x6b, 0x68, 0xff,
+  0xc8, 0xcb, 0xc8, 0xff, 0x56, 0x58, 0x56, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xac, 0xaf, 0xac, 0xff, 0x5e, 0x60, 0x5e, 0xff,
+  0x77, 0x79, 0x77, 0xff, 0x58, 0x59, 0x58, 0xff,
+  0x96, 0x98, 0x96, 0xff, 0xca, 0xcd, 0xca, 0xff,
+  0x63, 0x65, 0x63, 0xff, 0xad, 0xb0, 0xad, 0xff,
+  0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe0, 0xe2, 0xe0, 0xff, 0xac, 0xaf, 0xac, 0xff,
+  0xc1, 0xc3, 0xc1, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xed, 0xee, 0xed, 0xff,
+  0x61, 0x63, 0x61, 0xff, 0x5e, 0x5f, 0x5e, 0xff,
+  0xac, 0xae, 0xac, 0xff, 0xef, 0xf1, 0xef, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf6, 0xf5, 0xff,
+  0xcb, 0xce, 0xcb, 0xff, 0x58, 0x59, 0x58, 0xff,
+  0x9e, 0xa1, 0x9e, 0xff, 0xdf, 0xe2, 0xdf, 0xff,
+  0xae, 0xb1, 0xae, 0xff, 0x73, 0x76, 0x73, 0xff,
+  0x6b, 0x6c, 0x6b, 0xff, 0x77, 0x79, 0x77, 0xff,
+  0x50, 0x52, 0x50, 0xff, 0x6f, 0x71, 0x6f, 0xff,
+  0xc6, 0xc9, 0xc6, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xdf, 0xe3, 0xdf, 0xff,
+  0x85, 0x88, 0x85, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0xb9, 0xbc, 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xc3, 0xc6, 0xc3, 0xff, 0x57, 0x59, 0x57, 0xff,
+  0x61, 0x62, 0x61, 0xff, 0x41, 0x43, 0x41, 0xff,
+  0xa8, 0xab, 0xa8, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xf7, 0xff,
+  0x98, 0x9b, 0x98, 0xff, 0x2b, 0x2c, 0x2b, 0xff,
+  0x55, 0x56, 0x55, 0xff, 0x77, 0x79, 0x77, 0xff,
+  0x63, 0x66, 0x63, 0xff, 0x95, 0x98, 0x95, 0xff,
+  0x5f, 0x61, 0x5f, 0xff, 0xd5, 0xd9, 0xd5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfa, 0xfa, 0xfa, 0xff, 0xee, 0xef, 0xee, 0xff,
+  0xf4, 0xf4, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf1, 0xf2, 0xf1, 0xff,
+  0xc6, 0xc9, 0xc6, 0xff, 0xbb, 0xbd, 0xbb, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf8, 0xf9, 0xf8, 0xff, 0xa1, 0xa2, 0xa1, 0xff,
+  0x82, 0x84, 0x82, 0xff, 0x9f, 0xa2, 0x9f, 0xff,
+  0x88, 0x8b, 0x88, 0xff, 0x56, 0x58, 0x56, 0xff,
+  0x92, 0x95, 0x92, 0xff, 0x83, 0x86, 0x83, 0xff,
+  0x5d, 0x60, 0x5d, 0xff, 0x4c, 0x4e, 0x4c, 0xff,
+  0xbc, 0xbf, 0xbc, 0xff, 0xf7, 0xf8, 0xf7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf5, 0xf7, 0xf5, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xc3, 0xc6, 0xc3, 0xff,
+  0xa9, 0xac, 0xa9, 0xff, 0xb4, 0xb7, 0xb4, 0xff,
+  0xeb, 0xed, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe9, 0xe9, 0xe9, 0xff,
+  0x79, 0x7b, 0x79, 0xff, 0x2f, 0x30, 0x2f, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0xc2, 0xc5, 0xc2, 0xff,
+  0x69, 0x6c, 0x69, 0xff, 0x51, 0x52, 0x51, 0xff,
+  0x65, 0x67, 0x65, 0xff, 0xe9, 0xec, 0xe9, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xfb, 0xfb, 0xfb, 0xff, 0xf7, 0xf8, 0xf7, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe4, 0xe4, 0xe4, 0xff,
+  0x92, 0x94, 0x92, 0xff, 0x68, 0x6a, 0x68, 0xff,
+  0x76, 0x78, 0x76, 0xff, 0x6e, 0x70, 0x6e, 0xff,
+  0xda, 0xdb, 0xda, 0xff, 0xe7, 0xe8, 0xe7, 0xff,
+  0xd5, 0xd6, 0xd5, 0xff, 0xe1, 0xe3, 0xe1, 0xff,
+  0xe5, 0xe7, 0xe5, 0xff, 0xfc, 0xfc, 0xfc, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xe7, 0xe8, 0xe7, 0xff,
+  0x96, 0x98, 0x96, 0xff, 0x7e, 0x81, 0x7e, 0xff,
+  0xd4, 0xd6, 0xd4, 0xff, 0xe6, 0xe8, 0xe6, 0xff,
+  0x90, 0x93, 0x90, 0xff, 0x46, 0x48, 0x46, 0xff,
+  0x83, 0x84, 0x83, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xcb, 0xcd, 0xcb, 0xff, 0x80, 0x82, 0x80, 0xff,
+  0x48, 0x49, 0x48, 0xff, 0x6c, 0x6e, 0x6c, 0xff,
+  0xda, 0xdc, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf2, 0xf2, 0xf2, 0xff,
+  0xf9, 0xf9, 0xf9, 0xff, 0xf8, 0xf9, 0xf8, 0xff,
+  0xbc, 0xbe, 0xbc, 0xff, 0x77, 0x7a, 0x77, 0xff,
+  0xae, 0xaf, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf0, 0xf1, 0xf0, 0xff, 0xc0, 0xc2, 0xc0, 0xff,
+  0x5c, 0x5f, 0x5c, 0xff, 0x4c, 0x4e, 0x4c, 0xff,
+  0xec, 0xed, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xe7, 0xe8, 0xe7, 0xff, 0xc9, 0xcb, 0xc9, 0xff,
+  0xe0, 0xe1, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xff,
+  0xae, 0xb1, 0xae, 0xff, 0x9a, 0x9d, 0x9a, 0xff,
+  0xe3, 0xe4, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xf4, 0xf4, 0xf4, 0xff, 0xfd, 0xfd, 0xfd, 0xff,
+  0xfa, 0xfb, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29,
+  0x67, 0x69, 0x6d, 0x70, 0x2f, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x77, 0x61, 0x6e, 0x64,
+  0x61, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00,
+  0x18, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x64, 0x6b, 0x50, 0x00, 0x00, 0x63, 0x18,
+  0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x04, 0x80,
+  0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x16,
+  0x41, 0x7c, 0xd2, 0xb8, 0x41, 0x7c, 0xd2, 0xb8,
+  0x41, 0x7c, 0xd2, 0xb8, 0x41, 0x7c, 0xd2, 0xb8,
+  0x39, 0x6d, 0xb8, 0xbf, 0x40, 0x7a, 0xcf, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb8, 0x38, 0x6c, 0xb7, 0xbf,
+  0x39, 0x6d, 0xb9, 0xbe, 0x41, 0x7c, 0xd2, 0xb8,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x38, 0x6e, 0xba, 0xbf,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x33, 0x63, 0xa9, 0xc3, 0x3c, 0x74, 0xc5, 0xbc,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xb9, 0x40, 0x7c, 0xd2, 0xb9,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xba, 0x40, 0x7c, 0xd2, 0xba,
+  0x39, 0x6f, 0xbc, 0xbf, 0x40, 0x7c, 0xd2, 0xba,
+  0x40, 0x7c, 0xd2, 0xbb, 0x30, 0x5d, 0x9d, 0xc8,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x40, 0x7c, 0xd2, 0xbb,
+  0x40, 0x7c, 0xd2, 0xbb, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3a, 0x72, 0xc2, 0xc0,
+  0x3e, 0x7b, 0xd0, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x31, 0x61, 0xa5, 0xc7, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7b, 0xce, 0xbd, 0x3f, 0x7c, 0xd2, 0xbc,
+  0x3f, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x49, 0x78, 0xc0, 0xc0, 0x9b, 0x62, 0x30, 0xed,
+  0xac, 0x5d, 0x11, 0xf9, 0xa3, 0x61, 0x23, 0xf2,
+  0x66, 0x6f, 0x89, 0xcf, 0x45, 0x7a, 0xc6, 0xbf,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd2, 0xbc, 0x40, 0x7c, 0xd2, 0xbc,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x38, 0x6d, 0xb9, 0xc3, 0x3f, 0x7a, 0xd0, 0xbe,
+  0x40, 0x7c, 0xd3, 0xbd, 0x38, 0x6c, 0xb9, 0xc3,
+  0x38, 0x6d, 0xbb, 0xc3, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x39, 0x6e, 0xbc, 0xc2,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x33, 0x64, 0xaa, 0xc7, 0x3c, 0x74, 0xc6, 0xc0,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x39, 0x6f, 0xbd, 0xc2, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x30, 0x5d, 0x9e, 0xca,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x3a, 0x71, 0xc1, 0xc1, 0x40, 0x7c, 0xd3, 0xbd,
+  0x3f, 0x7b, 0xd1, 0xbd, 0x32, 0x62, 0xa7, 0xc8,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x41, 0x7b, 0xcf, 0xbe, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x49, 0x78, 0xc1, 0xc1, 0x9b, 0x62, 0x31, 0xed,
+  0xac, 0x5d, 0x11, 0xf9, 0xa3, 0x61, 0x24, 0xf2,
+  0x66, 0x6f, 0x8a, 0xcf, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x44, 0x7a, 0xca, 0xbf, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x40, 0x7c, 0xd3, 0xbd, 0x40, 0x7c, 0xd3, 0xbd,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7d, 0xd0, 0xb1, 0x49, 0x73, 0xad, 0xc2,
+  0x43, 0x7e, 0xd2, 0xb0, 0x42, 0x67, 0x9d, 0xc6,
+  0x3d, 0x64, 0x9c, 0xc5, 0x43, 0x7e, 0xd2, 0xb0,
+  0x42, 0x67, 0xa0, 0xbf, 0x68, 0x71, 0x8b, 0xc4,
+  0x5f, 0x73, 0x9a, 0xc0, 0x45, 0x7d, 0xcc, 0xb2,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x4a, 0x7b, 0xc5, 0xb3, 0x45, 0x7d, 0xd0, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x44, 0x7e, 0xd2, 0xb0, 0x48, 0x79, 0xc1, 0xb8,
+  0x46, 0x78, 0xc0, 0xb8, 0x44, 0x7e, 0xd2, 0xb0,
+  0x3f, 0x59, 0x7f, 0xd4, 0x40, 0x6f, 0xb4, 0xba,
+  0x44, 0x7e, 0xd2, 0xb0, 0x3a, 0x68, 0xaa, 0xbc,
+  0x45, 0x7d, 0xd0, 0xb0, 0x44, 0x7d, 0xce, 0xb2,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x43, 0x7e, 0xd2, 0xb1, 0x43, 0x7e, 0xd2, 0xb1,
+  0x42, 0x7e, 0xd2, 0xb1, 0x42, 0x7e, 0xd2, 0xb1,
+  0x42, 0x7e, 0xd2, 0xb1, 0x42, 0x7e, 0xd2, 0xb1,
+  0x42, 0x7e, 0xd2, 0xb1, 0x42, 0x7e, 0xd2, 0xb1,
+  0x42, 0x7e, 0xd2, 0xb2, 0x42, 0x7e, 0xd2, 0xb2,
+  0x42, 0x7e, 0xd2, 0xb2, 0x42, 0x7e, 0xd2, 0xb2,
+  0x42, 0x7e, 0xd2, 0xb2, 0x42, 0x7e, 0xd2, 0xb2,
+  0x48, 0x74, 0xb3, 0xc1, 0x42, 0x7e, 0xd2, 0xb2,
+  0x41, 0x7c, 0xce, 0xb3, 0x38, 0x4d, 0x6a, 0xde,
+  0x42, 0x7e, 0xd2, 0xb2, 0x39, 0x68, 0xac, 0xbe,
+  0x43, 0x7c, 0xd0, 0xb2, 0x43, 0x7c, 0xce, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb2, 0x42, 0x7d, 0xd2, 0xb2,
+  0x42, 0x7d, 0xd2, 0xb2, 0x42, 0x7d, 0xd2, 0xb2,
+  0x42, 0x7d, 0xd2, 0xb2, 0x42, 0x7d, 0xd2, 0xb2,
+  0x42, 0x7d, 0xd2, 0xb2, 0x42, 0x7d, 0xd2, 0xb2,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xcf, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7c, 0xd1, 0xb3,
+  0x48, 0x74, 0xb4, 0xc2, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x5c, 0x83, 0xd6, 0x59, 0x6d, 0x94, 0xc5,
+  0x89, 0x67, 0x4e, 0xdc, 0x94, 0x56, 0x1a, 0xf6,
+  0xb1, 0x5a, 0x05, 0xfe, 0xb0, 0x59, 0x05, 0xfd,
+  0xab, 0x5f, 0x16, 0xf6, 0x98, 0x64, 0x37, 0xe6,
+  0x64, 0x71, 0x90, 0xc5, 0x50, 0x77, 0xb5, 0xba,
+  0xa8, 0x5e, 0x18, 0xf4, 0xd9, 0x9d, 0x58, 0xfe,
+  0xf7, 0xc7, 0x85, 0xff, 0xeb, 0xb3, 0x6d, 0xff,
+  0xb5, 0x62, 0x0f, 0xfd, 0x88, 0x64, 0x4a, 0xdd,
+  0x91, 0x61, 0x3a, 0xe4, 0x48, 0x7a, 0xc5, 0xb6,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb3,
+  0x42, 0x7d, 0xd2, 0xb3, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb4, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb4, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb4, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb4, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb4, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7c, 0xd0, 0xb5, 0x49, 0x72, 0xae, 0xc5,
+  0x42, 0x7d, 0xd2, 0xb4, 0x41, 0x67, 0x9e, 0xc9,
+  0x3d, 0x64, 0x9c, 0xc8, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x67, 0xa1, 0xc3, 0x66, 0x71, 0x8c, 0xc7,
+  0x5e, 0x72, 0x9b, 0xc3, 0x44, 0x7c, 0xcc, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb4, 0x42, 0x7d, 0xd2, 0xb4,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x49, 0x7b, 0xc5, 0xb8, 0x43, 0x7c, 0xd0, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x42, 0x7d, 0xd2, 0xb5,
+  0x42, 0x7d, 0xd2, 0xb5, 0x45, 0x79, 0xc2, 0xbe,
+  0x43, 0x77, 0xc1, 0xbd, 0x41, 0x7d, 0xd2, 0xb6,
+  0x3d, 0x59, 0x80, 0xd7, 0x3d, 0x6f, 0xb5, 0xbf,
+  0x41, 0x7d, 0xd2, 0xb6, 0x38, 0x68, 0xab, 0xc1,
+  0x42, 0x7c, 0xd0, 0xb6, 0x42, 0x7c, 0xce, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x41, 0x7d, 0xd2, 0xb6,
+  0x47, 0x74, 0xb4, 0xc4, 0x41, 0x7d, 0xd2, 0xb6,
+  0x41, 0x7d, 0xd2, 0xb6, 0x39, 0x4d, 0x69, 0xe1,
+  0x41, 0x7d, 0xd2, 0xb6, 0x3a, 0x6c, 0xb2, 0xbf,
+  0x3f, 0x79, 0xcc, 0xb7, 0x42, 0x7c, 0xce, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xcf, 0xb8,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7d, 0xd2, 0xb7, 0x41, 0x7d, 0xd2, 0xb7,
+  0x41, 0x7c, 0xd2, 0xb7, 0x41, 0x7c, 0xd2, 0xb7,
+  0x41, 0x7c, 0xd2, 0xb7, 0x41, 0x7c, 0xd2, 0xb7,
+  0x41, 0x7c, 0xd2, 0xb7, 0x41, 0x7c, 0xd2, 0xb7,
+  0x41, 0x7c, 0xd2, 0xb8, 0x41, 0x7c, 0xd2, 0xb8,
+  0x41, 0x7c, 0xd2, 0xb8, 0x41, 0x7c, 0xd2, 0xb8,
+  0x41, 0x7c, 0xd2, 0xb8, 0x41, 0x7c, 0xd2, 0xb8,
+  0x41, 0x7c, 0xd2, 0xb8, 0x41, 0x7c, 0xd2, 0xb8,
+  0x49, 0x75, 0xb5, 0xc6, 0x41, 0x7c, 0xd2, 0xb8,
+  0x41, 0x75, 0xc1, 0xbe, 0x4b, 0x56, 0x6c, 0xde,
+  0x88, 0x66, 0x50, 0xdf, 0x94, 0x56, 0x1b, 0xf6,
+  0xb0, 0x58, 0x02, 0xfe, 0xb0, 0x59, 0x05, 0xfd,
+  0xab, 0x5f, 0x16, 0xf6, 0x97, 0x64, 0x38, 0xe8,
+  0x63, 0x70, 0x91, 0xc9, 0x4f, 0x77, 0xb6, 0xbf,
+  0xa8, 0x5e, 0x18, 0xf5, 0xd8, 0x99, 0x52, 0xfd,
+  0xf7, 0xc6, 0x83, 0xff, 0xea, 0xb1, 0x68, 0xff,
+  0xb4, 0x61, 0x0d, 0xfd, 0x7f, 0x67, 0x5d, 0xda,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x81, 0x66, 0x59, 0xdc, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x41, 0x7c, 0xd2, 0xb9, 0x41, 0x7c, 0xd2, 0xb9,
+  0x45, 0x80, 0xd2, 0xa7, 0x45, 0x80, 0xd2, 0xa7,
+  0x45, 0x80, 0xd2, 0xa7, 0x45, 0x80, 0xd2, 0xa7,
+  0x45, 0x80, 0xd2, 0xa7, 0x69, 0x83, 0xa7, 0xcf,
+  0x4f, 0x82, 0xc8, 0xb0, 0x6a, 0x8b, 0xb9, 0xc4,
+  0x8b, 0x7f, 0x7a, 0xe4, 0xad, 0x66, 0x20, 0xf3,
+  0xa7, 0x7e, 0x54, 0xfe, 0xd7, 0xa3, 0x66, 0xfc,
+  0xd6, 0xa0, 0x64, 0xfd, 0xbb, 0x6d, 0x23, 0xfd,
+  0xa6, 0x62, 0x1f, 0xee, 0x7a, 0x6c, 0x6a, 0xc9,
+  0x49, 0x7d, 0xc9, 0xa9, 0x45, 0x80, 0xd2, 0xa8,
+  0x77, 0x6d, 0x70, 0xc8, 0x9e, 0x65, 0x2f, 0xe6,
+  0xa6, 0x62, 0x21, 0xee, 0xac, 0x60, 0x18, 0xf4,
+  0xb3, 0x62, 0x16, 0xf9, 0xb0, 0x59, 0x05, 0xfd,
+  0x93, 0x62, 0x3a, 0xdf, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x7f, 0xd2, 0xa8,
+  0x70, 0x87, 0xa6, 0xd5, 0x45, 0x7f, 0xd2, 0xa8,
+  0x83, 0x93, 0xab, 0xdf, 0x69, 0x7d, 0xa0, 0xc5,
+  0x87, 0x69, 0x56, 0xd9, 0x92, 0x69, 0x44, 0xf3,
+  0xb0, 0x5b, 0x09, 0xfc, 0xb2, 0x5b, 0x08, 0xfe,
+  0xac, 0x5f, 0x15, 0xf4, 0x8e, 0x67, 0x48, 0xd9,
+  0x66, 0x72, 0x91, 0xbc, 0x45, 0x7f, 0xd2, 0xa8,
+  0x45, 0x7f, 0xd2, 0xa8, 0x45, 0x7f, 0xd2, 0xa8,
+  0x45, 0x7f, 0xd2, 0xa8, 0x4b, 0x7c, 0xc5, 0xab,
+  0x5e, 0x76, 0xa0, 0xb7, 0x59, 0x77, 0xab, 0xb3,
+  0x52, 0x7a, 0xb7, 0xb0, 0x4c, 0x7c, 0xc4, 0xac,
+  0x46, 0x7e, 0xd0, 0xa8, 0x45, 0x7f, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x45, 0x80, 0xd2, 0xa9, 0x45, 0x80, 0xd2, 0xa9,
+  0x5f, 0x82, 0xb4, 0xc3, 0x59, 0x84, 0xc0, 0xba,
+  0x55, 0x85, 0xc8, 0xb4, 0x87, 0x8f, 0x9a, 0xea,
+  0x86, 0x68, 0x55, 0xd4, 0x90, 0x6e, 0x4f, 0xf4,
+  0xb0, 0x5a, 0x07, 0xfc, 0xb0, 0x58, 0x02, 0xfe,
+  0xae, 0x5d, 0x0d, 0xf9, 0xa3, 0x63, 0x26, 0xeb,
+  0x88, 0x68, 0x52, 0xd6, 0x58, 0x77, 0xab, 0xb5,
+  0x45, 0x7f, 0xd2, 0xaa, 0x45, 0x7f, 0xd2, 0xaa,
+  0x6d, 0x70, 0x84, 0xc2, 0xa5, 0x62, 0x23, 0xed,
+  0xb0, 0x5b, 0x08, 0xfb, 0xb1, 0x5a, 0x07, 0xfe,
+  0xaf, 0x5e, 0x10, 0xf9, 0xa2, 0x5f, 0x1f, 0xee,
+  0x65, 0x72, 0x90, 0xbe, 0x44, 0x7f, 0xd2, 0xaa,
+  0x44, 0x7f, 0xd2, 0xaa, 0x44, 0x7f, 0xd2, 0xaa,
+  0x44, 0x7f, 0xd2, 0xaa, 0x44, 0x7f, 0xd2, 0xaa,
+  0x44, 0x7f, 0xd2, 0xaa, 0x44, 0x7f, 0xd2, 0xaa,
+  0x44, 0x7f, 0xd2, 0xaa, 0x44, 0x7f, 0xd2, 0xaa,
+  0x44, 0x7f, 0xd2, 0xaa, 0x44, 0x80, 0xd2, 0xaa,
+  0x44, 0x80, 0xd2, 0xaa, 0x44, 0x80, 0xd2, 0xaa,
+  0x44, 0x80, 0xd2, 0xaa, 0x44, 0x80, 0xd2, 0xaa,
+  0x44, 0x80, 0xd2, 0xaa, 0x44, 0x80, 0xd2, 0xaa,
+  0x67, 0x83, 0xa9, 0xcf, 0x50, 0x81, 0xc4, 0xb4,
+  0x90, 0x7f, 0x72, 0xe7, 0xac, 0x76, 0x41, 0xfc,
+  0xee, 0xc1, 0x88, 0xff, 0xc6, 0xb4, 0x9c, 0xff,
+  0xfd, 0xe5, 0xc1, 0xff, 0xfd, 0xe6, 0xc3, 0xff,
+  0xfa, 0xdc, 0xb1, 0xff, 0xf1, 0xc7, 0x8e, 0xff,
+  0xca, 0x86, 0x40, 0xfc, 0xb1, 0x5b, 0x06, 0xfe,
+  0xde, 0xa4, 0x5f, 0xfe, 0xfd, 0xd7, 0xa0, 0xff,
+  0xfc, 0xc7, 0x7a, 0xff, 0xf5, 0xc5, 0x84, 0xff,
+  0xb0, 0x5b, 0x08, 0xfb, 0x4f, 0x7a, 0xbb, 0xb1,
+  0xad, 0x5b, 0x0b, 0xf9, 0xaa, 0x5e, 0x14, 0xf5,
+  0x5b, 0x76, 0xa5, 0xb8, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x44, 0x7f, 0xd2, 0xab,
+  0x44, 0x7f, 0xd2, 0xab, 0x69, 0x83, 0xa8, 0xd1,
+  0x4e, 0x81, 0xc9, 0xb3, 0x69, 0x8b, 0xba, 0xc7,
+  0x8a, 0x7f, 0x7a, 0xe6, 0xad, 0x66, 0x20, 0xf4,
+  0xa5, 0x7a, 0x50, 0xfe, 0xd5, 0x9d, 0x5d, 0xfc,
+  0xd1, 0x95, 0x53, 0xfc, 0xb4, 0x5e, 0x0b, 0xfd,
+  0xa5, 0x61, 0x1f, 0xef, 0x79, 0x6c, 0x6c, 0xcc,
+  0x48, 0x7d, 0xc9, 0xae, 0x44, 0x80, 0xd2, 0xac,
+  0x76, 0x6d, 0x71, 0xca, 0x9d, 0x65, 0x30, 0xe7,
+  0xa5, 0x62, 0x22, 0xee, 0xaa, 0x5f, 0x16, 0xf5,
+  0xaf, 0x5b, 0x0c, 0xf9, 0xb0, 0x58, 0x04, 0xfd,
+  0x92, 0x62, 0x3b, 0xe0, 0x44, 0x80, 0xd2, 0xac,
+  0x44, 0x80, 0xd2, 0xac, 0x44, 0x80, 0xd2, 0xac,
+  0x44, 0x80, 0xd2, 0xac, 0x44, 0x80, 0xd2, 0xac,
+  0x44, 0x7f, 0xd2, 0xad, 0x44, 0x7f, 0xd2, 0xad,
+  0x44, 0x7f, 0xd2, 0xad, 0x44, 0x7f, 0xd2, 0xad,
+  0x44, 0x7f, 0xd2, 0xad, 0x44, 0x7f, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x6f, 0x86, 0xa7, 0xd7, 0x44, 0x7e, 0xd2, 0xad,
+  0x83, 0x93, 0xab, 0xe1, 0x68, 0x7d, 0xa1, 0xc9,
+  0x86, 0x69, 0x58, 0xdb, 0x92, 0x69, 0x44, 0xf4,
+  0xb0, 0x5b, 0x09, 0xfc, 0xb2, 0x5b, 0x08, 0xfe,
+  0xab, 0x5f, 0x15, 0xf5, 0x8d, 0x67, 0x4a, 0xdb,
+  0x64, 0x72, 0x92, 0xc0, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x4a, 0x7b, 0xc6, 0xb0,
+  0x5d, 0x75, 0xa1, 0xbb, 0x57, 0x76, 0xac, 0xb8,
+  0x50, 0x79, 0xb8, 0xb4, 0x4b, 0x7b, 0xc4, 0xb1,
+  0x45, 0x7d, 0xd0, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x44, 0x7e, 0xd2, 0xad, 0x44, 0x7e, 0xd2, 0xad,
+  0x42, 0x7e, 0xd2, 0xad, 0x42, 0x7e, 0xd2, 0xad,
+  0x42, 0x7e, 0xd2, 0xad, 0x42, 0x7e, 0xd2, 0xad,
+  0x42, 0x7e, 0xd2, 0xad, 0x43, 0x7e, 0xd3, 0xae,
+  0x59, 0x81, 0xb9, 0xc3, 0x5c, 0x84, 0xbd, 0xc2,
+  0x4c, 0x81, 0xcd, 0xb4, 0x8a, 0x91, 0x9b, 0xef,
+  0x82, 0x68, 0x5b, 0xd5, 0x8f, 0x6f, 0x51, 0xf4,
+  0xaf, 0x5b, 0x08, 0xfb, 0xb1, 0x58, 0x02, 0xfe,
+  0xae, 0x5c, 0x0c, 0xfa, 0xa3, 0x62, 0x26, 0xed,
+  0x89, 0x66, 0x4f, 0xda, 0x58, 0x76, 0xa7, 0xba,
+  0x43, 0x7e, 0xd3, 0xae, 0x43, 0x7e, 0xd3, 0xae,
+  0x66, 0x71, 0x8d, 0xc2, 0xa2, 0x63, 0x27, 0xec,
+  0xaf, 0x5b, 0x08, 0xfb, 0xb1, 0x5a, 0x07, 0xfe,
+  0xaf, 0x5f, 0x0f, 0xfa, 0xa4, 0x5e, 0x20, 0xef,
+  0x6a, 0x70, 0x87, 0xc4, 0x43, 0x7e, 0xd3, 0xae,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x43, 0x7e, 0xd2, 0xaf, 0x43, 0x7e, 0xd2, 0xaf,
+  0x51, 0x7e, 0xbf, 0xbd, 0x65, 0x84, 0xb0, 0xcd,
+  0x88, 0x6a, 0x57, 0xda, 0xa4, 0x88, 0x6e, 0xfe,
+  0xec, 0xbe, 0x83, 0xff, 0xc9, 0xb6, 0x9d, 0xff,
+  0xfa, 0xe3, 0xc0, 0xff, 0xfd, 0xe5, 0xc2, 0xff,
+  0xfa, 0xdb, 0xae, 0xff, 0xf0, 0xc5, 0x8b, 0xff,
+  0xc9, 0x84, 0x3c, 0xfc, 0xb0, 0x59, 0x03, 0xfe,
+  0xdd, 0xa1, 0x59, 0xfe, 0xfd, 0xd8, 0xa2, 0xff,
+  0xfc, 0xc9, 0x7e, 0xff, 0xf5, 0xc4, 0x83, 0xff,
+  0xb0, 0x5b, 0x09, 0xfb, 0x4e, 0x79, 0xbc, 0xb6,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0xae, 0x58, 0x04, 0xfc, 0x54, 0x77, 0xb1, 0xb9,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x43, 0x7e, 0xd2, 0xb0,
+  0x43, 0x7e, 0xd2, 0xb0, 0x44, 0x7e, 0xd2, 0xb0,
+  0x48, 0x81, 0xd2, 0x9e, 0x48, 0x81, 0xd2, 0x9e,
+  0x48, 0x81, 0xd2, 0x9e, 0x48, 0x81, 0xd2, 0x9e,
+  0x48, 0x81, 0xd2, 0x9e, 0x46, 0x7a, 0xc4, 0xa3,
+  0x45, 0x4c, 0x56, 0xe6, 0x90, 0x5a, 0x28, 0xf0,
+  0x6c, 0x62, 0x57, 0xfe, 0xe5, 0xd1, 0xb2, 0xff,
+  0xa8, 0x9e, 0x8f, 0xff, 0xfb, 0xde, 0xb4, 0xff,
+  0xfd, 0xe1, 0xb7, 0xff, 0xfe, 0xe5, 0xbf, 0xff,
+  0xf9, 0xdb, 0xb2, 0xff, 0xdd, 0xac, 0x72, 0xfd,
+  0xb5, 0x67, 0x1c, 0xf9, 0xa7, 0x60, 0x1b, 0xee,
+  0xc4, 0x7e, 0x37, 0xfb, 0xec, 0xba, 0x7c, 0xff,
+  0xf2, 0xc6, 0x8c, 0xff, 0xf5, 0xcd, 0x96, 0xff,
+  0xdc, 0xa3, 0x60, 0xfe, 0xa8, 0x60, 0x1c, 0xee,
+  0x4b, 0x7e, 0xc8, 0xa2, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x49, 0x80, 0xcb, 0xa1,
+  0x4f, 0x7d, 0xc1, 0xa3, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x41, 0x61, 0x8d, 0xbf, 0x4a, 0x59, 0x70, 0xd4,
+  0x73, 0x5a, 0x46, 0xea, 0x7a, 0x61, 0x46, 0xfe,
+  0xb8, 0x9d, 0x79, 0xff, 0xcb, 0xb8, 0x9c, 0xff,
+  0xfd, 0xe6, 0xc3, 0xff, 0xfd, 0xe7, 0xc5, 0xff,
+  0xfb, 0xdf, 0xb6, 0xff, 0xee, 0xc1, 0x87, 0xfe,
+  0xc7, 0x82, 0x3a, 0xfb, 0xa7, 0x61, 0x1d, 0xed,
+  0x6f, 0x71, 0x82, 0xb9, 0x68, 0x73, 0x8f, 0xb5,
+  0x99, 0x65, 0x38, 0xdd, 0xb1, 0x5b, 0x07, 0xfb,
+  0xb6, 0x62, 0x0e, 0xfa, 0xb6, 0x63, 0x11, 0xfb,
+  0xb2, 0x5b, 0x05, 0xfc, 0xb1, 0x57, 0x00, 0xff,
+  0xae, 0x58, 0x04, 0xfc, 0x80, 0x6a, 0x5f, 0xc9,
+  0x47, 0x80, 0xcf, 0xa1, 0x47, 0x81, 0xd2, 0xa0,
+  0x47, 0x81, 0xd2, 0xa0, 0x47, 0x81, 0xd2, 0xa0,
+  0x47, 0x81, 0xd2, 0xa0, 0x47, 0x81, 0xd2, 0xa0,
+  0x47, 0x81, 0xd2, 0xa0, 0x47, 0x81, 0xd2, 0xa0,
+  0x47, 0x81, 0xd2, 0xa0, 0x47, 0x81, 0xd2, 0xa0,
+  0x47, 0x81, 0xd2, 0xa0, 0x47, 0x81, 0xd2, 0xa0,
+  0x47, 0x81, 0xd2, 0xa0, 0x47, 0x81, 0xd2, 0xa0,
+  0x46, 0x80, 0xd1, 0xa1, 0x42, 0x4e, 0x5e, 0xe2,
+  0x79, 0x60, 0x4e, 0xdb, 0x60, 0x57, 0x4e, 0xff,
+  0xd1, 0xab, 0x7a, 0xfe, 0x93, 0x8b, 0x7f, 0xff,
+  0xfb, 0xe3, 0xc0, 0xff, 0xfd, 0xe8, 0xc7, 0xff,
+  0xfd, 0xe4, 0xbe, 0xff, 0xf8, 0xd6, 0xa7, 0xff,
+  0xec, 0xbe, 0x83, 0xfe, 0xc7, 0x82, 0x38, 0xfd,
+  0xa6, 0x64, 0x25, 0xec, 0xa9, 0x60, 0x1a, 0xf0,
+  0xbd, 0x70, 0x23, 0xfb, 0xeb, 0xb3, 0x6b, 0xff,
+  0xf9, 0xcd, 0x8d, 0xff, 0xf8, 0xca, 0x89, 0xff,
+  0xb6, 0x62, 0x0e, 0xfc, 0x8c, 0x68, 0x4e, 0xd2,
+  0x47, 0x81, 0xd2, 0xa1, 0x47, 0x81, 0xd2, 0xa1,
+  0x47, 0x81, 0xd2, 0xa1, 0x47, 0x81, 0xd3, 0xa2,
+  0x47, 0x81, 0xd3, 0xa2, 0x47, 0x81, 0xd3, 0xa2,
+  0x47, 0x81, 0xd3, 0xa2, 0x47, 0x81, 0xd3, 0xa2,
+  0x47, 0x81, 0xd3, 0xa2, 0x47, 0x81, 0xd3, 0xa2,
+  0x47, 0x81, 0xd3, 0xa2, 0x47, 0x81, 0xd3, 0xa2,
+  0x47, 0x81, 0xd3, 0xa2, 0x47, 0x81, 0xd3, 0xa2,
+  0x47, 0x80, 0xd3, 0xa2, 0x47, 0x80, 0xd3, 0xa2,
+  0x47, 0x80, 0xd3, 0xa2, 0x47, 0x80, 0xd3, 0xa2,
+  0x4e, 0x75, 0xb1, 0xad, 0x59, 0x46, 0x35, 0xfa,
+  0xb6, 0x87, 0x54, 0xfd, 0x7d, 0x77, 0x6d, 0xff,
+  0xf1, 0xd6, 0xaf, 0xff, 0xa0, 0x93, 0x80, 0xff,
+  0xfb, 0xd4, 0x9a, 0xff, 0xfd, 0xd6, 0x9d, 0xff,
+  0xfd, 0xd8, 0xa2, 0xff, 0xfd, 0xde, 0xb0, 0xff,
+  0xfd, 0xe6, 0xc3, 0xff, 0xfc, 0xe1, 0xbc, 0xff,
+  0xfd, 0xd5, 0x99, 0xff, 0xfc, 0xc7, 0x7b, 0xff,
+  0xfc, 0xc7, 0x79, 0xff, 0xcf, 0x8c, 0x44, 0xfc,
+  0x82, 0x69, 0x5c, 0xcb, 0x46, 0x80, 0xd2, 0xa2,
+  0x9c, 0x64, 0x31, 0xe2, 0xc0, 0x69, 0x0d, 0xff,
+  0xac, 0x5d, 0x10, 0xf6, 0x4d, 0x7d, 0xc4, 0xa6,
+  0x46, 0x80, 0xd2, 0xa2, 0x46, 0x80, 0xd2, 0xa2,
+  0x46, 0x80, 0xd2, 0xa2, 0x46, 0x80, 0xd2, 0xa2,
+  0x46, 0x80, 0xd2, 0xa2, 0x46, 0x80, 0xd2, 0xa2,
+  0x46, 0x80, 0xd2, 0xa2, 0x46, 0x80, 0xd2, 0xa2,
+  0x46, 0x80, 0xd2, 0xa3, 0x46, 0x80, 0xd2, 0xa3,
+  0x46, 0x80, 0xd2, 0xa3, 0x46, 0x80, 0xd2, 0xa3,
+  0x46, 0x80, 0xd2, 0xa3, 0x44, 0x79, 0xc4, 0xa8,
+  0x45, 0x4c, 0x57, 0xe8, 0x8f, 0x5a, 0x29, 0xf1,
+  0x6c, 0x62, 0x56, 0xfe, 0xe5, 0xcf, 0xaf, 0xff,
+  0xa8, 0x9f, 0x90, 0xff, 0xfb, 0xe0, 0xb8, 0xff,
+  0xfd, 0xe4, 0xbf, 0xff, 0xfe, 0xe6, 0xc2, 0xff,
+  0xf7, 0xd1, 0x9a, 0xff, 0xd6, 0x9a, 0x54, 0xfc,
+  0xb1, 0x5f, 0x0f, 0xf9, 0xa6, 0x60, 0x1c, 0xee,
+  0xc4, 0x7e, 0x36, 0xfc, 0xeb, 0xb6, 0x73, 0xff,
+  0xf0, 0xc0, 0x82, 0xff, 0xf5, 0xc9, 0x8e, 0xff,
+  0xda, 0x9f, 0x59, 0xfe, 0xa7, 0x60, 0x1d, 0xef,
+  0x4a, 0x7d, 0xc9, 0xa6, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x46, 0x80, 0xd2, 0xa4, 0x46, 0x80, 0xd2, 0xa4,
+  0x40, 0x61, 0x8e, 0xc3, 0x4a, 0x59, 0x71, 0xd6,
+  0x73, 0x5a, 0x47, 0xeb, 0x7a, 0x61, 0x46, 0xfe,
+  0xb8, 0x9d, 0x79, 0xff, 0xcb, 0xb8, 0x9c, 0xff,
+  0xfd, 0xe6, 0xc3, 0xff, 0xfd, 0xe7, 0xc5, 0xff,
+  0xfb, 0xdf, 0xb6, 0xff, 0xee, 0xc1, 0x87, 0xfe,
+  0xc7, 0x82, 0x3a, 0xfb, 0xa7, 0x61, 0x1d, 0xee,
+  0x6e, 0x71, 0x84, 0xbe, 0x67, 0x72, 0x91, 0xb9,
+  0x98, 0x65, 0x39, 0xdf, 0xb1, 0x5b, 0x07, 0xfb,
+  0xb6, 0x62, 0x0e, 0xfa, 0xb6, 0x63, 0x11, 0xfb,
+  0xb1, 0x5b, 0x05, 0xfd, 0xb1, 0x57, 0x00, 0xff,
+  0xae, 0x58, 0x04, 0xfc, 0x7f, 0x6a, 0x60, 0xcc,
+  0x46, 0x7f, 0xcf, 0xa6, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x46, 0x80, 0xd2, 0xa5,
+  0x46, 0x80, 0xd2, 0xa5, 0x41, 0x4e, 0x62, 0xe1,
+  0x75, 0x61, 0x55, 0xda, 0x63, 0x57, 0x4c, 0xfe,
+  0xc8, 0xa3, 0x74, 0xfe, 0x93, 0x8b, 0x7e, 0xff,
+  0xfb, 0xe3, 0xbf, 0xff, 0xfd, 0xe8, 0xc7, 0xff,
+  0xfd, 0xe4, 0xbf, 0xff, 0xf9, 0xd8, 0xa9, 0xff,
+  0xec, 0xc0, 0x86, 0xfe, 0xc9, 0x86, 0x3c, 0xfd,
+  0xaa, 0x65, 0x24, 0xef, 0xa5, 0x61, 0x1f, 0xee,
+  0xbb, 0x6d, 0x1e, 0xfb, 0xe9, 0xb0, 0x67, 0xff,
+  0xf9, 0xcc, 0x8c, 0xff, 0xf9, 0xcd, 0x8d, 0xff,
+  0xba, 0x67, 0x13, 0xfc, 0x91, 0x67, 0x42, 0xda,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd1, 0xa6, 0x45, 0x80, 0xd1, 0xa6,
+  0x45, 0x80, 0xd2, 0xa7, 0x45, 0x80, 0xd2, 0xa7,
+  0x4f, 0x7b, 0xbd, 0xad, 0x69, 0x4a, 0x2d, 0xf8,
+  0x9d, 0x76, 0x4c, 0xfd, 0x97, 0x8c, 0x7c, 0xff,
+  0xca, 0xb7, 0x9b, 0xff, 0xa5, 0x97, 0x81, 0xff,
+  0xf0, 0xcc, 0x97, 0xff, 0xfd, 0xd7, 0x9e, 0xff,
+  0xfd, 0xd9, 0xa4, 0xff, 0xfd, 0xdf, 0xb2, 0xff,
+  0xfd, 0xe7, 0xc5, 0xff, 0xfc, 0xe1, 0xbc, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfc, 0xc8, 0x7c, 0xff,
+  0xfc, 0xc8, 0x7c, 0xff, 0xcf, 0x8c, 0x43, 0xfc,
+  0x81, 0x6a, 0x5e, 0xce, 0x45, 0x80, 0xd2, 0xa7,
+  0x45, 0x80, 0xd2, 0xa7, 0x47, 0x7f, 0xcd, 0xa8,
+  0xb1, 0x57, 0x00, 0xff, 0x99, 0x62, 0x33, 0xe3,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x45, 0x80, 0xd2, 0xa8, 0x45, 0x80, 0xd2, 0xa8,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x68, 0x75, 0x93, 0xab,
+  0x83, 0x46, 0x0b, 0xfb, 0x18, 0x15, 0x10, 0xff,
+  0x39, 0x33, 0x2a, 0xff, 0x42, 0x32, 0x1e, 0xff,
+  0x38, 0x2c, 0x1c, 0xff, 0xd1, 0xa4, 0x66, 0xff,
+  0xfd, 0xd5, 0x9b, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd8, 0xa1, 0xff, 0xfd, 0xe0, 0xb5, 0xff,
+  0xfd, 0xe5, 0xc3, 0xff, 0xf5, 0xd5, 0xaa, 0xff,
+  0xfc, 0xce, 0x8f, 0xff, 0xfd, 0xd4, 0x9a, 0xff,
+  0xfc, 0xc6, 0x75, 0xff, 0xf5, 0xc7, 0x88, 0xff,
+  0xb1, 0x5e, 0x0f, 0xf9, 0x57, 0x7d, 0xb4, 0x9f,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0xa9, 0x5a, 0x0f, 0xf2, 0x73, 0x70, 0x7c, 0xb4,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x6d, 0x70, 0x82, 0xb2, 0x42, 0x24, 0x06, 0xfd,
+  0x2b, 0x23, 0x19, 0xff, 0x16, 0x14, 0x10, 0xff,
+  0x49, 0x38, 0x20, 0xff, 0x79, 0x5c, 0x36, 0xff,
+  0xec, 0xc2, 0x89, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd9, 0xa4, 0xff, 0xfd, 0xdf, 0xb1, 0xff,
+  0xfd, 0xe6, 0xc3, 0xff, 0xfa, 0xdb, 0xaf, 0xff,
+  0xdb, 0xa5, 0x63, 0xfc, 0xbd, 0x72, 0x25, 0xfa,
+  0xec, 0xc5, 0x96, 0xfe, 0xfa, 0xd5, 0xa0, 0xff,
+  0xfd, 0xd5, 0x9c, 0xff, 0xf4, 0xbc, 0x6f, 0xff,
+  0xb8, 0x62, 0x0c, 0xfb, 0xa3, 0x61, 0x24, 0xe5,
+  0x5e, 0x78, 0xa7, 0xa4, 0x49, 0x82, 0xd2, 0x97,
+  0x49, 0x82, 0xd2, 0x97, 0x49, 0x82, 0xd2, 0x97,
+  0x49, 0x82, 0xd2, 0x97, 0x49, 0x82, 0xd2, 0x97,
+  0x49, 0x82, 0xd2, 0x97, 0x49, 0x82, 0xd2, 0x97,
+  0x49, 0x83, 0xd2, 0x98, 0x49, 0x83, 0xd2, 0x98,
+  0x49, 0x83, 0xd2, 0x98, 0x49, 0x83, 0xd2, 0x98,
+  0x49, 0x83, 0xd2, 0x98, 0x49, 0x83, 0xd2, 0x98,
+  0x49, 0x83, 0xd2, 0x98, 0x49, 0x83, 0xd2, 0x98,
+  0x5c, 0x7a, 0xa9, 0xa5, 0x88, 0x4b, 0x11, 0xf7,
+  0x19, 0x14, 0x0e, 0xff, 0x39, 0x33, 0x2b, 0xff,
+  0x3a, 0x2d, 0x1d, 0xff, 0x36, 0x2b, 0x1c, 0xff,
+  0xd1, 0xa4, 0x68, 0xff, 0xfd, 0xd5, 0x9b, 0xff,
+  0xfd, 0xd8, 0xa2, 0xff, 0xfd, 0xdb, 0xaa, 0xff,
+  0xfd, 0xe1, 0xb8, 0xff, 0xfd, 0xe7, 0xc6, 0xff,
+  0xfa, 0xdc, 0xb2, 0xff, 0xf1, 0xc1, 0x83, 0xff,
+  0xfd, 0xe2, 0xba, 0xff, 0xfc, 0xd1, 0x92, 0xff,
+  0xfd, 0xd2, 0x96, 0xff, 0xc5, 0x7f, 0x35, 0xfc,
+  0x8e, 0x68, 0x4b, 0xce, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x4b, 0x81, 0xcb, 0x9b, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x49, 0x82, 0xd2, 0x99,
+  0x49, 0x82, 0xd2, 0x99, 0x4c, 0x81, 0xca, 0x9b,
+  0xa5, 0x61, 0x1f, 0xe9, 0xa8, 0x7e, 0x4c, 0xfe,
+  0x18, 0x16, 0x13, 0xff, 0x3b, 0x33, 0x26, 0xff,
+  0x3f, 0x31, 0x1d, 0xff, 0x38, 0x2c, 0x1c, 0xff,
+  0xc3, 0x98, 0x5b, 0xff, 0xfd, 0xd5, 0x9a, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfc, 0xd4, 0x99, 0xff,
+  0xfc, 0xcf, 0x8d, 0xff, 0xfc, 0xb6, 0x51, 0xff,
+  0xfd, 0xcf, 0x8c, 0xff, 0xb8, 0x69, 0x1a, 0xfa,
+  0x61, 0x78, 0xa0, 0xa9, 0x49, 0x83, 0xd1, 0x99,
+  0x7e, 0x6c, 0x64, 0xc1, 0xc5, 0x73, 0x18, 0xfb,
+  0xc6, 0x73, 0x18, 0xfb, 0x94, 0x66, 0x3f, 0xd6,
+  0x4a, 0x82, 0xd2, 0x9a, 0x4a, 0x82, 0xd2, 0x9a,
+  0x4a, 0x82, 0xd2, 0x9a, 0x4a, 0x82, 0xd2, 0x9a,
+  0x4a, 0x82, 0xd2, 0x9a, 0x4a, 0x82, 0xd2, 0x9a,
+  0x4a, 0x82, 0xd2, 0x9a, 0x4a, 0x82, 0xd2, 0x9a,
+  0x4a, 0x82, 0xd2, 0x9a, 0x4a, 0x82, 0xd2, 0x9a,
+  0x4a, 0x82, 0xd2, 0x9a, 0x4a, 0x82, 0xd2, 0x9a,
+  0x4a, 0x82, 0xd2, 0x9a, 0x67, 0x74, 0x94, 0xae,
+  0x84, 0x47, 0x0c, 0xfb, 0x18, 0x15, 0x10, 0xff,
+  0x39, 0x33, 0x2a, 0xff, 0x42, 0x32, 0x1e, 0xff,
+  0x38, 0x2c, 0x1c, 0xff, 0xd1, 0xa4, 0x66, 0xff,
+  0xfd, 0xd5, 0x9b, 0xff, 0xfd, 0xd8, 0xa1, 0xff,
+  0xfd, 0xdf, 0xb1, 0xff, 0xfd, 0xe5, 0xc1, 0xff,
+  0xfd, 0xe4, 0xc1, 0xff, 0xf5, 0xd4, 0xa7, 0xff,
+  0xfc, 0xcf, 0x8f, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfc, 0xcb, 0x84, 0xff, 0xf5, 0xc5, 0x83, 0xff,
+  0xb0, 0x5c, 0x0c, 0xf9, 0x55, 0x7d, 0xb5, 0xa4,
+  0x48, 0x83, 0xd2, 0x9b, 0x48, 0x83, 0xd2, 0x9b,
+  0x48, 0x83, 0xd2, 0x9b, 0x48, 0x83, 0xd2, 0x9b,
+  0x48, 0x83, 0xd2, 0x9b, 0x48, 0x83, 0xd2, 0x9b,
+  0x48, 0x83, 0xd2, 0x9b, 0x48, 0x83, 0xd2, 0x9b,
+  0x48, 0x83, 0xd2, 0x9b, 0x48, 0x83, 0xd2, 0x9b,
+  0x48, 0x83, 0xd2, 0x9b, 0x48, 0x83, 0xd2, 0x9b,
+  0x48, 0x82, 0xd2, 0x9c, 0x48, 0x82, 0xd2, 0x9c,
+  0x48, 0x82, 0xd2, 0x9c, 0x48, 0x82, 0xd2, 0x9c,
+  0x6b, 0x70, 0x84, 0xb6, 0x42, 0x24, 0x06, 0xfd,
+  0x2b, 0x23, 0x19, 0xff, 0x16, 0x14, 0x10, 0xff,
+  0x49, 0x38, 0x20, 0xff, 0x79, 0x5c, 0x36, 0xff,
+  0xec, 0xc2, 0x89, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd9, 0xa4, 0xff, 0xfd, 0xdf, 0xb1, 0xff,
+  0xfd, 0xe6, 0xc3, 0xff, 0xfa, 0xdb, 0xaf, 0xff,
+  0xdb, 0xa5, 0x63, 0xfc, 0xbd, 0x72, 0x25, 0xfa,
+  0xec, 0xc5, 0x96, 0xfe, 0xfa, 0xd5, 0xa0, 0xff,
+  0xfd, 0xd5, 0x9c, 0xff, 0xf4, 0xbc, 0x6f, 0xff,
+  0xb7, 0x62, 0x0c, 0xfb, 0xa3, 0x61, 0x25, 0xe6,
+  0x5d, 0x7a, 0xa8, 0xa9, 0x49, 0x83, 0xd2, 0x9c,
+  0x49, 0x83, 0xd2, 0x9c, 0x49, 0x83, 0xd2, 0x9c,
+  0x49, 0x83, 0xd2, 0x9c, 0x49, 0x81, 0xd2, 0x9c,
+  0x49, 0x81, 0xd2, 0x9c, 0x49, 0x81, 0xd2, 0x9c,
+  0x49, 0x81, 0xd2, 0x9c, 0x49, 0x81, 0xd2, 0x9c,
+  0x49, 0x81, 0xd2, 0x9c, 0x49, 0x81, 0xd2, 0x9c,
+  0x49, 0x81, 0xd2, 0x9c, 0x49, 0x81, 0xd2, 0x9c,
+  0x49, 0x81, 0xd2, 0x9c, 0x49, 0x81, 0xd2, 0x9c,
+  0x58, 0x7a, 0xb3, 0xa5, 0x8b, 0x4f, 0x14, 0xf4,
+  0x1c, 0x16, 0x0f, 0xff, 0x3c, 0x35, 0x2c, 0xff,
+  0x2f, 0x26, 0x1a, 0xff, 0x35, 0x2a, 0x1c, 0xff,
+  0xc9, 0x9e, 0x62, 0xff, 0xfd, 0xd5, 0x9b, 0xff,
+  0xfd, 0xd8, 0xa2, 0xff, 0xfd, 0xdb, 0xa9, 0xff,
+  0xfd, 0xe1, 0xb7, 0xff, 0xfd, 0xe7, 0xc6, 0xff,
+  0xfb, 0xde, 0xb5, 0xff, 0xf1, 0xc1, 0x82, 0xff,
+  0xfd, 0xe1, 0xb9, 0xff, 0xfc, 0xd3, 0x95, 0xff,
+  0xfd, 0xd2, 0x95, 0xff, 0xca, 0x86, 0x3e, 0xfc,
+  0x94, 0x65, 0x3f, 0xd7, 0x48, 0x81, 0xd2, 0x9d,
+  0x48, 0x81, 0xd2, 0x9d, 0x48, 0x81, 0xd2, 0x9d,
+  0x48, 0x81, 0xd2, 0x9d, 0x48, 0x81, 0xd2, 0x9d,
+  0x48, 0x81, 0xd2, 0x9d, 0x48, 0x81, 0xd2, 0x9d,
+  0x48, 0x81, 0xd2, 0x9d, 0x48, 0x81, 0xd2, 0x9d,
+  0x4a, 0x80, 0xcb, 0xa0, 0x48, 0x81, 0xd2, 0x9e,
+  0x48, 0x81, 0xd2, 0x9e, 0x48, 0x81, 0xd2, 0x9e,
+  0x48, 0x81, 0xd2, 0x9e, 0x48, 0x81, 0xd2, 0x9e,
+  0x48, 0x81, 0xd2, 0x9e, 0x48, 0x81, 0xd2, 0x9e,
+  0x48, 0x81, 0xd2, 0x9e, 0x4b, 0x7f, 0xcb, 0xa0,
+  0xa5, 0x61, 0x20, 0xea, 0xd6, 0x9f, 0x5c, 0xfe,
+  0x44, 0x3e, 0x35, 0xff, 0x34, 0x2d, 0x23, 0xff,
+  0x1c, 0x17, 0x11, 0xff, 0x52, 0x3c, 0x21, 0xff,
+  0x81, 0x61, 0x38, 0xff, 0xee, 0xc5, 0x89, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd6, 0x9d, 0xff, 0xfc, 0xd4, 0x9a, 0xff,
+  0xfc, 0xcf, 0x8d, 0xff, 0xfc, 0xb6, 0x51, 0xff,
+  0xfd, 0xd1, 0x90, 0xff, 0xb6, 0x64, 0x12, 0xfa,
+  0x5e, 0x77, 0xa2, 0xae, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x4c, 0x7e, 0xc6, 0xa2,
+  0xb1, 0x58, 0x01, 0xfe, 0xb4, 0x60, 0x0e, 0xfb,
+  0x65, 0x74, 0x94, 0xb3, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x47, 0x81, 0xd2, 0x9f, 0x47, 0x81, 0xd2, 0x9f,
+  0x4d, 0x84, 0xd1, 0x8d, 0x4d, 0x84, 0xd1, 0x8d,
+  0x4d, 0x84, 0xd1, 0x8d, 0x4d, 0x84, 0xd1, 0x8d,
+  0x60, 0x7a, 0xa8, 0x9a, 0xb0, 0x5c, 0x0a, 0xf7,
+  0xf6, 0xd1, 0x9e, 0xff, 0xca, 0xa2, 0x73, 0xff,
+  0x2f, 0x1c, 0x09, 0xff, 0x06, 0x05, 0x03, 0xff,
+  0x02, 0x01, 0x00, 0xff, 0x9c, 0x7e, 0x53, 0xff,
+  0xd3, 0xa1, 0x5f, 0xff, 0xfd, 0xd6, 0x9b, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfc, 0xd6, 0x9c, 0xff, 0xfc, 0xd5, 0x99, 0xff,
+  0xfc, 0xcd, 0x88, 0xff, 0xfb, 0xb8, 0x53, 0xff,
+  0xfc, 0xc0, 0x69, 0xff, 0xdd, 0x9f, 0x57, 0xfe,
+  0x94, 0x67, 0x42, 0xcc, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4e, 0x82, 0xca, 0x90,
+  0xb1, 0x56, 0x00, 0xff, 0xb1, 0x57, 0x00, 0xff,
+  0x9a, 0x63, 0x34, 0xd5, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x83, 0xd2, 0x8e,
+  0x4c, 0x83, 0xd2, 0x8e, 0x78, 0x70, 0x75, 0xb1,
+  0xba, 0x6b, 0x1c, 0xfb, 0xfb, 0xdc, 0xb1, 0xff,
+  0x70, 0x48, 0x1e, 0xff, 0x15, 0x0f, 0x0a, 0xff,
+  0x01, 0x01, 0x01, 0xff, 0x2a, 0x21, 0x15, 0xff,
+  0xde, 0xb5, 0x79, 0xff, 0xea, 0xb7, 0x71, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfc, 0xdc, 0xab, 0xff,
+  0xfd, 0xe3, 0xbb, 0xff, 0xfd, 0xde, 0xb0, 0xff,
+  0xfc, 0xc9, 0x7d, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xf7, 0xc6, 0x80, 0xff, 0xb6, 0x64, 0x10, 0xfb,
+  0x83, 0x6c, 0x61, 0xba, 0x4c, 0x83, 0xd2, 0x8e,
+  0x4d, 0x84, 0xd2, 0x8f, 0x4d, 0x84, 0xd2, 0x8f,
+  0x4d, 0x84, 0xd2, 0x8f, 0x4d, 0x84, 0xd2, 0x8f,
+  0x4d, 0x84, 0xd2, 0x8f, 0x4d, 0x84, 0xd2, 0x8f,
+  0x4d, 0x84, 0xd2, 0x8f, 0x4d, 0x84, 0xd2, 0x8f,
+  0x6c, 0x76, 0x90, 0xa6, 0x93, 0x64, 0x3b, 0xd0,
+  0x4d, 0x84, 0xd2, 0x8f, 0x4d, 0x84, 0xd2, 0x8f,
+  0x4d, 0x84, 0xd2, 0x8f, 0x4d, 0x84, 0xd2, 0x8f,
+  0x4d, 0x84, 0xd2, 0x8f, 0x61, 0x7a, 0xa7, 0x9d,
+  0xb6, 0x67, 0x19, 0xf6, 0xf7, 0xd2, 0xa1, 0xff,
+  0xcc, 0xa7, 0x7b, 0xff, 0x30, 0x1d, 0x0a, 0xff,
+  0x06, 0x05, 0x03, 0xff, 0x06, 0x05, 0x03, 0xff,
+  0xa1, 0x83, 0x56, 0xff, 0xd3, 0xa1, 0x5f, 0xff,
+  0xfd, 0xd6, 0x9b, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfc, 0xd5, 0x9c, 0xff,
+  0xfc, 0xd9, 0xa5, 0xff, 0xfc, 0xd7, 0xa2, 0xff,
+  0xfc, 0xc1, 0x6b, 0xff, 0xfc, 0xbf, 0x66, 0xff,
+  0xeb, 0xb5, 0x70, 0xff, 0xa9, 0x60, 0x19, 0xeb,
+  0x4b, 0x83, 0xd2, 0x90, 0x4b, 0x83, 0xd2, 0x90,
+  0x4b, 0x83, 0xd2, 0x90, 0x4b, 0x83, 0xd2, 0x90,
+  0x4b, 0x83, 0xd2, 0x90, 0x4b, 0x83, 0xd2, 0x90,
+  0x4b, 0x83, 0xd2, 0x90, 0x4b, 0x83, 0xd2, 0x90,
+  0x6f, 0x72, 0x87, 0xaa, 0x9d, 0x62, 0x30, 0xd9,
+  0xac, 0x59, 0x0b, 0xf5, 0x4b, 0x84, 0xd3, 0x91,
+  0x4b, 0x84, 0xd3, 0x91, 0x4b, 0x84, 0xd3, 0x91,
+  0x4b, 0x84, 0xd3, 0x91, 0x4b, 0x84, 0xd3, 0x91,
+  0x4b, 0x84, 0xd3, 0x91, 0x4b, 0x84, 0xd3, 0x91,
+  0x4b, 0x84, 0xd3, 0x91, 0x9a, 0x64, 0x35, 0xd7,
+  0xd3, 0x93, 0x4a, 0xfc, 0xfd, 0xe6, 0xc1, 0xff,
+  0xd4, 0xaa, 0x74, 0xff, 0x37, 0x20, 0x0a, 0xff,
+  0x09, 0x07, 0x05, 0xff, 0x00, 0x00, 0x00, 0xff,
+  0x77, 0x60, 0x3f, 0xff, 0xd1, 0xa2, 0x62, 0xff,
+  0xfa, 0xd0, 0x94, 0xff, 0xfc, 0xd3, 0x96, 0xff,
+  0xfc, 0xd1, 0x92, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xcc, 0x83, 0xff,
+  0xfb, 0xd6, 0xa1, 0xff, 0xb1, 0x58, 0x03, 0xfe,
+  0x52, 0x7f, 0xc1, 0x96, 0x4b, 0x83, 0xd1, 0x91,
+  0x60, 0x79, 0xa4, 0xa0, 0xb3, 0x5d, 0x08, 0xfb,
+  0xf5, 0xa7, 0x38, 0xff, 0xb1, 0x5a, 0x05, 0xfb,
+  0x54, 0x7e, 0xbd, 0x97, 0x4b, 0x83, 0xd1, 0x91,
+  0x4b, 0x83, 0xd1, 0x91, 0x4b, 0x83, 0xd1, 0x91,
+  0x4b, 0x83, 0xd1, 0x91, 0x4b, 0x83, 0xd1, 0x91,
+  0x4b, 0x83, 0xd1, 0x91, 0x4b, 0x83, 0xd1, 0x91,
+  0x4b, 0x83, 0xd1, 0x91, 0x4b, 0x83, 0xd1, 0x91,
+  0x4b, 0x83, 0xd1, 0x91, 0x4b, 0x83, 0xd1, 0x91,
+  0x5e, 0x7a, 0xa9, 0x9e, 0xb0, 0x5e, 0x0d, 0xf8,
+  0xf7, 0xd3, 0xa2, 0xff, 0xca, 0xa1, 0x72, 0xff,
+  0x2f, 0x1c, 0x09, 0xff, 0x06, 0x05, 0x03, 0xff,
+  0x02, 0x01, 0x00, 0xff, 0x9c, 0x7e, 0x53, 0xff,
+  0xd3, 0xa1, 0x5f, 0xff, 0xfd, 0xd6, 0x9b, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfc, 0xd8, 0xa1, 0xff, 0xfc, 0xd6, 0x9c, 0xff,
+  0xfc, 0xcd, 0x88, 0xff, 0xfb, 0xb8, 0x53, 0xff,
+  0xfc, 0xc5, 0x75, 0xff, 0xda, 0x98, 0x4b, 0xfd,
+  0x93, 0x67, 0x43, 0xce, 0x4b, 0x83, 0xd2, 0x92,
+  0x4b, 0x83, 0xd2, 0x92, 0x4b, 0x83, 0xd2, 0x92,
+  0x4b, 0x83, 0xd2, 0x92, 0x4c, 0x82, 0xcd, 0x93,
+  0x67, 0x75, 0x95, 0xa7, 0x81, 0x6b, 0x60, 0xbf,
+  0x94, 0x65, 0x3f, 0xd1, 0x91, 0x66, 0x42, 0xcf,
+  0x8d, 0x66, 0x49, 0xcb, 0x78, 0x6f, 0x75, 0xb5,
+  0x4b, 0x83, 0xd2, 0x93, 0x4b, 0x83, 0xd2, 0x93,
+  0x4b, 0x83, 0xd2, 0x93, 0x4b, 0x83, 0xd2, 0x93,
+  0x4b, 0x83, 0xd2, 0x93, 0x76, 0x70, 0x77, 0xb4,
+  0xba, 0x6b, 0x1c, 0xfb, 0xfb, 0xdc, 0xb1, 0xff,
+  0x70, 0x48, 0x1e, 0xff, 0x15, 0x0f, 0x0a, 0xff,
+  0x01, 0x01, 0x01, 0xff, 0x2a, 0x21, 0x15, 0xff,
+  0xde, 0xb5, 0x79, 0xff, 0xea, 0xb7, 0x71, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfc, 0xdc, 0xab, 0xff,
+  0xfd, 0xe3, 0xbb, 0xff, 0xfd, 0xde, 0xb0, 0xff,
+  0xfc, 0xc9, 0x7d, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xf7, 0xc6, 0x80, 0xff, 0xb6, 0x64, 0x10, 0xfb,
+  0x81, 0x6c, 0x63, 0xbd, 0x4a, 0x83, 0xd2, 0x93,
+  0x4a, 0x83, 0xd2, 0x93, 0x4a, 0x83, 0xd2, 0x93,
+  0x4a, 0x83, 0xd2, 0x93, 0x4a, 0x83, 0xd2, 0x93,
+  0x4a, 0x83, 0xd2, 0x93, 0x4a, 0x83, 0xd2, 0x93,
+  0x4a, 0x83, 0xd2, 0x93, 0x4a, 0x83, 0xd2, 0x93,
+  0x69, 0x75, 0x91, 0xa9, 0x92, 0x63, 0x3d, 0xd2,
+  0x4a, 0x83, 0xd2, 0x93, 0x4a, 0x83, 0xd2, 0x93,
+  0x4a, 0x83, 0xd2, 0x93, 0x4a, 0x83, 0xd2, 0x94,
+  0x4a, 0x83, 0xd2, 0x94, 0x5a, 0x7c, 0xb2, 0x9e,
+  0xb1, 0x64, 0x1b, 0xf3, 0xf4, 0xce, 0x99, 0xfe,
+  0xd6, 0xb3, 0x88, 0xff, 0x35, 0x20, 0x0a, 0xff,
+  0x07, 0x06, 0x04, 0xff, 0x02, 0x02, 0x01, 0xff,
+  0x8e, 0x73, 0x4b, 0xff, 0xd2, 0xa3, 0x61, 0xff,
+  0xfc, 0xd4, 0x98, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xfd, 0xd6, 0x9c, 0xff, 0xfc, 0xd5, 0x9b, 0xff,
+  0xfc, 0xd9, 0xa6, 0xff, 0xfc, 0xd8, 0xa3, 0xff,
+  0xfc, 0xc3, 0x6f, 0xff, 0xfc, 0xbd, 0x61, 0xff,
+  0xef, 0xbc, 0x78, 0xff, 0xac, 0x5e, 0x13, 0xf2,
+  0x4a, 0x82, 0xcf, 0x95, 0x4a, 0x83, 0xd2, 0x94,
+  0x4a, 0x83, 0xd3, 0x95, 0x4a, 0x83, 0xd3, 0x95,
+  0x4a, 0x83, 0xd3, 0x95, 0x4a, 0x83, 0xd3, 0x95,
+  0x4a, 0x83, 0xd3, 0x95, 0x4a, 0x83, 0xd3, 0x95,
+  0x69, 0x74, 0x90, 0xab, 0x99, 0x64, 0x36, 0xd8,
+  0xae, 0x58, 0x07, 0xf9, 0x4a, 0x82, 0xd0, 0x96,
+  0x4a, 0x83, 0xd3, 0x95, 0x4a, 0x83, 0xd3, 0x95,
+  0x4a, 0x83, 0xd3, 0x95, 0x4a, 0x83, 0xd3, 0x95,
+  0x4a, 0x83, 0xd3, 0x95, 0x4a, 0x83, 0xd3, 0x95,
+  0x4a, 0x83, 0xd3, 0x95, 0x99, 0x64, 0x36, 0xd8,
+  0xd1, 0x8f, 0x44, 0xfb, 0xfd, 0xe6, 0xc2, 0xff,
+  0xfb, 0xd6, 0xa0, 0xff, 0x66, 0x40, 0x17, 0xff,
+  0x13, 0x0e, 0x09, 0xff, 0x01, 0x01, 0x01, 0xff,
+  0x25, 0x1e, 0x13, 0xff, 0xde, 0xb5, 0x78, 0xff,
+  0xe9, 0xb6, 0x70, 0xff, 0xfc, 0xd3, 0x96, 0xff,
+  0xfc, 0xd1, 0x92, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xce, 0x86, 0xff,
+  0xfb, 0xd5, 0x9d, 0xff, 0xb1, 0x57, 0x01, 0xfe,
+  0x51, 0x7f, 0xc3, 0x9b, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x53, 0x7e, 0xbd, 0x9c,
+  0xb1, 0x59, 0x03, 0xfd, 0xe5, 0x9e, 0x53, 0xfe,
+  0xa7, 0x5e, 0x1b, 0xea, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4a, 0x83, 0xd2, 0x96, 0x4a, 0x83, 0xd2, 0x96,
+  0x4d, 0x87, 0xd1, 0x84, 0x4d, 0x87, 0xd1, 0x84,
+  0x4d, 0x87, 0xd1, 0x84, 0x56, 0x81, 0xbd, 0x8a,
+  0xac, 0x5d, 0x12, 0xef, 0xee, 0xc0, 0x85, 0xfe,
+  0xfd, 0xe3, 0xbb, 0xff, 0xc8, 0x7e, 0x31, 0xff,
+  0xcf, 0xd9, 0xe5, 0xff, 0xf1, 0xf3, 0xf6, 0xff,
+  0x94, 0x9d, 0xa7, 0xff, 0x2e, 0x29, 0x22, 0xff,
+  0xee, 0xc0, 0x7c, 0xff, 0xec, 0xb6, 0x6b, 0xff,
+  0xfc, 0xd3, 0x95, 0xff, 0xfc, 0xd1, 0x92, 0xff,
+  0xfc, 0xcf, 0x8d, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xcf, 0x8e, 0xff, 0xc8, 0x86, 0x43, 0xfc,
+  0x87, 0x6a, 0x56, 0xb9, 0x4e, 0x86, 0xd1, 0x85,
+  0x4e, 0x86, 0xd1, 0x85, 0x4e, 0x86, 0xd1, 0x85,
+  0x4e, 0x86, 0xd1, 0x85, 0x4e, 0x86, 0xd1, 0x85,
+  0x4e, 0x86, 0xd1, 0x85, 0x5a, 0x81, 0xb8, 0x8d,
+  0xb0, 0x58, 0x02, 0xfc, 0xb5, 0x5b, 0x04, 0xff,
+  0xc7, 0x7e, 0x39, 0xfe, 0x79, 0x72, 0x75, 0xa8,
+  0x4e, 0x87, 0xd2, 0x85, 0x4e, 0x87, 0xd2, 0x85,
+  0x4e, 0x87, 0xd2, 0x85, 0x4e, 0x87, 0xd2, 0x85,
+  0x7f, 0x70, 0x6a, 0xae, 0xc0, 0x76, 0x29, 0xfb,
+  0xfc, 0xe0, 0xb9, 0xff, 0xeb, 0xbf, 0x88, 0xff,
+  0xca, 0xac, 0x90, 0xff, 0xf0, 0xf3, 0xf7, 0xff,
+  0xd3, 0xd9, 0xdf, 0xff, 0x57, 0x56, 0x55, 0xff,
+  0x87, 0x71, 0x52, 0xff, 0xee, 0xb5, 0x66, 0xff,
+  0xfc, 0xd5, 0x9a, 0xff, 0xfc, 0xd3, 0x95, 0xff,
+  0xfc, 0xd1, 0x92, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xcc, 0x84, 0xff,
+  0xfc, 0xca, 0x7f, 0xff, 0xfc, 0xd1, 0x94, 0xff,
+  0xc6, 0x7d, 0x34, 0xfd, 0xa5, 0x5e, 0x1c, 0xe4,
+  0x5b, 0x7f, 0xb3, 0x8f, 0x4d, 0x86, 0xd1, 0x86,
+  0x4d, 0x86, 0xd1, 0x86, 0x4d, 0x86, 0xd1, 0x86,
+  0x4d, 0x86, 0xd1, 0x86, 0x4d, 0x86, 0xd1, 0x86,
+  0x4d, 0x86, 0xd1, 0x86, 0x56, 0x80, 0xbd, 0x8c,
+  0x85, 0x6a, 0x5a, 0xb7, 0xac, 0x5c, 0x10, 0xee,
+  0xba, 0x69, 0x1b, 0xfa, 0xb4, 0x5e, 0x0c, 0xfe,
+  0x54, 0x81, 0xc1, 0x8b, 0x4d, 0x86, 0xd1, 0x86,
+  0x4d, 0x86, 0xd1, 0x86, 0x4d, 0x86, 0xd1, 0x86,
+  0x5e, 0x7d, 0xae, 0x92, 0xb8, 0x6b, 0x1e, 0xf6,
+  0xf9, 0xd7, 0xa8, 0xff, 0xfd, 0xe4, 0xbf, 0xff,
+  0xc8, 0x7e, 0x31, 0xff, 0xcf, 0xd9, 0xe5, 0xff,
+  0xf1, 0xf3, 0xf6, 0xff, 0x94, 0x9d, 0xa7, 0xff,
+  0x2e, 0x29, 0x22, 0xff, 0xee, 0xc0, 0x7c, 0xff,
+  0xec, 0xb6, 0x6b, 0xff, 0xfc, 0xd3, 0x95, 0xff,
+  0xfc, 0xd1, 0x92, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xcc, 0x84, 0xff,
+  0xfc, 0xca, 0x80, 0xff, 0xfd, 0xd9, 0xa4, 0xff,
+  0xc9, 0x81, 0x37, 0xfc, 0x9b, 0x62, 0x30, 0xd5,
+  0x5b, 0x7e, 0xb4, 0x90, 0x4e, 0x85, 0xd1, 0x87,
+  0x4e, 0x84, 0xd1, 0x88, 0x4e, 0x84, 0xd1, 0x88,
+  0x4e, 0x84, 0xd1, 0x88, 0x5e, 0x7d, 0xad, 0x94,
+  0x8d, 0x68, 0x4d, 0xc0, 0xae, 0x5b, 0x0b, 0xf3,
+  0xbc, 0x6c, 0x1e, 0xf9, 0xe0, 0x93, 0x4a, 0xfe,
+  0xb4, 0x5e, 0x0b, 0xfe, 0x53, 0x81, 0xc6, 0x8b,
+  0x4e, 0x84, 0xd1, 0x88, 0x4e, 0x84, 0xd1, 0x88,
+  0x4d, 0x84, 0xd1, 0x88, 0x4d, 0x84, 0xd1, 0x88,
+  0x4d, 0x84, 0xd1, 0x88, 0x4d, 0x84, 0xd1, 0x88,
+  0x7f, 0x6d, 0x68, 0xb2, 0xbe, 0x74, 0x25, 0xf9,
+  0xfd, 0xe4, 0xbd, 0xff, 0xfd, 0xd9, 0xa4, 0xff,
+  0xd1, 0x8c, 0x41, 0xff, 0xcc, 0xd4, 0xde, 0xff,
+  0xf3, 0xf6, 0xf9, 0xff, 0xa3, 0xac, 0xb8, 0xff,
+  0x37, 0x32, 0x2c, 0xff, 0xd3, 0xac, 0x71, 0xff,
+  0xe8, 0xab, 0x5c, 0xff, 0xfc, 0xce, 0x89, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xc8, 0x7b, 0xff, 0xfc, 0xc6, 0x77, 0xff,
+  0xfd, 0xdb, 0xaa, 0xff, 0xe8, 0xaf, 0x67, 0xfd,
+  0xaf, 0x5d, 0x0f, 0xf2, 0x72, 0x73, 0x83, 0xa4,
+  0x51, 0x83, 0xc9, 0x8a, 0xb1, 0x58, 0x01, 0xfe,
+  0xfc, 0xb0, 0x41, 0xff, 0xc4, 0x70, 0x15, 0xfb,
+  0x82, 0x6c, 0x61, 0xb5, 0x4e, 0x85, 0xd1, 0x88,
+  0x4e, 0x85, 0xd1, 0x88, 0x4e, 0x85, 0xd1, 0x88,
+  0x4e, 0x85, 0xd1, 0x88, 0x4e, 0x85, 0xd1, 0x88,
+  0x4d, 0x84, 0xd2, 0x89, 0x4d, 0x84, 0xd2, 0x89,
+  0x4d, 0x84, 0xd2, 0x89, 0x4d, 0x84, 0xd2, 0x89,
+  0x4d, 0x84, 0xd2, 0x89, 0x56, 0x7f, 0xbe, 0x8f,
+  0xac, 0x5d, 0x12, 0xf0, 0xef, 0xc3, 0x8b, 0xfe,
+  0xfd, 0xe1, 0xb8, 0xff, 0xc8, 0x7e, 0x31, 0xff,
+  0xcf, 0xd9, 0xe5, 0xff, 0xf1, 0xf3, 0xf6, 0xff,
+  0x94, 0x9d, 0xa7, 0xff, 0x2e, 0x29, 0x22, 0xff,
+  0xee, 0xc0, 0x7c, 0xff, 0xec, 0xb6, 0x6b, 0xff,
+  0xfc, 0xd3, 0x95, 0xff, 0xfc, 0xd1, 0x92, 0xff,
+  0xfc, 0xcf, 0x8d, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfd, 0xd4, 0x9a, 0xff, 0xc3, 0x79, 0x30, 0xfc,
+  0x86, 0x6a, 0x58, 0xbc, 0x4d, 0x85, 0xd0, 0x8a,
+  0x4d, 0x85, 0xd0, 0x8a, 0x5f, 0x7c, 0xaa, 0x96,
+  0x97, 0x65, 0x39, 0xcf, 0xb3, 0x5c, 0x0a, 0xfb,
+  0xbe, 0x70, 0x26, 0xfa, 0xd2, 0x87, 0x3c, 0xfb,
+  0xe2, 0x95, 0x4c, 0xff, 0xe3, 0x98, 0x50, 0xff,
+  0xba, 0x67, 0x15, 0xfd, 0x7e, 0x6e, 0x69, 0xb2,
+  0x4d, 0x85, 0xd0, 0x8a, 0x4d, 0x85, 0xd0, 0x8a,
+  0x4d, 0x85, 0xd0, 0x8a, 0x4d, 0x85, 0xd0, 0x8a,
+  0x7d, 0x6f, 0x6b, 0xb1, 0xc0, 0x76, 0x29, 0xfb,
+  0xfc, 0xe0, 0xb9, 0xff, 0xeb, 0xbf, 0x88, 0xff,
+  0xca, 0xac, 0x90, 0xff, 0xf0, 0xf3, 0xf7, 0xff,
+  0xd3, 0xd9, 0xdf, 0xff, 0x57, 0x56, 0x55, 0xff,
+  0x87, 0x71, 0x52, 0xff, 0xee, 0xb5, 0x66, 0xff,
+  0xfc, 0xd5, 0x9a, 0xff, 0xfc, 0xd3, 0x95, 0xff,
+  0xfc, 0xd1, 0x92, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xcc, 0x84, 0xff,
+  0xfc, 0xca, 0x7f, 0xff, 0xfc, 0xd1, 0x94, 0xff,
+  0xc6, 0x7d, 0x34, 0xfd, 0xa4, 0x5e, 0x1c, 0xe6,
+  0x59, 0x7f, 0xb4, 0x94, 0x4c, 0x86, 0xd1, 0x8b,
+  0x4c, 0x86, 0xd1, 0x8b, 0x4c, 0x86, 0xd1, 0x8b,
+  0x4c, 0x86, 0xd1, 0x8b, 0x4c, 0x86, 0xd1, 0x8b,
+  0x4c, 0x86, 0xd1, 0x8b, 0x55, 0x80, 0xbe, 0x91,
+  0x84, 0x6a, 0x5c, 0xba, 0xab, 0x5c, 0x11, 0xef,
+  0xba, 0x69, 0x1b, 0xfa, 0xb4, 0x5e, 0x0c, 0xfe,
+  0x54, 0x81, 0xc2, 0x90, 0x4d, 0x85, 0xd1, 0x8b,
+  0x4d, 0x85, 0xd1, 0x8b, 0x4d, 0x85, 0xd1, 0x8b,
+  0x57, 0x7f, 0xba, 0x92, 0xb4, 0x68, 0x1e, 0xf2,
+  0xf6, 0xd3, 0xa3, 0xff, 0xfd, 0xe5, 0xc1, 0xff,
+  0xcd, 0x85, 0x3a, 0xff, 0xcd, 0xd6, 0xe2, 0xff,
+  0xf3, 0xf5, 0xf8, 0xff, 0x9c, 0xa5, 0xb0, 0xff,
+  0x33, 0x2e, 0x27, 0xff, 0xde, 0xb4, 0x75, 0xff,
+  0xe9, 0xb1, 0x66, 0xff, 0xfc, 0xd3, 0x96, 0xff,
+  0xfc, 0xd1, 0x92, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xce, 0x89, 0xff, 0xfc, 0xcc, 0x84, 0xff,
+  0xfc, 0xca, 0x80, 0xff, 0xfd, 0xd8, 0xa2, 0xff,
+  0xcf, 0x8b, 0x43, 0xfc, 0x9e, 0x60, 0x29, 0xdc,
+  0x5c, 0x7d, 0xae, 0x97, 0x4c, 0x84, 0xd1, 0x8c,
+  0x4c, 0x84, 0xd1, 0x8c, 0x4c, 0x84, 0xd1, 0x8c,
+  0x4c, 0x84, 0xd1, 0x8c, 0x5a, 0x7d, 0xb3, 0x95,
+  0x87, 0x6a, 0x54, 0xbf, 0xad, 0x5c, 0x0f, 0xf1,
+  0xb9, 0x65, 0x15, 0xfa, 0xdc, 0x8c, 0x3d, 0xfe,
+  0xb6, 0x62, 0x11, 0xfc, 0x5b, 0x7d, 0xb1, 0x96,
+  0x4c, 0x84, 0xd1, 0x8c, 0x4c, 0x84, 0xd1, 0x8c,
+  0x4c, 0x84, 0xd1, 0x8c, 0x4c, 0x84, 0xd1, 0x8c,
+  0x4d, 0x84, 0xd1, 0x8d, 0x4d, 0x84, 0xd1, 0x8d,
+  0x7e, 0x6d, 0x6a, 0xb5, 0xbd, 0x71, 0x20, 0xf9,
+  0xfd, 0xe4, 0xbd, 0xff, 0xfd, 0xda, 0xa8, 0xff,
+  0xeb, 0xb7, 0x76, 0xff, 0xcb, 0xae, 0x93, 0xff,
+  0xf0, 0xf3, 0xf8, 0xff, 0xd3, 0xd8, 0xdf, 0xff,
+  0x54, 0x54, 0x52, 0xff, 0x8b, 0x75, 0x54, 0xff,
+  0xed, 0xb4, 0x64, 0xff, 0xfc, 0xce, 0x89, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xc8, 0x7b, 0xff, 0xfc, 0xc7, 0x78, 0xff,
+  0xfd, 0xdc, 0xac, 0xff, 0xe7, 0xae, 0x66, 0xfd,
+  0xaf, 0x5d, 0x0f, 0xf3, 0x71, 0x73, 0x85, 0xa8,
+  0x4d, 0x84, 0xd1, 0x8d, 0x7a, 0x6f, 0x70, 0xb3,
+  0xc1, 0x73, 0x25, 0xfa, 0xfa, 0xbf, 0x7f, 0xff,
+  0xb2, 0x5a, 0x06, 0xfc, 0x5d, 0x7c, 0xae, 0x9a,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x84, 0xd2, 0x8e,
+  0x4c, 0x84, 0xd2, 0x8e, 0x4c, 0x84, 0xd2, 0x8e,
+  0x51, 0x88, 0xd1, 0x7c, 0x51, 0x88, 0xd1, 0x7c,
+  0x51, 0x88, 0xd1, 0x7c, 0x98, 0x67, 0x3a, 0xc5,
+  0xd5, 0x94, 0x4a, 0xfc, 0xfd, 0xe5, 0xbf, 0xff,
+  0xf5, 0xc6, 0x88, 0xff, 0xd8, 0x9f, 0x66, 0xff,
+  0x63, 0x87, 0xb6, 0xff, 0x5e, 0x6b, 0x7b, 0xff,
+  0x56, 0x7d, 0xaf, 0xff, 0xc5, 0xc5, 0xc3, 0xff,
+  0xe4, 0xb6, 0x72, 0xff, 0xe1, 0xa0, 0x49, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xcc, 0x84, 0xff,
+  0xfc, 0xca, 0x80, 0xff, 0xfc, 0xc8, 0x7b, 0xff,
+  0xfc, 0xc6, 0x76, 0xff, 0xfc, 0xc4, 0x73, 0xff,
+  0xfc, 0xc7, 0x7b, 0xff, 0xfa, 0xd7, 0xa3, 0xff,
+  0xd1, 0x92, 0x4d, 0xfb, 0x9e, 0x65, 0x32, 0xce,
+  0x67, 0x7b, 0x9d, 0x8f, 0x55, 0x83, 0xc5, 0x81,
+  0x50, 0x87, 0xd1, 0x7d, 0x50, 0x87, 0xd1, 0x7d,
+  0x5a, 0x81, 0xb9, 0x85, 0x84, 0x6d, 0x5e, 0xad,
+  0xb4, 0x5c, 0x07, 0xff, 0xe6, 0x9e, 0x59, 0xff,
+  0xdd, 0x99, 0x56, 0xfe, 0x8c, 0x69, 0x50, 0xb6,
+  0x50, 0x87, 0xd1, 0x7d, 0x50, 0x87, 0xd1, 0x7d,
+  0x50, 0x87, 0xd1, 0x7d, 0x61, 0x7e, 0xac, 0x89,
+  0xb1, 0x5c, 0x08, 0xf9, 0xfb, 0xdd, 0xb4, 0xff,
+  0xfd, 0xdf, 0xb1, 0xff, 0xd8, 0x93, 0x4a, 0xff,
+  0xa3, 0xb4, 0xc9, 0xff, 0x6c, 0x83, 0xa1, 0xff,
+  0x62, 0x7b, 0x9c, 0xff, 0xa3, 0xb8, 0xd1, 0xff,
+  0xb2, 0xa5, 0x91, 0xff, 0xfc, 0xbd, 0x61, 0xff,
+  0xf5, 0xc2, 0x7a, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xc8, 0x7b, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xfc, 0xc4, 0x73, 0xff, 0xfc, 0xcd, 0x89, 0xff,
+  0xfb, 0xd7, 0xa2, 0xff, 0xde, 0xa1, 0x5a, 0xfc,
+  0xb3, 0x5e, 0x0b, 0xfa, 0x9c, 0x63, 0x32, 0xcd,
+  0x68, 0x7a, 0x9c, 0x90, 0x68, 0x7a, 0x9c, 0x90,
+  0x81, 0x6e, 0x66, 0xaa, 0x97, 0x65, 0x3a, 0xc6,
+  0xaa, 0x5e, 0x18, 0xe5, 0xb7, 0x66, 0x17, 0xfb,
+  0xd1, 0x8a, 0x47, 0xfb, 0xee, 0xab, 0x6a, 0xff,
+  0xf9, 0xb7, 0x76, 0xff, 0xb7, 0x63, 0x14, 0xf9,
+  0x62, 0x7e, 0xa7, 0x8c, 0x50, 0x87, 0xd1, 0x7e,
+  0x50, 0x87, 0xd1, 0x7e, 0x50, 0x87, 0xd1, 0x7e,
+  0xa3, 0x63, 0x28, 0xd7, 0xf2, 0xc9, 0x94, 0xfe,
+  0xfd, 0xe4, 0xbf, 0xff, 0xf5, 0xc6, 0x89, 0xff,
+  0xd8, 0x9f, 0x66, 0xff, 0x63, 0x87, 0xb6, 0xff,
+  0x5e, 0x6b, 0x7b, 0xff, 0x56, 0x7d, 0xaf, 0xff,
+  0xc5, 0xc5, 0xc3, 0xff, 0xe4, 0xb6, 0x72, 0xff,
+  0xe1, 0xa0, 0x49, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xc8, 0x7b, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xfc, 0xc4, 0x73, 0xff, 0xfc, 0xcf, 0x8d, 0xff,
+  0xfc, 0xd8, 0xa3, 0xff, 0xe2, 0xa5, 0x5c, 0xfd,
+  0xb2, 0x5b, 0x09, 0xfa, 0x9e, 0x64, 0x31, 0xcf,
+  0x6d, 0x7a, 0x94, 0x95, 0x7f, 0x70, 0x6c, 0xa8,
+  0xa6, 0x60, 0x1d, 0xdf, 0xb3, 0x5c, 0x09, 0xfb,
+  0xd6, 0x8c, 0x46, 0xfb, 0xf1, 0xb4, 0x7a, 0xff,
+  0xf9, 0xbe, 0x83, 0xff, 0xf9, 0xbb, 0x7f, 0xff,
+  0xb3, 0x5b, 0x07, 0xf9, 0x65, 0x7d, 0xa4, 0x8e,
+  0x51, 0x88, 0xd1, 0x7f, 0x51, 0x88, 0xd1, 0x7f,
+  0x51, 0x88, 0xd1, 0x7f, 0x51, 0x88, 0xd1, 0x7f,
+  0x51, 0x88, 0xd1, 0x7f, 0x52, 0x85, 0xcc, 0x81,
+  0xae, 0x5d, 0x0e, 0xf1, 0xf5, 0xcb, 0x91, 0xff,
+  0xfd, 0xdd, 0xaf, 0xff, 0xfa, 0xd0, 0x95, 0xff,
+  0xd2, 0x8f, 0x4d, 0xff, 0x68, 0x89, 0xb4, 0xff,
+  0x5f, 0x6d, 0x7d, 0xff, 0x57, 0x7f, 0xb2, 0xff,
+  0xcb, 0xcc, 0xcd, 0xff, 0xd4, 0xae, 0x77, 0xff,
+  0xe3, 0xa1, 0x49, 0xff, 0xfc, 0xc9, 0x7d, 0xff,
+  0xfc, 0xc7, 0x78, 0xff, 0xfc, 0xc5, 0x73, 0xff,
+  0xfc, 0xc3, 0x6f, 0xff, 0xfb, 0xc1, 0x6a, 0xff,
+  0xfb, 0xc1, 0x6e, 0xff, 0xfc, 0xd4, 0x97, 0xff,
+  0xf7, 0xc9, 0x88, 0xff, 0xbb, 0x6a, 0x19, 0xfa,
+  0xa5, 0x60, 0x20, 0xdd, 0xb1, 0x57, 0x00, 0xff,
+  0xfc, 0xb4, 0x4b, 0xff, 0xe3, 0x94, 0x2e, 0xff,
+  0xa6, 0x64, 0x24, 0xdd, 0x50, 0x88, 0xd1, 0x80,
+  0x50, 0x88, 0xd1, 0x80, 0x50, 0x88, 0xd1, 0x80,
+  0x50, 0x88, 0xd1, 0x80, 0x50, 0x88, 0xd1, 0x80,
+  0x50, 0x88, 0xd1, 0x80, 0x50, 0x88, 0xd1, 0x80,
+  0x50, 0x88, 0xd1, 0x80, 0x50, 0x88, 0xd1, 0x80,
+  0x50, 0x88, 0xd1, 0x80, 0x97, 0x67, 0x3c, 0xc7,
+  0xd8, 0x9b, 0x56, 0xfc, 0xfd, 0xe3, 0xbc, 0xff,
+  0xf5, 0xc6, 0x88, 0xff, 0xd8, 0x9f, 0x66, 0xff,
+  0x63, 0x87, 0xb6, 0xff, 0x5e, 0x6b, 0x7b, 0xff,
+  0x56, 0x7d, 0xaf, 0xff, 0xc5, 0xc5, 0xc3, 0xff,
+  0xe4, 0xb6, 0x72, 0xff, 0xe1, 0xa0, 0x49, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xcc, 0x84, 0xff,
+  0xfc, 0xca, 0x80, 0xff, 0xfc, 0xc8, 0x7b, 0xff,
+  0xfc, 0xc6, 0x76, 0xff, 0xfc, 0xc4, 0x73, 0xff,
+  0xfc, 0xcd, 0x88, 0xff, 0xfa, 0xd5, 0x9f, 0xff,
+  0xcb, 0x84, 0x37, 0xfb, 0x9e, 0x65, 0x31, 0xd1,
+  0x9d, 0x64, 0x31, 0xd1, 0xb5, 0x61, 0x0f, 0xfb,
+  0xd9, 0x90, 0x47, 0xfd, 0xf5, 0xb0, 0x6c, 0xff,
+  0xf8, 0xa7, 0x59, 0xff, 0xf5, 0x99, 0x40, 0xff,
+  0xf3, 0x8d, 0x2a, 0xff, 0xf8, 0xab, 0x60, 0xff,
+  0xbc, 0x6e, 0x23, 0xfb, 0x64, 0x7b, 0xa4, 0x90,
+  0x4f, 0x86, 0xd0, 0x82, 0x4f, 0x86, 0xd0, 0x82,
+  0x4f, 0x86, 0xd0, 0x82, 0x60, 0x7d, 0xac, 0x8e,
+  0xb0, 0x5c, 0x08, 0xf9, 0xfb, 0xdd, 0xb4, 0xff,
+  0xfd, 0xdf, 0xb1, 0xff, 0xd8, 0x93, 0x4a, 0xff,
+  0xa3, 0xb4, 0xc9, 0xff, 0x6c, 0x83, 0xa1, 0xff,
+  0x62, 0x7b, 0x9c, 0xff, 0xa3, 0xb8, 0xd1, 0xff,
+  0xb2, 0xa5, 0x91, 0xff, 0xfc, 0xbd, 0x61, 0xff,
+  0xf5, 0xc2, 0x7a, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xc8, 0x7b, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xfc, 0xc4, 0x73, 0xff, 0xfc, 0xcd, 0x89, 0xff,
+  0xfb, 0xd7, 0xa2, 0xff, 0xde, 0xa1, 0x5a, 0xfc,
+  0xb3, 0x5e, 0x0b, 0xfb, 0x9c, 0x63, 0x33, 0xcf,
+  0x67, 0x79, 0x9e, 0x94, 0x67, 0x79, 0x9e, 0x94,
+  0x80, 0x6d, 0x68, 0xac, 0x96, 0x64, 0x3c, 0xc8,
+  0xaa, 0x5e, 0x18, 0xe6, 0xb3, 0x5d, 0x0a, 0xfb,
+  0xcd, 0x7f, 0x35, 0xfb, 0xec, 0xa5, 0x5f, 0xff,
+  0xf9, 0xb6, 0x75, 0xff, 0xb7, 0x63, 0x14, 0xfa,
+  0x62, 0x7c, 0xa8, 0x90, 0x50, 0x85, 0xd1, 0x82,
+  0x50, 0x85, 0xd1, 0x82, 0x50, 0x85, 0xd1, 0x82,
+  0x9b, 0x65, 0x35, 0xce, 0xee, 0xc2, 0x88, 0xfe,
+  0xfd, 0xe5, 0xc1, 0xff, 0xf7, 0xcd, 0x91, 0xff,
+  0xd4, 0x95, 0x54, 0xff, 0x66, 0x88, 0xb5, 0xff,
+  0x5f, 0x6c, 0x7c, 0xff, 0x56, 0x7e, 0xb2, 0xff,
+  0xca, 0xca, 0xc9, 0xff, 0xdc, 0xb2, 0x75, 0xff,
+  0xe2, 0xa1, 0x4a, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xcc, 0x84, 0xff, 0xfc, 0xca, 0x80, 0xff,
+  0xfc, 0xc8, 0x7b, 0xff, 0xfc, 0xc6, 0x77, 0xff,
+  0xfc, 0xc4, 0x73, 0xff, 0xfc, 0xcd, 0x88, 0xff,
+  0xfc, 0xd9, 0xa6, 0xff, 0xe4, 0xaa, 0x61, 0xfd,
+  0xb3, 0x5d, 0x0a, 0xfb, 0x9e, 0x63, 0x2d, 0xd4,
+  0x6d, 0x77, 0x91, 0x9a, 0x7a, 0x71, 0x73, 0xa7,
+  0xa4, 0x60, 0x22, 0xdc, 0xb1, 0x5b, 0x08, 0xfb,
+  0xcf, 0x7f, 0x30, 0xfb, 0xed, 0xa1, 0x59, 0xff,
+  0xf9, 0xb0, 0x6a, 0xff, 0xf9, 0xb6, 0x75, 0xff,
+  0xb8, 0x61, 0x0f, 0xf8, 0x6c, 0x79, 0x92, 0x9a,
+  0x4f, 0x87, 0xd1, 0x84, 0x4f, 0x87, 0xd1, 0x84,
+  0x4f, 0x87, 0xd1, 0x84, 0x4f, 0x87, 0xd1, 0x84,
+  0x4f, 0x87, 0xd1, 0x84, 0x51, 0x85, 0xcc, 0x85,
+  0xae, 0x5d, 0x0e, 0xf2, 0xf5, 0xc9, 0x8d, 0xff,
+  0xfd, 0xdf, 0xb2, 0xff, 0xfd, 0xd6, 0x9c, 0xff,
+  0xd7, 0x92, 0x4a, 0xff, 0xa0, 0xb2, 0xca, 0xff,
+  0x6e, 0x84, 0xa1, 0xff, 0x64, 0x7d, 0x9e, 0xff,
+  0xa7, 0xba, 0xd3, 0xff, 0xaf, 0xa1, 0x8d, 0xff,
+  0xfc, 0xbd, 0x61, 0xff, 0xf5, 0xbd, 0x6e, 0xff,
+  0xfc, 0xc7, 0x78, 0xff, 0xfc, 0xc5, 0x73, 0xff,
+  0xfc, 0xc3, 0x6f, 0xff, 0xfb, 0xc1, 0x6a, 0xff,
+  0xfb, 0xc2, 0x70, 0xff, 0xfc, 0xd4, 0x99, 0xff,
+  0xf6, 0xc7, 0x84, 0xff, 0xba, 0x67, 0x15, 0xfa,
+  0xa5, 0x61, 0x21, 0xdf, 0xb1, 0x5a, 0x06, 0xfa,
+  0xe9, 0xa7, 0x5d, 0xff, 0xfa, 0xc1, 0x81, 0xff,
+  0xbe, 0x6d, 0x1c, 0xf9, 0x75, 0x73, 0x7d, 0xa5,
+  0x4e, 0x86, 0xd1, 0x85, 0x4e, 0x86, 0xd1, 0x85,
+  0x4e, 0x86, 0xd1, 0x85, 0x4e, 0x86, 0xd1, 0x85,
+  0x4e, 0x86, 0xd1, 0x85, 0x4e, 0x86, 0xd1, 0x85,
+  0x52, 0x89, 0xd1, 0x73, 0x52, 0x89, 0xd1, 0x73,
+  0x68, 0x7d, 0x9e, 0x85, 0xb3, 0x5d, 0x0a, 0xfa,
+  0xfb, 0xda, 0xac, 0xff, 0xfd, 0xda, 0xa8, 0xff,
+  0xf9, 0xce, 0x95, 0xff, 0xda, 0x96, 0x53, 0xff,
+  0x85, 0x9c, 0xbb, 0xff, 0x36, 0x65, 0xa2, 0xff,
+  0x80, 0x98, 0xb6, 0xff, 0xe0, 0xe0, 0xdc, 0xff,
+  0xc2, 0x9d, 0x6d, 0xff, 0xe3, 0xa0, 0x45, 0xff,
+  0xfc, 0xca, 0x81, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xfc, 0xc4, 0x73, 0xff, 0xfc, 0xc2, 0x6e, 0xff,
+  0xfb, 0xbf, 0x66, 0xff, 0xfc, 0xba, 0x5a, 0xff,
+  0xfc, 0xb6, 0x4e, 0xff, 0xfc, 0xb8, 0x55, 0xff,
+  0xfb, 0xcc, 0x8a, 0xff, 0xe0, 0xaa, 0x6b, 0xfc,
+  0xc2, 0x7b, 0x35, 0xf8, 0xba, 0x6c, 0x20, 0xfc,
+  0xb5, 0x63, 0x13, 0xf7, 0xb1, 0x5e, 0x0e, 0xf4,
+  0xba, 0x6a, 0x1e, 0xfc, 0xca, 0x83, 0x3d, 0xfa,
+  0xed, 0xb0, 0x75, 0xff, 0xf8, 0xad, 0x65, 0xff,
+  0xd8, 0x94, 0x51, 0xfc, 0x8a, 0x6b, 0x57, 0xaa,
+  0x53, 0x88, 0xd2, 0x74, 0x53, 0x88, 0xd2, 0x74,
+  0x53, 0x88, 0xd2, 0x74, 0xa5, 0x62, 0x24, 0xd5,
+  0xe9, 0xb7, 0x76, 0xfd, 0xfd, 0xe3, 0xbb, 0xff,
+  0xfd, 0xd8, 0xa1, 0xff, 0xe4, 0xa3, 0x5e, 0xff,
+  0xd0, 0xc3, 0xb7, 0xff, 0x42, 0x6c, 0xa2, 0xff,
+  0x42, 0x6c, 0xa2, 0xff, 0xc9, 0xce, 0xd2, 0xff,
+  0xda, 0xd8, 0xd3, 0xff, 0xe8, 0xa3, 0x43, 0xff,
+  0xf9, 0xc5, 0x7b, 0xff, 0xfc, 0xc8, 0x7d, 0xff,
+  0xfc, 0xc6, 0x76, 0xff, 0xfc, 0xc4, 0x73, 0xff,
+  0xfc, 0xc2, 0x6e, 0xff, 0xfc, 0xbf, 0x65, 0xff,
+  0xfc, 0xba, 0x59, 0xff, 0xfc, 0xb6, 0x4e, 0xff,
+  0xfc, 0xbb, 0x5b, 0xff, 0xfc, 0xca, 0x82, 0xff,
+  0xf8, 0xcb, 0x8c, 0xff, 0xdd, 0x99, 0x51, 0xfd,
+  0xb8, 0x65, 0x14, 0xfb, 0xba, 0x68, 0x1a, 0xf9,
+  0xce, 0x83, 0x3b, 0xf8, 0xe3, 0x9f, 0x5c, 0xfe,
+  0xf1, 0xbb, 0x87, 0xff, 0xf8, 0xc5, 0x93, 0xff,
+  0xf8, 0xb1, 0x6c, 0xff, 0xf6, 0x95, 0x35, 0xff,
+  0xf9, 0xb5, 0x73, 0xff, 0xb5, 0x5c, 0x07, 0xf8,
+  0x6d, 0x7b, 0x93, 0x8b, 0x52, 0x89, 0xd0, 0x75,
+  0x52, 0x89, 0xd0, 0x75, 0x7a, 0x73, 0x79, 0x97,
+  0xcd, 0x88, 0x40, 0xfb, 0xfd, 0xe7, 0xc5, 0xff,
+  0xfd, 0xd8, 0xa4, 0xff, 0xf9, 0xce, 0x95, 0xff,
+  0xda, 0x96, 0x53, 0xff, 0x85, 0x9c, 0xbb, 0xff,
+  0x36, 0x65, 0xa2, 0xff, 0x80, 0x98, 0xb6, 0xff,
+  0xe0, 0xe0, 0xdc, 0xff, 0xc2, 0x9d, 0x6d, 0xff,
+  0xe3, 0xa0, 0x45, 0xff, 0xfc, 0xca, 0x81, 0xff,
+  0xfc, 0xc6, 0x76, 0xff, 0xfc, 0xc4, 0x73, 0xff,
+  0xfc, 0xc2, 0x6e, 0xff, 0xfb, 0xbf, 0x63, 0xff,
+  0xfb, 0xb8, 0x58, 0xff, 0xfc, 0xb4, 0x4e, 0xff,
+  0xfc, 0xbb, 0x5e, 0xff, 0xfd, 0xcd, 0x87, 0xff,
+  0xf8, 0xca, 0x8a, 0xff, 0xdb, 0x95, 0x49, 0xfd,
+  0xb6, 0x62, 0x10, 0xfb, 0xc3, 0x73, 0x24, 0xf7,
+  0xe8, 0x9d, 0x56, 0xff, 0xf8, 0xc1, 0x8b, 0xff,
+  0xfa, 0xbe, 0x84, 0xff, 0xf8, 0xa7, 0x59, 0xff,
+  0xf6, 0x96, 0x37, 0xff, 0xf9, 0xb5, 0x74, 0xff,
+  0xb3, 0x5a, 0x03, 0xfa, 0x66, 0x7b, 0xa2, 0x87,
+  0x51, 0x87, 0xd1, 0x77, 0x51, 0x87, 0xd1, 0x77,
+  0x51, 0x87, 0xd1, 0x77, 0x51, 0x87, 0xd1, 0x77,
+  0x51, 0x87, 0xd1, 0x77, 0x86, 0x6c, 0x5c, 0xa9,
+  0xc5, 0x7c, 0x2e, 0xf9, 0xfd, 0xe3, 0xbb, 0xff,
+  0xfc, 0xd5, 0x9c, 0xff, 0xfb, 0xd2, 0x97, 0xff,
+  0xd8, 0x8f, 0x47, 0xff, 0x99, 0xac, 0xc3, 0xff,
+  0x36, 0x65, 0xa1, 0xff, 0x70, 0x8d, 0xb0, 0xff,
+  0xde, 0xde, 0xdb, 0xff, 0xc0, 0xa5, 0x82, 0xff,
+  0xe2, 0x9b, 0x3d, 0xff, 0xfc, 0xc6, 0x78, 0xff,
+  0xfb, 0xc1, 0x6c, 0xff, 0xfb, 0xbe, 0x63, 0xff,
+  0xfc, 0xb5, 0x4e, 0xff, 0xfc, 0xb1, 0x43, 0xff,
+  0xfc, 0xaf, 0x3d, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xbe, 0x65, 0xff, 0xf9, 0xc9, 0x88, 0xff,
+  0xe5, 0xa8, 0x61, 0xff, 0xb1, 0x57, 0x01, 0xff,
+  0xfb, 0xb8, 0x55, 0xff, 0xef, 0xa6, 0x43, 0xff,
+  0xaf, 0x5f, 0x10, 0xee, 0x52, 0x88, 0xd1, 0x77,
+  0x52, 0x88, 0xd1, 0x77, 0x52, 0x88, 0xd1, 0x77,
+  0x52, 0x88, 0xd1, 0x77, 0x52, 0x88, 0xd1, 0x77,
+  0x52, 0x87, 0xd1, 0x78, 0x52, 0x87, 0xd1, 0x78,
+  0x52, 0x87, 0xd1, 0x78, 0x52, 0x87, 0xd1, 0x78,
+  0x67, 0x7b, 0xa0, 0x89, 0xb5, 0x61, 0x0f, 0xfa,
+  0xfb, 0xdb, 0xae, 0xff, 0xfd, 0xd8, 0xa3, 0xff,
+  0xf9, 0xce, 0x95, 0xff, 0xda, 0x96, 0x53, 0xff,
+  0x85, 0x9c, 0xbb, 0xff, 0x36, 0x65, 0xa2, 0xff,
+  0x80, 0x98, 0xb6, 0xff, 0xe0, 0xe0, 0xdc, 0xff,
+  0xc2, 0x9d, 0x6d, 0xff, 0xe3, 0xa0, 0x45, 0xff,
+  0xfc, 0xca, 0x81, 0xff, 0xfc, 0xc6, 0x76, 0xff,
+  0xfc, 0xc4, 0x73, 0xff, 0xfc, 0xc2, 0x6e, 0xff,
+  0xfb, 0xbf, 0x66, 0xff, 0xfc, 0xba, 0x5a, 0xff,
+  0xfc, 0xb6, 0x4e, 0xff, 0xfc, 0xbe, 0x63, 0xff,
+  0xfb, 0xd1, 0x95, 0xff, 0xdd, 0xa1, 0x5b, 0xfc,
+  0xde, 0x9d, 0x56, 0xfd, 0xf7, 0xbb, 0x78, 0xff,
+  0xf8, 0xa1, 0x47, 0xff, 0xf4, 0x7d, 0x0a, 0xff,
+  0xf2, 0x77, 0x00, 0xff, 0xf1, 0x77, 0x00, 0xff,
+  0xf3, 0x78, 0x00, 0xff, 0xf8, 0xa1, 0x4d, 0xff,
+  0xc7, 0x79, 0x2f, 0xf8, 0x7c, 0x72, 0x72, 0x9f,
+  0x51, 0x88, 0xd2, 0x79, 0x51, 0x88, 0xd2, 0x79,
+  0x51, 0x88, 0xd2, 0x79, 0xa4, 0x63, 0x26, 0xd7,
+  0xe9, 0xb7, 0x76, 0xfd, 0xfd, 0xe3, 0xbb, 0xff,
+  0xfd, 0xd8, 0xa1, 0xff, 0xe4, 0xa3, 0x5e, 0xff,
+  0xd0, 0xc3, 0xb7, 0xff, 0x42, 0x6c, 0xa2, 0xff,
+  0x42, 0x6c, 0xa2, 0xff, 0xc9, 0xce, 0xd2, 0xff,
+  0xda, 0xd8, 0xd3, 0xff, 0xe8, 0xa3, 0x43, 0xff,
+  0xf9, 0xc5, 0x7b, 0xff, 0xfc, 0xc8, 0x7d, 0xff,
+  0xfc, 0xc6, 0x76, 0xff, 0xfc, 0xc4, 0x73, 0xff,
+  0xfc, 0xc2, 0x6e, 0xff, 0xfc, 0xbf, 0x65, 0xff,
+  0xfc, 0xba, 0x59, 0xff, 0xfc, 0xb6, 0x4e, 0xff,
+  0xfc, 0xbb, 0x5b, 0xff, 0xfc, 0xca, 0x82, 0xff,
+  0xf8, 0xcb, 0x8c, 0xff, 0xdd, 0x99, 0x51, 0xfd,
+  0xb8, 0x65, 0x14, 0xfb, 0xba, 0x68, 0x1a, 0xf9,
+  0xcb, 0x7d, 0x31, 0xf9, 0xe0, 0x90, 0x43, 0xfe,
+  0xec, 0xa2, 0x5a, 0xff, 0xf7, 0xb2, 0x6f, 0xff,
+  0xf8, 0xa1, 0x4e, 0xff, 0xf6, 0x8a, 0x22, 0xff,
+  0xf9, 0xb4, 0x72, 0xff, 0xb5, 0x5c, 0x07, 0xf8,
+  0x6b, 0x7a, 0x96, 0x8f, 0x50, 0x88, 0xd1, 0x7a,
+  0x50, 0x88, 0xd1, 0x7a, 0x71, 0x77, 0x8a, 0x94,
+  0xc6, 0x7e, 0x33, 0xfb, 0xfd, 0xe7, 0xc5, 0xff,
+  0xfd, 0xd9, 0xa5, 0xff, 0xfb, 0xd2, 0x9a, 0xff,
+  0xd8, 0x91, 0x4a, 0xff, 0x91, 0xa6, 0xc0, 0xff,
+  0x36, 0x65, 0xa1, 0xff, 0x76, 0x91, 0xb3, 0xff,
+  0xdf, 0xdf, 0xdc, 0xff, 0xc2, 0xa3, 0x79, 0xff,
+  0xe2, 0x9e, 0x43, 0xff, 0xfc, 0xca, 0x81, 0xff,
+  0xfc, 0xc6, 0x77, 0xff, 0xfc, 0xc4, 0x73, 0xff,
+  0xfc, 0xc2, 0x6e, 0xff, 0xfb, 0xbf, 0x65, 0xff,
+  0xfb, 0xb9, 0x58, 0xff, 0xfc, 0xb5, 0x4e, 0xff,
+  0xfc, 0xbb, 0x5d, 0xff, 0xfc, 0xcb, 0x84, 0xff,
+  0xf9, 0xcc, 0x8d, 0xff, 0xde, 0x9a, 0x4d, 0xfd,
+  0xb6, 0x63, 0x13, 0xfa, 0xc0, 0x70, 0x20, 0xf8,
+  0xe4, 0x95, 0x47, 0xfe, 0xf6, 0xb1, 0x6d, 0xff,
+  0xf8, 0xa4, 0x53, 0xff, 0xf6, 0x8c, 0x25, 0xff,
+  0xf5, 0x7d, 0x08, 0xff, 0xf9, 0xb4, 0x71, 0xff,
+  0xb6, 0x5c, 0x05, 0xf8, 0x6f, 0x79, 0x8f, 0x93,
+  0x51, 0x89, 0xd1, 0x7b, 0x51, 0x89, 0xd1, 0x7b,
+  0x51, 0x89, 0xd1, 0x7b, 0x51, 0x89, 0xd1, 0x7b,
+  0x51, 0x89, 0xd1, 0x7b, 0x85, 0x6d, 0x5e, 0xac,
+  0xc4, 0x79, 0x29, 0xf9, 0xfd, 0xe4, 0xbd, 0xff,
+  0xfc, 0xd5, 0x9c, 0xff, 0xfc, 0xd5, 0x9b, 0xff,
+  0xe2, 0xa1, 0x59, 0xff, 0xcd, 0xc2, 0xb8, 0xff,
+  0x41, 0x6c, 0xa1, 0xff, 0x44, 0x6d, 0xa2, 0xff,
+  0xc8, 0xcd, 0xd2, 0xff, 0xd6, 0xd3, 0xcf, 0xff,
+  0xe7, 0xa2, 0x42, 0xff, 0xf9, 0xc0, 0x71, 0xff,
+  0xfb, 0xc1, 0x6e, 0xff, 0xfb, 0xbe, 0x63, 0xff,
+  0xfc, 0xb5, 0x4e, 0xff, 0xfc, 0xb1, 0x43, 0xff,
+  0xfc, 0xaf, 0x3d, 0xff, 0xfc, 0xaf, 0x3f, 0xff,
+  0xfc, 0xc0, 0x6a, 0xff, 0xf9, 0xc8, 0x87, 0xff,
+  0xe4, 0xa2, 0x56, 0xff, 0xf5, 0xb8, 0x6e, 0xff,
+  0xfa, 0xb9, 0x6e, 0xff, 0xf9, 0xb3, 0x65, 0xff,
+  0xd0, 0x80, 0x30, 0xfb, 0x89, 0x6a, 0x55, 0xb3,
+  0x50, 0x87, 0xd1, 0x7d, 0x50, 0x87, 0xd1, 0x7d,
+  0x50, 0x87, 0xd1, 0x7d, 0x50, 0x87, 0xd1, 0x7d,
+  0x50, 0x87, 0xd1, 0x7d, 0x50, 0x87, 0xd1, 0x7d,
+  0x55, 0x8a, 0xd1, 0x6b, 0x55, 0x8a, 0xd1, 0x6b,
+  0xa7, 0x62, 0x22, 0xd2, 0xe2, 0xa5, 0x5e, 0xfd,
+  0xfc, 0xe1, 0xb6, 0xff, 0xfc, 0xd4, 0x97, 0xff,
+  0xfc, 0xd7, 0x9f, 0xff, 0xe7, 0xa2, 0x5a, 0xff,
+  0xdc, 0xba, 0x96, 0xff, 0xd1, 0xce, 0xc7, 0xff,
+  0xcb, 0xcb, 0xc5, 0xff, 0xd0, 0xc4, 0xb2, 0xff,
+  0xce, 0x88, 0x45, 0xff, 0xf3, 0xba, 0x6d, 0xff,
+  0xfc, 0xc6, 0x79, 0xff, 0xfb, 0xc0, 0x69, 0xff,
+  0xfb, 0xbd, 0x5e, 0xff, 0xfd, 0xb4, 0x4b, 0xff,
+  0xfc, 0xaf, 0x3f, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfa, 0xb6, 0x5a, 0xff,
+  0xfa, 0xb6, 0x64, 0xff, 0xf9, 0xb4, 0x68, 0xff,
+  0xf6, 0xb2, 0x6d, 0xff, 0xf3, 0xb0, 0x6f, 0xff,
+  0xf9, 0xb2, 0x6c, 0xff, 0xf9, 0xb9, 0x7b, 0xff,
+  0xf8, 0xa3, 0x53, 0xff, 0xf7, 0x97, 0x3b, 0xff,
+  0xcd, 0x88, 0x44, 0xf9, 0x84, 0x70, 0x63, 0x9a,
+  0x54, 0x8b, 0xd1, 0x6b, 0x54, 0x8b, 0xd1, 0x6b,
+  0x80, 0x71, 0x6c, 0x94, 0xbe, 0x71, 0x22, 0xf9,
+  0xfd, 0xe5, 0xc0, 0xff, 0xfc, 0xd6, 0x9e, 0xff,
+  0xfc, 0xd7, 0x9f, 0xff, 0xf7, 0xca, 0x8a, 0xff,
+  0xe1, 0x9b, 0x55, 0xff, 0xd7, 0xcd, 0xbf, 0xff,
+  0xcc, 0xcc, 0xc6, 0xff, 0xcd, 0xcb, 0xc2, 0xff,
+  0xd8, 0xae, 0x81, 0xff, 0xd8, 0x9a, 0x4c, 0xff,
+  0xfc, 0xcc, 0x86, 0xff, 0xfc, 0xc2, 0x6f, 0xff,
+  0xfb, 0xc1, 0x68, 0xff, 0xfb, 0xba, 0x57, 0xff,
+  0xfb, 0xb2, 0x47, 0xff, 0xfc, 0xaf, 0x3d, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xa9, 0x3d, 0xff, 0xfa, 0xb2, 0x5b, 0xff,
+  0xfa, 0xbb, 0x75, 0xff, 0xf9, 0xb3, 0x6b, 0xff,
+  0xf8, 0xae, 0x66, 0xff, 0xf8, 0xac, 0x62, 0xff,
+  0xf8, 0xac, 0x64, 0xff, 0xf7, 0x9c, 0x45, 0xff,
+  0xf6, 0x8f, 0x2b, 0xff, 0xf5, 0x8a, 0x22, 0xff,
+  0xf5, 0xae, 0x69, 0xff, 0xb1, 0x59, 0x03, 0xf9,
+  0x57, 0x89, 0xca, 0x6f, 0x55, 0x8b, 0xd0, 0x6d,
+  0x58, 0x88, 0xc8, 0x6f, 0xb0, 0x5f, 0x11, 0xed,
+  0xfa, 0xdc, 0xb1, 0xff, 0xfc, 0xde, 0xb0, 0xff,
+  0xfc, 0xd4, 0x97, 0xff, 0xfc, 0xd7, 0x9f, 0xff,
+  0xe7, 0xa2, 0x5a, 0xff, 0xdc, 0xba, 0x96, 0xff,
+  0xd1, 0xce, 0xc7, 0xff, 0xcb, 0xcb, 0xc5, 0xff,
+  0xd0, 0xc4, 0xb2, 0xff, 0xce, 0x88, 0x45, 0xff,
+  0xf3, 0xba, 0x6d, 0xff, 0xfc, 0xc6, 0x79, 0xff,
+  0xfb, 0xc0, 0x67, 0xff, 0xfb, 0xb9, 0x56, 0xff,
+  0xfb, 0xb1, 0x46, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xac, 0x43, 0xff, 0xfa, 0xb6, 0x63, 0xff,
+  0xf9, 0xbe, 0x7a, 0xff, 0xf9, 0xb4, 0x6d, 0xff,
+  0xf7, 0xa3, 0x52, 0xff, 0xf7, 0x9a, 0x40, 0xff,
+  0xf8, 0xa1, 0x4e, 0xff, 0xf7, 0x9a, 0x40, 0xff,
+  0xf6, 0x99, 0x3f, 0xff, 0xf3, 0xac, 0x68, 0xff,
+  0xb1, 0x59, 0x05, 0xf6, 0x54, 0x8a, 0xd0, 0x6e,
+  0x54, 0x8a, 0xd0, 0x6e, 0x54, 0x8a, 0xd0, 0x6e,
+  0x54, 0x8a, 0xd0, 0x6e, 0x54, 0x8a, 0xd0, 0x6e,
+  0x54, 0x8a, 0xd0, 0x6e, 0xb0, 0x5d, 0x0c, 0xf1,
+  0xf4, 0xca, 0x90, 0xff, 0xfc, 0xd9, 0xa5, 0xff,
+  0xfc, 0xd0, 0x8f, 0xff, 0xfc, 0xd5, 0x9a, 0xff,
+  0xeb, 0xaa, 0x60, 0xff, 0xde, 0xb3, 0x87, 0xff,
+  0xd1, 0xce, 0xc6, 0xff, 0xcb, 0xcb, 0xc5, 0xff,
+  0xd0, 0xc7, 0xb8, 0xff, 0xd5, 0x91, 0x50, 0xff,
+  0xea, 0xae, 0x5f, 0xff, 0xfb, 0xc4, 0x70, 0xff,
+  0xfc, 0xb6, 0x4d, 0xff, 0xfc, 0xb0, 0x3f, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xad, 0x41, 0xff,
+  0xfa, 0xb0, 0x50, 0xff, 0xb2, 0x5a, 0x02, 0xff,
+  0xfa, 0xba, 0x5f, 0xff, 0xf9, 0xb8, 0x5b, 0xff,
+  0xb1, 0x59, 0x03, 0xfb, 0x53, 0x8a, 0xd1, 0x6f,
+  0x53, 0x8a, 0xd1, 0x6f, 0x53, 0x8a, 0xd1, 0x6f,
+  0x53, 0x8a, 0xd1, 0x6f, 0x53, 0x8a, 0xd1, 0x6f,
+  0x53, 0x8a, 0xd1, 0x6f, 0x53, 0x8a, 0xd1, 0x6f,
+  0x53, 0x8a, 0xd1, 0x6f, 0x53, 0x8a, 0xd1, 0x6f,
+  0xa6, 0x63, 0x23, 0xd4, 0xe3, 0xab, 0x68, 0xfd,
+  0xfc, 0xde, 0xaf, 0xff, 0xfc, 0xd4, 0x97, 0xff,
+  0xfc, 0xd7, 0x9f, 0xff, 0xe7, 0xa2, 0x5a, 0xff,
+  0xdc, 0xba, 0x96, 0xff, 0xd1, 0xce, 0xc7, 0xff,
+  0xcb, 0xcb, 0xc5, 0xff, 0xd0, 0xc4, 0xb2, 0xff,
+  0xce, 0x88, 0x45, 0xff, 0xf3, 0xba, 0x6d, 0xff,
+  0xfc, 0xc6, 0x79, 0xff, 0xfb, 0xc0, 0x69, 0xff,
+  0xfb, 0xbd, 0x5e, 0xff, 0xfd, 0xb4, 0x4b, 0xff,
+  0xfc, 0xaf, 0x3f, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xb2, 0x47, 0xff, 0xfb, 0xb9, 0x60, 0xff,
+  0xfa, 0xad, 0x51, 0xff, 0xf7, 0x91, 0x1e, 0xff,
+  0xf6, 0x82, 0x0a, 0xff, 0xf3, 0x78, 0x00, 0xff,
+  0xf2, 0x77, 0x00, 0xff, 0xf2, 0x77, 0x00, 0xff,
+  0xf3, 0x78, 0x00, 0xff, 0xf6, 0x90, 0x2d, 0xff,
+  0xe1, 0x94, 0x49, 0xfe, 0x9f, 0x62, 0x2c, 0xc8,
+  0x54, 0x8a, 0xd1, 0x70, 0x54, 0x8a, 0xd2, 0x71,
+  0x7e, 0x71, 0x70, 0x99, 0xbe, 0x71, 0x22, 0xf9,
+  0xfd, 0xe5, 0xc0, 0xff, 0xfc, 0xd6, 0x9e, 0xff,
+  0xfc, 0xd7, 0x9f, 0xff, 0xf7, 0xca, 0x8a, 0xff,
+  0xe1, 0x9b, 0x55, 0xff, 0xd7, 0xcd, 0xbf, 0xff,
+  0xcc, 0xcc, 0xc6, 0xff, 0xcd, 0xcb, 0xc2, 0xff,
+  0xd8, 0xae, 0x81, 0xff, 0xd8, 0x9a, 0x4c, 0xff,
+  0xfc, 0xcc, 0x86, 0xff, 0xfc, 0xc2, 0x6f, 0xff,
+  0xfb, 0xc1, 0x68, 0xff, 0xfb, 0xba, 0x57, 0xff,
+  0xfb, 0xb2, 0x47, 0xff, 0xfc, 0xaf, 0x3d, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xa9, 0x3d, 0xff, 0xfa, 0xb2, 0x5b, 0xff,
+  0xfa, 0xbb, 0x75, 0xff, 0xf9, 0xb3, 0x6a, 0xff,
+  0xf8, 0xa1, 0x4d, 0xff, 0xf7, 0x95, 0x36, 0xff,
+  0xf6, 0x89, 0x20, 0xff, 0xf5, 0x7c, 0x07, 0xff,
+  0xf5, 0x79, 0x00, 0xff, 0xf5, 0x80, 0x0e, 0xff,
+  0xf5, 0xae, 0x69, 0xff, 0xb1, 0x59, 0x04, 0xf9,
+  0x55, 0x87, 0xca, 0x73, 0x53, 0x89, 0xd0, 0x71,
+  0x54, 0x87, 0xce, 0x72, 0xab, 0x5f, 0x15, 0xe6,
+  0xf8, 0xd6, 0xa9, 0xff, 0xfc, 0xdf, 0xb3, 0xff,
+  0xfc, 0xd3, 0x96, 0xff, 0xfc, 0xd7, 0xa0, 0xff,
+  0xe9, 0xa8, 0x5e, 0xff, 0xdd, 0xb7, 0x8e, 0xff,
+  0xd1, 0xcf, 0xc7, 0xff, 0xcb, 0xcb, 0xc5, 0xff,
+  0xd1, 0xc5, 0xb5, 0xff, 0xd4, 0x8f, 0x4b, 0xff,
+  0xed, 0xb6, 0x68, 0xff, 0xfc, 0xc7, 0x7a, 0xff,
+  0xfb, 0xc1, 0x68, 0xff, 0xfb, 0xb9, 0x59, 0xff,
+  0xfb, 0xb2, 0x48, 0xff, 0xfc, 0xaf, 0x3d, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xac, 0x41, 0xff, 0xfa, 0xb6, 0x62, 0xff,
+  0xf9, 0xbd, 0x78, 0xff, 0xf9, 0xb4, 0x6b, 0xff,
+  0xf7, 0x96, 0x38, 0xff, 0xf5, 0x7f, 0x0c, 0xff,
+  0xf5, 0x79, 0x00, 0xff, 0xf5, 0x79, 0x00, 0xff,
+  0xf5, 0x81, 0x11, 0xff, 0xf5, 0xac, 0x65, 0xff,
+  0xb1, 0x58, 0x03, 0xfb, 0x54, 0x87, 0xcb, 0x75,
+  0x52, 0x89, 0xd1, 0x73, 0x52, 0x89, 0xd1, 0x73,
+  0x52, 0x89, 0xd1, 0x73, 0x52, 0x89, 0xd1, 0x73,
+  0x52, 0x89, 0xd1, 0x73, 0xaf, 0x5d, 0x0c, 0xf1,
+  0xf4, 0xc8, 0x8d, 0xff, 0xfc, 0xda, 0xa8, 0xff,
+  0xfc, 0xd0, 0x8f, 0xff, 0xfc, 0xd3, 0x95, 0xff,
+  0xf7, 0xc7, 0x81, 0xff, 0xe1, 0x9b, 0x55, 0xff,
+  0xd7, 0xcd, 0xbf, 0xff, 0xcc, 0xcc, 0xc6, 0xff,
+  0xcd, 0xcb, 0xc2, 0xff, 0xd8, 0xae, 0x81, 0xff,
+  0xd6, 0x96, 0x48, 0xff, 0xfb, 0xc6, 0x77, 0xff,
+  0xfc, 0xb6, 0x4e, 0xff, 0xfc, 0xb0, 0x3f, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xae, 0x44, 0xff,
+  0xfb, 0xb6, 0x5c, 0xff, 0xf8, 0xa8, 0x46, 0xff,
+  0xf4, 0x90, 0x1e, 0xff, 0xf7, 0xa6, 0x4b, 0xff,
+  0xdf, 0x92, 0x43, 0xff, 0x9c, 0x63, 0x31, 0xc7,
+  0x53, 0x89, 0xd1, 0x74, 0x53, 0x89, 0xd1, 0x74,
+  0x53, 0x89, 0xd1, 0x74, 0x53, 0x89, 0xd1, 0x74,
+  0x53, 0x89, 0xd1, 0x74, 0x53, 0x89, 0xd1, 0x74,
+  0x59, 0x8b, 0xd1, 0x62, 0x59, 0x8a, 0xcc, 0x63,
+  0xb1, 0x5b, 0x06, 0xf6, 0xf5, 0xc7, 0x87, 0xff,
+  0xfc, 0xd4, 0x99, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xd2, 0x94, 0xff, 0xf9, 0xcb, 0x8c, 0xff,
+  0xee, 0xa7, 0x5d, 0xff, 0xeb, 0x9e, 0x52, 0xff,
+  0xe6, 0xa3, 0x5f, 0xff, 0xed, 0x9f, 0x52, 0xff,
+  0xf4, 0xb7, 0x6b, 0xff, 0xfb, 0xcb, 0x84, 0xff,
+  0xfc, 0xba, 0x59, 0xff, 0xfb, 0xb2, 0x46, 0xff,
+  0xfc, 0xaf, 0x3d, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xb0, 0x41, 0xff, 0xfb, 0xb9, 0x61, 0xff,
+  0xfa, 0xb6, 0x65, 0xff, 0xf8, 0x9d, 0x38, 0xff,
+  0xf5, 0x80, 0x09, 0xff, 0xf0, 0x77, 0x01, 0xff,
+  0xf2, 0x8d, 0x2b, 0xff, 0xf5, 0xa4, 0x54, 0xff,
+  0xf6, 0x94, 0x35, 0xff, 0xf8, 0xa4, 0x54, 0xff,
+  0xbf, 0x72, 0x29, 0xfa, 0x6e, 0x7d, 0x98, 0x77,
+  0x56, 0x8c, 0xd1, 0x63, 0x58, 0x8d, 0xd1, 0x63,
+  0x8b, 0x6d, 0x5a, 0x98, 0xc5, 0x7c, 0x31, 0xf9,
+  0xfd, 0xd8, 0xa2, 0xff, 0xfc, 0xd0, 0x8b, 0xff,
+  0xfc, 0xcf, 0x8b, 0xff, 0xfc, 0xd7, 0x9e, 0xff,
+  0xf4, 0xb9, 0x73, 0xff, 0xec, 0x9f, 0x52, 0xff,
+  0xe7, 0xa3, 0x5f, 0xff, 0xec, 0x9e, 0x52, 0xff,
+  0xef, 0xa9, 0x5d, 0xff, 0xfa, 0xc7, 0x81, 0xff,
+  0xfb, 0xc3, 0x6f, 0xff, 0xfc, 0xb6, 0x4f, 0xff,
+  0xfc, 0xaf, 0x41, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xa4, 0x31, 0xff, 0xf9, 0x9a, 0x28, 0xff,
+  0xf8, 0x9c, 0x37, 0xff, 0xf7, 0x94, 0x2f, 0xff,
+  0xf4, 0x8a, 0x24, 0xff, 0xf3, 0x93, 0x38, 0xff,
+  0xf3, 0x9d, 0x4c, 0xff, 0xf3, 0x97, 0x3e, 0xff,
+  0xf3, 0x8d, 0x29, 0xff, 0xf5, 0x8e, 0x28, 0xff,
+  0xe9, 0xa3, 0x60, 0xff, 0xaa, 0x5e, 0x19, 0xd6,
+  0x57, 0x8c, 0xd2, 0x64, 0x57, 0x8c, 0xd2, 0x64,
+  0x59, 0x8a, 0xcb, 0x66, 0xb1, 0x5c, 0x09, 0xf3,
+  0xf7, 0xcd, 0x92, 0xff, 0xfd, 0xd4, 0x95, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xd2, 0x94, 0xff,
+  0xf9, 0xcb, 0x8c, 0xff, 0xee, 0xa7, 0x5d, 0xff,
+  0xeb, 0x9e, 0x52, 0xff, 0xe6, 0xa3, 0x5f, 0xff,
+  0xed, 0x9f, 0x52, 0xff, 0xf4, 0xb7, 0x6b, 0xff,
+  0xfb, 0xc9, 0x80, 0xff, 0xfd, 0xb6, 0x4f, 0xff,
+  0xfc, 0xaf, 0x41, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xa4, 0x31, 0xff, 0xf9, 0x9a, 0x28, 0xff,
+  0xf8, 0x9d, 0x38, 0xff, 0xf7, 0x98, 0x37, 0xff,
+  0xf4, 0x8a, 0x25, 0xff, 0xf3, 0x93, 0x38, 0xff,
+  0xf3, 0x9d, 0x4c, 0xff, 0xf3, 0x97, 0x3e, 0xff,
+  0xf4, 0x9a, 0x42, 0xff, 0xe9, 0xa3, 0x5e, 0xff,
+  0xa9, 0x5f, 0x19, 0xd8, 0x57, 0x8c, 0xd0, 0x66,
+  0x57, 0x8c, 0xd0, 0x66, 0x57, 0x8c, 0xd0, 0x66,
+  0x57, 0x8c, 0xd0, 0x66, 0x57, 0x8c, 0xd0, 0x66,
+  0x57, 0x8c, 0xd0, 0x66, 0xaf, 0x5f, 0x10, 0xe8,
+  0xf1, 0xbf, 0x7c, 0xff, 0xfd, 0xcd, 0x89, 0xff,
+  0xfc, 0xcb, 0x83, 0xff, 0xfc, 0xcf, 0x8c, 0xff,
+  0xfa, 0xcd, 0x8d, 0xff, 0xf0, 0xa8, 0x5e, 0xff,
+  0xeb, 0x9d, 0x50, 0xff, 0xe6, 0xa4, 0x60, 0xff,
+  0xec, 0x9d, 0x51, 0xff, 0xf3, 0xb1, 0x62, 0xff,
+  0xfb, 0xc5, 0x74, 0xff, 0xfc, 0xb1, 0x44, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xb2, 0x4d, 0xff,
+  0xf5, 0xb4, 0x62, 0xff, 0xb6, 0x5e, 0x07, 0xff,
+  0xfc, 0xc2, 0x6c, 0xff, 0xf9, 0xbc, 0x66, 0xff,
+  0xb1, 0x59, 0x03, 0xfb, 0x57, 0x8b, 0xd1, 0x66,
+  0x57, 0x8b, 0xd1, 0x66, 0x57, 0x8b, 0xd1, 0x66,
+  0x57, 0x8b, 0xd1, 0x66, 0x57, 0x8b, 0xd1, 0x66,
+  0x57, 0x8b, 0xd1, 0x66, 0x57, 0x8b, 0xd1, 0x66,
+  0x57, 0x8b, 0xd1, 0x66, 0x57, 0x8a, 0xcc, 0x67,
+  0xb1, 0x5c, 0x08, 0xf7, 0xf7, 0xce, 0x97, 0xff,
+  0xfc, 0xcf, 0x8f, 0xff, 0xfc, 0xce, 0x88, 0xff,
+  0xfc, 0xd2, 0x94, 0xff, 0xf9, 0xcb, 0x8c, 0xff,
+  0xee, 0xa7, 0x5d, 0xff, 0xeb, 0x9e, 0x52, 0xff,
+  0xe6, 0xa3, 0x5f, 0xff, 0xed, 0x9f, 0x52, 0xff,
+  0xf4, 0xb7, 0x6b, 0xff, 0xfb, 0xcb, 0x84, 0xff,
+  0xfc, 0xba, 0x59, 0xff, 0xfb, 0xb2, 0x46, 0xff,
+  0xfc, 0xaf, 0x3d, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xb0, 0x41, 0xff, 0xfb, 0xb8, 0x5f, 0xff,
+  0xfa, 0xb6, 0x65, 0xff, 0xf9, 0xac, 0x58, 0xff,
+  0xf8, 0xa4, 0x4e, 0xff, 0xf7, 0x9a, 0x40, 0xff,
+  0xf6, 0x90, 0x2d, 0xff, 0xf6, 0x86, 0x1a, 0xff,
+  0xf5, 0x7a, 0x02, 0xff, 0xf5, 0x7f, 0x0c, 0xff,
+  0xf1, 0xac, 0x69, 0xff, 0xaf, 0x5c, 0x0b, 0xed,
+  0x56, 0x8a, 0xd1, 0x68, 0x56, 0x8a, 0xd1, 0x68,
+  0x89, 0x6d, 0x5c, 0x9b, 0xc5, 0x7c, 0x32, 0xf9,
+  0xfd, 0xd8, 0xa2, 0xff, 0xfc, 0xd0, 0x8b, 0xff,
+  0xfc, 0xcf, 0x8b, 0xff, 0xfc, 0xd7, 0x9e, 0xff,
+  0xf4, 0xb9, 0x73, 0xff, 0xec, 0x9f, 0x52, 0xff,
+  0xe7, 0xa3, 0x5f, 0xff, 0xec, 0x9e, 0x52, 0xff,
+  0xef, 0xa9, 0x5d, 0xff, 0xfa, 0xc7, 0x81, 0xff,
+  0xfb, 0xc3, 0x6f, 0xff, 0xfc, 0xb6, 0x4f, 0xff,
+  0xfc, 0xaf, 0x41, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xa4, 0x31, 0xff, 0xf9, 0x9a, 0x28, 0xff,
+  0xf8, 0x9c, 0x37, 0xff, 0xf7, 0x8f, 0x25, 0xff,
+  0xf3, 0x78, 0x00, 0xff, 0xf1, 0x77, 0x00, 0xff,
+  0xf0, 0x76, 0x00, 0xff, 0xf1, 0x77, 0x00, 0xff,
+  0xf2, 0x77, 0x00, 0xff, 0xf5, 0x84, 0x15, 0xff,
+  0xe9, 0xa3, 0x60, 0xff, 0xa9, 0x5e, 0x1a, 0xd8,
+  0x57, 0x8b, 0xd2, 0x69, 0x57, 0x8b, 0xd2, 0x69,
+  0x56, 0x8a, 0xd0, 0x69, 0xb0, 0x5e, 0x0e, 0xed,
+  0xf3, 0xc7, 0x89, 0xff, 0xfc, 0xd3, 0x97, 0xff,
+  0xfc, 0xce, 0x88, 0xff, 0xfc, 0xd2, 0x92, 0xff,
+  0xfa, 0xcf, 0x90, 0xff, 0xef, 0xa9, 0x5f, 0xff,
+  0xeb, 0x9e, 0x50, 0xff, 0xe5, 0xa4, 0x60, 0xff,
+  0xec, 0x9e, 0x52, 0xff, 0xf3, 0xb5, 0x69, 0xff,
+  0xfb, 0xca, 0x81, 0xff, 0xfc, 0xb7, 0x52, 0xff,
+  0xfc, 0xaf, 0x40, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xa4, 0x32, 0xff, 0xf9, 0x9a, 0x28, 0xff,
+  0xf8, 0x9d, 0x38, 0xff, 0xf7, 0x94, 0x30, 0xff,
+  0xf4, 0x79, 0x02, 0xff, 0xf1, 0x77, 0x00, 0xff,
+  0xf0, 0x76, 0x00, 0xff, 0xf1, 0x77, 0x00, 0xff,
+  0xf2, 0x83, 0x16, 0xff, 0xed, 0xa4, 0x5e, 0xff,
+  0xad, 0x5e, 0x12, 0xe3, 0x56, 0x8b, 0xd1, 0x6a,
+  0x56, 0x8b, 0xd1, 0x6a, 0x56, 0x8b, 0xd1, 0x6a,
+  0x56, 0x8b, 0xd1, 0x6a, 0x56, 0x8b, 0xd1, 0x6a,
+  0x56, 0x8b, 0xd1, 0x6a, 0xaf, 0x5f, 0x11, 0xe9,
+  0xf1, 0xbe, 0x7a, 0xff, 0xfd, 0xce, 0x8b, 0xff,
+  0xfc, 0xcb, 0x83, 0xff, 0xfc, 0xca, 0x82, 0xff,
+  0xfc, 0xd3, 0x95, 0xff, 0xf3, 0xb5, 0x6b, 0xff,
+  0xeb, 0x9f, 0x52, 0xff, 0xe6, 0xa4, 0x60, 0xff,
+  0xeb, 0x9d, 0x51, 0xff, 0xf0, 0xa9, 0x59, 0xff,
+  0xfa, 0xc0, 0x6e, 0xff, 0xfc, 0xb7, 0x53, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xb3, 0x50, 0xff,
+  0xfb, 0xbe, 0x6f, 0xff, 0xfa, 0xae, 0x53, 0xff,
+  0xf4, 0x93, 0x24, 0xff, 0xf7, 0xa2, 0x44, 0xff,
+  0xe3, 0x99, 0x4d, 0xff, 0xa5, 0x60, 0x21, 0xd1,
+  0x55, 0x8a, 0xd1, 0x6b, 0x54, 0x8b, 0xd1, 0x6b,
+  0x54, 0x8b, 0xd1, 0x6b, 0x54, 0x8b, 0xd1, 0x6b,
+  0x54, 0x8b, 0xd1, 0x6b, 0x54, 0x8b, 0xd1, 0x6b,
+  0x59, 0x8e, 0xd0, 0x59, 0x59, 0x8e, 0xd0, 0x59,
+  0x9e, 0x64, 0x30, 0xb3, 0xd2, 0x8a, 0x3a, 0xfb,
+  0xfd, 0xcb, 0x83, 0xff, 0xfc, 0xbf, 0x65, 0xff,
+  0xfc, 0xc6, 0x77, 0xff, 0xfc, 0xcd, 0x89, 0xff,
+  0xfc, 0xd2, 0x95, 0xff, 0xfa, 0xc9, 0x84, 0xff,
+  0xfa, 0xc4, 0x7c, 0xff, 0xfc, 0xcb, 0x85, 0xff,
+  0xfb, 0xc8, 0x7a, 0xff, 0xfb, 0xb4, 0x4b, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xb2, 0x46, 0xff,
+  0xfc, 0xca, 0x82, 0xff, 0xe0, 0xa3, 0x5f, 0xfd,
+  0xd5, 0x8c, 0x3e, 0xfb, 0xf2, 0xaf, 0x66, 0xff,
+  0xf9, 0xb3, 0x6c, 0xff, 0xf7, 0x96, 0x39, 0xff,
+  0xf2, 0x90, 0x33, 0xff, 0xf2, 0xa1, 0x53, 0xff,
+  0xf5, 0x93, 0x36, 0xff, 0xf4, 0xaf, 0x6b, 0xff,
+  0xb5, 0x63, 0x12, 0xf7, 0x5a, 0x8e, 0xd1, 0x5a,
+  0x5a, 0x8e, 0xd1, 0x5a, 0x5a, 0x8e, 0xd1, 0x5a,
+  0x5c, 0x8c, 0xca, 0x5c, 0xb1, 0x5d, 0x0a, 0xef,
+  0xf0, 0xbc, 0x79, 0xff, 0xfc, 0xbe, 0x63, 0xff,
+  0xfd, 0xc2, 0x6b, 0xff, 0xfd, 0xc8, 0x7e, 0xff,
+  0xfc, 0xd3, 0x96, 0xff, 0xfc, 0xcf, 0x8e, 0xff,
+  0xfa, 0xc5, 0x7e, 0xff, 0xfb, 0xc8, 0x7f, 0xff,
+  0xfc, 0xcb, 0x82, 0xff, 0xfb, 0xbc, 0x60, 0xff,
+  0xfc, 0xae, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xae, 0x3d, 0xff,
+  0xfa, 0xae, 0x49, 0xff, 0xfa, 0xc0, 0x7a, 0xff,
+  0xe8, 0xa6, 0x61, 0xff, 0xee, 0xac, 0x6a, 0xff,
+  0xf9, 0xb9, 0x7b, 0xff, 0xf5, 0xa8, 0x5f, 0xff,
+  0xf3, 0xa0, 0x51, 0xff, 0xf4, 0x97, 0x3d, 0xff,
+  0xf5, 0x8d, 0x28, 0xff, 0xf5, 0x8f, 0x2b, 0xff,
+  0xdd, 0x9d, 0x5d, 0xfc, 0x98, 0x65, 0x39, 0xa9,
+  0x59, 0x8d, 0xcf, 0x5b, 0x59, 0x8d, 0xcf, 0x5b,
+  0x58, 0x8e, 0xd0, 0x5c, 0x99, 0x67, 0x39, 0xad,
+  0xd0, 0x8a, 0x3c, 0xfa, 0xfd, 0xc9, 0x81, 0xff,
+  0xfc, 0xbc, 0x5e, 0xff, 0xfd, 0xc2, 0x6d, 0xff,
+  0xfc, 0xcd, 0x89, 0xff, 0xfc, 0xd2, 0x95, 0xff,
+  0xfa, 0xc9, 0x84, 0xff, 0xfa, 0xc2, 0x7a, 0xff,
+  0xfb, 0xc7, 0x7b, 0xff, 0xfb, 0xc4, 0x70, 0xff,
+  0xfc, 0xb2, 0x46, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xae, 0x3d, 0xff,
+  0xfa, 0xac, 0x45, 0xff, 0xfa, 0xc0, 0x79, 0xff,
+  0xe9, 0xa6, 0x5f, 0xff, 0xee, 0xab, 0x68, 0xff,
+  0xf9, 0xbb, 0x7f, 0xff, 0xf5, 0xaa, 0x61, 0xff,
+  0xf3, 0xa0, 0x51, 0xff, 0xf4, 0x97, 0x3d, 0xff,
+  0xf6, 0x9b, 0x43, 0xff, 0xe3, 0x9f, 0x5d, 0xfe,
+  0x9d, 0x65, 0x32, 0xb3, 0x5a, 0x8d, 0xd0, 0x5d,
+  0x5a, 0x8d, 0xd0, 0x5d, 0x5a, 0x8d, 0xd0, 0x5d,
+  0x5a, 0x8d, 0xd0, 0x5d, 0x5a, 0x8d, 0xd0, 0x5d,
+  0x5a, 0x8d, 0xd0, 0x5d, 0x95, 0x68, 0x42, 0xa3,
+  0xcc, 0x84, 0x33, 0xfb, 0xfa, 0xc6, 0x78, 0xff,
+  0xfc, 0xba, 0x59, 0xff, 0xfc, 0xc3, 0x6e, 0xff,
+  0xfc, 0xcb, 0x82, 0xff, 0xfc, 0xd1, 0x91, 0xff,
+  0xfb, 0xc9, 0x80, 0xff, 0xfa, 0xc2, 0x76, 0xff,
+  0xfb, 0xc5, 0x73, 0xff, 0xfc, 0xc3, 0x71, 0xff,
+  0xfc, 0xb4, 0x4a, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xbd, 0x61, 0xff, 0xf7, 0xc4, 0x82, 0xff,
+  0xc7, 0x7c, 0x2e, 0xfb, 0xc4, 0x74, 0x1f, 0xff,
+  0xfc, 0xc5, 0x73, 0xff, 0xf4, 0xb8, 0x66, 0xff,
+  0xb1, 0x5d, 0x09, 0xf1, 0x59, 0x8e, 0xd0, 0x5d,
+  0x59, 0x8e, 0xd0, 0x5d, 0x59, 0x8e, 0xd0, 0x5d,
+  0x58, 0x8d, 0xd1, 0x5e, 0x58, 0x8d, 0xd1, 0x5e,
+  0x58, 0x8d, 0xd1, 0x5e, 0x58, 0x8d, 0xd1, 0x5e,
+  0x58, 0x8d, 0xd1, 0x5e, 0x58, 0x8d, 0xd1, 0x5e,
+  0x9d, 0x65, 0x33, 0xb5, 0xd8, 0x98, 0x51, 0xfc,
+  0xfc, 0xc3, 0x70, 0xff, 0xfc, 0xbf, 0x65, 0xff,
+  0xfc, 0xc6, 0x77, 0xff, 0xfc, 0xcd, 0x89, 0xff,
+  0xfc, 0xd2, 0x95, 0xff, 0xfa, 0xc9, 0x84, 0xff,
+  0xfa, 0xc4, 0x7c, 0xff, 0xfc, 0xcb, 0x85, 0xff,
+  0xfb, 0xc8, 0x7a, 0xff, 0xfb, 0xb4, 0x4b, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xb2, 0x46, 0xff,
+  0xfc, 0xca, 0x82, 0xff, 0xe0, 0xa3, 0x5e, 0xfc,
+  0xc8, 0x7f, 0x35, 0xf7, 0xd0, 0x83, 0x35, 0xf8,
+  0xd5, 0x83, 0x32, 0xfc, 0xdb, 0x86, 0x34, 0xfe,
+  0xe3, 0x95, 0x49, 0xff, 0xeb, 0xa5, 0x61, 0xff,
+  0xf8, 0xab, 0x60, 0xff, 0xf5, 0x84, 0x16, 0xff,
+  0xf2, 0xb0, 0x70, 0xff, 0xb0, 0x5b, 0x0a, 0xec,
+  0x58, 0x8d, 0xd1, 0x5f, 0x58, 0x8d, 0xd1, 0x5f,
+  0x5a, 0x8b, 0xca, 0x61, 0xb1, 0x5d, 0x0a, 0xf0,
+  0xf0, 0xbc, 0x79, 0xff, 0xfc, 0xbe, 0x63, 0xff,
+  0xfd, 0xc2, 0x6b, 0xff, 0xfd, 0xc8, 0x7e, 0xff,
+  0xfc, 0xd3, 0x96, 0xff, 0xfc, 0xcf, 0x8e, 0xff,
+  0xfa, 0xc5, 0x7e, 0xff, 0xfb, 0xc8, 0x7f, 0xff,
+  0xfc, 0xcb, 0x82, 0xff, 0xfb, 0xbc, 0x60, 0xff,
+  0xfc, 0xae, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfb, 0xae, 0x3d, 0xff,
+  0xfa, 0xae, 0x49, 0xff, 0xfa, 0xc0, 0x7a, 0xff,
+  0xe8, 0xa6, 0x61, 0xff, 0xee, 0xa8, 0x62, 0xff,
+  0xf8, 0xad, 0x64, 0xff, 0xf4, 0x91, 0x32, 0xff,
+  0xf0, 0x79, 0x06, 0xff, 0xf2, 0x77, 0x00, 0xff,
+  0xf4, 0x78, 0x00, 0xff, 0xf5, 0x85, 0x18, 0xff,
+  0xdd, 0x9d, 0x5d, 0xfc, 0x97, 0x65, 0x3d, 0xac,
+  0x58, 0x8d, 0xd2, 0x60, 0x58, 0x8d, 0xd2, 0x60,
+  0x58, 0x8d, 0xd2, 0x60, 0x92, 0x6b, 0x47, 0xa3,
+  0xcb, 0x81, 0x33, 0xf9, 0xfd, 0xcc, 0x85, 0xff,
+  0xfc, 0xbb, 0x5c, 0xff, 0xfc, 0xc1, 0x6d, 0xff,
+  0xfc, 0xcd, 0x88, 0xff, 0xfc, 0xd2, 0x95, 0xff,
+  0xfb, 0xca, 0x85, 0xff, 0xfa, 0xc3, 0x7a, 0xff,
+  0xfb, 0xc7, 0x7a, 0xff, 0xfb, 0xc4, 0x73, 0xff,
+  0xfc, 0xb2, 0x49, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfa, 0xab, 0x43, 0xff, 0xfb, 0xbf, 0x77, 0xff,
+  0xeb, 0xa8, 0x62, 0xff, 0xec, 0xa5, 0x5c, 0xff,
+  0xf9, 0xb0, 0x6a, 0xff, 0xf5, 0x94, 0x38, 0xff,
+  0xf0, 0x7a, 0x08, 0xff, 0xf2, 0x77, 0x00, 0xff,
+  0xf4, 0x84, 0x19, 0xff, 0xe6, 0xa0, 0x5c, 0xff,
+  0xa2, 0x63, 0x27, 0xc2, 0x58, 0x8c, 0xd0, 0x61,
+  0x58, 0x8c, 0xd0, 0x61, 0x58, 0x8c, 0xd0, 0x61,
+  0x58, 0x8c, 0xd0, 0x61, 0x59, 0x8b, 0xd1, 0x62,
+  0x59, 0x8b, 0xd1, 0x62, 0x94, 0x68, 0x45, 0xa6,
+  0xcc, 0x83, 0x32, 0xfb, 0xfc, 0xc7, 0x7d, 0xff,
+  0xfc, 0xba, 0x59, 0xff, 0xfc, 0xc3, 0x6e, 0xff,
+  0xfc, 0xc6, 0x77, 0xff, 0xfc, 0xd0, 0x8f, 0xff,
+  0xfb, 0xcc, 0x85, 0xff, 0xfa, 0xc1, 0x76, 0xff,
+  0xfb, 0xc1, 0x6f, 0xff, 0xfc, 0xc4, 0x74, 0xff,
+  0xfc, 0xba, 0x5a, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xbf, 0x66, 0xff, 0xf7, 0xc4, 0x80, 0xff,
+  0xce, 0x85, 0x38, 0xfb, 0xe3, 0xa1, 0x58, 0xfe,
+  0xf7, 0xbe, 0x7c, 0xff, 0xf7, 0xb3, 0x69, 0xff,
+  0xd2, 0x82, 0x34, 0xfb, 0x92, 0x68, 0x46, 0xa7,
+  0x56, 0x8c, 0xd1, 0x63, 0x56, 0x8c, 0xd1, 0x63,
+  0x56, 0x8c, 0xd1, 0x63, 0x56, 0x8c, 0xd1, 0x63,
+  0x56, 0x8c, 0xd1, 0x63, 0x56, 0x8c, 0xd1, 0x63,
+  0x5b, 0x91, 0xd0, 0x51, 0x5b, 0x91, 0xd0, 0x51,
+  0x71, 0x80, 0x95, 0x64, 0xb2, 0x5a, 0x05, 0xfa,
+  0xce, 0x86, 0x39, 0xff, 0xf8, 0xb1, 0x4e, 0xff,
+  0xfc, 0xb1, 0x43, 0xff, 0xfc, 0xb5, 0x4a, 0xff,
+  0xfc, 0xb9, 0x55, 0xff, 0xf9, 0xb8, 0x5c, 0xff,
+  0xec, 0xa9, 0x4f, 0xff, 0xed, 0xa3, 0x40, 0xff,
+  0xf9, 0xab, 0x3b, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xf5, 0xa6, 0x38, 0xff, 0xf8, 0xaa, 0x3a, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xb5, 0x4e, 0xff, 0xfa, 0xcb, 0x89, 0xff,
+  0xd1, 0x8f, 0x47, 0xfa, 0xae, 0x5f, 0x11, 0xde,
+  0xa1, 0x64, 0x2a, 0xb2, 0xb1, 0x59, 0x04, 0xf6,
+  0xc4, 0x6e, 0x1b, 0xf7, 0xe9, 0x97, 0x48, 0xff,
+  0xf8, 0xbe, 0x85, 0xff, 0xf9, 0xc5, 0x93, 0xff,
+  0xf7, 0xae, 0x69, 0xff, 0xf3, 0xb2, 0x73, 0xff,
+  0xb5, 0x64, 0x15, 0xf0, 0x5d, 0x90, 0xd1, 0x52,
+  0x5d, 0x90, 0xd1, 0x52, 0x5d, 0x90, 0xd1, 0x52,
+  0x5d, 0x90, 0xd1, 0x52, 0x97, 0x6a, 0x41, 0x9a,
+  0xc1, 0x73, 0x22, 0xfb, 0xe2, 0xa4, 0x58, 0xff,
+  0xfc, 0xb1, 0x43, 0xff, 0xfc, 0xae, 0x3e, 0xff,
+  0xfc, 0xb1, 0x45, 0xff, 0xfb, 0xb7, 0x53, 0xff,
+  0xfc, 0xb9, 0x5a, 0xff, 0xf9, 0xb3, 0x4f, 0xff,
+  0xf1, 0xa4, 0x3b, 0xff, 0xf8, 0xaa, 0x3a, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xf5, 0xa6, 0x38, 0xff,
+  0xf8, 0xaa, 0x3a, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfb, 0xb0, 0x43, 0xff, 0xfa, 0xc3, 0x74, 0xff,
+  0xf3, 0xbf, 0x7e, 0xff, 0xc5, 0x7a, 0x2d, 0xf9,
+  0xaf, 0x5c, 0x0d, 0xe3, 0xb0, 0x5a, 0x08, 0xeb,
+  0xc0, 0x70, 0x23, 0xf8, 0xe7, 0xa5, 0x64, 0xfe,
+  0xf8, 0xc6, 0x96, 0xff, 0xf4, 0xb4, 0x75, 0xff,
+  0xf5, 0xa0, 0x4e, 0xff, 0xf6, 0x97, 0x3b, 0xff,
+  0xe0, 0x9a, 0x58, 0xfe, 0x9e, 0x64, 0x2f, 0xad,
+  0x5b, 0x8f, 0xcf, 0x53, 0x5b, 0x8f, 0xcf, 0x53,
+  0x5b, 0x8f, 0xcf, 0x53, 0x6d, 0x83, 0xa0, 0x62,
+  0xb2, 0x59, 0x05, 0xfb, 0xcc, 0x85, 0x37, 0xff,
+  0xf6, 0xb1, 0x4d, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xb0, 0x3f, 0xff, 0xfc, 0xb4, 0x4a, 0xff,
+  0xfc, 0xb7, 0x54, 0xff, 0xf8, 0xb4, 0x53, 0xff,
+  0xee, 0xa3, 0x3f, 0xff, 0xf6, 0xa8, 0x39, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xf5, 0xa6, 0x38, 0xff,
+  0xf8, 0xaa, 0x3a, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfb, 0xae, 0x3f, 0xff, 0xf9, 0xbe, 0x6a, 0xff,
+  0xf6, 0xc3, 0x82, 0xff, 0xca, 0x7e, 0x2d, 0xf9,
+  0xb0, 0x5c, 0x0c, 0xe5, 0xb0, 0x5b, 0x07, 0xed,
+  0xc3, 0x73, 0x27, 0xf8, 0xeb, 0xab, 0x6d, 0xff,
+  0xf8, 0xc9, 0x9a, 0xff, 0xf4, 0xaf, 0x6c, 0xff,
+  0xf5, 0xa2, 0x51, 0xff, 0xde, 0x9b, 0x5b, 0xfd,
+  0x98, 0x66, 0x3c, 0xa0, 0x5a, 0x8e, 0xd0, 0x54,
+  0x5a, 0x8e, 0xd0, 0x54, 0x5a, 0x8e, 0xd0, 0x54,
+  0x5a, 0x8e, 0xd0, 0x54, 0x5c, 0x8f, 0xd0, 0x54,
+  0x5c, 0x8f, 0xd0, 0x54, 0x6e, 0x83, 0xa3, 0x62,
+  0xb2, 0x5b, 0x07, 0xfa, 0xc4, 0x7a, 0x2c, 0xff,
+  0xf3, 0xa8, 0x41, 0xff, 0xfc, 0xaf, 0x3d, 0xff,
+  0xfc, 0xb0, 0x43, 0xff, 0xfb, 0xb4, 0x4c, 0xff,
+  0xfc, 0xb8, 0x54, 0xff, 0xf6, 0xb3, 0x53, 0xff,
+  0xec, 0xa2, 0x40, 0xff, 0xf6, 0xa7, 0x39, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xf2, 0xa3, 0x35, 0xff, 0xed, 0x9e, 0x32, 0xff,
+  0xf9, 0xac, 0x3d, 0xff, 0xf8, 0xac, 0x3d, 0xff,
+  0xf7, 0xab, 0x3c, 0xff, 0xf6, 0xbd, 0x69, 0xff,
+  0xec, 0xba, 0x75, 0xff, 0xb7, 0x64, 0x11, 0xf9,
+  0xa7, 0x5d, 0x18, 0xcf, 0xd4, 0x8c, 0x39, 0xfc,
+  0xfc, 0xc5, 0x73, 0xff, 0xea, 0xa9, 0x55, 0xff,
+  0xaf, 0x60, 0x13, 0xdd, 0x5b, 0x8e, 0xd0, 0x55,
+  0x5b, 0x8e, 0xd0, 0x55, 0x5b, 0x8e, 0xd0, 0x55,
+  0x5b, 0x8e, 0xd0, 0x55, 0x5b, 0x8e, 0xd0, 0x55,
+  0x5b, 0x8e, 0xd0, 0x55, 0x5b, 0x8e, 0xd0, 0x55,
+  0x5b, 0x8e, 0xd0, 0x55, 0x5b, 0x8e, 0xd0, 0x55,
+  0x71, 0x80, 0x97, 0x68, 0xb6, 0x63, 0x12, 0xfa,
+  0xce, 0x86, 0x3a, 0xff, 0xf8, 0xac, 0x40, 0xff,
+  0xfc, 0xb1, 0x43, 0xff, 0xfc, 0xb5, 0x4a, 0xff,
+  0xfc, 0xb9, 0x55, 0xff, 0xf9, 0xb8, 0x5c, 0xff,
+  0xec, 0xa9, 0x4f, 0xff, 0xed, 0xa3, 0x40, 0xff,
+  0xf9, 0xab, 0x3b, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xf5, 0xa6, 0x38, 0xff, 0xf8, 0xaa, 0x3a, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xb5, 0x4e, 0xff, 0xfa, 0xcb, 0x89, 0xff,
+  0xd0, 0x8c, 0x43, 0xf9, 0xad, 0x5f, 0x12, 0xdd,
+  0x89, 0x70, 0x5f, 0x86, 0x8f, 0x6c, 0x4f, 0x92,
+  0x96, 0x68, 0x3f, 0xa0, 0x9d, 0x63, 0x31, 0xae,
+  0xa6, 0x62, 0x22, 0xc0, 0xb0, 0x5b, 0x09, 0xea,
+  0xd5, 0x85, 0x36, 0xfb, 0xf8, 0xac, 0x62, 0xff,
+  0xf0, 0xae, 0x6d, 0xff, 0xb1, 0x5b, 0x0b, 0xe7,
+  0x5c, 0x8e, 0xcf, 0x57, 0x5c, 0x8e, 0xcf, 0x57,
+  0x5c, 0x8e, 0xcf, 0x57, 0x96, 0x6a, 0x43, 0x9d,
+  0xc1, 0x73, 0x22, 0xfb, 0xe2, 0xa4, 0x58, 0xff,
+  0xfc, 0xb1, 0x43, 0xff, 0xfc, 0xae, 0x3e, 0xff,
+  0xfc, 0xb1, 0x45, 0xff, 0xfb, 0xb7, 0x53, 0xff,
+  0xfc, 0xb9, 0x5a, 0xff, 0xf9, 0xb3, 0x4f, 0xff,
+  0xf1, 0xa4, 0x3b, 0xff, 0xf8, 0xaa, 0x3a, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xf5, 0xa6, 0x38, 0xff,
+  0xf8, 0xaa, 0x3a, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfb, 0xb0, 0x43, 0xff, 0xfa, 0xc3, 0x74, 0xff,
+  0xf3, 0xbf, 0x7e, 0xff, 0xc5, 0x7a, 0x2d, 0xf9,
+  0xaf, 0x5c, 0x0d, 0xe4, 0xb0, 0x5a, 0x09, 0xeb,
+  0xbf, 0x6d, 0x1e, 0xf8, 0xe4, 0x98, 0x4d, 0xfe,
+  0xf6, 0xb0, 0x6c, 0xff, 0xf3, 0x9d, 0x4c, 0xff,
+  0xf4, 0x8f, 0x2d, 0xff, 0xf6, 0x8f, 0x2b, 0xff,
+  0xe0, 0x9a, 0x58, 0xfe, 0x9e, 0x64, 0x30, 0xaf,
+  0x5b, 0x8f, 0xcf, 0x57, 0x5b, 0x8f, 0xcf, 0x57,
+  0x5b, 0x8f, 0xcf, 0x57, 0x66, 0x86, 0xb2, 0x60,
+  0xb1, 0x5a, 0x04, 0xfa, 0xcb, 0x80, 0x32, 0xff,
+  0xf5, 0xb1, 0x51, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3f, 0xff, 0xfc, 0xb3, 0x49, 0xff,
+  0xfc, 0xb7, 0x52, 0xff, 0xf8, 0xb4, 0x54, 0xff,
+  0xee, 0xa4, 0x40, 0xff, 0xf5, 0xa7, 0x39, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xf6, 0xa7, 0x38, 0xff,
+  0xf7, 0xa9, 0x39, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xfb, 0xae, 0x3d, 0xff, 0xf9, 0xbe, 0x67, 0xff,
+  0xf7, 0xc5, 0x83, 0xff, 0xcf, 0x82, 0x33, 0xf9,
+  0xb1, 0x5d, 0x0b, 0xe9, 0xb1, 0x5c, 0x0a, 0xe9,
+  0xbe, 0x6b, 0x1a, 0xf8, 0xe4, 0x97, 0x4b, 0xff,
+  0xf7, 0xb1, 0x6e, 0xff, 0xf2, 0x99, 0x43, 0xff,
+  0xf4, 0x8e, 0x2c, 0xff, 0xe2, 0x9d, 0x59, 0xfe,
+  0x9d, 0x65, 0x33, 0xaf, 0x59, 0x8e, 0xd0, 0x59,
+  0x59, 0x8e, 0xd0, 0x59, 0x59, 0x8e, 0xd0, 0x59,
+  0x59, 0x8e, 0xd0, 0x59, 0x59, 0x8e, 0xd0, 0x59,
+  0x59, 0x8e, 0xd0, 0x59, 0x6b, 0x82, 0xa5, 0x67,
+  0xb1, 0x5b, 0x06, 0xfb, 0xc5, 0x7b, 0x2d, 0xff,
+  0xf4, 0xac, 0x45, 0xff, 0xfc, 0xaf, 0x3d, 0xff,
+  0xfc, 0xb0, 0x43, 0xff, 0xfb, 0xb2, 0x48, 0xff,
+  0xfb, 0xb5, 0x4e, 0xff, 0xf2, 0xad, 0x4f, 0xff,
+  0xef, 0xa9, 0x48, 0xff, 0xfa, 0xaf, 0x42, 0xff,
+  0xfc, 0xaf, 0x3e, 0xff, 0xfc, 0xaf, 0x3e, 0xff,
+  0xf2, 0xa3, 0x35, 0xff, 0xed, 0x9e, 0x32, 0xff,
+  0xf9, 0xac, 0x3d, 0xff, 0xf8, 0xac, 0x3d, 0xff,
+  0xf7, 0xab, 0x3d, 0xff, 0xf6, 0xc0, 0x70, 0xff,
+  0xed, 0xba, 0x76, 0xff, 0xb6, 0x62, 0x0e, 0xf9,
+  0x9d, 0x65, 0x31, 0xb2, 0xac, 0x5e, 0x13, 0xdc,
+  0xdc, 0x95, 0x49, 0xfd, 0xf9, 0xbf, 0x7f, 0xff,
+  0xbb, 0x67, 0x16, 0xf8, 0x7e, 0x76, 0x7b, 0x7a,
+  0x5b, 0x8d, 0xd1, 0x5a, 0x5b, 0x8d, 0xd1, 0x5a,
+  0x5b, 0x8d, 0xd1, 0x5a, 0x5b, 0x8d, 0xd1, 0x5a,
+  0x5b, 0x8d, 0xd1, 0x5a, 0x5b, 0x8d, 0xd1, 0x5a,
+  0x5f, 0x91, 0xd0, 0x48, 0x5f, 0x91, 0xd0, 0x48,
+  0x5f, 0x91, 0xd0, 0x48, 0xaa, 0x63, 0x1c, 0xc2,
+  0xcd, 0x8c, 0x48, 0xfd, 0xb9, 0x6f, 0x22, 0xff,
+  0xbd, 0x6a, 0x12, 0xff, 0xbf, 0x6c, 0x11, 0xff,
+  0xc1, 0x74, 0x20, 0xff, 0xd2, 0x90, 0x40, 0xff,
+  0xe4, 0x9a, 0x34, 0xff, 0xf0, 0xa6, 0x3b, 0xff,
+  0xef, 0xa6, 0x3a, 0xff, 0xee, 0xa5, 0x3a, 0xff,
+  0xed, 0xa4, 0x3a, 0xff, 0xd4, 0x84, 0x22, 0xff,
+  0xc3, 0x6f, 0x12, 0xff, 0xe3, 0x99, 0x32, 0xff,
+  0xe9, 0xa1, 0x39, 0xff, 0xe9, 0xac, 0x53, 0xff,
+  0xe3, 0xba, 0x7f, 0xff, 0xbf, 0x77, 0x2d, 0xf8,
+  0xa9, 0x62, 0x1d, 0xc1, 0x63, 0x8d, 0xbf, 0x4d,
+  0x5e, 0x92, 0xd0, 0x49, 0x65, 0x8b, 0xbd, 0x4e,
+  0x96, 0x6b, 0x45, 0x8b, 0xb1, 0x5b, 0x0c, 0xdf,
+  0xb3, 0x5b, 0x06, 0xfa, 0xca, 0x7a, 0x2e, 0xf7,
+  0xdf, 0x90, 0x44, 0xfe, 0xe7, 0x99, 0x4d, 0xff,
+  0xb7, 0x62, 0x11, 0xfc, 0x7d, 0x7b, 0x83, 0x63,
+  0x5d, 0x90, 0xd1, 0x49, 0x5d, 0x90, 0xd1, 0x49,
+  0x5d, 0x90, 0xd1, 0x49, 0x66, 0x8b, 0xbb, 0x4f,
+  0xaf, 0x5d, 0x0e, 0xe2, 0xc5, 0x82, 0x3e, 0xfe,
+  0xbe, 0x70, 0x20, 0xff, 0xc7, 0x76, 0x19, 0xff,
+  0xc8, 0x77, 0x19, 0xff, 0xc6, 0x76, 0x1e, 0xff,
+  0xd9, 0x99, 0x4d, 0xff, 0xe1, 0x9b, 0x3d, 0xff,
+  0xef, 0xa4, 0x3a, 0xff, 0xef, 0xa6, 0x3a, 0xff,
+  0xee, 0xa5, 0x3a, 0xff, 0xed, 0xa4, 0x3a, 0xff,
+  0xd4, 0x84, 0x22, 0xff, 0xbf, 0x6b, 0x0f, 0xff,
+  0xd2, 0x83, 0x21, 0xff, 0xd9, 0x8b, 0x28, 0xff,
+  0xdc, 0x91, 0x2c, 0xff, 0xe0, 0xa0, 0x49, 0xff,
+  0xe5, 0xb7, 0x79, 0xff, 0xd7, 0x9c, 0x55, 0xfc,
+  0xb4, 0x5d, 0x0a, 0xf8, 0x9b, 0x67, 0x3a, 0x99,
+  0x5e, 0x90, 0xcb, 0x4b, 0x5e, 0x91, 0xd1, 0x4a,
+  0x8c, 0x71, 0x5d, 0x7a, 0xac, 0x5e, 0x13, 0xd0,
+  0xb5, 0x60, 0x0e, 0xf9, 0xcf, 0x82, 0x39, 0xf8,
+  0xe1, 0x99, 0x53, 0xff, 0xef, 0xab, 0x6a, 0xff,
+  0xe4, 0x99, 0x50, 0xff, 0xac, 0x5f, 0x14, 0xcd,
+  0x5e, 0x91, 0xd1, 0x4a, 0x5e, 0x91, 0xd1, 0x4a,
+  0x5e, 0x91, 0xd1, 0x4a, 0x5e, 0x91, 0xd1, 0x4a,
+  0xa4, 0x64, 0x28, 0xb2, 0xc9, 0x89, 0x49, 0xfc,
+  0xbc, 0x74, 0x29, 0xff, 0xbd, 0x6b, 0x12, 0xff,
+  0xc0, 0x6d, 0x12, 0xff, 0xc5, 0x78, 0x22, 0xff,
+  0xd5, 0x98, 0x4e, 0xff, 0xdc, 0x95, 0x39, 0xff,
+  0xed, 0xa2, 0x38, 0xff, 0xef, 0xa6, 0x3a, 0xff,
+  0xee, 0xa5, 0x3a, 0xff, 0xed, 0xa4, 0x3a, 0xff,
+  0xd4, 0x84, 0x22, 0xff, 0xc0, 0x6c, 0x10, 0xff,
+  0xda, 0x8c, 0x29, 0xff, 0xe6, 0x9d, 0x35, 0xff,
+  0xe9, 0xa1, 0x39, 0xff, 0xe8, 0xa6, 0x46, 0xff,
+  0xe9, 0xbc, 0x7b, 0xff, 0xe4, 0xae, 0x68, 0xff,
+  0xb7, 0x61, 0x0f, 0xf8, 0xa1, 0x65, 0x2e, 0xa7,
+  0x60, 0x8d, 0xc6, 0x4d, 0x5f, 0x8e, 0xcc, 0x4c,
+  0x8f, 0x6e, 0x54, 0x81, 0xae, 0x5c, 0x0e, 0xda,
+  0xbc, 0x6d, 0x22, 0xf9, 0xe2, 0x9d, 0x5a, 0xfd,
+  0xf3, 0xb6, 0x7b, 0xff, 0xe5, 0x9a, 0x52, 0xff,
+  0xab, 0x60, 0x16, 0xca, 0x5d, 0x91, 0xd0, 0x4c,
+  0x5d, 0x91, 0xd0, 0x4c, 0x5d, 0x91, 0xd0, 0x4c,
+  0x5d, 0x91, 0xd0, 0x4c, 0x5d, 0x91, 0xd0, 0x4c,
+  0x5d, 0x91, 0xd0, 0x4c, 0x5d, 0x91, 0xd0, 0x4c,
+  0xa9, 0x63, 0x1f, 0xc1, 0xd3, 0x9e, 0x66, 0xfd,
+  0xb9, 0x71, 0x28, 0xff, 0xb4, 0x60, 0x09, 0xff,
+  0xba, 0x67, 0x0f, 0xff, 0xbc, 0x6d, 0x16, 0xff,
+  0xd1, 0x92, 0x4a, 0xff, 0xdc, 0x9a, 0x48, 0xff,
+  0xea, 0xa1, 0x3a, 0xff, 0xec, 0xa4, 0x3a, 0xff,
+  0xeb, 0xa3, 0x39, 0xff, 0xda, 0x8d, 0x29, 0xff,
+  0xbd, 0x68, 0x0d, 0xff, 0xe4, 0x9c, 0x35, 0xff,
+  0xe7, 0xa0, 0x38, 0xff, 0xe6, 0xa0, 0x3b, 0xff,
+  0xe5, 0xb3, 0x69, 0xff, 0xd9, 0xa2, 0x5f, 0xfe,
+  0xb1, 0x5d, 0x0a, 0xf7, 0x8f, 0x6e, 0x53, 0x83,
+  0xa8, 0x62, 0x1f, 0xc0, 0xe4, 0xa4, 0x53, 0xff,
+  0xfc, 0xc6, 0x77, 0xff, 0xcb, 0x7f, 0x2b, 0xf8,
+  0x97, 0x69, 0x41, 0x93, 0x5e, 0x90, 0xd0, 0x4c,
+  0x5e, 0x90, 0xd0, 0x4c, 0x5e, 0x90, 0xd0, 0x4c,
+  0x5e, 0x90, 0xd0, 0x4c, 0x5e, 0x90, 0xd0, 0x4c,
+  0x5e, 0x90, 0xd0, 0x4c, 0x5e, 0x90, 0xd0, 0x4c,
+  0x5e, 0x90, 0xd0, 0x4c, 0x5e, 0x90, 0xd0, 0x4c,
+  0x5d, 0x91, 0xd0, 0x4d, 0xa9, 0x63, 0x1d, 0xc4,
+  0xd0, 0x94, 0x56, 0xfd, 0xb9, 0x6e, 0x21, 0xff,
+  0xbd, 0x69, 0x0f, 0xff, 0xbf, 0x6c, 0x11, 0xff,
+  0xc1, 0x74, 0x20, 0xff, 0xd2, 0x90, 0x40, 0xff,
+  0xe4, 0x9a, 0x34, 0xff, 0xf0, 0xa6, 0x3b, 0xff,
+  0xef, 0xa6, 0x3a, 0xff, 0xee, 0xa5, 0x3a, 0xff,
+  0xed, 0xa4, 0x3a, 0xff, 0xd4, 0x84, 0x22, 0xff,
+  0xc3, 0x6f, 0x12, 0xff, 0xe3, 0x99, 0x32, 0xff,
+  0xe9, 0xa1, 0x39, 0xff, 0xe9, 0xac, 0x53, 0xff,
+  0xe3, 0xba, 0x7f, 0xff, 0xbe, 0x75, 0x2b, 0xf8,
+  0xa8, 0x62, 0x20, 0xc0, 0x60, 0x8e, 0xc3, 0x50,
+  0x5d, 0x91, 0xd0, 0x4d, 0x5c, 0x8f, 0xd1, 0x4e,
+  0x5c, 0x8f, 0xd1, 0x4e, 0x5c, 0x8f, 0xd1, 0x4e,
+  0x5c, 0x8f, 0xd1, 0x4e, 0x6a, 0x86, 0xaf, 0x58,
+  0xb1, 0x59, 0x02, 0xf7, 0xf4, 0xaf, 0x6e, 0xff,
+  0xce, 0x7e, 0x30, 0xf8, 0xa1, 0x62, 0x28, 0xb1,
+  0x5c, 0x8f, 0xd1, 0x4e, 0x5c, 0x8f, 0xd1, 0x4e,
+  0x5c, 0x8f, 0xd1, 0x4e, 0x65, 0x8a, 0xbc, 0x54,
+  0xae, 0x5e, 0x0f, 0xe3, 0xc5, 0x82, 0x3e, 0xfe,
+  0xbe, 0x70, 0x20, 0xff, 0xc7, 0x76, 0x19, 0xff,
+  0xc8, 0x77, 0x19, 0xff, 0xc6, 0x76, 0x1e, 0xff,
+  0xd9, 0x99, 0x4d, 0xff, 0xe1, 0x9b, 0x3d, 0xff,
+  0xef, 0xa4, 0x3a, 0xff, 0xef, 0xa6, 0x3a, 0xff,
+  0xee, 0xa5, 0x3a, 0xff, 0xed, 0xa4, 0x3a, 0xff,
+  0xd3, 0x84, 0x22, 0xff, 0xc0, 0x6b, 0x0f, 0xff,
+  0xd3, 0x83, 0x21, 0xff, 0xd9, 0x8b, 0x28, 0xff,
+  0xdc, 0x91, 0x2c, 0xff, 0xe0, 0xa0, 0x49, 0xff,
+  0xe5, 0xb7, 0x79, 0xff, 0xd7, 0x9b, 0x54, 0xfd,
+  0xb3, 0x5d, 0x0a, 0xf8, 0x9a, 0x67, 0x3c, 0x9c,
+  0x5e, 0x8f, 0xc9, 0x50, 0x5e, 0x90, 0xcf, 0x4f,
+  0x8b, 0x71, 0x60, 0x7d, 0xac, 0x5e, 0x14, 0xd1,
+  0xb5, 0x5f, 0x0d, 0xf9, 0xcd, 0x7d, 0x2f, 0xf8,
+  0xe0, 0x92, 0x48, 0xff, 0xef, 0xa7, 0x64, 0xff,
+  0xe4, 0x99, 0x50, 0xff, 0xab, 0x5f, 0x15, 0xcf,
+  0x5d, 0x8f, 0xcf, 0x4f, 0x5d, 0x8f, 0xcf, 0x4f,
+  0x5d, 0x8f, 0xcf, 0x4f, 0x5d, 0x8f, 0xcf, 0x4f,
+  0x9f, 0x67, 0x32, 0xa7, 0xc6, 0x85, 0x41, 0xfb,
+  0xbd, 0x76, 0x2f, 0xff, 0xbd, 0x6a, 0x13, 0xff,
+  0xc0, 0x6d, 0x11, 0xff, 0xc4, 0x76, 0x1f, 0xff,
+  0xd4, 0x97, 0x4d, 0xff, 0xdb, 0x94, 0x3a, 0xff,
+  0xec, 0xa2, 0x38, 0xff, 0xef, 0xa6, 0x3a, 0xff,
+  0xee, 0xa5, 0x3a, 0xff, 0xed, 0xa4, 0x3a, 0xff,
+  0xd7, 0x88, 0x25, 0xff, 0xbf, 0x6b, 0x0f, 0xff,
+  0xd8, 0x8a, 0x27, 0xff, 0xe6, 0x9d, 0x35, 0xff,
+  0xe9, 0xa1, 0x39, 0xff, 0xe8, 0xa5, 0x44, 0xff,
+  0xe9, 0xbb, 0x78, 0xff, 0xe6, 0xb2, 0x6d, 0xff,
+  0xb8, 0x64, 0x11, 0xf7, 0xa2, 0x63, 0x2a, 0xb2,
+  0x61, 0x8b, 0xc1, 0x54, 0x5c, 0x90, 0xd0, 0x50,
+  0x8a, 0x72, 0x5f, 0x7f, 0xad, 0x5e, 0x12, 0xd5,
+  0xb5, 0x60, 0x0e, 0xfa, 0xda, 0x8a, 0x3c, 0xfd,
+  0xf1, 0xa9, 0x64, 0xff, 0xe8, 0x9b, 0x51, 0xff,
+  0xae, 0x5d, 0x11, 0xd8, 0x5c, 0x90, 0xd0, 0x50,
+  0x5c, 0x90, 0xd0, 0x50, 0x5c, 0x90, 0xd0, 0x50,
+  0x5c, 0x90, 0xd0, 0x50, 0x5c, 0x90, 0xd0, 0x50,
+  0x5c, 0x90, 0xd0, 0x50, 0x5c, 0x90, 0xd0, 0x50,
+  0xa8, 0x63, 0x20, 0xc3, 0xd3, 0x9b, 0x62, 0xfd,
+  0xb7, 0x6e, 0x23, 0xff, 0xb5, 0x61, 0x0b, 0xff,
+  0xbb, 0x69, 0x10, 0xff, 0xc1, 0x75, 0x23, 0xff,
+  0xd5, 0x99, 0x50, 0xff, 0xe1, 0x9c, 0x40, 0xff,
+  0xed, 0xa4, 0x3a, 0xff, 0xec, 0xa4, 0x3a, 0xff,
+  0xeb, 0xa3, 0x39, 0xff, 0xda, 0x8d, 0x29, 0xff,
+  0xbd, 0x68, 0x0d, 0xff, 0xe4, 0x9c, 0x35, 0xff,
+  0xe7, 0xa0, 0x38, 0xff, 0xe6, 0xa0, 0x3c, 0xff,
+  0xe5, 0xb5, 0x70, 0xff, 0xd9, 0xa3, 0x5f, 0xfe,
+  0xb1, 0x5c, 0x08, 0xf8, 0x8c, 0x6e, 0x57, 0x86,
+  0x5b, 0x8f, 0xd0, 0x51, 0x88, 0x71, 0x62, 0x7f,
+  0xc1, 0x6f, 0x1e, 0xf6, 0xf6, 0xb6, 0x6f, 0xff,
+  0xb1, 0x58, 0x02, 0xfa, 0x60, 0x8d, 0xc9, 0x54,
+  0x5d, 0x90, 0xd1, 0x52, 0x5d, 0x90, 0xd1, 0x52,
+  0x5d, 0x90, 0xd1, 0x52, 0x5d, 0x90, 0xd1, 0x52,
+  0x5d, 0x90, 0xd1, 0x52, 0x5d, 0x90, 0xd1, 0x52,
+  0x62, 0x94, 0xd0, 0x40, 0x62, 0x94, 0xd0, 0x40,
+  0x62, 0x94, 0xd0, 0x40, 0x6b, 0x8b, 0xb5, 0x47,
+  0xae, 0x5e, 0x10, 0xda, 0xd9, 0xad, 0x7d, 0xfc,
+  0xe5, 0xcb, 0xab, 0xff, 0xe8, 0xc7, 0x9b, 0xff,
+  0xe6, 0xb5, 0x6e, 0xff, 0xde, 0x9a, 0x36, 0xff,
+  0xdd, 0x99, 0x36, 0xff, 0xdc, 0x99, 0x36, 0xff,
+  0xdb, 0x98, 0x35, 0xff, 0xda, 0x97, 0x35, 0xff,
+  0xc7, 0x7b, 0x1e, 0xff, 0xb3, 0x58, 0x00, 0xff,
+  0xc3, 0x62, 0x01, 0xff, 0xb4, 0x5a, 0x01, 0xff,
+  0xbc, 0x68, 0x12, 0xff, 0xc1, 0x82, 0x3d, 0xff,
+  0xb0, 0x62, 0x16, 0xfa, 0xa1, 0x66, 0x2e, 0x9b,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x73, 0x86, 0xa1, 0x4d, 0x95, 0x6b, 0x48, 0x7d,
+  0xa8, 0x5f, 0x1e, 0xb2, 0xb0, 0x5e, 0x0f, 0xd0,
+  0xb2, 0x5b, 0x08, 0xe3, 0xa3, 0x60, 0x23, 0xaa,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x6f, 0x86, 0xa6, 0x4b, 0xb6, 0x69, 0x1d, 0xe2,
+  0xda, 0xaf, 0x80, 0xfd, 0xd9, 0xb6, 0x8e, 0xff,
+  0xe2, 0xbe, 0x8f, 0xff, 0xe8, 0xbd, 0x80, 0xff,
+  0xdf, 0x9d, 0x3d, 0xff, 0xdd, 0x99, 0x36, 0xff,
+  0xdc, 0x99, 0x36, 0xff, 0xdb, 0x98, 0x35, 0xff,
+  0xda, 0x97, 0x35, 0xff, 0xc7, 0x7b, 0x1e, 0xff,
+  0xb4, 0x58, 0x00, 0xff, 0xce, 0x66, 0x00, 0xff,
+  0xca, 0x67, 0x02, 0xff, 0xc6, 0x64, 0x04, 0xff,
+  0xc0, 0x64, 0x08, 0xff, 0xbd, 0x68, 0x10, 0xff,
+  0xb7, 0x5f, 0x0a, 0xff, 0xb2, 0x5d, 0x07, 0xef,
+  0x7a, 0x7d, 0x8e, 0x55, 0x60, 0x91, 0xd1, 0x41,
+  0x60, 0x91, 0xd1, 0x41, 0x60, 0x91, 0xd1, 0x41,
+  0x60, 0x91, 0xd1, 0x41, 0x60, 0x91, 0xd1, 0x41,
+  0x76, 0x81, 0x9a, 0x51, 0x97, 0x69, 0x41, 0x85,
+  0xac, 0x5f, 0x16, 0xc2, 0xb3, 0x5b, 0x07, 0xe8,
+  0xb2, 0x59, 0x02, 0xf7, 0xaf, 0x5b, 0x09, 0xe2,
+  0x61, 0x92, 0xd1, 0x42, 0x61, 0x92, 0xd1, 0x42,
+  0x61, 0x92, 0xd1, 0x42, 0x61, 0x92, 0xd1, 0x42,
+  0x61, 0x91, 0xca, 0x43, 0xac, 0x60, 0x17, 0xc9,
+  0xd8, 0xad, 0x7e, 0xfc, 0xe7, 0xcf, 0xb1, 0xff,
+  0xea, 0xcb, 0xa2, 0xff, 0xe9, 0xbc, 0x7c, 0xff,
+  0xde, 0x9b, 0x39, 0xff, 0xdd, 0x99, 0x36, 0xff,
+  0xdc, 0x99, 0x36, 0xff, 0xdb, 0x98, 0x35, 0xff,
+  0xda, 0x97, 0x35, 0xff, 0xc7, 0x7b, 0x1e, 0xff,
+  0xb3, 0x58, 0x00, 0xff, 0xc9, 0x65, 0x01, 0xff,
+  0xbf, 0x61, 0x03, 0xff, 0xb4, 0x5b, 0x01, 0xff,
+  0xb7, 0x5e, 0x06, 0xff, 0xbd, 0x6d, 0x1b, 0xff,
+  0xbe, 0x6d, 0x1a, 0xfc, 0xb2, 0x5d, 0x0a, 0xe9,
+  0x87, 0x75, 0x6b, 0x68, 0x60, 0x93, 0xcf, 0x43,
+  0x60, 0x93, 0xcf, 0x43, 0x60, 0x93, 0xcf, 0x43,
+  0x60, 0x93, 0xcf, 0x43, 0x60, 0x93, 0xcf, 0x43,
+  0x86, 0x77, 0x6f, 0x66, 0xaa, 0x5e, 0x17, 0xc1,
+  0xb4, 0x5c, 0x09, 0xfa, 0xc8, 0x71, 0x1d, 0xfb,
+  0xb2, 0x5a, 0x04, 0xf0, 0x60, 0x93, 0xcf, 0x43,
+  0x60, 0x93, 0xcf, 0x43, 0x60, 0x93, 0xcf, 0x43,
+  0x60, 0x93, 0xcf, 0x43, 0x60, 0x93, 0xcf, 0x43,
+  0x60, 0x93, 0xcf, 0x43, 0x60, 0x93, 0xcf, 0x43,
+  0x6a, 0x8a, 0xb3, 0x4a, 0xb3, 0x62, 0x13, 0xe6,
+  0xe3, 0xc2, 0x9c, 0xfe, 0xe9, 0xd2, 0xb4, 0xff,
+  0xea, 0xcc, 0xa3, 0xff, 0xea, 0xc5, 0x8f, 0xff,
+  0xdf, 0xa2, 0x48, 0xff, 0xdb, 0x98, 0x35, 0xff,
+  0xda, 0x97, 0x35, 0xff, 0xd9, 0x96, 0x35, 0xff,
+  0xd1, 0x8b, 0x2c, 0xff, 0xb3, 0x5a, 0x01, 0xff,
+  0xb3, 0x59, 0x00, 0xff, 0xce, 0x8a, 0x2b, 0xff,
+  0xd4, 0x96, 0x3a, 0xff, 0xd4, 0xa7, 0x66, 0xff,
+  0xc1, 0x8b, 0x47, 0xfc, 0xaf, 0x59, 0x06, 0xf1,
+  0x85, 0x75, 0x6c, 0x67, 0x61, 0x90, 0xc8, 0x44,
+  0xb2, 0x5b, 0x06, 0xf3, 0xf4, 0xbb, 0x6c, 0xff,
+  0xf2, 0xb5, 0x63, 0xff, 0xb2, 0x5a, 0x05, 0xf7,
+  0x6b, 0x88, 0xae, 0x4c, 0x5f, 0x92, 0xcf, 0x43,
+  0x5e, 0x93, 0xd0, 0x44, 0x5e, 0x93, 0xd0, 0x44,
+  0x5e, 0x93, 0xd0, 0x44, 0x5e, 0x93, 0xd0, 0x44,
+  0x5e, 0x93, 0xd0, 0x44, 0x5e, 0x93, 0xd0, 0x44,
+  0x5e, 0x93, 0xd0, 0x44, 0x5e, 0x93, 0xd0, 0x44,
+  0x5e, 0x93, 0xd0, 0x44, 0x67, 0x8b, 0xb6, 0x4b,
+  0xae, 0x5e, 0x10, 0xdb, 0xdd, 0xb6, 0x8e, 0xfc,
+  0xe5, 0xca, 0xa7, 0xff, 0xe8, 0xc6, 0x97, 0xff,
+  0xe6, 0xb5, 0x6e, 0xff, 0xde, 0x9a, 0x36, 0xff,
+  0xdd, 0x99, 0x36, 0xff, 0xdc, 0x99, 0x36, 0xff,
+  0xdb, 0x98, 0x35, 0xff, 0xda, 0x97, 0x35, 0xff,
+  0xc7, 0x7b, 0x1e, 0xff, 0xb3, 0x58, 0x00, 0xff,
+  0xc3, 0x62, 0x01, 0xff, 0xb4, 0x5a, 0x01, 0xff,
+  0xbc, 0x68, 0x11, 0xff, 0xc1, 0x82, 0x3c, 0xff,
+  0xaf, 0x62, 0x14, 0xfa, 0xa0, 0x66, 0x32, 0x9c,
+  0x60, 0x91, 0xd0, 0x45, 0x60, 0x91, 0xd0, 0x45,
+  0x60, 0x91, 0xd0, 0x45, 0x60, 0x91, 0xd0, 0x45,
+  0x60, 0x91, 0xd0, 0x45, 0x60, 0x91, 0xd0, 0x45,
+  0x60, 0x91, 0xd0, 0x45, 0x60, 0x91, 0xd0, 0x45,
+  0xb1, 0x59, 0x04, 0xf1, 0xcf, 0x88, 0x42, 0xfb,
+  0xaf, 0x5c, 0x0b, 0xdd, 0x68, 0x8a, 0xbc, 0x4a,
+  0x60, 0x91, 0xd0, 0x45, 0x60, 0x91, 0xd0, 0x45,
+  0x60, 0x91, 0xd0, 0x45, 0x60, 0x91, 0xd0, 0x45,
+  0x6d, 0x85, 0xa8, 0x50, 0xb5, 0x69, 0x1e, 0xe3,
+  0xda, 0xaf, 0x80, 0xfd, 0xd9, 0xb6, 0x8e, 0xff,
+  0xe2, 0xbe, 0x8f, 0xff, 0xe8, 0xbd, 0x80, 0xff,
+  0xdf, 0x9d, 0x3d, 0xff, 0xdd, 0x99, 0x36, 0xff,
+  0xdc, 0x99, 0x36, 0xff, 0xdb, 0x98, 0x35, 0xff,
+  0xda, 0x97, 0x35, 0xff, 0xc7, 0x7b, 0x1d, 0xff,
+  0xb6, 0x5a, 0x01, 0xff, 0xcf, 0x67, 0x01, 0xff,
+  0xca, 0x67, 0x02, 0xff, 0xc6, 0x64, 0x04, 0xff,
+  0xc0, 0x64, 0x08, 0xff, 0xbd, 0x68, 0x10, 0xff,
+  0xb6, 0x5f, 0x0a, 0xff, 0xb2, 0x5d, 0x07, 0xef,
+  0x78, 0x7e, 0x92, 0x5a, 0x5f, 0x90, 0xd1, 0x46,
+  0x5f, 0x90, 0xd1, 0x46, 0x5f, 0x90, 0xd1, 0x46,
+  0x5e, 0x91, 0xcf, 0x46, 0x5e, 0x91, 0xcf, 0x46,
+  0x73, 0x82, 0x9c, 0x55, 0x95, 0x6a, 0x44, 0x88,
+  0xab, 0x60, 0x17, 0xc4, 0xb2, 0x5b, 0x07, 0xe9,
+  0xb2, 0x59, 0x02, 0xf7, 0xaf, 0x5b, 0x09, 0xe3,
+  0x5e, 0x91, 0xcf, 0x46, 0x5e, 0x91, 0xcf, 0x46,
+  0x5e, 0x91, 0xcf, 0x46, 0x5e, 0x91, 0xcf, 0x46,
+  0x5e, 0x91, 0xcf, 0x46, 0xaa, 0x61, 0x1d, 0xbe,
+  0xd4, 0xa8, 0x78, 0xfa, 0xe6, 0xcd, 0xaf, 0xff,
+  0xea, 0xcb, 0xa3, 0xff, 0xe9, 0xbe, 0x80, 0xff,
+  0xdf, 0x9d, 0x3c, 0xff, 0xdd, 0x99, 0x36, 0xff,
+  0xdc, 0x99, 0x36, 0xff, 0xdb, 0x98, 0x35, 0xff,
+  0xda, 0x97, 0x35, 0xff, 0xca, 0x7e, 0x21, 0xff,
+  0xb2, 0x58, 0x00, 0xff, 0xc9, 0x65, 0x01, 0xff,
+  0xc0, 0x61, 0x03, 0xff, 0xb5, 0x5a, 0x02, 0xff,
+  0xb6, 0x5d, 0x05, 0xff, 0xbd, 0x6c, 0x1a, 0xff,
+  0xbe, 0x6e, 0x1b, 0xfd, 0xb1, 0x5d, 0x06, 0xee,
+  0x8a, 0x73, 0x63, 0x72, 0x60, 0x92, 0xcf, 0x47,
+  0x60, 0x92, 0xcf, 0x47, 0x60, 0x92, 0xcf, 0x47,
+  0x60, 0x92, 0xcf, 0x47, 0x60, 0x92, 0xcf, 0x47,
+  0x7f, 0x79, 0x7a, 0x65, 0xa8, 0x61, 0x1c, 0xbc,
+  0xb3, 0x5c, 0x06, 0xf9, 0xc8, 0x72, 0x1d, 0xfb,
+  0xb2, 0x58, 0x02, 0xf8, 0x5f, 0x8f, 0xcc, 0x48,
+  0x5d, 0x92, 0xcf, 0x47, 0x5f, 0x91, 0xd0, 0x48,
+  0x5f, 0x91, 0xd0, 0x48, 0x5f, 0x91, 0xd0, 0x48,
+  0x5f, 0x91, 0xd0, 0x48, 0x5f, 0x91, 0xd0, 0x48,
+  0x69, 0x89, 0xb5, 0x4f, 0xb3, 0x62, 0x13, 0xe7,
+  0xe2, 0xbf, 0x96, 0xfe, 0xe9, 0xd3, 0xb5, 0xff,
+  0xeb, 0xcc, 0xa1, 0xff, 0xe8, 0xbb, 0x7c, 0xff,
+  0xdc, 0x9b, 0x39, 0xff, 0xdb, 0x98, 0x35, 0xff,
+  0xda, 0x97, 0x35, 0xff, 0xd9, 0x96, 0x35, 0xff,
+  0xd1, 0x8b, 0x2c, 0xff, 0xb3, 0x5a, 0x01, 0xff,
+  0xb3, 0x59, 0x00, 0xff, 0xce, 0x8a, 0x2b, 0xff,
+  0xd4, 0x96, 0x3b, 0xff, 0xd5, 0xa9, 0x6b, 0xff,
+  0xc1, 0x8a, 0x45, 0xfd, 0xaf, 0x59, 0x06, 0xf2,
+  0x84, 0x76, 0x70, 0x6d, 0x5e, 0x92, 0xd0, 0x49,
+  0x5e, 0x92, 0xd0, 0x49, 0x9b, 0x66, 0x36, 0x9a,
+  0xcd, 0x6f, 0x0d, 0xfa, 0xcf, 0x6f, 0x0a, 0xfb,
+  0xab, 0x5f, 0x17, 0xc7, 0x5e, 0x92, 0xd0, 0x49,
+  0x5e, 0x92, 0xd0, 0x49, 0x5e, 0x92, 0xd0, 0x49,
+  0x5e, 0x92, 0xd0, 0x49, 0x5e, 0x92, 0xd0, 0x49,
+  0x5e, 0x92, 0xd0, 0x49, 0x5e, 0x92, 0xd0, 0x49,
+  0x64, 0x94, 0xcf, 0x37, 0x64, 0x94, 0xcf, 0x37,
+  0x64, 0x94, 0xcf, 0x37, 0x64, 0x94, 0xcf, 0x37,
+  0x75, 0x83, 0x9d, 0x44, 0xaf, 0x5b, 0x08, 0xe5,
+  0xc6, 0x8f, 0x4c, 0xfd, 0xcc, 0xa8, 0x74, 0xff,
+  0xcb, 0x9e, 0x5a, 0xff, 0xca, 0x8e, 0x36, 0xff,
+  0xc9, 0x8c, 0x31, 0xff, 0xc8, 0x8b, 0x31, 0xff,
+  0xc7, 0x8a, 0x31, 0xff, 0xc2, 0x82, 0x29, 0xff,
+  0xb6, 0x60, 0x08, 0xff, 0xcf, 0x66, 0x00, 0xff,
+  0xf5, 0x79, 0x00, 0xff, 0xf3, 0x7a, 0x04, 0xff,
+  0xe4, 0x7a, 0x15, 0xff, 0xd0, 0x79, 0x20, 0xff,
+  0xb2, 0x5b, 0x07, 0xf1, 0x57, 0x7d, 0xa3, 0x42,
+  0x57, 0x85, 0xb7, 0x3d, 0x60, 0x91, 0xc5, 0x3a,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x65, 0x94, 0xd0, 0x38, 0x65, 0x94, 0xd0, 0x38,
+  0x65, 0x94, 0xd0, 0x38, 0x65, 0x94, 0xd0, 0x38,
+  0x65, 0x94, 0xd0, 0x38, 0x78, 0x85, 0x9c, 0x45,
+  0xb1, 0x5d, 0x0b, 0xe1, 0xcf, 0x99, 0x5c, 0xfb,
+  0xce, 0xaa, 0x77, 0xff, 0xcb, 0x9e, 0x5b, 0xff,
+  0xca, 0x8f, 0x38, 0xff, 0xc9, 0x8c, 0x31, 0xff,
+  0xc8, 0x8b, 0x31, 0xff, 0xc7, 0x8a, 0x31, 0xff,
+  0xc1, 0x80, 0x27, 0xff, 0xb6, 0x61, 0x09, 0xff,
+  0xb6, 0x5a, 0x01, 0xff, 0xd3, 0x69, 0x01, 0xff,
+  0xef, 0x76, 0x00, 0xff, 0xf5, 0x7b, 0x04, 0xff,
+  0xf7, 0x95, 0x2a, 0xff, 0xfa, 0xaf, 0x4b, 0xff,
+  0xfb, 0xbf, 0x69, 0xff, 0xc0, 0x73, 0x21, 0xf7,
+  0x9b, 0x68, 0x39, 0x83, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x67, 0x91, 0xbf, 0x3d,
+  0x63, 0x95, 0xd1, 0x39, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x63, 0x95, 0xd1, 0x39,
+  0x63, 0x95, 0xd1, 0x39, 0x6e, 0x8e, 0xb6, 0x3f,
+  0xae, 0x5d, 0x0d, 0xd9, 0xc1, 0x86, 0x44, 0xfb,
+  0xca, 0xa6, 0x71, 0xff, 0xcb, 0x9c, 0x58, 0xff,
+  0xca, 0x8e, 0x35, 0xff, 0xc9, 0x8c, 0x31, 0xff,
+  0xc8, 0x8b, 0x31, 0xff, 0xc7, 0x8a, 0x31, 0xff,
+  0xc2, 0x82, 0x29, 0xff, 0xb5, 0x60, 0x09, 0xff,
+  0xbe, 0x5f, 0x01, 0xff, 0xf1, 0x77, 0x00, 0xff,
+  0xf5, 0x79, 0x00, 0xff, 0xf5, 0x80, 0x0f, 0xff,
+  0xf3, 0x98, 0x34, 0xff, 0xec, 0xa4, 0x4c, 0xff,
+  0xb9, 0x66, 0x12, 0xfc, 0x7d, 0x71, 0x6e, 0x5c,
+  0x5d, 0x8c, 0xcc, 0x3c, 0x62, 0x93, 0xd1, 0x3a,
+  0x62, 0x93, 0xd1, 0x3a, 0x62, 0x93, 0xd1, 0x3a,
+  0x62, 0x93, 0xd1, 0x3a, 0x62, 0x93, 0xd1, 0x3a,
+  0x62, 0x93, 0xd1, 0x3a, 0x62, 0x93, 0xd1, 0x3a,
+  0x79, 0x82, 0x8c, 0x4e, 0xa6, 0x61, 0x22, 0xa4,
+  0xb0, 0x58, 0x03, 0xf3, 0x79, 0x82, 0x90, 0x4d,
+  0x61, 0x94, 0xcf, 0x3b, 0x61, 0x94, 0xcf, 0x3b,
+  0x61, 0x94, 0xcf, 0x3b, 0x61, 0x94, 0xcf, 0x3b,
+  0x61, 0x94, 0xcf, 0x3b, 0x61, 0x94, 0xcf, 0x3b,
+  0x61, 0x94, 0xcf, 0x3b, 0x81, 0x7b, 0x7a, 0x56,
+  0xb0, 0x5b, 0x07, 0xf5, 0xce, 0xa1, 0x68, 0xff,
+  0xcb, 0x9f, 0x5f, 0xff, 0xca, 0x8f, 0x39, 0xff,
+  0xc9, 0x8c, 0x31, 0xff, 0xc9, 0x8c, 0x31, 0xff,
+  0xc8, 0x8b, 0x31, 0xff, 0xc6, 0x88, 0x2f, 0xff,
+  0xb7, 0x66, 0x0d, 0xff, 0xcf, 0x68, 0x00, 0xff,
+  0xda, 0x6c, 0x00, 0xff, 0xb8, 0x63, 0x0c, 0xff,
+  0xc2, 0x99, 0x5e, 0xff, 0xb7, 0x79, 0x33, 0xfa,
+  0xad, 0x5b, 0x09, 0xe4, 0x70, 0x71, 0x78, 0x57,
+  0x57, 0x83, 0xbb, 0x40, 0x90, 0x6d, 0x52, 0x6e,
+  0xba, 0x65, 0x0c, 0xf5, 0xf5, 0xb4, 0x5a, 0xff,
+  0xb7, 0x63, 0x0e, 0xf8, 0x9a, 0x69, 0x3e, 0x81,
+  0x63, 0x93, 0xcf, 0x3b, 0x63, 0x93, 0xcf, 0x3b,
+  0x63, 0x93, 0xcf, 0x3b, 0x63, 0x93, 0xcf, 0x3b,
+  0x63, 0x93, 0xcf, 0x3b, 0x63, 0x93, 0xcf, 0x3b,
+  0x63, 0x93, 0xcf, 0x3b, 0x63, 0x93, 0xcf, 0x3b,
+  0x63, 0x93, 0xcf, 0x3b, 0x63, 0x93, 0xcf, 0x3b,
+  0x63, 0x93, 0xcf, 0x3b, 0x62, 0x94, 0xd0, 0x3c,
+  0x73, 0x84, 0xa1, 0x48, 0xaf, 0x5b, 0x0a, 0xe6,
+  0xcb, 0x9b, 0x61, 0xfd, 0xcb, 0xa7, 0x6f, 0xff,
+  0xcb, 0x97, 0x4b, 0xff, 0xca, 0x8c, 0x31, 0xff,
+  0xc9, 0x8c, 0x31, 0xff, 0xc8, 0x8b, 0x31, 0xff,
+  0xc7, 0x8a, 0x31, 0xff, 0xc2, 0x82, 0x29, 0xff,
+  0xb6, 0x60, 0x08, 0xff, 0xcf, 0x66, 0x00, 0xff,
+  0xf5, 0x79, 0x00, 0xff, 0xf3, 0x7d, 0x0b, 0xff,
+  0xe4, 0x7b, 0x17, 0xff, 0xcf, 0x78, 0x1e, 0xff,
+  0xb2, 0x5b, 0x05, 0xf2, 0x55, 0x77, 0xa5, 0x47,
+  0x56, 0x85, 0xbc, 0x41, 0x5e, 0x8f, 0xc5, 0x3e,
+  0x62, 0x94, 0xd0, 0x3c, 0x60, 0x92, 0xd0, 0x3d,
+  0x60, 0x92, 0xd0, 0x3d, 0x60, 0x92, 0xd0, 0x3d,
+  0x60, 0x92, 0xd0, 0x3d, 0x60, 0x92, 0xd0, 0x3d,
+  0xb0, 0x59, 0x05, 0xea, 0xa8, 0x63, 0x23, 0xac,
+  0x64, 0x8e, 0xbf, 0x41, 0x60, 0x92, 0xd0, 0x3d,
+  0x60, 0x92, 0xd0, 0x3d, 0x60, 0x92, 0xd0, 0x3d,
+  0x60, 0x92, 0xd0, 0x3d, 0x60, 0x92, 0xd0, 0x3d,
+  0x60, 0x92, 0xd0, 0x3d, 0x73, 0x85, 0xa0, 0x4a,
+  0xb1, 0x5d, 0x0c, 0xe1, 0xcf, 0x99, 0x5d, 0xfb,
+  0xce, 0xaa, 0x77, 0xff, 0xcb, 0x9e, 0x5b, 0xff,
+  0xca, 0x8f, 0x38, 0xff, 0xc9, 0x8c, 0x31, 0xff,
+  0xc8, 0x8b, 0x31, 0xff, 0xc7, 0x8a, 0x31, 0xff,
+  0xc1, 0x80, 0x28, 0xff, 0xb7, 0x61, 0x09, 0xff,
+  0xb6, 0x5a, 0x01, 0xff, 0xd3, 0x69, 0x01, 0xff,
+  0xef, 0x76, 0x00, 0xff, 0xf5, 0x7b, 0x04, 0xff,
+  0xf7, 0x95, 0x2a, 0xff, 0xfa, 0xaf, 0x4b, 0xff,
+  0xfb, 0xbf, 0x69, 0xff, 0xc0, 0x73, 0x21, 0xf7,
+  0x99, 0x69, 0x3d, 0x86, 0x62, 0x93, 0xd1, 0x3e,
+  0x62, 0x93, 0xd1, 0x3e, 0x62, 0x93, 0xd1, 0x3e,
+  0x62, 0x93, 0xd1, 0x3e, 0x62, 0x93, 0xd1, 0x3e,
+  0x62, 0x93, 0xd1, 0x3e, 0x62, 0x93, 0xd1, 0x3e,
+  0x62, 0x93, 0xd1, 0x3e, 0x62, 0x93, 0xd1, 0x3e,
+  0x62, 0x93, 0xd1, 0x3e, 0x66, 0x8f, 0xc1, 0x42,
+  0x61, 0x92, 0xd1, 0x3e, 0x61, 0x92, 0xd1, 0x3e,
+  0x61, 0x92, 0xd1, 0x3e, 0x61, 0x92, 0xd1, 0x3e,
+  0x61, 0x92, 0xd1, 0x3e, 0x66, 0x8c, 0xc4, 0x41,
+  0xae, 0x5f, 0x12, 0xd0, 0xbe, 0x80, 0x3e, 0xfa,
+  0xca, 0xa5, 0x70, 0xff, 0xcb, 0x9e, 0x5a, 0xff,
+  0xca, 0x8e, 0x36, 0xff, 0xc9, 0x8c, 0x31, 0xff,
+  0xc8, 0x8b, 0x31, 0xff, 0xc7, 0x8a, 0x31, 0xff,
+  0xc3, 0x82, 0x2a, 0xff, 0xb6, 0x62, 0x0b, 0xff,
+  0xbc, 0x5d, 0x01, 0xff, 0xf0, 0x77, 0x00, 0xff,
+  0xf5, 0x79, 0x00, 0xff, 0xf5, 0x7f, 0x0d, 0xff,
+  0xf3, 0x96, 0x31, 0xff, 0xec, 0xa4, 0x4b, 0xff,
+  0xbd, 0x6b, 0x17, 0xfc, 0x85, 0x6b, 0x59, 0x6e,
+  0x5e, 0x8d, 0xc8, 0x41, 0x60, 0x93, 0xcf, 0x3f,
+  0x60, 0x93, 0xcf, 0x3f, 0x60, 0x93, 0xcf, 0x3f,
+  0x60, 0x93, 0xcf, 0x3f, 0x60, 0x93, 0xcf, 0x3f,
+  0x60, 0x93, 0xcf, 0x3f, 0x60, 0x93, 0xcf, 0x3f,
+  0x75, 0x84, 0x99, 0x4e, 0xa3, 0x64, 0x28, 0xa0,
+  0xb0, 0x59, 0x04, 0xf0, 0x82, 0x78, 0x77, 0x5c,
+  0x60, 0x93, 0xcf, 0x3f, 0x60, 0x93, 0xcf, 0x3f,
+  0x60, 0x93, 0xcf, 0x3f, 0x60, 0x93, 0xcf, 0x3f,
+  0x60, 0x93, 0xcf, 0x3f, 0x60, 0x93, 0xcf, 0x3f,
+  0x60, 0x93, 0xcf, 0x3f, 0x7f, 0x7b, 0x7d, 0x59,
+  0xb0, 0x5a, 0x06, 0xf5, 0xcd, 0x9e, 0x5f, 0xff,
+  0xcb, 0x9f, 0x5f, 0xff, 0xca, 0x90, 0x3b, 0xff,
+  0xc9, 0x8c, 0x31, 0xff, 0xc9, 0x8c, 0x31, 0xff,
+  0xc8, 0x8b, 0x31, 0xff, 0xc6, 0x88, 0x2f, 0xff,
+  0xb7, 0x66, 0x0d, 0xff, 0xcf, 0x68, 0x00, 0xff,
+  0xda, 0x6c, 0x00, 0xff, 0xb8, 0x63, 0x0d, 0xff,
+  0xc2, 0x9b, 0x61, 0xff, 0xb7, 0x77, 0x31, 0xfa,
+  0xad, 0x5b, 0x09, 0xe4, 0x70, 0x70, 0x7c, 0x5b,
+  0x5a, 0x87, 0xbf, 0x44, 0x62, 0x91, 0xcc, 0x41,
+  0x5f, 0x94, 0xd0, 0x40, 0xae, 0x60, 0x13, 0xcc,
+  0xc8, 0x6a, 0x09, 0xff, 0xb2, 0x5a, 0x04, 0xf2,
+  0x73, 0x84, 0x9b, 0x4f, 0x5f, 0x94, 0xd0, 0x40,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x61, 0x93, 0xd0, 0x40, 0x61, 0x93, 0xd0, 0x40,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x65, 0x96, 0xce, 0x2f,
+  0x65, 0x96, 0xce, 0x2f, 0x81, 0x7e, 0x7f, 0x44,
+  0xb0, 0x5e, 0x0f, 0xcb, 0xa8, 0x5d, 0x10, 0xf7,
+  0xaf, 0x82, 0x4a, 0xff, 0xb7, 0x96, 0x67, 0xff,
+  0xb5, 0x8e, 0x55, 0xff, 0xb4, 0x8b, 0x4d, 0xff,
+  0xb4, 0x88, 0x47, 0xff, 0xb2, 0x84, 0x43, 0xff,
+  0xb1, 0x87, 0x4c, 0xff, 0xb3, 0x5c, 0x06, 0xff,
+  0xe7, 0x74, 0x05, 0xff, 0xf5, 0x7b, 0x04, 0xff,
+  0xf6, 0x86, 0x11, 0xff, 0xfa, 0xad, 0x4e, 0xff,
+  0xc1, 0x72, 0x21, 0xf6, 0x7c, 0x59, 0x3a, 0x71,
+  0x43, 0x67, 0x8b, 0x40, 0x4d, 0x70, 0x9b, 0x3b,
+  0x55, 0x7f, 0xae, 0x36, 0x62, 0x91, 0xc5, 0x31,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x64, 0x97, 0xcf, 0x2f, 0x64, 0x97, 0xcf, 0x2f,
+  0x77, 0x88, 0x9d, 0x3a, 0xaa, 0x62, 0x1c, 0xa2,
+  0xb1, 0x5d, 0x09, 0xf7, 0xb8, 0x83, 0x44, 0xfb,
+  0xbc, 0x9a, 0x69, 0xff, 0xb6, 0x91, 0x5d, 0xff,
+  0xb4, 0x8e, 0x54, 0xff, 0xb4, 0x8b, 0x4d, 0xff,
+  0xb2, 0x86, 0x47, 0xff, 0xb2, 0x8e, 0x58, 0xff,
+  0xb3, 0x8b, 0x56, 0xff, 0xb6, 0x6f, 0x27, 0xff,
+  0xb3, 0x59, 0x02, 0xff, 0xc7, 0x68, 0x0c, 0xff,
+  0xea, 0x9a, 0x3c, 0xff, 0xfc, 0xbf, 0x66, 0xff,
+  0xfc, 0xbf, 0x66, 0xff, 0xee, 0xb5, 0x69, 0xff,
+  0xb0, 0x5d, 0x0d, 0xd8, 0x53, 0x7d, 0xb0, 0x37,
+  0x60, 0x8e, 0xc6, 0x32, 0x66, 0x95, 0xd0, 0x30,
+  0x66, 0x95, 0xd0, 0x30, 0x66, 0x95, 0xd0, 0x30,
+  0x66, 0x95, 0xd0, 0x30, 0x66, 0x95, 0xd0, 0x30,
+  0x66, 0x95, 0xd0, 0x30, 0x66, 0x95, 0xd0, 0x30,
+  0x66, 0x95, 0xd0, 0x30, 0x66, 0x95, 0xd0, 0x30,
+  0x66, 0x95, 0xd0, 0x30, 0x64, 0x97, 0xd1, 0x31,
+  0x64, 0x97, 0xd1, 0x31, 0x64, 0x97, 0xd1, 0x31,
+  0x64, 0x97, 0xd1, 0x31, 0x64, 0x97, 0xd1, 0x31,
+  0x77, 0x84, 0x9b, 0x3e, 0xac, 0x62, 0x17, 0xb4,
+  0xa5, 0x58, 0x0b, 0xf7, 0xab, 0x7d, 0x44, 0xfe,
+  0xb7, 0x94, 0x60, 0xff, 0xb5, 0x8c, 0x50, 0xff,
+  0xb4, 0x89, 0x48, 0xff, 0xb4, 0x86, 0x42, 0xff,
+  0xb2, 0x82, 0x3e, 0xff, 0xb2, 0x87, 0x4a, 0xff,
+  0xb2, 0x6f, 0x26, 0xff, 0xb7, 0x5c, 0x04, 0xff,
+  0xe8, 0x77, 0x0a, 0xff, 0xf6, 0x8c, 0x1e, 0xff,
+  0xf9, 0x9c, 0x29, 0xff, 0xfc, 0xbc, 0x5d, 0xff,
+  0xcd, 0x87, 0x39, 0xf7, 0x8b, 0x5c, 0x2e, 0x85,
+  0x4a, 0x6f, 0xa0, 0x3e, 0x50, 0x7d, 0xb2, 0x39,
+  0x5d, 0x8e, 0xc9, 0x34, 0x63, 0x94, 0xd1, 0x32,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x6e, 0x8a, 0xb0, 0x39, 0x71, 0x87, 0xa6, 0x3c,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x63, 0x94, 0xd1, 0x32, 0x63, 0x94, 0xd1, 0x32,
+  0x93, 0x6e, 0x4f, 0x64, 0xb1, 0x5a, 0x05, 0xf0,
+  0xad, 0x74, 0x32, 0xfb, 0xb6, 0x91, 0x5a, 0xff,
+  0xb7, 0x8a, 0x47, 0xff, 0xb6, 0x85, 0x3c, 0xff,
+  0xb5, 0x81, 0x35, 0xff, 0xb4, 0x7d, 0x2e, 0xff,
+  0xb5, 0x63, 0x0d, 0xff, 0xe4, 0x76, 0x0c, 0xff,
+  0xf5, 0x81, 0x10, 0xff, 0xc1, 0x63, 0x09, 0xff,
+  0xb0, 0x5c, 0x08, 0xfa, 0xa6, 0x5a, 0x0f, 0xc9,
+  0x4d, 0x59, 0x69, 0x51, 0x42, 0x60, 0x85, 0x45,
+  0x4b, 0x6b, 0x93, 0x40, 0xa9, 0x5e, 0x15, 0xba,
+  0xbd, 0x66, 0x0b, 0xfd, 0xb4, 0x5b, 0x04, 0xf8,
+  0xa5, 0x64, 0x26, 0x93, 0x65, 0x96, 0xce, 0x32,
+  0x65, 0x96, 0xce, 0x32, 0x65, 0x96, 0xce, 0x32,
+  0x64, 0x94, 0xcf, 0x33, 0x64, 0x94, 0xcf, 0x33,
+  0x64, 0x94, 0xcf, 0x33, 0x64, 0x94, 0xcf, 0x33,
+  0x64, 0x94, 0xcf, 0x33, 0x64, 0x94, 0xcf, 0x33,
+  0x64, 0x94, 0xcf, 0x33, 0x64, 0x94, 0xcf, 0x33,
+  0x64, 0x94, 0xcf, 0x33, 0x64, 0x94, 0xcf, 0x33,
+  0x64, 0x94, 0xcf, 0x33, 0x7f, 0x7e, 0x84, 0x48,
+  0xb0, 0x5e, 0x10, 0xcc, 0xae, 0x67, 0x20, 0xf8,
+  0xb0, 0x87, 0x54, 0xff, 0xb7, 0x91, 0x5b, 0xff,
+  0xb5, 0x89, 0x49, 0xff, 0xb4, 0x86, 0x42, 0xff,
+  0xb4, 0x84, 0x3b, 0xff, 0xb2, 0x81, 0x3a, 0xff,
+  0xb1, 0x82, 0x42, 0xff, 0xb3, 0x5b, 0x05, 0xff,
+  0xe7, 0x76, 0x09, 0xff, 0xf5, 0x7e, 0x0a, 0xff,
+  0xf6, 0x88, 0x16, 0xff, 0xfa, 0xb1, 0x56, 0xff,
+  0xbf, 0x6e, 0x1a, 0xf6, 0x7b, 0x5a, 0x3f, 0x74,
+  0x43, 0x69, 0x92, 0x44, 0x4c, 0x71, 0xa1, 0x3f,
+  0x53, 0x7f, 0xb4, 0x3a, 0x60, 0x90, 0xca, 0x35,
+  0x62, 0x95, 0xd0, 0x34, 0x62, 0x95, 0xd0, 0x34,
+  0x62, 0x95, 0xd0, 0x34, 0x62, 0x95, 0xd0, 0x34,
+  0x8d, 0x73, 0x5e, 0x5c, 0x62, 0x95, 0xd0, 0x34,
+  0x62, 0x95, 0xd0, 0x34, 0x62, 0x95, 0xd0, 0x34,
+  0x62, 0x95, 0xd0, 0x34, 0x62, 0x95, 0xd0, 0x34,
+  0x62, 0x95, 0xd0, 0x34, 0x62, 0x95, 0xd0, 0x34,
+  0x62, 0x95, 0xd0, 0x34, 0x65, 0x93, 0xd0, 0x35,
+  0x76, 0x86, 0xa2, 0x40, 0xa9, 0x62, 0x1f, 0xa5,
+  0xb1, 0x5d, 0x09, 0xf7, 0xb8, 0x83, 0x44, 0xfc,
+  0xbc, 0x9a, 0x69, 0xff, 0xb6, 0x91, 0x5d, 0xff,
+  0xb4, 0x8e, 0x54, 0xff, 0xb4, 0x8b, 0x4d, 0xff,
+  0xb2, 0x86, 0x47, 0xff, 0xb2, 0x8e, 0x58, 0xff,
+  0xb3, 0x8b, 0x56, 0xff, 0xb6, 0x6f, 0x27, 0xff,
+  0xb3, 0x59, 0x02, 0xff, 0xc7, 0x68, 0x0c, 0xff,
+  0xea, 0x9a, 0x3c, 0xff, 0xfc, 0xbf, 0x66, 0xff,
+  0xfc, 0xbf, 0x66, 0xff, 0xee, 0xb5, 0x69, 0xff,
+  0xb0, 0x5d, 0x0e, 0xd9, 0x55, 0x7f, 0xae, 0x3c,
+  0x61, 0x8f, 0xc2, 0x37, 0x65, 0x93, 0xd0, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x63, 0x95, 0xd1, 0x35, 0x63, 0x95, 0xd1, 0x35,
+  0x72, 0x8a, 0xab, 0x3e, 0xab, 0x61, 0x1c, 0xad,
+  0xa7, 0x58, 0x0a, 0xf8, 0xaa, 0x7b, 0x40, 0xfe,
+  0xb6, 0x94, 0x61, 0xff, 0xb5, 0x8d, 0x50, 0xff,
+  0xb4, 0x89, 0x49, 0xff, 0xb4, 0x86, 0x42, 0xff,
+  0xb2, 0x82, 0x3d, 0xff, 0xb1, 0x87, 0x4a, 0xff,
+  0xb2, 0x72, 0x2a, 0xff, 0xb5, 0x5b, 0x04, 0xff,
+  0xe5, 0x76, 0x09, 0xff, 0xf6, 0x8c, 0x1d, 0xff,
+  0xf9, 0x9b, 0x28, 0xff, 0xfc, 0xba, 0x5a, 0xff,
+  0xd4, 0x90, 0x41, 0xf9, 0x93, 0x5a, 0x28, 0x93,
+  0x4c, 0x6e, 0x9c, 0x43, 0x52, 0x7b, 0xac, 0x3e,
+  0x5d, 0x8a, 0xc0, 0x39, 0x62, 0x93, 0xd2, 0x36,
+  0x62, 0x93, 0xd2, 0x36, 0x62, 0x93, 0xd2, 0x36,
+  0x62, 0x93, 0xd2, 0x36, 0x62, 0x93, 0xd2, 0x36,
+  0x62, 0x93, 0xd2, 0x36, 0x62, 0x93, 0xd2, 0x36,
+  0x69, 0x8c, 0xbc, 0x3b, 0x72, 0x84, 0xa2, 0x42,
+  0x62, 0x93, 0xd2, 0x36, 0x64, 0x94, 0xcf, 0x37,
+  0x64, 0x94, 0xcf, 0x37, 0x64, 0x94, 0xcf, 0x37,
+  0x64, 0x94, 0xcf, 0x37, 0x64, 0x94, 0xcf, 0x37,
+  0x64, 0x94, 0xcf, 0x37, 0x64, 0x94, 0xcf, 0x37,
+  0x92, 0x6f, 0x53, 0x68, 0xb1, 0x5a, 0x05, 0xf1,
+  0xac, 0x70, 0x2c, 0xfb, 0xb6, 0x8f, 0x56, 0xff,
+  0xb7, 0x8a, 0x47, 0xff, 0xb6, 0x85, 0x3c, 0xff,
+  0xb5, 0x81, 0x36, 0xff, 0xb4, 0x7d, 0x2f, 0xff,
+  0xb5, 0x63, 0x0e, 0xff, 0xe4, 0x76, 0x0c, 0xff,
+  0xf5, 0x81, 0x10, 0xff, 0xc1, 0x63, 0x08, 0xff,
+  0xb0, 0x5b, 0x07, 0xfb, 0xa5, 0x5a, 0x11, 0xca,
+  0x4d, 0x5a, 0x6f, 0x56, 0x44, 0x63, 0x8d, 0x4a,
+  0x48, 0x70, 0x99, 0x46, 0x52, 0x79, 0xa8, 0x41,
+  0x5d, 0x88, 0xbb, 0x3c, 0xb1, 0x59, 0x03, 0xf3,
+  0xb2, 0x5b, 0x06, 0xea, 0x8b, 0x75, 0x64, 0x5d,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x63, 0x96, 0xcf, 0x38, 0x63, 0x96, 0xcf, 0x38,
+  0x69, 0x96, 0xcd, 0x26, 0x69, 0x96, 0xcd, 0x26,
+  0x69, 0x96, 0xcd, 0x26, 0x69, 0x96, 0xcd, 0x26,
+  0x69, 0x96, 0xcd, 0x26, 0x69, 0x96, 0xcd, 0x26,
+  0x69, 0x96, 0xcd, 0x26, 0x98, 0x65, 0x3a, 0x62,
+  0xae, 0x59, 0x06, 0xe3, 0xad, 0x64, 0x17, 0xf7,
+  0xb0, 0x76, 0x34, 0xfa, 0xa6, 0x75, 0x3b, 0xfe,
+  0xa8, 0x7c, 0x45, 0xff, 0xb0, 0x83, 0x4b, 0xff,
+  0xa7, 0x72, 0x33, 0xf9, 0xa9, 0x5b, 0x0d, 0xfb,
+  0xb8, 0x5d, 0x06, 0xfe, 0xf2, 0x8c, 0x24, 0xff,
+  0xf8, 0x95, 0x21, 0xff, 0xfb, 0xba, 0x5c, 0xff,
+  0xce, 0x88, 0x3c, 0xf8, 0x82, 0x51, 0x23, 0x82,
+  0x36, 0x4e, 0x6d, 0x41, 0x3b, 0x59, 0x7b, 0x3c,
+  0x46, 0x63, 0x8d, 0x36, 0x4f, 0x74, 0xa4, 0x30,
+  0x61, 0x8b, 0xc2, 0x2a, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x65, 0x95, 0xcf, 0x27, 0x65, 0x95, 0xcf, 0x27,
+  0x7d, 0x76, 0x73, 0x3e, 0xa8, 0x5d, 0x14, 0xad,
+  0xb4, 0x5e, 0x0b, 0xf9, 0xb9, 0x70, 0x25, 0xf5,
+  0xb2, 0x73, 0x32, 0xf7, 0xb8, 0x80, 0x40, 0xfb,
+  0xc9, 0x8f, 0x4b, 0xfc, 0xbf, 0x78, 0x30, 0xf6,
+  0xb4, 0x5e, 0x0b, 0xfb, 0xad, 0x59, 0x07, 0xe7,
+  0x89, 0x4d, 0x15, 0xa5, 0x83, 0x4d, 0x17, 0x9a,
+  0xad, 0x5a, 0x07, 0xe4, 0xbb, 0x6b, 0x18, 0xf6,
+  0xe2, 0xa0, 0x50, 0xfe, 0xde, 0x9e, 0x51, 0xfd,
+  0xab, 0x5c, 0x0e, 0xc7, 0x42, 0x63, 0x8d, 0x36,
+  0x4a, 0x74, 0xa4, 0x30, 0x5b, 0x8b, 0xc2, 0x2a,
+  0x65, 0x95, 0xcf, 0x27, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x68, 0x97, 0xd0, 0x28, 0x68, 0x97, 0xd0, 0x28,
+  0x8d, 0x6d, 0x4f, 0x53, 0xad, 0x5b, 0x0a, 0xd6,
+  0xab, 0x61, 0x14, 0xf7, 0xab, 0x6f, 0x2d, 0xf8,
+  0xa3, 0x70, 0x34, 0xfe, 0xa6, 0x78, 0x3e, 0xff,
+  0xad, 0x7e, 0x42, 0xff, 0xa8, 0x70, 0x30, 0xfc,
+  0xa5, 0x60, 0x19, 0xf7, 0xac, 0x56, 0x02, 0xfb,
+  0xb3, 0x58, 0x01, 0xfc, 0xdd, 0x89, 0x2d, 0xfd,
+  0xfb, 0xbc, 0x62, 0xff, 0xfc, 0xc4, 0x72, 0xff,
+  0xc6, 0x79, 0x27, 0xf5, 0x7f, 0x54, 0x2c, 0x7a,
+  0x39, 0x5e, 0x7f, 0x3e, 0x44, 0x68, 0x91, 0x38,
+  0x4c, 0x7a, 0xa8, 0x32, 0x5c, 0x90, 0xc5, 0x2c,
+  0x66, 0x99, 0xd1, 0x29, 0x66, 0x99, 0xd1, 0x29,
+  0x66, 0x99, 0xd1, 0x29, 0x66, 0x99, 0xd1, 0x29,
+  0x66, 0x99, 0xd1, 0x29, 0x66, 0x99, 0xd1, 0x29,
+  0x66, 0x99, 0xd1, 0x29, 0x66, 0x99, 0xd1, 0x29,
+  0x66, 0x99, 0xd1, 0x29, 0x66, 0x99, 0xd1, 0x29,
+  0x69, 0x96, 0xcd, 0x2a, 0x69, 0x96, 0xcd, 0x2a,
+  0x69, 0x96, 0xcd, 0x2a, 0x69, 0x96, 0xcd, 0x2a,
+  0x69, 0x96, 0xcd, 0x2a, 0x64, 0x96, 0xcd, 0x2a,
+  0x64, 0x96, 0xcd, 0x2a, 0x76, 0x86, 0x9a, 0x35,
+  0xaa, 0x5e, 0x14, 0xb0, 0xa9, 0x5b, 0x0e, 0xf9,
+  0xb6, 0x7f, 0x3c, 0xff, 0xa8, 0x7b, 0x40, 0xff,
+  0xa4, 0x7c, 0x46, 0xff, 0xa9, 0x81, 0x4b, 0xff,
+  0xb4, 0x5d, 0x07, 0xff, 0xf0, 0x88, 0x23, 0xff,
+  0xf5, 0x7d, 0x09, 0xff, 0xef, 0x8b, 0x2c, 0xff,
+  0xb2, 0x5a, 0x04, 0xf9, 0x29, 0x3f, 0x59, 0x50,
+  0x2c, 0x47, 0x62, 0x4b, 0x33, 0x50, 0x69, 0x46,
+  0x45, 0x56, 0x69, 0x46, 0xaf, 0x58, 0x03, 0xef,
+  0xaa, 0x5e, 0x12, 0xb6, 0x88, 0x71, 0x5c, 0x4d,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x67, 0x98, 0xce, 0x2a,
+  0x67, 0x98, 0xce, 0x2a, 0x96, 0x68, 0x3d, 0x65,
+  0xae, 0x5a, 0x07, 0xe4, 0xb1, 0x6d, 0x25, 0xf8,
+  0xb0, 0x78, 0x3a, 0xfa, 0xa6, 0x76, 0x3e, 0xfe,
+  0xa9, 0x7d, 0x47, 0xff, 0xb0, 0x82, 0x49, 0xff,
+  0xa8, 0x71, 0x33, 0xfa, 0xaa, 0x5c, 0x10, 0xfb,
+  0xb8, 0x5c, 0x04, 0xfe, 0xf3, 0x8f, 0x2a, 0xff,
+  0xf8, 0x97, 0x26, 0xff, 0xfb, 0xbd, 0x63, 0xff,
+  0xcc, 0x84, 0x34, 0xf7, 0x81, 0x51, 0x27, 0x84,
+  0x39, 0x53, 0x75, 0x43, 0x3d, 0x5e, 0x83, 0x3e,
+  0x48, 0x68, 0x96, 0x38, 0x51, 0x7a, 0xad, 0x32,
+  0x62, 0x90, 0xca, 0x2c, 0x65, 0x95, 0xcf, 0x2b,
+  0x65, 0x95, 0xcf, 0x2b, 0x65, 0x95, 0xcf, 0x2b,
+  0x65, 0x95, 0xcf, 0x2b, 0x68, 0x97, 0xcf, 0x2c,
+  0x68, 0x97, 0xcf, 0x2c, 0x68, 0x97, 0xcf, 0x2c,
+  0x68, 0x97, 0xcf, 0x2c, 0x68, 0x97, 0xcf, 0x2c,
+  0x68, 0x97, 0xcf, 0x2c, 0x68, 0x97, 0xcf, 0x2c,
+  0x68, 0x97, 0xcf, 0x2c, 0x68, 0x97, 0xcf, 0x2c,
+  0x68, 0x97, 0xcf, 0x2c, 0x68, 0x97, 0xcf, 0x2c,
+  0x7f, 0x78, 0x78, 0x43, 0xa8, 0x5e, 0x16, 0xaf,
+  0xb4, 0x5e, 0x0b, 0xf9, 0xb9, 0x70, 0x25, 0xf6,
+  0xb2, 0x73, 0x32, 0xf7, 0xb8, 0x80, 0x40, 0xfb,
+  0xc9, 0x8f, 0x4b, 0xfd, 0xbf, 0x78, 0x30, 0xf6,
+  0xb4, 0x5e, 0x0b, 0xfb, 0xad, 0x5a, 0x07, 0xe8,
+  0x89, 0x4d, 0x17, 0xa7, 0x83, 0x4e, 0x1b, 0x9c,
+  0xae, 0x5a, 0x08, 0xe5, 0xbb, 0x6b, 0x18, 0xf6,
+  0xe2, 0xa0, 0x50, 0xfe, 0xde, 0x9e, 0x51, 0xfd,
+  0xab, 0x5c, 0x0f, 0xc9, 0x49, 0x67, 0x8e, 0x3b,
+  0x51, 0x78, 0xa3, 0x35, 0x63, 0x90, 0xc7, 0x2e,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x66, 0x95, 0xd0, 0x2c, 0x66, 0x95, 0xd0, 0x2c,
+  0x64, 0x96, 0xd1, 0x2d, 0x64, 0x96, 0xd1, 0x2d,
+  0x86, 0x70, 0x5e, 0x51, 0xad, 0x5d, 0x0c, 0xd0,
+  0xab, 0x60, 0x13, 0xf7, 0xab, 0x6f, 0x2c, 0xf7,
+  0xa3, 0x6f, 0x34, 0xfd, 0xa6, 0x77, 0x3e, 0xff,
+  0xae, 0x7f, 0x43, 0xff, 0xa8, 0x71, 0x31, 0xfc,
+  0xa4, 0x61, 0x1a, 0xf7, 0xaa, 0x56, 0x02, 0xfb,
+  0xb3, 0x58, 0x01, 0xfc, 0xd9, 0x83, 0x28, 0xfd,
+  0xfb, 0xba, 0x61, 0xff, 0xfc, 0xc3, 0x6f, 0xff,
+  0xcc, 0x83, 0x31, 0xf6, 0x87, 0x55, 0x26, 0x88,
+  0x3d, 0x58, 0x7f, 0x42, 0x47, 0x64, 0x8e, 0x3d,
+  0x4e, 0x73, 0xa2, 0x37, 0x5f, 0x8a, 0xbf, 0x30,
+  0x64, 0x96, 0xd1, 0x2d, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x67, 0x94, 0xce, 0x2e,
+  0x67, 0x94, 0xce, 0x2e, 0x77, 0x86, 0x9e, 0x39,
+  0xaa, 0x5e, 0x15, 0xb1, 0xa8, 0x59, 0x0b, 0xf9,
+  0xb6, 0x7d, 0x37, 0xff, 0xa8, 0x79, 0x3d, 0xff,
+  0xa4, 0x7a, 0x42, 0xff, 0xa9, 0x81, 0x49, 0xff,
+  0xb4, 0x5d, 0x07, 0xff, 0xf0, 0x88, 0x23, 0xff,
+  0xf5, 0x7d, 0x09, 0xff, 0xef, 0x8b, 0x2c, 0xff,
+  0xb2, 0x5a, 0x05, 0xf9, 0x30, 0x45, 0x5d, 0x55,
+  0x33, 0x4c, 0x66, 0x50, 0x36, 0x51, 0x70, 0x4b,
+  0x3e, 0x5c, 0x7d, 0x45, 0x48, 0x69, 0x8d, 0x3f,
+  0x77, 0x6a, 0x5f, 0x53, 0xa7, 0x5d, 0x15, 0xae,
+  0x73, 0x89, 0xa5, 0x38, 0x65, 0x96, 0xce, 0x2f,
+  0x65, 0x96, 0xce, 0x2f, 0x65, 0x96, 0xce, 0x2f,
+  0x65, 0x96, 0xce, 0x2f, 0x65, 0x96, 0xce, 0x2f,
+  0x65, 0x96, 0xce, 0x2f, 0x65, 0x96, 0xce, 0x2f,
+  0x65, 0x96, 0xce, 0x2f, 0x65, 0x96, 0xce, 0x2f,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x57, 0x7b, 0xa7, 0x23,
+  0x46, 0x64, 0x88, 0x2b, 0x8b, 0x56, 0x24, 0x6d,
+  0x95, 0x53, 0x16, 0x8a, 0x9b, 0x53, 0x0f, 0xa3,
+  0xa5, 0x58, 0x0d, 0xbf, 0xa4, 0x58, 0x0b, 0xc6,
+  0x82, 0x48, 0x12, 0x97, 0x50, 0x36, 0x22, 0x70,
+  0x92, 0x4c, 0x09, 0xba, 0xcb, 0x78, 0x24, 0xf9,
+  0xfb, 0xb7, 0x5f, 0xff, 0xfa, 0xc4, 0x76, 0xff,
+  0xb5, 0x60, 0x0c, 0xf8, 0x52, 0x41, 0x33, 0x58,
+  0x2d, 0x3d, 0x56, 0x3e, 0x36, 0x48, 0x5f, 0x38,
+  0x3e, 0x58, 0x72, 0x31, 0x48, 0x67, 0x8b, 0x2a,
+  0x5a, 0x87, 0xb4, 0x22, 0x66, 0x99, 0xcc, 0x1e,
+  0x66, 0x99, 0xcc, 0x1e, 0x66, 0x99, 0xcc, 0x1e,
+  0x66, 0x99, 0xcc, 0x1e, 0x66, 0x99, 0xcc, 0x1e,
+  0x6a, 0x9b, 0xcd, 0x1e, 0x6a, 0x9b, 0xcd, 0x1e,
+  0x6a, 0x9b, 0xcd, 0x1e, 0x6a, 0x9b, 0xcd, 0x1e,
+  0x6a, 0x9b, 0xcd, 0x1e, 0x6a, 0x9b, 0xcd, 0x1e,
+  0x6a, 0x9b, 0xcd, 0x1e, 0x6a, 0x9b, 0xcd, 0x1e,
+  0x6a, 0x9b, 0xcd, 0x1e, 0x6a, 0x9b, 0xcd, 0x1e,
+  0x55, 0x7f, 0xa2, 0x24, 0x42, 0x67, 0x8b, 0x2a,
+  0x5a, 0x58, 0x53, 0x3f, 0x75, 0x51, 0x2e, 0x5d,
+  0x7f, 0x50, 0x1f, 0x76, 0x89, 0x4e, 0x15, 0x8f,
+  0x8e, 0x4d, 0x0f, 0xa0, 0x6f, 0x43, 0x1a, 0x83,
+  0x30, 0x2d, 0x2c, 0x60, 0x18, 0x23, 0x2e, 0x5d,
+  0x18, 0x23, 0x2e, 0x5d, 0x1a, 0x26, 0x35, 0x56,
+  0x1f, 0x2c, 0x3b, 0x51, 0x63, 0x41, 0x25, 0x6e,
+  0xa4, 0x57, 0x0c, 0xbd, 0xb0, 0x59, 0x03, 0xf2,
+  0x62, 0x4d, 0x3f, 0x4f, 0x3e, 0x58, 0x77, 0x31,
+  0x47, 0x64, 0x8e, 0x2b, 0x5e, 0x83, 0xb6, 0x23,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x67, 0x98, 0xce, 0x1f,
+  0x67, 0x98, 0xce, 0x1f, 0x6b, 0x9a, 0xd0, 0x20,
+  0x57, 0x78, 0xa7, 0x26, 0x45, 0x68, 0x90, 0x2c,
+  0x83, 0x56, 0x30, 0x61, 0x8f, 0x53, 0x1c, 0x82,
+  0x97, 0x53, 0x11, 0x9e, 0xa3, 0x57, 0x0d, 0xbd,
+  0xa4, 0x58, 0x0c, 0xc7, 0x86, 0x4a, 0x12, 0x9e,
+  0x5d, 0x3d, 0x1e, 0x7c, 0x20, 0x27, 0x2f, 0x62,
+  0x41, 0x31, 0x25, 0x71, 0xaa, 0x58, 0x05, 0xe2,
+  0xcd, 0x82, 0x31, 0xf9, 0xee, 0xb4, 0x66, 0xff,
+  0xb2, 0x5a, 0x04, 0xf3, 0x3f, 0x41, 0x4c, 0x47,
+  0x35, 0x4c, 0x66, 0x39, 0x3d, 0x56, 0x7a, 0x32,
+  0x45, 0x68, 0x90, 0x2c, 0x5c, 0x86, 0xb1, 0x24,
+  0x6b, 0x9a, 0xd0, 0x20, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x68, 0x97, 0xd1, 0x21,
+  0x68, 0x97, 0xd1, 0x21, 0x61, 0x96, 0xca, 0x22,
+  0x50, 0x76, 0xa1, 0x29, 0x84, 0x5c, 0x33, 0x5f,
+  0xa3, 0x59, 0x10, 0xaa, 0xab, 0x5b, 0x0c, 0xca,
+  0xab, 0x58, 0x06, 0xe3, 0xb1, 0x59, 0x03, 0xf5,
+  0xbe, 0x69, 0x17, 0xfd, 0xf7, 0x94, 0x34, 0xff,
+  0xf6, 0x91, 0x2f, 0xff, 0xe9, 0x97, 0x43, 0xff,
+  0xaf, 0x59, 0x07, 0xf1, 0x23, 0x33, 0x42, 0x50,
+  0x25, 0x37, 0x4b, 0x4a, 0x2d, 0x40, 0x57, 0x43,
+  0x55, 0x4f, 0x49, 0x4c, 0x65, 0x55, 0x49, 0x4a,
+  0x46, 0x67, 0x87, 0x2f, 0x5b, 0x7c, 0xaa, 0x27,
+  0x6c, 0x99, 0xd2, 0x21, 0x6c, 0x99, 0xd2, 0x21,
+  0x6c, 0x99, 0xd2, 0x21, 0x6c, 0x99, 0xd2, 0x21,
+  0x6c, 0x99, 0xd2, 0x21, 0x6c, 0x99, 0xd2, 0x21,
+  0x6c, 0x99, 0xd2, 0x21, 0x6c, 0x99, 0xd2, 0x21,
+  0x6c, 0x99, 0xd2, 0x21, 0x6c, 0x99, 0xd2, 0x21,
+  0x6c, 0x99, 0xd2, 0x21, 0x69, 0x96, 0xcd, 0x22,
+  0x69, 0x96, 0xcd, 0x22, 0x69, 0x96, 0xcd, 0x22,
+  0x69, 0x96, 0xcd, 0x22, 0x69, 0x96, 0xcd, 0x22,
+  0x69, 0x96, 0xcd, 0x22, 0x59, 0x79, 0xa5, 0x28,
+  0x4a, 0x69, 0x89, 0x30, 0x8a, 0x56, 0x28, 0x6f,
+  0x92, 0x54, 0x19, 0x8c, 0x9a, 0x53, 0x10, 0xa5,
+  0xa4, 0x58, 0x0d, 0xc0, 0xa3, 0x58, 0x0c, 0xc7,
+  0x82, 0x48, 0x14, 0x9a, 0x4e, 0x38, 0x25, 0x73,
+  0x92, 0x4d, 0x0a, 0xbb, 0xc9, 0x73, 0x1c, 0xf9,
+  0xfb, 0xbb, 0x67, 0xff, 0xfa, 0xc3, 0x74, 0xff,
+  0xb4, 0x5e, 0x09, 0xf8, 0x53, 0x44, 0x39, 0x5a,
+  0x30, 0x44, 0x5d, 0x3f, 0x3a, 0x55, 0x6f, 0x39,
+  0x41, 0x5f, 0x82, 0x33, 0x4b, 0x73, 0x9c, 0x2c,
+  0x60, 0x90, 0xc0, 0x25, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x67, 0x98, 0xce, 0x23, 0x67, 0x98, 0xce, 0x23,
+  0x57, 0x7c, 0xa7, 0x29, 0x46, 0x6c, 0x8d, 0x2f,
+  0x5c, 0x5a, 0x5d, 0x42, 0x72, 0x55, 0x35, 0x61,
+  0x80, 0x52, 0x24, 0x7a, 0x88, 0x4f, 0x18, 0x92,
+  0x8d, 0x4f, 0x12, 0xa3, 0x70, 0x46, 0x1e, 0x86,
+  0x32, 0x32, 0x33, 0x65, 0x1c, 0x2a, 0x37, 0x61,
+  0x1c, 0x2a, 0x37, 0x61, 0x1e, 0x2c, 0x3d, 0x5b,
+  0x24, 0x33, 0x45, 0x55, 0x63, 0x46, 0x29, 0x72,
+  0xa3, 0x58, 0x0d, 0xbf, 0xb0, 0x59, 0x03, 0xf2,
+  0x60, 0x52, 0x46, 0x53, 0x42, 0x5e, 0x7f, 0x36,
+  0x4a, 0x6f, 0x8f, 0x30, 0x5f, 0x8c, 0xb2, 0x28,
+  0x6a, 0x9a, 0xcf, 0x24, 0x6a, 0x9a, 0xcf, 0x24,
+  0x6a, 0x9a, 0xcf, 0x24, 0x6a, 0x9a, 0xcf, 0x24,
+  0x6a, 0x9a, 0xcf, 0x24, 0x6a, 0x9a, 0xcf, 0x24,
+  0x68, 0x97, 0xd0, 0x24, 0x68, 0x97, 0xd0, 0x24,
+  0x68, 0x97, 0xd0, 0x24, 0x68, 0x97, 0xd0, 0x24,
+  0x68, 0x97, 0xd0, 0x24, 0x68, 0x97, 0xd0, 0x24,
+  0x68, 0x97, 0xd0, 0x24, 0x68, 0x97, 0xd0, 0x24,
+  0x68, 0x97, 0xd0, 0x24, 0x68, 0x97, 0xd0, 0x24,
+  0x5d, 0x82, 0xae, 0x29, 0x4a, 0x6a, 0x8f, 0x30,
+  0x7e, 0x56, 0x37, 0x61, 0x8e, 0x55, 0x1f, 0x83,
+  0x95, 0x54, 0x14, 0x9e, 0xa2, 0x57, 0x0e, 0xbc,
+  0xa5, 0x57, 0x0c, 0xc9, 0x89, 0x4c, 0x13, 0xa2,
+  0x5f, 0x3f, 0x21, 0x80, 0x28, 0x2b, 0x32, 0x66,
+  0x3a, 0x31, 0x2a, 0x70, 0xa8, 0x57, 0x07, 0xdc,
+  0xc9, 0x7c, 0x2a, 0xf9, 0xf0, 0xb6, 0x6a, 0xff,
+  0xb2, 0x5a, 0x05, 0xf5, 0x4d, 0x49, 0x4a, 0x52,
+  0x35, 0x4e, 0x6f, 0x3e, 0x3f, 0x5b, 0x7a, 0x38,
+  0x47, 0x6b, 0x8e, 0x32, 0x5b, 0x7f, 0xb0, 0x2a,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x66, 0x99, 0xd1, 0x25,
+  0x66, 0x99, 0xd1, 0x25, 0x69, 0x96, 0xcd, 0x26,
+  0x69, 0x96, 0xcd, 0x26, 0x68, 0x8f, 0xca, 0x27,
+  0x53, 0x74, 0xa6, 0x2e, 0x86, 0x5d, 0x3a, 0x62,
+  0xa2, 0x59, 0x13, 0xac, 0xab, 0x5b, 0x0d, 0xcb,
+  0xab, 0x59, 0x07, 0xe4, 0xb1, 0x59, 0x03, 0xf5,
+  0xbe, 0x69, 0x17, 0xfd, 0xf7, 0x94, 0x34, 0xff,
+  0xf6, 0x91, 0x2f, 0xff, 0xe9, 0x97, 0x43, 0xff,
+  0xaf, 0x5a, 0x08, 0xf1, 0x27, 0x33, 0x48, 0x54,
+  0x2a, 0x3a, 0x51, 0x4e, 0x32, 0x44, 0x5d, 0x47,
+  0x37, 0x4b, 0x6b, 0x40, 0x3d, 0x57, 0x7b, 0x3a,
+  0x4e, 0x65, 0x86, 0x36, 0x5c, 0x79, 0xad, 0x2c,
+  0x69, 0x96, 0xcd, 0x26, 0x69, 0x96, 0xcd, 0x26,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x67, 0x98, 0xce, 0x27, 0x67, 0x98, 0xce, 0x27,
+  0x68, 0x97, 0xd0, 0x14, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x5b, 0x84, 0xad, 0x19,
+  0x4a, 0x62, 0x83, 0x1f, 0x35, 0x50, 0x6b, 0x26,
+  0x2e, 0x45, 0x56, 0x2c, 0x29, 0x39, 0x4e, 0x31,
+  0x25, 0x33, 0x45, 0x37, 0x1d, 0x2d, 0x3a, 0x3d,
+  0x1b, 0x2a, 0x36, 0x42, 0x19, 0x24, 0x2f, 0x46,
+  0x22, 0x26, 0x2a, 0x4c, 0xac, 0x57, 0x05, 0xe1,
+  0xe1, 0xa4, 0x5a, 0xfe, 0xc3, 0x75, 0x23, 0xf7,
+  0xa0, 0x55, 0x0b, 0xb0, 0x24, 0x32, 0x3f, 0x38,
+  0x29, 0x39, 0x4e, 0x31, 0x2e, 0x45, 0x56, 0x2c,
+  0x35, 0x50, 0x6b, 0x26, 0x4c, 0x66, 0x88, 0x1e,
+  0x68, 0x96, 0xc5, 0x16, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x5b, 0x84, 0xad, 0x19, 0x4a, 0x62, 0x83, 0x1f,
+  0x35, 0x50, 0x6b, 0x26, 0x2e, 0x45, 0x56, 0x2c,
+  0x2d, 0x38, 0x51, 0x32, 0x28, 0x32, 0x44, 0x38,
+  0x20, 0x2d, 0x3d, 0x3e, 0x1e, 0x29, 0x39, 0x43,
+  0x1d, 0x24, 0x33, 0x46, 0x1b, 0x22, 0x30, 0x49,
+  0x1b, 0x22, 0x30, 0x49, 0x1d, 0x24, 0x33, 0x46,
+  0x1e, 0x29, 0x39, 0x43, 0x20, 0x2d, 0x3d, 0x3e,
+  0x28, 0x31, 0x43, 0x39, 0x34, 0x39, 0x4c, 0x34,
+  0x33, 0x44, 0x5a, 0x2d, 0x3c, 0x50, 0x72, 0x26,
+  0x52, 0x62, 0x8b, 0x1f, 0x6e, 0x90, 0xc7, 0x17,
+  0x6f, 0x99, 0xcc, 0x16, 0x6f, 0x99, 0xcc, 0x16,
+  0x6f, 0x99, 0xcc, 0x16, 0x6f, 0x99, 0xcc, 0x16,
+  0x6f, 0x99, 0xcc, 0x16, 0x6f, 0x99, 0xcc, 0x16,
+  0x6f, 0x99, 0xcc, 0x16, 0x6b, 0x9c, 0xce, 0x17,
+  0x6b, 0x9c, 0xce, 0x17, 0x6b, 0x9c, 0xce, 0x17,
+  0x6b, 0x9c, 0xce, 0x17, 0x6b, 0x9c, 0xce, 0x17,
+  0x6b, 0x9c, 0xce, 0x17, 0x6b, 0x9c, 0xce, 0x17,
+  0x6b, 0x9c, 0xce, 0x17, 0x6b, 0x9c, 0xce, 0x17,
+  0x5e, 0x84, 0xb3, 0x1b, 0x4d, 0x64, 0x8b, 0x21,
+  0x3a, 0x55, 0x75, 0x27, 0x31, 0x48, 0x5e, 0x2e,
+  0x2d, 0x3c, 0x55, 0x33, 0x28, 0x35, 0x47, 0x39,
+  0x20, 0x30, 0x40, 0x3f, 0x1e, 0x29, 0x38, 0x44,
+  0x1c, 0x27, 0x35, 0x47, 0x1b, 0x25, 0x33, 0x4a,
+  0x1b, 0x25, 0x33, 0x4a, 0x24, 0x2b, 0x31, 0x4b,
+  0x9d, 0x54, 0x0b, 0xb1, 0xb1, 0x58, 0x02, 0xfe,
+  0x7c, 0x49, 0x1b, 0x6e, 0x2c, 0x3a, 0x53, 0x34,
+  0x30, 0x46, 0x5c, 0x2f, 0x39, 0x52, 0x72, 0x28,
+  0x4d, 0x64, 0x8b, 0x21, 0x66, 0x8e, 0xc1, 0x19,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x68, 0x97, 0xcf, 0x18, 0x68, 0x97, 0xcf, 0x18,
+  0x6c, 0x9b, 0xd1, 0x18, 0x6c, 0x9b, 0xd1, 0x18,
+  0x52, 0x7b, 0x9c, 0x1f, 0x3c, 0x5d, 0x7f, 0x26,
+  0x31, 0x4d, 0x63, 0x2e, 0x2c, 0x3f, 0x58, 0x34,
+  0x22, 0x38, 0x49, 0x3b, 0xa3, 0x53, 0x07, 0xbe,
+  0xde, 0x89, 0x37, 0xfe, 0xef, 0x9b, 0x4a, 0xff,
+  0xd1, 0x7c, 0x29, 0xfa, 0xb0, 0x59, 0x05, 0xf1,
+  0x5e, 0x3c, 0x1b, 0x70, 0x1c, 0x2b, 0x39, 0x47,
+  0x1f, 0x2f, 0x3e, 0x41, 0x27, 0x39, 0x4a, 0x3a,
+  0x2d, 0x41, 0x5a, 0x33, 0x33, 0x4f, 0x66, 0x2d,
+  0x3c, 0x5d, 0x7f, 0x26, 0x5b, 0x88, 0xb6, 0x1c,
+  0x6c, 0x9b, 0xd1, 0x18, 0x6c, 0x9b, 0xd1, 0x18,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x69, 0x9e, 0xd2, 0x19,
+  0x69, 0x9e, 0xd2, 0x19, 0x55, 0x7f, 0xb2, 0x1e,
+  0x46, 0x63, 0x8d, 0x24, 0x36, 0x55, 0x73, 0x2a,
+  0x2f, 0x45, 0x64, 0x30, 0x29, 0x3c, 0x53, 0x37,
+  0x21, 0x36, 0x4b, 0x3d, 0x1e, 0x2e, 0x41, 0x42,
+  0x1c, 0x2a, 0x3c, 0x48, 0x1e, 0x28, 0x35, 0x4c,
+  0x22, 0x28, 0x2f, 0x52, 0xab, 0x57, 0x04, 0xe2,
+  0xdf, 0x9e, 0x4e, 0xfd, 0xc1, 0x72, 0x1d, 0xf7,
+  0x9f, 0x56, 0x0d, 0xb2, 0x26, 0x3c, 0x4d, 0x3b,
+  0x2f, 0x42, 0x55, 0x36, 0x35, 0x4a, 0x64, 0x30,
+  0x3e, 0x5d, 0x7c, 0x29, 0x52, 0x70, 0x96, 0x22,
+  0x6d, 0x99, 0xcc, 0x1a, 0x6d, 0x99, 0xcc, 0x1a,
+  0x6d, 0x99, 0xcc, 0x1a, 0x6d, 0x99, 0xcc, 0x1a,
+  0x6d, 0x99, 0xcc, 0x1a, 0x6d, 0x99, 0xcc, 0x1a,
+  0x6d, 0x99, 0xcc, 0x1a, 0x6d, 0x99, 0xcc, 0x1a,
+  0x6d, 0x99, 0xcc, 0x1a, 0x6d, 0x99, 0xcc, 0x1a,
+  0x6d, 0x99, 0xcc, 0x1a, 0x6a, 0x9c, 0xcd, 0x1b,
+  0x6a, 0x9c, 0xcd, 0x1b, 0x6a, 0x9c, 0xcd, 0x1b,
+  0x6a, 0x9c, 0xcd, 0x1b, 0x6a, 0x9c, 0xcd, 0x1b,
+  0x5a, 0x8b, 0xb4, 0x1f, 0x4b, 0x6e, 0x90, 0x25,
+  0x3b, 0x5e, 0x76, 0x2b, 0x34, 0x4e, 0x68, 0x31,
+  0x2e, 0x45, 0x58, 0x37, 0x26, 0x3f, 0x50, 0x3c,
+  0x22, 0x36, 0x45, 0x42, 0x20, 0x32, 0x40, 0x47,
+  0x1f, 0x2c, 0x3a, 0x4a, 0x1d, 0x2b, 0x38, 0x4d,
+  0x1d, 0x2b, 0x38, 0x4d, 0x1f, 0x2c, 0x3a, 0x4a,
+  0x20, 0x32, 0x40, 0x47, 0x22, 0x36, 0x45, 0x42,
+  0x25, 0x3a, 0x4f, 0x3d, 0x34, 0x45, 0x53, 0x39,
+  0x34, 0x4e, 0x68, 0x31, 0x3b, 0x5e, 0x76, 0x2b,
+  0x4d, 0x6a, 0x94, 0x24, 0x64, 0x91, 0xc8, 0x1c,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x67, 0x98, 0xcf, 0x1b, 0x67, 0x98, 0xcf, 0x1b,
+  0x5d, 0x88, 0xbb, 0x1e, 0x4b, 0x67, 0x90, 0x25,
+  0x3c, 0x5b, 0x7f, 0x2a, 0x35, 0x4a, 0x6a, 0x30,
+  0x2e, 0x40, 0x58, 0x37, 0x29, 0x3e, 0x53, 0x3d,
+  0x26, 0x36, 0x49, 0x42, 0x23, 0x31, 0x43, 0x48,
+  0x22, 0x2c, 0x3d, 0x4b, 0x1d, 0x2a, 0x3a, 0x4e,
+  0x1d, 0x2a, 0x3a, 0x4e, 0x20, 0x2d, 0x3a, 0x4d,
+  0x98, 0x53, 0x0e, 0xaa, 0xb1, 0x58, 0x02, 0xfe,
+  0x83, 0x4e, 0x1b, 0x7c, 0x2d, 0x44, 0x5b, 0x38,
+  0x38, 0x4c, 0x6b, 0x32, 0x3e, 0x5a, 0x77, 0x2d,
+  0x49, 0x6b, 0x93, 0x26, 0x69, 0x95, 0xca, 0x1d,
+  0x6b, 0x9a, 0xd0, 0x1c, 0x6b, 0x9a, 0xd0, 0x1c,
+  0x6b, 0x9a, 0xd0, 0x1c, 0x6b, 0x9a, 0xd0, 0x1c,
+  0x6b, 0x9a, 0xd0, 0x1c, 0x6b, 0x9a, 0xd0, 0x1c,
+  0x6b, 0x9a, 0xd0, 0x1c, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x69, 0x96, 0xd1, 0x1d, 0x69, 0x96, 0xd1, 0x1d,
+  0x55, 0x71, 0xa2, 0x24, 0x41, 0x5e, 0x82, 0x2b,
+  0x38, 0x4c, 0x70, 0x32, 0x32, 0x44, 0x5f, 0x38,
+  0x27, 0x37, 0x4f, 0x40, 0xa3, 0x53, 0x09, 0xbf,
+  0xde, 0x89, 0x37, 0xfe, 0xef, 0x9b, 0x4a, 0xff,
+  0xd1, 0x7c, 0x29, 0xfa, 0xb0, 0x59, 0x05, 0xf1,
+  0x5d, 0x3c, 0x21, 0x72, 0x22, 0x2f, 0x40, 0x4b,
+  0x28, 0x36, 0x48, 0x46, 0x2b, 0x3b, 0x4f, 0x40,
+  0x32, 0x48, 0x5f, 0x38, 0x3d, 0x51, 0x70, 0x32,
+  0x47, 0x64, 0x88, 0x2b, 0x61, 0x87, 0xb4, 0x22,
+  0x6c, 0x99, 0xcc, 0x1e, 0x6c, 0x99, 0xcc, 0x1e,
+  0x6c, 0x99, 0xcc, 0x1e, 0x6c, 0x99, 0xcc, 0x1e,
+  0x6c, 0x99, 0xcc, 0x1e, 0x6c, 0x99, 0xcc, 0x1e,
+  0x6c, 0x99, 0xcc, 0x1e, 0x6c, 0x99, 0xcc, 0x1e,
+  0x6c, 0x99, 0xcc, 0x1e, 0x6c, 0x99, 0xcc, 0x1e,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x62, 0x89, 0xc4, 0x0d, 0x3f, 0x59, 0x7f, 0x14,
+  0x31, 0x44, 0x58, 0x1a, 0x29, 0x31, 0x4a, 0x1f,
+  0x23, 0x2a, 0x3f, 0x24, 0x18, 0x25, 0x37, 0x29,
+  0x17, 0x23, 0x35, 0x2b, 0x15, 0x25, 0x30, 0x2f,
+  0x15, 0x25, 0x2f, 0x30, 0x58, 0x3a, 0x1a, 0x4a,
+  0xb1, 0x5a, 0x04, 0xf3, 0x99, 0x51, 0x0b, 0x8d,
+  0x18, 0x2b, 0x3e, 0x29, 0x1a, 0x2e, 0x43, 0x26,
+  0x26, 0x36, 0x4d, 0x21, 0x31, 0x4e, 0x62, 0x1a,
+  0x46, 0x71, 0x9b, 0x12, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x71, 0x9c, 0xd5, 0x0d, 0x71, 0x9c, 0xd5, 0x0d,
+  0x71, 0x9c, 0xd5, 0x0d, 0x71, 0x9c, 0xd5, 0x0d,
+  0x71, 0x9c, 0xd5, 0x0d, 0x6d, 0x91, 0xc8, 0x0e,
+  0x48, 0x61, 0x85, 0x15, 0x38, 0x4b, 0x5e, 0x1b,
+  0x2f, 0x37, 0x4f, 0x20, 0x22, 0x30, 0x44, 0x25,
+  0x1f, 0x2b, 0x3e, 0x29, 0x1c, 0x28, 0x39, 0x2c,
+  0x1b, 0x25, 0x30, 0x2f, 0x1a, 0x25, 0x2f, 0x30,
+  0x1a, 0x25, 0x2f, 0x30, 0x1b, 0x25, 0x30, 0x2f,
+  0x1c, 0x28, 0x39, 0x2c, 0x1f, 0x2b, 0x3e, 0x29,
+  0x21, 0x2e, 0x43, 0x26, 0x2e, 0x36, 0x4d, 0x21,
+  0x3a, 0x4e, 0x62, 0x1a, 0x55, 0x71, 0x9b, 0x12,
+  0x71, 0x9c, 0xd5, 0x0d, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x6b, 0xa1, 0xc9, 0x0e,
+  0x6b, 0xa1, 0xc9, 0x0e, 0x66, 0x99, 0xbb, 0x0f,
+  0x45, 0x68, 0x7f, 0x16, 0x36, 0x48, 0x5b, 0x1c,
+  0x2e, 0x3d, 0x4d, 0x21, 0x27, 0x34, 0x47, 0x27,
+  0x23, 0x2f, 0x41, 0x2b, 0x21, 0x2c, 0x37, 0x2e,
+  0x1f, 0x29, 0x34, 0x31, 0x1e, 0x28, 0x33, 0x32,
+  0x1e, 0x28, 0x33, 0x32, 0x1f, 0x29, 0x34, 0x31,
+  0x21, 0x2c, 0x37, 0x2e, 0x6e, 0x45, 0x1e, 0x4c,
+  0x27, 0x34, 0x47, 0x27, 0x2b, 0x3a, 0x50, 0x23,
+  0x3f, 0x51, 0x64, 0x1c, 0x59, 0x72, 0x99, 0x14,
+  0x73, 0x99, 0xcc, 0x0f, 0x73, 0x99, 0xcc, 0x0f,
+  0x73, 0x99, 0xcc, 0x0f, 0x73, 0x99, 0xcc, 0x0f,
+  0x73, 0x99, 0xcc, 0x0f, 0x73, 0x99, 0xcc, 0x0f,
+  0x73, 0x99, 0xcc, 0x0f, 0x73, 0x99, 0xcc, 0x0f,
+  0x73, 0x99, 0xcc, 0x0f, 0x73, 0x99, 0xcc, 0x0f,
+  0x6d, 0x9e, 0xce, 0x10, 0x6d, 0x9e, 0xce, 0x10,
+  0x6d, 0x9e, 0xce, 0x10, 0x6d, 0x9e, 0xce, 0x10,
+  0x6d, 0x9e, 0xce, 0x10, 0x6d, 0x9e, 0xce, 0x10,
+  0x6d, 0x9e, 0xce, 0x10, 0x6d, 0x9e, 0xce, 0x10,
+  0x6d, 0x9e, 0xce, 0x10, 0x6d, 0x9e, 0xce, 0x10,
+  0x5d, 0x86, 0xae, 0x13, 0x44, 0x62, 0x75, 0x1a,
+  0x36, 0x45, 0x5c, 0x21, 0x27, 0x3a, 0x4e, 0x27,
+  0x46, 0x3c, 0x2e, 0x39, 0xb0, 0x57, 0x00, 0xf4,
+  0xb4, 0x5e, 0x09, 0xf8, 0xb0, 0x57, 0x01, 0xe8,
+  0x91, 0x4d, 0x09, 0x98, 0x3f, 0x2d, 0x22, 0x4b,
+  0x1a, 0x23, 0x30, 0x3a, 0x1c, 0x25, 0x33, 0x36,
+  0x1e, 0x28, 0x38, 0x32, 0x22, 0x2e, 0x3f, 0x2c,
+  0x28, 0x35, 0x50, 0x26, 0x37, 0x3f, 0x5f, 0x20,
+  0x4d, 0x63, 0x90, 0x17, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x68, 0x97, 0xd1, 0x10,
+  0x68, 0x97, 0xd1, 0x10, 0x6f, 0x9b, 0xd3, 0x11,
+  0x51, 0x73, 0xa2, 0x16, 0x3f, 0x5b, 0x76, 0x1c,
+  0x34, 0x43, 0x61, 0x22, 0x27, 0x3a, 0x55, 0x27,
+  0x22, 0x34, 0x45, 0x2c, 0x1f, 0x2e, 0x3e, 0x31,
+  0x1d, 0x2c, 0x3a, 0x34, 0x1b, 0x25, 0x37, 0x37,
+  0x1b, 0x24, 0x36, 0x38, 0x56, 0x38, 0x20, 0x51,
+  0xb0, 0x58, 0x02, 0xf4, 0x96, 0x51, 0x0c, 0x91,
+  0x20, 0x30, 0x41, 0x2f, 0x23, 0x35, 0x47, 0x2b,
+  0x28, 0x3c, 0x57, 0x26, 0x37, 0x47, 0x67, 0x20,
+  0x4d, 0x6e, 0x9b, 0x17, 0x6f, 0x9b, 0xd3, 0x11,
+  0x6f, 0x9b, 0xd3, 0x11, 0x6f, 0x9b, 0xd3, 0x11,
+  0x6f, 0x9b, 0xd3, 0x11, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x6a, 0x9f, 0xca, 0x12,
+  0x6a, 0x9f, 0xca, 0x12, 0x5d, 0x93, 0xbb, 0x13,
+  0x47, 0x70, 0x8e, 0x19, 0x37, 0x4f, 0x67, 0x20,
+  0x29, 0x44, 0x59, 0x25, 0x25, 0x3e, 0x50, 0x29,
+  0x21, 0x37, 0x42, 0x2e, 0x1f, 0x34, 0x3e, 0x31,
+  0x1e, 0x2d, 0x3c, 0x33, 0x1d, 0x2c, 0x3a, 0x34,
+  0x21, 0x2b, 0x3e, 0x35, 0x22, 0x2c, 0x3f, 0x34,
+  0x23, 0x33, 0x42, 0x32, 0x25, 0x36, 0x46, 0x2f,
+  0x29, 0x3b, 0x4d, 0x2b, 0x2e, 0x43, 0x5d, 0x26,
+  0x3f, 0x4f, 0x6f, 0x20, 0x55, 0x74, 0x9f, 0x18,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x70, 0x99, 0xcc, 0x13, 0x70, 0x99, 0xcc, 0x13,
+  0x6c, 0x9d, 0xce, 0x13, 0x6c, 0x9d, 0xce, 0x13,
+  0x6c, 0x9d, 0xce, 0x13, 0x6c, 0x9d, 0xce, 0x13,
+  0x6c, 0x9d, 0xce, 0x13, 0x66, 0x99, 0xbf, 0x14,
+  0x4e, 0x75, 0x93, 0x1a, 0x3d, 0x55, 0x6c, 0x21,
+  0x2e, 0x49, 0x5d, 0x26, 0x2a, 0x42, 0x55, 0x2a,
+  0x26, 0x3c, 0x48, 0x2e, 0x23, 0x33, 0x42, 0x32,
+  0x22, 0x31, 0x3f, 0x34, 0x21, 0x30, 0x3e, 0x35,
+  0x21, 0x30, 0x3e, 0x35, 0x22, 0x31, 0x3f, 0x34,
+  0x23, 0x33, 0x42, 0x32, 0x6c, 0x4a, 0x22, 0x50,
+  0x29, 0x41, 0x4d, 0x2b, 0x2e, 0x49, 0x5d, 0x26,
+  0x3f, 0x57, 0x6f, 0x20, 0x55, 0x7f, 0x9f, 0x18,
+  0x6c, 0x9d, 0xce, 0x13, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x68, 0x97, 0xd0, 0x14, 0x68, 0x97, 0xd0, 0x14,
+  0x58, 0x85, 0xb1, 0x17, 0x44, 0x5d, 0x7f, 0x1e,
+  0x30, 0x4b, 0x67, 0x25, 0x2e, 0x45, 0x56, 0x2c,
+  0x49, 0x40, 0x3b, 0x3c, 0xb0, 0x57, 0x00, 0xf4,
+  0xb4, 0x5e, 0x09, 0xf8, 0xb0, 0x58, 0x01, 0xe8,
+  0x90, 0x4e, 0x0c, 0x9a, 0x3e, 0x34, 0x29, 0x4e,
+  0x1c, 0x2d, 0x39, 0x3e, 0x22, 0x2f, 0x3c, 0x3b,
+  0x25, 0x33, 0x46, 0x36, 0x29, 0x39, 0x4e, 0x31,
+  0x2f, 0x47, 0x58, 0x2b, 0x37, 0x52, 0x6e, 0x25,
+  0x55, 0x7a, 0xa0, 0x1b, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6d, 0x9b, 0xd1, 0x15, 0x6d, 0x9b, 0xd1, 0x15,
+  0x6a, 0x9e, 0xd3, 0x15, 0x6a, 0x9e, 0xd3, 0x15,
+  0x80, 0x80, 0xbf, 0x03, 0x80, 0x80, 0xbf, 0x03,
+  0x80, 0x80, 0xbf, 0x03, 0x80, 0x80, 0xbf, 0x03,
+  0x80, 0x80, 0xbf, 0x03, 0x80, 0x80, 0xbf, 0x03,
+  0x80, 0x80, 0xbf, 0x03, 0x66, 0x99, 0xcc, 0x04,
+  0x66, 0x99, 0xcc, 0x04, 0x66, 0x99, 0xcc, 0x04,
+  0x66, 0x99, 0xcc, 0x04, 0x48, 0x48, 0x6d, 0x07,
+  0x2e, 0x2e, 0x45, 0x0b, 0x24, 0x24, 0x36, 0x0e,
+  0x1c, 0x1c, 0x2a, 0x12, 0x19, 0x19, 0x26, 0x14,
+  0x17, 0x17, 0x22, 0x16, 0x18, 0x18, 0x24, 0x15,
+  0x5e, 0x35, 0x15, 0x21, 0x1f, 0x1f, 0x2f, 0x10,
+  0x27, 0x27, 0x3a, 0x0d, 0x3f, 0x3f, 0x5f, 0x08,
+  0x66, 0x66, 0x99, 0x05, 0x66, 0x99, 0xcc, 0x04,
+  0x66, 0x99, 0xcc, 0x04, 0x66, 0x99, 0xcc, 0x04,
+  0x66, 0x99, 0xcc, 0x04, 0x66, 0x99, 0xcc, 0x04,
+  0x66, 0x99, 0xcc, 0x04, 0x66, 0x99, 0xcc, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x80, 0xaa, 0xd5, 0x04, 0x80, 0xaa, 0xd5, 0x04,
+  0x48, 0x6d, 0x6d, 0x07, 0x2e, 0x45, 0x45, 0x0b,
+  0x24, 0x36, 0x36, 0x0e, 0x1c, 0x2a, 0x2a, 0x12,
+  0x19, 0x26, 0x26, 0x14, 0x17, 0x22, 0x22, 0x16,
+  0x17, 0x22, 0x2e, 0x16, 0x19, 0x26, 0x33, 0x14,
+  0x1e, 0x2d, 0x3c, 0x11, 0x24, 0x36, 0x48, 0x0e,
+  0x38, 0x55, 0x71, 0x09, 0x55, 0x7f, 0xaa, 0x06,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x6d, 0x92, 0xdb, 0x05,
+  0x6d, 0x92, 0xdb, 0x05, 0x80, 0x9f, 0xbf, 0x06,
+  0x80, 0x9f, 0xbf, 0x06, 0x80, 0x9f, 0xbf, 0x06,
+  0x80, 0x9f, 0xbf, 0x06, 0x80, 0x9f, 0xbf, 0x06,
+  0x80, 0x9f, 0xbf, 0x06, 0x80, 0x9f, 0xbf, 0x06,
+  0x55, 0x71, 0x71, 0x09, 0x3a, 0x4e, 0x4e, 0x0d,
+  0x2f, 0x3f, 0x3f, 0x10, 0x26, 0x33, 0x33, 0x14,
+  0x22, 0x2e, 0x2e, 0x16, 0x1f, 0x2a, 0x2a, 0x18,
+  0x21, 0x2c, 0x2c, 0x17, 0x24, 0x30, 0x30, 0x15,
+  0x2a, 0x38, 0x38, 0x12, 0x33, 0x44, 0x44, 0x0f,
+  0x4c, 0x66, 0x66, 0x0a, 0x6d, 0x91, 0x91, 0x07,
+  0x80, 0x9f, 0xbf, 0x06, 0x80, 0x9f, 0xbf, 0x06,
+  0x80, 0x9f, 0xbf, 0x06, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x71, 0xaa, 0xc6, 0x07,
+  0x71, 0xaa, 0xc6, 0x07, 0x5f, 0x9f, 0x9f, 0x08,
+  0x33, 0x55, 0x55, 0x0f, 0x24, 0x3c, 0x3c, 0x15,
+  0x1d, 0x27, 0x3a, 0x1a, 0x19, 0x22, 0x2a, 0x1e,
+  0x16, 0x1e, 0x25, 0x22, 0x15, 0x1c, 0x23, 0x24,
+  0x14, 0x1b, 0x22, 0x25, 0x14, 0x1b, 0x22, 0x25,
+  0x15, 0x1c, 0x23, 0x24, 0x17, 0x1e, 0x26, 0x21,
+  0x19, 0x22, 0x2a, 0x1e, 0x1e, 0x28, 0x3d, 0x19,
+  0x28, 0x35, 0x50, 0x13, 0x45, 0x5c, 0x8b, 0x0b,
+  0x66, 0x99, 0xcc, 0x07, 0x66, 0x99, 0xcc, 0x07,
+  0x66, 0x99, 0xcc, 0x07, 0x66, 0x99, 0xcc, 0x07,
+  0x66, 0x99, 0xcc, 0x07, 0x66, 0x99, 0xcc, 0x07,
+  0x66, 0x99, 0xcc, 0x07, 0x66, 0x99, 0xcc, 0x07,
+  0x66, 0x99, 0xcc, 0x07, 0x66, 0x99, 0xcc, 0x07,
+  0x74, 0xa2, 0xd1, 0x08, 0x74, 0xa2, 0xd1, 0x08,
+  0x74, 0xa2, 0xd1, 0x08, 0x74, 0xa2, 0xd1, 0x08,
+  0x74, 0xa2, 0xd1, 0x08, 0x74, 0xa2, 0xd1, 0x08,
+  0x74, 0xa2, 0xd1, 0x08, 0x74, 0xa2, 0xd1, 0x08,
+  0x74, 0xa2, 0xd1, 0x08, 0x74, 0xa2, 0xd1, 0x08,
+  0x74, 0xa2, 0xd1, 0x08, 0x71, 0x8d, 0xc6, 0x09,
+  0x55, 0x6a, 0x94, 0x0c, 0x38, 0x46, 0x63, 0x12,
+  0x2c, 0x37, 0x4d, 0x17, 0x27, 0x31, 0x3a, 0x1a,
+  0x23, 0x2b, 0x34, 0x1d, 0x20, 0x29, 0x31, 0x1f,
+  0x1f, 0x27, 0x2f, 0x20, 0x1f, 0x27, 0x2f, 0x20,
+  0x51, 0x38, 0x20, 0x2c, 0x24, 0x2d, 0x36, 0x1c,
+  0x28, 0x33, 0x47, 0x19, 0x33, 0x3f, 0x66, 0x14,
+  0x48, 0x5b, 0x91, 0x0e, 0x66, 0x7f, 0xcc, 0x0a,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x6a, 0x95, 0xd5, 0x09, 0x6a, 0x95, 0xd5, 0x09,
+  0x76, 0x9d, 0xd8, 0x0a, 0x76, 0x9d, 0xd8, 0x0a,
+  0x62, 0x75, 0x9c, 0x0d, 0x4b, 0x5a, 0x78, 0x11,
+  0x3f, 0x4c, 0x66, 0x14, 0x37, 0x42, 0x58, 0x17,
+  0x33, 0x3d, 0x47, 0x19, 0x2f, 0x38, 0x42, 0x1b,
+  0x31, 0x3a, 0x44, 0x1a, 0x35, 0x3f, 0x55, 0x18,
+  0x39, 0x45, 0x5c, 0x16, 0x43, 0x50, 0x6b, 0x13,
+  0x5b, 0x6d, 0x91, 0x0e, 0x73, 0x8b, 0xb9, 0x0b,
+  0x76, 0x9d, 0xd8, 0x0a, 0x76, 0x9d, 0xd8, 0x0a,
+  0x76, 0x9d, 0xd8, 0x0a, 0x76, 0x9d, 0xd8, 0x0a,
+  0x76, 0x9d, 0xd8, 0x0a, 0x76, 0x9d, 0xd8, 0x0a,
+  0x76, 0x9d, 0xd8, 0x0a, 0x76, 0x9d, 0xd8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x6d, 0xa4, 0xc8, 0x0a, 0x6d, 0xa4, 0xc8, 0x0a,
+  0x4e, 0x75, 0x9c, 0x0d, 0x3f, 0x5f, 0x7f, 0x10,
+  0x33, 0x4c, 0x66, 0x14, 0x2e, 0x45, 0x5c, 0x16,
+  0x28, 0x3d, 0x47, 0x19, 0x25, 0x38, 0x42, 0x1b,
+  0x27, 0x3a, 0x44, 0x1a, 0x33, 0x47, 0x51, 0x19,
+  0x39, 0x51, 0x68, 0x16, 0x3f, 0x59, 0x72, 0x14,
+  0x4f, 0x6f, 0x8f, 0x10, 0x6a, 0x94, 0xbf, 0x0c,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x66, 0x99, 0xcc, 0x0b,
+  0x66, 0x99, 0xcc, 0x0b, 0x70, 0x9f, 0xcf, 0x0c,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x70, 0x9f, 0xcf, 0x0c, 0x62, 0x89, 0xc4, 0x0d,
+  0x3f, 0x59, 0x7f, 0x14, 0x33, 0x47, 0x5b, 0x19,
+  0x29, 0x31, 0x4a, 0x1f, 0x24, 0x2b, 0x41, 0x23,
+  0x1a, 0x27, 0x3a, 0x27, 0x18, 0x25, 0x37, 0x29,
+  0x18, 0x24, 0x36, 0x2a, 0x18, 0x24, 0x36, 0x2a,
+  0x18, 0x25, 0x37, 0x29, 0x1a, 0x28, 0x3c, 0x26,
+  0x24, 0x2b, 0x41, 0x23, 0x2a, 0x33, 0x4c, 0x1e,
+  0x37, 0x4d, 0x6e, 0x17, 0x4f, 0x6f, 0x9f, 0x10,
+  0x70, 0x9f, 0xcf, 0x0c, 0x70, 0x9f, 0xcf, 0x0c,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x69, 0x96, 0xd2, 0x0d, 0x69, 0x96, 0xd2, 0x0d,
+  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29,
+  0x6c, 0x65, 0x62, 0x6c, 0x2d, 0x64, 0x69, 0x61,
+  0x6c, 0x6f, 0x67, 0x2f, 0x02, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
+} };
+
+static GStaticResource static_resource = { lebl_dialog_resource_data.data, sizeof (lebl_dialog_resource_data.data), NULL, NULL, NULL };
+extern GResource *lebl_dialog_get_resource (void);
+GResource *lebl_dialog_get_resource (void)
+{
+  return g_static_resource_get_resource (&static_resource);
+}
+/*
+  If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
+  destructors, in a sane way, including e.g. on library unload. If not you're on
+  your own.
+
+  Some compilers need #pragma to handle this, which does not work with macros,
+  so the way you need to use this is (for constructors):
+
+  #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+  #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
+  #endif
+  G_DEFINE_CONSTRUCTOR(my_constructor)
+  static void my_constructor(void) {
+   ...
+  }
+
+*/
+
+#ifndef __GTK_DOC_IGNORE__
+
+#if  __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
+#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
+
+#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
+/* Visual studio 2008 and later has _Pragma */
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* We do some weird things to avoid the constructors being optimized
+ * away on VS2015 if WholeProgramOptimization is enabled. First we
+ * make a reference to the array from the wrapper to make sure its
+ * references. Then we use a pragma to make sure the wrapper function
+ * symbol is always included at the link stage. Also, the symbols
+ * need to be extern (but not dllexport), even though they are not
+ * really used from another object file.
+ */
+
+/* We need to account for differences between the mangling of symbols
+ * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
+ * with an underscore but symbols on x64 are not.
+ */
+#ifdef _WIN64
+#define G_MSVC_SYMBOL_PREFIX ""
+#else
+#define G_MSVC_SYMBOL_PREFIX "_"
+#endif
+
+#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
+#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
+
+#define G_MSVC_CTOR(_func,_sym_prefix) \
+  static void _func(void); \
+  extern int (* _array ## _func)(void);              \
+  int _func ## _wrapper(void) { _func(); g_slist_find (NULL,  _array ## _func); return 0; } \
+  __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
+
+#define G_MSVC_DTOR(_func,_sym_prefix) \
+  static void _func(void); \
+  extern int (* _array ## _func)(void);              \
+  int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL,  _array ## _func); return 0; } \
+   __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined (_MSC_VER)
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* Pre Visual studio 2008 must use #pragma section */
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined(__SUNPRO_C)
+
+/* This is not tested, but i believe it should work, based on:
+ * https://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
+ */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  init(_func)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void);
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  fini(_func)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void);
+
+#else
+
+/* constructors not supported for this compiler */
+
+#endif
+
+#endif /* __GTK_DOC_IGNORE__ */
+
+#ifdef G_HAS_CONSTRUCTORS
+
+#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor)
+#endif
+G_DEFINE_CONSTRUCTOR(resource_constructor)
+#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor)
+#endif
+G_DEFINE_DESTRUCTOR(resource_destructor)
+
+#else
+#warning "Constructor not supported on this compiler, linking in resources will not work"
+#endif
+
+static void resource_constructor (void)
+{
+  g_static_resource_init (&static_resource);
+}
+
+static void resource_destructor (void)
+{
+  g_static_resource_fini (&static_resource);
+}
diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c
new file mode 100644
index 0000000..be1a438
--- /dev/null
+++ b/app/dialogs/module-dialog.c
@@ -0,0 +1,526 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * module-dialog.c
+ * (C) 1999 Austin Donnelly <austin@gimp.org>
+ * (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmodule/gimpmodule.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-modules.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "module-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_REFRESH  1
+
+enum
+{
+  COLUMN_NAME,
+  COLUMN_ENABLED,
+  COLUMN_MODULE,
+  N_COLUMNS
+};
+
+enum
+{
+  INFO_AUTHOR,
+  INFO_VERSION,
+  INFO_DATE,
+  INFO_COPYRIGHT,
+  INFO_LOCATION,
+  N_INFOS
+};
+
+typedef struct _ModuleDialog ModuleDialog;
+
+struct _ModuleDialog
+{
+  Gimp         *gimp;
+
+  GimpModule   *selected;
+  GtkListStore *list;
+
+  GtkWidget    *hint;
+  GtkWidget    *table;
+  GtkWidget    *label[N_INFOS];
+  GtkWidget    *error_box;
+  GtkWidget    *error_label;
+};
+
+
+/*  local function prototypes  */
+
+static void   dialog_response         (GtkWidget             *widget,
+                                       gint                   response_id,
+                                       ModuleDialog          *private);
+static void   dialog_destroy_callback (GtkWidget             *widget,
+                                       ModuleDialog          *private);
+static void   dialog_select_callback  (GtkTreeSelection      *sel,
+                                       ModuleDialog          *private);
+static void   dialog_enabled_toggled  (GtkCellRendererToggle *celltoggle,
+                                       const gchar           *path_string,
+                                       ModuleDialog          *private);
+static void   make_list_item          (gpointer               data,
+                                       gpointer               user_data);
+static void   dialog_info_add         (GimpModuleDB          *db,
+                                       GimpModule            *module,
+                                       ModuleDialog          *private);
+static void   dialog_info_remove      (GimpModuleDB          *db,
+                                       GimpModule            *module,
+                                       ModuleDialog          *private);
+static void   dialog_info_update      (GimpModuleDB          *db,
+                                       GimpModule            *module,
+                                       ModuleDialog          *private);
+static void   dialog_info_init        (ModuleDialog          *private,
+                                       GtkWidget             *table);
+
+
+/*  public functions  */
+
+GtkWidget *
+module_dialog_new (Gimp *gimp)
+{
+  ModuleDialog      *private;
+  GtkWidget         *dialog;
+  GtkWidget         *vbox;
+  GtkWidget         *sw;
+  GtkWidget         *view;
+  GtkWidget         *image;
+  GtkTreeSelection  *sel;
+  GtkTreeIter        iter;
+  GtkTreeViewColumn *col;
+  GtkCellRenderer   *rend;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  private = g_slice_new0 (ModuleDialog);
+
+  private->gimp = gimp;
+
+  dialog = gimp_dialog_new (_("Module Manager"),
+                            "gimp-modules", NULL, 0,
+                            gimp_standard_help_func, GIMP_HELP_MODULE_DIALOG,
+
+                            _("_Refresh"), RESPONSE_REFRESH,
+                            _("_Close"),   GTK_RESPONSE_CLOSE,
+
+                            NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_CLOSE,
+                                           RESPONSE_REFRESH,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (dialog_response),
+                    private);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  private->hint = gimp_hint_box_new (_("You will have to restart GIMP "
+                                       "for the changes to take effect."));
+  gtk_box_pack_start (GTK_BOX (vbox), private->hint, FALSE, FALSE, 0);
+
+  if (gimp->write_modulerc)
+    gtk_widget_show (private->hint);
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+  gtk_widget_set_size_request (sw, 124, 100);
+  gtk_widget_show (sw);
+
+  private->list = gtk_list_store_new (N_COLUMNS,
+                                      G_TYPE_STRING,
+                                      G_TYPE_BOOLEAN,
+                                      GIMP_TYPE_MODULE);
+  view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (private->list));
+  g_object_unref (private->list);
+
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE);
+
+  g_list_foreach (gimp->module_db->modules, make_list_item, private);
+
+  rend = gtk_cell_renderer_toggle_new ();
+
+  g_signal_connect (rend, "toggled",
+                    G_CALLBACK (dialog_enabled_toggled),
+                    private);
+
+  col = gtk_tree_view_column_new ();
+  gtk_tree_view_column_pack_start (col, rend, FALSE);
+  gtk_tree_view_column_add_attribute (col, rend, "active", COLUMN_ENABLED);
+
+  gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 1,
+                                               _("Module"),
+                                               gtk_cell_renderer_text_new (),
+                                               "text", COLUMN_NAME,
+                                               NULL);
+
+  gtk_container_add (GTK_CONTAINER (sw), view);
+  gtk_widget_show (view);
+
+  private->table = gtk_table_new (2, N_INFOS, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (private->table), 6);
+  gtk_box_pack_start (GTK_BOX (vbox), private->table, FALSE, FALSE, 0);
+  gtk_widget_show (private->table);
+
+  private->error_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), private->error_box, FALSE, FALSE, 0);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_WARNING,
+                                        GTK_ICON_SIZE_BUTTON);
+  gtk_box_pack_start (GTK_BOX (private->error_box), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  private->error_label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (private->error_label), 0.0);
+  gtk_box_pack_start (GTK_BOX (private->error_box),
+                      private->error_label, TRUE, TRUE, 0);
+  gtk_widget_show (private->error_label);
+
+  dialog_info_init (private, private->table);
+
+  dialog_info_update (gimp->module_db, private->selected, private);
+
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+  g_signal_connect (sel, "changed",
+                    G_CALLBACK (dialog_select_callback),
+                    private);
+
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (private->list), &iter))
+    gtk_tree_selection_select_iter (sel, &iter);
+
+  /* hook the GimpModuleDB signals so we can refresh the display
+   * appropriately.
+   */
+  g_signal_connect (gimp->module_db, "add",
+                    G_CALLBACK (dialog_info_add),
+                    private);
+  g_signal_connect (gimp->module_db, "remove",
+                    G_CALLBACK (dialog_info_remove),
+                    private);
+  g_signal_connect (gimp->module_db, "module-modified",
+                    G_CALLBACK (dialog_info_update),
+                    private);
+
+  g_signal_connect (dialog, "destroy",
+                    G_CALLBACK (dialog_destroy_callback),
+                    private);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+dialog_response (GtkWidget    *widget,
+                 gint          response_id,
+                 ModuleDialog *private)
+{
+  if (response_id == RESPONSE_REFRESH)
+    gimp_modules_refresh (private->gimp);
+  else
+    gtk_widget_destroy (widget);
+}
+
+static void
+dialog_destroy_callback (GtkWidget    *widget,
+                         ModuleDialog *private)
+{
+  g_signal_handlers_disconnect_by_func (private->gimp->module_db,
+                                        dialog_info_add,
+                                        private);
+  g_signal_handlers_disconnect_by_func (private->gimp->module_db,
+                                        dialog_info_remove,
+                                        private);
+  g_signal_handlers_disconnect_by_func (private->gimp->module_db,
+                                        dialog_info_update,
+                                        private);
+
+  g_slice_free (ModuleDialog, private);
+}
+
+static void
+dialog_select_callback (GtkTreeSelection *sel,
+                        ModuleDialog     *private)
+{
+  GtkTreeIter iter;
+
+  if (gtk_tree_selection_get_selected (sel, NULL, &iter))
+    {
+      GimpModule *module;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->list), &iter,
+                          COLUMN_MODULE, &module, -1);
+
+      if (module)
+        g_object_unref (module);
+
+      if (private->selected == module)
+        return;
+
+      private->selected = module;
+
+      dialog_info_update (private->gimp->module_db, private->selected, private);
+    }
+}
+
+static void
+dialog_enabled_toggled (GtkCellRendererToggle *celltoggle,
+                        const gchar           *path_string,
+                        ModuleDialog          *private)
+{
+  GtkTreePath *path;
+  GtkTreeIter  iter;
+  GimpModule  *module = NULL;
+
+  path = gtk_tree_path_new_from_string (path_string);
+
+  if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (private->list), &iter, path))
+    {
+      g_warning ("%s: bad tree path?", G_STRFUNC);
+      return;
+    }
+
+  gtk_tree_path_free (path);
+
+  gtk_tree_model_get (GTK_TREE_MODEL (private->list), &iter,
+                      COLUMN_MODULE, &module,
+                      -1);
+
+  if (module)
+    {
+      gimp_module_set_load_inhibit (module, ! module->load_inhibit);
+      g_object_unref (module);
+
+      private->gimp->write_modulerc = TRUE;
+      gtk_widget_show (private->hint);
+   }
+}
+
+static void
+dialog_list_item_update (ModuleDialog *private,
+                         GtkTreeIter  *iter,
+                         GimpModule   *module)
+{
+  gtk_list_store_set (private->list, iter,
+                      COLUMN_NAME,   (module->info ?
+                                      gettext (module->info->purpose) :
+                                      gimp_filename_to_utf8 (module->filename)),
+                      COLUMN_ENABLED, ! module->load_inhibit,
+                      COLUMN_MODULE,  module,
+                      -1);
+}
+
+static void
+make_list_item (gpointer data,
+                gpointer user_data)
+{
+  GimpModule   *module = data;
+  ModuleDialog *private = user_data;
+  GtkTreeIter   iter;
+
+  if (! private->selected)
+    private->selected = module;
+
+  gtk_list_store_append (private->list, &iter);
+
+  dialog_list_item_update (private, &iter, module);
+}
+
+static void
+dialog_info_add (GimpModuleDB *db,
+                 GimpModule   *module,
+                 ModuleDialog *private)
+{
+  make_list_item (module, private);
+}
+
+static void
+dialog_info_remove (GimpModuleDB *db,
+                    GimpModule   *module,
+                    ModuleDialog *private)
+{
+  GtkTreeIter  iter;
+
+  /* FIXME: Use gtk_list_store_foreach_remove when it becomes available */
+
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (private->list), &iter))
+    return;
+
+  do
+    {
+      GimpModule  *this;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->list), &iter,
+                          COLUMN_MODULE, &this,
+                          -1);
+
+      if (this)
+        g_object_unref (this);
+
+      if (this == module)
+        {
+          gtk_list_store_remove (private->list, &iter);
+          return;
+        }
+    }
+  while (gtk_tree_model_iter_next (GTK_TREE_MODEL (private->list), &iter));
+
+  g_warning ("%s: Tried to remove a module not in the dialog's list.",
+             G_STRFUNC);
+}
+
+static void
+dialog_info_update (GimpModuleDB *db,
+                    GimpModule   *module,
+                    ModuleDialog *private)
+{
+  GtkTreeModel *model         = GTK_TREE_MODEL (private->list);
+  GtkTreeIter   iter;
+  const gchar  *text[N_INFOS] = { NULL, };
+  gchar        *location      = NULL;
+  gboolean      iter_valid;
+  gint          i;
+  gboolean      show_error;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      GimpModule *this;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_MODULE, &this,
+                          -1);
+      if (this)
+        g_object_unref (this);
+
+      if (this == module)
+        break;
+    }
+
+  if (iter_valid)
+    dialog_list_item_update (private, &iter, module);
+
+  /* only update the info if we're actually showing it */
+  if (module != private->selected)
+    return;
+
+  if (! module)
+    {
+      for (i = 0; i < N_INFOS; i++)
+        gtk_label_set_text (GTK_LABEL (private->label[i]), NULL);
+
+      gtk_label_set_text (GTK_LABEL (private->error_label), NULL);
+      gtk_widget_hide (private->error_box);
+
+      return;
+    }
+
+  if (module->on_disk)
+    location = g_filename_display_name (module->filename);
+
+  if (module->info)
+    {
+      text[INFO_AUTHOR]    = module->info->author;
+      text[INFO_VERSION]   = module->info->version;
+      text[INFO_DATE]      = module->info->date;
+      text[INFO_COPYRIGHT] = module->info->copyright;
+      text[INFO_LOCATION]  = module->on_disk ? location : _("Only in memory");
+    }
+  else
+    {
+      text[INFO_LOCATION]  = (module->on_disk ?
+                              location : _("No longer available"));
+    }
+
+  for (i = 0; i < N_INFOS; i++)
+    gtk_label_set_text (GTK_LABEL (private->label[i]),
+                        text[i] ? text[i] : "--");
+  g_free (location);
+
+  /* Show errors */
+  show_error = (module->state == GIMP_MODULE_STATE_ERROR &&
+                module->last_module_error);
+  gtk_label_set_text (GTK_LABEL (private->error_label),
+                      show_error ? module->last_module_error : NULL);
+  gtk_widget_set_visible (private->error_box, show_error);
+}
+
+static void
+dialog_info_init (ModuleDialog *private,
+                  GtkWidget    *table)
+{
+  GtkWidget *label;
+  gint       i;
+
+  const gchar * const text[] =
+  {
+    N_("Author:"),
+    N_("Version:"),
+    N_("Date:"),
+    N_("Copyright:"),
+    N_("Location:")
+  };
+
+  for (i = 0; i < G_N_ELEMENTS (text); i++)
+    {
+      label = gtk_label_new (gettext (text[i]));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i + 1,
+                        GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 2);
+      gtk_widget_show (label);
+
+      private->label[i] = gtk_label_new ("");
+      gtk_label_set_xalign (GTK_LABEL (private->label[i]), 0.0);
+      gtk_label_set_ellipsize (GTK_LABEL (private->label[i]),
+                               PANGO_ELLIPSIZE_END);
+      gtk_table_attach (GTK_TABLE (private->table), private->label[i],
+                        1, 2, i, i + 1,
+                        GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 2);
+      gtk_widget_show (private->label[i]);
+    }
+}
diff --git a/app/dialogs/module-dialog.h b/app/dialogs/module-dialog.h
new file mode 100644
index 0000000..17aaef0
--- /dev/null
+++ b/app/dialogs/module-dialog.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * module-dialog.h
+ * (C) 1999 Austin Donnelly <austin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MODULE_DIALOG_H__
+
+
+GtkWidget * module_dialog_new (Gimp *gimp);
+
+
+#endif  /* __MODULE_DIALOG_H__ */
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
new file mode 100644
index 0000000..d922c2f
--- /dev/null
+++ b/app/dialogs/palette-import-dialog.c
@@ -0,0 +1,886 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimppalette.h"
+#include "core/gimppalette-import.h"
+
+#include "widgets/gimpcontainercombobox.h"
+#include "widgets/gimpdnd.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpview.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "palette-import-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  GRADIENT_IMPORT,
+  IMAGE_IMPORT,
+  FILE_IMPORT
+} ImportType;
+
+
+typedef struct _ImportDialog ImportDialog;
+
+struct _ImportDialog
+{
+  GtkWidget     *dialog;
+
+  ImportType     import_type;
+  GimpContext   *context;
+  GimpImage     *image;
+
+  GimpPalette   *palette;
+
+  GtkWidget     *gradient_radio;
+  GtkWidget     *image_radio;
+  GtkWidget     *file_radio;
+
+  GtkWidget     *gradient_combo;
+  GtkWidget     *image_combo;
+  GtkWidget     *file_chooser;
+
+  GtkWidget     *sample_merged_toggle;
+  GtkWidget     *selection_only_toggle;
+
+  GtkWidget     *entry;
+  GtkAdjustment *num_colors;
+  GtkAdjustment *columns;
+  GtkAdjustment *threshold;
+
+  GtkWidget     *preview;
+  GtkWidget     *no_colors_label;
+};
+
+
+static void   palette_import_free                 (ImportDialog   *private);
+static void   palette_import_response             (GtkWidget      *dialog,
+                                                   gint            response_id,
+                                                   ImportDialog   *private);
+static void   palette_import_gradient_changed     (GimpContext    *context,
+                                                   GimpGradient   *gradient,
+                                                   ImportDialog   *private);
+static void   palette_import_image_changed        (GimpContext    *context,
+                                                   GimpImage      *image,
+                                                   ImportDialog   *private);
+static void   palette_import_layer_changed        (GimpImage      *image,
+                                                   ImportDialog   *private);
+static void   palette_import_mask_changed         (GimpImage      *image,
+                                                   ImportDialog   *private);
+static void   palette_import_filename_changed     (GtkFileChooser *button,
+                                                   ImportDialog   *private);
+static void   import_dialog_drop_callback         (GtkWidget      *widget,
+                                                   gint            x,
+                                                   gint            y,
+                                                   GimpViewable   *viewable,
+                                                   gpointer        data);
+static void   palette_import_grad_callback        (GtkWidget      *widget,
+                                                   ImportDialog   *private);
+static void   palette_import_image_callback       (GtkWidget      *widget,
+                                                   ImportDialog   *private);
+static void   palette_import_file_callback        (GtkWidget      *widget,
+                                                   ImportDialog   *private);
+static void   palette_import_columns_changed      (GtkAdjustment  *adjustment,
+                                                   ImportDialog   *private);
+static void   palette_import_image_add            (GimpContainer  *container,
+                                                   GimpImage      *image,
+                                                   ImportDialog   *private);
+static void   palette_import_image_remove         (GimpContainer  *container,
+                                                   GimpImage      *image,
+                                                   ImportDialog   *private);
+static void   palette_import_make_palette         (ImportDialog   *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+palette_import_dialog_new (GimpContext *context)
+{
+  ImportDialog *private;
+  GimpGradient *gradient;
+  GtkWidget    *dialog;
+  GtkWidget    *main_hbox;
+  GtkWidget    *frame;
+  GtkWidget    *vbox;
+  GtkWidget    *table;
+  GtkWidget    *abox;
+  GtkSizeGroup *size_group;
+  GSList       *group = NULL;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  gradient = gimp_context_get_gradient (context);
+
+  private = g_slice_new0 (ImportDialog);
+
+  private->import_type = GRADIENT_IMPORT;
+  private->context     = gimp_context_new (context->gimp, "Palette Import",
+                                          context);
+
+  dialog = private->dialog =
+    gimp_dialog_new (_("Import a New Palette"),
+                     "gimp-palette-import", NULL, 0,
+                     gimp_standard_help_func,
+                     GIMP_HELP_PALETTE_IMPORT,
+
+                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                     _("_Import"), GTK_RESPONSE_OK,
+
+                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) palette_import_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (palette_import_response),
+                    private);
+
+  gimp_dnd_viewable_dest_add (dialog,
+                              GIMP_TYPE_GRADIENT,
+                              import_dialog_drop_callback,
+                              private);
+  gimp_dnd_viewable_dest_add (dialog,
+                              GIMP_TYPE_IMAGE,
+                              import_dialog_drop_callback,
+                              private);
+
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_hbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_hbox);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+
+  /*  The "Source" frame  */
+
+  frame = gimp_frame_new (_("Select Source"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (5, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  private->gradient_radio =
+    gtk_radio_button_new_with_mnemonic (group, _("_Gradient"));
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (private->gradient_radio));
+  gtk_table_attach (GTK_TABLE (table), private->gradient_radio,
+                    0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (private->gradient_radio);
+
+  g_signal_connect (private->gradient_radio, "toggled",
+                    G_CALLBACK (palette_import_grad_callback),
+                    private);
+
+  private->image_radio =
+    gtk_radio_button_new_with_mnemonic (group, _("I_mage"));
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (private->image_radio));
+  gtk_table_attach (GTK_TABLE (table), private->image_radio,
+                    0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (private->image_radio);
+
+  g_signal_connect (private->image_radio, "toggled",
+                    G_CALLBACK (palette_import_image_callback),
+                    private);
+
+  gtk_widget_set_sensitive (private->image_radio,
+                            ! gimp_container_is_empty (context->gimp->images));
+
+  private->sample_merged_toggle =
+    gtk_check_button_new_with_mnemonic (_("Sample _Merged"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->sample_merged_toggle),
+                                TRUE);
+  gtk_table_attach (GTK_TABLE (table), private->sample_merged_toggle,
+                    1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (private->sample_merged_toggle);
+
+  g_signal_connect_swapped (private->sample_merged_toggle, "toggled",
+                            G_CALLBACK (palette_import_make_palette),
+                            private);
+
+  private->selection_only_toggle =
+    gtk_check_button_new_with_mnemonic (_("_Selected Pixels only"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->selection_only_toggle),
+                                FALSE);
+  gtk_table_attach (GTK_TABLE (table), private->selection_only_toggle,
+                    1, 2, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (private->selection_only_toggle);
+
+  g_signal_connect_swapped (private->selection_only_toggle, "toggled",
+                            G_CALLBACK (palette_import_make_palette),
+                            private);
+
+  private->file_radio =
+    gtk_radio_button_new_with_mnemonic (group, _("Palette _file"));
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (private->image_radio));
+  gtk_table_attach (GTK_TABLE (table), private->file_radio,
+                    0, 1, 4, 5, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (private->file_radio);
+
+  g_signal_connect (private->file_radio, "toggled",
+                    G_CALLBACK (palette_import_file_callback),
+                    private);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+
+  /*  The gradient menu  */
+  private->gradient_combo =
+    gimp_container_combo_box_new (gimp_data_factory_get_container (context->gimp->gradient_factory),
+                                  private->context, 24, 1);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             NULL, 0.0, 0.5, private->gradient_combo, 1, FALSE);
+  gtk_size_group_add_widget (size_group, private->gradient_combo);
+
+  /*  The image menu  */
+  private->image_combo =
+    gimp_container_combo_box_new (context->gimp->images, private->context,
+                                  24, 1);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             NULL, 0.0, 0.5, private->image_combo, 1, FALSE);
+  gtk_size_group_add_widget (size_group, private->image_combo);
+
+  /*  Palette file name entry  */
+  private->file_chooser = gtk_file_chooser_button_new (_("Select Palette File"),
+                                                      GTK_FILE_CHOOSER_ACTION_OPEN);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
+                             NULL, 0.0, 0.5, private->file_chooser, 1, FALSE);
+  gtk_size_group_add_widget (size_group, private->file_chooser);
+
+  g_object_unref (size_group);
+
+
+  /*  The "Import" frame  */
+
+  frame = gimp_frame_new (_("Import Options"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (4, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  /*  The source's name  */
+  private->entry = gtk_entry_new ();
+  gtk_entry_set_text (GTK_ENTRY (private->entry),
+                      gradient ?
+                      gimp_object_get_name (gradient) : _("New import"));
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("Palette _name:"), 0.0, 0.5,
+                             private->entry, 2, FALSE);
+
+  /*  The # of colors  */
+  private->num_colors =
+    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
+                                          _("N_umber of colors:"), -1, 5,
+                                          256, 2, 10000, 1, 10, 0,
+                                          TRUE, 0.0, 0.0,
+                                          NULL, NULL));
+  gimp_scale_entry_set_logarithmic (GTK_OBJECT (private->num_colors), TRUE);
+
+  g_signal_connect_swapped (private->num_colors,
+                            "value-changed",
+                            G_CALLBACK (palette_import_make_palette),
+                            private);
+
+  /*  The columns  */
+  private->columns =
+    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
+                                          _("C_olumns:"), -1, 5,
+                                          16, 0, 64, 1, 8, 0,
+                                          TRUE, 0.0, 0.0,
+                                          NULL, NULL));
+
+  g_signal_connect (private->columns, "value-changed",
+                    G_CALLBACK (palette_import_columns_changed),
+                    private);
+
+  /*  The interval  */
+  private->threshold =
+    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
+                                          _("I_nterval:"), -1, 5,
+                                          1, 1, 128, 1, 8, 0,
+                                          TRUE, 0.0, 0.0,
+                                          NULL, NULL));
+
+  g_signal_connect_swapped (private->threshold, "value-changed",
+                            G_CALLBACK (palette_import_make_palette),
+                            private);
+
+
+  /*  The "Preview" frame  */
+  frame = gimp_frame_new (_("Preview"));
+  gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  abox = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), abox, FALSE, FALSE, 0);
+  gtk_widget_show (abox);
+
+  private->preview = gimp_view_new_full_by_types (private->context,
+                                                 GIMP_TYPE_VIEW,
+                                                 GIMP_TYPE_PALETTE,
+                                                 192, 192, 1,
+                                                 TRUE, FALSE, FALSE);
+  gtk_container_add (GTK_CONTAINER (abox), private->preview);
+  gtk_widget_show (private->preview);
+
+  private->no_colors_label =
+    gtk_label_new (_("The selected source contains no colors."));
+  gtk_widget_set_size_request (private->no_colors_label, 194, -1);
+  gtk_label_set_line_wrap (GTK_LABEL (private->no_colors_label), TRUE);
+  gimp_label_set_attributes (GTK_LABEL (private->no_colors_label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), private->no_colors_label, FALSE, FALSE, 0);
+  gtk_widget_show (private->no_colors_label);
+
+
+  /*  keep the dialog up-to-date  */
+
+  g_signal_connect (context->gimp->images, "add",
+                    G_CALLBACK (palette_import_image_add),
+                    private);
+  g_signal_connect (context->gimp->images, "remove",
+                    G_CALLBACK (palette_import_image_remove),
+                    private);
+
+  g_signal_connect (private->context, "gradient-changed",
+                    G_CALLBACK (palette_import_gradient_changed),
+                    private);
+  g_signal_connect (private->context, "image-changed",
+                    G_CALLBACK (palette_import_image_changed),
+                    private);
+  g_signal_connect (private->file_chooser, "selection-changed",
+                    G_CALLBACK (palette_import_filename_changed),
+                    private);
+
+  palette_import_grad_callback (private->gradient_radio, private);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+palette_import_free (ImportDialog *private)
+{
+  Gimp *gimp = private->context->gimp;
+
+  g_signal_handlers_disconnect_by_func (gimp->images,
+                                        palette_import_image_add,
+                                        private);
+  g_signal_handlers_disconnect_by_func (gimp->images,
+                                        palette_import_image_remove,
+                                        private);
+
+  if (private->palette)
+    g_object_unref (private->palette);
+
+  g_object_unref (private->context);
+
+  g_slice_free (ImportDialog, private);
+}
+
+
+/*  the palette import response callback  ************************************/
+
+static void
+palette_import_response (GtkWidget    *dialog,
+                         gint          response_id,
+                         ImportDialog *private)
+{
+  palette_import_image_changed (private->context, NULL, private);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      Gimp *gimp = private->context->gimp;
+
+      if (private->palette &&
+          gimp_palette_get_n_colors (private->palette) > 0)
+        {
+          const gchar *name = gtk_entry_get_text (GTK_ENTRY (private->entry));
+
+          if (name && *name)
+            gimp_object_set_name (GIMP_OBJECT (private->palette), name);
+
+          gimp_container_add (gimp_data_factory_get_container (gimp->palette_factory),
+                              GIMP_OBJECT (private->palette));
+        }
+      else
+        {
+          gimp_message_literal (gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+                                _("There is no palette to import."));
+          return;
+        }
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+
+/*  functions to create & update the import dialog's gradient selection  *****/
+
+static void
+palette_import_gradient_changed (GimpContext  *context,
+                                 GimpGradient *gradient,
+                                 ImportDialog *private)
+{
+  if (gradient && private->import_type == GRADIENT_IMPORT)
+    {
+      gtk_entry_set_text (GTK_ENTRY (private->entry),
+                          gimp_object_get_name (gradient));
+
+      palette_import_make_palette (private);
+    }
+}
+
+static void
+palette_import_image_changed (GimpContext  *context,
+                              GimpImage    *image,
+                              ImportDialog *private)
+{
+  if (private->image)
+    {
+      g_signal_handlers_disconnect_by_func (private->image,
+                                            palette_import_layer_changed,
+                                            private);
+      g_signal_handlers_disconnect_by_func (private->image,
+                                            palette_import_mask_changed,
+                                            private);
+    }
+
+  private->image = image;
+
+  if (private->import_type == IMAGE_IMPORT)
+    {
+      gboolean sensitive = FALSE;
+
+      if (image)
+        {
+          gchar *label;
+
+          label = g_strdup_printf ("%s-%d",
+                                   gimp_image_get_display_name (image),
+                                   gimp_image_get_ID (image));
+
+          gtk_entry_set_text (GTK_ENTRY (private->entry), label);
+          g_free (label);
+
+          palette_import_make_palette (private);
+
+          if (gimp_image_get_base_type (image) != GIMP_INDEXED)
+            sensitive = TRUE;
+        }
+
+      gtk_widget_set_sensitive (private->sample_merged_toggle, sensitive);
+      gtk_widget_set_sensitive (private->selection_only_toggle, sensitive);
+      gimp_scale_entry_set_sensitive (GTK_OBJECT (private->threshold),
+                                      sensitive);
+      gimp_scale_entry_set_sensitive (GTK_OBJECT (private->num_colors),
+                                      sensitive);
+    }
+
+  if (private->image)
+    {
+      g_signal_connect (private->image, "active-layer-changed",
+                        G_CALLBACK (palette_import_layer_changed),
+                        private);
+      g_signal_connect (private->image, "mask-changed",
+                        G_CALLBACK (palette_import_mask_changed),
+                        private);
+    }
+}
+
+static void
+palette_import_layer_changed (GimpImage    *image,
+                              ImportDialog *private)
+{
+  if (private->import_type == IMAGE_IMPORT &&
+      ! gtk_toggle_button_get_active
+        (GTK_TOGGLE_BUTTON (private->sample_merged_toggle)))
+    {
+      palette_import_make_palette (private);
+    }
+}
+
+static void
+palette_import_mask_changed (GimpImage    *image,
+                             ImportDialog *private)
+{
+  if (private->import_type == IMAGE_IMPORT &&
+      gtk_toggle_button_get_active
+      (GTK_TOGGLE_BUTTON (private->selection_only_toggle)))
+    {
+      palette_import_make_palette (private);
+    }
+}
+
+static void
+palette_import_filename_changed (GtkFileChooser *button,
+                                 ImportDialog   *private)
+{
+  gchar *filename;
+
+  if (private->import_type != FILE_IMPORT)
+    return;
+
+  filename = gtk_file_chooser_get_filename (button);
+
+  if (filename)
+    {
+      gchar *basename = g_filename_display_basename (filename);
+
+      /* TODO: strip filename extension */
+      gtk_entry_set_text (GTK_ENTRY (private->entry), basename);
+      g_free (basename);
+    }
+  else
+    {
+      gtk_entry_set_text (GTK_ENTRY (private->entry), "");
+    }
+
+  g_free (filename);
+
+  palette_import_make_palette (private);
+}
+
+static void
+import_dialog_drop_callback (GtkWidget    *widget,
+                             gint          x,
+                             gint          y,
+                             GimpViewable *viewable,
+                             gpointer      data)
+{
+  ImportDialog *private = data;
+
+  gimp_context_set_by_type (private->context,
+                            G_TYPE_FROM_INSTANCE (viewable),
+                            GIMP_OBJECT (viewable));
+
+  if (GIMP_IS_GRADIENT (viewable) &&
+      private->import_type != GRADIENT_IMPORT)
+    {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->gradient_radio),
+                                    TRUE);
+    }
+  else if (GIMP_IS_IMAGE (viewable) &&
+           private->import_type != IMAGE_IMPORT)
+    {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->image_radio),
+                                    TRUE);
+    }
+}
+
+
+/*  the import source menu item callbacks  ***********************************/
+
+static void
+palette_import_set_sensitive (ImportDialog *private)
+{
+  gboolean gradient = (private->import_type == GRADIENT_IMPORT);
+  gboolean image    = (private->import_type == IMAGE_IMPORT);
+  gboolean file     = (private->import_type == FILE_IMPORT);
+
+  gtk_widget_set_sensitive (private->gradient_combo,        gradient);
+  gtk_widget_set_sensitive (private->image_combo,           image);
+  gtk_widget_set_sensitive (private->sample_merged_toggle,  image);
+  gtk_widget_set_sensitive (private->selection_only_toggle, image);
+  gtk_widget_set_sensitive (private->file_chooser,          file);
+
+  gimp_scale_entry_set_sensitive (GTK_OBJECT (private->num_colors), ! file);
+  gimp_scale_entry_set_sensitive (GTK_OBJECT (private->columns),    ! file);
+  gimp_scale_entry_set_sensitive (GTK_OBJECT (private->threshold),  image);
+}
+
+static void
+palette_import_grad_callback (GtkWidget    *widget,
+                              ImportDialog *private)
+{
+  GimpGradient *gradient;
+
+  if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    return;
+
+  private->import_type = GRADIENT_IMPORT;
+
+  gradient = gimp_context_get_gradient (private->context);
+
+  gtk_entry_set_text (GTK_ENTRY (private->entry),
+                      gimp_object_get_name (gradient));
+
+  palette_import_set_sensitive (private);
+
+  palette_import_make_palette (private);
+}
+
+static void
+palette_import_image_callback (GtkWidget    *widget,
+                               ImportDialog *private)
+{
+  GimpImage *image;
+
+  if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    return;
+
+  private->import_type = IMAGE_IMPORT;
+
+  image = gimp_context_get_image (private->context);
+
+  if (! image)
+    {
+      GimpContainer *images = private->context->gimp->images;
+
+      image = GIMP_IMAGE (gimp_container_get_first_child (images));
+    }
+
+  palette_import_set_sensitive (private);
+
+  palette_import_image_changed (private->context, image, private);
+}
+
+static void
+palette_import_file_callback (GtkWidget    *widget,
+                              ImportDialog *private)
+{
+  gchar *filename;
+
+  if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    return;
+
+  private->import_type = FILE_IMPORT;
+
+  filename =
+    gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (private->file_chooser));
+
+  if (filename)
+    {
+      gchar *basename = g_filename_display_basename (filename);
+
+      /* TODO: strip filename extension */
+      gtk_entry_set_text (GTK_ENTRY (private->entry), basename);
+      g_free (basename);
+
+      g_free (filename);
+    }
+  else
+    {
+      gtk_entry_set_text (GTK_ENTRY (private->entry), "");
+    }
+
+  palette_import_set_sensitive (private);
+}
+
+static void
+palette_import_columns_changed (GtkAdjustment *adj,
+                                ImportDialog  *private)
+{
+  if (private->palette)
+    gimp_palette_set_columns (private->palette,
+                              ROUND (gtk_adjustment_get_value (adj)));
+}
+
+
+/*  functions & callbacks to keep the import dialog uptodate  ****************/
+
+static void
+palette_import_image_add (GimpContainer *container,
+                          GimpImage     *image,
+                          ImportDialog  *private)
+{
+  if (! gtk_widget_is_sensitive (private->image_radio))
+    {
+      gtk_widget_set_sensitive (private->image_radio, TRUE);
+      gimp_context_set_image (private->context, image);
+    }
+}
+
+static void
+palette_import_image_remove (GimpContainer *container,
+                             GimpImage     *image,
+                             ImportDialog  *private)
+{
+  if (! gimp_container_get_n_children (private->context->gimp->images))
+    {
+      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (private->image_radio)))
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->gradient_radio),
+                                      TRUE);
+
+      gtk_widget_set_sensitive (private->image_radio, FALSE);
+    }
+}
+
+static void
+palette_import_make_palette (ImportDialog *private)
+{
+  GimpPalette  *palette = NULL;
+  const gchar  *palette_name;
+  gint          n_colors;
+  gint          n_columns;
+  gint          threshold;
+
+  palette_name = gtk_entry_get_text (GTK_ENTRY (private->entry));
+
+  if (! palette_name || ! strlen (palette_name))
+    palette_name = _("Untitled");
+
+  n_colors  = ROUND (gtk_adjustment_get_value (private->num_colors));
+  n_columns = ROUND (gtk_adjustment_get_value (private->columns));
+  threshold = ROUND (gtk_adjustment_get_value (private->threshold));
+
+  switch (private->import_type)
+    {
+    case GRADIENT_IMPORT:
+      {
+        GimpGradient *gradient;
+
+        gradient = gimp_context_get_gradient (private->context);
+
+        palette = gimp_palette_import_from_gradient (gradient,
+                                                     private->context,
+                                                     FALSE,
+                                                     GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                     palette_name,
+                                                     n_colors);
+      }
+      break;
+
+    case IMAGE_IMPORT:
+      {
+        GimpImage *image = gimp_context_get_image (private->context);
+        gboolean   sample_merged;
+        gboolean   selection_only;
+
+        sample_merged =
+          gtk_toggle_button_get_active
+          (GTK_TOGGLE_BUTTON (private->sample_merged_toggle));
+
+        selection_only =
+          gtk_toggle_button_get_active
+          (GTK_TOGGLE_BUTTON (private->selection_only_toggle));
+
+        if (gimp_image_get_base_type (image) == GIMP_INDEXED)
+          {
+            palette = gimp_palette_import_from_indexed_image (image,
+                                                              private->context,
+                                                              palette_name);
+          }
+        else if (sample_merged)
+          {
+            palette = gimp_palette_import_from_image (image,
+                                                      private->context,
+                                                      palette_name,
+                                                      n_colors,
+                                                      threshold,
+                                                      selection_only);
+          }
+        else
+          {
+            GimpDrawable *drawable;
+
+            drawable = GIMP_DRAWABLE (gimp_image_get_active_layer (image));
+
+            palette = gimp_palette_import_from_drawable (drawable,
+                                                         private->context,
+                                                         palette_name,
+                                                         n_colors,
+                                                         threshold,
+                                                         selection_only);
+          }
+      }
+      break;
+
+    case FILE_IMPORT:
+      {
+        GFile  *file;
+        GError *error = NULL;
+
+        file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (private->file_chooser));
+
+        palette = gimp_palette_import_from_file (private->context,
+                                                 file,
+                                                 palette_name, &error);
+        g_object_unref (file);
+
+        if (! palette)
+          {
+            gimp_message_literal (private->context->gimp,
+                                  G_OBJECT (private->dialog), GIMP_MESSAGE_ERROR,
+                                  error->message);
+            g_error_free (error);
+          }
+      }
+      break;
+    }
+
+  if (private->palette)
+    g_object_unref (private->palette);
+
+  private->palette = palette;
+
+  if (palette)
+    {
+      gimp_palette_set_columns (palette, n_columns);
+
+      gimp_view_set_viewable (GIMP_VIEW (private->preview),
+                              GIMP_VIEWABLE (palette));
+
+    }
+
+  gtk_widget_set_visible (private->no_colors_label,
+                          ! (palette &&
+                             gimp_palette_get_n_colors (palette) > 0));
+}
diff --git a/app/dialogs/palette-import-dialog.h b/app/dialogs/palette-import-dialog.h
new file mode 100644
index 0000000..baa5677
--- /dev/null
+++ b/app/dialogs/palette-import-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PALETTE_IMPORT_DIALOG_H__
+#define __PALETTE_IMPORT_DIALOG_H__
+
+
+GtkWidget * palette_import_dialog_new (GimpContext *context);
+
+
+#endif /* __PALETTE_IMPORT_DIALOG_H__ */
diff --git a/app/dialogs/preferences-dialog-utils.c b/app/dialogs/preferences-dialog-utils.c
new file mode 100644
index 0000000..1a1aaaa
--- /dev/null
+++ b/app/dialogs/preferences-dialog-utils.c
@@ -0,0 +1,402 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-constructors.h"
+
+#include "preferences-dialog-utils.h"
+
+
+GtkWidget *
+prefs_frame_new (const gchar  *label,
+                 GtkContainer *parent,
+                 gboolean      expand)
+{
+  GtkWidget *frame;
+  GtkWidget *vbox;
+
+  frame = gimp_frame_new (label);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  if (GTK_IS_BOX (parent))
+    gtk_box_pack_start (GTK_BOX (parent), frame, expand, expand, 0);
+  else
+    gtk_container_add (parent, frame);
+
+  gtk_widget_show (frame);
+
+  return vbox;
+}
+
+GtkWidget *
+prefs_table_new (gint          rows,
+                 GtkContainer *parent)
+{
+  GtkWidget *table;
+
+  table = gtk_table_new (rows, 2, FALSE);
+
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+
+  if (GTK_IS_BOX (parent))
+    gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0);
+  else
+    gtk_container_add (parent, table);
+
+  gtk_widget_show (table);
+
+  return table;
+}
+
+GtkWidget *
+prefs_hint_box_new (const gchar  *icon_name,
+                    const gchar  *text)
+{
+  GtkWidget *hbox;
+  GtkWidget *image;
+  GtkWidget *label;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  label = gtk_label_new (text);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+  gtk_widget_show (label);
+
+  gtk_widget_show (hbox);
+
+  return hbox;
+}
+
+GtkWidget *
+prefs_button_add (const gchar *icon_name,
+                  const gchar *label,
+                  GtkBox      *box)
+{
+  GtkWidget *button;
+
+  button = gimp_icon_button_new (icon_name, label);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return button;
+}
+
+GtkWidget *
+prefs_check_button_add (GObject     *config,
+                        const gchar *property_name,
+                        const gchar *label,
+                        GtkBox      *vbox)
+{
+  GtkWidget *button;
+
+  button = gimp_prop_check_button_new (config, property_name, label);
+
+  if (button)
+    {
+      gtk_box_pack_start (vbox, button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  return button;
+}
+
+GtkWidget *
+prefs_check_button_add_with_icon (GObject      *config,
+                                  const gchar  *property_name,
+                                  const gchar  *label,
+                                  const gchar  *icon_name,
+                                  GtkBox       *vbox,
+                                  GtkSizeGroup *group)
+{
+  GtkWidget *button;
+  GtkWidget *hbox;
+  GtkWidget *image;
+
+  button = gimp_prop_check_button_new (config, property_name, label);
+  if (!button)
+    return NULL;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (vbox, hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+  gtk_misc_set_padding (GTK_MISC (image), 2, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  if (group)
+    gtk_size_group_add_widget (group, image);
+
+  return button;
+}
+
+GtkWidget *
+prefs_widget_add_aligned (GtkWidget    *widget,
+                          const gchar  *text,
+                          GtkTable     *table,
+                          gint          table_row,
+                          gboolean      left_align,
+                          GtkSizeGroup *group)
+{
+  GtkWidget *label = gimp_table_attach_aligned (table, 0, table_row,
+                                                text, 0.0, 0.5,
+                                                widget, 1, left_align);
+  if (group)
+    gtk_size_group_add_widget (group, label);
+
+  return label;
+}
+
+GtkWidget *
+prefs_color_button_add (GObject      *config,
+                        const gchar  *property_name,
+                        const gchar  *label,
+                        const gchar  *title,
+                        GtkTable     *table,
+                        gint          table_row,
+                        GtkSizeGroup *group,
+                        GimpContext  *context)
+{
+  GtkWidget  *button;
+  GParamSpec *pspec;
+  gboolean    has_alpha;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        property_name);
+
+  has_alpha = gimp_param_spec_rgb_has_alpha (pspec);
+
+  button = gimp_prop_color_button_new (config, property_name,
+                                       title,
+                                       PREFS_COLOR_BUTTON_WIDTH,
+                                       PREFS_COLOR_BUTTON_HEIGHT,
+                                       has_alpha ?
+                                       GIMP_COLOR_AREA_SMALL_CHECKS :
+                                       GIMP_COLOR_AREA_FLAT);
+
+  if (button)
+    {
+      if (context)
+        gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), context);
+
+      prefs_widget_add_aligned (button, label, table, table_row, TRUE, group);
+    }
+
+  return button;
+}
+
+GtkWidget *
+prefs_entry_add (GObject      *config,
+                 const gchar  *property_name,
+                 const gchar  *label,
+                 GtkTable     *table,
+                 gint          table_row,
+                 GtkSizeGroup *group)
+{
+  GtkWidget *entry = gimp_prop_entry_new (config, property_name, -1);
+
+  if (entry)
+    prefs_widget_add_aligned (entry, label, table, table_row, FALSE, group);
+
+  return entry;
+}
+
+GtkWidget *
+prefs_spin_button_add (GObject      *config,
+                       const gchar  *property_name,
+                       gdouble       step_increment,
+                       gdouble       page_increment,
+                       gint          digits,
+                       const gchar  *label,
+                       GtkTable     *table,
+                       gint          table_row,
+                       GtkSizeGroup *group)
+{
+  GtkWidget *button = gimp_prop_spin_button_new (config, property_name,
+                                                 step_increment,
+                                                 page_increment,
+                                                 digits);
+
+  if (button)
+    prefs_widget_add_aligned (button, label, table, table_row, TRUE, group);
+
+  return button;
+}
+
+GtkWidget *
+prefs_memsize_entry_add (GObject      *config,
+                         const gchar  *property_name,
+                         const gchar  *label,
+                         GtkTable     *table,
+                         gint          table_row,
+                         GtkSizeGroup *group)
+{
+  GtkWidget *entry = gimp_prop_memsize_entry_new (config, property_name);
+
+  if (entry)
+    prefs_widget_add_aligned (entry, label, table, table_row, TRUE, group);
+
+  return entry;
+}
+
+GtkWidget *
+prefs_file_chooser_button_add (GObject      *config,
+                               const gchar  *property_name,
+                               const gchar  *label,
+                               const gchar  *dialog_title,
+                               GtkTable     *table,
+                               gint          table_row,
+                               GtkSizeGroup *group)
+{
+  GtkWidget *button;
+
+  button = gimp_prop_file_chooser_button_new (config, property_name,
+                                              dialog_title,
+                                              GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+
+  if (button)
+    prefs_widget_add_aligned (button, label, table, table_row, FALSE, group);
+
+  return button;
+}
+
+GtkWidget *
+prefs_enum_combo_box_add (GObject      *config,
+                          const gchar  *property_name,
+                          gint          minimum,
+                          gint          maximum,
+                          const gchar  *label,
+                          GtkTable     *table,
+                          gint          table_row,
+                          GtkSizeGroup *group)
+{
+  GtkWidget *combo = gimp_prop_enum_combo_box_new (config, property_name,
+                                                   minimum, maximum);
+
+  if (combo)
+    prefs_widget_add_aligned (combo, label, table, table_row, FALSE, group);
+
+  return combo;
+}
+
+GtkWidget *
+prefs_boolean_combo_box_add (GObject      *config,
+                             const gchar  *property_name,
+                             const gchar  *true_text,
+                             const gchar  *false_text,
+                             const gchar  *label,
+                             GtkTable     *table,
+                             gint          table_row,
+                             GtkSizeGroup *group)
+{
+  GtkWidget *combo = gimp_prop_boolean_combo_box_new (config, property_name,
+                                                      true_text, false_text);
+
+  if (combo)
+    prefs_widget_add_aligned (combo, label, table, table_row, FALSE, group);
+
+  return combo;
+}
+
+#ifdef HAVE_ISO_CODES
+GtkWidget *
+prefs_language_combo_box_add (GObject      *config,
+                              const gchar  *property_name,
+                              GtkBox       *vbox)
+{
+  GtkWidget *combo = gimp_prop_language_combo_box_new (config, property_name);
+
+  if (combo)
+    {
+      gtk_box_pack_start (vbox, combo, FALSE, FALSE, 0);
+      gtk_widget_show (combo);
+    }
+
+  return combo;
+}
+#endif
+
+GtkWidget *
+prefs_profile_combo_box_add (GObject      *config,
+                             const gchar  *property_name,
+                             GtkListStore *profile_store,
+                             const gchar  *dialog_title,
+                             const gchar  *label,
+                             GtkTable     *table,
+                             gint          table_row,
+                             GtkSizeGroup *group,
+                             GObject      *profile_path_config,
+                             const gchar  *profile_path_property_name)
+{
+  GtkWidget *combo = gimp_prop_profile_combo_box_new (config,
+                                                      property_name,
+                                                      profile_store,
+                                                      dialog_title,
+                                                      profile_path_config,
+                                                      profile_path_property_name);
+
+  if (combo)
+    prefs_widget_add_aligned (combo, label, table, table_row, FALSE, group);
+
+  return combo;
+}
+
+GtkWidget *
+prefs_compression_combo_box_add (GObject      *config,
+                                 const gchar  *property_name,
+                                 const gchar  *label,
+                                 GtkTable     *table,
+                                 gint          table_row,
+                                 GtkSizeGroup *group)
+{
+  GtkWidget *combo = gimp_prop_compression_combo_box_new (config,
+                                                          property_name);
+
+  if (combo)
+    prefs_widget_add_aligned (combo, label, table, table_row, FALSE, group);
+
+  return combo;
+}
diff --git a/app/dialogs/preferences-dialog-utils.h b/app/dialogs/preferences-dialog-utils.h
new file mode 100644
index 0000000..46f2be9
--- /dev/null
+++ b/app/dialogs/preferences-dialog-utils.h
@@ -0,0 +1,134 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PREFERENCES_DIALOG_UTILS_H__
+#define __PREFERENCES_DIALOG_UTILS_H__
+
+
+#define PREFS_COLOR_BUTTON_WIDTH  40
+#define PREFS_COLOR_BUTTON_HEIGHT 24
+
+
+GtkWidget * prefs_frame_new                  (const gchar  *label,
+                                              GtkContainer *parent,
+                                              gboolean      expand);
+GtkWidget * prefs_table_new                  (gint          rows,
+                                              GtkContainer *parent);
+
+GtkWidget * prefs_hint_box_new               (const gchar  *icon_name,
+                                              const gchar  *text);
+
+GtkWidget * prefs_button_add                 (const gchar  *icon_name,
+                                              const gchar  *label,
+                                              GtkBox       *box);
+GtkWidget * prefs_check_button_add           (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              GtkBox       *box);
+GtkWidget * prefs_check_button_add_with_icon (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              const gchar  *icon_name,
+                                              GtkBox       *box,
+                                              GtkSizeGroup *group);
+
+GtkWidget * prefs_widget_add_aligned         (GtkWidget    *widget,
+                                              const gchar  *text,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              gboolean      left_align,
+                                              GtkSizeGroup *group);
+
+GtkWidget * prefs_color_button_add           (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              const gchar  *title,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group,
+                                              GimpContext  *context);
+
+GtkWidget * prefs_entry_add                  (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+GtkWidget * prefs_spin_button_add            (GObject      *config,
+                                              const gchar  *property_name,
+                                              gdouble       step_increment,
+                                              gdouble       page_increment,
+                                              gint          digits,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+GtkWidget * prefs_memsize_entry_add          (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+
+GtkWidget * prefs_file_chooser_button_add    (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              const gchar  *dialog_title,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+
+GtkWidget * prefs_enum_combo_box_add         (GObject      *config,
+                                              const gchar  *property_name,
+                                              gint          minimum,
+                                              gint          maximum,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+GtkWidget * prefs_boolean_combo_box_add      (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *true_text,
+                                              const gchar  *false_text,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+#ifdef HAVE_ISO_CODES
+GtkWidget * prefs_language_combo_box_add     (GObject      *config,
+                                              const gchar  *property_name,
+                                              GtkBox       *vbox);
+#endif
+GtkWidget * prefs_profile_combo_box_add      (GObject      *config,
+                                              const gchar  *property_name,
+                                              GtkListStore *profile_store,
+                                              const gchar  *dialog_title,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group,
+                                              GObject      *profile_path_config,
+                                              const gchar  *profile_path_property_name);
+GtkWidget * prefs_compression_combo_box_add  (GObject      *config,
+                                              const gchar  *property_name,
+                                              const gchar  *label,
+                                              GtkTable     *table,
+                                              gint          table_row,
+                                              GtkSizeGroup *group);
+
+
+#endif /* __PREFERENCES_DIALOG_H__ */
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
new file mode 100644
index 0000000..cde1576
--- /dev/null
+++ b/app/dialogs/preferences-dialog.c
@@ -0,0 +1,3409 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "gimp-version.h"
+
+#include "config/gimprc.h"
+
+#include "core/gimp.h"
+#include "core/gimptemplate.h"
+
+#include "plug-in/gimppluginmanager.h"
+
+#include "widgets/gimpaction-history.h"
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpcontainercombobox.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpcontrollerlist.h"
+#include "widgets/gimpdevices.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpgrideditor.h"
+#include "widgets/gimphelp.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpiconsizescale.h"
+#include "widgets/gimplanguagecombobox.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimppluginview.h"
+#include "widgets/gimpprefsbox.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpstrokeeditor.h"
+#include "widgets/gimptemplateeditor.h"
+#include "widgets/gimptooleditor.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "menus/menus.h"
+
+#include "tools/gimp-tools.h"
+
+#include "gui/session.h"
+#include "gui/icon-themes.h"
+#include "gui/themes.h"
+
+#include "preferences-dialog.h"
+#include "preferences-dialog-utils.h"
+#include "resolution-calibrate-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+
+/*  preferences local functions  */
+
+static GtkWidget * prefs_dialog_new                (Gimp       *gimp,
+                                                    GimpConfig *config);
+static void        prefs_config_notify             (GObject    *config,
+                                                    GParamSpec *param_spec,
+                                                    GObject    *config_copy);
+static void        prefs_config_copy_notify        (GObject    *config_copy,
+                                                    GParamSpec *param_spec,
+                                                    GObject    *config);
+static void        prefs_response                  (GtkWidget  *widget,
+                                                    gint        response_id,
+                                                    GtkWidget  *dialog);
+
+static void        prefs_message                   (GtkMessageType  type,
+                                                    gboolean        destroy,
+                                                    const gchar    *message);
+
+static void   prefs_color_management_reset         (GtkWidget    *widget,
+                                                    GObject      *config);
+static void   prefs_dialog_defaults_reset          (GtkWidget    *widget,
+                                                    GObject      *config);
+static void   prefs_folders_reset                  (GtkWidget    *widget,
+                                                    GObject      *config);
+static void   prefs_path_reset                     (GtkWidget    *widget,
+                                                    GObject      *config);
+
+static void   prefs_import_raw_procedure_callback  (GtkWidget    *widget,
+                                                    GObject      *config);
+static void   prefs_resolution_source_callback     (GtkWidget    *widget,
+                                                    GObject      *config);
+static void   prefs_resolution_calibrate_callback  (GtkWidget    *widget,
+                                                    GtkWidget    *entry);
+static void   prefs_input_devices_dialog           (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_keyboard_shortcuts_dialog      (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_menus_save_callback            (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_menus_clear_callback           (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_menus_remove_callback          (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_session_save_callback          (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_session_clear_callback         (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_devices_save_callback          (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_devices_clear_callback         (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_search_clear_callback          (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_tool_options_save_callback     (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_tool_options_clear_callback    (GtkWidget    *widget,
+                                                    Gimp         *gimp);
+static void   prefs_help_language_change_callback  (GtkComboBox  *combo,
+                                                    Gimp         *gimp);
+static void   prefs_help_language_change_callback2 (GtkComboBox  *combo,
+                                                    GtkContainer *box);
+
+
+/*  private variables  */
+
+static GtkWidget *prefs_dialog = NULL;
+static GtkWidget *tool_editor  = NULL;
+
+
+/*  public function  */
+
+GtkWidget *
+preferences_dialog_create (Gimp *gimp)
+{
+  GimpConfig *config;
+  GimpConfig *config_copy;
+  GimpConfig *config_orig;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (prefs_dialog)
+    return prefs_dialog;
+
+  /*  turn off autosaving while the prefs dialog is open  */
+  gimp_rc_set_autosave (GIMP_RC (gimp->edit_config), FALSE);
+
+  config       = GIMP_CONFIG (gimp->edit_config);
+  config_copy  = gimp_config_duplicate (config);
+  config_orig  = gimp_config_duplicate (config);
+
+  g_signal_connect_object (config, "notify",
+                           G_CALLBACK (prefs_config_notify),
+                           config_copy, 0);
+  g_signal_connect_object (config_copy, "notify",
+                           G_CALLBACK (prefs_config_copy_notify),
+                           config, 0);
+
+  prefs_dialog = prefs_dialog_new (gimp, config_copy);
+
+  g_object_add_weak_pointer (G_OBJECT (prefs_dialog),
+                             (gpointer) &prefs_dialog);
+
+  g_object_set_data (G_OBJECT (prefs_dialog), "gimp", gimp);
+
+  g_object_set_data_full (G_OBJECT (prefs_dialog), "config-copy", config_copy,
+                          (GDestroyNotify) g_object_unref);
+  g_object_set_data_full (G_OBJECT (prefs_dialog), "config-orig", config_orig,
+                          (GDestroyNotify) g_object_unref);
+
+  return prefs_dialog;
+}
+
+
+/*  private functions  */
+
+static void
+prefs_config_notify (GObject    *config,
+                     GParamSpec *param_spec,
+                     GObject    *config_copy)
+{
+  GValue global_value = G_VALUE_INIT;
+  GValue copy_value   = G_VALUE_INIT;
+
+  g_value_init (&global_value, param_spec->value_type);
+  g_value_init (&copy_value,   param_spec->value_type);
+
+  g_object_get_property (config,      param_spec->name, &global_value);
+  g_object_get_property (config_copy, param_spec->name, &copy_value);
+
+  if (g_param_values_cmp (param_spec, &global_value, &copy_value))
+    {
+      g_signal_handlers_block_by_func (config_copy,
+                                       prefs_config_copy_notify,
+                                       config);
+
+      g_object_set_property (config_copy, param_spec->name, &global_value);
+
+      g_signal_handlers_unblock_by_func (config_copy,
+                                         prefs_config_copy_notify,
+                                         config);
+    }
+
+  g_value_unset (&global_value);
+  g_value_unset (&copy_value);
+}
+
+static void
+prefs_config_copy_notify (GObject    *config_copy,
+                          GParamSpec *param_spec,
+                          GObject    *config)
+{
+  GValue copy_value   = G_VALUE_INIT;
+  GValue global_value = G_VALUE_INIT;
+
+  g_value_init (&copy_value,   param_spec->value_type);
+  g_value_init (&global_value, param_spec->value_type);
+
+  g_object_get_property (config_copy, param_spec->name, &copy_value);
+  g_object_get_property (config,      param_spec->name, &global_value);
+
+  if (g_param_values_cmp (param_spec, &copy_value, &global_value))
+    {
+      if (param_spec->flags & GIMP_CONFIG_PARAM_CONFIRM)
+        {
+#ifdef GIMP_CONFIG_DEBUG
+          g_print ("NOT Applying prefs change of '%s' to edit_config "
+                   "because it needs confirmation\n",
+                   param_spec->name);
+#endif
+        }
+      else
+        {
+#ifdef GIMP_CONFIG_DEBUG
+          g_print ("Applying prefs change of '%s' to edit_config\n",
+                   param_spec->name);
+#endif
+          g_signal_handlers_block_by_func (config,
+                                           prefs_config_notify,
+                                           config_copy);
+
+          g_object_set_property (config, param_spec->name, &copy_value);
+
+          g_signal_handlers_unblock_by_func (config,
+                                             prefs_config_notify,
+                                             config_copy);
+        }
+    }
+
+  g_value_unset (&copy_value);
+  g_value_unset (&global_value);
+}
+
+static void
+prefs_response (GtkWidget *widget,
+                gint       response_id,
+                GtkWidget *dialog)
+{
+  Gimp *gimp = g_object_get_data (G_OBJECT (dialog), "gimp");
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      {
+        GtkWidget *confirm;
+
+        confirm = gimp_message_dialog_new (_("Reset All Preferences"),
+                                           GIMP_ICON_DIALOG_QUESTION,
+                                           dialog,
+                                           GTK_DIALOG_MODAL |
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           gimp_standard_help_func, NULL,
+
+                                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                           _("_Reset"),  GTK_RESPONSE_OK,
+
+                                           NULL);
+
+        gtk_dialog_set_alternative_button_order (GTK_DIALOG (confirm),
+                                                 GTK_RESPONSE_OK,
+                                                 GTK_RESPONSE_CANCEL,
+                                                 -1);
+
+        gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (confirm)->box,
+                                           _("Do you really want to reset all "
+                                             "preferences to default values?"));
+
+        if (gimp_dialog_run (GIMP_DIALOG (confirm)) == GTK_RESPONSE_OK)
+          {
+            GimpConfig *config_copy;
+
+            config_copy = g_object_get_data (G_OBJECT (dialog), "config-copy");
+
+            gimp_config_reset (config_copy);
+            gimp_rc_load_system (GIMP_RC (config_copy));
+
+            /* don't use the default value if there is no help browser */
+            if (! gimp_help_browser_is_installed (gimp))
+              {
+                g_object_set (config_copy,
+                              "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
+                              NULL);
+              }
+          }
+
+        gtk_widget_destroy (confirm);
+
+        return;
+      }
+      break;
+
+    case GTK_RESPONSE_OK:
+      {
+        GObject *config_copy;
+        GList   *restart_diff;
+        GList   *confirm_diff;
+        GList   *list;
+
+        config_copy = g_object_get_data (G_OBJECT (dialog), "config-copy");
+
+        /*  destroy config_orig  */
+        g_object_set_data (G_OBJECT (dialog), "config-orig", NULL);
+
+        gtk_widget_set_sensitive (GTK_WIDGET (dialog), FALSE);
+
+        confirm_diff = gimp_config_diff (G_OBJECT (gimp->edit_config),
+                                         config_copy,
+                                         GIMP_CONFIG_PARAM_CONFIRM);
+
+        g_object_freeze_notify (G_OBJECT (gimp->edit_config));
+
+        for (list = confirm_diff; list; list = g_list_next (list))
+          {
+            GParamSpec *param_spec = list->data;
+            GValue      value      = G_VALUE_INIT;
+
+            g_value_init (&value, param_spec->value_type);
+
+            g_object_get_property (config_copy,
+                                   param_spec->name, &value);
+            g_object_set_property (G_OBJECT (gimp->edit_config),
+                                   param_spec->name, &value);
+
+            g_value_unset (&value);
+          }
+
+        g_object_thaw_notify (G_OBJECT (gimp->edit_config));
+
+        g_list_free (confirm_diff);
+
+        gimp_rc_save (GIMP_RC (gimp->edit_config));
+
+        /*  spit out a solely informational warning about changed values
+         *  which need restart
+         */
+        restart_diff = gimp_config_diff (G_OBJECT (gimp->edit_config),
+                                         G_OBJECT (gimp->config),
+                                         GIMP_CONFIG_PARAM_RESTART);
+
+        if (restart_diff)
+          {
+            GString *string;
+
+            string = g_string_new (_("You will have to restart GIMP for "
+                                     "the following changes to take effect:"));
+            g_string_append (string, "\n\n");
+
+            for (list = restart_diff; list; list = g_list_next (list))
+              {
+                GParamSpec *param_spec = list->data;
+
+                g_string_append_printf (string, "%s\n", param_spec->name);
+              }
+
+            prefs_message (GTK_MESSAGE_INFO, FALSE, string->str);
+
+            g_string_free (string, TRUE);
+          }
+
+        g_list_free (restart_diff);
+      }
+      break;
+
+    default:
+      {
+        GObject *config_orig;
+        GList   *diff;
+        GList   *list;
+
+        config_orig = g_object_get_data (G_OBJECT (dialog), "config-orig");
+
+        /*  destroy config_copy  */
+        g_object_set_data (G_OBJECT (dialog), "config-copy", NULL);
+
+        gtk_widget_set_sensitive (GTK_WIDGET (dialog), FALSE);
+
+        diff = gimp_config_diff (G_OBJECT (gimp->edit_config),
+                                 config_orig,
+                                 GIMP_CONFIG_PARAM_SERIALIZE);
+
+        g_object_freeze_notify (G_OBJECT (gimp->edit_config));
+
+        for (list = diff; list; list = g_list_next (list))
+          {
+            GParamSpec *param_spec = list->data;
+            GValue      value      = G_VALUE_INIT;
+
+            g_value_init (&value, param_spec->value_type);
+
+            g_object_get_property (config_orig,
+                                   param_spec->name, &value);
+            g_object_set_property (G_OBJECT (gimp->edit_config),
+                                   param_spec->name, &value);
+
+            g_value_unset (&value);
+          }
+
+        gimp_tool_editor_revert_changes (GIMP_TOOL_EDITOR (tool_editor));
+
+        g_object_thaw_notify (G_OBJECT (gimp->edit_config));
+
+        g_list_free (diff);
+      }
+
+      tool_editor = NULL;
+    }
+
+  /*  enable autosaving again  */
+  gimp_rc_set_autosave (GIMP_RC (gimp->edit_config), TRUE);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+prefs_color_management_reset (GtkWidget *widget,
+                              GObject   *config)
+{
+  GimpCoreConfig *core_config = GIMP_CORE_CONFIG (config);
+
+  gimp_config_reset (GIMP_CONFIG (core_config->color_management));
+  gimp_config_reset_property (config, "color-profile-policy");
+  gimp_config_reset_property (config, "filter-tool-show-color-options");
+}
+
+static void
+prefs_dialog_defaults_reset (GtkWidget *widget,
+                             GObject   *config)
+{
+  GParamSpec **pspecs;
+  guint        n_pspecs;
+  guint        i;
+
+  pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (config),
+                                           &n_pspecs);
+
+  g_object_freeze_notify (config);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *pspec = pspecs[i];
+
+      if (pspec->owner_type == GIMP_TYPE_DIALOG_CONFIG)
+        gimp_config_reset_property (config, pspec->name);
+    }
+
+  gimp_config_reset_property (config, "filter-tool-max-recent");
+  gimp_config_reset_property (config, "filter-tool-use-last-settings");
+  gimp_config_reset_property (config, "filter-tool-show-color-options");
+
+  g_object_thaw_notify (config);
+
+  g_free (pspecs);
+}
+
+static void
+prefs_folders_reset (GtkWidget *widget,
+                     GObject   *config)
+{
+  gimp_config_reset_property (config, "temp-path");
+  gimp_config_reset_property (config, "swap-path");
+}
+
+static void
+prefs_path_reset (GtkWidget *widget,
+                  GObject   *config)
+{
+  const gchar *path_property;
+  const gchar *writable_property;
+
+  path_property     = g_object_get_data (G_OBJECT (widget), "path");
+  writable_property = g_object_get_data (G_OBJECT (widget), "path-writable");
+
+  gimp_config_reset_property (config, path_property);
+
+  if (writable_property)
+    gimp_config_reset_property (config, writable_property);
+}
+
+static void
+prefs_template_select_callback (GimpContainerView *view,
+                                GimpTemplate      *template,
+                                gpointer           insert_data,
+                                GimpTemplate      *edit_template)
+{
+  if (template)
+    {
+      /*  make sure the resolution values are copied first (see bug #546924)  */
+      gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template),
+                        GIMP_TEMPLATE_PARAM_COPY_FIRST);
+      gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template),
+                        0);
+    }
+}
+
+static void
+prefs_import_raw_procedure_callback (GtkWidget *widget,
+                                     GObject   *config)
+{
+  gchar *raw_plug_in;
+
+  raw_plug_in = gimp_plug_in_view_get_plug_in (GIMP_PLUG_IN_VIEW (widget));
+
+  g_object_set (config,
+                "import-raw-plug-in", raw_plug_in,
+                NULL);
+
+  g_free (raw_plug_in);
+}
+
+static void
+prefs_resolution_source_callback (GtkWidget *widget,
+                                  GObject   *config)
+{
+  gdouble  xres;
+  gdouble  yres;
+  gboolean from_gdk;
+
+  from_gdk = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+  if (from_gdk)
+    {
+      gimp_get_monitor_resolution (gtk_widget_get_screen (widget),
+                                   gimp_widget_get_monitor (widget),
+                                   &xres, &yres);
+    }
+  else
+    {
+      GimpSizeEntry *entry = g_object_get_data (G_OBJECT (widget),
+                                                "monitor_resolution_sizeentry");
+
+      g_return_if_fail (GIMP_IS_SIZE_ENTRY (entry));
+
+      xres = gimp_size_entry_get_refval (entry, 0);
+      yres = gimp_size_entry_get_refval (entry, 1);
+    }
+
+  g_object_set (config,
+                "monitor-xresolution",                      xres,
+                "monitor-yresolution",                      yres,
+                "monitor-resolution-from-windowing-system", from_gdk,
+                NULL);
+}
+
+static void
+prefs_resolution_calibrate_callback (GtkWidget *widget,
+                                     GtkWidget *entry)
+{
+  GtkWidget   *dialog;
+  GtkWidget   *prefs_box;
+  const gchar *icon_name;
+
+  dialog = gtk_widget_get_toplevel (entry);
+
+  prefs_box = g_object_get_data (G_OBJECT (dialog), "prefs-box");
+  icon_name = gimp_prefs_box_get_current_icon_name (GIMP_PREFS_BOX (prefs_box));
+
+  resolution_calibrate_dialog (entry, icon_name);
+}
+
+static void
+prefs_input_devices_dialog (GtkWidget *widget,
+                            Gimp      *gimp)
+{
+  gimp_dialog_factory_dialog_raise (gimp_dialog_factory_get_singleton (),
+                                    gtk_widget_get_screen (widget),
+                                    gimp_widget_get_monitor (widget),
+                                    "gimp-input-devices-dialog", 0);
+}
+
+static void
+prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
+                                 Gimp      *gimp)
+{
+  gimp_dialog_factory_dialog_raise (gimp_dialog_factory_get_singleton (),
+                                    gtk_widget_get_screen (widget),
+                                    gimp_widget_get_monitor (widget),
+                                    "gimp-keyboard-shortcuts-dialog", 0);
+}
+
+static void
+prefs_menus_save_callback (GtkWidget *widget,
+                           Gimp      *gimp)
+{
+  GtkWidget *clear_button;
+
+  menus_save (gimp, TRUE);
+
+  clear_button = g_object_get_data (G_OBJECT (widget), "clear-button");
+
+  if (clear_button)
+    gtk_widget_set_sensitive (clear_button, TRUE);
+}
+
+static void
+prefs_menus_clear_callback (GtkWidget *widget,
+                            Gimp      *gimp)
+{
+  GError *error = NULL;
+
+  if (! menus_clear (gimp, &error))
+    {
+      prefs_message (GTK_MESSAGE_ERROR, TRUE, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (widget, FALSE);
+
+      prefs_message (GTK_MESSAGE_INFO, TRUE,
+                     _("Your keyboard shortcuts will be reset to "
+                       "default values the next time you start GIMP."));
+    }
+}
+
+static void
+prefs_menus_remove_callback (GtkWidget *widget,
+                             Gimp      *gimp)
+{
+  GtkWidget *dialog;
+
+  dialog = gimp_message_dialog_new (_("Remove all Keyboard Shortcuts"),
+                                    GIMP_ICON_DIALOG_QUESTION,
+                                    gtk_widget_get_toplevel (widget),
+                                    GTK_DIALOG_MODAL |
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("Cl_ear"),  GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect_object (gtk_widget_get_toplevel (widget), "unmap",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, G_CONNECT_SWAPPED);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Do you really want to remove all "
+                                       "keyboard shortcuts from all menus?"));
+
+  if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      menus_remove (gimp);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+prefs_session_save_callback (GtkWidget *widget,
+                             Gimp      *gimp)
+{
+  GtkWidget *clear_button;
+
+  session_save (gimp, TRUE);
+
+  clear_button = g_object_get_data (G_OBJECT (widget), "clear-button");
+
+  if (clear_button)
+    gtk_widget_set_sensitive (clear_button, TRUE);
+}
+
+static void
+prefs_session_clear_callback (GtkWidget *widget,
+                              Gimp      *gimp)
+{
+  GError *error = NULL;
+
+  if (! session_clear (gimp, &error))
+    {
+      prefs_message (GTK_MESSAGE_ERROR, TRUE, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (widget, FALSE);
+
+      prefs_message (GTK_MESSAGE_INFO, TRUE,
+                     _("Your window setup will be reset to "
+                       "default values the next time you start GIMP."));
+    }
+}
+
+static void
+prefs_devices_save_callback (GtkWidget *widget,
+                             Gimp      *gimp)
+{
+  GtkWidget *clear_button;
+
+  gimp_devices_save (gimp, TRUE);
+
+  clear_button = g_object_get_data (G_OBJECT (widget), "clear-button");
+
+  if (clear_button)
+    gtk_widget_set_sensitive (clear_button, TRUE);
+}
+
+static void
+prefs_devices_clear_callback (GtkWidget *widget,
+                              Gimp      *gimp)
+{
+  GError *error = NULL;
+
+  if (! gimp_devices_clear (gimp, &error))
+    {
+      prefs_message (GTK_MESSAGE_ERROR, TRUE, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (widget, FALSE);
+
+      prefs_message (GTK_MESSAGE_INFO, TRUE,
+                     _("Your input device settings will be reset to "
+                       "default values the next time you start GIMP."));
+    }
+}
+
+static void
+prefs_search_clear_callback (GtkWidget *widget,
+                             Gimp      *gimp)
+{
+  gimp_action_history_clear (gimp);
+}
+
+static void
+prefs_tool_options_save_callback (GtkWidget *widget,
+                                  Gimp      *gimp)
+{
+  GtkWidget *clear_button;
+
+  gimp_tools_save (gimp, TRUE, TRUE);
+
+  clear_button = g_object_get_data (G_OBJECT (widget), "clear-button");
+
+  if (clear_button)
+    gtk_widget_set_sensitive (clear_button, TRUE);
+}
+
+static void
+prefs_tool_options_clear_callback (GtkWidget *widget,
+                                   Gimp      *gimp)
+{
+  GError *error = NULL;
+
+  if (! gimp_tools_clear (gimp, &error))
+    {
+      prefs_message (GTK_MESSAGE_ERROR, TRUE, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (widget, FALSE);
+
+      prefs_message (GTK_MESSAGE_INFO, TRUE,
+                     _("Your tool options will be reset to "
+                       "default values the next time you start GIMP."));
+    }
+}
+
+static void
+prefs_help_language_change_callback (GtkComboBox *combo,
+                                     Gimp        *gimp)
+{
+  gchar *help_locales = NULL;
+  gchar *code;
+
+  code = gimp_language_combo_box_get_code (GIMP_LANGUAGE_COMBO_BOX (combo));
+  if (code && g_strcmp0 ("", code) != 0)
+    {
+      help_locales = g_strdup_printf ("%s:", code);
+    }
+  g_object_set (gimp->config,
+                "help-locales", help_locales? help_locales : "",
+                NULL);
+  g_free (code);
+  if (help_locales)
+    g_free (help_locales);
+}
+
+static void
+prefs_help_language_change_callback2 (GtkComboBox  *combo,
+                                      GtkContainer *box)
+{
+  Gimp        *gimp;
+  GtkLabel    *label = NULL;
+  GtkImage    *icon  = NULL;
+  GList       *children;
+  GList       *iter;
+  const gchar *text;
+  const gchar *icon_name;
+
+  gimp = g_object_get_data (G_OBJECT (box), "gimp");
+  children = gtk_container_get_children (box);
+  for (iter = children; iter; iter = iter->next)
+    {
+      if (GTK_IS_LABEL (iter->data))
+        {
+          label = iter->data;
+        }
+      else if (GTK_IS_IMAGE (iter->data))
+        {
+          icon = iter->data;
+        }
+    }
+  if (gimp_help_user_manual_is_installed (gimp))
+    {
+      text = _("There's a local installation of the user manual.");
+      icon_name = GIMP_ICON_DIALOG_INFORMATION;
+    }
+  else
+    {
+      text = _("The user manual is not installed locally.");
+      icon_name = GIMP_ICON_DIALOG_WARNING;
+    }
+  if (label)
+    {
+      gtk_label_set_text (label, text);
+    }
+  if (icon)
+    {
+      gtk_image_set_from_icon_name (icon, icon_name,
+                                    GTK_ICON_SIZE_BUTTON);
+    }
+
+  g_list_free (children);
+}
+
+static void
+prefs_format_string_select_callback (GtkTreeSelection *sel,
+                                     GtkEntry         *entry)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      GValue val = G_VALUE_INIT;
+
+      gtk_tree_model_get_value (model, &iter, 1, &val);
+      gtk_entry_set_text (entry, g_value_get_string (&val));
+      g_value_unset (&val);
+    }
+}
+
+static void
+prefs_theme_select_callback (GtkTreeSelection *sel,
+                             Gimp             *gimp)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      GValue val = G_VALUE_INIT;
+
+      gtk_tree_model_get_value (model, &iter, 0, &val);
+      g_object_set_property (G_OBJECT (gimp->config), "theme", &val);
+      g_value_unset (&val);
+    }
+}
+
+static void
+prefs_theme_reload_callback (GtkWidget *button,
+                             Gimp      *gimp)
+{
+  g_object_notify (G_OBJECT (gimp->config), "theme");
+}
+
+static void
+prefs_icon_theme_select_callback (GtkTreeSelection *sel,
+                                  Gimp             *gimp)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      GValue val = G_VALUE_INIT;
+
+      gtk_tree_model_get_value (model, &iter, 1, &val);
+      g_object_set_property (G_OBJECT (gimp->config), "icon-theme", &val);
+      g_value_unset (&val);
+    }
+}
+
+static void
+prefs_canvas_padding_color_changed (GtkWidget *button,
+                                    GtkWidget *combo)
+{
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
+                                 GIMP_CANVAS_PADDING_MODE_CUSTOM);
+}
+
+static void
+prefs_display_options_frame_add (Gimp         *gimp,
+                                 GObject      *object,
+                                 const gchar  *label,
+                                 GtkContainer *parent)
+{
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *checks_vbox;
+  GtkWidget *table;
+  GtkWidget *combo;
+  GtkWidget *button;
+
+  vbox = prefs_frame_new (label, parent, FALSE);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  checks_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (checks_vbox);
+
+  prefs_check_button_add (object, "show-selection",
+                          _("Show s_election"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-layer-boundary",
+                          _("Show _layer boundary"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-canvas-boundary",
+                          _("Show can_vas boundary"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-guides",
+                          _("Show _guides"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-grid",
+                          _("Show gri_d"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-sample-points",
+                          _("Show _sample points"),
+                          GTK_BOX (checks_vbox));
+
+  checks_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (checks_vbox);
+
+#ifndef GDK_WINDOWING_QUARTZ
+  prefs_check_button_add (object, "show-menubar",
+                          _("Show _menubar"),
+                          GTK_BOX (checks_vbox));
+#endif /* !GDK_WINDOWING_QUARTZ */
+  prefs_check_button_add (object, "show-rulers",
+                          _("Show _rulers"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-scrollbars",
+                          _("Show scroll_bars"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "show-statusbar",
+                          _("Show s_tatusbar"),
+                          GTK_BOX (checks_vbox));
+
+  table = prefs_table_new (2, GTK_CONTAINER (vbox));
+
+  combo = prefs_enum_combo_box_add (object, "padding-mode", 0, 0,
+                                    _("Canvas _padding mode:"),
+                                    GTK_TABLE (table), 0,
+                                    NULL);
+
+  button = prefs_color_button_add (object, "padding-color",
+                                   _("Custom p_adding color:"),
+                                   _("Select Custom Canvas Padding Color"),
+                                   GTK_TABLE (table), 1, NULL,
+                                   gimp_get_user_context (gimp));
+
+  g_signal_connect (button, "color-changed",
+                    G_CALLBACK (prefs_canvas_padding_color_changed),
+                    combo);
+
+  prefs_check_button_add (object, "padding-in-show-all",
+                          _("_Keep canvas padding in \"Show All\" mode"),
+                          GTK_BOX (vbox));
+}
+
+static void
+prefs_behavior_options_frame_add (Gimp         *gimp,
+                                  GObject      *object,
+                                  const gchar  *label,
+                                  GtkContainer *parent)
+{
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *checks_vbox;
+
+  vbox = prefs_frame_new (label, parent, FALSE);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  checks_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (checks_vbox);
+
+  prefs_check_button_add (object, "snap-to-guides",
+                          _("Snap to _Guides"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "snap-to-grid",
+                          _("S_nap to Grid"),
+                          GTK_BOX (checks_vbox));
+
+  checks_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (checks_vbox);
+
+  prefs_check_button_add (object, "snap-to-canvas",
+                          _("Snap to Canvas _Edges"),
+                          GTK_BOX (checks_vbox));
+  prefs_check_button_add (object, "snap-to-path",
+                          _("Snap to _Active Path"),
+                          GTK_BOX (checks_vbox));
+}
+
+static void
+prefs_help_func (const gchar *help_id,
+                 gpointer     help_data)
+{
+  GtkWidget *prefs_box;
+
+  prefs_box = g_object_get_data (G_OBJECT (help_data), "prefs-box");
+
+  help_id = gimp_prefs_box_get_current_help_id (GIMP_PREFS_BOX (prefs_box));
+
+  gimp_standard_help_func (help_id, NULL);
+}
+
+static void
+prefs_message (GtkMessageType  type,
+               gboolean        destroy_with_parent,
+               const gchar    *message)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_message_dialog_new (GTK_WINDOW (prefs_dialog),
+                                   destroy_with_parent ?
+                                   GTK_DIALOG_DESTROY_WITH_PARENT : 0,
+                                   type, GTK_BUTTONS_OK,
+                                   "%s", message);
+
+  gtk_dialog_run (GTK_DIALOG (dialog));
+
+  gtk_widget_destroy (dialog);
+}
+
+static GtkWidget *
+prefs_dialog_new (Gimp       *gimp,
+                  GimpConfig *config)
+{
+  GtkWidget         *dialog;
+  GtkTreeIter        top_iter;
+  GtkTreeIter        child_iter;
+
+  GtkWidget         *prefs_box;
+  GtkSizeGroup      *size_group = NULL;
+  GtkWidget         *vbox;
+  GtkWidget         *hbox;
+  GtkWidget         *vbox2;
+  GtkWidget         *vbox3;
+  GtkWidget         *button;
+  GtkWidget         *button2;
+  GtkWidget         *table;
+  GtkWidget         *label;
+  GtkWidget         *entry;
+  GtkWidget         *calibrate_button;
+  GSList            *group;
+  GtkWidget         *separator;
+  GtkWidget         *editor;
+  gint               i;
+
+  GObject           *object;
+  GimpCoreConfig    *core_config;
+  GimpDisplayConfig *display_config;
+  GList             *manuals;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONFIG (config), NULL);
+
+  object         = G_OBJECT (config);
+  core_config    = GIMP_CORE_CONFIG (config);
+  display_config = GIMP_DISPLAY_CONFIG (config);
+
+  dialog = gimp_dialog_new (_("Preferences"), "gimp-preferences",
+                            NULL, 0,
+                            prefs_help_func,
+                            GIMP_HELP_PREFS_DIALOG,
+
+                            _("_Reset"),  RESPONSE_RESET,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
+
+                            NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (prefs_response),
+                    dialog);
+
+  /* The prefs box */
+  prefs_box = gimp_prefs_box_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (prefs_box), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      prefs_box, TRUE, TRUE, 0);
+  gtk_widget_show (prefs_box);
+
+  g_object_set_data (G_OBJECT (dialog), "prefs-box", prefs_box);
+
+
+  /**********************/
+  /*  System Resources  */
+  /**********************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-system-resources",
+                                  _("System Resources"),
+                                  _("System Resources"),
+                                  GIMP_HELP_PREFS_SYSTEM_RESOURCES,
+                                  NULL,
+                                  &top_iter);
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  vbox2 = prefs_frame_new (_("Resource Consumption"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+#ifdef ENABLE_MP
+  table = prefs_table_new (6, GTK_CONTAINER (vbox2));
+#else
+  table = prefs_table_new (5, GTK_CONTAINER (vbox2));
+#endif /* ENABLE_MP */
+
+  prefs_spin_button_add (object, "undo-levels", 1.0, 5.0, 0,
+                         _("Minimal number of _undo levels:"),
+                         GTK_TABLE (table), 0, size_group);
+  prefs_memsize_entry_add (object, "undo-size",
+                           _("Maximum undo _memory:"),
+                           GTK_TABLE (table), 1, size_group);
+  prefs_memsize_entry_add (object, "tile-cache-size",
+                           _("Tile cache _size:"),
+                           GTK_TABLE (table), 2, size_group);
+  prefs_memsize_entry_add (object, "max-new-image-size",
+                           _("Maximum _new image size:"),
+                           GTK_TABLE (table), 3, size_group);
+
+  prefs_compression_combo_box_add (object, "swap-compression",
+                                   _("S_wap compression:"),
+                                   GTK_TABLE (table), 4, size_group);
+
+#ifdef ENABLE_MP
+  prefs_spin_button_add (object, "num-processors", 1.0, 4.0, 0,
+                         _("Number of _threads to use:"),
+                         GTK_TABLE (table), 5, size_group);
+#endif /* ENABLE_MP */
+
+  /*  Internet access  */
+#ifdef CHECK_UPDATE
+  if (gimp_version_check_update ())
+    {
+      vbox2 = prefs_frame_new (_("Network access"), GTK_CONTAINER (vbox),
+                               FALSE);
+
+      prefs_check_button_add (object, "check-updates",
+                              _("Check for updates (requires internet)"),
+                              GTK_BOX (vbox2));
+    }
+#endif
+
+  /*  Image Thumbnails  */
+  vbox2 = prefs_frame_new (_("Image Thumbnails"), GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "thumbnail-size", 0, 0,
+                            _("Size of _thumbnails:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  prefs_memsize_entry_add (object, "thumbnail-filesize-limit",
+                           _("Maximum _filesize for thumbnailing:"),
+                           GTK_TABLE (table), 1, size_group);
+
+  /*  Document History  */
+  vbox2 = prefs_frame_new (_("Document History"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "save-document-history",
+                          _("_Keep record of used files in the Recent Documents list"),
+                          GTK_BOX (vbox2));
+
+  g_clear_object (&size_group);
+
+
+  /***************/
+  /*  Debugging  */
+  /***************/
+  /* No debugging preferences are needed on win32. Either GIMP has been
+   * built with DrMinGW support (HAVE_EXCHNDL) or not. If it has, then
+   * the backtracing is enabled and can't be disabled. It assume it will
+   * work only upon a crash.
+   */
+#ifndef G_OS_WIN32
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-wilber-eek", /* TODO: icon needed. */
+                                  _("Debugging"),
+                                  _("Debugging"),
+                                  GIMP_HELP_PREFS_DEBUGGING,
+                                  NULL,
+                                  &top_iter);
+
+  hbox = g_object_new (GIMP_TYPE_HINT_BOX,
+                       "icon-name", GIMP_ICON_DIALOG_WARNING,
+                       "hint",      _("We hope you will never need these "
+                                      "settings, but as all software, GIMP "
+                                      "has bugs, and crashes can occur. If it "
+                                      "happens, you can help us by reporting "
+                                      "bugs."),
+                        NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  vbox2 = prefs_frame_new (_("Bug Reporting"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  button = prefs_enum_combo_box_add (object, "debug-policy", 0, 0,
+                                     _("Debug _policy:"),
+                                     GTK_TABLE (table), 0, NULL);
+
+  /* Check existence of gdb or lldb to activate the preference, as a
+   * good hint of its prerequisite, unless backtrace() API exists, in
+   * which case the feature is always available.
+   */
+  hbox = NULL;
+  if (! gimp_stack_trace_available (TRUE))
+    {
+#ifndef HAVE_EXECINFO_H
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
+                                 _("This feature requires \"gdb\" or \"lldb\" installed on your system."));
+      gtk_widget_set_sensitive (button, FALSE);
+#else
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
+                                 _("This feature is more efficient with \"gdb\" or \"lldb\" installed on your system."));
+#endif /* ! HAVE_EXECINFO_H */
+    }
+  if (hbox)
+    gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+
+#endif /* ! G_OS_WIN32 */
+
+  /**********************/
+  /*  Color Management  */
+  /**********************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-color-management",
+                                  _("Color Management"),
+                                  _("Color Management"),
+                                  GIMP_HELP_PREFS_COLOR_MANAGEMENT,
+                                  NULL,
+                                  &top_iter);
+
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  button = gimp_prefs_box_set_page_resettable (GIMP_PREFS_BOX (prefs_box),
+                                               vbox,
+                                               _("R_eset Color Management"));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_color_management_reset),
+                    config);
+
+  {
+    GObject      *color_config = G_OBJECT (core_config->color_management);
+    GtkListStore *store;
+    gchar        *filename;
+    gint          row = 0;
+
+    filename = gimp_personal_rc_file ("profilerc");
+    store = gimp_color_profile_store_new (filename);
+    g_free (filename);
+
+    gimp_color_profile_store_add_file (GIMP_COLOR_PROFILE_STORE (store),
+                                       NULL, NULL);
+
+    size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+    table = prefs_table_new (1, GTK_CONTAINER (vbox));
+
+    prefs_enum_combo_box_add (color_config, "mode", 0, 0,
+                              _("Image display _mode:"),
+                              GTK_TABLE (table), row++, NULL);
+
+    /*  Color Managed Display  */
+    vbox2 = prefs_frame_new (_("Color Managed Display"), GTK_CONTAINER (vbox),
+                             FALSE);
+
+    table = prefs_table_new (4, GTK_CONTAINER (vbox2));
+    row = 0;
+
+    prefs_profile_combo_box_add (color_config,
+                                 "display-profile",
+                                 store,
+                                 _("Select Monitor Color Profile"),
+                                 _("_Monitor profile:"),
+                                 GTK_TABLE (table), row++, size_group,
+                                 object, "color-profile-path");
+
+    button = gimp_prop_check_button_new (color_config,
+                                         "display-profile-from-gdk",
+                                         _("_Try to use the system monitor "
+                                           "profile"));
+    gtk_table_attach_defaults (GTK_TABLE (table),
+                               button, 1, 2, row, row + 1);
+    gtk_widget_show (button);
+    row++;
+
+    prefs_enum_combo_box_add (color_config,
+                              "display-rendering-intent", 0, 0,
+                              _("_Rendering intent:"),
+                              GTK_TABLE (table), row++, size_group);
+
+    button = gimp_prop_check_button_new (color_config,
+                                         "display-use-black-point-compensation",
+                                         _("Use _black point compensation"));
+    gtk_table_attach_defaults (GTK_TABLE (table),
+                               button, 1, 2, row, row + 1);
+    gtk_widget_show (button);
+    row++;
+
+    prefs_boolean_combo_box_add (color_config,
+                                 "display-optimize",
+                                 _("Speed"),
+                                 _("Precision / Color Fidelity"),
+                                 _("_Optimize image display for:"),
+                                 GTK_TABLE (table), row++, size_group);
+
+    /*  Print Simulation (Soft-proofing)  */
+    vbox2 = prefs_frame_new (_("Soft-Proofing"),
+                             GTK_CONTAINER (vbox),
+                             FALSE);
+
+    table = prefs_table_new (4, GTK_CONTAINER (vbox2));
+    row = 0;
+
+    prefs_profile_combo_box_add (color_config,
+                                 "printer-profile",
+                                 store,
+                                 _("Select Soft-Proofing Color Profile"),
+                                 _("_Soft-proofing profile:"),
+                                 GTK_TABLE (table), row++, size_group,
+                                 object, "color-profile-path");
+
+    prefs_enum_combo_box_add (color_config,
+                              "simulation-rendering-intent", 0, 0,
+                              _("Re_ndering intent:"),
+                              GTK_TABLE (table), row++, size_group);
+
+    button = gimp_prop_check_button_new (color_config,
+                                         "simulation-use-black-point-compensation",
+                                         _("Use black _point compensation"));
+    gtk_table_attach_defaults (GTK_TABLE (table),
+                               button, 1, 2, row, row + 1);
+    gtk_widget_show (button);
+    row++;
+
+    prefs_boolean_combo_box_add (color_config,
+                                 "simulation-optimize",
+                                 _("Speed"),
+                                 _("Precision / Color Fidelity"),
+                                 _("O_ptimize soft-proofing for:"),
+                                 GTK_TABLE (table), row++, size_group);
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, row, row + 1);
+    gtk_widget_show (hbox);
+    row++;
+
+    button = gimp_prop_check_button_new (color_config, "simulation-gamut-check",
+                                         _("Mar_k out of gamut colors"));
+    gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+    gtk_widget_show (button);
+
+    button = gimp_prop_color_button_new (color_config, "out-of-gamut-color",
+                                         _("Select Warning Color"),
+                                         PREFS_COLOR_BUTTON_WIDTH,
+                                         PREFS_COLOR_BUTTON_HEIGHT,
+                                         GIMP_COLOR_AREA_FLAT);
+    gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+    gtk_widget_show (button);
+
+    gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
+                                  gimp_get_user_context (gimp));
+
+    /*  Preferred profiles  */
+    vbox2 = prefs_frame_new (_("Preferred Profiles"), GTK_CONTAINER (vbox),
+                             FALSE);
+
+    table = prefs_table_new (3, GTK_CONTAINER (vbox2));
+    row = 0;
+
+    prefs_profile_combo_box_add (color_config,
+                                 "rgb-profile",
+                                 store,
+                                 _("Select Preferred RGB Color Profile"),
+                                 _("_RGB profile:"),
+                                 GTK_TABLE (table), row++, size_group,
+                                 object, "color-profile-path");
+
+    prefs_profile_combo_box_add (color_config,
+                                 "gray-profile",
+                                 store,
+                                 _("Select Preferred Grayscale Color Profile"),
+                                 _("_Grayscale profile:"),
+                                 GTK_TABLE (table), row++, size_group,
+                                 object, "color-profile-path");
+
+    prefs_profile_combo_box_add (color_config,
+                                 "cmyk-profile",
+                                 store,
+                                 _("Select CMYK Color Profile"),
+                                 _("_CMYK profile:"),
+                                 GTK_TABLE (table), row++, size_group,
+                                 object, "color-profile-path");
+
+    /*  Policies  */
+    vbox2 = prefs_frame_new (_("Policies"), GTK_CONTAINER (vbox),
+                             FALSE);
+    table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+    button = prefs_enum_combo_box_add (object, "color-profile-policy", 0, 0,
+                                       _("_File Open behaviour:"),
+                                       GTK_TABLE (table), 0, size_group);
+
+    /*  Filter Dialogs  */
+    vbox2 = prefs_frame_new (_("Filter Dialogs"), GTK_CONTAINER (vbox),
+                             FALSE);
+
+    button = prefs_check_button_add (object, "filter-tool-show-color-options",
+                                     _("Show _advanced color options"),
+                                     GTK_BOX (vbox2));
+
+    g_clear_object (&size_group);
+
+    g_object_unref (store);
+  }
+
+
+  /***************************/
+  /*  Image Import / Export  */
+  /***************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-import-export",
+                                  _("Image Import & Export"),
+                                  _("Image Import & Export"),
+                                  GIMP_HELP_PREFS_IMPORT_EXPORT,
+                                  NULL,
+                                  &top_iter);
+
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Import Policies  */
+  vbox2 = prefs_frame_new (_("Import Policies"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  button = prefs_check_button_add (object, "import-promote-float",
+                                   _("Promote imported images to "
+                                     "_floating point precision"),
+                                   GTK_BOX (vbox2));
+
+  vbox3 = prefs_frame_new (NULL, GTK_CONTAINER (vbox2), FALSE);
+  g_object_bind_property (button, "active",
+                          vbox3,  "sensitive",
+                          G_BINDING_SYNC_CREATE);
+  button = prefs_check_button_add (object, "import-promote-dither",
+                                   _("_Dither images when promoting to "
+                                     "floating point"),
+                                   GTK_BOX (vbox3));
+
+  button = prefs_check_button_add (object, "import-add-alpha",
+                                   _("_Add an alpha channel to imported images"),
+                                   GTK_BOX (vbox2));
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+  button = prefs_enum_combo_box_add (object, "color-profile-policy", 0, 0,
+                                     _("Color _profile policy:"),
+                                     GTK_TABLE (table), 0, size_group);
+
+  /*  Export Policies  */
+  vbox2 = prefs_frame_new (_("Export Policies"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  button = prefs_check_button_add (object, "export-color-profile",
+                                   _("Export the i_mage's color profile by default"),
+                                   GTK_BOX (vbox2));
+  button = prefs_check_button_add (object, "export-metadata-exif",
+                                   /* Translators: label for
+                                    * configuration option (checkbox).
+                                    * It determines how file export
+                                    * plug-ins handle Exif by default.
+                                    */
+                                   _("Export _Exif metadata by default when available"),
+                                   GTK_BOX (vbox2));
+  button = prefs_check_button_add (object, "export-metadata-xmp",
+                                   /* Translators: label for
+                                    * configuration option (checkbox).
+                                    * It determines how file export
+                                    * plug-ins handle XMP by default.
+                                    */
+                                   _("Export _XMP metadata by default when available"),
+                                   GTK_BOX (vbox2));
+  button = prefs_check_button_add (object, "export-metadata-iptc",
+                                   /* Translators: label for
+                                    * configuration option (checkbox).
+                                    * It determines how file export
+                                    * plug-ins handle IPTC by default.
+                                    */
+                                   _("Export _IPTC metadata by default when available"),
+                                   GTK_BOX (vbox2));
+  hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
+                             _("Metadata can contain sensitive information."));
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+
+  /*  Export File Type  */
+  vbox2 = prefs_frame_new (_("Export File Type"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "export-file-type", 0, 0,
+                            _("Default export file t_ype:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  /*  Raw Image Importer  */
+  vbox2 = prefs_frame_new (_("Raw Image Importer"),
+                           GTK_CONTAINER (vbox), TRUE);
+
+  {
+    GtkWidget *scrolled_window;
+    GtkWidget *view;
+
+    scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                         GTK_SHADOW_IN);
+    gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window, TRUE, TRUE, 0);
+    gtk_widget_show (scrolled_window);
+
+    view = gimp_plug_in_view_new (gimp->plug_in_manager->display_raw_load_procs);
+    gimp_plug_in_view_set_plug_in (GIMP_PLUG_IN_VIEW (view),
+                                   core_config->import_raw_plug_in);
+    gtk_container_add (GTK_CONTAINER (scrolled_window), view);
+    gtk_widget_show (view);
+
+    g_signal_connect (view, "changed",
+                      G_CALLBACK (prefs_import_raw_procedure_callback),
+                      config);
+  }
+
+  g_clear_object (&size_group);
+
+
+  /****************/
+  /*  Playground  */
+  /****************/
+  if (gimp->show_playground)
+    {
+      vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                      "gimp-prefs-playground",
+                                      _("Experimental Playground"),
+                                      _("Playground"),
+                                      GIMP_HELP_PREFS_PLAYGROUND,
+                                      NULL,
+                                      &top_iter);
+
+      hbox = g_object_new (GIMP_TYPE_HINT_BOX,
+                           "icon-name", GIMP_ICON_DIALOG_WARNING,
+                           "hint",      _("These features are unfinished, buggy "
+                                          "and may crash GIMP. It is unadvised to "
+                                          "use them unless you really know what "
+                                          "you are doing or you intend to contribute "
+                                          "patches."),
+                           NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      /*  Hardware Acceleration  */
+      vbox2 = prefs_frame_new (_("Hardware Acceleration"), GTK_CONTAINER (vbox),
+                               FALSE);
+
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
+                                 _("OpenCL drivers and support are experimental, "
+                                   "expect slowdowns and possible crashes "
+                                   "(please report)."));
+      gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+
+      prefs_check_button_add (object, "use-opencl",
+                              _("Use O_penCL"),
+                              GTK_BOX (vbox2));
+
+      /*  Very unstable tools  */
+      vbox2 = prefs_frame_new (_("Insane Options"),
+                               GTK_CONTAINER (vbox), FALSE);
+
+      button = prefs_check_button_add (object, "playground-npd-tool",
+                                       _("_N-Point Deformation tool"),
+                                       GTK_BOX (vbox2));
+      button = prefs_check_button_add (object, "playground-seamless-clone-tool",
+                                       _("_Seamless Clone tool"),
+                                       GTK_BOX (vbox2));
+    }
+
+
+  /******************/
+  /*  Tool Options  */
+  /******************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-tool-options",
+                                  C_("preferences", "Tool Options"),
+                                  C_("preferences", "Tool Options"),
+                                  GIMP_HELP_PREFS_TOOL_OPTIONS,
+                                  NULL,
+                                  &top_iter);
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  General  */
+  vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "edit-non-visible",
+                          _("Allow _editing on non-visible layers"),
+                          GTK_BOX (vbox2));
+
+  prefs_check_button_add (object, "save-tool-options",
+                          _("_Save tool options on exit"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
+                             _("Save Tool Options _Now"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_tool_options_save_callback),
+                    gimp);
+
+  button2 = prefs_button_add (GIMP_ICON_RESET,
+                              _("_Reset Saved Tool Options to "
+                                "Default Values"),
+                              GTK_BOX (vbox2));
+  g_signal_connect (button2, "clicked",
+                    G_CALLBACK (prefs_tool_options_clear_callback),
+                    gimp);
+
+  g_object_set_data (G_OBJECT (button), "clear-button", button2);
+
+  /*  Scaling  */
+  vbox2 = prefs_frame_new (_("Scaling"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "interpolation-type", 0, 0,
+                            _("Default _interpolation:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  g_object_unref (size_group);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Global Brush, Pattern, ...  */
+  vbox2 = prefs_frame_new (_("Paint Options Shared Between Tools"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add_with_icon (object, "global-brush",
+                                    _("_Brush"),    GIMP_ICON_BRUSH,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "global-dynamics",
+                                    _("_Dynamics"), GIMP_ICON_DYNAMICS,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "global-pattern",
+                                    _("_Pattern"),  GIMP_ICON_PATTERN,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "global-gradient",
+                                    _("_Gradient"), GIMP_ICON_GRADIENT,
+                                    GTK_BOX (vbox2), size_group);
+
+  /*  Move Tool */
+  vbox2 = prefs_frame_new (_("Move Tool"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add_with_icon (object, "move-tool-changes-active",
+                                    _("Set _layer or path as active"),
+                                    GIMP_ICON_TOOL_MOVE,
+                                    GTK_BOX (vbox2), size_group);
+
+  g_clear_object (&size_group);
+
+
+  /*******************/
+  /*  Default Image  */
+  /*******************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-new-image",
+                                  _("Default New Image"),
+                                  _("Default Image"),
+                                  GIMP_HELP_PREFS_NEW_IMAGE,
+                                  NULL,
+                                  &top_iter);
+
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox));
+
+  {
+    GtkWidget *combo;
+
+    combo = gimp_container_combo_box_new (gimp->templates,
+                                          gimp_get_user_context (gimp),
+                                          16, 0);
+    gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                               _("_Template:"),  0.0, 0.5,
+                               combo, 1, FALSE);
+
+    gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL);
+
+    g_signal_connect (combo, "select-item",
+                      G_CALLBACK (prefs_template_select_callback),
+                      core_config->default_image);
+  }
+
+  editor = gimp_template_editor_new (core_config->default_image, gimp, FALSE);
+  gimp_template_editor_show_advanced (GIMP_TEMPLATE_EDITOR (editor), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), editor, FALSE, FALSE, 0);
+  gtk_widget_show (editor);
+
+  /*  Quick Mask Color */
+  vbox2 = prefs_frame_new (_("Quick Mask"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_color_button_add (object, "quick-mask-color",
+                          _("Quick Mask color:"),
+                          _("Set the default Quick Mask color"),
+                          GTK_TABLE (table), 0, NULL,
+                          gimp_get_user_context (gimp));
+
+
+  /**********************************/
+  /*  Default Image / Default Grid  */
+  /**********************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-default-grid",
+                                  _("Default Image Grid"),
+                                  _("Default Grid"),
+                                  GIMP_HELP_PREFS_DEFAULT_GRID,
+                                  &top_iter,
+                                  &child_iter);
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  /*  Grid  */
+  editor = gimp_grid_editor_new (core_config->default_grid,
+                                 gimp_get_user_context (gimp),
+                                 gimp_template_get_resolution_x (core_config->default_image),
+                                 gimp_template_get_resolution_y (core_config->default_image));
+  gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+
+  /***************/
+  /*  Interface  */
+  /***************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-interface",
+                                  _("User Interface"),
+                                  _("Interface"),
+                                  GIMP_HELP_PREFS_INTERFACE,
+                                  NULL,
+                                  &top_iter);
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  /*  Language  */
+
+  /*  Only add the language entry if the iso-codes package is available.  */
+#ifdef HAVE_ISO_CODES
+  vbox2 = prefs_frame_new (_("Language"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_language_combo_box_add (object, "language", GTK_BOX (vbox2));
+#endif
+
+  /*  Style  */
+  vbox2 = prefs_frame_new (_("Style"), GTK_CONTAINER (vbox), FALSE);
+
+  button = prefs_check_button_add (object, "compact-sliders",
+                                   _("Use co_mpact sliders"),
+                                   GTK_BOX (vbox2));
+
+  /*  Previews  */
+  vbox2 = prefs_frame_new (_("Previews"), GTK_CONTAINER (vbox), FALSE);
+
+  button = prefs_check_button_add (object, "layer-previews",
+                                   _("_Enable layer & channel previews"),
+                                   GTK_BOX (vbox2));
+
+  vbox3 = prefs_frame_new (NULL, GTK_CONTAINER (vbox2), FALSE);
+  g_object_bind_property (button, "active",
+                          vbox3,  "sensitive",
+                          G_BINDING_SYNC_CREATE);
+  button = prefs_check_button_add (object, "group-layer-previews",
+                                   _("Enable layer _group previews"),
+                                   GTK_BOX (vbox3));
+
+  table = prefs_table_new (3, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "layer-preview-size", 0, 0,
+                            _("_Default layer & channel preview size:"),
+                            GTK_TABLE (table), 0, NULL);
+  prefs_enum_combo_box_add (object, "undo-preview-size", 0, 0,
+                            _("_Undo preview size:"),
+                            GTK_TABLE (table), 1, NULL);
+  prefs_enum_combo_box_add (object, "navigation-preview-size", 0, 0,
+                            _("Na_vigation preview size:"),
+                            GTK_TABLE (table), 2, NULL);
+
+  /* Keyboard Shortcuts */
+  vbox2 = prefs_frame_new (_("Keyboard Shortcuts"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "can-change-accels",
+                          _("_Use dynamic keyboard shortcuts"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add (GIMP_ICON_PREFERENCES_SYSTEM,
+                             _("Configure _Keyboard Shortcuts..."),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_keyboard_shortcuts_dialog),
+                    gimp);
+
+  prefs_check_button_add (object, "save-accels",
+                          _("_Save keyboard shortcuts on exit"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
+                             _("Save Keyboard Shortcuts _Now"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_menus_save_callback),
+                    gimp);
+
+  button2 = prefs_button_add (GIMP_ICON_RESET,
+                              _("_Reset Keyboard Shortcuts to Default Values"),
+                              GTK_BOX (vbox2));
+  g_signal_connect (button2, "clicked",
+                    G_CALLBACK (prefs_menus_clear_callback),
+                    gimp);
+
+  g_object_set_data (G_OBJECT (button), "clear-button", button2);
+
+  button = prefs_button_add (GIMP_ICON_EDIT_CLEAR,
+                             _("Remove _All Keyboard Shortcuts"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_menus_remove_callback),
+                    gimp);
+
+
+  /***********************/
+  /*  Interface / Theme  */
+  /***********************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-theme",
+                                  _("Theme"),
+                                  _("Theme"),
+                                  GIMP_HELP_PREFS_THEME,
+                                  &top_iter,
+                                  &child_iter);
+
+  vbox2 = prefs_frame_new (_("Select Theme"), GTK_CONTAINER (vbox), TRUE);
+
+  {
+    GtkWidget         *scrolled_win;
+    GtkListStore      *list_store;
+    GtkWidget         *view;
+    GtkTreeSelection  *sel;
+    gchar            **themes;
+    gint               n_themes;
+    gint               i;
+
+    scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+    gtk_widget_set_size_request (scrolled_win, -1, 80);
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+                                         GTK_SHADOW_IN);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_box_pack_start (GTK_BOX (vbox2), scrolled_win, TRUE, TRUE, 0);
+    gtk_widget_show (scrolled_win);
+
+    list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+
+    view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
+    gtk_container_add (GTK_CONTAINER (scrolled_win), view);
+    gtk_widget_show (view);
+
+    g_object_unref (list_store);
+
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 0,
+                                                 _("Theme"),
+                                                 gtk_cell_renderer_text_new (),
+                                                 "text", 0,
+                                                 NULL);
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 1,
+                                                 _("Folder"),
+                                                 gtk_cell_renderer_text_new (),
+                                                 "text", 1,
+                                                 NULL);
+
+    sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+    themes = themes_list_themes (gimp, &n_themes);
+
+    for (i = 0; i < n_themes; i++)
+      {
+        GtkTreeIter  iter;
+        GFile       *theme_dir = themes_get_theme_dir (gimp, themes[i]);
+
+        gtk_list_store_append (list_store, &iter);
+        gtk_list_store_set (list_store, &iter,
+                            0, themes[i],
+                            1, gimp_file_get_utf8_name (theme_dir),
+                            -1);
+
+        if (GIMP_GUI_CONFIG (object)->theme &&
+            ! strcmp (GIMP_GUI_CONFIG (object)->theme, themes[i]))
+          {
+            GtkTreePath *path;
+
+            path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
+
+            gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE);
+            gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (view), path,
+                                          NULL, FALSE, 0.0, 0.0);
+
+            gtk_tree_path_free (path);
+          }
+      }
+
+    g_strfreev (themes);
+
+    g_signal_connect (sel, "changed",
+                      G_CALLBACK (prefs_theme_select_callback),
+                      gimp);
+  }
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = prefs_button_add (GIMP_ICON_VIEW_REFRESH,
+                             _("Reload C_urrent Theme"),
+                             GTK_BOX (hbox));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_theme_reload_callback),
+                    gimp);
+
+
+  /****************************/
+  /*  Interface / Icon Theme  */
+  /****************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-icon-theme",
+                                  _("Icon Theme"),
+                                  _("Icon Theme"),
+                                  GIMP_HELP_PREFS_ICON_THEME,
+                                  &top_iter,
+                                  &child_iter);
+
+  vbox2 = prefs_frame_new (_("Select an Icon Theme"), GTK_CONTAINER (vbox), TRUE);
+
+  {
+    GtkWidget         *scrolled_win;
+    GtkWidget         *icon_size_scale;
+    GtkListStore      *list_store;
+    GtkWidget         *view;
+    GtkTreeSelection  *sel;
+    gchar            **icon_themes;
+    gint               n_icon_themes;
+    gint               i;
+
+    scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+    gtk_widget_set_size_request (scrolled_win, -1, 80);
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+                                         GTK_SHADOW_IN);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_box_pack_start (GTK_BOX (vbox2), scrolled_win, TRUE, TRUE, 0);
+    gtk_widget_show (scrolled_win);
+
+    list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+
+    view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
+    gtk_container_add (GTK_CONTAINER (scrolled_win), view);
+    gtk_widget_show (view);
+
+    g_object_unref (list_store);
+
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 0,
+                                                 NULL,
+                                                 gtk_cell_renderer_pixbuf_new (),
+                                                 "pixbuf", 0,
+                                                 NULL);
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 1,
+                                                 _("Icon Theme"),
+                                                 gtk_cell_renderer_text_new (),
+                                                 "text", 1,
+                                                 NULL);
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 2,
+                                                 _("Folder"),
+                                                 gtk_cell_renderer_text_new (),
+                                                 "text", 2,
+                                                 NULL);
+
+    sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+    icon_themes = icon_themes_list_themes (gimp, &n_icon_themes);
+
+    for (i = 0; i < n_icon_themes; i++)
+      {
+        GtkTreeIter   iter;
+        GFile        *icon_theme_dir = icon_themes_get_theme_dir (gimp, icon_themes[i]);
+        GFile        *icon_theme_search_path = g_file_get_parent (icon_theme_dir);
+        GtkIconTheme *theme;
+        gchar        *example;
+        GdkPixbuf    *pixbuf;
+
+        theme = gtk_icon_theme_new ();
+        gtk_icon_theme_prepend_search_path (theme, gimp_file_get_utf8_name(icon_theme_search_path));
+        g_object_unref (icon_theme_search_path);
+        gtk_icon_theme_set_custom_theme (theme, icon_themes[i]);
+
+        example = gtk_icon_theme_get_example_icon_name (theme);
+        if (! example)
+          {
+            /* If the icon theme didn't explicitly specify an example
+             * icon, try "gimp-wilber".
+             */
+            example = g_strdup ("gimp-wilber");
+          }
+        pixbuf = gtk_icon_theme_load_icon (theme, example, 16, 0, NULL);
+
+        gtk_list_store_append (list_store, &iter);
+        gtk_list_store_set (list_store, &iter,
+                            0, pixbuf,
+                            1, icon_themes[i],
+                            2, gimp_file_get_utf8_name (icon_theme_dir),
+                            -1);
+        g_object_unref (theme);
+        g_object_unref (pixbuf);
+        g_free (example);
+
+        if (GIMP_GUI_CONFIG (object)->icon_theme &&
+            ! strcmp (GIMP_GUI_CONFIG (object)->icon_theme, icon_themes[i]))
+          {
+            GtkTreePath *path;
+
+            path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
+
+            gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE);
+            gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (view), path,
+                                          NULL, FALSE, 0.0, 0.0);
+
+            gtk_tree_path_free (path);
+          }
+      }
+
+    g_strfreev (icon_themes);
+
+    g_signal_connect (sel, "changed",
+                      G_CALLBACK (prefs_icon_theme_select_callback),
+                      gimp);
+
+    icon_size_scale = gimp_icon_size_scale_new (gimp);
+    gtk_box_pack_start (GTK_BOX (vbox), icon_size_scale, FALSE, FALSE, 0);
+    gtk_widget_show (icon_size_scale);
+  }
+
+
+  /*************************/
+  /*  Interface / Toolbox  */
+  /*************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-toolbox",
+                                  _("Toolbox"),
+                                  _("Toolbox"),
+                                  GIMP_HELP_PREFS_TOOLBOX,
+                                  &top_iter,
+                                  &child_iter);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Appearance  */
+  vbox2 = prefs_frame_new (_("Appearance"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add_with_icon (object, "toolbox-wilber",
+                                    _("Show GIMP _logo (drag-and-drop target)"),
+                                    GIMP_ICON_WILBER,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "toolbox-color-area",
+                                    _("Show _foreground & background color"),
+                                    GIMP_ICON_COLORS_DEFAULT,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "toolbox-foo-area",
+                                    _("Show active _brush, pattern & gradient"),
+                                    GIMP_ICON_BRUSH,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "toolbox-image-area",
+                                    _("Show active _image"),
+                                    GIMP_ICON_IMAGE,
+                                    GTK_BOX (vbox2), size_group);
+
+  separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_box_pack_start (GTK_BOX (vbox2), separator, FALSE, FALSE, 0);
+  gtk_widget_show (separator);
+
+  button = prefs_check_button_add_with_icon (object, "toolbox-groups",
+                                             _("Use tool _groups"),
+                                             NULL,
+                                             GTK_BOX (vbox2), size_group);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (NULL);
+  gtk_misc_set_padding (GTK_MISC (label), 2, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  gtk_size_group_add_widget (size_group, label);
+
+  vbox3 = prefs_frame_new (NULL, GTK_CONTAINER (hbox), TRUE);
+  g_object_bind_property (button, "active",
+                          vbox3,  "sensitive",
+                          G_BINDING_SYNC_CREATE);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox3));
+
+  prefs_enum_combo_box_add (object, "toolbox-group-menu-mode", 0, 0,
+                            _("_Menu mode:"),
+                            GTK_TABLE (table), 0,
+                            NULL);
+
+  g_clear_object (&size_group);
+
+  /* Tool Editor */
+  vbox2 = prefs_frame_new (_("Tools Configuration"),
+                           GTK_CONTAINER (vbox), TRUE);
+  tool_editor = gimp_tool_editor_new (gimp->tool_item_list, gimp->user_context,
+                                      GIMP_VIEW_SIZE_SMALL, 1);
+
+  gtk_box_pack_start (GTK_BOX (vbox2), tool_editor, TRUE, TRUE, 0);
+  gtk_widget_show (tool_editor);
+
+
+  /*********************************/
+  /*  Interface / Dialog Defaults  */
+  /*********************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  /* FIXME need an icon */
+                                  "gimp-prefs-controllers",
+                                  _("Dialog Defaults"),
+                                  _("Dialog Defaults"),
+                                  GIMP_HELP_PREFS_DIALOG_DEFAULTS,
+                                  &top_iter,
+                                  &child_iter);
+
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  button = gimp_prefs_box_set_page_resettable (GIMP_PREFS_BOX (prefs_box),
+                                               vbox,
+                                               _("Reset Dialog _Defaults"));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_dialog_defaults_reset),
+                    config);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Color profile import dialog  */
+  vbox2 = prefs_frame_new (_("Color Profile Import Dialog"), GTK_CONTAINER (vbox),
+                           FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  button = prefs_enum_combo_box_add (object, "color-profile-policy", 0, 0,
+                                     _("Color profile policy:"),
+                                     GTK_TABLE (table), 0, size_group);
+
+  /*  All color profile chooser dialogs  */
+  vbox2 = prefs_frame_new (_("Color Profile File Dialogs"), GTK_CONTAINER (vbox),
+                           FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_file_chooser_button_add (object, "color-profile-path",
+                                 _("Profile folder:"),
+                                 _("Select Default Folder for Color Profiles"),
+                                 GTK_TABLE (table), 0, size_group);
+
+  /*  Convert to Color Profile Dialog  */
+  vbox2 = prefs_frame_new (_("Convert to Color Profile Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "image-convert-profile-intent", 0, 0,
+                            _("Rendering intent:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "image-convert-profile-black-point-compensation",
+                          _("Black point compensation"),
+                          GTK_BOX (vbox2));
+
+  /*  Convert Precision Dialog  */
+  vbox2 = prefs_frame_new (_("Precision Conversion Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (3, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object,
+                            "image-convert-precision-layer-dither-method",
+                            0, 0,
+                            _("Dither layers:"),
+                            GTK_TABLE (table), 0, size_group);
+  prefs_enum_combo_box_add (object,
+                            "image-convert-precision-text-layer-dither-method",
+                            0, 0,
+                            _("Dither text layers:"),
+                            GTK_TABLE (table), 1, size_group);
+  prefs_enum_combo_box_add (object,
+                            "image-convert-precision-channel-dither-method",
+                            0, 0,
+                            _("Dither channels/masks:"),
+                            GTK_TABLE (table), 2, size_group);
+
+  /*  Convert Indexed Dialog  */
+  vbox2 = prefs_frame_new (_("Indexed Conversion Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "image-convert-indexed-palette-type", 0, 0,
+                            _("Colormap:"),
+                            GTK_TABLE (table), 0, size_group);
+  prefs_spin_button_add (object, "image-convert-indexed-max-colors", 1.0, 8.0, 0,
+                         _("Maximum number of colors:"),
+                         GTK_TABLE (table), 1, size_group);
+
+  prefs_check_button_add (object, "image-convert-indexed-remove-duplicates",
+                          _("Remove unused and duplicate colors "
+                            "from colormap"),
+                          GTK_BOX (vbox2));
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+  prefs_enum_combo_box_add (object, "image-convert-indexed-dither-type", 0, 0,
+                            _("Color dithering:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "image-convert-indexed-dither-alpha",
+                          _("Enable dithering of transparency"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "image-convert-indexed-dither-text-layers",
+                          _("Enable dithering of text layers"),
+                          GTK_BOX (vbox2));
+
+  /*  Filter Dialogs  */
+  vbox2 = prefs_frame_new (_("Filter Dialogs"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "filter-tool-max-recent", 1.0, 8.0, 0,
+                         _("Keep recent settings:"),
+                         GTK_TABLE (table), 1, size_group);
+
+  button = prefs_check_button_add (object, "filter-tool-use-last-settings",
+                                   _("Default to the last used settings"),
+                                   GTK_BOX (vbox2));
+  button = prefs_check_button_add (object, "filter-tool-show-color-options",
+                                   _("Show advanced color options"),
+                                   GTK_BOX (vbox2));
+
+  /*  Canvas Size Dialog  */
+  vbox2 = prefs_frame_new (_("Canvas Size Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "image-resize-fill-type", 0, 0,
+                            _("Fill with:"),
+                            GTK_TABLE (table), 0, size_group);
+  prefs_enum_combo_box_add (object, "image-resize-layer-set", 0, 0,
+                            _("Resize layers:"),
+                            GTK_TABLE (table), 1, size_group);
+
+  prefs_check_button_add (object, "image-resize-resize-text-layers",
+                          _("Resize text layers"),
+                          GTK_BOX (vbox2));
+
+  /*  New Layer Dialog  */
+  vbox2 = prefs_frame_new (_("New Layer Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_entry_add (object, "layer-new-name",
+                   _("Layer name:"),
+                   GTK_TABLE (table), 0, size_group);
+
+  prefs_enum_combo_box_add (object, "layer-new-fill-type", 0, 0,
+                            _("Fill type:"),
+                            GTK_TABLE (table), 1, size_group);
+
+  /*  Layer Boundary Size Dialog  */
+  vbox2 = prefs_frame_new (_("Layer Boundary Size Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "layer-resize-fill-type", 0, 0,
+                            _("Fill with:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  /*  Add Layer Mask Dialog  */
+  vbox2 = prefs_frame_new (_("Add Layer Mask Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "layer-add-mask-type", 0, 0,
+                            _("Layer mask type:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "layer-add-mask-invert",
+                          _("Invert mask"),
+                          GTK_BOX (vbox2));
+
+  /*  Merge Layers Dialog  */
+  vbox2 = prefs_frame_new (_("Merge Layers Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "layer-merge-type",
+                            GIMP_EXPAND_AS_NECESSARY,
+                            GIMP_CLIP_TO_BOTTOM_LAYER,
+                            _("Merged layer size:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "layer-merge-active-group-only",
+                          _("Merge within active group only"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "layer-merge-discard-invisible",
+                          _("Discard invisible layers"),
+                          GTK_BOX (vbox2));
+
+  /*  New Channel Dialog  */
+  vbox2 = prefs_frame_new (_("New Channel Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_entry_add (object, "channel-new-name",
+                   _("Channel name:"),
+                   GTK_TABLE (table), 0, size_group);
+
+  prefs_color_button_add (object, "channel-new-color",
+                          _("Color and opacity:"),
+                          _("Default New Channel Color and Opacity"),
+                          GTK_TABLE (table), 1, size_group,
+                          gimp_get_user_context (gimp));
+
+  /*  New Path Dialog  */
+  vbox2 = prefs_frame_new (_("New Path Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_entry_add (object, "path-new-name",
+                   _("Path name:"),
+                   GTK_TABLE (table), 0, size_group);
+
+  /*  Export Path Dialog  */
+  vbox2 = prefs_frame_new (_("Export Paths Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_file_chooser_button_add (object, "path-export-path",
+                                 _("Export folder:"),
+                                 _("Select Default Folder for Exporting Paths"),
+                                 GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "path-export-active-only",
+                          _("Export the active path only"),
+                          GTK_BOX (vbox2));
+
+  /*  Import Path Dialog  */
+  vbox2 = prefs_frame_new (_("Import Paths Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_file_chooser_button_add (object, "path-import-path",
+                                 _("Import folder:"),
+                                 _("Select Default Folder for Importing Paths"),
+                                 GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "path-import-merge",
+                          _("Merge imported paths"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "path-import-scale",
+                          _("Scale imported paths"),
+                          GTK_BOX (vbox2));
+
+  /*  Feather Selection Dialog  */
+  vbox2 = prefs_frame_new (_("Feather Selection Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "selection-feather-radius", 1.0, 10.0, 2,
+                         _("Feather radius:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "selection-feather-edge-lock",
+                          _("Selected areas continue outside the image"),
+                          GTK_BOX (vbox2));
+
+  /*  Grow Selection Dialog  */
+  vbox2 = prefs_frame_new (_("Grow Selection Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "selection-grow-radius", 1.0, 10.0, 0,
+                         _("Grow radius:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  /*  Shrink Selection Dialog  */
+  vbox2 = prefs_frame_new (_("Shrink Selection Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "selection-shrink-radius", 1.0, 10.0, 0,
+                         _("Shrink radius:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  prefs_check_button_add (object, "selection-shrink-edge-lock",
+                          _("Selected areas continue outside the image"),
+                          GTK_BOX (vbox2));
+
+  /*  Border Selection Dialog  */
+  vbox2 = prefs_frame_new (_("Border Selection Dialog"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "selection-border-radius", 1.0, 10.0, 0,
+                         _("Border radius:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  prefs_enum_combo_box_add (object, "selection-border-style", 0, 0,
+                            _("Border style:"),
+                            GTK_TABLE (table), 1, size_group);
+
+  prefs_check_button_add (object, "selection-border-edge-lock",
+                          _("Selected areas continue outside the image"),
+                          GTK_BOX (vbox2));
+
+  /*  Fill Options Dialog  */
+  vbox2 = prefs_frame_new (_("Fill Selection Outline & Fill Path Dialogs"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = gimp_fill_editor_new (GIMP_DIALOG_CONFIG (object)->fill_options,
+                                FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  /*  Stroke Options Dialog  */
+  vbox2 = prefs_frame_new (_("Stroke Selection & Stroke Path Dialogs"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  /* The stroke line width physical values could be based on either the
+   * x or y resolution, some average, or whatever which makes a bit of
+   * sense. There is no perfect answer. The actual stroke dialog though
+   * uses the y resolution on the opened image. So using the y resolution
+   * of the default image seems like the best compromise in the preferences.
+   */
+  table = gimp_stroke_editor_new (GIMP_DIALOG_CONFIG (object)->stroke_options,
+                                  gimp_template_get_resolution_y (core_config->default_image),
+                                  FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  g_clear_object (&size_group);
+
+
+  /*****************************/
+  /*  Interface / Help System  */
+  /*****************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-help-system",
+                                  _("Help System"),
+                                  _("Help System"),
+                                  GIMP_HELP_PREFS_HELP,
+                                  &top_iter,
+                                  &child_iter);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  General  */
+  vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "show-tooltips",
+                          _("Show _tooltips"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "show-help-button",
+                          _("Show help _buttons"),
+                          GTK_BOX (vbox2));
+
+  table = prefs_table_new (3, GTK_CONTAINER (vbox2));
+  button = prefs_boolean_combo_box_add (object, "user-manual-online",
+                                        _("Use the online version"),
+                                        _("Use a locally installed copy"),
+                                        _("U_ser manual:"),
+                                        GTK_TABLE (table), 0, size_group);
+  gimp_help_set_help_data (button, NULL, NULL);
+
+  manuals = gimp_help_get_installed_languages ();
+  entry   = NULL;
+  if (manuals != NULL)
+    {
+      gchar *help_locales = NULL;
+
+      entry = gimp_language_combo_box_new (TRUE,
+                                           _("User interface language"));
+
+      g_object_get (config, "help-locales", &help_locales, NULL);
+      if (help_locales && strlen (help_locales))
+        {
+          gchar *sep;
+
+          sep = strchr (help_locales, ':');
+          if (sep)
+            *sep = '\0';
+        }
+      if (help_locales)
+        {
+          gimp_language_combo_box_set_code (GIMP_LANGUAGE_COMBO_BOX (entry),
+                                            help_locales);
+          g_free (help_locales);
+        }
+      else
+        {
+          gimp_language_combo_box_set_code (GIMP_LANGUAGE_COMBO_BOX (entry),
+                                            "");
+        }
+      g_signal_connect (entry, "changed",
+                        G_CALLBACK (prefs_help_language_change_callback),
+                        gimp);
+      gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 1, 2);
+      gtk_widget_show (entry);
+    }
+
+  if (gimp_help_user_manual_is_installed (gimp))
+    {
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_INFORMATION,
+                                 _("There's a local installation "
+                                   "of the user manual."));
+    }
+  else
+    {
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
+                                 _("The user manual is not installed "
+                                   "locally."));
+    }
+  if (manuals)
+    {
+      g_object_set_data (G_OBJECT (hbox), "gimp", gimp);
+      g_signal_connect (entry, "changed",
+                        G_CALLBACK (prefs_help_language_change_callback2),
+                        hbox);
+      g_list_free_full (manuals, g_free);
+    }
+
+  gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 2, 3);
+  gtk_widget_show (hbox);
+
+  /*  Help Browser  */
+#ifdef HAVE_WEBKIT
+  /*  If there is no webkit available, assume we are on a platform
+   *  that doesn't use the help browser, so don't bother showing
+   *  the combo.
+   */
+  vbox2 = prefs_frame_new (_("Help Browser"), GTK_CONTAINER (vbox), FALSE);
+
+  if (gimp_help_browser_is_installed (gimp))
+    {
+      table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+      button = prefs_enum_combo_box_add (object, "help-browser", 0, 0,
+                                         _("H_elp browser to use:"),
+                                         GTK_TABLE (table), 0, size_group);
+    }
+  else
+    {
+      hbox = prefs_hint_box_new (GIMP_ICON_DIALOG_WARNING,
+                                 _("The GIMP help browser doesn't seem to "
+                                   "be installed. Using the web browser "
+                                   "instead."));
+      gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      g_object_set (config,
+                    "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
+                    NULL);
+    }
+#else
+  g_object_set (config,
+                "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
+                NULL);
+#endif /* HAVE_WEBKIT */
+
+  /* Action Search */
+  vbox2 = prefs_frame_new (_("Action Search"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_check_button_add (object, "search-show-unavailable-actions",
+                          _("Show _unavailable actions"),
+                          GTK_BOX (vbox2));
+  prefs_spin_button_add (object, "action-history-size", 1.0, 10.0, 0,
+                         _("_Maximum History Size:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  button = prefs_button_add (GIMP_ICON_SHRED,
+                             _("C_lear Action History"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_search_clear_callback),
+                    gimp);
+
+  g_clear_object (&size_group);
+
+
+  /*************************/
+  /*  Interface / Display  */
+  /*************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-display",
+                                  _("Display"),
+                                  _("Display"),
+                                  GIMP_HELP_PREFS_DISPLAY,
+                                  &top_iter,
+                                  &child_iter);
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Transparency  */
+  vbox2 = prefs_frame_new (_("Transparency"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "transparency-type", 0, 0,
+                            _("_Check style:"),
+                            GTK_TABLE (table), 0, size_group);
+  prefs_enum_combo_box_add (object, "transparency-size", 0, 0,
+                            _("Check _size:"),
+                            GTK_TABLE (table), 1, size_group);
+
+  vbox2 = prefs_frame_new (_("Monitor Resolution"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  {
+    gchar *pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
+
+    entry = gimp_prop_coordinates_new (object,
+                                       "monitor-xresolution",
+                                       "monitor-yresolution",
+                                       NULL,
+                                       pixels_per_unit,
+                                       GIMP_SIZE_ENTRY_UPDATE_RESOLUTION,
+                                       0.0, 0.0,
+                                       TRUE);
+
+    g_free (pixels_per_unit);
+  }
+
+  gtk_table_set_col_spacings (GTK_TABLE (entry), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (entry), 2);
+
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("Horizontal"), 0, 1, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("Vertical"), 0, 2, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("ppi"), 1, 4, 0.0);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 24);
+  gtk_widget_show (entry);
+  gtk_widget_set_sensitive (entry, ! display_config->monitor_res_from_gdk);
+
+  group = NULL;
+
+  {
+    gdouble  xres;
+    gdouble  yres;
+    gchar   *str;
+
+    gimp_get_monitor_resolution (gdk_screen_get_default (), /* FIXME monitor */
+                                 0, /* FIXME monitor */
+                                 &xres, &yres);
+
+    str = g_strdup_printf (_("_Detect automatically (currently %d × %d ppi)"),
+                           ROUND (xres), ROUND (yres));
+
+    button = gtk_radio_button_new_with_mnemonic (group, str);
+
+    g_free (str);
+  }
+
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_object_set_data (G_OBJECT (button), "monitor_resolution_sizeentry", entry);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (prefs_resolution_source_callback),
+                    config);
+
+  button = gtk_radio_button_new_with_mnemonic (group, _("_Enter manually"));
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  if (! display_config->monitor_res_from_gdk)
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  calibrate_button = gtk_button_new_with_mnemonic (_("C_alibrate..."));
+  label = gtk_bin_get_child (GTK_BIN (calibrate_button));
+  gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), calibrate_button, FALSE, FALSE, 0);
+  gtk_widget_show (calibrate_button);
+  gtk_widget_set_sensitive (calibrate_button,
+                            ! display_config->monitor_res_from_gdk);
+
+  g_object_bind_property (button, "active",
+                          entry,  "sensitive",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (button,           "active",
+                          calibrate_button, "sensitive",
+                          G_BINDING_SYNC_CREATE);
+
+  g_signal_connect (calibrate_button, "clicked",
+                    G_CALLBACK (prefs_resolution_calibrate_callback),
+                    entry);
+
+  g_clear_object (&size_group);
+
+
+  /***********************************/
+  /*  Interface / Window Management  */
+  /***********************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-window-management",
+                                  _("Window Management"),
+                                  _("Window Management"),
+                                  GIMP_HELP_PREFS_WINDOW_MANAGEMENT,
+                                  &top_iter,
+                                  &child_iter);
+
+  vbox2 = prefs_frame_new (_("Window Manager Hints"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
+                            _("Hint for _docks and toolbox:"),
+                            GTK_TABLE (table), 1, NULL);
+
+  vbox2 = prefs_frame_new (_("Focus"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "activate-on-focus",
+                          _("Activate the _focused image"),
+                          GTK_BOX (vbox2));
+
+  /* Window Positions */
+  vbox2 = prefs_frame_new (_("Window Positions"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "save-session-info",
+                          _("_Save window positions on exit"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "restore-monitor",
+                          _("Open windows on the same _monitor they were open before"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
+                             _("Save Window Positions _Now"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_session_save_callback),
+                    gimp);
+
+  button2 = prefs_button_add (GIMP_ICON_RESET,
+                              _("_Reset Saved Window Positions to "
+                                "Default Values"),
+                              GTK_BOX (vbox2));
+  g_signal_connect (button2, "clicked",
+                    G_CALLBACK (prefs_session_clear_callback),
+                    gimp);
+
+  g_object_set_data (G_OBJECT (button), "clear-button", button2);
+
+
+  /*******************/
+  /*  Image Windows  */
+  /*******************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-image-windows",
+                                  _("Image Windows"),
+                                  _("Image Windows"),
+                                  GIMP_HELP_PREFS_IMAGE_WINDOW,
+                                  NULL,
+                                  &top_iter);
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  General  */
+  vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "default-show-all",
+                          _("Use \"Show _all\" by default"),
+                          GTK_BOX (vbox2));
+
+  prefs_check_button_add (object, "default-dot-for-dot",
+                          _("Use \"_Dot for dot\" by default"),
+                          GTK_BOX (vbox2));
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "marching-ants-speed", 1.0, 10.0, 0,
+                         _("Marching ants s_peed:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  /*  Zoom & Resize Behavior  */
+  vbox2 = prefs_frame_new (_("Zoom & Resize Behavior"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "resize-windows-on-zoom",
+                          _("Resize window on _zoom"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "resize-windows-on-resize",
+                          _("Resize window on image _size change"),
+                          GTK_BOX (vbox2));
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_boolean_combo_box_add (object, "initial-zoom-to-fit",
+                               _("Show entire image"),
+                               "1:1",
+                               _("Initial zoom _ratio:"),
+                               GTK_TABLE (table), 0, size_group);
+
+  /*  Space Bar  */
+  vbox2 = prefs_frame_new (_("Space Bar"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "space-bar-action", 0, 0,
+                            _("_While space bar is pressed:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  /*  Mouse Pointers  */
+  vbox2 = prefs_frame_new (_("Mouse Pointers"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  button = prefs_check_button_add (object, "show-brush-outline",
+                                   _("Show _brush outline"),
+                                   GTK_BOX (vbox2));
+
+  vbox3 = prefs_frame_new (NULL, GTK_CONTAINER (vbox2), FALSE);
+  g_object_bind_property (button, "active",
+                          vbox3,  "sensitive",
+                          G_BINDING_SYNC_CREATE);
+  prefs_check_button_add (object, "snap-brush-outline",
+                          _("S_nap brush outline to stroke"),
+                          GTK_BOX (vbox3));
+
+  prefs_check_button_add (object, "show-paint-tool-cursor",
+                          _("Show pointer for paint _tools"),
+                          GTK_BOX (vbox2));
+
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "cursor-mode", 0, 0,
+                            _("Pointer _mode:"),
+                            GTK_TABLE (table), 0, size_group);
+  prefs_enum_combo_box_add (object, "cursor-handedness", 0, 0,
+                            _("Pointer _handedness:"),
+                            GTK_TABLE (table), 1, NULL);
+
+  g_clear_object (&size_group);
+
+
+  /********************************/
+  /*  Image Windows / Appearance  */
+  /********************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-image-windows-appearance",
+                                  _("Image Window Appearance"),
+                                  _("Appearance"),
+                                  GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
+                                  &top_iter,
+                                  &child_iter);
+
+  gimp_prefs_box_set_page_scrollable (GIMP_PREFS_BOX (prefs_box), vbox, TRUE);
+
+  prefs_display_options_frame_add (gimp,
+                                   G_OBJECT (display_config->default_view),
+                                   _("Default Appearance in Normal Mode"),
+                                   GTK_CONTAINER (vbox));
+
+  prefs_display_options_frame_add (gimp,
+                                   G_OBJECT (display_config->default_fullscreen_view),
+                                   _("Default Appearance in Fullscreen Mode"),
+                                   GTK_CONTAINER (vbox));
+
+
+  /****************************************************/
+  /*  Image Windows / Image Title & Statusbar Format  */
+  /****************************************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-image-title",
+                                  _("Image Title & Statusbar Format"),
+                                  _("Title & Status"),
+                                  GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE,
+                                  &top_iter,
+                                  &child_iter);
+
+  {
+    const gchar *format_strings[] =
+    {
+      NULL,
+      NULL,
+      "%f-%p.%i (%t) %z%%",
+      "%f-%p.%i (%t) %d:%s",
+      "%f-%p.%i (%t) %wx%h",
+      "%f-%p-%i (%t) %wx%h (%xx%y)"
+    };
+
+    const gchar *format_names[] =
+    {
+      N_("Current format"),
+      N_("Default format"),
+      N_("Show zoom percentage"),
+      N_("Show zoom ratio"),
+      N_("Show image size"),
+      N_("Show drawable size")
+    };
+
+    struct
+    {
+      gchar       *current_setting;
+      const gchar *default_setting;
+      const gchar *title;
+      const gchar *property_name;
+    }
+    formats[] =
+    {
+      { NULL, GIMP_CONFIG_DEFAULT_IMAGE_TITLE_FORMAT,
+        N_("Image Title Format"),     "image-title-format"  },
+      { NULL, GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT,
+        N_("Image Statusbar Format"), "image-status-format" }
+    };
+
+    gint format;
+
+    gimp_assert (G_N_ELEMENTS (format_strings) == G_N_ELEMENTS (format_names));
+
+    formats[0].current_setting = display_config->image_title_format;
+    formats[1].current_setting = display_config->image_status_format;
+
+    for (format = 0; format < G_N_ELEMENTS (formats); format++)
+      {
+        GtkWidget        *scrolled_win;
+        GtkListStore     *list_store;
+        GtkWidget        *view;
+        GtkTreeSelection *sel;
+        gint              i;
+
+        format_strings[0] = formats[format].current_setting;
+        format_strings[1] = formats[format].default_setting;
+
+        vbox2 = prefs_frame_new (gettext (formats[format].title),
+                                 GTK_CONTAINER (vbox), TRUE);
+
+        entry = gimp_prop_entry_new (object, formats[format].property_name, 0);
+        gtk_box_pack_start (GTK_BOX (vbox2), entry, FALSE, FALSE, 0);
+        gtk_widget_show (entry);
+
+        scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+                                             GTK_SHADOW_IN);
+        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                        GTK_POLICY_AUTOMATIC,
+                                        GTK_POLICY_AUTOMATIC);
+        gtk_box_pack_start (GTK_BOX (vbox2), scrolled_win, TRUE, TRUE, 0);
+        gtk_widget_show (scrolled_win);
+
+        list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+
+        view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
+        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE);
+        gtk_container_add (GTK_CONTAINER (scrolled_win), view);
+        gtk_widget_show (view);
+
+        g_object_unref (list_store);
+
+        gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 0,
+                                                     NULL,
+                                                     gtk_cell_renderer_text_new (),
+                                                     "text", 0,
+                                                     NULL);
+        gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), 1,
+                                                     NULL,
+                                                     gtk_cell_renderer_text_new (),
+                                                     "text", 1,
+                                                     NULL);
+
+        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+        for (i = 0; i < G_N_ELEMENTS (format_strings); i++)
+          {
+            GtkTreeIter iter;
+
+            gtk_list_store_append (list_store, &iter);
+            gtk_list_store_set (list_store, &iter,
+                                0, gettext (format_names[i]),
+                                1, format_strings[i],
+                                -1);
+
+            if (i == 0)
+              gtk_tree_selection_select_iter (sel, &iter);
+          }
+
+        g_signal_connect (sel, "changed",
+                          G_CALLBACK (prefs_format_string_select_callback),
+                          entry);
+      }
+  }
+
+
+  /******************************/
+  /*  Image Windows / Snapping  */
+  /******************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-image-windows-snapping",
+                                  _("Image Window Snapping Behavior"),
+                                  _("Snapping"),
+                                  GIMP_HELP_PREFS_IMAGE_WINDOW_SNAPPING,
+                                  &top_iter,
+                                  &child_iter);
+
+  prefs_behavior_options_frame_add (gimp,
+                                    G_OBJECT (display_config->default_view),
+                                    _("Default Behavior in Normal Mode"),
+                                    GTK_CONTAINER (vbox));
+  prefs_behavior_options_frame_add (gimp,
+                                    G_OBJECT (display_config->default_fullscreen_view),
+                                    _("Default Behavior in Fullscreen Mode"),
+                                    GTK_CONTAINER (vbox));
+
+  /*  Snapping Distance  */
+  vbox2 = prefs_frame_new (_("General"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "snap-distance", 1.0, 5.0, 0,
+                         _("_Snapping distance:"),
+                         GTK_TABLE (table), 0, NULL);
+
+
+  /*******************/
+  /*  Input Devices  */
+  /*******************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-input-devices",
+                                  _("Input Devices"),
+                                  _("Input Devices"),
+                                  GIMP_HELP_PREFS_INPUT_DEVICES,
+                                  NULL,
+                                  &top_iter);
+
+  /*  Extended Input Devices  */
+  vbox2 = prefs_frame_new (_("Extended Input Devices"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "devices-share-tool",
+                          _("S_hare tool and tool options between input devices"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add (GIMP_ICON_PREFERENCES_SYSTEM,
+                             _("Configure E_xtended Input Devices..."),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_input_devices_dialog),
+                    gimp);
+
+  prefs_check_button_add (object, "save-device-status",
+                          _("_Save input device settings on exit"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add (GIMP_ICON_DOCUMENT_SAVE,
+                             _("Save Input Device Settings _Now"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_devices_save_callback),
+                    gimp);
+
+  button2 = prefs_button_add (GIMP_ICON_RESET,
+                              _("_Reset Saved Input Device Settings to "
+                                "Default Values"),
+                              GTK_BOX (vbox2));
+  g_signal_connect (button2, "clicked",
+                    G_CALLBACK (prefs_devices_clear_callback),
+                    gimp);
+
+  g_object_set_data (G_OBJECT (button), "clear-button", button2);
+
+
+  /****************************/
+  /*  Additional Controllers  */
+  /****************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-controllers",
+                                  _("Additional Input Controllers"),
+                                  _("Input Controllers"),
+                                  GIMP_HELP_PREFS_INPUT_CONTROLLERS,
+                                  &top_iter,
+                                  &child_iter);
+
+  vbox2 = gimp_controller_list_new (gimp);
+  gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0);
+  gtk_widget_show (vbox2);
+
+
+  /*************/
+  /*  Folders  */
+  /*************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-folders",
+                                  _("Folders"),
+                                  _("Folders"),
+                                  GIMP_HELP_PREFS_FOLDERS,
+                                  NULL,
+                                  &top_iter);
+
+  button = gimp_prefs_box_set_page_resettable (GIMP_PREFS_BOX (prefs_box),
+                                               vbox,
+                                               _("Reset _Folders"));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_folders_reset),
+                    config);
+
+  {
+    static const struct
+    {
+      const gchar *property_name;
+      const gchar *label;
+      const gchar *dialog_title;
+    }
+    dirs[] =
+    {
+      {
+        "temp-path",
+        N_("_Temporary folder:"),
+        N_("Select Folder for Temporary Files")
+      },
+      {
+        "swap-path",
+        N_("_Swap folder:"),
+        N_("Select Swap Folder")
+      }
+    };
+
+    table = prefs_table_new (G_N_ELEMENTS (dirs) + 1, GTK_CONTAINER (vbox));
+
+    for (i = 0; i < G_N_ELEMENTS (dirs); i++)
+      {
+        prefs_file_chooser_button_add (object, dirs[i].property_name,
+                                       gettext (dirs[i].label),
+                                       gettext (dirs[i].dialog_title),
+                                       GTK_TABLE (table), i, NULL);
+      }
+  }
+
+
+  /*********************/
+  /* Folders / <paths> */
+  /*********************/
+  {
+    static const struct
+    {
+      const gchar *tree_label;
+      const gchar *label;
+      const gchar *icon;
+      const gchar *help_data;
+      const gchar *reset_label;
+      const gchar *fs_label;
+      const gchar *path_property_name;
+      const gchar *writable_property_name;
+    }
+    paths[] =
+    {
+      { N_("Brushes"), N_("Brush Folders"),
+        "folders-brushes",
+        GIMP_HELP_PREFS_FOLDERS_BRUSHES,
+        N_("Reset Brush _Folders"),
+        N_("Select Brush Folders"),
+        "brush-path", "brush-path-writable" },
+      { N_("Dynamics"), N_("Dynamics Folders"),
+        "folders-dynamics",
+        GIMP_HELP_PREFS_FOLDERS_DYNAMICS,
+        N_("Reset Dynamics _Folders"),
+        N_("Select Dynamics Folders"),
+        "dynamics-path", "dynamics-path-writable" },
+      { N_("Patterns"), N_("Pattern Folders"),
+        "folders-patterns",
+        GIMP_HELP_PREFS_FOLDERS_PATTERNS,
+        N_("Reset Pattern _Folders"),
+        N_("Select Pattern Folders"),
+        "pattern-path", "pattern-path-writable" },
+      { N_("Palettes"), N_("Palette Folders"),
+        "folders-palettes",
+        GIMP_HELP_PREFS_FOLDERS_PALETTES,
+        N_("Reset Palette _Folders"),
+        N_("Select Palette Folders"),
+        "palette-path", "palette-path-writable" },
+      { N_("Gradients"), N_("Gradient Folders"),
+        "folders-gradients",
+        GIMP_HELP_PREFS_FOLDERS_GRADIENTS,
+        N_("Reset Gradient _Folders"),
+        N_("Select Gradient Folders"),
+        "gradient-path", "gradient-path-writable" },
+      { N_("Fonts"), N_("Font Folders"),
+        "folders-fonts",
+        GIMP_HELP_PREFS_FOLDERS_FONTS,
+        N_("Reset Font _Folders"),
+        N_("Select Font Folders"),
+        "font-path", NULL },
+      { N_("Tool Presets"), N_("Tool Preset Folders"),
+        "folders-tool-presets",
+        GIMP_HELP_PREFS_FOLDERS_TOOL_PRESETS,
+        N_("Reset Tool Preset _Folders"),
+        N_("Select Tool Preset Folders"),
+        "tool-preset-path", "tool-preset-path-writable" },
+      { N_("MyPaint Brushes"), N_("MyPaint Brush Folders"),
+        "folders-mypaint-brushes",
+        GIMP_HELP_PREFS_FOLDERS_MYPAINT_BRUSHES,
+        N_("Reset MyPaint Brush _Folders"),
+        N_("Select MyPaint Brush Folders"),
+        "mypaint-brush-path", "mypaint-brush-path-writable" },
+      { N_("Plug-ins"), N_("Plug-in Folders"),
+        "folders-plug-ins",
+        GIMP_HELP_PREFS_FOLDERS_PLUG_INS,
+        N_("Reset plug-in _Folders"),
+        N_("Select plug-in Folders"),
+        "plug-in-path", NULL },
+      { N_("Scripts"), N_("Script-Fu Folders"),
+        "folders-scripts",
+        GIMP_HELP_PREFS_FOLDERS_SCRIPTS,
+        N_("Reset Script-Fu _Folders"),
+        N_("Select Script-Fu Folders"),
+        "script-fu-path", NULL },
+      { N_("Modules"), N_("Module Folders"),
+        "folders-modules",
+        GIMP_HELP_PREFS_FOLDERS_MODULES,
+        N_("Reset Module _Folders"),
+        N_("Select Module Folders"),
+        "module-path", NULL },
+      { N_("Interpreters"), N_("Interpreter Folders"),
+        "folders-interp",
+        GIMP_HELP_PREFS_FOLDERS_INTERPRETERS,
+        N_("Reset Interpreter _Folders"),
+        N_("Select Interpreter Folders"),
+        "interpreter-path", NULL },
+      { N_("Environment"), N_("Environment Folders"),
+        "folders-environ",
+        GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT,
+        N_("Reset Environment _Folders"),
+        N_("Select Environment Folders"),
+        "environ-path", NULL },
+      { N_("Themes"), N_("Theme Folders"),
+        "folders-themes",
+        GIMP_HELP_PREFS_FOLDERS_THEMES,
+        N_("Reset Theme _Folders"),
+        N_("Select Theme Folders"),
+        "theme-path", NULL },
+      { N_("Icon Themes"), N_("Icon Theme Folders"),
+        "folders-icon-themes",
+        GIMP_HELP_PREFS_FOLDERS_ICON_THEMES,
+        N_("Reset Icon Theme _Folders"),
+        N_("Select Icon Theme Folders"),
+        "icon-theme-path", NULL }
+    };
+
+    for (i = 0; i < G_N_ELEMENTS (paths); i++)
+      {
+        GtkWidget *editor;
+        gchar     *icon_name;
+
+        icon_name = g_strconcat ("gimp-prefs-", paths[i].icon, NULL);
+        vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                        icon_name,
+                                        gettext (paths[i].label),
+                                        gettext (paths[i].tree_label),
+                                        paths[i].help_data,
+                                        &top_iter,
+                                        &child_iter);
+        g_free (icon_name);
+
+        button = gimp_prefs_box_set_page_resettable (GIMP_PREFS_BOX (prefs_box),
+                                                     vbox,
+                                                     gettext (paths[i].reset_label));
+        g_object_set_data (G_OBJECT (button), "path",
+                           (gpointer) paths[i].path_property_name);
+        g_object_set_data (G_OBJECT (button), "path-writable",
+                           (gpointer) paths[i].writable_property_name);
+        g_signal_connect (button, "clicked",
+                          G_CALLBACK (prefs_path_reset),
+                          config);
+
+        editor = gimp_prop_path_editor_new (object,
+                                            paths[i].path_property_name,
+                                            paths[i].writable_property_name,
+                                            gettext (paths[i].fs_label));
+        gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
+        gtk_widget_show (editor);
+      }
+  }
+
+  {
+    GtkWidget    *tv;
+    GtkTreeModel *model;
+    GtkTreePath  *path;
+
+    tv = gimp_prefs_box_get_tree_view (GIMP_PREFS_BOX (prefs_box));
+    gtk_tree_view_expand_all (GTK_TREE_VIEW (tv));
+
+    /*  collapse the Folders subtree */
+    model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv));
+    path = gtk_tree_model_get_path (model, &top_iter);
+    gtk_tree_view_collapse_row (GTK_TREE_VIEW (tv), path);
+    gtk_tree_path_free (path);
+  }
+
+  return dialog;
+}
diff --git a/app/dialogs/preferences-dialog.h b/app/dialogs/preferences-dialog.h
new file mode 100644
index 0000000..899f293
--- /dev/null
+++ b/app/dialogs/preferences-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PREFERENCES_DIALOG_H__
+#define __PREFERENCES_DIALOG_H__
+
+
+GtkWidget * preferences_dialog_create (Gimp *gimp);
+
+
+#endif /* __PREFERENCES_DIALOG_H__ */
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
new file mode 100644
index 0000000..e3b9ba0
--- /dev/null
+++ b/app/dialogs/print-size-dialog.c
@@ -0,0 +1,454 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimp-utils.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "print-size-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+#define SB_WIDTH       8
+
+
+typedef struct _PrintSizeDialog PrintSizeDialog;
+
+struct _PrintSizeDialog
+{
+  GimpImage              *image;
+  GimpSizeEntry          *size_entry;
+  GimpSizeEntry          *resolution_entry;
+  GimpChainButton        *chain;
+  gdouble                 xres;
+  gdouble                 yres;
+  GimpResolutionCallback  callback;
+  gpointer                user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void   print_size_dialog_free               (PrintSizeDialog *private);
+static void   print_size_dialog_response           (GtkWidget       *dialog,
+                                                    gint             response_id,
+                                                    PrintSizeDialog *private);
+static void   print_size_dialog_reset              (PrintSizeDialog *private);
+
+static void   print_size_dialog_size_changed       (GtkWidget       *widget,
+                                                    PrintSizeDialog *private);
+static void   print_size_dialog_resolution_changed (GtkWidget       *widget,
+                                                    PrintSizeDialog *private);
+static void   print_size_dialog_set_size           (PrintSizeDialog *private,
+                                                    gdouble          width,
+                                                    gdouble          height);
+static void   print_size_dialog_set_resolution     (PrintSizeDialog *private,
+                                                    gdouble          xres,
+                                                    gdouble          yres);
+
+
+/*  public functions  */
+
+GtkWidget *
+print_size_dialog_new (GimpImage              *image,
+                       GimpContext            *context,
+                       const gchar            *title,
+                       const gchar            *role,
+                       GtkWidget              *parent,
+                       GimpHelpFunc            help_func,
+                       const gchar            *help_id,
+                       GimpResolutionCallback  callback,
+                       gpointer                user_data)
+{
+  PrintSizeDialog *private;
+  GtkWidget       *dialog;
+  GtkWidget       *frame;
+  GtkWidget       *table;
+  GtkWidget       *entry;
+  GtkWidget       *label;
+  GtkWidget       *width;
+  GtkWidget       *height;
+  GtkWidget       *hbox;
+  GtkWidget       *chain;
+  GtkAdjustment   *adj;
+  GList           *focus_chain = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (PrintSizeDialog);
+
+  private->image     = image;
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  gimp_image_get_resolution (image, &private->xres, &private->yres);
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
+                                     title, role,
+                                     GIMP_ICON_DOCUMENT_PRINT_RESOLUTION, title,
+                                     parent,
+                                     help_func, help_id,
+
+                                     _("_Reset"),  RESPONSE_RESET,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_OK"),     GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) print_size_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (print_size_dialog_response),
+                    private);
+
+  frame = gimp_frame_new (_("Print Size"));
+  gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (4, 3, FALSE);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 12);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 2, 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  /*  the print size entry  */
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  width = gimp_spin_button_new (adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (width), SB_WIDTH);
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  height = gimp_spin_button_new (adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH);
+
+  entry = gimp_size_entry_new (0, gimp_get_default_unit (), "%p",
+                               FALSE, FALSE, FALSE, SB_WIDTH,
+                               GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  private->size_entry = GIMP_SIZE_ENTRY (entry);
+
+  label = gtk_label_new_with_mnemonic (_("_Width:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), width);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new_with_mnemonic (_("H_eight:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), height);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 0, 2);
+  gtk_widget_show (hbox);
+
+  gtk_table_set_row_spacing (GTK_TABLE (entry), 0, 2);
+  gtk_table_set_col_spacing (GTK_TABLE (entry), 1, 6);
+
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry),
+                             GTK_SPIN_BUTTON (height), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (entry), height, 0, 1, 1, 2);
+  gtk_widget_show (height);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry),
+                             GTK_SPIN_BUTTON (width), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (entry), width, 0, 1, 0, 1);
+  gtk_widget_show (width);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 0,
+                                  private->xres, FALSE);
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 1,
+                                  private->yres, FALSE);
+
+  gimp_size_entry_set_refval_boundaries
+    (GIMP_SIZE_ENTRY (entry), 0, GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE);
+  gimp_size_entry_set_refval_boundaries
+    (GIMP_SIZE_ENTRY (entry), 1, GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 0,
+                              gimp_image_get_width  (image));
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 1,
+                              gimp_image_get_height (image));
+
+  /*  the resolution entry  */
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  width = gimp_spin_button_new (adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (width), SB_WIDTH);
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  height = gimp_spin_button_new (adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH);
+
+  label = gtk_label_new_with_mnemonic (_("_X resolution:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), width);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new_with_mnemonic (_("_Y resolution:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), height);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 2, 4);
+  gtk_widget_show (hbox);
+
+  entry = gimp_size_entry_new (0, gimp_image_get_unit (image), _("pixels/%a"),
+                               FALSE, FALSE, FALSE, SB_WIDTH,
+                               GIMP_SIZE_ENTRY_UPDATE_RESOLUTION);
+  private->resolution_entry = GIMP_SIZE_ENTRY (entry);
+
+  gtk_table_set_row_spacing (GTK_TABLE (entry), 0, 2);
+  gtk_table_set_col_spacing (GTK_TABLE (entry), 1, 2);
+  gtk_table_set_col_spacing (GTK_TABLE (entry), 2, 2);
+
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry),
+                             GTK_SPIN_BUTTON (height), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (entry), height, 0, 1, 1, 2);
+  gtk_widget_show (height);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry),
+                             GTK_SPIN_BUTTON (width), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (entry), width, 0, 1, 0, 1);
+  gtk_widget_show (width);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (entry), 0,
+                                         GIMP_MIN_RESOLUTION,
+                                         GIMP_MAX_RESOLUTION);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (entry), 1,
+                                         GIMP_MIN_RESOLUTION,
+                                         GIMP_MAX_RESOLUTION);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 0, private->xres);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 1, private->yres);
+
+  chain = gimp_chain_button_new (GIMP_CHAIN_RIGHT);
+  if (ABS (private->xres - private->yres) < GIMP_MIN_RESOLUTION)
+    gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (chain), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (entry), chain, 1, 2, 0, 2);
+  gtk_widget_show (chain);
+
+  private->chain = GIMP_CHAIN_BUTTON (chain);
+
+  focus_chain = g_list_prepend (focus_chain, GIMP_SIZE_ENTRY (entry)->unitmenu);
+  focus_chain = g_list_prepend (focus_chain, chain);
+  focus_chain = g_list_prepend (focus_chain, height);
+  focus_chain = g_list_prepend (focus_chain, width);
+
+  gtk_container_set_focus_chain (GTK_CONTAINER (entry), focus_chain);
+  g_list_free (focus_chain);
+
+  g_signal_connect (private->size_entry, "value-changed",
+                    G_CALLBACK (print_size_dialog_size_changed),
+                    private);
+  g_signal_connect (private->resolution_entry, "value-changed",
+                    G_CALLBACK (print_size_dialog_resolution_changed),
+                    private);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+print_size_dialog_free (PrintSizeDialog *private)
+{
+  g_slice_free (PrintSizeDialog, private);
+}
+
+static void
+print_size_dialog_response (GtkWidget       *dialog,
+                            gint             response_id,
+                            PrintSizeDialog *private)
+{
+  GimpSizeEntry *entry = private->resolution_entry;
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      print_size_dialog_reset (private);
+      break;
+
+    case GTK_RESPONSE_OK:
+      private->callback (dialog,
+                         private->image,
+                         gimp_size_entry_get_refval (entry, 0),
+                         gimp_size_entry_get_refval (entry, 1),
+                         gimp_size_entry_get_unit (entry),
+                         private->user_data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
+
+static void
+print_size_dialog_reset (PrintSizeDialog *private)
+{
+  gdouble  xres, yres;
+
+  gimp_size_entry_set_unit (private->resolution_entry,
+                            gimp_get_default_unit ());
+
+  gimp_image_get_resolution (private->image, &xres, &yres);
+  print_size_dialog_set_resolution (private, xres, yres);
+}
+
+static void
+print_size_dialog_size_changed (GtkWidget       *widget,
+                                PrintSizeDialog *private)
+{
+  GimpImage *image = private->image;
+  gdouble    width;
+  gdouble    height;
+  gdouble    xres;
+  gdouble    yres;
+  gdouble    scale;
+
+  scale = gimp_unit_get_factor (gimp_size_entry_get_unit (private->size_entry));
+
+  width  = gimp_size_entry_get_value (private->size_entry, 0);
+  height = gimp_size_entry_get_value (private->size_entry, 1);
+
+  xres = scale * gimp_image_get_width  (image) / MAX (0.001, width);
+  yres = scale * gimp_image_get_height (image) / MAX (0.001, height);
+
+  xres = CLAMP (xres, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION);
+  yres = CLAMP (yres, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION);
+
+  print_size_dialog_set_resolution (private, xres, yres);
+  print_size_dialog_set_size (private,
+                              gimp_image_get_width  (image),
+                              gimp_image_get_height (image));
+}
+
+static void
+print_size_dialog_resolution_changed (GtkWidget       *widget,
+                                      PrintSizeDialog *private)
+{
+  GimpSizeEntry *entry = private->resolution_entry;
+  gdouble        xres  = gimp_size_entry_get_refval (entry, 0);
+  gdouble        yres  = gimp_size_entry_get_refval (entry, 1);
+
+  print_size_dialog_set_resolution (private, xres, yres);
+}
+
+static void
+print_size_dialog_set_size (PrintSizeDialog *private,
+                            gdouble          width,
+                            gdouble          height)
+{
+  g_signal_handlers_block_by_func (private->size_entry,
+                                   print_size_dialog_size_changed,
+                                   private);
+
+  gimp_size_entry_set_refval (private->size_entry, 0, width);
+  gimp_size_entry_set_refval (private->size_entry, 1, height);
+
+  g_signal_handlers_unblock_by_func (private->size_entry,
+                                     print_size_dialog_size_changed,
+                                     private);
+}
+
+static void
+print_size_dialog_set_resolution (PrintSizeDialog *private,
+                                  gdouble          xres,
+                                  gdouble          yres)
+{
+  if (private->chain && gimp_chain_button_get_active (private->chain))
+    {
+      if (xres != private->xres)
+        yres = xres;
+      else
+        xres = yres;
+    }
+
+  private->xres = xres;
+  private->yres = yres;
+
+  g_signal_handlers_block_by_func (private->resolution_entry,
+                                   print_size_dialog_resolution_changed,
+                                   private);
+
+  gimp_size_entry_set_refval (private->resolution_entry, 0, xres);
+  gimp_size_entry_set_refval (private->resolution_entry, 1, yres);
+
+  g_signal_handlers_unblock_by_func (private->resolution_entry,
+                                     print_size_dialog_resolution_changed,
+                                     private);
+
+  g_signal_handlers_block_by_func (private->size_entry,
+                                   print_size_dialog_size_changed,
+                                   private);
+
+  gimp_size_entry_set_resolution (private->size_entry, 0, xres, TRUE);
+  gimp_size_entry_set_resolution (private->size_entry, 1, yres, TRUE);
+
+  g_signal_handlers_unblock_by_func (private->size_entry,
+                                     print_size_dialog_size_changed,
+                                     private);
+}
diff --git a/app/dialogs/print-size-dialog.h b/app/dialogs/print-size-dialog.h
new file mode 100644
index 0000000..53f37f5
--- /dev/null
+++ b/app/dialogs/print-size-dialog.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PRINT_SIZE_DIALOG_H__
+#define __PRINT_SIZE_DIALOG_H__
+
+
+typedef void (* GimpResolutionCallback) (GtkWidget *dialog,
+                                         GimpImage *image,
+                                         gdouble    xresolution,
+                                         gdouble    yresolution,
+                                         GimpUnit   resolution_unit,
+                                         gpointer   user_data);
+
+
+GtkWidget * print_size_dialog_new (GimpImage              *image,
+                                   GimpContext            *context,
+                                   const gchar            *title,
+                                   const gchar            *role,
+                                   GtkWidget              *parent,
+                                   GimpHelpFunc            help_func,
+                                   const gchar            *help_id,
+                                   GimpResolutionCallback  callback,
+                                   gpointer                user_data);
+
+
+#endif  /*  __PRINT_SIZE_DIALOG_H__  */
diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
new file mode 100644
index 0000000..11737f9
--- /dev/null
+++ b/app/dialogs/quit-dialog.c
@@ -0,0 +1,614 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplay-foreach.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
+
+#include "widgets/gimpcellrendererbutton.h"
+#include "widgets/gimpcontainertreestore.h"
+#include "widgets/gimpcontainertreeview.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpdnd.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpviewrenderer.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "quit-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _QuitDialog QuitDialog;
+
+struct _QuitDialog
+{
+  Gimp                  *gimp;
+  GimpContainer         *images;
+  GimpContext           *context;
+
+  gboolean               do_quit;
+
+  GtkWidget             *dialog;
+  GimpContainerTreeView *tree_view;
+  GtkTreeViewColumn     *save_column;
+  GtkWidget             *ok_button;
+  GimpMessageBox        *box;
+  GtkWidget             *lost_label;
+  GtkWidget             *hint_label;
+
+  guint                  accel_key;
+  GdkModifierType        accel_mods;
+};
+
+
+static GtkWidget * quit_close_all_dialog_new               (Gimp              *gimp,
+                                                            gboolean           do_quit);
+static void        quit_close_all_dialog_free              (QuitDialog        *private);
+static void        quit_close_all_dialog_response          (GtkWidget         *dialog,
+                                                            gint               response_id,
+                                                            QuitDialog        *private);
+static void        quit_close_all_dialog_accel_marshal     (GClosure          *closure,
+                                                            GValue            *return_value,
+                                                            guint              n_param_values,
+                                                            const GValue      *param_values,
+                                                            gpointer           invocation_hint,
+                                                            gpointer           marshal_data);
+static void        quit_close_all_dialog_container_changed (GimpContainer     *images,
+                                                            GimpObject        *image,
+                                                            QuitDialog        *private);
+static void        quit_close_all_dialog_image_selected    (GimpContainerView *view,
+                                                            GimpImage         *image,
+                                                            gpointer           insert_data,
+                                                            QuitDialog        *private);
+static void        quit_close_all_dialog_name_cell_func    (GtkTreeViewColumn *tree_column,
+                                                            GtkCellRenderer   *cell,
+                                                            GtkTreeModel      *tree_model,
+                                                            GtkTreeIter       *iter,
+                                                            gpointer           data);
+static void        quit_close_all_dialog_save_clicked      (GtkCellRenderer   *cell,
+                                                            const gchar       *path,
+                                                            GdkModifierType    state,
+                                                            QuitDialog        *private);
+static gboolean    quit_close_all_dialog_query_tooltip     (GtkWidget         *widget,
+                                                            gint               x,
+                                                            gint               y,
+                                                            gboolean           keyboard_tip,
+                                                            GtkTooltip        *tooltip,
+                                                            QuitDialog        *private);
+static gboolean    quit_close_all_idle                     (QuitDialog        *private);
+
+
+/*  public functions  */
+
+GtkWidget *
+quit_dialog_new (Gimp *gimp)
+{
+  return quit_close_all_dialog_new (gimp, TRUE);
+}
+
+GtkWidget *
+close_all_dialog_new (Gimp *gimp)
+{
+  return quit_close_all_dialog_new (gimp, FALSE);
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+quit_close_all_dialog_new (Gimp     *gimp,
+                           gboolean  do_quit)
+{
+  QuitDialog            *private;
+  GtkWidget             *view;
+  GimpContainerTreeView *tree_view;
+  GtkTreeViewColumn     *column;
+  GtkCellRenderer       *renderer;
+  GtkWidget             *dnd_widget;
+  GtkAccelGroup         *accel_group;
+  GClosure              *closure;
+  gint                   rows;
+  gint                   view_size;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  private = g_slice_new0 (QuitDialog);
+
+  private->gimp    = gimp;
+  private->do_quit = do_quit;
+  private->images  = gimp_displays_get_dirty_images (gimp);
+  private->context = gimp_context_new (gimp, "close-all-dialog",
+                                       gimp_get_user_context (gimp));
+
+  g_return_val_if_fail (private->images != NULL, NULL);
+
+  private->dialog =
+    gimp_message_dialog_new (do_quit ? _("Quit GIMP") : _("Close All Images"),
+                             GIMP_ICON_DIALOG_WARNING,
+                             NULL, 0,
+                             gimp_standard_help_func,
+                             do_quit ?
+                             GIMP_HELP_FILE_QUIT : GIMP_HELP_FILE_CLOSE_ALL,
+
+                             _("_Cancel"), GTK_RESPONSE_CANCEL,
+
+                             NULL);
+
+  private->ok_button = gtk_dialog_add_button (GTK_DIALOG (private->dialog),
+                                              "", GTK_RESPONSE_OK);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (private->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_object_weak_ref (G_OBJECT (private->dialog),
+                     (GWeakNotify) quit_close_all_dialog_free, private);
+
+  g_signal_connect (private->dialog, "response",
+                    G_CALLBACK (quit_close_all_dialog_response),
+                    private);
+
+  /* connect <Primary>D to the quit/close button */
+  accel_group = gtk_accel_group_new ();
+  gtk_window_add_accel_group (GTK_WINDOW (private->dialog), accel_group);
+  g_object_unref (accel_group);
+
+  closure = g_closure_new_object (sizeof (GClosure), G_OBJECT (private->dialog));
+  g_closure_set_marshal (closure, quit_close_all_dialog_accel_marshal);
+  gtk_accelerator_parse ("<Primary>D",
+                         &private->accel_key, &private->accel_mods);
+  gtk_accel_group_connect (accel_group,
+                           private->accel_key, private->accel_mods,
+                           0, closure);
+
+  private->box = GIMP_MESSAGE_DIALOG (private->dialog)->box;
+
+  view_size = gimp->config->layer_preview_size;
+  rows      = CLAMP (gimp_container_get_n_children (private->images), 3, 6);
+
+  view = gimp_container_tree_view_new (private->images, private->context,
+                                       view_size, 1);
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (view),
+                                       -1,
+                                       rows * (view_size + 2));
+
+  private->tree_view = tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  gtk_tree_view_column_set_expand (tree_view->main_column, TRUE);
+
+  renderer = gimp_container_tree_view_get_name_cell (tree_view);
+  gtk_tree_view_column_set_cell_data_func (tree_view->main_column,
+                                           renderer,
+                                           quit_close_all_dialog_name_cell_func,
+                                           NULL, NULL);
+
+  private->save_column = column = gtk_tree_view_column_new ();
+  renderer = gimp_cell_renderer_button_new ();
+  g_object_set (renderer,
+                "icon-name", "document-save",
+                NULL);
+  gtk_tree_view_column_pack_end (column, renderer, FALSE);
+  gtk_tree_view_column_set_attributes (column, renderer, NULL);
+
+  gtk_tree_view_append_column (tree_view->view, column);
+  gimp_container_tree_view_add_toggle_cell (tree_view, renderer);
+
+  g_signal_connect (renderer, "clicked",
+                    G_CALLBACK (quit_close_all_dialog_save_clicked),
+                    private);
+
+  gtk_box_pack_start (GTK_BOX (private->box), view, TRUE, TRUE, 0);
+  gtk_widget_show (view);
+
+  g_signal_connect (view, "select-item",
+                    G_CALLBACK (quit_close_all_dialog_image_selected),
+                    private);
+
+  dnd_widget = gimp_container_view_get_dnd_widget (GIMP_CONTAINER_VIEW (view));
+  gimp_dnd_xds_source_add (dnd_widget,
+                           (GimpDndDragViewableFunc) gimp_dnd_get_drag_data,
+                           NULL);
+
+  g_signal_connect (tree_view->view, "query-tooltip",
+                    G_CALLBACK (quit_close_all_dialog_query_tooltip),
+                    private);
+
+  if (do_quit)
+    private->lost_label = gtk_label_new (_("If you quit GIMP now, "
+                                           "these changes will be lost."));
+  else
+    private->lost_label = gtk_label_new (_("If you close these images now, "
+                                           "changes will be lost."));
+  gtk_label_set_xalign (GTK_LABEL (private->lost_label), 0.0);
+  gtk_label_set_line_wrap (GTK_LABEL (private->lost_label), TRUE);
+  gtk_box_pack_start (GTK_BOX (private->box), private->lost_label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (private->lost_label);
+
+  private->hint_label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (private->hint_label), 0.0);
+  gtk_label_set_line_wrap (GTK_LABEL (private->hint_label), TRUE);
+  gtk_box_pack_start (GTK_BOX (private->box), private->hint_label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (private->hint_label);
+
+  closure = g_cclosure_new (G_CALLBACK (quit_close_all_dialog_container_changed),
+                            private, NULL);
+  g_object_watch_closure (G_OBJECT (private->dialog), closure);
+  g_signal_connect_closure (private->images, "add", closure, FALSE);
+  g_signal_connect_closure (private->images, "remove", closure, FALSE);
+
+  quit_close_all_dialog_container_changed (private->images, NULL,
+                                           private);
+
+  return private->dialog;
+}
+
+static void
+quit_close_all_dialog_free (QuitDialog *private)
+{
+  g_idle_remove_by_data (private);
+  g_object_unref (private->images);
+  g_object_unref (private->context);
+
+  g_slice_free (QuitDialog, private);
+}
+
+static void
+quit_close_all_dialog_response (GtkWidget  *dialog,
+                                gint        response_id,
+                                QuitDialog *private)
+{
+  Gimp     *gimp    = private->gimp;
+  gboolean  do_quit = private->do_quit;
+
+  gtk_widget_destroy (dialog);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      if (do_quit)
+        gimp_exit (gimp, TRUE);
+      else
+        gimp_displays_close (gimp);
+    }
+}
+
+static void
+quit_close_all_dialog_accel_marshal (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data)
+{
+  gtk_dialog_response (GTK_DIALOG (closure->data), GTK_RESPONSE_OK);
+
+  /* we handled the accelerator */
+  g_value_set_boolean (return_value, TRUE);
+}
+
+static void
+quit_close_all_dialog_container_changed (GimpContainer *images,
+                                         GimpObject    *image,
+                                         QuitDialog    *private)
+{
+  gint   num_images = gimp_container_get_n_children (images);
+  gchar *accel_string;
+  gchar *hint;
+  gchar *markup;
+
+  accel_string = gtk_accelerator_get_label (private->accel_key,
+                                            private->accel_mods);
+
+  gimp_message_box_set_primary_text (private->box,
+                                     /* TRANSLATORS: unless your language
+                                        msgstr[0] applies to 1 only (as
+                                        in English), replace "one" with %d. */
+                                     ngettext ("There is one image with "
+                                               "unsaved changes:",
+                                               "There are %d images with "
+                                               "unsaved changes:",
+                                               num_images), num_images);
+
+  if (num_images == 0)
+    {
+      gtk_widget_hide (private->lost_label);
+
+      if (private->do_quit)
+        hint = g_strdup_printf (_("Press %s to quit."),
+                                accel_string);
+      else
+        hint = g_strdup_printf (_("Press %s to close all images."),
+                                accel_string);
+
+      g_object_set (private->ok_button,
+                    "label",     private->do_quit ? _("_Quit") : _("Cl_ose"),
+                    "use-stock", TRUE,
+                    "image",     NULL,
+                    NULL);
+
+      gtk_widget_grab_default (private->ok_button);
+
+      /* When no image requires saving anymore, there is no harm in
+       * assuming completing the original quit or close-all action is
+       * the expected end-result.
+       * I don't immediately exit though because of some unfinished
+       * actions provoking warnings. Let's just close as soon as
+       * possible with an idle source.
+       * Also the idle source has another benefit: allowing to change
+       * one's mind and not exist after the last save, for instance by
+       * hitting Esc quickly while the last save is in progress.
+       */
+      g_idle_add ((GSourceFunc) quit_close_all_idle, private);
+    }
+  else
+    {
+      GtkWidget *icon;
+
+      if (private->do_quit)
+        hint = g_strdup_printf (_("Press %s to discard all changes and quit."),
+                                accel_string);
+      else
+        hint = g_strdup_printf (_("Press %s to discard all changes and close all images."),
+                                accel_string);
+
+      gtk_widget_show (private->lost_label);
+
+      icon = gtk_image_new_from_icon_name ("edit-delete",
+                                           GTK_ICON_SIZE_BUTTON);
+      g_object_set (private->ok_button,
+                    "label",     _("_Discard Changes"),
+                    "use-stock", FALSE,
+                    "image",     icon,
+                    NULL);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (private->dialog),
+                                       GTK_RESPONSE_CANCEL);
+    }
+
+  markup = g_strdup_printf ("<i><small>%s</small></i>", hint);
+
+  gtk_label_set_markup (GTK_LABEL (private->hint_label), markup);
+
+  g_free (markup);
+  g_free (hint);
+  g_free (accel_string);
+}
+
+static void
+quit_close_all_dialog_image_selected (GimpContainerView *view,
+                                      GimpImage         *image,
+                                      gpointer           insert_data,
+                                      QuitDialog        *private)
+{
+  GList *list;
+
+  for (list = gimp_get_display_iter (private->gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+
+      if (gimp_display_get_image (display) == image)
+        {
+          gimp_display_shell_present (gimp_display_get_shell (display));
+
+          /* We only want to update the active shell. Give back keyboard
+           * focus to the quit dialog after this.
+           */
+          gtk_window_present (GTK_WINDOW (private->dialog));
+        }
+    }
+}
+
+static void
+quit_close_all_dialog_name_cell_func (GtkTreeViewColumn *tree_column,
+                                      GtkCellRenderer   *cell,
+                                      GtkTreeModel      *tree_model,
+                                      GtkTreeIter       *iter,
+                                      gpointer           data)
+{
+  GimpViewRenderer *renderer;
+  GimpImage        *image;
+  gchar            *name;
+
+  gtk_tree_model_get (tree_model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_NAME,     &name,
+                      -1);
+
+  image = GIMP_IMAGE (renderer->viewable);
+
+  if (gimp_image_is_export_dirty (image))
+    {
+      g_object_set (cell,
+                    "markup", NULL,
+                    "text",   name,
+                    NULL);
+    }
+  else
+    {
+      GFile       *file;
+      const gchar *filename;
+      gchar       *escaped_name;
+      gchar       *escaped_filename;
+      gchar       *exported;
+      gchar       *markup;
+
+      file = gimp_image_get_exported_file (image);
+      if (! file)
+        file = gimp_image_get_imported_file (image);
+
+      filename = gimp_file_get_utf8_name (file);
+
+      escaped_name     = g_markup_escape_text (name, -1);
+      escaped_filename = g_markup_escape_text (filename, -1);
+
+      exported = g_strdup_printf (_("Exported to %s"), escaped_filename);
+      markup = g_strdup_printf ("%s\n<i>%s</i>", escaped_name, exported);
+      g_free (exported);
+
+      g_free (escaped_name);
+      g_free (escaped_filename);
+
+      g_object_set (cell,
+                    "text",   NULL,
+                    "markup", markup,
+                    NULL);
+
+      g_free (markup);
+    }
+
+  g_object_unref (renderer);
+  g_free (name);
+}
+
+static void
+quit_close_all_dialog_save_clicked (GtkCellRenderer *cell,
+                                    const gchar     *path_str,
+                                    GdkModifierType  state,
+                                    QuitDialog      *private)
+{
+  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
+  GtkTreeIter  iter;
+
+  if (gtk_tree_model_get_iter (private->tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpImage        *image;
+      GList            *list;
+
+      gtk_tree_model_get (private->tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      image = GIMP_IMAGE (renderer->viewable);
+      g_object_unref (renderer);
+
+      for (list = gimp_get_display_iter (private->gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpDisplay *display = list->data;
+
+          if (gimp_display_get_image (display) == image)
+            {
+              GimpDisplayShell *shell  = gimp_display_get_shell (display);
+              GimpImageWindow  *window = gimp_display_shell_get_window (shell);
+
+              if (window)
+                {
+                  GimpUIManager *manager;
+
+                  manager = gimp_image_window_get_ui_manager (window);
+
+                  gimp_display_shell_present (shell);
+                  /* Make sure the quit dialog kept keyboard focus when
+                   * the save dialog will exit. */
+                  gtk_window_present (GTK_WINDOW (private->dialog));
+
+                  if (state & GDK_SHIFT_MASK)
+                    {
+                      gimp_ui_manager_activate_action (manager, "file",
+                                                       "file-save-as");
+                    }
+                  else
+                    {
+                      gimp_ui_manager_activate_action (manager, "file",
+                                                       "file-save");
+                    }
+                }
+
+              break;
+            }
+        }
+    }
+}
+
+static gboolean
+quit_close_all_dialog_query_tooltip (GtkWidget  *widget,
+                                     gint        x,
+                                     gint        y,
+                                     gboolean    keyboard_tip,
+                                     GtkTooltip *tooltip,
+                                     QuitDialog *private)
+{
+  GtkTreePath *path;
+  gboolean     show_tip = FALSE;
+
+  if (gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (widget), &x, &y,
+                                         keyboard_tip,
+                                         NULL, &path, NULL))
+    {
+      GtkTreeViewColumn *column = NULL;
+
+      gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), x, y,
+                                     NULL, &column, NULL, NULL);
+
+      if (column == private->save_column)
+        {
+          gchar *tip = g_strconcat (_("Save this image"), "\n<b>",
+                                    gimp_get_mod_string (GDK_SHIFT_MASK),
+                                    "</b>  ", _("Save as"),
+                                    NULL);
+
+          gtk_tooltip_set_markup (tooltip, tip);
+          gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (widget), tooltip, path);
+
+          g_free (tip);
+
+          show_tip = TRUE;
+        }
+
+      gtk_tree_path_free (path);
+    }
+
+  return show_tip;
+}
+
+static gboolean
+quit_close_all_idle (QuitDialog *private)
+{
+  gtk_dialog_response (GTK_DIALOG (private->dialog), GTK_RESPONSE_OK);
+
+  return FALSE;
+}
diff --git a/app/dialogs/quit-dialog.h b/app/dialogs/quit-dialog.h
new file mode 100644
index 0000000..1760976
--- /dev/null
+++ b/app/dialogs/quit-dialog.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2004  Sven Neumann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __QUIT_DIALOG_H__
+#define __QUIT_DIALOG_H__
+
+
+GtkWidget * quit_dialog_new      (Gimp *gimp);
+GtkWidget * close_all_dialog_new (Gimp *gimp);
+
+
+#endif  /*  __QUIT_DIALOG_H__  */
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
new file mode 100644
index 0000000..7f20702
--- /dev/null
+++ b/app/dialogs/resize-dialog.c
@@ -0,0 +1,853 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimptemplate.h"
+
+#include "widgets/gimpcontainercombobox.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsizebox.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpwidgets-constructors.h"
+
+#include "resize-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+#define SB_WIDTH       8
+
+
+typedef struct _ResizeDialog ResizeDialog;
+
+struct _ResizeDialog
+{
+  GimpViewable       *viewable;
+  GimpContext        *context;
+  GimpContext        *parent_context;
+  GimpFillType        fill_type;
+  GimpItemSet         layer_set;
+  gboolean            resize_text_layers;
+  GimpResizeCallback  callback;
+  gpointer            user_data;
+
+  gdouble             old_xres;
+  gdouble             old_yres;
+  GimpUnit            old_res_unit;
+  gint                old_width;
+  gint                old_height;
+  GimpUnit            old_unit;
+  GimpFillType        old_fill_type;
+  GimpItemSet         old_layer_set;
+  gboolean            old_resize_text_layers;
+
+  GtkWidget          *box;
+  GtkWidget          *offset;
+  GtkWidget          *area;
+  GtkWidget          *layer_set_combo;
+  GtkWidget          *fill_type_combo;
+  GtkWidget          *text_layers_button;
+
+  GtkWidget          *ppi_box;
+  GtkWidget          *ppi_image;
+  GtkWidget          *ppi_template;
+  GimpTemplate       *template;
+};
+
+
+/*  local function prototypes  */
+
+static void   resize_dialog_free     (ResizeDialog *private);
+static void   resize_dialog_response (GtkWidget    *dialog,
+                                      gint          response_id,
+                                      ResizeDialog *private);
+static void   resize_dialog_reset    (ResizeDialog *private);
+
+static void   size_notify            (GimpSizeBox  *box,
+                                      GParamSpec   *pspec,
+                                      ResizeDialog *private);
+static void   offset_update          (GtkWidget    *widget,
+                                      ResizeDialog *private);
+static void   offsets_changed        (GtkWidget    *area,
+                                      gint          off_x,
+                                      gint          off_y,
+                                      ResizeDialog *private);
+static void   offset_center_clicked  (GtkWidget    *widget,
+                                      ResizeDialog *private);
+
+static void   template_changed       (GimpContext  *context,
+                                      GimpTemplate *template,
+                                      ResizeDialog *private);
+
+static void   reset_template_clicked (GtkWidget    *button,
+                                      ResizeDialog *private);
+static void   ppi_select_toggled     (GtkWidget    *radio,
+                                      ResizeDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+resize_dialog_new (GimpViewable       *viewable,
+                   GimpContext        *context,
+                   const gchar        *title,
+                   const gchar        *role,
+                   GtkWidget          *parent,
+                   GimpHelpFunc        help_func,
+                   const gchar        *help_id,
+                   GimpUnit            unit,
+                   GimpFillType        fill_type,
+                   GimpItemSet         layer_set,
+                   gboolean            resize_text_layers,
+                   GimpResizeCallback  callback,
+                   gpointer            user_data)
+{
+  ResizeDialog  *private;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *vbox;
+  GtkWidget     *center_hbox;
+  GtkWidget     *center_left_vbox;
+  GtkWidget     *center_right_vbox;
+  GtkWidget     *frame;
+  GtkWidget     *button;
+  GtkWidget     *spinbutton;
+  GtkWidget     *entry;
+  GtkWidget     *hbox;
+  GtkWidget     *combo;
+  GtkWidget     *label;
+  GtkWidget     *template_selector;
+  GtkWidget     *ppi_image;
+  GtkWidget     *ppi_template;
+  GtkAdjustment *adjustment;
+  GdkPixbuf     *pixbuf;
+  GtkSizeGroup  *size_group   = NULL;
+  GimpImage     *image        = NULL;
+  const gchar   *size_title   = NULL;
+  const gchar   *layers_title = NULL;
+  gint           width, height;
+  gdouble        xres, yres;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  if (GIMP_IS_IMAGE (viewable))
+    {
+      image = GIMP_IMAGE (viewable);
+
+      width  = gimp_image_get_width (image);
+      height = gimp_image_get_height (image);
+
+      size_title   = _("Canvas Size");
+      layers_title = _("Layers");
+    }
+  else if (GIMP_IS_ITEM (viewable))
+    {
+      GimpItem *item = GIMP_ITEM (viewable);
+
+      image = gimp_item_get_image (item);
+
+      width  = gimp_item_get_width  (item);
+      height = gimp_item_get_height (item);
+
+      size_title   = _("Layer Size");
+      layers_title = _("Fill With");
+    }
+  else
+    {
+      g_return_val_if_reached (NULL);
+    }
+
+  private = g_slice_new0 (ResizeDialog);
+
+  private->parent_context = context;
+  private->context        = gimp_context_new (context->gimp,
+                                              "resize-dialog",
+                                              context);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  private->old_xres     = xres;
+  private->old_yres     = yres;
+  private->old_res_unit = gimp_image_get_unit (image);
+
+  private->viewable           = viewable;
+  private->fill_type          = fill_type;
+  private->layer_set          = layer_set;
+  private->resize_text_layers = resize_text_layers;
+  private->callback           = callback;
+  private->user_data          = user_data;
+
+  private->old_width              = width;
+  private->old_height             = height;
+  private->old_unit               = unit;
+  private->old_fill_type          = private->fill_type;
+  private->old_layer_set          = private->layer_set;
+  private->old_resize_text_layers = private->resize_text_layers;
+
+  gimp_context_set_template (private->context, NULL);
+
+  dialog = gimp_viewable_dialog_new (viewable, context,
+                                     title, role, GIMP_ICON_OBJECT_RESIZE, title,
+                                     parent,
+                                     help_func, help_id,
+
+                                     _("Re_set"),   RESPONSE_RESET,
+                                     _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                                     _("_Resize"),  GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) resize_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (resize_dialog_response),
+                    private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+  /* template selector */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("_Template:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  template_selector = g_object_new (GIMP_TYPE_CONTAINER_COMBO_BOX,
+                                    "container",         context->gimp->templates,
+                                    "context",           private->context,
+                                    "view-size",         16,
+                                    "view-border-width", 0,
+                                    "ellipsize",         PANGO_ELLIPSIZE_NONE,
+                                    "focus-on-click",    FALSE,
+                                    NULL);
+
+  gtk_box_pack_start (GTK_BOX (hbox), template_selector, TRUE, TRUE, 0);
+  gtk_widget_show (template_selector);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), template_selector);
+
+  g_signal_connect (private->context,
+                    "template-changed",
+                    G_CALLBACK (template_changed),
+                    private);
+
+  /* reset template button */
+  button = gimp_icon_button_new (GIMP_ICON_RESET, NULL);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))),
+                                GIMP_ICON_RESET, GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button,
+                    "clicked",
+                    G_CALLBACK (reset_template_clicked),
+                    private);
+
+  gimp_help_set_help_data (button,
+                           _("Reset the template selection"),
+                           NULL);
+
+  /* ppi selector box */
+  private->ppi_box = vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+
+  label = gtk_label_new (_("Template and image print resolution don't match.\n"
+                           "Choose how to scale the canvas:"));
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  gtk_widget_show (hbox);
+
+  /* actual label text is set inside template_change fn. */
+  ppi_image    = gtk_radio_button_new_with_label (NULL, "");
+  ppi_template = gtk_radio_button_new_with_label (NULL, "");
+
+  private->ppi_image    = ppi_image;
+  private->ppi_template = ppi_template;
+
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (ppi_template),
+                              gtk_radio_button_get_group (GTK_RADIO_BUTTON (ppi_image)));
+
+  gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (ppi_image), FALSE);
+  gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (ppi_template), FALSE);
+
+  gtk_box_pack_start (GTK_BOX (hbox), ppi_image, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), ppi_template, FALSE, FALSE, 0);
+
+  gtk_widget_show (ppi_image);
+  gtk_widget_show (ppi_template);
+
+  g_signal_connect (G_OBJECT (ppi_image),
+                    "toggled",
+                    G_CALLBACK (ppi_select_toggled),
+                    private);
+
+  g_signal_connect (G_OBJECT (ppi_template),
+                    "toggled",
+                    G_CALLBACK (ppi_select_toggled),
+                    private);
+
+  /* For space gain, organize the main widgets in both vertical and
+   * horizontal layout.
+   * The size and offset fields are on the center left, while the
+   * preview and the "Center" button are on center right.
+   */
+  center_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (main_vbox), center_hbox, FALSE, FALSE, 0);
+  gtk_widget_show (center_hbox);
+
+  center_left_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_box_pack_start (GTK_BOX (center_hbox), center_left_vbox, FALSE, FALSE, 0);
+  gtk_widget_show (center_left_vbox);
+
+  center_right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (center_hbox), center_right_vbox, FALSE, FALSE, 0);
+  gtk_widget_show (center_right_vbox);
+
+  /* size select frame */
+
+  frame = gimp_frame_new (size_title);
+  gtk_box_pack_start (GTK_BOX (center_left_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /* size box */
+
+  private->box = g_object_new (GIMP_TYPE_SIZE_BOX,
+                               "width",           width,
+                               "height",          height,
+                               "unit",            unit,
+                               "xresolution",     xres,
+                               "yresolution",     yres,
+                               "keep-aspect",     FALSE,
+                               "edit-resolution", FALSE,
+                               NULL);
+  gtk_container_add (GTK_CONTAINER (frame), private->box);
+  gtk_widget_show (private->box);
+
+  /* offset frame */
+  frame = gimp_frame_new (_("Offset"));
+  gtk_box_pack_start (GTK_BOX (center_left_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  /*  the offset sizeentry  */
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  spinbutton = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
+
+  private->offset = entry = gimp_size_entry_new (1, unit, "%p",
+                                                 TRUE, FALSE, FALSE, SB_WIDTH,
+                                                 GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_col_spacing (GTK_TABLE (entry), 0, 6);
+  gtk_table_set_col_spacing (GTK_TABLE (entry), 1, 6);
+  gtk_table_set_col_spacing (GTK_TABLE (entry), 3, 12);
+  gtk_table_set_row_spacing (GTK_TABLE (entry), 0, 2);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (entry), spinbutton,
+                             1, 2, 0, 1);
+  gtk_widget_show (spinbutton);
+
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("_X:"), 0, 0, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),_("_Y:"), 1, 0, 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 0, xres, FALSE);
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 1, yres, FALSE);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (entry), 0, 0, 0);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (entry), 1, 0, 0);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 0, 0);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 1, 0);
+
+  g_signal_connect (entry, "value-changed",
+                    G_CALLBACK (offset_update),
+                    private);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (center_right_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  private->area = gimp_offset_area_new (width, height);
+  gtk_container_add (GTK_CONTAINER (frame), private->area);
+  gtk_widget_show (private->area);
+
+  gimp_viewable_get_preview_size (viewable, 200, TRUE, TRUE, &width, &height);
+  pixbuf = gimp_viewable_get_pixbuf (viewable, context,
+                                     width, height);
+
+  if (pixbuf)
+    gimp_offset_area_set_pixbuf (GIMP_OFFSET_AREA (private->area), pixbuf);
+
+  g_signal_connect (private->area, "offsets-changed",
+                    G_CALLBACK (offsets_changed),
+                    private);
+
+  g_signal_connect (private->box, "notify",
+                    G_CALLBACK (size_notify),
+                    private);
+
+  /* Button to center the image on canvas just below the preview. */
+  button = gtk_button_new_with_mnemonic (_("C_enter"));
+  gtk_box_pack_start (GTK_BOX (center_right_vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (offset_center_clicked),
+                    private);
+
+  frame = gimp_frame_new (layers_title);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  if (GIMP_IS_IMAGE (viewable))
+    {
+      GtkWidget *label;
+
+      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      label = gtk_label_new_with_mnemonic (_("Resize _layers:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+
+      gtk_size_group_add_widget (size_group, label);
+
+      private->layer_set_combo = combo =
+        gimp_enum_combo_box_new (GIMP_TYPE_ITEM_SET);
+      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+      gtk_widget_show (combo);
+
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  private->layer_set,
+                                  G_CALLBACK (gimp_int_combo_box_get_active),
+                                  &private->layer_set);
+    }
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  private->fill_type_combo = combo =
+    gimp_enum_combo_box_new (GIMP_TYPE_FILL_TYPE);
+  gtk_box_pack_end (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                              private->fill_type,
+                              G_CALLBACK (gimp_int_combo_box_get_active),
+                              &private->fill_type);
+
+  if (GIMP_IS_IMAGE (viewable))
+    {
+      GtkWidget *label;
+
+      label = gtk_label_new_with_mnemonic (_("_Fill with:"));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+      gtk_size_group_add_widget (size_group, label);
+
+      private->text_layers_button = button =
+        gtk_check_button_new_with_mnemonic (_("Resize _text layers"));
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                    private->resize_text_layers);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      g_signal_connect (button, "toggled",
+                        G_CALLBACK (gimp_toggle_button_update),
+                        &private->resize_text_layers);
+
+      gimp_help_set_help_data (button,
+                               _("Resizing text layers will make them uneditable"),
+                               NULL);
+
+      g_object_unref (size_group);
+    }
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+resize_dialog_free (ResizeDialog *private)
+{
+  g_object_unref (private->context);
+
+  g_slice_free (ResizeDialog, private);
+}
+
+static void
+resize_dialog_response (GtkWidget    *dialog,
+                        gint          response_id,
+                        ResizeDialog *private)
+{
+  GimpSizeEntry *entry = GIMP_SIZE_ENTRY (private->offset);
+  GimpUnit       unit;
+  gint           width;
+  gint           height;
+  gdouble        xres;
+  gdouble        yres;
+  GimpUnit       res_unit;
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      resize_dialog_reset (private);
+      break;
+
+    case GTK_RESPONSE_OK:
+      g_object_get (private->box,
+                    "width",           &width,
+                    "height",          &height,
+                    "unit",            &unit,
+                    "xresolution",     &xres,
+                    "yresolution",     &yres,
+                    "resolution-unit", &res_unit,
+                    NULL);
+
+      private->callback (dialog,
+                         private->viewable,
+                         private->parent_context,
+                         width,
+                         height,
+                         unit,
+                         gimp_size_entry_get_refval (entry, 0),
+                         gimp_size_entry_get_refval (entry, 1),
+                         xres,
+                         yres,
+                         res_unit,
+                         private->fill_type,
+                         private->layer_set,
+                         private->resize_text_layers,
+                         private->user_data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
+
+static void
+resize_dialog_reset (ResizeDialog *private)
+{
+  g_object_set (private->box,
+                "keep-aspect", FALSE,
+                NULL);
+
+  g_object_set (private->box,
+                "width",           private->old_width,
+                "height",          private->old_height,
+                "unit",            private->old_unit,
+                "xresolution",     private->old_xres,
+                "yresolution",     private->old_yres,
+                "resolution-unit", private->old_res_unit,
+                NULL);
+
+  if (private->layer_set_combo)
+    gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->layer_set_combo),
+                                   private->old_layer_set);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->fill_type_combo),
+                                 private->old_fill_type);
+
+  if (private->text_layers_button)
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->text_layers_button),
+                                  private->old_resize_text_layers);
+
+  gimp_context_set_template (private->context, NULL);
+
+  gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (private->offset),
+                            private->old_unit);
+}
+
+static void
+size_notify (GimpSizeBox  *box,
+             GParamSpec   *pspec,
+             ResizeDialog *private)
+{
+  gint  diff_x = box->width  - private->old_width;
+  gint  diff_y = box->height - private->old_height;
+
+  gimp_offset_area_set_size (GIMP_OFFSET_AREA (private->area),
+                             box->width, box->height);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (private->offset), 0,
+                                         MIN (0, diff_x), MAX (0, diff_x));
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (private->offset), 1,
+                                         MIN (0, diff_y), MAX (0, diff_y));
+}
+
+static gint
+resize_bound_off_x (ResizeDialog *private,
+                    gint          offset_x)
+{
+  GimpSizeBox *box = GIMP_SIZE_BOX (private->box);
+
+  if (private->old_width <= box->width)
+    return CLAMP (offset_x, 0, (box->width - private->old_width));
+  else
+    return CLAMP (offset_x, (box->width - private->old_width), 0);
+}
+
+static gint
+resize_bound_off_y (ResizeDialog *private,
+                    gint          off_y)
+{
+  GimpSizeBox *box = GIMP_SIZE_BOX (private->box);
+
+  if (private->old_height <= box->height)
+    return CLAMP (off_y, 0, (box->height - private->old_height));
+  else
+    return CLAMP (off_y, (box->height - private->old_height), 0);
+}
+
+static void
+offset_update (GtkWidget    *widget,
+               ResizeDialog *private)
+{
+  GimpSizeEntry *entry = GIMP_SIZE_ENTRY (private->offset);
+  gint           off_x;
+  gint           off_y;
+
+  off_x = resize_bound_off_x (private,
+                              RINT (gimp_size_entry_get_refval (entry, 0)));
+  off_y = resize_bound_off_y (private,
+                              RINT (gimp_size_entry_get_refval (entry, 1)));
+
+  gimp_offset_area_set_offsets (GIMP_OFFSET_AREA (private->area), off_x, off_y);
+}
+
+static void
+offsets_changed (GtkWidget    *area,
+                 gint          off_x,
+                 gint          off_y,
+                 ResizeDialog *private)
+{
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset), 0, off_x);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset), 1, off_y);
+}
+
+static void
+offset_center_clicked (GtkWidget    *widget,
+                       ResizeDialog *private)
+{
+  GimpSizeBox *box = GIMP_SIZE_BOX (private->box);
+  gint         off_x;
+  gint         off_y;
+
+  off_x = resize_bound_off_x (private, (box->width  - private->old_width)  / 2);
+  off_y = resize_bound_off_y (private, (box->height - private->old_height) / 2);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset), 0, off_x);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset), 1, off_y);
+
+  g_signal_emit_by_name (private->offset, "value-changed", 0);
+}
+
+static void
+template_changed (GimpContext  *context,
+                  GimpTemplate *template,
+                  ResizeDialog *private)
+{
+  GimpUnit unit = private->old_unit;
+
+  private->template = template;
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->ppi_image), TRUE);
+  gtk_widget_hide (private->ppi_box);
+
+  if (template != NULL)
+    {
+      gdouble  xres;
+      gdouble  yres;
+      GimpUnit res_unit;
+      gboolean resolution_mismatch;
+
+      unit     = gimp_template_get_unit            (template);
+      xres     = gimp_template_get_resolution_x    (template);
+      yres     = gimp_template_get_resolution_y    (template);
+      res_unit = gimp_template_get_resolution_unit (template);
+
+      resolution_mismatch = xres     != private->old_xres ||
+                            yres     != private->old_yres ||
+                            res_unit != private->old_res_unit;
+
+      if (resolution_mismatch &&
+          unit != GIMP_UNIT_PIXEL)
+        {
+          gchar *text;
+
+          text = g_strdup_printf (_("Scale template to %.2f ppi"),
+                                  private->old_xres);
+          gtk_button_set_label (GTK_BUTTON (private->ppi_image), text);
+          g_free (text);
+
+          text = g_strdup_printf (_("Set image to %.2f ppi"),
+                                  xres);
+          gtk_button_set_label (GTK_BUTTON (private->ppi_template), text);
+          g_free (text);
+
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (private->ppi_image),
+                                        TRUE);
+
+          gtk_widget_show (private->ppi_box);
+        }
+    }
+
+  ppi_select_toggled (NULL, private);
+
+  gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (private->offset), unit);
+}
+
+static void
+ppi_select_toggled (GtkWidget    *radio,
+                    ResizeDialog *private)
+{
+  gint             width;
+  gint             height;
+  GimpUnit         unit;
+  gdouble          xres;
+  gdouble          yres;
+  GimpUnit         res_unit;
+  GtkToggleButton *image_button;
+  gboolean         use_image_ppi;
+
+  width    = private->old_width;
+  height   = private->old_height;
+  xres     = private->old_xres;
+  yres     = private->old_yres;
+  res_unit = private->old_res_unit;
+  unit     = private->old_unit;
+
+  image_button  = GTK_TOGGLE_BUTTON (private->ppi_image);
+  use_image_ppi = gtk_toggle_button_get_active (image_button);
+
+  if (private->template != NULL)
+    {
+      width    = gimp_template_get_width           (private->template);
+      height   = gimp_template_get_height          (private->template);
+      unit     = gimp_template_get_unit            (private->template);
+      xres     = gimp_template_get_resolution_x    (private->template);
+      yres     = gimp_template_get_resolution_y    (private->template);
+      res_unit = gimp_template_get_resolution_unit (private->template);
+    }
+
+  if (private->template != NULL &&
+      unit != GIMP_UNIT_PIXEL)
+    {
+      if (use_image_ppi)
+        {
+          width  = ceil (width  * (private->old_xres / xres));
+          height = ceil (height * (private->old_yres / yres));
+
+          xres = private->old_xres;
+          yres = private->old_yres;
+        }
+
+      g_object_set (private->box,
+                    "xresolution",     xres,
+                    "yresolution",     yres,
+                    "resolution-unit", res_unit,
+                    NULL);
+    }
+  else
+    {
+      g_object_set (private->box,
+                    "xresolution",     private->old_xres,
+                    "yresolution",     private->old_yres,
+                    "resolution-unit", private->old_res_unit,
+                    NULL);
+    }
+
+  g_object_set (private->box,
+                "width",  width,
+                "height", height,
+                "unit",   unit,
+                NULL);
+}
+
+static void
+reset_template_clicked (GtkWidget    *button,
+                        ResizeDialog *private)
+{
+  gimp_context_set_template (private->context, NULL);
+}
diff --git a/app/dialogs/resize-dialog.h b/app/dialogs/resize-dialog.h
new file mode 100644
index 0000000..223b43c
--- /dev/null
+++ b/app/dialogs/resize-dialog.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RESIZE_DIALOG_H__
+#define __RESIZE_DIALOG_H__
+
+
+typedef void (* GimpResizeCallback) (GtkWidget    *dialog,
+                                     GimpViewable *viewable,
+                                     GimpContext  *context,
+                                     gint          width,
+                                     gint          height,
+                                     GimpUnit      unit,
+                                     gint          offset_x,
+                                     gint          offset_y,
+                                     gdouble       xres,
+                                     gdouble       yres,
+                                     GimpUnit      res_unit,
+                                     GimpFillType  fill_type,
+                                     GimpItemSet   layer_set,
+                                     gboolean      resize_text_layers,
+                                     gpointer      user_data);
+
+
+GtkWidget * resize_dialog_new (GimpViewable       *viewable,
+                               GimpContext        *context,
+                               const gchar        *title,
+                               const gchar        *role,
+                               GtkWidget          *parent,
+                               GimpHelpFunc        help_func,
+                               const gchar        *help_id,
+                               GimpUnit            unit,
+                               GimpFillType        fill_type,
+                               GimpItemSet         layer_set,
+                               gboolean            resize_text_layers,
+                               GimpResizeCallback  callback,
+                               gpointer            user_data);
+
+
+#endif  /*  __RESIZE_DIALOG_H__  */
diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c
new file mode 100644
index 0000000..d4562aa
--- /dev/null
+++ b/app/dialogs/resolution-calibrate-dialog.c
@@ -0,0 +1,204 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "resolution-calibrate-dialog.h"
+
+#include "gimp-intl.h"
+
+
+static GtkWidget *calibrate_entry = NULL;
+static gdouble    calibrate_xres  = 1.0;
+static gdouble    calibrate_yres  = 1.0;
+static gint       ruler_width     = 1;
+static gint       ruler_height    = 1;
+
+
+/**
+ * resolution_calibrate_dialog:
+ * @resolution_entry: a #GimpSizeEntry to connect the dialog to
+ * @icon_name:        an optional icon-name for the upper left corner
+ *
+ * Displays a dialog that allows the user to interactively determine
+ * her monitor resolution. This dialog runs it's own GTK main loop and
+ * is connected to a #GimpSizeEntry handling the resolution to be set.
+ **/
+void
+resolution_calibrate_dialog (GtkWidget   *resolution_entry,
+                             const gchar *icon_name)
+{
+  GtkWidget    *dialog;
+  GtkWidget    *table;
+  GtkWidget    *vbox;
+  GtkWidget    *hbox;
+  GtkWidget    *ruler;
+  GtkWidget    *label;
+  GdkScreen    *screen;
+  GdkRectangle  rect;
+  gint          monitor;
+
+  g_return_if_fail (GIMP_IS_SIZE_ENTRY (resolution_entry));
+  g_return_if_fail (gtk_widget_get_realized (resolution_entry));
+
+  /*  this dialog can only exist once  */
+  if (calibrate_entry)
+    return;
+
+  dialog = gimp_dialog_new (_("Calibrate Monitor Resolution"),
+                            "gimp-resolution-calibration",
+                            gtk_widget_get_toplevel (resolution_entry),
+                            GTK_DIALOG_DESTROY_WITH_PARENT,
+                            NULL, NULL,
+
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
+
+                            NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  screen = gtk_widget_get_screen (dialog);
+  monitor = gdk_screen_get_monitor_at_window (screen,
+                                              gtk_widget_get_window (resolution_entry));
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  ruler_width  = rect.width  - 300 - (rect.width  % 100);
+  ruler_height = rect.height - 300 - (rect.height % 100);
+
+  table = gtk_table_new (4, 4, FALSE);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      table, TRUE, TRUE, 0);
+  gtk_widget_show (table);
+
+  if (icon_name)
+    {
+      GtkWidget *image = gtk_image_new_from_icon_name (icon_name,
+                                                       GTK_ICON_SIZE_DIALOG);
+
+      gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1,
+                        GTK_SHRINK, GTK_SHRINK, 4, 4);
+      gtk_widget_show (image);
+    }
+
+  ruler = gimp_ruler_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_widget_set_size_request (ruler, ruler_width, 32);
+  gimp_ruler_set_range (GIMP_RULER (ruler), 0, ruler_width, ruler_width);
+  gtk_table_attach (GTK_TABLE (table), ruler, 1, 3, 0, 1,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (ruler);
+
+  ruler = gimp_ruler_new (GTK_ORIENTATION_VERTICAL);
+  gtk_widget_set_size_request (ruler, 32, ruler_height);
+  gimp_ruler_set_range (GIMP_RULER (ruler), 0, ruler_height, ruler_height);
+  gtk_table_attach (GTK_TABLE (table), ruler, 0, 1, 1, 3,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (ruler);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_table_attach (GTK_TABLE (table), vbox, 1, 2, 1, 2,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (vbox);
+
+  label =
+    gtk_label_new (_("Measure the rulers and enter their lengths:"));
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_LARGE,
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  calibrate_xres =
+    gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (resolution_entry), 0);
+  calibrate_yres =
+    gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (resolution_entry), 1);
+
+  calibrate_entry =
+    gimp_coordinates_new  (GIMP_UNIT_INCH, "%p",
+                           FALSE, FALSE, 10,
+                           GIMP_SIZE_ENTRY_UPDATE_SIZE,
+                           FALSE,
+                           FALSE,
+                           _("_Horizontal:"),
+                           ruler_width,
+                           calibrate_xres,
+                           1, GIMP_MAX_IMAGE_SIZE,
+                           0, 0,
+                           _("_Vertical:"),
+                           ruler_height,
+                           calibrate_yres,
+                           1, GIMP_MAX_IMAGE_SIZE,
+                           0, 0);
+  gtk_widget_hide (GTK_WIDGET (GIMP_COORDINATES_CHAINBUTTON (calibrate_entry)));
+  g_signal_connect (dialog, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &calibrate_entry);
+
+  gtk_box_pack_end (GTK_BOX (hbox), calibrate_entry, FALSE, FALSE, 0);
+  gtk_widget_show (calibrate_entry);
+
+  gtk_widget_show (dialog);
+
+  switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
+    {
+    case GTK_RESPONSE_OK:
+      {
+        GtkWidget *chain_button;
+        gdouble    x, y;
+
+        x = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (calibrate_entry), 0);
+        y = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (calibrate_entry), 1);
+
+        calibrate_xres = (gdouble) ruler_width  * calibrate_xres / x;
+        calibrate_yres = (gdouble) ruler_height * calibrate_yres / y;
+
+        chain_button = GIMP_COORDINATES_CHAINBUTTON (resolution_entry);
+
+        if (ABS (x - y) > GIMP_MIN_RESOLUTION)
+          gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (chain_button),
+                                        FALSE);
+
+        gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (resolution_entry),
+                                    0, calibrate_xres);
+        gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (resolution_entry),
+                                    1, calibrate_yres);
+      }
+
+    default:
+      break;
+    }
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/dialogs/resolution-calibrate-dialog.h b/app/dialogs/resolution-calibrate-dialog.h
new file mode 100644
index 0000000..84a60dc
--- /dev/null
+++ b/app/dialogs/resolution-calibrate-dialog.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RESOLUTION_CALIBRATE_DIALOG_H__
+#define __RESOLUTION_CALIBRATE_DIALOG_H__
+
+
+void  resolution_calibrate_dialog (GtkWidget   *resolution_entry,
+                                   const gchar *icon_name);
+
+
+#endif /* __RESOLUTION_CALIBRATE_DIALOG_H__ */
diff --git a/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c
new file mode 100644
index 0000000..8c4b6da
--- /dev/null
+++ b/app/dialogs/scale-dialog.c
@@ -0,0 +1,311 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpsizebox.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "scale-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+typedef struct _ScaleDialog ScaleDialog;
+
+struct _ScaleDialog
+{
+  GimpViewable          *viewable;
+  GimpUnit               unit;
+  GimpInterpolationType  interpolation;
+  GtkWidget             *box;
+  GtkWidget             *combo;
+  GimpScaleCallback      callback;
+  gpointer               user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void   scale_dialog_free     (ScaleDialog *private);
+static void   scale_dialog_response (GtkWidget   *dialog,
+                                     gint         response_id,
+                                     ScaleDialog *private);
+static void   scale_dialog_reset    (ScaleDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+scale_dialog_new (GimpViewable          *viewable,
+                  GimpContext           *context,
+                  const gchar           *title,
+                  const gchar           *role,
+                  GtkWidget             *parent,
+                  GimpHelpFunc           help_func,
+                  const gchar           *help_id,
+                  GimpUnit               unit,
+                  GimpInterpolationType  interpolation,
+                  GimpScaleCallback      callback,
+                  gpointer               user_data)
+{
+  GtkWidget   *dialog;
+  GtkWidget   *vbox;
+  GtkWidget   *hbox;
+  GtkWidget   *frame;
+  GtkWidget   *label;
+  ScaleDialog *private;
+  GimpImage   *image = NULL;
+  const gchar *text  = NULL;
+  gint         width, height;
+  gdouble      xres, yres;
+
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  if (GIMP_IS_IMAGE (viewable))
+    {
+      image = GIMP_IMAGE (viewable);
+
+      width  = gimp_image_get_width (image);
+      height = gimp_image_get_height (image);
+
+      text = _("Image Size");
+    }
+  else if (GIMP_IS_ITEM (viewable))
+    {
+      GimpItem *item = GIMP_ITEM (viewable);
+
+      image = gimp_item_get_image (item);
+
+      width  = gimp_item_get_width  (item);
+      height = gimp_item_get_height (item);
+
+      text = _("Layer Size");
+    }
+  else
+    {
+      g_return_val_if_reached (NULL);
+    }
+
+  private = g_slice_new0 (ScaleDialog);
+
+  private->viewable      = viewable;
+  private->interpolation = interpolation;
+  private->unit          = unit;
+  private->callback      = callback;
+  private->user_data     = user_data;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  dialog = gimp_viewable_dialog_new (viewable, context,
+                                     title, role, GIMP_ICON_OBJECT_SCALE, title,
+                                     parent,
+                                     help_func, help_id,
+
+                                     _("_Reset"),  RESPONSE_RESET,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Scale"),  GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) scale_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (scale_dialog_response),
+                    private);
+
+  private->box = g_object_new (GIMP_TYPE_SIZE_BOX,
+                               "width",           width,
+                               "height",          height,
+                               "unit",            unit,
+                               "xresolution",     xres,
+                               "yresolution",     yres,
+                               "resolution-unit", gimp_image_get_unit (image),
+                               "keep-aspect",     TRUE,
+                               "edit-resolution", GIMP_IS_IMAGE (viewable),
+                               NULL);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  frame = gimp_frame_new (text);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  gtk_container_add (GTK_CONTAINER (frame), private->box);
+  gtk_widget_show (private->box);
+
+  frame = gimp_frame_new (_("Quality"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("I_nterpolation:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  gtk_size_group_add_widget (GIMP_SIZE_BOX (private->box)->size_group, label);
+
+  private->combo = gimp_enum_combo_box_new (GIMP_TYPE_INTERPOLATION_TYPE);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), private->combo);
+  gtk_box_pack_start (GTK_BOX (hbox), private->combo, TRUE, TRUE, 0);
+  gtk_widget_show (private->combo);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->combo),
+                                 private->interpolation);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+scale_dialog_free (ScaleDialog *private)
+{
+  g_slice_free (ScaleDialog, private);
+}
+
+static void
+scale_dialog_response (GtkWidget   *dialog,
+                       gint         response_id,
+                       ScaleDialog *private)
+{
+  GimpUnit  unit          = private->unit;
+  gint      interpolation = private->interpolation;
+  GimpUnit  resolution_unit;
+  gint      width, height;
+  gdouble   xres, yres;
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      scale_dialog_reset (private);
+      break;
+
+    case GTK_RESPONSE_OK:
+      g_object_get (private->box,
+                    "width",           &width,
+                    "height",          &height,
+                    "unit",            &unit,
+                    "xresolution",     &xres,
+                    "yresolution",     &yres,
+                    "resolution-unit", &resolution_unit,
+                    NULL);
+
+      gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (private->combo),
+                                     &interpolation);
+
+      private->callback (dialog,
+                         private->viewable,
+                         width, height, unit, interpolation,
+                         xres, yres, resolution_unit,
+                         private->user_data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
+
+static void
+scale_dialog_reset (ScaleDialog *private)
+{
+  GimpImage *image;
+  gint       width, height;
+  gdouble    xres, yres;
+
+  if (GIMP_IS_IMAGE (private->viewable))
+    {
+      image = GIMP_IMAGE (private->viewable);
+
+      width  = gimp_image_get_width (image);
+      height = gimp_image_get_height (image);
+    }
+  else if (GIMP_IS_ITEM (private->viewable))
+    {
+      GimpItem *item = GIMP_ITEM (private->viewable);
+
+      image = gimp_item_get_image (item);
+
+      width  = gimp_item_get_width  (item);
+      height = gimp_item_get_height (item);
+    }
+  else
+    {
+      g_return_if_reached ();
+    }
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  g_object_set (private->box,
+                "keep-aspect",     FALSE,
+                NULL);
+
+  g_object_set (private->box,
+                "width",           width,
+                "height",          height,
+                "unit",            private->unit,
+                NULL);
+
+  g_object_set (private->box,
+                "keep-aspect",     TRUE,
+                "xresolution",     xres,
+                "yresolution",     yres,
+                "resolution-unit", gimp_image_get_unit (image),
+                NULL);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->combo),
+                                 private->interpolation);
+}
diff --git a/app/dialogs/scale-dialog.h b/app/dialogs/scale-dialog.h
new file mode 100644
index 0000000..46e8f9c
--- /dev/null
+++ b/app/dialogs/scale-dialog.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SCALE_DIALOG_H__
+#define __SCALE_DIALOG_H__
+
+
+GtkWidget * scale_dialog_new (GimpViewable          *viewable,
+                              GimpContext           *context,
+                              const gchar           *title,
+                              const gchar           *role,
+                              GtkWidget             *parent,
+                              GimpHelpFunc           help_func,
+                              const gchar           *help_id,
+                              GimpUnit               unit,
+                              GimpInterpolationType  interpolation,
+                              GimpScaleCallback      callback,
+                              gpointer               user_data);
+
+
+#endif  /*  __SCALE_DIALOG_H__  */
diff --git a/app/dialogs/stroke-dialog.c b/app/dialogs/stroke-dialog.c
new file mode 100644
index 0000000..33c11ce
--- /dev/null
+++ b/app/dialogs/stroke-dialog.c
@@ -0,0 +1,303 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimppaintinfo.h"
+#include "core/gimpstrokeoptions.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpcontainercombobox.h"
+#include "widgets/gimpcontainerview.h"
+#include "widgets/gimpviewabledialog.h"
+#include "widgets/gimpstrokeeditor.h"
+
+#include "stroke-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+
+typedef struct _StrokeDialog StrokeDialog;
+
+struct _StrokeDialog
+{
+  GimpItem           *item;
+  GimpDrawable       *drawable;
+  GimpContext        *context;
+  GimpStrokeOptions  *options;
+  GimpStrokeCallback  callback;
+  gpointer            user_data;
+
+  GtkWidget          *tool_combo;
+};
+
+
+/*  local function prototypes  */
+
+static void  stroke_dialog_free     (StrokeDialog *private);
+static void  stroke_dialog_response (GtkWidget    *dialog,
+                                     gint          response_id,
+                                     StrokeDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+stroke_dialog_new (GimpItem           *item,
+                   GimpDrawable       *drawable,
+                   GimpContext        *context,
+                   const gchar        *title,
+                   const gchar        *icon_name,
+                   const gchar        *help_id,
+                   GtkWidget          *parent,
+                   GimpStrokeOptions  *options,
+                   GimpStrokeCallback  callback,
+                   gpointer            user_data)
+{
+  StrokeDialog *private;
+  GimpImage    *image;
+  GtkWidget    *dialog;
+  GtkWidget    *main_vbox;
+  GtkWidget    *radio_box;
+  GtkWidget    *cairo_radio;
+  GtkWidget    *paint_radio;
+  GSList       *group;
+  GtkWidget    *frame;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  image = gimp_item_get_image (item);
+
+  private = g_slice_new0 (StrokeDialog);
+
+  private->item      = item;
+  private->drawable  = drawable;
+  private->context   = context;
+  private->options   = gimp_stroke_options_new (context->gimp, context, TRUE);
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (private->options), 0);
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (item), context,
+                                     title, "gimp-stroke-options",
+                                     icon_name,
+                                     _("Choose Stroke Style"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     help_id,
+
+                                     _("_Reset"),  RESPONSE_RESET,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Stroke"), GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) stroke_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (stroke_dialog_response),
+                    private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+  radio_box = gimp_prop_enum_radio_box_new (G_OBJECT (private->options),
+                                            "method", -1, -1);
+
+  group = gtk_radio_button_get_group (g_object_get_data (G_OBJECT (radio_box),
+                                                         "radio-button"));
+
+  cairo_radio = g_object_ref (group->next->data);
+  gtk_container_remove (GTK_CONTAINER (radio_box), cairo_radio);
+
+  paint_radio = g_object_ref (group->data);
+  gtk_container_remove (GTK_CONTAINER (radio_box), paint_radio);
+
+  g_object_ref_sink (radio_box);
+  g_object_unref (radio_box);
+
+  {
+    PangoFontDescription *font_desc;
+
+    font_desc = pango_font_description_new ();
+    pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
+
+    gtk_widget_modify_font (gtk_bin_get_child (GTK_BIN (cairo_radio)),
+                            font_desc);
+    gtk_widget_modify_font (gtk_bin_get_child (GTK_BIN (paint_radio)),
+                            font_desc);
+
+    pango_font_description_free (font_desc);
+  }
+
+
+  /*  the stroke frame  */
+
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  gtk_frame_set_label_widget (GTK_FRAME (frame), cairo_radio);
+  g_object_unref (cairo_radio);
+
+  {
+    GtkWidget *stroke_editor;
+    gdouble    xres;
+    gdouble    yres;
+
+    gimp_image_get_resolution (image, &xres, &yres);
+
+    stroke_editor = gimp_stroke_editor_new (private->options, yres, FALSE);
+    gtk_container_add (GTK_CONTAINER (frame), stroke_editor);
+    gtk_widget_show (stroke_editor);
+
+    g_object_bind_property (cairo_radio,   "active",
+                            stroke_editor, "sensitive",
+                            G_BINDING_SYNC_CREATE);
+  }
+
+
+  /*  the paint tool frame  */
+
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  gtk_frame_set_label_widget (GTK_FRAME (frame), paint_radio);
+  g_object_unref (paint_radio);
+
+  {
+    GtkWidget *vbox;
+    GtkWidget *hbox;
+    GtkWidget *label;
+    GtkWidget *combo;
+    GtkWidget *button;
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+    gtk_container_add (GTK_CONTAINER (frame), vbox);
+    gtk_widget_show (vbox);
+
+    g_object_bind_property (paint_radio, "active",
+                            vbox,        "sensitive",
+                            G_BINDING_SYNC_CREATE);
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    label = gtk_label_new_with_mnemonic (_("P_aint tool:"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    combo = gimp_container_combo_box_new (image->gimp->paint_info_list,
+                                          GIMP_CONTEXT (private->options),
+                                          16, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+    gtk_widget_show (combo);
+
+    private->tool_combo = combo;
+
+    button = gimp_prop_check_button_new (G_OBJECT (private->options),
+                                         "emulate-brush-dynamics",
+                                         _("_Emulate brush dynamics"));
+    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+    gtk_widget_show (button);
+  }
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+stroke_dialog_free (StrokeDialog *private)
+{
+  g_object_unref (private->options);
+
+  g_slice_free (StrokeDialog, private);
+}
+
+static void
+stroke_dialog_response (GtkWidget    *dialog,
+                        gint          response_id,
+                        StrokeDialog *private)
+{
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      {
+        GimpToolInfo *tool_info = gimp_context_get_tool (private->context);
+
+        gimp_config_reset (GIMP_CONFIG (private->options));
+
+        gimp_container_view_select_item (GIMP_CONTAINER_VIEW (private->tool_combo),
+                                         GIMP_VIEWABLE (tool_info->paint_info));
+
+      }
+      break;
+
+    case GTK_RESPONSE_OK:
+      private->callback (dialog,
+                         private->item,
+                         private->drawable,
+                         private->context,
+                         private->options,
+                         private->user_data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
diff --git a/app/dialogs/stroke-dialog.h b/app/dialogs/stroke-dialog.h
new file mode 100644
index 0000000..e8e02a1
--- /dev/null
+++ b/app/dialogs/stroke-dialog.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Copyright (C) 2003  Simon Budig
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __STROKE_DIALOG_H__
+#define __STROKE_DIALOG_H__
+
+
+typedef void (* GimpStrokeCallback) (GtkWidget         *dialog,
+                                     GimpItem          *item,
+                                     GimpDrawable      *drawable,
+                                     GimpContext       *context,
+                                     GimpStrokeOptions *options,
+                                     gpointer           user_data);
+
+
+GtkWidget * stroke_dialog_new (GimpItem           *item,
+                               GimpDrawable       *drawable,
+                               GimpContext        *context,
+                               const gchar        *title,
+                               const gchar        *icon_name,
+                               const gchar        *help_id,
+                               GtkWidget          *parent,
+                               GimpStrokeOptions  *options,
+                               GimpStrokeCallback  callback,
+                               gpointer            user_data);
+
+
+#endif  /*  __STROKE_DIALOG_H__  */
diff --git a/app/dialogs/template-options-dialog.c b/app/dialogs/template-options-dialog.c
new file mode 100644
index 0000000..7025253
--- /dev/null
+++ b/app/dialogs/template-options-dialog.c
@@ -0,0 +1,180 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimptemplate.h"
+
+#include "widgets/gimptemplateeditor.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "template-options-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _TemplateOptionsDialog TemplateOptionsDialog;
+
+struct _TemplateOptionsDialog
+{
+  GimpTemplate                *template;
+  GimpContext                 *context;
+  GimpTemplateOptionsCallback  callback;
+  gpointer                     user_data;
+
+  GtkWidget                   *editor;
+};
+
+
+/*  local function prototypes  */
+
+static void   template_options_dialog_free     (TemplateOptionsDialog *private);
+static void   template_options_dialog_response (GtkWidget             *dialog,
+                                                gint                   response_id,
+                                                TemplateOptionsDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+template_options_dialog_new (GimpTemplate *template,
+                             GimpContext  *context,
+                             GtkWidget    *parent,
+                             const gchar  *title,
+                             const gchar  *role,
+                             const gchar  *icon_name,
+                             const gchar  *desc,
+                             const gchar  *help_id,
+                             GimpTemplateOptionsCallback  callback,
+                             gpointer                     user_data)
+{
+  TemplateOptionsDialog *private;
+  GtkWidget             *dialog;
+  GimpViewable          *viewable = NULL;
+  GtkWidget             *vbox;
+
+  g_return_val_if_fail (template == NULL || GIMP_IS_TEMPLATE (template), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (role != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (desc != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (TemplateOptionsDialog);
+
+  private->template  = template;
+  private->context   = context;
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  if (template)
+    {
+      viewable = GIMP_VIEWABLE (template);
+      template = gimp_config_duplicate (GIMP_CONFIG (template));
+    }
+  else
+    {
+      template =
+        gimp_config_duplicate (GIMP_CONFIG (context->gimp->config->default_image));
+      viewable = GIMP_VIEWABLE (template);
+
+      gimp_object_set_static_name (GIMP_OBJECT (template), _("Unnamed"));
+    }
+
+  dialog = gimp_viewable_dialog_new (viewable, context,
+                                     title, role, icon_name, desc,
+                                     parent,
+                                     gimp_standard_help_func, help_id,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_OK"),     GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) template_options_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (template_options_dialog_response),
+                    private);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  private->editor = gimp_template_editor_new (template, context->gimp, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), private->editor, FALSE, FALSE, 0);
+  gtk_widget_show (private->editor);
+
+  g_object_unref (template);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+template_options_dialog_free (TemplateOptionsDialog *private)
+{
+  g_slice_free (TemplateOptionsDialog, private);
+}
+
+static void
+template_options_dialog_response (GtkWidget             *dialog,
+                                  gint                   response_id,
+                                  TemplateOptionsDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GimpTemplateEditor *editor = GIMP_TEMPLATE_EDITOR (private->editor);
+
+      private->callback (dialog,
+                         private->template,
+                         gimp_template_editor_get_template (editor),
+                         private->context,
+                         private->user_data);
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
diff --git a/app/dialogs/template-options-dialog.h b/app/dialogs/template-options-dialog.h
new file mode 100644
index 0000000..633489e
--- /dev/null
+++ b/app/dialogs/template-options-dialog.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEMPLATE_OPTIONS_DIALOG_H__
+#define __TEMPLATE_OPTIONS_DIALOG_H__
+
+
+typedef void (* GimpTemplateOptionsCallback) (GtkWidget    *dialog,
+                                              GimpTemplate *template,
+                                              GimpTemplate *edit_template,
+                                              GimpContext  *context,
+                                              gpointer      user_data);
+
+
+GtkWidget * template_options_dialog_new (GimpTemplate                *template,
+                                         GimpContext                 *context,
+                                         GtkWidget                   *parent,
+                                         const gchar                 *title,
+                                         const gchar                 *role,
+                                         const gchar                 *icon_name,
+                                         const gchar                 *desc,
+                                         const gchar                 *help_id,
+                                         GimpTemplateOptionsCallback  callback,
+                                         gpointer                     user_data);
+
+
+#endif /* __TEMPLATE_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c
new file mode 100644
index 0000000..610938c
--- /dev/null
+++ b/app/dialogs/tips-dialog.c
@@ -0,0 +1,289 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "tips-dialog.h"
+#include "tips-parser.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  RESPONSE_PREVIOUS = 1,
+  RESPONSE_NEXT     = 2
+};
+
+
+/* eek, see bug 762279 */
+GtkLinkButtonUriFunc
+gtk_link_button_set_uri_hook      (GtkLinkButtonUriFunc func,
+                                   gpointer             data,
+                                   GDestroyNotify       destroy);
+static void  tips_uri_hook        (GtkLinkButton *button,
+                                   const gchar   *link_,
+                                   gpointer       user_data);
+
+
+static void  tips_dialog_set_tip  (GimpTip       *tip);
+static void  tips_dialog_response (GtkWidget     *dialog,
+                                   gint           response);
+static void  tips_dialog_destroy  (GtkWidget     *widget,
+                                   GimpGuiConfig *config);
+static void  more_button_clicked  (GtkWidget     *button,
+                                   Gimp          *gimp);
+
+
+static GtkWidget *tips_dialog = NULL;
+static GtkWidget *tip_label   = NULL;
+static GtkWidget *more_button = NULL;
+static GList     *tips        = NULL;
+static GList     *current_tip = NULL;
+
+
+GtkWidget *
+tips_dialog_create (Gimp *gimp)
+{
+  GimpGuiConfig *config;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *button;
+  GtkWidget     *image;
+  gint           tips_count;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (!tips)
+    {
+      GError *error = NULL;
+      GFile  *file;
+
+      file = gimp_data_directory_file ("tips", "gimp-tips.xml", NULL);
+
+      tips = gimp_tips_from_file (file, &error);
+
+      if (! tips)
+        {
+          GimpTip *tip;
+
+          if (! error)
+            {
+              tip = gimp_tip_new (_("The GIMP tips file is empty!"), NULL);
+            }
+          else if (error->code == G_FILE_ERROR_NOENT)
+            {
+              tip = gimp_tip_new (_("The GIMP tips file appears to be "
+                                    "missing!"),
+                                  _("There should be a file called '%s'. "
+                                    "Please check your installation."),
+                                  gimp_file_get_utf8_name (file));
+            }
+          else
+            {
+              tip = gimp_tip_new (_("The GIMP tips file could not be parsed!"),
+                                  "%s", error->message);
+            }
+
+          tips = g_list_prepend (tips, tip);
+        }
+      else if (error)
+        {
+          g_printerr ("Error while parsing '%s': %s\n",
+                      gimp_file_get_utf8_name (file), error->message);
+        }
+
+      g_clear_error (&error);
+      g_object_unref (file);
+    }
+
+  tips_count = g_list_length (tips);
+
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  if (config->last_tip_shown >= tips_count || config->last_tip_shown < 0)
+    config->last_tip_shown = 0;
+
+  current_tip = g_list_nth (tips, config->last_tip_shown);
+
+  if (tips_dialog)
+    return tips_dialog;
+
+  tips_dialog = gimp_dialog_new (_("GIMP Tip of the Day"),
+                                 "gimp-tip-of-the-day",
+                                 NULL, 0, NULL, NULL,
+                                 NULL);
+
+  button = gtk_dialog_add_button (GTK_DIALOG (tips_dialog),
+                                  _("_Previous Tip"), RESPONSE_PREVIOUS);
+  gtk_button_set_image (GTK_BUTTON (button),
+                        gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
+                                                      GTK_ICON_SIZE_BUTTON));
+
+  button = gtk_dialog_add_button (GTK_DIALOG (tips_dialog),
+                                  _("_Next Tip"), RESPONSE_NEXT);
+  gtk_button_set_image (GTK_BUTTON (button),
+                        gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
+                                                      GTK_ICON_SIZE_BUTTON));
+
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (tips_dialog),
+                                     RESPONSE_NEXT, tips_count > 1);
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (tips_dialog),
+                                     RESPONSE_PREVIOUS, tips_count > 1);
+
+  g_signal_connect (tips_dialog, "response",
+                    G_CALLBACK (tips_dialog_response),
+                    NULL);
+  g_signal_connect (tips_dialog, "destroy",
+                    G_CALLBACK (tips_dialog_destroy),
+                    config);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tips_dialog))),
+                      vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+  gtk_widget_show (hbox);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_INFORMATION,
+                                        GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  gtk_container_set_focus_chain (GTK_CONTAINER (hbox), NULL);
+
+  tip_label = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (tip_label), TRUE);
+  gtk_label_set_justify (GTK_LABEL (tip_label), GTK_JUSTIFY_LEFT);
+  gtk_label_set_line_wrap (GTK_LABEL (tip_label), TRUE);
+  gtk_label_set_yalign (GTK_LABEL (tip_label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), tip_label, TRUE, TRUE, 0);
+  gtk_widget_show (tip_label);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  more_button = gtk_link_button_new_with_label ("https://docs.gimp.org/",
+  /*  a link to the related section in the user manual  */
+                                                _("Learn more"));
+  gtk_widget_show (more_button);
+  gtk_box_pack_start (GTK_BOX (hbox), more_button, FALSE, FALSE, 0);
+
+  /* this is deprecated but better than showing two URIs, see bug #762279 */
+  gtk_link_button_set_uri_hook (tips_uri_hook, NULL, NULL);
+
+  g_signal_connect (more_button, "clicked",
+                    G_CALLBACK (more_button_clicked),
+                    gimp);
+
+  tips_dialog_set_tip (current_tip->data);
+
+  return tips_dialog;
+}
+
+static void
+tips_dialog_destroy (GtkWidget     *widget,
+                     GimpGuiConfig *config)
+{
+  /* the last-shown-tip is saved in sessionrc */
+  config->last_tip_shown = g_list_position (tips, current_tip);
+
+  tips_dialog = NULL;
+  current_tip = NULL;
+
+  gimp_tips_free (tips);
+  tips = NULL;
+}
+
+static void
+tips_dialog_response (GtkWidget *dialog,
+                      gint       response)
+{
+  switch (response)
+    {
+    case RESPONSE_PREVIOUS:
+      current_tip = current_tip->prev ? current_tip->prev : g_list_last (tips);
+      tips_dialog_set_tip (current_tip->data);
+      break;
+
+    case RESPONSE_NEXT:
+      current_tip = current_tip->next ? current_tip->next : tips;
+      tips_dialog_set_tip (current_tip->data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}
+
+static void
+tips_dialog_set_tip (GimpTip *tip)
+{
+  g_return_if_fail (tip != NULL);
+
+  gtk_label_set_markup (GTK_LABEL (tip_label), tip->text);
+
+  /*  set the URI to unset the "visited" state  */
+  gtk_link_button_set_uri (GTK_LINK_BUTTON (more_button),
+                           "https://docs.gimp.org/");
+
+  gtk_widget_set_sensitive (more_button, tip->help_id != NULL);
+}
+
+static void
+more_button_clicked (GtkWidget *button,
+                     Gimp      *gimp)
+{
+  GimpTip *tip = current_tip->data;
+
+  g_signal_stop_emission_by_name (button, "clicked");
+
+  if (tip->help_id)
+    gimp_help (gimp, NULL, NULL, tip->help_id);
+}
+
+static void
+tips_uri_hook (GtkLinkButton *button,
+               const gchar   *link_,
+               gpointer       user_data)
+{
+  /* do nothing */
+}
diff --git a/app/dialogs/tips-dialog.h b/app/dialogs/tips-dialog.h
new file mode 100644
index 0000000..e594212
--- /dev/null
+++ b/app/dialogs/tips-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TIPS_DIALOG_H__
+#define __TIPS_DIALOG_H__
+
+
+GtkWidget * tips_dialog_create (Gimp *gimp);
+
+
+#endif /* __TIPS_DIALOG_H__ */
diff --git a/app/dialogs/tips-parser.c b/app/dialogs/tips-parser.c
new file mode 100644
index 0000000..9e94f0f
--- /dev/null
+++ b/app/dialogs/tips-parser.c
@@ -0,0 +1,477 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * tips-parser.c - Parse the gimp-tips.xml file.
+ * Copyright (C) 2002, 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "config/config-types.h"
+#include "config/gimpxmlparser.h"
+
+#include "tips-parser.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  TIPS_START,
+  TIPS_IN_TIPS,
+  TIPS_IN_TIP,
+  TIPS_IN_THETIP,
+  TIPS_IN_UNKNOWN
+} TipsParserState;
+
+typedef enum
+{
+  TIPS_LOCALE_NONE,
+  TIPS_LOCALE_MATCH,
+  TIPS_LOCALE_MISMATCH
+} TipsParserLocaleState;
+
+typedef struct
+{
+  TipsParserState        state;
+  TipsParserState        last_known_state;
+  const gchar           *locale;
+  const gchar           *help_id;
+  TipsParserLocaleState  locale_state;
+  gint                   markup_depth;
+  gint                   unknown_depth;
+  GString               *value;
+  GimpTip               *current_tip;
+  GList                 *tips;
+} TipsParser;
+
+
+static void    tips_parser_start_element (GMarkupParseContext  *context,
+                                          const gchar          *element_name,
+                                          const gchar         **attribute_names,
+                                          const gchar         **attribute_values,
+                                          gpointer              user_data,
+                                          GError              **error);
+static void    tips_parser_end_element   (GMarkupParseContext  *context,
+                                          const gchar          *element_name,
+                                          gpointer              user_data,
+                                          GError              **error);
+static void    tips_parser_characters    (GMarkupParseContext  *context,
+                                          const gchar          *text,
+                                          gsize                 text_len,
+                                          gpointer              user_data,
+                                          GError              **error);
+
+static void    tips_parser_start_markup   (TipsParser   *parser,
+                                           const gchar  *markup_name);
+static void    tips_parser_end_markup     (TipsParser   *parser,
+                                           const gchar  *markup_name);
+static void    tips_parser_start_unknown  (TipsParser   *parser);
+static void    tips_parser_end_unknown    (TipsParser   *parser);
+
+static gchar * tips_parser_parse_help_id  (TipsParser   *parser,
+                                           const gchar **names,
+                                           const gchar **values);
+
+static void    tips_parser_parse_locale   (TipsParser   *parser,
+                                           const gchar **names,
+                                           const gchar **values);
+static void    tips_parser_set_by_locale  (TipsParser   *parser,
+                                           gchar       **dest);
+
+
+static const GMarkupParser markup_parser =
+{
+  tips_parser_start_element,
+  tips_parser_end_element,
+  tips_parser_characters,
+  NULL,  /*  passthrough  */
+  NULL   /*  error        */
+};
+
+
+GimpTip *
+gimp_tip_new (const gchar *title,
+              const gchar *format,
+              ...)
+{
+  GimpTip *tip = g_slice_new0 (GimpTip);
+  GString *str = g_string_new (NULL);
+
+  if (title)
+    {
+      g_string_append (str, "<b>");
+      g_string_append (str, title);
+      g_string_append (str, "</b>");
+
+      if (format)
+        g_string_append (str, "\n\n");
+    }
+
+  if (format)
+    {
+      va_list  args;
+
+      va_start (args, format);
+      g_string_append_vprintf (str, format, args);
+      va_end (args);
+    }
+
+  tip->text = g_string_free (str, FALSE);
+
+  return tip;
+}
+
+void
+gimp_tip_free (GimpTip *tip)
+{
+  if (! tip)
+    return;
+
+  g_free (tip->text);
+  g_free (tip->help_id);
+
+  g_slice_free (GimpTip, tip);
+}
+
+/**
+ * gimp_tips_from_file:
+ * @file:  the tips file to parse
+ * @error: return location for a #GError
+ *
+ * Reads a gimp-tips XML file, creates a new #GimpTip for
+ * each tip entry and returns a #GList of them. If a parser
+ * error occurs at some point, the uncompleted list is
+ * returned and @error is set (unless @error is %NULL).
+ * The message set in @error contains a detailed description
+ * of the problem.
+ *
+ * Return value: a #Glist of #GimpTips.
+ **/
+GList *
+gimp_tips_from_file (GFile   *file,
+                     GError **error)
+{
+  GimpXmlParser *xml_parser;
+  TipsParser     parser = { 0, };
+  const gchar   *tips_locale;
+  GList         *tips   = NULL;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  parser.value = g_string_new (NULL);
+
+  /* This is a special string to specify the language identifier to
+     look for in the gimp-tips.xml file. Please translate the C in it
+     according to the name of the po file used for gimp-tips.xml.
+     E.g. for the german translation, that would be "tips-locale:de".
+   */
+  tips_locale = _("tips-locale:C");
+
+  if (g_str_has_prefix (tips_locale, "tips-locale:"))
+    {
+      tips_locale += strlen ("tips-locale:");
+
+      if (*tips_locale && *tips_locale != 'C')
+        parser.locale = tips_locale;
+    }
+  else
+    {
+      g_warning ("Wrong translation for 'tips-locale:', fix the translation!");
+    }
+
+  xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
+
+  gimp_xml_parser_parse_gfile (xml_parser, file, error);
+
+  gimp_xml_parser_free (xml_parser);
+
+  tips = g_list_reverse (parser.tips);
+
+  gimp_tip_free (parser.current_tip);
+  g_string_free (parser.value, TRUE);
+
+  return tips;
+}
+
+void
+gimp_tips_free (GList *tips)
+{
+  GList *list;
+
+  for (list = tips; list; list = list->next)
+    gimp_tip_free (list->data);
+
+  g_list_free (tips);
+}
+
+static void
+tips_parser_start_element (GMarkupParseContext *context,
+                           const gchar         *element_name,
+                           const gchar        **attribute_names,
+                           const gchar        **attribute_values,
+                           gpointer             user_data,
+                           GError             **error)
+{
+  TipsParser *parser = user_data;
+
+  switch (parser->state)
+    {
+    case TIPS_START:
+      if (strcmp (element_name, "gimp-tips") == 0)
+        {
+          parser->state = TIPS_IN_TIPS;
+        }
+      else
+        {
+          tips_parser_start_unknown (parser);
+        }
+      break;
+
+    case TIPS_IN_TIPS:
+      if (strcmp (element_name, "tip") == 0)
+        {
+          parser->state = TIPS_IN_TIP;
+          parser->current_tip = g_slice_new0 (GimpTip);
+          parser->current_tip->help_id = tips_parser_parse_help_id (parser,
+                                                                    attribute_names,
+                                                                    attribute_values);
+        }
+      else
+        {
+          tips_parser_start_unknown (parser);
+        }
+      break;
+
+    case TIPS_IN_TIP:
+      if (strcmp (element_name, "thetip") == 0)
+        {
+          parser->state = TIPS_IN_THETIP;
+          tips_parser_parse_locale (parser, attribute_names, attribute_values);
+        }
+      else
+        {
+          tips_parser_start_unknown (parser);
+        }
+      break;
+
+    case TIPS_IN_THETIP:
+      if (strcmp (element_name, "b"  ) == 0 ||
+          strcmp (element_name, "big") == 0 ||
+          strcmp (element_name, "tt" ) == 0)
+        {
+          tips_parser_start_markup (parser, element_name);
+        }
+      else
+        {
+          tips_parser_start_unknown (parser);
+        }
+      break;
+
+    case TIPS_IN_UNKNOWN:
+      tips_parser_start_unknown (parser);
+      break;
+    }
+}
+
+static void
+tips_parser_end_element (GMarkupParseContext *context,
+                         const gchar         *element_name,
+                         gpointer             user_data,
+                         GError             **error)
+{
+  TipsParser *parser = user_data;
+
+  switch (parser->state)
+    {
+    case TIPS_START:
+      g_warning ("%s: shouldn't get here", G_STRLOC);
+      break;
+
+    case TIPS_IN_TIPS:
+      parser->state = TIPS_START;
+      break;
+
+    case TIPS_IN_TIP:
+      parser->tips = g_list_prepend (parser->tips, parser->current_tip);
+      parser->current_tip = NULL;
+      parser->state = TIPS_IN_TIPS;
+      break;
+
+    case TIPS_IN_THETIP:
+      if (parser->markup_depth == 0)
+        {
+          tips_parser_set_by_locale (parser, &parser->current_tip->text);
+          g_string_truncate (parser->value, 0);
+          parser->state = TIPS_IN_TIP;
+        }
+      else
+        tips_parser_end_markup (parser, element_name);
+      break;
+
+    case TIPS_IN_UNKNOWN:
+      tips_parser_end_unknown (parser);
+      break;
+    }
+}
+
+static void
+tips_parser_characters (GMarkupParseContext *context,
+                        const gchar         *text,
+                        gsize                text_len,
+                        gpointer             user_data,
+                        GError             **error)
+{
+  TipsParser *parser = user_data;
+
+  switch (parser->state)
+    {
+    case TIPS_IN_THETIP:
+      if (parser->locale_state != TIPS_LOCALE_MISMATCH)
+        {
+          gint i;
+
+          /* strip tabs, newlines and adjacent whitespace */
+          for (i = 0; i < text_len; i++)
+            {
+              if (text[i] != ' ' &&
+                  text[i] != '\t' && text[i] != '\n' && text[i] != '\r')
+                {
+                  g_string_append_c (parser->value, text[i]);
+                }
+              else if (parser->value->len > 0 &&
+                       parser->value->str[parser->value->len - 1] != ' ')
+                {
+                  g_string_append_c (parser->value, ' ');
+                }
+            }
+        }
+      break;
+    default:
+      break;
+    }
+}
+
+static void
+tips_parser_start_markup (TipsParser  *parser,
+                          const gchar *markup_name)
+{
+  parser->markup_depth++;
+  g_string_append_printf (parser->value, "<%s>", markup_name);
+}
+
+static void
+tips_parser_end_markup (TipsParser  *parser,
+                        const gchar *markup_name)
+{
+  gimp_assert (parser->markup_depth > 0);
+
+  parser->markup_depth--;
+  g_string_append_printf (parser->value, "</%s>", markup_name);
+}
+
+static void
+tips_parser_start_unknown (TipsParser *parser)
+{
+  if (parser->unknown_depth == 0)
+    parser->last_known_state = parser->state;
+
+  parser->state = TIPS_IN_UNKNOWN;
+  parser->unknown_depth++;
+}
+
+static void
+tips_parser_end_unknown (TipsParser *parser)
+{
+  gimp_assert (parser->unknown_depth > 0 && parser->state == TIPS_IN_UNKNOWN);
+
+  parser->unknown_depth--;
+
+  if (parser->unknown_depth == 0)
+    parser->state = parser->last_known_state;
+}
+
+static gchar *
+tips_parser_parse_help_id (TipsParser   *parser,
+                           const gchar **names,
+                           const gchar **values)
+{
+  while (*names && *values)
+    {
+      if (strcmp (*names, "help") == 0 && **values)
+        return g_strdup (*values);
+
+      names++;
+      values++;
+    }
+
+  return NULL;
+}
+
+static void
+tips_parser_parse_locale (TipsParser   *parser,
+                          const gchar **names,
+                          const gchar **values)
+{
+  parser->locale_state = TIPS_LOCALE_NONE;
+
+  while (*names && *values)
+    {
+      if (strcmp (*names, "xml:lang") == 0 && **values)
+        {
+          parser->locale_state = (parser->locale &&
+                                  strcmp (*values, parser->locale) == 0 ?
+                                  TIPS_LOCALE_MATCH : TIPS_LOCALE_MISMATCH);
+        }
+
+      names++;
+      values++;
+    }
+}
+
+static void
+tips_parser_set_by_locale (TipsParser  *parser,
+                           gchar      **dest)
+{
+  switch (parser->locale_state)
+    {
+    case TIPS_LOCALE_NONE:
+      if (!parser->locale)
+        {
+          g_free (*dest);
+          *dest = g_strdup (parser->value->str);
+        }
+      else if (*dest == NULL)
+        {
+          *dest = g_strdup (parser->value->str);
+        }
+      break;
+
+    case TIPS_LOCALE_MATCH:
+      g_free (*dest);
+      *dest = g_strdup (parser->value->str);
+      break;
+
+    case TIPS_LOCALE_MISMATCH:
+      break;
+    }
+}
+
diff --git a/app/dialogs/tips-parser.h b/app/dialogs/tips-parser.h
new file mode 100644
index 0000000..4d9fab7
--- /dev/null
+++ b/app/dialogs/tips-parser.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * tips-parser.h - Parse the gimp-tips.xml file.
+ * Copyright (C) 2002, 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TIPS_PARSER_H__
+#define __TIPS_PARSER_H__
+
+
+typedef struct _GimpTip GimpTip;
+
+struct _GimpTip
+{
+  gchar *text;
+  gchar *help_id;
+};
+
+
+GimpTip * gimp_tip_new        (const gchar  *title,
+                               const gchar  *format,
+                               ...) G_GNUC_PRINTF(2, 3);
+void      gimp_tip_free       (GimpTip      *tip);
+
+GList   * gimp_tips_from_file (GFile        *file,
+                               GError      **error);
+void      gimp_tips_free      (GList        *tips);
+
+
+#endif /* __TIPS_PARSER_H__ */
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
new file mode 100644
index 0000000..af9edd4
--- /dev/null
+++ b/app/dialogs/user-install-dialog.c
@@ -0,0 +1,153 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * user-install-dialog.c
+ * Copyright (C) 2000-2006 Michael Natterer and Sven Neumann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimp-user-install.h"
+
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+
+#include "user-install-dialog.h"
+
+#include "gimp-intl.h"
+
+
+static GtkWidget * user_install_dialog_new (GimpUserInstall *install);
+static void        user_install_dialog_log (const gchar     *message,
+                                            gboolean         error,
+                                            gpointer         data);
+
+
+gboolean
+user_install_dialog_run (GimpUserInstall *install)
+{
+  GtkWidget *dialog;
+  gboolean   success;
+
+  g_return_val_if_fail (install != NULL, FALSE);
+
+  dialog = user_install_dialog_new (install);
+
+  success = gimp_user_install_run (install);
+
+  if (! success)
+    {
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_main_quit),
+                        NULL);
+
+      gtk_widget_show (dialog);
+
+      gtk_main ();
+    }
+
+  gtk_widget_destroy (dialog);
+
+  return success;
+}
+
+static GtkWidget *
+user_install_dialog_new (GimpUserInstall *install)
+{
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *scrolled;
+  GtkTextBuffer *buffer;
+  GtkWidget     *view;
+
+  gimp_icons_init ();
+
+  dialog = gimp_message_dialog_new (_("GIMP User Installation"),
+                                    GIMP_ICON_WILBER_EEK,
+                                    NULL, 0, NULL, NULL,
+
+                                    _("_Quit"), GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("User installation failed!"));
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("The GIMP user installation failed; "
+                               "see the log for details."));
+
+  frame = gimp_frame_new (_("Installation Log"));
+  gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_container_add (GTK_CONTAINER (frame), scrolled);
+  gtk_widget_show (scrolled);
+
+  buffer = gtk_text_buffer_new (NULL);
+
+  gtk_text_buffer_create_tag (buffer, "bold",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+
+  view = gtk_text_view_new_with_buffer (buffer);
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
+  gtk_widget_set_size_request (view, -1, 200);
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_widget_show (view);
+
+  g_object_unref (buffer);
+
+  gimp_user_install_set_log_handler (install, user_install_dialog_log, buffer);
+
+  return dialog;
+}
+
+static void
+user_install_dialog_log (const gchar *message,
+                         gboolean     error,
+                         gpointer     data)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
+  GtkTextIter    cursor;
+
+  gtk_text_buffer_get_end_iter (buffer, &cursor);
+
+  if (error && message)
+    {
+      gtk_text_buffer_insert_with_tags_by_name (buffer, &cursor, message, -1,
+                                                "bold", NULL);
+    }
+  else if (message)
+    {
+      gtk_text_buffer_insert (buffer, &cursor, message, -1);
+    }
+
+  gtk_text_buffer_insert (buffer, &cursor, "\n", -1);
+}
diff --git a/app/dialogs/user-install-dialog.h b/app/dialogs/user-install-dialog.h
new file mode 100644
index 0000000..baa2bda
--- /dev/null
+++ b/app/dialogs/user-install-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __USER_INSTALL_DIALOG_H__
+#define __USER_INSTALL_DIALOG_H__
+
+
+gboolean  user_install_dialog_run (GimpUserInstall *install);
+
+
+#endif /* __USER_INSTALL_DIALOG_H__ */
diff --git a/app/dialogs/vectors-export-dialog.c b/app/dialogs/vectors-export-dialog.c
new file mode 100644
index 0000000..9a3e082
--- /dev/null
+++ b/app/dialogs/vectors-export-dialog.c
@@ -0,0 +1,179 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpimage.h"
+
+#include "vectors-export-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _VectorsExportDialog VectorsExportDialog;
+
+struct _VectorsExportDialog
+{
+  GimpImage                 *image;
+  gboolean                   active_only;
+  GimpVectorsExportCallback  callback;
+  gpointer                   user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void   vectors_export_dialog_free     (VectorsExportDialog *private);
+static void   vectors_export_dialog_response (GtkWidget           *widget,
+                                              gint                 response_id,
+                                              VectorsExportDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+vectors_export_dialog_new (GimpImage                 *image,
+                           GtkWidget                 *parent,
+                           GFile                     *export_folder,
+                           gboolean                   active_only,
+                           GimpVectorsExportCallback  callback,
+                           gpointer                   user_data)
+{
+  VectorsExportDialog *private;
+  GtkWidget           *dialog;
+  GtkWidget           *combo;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (export_folder == NULL || G_IS_FILE (export_folder),
+                        NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (VectorsExportDialog);
+
+  private->image       = image;
+  private->active_only = active_only;
+  private->callback    = callback;
+  private->user_data   = user_data;
+
+  dialog = gtk_file_chooser_dialog_new (_("Export Path to SVG"), NULL,
+                                        GTK_FILE_CHOOSER_ACTION_SAVE,
+
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Save"),   GTK_RESPONSE_OK,
+
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-export");
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+  gtk_window_set_screen (GTK_WINDOW (dialog),
+                         gtk_widget_get_screen (parent));
+
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
+                                                  TRUE);
+
+  if (export_folder)
+    gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                              export_folder, NULL);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) vectors_export_dialog_free, private);
+
+  g_signal_connect_object (image, "disconnect",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, 0);
+
+  g_signal_connect (dialog, "delete-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (vectors_export_dialog_response),
+                    private);
+
+  combo = gimp_int_combo_box_new (_("Export the active path"),           TRUE,
+                                  _("Export all paths from this image"), FALSE,
+                                  NULL);
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
+                                 private->active_only);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), combo);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_int_combo_box_get_active),
+                    &private->active_only);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+vectors_export_dialog_free (VectorsExportDialog *private)
+{
+  g_slice_free (VectorsExportDialog, private);
+}
+
+static void
+vectors_export_dialog_response (GtkWidget           *dialog,
+                                gint                 response_id,
+                                VectorsExportDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+      GFile          *file;
+
+      file = gtk_file_chooser_get_file (chooser);
+
+      if (file)
+        {
+          GFile *folder;
+
+          folder = gtk_file_chooser_get_current_folder_file (chooser);
+
+          private->callback (dialog,
+                             private->image,
+                             file,
+                             folder,
+                             private->active_only,
+                             private->user_data);
+
+          if (folder)
+            g_object_unref (folder);
+
+          g_object_unref (file);
+        }
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
diff --git a/app/dialogs/vectors-export-dialog.h b/app/dialogs/vectors-export-dialog.h
new file mode 100644
index 0000000..236b6e5
--- /dev/null
+++ b/app/dialogs/vectors-export-dialog.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_EXPORT_DIALOG_H__
+#define __VECTORS_EXPORT_DIALOG_H__
+
+
+typedef void (* GimpVectorsExportCallback) (GtkWidget *dialog,
+                                            GimpImage *image,
+                                            GFile     *file,
+                                            GFile     *export_folder,
+                                            gboolean   active_only,
+                                            gpointer   user_data);
+
+
+GtkWidget * vectors_export_dialog_new (GimpImage                 *image,
+                                       GtkWidget                 *parent,
+                                       GFile                     *export_folder,
+                                       gboolean                   active_only,
+                                       GimpVectorsExportCallback  callback,
+                                       gpointer                   user_data);
+
+
+#endif /* __VECTORS_EXPORT_DIALOG_H__ */
diff --git a/app/dialogs/vectors-import-dialog.c b/app/dialogs/vectors-import-dialog.c
new file mode 100644
index 0000000..76ac7cc
--- /dev/null
+++ b/app/dialogs/vectors-import-dialog.c
@@ -0,0 +1,209 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpimage.h"
+
+#include "vectors-import-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _VectorsImportDialog VectorsImportDialog;
+
+struct _VectorsImportDialog
+{
+  GimpImage                 *image;
+  gboolean                   merge_vectors;
+  gboolean                   scale_vectors;
+  GimpVectorsImportCallback  callback;
+  gpointer                   user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void   vectors_import_dialog_free     (VectorsImportDialog *private);
+static void   vectors_import_dialog_response (GtkWidget           *dialog,
+                                              gint                 response_id,
+                                              VectorsImportDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+vectors_import_dialog_new (GimpImage                 *image,
+                           GtkWidget                 *parent,
+                           GFile                     *import_folder,
+                           gboolean                   merge_vectors,
+                           gboolean                   scale_vectors,
+                           GimpVectorsImportCallback  callback,
+                           gpointer                   user_data)
+{
+  VectorsImportDialog *private;
+  GtkWidget           *dialog;
+  GtkWidget           *vbox;
+  GtkWidget           *button;
+  GtkFileFilter       *filter;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (import_folder == NULL || G_IS_FILE (import_folder),
+                        NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (VectorsImportDialog);
+
+  private->image         = image;
+  private->merge_vectors = merge_vectors;
+  private->scale_vectors = scale_vectors;
+  private->callback      = callback;
+  private->user_data     = user_data;
+
+  dialog = gtk_file_chooser_dialog_new (_("Import Paths from SVG"), NULL,
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Open"),   GTK_RESPONSE_OK,
+
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-import");
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+  gtk_window_set_screen (GTK_WINDOW (dialog),
+                         gtk_widget_get_screen (parent));
+
+  if (import_folder)
+    gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                              import_folder, NULL);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) vectors_import_dialog_free, private);
+
+  g_signal_connect_object (image, "disconnect",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog, 0);
+
+  g_signal_connect (dialog, "delete-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (vectors_import_dialog_response),
+                    private);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("All files (*.*)"));
+  gtk_file_filter_add_pattern (filter, "*");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Scalable SVG image (*.svg)"));
+  gtk_file_filter_add_pattern (filter, "*.[Ss][Vv][Gg]");
+  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), vbox);
+  gtk_widget_show (vbox);
+
+  button = gtk_check_button_new_with_mnemonic (_("_Merge imported paths"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->merge_vectors);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->merge_vectors);
+
+  button = gtk_check_button_new_with_mnemonic (_("_Scale imported paths "
+                                                 "to fit image"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                private->scale_vectors);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &private->scale_vectors);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+vectors_import_dialog_free (VectorsImportDialog *private)
+{
+  g_slice_free (VectorsImportDialog, private);
+}
+
+static void
+vectors_import_dialog_response (GtkWidget           *dialog,
+                                gint                 response_id,
+                                VectorsImportDialog *private)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+      GFile          *file;
+
+      file = gtk_file_chooser_get_file (chooser);
+
+      if (file)
+        {
+          GFile *folder;
+
+          folder = gtk_file_chooser_get_current_folder_file (chooser);
+
+          private->callback (dialog,
+                             private->image,
+                             file,
+                             folder,
+                             private->merge_vectors,
+                             private->scale_vectors,
+                             private->user_data);
+
+          if (folder)
+            g_object_unref (folder);
+
+          g_object_unref (file);
+        }
+    }
+  else
+    {
+      gtk_widget_destroy (dialog);
+    }
+}
diff --git a/app/dialogs/vectors-import-dialog.h b/app/dialogs/vectors-import-dialog.h
new file mode 100644
index 0000000..b8928d4
--- /dev/null
+++ b/app/dialogs/vectors-import-dialog.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_IMPORT_DIALOG_H__
+#define __VECTORS_IMPORT_DIALOG_H__
+
+
+typedef void (* GimpVectorsImportCallback) (GtkWidget *dialog,
+                                            GimpImage *image,
+                                            GFile     *file,
+                                            GFile     *import_folder,
+                                            gboolean   merge_vectors,
+                                            gboolean   scale_vectors,
+                                            gpointer   user_data);
+
+
+GtkWidget * vectors_import_dialog_new (GimpImage                 *image,
+                                       GtkWidget                 *parent,
+                                       GFile                     *import_folder,
+                                       gboolean                   merge_vectors,
+                                       gboolean                   scale_vectors,
+                                       GimpVectorsImportCallback  callback,
+                                       gpointer                   user_data);
+
+
+#endif /* __VECTORS_IMPORT_DIALOG_H__ */
diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c
new file mode 100644
index 0000000..3b00be0
--- /dev/null
+++ b/app/dialogs/vectors-options-dialog.c
@@ -0,0 +1,160 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "item-options-dialog.h"
+#include "vectors-options-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _VectorsOptionsDialog VectorsOptionsDialog;
+
+struct _VectorsOptionsDialog
+{
+  GimpVectorsOptionsCallback  callback;
+  gpointer                    user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void  vectors_options_dialog_free     (VectorsOptionsDialog *private);
+static void  vectors_options_dialog_callback (GtkWidget            *dialog,
+                                              GimpImage            *image,
+                                              GimpItem             *item,
+                                              GimpContext          *context,
+                                              const gchar          *item_name,
+                                              gboolean              item_visible,
+                                              gboolean              item_linked,
+                                              GimpColorTag          item_color_tag,
+                                              gboolean              item_lock_content,
+                                              gboolean              item_lock_position,
+                                              gpointer              user_data);
+
+
+/*  public functions  */
+
+GtkWidget *
+vectors_options_dialog_new (GimpImage                  *image,
+                            GimpVectors                *vectors,
+                            GimpContext                *context,
+                            GtkWidget                  *parent,
+                            const gchar                *title,
+                            const gchar                *role,
+                            const gchar                *icon_name,
+                            const gchar                *desc,
+                            const gchar                *help_id,
+                            const gchar                *vectors_name,
+                            gboolean                    vectors_visible,
+                            gboolean                    vectors_linked,
+                            GimpColorTag                vectors_color_tag,
+                            gboolean                    vectors_lock_content,
+                            gboolean                    vectors_lock_position,
+                            GimpVectorsOptionsCallback  callback,
+                            gpointer                    user_data)
+{
+  VectorsOptionsDialog *private;
+  GtkWidget            *dialog;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (role != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (desc != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (VectorsOptionsDialog);
+
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  dialog = item_options_dialog_new (image, GIMP_ITEM (vectors), context,
+                                    parent, title, role,
+                                    icon_name, desc, help_id,
+                                    _("Path _name:"),
+                                    GIMP_ICON_TOOL_PATH,
+                                    _("Lock path _strokes"),
+                                    _("Lock path _position"),
+                                    vectors_name,
+                                    vectors_visible,
+                                    vectors_linked,
+                                    vectors_color_tag,
+                                    vectors_lock_content,
+                                    vectors_lock_position,
+                                    vectors_options_dialog_callback,
+                                    private);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) vectors_options_dialog_free, private);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+vectors_options_dialog_free (VectorsOptionsDialog *private)
+{
+  g_slice_free (VectorsOptionsDialog, private);
+}
+
+static void
+vectors_options_dialog_callback (GtkWidget    *dialog,
+                                 GimpImage    *image,
+                                 GimpItem     *item,
+                                 GimpContext  *context,
+                                 const gchar  *item_name,
+                                 gboolean      item_visible,
+                                 gboolean      item_linked,
+                                 GimpColorTag  item_color_tag,
+                                 gboolean      item_lock_content,
+                                 gboolean      item_lock_position,
+                                 gpointer      user_data)
+{
+  VectorsOptionsDialog *private = user_data;
+
+  private->callback (dialog,
+                     image,
+                     GIMP_VECTORS (item),
+                     context,
+                     item_name,
+                     item_visible,
+                     item_linked,
+                     item_color_tag,
+                     item_lock_content,
+                     item_lock_position,
+                     private->user_data);
+}
diff --git a/app/dialogs/vectors-options-dialog.h b/app/dialogs/vectors-options-dialog.h
new file mode 100644
index 0000000..00f5a32
--- /dev/null
+++ b/app/dialogs/vectors-options-dialog.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_OPTIONS_DIALOG_H__
+#define __VECTORS_OPTIONS_DIALOG_H__
+
+
+typedef void (* GimpVectorsOptionsCallback) (GtkWidget    *dialog,
+                                             GimpImage    *image,
+                                             GimpVectors  *vectors,
+                                             GimpContext  *context,
+                                             const gchar  *vectors_name,
+                                             gboolean      vectors_visible,
+                                             gboolean      vectors_linked,
+                                             GimpColorTag  vectors_color_tag,
+                                             gboolean      vectors_lock_content,
+                                             gboolean      vectors_lock_position,
+                                             gpointer      user_data);
+
+
+GtkWidget * vectors_options_dialog_new (GimpImage                  *image,
+                                        GimpVectors                *vectors,
+                                        GimpContext                *context,
+                                        GtkWidget                  *parent,
+                                        const gchar                *title,
+                                        const gchar                *role,
+                                        const gchar                *icon_name,
+                                        const gchar                *desc,
+                                        const gchar                *help_id,
+                                        const gchar                *vectors_name,
+                                        gboolean                    vectors_visible,
+                                        gboolean                    vectors_linked,
+                                        GimpColorTag                vectors_color_tag,
+                                        gboolean                    vectors_lock_content,
+                                        gboolean                    vectors_lock_position,
+                                        GimpVectorsOptionsCallback  callback,
+                                        gpointer                    user_data);
+
+
+#endif /* __VECTORS_OPTIONS_DIALOG_H__ */
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
new file mode 100644
index 0000000..dbee710
--- /dev/null
+++ b/app/display/Makefile.am
@@ -0,0 +1,247 @@
+## Process this file with automake to produce Makefile.in
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+xobjective_cxx = "-xobjective-c++"
+xnone = "-xnone"
+endif
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Display\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappdisplay.a
+
+libappdisplay_a_sources = \
+	display-enums.h				\
+	display-types.h				\
+	gimpcanvas.c				\
+	gimpcanvas.h				\
+	gimpcanvas-style.c			\
+	gimpcanvas-style.h			\
+	gimpcanvasarc.c				\
+	gimpcanvasarc.h				\
+	gimpcanvasboundary.c			\
+	gimpcanvasboundary.h			\
+	gimpcanvasbufferpreview.c		\
+	gimpcanvasbufferpreview.h		\
+	gimpcanvascanvasboundary.c		\
+	gimpcanvascanvasboundary.h		\
+	gimpcanvascorner.c			\
+	gimpcanvascorner.h			\
+	gimpcanvascursor.c			\
+	gimpcanvascursor.h			\
+	gimpcanvasgrid.c			\
+	gimpcanvasgrid.h			\
+	gimpcanvasgroup.c			\
+	gimpcanvasgroup.h			\
+	gimpcanvasguide.c			\
+	gimpcanvasguide.h			\
+	gimpcanvashandle.c			\
+	gimpcanvashandle.h			\
+	gimpcanvasitem.c			\
+	gimpcanvasitem.h			\
+	gimpcanvasitem-utils.c			\
+	gimpcanvasitem-utils.h			\
+	gimpcanvaslayerboundary.c		\
+	gimpcanvaslayerboundary.h		\
+	gimpcanvaslimit.c			\
+	gimpcanvaslimit.h			\
+	gimpcanvasline.c			\
+	gimpcanvasline.h			\
+	gimpcanvaspassepartout.c		\
+	gimpcanvaspassepartout.h		\
+	gimpcanvaspath.c			\
+	gimpcanvaspath.h			\
+	gimpcanvaspen.c				\
+	gimpcanvaspen.h				\
+	gimpcanvaspolygon.c			\
+	gimpcanvaspolygon.h			\
+	gimpcanvasprogress.c			\
+	gimpcanvasprogress.h			\
+	gimpcanvasproxygroup.c			\
+	gimpcanvasproxygroup.h			\
+	gimpcanvasrectangle.c			\
+	gimpcanvasrectangle.h			\
+	gimpcanvasrectangleguides.c		\
+	gimpcanvasrectangleguides.h		\
+	gimpcanvassamplepoint.c			\
+	gimpcanvassamplepoint.h			\
+	gimpcanvastextcursor.c			\
+	gimpcanvastextcursor.h			\
+	gimpcanvastransformguides.c		\
+	gimpcanvastransformguides.h		\
+	gimpcanvastransformpreview.c		\
+	gimpcanvastransformpreview.h		\
+	gimpcursorview.c			\
+	gimpcursorview.h			\
+	gimpdisplay.c				\
+	gimpdisplay.h				\
+	gimpdisplay-foreach.c			\
+	gimpdisplay-foreach.h			\
+	gimpdisplay-handlers.c			\
+	gimpdisplay-handlers.h			\
+	gimpdisplayshell.c			\
+	gimpdisplayshell.h			\
+	gimpdisplayshell-actions.c		\
+	gimpdisplayshell-actions.h		\
+	gimpdisplayshell-appearance.c		\
+	gimpdisplayshell-appearance.h		\
+	gimpdisplayshell-autoscroll.c		\
+	gimpdisplayshell-autoscroll.h		\
+	gimpdisplayshell-callbacks.c		\
+	gimpdisplayshell-callbacks.h		\
+	gimpdisplayshell-close.c		\
+	gimpdisplayshell-close.h		\
+	gimpdisplayshell-cursor.c		\
+	gimpdisplayshell-cursor.h		\
+	gimpdisplayshell-dnd.c			\
+	gimpdisplayshell-dnd.h			\
+	gimpdisplayshell-draw.c			\
+	gimpdisplayshell-draw.h			\
+	gimpdisplayshell-expose.c		\
+	gimpdisplayshell-expose.h		\
+	gimpdisplayshell-grab.c			\
+	gimpdisplayshell-grab.h			\
+	gimpdisplayshell-handlers.c		\
+	gimpdisplayshell-handlers.h		\
+	gimpdisplayshell-filter.c		\
+	gimpdisplayshell-filter.h		\
+	gimpdisplayshell-filter-dialog.c	\
+	gimpdisplayshell-filter-dialog.h	\
+	gimpdisplayshell-layer-select.c		\
+	gimpdisplayshell-layer-select.h		\
+	gimpdisplayshell-icon.c			\
+	gimpdisplayshell-icon.h			\
+	gimpdisplayshell-items.c		\
+	gimpdisplayshell-items.h		\
+	gimpdisplayshell-profile.c		\
+	gimpdisplayshell-profile.h		\
+	gimpdisplayshell-progress.c		\
+	gimpdisplayshell-progress.h		\
+	gimpdisplayshell-render.c		\
+	gimpdisplayshell-render.h		\
+	gimpdisplayshell-rotate.c		\
+	gimpdisplayshell-rotate.h		\
+	gimpdisplayshell-rotate-dialog.c	\
+	gimpdisplayshell-rotate-dialog.h	\
+	gimpdisplayshell-rulers.c		\
+	gimpdisplayshell-rulers.h		\
+	gimpdisplayshell-scale.c		\
+	gimpdisplayshell-scale.h		\
+	gimpdisplayshell-scale-dialog.c		\
+	gimpdisplayshell-scale-dialog.h		\
+	gimpdisplayshell-scroll.c		\
+	gimpdisplayshell-scroll.h		\
+	gimpdisplayshell-scrollbars.c		\
+	gimpdisplayshell-scrollbars.h		\
+	gimpdisplayshell-selection.c		\
+	gimpdisplayshell-selection.h		\
+	gimpdisplayshell-title.c		\
+	gimpdisplayshell-title.h		\
+	gimpdisplayshell-tool-events.c		\
+	gimpdisplayshell-tool-events.h		\
+	gimpdisplayshell-transform.c		\
+	gimpdisplayshell-transform.h		\
+	gimpdisplayshell-utils.c		\
+	gimpdisplayshell-utils.h		\
+	gimpdisplayxfer.c			\
+	gimpdisplayxfer.h			\
+	gimpimagewindow.c			\
+	gimpimagewindow.h			\
+	gimpmotionbuffer.c			\
+	gimpmotionbuffer.h			\
+	gimpmultiwindowstrategy.c		\
+	gimpmultiwindowstrategy.h		\
+	gimpnavigationeditor.c			\
+	gimpnavigationeditor.h			\
+	gimpscalecombobox.c			\
+	gimpscalecombobox.h			\
+	gimpsinglewindowstrategy.c		\
+	gimpsinglewindowstrategy.h		\
+	gimpstatusbar.c				\
+	gimpstatusbar.h				\
+	gimptooldialog.c			\
+	gimptooldialog.h			\
+	gimptoolgui.c				\
+	gimptoolgui.h				\
+	gimptoolcompass.c			\
+	gimptoolcompass.h			\
+	gimptoolfocus.h				\
+	gimptoolfocus.c				\
+	gimptoolgyroscope.c			\
+	gimptoolgyroscope.h			\
+	gimptoolhandlegrid.c			\
+	gimptoolhandlegrid.h			\
+	gimptoolline.c				\
+	gimptoolline.h				\
+	gimptoolpath.c				\
+	gimptoolpath.h				\
+	gimptoolpolygon.c			\
+	gimptoolpolygon.h			\
+	gimptoolrectangle.c			\
+	gimptoolrectangle.h			\
+	gimptoolrotategrid.c			\
+	gimptoolrotategrid.h			\
+	gimptoolsheargrid.c			\
+	gimptoolsheargrid.h			\
+	gimptooltransform3dgrid.c		\
+	gimptooltransform3dgrid.h		\
+	gimptooltransformgrid.c			\
+	gimptooltransformgrid.h			\
+	gimptoolwidget.c			\
+	gimptoolwidget.h			\
+	gimptoolwidgetgroup.c			\
+	gimptoolwidgetgroup.h
+
+libappdisplay_a_built_sources = display-enums.c
+
+libappdisplay_a_SOURCES = \
+	$(libappdisplay_a_built_sources)	\
+	$(libappdisplay_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-dec
+CLEANFILES = $(gen_sources)
+
+xgen-dec: $(srcdir)/display-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"display-enums.h\"\n#include\"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/display-enums.c: xgen-dec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/display/Makefile.in b/app/display/Makefile.in
new file mode 100644
index 0000000..943fbe3
--- /dev/null
+++ b/app/display/Makefile.in
@@ -0,0 +1,1546 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/display
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappdisplay_a_AR = $(AR) $(ARFLAGS)
+libappdisplay_a_LIBADD =
+am__objects_1 = display-enums.$(OBJEXT)
+am__objects_2 = gimpcanvas.$(OBJEXT) gimpcanvas-style.$(OBJEXT) \
+	gimpcanvasarc.$(OBJEXT) gimpcanvasboundary.$(OBJEXT) \
+	gimpcanvasbufferpreview.$(OBJEXT) \
+	gimpcanvascanvasboundary.$(OBJEXT) gimpcanvascorner.$(OBJEXT) \
+	gimpcanvascursor.$(OBJEXT) gimpcanvasgrid.$(OBJEXT) \
+	gimpcanvasgroup.$(OBJEXT) gimpcanvasguide.$(OBJEXT) \
+	gimpcanvashandle.$(OBJEXT) gimpcanvasitem.$(OBJEXT) \
+	gimpcanvasitem-utils.$(OBJEXT) \
+	gimpcanvaslayerboundary.$(OBJEXT) gimpcanvaslimit.$(OBJEXT) \
+	gimpcanvasline.$(OBJEXT) gimpcanvaspassepartout.$(OBJEXT) \
+	gimpcanvaspath.$(OBJEXT) gimpcanvaspen.$(OBJEXT) \
+	gimpcanvaspolygon.$(OBJEXT) gimpcanvasprogress.$(OBJEXT) \
+	gimpcanvasproxygroup.$(OBJEXT) gimpcanvasrectangle.$(OBJEXT) \
+	gimpcanvasrectangleguides.$(OBJEXT) \
+	gimpcanvassamplepoint.$(OBJEXT) gimpcanvastextcursor.$(OBJEXT) \
+	gimpcanvastransformguides.$(OBJEXT) \
+	gimpcanvastransformpreview.$(OBJEXT) gimpcursorview.$(OBJEXT) \
+	gimpdisplay.$(OBJEXT) gimpdisplay-foreach.$(OBJEXT) \
+	gimpdisplay-handlers.$(OBJEXT) gimpdisplayshell.$(OBJEXT) \
+	gimpdisplayshell-actions.$(OBJEXT) \
+	gimpdisplayshell-appearance.$(OBJEXT) \
+	gimpdisplayshell-autoscroll.$(OBJEXT) \
+	gimpdisplayshell-callbacks.$(OBJEXT) \
+	gimpdisplayshell-close.$(OBJEXT) \
+	gimpdisplayshell-cursor.$(OBJEXT) \
+	gimpdisplayshell-dnd.$(OBJEXT) gimpdisplayshell-draw.$(OBJEXT) \
+	gimpdisplayshell-expose.$(OBJEXT) \
+	gimpdisplayshell-grab.$(OBJEXT) \
+	gimpdisplayshell-handlers.$(OBJEXT) \
+	gimpdisplayshell-filter.$(OBJEXT) \
+	gimpdisplayshell-filter-dialog.$(OBJEXT) \
+	gimpdisplayshell-layer-select.$(OBJEXT) \
+	gimpdisplayshell-icon.$(OBJEXT) \
+	gimpdisplayshell-items.$(OBJEXT) \
+	gimpdisplayshell-profile.$(OBJEXT) \
+	gimpdisplayshell-progress.$(OBJEXT) \
+	gimpdisplayshell-render.$(OBJEXT) \
+	gimpdisplayshell-rotate.$(OBJEXT) \
+	gimpdisplayshell-rotate-dialog.$(OBJEXT) \
+	gimpdisplayshell-rulers.$(OBJEXT) \
+	gimpdisplayshell-scale.$(OBJEXT) \
+	gimpdisplayshell-scale-dialog.$(OBJEXT) \
+	gimpdisplayshell-scroll.$(OBJEXT) \
+	gimpdisplayshell-scrollbars.$(OBJEXT) \
+	gimpdisplayshell-selection.$(OBJEXT) \
+	gimpdisplayshell-title.$(OBJEXT) \
+	gimpdisplayshell-tool-events.$(OBJEXT) \
+	gimpdisplayshell-transform.$(OBJEXT) \
+	gimpdisplayshell-utils.$(OBJEXT) gimpdisplayxfer.$(OBJEXT) \
+	gimpimagewindow.$(OBJEXT) gimpmotionbuffer.$(OBJEXT) \
+	gimpmultiwindowstrategy.$(OBJEXT) \
+	gimpnavigationeditor.$(OBJEXT) gimpscalecombobox.$(OBJEXT) \
+	gimpsinglewindowstrategy.$(OBJEXT) gimpstatusbar.$(OBJEXT) \
+	gimptooldialog.$(OBJEXT) gimptoolgui.$(OBJEXT) \
+	gimptoolcompass.$(OBJEXT) gimptoolfocus.$(OBJEXT) \
+	gimptoolgyroscope.$(OBJEXT) gimptoolhandlegrid.$(OBJEXT) \
+	gimptoolline.$(OBJEXT) gimptoolpath.$(OBJEXT) \
+	gimptoolpolygon.$(OBJEXT) gimptoolrectangle.$(OBJEXT) \
+	gimptoolrotategrid.$(OBJEXT) gimptoolsheargrid.$(OBJEXT) \
+	gimptooltransform3dgrid.$(OBJEXT) \
+	gimptooltransformgrid.$(OBJEXT) gimptoolwidget.$(OBJEXT) \
+	gimptoolwidgetgroup.$(OBJEXT)
+am_libappdisplay_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappdisplay_a_OBJECTS = $(am_libappdisplay_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/display-enums.Po \
+	./$(DEPDIR)/gimpcanvas-style.Po ./$(DEPDIR)/gimpcanvas.Po \
+	./$(DEPDIR)/gimpcanvasarc.Po ./$(DEPDIR)/gimpcanvasboundary.Po \
+	./$(DEPDIR)/gimpcanvasbufferpreview.Po \
+	./$(DEPDIR)/gimpcanvascanvasboundary.Po \
+	./$(DEPDIR)/gimpcanvascorner.Po \
+	./$(DEPDIR)/gimpcanvascursor.Po ./$(DEPDIR)/gimpcanvasgrid.Po \
+	./$(DEPDIR)/gimpcanvasgroup.Po ./$(DEPDIR)/gimpcanvasguide.Po \
+	./$(DEPDIR)/gimpcanvashandle.Po \
+	./$(DEPDIR)/gimpcanvasitem-utils.Po \
+	./$(DEPDIR)/gimpcanvasitem.Po \
+	./$(DEPDIR)/gimpcanvaslayerboundary.Po \
+	./$(DEPDIR)/gimpcanvaslimit.Po ./$(DEPDIR)/gimpcanvasline.Po \
+	./$(DEPDIR)/gimpcanvaspassepartout.Po \
+	./$(DEPDIR)/gimpcanvaspath.Po ./$(DEPDIR)/gimpcanvaspen.Po \
+	./$(DEPDIR)/gimpcanvaspolygon.Po \
+	./$(DEPDIR)/gimpcanvasprogress.Po \
+	./$(DEPDIR)/gimpcanvasproxygroup.Po \
+	./$(DEPDIR)/gimpcanvasrectangle.Po \
+	./$(DEPDIR)/gimpcanvasrectangleguides.Po \
+	./$(DEPDIR)/gimpcanvassamplepoint.Po \
+	./$(DEPDIR)/gimpcanvastextcursor.Po \
+	./$(DEPDIR)/gimpcanvastransformguides.Po \
+	./$(DEPDIR)/gimpcanvastransformpreview.Po \
+	./$(DEPDIR)/gimpcursorview.Po \
+	./$(DEPDIR)/gimpdisplay-foreach.Po \
+	./$(DEPDIR)/gimpdisplay-handlers.Po ./$(DEPDIR)/gimpdisplay.Po \
+	./$(DEPDIR)/gimpdisplayshell-actions.Po \
+	./$(DEPDIR)/gimpdisplayshell-appearance.Po \
+	./$(DEPDIR)/gimpdisplayshell-autoscroll.Po \
+	./$(DEPDIR)/gimpdisplayshell-callbacks.Po \
+	./$(DEPDIR)/gimpdisplayshell-close.Po \
+	./$(DEPDIR)/gimpdisplayshell-cursor.Po \
+	./$(DEPDIR)/gimpdisplayshell-dnd.Po \
+	./$(DEPDIR)/gimpdisplayshell-draw.Po \
+	./$(DEPDIR)/gimpdisplayshell-expose.Po \
+	./$(DEPDIR)/gimpdisplayshell-filter-dialog.Po \
+	./$(DEPDIR)/gimpdisplayshell-filter.Po \
+	./$(DEPDIR)/gimpdisplayshell-grab.Po \
+	./$(DEPDIR)/gimpdisplayshell-handlers.Po \
+	./$(DEPDIR)/gimpdisplayshell-icon.Po \
+	./$(DEPDIR)/gimpdisplayshell-items.Po \
+	./$(DEPDIR)/gimpdisplayshell-layer-select.Po \
+	./$(DEPDIR)/gimpdisplayshell-profile.Po \
+	./$(DEPDIR)/gimpdisplayshell-progress.Po \
+	./$(DEPDIR)/gimpdisplayshell-render.Po \
+	./$(DEPDIR)/gimpdisplayshell-rotate-dialog.Po \
+	./$(DEPDIR)/gimpdisplayshell-rotate.Po \
+	./$(DEPDIR)/gimpdisplayshell-rulers.Po \
+	./$(DEPDIR)/gimpdisplayshell-scale-dialog.Po \
+	./$(DEPDIR)/gimpdisplayshell-scale.Po \
+	./$(DEPDIR)/gimpdisplayshell-scroll.Po \
+	./$(DEPDIR)/gimpdisplayshell-scrollbars.Po \
+	./$(DEPDIR)/gimpdisplayshell-selection.Po \
+	./$(DEPDIR)/gimpdisplayshell-title.Po \
+	./$(DEPDIR)/gimpdisplayshell-tool-events.Po \
+	./$(DEPDIR)/gimpdisplayshell-transform.Po \
+	./$(DEPDIR)/gimpdisplayshell-utils.Po \
+	./$(DEPDIR)/gimpdisplayshell.Po ./$(DEPDIR)/gimpdisplayxfer.Po \
+	./$(DEPDIR)/gimpimagewindow.Po ./$(DEPDIR)/gimpmotionbuffer.Po \
+	./$(DEPDIR)/gimpmultiwindowstrategy.Po \
+	./$(DEPDIR)/gimpnavigationeditor.Po \
+	./$(DEPDIR)/gimpscalecombobox.Po \
+	./$(DEPDIR)/gimpsinglewindowstrategy.Po \
+	./$(DEPDIR)/gimpstatusbar.Po ./$(DEPDIR)/gimptoolcompass.Po \
+	./$(DEPDIR)/gimptooldialog.Po ./$(DEPDIR)/gimptoolfocus.Po \
+	./$(DEPDIR)/gimptoolgui.Po ./$(DEPDIR)/gimptoolgyroscope.Po \
+	./$(DEPDIR)/gimptoolhandlegrid.Po ./$(DEPDIR)/gimptoolline.Po \
+	./$(DEPDIR)/gimptoolpath.Po ./$(DEPDIR)/gimptoolpolygon.Po \
+	./$(DEPDIR)/gimptoolrectangle.Po \
+	./$(DEPDIR)/gimptoolrotategrid.Po \
+	./$(DEPDIR)/gimptoolsheargrid.Po \
+	./$(DEPDIR)/gimptooltransform3dgrid.Po \
+	./$(DEPDIR)/gimptooltransformgrid.Po \
+	./$(DEPDIR)/gimptoolwidget.Po \
+	./$(DEPDIR)/gimptoolwidgetgroup.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappdisplay_a_SOURCES)
+DIST_SOURCES = $(libappdisplay_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
+@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
+@PLATFORM_OSX_TRUE@xnone = "-xnone"
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Display\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappdisplay.a
+libappdisplay_a_sources = \
+	display-enums.h				\
+	display-types.h				\
+	gimpcanvas.c				\
+	gimpcanvas.h				\
+	gimpcanvas-style.c			\
+	gimpcanvas-style.h			\
+	gimpcanvasarc.c				\
+	gimpcanvasarc.h				\
+	gimpcanvasboundary.c			\
+	gimpcanvasboundary.h			\
+	gimpcanvasbufferpreview.c		\
+	gimpcanvasbufferpreview.h		\
+	gimpcanvascanvasboundary.c		\
+	gimpcanvascanvasboundary.h		\
+	gimpcanvascorner.c			\
+	gimpcanvascorner.h			\
+	gimpcanvascursor.c			\
+	gimpcanvascursor.h			\
+	gimpcanvasgrid.c			\
+	gimpcanvasgrid.h			\
+	gimpcanvasgroup.c			\
+	gimpcanvasgroup.h			\
+	gimpcanvasguide.c			\
+	gimpcanvasguide.h			\
+	gimpcanvashandle.c			\
+	gimpcanvashandle.h			\
+	gimpcanvasitem.c			\
+	gimpcanvasitem.h			\
+	gimpcanvasitem-utils.c			\
+	gimpcanvasitem-utils.h			\
+	gimpcanvaslayerboundary.c		\
+	gimpcanvaslayerboundary.h		\
+	gimpcanvaslimit.c			\
+	gimpcanvaslimit.h			\
+	gimpcanvasline.c			\
+	gimpcanvasline.h			\
+	gimpcanvaspassepartout.c		\
+	gimpcanvaspassepartout.h		\
+	gimpcanvaspath.c			\
+	gimpcanvaspath.h			\
+	gimpcanvaspen.c				\
+	gimpcanvaspen.h				\
+	gimpcanvaspolygon.c			\
+	gimpcanvaspolygon.h			\
+	gimpcanvasprogress.c			\
+	gimpcanvasprogress.h			\
+	gimpcanvasproxygroup.c			\
+	gimpcanvasproxygroup.h			\
+	gimpcanvasrectangle.c			\
+	gimpcanvasrectangle.h			\
+	gimpcanvasrectangleguides.c		\
+	gimpcanvasrectangleguides.h		\
+	gimpcanvassamplepoint.c			\
+	gimpcanvassamplepoint.h			\
+	gimpcanvastextcursor.c			\
+	gimpcanvastextcursor.h			\
+	gimpcanvastransformguides.c		\
+	gimpcanvastransformguides.h		\
+	gimpcanvastransformpreview.c		\
+	gimpcanvastransformpreview.h		\
+	gimpcursorview.c			\
+	gimpcursorview.h			\
+	gimpdisplay.c				\
+	gimpdisplay.h				\
+	gimpdisplay-foreach.c			\
+	gimpdisplay-foreach.h			\
+	gimpdisplay-handlers.c			\
+	gimpdisplay-handlers.h			\
+	gimpdisplayshell.c			\
+	gimpdisplayshell.h			\
+	gimpdisplayshell-actions.c		\
+	gimpdisplayshell-actions.h		\
+	gimpdisplayshell-appearance.c		\
+	gimpdisplayshell-appearance.h		\
+	gimpdisplayshell-autoscroll.c		\
+	gimpdisplayshell-autoscroll.h		\
+	gimpdisplayshell-callbacks.c		\
+	gimpdisplayshell-callbacks.h		\
+	gimpdisplayshell-close.c		\
+	gimpdisplayshell-close.h		\
+	gimpdisplayshell-cursor.c		\
+	gimpdisplayshell-cursor.h		\
+	gimpdisplayshell-dnd.c			\
+	gimpdisplayshell-dnd.h			\
+	gimpdisplayshell-draw.c			\
+	gimpdisplayshell-draw.h			\
+	gimpdisplayshell-expose.c		\
+	gimpdisplayshell-expose.h		\
+	gimpdisplayshell-grab.c			\
+	gimpdisplayshell-grab.h			\
+	gimpdisplayshell-handlers.c		\
+	gimpdisplayshell-handlers.h		\
+	gimpdisplayshell-filter.c		\
+	gimpdisplayshell-filter.h		\
+	gimpdisplayshell-filter-dialog.c	\
+	gimpdisplayshell-filter-dialog.h	\
+	gimpdisplayshell-layer-select.c		\
+	gimpdisplayshell-layer-select.h		\
+	gimpdisplayshell-icon.c			\
+	gimpdisplayshell-icon.h			\
+	gimpdisplayshell-items.c		\
+	gimpdisplayshell-items.h		\
+	gimpdisplayshell-profile.c		\
+	gimpdisplayshell-profile.h		\
+	gimpdisplayshell-progress.c		\
+	gimpdisplayshell-progress.h		\
+	gimpdisplayshell-render.c		\
+	gimpdisplayshell-render.h		\
+	gimpdisplayshell-rotate.c		\
+	gimpdisplayshell-rotate.h		\
+	gimpdisplayshell-rotate-dialog.c	\
+	gimpdisplayshell-rotate-dialog.h	\
+	gimpdisplayshell-rulers.c		\
+	gimpdisplayshell-rulers.h		\
+	gimpdisplayshell-scale.c		\
+	gimpdisplayshell-scale.h		\
+	gimpdisplayshell-scale-dialog.c		\
+	gimpdisplayshell-scale-dialog.h		\
+	gimpdisplayshell-scroll.c		\
+	gimpdisplayshell-scroll.h		\
+	gimpdisplayshell-scrollbars.c		\
+	gimpdisplayshell-scrollbars.h		\
+	gimpdisplayshell-selection.c		\
+	gimpdisplayshell-selection.h		\
+	gimpdisplayshell-title.c		\
+	gimpdisplayshell-title.h		\
+	gimpdisplayshell-tool-events.c		\
+	gimpdisplayshell-tool-events.h		\
+	gimpdisplayshell-transform.c		\
+	gimpdisplayshell-transform.h		\
+	gimpdisplayshell-utils.c		\
+	gimpdisplayshell-utils.h		\
+	gimpdisplayxfer.c			\
+	gimpdisplayxfer.h			\
+	gimpimagewindow.c			\
+	gimpimagewindow.h			\
+	gimpmotionbuffer.c			\
+	gimpmotionbuffer.h			\
+	gimpmultiwindowstrategy.c		\
+	gimpmultiwindowstrategy.h		\
+	gimpnavigationeditor.c			\
+	gimpnavigationeditor.h			\
+	gimpscalecombobox.c			\
+	gimpscalecombobox.h			\
+	gimpsinglewindowstrategy.c		\
+	gimpsinglewindowstrategy.h		\
+	gimpstatusbar.c				\
+	gimpstatusbar.h				\
+	gimptooldialog.c			\
+	gimptooldialog.h			\
+	gimptoolgui.c				\
+	gimptoolgui.h				\
+	gimptoolcompass.c			\
+	gimptoolcompass.h			\
+	gimptoolfocus.h				\
+	gimptoolfocus.c				\
+	gimptoolgyroscope.c			\
+	gimptoolgyroscope.h			\
+	gimptoolhandlegrid.c			\
+	gimptoolhandlegrid.h			\
+	gimptoolline.c				\
+	gimptoolline.h				\
+	gimptoolpath.c				\
+	gimptoolpath.h				\
+	gimptoolpolygon.c			\
+	gimptoolpolygon.h			\
+	gimptoolrectangle.c			\
+	gimptoolrectangle.h			\
+	gimptoolrotategrid.c			\
+	gimptoolrotategrid.h			\
+	gimptoolsheargrid.c			\
+	gimptoolsheargrid.h			\
+	gimptooltransform3dgrid.c		\
+	gimptooltransform3dgrid.h		\
+	gimptooltransformgrid.c			\
+	gimptooltransformgrid.h			\
+	gimptoolwidget.c			\
+	gimptoolwidget.h			\
+	gimptoolwidgetgroup.c			\
+	gimptoolwidgetgroup.h
+
+libappdisplay_a_built_sources = display-enums.c
+libappdisplay_a_SOURCES = \
+	$(libappdisplay_a_built_sources)	\
+	$(libappdisplay_a_sources)
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-dec
+CLEANFILES = $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/display/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/display/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappdisplay.a: $(libappdisplay_a_OBJECTS) $(libappdisplay_a_DEPENDENCIES) $(EXTRA_libappdisplay_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappdisplay.a
+	$(AM_V_AR)$(libappdisplay_a_AR) libappdisplay.a $(libappdisplay_a_OBJECTS) $(libappdisplay_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappdisplay.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-enums.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvas-style.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvas.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasarc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasboundary.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasbufferpreview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvascanvasboundary.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvascorner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvascursor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasgrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasgroup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasguide.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvashandle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasitem-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasitem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvaslayerboundary.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvaslimit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasline.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvaspassepartout.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvaspath.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvaspen.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvaspolygon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasprogress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasproxygroup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasrectangle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvasrectangleguides.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvassamplepoint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvastextcursor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvastransformguides.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcanvastransformpreview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcursorview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplay-foreach.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplay-handlers.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplay.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-appearance.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-autoscroll.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-callbacks.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-close.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-cursor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-dnd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-draw.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-expose.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-filter-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-filter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-grab.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-handlers.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-icon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-items.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-layer-select.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-profile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-progress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-render.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-rotate-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-rotate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-rulers.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-scale-dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-scale.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-scroll.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-scrollbars.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-selection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-title.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-tool-events.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-transform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayshell.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdisplayxfer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimagewindow.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmotionbuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmultiwindowstrategy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpnavigationeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpscalecombobox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsinglewindowstrategy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpstatusbar.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolcompass.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooldialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolfocus.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolgui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolgyroscope.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolhandlegrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolline.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpath.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpolygon.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolrectangle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolrotategrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolsheargrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooltransform3dgrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooltransformgrid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolwidget.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolwidgetgroup.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/display-enums.Po
+	-rm -f ./$(DEPDIR)/gimpcanvas-style.Po
+	-rm -f ./$(DEPDIR)/gimpcanvas.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasarc.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasboundary.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasbufferpreview.Po
+	-rm -f ./$(DEPDIR)/gimpcanvascanvasboundary.Po
+	-rm -f ./$(DEPDIR)/gimpcanvascorner.Po
+	-rm -f ./$(DEPDIR)/gimpcanvascursor.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasgrid.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasgroup.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasguide.Po
+	-rm -f ./$(DEPDIR)/gimpcanvashandle.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasitem-utils.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasitem.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaslayerboundary.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaslimit.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasline.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspassepartout.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspath.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspen.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspolygon.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasprogress.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasproxygroup.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasrectangle.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasrectangleguides.Po
+	-rm -f ./$(DEPDIR)/gimpcanvassamplepoint.Po
+	-rm -f ./$(DEPDIR)/gimpcanvastextcursor.Po
+	-rm -f ./$(DEPDIR)/gimpcanvastransformguides.Po
+	-rm -f ./$(DEPDIR)/gimpcanvastransformpreview.Po
+	-rm -f ./$(DEPDIR)/gimpcursorview.Po
+	-rm -f ./$(DEPDIR)/gimpdisplay-foreach.Po
+	-rm -f ./$(DEPDIR)/gimpdisplay-handlers.Po
+	-rm -f ./$(DEPDIR)/gimpdisplay.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-actions.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-appearance.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-autoscroll.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-callbacks.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-close.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-cursor.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-dnd.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-draw.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-expose.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-filter-dialog.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-filter.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-grab.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-handlers.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-icon.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-items.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-layer-select.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-profile.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-progress.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-render.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-rotate-dialog.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-rotate.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-rulers.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scale-dialog.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scale.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scroll.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scrollbars.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-selection.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-title.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-tool-events.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-transform.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-utils.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayxfer.Po
+	-rm -f ./$(DEPDIR)/gimpimagewindow.Po
+	-rm -f ./$(DEPDIR)/gimpmotionbuffer.Po
+	-rm -f ./$(DEPDIR)/gimpmultiwindowstrategy.Po
+	-rm -f ./$(DEPDIR)/gimpnavigationeditor.Po
+	-rm -f ./$(DEPDIR)/gimpscalecombobox.Po
+	-rm -f ./$(DEPDIR)/gimpsinglewindowstrategy.Po
+	-rm -f ./$(DEPDIR)/gimpstatusbar.Po
+	-rm -f ./$(DEPDIR)/gimptoolcompass.Po
+	-rm -f ./$(DEPDIR)/gimptooldialog.Po
+	-rm -f ./$(DEPDIR)/gimptoolfocus.Po
+	-rm -f ./$(DEPDIR)/gimptoolgui.Po
+	-rm -f ./$(DEPDIR)/gimptoolgyroscope.Po
+	-rm -f ./$(DEPDIR)/gimptoolhandlegrid.Po
+	-rm -f ./$(DEPDIR)/gimptoolline.Po
+	-rm -f ./$(DEPDIR)/gimptoolpath.Po
+	-rm -f ./$(DEPDIR)/gimptoolpolygon.Po
+	-rm -f ./$(DEPDIR)/gimptoolrectangle.Po
+	-rm -f ./$(DEPDIR)/gimptoolrotategrid.Po
+	-rm -f ./$(DEPDIR)/gimptoolsheargrid.Po
+	-rm -f ./$(DEPDIR)/gimptooltransform3dgrid.Po
+	-rm -f ./$(DEPDIR)/gimptooltransformgrid.Po
+	-rm -f ./$(DEPDIR)/gimptoolwidget.Po
+	-rm -f ./$(DEPDIR)/gimptoolwidgetgroup.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/display-enums.Po
+	-rm -f ./$(DEPDIR)/gimpcanvas-style.Po
+	-rm -f ./$(DEPDIR)/gimpcanvas.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasarc.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasboundary.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasbufferpreview.Po
+	-rm -f ./$(DEPDIR)/gimpcanvascanvasboundary.Po
+	-rm -f ./$(DEPDIR)/gimpcanvascorner.Po
+	-rm -f ./$(DEPDIR)/gimpcanvascursor.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasgrid.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasgroup.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasguide.Po
+	-rm -f ./$(DEPDIR)/gimpcanvashandle.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasitem-utils.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasitem.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaslayerboundary.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaslimit.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasline.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspassepartout.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspath.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspen.Po
+	-rm -f ./$(DEPDIR)/gimpcanvaspolygon.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasprogress.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasproxygroup.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasrectangle.Po
+	-rm -f ./$(DEPDIR)/gimpcanvasrectangleguides.Po
+	-rm -f ./$(DEPDIR)/gimpcanvassamplepoint.Po
+	-rm -f ./$(DEPDIR)/gimpcanvastextcursor.Po
+	-rm -f ./$(DEPDIR)/gimpcanvastransformguides.Po
+	-rm -f ./$(DEPDIR)/gimpcanvastransformpreview.Po
+	-rm -f ./$(DEPDIR)/gimpcursorview.Po
+	-rm -f ./$(DEPDIR)/gimpdisplay-foreach.Po
+	-rm -f ./$(DEPDIR)/gimpdisplay-handlers.Po
+	-rm -f ./$(DEPDIR)/gimpdisplay.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-actions.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-appearance.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-autoscroll.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-callbacks.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-close.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-cursor.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-dnd.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-draw.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-expose.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-filter-dialog.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-filter.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-grab.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-handlers.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-icon.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-items.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-layer-select.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-profile.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-progress.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-render.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-rotate-dialog.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-rotate.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-rulers.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scale-dialog.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scale.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scroll.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-scrollbars.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-selection.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-title.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-tool-events.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-transform.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell-utils.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayshell.Po
+	-rm -f ./$(DEPDIR)/gimpdisplayxfer.Po
+	-rm -f ./$(DEPDIR)/gimpimagewindow.Po
+	-rm -f ./$(DEPDIR)/gimpmotionbuffer.Po
+	-rm -f ./$(DEPDIR)/gimpmultiwindowstrategy.Po
+	-rm -f ./$(DEPDIR)/gimpnavigationeditor.Po
+	-rm -f ./$(DEPDIR)/gimpscalecombobox.Po
+	-rm -f ./$(DEPDIR)/gimpsinglewindowstrategy.Po
+	-rm -f ./$(DEPDIR)/gimpstatusbar.Po
+	-rm -f ./$(DEPDIR)/gimptoolcompass.Po
+	-rm -f ./$(DEPDIR)/gimptooldialog.Po
+	-rm -f ./$(DEPDIR)/gimptoolfocus.Po
+	-rm -f ./$(DEPDIR)/gimptoolgui.Po
+	-rm -f ./$(DEPDIR)/gimptoolgyroscope.Po
+	-rm -f ./$(DEPDIR)/gimptoolhandlegrid.Po
+	-rm -f ./$(DEPDIR)/gimptoolline.Po
+	-rm -f ./$(DEPDIR)/gimptoolpath.Po
+	-rm -f ./$(DEPDIR)/gimptoolpolygon.Po
+	-rm -f ./$(DEPDIR)/gimptoolrectangle.Po
+	-rm -f ./$(DEPDIR)/gimptoolrotategrid.Po
+	-rm -f ./$(DEPDIR)/gimptoolsheargrid.Po
+	-rm -f ./$(DEPDIR)/gimptooltransform3dgrid.Po
+	-rm -f ./$(DEPDIR)/gimptooltransformgrid.Po
+	-rm -f ./$(DEPDIR)/gimptoolwidget.Po
+	-rm -f ./$(DEPDIR)/gimptoolwidgetgroup.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-dec: $(srcdir)/display-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"display-enums.h\"\n#include\"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/display-enums.c: xgen-dec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/display/display-enums.c b/app/display/display-enums.c
new file mode 100644
index 0000000..438fc3e
--- /dev/null
+++ b/app/display/display-enums.c
@@ -0,0 +1,592 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "display-enums.h"
+#include"gimp-intl.h"
+
+/* enumerations from "display-enums.h" */
+GType
+gimp_button_press_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_BUTTON_PRESS_NORMAL, "GIMP_BUTTON_PRESS_NORMAL", "normal" },
+    { GIMP_BUTTON_PRESS_DOUBLE, "GIMP_BUTTON_PRESS_DOUBLE", "double" },
+    { GIMP_BUTTON_PRESS_TRIPLE, "GIMP_BUTTON_PRESS_TRIPLE", "triple" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_BUTTON_PRESS_NORMAL, "GIMP_BUTTON_PRESS_NORMAL", NULL },
+    { GIMP_BUTTON_PRESS_DOUBLE, "GIMP_BUTTON_PRESS_DOUBLE", NULL },
+    { GIMP_BUTTON_PRESS_TRIPLE, "GIMP_BUTTON_PRESS_TRIPLE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpButtonPressType", values);
+      gimp_type_set_translation_context (type, "button-press-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_button_release_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_BUTTON_RELEASE_NORMAL, "GIMP_BUTTON_RELEASE_NORMAL", "normal" },
+    { GIMP_BUTTON_RELEASE_CANCEL, "GIMP_BUTTON_RELEASE_CANCEL", "cancel" },
+    { GIMP_BUTTON_RELEASE_CLICK, "GIMP_BUTTON_RELEASE_CLICK", "click" },
+    { GIMP_BUTTON_RELEASE_NO_MOTION, "GIMP_BUTTON_RELEASE_NO_MOTION", "no-motion" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_BUTTON_RELEASE_NORMAL, "GIMP_BUTTON_RELEASE_NORMAL", NULL },
+    { GIMP_BUTTON_RELEASE_CANCEL, "GIMP_BUTTON_RELEASE_CANCEL", NULL },
+    { GIMP_BUTTON_RELEASE_CLICK, "GIMP_BUTTON_RELEASE_CLICK", NULL },
+    { GIMP_BUTTON_RELEASE_NO_MOTION, "GIMP_BUTTON_RELEASE_NO_MOTION", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpButtonReleaseType", values);
+      gimp_type_set_translation_context (type, "button-release-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_compass_orientation_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_COMPASS_ORIENTATION_AUTO, "GIMP_COMPASS_ORIENTATION_AUTO", "auto" },
+    { GIMP_COMPASS_ORIENTATION_HORIZONTAL, "GIMP_COMPASS_ORIENTATION_HORIZONTAL", "horizontal" },
+    { GIMP_COMPASS_ORIENTATION_VERTICAL, "GIMP_COMPASS_ORIENTATION_VERTICAL", "vertical" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_COMPASS_ORIENTATION_AUTO, NC_("compass-orientation", "Auto"), NULL },
+    { GIMP_COMPASS_ORIENTATION_HORIZONTAL, NC_("compass-orientation", "Horizontal"), NULL },
+    { GIMP_COMPASS_ORIENTATION_VERTICAL, NC_("compass-orientation", "Vertical"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCompassOrientation", values);
+      gimp_type_set_translation_context (type, "compass-orientation");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_cursor_precision_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CURSOR_PRECISION_PIXEL_CENTER, "GIMP_CURSOR_PRECISION_PIXEL_CENTER", "pixel-center" },
+    { GIMP_CURSOR_PRECISION_PIXEL_BORDER, "GIMP_CURSOR_PRECISION_PIXEL_BORDER", "pixel-border" },
+    { GIMP_CURSOR_PRECISION_SUBPIXEL, "GIMP_CURSOR_PRECISION_SUBPIXEL", "subpixel" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CURSOR_PRECISION_PIXEL_CENTER, "GIMP_CURSOR_PRECISION_PIXEL_CENTER", NULL },
+    { GIMP_CURSOR_PRECISION_PIXEL_BORDER, "GIMP_CURSOR_PRECISION_PIXEL_BORDER", NULL },
+    { GIMP_CURSOR_PRECISION_SUBPIXEL, "GIMP_CURSOR_PRECISION_SUBPIXEL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCursorPrecision", values);
+      gimp_type_set_translation_context (type, "cursor-precision");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_guides_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_GUIDES_NONE, "GIMP_GUIDES_NONE", "none" },
+    { GIMP_GUIDES_CENTER_LINES, "GIMP_GUIDES_CENTER_LINES", "center-lines" },
+    { GIMP_GUIDES_THIRDS, "GIMP_GUIDES_THIRDS", "thirds" },
+    { GIMP_GUIDES_FIFTHS, "GIMP_GUIDES_FIFTHS", "fifths" },
+    { GIMP_GUIDES_GOLDEN, "GIMP_GUIDES_GOLDEN", "golden" },
+    { GIMP_GUIDES_DIAGONALS, "GIMP_GUIDES_DIAGONALS", "diagonals" },
+    { GIMP_GUIDES_N_LINES, "GIMP_GUIDES_N_LINES", "n-lines" },
+    { GIMP_GUIDES_SPACING, "GIMP_GUIDES_SPACING", "spacing" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_GUIDES_NONE, NC_("guides-type", "No guides"), NULL },
+    { GIMP_GUIDES_CENTER_LINES, NC_("guides-type", "Center lines"), NULL },
+    { GIMP_GUIDES_THIRDS, NC_("guides-type", "Rule of thirds"), NULL },
+    { GIMP_GUIDES_FIFTHS, NC_("guides-type", "Rule of fifths"), NULL },
+    { GIMP_GUIDES_GOLDEN, NC_("guides-type", "Golden sections"), NULL },
+    { GIMP_GUIDES_DIAGONALS, NC_("guides-type", "Diagonal lines"), NULL },
+    { GIMP_GUIDES_N_LINES, NC_("guides-type", "Number of lines"), NULL },
+    { GIMP_GUIDES_SPACING, NC_("guides-type", "Line spacing"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpGuidesType", values);
+      gimp_type_set_translation_context (type, "guides-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_handle_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HANDLE_SQUARE, "GIMP_HANDLE_SQUARE", "square" },
+    { GIMP_HANDLE_DASHED_SQUARE, "GIMP_HANDLE_DASHED_SQUARE", "dashed-square" },
+    { GIMP_HANDLE_FILLED_SQUARE, "GIMP_HANDLE_FILLED_SQUARE", "filled-square" },
+    { GIMP_HANDLE_CIRCLE, "GIMP_HANDLE_CIRCLE", "circle" },
+    { GIMP_HANDLE_DASHED_CIRCLE, "GIMP_HANDLE_DASHED_CIRCLE", "dashed-circle" },
+    { GIMP_HANDLE_FILLED_CIRCLE, "GIMP_HANDLE_FILLED_CIRCLE", "filled-circle" },
+    { GIMP_HANDLE_DIAMOND, "GIMP_HANDLE_DIAMOND", "diamond" },
+    { GIMP_HANDLE_DASHED_DIAMOND, "GIMP_HANDLE_DASHED_DIAMOND", "dashed-diamond" },
+    { GIMP_HANDLE_FILLED_DIAMOND, "GIMP_HANDLE_FILLED_DIAMOND", "filled-diamond" },
+    { GIMP_HANDLE_CROSS, "GIMP_HANDLE_CROSS", "cross" },
+    { GIMP_HANDLE_CROSSHAIR, "GIMP_HANDLE_CROSSHAIR", "crosshair" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HANDLE_SQUARE, "GIMP_HANDLE_SQUARE", NULL },
+    { GIMP_HANDLE_DASHED_SQUARE, "GIMP_HANDLE_DASHED_SQUARE", NULL },
+    { GIMP_HANDLE_FILLED_SQUARE, "GIMP_HANDLE_FILLED_SQUARE", NULL },
+    { GIMP_HANDLE_CIRCLE, "GIMP_HANDLE_CIRCLE", NULL },
+    { GIMP_HANDLE_DASHED_CIRCLE, "GIMP_HANDLE_DASHED_CIRCLE", NULL },
+    { GIMP_HANDLE_FILLED_CIRCLE, "GIMP_HANDLE_FILLED_CIRCLE", NULL },
+    { GIMP_HANDLE_DIAMOND, "GIMP_HANDLE_DIAMOND", NULL },
+    { GIMP_HANDLE_DASHED_DIAMOND, "GIMP_HANDLE_DASHED_DIAMOND", NULL },
+    { GIMP_HANDLE_FILLED_DIAMOND, "GIMP_HANDLE_FILLED_DIAMOND", NULL },
+    { GIMP_HANDLE_CROSS, "GIMP_HANDLE_CROSS", NULL },
+    { GIMP_HANDLE_CROSSHAIR, "GIMP_HANDLE_CROSSHAIR", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpHandleType", values);
+      gimp_type_set_translation_context (type, "handle-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_handle_anchor_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HANDLE_ANCHOR_CENTER, "GIMP_HANDLE_ANCHOR_CENTER", "center" },
+    { GIMP_HANDLE_ANCHOR_NORTH, "GIMP_HANDLE_ANCHOR_NORTH", "north" },
+    { GIMP_HANDLE_ANCHOR_NORTH_WEST, "GIMP_HANDLE_ANCHOR_NORTH_WEST", "north-west" },
+    { GIMP_HANDLE_ANCHOR_NORTH_EAST, "GIMP_HANDLE_ANCHOR_NORTH_EAST", "north-east" },
+    { GIMP_HANDLE_ANCHOR_SOUTH, "GIMP_HANDLE_ANCHOR_SOUTH", "south" },
+    { GIMP_HANDLE_ANCHOR_SOUTH_WEST, "GIMP_HANDLE_ANCHOR_SOUTH_WEST", "south-west" },
+    { GIMP_HANDLE_ANCHOR_SOUTH_EAST, "GIMP_HANDLE_ANCHOR_SOUTH_EAST", "south-east" },
+    { GIMP_HANDLE_ANCHOR_WEST, "GIMP_HANDLE_ANCHOR_WEST", "west" },
+    { GIMP_HANDLE_ANCHOR_EAST, "GIMP_HANDLE_ANCHOR_EAST", "east" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HANDLE_ANCHOR_CENTER, "GIMP_HANDLE_ANCHOR_CENTER", NULL },
+    { GIMP_HANDLE_ANCHOR_NORTH, "GIMP_HANDLE_ANCHOR_NORTH", NULL },
+    { GIMP_HANDLE_ANCHOR_NORTH_WEST, "GIMP_HANDLE_ANCHOR_NORTH_WEST", NULL },
+    { GIMP_HANDLE_ANCHOR_NORTH_EAST, "GIMP_HANDLE_ANCHOR_NORTH_EAST", NULL },
+    { GIMP_HANDLE_ANCHOR_SOUTH, "GIMP_HANDLE_ANCHOR_SOUTH", NULL },
+    { GIMP_HANDLE_ANCHOR_SOUTH_WEST, "GIMP_HANDLE_ANCHOR_SOUTH_WEST", NULL },
+    { GIMP_HANDLE_ANCHOR_SOUTH_EAST, "GIMP_HANDLE_ANCHOR_SOUTH_EAST", NULL },
+    { GIMP_HANDLE_ANCHOR_WEST, "GIMP_HANDLE_ANCHOR_WEST", NULL },
+    { GIMP_HANDLE_ANCHOR_EAST, "GIMP_HANDLE_ANCHOR_EAST", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpHandleAnchor", values);
+      gimp_type_set_translation_context (type, "handle-anchor");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_limit_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_LIMIT_CIRCLE, "GIMP_LIMIT_CIRCLE", "circle" },
+    { GIMP_LIMIT_SQUARE, "GIMP_LIMIT_SQUARE", "square" },
+    { GIMP_LIMIT_DIAMOND, "GIMP_LIMIT_DIAMOND", "diamond" },
+    { GIMP_LIMIT_HORIZONTAL, "GIMP_LIMIT_HORIZONTAL", "horizontal" },
+    { GIMP_LIMIT_VERTICAL, "GIMP_LIMIT_VERTICAL", "vertical" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_LIMIT_CIRCLE, "GIMP_LIMIT_CIRCLE", NULL },
+    { GIMP_LIMIT_SQUARE, "GIMP_LIMIT_SQUARE", NULL },
+    { GIMP_LIMIT_DIAMOND, "GIMP_LIMIT_DIAMOND", NULL },
+    { GIMP_LIMIT_HORIZONTAL, "GIMP_LIMIT_HORIZONTAL", NULL },
+    { GIMP_LIMIT_VERTICAL, "GIMP_LIMIT_VERTICAL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpLimitType", values);
+      gimp_type_set_translation_context (type, "limit-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_path_style_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_PATH_STYLE_DEFAULT, "GIMP_PATH_STYLE_DEFAULT", "default" },
+    { GIMP_PATH_STYLE_VECTORS, "GIMP_PATH_STYLE_VECTORS", "vectors" },
+    { GIMP_PATH_STYLE_OUTLINE, "GIMP_PATH_STYLE_OUTLINE", "outline" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_PATH_STYLE_DEFAULT, "GIMP_PATH_STYLE_DEFAULT", NULL },
+    { GIMP_PATH_STYLE_VECTORS, "GIMP_PATH_STYLE_VECTORS", NULL },
+    { GIMP_PATH_STYLE_OUTLINE, "GIMP_PATH_STYLE_OUTLINE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpPathStyle", values);
+      gimp_type_set_translation_context (type, "path-style");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_rectangle_constraint_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_RECTANGLE_CONSTRAIN_NONE, "GIMP_RECTANGLE_CONSTRAIN_NONE", "none" },
+    { GIMP_RECTANGLE_CONSTRAIN_IMAGE, "GIMP_RECTANGLE_CONSTRAIN_IMAGE", "image" },
+    { GIMP_RECTANGLE_CONSTRAIN_DRAWABLE, "GIMP_RECTANGLE_CONSTRAIN_DRAWABLE", "drawable" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_RECTANGLE_CONSTRAIN_NONE, "GIMP_RECTANGLE_CONSTRAIN_NONE", NULL },
+    { GIMP_RECTANGLE_CONSTRAIN_IMAGE, "GIMP_RECTANGLE_CONSTRAIN_IMAGE", NULL },
+    { GIMP_RECTANGLE_CONSTRAIN_DRAWABLE, "GIMP_RECTANGLE_CONSTRAIN_DRAWABLE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpRectangleConstraint", values);
+      gimp_type_set_translation_context (type, "rectangle-constraint");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_rectangle_fixed_rule_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_RECTANGLE_FIXED_ASPECT, "GIMP_RECTANGLE_FIXED_ASPECT", "aspect" },
+    { GIMP_RECTANGLE_FIXED_WIDTH, "GIMP_RECTANGLE_FIXED_WIDTH", "width" },
+    { GIMP_RECTANGLE_FIXED_HEIGHT, "GIMP_RECTANGLE_FIXED_HEIGHT", "height" },
+    { GIMP_RECTANGLE_FIXED_SIZE, "GIMP_RECTANGLE_FIXED_SIZE", "size" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_RECTANGLE_FIXED_ASPECT, NC_("rectangle-fixed-rule", "Aspect ratio"), NULL },
+    { GIMP_RECTANGLE_FIXED_WIDTH, NC_("rectangle-fixed-rule", "Width"), NULL },
+    { GIMP_RECTANGLE_FIXED_HEIGHT, NC_("rectangle-fixed-rule", "Height"), NULL },
+    { GIMP_RECTANGLE_FIXED_SIZE, NC_("rectangle-fixed-rule", "Size"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpRectangleFixedRule", values);
+      gimp_type_set_translation_context (type, "rectangle-fixed-rule");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_rectangle_precision_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_RECTANGLE_PRECISION_INT, "GIMP_RECTANGLE_PRECISION_INT", "int" },
+    { GIMP_RECTANGLE_PRECISION_DOUBLE, "GIMP_RECTANGLE_PRECISION_DOUBLE", "double" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_RECTANGLE_PRECISION_INT, "GIMP_RECTANGLE_PRECISION_INT", NULL },
+    { GIMP_RECTANGLE_PRECISION_DOUBLE, "GIMP_RECTANGLE_PRECISION_DOUBLE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpRectanglePrecision", values);
+      gimp_type_set_translation_context (type, "rectangle-precision");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_transform_3d_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TRANSFORM_3D_MODE_CAMERA, "GIMP_TRANSFORM_3D_MODE_CAMERA", "camera" },
+    { GIMP_TRANSFORM_3D_MODE_MOVE, "GIMP_TRANSFORM_3D_MODE_MOVE", "move" },
+    { GIMP_TRANSFORM_3D_MODE_ROTATE, "GIMP_TRANSFORM_3D_MODE_ROTATE", "rotate" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TRANSFORM_3D_MODE_CAMERA, "GIMP_TRANSFORM_3D_MODE_CAMERA", NULL },
+    { GIMP_TRANSFORM_3D_MODE_MOVE, "GIMP_TRANSFORM_3D_MODE_MOVE", NULL },
+    { GIMP_TRANSFORM_3D_MODE_ROTATE, "GIMP_TRANSFORM_3D_MODE_ROTATE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTransform3DMode", values);
+      gimp_type_set_translation_context (type, "transform3-dmode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_transform_function_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TRANSFORM_FUNCTION_NONE, "GIMP_TRANSFORM_FUNCTION_NONE", "none" },
+    { GIMP_TRANSFORM_FUNCTION_MOVE, "GIMP_TRANSFORM_FUNCTION_MOVE", "move" },
+    { GIMP_TRANSFORM_FUNCTION_SCALE, "GIMP_TRANSFORM_FUNCTION_SCALE", "scale" },
+    { GIMP_TRANSFORM_FUNCTION_ROTATE, "GIMP_TRANSFORM_FUNCTION_ROTATE", "rotate" },
+    { GIMP_TRANSFORM_FUNCTION_SHEAR, "GIMP_TRANSFORM_FUNCTION_SHEAR", "shear" },
+    { GIMP_TRANSFORM_FUNCTION_PERSPECTIVE, "GIMP_TRANSFORM_FUNCTION_PERSPECTIVE", "perspective" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TRANSFORM_FUNCTION_NONE, "GIMP_TRANSFORM_FUNCTION_NONE", NULL },
+    { GIMP_TRANSFORM_FUNCTION_MOVE, "GIMP_TRANSFORM_FUNCTION_MOVE", NULL },
+    { GIMP_TRANSFORM_FUNCTION_SCALE, "GIMP_TRANSFORM_FUNCTION_SCALE", NULL },
+    { GIMP_TRANSFORM_FUNCTION_ROTATE, "GIMP_TRANSFORM_FUNCTION_ROTATE", NULL },
+    { GIMP_TRANSFORM_FUNCTION_SHEAR, "GIMP_TRANSFORM_FUNCTION_SHEAR", NULL },
+    { GIMP_TRANSFORM_FUNCTION_PERSPECTIVE, "GIMP_TRANSFORM_FUNCTION_PERSPECTIVE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTransformFunction", values);
+      gimp_type_set_translation_context (type, "transform-function");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_transform_handle_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HANDLE_MODE_ADD_TRANSFORM, "GIMP_HANDLE_MODE_ADD_TRANSFORM", "add-transform" },
+    { GIMP_HANDLE_MODE_MOVE, "GIMP_HANDLE_MODE_MOVE", "move" },
+    { GIMP_HANDLE_MODE_REMOVE, "GIMP_HANDLE_MODE_REMOVE", "remove" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HANDLE_MODE_ADD_TRANSFORM, NC_("transform-handle-mode", "Add / Transform"), NULL },
+    { GIMP_HANDLE_MODE_MOVE, NC_("transform-handle-mode", "Move"), NULL },
+    { GIMP_HANDLE_MODE_REMOVE, NC_("transform-handle-mode", "Remove"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTransformHandleMode", values);
+      gimp_type_set_translation_context (type, "transform-handle-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_vector_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_VECTOR_MODE_DESIGN, "GIMP_VECTOR_MODE_DESIGN", "design" },
+    { GIMP_VECTOR_MODE_EDIT, "GIMP_VECTOR_MODE_EDIT", "edit" },
+    { GIMP_VECTOR_MODE_MOVE, "GIMP_VECTOR_MODE_MOVE", "move" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_VECTOR_MODE_DESIGN, NC_("vector-mode", "Design"), NULL },
+    { GIMP_VECTOR_MODE_EDIT, NC_("vector-mode", "Edit"), NULL },
+    { GIMP_VECTOR_MODE_MOVE, NC_("vector-mode", "Move"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpVectorMode", values);
+      gimp_type_set_translation_context (type, "vector-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_zoom_focus_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ZOOM_FOCUS_BEST_GUESS, "GIMP_ZOOM_FOCUS_BEST_GUESS", "best-guess" },
+    { GIMP_ZOOM_FOCUS_POINTER, "GIMP_ZOOM_FOCUS_POINTER", "pointer" },
+    { GIMP_ZOOM_FOCUS_IMAGE_CENTER, "GIMP_ZOOM_FOCUS_IMAGE_CENTER", "image-center" },
+    { GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS, "GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS", "retain-centering-else-best-guess" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ZOOM_FOCUS_BEST_GUESS, "GIMP_ZOOM_FOCUS_BEST_GUESS", NULL },
+    { GIMP_ZOOM_FOCUS_POINTER, "GIMP_ZOOM_FOCUS_POINTER", NULL },
+    { GIMP_ZOOM_FOCUS_IMAGE_CENTER, "GIMP_ZOOM_FOCUS_IMAGE_CENTER", NULL },
+    { GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS, "GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpZoomFocus", values);
+      gimp_type_set_translation_context (type, "zoom-focus");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/display/display-enums.h b/app/display/display-enums.h
new file mode 100644
index 0000000..4cc84a8
--- /dev/null
+++ b/app/display/display-enums.h
@@ -0,0 +1,275 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DISPLAY_ENUMS_H__
+#define __DISPLAY_ENUMS_H__
+
+
+#define GIMP_TYPE_BUTTON_PRESS_TYPE (gimp_button_press_type_get_type ())
+
+GType gimp_button_press_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_BUTTON_PRESS_NORMAL,
+  GIMP_BUTTON_PRESS_DOUBLE,
+  GIMP_BUTTON_PRESS_TRIPLE
+} GimpButtonPressType;
+
+
+#define GIMP_TYPE_BUTTON_RELEASE_TYPE (gimp_button_release_type_get_type ())
+
+GType gimp_button_release_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_BUTTON_RELEASE_NORMAL,
+  GIMP_BUTTON_RELEASE_CANCEL,
+  GIMP_BUTTON_RELEASE_CLICK,
+  GIMP_BUTTON_RELEASE_NO_MOTION
+} GimpButtonReleaseType;
+
+
+#define GIMP_TYPE_COMPASS_ORIENTATION (gimp_compass_orientation_get_type ())
+
+GType gimp_compass_orientation_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_COMPASS_ORIENTATION_AUTO,       /*< desc="Auto"       >*/
+  GIMP_COMPASS_ORIENTATION_HORIZONTAL, /*< desc="Horizontal" >*/
+  GIMP_COMPASS_ORIENTATION_VERTICAL    /*< desc="Vertical"   >*/
+} GimpCompassOrientation;
+
+
+#define GIMP_TYPE_CURSOR_PRECISION (gimp_cursor_precision_get_type ())
+
+GType gimp_cursor_precision_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CURSOR_PRECISION_PIXEL_CENTER,
+  GIMP_CURSOR_PRECISION_PIXEL_BORDER,
+  GIMP_CURSOR_PRECISION_SUBPIXEL
+} GimpCursorPrecision;
+
+
+#define GIMP_TYPE_GUIDES_TYPE (gimp_guides_type_get_type ())
+
+GType gimp_guides_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_GUIDES_NONE,          /*< desc="No guides"       >*/
+  GIMP_GUIDES_CENTER_LINES,  /*< desc="Center lines"    >*/
+  GIMP_GUIDES_THIRDS,        /*< desc="Rule of thirds"  >*/
+  GIMP_GUIDES_FIFTHS,        /*< desc="Rule of fifths"  >*/
+  GIMP_GUIDES_GOLDEN,        /*< desc="Golden sections" >*/
+  GIMP_GUIDES_DIAGONALS,     /*< desc="Diagonal lines"  >*/
+  GIMP_GUIDES_N_LINES,       /*< desc="Number of lines" >*/
+  GIMP_GUIDES_SPACING        /*< desc="Line spacing"    >*/
+} GimpGuidesType;
+
+
+#define GIMP_TYPE_HANDLE_TYPE (gimp_handle_type_get_type ())
+
+GType gimp_handle_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HANDLE_SQUARE,
+  GIMP_HANDLE_DASHED_SQUARE,
+  GIMP_HANDLE_FILLED_SQUARE,
+  GIMP_HANDLE_CIRCLE,
+  GIMP_HANDLE_DASHED_CIRCLE,
+  GIMP_HANDLE_FILLED_CIRCLE,
+  GIMP_HANDLE_DIAMOND,
+  GIMP_HANDLE_DASHED_DIAMOND,
+  GIMP_HANDLE_FILLED_DIAMOND,
+  GIMP_HANDLE_CROSS,
+  GIMP_HANDLE_CROSSHAIR
+} GimpHandleType;
+
+
+#define GIMP_TYPE_HANDLE_ANCHOR (gimp_handle_anchor_get_type ())
+
+GType gimp_handle_anchor_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HANDLE_ANCHOR_CENTER,
+  GIMP_HANDLE_ANCHOR_NORTH,
+  GIMP_HANDLE_ANCHOR_NORTH_WEST,
+  GIMP_HANDLE_ANCHOR_NORTH_EAST,
+  GIMP_HANDLE_ANCHOR_SOUTH,
+  GIMP_HANDLE_ANCHOR_SOUTH_WEST,
+  GIMP_HANDLE_ANCHOR_SOUTH_EAST,
+  GIMP_HANDLE_ANCHOR_WEST,
+  GIMP_HANDLE_ANCHOR_EAST
+} GimpHandleAnchor;
+
+
+#define GIMP_TYPE_LIMIT_TYPE (gimp_limit_type_get_type ())
+
+GType gimp_limit_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_LIMIT_CIRCLE,
+  GIMP_LIMIT_SQUARE,
+  GIMP_LIMIT_DIAMOND,
+  GIMP_LIMIT_HORIZONTAL,
+  GIMP_LIMIT_VERTICAL
+} GimpLimitType;
+
+
+#define GIMP_TYPE_PATH_STYLE (gimp_path_style_get_type ())
+
+GType gimp_path_style_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_PATH_STYLE_DEFAULT,
+  GIMP_PATH_STYLE_VECTORS,
+  GIMP_PATH_STYLE_OUTLINE
+} GimpPathStyle;
+
+
+#define GIMP_TYPE_RECTANGLE_CONSTRAINT (gimp_rectangle_constraint_get_type ())
+
+GType gimp_rectangle_constraint_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_RECTANGLE_CONSTRAIN_NONE,
+  GIMP_RECTANGLE_CONSTRAIN_IMAGE,
+  GIMP_RECTANGLE_CONSTRAIN_DRAWABLE
+} GimpRectangleConstraint;
+
+
+#define GIMP_TYPE_RECTANGLE_FIXED_RULE (gimp_rectangle_fixed_rule_get_type ())
+
+GType gimp_rectangle_fixed_rule_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_RECTANGLE_FIXED_ASPECT, /*< desc="Aspect ratio" >*/
+  GIMP_RECTANGLE_FIXED_WIDTH,  /*< desc="Width"        >*/
+  GIMP_RECTANGLE_FIXED_HEIGHT, /*< desc="Height"       >*/
+  GIMP_RECTANGLE_FIXED_SIZE,   /*< desc="Size"         >*/
+} GimpRectangleFixedRule;
+
+
+#define GIMP_TYPE_RECTANGLE_PRECISION (gimp_rectangle_precision_get_type ())
+
+GType gimp_rectangle_precision_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_RECTANGLE_PRECISION_INT,
+  GIMP_RECTANGLE_PRECISION_DOUBLE,
+} GimpRectanglePrecision;
+
+
+#define GIMP_TYPE_TRANSFORM_3D_MODE (gimp_transform_3d_mode_get_type ())
+
+GType gimp_transform_3d_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< lowercase_name=gimp_transform_3d_mode >*/
+{
+  GIMP_TRANSFORM_3D_MODE_CAMERA,
+  GIMP_TRANSFORM_3D_MODE_MOVE,
+  GIMP_TRANSFORM_3D_MODE_ROTATE
+} GimpTransform3DMode;
+
+
+#define GIMP_TYPE_TRANSFORM_FUNCTION (gimp_transform_function_get_type ())
+
+GType gimp_transform_function_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TRANSFORM_FUNCTION_NONE,
+  GIMP_TRANSFORM_FUNCTION_MOVE,
+  GIMP_TRANSFORM_FUNCTION_SCALE,
+  GIMP_TRANSFORM_FUNCTION_ROTATE,
+  GIMP_TRANSFORM_FUNCTION_SHEAR,
+  GIMP_TRANSFORM_FUNCTION_PERSPECTIVE
+} GimpTransformFunction;
+
+
+#define GIMP_TYPE_TRANSFORM_HANDLE_MODE (gimp_transform_handle_mode_get_type ())
+
+GType gimp_transform_handle_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HANDLE_MODE_ADD_TRANSFORM, /*< desc="Add / Transform" >*/
+  GIMP_HANDLE_MODE_MOVE,          /*< desc="Move"            >*/
+  GIMP_HANDLE_MODE_REMOVE         /*< desc="Remove"          >*/
+} GimpTransformHandleMode;
+
+
+#define GIMP_TYPE_VECTOR_MODE (gimp_vector_mode_get_type ())
+
+GType gimp_vector_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_VECTOR_MODE_DESIGN,      /*< desc="Design" >*/
+  GIMP_VECTOR_MODE_EDIT,        /*< desc="Edit"   >*/
+  GIMP_VECTOR_MODE_MOVE         /*< desc="Move"   >*/
+} GimpVectorMode;
+
+
+#define GIMP_TYPE_ZOOM_FOCUS (gimp_zoom_focus_get_type ())
+
+GType gimp_zoom_focus_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  /* Make a best guess */
+  GIMP_ZOOM_FOCUS_BEST_GUESS,
+
+  /* Use the mouse cursor (if within canvas) */
+  GIMP_ZOOM_FOCUS_POINTER,
+
+  /* Use the image center */
+  GIMP_ZOOM_FOCUS_IMAGE_CENTER,
+
+  /* If the image is centered, retain the centering. Else use
+   * _BEST_GUESS
+   */
+  GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS
+
+} GimpZoomFocus;
+
+
+/*
+ * non-registered enums; register them if needed
+ */
+
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_HIT_NONE,
+  GIMP_HIT_INDIRECT,
+  GIMP_HIT_DIRECT
+} GimpHit;
+
+
+#endif /* __DISPLAY_ENUMS_H__ */
diff --git a/app/display/display-types.h b/app/display/display-types.h
new file mode 100644
index 0000000..6de751d
--- /dev/null
+++ b/app/display/display-types.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DISPLAY_TYPES_H__
+#define __DISPLAY_TYPES_H__
+
+
+#include "propgui/propgui-types.h"
+
+#include "display/display-enums.h"
+
+
+typedef struct _GimpCanvas               GimpCanvas;
+typedef struct _GimpCanvasGroup          GimpCanvasGroup;
+typedef struct _GimpCanvasItem           GimpCanvasItem;
+
+typedef struct _GimpDisplay              GimpDisplay;
+typedef struct _GimpDisplayShell         GimpDisplayShell;
+typedef struct _GimpMotionBuffer         GimpMotionBuffer;
+
+typedef struct _GimpImageWindow          GimpImageWindow;
+typedef struct _GimpMultiWindowStrategy  GimpMultiWindowStrategy;
+typedef struct _GimpSingleWindowStrategy GimpSingleWindowStrategy;
+
+typedef struct _GimpCursorView           GimpCursorView;
+typedef struct _GimpNavigationEditor     GimpNavigationEditor;
+typedef struct _GimpScaleComboBox        GimpScaleComboBox;
+typedef struct _GimpStatusbar            GimpStatusbar;
+
+typedef struct _GimpToolDialog           GimpToolDialog;
+typedef struct _GimpToolGui              GimpToolGui;
+typedef struct _GimpToolWidget           GimpToolWidget;
+typedef struct _GimpToolWidgetGroup      GimpToolWidgetGroup;
+
+typedef struct _GimpDisplayXfer          GimpDisplayXfer;
+typedef struct _Selection                Selection;
+
+
+#endif /* __DISPLAY_TYPES_H__ */
diff --git a/app/display/gimpcanvas-style.c b/app/display/gimpcanvas-style.c
new file mode 100644
index 0000000..8d47961
--- /dev/null
+++ b/app/display/gimpcanvas-style.c
@@ -0,0 +1,458 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvas-style.c
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+#include "core/gimpgrid.h"
+#include "core/gimplayer.h"
+
+#include "gimpcanvas-style.h"
+
+/* Styles for common and custom guides. */
+static const GimpRGB guide_normal_fg         = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB guide_normal_bg         = { 0.0, 0.8, 1.0, 1.0 };
+static const GimpRGB guide_active_fg         = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB guide_active_bg         = { 1.0, 0.0, 0.0, 1.0 };
+
+static const GimpRGB guide_mirror_normal_fg  = { 1.0, 1.0, 1.0, 1.0 };
+static const GimpRGB guide_mirror_normal_bg  = { 0.0, 1.0, 0.0, 1.0 };
+static const GimpRGB guide_mirror_active_fg  = { 0.0, 1.0, 0.0, 1.0 };
+static const GimpRGB guide_mirror_active_bg  = { 1.0, 0.0, 0.0, 1.0 };
+
+static const GimpRGB guide_mandala_normal_fg = { 1.0, 1.0, 1.0, 1.0 };
+static const GimpRGB guide_mandala_normal_bg = { 0.0, 1.0, 1.0, 1.0 };
+static const GimpRGB guide_mandala_active_fg = { 0.0, 1.0, 1.0, 1.0 };
+static const GimpRGB guide_mandala_active_bg = { 1.0, 0.0, 0.0, 1.0 };
+
+static const GimpRGB guide_split_normal_fg   = { 1.0, 1.0, 1.0, 1.0 };
+static const GimpRGB guide_split_normal_bg   = { 1.0, 0.0, 1.0, 1.0 };
+static const GimpRGB guide_split_active_fg   = { 1.0, 0.0, 1.0, 1.0 };
+static const GimpRGB guide_split_active_bg   = { 1.0, 0.0, 0.0, 1.0 };
+
+/* Styles for other canvas items. */
+static const GimpRGB sample_point_normal = { 0.0, 0.8, 1.0, 1.0 };
+static const GimpRGB sample_point_active = { 1.0, 0.0, 0.0, 1.0 };
+
+static const GimpRGB layer_fg            = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB layer_bg            = { 1.0, 1.0, 0.0, 1.0 };
+
+static const GimpRGB layer_group_fg      = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB layer_group_bg      = { 0.0, 1.0, 1.0, 1.0 };
+
+static const GimpRGB layer_mask_fg       = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB layer_mask_bg       = { 0.0, 1.0, 0.0, 1.0 };
+
+static const GimpRGB canvas_fg           = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB canvas_bg           = { 1.0, 0.5, 0.0, 1.0 };
+
+static const GimpRGB selection_out_fg    = { 1.0, 1.0, 1.0, 1.0 };
+static const GimpRGB selection_out_bg    = { 0.5, 0.5, 0.5, 1.0 };
+
+static const GimpRGB selection_in_fg     = { 0.0, 0.0, 0.0, 1.0 };
+static const GimpRGB selection_in_bg     = { 1.0, 1.0, 1.0, 1.0 };
+
+static const GimpRGB vectors_normal_bg   = { 1.0, 1.0, 1.0, 0.6 };
+static const GimpRGB vectors_normal_fg   = { 0.0, 0.0, 1.0, 0.8 };
+
+static const GimpRGB vectors_active_bg   = { 1.0, 1.0, 1.0, 0.6 };
+static const GimpRGB vectors_active_fg   = { 1.0, 0.0, 0.0, 0.8 };
+
+static const GimpRGB outline_bg          = { 1.0, 1.0, 1.0, 0.6 };
+static const GimpRGB outline_fg          = { 0.0, 0.0, 0.0, 0.8 };
+
+static const GimpRGB passe_partout       = { 0.0, 0.0, 0.0, 1.0 };
+
+static const GimpRGB tool_bg             = { 0.0, 0.0, 0.0, 0.4 };
+static const GimpRGB tool_fg             = { 1.0, 1.0, 1.0, 0.8 };
+static const GimpRGB tool_fg_highlight   = { 1.0, 0.8, 0.2, 0.8 };
+
+
+/*  public functions  */
+
+void
+gimp_canvas_set_guide_style (GtkWidget      *canvas,
+                             cairo_t        *cr,
+                             GimpGuideStyle  style,
+                             gboolean        active,
+                             gdouble         offset_x,
+                             gdouble         offset_y)
+{
+  cairo_pattern_t *pattern;
+  GimpRGB          normal_fg;
+  GimpRGB          normal_bg;
+  GimpRGB          active_fg;
+  GimpRGB          active_bg;
+  gdouble          line_width;
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  switch (style)
+    {
+    case GIMP_GUIDE_STYLE_NORMAL:
+      normal_fg  = guide_normal_fg;
+      normal_bg  = guide_normal_bg;
+      active_fg  = guide_active_fg;
+      active_bg  = guide_active_bg;
+      line_width = 1.0;
+      break;
+
+    case GIMP_GUIDE_STYLE_MIRROR:
+      normal_fg  = guide_mirror_normal_fg;
+      normal_bg  = guide_mirror_normal_bg;
+      active_fg  = guide_mirror_active_fg;
+      active_bg  = guide_mirror_active_bg;
+      line_width = 1.0;
+      break;
+
+    case GIMP_GUIDE_STYLE_MANDALA:
+      normal_fg  = guide_mandala_normal_fg;
+      normal_bg  = guide_mandala_normal_bg;
+      active_fg  = guide_mandala_active_fg;
+      active_bg  = guide_mandala_active_bg;
+      line_width = 1.0;
+      break;
+
+    case GIMP_GUIDE_STYLE_SPLIT_VIEW:
+      normal_fg  = guide_split_normal_fg;
+      normal_bg  = guide_split_normal_bg;
+      active_fg  = guide_split_active_fg;
+      active_bg  = guide_split_active_bg;
+      line_width = 1.0;
+      break;
+
+    default: /* GIMP_GUIDE_STYLE_NONE */
+      /* This should not happen. */
+      g_return_if_reached ();
+    }
+
+  cairo_set_line_width (cr, line_width);
+
+  if (active)
+    pattern = gimp_cairo_pattern_create_stipple (&active_fg, &active_bg, 0,
+                                                 offset_x, offset_y);
+  else
+    pattern = gimp_cairo_pattern_create_stipple (&normal_fg, &normal_bg, 0,
+                                                 offset_x, offset_y);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+}
+
+void
+gimp_canvas_set_sample_point_style (GtkWidget *canvas,
+                                    cairo_t   *cr,
+                                    gboolean   active)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+
+  if (active)
+    gimp_cairo_set_source_rgb (cr, &sample_point_active);
+  else
+    gimp_cairo_set_source_rgb (cr, &sample_point_normal);
+}
+
+void
+gimp_canvas_set_grid_style (GtkWidget *canvas,
+                            cairo_t   *cr,
+                            GimpGrid  *grid,
+                            gdouble    offset_x,
+                            gdouble    offset_y)
+{
+  GimpRGB fg;
+  GimpRGB bg;
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (GIMP_IS_GRID (grid));
+
+  cairo_set_line_width (cr, 1.0);
+
+  gimp_grid_get_fgcolor (grid, &fg);
+
+  switch (gimp_grid_get_style (grid))
+    {
+      cairo_pattern_t *pattern;
+
+    case GIMP_GRID_ON_OFF_DASH:
+    case GIMP_GRID_DOUBLE_DASH:
+      if (grid->style == GIMP_GRID_DOUBLE_DASH)
+        {
+          gimp_grid_get_bgcolor (grid, &bg);
+
+          pattern = gimp_cairo_pattern_create_stipple (&fg, &bg, 0,
+                                                       offset_x, offset_y);
+        }
+      else
+        {
+          gimp_rgba_set (&bg, 0.0, 0.0, 0.0, 0.0);
+
+          pattern = gimp_cairo_pattern_create_stipple (&fg, &bg, 0,
+                                                       offset_x, offset_y);
+        }
+
+      cairo_set_source (cr, pattern);
+      cairo_pattern_destroy (pattern);
+      break;
+
+    case GIMP_GRID_DOTS:
+    case GIMP_GRID_INTERSECTIONS:
+    case GIMP_GRID_SOLID:
+      gimp_cairo_set_source_rgb (cr, &fg);
+      break;
+    }
+}
+
+void
+gimp_canvas_set_pen_style (GtkWidget     *canvas,
+                           cairo_t       *cr,
+                           const GimpRGB *color,
+                           gint           width)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (color != NULL);
+
+  cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+  cairo_set_line_width (cr, width);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+
+  gimp_cairo_set_source_rgb (cr, color);
+}
+
+void
+gimp_canvas_set_layer_style (GtkWidget *canvas,
+                             cairo_t   *cr,
+                             GimpLayer *layer,
+                             gdouble    offset_x,
+                             gdouble    offset_y)
+{
+  cairo_pattern_t *pattern;
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (GIMP_IS_LAYER (layer));
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+
+  if (gimp_layer_get_mask (layer) &&
+      gimp_layer_get_edit_mask (layer))
+    {
+      pattern = gimp_cairo_pattern_create_stipple (&layer_mask_fg,
+                                                   &layer_mask_bg,
+                                                   0,
+                                                   offset_x, offset_y);
+    }
+  else if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+    {
+      pattern = gimp_cairo_pattern_create_stipple (&layer_group_fg,
+                                                   &layer_group_bg,
+                                                   0,
+                                                   offset_x, offset_y);
+    }
+  else
+    {
+      pattern = gimp_cairo_pattern_create_stipple (&layer_fg,
+                                                   &layer_bg,
+                                                   0,
+                                                   offset_x, offset_y);
+    }
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+}
+
+void
+gimp_canvas_set_canvas_style (GtkWidget *canvas,
+                              cairo_t   *cr,
+                              gdouble    offset_x,
+                              gdouble    offset_y)
+{
+  cairo_pattern_t *pattern;
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+
+  pattern = gimp_cairo_pattern_create_stipple (&canvas_fg,
+                                               &canvas_bg,
+                                               0,
+                                               offset_x, offset_y);
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+}
+
+void
+gimp_canvas_set_selection_out_style (GtkWidget *canvas,
+                                     cairo_t   *cr,
+                                     gdouble    offset_x,
+                                     gdouble    offset_y)
+{
+  cairo_pattern_t *pattern;
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+
+  pattern = gimp_cairo_pattern_create_stipple (&selection_out_fg,
+                                               &selection_out_bg,
+                                               0,
+                                               offset_x, offset_y);
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+}
+
+void
+gimp_canvas_set_selection_in_style (GtkWidget *canvas,
+                                    cairo_t   *cr,
+                                    gint       index,
+                                    gdouble    offset_x,
+                                    gdouble    offset_y)
+{
+  cairo_pattern_t *pattern;
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+
+  pattern = gimp_cairo_pattern_create_stipple (&selection_in_fg,
+                                               &selection_in_bg,
+                                               index,
+                                               offset_x, offset_y);
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+}
+
+void
+gimp_canvas_set_vectors_bg_style (GtkWidget *canvas,
+                                  cairo_t   *cr,
+                                  gboolean   active)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 3.0);
+
+  if (active)
+    gimp_cairo_set_source_rgba (cr, &vectors_active_bg);
+  else
+    gimp_cairo_set_source_rgba (cr, &vectors_normal_bg);
+}
+
+void
+gimp_canvas_set_vectors_fg_style (GtkWidget *canvas,
+                                  cairo_t   *cr,
+                                  gboolean   active)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+
+  if (active)
+    gimp_cairo_set_source_rgba (cr, &vectors_active_fg);
+  else
+    gimp_cairo_set_source_rgba (cr, &vectors_normal_fg);
+}
+
+void
+gimp_canvas_set_outline_bg_style (GtkWidget *canvas,
+                                  cairo_t   *cr)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+  gimp_cairo_set_source_rgba (cr, &outline_bg);
+}
+
+void
+gimp_canvas_set_outline_fg_style (GtkWidget *canvas,
+                                  cairo_t   *cr)
+{
+  static const double dashes[] = { 4.0, 4.0 };
+
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+  gimp_cairo_set_source_rgba (cr, &outline_fg);
+  cairo_set_dash (cr, dashes, G_N_ELEMENTS (dashes), 0);
+}
+
+void
+gimp_canvas_set_passe_partout_style (GtkWidget *canvas,
+                                     cairo_t   *cr)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  gimp_cairo_set_source_rgba (cr, &passe_partout);
+}
+
+void
+gimp_canvas_set_tool_bg_style (GtkWidget *canvas,
+                               cairo_t   *cr)
+{
+  g_return_if_fail (GTK_IS_WIDGET (canvas));
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 3.0);
+  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+
+  gimp_cairo_set_source_rgba (cr, &tool_bg);
+}
+
+void
+gimp_canvas_set_tool_fg_style (GtkWidget *canvas,
+                               cairo_t   *cr,
+                               gboolean   highlight)
+{
+  g_return_if_fail (cr != NULL);
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+
+  if (highlight)
+    gimp_cairo_set_source_rgba (cr, &tool_fg_highlight);
+  else
+    gimp_cairo_set_source_rgba (cr, &tool_fg);
+}
diff --git a/app/display/gimpcanvas-style.h b/app/display/gimpcanvas-style.h
new file mode 100644
index 0000000..3a37b98
--- /dev/null
+++ b/app/display/gimpcanvas-style.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdisplayshell-style.h
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_STYLE_H__
+#define __GIMP_CANVAS_STYLE_H__
+
+
+void   gimp_canvas_set_guide_style         (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            GimpGuideStyle style,
+                                            gboolean       active,
+                                            gdouble        offset_x,
+                                            gdouble        offset_y);
+void   gimp_canvas_set_sample_point_style  (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gboolean       active);
+void   gimp_canvas_set_grid_style          (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            GimpGrid      *grid,
+                                            gdouble        offset_x,
+                                            gdouble        offset_y);
+void   gimp_canvas_set_pen_style           (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            const GimpRGB *color,
+                                            gint           width);
+void   gimp_canvas_set_layer_style         (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            GimpLayer     *layer,
+                                            gdouble        offset_x,
+                                            gdouble        offset_y);
+void   gimp_canvas_set_canvas_style        (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gdouble        offset_x,
+                                            gdouble        offset_y);
+void   gimp_canvas_set_selection_out_style (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gdouble        offset_x,
+                                            gdouble        offset_y);
+void   gimp_canvas_set_selection_in_style  (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gint           index,
+                                            gdouble        offset_x,
+                                            gdouble        offset_y);
+void   gimp_canvas_set_vectors_bg_style    (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gboolean       active);
+void   gimp_canvas_set_vectors_fg_style    (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gboolean       active);
+void   gimp_canvas_set_outline_bg_style    (GtkWidget     *canvas,
+                                            cairo_t       *cr);
+void   gimp_canvas_set_outline_fg_style    (GtkWidget     *canvas,
+                                            cairo_t       *cr);
+void   gimp_canvas_set_passe_partout_style (GtkWidget     *canvas,
+                                            cairo_t       *cr);
+
+void   gimp_canvas_set_tool_bg_style       (GtkWidget     *canvas,
+                                            cairo_t       *cr);
+void   gimp_canvas_set_tool_fg_style       (GtkWidget     *canvas,
+                                            cairo_t       *cr,
+                                            gboolean       highlight);
+
+
+#endif /* __GIMP_CANVAS_STYLE_H__ */
diff --git a/app/display/gimpcanvas.c b/app/display/gimpcanvas.c
new file mode 100644
index 0000000..46b9ff5
--- /dev/null
+++ b/app/display/gimpcanvas.c
@@ -0,0 +1,298 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvas.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_BATCH_SIZE 32000
+
+
+enum
+{
+  PROP_0,
+  PROP_CONFIG
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_canvas_set_property    (GObject         *object,
+                                               guint            property_id,
+                                               const GValue    *value,
+                                               GParamSpec      *pspec);
+static void       gimp_canvas_get_property    (GObject         *object,
+                                               guint            property_id,
+                                               GValue          *value,
+                                               GParamSpec      *pspec);
+
+static void       gimp_canvas_unrealize       (GtkWidget       *widget);
+static void       gimp_canvas_style_set       (GtkWidget       *widget,
+                                               GtkStyle        *prev_style);
+static gboolean   gimp_canvas_focus_in_event  (GtkWidget       *widget,
+                                               GdkEventFocus   *event);
+static gboolean   gimp_canvas_focus_out_event (GtkWidget       *widget,
+                                               GdkEventFocus   *event);
+static gboolean   gimp_canvas_focus           (GtkWidget       *widget,
+                                               GtkDirectionType direction);
+
+
+G_DEFINE_TYPE (GimpCanvas, gimp_canvas, GIMP_TYPE_OVERLAY_BOX)
+
+#define parent_class gimp_canvas_parent_class
+
+
+static void
+gimp_canvas_class_init (GimpCanvasClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->set_property    = gimp_canvas_set_property;
+  object_class->get_property    = gimp_canvas_get_property;
+
+  widget_class->unrealize       = gimp_canvas_unrealize;
+  widget_class->style_set       = gimp_canvas_style_set;
+  widget_class->focus_in_event  = gimp_canvas_focus_in_event;
+  widget_class->focus_out_event = gimp_canvas_focus_out_event;
+  widget_class->focus           = gimp_canvas_focus;
+
+  g_object_class_install_property (object_class, PROP_CONFIG,
+                                   g_param_spec_object ("config", NULL, NULL,
+                                                        GIMP_TYPE_DISPLAY_CONFIG,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_canvas_init (GimpCanvas *canvas)
+{
+  GtkWidget *widget = GTK_WIDGET (canvas);
+
+  gtk_widget_set_can_focus (widget, TRUE);
+  gtk_widget_add_events (widget, GIMP_CANVAS_EVENT_MASK);
+  gtk_widget_set_extension_events (widget, GDK_EXTENSION_EVENTS_ALL);
+}
+
+static void
+gimp_canvas_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpCanvas *canvas = GIMP_CANVAS (object);
+
+  switch (property_id)
+    {
+    case PROP_CONFIG:
+      canvas->config = g_value_get_object (value); /* don't dup */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpCanvas *canvas = GIMP_CANVAS (object);
+
+  switch (property_id)
+    {
+    case PROP_CONFIG:
+      g_value_set_object (value, canvas->config);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_unrealize (GtkWidget *widget)
+{
+  GimpCanvas *canvas = GIMP_CANVAS (widget);
+
+  g_clear_object (&canvas->layout);
+
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+gimp_canvas_style_set (GtkWidget *widget,
+                       GtkStyle  *prev_style)
+{
+  GimpCanvas *canvas = GIMP_CANVAS (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  g_clear_object (&canvas->layout);
+}
+
+static gboolean
+gimp_canvas_focus_in_event (GtkWidget     *widget,
+                            GdkEventFocus *event)
+{
+  /*  don't allow the default impl to invalidate the whole widget,
+   *  we don't draw a focus indicator anyway.
+   */
+  return FALSE;
+}
+
+static gboolean
+gimp_canvas_focus_out_event (GtkWidget     *widget,
+                             GdkEventFocus *event)
+{
+  /*  see focus-in-event
+   */
+  return FALSE;
+}
+
+static gboolean
+gimp_canvas_focus (GtkWidget        *widget,
+                   GtkDirectionType  direction)
+{
+  GtkWidget *focus = gtk_container_get_focus_child (GTK_CONTAINER (widget));
+
+  /* override GtkContainer's focus() implementation which would always
+   * give focus to the canvas because it is focussable. Instead, try
+   * navigating in the focused overlay child first, and use
+   * GtkContainer's default implementation only if that fails (which
+   * happens when focus navigation leaves the overlay child).
+   */
+
+  if (focus && gtk_widget_child_focus (focus, direction))
+    return TRUE;
+
+  return GTK_WIDGET_CLASS (parent_class)->focus (widget, direction);
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_canvas_new:
+ *
+ * Creates a new #GimpCanvas widget.
+ *
+ * The #GimpCanvas widget is a #GtkDrawingArea abstraction. It manages
+ * a set of graphic contexts for drawing on a GIMP display. If you
+ * draw using a #GimpCanvasStyle, #GimpCanvas makes sure that the
+ * associated #GdkGC is created. All drawing on the canvas needs to
+ * happen by means of the #GimpCanvas drawing functions. Besides from
+ * not needing a #GdkGC pointer, the #GimpCanvas drawing functions
+ * look and work like their #GdkDrawable counterparts. #GimpCanvas
+ * gracefully handles attempts to draw on the unrealized widget.
+ *
+ * Return value: a new #GimpCanvas widget
+ **/
+GtkWidget *
+gimp_canvas_new (GimpDisplayConfig *config)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_CONFIG (config), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS,
+                       "name",   "gimp-canvas",
+                       "config", config,
+                       NULL);
+}
+
+/**
+ * gimp_canvas_get_layout:
+ * @canvas:  a #GimpCanvas widget
+ * @format:  a standard printf() format string.
+ * @Varargs: the parameters to insert into the format string.
+ *
+ * Returns a layout which can be used for
+ * pango_cairo_show_layout(). The layout belongs to the canvas and
+ * should not be freed, not should a pointer to it be kept around
+ * after drawing.
+ *
+ * Returns: a #PangoLayout owned by the canvas.
+ **/
+PangoLayout *
+gimp_canvas_get_layout (GimpCanvas  *canvas,
+                        const gchar *format,
+                        ...)
+{
+  va_list  args;
+  gchar   *text;
+
+  if (! canvas->layout)
+    canvas->layout = gtk_widget_create_pango_layout (GTK_WIDGET (canvas),
+                                                     NULL);
+
+  va_start (args, format);
+  text = g_strdup_vprintf (format, args);
+  va_end (args);
+
+  pango_layout_set_text (canvas->layout, text, -1);
+  g_free (text);
+
+  return canvas->layout;
+}
+
+/**
+ * gimp_canvas_set_bg_color:
+ * @canvas:   a #GimpCanvas widget
+ * @color:    a color in #GimpRGB format
+ *
+ * Sets the background color of the canvas's window.  This
+ * is the color the canvas is set to if it is cleared.
+ **/
+void
+gimp_canvas_set_bg_color (GimpCanvas *canvas,
+                          GimpRGB    *color)
+{
+  GtkWidget   *widget = GTK_WIDGET (canvas);
+  GdkColormap *colormap;
+  GdkColor     gdk_color;
+
+  if (! gtk_widget_get_realized (widget))
+    return;
+
+  gimp_rgb_get_gdk_color (color, &gdk_color);
+
+  colormap = gdk_drawable_get_colormap (gtk_widget_get_window (widget));
+  g_return_if_fail (colormap != NULL);
+  gdk_colormap_alloc_color (colormap, &gdk_color, FALSE, TRUE);
+
+  gdk_window_set_background (gtk_widget_get_window (widget), &gdk_color);
+
+  gtk_widget_queue_draw (GTK_WIDGET (canvas));
+}
diff --git a/app/display/gimpcanvas.h b/app/display/gimpcanvas.h
new file mode 100644
index 0000000..dc52be8
--- /dev/null
+++ b/app/display/gimpcanvas.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_H__
+#define __GIMP_CANVAS_H__
+
+
+#include "widgets/gimpoverlaybox.h"
+
+
+#define GIMP_CANVAS_EVENT_MASK (GDK_EXPOSURE_MASK            | \
+                                GDK_POINTER_MOTION_MASK      | \
+                                GDK_BUTTON_PRESS_MASK        | \
+                                GDK_BUTTON_RELEASE_MASK      | \
+                                GDK_STRUCTURE_MASK           | \
+                                GDK_ENTER_NOTIFY_MASK        | \
+                                GDK_LEAVE_NOTIFY_MASK        | \
+                                GDK_FOCUS_CHANGE_MASK        | \
+                                GDK_KEY_PRESS_MASK           | \
+                                GDK_KEY_RELEASE_MASK         | \
+                                GDK_PROXIMITY_OUT_MASK)
+
+
+#define GIMP_TYPE_CANVAS            (gimp_canvas_get_type ())
+#define GIMP_CANVAS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS, GimpCanvas))
+#define GIMP_CANVAS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS, GimpCanvasClass))
+#define GIMP_IS_CANVAS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS))
+#define GIMP_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS))
+#define GIMP_CANVAS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS, GimpCanvasClass))
+
+
+typedef struct _GimpCanvasClass GimpCanvasClass;
+
+struct _GimpCanvas
+{
+  GimpOverlayBox     parent_instance;
+
+  GimpDisplayConfig *config;
+  PangoLayout       *layout;
+};
+
+struct _GimpCanvasClass
+{
+  GimpOverlayBoxClass  parent_class;
+};
+
+
+GType         gimp_canvas_get_type     (void) G_GNUC_CONST;
+
+GtkWidget   * gimp_canvas_new          (GimpDisplayConfig *config);
+
+PangoLayout * gimp_canvas_get_layout   (GimpCanvas        *canvas,
+                                        const gchar       *format,
+                                        ...) G_GNUC_PRINTF (2, 3);
+
+void          gimp_canvas_set_bg_color (GimpCanvas        *canvas,
+                                        GimpRGB           *color);
+
+
+#endif /*  __GIMP_CANVAS_H__  */
diff --git a/app/display/gimpcanvasarc.c b/app/display/gimpcanvasarc.c
new file mode 100644
index 0000000..a4041b2
--- /dev/null
+++ b/app/display/gimpcanvasarc.c
@@ -0,0 +1,369 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasarc.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimpcanvasarc.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CENTER_X,
+  PROP_CENTER_Y,
+  PROP_RADIUS_X,
+  PROP_RADIUS_Y,
+  PROP_START_ANGLE,
+  PROP_SLICE_ANGLE,
+  PROP_FILLED
+};
+
+
+typedef struct _GimpCanvasArcPrivate GimpCanvasArcPrivate;
+
+struct _GimpCanvasArcPrivate
+{
+  gdouble  center_x;
+  gdouble  center_y;
+  gdouble  radius_x;
+  gdouble  radius_y;
+  gdouble  start_angle;
+  gdouble  slice_angle;
+  gboolean filled;
+};
+
+#define GET_PRIVATE(arc) \
+        ((GimpCanvasArcPrivate *) gimp_canvas_arc_get_instance_private ((GimpCanvasArc *) (arc)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_arc_set_property (GObject        *object,
+                                                      guint           property_id,
+                                                      const GValue   *value,
+                                                      GParamSpec     *pspec);
+static void             gimp_canvas_arc_get_property (GObject        *object,
+                                                      guint           property_id,
+                                                      GValue         *value,
+                                                      GParamSpec     *pspec);
+static void             gimp_canvas_arc_draw         (GimpCanvasItem *item,
+                                                      cairo_t        *cr);
+static cairo_region_t * gimp_canvas_arc_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasArc, gimp_canvas_arc,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_arc_parent_class
+
+
+static void
+gimp_canvas_arc_class_init (GimpCanvasArcClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_arc_set_property;
+  object_class->get_property = gimp_canvas_arc_get_property;
+
+  item_class->draw           = gimp_canvas_arc_draw;
+  item_class->get_extents    = gimp_canvas_arc_get_extents;
+
+  g_object_class_install_property (object_class, PROP_CENTER_X,
+                                   g_param_spec_double ("center-x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_CENTER_Y,
+                                   g_param_spec_double ("center-y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_RADIUS_X,
+                                   g_param_spec_double ("radius-x", NULL, NULL,
+                                                        0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_RADIUS_Y,
+                                   g_param_spec_double ("radius-y", NULL, NULL,
+                                                        0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_START_ANGLE,
+                                   g_param_spec_double ("start-angle", NULL, NULL,
+                                                        -1000, 1000, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SLICE_ANGLE,
+                                   g_param_spec_double ("slice-angle", NULL, NULL,
+                                                        -1000, 1000, 2 * G_PI,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_FILLED,
+                                   g_param_spec_boolean ("filled", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_arc_init (GimpCanvasArc *arc)
+{
+}
+
+static void
+gimp_canvas_arc_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpCanvasArcPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_CENTER_X:
+      private->center_x = g_value_get_double (value);
+      break;
+    case PROP_CENTER_Y:
+      private->center_y = g_value_get_double (value);
+      break;
+    case PROP_RADIUS_X:
+      private->radius_x = g_value_get_double (value);
+      break;
+    case PROP_RADIUS_Y:
+      private->radius_y = g_value_get_double (value);
+      break;
+    case PROP_START_ANGLE:
+      private->start_angle = g_value_get_double (value);
+      break;
+    case PROP_SLICE_ANGLE:
+      private->slice_angle = g_value_get_double (value);
+      break;
+    case PROP_FILLED:
+      private->filled = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_arc_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpCanvasArcPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_CENTER_X:
+      g_value_set_double (value, private->center_x);
+      break;
+    case PROP_CENTER_Y:
+      g_value_set_double (value, private->center_y);
+      break;
+    case PROP_RADIUS_X:
+      g_value_set_double (value, private->radius_x);
+      break;
+    case PROP_RADIUS_Y:
+      g_value_set_double (value, private->radius_y);
+      break;
+    case PROP_START_ANGLE:
+      g_value_set_double (value, private->start_angle);
+      break;
+    case PROP_SLICE_ANGLE:
+      g_value_set_double (value, private->slice_angle);
+      break;
+    case PROP_FILLED:
+      g_value_set_boolean (value, private->filled);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_arc_transform (GimpCanvasItem *item,
+                           gdouble        *center_x,
+                           gdouble        *center_y,
+                           gdouble        *radius_x,
+                           gdouble        *radius_y)
+{
+  GimpCanvasArcPrivate *private = GET_PRIVATE (item);
+  gdouble               x1, y1;
+  gdouble               x2, y2;
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->center_x - private->radius_x,
+                                   private->center_y - private->radius_y,
+                                   &x1, &y1);
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->center_x + private->radius_x,
+                                   private->center_y + private->radius_y,
+                                   &x2, &y2);
+
+  x1 = floor (x1);
+  y1 = floor (y1);
+  x2 = ceil (x2);
+  y2 = ceil (y2);
+
+  *center_x = (x1 + x2) / 2.0;
+  *center_y = (y1 + y2) / 2.0;
+
+  *radius_x = (x2 - x1) / 2.0;
+  *radius_y = (y2 - y1) / 2.0;
+
+  if (! private->filled)
+    {
+      *radius_x = MAX (*radius_x - 0.5, 0.0);
+      *radius_y = MAX (*radius_y - 0.5, 0.0);
+    }
+
+  /* avoid cairo_scale (cr, 0.0, 0.0) */
+  if (*radius_x == 0.0) *radius_x = 0.000001;
+  if (*radius_y == 0.0) *radius_y = 0.000001;
+}
+
+static void
+gimp_canvas_arc_draw (GimpCanvasItem *item,
+                      cairo_t        *cr)
+{
+  GimpCanvasArcPrivate *private = GET_PRIVATE (item);
+  gdouble               center_x, center_y;
+  gdouble               radius_x, radius_y;
+
+  gimp_canvas_arc_transform (item,
+                             &center_x, &center_y,
+                             &radius_x, &radius_y);
+
+  cairo_save (cr);
+  cairo_translate (cr, center_x, center_y);
+  cairo_scale (cr, radius_x, radius_y);
+  gimp_cairo_arc (cr, 0.0, 0.0, 1.0,
+                  private->start_angle, private->slice_angle);
+  cairo_restore (cr);
+
+  if (private->filled)
+    _gimp_canvas_item_fill (item, cr);
+  else
+    _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_arc_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasArcPrivate  *private = GET_PRIVATE (item);
+  cairo_region_t        *region;
+  cairo_rectangle_int_t  rectangle;
+  gdouble                center_x, center_y;
+  gdouble                radius_x, radius_y;
+
+  gimp_canvas_arc_transform (item,
+                             &center_x, &center_y,
+                             &radius_x, &radius_y);
+
+  rectangle.x      = floor (center_x - radius_x - 1.5);
+  rectangle.y      = floor (center_y - radius_y - 1.5);
+  rectangle.width  = ceil (center_x + radius_x + 1.5) - rectangle.x;
+  rectangle.height = ceil (center_y + radius_y + 1.5) - rectangle.y;
+
+  region = cairo_region_create_rectangle (&rectangle);
+
+  if (! private->filled &&
+      rectangle.width > 64 * 1.43 &&
+      rectangle.height > 64 * 1.43)
+    {
+      radius_x *= 0.7;
+      radius_y *= 0.7;
+
+      rectangle.x      = ceil (center_x - radius_x + 1.5);
+      rectangle.y      = ceil (center_y - radius_y + 1.5);
+      rectangle.width  = floor (center_x + radius_x - 1.5) - rectangle.x;
+      rectangle.height = floor (center_y + radius_y - 1.5) - rectangle.y;
+
+      cairo_region_subtract_rectangle (region, &rectangle);
+    }
+
+  return region;
+}
+
+GimpCanvasItem *
+gimp_canvas_arc_new (GimpDisplayShell *shell,
+                     gdouble          center_x,
+                     gdouble          center_y,
+                     gdouble          radius_x,
+                     gdouble          radius_y,
+                     gdouble          start_angle,
+                     gdouble          slice_angle,
+                     gboolean         filled)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_ARC,
+                       "shell",       shell,
+                       "center-x",    center_x,
+                       "center-y",    center_y,
+                       "radius-x",    radius_x,
+                       "radius-y",    radius_y,
+                       "start-angle", start_angle,
+                       "slice-angle", slice_angle,
+                       "filled",      filled,
+                       NULL);
+}
+
+void
+gimp_canvas_arc_set (GimpCanvasItem *arc,
+                     gdouble         center_x,
+                     gdouble         center_y,
+                     gdouble         radius_x,
+                     gdouble         radius_y,
+                     gdouble         start_angle,
+                     gdouble         slice_angle)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ARC (arc));
+
+  gimp_canvas_item_begin_change (arc);
+  g_object_set (arc,
+                "center-x",    center_x,
+                "center-y",    center_y,
+                "radius-x",    radius_x,
+                "radius-y",    radius_y,
+                "start-angle", start_angle,
+                "slice-angle", slice_angle,
+                NULL);
+  gimp_canvas_item_end_change (arc);
+}
diff --git a/app/display/gimpcanvasarc.h b/app/display/gimpcanvasarc.h
new file mode 100644
index 0000000..1896352
--- /dev/null
+++ b/app/display/gimpcanvasarc.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasarc.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_ARC_H__
+#define __GIMP_CANVAS_ARC_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_ARC            (gimp_canvas_arc_get_type ())
+#define GIMP_CANVAS_ARC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_ARC, GimpCanvasArc))
+#define GIMP_CANVAS_ARC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_ARC, GimpCanvasArcClass))
+#define GIMP_IS_CANVAS_ARC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_ARC))
+#define GIMP_IS_CANVAS_ARC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_ARC))
+#define GIMP_CANVAS_ARC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_ARC, GimpCanvasArcClass))
+
+
+typedef struct _GimpCanvasArc      GimpCanvasArc;
+typedef struct _GimpCanvasArcClass GimpCanvasArcClass;
+
+struct _GimpCanvasArc
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasArcClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_arc_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_arc_new      (GimpDisplayShell *shell,
+                                           gdouble          center_x,
+                                           gdouble          center_y,
+                                           gdouble          radius_x,
+                                           gdouble          radius_y,
+                                           gdouble          start_angle,
+                                           gdouble          slice_angle,
+                                           gboolean         filled);
+
+void             gimp_canvas_arc_set      (GimpCanvasItem  *arc,
+                                           gdouble          center_x,
+                                           gdouble          center_y,
+                                           gdouble          radius_x,
+                                           gdouble          radius_y,
+                                           gdouble          start_angle,
+                                           gdouble          slice_angle);
+
+#endif /* __GIMP_CANVAS_ARC_H__ */
diff --git a/app/display/gimpcanvasboundary.c b/app/display/gimpcanvasboundary.c
new file mode 100644
index 0000000..a6cab9d
--- /dev/null
+++ b/app/display/gimpcanvasboundary.c
@@ -0,0 +1,384 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasboundary.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+#include "core/gimp-transform-utils.h"
+#include "core/gimpboundary.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimpcanvasboundary.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SEGS,
+  PROP_TRANSFORM,
+  PROP_OFFSET_X,
+  PROP_OFFSET_Y
+};
+
+
+typedef struct _GimpCanvasBoundaryPrivate GimpCanvasBoundaryPrivate;
+
+struct _GimpCanvasBoundaryPrivate
+{
+  GimpBoundSeg *segs;
+  gint          n_segs;
+  GimpMatrix3  *transform;
+  gdouble       offset_x;
+  gdouble       offset_y;
+};
+
+#define GET_PRIVATE(boundary) \
+        ((GimpCanvasBoundaryPrivate *) gimp_canvas_boundary_get_instance_private ((GimpCanvasBoundary *) (boundary)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_boundary_finalize     (GObject        *object);
+static void             gimp_canvas_boundary_set_property (GObject        *object,
+                                                           guint           property_id,
+                                                           const GValue   *value,
+                                                           GParamSpec     *pspec);
+static void             gimp_canvas_boundary_get_property (GObject        *object,
+                                                           guint           property_id,
+                                                           GValue         *value,
+                                                           GParamSpec     *pspec);
+static void             gimp_canvas_boundary_draw         (GimpCanvasItem *item,
+                                                           cairo_t        *cr);
+static cairo_region_t * gimp_canvas_boundary_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasBoundary, gimp_canvas_boundary,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_boundary_parent_class
+
+
+static void
+gimp_canvas_boundary_class_init (GimpCanvasBoundaryClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_boundary_finalize;
+  object_class->set_property = gimp_canvas_boundary_set_property;
+  object_class->get_property = gimp_canvas_boundary_get_property;
+
+  item_class->draw           = gimp_canvas_boundary_draw;
+  item_class->get_extents    = gimp_canvas_boundary_get_extents;
+
+  g_object_class_install_property (object_class, PROP_SEGS,
+                                   gimp_param_spec_array ("segs", NULL, NULL,
+                                                          GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TRANSFORM,
+                                   g_param_spec_pointer ("transform", NULL, NULL,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_X,
+                                   g_param_spec_double ("offset-x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_Y,
+                                   g_param_spec_double ("offset-y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_boundary_init (GimpCanvasBoundary *boundary)
+{
+  gimp_canvas_item_set_line_cap (GIMP_CANVAS_ITEM (boundary),
+                                 CAIRO_LINE_CAP_SQUARE);
+}
+
+static void
+gimp_canvas_boundary_finalize (GObject *object)
+{
+  GimpCanvasBoundaryPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->segs, g_free);
+  private->n_segs = 0;
+
+  g_clear_pointer (&private->transform, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_boundary_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpCanvasBoundaryPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_SEGS:
+      break;
+
+    case PROP_TRANSFORM:
+      {
+        GimpMatrix3 *transform = g_value_get_pointer (value);
+        if (private->transform)
+          g_free (private->transform);
+        if (transform)
+          private->transform = g_memdup (transform, sizeof (GimpMatrix3));
+        else
+          private->transform = NULL;
+      }
+      break;
+
+    case PROP_OFFSET_X:
+      private->offset_x = g_value_get_double (value);
+      break;
+    case PROP_OFFSET_Y:
+      private->offset_y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_boundary_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpCanvasBoundaryPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_SEGS:
+      break;
+
+    case PROP_TRANSFORM:
+      g_value_set_pointer (value, private->transform);
+      break;
+
+    case PROP_OFFSET_X:
+      g_value_set_double (value, private->offset_x);
+      break;
+    case PROP_OFFSET_Y:
+      g_value_set_double (value, private->offset_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_boundary_transform (GimpCanvasItem *item,
+                                GimpSegment    *segs,
+                                gint           *n_segs)
+{
+  GimpCanvasBoundaryPrivate *private = GET_PRIVATE (item);
+  gint                       i;
+
+  if (private->transform)
+    {
+      gint n = 0;
+
+      for (i = 0; i < private->n_segs; i++)
+        {
+          GimpVector2 vertices[2];
+          GimpVector2 t_vertices[2];
+          gint        n_t_vertices;
+
+          vertices[0] = (GimpVector2) { private->segs[i].x1, private->segs[i].y1 };
+          vertices[1] = (GimpVector2) { private->segs[i].x2, private->segs[i].y2 };
+
+          gimp_transform_polygon (private->transform, vertices, 2, FALSE,
+                                  t_vertices, &n_t_vertices);
+
+          if (n_t_vertices == 2)
+            {
+              gimp_canvas_item_transform_xy (item,
+                                             t_vertices[0].x + private->offset_x,
+                                             t_vertices[0].y + private->offset_y,
+                                             &segs[n].x1, &segs[n].y1);
+              gimp_canvas_item_transform_xy (item,
+                                             t_vertices[1].x + private->offset_x,
+                                             t_vertices[1].y + private->offset_y,
+                                             &segs[n].x2, &segs[n].y2);
+
+              n++;
+            }
+        }
+
+      *n_segs = n;
+    }
+  else
+    {
+      for (i = 0; i < private->n_segs; i++)
+        {
+          gimp_canvas_item_transform_xy (item,
+                                         private->segs[i].x1 + private->offset_x,
+                                         private->segs[i].y1 + private->offset_y,
+                                         &segs[i].x1,
+                                         &segs[i].y1);
+          gimp_canvas_item_transform_xy (item,
+                                         private->segs[i].x2 + private->offset_x,
+                                         private->segs[i].y2 + private->offset_y,
+                                         &segs[i].x2,
+                                         &segs[i].y2);
+
+          /*  If this segment is a closing segment && the segments lie inside
+           *  the region, OR if this is an opening segment and the segments
+           *  lie outside the region...
+           *  we need to transform it by one display pixel
+           */
+          if (! private->segs[i].open)
+            {
+              /*  If it is vertical  */
+              if (segs[i].x1 == segs[i].x2)
+                {
+                  segs[i].x1 -= 1;
+                  segs[i].x2 -= 1;
+                }
+              else
+                {
+                  segs[i].y1 -= 1;
+                  segs[i].y2 -= 1;
+                }
+            }
+        }
+
+      *n_segs = private->n_segs;
+    }
+}
+
+static void
+gimp_canvas_boundary_draw (GimpCanvasItem *item,
+                           cairo_t        *cr)
+{
+  GimpCanvasBoundaryPrivate *private = GET_PRIVATE (item);
+  GimpSegment               *segs;
+  gint                       n_segs;
+
+  segs = g_new0 (GimpSegment, private->n_segs);
+
+  gimp_canvas_boundary_transform (item, segs, &n_segs);
+
+  gimp_cairo_segments (cr, segs, n_segs);
+
+  _gimp_canvas_item_stroke (item, cr);
+
+  g_free (segs);
+}
+
+static cairo_region_t *
+gimp_canvas_boundary_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasBoundaryPrivate *private = GET_PRIVATE (item);
+  cairo_rectangle_int_t      rectangle;
+  GimpSegment               *segs;
+  gint                       n_segs;
+  gint                       x1, y1, x2, y2;
+  gint                       i;
+
+  segs = g_new0 (GimpSegment, private->n_segs);
+
+  gimp_canvas_boundary_transform (item, segs, &n_segs);
+
+  if (n_segs == 0)
+    {
+      g_free (segs);
+
+      return cairo_region_create ();
+    }
+
+  x1 = MIN (segs[0].x1, segs[0].x2);
+  y1 = MIN (segs[0].y1, segs[0].y2);
+  x2 = MAX (segs[0].x1, segs[0].x2);
+  y2 = MAX (segs[0].y1, segs[0].y2);
+
+  for (i = 1; i < n_segs; i++)
+    {
+      gint x3 = MIN (segs[i].x1, segs[i].x2);
+      gint y3 = MIN (segs[i].y1, segs[i].y2);
+      gint x4 = MAX (segs[i].x1, segs[i].x2);
+      gint y4 = MAX (segs[i].y1, segs[i].y2);
+
+      x1 = MIN (x1, x3);
+      y1 = MIN (y1, y3);
+      x2 = MAX (x2, x4);
+      y2 = MAX (y2, y4);
+    }
+
+  g_free (segs);
+
+  rectangle.x      = x1 - 2;
+  rectangle.y      = y1 - 2;
+  rectangle.width  = x2 - x1 + 4;
+  rectangle.height = y2 - y1 + 4;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_boundary_new (GimpDisplayShell   *shell,
+                          const GimpBoundSeg *segs,
+                          gint                n_segs,
+                          GimpMatrix3        *transform,
+                          gdouble             offset_x,
+                          gdouble             offset_y)
+{
+  GimpCanvasItem            *item;
+  GimpCanvasBoundaryPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  item = g_object_new (GIMP_TYPE_CANVAS_BOUNDARY,
+                       "shell",     shell,
+                       "transform", transform,
+                       "offset-x",  offset_x,
+                       "offset-y",  offset_y,
+                       NULL);
+  private = GET_PRIVATE (item);
+
+  /* puke */
+  private->segs   = g_memdup (segs, n_segs * sizeof (GimpBoundSeg));
+  private->n_segs = n_segs;
+
+  return item;
+}
diff --git a/app/display/gimpcanvasboundary.h b/app/display/gimpcanvasboundary.h
new file mode 100644
index 0000000..527f89e
--- /dev/null
+++ b/app/display/gimpcanvasboundary.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program Copyright (C) 1995
+ * Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasboundary.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_BOUNDARY_H__
+#define __GIMP_CANVAS_BOUNDARY_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_BOUNDARY            (gimp_canvas_boundary_get_type ())
+#define GIMP_CANVAS_BOUNDARY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_BOUNDARY, GimpCanvasBoundary))
+#define GIMP_CANVAS_BOUNDARY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_BOUNDARY, GimpCanvasBoundaryClass))
+#define GIMP_IS_CANVAS_BOUNDARY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_BOUNDARY))
+#define GIMP_IS_CANVAS_BOUNDARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_BOUNDARY))
+#define GIMP_CANVAS_BOUNDARY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_BOUNDARY, GimpCanvasBoundaryClass))
+
+
+typedef struct _GimpCanvasBoundary      GimpCanvasBoundary;
+typedef struct _GimpCanvasBoundaryClass GimpCanvasBoundaryClass;
+
+struct _GimpCanvasBoundary
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasBoundaryClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_boundary_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_boundary_new      (GimpDisplayShell   *shell,
+                                                const GimpBoundSeg *segs,
+                                                gint                n_segs,
+                                                GimpMatrix3        *transform,
+                                                gdouble             offset_x,
+                                                gdouble             offset_y);
+
+
+#endif /* __GIMP_CANVAS_BOUNDARY_H__ */
diff --git a/app/display/gimpcanvasbufferpreview.c b/app/display/gimpcanvasbufferpreview.c
new file mode 100644
index 0000000..858bab6
--- /dev/null
+++ b/app/display/gimpcanvasbufferpreview.c
@@ -0,0 +1,263 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasbufferpreview.c
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <cairo/cairo.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display/display-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvasbufferpreview.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scroll.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_BUFFER
+};
+
+
+typedef struct _GimpCanvasBufferPreviewPrivate GimpCanvasBufferPreviewPrivate;
+
+struct _GimpCanvasBufferPreviewPrivate
+{
+  GeglBuffer *buffer;
+};
+
+
+#define GET_PRIVATE(transform_preview) \
+        ((GimpCanvasBufferPreviewPrivate *) gimp_canvas_buffer_preview_get_instance_private ((GimpCanvasBufferPreview *) (transform_preview)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_buffer_preview_dispose        (GObject               *object);
+static void             gimp_canvas_buffer_preview_set_property   (GObject               *object,
+                                                                   guint                  property_id,
+                                                                   const GValue          *value,
+                                                                   GParamSpec            *pspec);
+static void             gimp_canvas_buffer_preview_get_property   (GObject               *object,
+                                                                   guint                  property_id,
+                                                                   GValue                *value,
+                                                                   GParamSpec            *pspec);
+
+static void             gimp_canvas_buffer_preview_draw           (GimpCanvasItem        *item,
+                                                                   cairo_t               *cr);
+static cairo_region_t * gimp_canvas_buffer_preview_get_extents    (GimpCanvasItem        *item);
+static void             gimp_canvas_buffer_preview_compute_bounds (GimpCanvasItem        *item,
+                                                                   cairo_rectangle_int_t *bounds);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasBufferPreview, gimp_canvas_buffer_preview,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_buffer_preview_parent_class
+
+
+static void
+gimp_canvas_buffer_preview_class_init (GimpCanvasBufferPreviewClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->dispose      = gimp_canvas_buffer_preview_dispose;
+  object_class->set_property = gimp_canvas_buffer_preview_set_property;
+  object_class->get_property = gimp_canvas_buffer_preview_get_property;
+
+  item_class->draw           = gimp_canvas_buffer_preview_draw;
+  item_class->get_extents    = gimp_canvas_buffer_preview_get_extents;
+
+  g_object_class_install_property (object_class, PROP_BUFFER,
+                                   g_param_spec_object ("buffer",
+                                                        NULL, NULL,
+                                                        GEGL_TYPE_BUFFER,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_buffer_preview_init (GimpCanvasBufferPreview *transform_preview)
+{
+}
+
+static void
+gimp_canvas_buffer_preview_dispose (GObject *object)
+{
+  GimpCanvasBufferPreviewPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->buffer);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_canvas_buffer_preview_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpCanvasBufferPreviewPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      g_set_object (&private->buffer, g_value_get_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_buffer_preview_get_property (GObject    *object,
+                                         guint       property_id,
+                                         GValue     *value,
+                                         GParamSpec *pspec)
+{
+  GimpCanvasBufferPreviewPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      g_value_set_object (value, private->buffer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_buffer_preview_draw (GimpCanvasItem *item,
+                                 cairo_t        *cr)
+{
+  GimpDisplayShell      *shell  = gimp_canvas_item_get_shell (item);
+  GeglBuffer            *buffer = GET_PRIVATE (item)->buffer;
+  cairo_surface_t       *area;
+  guchar                *data;
+  cairo_rectangle_int_t  rectangle;
+
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  gimp_canvas_buffer_preview_compute_bounds (item, &rectangle);
+
+  area = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                     rectangle.width,
+                                     rectangle.height);
+
+  data = cairo_image_surface_get_data (area);
+  gegl_buffer_get (buffer,
+                   GEGL_RECTANGLE (rectangle.x + shell->offset_x,
+                                   rectangle.y + shell->offset_y,
+                                   rectangle.width,
+                                   rectangle.height),
+                   shell->scale_x,
+                   babl_format ("cairo-ARGB32"),
+                   data,
+                   cairo_image_surface_get_stride (area),
+                   GEGL_ABYSS_NONE);
+
+  cairo_surface_flush (area);
+  cairo_surface_mark_dirty (area);
+
+  cairo_set_source_surface (cr, area, rectangle.x, rectangle.y);
+  cairo_rectangle (cr,
+                   rectangle.x, rectangle.y,
+                   rectangle.width, rectangle.height);
+  cairo_fill (cr);
+
+  cairo_surface_destroy (area);
+}
+
+static void
+gimp_canvas_buffer_preview_compute_bounds (GimpCanvasItem        *item,
+                                           cairo_rectangle_int_t *bounds)
+{
+  GimpDisplayShell *shell  = gimp_canvas_item_get_shell (item);
+  GeglBuffer       *buffer = GET_PRIVATE (item)->buffer;
+  GeglRectangle     extent;
+  gdouble           x1, y1;
+  gdouble           x2, y2;
+
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  extent = *gegl_buffer_get_extent (buffer);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   extent.x,
+                                   extent.y,
+                                   &x1, &y1);
+  gimp_canvas_item_transform_xy_f (item,
+                                   extent.x + extent.width,
+                                   extent.y + extent.height,
+                                   &x2, &y2);
+
+  extent.x      = floor (x1);
+  extent.y      = floor (y1);
+  extent.width  = ceil  (x2) - extent.x;
+  extent.height = ceil  (y2) - extent.y;
+
+  gegl_rectangle_intersect (&extent,
+                            &extent,
+                            GEGL_RECTANGLE (0,
+                                            0,
+                                            shell->disp_width,
+                                            shell->disp_height));
+
+  bounds->x      = extent.x;
+  bounds->y      = extent.y;
+  bounds->width  = extent.width;
+  bounds->height = extent.height;
+}
+
+static cairo_region_t *
+gimp_canvas_buffer_preview_get_extents (GimpCanvasItem *item)
+{
+  cairo_rectangle_int_t rectangle;
+
+  gimp_canvas_buffer_preview_compute_bounds (item, &rectangle);
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_buffer_preview_new (GimpDisplayShell  *shell,
+                                GeglBuffer        *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_BUFFER_PREVIEW,
+                       "shell",       shell,
+                       "buffer",      buffer,
+                       NULL);
+}
diff --git a/app/display/gimpcanvasbufferpreview.h b/app/display/gimpcanvasbufferpreview.h
new file mode 100644
index 0000000..28d8806
--- /dev/null
+++ b/app/display/gimpcanvasbufferpreview.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasbufferpreview.h
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_BUFFER_PREVIEW_H__
+#define __GIMP_CANVAS_BUFFER_PREVIEW_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_BUFFER_PREVIEW            (gimp_canvas_buffer_preview_get_type ())
+#define GIMP_CANVAS_BUFFER_PREVIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_BUFFER_PREVIEW, GimpCanvasBufferPreview))
+#define GIMP_CANVAS_BUFFER_PREVIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_BUFFER_PREVIEW, GimpCanvasBufferPreviewClass))
+#define GIMP_IS_CANVAS_BUFFER_PREVIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_BUFFER_PREVIEW))
+#define GIMP_IS_CANVAS_BUFFER_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_BUFFER_PREVIEW))
+#define GIMP_CANVAS_BUFFER_PREVIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_BUFFER_PREVIEW, GimpCanvasBufferPreviewClass))
+
+
+typedef struct _GimpCanvasBufferPreview      GimpCanvasBufferPreview;
+typedef struct _GimpCanvasBufferPreviewClass GimpCanvasBufferPreviewClass;
+
+struct _GimpCanvasBufferPreview
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasBufferPreviewClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_buffer_preview_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_buffer_preview_new      (GimpDisplayShell  *shell,
+                                                      GeglBuffer        *buffer);
+
+
+#endif /* __GIMP_CANVAS_BUFFER_PREVIEW_H__ */
diff --git a/app/display/gimpcanvascanvasboundary.c b/app/display/gimpcanvascanvasboundary.c
new file mode 100644
index 0000000..01ac5a3
--- /dev/null
+++ b/app/display/gimpcanvascanvasboundary.c
@@ -0,0 +1,270 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvascanvasboundary.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvascanvasboundary.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE
+};
+
+
+typedef struct _GimpCanvasCanvasBoundaryPrivate GimpCanvasCanvasBoundaryPrivate;
+
+struct _GimpCanvasCanvasBoundaryPrivate
+{
+  GimpImage *image;
+};
+
+#define GET_PRIVATE(canvas_boundary) \
+        ((GimpCanvasCanvasBoundaryPrivate *) gimp_canvas_canvas_boundary_get_instance_private ((GimpCanvasCanvasBoundary *) (canvas_boundary)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_canvas_boundary_set_property (GObject        *object,
+                                                                  guint           property_id,
+                                                                  const GValue   *value,
+                                                                  GParamSpec     *pspec);
+static void             gimp_canvas_canvas_boundary_get_property (GObject        *object,
+                                                                  guint           property_id,
+                                                                  GValue         *value,
+                                                                  GParamSpec     *pspec);
+static void             gimp_canvas_canvas_boundary_finalize     (GObject        *object);
+static void             gimp_canvas_canvas_boundary_draw         (GimpCanvasItem *item,
+                                                                  cairo_t        *cr);
+static cairo_region_t * gimp_canvas_canvas_boundary_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_canvas_boundary_stroke       (GimpCanvasItem *item,
+                                                                  cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasCanvasBoundary, gimp_canvas_canvas_boundary,
+                            GIMP_TYPE_CANVAS_RECTANGLE)
+
+#define parent_class gimp_canvas_canvas_boundary_parent_class
+
+
+static void
+gimp_canvas_canvas_boundary_class_init (GimpCanvasCanvasBoundaryClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_canvas_boundary_set_property;
+  object_class->get_property = gimp_canvas_canvas_boundary_get_property;
+  object_class->finalize     = gimp_canvas_canvas_boundary_finalize;
+
+  item_class->draw           = gimp_canvas_canvas_boundary_draw;
+  item_class->get_extents    = gimp_canvas_canvas_boundary_get_extents;
+  item_class->stroke         = gimp_canvas_canvas_boundary_stroke;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image", NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_canvas_boundary_init (GimpCanvasCanvasBoundary *canvas_boundary)
+{
+}
+
+static void
+gimp_canvas_canvas_boundary_finalize (GObject *object)
+{
+  GimpCanvasCanvasBoundaryPrivate *private = GET_PRIVATE (object);
+
+  if (private->image)
+    g_object_remove_weak_pointer (G_OBJECT (private->image),
+                                  (gpointer) &private->image);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_canvas_boundary_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpCanvasCanvasBoundaryPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      if (private->image)
+        g_object_remove_weak_pointer (G_OBJECT (private->image),
+                                      (gpointer) &private->image);
+      private->image = g_value_get_object (value); /* don't ref */
+      if (private->image)
+        g_object_add_weak_pointer (G_OBJECT (private->image),
+                                   (gpointer) &private->image);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_canvas_boundary_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpCanvasCanvasBoundaryPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, private->image);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_canvas_boundary_draw (GimpCanvasItem *item,
+                                  cairo_t        *cr)
+{
+  GimpCanvasCanvasBoundaryPrivate *private = GET_PRIVATE (item);
+
+  if (private->image)
+    GIMP_CANVAS_ITEM_CLASS (parent_class)->draw (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_canvas_boundary_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasCanvasBoundaryPrivate *private = GET_PRIVATE (item);
+
+  if (private->image)
+    return GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item);
+
+  return NULL;
+}
+
+static void
+gimp_canvas_canvas_boundary_stroke (GimpCanvasItem *item,
+                                    cairo_t        *cr)
+{
+  GimpDisplayShell *shell = gimp_canvas_item_get_shell (item);
+
+  gimp_canvas_set_canvas_style (gimp_canvas_item_get_canvas (item), cr,
+                                shell->offset_x, shell->offset_y);
+  cairo_stroke (cr);
+}
+
+GimpCanvasItem *
+gimp_canvas_canvas_boundary_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_CANVAS_BOUNDARY,
+                       "shell", shell,
+                       NULL);
+}
+
+void
+gimp_canvas_canvas_boundary_set_image (GimpCanvasCanvasBoundary *boundary,
+                                       GimpImage                *image)
+{
+  GimpCanvasCanvasBoundaryPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_CANVAS_BOUNDARY (boundary));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  private = GET_PRIVATE (boundary);
+
+  if (image != private->image)
+    {
+      gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary));
+
+      if (image)
+        {
+          g_object_set (boundary,
+                        "x",      (gdouble) 0,
+                        "y",      (gdouble) 0,
+                        "width",  (gdouble) gimp_image_get_width  (image),
+                        "height", (gdouble) gimp_image_get_height (image),
+                        NULL);
+        }
+
+      g_object_set (boundary,
+                    "image", image,
+                    NULL);
+
+      gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary));
+    }
+  else if (image && image == private->image)
+    {
+      gint    lx, ly, lw, lh;
+      gdouble x, y, w ,h;
+
+      lx = 0;
+      ly = 0;
+      lw = gimp_image_get_width  (image);
+      lh = gimp_image_get_height (image);
+
+      g_object_get (boundary,
+                    "x",      &x,
+                    "y",      &y,
+                    "width",  &w,
+                    "height", &h,
+                    NULL);
+
+      if (lx != (gint) x ||
+          ly != (gint) y ||
+          lw != (gint) w ||
+          lh != (gint) h)
+        {
+          gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary));
+
+          g_object_set (boundary,
+                        "x",      (gdouble) lx,
+                        "y",      (gdouble) ly,
+                        "width",  (gdouble) lw,
+                        "height", (gdouble) lh,
+                        NULL);
+
+          gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary));
+        }
+    }
+}
diff --git a/app/display/gimpcanvascanvasboundary.h b/app/display/gimpcanvascanvasboundary.h
new file mode 100644
index 0000000..c8fe16f
--- /dev/null
+++ b/app/display/gimpcanvascanvasboundary.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvascanvasvboundary.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_CANVAS_BOUNDARY_H__
+#define __GIMP_CANVAS_CANVAS_BOUNDARY_H__
+
+
+#include "gimpcanvasrectangle.h"
+
+
+#define GIMP_TYPE_CANVAS_CANVAS_BOUNDARY            (gimp_canvas_canvas_boundary_get_type ())
+#define GIMP_CANVAS_CANVAS_BOUNDARY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_CANVAS_BOUNDARY, GimpCanvasCanvasBoundary))
+#define GIMP_CANVAS_CANVAS_BOUNDARY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_CANVAS_BOUNDARY, GimpCanvasCanvasBoundaryClass))
+#define GIMP_IS_CANVAS_CANVAS_BOUNDARY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_CANVAS_BOUNDARY))
+#define GIMP_IS_CANVAS_CANVAS_BOUNDARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_CANVAS_BOUNDARY))
+#define GIMP_CANVAS_CANVAS_BOUNDARY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_CANVAS_BOUNDARY, GimpCanvasCanvasBoundaryClass))
+
+
+typedef struct _GimpCanvasCanvasBoundary      GimpCanvasCanvasBoundary;
+typedef struct _GimpCanvasCanvasBoundaryClass GimpCanvasCanvasBoundaryClass;
+
+struct _GimpCanvasCanvasBoundary
+{
+  GimpCanvasRectangle  parent_instance;
+};
+
+struct _GimpCanvasCanvasBoundaryClass
+{
+  GimpCanvasRectangleClass  parent_class;
+};
+
+
+GType            gimp_canvas_canvas_boundary_get_type  (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_canvas_boundary_new       (GimpDisplayShell        *shell);
+
+void             gimp_canvas_canvas_boundary_set_image (GimpCanvasCanvasBoundary *boundary,
+                                                        GimpImage                *image);
+
+
+#endif /* __GIMP_CANVAS_CANVAS_BOUNDARY_H__ */
diff --git a/app/display/gimpcanvascorner.c b/app/display/gimpcanvascorner.c
new file mode 100644
index 0000000..50aebfb
--- /dev/null
+++ b/app/display/gimpcanvascorner.c
@@ -0,0 +1,468 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvascorner.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvascorner.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_ANCHOR,
+  PROP_CORNER_WIDTH,
+  PROP_CORNER_HEIGHT,
+  PROP_OUTSIDE
+};
+
+
+typedef struct _GimpCanvasCornerPrivate GimpCanvasCornerPrivate;
+
+struct _GimpCanvasCornerPrivate
+{
+  gdouble          x;
+  gdouble          y;
+  gdouble          width;
+  gdouble          height;
+  GimpHandleAnchor anchor;
+  gint             corner_width;
+  gint             corner_height;
+  gboolean         outside;
+};
+
+#define GET_PRIVATE(corner) \
+        ((GimpCanvasCornerPrivate *) gimp_canvas_corner_get_instance_private ((GimpCanvasCorner *) (corner)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_corner_set_property (GObject        *object,
+                                                         guint           property_id,
+                                                         const GValue   *value,
+                                                         GParamSpec     *pspec);
+static void             gimp_canvas_corner_get_property (GObject        *object,
+                                                         guint           property_id,
+                                                         GValue         *value,
+                                                         GParamSpec     *pspec);
+static void             gimp_canvas_corner_draw         (GimpCanvasItem *item,
+                                                         cairo_t        *cr);
+static cairo_region_t * gimp_canvas_corner_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasCorner, gimp_canvas_corner,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_corner_parent_class
+
+
+static void
+gimp_canvas_corner_class_init (GimpCanvasCornerClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_corner_set_property;
+  object_class->get_property = gimp_canvas_corner_get_property;
+
+  item_class->draw           = gimp_canvas_corner_draw;
+  item_class->get_extents    = gimp_canvas_corner_get_extents;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_double ("width", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_double ("height", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ANCHOR,
+                                   g_param_spec_enum ("anchor", NULL, NULL,
+                                                      GIMP_TYPE_HANDLE_ANCHOR,
+                                                      GIMP_HANDLE_ANCHOR_CENTER,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_CORNER_WIDTH,
+                                   g_param_spec_int ("corner-width", NULL, NULL,
+                                                     3, GIMP_MAX_IMAGE_SIZE, 3,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_CORNER_HEIGHT,
+                                   g_param_spec_int ("corner-height", NULL, NULL,
+                                                     3, GIMP_MAX_IMAGE_SIZE, 3,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_OUTSIDE,
+                                   g_param_spec_boolean ("outside", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_corner_init (GimpCanvasCorner *corner)
+{
+}
+
+static void
+gimp_canvas_corner_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpCanvasCornerPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_double (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_double (value);
+      break;
+    case PROP_ANCHOR:
+      private->anchor = g_value_get_enum (value);
+      break;
+    case PROP_CORNER_WIDTH:
+      private->corner_width = g_value_get_int (value);
+      break;
+    case PROP_CORNER_HEIGHT:
+      private->corner_height = g_value_get_int (value);
+      break;
+   case PROP_OUTSIDE:
+      private->outside = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_corner_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpCanvasCornerPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_double (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_double (value, private->height);
+      break;
+    case PROP_ANCHOR:
+      g_value_set_enum (value, private->anchor);
+      break;
+    case PROP_CORNER_WIDTH:
+      g_value_set_int (value, private->corner_width);
+      break;
+    case PROP_CORNER_HEIGHT:
+      g_value_set_int (value, private->corner_height);
+      break;
+    case PROP_OUTSIDE:
+      g_value_set_boolean (value, private->outside);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_corner_transform (GimpCanvasItem *item,
+                              gdouble        *x,
+                              gdouble        *y,
+                              gdouble        *w,
+                              gdouble        *h)
+{
+  GimpCanvasCornerPrivate *private = GET_PRIVATE (item);
+  gdouble                  rx, ry;
+  gdouble                  rw, rh;
+  gint                     top_and_bottom_handle_x_offset;
+  gint                     left_and_right_handle_y_offset;
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   MIN (private->x,
+                                        private->x + private->width),
+                                   MIN (private->y,
+                                        private->y + private->height),
+                                   &rx, &ry);
+  gimp_canvas_item_transform_xy_f (item,
+                                   MAX (private->x,
+                                        private->x + private->width),
+                                   MAX (private->y,
+                                        private->y + private->height),
+                                   &rw, &rh);
+
+  rw -= rx;
+  rh -= ry;
+
+  rx = floor (rx) + 0.5;
+  ry = floor (ry) + 0.5;
+  rw = ceil (rw) - 1.0;
+  rh = ceil (rh) - 1.0;
+
+  top_and_bottom_handle_x_offset = (rw - private->corner_width)  / 2;
+  left_and_right_handle_y_offset = (rh - private->corner_height) / 2;
+
+  *w = private->corner_width;
+  *h = private->corner_height;
+
+  switch (private->anchor)
+    {
+    case GIMP_HANDLE_ANCHOR_CENTER:
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_WEST:
+      if (private->outside)
+        {
+          *x = rx - private->corner_width;
+          *y = ry - private->corner_height;
+        }
+      else
+        {
+          *x = rx;
+          *y = ry;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_EAST:
+      if (private->outside)
+        {
+          *x = rx + rw;
+          *y = ry - private->corner_height;
+        }
+      else
+        {
+          *x = rx + rw - private->corner_width;
+          *y = ry;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_WEST:
+      if (private->outside)
+        {
+          *x = rx - private->corner_width;
+          *y = ry + rh;
+        }
+      else
+        {
+          *x = rx;
+          *y = ry + rh - private->corner_height;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_EAST:
+      if (private->outside)
+        {
+          *x = rx + rw;
+          *y = ry + rh;
+        }
+      else
+        {
+          *x = rx + rw - private->corner_width;
+          *y = ry + rh - private->corner_height;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH:
+      if (private->outside)
+        {
+          *x = rx;
+          *y = ry - private->corner_height;
+          *w = rw;
+        }
+      else
+        {
+          *x = rx + top_and_bottom_handle_x_offset;
+          *y = ry;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH:
+      if (private->outside)
+        {
+          *x = rx;
+          *y = ry + rh;
+          *w = rw;
+        }
+      else
+        {
+          *x = rx + top_and_bottom_handle_x_offset;
+          *y = ry + rh - private->corner_height;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_WEST:
+      if (private->outside)
+        {
+          *x = rx - private->corner_width;
+          *y = ry;
+          *h = rh;
+        }
+      else
+        {
+          *x = rx;
+          *y = ry + left_and_right_handle_y_offset;
+        }
+      break;
+
+    case GIMP_HANDLE_ANCHOR_EAST:
+      if (private->outside)
+        {
+          *x = rx + rw;
+          *y = ry;
+          *h = rh;
+        }
+      else
+        {
+          *x = rx + rw - private->corner_width;
+          *y = ry + left_and_right_handle_y_offset;
+        }
+      break;
+    }
+}
+
+static void
+gimp_canvas_corner_draw (GimpCanvasItem *item,
+                         cairo_t        *cr)
+{
+  gdouble x, y;
+  gdouble w, h;
+
+  gimp_canvas_corner_transform (item, &x, &y, &w, &h);
+
+  cairo_rectangle (cr, x, y, w, h);
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_corner_get_extents (GimpCanvasItem *item)
+{
+  cairo_rectangle_int_t rectangle;
+  gdouble               x, y;
+  gdouble               w, h;
+
+  gimp_canvas_corner_transform (item, &x, &y, &w, &h);
+
+  rectangle.x      = floor (x - 1.5);
+  rectangle.y      = floor (y - 1.5);
+  rectangle.width  = ceil (w + 3.0);
+  rectangle.height = ceil (h + 3.0);
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_corner_new (GimpDisplayShell *shell,
+                        gdouble           x,
+                        gdouble           y,
+                        gdouble           width,
+                        gdouble           height,
+                        GimpHandleAnchor  anchor,
+                        gint              corner_width,
+                        gint              corner_height,
+                        gboolean          outside)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_CORNER,
+                       "shell",         shell,
+                       "x",             x,
+                       "y",             y,
+                       "width",         width,
+                       "height",        height,
+                       "anchor",        anchor,
+                       "corner-width",  corner_width,
+                       "corner-height", corner_height,
+                       "outside",       outside,
+                       NULL);
+}
+
+void
+gimp_canvas_corner_set (GimpCanvasItem *corner,
+                        gdouble         x,
+                        gdouble         y,
+                        gdouble         width,
+                        gdouble         height,
+                        gint            corner_width,
+                        gint            corner_height,
+                        gboolean        outside)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_CORNER (corner));
+
+  gimp_canvas_item_begin_change (corner);
+  g_object_set (corner,
+                "x",             x,
+                "y",             y,
+                "width",         width,
+                "height",        height,
+                "corner-width",  corner_width,
+                "corner-height", corner_height,
+                "outside",       outside,
+                NULL);
+  gimp_canvas_item_end_change (corner);
+}
diff --git a/app/display/gimpcanvascorner.h b/app/display/gimpcanvascorner.h
new file mode 100644
index 0000000..47cc53b
--- /dev/null
+++ b/app/display/gimpcanvascorner.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvascorner.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_CORNER_H__
+#define __GIMP_CANVAS_CORNER_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_CORNER            (gimp_canvas_corner_get_type ())
+#define GIMP_CANVAS_CORNER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_CORNER, GimpCanvasCorner))
+#define GIMP_CANVAS_CORNER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_CORNER, GimpCanvasCornerClass))
+#define GIMP_IS_CANVAS_CORNER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_CORNER))
+#define GIMP_IS_CANVAS_CORNER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_CORNER))
+#define GIMP_CANVAS_CORNER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_CORNER, GimpCanvasCornerClass))
+
+
+typedef struct _GimpCanvasCorner      GimpCanvasCorner;
+typedef struct _GimpCanvasCornerClass GimpCanvasCornerClass;
+
+struct _GimpCanvasCorner
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasCornerClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_corner_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_corner_new      (GimpDisplayShell *shell,
+                                              gdouble           x,
+                                              gdouble           y,
+                                              gdouble           width,
+                                              gdouble           height,
+                                              GimpHandleAnchor  anchor,
+                                              gint              corner_width,
+                                              gint              corner_height,
+                                              gboolean          outside);
+
+void             gimp_canvas_corner_set      (GimpCanvasItem   *corner,
+                                              gdouble           x,
+                                              gdouble           y,
+                                              gdouble           width,
+                                              gdouble           height,
+                                              gint              corner_width,
+                                              gint              corner_height,
+                                              gboolean          outside);
+
+
+#endif /* __GIMP_CANVAS_CORNER_H__ */
diff --git a/app/display/gimpcanvascursor.c b/app/display/gimpcanvascursor.c
new file mode 100644
index 0000000..581fa76
--- /dev/null
+++ b/app/display/gimpcanvascursor.c
@@ -0,0 +1,228 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvascursor.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimpcanvascursor.h"
+#include "gimpdisplayshell.h"
+
+
+#define GIMP_CURSOR_SIZE 7
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y
+};
+
+
+typedef struct _GimpCanvasCursorPrivate GimpCanvasCursorPrivate;
+
+struct _GimpCanvasCursorPrivate
+{
+  gdouble x;
+  gdouble y;
+};
+
+#define GET_PRIVATE(cursor) \
+        ((GimpCanvasCursorPrivate *) gimp_canvas_cursor_get_instance_private ((GimpCanvasCursor *) (cursor)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_cursor_set_property (GObject        *object,
+                                                         guint           property_id,
+                                                         const GValue   *value,
+                                                         GParamSpec     *pspec);
+static void             gimp_canvas_cursor_get_property (GObject        *object,
+                                                         guint           property_id,
+                                                         GValue         *value,
+                                                         GParamSpec     *pspec);
+static void             gimp_canvas_cursor_draw         (GimpCanvasItem *item,
+                                                         cairo_t        *cr);
+static cairo_region_t * gimp_canvas_cursor_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasCursor, gimp_canvas_cursor,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_cursor_parent_class
+
+
+static void
+gimp_canvas_cursor_class_init (GimpCanvasCursorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_cursor_set_property;
+  object_class->get_property = gimp_canvas_cursor_get_property;
+
+  item_class->draw           = gimp_canvas_cursor_draw;
+  item_class->get_extents    = gimp_canvas_cursor_get_extents;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_cursor_init (GimpCanvasCursor *cursor)
+{
+  gimp_canvas_item_set_line_cap (GIMP_CANVAS_ITEM (cursor),
+                                 CAIRO_LINE_CAP_SQUARE);
+}
+
+static void
+gimp_canvas_cursor_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpCanvasCursorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_cursor_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpCanvasCursorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_cursor_draw (GimpCanvasItem *item,
+                         cairo_t        *cr)
+{
+  GimpCanvasCursorPrivate *private = GET_PRIVATE (item);
+  gdouble                  x, y;
+
+  x = floor (private->x) + 0.5;
+  y = floor (private->y) + 0.5;
+
+  cairo_move_to (cr, x - GIMP_CURSOR_SIZE, y);
+  cairo_line_to (cr, x + GIMP_CURSOR_SIZE, y);
+
+  cairo_move_to (cr, x, y - GIMP_CURSOR_SIZE);
+  cairo_line_to (cr, x, y + GIMP_CURSOR_SIZE);
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_cursor_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasCursorPrivate *private = GET_PRIVATE (item);
+  cairo_rectangle_int_t    rectangle;
+  gdouble                  x, y;
+
+  x = floor (private->x) + 0.5;
+  y = floor (private->y) + 0.5;
+
+  rectangle.x      = floor (x - GIMP_CURSOR_SIZE - 1.5);
+  rectangle.y      = floor (y - GIMP_CURSOR_SIZE - 1.5);
+  rectangle.width  = ceil (x + GIMP_CURSOR_SIZE + 1.5) - rectangle.x;
+  rectangle.height = ceil (y + GIMP_CURSOR_SIZE + 1.5) - rectangle.y;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_cursor_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_CURSOR,
+                       "shell", shell,
+                       NULL);
+}
+
+void
+gimp_canvas_cursor_set (GimpCanvasItem *cursor,
+                        gdouble         x,
+                        gdouble         y)
+{
+  GimpCanvasCursorPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_CURSOR (cursor));
+
+  private = GET_PRIVATE (cursor);
+
+  if (private->x != x || private->y != y)
+    {
+      gimp_canvas_item_begin_change (cursor);
+
+      g_object_set (cursor,
+                    "x", x,
+                    "y", y,
+                    NULL);
+
+      gimp_canvas_item_end_change (cursor);
+    }
+}
diff --git a/app/display/gimpcanvascursor.h b/app/display/gimpcanvascursor.h
new file mode 100644
index 0000000..b518563
--- /dev/null
+++ b/app/display/gimpcanvascursor.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvascursor.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_CURSOR_H__
+#define __GIMP_CANVAS_CURSOR_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_CURSOR            (gimp_canvas_cursor_get_type ())
+#define GIMP_CANVAS_CURSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_CURSOR, GimpCanvasCursor))
+#define GIMP_CANVAS_CURSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_CURSOR, GimpCanvasCursorClass))
+#define GIMP_IS_CANVAS_CURSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_CURSOR))
+#define GIMP_IS_CANVAS_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_CURSOR))
+#define GIMP_CANVAS_CURSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_CURSOR, GimpCanvasCursorClass))
+
+
+typedef struct _GimpCanvasCursor      GimpCanvasCursor;
+typedef struct _GimpCanvasCursorClass GimpCanvasCursorClass;
+
+struct _GimpCanvasCursor
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasCursorClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_cursor_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_cursor_new      (GimpDisplayShell *shell);
+
+void             gimp_canvas_cursor_set      (GimpCanvasItem   *cursor,
+                                              gdouble           x,
+                                              gdouble           y);
+
+
+#endif /* __GIMP_CANVAS_CURSOR_H__ */
diff --git a/app/display/gimpcanvasgrid.c b/app/display/gimpcanvasgrid.c
new file mode 100644
index 0000000..23b46ee
--- /dev/null
+++ b/app/display/gimpcanvasgrid.c
@@ -0,0 +1,414 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasgrid.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "display-types.h"
+
+#include "core/gimpgrid.h"
+#include "core/gimpimage.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvasgrid.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scale.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GRID,
+  PROP_GRID_STYLE
+};
+
+
+typedef struct _GimpCanvasGridPrivate GimpCanvasGridPrivate;
+
+struct _GimpCanvasGridPrivate
+{
+  GimpGrid *grid;
+  gboolean  grid_style;
+};
+
+#define GET_PRIVATE(grid) \
+        ((GimpCanvasGridPrivate *) gimp_canvas_grid_get_instance_private ((GimpCanvasGrid *) (grid)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_grid_finalize     (GObject        *object);
+static void             gimp_canvas_grid_set_property (GObject        *object,
+                                                       guint           property_id,
+                                                       const GValue   *value,
+                                                       GParamSpec     *pspec);
+static void             gimp_canvas_grid_get_property (GObject        *object,
+                                                       guint           property_id,
+                                                       GValue         *value,
+                                                       GParamSpec     *pspec);
+static void             gimp_canvas_grid_draw         (GimpCanvasItem *item,
+                                                       cairo_t        *cr);
+static cairo_region_t * gimp_canvas_grid_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_grid_stroke       (GimpCanvasItem *item,
+                                                       cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasGrid, gimp_canvas_grid,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_grid_parent_class
+
+
+static void
+gimp_canvas_grid_class_init (GimpCanvasGridClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_grid_finalize;
+  object_class->set_property = gimp_canvas_grid_set_property;
+  object_class->get_property = gimp_canvas_grid_get_property;
+
+  item_class->draw           = gimp_canvas_grid_draw;
+  item_class->get_extents    = gimp_canvas_grid_get_extents;
+  item_class->stroke         = gimp_canvas_grid_stroke;
+
+  g_object_class_install_property (object_class, PROP_GRID,
+                                   g_param_spec_object ("grid", NULL, NULL,
+                                                        GIMP_TYPE_GRID,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_GRID_STYLE,
+                                   g_param_spec_boolean ("grid-style",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_grid_init (GimpCanvasGrid *grid)
+{
+  GimpCanvasGridPrivate *private = GET_PRIVATE (grid);
+
+  private->grid = g_object_new (GIMP_TYPE_GRID, NULL);
+}
+
+static void
+gimp_canvas_grid_finalize (GObject *object)
+{
+  GimpCanvasGridPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->grid);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_grid_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpCanvasGridPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GRID:
+      {
+        GimpGrid *grid = g_value_get_object (value);
+        if (grid)
+          gimp_config_sync (G_OBJECT (grid), G_OBJECT (private->grid), 0);
+      }
+      break;
+    case PROP_GRID_STYLE:
+      private->grid_style = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_grid_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpCanvasGridPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GRID:
+      g_value_set_object (value, private->grid);
+      break;
+    case PROP_GRID_STYLE:
+      g_value_set_boolean (value, private->grid_style);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_grid_draw (GimpCanvasItem *item,
+                       cairo_t        *cr)
+{
+  GimpCanvasGridPrivate *private = GET_PRIVATE (item);
+  GimpDisplayShell      *shell   = gimp_canvas_item_get_shell (item);
+  gdouble                xspacing, yspacing;
+  gdouble                xoffset, yoffset;
+  gboolean               vert, horz;
+  gdouble                dx1, dy1, dx2, dy2;
+  gint                   x1, y1, x2, y2;
+  gdouble                dx, dy;
+  gint                   x, y;
+
+#define CROSSHAIR 2
+
+  gimp_grid_get_spacing (private->grid, &xspacing, &yspacing);
+  gimp_grid_get_offset  (private->grid, &xoffset,  &yoffset);
+
+  g_return_if_fail (xspacing >= 0.0 &&
+                    yspacing >= 0.0);
+
+  xspacing *= shell->scale_x;
+  yspacing *= shell->scale_y;
+
+  xoffset  *= shell->scale_x;
+  yoffset  *= shell->scale_y;
+
+  /*  skip grid drawing when the space between grid lines starts
+   *  disappearing, see bug #599267.
+   */
+  vert = (xspacing >= 2.0);
+  horz = (yspacing >= 2.0);
+
+  if (! vert && ! horz)
+    return;
+
+  cairo_clip_extents (cr, &dx1, &dy1, &dx2, &dy2);
+
+  x1 = floor (dx1) - 1;
+  y1 = floor (dy1) - 1;
+  x2 = ceil  (dx2) + 1;
+  y2 = ceil  (dy2) + 1;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      GeglRectangle bounds;
+
+      gimp_display_shell_scale_get_image_unrotated_bounds (
+        shell,
+        &bounds.x, &bounds.y, &bounds.width, &bounds.height);
+
+      if (! gegl_rectangle_intersect (&bounds,
+                                      &bounds,
+                                      GEGL_RECTANGLE (x1,      y1,
+                                                      x2 - x1, y2 - y1)))
+        {
+          return;
+        }
+
+      x1 = bounds.x;
+      y1 = bounds.y;
+      x2 = bounds.x + bounds.width;
+      y2 = bounds.y + bounds.height;
+    }
+
+  switch (gimp_grid_get_style (private->grid))
+    {
+    case GIMP_GRID_INTERSECTIONS:
+      x1 -= CROSSHAIR;
+      y1 -= CROSSHAIR;
+      x2 += CROSSHAIR;
+      y2 += CROSSHAIR;
+      break;
+
+    case GIMP_GRID_DOTS:
+    case GIMP_GRID_ON_OFF_DASH:
+    case GIMP_GRID_DOUBLE_DASH:
+    case GIMP_GRID_SOLID:
+      break;
+    }
+
+  xoffset = fmod (xoffset - shell->offset_x - x1, xspacing);
+  yoffset = fmod (yoffset - shell->offset_y - y1, yspacing);
+
+  if (xoffset < 0.0)
+    xoffset += xspacing;
+
+  if (yoffset < 0.0)
+    yoffset += yspacing;
+
+  switch (gimp_grid_get_style (private->grid))
+    {
+    case GIMP_GRID_DOTS:
+      if (vert && horz)
+        {
+          for (dx = x1 + xoffset; dx <= x2; dx += xspacing)
+            {
+              x = RINT (dx);
+
+              for (dy = y1 + yoffset; dy <= y2; dy += yspacing)
+                {
+                  y = RINT (dy);
+
+                  cairo_move_to (cr, x,       y + 0.5);
+                  cairo_line_to (cr, x + 1.0, y + 0.5);
+                }
+            }
+        }
+      break;
+
+    case GIMP_GRID_INTERSECTIONS:
+      if (vert && horz)
+        {
+          for (dx = x1 + xoffset; dx <= x2; dx += xspacing)
+            {
+              x = RINT (dx);
+
+              for (dy = y1 + yoffset; dy <= y2; dy += yspacing)
+                {
+                  y = RINT (dy);
+
+                  cairo_move_to (cr, x + 0.5, y - CROSSHAIR);
+                  cairo_line_to (cr, x + 0.5, y + CROSSHAIR + 1.0);
+
+                  cairo_move_to (cr, x - CROSSHAIR, y + 0.5);
+                  cairo_line_to (cr, x + CROSSHAIR + 1.0, y + 0.5);
+                }
+            }
+        }
+      break;
+
+    case GIMP_GRID_ON_OFF_DASH:
+    case GIMP_GRID_DOUBLE_DASH:
+    case GIMP_GRID_SOLID:
+      if (vert)
+        {
+          for (dx = x1 + xoffset; dx < x2; dx += xspacing)
+            {
+              x = RINT (dx);
+              
+              cairo_move_to (cr, x + 0.5, y1);
+              cairo_line_to (cr, x + 0.5, y2);
+            }
+        }
+
+      if (horz)
+        {
+          for (dy = y1 + yoffset; dy < y2; dy += yspacing)
+            {
+              y = RINT (dy);
+              
+              cairo_move_to (cr, x1, y + 0.5);
+              cairo_line_to (cr, x2, y + 0.5);
+            }
+        }
+      break;
+    }
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_grid_get_extents (GimpCanvasItem *item)
+{
+  GimpDisplayShell      *shell = gimp_canvas_item_get_shell (item);
+  GimpImage             *image = gimp_canvas_item_get_image (item);
+  cairo_rectangle_int_t  rectangle;
+
+  if (! image)
+    return NULL;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      
+      gdouble x1, y1;
+      gdouble x2, y2;
+      gint    w, h;
+
+      w = gimp_image_get_width  (image);
+      h = gimp_image_get_height (image);
+
+      gimp_canvas_item_transform_xy_f (item, 0, 0, &x1, &y1);
+      gimp_canvas_item_transform_xy_f (item, w, h, &x2, &y2);
+
+      rectangle.x      = floor (x1);
+      rectangle.y      = floor (y1);
+      rectangle.width  = ceil (x2) - rectangle.x;
+      rectangle.height = ceil (y2) - rectangle.y;
+    }
+  else
+    {
+      gimp_canvas_item_untransform_viewport (item,
+                                             &rectangle.x,
+                                             &rectangle.y,
+                                             &rectangle.width,
+                                             &rectangle.height);
+    }
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static void
+gimp_canvas_grid_stroke (GimpCanvasItem *item,
+                         cairo_t        *cr)
+{
+  GimpCanvasGridPrivate *private = GET_PRIVATE (item);
+
+  if (private->grid_style)
+    {
+      GimpDisplayShell *shell = gimp_canvas_item_get_shell (item);
+
+      gimp_canvas_set_grid_style (gimp_canvas_item_get_canvas (item), cr,
+                                  private->grid,
+                                  shell->offset_x, shell->offset_y);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      GIMP_CANVAS_ITEM_CLASS (parent_class)->stroke (item, cr);
+    }
+}
+
+GimpCanvasItem *
+gimp_canvas_grid_new (GimpDisplayShell *shell,
+                      GimpGrid         *grid)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (grid == NULL || GIMP_IS_GRID (grid), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_GRID,
+                       "shell", shell,
+                       "grid",  grid,
+                       NULL);
+}
diff --git a/app/display/gimpcanvasgrid.h b/app/display/gimpcanvasgrid.h
new file mode 100644
index 0000000..391d2ea
--- /dev/null
+++ b/app/display/gimpcanvasgrid.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasgrid.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_GRID_H__
+#define __GIMP_CANVAS_GRID_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_GRID            (gimp_canvas_grid_get_type ())
+#define GIMP_CANVAS_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_GRID, GimpCanvasGrid))
+#define GIMP_CANVAS_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_GRID, GimpCanvasGridClass))
+#define GIMP_IS_CANVAS_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_GRID))
+#define GIMP_IS_CANVAS_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_GRID))
+#define GIMP_CANVAS_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_GRID, GimpCanvasGridClass))
+
+
+typedef struct _GimpCanvasGrid      GimpCanvasGrid;
+typedef struct _GimpCanvasGridClass GimpCanvasGridClass;
+
+struct _GimpCanvasGrid
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasGridClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_grid_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_grid_new      (GimpDisplayShell *shell,
+                                            GimpGrid         *grid);
+
+
+#endif /* __GIMP_CANVAS_GRID_H__ */
diff --git a/app/display/gimpcanvasgroup.c b/app/display/gimpcanvasgroup.c
new file mode 100644
index 0000000..13d00ff
--- /dev/null
+++ b/app/display/gimpcanvasgroup.c
@@ -0,0 +1,387 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasgroup.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvasgroup.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GROUP_STROKING,
+  PROP_GROUP_FILLING
+};
+
+
+struct _GimpCanvasGroupPrivate
+{
+  GQueue   *items;
+  gboolean  group_stroking;
+  gboolean  group_filling;
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_group_finalize     (GObject         *object);
+static void             gimp_canvas_group_set_property (GObject         *object,
+                                                        guint            property_id,
+                                                        const GValue    *value,
+                                                        GParamSpec      *pspec);
+static void             gimp_canvas_group_get_property (GObject         *object,
+                                                        guint            property_id,
+                                                        GValue          *value,
+                                                        GParamSpec      *pspec);
+static void             gimp_canvas_group_draw         (GimpCanvasItem  *item,
+                                                        cairo_t         *cr);
+static cairo_region_t * gimp_canvas_group_get_extents  (GimpCanvasItem  *item);
+static gboolean         gimp_canvas_group_hit          (GimpCanvasItem  *item,
+                                                        gdouble          x,
+                                                        gdouble          y);
+
+static void             gimp_canvas_group_child_update (GimpCanvasItem  *item,
+                                                        cairo_region_t  *region,
+                                                        GimpCanvasGroup *group);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasGroup, gimp_canvas_group,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_group_parent_class
+
+
+static void
+gimp_canvas_group_class_init (GimpCanvasGroupClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_group_finalize;
+  object_class->set_property = gimp_canvas_group_set_property;
+  object_class->get_property = gimp_canvas_group_get_property;
+
+  item_class->draw           = gimp_canvas_group_draw;
+  item_class->get_extents    = gimp_canvas_group_get_extents;
+  item_class->hit            = gimp_canvas_group_hit;
+
+  g_object_class_install_property (object_class, PROP_GROUP_STROKING,
+                                   g_param_spec_boolean ("group-stroking",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_GROUP_FILLING,
+                                   g_param_spec_boolean ("group-filling",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_group_init (GimpCanvasGroup *group)
+{
+  group->priv = gimp_canvas_group_get_instance_private (group);
+
+  group->priv->items = g_queue_new ();
+}
+
+static void
+gimp_canvas_group_finalize (GObject *object)
+{
+  GimpCanvasGroup *group = GIMP_CANVAS_GROUP (object);
+  GimpCanvasItem  *item;
+
+  while ((item = g_queue_peek_head (group->priv->items)))
+    gimp_canvas_group_remove_item (group, item);
+
+  g_queue_free (group->priv->items);
+  group->priv->items = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_group_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpCanvasGroup *group = GIMP_CANVAS_GROUP (object);
+
+  switch (property_id)
+    {
+    case PROP_GROUP_STROKING:
+      group->priv->group_stroking = g_value_get_boolean (value);
+      break;
+    case PROP_GROUP_FILLING:
+      group->priv->group_filling = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_group_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpCanvasGroup *group = GIMP_CANVAS_GROUP (object);
+
+  switch (property_id)
+    {
+    case PROP_GROUP_STROKING:
+      g_value_set_boolean (value, group->priv->group_stroking);
+      break;
+    case PROP_GROUP_FILLING:
+      g_value_set_boolean (value, group->priv->group_filling);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_group_draw (GimpCanvasItem *item,
+                        cairo_t        *cr)
+{
+  GimpCanvasGroup *group = GIMP_CANVAS_GROUP (item);
+  GList           *list;
+
+  for (list = group->priv->items->head; list; list = g_list_next (list))
+    {
+      GimpCanvasItem *sub_item = list->data;
+
+      gimp_canvas_item_draw (sub_item, cr);
+    }
+
+  if (group->priv->group_stroking)
+    _gimp_canvas_item_stroke (item, cr);
+
+  if (group->priv->group_filling)
+    _gimp_canvas_item_fill (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_group_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasGroup *group  = GIMP_CANVAS_GROUP (item);
+  cairo_region_t  *region = NULL;
+  GList           *list;
+
+  for (list = group->priv->items->head; list; list = g_list_next (list))
+    {
+      GimpCanvasItem *sub_item   = list->data;
+      cairo_region_t *sub_region = gimp_canvas_item_get_extents (sub_item);
+
+      if (! region)
+        {
+          region = sub_region;
+        }
+      else if (sub_region)
+        {
+          cairo_region_union (region, sub_region);
+          cairo_region_destroy (sub_region);
+        }
+    }
+
+  return region;
+}
+
+static gboolean
+gimp_canvas_group_hit (GimpCanvasItem *item,
+                       gdouble         x,
+                       gdouble         y)
+{
+  GimpCanvasGroup *group = GIMP_CANVAS_GROUP (item);
+  GList           *list;
+
+  for (list = group->priv->items->head; list; list = g_list_next (list))
+    {
+      if (gimp_canvas_item_hit (list->data, x, y))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_canvas_group_child_update (GimpCanvasItem  *item,
+                                cairo_region_t  *region,
+                                GimpCanvasGroup *group)
+{
+  if (_gimp_canvas_item_needs_update (GIMP_CANVAS_ITEM (group)))
+    _gimp_canvas_item_update (GIMP_CANVAS_ITEM (group), region);
+}
+
+
+/*  public functions  */
+
+GimpCanvasItem *
+gimp_canvas_group_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_GROUP,
+                       "shell", shell,
+                       NULL);
+}
+
+void
+gimp_canvas_group_add_item (GimpCanvasGroup *group,
+                            GimpCanvasItem  *item)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+  g_return_if_fail (GIMP_CANVAS_ITEM (group) != item);
+
+  if (group->priv->group_stroking)
+    gimp_canvas_item_suspend_stroking (item);
+
+  if (group->priv->group_filling)
+    gimp_canvas_item_suspend_filling (item);
+
+  g_queue_push_tail (group->priv->items, g_object_ref (item));
+
+  if (_gimp_canvas_item_needs_update (GIMP_CANVAS_ITEM (group)))
+    {
+      cairo_region_t *region = gimp_canvas_item_get_extents (item);
+
+      if (region)
+        {
+          _gimp_canvas_item_update (GIMP_CANVAS_ITEM (group), region);
+          cairo_region_destroy (region);
+        }
+    }
+
+  g_signal_connect (item, "update",
+                    G_CALLBACK (gimp_canvas_group_child_update),
+                    group);
+}
+
+void
+gimp_canvas_group_remove_item (GimpCanvasGroup *group,
+                               GimpCanvasItem  *item)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  list = g_queue_find (group->priv->items, item);
+
+  g_return_if_fail (list != NULL);
+
+  g_queue_delete_link (group->priv->items, list);
+
+  if (group->priv->group_stroking)
+    gimp_canvas_item_resume_stroking (item);
+
+  if (group->priv->group_filling)
+    gimp_canvas_item_resume_filling (item);
+
+  if (_gimp_canvas_item_needs_update (GIMP_CANVAS_ITEM (group)))
+    {
+      cairo_region_t *region = gimp_canvas_item_get_extents (item);
+
+      if (region)
+        {
+          _gimp_canvas_item_update (GIMP_CANVAS_ITEM (group), region);
+          cairo_region_destroy (region);
+        }
+    }
+
+  g_signal_handlers_disconnect_by_func (item,
+                                        gimp_canvas_group_child_update,
+                                        group);
+
+  g_object_unref (item);
+}
+
+void
+gimp_canvas_group_set_group_stroking (GimpCanvasGroup *group,
+                                      gboolean         group_stroking)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+
+  if (group->priv->group_stroking != group_stroking)
+    {
+      GList *list;
+
+      gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (group));
+
+      g_object_set (group,
+                    "group-stroking", group_stroking ? TRUE : FALSE,
+                    NULL);
+
+      for (list = group->priv->items->head; list; list = g_list_next (list))
+        {
+          if (group->priv->group_stroking)
+            gimp_canvas_item_suspend_stroking (list->data);
+          else
+            gimp_canvas_item_resume_stroking (list->data);
+        }
+
+      gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (group));
+    }
+}
+
+void
+gimp_canvas_group_set_group_filling (GimpCanvasGroup *group,
+                                     gboolean         group_filling)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+
+  if (group->priv->group_filling != group_filling)
+    {
+      GList *list;
+
+      gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (group));
+
+      g_object_set (group,
+                    "group-filling", group_filling ? TRUE : FALSE,
+                    NULL);
+
+      for (list = group->priv->items->head; list; list = g_list_next (list))
+        {
+          if (group->priv->group_filling)
+            gimp_canvas_item_suspend_filling (list->data);
+          else
+            gimp_canvas_item_resume_filling (list->data);
+        }
+
+      gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (group));
+    }
+}
diff --git a/app/display/gimpcanvasgroup.h b/app/display/gimpcanvasgroup.h
new file mode 100644
index 0000000..d2fb9cc
--- /dev/null
+++ b/app/display/gimpcanvasgroup.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasgroup.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_GROUP_H__
+#define __GIMP_CANVAS_GROUP_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_GROUP            (gimp_canvas_group_get_type ())
+#define GIMP_CANVAS_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_GROUP, GimpCanvasGroup))
+#define GIMP_CANVAS_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_GROUP, GimpCanvasGroupClass))
+#define GIMP_IS_CANVAS_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_GROUP))
+#define GIMP_IS_CANVAS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_GROUP))
+#define GIMP_CANVAS_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_GROUP, GimpCanvasGroupClass))
+
+
+typedef struct _GimpCanvasGroupPrivate GimpCanvasGroupPrivate;
+typedef struct _GimpCanvasGroupClass   GimpCanvasGroupClass;
+
+struct _GimpCanvasGroup
+{
+  GimpCanvasItem          parent_instance;
+
+  GimpCanvasGroupPrivate *priv;
+
+};
+
+struct _GimpCanvasGroupClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_group_get_type           (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_group_new                (GimpDisplayShell *shell);
+
+void             gimp_canvas_group_add_item           (GimpCanvasGroup  *group,
+                                                       GimpCanvasItem   *item);
+void             gimp_canvas_group_remove_item        (GimpCanvasGroup  *group,
+                                                       GimpCanvasItem   *item);
+
+void             gimp_canvas_group_set_group_stroking (GimpCanvasGroup  *group,
+                                                       gboolean          group_stroking);
+void             gimp_canvas_group_set_group_filling  (GimpCanvasGroup  *group,
+                                                       gboolean          group_filling);
+
+
+#endif /* __GIMP_CANVAS_GROUP_H__ */
diff --git a/app/display/gimpcanvasguide.c b/app/display/gimpcanvasguide.c
new file mode 100644
index 0000000..5712633
--- /dev/null
+++ b/app/display/gimpcanvasguide.c
@@ -0,0 +1,295 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasguide.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvasguide.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_POSITION,
+  PROP_STYLE
+};
+
+
+typedef struct _GimpCanvasGuidePrivate GimpCanvasGuidePrivate;
+
+struct _GimpCanvasGuidePrivate
+{
+  GimpOrientationType  orientation;
+  gint                 position;
+
+  GimpGuideStyle       style;
+};
+
+#define GET_PRIVATE(guide) \
+        ((GimpCanvasGuidePrivate *) gimp_canvas_guide_get_instance_private ((GimpCanvasGuide *) (guide)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_guide_set_property (GObject        *object,
+                                                        guint           property_id,
+                                                        const GValue   *value,
+                                                        GParamSpec     *pspec);
+static void             gimp_canvas_guide_get_property (GObject        *object,
+                                                        guint           property_id,
+                                                        GValue         *value,
+                                                        GParamSpec     *pspec);
+static void             gimp_canvas_guide_draw         (GimpCanvasItem *item,
+                                                        cairo_t        *cr);
+static cairo_region_t * gimp_canvas_guide_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_guide_stroke       (GimpCanvasItem *item,
+                                                        cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasGuide, gimp_canvas_guide,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_guide_parent_class
+
+
+static void
+gimp_canvas_guide_class_init (GimpCanvasGuideClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_guide_set_property;
+  object_class->get_property = gimp_canvas_guide_get_property;
+
+  item_class->draw           = gimp_canvas_guide_draw;
+  item_class->get_extents    = gimp_canvas_guide_get_extents;
+  item_class->stroke         = gimp_canvas_guide_stroke;
+
+  g_object_class_install_property (object_class, PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation", NULL, NULL,
+                                                      GIMP_TYPE_ORIENTATION_TYPE,
+                                                      GIMP_ORIENTATION_HORIZONTAL,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_POSITION,
+                                   g_param_spec_int ("position", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_STYLE,
+                                   g_param_spec_enum ("style", NULL, NULL,
+                                                      GIMP_TYPE_GUIDE_STYLE,
+                                                      GIMP_GUIDE_STYLE_NONE,
+                                                      GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_guide_init (GimpCanvasGuide *guide)
+{
+}
+
+static void
+gimp_canvas_guide_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpCanvasGuidePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      private->orientation = g_value_get_enum (value);
+      break;
+    case PROP_POSITION:
+      private->position = g_value_get_int (value);
+      break;
+    case PROP_STYLE:
+      private->style = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_guide_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpCanvasGuidePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, private->orientation);
+      break;
+    case PROP_POSITION:
+      g_value_set_int (value, private->position);
+      break;
+    case PROP_STYLE:
+      g_value_set_enum (value, private->style);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_guide_transform (GimpCanvasItem *item,
+                             gdouble        *x1,
+                             gdouble        *y1,
+                             gdouble        *x2,
+                             gdouble        *y2)
+{
+  GimpCanvasGuidePrivate *private = GET_PRIVATE (item);
+  GtkWidget              *canvas  = gimp_canvas_item_get_canvas (item);
+  GtkAllocation           allocation;
+  gint                    max_outside;
+  gint                    x, y;
+
+  gtk_widget_get_allocation (canvas, &allocation);
+
+  max_outside = allocation.width + allocation.height;
+
+  *x1 = -max_outside;
+  *y1 = -max_outside;
+  *x2 = allocation.width  + max_outside;
+  *y2 = allocation.height + max_outside;
+
+  switch (private->orientation)
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      gimp_canvas_item_transform_xy (item, 0, private->position, &x, &y);
+      *y1 = *y2 = y + 0.5;
+      break;
+
+    case GIMP_ORIENTATION_VERTICAL:
+      gimp_canvas_item_transform_xy (item, private->position, 0, &x, &y);
+      *x1 = *x2 = x + 0.5;
+      break;
+
+    case GIMP_ORIENTATION_UNKNOWN:
+      return;
+    }
+}
+
+static void
+gimp_canvas_guide_draw (GimpCanvasItem *item,
+                        cairo_t        *cr)
+{
+  gdouble x1, y1;
+  gdouble x2, y2;
+
+  gimp_canvas_guide_transform (item, &x1, &y1, &x2, &y2);
+
+  cairo_move_to (cr, x1, y1);
+  cairo_line_to (cr, x2, y2);
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_guide_get_extents (GimpCanvasItem *item)
+{
+  cairo_rectangle_int_t rectangle;
+  gdouble               x1, y1;
+  gdouble               x2, y2;
+
+  gimp_canvas_guide_transform (item, &x1, &y1, &x2, &y2);
+
+  rectangle.x      = MIN (x1, x2) - 1.5;
+  rectangle.y      = MIN (y1, y2) - 1.5;
+  rectangle.width  = ABS (x2 - x1) + 3.0;
+  rectangle.height = ABS (y2 - y1) + 3.0;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static void
+gimp_canvas_guide_stroke (GimpCanvasItem *item,
+                          cairo_t        *cr)
+{
+  GimpCanvasGuidePrivate *private = GET_PRIVATE (item);
+
+  if (private->style != GIMP_GUIDE_STYLE_NONE)
+    {
+      GimpDisplayShell *shell = gimp_canvas_item_get_shell (item);
+
+      gimp_canvas_set_guide_style (gimp_canvas_item_get_canvas (item), cr,
+                                   private->style,
+                                   gimp_canvas_item_get_highlight (item),
+                                   shell->offset_x, shell->offset_y);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      GIMP_CANVAS_ITEM_CLASS (parent_class)->stroke (item, cr);
+    }
+}
+
+GimpCanvasItem *
+gimp_canvas_guide_new (GimpDisplayShell    *shell,
+                       GimpOrientationType  orientation,
+                       gint                 position,
+                       GimpGuideStyle       style)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_GUIDE,
+                       "shell",        shell,
+                       "orientation",  orientation,
+                       "position",     position,
+                       "style",        style,
+                       NULL);
+}
+
+void
+gimp_canvas_guide_set (GimpCanvasItem      *guide,
+                       GimpOrientationType  orientation,
+                       gint                 position)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_GUIDE (guide));
+
+  gimp_canvas_item_begin_change (guide);
+
+  g_object_set (guide,
+                "orientation", orientation,
+                "position",    position,
+                NULL);
+
+  gimp_canvas_item_end_change (guide);
+}
diff --git a/app/display/gimpcanvasguide.h b/app/display/gimpcanvasguide.h
new file mode 100644
index 0000000..54b1696
--- /dev/null
+++ b/app/display/gimpcanvasguide.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasguide.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_GUIDE_H__
+#define __GIMP_CANVAS_GUIDE_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_GUIDE            (gimp_canvas_guide_get_type ())
+#define GIMP_CANVAS_GUIDE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_GUIDE, GimpCanvasGuide))
+#define GIMP_CANVAS_GUIDE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_GUIDE, GimpCanvasGuideClass))
+#define GIMP_IS_CANVAS_GUIDE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_GUIDE))
+#define GIMP_IS_CANVAS_GUIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_GUIDE))
+#define GIMP_CANVAS_GUIDE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_GUIDE, GimpCanvasGuideClass))
+
+
+typedef struct _GimpCanvasGuide      GimpCanvasGuide;
+typedef struct _GimpCanvasGuideClass GimpCanvasGuideClass;
+
+struct _GimpCanvasGuide
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasGuideClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_guide_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_guide_new      (GimpDisplayShell    *shell,
+                                             GimpOrientationType  orientation,
+                                             gint                 position,
+                                             GimpGuideStyle       style);
+
+void             gimp_canvas_guide_set      (GimpCanvasItem      *guide,
+                                             GimpOrientationType  orientation,
+                                             gint                 position);
+
+
+#endif /* __GIMP_CANVAS_GUIDE_H__ */
diff --git a/app/display/gimpcanvashandle.c b/app/display/gimpcanvashandle.c
new file mode 100644
index 0000000..954eead
--- /dev/null
+++ b/app/display/gimpcanvashandle.c
@@ -0,0 +1,703 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvashandle.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimpcanvashandle.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpdisplayshell.h"
+
+
+#define N_DASHES       8
+#define DASH_ON_RATIO  0.3
+#define DASH_OFF_RATIO 0.7
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_ANCHOR,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_START_ANGLE,
+  PROP_SLICE_ANGLE
+};
+
+
+typedef struct _GimpCanvasHandlePrivate GimpCanvasHandlePrivate;
+
+struct _GimpCanvasHandlePrivate
+{
+  GimpHandleType   type;
+  GimpHandleAnchor anchor;
+  gdouble          x;
+  gdouble          y;
+  gint             width;
+  gint             height;
+  gdouble          start_angle;
+  gdouble          slice_angle;
+};
+
+#define GET_PRIVATE(handle) \
+        ((GimpCanvasHandlePrivate *) gimp_canvas_handle_get_instance_private ((GimpCanvasHandle *) (handle)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_handle_set_property (GObject        *object,
+                                                         guint           property_id,
+                                                         const GValue   *value,
+                                                         GParamSpec     *pspec);
+static void             gimp_canvas_handle_get_property (GObject        *object,
+                                                         guint           property_id,
+                                                         GValue         *value,
+                                                         GParamSpec     *pspec);
+static void             gimp_canvas_handle_draw         (GimpCanvasItem *item,
+                                                         cairo_t        *cr);
+static cairo_region_t * gimp_canvas_handle_get_extents  (GimpCanvasItem *item);
+static gboolean         gimp_canvas_handle_hit          (GimpCanvasItem *item,
+                                                         gdouble         x,
+                                                         gdouble         y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasHandle, gimp_canvas_handle,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_handle_parent_class
+
+
+static void
+gimp_canvas_handle_class_init (GimpCanvasHandleClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_handle_set_property;
+  object_class->get_property = gimp_canvas_handle_get_property;
+
+  item_class->draw           = gimp_canvas_handle_draw;
+  item_class->get_extents    = gimp_canvas_handle_get_extents;
+  item_class->hit            = gimp_canvas_handle_hit;
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("type", NULL, NULL,
+                                                      GIMP_TYPE_HANDLE_TYPE,
+                                                      GIMP_HANDLE_CROSS,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ANCHOR,
+                                   g_param_spec_enum ("anchor", NULL, NULL,
+                                                      GIMP_TYPE_HANDLE_ANCHOR,
+                                                      GIMP_HANDLE_ANCHOR_CENTER,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width", NULL, NULL,
+                                                     3, 1001, 7,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_int ("height", NULL, NULL,
+                                                     3, 1001, 7,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_START_ANGLE,
+                                   g_param_spec_double ("start-angle", NULL, NULL,
+                                                        -1000, 1000, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SLICE_ANGLE,
+                                   g_param_spec_double ("slice-angle", NULL, NULL,
+                                                        -1000, 1000, 2 * G_PI,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_handle_init (GimpCanvasHandle *handle)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (handle);
+
+  gimp_canvas_item_set_line_cap (GIMP_CANVAS_ITEM (handle),
+                                 CAIRO_LINE_CAP_SQUARE);
+
+  private->start_angle = 0.0;
+  private->slice_angle = 2.0 * G_PI;
+}
+
+static void
+gimp_canvas_handle_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      private->type = g_value_get_enum (value);
+      break;
+    case PROP_ANCHOR:
+      private->anchor = g_value_get_enum (value);
+      break;
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_int (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_int (value);
+      break;
+    case PROP_START_ANGLE:
+      private->start_angle = g_value_get_double (value);
+      break;
+    case PROP_SLICE_ANGLE:
+      private->slice_angle = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_handle_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, private->type);
+      break;
+    case PROP_ANCHOR:
+      g_value_set_enum (value, private->anchor);
+      break;
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_int (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_int (value, private->height);
+      break;
+    case PROP_START_ANGLE:
+      g_value_set_double (value, private->start_angle);
+      break;
+    case PROP_SLICE_ANGLE:
+      g_value_set_double (value, private->slice_angle);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_handle_transform (GimpCanvasItem *item,
+                              gdouble        *x,
+                              gdouble        *y)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (item);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->x, private->y,
+                                   x, y);
+
+  switch (private->type)
+    {
+    case GIMP_HANDLE_SQUARE:
+    case GIMP_HANDLE_DASHED_SQUARE:
+    case GIMP_HANDLE_FILLED_SQUARE:
+      gimp_canvas_item_shift_to_north_west (private->anchor,
+                                            *x, *y,
+                                            private->width,
+                                            private->height,
+                                            x, y);
+      break;
+
+    case GIMP_HANDLE_CIRCLE:
+    case GIMP_HANDLE_DASHED_CIRCLE:
+    case GIMP_HANDLE_FILLED_CIRCLE:
+    case GIMP_HANDLE_CROSS:
+    case GIMP_HANDLE_CROSSHAIR:
+    case GIMP_HANDLE_DIAMOND:
+    case GIMP_HANDLE_DASHED_DIAMOND:
+    case GIMP_HANDLE_FILLED_DIAMOND:
+      gimp_canvas_item_shift_to_center (private->anchor,
+                                        *x, *y,
+                                        private->width,
+                                        private->height,
+                                        x, y);
+      break;
+
+    default:
+      break;
+    }
+
+  *x = floor (*x) + 0.5;
+  *y = floor (*y) + 0.5;
+}
+
+static void
+gimp_canvas_handle_draw (GimpCanvasItem *item,
+                         cairo_t        *cr)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (item);
+  gdouble                  x, y, tx, ty;
+
+  gimp_canvas_handle_transform (item, &x, &y);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->x, private->y,
+                                   &tx, &ty);
+
+  tx = floor (tx) + 0.5;
+  ty = floor (ty) + 0.5;
+
+  switch (private->type)
+    {
+    case GIMP_HANDLE_SQUARE:
+    case GIMP_HANDLE_DASHED_SQUARE:
+    case GIMP_HANDLE_FILLED_SQUARE:
+    case GIMP_HANDLE_DIAMOND:
+    case GIMP_HANDLE_DASHED_DIAMOND:
+    case GIMP_HANDLE_FILLED_DIAMOND:
+    case GIMP_HANDLE_CROSS:
+      cairo_save (cr);
+      cairo_translate (cr, tx, ty);
+      cairo_rotate (cr, private->start_angle);
+      cairo_translate (cr, -tx, -ty);
+
+      switch (private->type)
+        {
+        case GIMP_HANDLE_SQUARE:
+        case GIMP_HANDLE_DASHED_SQUARE:
+          if (private->type == GIMP_HANDLE_DASHED_SQUARE)
+            {
+              gdouble circ;
+              gdouble dashes[2];
+
+              cairo_save (cr);
+
+              circ = 2.0 * ((private->width - 1.0) + (private->height - 1.0));
+
+              dashes[0] = (circ / N_DASHES) * DASH_ON_RATIO;
+              dashes[1] = (circ / N_DASHES) * DASH_OFF_RATIO;
+
+              cairo_set_dash (cr, dashes, 2, dashes[0] / 2.0);
+            }
+
+          cairo_rectangle (cr, x, y, private->width - 1.0, private->height - 1.0);
+          _gimp_canvas_item_stroke (item, cr);
+
+          if (private->type == GIMP_HANDLE_DASHED_SQUARE)
+            cairo_restore (cr);
+          break;
+
+        case GIMP_HANDLE_FILLED_SQUARE:
+          cairo_rectangle (cr, x - 0.5, y - 0.5, private->width, private->height);
+          _gimp_canvas_item_fill (item, cr);
+          break;
+
+        case GIMP_HANDLE_DIAMOND:
+        case GIMP_HANDLE_DASHED_DIAMOND:
+        case GIMP_HANDLE_FILLED_DIAMOND:
+          if (private->type == GIMP_HANDLE_DASHED_DIAMOND)
+            {
+              gdouble circ;
+              gdouble dashes[2];
+
+              cairo_save (cr);
+
+              circ = 4.0 * hypot ((gdouble) private->width  / 2.0,
+                                  (gdouble) private->height / 2.0);
+
+              dashes[0] = (circ / N_DASHES) * DASH_ON_RATIO;
+              dashes[1] = (circ / N_DASHES) * DASH_OFF_RATIO;
+
+              cairo_set_dash (cr, dashes, 2, dashes[0] / 2.0);
+            }
+
+          cairo_move_to (cr, x, y - (gdouble) private->height / 2.0);
+          cairo_line_to (cr, x + (gdouble) private->width / 2.0, y);
+          cairo_line_to (cr, x, y + (gdouble) private->height / 2.0);
+          cairo_line_to (cr, x - (gdouble) private->width / 2.0, y);
+          cairo_line_to (cr, x, y - (gdouble) private->height / 2.0);
+          if (private->type == GIMP_HANDLE_DIAMOND ||
+              private->type == GIMP_HANDLE_DASHED_DIAMOND)
+            _gimp_canvas_item_stroke (item, cr);
+          else
+            _gimp_canvas_item_fill (item, cr);
+
+          if (private->type == GIMP_HANDLE_DASHED_SQUARE)
+            cairo_restore (cr);
+          break;
+
+        case GIMP_HANDLE_CROSS:
+          cairo_move_to (cr, x - private->width / 2.0, y);
+          cairo_line_to (cr, x + private->width / 2.0 - 0.5, y);
+          cairo_move_to (cr, x, y - private->height / 2.0);
+          cairo_line_to (cr, x, y + private->height / 2.0 - 0.5);
+          _gimp_canvas_item_stroke (item, cr);
+          break;
+
+        default:
+          gimp_assert_not_reached ();
+        }
+
+      cairo_restore (cr);
+      break;
+
+    case GIMP_HANDLE_CIRCLE:
+    case GIMP_HANDLE_DASHED_CIRCLE:
+      if (private->type == GIMP_HANDLE_DASHED_CIRCLE)
+        {
+          gdouble circ;
+          gdouble dashes[2];
+
+          cairo_save (cr);
+
+          circ = 2.0 * G_PI * (private->width / 2.0);
+
+          dashes[0] = (circ / N_DASHES) * DASH_ON_RATIO;
+          dashes[1] = (circ / N_DASHES) * DASH_OFF_RATIO;
+
+          cairo_set_dash (cr, dashes, 2, dashes[0] / 2.0);
+        }
+
+      gimp_cairo_arc (cr, x, y, private->width / 2.0,
+                      private->start_angle,
+                      private->slice_angle);
+
+      _gimp_canvas_item_stroke (item, cr);
+
+      if (private->type == GIMP_HANDLE_DASHED_CIRCLE)
+        cairo_restore (cr);
+      break;
+
+    case GIMP_HANDLE_FILLED_CIRCLE:
+      cairo_move_to (cr, x, y);
+
+      gimp_cairo_arc (cr, x, y, (gdouble) private->width / 2.0,
+                      private->start_angle,
+                      private->slice_angle);
+
+      _gimp_canvas_item_fill (item, cr);
+      break;
+
+    case GIMP_HANDLE_CROSSHAIR:
+      cairo_move_to (cr, x - private->width / 2.0, y);
+      cairo_line_to (cr, x - private->width * 0.4, y);
+
+      cairo_move_to (cr, x + private->width / 2.0 - 0.5, y);
+      cairo_line_to (cr, x + private->width * 0.4, y);
+
+      cairo_move_to (cr, x, y - private->height / 2.0);
+      cairo_line_to (cr, x, y - private->height * 0.4 - 0.5);
+
+      cairo_move_to (cr, x, y + private->height / 2.0 - 0.5);
+      cairo_line_to (cr, x, y + private->height * 0.4 - 0.5);
+
+       _gimp_canvas_item_stroke (item, cr);
+      break;
+
+    default:
+      break;
+    }
+}
+
+static cairo_region_t *
+gimp_canvas_handle_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (item);
+  cairo_rectangle_int_t    rectangle;
+  gdouble                  x, y;
+  gdouble                  w, h;
+
+  gimp_canvas_handle_transform (item, &x, &y);
+
+  switch (private->type)
+    {
+    case GIMP_HANDLE_SQUARE:
+    case GIMP_HANDLE_DASHED_SQUARE:
+    case GIMP_HANDLE_FILLED_SQUARE:
+      w = private->width * (sqrt(2) - 1) / 2;
+      h = private->height * (sqrt(2) - 1) / 2;
+      rectangle.x      = x - 1.5 - w;
+      rectangle.y      = y - 1.5 - h;
+      rectangle.width  = private->width  + 3.0 + w * 2;
+      rectangle.height = private->height + 3.0 + h * 2;
+      break;
+
+    case GIMP_HANDLE_CIRCLE:
+    case GIMP_HANDLE_DASHED_CIRCLE:
+    case GIMP_HANDLE_FILLED_CIRCLE:
+    case GIMP_HANDLE_CROSS:
+    case GIMP_HANDLE_CROSSHAIR:
+    case GIMP_HANDLE_DIAMOND:
+    case GIMP_HANDLE_DASHED_DIAMOND:
+    case GIMP_HANDLE_FILLED_DIAMOND:
+      rectangle.x      = x - private->width  / 2.0 - 2.0;
+      rectangle.y      = y - private->height / 2.0 - 2.0;
+      rectangle.width  = private->width  + 4.0;
+      rectangle.height = private->height + 4.0;
+      break;
+
+    default:
+      break;
+    }
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static gboolean
+gimp_canvas_handle_hit (GimpCanvasItem *item,
+                        gdouble         x,
+                        gdouble         y)
+{
+  GimpCanvasHandlePrivate *private = GET_PRIVATE (item);
+  gdouble                  handle_tx, handle_ty;
+  gdouble                  mx, my, tx, ty, mmx, mmy;
+  gdouble                  diamond_offset_x = 0.0;
+  gdouble                  diamond_offset_y = 0.0;
+  gdouble                  angle            = -private->start_angle;
+
+  gimp_canvas_handle_transform (item, &handle_tx, &handle_ty);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   x, y,
+                                   &mx, &my);
+
+  switch (private->type)
+    {
+    case GIMP_HANDLE_DIAMOND:
+    case GIMP_HANDLE_DASHED_DIAMOND:
+    case GIMP_HANDLE_FILLED_DIAMOND:
+      angle -= G_PI / 4.0;
+      diamond_offset_x = private->width / 2.0;
+      diamond_offset_y = private->height / 2.0;
+    case GIMP_HANDLE_SQUARE:
+    case GIMP_HANDLE_DASHED_SQUARE:
+    case GIMP_HANDLE_FILLED_SQUARE:
+      gimp_canvas_item_transform_xy_f (item,
+                                       private->x, private->y,
+                                       &tx, &ty);
+      mmx = mx - tx; mmy = my - ty;
+      mx = cos (angle) * mmx - sin (angle) * mmy + tx + diamond_offset_x;
+      my = sin (angle) * mmx + cos (angle) * mmy + ty + diamond_offset_y;
+      return mx > handle_tx && mx < handle_tx + private->width &&
+             my > handle_ty && my < handle_ty + private->height;
+
+    case GIMP_HANDLE_CIRCLE:
+    case GIMP_HANDLE_DASHED_CIRCLE:
+    case GIMP_HANDLE_FILLED_CIRCLE:
+    case GIMP_HANDLE_CROSS:
+    case GIMP_HANDLE_CROSSHAIR:
+      {
+        gint width = private->width;
+
+        if (width != private->height)
+          width = (width + private->height) / 2;
+
+        width /= 2;
+
+        return ((SQR (handle_tx - mx) + SQR (handle_ty - my)) < SQR (width));
+      }
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+GimpCanvasItem *
+gimp_canvas_handle_new (GimpDisplayShell *shell,
+                        GimpHandleType    type,
+                        GimpHandleAnchor  anchor,
+                        gdouble           x,
+                        gdouble           y,
+                        gint              width,
+                        gint              height)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_HANDLE,
+                       "shell",  shell,
+                       "type",   type,
+                       "anchor", anchor,
+                       "x",      x,
+                       "y",      y,
+                       "width",  width,
+                       "height", height,
+                       NULL);
+}
+
+void
+gimp_canvas_handle_get_position (GimpCanvasItem *handle,
+                                 gdouble        *x,
+                                 gdouble        *y)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
+  g_return_if_fail (x != NULL);
+  g_return_if_fail (y != NULL);
+
+  g_object_get (handle,
+                "x", x,
+                "y", y,
+                NULL);
+}
+
+void
+gimp_canvas_handle_set_position (GimpCanvasItem *handle,
+                                 gdouble         x,
+                                 gdouble         y)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
+
+  gimp_canvas_item_begin_change (handle);
+
+  g_object_set (handle,
+                "x", x,
+                "y", y,
+                NULL);
+
+  gimp_canvas_item_end_change (handle);
+}
+
+gint
+gimp_canvas_handle_calc_size (GimpCanvasItem *item,
+                              gdouble         mouse_x,
+                              gdouble         mouse_y,
+                              gint            normal_size,
+                              gint            hover_size)
+{
+  gdouble x, y;
+  gdouble distance;
+  gdouble size;
+  gint    full_threshold_sq    = SQR (hover_size / 2) * 9;
+  gint    partial_threshold_sq = full_threshold_sq * 5;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_HANDLE (item), normal_size);
+
+  gimp_canvas_handle_get_position (item, &x, &y);
+  distance = gimp_canvas_item_transform_distance_square (item,
+                                                         mouse_x,
+                                                         mouse_y,
+                                                         x, y);
+
+  /*  calculate the handle size based on distance from the cursor  */
+  size = (1.0 - (distance - full_threshold_sq) /
+          (partial_threshold_sq - full_threshold_sq));
+
+  size = CLAMP (size, 0.0, 1.0);
+
+  return (gint) CLAMP ((size * hover_size),
+                       normal_size,
+                       hover_size);
+}
+
+void
+gimp_canvas_handle_get_size (GimpCanvasItem *handle,
+                             gint           *width,
+                             gint           *height)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
+  g_return_if_fail (width != NULL);
+  g_return_if_fail (height != NULL);
+
+  g_object_get (handle,
+                "width",  width,
+                "height", height,
+                NULL);
+}
+
+void
+gimp_canvas_handle_set_size (GimpCanvasItem *handle,
+                             gint            width,
+                             gint            height)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
+
+  gimp_canvas_item_begin_change (handle);
+
+  g_object_set (handle,
+                "width",  width,
+                "height", height,
+                NULL);
+
+  gimp_canvas_item_end_change (handle);
+}
+
+void
+gimp_canvas_handle_set_angles (GimpCanvasItem *handle,
+                               gdouble         start_angle,
+                               gdouble         slice_angle)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
+
+  gimp_canvas_item_begin_change (handle);
+
+  g_object_set (handle,
+                "start-angle", start_angle,
+                "slice-angle", slice_angle,
+                NULL);
+
+  gimp_canvas_item_end_change (handle);
+}
diff --git a/app/display/gimpcanvashandle.h b/app/display/gimpcanvashandle.h
new file mode 100644
index 0000000..0dea957
--- /dev/null
+++ b/app/display/gimpcanvashandle.h
@@ -0,0 +1,92 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvashandle.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_HANDLE_H__
+#define __GIMP_CANVAS_HANDLE_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_CANVAS_HANDLE_SIZE_CIRCLE    13
+#define GIMP_CANVAS_HANDLE_SIZE_CROSS     15
+#define GIMP_CANVAS_HANDLE_SIZE_CROSSHAIR 43
+#define GIMP_CANVAS_HANDLE_SIZE_LARGE     25
+#define GIMP_CANVAS_HANDLE_SIZE_SMALL     7
+
+
+#define GIMP_TYPE_CANVAS_HANDLE            (gimp_canvas_handle_get_type ())
+#define GIMP_CANVAS_HANDLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandle))
+#define GIMP_CANVAS_HANDLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandleClass))
+#define GIMP_IS_CANVAS_HANDLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_HANDLE))
+#define GIMP_IS_CANVAS_HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_HANDLE))
+#define GIMP_CANVAS_HANDLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandleClass))
+
+
+typedef struct _GimpCanvasHandle      GimpCanvasHandle;
+typedef struct _GimpCanvasHandleClass GimpCanvasHandleClass;
+
+struct _GimpCanvasHandle
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasHandleClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_handle_get_type     (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_handle_new          (GimpDisplayShell *shell,
+                                                  GimpHandleType    type,
+                                                  GimpHandleAnchor  anchor,
+                                                  gdouble           x,
+                                                  gdouble           y,
+                                                  gint              width,
+                                                  gint              height);
+
+void             gimp_canvas_handle_get_position (GimpCanvasItem   *handle,
+                                                  gdouble          *x,
+                                                  gdouble          *y);
+void             gimp_canvas_handle_set_position (GimpCanvasItem   *handle,
+                                                  gdouble           x,
+                                                  gdouble           y);
+
+gint             gimp_canvas_handle_calc_size    (GimpCanvasItem   *item,
+                                                  gdouble           mouse_x,
+                                                  gdouble           mouse_y,
+                                                  gint              normal_size,
+                                                  gint              hover_size);
+
+void             gimp_canvas_handle_get_size     (GimpCanvasItem   *handle,
+                                                  gint             *width,
+                                                  gint             *height);
+void             gimp_canvas_handle_set_size     (GimpCanvasItem   *handle,
+                                                  gint              width,
+                                                  gint              height);
+
+void             gimp_canvas_handle_set_angles   (GimpCanvasItem   *handle,
+                                                  gdouble           start_handle,
+                                                  gdouble           slice_handle);
+
+
+#endif /* __GIMP_CANVAS_HANDLE_H__ */
diff --git a/app/display/gimpcanvasitem-utils.c b/app/display/gimpcanvasitem-utils.c
new file mode 100644
index 0000000..4c23592
--- /dev/null
+++ b/app/display/gimpcanvasitem-utils.c
@@ -0,0 +1,474 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasitem-utils.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpimage.h"
+
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimpcanvasitem.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+
+
+gboolean
+gimp_canvas_item_on_handle (GimpCanvasItem  *item,
+                            gdouble           x,
+                            gdouble           y,
+                            GimpHandleType    type,
+                            gdouble           handle_x,
+                            gdouble           handle_y,
+                            gint              width,
+                            gint              height,
+                            GimpHandleAnchor  anchor)
+{
+  GimpDisplayShell *shell;
+  gdouble           tx, ty;
+  gdouble           handle_tx, handle_ty;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+
+  shell = gimp_canvas_item_get_shell (item);
+
+  gimp_display_shell_zoom_xy_f (shell,
+                                x, y,
+                                &tx, &ty);
+  gimp_display_shell_zoom_xy_f (shell,
+                                handle_x, handle_y,
+                                &handle_tx, &handle_ty);
+
+  switch (type)
+    {
+    case GIMP_HANDLE_SQUARE:
+    case GIMP_HANDLE_FILLED_SQUARE:
+    case GIMP_HANDLE_CROSS:
+    case GIMP_HANDLE_CROSSHAIR:
+      gimp_canvas_item_shift_to_north_west (anchor,
+                                            handle_tx, handle_ty,
+                                            width, height,
+                                            &handle_tx, &handle_ty);
+
+      return (tx == CLAMP (tx, handle_tx, handle_tx + width) &&
+              ty == CLAMP (ty, handle_ty, handle_ty + height));
+
+    case GIMP_HANDLE_CIRCLE:
+    case GIMP_HANDLE_FILLED_CIRCLE:
+      gimp_canvas_item_shift_to_center (anchor,
+                                        handle_tx, handle_ty,
+                                        width, height,
+                                        &handle_tx, &handle_ty);
+
+      /* FIXME */
+      if (width != height)
+        width = (width + height) / 2;
+
+      width /= 2;
+
+      return ((SQR (handle_tx - tx) + SQR (handle_ty - ty)) < SQR (width));
+
+    default:
+      g_warning ("%s: invalid handle type %d", G_STRFUNC, type);
+      break;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_canvas_item_on_vectors_handle (GimpCanvasItem    *item,
+                                    GimpVectors       *vectors,
+                                    const GimpCoords  *coord,
+                                    gint               width,
+                                    gint               height,
+                                    GimpAnchorType     preferred,
+                                    gboolean           exclusive,
+                                    GimpAnchor       **ret_anchor,
+                                    GimpStroke       **ret_stroke)
+{
+  GimpStroke *stroke       = NULL;
+  GimpStroke *pref_stroke  = NULL;
+  GimpAnchor *anchor       = NULL;
+  GimpAnchor *pref_anchor  = NULL;
+  gdouble     dx, dy;
+  gdouble     pref_mindist = -1;
+  gdouble     mindist      = -1;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
+  g_return_val_if_fail (coord != NULL, FALSE);
+
+  if (ret_anchor) *ret_anchor = NULL;
+  if (ret_stroke) *ret_stroke = NULL;
+
+  while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+    {
+      GList *anchor_list;
+      GList *list;
+
+      anchor_list = g_list_concat (gimp_stroke_get_draw_anchors (stroke),
+                                   gimp_stroke_get_draw_controls (stroke));
+
+      for (list = anchor_list; list; list = g_list_next (list))
+        {
+          dx = coord->x - GIMP_ANCHOR (list->data)->position.x;
+          dy = coord->y - GIMP_ANCHOR (list->data)->position.y;
+
+          if (mindist < 0 || mindist > dx * dx + dy * dy)
+            {
+              mindist = dx * dx + dy * dy;
+              anchor = GIMP_ANCHOR (list->data);
+
+              if (ret_stroke)
+                *ret_stroke = stroke;
+            }
+
+          if ((pref_mindist < 0 || pref_mindist > dx * dx + dy * dy) &&
+              GIMP_ANCHOR (list->data)->type == preferred)
+            {
+              pref_mindist = dx * dx + dy * dy;
+              pref_anchor = GIMP_ANCHOR (list->data);
+              pref_stroke = stroke;
+            }
+        }
+
+      g_list_free (anchor_list);
+    }
+
+  /* If the data passed into ret_anchor is a preferred anchor, return it. */
+  if (ret_anchor && *ret_anchor &&
+      gimp_canvas_item_on_handle (item,
+                                  coord->x,
+                                  coord->y,
+                                  GIMP_HANDLE_CIRCLE,
+                                  (*ret_anchor)->position.x,
+                                  (*ret_anchor)->position.y,
+                                  width, height,
+                                  GIMP_HANDLE_ANCHOR_CENTER) &&
+      (*ret_anchor)->type == preferred)
+    {
+      if (ret_stroke) *ret_stroke = pref_stroke;
+
+      return TRUE;
+    }
+
+  if (pref_anchor && gimp_canvas_item_on_handle (item,
+                                                 coord->x,
+                                                 coord->y,
+                                                 GIMP_HANDLE_CIRCLE,
+                                                 pref_anchor->position.x,
+                                                 pref_anchor->position.y,
+                                                 width, height,
+                                                 GIMP_HANDLE_ANCHOR_CENTER))
+    {
+      if (ret_anchor) *ret_anchor = pref_anchor;
+      if (ret_stroke) *ret_stroke = pref_stroke;
+
+      return TRUE;
+    }
+  else if (!exclusive && anchor &&
+           gimp_canvas_item_on_handle (item,
+                                       coord->x,
+                                       coord->y,
+                                       GIMP_HANDLE_CIRCLE,
+                                       anchor->position.x,
+                                       anchor->position.y,
+                                       width, height,
+                                       GIMP_HANDLE_ANCHOR_CENTER))
+    {
+      if (ret_anchor)
+        *ret_anchor = anchor;
+
+      /* *ret_stroke already set correctly. */
+      return TRUE;
+    }
+
+  if (ret_anchor)
+    *ret_anchor = NULL;
+  if (ret_stroke)
+    *ret_stroke = NULL;
+
+  return FALSE;
+}
+
+gboolean
+gimp_canvas_item_on_vectors_curve (GimpCanvasItem    *item,
+                                   GimpVectors       *vectors,
+                                   const GimpCoords  *coord,
+                                   gint               width,
+                                   gint               height,
+                                   GimpCoords        *ret_coords,
+                                   gdouble           *ret_pos,
+                                   GimpAnchor       **ret_segment_start,
+                                   GimpAnchor       **ret_segment_end,
+                                   GimpStroke       **ret_stroke)
+{
+  GimpStroke *stroke = NULL;
+  GimpAnchor *segment_start;
+  GimpAnchor *segment_end;
+  GimpCoords  min_coords = GIMP_COORDS_DEFAULT_VALUES;
+  GimpCoords  cur_coords;
+  gdouble     min_dist, cur_dist, cur_pos;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
+  g_return_val_if_fail (coord != NULL, FALSE);
+
+  if (ret_coords)        *ret_coords        = *coord;
+  if (ret_pos)           *ret_pos           = -1.0;
+  if (ret_segment_start) *ret_segment_start = NULL;
+  if (ret_segment_end)   *ret_segment_end   = NULL;
+  if (ret_stroke)        *ret_stroke        = NULL;
+
+  min_dist = -1.0;
+
+  while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+    {
+      cur_dist = gimp_stroke_nearest_point_get (stroke, coord, 1.0,
+                                                &cur_coords,
+                                                &segment_start,
+                                                &segment_end,
+                                                &cur_pos);
+
+      if (cur_dist >= 0 && (min_dist < 0 || cur_dist < min_dist))
+        {
+          min_dist   = cur_dist;
+          min_coords = cur_coords;
+
+          if (ret_coords)        *ret_coords        = cur_coords;
+          if (ret_pos)           *ret_pos           = cur_pos;
+          if (ret_segment_start) *ret_segment_start = segment_start;
+          if (ret_segment_end)   *ret_segment_end   = segment_end;
+          if (ret_stroke)        *ret_stroke        = stroke;
+        }
+    }
+
+  if (min_dist >= 0 &&
+      gimp_canvas_item_on_handle (item,
+                                  coord->x,
+                                  coord->y,
+                                  GIMP_HANDLE_CIRCLE,
+                                  min_coords.x,
+                                  min_coords.y,
+                                  width, height,
+                                  GIMP_HANDLE_ANCHOR_CENTER))
+    {
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_canvas_item_on_vectors (GimpCanvasItem    *item,
+                             const GimpCoords  *coords,
+                             gint               width,
+                             gint               height,
+                             GimpCoords        *ret_coords,
+                             gdouble           *ret_pos,
+                             GimpAnchor       **ret_segment_start,
+                             GimpAnchor       **ret_segment_end,
+                             GimpStroke       **ret_stroke,
+                             GimpVectors      **ret_vectors)
+{
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  GList            *all_vectors;
+  GList            *list;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+
+  shell = gimp_canvas_item_get_shell (item);
+  image = gimp_display_get_image (shell->display);
+
+  if (ret_coords)        *ret_coords         = *coords;
+  if (ret_pos)           *ret_pos            = -1.0;
+  if (ret_segment_start) *ret_segment_start  = NULL;
+  if (ret_segment_end)   *ret_segment_end    = NULL;
+  if (ret_stroke)        *ret_stroke         = NULL;
+  if (ret_vectors)       *ret_vectors        = NULL;
+
+  all_vectors = gimp_image_get_vectors_list (image);
+
+  for (list = all_vectors; list; list = g_list_next (list))
+    {
+      GimpVectors *vectors = list->data;
+
+      if (! gimp_item_get_visible (GIMP_ITEM (vectors)))
+        continue;
+
+      if (gimp_canvas_item_on_vectors_curve (item,
+                                             vectors, coords,
+                                             width, height,
+                                             ret_coords,
+                                             ret_pos,
+                                             ret_segment_start,
+                                             ret_segment_end,
+                                             ret_stroke))
+        {
+          if (ret_vectors)
+            *ret_vectors = vectors;
+
+          g_list_free (all_vectors);
+
+          return TRUE;
+        }
+    }
+
+  g_list_free (all_vectors);
+
+  return FALSE;
+}
+
+void
+gimp_canvas_item_shift_to_north_west (GimpHandleAnchor  anchor,
+                                      gdouble           x,
+                                      gdouble           y,
+                                      gint              width,
+                                      gint              height,
+                                      gdouble          *shifted_x,
+                                      gdouble          *shifted_y)
+{
+  switch (anchor)
+    {
+    case GIMP_HANDLE_ANCHOR_CENTER:
+      x -= width  / 2;
+      y -= height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH:
+      x -= width / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_WEST:
+      /*  nothing, this is the default  */
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_EAST:
+      x -= width;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH:
+      x -= width / 2;
+      y -= height;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_WEST:
+      y -= height;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_EAST:
+      x -= width;
+      y -= height;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_WEST:
+      y -= height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_EAST:
+      x -= width;
+      y -= height / 2;
+      break;
+
+    default:
+      break;
+    }
+
+  if (shifted_x)
+    *shifted_x = x;
+
+  if (shifted_y)
+    *shifted_y = y;
+}
+
+void
+gimp_canvas_item_shift_to_center (GimpHandleAnchor  anchor,
+                                  gdouble           x,
+                                  gdouble           y,
+                                  gint              width,
+                                  gint              height,
+                                  gdouble          *shifted_x,
+                                  gdouble          *shifted_y)
+{
+  switch (anchor)
+    {
+    case GIMP_HANDLE_ANCHOR_CENTER:
+      /*  nothing, this is the default  */
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH:
+      y += height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_WEST:
+      x += width  / 2;
+      y += height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_EAST:
+      x -= width  / 2;
+      y += height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH:
+      y -= height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_WEST:
+      x += width  / 2;
+      y -= height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_EAST:
+      x -= width  / 2;
+      y -= height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_WEST:
+      x += width / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_EAST:
+      x -= width / 2;
+      break;
+
+    default:
+      break;
+    }
+
+  if (shifted_x)
+    *shifted_x = x;
+
+  if (shifted_y)
+    *shifted_y = y;
+}
diff --git a/app/display/gimpcanvasitem-utils.h b/app/display/gimpcanvasitem-utils.h
new file mode 100644
index 0000000..240385e
--- /dev/null
+++ b/app/display/gimpcanvasitem-utils.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasitem-utils.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_ITEM_UTILS_H__
+#define __GIMP_CANVAS_ITEM_UTILS_H__
+
+
+gboolean   gimp_canvas_item_on_handle           (GimpCanvasItem    *item,
+                                                 gdouble            x,
+                                                 gdouble            y,
+                                                 GimpHandleType     type,
+                                                 gdouble            handle_x,
+                                                 gdouble            handle_y,
+                                                 gint               width,
+                                                 gint               height,
+                                                 GimpHandleAnchor   anchor);
+
+gboolean   gimp_canvas_item_on_vectors_handle   (GimpCanvasItem    *item,
+                                                 GimpVectors       *vectors,
+                                                 const GimpCoords  *coord,
+                                                 gint               width,
+                                                 gint               height,
+                                                 GimpAnchorType     preferred,
+                                                 gboolean           exclusive,
+                                                 GimpAnchor       **ret_anchor,
+                                                 GimpStroke       **ret_stroke);
+gboolean   gimp_canvas_item_on_vectors_curve    (GimpCanvasItem    *item,
+                                                 GimpVectors       *vectors,
+                                                 const GimpCoords  *coord,
+                                                 gint               width,
+                                                 gint               height,
+                                                 GimpCoords        *ret_coords,
+                                                 gdouble           *ret_pos,
+                                                 GimpAnchor       **ret_segment_start,
+                                                 GimpAnchor       **ret_segment_end,
+                                                 GimpStroke       **ret_stroke);
+gboolean   gimp_canvas_item_on_vectors          (GimpCanvasItem    *item,
+                                                 const GimpCoords  *coords,
+                                                 gint               width,
+                                                 gint               height,
+                                                 GimpCoords        *ret_coords,
+                                                 gdouble           *ret_pos,
+                                                 GimpAnchor       **ret_segment_start,
+                                                 GimpAnchor       **ret_segment_end,
+                                                 GimpStroke       **ret_stroke,
+                                                 GimpVectors      **ret_vectors);
+
+void       gimp_canvas_item_shift_to_north_west (GimpHandleAnchor   anchor,
+                                                 gdouble            x,
+                                                 gdouble            y,
+                                                 gint               width,
+                                                 gint               height,
+                                                 gdouble           *shifted_x,
+                                                 gdouble           *shifted_y);
+void       gimp_canvas_item_shift_to_center     (GimpHandleAnchor   anchor,
+                                                 gdouble            x,
+                                                 gdouble            y,
+                                                 gint               width,
+                                                 gint               height,
+                                                 gdouble           *shifted_x,
+                                                 gdouble           *shifted_y);
+
+
+#endif /* __GIMP_CANVAS_ITEM_UTILS_H__ */
diff --git a/app/display/gimpcanvasitem.c b/app/display/gimpcanvasitem.c
new file mode 100644
index 0000000..560210a
--- /dev/null
+++ b/app/display/gimpcanvasitem.c
@@ -0,0 +1,731 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasitem.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvasitem.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SHELL,
+  PROP_VISIBLE,
+  PROP_LINE_CAP,
+  PROP_HIGHLIGHT
+};
+
+enum
+{
+  UPDATE,
+  LAST_SIGNAL
+};
+
+
+struct _GimpCanvasItemPrivate
+{
+  GimpDisplayShell *shell;
+  gboolean          visible;
+  cairo_line_cap_t  line_cap;
+  gboolean          highlight;
+  gint              suspend_stroking;
+  gint              suspend_filling;
+  gint              change_count;
+  cairo_region_t   *change_region;
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_item_dispose          (GObject         *object);
+static void             gimp_canvas_item_constructed      (GObject         *object);
+static void             gimp_canvas_item_set_property     (GObject         *object,
+                                                           guint            property_id,
+                                                           const GValue    *value,
+                                                           GParamSpec      *pspec);
+static void             gimp_canvas_item_get_property     (GObject         *object,
+                                                           guint            property_id,
+                                                           GValue          *value,
+                                                           GParamSpec      *pspec);
+static void  gimp_canvas_item_dispatch_properties_changed (GObject         *object,
+                                                           guint            n_pspecs,
+                                                           GParamSpec     **pspecs);
+
+static void             gimp_canvas_item_real_draw        (GimpCanvasItem  *item,
+                                                           cairo_t         *cr);
+static cairo_region_t * gimp_canvas_item_real_get_extents (GimpCanvasItem  *item);
+static void             gimp_canvas_item_real_stroke      (GimpCanvasItem  *item,
+                                                           cairo_t         *cr);
+static void             gimp_canvas_item_real_fill        (GimpCanvasItem  *item,
+                                                           cairo_t         *cr);
+static gboolean         gimp_canvas_item_real_hit         (GimpCanvasItem  *item,
+                                                           gdouble          x,
+                                                           gdouble          y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasItem, gimp_canvas_item, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_canvas_item_parent_class
+
+static guint item_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_canvas_item_class_init (GimpCanvasItemClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose                     = gimp_canvas_item_dispose;
+  object_class->constructed                 = gimp_canvas_item_constructed;
+  object_class->set_property                = gimp_canvas_item_set_property;
+  object_class->get_property                = gimp_canvas_item_get_property;
+  object_class->dispatch_properties_changed = gimp_canvas_item_dispatch_properties_changed;
+
+  klass->update                             = NULL;
+  klass->draw                               = gimp_canvas_item_real_draw;
+  klass->get_extents                        = gimp_canvas_item_real_get_extents;
+  klass->stroke                             = gimp_canvas_item_real_stroke;
+  klass->fill                               = gimp_canvas_item_real_fill;
+  klass->hit                                = gimp_canvas_item_real_hit;
+
+  item_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpCanvasItemClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  g_object_class_install_property (object_class, PROP_SHELL,
+                                   g_param_spec_object ("shell",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DISPLAY_SHELL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_VISIBLE,
+                                   g_param_spec_boolean ("visible",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_LINE_CAP,
+                                   g_param_spec_int ("line-cap",
+                                                     NULL, NULL,
+                                                     CAIRO_LINE_CAP_BUTT,
+                                                     CAIRO_LINE_CAP_SQUARE,
+                                                     CAIRO_LINE_CAP_ROUND,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HIGHLIGHT,
+                                   g_param_spec_boolean ("highlight",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_item_init (GimpCanvasItem *item)
+{
+  GimpCanvasItemPrivate *private;
+
+  item->private = gimp_canvas_item_get_instance_private (item);
+  private = item->private;
+
+  private->shell            = NULL;
+  private->visible          = TRUE;
+  private->line_cap         = CAIRO_LINE_CAP_ROUND;
+  private->highlight        = FALSE;
+  private->suspend_stroking = 0;
+  private->suspend_filling  = 0;
+  private->change_count     = 1; /* avoid emissions during construction */
+  private->change_region    = NULL;
+}
+
+static void
+gimp_canvas_item_constructed (GObject *object)
+{
+  GimpCanvasItem *item = GIMP_CANVAS_ITEM (object);
+
+  gimp_assert (GIMP_IS_DISPLAY_SHELL (item->private->shell));
+
+  item->private->change_count = 0; /* undo hack from init() */
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+static void
+gimp_canvas_item_dispose (GObject *object)
+{
+  GimpCanvasItem *item = GIMP_CANVAS_ITEM (object);
+
+  item->private->change_count++; /* avoid emissions during destruction */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_canvas_item_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpCanvasItem        *item    = GIMP_CANVAS_ITEM (object);
+  GimpCanvasItemPrivate *private = item->private;
+
+  switch (property_id)
+    {
+    case PROP_SHELL:
+      private->shell = g_value_get_object (value); /* don't ref */
+      break;
+    case PROP_VISIBLE:
+      private->visible = g_value_get_boolean (value);
+      break;
+    case PROP_LINE_CAP:
+      private->line_cap = g_value_get_int (value);
+      break;
+    case PROP_HIGHLIGHT:
+      private->highlight = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_item_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpCanvasItem        *item    = GIMP_CANVAS_ITEM (object);
+  GimpCanvasItemPrivate *private = item->private;
+
+  switch (property_id)
+    {
+    case PROP_SHELL:
+      g_value_set_object (value, private->shell);
+      break;
+    case PROP_VISIBLE:
+      g_value_set_boolean (value, private->visible);
+      break;
+    case PROP_LINE_CAP:
+      g_value_set_int (value, private->line_cap);
+      break;
+    case PROP_HIGHLIGHT:
+      g_value_set_boolean (value, private->highlight);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_item_dispatch_properties_changed (GObject     *object,
+                                              guint        n_pspecs,
+                                              GParamSpec **pspecs)
+{
+  GimpCanvasItem *item = GIMP_CANVAS_ITEM (object);
+
+  G_OBJECT_CLASS (parent_class)->dispatch_properties_changed (object,
+                                                              n_pspecs,
+                                                              pspecs);
+
+  if (_gimp_canvas_item_needs_update (item))
+    {
+      cairo_region_t *region = gimp_canvas_item_get_extents (item);
+
+      if (region)
+        {
+          g_signal_emit (object, item_signals[UPDATE], 0,
+                         region);
+          cairo_region_destroy (region);
+        }
+    }
+}
+
+static void
+gimp_canvas_item_real_draw (GimpCanvasItem *item,
+                            cairo_t        *cr)
+{
+  g_warn_if_reached ();
+}
+
+static cairo_region_t *
+gimp_canvas_item_real_get_extents (GimpCanvasItem *item)
+{
+  return NULL;
+}
+
+static void
+gimp_canvas_item_real_stroke (GimpCanvasItem *item,
+                              cairo_t        *cr)
+{
+  cairo_set_line_cap (cr, item->private->line_cap);
+
+  gimp_canvas_set_tool_bg_style (gimp_canvas_item_get_canvas (item), cr);
+  cairo_stroke_preserve (cr);
+
+  gimp_canvas_set_tool_fg_style (gimp_canvas_item_get_canvas (item), cr,
+                                 item->private->highlight);
+  cairo_stroke (cr);
+}
+
+static void
+gimp_canvas_item_real_fill (GimpCanvasItem *item,
+                            cairo_t        *cr)
+{
+  gimp_canvas_set_tool_bg_style (gimp_canvas_item_get_canvas (item), cr);
+  cairo_set_line_width (cr, 2.0);
+  cairo_stroke_preserve (cr);
+
+  gimp_canvas_set_tool_fg_style (gimp_canvas_item_get_canvas (item), cr,
+                                 item->private->highlight);
+  cairo_fill (cr);
+}
+
+static gboolean
+gimp_canvas_item_real_hit (GimpCanvasItem *item,
+                           gdouble         x,
+                           gdouble         y)
+{
+  return FALSE;
+}
+
+
+/*  public functions  */
+
+GimpDisplayShell *
+gimp_canvas_item_get_shell (GimpCanvasItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), NULL);
+
+  return item->private->shell;
+}
+
+GimpImage *
+gimp_canvas_item_get_image (GimpCanvasItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), NULL);
+
+  return gimp_display_get_image (item->private->shell->display);
+}
+
+GtkWidget *
+gimp_canvas_item_get_canvas (GimpCanvasItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), NULL);
+
+  return item->private->shell->canvas;
+}
+
+void
+gimp_canvas_item_draw (GimpCanvasItem *item,
+                       cairo_t        *cr)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+  g_return_if_fail (cr != NULL);
+
+  if (item->private->visible)
+    {
+      cairo_save (cr);
+      GIMP_CANVAS_ITEM_GET_CLASS (item)->draw (item, cr);
+      cairo_restore (cr);
+    }
+}
+
+cairo_region_t *
+gimp_canvas_item_get_extents (GimpCanvasItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), NULL);
+
+  if (item->private->visible)
+    return GIMP_CANVAS_ITEM_GET_CLASS (item)->get_extents (item);
+
+  return NULL;
+}
+
+gboolean
+gimp_canvas_item_hit (GimpCanvasItem   *item,
+                      gdouble           x,
+                      gdouble           y)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+
+  if (item->private->visible)
+    return GIMP_CANVAS_ITEM_GET_CLASS (item)->hit (item, x, y);
+
+  return FALSE;
+}
+
+void
+gimp_canvas_item_set_visible (GimpCanvasItem *item,
+                              gboolean        visible)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  if (item->private->visible != visible)
+    {
+      gimp_canvas_item_begin_change (item);
+      g_object_set (G_OBJECT (item),
+                    "visible", visible,
+                    NULL);
+      gimp_canvas_item_end_change (item);
+    }
+}
+
+gboolean
+gimp_canvas_item_get_visible (GimpCanvasItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+
+  return item->private->visible;
+}
+
+void
+gimp_canvas_item_set_line_cap (GimpCanvasItem   *item,
+                               cairo_line_cap_t  line_cap)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  if (item->private->line_cap != line_cap)
+    {
+      gimp_canvas_item_begin_change (item);
+      g_object_set (G_OBJECT (item),
+                    "line-cap", line_cap,
+                    NULL);
+      gimp_canvas_item_end_change (item);
+    }
+}
+
+void
+gimp_canvas_item_set_highlight (GimpCanvasItem *item,
+                                gboolean        highlight)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  if (item->private->highlight != highlight)
+    {
+      g_object_set (G_OBJECT (item),
+                    "highlight", highlight,
+                    NULL);
+    }
+}
+
+gboolean
+gimp_canvas_item_get_highlight (GimpCanvasItem *item)
+{
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), FALSE);
+
+  return item->private->highlight;
+}
+
+void
+gimp_canvas_item_begin_change (GimpCanvasItem *item)
+{
+  GimpCanvasItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  private = item->private;
+
+  private->change_count++;
+
+  if (private->change_count == 1 &&
+      g_signal_has_handler_pending (item, item_signals[UPDATE], 0, FALSE))
+    {
+      private->change_region = gimp_canvas_item_get_extents (item);
+    }
+}
+
+void
+gimp_canvas_item_end_change (GimpCanvasItem *item)
+{
+  GimpCanvasItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  private = item->private;
+
+  g_return_if_fail (private->change_count > 0);
+
+  private->change_count--;
+
+  if (private->change_count == 0)
+    {
+      if (g_signal_has_handler_pending (item, item_signals[UPDATE], 0, FALSE))
+        {
+          cairo_region_t *region = gimp_canvas_item_get_extents (item);
+
+          if (! region)
+            {
+              region = private->change_region;
+            }
+          else if (private->change_region)
+            {
+              cairo_region_union (region, private->change_region);
+              cairo_region_destroy (private->change_region);
+            }
+
+          private->change_region = NULL;
+
+          if (region)
+            {
+              g_signal_emit (item, item_signals[UPDATE], 0,
+                             region);
+              cairo_region_destroy (region);
+            }
+        }
+      else
+        {
+          g_clear_pointer (&private->change_region, cairo_region_destroy);
+        }
+    }
+}
+
+void
+gimp_canvas_item_suspend_stroking (GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  item->private->suspend_stroking++;
+}
+
+void
+gimp_canvas_item_resume_stroking (GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  g_return_if_fail (item->private->suspend_stroking > 0);
+
+  item->private->suspend_stroking--;
+}
+
+void
+gimp_canvas_item_suspend_filling (GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  item->private->suspend_filling++;
+}
+
+void
+gimp_canvas_item_resume_filling (GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  g_return_if_fail (item->private->suspend_filling > 0);
+
+  item->private->suspend_filling--;
+}
+
+void
+gimp_canvas_item_transform (GimpCanvasItem *item,
+                            cairo_t        *cr)
+{
+  GimpCanvasItemPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+  g_return_if_fail (cr != NULL);
+
+  private = item->private;
+
+  cairo_translate (cr, -private->shell->offset_x, -private->shell->offset_y);
+  cairo_scale (cr, private->shell->scale_x, private->shell->scale_y);
+}
+
+void
+gimp_canvas_item_transform_xy (GimpCanvasItem *item,
+                               gdouble         x,
+                               gdouble         y,
+                               gint           *tx,
+                               gint           *ty)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_display_shell_zoom_xy (item->private->shell, x, y, tx, ty);
+}
+
+void
+gimp_canvas_item_transform_xy_f (GimpCanvasItem *item,
+                                 gdouble         x,
+                                 gdouble         y,
+                                 gdouble        *tx,
+                                 gdouble        *ty)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_display_shell_zoom_xy_f (item->private->shell, x, y, tx, ty);
+}
+
+/**
+ * gimp_canvas_item_transform_distance:
+ * @item: a #GimpCanvasItem
+ * @x1:   start point X in image coordinates
+ * @y1:   start point Y in image coordinates
+ * @x2:   end point X in image coordinates
+ * @y2:   end point Y in image coordinates
+ *
+ * If you just need to compare distances, consider to use
+ * gimp_canvas_item_transform_distance_square() instead.
+ *
+ * Returns: the distance between the given points in display coordinates
+ **/
+gdouble
+gimp_canvas_item_transform_distance (GimpCanvasItem *item,
+                                     gdouble         x1,
+                                     gdouble         y1,
+                                     gdouble         x2,
+                                     gdouble         y2)
+{
+  return sqrt (gimp_canvas_item_transform_distance_square (item,
+                                                           x1, y1, x2, y2));
+}
+
+/**
+ * gimp_canvas_item_transform_distance_square:
+ * @item: a #GimpCanvasItem
+ * @x1:   start point X in image coordinates
+ * @y1:   start point Y in image coordinates
+ * @x2:   end point X in image coordinates
+ * @y2:   end point Y in image coordinates
+ *
+ * This function is more effective than
+ * gimp_canvas_item_transform_distance() as it doesn't perform a
+ * sqrt(). Use this if you just need to compare distances.
+ *
+ * Returns: the square of the distance between the given points in
+ *          display coordinates
+ **/
+gdouble
+gimp_canvas_item_transform_distance_square (GimpCanvasItem   *item,
+                                            gdouble           x1,
+                                            gdouble           y1,
+                                            gdouble           x2,
+                                            gdouble           y2)
+{
+  gdouble tx1, ty1;
+  gdouble tx2, ty2;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), 0.0);
+
+  gimp_canvas_item_transform_xy_f (item, x1, y1, &tx1, &ty1);
+  gimp_canvas_item_transform_xy_f (item, x2, y2, &tx2, &ty2);
+
+  return SQR (tx2 - tx1) + SQR (ty2 - ty1);
+}
+
+void
+gimp_canvas_item_untransform_viewport (GimpCanvasItem *item,
+                                       gint           *x,
+                                       gint           *y,
+                                       gint           *w,
+                                       gint           *h)
+{
+  GimpDisplayShell *shell;
+  gdouble           x1, y1;
+  gdouble           x2, y2;
+
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  shell = item->private->shell;
+
+  gimp_display_shell_unrotate_bounds (shell,
+                                      0.0,               0.0,
+                                      shell->disp_width, shell->disp_height,
+                                      &x1,               &y1,
+                                      &x2,               &y2);
+
+  *x = floor (x1);
+  *y = floor (y1);
+  *w = ceil  (x2) - *x;
+  *h = ceil  (y2) - *y;
+}
+
+
+/*  protected functions  */
+
+void
+_gimp_canvas_item_update (GimpCanvasItem *item,
+                          cairo_region_t *region)
+{
+  g_signal_emit (item, item_signals[UPDATE], 0,
+                 region);
+}
+
+gboolean
+_gimp_canvas_item_needs_update (GimpCanvasItem *item)
+{
+  return (item->private->change_count == 0 &&
+          g_signal_has_handler_pending (item, item_signals[UPDATE], 0, FALSE));
+}
+
+void
+_gimp_canvas_item_stroke (GimpCanvasItem *item,
+                          cairo_t        *cr)
+{
+  if (item->private->suspend_filling > 0)
+    g_warning ("_gimp_canvas_item_stroke() on an item that is in a filling group");
+
+  if (item->private->suspend_stroking == 0)
+    {
+      GIMP_CANVAS_ITEM_GET_CLASS (item)->stroke (item, cr);
+    }
+  else
+    {
+      cairo_new_sub_path (cr);
+    }
+}
+
+void
+_gimp_canvas_item_fill (GimpCanvasItem *item,
+                        cairo_t        *cr)
+{
+  if (item->private->suspend_stroking > 0)
+    g_warning ("_gimp_canvas_item_fill() on an item that is in a stroking group");
+
+  if (item->private->suspend_filling == 0)
+    {
+      GIMP_CANVAS_ITEM_GET_CLASS (item)->fill (item, cr);
+    }
+  else
+    {
+      cairo_new_sub_path (cr);
+    }
+}
diff --git a/app/display/gimpcanvasitem.h b/app/display/gimpcanvasitem.h
new file mode 100644
index 0000000..2004260
--- /dev/null
+++ b/app/display/gimpcanvasitem.h
@@ -0,0 +1,147 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasitem.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_ITEM_H__
+#define __GIMP_CANVAS_ITEM_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_CANVAS_ITEM            (gimp_canvas_item_get_type ())
+#define GIMP_CANVAS_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_ITEM, GimpCanvasItem))
+#define GIMP_CANVAS_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_ITEM, GimpCanvasItemClass))
+#define GIMP_IS_CANVAS_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_ITEM))
+#define GIMP_IS_CANVAS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_ITEM))
+#define GIMP_CANVAS_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_ITEM, GimpCanvasItemClass))
+
+
+typedef struct _GimpCanvasItemPrivate GimpCanvasItemPrivate;
+typedef struct _GimpCanvasItemClass   GimpCanvasItemClass;
+
+struct _GimpCanvasItem
+{
+  GimpObject             parent_instance;
+
+  GimpCanvasItemPrivate *private;
+};
+
+struct _GimpCanvasItemClass
+{
+  GimpObjectClass  parent_class;
+
+  /*  signals  */
+  void             (* update)      (GimpCanvasItem   *item,
+                                    cairo_region_t   *region);
+
+  /*  virtual functions  */
+  void             (* draw)        (GimpCanvasItem   *item,
+                                    cairo_t          *cr);
+  cairo_region_t * (* get_extents) (GimpCanvasItem   *item);
+
+  void             (* stroke)      (GimpCanvasItem   *item,
+                                    cairo_t          *cr);
+  void             (* fill)        (GimpCanvasItem   *item,
+                                    cairo_t          *cr);
+
+  gboolean         (* hit)         (GimpCanvasItem   *item,
+                                    gdouble           x,
+                                    gdouble           y);
+};
+
+
+GType            gimp_canvas_item_get_type         (void) G_GNUC_CONST;
+
+GimpDisplayShell * gimp_canvas_item_get_shell      (GimpCanvasItem   *item);
+GimpImage      * gimp_canvas_item_get_image        (GimpCanvasItem   *item);
+GtkWidget      * gimp_canvas_item_get_canvas       (GimpCanvasItem   *item);
+
+void             gimp_canvas_item_draw             (GimpCanvasItem   *item,
+                                                    cairo_t          *cr);
+cairo_region_t * gimp_canvas_item_get_extents      (GimpCanvasItem   *item);
+
+gboolean         gimp_canvas_item_hit              (GimpCanvasItem   *item,
+                                                    gdouble           x,
+                                                    gdouble           y);
+
+void             gimp_canvas_item_set_visible      (GimpCanvasItem   *item,
+                                                    gboolean          visible);
+gboolean         gimp_canvas_item_get_visible      (GimpCanvasItem   *item);
+
+void             gimp_canvas_item_set_line_cap     (GimpCanvasItem   *item,
+                                                    cairo_line_cap_t  line_cap);
+
+void             gimp_canvas_item_set_highlight    (GimpCanvasItem   *item,
+                                                    gboolean          highlight);
+gboolean         gimp_canvas_item_get_highlight    (GimpCanvasItem   *item);
+
+void             gimp_canvas_item_begin_change     (GimpCanvasItem   *item);
+void             gimp_canvas_item_end_change       (GimpCanvasItem   *item);
+
+void             gimp_canvas_item_suspend_stroking (GimpCanvasItem   *item);
+void             gimp_canvas_item_resume_stroking  (GimpCanvasItem   *item);
+
+void             gimp_canvas_item_suspend_filling  (GimpCanvasItem   *item);
+void             gimp_canvas_item_resume_filling   (GimpCanvasItem   *item);
+
+void             gimp_canvas_item_transform        (GimpCanvasItem   *item,
+                                                    cairo_t          *cr);
+void             gimp_canvas_item_transform_xy     (GimpCanvasItem   *item,
+                                                    gdouble           x,
+                                                    gdouble           y,
+                                                    gint             *tx,
+                                                    gint             *ty);
+void             gimp_canvas_item_transform_xy_f   (GimpCanvasItem   *item,
+                                                    gdouble           x,
+                                                    gdouble           y,
+                                                    gdouble          *tx,
+                                                    gdouble          *ty);
+gdouble          gimp_canvas_item_transform_distance
+                                                   (GimpCanvasItem   *item,
+                                                    gdouble           x1,
+                                                    gdouble           y1,
+                                                    gdouble           x2,
+                                                    gdouble           y2);
+gdouble          gimp_canvas_item_transform_distance_square
+                                                   (GimpCanvasItem   *item,
+                                                    gdouble           x1,
+                                                    gdouble           y1,
+                                                    gdouble           x2,
+                                                    gdouble           y2);
+void             gimp_canvas_item_untransform_viewport
+                                                   (GimpCanvasItem   *item,
+                                                    gint             *x,
+                                                    gint             *y,
+                                                    gint             *w,
+                                                    gint             *h);
+
+
+/*  protected  */
+
+void             _gimp_canvas_item_update          (GimpCanvasItem   *item,
+                                                    cairo_region_t   *region);
+gboolean         _gimp_canvas_item_needs_update    (GimpCanvasItem   *item);
+void             _gimp_canvas_item_stroke          (GimpCanvasItem   *item,
+                                                    cairo_t          *cr);
+void             _gimp_canvas_item_fill            (GimpCanvasItem   *item,
+                                                    cairo_t          *cr);
+
+
+#endif /* __GIMP_CANVAS_ITEM_H__ */
diff --git a/app/display/gimpcanvaslayerboundary.c b/app/display/gimpcanvaslayerboundary.c
new file mode 100644
index 0000000..0e4b43b
--- /dev/null
+++ b/app/display/gimpcanvaslayerboundary.c
@@ -0,0 +1,322 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaslayerboundary.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-floating-selection.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvaslayerboundary.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LAYER,
+  PROP_EDIT_MASK
+};
+
+
+typedef struct _GimpCanvasLayerBoundaryPrivate GimpCanvasLayerBoundaryPrivate;
+
+struct _GimpCanvasLayerBoundaryPrivate
+{
+  GimpLayer *layer;
+  gboolean   edit_mask;
+};
+
+#define GET_PRIVATE(layer_boundary) \
+        ((GimpCanvasLayerBoundaryPrivate *) gimp_canvas_layer_boundary_get_instance_private ((GimpCanvasLayerBoundary *) (layer_boundary)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_layer_boundary_set_property (GObject        *object,
+                                                                 guint           property_id,
+                                                                 const GValue   *value,
+                                                                 GParamSpec     *pspec);
+static void             gimp_canvas_layer_boundary_get_property (GObject        *object,
+                                                                 guint           property_id,
+                                                                 GValue         *value,
+                                                                 GParamSpec     *pspec);
+static void             gimp_canvas_layer_boundary_finalize     (GObject        *object);
+static void             gimp_canvas_layer_boundary_draw         (GimpCanvasItem *item,
+                                                                 cairo_t        *cr);
+static cairo_region_t * gimp_canvas_layer_boundary_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_layer_boundary_stroke       (GimpCanvasItem *item,
+                                                                 cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasLayerBoundary, gimp_canvas_layer_boundary,
+                            GIMP_TYPE_CANVAS_RECTANGLE)
+
+#define parent_class gimp_canvas_layer_boundary_parent_class
+
+
+static void
+gimp_canvas_layer_boundary_class_init (GimpCanvasLayerBoundaryClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_layer_boundary_set_property;
+  object_class->get_property = gimp_canvas_layer_boundary_get_property;
+  object_class->finalize     = gimp_canvas_layer_boundary_finalize;
+
+  item_class->draw           = gimp_canvas_layer_boundary_draw;
+  item_class->get_extents    = gimp_canvas_layer_boundary_get_extents;
+  item_class->stroke         = gimp_canvas_layer_boundary_stroke;
+
+  g_object_class_install_property (object_class, PROP_LAYER,
+                                   g_param_spec_object ("layer", NULL, NULL,
+                                                        GIMP_TYPE_LAYER,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_EDIT_MASK,
+                                   g_param_spec_boolean ("edit-mask", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_layer_boundary_init (GimpCanvasLayerBoundary *layer_boundary)
+{
+}
+
+static void
+gimp_canvas_layer_boundary_finalize (GObject *object)
+{
+  GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (object);
+
+  if (private->layer)
+    g_object_remove_weak_pointer (G_OBJECT (private->layer),
+                                  (gpointer) &private->layer);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_layer_boundary_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER:
+      if (private->layer)
+        g_object_remove_weak_pointer (G_OBJECT (private->layer),
+                                      (gpointer) &private->layer);
+      private->layer = g_value_get_object (value); /* don't ref */
+      if (private->layer)
+        g_object_add_weak_pointer (G_OBJECT (private->layer),
+                                   (gpointer) &private->layer);
+      break;
+    case PROP_EDIT_MASK:
+      private->edit_mask = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_layer_boundary_get_property (GObject    *object,
+                                         guint       property_id,
+                                         GValue     *value,
+                                         GParamSpec *pspec)
+{
+  GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER:
+      g_value_set_object (value, private->layer);
+      break;
+    case PROP_EDIT_MASK:
+      g_value_set_boolean (value, private->edit_mask);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_layer_boundary_draw (GimpCanvasItem *item,
+                                 cairo_t        *cr)
+{
+  GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item);
+
+  if (private->layer)
+    GIMP_CANVAS_ITEM_CLASS (parent_class)->draw (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_layer_boundary_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item);
+
+  if (private->layer)
+    return GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item);
+
+  return NULL;
+}
+
+static void
+gimp_canvas_layer_boundary_stroke (GimpCanvasItem *item,
+                                   cairo_t        *cr)
+{
+  GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item);
+  GimpDisplayShell               *shell   = gimp_canvas_item_get_shell (item);
+
+  gimp_canvas_set_layer_style (gimp_canvas_item_get_canvas (item), cr,
+                               private->layer,
+                               shell->offset_x, shell->offset_y);
+  cairo_stroke (cr);
+}
+
+GimpCanvasItem *
+gimp_canvas_layer_boundary_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_LAYER_BOUNDARY,
+                       "shell", shell,
+                       NULL);
+}
+
+void
+gimp_canvas_layer_boundary_set_layer (GimpCanvasLayerBoundary *boundary,
+                                      GimpLayer               *layer)
+{
+  GimpCanvasLayerBoundaryPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_LAYER_BOUNDARY (boundary));
+  g_return_if_fail (layer == NULL || GIMP_IS_LAYER (layer));
+
+  private = GET_PRIVATE (boundary);
+
+  if (layer && gimp_layer_is_floating_sel (layer))
+    {
+      GimpDrawable *drawable;
+
+      drawable = gimp_layer_get_floating_sel_drawable (layer);
+
+      if (GIMP_IS_CHANNEL (drawable))
+        {
+          /*  if the owner drawable is a channel, show no outline  */
+
+          layer = NULL;
+        }
+      else
+        {
+          /*  otherwise, set the layer to the owner drawable  */
+
+          layer = GIMP_LAYER (drawable);
+        }
+    }
+
+  if (layer != private->layer)
+    {
+      gboolean edit_mask = FALSE;
+
+      gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary));
+
+      if (layer)
+        {
+          GimpItem *item = GIMP_ITEM (layer);
+
+          edit_mask = (gimp_layer_get_mask (layer) &&
+                       gimp_layer_get_edit_mask (layer));
+
+          g_object_set (boundary,
+                        "x",      (gdouble) gimp_item_get_offset_x (item),
+                        "y",      (gdouble) gimp_item_get_offset_y (item),
+                        "width",  (gdouble) gimp_item_get_width  (item),
+                        "height", (gdouble) gimp_item_get_height (item),
+                        NULL);
+        }
+
+      g_object_set (boundary,
+                    "layer",     layer,
+                    "edit-mask", edit_mask,
+                    NULL);
+
+      gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary));
+    }
+  else if (layer && layer == private->layer)
+    {
+      GimpItem *item = GIMP_ITEM (layer);
+      gint      lx, ly, lw, lh;
+      gdouble   x, y, w ,h;
+      gboolean  edit_mask;
+
+      lx = gimp_item_get_offset_x (item);
+      ly = gimp_item_get_offset_y (item);
+      lw = gimp_item_get_width  (item);
+      lh = gimp_item_get_height (item);
+
+      edit_mask = (gimp_layer_get_mask (layer) &&
+                   gimp_layer_get_edit_mask (layer));
+
+      g_object_get (boundary,
+                    "x",      &x,
+                    "y",      &y,
+                    "width",  &w,
+                    "height", &h,
+                    NULL);
+
+      if (lx        != (gint) x ||
+          ly        != (gint) y ||
+          lw        != (gint) w ||
+          lh        != (gint) h ||
+          edit_mask != private->edit_mask)
+        {
+          gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary));
+
+          g_object_set (boundary,
+                        "x",         (gdouble) lx,
+                        "y",         (gdouble) ly,
+                        "width",     (gdouble) lw,
+                        "height",    (gdouble) lh,
+                        "edit-mask", edit_mask,
+                        NULL);
+
+          gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary));
+        }
+    }
+}
diff --git a/app/display/gimpcanvaslayerboundary.h b/app/display/gimpcanvaslayerboundary.h
new file mode 100644
index 0000000..5f90131
--- /dev/null
+++ b/app/display/gimpcanvaslayerboundary.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaslayerboundary.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_LAYER_BOUNDARY_H__
+#define __GIMP_CANVAS_LAYER_BOUNDARY_H__
+
+
+#include "gimpcanvasrectangle.h"
+
+
+#define GIMP_TYPE_CANVAS_LAYER_BOUNDARY            (gimp_canvas_layer_boundary_get_type ())
+#define GIMP_CANVAS_LAYER_BOUNDARY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_LAYER_BOUNDARY, GimpCanvasLayerBoundary))
+#define GIMP_CANVAS_LAYER_BOUNDARY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_LAYER_BOUNDARY, GimpCanvasLayerBoundaryClass))
+#define GIMP_IS_CANVAS_LAYER_BOUNDARY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_LAYER_BOUNDARY))
+#define GIMP_IS_CANVAS_LAYER_BOUNDARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_LAYER_BOUNDARY))
+#define GIMP_CANVAS_LAYER_BOUNDARY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_LAYER_BOUNDARY, GimpCanvasLayerBoundaryClass))
+
+
+typedef struct _GimpCanvasLayerBoundary      GimpCanvasLayerBoundary;
+typedef struct _GimpCanvasLayerBoundaryClass GimpCanvasLayerBoundaryClass;
+
+struct _GimpCanvasLayerBoundary
+{
+  GimpCanvasRectangle  parent_instance;
+};
+
+struct _GimpCanvasLayerBoundaryClass
+{
+  GimpCanvasRectangleClass  parent_class;
+};
+
+
+GType            gimp_canvas_layer_boundary_get_type  (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_layer_boundary_new       (GimpDisplayShell        *shell);
+
+void             gimp_canvas_layer_boundary_set_layer (GimpCanvasLayerBoundary *boundary,
+                                                       GimpLayer               *layer);
+
+
+#endif /* __GIMP_CANVAS_LAYER_BOUNDARY_H__ */
diff --git a/app/display/gimpcanvaslimit.c b/app/display/gimpcanvaslimit.c
new file mode 100644
index 0000000..05dacbb
--- /dev/null
+++ b/app/display/gimpcanvaslimit.c
@@ -0,0 +1,760 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaslimit.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimpcanvaslimit.h"
+#include "gimpdisplayshell.h"
+
+
+#define DASH_LENGTH   4.0
+#define HIT_DISTANCE 16.0
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_X,
+  PROP_Y,
+  PROP_RADIUS,
+  PROP_ASPECT_RATIO,
+  PROP_ANGLE,
+  PROP_DASHED
+};
+
+
+typedef struct _GimpCanvasLimitPrivate GimpCanvasLimitPrivate;
+
+struct _GimpCanvasLimitPrivate
+{
+  GimpLimitType type;
+
+  gdouble       x;
+  gdouble       y;
+  gdouble       radius;
+  gdouble       aspect_ratio;
+  gdouble       angle;
+
+  gboolean      dashed;
+};
+
+#define GET_PRIVATE(limit) \
+        ((GimpCanvasLimitPrivate *) gimp_canvas_limit_get_instance_private ((GimpCanvasLimit *) (limit)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_limit_set_property (GObject        *object,
+                                                        guint           property_id,
+                                                        const GValue   *value,
+                                                        GParamSpec     *pspec);
+static void             gimp_canvas_limit_get_property (GObject        *object,
+                                                        guint           property_id,
+                                                        GValue         *value,
+                                                        GParamSpec     *pspec);
+
+static void             gimp_canvas_limit_draw         (GimpCanvasItem *item,
+                                                        cairo_t        *cr);
+static cairo_region_t * gimp_canvas_limit_get_extents  (GimpCanvasItem *item);
+static gboolean         gimp_canvas_limit_hit          (GimpCanvasItem *item,
+                                                        gdouble         x,
+                                                        gdouble         y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasLimit, gimp_canvas_limit,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_limit_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_canvas_limit_class_init (GimpCanvasLimitClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_limit_set_property;
+  object_class->get_property = gimp_canvas_limit_get_property;
+
+  item_class->draw           = gimp_canvas_limit_draw;
+  item_class->get_extents    = gimp_canvas_limit_get_extents;
+  item_class->hit            = gimp_canvas_limit_hit;
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("type", NULL, NULL,
+                                                      GIMP_TYPE_LIMIT_TYPE,
+                                                      GIMP_LIMIT_CIRCLE,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_RADIUS,
+                                   g_param_spec_double ("radius", NULL, NULL,
+                                                        0.0,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ASPECT_RATIO,
+                                   g_param_spec_double ("aspect-ratio", NULL, NULL,
+                                                        -1.0,
+                                                        +1.0,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ANGLE,
+                                   g_param_spec_double ("angle", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_DASHED,
+                                   g_param_spec_boolean ("dashed", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_limit_init (GimpCanvasLimit *limit)
+{
+}
+
+static void
+gimp_canvas_limit_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpCanvasLimitPrivate *priv = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      priv->type = g_value_get_enum (value);
+      break;
+
+    case PROP_X:
+      priv->x = g_value_get_double (value);
+      break;
+
+    case PROP_Y:
+      priv->y = g_value_get_double (value);
+      break;
+
+    case PROP_RADIUS:
+      priv->radius = g_value_get_double (value);
+      break;
+
+    case PROP_ASPECT_RATIO:
+      priv->aspect_ratio = g_value_get_double (value);
+      break;
+
+    case PROP_ANGLE:
+      priv->angle = g_value_get_double (value);
+      break;
+
+    case PROP_DASHED:
+      priv->dashed = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_limit_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpCanvasLimitPrivate *priv = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, priv->type);
+      break;
+
+    case PROP_X:
+      g_value_set_double (value, priv->x);
+      break;
+
+    case PROP_Y:
+      g_value_set_double (value, priv->y);
+      break;
+
+    case PROP_RADIUS:
+      g_value_set_double (value, priv->radius);
+      break;
+
+    case PROP_ASPECT_RATIO:
+      g_value_set_double (value, priv->aspect_ratio);
+      break;
+
+    case PROP_ANGLE:
+      g_value_set_double (value, priv->angle);
+      break;
+
+    case PROP_DASHED:
+      g_value_set_boolean (value, priv->dashed);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_limit_transform (GimpCanvasItem *item,
+                             gdouble        *x,
+                             gdouble        *y,
+                             gdouble        *rx,
+                             gdouble        *ry)
+{
+  GimpCanvasLimit        *limit      = GIMP_CANVAS_LIMIT (item);
+  GimpCanvasLimitPrivate *priv       = GET_PRIVATE (item);
+  gdouble                 x1, y1;
+  gdouble                 x2, y2;
+  gdouble                 min_radius = 0.0;
+
+  gimp_canvas_limit_get_radii (limit, rx, ry);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   priv->x - *rx, priv->y - *ry,
+                                   &x1,           &y1);
+  gimp_canvas_item_transform_xy_f (item,
+                                   priv->x + *rx, priv->y + *ry,
+                                   &x2,           &y2);
+
+  x1  = floor (x1) + 0.5;
+  y1  = floor (y1) + 0.5;
+
+  x2  = floor (x2) + 0.5;
+  y2  = floor (y2) + 0.5;
+
+  *x  = (x1 + x2) / 2.0;
+  *y  = (y1 + y2) / 2.0;
+
+  *rx = (x2 - x1) / 2.0;
+  *ry = (y2 - y1) / 2.0;
+
+  switch (priv->type)
+    {
+    case GIMP_LIMIT_CIRCLE:
+    case GIMP_LIMIT_SQUARE:
+      min_radius = 2.0;
+      break;
+
+    case GIMP_LIMIT_DIAMOND:
+      min_radius = 3.0;
+      break;
+
+    case GIMP_LIMIT_HORIZONTAL:
+    case GIMP_LIMIT_VERTICAL:
+      min_radius = 1.0;
+      break;
+    }
+
+  *rx = MAX (*rx, min_radius);
+  *ry = MAX (*ry, min_radius);
+}
+
+static void
+gimp_canvas_limit_paint (GimpCanvasItem *item,
+                         cairo_t        *cr)
+{
+  GimpCanvasLimitPrivate *priv  = GET_PRIVATE (item);
+  GimpDisplayShell       *shell = gimp_canvas_item_get_shell (item);
+  gdouble                 x,  y;
+  gdouble                 rx, ry;
+  gdouble                 inf;
+
+  gimp_canvas_limit_transform (item,
+                               &x,  &y,
+                               &rx, &ry);
+
+  cairo_save (cr);
+
+  cairo_translate (cr, x,  y);
+  cairo_rotate    (cr, priv->angle);
+  cairo_scale     (cr, rx, ry);
+
+  inf = MAX (x, shell->disp_width  - x) +
+        MAX (y, shell->disp_height - y);
+
+  switch (priv->type)
+    {
+    case GIMP_LIMIT_CIRCLE:
+      cairo_arc (cr, 0.0, 0.0, 1.0, 0.0, 2.0 * G_PI);
+      break;
+
+    case GIMP_LIMIT_SQUARE:
+      cairo_rectangle (cr, -1.0, -1.0, 2.0, 2.0);
+      break;
+
+    case GIMP_LIMIT_DIAMOND:
+      cairo_move_to (cr,  0.0, -1.0);
+      cairo_line_to (cr, +1.0,  0.0);
+      cairo_line_to (cr,  0.0, +1.0);
+      cairo_line_to (cr, -1.0,  0.0);
+      cairo_close_path (cr);
+      break;
+
+    case GIMP_LIMIT_HORIZONTAL:
+      cairo_move_to (cr, -inf / rx, -1.0);
+      cairo_line_to (cr, +inf / rx, -1.0);
+
+      cairo_move_to (cr, -inf / rx, +1.0);
+      cairo_line_to (cr, +inf / rx, +1.0);
+      break;
+
+    case GIMP_LIMIT_VERTICAL:
+      cairo_move_to (cr, -1.0, -inf / ry);
+      cairo_line_to (cr, -1.0, +inf / ry);
+
+      cairo_move_to (cr, +1.0, -inf / ry);
+      cairo_line_to (cr, +1.0, +inf / ry);
+      break;
+    }
+
+  cairo_restore (cr);
+}
+
+static void
+gimp_canvas_limit_draw (GimpCanvasItem *item,
+                        cairo_t        *cr)
+{
+  GimpCanvasLimitPrivate *priv = GET_PRIVATE (item);
+
+  gimp_canvas_limit_paint (item, cr);
+
+  cairo_save (cr);
+
+  if (priv->dashed)
+    cairo_set_dash (cr, (const gdouble[]) {DASH_LENGTH}, 1, 0.0);
+
+  _gimp_canvas_item_stroke (item, cr);
+
+  cairo_restore (cr);
+}
+
+static cairo_region_t *
+gimp_canvas_limit_get_extents (GimpCanvasItem *item)
+{
+  cairo_t               *cr;
+  cairo_surface_t       *surface;
+  cairo_rectangle_int_t  rectangle;
+  gdouble                x1, y1;
+  gdouble                x2, y2;
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1);
+
+  cr = cairo_create (surface);
+
+  gimp_canvas_limit_paint (item, cr);
+
+  cairo_path_extents (cr,
+                      &x1, &y1,
+                      &x2, &y2);
+
+  cairo_destroy (cr);
+
+  cairo_surface_destroy (surface);
+
+  rectangle.x      = floor (x1 - 1.5);
+  rectangle.y      = floor (y1 - 1.5);
+  rectangle.width  = ceil  (x2 + 1.5) - rectangle.x;
+  rectangle.height = ceil  (y2 + 1.5) - rectangle.y;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static gboolean
+gimp_canvas_limit_hit (GimpCanvasItem *item,
+                       gdouble         x,
+                       gdouble         y)
+{
+  GimpCanvasLimit *limit = GIMP_CANVAS_LIMIT (item);
+  gdouble          bx, by;
+
+  gimp_canvas_limit_boundary_point (limit,
+                                    x,   y,
+                                    &bx, &by);
+
+  return gimp_canvas_item_transform_distance (item,
+                                              x,  y,
+                                              bx, by) <= HIT_DISTANCE;
+}
+
+
+/*  public functions  */
+
+GimpCanvasItem *
+gimp_canvas_limit_new (GimpDisplayShell *shell,
+                       GimpLimitType     type,
+                       gdouble           x,
+                       gdouble           y,
+                       gdouble           radius,
+                       gdouble           aspect_ratio,
+                       gdouble           angle,
+                       gboolean          dashed)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_LIMIT,
+                       "shell",        shell,
+                       "type",         type,
+                       "x",            x,
+                       "y",            y,
+                       "radius",       radius,
+                       "aspect-ratio", aspect_ratio,
+                       "angle",        angle,
+                       "dashed",       dashed,
+                       NULL);
+}
+
+void
+gimp_canvas_limit_get_radii (GimpCanvasLimit  *limit,
+                             gdouble          *rx,
+                             gdouble          *ry)
+{
+  GimpCanvasLimitPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_CANVAS_LIMIT (limit));
+
+  priv = GET_PRIVATE (limit);
+
+  if (priv->aspect_ratio >= 0.0)
+    {
+      if (rx) *rx = priv->radius;
+      if (ry) *ry = priv->radius * (1.0 - priv->aspect_ratio);
+    }
+  else
+    {
+      if (rx) *rx = priv->radius * (1.0 + priv->aspect_ratio);
+      if (ry) *ry = priv->radius;
+    }
+}
+
+gboolean
+gimp_canvas_limit_is_inside (GimpCanvasLimit *limit,
+                             gdouble          x,
+                             gdouble          y)
+{
+  GimpCanvasLimitPrivate *priv;
+  GimpVector2             p;
+  gdouble                 rx, ry;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_LIMIT (limit), FALSE);
+
+  priv = GET_PRIVATE (limit);
+
+  gimp_canvas_limit_get_radii (limit, &rx, &ry);
+
+  if (rx == 0.0 || ry == 0.0)
+    return FALSE;
+
+  p.x = x - priv->x;
+  p.y = y - priv->y;
+
+  gimp_vector2_rotate (&p, +priv->angle);
+
+  p.x = fabs (p.x / rx);
+  p.y = fabs (p.y / ry);
+
+  switch (priv->type)
+    {
+    case GIMP_LIMIT_CIRCLE:
+      return gimp_vector2_length (&p) < 1.0;
+
+    case GIMP_LIMIT_SQUARE:
+      return p.x < 1.0 && p.y < 1.0;
+
+    case GIMP_LIMIT_DIAMOND:
+      return p.x + p.y < 1.0;
+
+    case GIMP_LIMIT_HORIZONTAL:
+      return p.y < 1.0;
+
+    case GIMP_LIMIT_VERTICAL:
+      return p.x < 1.0;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+void
+gimp_canvas_limit_boundary_point (GimpCanvasLimit *limit,
+                                  gdouble          x,
+                                  gdouble          y,
+                                  gdouble         *bx,
+                                  gdouble         *by)
+{
+  GimpCanvasLimitPrivate *priv;
+  GimpVector2             p;
+  gdouble                 rx, ry;
+  gboolean                flip_x = FALSE;
+  gboolean                flip_y = FALSE;
+
+  g_return_if_fail (GIMP_IS_CANVAS_LIMIT (limit));
+  g_return_if_fail (bx != NULL);
+  g_return_if_fail (by != NULL);
+
+  priv = GET_PRIVATE (limit);
+
+  gimp_canvas_limit_get_radii (limit, &rx, &ry);
+
+  p.x = x - priv->x;
+  p.y = y - priv->y;
+
+  gimp_vector2_rotate (&p, +priv->angle);
+
+  if (p.x < 0.0)
+    {
+      p.x = -p.x;
+
+      flip_x = TRUE;
+    }
+
+  if (p.y < 0.0)
+    {
+      p.y = -p.y;
+
+      flip_y = TRUE;
+    }
+
+  switch (priv->type)
+    {
+    case GIMP_LIMIT_CIRCLE:
+      if (rx == ry)
+        {
+          gimp_vector2_normalize (&p);
+
+          gimp_vector2_mul (&p, rx);
+        }
+      else
+        {
+          gdouble a0 = 0.0;
+          gdouble a1 = G_PI / 2.0;
+          gdouble a;
+          gint    i;
+
+          for (i = 0; i < 20; i++)
+            {
+              GimpVector2 r;
+              GimpVector2 n;
+
+              a = (a0 + a1) / 2.0;
+
+              r.x = p.x - rx * cos (a);
+              r.y = p.y - ry * sin (a);
+
+              n.x = 1.0;
+              n.y = tan (a) * rx / ry;
+
+              if (gimp_vector2_cross_product (&r, &n).x >= 0.0)
+                a1 = a;
+              else
+                a0 = a;
+            }
+
+          a = (a0 + a1) / 2.0;
+
+          p.x = rx * cos (a);
+          p.y = ry * sin (a);
+        }
+      break;
+
+    case GIMP_LIMIT_SQUARE:
+      if (p.x <= rx || p.y <= ry)
+        {
+          if (rx - p.x <= ry - p.y)
+            p.x = rx;
+          else
+            p.y = ry;
+        }
+      else
+        {
+          p.x = rx;
+          p.y = ry;
+        }
+      break;
+
+    case GIMP_LIMIT_DIAMOND:
+      {
+        GimpVector2 l;
+        GimpVector2 r;
+        gdouble     t;
+
+        l.x = rx;
+        l.y = -ry;
+
+        r.x = p.x;
+        r.y = p.y - ry;
+
+        t = gimp_vector2_inner_product (&r, &l) /
+            gimp_vector2_inner_product (&l, &l);
+        t = CLAMP (t, 0.0, 1.0);
+
+        p.x = rx * t;
+        p.y = ry * (1.0 - t);
+      }
+      break;
+
+    case GIMP_LIMIT_HORIZONTAL:
+      p.y = ry;
+      break;
+
+    case GIMP_LIMIT_VERTICAL:
+      p.x = rx;
+      break;
+    }
+
+  if (flip_x)
+    p.x = -p.x;
+
+  if (flip_y)
+    p.y = -p.y;
+
+  gimp_vector2_rotate (&p, -priv->angle);
+
+  *bx = priv->x + p.x;
+  *by = priv->y + p.y;
+}
+
+gdouble
+gimp_canvas_limit_boundary_radius (GimpCanvasLimit *limit,
+                                   gdouble          x,
+                                   gdouble          y)
+{
+  GimpCanvasLimitPrivate *priv;
+  GimpVector2             p;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_LIMIT (limit), 0.0);
+
+  priv = GET_PRIVATE (limit);
+
+  p.x = x - priv->x;
+  p.y = y - priv->y;
+
+  gimp_vector2_rotate (&p, +priv->angle);
+
+  p.x = fabs (p.x);
+  p.y = fabs (p.y);
+
+  if (priv->aspect_ratio >= 0.0)
+    p.y /= 1.0 - priv->aspect_ratio;
+  else
+    p.x /= 1.0 + priv->aspect_ratio;
+
+  switch (priv->type)
+    {
+    case GIMP_LIMIT_CIRCLE:
+      return gimp_vector2_length (&p);
+
+    case GIMP_LIMIT_SQUARE:
+      return MAX (p.x, p.y);
+
+    case GIMP_LIMIT_DIAMOND:
+      return p.x + p.y;
+
+    case GIMP_LIMIT_HORIZONTAL:
+      return p.y;
+
+    case GIMP_LIMIT_VERTICAL:
+      return p.x;
+    }
+
+  g_return_val_if_reached (0.0);
+}
+
+void
+gimp_canvas_limit_center_point (GimpCanvasLimit *limit,
+                                gdouble          x,
+                                gdouble          y,
+                                gdouble         *cx,
+                                gdouble         *cy)
+{
+  GimpCanvasLimitPrivate *priv;
+  GimpVector2             p;
+
+  g_return_if_fail (GIMP_IS_CANVAS_LIMIT (limit));
+  g_return_if_fail (cx != NULL);
+  g_return_if_fail (cy != NULL);
+
+  priv = GET_PRIVATE (limit);
+
+  p.x = x - priv->x;
+  p.y = y - priv->y;
+
+  gimp_vector2_rotate (&p, +priv->angle);
+
+  switch (priv->type)
+    {
+    case GIMP_LIMIT_CIRCLE:
+    case GIMP_LIMIT_SQUARE:
+    case GIMP_LIMIT_DIAMOND:
+      p.x = 0.0;
+      p.y = 0.0;
+      break;
+
+    case GIMP_LIMIT_HORIZONTAL:
+      p.y = 0.0;
+      break;
+
+    case GIMP_LIMIT_VERTICAL:
+      p.x = 0.0;
+      break;
+    }
+
+  gimp_vector2_rotate (&p, -priv->angle);
+
+  *cx = priv->x + p.x;
+  *cy = priv->y + p.y;
+}
diff --git a/app/display/gimpcanvaslimit.h b/app/display/gimpcanvaslimit.h
new file mode 100644
index 0000000..cf6ffc8
--- /dev/null
+++ b/app/display/gimpcanvaslimit.h
@@ -0,0 +1,84 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaslimit.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_LIMIT_H__
+#define __GIMP_CANVAS_LIMIT_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_LIMIT            (gimp_canvas_limit_get_type ())
+#define GIMP_CANVAS_LIMIT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_LIMIT, GimpCanvasLimit))
+#define GIMP_CANVAS_LIMIT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_LIMIT, GimpCanvasLimitClass))
+#define GIMP_IS_CANVAS_LIMIT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_LIMIT))
+#define GIMP_IS_CANVAS_LIMIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_LIMIT))
+#define GIMP_CANVAS_LIMIT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_LIMIT, GimpCanvasLimitClass))
+
+
+typedef struct _GimpCanvasLimit      GimpCanvasLimit;
+typedef struct _GimpCanvasLimitClass GimpCanvasLimitClass;
+
+struct _GimpCanvasLimit
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasLimitClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_limit_get_type        (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_limit_new             (GimpDisplayShell *shell,
+                                                    GimpLimitType     type,
+                                                    gdouble           x,
+                                                    gdouble           y,
+                                                    gdouble           radius,
+                                                    gdouble           aspect_ratio,
+                                                    gdouble           angle,
+                                                    gboolean          dashed);
+
+void             gimp_canvas_limit_get_radii       (GimpCanvasLimit  *limit,
+                                                    gdouble          *rx,
+                                                    gdouble          *ry);
+
+gboolean         gimp_canvas_limit_is_inside       (GimpCanvasLimit  *limit,
+                                                    gdouble           x,
+                                                    gdouble           y);
+void             gimp_canvas_limit_boundary_point  (GimpCanvasLimit  *limit,
+                                                    gdouble           x,
+                                                    gdouble           y,
+                                                    gdouble          *bx,
+                                                    gdouble          *by);
+gdouble          gimp_canvas_limit_boundary_radius (GimpCanvasLimit  *limit,
+                                                    gdouble           x,
+                                                    gdouble           y);
+
+void             gimp_canvas_limit_center_point    (GimpCanvasLimit  *limit,
+                                                    gdouble           x,
+                                                    gdouble           y,
+                                                    gdouble          *cx,
+                                                    gdouble          *cy);
+
+
+#endif /* __GIMP_CANVAS_LIMIT_H__ */
diff --git a/app/display/gimpcanvasline.c b/app/display/gimpcanvasline.c
new file mode 100644
index 0000000..38a00c8
--- /dev/null
+++ b/app/display/gimpcanvasline.c
@@ -0,0 +1,281 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasline.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvasline.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2
+};
+
+
+typedef struct _GimpCanvasLinePrivate GimpCanvasLinePrivate;
+
+struct _GimpCanvasLinePrivate
+{
+  gdouble  x1;
+  gdouble  y1;
+  gdouble  x2;
+  gdouble  y2;
+};
+
+#define GET_PRIVATE(line) \
+        ((GimpCanvasLinePrivate *) gimp_canvas_line_get_instance_private ((GimpCanvasLine *) (line)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_line_set_property (GObject        *object,
+                                                       guint           property_id,
+                                                       const GValue   *value,
+                                                       GParamSpec     *pspec);
+static void             gimp_canvas_line_get_property (GObject        *object,
+                                                       guint           property_id,
+                                                       GValue         *value,
+                                                       GParamSpec     *pspec);
+static void             gimp_canvas_line_draw         (GimpCanvasItem *item,
+                                                       cairo_t        *cr);
+static cairo_region_t * gimp_canvas_line_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasLine, gimp_canvas_line,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_line_parent_class
+
+
+static void
+gimp_canvas_line_class_init (GimpCanvasLineClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_line_set_property;
+  object_class->get_property = gimp_canvas_line_get_property;
+
+  item_class->draw           = gimp_canvas_line_draw;
+  item_class->get_extents    = gimp_canvas_line_get_extents;
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_double ("x1", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_double ("y1", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_double ("x2", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_double ("y2", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_line_init (GimpCanvasLine *line)
+{
+}
+
+static void
+gimp_canvas_line_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpCanvasLinePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X1:
+      private->x1 = g_value_get_double (value);
+      break;
+    case PROP_Y1:
+      private->y1 = g_value_get_double (value);
+      break;
+    case PROP_X2:
+      private->x2 = g_value_get_double (value);
+      break;
+    case PROP_Y2:
+      private->y2 = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_line_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpCanvasLinePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X1:
+      g_value_set_double (value, private->x1);
+      break;
+    case PROP_Y1:
+      g_value_set_double (value, private->y1);
+      break;
+    case PROP_X2:
+      g_value_set_double (value, private->x2);
+      break;
+    case PROP_Y2:
+      g_value_set_double (value, private->y2);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_line_transform (GimpCanvasItem *item,
+                            gdouble        *x1,
+                            gdouble        *y1,
+                            gdouble        *x2,
+                            gdouble        *y2)
+{
+  GimpCanvasLinePrivate *private = GET_PRIVATE (item);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->x1, private->y1,
+                                   x1, y1);
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->x2, private->y2,
+                                   x2, y2);
+
+  *x1 = floor (*x1) + 0.5;
+  *y1 = floor (*y1) + 0.5;
+  *x2 = floor (*x2) + 0.5;
+  *y2 = floor (*y2) + 0.5;
+}
+
+static void
+gimp_canvas_line_draw (GimpCanvasItem *item,
+                       cairo_t        *cr)
+{
+  gdouble x1, y1;
+  gdouble x2, y2;
+
+  gimp_canvas_line_transform (item, &x1, &y1, &x2, &y2);
+
+  cairo_move_to (cr, x1, y1);
+  cairo_line_to (cr, x2, y2);
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_line_get_extents (GimpCanvasItem *item)
+{
+  cairo_rectangle_int_t rectangle;
+  gdouble               x1, y1;
+  gdouble               x2, y2;
+
+  gimp_canvas_line_transform (item, &x1, &y1, &x2, &y2);
+
+  if (x1 == x2 || y1 == y2)
+    {
+      rectangle.x      = MIN (x1, x2) - 1.5;
+      rectangle.y      = MIN (y1, y2) - 1.5;
+      rectangle.width  = ABS (x2 - x1) + 3.0;
+      rectangle.height = ABS (y2 - y1) + 3.0;
+    }
+  else
+    {
+      rectangle.x      = floor (MIN (x1, x2) - 2.5);
+      rectangle.y      = floor (MIN (y1, y2) - 2.5);
+      rectangle.width  = ceil (ABS (x2 - x1) + 5.0);
+      rectangle.height = ceil (ABS (y2 - y1) + 5.0);
+    }
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_line_new (GimpDisplayShell *shell,
+                      gdouble           x1,
+                      gdouble           y1,
+                      gdouble           x2,
+                      gdouble           y2)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_LINE,
+                       "shell", shell,
+                       "x1",    x1,
+                       "y1",    y1,
+                       "x2",    x2,
+                       "y2",    y2,
+                       NULL);
+}
+
+void
+gimp_canvas_line_set (GimpCanvasItem *line,
+                      gdouble         x1,
+                      gdouble         y1,
+                      gdouble         x2,
+                      gdouble         y2)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_LINE (line));
+
+  gimp_canvas_item_begin_change (line);
+
+  g_object_set (line,
+                "x1", x1,
+                "y1", y1,
+                "x2", x2,
+                "y2", y2,
+                NULL);
+
+  gimp_canvas_item_end_change (line);
+}
diff --git a/app/display/gimpcanvasline.h b/app/display/gimpcanvasline.h
new file mode 100644
index 0000000..6f3f5f2
--- /dev/null
+++ b/app/display/gimpcanvasline.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasline.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_LINE_H__
+#define __GIMP_CANVAS_LINE_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_LINE            (gimp_canvas_line_get_type ())
+#define GIMP_CANVAS_LINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_LINE, GimpCanvasLine))
+#define GIMP_CANVAS_LINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_LINE, GimpCanvasLineClass))
+#define GIMP_IS_CANVAS_LINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_LINE))
+#define GIMP_IS_CANVAS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_LINE))
+#define GIMP_CANVAS_LINE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_LINE, GimpCanvasLineClass))
+
+
+typedef struct _GimpCanvasLine      GimpCanvasLine;
+typedef struct _GimpCanvasLineClass GimpCanvasLineClass;
+
+struct _GimpCanvasLine
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasLineClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_line_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_line_new      (GimpDisplayShell *shell,
+                                            gdouble           x1,
+                                            gdouble           y1,
+                                            gdouble           x2,
+                                            gdouble           y2);
+
+void             gimp_canvas_line_set      (GimpCanvasItem   *line,
+                                            gdouble           x1,
+                                            gdouble           y1,
+                                            gdouble           x2,
+                                            gdouble           y2);
+
+
+#endif /* __GIMP_CANVAS_LINE_H__ */
diff --git a/app/display/gimpcanvaspassepartout.c b/app/display/gimpcanvaspassepartout.c
new file mode 100644
index 0000000..21e7307
--- /dev/null
+++ b/app/display/gimpcanvaspassepartout.c
@@ -0,0 +1,235 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspassepartout.c
+ * Copyright (C) 2010 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpcanvaspassepartout.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scale.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OPACITY,
+};
+
+
+typedef struct _GimpCanvasPassePartoutPrivate GimpCanvasPassePartoutPrivate;
+
+struct _GimpCanvasPassePartoutPrivate
+{
+  gdouble opacity;
+};
+
+#define GET_PRIVATE(item) \
+        ((GimpCanvasPassePartoutPrivate *) gimp_canvas_passe_partout_get_instance_private ((GimpCanvasPassePartout *) (item)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_passe_partout_set_property (GObject        *object,
+                                                                guint           property_id,
+                                                                const GValue   *value,
+                                                                GParamSpec     *pspec);
+static void             gimp_canvas_passe_partout_get_property (GObject        *object,
+                                                                guint           property_id,
+                                                                GValue         *value,
+                                                                GParamSpec     *pspec);
+static void             gimp_canvas_passe_partout_draw         (GimpCanvasItem *item,
+                                                                cairo_t        *cr);
+static cairo_region_t * gimp_canvas_passe_partout_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_passe_partout_fill         (GimpCanvasItem *item,
+                                                                cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasPassePartout, gimp_canvas_passe_partout,
+                            GIMP_TYPE_CANVAS_RECTANGLE)
+
+#define parent_class gimp_canvas_passe_partout_parent_class
+
+
+static void
+gimp_canvas_passe_partout_class_init (GimpCanvasPassePartoutClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_passe_partout_set_property;
+  object_class->get_property = gimp_canvas_passe_partout_get_property;
+
+  item_class->draw           = gimp_canvas_passe_partout_draw;
+  item_class->get_extents    = gimp_canvas_passe_partout_get_extents;
+  item_class->fill           = gimp_canvas_passe_partout_fill;
+
+  g_object_class_install_property (object_class, PROP_OPACITY,
+                                   g_param_spec_double ("opacity", NULL, NULL,
+                                                        0.0,
+                                                        1.0, 0.5,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_passe_partout_init (GimpCanvasPassePartout *passe_partout)
+{
+}
+
+static void
+gimp_canvas_passe_partout_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpCanvasPassePartoutPrivate *priv = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_OPACITY:
+      priv->opacity = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_passe_partout_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpCanvasPassePartoutPrivate *priv = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_OPACITY:
+      g_value_set_double (value, priv->opacity);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_passe_partout_draw (GimpCanvasItem *item,
+                                cairo_t        *cr)
+{
+  GimpDisplayShell *shell = gimp_canvas_item_get_shell (item);
+  gint              x, y;
+  gint              w, h;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      x = -shell->offset_x;
+      y = -shell->offset_y;
+
+      gimp_display_shell_scale_get_image_size (shell, &w, &h);
+    }
+  else
+    {
+      gimp_canvas_item_untransform_viewport (item, &x, &y, &w, &h);
+    }
+
+  cairo_rectangle (cr, x, y, w, h);
+
+  GIMP_CANVAS_ITEM_CLASS (parent_class)->draw (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_passe_partout_get_extents (GimpCanvasItem *item)
+{
+  GimpDisplayShell      *shell = gimp_canvas_item_get_shell (item);
+  cairo_rectangle_int_t  rectangle;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      cairo_region_t *inner;
+      cairo_region_t *outer;
+
+      rectangle.x = - shell->offset_x;
+      rectangle.y = - shell->offset_y;
+      gimp_display_shell_scale_get_image_size (shell,
+                                               &rectangle.width,
+                                               &rectangle.height);
+
+      outer = cairo_region_create_rectangle (&rectangle);
+
+      inner = GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item);
+
+      cairo_region_xor (outer, inner);
+
+      cairo_region_destroy (inner);
+
+      return outer;
+    }
+  else
+    {
+      gimp_canvas_item_untransform_viewport (item,
+                                             &rectangle.x,
+                                             &rectangle.y,
+                                             &rectangle.width,
+                                             &rectangle.height);
+
+      return cairo_region_create_rectangle (&rectangle);
+    }
+}
+
+static void
+gimp_canvas_passe_partout_fill (GimpCanvasItem *item,
+                                cairo_t        *cr)
+{
+  GimpCanvasPassePartoutPrivate *priv = GET_PRIVATE (item);
+
+  cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+  cairo_clip (cr);
+
+  gimp_canvas_set_passe_partout_style (gimp_canvas_item_get_canvas (item), cr);
+  cairo_paint_with_alpha (cr, priv->opacity);
+}
+
+GimpCanvasItem *
+gimp_canvas_passe_partout_new (GimpDisplayShell *shell,
+                               gdouble           x,
+                               gdouble           y,
+                               gdouble           width,
+                               gdouble           height)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_PASSE_PARTOUT,
+                       "shell", shell,
+                       "x",      x,
+                       "y",      y,
+                       "width",  width,
+                       "height", height,
+                       "filled", TRUE,
+                       NULL);
+}
diff --git a/app/display/gimpcanvaspassepartout.h b/app/display/gimpcanvaspassepartout.h
new file mode 100644
index 0000000..7356e3a
--- /dev/null
+++ b/app/display/gimpcanvaspassepartout.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspassepartout.h
+ * Copyright (C) 2010 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_PASSE_PARTOUT_H__
+#define __GIMP_CANVAS_PASSE_PARTOUT_H__
+
+
+#include "gimpcanvasrectangle.h"
+
+
+#define GIMP_TYPE_CANVAS_PASSE_PARTOUT            (gimp_canvas_passe_partout_get_type ())
+#define GIMP_CANVAS_PASSE_PARTOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_PASSE_PARTOUT, GimpCanvasPassePartout))
+#define GIMP_CANVAS_PASSE_PARTOUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_PASSE_PARTOUT, GimpCanvasPassePartoutClass))
+#define GIMP_IS_CANVAS_PASSE_PARTOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_PASSE_PARTOUT))
+#define GIMP_IS_CANVAS_PASSE_PARTOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_PASSE_PARTOUT))
+#define GIMP_CANVAS_PASSE_PARTOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_PASSE_PARTOUT, GimpCanvasPassePartoutClass))
+
+
+typedef struct _GimpCanvasPassePartout      GimpCanvasPassePartout;
+typedef struct _GimpCanvasPassePartoutClass GimpCanvasPassePartoutClass;
+
+struct _GimpCanvasPassePartout
+{
+  GimpCanvasRectangle  parent_instance;
+};
+
+struct _GimpCanvasPassePartoutClass
+{
+  GimpCanvasRectangleClass  parent_class;
+};
+
+
+GType            gimp_canvas_passe_partout_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_passe_partout_new      (GimpDisplayShell *shell,
+                                                     gdouble           x,
+                                                     gdouble           y,
+                                                     gdouble           width,
+                                                     gdouble           height);
+
+
+#endif /* __GIMP_CANVAS_PASSE_PARTOUT_H__ */
diff --git a/app/display/gimpcanvaspath.c b/app/display/gimpcanvaspath.c
new file mode 100644
index 0000000..71a001f
--- /dev/null
+++ b/app/display/gimpcanvaspath.c
@@ -0,0 +1,352 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspath.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpbezierdesc.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvaspath.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PATH,
+  PROP_X,
+  PROP_Y,
+  PROP_FILLED,
+  PROP_PATH_STYLE
+};
+
+
+typedef struct _GimpCanvasPathPrivate GimpCanvasPathPrivate;
+
+struct _GimpCanvasPathPrivate
+{
+  cairo_path_t *path;
+  gdouble       x;
+  gdouble       y;
+  gboolean      filled;
+  GimpPathStyle path_style;
+};
+
+#define GET_PRIVATE(path) \
+        ((GimpCanvasPathPrivate *) gimp_canvas_path_get_instance_private ((GimpCanvasPath *) (path)))
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_path_finalize     (GObject        *object);
+static void             gimp_canvas_path_set_property (GObject        *object,
+                                                       guint           property_id,
+                                                       const GValue   *value,
+                                                       GParamSpec     *pspec);
+static void             gimp_canvas_path_get_property (GObject        *object,
+                                                       guint           property_id,
+                                                       GValue         *value,
+                                                       GParamSpec     *pspec);
+static void             gimp_canvas_path_draw         (GimpCanvasItem *item,
+                                                       cairo_t        *cr);
+static cairo_region_t * gimp_canvas_path_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_path_stroke       (GimpCanvasItem *item,
+                                                       cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasPath, gimp_canvas_path,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_path_parent_class
+
+
+static void
+gimp_canvas_path_class_init (GimpCanvasPathClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_path_finalize;
+  object_class->set_property = gimp_canvas_path_set_property;
+  object_class->get_property = gimp_canvas_path_get_property;
+
+  item_class->draw           = gimp_canvas_path_draw;
+  item_class->get_extents    = gimp_canvas_path_get_extents;
+  item_class->stroke         = gimp_canvas_path_stroke;
+
+  g_object_class_install_property (object_class, PROP_PATH,
+                                   g_param_spec_boxed ("path", NULL, NULL,
+                                                       GIMP_TYPE_BEZIER_DESC,
+                                                       GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_FILLED,
+                                   g_param_spec_boolean ("filled", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+
+  g_object_class_install_property (object_class, PROP_PATH_STYLE,
+                                   g_param_spec_enum ("path-style", NULL, NULL,
+                                                      GIMP_TYPE_PATH_STYLE,
+                                                      GIMP_PATH_STYLE_DEFAULT,
+                                                      GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_path_init (GimpCanvasPath *path)
+{
+}
+
+static void
+gimp_canvas_path_finalize (GObject *object)
+{
+  GimpCanvasPathPrivate *private = GET_PRIVATE (object);
+
+  if (private->path)
+    {
+      gimp_bezier_desc_free (private->path);
+      private->path = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_path_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpCanvasPathPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_PATH:
+      if (private->path)
+        gimp_bezier_desc_free (private->path);
+      private->path = g_value_dup_boxed (value);
+      break;
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case PROP_FILLED:
+      private->filled = g_value_get_boolean (value);
+      break;
+    case PROP_PATH_STYLE:
+      private->path_style = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_path_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpCanvasPathPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_PATH:
+      g_value_set_boxed (value, private->path);
+      break;
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case PROP_FILLED:
+      g_value_set_boolean (value, private->filled);
+      break;
+    case PROP_PATH_STYLE:
+      g_value_set_enum (value, private->path_style);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_path_draw (GimpCanvasItem *item,
+                       cairo_t        *cr)
+{
+  GimpCanvasPathPrivate *private = GET_PRIVATE (item);
+
+  if (private->path)
+    {
+      cairo_save (cr);
+      gimp_canvas_item_transform (item, cr);
+      cairo_translate (cr, private->x, private->y);
+
+      cairo_append_path (cr, private->path);
+      cairo_restore (cr);
+
+      if (private->filled)
+        _gimp_canvas_item_fill (item, cr);
+      else
+        _gimp_canvas_item_stroke (item, cr);
+    }
+}
+
+static cairo_region_t *
+gimp_canvas_path_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasPathPrivate *private = GET_PRIVATE (item);
+  GtkWidget             *canvas  = gimp_canvas_item_get_canvas (item);
+
+  if (private->path && gtk_widget_get_realized (canvas))
+    {
+      cairo_t               *cr;
+      cairo_rectangle_int_t  rectangle;
+      gdouble                x1, y1, x2, y2;
+
+      cr = gdk_cairo_create (gtk_widget_get_window (canvas));
+
+      cairo_save (cr);
+      gimp_canvas_item_transform (item, cr);
+      cairo_translate (cr, private->x, private->y);
+
+      cairo_append_path (cr, private->path);
+      cairo_restore (cr);
+
+      cairo_path_extents (cr, &x1, &y1, &x2, &y2);
+
+      cairo_destroy (cr);
+
+      if (private->filled)
+        {
+          rectangle.x      = floor (x1 - 1.0);
+          rectangle.y      = floor (y1 - 1.0);
+          rectangle.width  = ceil (x2 + 1.0) - rectangle.x;
+          rectangle.height = ceil (y2 + 1.0) - rectangle.y;
+        }
+      else
+        {
+          rectangle.x      = floor (x1 - 1.5);
+          rectangle.y      = floor (y1 - 1.5);
+          rectangle.width  = ceil (x2 + 1.5) - rectangle.x;
+          rectangle.height = ceil (y2 + 1.5) - rectangle.y;
+        }
+
+      return cairo_region_create_rectangle (&rectangle);
+    }
+
+  return NULL;
+}
+
+static void
+gimp_canvas_path_stroke (GimpCanvasItem *item,
+                         cairo_t        *cr)
+{
+  GimpCanvasPathPrivate *private = GET_PRIVATE (item);
+  GtkWidget             *canvas  = gimp_canvas_item_get_canvas (item);
+  gboolean               active;
+
+  switch (private->path_style)
+    {
+    case GIMP_PATH_STYLE_VECTORS:
+      active = gimp_canvas_item_get_highlight (item);
+
+      gimp_canvas_set_vectors_bg_style (canvas, cr, active);
+      cairo_stroke_preserve (cr);
+
+      gimp_canvas_set_vectors_fg_style (canvas, cr, active);
+      cairo_stroke (cr);
+      break;
+
+    case GIMP_PATH_STYLE_OUTLINE:
+      gimp_canvas_set_outline_bg_style (canvas, cr);
+      cairo_stroke_preserve (cr);
+
+      gimp_canvas_set_outline_fg_style (canvas, cr);
+      cairo_stroke (cr);
+      break;
+
+    case GIMP_PATH_STYLE_DEFAULT:
+      GIMP_CANVAS_ITEM_CLASS (parent_class)->stroke (item, cr);
+      break;
+    }
+}
+
+GimpCanvasItem *
+gimp_canvas_path_new (GimpDisplayShell     *shell,
+                      const GimpBezierDesc *bezier,
+                      gdouble               x,
+                      gdouble               y,
+                      gboolean              filled,
+                      GimpPathStyle         style)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_PATH,
+                       "shell",      shell,
+                       "path",       bezier,
+                       "x",          x,
+                       "y",          y,
+                       "filled",     filled,
+                       "path-style", style,
+                       NULL);
+}
+
+void
+gimp_canvas_path_set (GimpCanvasItem       *path,
+                      const GimpBezierDesc *bezier)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_PATH (path));
+
+  gimp_canvas_item_begin_change (path);
+
+  g_object_set (path,
+                "path", bezier,
+                NULL);
+
+  gimp_canvas_item_end_change (path);
+}
diff --git a/app/display/gimpcanvaspath.h b/app/display/gimpcanvaspath.h
new file mode 100644
index 0000000..03fbb01
--- /dev/null
+++ b/app/display/gimpcanvaspath.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program Copyright (C) 1995
+ * Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspolygon.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_PATH_H__
+#define __GIMP_CANVAS_PATH_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_PATH            (gimp_canvas_path_get_type ())
+#define GIMP_CANVAS_PATH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_PATH, GimpCanvasPath))
+#define GIMP_CANVAS_PATH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_PATH, GimpCanvasPathClass))
+#define GIMP_IS_CANVAS_PATH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_PATH))
+#define GIMP_IS_CANVAS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_PATH))
+#define GIMP_CANVAS_PATH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_PATH, GimpCanvasPathClass))
+
+
+typedef struct _GimpCanvasPath      GimpCanvasPath;
+typedef struct _GimpCanvasPathClass GimpCanvasPathClass;
+
+struct _GimpCanvasPath
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasPathClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_path_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_path_new      (GimpDisplayShell     *shell,
+                                            const GimpBezierDesc *bezier,
+                                            gdouble               x,
+                                            gdouble               y,
+                                            gboolean              filled,
+                                            GimpPathStyle         style);
+
+void             gimp_canvas_path_set      (GimpCanvasItem       *path,
+                                            const GimpBezierDesc *bezier);
+
+
+#endif /* __GIMP_CANVAS_PATH_H__ */
diff --git a/app/display/gimpcanvaspen.c b/app/display/gimpcanvaspen.c
new file mode 100644
index 0000000..d0d01f9
--- /dev/null
+++ b/app/display/gimpcanvaspen.c
@@ -0,0 +1,231 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspen.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimpcanvas-style.h"
+#include "gimpcanvaspen.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_COLOR,
+  PROP_WIDTH
+};
+
+
+typedef struct _GimpCanvasPenPrivate GimpCanvasPenPrivate;
+
+struct _GimpCanvasPenPrivate
+{
+  GimpRGB color;
+  gint    width;
+};
+
+#define GET_PRIVATE(pen) \
+        ((GimpCanvasPenPrivate *) gimp_canvas_pen_get_instance_private ((GimpCanvasPen *) (pen)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_pen_set_property (GObject        *object,
+                                                      guint           property_id,
+                                                      const GValue   *value,
+                                                      GParamSpec     *pspec);
+static void             gimp_canvas_pen_get_property (GObject        *object,
+                                                      guint           property_id,
+                                                      GValue         *value,
+                                                      GParamSpec     *pspec);
+static cairo_region_t * gimp_canvas_pen_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_pen_stroke       (GimpCanvasItem *item,
+                                                      cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasPen, gimp_canvas_pen,
+                            GIMP_TYPE_CANVAS_POLYGON)
+
+#define parent_class gimp_canvas_pen_parent_class
+
+
+static void
+gimp_canvas_pen_class_init (GimpCanvasPenClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_pen_set_property;
+  object_class->get_property = gimp_canvas_pen_get_property;
+
+  item_class->get_extents    = gimp_canvas_pen_get_extents;
+  item_class->stroke         = gimp_canvas_pen_stroke;
+
+  g_object_class_install_property (object_class, PROP_COLOR,
+                                   gimp_param_spec_rgb ("color", NULL, NULL,
+                                                        FALSE, NULL,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width", NULL, NULL,
+                                                     1, G_MAXINT, 1,
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_pen_init (GimpCanvasPen *pen)
+{
+}
+
+static void
+gimp_canvas_pen_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpCanvasPenPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_COLOR:
+      gimp_value_get_rgb (value, &private->color);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_pen_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpCanvasPenPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_COLOR:
+      gimp_value_set_rgb (value, &private->color);
+      break;
+    case PROP_WIDTH:
+      g_value_set_int (value, private->width);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static cairo_region_t *
+gimp_canvas_pen_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasPenPrivate *private = GET_PRIVATE (item);
+  cairo_region_t       *region;
+
+  region = GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item);
+
+  if (region)
+    {
+      cairo_rectangle_int_t rectangle;
+
+      cairo_region_get_extents (region, &rectangle);
+
+      rectangle.x      -= ceil (private->width / 2.0);
+      rectangle.y      -= ceil (private->width / 2.0);
+      rectangle.width  += private->width + 1;
+      rectangle.height += private->width + 1;
+
+      cairo_region_union_rectangle (region, &rectangle);
+    }
+
+  return region;
+}
+
+static void
+gimp_canvas_pen_stroke (GimpCanvasItem *item,
+                        cairo_t        *cr)
+{
+  GimpCanvasPenPrivate *private = GET_PRIVATE (item);
+
+  gimp_canvas_set_pen_style (gimp_canvas_item_get_canvas (item), cr,
+                             &private->color, private->width);
+  cairo_stroke (cr);
+}
+
+GimpCanvasItem *
+gimp_canvas_pen_new (GimpDisplayShell  *shell,
+                     const GimpVector2 *points,
+                     gint               n_points,
+                     GimpContext       *context,
+                     GimpActiveColor    color,
+                     gint               width)
+{
+  GimpCanvasItem *item;
+  GimpArray      *array;
+  GimpRGB         rgb;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (points != NULL && n_points > 1, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  array = gimp_array_new ((const guint8 *) points,
+                          n_points * sizeof (GimpVector2), TRUE);
+
+  switch (color)
+    {
+    case GIMP_ACTIVE_COLOR_FOREGROUND:
+      gimp_context_get_foreground (context, &rgb);
+      break;
+
+    case GIMP_ACTIVE_COLOR_BACKGROUND:
+      gimp_context_get_background (context, &rgb);
+      break;
+    }
+
+  item = g_object_new (GIMP_TYPE_CANVAS_PEN,
+                       "shell",  shell,
+                       "points", array,
+                       "color",  &rgb,
+                       "width",  width,
+                       NULL);
+
+  gimp_array_free (array);
+
+  return item;
+}
diff --git a/app/display/gimpcanvaspen.h b/app/display/gimpcanvaspen.h
new file mode 100644
index 0000000..3380790
--- /dev/null
+++ b/app/display/gimpcanvaspen.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program Copyright (C) 1995
+ * Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspen.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_PEN_H__
+#define __GIMP_CANVAS_PEN_H__
+
+
+#include "gimpcanvaspolygon.h"
+
+
+#define GIMP_TYPE_CANVAS_PEN            (gimp_canvas_pen_get_type ())
+#define GIMP_CANVAS_PEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_PEN, GimpCanvasPen))
+#define GIMP_CANVAS_PEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_PEN, GimpCanvasPenClass))
+#define GIMP_IS_CANVAS_PEN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_PEN))
+#define GIMP_IS_CANVAS_PEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_PEN))
+#define GIMP_CANVAS_PEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_PEN, GimpCanvasPenClass))
+
+
+typedef struct _GimpCanvasPen      GimpCanvasPen;
+typedef struct _GimpCanvasPenClass GimpCanvasPenClass;
+
+struct _GimpCanvasPen
+{
+  GimpCanvasPolygon  parent_instance;
+};
+
+struct _GimpCanvasPenClass
+{
+  GimpCanvasPolygonClass  parent_class;
+};
+
+
+GType            gimp_canvas_pen_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_pen_new      (GimpDisplayShell  *shell,
+                                           const GimpVector2 *points,
+                                           gint               n_points,
+                                           GimpContext       *context,
+                                           GimpActiveColor    color,
+                                           gint               width);
+
+
+#endif /* __GIMP_CANVAS_PEN_H__ */
diff --git a/app/display/gimpcanvaspolygon.c b/app/display/gimpcanvaspolygon.c
new file mode 100644
index 0000000..9c670e7
--- /dev/null
+++ b/app/display/gimpcanvaspolygon.c
@@ -0,0 +1,505 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspolygon.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimpcanvaspolygon.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_POINTS,
+  PROP_TRANSFORM,
+  PROP_FILLED
+};
+
+
+typedef struct _GimpCanvasPolygonPrivate GimpCanvasPolygonPrivate;
+
+struct _GimpCanvasPolygonPrivate
+{
+  GimpVector2  *points;
+  gint          n_points;
+  GimpMatrix3  *transform;
+  gboolean      filled;
+};
+
+#define GET_PRIVATE(polygon) \
+        ((GimpCanvasPolygonPrivate *) gimp_canvas_polygon_get_instance_private ((GimpCanvasPolygon *) (polygon)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_polygon_finalize     (GObject        *object);
+static void             gimp_canvas_polygon_set_property (GObject        *object,
+                                                          guint           property_id,
+                                                          const GValue   *value,
+                                                          GParamSpec     *pspec);
+static void             gimp_canvas_polygon_get_property (GObject        *object,
+                                                          guint           property_id,
+                                                          GValue         *value,
+                                                          GParamSpec     *pspec);
+static void             gimp_canvas_polygon_draw         (GimpCanvasItem *item,
+                                                          cairo_t        *cr);
+static cairo_region_t * gimp_canvas_polygon_get_extents  (GimpCanvasItem *item);
+static gboolean         gimp_canvas_polygon_hit          (GimpCanvasItem *item,
+                                                          gdouble         x,
+                                                          gdouble         y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasPolygon, gimp_canvas_polygon,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_polygon_parent_class
+
+
+static void
+gimp_canvas_polygon_class_init (GimpCanvasPolygonClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_polygon_finalize;
+  object_class->set_property = gimp_canvas_polygon_set_property;
+  object_class->get_property = gimp_canvas_polygon_get_property;
+
+  item_class->draw           = gimp_canvas_polygon_draw;
+  item_class->get_extents    = gimp_canvas_polygon_get_extents;
+  item_class->hit            = gimp_canvas_polygon_hit;
+
+  g_object_class_install_property (object_class, PROP_POINTS,
+                                   gimp_param_spec_array ("points", NULL, NULL,
+                                                          GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TRANSFORM,
+                                   g_param_spec_pointer ("transform", NULL, NULL,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_FILLED,
+                                   g_param_spec_boolean ("filled", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_polygon_init (GimpCanvasPolygon *polygon)
+{
+}
+
+static void
+gimp_canvas_polygon_finalize (GObject *object)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->points, g_free);
+  private->n_points = 0;
+
+  g_clear_pointer (&private->transform, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_polygon_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_POINTS:
+      {
+        GimpArray *array = g_value_get_boxed (value);
+
+        g_clear_pointer (&private->points, g_free);
+        private->n_points = 0;
+
+        if (array)
+          {
+            private->points = g_memdup (array->data, array->length);
+            private->n_points = array->length / sizeof (GimpVector2);
+          }
+      }
+      break;
+
+    case PROP_TRANSFORM:
+      {
+        GimpMatrix3 *transform = g_value_get_pointer (value);
+        if (private->transform)
+          g_free (private->transform);
+        if (transform)
+          private->transform = g_memdup (transform, sizeof (GimpMatrix3));
+        else
+          private->transform = NULL;
+      }
+      break;
+
+    case PROP_FILLED:
+      private->filled = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_polygon_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_POINTS:
+      if (private->points)
+        {
+          GimpArray *array;
+
+          array = gimp_array_new ((const guint8 *) private->points,
+                                  private->n_points * sizeof (GimpVector2),
+                                  FALSE);
+          g_value_take_boxed (value, array);
+        }
+      else
+        {
+          g_value_set_boxed (value, NULL);
+        }
+      break;
+
+    case PROP_TRANSFORM:
+      g_value_set_pointer (value, private->transform);
+      break;
+
+    case PROP_FILLED:
+      g_value_set_boolean (value, private->filled);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_polygon_transform (GimpCanvasItem *item,
+                               GimpVector2    *points,
+                               gint           *n_points)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (item);
+  gint                      i;
+
+  if (private->transform)
+    {
+      gimp_transform_polygon (private->transform,
+                              private->points, private->n_points, FALSE,
+                              points, n_points);
+
+      for (i = 0; i < *n_points; i++)
+        {
+          gimp_canvas_item_transform_xy_f (item,
+                                           points[i].x,
+                                           points[i].y,
+                                           &points[i].x,
+                                           &points[i].y);
+
+          points[i].x = floor (points[i].x) + 0.5;
+          points[i].y = floor (points[i].y) + 0.5;
+        }
+    }
+  else
+    {
+      for (i = 0; i < private->n_points; i++)
+        {
+          gimp_canvas_item_transform_xy_f (item,
+                                           private->points[i].x,
+                                           private->points[i].y,
+                                           &points[i].x,
+                                           &points[i].y);
+
+          points[i].x = floor (points[i].x) + 0.5;
+          points[i].y = floor (points[i].y) + 0.5;
+        }
+
+      *n_points = private->n_points;
+    }
+}
+
+static void
+gimp_canvas_polygon_draw (GimpCanvasItem *item,
+                          cairo_t        *cr)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (item);
+  GimpVector2              *points;
+  gint                      n_points;
+  gint                      i;
+
+  if (! private->points)
+    return;
+
+  n_points = private->n_points;
+
+  if (private->transform)
+    n_points = 3 * n_points / 2;
+
+  points = g_new0 (GimpVector2, n_points);
+
+  gimp_canvas_polygon_transform (item, points, &n_points);
+
+  if (n_points < 2)
+    {
+      g_free (points);
+
+      return;
+    }
+
+  cairo_move_to (cr, points[0].x, points[0].y);
+
+  for (i = 1; i < n_points; i++)
+    {
+      cairo_line_to (cr, points[i].x, points[i].y);
+    }
+
+  if (private->filled)
+    _gimp_canvas_item_fill (item, cr);
+  else
+    _gimp_canvas_item_stroke (item, cr);
+
+  g_free (points);
+}
+
+static cairo_region_t *
+gimp_canvas_polygon_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (item);
+  cairo_rectangle_int_t     rectangle;
+  GimpVector2              *points;
+  gint                      n_points;
+  gint                      x1, y1, x2, y2;
+  gint                      i;
+
+  if (! private->points)
+    return NULL;
+
+  n_points = private->n_points;
+
+  if (private->transform)
+    n_points = 3 * n_points / 2;
+
+  points = g_new0 (GimpVector2, n_points);
+
+  gimp_canvas_polygon_transform (item, points, &n_points);
+
+  if (n_points < 2)
+    {
+      g_free (points);
+
+      return NULL;
+    }
+
+  x1 = floor (points[0].x - 1.5);
+  y1 = floor (points[0].y - 1.5);
+  x2 = x1 + 3;
+  y2 = y1 + 3;
+
+  for (i = 1; i < n_points; i++)
+    {
+      gint x3 = floor (points[i].x - 1.5);
+      gint y3 = floor (points[i].y - 1.5);
+      gint x4 = x3 + 3;
+      gint y4 = y3 + 3;
+
+      x1 = MIN (x1, x3);
+      y1 = MIN (y1, y3);
+      x2 = MAX (x2, x4);
+      y2 = MAX (y2, y4);
+    }
+
+  g_free (points);
+
+  rectangle.x      = x1;
+  rectangle.y      = y1;
+  rectangle.width  = x2 - x1;
+  rectangle.height = y2 - y1;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static gboolean
+gimp_canvas_polygon_hit (GimpCanvasItem *item,
+                         gdouble         x,
+                         gdouble         y)
+{
+  GimpCanvasPolygonPrivate *private = GET_PRIVATE (item);
+  GimpVector2              *points;
+  gint                      n_points;
+  gdouble                   tx, ty;
+  cairo_surface_t          *surface;
+  cairo_t                  *cr;
+  gboolean                  hit;
+  gint                      i;
+
+  if (! private->points)
+    return FALSE;
+
+  gimp_canvas_item_transform_xy_f (item, x, y, &tx, &ty);
+
+  n_points = private->n_points;
+
+  if (private->transform)
+    n_points = 3 * n_points / 2;
+
+  points = g_new0 (GimpVector2, n_points);
+
+  gimp_canvas_polygon_transform (item, points, &n_points);
+
+  if (n_points < 2)
+    {
+      g_free (points);
+
+      return FALSE;
+    }
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 1, 1);
+  cr = cairo_create (surface);
+  cairo_surface_destroy (surface);
+
+  cairo_move_to (cr, points[0].x, points[0].y);
+
+  for (i = 1; i < private->n_points; i++)
+    {
+      cairo_line_to (cr, points[i].x, points[i].y);
+    }
+
+  g_free (points);
+
+  hit = cairo_in_fill (cr, tx, ty);
+
+  cairo_destroy (cr);
+
+  return hit;
+}
+
+GimpCanvasItem *
+gimp_canvas_polygon_new (GimpDisplayShell  *shell,
+                         const GimpVector2 *points,
+                         gint               n_points,
+                         GimpMatrix3       *transform,
+                         gboolean           filled)
+{
+  GimpCanvasItem *item;
+  GimpArray      *array;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (points == NULL || n_points > 0, NULL);
+
+  array = gimp_array_new ((const guint8 *) points,
+                          n_points * sizeof (GimpVector2), TRUE);
+
+  item = g_object_new (GIMP_TYPE_CANVAS_POLYGON,
+                       "shell",     shell,
+                       "transform", transform,
+                       "filled",    filled,
+                       "points",    array,
+                       NULL);
+
+  gimp_array_free (array);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_canvas_polygon_new_from_coords (GimpDisplayShell *shell,
+                                     const GimpCoords *coords,
+                                     gint              n_coords,
+                                     GimpMatrix3      *transform,
+                                     gboolean          filled)
+{
+  GimpCanvasItem *item;
+  GimpVector2    *points;
+  GimpArray      *array;
+  gint            i;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (coords == NULL || n_coords > 0, NULL);
+
+  points = g_new (GimpVector2, n_coords);
+
+  for (i = 0; i < n_coords; i++)
+    {
+      points[i].x = coords[i].x;
+      points[i].y = coords[i].y;
+    }
+
+  array = gimp_array_new ((const guint8 *) points,
+                          n_coords * sizeof (GimpVector2), TRUE);
+
+  item = g_object_new (GIMP_TYPE_CANVAS_POLYGON,
+                       "shell",     shell,
+                       "transform", transform,
+                       "filled",    filled,
+                       "points",    array,
+                       NULL);
+
+  gimp_array_free (array);
+  g_free (points);
+
+  return item;
+}
+
+void
+gimp_canvas_polygon_set_points (GimpCanvasItem    *polygon,
+                                const GimpVector2 *points,
+                                gint               n_points)
+{
+  GimpArray *array;
+
+  g_return_if_fail (GIMP_IS_CANVAS_POLYGON (polygon));
+  g_return_if_fail (points == NULL || n_points > 0);
+
+  array = gimp_array_new ((const guint8 *) points,
+                          n_points * sizeof (GimpVector2), TRUE);
+
+  gimp_canvas_item_begin_change (polygon);
+  g_object_set (polygon,
+                "points", array,
+                NULL);
+  gimp_canvas_item_end_change (polygon);
+
+  gimp_array_free (array);
+}
diff --git a/app/display/gimpcanvaspolygon.h b/app/display/gimpcanvaspolygon.h
new file mode 100644
index 0000000..f68e36a
--- /dev/null
+++ b/app/display/gimpcanvaspolygon.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program Copyright (C) 1995
+ * Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvaspolygon.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_POLYGON_H__
+#define __GIMP_CANVAS_POLYGON_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_POLYGON            (gimp_canvas_polygon_get_type ())
+#define GIMP_CANVAS_POLYGON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_POLYGON, GimpCanvasPolygon))
+#define GIMP_CANVAS_POLYGON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_POLYGON, GimpCanvasPolygonClass))
+#define GIMP_IS_CANVAS_POLYGON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_POLYGON))
+#define GIMP_IS_CANVAS_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_POLYGON))
+#define GIMP_CANVAS_POLYGON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_POLYGON, GimpCanvasPolygonClass))
+
+
+typedef struct _GimpCanvasPolygon      GimpCanvasPolygon;
+typedef struct _GimpCanvasPolygonClass GimpCanvasPolygonClass;
+
+struct _GimpCanvasPolygon
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasPolygonClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_polygon_get_type        (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_polygon_new             (GimpDisplayShell  *shell,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points,
+                                                      GimpMatrix3       *transform,
+                                                      gboolean           filled);
+GimpCanvasItem * gimp_canvas_polygon_new_from_coords (GimpDisplayShell  *shell,
+                                                      const GimpCoords  *coords,
+                                                      gint               n_coords,
+                                                      GimpMatrix3       *transform,
+                                                      gboolean           filled);
+
+void             gimp_canvas_polygon_set_points      (GimpCanvasItem    *polygon,
+                                                      const GimpVector2 *points,
+                                                      gint               n_points);
+
+
+#endif /* __GIMP_CANVAS_POLYGON_H__ */
diff --git a/app/display/gimpcanvasprogress.c b/app/display/gimpcanvasprogress.c
new file mode 100644
index 0000000..4def1ac
--- /dev/null
+++ b/app/display/gimpcanvasprogress.c
@@ -0,0 +1,459 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasprogress.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvas-style.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpcanvasprogress.h"
+#include "gimpdisplayshell.h"
+
+
+#define BORDER                5
+#define RADIUS               20
+
+#define MIN_UPDATE_INTERVAL  50000 /* microseconds */
+
+
+enum
+{
+  PROP_0,
+  PROP_ANCHOR,
+  PROP_X,
+  PROP_Y
+};
+
+
+typedef struct _GimpCanvasProgressPrivate GimpCanvasProgressPrivate;
+
+struct _GimpCanvasProgressPrivate
+{
+  GimpHandleAnchor  anchor;
+  gdouble           x;
+  gdouble           y;
+
+  gchar            *text;
+  gdouble           value;
+
+  guint64           last_update_time;
+};
+
+#define GET_PRIVATE(progress) \
+        ((GimpCanvasProgressPrivate *) gimp_canvas_progress_get_instance_private ((GimpCanvasProgress *) (progress)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_progress_iface_init   (GimpProgressInterface *iface);
+
+static void             gimp_canvas_progress_finalize     (GObject               *object);
+static void             gimp_canvas_progress_set_property (GObject               *object,
+                                                           guint                  property_id,
+                                                           const GValue          *value,
+                                                           GParamSpec            *pspec);
+static void             gimp_canvas_progress_get_property (GObject               *object,
+                                                           guint                  property_id,
+                                                           GValue                *value,
+                                                           GParamSpec            *pspec);
+static void             gimp_canvas_progress_draw         (GimpCanvasItem        *item,
+                                                           cairo_t               *cr);
+static cairo_region_t * gimp_canvas_progress_get_extents  (GimpCanvasItem        *item);
+static gboolean         gimp_canvas_progress_hit          (GimpCanvasItem        *item,
+                                                           gdouble                x,
+                                                           gdouble                y);
+
+static GimpProgress   * gimp_canvas_progress_start        (GimpProgress          *progress,
+                                                           gboolean               cancellable,
+                                                           const gchar           *message);
+static void             gimp_canvas_progress_end          (GimpProgress          *progress);
+static gboolean         gimp_canvas_progress_is_active    (GimpProgress          *progress);
+static void             gimp_canvas_progress_set_text     (GimpProgress          *progress,
+                                                           const gchar           *message);
+static void             gimp_canvas_progress_set_value    (GimpProgress          *progress,
+                                                           gdouble                percentage);
+static gdouble          gimp_canvas_progress_get_value    (GimpProgress          *progress);
+static void             gimp_canvas_progress_pulse        (GimpProgress          *progress);
+static gboolean         gimp_canvas_progress_message      (GimpProgress          *progress,
+                                                           Gimp                  *gimp,
+                                                           GimpMessageSeverity    severity,
+                                                           const gchar           *domain,
+                                                           const gchar           *message);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpCanvasProgress, gimp_canvas_progress,
+                         GIMP_TYPE_CANVAS_ITEM,
+                         G_ADD_PRIVATE (GimpCanvasProgress)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_canvas_progress_iface_init))
+
+#define parent_class gimp_canvas_progress_parent_class
+
+
+static void
+gimp_canvas_progress_class_init (GimpCanvasProgressClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_progress_finalize;
+  object_class->set_property = gimp_canvas_progress_set_property;
+  object_class->get_property = gimp_canvas_progress_get_property;
+
+  item_class->draw           = gimp_canvas_progress_draw;
+  item_class->get_extents    = gimp_canvas_progress_get_extents;
+  item_class->hit            = gimp_canvas_progress_hit;
+
+  g_object_class_install_property (object_class, PROP_ANCHOR,
+                                   g_param_spec_enum ("anchor", NULL, NULL,
+                                                      GIMP_TYPE_HANDLE_ANCHOR,
+                                                      GIMP_HANDLE_ANCHOR_CENTER,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start     = gimp_canvas_progress_start;
+  iface->end       = gimp_canvas_progress_end;
+  iface->is_active = gimp_canvas_progress_is_active;
+  iface->set_text  = gimp_canvas_progress_set_text;
+  iface->set_value = gimp_canvas_progress_set_value;
+  iface->get_value = gimp_canvas_progress_get_value;
+  iface->pulse     = gimp_canvas_progress_pulse;
+  iface->message   = gimp_canvas_progress_message;
+}
+
+static void
+gimp_canvas_progress_init (GimpCanvasProgress *progress)
+{
+}
+
+static void
+gimp_canvas_progress_finalize (GObject *object)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->text, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_progress_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_ANCHOR:
+      private->anchor = g_value_get_enum (value);
+      break;
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_progress_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_ANCHOR:
+      g_value_set_enum (value, private->anchor);
+      break;
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static PangoLayout *
+gimp_canvas_progress_transform (GimpCanvasItem *item,
+                                gdouble        *x,
+                                gdouble        *y,
+                                gint           *width,
+                                gint           *height)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (item);
+  GtkWidget                 *canvas  = gimp_canvas_item_get_canvas (item);
+  PangoLayout               *layout;
+
+  layout = gimp_canvas_get_layout (GIMP_CANVAS (canvas), "%s",
+                                   private->text);
+
+  pango_layout_get_pixel_size (layout, width, height);
+
+  *width = MAX (*width, 2 * RADIUS);
+
+  *width  += 2 * BORDER;
+  *height += 3 * BORDER + 2 * RADIUS;
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->x, private->y,
+                                   x, y);
+
+  gimp_canvas_item_shift_to_north_west (private->anchor,
+                                        *x, *y,
+                                        *width,
+                                        *height,
+                                        x, y);
+
+  *x = floor (*x);
+  *y = floor (*y);
+
+  return layout;
+}
+
+static void
+gimp_canvas_progress_draw (GimpCanvasItem *item,
+                           cairo_t        *cr)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (item);
+  GtkWidget                 *canvas  = gimp_canvas_item_get_canvas (item);
+  gdouble                    x, y;
+  gint                       width, height;
+
+  gimp_canvas_progress_transform (item, &x, &y, &width, &height);
+
+  cairo_move_to (cr, x, y);
+  cairo_line_to (cr, x + width, y);
+  cairo_line_to (cr, x + width, y + height - BORDER - 2 * RADIUS);
+  cairo_line_to (cr, x + 2 * BORDER + 2 * RADIUS, y + height - BORDER - 2 * RADIUS);
+  cairo_arc (cr, x + BORDER + RADIUS, y + height - BORDER - RADIUS,
+             BORDER + RADIUS, 0, G_PI);
+  cairo_close_path (cr);
+
+  _gimp_canvas_item_fill (item, cr);
+
+  cairo_move_to (cr, x + BORDER, y + BORDER);
+  cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+  pango_cairo_show_layout (cr,
+                           gimp_canvas_get_layout (GIMP_CANVAS (canvas),
+                                                   "%s", private->text));
+
+  gimp_canvas_set_tool_bg_style (gimp_canvas_item_get_canvas (item), cr);
+  cairo_arc (cr, x + BORDER + RADIUS, y + height - BORDER - RADIUS,
+             RADIUS, - G_PI / 2.0, 2 * G_PI - G_PI / 2.0);
+  cairo_fill (cr);
+
+  cairo_set_source_rgba (cr, 0.0, 1.0, 0.0, 1.0);
+  cairo_move_to (cr, x + BORDER + RADIUS, y + height - BORDER - RADIUS);
+  cairo_arc (cr, x + BORDER + RADIUS, y + height - BORDER - RADIUS,
+             RADIUS, - G_PI / 2.0, 2 * G_PI * private->value - G_PI / 2.0);
+  cairo_fill (cr);
+}
+
+static cairo_region_t *
+gimp_canvas_progress_get_extents (GimpCanvasItem *item)
+{
+  cairo_rectangle_int_t rectangle;
+  gdouble               x, y;
+  gint                  width, height;
+
+  gimp_canvas_progress_transform (item, &x, &y, &width, &height);
+
+  /*  add 1px on each side because fill()'s default impl does the same  */
+  rectangle.x      = (gint) x - 1;
+  rectangle.y      = (gint) y - 1;
+  rectangle.width  = width  + 2;
+  rectangle.height = height + 2;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static gboolean
+gimp_canvas_progress_hit (GimpCanvasItem *item,
+                          gdouble         x,
+                          gdouble         y)
+{
+  gdouble px, py;
+  gint    pwidth, pheight;
+  gdouble tx, ty;
+
+  gimp_canvas_progress_transform (item, &px, &py, &pwidth, &pheight);
+  gimp_canvas_item_transform_xy_f (item, x, y, &tx, &ty);
+
+  pheight -= BORDER + 2 * RADIUS;
+
+  return (tx >= px && tx < (px + pwidth) &&
+          ty >= py && ty < (py + pheight));
+}
+
+static GimpProgress *
+gimp_canvas_progress_start (GimpProgress *progress,
+                            gboolean      cancellable,
+                            const gchar  *message)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (progress);
+
+  gimp_canvas_progress_set_text (progress, message);
+
+  private->last_update_time = g_get_monotonic_time ();
+
+  return progress;
+}
+
+static void
+gimp_canvas_progress_end (GimpProgress *progress)
+{
+}
+
+static gboolean
+gimp_canvas_progress_is_active (GimpProgress *progress)
+{
+  return TRUE;
+}
+
+static void
+gimp_canvas_progress_set_text (GimpProgress *progress,
+                               const gchar  *message)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (progress);
+  cairo_region_t            *old_region;
+  cairo_region_t            *new_region;
+
+  old_region = gimp_canvas_item_get_extents (GIMP_CANVAS_ITEM (progress));
+
+  if (private->text)
+    g_free (private->text);
+
+  private->text = g_strdup (message);
+
+  new_region = gimp_canvas_item_get_extents (GIMP_CANVAS_ITEM (progress));
+
+  cairo_region_union (new_region, old_region);
+  cairo_region_destroy (old_region);
+
+  _gimp_canvas_item_update (GIMP_CANVAS_ITEM (progress), new_region);
+
+  cairo_region_destroy (new_region);
+}
+
+static void
+gimp_canvas_progress_set_value (GimpProgress *progress,
+                                gdouble       percentage)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (progress);
+
+  if (percentage != private->value)
+    {
+      guint64 time = g_get_monotonic_time ();
+
+      private->value = percentage;
+
+      if (time - private->last_update_time >= MIN_UPDATE_INTERVAL)
+        {
+          cairo_region_t *region;
+
+          private->last_update_time = time;
+
+          region = gimp_canvas_item_get_extents (GIMP_CANVAS_ITEM (progress));
+
+          _gimp_canvas_item_update (GIMP_CANVAS_ITEM (progress), region);
+
+          cairo_region_destroy (region);
+        }
+    }
+}
+
+static gdouble
+gimp_canvas_progress_get_value (GimpProgress *progress)
+{
+  GimpCanvasProgressPrivate *private = GET_PRIVATE (progress);
+
+  return private->value;
+}
+
+static void
+gimp_canvas_progress_pulse (GimpProgress *progress)
+{
+}
+
+static gboolean
+gimp_canvas_progress_message (GimpProgress        *progress,
+                              Gimp                *gimp,
+                              GimpMessageSeverity  severity,
+                              const gchar         *domain,
+                              const gchar         *message)
+{
+  return FALSE;
+}
+
+GimpCanvasItem *
+gimp_canvas_progress_new (GimpDisplayShell *shell,
+                          GimpHandleAnchor  anchor,
+                          gdouble           x,
+                          gdouble           y)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_PROGRESS,
+                       "shell",  shell,
+                       "anchor", anchor,
+                       "x",      x,
+                       "y",      y,
+                       NULL);
+}
diff --git a/app/display/gimpcanvasprogress.h b/app/display/gimpcanvasprogress.h
new file mode 100644
index 0000000..1f6a9c7
--- /dev/null
+++ b/app/display/gimpcanvasprogress.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasprogress.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_PROGRESS_H__
+#define __GIMP_CANVAS_PROGRESS_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_PROGRESS            (gimp_canvas_progress_get_type ())
+#define GIMP_CANVAS_PROGRESS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_PROGRESS, GimpCanvasProgress))
+#define GIMP_CANVAS_PROGRESS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_PROGRESS, GimpCanvasProgressClass))
+#define GIMP_IS_CANVAS_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_PROGRESS))
+#define GIMP_IS_CANVAS_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_PROGRESS))
+#define GIMP_CANVAS_PROGRESS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_PROGRESS, GimpCanvasProgressClass))
+
+
+typedef struct _GimpCanvasProgress      GimpCanvasProgress;
+typedef struct _GimpCanvasProgressClass GimpCanvasProgressClass;
+
+struct _GimpCanvasProgress
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasProgressClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_progress_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_progress_new      (GimpDisplayShell *shell,
+                                                GimpHandleAnchor  anchor,
+                                                gdouble           x,
+                                                gdouble           y);
+
+
+#endif /* __GIMP_CANVAS_PROGRESS_H__ */
diff --git a/app/display/gimpcanvasproxygroup.c b/app/display/gimpcanvasproxygroup.c
new file mode 100644
index 0000000..a979f24
--- /dev/null
+++ b/app/display/gimpcanvasproxygroup.c
@@ -0,0 +1,197 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasproxygroup.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvasproxygroup.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0
+};
+
+
+typedef struct _GimpCanvasProxyGroupPrivate GimpCanvasProxyGroupPrivate;
+
+struct _GimpCanvasProxyGroupPrivate
+{
+  GHashTable *proxy_hash;
+};
+
+#define GET_PRIVATE(proxy_group) \
+        ((GimpCanvasProxyGroupPrivate *) gimp_canvas_proxy_group_get_instance_private ((GimpCanvasProxyGroup *) (proxy_group)))
+
+
+/*  local function prototypes  */
+
+static void        gimp_canvas_proxy_group_finalize     (GObject          *object);
+static void        gimp_canvas_proxy_group_set_property (GObject          *object,
+                                                         guint             property_id,
+                                                         const GValue     *value,
+                                                         GParamSpec       *pspec);
+static void        gimp_canvas_proxy_group_get_property (GObject          *object,
+                                                         guint             property_id,
+                                                         GValue           *value,
+                                                         GParamSpec       *pspec);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasProxyGroup, gimp_canvas_proxy_group,
+                            GIMP_TYPE_CANVAS_GROUP)
+
+#define parent_class gimp_canvas_proxy_group_parent_class
+
+
+static void
+gimp_canvas_proxy_group_class_init (GimpCanvasProxyGroupClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_canvas_proxy_group_finalize;
+  object_class->set_property = gimp_canvas_proxy_group_set_property;
+  object_class->get_property = gimp_canvas_proxy_group_get_property;
+}
+
+static void
+gimp_canvas_proxy_group_init (GimpCanvasProxyGroup *proxy_group)
+{
+  GimpCanvasProxyGroupPrivate *private = GET_PRIVATE (proxy_group);
+
+  private->proxy_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+}
+
+static void
+gimp_canvas_proxy_group_finalize (GObject *object)
+{
+  GimpCanvasProxyGroupPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->proxy_hash, g_hash_table_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_canvas_proxy_group_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  /* GimpCanvasProxyGroupPrivate *private = GET_PRIVATE (object); */
+
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_proxy_group_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  /* GimpCanvasProxyGroupPrivate *private = GET_PRIVATE (object); */
+
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GimpCanvasItem *
+gimp_canvas_proxy_group_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_PROXY_GROUP,
+                       "shell", shell,
+                       NULL);
+}
+
+void
+gimp_canvas_proxy_group_add_item (GimpCanvasProxyGroup *group,
+                                  gpointer              object,
+                                  GimpCanvasItem       *proxy_item)
+{
+  GimpCanvasProxyGroupPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (proxy_item));
+  g_return_if_fail (GIMP_CANVAS_ITEM (group) != proxy_item);
+
+  private = GET_PRIVATE (group);
+
+  g_return_if_fail (g_hash_table_lookup (private->proxy_hash, object) ==
+                    NULL);
+
+  g_hash_table_insert (private->proxy_hash, object, proxy_item);
+
+  gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (group), proxy_item);
+}
+
+void
+gimp_canvas_proxy_group_remove_item (GimpCanvasProxyGroup *group,
+                                     gpointer              object)
+{
+  GimpCanvasProxyGroupPrivate *private;
+  GimpCanvasItem              *proxy_item;
+
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+  g_return_if_fail (object != NULL);
+
+  private = GET_PRIVATE (group);
+
+  proxy_item = g_hash_table_lookup (private->proxy_hash, object);
+
+  g_return_if_fail (proxy_item != NULL);
+
+  g_hash_table_remove (private->proxy_hash, object);
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (group), proxy_item);
+}
+
+GimpCanvasItem *
+gimp_canvas_proxy_group_get_item (GimpCanvasProxyGroup *group,
+                                  gpointer              object)
+{
+  GimpCanvasProxyGroupPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CANVAS_GROUP (group), NULL);
+  g_return_val_if_fail (object != NULL, NULL);
+
+  private = GET_PRIVATE (group);
+
+  return g_hash_table_lookup (private->proxy_hash, object);
+}
diff --git a/app/display/gimpcanvasproxygroup.h b/app/display/gimpcanvasproxygroup.h
new file mode 100644
index 0000000..be25787
--- /dev/null
+++ b/app/display/gimpcanvasproxygroup.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasproxygroup.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_PROXY_GROUP_H__
+#define __GIMP_CANVAS_PROXY_GROUP_H__
+
+
+#include "gimpcanvasgroup.h"
+
+
+#define GIMP_TYPE_CANVAS_PROXY_GROUP            (gimp_canvas_proxy_group_get_type ())
+#define GIMP_CANVAS_PROXY_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_PROXY_GROUP, GimpCanvasProxyGroup))
+#define GIMP_CANVAS_PROXY_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_PROXY_GROUP, GimpCanvasProxyGroupClass))
+#define GIMP_IS_CANVAS_PROXY_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_PROXY_GROUP))
+#define GIMP_IS_CANVAS_PROXY_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_PROXY_GROUP))
+#define GIMP_CANVAS_PROXY_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_PROXY_GROUP, GimpCanvasProxyGroupClass))
+
+
+typedef struct _GimpCanvasProxyGroup      GimpCanvasProxyGroup;
+typedef struct _GimpCanvasProxyGroupClass GimpCanvasProxyGroupClass;
+
+struct _GimpCanvasProxyGroup
+{
+  GimpCanvasGroup  parent_instance;
+};
+
+struct _GimpCanvasProxyGroupClass
+{
+  GimpCanvasGroupClass  parent_class;
+};
+
+
+GType            gimp_canvas_proxy_group_get_type    (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_proxy_group_new         (GimpDisplayShell     *shell);
+
+void             gimp_canvas_proxy_group_add_item    (GimpCanvasProxyGroup *group,
+                                                      gpointer              object,
+                                                      GimpCanvasItem       *proxy_item);
+void             gimp_canvas_proxy_group_remove_item (GimpCanvasProxyGroup *group,
+                                                      gpointer              object);
+GimpCanvasItem * gimp_canvas_proxy_group_get_item    (GimpCanvasProxyGroup *group,
+                                                      gpointer              object);
+
+
+#endif /* __GIMP_CANVAS_PROXY_GROUP_H__ */
diff --git a/app/display/gimpcanvasrectangle.c b/app/display/gimpcanvasrectangle.c
new file mode 100644
index 0000000..7ef7351
--- /dev/null
+++ b/app/display/gimpcanvasrectangle.c
@@ -0,0 +1,360 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasrectangle.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvasrectangle.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_FILLED
+};
+
+
+typedef struct _GimpCanvasRectanglePrivate GimpCanvasRectanglePrivate;
+
+struct _GimpCanvasRectanglePrivate
+{
+  gdouble  x;
+  gdouble  y;
+  gdouble  width;
+  gdouble  height;
+  gboolean filled;
+};
+
+#define GET_PRIVATE(rectangle) \
+        ((GimpCanvasRectanglePrivate *) gimp_canvas_rectangle_get_instance_private ((GimpCanvasRectangle *) (rectangle)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_rectangle_set_property (GObject        *object,
+                                                            guint           property_id,
+                                                            const GValue   *value,
+                                                            GParamSpec     *pspec);
+static void             gimp_canvas_rectangle_get_property (GObject        *object,
+                                                            guint           property_id,
+                                                            GValue         *value,
+                                                            GParamSpec     *pspec);
+static void             gimp_canvas_rectangle_draw         (GimpCanvasItem *item,
+                                                            cairo_t        *cr);
+static cairo_region_t * gimp_canvas_rectangle_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasRectangle, gimp_canvas_rectangle,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_rectangle_parent_class
+
+
+static void
+gimp_canvas_rectangle_class_init (GimpCanvasRectangleClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_rectangle_set_property;
+  object_class->get_property = gimp_canvas_rectangle_get_property;
+
+  item_class->draw           = gimp_canvas_rectangle_draw;
+  item_class->get_extents    = gimp_canvas_rectangle_get_extents;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_double ("width", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_double ("height", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_FILLED,
+                                   g_param_spec_boolean ("filled", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_rectangle_init (GimpCanvasRectangle *rectangle)
+{
+}
+
+static void
+gimp_canvas_rectangle_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpCanvasRectanglePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_double (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_double (value);
+      break;
+    case PROP_FILLED:
+      private->filled = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_rectangle_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpCanvasRectanglePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_double (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_double (value, private->height);
+      break;
+    case PROP_FILLED:
+      g_value_set_boolean (value, private->filled);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_rectangle_transform (GimpCanvasItem *item,
+                                 gdouble        *x,
+                                 gdouble        *y,
+                                 gdouble        *w,
+                                 gdouble        *h)
+{
+  GimpCanvasRectanglePrivate *private = GET_PRIVATE (item);
+  gdouble                     x1, y1;
+  gdouble                     x2, y2;
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   MIN (private->x,
+                                        private->x + private->width),
+                                   MIN (private->y,
+                                        private->y + private->height),
+                                   &x1, &y1);
+  gimp_canvas_item_transform_xy_f (item,
+                                   MAX (private->x,
+                                        private->x + private->width),
+                                   MAX (private->y,
+                                        private->y + private->height),
+                                   &x2, &y2);
+
+  x1 = floor (x1);
+  y1 = floor (y1);
+  x2 = ceil (x2);
+  y2 = ceil (y2);
+
+  if (private->filled)
+    {
+      *x = x1;
+      *y = y1;
+      *w = x2 - x1;
+      *h = y2 - y1;
+    }
+  else
+    {
+      *x = x1 + 0.5;
+      *y = y1 + 0.5;
+      *w = x2 - 0.5 - *x;
+      *h = y2 - 0.5 - *y;
+
+      *w = MAX (0.0, *w);
+      *h = MAX (0.0, *h);
+    }
+}
+
+static void
+gimp_canvas_rectangle_draw (GimpCanvasItem *item,
+                            cairo_t        *cr)
+{
+  GimpCanvasRectanglePrivate *private = GET_PRIVATE (item);
+  gdouble                     x, y;
+  gdouble                     w, h;
+
+  gimp_canvas_rectangle_transform (item, &x, &y, &w, &h);
+
+  cairo_rectangle (cr, x, y, w, h);
+
+  if (private->filled)
+    _gimp_canvas_item_fill (item, cr);
+  else
+    _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_rectangle_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasRectanglePrivate *private = GET_PRIVATE (item);
+  cairo_rectangle_int_t       rectangle;
+  gdouble                     x, y;
+  gdouble                     w, h;
+
+  gimp_canvas_rectangle_transform (item, &x, &y, &w, &h);
+
+  if (private->filled)
+    {
+      rectangle.x      = floor (x - 1.0);
+      rectangle.y      = floor (y - 1.0);
+      rectangle.width  = ceil (w + 2.0);
+      rectangle.height = ceil (h + 2.0);
+
+      return cairo_region_create_rectangle (&rectangle);
+    }
+  else if (w > 64 && h > 64)
+    {
+      cairo_region_t *region;
+
+      /* left */
+      rectangle.x      = floor (x - 1.5);
+      rectangle.y      = floor (y - 1.5);
+      rectangle.width  = 3.0;
+      rectangle.height = ceil (h + 3.0);
+
+      region = cairo_region_create_rectangle (&rectangle);
+
+      /* right */
+      rectangle.x      = floor (x + w - 1.5);
+
+      cairo_region_union_rectangle (region, &rectangle);
+
+      /* top */
+      rectangle.x      = floor (x - 1.5);
+      rectangle.y      = floor (y - 1.5);
+      rectangle.width  = ceil (w + 3.0);
+      rectangle.height = 3.0;
+
+      cairo_region_union_rectangle (region, &rectangle);
+
+      /* bottom */
+      rectangle.y      = floor (y + h - 1.5);
+
+      cairo_region_union_rectangle (region, &rectangle);
+
+      return region;
+    }
+  else
+    {
+      rectangle.x      = floor (x - 1.5);
+      rectangle.y      = floor (y - 1.5);
+      rectangle.width  = ceil (w + 3.0);
+      rectangle.height = ceil (h + 3.0);
+
+      return cairo_region_create_rectangle (&rectangle);
+    }
+}
+
+GimpCanvasItem *
+gimp_canvas_rectangle_new (GimpDisplayShell *shell,
+                           gdouble           x,
+                           gdouble           y,
+                           gdouble           width,
+                           gdouble           height,
+                           gboolean          filled)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_RECTANGLE,
+                       "shell",  shell,
+                       "x",      x,
+                       "y",      y,
+                       "width",  width,
+                       "height", height,
+                       "filled", filled,
+                       NULL);
+}
+
+void
+gimp_canvas_rectangle_set (GimpCanvasItem *rectangle,
+                           gdouble         x,
+                           gdouble         y,
+                           gdouble         width,
+                           gdouble         height)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_RECTANGLE (rectangle));
+
+  gimp_canvas_item_begin_change (rectangle);
+
+  g_object_set (rectangle,
+                "x",      x,
+                "y",      y,
+                "width",  width,
+                "height", height,
+                NULL);
+
+  gimp_canvas_item_end_change (rectangle);
+}
diff --git a/app/display/gimpcanvasrectangle.h b/app/display/gimpcanvasrectangle.h
new file mode 100644
index 0000000..6a96c06
--- /dev/null
+++ b/app/display/gimpcanvasrectangle.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasrectangle.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_RECTANGLE_H__
+#define __GIMP_CANVAS_RECTANGLE_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_RECTANGLE            (gimp_canvas_rectangle_get_type ())
+#define GIMP_CANVAS_RECTANGLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_RECTANGLE, GimpCanvasRectangle))
+#define GIMP_CANVAS_RECTANGLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_RECTANGLE, GimpCanvasRectangleClass))
+#define GIMP_IS_CANVAS_RECTANGLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_RECTANGLE))
+#define GIMP_IS_CANVAS_RECTANGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_RECTANGLE))
+#define GIMP_CANVAS_RECTANGLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_RECTANGLE, GimpCanvasRectangleClass))
+
+
+typedef struct _GimpCanvasRectangle      GimpCanvasRectangle;
+typedef struct _GimpCanvasRectangleClass GimpCanvasRectangleClass;
+
+struct _GimpCanvasRectangle
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasRectangleClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_rectangle_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_rectangle_new      (GimpDisplayShell *shell,
+                                                 gdouble           x,
+                                                 gdouble           y,
+                                                 gdouble           width,
+                                                 gdouble           height,
+                                                 gboolean          filled);
+
+void             gimp_canvas_rectangle_set      (GimpCanvasItem   *rectangle,
+                                                 gdouble           x,
+                                                 gdouble           y,
+                                                 gdouble           width,
+                                                 gdouble           height);
+
+
+#endif /* __GIMP_CANVAS_RECTANGLE_H__ */
diff --git a/app/display/gimpcanvasrectangleguides.c b/app/display/gimpcanvasrectangleguides.c
new file mode 100644
index 0000000..b7cc07d
--- /dev/null
+++ b/app/display/gimpcanvasrectangleguides.c
@@ -0,0 +1,422 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasrectangleguides.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvasrectangleguides.h"
+#include "gimpdisplayshell.h"
+
+
+#define SQRT5 2.236067977
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_TYPE,
+  PROP_N_GUIDES
+};
+
+
+typedef struct _GimpCanvasRectangleGuidesPrivate GimpCanvasRectangleGuidesPrivate;
+
+struct _GimpCanvasRectangleGuidesPrivate
+{
+  gdouble        x;
+  gdouble        y;
+  gdouble        width;
+  gdouble        height;
+  GimpGuidesType type;
+  gint           n_guides;
+};
+
+#define GET_PRIVATE(rectangle) \
+        ((GimpCanvasRectangleGuidesPrivate *) gimp_canvas_rectangle_guides_get_instance_private ((GimpCanvasRectangleGuides *) (rectangle)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_rectangle_guides_set_property (GObject        *object,
+                                                                   guint           property_id,
+                                                                   const GValue   *value,
+                                                                   GParamSpec     *pspec);
+static void             gimp_canvas_rectangle_guides_get_property (GObject        *object,
+                                                                   guint           property_id,
+                                                                   GValue         *value,
+                                                                   GParamSpec     *pspec);
+static void             gimp_canvas_rectangle_guides_draw         (GimpCanvasItem *item,
+                                                                   cairo_t        *cr);
+static cairo_region_t * gimp_canvas_rectangle_guides_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasRectangleGuides,
+                            gimp_canvas_rectangle_guides, GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_rectangle_guides_parent_class
+
+
+static void
+gimp_canvas_rectangle_guides_class_init (GimpCanvasRectangleGuidesClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_rectangle_guides_set_property;
+  object_class->get_property = gimp_canvas_rectangle_guides_get_property;
+
+  item_class->draw           = gimp_canvas_rectangle_guides_draw;
+  item_class->get_extents    = gimp_canvas_rectangle_guides_get_extents;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_double ("width", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_double ("height", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("type", NULL, NULL,
+                                                      GIMP_TYPE_GUIDES_TYPE,
+                                                      GIMP_GUIDES_NONE,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_N_GUIDES,
+                                   g_param_spec_int ("n-guides", NULL, NULL,
+                                                     1, 128, 4,
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_rectangle_guides_init (GimpCanvasRectangleGuides *rectangle)
+{
+}
+
+static void
+gimp_canvas_rectangle_guides_set_property (GObject      *object,
+                                           guint         property_id,
+                                           const GValue *value,
+                                           GParamSpec   *pspec)
+{
+  GimpCanvasRectangleGuidesPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_double (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_double (value);
+      break;
+    case PROP_TYPE:
+      private->type = g_value_get_enum (value);
+      break;
+    case PROP_N_GUIDES:
+      private->n_guides = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_rectangle_guides_get_property (GObject    *object,
+                                           guint       property_id,
+                                           GValue     *value,
+                                           GParamSpec *pspec)
+{
+  GimpCanvasRectangleGuidesPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_double (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_double (value, private->height);
+      break;
+    case PROP_TYPE:
+      g_value_set_enum (value, private->type);
+      break;
+    case PROP_N_GUIDES:
+      g_value_set_int (value, private->n_guides);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_rectangle_guides_transform (GimpCanvasItem *item,
+                                        gdouble        *x1,
+                                        gdouble        *y1,
+                                        gdouble        *x2,
+                                        gdouble        *y2)
+{
+  GimpCanvasRectangleGuidesPrivate *private = GET_PRIVATE (item);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   MIN (private->x,
+                                        private->x + private->width),
+                                   MIN (private->y,
+                                        private->y + private->height),
+                                   x1, y1);
+  gimp_canvas_item_transform_xy_f (item,
+                                   MAX (private->x,
+                                        private->x + private->width),
+                                   MAX (private->y,
+                                        private->y + private->height),
+                                   x2, y2);
+
+  *x1 = floor (*x1) + 0.5;
+  *y1 = floor (*y1) + 0.5;
+  *x2 = ceil (*x2) - 0.5;
+  *y2 = ceil (*y2) - 0.5;
+
+  *x2 = MAX (*x1, *x2);
+  *y2 = MAX (*y1, *y2);
+}
+
+static void
+draw_hline (cairo_t *cr,
+            gdouble  x1,
+            gdouble  x2,
+            gdouble  y)
+{
+  y = floor (y) + 0.5;
+
+  cairo_move_to (cr, x1, y);
+  cairo_line_to (cr, x2, y);
+}
+
+static void
+draw_vline (cairo_t *cr,
+            gdouble  y1,
+            gdouble  y2,
+            gdouble  x)
+{
+  x = floor (x) + 0.5;
+
+  cairo_move_to (cr, x, y1);
+  cairo_line_to (cr, x, y2);
+}
+
+static void
+gimp_canvas_rectangle_guides_draw (GimpCanvasItem *item,
+                                   cairo_t        *cr)
+{
+  GimpCanvasRectangleGuidesPrivate *private = GET_PRIVATE (item);
+  gdouble                           x1, y1;
+  gdouble                           x2, y2;
+  gint                              i;
+
+  gimp_canvas_rectangle_guides_transform (item, &x1, &y1, &x2, &y2);
+
+  switch (private->type)
+    {
+    case GIMP_GUIDES_NONE:
+      break;
+
+    case GIMP_GUIDES_CENTER_LINES:
+      draw_hline (cr, x1, x2, (y1 + y2) / 2);
+      draw_vline (cr, y1, y2, (x1 + x2) / 2);
+      break;
+
+    case GIMP_GUIDES_THIRDS:
+      draw_hline (cr, x1, x2, (2 * y1 +     y2) / 3);
+      draw_hline (cr, x1, x2, (    y1 + 2 * y2) / 3);
+
+      draw_vline (cr, y1, y2, (2 * x1 +     x2) / 3);
+      draw_vline (cr, y1, y2, (    x1 + 2 * x2) / 3);
+      break;
+
+    case GIMP_GUIDES_FIFTHS:
+      for (i = 0; i < 5; i++)
+        {
+          draw_hline (cr, x1, x2, y1 + i * (y2 - y1) / 5);
+          draw_vline (cr, y1, y2, x1 + i * (x2 - x1) / 5);
+        }
+      break;
+
+    case GIMP_GUIDES_GOLDEN:
+      draw_hline (cr, x1, x2, (2 * y1 + (1 + SQRT5) * y2) / (3 + SQRT5));
+      draw_hline (cr, x1, x2, ((1 + SQRT5) * y1 + 2 * y2) / (3 + SQRT5));
+
+      draw_vline (cr, y1, y2, (2 * x1 + (1 + SQRT5) * x2) / (3 + SQRT5));
+      draw_vline (cr, y1, y2, ((1 + SQRT5) * x1 + 2 * x2) / (3 + SQRT5));
+      break;
+
+    /* This code implements the method of diagonals discovered by
+     * Edwin Westhoff - see http://www.diagonalmethod.info/
+     */
+    case GIMP_GUIDES_DIAGONALS:
+      {
+        /* the side of the largest square that can be
+         * fitted in whole into the rectangle (x1, y1), (x2, y2)
+         */
+        const gdouble square_side = MIN (x2 - x1, y2 - y1);
+
+        /* diagonal from the top-left edge */
+        cairo_move_to (cr, x1, y1);
+        cairo_line_to (cr, x1 + square_side, y1 + square_side);
+
+        /* diagonal from the top-right edge */
+        cairo_move_to (cr, x2, y1);
+        cairo_line_to (cr, x2 - square_side, y1 + square_side);
+
+        /* diagonal from the bottom-left edge */
+        cairo_move_to (cr, x1, y2);
+        cairo_line_to (cr, x1 + square_side, y2 - square_side);
+
+        /* diagonal from the bottom-right edge */
+        cairo_move_to (cr, x2, y2);
+        cairo_line_to (cr, x2 - square_side, y2 - square_side);
+      }
+      break;
+
+    case GIMP_GUIDES_N_LINES:
+      for (i = 0; i < private->n_guides; i++)
+        {
+          draw_hline (cr, x1, x2, y1 + i * (y2 - y1) / private->n_guides);
+          draw_vline (cr, y1, y2, x1 + i * (x2 - x1) / private->n_guides);
+        }
+      break;
+
+    case GIMP_GUIDES_SPACING:
+      break;
+    }
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_rectangle_guides_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasRectangleGuidesPrivate *private = GET_PRIVATE (item);
+
+  if (private->type != GIMP_GUIDES_NONE)
+    {
+      cairo_rectangle_int_t rectangle;
+      gdouble               x1, y1;
+      gdouble               x2, y2;
+
+      gimp_canvas_rectangle_guides_transform (item, &x1, &y1, &x2, &y2);
+
+      rectangle.x      = floor (x1 - 1.5);
+      rectangle.y      = floor (y1 - 1.5);
+      rectangle.width  = ceil (x2 - x1 + 3.0);
+      rectangle.height = ceil (y2 - y1 + 3.0);
+
+      return cairo_region_create_rectangle (&rectangle);
+    }
+
+  return NULL;
+}
+
+GimpCanvasItem *
+gimp_canvas_rectangle_guides_new (GimpDisplayShell *shell,
+                                  gdouble           x,
+                                  gdouble           y,
+                                  gdouble           width,
+                                  gdouble           height,
+                                  GimpGuidesType    type,
+                                  gint              n_guides)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_RECTANGLE_GUIDES,
+                       "shell",    shell,
+                       "x",        x,
+                       "y",        y,
+                       "width",    width,
+                       "height",   height,
+                       "type",     type,
+                       "n-guides", n_guides,
+                       NULL);
+}
+
+void
+gimp_canvas_rectangle_guides_set (GimpCanvasItem *rectangle,
+                                  gdouble         x,
+                                  gdouble         y,
+                                  gdouble         width,
+                                  gdouble         height,
+                                  GimpGuidesType  type,
+                                  gint            n_guides)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_RECTANGLE_GUIDES (rectangle));
+
+  gimp_canvas_item_begin_change (rectangle);
+
+  g_object_set (rectangle,
+                "x",        x,
+                "y",        y,
+                "width",    width,
+                "height",   height,
+                "type",     type,
+                "n-guides", n_guides,
+                NULL);
+
+  gimp_canvas_item_end_change (rectangle);
+}
diff --git a/app/display/gimpcanvasrectangleguides.h b/app/display/gimpcanvasrectangleguides.h
new file mode 100644
index 0000000..1d37d15
--- /dev/null
+++ b/app/display/gimpcanvasrectangleguides.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasrectangleguides.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_RECTANGLE_GUIDES_H__
+#define __GIMP_CANVAS_RECTANGLE_GUIDES_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_RECTANGLE_GUIDES            (gimp_canvas_rectangle_guides_get_type ())
+#define GIMP_CANVAS_RECTANGLE_GUIDES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_RECTANGLE_GUIDES, GimpCanvasRectangleGuides))
+#define GIMP_CANVAS_RECTANGLE_GUIDES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_RECTANGLE_GUIDES, GimpCanvasRectangleGuidesClass))
+#define GIMP_IS_CANVAS_RECTANGLE_GUIDES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_RECTANGLE_GUIDES))
+#define GIMP_IS_CANVAS_RECTANGLE_GUIDES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_RECTANGLE_GUIDES))
+#define GIMP_CANVAS_RECTANGLE_GUIDES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_RECTANGLE_GUIDES, GimpCanvasRectangleGuidesClass))
+
+
+typedef struct _GimpCanvasRectangleGuides      GimpCanvasRectangleGuides;
+typedef struct _GimpCanvasRectangleGuidesClass GimpCanvasRectangleGuidesClass;
+
+struct _GimpCanvasRectangleGuides
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasRectangleGuidesClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_rectangle_guides_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_rectangle_guides_new      (GimpDisplayShell *shell,
+                                                        gdouble           x,
+                                                        gdouble           y,
+                                                        gdouble           width,
+                                                        gdouble           height,
+                                                        GimpGuidesType    type,
+                                                        gint              n_guides);
+
+void             gimp_canvas_rectangle_guides_set      (GimpCanvasItem   *rectangle,
+                                                        gdouble           x,
+                                                        gdouble           y,
+                                                        gdouble           width,
+                                                        gdouble           height,
+                                                        GimpGuidesType    type,
+                                                        gint              n_guides);
+
+
+#endif /* __GIMP_CANVAS_RECTANGLE_GUIDES_H__ */
diff --git a/app/display/gimpcanvassamplepoint.c b/app/display/gimpcanvassamplepoint.c
new file mode 100644
index 0000000..913a5b7
--- /dev/null
+++ b/app/display/gimpcanvassamplepoint.c
@@ -0,0 +1,356 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvassamplepoint.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvas-style.h"
+#include "gimpcanvassamplepoint.h"
+#include "gimpdisplayshell.h"
+
+
+#define GIMP_SAMPLE_POINT_DRAW_SIZE 14
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y,
+  PROP_INDEX,
+  PROP_SAMPLE_POINT_STYLE
+};
+
+
+typedef struct _GimpCanvasSamplePointPrivate GimpCanvasSamplePointPrivate;
+
+struct _GimpCanvasSamplePointPrivate
+{
+  gint     x;
+  gint     y;
+  gint     index;
+  gboolean sample_point_style;
+};
+
+#define GET_PRIVATE(sample_point) \
+        ((GimpCanvasSamplePointPrivate *) gimp_canvas_sample_point_get_instance_private ((GimpCanvasSamplePoint *) (sample_point)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_sample_point_set_property (GObject        *object,
+                                                               guint           property_id,
+                                                               const GValue   *value,
+                                                               GParamSpec     *pspec);
+static void             gimp_canvas_sample_point_get_property (GObject        *object,
+                                                               guint           property_id,
+                                                               GValue         *value,
+                                                               GParamSpec     *pspec);
+static void             gimp_canvas_sample_point_draw         (GimpCanvasItem *item,
+                                                               cairo_t        *cr);
+static cairo_region_t * gimp_canvas_sample_point_get_extents  (GimpCanvasItem *item);
+static void             gimp_canvas_sample_point_stroke       (GimpCanvasItem *item,
+                                                               cairo_t        *cr);
+static void             gimp_canvas_sample_point_fill         (GimpCanvasItem *item,
+                                                               cairo_t        *cr);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasSamplePoint, gimp_canvas_sample_point,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_sample_point_parent_class
+
+
+static void
+gimp_canvas_sample_point_class_init (GimpCanvasSamplePointClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_sample_point_set_property;
+  object_class->get_property = gimp_canvas_sample_point_get_property;
+
+  item_class->draw           = gimp_canvas_sample_point_draw;
+  item_class->get_extents    = gimp_canvas_sample_point_get_extents;
+  item_class->stroke         = gimp_canvas_sample_point_stroke;
+  item_class->fill           = gimp_canvas_sample_point_fill;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_int ("x", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_int ("y", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_INDEX,
+                                   g_param_spec_int ("index", NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SAMPLE_POINT_STYLE,
+                                   g_param_spec_boolean ("sample-point-style",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_sample_point_init (GimpCanvasSamplePoint *sample_point)
+{
+}
+
+static void
+gimp_canvas_sample_point_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      private->x = g_value_get_int (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_int (value);
+      break;
+    case PROP_INDEX:
+      private->index = g_value_get_int (value);
+      break;
+    case PROP_SAMPLE_POINT_STYLE:
+      private->sample_point_style = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_sample_point_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_int (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_int (value, private->x);
+      break;
+    case PROP_INDEX:
+      g_value_set_int (value, private->x);
+      break;
+    case PROP_SAMPLE_POINT_STYLE:
+      g_value_set_boolean (value, private->sample_point_style);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_sample_point_transform (GimpCanvasItem *item,
+                                    gdouble        *x,
+                                    gdouble        *y)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   private->x + 0.5,
+                                   private->y + 0.5,
+                                   x, y);
+
+  *x = floor (*x) + 0.5;
+  *y = floor (*y) + 0.5;
+}
+
+#define HALF_SIZE (GIMP_SAMPLE_POINT_DRAW_SIZE / 2)
+
+static void
+gimp_canvas_sample_point_draw (GimpCanvasItem *item,
+                               cairo_t        *cr)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
+  GtkWidget                    *canvas  = gimp_canvas_item_get_canvas (item);
+  PangoLayout                  *layout;
+  gdouble                       x, y;
+  gint                          x1, x2, y1, y2;
+
+  gimp_canvas_sample_point_transform (item, &x, &y);
+
+  x1 = x - GIMP_SAMPLE_POINT_DRAW_SIZE;
+  x2 = x + GIMP_SAMPLE_POINT_DRAW_SIZE;
+  y1 = y - GIMP_SAMPLE_POINT_DRAW_SIZE;
+  y2 = y + GIMP_SAMPLE_POINT_DRAW_SIZE;
+
+  cairo_move_to (cr, x, y1);
+  cairo_line_to (cr, x, y1 + HALF_SIZE);
+
+  cairo_move_to (cr, x, y2);
+  cairo_line_to (cr, x, y2 - HALF_SIZE);
+
+  cairo_move_to (cr, x1,             y);
+  cairo_line_to (cr, x1 + HALF_SIZE, y);
+
+  cairo_move_to (cr, x2,             y);
+  cairo_line_to (cr, x2 - HALF_SIZE, y);
+
+  cairo_arc_negative (cr, x, y, HALF_SIZE, 0.0, 0.5 * G_PI);
+
+  _gimp_canvas_item_stroke (item, cr);
+
+  layout = gimp_canvas_get_layout (GIMP_CANVAS (canvas),
+                                   "%d", private->index);
+
+  cairo_move_to (cr, x + 3, y + 3);
+  pango_cairo_show_layout (cr, layout);
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_sample_point_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
+  GtkWidget                    *canvas  = gimp_canvas_item_get_canvas (item);
+  cairo_rectangle_int_t         rectangle;
+  PangoLayout                  *layout;
+  PangoRectangle                ink;
+  gdouble                       x, y;
+  gint                          x1, x2, y1, y2;
+
+  gimp_canvas_sample_point_transform (item, &x, &y);
+
+  x1 = floor (x - GIMP_SAMPLE_POINT_DRAW_SIZE);
+  x2 = ceil  (x + GIMP_SAMPLE_POINT_DRAW_SIZE);
+  y1 = floor (y - GIMP_SAMPLE_POINT_DRAW_SIZE);
+  y2 = ceil  (y + GIMP_SAMPLE_POINT_DRAW_SIZE);
+
+  layout = gimp_canvas_get_layout (GIMP_CANVAS (canvas),
+                                   "%d", private->index);
+
+  pango_layout_get_extents (layout, &ink, NULL);
+
+  x2 = MAX (x2, 3 + ink.width);
+  y2 = MAX (y2, 3 + ink.height);
+
+  rectangle.x      = x1 - 1.5;
+  rectangle.y      = y1 - 1.5;
+  rectangle.width  = x2 - x1 + 3.0;
+  rectangle.height = y2 - y1 + 3.0;
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+static void
+gimp_canvas_sample_point_stroke (GimpCanvasItem *item,
+                                 cairo_t        *cr)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
+
+  if (private->sample_point_style)
+    {
+      gimp_canvas_set_tool_bg_style (gimp_canvas_item_get_canvas (item), cr);
+      cairo_stroke_preserve (cr);
+
+      gimp_canvas_set_sample_point_style (gimp_canvas_item_get_canvas (item), cr,
+                                          gimp_canvas_item_get_highlight (item));
+      cairo_stroke (cr);
+    }
+  else
+    {
+      GIMP_CANVAS_ITEM_CLASS (parent_class)->stroke (item, cr);
+    }
+}
+
+static void
+gimp_canvas_sample_point_fill (GimpCanvasItem *item,
+                               cairo_t        *cr)
+{
+  GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
+
+  if (private->sample_point_style)
+    {
+      gimp_canvas_set_sample_point_style (gimp_canvas_item_get_canvas (item), cr,
+                                          gimp_canvas_item_get_highlight (item));
+      cairo_fill (cr);
+    }
+  else
+    {
+      GIMP_CANVAS_ITEM_CLASS (parent_class)->fill (item, cr);
+    }
+}
+
+GimpCanvasItem *
+gimp_canvas_sample_point_new (GimpDisplayShell *shell,
+                              gint              x,
+                              gint              y,
+                              gint              index,
+                              gboolean          sample_point_style)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_SAMPLE_POINT,
+                       "shell",              shell,
+                       "x",                  x,
+                       "y",                  y,
+                       "index",              index,
+                       "sample-point-style", sample_point_style,
+                       NULL);
+}
+
+void
+gimp_canvas_sample_point_set (GimpCanvasItem *sample_point,
+                              gint            x,
+                              gint            y)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_SAMPLE_POINT (sample_point));
+
+  gimp_canvas_item_begin_change (sample_point);
+
+  g_object_set (sample_point,
+                "x", x,
+                "y", y,
+                NULL);
+
+  gimp_canvas_item_end_change (sample_point);
+}
diff --git a/app/display/gimpcanvassamplepoint.h b/app/display/gimpcanvassamplepoint.h
new file mode 100644
index 0000000..00ac0d5
--- /dev/null
+++ b/app/display/gimpcanvassamplepoint.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvassamplepoint.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_SAMPLE_POINT_H__
+#define __GIMP_CANVAS_SAMPLE_POINT_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_SAMPLE_POINT            (gimp_canvas_sample_point_get_type ())
+#define GIMP_CANVAS_SAMPLE_POINT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_SAMPLE_POINT, GimpCanvasSamplePoint))
+#define GIMP_CANVAS_SAMPLE_POINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_SAMPLE_POINT, GimpCanvasSamplePointClass))
+#define GIMP_IS_CANVAS_SAMPLE_POINT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_SAMPLE_POINT))
+#define GIMP_IS_CANVAS_SAMPLE_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_SAMPLE_POINT))
+#define GIMP_CANVAS_SAMPLE_POINT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_SAMPLE_POINT, GimpCanvasSamplePointClass))
+
+
+typedef struct _GimpCanvasSamplePoint      GimpCanvasSamplePoint;
+typedef struct _GimpCanvasSamplePointClass GimpCanvasSamplePointClass;
+
+struct _GimpCanvasSamplePoint
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasSamplePointClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_sample_point_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_sample_point_new      (GimpDisplayShell *shell,
+                                                    gint              x,
+                                                    gint              y,
+                                                    gint              index,
+                                                    gboolean          sample_point_style);
+
+void             gimp_canvas_sample_point_set      (GimpCanvasItem   *sample_point,
+                                                    gint              x,
+                                                    gint              y);
+
+
+#endif /* __GIMP_CANVAS_SAMPLE_POINT_H__ */
diff --git a/app/display/gimpcanvastextcursor.c b/app/display/gimpcanvastextcursor.c
new file mode 100644
index 0000000..aaa8c5f
--- /dev/null
+++ b/app/display/gimpcanvastextcursor.c
@@ -0,0 +1,386 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvastextcursor.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpcanvastextcursor.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_OVERWRITE,
+  PROP_DIRECTION
+};
+
+
+typedef struct _GimpCanvasTextCursorPrivate GimpCanvasTextCursorPrivate;
+
+struct _GimpCanvasTextCursorPrivate
+{
+  gint              x;
+  gint              y;
+  gint              width;
+  gint              height;
+  gboolean          overwrite;
+  GimpTextDirection direction;
+};
+
+#define GET_PRIVATE(text_cursor) \
+        ((GimpCanvasTextCursorPrivate *) gimp_canvas_text_cursor_get_instance_private ((GimpCanvasTextCursor *) (text_cursor)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_text_cursor_set_property (GObject        *object,
+                                                              guint           property_id,
+                                                              const GValue   *value,
+                                                              GParamSpec     *pspec);
+static void             gimp_canvas_text_cursor_get_property (GObject        *object,
+                                                              guint           property_id,
+                                                              GValue         *value,
+                                                              GParamSpec     *pspec);
+static void             gimp_canvas_text_cursor_draw         (GimpCanvasItem *item,
+                                                              cairo_t        *cr);
+static cairo_region_t * gimp_canvas_text_cursor_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasTextCursor, gimp_canvas_text_cursor,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_text_cursor_parent_class
+
+
+static void
+gimp_canvas_text_cursor_class_init (GimpCanvasTextCursorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_text_cursor_set_property;
+  object_class->get_property = gimp_canvas_text_cursor_get_property;
+
+  item_class->draw           = gimp_canvas_text_cursor_draw;
+  item_class->get_extents    = gimp_canvas_text_cursor_get_extents;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_int ("x", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_int ("y", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_int ("height", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_OVERWRITE,
+                                   g_param_spec_boolean ("overwrite", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_DIRECTION,
+                                   g_param_spec_enum ("direction", NULL, NULL,
+                                                     gimp_text_direction_get_type(),
+                                                     GIMP_TEXT_DIRECTION_LTR,
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_text_cursor_init (GimpCanvasTextCursor *text_cursor)
+{
+}
+
+static void
+gimp_canvas_text_cursor_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpCanvasTextCursorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      private->x = g_value_get_int (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_int (value);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_int (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_int (value);
+      break;
+    case PROP_OVERWRITE:
+      private->overwrite = g_value_get_boolean (value);
+      break;
+    case PROP_DIRECTION:
+      private->direction = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_text_cursor_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpCanvasTextCursorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_int (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_int (value, private->y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_int (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_int (value, private->height);
+      break;
+    case PROP_OVERWRITE:
+      g_value_set_boolean (value, private->overwrite);
+      break;
+    case PROP_DIRECTION:
+      g_value_set_enum (value, private->direction);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_text_cursor_transform (GimpCanvasItem *item,
+                                   gdouble        *x,
+                                   gdouble        *y,
+                                   gdouble        *w,
+                                   gdouble        *h)
+{
+  GimpCanvasTextCursorPrivate *private = GET_PRIVATE (item);
+
+  gimp_canvas_item_transform_xy_f (item,
+                                   MIN (private->x,
+                                        private->x + private->width),
+                                   MIN (private->y,
+                                        private->y + private->height),
+                                   x, y);
+  gimp_canvas_item_transform_xy_f (item,
+                                   MAX (private->x,
+                                        private->x + private->width),
+                                   MAX (private->y,
+                                        private->y + private->height),
+                                   w, h);
+
+  *w -= *x;
+  *h -= *y;
+
+  *x = floor (*x) + 0.5;
+  *y = floor (*y) + 0.5;
+  switch (private->direction)
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+    case GIMP_TEXT_DIRECTION_RTL:
+      break;
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+      *x = *x - *w;
+      break;
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      *y = *y + *h;
+      break;
+    }
+
+  if (private->overwrite)
+    {
+      *w = ceil (*w) - 1.0;
+      *h = ceil (*h) - 1.0;
+    }
+  else
+    {
+      switch (private->direction)
+        {
+        case GIMP_TEXT_DIRECTION_LTR:
+        case GIMP_TEXT_DIRECTION_RTL:
+          *w = 0;
+          *h = ceil (*h) - 1.0;
+           break;
+        case GIMP_TEXT_DIRECTION_TTB_RTL:
+        case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+          *w = ceil (*w) - 1.0;
+          *h = 0;
+          break;
+        case GIMP_TEXT_DIRECTION_TTB_LTR:
+        case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+          *w = ceil (*w) - 1.0;
+          *h = 0;
+          break;
+        }
+    }
+}
+
+static void
+gimp_canvas_text_cursor_draw (GimpCanvasItem *item,
+                              cairo_t        *cr)
+{
+  GimpCanvasTextCursorPrivate *private = GET_PRIVATE (item);
+  gdouble                      x, y;
+  gdouble                      w, h;
+
+  gimp_canvas_text_cursor_transform (item, &x, &y, &w, &h);
+
+  if (private->overwrite)
+    {
+      cairo_rectangle (cr, x, y, w, h);
+    }
+  else
+    {
+      switch (private->direction)
+        {
+        case GIMP_TEXT_DIRECTION_LTR:
+        case GIMP_TEXT_DIRECTION_RTL:
+          cairo_move_to (cr, x, y);
+          cairo_line_to (cr, x, y + h);
+
+          cairo_move_to (cr, x - 3.0, y);
+          cairo_line_to (cr, x + 3.0, y);
+
+          cairo_move_to (cr, x - 3.0, y + h);
+          cairo_line_to (cr, x + 3.0, y + h);
+          break;
+        case GIMP_TEXT_DIRECTION_TTB_RTL:
+        case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+        case GIMP_TEXT_DIRECTION_TTB_LTR:
+        case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+          cairo_move_to (cr, x, y);
+          cairo_line_to (cr, x + w, y);
+
+          cairo_move_to (cr, x, y - 3.0);
+          cairo_line_to (cr, x, y + 3.0);
+
+          cairo_move_to (cr, x + w, y - 3.0);
+          cairo_line_to (cr, x + w, y + 3.0);
+          break;
+        }
+    }
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_text_cursor_get_extents (GimpCanvasItem *item)
+{
+  GimpCanvasTextCursorPrivate *private = GET_PRIVATE (item);
+  cairo_rectangle_int_t        rectangle;
+  gdouble                      x, y;
+  gdouble                      w, h;
+
+  gimp_canvas_text_cursor_transform (item, &x, &y, &w, &h);
+
+  if (private->overwrite)
+    {
+      rectangle.x      = floor (x - 1.5);
+      rectangle.y      = floor (y - 1.5);
+      rectangle.width  = ceil (w + 3.0);
+      rectangle.height = ceil (h + 3.0);
+    }
+  else
+    {
+      switch (private->direction)
+        {
+        case GIMP_TEXT_DIRECTION_LTR:
+        case GIMP_TEXT_DIRECTION_RTL:
+          rectangle.x      = floor (x - 4.5);
+          rectangle.y      = floor (y - 1.5);
+          rectangle.width  = ceil (9.0);
+          rectangle.height = ceil (h + 3.0);
+          break;
+        case GIMP_TEXT_DIRECTION_TTB_RTL:
+        case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+        case GIMP_TEXT_DIRECTION_TTB_LTR:
+        case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+          rectangle.x      = floor (x - 1.5);
+          rectangle.y      = floor (y - 4.5);
+          rectangle.width  = ceil (w + 3.0);
+          rectangle.height = ceil (9.0);
+          break;
+        }
+    }
+
+  return cairo_region_create_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_text_cursor_new (GimpDisplayShell *shell,
+                             PangoRectangle   *cursor,
+                             gboolean          overwrite,
+                             GimpTextDirection direction)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (cursor != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_TEXT_CURSOR,
+                       "shell",     shell,
+                       "x",         cursor->x,
+                       "y",         cursor->y,
+                       "width",     cursor->width,
+                       "height",    cursor->height,
+                       "overwrite", overwrite,
+                       "direction", direction,
+                       NULL);
+}
diff --git a/app/display/gimpcanvastextcursor.h b/app/display/gimpcanvastextcursor.h
new file mode 100644
index 0000000..210b2a2
--- /dev/null
+++ b/app/display/gimpcanvastextcursor.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvastextcursor.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_TEXT_CURSOR_H__
+#define __GIMP_CANVAS_TEXT_CURSOR_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_TEXT_CURSOR            (gimp_canvas_text_cursor_get_type ())
+#define GIMP_CANVAS_TEXT_CURSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_TEXT_CURSOR, GimpCanvasTextCursor))
+#define GIMP_CANVAS_TEXT_CURSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_TEXT_CURSOR, GimpCanvasTextCursorClass))
+#define GIMP_IS_CANVAS_TEXT_CURSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_TEXT_CURSOR))
+#define GIMP_IS_CANVAS_TEXT_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_TEXT_CURSOR))
+#define GIMP_CANVAS_TEXT_CURSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_TEXT_CURSOR, GimpCanvasTextCursorClass))
+
+
+typedef struct _GimpCanvasTextCursor      GimpCanvasTextCursor;
+typedef struct _GimpCanvasTextCursorClass GimpCanvasTextCursorClass;
+
+struct _GimpCanvasTextCursor
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasTextCursorClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_text_cursor_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_text_cursor_new      (GimpDisplayShell *shell,
+                                                   PangoRectangle   *cursor,
+                                                   gboolean          overwrite,
+                                                   GimpTextDirection direction);
+
+
+#endif /* __GIMP_CANVAS_RECTANGLE_H__ */
diff --git a/app/display/gimpcanvastransformguides.c b/app/display/gimpcanvastransformguides.c
new file mode 100644
index 0000000..ba6c4cb
--- /dev/null
+++ b/app/display/gimpcanvastransformguides.c
@@ -0,0 +1,683 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvastransformguides.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+
+#include "gimpcanvastransformguides.h"
+#include "gimpdisplayshell.h"
+
+
+#define SQRT5 2.236067977
+
+
+enum
+{
+  PROP_0,
+  PROP_TRANSFORM,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2,
+  PROP_TYPE,
+  PROP_N_GUIDES,
+  PROP_CLIP
+};
+
+
+typedef struct _GimpCanvasTransformGuidesPrivate GimpCanvasTransformGuidesPrivate;
+
+struct _GimpCanvasTransformGuidesPrivate
+{
+  GimpMatrix3    transform;
+  gdouble        x1, y1;
+  gdouble        x2, y2;
+  GimpGuidesType type;
+  gint           n_guides;
+  gboolean       clip;
+};
+
+#define GET_PRIVATE(transform) \
+        ((GimpCanvasTransformGuidesPrivate *) gimp_canvas_transform_guides_get_instance_private ((GimpCanvasTransformGuides *) (transform)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_transform_guides_set_property (GObject        *object,
+                                                                   guint           property_id,
+                                                                   const GValue   *value,
+                                                                   GParamSpec     *pspec);
+static void             gimp_canvas_transform_guides_get_property (GObject        *object,
+                                                                   guint           property_id,
+                                                                   GValue         *value,
+                                                                   GParamSpec     *pspec);
+static void             gimp_canvas_transform_guides_draw         (GimpCanvasItem *item,
+                                                                   cairo_t        *cr);
+static cairo_region_t * gimp_canvas_transform_guides_get_extents  (GimpCanvasItem *item);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasTransformGuides,
+                            gimp_canvas_transform_guides, GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_transform_guides_parent_class
+
+
+static void
+gimp_canvas_transform_guides_class_init (GimpCanvasTransformGuidesClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->set_property = gimp_canvas_transform_guides_set_property;
+  object_class->get_property = gimp_canvas_transform_guides_get_property;
+
+  item_class->draw           = gimp_canvas_transform_guides_draw;
+  item_class->get_extents    = gimp_canvas_transform_guides_get_extents;
+
+  g_object_class_install_property (object_class, PROP_TRANSFORM,
+                                   gimp_param_spec_matrix3 ("transform",
+                                                            NULL, NULL,
+                                                            NULL,
+                                                            GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_double ("x1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_double ("y1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_double ("x2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_double ("y2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("type", NULL, NULL,
+                                                      GIMP_TYPE_GUIDES_TYPE,
+                                                      GIMP_GUIDES_NONE,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_N_GUIDES,
+                                   g_param_spec_int ("n-guides", NULL, NULL,
+                                                     1, 128, 4,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_CLIP,
+                                   g_param_spec_boolean ("clip", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_transform_guides_init (GimpCanvasTransformGuides *transform)
+{
+}
+
+static void
+gimp_canvas_transform_guides_set_property (GObject      *object,
+                                           guint         property_id,
+                                           const GValue *value,
+                                           GParamSpec   *pspec)
+{
+  GimpCanvasTransformGuidesPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TRANSFORM:
+      {
+        GimpMatrix3 *transform = g_value_get_boxed (value);
+
+        if (transform)
+          private->transform = *transform;
+        else
+          gimp_matrix3_identity (&private->transform);
+      }
+      break;
+
+    case PROP_X1:
+      private->x1 = g_value_get_double (value);
+      break;
+
+    case PROP_Y1:
+      private->y1 = g_value_get_double (value);
+      break;
+
+    case PROP_X2:
+      private->x2 = g_value_get_double (value);
+      break;
+
+    case PROP_Y2:
+      private->y2 = g_value_get_double (value);
+      break;
+
+    case PROP_TYPE:
+      private->type = g_value_get_enum (value);
+      break;
+
+    case PROP_N_GUIDES:
+      private->n_guides = g_value_get_int (value);
+      break;
+
+    case PROP_CLIP:
+      private->clip = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_transform_guides_get_property (GObject    *object,
+                                           guint       property_id,
+                                           GValue     *value,
+                                           GParamSpec *pspec)
+{
+  GimpCanvasTransformGuidesPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_TRANSFORM:
+      g_value_set_boxed (value, &private->transform);
+      break;
+
+    case PROP_X1:
+      g_value_set_double (value, private->x1);
+      break;
+
+    case PROP_Y1:
+      g_value_set_double (value, private->y1);
+      break;
+
+    case PROP_X2:
+      g_value_set_double (value, private->x2);
+      break;
+
+    case PROP_Y2:
+      g_value_set_double (value, private->y2);
+      break;
+
+    case PROP_TYPE:
+      g_value_set_enum (value, private->type);
+      break;
+
+    case PROP_N_GUIDES:
+      g_value_set_int (value, private->n_guides);
+      break;
+
+    case PROP_CLIP:
+      g_value_set_boolean (value, private->clip);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_canvas_transform_guides_transform (GimpCanvasItem *item,
+                                        GimpVector2    *t_vertices,
+                                        gint           *n_t_vertices)
+{
+  GimpCanvasTransformGuidesPrivate *private = GET_PRIVATE (item);
+  GimpVector2                       vertices[4];
+
+  vertices[0] = (GimpVector2) { private->x1, private->y1 };
+  vertices[1] = (GimpVector2) { private->x2, private->y1 };
+  vertices[2] = (GimpVector2) { private->x2, private->y2 };
+  vertices[3] = (GimpVector2) { private->x1, private->y2 };
+
+  if (private->clip)
+    {
+      gimp_transform_polygon (&private->transform, vertices, 4, TRUE,
+                              t_vertices, n_t_vertices);
+
+      return TRUE;
+    }
+  else
+    {
+      gint i;
+
+      for (i = 0; i < 4; i++)
+        {
+          gimp_matrix3_transform_point (&private->transform,
+                                        vertices[i].x,    vertices[i].y,
+                                        &t_vertices[i].x, &t_vertices[i].y);
+        }
+
+      *n_t_vertices = 4;
+
+      return gimp_transform_polygon_is_convex (t_vertices[0].x, t_vertices[0].y,
+                                               t_vertices[1].x, t_vertices[1].y,
+                                               t_vertices[3].x, t_vertices[3].y,
+                                               t_vertices[2].x, t_vertices[2].y);
+    }
+}
+
+static void
+draw_line (cairo_t        *cr,
+           GimpCanvasItem *item,
+           GimpMatrix3    *transform,
+           gdouble         x1,
+           gdouble         y1,
+           gdouble         x2,
+           gdouble         y2)
+{
+  GimpCanvasTransformGuidesPrivate *private = GET_PRIVATE (item);
+  GimpVector2                       vertices[2];
+  GimpVector2                       t_vertices[2];
+  gint                              n_t_vertices;
+
+  vertices[0] = (GimpVector2) { x1, y1 };
+  vertices[1] = (GimpVector2) { x2, y2 };
+
+  if (private->clip)
+    {
+      gimp_transform_polygon (transform, vertices, 2, FALSE,
+                              t_vertices, &n_t_vertices);
+    }
+  else
+    {
+      gint i;
+
+      for (i = 0; i < 2; i++)
+        {
+          gimp_matrix3_transform_point (transform,
+                                        vertices[i].x,    vertices[i].y,
+                                        &t_vertices[i].x, &t_vertices[i].y);
+        }
+
+      n_t_vertices = 2;
+    }
+
+  if (n_t_vertices == 2)
+    {
+      gint i;
+
+      for (i = 0; i < 2; i++)
+        {
+          GimpVector2 v;
+
+          gimp_canvas_item_transform_xy_f (item,
+                                           t_vertices[i].x, t_vertices[i].y,
+                                           &v.x,            &v.y);
+
+          v.x = floor (v.x) + 0.5;
+          v.y = floor (v.y) + 0.5;
+
+          if (i == 0)
+            cairo_move_to (cr, v.x, v.y);
+          else
+            cairo_line_to (cr, v.x, v.y);
+        }
+    }
+}
+
+static void
+draw_hline (cairo_t        *cr,
+            GimpCanvasItem *item,
+            GimpMatrix3    *transform,
+            gdouble         x1,
+            gdouble         x2,
+            gdouble         y)
+{
+  draw_line (cr, item, transform, x1, y, x2, y);
+}
+
+static void
+draw_vline (cairo_t        *cr,
+            GimpCanvasItem *item,
+            GimpMatrix3    *transform,
+            gdouble         y1,
+            gdouble         y2,
+            gdouble         x)
+{
+  draw_line (cr, item, transform, x, y1, x, y2);
+}
+
+static void
+gimp_canvas_transform_guides_draw (GimpCanvasItem *item,
+                                   cairo_t        *cr)
+{
+  GimpCanvasTransformGuidesPrivate *private = GET_PRIVATE (item);
+  GimpVector2                       t_vertices[5];
+  gint                              n_t_vertices;
+  gboolean                          convex;
+  gint                              i;
+
+  convex = gimp_canvas_transform_guides_transform (item,
+                                                   t_vertices, &n_t_vertices);
+
+  if (n_t_vertices < 2)
+    return;
+
+  for (i = 0; i < n_t_vertices; i++)
+    {
+      GimpVector2 v;
+
+      gimp_canvas_item_transform_xy_f (item, t_vertices[i].x, t_vertices[i].y,
+                                       &v.x, &v.y);
+
+      v.x = floor (v.x) + 0.5;
+      v.y = floor (v.y) + 0.5;
+
+      if (i == 0)
+        cairo_move_to (cr, v.x, v.y);
+      else
+        cairo_line_to (cr, v.x, v.y);
+    }
+
+  cairo_close_path (cr);
+
+  if (! convex || n_t_vertices < 3)
+    {
+      _gimp_canvas_item_stroke (item, cr);
+      return;
+    }
+
+  switch (private->type)
+    {
+    case GIMP_GUIDES_NONE:
+      break;
+
+    case GIMP_GUIDES_CENTER_LINES:
+      draw_hline (cr, item, &private->transform,
+                  private->x1, private->x2, (private->y1 + private->y2) / 2);
+      draw_vline (cr, item, &private->transform,
+                  private->y1, private->y2, (private->x1 + private->x2) / 2);
+      break;
+
+    case GIMP_GUIDES_THIRDS:
+      draw_hline (cr, item, &private->transform,
+                  private->x1, private->x2, (2 * private->y1 + private->y2) / 3);
+      draw_hline (cr, item, &private->transform,
+                  private->x1, private->x2, (private->y1 + 2 * private->y2) / 3);
+
+      draw_vline (cr, item, &private->transform,
+                  private->y1, private->y2, (2 * private->x1 + private->x2) / 3);
+      draw_vline (cr, item, &private->transform,
+                  private->y1, private->y2, (private->x1 + 2 * private->x2) / 3);
+      break;
+
+    case GIMP_GUIDES_FIFTHS:
+      for (i = 0; i < 5; i++)
+        {
+          draw_hline (cr, item, &private->transform,
+                      private->x1, private->x2,
+                      private->y1 + i * (private->y2 - private->y1) / 5);
+          draw_vline (cr, item, &private->transform,
+                      private->y1, private->y2,
+                      private->x1 + i * (private->x2 - private->x1) / 5);
+        }
+      break;
+
+    case GIMP_GUIDES_GOLDEN:
+      draw_hline (cr, item, &private->transform,
+                  private->x1, private->x2,
+                  (2 * private->y1 + (1 + SQRT5) * private->y2) / (3 + SQRT5));
+      draw_hline (cr, item, &private->transform,
+                  private->x1, private->x2,
+                  ((1 + SQRT5) * private->y1 + 2 * private->y2) / (3 + SQRT5));
+
+      draw_vline (cr, item, &private->transform,
+                  private->y1, private->y2,
+                  (2 * private->x1 + (1 + SQRT5) * private->x2) / (3 + SQRT5));
+      draw_vline (cr, item, &private->transform,
+                  private->y1, private->y2,
+                  ((1 + SQRT5) * private->x1 + 2 * private->x2) / (3 + SQRT5));
+      break;
+
+    /* This code implements the method of diagonals discovered by
+     * Edwin Westhoff - see http://www.diagonalmethod.info/
+     */
+    case GIMP_GUIDES_DIAGONALS:
+      {
+        /* the side of the largest square that can be
+         * fitted in whole into the rectangle (x1, y1), (x2, y2)
+         */
+        const gdouble square_side = MIN (private->x2 - private->x1,
+                                         private->y2 - private->y1);
+
+        /* diagonal from the top-left edge */
+        draw_line (cr, item, &private->transform,
+                   private->x1, private->y1,
+                   private->x1 + square_side,
+                   private->y1 + square_side);
+
+        /* diagonal from the top-right edge */
+        draw_line (cr, item, &private->transform,
+                   private->x2, private->y1,
+                   private->x2 - square_side,
+                   private->y1 + square_side);
+
+        /* diagonal from the bottom-left edge */
+        draw_line (cr, item, &private->transform,
+                   private->x1, private->y2,
+                   private->x1 + square_side,
+                   private->y2 - square_side);
+
+        /* diagonal from the bottom-right edge */
+        draw_line (cr, item, &private->transform,
+                   private->x2, private->y2,
+                   private->x2 - square_side,
+                   private->y2 - square_side);
+      }
+      break;
+
+    case GIMP_GUIDES_N_LINES:
+    case GIMP_GUIDES_SPACING:
+      {
+        gint width, height;
+        gint ngx, ngy;
+
+        width  = MAX (1, private->x2 - private->x1);
+        height = MAX (1, private->y2 - private->y1);
+
+        /*  the MIN() in the code below limits the grid to one line
+         *  every 5 image pixels, see bug 772667.
+         */
+
+        if (private->type == GIMP_GUIDES_N_LINES)
+          {
+            if (width <= height)
+              {
+                ngx = private->n_guides;
+                ngx = MIN (ngx, width / 5);
+
+                ngy = ngx * MAX (1, height / width);
+                ngy = MIN (ngy, height / 5);
+              }
+            else
+              {
+                ngy = private->n_guides;
+                ngy = MIN (ngy, height / 5);
+
+                ngx = ngy * MAX (1, width / height);
+                ngx = MIN (ngx, width / 5);
+              }
+          }
+        else /* GIMP_GUIDES_SPACING */
+          {
+            gint grid_size = MAX (2, private->n_guides);
+
+            ngx = width  / grid_size;
+            ngx = MIN (ngx, width / 5);
+
+            ngy = height / grid_size;
+            ngy = MIN (ngy, height / 5);
+          }
+
+        for (i = 1; i <= ngx; i++)
+          {
+            gdouble x = private->x1 + (((gdouble) i) / (ngx + 1) *
+                                       (private->x2 - private->x1));
+
+            draw_line (cr, item, &private->transform,
+                       x, private->y1,
+                       x, private->y2);
+          }
+
+        for (i = 1; i <= ngy; i++)
+          {
+            gdouble y = private->y1 + (((gdouble) i) / (ngy + 1) *
+                                       (private->y2 - private->y1));
+
+            draw_line (cr, item, &private->transform,
+                       private->x1, y,
+                       private->x2, y);
+          }
+      }
+    }
+
+  _gimp_canvas_item_stroke (item, cr);
+}
+
+static cairo_region_t *
+gimp_canvas_transform_guides_get_extents (GimpCanvasItem *item)
+{
+  GimpVector2           t_vertices[5];
+  gint                  n_t_vertices;
+  GimpVector2           top_left;
+  GimpVector2           bottom_right;
+  cairo_rectangle_int_t extents;
+  gint                  i;
+
+  gimp_canvas_transform_guides_transform (item, t_vertices, &n_t_vertices);
+
+  if (n_t_vertices < 2)
+    return  cairo_region_create ();
+
+  for (i = 0; i < n_t_vertices; i++)
+    {
+      GimpVector2 v;
+
+      gimp_canvas_item_transform_xy_f (item,
+                                       t_vertices[i].x, t_vertices[i].y,
+                                       &v.x,            &v.y);
+
+      if (i == 0)
+        {
+          top_left = bottom_right = v;
+        }
+      else
+        {
+          top_left.x     = MIN (top_left.x,     v.x);
+          top_left.y     = MIN (top_left.y,     v.y);
+
+          bottom_right.x = MAX (bottom_right.x, v.x);
+          bottom_right.y = MAX (bottom_right.y, v.y);
+        }
+    }
+
+  extents.x      = (gint) floor (top_left.x     - 1.5);
+  extents.y      = (gint) floor (top_left.y     - 1.5);
+  extents.width  = (gint) ceil  (bottom_right.x + 1.5) - extents.x;
+  extents.height = (gint) ceil  (bottom_right.y + 1.5) - extents.y;
+
+  return cairo_region_create_rectangle (&extents);
+}
+
+GimpCanvasItem *
+gimp_canvas_transform_guides_new (GimpDisplayShell  *shell,
+                                  const GimpMatrix3 *transform,
+                                  gdouble            x1,
+                                  gdouble            y1,
+                                  gdouble            x2,
+                                  gdouble            y2,
+                                  GimpGuidesType     type,
+                                  gint               n_guides,
+                                  gboolean           clip)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_TRANSFORM_GUIDES,
+                       "shell",     shell,
+                       "transform", transform,
+                       "x1",        x1,
+                       "y1",        y1,
+                       "x2",        x2,
+                       "y2",        y2,
+                       "type",      type,
+                       "n-guides",  n_guides,
+                       "clip",      clip,
+                       NULL);
+}
+
+void
+gimp_canvas_transform_guides_set (GimpCanvasItem    *guides,
+                                  const GimpMatrix3 *transform,
+                                  gdouble            x1,
+                                  gdouble            y1,
+                                  gdouble            x2,
+                                  gdouble            y2,
+                                  GimpGuidesType     type,
+                                  gint               n_guides,
+                                  gboolean           clip)
+{
+  g_return_if_fail (GIMP_IS_CANVAS_TRANSFORM_GUIDES (guides));
+
+  gimp_canvas_item_begin_change (guides);
+
+  g_object_set (guides,
+                "transform", transform,
+                "x1",        x1,
+                "y1",        y1,
+                "x2",        x2,
+                "y2",        y2,
+                "type",      type,
+                "n-guides",  n_guides,
+                "clip",      clip,
+                NULL);
+
+  gimp_canvas_item_end_change (guides);
+}
diff --git a/app/display/gimpcanvastransformguides.h b/app/display/gimpcanvastransformguides.h
new file mode 100644
index 0000000..4358501
--- /dev/null
+++ b/app/display/gimpcanvastransformguides.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvastransformguides.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_TRANSFORM_GUIDES_H__
+#define __GIMP_CANVAS_TRANSFORM_GUIDES_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_TRANSFORM_GUIDES            (gimp_canvas_transform_guides_get_type ())
+#define GIMP_CANVAS_TRANSFORM_GUIDES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_TRANSFORM_GUIDES, GimpCanvasTransformGuides))
+#define GIMP_CANVAS_TRANSFORM_GUIDES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_TRANSFORM_GUIDES, GimpCanvasTransformGuidesClass))
+#define GIMP_IS_CANVAS_TRANSFORM_GUIDES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_TRANSFORM_GUIDES))
+#define GIMP_IS_CANVAS_TRANSFORM_GUIDES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_TRANSFORM_GUIDES))
+#define GIMP_CANVAS_TRANSFORM_GUIDES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_TRANSFORM_GUIDES, GimpCanvasTransformGuidesClass))
+
+
+typedef struct _GimpCanvasTransformGuides      GimpCanvasTransformGuides;
+typedef struct _GimpCanvasTransformGuidesClass GimpCanvasTransformGuidesClass;
+
+struct _GimpCanvasTransformGuides
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasTransformGuidesClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_transform_guides_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_transform_guides_new      (GimpDisplayShell  *shell,
+                                                        const GimpMatrix3 *transform,
+                                                        gdouble            x1,
+                                                        gdouble            y1,
+                                                        gdouble            x2,
+                                                        gdouble            y2,
+                                                        GimpGuidesType     type,
+                                                        gint               n_guides,
+                                                        gboolean           clip);
+
+void             gimp_canvas_transform_guides_set      (GimpCanvasItem    *guides,
+                                                        const GimpMatrix3 *transform,
+                                                        gdouble            x1,
+                                                        gdouble            y1,
+                                                        gdouble            x2,
+                                                        gdouble            y2,
+                                                        GimpGuidesType     type,
+                                                        gint               n_guides,
+                                                        gboolean           clip);
+
+
+#endif /* __GIMP_CANVAS_TRANSFORM_GUIDES_H__ */
diff --git a/app/display/gimpcanvastransformpreview.c b/app/display/gimpcanvastransformpreview.c
new file mode 100644
index 0000000..8c8d950
--- /dev/null
+++ b/app/display/gimpcanvastransformpreview.c
@@ -0,0 +1,791 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvastransformpreview.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display/display-types.h"
+
+#include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimp-gegl-utils.h"
+#include "gegl/gimptilehandlervalidate.h"
+
+#include "core/gimp-transform-resize.h"
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimppickable.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvastransformpreview.h"
+#include "gimpdisplayshell.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PICKABLE,
+  PROP_TRANSFORM,
+  PROP_CLIP,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2,
+  PROP_OPACITY
+};
+
+
+typedef struct _GimpCanvasTransformPreviewPrivate GimpCanvasTransformPreviewPrivate;
+
+struct _GimpCanvasTransformPreviewPrivate
+{
+  GimpPickable        *pickable;
+  GimpMatrix3          transform;
+  GimpTransformResize  clip;
+  gdouble              x1, y1;
+  gdouble              x2, y2;
+  gdouble              opacity;
+
+  GeglNode            *node;
+  GeglNode            *source_node;
+  GeglNode            *convert_format_node;
+  GeglNode            *layer_mask_source_node;
+  GeglNode            *layer_mask_opacity_node;
+  GeglNode            *mask_source_node;
+  GeglNode            *mask_translate_node;
+  GeglNode            *mask_crop_node;
+  GeglNode            *opacity_node;
+  GeglNode            *cache_node;
+  GeglNode            *transform_node;
+
+  GimpPickable        *node_pickable;
+  GimpDrawable        *node_layer_mask;
+  GimpDrawable        *node_mask;
+  GeglRectangle        node_rect;
+  gdouble              node_opacity;
+  GimpMatrix3          node_matrix;
+  GeglNode            *node_output;
+};
+
+#define GET_PRIVATE(transform_preview) \
+        ((GimpCanvasTransformPreviewPrivate *) gimp_canvas_transform_preview_get_instance_private ((GimpCanvasTransformPreview *) (transform_preview)))
+
+
+/*  local function prototypes  */
+
+static void             gimp_canvas_transform_preview_dispose       (GObject                    *object);
+static void             gimp_canvas_transform_preview_set_property  (GObject                    *object,
+                                                                     guint                       property_id,
+                                                                     const GValue               *value,
+                                                                     GParamSpec                 *pspec);
+static void             gimp_canvas_transform_preview_get_property  (GObject                    *object,
+                                                                     guint                       property_id,
+                                                                     GValue                     *value,
+                                                                     GParamSpec                 *pspec);
+
+static void             gimp_canvas_transform_preview_draw          (GimpCanvasItem             *item,
+                                                                     cairo_t                    *cr);
+static cairo_region_t * gimp_canvas_transform_preview_get_extents   (GimpCanvasItem             *item);
+
+static void             gimp_canvas_transform_preview_layer_changed (GimpLayer                  *layer,
+                                                                     GimpCanvasTransformPreview *transform_preview);
+
+static void             gimp_canvas_transform_preview_set_pickable  (GimpCanvasTransformPreview *transform_preview,
+                                                                     GimpPickable               *pickable);
+static void             gimp_canvas_transform_preview_sync_node     (GimpCanvasTransformPreview *transform_preview);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasTransformPreview,
+                            gimp_canvas_transform_preview,
+                            GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_transform_preview_parent_class
+
+
+/* private functions */
+
+
+static void
+gimp_canvas_transform_preview_class_init (GimpCanvasTransformPreviewClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpCanvasItemClass *item_class   = GIMP_CANVAS_ITEM_CLASS (klass);
+
+  object_class->dispose      = gimp_canvas_transform_preview_dispose;
+  object_class->set_property = gimp_canvas_transform_preview_set_property;
+  object_class->get_property = gimp_canvas_transform_preview_get_property;
+
+  item_class->draw           = gimp_canvas_transform_preview_draw;
+  item_class->get_extents    = gimp_canvas_transform_preview_get_extents;
+
+  g_object_class_install_property (object_class, PROP_PICKABLE,
+                                   g_param_spec_object ("pickable",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_PICKABLE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TRANSFORM,
+                                   gimp_param_spec_matrix3 ("transform",
+                                                            NULL, NULL,
+                                                            NULL,
+                                                            GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_CLIP,
+                                   g_param_spec_enum ("clip",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_TRANSFORM_RESIZE,
+                                                      GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_double ("x1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_double ("y1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_double ("x2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_double ("y2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_OPACITY,
+                                   g_param_spec_double ("opacity",
+                                                        NULL, NULL,
+                                                        0.0, 1.0, 1.0,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_canvas_transform_preview_init (GimpCanvasTransformPreview *transform_preview)
+{
+  GimpCanvasTransformPreviewPrivate *private = GET_PRIVATE (transform_preview);
+
+  private->clip    = GIMP_TRANSFORM_RESIZE_ADJUST;
+  private->opacity = 1.0;
+}
+
+static void
+gimp_canvas_transform_preview_dispose (GObject *object)
+{
+  GimpCanvasTransformPreview        *transform_preview = GIMP_CANVAS_TRANSFORM_PREVIEW (object);
+  GimpCanvasTransformPreviewPrivate *private           = GET_PRIVATE (object);
+
+  g_clear_object (&private->node);
+
+  gimp_canvas_transform_preview_set_pickable (transform_preview, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_canvas_transform_preview_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpCanvasTransformPreview        *transform_preview = GIMP_CANVAS_TRANSFORM_PREVIEW (object);
+  GimpCanvasTransformPreviewPrivate *private           = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_PICKABLE:
+      gimp_canvas_transform_preview_set_pickable (transform_preview,
+                                                  g_value_get_object (value));
+      break;
+
+    case PROP_TRANSFORM:
+      {
+        GimpMatrix3 *transform = g_value_get_boxed (value);
+
+        if (transform)
+          private->transform = *transform;
+        else
+          gimp_matrix3_identity (&private->transform);
+      }
+      break;
+
+    case PROP_CLIP:
+      private->clip = g_value_get_enum (value);
+      break;
+
+    case PROP_X1:
+      private->x1 = g_value_get_double (value);
+      break;
+
+    case PROP_Y1:
+      private->y1 = g_value_get_double (value);
+      break;
+
+    case PROP_X2:
+      private->x2 = g_value_get_double (value);
+      break;
+
+    case PROP_Y2:
+      private->y2 = g_value_get_double (value);
+      break;
+
+    case PROP_OPACITY:
+      private->opacity = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_canvas_transform_preview_get_property (GObject    *object,
+                                            guint       property_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpCanvasTransformPreviewPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_PICKABLE:
+      g_value_set_object (value, private->pickable);
+      break;
+
+    case PROP_TRANSFORM:
+      g_value_set_boxed (value, &private->transform);
+      break;
+
+    case PROP_CLIP:
+      g_value_set_enum (value, private->clip);
+      break;
+
+    case PROP_X1:
+      g_value_set_double (value, private->x1);
+      break;
+
+    case PROP_Y1:
+      g_value_set_double (value, private->y1);
+      break;
+
+    case PROP_X2:
+      g_value_set_double (value, private->x2);
+      break;
+
+    case PROP_Y2:
+      g_value_set_double (value, private->y2);
+      break;
+
+    case PROP_OPACITY:
+      g_value_set_double (value, private->opacity);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_canvas_transform_preview_transform (GimpCanvasItem        *item,
+                                         cairo_rectangle_int_t *extents)
+{
+  GimpCanvasTransformPreviewPrivate *private = GET_PRIVATE (item);
+  gint                               x1,  y1;
+  gint                               x2,  y2;
+  gdouble                            tx1, ty1;
+  gdouble                            tx2, ty2;
+
+  if (! gimp_transform_resize_boundary (&private->transform,
+                                        private->clip,
+                                        private->x1, private->y1,
+                                        private->x2, private->y2,
+                                        &x1,         &y1,
+                                        &x2,         &y2))
+    {
+      return FALSE;
+    }
+
+  gimp_canvas_item_transform_xy_f (item, x1, y1, &tx1, &ty1);
+  gimp_canvas_item_transform_xy_f (item, x2, y2, &tx2, &ty2);
+
+  extents->x      = (gint) floor (tx1);
+  extents->y      = (gint) floor (ty1);
+  extents->width  = (gint) ceil  (tx2) - extents->x;
+  extents->height = (gint) ceil  (ty2) - extents->y;
+
+  return TRUE;
+}
+
+static void
+gimp_canvas_transform_preview_draw (GimpCanvasItem *item,
+                                    cairo_t        *cr)
+{
+  GimpCanvasTransformPreview        *transform_preview = GIMP_CANVAS_TRANSFORM_PREVIEW (item);
+  GimpCanvasTransformPreviewPrivate *private           = GET_PRIVATE (item);
+  GimpDisplayShell                  *shell             = gimp_canvas_item_get_shell (item);
+  cairo_rectangle_int_t              extents;
+  gdouble                            clip_x1, clip_y1;
+  gdouble                            clip_x2, clip_y2;
+  GeglRectangle                      bounds;
+  cairo_surface_t                   *surface;
+  guchar                            *surface_data;
+  gint                               surface_stride;
+
+  if (! gimp_canvas_transform_preview_transform (item, &extents))
+    return;
+
+  cairo_clip_extents (cr, &clip_x1, &clip_y1, &clip_x2, &clip_y2);
+
+  clip_x1 = floor (clip_x1);
+  clip_y1 = floor (clip_y1);
+  clip_x2 = ceil  (clip_x2);
+  clip_y2 = ceil  (clip_y2);
+
+  if (! gegl_rectangle_intersect (&bounds,
+                                  GEGL_RECTANGLE (extents.x,
+                                                  extents.y,
+                                                  extents.width,
+                                                  extents.height),
+                                  GEGL_RECTANGLE (clip_x1,
+                                                  clip_y1,
+                                                  clip_x2 - clip_x1,
+                                                  clip_y2 - clip_y1)))
+    {
+      return;
+    }
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                        bounds.width, bounds.height);
+
+  g_return_if_fail (surface != NULL);
+
+  surface_data   = cairo_image_surface_get_data (surface);
+  surface_stride = cairo_image_surface_get_stride (surface);
+
+  gimp_canvas_transform_preview_sync_node (transform_preview);
+
+  gegl_node_blit (private->node_output, 1.0,
+                  GEGL_RECTANGLE (bounds.x + shell->offset_x,
+                                  bounds.y + shell->offset_y,
+                                  bounds.width,
+                                  bounds.height),
+                  babl_format ("cairo-ARGB32"), surface_data, surface_stride,
+                  GEGL_BLIT_CACHE);
+
+  cairo_surface_mark_dirty (surface);
+
+  cairo_set_source_surface (cr, surface, bounds.x, bounds.y);
+  cairo_rectangle (cr, bounds.x, bounds.y, bounds.width, bounds.height);
+  cairo_fill (cr);
+
+  cairo_surface_destroy (surface);
+}
+
+static cairo_region_t *
+gimp_canvas_transform_preview_get_extents (GimpCanvasItem *item)
+{
+  cairo_rectangle_int_t rectangle;
+
+  if (gimp_canvas_transform_preview_transform (item, &rectangle))
+    return cairo_region_create_rectangle (&rectangle);
+
+  return NULL;
+}
+
+static void
+gimp_canvas_transform_preview_layer_changed (GimpLayer                  *layer,
+                                             GimpCanvasTransformPreview *transform_preview)
+{
+  GimpCanvasItem *item = GIMP_CANVAS_ITEM (transform_preview);
+
+  gimp_canvas_item_begin_change (item);
+  gimp_canvas_item_end_change   (item);
+}
+
+static void
+gimp_canvas_transform_preview_set_pickable (GimpCanvasTransformPreview *transform_preview,
+                                            GimpPickable               *pickable)
+{
+  GimpCanvasTransformPreviewPrivate *private = GET_PRIVATE (transform_preview);
+
+  if (private->pickable && GIMP_IS_LAYER (private->pickable))
+    {
+      g_signal_handlers_disconnect_by_func (
+        private->pickable,
+        gimp_canvas_transform_preview_layer_changed,
+        transform_preview);
+    }
+
+  g_set_object (&private->pickable, pickable);
+
+  if (pickable && GIMP_IS_LAYER (pickable))
+    {
+      g_signal_connect (pickable, "opacity-changed",
+                        G_CALLBACK (gimp_canvas_transform_preview_layer_changed),
+                        transform_preview);
+      g_signal_connect (pickable, "mask-changed",
+                        G_CALLBACK (gimp_canvas_transform_preview_layer_changed),
+                        transform_preview);
+      g_signal_connect (pickable, "apply-mask-changed",
+                        G_CALLBACK (gimp_canvas_transform_preview_layer_changed),
+                        transform_preview);
+      g_signal_connect (pickable, "show-mask-changed",
+                        G_CALLBACK (gimp_canvas_transform_preview_layer_changed),
+                        transform_preview);
+    }
+}
+
+static void
+gimp_canvas_transform_preview_sync_node (GimpCanvasTransformPreview *transform_preview)
+{
+  GimpCanvasTransformPreviewPrivate *private    = GET_PRIVATE (transform_preview);
+  GimpCanvasItem                    *item       = GIMP_CANVAS_ITEM (transform_preview);
+  GimpDisplayShell                  *shell      = gimp_canvas_item_get_shell (item);
+  GimpImage                         *image      = gimp_canvas_item_get_image (item);
+  GimpPickable                      *pickable   = private->pickable;
+  GimpDrawable                      *layer_mask = NULL;
+  GimpDrawable                      *mask       = NULL;
+  gdouble                            opacity    = private->opacity;
+  gint                               offset_x   = 0;
+  gint                               offset_y   = 0;
+  GimpMatrix3                        matrix;
+
+  if (! private->node)
+    {
+      private->node = gegl_node_new ();
+
+      private->source_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gimp:buffer-source-validate",
+                             NULL);
+
+      private->convert_format_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:convert-format",
+                             NULL);
+
+      private->layer_mask_source_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gimp:buffer-source-validate",
+                             NULL);
+
+      private->layer_mask_opacity_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:opacity",
+                             NULL);
+
+      private->mask_source_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gimp:buffer-source-validate",
+                             NULL);
+
+      private->mask_translate_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:translate",
+                             NULL);
+
+      private->mask_crop_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:crop",
+                             "width",     0.0,
+                             "height",    0.0,
+                             NULL);
+
+      private->opacity_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:opacity",
+                             NULL);
+
+      private->cache_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:cache",
+                             NULL);
+
+      private->transform_node =
+        gegl_node_new_child (private->node,
+                             "operation", "gegl:transform",
+                             "near-z",    GIMP_TRANSFORM_NEAR_Z,
+                             "sampler",   GIMP_INTERPOLATION_NONE,
+                             NULL);
+
+      gegl_node_link_many (private->source_node,
+                           private->convert_format_node,
+                           private->transform_node,
+                           NULL);
+
+      gegl_node_connect_to (private->layer_mask_source_node,  "output",
+                            private->layer_mask_opacity_node, "aux");
+
+      gegl_node_link_many (private->mask_source_node,
+                           private->mask_translate_node,
+                           private->mask_crop_node,
+                           NULL);
+
+      private->node_pickable   = NULL;
+      private->node_layer_mask = NULL;
+      private->node_mask       = NULL;
+      private->node_rect       = *GEGL_RECTANGLE (0, 0, 0, 0);
+      private->node_opacity    = 1.0;
+      gimp_matrix3_identity (&private->node_matrix);
+      private->node_output     = private->transform_node;
+    }
+
+  if (GIMP_IS_ITEM (pickable))
+    {
+      gimp_item_get_offset (GIMP_ITEM (private->pickable),
+                            &offset_x, &offset_y);
+
+      if (gimp_item_mask_bounds (GIMP_ITEM (pickable),
+                                 NULL, NULL, NULL, NULL))
+        {
+          mask = GIMP_DRAWABLE (gimp_image_get_mask (image));
+        }
+
+      if (GIMP_IS_LAYER (pickable))
+        {
+          GimpLayer *layer = GIMP_LAYER (pickable);
+
+          opacity *= gimp_layer_get_opacity (layer);
+
+          layer_mask = GIMP_DRAWABLE (gimp_layer_get_mask (layer));
+
+          if (layer_mask)
+            {
+              if (gimp_layer_get_show_mask (layer) && ! mask)
+                {
+                  pickable   = GIMP_PICKABLE (layer_mask);
+                  layer_mask = NULL;
+                }
+              else if (! gimp_layer_get_apply_mask (layer))
+                {
+                  layer_mask = NULL;
+                }
+            }
+        }
+    }
+
+  gimp_matrix3_identity (&matrix);
+  gimp_matrix3_translate (&matrix, offset_x, offset_y);
+  gimp_matrix3_mult (&private->transform, &matrix);
+  gimp_matrix3_scale (&matrix, shell->scale_x, shell->scale_y);
+
+  if (pickable != private->node_pickable)
+    {
+      GeglBuffer *buffer;
+
+      gimp_pickable_flush (pickable);
+
+      buffer = gimp_pickable_get_buffer (pickable);
+
+      if (gimp_tile_handler_validate_get_assigned (buffer))
+        buffer = gimp_gegl_buffer_dup (buffer);
+      else
+        buffer = g_object_ref (buffer);
+
+      gegl_node_set (private->source_node,
+                     "buffer", buffer,
+                     NULL);
+      gegl_node_set (private->convert_format_node,
+                     "format", gimp_pickable_get_format_with_alpha (pickable),
+                     NULL);
+
+      g_object_unref (buffer);
+    }
+
+  if (layer_mask != private->node_layer_mask)
+    {
+      gegl_node_set (private->layer_mask_source_node,
+                     "buffer", layer_mask ?
+                                 gimp_drawable_get_buffer (layer_mask) :
+                                 NULL,
+                     NULL);
+    }
+
+  if (mask)
+    {
+      GeglRectangle  rect;
+
+      rect.x      = offset_x;
+      rect.y      = offset_y;
+      rect.width  = gimp_item_get_width  (GIMP_ITEM (private->pickable));
+      rect.height = gimp_item_get_height (GIMP_ITEM (private->pickable));
+
+      if (mask != private->node_mask)
+        {
+          gegl_node_set (private->mask_source_node,
+                         "buffer", gimp_drawable_get_buffer (mask),
+                         NULL);
+        }
+
+      if (! gegl_rectangle_equal (&rect, &private->node_rect))
+        {
+          private->node_rect = rect;
+
+          gegl_node_set (private->mask_translate_node,
+                         "x", (gdouble) -rect.x,
+                         "y", (gdouble) -rect.y,
+                         NULL);
+
+          gegl_node_set (private->mask_crop_node,
+                         "width",  (gdouble) rect.width,
+                         "height", (gdouble) rect.height,
+                         NULL);
+        }
+
+      if (! private->node_mask)
+        {
+          gegl_node_connect_to (private->mask_crop_node, "output",
+                                private->opacity_node,   "aux");
+        }
+    }
+  else if (private->node_mask)
+    {
+      gegl_node_disconnect (private->opacity_node, "aux");
+    }
+
+  if (opacity != private->node_opacity)
+    {
+      gegl_node_set (private->opacity_node,
+                     "value", opacity,
+                     NULL);
+    }
+
+  if (layer_mask       != private->node_layer_mask ||
+      mask             != private->node_mask       ||
+      (opacity != 1.0) != (private->node_opacity != 1.0))
+    {
+      GeglNode *output = private->source_node;
+
+      if (layer_mask && ! mask)
+        {
+          gegl_node_link (output, private->layer_mask_opacity_node);
+          output = private->layer_mask_opacity_node;
+        }
+      else
+        {
+          gegl_node_disconnect (private->layer_mask_opacity_node, "input");
+        }
+
+      if (mask || (opacity != 1.0))
+        {
+          gegl_node_link (output, private->opacity_node);
+          output = private->opacity_node;
+        }
+      else
+        {
+          gegl_node_disconnect (private->opacity_node, "input");
+        }
+
+      if (output == private->source_node)
+        {
+          gegl_node_disconnect (private->cache_node, "input");
+
+          gegl_node_link (output, private->convert_format_node);
+          output = private->convert_format_node;
+        }
+      else
+        {
+          gegl_node_disconnect (private->convert_format_node, "input");
+
+          gegl_node_link (output, private->cache_node);
+          output = private->cache_node;
+        }
+
+      gegl_node_link (output, private->transform_node);
+      output = private->transform_node;
+
+      if (layer_mask && mask)
+        {
+          gegl_node_link (output, private->layer_mask_opacity_node);
+          output = private->layer_mask_opacity_node;
+        }
+
+      private->node_output = output;
+    }
+
+  if (memcmp (&matrix, &private->node_matrix, sizeof (matrix)))
+    {
+      private->node_matrix = matrix;
+
+      gimp_gegl_node_set_matrix (private->transform_node, &matrix);
+    }
+
+  private->node_pickable   = pickable;
+  private->node_layer_mask = layer_mask;
+  private->node_mask       = mask;
+  private->node_opacity    = opacity;
+}
+
+
+/* public functions */
+
+
+GimpCanvasItem *
+gimp_canvas_transform_preview_new (GimpDisplayShell  *shell,
+                                   GimpPickable      *pickable,
+                                   const GimpMatrix3 *transform,
+                                   gdouble            x1,
+                                   gdouble            y1,
+                                   gdouble            x2,
+                                   gdouble            y2)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+  g_return_val_if_fail (transform != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW,
+                       "shell",     shell,
+                       "pickable",  pickable,
+                       "transform", transform,
+                       "x1",        x1,
+                       "y1",        y1,
+                       "x2",        x2,
+                       "y2",        y2,
+                       NULL);
+}
diff --git a/app/display/gimpcanvastransformpreview.h b/app/display/gimpcanvastransformpreview.h
new file mode 100644
index 0000000..a82d50c
--- /dev/null
+++ b/app/display/gimpcanvastransformpreview.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvastransformpreview.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_TRANSFORM_PREVIEW_H__
+#define __GIMP_CANVAS_TRANSFORM_PREVIEW_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW            (gimp_canvas_transform_preview_get_type ())
+#define GIMP_CANVAS_TRANSFORM_PREVIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW, GimpCanvasTransformPreview))
+#define GIMP_CANVAS_TRANSFORM_PREVIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW, GimpCanvasTransformPreviewClass))
+#define GIMP_IS_CANVAS_TRANSFORM_PREVIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW))
+#define GIMP_IS_CANVAS_TRANSFORM_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW))
+#define GIMP_CANVAS_TRANSFORM_PREVIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_TRANSFORM_PREVIEW, GimpCanvasTransformPreviewClass))
+
+
+typedef struct _GimpCanvasTransformPreview      GimpCanvasTransformPreview;
+typedef struct _GimpCanvasTransformPreviewClass GimpCanvasTransformPreviewClass;
+
+struct _GimpCanvasTransformPreview
+{
+  GimpCanvasItem  parent_instance;
+};
+
+struct _GimpCanvasTransformPreviewClass
+{
+  GimpCanvasItemClass  parent_class;
+};
+
+
+GType            gimp_canvas_transform_preview_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_transform_preview_new      (GimpDisplayShell  *shell,
+                                                         GimpPickable      *pickable,
+                                                         const GimpMatrix3 *transform,
+                                                         gdouble            x1,
+                                                         gdouble            y1,
+                                                         gdouble            x2,
+                                                         gdouble            y2);
+
+
+#endif /* __GIMP_CANVAS_TRANSFORM_PREVIEW_H__ */
diff --git a/app/display/gimpcursorview.c b/app/display/gimpcursorview.c
new file mode 100644
index 0000000..846df91
--- /dev/null
+++ b/app/display/gimpcursorview.c
@@ -0,0 +1,887 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcursorview.c
+ * Copyright (C) 2005-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-color.h"
+#include "core/gimpitem.h"
+
+#include "widgets/gimpcolorframe.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpsessioninfo-aux.h"
+
+#include "gimpcursorview.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLE_MERGED
+};
+
+
+struct _GimpCursorViewPrivate
+{
+  GimpEditor        parent_instance;
+
+  GtkWidget        *coord_hbox;
+  GtkWidget        *selection_hbox;
+  GtkWidget        *color_hbox;
+
+  GtkWidget        *pixel_x_label;
+  GtkWidget        *pixel_y_label;
+  GtkWidget        *unit_x_label;
+  GtkWidget        *unit_y_label;
+  GtkWidget        *selection_x_label;
+  GtkWidget        *selection_y_label;
+  GtkWidget        *selection_width_label;
+  GtkWidget        *selection_height_label;
+  GtkWidget        *color_frame_1;
+  GtkWidget        *color_frame_2;
+
+  gboolean          sample_merged;
+
+  GimpContext      *context;
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  GimpUnit          unit;
+
+  guint             cursor_idle_id;
+  GimpImage        *cursor_image;
+  GimpUnit          cursor_unit;
+  gdouble           cursor_x;
+  gdouble           cursor_y;
+};
+
+
+static void       gimp_cursor_view_docked_iface_init     (GimpDockedInterface *iface);
+
+static void       gimp_cursor_view_dispose               (GObject             *object);
+static void       gimp_cursor_view_set_property          (GObject             *object,
+                                                          guint                property_id,
+                                                          const GValue        *value,
+                                                          GParamSpec          *pspec);
+static void       gimp_cursor_view_get_property          (GObject             *object,
+                                                          guint                property_id,
+                                                          GValue              *value,
+                                                          GParamSpec          *pspec);
+
+static void       gimp_cursor_view_style_set             (GtkWidget           *widget,
+                                                          GtkStyle            *prev_style);
+
+static void       gimp_cursor_view_set_aux_info          (GimpDocked          *docked,
+                                                          GList               *aux_info);
+static GList    * gimp_cursor_view_get_aux_info          (GimpDocked          *docked);
+
+static void       gimp_cursor_view_set_context           (GimpDocked          *docked,
+                                                          GimpContext         *context);
+static void       gimp_cursor_view_image_changed         (GimpCursorView      *view,
+                                                          GimpImage           *image,
+                                                          GimpContext         *context);
+static void       gimp_cursor_view_mask_changed          (GimpCursorView      *view,
+                                                          GimpImage           *image);
+static void       gimp_cursor_view_diplay_changed        (GimpCursorView      *view,
+                                                          GimpDisplay         *display,
+                                                          GimpContext         *context);
+static void       gimp_cursor_view_shell_unit_changed    (GimpCursorView      *view,
+                                                          GParamSpec          *pspec,
+                                                          GimpDisplayShell    *shell);
+static void       gimp_cursor_view_format_as_unit        (GimpUnit             unit,
+                                                          gchar               *output_buf,
+                                                          gint                 output_buf_size,
+                                                          gdouble              pixel_value,
+                                                          gdouble              image_res);
+static void       gimp_cursor_view_set_label_italic      (GtkWidget           *label,
+                                                          gboolean             italic);
+static void       gimp_cursor_view_update_selection_info (GimpCursorView      *view,
+                                                          GimpImage           *image,
+                                                          GimpUnit             unit);
+static gboolean   gimp_cursor_view_cursor_idle           (GimpCursorView      *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpCursorView, gimp_cursor_view, GIMP_TYPE_EDITOR,
+                         G_ADD_PRIVATE (GimpCursorView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_cursor_view_docked_iface_init))
+
+#define parent_class gimp_cursor_view_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_cursor_view_class_init (GimpCursorViewClass* klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose      = gimp_cursor_view_dispose;
+  object_class->get_property = gimp_cursor_view_get_property;
+  object_class->set_property = gimp_cursor_view_set_property;
+
+  widget_class->style_set    = gimp_cursor_view_style_set;
+
+  g_object_class_install_property (object_class, PROP_SAMPLE_MERGED,
+                                   g_param_spec_boolean ("sample-merged",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_cursor_view_init (GimpCursorView *view)
+{
+  GtkWidget *frame;
+  GtkWidget *table;
+  GtkWidget *toggle;
+  gint       content_spacing;
+
+  view->priv = gimp_cursor_view_get_instance_private (view);
+
+  view->priv->sample_merged  = TRUE;
+  view->priv->context        = NULL;
+  view->priv->shell          = NULL;
+  view->priv->image          = NULL;
+  view->priv->unit           = GIMP_UNIT_PIXEL;
+  view->priv->cursor_idle_id = 0;
+
+  gtk_widget_style_get (GTK_WIDGET (view),
+                        "content-spacing", &content_spacing,
+                        NULL);
+
+
+  /* cursor information */
+
+  view->priv->coord_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                        content_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (view->priv->coord_hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (view), view->priv->coord_hbox,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (view->priv->coord_hbox);
+
+  view->priv->selection_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                            content_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (view->priv->selection_hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (view), view->priv->selection_hbox,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (view->priv->selection_hbox);
+
+
+  /* Pixels */
+
+  frame = gimp_frame_new (_("Pixels"));
+  gtk_box_pack_start (GTK_BOX (view->priv->coord_hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  view->priv->pixel_x_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->pixel_x_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("X"), 0.5, 0.5,
+                             view->priv->pixel_x_label, 1, FALSE);
+
+  view->priv->pixel_y_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->pixel_y_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             _("Y"), 0.5, 0.5,
+                             view->priv->pixel_y_label, 1, FALSE);
+
+
+  /* Units */
+
+  frame = gimp_frame_new (_("Units"));
+  gtk_box_pack_start (GTK_BOX (view->priv->coord_hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  view->priv->unit_x_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->unit_x_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("X"), 0.5, 0.5,
+                             view->priv->unit_x_label, 1, FALSE);
+
+  view->priv->unit_y_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->unit_y_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             _("Y"), 0.5, 0.5,
+                             view->priv->unit_y_label, 1, FALSE);
+
+
+  /* Selection Bounding Box */
+
+  frame = gimp_frame_new (_("Selection"));
+  gtk_box_pack_start (GTK_BOX (view->priv->selection_hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  gimp_help_set_help_data (frame, _("The selection's bounding box"), NULL);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  view->priv->selection_x_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->selection_x_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("X"), 0.5, 0.5,
+                             view->priv->selection_x_label, 1, FALSE);
+
+  view->priv->selection_y_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->selection_y_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             _("Y"), 0.5, 0.5,
+                             view->priv->selection_y_label, 1, FALSE);
+
+  frame = gimp_frame_new ("");
+  gtk_box_pack_start (GTK_BOX (view->priv->selection_hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  view->priv->selection_width_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->selection_width_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             /* Width */
+                             _("W"), 0.5, 0.5,
+                             view->priv->selection_width_label, 1, FALSE);
+
+  view->priv->selection_height_label = gtk_label_new (_("n/a"));
+  gtk_label_set_xalign (GTK_LABEL (view->priv->selection_height_label), 1.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             /* Height */
+                             _("H"), 0.5, 0.5,
+                             view->priv->selection_height_label, 1, FALSE);
+
+
+  /* color information */
+
+  view->priv->color_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                        content_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (view->priv->color_hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (view), view->priv->color_hbox, FALSE, FALSE, 0);
+  gtk_widget_show (view->priv->color_hbox);
+
+  view->priv->color_frame_1 = gimp_color_frame_new ();
+  gimp_color_frame_set_mode (GIMP_COLOR_FRAME (view->priv->color_frame_1),
+                             GIMP_COLOR_PICK_MODE_PIXEL);
+  gimp_color_frame_set_ellipsize (GIMP_COLOR_FRAME (view->priv->color_frame_1),
+                                  PANGO_ELLIPSIZE_END);
+  gtk_box_pack_start (GTK_BOX (view->priv->color_hbox), view->priv->color_frame_1,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (view->priv->color_frame_1);
+
+  view->priv->color_frame_2 = gimp_color_frame_new ();
+  gimp_color_frame_set_mode (GIMP_COLOR_FRAME (view->priv->color_frame_2),
+                             GIMP_COLOR_PICK_MODE_RGB_PERCENT);
+  gtk_box_pack_start (GTK_BOX (view->priv->color_hbox), view->priv->color_frame_2,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (view->priv->color_frame_2);
+
+  /* sample merged toggle */
+
+  toggle = gimp_prop_check_button_new (G_OBJECT (view), "sample-merged",
+                                       _("_Sample Merged"));
+  gtk_box_pack_start (GTK_BOX (view), toggle, FALSE, FALSE, 0);
+  gtk_widget_show (toggle);
+}
+
+static void
+gimp_cursor_view_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_aux_info = gimp_cursor_view_set_aux_info;
+  iface->get_aux_info = gimp_cursor_view_get_aux_info;
+  iface->set_context  = gimp_cursor_view_set_context;
+}
+
+static void
+gimp_cursor_view_dispose (GObject *object)
+{
+  GimpCursorView *view = GIMP_CURSOR_VIEW (object);
+
+  if (view->priv->context)
+    gimp_docked_set_context (GIMP_DOCKED (view), NULL);
+
+  if (view->priv->cursor_idle_id)
+    {
+      g_source_remove (view->priv->cursor_idle_id);
+      view->priv->cursor_idle_id = 0;
+    }
+
+  g_clear_object (&view->priv->cursor_image);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_cursor_view_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpCursorView *view = GIMP_CURSOR_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_MERGED:
+      view->priv->sample_merged = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_cursor_view_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpCursorView *view = GIMP_CURSOR_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, view->priv->sample_merged);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+#define AUX_INFO_FRAME_1_MODE "frame-1-mode"
+#define AUX_INFO_FRAME_2_MODE "frame-2-mode"
+
+static void
+gimp_cursor_view_set_aux_info (GimpDocked *docked,
+                               GList      *aux_info)
+{
+  GimpCursorView *view = GIMP_CURSOR_VIEW (docked);
+  GList          *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux   = list->data;
+      GtkWidget          *frame = NULL;
+
+      if (! strcmp (aux->name, AUX_INFO_FRAME_1_MODE))
+        frame = view->priv->color_frame_1;
+      else if (! strcmp (aux->name, AUX_INFO_FRAME_2_MODE))
+        frame = view->priv->color_frame_2;
+
+      if (frame)
+        {
+          GEnumClass *enum_class;
+          GEnumValue *enum_value;
+
+          enum_class = g_type_class_peek (GIMP_TYPE_COLOR_PICK_MODE);
+          enum_value = g_enum_get_value_by_nick (enum_class, aux->value);
+
+          if (enum_value)
+            gimp_color_frame_set_mode (GIMP_COLOR_FRAME (frame),
+                                       enum_value->value);
+        }
+    }
+}
+
+static GList *
+gimp_cursor_view_get_aux_info (GimpDocked *docked)
+{
+  GimpCursorView     *view = GIMP_CURSOR_VIEW (docked);
+  GList              *aux_info;
+  const gchar        *nick;
+  GimpSessionInfoAux *aux;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  if (gimp_enum_get_value (GIMP_TYPE_COLOR_PICK_MODE,
+                           GIMP_COLOR_FRAME (view->priv->color_frame_1)->pick_mode,
+                           NULL, &nick, NULL, NULL))
+    {
+      aux = gimp_session_info_aux_new (AUX_INFO_FRAME_1_MODE, nick);
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  if (gimp_enum_get_value (GIMP_TYPE_COLOR_PICK_MODE,
+                           GIMP_COLOR_FRAME (view->priv->color_frame_2)->pick_mode,
+                           NULL, &nick, NULL, NULL))
+    {
+      aux = gimp_session_info_aux_new (AUX_INFO_FRAME_2_MODE, nick);
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
+
+static void
+gimp_cursor_view_format_as_unit (GimpUnit  unit,
+                                 gchar    *output_buf,
+                                 gint      output_buf_size,
+                                 gdouble   pixel_value,
+                                 gdouble   image_res)
+{
+  gchar         format_buf[32];
+  gdouble       value;
+  gint          unit_digits = 0;
+  const gchar  *unit_str = "";
+
+  value = gimp_pixels_to_units (pixel_value, unit, image_res);
+
+  if (unit != GIMP_UNIT_PIXEL)
+    {
+      unit_digits = gimp_unit_get_scaled_digits (unit, image_res);
+      unit_str    = gimp_unit_get_abbreviation (unit);
+    }
+
+  g_snprintf (format_buf, sizeof (format_buf),
+              "%%.%df %s", unit_digits, unit_str);
+
+  g_snprintf (output_buf, output_buf_size, format_buf, value);
+}
+
+static void
+gimp_cursor_view_set_label_italic (GtkWidget *label,
+                                   gboolean   italic)
+{
+  PangoStyle attribute = italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL;
+
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_STYLE, attribute,
+                             -1);
+}
+
+static void
+gimp_cursor_view_style_set (GtkWidget *widget,
+                            GtkStyle  *prev_style)
+{
+  GimpCursorView *view = GIMP_CURSOR_VIEW (widget);
+  gint            content_spacing;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (GTK_WIDGET (view),
+                        "content-spacing", &content_spacing,
+                        NULL);
+
+  gtk_box_set_spacing (GTK_BOX (view->priv->coord_hbox),     content_spacing);
+  gtk_box_set_spacing (GTK_BOX (view->priv->selection_hbox), content_spacing);
+  gtk_box_set_spacing (GTK_BOX (view->priv->color_hbox),     content_spacing);
+}
+
+static void
+gimp_cursor_view_set_context (GimpDocked  *docked,
+                              GimpContext *context)
+{
+  GimpCursorView  *view    = GIMP_CURSOR_VIEW (docked);
+  GimpColorConfig *config  = NULL;
+  GimpDisplay     *display = NULL;
+  GimpImage       *image   = NULL;
+
+  if (context == view->priv->context)
+    return;
+
+  if (view->priv->context)
+    {
+      g_signal_handlers_disconnect_by_func (view->priv->context,
+                                            gimp_cursor_view_diplay_changed,
+                                            view);
+      g_signal_handlers_disconnect_by_func (view->priv->context,
+                                            gimp_cursor_view_image_changed,
+                                            view);
+
+      g_object_unref (view->priv->context);
+    }
+
+  view->priv->context = context;
+
+  if (view->priv->context)
+    {
+      g_object_ref (view->priv->context);
+
+      g_signal_connect_swapped (view->priv->context, "display-changed",
+                                G_CALLBACK (gimp_cursor_view_diplay_changed),
+                                view);
+
+      g_signal_connect_swapped (view->priv->context, "image-changed",
+                                G_CALLBACK (gimp_cursor_view_image_changed),
+                                view);
+
+      config  = context->gimp->config->color_management;
+      display = gimp_context_get_display (context);
+      image   = gimp_context_get_image (context);
+    }
+
+  gimp_color_frame_set_color_config (GIMP_COLOR_FRAME (view->priv->color_frame_1),
+                                     config);
+  gimp_color_frame_set_color_config (GIMP_COLOR_FRAME (view->priv->color_frame_2),
+                                     config);
+
+  gimp_cursor_view_diplay_changed (view, display, view->priv->context);
+  gimp_cursor_view_image_changed (view, image, view->priv->context);
+}
+
+static void
+gimp_cursor_view_image_changed (GimpCursorView *view,
+                                GimpImage      *image,
+                                GimpContext    *context)
+{
+  g_return_if_fail (GIMP_IS_CURSOR_VIEW (view));
+
+  if (image == view->priv->image)
+    return;
+
+  if (view->priv->image)
+    {
+      g_signal_handlers_disconnect_by_func (view->priv->image,
+                                            gimp_cursor_view_mask_changed,
+                                            view);
+    }
+
+  view->priv->image = image;
+
+  if (view->priv->image)
+    {
+      g_signal_connect_swapped (view->priv->image, "mask-changed",
+                                G_CALLBACK (gimp_cursor_view_mask_changed),
+                                view);
+    }
+
+  gimp_cursor_view_mask_changed (view, view->priv->image);
+}
+
+static void
+gimp_cursor_view_mask_changed (GimpCursorView *view,
+                               GimpImage      *image)
+{
+  gimp_cursor_view_update_selection_info (view,
+                                          view->priv->image,
+                                          view->priv->unit);
+}
+
+static void
+gimp_cursor_view_diplay_changed (GimpCursorView *view,
+                                 GimpDisplay    *display,
+                                 GimpContext    *context)
+{
+  GimpDisplayShell *shell = NULL;
+
+  if (display)
+    shell = gimp_display_get_shell (display);
+
+  if (view->priv->shell)
+    {
+      g_signal_handlers_disconnect_by_func (view->priv->shell,
+                                            gimp_cursor_view_shell_unit_changed,
+                                            view);
+    }
+
+  view->priv->shell = shell;
+
+  if (view->priv->shell)
+    {
+      g_signal_connect_swapped (view->priv->shell, "notify::unit",
+                                G_CALLBACK (gimp_cursor_view_shell_unit_changed),
+                                view);
+    }
+
+  gimp_cursor_view_shell_unit_changed (view,
+                                       NULL,
+                                       view->priv->shell);
+}
+
+static void
+gimp_cursor_view_shell_unit_changed (GimpCursorView   *view,
+                                     GParamSpec       *pspec,
+                                     GimpDisplayShell *shell)
+{
+  GimpUnit new_unit = GIMP_UNIT_PIXEL;
+
+  if (shell)
+    {
+      new_unit = gimp_display_shell_get_unit (shell);
+    }
+
+  if (view->priv->unit != new_unit)
+    {
+      gimp_cursor_view_update_selection_info (view, view->priv->image, new_unit);
+      view->priv->unit = new_unit;
+    }
+}
+
+static void
+gimp_cursor_view_update_selection_info (GimpCursorView *view,
+                                        GimpImage      *image,
+                                        GimpUnit        unit)
+{
+  gint x, y, width, height;
+
+  if (image &&
+      gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                        &x, &y, &width, &height))
+    {
+      gdouble xres, yres;
+      gchar   buf[32];
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      gimp_cursor_view_format_as_unit (unit, buf, sizeof (buf), x, xres);
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_x_label), buf);
+
+      gimp_cursor_view_format_as_unit (unit, buf, sizeof (buf), y, yres);
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_y_label), buf);
+
+      gimp_cursor_view_format_as_unit (unit, buf, sizeof (buf), width, xres);
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_width_label), buf);
+
+      gimp_cursor_view_format_as_unit (unit, buf, sizeof (buf), height, yres);
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_height_label), buf);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_x_label),
+                          _("n/a"));
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_y_label),
+                          _("n/a"));
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_width_label),
+                          _("n/a"));
+      gtk_label_set_text (GTK_LABEL (view->priv->selection_height_label),
+                          _("n/a"));
+    }
+}
+
+static gboolean
+gimp_cursor_view_cursor_idle (GimpCursorView *view)
+{
+
+  if (view->priv->cursor_image)
+    {
+      GimpImage  *image = view->priv->cursor_image;
+      GimpUnit    unit  = view->priv->cursor_unit;
+      gdouble     x     = view->priv->cursor_x;
+      gdouble     y     = view->priv->cursor_y;
+      gboolean    in_image;
+      gchar       buf[32];
+      const Babl *sample_format;
+      gdouble     pixel[4];
+      GimpRGB     color;
+      gdouble     xres;
+      gdouble     yres;
+      gint        int_x;
+      gint        int_y;
+
+      if (unit == GIMP_UNIT_PIXEL)
+        unit = gimp_image_get_unit (image);
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      in_image = (x >= 0.0 && x < gimp_image_get_width  (image) &&
+                  y >= 0.0 && y < gimp_image_get_height (image));
+
+      g_snprintf (buf, sizeof (buf), "%d", (gint) floor (x));
+      gtk_label_set_text (GTK_LABEL (view->priv->pixel_x_label), buf);
+      gimp_cursor_view_set_label_italic (view->priv->pixel_x_label, ! in_image);
+
+      g_snprintf (buf, sizeof (buf), "%d", (gint) floor (y));
+      gtk_label_set_text (GTK_LABEL (view->priv->pixel_y_label), buf);
+      gimp_cursor_view_set_label_italic (view->priv->pixel_y_label, ! in_image);
+
+      gimp_cursor_view_format_as_unit (unit, buf, sizeof (buf), x, xres);
+      gtk_label_set_text (GTK_LABEL (view->priv->unit_x_label), buf);
+      gimp_cursor_view_set_label_italic (view->priv->unit_x_label, ! in_image);
+
+      gimp_cursor_view_format_as_unit (unit, buf, sizeof (buf), y, yres);
+      gtk_label_set_text (GTK_LABEL (view->priv->unit_y_label), buf);
+      gimp_cursor_view_set_label_italic (view->priv->unit_y_label, ! in_image);
+
+      int_x = (gint) floor (x);
+      int_y = (gint) floor (y);
+
+      if (gimp_image_pick_color (image, NULL,
+                                 int_x, int_y,
+                                 view->priv->shell->show_all,
+                                 view->priv->sample_merged,
+                                 FALSE, 0.0,
+                                 &sample_format, pixel, &color))
+        {
+          gimp_color_frame_set_color (GIMP_COLOR_FRAME (view->priv->color_frame_1),
+                                      FALSE, sample_format, pixel, &color,
+                                      int_x, int_y);
+          gimp_color_frame_set_color (GIMP_COLOR_FRAME (view->priv->color_frame_2),
+                                      FALSE, sample_format, pixel, &color,
+                                      int_x, int_y);
+        }
+      else
+        {
+          gimp_color_frame_set_invalid (GIMP_COLOR_FRAME (view->priv->color_frame_1));
+          gimp_color_frame_set_invalid (GIMP_COLOR_FRAME (view->priv->color_frame_2));
+        }
+
+      /* Show the selection info from the image under the cursor if any */
+      gimp_cursor_view_update_selection_info (view,
+                                              image,
+                                              view->priv->cursor_unit);
+
+      g_clear_object (&view->priv->cursor_image);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (view->priv->pixel_x_label), _("n/a"));
+      gtk_label_set_text (GTK_LABEL (view->priv->pixel_y_label), _("n/a"));
+      gtk_label_set_text (GTK_LABEL (view->priv->unit_x_label),  _("n/a"));
+      gtk_label_set_text (GTK_LABEL (view->priv->unit_y_label),  _("n/a"));
+
+      gimp_color_frame_set_invalid (GIMP_COLOR_FRAME (view->priv->color_frame_1));
+      gimp_color_frame_set_invalid (GIMP_COLOR_FRAME (view->priv->color_frame_2));
+
+      /* Start showing selection info from the active image again */
+      gimp_cursor_view_update_selection_info (view,
+                                              view->priv->image,
+                                              view->priv->unit);
+    }
+
+  view->priv->cursor_idle_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_cursor_view_new (GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_CURSOR_VIEW,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<CursorInfo>",
+                       "ui-path",         "/cursor-info-popup",
+                       NULL);
+}
+
+void
+gimp_cursor_view_set_sample_merged (GimpCursorView *view,
+                                    gboolean        sample_merged)
+{
+  g_return_if_fail (GIMP_IS_CURSOR_VIEW (view));
+
+  sample_merged = sample_merged ? TRUE : FALSE;
+
+  if (view->priv->sample_merged != sample_merged)
+    {
+      view->priv->sample_merged = sample_merged;
+
+      g_object_notify (G_OBJECT (view), "sample-merged");
+    }
+}
+
+gboolean
+gimp_cursor_view_get_sample_merged (GimpCursorView *view)
+{
+  g_return_val_if_fail (GIMP_IS_CURSOR_VIEW (view), FALSE);
+
+  return view->priv->sample_merged;
+}
+
+void
+gimp_cursor_view_update_cursor (GimpCursorView   *view,
+                                GimpImage        *image,
+                                GimpUnit          shell_unit,
+                                gdouble           x,
+                                gdouble           y)
+{
+  g_return_if_fail (GIMP_IS_CURSOR_VIEW (view));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_clear_object (&view->priv->cursor_image);
+
+  view->priv->cursor_image = g_object_ref (image);
+  view->priv->cursor_unit  = shell_unit;
+  view->priv->cursor_x     = x;
+  view->priv->cursor_y     = y;
+
+  if (view->priv->cursor_idle_id == 0)
+    {
+      view->priv->cursor_idle_id =
+        g_idle_add ((GSourceFunc) gimp_cursor_view_cursor_idle, view);
+    }
+}
+
+void
+gimp_cursor_view_clear_cursor (GimpCursorView *view)
+{
+  g_return_if_fail (GIMP_IS_CURSOR_VIEW (view));
+
+  g_clear_object (&view->priv->cursor_image);
+
+  if (view->priv->cursor_idle_id == 0)
+    {
+      view->priv->cursor_idle_id =
+        g_idle_add ((GSourceFunc) gimp_cursor_view_cursor_idle, view);
+    }
+}
diff --git a/app/display/gimpcursorview.h b/app/display/gimpcursorview.h
new file mode 100644
index 0000000..f538041
--- /dev/null
+++ b/app/display/gimpcursorview.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcursorview.h
+ * Copyright (C) 2005-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURSOR_VIEW_H__
+#define __GIMP_CURSOR_VIEW_H__
+
+
+#include "widgets/gimpeditor.h"
+
+
+#define GIMP_TYPE_CURSOR_VIEW            (gimp_cursor_view_get_type ())
+#define GIMP_CURSOR_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CURSOR_VIEW, GimpCursorView))
+#define GIMP_CURSOR_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CURSOR_VIEW, GimpCursorViewClass))
+#define GIMP_IS_CURSOR_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CURSOR_VIEW))
+#define GIMP_IS_CURSOR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CURSOR_VIEW))
+#define GIMP_CURSOR_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CURSOR_VIEW, GimpCursorViewClass))
+
+
+typedef struct _GimpCursorViewClass   GimpCursorViewClass;
+typedef struct _GimpCursorViewPrivate GimpCursorViewPrivate;
+
+struct _GimpCursorView
+{
+  GimpEditor             parent_instance;
+
+  GimpCursorViewPrivate *priv;
+};
+
+struct _GimpCursorViewClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType       gimp_cursor_view_get_type          (void) G_GNUC_CONST;
+
+GtkWidget * gimp_cursor_view_new               (GimpMenuFactory *menu_factory);
+
+void        gimp_cursor_view_set_sample_merged (GimpCursorView  *view,
+                                                gboolean         sample_merged);
+gboolean    gimp_cursor_view_get_sample_merged (GimpCursorView  *view);
+
+void        gimp_cursor_view_update_cursor     (GimpCursorView  *view,
+                                                GimpImage       *image,
+                                                GimpUnit         shell_unit,
+                                                gdouble          x,
+                                                gdouble          y);
+void        gimp_cursor_view_clear_cursor      (GimpCursorView  *view);
+
+
+#endif /* __GIMP_CURSOR_VIEW_H__ */
diff --git a/app/display/gimpdisplay-foreach.c b/app/display/gimpdisplay-foreach.c
new file mode 100644
index 0000000..440113e
--- /dev/null
+++ b/app/display/gimpdisplay-foreach.c
@@ -0,0 +1,308 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplay-foreach.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-cursor.h"
+
+
+gboolean
+gimp_displays_dirty (Gimp *gimp)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  for (list = gimp_get_display_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+      GimpImage   *image   = gimp_display_get_image (display);
+
+      if (image && gimp_image_is_dirty (image))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_displays_image_dirty_callback (GimpImage     *image,
+                                    GimpDirtyMask  dirty_mask,
+                                    GimpContainer *container)
+{
+  if (gimp_image_is_dirty (image)              &&
+      gimp_image_get_display_count (image) > 0 &&
+      ! gimp_container_have (container, GIMP_OBJECT (image)))
+    gimp_container_add (container, GIMP_OBJECT (image));
+}
+
+static void
+gimp_displays_dirty_images_disconnect (GimpContainer *dirty_container,
+                                       GimpContainer *global_container)
+{
+  GQuark handler;
+
+  handler = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dirty_container),
+                                                "clean-handler"));
+  gimp_container_remove_handler (global_container, handler);
+
+  handler = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dirty_container),
+                                                "dirty-handler"));
+  gimp_container_remove_handler (global_container, handler);
+}
+
+static void
+gimp_displays_image_clean_callback (GimpImage     *image,
+                                    GimpDirtyMask  dirty_mask,
+                                    GimpContainer *container)
+{
+  if (! gimp_image_is_dirty (image))
+    gimp_container_remove (container, GIMP_OBJECT (image));
+}
+
+GimpContainer *
+gimp_displays_get_dirty_images (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (gimp_displays_dirty (gimp))
+    {
+      GimpContainer *container = gimp_list_new_weak (GIMP_TYPE_IMAGE, FALSE);
+      GList         *list;
+      GQuark         handler;
+
+      handler =
+        gimp_container_add_handler (gimp->images, "clean",
+                                    G_CALLBACK (gimp_displays_image_dirty_callback),
+                                    container);
+      g_object_set_data (G_OBJECT (container), "clean-handler",
+                         GINT_TO_POINTER (handler));
+
+      handler =
+        gimp_container_add_handler (gimp->images, "dirty",
+                                    G_CALLBACK (gimp_displays_image_dirty_callback),
+                                    container);
+      g_object_set_data (G_OBJECT (container), "dirty-handler",
+                         GINT_TO_POINTER (handler));
+
+      g_signal_connect_object (container, "disconnect",
+                               G_CALLBACK (gimp_displays_dirty_images_disconnect),
+                               G_OBJECT (gimp->images), 0);
+
+      gimp_container_add_handler (container, "clean",
+                                  G_CALLBACK (gimp_displays_image_clean_callback),
+                                  container);
+      gimp_container_add_handler (container, "dirty",
+                                  G_CALLBACK (gimp_displays_image_clean_callback),
+                                  container);
+
+      for (list = gimp_get_image_iter (gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpImage *image = list->data;
+
+          if (gimp_image_is_dirty (image) &&
+              gimp_image_get_display_count (image) > 0)
+            gimp_container_add (container, GIMP_OBJECT (image));
+        }
+
+      return container;
+    }
+
+  return NULL;
+}
+
+/**
+ * gimp_displays_delete:
+ * @gimp:
+ *
+ * Calls gimp_display_delete() an all displays in the display list.
+ * This closes all displays, including the first one which is usually
+ * kept open.
+ */
+void
+gimp_displays_delete (Gimp *gimp)
+{
+  /*  this removes the GimpDisplay from the list, so do a while loop
+   *  "around" the first element to get them all
+   */
+  while (! gimp_container_is_empty (gimp->displays))
+    {
+      GimpDisplay *display = gimp_get_display_iter (gimp)->data;
+
+      gimp_display_delete (display);
+    }
+}
+
+/**
+ * gimp_displays_close:
+ * @gimp:
+ *
+ * Calls gimp_display_close() an all displays in the display list. The
+ * first display will remain open without an image.
+ */
+void
+gimp_displays_close (Gimp *gimp)
+{
+  GList *list;
+  GList *iter;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  list = g_list_copy (gimp_get_display_iter (gimp));
+
+  for (iter = list; iter; iter = g_list_next (iter))
+    {
+      GimpDisplay *display = iter->data;
+
+      gimp_display_close (display);
+    }
+
+  g_list_free (list);
+}
+
+void
+gimp_displays_reconnect (Gimp      *gimp,
+                         GimpImage *old,
+                         GimpImage *new)
+{
+  GList *contexts = NULL;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_IMAGE (old));
+  g_return_if_fail (GIMP_IS_IMAGE (new));
+
+  /*  check which contexts refer to old_image  */
+  for (list = gimp->context_list; list; list = g_list_next (list))
+    {
+      GimpContext *context = list->data;
+
+      if (gimp_context_get_image (context) == old)
+        contexts = g_list_prepend (contexts, list->data);
+    }
+
+  /*  set the new_image on the remembered contexts (in reverse order,
+   *  since older contexts are usually the parents of newer
+   *  ones). Also, update the contexts before the displays, or we
+   *  might run into menu update functions that would see an
+   *  inconsistent state (display = new, context = old), and thus
+   *  inadvertently call actions as if the user had selected a menu
+   *  item.
+   */
+  g_list_foreach (contexts, (GFunc) gimp_context_set_image, new);
+  g_list_free (contexts);
+
+  for (list = gimp_get_display_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+
+      if (gimp_display_get_image (display) == old)
+        gimp_display_set_image (display, new);
+    }
+}
+
+gint
+gimp_displays_get_num_visible (Gimp *gimp)
+{
+  GList *list;
+  gint   visible = 0;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+
+  for (list = gimp_get_display_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay      *display = list->data;
+      GimpDisplayShell *shell   = gimp_display_get_shell (display);
+
+      if (gtk_widget_is_drawable (GTK_WIDGET (shell)))
+        {
+          GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+          if (GTK_IS_WINDOW (toplevel))
+            {
+              GdkWindow      *window = gtk_widget_get_window (toplevel);
+              GdkWindowState  state  = gdk_window_get_state (window);
+
+              if ((state & (GDK_WINDOW_STATE_WITHDRAWN |
+                            GDK_WINDOW_STATE_ICONIFIED)) == 0)
+                {
+                  visible++;
+                }
+            }
+        }
+    }
+
+  return visible;
+}
+
+void
+gimp_displays_set_busy (Gimp *gimp)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  for (list = gimp_get_display_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplayShell *shell =
+        gimp_display_get_shell (GIMP_DISPLAY (list->data));
+
+      gimp_display_shell_set_override_cursor (shell, (GimpCursorType) GDK_WATCH);
+    }
+}
+
+void
+gimp_displays_unset_busy (Gimp *gimp)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  for (list = gimp_get_display_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplayShell *shell =
+        gimp_display_get_shell (GIMP_DISPLAY (list->data));
+
+      gimp_display_shell_unset_override_cursor (shell);
+    }
+}
diff --git a/app/display/gimpdisplay-foreach.h b/app/display/gimpdisplay-foreach.h
new file mode 100644
index 0000000..09fae7c
--- /dev/null
+++ b/app/display/gimpdisplay-foreach.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_FOREACH_H__
+#define __GIMP_DISPLAY_FOREACH_H__
+
+
+gboolean        gimp_displays_dirty            (Gimp      *gimp);
+GimpContainer * gimp_displays_get_dirty_images (Gimp      *gimp);
+void            gimp_displays_delete           (Gimp      *gimp);
+void            gimp_displays_close            (Gimp      *gimp);
+void            gimp_displays_reconnect        (Gimp      *gimp,
+                                                GimpImage *old,
+                                                GimpImage *new);
+
+gint            gimp_displays_get_num_visible  (Gimp      *gimp);
+
+void            gimp_displays_set_busy         (Gimp      *gimp);
+void            gimp_displays_unset_busy       (Gimp      *gimp);
+
+
+#endif /*  __GIMP_DISPLAY_FOREACH_H__  */
diff --git a/app/display/gimpdisplay-handlers.c b/app/display/gimpdisplay-handlers.c
new file mode 100644
index 0000000..94cb863
--- /dev/null
+++ b/app/display/gimpdisplay-handlers.c
@@ -0,0 +1,128 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplay-handlers.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_update_handler         (GimpProjection *projection,
+                                                   gboolean        now,
+                                                   gint            x,
+                                                   gint            y,
+                                                   gint            w,
+                                                   gint            h,
+                                                   GimpDisplay    *display);
+
+static void   gimp_display_bounds_changed_handler (GimpImage      *image,
+                                                   gint            old_x,
+                                                   gint            old_y,
+                                                   GimpDisplay    *display);
+static void   gimp_display_flush_handler          (GimpImage      *image,
+                                                   gboolean        invalidate_preview,
+                                                   GimpDisplay    *display);
+
+
+/*  public functions  */
+
+void
+gimp_display_connect (GimpDisplay *display)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  image = gimp_display_get_image (display);
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_connect (gimp_image_get_projection (image), "update",
+                    G_CALLBACK (gimp_display_update_handler),
+                    display);
+
+  g_signal_connect (image, "bounds-changed",
+                    G_CALLBACK (gimp_display_bounds_changed_handler),
+                    display);
+  g_signal_connect (image, "flush",
+                    G_CALLBACK (gimp_display_flush_handler),
+                    display);
+}
+
+void
+gimp_display_disconnect (GimpDisplay *display)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  image = gimp_display_get_image (display);
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_flush_handler,
+                                        display);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_bounds_changed_handler,
+                                        display);
+
+  g_signal_handlers_disconnect_by_func (gimp_image_get_projection (image),
+                                        gimp_display_update_handler,
+                                        display);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_update_handler (GimpProjection *projection,
+                             gboolean        now,
+                             gint            x,
+                             gint            y,
+                             gint            w,
+                             gint            h,
+                             GimpDisplay    *display)
+{
+  gimp_display_update_area (display, now, x, y, w, h);
+}
+
+static void
+gimp_display_bounds_changed_handler (GimpImage   *image,
+                                     gint         old_x,
+                                     gint         old_y,
+                                     GimpDisplay *display)
+{
+  gimp_display_update_bounding_box (display);
+}
+
+static void
+gimp_display_flush_handler (GimpImage   *image,
+                            gboolean     invalidate_preview,
+                            GimpDisplay *display)
+{
+  gimp_display_flush (display);
+}
diff --git a/app/display/gimpdisplay-handlers.h b/app/display/gimpdisplay-handlers.h
new file mode 100644
index 0000000..34c547c
--- /dev/null
+++ b/app/display/gimpdisplay-handlers.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_HANDLERS_H__
+#define __GIMP_DISPLAY_HANDLERS_H__
+
+
+void   gimp_display_connect    (GimpDisplay *display);
+void   gimp_display_disconnect (GimpDisplay *display);
+
+
+#endif /*  __GIMP_DISPLAY_HANDLERS_H__  */
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
new file mode 100644
index 0000000..bf8a238
--- /dev/null
+++ b/app/display/gimpdisplay.c
@@ -0,0 +1,985 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+#include "tools/tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+
+#include "widgets/gimpdialogfactory.h"
+
+#include "tools/gimptool.h"
+#include "tools/tool_manager.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplay-handlers.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-handlers.h"
+#include "gimpdisplayshell-icon.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-scrollbars.h"
+#include "gimpdisplayshell-title.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpimagewindow.h"
+
+#include "gimp-intl.h"
+
+
+#define FLUSH_NOW_INTERVAL      (G_TIME_SPAN_SECOND / 60)
+
+#define PAINT_AREA_CHUNK_WIDTH  32
+#define PAINT_AREA_CHUNK_HEIGHT 32
+
+
+enum
+{
+  PROP_0,
+  PROP_ID,
+  PROP_GIMP,
+  PROP_IMAGE,
+  PROP_SHELL
+};
+
+
+typedef struct _GimpDisplayPrivate GimpDisplayPrivate;
+
+struct _GimpDisplayPrivate
+{
+  gint            ID;           /*  unique identifier for this display  */
+
+  GimpImage      *image;        /*  pointer to the associated image     */
+  gint            instance;     /*  the instance # of this display as
+                                 *  taken from the image at creation    */
+
+  GeglRectangle   bounding_box;
+
+  GtkWidget      *shell;
+  cairo_region_t *update_region;
+
+  guint64         last_flush_now;
+};
+
+#define GIMP_DISPLAY_GET_PRIVATE(display) \
+        ((GimpDisplayPrivate *) gimp_display_get_instance_private ((GimpDisplay *) (display)))
+
+
+/*  local function prototypes  */
+
+static void     gimp_display_progress_iface_init  (GimpProgressInterface *iface);
+
+static void     gimp_display_set_property           (GObject             *object,
+                                                     guint                property_id,
+                                                     const GValue        *value,
+                                                     GParamSpec          *pspec);
+static void     gimp_display_get_property           (GObject             *object,
+                                                     guint                property_id,
+                                                     GValue              *value,
+                                                     GParamSpec          *pspec);
+
+static GimpProgress * gimp_display_progress_start   (GimpProgress        *progress,
+                                                     gboolean             cancellable,
+                                                     const gchar         *message);
+static void     gimp_display_progress_end           (GimpProgress        *progress);
+static gboolean gimp_display_progress_is_active     (GimpProgress        *progress);
+static void     gimp_display_progress_set_text      (GimpProgress        *progress,
+                                                     const gchar         *message);
+static void     gimp_display_progress_set_value     (GimpProgress        *progress,
+                                                     gdouble              percentage);
+static gdouble  gimp_display_progress_get_value     (GimpProgress        *progress);
+static void     gimp_display_progress_pulse         (GimpProgress        *progress);
+static guint32  gimp_display_progress_get_window_id (GimpProgress        *progress);
+static gboolean gimp_display_progress_message       (GimpProgress        *progress,
+                                                     Gimp                *gimp,
+                                                     GimpMessageSeverity  severity,
+                                                     const gchar         *domain,
+                                                     const gchar         *message);
+static void     gimp_display_progress_canceled      (GimpProgress        *progress,
+                                                     GimpDisplay         *display);
+
+static void     gimp_display_flush_whenever         (GimpDisplay         *display,
+                                                     gboolean             now);
+static void     gimp_display_paint_area             (GimpDisplay         *display,
+                                                     gint                 x,
+                                                     gint                 y,
+                                                     gint                 w,
+                                                     gint                 h);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDisplay, gimp_display, GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpDisplay)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_display_progress_iface_init))
+
+#define parent_class gimp_display_parent_class
+
+
+static void
+gimp_display_class_init (GimpDisplayClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_display_set_property;
+  object_class->get_property = gimp_display_get_property;
+
+  g_object_class_install_property (object_class, PROP_ID,
+                                   g_param_spec_int ("id",
+                                                     NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_SHELL,
+                                   g_param_spec_object ("shell",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DISPLAY_SHELL,
+                                                        GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_display_init (GimpDisplay *display)
+{
+}
+
+static void
+gimp_display_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start         = gimp_display_progress_start;
+  iface->end           = gimp_display_progress_end;
+  iface->is_active     = gimp_display_progress_is_active;
+  iface->set_text      = gimp_display_progress_set_text;
+  iface->set_value     = gimp_display_progress_set_value;
+  iface->get_value     = gimp_display_progress_get_value;
+  iface->pulse         = gimp_display_progress_pulse;
+  iface->get_window_id = gimp_display_progress_get_window_id;
+  iface->message       = gimp_display_progress_message;
+}
+
+static void
+gimp_display_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (object);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      {
+        gint ID;
+
+        display->gimp = g_value_get_object (value); /* don't ref the gimp */
+        display->config = GIMP_DISPLAY_CONFIG (display->gimp->config);
+
+        do
+          {
+            ID = display->gimp->next_display_ID++;
+
+            if (display->gimp->next_display_ID == G_MAXINT)
+              display->gimp->next_display_ID = 1;
+          }
+        while (gimp_display_get_by_ID (display->gimp, ID));
+
+        private->ID = ID;
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_display_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (object);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  switch (property_id)
+    {
+    case PROP_ID:
+      g_value_set_int (value, private->ID);
+      break;
+
+    case PROP_GIMP:
+      g_value_set_object (value, display->gimp);
+      break;
+
+    case PROP_IMAGE:
+      g_value_set_object (value, private->image);
+      break;
+
+    case PROP_SHELL:
+      g_value_set_object (value, private->shell);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpProgress *
+gimp_display_progress_start (GimpProgress *progress,
+                             gboolean      cancellable,
+                             const gchar  *message)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    return gimp_progress_start (GIMP_PROGRESS (private->shell), cancellable,
+                                "%s", message);
+
+  return NULL;
+}
+
+static void
+gimp_display_progress_end (GimpProgress *progress)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    gimp_progress_end (GIMP_PROGRESS (private->shell));
+}
+
+static gboolean
+gimp_display_progress_is_active (GimpProgress *progress)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    return gimp_progress_is_active (GIMP_PROGRESS (private->shell));
+
+  return FALSE;
+}
+
+static void
+gimp_display_progress_set_text (GimpProgress *progress,
+                                const gchar  *message)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    gimp_progress_set_text_literal (GIMP_PROGRESS (private->shell), message);
+}
+
+static void
+gimp_display_progress_set_value (GimpProgress *progress,
+                                 gdouble       percentage)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    gimp_progress_set_value (GIMP_PROGRESS (private->shell), percentage);
+}
+
+static gdouble
+gimp_display_progress_get_value (GimpProgress *progress)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    return gimp_progress_get_value (GIMP_PROGRESS (private->shell));
+
+  return 0.0;
+}
+
+static void
+gimp_display_progress_pulse (GimpProgress *progress)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    gimp_progress_pulse (GIMP_PROGRESS (private->shell));
+}
+
+static guint32
+gimp_display_progress_get_window_id (GimpProgress *progress)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    return gimp_progress_get_window_id (GIMP_PROGRESS (private->shell));
+
+  return 0;
+}
+
+static gboolean
+gimp_display_progress_message (GimpProgress        *progress,
+                               Gimp                *gimp,
+                               GimpMessageSeverity  severity,
+                               const gchar         *domain,
+                               const gchar         *message)
+{
+  GimpDisplay        *display = GIMP_DISPLAY (progress);
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->shell)
+    return gimp_progress_message (GIMP_PROGRESS (private->shell), gimp,
+                                  severity, domain, message);
+
+  return FALSE;
+}
+
+static void
+gimp_display_progress_canceled (GimpProgress *progress,
+                                GimpDisplay  *display)
+{
+  gimp_progress_cancel (GIMP_PROGRESS (display));
+}
+
+
+/*  public functions  */
+
+GimpDisplay *
+gimp_display_new (Gimp              *gimp,
+                  GimpImage         *image,
+                  GimpUnit           unit,
+                  gdouble            scale,
+                  GimpUIManager     *popup_manager,
+                  GimpDialogFactory *dialog_factory,
+                  GdkScreen         *screen,
+                  gint               monitor)
+{
+  GimpDisplay        *display;
+  GimpDisplayPrivate *private;
+  GimpImageWindow    *window = NULL;
+  GimpDisplayShell   *shell;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  /*  If there isn't an interface, never create a display  */
+  if (gimp->no_interface)
+    return NULL;
+
+  display = g_object_new (GIMP_TYPE_DISPLAY,
+                          "gimp", gimp,
+                          NULL);
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  /*  refs the image  */
+  if (image)
+    gimp_display_set_image (display, image);
+
+  /*  get an image window  */
+  if (GIMP_GUI_CONFIG (display->config)->single_window_mode)
+    {
+      GimpDisplay *active_display;
+
+      active_display = gimp_context_get_display (gimp_get_user_context (gimp));
+
+      if (! active_display)
+        {
+          active_display =
+            GIMP_DISPLAY (gimp_container_get_first_child (gimp->displays));
+        }
+
+      if (active_display)
+        {
+          GimpDisplayShell *shell = gimp_display_get_shell (active_display);
+
+          window = gimp_display_shell_get_window (shell);
+        }
+    }
+
+  if (! window)
+    {
+      window = gimp_image_window_new (gimp,
+                                      private->image,
+                                      dialog_factory,
+                                      screen,
+                                      monitor);
+    }
+
+  /*  create the shell for the image  */
+  private->shell = gimp_display_shell_new (display, unit, scale,
+                                           popup_manager,
+                                           screen,
+                                           monitor);
+
+  shell = gimp_display_get_shell (display);
+
+  gimp_display_update_bounding_box (display);
+
+  gimp_image_window_add_shell (window, shell);
+  gimp_display_shell_present (shell);
+
+  /* make sure the docks are visible, in case all other image windows
+   * are iconified, see bug #686544.
+   */
+  gimp_dialog_factory_show_with_display (dialog_factory);
+
+  g_signal_connect (gimp_display_shell_get_statusbar (shell), "cancel",
+                    G_CALLBACK (gimp_display_progress_canceled),
+                    display);
+
+  /* add the display to the list */
+  gimp_container_add (gimp->displays, GIMP_OBJECT (display));
+
+  return display;
+}
+
+/**
+ * gimp_display_delete:
+ * @display:
+ *
+ * Closes the display and removes it from the display list. You should
+ * not call this function directly, use gimp_display_close() instead.
+ */
+void
+gimp_display_delete (GimpDisplay *display)
+{
+  GimpDisplayPrivate *private;
+  GimpTool           *active_tool;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  /* remove the display from the list */
+  gimp_container_remove (display->gimp->displays, GIMP_OBJECT (display));
+
+  /*  unrefs the image  */
+  gimp_display_set_image (display, NULL);
+
+  active_tool = tool_manager_get_active (display->gimp);
+
+  if (active_tool && active_tool->focus_display == display)
+    tool_manager_focus_display_active (display->gimp, NULL);
+
+  if (private->shell)
+    {
+      GimpDisplayShell *shell  = gimp_display_get_shell (display);
+      GimpImageWindow  *window = gimp_display_shell_get_window (shell);
+
+      /*  set private->shell to NULL *before* destroying the shell.
+       *  all callbacks in gimpdisplayshell-callbacks.c will check
+       *  this pointer and do nothing if the shell is in destruction.
+       */
+      private->shell = NULL;
+
+      if (window)
+        {
+          if (gimp_image_window_get_n_shells (window) > 1)
+            {
+              g_object_ref (shell);
+
+              gimp_image_window_remove_shell (window, shell);
+              gtk_widget_destroy (GTK_WIDGET (shell));
+
+              g_object_unref (shell);
+            }
+          else
+            {
+              gimp_image_window_destroy (window);
+            }
+        }
+      else
+        {
+          g_object_unref (shell);
+        }
+    }
+
+  g_object_unref (display);
+}
+
+/**
+ * gimp_display_close:
+ * @display:
+ *
+ * Closes the display. If this is the last display, it will remain
+ * open, but without an image.
+ */
+void
+gimp_display_close (GimpDisplay *display)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  if (gimp_container_get_n_children (display->gimp->displays) > 1)
+    {
+      gimp_display_delete (display);
+    }
+  else
+    {
+      gimp_display_empty (display);
+    }
+}
+
+gint
+gimp_display_get_ID (GimpDisplay *display)
+{
+  GimpDisplayPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), -1);
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  return private->ID;
+}
+
+GimpDisplay *
+gimp_display_get_by_ID (Gimp *gimp,
+                        gint  ID)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  for (list = gimp_get_display_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+
+      if (gimp_display_get_ID (display) == ID)
+        return display;
+    }
+
+  return NULL;
+}
+
+/**
+ * gimp_display_get_action_name:
+ * @display:
+ *
+ * Returns: The action name for the given display. The action name
+ * depends on the display ID. The result must be freed with g_free().
+ **/
+gchar *
+gimp_display_get_action_name (GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  return g_strdup_printf ("windows-display-%04d",
+                          gimp_display_get_ID (display));
+}
+
+Gimp *
+gimp_display_get_gimp (GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  return display->gimp;
+}
+
+GimpImage *
+gimp_display_get_image (GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  return GIMP_DISPLAY_GET_PRIVATE (display)->image;
+}
+
+void
+gimp_display_set_image (GimpDisplay *display,
+                        GimpImage   *image)
+{
+  GimpDisplayPrivate *private;
+  GimpImage          *old_image = NULL;
+  GimpDisplayShell   *shell;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  shell = gimp_display_get_shell (display);
+
+  if (private->image)
+    {
+      /*  stop any active tool  */
+      tool_manager_control_active (display->gimp, GIMP_TOOL_ACTION_HALT,
+                                   display);
+
+      gimp_display_shell_disconnect (shell);
+
+      gimp_display_disconnect (display);
+
+      g_clear_pointer (&private->update_region, cairo_region_destroy);
+
+      gimp_image_dec_display_count (private->image);
+
+      /*  set private->image before unrefing because there may be code
+       *  that listens for image removals and then iterates the
+       *  display list to find a valid display.
+       */
+      old_image = private->image;
+
+#if 0
+      g_print ("%s: image->ref_count before unrefing: %d\n",
+               G_STRFUNC, G_OBJECT (old_image)->ref_count);
+#endif
+    }
+
+  private->image = image;
+
+  if (image)
+    {
+#if 0
+      g_print ("%s: image->ref_count before refing: %d\n",
+               G_STRFUNC, G_OBJECT (image)->ref_count);
+#endif
+
+      g_object_ref (image);
+
+      private->instance = gimp_image_get_instance_count (image);
+      gimp_image_inc_instance_count (image);
+
+      gimp_image_inc_display_count (image);
+
+      gimp_display_connect (display);
+
+      if (shell)
+        gimp_display_shell_connect (shell);
+    }
+
+  if (old_image)
+    g_object_unref (old_image);
+
+  gimp_display_update_bounding_box (display);
+
+  if (shell)
+    {
+      if (image)
+        {
+          gimp_display_shell_reconnect (shell);
+        }
+      else
+        {
+          gimp_display_shell_title_update (shell);
+          gimp_display_shell_icon_update (shell);
+        }
+    }
+
+  if (old_image != image)
+    g_object_notify (G_OBJECT (display), "image");
+}
+
+gint
+gimp_display_get_instance (GimpDisplay *display)
+{
+  GimpDisplayPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), 0);
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  return private->instance;
+}
+
+GimpDisplayShell *
+gimp_display_get_shell (GimpDisplay *display)
+{
+  GimpDisplayPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  return GIMP_DISPLAY_SHELL (private->shell);
+}
+
+void
+gimp_display_empty (GimpDisplay *display)
+{
+  GimpDisplayPrivate *private;
+  GList              *iter;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  g_return_if_fail (GIMP_IS_IMAGE (private->image));
+
+  for (iter = display->gimp->context_list; iter; iter = g_list_next (iter))
+    {
+      GimpContext *context = iter->data;
+
+      if (gimp_context_get_display (context) == display)
+        gimp_context_set_image (context, NULL);
+    }
+
+  gimp_display_set_image (display, NULL);
+
+  gimp_display_shell_empty (gimp_display_get_shell (display));
+}
+
+void
+gimp_display_fill (GimpDisplay *display,
+                   GimpImage   *image,
+                   GimpUnit     unit,
+                   gdouble      scale)
+{
+  GimpDisplayPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  g_return_if_fail (private->image == NULL);
+
+  gimp_display_set_image (display, image);
+
+  gimp_display_shell_fill (gimp_display_get_shell (display),
+                           image, unit, scale);
+}
+
+void
+gimp_display_update_bounding_box (GimpDisplay *display)
+{
+  GimpDisplayPrivate *private;
+  GimpDisplayShell   *shell;
+  GeglRectangle       bounding_box = {};
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+  shell   = gimp_display_get_shell (display);
+
+  if (shell)
+    {
+      bounding_box = gimp_display_shell_get_bounding_box (shell);
+
+      if (! gegl_rectangle_equal (&bounding_box, &private->bounding_box))
+        {
+          GeglRectangle diff_rects[4];
+          gint          n_diff_rects;
+          gint          i;
+
+          n_diff_rects = gegl_rectangle_subtract (diff_rects,
+                                                  &private->bounding_box,
+                                                  &bounding_box);
+
+          for (i = 0; i < n_diff_rects; i++)
+            {
+              gimp_display_paint_area (display,
+                                       diff_rects[i].x,     diff_rects[i].y,
+                                       diff_rects[i].width, diff_rects[i].height);
+            }
+
+          private->bounding_box = bounding_box;
+
+          gimp_display_shell_scroll_clamp_and_update (shell);
+          gimp_display_shell_scrollbars_update (shell);
+        }
+    }
+  else
+    {
+      private->bounding_box = bounding_box;
+    }
+}
+
+void
+gimp_display_update_area (GimpDisplay *display,
+                          gboolean     now,
+                          gint         x,
+                          gint         y,
+                          gint         w,
+                          gint         h)
+{
+  GimpDisplayPrivate *private;
+
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (now)
+    {
+      gimp_display_paint_area (display, x, y, w, h);
+    }
+  else
+    {
+      cairo_rectangle_int_t rect;
+      gint                  image_width;
+      gint                  image_height;
+
+      image_width  = gimp_image_get_width  (private->image);
+      image_height = gimp_image_get_height (private->image);
+
+      rect.x      = CLAMP (x,     0, image_width);
+      rect.y      = CLAMP (y,     0, image_height);
+      rect.width  = CLAMP (x + w, 0, image_width)  - rect.x;
+      rect.height = CLAMP (y + h, 0, image_height) - rect.y;
+
+      if (private->update_region)
+        cairo_region_union_rectangle (private->update_region, &rect);
+      else
+        private->update_region = cairo_region_create_rectangle (&rect);
+    }
+}
+
+void
+gimp_display_flush (GimpDisplay *display)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  /* FIXME: we can end up being called during shell construction if "show all"
+   * is enabled by default, in which case the shell's display pointer is still
+   * NULL
+   */
+  if (gimp_display_get_shell (display))
+    gimp_display_flush_whenever (display, FALSE);
+}
+
+void
+gimp_display_flush_now (GimpDisplay *display)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  gimp_display_flush_whenever (display, TRUE);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_flush_whenever (GimpDisplay *display,
+                             gboolean     now)
+{
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+
+  if (private->update_region)
+    {
+      gint n_rects = cairo_region_num_rectangles (private->update_region);
+      gint i;
+
+      for (i = 0; i < n_rects; i++)
+        {
+          cairo_rectangle_int_t rect;
+
+          cairo_region_get_rectangle (private->update_region,
+                                      i, &rect);
+
+          gimp_display_paint_area (display,
+                                   rect.x,
+                                   rect.y,
+                                   rect.width,
+                                   rect.height);
+        }
+
+      g_clear_pointer (&private->update_region, cairo_region_destroy);
+    }
+
+  if (now)
+    {
+      guint64 now = g_get_monotonic_time ();
+
+      if ((now - private->last_flush_now) > FLUSH_NOW_INTERVAL)
+        {
+          gimp_display_shell_flush (gimp_display_get_shell (display), TRUE);
+
+          private->last_flush_now = now;
+        }
+    }
+  else
+    {
+      gimp_display_shell_flush (gimp_display_get_shell (display), now);
+    }
+}
+
+static void
+gimp_display_paint_area (GimpDisplay *display,
+                         gint         x,
+                         gint         y,
+                         gint         w,
+                         gint         h)
+{
+  GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
+  GimpDisplayShell   *shell   = gimp_display_get_shell (display);
+  GeglRectangle       rect;
+  gint                x1, y1, x2, y2;
+  gdouble             x1_f, y1_f, x2_f, y2_f;
+
+  if (! gegl_rectangle_intersect (&rect,
+                                  &private->bounding_box,
+                                  GEGL_RECTANGLE (x, y, w, h)))
+    {
+      return;
+    }
+
+  /*  display the area  */
+  gimp_display_shell_transform_bounds (shell,
+                                       rect.x,
+                                       rect.y,
+                                       rect.x + rect.width,
+                                       rect.y + rect.height,
+                                       &x1_f, &y1_f, &x2_f, &y2_f);
+
+  /*  make sure to expose a superset of the transformed sub-pixel expose
+   *  area, not a subset. bug #126942. --mitch
+   *
+   *  also accommodate for spill introduced by potential box filtering.
+   *  (bug #474509). --simon
+   */
+  x1 = floor (x1_f - 0.5);
+  y1 = floor (y1_f - 0.5);
+  x2 = ceil (x2_f + 0.5);
+  y2 = ceil (y2_f + 0.5);
+
+  /*  align transformed area to a coarse grid, to simplify the
+   *  invalidated area
+   */
+  x1 = floor ((gdouble) x1 / PAINT_AREA_CHUNK_WIDTH)  * PAINT_AREA_CHUNK_WIDTH;
+  y1 = floor ((gdouble) y1 / PAINT_AREA_CHUNK_HEIGHT) * PAINT_AREA_CHUNK_HEIGHT;
+  x2 = ceil  ((gdouble) x2 / PAINT_AREA_CHUNK_WIDTH)  * PAINT_AREA_CHUNK_WIDTH;
+  y2 = ceil  ((gdouble) y2 / PAINT_AREA_CHUNK_HEIGHT) * PAINT_AREA_CHUNK_HEIGHT;
+
+  gimp_display_shell_expose_area (shell, x1, y1, x2 - x1, y2 - y1);
+}
diff --git a/app/display/gimpdisplay.h b/app/display/gimpdisplay.h
new file mode 100644
index 0000000..7e676b0
--- /dev/null
+++ b/app/display/gimpdisplay.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_H__
+#define __GIMP_DISPLAY_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_DISPLAY            (gimp_display_get_type ())
+#define GIMP_DISPLAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY, GimpDisplay))
+#define GIMP_DISPLAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DISPLAY, GimpDisplayClass))
+#define GIMP_IS_DISPLAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DISPLAY))
+#define GIMP_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DISPLAY))
+#define GIMP_DISPLAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DISPLAY, GimpDisplayClass))
+
+
+typedef struct _GimpDisplayClass GimpDisplayClass;
+
+struct _GimpDisplay
+{
+  GimpObject         parent_instance;
+
+  Gimp              *gimp;
+  GimpDisplayConfig *config;
+
+};
+
+struct _GimpDisplayClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType              gimp_display_get_type        (void) G_GNUC_CONST;
+
+GimpDisplay      * gimp_display_new             (Gimp              *gimp,
+                                                 GimpImage         *image,
+                                                 GimpUnit           unit,
+                                                 gdouble            scale,
+                                                 GimpUIManager     *popup_manager,
+                                                 GimpDialogFactory *dialog_factory,
+                                                 GdkScreen         *screen,
+                                                 gint               monitor);
+void               gimp_display_delete          (GimpDisplay       *display);
+void               gimp_display_close           (GimpDisplay       *display);
+
+gint               gimp_display_get_ID          (GimpDisplay       *display);
+GimpDisplay      * gimp_display_get_by_ID       (Gimp              *gimp,
+                                                 gint               ID);
+
+gchar            * gimp_display_get_action_name (GimpDisplay       *display);
+
+Gimp             * gimp_display_get_gimp        (GimpDisplay       *display);
+
+GimpImage        * gimp_display_get_image       (GimpDisplay       *display);
+void               gimp_display_set_image       (GimpDisplay       *display,
+                                                 GimpImage         *image);
+
+gint               gimp_display_get_instance    (GimpDisplay       *display);
+
+GimpDisplayShell * gimp_display_get_shell       (GimpDisplay       *display);
+
+void               gimp_display_empty           (GimpDisplay       *display);
+void               gimp_display_fill            (GimpDisplay       *display,
+                                                 GimpImage         *image,
+                                                 GimpUnit           unit,
+                                                 gdouble            scale);
+
+void               gimp_display_update_bounding_box
+                                                (GimpDisplay       *display);
+
+void               gimp_display_update_area     (GimpDisplay       *display,
+                                                 gboolean           now,
+                                                 gint               x,
+                                                 gint               y,
+                                                 gint               w,
+                                                 gint               h);
+
+void               gimp_display_flush           (GimpDisplay       *display);
+void               gimp_display_flush_now       (GimpDisplay       *display);
+
+
+#endif /*  __GIMP_DISPLAY_H__  */
diff --git a/app/display/gimpdisplayshell-actions.c b/app/display/gimpdisplayshell-actions.c
new file mode 100644
index 0000000..fa0b5ef
--- /dev/null
+++ b/app/display/gimpdisplayshell-actions.c
@@ -0,0 +1,149 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpuimanager.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-actions.h"
+#include "gimpimagewindow.h"
+
+
+void
+gimp_display_shell_set_action_sensitive (GimpDisplayShell *shell,
+                                         const gchar      *action,
+                                         gboolean          sensitive)
+{
+  GimpImageWindow *window;
+  GimpContext     *context;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (action != NULL);
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (window && gimp_image_window_get_active_shell (window) == shell)
+    {
+      GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+      GimpActionGroup *action_group;
+
+      action_group = gimp_ui_manager_get_action_group (manager, "view");
+
+      if (action_group)
+        gimp_action_group_set_action_sensitive (action_group, action, sensitive);
+    }
+
+  context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (context))
+    {
+      GimpActionGroup *action_group;
+
+      action_group = gimp_ui_manager_get_action_group (shell->popup_manager,
+                                                       "view");
+
+      if (action_group)
+        gimp_action_group_set_action_sensitive (action_group, action, sensitive);
+    }
+}
+
+void
+gimp_display_shell_set_action_active (GimpDisplayShell *shell,
+                                      const gchar      *action,
+                                      gboolean          active)
+{
+  GimpImageWindow *window;
+  GimpContext     *context;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (action != NULL);
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (window && gimp_image_window_get_active_shell (window) == shell)
+    {
+      GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+      GimpActionGroup *action_group;
+
+      action_group = gimp_ui_manager_get_action_group (manager, "view");
+
+      if (action_group)
+        gimp_action_group_set_action_active (action_group, action, active);
+    }
+
+  context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (context))
+    {
+      GimpActionGroup *action_group;
+
+      action_group = gimp_ui_manager_get_action_group (shell->popup_manager,
+                                                       "view");
+
+      if (action_group)
+        gimp_action_group_set_action_active (action_group, action, active);
+    }
+}
+
+void
+gimp_display_shell_set_action_color (GimpDisplayShell *shell,
+                                     const gchar      *action,
+                                     const GimpRGB    *color)
+{
+  GimpImageWindow *window;
+  GimpContext     *context;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (action != NULL);
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (window && gimp_image_window_get_active_shell (window) == shell)
+    {
+      GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+      GimpActionGroup *action_group;
+
+      action_group = gimp_ui_manager_get_action_group (manager, "view");
+
+      if (action_group)
+        gimp_action_group_set_action_color (action_group, action, color, FALSE);
+    }
+
+  context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (context))
+    {
+      GimpActionGroup *action_group;
+
+      action_group = gimp_ui_manager_get_action_group (shell->popup_manager,
+                                                       "view");
+
+      if (action_group)
+        gimp_action_group_set_action_color (action_group, action, color, FALSE);
+    }
+}
diff --git a/app/display/gimpdisplayshell-actions.h b/app/display/gimpdisplayshell-actions.h
new file mode 100644
index 0000000..5d4a4da
--- /dev/null
+++ b/app/display/gimpdisplayshell-actions.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_ACTIONS_H__
+#define __GIMP_DISPLAY_SHELL_ACTIONS_H__
+
+
+void   gimp_display_shell_set_action_sensitive (GimpDisplayShell *shell,
+                                                const gchar      *action,
+                                                gboolean          sensitive);
+void   gimp_display_shell_set_action_active    (GimpDisplayShell *shell,
+                                                const gchar      *action,
+                                                gboolean          active);
+void   gimp_display_shell_set_action_color     (GimpDisplayShell *shell,
+                                                const gchar      *action,
+                                                const GimpRGB    *color);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_ACTIONS_H__ */
diff --git a/app/display/gimpdisplayshell-appearance.c b/app/display/gimpdisplayshell-appearance.c
new file mode 100644
index 0000000..1080acf
--- /dev/null
+++ b/app/display/gimpdisplayshell-appearance.c
@@ -0,0 +1,606 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "config/gimpdisplayoptions.h"
+
+#include "core/gimpimage.h"
+
+#include "widgets/gimpdockcolumns.h"
+#include "widgets/gimprender.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvasitem.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-actions.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-selection.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-scrollbars.h"
+#include "gimpimagewindow.h"
+#include "gimpstatusbar.h"
+
+
+/*  local function prototypes  */
+
+static GimpDisplayOptions * appearance_get_options (GimpDisplayShell *shell);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_appearance_update (GimpDisplayShell *shell)
+{
+  GimpDisplayOptions *options;
+  GimpImageWindow    *window;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+  window  = gimp_display_shell_get_window (shell);
+
+  if (window)
+    {
+      GimpDockColumns *left_docks;
+      GimpDockColumns *right_docks;
+      gboolean         fullscreen;
+      gboolean         has_grip;
+
+      fullscreen = gimp_image_window_get_fullscreen (window);
+
+      gimp_display_shell_set_action_active (shell, "view-fullscreen",
+                                            fullscreen);
+
+      left_docks  = gimp_image_window_get_left_docks (window);
+      right_docks = gimp_image_window_get_right_docks (window);
+
+      has_grip = (! fullscreen &&
+                  ! (left_docks  && gimp_dock_columns_get_docks (left_docks)) &&
+                  ! (right_docks && gimp_dock_columns_get_docks (right_docks)));
+
+      gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar),
+                                         has_grip);
+    }
+
+  gimp_display_shell_set_show_menubar        (shell,
+                                              options->show_menubar);
+  gimp_display_shell_set_show_statusbar      (shell,
+                                              options->show_statusbar);
+
+  gimp_display_shell_set_show_rulers         (shell,
+                                              options->show_rulers);
+  gimp_display_shell_set_show_scrollbars     (shell,
+                                              options->show_scrollbars);
+  gimp_display_shell_set_show_selection      (shell,
+                                              options->show_selection);
+  gimp_display_shell_set_show_layer          (shell,
+                                              options->show_layer_boundary);
+  gimp_display_shell_set_show_canvas         (shell,
+                                              options->show_canvas_boundary);
+  gimp_display_shell_set_show_guides         (shell,
+                                              options->show_guides);
+  gimp_display_shell_set_show_grid           (shell,
+                                              options->show_grid);
+  gimp_display_shell_set_show_sample_points  (shell,
+                                              options->show_sample_points);
+  gimp_display_shell_set_padding             (shell,
+                                              options->padding_mode,
+                                              &options->padding_color);
+  gimp_display_shell_set_padding_in_show_all (shell,
+                                              options->padding_in_show_all);
+}
+
+void
+gimp_display_shell_set_show_menubar (GimpDisplayShell *shell,
+                                     gboolean          show)
+{
+  GimpDisplayOptions *options;
+  GimpImageWindow    *window;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+  window  = gimp_display_shell_get_window (shell);
+
+  g_object_set (options, "show-menubar", show, NULL);
+
+  if (window && gimp_image_window_get_active_shell (window) == shell)
+    {
+      gimp_image_window_keep_canvas_pos (gimp_display_shell_get_window (shell));
+      gimp_image_window_set_show_menubar (window, show);
+    }
+
+  gimp_display_shell_set_action_active (shell, "view-show-menubar", show);
+}
+
+gboolean
+gimp_display_shell_get_show_menubar (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_menubar;
+}
+
+void
+gimp_display_shell_set_show_statusbar (GimpDisplayShell *shell,
+                                       gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-statusbar", show, NULL);
+
+  gimp_image_window_keep_canvas_pos (gimp_display_shell_get_window (shell));
+  gimp_statusbar_set_visible (GIMP_STATUSBAR (shell->statusbar), show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-statusbar", show);
+}
+
+gboolean
+gimp_display_shell_get_show_statusbar (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_statusbar;
+}
+
+void
+gimp_display_shell_set_show_rulers (GimpDisplayShell *shell,
+                                    gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-rulers", show, NULL);
+
+  gimp_image_window_keep_canvas_pos (gimp_display_shell_get_window (shell));
+  gtk_widget_set_visible (shell->origin, show);
+  gtk_widget_set_visible (shell->hrule, show);
+  gtk_widget_set_visible (shell->vrule, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-rulers", show);
+}
+
+gboolean
+gimp_display_shell_get_show_rulers (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_rulers;
+}
+
+void
+gimp_display_shell_set_show_scrollbars (GimpDisplayShell *shell,
+                                        gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-scrollbars", show, NULL);
+
+  gimp_image_window_keep_canvas_pos (gimp_display_shell_get_window (shell));
+  gtk_widget_set_visible (shell->nav_ebox, show);
+  gtk_widget_set_visible (shell->hsb, show);
+  gtk_widget_set_visible (shell->vsb, show);
+  gtk_widget_set_visible (shell->quick_mask_button, show);
+  gtk_widget_set_visible (shell->zoom_button, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-scrollbars", show);
+}
+
+gboolean
+gimp_display_shell_get_show_scrollbars (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_scrollbars;
+}
+
+void
+gimp_display_shell_set_show_selection (GimpDisplayShell *shell,
+                                       gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-selection", show, NULL);
+
+  gimp_display_shell_selection_set_show (shell, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-selection", show);
+}
+
+gboolean
+gimp_display_shell_get_show_selection (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_selection;
+}
+
+void
+gimp_display_shell_set_show_layer (GimpDisplayShell *shell,
+                                   gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-layer-boundary", show, NULL);
+
+  gimp_canvas_item_set_visible (shell->layer_boundary, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-layer-boundary", show);
+}
+
+gboolean
+gimp_display_shell_get_show_layer (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_layer_boundary;
+}
+
+void
+gimp_display_shell_set_show_canvas (GimpDisplayShell *shell,
+                                    gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-canvas-boundary", show, NULL);
+
+  gimp_canvas_item_set_visible (shell->canvas_boundary,
+                                show && shell->show_all);
+
+  gimp_display_shell_set_action_active (shell, "view-show-canvas-boundary", show);
+}
+
+gboolean
+gimp_display_shell_get_show_canvas (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_canvas_boundary;
+}
+
+void
+gimp_display_shell_update_show_canvas (GimpDisplayShell *shell)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  gimp_canvas_item_set_visible (shell->canvas_boundary,
+                                options->show_canvas_boundary &&
+                                shell->show_all);
+}
+
+void
+gimp_display_shell_set_show_guides (GimpDisplayShell *shell,
+                                    gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-guides", show, NULL);
+
+  gimp_canvas_item_set_visible (shell->guides, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-guides", show);
+}
+
+gboolean
+gimp_display_shell_get_show_guides (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_guides;
+}
+
+void
+gimp_display_shell_set_show_grid (GimpDisplayShell *shell,
+                                  gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-grid", show, NULL);
+
+  gimp_canvas_item_set_visible (shell->grid, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-grid", show);
+}
+
+gboolean
+gimp_display_shell_get_show_grid (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_grid;
+}
+
+void
+gimp_display_shell_set_show_sample_points (GimpDisplayShell *shell,
+                                           gboolean          show)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "show-sample-points", show, NULL);
+
+  gimp_canvas_item_set_visible (shell->sample_points, show);
+
+  gimp_display_shell_set_action_active (shell, "view-show-sample-points", show);
+}
+
+gboolean
+gimp_display_shell_get_show_sample_points (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->show_sample_points;
+}
+
+void
+gimp_display_shell_set_snap_to_grid (GimpDisplayShell *shell,
+                                     gboolean          snap)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "snap-to-grid", snap, NULL);
+}
+
+gboolean
+gimp_display_shell_get_snap_to_grid (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->snap_to_grid;
+}
+
+void
+gimp_display_shell_set_snap_to_guides (GimpDisplayShell *shell,
+                                       gboolean          snap)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "snap-to-guides", snap, NULL);
+}
+
+gboolean
+gimp_display_shell_get_snap_to_guides (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->snap_to_guides;
+}
+
+void
+gimp_display_shell_set_snap_to_canvas (GimpDisplayShell *shell,
+                                       gboolean          snap)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "snap-to-canvas", snap, NULL);
+}
+
+gboolean
+gimp_display_shell_get_snap_to_canvas (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->snap_to_canvas;
+}
+
+void
+gimp_display_shell_set_snap_to_vectors (GimpDisplayShell *shell,
+                                        gboolean          snap)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  g_object_set (options, "snap-to-path", snap, NULL);
+}
+
+gboolean
+gimp_display_shell_get_snap_to_vectors (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->snap_to_path;
+}
+
+void
+gimp_display_shell_set_padding (GimpDisplayShell      *shell,
+                                GimpCanvasPaddingMode  padding_mode,
+                                const GimpRGB         *padding_color)
+{
+  GimpDisplayOptions *options;
+  GimpRGB             color;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (padding_color != NULL);
+
+  options = appearance_get_options (shell);
+  color   = *padding_color;
+
+  switch (padding_mode)
+    {
+    case GIMP_CANVAS_PADDING_MODE_DEFAULT:
+      if (shell->canvas)
+        {
+          GtkStyle *style;
+
+          gtk_widget_ensure_style (shell->canvas);
+
+          style = gtk_widget_get_style (shell->canvas);
+
+          gimp_rgb_set_gdk_color (&color, style->bg + GTK_STATE_NORMAL);
+        }
+      break;
+
+    case GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK:
+      color = *gimp_render_light_check_color ();
+      break;
+
+    case GIMP_CANVAS_PADDING_MODE_DARK_CHECK:
+      color = *gimp_render_dark_check_color ();
+      break;
+
+    case GIMP_CANVAS_PADDING_MODE_CUSTOM:
+    case GIMP_CANVAS_PADDING_MODE_RESET:
+      break;
+    }
+
+  g_object_set (options,
+                "padding-mode",  padding_mode,
+                "padding-color", &color,
+                NULL);
+
+  gimp_canvas_set_bg_color (GIMP_CANVAS (shell->canvas), &color);
+
+  gimp_display_shell_set_action_color (shell, "view-padding-color-menu",
+                                       &options->padding_color);
+}
+
+void
+gimp_display_shell_get_padding (GimpDisplayShell       *shell,
+                                GimpCanvasPaddingMode  *padding_mode,
+                                GimpRGB                *padding_color)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  if (padding_mode)
+    *padding_mode = options->padding_mode;
+
+  if (padding_color)
+    *padding_color = options->padding_color;
+}
+
+void
+gimp_display_shell_set_padding_in_show_all (GimpDisplayShell *shell,
+                                            gboolean          keep)
+{
+  GimpDisplayOptions *options;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  options = appearance_get_options (shell);
+
+  if (options->padding_in_show_all != keep)
+    {
+      g_object_set (options, "padding-in-show-all", keep, NULL);
+
+      if (shell->display)
+        {
+          gimp_display_shell_scroll_clamp_and_update (shell);
+          gimp_display_shell_scrollbars_update (shell);
+
+          gimp_display_shell_expose_full (shell);
+        }
+
+      gimp_display_shell_set_action_active (shell,
+                                            "view-padding-color-in-show-all",
+                                            keep);
+
+      g_object_notify (G_OBJECT (shell), "infinite-canvas");
+    }
+}
+
+gboolean
+gimp_display_shell_get_padding_in_show_all (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return appearance_get_options (shell)->padding_in_show_all;
+}
+
+
+/*  private functions  */
+
+static GimpDisplayOptions *
+appearance_get_options (GimpDisplayShell *shell)
+{
+  if (gimp_display_get_image (shell->display))
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      if (window && gimp_image_window_get_fullscreen (window))
+        return shell->fullscreen_options;
+      else
+        return shell->options;
+    }
+
+  return shell->no_image_options;
+}
diff --git a/app/display/gimpdisplayshell-appearance.h b/app/display/gimpdisplayshell-appearance.h
new file mode 100644
index 0000000..0c67649
--- /dev/null
+++ b/app/display/gimpdisplayshell-appearance.h
@@ -0,0 +1,92 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_APPEARANCE_H__
+#define __GIMP_DISPLAY_SHELL_APPEARANCE_H__
+
+
+void       gimp_display_shell_appearance_update       (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_menubar        (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_menubar        (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_statusbar      (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_statusbar      (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_rulers         (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_rulers         (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_scrollbars     (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_scrollbars     (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_selection      (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_selection      (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_layer          (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_layer          (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_canvas         (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_canvas         (GimpDisplayShell       *shell);
+void       gimp_display_shell_update_show_canvas      (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_grid           (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_grid           (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_guides         (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_guides         (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_snap_to_grid        (GimpDisplayShell       *shell,
+                                                       gboolean                snap);
+gboolean   gimp_display_shell_get_snap_to_grid        (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_show_sample_points  (GimpDisplayShell       *shell,
+                                                       gboolean                show);
+gboolean   gimp_display_shell_get_show_sample_points  (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_snap_to_guides      (GimpDisplayShell       *shell,
+                                                       gboolean                snap);
+gboolean   gimp_display_shell_get_snap_to_guides      (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_snap_to_canvas      (GimpDisplayShell       *shell,
+                                                       gboolean                snap);
+gboolean   gimp_display_shell_get_snap_to_canvas      (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_snap_to_vectors     (GimpDisplayShell       *shell,
+                                                       gboolean                snap);
+gboolean   gimp_display_shell_get_snap_to_vectors     (GimpDisplayShell       *shell);
+
+void       gimp_display_shell_set_padding             (GimpDisplayShell       *shell,
+                                                       GimpCanvasPaddingMode   mode,
+                                                       const GimpRGB          *color);
+void       gimp_display_shell_get_padding             (GimpDisplayShell       *shell,
+                                                       GimpCanvasPaddingMode  *mode,
+                                                       GimpRGB                *color);
+void       gimp_display_shell_set_padding_in_show_all (GimpDisplayShell       *shell,
+                                                       gboolean                keep);
+gboolean   gimp_display_shell_get_padding_in_show_all (GimpDisplayShell       *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_APPEARANCE_H__ */
diff --git a/app/display/gimpdisplayshell-autoscroll.c b/app/display/gimpdisplayshell-autoscroll.c
new file mode 100644
index 0000000..39cf252
--- /dev/null
+++ b/app/display/gimpdisplayshell-autoscroll.c
@@ -0,0 +1,184 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "widgets/gimpdeviceinfo.h"
+#include "widgets/gimpdeviceinfo-coords.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-autoscroll.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-transform.h"
+
+#include "tools/tools-types.h"
+#include "tools/tool_manager.h"
+#include "tools/gimptool.h"
+#include "tools/gimptoolcontrol.h"
+
+
+#define AUTOSCROLL_DT  20
+#define AUTOSCROLL_DX  0.1
+
+
+typedef struct
+{
+  GdkEventMotion  *mevent;
+  GimpDeviceInfo  *device;
+  guint32          time;
+  GdkModifierType  state;
+  guint            timeout_id;
+} ScrollInfo;
+
+
+/*  local function prototypes  */
+
+static gboolean gimp_display_shell_autoscroll_timeout (gpointer data);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_autoscroll_start (GimpDisplayShell *shell,
+                                     GdkModifierType   state,
+                                     GdkEventMotion   *mevent)
+{
+  ScrollInfo *info;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->scroll_info)
+    return;
+
+  info = g_slice_new0 (ScrollInfo);
+
+  info->mevent     = mevent;
+  info->device     = gimp_device_info_get_by_device (mevent->device);
+  info->time       = gdk_event_get_time ((GdkEvent *) mevent);
+  info->state      = state;
+  info->timeout_id = g_timeout_add (AUTOSCROLL_DT,
+                                    gimp_display_shell_autoscroll_timeout,
+                                    shell);
+
+  shell->scroll_info = info;
+}
+
+void
+gimp_display_shell_autoscroll_stop (GimpDisplayShell *shell)
+{
+  ScrollInfo *info;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->scroll_info)
+    return;
+
+  info = shell->scroll_info;
+
+  if (info->timeout_id)
+    {
+      g_source_remove (info->timeout_id);
+      info->timeout_id = 0;
+    }
+
+  g_slice_free (ScrollInfo, info);
+  shell->scroll_info = NULL;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_display_shell_autoscroll_timeout (gpointer data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+  ScrollInfo       *info  = shell->scroll_info;
+  GimpCoords        device_coords;
+  GimpCoords        image_coords;
+  gint              dx = 0;
+  gint              dy = 0;
+
+  gimp_device_info_get_device_coords (info->device,
+                                      gtk_widget_get_window (shell->canvas),
+                                      &device_coords);
+
+  if (device_coords.x < 0)
+    dx = device_coords.x;
+  else if (device_coords.x > shell->disp_width)
+    dx = device_coords.x - shell->disp_width;
+
+  if (device_coords.y < 0)
+    dy = device_coords.y;
+  else if (device_coords.y > shell->disp_height)
+    dy = device_coords.y - shell->disp_height;
+
+  if (dx || dy)
+    {
+      GimpDisplay *display         = shell->display;
+      GimpTool    *active_tool     = tool_manager_get_active (display->gimp);
+      gint         scroll_amount_x = AUTOSCROLL_DX * dx;
+      gint         scroll_amount_y = AUTOSCROLL_DX * dy;
+
+      info->time += AUTOSCROLL_DT;
+
+      gimp_display_shell_scroll_unoverscrollify (shell,
+                                                 scroll_amount_x,
+                                                 scroll_amount_y,
+                                                 &scroll_amount_x,
+                                                 &scroll_amount_y);
+
+      gimp_display_shell_scroll (shell,
+                                 scroll_amount_x,
+                                 scroll_amount_y);
+
+      gimp_display_shell_untransform_coords (shell,
+                                             &device_coords,
+                                             &image_coords);
+
+      if (gimp_tool_control_get_snap_to (active_tool->control))
+        {
+          gint x, y, width, height;
+
+          gimp_tool_control_get_snap_offsets (active_tool->control,
+                                              &x, &y, &width, &height);
+
+          gimp_display_shell_snap_coords (shell,
+                                          &image_coords,
+                                          x, y, width, height);
+        }
+
+      tool_manager_motion_active (display->gimp,
+                                  &image_coords,
+                                  info->time, info->state,
+                                  display);
+
+      return TRUE;
+    }
+  else
+    {
+      g_slice_free (ScrollInfo, info);
+      shell->scroll_info = NULL;
+
+      return FALSE;
+    }
+}
diff --git a/app/display/gimpdisplayshell-autoscroll.h b/app/display/gimpdisplayshell-autoscroll.h
new file mode 100644
index 0000000..c030759
--- /dev/null
+++ b/app/display/gimpdisplayshell-autoscroll.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_AUTOSCROLL_H__
+#define __GIMP_DISPLAY_SHELL_AUTOSCROLL_H__
+
+
+void   gimp_display_shell_autoscroll_start (GimpDisplayShell *shell,
+                                            GdkModifierType   state,
+                                            GdkEventMotion   *mevent);
+void   gimp_display_shell_autoscroll_stop  (GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_AUTOSCROLL_H__ */
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
new file mode 100644
index 0000000..4b87898
--- /dev/null
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -0,0 +1,652 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-quick-mask.h"
+
+#include "widgets/gimpcairo-wilber.h"
+#include "widgets/gimpuimanager.h"
+
+#include "gimpcanvasitem.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-callbacks.h"
+#include "gimpdisplayshell-draw.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-scrollbars.h"
+#include "gimpdisplayshell-selection.h"
+#include "gimpdisplayshell-title.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpdisplayxfer.h"
+#include "gimpimagewindow.h"
+#include "gimpnavigationeditor.h"
+
+#include "git-version.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void       gimp_display_shell_vadjustment_changed      (GtkAdjustment    *adjustment,
+                                                               GimpDisplayShell *shell);
+static void       gimp_display_shell_hadjustment_changed      (GtkAdjustment    *adjustment,
+                                                               GimpDisplayShell *shell);
+static gboolean   gimp_display_shell_vscrollbar_change_value  (GtkRange         *range,
+                                                               GtkScrollType     scroll,
+                                                               gdouble           value,
+                                                               GimpDisplayShell *shell);
+
+static gboolean   gimp_display_shell_hscrollbar_change_value  (GtkRange         *range,
+                                                               GtkScrollType     scroll,
+                                                               gdouble           value,
+                                                               GimpDisplayShell *shell);
+
+static void       gimp_display_shell_canvas_draw_image        (GimpDisplayShell *shell,
+                                                               cairo_t          *cr);
+static void       gimp_display_shell_canvas_draw_drop_zone    (GimpDisplayShell *shell,
+                                                               cairo_t          *cr);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_canvas_realize (GtkWidget        *canvas,
+                                   GimpDisplayShell *shell)
+{
+  GimpCanvasPaddingMode padding_mode;
+  GimpRGB               padding_color;
+  GtkAllocation         allocation;
+
+  gtk_widget_grab_focus (canvas);
+
+  gimp_display_shell_get_padding (shell, &padding_mode, &padding_color);
+  gimp_display_shell_set_padding (shell, padding_mode, &padding_color);
+
+  gtk_widget_get_allocation (canvas, &allocation);
+
+  gimp_display_shell_title_update (shell);
+
+  shell->disp_width  = allocation.width;
+  shell->disp_height = allocation.height;
+
+  /*  set up the scrollbar observers  */
+  g_signal_connect (shell->hsbdata, "value-changed",
+                    G_CALLBACK (gimp_display_shell_hadjustment_changed),
+                    shell);
+  g_signal_connect (shell->vsbdata, "value-changed",
+                    G_CALLBACK (gimp_display_shell_vadjustment_changed),
+                    shell);
+
+  g_signal_connect (shell->hsb, "change-value",
+                    G_CALLBACK (gimp_display_shell_hscrollbar_change_value),
+                    shell);
+
+  g_signal_connect (shell->vsb, "change-value",
+                    G_CALLBACK (gimp_display_shell_vscrollbar_change_value),
+                    shell);
+
+  /*  allow shrinking  */
+  gtk_widget_set_size_request (GTK_WIDGET (shell), 0, 0);
+
+  shell->xfer = gimp_display_xfer_realize (GTK_WIDGET(shell));
+
+  /*  HACK: remove with GTK+ 3.x: this unconditionally maps the
+   *  rulers, if configured to be hidden they are never visible to the
+   *  user because they will be hidden again right away.
+   *
+   *  For some obscure reason, having the rulers mapped once prevents
+   *  crashes with tablets and on-canvas dialogs. See bug #784480 and
+   *  all its duplicates.
+   */
+  gtk_widget_show (shell->hrule);
+  gtk_widget_show (shell->vrule);
+}
+
+void
+gimp_display_shell_canvas_realize_after (GtkWidget        *canvas,
+                                         GimpDisplayShell *shell)
+{
+  GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+  /*  HACK: see above: must go with GTK+ 3.x too. Restore the rulers'
+   *  intended visibility again.
+   */
+  gimp_image_window_suspend_keep_pos (window);
+  gimp_display_shell_appearance_update (shell);
+  gimp_image_window_resume_keep_pos (window);
+}
+
+void
+gimp_display_shell_canvas_size_allocate (GtkWidget        *widget,
+                                         GtkAllocation    *allocation,
+                                         GimpDisplayShell *shell)
+{
+  /*  are we in destruction?  */
+  if (! shell->display || ! gimp_display_get_shell (shell->display))
+    return;
+
+  if ((shell->disp_width  != allocation->width) ||
+      (shell->disp_height != allocation->height))
+    {
+      if (shell->zoom_on_resize   &&
+          shell->disp_width  > 64 &&
+          shell->disp_height > 64 &&
+          allocation->width  > 64 &&
+          allocation->height > 64)
+        {
+          gdouble scale = gimp_zoom_model_get_factor (shell->zoom);
+          gint    offset_x;
+          gint    offset_y;
+
+          /* FIXME: The code is a bit of a mess */
+
+          /*  multiply the zoom_factor with the ratio of the new and
+           *  old canvas diagonals
+           */
+          scale *= (sqrt (SQR (allocation->width) +
+                          SQR (allocation->height)) /
+                    sqrt (SQR (shell->disp_width) +
+                          SQR (shell->disp_height)));
+
+          offset_x = UNSCALEX (shell, shell->offset_x);
+          offset_y = UNSCALEX (shell, shell->offset_y);
+
+          gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, scale);
+
+          shell->offset_x = SCALEX (shell, offset_x);
+          shell->offset_y = SCALEY (shell, offset_y);
+        }
+
+      shell->disp_width  = allocation->width;
+      shell->disp_height = allocation->height;
+
+      /* When we size-allocate due to resize of the top level window,
+       * we want some additional logic. Don't apply it on
+       * zoom_on_resize though.
+       */
+      if (shell->size_allocate_from_configure_event &&
+          ! shell->zoom_on_resize)
+        {
+          gboolean center_horizontally;
+          gboolean center_vertically;
+          gint     target_offset_x;
+          gint     target_offset_y;
+          gint     sw;
+          gint     sh;
+
+          gimp_display_shell_scale_get_image_size (shell, &sw, &sh);
+
+          center_horizontally = sw <= shell->disp_width;
+          center_vertically   = sh <= shell->disp_height;
+
+          if (! gimp_display_shell_get_infinite_canvas (shell))
+            {
+              gimp_display_shell_scroll_center_image (shell,
+                                                      center_horizontally,
+                                                      center_vertically);
+            }
+          else
+            {
+              gimp_display_shell_scroll_center_content (shell,
+                                                        center_horizontally,
+                                                        center_vertically);
+            }
+
+          /* This is basically the best we can do before we get an
+           * API for storing the image offset at the start of an
+           * image window resize using the mouse
+           */
+          target_offset_x = shell->offset_x;
+          target_offset_y = shell->offset_y;
+
+          if (! center_horizontally)
+            {
+              target_offset_x = MAX (shell->offset_x, 0);
+            }
+
+          if (! center_vertically)
+            {
+              target_offset_y = MAX (shell->offset_y, 0);
+            }
+
+          gimp_display_shell_scroll_set_offset (shell,
+                                                target_offset_x,
+                                                target_offset_y);
+        }
+
+      gimp_display_shell_scroll_clamp_and_update (shell);
+      gimp_display_shell_scaled (shell);
+
+      shell->size_allocate_from_configure_event = FALSE;
+    }
+
+  if (shell->size_allocate_center_image)
+    {
+      gimp_display_shell_scroll_center_image (shell, TRUE, TRUE);
+
+      shell->size_allocate_center_image = FALSE;
+    }
+}
+
+gboolean
+gimp_display_shell_canvas_expose (GtkWidget        *widget,
+                                  GdkEventExpose   *eevent,
+                                  GimpDisplayShell *shell)
+{
+  /*  are we in destruction?  */
+  if (! shell->display || ! gimp_display_get_shell (shell->display))
+    return TRUE;
+
+  /*  we will scroll around in the next tick anyway, so we just can as
+   *  well skip the drawing of this frame and wait for the next
+   */
+  if (shell->size_allocate_center_image)
+    return TRUE;
+
+  /*  ignore events on overlays  */
+  if (eevent->window == gtk_widget_get_window (widget))
+    {
+      GimpImage *image = gimp_display_get_image (shell->display);
+      cairo_t   *cr;
+
+      cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas));
+      gdk_cairo_region (cr, eevent->region);
+      cairo_clip (cr);
+
+      /* If we are currently converting the image, it might be in inconsistent
+       * state and should not be redrawn.
+       */
+      if (image != NULL && ! gimp_image_get_converting (image))
+        {
+          gimp_display_shell_canvas_draw_image (shell, cr);
+        }
+      else if (image == NULL)
+        {
+          gimp_display_shell_canvas_draw_drop_zone (shell, cr);
+        }
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_display_shell_origin_button_press (GtkWidget        *widget,
+                                        GdkEventButton   *event,
+                                        GimpDisplayShell *shell)
+{
+  if (! shell->display->gimp->busy)
+    {
+      if (event->type == GDK_BUTTON_PRESS && event->button == 1)
+        {
+          gboolean unused;
+
+          g_signal_emit_by_name (shell, "popup-menu", &unused);
+        }
+    }
+
+  /* Return TRUE to stop signal emission so the button doesn't grab the
+   * pointer away from us.
+   */
+  return TRUE;
+}
+
+gboolean
+gimp_display_shell_quick_mask_button_press (GtkWidget        *widget,
+                                            GdkEventButton   *bevent,
+                                            GimpDisplayShell *shell)
+{
+  if (! gimp_display_get_image (shell->display))
+    return TRUE;
+
+  if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      if (window)
+        {
+          GimpUIManager *manager = gimp_image_window_get_ui_manager (window);
+
+          gimp_ui_manager_ui_popup (manager,
+                                    "/quick-mask-popup",
+                                    GTK_WIDGET (shell),
+                                    NULL, NULL, NULL, NULL);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_display_shell_quick_mask_toggled (GtkWidget        *widget,
+                                       GimpDisplayShell *shell)
+{
+  GimpImage *image  = gimp_display_get_image (shell->display);
+  gboolean   active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+  if (active != gimp_image_get_quick_mask_state (image))
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      if (window)
+        {
+          GimpUIManager *manager = gimp_image_window_get_ui_manager (window);
+
+          gimp_ui_manager_toggle_action (manager,
+                                         "quick-mask", "quick-mask-toggle",
+                                         active);
+        }
+    }
+}
+
+gboolean
+gimp_display_shell_navigation_button_press (GtkWidget        *widget,
+                                            GdkEventButton   *bevent,
+                                            GimpDisplayShell *shell)
+{
+  if (! gimp_display_get_image (shell->display))
+    return TRUE;
+
+  if (bevent->type == GDK_BUTTON_PRESS && bevent->button == 1)
+    {
+      gimp_navigation_editor_popup (shell, widget, bevent->x, bevent->y);
+    }
+
+  return TRUE;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_vadjustment_changed (GtkAdjustment    *adjustment,
+                                        GimpDisplayShell *shell)
+{
+  /*  If we are panning with mouse, scrollbars are to be ignored or
+   *  they will cause jitter in motion
+   */
+  if (! shell->scrolling)
+    gimp_display_shell_scroll (shell,
+                               0,
+                               gtk_adjustment_get_value (adjustment) -
+                               shell->offset_y);
+}
+
+static void
+gimp_display_shell_hadjustment_changed (GtkAdjustment    *adjustment,
+                                        GimpDisplayShell *shell)
+{
+  /* If we are panning with mouse, scrollbars are to be ignored or
+   * they will cause jitter in motion
+   */
+  if (! shell->scrolling)
+    gimp_display_shell_scroll (shell,
+                               gtk_adjustment_get_value (adjustment) -
+                               shell->offset_x,
+                               0);
+}
+
+static gboolean
+gimp_display_shell_hscrollbar_change_value (GtkRange         *range,
+                                            GtkScrollType     scroll,
+                                            gdouble           value,
+                                            GimpDisplayShell *shell)
+{
+  if (! shell->display)
+    return TRUE;
+
+  if ((scroll == GTK_SCROLL_JUMP)          ||
+      (scroll == GTK_SCROLL_PAGE_BACKWARD) ||
+      (scroll == GTK_SCROLL_PAGE_FORWARD))
+    return FALSE;
+
+  g_object_freeze_notify (G_OBJECT (shell->hsbdata));
+
+  gimp_display_shell_scrollbars_setup_horizontal (shell, value);
+
+  g_object_thaw_notify (G_OBJECT (shell->hsbdata)); /* emits "changed" */
+
+  return FALSE;
+}
+
+static gboolean
+gimp_display_shell_vscrollbar_change_value (GtkRange         *range,
+                                            GtkScrollType     scroll,
+                                            gdouble           value,
+                                            GimpDisplayShell *shell)
+{
+  if (! shell->display)
+    return TRUE;
+
+  if ((scroll == GTK_SCROLL_JUMP)          ||
+      (scroll == GTK_SCROLL_PAGE_BACKWARD) ||
+      (scroll == GTK_SCROLL_PAGE_FORWARD))
+    return FALSE;
+
+  g_object_freeze_notify (G_OBJECT (shell->vsbdata));
+
+  gimp_display_shell_scrollbars_setup_vertical (shell, value);
+
+  g_object_thaw_notify (G_OBJECT (shell->vsbdata)); /* emits "changed" */
+
+  return FALSE;
+}
+
+static void
+gimp_display_shell_canvas_draw_image (GimpDisplayShell *shell,
+                                      cairo_t          *cr)
+{
+  cairo_rectangle_list_t *clip_rectangles;
+  GeglRectangle           image_rect;
+  GeglRectangle           rotated_image_rect;
+  GeglRectangle           canvas_rect;
+  cairo_matrix_t          matrix;
+  gdouble                 x1, y1;
+  gdouble                 x2, y2;
+
+  gimp_display_shell_scale_get_image_unrotated_bounding_box (
+    shell,
+    &image_rect.x,
+    &image_rect.y,
+    &image_rect.width,
+    &image_rect.height);
+
+  gimp_display_shell_scale_get_image_unrotated_bounds (
+    shell,
+    &canvas_rect.x,
+    &canvas_rect.y,
+    &canvas_rect.width,
+    &canvas_rect.height);
+
+  /*  the background has already been cleared by GdkWindow
+   */
+
+
+  /*  on top, draw the exposed part of the region that is inside the
+   *  image
+   */
+
+  cairo_save (cr);
+  clip_rectangles = cairo_copy_clip_rectangle_list (cr);
+  cairo_get_matrix (cr, &matrix);
+
+  if (shell->rotate_transform)
+    cairo_transform (cr, shell->rotate_transform);
+
+  if (shell->show_all)
+    {
+      cairo_save (cr);
+
+      if (gimp_display_shell_get_padding_in_show_all (shell))
+        {
+          cairo_rectangle (cr,
+                           canvas_rect.x,
+                           canvas_rect.y,
+                           canvas_rect.width,
+                           canvas_rect.height);
+          cairo_clip (cr);
+        }
+
+      gimp_display_shell_draw_checkerboard (shell, cr);
+
+      cairo_restore (cr);
+    }
+
+  cairo_rectangle (cr,
+                   image_rect.x,
+                   image_rect.y,
+                   image_rect.width,
+                   image_rect.height);
+  cairo_clip (cr);
+
+  gimp_display_shell_rotate_bounds (shell,
+                                    image_rect.x,
+                                    image_rect.y,
+                                    image_rect.x + image_rect.width,
+                                    image_rect.y + image_rect.height,
+                                    &x1, &y1, &x2, &y2);
+
+  rotated_image_rect.x      = floor (x1);
+  rotated_image_rect.y      = floor (y1);
+  rotated_image_rect.width  = ceil  (x2) - rotated_image_rect.x;
+  rotated_image_rect.height = ceil  (y2) - rotated_image_rect.y;
+
+  if (gdk_cairo_get_clip_rectangle (cr, NULL))
+    {
+      gint i;
+
+      if (! shell->show_all)
+        {
+          cairo_save (cr);
+          gimp_display_shell_draw_checkerboard (shell, cr);
+          cairo_restore (cr);
+        }
+
+      if (shell->show_image)
+        {
+          cairo_set_matrix (cr, &matrix);
+
+          for (i = 0; i < clip_rectangles->num_rectangles; i++)
+            {
+              cairo_rectangle_t clip_rect = clip_rectangles->rectangles[i];
+              GeglRectangle     rect;
+
+              rect.x      = floor (clip_rect.x);
+              rect.y      = floor (clip_rect.y);
+              rect.width  = ceil  (clip_rect.x + clip_rect.width)  - rect.x;
+              rect.height = ceil  (clip_rect.y + clip_rect.height) - rect.y;
+
+              if (gegl_rectangle_intersect (&rect, &rect, &rotated_image_rect))
+                {
+                  gimp_display_shell_draw_image (shell, cr,
+                                                 rect.x,     rect.y,
+                                                 rect.width, rect.height);
+                }
+            }
+        }
+    }
+
+  cairo_rectangle_list_destroy (clip_rectangles);
+  cairo_restore (cr);
+
+
+  /*  finally, draw all the remaining image window stuff on top
+   */
+
+  /* draw canvas items */
+  cairo_save (cr);
+
+  if (shell->rotate_transform)
+    cairo_transform (cr, shell->rotate_transform);
+
+  gimp_canvas_item_draw (shell->canvas_item, cr);
+
+  cairo_restore (cr);
+
+  gimp_canvas_item_draw (shell->unrotated_item, cr);
+
+  /* restart (and recalculate) the selection boundaries */
+  gimp_display_shell_selection_draw (shell, cr);
+  gimp_display_shell_selection_restart (shell);
+}
+
+static void
+gimp_display_shell_canvas_draw_drop_zone (GimpDisplayShell *shell,
+                                          cairo_t          *cr)
+{
+  cairo_save (cr);
+
+  gimp_cairo_draw_drop_wilber (shell->canvas, cr, shell->blink);
+
+  cairo_restore (cr);
+
+#ifdef GIMP_UNSTABLE
+  {
+    PangoLayout   *layout;
+    gchar         *msg;
+    GtkAllocation  allocation;
+    gint           width;
+    gint           height;
+    gdouble        scale;
+
+    layout = gtk_widget_create_pango_layout (shell->canvas, NULL);
+
+    msg = g_strdup_printf (_("<big>Unstable Development Version</big>\n\n"
+                             "<small>commit <tt>%s</tt></small>\n\n"
+                             "<small>Please test bugs against "
+                             "latest git master branch\n"
+                             "before reporting them.</small>"),
+                             GIMP_GIT_VERSION_ABBREV);
+    pango_layout_set_markup (layout, msg, -1);
+    g_free (msg);
+    pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+
+    pango_layout_get_pixel_size (layout, &width, &height);
+    gtk_widget_get_allocation (shell->canvas, &allocation);
+
+    scale = MIN (((gdouble) allocation.width  / 2.0) / (gdouble) width,
+                 ((gdouble) allocation.height / 2.0) / (gdouble) height);
+
+    cairo_move_to (cr,
+                   (allocation.width  - (width  * scale)) / 2,
+                   (allocation.height - (height * scale)) / 2);
+
+    cairo_scale (cr, scale, scale);
+
+    pango_cairo_show_layout (cr, layout);
+
+    g_object_unref (layout);
+  }
+#endif /* GIMP_UNSTABLE */
+}
diff --git a/app/display/gimpdisplayshell-callbacks.h b/app/display/gimpdisplayshell-callbacks.h
new file mode 100644
index 0000000..de1861f
--- /dev/null
+++ b/app/display/gimpdisplayshell-callbacks.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_CALLBACKS_H__
+#define __GIMP_DISPLAY_SHELL_CALLBACKS_H__
+
+
+void       gimp_display_shell_canvas_realize          (GtkWidget        *widget,
+                                                       GimpDisplayShell *shell);
+void       gimp_display_shell_canvas_realize_after    (GtkWidget        *widget,
+                                                       GimpDisplayShell *shell);
+void       gimp_display_shell_canvas_size_allocate    (GtkWidget        *widget,
+                                                       GtkAllocation    *alloc,
+                                                       GimpDisplayShell *shell);
+gboolean   gimp_display_shell_canvas_expose           (GtkWidget        *widget,
+                                                       GdkEventExpose   *eevent,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_origin_button_press     (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_quick_mask_button_press (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+void       gimp_display_shell_quick_mask_toggled      (GtkWidget        *widget,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_navigation_button_press (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_CALLBACKS_H__ */
diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
new file mode 100644
index 0000000..b7d7c16
--- /dev/null
+++ b/app/display/gimpdisplayshell-close.c
@@ -0,0 +1,447 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <time.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-close.h"
+#include "gimpimagewindow.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void      gimp_display_shell_close_dialog       (GimpDisplayShell *shell,
+                                                        GimpImage        *image);
+static void      gimp_display_shell_close_name_changed (GimpImage        *image,
+                                                        GimpMessageBox   *box);
+static void      gimp_display_shell_close_exported     (GimpImage        *image,
+                                                        GFile            *file,
+                                                        GimpMessageBox   *box);
+static gboolean  gimp_display_shell_close_time_changed (GimpMessageBox   *box);
+static void      gimp_display_shell_close_response     (GtkWidget        *widget,
+                                                        gboolean          close,
+                                                        GimpDisplayShell *shell);
+static void      gimp_display_shell_close_accel_marshal(GClosure         *closure,
+                                                        GValue           *return_value,
+                                                        guint             n_param_values,
+                                                        const GValue     *param_values,
+                                                        gpointer          invocation_hint,
+                                                        gpointer          marshal_data);
+static void      gimp_time_since                       (gint64            then,
+                                                        gint             *hours,
+                                                        gint             *minutes);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_close (GimpDisplayShell *shell,
+                          gboolean          kill_it)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  /*  FIXME: gimp_busy HACK not really appropriate here because we only
+   *  want to prevent the busy image and display to be closed.  --Mitch
+   */
+  if (shell->display->gimp->busy)
+    return;
+
+  /*  If the image has been modified, give the user a chance to save
+   *  it before nuking it--this only applies if its the last view
+   *  to an image canvas.  (a image with disp_count = 1)
+   */
+  if (! kill_it                                 &&
+      image                                     &&
+      gimp_image_get_display_count (image) == 1 &&
+      gimp_image_is_dirty (image))
+    {
+      /*  If there's a save dialog active for this image, then raise it.
+       *  (see bug #511965)
+       */
+      GtkWidget *dialog = g_object_get_data (G_OBJECT (image),
+                                             "gimp-file-save-dialog");
+      if (dialog)
+        {
+          gtk_window_present (GTK_WINDOW (dialog));
+        }
+      else
+        {
+          gimp_display_shell_close_dialog (shell, image);
+        }
+    }
+  else if (image)
+    {
+      gimp_display_close (shell->display);
+    }
+  else
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      if (window)
+        {
+          GimpUIManager *manager = gimp_image_window_get_ui_manager (window);
+
+          /* Activate the action instead of simply calling gimp_exit(), so
+           * the quit action's sensitivity is taken into account.
+           */
+          gimp_ui_manager_activate_action (manager, "file", "file-quit");
+        }
+    }
+}
+
+
+/*  private functions  */
+
+#define RESPONSE_SAVE  1
+
+
+static void
+gimp_display_shell_close_dialog (GimpDisplayShell *shell,
+                                 GimpImage        *image)
+{
+  GtkWidget       *dialog;
+  GimpMessageBox  *box;
+  GtkWidget       *label;
+  GtkAccelGroup   *accel_group;
+  GClosure        *closure;
+  GSource         *source;
+  guint            accel_key;
+  GdkModifierType  accel_mods;
+  gchar           *title;
+  gchar           *accel_string;
+  gchar           *hint;
+  gchar           *markup;
+  GFile           *file;
+
+  if (shell->close_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (shell->close_dialog));
+      return;
+    }
+
+  file = gimp_image_get_file (image);
+
+  title = g_strdup_printf (_("Close %s"), gimp_image_get_display_name (image));
+
+  shell->close_dialog =
+    dialog = gimp_message_dialog_new (title, GIMP_ICON_DOCUMENT_SAVE,
+                                      GTK_WIDGET (shell),
+                                      GTK_DIALOG_DESTROY_WITH_PARENT,
+                                      gimp_standard_help_func, NULL,
+
+                                      file ?
+                                      _("_Save") :
+                                      _("Save _As"),         RESPONSE_SAVE,
+                                      _("_Cancel"),          GTK_RESPONSE_CANCEL,
+                                      _("_Discard Changes"), GTK_RESPONSE_CLOSE,
+                                      NULL);
+
+  g_free (title);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_SAVE,
+                                           GTK_RESPONSE_CLOSE,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &shell->close_dialog);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gimp_display_shell_close_response),
+                    shell);
+
+  /* connect <Primary>D to the quit/close button */
+  accel_group = gtk_accel_group_new ();
+  gtk_window_add_accel_group (GTK_WINDOW (shell->close_dialog), accel_group);
+  g_object_unref (accel_group);
+
+  closure = g_closure_new_object (sizeof (GClosure),
+                                  G_OBJECT (shell->close_dialog));
+  g_closure_set_marshal (closure, gimp_display_shell_close_accel_marshal);
+  gtk_accelerator_parse ("<Primary>D", &accel_key, &accel_mods);
+  gtk_accel_group_connect (accel_group, accel_key, accel_mods, 0, closure);
+
+  box = GIMP_MESSAGE_DIALOG (dialog)->box;
+
+  accel_string = gtk_accelerator_get_label (accel_key, accel_mods);
+  hint = g_strdup_printf (_("Press %s to discard all changes and close the image."),
+                          accel_string);
+  markup = g_strdup_printf ("<i><small>%s</small></i>", hint);
+
+  label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_markup (GTK_LABEL (label), markup);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  g_free (markup);
+  g_free (hint);
+  g_free (accel_string);
+
+  g_signal_connect_object (image, "name-changed",
+                           G_CALLBACK (gimp_display_shell_close_name_changed),
+                           box, 0);
+  g_signal_connect_object (image, "exported",
+                           G_CALLBACK (gimp_display_shell_close_exported),
+                           box, 0);
+
+  gimp_display_shell_close_name_changed (image, box);
+
+  closure =
+    g_cclosure_new_object (G_CALLBACK (gimp_display_shell_close_time_changed),
+                           G_OBJECT (box));
+
+  /*  update every 10 seconds  */
+  source = g_timeout_source_new_seconds (10);
+  g_source_set_closure (source, closure);
+  g_source_attach (source, NULL);
+  g_source_unref (source);
+
+  /*  The dialog is destroyed with the shell, so it should be safe
+   *  to hold an image pointer for the lifetime of the dialog.
+   */
+  g_object_set_data (G_OBJECT (box), "gimp-image", image);
+
+  gimp_display_shell_close_time_changed (box);
+
+  gtk_widget_show (dialog);
+}
+
+static void
+gimp_display_shell_close_name_changed (GimpImage      *image,
+                                       GimpMessageBox *box)
+{
+  GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (box));
+
+  if (GTK_IS_WINDOW (window))
+    {
+      gchar *title = g_strdup_printf (_("Close %s"),
+                                      gimp_image_get_display_name (image));
+
+      gtk_window_set_title (GTK_WINDOW (window), title);
+      g_free (title);
+    }
+
+  gimp_message_box_set_primary_text (box,
+                                     _("Save the changes to image '%s' "
+                                       "before closing?"),
+                                     gimp_image_get_display_name (image));
+}
+
+static void
+gimp_display_shell_close_exported (GimpImage      *image,
+                                   GFile          *file,
+                                   GimpMessageBox *box)
+{
+  gimp_display_shell_close_time_changed (box);
+}
+
+static gboolean
+gimp_display_shell_close_time_changed (GimpMessageBox *box)
+{
+  GimpImage   *image       = g_object_get_data (G_OBJECT (box), "gimp-image");
+  gint64       dirty_time  = gimp_image_get_dirty_time (image);
+  gchar       *time_text   = NULL;
+  gchar       *export_text = NULL;
+
+  if (dirty_time)
+    {
+      gint hours   = 0;
+      gint minutes = 0;
+
+      gimp_time_since (dirty_time, &hours, &minutes);
+
+      if (hours > 0)
+        {
+          if (hours > 1 || minutes == 0)
+            {
+              time_text =
+                g_strdup_printf (ngettext ("If you don't save the image, "
+                                           "changes from the last hour "
+                                           "will be lost.",
+                                           "If you don't save the image, "
+                                           "changes from the last %d "
+                                           "hours will be lost.",
+                                           hours), hours);
+            }
+          else
+            {
+              time_text =
+                g_strdup_printf (ngettext ("If you don't save the image, "
+                                           "changes from the last hour "
+                                           "and %d minute will be lost.",
+                                           "If you don't save the image, "
+                                           "changes from the last hour "
+                                           "and %d minutes will be lost.",
+                                           minutes), minutes);
+            }
+        }
+      else
+        {
+          time_text =
+            g_strdup_printf (ngettext ("If you don't save the image, "
+                                       "changes from the last minute "
+                                       "will be lost.",
+                                       "If you don't save the image, "
+                                       "changes from the last %d "
+                                       "minutes will be lost.",
+                                       minutes), minutes);
+        }
+    }
+
+  if (! gimp_image_is_export_dirty (image))
+    {
+      GFile *file;
+
+      file = gimp_image_get_exported_file (image);
+      if (! file)
+        file = gimp_image_get_imported_file (image);
+
+      export_text = g_strdup_printf (_("The image has been exported to '%s'."),
+                                     gimp_file_get_utf8_name (file));
+    }
+
+  if (time_text && export_text)
+    gimp_message_box_set_text (box, "%s\n\n%s", time_text, export_text);
+  else if (time_text || export_text)
+    gimp_message_box_set_text (box, "%s", time_text ? time_text : export_text);
+  else
+    gimp_message_box_set_text (box, "%s", time_text);
+
+  g_free (time_text);
+  g_free (export_text);
+
+  return TRUE;
+}
+
+static void
+gimp_display_shell_close_response (GtkWidget        *widget,
+                                   gint              response_id,
+                                   GimpDisplayShell *shell)
+{
+  gtk_widget_destroy (widget);
+
+  switch (response_id)
+    {
+    case GTK_RESPONSE_CLOSE:
+      gimp_display_close (shell->display);
+      break;
+
+    case RESPONSE_SAVE:
+      {
+        GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+        if (window)
+          {
+            GimpUIManager *manager = gimp_image_window_get_ui_manager (window);
+
+            gimp_image_window_set_active_shell (window, shell);
+
+            gimp_ui_manager_activate_action (manager,
+                                             "file", "file-save-and-close");
+          }
+      }
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gimp_display_shell_close_accel_marshal (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data)
+{
+  gtk_dialog_response (GTK_DIALOG (closure->data), GTK_RESPONSE_CLOSE);
+
+  /* we handled the accelerator */
+  g_value_set_boolean (return_value, TRUE);
+}
+
+static void
+gimp_time_since (gint64 then,
+                 gint  *hours,
+                 gint  *minutes)
+{
+  gint64 now  = time (NULL);
+  gint64 diff = 1 + now - then;
+
+  g_return_if_fail (now >= then);
+
+  /*  first round up to the nearest minute  */
+  diff = (diff + 59) / 60;
+
+  /*  then optionally round minutes to multiples of 5 or 10  */
+  if (diff > 50)
+    diff = ((diff + 8) / 10) * 10;
+  else if (diff > 20)
+    diff = ((diff + 3) / 5) * 5;
+
+  /*  determine full hours  */
+  if (diff >= 60)
+    {
+      *hours = diff / 60;
+      diff = (diff % 60);
+    }
+
+  /*  round up to full hours for 2 and more  */
+  if (*hours > 1 && diff > 0)
+    {
+      *hours += 1;
+      diff = 0;
+    }
+
+  *minutes = diff;
+}
diff --git a/app/display/gimpdisplayshell-close.h b/app/display/gimpdisplayshell-close.h
new file mode 100644
index 0000000..3d55650
--- /dev/null
+++ b/app/display/gimpdisplayshell-close.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_CLOSE_H__
+#define __GIMP_DISPLAY_SHELL_CLOSE_H__
+
+
+void   gimp_display_shell_close (GimpDisplayShell *shell,
+                                 gboolean          kill_it);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_CLOSE_H__ */
diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c
new file mode 100644
index 0000000..5a536d5
--- /dev/null
+++ b/app/display/gimpdisplayshell-cursor.c
@@ -0,0 +1,295 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimpimage.h"
+
+#include "widgets/gimpcursor.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimpsessioninfo.h"
+
+#include "gimpcanvascursor.h"
+#include "gimpdisplay.h"
+#include "gimpcursorview.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-cursor.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpstatusbar.h"
+
+
+static void  gimp_display_shell_real_set_cursor (GimpDisplayShell   *shell,
+                                                 GimpCursorType      cursor_type,
+                                                 GimpToolCursorType  tool_cursor,
+                                                 GimpCursorModifier  modifier,
+                                                 gboolean            always_install);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_set_cursor (GimpDisplayShell   *shell,
+                               GimpCursorType      cursor_type,
+                               GimpToolCursorType  tool_cursor,
+                               GimpCursorModifier  modifier)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->using_override_cursor)
+    {
+      gimp_display_shell_real_set_cursor (shell,
+                                          cursor_type,
+                                          tool_cursor,
+                                          modifier,
+                                          FALSE);
+    }
+}
+
+void
+gimp_display_shell_unset_cursor (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->using_override_cursor)
+    {
+      gimp_display_shell_real_set_cursor (shell,
+                                          (GimpCursorType) -1, 0, 0, FALSE);
+    }
+}
+
+void
+gimp_display_shell_set_override_cursor (GimpDisplayShell *shell,
+                                        GimpCursorType    cursor_type)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->using_override_cursor ||
+      (shell->using_override_cursor &&
+       shell->override_cursor != cursor_type))
+    {
+      shell->override_cursor       = cursor_type;
+      shell->using_override_cursor = TRUE;
+
+      gimp_cursor_set (shell->canvas,
+                       shell->cursor_handedness,
+                       cursor_type,
+                       GIMP_TOOL_CURSOR_NONE,
+                       GIMP_CURSOR_MODIFIER_NONE);
+    }
+}
+
+void
+gimp_display_shell_unset_override_cursor (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->using_override_cursor)
+    {
+      shell->using_override_cursor = FALSE;
+
+      gimp_display_shell_real_set_cursor (shell,
+                                          shell->current_cursor,
+                                          shell->tool_cursor,
+                                          shell->cursor_modifier,
+                                          TRUE);
+    }
+}
+
+void
+gimp_display_shell_update_software_cursor (GimpDisplayShell    *shell,
+                                           GimpCursorPrecision  precision,
+                                           gint                 display_x,
+                                           gint                 display_y,
+                                           gdouble              image_x,
+                                           gdouble              image_y)
+{
+  GimpImageWindow   *image_window;
+  GimpDialogFactory *factory;
+  GimpStatusbar     *statusbar;
+  GtkWidget         *widget;
+  GimpImage         *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  if (shell->draw_cursor &&
+      shell->proximity   &&
+      display_x >= 0     &&
+      display_y >= 0)
+    {
+      gimp_canvas_item_begin_change (shell->cursor);
+
+      gimp_canvas_cursor_set (shell->cursor,
+                              display_x,
+                              display_y);
+      gimp_canvas_item_set_visible (shell->cursor, TRUE);
+
+      gimp_canvas_item_end_change (shell->cursor);
+    }
+  else
+    {
+      gimp_canvas_item_set_visible (shell->cursor, FALSE);
+    }
+
+  /*  use the passed image_coords for the statusbar because they are
+   *  possibly snapped...
+   */
+  statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_statusbar_update_cursor (statusbar, precision, image_x, image_y);
+
+  image_window = gimp_display_shell_get_window (shell);
+  factory = gimp_dock_container_get_dialog_factory (GIMP_DOCK_CONTAINER (image_window));
+
+  widget = gimp_dialog_factory_find_widget (factory, "gimp-cursor-view");
+
+  if (widget)
+    {
+      GtkWidget *cursor_view = gtk_bin_get_child (GTK_BIN (widget));
+
+      if (cursor_view)
+        {
+          gint t_x = -1;
+          gint t_y = -1;
+
+          /*  ...but use the unsnapped display_coords for the info window  */
+          if (display_x >= 0 && display_y >= 0)
+            gimp_display_shell_untransform_xy (shell, display_x, display_y,
+                                               &t_x, &t_y, FALSE);
+
+          gimp_cursor_view_update_cursor (GIMP_CURSOR_VIEW (cursor_view),
+                                          image, shell->unit,
+                                          t_x, t_y);
+        }
+    }
+}
+
+void
+gimp_display_shell_clear_software_cursor (GimpDisplayShell *shell)
+{
+  GimpImageWindow   *image_window;
+  GimpDialogFactory *factory;
+  GimpStatusbar     *statusbar;
+  GtkWidget         *widget;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_canvas_item_set_visible (shell->cursor, FALSE);
+
+  statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_statusbar_clear_cursor (statusbar);
+
+  image_window = gimp_display_shell_get_window (shell);
+  factory = gimp_dock_container_get_dialog_factory (GIMP_DOCK_CONTAINER (image_window));
+
+  widget = gimp_dialog_factory_find_widget (factory, "gimp-cursor-view");
+
+  if (widget)
+    {
+      GtkWidget *cursor_view = gtk_bin_get_child (GTK_BIN (widget));
+
+      if (cursor_view)
+        gimp_cursor_view_clear_cursor (GIMP_CURSOR_VIEW (cursor_view));
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_real_set_cursor (GimpDisplayShell   *shell,
+                                    GimpCursorType      cursor_type,
+                                    GimpToolCursorType  tool_cursor,
+                                    GimpCursorModifier  modifier,
+                                    gboolean            always_install)
+{
+  GimpHandedness cursor_handedness;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (cursor_type == (GimpCursorType) -1)
+    {
+      shell->current_cursor = cursor_type;
+
+      if (gtk_widget_is_drawable (shell->canvas))
+        gdk_window_set_cursor (gtk_widget_get_window (shell->canvas), NULL);
+
+      return;
+    }
+
+  if (cursor_type != GIMP_CURSOR_NONE &&
+      cursor_type != GIMP_CURSOR_BAD)
+    {
+      switch (shell->display->config->cursor_mode)
+        {
+        case GIMP_CURSOR_MODE_TOOL_ICON:
+          break;
+
+        case GIMP_CURSOR_MODE_TOOL_CROSSHAIR:
+          if (cursor_type < GIMP_CURSOR_CORNER_TOP ||
+              cursor_type > GIMP_CURSOR_SIDE_TOP_LEFT)
+            {
+              /* the corner and side cursors count as crosshair, so leave
+               * them and override everything else
+               */
+              cursor_type = GIMP_CURSOR_CROSSHAIR_SMALL;
+            }
+          break;
+
+        case GIMP_CURSOR_MODE_CROSSHAIR:
+          cursor_type = GIMP_CURSOR_CROSSHAIR;
+          tool_cursor = GIMP_TOOL_CURSOR_NONE;
+
+          if (modifier != GIMP_CURSOR_MODIFIER_BAD)
+            {
+              /* the bad modifier is always shown */
+              modifier = GIMP_CURSOR_MODIFIER_NONE;
+            }
+          break;
+        }
+    }
+
+  cursor_type = gimp_cursor_rotate (cursor_type, shell->rotate_angle);
+
+  cursor_handedness = GIMP_GUI_CONFIG (shell->display->config)->cursor_handedness;
+
+  if (shell->cursor_handedness != cursor_handedness ||
+      shell->current_cursor    != cursor_type       ||
+      shell->tool_cursor       != tool_cursor       ||
+      shell->cursor_modifier   != modifier          ||
+      always_install)
+    {
+      shell->cursor_handedness = cursor_handedness;
+      shell->current_cursor    = cursor_type;
+      shell->tool_cursor       = tool_cursor;
+      shell->cursor_modifier   = modifier;
+
+      gimp_cursor_set (shell->canvas,
+                       cursor_handedness,
+                       cursor_type, tool_cursor, modifier);
+    }
+}
diff --git a/app/display/gimpdisplayshell-cursor.h b/app/display/gimpdisplayshell-cursor.h
new file mode 100644
index 0000000..8f434c6
--- /dev/null
+++ b/app/display/gimpdisplayshell-cursor.h
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_CURSOR_H__
+#define __GIMP_DISPLAY_SHELL_CURSOR_H__
+
+
+/*  functions dealing with the normal windowing system cursor  */
+
+void   gimp_display_shell_set_cursor             (GimpDisplayShell    *shell,
+                                                  GimpCursorType       cursor_type,
+                                                  GimpToolCursorType   tool_cursor,
+                                                  GimpCursorModifier   modifier);
+void   gimp_display_shell_unset_cursor           (GimpDisplayShell    *shell);
+void   gimp_display_shell_set_override_cursor    (GimpDisplayShell    *shell,
+                                                  GimpCursorType       cursor_type);
+void   gimp_display_shell_unset_override_cursor  (GimpDisplayShell    *shell);
+
+
+/*  functions dealing with the software cursor that is drawn to the
+ *  canvas by GIMP
+ */
+
+void   gimp_display_shell_update_software_cursor (GimpDisplayShell    *shell,
+                                                  GimpCursorPrecision  precision,
+                                                  gint                 display_x,
+                                                  gint                 display_y,
+                                                  gdouble              image_x,
+                                                  gdouble              image_y);
+void   gimp_display_shell_clear_software_cursor  (GimpDisplayShell    *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_CURSOR_H__ */
diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c
new file mode 100644
index 0000000..152ca45
--- /dev/null
+++ b/app/display/gimpdisplayshell-dnd.c
@@ -0,0 +1,770 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-edit.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpdrawable-edit.h"
+#include "core/gimpfilloptions.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-new.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-new.h"
+#include "core/gimplayermask.h"
+#include "core/gimppattern.h"
+#include "core/gimpprogress.h"
+
+#include "file/file-open.h"
+
+#include "text/gimptext.h"
+#include "text/gimptextlayer.h"
+
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-import.h"
+
+#include "widgets/gimpdnd.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-dnd.h"
+#include "gimpdisplayshell-transform.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_shell_drop_drawable  (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GimpViewable    *viewable,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_vectors   (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GimpViewable    *viewable,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_svg       (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 const guchar    *svg_data,
+                                                 gsize            svg_data_length,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_pattern   (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GimpViewable    *viewable,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_color     (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 const GimpRGB   *color,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_buffer    (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GimpViewable    *viewable,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_uri_list  (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GList           *uri_list,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_component (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GimpImage       *image,
+                                                 GimpChannelType  component,
+                                                 gpointer         data);
+static void   gimp_display_shell_drop_pixbuf    (GtkWidget       *widget,
+                                                 gint             x,
+                                                 gint             y,
+                                                 GdkPixbuf       *pixbuf,
+                                                 gpointer         data);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_dnd_init (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_LAYER,
+                               gimp_display_shell_drop_drawable,
+                               shell);
+  gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_LAYER_MASK,
+                               gimp_display_shell_drop_drawable,
+                               shell);
+  gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_CHANNEL,
+                               gimp_display_shell_drop_drawable,
+                               shell);
+  gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_VECTORS,
+                               gimp_display_shell_drop_vectors,
+                               shell);
+  gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_PATTERN,
+                               gimp_display_shell_drop_pattern,
+                               shell);
+  gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_BUFFER,
+                               gimp_display_shell_drop_buffer,
+                               shell);
+  gimp_dnd_color_dest_add     (shell->canvas,
+                               gimp_display_shell_drop_color,
+                               shell);
+  gimp_dnd_component_dest_add (shell->canvas,
+                               gimp_display_shell_drop_component,
+                               shell);
+  gimp_dnd_uri_list_dest_add  (shell->canvas,
+                               gimp_display_shell_drop_uri_list,
+                               shell);
+  gimp_dnd_svg_dest_add       (shell->canvas,
+                               gimp_display_shell_drop_svg,
+                               shell);
+  gimp_dnd_pixbuf_dest_add    (shell->canvas,
+                               gimp_display_shell_drop_pixbuf,
+                               shell);
+}
+
+
+/*  private functions  */
+
+/*
+ * Position the dropped item in the middle of the viewport.
+ */
+static void
+gimp_display_shell_dnd_position_item (GimpDisplayShell *shell,
+                                      GimpImage        *image,
+                                      GimpItem         *item)
+{
+  gint item_width  = gimp_item_get_width  (item);
+  gint item_height = gimp_item_get_height (item);
+  gint off_x, off_y;
+
+  if (item_width  >= gimp_image_get_width  (image) &&
+      item_height >= gimp_image_get_height (image))
+    {
+      off_x = (gimp_image_get_width  (image) - item_width)  / 2;
+      off_y = (gimp_image_get_height (image) - item_height) / 2;
+    }
+  else
+    {
+      gint x, y;
+      gint width, height;
+
+      gimp_display_shell_untransform_viewport (
+        shell,
+        ! gimp_display_shell_get_infinite_canvas (shell),
+        &x, &y, &width, &height);
+
+      off_x = x + (width  - item_width)  / 2;
+      off_y = y + (height - item_height) / 2;
+    }
+
+  gimp_item_translate (item,
+                       off_x - gimp_item_get_offset_x (item),
+                       off_y - gimp_item_get_offset_y (item),
+                       FALSE);
+}
+
+static void
+gimp_display_shell_dnd_flush (GimpDisplayShell *shell,
+                              GimpImage        *image)
+{
+  gimp_display_shell_present (shell);
+
+  gimp_image_flush (image);
+
+  gimp_context_set_display (gimp_get_user_context (shell->display->gimp),
+                            shell->display);
+}
+
+static void
+gimp_display_shell_drop_drawable (GtkWidget    *widget,
+                                  gint          x,
+                                  gint          y,
+                                  GimpViewable *viewable,
+                                  gpointer      data)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image     = gimp_display_get_image (shell->display);
+  GType             new_type;
+  GimpItem         *new_item;
+
+  GIMP_LOG (DND, NULL);
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! image)
+    {
+      image = gimp_image_new_from_drawable (shell->display->gimp,
+                                            GIMP_DRAWABLE (viewable));
+      gimp_create_display (shell->display->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (image);
+
+      return;
+    }
+
+  if (GIMP_IS_LAYER (viewable))
+    new_type = G_TYPE_FROM_INSTANCE (viewable);
+  else
+    new_type = GIMP_TYPE_LAYER;
+
+  new_item = gimp_item_convert (GIMP_ITEM (viewable), image, new_type);
+
+  if (new_item)
+    {
+      GimpLayer *new_layer = GIMP_LAYER (new_item);
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                                   _("Drop New Layer"));
+
+      gimp_display_shell_dnd_position_item (shell, image, new_item);
+
+      gimp_item_set_visible (new_item, TRUE, FALSE);
+      gimp_item_set_linked (new_item, FALSE, FALSE);
+
+      gimp_image_add_layer (image, new_layer,
+                            GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_display_shell_dnd_flush (shell, image);
+    }
+}
+
+static void
+gimp_display_shell_drop_vectors (GtkWidget    *widget,
+                                 gint          x,
+                                 gint          y,
+                                 GimpViewable *viewable,
+                                 gpointer      data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+  GimpItem         *new_item;
+
+  GIMP_LOG (DND, NULL);
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! image)
+    return;
+
+  new_item = gimp_item_convert (GIMP_ITEM (viewable),
+                                image, G_TYPE_FROM_INSTANCE (viewable));
+
+  if (new_item)
+    {
+      GimpVectors *new_vectors = GIMP_VECTORS (new_item);
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                                   _("Drop New Path"));
+
+      gimp_image_add_vectors (image, new_vectors,
+                              GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_display_shell_dnd_flush (shell, image);
+    }
+}
+
+static void
+gimp_display_shell_drop_svg (GtkWidget     *widget,
+                             gint           x,
+                             gint           y,
+                             const guchar  *svg_data,
+                             gsize          svg_data_len,
+                             gpointer       data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+  GError           *error  = NULL;
+
+  GIMP_LOG (DND, NULL);
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! image)
+    return;
+
+  if (! gimp_vectors_import_buffer (image,
+                                    (const gchar *) svg_data, svg_data_len,
+                                    TRUE, FALSE,
+                                    GIMP_IMAGE_ACTIVE_PARENT, -1,
+                                    NULL, &error))
+    {
+      gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
+                            GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gimp_display_shell_dnd_flush (shell, image);
+    }
+}
+
+static void
+gimp_display_shell_dnd_fill (GimpDisplayShell *shell,
+                             GimpFillOptions  *options,
+                             const gchar      *undo_desc)
+{
+  GimpImage    *image = gimp_display_get_image (shell->display);
+  GimpDrawable *drawable;
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! image)
+    return;
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    return;
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
+                            GIMP_MESSAGE_ERROR,
+                            _("Cannot modify the pixels of layer groups."));
+      return;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
+                            GIMP_MESSAGE_ERROR,
+                            _("The active layer's pixels are locked."));
+      return;
+    }
+
+  /* FIXME: there should be a virtual method for this that the
+   *        GimpTextLayer can override.
+   */
+  if (gimp_fill_options_get_style (options) == GIMP_FILL_STYLE_SOLID &&
+      gimp_item_is_text_layer (GIMP_ITEM (drawable)))
+    {
+      GimpRGB color;
+
+      gimp_context_get_foreground (GIMP_CONTEXT (options), &color);
+
+      gimp_text_layer_set (GIMP_TEXT_LAYER (drawable), NULL,
+                           "color", &color,
+                           NULL);
+    }
+  else
+    {
+      gimp_drawable_edit_fill (drawable, options, undo_desc);
+    }
+
+  gimp_display_shell_dnd_flush (shell, image);
+}
+
+static void
+gimp_display_shell_drop_pattern (GtkWidget    *widget,
+                                 gint          x,
+                                 gint          y,
+                                 GimpViewable *viewable,
+                                 gpointer      data)
+{
+  GimpDisplayShell *shell   = GIMP_DISPLAY_SHELL (data);
+  GimpFillOptions  *options = gimp_fill_options_new (shell->display->gimp,
+                                                     NULL, FALSE);
+
+  GIMP_LOG (DND, NULL);
+
+  gimp_fill_options_set_style (options, GIMP_FILL_STYLE_PATTERN);
+  gimp_context_set_pattern (GIMP_CONTEXT (options), GIMP_PATTERN (viewable));
+
+  gimp_display_shell_dnd_fill (shell, options,
+                               C_("undo-type", "Drop pattern to layer"));
+
+  g_object_unref (options);
+}
+
+static void
+gimp_display_shell_drop_color (GtkWidget     *widget,
+                               gint           x,
+                               gint           y,
+                               const GimpRGB *color,
+                               gpointer       data)
+{
+  GimpDisplayShell *shell   = GIMP_DISPLAY_SHELL (data);
+  GimpFillOptions  *options = gimp_fill_options_new (shell->display->gimp,
+                                                     NULL, FALSE);
+
+  GIMP_LOG (DND, NULL);
+
+  gimp_fill_options_set_style (options, GIMP_FILL_STYLE_SOLID);
+  gimp_context_set_foreground (GIMP_CONTEXT (options), color);
+
+  gimp_display_shell_dnd_fill (shell, options,
+                               C_("undo-type", "Drop color to layer"));
+
+  g_object_unref (options);
+}
+
+static void
+gimp_display_shell_drop_buffer (GtkWidget    *widget,
+                                gint          drop_x,
+                                gint          drop_y,
+                                GimpViewable *viewable,
+                                gpointer      data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+  GimpDrawable     *drawable;
+  GimpBuffer       *buffer;
+  GimpPasteType     paste_type;
+  gint              x, y, width, height;
+
+  GIMP_LOG (DND, NULL);
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! image)
+    {
+      image = gimp_image_new_from_buffer (shell->display->gimp,
+                                          GIMP_BUFFER (viewable));
+      gimp_create_display (image->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (image);
+
+      return;
+    }
+
+  paste_type = GIMP_PASTE_TYPE_FLOATING;
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (drawable)
+    {
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+        {
+          gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
+                                GIMP_MESSAGE_INFO,
+                                _("Pasted as new layer because the "
+                                  "target is a layer group."));
+
+          paste_type = GIMP_PASTE_TYPE_NEW_LAYER;
+        }
+      else if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+        {
+          gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
+                                GIMP_MESSAGE_ERROR,
+                                _("Pasted as new layer because the "
+                                  "target's pixels are locked."));
+
+          paste_type = GIMP_PASTE_TYPE_NEW_LAYER;
+        }
+    }
+
+  buffer = GIMP_BUFFER (viewable);
+
+  gimp_display_shell_untransform_viewport (
+    shell,
+    ! gimp_display_shell_get_infinite_canvas (shell),
+    &x, &y, &width, &height);
+
+  /* FIXME: popup a menu for selecting "Paste Into" */
+
+  gimp_edit_paste (image, drawable, GIMP_OBJECT (buffer),
+                   paste_type, x, y, width, height);
+
+  gimp_display_shell_dnd_flush (shell, image);
+}
+
+static void
+gimp_display_shell_drop_uri_list (GtkWidget *widget,
+                                  gint       x,
+                                  gint       y,
+                                  GList     *uri_list,
+                                  gpointer   data)
+{
+  GimpDisplayShell *shell   = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image;
+  GimpContext      *context;
+  GList            *list;
+  gboolean          open_as_layers;
+
+  /* If the app is already being torn down, shell->display might be
+   * NULL here.  Play it safe.
+   */
+  if (! shell->display)
+    return;
+
+  image = gimp_display_get_image (shell->display);
+  context = gimp_get_user_context (shell->display->gimp);
+
+  GIMP_LOG (DND, NULL);
+
+  open_as_layers = (image != NULL);
+
+  if (image)
+    g_object_ref (image);
+
+  for (list = uri_list; list; list = g_list_next (list))
+    {
+      GFile             *file  = g_file_new_for_uri (list->data);
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+      gboolean           warn  = FALSE;
+
+      if (! shell->display)
+        {
+          /* It seems as if GIMP is being torn down for quitting. Bail out. */
+          g_object_unref (file);
+          g_clear_object (&image);
+          return;
+        }
+
+      if (open_as_layers)
+        {
+          GList *new_layers;
+
+          new_layers = file_open_layers (shell->display->gimp, context,
+                                         GIMP_PROGRESS (shell->display),
+                                         image, FALSE,
+                                         file, GIMP_RUN_INTERACTIVE, NULL,
+                                         &status, &error);
+
+          if (new_layers)
+            {
+              gint x      = 0;
+              gint y      = 0;
+              gint width  = gimp_image_get_width  (image);
+              gint height = gimp_image_get_height (image);
+
+              if (gimp_display_get_image (shell->display))
+                {
+                  gimp_display_shell_untransform_viewport (
+                    shell,
+                    ! gimp_display_shell_get_infinite_canvas (shell),
+                    &x, &y, &width, &height);
+                }
+
+              gimp_image_add_layers (image, new_layers,
+                                     GIMP_IMAGE_ACTIVE_PARENT, -1,
+                                     x, y, width, height,
+                                     _("Drop layers"));
+
+              g_list_free (new_layers);
+            }
+          else if (status != GIMP_PDB_CANCEL)
+            {
+              warn = TRUE;
+            }
+        }
+      else if (gimp_display_get_image (shell->display))
+        {
+          /*  open any subsequent images in a new display  */
+          GimpImage *new_image;
+
+          new_image = file_open_with_display (shell->display->gimp, context,
+                                              NULL,
+                                              file, FALSE,
+                                              G_OBJECT (gtk_widget_get_screen (widget)),
+                                              gimp_widget_get_monitor (widget),
+                                              &status, &error);
+
+          if (! new_image && status != GIMP_PDB_CANCEL)
+            warn = TRUE;
+        }
+      else
+        {
+          /*  open the first image in the empty display  */
+          image = file_open_with_display (shell->display->gimp, context,
+                                          GIMP_PROGRESS (shell->display),
+                                          file, FALSE,
+                                          G_OBJECT (gtk_widget_get_screen (widget)),
+                                          gimp_widget_get_monitor (widget),
+                                          &status, &error);
+
+          if (image)
+            {
+              g_object_ref (image);
+            }
+          else if (status != GIMP_PDB_CANCEL)
+            {
+              warn = TRUE;
+            }
+        }
+
+      /* Something above might have run a few rounds of the main loop. Check
+       * that shell->display is still there, otherwise ignore this as the app
+       * is being torn down for quitting.
+       */
+      if (warn && shell->display)
+        {
+          gimp_message (shell->display->gimp, G_OBJECT (shell->display),
+                        GIMP_MESSAGE_ERROR,
+                        _("Opening '%s' failed:\n\n%s"),
+                        gimp_file_get_utf8_name (file), error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (file);
+    }
+
+  if (image)
+    gimp_display_shell_dnd_flush (shell, image);
+
+  g_clear_object (&image);
+}
+
+static void
+gimp_display_shell_drop_component (GtkWidget       *widget,
+                                   gint             x,
+                                   gint             y,
+                                   GimpImage       *image,
+                                   GimpChannelType  component,
+                                   gpointer         data)
+{
+  GimpDisplayShell *shell      = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *dest_image = gimp_display_get_image (shell->display);
+  GimpChannel      *channel;
+  GimpItem         *new_item;
+  const gchar      *desc;
+
+  GIMP_LOG (DND, NULL);
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! dest_image)
+    {
+      dest_image = gimp_image_new_from_component (image->gimp,
+                                                  image, component);
+      gimp_create_display (dest_image->gimp, dest_image, GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (dest_image);
+
+      return;
+    }
+
+  channel = gimp_channel_new_from_component (image, component, NULL, NULL);
+
+  new_item = gimp_item_convert (GIMP_ITEM (channel),
+                                dest_image, GIMP_TYPE_LAYER);
+  g_object_unref (channel);
+
+  if (new_item)
+    {
+      GimpLayer *new_layer = GIMP_LAYER (new_item);
+
+      gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
+                           NULL, NULL, &desc, NULL);
+      gimp_object_take_name (GIMP_OBJECT (new_layer),
+                             g_strdup_printf (_("%s Channel Copy"), desc));
+
+      gimp_image_undo_group_start (dest_image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                                   _("Drop New Layer"));
+
+      gimp_display_shell_dnd_position_item (shell, image, new_item);
+
+      gimp_image_add_layer (dest_image, new_layer,
+                            GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+      gimp_image_undo_group_end (dest_image);
+
+      gimp_display_shell_dnd_flush (shell, dest_image);
+    }
+}
+
+static void
+gimp_display_shell_drop_pixbuf (GtkWidget *widget,
+                                gint       x,
+                                gint       y,
+                                GdkPixbuf *pixbuf,
+                                gpointer   data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+  GimpLayer        *new_layer;
+  gboolean          has_alpha = FALSE;
+
+  GIMP_LOG (DND, NULL);
+
+  if (shell->display->gimp->busy)
+    return;
+
+  if (! image)
+    {
+      image = gimp_image_new_from_pixbuf (shell->display->gimp, pixbuf,
+                                          _("Dropped Buffer"));
+      gimp_create_display (image->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                           G_OBJECT (gtk_widget_get_screen (widget)),
+                           gimp_widget_get_monitor (widget));
+      g_object_unref (image);
+
+      return;
+    }
+
+  if (gdk_pixbuf_get_n_channels (pixbuf) == 2 ||
+      gdk_pixbuf_get_n_channels (pixbuf) == 4)
+    {
+      has_alpha = TRUE;
+    }
+
+  new_layer =
+    gimp_layer_new_from_pixbuf (pixbuf, image,
+                                gimp_image_get_layer_format (image, has_alpha),
+                                _("Dropped Buffer"),
+                                GIMP_OPACITY_OPAQUE,
+                                gimp_image_get_default_new_layer_mode (image));
+
+  if (new_layer)
+    {
+      GimpItem *new_item = GIMP_ITEM (new_layer);
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                                   _("Drop New Layer"));
+
+      gimp_display_shell_dnd_position_item (shell, image, new_item);
+
+      gimp_image_add_layer (image, new_layer,
+                            GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+      gimp_image_undo_group_end (image);
+
+      gimp_display_shell_dnd_flush (shell, image);
+    }
+}
diff --git a/app/display/gimpdisplayshell-dnd.h b/app/display/gimpdisplayshell-dnd.h
new file mode 100644
index 0000000..d1f6e99
--- /dev/null
+++ b/app/display/gimpdisplayshell-dnd.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_DND_H__
+#define __GIMP_DISPLAY_SHELL_DND_H__
+
+
+void   gimp_display_shell_dnd_init (GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_DND_H__ */
diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c
new file mode 100644
index 0000000..d6a63d5
--- /dev/null
+++ b/app/display/gimpdisplayshell-draw.c
@@ -0,0 +1,256 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp-cairo.h"
+#include "core/gimp-utils.h"
+#include "core/gimpimage.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvas-style.h"
+#include "gimpcanvaspath.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-draw.h"
+#include "gimpdisplayshell-render.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpdisplayxfer.h"
+
+#ifdef GDK_WINDOWING_QUARTZ
+#import <AppKit/AppKit.h>
+#endif
+
+/* #define GIMP_DISPLAY_RENDER_ENABLE_SCALING 1 */
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_draw_selection_out (GimpDisplayShell *shell,
+                                       cairo_t          *cr,
+                                       GimpSegment      *segs,
+                                       gint              n_segs)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (segs != NULL && n_segs > 0);
+
+  gimp_canvas_set_selection_out_style (shell->canvas, cr,
+                                       shell->offset_x, shell->offset_y);
+
+  gimp_cairo_segments (cr, segs, n_segs);
+  cairo_stroke (cr);
+}
+
+void
+gimp_display_shell_draw_selection_in (GimpDisplayShell   *shell,
+                                      cairo_t            *cr,
+                                      cairo_pattern_t    *mask,
+                                      gint                index)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (mask != NULL);
+
+  gimp_canvas_set_selection_in_style (shell->canvas, cr, index,
+                                      shell->offset_x, shell->offset_y);
+
+  cairo_mask (cr, mask);
+}
+
+void
+gimp_display_shell_draw_checkerboard (GimpDisplayShell *shell,
+                                      cairo_t          *cr)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (cr != NULL);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (G_UNLIKELY (! shell->checkerboard))
+    {
+      GimpCheckSize  check_size;
+      GimpCheckType  check_type;
+      guchar         check_light;
+      guchar         check_dark;
+      GimpRGB        light;
+      GimpRGB        dark;
+
+      g_object_get (shell->display->config,
+                    "transparency-size", &check_size,
+                    "transparency-type", &check_type,
+                    NULL);
+
+      gimp_checks_get_shades (check_type, &check_light, &check_dark);
+      gimp_rgb_set_uchar (&light, check_light, check_light, check_light);
+      gimp_rgb_set_uchar (&dark,  check_dark,  check_dark,  check_dark);
+
+      shell->checkerboard =
+        gimp_cairo_checkerboard_create (cr,
+                                        1 << (check_size + 2), &light, &dark);
+    }
+
+  cairo_translate (cr, - shell->offset_x, - shell->offset_y);
+
+  if (gimp_image_get_component_visible (image, GIMP_CHANNEL_ALPHA))
+    cairo_set_source (cr, shell->checkerboard);
+  else
+    cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+
+  cairo_paint (cr);
+}
+
+void
+gimp_display_shell_draw_image (GimpDisplayShell *shell,
+                               cairo_t          *cr,
+                               gint              x,
+                               gint              y,
+                               gint              w,
+                               gint              h)
+{
+  gdouble chunk_width;
+  gdouble chunk_height;
+  gdouble scale = 1.0;
+  gint    n_rows;
+  gint    n_cols;
+  gint    r, c;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (gimp_display_get_image (shell->display));
+  g_return_if_fail (cr != NULL);
+
+  /*  display the image in RENDER_BUF_WIDTH x RENDER_BUF_HEIGHT
+   *  maximally-sized image-space chunks.  adjust the screen-space
+   *  chunk size as necessary, to accommodate for the display
+   *  transform and window scale factor.
+   */
+  chunk_width  = GIMP_DISPLAY_RENDER_BUF_WIDTH;
+  chunk_height = GIMP_DISPLAY_RENDER_BUF_HEIGHT;
+
+#ifdef GIMP_DISPLAY_RENDER_ENABLE_SCALING
+  /* if we had this future API, things would look pretty on hires (retina) */
+  scale *=
+    gdk_window_get_scale_factor (
+      gtk_widget_get_window (gtk_widget_get_toplevel (GTK_WIDGET (shell))));
+#elif defined(GDK_WINDOWING_QUARTZ)
+  /* gtk2/osx retina support */
+  if ([
+      [NSScreen mainScreen]
+      respondsToSelector: @selector(backingScaleFactor)
+    ]) {
+    for (NSScreen * screen in [NSScreen screens]) {
+      float s = [screen backingScaleFactor];
+      if (s > scale) scale = s;
+    }
+  }
+#endif
+
+  scale  = MIN (scale, GIMP_DISPLAY_RENDER_MAX_SCALE);
+  scale *= MAX (shell->scale_x, shell->scale_y);
+
+  if (scale != shell->scale_x)
+    chunk_width  = (chunk_width  - 1.0) * (shell->scale_x / scale);
+  if (scale != shell->scale_y)
+    chunk_height = (chunk_height - 1.0) * (shell->scale_y / scale);
+
+  if (shell->rotate_untransform)
+    {
+      gdouble a = shell->rotate_angle * G_PI / 180.0;
+
+      chunk_width = chunk_height = (MIN (chunk_width, chunk_height) - 1.0) /
+                                   (fabs (sin (a)) + fabs (cos (a)));
+    }
+
+  /* divide the painted area to evenly-sized chunks */
+  n_rows = ceil (h / floor (chunk_height));
+  n_cols = ceil (w / floor (chunk_width));
+
+  for (r = 0; r < n_rows; r++)
+    {
+      gint y1 = y + (2 *  r      * h + n_rows) / (2 * n_rows);
+      gint y2 = y + (2 * (r + 1) * h + n_rows) / (2 * n_rows);
+
+      for (c = 0; c < n_cols; c++)
+        {
+          gint    x1 = x + (2 *  c      * w + n_cols) / (2 * n_cols);
+          gint    x2 = x + (2 * (c + 1) * w + n_cols) / (2 * n_cols);
+          gdouble ix1, iy1;
+          gdouble ix2, iy2;
+          gint    ix, iy;
+          gint    iw, ih;
+
+          /* map chunk from screen space to scaled image space */
+          gimp_display_shell_untransform_bounds_with_scale (
+            shell, scale,
+            x1,   y1,   x2,   y2,
+            &ix1, &iy1, &ix2, &iy2);
+
+          ix = floor (ix1);
+          iy = floor (iy1);
+          iw = ceil  (ix2) - ix;
+          ih = ceil  (iy2) - iy;
+
+          cairo_save (cr);
+
+          /* clip to chunk bounds, in screen space */
+          cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1);
+          cairo_clip (cr);
+
+          /* transform to scaled image space, and apply uneven scaling */
+          if (shell->rotate_transform)
+            cairo_transform (cr, shell->rotate_transform);
+          cairo_translate (cr, -shell->offset_x, -shell->offset_y);
+          cairo_scale (cr, shell->scale_x / scale, shell->scale_y / scale);
+
+          /* render image */
+          gimp_display_shell_render (shell, cr, ix, iy, iw, ih, scale);
+
+          cairo_restore (cr);
+
+          /* if the GIMP_BRICK_WALL environment variable is defined,
+           * show chunk bounds
+           */
+          {
+            static gint brick_wall = -1;
+
+            if (brick_wall < 0)
+              brick_wall = (g_getenv ("GIMP_BRICK_WALL") != NULL);
+
+            if (brick_wall)
+              {
+                cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+                cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1);
+                cairo_stroke (cr);
+              }
+          }
+        }
+    }
+}
diff --git a/app/display/gimpdisplayshell-draw.h b/app/display/gimpdisplayshell-draw.h
new file mode 100644
index 0000000..05dd2c1
--- /dev/null
+++ b/app/display/gimpdisplayshell-draw.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_DRAW_H__
+#define __GIMP_DISPLAY_SHELL_DRAW_H__
+
+
+void   gimp_display_shell_draw_selection_out (GimpDisplayShell   *shell,
+                                              cairo_t            *cr,
+                                              GimpSegment        *segs,
+                                              gint                n_segs);
+void   gimp_display_shell_draw_selection_in  (GimpDisplayShell   *shell,
+                                              cairo_t            *cr,
+                                              cairo_pattern_t    *mask,
+                                              gint                index);
+
+void   gimp_display_shell_draw_checkerboard  (GimpDisplayShell   *shell,
+                                              cairo_t            *cr);
+void   gimp_display_shell_draw_image         (GimpDisplayShell   *shell,
+                                              cairo_t            *cr,
+                                              gint                x,
+                                              gint                y,
+                                              gint                w,
+                                              gint                h);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_DRAW_H__ */
diff --git a/app/display/gimpdisplayshell-expose.c b/app/display/gimpdisplayshell-expose.c
new file mode 100644
index 0000000..2320a90
--- /dev/null
+++ b/app/display/gimpdisplayshell-expose.c
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+
+
+void
+gimp_display_shell_expose_area (GimpDisplayShell *shell,
+                                gint              x,
+                                gint              y,
+                                gint              w,
+                                gint              h)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gtk_widget_queue_draw_area (shell->canvas, x, y, w, h);
+}
+
+void
+gimp_display_shell_expose_region (GimpDisplayShell *shell,
+                                  cairo_region_t   *region)
+{
+  GdkWindow *window;
+  gint       n_rectangles;
+  gint       i;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (region != NULL);
+
+  if (! gtk_widget_get_realized (shell->canvas))
+    return;
+
+  window = gtk_widget_get_window (shell->canvas);
+  n_rectangles = cairo_region_num_rectangles (region);
+
+  for (i = 0; i < n_rectangles; i++)
+    {
+      cairo_rectangle_int_t rectangle;
+
+      cairo_region_get_rectangle (region, i, &rectangle);
+
+      gdk_window_invalidate_rect (window,
+                                  (GdkRectangle *) &rectangle,
+                                  TRUE);
+    }
+}
+
+void
+gimp_display_shell_expose_full (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gtk_widget_queue_draw (shell->canvas);
+}
diff --git a/app/display/gimpdisplayshell-expose.h b/app/display/gimpdisplayshell-expose.h
new file mode 100644
index 0000000..36d3519
--- /dev/null
+++ b/app/display/gimpdisplayshell-expose.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_EXPOSE_H__
+#define __GIMP_DISPLAY_SHELL_EXPOSE_H__
+
+
+void   gimp_display_shell_expose_area   (GimpDisplayShell   *shell,
+                                         gint                x,
+                                         gint                y,
+                                         gint                w,
+                                         gint                h);
+void   gimp_display_shell_expose_region (GimpDisplayShell   *shell,
+                                         cairo_region_t     *region);
+void   gimp_display_shell_expose_full   (GimpDisplayShell   *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_EXPOSE_H__ */
diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c
new file mode 100644
index 0000000..720529c
--- /dev/null
+++ b/app/display/gimpdisplayshell-filter-dialog.c
@@ -0,0 +1,151 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1999 Manish Singh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpviewable.h"
+
+#include "widgets/gimpcolordisplayeditor.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-filter.h"
+#include "gimpdisplayshell-filter-dialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  GimpDisplayShell      *shell;
+  GtkWidget             *dialog;
+
+  GimpColorDisplayStack *old_stack;
+} ColorDisplayDialog;
+
+
+/*  local function prototypes  */
+
+static void gimp_display_shell_filter_dialog_response (GtkWidget          *widget,
+                                                       gint                response_id,
+                                                       ColorDisplayDialog *cdd);
+
+static void gimp_display_shell_filter_dialog_free     (ColorDisplayDialog *cdd);
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
+{
+  GimpImage          *image;
+  ColorDisplayDialog *cdd;
+  GtkWidget          *editor;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  image = gimp_display_get_image (shell->display);
+
+  cdd = g_slice_new0 (ColorDisplayDialog);
+
+  cdd->shell  = shell;
+  cdd->dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
+                                          gimp_get_user_context (shell->display->gimp),
+                                          _("Color Display Filters"),
+                                          "gimp-display-filters",
+                                          GIMP_ICON_DISPLAY_FILTER,
+                                          _("Configure Color Display Filters"),
+                                          GTK_WIDGET (cdd->shell),
+                                          gimp_standard_help_func,
+                                          GIMP_HELP_DISPLAY_FILTER_DIALOG,
+
+                                          _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                          _("_OK"),     GTK_RESPONSE_OK,
+
+                                          NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (cdd->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (cdd->dialog), TRUE);
+
+  g_object_weak_ref (G_OBJECT (cdd->dialog),
+                     (GWeakNotify) gimp_display_shell_filter_dialog_free, cdd);
+
+  g_signal_connect (cdd->dialog, "response",
+                    G_CALLBACK (gimp_display_shell_filter_dialog_response),
+                    cdd);
+
+  if (shell->filter_stack)
+    {
+      cdd->old_stack = gimp_color_display_stack_clone (shell->filter_stack);
+
+      g_object_weak_ref (G_OBJECT (cdd->dialog),
+                         (GWeakNotify) g_object_unref, cdd->old_stack);
+    }
+  else
+    {
+      GimpColorDisplayStack *stack = gimp_color_display_stack_new ();
+
+      gimp_display_shell_filter_set (shell, stack);
+      g_object_unref (stack);
+    }
+
+  editor = gimp_color_display_editor_new (shell->display->gimp,
+                                          shell->filter_stack,
+                                          gimp_display_shell_get_color_config (shell),
+                                          GIMP_COLOR_MANAGED (shell));
+  gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (cdd->dialog))),
+                      editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+  return cdd->dialog;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_filter_dialog_response (GtkWidget          *widget,
+                                           gint                response_id,
+                                           ColorDisplayDialog *cdd)
+{
+  if (response_id != GTK_RESPONSE_OK)
+    gimp_display_shell_filter_set (cdd->shell, cdd->old_stack);
+
+  gtk_widget_destroy (GTK_WIDGET (cdd->dialog));
+}
+
+static void
+gimp_display_shell_filter_dialog_free (ColorDisplayDialog *cdd)
+{
+  g_slice_free (ColorDisplayDialog, cdd);
+}
diff --git a/app/display/gimpdisplayshell-filter-dialog.h b/app/display/gimpdisplayshell-filter-dialog.h
new file mode 100644
index 0000000..9f73a8b
--- /dev/null
+++ b/app/display/gimpdisplayshell-filter-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1999 Manish Singh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__
+#define __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__
+
+
+GtkWidget * gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__ */
diff --git a/app/display/gimpdisplayshell-filter.c b/app/display/gimpdisplayshell-filter.c
new file mode 100644
index 0000000..1cf60e8
--- /dev/null
+++ b/app/display/gimpdisplayshell-filter.c
@@ -0,0 +1,116 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1999 Manish Singh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-filter.h"
+#include "gimpdisplayshell-profile.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_shell_filter_changed (GimpColorDisplayStack *stack,
+                                                 GimpDisplayShell      *shell);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_filter_set (GimpDisplayShell      *shell,
+                               GimpColorDisplayStack *stack)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (stack == NULL || GIMP_IS_COLOR_DISPLAY_STACK (stack));
+
+  if (stack == shell->filter_stack)
+    return;
+
+  if (shell->filter_stack)
+    {
+      g_signal_handlers_disconnect_by_func (shell->filter_stack,
+                                            gimp_display_shell_filter_changed,
+                                            shell);
+    }
+
+  g_set_object (&shell->filter_stack, stack);
+
+  if (shell->filter_stack)
+    {
+      g_signal_connect (shell->filter_stack, "changed",
+                        G_CALLBACK (gimp_display_shell_filter_changed),
+                        shell);
+    }
+
+  gimp_display_shell_filter_changed (NULL, shell);
+}
+
+gboolean
+gimp_display_shell_has_filter (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  if (shell->filter_stack)
+    {
+      GList *iter;
+
+      for (iter = shell->filter_stack->filters; iter; iter = g_list_next (iter))
+        {
+          if (gimp_color_display_get_enabled (GIMP_COLOR_DISPLAY (iter->data)))
+            return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_display_shell_filter_changed_idle (gpointer data)
+{
+  GimpDisplayShell *shell = data;
+
+  gimp_display_shell_profile_update (shell);
+  gimp_display_shell_expose_full (shell);
+
+  shell->filter_idle_id = 0;
+
+  return FALSE;
+}
+
+static void
+gimp_display_shell_filter_changed (GimpColorDisplayStack *stack,
+                                   GimpDisplayShell      *shell)
+{
+  if (shell->filter_idle_id)
+    g_source_remove (shell->filter_idle_id);
+
+  shell->filter_idle_id =
+    g_idle_add_full (G_PRIORITY_LOW,
+                     gimp_display_shell_filter_changed_idle,
+                     shell, NULL);
+}
diff --git a/app/display/gimpdisplayshell-filter.h b/app/display/gimpdisplayshell-filter.h
new file mode 100644
index 0000000..7543a8b
--- /dev/null
+++ b/app/display/gimpdisplayshell-filter.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1999 Manish Singh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_FILTER_H__
+#define __GIMP_DISPLAY_SHELL_FILTER_H__
+
+
+void       gimp_display_shell_filter_set (GimpDisplayShell      *shell,
+                                          GimpColorDisplayStack *stack);
+
+gboolean   gimp_display_shell_has_filter (GimpDisplayShell      *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_FILTER_H__ */
diff --git a/app/display/gimpdisplayshell-grab.c b/app/display/gimpdisplayshell-grab.c
new file mode 100644
index 0000000..d3bb550
--- /dev/null
+++ b/app/display/gimpdisplayshell-grab.c
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdisplayshell-grab.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-grab.h"
+
+
+gboolean
+gimp_display_shell_pointer_grab (GimpDisplayShell *shell,
+                                 const GdkEvent   *event,
+                                 GdkEventMask      event_mask)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+  g_return_val_if_fail (shell->pointer_grabbed == FALSE, FALSE);
+
+  if (event)
+    {
+      GdkGrabStatus status;
+
+      status = gdk_pointer_grab (gtk_widget_get_window (shell->canvas),
+                                 FALSE, event_mask, NULL, NULL,
+                                 gdk_event_get_time (event));
+
+      if (status != GDK_GRAB_SUCCESS)
+        {
+          g_printerr ("%s: gdk_pointer_grab failed with status %d\n",
+                      G_STRFUNC, status);
+          return FALSE;
+        }
+
+      shell->pointer_grab_time = gdk_event_get_time (event);
+    }
+
+  gtk_grab_add (shell->canvas);
+
+  shell->pointer_grabbed = TRUE;
+
+  return TRUE;
+}
+
+void
+gimp_display_shell_pointer_ungrab (GimpDisplayShell *shell,
+                                   const GdkEvent   *event)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->pointer_grabbed == TRUE);
+
+  gtk_grab_remove (shell->canvas);
+
+  if (event)
+    {
+      gdk_display_pointer_ungrab (gtk_widget_get_display (shell->canvas),
+                                  shell->pointer_grab_time);
+
+      shell->pointer_grab_time = 0;
+    }
+
+  shell->pointer_grabbed = FALSE;
+}
+
+gboolean
+gimp_display_shell_keyboard_grab (GimpDisplayShell *shell,
+                                  const GdkEvent   *event)
+{
+  GdkGrabStatus status;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+  g_return_val_if_fail (shell->keyboard_grabbed == FALSE, FALSE);
+
+  status = gdk_keyboard_grab (gtk_widget_get_window (shell->canvas),
+                              FALSE,
+                              gdk_event_get_time (event));
+
+  if (status != GDK_GRAB_SUCCESS)
+    {
+      g_printerr ("%s: gdk_keyboard_grab failed with status %d\n",
+                  G_STRFUNC, status);
+      return FALSE;
+    }
+
+  shell->keyboard_grabbed   = TRUE;
+  shell->keyboard_grab_time = gdk_event_get_time (event);
+
+  return TRUE;
+}
+
+void
+gimp_display_shell_keyboard_ungrab (GimpDisplayShell *shell,
+                                    const GdkEvent   *event)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (event != NULL);
+  g_return_if_fail (shell->keyboard_grabbed == TRUE);
+
+  gdk_display_keyboard_ungrab (gtk_widget_get_display (shell->canvas),
+                               shell->keyboard_grab_time);
+
+  shell->keyboard_grabbed   = FALSE;
+  shell->keyboard_grab_time = 0;
+}
diff --git a/app/display/gimpdisplayshell-grab.h b/app/display/gimpdisplayshell-grab.h
new file mode 100644
index 0000000..915cf34
--- /dev/null
+++ b/app/display/gimpdisplayshell-grab.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdisplayshell-grab.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_GRAB_H__
+#define __GIMP_DISPLAY_SHELL_GRAB_H__
+
+
+gboolean   gimp_display_shell_pointer_grab    (GimpDisplayShell *shell,
+                                               const GdkEvent   *event,
+                                               GdkEventMask      event_mask);
+void       gimp_display_shell_pointer_ungrab  (GimpDisplayShell *shell,
+                                               const GdkEvent   *event);
+
+gboolean   gimp_display_shell_keyboard_grab   (GimpDisplayShell *shell,
+                                               const GdkEvent   *event);
+void       gimp_display_shell_keyboard_ungrab (GimpDisplayShell *shell,
+                                               const GdkEvent   *event);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_GRAB_H__ */
diff --git a/app/display/gimpdisplayshell-handlers.c b/app/display/gimpdisplayshell-handlers.c
new file mode 100644
index 0000000..7680467
--- /dev/null
+++ b/app/display/gimpdisplayshell-handlers.c
@@ -0,0 +1,1239 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayoptions.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-cairo.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-quick-mask.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpitem.h"
+#include "core/gimpitemstack.h"
+#include "core/gimpsamplepoint.h"
+#include "core/gimptreehandler.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvascanvasboundary.h"
+#include "gimpcanvasguide.h"
+#include "gimpcanvaslayerboundary.h"
+#include "gimpcanvaspath.h"
+#include "gimpcanvasproxygroup.h"
+#include "gimpcanvassamplepoint.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-callbacks.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-handlers.h"
+#include "gimpdisplayshell-icon.h"
+#include "gimpdisplayshell-profile.h"
+#include "gimpdisplayshell-rulers.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-selection.h"
+#include "gimpdisplayshell-title.h"
+#include "gimpimagewindow.h"
+#include "gimpstatusbar.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_shell_clean_dirty_handler        (GimpImage        *image,
+                                                             GimpDirtyMask     dirty_mask,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_undo_event_handler         (GimpImage        *image,
+                                                             GimpUndoEvent     event,
+                                                             GimpUndo         *undo,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_grid_notify_handler        (GimpGrid         *grid,
+                                                             GParamSpec       *pspec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_name_changed_handler       (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_selection_invalidate_handler
+                                                            (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_component_visibility_changed_handler
+                                                            (GimpImage        *image,
+                                                             GimpChannelType   channel,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_size_changed_detailed_handler
+                                                            (GimpImage        *image,
+                                                             gint              previous_origin_x,
+                                                             gint              previous_origin_y,
+                                                             gint              previous_width,
+                                                             gint              previous_height,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_resolution_changed_handler (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_quick_mask_changed_handler (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_guide_add_handler          (GimpImage        *image,
+                                                             GimpGuide        *guide,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_guide_remove_handler       (GimpImage        *image,
+                                                             GimpGuide        *guide,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_guide_move_handler         (GimpImage        *image,
+                                                             GimpGuide        *guide,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_sample_point_add_handler   (GimpImage        *image,
+                                                             GimpSamplePoint  *sample_point,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_sample_point_remove_handler(GimpImage        *image,
+                                                             GimpSamplePoint  *sample_point,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_sample_point_move_handler  (GimpImage        *image,
+                                                             GimpSamplePoint  *sample_point,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_invalidate_preview_handler (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_mode_changed_handler       (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_precision_changed_handler  (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_profile_changed_handler    (GimpColorManaged *image,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_saved_handler              (GimpImage        *image,
+                                                             GFile            *file,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_exported_handler           (GimpImage        *image,
+                                                             GFile            *file,
+                                                             GimpDisplayShell *shell);
+
+static void   gimp_display_shell_active_vectors_handler     (GimpImage        *image,
+                                                             GimpDisplayShell *shell);
+
+static void   gimp_display_shell_vectors_freeze_handler     (GimpVectors      *vectors,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_vectors_thaw_handler       (GimpVectors      *vectors,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_vectors_visible_handler    (GimpVectors      *vectors,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_vectors_add_handler        (GimpContainer    *container,
+                                                             GimpVectors      *vectors,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_vectors_remove_handler     (GimpContainer    *container,
+                                                             GimpVectors      *vectors,
+                                                             GimpDisplayShell *shell);
+
+static void   gimp_display_shell_check_notify_handler       (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_title_notify_handler       (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_nav_size_notify_handler    (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_monitor_res_notify_handler (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_padding_notify_handler     (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_ants_speed_notify_handler  (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void   gimp_display_shell_quality_notify_handler     (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void  gimp_display_shell_color_config_notify_handler (GObject          *config,
+                                                             GParamSpec       *param_spec,
+                                                             GimpDisplayShell *shell);
+static void  gimp_display_shell_display_changed_handler     (GimpContext      *context,
+                                                             GimpDisplay      *display,
+                                                             GimpDisplayShell *shell);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_connect (GimpDisplayShell *shell)
+{
+  GimpImage         *image;
+  GimpContainer     *vectors;
+  GimpDisplayConfig *config;
+  GimpColorConfig   *color_config;
+  GimpContext       *user_context;
+  GList             *list;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
+
+  image = gimp_display_get_image (shell->display);
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  vectors = gimp_image_get_vectors (image);
+
+  config       = shell->display->config;
+  color_config = GIMP_CORE_CONFIG (config)->color_management;
+
+  user_context = gimp_get_user_context (shell->display->gimp);
+
+  g_signal_connect (image, "clean",
+                    G_CALLBACK (gimp_display_shell_clean_dirty_handler),
+                    shell);
+  g_signal_connect (image, "dirty",
+                    G_CALLBACK (gimp_display_shell_clean_dirty_handler),
+                    shell);
+  g_signal_connect (image, "undo-event",
+                    G_CALLBACK (gimp_display_shell_undo_event_handler),
+                    shell);
+
+  g_signal_connect (gimp_image_get_grid (image), "notify",
+                    G_CALLBACK (gimp_display_shell_grid_notify_handler),
+                    shell);
+  g_object_set (shell->grid, "grid", gimp_image_get_grid (image), NULL);
+
+  g_signal_connect (image, "name-changed",
+                    G_CALLBACK (gimp_display_shell_name_changed_handler),
+                    shell);
+  g_signal_connect (image, "selection-invalidate",
+                    G_CALLBACK (gimp_display_shell_selection_invalidate_handler),
+                    shell);
+  g_signal_connect (image, "component-visibility-changed",
+                    G_CALLBACK (gimp_display_shell_component_visibility_changed_handler),
+                    shell);
+  g_signal_connect (image, "size-changed-detailed",
+                    G_CALLBACK (gimp_display_shell_size_changed_detailed_handler),
+                    shell);
+  g_signal_connect (image, "resolution-changed",
+                    G_CALLBACK (gimp_display_shell_resolution_changed_handler),
+                    shell);
+  g_signal_connect (image, "quick-mask-changed",
+                    G_CALLBACK (gimp_display_shell_quick_mask_changed_handler),
+                    shell);
+
+  g_signal_connect (image, "guide-added",
+                    G_CALLBACK (gimp_display_shell_guide_add_handler),
+                    shell);
+  g_signal_connect (image, "guide-removed",
+                    G_CALLBACK (gimp_display_shell_guide_remove_handler),
+                    shell);
+  g_signal_connect (image, "guide-moved",
+                    G_CALLBACK (gimp_display_shell_guide_move_handler),
+                    shell);
+  for (list = gimp_image_get_guides (image);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_display_shell_guide_add_handler (image, list->data, shell);
+    }
+
+  g_signal_connect (image, "sample-point-added",
+                    G_CALLBACK (gimp_display_shell_sample_point_add_handler),
+                    shell);
+  g_signal_connect (image, "sample-point-removed",
+                    G_CALLBACK (gimp_display_shell_sample_point_remove_handler),
+                    shell);
+  g_signal_connect (image, "sample-point-moved",
+                    G_CALLBACK (gimp_display_shell_sample_point_move_handler),
+                    shell);
+  for (list = gimp_image_get_sample_points (image);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_display_shell_sample_point_add_handler (image, list->data, shell);
+    }
+
+  g_signal_connect (image, "invalidate-preview",
+                    G_CALLBACK (gimp_display_shell_invalidate_preview_handler),
+                    shell);
+  g_signal_connect (image, "mode-changed",
+                    G_CALLBACK (gimp_display_shell_mode_changed_handler),
+                    shell);
+  g_signal_connect (image, "precision-changed",
+                    G_CALLBACK (gimp_display_shell_precision_changed_handler),
+                    shell);
+  g_signal_connect (image, "profile-changed",
+                    G_CALLBACK (gimp_display_shell_profile_changed_handler),
+                    shell);
+  g_signal_connect (image, "saved",
+                    G_CALLBACK (gimp_display_shell_saved_handler),
+                    shell);
+  g_signal_connect (image, "exported",
+                    G_CALLBACK (gimp_display_shell_exported_handler),
+                    shell);
+
+  g_signal_connect (image, "active-vectors-changed",
+                    G_CALLBACK (gimp_display_shell_active_vectors_handler),
+                    shell);
+
+  shell->vectors_freeze_handler =
+    gimp_tree_handler_connect (vectors, "freeze",
+                               G_CALLBACK (gimp_display_shell_vectors_freeze_handler),
+                               shell);
+  shell->vectors_thaw_handler =
+    gimp_tree_handler_connect (vectors, "thaw",
+                               G_CALLBACK (gimp_display_shell_vectors_thaw_handler),
+                               shell);
+  shell->vectors_visible_handler =
+    gimp_tree_handler_connect (vectors, "visibility-changed",
+                               G_CALLBACK (gimp_display_shell_vectors_visible_handler),
+                               shell);
+
+  g_signal_connect (vectors, "add",
+                    G_CALLBACK (gimp_display_shell_vectors_add_handler),
+                    shell);
+  g_signal_connect (vectors, "remove",
+                    G_CALLBACK (gimp_display_shell_vectors_remove_handler),
+                    shell);
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (vectors));
+       list;
+       list = g_list_next (list))
+    {
+      gimp_display_shell_vectors_add_handler (vectors, list->data, shell);
+    }
+
+  g_signal_connect (config,
+                    "notify::transparency-size",
+                    G_CALLBACK (gimp_display_shell_check_notify_handler),
+                    shell);
+  g_signal_connect (config,
+                    "notify::transparency-type",
+                    G_CALLBACK (gimp_display_shell_check_notify_handler),
+                    shell);
+
+  g_signal_connect (config,
+                    "notify::image-title-format",
+                    G_CALLBACK (gimp_display_shell_title_notify_handler),
+                    shell);
+  g_signal_connect (config,
+                    "notify::image-status-format",
+                    G_CALLBACK (gimp_display_shell_title_notify_handler),
+                    shell);
+  g_signal_connect (config,
+                    "notify::navigation-preview-size",
+                    G_CALLBACK (gimp_display_shell_nav_size_notify_handler),
+                    shell);
+  g_signal_connect (config,
+                    "notify::monitor-resolution-from-windowing-system",
+                    G_CALLBACK (gimp_display_shell_monitor_res_notify_handler),
+                    shell);
+  g_signal_connect (config,
+                    "notify::monitor-xresolution",
+                    G_CALLBACK (gimp_display_shell_monitor_res_notify_handler),
+                    shell);
+  g_signal_connect (config,
+                    "notify::monitor-yresolution",
+                    G_CALLBACK (gimp_display_shell_monitor_res_notify_handler),
+                    shell);
+
+  g_signal_connect (config->default_view,
+                    "notify::padding-mode",
+                    G_CALLBACK (gimp_display_shell_padding_notify_handler),
+                    shell);
+  g_signal_connect (config->default_view,
+                    "notify::padding-color",
+                    G_CALLBACK (gimp_display_shell_padding_notify_handler),
+                    shell);
+  g_signal_connect (config->default_fullscreen_view,
+                    "notify::padding-mode",
+                    G_CALLBACK (gimp_display_shell_padding_notify_handler),
+                    shell);
+  g_signal_connect (config->default_fullscreen_view,
+                    "notify::padding-color",
+                    G_CALLBACK (gimp_display_shell_padding_notify_handler),
+                    shell);
+
+  g_signal_connect (config,
+                    "notify::marching-ants-speed",
+                    G_CALLBACK (gimp_display_shell_ants_speed_notify_handler),
+                    shell);
+
+  g_signal_connect (config,
+                    "notify::zoom-quality",
+                    G_CALLBACK (gimp_display_shell_quality_notify_handler),
+                    shell);
+
+  g_signal_connect (color_config, "notify",
+                    G_CALLBACK (gimp_display_shell_color_config_notify_handler),
+                    shell);
+
+  g_signal_connect (user_context, "display-changed",
+                    G_CALLBACK (gimp_display_shell_display_changed_handler),
+                    shell);
+
+  gimp_display_shell_active_vectors_handler     (image, shell);
+  gimp_display_shell_invalidate_preview_handler (image, shell);
+  gimp_display_shell_quick_mask_changed_handler (image, shell);
+  gimp_display_shell_profile_changed_handler    (GIMP_COLOR_MANAGED (image),
+                                                 shell);
+  gimp_display_shell_color_config_notify_handler (G_OBJECT (color_config),
+                                                  NULL, /* sync all */
+                                                  shell);
+
+  gimp_canvas_layer_boundary_set_layer (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary),
+                                        gimp_image_get_active_layer (image));
+
+  gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary),
+                                         image);
+
+  if (shell->show_all)
+    {
+      gimp_image_inc_show_all_count (image);
+
+      gimp_image_flush (image);
+    }
+}
+
+void
+gimp_display_shell_disconnect (GimpDisplayShell *shell)
+{
+  GimpImage         *image;
+  GimpContainer     *vectors;
+  GimpDisplayConfig *config;
+  GimpColorConfig   *color_config;
+  GimpContext       *user_context;
+  GList             *list;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
+
+  image = gimp_display_get_image (shell->display);
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  vectors = gimp_image_get_vectors (image);
+
+  config       = shell->display->config;
+  color_config = GIMP_CORE_CONFIG (config)->color_management;
+
+  user_context = gimp_get_user_context (shell->display->gimp);
+
+  gimp_display_shell_icon_update_stop (shell);
+
+  gimp_canvas_layer_boundary_set_layer (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary),
+                                        NULL);
+
+  gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary),
+                                         NULL);
+
+  g_signal_handlers_disconnect_by_func (user_context,
+                                        gimp_display_shell_display_changed_handler,
+                                        shell);
+
+  g_signal_handlers_disconnect_by_func (color_config,
+                                        gimp_display_shell_color_config_notify_handler,
+                                        shell);
+  shell->color_config_set = FALSE;
+
+  g_signal_handlers_disconnect_by_func (config,
+                                        gimp_display_shell_quality_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config,
+                                        gimp_display_shell_ants_speed_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config->default_fullscreen_view,
+                                        gimp_display_shell_padding_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config->default_view,
+                                        gimp_display_shell_padding_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config,
+                                        gimp_display_shell_monitor_res_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config,
+                                        gimp_display_shell_nav_size_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config,
+                                        gimp_display_shell_title_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (config,
+                                        gimp_display_shell_check_notify_handler,
+                                        shell);
+
+  g_signal_handlers_disconnect_by_func (vectors,
+                                        gimp_display_shell_vectors_remove_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (vectors,
+                                        gimp_display_shell_vectors_add_handler,
+                                        shell);
+
+  gimp_tree_handler_disconnect (shell->vectors_visible_handler);
+  shell->vectors_visible_handler = NULL;
+
+  gimp_tree_handler_disconnect (shell->vectors_thaw_handler);
+  shell->vectors_thaw_handler = NULL;
+
+  gimp_tree_handler_disconnect (shell->vectors_freeze_handler);
+  shell->vectors_freeze_handler = NULL;
+
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_active_vectors_handler,
+                                        shell);
+
+  for (list = gimp_item_stack_get_item_iter (GIMP_ITEM_STACK (vectors));
+       list;
+       list = g_list_next (list))
+    {
+      gimp_canvas_proxy_group_remove_item (GIMP_CANVAS_PROXY_GROUP (shell->vectors),
+                                           list->data);
+    }
+
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_exported_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_saved_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_profile_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_precision_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_mode_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_invalidate_preview_handler,
+                                        shell);
+
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_guide_add_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_guide_remove_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_guide_move_handler,
+                                        shell);
+  for (list = gimp_image_get_guides (image);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_canvas_proxy_group_remove_item (GIMP_CANVAS_PROXY_GROUP (shell->guides),
+                                           list->data);
+    }
+
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_sample_point_add_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_sample_point_remove_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_sample_point_move_handler,
+                                        shell);
+  for (list = gimp_image_get_sample_points (image);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_canvas_proxy_group_remove_item (GIMP_CANVAS_PROXY_GROUP (shell->sample_points),
+                                           list->data);
+    }
+
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_quick_mask_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_resolution_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_component_visibility_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_size_changed_detailed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_selection_invalidate_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_name_changed_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (gimp_image_get_grid (image),
+                                        gimp_display_shell_grid_notify_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_undo_event_handler,
+                                        shell);
+  g_signal_handlers_disconnect_by_func (image,
+                                        gimp_display_shell_clean_dirty_handler,
+                                        shell);
+
+  if (shell->show_all)
+    {
+      gimp_image_dec_show_all_count (image);
+
+      gimp_image_flush (image);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_clean_dirty_handler (GimpImage        *image,
+                                        GimpDirtyMask     dirty_mask,
+                                        GimpDisplayShell *shell)
+{
+  gimp_display_shell_title_update (shell);
+}
+
+static void
+gimp_display_shell_undo_event_handler (GimpImage        *image,
+                                       GimpUndoEvent     event,
+                                       GimpUndo         *undo,
+                                       GimpDisplayShell *shell)
+{
+  gimp_display_shell_title_update (shell);
+}
+
+static void
+gimp_display_shell_grid_notify_handler (GimpGrid         *grid,
+                                        GParamSpec       *pspec,
+                                        GimpDisplayShell *shell)
+{
+  g_object_set (shell->grid, "grid", grid, NULL);
+}
+
+static void
+gimp_display_shell_name_changed_handler (GimpImage        *image,
+                                         GimpDisplayShell *shell)
+{
+  gimp_display_shell_title_update (shell);
+}
+
+static void
+gimp_display_shell_selection_invalidate_handler (GimpImage        *image,
+                                                 GimpDisplayShell *shell)
+{
+  gimp_display_shell_selection_undraw (shell);
+}
+
+static void
+gimp_display_shell_resolution_changed_handler (GimpImage        *image,
+                                               GimpDisplayShell *shell)
+{
+  gimp_display_shell_scale_update (shell);
+
+  if (shell->dot_for_dot)
+    {
+      if (shell->unit != GIMP_UNIT_PIXEL)
+        {
+          gimp_display_shell_rulers_update (shell);
+        }
+
+      gimp_display_shell_scaled (shell);
+    }
+  else
+    {
+      /* A resolution change has the same effect as a size change from
+       * a display shell point of view. Force a redraw of the display
+       * so that we don't get any display garbage.
+       */
+
+      GimpDisplayConfig *config = shell->display->config;
+      gboolean           resize_window;
+
+      /* Resize windows only in multi-window mode */
+      resize_window = (config->resize_windows_on_resize &&
+                       ! GIMP_GUI_CONFIG (config)->single_window_mode);
+
+      gimp_display_shell_scale_resize (shell, resize_window, FALSE);
+    }
+}
+
+static void
+gimp_display_shell_quick_mask_changed_handler (GimpImage        *image,
+                                               GimpDisplayShell *shell)
+{
+  GtkImage *gtk_image;
+  gboolean  quick_mask_state;
+
+  gtk_image = GTK_IMAGE (gtk_bin_get_child (GTK_BIN (shell->quick_mask_button)));
+
+  g_signal_handlers_block_by_func (shell->quick_mask_button,
+                                   gimp_display_shell_quick_mask_toggled,
+                                   shell);
+
+  quick_mask_state = gimp_image_get_quick_mask_state (image);
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (shell->quick_mask_button),
+                                quick_mask_state);
+
+  if (quick_mask_state)
+    gtk_image_set_from_icon_name (gtk_image, GIMP_ICON_QUICK_MASK_ON,
+                                  GTK_ICON_SIZE_MENU);
+  else
+    gtk_image_set_from_icon_name (gtk_image, GIMP_ICON_QUICK_MASK_OFF,
+                                  GTK_ICON_SIZE_MENU);
+
+  g_signal_handlers_unblock_by_func (shell->quick_mask_button,
+                                     gimp_display_shell_quick_mask_toggled,
+                                     shell);
+}
+
+static void
+gimp_display_shell_guide_add_handler (GimpImage        *image,
+                                      GimpGuide        *guide,
+                                      GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->guides);
+  GimpCanvasItem       *item;
+  GimpGuideStyle        style;
+
+  style = gimp_guide_get_style (guide);
+  item = gimp_canvas_guide_new (shell,
+                                gimp_guide_get_orientation (guide),
+                                gimp_guide_get_position (guide),
+                                style);
+
+  gimp_canvas_proxy_group_add_item (group, guide, item);
+  g_object_unref (item);
+}
+
+static void
+gimp_display_shell_guide_remove_handler (GimpImage        *image,
+                                         GimpGuide        *guide,
+                                         GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->guides);
+
+  gimp_canvas_proxy_group_remove_item (group, guide);
+}
+
+static void
+gimp_display_shell_guide_move_handler (GimpImage        *image,
+                                       GimpGuide        *guide,
+                                       GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->guides);
+  GimpCanvasItem       *item;
+
+  item = gimp_canvas_proxy_group_get_item (group, guide);
+
+  gimp_canvas_guide_set (item,
+                         gimp_guide_get_orientation (guide),
+                         gimp_guide_get_position (guide));
+}
+
+static void
+gimp_display_shell_sample_point_add_handler (GimpImage        *image,
+                                             GimpSamplePoint  *sample_point,
+                                             GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->sample_points);
+  GimpCanvasItem       *item;
+  GList                *list;
+  gint                  x;
+  gint                  y;
+  gint                  i;
+
+  gimp_sample_point_get_position (sample_point, &x, &y);
+
+  item = gimp_canvas_sample_point_new (shell, x, y, 0, TRUE);
+
+  gimp_canvas_proxy_group_add_item (group, sample_point, item);
+  g_object_unref (item);
+
+  for (list = gimp_image_get_sample_points (image), i = 1;
+       list;
+       list = g_list_next (list), i++)
+    {
+      GimpSamplePoint *sample_point = list->data;
+
+      item = gimp_canvas_proxy_group_get_item (group, sample_point);
+
+      if (item)
+        g_object_set (item,
+                      "index", i,
+                      NULL);
+    }
+}
+
+static void
+gimp_display_shell_sample_point_remove_handler (GimpImage        *image,
+                                                GimpSamplePoint  *sample_point,
+                                                GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->sample_points);
+  GList                *list;
+  gint                  i;
+
+  gimp_canvas_proxy_group_remove_item (group, sample_point);
+
+  for (list = gimp_image_get_sample_points (image), i = 1;
+       list;
+       list = g_list_next (list), i++)
+    {
+      GimpSamplePoint *sample_point = list->data;
+      GimpCanvasItem  *item;
+
+      item = gimp_canvas_proxy_group_get_item (group, sample_point);
+
+      if (item)
+        g_object_set (item,
+                      "index", i,
+                      NULL);
+    }
+}
+
+static void
+gimp_display_shell_sample_point_move_handler (GimpImage        *image,
+                                              GimpSamplePoint  *sample_point,
+                                              GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->sample_points);
+  GimpCanvasItem       *item;
+  gint                  x;
+  gint                  y;
+
+  item = gimp_canvas_proxy_group_get_item (group, sample_point);
+
+  gimp_sample_point_get_position (sample_point, &x, &y);
+
+  gimp_canvas_sample_point_set (item, x, y);
+}
+
+static void
+gimp_display_shell_component_visibility_changed_handler (GimpImage        *image,
+                                                         GimpChannelType   channel,
+                                                         GimpDisplayShell *shell)
+{
+  if (channel == GIMP_CHANNEL_ALPHA && shell->show_all)
+    gimp_display_shell_expose_full (shell);
+}
+
+static void
+gimp_display_shell_size_changed_detailed_handler (GimpImage        *image,
+                                                  gint              previous_origin_x,
+                                                  gint              previous_origin_y,
+                                                  gint              previous_width,
+                                                  gint              previous_height,
+                                                  GimpDisplayShell *shell)
+{
+  GimpDisplayConfig *config = shell->display->config;
+  gboolean           resize_window;
+
+  /* Resize windows only in multi-window mode */
+  resize_window = (config->resize_windows_on_resize &&
+                   ! GIMP_GUI_CONFIG (config)->single_window_mode);
+
+  if (resize_window)
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      if (window && gimp_image_window_get_active_shell (window) == shell)
+        {
+          /* If the window is resized just center the image in it when it
+           * has change size
+           */
+          gimp_image_window_shrink_wrap (window, FALSE);
+        }
+    }
+  else
+    {
+      GimpImage *image      = gimp_display_get_image (shell->display);
+      gint       new_width  = gimp_image_get_width  (image);
+      gint       new_height = gimp_image_get_height (image);
+      gint       scaled_previous_origin_x;
+      gint       scaled_previous_origin_y;
+      gboolean   horizontally;
+      gboolean   vertically;
+
+      scaled_previous_origin_x = SCALEX (shell, previous_origin_x);
+      scaled_previous_origin_y = SCALEY (shell, previous_origin_y);
+
+      horizontally = (SCALEX (shell, previous_width)  >  shell->disp_width  &&
+                      SCALEX (shell, new_width)       <= shell->disp_width);
+      vertically   = (SCALEY (shell, previous_height) >  shell->disp_height &&
+                      SCALEY (shell, new_height)      <= shell->disp_height);
+
+      gimp_display_shell_scroll_set_offset (shell,
+                                            shell->offset_x + scaled_previous_origin_x,
+                                            shell->offset_y + scaled_previous_origin_y);
+
+      if (! gimp_display_shell_get_infinite_canvas (shell))
+        {
+          gimp_display_shell_scroll_center_image (shell,
+                                                  horizontally, vertically);
+        }
+
+      /* The above calls might not lead to a call to
+       * gimp_display_shell_scroll_clamp_and_update() and
+       * gimp_display_shell_expose_full() in all cases because when
+       * scaling the old and new scroll offset might be the same.
+       *
+       * We need them to be called in all cases, so simply call them
+       * explicitly here at the end
+       */
+      gimp_display_shell_scroll_clamp_and_update (shell);
+
+      gimp_display_shell_expose_full (shell);
+    }
+}
+
+static void
+gimp_display_shell_invalidate_preview_handler (GimpImage        *image,
+                                               GimpDisplayShell *shell)
+{
+  gimp_display_shell_icon_update (shell);
+}
+
+static void
+gimp_display_shell_mode_changed_handler (GimpImage        *image,
+                                         GimpDisplayShell *shell)
+{
+  gimp_display_shell_profile_update (shell);
+}
+
+static void
+gimp_display_shell_precision_changed_handler (GimpImage        *image,
+                                              GimpDisplayShell *shell)
+{
+  gimp_display_shell_profile_update (shell);
+}
+
+static void
+gimp_display_shell_profile_changed_handler (GimpColorManaged *image,
+                                            GimpDisplayShell *shell)
+{
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (shell));
+}
+
+static void
+gimp_display_shell_saved_handler (GimpImage        *image,
+                                  GFile            *file,
+                                  GimpDisplayShell *shell)
+{
+  GimpStatusbar *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
+                            GIMP_ICON_DOCUMENT_SAVE,
+                            _("Image saved to '%s'"),
+                            gimp_file_get_utf8_name (file));
+}
+
+static void
+gimp_display_shell_exported_handler (GimpImage        *image,
+                                     GFile            *file,
+                                     GimpDisplayShell *shell)
+{
+  GimpStatusbar *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
+                            GIMP_ICON_DOCUMENT_SAVE,
+                            _("Image exported to '%s'"),
+                            gimp_file_get_utf8_name (file));
+}
+
+static void
+gimp_display_shell_active_vectors_handler (GimpImage        *image,
+                                           GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group  = GIMP_CANVAS_PROXY_GROUP (shell->vectors);
+  GimpVectors          *active = gimp_image_get_active_vectors (image);
+  GList                *list;
+
+  for (list = gimp_image_get_vectors_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpVectors    *vectors = list->data;
+      GimpCanvasItem *item;
+
+      item = gimp_canvas_proxy_group_get_item (group, vectors);
+
+      gimp_canvas_item_set_highlight (item, vectors == active);
+    }
+}
+
+static void
+gimp_display_shell_vectors_freeze_handler (GimpVectors      *vectors,
+                                           GimpDisplayShell *shell)
+{
+  /* do nothing */
+}
+
+static void
+gimp_display_shell_vectors_thaw_handler (GimpVectors      *vectors,
+                                         GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->vectors);
+  GimpCanvasItem       *item;
+
+  item = gimp_canvas_proxy_group_get_item (group, vectors);
+
+  gimp_canvas_path_set (item, gimp_vectors_get_bezier (vectors));
+}
+
+static void
+gimp_display_shell_vectors_visible_handler (GimpVectors      *vectors,
+                                            GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->vectors);
+  GimpCanvasItem       *item;
+
+  item = gimp_canvas_proxy_group_get_item (group, vectors);
+
+  gimp_canvas_item_set_visible (item,
+                                gimp_item_get_visible (GIMP_ITEM (vectors)));
+}
+
+static void
+gimp_display_shell_vectors_add_handler (GimpContainer    *container,
+                                        GimpVectors      *vectors,
+                                        GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->vectors);
+  GimpCanvasItem       *item;
+
+  item = gimp_canvas_path_new (shell,
+                               gimp_vectors_get_bezier (vectors),
+                               0, 0,
+                               FALSE,
+                               GIMP_PATH_STYLE_VECTORS);
+  gimp_canvas_item_set_visible (item,
+                                gimp_item_get_visible (GIMP_ITEM (vectors)));
+
+  gimp_canvas_proxy_group_add_item (group, vectors, item);
+  g_object_unref (item);
+}
+
+static void
+gimp_display_shell_vectors_remove_handler (GimpContainer    *container,
+                                           GimpVectors      *vectors,
+                                           GimpDisplayShell *shell)
+{
+  GimpCanvasProxyGroup *group = GIMP_CANVAS_PROXY_GROUP (shell->vectors);
+
+  gimp_canvas_proxy_group_remove_item (group, vectors);
+}
+
+static void
+gimp_display_shell_check_notify_handler (GObject          *config,
+                                         GParamSpec       *param_spec,
+                                         GimpDisplayShell *shell)
+{
+  GimpCanvasPaddingMode padding_mode;
+  GimpRGB               padding_color;
+
+  g_clear_pointer (&shell->checkerboard, cairo_pattern_destroy);
+
+  gimp_display_shell_get_padding (shell, &padding_mode, &padding_color);
+
+  switch (padding_mode)
+    {
+    case GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK:
+    case GIMP_CANVAS_PADDING_MODE_DARK_CHECK:
+      gimp_display_shell_set_padding (shell, padding_mode, &padding_color);
+      break;
+
+    default:
+      break;
+    }
+
+  gimp_display_shell_expose_full (shell);
+}
+
+static void
+gimp_display_shell_title_notify_handler (GObject          *config,
+                                         GParamSpec       *param_spec,
+                                         GimpDisplayShell *shell)
+{
+  gimp_display_shell_title_update (shell);
+}
+
+static void
+gimp_display_shell_nav_size_notify_handler (GObject          *config,
+                                            GParamSpec       *param_spec,
+                                            GimpDisplayShell *shell)
+{
+  g_clear_pointer (&shell->nav_popup, gtk_widget_destroy);
+}
+
+static void
+gimp_display_shell_monitor_res_notify_handler (GObject          *config,
+                                               GParamSpec       *param_spec,
+                                               GimpDisplayShell *shell)
+{
+  if (GIMP_DISPLAY_CONFIG (config)->monitor_res_from_gdk)
+    {
+      gimp_get_monitor_resolution (gtk_widget_get_screen (GTK_WIDGET (shell)),
+                                   gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                                   &shell->monitor_xres,
+                                   &shell->monitor_yres);
+    }
+  else
+    {
+      shell->monitor_xres = GIMP_DISPLAY_CONFIG (config)->monitor_xres;
+      shell->monitor_yres = GIMP_DISPLAY_CONFIG (config)->monitor_yres;
+    }
+
+  gimp_display_shell_scale_update (shell);
+
+  if (! shell->dot_for_dot)
+    {
+      gimp_display_shell_scroll_clamp_and_update (shell);
+
+      gimp_display_shell_scaled (shell);
+
+      gimp_display_shell_expose_full (shell);
+    }
+}
+
+static void
+gimp_display_shell_padding_notify_handler (GObject          *config,
+                                           GParamSpec       *param_spec,
+                                           GimpDisplayShell *shell)
+{
+  GimpDisplayConfig     *display_config;
+  GimpImageWindow       *window;
+  gboolean               fullscreen;
+  GimpCanvasPaddingMode  padding_mode;
+  GimpRGB                padding_color;
+
+  display_config = shell->display->config;
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (window)
+    fullscreen = gimp_image_window_get_fullscreen (window);
+  else
+    fullscreen = FALSE;
+
+  /*  if the user did not set the padding mode for this display explicitly  */
+  if (! shell->fullscreen_options->padding_mode_set)
+    {
+      padding_mode  = display_config->default_fullscreen_view->padding_mode;
+      padding_color = display_config->default_fullscreen_view->padding_color;
+
+      if (fullscreen)
+        {
+          gimp_display_shell_set_padding (shell, padding_mode, &padding_color);
+        }
+      else
+        {
+          shell->fullscreen_options->padding_mode  = padding_mode;
+          shell->fullscreen_options->padding_color = padding_color;
+        }
+    }
+
+  /*  if the user did not set the padding mode for this display explicitly  */
+  if (! shell->options->padding_mode_set)
+    {
+      padding_mode  = display_config->default_view->padding_mode;
+      padding_color = display_config->default_view->padding_color;
+
+      if (fullscreen)
+        {
+          shell->options->padding_mode  = padding_mode;
+          shell->options->padding_color = padding_color;
+        }
+      else
+        {
+          gimp_display_shell_set_padding (shell, padding_mode, &padding_color);
+        }
+    }
+}
+
+static void
+gimp_display_shell_ants_speed_notify_handler (GObject          *config,
+                                              GParamSpec       *param_spec,
+                                              GimpDisplayShell *shell)
+{
+  gimp_display_shell_selection_pause (shell);
+  gimp_display_shell_selection_resume (shell);
+}
+
+static void
+gimp_display_shell_quality_notify_handler (GObject          *config,
+                                           GParamSpec       *param_spec,
+                                           GimpDisplayShell *shell)
+{
+  gimp_display_shell_expose_full (shell);
+}
+
+static void
+gimp_display_shell_color_config_notify_handler (GObject          *config,
+                                                GParamSpec       *param_spec,
+                                                GimpDisplayShell *shell)
+{
+  if (param_spec)
+    {
+      gboolean copy = TRUE;
+
+      if (! strcmp (param_spec->name, "mode")                                 ||
+          ! strcmp (param_spec->name, "display-rendering-intent")             ||
+          ! strcmp (param_spec->name, "display-use-black-point-compensation") ||
+          ! strcmp (param_spec->name, "printer-profile")                      ||
+          ! strcmp (param_spec->name, "simulation-rendering-intent")          ||
+          ! strcmp (param_spec->name, "simulation-use-black-point-compensation") ||
+          ! strcmp (param_spec->name, "simulation-gamut-check"))
+        {
+          if (shell->color_config_set)
+            copy = FALSE;
+        }
+
+      if (copy)
+        {
+          GValue value = G_VALUE_INIT;
+
+          g_value_init (&value, param_spec->value_type);
+
+          g_object_get_property (config,
+                                 param_spec->name, &value);
+          g_object_set_property (G_OBJECT (shell->color_config),
+                                 param_spec->name, &value);
+
+          g_value_unset (&value);
+        }
+    }
+  else
+    {
+      gimp_config_copy (GIMP_CONFIG (config),
+                        GIMP_CONFIG (shell->color_config),
+                        0);
+      shell->color_config_set = FALSE;
+    }
+}
+
+static void
+gimp_display_shell_display_changed_handler (GimpContext      *context,
+                                            GimpDisplay      *display,
+                                            GimpDisplayShell *shell)
+{
+  if (shell->display == display)
+    gimp_display_shell_update_priority_rect (shell);
+}
diff --git a/app/display/gimpdisplayshell-handlers.h b/app/display/gimpdisplayshell-handlers.h
new file mode 100644
index 0000000..49d743e
--- /dev/null
+++ b/app/display/gimpdisplayshell-handlers.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_HANDLERS_H__
+#define __GIMP_DISPLAY_SHELL_HANDLERS_H__
+
+
+void   gimp_display_shell_connect    (GimpDisplayShell *shell);
+void   gimp_display_shell_disconnect (GimpDisplayShell *shell);
+
+
+#endif /*  __GIMP_DISPLAY_SHELL_HANDLERS_H__  */
diff --git a/app/display/gimpdisplayshell-icon.c b/app/display/gimpdisplayshell-icon.c
new file mode 100644
index 0000000..6168820
--- /dev/null
+++ b/app/display/gimpdisplayshell-icon.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-icon.h"
+
+
+#define GIMP_DISPLAY_UPDATE_ICON_TIMEOUT  1000
+
+static gboolean   gimp_display_shell_icon_update_idle (gpointer data);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_icon_update (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_icon_update_stop (shell);
+
+  if (gimp_display_get_image (shell->display))
+    shell->icon_idle_id = g_timeout_add_full (G_PRIORITY_LOW,
+                                              GIMP_DISPLAY_UPDATE_ICON_TIMEOUT,
+                                              gimp_display_shell_icon_update_idle,
+                                              shell,
+                                              NULL);
+  else
+    gimp_display_shell_icon_update_idle (shell);
+}
+
+void
+gimp_display_shell_icon_update_stop (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->icon_idle_id)
+    {
+      g_source_remove (shell->icon_idle_id);
+      shell->icon_idle_id = 0;
+    }
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_display_shell_icon_update_idle (gpointer data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+  GdkPixbuf        *icon  = NULL;
+
+  shell->icon_idle_id = 0;
+
+  if (image)
+    {
+      Gimp      *gimp = gimp_display_get_gimp (shell->display);
+      GdkPixbuf *pixbuf;
+      gint       width;
+      gint       height;
+      gdouble    factor = ((gdouble) gimp_image_get_height (image) /
+                           (gdouble) gimp_image_get_width  (image));
+
+      if (factor >= 1)
+        {
+          height = MAX (shell->icon_size, 1);
+          width  = MAX (((gdouble) shell->icon_size) / factor, 1);
+        }
+      else
+        {
+          height = MAX (((gdouble) shell->icon_size) * factor, 1);
+          width  = MAX (shell->icon_size, 1);
+        }
+
+      pixbuf = gimp_viewable_get_pixbuf (GIMP_VIEWABLE (image),
+                                         gimp_get_user_context (gimp),
+                                         width, height);
+
+      icon = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                             shell->icon_size, shell->icon_size);
+
+      memset (gdk_pixbuf_get_pixels (icon), 0,
+              gdk_pixbuf_get_height (icon) *
+              gdk_pixbuf_get_rowstride (icon));
+
+      gdk_pixbuf_copy_area (pixbuf, 0, 0, width, height,
+                            icon,
+                            0, shell->icon_size - height);
+
+      pixbuf = gimp_widget_load_icon (GTK_WIDGET (shell), "gimp-wilber-outline",
+                                      shell->icon_size_small);
+
+      width  = gdk_pixbuf_get_width  (pixbuf);
+      height = gdk_pixbuf_get_height (pixbuf);
+
+      gdk_pixbuf_composite (pixbuf, icon,
+                            shell->icon_size - width, 0,
+                            width, height,
+                            shell->icon_size - width, 0.0, 1.0, 1.0,
+                            GDK_INTERP_NEAREST, 255);
+      g_object_unref (pixbuf);
+    }
+
+  g_object_set (shell, "icon", icon, NULL);
+
+  if (icon)
+    g_object_unref (icon);
+
+  return FALSE;
+}
diff --git a/app/display/gimpdisplayshell-icon.h b/app/display/gimpdisplayshell-icon.h
new file mode 100644
index 0000000..6d2a673
--- /dev/null
+++ b/app/display/gimpdisplayshell-icon.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_ICON_H__
+#define __GIMP_DISPLAY_SHELL_ICON_H__
+
+
+void  gimp_display_shell_icon_update      (GimpDisplayShell *shell);
+void  gimp_display_shell_icon_update_stop (GimpDisplayShell *shell);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_ICON_H__  */
diff --git a/app/display/gimpdisplayshell-items.c b/app/display/gimpdisplayshell-items.c
new file mode 100644
index 0000000..caa381a
--- /dev/null
+++ b/app/display/gimpdisplayshell-items.c
@@ -0,0 +1,284 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdisplayshell-items.c
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include <libgimpmath/gimpmath.h>
+
+#include "display-types.h"
+
+#include "gimpcanvascanvasboundary.h"
+#include "gimpcanvascursor.h"
+#include "gimpcanvasgrid.h"
+#include "gimpcanvaslayerboundary.h"
+#include "gimpcanvaspassepartout.h"
+#include "gimpcanvasproxygroup.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-items.h"
+#include "gimpdisplayshell-transform.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_shell_item_update           (GimpCanvasItem   *item,
+                                                        cairo_region_t   *region,
+                                                        GimpDisplayShell *shell);
+static void   gimp_display_shell_unrotated_item_update (GimpCanvasItem   *item,
+                                                        cairo_region_t   *region,
+                                                        GimpDisplayShell *shell);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_items_init (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  shell->canvas_item = gimp_canvas_group_new (shell);
+
+  shell->passe_partout = gimp_canvas_passe_partout_new (shell, 0, 0, 0, 0);
+  gimp_canvas_item_set_visible (shell->passe_partout, FALSE);
+  gimp_display_shell_add_item (shell, shell->passe_partout);
+  g_object_unref (shell->passe_partout);
+
+  shell->preview_items = gimp_canvas_group_new (shell);
+  gimp_display_shell_add_item (shell, shell->preview_items);
+  g_object_unref (shell->preview_items);
+
+  shell->vectors = gimp_canvas_proxy_group_new (shell);
+  gimp_display_shell_add_item (shell, shell->vectors);
+  g_object_unref (shell->vectors);
+
+  shell->grid = gimp_canvas_grid_new (shell, NULL);
+  gimp_canvas_item_set_visible (shell->grid, FALSE);
+  g_object_set (shell->grid, "grid-style", TRUE, NULL);
+  gimp_display_shell_add_item (shell, shell->grid);
+  g_object_unref (shell->grid);
+
+  shell->guides = gimp_canvas_proxy_group_new (shell);
+  gimp_display_shell_add_item (shell, shell->guides);
+  g_object_unref (shell->guides);
+
+  shell->sample_points = gimp_canvas_proxy_group_new (shell);
+  gimp_display_shell_add_item (shell, shell->sample_points);
+  g_object_unref (shell->sample_points);
+
+  shell->canvas_boundary = gimp_canvas_canvas_boundary_new (shell);
+  gimp_canvas_item_set_visible (shell->canvas_boundary, FALSE);
+  gimp_display_shell_add_item (shell, shell->canvas_boundary);
+  g_object_unref (shell->canvas_boundary);
+
+  shell->layer_boundary = gimp_canvas_layer_boundary_new (shell);
+  gimp_canvas_item_set_visible (shell->layer_boundary, FALSE);
+  gimp_display_shell_add_item (shell, shell->layer_boundary);
+  g_object_unref (shell->layer_boundary);
+
+  shell->tool_items = gimp_canvas_group_new (shell);
+  gimp_display_shell_add_item (shell, shell->tool_items);
+  g_object_unref (shell->tool_items);
+
+  g_signal_connect (shell->canvas_item, "update",
+                    G_CALLBACK (gimp_display_shell_item_update),
+                    shell);
+
+  shell->unrotated_item = gimp_canvas_group_new (shell);
+
+  shell->cursor = gimp_canvas_cursor_new (shell);
+  gimp_canvas_item_set_visible (shell->cursor, FALSE);
+  gimp_display_shell_add_unrotated_item (shell, shell->cursor);
+  g_object_unref (shell->cursor);
+
+  g_signal_connect (shell->unrotated_item, "update",
+                    G_CALLBACK (gimp_display_shell_unrotated_item_update),
+                    shell);
+}
+
+void
+gimp_display_shell_items_free (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->canvas_item)
+    {
+      g_signal_handlers_disconnect_by_func (shell->canvas_item,
+                                            gimp_display_shell_item_update,
+                                            shell);
+
+      g_clear_object (&shell->canvas_item);
+
+      shell->passe_partout   = NULL;
+      shell->preview_items   = NULL;
+      shell->vectors         = NULL;
+      shell->grid            = NULL;
+      shell->guides          = NULL;
+      shell->sample_points   = NULL;
+      shell->canvas_boundary = NULL;
+      shell->layer_boundary  = NULL;
+      shell->tool_items      = NULL;
+    }
+
+  if (shell->unrotated_item)
+    {
+      g_signal_handlers_disconnect_by_func (shell->unrotated_item,
+                                            gimp_display_shell_unrotated_item_update,
+                                            shell);
+
+      g_clear_object (&shell->unrotated_item);
+
+      shell->cursor = NULL;
+    }
+}
+
+void
+gimp_display_shell_add_item (GimpDisplayShell *shell,
+                             GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (shell->canvas_item), item);
+}
+
+void
+gimp_display_shell_remove_item (GimpDisplayShell *shell,
+                                GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (shell->canvas_item), item);
+}
+
+void
+gimp_display_shell_add_preview_item (GimpDisplayShell *shell,
+                                     GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (shell->preview_items), item);
+}
+
+void
+gimp_display_shell_remove_preview_item (GimpDisplayShell *shell,
+                                        GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (shell->preview_items), item);
+}
+
+void
+gimp_display_shell_add_unrotated_item (GimpDisplayShell *shell,
+                                       GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (shell->unrotated_item), item);
+}
+
+void
+gimp_display_shell_remove_unrotated_item (GimpDisplayShell *shell,
+                                          GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (shell->unrotated_item), item);
+}
+
+void
+gimp_display_shell_add_tool_item (GimpDisplayShell *shell,
+                                  GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (shell->tool_items), item);
+}
+
+void
+gimp_display_shell_remove_tool_item (GimpDisplayShell *shell,
+                                     GimpCanvasItem   *item)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (shell->tool_items), item);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_item_update (GimpCanvasItem   *item,
+                                cairo_region_t   *region,
+                                GimpDisplayShell *shell)
+{
+  if (shell->rotate_transform)
+    {
+      gint n_rects;
+      gint i;
+
+      n_rects = cairo_region_num_rectangles (region);
+
+      for (i = 0; i < n_rects; i++)
+        {
+          cairo_rectangle_int_t rect;
+          gdouble               tx1, ty1;
+          gdouble               tx2, ty2;
+          gint                  x1, y1, x2, y2;
+
+          cairo_region_get_rectangle (region, i, &rect);
+
+          gimp_display_shell_rotate_bounds (shell,
+                                            rect.x, rect.y,
+                                            rect.x + rect.width,
+                                            rect.y + rect.height,
+                                            &tx1, &ty1, &tx2, &ty2);
+
+          x1 = floor (tx1 - 0.5);
+          y1 = floor (ty1 - 0.5);
+          x2 = ceil (tx2 + 0.5);
+          y2 = ceil (ty2 + 0.5);
+
+          gimp_display_shell_expose_area (shell, x1, y1, x2 - x1, y2 - y1);
+        }
+    }
+  else
+    {
+      gimp_display_shell_expose_region (shell, region);
+    }
+}
+
+static void
+gimp_display_shell_unrotated_item_update (GimpCanvasItem   *item,
+                                          cairo_region_t   *region,
+                                          GimpDisplayShell *shell)
+{
+  gimp_display_shell_expose_region (shell, region);
+}
diff --git a/app/display/gimpdisplayshell-items.h b/app/display/gimpdisplayshell-items.h
new file mode 100644
index 0000000..84f169e
--- /dev/null
+++ b/app/display/gimpdisplayshell-items.h
@@ -0,0 +1,49 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdisplayshell-items.h
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_ITEMS_H__
+#define __GIMP_DISPLAY_SHELL_ITEMS_H__
+
+
+void   gimp_display_shell_items_init            (GimpDisplayShell *shell);
+void   gimp_display_shell_items_free            (GimpDisplayShell *shell);
+
+void   gimp_display_shell_add_item              (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+void   gimp_display_shell_remove_item           (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+
+void   gimp_display_shell_add_preview_item      (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+void   gimp_display_shell_remove_preview_item   (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+
+void   gimp_display_shell_add_unrotated_item    (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+void   gimp_display_shell_remove_unrotated_item (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+
+void   gimp_display_shell_add_tool_item         (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+void   gimp_display_shell_remove_tool_item      (GimpDisplayShell *shell,
+                                                 GimpCanvasItem   *item);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_ITEMS_H__ */
diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c
new file mode 100644
index 0000000..0618eea
--- /dev/null
+++ b/app/display/gimpdisplayshell-layer-select.c
@@ -0,0 +1,305 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+
+#include "widgets/gimpview.h"
+#include "widgets/gimpviewrenderer.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-layer-select.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct
+{
+  GtkWidget *window;
+  GtkWidget *view;
+  GtkWidget *label;
+
+  GimpImage *image;
+  GimpLayer *orig_layer;
+} LayerSelect;
+
+
+/*  local function prototypes  */
+
+static LayerSelect * layer_select_new       (GimpDisplayShell *shell,
+                                             GimpImage        *image,
+                                             GimpLayer        *layer,
+                                             gint              view_size);
+static void          layer_select_destroy   (LayerSelect      *layer_select,
+                                             guint32           time);
+static void          layer_select_advance   (LayerSelect      *layer_select,
+                                             gint              move);
+static gboolean      layer_select_events    (GtkWidget        *widget,
+                                             GdkEvent         *event,
+                                             LayerSelect      *layer_select);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_layer_select_init (GimpDisplayShell *shell,
+                                      gint              move,
+                                      guint32           time)
+{
+  LayerSelect   *layer_select;
+  GimpImage     *image;
+  GimpLayer     *layer;
+  GdkGrabStatus  status;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  layer = gimp_image_get_active_layer (image);
+
+  if (! layer)
+    return;
+
+  layer_select = layer_select_new (shell, image, layer,
+                                   image->gimp->config->layer_preview_size);
+  layer_select_advance (layer_select, move);
+
+  gtk_window_set_screen (GTK_WINDOW (layer_select->window),
+                         gtk_widget_get_screen (GTK_WIDGET (shell)));
+
+  gtk_widget_show (layer_select->window);
+
+  status = gdk_keyboard_grab (gtk_widget_get_window (layer_select->window), FALSE, time);
+  if (status != GDK_GRAB_SUCCESS)
+    g_printerr ("gdk_keyboard_grab failed with status %d\n", status);
+}
+
+
+/*  private functions  */
+
+static LayerSelect *
+layer_select_new (GimpDisplayShell *shell,
+                  GimpImage        *image,
+                  GimpLayer        *layer,
+                  gint              view_size)
+{
+  LayerSelect *layer_select;
+  GtkWidget   *frame1;
+  GtkWidget   *frame2;
+  GtkWidget   *hbox;
+  GtkWidget   *alignment;
+
+  layer_select = g_slice_new0 (LayerSelect);
+
+  layer_select->image      = image;
+  layer_select->orig_layer = layer;
+
+  layer_select->window = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_window_set_role (GTK_WINDOW (layer_select->window), "gimp-layer-select");
+  gtk_window_set_title (GTK_WINDOW (layer_select->window), _("Layer Select"));
+  gtk_window_set_position (GTK_WINDOW (layer_select->window), GTK_WIN_POS_MOUSE);
+  gtk_widget_set_events (layer_select->window,
+                         GDK_KEY_PRESS_MASK   |
+                         GDK_KEY_RELEASE_MASK |
+                         GDK_BUTTON_PRESS_MASK);
+
+  g_signal_connect (layer_select->window, "event",
+                    G_CALLBACK (layer_select_events),
+                    layer_select);
+
+  frame1 = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (layer_select->window), frame1);
+  gtk_widget_show (frame1);
+
+  frame2 = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
+  gtk_container_add (GTK_CONTAINER (frame1), frame2);
+  gtk_widget_show (frame2);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+  gtk_container_add (GTK_CONTAINER (frame2), hbox);
+  gtk_widget_show (hbox);
+
+  /*  The view  */
+  alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
+  gtk_widget_show (alignment);
+
+  layer_select->view =
+    gimp_view_new_by_types (gimp_get_user_context (image->gimp),
+                            GIMP_TYPE_VIEW,
+                            GIMP_TYPE_LAYER,
+                            view_size, 1, FALSE);
+  gimp_view_renderer_set_color_config (GIMP_VIEW (layer_select->view)->renderer,
+                                       gimp_display_shell_get_color_config (shell));
+  gimp_view_set_viewable (GIMP_VIEW (layer_select->view),
+                          GIMP_VIEWABLE (layer));
+  gtk_container_add (GTK_CONTAINER (alignment), layer_select->view);
+  gtk_widget_show (layer_select->view);
+  gtk_widget_show (alignment);
+
+  /*  the layer name label */
+  layer_select->label = gtk_label_new (gimp_object_get_name (layer));
+  gtk_box_pack_start (GTK_BOX (hbox), layer_select->label, FALSE, FALSE, 0);
+  gtk_widget_show (layer_select->label);
+
+  return layer_select;
+}
+
+static void
+layer_select_destroy (LayerSelect *layer_select,
+                      guint32      time)
+{
+  gdk_display_keyboard_ungrab (gtk_widget_get_display (layer_select->window),
+                                                       time);
+
+  gtk_widget_destroy (layer_select->window);
+
+  if (layer_select->orig_layer !=
+      gimp_image_get_active_layer (layer_select->image))
+    {
+      gimp_image_flush (layer_select->image);
+    }
+
+  g_slice_free (LayerSelect, layer_select);
+}
+
+static void
+layer_select_advance (LayerSelect *layer_select,
+                      gint         move)
+{
+  GimpLayer *active_layer;
+  GimpLayer *next_layer;
+  GList     *layers;
+  gint       n_layers;
+  gint       index;
+
+  if (move == 0)
+    return;
+
+  /*  If there is a floating selection, allow no advancement  */
+  if (gimp_image_get_floating_selection (layer_select->image))
+    return;
+
+  active_layer = gimp_image_get_active_layer (layer_select->image);
+
+  layers   = gimp_image_get_layer_list (layer_select->image);
+  n_layers = g_list_length (layers);
+
+  index = g_list_index (layers, active_layer);
+  index += move;
+
+  if (index < 0)
+    index = n_layers - 1;
+  else if (index >= n_layers)
+    index = 0;
+
+  next_layer = g_list_nth_data (layers, index);
+
+  g_list_free (layers);
+
+  if (next_layer && next_layer != active_layer)
+    {
+      active_layer = gimp_image_set_active_layer (layer_select->image,
+                                                  next_layer);
+
+      if (active_layer)
+        {
+          gimp_view_set_viewable (GIMP_VIEW (layer_select->view),
+                                  GIMP_VIEWABLE (active_layer));
+          gtk_label_set_text (GTK_LABEL (layer_select->label),
+                              gimp_object_get_name (active_layer));
+        }
+    }
+}
+
+static gboolean
+layer_select_events (GtkWidget   *widget,
+                     GdkEvent    *event,
+                     LayerSelect *layer_select)
+{
+  GdkEventKey    *kevent;
+  GdkEventButton *bevent;
+
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+      bevent = (GdkEventButton *) event;
+
+      layer_select_destroy (layer_select, bevent->time);
+      break;
+
+    case GDK_KEY_PRESS:
+      kevent = (GdkEventKey *) event;
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Tab:
+          layer_select_advance (layer_select, 1);
+          break;
+        case GDK_KEY_ISO_Left_Tab:
+          layer_select_advance (layer_select, -1);
+          break;
+        }
+      return TRUE;
+      break;
+
+    case GDK_KEY_RELEASE:
+      kevent = (GdkEventKey *) event;
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Alt_L: case GDK_KEY_Alt_R:
+          kevent->state &= ~GDK_MOD1_MASK;
+          break;
+        case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+          kevent->state &= ~GDK_CONTROL_MASK;
+          break;
+        case GDK_KEY_Shift_L: case GDK_KEY_Shift_R:
+          kevent->state &= ~GDK_SHIFT_MASK;
+          break;
+        }
+
+      if (! (kevent->state & GDK_CONTROL_MASK))
+        layer_select_destroy (layer_select, kevent->time);
+
+      return TRUE;
+      break;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
diff --git a/app/display/gimpdisplayshell-layer-select.h b/app/display/gimpdisplayshell-layer-select.h
new file mode 100644
index 0000000..20546c6
--- /dev/null
+++ b/app/display/gimpdisplayshell-layer-select.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_DISPLAY_SHELL_LAYER_SELECT_H__
+#define  __GIMP_DISPLAY_SHELL_LAYER_SELECT_H__
+
+
+void   gimp_display_shell_layer_select_init (GimpDisplayShell *shell,
+                                             gint              move,
+                                             guint32           time);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_LAYER_SELECT_H__  */
diff --git a/app/display/gimpdisplayshell-profile.c b/app/display/gimpdisplayshell-profile.c
new file mode 100644
index 0000000..71a6c94
--- /dev/null
+++ b/app/display/gimpdisplayshell-profile.c
@@ -0,0 +1,336 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpprojectable.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-actions.h"
+#include "gimpdisplayshell-filter.h"
+#include "gimpdisplayshell-profile.h"
+#include "gimpdisplayxfer.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_shell_profile_free        (GimpDisplayShell *shell);
+
+static void   gimp_display_shell_color_config_notify (GimpColorConfig  *config,
+                                                      const GParamSpec *pspec,
+                                                      GimpDisplayShell *shell);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_profile_init (GimpDisplayShell *shell)
+{
+  GimpColorConfig *color_config;
+
+  color_config = GIMP_CORE_CONFIG (shell->display->config)->color_management;
+
+  shell->color_config = gimp_config_duplicate (GIMP_CONFIG (color_config));
+
+  /* use after so we are called after the profile cache is invalidated
+   * in gimp_widget_get_color_transform()
+   */
+  g_signal_connect_after (shell->color_config, "notify",
+                          G_CALLBACK (gimp_display_shell_color_config_notify),
+                          shell);
+}
+
+void
+gimp_display_shell_profile_finalize (GimpDisplayShell *shell)
+{
+  g_clear_object (&shell->color_config);
+
+  gimp_display_shell_profile_free (shell);
+}
+
+void
+gimp_display_shell_profile_update (GimpDisplayShell *shell)
+{
+  GimpImage        *image;
+  GimpColorProfile *src_profile;
+  const Babl       *src_format;
+  GimpColorProfile *filter_profile;
+  const Babl       *filter_format;
+  const Babl       *dest_format;
+
+  gimp_display_shell_profile_free (shell);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (! image)
+    return;
+
+  src_profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (shell));
+
+  if (! src_profile)
+    return;
+
+  src_format = gimp_projectable_get_format (GIMP_PROJECTABLE (image));
+
+  if (gimp_display_shell_has_filter (shell))
+    {
+      filter_format  = shell->filter_format;
+      filter_profile = gimp_babl_format_get_color_profile (filter_format);
+    }
+  else
+    {
+      filter_format  = src_format;
+      filter_profile = src_profile;
+    }
+
+  if (! gimp_display_shell_profile_can_convert_to_u8 (shell))
+    {
+      dest_format = shell->filter_format;
+    }
+  else
+    {
+      dest_format = babl_format ("R'G'B'A u8");
+    }
+
+#if 0
+  g_printerr ("src_profile:    %s\n"
+              "src_format:     %s\n"
+              "filter_profile: %s\n"
+              "filter_format:  %s\n"
+              "dest_format:    %s\n",
+              gimp_color_profile_get_label (src_profile),
+              babl_get_name (src_format),
+              gimp_color_profile_get_label (filter_profile),
+              babl_get_name (filter_format),
+              babl_get_name (dest_format));
+#endif
+
+  if (! gimp_color_transform_can_gegl_copy (src_profile, filter_profile))
+    {
+      shell->filter_transform =
+        gimp_color_transform_new (src_profile,
+                                  src_format,
+                                  filter_profile,
+                                  filter_format,
+                                  GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
+                                  GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION |
+                                  GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE);
+    }
+
+  shell->profile_transform =
+    gimp_widget_get_color_transform (gtk_widget_get_toplevel (GTK_WIDGET (shell)),
+                                     gimp_display_shell_get_color_config (shell),
+                                     filter_profile,
+                                     filter_format,
+                                     dest_format);
+
+  if (shell->filter_transform || shell->profile_transform)
+    {
+      gint w = GIMP_DISPLAY_RENDER_BUF_WIDTH;
+      gint h = GIMP_DISPLAY_RENDER_BUF_HEIGHT;
+
+      shell->profile_data =
+        gegl_malloc (w * h * babl_format_get_bytes_per_pixel (src_format));
+
+      shell->profile_stride =
+        w * babl_format_get_bytes_per_pixel (src_format);
+
+      shell->profile_buffer =
+        gegl_buffer_linear_new_from_data (shell->profile_data,
+                                          src_format,
+                                          GEGL_RECTANGLE (0, 0, w, h),
+                                          GEGL_AUTO_ROWSTRIDE,
+                                          (GDestroyNotify) gegl_free,
+                                          shell->profile_data);
+    }
+}
+
+gboolean
+gimp_display_shell_profile_can_convert_to_u8 (GimpDisplayShell *shell)
+{
+  GimpImage *image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      GimpComponentType component_type;
+
+      if (! gimp_display_shell_has_filter (shell))
+        component_type = gimp_image_get_component_type (image);
+      else
+        component_type = gimp_babl_format_get_component_type (shell->filter_format);
+
+      switch (component_type)
+        {
+        case GIMP_COMPONENT_TYPE_U8:
+#if 0
+          /* would like to convert directly for these too, but it
+           * produces inferior results, see bug 750874
+           */
+        case GIMP_COMPONENT_TYPE_U16:
+        case GIMP_COMPONENT_TYPE_U32:
+#endif
+          return TRUE;
+
+        default:
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_profile_free (GimpDisplayShell *shell)
+{
+  g_clear_object (&shell->profile_transform);
+  g_clear_object (&shell->filter_transform);
+  g_clear_object (&shell->profile_buffer);
+  shell->profile_data   = NULL;
+  shell->profile_stride = 0;
+}
+
+static void
+gimp_display_shell_color_config_notify (GimpColorConfig  *config,
+                                        const GParamSpec *pspec,
+                                        GimpDisplayShell *shell)
+{
+  if (! strcmp (pspec->name, "mode")                                    ||
+      ! strcmp (pspec->name, "display-rendering-intent")                ||
+      ! strcmp (pspec->name, "display-use-black-point-compensation")    ||
+      ! strcmp (pspec->name, "simulation-rendering-intent")             ||
+      ! strcmp (pspec->name, "simulation-use-black-point-compensation") ||
+      ! strcmp (pspec->name, "simulation-gamut-check"))
+    {
+      gboolean     managed   = FALSE;
+      gboolean     softproof = FALSE;
+      const gchar *action    = NULL;
+
+#define SET_SENSITIVE(action, sensitive) \
+      gimp_display_shell_set_action_sensitive (shell, action, sensitive);
+
+#define SET_ACTIVE(action, active) \
+      gimp_display_shell_set_action_active (shell, action, active);
+
+      switch (gimp_color_config_get_mode (config))
+        {
+        case GIMP_COLOR_MANAGEMENT_OFF:
+          break;
+
+        case GIMP_COLOR_MANAGEMENT_DISPLAY:
+          managed = TRUE;
+          break;
+
+        case GIMP_COLOR_MANAGEMENT_SOFTPROOF:
+          managed   = TRUE;
+          softproof = TRUE;
+          break;
+        }
+
+      SET_ACTIVE ("view-color-management-enable",    managed);
+      SET_ACTIVE ("view-color-management-softproof", softproof);
+
+      switch (gimp_color_config_get_display_intent (config))
+        {
+        case GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL:
+          action = "view-display-intent-perceptual";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC:
+          action = "view-display-intent-relative-colorimetric";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_SATURATION:
+          action = "view-display-intent-saturation";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC:
+          action = "view-display-intent-absolute-colorimetric";
+          break;
+        }
+
+      SET_SENSITIVE ("view-display-intent-perceptual",            managed);
+      SET_SENSITIVE ("view-display-intent-relative-colorimetric", managed);
+      SET_SENSITIVE ("view-display-intent-saturation",            managed);
+      SET_SENSITIVE ("view-display-intent-absolute-colorimetric", managed);
+
+      SET_ACTIVE (action, TRUE);
+
+      SET_SENSITIVE ("view-display-black-point-compensation", managed);
+      SET_ACTIVE    ("view-display-black-point-compensation",
+                     gimp_color_config_get_display_bpc (config));
+
+      SET_SENSITIVE ("view-softproof-profile", softproof);
+
+      switch (gimp_color_config_get_simulation_intent (config))
+        {
+        case GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL:
+          action = "view-softproof-intent-perceptual";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC:
+          action = "view-softproof-intent-relative-colorimetric";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_SATURATION:
+          action = "view-softproof-intent-saturation";
+          break;
+
+        case GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC:
+          action = "view-softproof-intent-absolute-colorimetric";
+          break;
+        }
+
+      SET_SENSITIVE ("view-softproof-intent-perceptual",            softproof);
+      SET_SENSITIVE ("view-softproof-intent-relative-colorimetric", softproof);
+      SET_SENSITIVE ("view-softproof-intent-saturation",            softproof);
+      SET_SENSITIVE ("view-softproof-intent-absolute-colorimetric", softproof);
+
+      SET_ACTIVE (action, TRUE);
+
+      SET_SENSITIVE ("view-softproof-black-point-compensation", softproof);
+      SET_ACTIVE    ("view-softproof-black-point-compensation",
+                     gimp_color_config_get_simulation_bpc (config));
+
+      SET_SENSITIVE ("view-softproof-gamut-check", softproof);
+      SET_ACTIVE    ("view-softproof-gamut-check",
+                     gimp_color_config_get_simulation_gamut_check (config));
+    }
+
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (shell));
+}
diff --git a/app/display/gimpdisplayshell-profile.h b/app/display/gimpdisplayshell-profile.h
new file mode 100644
index 0000000..e390cac
--- /dev/null
+++ b/app/display/gimpdisplayshell-profile.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_PROFILE_H__
+#define __GIMP_DISPLAY_SHELL_PROFILE_H__
+
+
+void     gimp_display_shell_profile_init              (GimpDisplayShell *shell);
+void     gimp_display_shell_profile_finalize          (GimpDisplayShell *shell);
+
+void     gimp_display_shell_profile_update            (GimpDisplayShell *shell);
+
+gboolean gimp_display_shell_profile_can_convert_to_u8 (GimpDisplayShell *shell);
+
+
+#endif /*  __GIMP_DISPLAY_SHELL_PROFILE_H__  */
diff --git a/app/display/gimpdisplayshell-progress.c b/app/display/gimpdisplayshell-progress.c
new file mode 100644
index 0000000..4314a84
--- /dev/null
+++ b/app/display/gimpdisplayshell-progress.c
@@ -0,0 +1,163 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-progress.h"
+#include "gimpstatusbar.h"
+
+
+static GimpProgress *
+gimp_display_shell_progress_start (GimpProgress *progress,
+                                   gboolean      cancellable,
+                                   const gchar  *message)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  return gimp_progress_start (GIMP_PROGRESS (statusbar), cancellable,
+                              "%s", message);
+}
+
+static void
+gimp_display_shell_progress_end (GimpProgress *progress)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_progress_end (GIMP_PROGRESS (statusbar));
+}
+
+static gboolean
+gimp_display_shell_progress_is_active (GimpProgress *progress)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  return gimp_progress_is_active (GIMP_PROGRESS (statusbar));
+}
+
+static void
+gimp_display_shell_progress_set_text (GimpProgress *progress,
+                                      const gchar  *message)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_progress_set_text_literal (GIMP_PROGRESS (statusbar), message);
+}
+
+static void
+gimp_display_shell_progress_set_value (GimpProgress *progress,
+                                       gdouble       percentage)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_progress_set_value (GIMP_PROGRESS (statusbar), percentage);
+}
+
+static gdouble
+gimp_display_shell_progress_get_value (GimpProgress *progress)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  return gimp_progress_get_value (GIMP_PROGRESS (statusbar));
+}
+
+static void
+gimp_display_shell_progress_pulse (GimpProgress *progress)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_progress_pulse (GIMP_PROGRESS (statusbar));
+}
+
+static guint32
+gimp_display_shell_progress_get_window_id (GimpProgress *progress)
+{
+  GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (progress));
+
+  if (GTK_IS_WINDOW (toplevel))
+    return gimp_window_get_native_id (GTK_WINDOW (toplevel));
+
+  return 0;
+}
+
+static gboolean
+gimp_display_shell_progress_message (GimpProgress        *progress,
+                                     Gimp                *gimp,
+                                     GimpMessageSeverity  severity,
+                                     const gchar         *domain,
+                                     const gchar         *message)
+{
+  GimpDisplayShell *shell     = GIMP_DISPLAY_SHELL (progress);
+  GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+  switch (severity)
+    {
+    case GIMP_MESSAGE_ERROR:
+    case GIMP_MESSAGE_BUG_WARNING:
+    case GIMP_MESSAGE_BUG_CRITICAL:
+      /* error messages are never handled here */
+      break;
+
+    case GIMP_MESSAGE_WARNING:
+      /* warning messages go to the statusbar, if it's visible */
+      if (! gimp_statusbar_get_visible (statusbar))
+        break;
+      else
+        return gimp_progress_message (GIMP_PROGRESS (statusbar), gimp,
+                                      severity, domain, message);
+
+    case GIMP_MESSAGE_INFO:
+      /* info messages go to the statusbar;
+       * if they are not handled there, they are swallowed
+       */
+      gimp_progress_message (GIMP_PROGRESS (statusbar), gimp,
+                             severity, domain, message);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_display_shell_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start         = gimp_display_shell_progress_start;
+  iface->end           = gimp_display_shell_progress_end;
+  iface->is_active     = gimp_display_shell_progress_is_active;
+  iface->set_text      = gimp_display_shell_progress_set_text;
+  iface->set_value     = gimp_display_shell_progress_set_value;
+  iface->get_value     = gimp_display_shell_progress_get_value;
+  iface->pulse         = gimp_display_shell_progress_pulse;
+  iface->get_window_id = gimp_display_shell_progress_get_window_id;
+  iface->message       = gimp_display_shell_progress_message;
+}
diff --git a/app/display/gimpdisplayshell-progress.h b/app/display/gimpdisplayshell-progress.h
new file mode 100644
index 0000000..d697fa1
--- /dev/null
+++ b/app/display/gimpdisplayshell-progress.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_PROGRESS_H__
+#define __GIMP_DISPLAY_SHELL_PROGRESS_H__
+
+
+#include "core/gimpprogress.h"
+
+
+void   gimp_display_shell_progress_iface_init (GimpProgressInterface *iface);
+
+
+#endif /*  __GIMP_DISPLAY_SHELL_PROGRESS_H__  */
diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c
new file mode 100644
index 0000000..48518ac
--- /dev/null
+++ b/app/display/gimpdisplayshell-render.c
@@ -0,0 +1,360 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpprojectable.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpdisplayshell-filter.h"
+#include "gimpdisplayshell-profile.h"
+#include "gimpdisplayshell-render.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayxfer.h"
+
+
+void
+gimp_display_shell_render (GimpDisplayShell *shell,
+                           cairo_t          *cr,
+                           gint              x,
+                           gint              y,
+                           gint              w,
+                           gint              h,
+                           gdouble           scale)
+{
+  GimpImage       *image;
+  GeglBuffer      *buffer;
+#ifdef USE_NODE_BLIT
+  GeglNode        *node;
+#endif
+  GeglAbyssPolicy  abyss_policy;
+  cairo_surface_t *xfer;
+  gint             xfer_src_x;
+  gint             xfer_src_y;
+  gint             mask_src_x = 0;
+  gint             mask_src_y = 0;
+  gint             cairo_stride;
+  guchar          *cairo_data;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (w > 0 && w <= GIMP_DISPLAY_RENDER_BUF_WIDTH);
+  g_return_if_fail (h > 0 && h <= GIMP_DISPLAY_RENDER_BUF_HEIGHT);
+  g_return_if_fail (scale > 0.0);
+
+  image  = gimp_display_get_image (shell->display);
+
+  /* While converting, the render can be wrong; but worse, we rely on allocated
+   * data which might be the wrong size and this was a crash we had which was
+   * hard to diagnose as it doesn't always crash immediately (see discussions in
+   * #9136). This is why this assert is important. We want to make sure we never
+   * call this when the shell's image is in the inconsistent "converting" state.
+   */
+  g_return_if_fail (! gimp_image_get_converting (image));
+
+  buffer = gimp_pickable_get_buffer (
+    gimp_display_shell_get_pickable (shell));
+#ifdef USE_NODE_BLIT
+  node   = gimp_projectable_get_graph (GIMP_PROJECTABLE (image));
+
+  gimp_projectable_begin_render (GIMP_PROJECTABLE (image));
+#endif
+
+  if (shell->show_all)
+    abyss_policy = GEGL_ABYSS_NONE;
+  else
+    abyss_policy = GEGL_ABYSS_CLAMP;
+
+  xfer = gimp_display_xfer_get_surface (shell->xfer, w, h,
+                                        &xfer_src_x, &xfer_src_y);
+
+  cairo_stride = cairo_image_surface_get_stride (xfer);
+  cairo_data   = cairo_image_surface_get_data (xfer) +
+                 xfer_src_y * cairo_stride + xfer_src_x * 4;
+
+  if (shell->profile_transform ||
+      gimp_display_shell_has_filter (shell))
+    {
+      gboolean can_convert_to_u8;
+
+      /*  if there is a profile transform or a display filter, we need
+       *  to use temp buffers
+       */
+
+      can_convert_to_u8 = gimp_display_shell_profile_can_convert_to_u8 (shell);
+
+      /*  create the filter buffer if we have filters, or can't convert
+       *  to u8 directly
+       */
+      if ((gimp_display_shell_has_filter (shell) || ! can_convert_to_u8) &&
+          ! shell->filter_buffer)
+        {
+          gint fw = GIMP_DISPLAY_RENDER_BUF_WIDTH;
+          gint fh = GIMP_DISPLAY_RENDER_BUF_HEIGHT;
+
+          shell->filter_data =
+            gegl_malloc (fw * fh *
+                         babl_format_get_bytes_per_pixel (shell->filter_format));
+
+          shell->filter_stride =
+            fw * babl_format_get_bytes_per_pixel (shell->filter_format);
+
+          shell->filter_buffer =
+            gegl_buffer_linear_new_from_data (shell->filter_data,
+                                              shell->filter_format,
+                                              GEGL_RECTANGLE (0, 0, fw, fh),
+                                              GEGL_AUTO_ROWSTRIDE,
+                                              (GDestroyNotify) gegl_free,
+                                              shell->filter_data);
+        }
+
+      if (! gimp_display_shell_has_filter (shell) || shell->filter_transform)
+        {
+          /*  if there are no filters, or there is a filter transform,
+           *  load the projection pixels into the profile_buffer
+           */
+#ifndef USE_NODE_BLIT
+          gegl_buffer_get (buffer,
+                           GEGL_RECTANGLE (x, y, w, h), scale,
+                           gimp_projectable_get_format (GIMP_PROJECTABLE (image)),
+                           shell->profile_data, shell->profile_stride,
+                           abyss_policy);
+#else
+          gegl_node_blit (node,
+                          scale, GEGL_RECTANGLE (x, y, w, h),
+                          gimp_projectable_get_format (GIMP_PROJECTABLE (image)),
+                          shell->profile_data, shell->profile_stride,
+                          GEGL_BLIT_CACHE);
+#endif
+        }
+      else
+        {
+          /*  otherwise, load the pixels directly into the filter_buffer
+           */
+#ifndef USE_NODE_BLIT
+          gegl_buffer_get (buffer,
+                           GEGL_RECTANGLE (x, y, w, h), scale,
+                           shell->filter_format,
+                           shell->filter_data, shell->filter_stride,
+                           abyss_policy);
+#else
+          gegl_node_blit (node,
+                          scale, GEGL_RECTANGLE (x, y, w, h),
+                          shell->filter_format,
+                          shell->filter_data, shell->filter_stride,
+                          GEGL_BLIT_CACHE);
+#endif
+        }
+
+      /*  if there is a filter transform, convert the pixels from
+       *  the profile_buffer to the filter_buffer
+       */
+      if (shell->filter_transform)
+        {
+          gimp_color_transform_process_buffer (shell->filter_transform,
+                                               shell->profile_buffer,
+                                               GEGL_RECTANGLE (0, 0, w, h),
+                                               shell->filter_buffer,
+                                               GEGL_RECTANGLE (0, 0, w, h));
+        }
+
+      /*  if there are filters, apply them
+       */
+      if (gimp_display_shell_has_filter (shell))
+        {
+          GeglBuffer *filter_buffer;
+
+          /*  shift the filter_buffer so that the area passed to
+           *  the filters is the real render area, allowing for
+           *  position-dependent filters
+           */
+          filter_buffer = g_object_new (GEGL_TYPE_BUFFER,
+                                        "source", shell->filter_buffer,
+                                        "shift-x", -x,
+                                        "shift-y", -y,
+                                        NULL);
+
+          /*  convert the filter_buffer in place
+           */
+          gimp_color_display_stack_convert_buffer (shell->filter_stack,
+                                                   filter_buffer,
+                                                   GEGL_RECTANGLE (x, y, w, h));
+
+          g_object_unref (filter_buffer);
+        }
+
+      /*  if there is a profile transform...
+       */
+      if (shell->profile_transform)
+        {
+          if (gimp_display_shell_has_filter (shell))
+            {
+              /*  if we have filters, convert the pixels in the filter_buffer
+               *  in-place
+               */
+              gimp_color_transform_process_buffer (shell->profile_transform,
+                                                   shell->filter_buffer,
+                                                   GEGL_RECTANGLE (0, 0, w, h),
+                                                   shell->filter_buffer,
+                                                   GEGL_RECTANGLE (0, 0, w, h));
+            }
+          else if (! can_convert_to_u8)
+            {
+              /*  otherwise, if we can't convert to u8 directly, convert
+               *  the pixels from the profile_buffer to the filter_buffer
+               */
+              gimp_color_transform_process_buffer (shell->profile_transform,
+                                                   shell->profile_buffer,
+                                                   GEGL_RECTANGLE (0, 0, w, h),
+                                                   shell->filter_buffer,
+                                                   GEGL_RECTANGLE (0, 0, w, h));
+            }
+          else
+            {
+              GeglBuffer *buffer =
+                gegl_buffer_linear_new_from_data (cairo_data,
+                                                  babl_format ("cairo-ARGB32"),
+                                                  GEGL_RECTANGLE (0, 0, w, h),
+                                                  cairo_stride,
+                                                  NULL, NULL);
+
+              /*  otherwise, convert the profile_buffer directly into
+               *  the cairo_buffer
+               */
+              gimp_color_transform_process_buffer (shell->profile_transform,
+                                                   shell->profile_buffer,
+                                                   GEGL_RECTANGLE (0, 0, w, h),
+                                                   buffer,
+                                                   GEGL_RECTANGLE (0, 0, w, h));
+              g_object_unref (buffer);
+            }
+        }
+
+      /*  finally, copy the filter buffer to the cairo-ARGB32 buffer,
+       *  if necessary
+       */
+      if (gimp_display_shell_has_filter (shell) || ! can_convert_to_u8)
+        {
+          gegl_buffer_get (shell->filter_buffer,
+                           GEGL_RECTANGLE (0, 0, w, h), 1.0,
+                           babl_format ("cairo-ARGB32"),
+                           cairo_data, cairo_stride,
+                           GEGL_ABYSS_NONE);
+        }
+    }
+  else
+    {
+      /*  otherwise we can copy the projection pixels straight to the
+       *  cairo-ARGB32 buffer
+       */
+#ifndef USE_NODE_BLIT
+      gegl_buffer_get (buffer,
+                       GEGL_RECTANGLE (x, y, w, h), scale,
+                       babl_format ("cairo-ARGB32"),
+                       cairo_data, cairo_stride,
+                       abyss_policy);
+#else
+      gegl_node_blit (node,
+                      scale, GEGL_RECTANGLE (x, y, w, h),
+                      babl_format ("cairo-ARGB32"),
+                      cairo_data, cairo_stride,
+                      GEGL_BLIT_CACHE);
+#endif
+    }
+
+#ifdef USE_NODE_BLIT
+  gimp_projectable_end_render (GIMP_PROJECTABLE (image));
+#endif
+
+  if (shell->mask)
+    {
+      if (! shell->mask_surface)
+        {
+          shell->mask_surface =
+            cairo_image_surface_create (CAIRO_FORMAT_A8,
+                                        GIMP_DISPLAY_RENDER_BUF_WIDTH,
+                                        GIMP_DISPLAY_RENDER_BUF_HEIGHT);
+        }
+
+      cairo_surface_mark_dirty (shell->mask_surface);
+
+      cairo_stride = cairo_image_surface_get_stride (shell->mask_surface);
+      cairo_data   = cairo_image_surface_get_data (shell->mask_surface) +
+                     mask_src_y * cairo_stride + mask_src_x;
+
+      gegl_buffer_get (shell->mask,
+                       GEGL_RECTANGLE (x - floor (shell->mask_offset_x * scale),
+                                       y - floor (shell->mask_offset_y * scale),
+                                       w, h),
+                       scale,
+                       babl_format ("Y u8"),
+                       cairo_data, cairo_stride,
+                       GEGL_ABYSS_NONE);
+
+      if (shell->mask_inverted)
+        {
+          gint mask_height = h;
+
+          while (mask_height--)
+            {
+              gint    mask_width = w;
+              guchar *d          = cairo_data;
+
+              while (mask_width--)
+                {
+                  guchar inv = 255 - *d;
+
+                  *d++ = inv;
+                }
+
+              cairo_data += cairo_stride;
+            }
+        }
+    }
+
+  /*  put it to the screen  */
+  cairo_set_source_surface (cr, xfer,
+                            x - xfer_src_x,
+                            y - xfer_src_y);
+  cairo_paint (cr);
+
+  if (shell->mask)
+    {
+      gimp_cairo_set_source_rgba (cr, &shell->mask_color);
+      cairo_mask_surface (cr, shell->mask_surface,
+                          x - mask_src_x,
+                          y - mask_src_y);
+    }
+}
diff --git a/app/display/gimpdisplayshell-render.h b/app/display/gimpdisplayshell-render.h
new file mode 100644
index 0000000..7b4a644
--- /dev/null
+++ b/app/display/gimpdisplayshell-render.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_RENDER_H__
+#define __GIMP_DISPLAY_SHELL_RENDER_H__
+
+void  gimp_display_shell_render (GimpDisplayShell *shell,
+                                 cairo_t          *cr,
+                                 gint              x,
+                                 gint              y,
+                                 gint              w,
+                                 gint              h,
+                                 gdouble           scale);
+
+#endif  /*  __GIMP_DISPLAY_SHELL_RENDER_H__  */
diff --git a/app/display/gimpdisplayshell-rotate-dialog.c b/app/display/gimpdisplayshell-rotate-dialog.c
new file mode 100644
index 0000000..c899235
--- /dev/null
+++ b/app/display/gimpdisplayshell-rotate-dialog.c
@@ -0,0 +1,293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpviewable.h"
+
+#include "widgets/gimpdial.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-rotate-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+
+typedef struct
+{
+  GimpDisplayShell *shell;
+  GtkAdjustment    *rotate_adj;
+  gdouble           old_angle;
+} RotateDialogData;
+
+
+/*  local function prototypes  */
+
+static void  gimp_display_shell_rotate_dialog_response (GtkWidget         *widget,
+                                                        gint               response_id,
+                                                        RotateDialogData  *dialog);
+static void      gimp_display_shell_rotate_dialog_free (RotateDialogData  *dialog);
+
+static void      rotate_adjustment_changed             (GtkAdjustment     *adj,
+                                                        RotateDialogData  *dialog);
+static void      display_shell_rotated                 (GimpDisplayShell  *shell,
+                                                        RotateDialogData  *dialog);
+
+static gboolean  deg_to_rad                            (GBinding          *binding,
+                                                        const GValue      *from_value,
+                                                        GValue            *to_value,
+                                                        gpointer           user_data);
+static gboolean  rad_to_deg                            (GBinding          *binding,
+                                                        const GValue      *from_value,
+                                                        GValue            *to_value,
+                                                        gpointer           user_data);
+
+
+/*  public functions  */
+
+/**
+ * gimp_display_shell_rotate_dialog:
+ * @shell: the #GimpDisplayShell
+ *
+ * Constructs and displays a dialog allowing the user to enter a
+ * custom display rotate.
+ **/
+void
+gimp_display_shell_rotate_dialog (GimpDisplayShell *shell)
+{
+  RotateDialogData *data;
+  GimpImage        *image;
+  GtkWidget        *toplevel;
+  GtkWidget        *hbox;
+  GtkWidget        *spin;
+  GtkWidget        *dial;
+  GtkWidget        *label;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->rotate_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (shell->rotate_dialog));
+      return;
+    }
+
+  image = gimp_display_get_image (shell->display);
+
+  data = g_slice_new (RotateDialogData);
+
+  data->shell     = shell;
+  data->old_angle = shell->rotate_angle;
+
+  shell->rotate_dialog =
+    gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
+                              gimp_get_user_context (shell->display->gimp),
+                              _("Rotate View"), "display-rotate",
+                              GIMP_ICON_OBJECT_ROTATE_180,
+                              _("Select Rotation Angle"),
+                              GTK_WIDGET (shell),
+                              gimp_standard_help_func,
+                              GIMP_HELP_VIEW_ROTATE_OTHER,
+
+                              _("_Reset"),  RESPONSE_RESET,
+                              _("_Cancel"), GTK_RESPONSE_CANCEL,
+                              _("_OK"),     GTK_RESPONSE_OK,
+
+                              NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (shell->rotate_dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_object_weak_ref (G_OBJECT (shell->rotate_dialog),
+                     (GWeakNotify) gimp_display_shell_rotate_dialog_free, data);
+
+  g_object_add_weak_pointer (G_OBJECT (shell->rotate_dialog),
+                             (gpointer) &shell->rotate_dialog);
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+  gtk_window_set_transient_for (GTK_WINDOW (shell->rotate_dialog),
+                                GTK_WINDOW (toplevel));
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (shell->rotate_dialog), TRUE);
+
+  g_signal_connect (shell->rotate_dialog, "response",
+                    G_CALLBACK (gimp_display_shell_rotate_dialog_response),
+                    data);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell->rotate_dialog))),
+                      hbox, TRUE, TRUE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Angle:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  data->rotate_adj = (GtkAdjustment *)
+    gtk_adjustment_new (shell->rotate_angle, 0.0, 360.0, 1, 15, 0);
+  spin = gimp_spin_button_new (data->rotate_adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+  gtk_widget_show (spin);
+
+  label = gtk_label_new (_("degrees"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  dial = gimp_dial_new ();
+  g_object_set (dial,
+                "size",       32,
+                "background", GIMP_CIRCLE_BACKGROUND_PLAIN,
+                "draw-beta",  FALSE,
+                NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), dial, FALSE, FALSE, 0);
+  gtk_widget_show (dial);
+
+  g_object_bind_property_full (data->rotate_adj, "value",
+                               dial,             "alpha",
+                               G_BINDING_BIDIRECTIONAL |
+                               G_BINDING_SYNC_CREATE,
+                               deg_to_rad,
+                               rad_to_deg,
+                               NULL, NULL);
+
+  g_signal_connect (data->rotate_adj, "value-changed",
+                    G_CALLBACK (rotate_adjustment_changed),
+                    data);
+  g_signal_connect (shell, "rotated",
+                    G_CALLBACK (display_shell_rotated),
+                    data);
+
+  gtk_widget_show (shell->rotate_dialog);
+}
+
+static void
+gimp_display_shell_rotate_dialog_response (GtkWidget        *widget,
+                                           gint              response_id,
+                                           RotateDialogData *dialog)
+{
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gtk_adjustment_set_value (dialog->rotate_adj, 0.0);
+      break;
+
+    case GTK_RESPONSE_CANCEL:
+      gtk_adjustment_set_value (dialog->rotate_adj, dialog->old_angle);
+      /* fall thru */
+
+    default:
+      gtk_widget_destroy (dialog->shell->rotate_dialog);
+      break;
+    }
+}
+
+static void
+gimp_display_shell_rotate_dialog_free (RotateDialogData *dialog)
+{
+  g_signal_handlers_disconnect_by_func (dialog->shell,
+                                        display_shell_rotated,
+                                        dialog);
+
+  g_slice_free (RotateDialogData, dialog);
+}
+
+static void
+rotate_adjustment_changed (GtkAdjustment    *adj,
+                           RotateDialogData *dialog)
+{
+  gdouble angle = gtk_adjustment_get_value (dialog->rotate_adj);
+
+  g_signal_handlers_block_by_func (dialog->shell,
+                                   display_shell_rotated,
+                                   dialog);
+
+  gimp_display_shell_rotate_to (dialog->shell, angle);
+
+  g_signal_handlers_unblock_by_func (dialog->shell,
+                                     display_shell_rotated,
+                                     dialog);
+}
+
+static void
+display_shell_rotated (GimpDisplayShell  *shell,
+                       RotateDialogData  *dialog)
+{
+  g_signal_handlers_block_by_func (dialog->rotate_adj,
+                                   rotate_adjustment_changed,
+                                   dialog);
+
+  gtk_adjustment_set_value (dialog->rotate_adj, shell->rotate_angle);
+
+  g_signal_handlers_unblock_by_func (dialog->rotate_adj,
+                                     rotate_adjustment_changed,
+                                     dialog);
+}
+
+static gboolean
+deg_to_rad (GBinding     *binding,
+            const GValue *from_value,
+            GValue       *to_value,
+            gpointer      user_data)
+{
+  gdouble value = g_value_get_double (from_value);
+
+  value = 360.0 - value;
+
+  value *= G_PI / 180.0;
+
+  g_value_set_double (to_value, value);
+
+  return TRUE;
+}
+
+static gboolean
+rad_to_deg (GBinding     *binding,
+            const GValue *from_value,
+            GValue       *to_value,
+            gpointer      user_data)
+{
+  gdouble value = g_value_get_double (from_value);
+
+  value *= 180.0 / G_PI;
+
+  value = 360.0 - value;
+
+  g_value_set_double (to_value, value);
+
+  return TRUE;
+}
diff --git a/app/display/gimpdisplayshell-rotate-dialog.h b/app/display/gimpdisplayshell-rotate-dialog.h
new file mode 100644
index 0000000..5222d13
--- /dev/null
+++ b/app/display/gimpdisplayshell-rotate-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_ROTATE_DIALOG_H__
+#define __GIMP_DISPLAY_SHELL_ROTATE_DIALOG_H__
+
+
+void  gimp_display_shell_rotate_dialog (GimpDisplayShell *shell);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_ROTATE_DIALOG_H__  */
diff --git a/app/display/gimpdisplayshell-rotate.c b/app/display/gimpdisplayshell-rotate.c
new file mode 100644
index 0000000..d14f2a5
--- /dev/null
+++ b/app/display/gimpdisplayshell-rotate.c
@@ -0,0 +1,251 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-transform.h"
+
+
+#define ANGLE_EPSILON 1e-3
+
+
+/*  local function prototypes  */
+
+static void   gimp_display_shell_save_viewport_center    (GimpDisplayShell *shell,
+                                                          gdouble          *x,
+                                                          gdouble          *y);
+static void   gimp_display_shell_restore_viewport_center (GimpDisplayShell *shell,
+                                                          gdouble           x,
+                                                          gdouble           y);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_flip (GimpDisplayShell *shell,
+                         gboolean          flip_horizontally,
+                         gboolean          flip_vertically)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  flip_horizontally = flip_horizontally ? TRUE : FALSE;
+  flip_vertically   = flip_vertically   ? TRUE : FALSE;
+
+  if (flip_horizontally != shell->flip_horizontally ||
+      flip_vertically   != shell->flip_vertically)
+    {
+      gdouble cx, cy;
+
+      /* Maintain the current center of the viewport. */
+      gimp_display_shell_save_viewport_center (shell, &cx, &cy);
+
+      /* freeze the active tool */
+      gimp_display_shell_pause (shell);
+
+      /* Adjust the rotation angle so that the image gets reflected across the
+       * horizontal, and/or vertical, axes in screen space, regardless of the
+       * current rotation.
+       */
+      if (flip_horizontally == shell->flip_horizontally ||
+          flip_vertically   == shell->flip_vertically)
+        {
+          if (shell->rotate_angle != 0.0)
+            shell->rotate_angle = 360.0 - shell->rotate_angle;
+        }
+
+      shell->flip_horizontally = flip_horizontally;
+      shell->flip_vertically   = flip_vertically;
+
+      gimp_display_shell_rotated (shell);
+
+      gimp_display_shell_restore_viewport_center (shell, cx, cy);
+
+      gimp_display_shell_expose_full (shell);
+
+      /* re-enable the active tool */
+      gimp_display_shell_resume (shell);
+    }
+}
+
+void
+gimp_display_shell_rotate (GimpDisplayShell *shell,
+                           gdouble           delta)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_rotate_to (shell, shell->rotate_angle + delta);
+}
+
+void
+gimp_display_shell_rotate_to (GimpDisplayShell *shell,
+                              gdouble           value)
+{
+  gdouble cx, cy;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  /* Maintain the current center of the viewport. */
+  gimp_display_shell_save_viewport_center (shell, &cx, &cy);
+
+  /* Make sure the angle is within the range [0, 360). */
+  value = fmod (value, 360.0);
+  if (value < 0.0)
+    value += 360.0;
+
+  shell->rotate_angle = value;
+
+  /* freeze the active tool */
+  gimp_display_shell_pause (shell);
+
+  gimp_display_shell_scroll_clamp_and_update (shell);
+
+  gimp_display_shell_rotated (shell);
+
+  gimp_display_shell_restore_viewport_center (shell, cx, cy);
+
+  gimp_display_shell_expose_full (shell);
+
+  /* re-enable the active tool */
+  gimp_display_shell_resume (shell);
+}
+
+void
+gimp_display_shell_rotate_drag (GimpDisplayShell *shell,
+                                gdouble           last_x,
+                                gdouble           last_y,
+                                gdouble           cur_x,
+                                gdouble           cur_y,
+                                gboolean          constrain)
+{
+  gdouble pivot_x, pivot_y;
+  gdouble src_x,   src_y,   src_angle;
+  gdouble dest_x,  dest_y,  dest_angle;
+  gdouble                   delta_angle;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  /* Rotate the image around the center of the viewport. */
+  pivot_x     = shell->disp_width  / 2.0;
+  pivot_y     = shell->disp_height / 2.0;
+
+  src_x       = last_x - pivot_x;
+  src_y       = last_y - pivot_y;
+  src_angle   = atan2 (src_y, src_x);
+
+  dest_x      = cur_x - pivot_x;
+  dest_y      = cur_y - pivot_y;
+  dest_angle  = atan2 (dest_y, dest_x);
+
+  delta_angle = dest_angle - src_angle;
+
+  shell->rotate_drag_angle += 180.0 * delta_angle / G_PI;
+
+  gimp_display_shell_rotate_to (shell,
+                                constrain ?
+                                RINT (shell->rotate_drag_angle / 15.0) * 15.0 :
+                                shell->rotate_drag_angle);
+}
+
+void
+gimp_display_shell_rotate_update_transform (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  g_clear_pointer (&shell->rotate_transform,   g_free);
+  g_clear_pointer (&shell->rotate_untransform, g_free);
+
+  if (fabs (shell->rotate_angle)         < ANGLE_EPSILON ||
+      fabs (360.0 - shell->rotate_angle) < ANGLE_EPSILON)
+    shell->rotate_angle = 0.0;
+
+  if ((shell->rotate_angle != 0.0 ||
+       shell->flip_horizontally   ||
+       shell->flip_vertically) &&
+      gimp_display_get_image (shell->display))
+    {
+      gint    image_width, image_height;
+      gdouble cx, cy;
+
+      shell->rotate_transform   = g_new (cairo_matrix_t, 1);
+      shell->rotate_untransform = g_new (cairo_matrix_t, 1);
+
+      gimp_display_shell_scale_get_image_size (shell,
+                                               &image_width, &image_height);
+
+      cx = -shell->offset_x + image_width  / 2;
+      cy = -shell->offset_y + image_height / 2;
+
+      cairo_matrix_init_translate (shell->rotate_transform, cx, cy);
+
+      if (shell->rotate_angle != 0.0)
+        cairo_matrix_rotate (shell->rotate_transform,
+                             shell->rotate_angle / 180.0 * G_PI);
+
+      if (shell->flip_horizontally)
+        cairo_matrix_scale (shell->rotate_transform, -1.0, 1.0);
+
+      if (shell->flip_vertically)
+        cairo_matrix_scale (shell->rotate_transform, 1.0, -1.0);
+
+      cairo_matrix_translate (shell->rotate_transform, -cx, -cy);
+
+      *shell->rotate_untransform = *shell->rotate_transform;
+      cairo_matrix_invert (shell->rotate_untransform);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_display_shell_save_viewport_center (GimpDisplayShell *shell,
+                                         gdouble          *x,
+                                         gdouble          *y)
+{
+  gimp_display_shell_unrotate_xy_f (shell,
+                                    shell->disp_width  / 2,
+                                    shell->disp_height / 2,
+                                    x, y);
+}
+
+static void
+gimp_display_shell_restore_viewport_center (GimpDisplayShell *shell,
+                                            gdouble           x,
+                                            gdouble           y)
+{
+  gimp_display_shell_rotate_xy_f (shell, x, y, &x, &y);
+
+  x += shell->offset_x - shell->disp_width  / 2;
+  y += shell->offset_y - shell->disp_height / 2;
+
+  gimp_display_shell_scroll_set_offset (shell, RINT (x), RINT (y));
+}
diff --git a/app/display/gimpdisplayshell-rotate.h b/app/display/gimpdisplayshell-rotate.h
new file mode 100644
index 0000000..d1ffa05
--- /dev/null
+++ b/app/display/gimpdisplayshell-rotate.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_ROTATE_H__
+#define __GIMP_DISPLAY_SHELL_ROTATE_H__
+
+
+void   gimp_display_shell_flip                    (GimpDisplayShell *shell,
+                                                   gboolean          flip_horizontally,
+                                                   gboolean          flip_vertically);
+
+void   gimp_display_shell_rotate                  (GimpDisplayShell *shell,
+                                                   gdouble           delta);
+void   gimp_display_shell_rotate_to               (GimpDisplayShell *shell,
+                                                   gdouble           value);
+void   gimp_display_shell_rotate_drag             (GimpDisplayShell *shell,
+                                                   gdouble           last_x,
+                                                   gdouble           last_y,
+                                                   gdouble           cur_x,
+                                                   gdouble           cur_y,
+                                                   gboolean          constrain);
+
+void   gimp_display_shell_rotate_update_transform (GimpDisplayShell *shell);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_ROTATE_H__  */
diff --git a/app/display/gimpdisplayshell-rulers.c b/app/display/gimpdisplayshell-rulers.c
new file mode 100644
index 0000000..79253c8
--- /dev/null
+++ b/app/display/gimpdisplayshell-rulers.c
@@ -0,0 +1,181 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-rulers.h"
+#include "gimpdisplayshell-scale.h"
+
+
+/**
+ * gimp_display_shell_rulers_update:
+ * @shell:
+ *
+ **/
+void
+gimp_display_shell_rulers_update (GimpDisplayShell *shell)
+{
+  GimpImage *image;
+  gint       image_width;
+  gint       image_height;
+  gdouble    offset_x     = 0.0;
+  gdouble    offset_y     = 0.0;
+  gdouble    scale_x      = 1.0;
+  gdouble    scale_y      = 1.0;
+  gdouble    resolution_x = 1.0;
+  gdouble    resolution_y = 1.0;
+  gdouble    horizontal_lower;
+  gdouble    horizontal_upper;
+  gdouble    horizontal_max_size;
+  gdouble    vertical_lower;
+  gdouble    vertical_upper;
+  gdouble    vertical_max_size;
+
+  if (! shell->display)
+    return;
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      gint    image_x, image_y;
+      gdouble res_x, res_y;
+
+      gimp_display_shell_scale_get_image_bounds (shell,
+                                                 &image_x, &image_y,
+                                                 &image_width, &image_height);
+
+      gimp_display_shell_get_rotated_scale (shell, &scale_x, &scale_y);
+
+      image_width  /= scale_x;
+      image_height /= scale_y;
+
+      offset_x = shell->offset_x - image_x;
+      offset_y = shell->offset_y - image_y;
+
+      gimp_image_get_resolution (image, &res_x, &res_y);
+
+      if (shell->rotate_angle == 0.0 || res_x == res_y)
+        {
+          resolution_x = res_x;
+          resolution_y = res_y;
+        }
+      else
+        {
+          gdouble cos_a = cos (G_PI * shell->rotate_angle / 180.0);
+          gdouble sin_a = sin (G_PI * shell->rotate_angle / 180.0);
+
+          if (shell->dot_for_dot)
+            {
+              resolution_x = 1.0 / sqrt (SQR (cos_a / res_x) +
+                                         SQR (sin_a / res_y));
+              resolution_y = 1.0 / sqrt (SQR (cos_a / res_y) +
+                                         SQR (sin_a / res_x));
+            }
+          else
+            {
+              resolution_x = sqrt (SQR (res_x * cos_a) + SQR (res_y * sin_a));
+              resolution_y = sqrt (SQR (res_y * cos_a) + SQR (res_x * sin_a));
+            }
+        }
+    }
+  else
+    {
+      image_width  = shell->disp_width;
+      image_height = shell->disp_height;
+    }
+
+  /* Initialize values */
+
+  horizontal_lower = 0;
+  vertical_lower   = 0;
+
+  if (image)
+    {
+      horizontal_upper    = gimp_pixels_to_units (shell->disp_width / scale_x,
+                                                  shell->unit,
+                                                  resolution_x);
+      horizontal_max_size = gimp_pixels_to_units (MAX (image_width,
+                                                       image_height),
+                                                  shell->unit,
+                                                  resolution_x);
+
+      vertical_upper      = gimp_pixels_to_units (shell->disp_height / scale_y,
+                                                  shell->unit,
+                                                  resolution_y);
+      vertical_max_size   = gimp_pixels_to_units (MAX (image_width,
+                                                       image_height),
+                                                  shell->unit,
+                                                  resolution_y);
+    }
+  else
+    {
+      horizontal_upper    = image_width;
+      horizontal_max_size = MAX (image_width, image_height);
+
+      vertical_upper      = image_height;
+      vertical_max_size   = MAX (image_width, image_height);
+    }
+
+
+  /* Adjust due to scrolling */
+
+  if (image)
+    {
+      offset_x *= horizontal_upper / shell->disp_width;
+      offset_y *= vertical_upper   / shell->disp_height;
+
+      horizontal_lower += offset_x;
+      horizontal_upper += offset_x;
+
+      vertical_lower   += offset_y;
+      vertical_upper   += offset_y;
+    }
+
+  /* Finally setup the actual rulers */
+
+  gimp_ruler_set_range (GIMP_RULER (shell->hrule),
+                        horizontal_lower,
+                        horizontal_upper,
+                        horizontal_max_size);
+
+  gimp_ruler_set_unit  (GIMP_RULER (shell->hrule),
+                        shell->unit);
+
+  gimp_ruler_set_range (GIMP_RULER (shell->vrule),
+                        vertical_lower,
+                        vertical_upper,
+                        vertical_max_size);
+
+  gimp_ruler_set_unit  (GIMP_RULER (shell->vrule),
+                        shell->unit);
+}
diff --git a/app/display/gimpdisplayshell-rulers.h b/app/display/gimpdisplayshell-rulers.h
new file mode 100644
index 0000000..117a8f0
--- /dev/null
+++ b/app/display/gimpdisplayshell-rulers.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_RULERS_H__
+#define __GIMP_DISPLAY_SHELL_RULERS_H__
+
+
+void   gimp_display_shell_rulers_update (GimpDisplayShell *shell);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_RULERS_H__  */
diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c
new file mode 100644
index 0000000..f3d2eab
--- /dev/null
+++ b/app/display/gimpdisplayshell-scale-dialog.c
@@ -0,0 +1,293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpviewable.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scale-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define SCALE_EPSILON      0.0001
+#define SCALE_EQUALS(a,b) (fabs ((a) - (b)) < SCALE_EPSILON)
+
+
+typedef struct
+{
+  GimpDisplayShell *shell;
+  GimpZoomModel    *model;
+  GtkAdjustment    *scale_adj;
+  GtkAdjustment    *num_adj;
+  GtkAdjustment    *denom_adj;
+} ScaleDialogData;
+
+
+/*  local function prototypes  */
+
+static void  gimp_display_shell_scale_dialog_response (GtkWidget        *widget,
+                                                       gint              response_id,
+                                                       ScaleDialogData  *dialog);
+static void  gimp_display_shell_scale_dialog_free     (ScaleDialogData  *dialog);
+
+static void  update_zoom_values                       (GtkAdjustment    *adj,
+                                                       ScaleDialogData  *dialog);
+
+
+
+/*  public functions  */
+
+/**
+ * gimp_display_shell_scale_dialog:
+ * @shell: the #GimpDisplayShell
+ *
+ * Constructs and displays a dialog allowing the user to enter a
+ * custom display scale.
+ **/
+void
+gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
+{
+  ScaleDialogData *data;
+  GimpImage       *image;
+  GtkWidget       *toplevel;
+  GtkWidget       *hbox;
+  GtkWidget       *table;
+  GtkWidget       *spin;
+  GtkWidget       *label;
+  gint             num, denom, row;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->scale_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (shell->scale_dialog));
+      return;
+    }
+
+  if (SCALE_EQUALS (shell->other_scale, 0.0))
+    {
+      /* other_scale not yet initialized */
+      shell->other_scale = gimp_zoom_model_get_factor (shell->zoom);
+    }
+
+  image = gimp_display_get_image (shell->display);
+
+  data = g_slice_new (ScaleDialogData);
+
+  data->shell = shell;
+  data->model = g_object_new (GIMP_TYPE_ZOOM_MODEL,
+                              "value", fabs (shell->other_scale),
+                              NULL);
+
+  shell->scale_dialog =
+    gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
+                              gimp_get_user_context (shell->display->gimp),
+                              _("Zoom Ratio"), "display_scale",
+                              "zoom-original",
+                              _("Select Zoom Ratio"),
+                              GTK_WIDGET (shell),
+                              gimp_standard_help_func,
+                              GIMP_HELP_VIEW_ZOOM_OTHER,
+
+                              _("_Cancel"), GTK_RESPONSE_CANCEL,
+                              _("_OK"),     GTK_RESPONSE_OK,
+
+                              NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (shell->scale_dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_object_weak_ref (G_OBJECT (shell->scale_dialog),
+                     (GWeakNotify) gimp_display_shell_scale_dialog_free, data);
+  g_object_weak_ref (G_OBJECT (shell->scale_dialog),
+                     (GWeakNotify) g_object_unref, data->model);
+
+  g_object_add_weak_pointer (G_OBJECT (shell->scale_dialog),
+                             (gpointer) &shell->scale_dialog);
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+  gtk_window_set_transient_for (GTK_WINDOW (shell->scale_dialog),
+                                GTK_WINDOW (toplevel));
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (shell->scale_dialog), TRUE);
+
+  g_signal_connect (shell->scale_dialog, "response",
+                    G_CALLBACK (gimp_display_shell_scale_dialog_response),
+                    data);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell->scale_dialog))),
+                      table, TRUE, TRUE, 0);
+  gtk_widget_show (table);
+
+  row = 0;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Zoom ratio:"), 0.0, 0.5,
+                             hbox, 1, FALSE);
+
+  gimp_zoom_model_get_fraction (data->model, &num, &denom);
+
+  data->num_adj = (GtkAdjustment *)
+    gtk_adjustment_new (num, 1, 256, 1, 8, 0);
+  spin = gimp_spin_button_new (data->num_adj, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+  gtk_widget_show (spin);
+
+  label = gtk_label_new (":");
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  data->denom_adj = (GtkAdjustment *)
+    gtk_adjustment_new (denom, 1, 256, 1, 8, 0);
+  spin = gimp_spin_button_new (data->denom_adj, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+  gtk_widget_show (spin);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Zoom:"), 0.0, 0.5,
+                             hbox, 1, FALSE);
+
+  data->scale_adj = (GtkAdjustment *)
+    gtk_adjustment_new (fabs (shell->other_scale) * 100,
+                        100.0 / 256.0, 25600.0,
+                        10, 50, 0);
+  spin = gimp_spin_button_new (data->scale_adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+  gtk_widget_show (spin);
+
+  label = gtk_label_new ("%");
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  g_signal_connect (data->scale_adj, "value-changed",
+                    G_CALLBACK (update_zoom_values), data);
+  g_signal_connect (data->num_adj, "value-changed",
+                    G_CALLBACK (update_zoom_values), data);
+  g_signal_connect (data->denom_adj, "value-changed",
+                    G_CALLBACK (update_zoom_values), data);
+
+  gtk_widget_show (shell->scale_dialog);
+}
+
+static void
+gimp_display_shell_scale_dialog_response (GtkWidget       *widget,
+                                          gint             response_id,
+                                          ScaleDialogData *dialog)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      gdouble scale;
+
+      scale = gtk_adjustment_get_value (dialog->scale_adj);
+
+      gimp_display_shell_scale (dialog->shell,
+                                GIMP_ZOOM_TO,
+                                scale / 100.0,
+                                GIMP_ZOOM_FOCUS_BEST_GUESS);
+    }
+  else
+    {
+      /*  need to emit "scaled" to get the menu updated  */
+      gimp_display_shell_scaled (dialog->shell);
+    }
+
+  dialog->shell->other_scale = - fabs (dialog->shell->other_scale);
+
+  gtk_widget_destroy (dialog->shell->scale_dialog);
+}
+
+static void
+gimp_display_shell_scale_dialog_free (ScaleDialogData *dialog)
+{
+  g_slice_free (ScaleDialogData, dialog);
+}
+
+static void
+update_zoom_values (GtkAdjustment   *adj,
+                    ScaleDialogData *dialog)
+{
+  gint    num, denom;
+  gdouble scale;
+
+  g_signal_handlers_block_by_func (dialog->scale_adj,
+                                   update_zoom_values,
+                                   dialog);
+  g_signal_handlers_block_by_func (dialog->num_adj,
+                                   update_zoom_values,
+                                   dialog);
+  g_signal_handlers_block_by_func (dialog->denom_adj,
+                                   update_zoom_values,
+                                   dialog);
+
+  if (adj == dialog->scale_adj)
+    {
+      scale = gtk_adjustment_get_value (dialog->scale_adj);
+
+      gimp_zoom_model_zoom (dialog->model, GIMP_ZOOM_TO, scale / 100.0);
+      gimp_zoom_model_get_fraction (dialog->model, &num, &denom);
+
+      gtk_adjustment_set_value (dialog->num_adj, num);
+      gtk_adjustment_set_value (dialog->denom_adj, denom);
+    }
+  else /* fraction adjustments */
+    {
+      scale = (gtk_adjustment_get_value (dialog->num_adj) /
+               gtk_adjustment_get_value (dialog->denom_adj));
+
+      gtk_adjustment_set_value (dialog->scale_adj, scale * 100);
+    }
+
+  g_signal_handlers_unblock_by_func (dialog->scale_adj,
+                                     update_zoom_values,
+                                     dialog);
+  g_signal_handlers_unblock_by_func (dialog->num_adj,
+                                     update_zoom_values,
+                                     dialog);
+  g_signal_handlers_unblock_by_func (dialog->denom_adj,
+                                     update_zoom_values,
+                                     dialog);
+}
diff --git a/app/display/gimpdisplayshell-scale-dialog.h b/app/display/gimpdisplayshell-scale-dialog.h
new file mode 100644
index 0000000..eb83065
--- /dev/null
+++ b/app/display/gimpdisplayshell-scale-dialog.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_SCALE_DIALOG_H__
+#define __GIMP_DISPLAY_SHELL_SCALE_DIALOG_H__
+
+
+void  gimp_display_shell_scale_dialog (GimpDisplayShell *shell);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_SCALE_DIALOG_H__  */
diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c
new file mode 100644
index 0000000..482a9fe
--- /dev/null
+++ b/app/display/gimpdisplayshell-scale.c
@@ -0,0 +1,1449 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpimagewindow.h"
+
+
+#define SCALE_TIMEOUT             2
+#define SCALE_EPSILON             0.0001
+#define ALMOST_CENTERED_THRESHOLD 2
+
+#define SCALE_EQUALS(a,b) (fabs ((a) - (b)) < SCALE_EPSILON)
+
+
+/*  local function prototypes  */
+
+static void      gimp_display_shell_scale_get_screen_resolution
+                                                         (GimpDisplayShell *shell,
+                                                          gdouble          *xres,
+                                                          gdouble          *yres);
+static void      gimp_display_shell_scale_get_image_size_for_scale
+                                                         (GimpDisplayShell *shell,
+                                                          gdouble           scale,
+                                                          gint             *w,
+                                                          gint             *h);
+static void      gimp_display_shell_calculate_scale_x_and_y
+                                                         (GimpDisplayShell *shell,
+                                                          gdouble           scale,
+                                                          gdouble          *scale_x,
+                                                          gdouble          *scale_y);
+
+static void      gimp_display_shell_scale_to             (GimpDisplayShell *shell,
+                                                          gdouble           scale,
+                                                          gdouble           viewport_x,
+                                                          gdouble           viewport_y);
+static void      gimp_display_shell_scale_fit_or_fill    (GimpDisplayShell *shell,
+                                                          gboolean          fill);
+
+static gboolean  gimp_display_shell_scale_image_starts_to_fit
+                                                         (GimpDisplayShell *shell,
+                                                          gdouble           new_scale,
+                                                          gdouble           current_scale,
+                                                          gboolean         *vertically,
+                                                          gboolean         *horizontally);
+static gboolean  gimp_display_shell_scale_viewport_coord_almost_centered
+                                                         (GimpDisplayShell *shell,
+                                                          gint              x,
+                                                          gint              y,
+                                                          gboolean         *horizontally,
+                                                          gboolean         *vertically);
+
+static void      gimp_display_shell_scale_get_image_center_viewport
+                                                         (GimpDisplayShell *shell,
+                                                          gint             *image_center_x,
+                                                          gint             *image_center_y);
+
+
+static void      gimp_display_shell_scale_get_zoom_focus (GimpDisplayShell *shell,
+                                                          gdouble           new_scale,
+                                                          gdouble           current_scale,
+                                                          gdouble          *x,
+                                                          gdouble          *y,
+                                                          GimpZoomFocus     zoom_focus);
+
+
+/*  public functions  */
+
+/**
+ * gimp_display_shell_scale_revert:
+ * @shell:     the #GimpDisplayShell
+ *
+ * Reverts the display to the previously used scale. If no previous
+ * scale exist, then the call does nothing.
+ *
+ * Return value: %TRUE if the scale was reverted, otherwise %FALSE.
+ **/
+gboolean
+gimp_display_shell_scale_revert (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  /* don't bother if no scale has been set */
+  if (shell->last_scale < SCALE_EPSILON)
+    return FALSE;
+
+  shell->last_scale_time = 0;
+
+  gimp_display_shell_scale_by_values (shell,
+                                      shell->last_scale,
+                                      shell->last_offset_x,
+                                      shell->last_offset_y,
+                                      FALSE);   /* don't resize the window */
+
+  return TRUE;
+}
+
+/**
+ * gimp_display_shell_scale_can_revert:
+ * @shell: the #GimpDisplayShell
+ *
+ * Return value: %TRUE if a previous display scale exists, otherwise %FALSE.
+ **/
+gboolean
+gimp_display_shell_scale_can_revert (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return (shell->last_scale > SCALE_EPSILON);
+}
+
+/**
+ * gimp_display_shell_scale_save_revert_values:
+ * @shell:
+ *
+ * Handle the updating of the Revert Zoom variables.
+ **/
+void
+gimp_display_shell_scale_save_revert_values (GimpDisplayShell *shell)
+{
+  guint now;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  now = time (NULL);
+
+  if (now - shell->last_scale_time >= SCALE_TIMEOUT)
+    {
+      shell->last_scale    = gimp_zoom_model_get_factor (shell->zoom);
+      shell->last_offset_x = shell->offset_x;
+      shell->last_offset_y = shell->offset_y;
+    }
+
+  shell->last_scale_time = now;
+}
+
+/**
+ * gimp_display_shell_scale_set_dot_for_dot:
+ * @shell:        the #GimpDisplayShell
+ * @dot_for_dot:  whether "Dot for Dot" should be enabled
+ *
+ * If @dot_for_dot is set to %TRUE then the "Dot for Dot" mode (where image and
+ * screen pixels are of the same size) is activated. Dually, the mode is
+ * disabled if @dot_for_dot is %FALSE.
+ **/
+void
+gimp_display_shell_scale_set_dot_for_dot (GimpDisplayShell *shell,
+                                          gboolean          dot_for_dot)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (dot_for_dot != shell->dot_for_dot)
+    {
+      GimpDisplayConfig *config = shell->display->config;
+      gboolean           resize_window;
+
+      /* Resize windows only in multi-window mode */
+      resize_window = (config->resize_windows_on_zoom &&
+                       ! GIMP_GUI_CONFIG (config)->single_window_mode);
+
+      /* freeze the active tool */
+      gimp_display_shell_pause (shell);
+
+      shell->dot_for_dot = dot_for_dot;
+
+      gimp_display_shell_scale_update (shell);
+
+      gimp_display_shell_scale_resize (shell, resize_window, FALSE);
+
+      /* re-enable the active tool */
+      gimp_display_shell_resume (shell);
+    }
+}
+
+/**
+ * gimp_display_shell_scale_get_image_size:
+ * @shell:
+ * @w:
+ * @h:
+ *
+ * Gets the size of the rendered image after it has been scaled.
+ *
+ **/
+void
+gimp_display_shell_scale_get_image_size (GimpDisplayShell *shell,
+                                         gint             *w,
+                                         gint             *h)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_scale_get_image_size_for_scale (shell,
+                                                     gimp_zoom_model_get_factor (shell->zoom),
+                                                     w, h);
+}
+
+/**
+ * gimp_display_shell_scale_get_image_bounds:
+ * @shell:
+ * @x:
+ * @y:
+ * @w:
+ * @h:
+ *
+ * Gets the screen-space boudning box of the image, after it has
+ * been transformed (i.e., scaled, rotated, and scrolled).
+ **/
+void
+gimp_display_shell_scale_get_image_bounds (GimpDisplayShell *shell,
+                                           gint             *x,
+                                           gint             *y,
+                                           gint             *w,
+                                           gint             *h)
+{
+  GimpImage *image;
+  gdouble    x1, y1;
+  gdouble    x2, y2;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  gimp_display_shell_transform_bounds (shell,
+                                       0, 0,
+                                       gimp_image_get_width (image),
+                                       gimp_image_get_height (image),
+                                       &x1, &y1,
+                                       &x2, &y2);
+
+  x1 = ceil (x1);
+  y1 = ceil (y1);
+  x2 = floor (x2);
+  y2 = floor (y2);
+
+  if (x) *x = x1 + shell->offset_x;
+  if (y) *y = y1 + shell->offset_y;
+  if (w) *w = x2 - x1;
+  if (h) *h = y2 - y1;
+}
+
+/**
+ * gimp_display_shell_scale_get_image_unrotated_bounds:
+ * @shell:
+ * @x:
+ * @y:
+ * @w:
+ * @h:
+ *
+ * Gets the screen-space boudning box of the image, after it has
+ * been scaled and scrolled, but before it has been rotated.
+ **/
+void
+gimp_display_shell_scale_get_image_unrotated_bounds (GimpDisplayShell *shell,
+                                                     gint             *x,
+                                                     gint             *y,
+                                                     gint             *w,
+                                                     gint             *h)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  if (x) *x = -shell->offset_x;
+  if (y) *y = -shell->offset_y;
+  if (w) *w = floor (gimp_image_get_width  (image) * shell->scale_x);
+  if (h) *h = floor (gimp_image_get_height (image) * shell->scale_y);
+}
+
+/**
+ * gimp_display_shell_scale_get_image_bounding_box:
+ * @shell:
+ * @x:
+ * @y:
+ * @w:
+ * @h:
+ *
+ * Gets the screen-space boudning box of the image content, after it has
+ * been transformed (i.e., scaled, rotated, and scrolled).
+ **/
+void
+gimp_display_shell_scale_get_image_bounding_box (GimpDisplayShell *shell,
+                                                 gint             *x,
+                                                 gint             *y,
+                                                 gint             *w,
+                                                 gint             *h)
+{
+  GeglRectangle bounding_box;
+  gdouble       x1, y1;
+  gdouble       x2, y2;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  bounding_box = gimp_display_shell_get_bounding_box (shell);
+
+  gimp_display_shell_transform_bounds (shell,
+                                       bounding_box.x,
+                                       bounding_box.y,
+                                       bounding_box.x + bounding_box.width,
+                                       bounding_box.y + bounding_box.height,
+                                       &x1, &y1,
+                                       &x2, &y2);
+
+  if (! shell->show_all)
+    {
+      x1 = ceil  (x1);
+      y1 = ceil  (y1);
+      x2 = floor (x2);
+      y2 = floor (y2);
+    }
+  else
+    {
+      x1 = floor (x1);
+      y1 = floor (y1);
+      x2 = ceil  (x2);
+      y2 = ceil  (y2);
+    }
+
+  if (x) *x = x1 + shell->offset_x;
+  if (y) *y = y1 + shell->offset_y;
+  if (w) *w = x2 - x1;
+  if (h) *h = y2 - y1;
+}
+
+/**
+ * gimp_display_shell_scale_get_image_unrotated_bounding_box:
+ * @shell:
+ * @x:
+ * @y:
+ * @w:
+ * @h:
+ *
+ * Gets the screen-space boudning box of the image content, after it has
+ * been scaled and scrolled, but before it has been rotated.
+ **/
+void
+gimp_display_shell_scale_get_image_unrotated_bounding_box (GimpDisplayShell *shell,
+                                                           gint             *x,
+                                                           gint             *y,
+                                                           gint             *w,
+                                                           gint             *h)
+{
+  GeglRectangle bounding_box;
+  gdouble       x1, y1;
+  gdouble       x2, y2;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  bounding_box = gimp_display_shell_get_bounding_box (shell);
+
+  x1 = bounding_box.x * shell->scale_x -
+       shell->offset_x;
+  y1 = bounding_box.y * shell->scale_y -
+       shell->offset_y;
+
+  x2 = (bounding_box.x + bounding_box.width)  * shell->scale_x -
+       shell->offset_x;
+  y2 = (bounding_box.y + bounding_box.height) * shell->scale_y -
+       shell->offset_y;
+
+  if (! shell->show_all)
+    {
+      x1 = ceil  (x1);
+      y1 = ceil  (y1);
+      x2 = floor (x2);
+      y2 = floor (y2);
+    }
+  else
+    {
+      x1 = floor (x1);
+      y1 = floor (y1);
+      x2 = ceil  (x2);
+      y2 = ceil  (y2);
+    }
+
+  if (x) *x = x1;
+  if (y) *y = y1;
+  if (w) *w = x2 - x1;
+  if (h) *h = y2 - y1;
+}
+
+/**
+ * gimp_display_shell_scale_image_is_within_viewport:
+ * @shell:
+ *
+ * Returns: %TRUE if the (scaled) image is smaller than and within the
+ *          viewport.
+ **/
+gboolean
+gimp_display_shell_scale_image_is_within_viewport (GimpDisplayShell *shell,
+                                                   gboolean         *horizontally,
+                                                   gboolean         *vertically)
+{
+  gboolean horizontally_dummy, vertically_dummy;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  if (! horizontally) horizontally = &horizontally_dummy;
+  if (! vertically)   vertically   = &vertically_dummy;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      gint sx, sy;
+      gint sw, sh;
+
+      gimp_display_shell_scale_get_image_bounding_box (shell,
+                                                       &sx, &sy, &sw, &sh);
+
+      sx -= shell->offset_x;
+      sy -= shell->offset_y;
+
+      *horizontally = sx >= 0 && sx + sw <= shell->disp_width;
+      *vertically   = sy >= 0 && sy + sh <= shell->disp_height;
+    }
+  else
+    {
+      *horizontally = FALSE;
+      *vertically   = FALSE;
+    }
+
+  return *vertically && *horizontally;
+}
+
+/* We used to calculate the scale factor in the SCALEFACTOR_X() and
+ * SCALEFACTOR_Y() macros. But since these are rather frequently
+ * called and the values rarely change, we now store them in the
+ * shell and call this function whenever they need to be recalculated.
+ */
+void
+gimp_display_shell_scale_update (GimpDisplayShell *shell)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      gimp_display_shell_calculate_scale_x_and_y (shell,
+                                                  gimp_zoom_model_get_factor (shell->zoom),
+                                                  &shell->scale_x,
+                                                  &shell->scale_y);
+    }
+  else
+    {
+      shell->scale_x = 1.0;
+      shell->scale_y = 1.0;
+    }
+}
+
+/**
+ * gimp_display_shell_scale:
+ * @shell:     the #GimpDisplayShell
+ * @zoom_type: whether to zoom in, out or to a specific scale
+ * @scale:     ignored unless @zoom_type == %GIMP_ZOOM_TO
+ *
+ * This function figures out the context of the zoom and behaves
+ * appropriately thereafter.
+ *
+ **/
+void
+gimp_display_shell_scale (GimpDisplayShell *shell,
+                          GimpZoomType      zoom_type,
+                          gdouble           new_scale,
+                          GimpZoomFocus     zoom_focus)
+{
+  GimpDisplayConfig *config;
+  gdouble            current_scale;
+  gboolean           resize_window;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->canvas != NULL);
+
+  current_scale = gimp_zoom_model_get_factor (shell->zoom);
+
+  if (zoom_type != GIMP_ZOOM_TO)
+    new_scale = gimp_zoom_model_zoom_step (zoom_type, current_scale);
+
+  if (SCALE_EQUALS (new_scale, current_scale))
+    return;
+
+  config = shell->display->config;
+
+  /* Resize windows only in multi-window mode */
+  resize_window = (config->resize_windows_on_zoom &&
+                   ! GIMP_GUI_CONFIG (config)->single_window_mode);
+
+  if (resize_window)
+    {
+      /* If the window is resized on zoom, simply do the zoom and get
+       * things rolling
+       */
+      gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, new_scale);
+
+      gimp_display_shell_scale_resize (shell, TRUE, FALSE);
+    }
+  else
+    {
+      gdouble  x, y;
+      gint     image_center_x;
+      gint     image_center_y;
+
+      gimp_display_shell_scale_get_zoom_focus (shell,
+                                               new_scale,
+                                               current_scale,
+                                               &x,
+                                               &y,
+                                               zoom_focus);
+      gimp_display_shell_scale_get_image_center_viewport (shell,
+                                                          &image_center_x,
+                                                          &image_center_y);
+
+      gimp_display_shell_scale_to (shell, new_scale, x, y);
+
+      /* skip centering magic if pointer focus was requested */
+      if (zoom_focus != GIMP_ZOOM_FOCUS_POINTER)
+        {
+          gboolean starts_fitting_horiz;
+          gboolean starts_fitting_vert;
+          gboolean zoom_focus_almost_centered_horiz;
+          gboolean zoom_focus_almost_centered_vert;
+          gboolean image_center_almost_centered_horiz;
+          gboolean image_center_almost_centered_vert;
+
+          /* If an image axis started to fit due to zooming out or if
+           * the focus point is as good as in the center, center on
+           * that axis
+           */
+          gimp_display_shell_scale_image_starts_to_fit (shell,
+                                                        new_scale,
+                                                        current_scale,
+                                                        &starts_fitting_horiz,
+                                                        &starts_fitting_vert);
+
+          gimp_display_shell_scale_viewport_coord_almost_centered (shell,
+                                                                   x,
+                                                                   y,
+                                                                   &zoom_focus_almost_centered_horiz,
+                                                                   &zoom_focus_almost_centered_vert);
+          gimp_display_shell_scale_viewport_coord_almost_centered (shell,
+                                                                   image_center_x,
+                                                                   image_center_y,
+                                                                   &image_center_almost_centered_horiz,
+                                                                   &image_center_almost_centered_vert);
+
+          gimp_display_shell_scroll_center_image (shell,
+                                                  starts_fitting_horiz ||
+                                                  (zoom_focus_almost_centered_horiz &&
+                                                   image_center_almost_centered_horiz),
+                                                  starts_fitting_vert ||
+                                                  (zoom_focus_almost_centered_vert &&
+                                                   image_center_almost_centered_vert));
+        }
+    }
+}
+
+/**
+ * gimp_display_shell_scale_to_rectangle:
+ * @shell:         the #GimpDisplayShell
+ * @zoom_type:     whether to zoom in or out
+ * @x:             retangle's x in image coordinates
+ * @y:             retangle's y in image coordinates
+ * @width:         retangle's width in image coordinates
+ * @height:        retangle's height in image coordinates
+ * @resize_window: whether the display window should be resized
+ *
+ * Scales and scrolls to a specific image rectangle
+ **/
+void
+gimp_display_shell_scale_to_rectangle (GimpDisplayShell *shell,
+                                       GimpZoomType      zoom_type,
+                                       gdouble           x,
+                                       gdouble           y,
+                                       gdouble           width,
+                                       gdouble           height,
+                                       gboolean          resize_window)
+{
+  gdouble current_scale;
+  gdouble new_scale;
+  gdouble factor   = 1.0;
+  gint    offset_x = 0;
+  gint    offset_y = 0;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_transform_bounds (shell,
+                                       x, y,
+                                       x + width, y + height,
+                                       &x, &y,
+                                       &width, &height);
+
+  /* Convert scrolled (x1, y1, x2, y2) to unscrolled (x, y, width, height). */
+  width  -= x;
+  height -= y;
+  x      += shell->offset_x;
+  y      += shell->offset_y;
+
+  width  = MAX (1.0, width);
+  height = MAX (1.0, height);
+
+  current_scale = gimp_zoom_model_get_factor (shell->zoom);
+
+  switch (zoom_type)
+    {
+    case GIMP_ZOOM_IN:
+      factor = MIN ((shell->disp_width  / width),
+                    (shell->disp_height / height));
+      break;
+
+    case GIMP_ZOOM_OUT:
+      factor = MAX ((width  / shell->disp_width),
+                    (height / shell->disp_height));
+      break;
+
+    default:
+      g_return_if_reached ();
+      break;
+    }
+
+  new_scale = current_scale * factor;
+
+  switch (zoom_type)
+    {
+    case GIMP_ZOOM_IN:
+      /*  move the center of the rectangle to the center of the
+       *  viewport:
+       *
+       *  new_offset = center of rectangle in new scale screen coords
+       *               including offset
+       *               -
+       *               center of viewport in screen coords without
+       *               offset
+       */
+      offset_x = RINT (factor * (x + width  / 2.0) - (shell->disp_width  / 2));
+      offset_y = RINT (factor * (y + height / 2.0) - (shell->disp_height / 2));
+      break;
+
+    case GIMP_ZOOM_OUT:
+      /*  move the center of the viewport to the center of the
+       *  rectangle:
+       *
+       *  new_offset = center of viewport in new scale screen coords
+       *               including offset
+       *               -
+       *               center of rectangle in screen coords without
+       *               offset
+       */
+      offset_x = RINT (factor * (shell->offset_x + shell->disp_width  / 2) -
+                       ((x + width  / 2.0) - shell->offset_x));
+
+      offset_y = RINT (factor * (shell->offset_y + shell->disp_height / 2) -
+                       ((y + height / 2.0) - shell->offset_y));
+      break;
+
+    default:
+      break;
+    }
+
+  if (new_scale != current_scale   ||
+      offset_x  != shell->offset_x ||
+      offset_y  != shell->offset_y)
+    {
+      gimp_display_shell_scale_by_values (shell,
+                                          new_scale,
+                                          offset_x, offset_y,
+                                          resize_window);
+    }
+}
+
+/**
+ * gimp_display_shell_scale_fit_in:
+ * @shell: the #GimpDisplayShell
+ *
+ * Sets the scale such that the entire image precisely fits in the
+ * display area.
+ **/
+void
+gimp_display_shell_scale_fit_in (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_scale_fit_or_fill (shell,
+                                        /* fill = */ FALSE);
+ }
+
+/**
+ * gimp_display_shell_scale_fill:
+ * @shell: the #GimpDisplayShell
+ *
+ * Sets the scale such that the entire display area is precisely
+ * filled by the image.
+ **/
+void
+gimp_display_shell_scale_fill (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_scale_fit_or_fill (shell,
+                                        /* fill = */ TRUE);
+}
+
+/**
+ * gimp_display_shell_scale_by_values:
+ * @shell:         the #GimpDisplayShell
+ * @scale:         the new scale
+ * @offset_x:      the new X offset
+ * @offset_y:      the new Y offset
+ * @resize_window: whether the display window should be resized
+ *
+ * Directly sets the image scale and image offsets used by the display. If
+ * @resize_window is %TRUE then the display window is resized to better
+ * accommodate the image, see gimp_display_shell_shrink_wrap().
+ **/
+void
+gimp_display_shell_scale_by_values (GimpDisplayShell *shell,
+                                    gdouble           scale,
+                                    gint              offset_x,
+                                    gint              offset_y,
+                                    gboolean          resize_window)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  /*  Abort early if the values are all setup already. We don't
+   *  want to inadvertently resize the window (bug #164281).
+   */
+  if (SCALE_EQUALS (gimp_zoom_model_get_factor (shell->zoom), scale) &&
+      shell->offset_x == offset_x &&
+      shell->offset_y == offset_y)
+    return;
+
+  gimp_display_shell_scale_save_revert_values (shell);
+
+  /* freeze the active tool */
+  gimp_display_shell_pause (shell);
+
+  gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, scale);
+
+  shell->offset_x = offset_x;
+  shell->offset_y = offset_y;
+
+  gimp_display_shell_rotate_update_transform (shell);
+
+  gimp_display_shell_scale_resize (shell, resize_window, FALSE);
+
+  /* re-enable the active tool */
+  gimp_display_shell_resume (shell);
+}
+
+void
+gimp_display_shell_scale_drag (GimpDisplayShell *shell,
+                               gdouble           start_x,
+                               gdouble           start_y,
+                               gdouble           delta_x,
+                               gdouble           delta_y)
+{
+  gdouble scale;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  scale = gimp_zoom_model_get_factor (shell->zoom);
+
+  gimp_display_shell_push_zoom_focus_pointer_pos (shell, start_x, start_y);
+
+  if (delta_y > 0)
+    {
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_TO,
+                                scale * 1.1,
+                                GIMP_ZOOM_FOCUS_POINTER);
+    }
+  else if (delta_y < 0)
+    {
+      gimp_display_shell_scale (shell,
+                                GIMP_ZOOM_TO,
+                                scale * 0.9,
+                                GIMP_ZOOM_FOCUS_POINTER);
+    }
+}
+
+/**
+ * gimp_display_shell_scale_shrink_wrap:
+ * @shell: the #GimpDisplayShell
+ *
+ * Convenience function with the same functionality as
+ * gimp_display_shell_scale_resize(@shell, TRUE, grow_only).
+ **/
+void
+gimp_display_shell_scale_shrink_wrap (GimpDisplayShell *shell,
+                                      gboolean          grow_only)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_scale_resize (shell, TRUE, grow_only);
+}
+
+/**
+ * gimp_display_shell_scale_resize:
+ * @shell:          the #GimpDisplayShell
+ * @resize_window:  whether the display window should be resized
+ * @grow_only:      whether shrinking of the window is allowed or not
+ *
+ * Function commonly called after a change in display scale to make the changes
+ * visible to the user. If @resize_window is %TRUE then the display window is
+ * resized to accommodate the display image as per
+ * gimp_display_shell_shrink_wrap().
+ **/
+void
+gimp_display_shell_scale_resize (GimpDisplayShell *shell,
+                                 gboolean          resize_window,
+                                 gboolean          grow_only)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  /* freeze the active tool */
+  gimp_display_shell_pause (shell);
+
+  if (resize_window)
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+
+      if (window && gimp_image_window_get_active_shell (window) == shell)
+        {
+          gimp_image_window_shrink_wrap (window, grow_only);
+        }
+    }
+
+  gimp_display_shell_scroll_clamp_and_update (shell);
+  gimp_display_shell_scaled (shell);
+
+  gimp_display_shell_expose_full (shell);
+
+  /* re-enable the active tool */
+  gimp_display_shell_resume (shell);
+}
+
+void
+gimp_display_shell_set_initial_scale (GimpDisplayShell *shell,
+                                      gdouble           scale,
+                                      gint             *display_width,
+                                      gint             *display_height)
+{
+  GimpImage *image;
+  GdkScreen *screen;
+  gint       image_width;
+  gint       image_height;
+  gint       shell_width;
+  gint       shell_height;
+  gint       screen_width;
+  gint       screen_height;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  screen = gtk_widget_get_screen (GTK_WIDGET (shell));
+
+  image_width  = gimp_image_get_width  (image);
+  image_height = gimp_image_get_height (image);
+
+  screen_width  = gdk_screen_get_width (screen)  * 0.75;
+  screen_height = gdk_screen_get_height (screen) * 0.75;
+
+  /* We need to zoom before we use SCALE[XY] */
+  gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, scale);
+
+  shell_width  = SCALEX (shell, image_width);
+  shell_height = SCALEY (shell, image_height);
+
+  if (shell->display->config->initial_zoom_to_fit)
+    {
+      /*  Limit to the size of the screen...  */
+      if (shell_width > screen_width || shell_height > screen_height)
+        {
+          gdouble new_scale;
+          gdouble current = gimp_zoom_model_get_factor (shell->zoom);
+
+          new_scale = current * MIN (((gdouble) screen_height) / shell_height,
+                                     ((gdouble) screen_width)  / shell_width);
+
+          new_scale = gimp_zoom_model_zoom_step (GIMP_ZOOM_OUT, new_scale);
+
+          /*  Since zooming out might skip a zoom step we zoom in
+           *  again and test if we are small enough.
+           */
+          gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO,
+                                gimp_zoom_model_zoom_step (GIMP_ZOOM_IN,
+                                                           new_scale));
+
+          if (SCALEX (shell, image_width) > screen_width ||
+              SCALEY (shell, image_height) > screen_height)
+            gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, new_scale);
+
+          shell_width  = SCALEX (shell, image_width);
+          shell_height = SCALEY (shell, image_height);
+        }
+    }
+  else
+    {
+      /*  Set up size like above, but do not zoom to fit. Useful when
+       *  working on large images.
+       */
+      if (shell_width > screen_width)
+        shell_width = screen_width;
+
+      if (shell_height > screen_height)
+        shell_height = screen_height;
+    }
+
+  if (display_width)
+    *display_width = shell_width;
+
+  if (display_height)
+    *display_height = shell_height;
+}
+
+/**
+ * gimp_display_shell_get_rotated_scale:
+ * @shell:   the #GimpDisplayShell
+ * @scale_x: horizontal scale output
+ * @scale_y: vertical scale output
+ *
+ * Returns the screen space horizontal and vertical scaling
+ * factors, taking rotation into account.
+ **/
+void
+gimp_display_shell_get_rotated_scale (GimpDisplayShell *shell,
+                                      gdouble          *scale_x,
+                                      gdouble          *scale_y)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->rotate_angle == 0.0 || shell->scale_x == shell->scale_y)
+    {
+      if (scale_x) *scale_x = shell->scale_x;
+      if (scale_y) *scale_y = shell->scale_y;
+    }
+  else
+    {
+      gdouble a     = G_PI * shell->rotate_angle / 180.0;
+      gdouble cos_a = cos (a);
+      gdouble sin_a = sin (a);
+
+      if (scale_x) *scale_x = 1.0 / sqrt (SQR (cos_a / shell->scale_x) +
+                                          SQR (sin_a / shell->scale_y));
+
+      if (scale_y) *scale_y = 1.0 / sqrt (SQR (cos_a / shell->scale_y) +
+                                          SQR (sin_a / shell->scale_x));
+    }
+}
+
+/**
+ * gimp_display_shell_push_zoom_focus_pointer_pos:
+ * @shell:
+ * @x:
+ * @y:
+ *
+ * When the zoom focus mechanism asks for the pointer the next time,
+ * use @x and @y.
+ **/
+void
+gimp_display_shell_push_zoom_focus_pointer_pos (GimpDisplayShell *shell,
+                                                gint              x,
+                                                gint              y)
+{
+  GdkPoint *point = g_slice_new (GdkPoint);
+  point->x = x;
+  point->y = y;
+
+  g_queue_push_head (shell->zoom_focus_pointer_queue,
+                     point);
+}
+
+
+/*  private functions   */
+
+static void
+gimp_display_shell_scale_get_screen_resolution (GimpDisplayShell *shell,
+                                                gdouble          *xres,
+                                                gdouble          *yres)
+{
+  gdouble x, y;
+
+  if (shell->dot_for_dot)
+    {
+      gimp_image_get_resolution (gimp_display_get_image (shell->display),
+                                 &x, &y);
+    }
+  else
+    {
+      x = shell->monitor_xres;
+      y = shell->monitor_yres;
+    }
+
+  if (xres) *xres = x;
+  if (yres) *yres = y;
+}
+
+/**
+ * gimp_display_shell_scale_get_image_size_for_scale:
+ * @shell:
+ * @scale:
+ * @w:
+ * @h:
+ *
+ **/
+static void
+gimp_display_shell_scale_get_image_size_for_scale (GimpDisplayShell *shell,
+                                                   gdouble           scale,
+                                                   gint             *w,
+                                                   gint             *h)
+{
+  GimpImage *image = gimp_display_get_image (shell->display);
+  gdouble    scale_x;
+  gdouble    scale_y;
+
+  gimp_display_shell_calculate_scale_x_and_y (shell, scale, &scale_x, &scale_y);
+
+  if (w) *w = scale_x * gimp_image_get_width  (image);
+  if (h) *h = scale_y * gimp_image_get_height (image);
+}
+
+/**
+ * gimp_display_shell_calculate_scale_x_and_y:
+ * @shell:
+ * @scale:
+ * @scale_x:
+ * @scale_y:
+ *
+ **/
+static void
+gimp_display_shell_calculate_scale_x_and_y (GimpDisplayShell *shell,
+                                            gdouble           scale,
+                                            gdouble          *scale_x,
+                                            gdouble          *scale_y)
+{
+  GimpImage *image = gimp_display_get_image (shell->display);
+  gdouble    xres;
+  gdouble    yres;
+  gdouble    screen_xres;
+  gdouble    screen_yres;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+  gimp_display_shell_scale_get_screen_resolution (shell,
+                                                  &screen_xres, &screen_yres);
+
+  if (scale_x) *scale_x = scale * screen_xres / xres;
+  if (scale_y) *scale_y = scale * screen_yres / yres;
+}
+
+/**
+ * gimp_display_shell_scale_to:
+ * @shell:
+ * @scale:
+ * @viewport_x:
+ * @viewport_y:
+ *
+ * Zooms. The display offsets are adjusted so that the point specified
+ * by @x and @y doesn't change it's position on screen.
+ **/
+static void
+gimp_display_shell_scale_to (GimpDisplayShell *shell,
+                             gdouble           scale,
+                             gdouble           viewport_x,
+                             gdouble           viewport_y)
+{
+  gdouble image_x, image_y;
+  gdouble new_viewport_x, new_viewport_y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->display)
+    return;
+
+  /* freeze the active tool */
+  gimp_display_shell_pause (shell);
+
+  gimp_display_shell_untransform_xy_f (shell,
+                                       viewport_x,
+                                       viewport_y,
+                                       &image_x,
+                                       &image_y);
+
+  /* Note that we never come here if we need to resize_windows_on_zoom
+   */
+  gimp_display_shell_scale_by_values (shell,
+                                      scale,
+                                      shell->offset_x,
+                                      shell->offset_y,
+                                      FALSE);
+
+  gimp_display_shell_transform_xy_f (shell,
+                                     image_x,
+                                     image_y,
+                                     &new_viewport_x,
+                                     &new_viewport_y);
+
+  gimp_display_shell_scroll (shell,
+                             new_viewport_x - viewport_x,
+                             new_viewport_y - viewport_y);
+
+  /* re-enable the active tool */
+  gimp_display_shell_resume (shell);
+}
+
+/**
+ * gimp_display_shell_scale_fit_or_fill:
+ * @shell: the #GimpDisplayShell
+ * @fill:  whether to scale the image to fill the viewport,
+ *         or fit inside the viewport
+ *
+ * A common implementation for gimp_display_shell_scale_{fit_in,fill}().
+ **/
+static void
+gimp_display_shell_scale_fit_or_fill (GimpDisplayShell *shell,
+                                      gboolean          fill)
+{
+  GeglRectangle bounding_box;
+  gdouble       image_x;
+  gdouble       image_y;
+  gdouble       image_width;
+  gdouble       image_height;
+  gdouble       current_scale;
+  gdouble       zoom_factor;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      GimpImage *image = gimp_display_get_image (shell->display);
+
+      bounding_box.x      = 0;
+      bounding_box.y      = 0;
+      bounding_box.width  = gimp_image_get_width  (image);
+      bounding_box.height = gimp_image_get_height (image);
+    }
+  else
+    {
+      bounding_box = gimp_display_shell_get_bounding_box (shell);
+    }
+
+  gimp_display_shell_transform_bounds (shell,
+                                       bounding_box.x,
+                                       bounding_box.y,
+                                       bounding_box.x + bounding_box.width,
+                                       bounding_box.y + bounding_box.height,
+                                       &image_x,
+                                       &image_y,
+                                       &image_width,
+                                       &image_height);
+
+  image_width  -= image_x;
+  image_height -= image_y;
+
+  current_scale = gimp_zoom_model_get_factor (shell->zoom);
+
+  if (fill)
+    {
+      zoom_factor = MAX (shell->disp_width  / image_width,
+                         shell->disp_height / image_height);
+    }
+  else
+    {
+      zoom_factor = MIN (shell->disp_width  / image_width,
+                         shell->disp_height / image_height);
+    }
+
+  gimp_display_shell_scale (shell,
+                            GIMP_ZOOM_TO,
+                            zoom_factor * current_scale,
+                            GIMP_ZOOM_FOCUS_BEST_GUESS);
+
+  gimp_display_shell_scroll_center_content (shell, TRUE, TRUE);
+}
+
+static gboolean
+gimp_display_shell_scale_image_starts_to_fit (GimpDisplayShell *shell,
+                                              gdouble           new_scale,
+                                              gdouble           current_scale,
+                                              gboolean         *vertically,
+                                              gboolean         *horizontally)
+{
+  gboolean vertically_dummy;
+  gboolean horizontally_dummy;
+
+  if (! vertically)   vertically   = &vertically_dummy;
+  if (! horizontally) horizontally = &horizontally_dummy;
+
+  /* The image can only start to fit if we zoom out */
+  if (new_scale > current_scale ||
+      gimp_display_shell_get_infinite_canvas (shell))
+    {
+      *vertically   = FALSE;
+      *horizontally = FALSE;
+    }
+  else
+    {
+      gint current_scale_width;
+      gint current_scale_height;
+      gint new_scale_width;
+      gint new_scale_height;
+
+      gimp_display_shell_scale_get_image_size_for_scale (shell,
+                                                         current_scale,
+                                                         &current_scale_width,
+                                                         &current_scale_height);
+
+      gimp_display_shell_scale_get_image_size_for_scale (shell,
+                                                         new_scale,
+                                                         &new_scale_width,
+                                                         &new_scale_height);
+
+      *vertically   = (current_scale_width  >  shell->disp_width &&
+                       new_scale_width      <= shell->disp_width);
+      *horizontally = (current_scale_height >  shell->disp_height &&
+                       new_scale_height     <= shell->disp_height);
+    }
+
+  return *vertically && *horizontally;
+}
+
+static gboolean
+gimp_display_shell_scale_image_stops_to_fit (GimpDisplayShell *shell,
+                                             gdouble           new_scale,
+                                             gdouble           current_scale,
+                                             gboolean         *vertically,
+                                             gboolean         *horizontally)
+{
+  return gimp_display_shell_scale_image_starts_to_fit (shell,
+                                                       current_scale,
+                                                       new_scale,
+                                                       vertically,
+                                                       horizontally);
+}
+
+/**
+ * gimp_display_shell_scale_viewport_coord_almost_centered:
+ * @shell:
+ * @x:
+ * @y:
+ * @horizontally:
+ * @vertically:
+ *
+ **/
+static gboolean
+gimp_display_shell_scale_viewport_coord_almost_centered (GimpDisplayShell *shell,
+                                                         gint              x,
+                                                         gint              y,
+                                                         gboolean         *horizontally,
+                                                         gboolean         *vertically)
+{
+  gboolean local_horizontally = FALSE;
+  gboolean local_vertically   = FALSE;
+  gint     center_x           = shell->disp_width  / 2;
+  gint     center_y           = shell->disp_height / 2;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      local_horizontally = (x > center_x - ALMOST_CENTERED_THRESHOLD &&
+                            x < center_x + ALMOST_CENTERED_THRESHOLD);
+
+      local_vertically   = (y > center_y - ALMOST_CENTERED_THRESHOLD &&
+                            y < center_y + ALMOST_CENTERED_THRESHOLD);
+    }
+
+  if (horizontally) *horizontally = local_horizontally;
+  if (vertically)   *vertically   = local_vertically;
+
+  return local_horizontally && local_vertically;
+}
+
+static void
+gimp_display_shell_scale_get_image_center_viewport (GimpDisplayShell *shell,
+                                                    gint             *image_center_x,
+                                                    gint             *image_center_y)
+{
+  gint sw, sh;
+
+  gimp_display_shell_scale_get_image_size (shell, &sw, &sh);
+
+  if (image_center_x) *image_center_x = -shell->offset_x + sw / 2;
+  if (image_center_y) *image_center_y = -shell->offset_y + sh / 2;
+}
+
+/**
+ * gimp_display_shell_scale_get_zoom_focus:
+ * @shell:
+ * @new_scale:
+ * @x:
+ * @y:
+ *
+ * Calculates the viewport coordinate to focus on when zooming
+ * independently for each axis.
+ **/
+static void
+gimp_display_shell_scale_get_zoom_focus (GimpDisplayShell *shell,
+                                         gdouble           new_scale,
+                                         gdouble           current_scale,
+                                         gdouble          *x,
+                                         gdouble          *y,
+                                         GimpZoomFocus     zoom_focus)
+{
+  GtkWidget *window = GTK_WIDGET (gimp_display_shell_get_window (shell));
+  GdkEvent  *event;
+  gint       image_center_x;
+  gint       image_center_y;
+  gint       other_x;
+  gint       other_y;
+
+  /* Calculate stops-to-fit focus point */
+  gimp_display_shell_scale_get_image_center_viewport (shell,
+                                                      &image_center_x,
+                                                      &image_center_y);
+
+  /* Calculate other focus point, default is the canvas center */
+  other_x = shell->disp_width  / 2;
+  other_y = shell->disp_height / 2;
+
+  /*  Center on the mouse position instead of the display center if
+   *  one of the following conditions are fulfilled and pointer is
+   *  within the canvas:
+   *
+   *   (1) there's no current event (the action was triggered by an
+   *       input controller)
+   *   (2) the event originates from the canvas (a scroll event)
+   *   (3) the event originates from the window (a key press event)
+   *
+   *  Basically the only situation where we don't want to center on
+   *  mouse position is if the action is being called from a menu.
+   */
+  event = gtk_get_current_event ();
+
+  if (! event ||
+      gtk_get_event_widget (event) == shell->canvas ||
+      gtk_get_event_widget (event) == window)
+    {
+      GdkPoint *point = g_queue_pop_head (shell->zoom_focus_pointer_queue);
+      gint      canvas_pointer_x;
+      gint      canvas_pointer_y;
+
+      if (point)
+        {
+          canvas_pointer_x = point->x;
+          canvas_pointer_y = point->y;
+
+          g_slice_free (GdkPoint, point);
+        }
+      else
+        {
+          gtk_widget_get_pointer (shell->canvas,
+                                  &canvas_pointer_x,
+                                  &canvas_pointer_y);
+        }
+
+      if (canvas_pointer_x >= 0 &&
+          canvas_pointer_y >= 0 &&
+          canvas_pointer_x <  shell->disp_width &&
+          canvas_pointer_y <  shell->disp_height)
+        {
+          other_x = canvas_pointer_x;
+          other_y = canvas_pointer_y;
+        }
+    }
+
+  if (zoom_focus == GIMP_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS)
+    {
+      if (gimp_display_shell_scale_viewport_coord_almost_centered (shell,
+                                                                   image_center_x,
+                                                                   image_center_y,
+                                                                   NULL,
+                                                                   NULL))
+        {
+          zoom_focus = GIMP_ZOOM_FOCUS_IMAGE_CENTER;
+        }
+      else
+        {
+          zoom_focus = GIMP_ZOOM_FOCUS_BEST_GUESS;
+        }
+    }
+
+  switch (zoom_focus)
+    {
+    case GIMP_ZOOM_FOCUS_POINTER:
+      *x = other_x;
+      *y = other_y;
+      break;
+
+    case GIMP_ZOOM_FOCUS_IMAGE_CENTER:
+      *x = image_center_x;
+      *y = image_center_y;
+      break;
+
+    case GIMP_ZOOM_FOCUS_BEST_GUESS:
+    default:
+      {
+        gboolean within_horizontally, within_vertically;
+        gboolean stops_horizontally, stops_vertically;
+
+        gimp_display_shell_scale_image_is_within_viewport (shell,
+                                                           &within_horizontally,
+                                                           &within_vertically);
+
+        gimp_display_shell_scale_image_stops_to_fit (shell,
+                                                     new_scale,
+                                                     current_scale,
+                                                     &stops_horizontally,
+                                                     &stops_vertically);
+
+        *x = within_horizontally && ! stops_horizontally ? image_center_x : other_x;
+        *y = within_vertically   && ! stops_vertically   ? image_center_y : other_y;
+      }
+      break;
+    }
+}
diff --git a/app/display/gimpdisplayshell-scale.h b/app/display/gimpdisplayshell-scale.h
new file mode 100644
index 0000000..b97f9fb
--- /dev/null
+++ b/app/display/gimpdisplayshell-scale.h
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_SCALE_H__
+#define __GIMP_DISPLAY_SHELL_SCALE_H__
+
+
+gboolean gimp_display_shell_scale_revert             (GimpDisplayShell *shell);
+gboolean gimp_display_shell_scale_can_revert         (GimpDisplayShell *shell);
+void     gimp_display_shell_scale_save_revert_values (GimpDisplayShell *shell);
+
+void     gimp_display_shell_scale_set_dot_for_dot    (GimpDisplayShell *shell,
+                                                      gboolean          dot_for_dot);
+
+void     gimp_display_shell_scale_get_image_size     (GimpDisplayShell *shell,
+                                                      gint             *w,
+                                                      gint             *h);
+void     gimp_display_shell_scale_get_image_bounds   (GimpDisplayShell *shell,
+                                                      gint             *x,
+                                                      gint             *y,
+                                                      gint             *w,
+                                                      gint             *h);
+void     gimp_display_shell_scale_get_image_unrotated_bounds
+                                                     (GimpDisplayShell *shell,
+                                                      gint             *x,
+                                                      gint             *y,
+                                                      gint             *w,
+                                                      gint             *h);
+void     gimp_display_shell_scale_get_image_bounding_box
+                                                     (GimpDisplayShell *shell,
+                                                      gint             *x,
+                                                      gint             *y,
+                                                      gint             *w,
+                                                      gint             *h);
+void     gimp_display_shell_scale_get_image_unrotated_bounding_box
+                                                     (GimpDisplayShell *shell,
+                                                      gint             *x,
+                                                      gint             *y,
+                                                      gint             *w,
+                                                      gint             *h);
+gboolean gimp_display_shell_scale_image_is_within_viewport
+                                                     (GimpDisplayShell *shell,
+                                                      gboolean         *horizontally,
+                                                      gboolean         *vertically);
+
+void     gimp_display_shell_scale_update             (GimpDisplayShell *shell);
+
+void     gimp_display_shell_scale                    (GimpDisplayShell *shell,
+                                                      GimpZoomType      zoom_type,
+                                                      gdouble           scale,
+                                                      GimpZoomFocus     zoom_focus);
+void     gimp_display_shell_scale_to_rectangle       (GimpDisplayShell *shell,
+                                                      GimpZoomType      zoom_type,
+                                                      gdouble           x,
+                                                      gdouble           y,
+                                                      gdouble           width,
+                                                      gdouble           height,
+                                                      gboolean          resize_window);
+void     gimp_display_shell_scale_fit_in             (GimpDisplayShell *shell);
+void     gimp_display_shell_scale_fill               (GimpDisplayShell *shell);
+void     gimp_display_shell_scale_by_values          (GimpDisplayShell *shell,
+                                                      gdouble           scale,
+                                                      gint              offset_x,
+                                                      gint              offset_y,
+                                                      gboolean          resize_window);
+
+void     gimp_display_shell_scale_drag               (GimpDisplayShell *shell,
+                                                      gdouble           start_x,
+                                                      gdouble           start_y,
+                                                      gdouble           delta_x,
+                                                      gdouble           delta_y);
+
+void     gimp_display_shell_scale_shrink_wrap        (GimpDisplayShell *shell,
+                                                      gboolean          grow_only);
+void     gimp_display_shell_scale_resize             (GimpDisplayShell *shell,
+                                                      gboolean          resize_window,
+                                                      gboolean          grow_only);
+void     gimp_display_shell_set_initial_scale        (GimpDisplayShell *shell,
+                                                      gdouble           scale,
+                                                      gint             *display_width,
+                                                      gint             *display_height);
+
+void     gimp_display_shell_get_rotated_scale        (GimpDisplayShell *shell,
+                                                      gdouble          *scale_x,
+                                                      gdouble          *scale_y);
+
+/*  debug API for testing  */
+
+void  gimp_display_shell_push_zoom_focus_pointer_pos (GimpDisplayShell *shell,
+                                                      gint              x,
+                                                      gint              y);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_SCALE_H__  */
diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c
new file mode 100644
index 0000000..ec5084d
--- /dev/null
+++ b/app/display/gimpdisplayshell-scroll.c
@@ -0,0 +1,529 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpcanvas.h"
+#include "gimpdisplay.h"
+#include "gimpdisplay-foreach.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-rulers.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-scrollbars.h"
+#include "gimpdisplayshell-transform.h"
+
+
+#define OVERPAN_FACTOR 0.5
+
+
+/**
+ * gimp_display_shell_scroll:
+ * @shell:
+ * @x_offset:
+ * @y_offset:
+ *
+ * This function scrolls the image in the shell's viewport. It does
+ * actual scrolling of the pixels, so only the newly scrolled-in parts
+ * are freshly redrawn.
+ *
+ * Use it for incremental actual panning.
+ **/
+void
+gimp_display_shell_scroll (GimpDisplayShell *shell,
+                           gint              x_offset,
+                           gint              y_offset)
+{
+  gint old_x;
+  gint old_y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (x_offset == 0 && y_offset == 0)
+    return;
+
+  old_x = shell->offset_x;
+  old_y = shell->offset_y;
+
+  /* freeze the active tool */
+  gimp_display_shell_pause (shell);
+
+  shell->offset_x += x_offset;
+  shell->offset_y += y_offset;
+
+  gimp_display_shell_scroll_clamp_and_update (shell);
+
+  /*  the actual changes in offset  */
+  x_offset = (shell->offset_x - old_x);
+  y_offset = (shell->offset_y - old_y);
+
+  if (x_offset || y_offset)
+    {
+      gimp_display_shell_scrolled (shell);
+
+      gimp_overlay_box_scroll (GIMP_OVERLAY_BOX (shell->canvas),
+                               -x_offset, -y_offset);
+
+    }
+
+  /* re-enable the active tool */
+  gimp_display_shell_resume (shell);
+}
+
+/**
+ * gimp_display_shell_scroll_set_offsets:
+ * @shell:
+ * @offset_x:
+ * @offset_y:
+ *
+ * This function scrolls the image in the shell's viewport. It redraws
+ * the entire canvas.
+ *
+ * Use it for setting the scroll offset on freshly scaled images or
+ * when the window is resized. For panning, use
+ * gimp_display_shell_scroll().
+ **/
+void
+gimp_display_shell_scroll_set_offset (GimpDisplayShell *shell,
+                                      gint              offset_x,
+                                      gint              offset_y)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->offset_x == offset_x &&
+      shell->offset_y == offset_y)
+    return;
+
+  gimp_display_shell_scale_save_revert_values (shell);
+
+  /* freeze the active tool */
+  gimp_display_shell_pause (shell);
+
+  shell->offset_x = offset_x;
+  shell->offset_y = offset_y;
+
+  gimp_display_shell_scroll_clamp_and_update (shell);
+
+  gimp_display_shell_scrolled (shell);
+
+  gimp_display_shell_expose_full (shell);
+
+  /* re-enable the active tool */
+  gimp_display_shell_resume (shell);
+}
+
+/**
+ * gimp_display_shell_scroll_clamp_and_update:
+ * @shell:
+ *
+ * Helper function for calling two functions that are commonly called
+ * in pairs.
+ **/
+void
+gimp_display_shell_scroll_clamp_and_update (GimpDisplayShell *shell)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      if (! shell->show_all)
+        {
+          gint bounds_x;
+          gint bounds_y;
+          gint bounds_width;
+          gint bounds_height;
+          gint min_offset_x;
+          gint max_offset_x;
+          gint min_offset_y;
+          gint max_offset_y;
+          gint offset_x;
+          gint offset_y;
+
+          gimp_display_shell_rotate_update_transform (shell);
+
+          gimp_display_shell_scale_get_image_bounds (shell,
+                                                     &bounds_x,
+                                                     &bounds_y,
+                                                     &bounds_width,
+                                                     &bounds_height);
+
+          if (shell->disp_width < bounds_width)
+            {
+              min_offset_x = bounds_x -
+                             shell->disp_width * OVERPAN_FACTOR;
+              max_offset_x = bounds_x + bounds_width -
+                             shell->disp_width * (1.0 - OVERPAN_FACTOR);
+            }
+          else
+            {
+              gint overpan_amount;
+
+              overpan_amount = shell->disp_width -
+                               bounds_width * (1.0 - OVERPAN_FACTOR);
+
+              min_offset_x = bounds_x -
+                             overpan_amount;
+              max_offset_x = bounds_x + bounds_width - shell->disp_width +
+                             overpan_amount;
+            }
+
+          if (shell->disp_height < bounds_height)
+            {
+              min_offset_y = bounds_y -
+                             shell->disp_height * OVERPAN_FACTOR;
+              max_offset_y = bounds_y + bounds_height -
+                             shell->disp_height * (1.0 - OVERPAN_FACTOR);
+            }
+          else
+            {
+              gint overpan_amount;
+
+              overpan_amount = shell->disp_height -
+                               bounds_height * (1.0 - OVERPAN_FACTOR);
+
+              min_offset_y = bounds_y -
+                             overpan_amount;
+              max_offset_y = bounds_y + bounds_height +
+                             overpan_amount - shell->disp_height;
+            }
+
+          /* Clamp */
+
+          offset_x = CLAMP (shell->offset_x, min_offset_x, max_offset_x);
+          offset_y = CLAMP (shell->offset_y, min_offset_y, max_offset_y);
+
+          if (offset_x != shell->offset_x || offset_y != shell->offset_y)
+            {
+              shell->offset_x = offset_x;
+              shell->offset_y = offset_y;
+
+              gimp_display_shell_rotate_update_transform (shell);
+            }
+
+          /* Set scrollbar stepper sensitiity */
+
+          gimp_display_shell_scrollbars_update_steppers (shell,
+                                                         min_offset_x,
+                                                         max_offset_x,
+                                                         min_offset_y,
+                                                         max_offset_y);
+        }
+      else
+        {
+          /* Set scrollbar stepper sensitiity */
+
+          gimp_display_shell_scrollbars_update_steppers (shell,
+                                                         G_MININT,
+                                                         G_MAXINT,
+                                                         G_MININT,
+                                                         G_MAXINT);
+        }
+    }
+  else
+    {
+      shell->offset_x = 0;
+      shell->offset_y = 0;
+    }
+
+  gimp_display_shell_scrollbars_update (shell);
+  gimp_display_shell_rulers_update (shell);
+}
+
+/**
+ * gimp_display_shell_scroll_unoverscrollify:
+ * @shell:
+ * @in_offset_x:
+ * @in_offset_y:
+ * @out_offset_x:
+ * @out_offset_y:
+ *
+ * Takes a scroll offset and returns the offset that will not result
+ * in a scroll beyond the image border. If the image is already
+ * overscrolled, the return value is 0 for that given axis.
+ **/
+void
+gimp_display_shell_scroll_unoverscrollify (GimpDisplayShell *shell,
+                                           gint              in_offset_x,
+                                           gint              in_offset_y,
+                                           gint             *out_offset_x,
+                                           gint             *out_offset_y)
+{
+  gint sw, sh;
+  gint out_offset_x_dummy, out_offset_y_dummy;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! out_offset_x) out_offset_x = &out_offset_x_dummy;
+  if (! out_offset_y) out_offset_y = &out_offset_y_dummy;
+
+  *out_offset_x = in_offset_x;
+  *out_offset_y = in_offset_y;
+
+  if (! shell->show_all)
+    {
+      gimp_display_shell_scale_get_image_size (shell, &sw, &sh);
+
+      if (in_offset_x < 0)
+        {
+          *out_offset_x = MAX (in_offset_x,
+                               MIN (0, 0 - shell->offset_x));
+        }
+      else if (in_offset_x > 0)
+        {
+          gint min_offset = sw - shell->disp_width;
+
+          *out_offset_x = MIN (in_offset_x,
+                               MAX (0, min_offset - shell->offset_x));
+        }
+
+      if (in_offset_y < 0)
+        {
+          *out_offset_y = MAX (in_offset_y,
+                               MIN (0, 0 - shell->offset_y));
+        }
+      else if (in_offset_y > 0)
+        {
+          gint min_offset = sh - shell->disp_height;
+
+          *out_offset_y = MIN (in_offset_y,
+                               MAX (0, min_offset - shell->offset_y));
+        }
+    }
+}
+
+/**
+ * gimp_display_shell_scroll_center_image_xy:
+ * @shell:
+ * @image_x:
+ * @image_y:
+ *
+ * Center the viewport around the passed image coordinate
+ **/
+void
+gimp_display_shell_scroll_center_image_xy (GimpDisplayShell *shell,
+                                           gdouble           image_x,
+                                           gdouble           image_y)
+{
+  gint viewport_x;
+  gint viewport_y;
+
+  gimp_display_shell_transform_xy (shell,
+                                   image_x, image_y,
+                                   &viewport_x, &viewport_y);
+
+  gimp_display_shell_scroll (shell,
+                             viewport_x - shell->disp_width  / 2,
+                             viewport_y - shell->disp_height / 2);
+}
+
+/**
+ * gimp_display_shell_scroll_center_image:
+ * @shell:
+ * @horizontally:
+ * @vertically:
+ *
+ * Centers the image in the display shell on the desired axes.
+ **/
+void
+gimp_display_shell_scroll_center_image (GimpDisplayShell *shell,
+                                        gboolean          horizontally,
+                                        gboolean          vertically)
+{
+  gint image_x;
+  gint image_y;
+  gint image_width;
+  gint image_height;
+  gint center_x;
+  gint center_y;
+  gint offset_x = 0;
+  gint offset_y = 0;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->display                          ||
+      ! gimp_display_get_image (shell->display) ||
+      (! vertically && ! horizontally))
+    return;
+
+  gimp_display_shell_scale_get_image_bounds (shell,
+                                             &image_x, &image_y,
+                                             &image_width, &image_height);
+
+  if (shell->disp_width > image_width)
+    {
+      image_x     -= (shell->disp_width - image_width) / 2;
+      image_width  = shell->disp_width;
+    }
+
+  if (shell->disp_height > image_height)
+    {
+      image_y      -= (shell->disp_height - image_height) / 2;
+      image_height  = shell->disp_height;
+    }
+
+  center_x = image_x + image_width  / 2;
+  center_y = image_y + image_height / 2;
+
+  if (horizontally)
+    offset_x = center_x - shell->disp_width / 2 - shell->offset_x;
+
+  if (vertically)
+    offset_y = center_y - shell->disp_height / 2 - shell->offset_y;
+
+  gimp_display_shell_scroll (shell, offset_x, offset_y);
+}
+
+/**
+ * gimp_display_shell_scroll_center_image:
+ * @shell:
+ * @horizontally:
+ * @vertically:
+ *
+ * Centers the image content in the display shell on the desired axes.
+ **/
+void
+gimp_display_shell_scroll_center_content (GimpDisplayShell *shell,
+                                          gboolean          horizontally,
+                                          gboolean          vertically)
+{
+  gint content_x;
+  gint content_y;
+  gint content_width;
+  gint content_height;
+  gint center_x;
+  gint center_y;
+  gint offset_x = 0;
+  gint offset_y = 0;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->display                          ||
+      ! gimp_display_get_image (shell->display) ||
+      (! vertically && ! horizontally))
+    return;
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      gimp_display_shell_scale_get_image_bounds (shell,
+                                                 &content_x,
+                                                 &content_y,
+                                                 &content_width,
+                                                 &content_height);
+    }
+  else
+    {
+      gimp_display_shell_scale_get_image_bounding_box (shell,
+                                                       &content_x,
+                                                       &content_y,
+                                                       &content_width,
+                                                       &content_height);
+    }
+
+  if (shell->disp_width > content_width)
+    {
+      content_x     -= (shell->disp_width - content_width) / 2;
+      content_width  = shell->disp_width;
+    }
+
+  if (shell->disp_height > content_height)
+    {
+      content_y      -= (shell->disp_height - content_height) / 2;
+      content_height  = shell->disp_height;
+    }
+
+  center_x = content_x + content_width  / 2;
+  center_y = content_y + content_height / 2;
+
+  if (horizontally)
+    offset_x = center_x - shell->disp_width / 2 - shell->offset_x;
+
+  if (vertically)
+    offset_y = center_y - shell->disp_height / 2 - shell->offset_y;
+
+  gimp_display_shell_scroll (shell, offset_x, offset_y);
+}
+
+/**
+ * gimp_display_shell_scroll_get_scaled_viewport:
+ * @shell:
+ * @x:
+ * @y:
+ * @w:
+ * @h:
+ *
+ * Gets the viewport in screen coordinates, with origin at (0, 0) in
+ * the image.
+ **/
+void
+gimp_display_shell_scroll_get_scaled_viewport (GimpDisplayShell *shell,
+                                               gint             *x,
+                                               gint             *y,
+                                               gint             *w,
+                                               gint             *h)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  *x = shell->offset_x;
+  *y = shell->offset_y;
+  *w = shell->disp_width;
+  *h = shell->disp_height;
+}
+
+/**
+ * gimp_display_shell_scroll_get_viewport:
+ * @shell:
+ * @x:
+ * @y:
+ * @w:
+ * @h:
+ *
+ * Gets the viewport in image coordinates.
+ **/
+void
+gimp_display_shell_scroll_get_viewport (GimpDisplayShell *shell,
+                                        gdouble          *x,
+                                        gdouble          *y,
+                                        gdouble          *w,
+                                        gdouble          *h)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  *x = shell->offset_x    / shell->scale_x;
+  *y = shell->offset_y    / shell->scale_y;
+  *w = shell->disp_width  / shell->scale_x;
+  *h = shell->disp_height / shell->scale_y;
+}
diff --git a/app/display/gimpdisplayshell-scroll.h b/app/display/gimpdisplayshell-scroll.h
new file mode 100644
index 0000000..fba444b
--- /dev/null
+++ b/app/display/gimpdisplayshell-scroll.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_SCROLL_H__
+#define __GIMP_DISPLAY_SHELL_SCROLL_H__
+
+
+void   gimp_display_shell_scroll                     (GimpDisplayShell *shell,
+                                                      gint              x_offset,
+                                                      gint              y_offset);
+void   gimp_display_shell_scroll_set_offset          (GimpDisplayShell *shell,
+                                                      gint              offset_x,
+                                                      gint              offset_y);
+
+void   gimp_display_shell_scroll_clamp_and_update    (GimpDisplayShell *shell);
+
+void   gimp_display_shell_scroll_unoverscrollify     (GimpDisplayShell *shell,
+                                                      gint              in_offset_x,
+                                                      gint              in_offset_y,
+                                                      gint             *out_offset_x,
+                                                      gint             *out_offset_y);
+
+void   gimp_display_shell_scroll_center_image_xy     (GimpDisplayShell *shell,
+                                                      gdouble           image_x,
+                                                      gdouble           image_y);
+void   gimp_display_shell_scroll_center_image        (GimpDisplayShell *shell,
+                                                      gboolean          horizontally,
+                                                      gboolean          vertically);
+void   gimp_display_shell_scroll_center_content      (GimpDisplayShell *shell,
+                                                      gboolean          horizontally,
+                                                      gboolean          vertically);
+
+void   gimp_display_shell_scroll_get_scaled_viewport (GimpDisplayShell *shell,
+                                                      gint             *x,
+                                                      gint             *y,
+                                                      gint             *w,
+                                                      gint             *h);
+void   gimp_display_shell_scroll_get_viewport        (GimpDisplayShell *shell,
+                                                      gdouble          *x,
+                                                      gdouble          *y,
+                                                      gdouble          *w,
+                                                      gdouble          *h);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_SCROLL_H__  */
diff --git a/app/display/gimpdisplayshell-scrollbars.c b/app/display/gimpdisplayshell-scrollbars.c
new file mode 100644
index 0000000..3696e01
--- /dev/null
+++ b/app/display/gimpdisplayshell-scrollbars.c
@@ -0,0 +1,244 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scrollbars.h"
+
+
+#define MINIMUM_STEP_AMOUNT 1.0
+
+
+/**
+ * gimp_display_shell_scrollbars_update:
+ * @shell:
+ *
+ **/
+void
+gimp_display_shell_scrollbars_update (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->display)
+    return;
+
+  /* Horizontal scrollbar */
+
+  g_object_freeze_notify (G_OBJECT (shell->hsbdata));
+
+  /* Update upper and lower value before we set the new value */
+  gimp_display_shell_scrollbars_setup_horizontal (shell, shell->offset_x);
+
+  g_object_set (shell->hsbdata,
+                "value",          (gdouble) shell->offset_x,
+                "page-size",      (gdouble) shell->disp_width,
+                "page-increment", (gdouble) shell->disp_width / 2,
+                NULL);
+
+  g_object_thaw_notify (G_OBJECT (shell->hsbdata)); /* emits "changed" */
+
+
+  /* Vertcal scrollbar */
+
+  g_object_freeze_notify (G_OBJECT (shell->vsbdata));
+
+  /* Update upper and lower value before we set the new value */
+  gimp_display_shell_scrollbars_setup_vertical (shell, shell->offset_y);
+
+  g_object_set (shell->vsbdata,
+                "value",          (gdouble) shell->offset_y,
+                "page-size",      (gdouble) shell->disp_height,
+                "page-increment", (gdouble) shell->disp_height / 2,
+                NULL);
+
+  g_object_thaw_notify (G_OBJECT (shell->vsbdata)); /* emits "changed" */
+}
+
+/**
+ * gimp_display_shell_scrollbars_setup_horizontal:
+ * @shell:
+ * @value:
+ *
+ * Setup the limits of the horizontal scrollbar
+ **/
+void
+gimp_display_shell_scrollbars_setup_horizontal (GimpDisplayShell *shell,
+                                                gdouble           value)
+{
+  gint    bounds_x;
+  gint    bounds_width;
+  gint    bounding_box_x;
+  gint    bounding_box_width;
+  gint    x1;
+  gint    x2;
+  gdouble lower;
+  gdouble upper;
+  gdouble scale_x;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->display || ! gimp_display_get_image (shell->display))
+    return;
+
+  gimp_display_shell_scale_get_image_bounds (shell,
+                                             &bounds_x,     NULL,
+                                             &bounds_width, NULL);
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      bounding_box_x     = bounds_x;
+      bounding_box_width = bounds_width;
+    }
+  else
+    {
+      gimp_display_shell_scale_get_image_bounding_box (
+        shell,
+        &bounding_box_x,     NULL,
+        &bounding_box_width, NULL);
+    }
+
+  x1 = bounding_box_x;
+  x2 = bounding_box_x + bounding_box_width;
+
+  x1 = MIN (x1, bounds_x + bounds_width / 2 - shell->disp_width       / 2);
+  x2 = MAX (x2, bounds_x + bounds_width / 2 + (shell->disp_width + 1) / 2);
+
+  lower = MIN (value,                     x1);
+  upper = MAX (value + shell->disp_width, x2);
+
+  gimp_display_shell_get_rotated_scale (shell, &scale_x, NULL);
+
+  g_object_set (shell->hsbdata,
+                "lower",          lower,
+                "upper",          upper,
+                "step-increment", (gdouble) MAX (scale_x, MINIMUM_STEP_AMOUNT),
+                NULL);
+}
+
+/**
+ * gimp_display_shell_scrollbars_setup_vertical:
+ * @shell:
+ * @value:
+ *
+ * Setup the limits of the vertical scrollbar
+ **/
+void
+gimp_display_shell_scrollbars_setup_vertical (GimpDisplayShell *shell,
+                                              gdouble           value)
+{
+  gint    bounds_y;
+  gint    bounds_height;
+  gint    bounding_box_y;
+  gint    bounding_box_height;
+  gint    y1;
+  gint    y2;
+  gdouble lower;
+  gdouble upper;
+  gdouble scale_y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (! shell->display || ! gimp_display_get_image (shell->display))
+    return;
+
+  gimp_display_shell_scale_get_image_bounds (shell,
+                                             NULL, &bounds_y,
+                                             NULL, &bounds_height);
+
+  if (! gimp_display_shell_get_infinite_canvas (shell))
+    {
+      bounding_box_y      = bounds_y;
+      bounding_box_height = bounds_height;
+    }
+  else
+    {
+      gimp_display_shell_scale_get_image_bounding_box (
+        shell,
+        NULL, &bounding_box_y,
+        NULL, &bounding_box_height);
+    }
+
+  y1 = bounding_box_y;
+  y2 = bounding_box_y + bounding_box_height;
+
+  y1 = MIN (y1, bounds_y + bounds_height / 2 - shell->disp_height       / 2);
+  y2 = MAX (y2, bounds_y + bounds_height / 2 + (shell->disp_height + 1) / 2);
+
+  lower = MIN (value,                      y1);
+  upper = MAX (value + shell->disp_height, y2);
+
+  gimp_display_shell_get_rotated_scale (shell, NULL, &scale_y);
+
+  g_object_set (shell->vsbdata,
+                "lower",          lower,
+                "upper",          upper,
+                "step-increment", (gdouble) MAX (scale_y, MINIMUM_STEP_AMOUNT),
+                NULL);
+}
+
+/**
+ * gimp_display_shell_scrollbars_update_steppers:
+ * @shell:
+ * @min_offset_x:
+ * @max_offset_x:
+ * @min_offset_y:
+ * @max_offset_y:
+ *
+ * Sets the scrollbars' stepper sensitivity which is set differently
+ * from its adjustment limits because we support overscrolling.
+ **/
+void
+gimp_display_shell_scrollbars_update_steppers (GimpDisplayShell *shell,
+                                               gint              min_offset_x,
+                                               gint              max_offset_x,
+                                               gint              min_offset_y,
+                                               gint              max_offset_y)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gtk_range_set_lower_stepper_sensitivity (GTK_RANGE (shell->hsb),
+                                           min_offset_x < shell->offset_x ?
+                                           GTK_SENSITIVITY_ON :
+                                           GTK_SENSITIVITY_OFF);
+
+  gtk_range_set_upper_stepper_sensitivity (GTK_RANGE (shell->hsb),
+                                           max_offset_x > shell->offset_x ?
+                                           GTK_SENSITIVITY_ON :
+                                           GTK_SENSITIVITY_OFF);
+
+  gtk_range_set_lower_stepper_sensitivity (GTK_RANGE (shell->vsb),
+                                           min_offset_y < shell->offset_y ?
+                                           GTK_SENSITIVITY_ON :
+                                           GTK_SENSITIVITY_OFF);
+
+  gtk_range_set_upper_stepper_sensitivity (GTK_RANGE (shell->vsb),
+                                           max_offset_y > shell->offset_y ?
+                                           GTK_SENSITIVITY_ON :
+                                           GTK_SENSITIVITY_OFF);
+}
diff --git a/app/display/gimpdisplayshell-scrollbars.h b/app/display/gimpdisplayshell-scrollbars.h
new file mode 100644
index 0000000..c15f802
--- /dev/null
+++ b/app/display/gimpdisplayshell-scrollbars.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_SCROLLBARS_H__
+#define __GIMP_DISPLAY_SHELL_SCROLLBARS_H__
+
+
+void   gimp_display_shell_scrollbars_update           (GimpDisplayShell *shell);
+
+void   gimp_display_shell_scrollbars_setup_horizontal (GimpDisplayShell *shell,
+                                                       gdouble           value);
+void   gimp_display_shell_scrollbars_setup_vertical   (GimpDisplayShell *shell,
+                                                       gdouble           value);
+
+void   gimp_display_shell_scrollbars_update_steppers  (GimpDisplayShell *shell,
+                                                       gint              min_offset_x,
+                                                       gint              max_offset_x,
+                                                       gint              min_offset_y,
+                                                       gint              max_offset_y);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_SCROLLBARS_H__  */
diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c
new file mode 100644
index 0000000..3cfacd3
--- /dev/null
+++ b/app/display/gimpdisplayshell-selection.c
@@ -0,0 +1,504 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-cairo.h"
+#include "core/gimpboundary.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-draw.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-selection.h"
+#include "gimpdisplayshell-transform.h"
+
+
+struct _Selection
+{
+  GimpDisplayShell *shell;            /*  shell that owns the selection     */
+
+  GimpSegment      *segs_in;          /*  gdk segments of area boundary     */
+  gint              n_segs_in;        /*  number of segments in segs_in     */
+
+  GimpSegment      *segs_out;         /*  gdk segments of area boundary     */
+  gint              n_segs_out;       /*  number of segments in segs_out    */
+
+  guint             index;            /*  index of current stipple pattern  */
+  gint              paused;           /*  count of pause requests           */
+  gboolean          shell_visible;    /*  visility of the display shell     */
+  gboolean          show_selection;   /*  is the selection visible?         */
+  guint             timeout;          /*  timer for successive draws        */
+  cairo_pattern_t  *segs_in_mask;     /*  cache for rendered segments       */
+};
+
+
+/*  local function prototypes  */
+
+static void      selection_start          (Selection          *selection);
+static void      selection_stop           (Selection          *selection);
+
+static void      selection_undraw         (Selection          *selection);
+
+static void      selection_render_mask    (Selection          *selection);
+
+static void      selection_zoom_segs      (Selection          *selection,
+                                           const GimpBoundSeg *src_segs,
+                                           GimpSegment        *dest_segs,
+                                           gint                n_segs,
+                                           gint                canvas_offset_x,
+                                           gint                canvas_offset_y);
+static void      selection_generate_segs  (Selection          *selection);
+static void      selection_free_segs      (Selection          *selection);
+
+static gboolean  selection_timeout        (Selection          *selection);
+
+static gboolean  selection_window_state_event      (GtkWidget           *shell,
+                                                    GdkEventWindowState *event,
+                                                    Selection           *selection);
+static gboolean  selection_visibility_notify_event (GtkWidget           *shell,
+                                                    GdkEventVisibility  *event,
+                                                    Selection           *selection);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_selection_init (GimpDisplayShell *shell)
+{
+  Selection *selection;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection == NULL);
+
+  selection = g_slice_new0 (Selection);
+
+  selection->shell          = shell;
+  selection->shell_visible  = TRUE;
+  selection->show_selection = gimp_display_shell_get_show_selection (shell);
+
+  shell->selection = selection;
+  shell->selection_update = g_get_monotonic_time ();
+
+  g_signal_connect (shell, "window-state-event",
+                    G_CALLBACK (selection_window_state_event),
+                    selection);
+  g_signal_connect (shell, "visibility-notify-event",
+                    G_CALLBACK (selection_visibility_notify_event),
+                    selection);
+}
+
+void
+gimp_display_shell_selection_free (GimpDisplayShell *shell)
+{
+  Selection *selection;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection != NULL);
+
+  selection = shell->selection;
+
+  selection_stop (selection);
+
+  g_signal_handlers_disconnect_by_func (shell,
+                                        selection_window_state_event,
+                                        selection);
+  g_signal_handlers_disconnect_by_func (shell,
+                                        selection_visibility_notify_event,
+                                        selection);
+
+  selection_free_segs (selection);
+
+  g_slice_free (Selection, selection);
+
+  shell->selection = NULL;
+}
+
+void
+gimp_display_shell_selection_undraw (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection != NULL);
+
+  if (gimp_display_get_image (shell->display))
+    {
+      selection_undraw (shell->selection);
+    }
+  else
+    {
+      selection_stop (shell->selection);
+      selection_free_segs (shell->selection);
+    }
+}
+
+void
+gimp_display_shell_selection_restart (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection != NULL);
+
+  if (gimp_display_get_image (shell->display))
+    {
+      selection_start (shell->selection);
+    }
+}
+
+void
+gimp_display_shell_selection_pause (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection != NULL);
+
+  if (gimp_display_get_image (shell->display))
+    {
+      if (shell->selection->paused == 0)
+        selection_stop (shell->selection);
+
+      shell->selection->paused++;
+    }
+}
+
+void
+gimp_display_shell_selection_resume (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection != NULL);
+
+  if (gimp_display_get_image (shell->display))
+    {
+      shell->selection->paused--;
+
+      if (shell->selection->paused == 0)
+        selection_start (shell->selection);
+    }
+}
+
+void
+gimp_display_shell_selection_set_show (GimpDisplayShell *shell,
+                                       gboolean          show)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->selection != NULL);
+
+  if (gimp_display_get_image (shell->display))
+    {
+      Selection *selection = shell->selection;
+
+      if (show != selection->show_selection)
+        {
+          selection_undraw (selection);
+
+          selection->show_selection = show;
+
+          selection_start (selection);
+        }
+    }
+}
+
+
+/*  private functions  */
+
+static void
+selection_start (Selection *selection)
+{
+  selection_stop (selection);
+
+  /*  If this selection is paused, do not start it  */
+  if (selection->paused == 0                             &&
+      gimp_display_get_image (selection->shell->display) &&
+      selection->show_selection)
+    {
+      /*  Draw the ants once  */
+      selection_timeout (selection);
+
+      if (selection->segs_in && selection->shell_visible)
+        {
+          GimpDisplayConfig *config = selection->shell->display->config;
+
+          selection->timeout = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+                                                   config->marching_ants_speed,
+                                                   (GSourceFunc) selection_timeout,
+                                                   selection, NULL);
+        }
+    }
+}
+
+static void
+selection_stop (Selection *selection)
+{
+  if (selection->timeout)
+    {
+      g_source_remove (selection->timeout);
+      selection->timeout = 0;
+    }
+}
+
+void
+gimp_display_shell_selection_draw (GimpDisplayShell *shell,
+                                   cairo_t          *cr)
+{
+  if (gimp_display_get_image (shell->display) &&
+      shell->selection && shell->selection->show_selection)
+    {
+      GimpDisplayConfig *config = shell->display->config;
+      gint64             time   = g_get_monotonic_time ();
+
+      if ((time - shell->selection_update) / 1000 > config->marching_ants_speed &&
+          shell->selection->paused == 0)
+        {
+          shell->selection_update = time;
+          shell->selection->index++;
+        }
+
+      selection_generate_segs (shell->selection);
+
+      if (shell->selection->segs_in)
+        {
+          gimp_display_shell_draw_selection_in (shell->selection->shell, cr,
+                                                shell->selection->segs_in_mask,
+                                                shell->selection->index % 8);
+        }
+
+      if (shell->selection->segs_out)
+        {
+          if (shell->selection->shell->rotate_transform)
+            cairo_transform (cr, shell->selection->shell->rotate_transform);
+
+          gimp_display_shell_draw_selection_out (shell->selection->shell, cr,
+                                                 shell->selection->segs_out,
+                                                 shell->selection->n_segs_out);
+        }
+    }
+}
+
+static void
+selection_undraw (Selection *selection)
+{
+  gint x, y, w, h;
+
+  selection_stop (selection);
+
+  if (gimp_display_shell_mask_bounds (selection->shell, &x, &y, &w, &h))
+    {
+      /* expose will restart the selection */
+      gimp_display_shell_expose_area (selection->shell, x, y, w, h);
+    }
+  else
+    {
+      selection_start (selection);
+    }
+}
+
+static void
+selection_render_mask (Selection *selection)
+{
+  GdkWindow       *window;
+  cairo_surface_t *surface;
+  cairo_t         *cr;
+
+  window = gtk_widget_get_window (GTK_WIDGET (selection->shell));
+  surface = gdk_window_create_similar_surface (window, CAIRO_CONTENT_ALPHA,
+                                               gdk_window_get_width  (window),
+                                               gdk_window_get_height (window));
+  cr = cairo_create (surface);
+
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+  cairo_set_line_width (cr, 1.0);
+
+  if (selection->shell->rotate_transform)
+    cairo_transform (cr, selection->shell->rotate_transform);
+
+  gimp_cairo_segments (cr,
+                       selection->segs_in,
+                       selection->n_segs_in);
+  cairo_stroke (cr);
+
+  selection->segs_in_mask = cairo_pattern_create_for_surface (surface);
+
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+}
+
+static void
+selection_zoom_segs (Selection          *selection,
+                     const GimpBoundSeg *src_segs,
+                     GimpSegment        *dest_segs,
+                     gint                n_segs,
+                     gint                canvas_offset_x,
+                     gint                canvas_offset_y)
+{
+  const gint xclamp = selection->shell->disp_width + 1;
+  const gint yclamp = selection->shell->disp_height + 1;
+  gint       i;
+
+  gimp_display_shell_zoom_segments (selection->shell,
+                                    src_segs, dest_segs, n_segs,
+                                    0.0, 0.0);
+
+  for (i = 0; i < n_segs; i++)
+    {
+      if (! selection->shell->rotate_transform)
+        {
+          dest_segs[i].x1 = CLAMP (dest_segs[i].x1, -1, xclamp) + canvas_offset_x;
+          dest_segs[i].y1 = CLAMP (dest_segs[i].y1, -1, yclamp) + canvas_offset_y;
+
+          dest_segs[i].x2 = CLAMP (dest_segs[i].x2, -1, xclamp) + canvas_offset_x;
+          dest_segs[i].y2 = CLAMP (dest_segs[i].y2, -1, yclamp) + canvas_offset_y;
+        }
+
+      /*  If this segment is a closing segment && the segments lie inside
+       *  the region, OR if this is an opening segment and the segments
+       *  lie outside the region...
+       *  we need to transform it by one display pixel
+       */
+      if (! src_segs[i].open)
+        {
+          /*  If it is vertical  */
+          if (dest_segs[i].x1 == dest_segs[i].x2)
+            {
+              dest_segs[i].x1 -= 1;
+              dest_segs[i].x2 -= 1;
+            }
+          else
+            {
+              dest_segs[i].y1 -= 1;
+              dest_segs[i].y2 -= 1;
+            }
+        }
+    }
+}
+
+static void
+selection_generate_segs (Selection *selection)
+{
+  GimpImage          *image = gimp_display_get_image (selection->shell->display);
+  const GimpBoundSeg *segs_in;
+  const GimpBoundSeg *segs_out;
+  gint                canvas_offset_x = 0;
+  gint                canvas_offset_y = 0;
+
+  selection_free_segs (selection);
+
+  /*  Ask the image for the boundary of its selected region...
+   *  Then transform that information into a new buffer of GimpSegments
+   */
+  gimp_channel_boundary (gimp_image_get_mask (image),
+                         &segs_in, &segs_out,
+                         &selection->n_segs_in, &selection->n_segs_out,
+                         0, 0, 0, 0);
+
+  if (selection->n_segs_in)
+    {
+      selection->segs_in = g_new (GimpSegment, selection->n_segs_in);
+      selection_zoom_segs (selection, segs_in,
+                           selection->segs_in, selection->n_segs_in,
+                           canvas_offset_x, canvas_offset_y);
+
+      selection_render_mask (selection);
+    }
+
+  /*  Possible secondary boundary representation  */
+  if (selection->n_segs_out)
+    {
+      selection->segs_out = g_new (GimpSegment, selection->n_segs_out);
+      selection_zoom_segs (selection, segs_out,
+                           selection->segs_out, selection->n_segs_out,
+                           canvas_offset_x, canvas_offset_y);
+    }
+}
+
+static void
+selection_free_segs (Selection *selection)
+{
+  g_clear_pointer (&selection->segs_in, g_free);
+  selection->n_segs_in = 0;
+
+  g_clear_pointer (&selection->segs_out, g_free);
+  selection->n_segs_out = 0;
+
+  g_clear_pointer (&selection->segs_in_mask, cairo_pattern_destroy);
+}
+
+static gboolean
+selection_timeout (Selection *selection)
+{
+  GimpDisplayConfig *config = selection->shell->display->config;
+  gint64             time   = g_get_monotonic_time ();
+
+  if ((time - selection->shell->selection_update) / 1000 > config->marching_ants_speed)
+    {
+      GdkWindow *window;
+
+      window = gtk_widget_get_window (GTK_WIDGET (selection->shell));
+
+      gtk_widget_queue_draw_area (GTK_WIDGET (selection->shell),
+                                  0, 0,
+                                  gdk_window_get_width (window),
+                                  gdk_window_get_height (window));
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+selection_set_shell_visible (Selection *selection,
+                             gboolean   shell_visible)
+{
+  if (selection->shell_visible != shell_visible)
+    {
+      selection->shell_visible = shell_visible;
+
+      if (shell_visible)
+        selection_start (selection);
+      else
+        selection_stop (selection);
+    }
+}
+
+static gboolean
+selection_window_state_event (GtkWidget           *shell,
+                              GdkEventWindowState *event,
+                              Selection           *selection)
+{
+  selection_set_shell_visible (selection,
+                               (event->new_window_state & (GDK_WINDOW_STATE_WITHDRAWN |
+                                                           GDK_WINDOW_STATE_ICONIFIED)) == 0);
+
+  return FALSE;
+}
+
+static gboolean
+selection_visibility_notify_event (GtkWidget          *shell,
+                                   GdkEventVisibility *event,
+                                   Selection          *selection)
+{
+  selection_set_shell_visible (selection,
+                               event->state != GDK_VISIBILITY_FULLY_OBSCURED);
+
+  return FALSE;
+}
diff --git a/app/display/gimpdisplayshell-selection.h b/app/display/gimpdisplayshell-selection.h
new file mode 100644
index 0000000..c7b0a5f
--- /dev/null
+++ b/app/display/gimpdisplayshell-selection.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_SELECTION_H__
+#define __GIMP_DISPLAY_SHELL_SELECTION_H__
+
+
+void   gimp_display_shell_selection_init     (GimpDisplayShell     *shell);
+void   gimp_display_shell_selection_free     (GimpDisplayShell     *shell);
+
+void   gimp_display_shell_selection_undraw   (GimpDisplayShell     *shell);
+void   gimp_display_shell_selection_restart  (GimpDisplayShell     *shell);
+
+void   gimp_display_shell_selection_pause    (GimpDisplayShell     *shell);
+void   gimp_display_shell_selection_resume   (GimpDisplayShell     *shell);
+
+void   gimp_display_shell_selection_set_show (GimpDisplayShell     *shell,
+                                              gboolean              show);
+
+void   gimp_display_shell_selection_draw     (GimpDisplayShell     *shell,
+                                              cairo_t              *cr);
+
+#endif  /*  __GIMP_DISPLAY_SHELL_SELECTION_H__  */
diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c
new file mode 100644
index 0000000..ff356ce
--- /dev/null
+++ b/app/display/gimpdisplayshell-title.c
@@ -0,0 +1,564 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpitem.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-title.h"
+#include "gimpstatusbar.h"
+
+#include "about.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_TITLE_BUF 512
+
+
+static gboolean gimp_display_shell_update_title_idle (gpointer          data);
+static gint     gimp_display_shell_format_title      (GimpDisplayShell *display,
+                                                      gchar            *title,
+                                                      gint              title_len,
+                                                      const gchar      *format);
+
+
+/*  public functions  */
+
+void
+gimp_display_shell_title_update (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->title_idle_id)
+    g_source_remove (shell->title_idle_id);
+
+  shell->title_idle_id = g_idle_add (gimp_display_shell_update_title_idle,
+                                     shell);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_display_shell_update_title_idle (gpointer data)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
+
+  shell->title_idle_id = 0;
+
+  if (gimp_display_get_image (shell->display))
+    {
+      GimpDisplayConfig *config = shell->display->config;
+      gchar              title[MAX_TITLE_BUF];
+      gchar              status[MAX_TITLE_BUF];
+      gint               len;
+
+      /* format the title */
+      len = gimp_display_shell_format_title (shell, title, sizeof (title),
+                                             config->image_title_format);
+
+      if (len)  /* U+2013 EN DASH */
+        len += g_strlcpy (title + len, " \342\200\223 ", sizeof (title) - len);
+
+      g_strlcpy (title + len, GIMP_ACRONYM, sizeof (title) - len);
+
+      /* format the statusbar */
+      gimp_display_shell_format_title (shell, status, sizeof (status),
+                                       config->image_status_format);
+
+      g_object_set (shell,
+                    "title",  title,
+                    "status", status,
+                    NULL);
+    }
+  else
+    {
+      g_object_set (shell,
+                    "title",  GIMP_NAME,
+                    "status", " ",
+                    NULL);
+    }
+
+  return FALSE;
+}
+
+static const gchar *
+gimp_display_shell_title_image_type (GimpImage *image)
+{
+  const gchar *name = "";
+
+  gimp_enum_get_value (GIMP_TYPE_IMAGE_BASE_TYPE,
+                       gimp_image_get_base_type (image), NULL, NULL, &name, NULL);
+
+  return name;
+}
+
+static const gchar *
+gimp_display_shell_title_image_precision (GimpImage *image)
+{
+  const gchar *name = "";
+
+  gimp_enum_get_value (GIMP_TYPE_PRECISION,
+                       gimp_image_get_precision (image), NULL, NULL, &name, NULL);
+
+  return name;
+}
+
+static gint print (gchar       *buf,
+                   gint         len,
+                   gint         start,
+                   const gchar *fmt,
+                   ...) G_GNUC_PRINTF (4, 5);
+
+static gint
+print (gchar       *buf,
+       gint         len,
+       gint         start,
+       const gchar *fmt,
+       ...)
+{
+  va_list args;
+  gint    printed;
+
+  va_start (args, fmt);
+
+  printed = g_vsnprintf (buf + start, len - start, fmt, args);
+  if (printed < 0)
+    printed = len - start;
+
+  va_end (args);
+
+  return printed;
+}
+
+static gint
+gimp_display_shell_format_title (GimpDisplayShell *shell,
+                                 gchar            *title,
+                                 gint              title_len,
+                                 const gchar      *format)
+{
+  GimpImage    *image;
+  GimpDrawable *drawable;
+  gint          num, denom;
+  gint          i = 0;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), 0);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (! image)
+    {
+      title[0] = '\n';
+      return 0;
+    }
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  gimp_zoom_model_get_fraction (shell->zoom, &num, &denom);
+
+  while (i < title_len && *format)
+    {
+      switch (*format)
+        {
+        case '%':
+          format++;
+          switch (*format)
+            {
+            case 0:
+              /* format string ends within %-sequence, print literal '%' */
+
+            case '%':
+              title[i++] = '%';
+              break;
+
+            case 'f': /* base filename */
+              i += print (title, title_len, i, "%s",
+                          gimp_image_get_display_name (image));
+              break;
+
+            case 'F': /* full filename */
+              i += print (title, title_len, i, "%s",
+                          gimp_image_get_display_path (image));
+              break;
+
+            case 'p': /* PDB id */
+              i += print (title, title_len, i, "%d", gimp_image_get_ID (image));
+              break;
+
+            case 'i': /* instance */
+              i += print (title, title_len, i, "%d",
+                          gimp_display_get_instance (shell->display));
+              break;
+
+            case 't': /* image type */
+              i += print (title, title_len, i, "%s %s",
+                          gimp_display_shell_title_image_type (image),
+                          gimp_display_shell_title_image_precision (image));
+              break;
+
+            case 'T': /* drawable type */
+              if (drawable)
+                {
+                  const Babl *format = gimp_drawable_get_format (drawable);
+
+                  i += print (title, title_len, i, "%s",
+                              gimp_babl_format_get_description (format));
+                }
+              break;
+
+            case 's': /* user source zoom factor */
+              i += print (title, title_len, i, "%d", denom);
+              break;
+
+            case 'd': /* user destination zoom factor */
+              i += print (title, title_len, i, "%d", num);
+              break;
+
+            case 'z': /* user zoom factor (percentage) */
+              {
+                gdouble  scale = gimp_zoom_model_get_factor (shell->zoom);
+
+                i += print (title, title_len, i,
+                            scale >= 0.15 ? "%.0f" : "%.2f", 100.0 * scale);
+              }
+              break;
+
+            case 'D': /* dirty flag */
+              if (format[1] == 0)
+                {
+                  /* format string ends within %D-sequence, print literal '%D' */
+                  i += print (title, title_len, i, "%%D");
+                  break;
+                }
+              if (gimp_image_is_dirty (image))
+                title[i++] = format[1];
+              format++;
+              break;
+
+            case 'C': /* clean flag */
+              if (format[1] == 0)
+                {
+                  /* format string ends within %C-sequence, print literal '%C' */
+                  i += print (title, title_len, i, "%%C");
+                  break;
+                }
+              if (! gimp_image_is_dirty (image))
+                title[i++] = format[1];
+              format++;
+              break;
+
+            case 'B': /* dirty flag (long) */
+              if (gimp_image_is_dirty (image))
+                i += print (title, title_len, i, "%s", _("(modified)"));
+              break;
+
+            case 'A': /* clean flag (long) */
+              if (! gimp_image_is_dirty (image))
+                i += print (title, title_len, i, "%s", _("(clean)"));
+              break;
+
+            case 'N': /* not-exported flag */
+              if (format[1] == 0)
+                {
+                  /* format string ends within %E-sequence, print literal '%E' */
+                  i += print (title, title_len, i, "%%N");
+                  break;
+                }
+              if (gimp_image_is_export_dirty (image))
+                title[i++] = format[1];
+              format++;
+              break;
+
+            case 'E': /* exported flag */
+              if (format[1] == 0)
+                {
+                  /* format string ends within %E-sequence, print literal '%E' */
+                  i += print (title, title_len, i, "%%E");
+                  break;
+                }
+              if (! gimp_image_is_export_dirty (image))
+                title[i++] = format[1];
+              format++;
+              break;
+
+            case 'm': /* memory used by image */
+              {
+                GimpObject *object = GIMP_OBJECT (image);
+                gchar      *str;
+
+                str = g_format_size (gimp_object_get_memsize (object, NULL));
+                i += print (title, title_len, i, "%s", str);
+                g_free (str);
+              }
+              break;
+
+            case 'M': /* image size in megapixels */
+              i += print (title, title_len, i, "%.1f",
+                          (gdouble) gimp_image_get_width (image) *
+                          (gdouble) gimp_image_get_height (image) / 1000000.0);
+              break;
+
+            case 'l': /* number of layers */
+              i += print (title, title_len, i, "%d",
+                          gimp_image_get_n_layers (image));
+              break;
+
+            case 'L': /* number of layers (long) */
+              {
+                gint num = gimp_image_get_n_layers (image);
+
+                i += print (title, title_len, i,
+                            ngettext ("%d layer", "%d layers", num), num);
+              }
+              break;
+
+            case 'n': /* active drawable name */
+              if (drawable)
+                {
+                  gchar *desc;
+
+                  desc = gimp_viewable_get_description (GIMP_VIEWABLE (drawable),
+                                                        NULL);
+                  i += print (title, title_len, i, "%s", desc);
+                  g_free (desc);
+                }
+              else
+                {
+                  i += print (title, title_len, i, "%s", _("(none)"));
+                }
+              break;
+
+            case 'P': /* active drawable PDB id */
+              if (drawable)
+                i += print (title, title_len, i, "%d",
+                            gimp_item_get_ID (GIMP_ITEM (drawable)));
+              else
+                i += print (title, title_len, i, "%s", _("(none)"));
+              break;
+
+            case 'W': /* width in real-world units */
+              if (shell->unit != GIMP_UNIT_PIXEL)
+                {
+                  gdouble xres;
+                  gdouble yres;
+                  gchar   unit_format[8];
+
+                  gimp_image_get_resolution (image, &xres, &yres);
+
+                  g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
+                              gimp_unit_get_scaled_digits (shell->unit, xres));
+                  i += print (title, title_len, i, unit_format,
+                              gimp_pixels_to_units (gimp_image_get_width (image),
+                                                    shell->unit, xres));
+                  break;
+                }
+              /* else fallthru */
+
+            case 'w': /* width in pixels */
+              i += print (title, title_len, i, "%d",
+                          gimp_image_get_width (image));
+              break;
+
+            case 'H': /* height in real-world units */
+              if (shell->unit != GIMP_UNIT_PIXEL)
+                {
+                  gdouble xres;
+                  gdouble yres;
+                  gchar   unit_format[8];
+
+                  gimp_image_get_resolution (image, &xres, &yres);
+
+                  g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
+                              gimp_unit_get_scaled_digits (shell->unit, yres));
+                  i += print (title, title_len, i, unit_format,
+                              gimp_pixels_to_units (gimp_image_get_height (image),
+                                                    shell->unit, yres));
+                  break;
+                }
+              /* else fallthru */
+
+            case 'h': /* height in pixels */
+              i += print (title, title_len, i, "%d",
+                          gimp_image_get_height (image));
+              break;
+
+            case 'u': /* unit symbol */
+              i += print (title, title_len, i, "%s",
+                          gimp_unit_get_symbol (shell->unit));
+              break;
+
+            case 'U': /* unit abbreviation */
+              i += print (title, title_len, i, "%s",
+                          gimp_unit_get_abbreviation (shell->unit));
+              break;
+
+            case 'X': /* drawable width in real world units */
+              if (drawable && shell->unit != GIMP_UNIT_PIXEL)
+                {
+                  gdouble xres;
+                  gdouble yres;
+                  gchar   unit_format[8];
+
+                  gimp_image_get_resolution (image, &xres, &yres);
+
+                  g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
+                              gimp_unit_get_scaled_digits (shell->unit, xres));
+                  i += print (title, title_len, i, unit_format,
+                              gimp_pixels_to_units (gimp_item_get_width
+                                                    (GIMP_ITEM (drawable)),
+                                                    shell->unit, xres));
+                  break;
+                }
+              /* else fallthru */
+
+            case 'x': /* drawable width in pixels */
+              if (drawable)
+                i += print (title, title_len, i, "%d",
+                            gimp_item_get_width (GIMP_ITEM (drawable)));
+              break;
+
+            case 'Y': /* drawable height in real world units */
+              if (drawable && shell->unit != GIMP_UNIT_PIXEL)
+                {
+                  gdouble xres;
+                  gdouble yres;
+                  gchar   unit_format[8];
+
+                  gimp_image_get_resolution (image, &xres, &yres);
+
+                  g_snprintf (unit_format, sizeof (unit_format), "%%.%df",
+                              gimp_unit_get_scaled_digits (shell->unit, yres));
+                  i += print (title, title_len, i, unit_format,
+                              gimp_pixels_to_units (gimp_item_get_height
+                                                    (GIMP_ITEM (drawable)),
+                                                    shell->unit, yres));
+                  break;
+                }
+              /* else fallthru */
+
+            case 'y': /* drawable height in pixels */
+              if (drawable)
+                i += print (title, title_len, i, "%d",
+                            gimp_item_get_height (GIMP_ITEM (drawable)));
+              break;
+
+            case 'o': /* image's color profile name */
+              if (gimp_image_get_is_color_managed (image))
+                {
+                  GimpColorManaged *managed = GIMP_COLOR_MANAGED (image);
+                  GimpColorProfile *profile;
+
+                  profile = gimp_color_managed_get_color_profile (managed);
+
+                  i += print (title, title_len, i, "%s",
+                              gimp_color_profile_get_label (profile));
+                }
+              else
+                {
+                  i += print (title, title_len, i, "%s",
+                              _("not color managed"));
+                }
+              break;
+
+            case 'e': /* display's offsets in pixels */
+              {
+                gdouble scale    = gimp_zoom_model_get_factor (shell->zoom);
+                gdouble offset_x = shell->offset_x / scale;
+                gdouble offset_y = shell->offset_y / scale;
+
+                i += print (title, title_len, i,
+                            scale >= 0.15 ? "%.0fx%.0f" : "%.2fx%.2f",
+                            offset_x, offset_y);
+              }
+              break;
+
+            case 'r': /* view rotation angle in degrees */
+              {
+                i += print (title, title_len, i, "%.1f", shell->rotate_angle);
+              }
+              break;
+
+            case '\xc3': /* utf-8 extended char */
+              {
+                format ++;
+                switch (*format)
+                  {
+                  case '\xbe':
+                    /* line actually written at 23:55 on an Easter Sunday */
+                    i += print (title, title_len, i, "42");
+                    break;
+
+                  default:
+                    /* in the case of an unhandled utf-8 extended char format
+                     * leave the format string parsing as it was
+                    */
+                    format--;
+                    break;
+                  }
+              }
+              break;
+
+              /* Other cool things to be added:
+               * %r = xresolution
+               * %R = yresolution
+               * %ø = image's fractal dimension
+               * %þ = the answer to everything - (implemented)
+               */
+
+            default:
+              /* format string contains unknown %-sequence, print it literally */
+              i += print (title, title_len, i, "%%%c", *format);
+              break;
+            }
+          break;
+
+        default:
+          title[i++] = *format;
+          break;
+        }
+
+      format++;
+    }
+
+  title[MIN (i, title_len - 1)] = '\0';
+
+  return i;
+}
diff --git a/app/display/gimpdisplayshell-title.h b/app/display/gimpdisplayshell-title.h
new file mode 100644
index 0000000..0a3ed21
--- /dev/null
+++ b/app/display/gimpdisplayshell-title.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_TITLE_H__
+#define __GIMP_DISPLAY_SHELL_TITLE_H__
+
+
+void  gimp_display_shell_title_update (GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_TITLE_H__ */
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
new file mode 100644
index 0000000..714f39f
--- /dev/null
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -0,0 +1,2144 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+#include "tools/tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-filter-history.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpitem.h"
+
+#include "widgets/gimpcontrollers.h"
+#include "widgets/gimpcontrollerkeyboard.h"
+#include "widgets/gimpcontrollermouse.h"
+#include "widgets/gimpcontrollerwheel.h"
+#include "widgets/gimpdeviceinfo.h"
+#include "widgets/gimpdeviceinfo-coords.h"
+#include "widgets/gimpdevicemanager.h"
+#include "widgets/gimpdevices.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "tools/gimpguidetool.h"
+#include "tools/gimpmovetool.h"
+#include "tools/gimpsamplepointtool.h"
+#include "tools/gimptoolcontrol.h"
+#include "tools/tool_manager.h"
+
+#include "gimpcanvas.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-autoscroll.h"
+#include "gimpdisplayshell-cursor.h"
+#include "gimpdisplayshell-grab.h"
+#include "gimpdisplayshell-layer-select.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-tool-events.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpimagewindow.h"
+#include "gimpmotionbuffer.h"
+#include "gimpstatusbar.h"
+
+#include "gimp-intl.h"
+#include "gimp-log.h"
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_display_shell_canvas_tool_events_internal (GtkWidget          *canvas,
+                                                                  GdkEvent           *event,
+                                                                  GimpDisplayShell   *shell,
+                                                                  GdkEvent          **next_event);
+
+static GdkModifierType
+                  gimp_display_shell_key_to_state                (gint                key);
+static GdkModifierType
+                  gimp_display_shell_button_to_state             (gint                button);
+
+static void       gimp_display_shell_proximity_in                (GimpDisplayShell   *shell);
+static void       gimp_display_shell_proximity_out               (GimpDisplayShell   *shell);
+
+static void       gimp_display_shell_check_device_cursor         (GimpDisplayShell   *shell);
+
+static void       gimp_display_shell_start_scrolling             (GimpDisplayShell   *shell,
+                                                                  const GdkEvent     *event,
+                                                                  GdkModifierType     state,
+                                                                  gint                x,
+                                                                  gint                y);
+static void       gimp_display_shell_stop_scrolling              (GimpDisplayShell   *shell,
+                                                                  const GdkEvent     *event);
+static void       gimp_display_shell_handle_scrolling            (GimpDisplayShell   *shell,
+                                                                  GdkModifierType     state,
+                                                                  gint                x,
+                                                                  gint                y);
+
+static void       gimp_display_shell_space_pressed               (GimpDisplayShell   *shell,
+                                                                  const GdkEvent     *event);
+static void       gimp_display_shell_released                    (GimpDisplayShell   *shell,
+                                                                  const GdkEvent     *event,
+                                                                  const GimpCoords   *image_coords);
+
+static gboolean   gimp_display_shell_tab_pressed                 (GimpDisplayShell   *shell,
+                                                                  const GdkEventKey  *event);
+
+static void       gimp_display_shell_update_focus                (GimpDisplayShell   *shell,
+                                                                  gboolean            focus_in,
+                                                                  const GimpCoords   *image_coords,
+                                                                  GdkModifierType     state);
+static void       gimp_display_shell_update_cursor               (GimpDisplayShell   *shell,
+                                                                  const GimpCoords   *display_coords,
+                                                                  const GimpCoords   *image_coords,
+                                                                  GdkModifierType     state,
+                                                                  gboolean            update_software_cursor);
+
+static gboolean   gimp_display_shell_initialize_tool             (GimpDisplayShell   *shell,
+                                                                  const GimpCoords   *image_coords,
+                                                                  GdkModifierType     state);
+
+static void       gimp_display_shell_get_event_coords            (GimpDisplayShell   *shell,
+                                                                  const GdkEvent     *event,
+                                                                  GimpCoords         *display_coords,
+                                                                  GdkModifierType    *state,
+                                                                  guint32            *time);
+static void       gimp_display_shell_untransform_event_coords    (GimpDisplayShell   *shell,
+                                                                  const GimpCoords   *display_coords,
+                                                                  GimpCoords         *image_coords,
+                                                                  gboolean           *update_software_cursor);
+
+static GdkEvent * gimp_display_shell_compress_motion             (GdkEvent           *initial_event,
+                                                                  GdkEvent          **next_event);
+
+
+/*  public functions  */
+
+gboolean
+gimp_display_shell_events (GtkWidget        *widget,
+                           GdkEvent         *event,
+                           GimpDisplayShell *shell)
+{
+  Gimp     *gimp;
+  gboolean  set_display = FALSE;
+
+  /*  are we in destruction?  */
+  if (! shell->display || ! gimp_display_get_shell (shell->display))
+    return TRUE;
+
+  gimp = gimp_display_get_gimp (shell->display);
+
+  switch (event->type)
+    {
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      {
+        GdkEventKey *kevent = (GdkEventKey *) event;
+
+        if (gimp->busy)
+          return TRUE;
+
+        /*  do not process most key events while BUTTON1 is down. We do this
+         *  so tools keep the modifier state they were in when BUTTON1 was
+         *  pressed and to prevent accelerators from being invoked.
+         */
+        if (kevent->state & GDK_BUTTON1_MASK)
+          {
+            if (kevent->keyval == GDK_KEY_Shift_L   ||
+                kevent->keyval == GDK_KEY_Shift_R   ||
+                kevent->keyval == GDK_KEY_Control_L ||
+                kevent->keyval == GDK_KEY_Control_R ||
+                kevent->keyval == GDK_KEY_Alt_L     ||
+                kevent->keyval == GDK_KEY_Alt_R     ||
+                kevent->keyval == GDK_KEY_Meta_L    ||
+                kevent->keyval == GDK_KEY_Meta_R    ||
+                kevent->keyval == GDK_KEY_space     ||
+                kevent->keyval == GDK_KEY_KP_Space)
+              {
+                break;
+              }
+
+            return TRUE;
+          }
+
+        switch (kevent->keyval)
+          {
+          case GDK_KEY_Left:      case GDK_KEY_Right:
+          case GDK_KEY_Up:        case GDK_KEY_Down:
+          case GDK_KEY_space:
+          case GDK_KEY_KP_Space:
+          case GDK_KEY_Tab:
+          case GDK_KEY_KP_Tab:
+          case GDK_KEY_ISO_Left_Tab:
+          case GDK_KEY_Alt_L:     case GDK_KEY_Alt_R:
+          case GDK_KEY_Shift_L:   case GDK_KEY_Shift_R:
+          case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+          case GDK_KEY_Meta_L:    case GDK_KEY_Meta_R:
+          case GDK_KEY_Return:
+          case GDK_KEY_KP_Enter:
+          case GDK_KEY_ISO_Enter:
+          case GDK_KEY_BackSpace:
+          case GDK_KEY_Escape:
+            break;
+
+          default:
+            if (shell->space_release_pending   ||
+                shell->button1_release_pending ||
+                shell->scrolling)
+              return TRUE;
+            break;
+          }
+
+        set_display = TRUE;
+        break;
+      }
+
+    case GDK_BUTTON_PRESS:
+    case GDK_SCROLL:
+      set_display = TRUE;
+      break;
+
+    case GDK_FOCUS_CHANGE:
+      {
+        GdkEventFocus *fevent = (GdkEventFocus *) event;
+
+        if (fevent->in && shell->display->config->activate_on_focus)
+          set_display = TRUE;
+      }
+      break;
+
+    default:
+      break;
+    }
+
+  /*  Setting the context's display automatically sets the image, too  */
+  if (set_display)
+    gimp_context_set_display (gimp_get_user_context (gimp), shell->display);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_display_shell_canvas_no_image_events (GtkWidget        *canvas,
+                                           GdkEvent         *event,
+                                           GimpDisplayShell *shell)
+{
+  switch (event->type)
+    {
+    case GDK_2BUTTON_PRESS:
+      {
+        GdkEventButton  *bevent = (GdkEventButton *) event;
+        if (bevent->button == 1)
+          {
+            GimpImageWindow *window  = gimp_display_shell_get_window (shell);
+            GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+
+            gimp_ui_manager_activate_action (manager, "file", "file-open");
+          }
+        return TRUE;
+      }
+      break;
+
+    case GDK_BUTTON_PRESS:
+      if (gdk_event_triggers_context_menu (event))
+        {
+          gimp_ui_manager_ui_popup (shell->popup_manager,
+                                    "/dummy-menubar/image-popup",
+                                    GTK_WIDGET (shell),
+                                    NULL, NULL, NULL, NULL);
+          return TRUE;
+        }
+      break;
+
+    case GDK_KEY_PRESS:
+      {
+        GdkEventKey *kevent = (GdkEventKey *) event;
+
+        if (kevent->keyval == GDK_KEY_Tab    ||
+            kevent->keyval == GDK_KEY_KP_Tab ||
+            kevent->keyval == GDK_KEY_ISO_Left_Tab)
+          {
+            return gimp_display_shell_tab_pressed (shell, kevent);
+          }
+      }
+      break;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
+                                       GdkEvent         *event,
+                                       GimpDisplayShell *shell)
+{
+  GdkEvent *next_event = NULL;
+  gboolean  return_val;
+
+  g_return_val_if_fail (gtk_widget_get_realized (canvas), FALSE);
+
+  return_val = gimp_display_shell_canvas_tool_events_internal (canvas,
+                                                               event, shell,
+                                                               &next_event);
+
+  if (next_event)
+    {
+      gtk_main_do_event (next_event);
+
+      gdk_event_free (next_event);
+    }
+
+  return return_val;
+}
+
+void
+gimp_display_shell_canvas_grab_notify (GtkWidget        *canvas,
+                                       gboolean          was_grabbed,
+                                       GimpDisplayShell *shell)
+{
+  GimpDisplay *display;
+  GimpImage   *image;
+  Gimp        *gimp;
+
+  /*  are we in destruction?  */
+  if (! shell->display || ! gimp_display_get_shell (shell->display))
+    return;
+
+  display = shell->display;
+  gimp    = gimp_display_get_gimp (display);
+  image   = gimp_display_get_image (display);
+
+  if (! image)
+    return;
+
+  GIMP_LOG (TOOL_EVENTS, "grab_notify (display %p): was_grabbed = %s",
+            display, was_grabbed ? "TRUE" : "FALSE");
+
+  if (! was_grabbed)
+    {
+      if (! gimp_image_is_empty (image))
+        {
+          GimpTool *active_tool = tool_manager_get_active (gimp);
+
+          if (active_tool && active_tool->focus_display == display)
+            {
+              tool_manager_modifier_state_active (gimp, 0, display);
+            }
+        }
+    }
+}
+
+void
+gimp_display_shell_buffer_stroke (GimpMotionBuffer *buffer,
+                                  const GimpCoords *coords,
+                                  guint32           time,
+                                  GdkModifierType   state,
+                                  GimpDisplayShell *shell)
+{
+  GimpDisplay *display = shell->display;
+  Gimp        *gimp    = gimp_display_get_gimp (display);
+  GimpTool    *active_tool;
+
+  active_tool = tool_manager_get_active (gimp);
+
+  if (active_tool &&
+      gimp_tool_control_is_active (active_tool->control))
+    {
+      tool_manager_motion_active (gimp,
+                                  coords, time, state,
+                                  display);
+    }
+}
+
+void
+gimp_display_shell_buffer_hover (GimpMotionBuffer *buffer,
+                                 const GimpCoords *coords,
+                                 GdkModifierType   state,
+                                 gboolean          proximity,
+                                 GimpDisplayShell *shell)
+{
+  GimpDisplay *display = shell->display;
+  Gimp        *gimp    = gimp_display_get_gimp (display);
+  GimpTool    *active_tool;
+
+  active_tool = tool_manager_get_active (gimp);
+
+  if (active_tool &&
+      ! gimp_tool_control_is_active (active_tool->control))
+    {
+      tool_manager_oper_update_active (gimp,
+                                       coords, state, proximity,
+                                       display);
+    }
+}
+
+static gboolean
+gimp_display_shell_ruler_button_press (GtkWidget           *widget,
+                                       GdkEventButton      *event,
+                                       GimpDisplayShell    *shell,
+                                       GimpOrientationType  orientation)
+{
+  GimpDisplay *display = shell->display;
+
+  if (display->gimp->busy)
+    return TRUE;
+
+  if (! gimp_display_get_image (display))
+    return TRUE;
+
+  if (event->type == GDK_BUTTON_PRESS && event->button == 1)
+    {
+      GimpTool *active_tool = tool_manager_get_active (display->gimp);
+
+      if (active_tool)
+        {
+          gimp_display_shell_update_focus (shell, TRUE,
+                                           NULL, event->state);
+
+          if (gimp_display_shell_pointer_grab (shell, NULL, 0))
+            {
+              if (gimp_display_shell_keyboard_grab (shell,
+                                                    (GdkEvent *) event))
+                {
+                  if (event->state & gimp_get_toggle_behavior_mask ())
+                    {
+                      gimp_sample_point_tool_start_new (active_tool, display);
+                    }
+                  else
+                    {
+                      gimp_guide_tool_start_new (active_tool, display,
+                                                 orientation);
+                    }
+
+                  return TRUE;
+                }
+              else
+                {
+                  gimp_display_shell_pointer_ungrab (shell, NULL);
+                }
+            }
+        }
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_display_shell_hruler_button_press (GtkWidget        *widget,
+                                        GdkEventButton   *event,
+                                        GimpDisplayShell *shell)
+{
+  return gimp_display_shell_ruler_button_press (widget, event, shell,
+                                                GIMP_ORIENTATION_HORIZONTAL);
+}
+
+gboolean
+gimp_display_shell_vruler_button_press (GtkWidget        *widget,
+                                        GdkEventButton   *event,
+                                        GimpDisplayShell *shell)
+{
+  return gimp_display_shell_ruler_button_press (widget, event, shell,
+                                                GIMP_ORIENTATION_VERTICAL);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_display_shell_canvas_tool_events_internal (GtkWidget         *canvas,
+                                                GdkEvent          *event,
+                                                GimpDisplayShell  *shell,
+                                                GdkEvent         **next_event)
+{
+  GimpDisplay     *display;
+  GimpImage       *image;
+  Gimp            *gimp;
+  GimpCoords       display_coords;
+  GimpCoords       image_coords;
+  GdkModifierType  state;
+  guint32          time;
+  gboolean         device_changed   = FALSE;
+  gboolean         return_val       = FALSE;
+  gboolean         update_sw_cursor = FALSE;
+
+  *next_event = NULL;
+
+  /*  are we in destruction?  */
+  if (! shell->display || ! gimp_display_get_shell (shell->display))
+    return TRUE;
+
+  /*  set the active display before doing any other canvas event processing  */
+  if (gimp_display_shell_events (canvas, event, shell))
+    return TRUE;
+
+  /*  events on overlays have a different window, but these windows'
+   *  user_data can still be the canvas, we need to check manually if
+   *  the event's window and the canvas' window are different.
+   */
+  if (event->any.window != gtk_widget_get_window (canvas))
+    {
+      GtkWidget *event_widget;
+
+      gdk_window_get_user_data (event->any.window, (gpointer) &event_widget);
+
+      /*  if the event came from a different window than the canvas',
+       *  check if it came from a canvas child and bail out.
+       */
+      if (gtk_widget_get_ancestor (event_widget, GIMP_TYPE_CANVAS))
+        return FALSE;
+    }
+
+  display = shell->display;
+  gimp    = gimp_display_get_gimp (display);
+  image   = gimp_display_get_image (display);
+
+  if (! image)
+    return gimp_display_shell_canvas_no_image_events (canvas, event, shell);
+
+  GIMP_LOG (TOOL_EVENTS, "event (display %p): %s",
+            display, gimp_print_event (event));
+
+  /* See bug 771444 */
+  if (shell->pointer_grabbed &&
+      event->type == GDK_MOTION_NOTIFY)
+    {
+      GimpDeviceManager *manager = gimp_devices_get_manager (gimp);
+      GimpDeviceInfo    *info;
+
+      info = gimp_device_manager_get_current_device (manager);
+
+      if (info->device != event->motion.device)
+        return FALSE;
+    }
+
+  /*  Find out what device the event occurred upon  */
+  if (! gimp->busy &&
+      ! shell->inferior_ignore_mode &&
+      gimp_devices_check_change (gimp, event))
+    {
+      gimp_display_shell_check_device_cursor (shell);
+      device_changed = TRUE;
+    }
+
+  gimp_display_shell_get_event_coords (shell, event,
+                                       &display_coords,
+                                       &state, &time);
+  gimp_display_shell_untransform_event_coords (shell,
+                                               &display_coords, &image_coords,
+                                               &update_sw_cursor);
+
+  /*  If the device (and maybe the tool) has changed, update the new
+   *  tool's state
+   */
+  if (device_changed && gtk_widget_has_focus (canvas))
+    {
+      gimp_display_shell_update_focus (shell, TRUE,
+                                       &image_coords, state);
+    }
+
+  switch (event->type)
+    {
+    case GDK_ENTER_NOTIFY:
+      {
+        GdkEventCrossing *cevent = (GdkEventCrossing *) event;
+
+        if (shell->inferior_ignore_mode &&
+            cevent->subwindow == NULL   &&
+            cevent->mode      == GDK_CROSSING_NORMAL)
+          {
+            shell->inferior_ignore_mode = FALSE;
+            gtk_widget_set_extension_events (shell->canvas,
+                                             GDK_EXTENSION_EVENTS_ALL);
+          }
+
+        if (cevent->mode != GDK_CROSSING_NORMAL)
+          return TRUE;
+
+        /*  ignore enter notify while we have a grab  */
+        if (shell->pointer_grabbed)
+          return TRUE;
+
+        gimp_display_shell_proximity_in (shell);
+        update_sw_cursor = TRUE;
+
+        tool_manager_oper_update_active (gimp,
+                                         &image_coords, state,
+                                         shell->proximity,
+                                         display);
+      }
+      break;
+
+    case GDK_LEAVE_NOTIFY:
+      {
+        GdkEventCrossing *cevent = (GdkEventCrossing *) event;
+
+        if (! shell->inferior_ignore_mode            &&
+            cevent->subwindow == NULL                &&
+            cevent->mode      == GDK_CROSSING_NORMAL &&
+            cevent->detail    == GDK_NOTIFY_INFERIOR)
+          {
+            shell->inferior_ignore_mode = TRUE;
+            gtk_widget_set_extension_events (shell->canvas,
+                                             GDK_EXTENSION_EVENTS_NONE);
+          }
+
+        if (cevent->mode != GDK_CROSSING_NORMAL)
+          return TRUE;
+
+        /*  ignore leave notify while we have a grab  */
+        if (shell->pointer_grabbed)
+          return TRUE;
+
+        gimp_display_shell_proximity_out (shell);
+
+        tool_manager_oper_update_active (gimp,
+                                         &image_coords, state,
+                                         shell->proximity,
+                                         display);
+      }
+      break;
+
+    case GDK_PROXIMITY_IN:
+      gimp_display_shell_proximity_in (shell);
+
+      tool_manager_oper_update_active (gimp,
+                                       &image_coords, state,
+                                       shell->proximity,
+                                       display);
+      break;
+
+    case GDK_PROXIMITY_OUT:
+      gimp_display_shell_proximity_out (shell);
+
+      tool_manager_oper_update_active (gimp,
+                                       &image_coords, state,
+                                       shell->proximity,
+                                       display);
+      break;
+
+    case GDK_FOCUS_CHANGE:
+      {
+        GdkEventFocus *fevent = (GdkEventFocus *) event;
+
+        if (fevent->in)
+          {
+            if (G_UNLIKELY (! gtk_widget_has_focus (canvas)))
+              g_warning ("%s: FOCUS_IN but canvas has no focus", G_STRFUNC);
+
+            /*  ignore focus changes while we have a grab  */
+            if (shell->pointer_grabbed)
+              return TRUE;
+
+            /*   press modifier keys when the canvas gets the focus  */
+            gimp_display_shell_update_focus (shell, TRUE,
+                                             &image_coords, state);
+          }
+        else
+          {
+            if (G_UNLIKELY (gtk_widget_has_focus (canvas)))
+              g_warning ("%s: FOCUS_OUT but canvas has focus", G_STRFUNC);
+
+            /*  ignore focus changes while we have a grab  */
+            if (shell->pointer_grabbed)
+              return TRUE;
+
+            /*  release modifier keys when the canvas loses the focus  */
+            gimp_display_shell_update_focus (shell, FALSE,
+                                             &image_coords, 0);
+          }
+      }
+      break;
+
+    case GDK_BUTTON_PRESS:
+      {
+        GdkEventButton  *bevent = (GdkEventButton *) event;
+        GdkModifierType  button_state;
+
+        /*  ignore new mouse events  */
+        if (gimp->busy || shell->scrolling ||
+            shell->pointer_grabbed         ||
+            shell->button1_release_pending)
+          return TRUE;
+
+        button_state = gimp_display_shell_button_to_state (bevent->button);
+
+        state |= button_state;
+
+        /* ignore new buttons while another button is down */
+        if (((state & (GDK_BUTTON1_MASK)) && (state & (GDK_BUTTON2_MASK |
+                                                       GDK_BUTTON3_MASK))) ||
+            ((state & (GDK_BUTTON2_MASK)) && (state & (GDK_BUTTON1_MASK |
+                                                       GDK_BUTTON3_MASK))) ||
+            ((state & (GDK_BUTTON3_MASK)) && (state & (GDK_BUTTON1_MASK |
+                                                       GDK_BUTTON2_MASK))))
+          return TRUE;
+
+        /*  focus the widget if it isn't; if the toplevel window
+         *  already has focus, this will generate a FOCUS_IN on the
+         *  canvas immediately, therefore we do this before logging
+         *  the BUTTON_PRESS.
+         */
+        if (! gtk_widget_has_focus (canvas))
+          gtk_widget_grab_focus (canvas);
+
+        /*  if the toplevel window didn't have focus, the above
+         *  gtk_widget_grab_focus() didn't set the canvas' HAS_FOCUS
+         *  flags, and didn't trigger a FOCUS_IN, but the tool needs
+         *  to be set up correctly regardless, so simply do the
+         *  same things here, it's safe to do them redundantly.
+         */
+        gimp_display_shell_update_focus (shell, TRUE,
+                                         &image_coords, state);
+        gimp_display_shell_update_cursor (shell, &display_coords,
+                                          &image_coords, state & ~button_state,
+                                          FALSE);
+
+        if (gdk_event_triggers_context_menu (event))
+          {
+            GimpUIManager *ui_manager;
+            const gchar   *ui_path;
+
+            ui_manager = tool_manager_get_popup_active (gimp,
+                                                        &image_coords, state,
+                                                        display,
+                                                        &ui_path);
+
+            if (ui_manager)
+              {
+                gimp_ui_manager_ui_popup (ui_manager,
+                                          ui_path,
+                                          GTK_WIDGET (shell),
+                                          NULL, NULL, NULL, NULL);
+              }
+            else
+              {
+                gimp_ui_manager_ui_popup (shell->popup_manager,
+                                          "/dummy-menubar/image-popup",
+                                          GTK_WIDGET (shell),
+                                          NULL, NULL, NULL, NULL);
+              }
+          }
+        else if (bevent->button == 1)
+          {
+            if (! gimp_display_shell_pointer_grab (shell, NULL, 0))
+              return TRUE;
+
+            if (! shell->space_release_pending)
+              if (! gimp_display_shell_keyboard_grab (shell, event))
+                {
+                  gimp_display_shell_pointer_ungrab (shell, NULL);
+                  return TRUE;
+                }
+
+            if (gimp_display_shell_initialize_tool (shell,
+                                                    &image_coords, state))
+              {
+                GimpCoords last_motion;
+
+                /* Use the last evaluated velocity&direction instead of the
+                 * button_press event's ones because the click is
+                 * usually at the same spot as the last motion event
+                 * which would give us bogus derivate dynamics.
+                 */
+                gimp_motion_buffer_begin_stroke (shell->motion_buffer, time,
+                                                 &last_motion);
+
+                image_coords.velocity = last_motion.velocity;
+                image_coords.direction = last_motion.direction;
+
+                tool_manager_button_press_active (gimp,
+                                                  &image_coords,
+                                                  time, state,
+                                                  GIMP_BUTTON_PRESS_NORMAL,
+                                                  display);
+              }
+          }
+        else if (bevent->button == 2)
+          {
+            gimp_display_shell_start_scrolling (shell, NULL, state,
+                                                bevent->x, bevent->y);
+          }
+
+        return_val = TRUE;
+      }
+      break;
+
+    case GDK_2BUTTON_PRESS:
+      {
+        GdkEventButton *bevent = (GdkEventButton *) event;
+        GimpTool       *active_tool;
+
+        if (gimp->busy)
+          return TRUE;
+
+        active_tool = tool_manager_get_active (gimp);
+
+        if (bevent->button == 1                                &&
+            active_tool                                        &&
+            gimp_tool_control_is_active (active_tool->control) &&
+            gimp_tool_control_get_wants_double_click (active_tool->control))
+          {
+            tool_manager_button_press_active (gimp,
+                                              &image_coords,
+                                              time, state,
+                                              GIMP_BUTTON_PRESS_DOUBLE,
+                                              display);
+          }
+
+        /*  don't update the cursor again on double click  */
+        return TRUE;
+      }
+      break;
+
+    case GDK_3BUTTON_PRESS:
+      {
+        GdkEventButton *bevent = (GdkEventButton *) event;
+        GimpTool       *active_tool;
+
+        if (gimp->busy)
+          return TRUE;
+
+        active_tool = tool_manager_get_active (gimp);
+
+        if (bevent->button == 1                                &&
+            active_tool                                        &&
+            gimp_tool_control_is_active (active_tool->control) &&
+            gimp_tool_control_get_wants_triple_click (active_tool->control))
+          {
+            tool_manager_button_press_active (gimp,
+                                              &image_coords,
+                                              time, state,
+                                              GIMP_BUTTON_PRESS_TRIPLE,
+                                              display);
+          }
+
+        /*  don't update the cursor again on triple click  */
+        return TRUE;
+      }
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      {
+        GdkEventButton *bevent = (GdkEventButton *) event;
+        GimpTool       *active_tool;
+
+        gimp_display_shell_autoscroll_stop (shell);
+
+        if (bevent->button == 1 && shell->button1_release_pending)
+          {
+            gimp_display_shell_released (shell, event, NULL);
+            return TRUE;
+          }
+
+        if (gimp->busy)
+          return TRUE;
+
+        active_tool = tool_manager_get_active (gimp);
+
+        state &= ~gimp_display_shell_button_to_state (bevent->button);
+
+        if (bevent->button == 1)
+          {
+            if (! shell->pointer_grabbed || shell->scrolling)
+              return TRUE;
+
+            if (! shell->space_release_pending)
+              gimp_display_shell_keyboard_ungrab (shell, event);
+
+            if (active_tool &&
+                (! gimp_image_is_empty (image) ||
+                 gimp_tool_control_get_handle_empty_image (active_tool->control)))
+              {
+                gimp_motion_buffer_end_stroke (shell->motion_buffer);
+
+                if (gimp_tool_control_is_active (active_tool->control))
+                  {
+                    tool_manager_button_release_active (gimp,
+                                                        &image_coords,
+                                                        time, state,
+                                                        display);
+                  }
+              }
+
+            /*  update the tool's modifier state because it didn't get
+             *  key events while BUTTON1 was down
+             */
+            if (gtk_widget_has_focus (canvas))
+              gimp_display_shell_update_focus (shell, TRUE,
+                                               &image_coords, state);
+            else
+              gimp_display_shell_update_focus (shell, FALSE,
+                                               &image_coords, 0);
+
+            gimp_display_shell_pointer_ungrab (shell, NULL);
+          }
+        else if (bevent->button == 2)
+          {
+            if (shell->scrolling)
+              gimp_display_shell_stop_scrolling (shell, NULL);
+          }
+        else if (bevent->button == 3)
+          {
+            /* nop */
+          }
+        else
+          {
+            GdkEventButton *bevent = (GdkEventButton *) event;
+            GimpController *mouse  = gimp_controllers_get_mouse (gimp);
+
+            if (!(shell->scrolling || shell->pointer_grabbed) &&
+                mouse && gimp_controller_mouse_button (GIMP_CONTROLLER_MOUSE (mouse),
+                                                       bevent))
+              {
+                return TRUE;
+              }
+          }
+
+        return_val = TRUE;
+      }
+      break;
+
+    case GDK_SCROLL:
+      {
+        GdkEventScroll *sevent = (GdkEventScroll *) event;
+        GimpController *wheel  = gimp_controllers_get_wheel (gimp);
+
+        if (! wheel ||
+            ! gimp_controller_wheel_scroll (GIMP_CONTROLLER_WHEEL (wheel),
+                                            sevent))
+          {
+            GdkScrollDirection  direction = sevent->direction;
+
+            if (state & gimp_get_toggle_behavior_mask ())
+              {
+                switch (direction)
+                  {
+                  case GDK_SCROLL_UP:
+                    gimp_display_shell_scale (shell,
+                                              GIMP_ZOOM_IN,
+                                              0.0,
+                                              GIMP_ZOOM_FOCUS_POINTER);
+                    break;
+
+                  case GDK_SCROLL_DOWN:
+                    gimp_display_shell_scale (shell,
+                                              GIMP_ZOOM_OUT,
+                                              0.0,
+                                              GIMP_ZOOM_FOCUS_POINTER);
+                    break;
+
+                  default:
+                    break;
+                  }
+              }
+            else
+              {
+                GtkAdjustment *adj = NULL;
+                gdouble        value;
+
+                if (state & GDK_SHIFT_MASK)
+                  switch (direction)
+                    {
+                    case GDK_SCROLL_UP:    direction = GDK_SCROLL_LEFT;  break;
+                    case GDK_SCROLL_DOWN:  direction = GDK_SCROLL_RIGHT; break;
+                    case GDK_SCROLL_LEFT:  direction = GDK_SCROLL_UP;    break;
+                    case GDK_SCROLL_RIGHT: direction = GDK_SCROLL_DOWN;  break;
+                    }
+
+                switch (direction)
+                  {
+                  case GDK_SCROLL_LEFT:
+                  case GDK_SCROLL_RIGHT:
+                    adj = shell->hsbdata;
+                    break;
+
+                  case GDK_SCROLL_UP:
+                  case GDK_SCROLL_DOWN:
+                    adj = shell->vsbdata;
+                    break;
+                  }
+
+                value = (gtk_adjustment_get_value (adj) +
+                         ((direction == GDK_SCROLL_UP ||
+                           direction == GDK_SCROLL_LEFT) ?
+                          -gtk_adjustment_get_page_increment (adj) / 2 :
+                          gtk_adjustment_get_page_increment (adj) / 2));
+                value = CLAMP (value,
+                               gtk_adjustment_get_lower (adj),
+                               gtk_adjustment_get_upper (adj) -
+                               gtk_adjustment_get_page_size (adj));
+
+                gtk_adjustment_set_value (adj, value);
+              }
+          }
+
+        gimp_display_shell_untransform_event_coords (shell,
+                                                     &display_coords,
+                                                     &image_coords,
+                                                     &update_sw_cursor);
+
+        tool_manager_oper_update_active (gimp,
+                                         &image_coords, state,
+                                         shell->proximity,
+                                         display);
+
+        return_val = TRUE;
+      }
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      {
+        GdkEventMotion *mevent            = (GdkEventMotion *) event;
+        GdkEvent       *compressed_motion = NULL;
+        GimpMotionMode  motion_mode       = GIMP_MOTION_MODE_EXACT;
+        GimpTool       *active_tool;
+
+        if (gimp->busy)
+          return TRUE;
+
+        active_tool = tool_manager_get_active (gimp);
+
+        if (active_tool)
+          motion_mode = gimp_tool_control_get_motion_mode (active_tool->control);
+
+        if (shell->scrolling ||
+            motion_mode == GIMP_MOTION_MODE_COMPRESS)
+          {
+            compressed_motion = gimp_display_shell_compress_motion (event,
+                                                                    next_event);
+
+            if (compressed_motion && ! shell->scrolling)
+              {
+                gimp_display_shell_get_event_coords (shell,
+                                                     compressed_motion,
+                                                     &display_coords,
+                                                     &state, &time);
+                gimp_display_shell_untransform_event_coords (shell,
+                                                             &display_coords,
+                                                             &image_coords,
+                                                             NULL);
+              }
+          }
+
+        /*  call proximity_in() here because the pointer might already
+         *  be in proximity when the canvas starts to receive events,
+         *  like when a new image has been created into an empty
+         *  display
+         */
+        gimp_display_shell_proximity_in (shell);
+        update_sw_cursor = TRUE;
+
+        if (shell->scrolling)
+          {
+            GdkEventMotion *me = (compressed_motion ?
+                                  (GdkEventMotion *) compressed_motion :
+                                  mevent);
+
+            gimp_display_shell_handle_scrolling (shell, state, me->x, me->y);
+          }
+        else if (state & GDK_BUTTON1_MASK)
+          {
+            if (active_tool                                        &&
+                gimp_tool_control_is_active (active_tool->control) &&
+                (! gimp_image_is_empty (image) ||
+                 gimp_tool_control_get_handle_empty_image (active_tool->control)))
+              {
+                GdkTimeCoord **history_events;
+                gint           n_history_events;
+                guint32        last_motion_time;
+
+                /*  if the first mouse button is down, check for automatic
+                 *  scrolling...
+                 */
+                if ((mevent->x < 0                 ||
+                     mevent->y < 0                 ||
+                     mevent->x > shell->disp_width ||
+                     mevent->y > shell->disp_height) &&
+                    ! gimp_tool_control_get_scroll_lock (active_tool->control))
+                  {
+                    gimp_display_shell_autoscroll_start (shell, state, mevent);
+                  }
+
+                /* gdk_device_get_history() has several quirks. First
+                 * is that events with borderline timestamps at both
+                 * ends are included. Because of that we need to add 1
+                 * to lower border. The second is due to poor X event
+                 * resolution. We need to do -1 to ensure that the
+                 * amount of events between timestamps is final or
+                 * risk losing some.
+                 */
+                last_motion_time =
+                  gimp_motion_buffer_get_last_motion_time (shell->motion_buffer);
+
+                if (motion_mode == GIMP_MOTION_MODE_EXACT     &&
+                    shell->display->config->use_event_history &&
+                    gdk_device_get_history (mevent->device, mevent->window,
+                                            last_motion_time + 1,
+                                            mevent->time - 1,
+                                            &history_events,
+                                            &n_history_events))
+                  {
+                    GimpDeviceInfo *device;
+                    gint            i;
+
+                    device = gimp_device_info_get_by_device (mevent->device);
+
+                    for (i = 0; i < n_history_events; i++)
+                      {
+                        gimp_device_info_get_time_coords (device,
+                                                          history_events[i],
+                                                          &display_coords);
+
+                        gimp_display_shell_untransform_event_coords (shell,
+                                                                     &display_coords,
+                                                                     &image_coords,
+                                                                     NULL);
+
+                        /* Early removal of useless events saves CPU time.
+                         */
+                        if (gimp_motion_buffer_motion_event (shell->motion_buffer,
+                                                             &image_coords,
+                                                             history_events[i]->time,
+                                                             TRUE))
+                          {
+                            gimp_motion_buffer_request_stroke (shell->motion_buffer,
+                                                               state,
+                                                               history_events[i]->time);
+                          }
+                      }
+
+                    gdk_device_free_history (history_events, n_history_events);
+                  }
+                else
+                  {
+                    gboolean event_fill = (motion_mode == GIMP_MOTION_MODE_EXACT);
+
+                    /* Early removal of useless events saves CPU time.
+                     */
+                    if (gimp_motion_buffer_motion_event (shell->motion_buffer,
+                                                         &image_coords,
+                                                         time,
+                                                         event_fill))
+                      {
+                        gimp_motion_buffer_request_stroke (shell->motion_buffer,
+                                                           state,
+                                                           time);
+                      }
+                  }
+              }
+          }
+
+        if (! (state &
+               (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
+          {
+            /* Early removal of useless events saves CPU time.
+             * Pass event_fill = FALSE since we are only hovering.
+             */
+            if (gimp_motion_buffer_motion_event (shell->motion_buffer,
+                                                 &image_coords,
+                                                 time,
+                                                 FALSE))
+              {
+                gimp_motion_buffer_request_hover (shell->motion_buffer,
+                                                  state,
+                                                  shell->proximity);
+              }
+          }
+
+        if (compressed_motion)
+          gdk_event_free (compressed_motion);
+
+        return_val = TRUE;
+      }
+      break;
+
+    case GDK_KEY_PRESS:
+      {
+        GdkEventKey *kevent = (GdkEventKey *) event;
+        GimpTool    *active_tool;
+
+        active_tool = tool_manager_get_active (gimp);
+
+        if (state & GDK_BUTTON1_MASK)
+          {
+            if (kevent->keyval == GDK_KEY_Alt_L     ||
+                kevent->keyval == GDK_KEY_Alt_R     ||
+                kevent->keyval == GDK_KEY_Shift_L   ||
+                kevent->keyval == GDK_KEY_Shift_R   ||
+                kevent->keyval == GDK_KEY_Control_L ||
+                kevent->keyval == GDK_KEY_Control_R ||
+                kevent->keyval == GDK_KEY_Meta_L    ||
+                kevent->keyval == GDK_KEY_Meta_R)
+              {
+                GdkModifierType key;
+
+                key = gimp_display_shell_key_to_state (kevent->keyval);
+                state |= key;
+
+                if (active_tool                                        &&
+                    gimp_tool_control_is_active (active_tool->control) &&
+                    ! gimp_image_is_empty (image))
+                  {
+                    tool_manager_active_modifier_state_active (gimp, state,
+                                                               display);
+                  }
+              }
+          }
+        else
+          {
+            gboolean arrow_key = FALSE;
+
+            tool_manager_focus_display_active (gimp, display);
+
+            if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
+              {
+                if (tool_manager_key_press_active (gimp, kevent, display))
+                  {
+                    /* FIXME: need to do some of the stuff below, like
+                     * calling oper_update()
+                     */
+
+                    return TRUE;
+                  }
+              }
+
+            if (! gtk_widget_has_focus (shell->canvas))
+              {
+                /*  The event was in an overlay widget and not handled
+                 *  there, make sure the overlay widgets are keyboard
+                 *  navigatable by letting the generic widget handlers
+                 *  deal with the event.
+                 */
+                return FALSE;
+              }
+
+            if (gimp_display_shell_key_to_state (kevent->keyval) == GDK_MOD1_MASK)
+              /* Make sure the picked layer is reset. */
+              shell->picked_layer = NULL;
+
+            switch (kevent->keyval)
+              {
+              case GDK_KEY_Left:
+              case GDK_KEY_Right:
+              case GDK_KEY_Up:
+              case GDK_KEY_Down:
+                arrow_key = TRUE;
+
+              case GDK_KEY_Return:
+              case GDK_KEY_KP_Enter:
+              case GDK_KEY_ISO_Enter:
+              case GDK_KEY_BackSpace:
+              case GDK_KEY_Escape:
+                if (! gimp_image_is_empty (image))
+                  return_val = tool_manager_key_press_active (gimp,
+                                                              kevent,
+                                                              display);
+
+                if (! return_val)
+                  {
+                    GimpController *keyboard = gimp_controllers_get_keyboard (gimp);
+
+                    if (keyboard)
+                      return_val =
+                        gimp_controller_keyboard_key_press (GIMP_CONTROLLER_KEYBOARD (keyboard),
+                                                            kevent);
+                  }
+
+                /* always swallow arrow keys, we don't want focus keynav */
+                if (! return_val)
+                  return_val = arrow_key;
+                break;
+
+              case GDK_KEY_space:
+              case GDK_KEY_KP_Space:
+                if (shell->button1_release_pending)
+                  shell->space_release_pending = TRUE;
+                else
+                  gimp_display_shell_space_pressed (shell, event);
+                return_val = TRUE;
+                break;
+
+              case GDK_KEY_Tab:
+              case GDK_KEY_KP_Tab:
+              case GDK_KEY_ISO_Left_Tab:
+                gimp_display_shell_tab_pressed (shell, kevent);
+                return_val = TRUE;
+                break;
+
+                /*  Update the state based on modifiers being pressed  */
+              case GDK_KEY_Alt_L:     case GDK_KEY_Alt_R:
+              case GDK_KEY_Shift_L:   case GDK_KEY_Shift_R:
+              case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+              case GDK_KEY_Meta_L:    case GDK_KEY_Meta_R:
+                {
+                  GdkModifierType key;
+
+                  key = gimp_display_shell_key_to_state (kevent->keyval);
+                  state |= key;
+
+                  if (! gimp_image_is_empty (image))
+                    tool_manager_modifier_state_active (gimp, state, display);
+                }
+                break;
+              }
+
+            tool_manager_oper_update_active (gimp,
+                                             &image_coords, state,
+                                             shell->proximity,
+                                             display);
+          }
+      }
+      break;
+
+    case GDK_KEY_RELEASE:
+      {
+        GdkEventKey *kevent = (GdkEventKey *) event;
+        GimpTool    *active_tool;
+
+        active_tool = tool_manager_get_active (gimp);
+
+        if (gimp_display_shell_key_to_state (kevent->keyval) == GDK_MOD1_MASK &&
+            shell->picked_layer)
+          {
+            GimpStatusbar *statusbar;
+
+            statusbar = gimp_display_shell_get_statusbar (shell);
+            gimp_statusbar_pop_temp (statusbar);
+
+            shell->picked_layer = NULL;
+          }
+
+        if ((state & GDK_BUTTON1_MASK)      &&
+            (! shell->space_release_pending ||
+             (kevent->keyval != GDK_KEY_space &&
+              kevent->keyval != GDK_KEY_KP_Space)))
+          {
+            if (kevent->keyval == GDK_KEY_Alt_L     ||
+                kevent->keyval == GDK_KEY_Alt_R     ||
+                kevent->keyval == GDK_KEY_Shift_L   ||
+                kevent->keyval == GDK_KEY_Shift_R   ||
+                kevent->keyval == GDK_KEY_Control_L ||
+                kevent->keyval == GDK_KEY_Control_R ||
+                kevent->keyval == GDK_KEY_Meta_L    ||
+                kevent->keyval == GDK_KEY_Meta_R)
+              {
+                GdkModifierType key;
+
+                key = gimp_display_shell_key_to_state (kevent->keyval);
+                state &= ~key;
+
+                if (active_tool                                        &&
+                    gimp_tool_control_is_active (active_tool->control) &&
+                    ! gimp_image_is_empty (image))
+                  {
+                    tool_manager_active_modifier_state_active (gimp, state,
+                                                               display);
+                  }
+              }
+          }
+        else
+          {
+            tool_manager_focus_display_active (gimp, display);
+
+            if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
+              {
+                if (tool_manager_key_release_active (gimp, kevent, display))
+                  {
+                    /* FIXME: need to do some of the stuff below, like
+                     * calling oper_update()
+                     */
+
+                    return TRUE;
+                  }
+              }
+
+            if (! gtk_widget_has_focus (shell->canvas))
+              {
+                /*  The event was in an overlay widget and not handled
+                 *  there, make sure the overlay widgets are keyboard
+                 *  navigatable by letting the generic widget handlers
+                 *  deal with the event.
+                 */
+                return FALSE;
+              }
+
+            switch (kevent->keyval)
+              {
+              case GDK_KEY_space:
+              case GDK_KEY_KP_Space:
+                if ((state & GDK_BUTTON1_MASK))
+                  {
+                    shell->button1_release_pending = TRUE;
+                    shell->space_release_pending   = FALSE;
+                    /* We need to ungrab the pointer in order to catch
+                     * button release events.
+                     */
+                    if (shell->pointer_grabbed)
+                      gimp_display_shell_pointer_ungrab (shell, event);
+                  }
+                else
+                  {
+                    gimp_display_shell_released (shell, event, NULL);
+                  }
+                return_val = TRUE;
+                break;
+
+                /*  Update the state based on modifiers being pressed  */
+              case GDK_KEY_Alt_L:     case GDK_KEY_Alt_R:
+              case GDK_KEY_Shift_L:   case GDK_KEY_Shift_R:
+              case GDK_KEY_Control_L: case GDK_KEY_Control_R:
+              case GDK_KEY_Meta_L:    case GDK_KEY_Meta_R:
+                {
+                  GdkModifierType key;
+
+                  key = gimp_display_shell_key_to_state (kevent->keyval);
+                  state &= ~key;
+
+                  /*  For all modifier keys: call the tools
+                   *  modifier_state *and* oper_update method so tools
+                   *  can choose if they are interested in the press
+                   *  itself or only in the resulting state
+                   */
+                  if (! gimp_image_is_empty (image))
+                    tool_manager_modifier_state_active (gimp, state, display);
+                }
+                break;
+              }
+
+            tool_manager_oper_update_active (gimp,
+                                             &image_coords, state,
+                                             shell->proximity,
+                                             display);
+          }
+      }
+      break;
+
+    default:
+      break;
+    }
+
+  /*  if we reached this point in gimp_busy mode, return now  */
+  if (gimp->busy)
+    return return_val;
+
+  /*  cursor update   */
+  gimp_display_shell_update_cursor (shell, &display_coords, &image_coords,
+                                    state, update_sw_cursor);
+
+  return return_val;
+}
+
+static GdkModifierType
+gimp_display_shell_key_to_state (gint key)
+{
+  /* FIXME: need some proper GDK API to figure this */
+
+  switch (key)
+    {
+    case GDK_KEY_Alt_L:
+    case GDK_KEY_Alt_R:
+      return GDK_MOD1_MASK;
+
+    case GDK_KEY_Shift_L:
+    case GDK_KEY_Shift_R:
+      return GDK_SHIFT_MASK;
+
+    case GDK_KEY_Control_L:
+    case GDK_KEY_Control_R:
+      return GDK_CONTROL_MASK;
+
+#ifdef GDK_WINDOWING_QUARTZ
+    case GDK_KEY_Meta_L:
+    case GDK_KEY_Meta_R:
+      return GDK_MOD2_MASK;
+#endif
+
+    default:
+      return 0;
+    }
+}
+
+static GdkModifierType
+gimp_display_shell_button_to_state (gint button)
+{
+  if (button == 1)
+    return GDK_BUTTON1_MASK;
+  else if (button == 2)
+    return GDK_BUTTON2_MASK;
+  else if (button == 3)
+    return GDK_BUTTON3_MASK;
+
+  return 0;
+}
+
+static void
+gimp_display_shell_proximity_in (GimpDisplayShell *shell)
+{
+  if (! shell->proximity)
+    {
+      shell->proximity = TRUE;
+
+      gimp_display_shell_check_device_cursor (shell);
+    }
+}
+
+static void
+gimp_display_shell_proximity_out (GimpDisplayShell *shell)
+{
+  if (shell->proximity)
+    {
+      shell->proximity = FALSE;
+
+      gimp_display_shell_clear_software_cursor (shell);
+    }
+}
+
+static void
+gimp_display_shell_check_device_cursor (GimpDisplayShell *shell)
+{
+  GimpDeviceManager *manager;
+  GimpDeviceInfo    *current_device;
+
+  manager = gimp_devices_get_manager (shell->display->gimp);
+
+  current_device = gimp_device_manager_get_current_device (manager);
+
+  shell->draw_cursor = ! gimp_device_info_has_cursor (current_device);
+}
+
+static void
+gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
+                                    const GdkEvent   *event,
+                                    GdkModifierType   state,
+                                    gint              x,
+                                    gint              y)
+{
+  g_return_if_fail (! shell->scrolling);
+
+  gimp_display_shell_pointer_grab (shell, event, GDK_POINTER_MOTION_MASK);
+
+  shell->scrolling         = TRUE;
+  shell->scroll_start_x    = x;
+  shell->scroll_start_y    = y;
+  shell->scroll_last_x     = x;
+  shell->scroll_last_y     = y;
+  shell->rotating          = (state & gimp_get_extend_selection_mask ()) ? TRUE : FALSE;
+  shell->rotate_drag_angle = shell->rotate_angle;
+  shell->scaling           = (state & gimp_get_toggle_behavior_mask ()) ? TRUE : FALSE;
+  shell->layer_picking     = (state & GDK_MOD1_MASK) ? TRUE : FALSE;
+
+  if (shell->rotating)
+    {
+      gimp_display_shell_set_override_cursor (shell,
+                                              (GimpCursorType) GDK_EXCHANGE);
+    }
+  else if (shell->scaling)
+    {
+      gimp_display_shell_set_override_cursor (shell,
+                                              (GimpCursorType) GIMP_CURSOR_ZOOM);
+    }
+  else if (shell->layer_picking)
+    {
+      GimpImage  *image   = gimp_display_get_image (shell->display);
+      GimpLayer  *layer;
+      GimpCoords  image_coords;
+      GimpCoords  display_coords;
+      guint32     time;
+
+      gimp_display_shell_set_override_cursor (shell,
+                                              (GimpCursorType) GIMP_CURSOR_CROSSHAIR);
+
+      gimp_display_shell_get_event_coords (shell, event,
+                                           &display_coords,
+                                           &state, &time);
+      gimp_display_shell_untransform_event_coords (shell,
+                                                   &display_coords, &image_coords,
+                                                   NULL);
+      layer = gimp_image_pick_layer (image,
+                                     (gint) image_coords.x,
+                                     (gint) image_coords.y,
+                                     shell->picked_layer);
+
+      if (layer && ! gimp_image_get_floating_selection (image))
+        {
+          if (layer != gimp_image_get_active_layer (image))
+            {
+              GimpStatusbar *statusbar;
+
+              gimp_image_set_active_layer (image, layer);
+
+              statusbar = gimp_display_shell_get_statusbar (shell);
+              gimp_statusbar_push_temp (statusbar, GIMP_MESSAGE_INFO,
+                                        GIMP_ICON_LAYER,
+                                        _("Layer picked: '%s'"),
+                                        gimp_object_get_name (layer));
+            }
+          shell->picked_layer = layer;
+        }
+    }
+  else
+    gimp_display_shell_set_override_cursor (shell,
+                                            (GimpCursorType) GDK_FLEUR);
+}
+
+static void
+gimp_display_shell_stop_scrolling (GimpDisplayShell *shell,
+                                   const GdkEvent   *event)
+{
+  g_return_if_fail (shell->scrolling);
+
+  gimp_display_shell_unset_override_cursor (shell);
+
+  shell->scrolling         = FALSE;
+  shell->scroll_start_x    = 0;
+  shell->scroll_start_y    = 0;
+  shell->scroll_last_x     = 0;
+  shell->scroll_last_y     = 0;
+  shell->rotating          = FALSE;
+  shell->rotate_drag_angle = 0.0;
+  shell->scaling           = FALSE;
+  shell->layer_picking     = FALSE;
+
+  /* We may have ungrabbed the pointer when space was released while
+   * mouse was down, to be able to catch a GDK_BUTTON_RELEASE event.
+   */
+  if (shell->pointer_grabbed)
+    gimp_display_shell_pointer_ungrab (shell, event);
+}
+
+static void
+gimp_display_shell_handle_scrolling (GimpDisplayShell *shell,
+                                     GdkModifierType   state,
+                                     gint              x,
+                                     gint              y)
+{
+  g_return_if_fail (shell->scrolling);
+
+  if (shell->rotating)
+    {
+      gboolean constrain = (state & GDK_CONTROL_MASK) ? TRUE : FALSE;
+
+      gimp_display_shell_rotate_drag (shell,
+                                      shell->scroll_last_x,
+                                      shell->scroll_last_y,
+                                      x,
+                                      y,
+                                      constrain);
+    }
+  else if (shell->scaling)
+    {
+      gimp_display_shell_scale_drag (shell,
+                                     shell->scroll_start_x,
+                                     shell->scroll_start_y,
+                                     shell->scroll_last_x - x,
+                                     shell->scroll_last_y - y);
+    }
+  else if (shell->layer_picking)
+    {
+      /* Do nothing. We only pick the layer on click. */
+    }
+  else
+    {
+      gimp_display_shell_scroll (shell,
+                                 shell->scroll_last_x - x,
+                                 shell->scroll_last_y - y);
+    }
+
+  shell->scroll_last_x = x;
+  shell->scroll_last_y = y;
+}
+
+static void
+gimp_display_shell_space_pressed (GimpDisplayShell *shell,
+                                  const GdkEvent   *event)
+{
+  Gimp *gimp = gimp_display_get_gimp (shell->display);
+
+  if (shell->space_release_pending || shell->scrolling)
+    return;
+
+  if (! gimp_display_shell_keyboard_grab (shell, event))
+    return;
+
+  switch (shell->display->config->space_bar_action)
+    {
+    case GIMP_SPACE_BAR_ACTION_NONE:
+      break;
+
+    case GIMP_SPACE_BAR_ACTION_PAN:
+      {
+        GimpDeviceManager *manager;
+        GimpDeviceInfo    *current_device;
+        GimpCoords         coords;
+        GdkModifierType    state = 0;
+
+        manager = gimp_devices_get_manager (gimp);
+        current_device = gimp_device_manager_get_current_device (manager);
+
+        gimp_device_info_get_device_coords (current_device,
+                                            gtk_widget_get_window (shell->canvas),
+                                            &coords);
+        gdk_event_get_state (event, &state);
+
+        gimp_display_shell_start_scrolling (shell, event, state,
+                                            coords.x, coords.y);
+      }
+      break;
+
+    case GIMP_SPACE_BAR_ACTION_MOVE:
+      {
+        GimpTool *active_tool = tool_manager_get_active (gimp);
+
+        if (active_tool || ! GIMP_IS_MOVE_TOOL (active_tool))
+          {
+            GdkModifierType state;
+
+            shell->space_shaded_tool =
+              gimp_object_get_name (active_tool->tool_info);
+
+            gimp_context_set_tool (gimp_get_user_context (gimp),
+                                   gimp_get_tool_info (gimp, "gimp-move-tool"));
+
+            gdk_event_get_state (event, &state);
+
+            gimp_display_shell_update_focus (shell, TRUE,
+                                             NULL, state);
+          }
+      }
+      break;
+    }
+
+  shell->space_release_pending = TRUE;
+}
+
+static void
+gimp_display_shell_released (GimpDisplayShell *shell,
+                             const GdkEvent   *event,
+                             const GimpCoords *image_coords)
+{
+  Gimp *gimp = gimp_display_get_gimp (shell->display);
+
+  if (! shell->space_release_pending &&
+      ! shell->button1_release_pending)
+    return;
+
+  switch (shell->display->config->space_bar_action)
+    {
+    case GIMP_SPACE_BAR_ACTION_NONE:
+      break;
+
+    case GIMP_SPACE_BAR_ACTION_PAN:
+      gimp_display_shell_stop_scrolling (shell, event);
+      break;
+
+    case GIMP_SPACE_BAR_ACTION_MOVE:
+      if (shell->space_shaded_tool)
+        {
+          gimp_context_set_tool (gimp_get_user_context (gimp),
+                                 gimp_get_tool_info (gimp,
+                                                     shell->space_shaded_tool));
+          shell->space_shaded_tool = NULL;
+
+          if (gtk_widget_has_focus (shell->canvas))
+            {
+              GdkModifierType state;
+
+              gdk_event_get_state (event, &state);
+
+              gimp_display_shell_update_focus (shell, TRUE,
+                                               image_coords, state);
+            }
+          else
+            {
+              gimp_display_shell_update_focus (shell, FALSE,
+                                               image_coords, 0);
+            }
+        }
+      break;
+    }
+
+  gimp_display_shell_keyboard_ungrab (shell, event);
+
+  shell->space_release_pending   = FALSE;
+  shell->button1_release_pending = FALSE;
+}
+
+static gboolean
+gimp_display_shell_tab_pressed (GimpDisplayShell  *shell,
+                                const GdkEventKey *kevent)
+{
+  GimpImageWindow *window  = gimp_display_shell_get_window (shell);
+  GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+  GimpImage       *image   = gimp_display_get_image (shell->display);
+
+  if (kevent->state & GDK_CONTROL_MASK)
+    {
+      if (image && ! gimp_image_is_empty (image))
+        {
+          if (kevent->keyval == GDK_KEY_Tab ||
+              kevent->keyval == GDK_KEY_KP_Tab)
+            gimp_display_shell_layer_select_init (shell,
+                                                  1, kevent->time);
+          else
+            gimp_display_shell_layer_select_init (shell,
+                                                  -1, kevent->time);
+
+          return TRUE;
+        }
+    }
+  else if (kevent->state & GDK_MOD1_MASK)
+    {
+      if (image)
+        {
+          if (kevent->keyval == GDK_KEY_Tab ||
+              kevent->keyval == GDK_KEY_KP_Tab)
+            gimp_ui_manager_activate_action (manager, "windows",
+                                             "windows-show-display-next");
+          else
+            gimp_ui_manager_activate_action (manager, "windows",
+                                             "windows-show-display-previous");
+
+          return TRUE;
+        }
+    }
+  else
+    {
+      gimp_ui_manager_activate_action (manager, "windows",
+                                       "windows-hide-docks");
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_display_shell_update_focus (GimpDisplayShell *shell,
+                                 gboolean          focus_in,
+                                 const GimpCoords *image_coords,
+                                 GdkModifierType   state)
+{
+  Gimp *gimp = gimp_display_get_gimp (shell->display);
+
+  if (focus_in)
+    {
+      tool_manager_focus_display_active (gimp, shell->display);
+      tool_manager_modifier_state_active (gimp, state, shell->display);
+    }
+  else
+    {
+      tool_manager_focus_display_active (gimp, NULL);
+    }
+
+  if (image_coords)
+    tool_manager_oper_update_active (gimp,
+                                     image_coords, state,
+                                     shell->proximity,
+                                     shell->display);
+}
+
+static void
+gimp_display_shell_update_cursor (GimpDisplayShell *shell,
+                                  const GimpCoords *display_coords,
+                                  const GimpCoords *image_coords,
+                                  GdkModifierType   state,
+                                  gboolean          update_software_cursor)
+{
+  GimpDisplay *display = shell->display;
+  Gimp        *gimp    = gimp_display_get_gimp (display);
+  GimpImage   *image   = gimp_display_get_image (display);
+  GimpTool    *active_tool;
+
+  if (! shell->display->config->cursor_updating)
+    return;
+
+  active_tool = tool_manager_get_active (gimp);
+
+  if (active_tool)
+    {
+      if ((! gimp_image_is_empty (image) ||
+           gimp_tool_control_get_handle_empty_image (active_tool->control)) &&
+          ! (state & (GDK_BUTTON1_MASK |
+                      GDK_BUTTON2_MASK |
+                      GDK_BUTTON3_MASK)))
+        {
+          tool_manager_cursor_update_active (gimp,
+                                             image_coords, state,
+                                             display);
+        }
+      else if (gimp_image_is_empty (image) &&
+               ! gimp_tool_control_get_handle_empty_image (active_tool->control))
+        {
+          gimp_display_shell_set_cursor (shell,
+                                         GIMP_CURSOR_MOUSE,
+                                         gimp_tool_control_get_tool_cursor (active_tool->control),
+                                         GIMP_CURSOR_MODIFIER_BAD);
+        }
+    }
+  else
+    {
+      gimp_display_shell_set_cursor (shell,
+                                     GIMP_CURSOR_MOUSE,
+                                     GIMP_TOOL_CURSOR_NONE,
+                                     GIMP_CURSOR_MODIFIER_BAD);
+    }
+
+  if (update_software_cursor)
+    {
+      GimpCursorPrecision precision = GIMP_CURSOR_PRECISION_PIXEL_CENTER;
+
+      if (active_tool)
+        precision = gimp_tool_control_get_precision (active_tool->control);
+
+      gimp_display_shell_update_software_cursor (shell,
+                                                 precision,
+                                                 (gint) display_coords->x,
+                                                 (gint) display_coords->y,
+                                                 image_coords->x,
+                                                 image_coords->y);
+    }
+}
+
+static gboolean
+gimp_display_shell_initialize_tool (GimpDisplayShell *shell,
+                                    const GimpCoords *image_coords,
+                                    GdkModifierType   state)
+{
+  GimpDisplay *display     = shell->display;
+  GimpImage   *image       = gimp_display_get_image (display);
+  Gimp        *gimp        = gimp_display_get_gimp (display);
+  gboolean     initialized = FALSE;
+  GimpTool    *active_tool;
+
+  active_tool = tool_manager_get_active (gimp);
+
+  if (active_tool &&
+      (! gimp_image_is_empty (image) ||
+       gimp_tool_control_get_handle_empty_image (active_tool->control)))
+    {
+      /*  initialize the current tool if it has no drawable  */
+      if (! active_tool->drawable)
+        {
+          initialized = tool_manager_initialize_active (gimp, display);
+        }
+      else if ((active_tool->drawable !=
+                gimp_image_get_active_drawable (image)) &&
+               (! gimp_tool_control_get_preserve (active_tool->control) &&
+                (gimp_tool_control_get_dirty_mask (active_tool->control) &
+                 GIMP_DIRTY_ACTIVE_DRAWABLE)))
+        {
+          GimpProcedure *procedure = g_object_get_data (G_OBJECT (active_tool),
+                                                        "gimp-gegl-procedure");
+
+          if (image == gimp_item_get_image (GIMP_ITEM (active_tool->drawable)))
+            {
+              /*  When changing between drawables if the *same* image,
+               *  stop the tool using its dirty action, so it doesn't
+               *  get committed on tool change, in case its dirty action
+               *  is HALT. This is a pure "probably better this way"
+               *  decision because the user is likely changing their
+               *  mind or was simply on the wrong layer. See bug #776370.
+               *
+               *  See also issues #1180 and #1202 for cases where we
+               *  actually *don't* want to halt the tool here, but rather
+               *  commit it, hence the use of the tool's dirty action.
+               */
+              tool_manager_control_active (
+                gimp,
+                gimp_tool_control_get_dirty_action (active_tool->control),
+                active_tool->display);
+            }
+
+          if (procedure)
+            {
+              /*  We can't just recreate an operation tool, we must
+               *  make sure the right stuff gets set on it, so
+               *  re-activate the procedure that created it instead of
+               *  just calling gimp_context_tool_changed(). See
+               *  GimpGeglProcedure and bug #776370.
+               */
+              GimpImageWindow *window;
+              GimpUIManager   *manager;
+
+              window  = gimp_display_shell_get_window (shell);
+              manager = gimp_image_window_get_ui_manager (window);
+
+              gimp_filter_history_add (gimp, procedure);
+              gimp_ui_manager_activate_action (manager, "filters",
+                                               "filters-reshow");
+
+              /*  the procedure already initialized the tool; don't
+               *  reinitialize it below, since this can lead to errors.
+               */
+              initialized = TRUE;
+            }
+          else
+            {
+              /*  create a new one, deleting the current  */
+              gimp_context_tool_changed (gimp_get_user_context (gimp));
+            }
+
+          /*  make sure the newly created tool has the right state  */
+          gimp_display_shell_update_focus (shell, TRUE, image_coords, state);
+
+          if (! initialized)
+            initialized = tool_manager_initialize_active (gimp, display);
+        }
+      else
+        {
+          initialized = TRUE;
+        }
+    }
+
+  return initialized;
+}
+
+static void
+gimp_display_shell_get_event_coords (GimpDisplayShell *shell,
+                                     const GdkEvent   *event,
+                                     GimpCoords       *display_coords,
+                                     GdkModifierType  *state,
+                                     guint32          *time)
+{
+  Gimp              *gimp = gimp_display_get_gimp (shell->display);
+  GimpDeviceManager *manager;
+  GimpDeviceInfo    *current_device;
+
+  manager = gimp_devices_get_manager (gimp);
+  current_device = gimp_device_manager_get_current_device (manager);
+
+  gimp_device_info_get_event_coords (current_device,
+                                     gtk_widget_get_window (shell->canvas),
+                                     event,
+                                     display_coords);
+
+  gimp_device_info_get_event_state (current_device,
+                                    gtk_widget_get_window (shell->canvas),
+                                    event,
+                                    state);
+
+  *time = gdk_event_get_time (event);
+}
+
+static void
+gimp_display_shell_untransform_event_coords (GimpDisplayShell *shell,
+                                             const GimpCoords *display_coords,
+                                             GimpCoords       *image_coords,
+                                             gboolean         *update_software_cursor)
+{
+  Gimp     *gimp = gimp_display_get_gimp (shell->display);
+  GimpTool *active_tool;
+
+  /*  GimpCoords passed to tools are ALWAYS in image coordinates  */
+  gimp_display_shell_untransform_coords (shell,
+                                         display_coords,
+                                         image_coords);
+
+  active_tool = tool_manager_get_active (gimp);
+
+  if (active_tool && gimp_tool_control_get_snap_to (active_tool->control))
+    {
+      gint x, y, width, height;
+
+      gimp_tool_control_get_snap_offsets (active_tool->control,
+                                          &x, &y, &width, &height);
+
+      if (gimp_display_shell_snap_coords (shell,
+                                          image_coords,
+                                          x, y, width, height))
+        {
+          if (update_software_cursor)
+            *update_software_cursor = TRUE;
+        }
+    }
+}
+
+/* gimp_display_shell_compress_motion:
+ *
+ * This function walks the GDK event queue, seeking motion events at the
+ * front of the queue corresponding to the same widget as, and having
+ * similar characteristics to, `initial_event`.   If it finds any it will
+ * remove them from the queue, and return the most recent motion event.
+ * Otherwise it will return NULL.
+ *
+ * If `*next_event` is non-NULL upon return, the caller must dispatch and
+ * free this event after handling the motion event.
+ *
+ * The gimp_display_shell_compress_motion function source may be re-used under
+ * the XFree86-style license. <adam@gimp.org>
+ */
+static GdkEvent *
+gimp_display_shell_compress_motion (GdkEvent  *initial_event,
+                                    GdkEvent **next_event)
+{
+  GdkEvent  *last_motion = NULL;
+  GtkWidget *widget;
+
+  *next_event = NULL;
+
+  if (initial_event->any.type != GDK_MOTION_NOTIFY)
+    return NULL;
+
+  widget = gtk_get_event_widget (initial_event);
+
+  while (gdk_events_pending ())
+    {
+      GdkEvent *event = gdk_event_get ();
+
+      if (!event)
+        {
+          /* Do nothing */
+        }
+      else if ((gtk_get_event_widget (event) == widget)               &&
+               (event->any.type      == GDK_MOTION_NOTIFY)            &&
+               (event->any.window    == initial_event->any.window)    &&
+               (event->motion.state  == initial_event->motion.state)  &&
+               (event->motion.device == initial_event->motion.device))
+        {
+          /* Discard previous motion event */
+          if (last_motion)
+            gdk_event_free (last_motion);
+
+          last_motion = event;
+        }
+      else
+        {
+          /* Let the caller dispatch the event */
+          *next_event = event;
+
+          break;
+        }
+    }
+
+  return last_motion;
+}
diff --git a/app/display/gimpdisplayshell-tool-events.h b/app/display/gimpdisplayshell-tool-events.h
new file mode 100644
index 0000000..4458a92
--- /dev/null
+++ b/app/display/gimpdisplayshell-tool-events.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_TOOL_EVENTS_H__
+#define __GIMP_DISPLAY_SHELL_TOOL_EVENTS_H__
+
+
+gboolean   gimp_display_shell_events                  (GtkWidget        *widget,
+                                                       GdkEvent         *event,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_canvas_tool_events      (GtkWidget        *widget,
+                                                       GdkEvent         *event,
+                                                       GimpDisplayShell *shell);
+void       gimp_display_shell_canvas_grab_notify      (GtkWidget        *widget,
+                                                       gboolean          was_grabbed,
+                                                       GimpDisplayShell *shell);
+
+void       gimp_display_shell_buffer_stroke           (GimpMotionBuffer *buffer,
+                                                       const GimpCoords *coords,
+                                                       guint32           time,
+                                                       GdkModifierType   state,
+                                                       GimpDisplayShell *shell);
+void       gimp_display_shell_buffer_hover            (GimpMotionBuffer *buffer,
+                                                       const GimpCoords *coords,
+                                                       GdkModifierType   state,
+                                                       gboolean          proximity,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_hruler_button_press     (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+gboolean   gimp_display_shell_vruler_button_press     (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_TOOL_EVENT_H__ */
diff --git a/app/display/gimpdisplayshell-transform.c b/app/display/gimpdisplayshell-transform.c
new file mode 100644
index 0000000..f9cd2e5
--- /dev/null
+++ b/app/display/gimpdisplayshell-transform.c
@@ -0,0 +1,1025 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpboundary.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimp-utils.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-transform.h"
+
+
+/*  local function prototypes  */
+
+static void gimp_display_shell_transform_xy_f_noround (GimpDisplayShell *shell,
+                                                       gdouble           x,
+                                                       gdouble           y,
+                                                       gdouble          *nx,
+                                                       gdouble          *ny);
+
+/*  public functions  */
+
+/**
+ * gimp_display_shell_zoom_coords:
+ * @shell:          a #GimpDisplayShell
+ * @image_coords:   image coordinates
+ * @display_coords: returns the corresponding display coordinates
+ *
+ * Zooms from image coordinates to display coordinates, so that
+ * objects can be rendered at the correct points on the display.
+ **/
+void
+gimp_display_shell_zoom_coords (GimpDisplayShell *shell,
+                                const GimpCoords *image_coords,
+                                GimpCoords       *display_coords)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (image_coords != NULL);
+  g_return_if_fail (display_coords != NULL);
+
+  *display_coords = *image_coords;
+
+  display_coords->x = SCALEX (shell, image_coords->x);
+  display_coords->y = SCALEY (shell, image_coords->y);
+
+  display_coords->x -= shell->offset_x;
+  display_coords->y -= shell->offset_y;
+}
+
+/**
+ * gimp_display_shell_unzoom_coords:
+ * @shell:          a #GimpDisplayShell
+ * @display_coords: display coordinates
+ * @image_coords:   returns the corresponding image coordinates
+ *
+ * Zooms from display coordinates to image coordinates, so that
+ * points on the display can be mapped to points in the image.
+ **/
+void
+gimp_display_shell_unzoom_coords (GimpDisplayShell *shell,
+                                  const GimpCoords *display_coords,
+                                  GimpCoords       *image_coords)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (display_coords != NULL);
+  g_return_if_fail (image_coords != NULL);
+
+  *image_coords = *display_coords;
+
+  image_coords->x += shell->offset_x;
+  image_coords->y += shell->offset_y;
+
+  image_coords->x /= shell->scale_x;
+  image_coords->y /= shell->scale_y;
+}
+
+/**
+ * gimp_display_shell_zoom_xy:
+ * @shell:
+ * @x:
+ * @y:
+ * @nx:
+ * @ny:
+ *
+ * Zooms an image coordinate to a shell coordinate.
+ **/
+void
+gimp_display_shell_zoom_xy (GimpDisplayShell *shell,
+                            gdouble           x,
+                            gdouble           y,
+                            gint             *nx,
+                            gint             *ny)
+{
+  gint64 tx;
+  gint64 ty;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  tx = x * shell->scale_x;
+  ty = y * shell->scale_y;
+
+  tx -= shell->offset_x;
+  ty -= shell->offset_y;
+
+  /*  The projected coordinates might overflow a gint in the case of
+   *  big images at high zoom levels, so we clamp them here to avoid
+   *  problems.
+   */
+  *nx = CLAMP (tx, G_MININT, G_MAXINT);
+  *ny = CLAMP (ty, G_MININT, G_MAXINT);
+}
+
+/**
+ * gimp_display_shell_unzoom_xy:
+ * @shell:       a #GimpDisplayShell
+ * @x:           x coordinate in display coordinates
+ * @y:           y coordinate in display coordinates
+ * @nx:          returns x oordinate in image coordinates
+ * @ny:          returns y coordinate in image coordinates
+ * @round:       if %TRUE, round the results to the nearest integer;
+ *               if %FALSE, simply cast them to @gint.
+ *
+ * Zoom from display coordinates to image coordinates, so that
+ * points on the display can be mapped to the corresponding points
+ * in the image.
+ **/
+void
+gimp_display_shell_unzoom_xy (GimpDisplayShell *shell,
+                              gint              x,
+                              gint              y,
+                              gint             *nx,
+                              gint             *ny,
+                              gboolean          round)
+{
+  gint64 tx;
+  gint64 ty;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  if (round)
+    {
+      tx = SIGNED_ROUND (((gdouble) x + shell->offset_x) / shell->scale_x);
+      ty = SIGNED_ROUND (((gdouble) y + shell->offset_y) / shell->scale_y);
+    }
+  else
+    {
+      tx = ((gint64) x + shell->offset_x) / shell->scale_x;
+      ty = ((gint64) y + shell->offset_y) / shell->scale_y;
+    }
+
+  *nx = CLAMP (tx, G_MININT, G_MAXINT);
+  *ny = CLAMP (ty, G_MININT, G_MAXINT);
+}
+
+/**
+ * gimp_display_shell_zoom_xy_f:
+ * @shell: a #GimpDisplayShell
+ * @x:     image x coordinate of point
+ * @y:     image y coordinate of point
+ * @nx:    returned shell canvas x coordinate
+ * @ny:    returned shell canvas y coordinate
+ *
+ * Zooms from image coordinates to display shell canvas
+ * coordinates.
+ **/
+void
+gimp_display_shell_zoom_xy_f (GimpDisplayShell *shell,
+                              gdouble           x,
+                              gdouble           y,
+                              gdouble          *nx,
+                              gdouble          *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  *nx = SCALEX (shell, x) - shell->offset_x;
+  *ny = SCALEY (shell, y) - shell->offset_y;
+}
+
+/**
+ * gimp_display_shell_unzoom_xy_f:
+ * @shell:       a #GimpDisplayShell
+ * @x:           x coordinate in display coordinates
+ * @y:           y coordinate in display coordinates
+ * @nx:          place to return x coordinate in image coordinates
+ * @ny:          place to return y coordinate in image coordinates
+ *
+ * This function is identical to gimp_display_shell_unzoom_xy(),
+ * except that the input and output coordinates are doubles rather than
+ * ints, and consequently there is no option related to rounding.
+ **/
+void
+gimp_display_shell_unzoom_xy_f (GimpDisplayShell *shell,
+                                gdouble           x,
+                                gdouble           y,
+                                gdouble          *nx,
+                                gdouble          *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  *nx = (x + shell->offset_x) / shell->scale_x;
+  *ny = (y + shell->offset_y) / shell->scale_y;
+}
+
+/**
+ * gimp_display_shell_zoom_segments:
+ * @shell:       a #GimpDisplayShell
+ * @src_segs:    array of segments in image coordinates
+ * @dest_segs:   returns the corresponding segments in display coordinates
+ * @n_segs:      number of segments
+ *
+ * Zooms from image coordinates to display coordinates, so that
+ * objects can be rendered at the correct points on the display.
+ **/
+void
+gimp_display_shell_zoom_segments (GimpDisplayShell   *shell,
+                                  const GimpBoundSeg *src_segs,
+                                  GimpSegment        *dest_segs,
+                                  gint                n_segs,
+                                  gdouble             offset_x,
+                                  gdouble             offset_y)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  for (i = 0; i < n_segs ; i++)
+    {
+      gdouble x1, x2;
+      gdouble y1, y2;
+
+      x1 = src_segs[i].x1 + offset_x;
+      x2 = src_segs[i].x2 + offset_x;
+      y1 = src_segs[i].y1 + offset_y;
+      y2 = src_segs[i].y2 + offset_y;
+
+      dest_segs[i].x1 = SCALEX (shell, x1) - shell->offset_x;
+      dest_segs[i].x2 = SCALEX (shell, x2) - shell->offset_x;
+      dest_segs[i].y1 = SCALEY (shell, y1) - shell->offset_y;
+      dest_segs[i].y2 = SCALEY (shell, y2) - shell->offset_y;
+    }
+}
+
+/**
+ * gimp_display_shell_rotate_coords:
+ * @shell:          a #GimpDisplayShell
+ * @image_coords:   unrotated display coordinates
+ * @display_coords: returns the corresponding rotated display coordinates
+ *
+ * Rotates from unrotated display coordinates to rotated display
+ * coordinates, so that objects can be rendered at the correct points
+ * on the display.
+ **/
+void
+gimp_display_shell_rotate_coords (GimpDisplayShell *shell,
+                                  const GimpCoords *unrotated_coords,
+                                  GimpCoords       *rotated_coords)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (unrotated_coords != NULL);
+  g_return_if_fail (rotated_coords != NULL);
+
+  *rotated_coords = *unrotated_coords;
+
+  if (shell->rotate_transform)
+    cairo_matrix_transform_point (shell->rotate_transform,
+                                  &rotated_coords->x,
+                                  &rotated_coords->y);
+}
+
+/**
+ * gimp_display_shell_unrotate_coords:
+ * @shell:          a #GimpDisplayShell
+ * @display_coords: rotated display coordinates
+ * @image_coords:   returns the corresponding unrotated display coordinates
+ *
+ * Rotates from rotated display coordinates to unrotated display coordinates.
+ **/
+void
+gimp_display_shell_unrotate_coords (GimpDisplayShell *shell,
+                                    const GimpCoords *rotated_coords,
+                                    GimpCoords       *unrotated_coords)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (rotated_coords != NULL);
+  g_return_if_fail (unrotated_coords != NULL);
+
+  *unrotated_coords = *rotated_coords;
+
+  if (shell->rotate_untransform)
+    cairo_matrix_transform_point (shell->rotate_untransform,
+                                  &unrotated_coords->x,
+                                  &unrotated_coords->y);
+}
+
+/**
+ * gimp_display_shell_rotate_xy:
+ * @shell:
+ * @x:
+ * @y:
+ * @nx:
+ * @ny:
+ *
+ * Rotates an unrotated display coordinate to a rotated shell coordinate.
+ **/
+void
+gimp_display_shell_rotate_xy (GimpDisplayShell *shell,
+                              gdouble           x,
+                              gdouble           y,
+                              gint             *nx,
+                              gint             *ny)
+{
+  gint64 tx;
+  gint64 ty;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  if (shell->rotate_transform)
+    cairo_matrix_transform_point (shell->rotate_transform, &x, &y);
+
+  tx = x;
+  ty = y;
+
+  /*  The projected coordinates might overflow a gint in the case of
+   *  big images at high zoom levels, so we clamp them here to avoid
+   *  problems.
+   */
+  *nx = CLAMP (tx, G_MININT, G_MAXINT);
+  *ny = CLAMP (ty, G_MININT, G_MAXINT);
+}
+
+/**
+ * gimp_display_shell_unrotate_xy:
+ * @shell:       a #GimpDisplayShell
+ * @x:           x coordinate in rotated display coordinates
+ * @y:           y coordinate in rotated display coordinates
+ * @nx:          returns x oordinate in unrotated display coordinates
+ * @ny:          returns y coordinate in unrotated display coordinates
+ *
+ * Rotate from rotated display coordinates to unrotated display
+ * coordinates.
+ **/
+void
+gimp_display_shell_unrotate_xy (GimpDisplayShell *shell,
+                                gint              x,
+                                gint              y,
+                                gint             *nx,
+                                gint             *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  if (shell->rotate_untransform)
+    {
+      gdouble fx = x;
+      gdouble fy = y;
+
+      cairo_matrix_transform_point (shell->rotate_untransform, &fx, &fy);
+
+      *nx = CLAMP (fx, G_MININT, G_MAXINT);
+      *ny = CLAMP (fy, G_MININT, G_MAXINT);
+    }
+  else
+    {
+      *nx = x;
+      *ny = y;
+    }
+}
+
+/**
+ * gimp_display_shell_rotate_xy_f:
+ * @shell: a #GimpDisplayShell
+ * @x:     image x coordinate of point
+ * @y:     image y coordinate of point
+ * @nx:    returned shell canvas x coordinate
+ * @ny:    returned shell canvas y coordinate
+ *
+ * Rotates from untransformed display coordinates to rotated display
+ * coordinates.
+ **/
+void
+gimp_display_shell_rotate_xy_f (GimpDisplayShell *shell,
+                                gdouble           x,
+                                gdouble           y,
+                                gdouble          *nx,
+                                gdouble          *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  *nx = x;
+  *ny = y;
+
+  if (shell->rotate_transform)
+    cairo_matrix_transform_point (shell->rotate_transform, nx, ny);
+}
+
+/**
+ * gimp_display_shell_unrotate_xy_f:
+ * @shell:       a #GimpDisplayShell
+ * @x:           x coordinate in rotated display coordinates
+ * @y:           y coordinate in rotated display coordinates
+ * @nx:          place to return x coordinate in unrotated display coordinates
+ * @ny:          place to return y coordinate in unrotated display  coordinates
+ *
+ * This function is identical to gimp_display_shell_unrotate_xy(),
+ * except that the input and output coordinates are doubles rather
+ * than ints.
+ **/
+void
+gimp_display_shell_unrotate_xy_f (GimpDisplayShell *shell,
+                                  gdouble           x,
+                                  gdouble           y,
+                                  gdouble          *nx,
+                                  gdouble          *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  *nx = x;
+  *ny = y;
+
+  if (shell->rotate_untransform)
+    cairo_matrix_transform_point (shell->rotate_untransform, nx, ny);
+}
+
+void
+gimp_display_shell_rotate_bounds (GimpDisplayShell *shell,
+                                  gdouble           x1,
+                                  gdouble           y1,
+                                  gdouble           x2,
+                                  gdouble           y2,
+                                  gdouble          *nx1,
+                                  gdouble          *ny1,
+                                  gdouble          *nx2,
+                                  gdouble          *ny2)
+{
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->rotate_transform)
+    {
+      gdouble tx1 = x1;
+      gdouble ty1 = y1;
+      gdouble tx2 = x1;
+      gdouble ty2 = y2;
+      gdouble tx3 = x2;
+      gdouble ty3 = y1;
+      gdouble tx4 = x2;
+      gdouble ty4 = y2;
+
+      cairo_matrix_transform_point (shell->rotate_transform, &tx1, &ty1);
+      cairo_matrix_transform_point (shell->rotate_transform, &tx2, &ty2);
+      cairo_matrix_transform_point (shell->rotate_transform, &tx3, &ty3);
+      cairo_matrix_transform_point (shell->rotate_transform, &tx4, &ty4);
+
+      *nx1 = MIN4 (tx1, tx2, tx3, tx4);
+      *ny1 = MIN4 (ty1, ty2, ty3, ty4);
+      *nx2 = MAX4 (tx1, tx2, tx3, tx4);
+      *ny2 = MAX4 (ty1, ty2, ty3, ty4);
+    }
+  else
+    {
+      *nx1 = x1;
+      *ny1 = y1;
+      *nx2 = x2;
+      *ny2 = y2;
+    }
+}
+
+void
+gimp_display_shell_unrotate_bounds (GimpDisplayShell *shell,
+                                    gdouble           x1,
+                                    gdouble           y1,
+                                    gdouble           x2,
+                                    gdouble           y2,
+                                    gdouble          *nx1,
+                                    gdouble          *ny1,
+                                    gdouble          *nx2,
+                                    gdouble          *ny2)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->rotate_untransform)
+    {
+      gdouble tx1 = x1;
+      gdouble ty1 = y1;
+      gdouble tx2 = x1;
+      gdouble ty2 = y2;
+      gdouble tx3 = x2;
+      gdouble ty3 = y1;
+      gdouble tx4 = x2;
+      gdouble ty4 = y2;
+
+      cairo_matrix_transform_point (shell->rotate_untransform, &tx1, &ty1);
+      cairo_matrix_transform_point (shell->rotate_untransform, &tx2, &ty2);
+      cairo_matrix_transform_point (shell->rotate_untransform, &tx3, &ty3);
+      cairo_matrix_transform_point (shell->rotate_untransform, &tx4, &ty4);
+
+      *nx1 = MIN4 (tx1, tx2, tx3, tx4);
+      *ny1 = MIN4 (ty1, ty2, ty3, ty4);
+      *nx2 = MAX4 (tx1, tx2, tx3, tx4);
+      *ny2 = MAX4 (ty1, ty2, ty3, ty4);
+    }
+  else
+    {
+      *nx1 = x1;
+      *ny1 = y1;
+      *nx2 = x2;
+      *ny2 = y2;
+    }
+}
+
+/**
+ * gimp_display_shell_transform_coords:
+ * @shell:          a #GimpDisplayShell
+ * @image_coords:   image coordinates
+ * @display_coords: returns the corresponding display coordinates
+ *
+ * Transforms from image coordinates to display coordinates, so that
+ * objects can be rendered at the correct points on the display.
+ **/
+void
+gimp_display_shell_transform_coords (GimpDisplayShell *shell,
+                                     const GimpCoords *image_coords,
+                                     GimpCoords       *display_coords)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (image_coords != NULL);
+  g_return_if_fail (display_coords != NULL);
+
+  *display_coords = *image_coords;
+
+  display_coords->x = SCALEX (shell, image_coords->x);
+  display_coords->y = SCALEY (shell, image_coords->y);
+
+  display_coords->x -= shell->offset_x;
+  display_coords->y -= shell->offset_y;
+
+  if (shell->rotate_transform)
+    cairo_matrix_transform_point (shell->rotate_transform,
+                                  &display_coords->x,
+                                  &display_coords->y);
+}
+
+/**
+ * gimp_display_shell_untransform_coords:
+ * @shell:          a #GimpDisplayShell
+ * @display_coords: display coordinates
+ * @image_coords:   returns the corresponding image coordinates
+ *
+ * Transforms from display coordinates to image coordinates, so that
+ * points on the display can be mapped to points in the image.
+ **/
+void
+gimp_display_shell_untransform_coords (GimpDisplayShell *shell,
+                                       const GimpCoords *display_coords,
+                                       GimpCoords       *image_coords)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (display_coords != NULL);
+  g_return_if_fail (image_coords != NULL);
+
+  *image_coords = *display_coords;
+
+  if (shell->rotate_untransform)
+    cairo_matrix_transform_point (shell->rotate_untransform,
+                                  &image_coords->x,
+                                  &image_coords->y);
+
+  image_coords->x += shell->offset_x;
+  image_coords->y += shell->offset_y;
+
+  image_coords->x /= shell->scale_x;
+  image_coords->y /= shell->scale_y;
+
+  image_coords->xscale  = shell->scale_x;
+  image_coords->yscale  = shell->scale_y;
+  image_coords->angle   = shell->rotate_angle / 360.0;
+  image_coords->reflect = shell->flip_horizontally ^ shell->flip_vertically;
+
+  if (shell->flip_vertically)
+    image_coords->angle += 0.5;
+}
+
+/**
+ * gimp_display_shell_transform_xy:
+ * @shell:
+ * @x:
+ * @y:
+ * @nx:
+ * @ny:
+ *
+ * Transforms an image coordinate to a shell coordinate.
+ **/
+void
+gimp_display_shell_transform_xy (GimpDisplayShell *shell,
+                                 gdouble           x,
+                                 gdouble           y,
+                                 gint             *nx,
+                                 gint             *ny)
+{
+  gint64 tx;
+  gint64 ty;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  tx = x * shell->scale_x;
+  ty = y * shell->scale_y;
+
+  tx -= shell->offset_x;
+  ty -= shell->offset_y;
+
+  if (shell->rotate_transform)
+    {
+      gdouble fx = tx;
+      gdouble fy = ty;
+
+      cairo_matrix_transform_point (shell->rotate_transform, &fx, &fy);
+
+      tx = fx;
+      ty = fy;
+    }
+
+  /*  The projected coordinates might overflow a gint in the case of
+   *  big images at high zoom levels, so we clamp them here to avoid
+   *  problems.
+   */
+  *nx = CLAMP (tx, G_MININT, G_MAXINT);
+  *ny = CLAMP (ty, G_MININT, G_MAXINT);
+}
+
+/**
+ * gimp_display_shell_untransform_xy:
+ * @shell:       a #GimpDisplayShell
+ * @x:           x coordinate in display coordinates
+ * @y:           y coordinate in display coordinates
+ * @nx:          returns x oordinate in image coordinates
+ * @ny:          returns y coordinate in image coordinates
+ * @round:       if %TRUE, round the results to the nearest integer;
+ *               if %FALSE, simply cast them to @gint.
+ *
+ * Transform from display coordinates to image coordinates, so that
+ * points on the display can be mapped to the corresponding points
+ * in the image.
+ **/
+void
+gimp_display_shell_untransform_xy (GimpDisplayShell *shell,
+                                   gint              x,
+                                   gint              y,
+                                   gint             *nx,
+                                   gint             *ny,
+                                   gboolean          round)
+{
+  gint64 tx;
+  gint64 ty;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  if (shell->rotate_untransform)
+    {
+      gdouble fx = x;
+      gdouble fy = y;
+
+      cairo_matrix_transform_point (shell->rotate_untransform, &fx, &fy);
+
+      x = fx;
+      y = fy;
+    }
+
+  if (round)
+    {
+      tx = SIGNED_ROUND (((gdouble) x + shell->offset_x) / shell->scale_x);
+      ty = SIGNED_ROUND (((gdouble) y + shell->offset_y) / shell->scale_y);
+    }
+  else
+    {
+      tx = ((gint64) x + shell->offset_x) / shell->scale_x;
+      ty = ((gint64) y + shell->offset_y) / shell->scale_y;
+    }
+
+  *nx = CLAMP (tx, G_MININT, G_MAXINT);
+  *ny = CLAMP (ty, G_MININT, G_MAXINT);
+}
+
+/**
+ * gimp_display_shell_transform_xy_f:
+ * @shell: a #GimpDisplayShell
+ * @x:     image x coordinate of point
+ * @y:     image y coordinate of point
+ * @nx:    returned shell canvas x coordinate
+ * @ny:    returned shell canvas y coordinate
+ *
+ * Transforms from image coordinates to display shell canvas
+ * coordinates.
+ **/
+void
+gimp_display_shell_transform_xy_f (GimpDisplayShell *shell,
+                                   gdouble           x,
+                                   gdouble           y,
+                                   gdouble          *nx,
+                                   gdouble          *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  *nx = SCALEX (shell, x) - shell->offset_x;
+  *ny = SCALEY (shell, y) - shell->offset_y;
+
+  if (shell->rotate_transform)
+    cairo_matrix_transform_point (shell->rotate_transform, nx, ny);
+}
+
+/**
+ * gimp_display_shell_untransform_xy_f:
+ * @shell:       a #GimpDisplayShell
+ * @x:           x coordinate in display coordinates
+ * @y:           y coordinate in display coordinates
+ * @nx:          place to return x coordinate in image coordinates
+ * @ny:          place to return y coordinate in image coordinates
+ *
+ * This function is identical to gimp_display_shell_untransform_xy(),
+ * except that the input and output coordinates are doubles rather than
+ * ints, and consequently there is no option related to rounding.
+ **/
+void
+gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell,
+                                     gdouble           x,
+                                     gdouble           y,
+                                     gdouble          *nx,
+                                     gdouble          *ny)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx != NULL);
+  g_return_if_fail (ny != NULL);
+
+  if (shell->rotate_untransform)
+    cairo_matrix_transform_point (shell->rotate_untransform, &x, &y);
+
+  *nx = (x + shell->offset_x) / shell->scale_x;
+  *ny = (y + shell->offset_y) / shell->scale_y;
+}
+
+void
+gimp_display_shell_transform_bounds (GimpDisplayShell *shell,
+                                     gdouble           x1,
+                                     gdouble           y1,
+                                     gdouble           x2,
+                                     gdouble           y2,
+                                     gdouble          *nx1,
+                                     gdouble          *ny1,
+                                     gdouble          *nx2,
+                                     gdouble          *ny2)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx1 != NULL);
+  g_return_if_fail (ny1 != NULL);
+  g_return_if_fail (nx2 != NULL);
+  g_return_if_fail (ny2 != NULL);
+
+  if (shell->rotate_transform)
+    {
+      gdouble tx1, ty1;
+      gdouble tx2, ty2;
+      gdouble tx3, ty3;
+      gdouble tx4, ty4;
+
+      gimp_display_shell_transform_xy_f_noround (shell, x1, y1, &tx1, &ty1);
+      gimp_display_shell_transform_xy_f_noround (shell, x1, y2, &tx2, &ty2);
+      gimp_display_shell_transform_xy_f_noround (shell, x2, y1, &tx3, &ty3);
+      gimp_display_shell_transform_xy_f_noround (shell, x2, y2, &tx4, &ty4);
+
+      *nx1 = MIN4 (tx1, tx2, tx3, tx4);
+      *ny1 = MIN4 (ty1, ty2, ty3, ty4);
+      *nx2 = MAX4 (tx1, tx2, tx3, tx4);
+      *ny2 = MAX4 (ty1, ty2, ty3, ty4);
+    }
+  else
+    {
+      gimp_display_shell_transform_xy_f_noround (shell, x1, y1, nx1, ny1);
+      gimp_display_shell_transform_xy_f_noround (shell, x2, y2, nx2, ny2);
+    }
+}
+
+void
+gimp_display_shell_untransform_bounds (GimpDisplayShell *shell,
+                                       gdouble           x1,
+                                       gdouble           y1,
+                                       gdouble           x2,
+                                       gdouble           y2,
+                                       gdouble          *nx1,
+                                       gdouble          *ny1,
+                                       gdouble          *nx2,
+                                       gdouble          *ny2)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (nx1 != NULL);
+  g_return_if_fail (ny1 != NULL);
+  g_return_if_fail (nx2 != NULL);
+  g_return_if_fail (ny2 != NULL);
+
+  if (shell->rotate_untransform)
+    {
+      gdouble tx1, ty1;
+      gdouble tx2, ty2;
+      gdouble tx3, ty3;
+      gdouble tx4, ty4;
+
+      gimp_display_shell_untransform_xy_f (shell, x1, y1, &tx1, &ty1);
+      gimp_display_shell_untransform_xy_f (shell, x1, y2, &tx2, &ty2);
+      gimp_display_shell_untransform_xy_f (shell, x2, y1, &tx3, &ty3);
+      gimp_display_shell_untransform_xy_f (shell, x2, y2, &tx4, &ty4);
+
+      *nx1 = MIN4 (tx1, tx2, tx3, tx4);
+      *ny1 = MIN4 (ty1, ty2, ty3, ty4);
+      *nx2 = MAX4 (tx1, tx2, tx3, tx4);
+      *ny2 = MAX4 (ty1, ty2, ty3, ty4);
+    }
+  else
+    {
+      gimp_display_shell_untransform_xy_f (shell, x1, y1, nx1, ny1);
+      gimp_display_shell_untransform_xy_f (shell, x2, y2, nx2, ny2);
+    }
+}
+
+/* transforms a bounding box from image-space, uniformly scaled by a factor of
+ * 'scale', to display-space.  this is equivalent to, but more accurate than,
+ * dividing the input by 'scale', and using
+ * gimp_display_shell_transform_bounds(), in particular, in that if 'scale'
+ * equals 'shell->scale_x' or 'shell->scale_y', there is no loss in accuracy
+ * in the corresponding dimension due to scaling (although there might be loss
+ * of accuracy due to rotation or translation.)
+ */
+void
+gimp_display_shell_transform_bounds_with_scale (GimpDisplayShell *shell,
+                                                gdouble           scale,
+                                                gdouble           x1,
+                                                gdouble           y1,
+                                                gdouble           x2,
+                                                gdouble           y2,
+                                                gdouble          *nx1,
+                                                gdouble          *ny1,
+                                                gdouble          *nx2,
+                                                gdouble          *ny2)
+{
+  gdouble factor_x;
+  gdouble factor_y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (scale > 0.0);
+  g_return_if_fail (nx1 != NULL);
+  g_return_if_fail (ny1 != NULL);
+  g_return_if_fail (nx2 != NULL);
+  g_return_if_fail (ny2 != NULL);
+
+  factor_x = shell->scale_x / scale;
+  factor_y = shell->scale_y / scale;
+
+  x1 = x1 * factor_x - shell->offset_x;
+  y1 = y1 * factor_y - shell->offset_y;
+  x2 = x2 * factor_x - shell->offset_x;
+  y2 = y2 * factor_y - shell->offset_y;
+
+  gimp_display_shell_rotate_bounds (shell,
+                                    x1,  y1,  x2,  y2,
+                                    nx1, ny1, nx2, ny2);
+}
+
+/* transforms a bounding box from display-space to image-space, uniformly
+ * scaled by a factor of 'scale'.  this is equivalent to, but more accurate
+ * than, using gimp_display_shell_untransform_bounds(), and multiplying the
+ * output by 'scale', in particular, in that if 'scale' equals 'shell->scale_x'
+ * or 'shell->scale_y', there is no loss in accuracy in the corresponding
+ * dimension due to scaling (although there might be loss of accuracy due to
+ * rotation or translation.)
+ */
+void
+gimp_display_shell_untransform_bounds_with_scale (GimpDisplayShell *shell,
+                                                  gdouble           scale,
+                                                  gdouble           x1,
+                                                  gdouble           y1,
+                                                  gdouble           x2,
+                                                  gdouble           y2,
+                                                  gdouble          *nx1,
+                                                  gdouble          *ny1,
+                                                  gdouble          *nx2,
+                                                  gdouble          *ny2)
+{
+  gdouble factor_x;
+  gdouble factor_y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (scale > 0.0);
+  g_return_if_fail (nx1 != NULL);
+  g_return_if_fail (ny1 != NULL);
+  g_return_if_fail (nx2 != NULL);
+  g_return_if_fail (ny2 != NULL);
+
+  factor_x = scale / shell->scale_x;
+  factor_y = scale / shell->scale_y;
+
+  gimp_display_shell_unrotate_bounds (shell,
+                                      x1,  y1,  x2,  y2,
+                                      nx1, ny1, nx2, ny2);
+
+  *nx1 = (*nx1 + shell->offset_x) * factor_x;
+  *ny1 = (*ny1 + shell->offset_y) * factor_y;
+  *nx2 = (*nx2 + shell->offset_x) * factor_x;
+  *ny2 = (*ny2 + shell->offset_y) * factor_y;
+}
+
+/**
+ * gimp_display_shell_untransform_viewport:
+ * @shell:  a #GimpDisplayShell
+ * @clip:   whether to clip the result to the image bounds
+ * @x:      returns image x coordinate of display upper left corner
+ * @y:      returns image y coordinate of display upper left corner
+ * @width:  returns width of display measured in image coordinates
+ * @height: returns height of display measured in image coordinates
+ *
+ * This function calculates the part of the image, in image coordinates,
+ * that corresponds to the display viewport.
+ **/
+void
+gimp_display_shell_untransform_viewport (GimpDisplayShell *shell,
+                                         gboolean          clip,
+                                         gint             *x,
+                                         gint             *y,
+                                         gint             *width,
+                                         gint             *height)
+{
+  gdouble x1, y1, x2, y2;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_untransform_bounds (shell,
+                                         0, 0,
+                                         shell->disp_width, shell->disp_height,
+                                         &x1, &y1,
+                                         &x2, &y2);
+
+  x1 = floor (x1);
+  y1 = floor (y1);
+  x2 = ceil (x2);
+  y2 = ceil (y2);
+
+  if (clip)
+    {
+      GimpImage *image = gimp_display_get_image (shell->display);
+
+      x1 = MAX (x1, 0);
+      y1 = MAX (y1, 0);
+      x2 = MIN (x2, gimp_image_get_width  (image));
+      y2 = MIN (y2, gimp_image_get_height (image));
+    }
+
+  if (x)      *x      = x1;
+  if (y)      *y      = y1;
+  if (width)  *width  = x2 - x1;
+  if (height) *height = y2 - y1;
+}
+
+
+/*  private functions  */
+
+/* Same as gimp_display_shell_transform_xy_f(), but doesn't do any rounding
+ * for the transformed coordinates.
+ */
+static void
+gimp_display_shell_transform_xy_f_noround (GimpDisplayShell *shell,
+                                           gdouble           x,
+                                           gdouble           y,
+                                           gdouble          *nx,
+                                           gdouble          *ny)
+{
+  *nx = shell->scale_x * x - shell->offset_x;
+  *ny = shell->scale_y * y - shell->offset_y;
+
+  if (shell->rotate_transform)
+    cairo_matrix_transform_point (shell->rotate_transform, nx, ny);
+}
diff --git a/app/display/gimpdisplayshell-transform.h b/app/display/gimpdisplayshell-transform.h
new file mode 100644
index 0000000..1877b13
--- /dev/null
+++ b/app/display/gimpdisplayshell-transform.h
@@ -0,0 +1,200 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_TRANSFORM_H__
+#define __GIMP_DISPLAY_SHELL_TRANSFORM_H__
+
+
+/*  zoom: functions to transform from image space to unrotated display
+ *  space and back, taking into account scroll offset and scale
+ */
+
+void  gimp_display_shell_zoom_coords                   (GimpDisplayShell   *shell,
+                                                        const GimpCoords   *image_coords,
+                                                        GimpCoords         *display_coords);
+void  gimp_display_shell_unzoom_coords                 (GimpDisplayShell   *shell,
+                                                        const GimpCoords   *display_coords,
+                                                        GimpCoords         *image_coords);
+
+void  gimp_display_shell_zoom_xy                       (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gint               *nx,
+                                                        gint               *ny);
+void  gimp_display_shell_unzoom_xy                     (GimpDisplayShell   *shell,
+                                                        gint                x,
+                                                        gint                y,
+                                                        gint               *nx,
+                                                        gint               *ny,
+                                                        gboolean            round);
+
+void  gimp_display_shell_zoom_xy_f                     (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gdouble            *nx,
+                                                        gdouble            *ny);
+void  gimp_display_shell_unzoom_xy_f                   (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gdouble            *nx,
+                                                        gdouble            *ny);
+
+void  gimp_display_shell_zoom_segments                 (GimpDisplayShell   *shell,
+                                                        const GimpBoundSeg *src_segs,
+                                                        GimpSegment        *dest_segs,
+                                                        gint                n_segs,
+                                                        gdouble             offset_x,
+                                                        gdouble             offset_y);
+
+
+/*  rotate: functions to transform from unrotated and unflipped but
+ *  zoomed display space to rotated and filpped display space and back
+ */
+
+void  gimp_display_shell_rotate_coords                 (GimpDisplayShell   *shell,
+                                                        const GimpCoords   *image_coords,
+                                                        GimpCoords         *display_coords);
+void  gimp_display_shell_unrotate_coords               (GimpDisplayShell   *shell,
+                                                        const GimpCoords   *display_coords,
+                                                        GimpCoords         *image_coords);
+
+void  gimp_display_shell_rotate_xy                     (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gint               *nx,
+                                                        gint               *ny);
+void  gimp_display_shell_unrotate_xy                   (GimpDisplayShell   *shell,
+                                                        gint                x,
+                                                        gint                y,
+                                                        gint               *nx,
+                                                        gint               *ny);
+
+void  gimp_display_shell_rotate_xy_f                   (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gdouble            *nx,
+                                                        gdouble            *ny);
+void  gimp_display_shell_unrotate_xy_f                 (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gdouble            *nx,
+                                                        gdouble            *ny);
+
+void  gimp_display_shell_rotate_bounds                 (GimpDisplayShell   *shell,
+                                                        gdouble             x1,
+                                                        gdouble             y1,
+                                                        gdouble             x2,
+                                                        gdouble             y2,
+                                                        gdouble            *nx1,
+                                                        gdouble            *ny1,
+                                                        gdouble            *nx2,
+                                                        gdouble            *ny2);
+void  gimp_display_shell_unrotate_bounds               (GimpDisplayShell   *shell,
+                                                        gdouble             x1,
+                                                        gdouble             y1,
+                                                        gdouble             x2,
+                                                        gdouble             y2,
+                                                        gdouble            *nx1,
+                                                        gdouble            *ny1,
+                                                        gdouble            *nx2,
+                                                        gdouble            *ny2);
+
+
+/*  transform: functions to transform from image space to rotated
+ *  display space and back, taking into account scroll offset, scale,
+ *  rotation and flipping
+ */
+
+void  gimp_display_shell_transform_coords              (GimpDisplayShell   *shell,
+                                                        const GimpCoords   *image_coords,
+                                                        GimpCoords         *display_coords);
+void  gimp_display_shell_untransform_coords            (GimpDisplayShell   *shell,
+                                                        const GimpCoords   *display_coords,
+                                                        GimpCoords         *image_coords);
+
+void  gimp_display_shell_transform_xy                  (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gint               *nx,
+                                                        gint               *ny);
+void  gimp_display_shell_untransform_xy                (GimpDisplayShell   *shell,
+                                                        gint                x,
+                                                        gint                y,
+                                                        gint               *nx,
+                                                        gint               *ny,
+                                                        gboolean            round);
+
+void  gimp_display_shell_transform_xy_f                (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gdouble            *nx,
+                                                        gdouble            *ny);
+void  gimp_display_shell_untransform_xy_f              (GimpDisplayShell   *shell,
+                                                        gdouble             x,
+                                                        gdouble             y,
+                                                        gdouble            *nx,
+                                                        gdouble            *ny);
+
+void  gimp_display_shell_transform_bounds              (GimpDisplayShell   *shell,
+                                                        gdouble             x1,
+                                                        gdouble             y1,
+                                                        gdouble             x2,
+                                                        gdouble             y2,
+                                                        gdouble            *nx1,
+                                                        gdouble            *ny1,
+                                                        gdouble            *nx2,
+                                                        gdouble            *ny2);
+void  gimp_display_shell_untransform_bounds            (GimpDisplayShell   *shell,
+                                                        gdouble             x1,
+                                                        gdouble             y1,
+                                                        gdouble             x2,
+                                                        gdouble             y2,
+                                                        gdouble            *nx1,
+                                                        gdouble            *ny1,
+                                                        gdouble            *nx2,
+                                                        gdouble            *ny2);
+
+void  gimp_display_shell_transform_bounds_with_scale   (GimpDisplayShell   *shell,
+                                                        gdouble             scale,
+                                                        gdouble             x1,
+                                                        gdouble             y1,
+                                                        gdouble             x2,
+                                                        gdouble             y2,
+                                                        gdouble            *nx1,
+                                                        gdouble            *ny1,
+                                                        gdouble            *nx2,
+                                                        gdouble            *ny2);
+void  gimp_display_shell_untransform_bounds_with_scale (GimpDisplayShell   *shell,
+                                                        gdouble             scale,
+                                                        gdouble             x1,
+                                                        gdouble             y1,
+                                                        gdouble             x2,
+                                                        gdouble             y2,
+                                                        gdouble            *nx1,
+                                                        gdouble            *ny1,
+                                                        gdouble            *nx2,
+                                                        gdouble            *ny2);
+
+void  gimp_display_shell_untransform_viewport          (GimpDisplayShell   *shell,
+                                                        gboolean            clip,
+                                                        gint               *x,
+                                                        gint               *y,
+                                                        gint               *width,
+                                                        gint               *height);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_TRANSFORM_H__ */
diff --git a/app/display/gimpdisplayshell-utils.c b/app/display/gimpdisplayshell-utils.c
new file mode 100644
index 0000000..8e85e71
--- /dev/null
+++ b/app/display/gimpdisplayshell-utils.c
@@ -0,0 +1,220 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpimage.h"
+#include "core/gimpunit.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-utils.h"
+
+#include "gimp-intl.h"
+
+void
+gimp_display_shell_get_constrained_line_params (GimpDisplayShell *shell,
+                                                gdouble          *offset_angle,
+                                                gdouble          *xres,
+                                                gdouble          *yres)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (offset_angle != NULL);
+  g_return_if_fail (xres != NULL);
+  g_return_if_fail (yres != NULL);
+
+  if (shell->flip_horizontally ^ shell->flip_vertically)
+    *offset_angle = +shell->rotate_angle;
+  else
+    *offset_angle = -shell->rotate_angle;
+
+  *xres = 1.0;
+  *yres = 1.0;
+
+  if (! shell->dot_for_dot)
+    {
+      GimpImage *image = gimp_display_get_image (shell->display);
+
+      if (image)
+        gimp_image_get_resolution (image, xres, yres);
+    }
+}
+
+void
+gimp_display_shell_constrain_line (GimpDisplayShell *shell,
+                                   gdouble           start_x,
+                                   gdouble           start_y,
+                                   gdouble          *end_x,
+                                   gdouble          *end_y,
+                                   gint              n_snap_lines)
+{
+  gdouble offset_angle;
+  gdouble xres, yres;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (end_x != NULL);
+  g_return_if_fail (end_y != NULL);
+
+  gimp_display_shell_get_constrained_line_params (shell,
+                                                  &offset_angle,
+                                                  &xres, &yres);
+
+  gimp_constrain_line (start_x, start_y,
+                       end_x,   end_y,
+                       n_snap_lines,
+                       offset_angle,
+                       xres, yres);
+}
+
+gdouble
+gimp_display_shell_constrain_angle (GimpDisplayShell *shell,
+                                    gdouble           angle,
+                                    gint              n_snap_lines)
+{
+  gdouble x, y;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), 0.0);
+
+  x = cos (angle);
+  y = sin (angle);
+
+  gimp_display_shell_constrain_line (shell,
+                                     0.0, 0.0,
+                                     &x,  &y,
+                                     n_snap_lines);
+
+  return atan2 (y, x);
+}
+
+/**
+ * gimp_display_shell_get_line_status:
+ * @status:    initial status text.
+ * @separator: separator text between the line information and @status.
+ * @shell:     #GimpDisplayShell this status text will be displayed for.
+ * @x1:        abscissa of first point.
+ * @y1:        ordinate of first point.
+ * @x2:        abscissa of second point.
+ * @y2:        ordinate of second point.
+ *
+ * Utility function to prepend the status message with a distance and
+ * angle value. Obviously this is only to be used for tools when it
+ * makes sense, and in particular when there is a concept of line. For
+ * instance when shift-clicking a painting tool or in the blend tool,
+ * etc.
+ * This utility prevents code duplication but also ensures a common
+ * display for every tool where such a status is needed. It will take
+ * into account the shell unit settings and will use the ideal digit
+ * precision according to current image resolution.
+ *
+ * Return value: a newly allocated string containing the enhanced status.
+ **/
+gchar *
+gimp_display_shell_get_line_status (GimpDisplayShell *shell,
+                                    const gchar      *status,
+                                    const gchar      *separator,
+                                    gdouble           x1,
+                                    gdouble           y1,
+                                    gdouble           x2,
+                                    gdouble           y2)
+{
+  GimpImage *image;
+  gchar     *enhanced_status;
+  gdouble    xres;
+  gdouble    yres;
+  gdouble    dx, dy, pixel_dist;
+  gdouble    angle;
+
+  image = gimp_display_get_image (shell->display);
+  if (! image)
+    {
+      /* This makes no sense to add line information when no image is
+       * attached to the display. */
+      return g_strdup (status);
+    }
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    xres = yres = 1.0;
+  else
+    gimp_image_get_resolution (image, &xres, &yres);
+
+  dx = x2 - x1;
+  dy = y2 - y1;
+  pixel_dist = sqrt (SQR (dx) + SQR (dy));
+
+  if (dx)
+    {
+      angle = gimp_rad_to_deg (atan ((dy/yres) / (dx/xres)));
+      if (dx > 0)
+        {
+          if (dy > 0)
+            angle = 360.0 - angle;
+          else if (dy < 0)
+            angle = -angle;
+        }
+      else
+        {
+          angle = 180.0 - angle;
+        }
+    }
+  else if (dy)
+    {
+      angle = dy > 0 ? 270.0 : 90.0;
+    }
+  else
+    {
+      angle = 0.0;
+    }
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    {
+      enhanced_status = g_strdup_printf ("%.1f %s, %.2f\302\260%s%s",
+                                         pixel_dist, _("pixels"), angle,
+                                         separator, status);
+    }
+  else
+    {
+      gdouble inch_dist;
+      gdouble unit_dist;
+      gint    digits = 0;
+
+      /* The distance in unit. */
+      inch_dist = sqrt (SQR (dx / xres) + SQR (dy / yres));
+      unit_dist = gimp_unit_get_factor (shell->unit) * inch_dist;
+
+      /* The ideal digit precision for unit in current resolution. */
+      if (inch_dist)
+        digits = gimp_unit_get_scaled_digits (shell->unit,
+                                              pixel_dist / inch_dist);
+
+      enhanced_status = g_strdup_printf ("%.*f %s, %.2f\302\260%s%s",
+                                         digits, unit_dist,
+                                         gimp_unit_get_symbol (shell->unit),
+                                         angle, separator, status);
+
+    }
+
+  return enhanced_status;
+}
diff --git a/app/display/gimpdisplayshell-utils.h b/app/display/gimpdisplayshell-utils.h
new file mode 100644
index 0000000..3eb52e3
--- /dev/null
+++ b/app/display/gimpdisplayshell-utils.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_UTILS_H__
+#define __GIMP_DISPLAY_SHELL_UTILS_H__
+
+
+void      gimp_display_shell_get_constrained_line_params (GimpDisplayShell *shell,
+                                                          gdouble          *offset_angle,
+                                                          gdouble          *xres,
+                                                          gdouble          *yres);
+void      gimp_display_shell_constrain_line              (GimpDisplayShell *shell,
+                                                          gdouble           start_x,
+                                                          gdouble           start_y,
+                                                          gdouble          *end_x,
+                                                          gdouble          *end_y,
+                                                          gint              n_snap_lines);
+gdouble   gimp_display_shell_constrain_angle             (GimpDisplayShell *shell,
+                                                          gdouble           angle,
+                                                          gint              n_snap_lines);
+
+gchar   * gimp_display_shell_get_line_status             (GimpDisplayShell *shell,
+                                                          const gchar      *status,
+                                                          const gchar      *separator,
+                                                          gdouble           x1,
+                                                          gdouble           y1,
+                                                          gdouble           x2,
+                                                          gdouble           y2);
+
+
+#endif  /*  __GIMP_DISPLAY_SHELL_UTILS_H__  */
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
new file mode 100644
index 0000000..9603e4f
--- /dev/null
+++ b/app/display/gimpdisplayshell.c
@@ -0,0 +1,2141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+#include "tools/tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+#include "config/gimpdisplayconfig.h"
+#include "config/gimpdisplayoptions.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-snap.h"
+#include "core/gimppickable.h"
+#include "core/gimpprojectable.h"
+#include "core/gimpprojection.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptemplate.h"
+
+#include "widgets/gimpdevices.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "tools/tool_manager.h"
+
+#include "gimpcanvas.h"
+#include "gimpcanvascanvasboundary.h"
+#include "gimpcanvaslayerboundary.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-callbacks.h"
+#include "gimpdisplayshell-cursor.h"
+#include "gimpdisplayshell-dnd.h"
+#include "gimpdisplayshell-expose.h"
+#include "gimpdisplayshell-filter.h"
+#include "gimpdisplayshell-handlers.h"
+#include "gimpdisplayshell-items.h"
+#include "gimpdisplayshell-profile.h"
+#include "gimpdisplayshell-progress.h"
+#include "gimpdisplayshell-render.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-rulers.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-scrollbars.h"
+#include "gimpdisplayshell-selection.h"
+#include "gimpdisplayshell-title.h"
+#include "gimpdisplayshell-tool-events.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpimagewindow.h"
+#include "gimpmotionbuffer.h"
+#include "gimpstatusbar.h"
+
+#include "about.h"
+#include "gimp-log.h"
+#include "gimp-priorities.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_POPUP_MANAGER,
+  PROP_INITIAL_SCREEN,
+  PROP_INITIAL_MONITOR,
+  PROP_DISPLAY,
+  PROP_UNIT,
+  PROP_TITLE,
+  PROP_STATUS,
+  PROP_ICON,
+  PROP_SHOW_ALL,
+  PROP_INFINITE_CANVAS
+};
+
+enum
+{
+  SCALED,
+  SCROLLED,
+  ROTATED,
+  RECONNECT,
+  LAST_SIGNAL
+};
+
+
+typedef struct _GimpDisplayShellOverlay GimpDisplayShellOverlay;
+
+struct _GimpDisplayShellOverlay
+{
+  gdouble          image_x;
+  gdouble          image_y;
+  GimpHandleAnchor anchor;
+  gint             spacing_x;
+  gint             spacing_y;
+};
+
+
+/*  local function prototypes  */
+
+static void      gimp_color_managed_iface_init     (GimpColorManagedInterface *iface);
+
+static void      gimp_display_shell_constructed    (GObject          *object);
+static void      gimp_display_shell_dispose        (GObject          *object);
+static void      gimp_display_shell_finalize       (GObject          *object);
+static void      gimp_display_shell_set_property   (GObject          *object,
+                                                    guint             property_id,
+                                                    const GValue     *value,
+                                                    GParamSpec       *pspec);
+static void      gimp_display_shell_get_property   (GObject          *object,
+                                                    guint             property_id,
+                                                    GValue           *value,
+                                                    GParamSpec       *pspec);
+
+static void      gimp_display_shell_unrealize      (GtkWidget        *widget);
+static void      gimp_display_shell_unmap          (GtkWidget        *widget);
+static void      gimp_display_shell_screen_changed (GtkWidget        *widget,
+                                                    GdkScreen        *previous);
+static gboolean  gimp_display_shell_popup_menu     (GtkWidget        *widget);
+
+static void      gimp_display_shell_real_scaled    (GimpDisplayShell *shell);
+static void      gimp_display_shell_real_scrolled  (GimpDisplayShell *shell);
+static void      gimp_display_shell_real_rotated   (GimpDisplayShell *shell);
+
+static const guint8 *
+                 gimp_display_shell_get_icc_profile(GimpColorManaged *managed,
+                                                    gsize            *len);
+static GimpColorProfile *
+               gimp_display_shell_get_color_profile(GimpColorManaged *managed);
+static void      gimp_display_shell_profile_changed(GimpColorManaged *managed);
+
+static void      gimp_display_shell_menu_position  (GtkMenu          *menu,
+                                                    gint             *x,
+                                                    gint             *y,
+                                                    gpointer          data);
+static void      gimp_display_shell_zoom_button_callback
+                                                   (GimpDisplayShell *shell,
+                                                    GtkWidget        *zoom_button);
+static void      gimp_display_shell_sync_config    (GimpDisplayShell  *shell,
+                                                    GimpDisplayConfig *config);
+
+static void      gimp_display_shell_remove_overlay (GtkWidget        *canvas,
+                                                    GtkWidget        *child,
+                                                    GimpDisplayShell *shell);
+static void   gimp_display_shell_transform_overlay (GimpDisplayShell *shell,
+                                                    GtkWidget        *child,
+                                                    gdouble          *x,
+                                                    gdouble          *y);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDisplayShell, gimp_display_shell,
+                         GTK_TYPE_EVENT_BOX,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_display_shell_progress_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
+                                                gimp_color_managed_iface_init))
+
+
+#define parent_class gimp_display_shell_parent_class
+
+static guint display_shell_signals[LAST_SIGNAL] = { 0 };
+
+
+static const gchar display_rc_style[] =
+  "style \"check-button-style\"\n"
+  "{\n"
+  "  GtkToggleButton::child-displacement-x = 0\n"
+  "  GtkToggleButton::child-displacement-y = 0\n"
+  "}\n"
+  "widget \"*\" style \"check-button-style\"";
+
+static void
+gimp_display_shell_class_init (GimpDisplayShellClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  display_shell_signals[SCALED] =
+    g_signal_new ("scaled",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDisplayShellClass, scaled),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  display_shell_signals[SCROLLED] =
+    g_signal_new ("scrolled",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDisplayShellClass, scrolled),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  display_shell_signals[ROTATED] =
+    g_signal_new ("rotated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDisplayShellClass, rotated),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  display_shell_signals[RECONNECT] =
+    g_signal_new ("reconnect",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDisplayShellClass, reconnect),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->constructed        = gimp_display_shell_constructed;
+  object_class->dispose            = gimp_display_shell_dispose;
+  object_class->finalize           = gimp_display_shell_finalize;
+  object_class->set_property       = gimp_display_shell_set_property;
+  object_class->get_property       = gimp_display_shell_get_property;
+
+  widget_class->unrealize          = gimp_display_shell_unrealize;
+  widget_class->unmap              = gimp_display_shell_unmap;
+  widget_class->screen_changed     = gimp_display_shell_screen_changed;
+  widget_class->popup_menu         = gimp_display_shell_popup_menu;
+
+  klass->scaled                    = gimp_display_shell_real_scaled;
+  klass->scrolled                  = gimp_display_shell_real_scrolled;
+  klass->rotated                   = gimp_display_shell_real_rotated;
+  klass->reconnect                 = NULL;
+
+  g_object_class_install_property (object_class, PROP_POPUP_MANAGER,
+                                   g_param_spec_object ("popup-manager",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_UI_MANAGER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_INITIAL_SCREEN,
+                                   g_param_spec_object ("initial-screen",
+                                                        NULL, NULL,
+                                                        GDK_TYPE_SCREEN,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_INITIAL_MONITOR,
+                                   g_param_spec_int ("initial-monitor",
+                                                     NULL, NULL,
+                                                     0, 16, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DISPLAY,
+                                   g_param_spec_object ("display", NULL, NULL,
+                                                        GIMP_TYPE_DISPLAY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_UNIT,
+                                   gimp_param_spec_unit ("unit", NULL, NULL,
+                                                         TRUE, FALSE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TITLE,
+                                   g_param_spec_string ("title", NULL, NULL,
+                                                        GIMP_NAME,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_STATUS,
+                                   g_param_spec_string ("status", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ICON,
+                                   g_param_spec_object ("icon", NULL, NULL,
+                                                        GDK_TYPE_PIXBUF,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SHOW_ALL,
+                                   g_param_spec_boolean ("show-all",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_INFINITE_CANVAS,
+                                   g_param_spec_boolean ("infinite-canvas",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READABLE));
+
+  gtk_rc_parse_string (display_rc_style);
+}
+
+static void
+gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
+{
+  iface->get_icc_profile   = gimp_display_shell_get_icc_profile;
+  iface->get_color_profile = gimp_display_shell_get_color_profile;
+  iface->profile_changed   = gimp_display_shell_profile_changed;
+}
+
+static void
+gimp_display_shell_init (GimpDisplayShell *shell)
+{
+  shell->options            = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
+  shell->fullscreen_options = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN, NULL);
+  shell->no_image_options   = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_NO_IMAGE, NULL);
+
+  shell->zoom        = gimp_zoom_model_new ();
+  shell->dot_for_dot = TRUE;
+  shell->scale_x     = 1.0;
+  shell->scale_y     = 1.0;
+
+  shell->show_image  = TRUE;
+
+  shell->show_all    = FALSE;
+
+  gimp_display_shell_items_init (shell);
+
+  shell->icon_size       = 128;
+  shell->icon_size_small = 96;
+
+  shell->cursor_handedness = GIMP_HANDEDNESS_RIGHT;
+  shell->current_cursor    = (GimpCursorType) -1;
+  shell->tool_cursor       = GIMP_TOOL_CURSOR_NONE;
+  shell->cursor_modifier   = GIMP_CURSOR_MODIFIER_NONE;
+  shell->override_cursor   = (GimpCursorType) -1;
+
+  shell->filter_format     = babl_format ("R'G'B'A float");
+
+  shell->motion_buffer   = gimp_motion_buffer_new ();
+
+  g_signal_connect (shell->motion_buffer, "stroke",
+                    G_CALLBACK (gimp_display_shell_buffer_stroke),
+                    shell);
+  g_signal_connect (shell->motion_buffer, "hover",
+                    G_CALLBACK (gimp_display_shell_buffer_hover),
+                    shell);
+
+  shell->zoom_focus_pointer_queue = g_queue_new ();
+
+  gtk_widget_set_events (GTK_WIDGET (shell), (GDK_POINTER_MOTION_MASK    |
+                                              GDK_BUTTON_PRESS_MASK      |
+                                              GDK_KEY_PRESS_MASK         |
+                                              GDK_KEY_RELEASE_MASK       |
+                                              GDK_FOCUS_CHANGE_MASK      |
+                                              GDK_VISIBILITY_NOTIFY_MASK |
+                                              GDK_SCROLL_MASK));
+
+  /*  zoom model callback  */
+  g_signal_connect_swapped (shell->zoom, "zoomed",
+                            G_CALLBACK (gimp_display_shell_scale_update),
+                            shell);
+
+  /*  active display callback  */
+  g_signal_connect (shell, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_events),
+                    shell);
+  g_signal_connect (shell, "button-release-event",
+                    G_CALLBACK (gimp_display_shell_events),
+                    shell);
+  g_signal_connect (shell, "key-press-event",
+                    G_CALLBACK (gimp_display_shell_events),
+                    shell);
+
+  gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func,
+                     GIMP_HELP_IMAGE_WINDOW, NULL);
+}
+
+static void
+gimp_display_shell_constructed (GObject *object)
+{
+  GimpDisplayShell  *shell = GIMP_DISPLAY_SHELL (object);
+  GimpDisplayConfig *config;
+  GimpImage         *image;
+  GtkWidget         *main_vbox;
+  GtkWidget         *upper_hbox;
+  GtkWidget         *right_vbox;
+  GtkWidget         *lower_hbox;
+  GtkWidget         *inner_table;
+  GtkWidget         *gtk_image;
+  GimpAction        *action;
+  gint               image_width;
+  gint               image_height;
+  gint               shell_width;
+  gint               shell_height;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_UI_MANAGER (shell->popup_manager));
+  gimp_assert (GIMP_IS_DISPLAY (shell->display));
+
+  config = shell->display->config;
+  image  = gimp_display_get_image (shell->display);
+
+  gimp_display_shell_profile_init (shell);
+
+  if (image)
+    {
+      image_width  = gimp_image_get_width  (image);
+      image_height = gimp_image_get_height (image);
+    }
+  else
+    {
+      /* These values are arbitrary. The width is determined by the
+       * menubar and the height is chosen to give a window aspect
+       * ratio of roughly 3:1 (as requested by the UI team).
+       */
+      image_width  = GIMP_DEFAULT_IMAGE_WIDTH;
+      image_height = GIMP_DEFAULT_IMAGE_HEIGHT / 3;
+    }
+
+  shell->dot_for_dot = config->default_dot_for_dot;
+
+  if (config->monitor_res_from_gdk)
+    {
+      gimp_get_monitor_resolution (shell->initial_screen,
+                                   shell->initial_monitor,
+                                   &shell->monitor_xres, &shell->monitor_yres);
+    }
+  else
+    {
+      shell->monitor_xres = config->monitor_xres;
+      shell->monitor_yres = config->monitor_yres;
+    }
+
+  /* adjust the initial scale -- so that window fits on screen. */
+  if (image)
+    {
+      gimp_display_shell_set_initial_scale (shell, 1.0, //scale,
+                                            &shell_width, &shell_height);
+    }
+  else
+    {
+      shell_width  = -1;
+      shell_height = image_height;
+    }
+
+  gimp_display_shell_sync_config (shell, config);
+
+  /*  GtkTable widgets are not able to shrink a row/column correctly if
+   *  widgets are attached with GTK_EXPAND even if those widgets have
+   *  other rows/columns in their rowspan/colspan where they could
+   *  nicely expand without disturbing the row/column which is supposed
+   *  to shrink. --Mitch
+   *
+   *  Changed the packing to use hboxes and vboxes which behave nicer:
+   *
+   *  shell
+   *     |
+   *     +-- main_vbox
+   *            |
+   *            +-- upper_hbox
+   *            |      |
+   *            |      +-- inner_table
+   *            |      |      |
+   *            |      |      +-- origin
+   *            |      |      +-- hruler
+   *            |      |      +-- vruler
+   *            |      |      +-- canvas
+   *            |      |
+   *            |      +-- right_vbox
+   *            |             |
+   *            |             +-- zoom_on_resize_button
+   *            |             +-- vscrollbar
+   *            |
+   *            +-- lower_hbox
+   *            |      |
+   *            |      +-- quick_mask
+   *            |      +-- hscrollbar
+   *            |      +-- navbutton
+   *            |
+   *            +-- statusbar
+   *
+   *  Note that we separate "shell" and "main_vbox", so that we can make
+   *  "shell" a GtkEventBox, giving it its own window.  This isolates our
+   *  events from those of our ancestors, avoiding some potential slowdowns,
+   *  and making things generally smoother.  See bug #778966.
+   */
+
+  /*  first, set up the container hierarchy  *********************************/
+
+  /*  the root vbox  */
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (shell), main_vbox);
+  gtk_widget_show (main_vbox);
+
+  /*  a hbox for the inner_table and the vertical scrollbar  */
+  upper_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), upper_hbox, TRUE, TRUE, 0);
+  gtk_widget_show (upper_hbox);
+
+  /*  the table containing origin, rulers and the canvas  */
+  inner_table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacing (GTK_TABLE (inner_table), 0, 0);
+  gtk_table_set_row_spacing (GTK_TABLE (inner_table), 0, 0);
+  gtk_box_pack_start (GTK_BOX (upper_hbox), inner_table, TRUE, TRUE, 0);
+  gtk_widget_show (inner_table);
+
+  /*  the vbox containing the color button and the vertical scrollbar  */
+  right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+  gtk_box_pack_start (GTK_BOX (upper_hbox), right_vbox, FALSE, FALSE, 0);
+  gtk_widget_show (right_vbox);
+
+  /*  the hbox containing the quickmask button, vertical scrollbar and
+   *  the navigation button
+   */
+  lower_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
+  gtk_box_pack_start (GTK_BOX (main_vbox), lower_hbox, FALSE, FALSE, 0);
+  gtk_widget_show (lower_hbox);
+
+  /*  create the scrollbars  *************************************************/
+
+  /*  the horizontal scrollbar  */
+  shell->hsbdata = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, image_width,
+                                                       1, 1, image_width));
+  shell->hsb = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, shell->hsbdata);
+  gtk_widget_set_can_focus (shell->hsb, FALSE);
+
+  /*  the vertical scrollbar  */
+  shell->vsbdata = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, image_height,
+                                                       1, 1, image_height));
+  shell->vsb = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, shell->vsbdata);
+  gtk_widget_set_can_focus (shell->vsb, FALSE);
+
+  /*  create the contents of the inner_table  ********************************/
+
+  /*  the menu popup button  */
+  shell->origin = gtk_event_box_new ();
+
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_MENU_RIGHT,
+                                            GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (shell->origin), gtk_image);
+  gtk_widget_show (gtk_image);
+
+  g_signal_connect (shell->origin, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_origin_button_press),
+                    shell);
+
+  gimp_help_set_help_data (shell->origin,
+                           _("Access the image menu"),
+                           GIMP_HELP_IMAGE_WINDOW_ORIGIN);
+
+  shell->canvas = gimp_canvas_new (config);
+  gtk_widget_set_size_request (shell->canvas, shell_width, shell_height);
+  gtk_container_set_border_width (GTK_CONTAINER (shell->canvas), 10);
+
+  g_signal_connect (shell->canvas, "remove",
+                    G_CALLBACK (gimp_display_shell_remove_overlay),
+                    shell);
+
+  gimp_display_shell_dnd_init (shell);
+  gimp_display_shell_selection_init (shell);
+
+  /*  the horizontal ruler  */
+  shell->hrule = gimp_ruler_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_widget_set_events (GTK_WIDGET (shell->hrule),
+                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+
+  gimp_ruler_add_track_widget (GIMP_RULER (shell->hrule), shell->canvas);
+  g_signal_connect (shell->hrule, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_hruler_button_press),
+                    shell);
+
+  gimp_help_set_help_data (shell->hrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER);
+
+  /*  the vertical ruler  */
+  shell->vrule = gimp_ruler_new (GTK_ORIENTATION_VERTICAL);
+  gtk_widget_set_events (GTK_WIDGET (shell->vrule),
+                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+
+  gimp_ruler_add_track_widget (GIMP_RULER (shell->vrule), shell->canvas);
+  g_signal_connect (shell->vrule, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_vruler_button_press),
+                    shell);
+
+  gimp_help_set_help_data (shell->vrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER);
+
+  /*  set the rulers as track widgets for each other, so we don't end up
+   *  with one ruler wrongly being stuck a few pixels off while we are
+   *  hovering the other
+   */
+  gimp_ruler_add_track_widget (GIMP_RULER (shell->hrule), shell->vrule);
+  gimp_ruler_add_track_widget (GIMP_RULER (shell->vrule), shell->hrule);
+
+  gimp_devices_add_widget (shell->display->gimp, shell->hrule);
+  gimp_devices_add_widget (shell->display->gimp, shell->vrule);
+
+  g_signal_connect (shell->canvas, "grab-notify",
+                    G_CALLBACK (gimp_display_shell_canvas_grab_notify),
+                    shell);
+
+  g_signal_connect (shell->canvas, "realize",
+                    G_CALLBACK (gimp_display_shell_canvas_realize),
+                    shell);
+  g_signal_connect (shell->canvas, "realize",
+                    G_CALLBACK (gimp_display_shell_canvas_realize_after),
+                    shell);
+  g_signal_connect (shell->canvas, "size-allocate",
+                    G_CALLBACK (gimp_display_shell_canvas_size_allocate),
+                    shell);
+  g_signal_connect (shell->canvas, "expose-event",
+                    G_CALLBACK (gimp_display_shell_canvas_expose),
+                    shell);
+
+  g_signal_connect (shell->canvas, "enter-notify-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "leave-notify-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "proximity-in-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "proximity-out-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "focus-in-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "focus-out-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "button-release-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "scroll-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "motion-notify-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "key-press-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+  g_signal_connect (shell->canvas, "key-release-event",
+                    G_CALLBACK (gimp_display_shell_canvas_tool_events),
+                    shell);
+
+  /*  create the contents of the right_vbox  *********************************/
+
+  shell->zoom_button = g_object_new (GTK_TYPE_CHECK_BUTTON,
+                                     "draw-indicator", FALSE,
+                                     "relief",         GTK_RELIEF_NONE,
+                                     "width-request",  18,
+                                     "height-request", 18,
+                                     NULL);
+  gtk_widget_set_can_focus (shell->zoom_button, FALSE);
+
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_ZOOM_FOLLOW_WINDOW,
+                                            GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (shell->zoom_button), gtk_image);
+  gtk_widget_show (gtk_image);
+
+  gimp_help_set_help_data (shell->zoom_button,
+                           _("Zoom image when window size changes"),
+                           GIMP_HELP_IMAGE_WINDOW_ZOOM_FOLLOW_BUTTON);
+
+  g_signal_connect_swapped (shell->zoom_button, "toggled",
+                            G_CALLBACK (gimp_display_shell_zoom_button_callback),
+                            shell);
+
+  /*  create the contents of the lower_hbox  *********************************/
+
+  /*  the quick mask button  */
+  shell->quick_mask_button = g_object_new (GTK_TYPE_CHECK_BUTTON,
+                                           "draw-indicator", FALSE,
+                                           "relief",         GTK_RELIEF_NONE,
+                                           "width-request",  18,
+                                           "height-request", 18,
+                                           NULL);
+  gtk_widget_set_can_focus (shell->quick_mask_button, FALSE);
+
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_QUICK_MASK_OFF,
+                                            GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (shell->quick_mask_button), gtk_image);
+  gtk_widget_show (gtk_image);
+
+  action = gimp_ui_manager_find_action (shell->popup_manager,
+                                        "quick-mask", "quick-mask-toggle");
+  if (action)
+    gimp_widget_set_accel_help (shell->quick_mask_button, action);
+  else
+    gimp_help_set_help_data (shell->quick_mask_button,
+                             _("Toggle Quick Mask"),
+                             GIMP_HELP_IMAGE_WINDOW_QUICK_MASK_BUTTON);
+
+  g_signal_connect (shell->quick_mask_button, "toggled",
+                    G_CALLBACK (gimp_display_shell_quick_mask_toggled),
+                    shell);
+  g_signal_connect (shell->quick_mask_button, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_quick_mask_button_press),
+                    shell);
+
+  /*  the navigation window button  */
+  shell->nav_ebox = gtk_event_box_new ();
+
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_DIALOG_NAVIGATION,
+                                            GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (shell->nav_ebox), gtk_image);
+  gtk_widget_show (gtk_image);
+
+  g_signal_connect (shell->nav_ebox, "button-press-event",
+                    G_CALLBACK (gimp_display_shell_navigation_button_press),
+                    shell);
+
+  gimp_help_set_help_data (shell->nav_ebox,
+                           _("Navigate the image display"),
+                           GIMP_HELP_IMAGE_WINDOW_NAV_BUTTON);
+
+  /*  the statusbar  ********************************************************/
+
+  shell->statusbar = gimp_statusbar_new ();
+  gimp_statusbar_set_shell (GIMP_STATUSBAR (shell->statusbar), shell);
+  gimp_help_set_help_data (shell->statusbar, NULL,
+                           GIMP_HELP_IMAGE_WINDOW_STATUS_BAR);
+  gtk_box_pack_end (GTK_BOX (main_vbox), shell->statusbar, FALSE, FALSE, 0);
+
+  /*  pack all the widgets  **************************************************/
+
+  /*  fill the inner_table  */
+  gtk_table_attach (GTK_TABLE (inner_table), shell->origin, 0, 1, 0, 1,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (inner_table), shell->hrule, 1, 2, 0, 1,
+                    GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (inner_table), shell->vrule, 0, 1, 1, 2,
+                    GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (inner_table), shell->canvas, 1, 2, 1, 2,
+                    GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+                    GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+
+  /*  fill the right_vbox  */
+  gtk_box_pack_start (GTK_BOX (right_vbox),
+                      shell->zoom_button, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (right_vbox),
+                      shell->vsb, TRUE, TRUE, 0);
+
+  /*  fill the lower_hbox  */
+  gtk_box_pack_start (GTK_BOX (lower_hbox),
+                      shell->quick_mask_button, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (lower_hbox),
+                      shell->hsb, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (lower_hbox),
+                      shell->nav_ebox, FALSE, FALSE, 0);
+
+  /*  show everything that is always shown ***********************************/
+
+  gtk_widget_show (GTK_WIDGET (shell->canvas));
+
+  if (image)
+    {
+      gimp_display_shell_connect (shell);
+
+      /* After connecting to the image we want to center it. Since we
+       * not even finished creating the display shell, we can safely
+       * assume we will get a size-allocate later.
+       */
+      shell->size_allocate_center_image = TRUE;
+    }
+  else
+    {
+#if 0
+      /* Disabled because it sets GDK_POINTER_MOTION_HINT on
+       * shell->canvas. For info see Bug 677375
+       */
+      gimp_help_set_help_data (shell->canvas,
+                               _("Drop image files here to open them"),
+                               NULL);
+#endif
+
+      gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
+    }
+
+  /* make sure the information is up-to-date */
+  gimp_display_shell_scale_update (shell);
+
+  gimp_display_shell_set_show_all (shell, config->default_show_all);
+}
+
+static void
+gimp_display_shell_dispose (GObject *object)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (object);
+
+  if (shell->display && gimp_display_get_shell (shell->display))
+    gimp_display_shell_disconnect (shell);
+
+  shell->popup_manager = NULL;
+
+  if (shell->selection)
+    gimp_display_shell_selection_free (shell);
+
+  gimp_display_shell_filter_set (shell, NULL);
+
+  if (shell->filter_idle_id)
+    {
+      g_source_remove (shell->filter_idle_id);
+      shell->filter_idle_id = 0;
+    }
+
+  g_clear_pointer (&shell->mask_surface, cairo_surface_destroy);
+  g_clear_pointer (&shell->checkerboard, cairo_pattern_destroy);
+
+  gimp_display_shell_profile_finalize (shell);
+
+  g_clear_object (&shell->filter_buffer);
+  shell->filter_data   = NULL;
+  shell->filter_stride = 0;
+
+  g_clear_object (&shell->mask);
+
+  gimp_display_shell_items_free (shell);
+
+  g_clear_object (&shell->motion_buffer);
+
+  g_clear_pointer (&shell->zoom_focus_pointer_queue, g_queue_free);
+
+  if (shell->title_idle_id)
+    {
+      g_source_remove (shell->title_idle_id);
+      shell->title_idle_id = 0;
+    }
+
+  if (shell->fill_idle_id)
+    {
+      g_source_remove (shell->fill_idle_id);
+      shell->fill_idle_id = 0;
+    }
+
+  g_clear_pointer (&shell->nav_popup, gtk_widget_destroy);
+
+  if (shell->blink_timeout_id)
+    {
+      g_source_remove (shell->blink_timeout_id);
+      shell->blink_timeout_id = 0;
+    }
+
+  shell->display = NULL;
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_display_shell_finalize (GObject *object)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (object);
+
+  g_clear_object (&shell->zoom);
+  g_clear_pointer (&shell->rotate_transform,   g_free);
+  g_clear_pointer (&shell->rotate_untransform, g_free);
+  g_clear_object (&shell->options);
+  g_clear_object (&shell->fullscreen_options);
+  g_clear_object (&shell->no_image_options);
+  g_clear_pointer (&shell->title,  g_free);
+  g_clear_pointer (&shell->status, g_free);
+  g_clear_object (&shell->icon);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_display_shell_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (object);
+
+  switch (property_id)
+    {
+    case PROP_POPUP_MANAGER:
+      shell->popup_manager = g_value_get_object (value);
+      break;
+    case PROP_INITIAL_SCREEN:
+      shell->initial_screen = g_value_get_object (value);
+      break;
+    case PROP_INITIAL_MONITOR:
+      shell->initial_monitor = g_value_get_int (value);
+      break;
+    case PROP_DISPLAY:
+      shell->display = g_value_get_object (value);
+      break;
+    case PROP_UNIT:
+      gimp_display_shell_set_unit (shell, g_value_get_int (value));
+      break;
+    case PROP_TITLE:
+      g_free (shell->title);
+      shell->title = g_value_dup_string (value);
+      break;
+    case PROP_STATUS:
+      g_free (shell->status);
+      shell->status = g_value_dup_string (value);
+      break;
+    case PROP_ICON:
+      if (shell->icon)
+        g_object_unref (shell->icon);
+      shell->icon = g_value_dup_object (value);
+      break;
+    case PROP_SHOW_ALL:
+      gimp_display_shell_set_show_all (shell, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_display_shell_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (object);
+
+  switch (property_id)
+    {
+    case PROP_POPUP_MANAGER:
+      g_value_set_object (value, shell->popup_manager);
+      break;
+    case PROP_INITIAL_SCREEN:
+      g_value_set_object (value, shell->initial_screen);
+      break;
+    case PROP_INITIAL_MONITOR:
+      g_value_set_int (value, shell->initial_monitor);
+      break;
+    case PROP_DISPLAY:
+      g_value_set_object (value, shell->display);
+      break;
+    case PROP_UNIT:
+      g_value_set_int (value, shell->unit);
+      break;
+    case PROP_TITLE:
+      g_value_set_string (value, shell->title);
+      break;
+    case PROP_STATUS:
+      g_value_set_string (value, shell->status);
+      break;
+    case PROP_ICON:
+      g_value_set_object (value, shell->icon);
+      break;
+    case PROP_SHOW_ALL:
+      g_value_set_boolean (value, shell->show_all);
+      break;
+    case PROP_INFINITE_CANVAS:
+      g_value_set_boolean (value,
+                           gimp_display_shell_get_infinite_canvas (shell));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_display_shell_unrealize (GtkWidget *widget)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
+
+  if (shell->nav_popup)
+    gtk_widget_unrealize (shell->nav_popup);
+
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+gimp_display_shell_unmap (GtkWidget *widget)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
+
+  gimp_display_shell_selection_undraw (shell);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_display_shell_screen_changed (GtkWidget *widget,
+                                   GdkScreen *previous)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
+
+  if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
+    GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, previous);
+
+  if (shell->display->config->monitor_res_from_gdk)
+    {
+      gimp_get_monitor_resolution (gtk_widget_get_screen (widget),
+                                   gimp_widget_get_monitor (widget),
+                                   &shell->monitor_xres,
+                                   &shell->monitor_yres);
+    }
+  else
+    {
+      shell->monitor_xres = shell->display->config->monitor_xres;
+      shell->monitor_yres = shell->display->config->monitor_yres;
+    }
+}
+
+static gboolean
+gimp_display_shell_popup_menu (GtkWidget *widget)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
+
+  gimp_context_set_display (gimp_get_user_context (shell->display->gimp),
+                            shell->display);
+
+  gimp_ui_manager_ui_popup (shell->popup_manager, "/dummy-menubar/image-popup",
+                            GTK_WIDGET (shell),
+                            gimp_display_shell_menu_position,
+                            shell->origin,
+                            NULL, NULL);
+
+  return TRUE;
+}
+
+static void
+gimp_display_shell_real_scaled (GimpDisplayShell *shell)
+{
+  GimpContext *user_context;
+
+  if (! shell->display)
+    return;
+
+  gimp_display_shell_title_update (shell);
+
+  user_context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (user_context))
+    {
+      gimp_display_shell_update_priority_rect (shell);
+
+      gimp_ui_manager_update (shell->popup_manager, shell->display);
+    }
+}
+
+static void
+gimp_display_shell_real_scrolled (GimpDisplayShell *shell)
+{
+  GimpContext *user_context;
+
+  if (! shell->display)
+    return;
+
+  gimp_display_shell_title_update (shell);
+
+  user_context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (user_context))
+    {
+      gimp_display_shell_update_priority_rect (shell);
+
+    }
+}
+
+static void
+gimp_display_shell_real_rotated (GimpDisplayShell *shell)
+{
+  GimpContext *user_context;
+
+  if (! shell->display)
+    return;
+
+  gimp_display_shell_title_update (shell);
+
+  user_context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (user_context))
+    {
+      gimp_display_shell_update_priority_rect (shell);
+
+      gimp_ui_manager_update (shell->popup_manager, shell->display);
+    }
+}
+
+static const guint8 *
+gimp_display_shell_get_icc_profile (GimpColorManaged *managed,
+                                    gsize            *len)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (managed);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+
+  if (image)
+    return gimp_color_managed_get_icc_profile (GIMP_COLOR_MANAGED (image), len);
+
+  return NULL;
+}
+
+static GimpColorProfile *
+gimp_display_shell_get_color_profile (GimpColorManaged *managed)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (managed);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+
+  if (image)
+    return gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+  return NULL;
+}
+
+static void
+gimp_display_shell_profile_changed (GimpColorManaged *managed)
+{
+  GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (managed);
+
+  gimp_display_shell_profile_update (shell);
+  gimp_display_shell_expose_full (shell);
+}
+
+static void
+gimp_display_shell_menu_position (GtkMenu  *menu,
+                                  gint     *x,
+                                  gint     *y,
+                                  gpointer  data)
+{
+  gimp_button_menu_position (GTK_WIDGET (data), menu, GTK_POS_RIGHT, x, y);
+}
+
+static void
+gimp_display_shell_zoom_button_callback (GimpDisplayShell *shell,
+                                         GtkWidget        *zoom_button)
+{
+  shell->zoom_on_resize =
+    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (zoom_button));
+
+  if (shell->zoom_on_resize &&
+      gimp_display_shell_scale_image_is_within_viewport (shell, NULL, NULL))
+    {
+      /* Implicitly make a View -> Fit Image in Window */
+      gimp_display_shell_scale_fit_in (shell);
+    }
+}
+
+static void
+gimp_display_shell_sync_config (GimpDisplayShell  *shell,
+                                GimpDisplayConfig *config)
+{
+  gimp_config_sync (G_OBJECT (config->default_view),
+                    G_OBJECT (shell->options), 0);
+  gimp_config_sync (G_OBJECT (config->default_fullscreen_view),
+                    G_OBJECT (shell->fullscreen_options), 0);
+}
+
+static void
+gimp_display_shell_remove_overlay (GtkWidget        *canvas,
+                                   GtkWidget        *child,
+                                   GimpDisplayShell *shell)
+{
+  shell->children = g_list_remove (shell->children, child);
+}
+
+static void
+gimp_display_shell_transform_overlay (GimpDisplayShell *shell,
+                                      GtkWidget        *child,
+                                      gdouble          *x,
+                                      gdouble          *y)
+{
+  GimpDisplayShellOverlay *overlay;
+  GtkRequisition           requisition;
+
+  overlay = g_object_get_data (G_OBJECT (child), "image-coords-overlay");
+
+  gimp_display_shell_transform_xy_f (shell,
+                                     overlay->image_x,
+                                     overlay->image_y,
+                                     x, y);
+
+  gtk_widget_size_request (child, &requisition);
+
+  switch (overlay->anchor)
+    {
+    case GIMP_HANDLE_ANCHOR_CENTER:
+      *x -= requisition.width  / 2;
+      *y -= requisition.height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH:
+      *x -= requisition.width / 2;
+      *y += overlay->spacing_y;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_WEST:
+      *x += overlay->spacing_x;
+      *y += overlay->spacing_y;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_EAST:
+      *x -= requisition.width + overlay->spacing_x;
+      *y += overlay->spacing_y;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH:
+      *x -= requisition.width / 2;
+      *y -= requisition.height + overlay->spacing_y;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_WEST:
+      *x += overlay->spacing_x;
+      *y -= requisition.height + overlay->spacing_y;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_EAST:
+      *x -= requisition.width + overlay->spacing_x;
+      *y -= requisition.height + overlay->spacing_y;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_WEST:
+      *x += overlay->spacing_x;
+      *y -= requisition.height / 2;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_EAST:
+      *x -= requisition.width + overlay->spacing_x;
+      *y -= requisition.height / 2;
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_display_shell_new (GimpDisplay   *display,
+                        GimpUnit       unit,
+                        gdouble        scale,
+                        GimpUIManager *popup_manager,
+                        GdkScreen     *screen,
+                        gint           monitor)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (popup_manager), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  return g_object_new (GIMP_TYPE_DISPLAY_SHELL,
+                       "popup-manager",   popup_manager,
+                       "initial-screen",  screen,
+                       "initial-monitor", monitor,
+                       "display",         display,
+                       "unit",            unit,
+                       NULL);
+}
+
+void
+gimp_display_shell_add_overlay (GimpDisplayShell *shell,
+                                GtkWidget        *child,
+                                gdouble           image_x,
+                                gdouble           image_y,
+                                GimpHandleAnchor  anchor,
+                                gint              spacing_x,
+                                gint              spacing_y)
+{
+  GimpDisplayShellOverlay *overlay;
+  gdouble                  x, y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GTK_IS_WIDGET (shell));
+
+  overlay = g_new0 (GimpDisplayShellOverlay, 1);
+
+  overlay->image_x   = image_x;
+  overlay->image_y   = image_y;
+  overlay->anchor    = anchor;
+  overlay->spacing_x = spacing_x;
+  overlay->spacing_y = spacing_y;
+
+  g_object_set_data_full (G_OBJECT (child), "image-coords-overlay", overlay,
+                          (GDestroyNotify) g_free);
+
+  shell->children = g_list_prepend (shell->children, child);
+
+  gimp_display_shell_transform_overlay (shell, child, &x, &y);
+
+  gimp_overlay_box_add_child (GIMP_OVERLAY_BOX (shell->canvas), child, 0.0, 0.0);
+  gimp_overlay_box_set_child_position (GIMP_OVERLAY_BOX (shell->canvas),
+                                       child, x, y);
+}
+
+void
+gimp_display_shell_move_overlay (GimpDisplayShell *shell,
+                                 GtkWidget        *child,
+                                 gdouble           image_x,
+                                 gdouble           image_y,
+                                 GimpHandleAnchor  anchor,
+                                 gint              spacing_x,
+                                 gint              spacing_y)
+{
+  GimpDisplayShellOverlay *overlay;
+  gdouble                  x, y;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GTK_IS_WIDGET (shell));
+
+  overlay = g_object_get_data (G_OBJECT (child), "image-coords-overlay");
+
+  g_return_if_fail (overlay != NULL);
+
+  overlay->image_x   = image_x;
+  overlay->image_y   = image_y;
+  overlay->anchor    = anchor;
+  overlay->spacing_x = spacing_x;
+  overlay->spacing_y = spacing_y;
+
+  gimp_display_shell_transform_overlay (shell, child, &x, &y);
+
+  gimp_overlay_box_set_child_position (GIMP_OVERLAY_BOX (shell->canvas),
+                                       child, x, y);
+}
+
+GimpImageWindow *
+gimp_display_shell_get_window (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return GIMP_IMAGE_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (shell),
+                                                     GIMP_TYPE_IMAGE_WINDOW));
+}
+
+GimpStatusbar *
+gimp_display_shell_get_statusbar (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return GIMP_STATUSBAR (shell->statusbar);
+}
+
+GimpColorConfig *
+gimp_display_shell_get_color_config (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return shell->color_config;
+}
+
+void
+gimp_display_shell_present (GimpDisplayShell *shell)
+{
+  GimpImageWindow *window;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (window)
+    {
+      gimp_image_window_set_active_shell (window, shell);
+
+      gtk_window_present (GTK_WINDOW (window));
+    }
+}
+
+void
+gimp_display_shell_reconnect (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
+  g_return_if_fail (gimp_display_get_image (shell->display) != NULL);
+
+  if (shell->fill_idle_id)
+    {
+      g_source_remove (shell->fill_idle_id);
+      shell->fill_idle_id = 0;
+    }
+
+  g_signal_emit (shell, display_shell_signals[RECONNECT], 0);
+
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (shell));
+
+  gimp_display_shell_scroll_clamp_and_update (shell);
+
+  gimp_display_shell_scaled (shell);
+
+  gimp_display_shell_expose_full (shell);
+}
+
+static gboolean
+gimp_display_shell_blink (GimpDisplayShell *shell)
+{
+  shell->blink_timeout_id = 0;
+
+  if (shell->blink)
+    {
+      shell->blink = FALSE;
+    }
+  else
+    {
+      shell->blink = TRUE;
+
+      shell->blink_timeout_id =
+        g_timeout_add (100, (GSourceFunc) gimp_display_shell_blink, shell);
+    }
+
+  gimp_display_shell_expose_full (shell);
+
+  return FALSE;
+}
+
+void
+gimp_display_shell_empty (GimpDisplayShell *shell)
+{
+  GimpContext     *user_context;
+  GimpImageWindow *window;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
+  g_return_if_fail (gimp_display_get_image (shell->display) == NULL);
+
+  window = gimp_display_shell_get_window (shell);
+
+  if (shell->fill_idle_id)
+    {
+      g_source_remove (shell->fill_idle_id);
+      shell->fill_idle_id = 0;
+    }
+
+  gimp_display_shell_selection_undraw (shell);
+
+  gimp_display_shell_unset_cursor (shell);
+
+  gimp_display_shell_filter_set (shell, NULL);
+
+  gimp_display_shell_sync_config (shell, shell->display->config);
+
+  gimp_display_shell_appearance_update (shell);
+  gimp_image_window_update_tabs (window);
+#if 0
+  gimp_help_set_help_data (shell->canvas,
+                           _("Drop image files here to open them"), NULL);
+#endif
+
+  gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
+
+  shell->flip_horizontally = FALSE;
+  shell->flip_vertically   = FALSE;
+  shell->rotate_angle      = 0.0;
+  gimp_display_shell_rotate_update_transform (shell);
+
+  gimp_display_shell_expose_full (shell);
+
+  user_context = gimp_get_user_context (shell->display->gimp);
+
+  if (shell->display == gimp_context_get_display (user_context))
+    gimp_ui_manager_update (shell->popup_manager, shell->display);
+
+  shell->blink_timeout_id =
+    g_timeout_add (1403230, (GSourceFunc) gimp_display_shell_blink, shell);
+}
+
+static gboolean
+gimp_display_shell_fill_idle (GimpDisplayShell *shell)
+{
+  GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+  shell->fill_idle_id = 0;
+
+  if (GTK_IS_WINDOW (toplevel))
+    {
+      gimp_display_shell_scale_shrink_wrap (shell, TRUE);
+
+      gtk_window_present (GTK_WINDOW (toplevel));
+    }
+
+  return FALSE;
+}
+
+void
+gimp_display_shell_fill (GimpDisplayShell *shell,
+                         GimpImage        *image,
+                         GimpUnit          unit,
+                         gdouble           scale)
+{
+  GimpDisplayConfig *config;
+  GimpImageWindow   *window;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  config = shell->display->config;
+  window = gimp_display_shell_get_window (shell);
+
+  shell->show_image  = TRUE;
+
+  shell->dot_for_dot = config->default_dot_for_dot;
+
+  gimp_display_shell_set_unit (shell, unit);
+  gimp_display_shell_set_initial_scale (shell, scale, NULL, NULL);
+  gimp_display_shell_scale_update (shell);
+
+  gimp_display_shell_sync_config (shell, config);
+
+  gimp_image_window_suspend_keep_pos (window);
+  gimp_display_shell_appearance_update (shell);
+  gimp_image_window_resume_keep_pos (window);
+
+  gimp_image_window_update_tabs (window);
+#if 0
+  gimp_help_set_help_data (shell->canvas, NULL, NULL);
+#endif
+
+  gimp_statusbar_fill (GIMP_STATUSBAR (shell->statusbar));
+
+  /* make sure a size-allocate always occurs, even when the rulers and
+   * scrollbars are hidden.  see issue #4968.
+   */
+  shell->size_allocate_center_image = TRUE;
+  gtk_widget_queue_resize (GTK_WIDGET (shell->canvas));
+
+  if (shell->blink_timeout_id)
+    {
+      g_source_remove (shell->blink_timeout_id);
+      shell->blink_timeout_id = 0;
+    }
+
+  shell->fill_idle_id =
+    g_idle_add_full (GIMP_PRIORITY_DISPLAY_SHELL_FILL_IDLE,
+                     (GSourceFunc) gimp_display_shell_fill_idle, shell,
+                     NULL);
+
+  gimp_display_shell_set_show_all (shell, config->default_show_all);
+}
+
+void
+gimp_display_shell_scaled (GimpDisplayShell *shell)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_rotate_update_transform (shell);
+
+  for (list = shell->children; list; list = g_list_next (list))
+    {
+      GtkWidget *child = list->data;
+      gdouble    x, y;
+
+      gimp_display_shell_transform_overlay (shell, child, &x, &y);
+
+      gimp_overlay_box_set_child_position (GIMP_OVERLAY_BOX (shell->canvas),
+                                           child, x, y);
+    }
+
+  g_signal_emit (shell, display_shell_signals[SCALED], 0);
+}
+
+void
+gimp_display_shell_scrolled (GimpDisplayShell *shell)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_rotate_update_transform (shell);
+
+  for (list = shell->children; list; list = g_list_next (list))
+    {
+      GtkWidget *child = list->data;
+      gdouble    x, y;
+
+      gimp_display_shell_transform_overlay (shell, child, &x, &y);
+
+      gimp_overlay_box_set_child_position (GIMP_OVERLAY_BOX (shell->canvas),
+                                           child, x, y);
+    }
+
+  g_signal_emit (shell, display_shell_signals[SCROLLED], 0);
+}
+
+void
+gimp_display_shell_rotated (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  gimp_display_shell_rotate_update_transform (shell);
+
+  g_signal_emit (shell, display_shell_signals[ROTATED], 0);
+}
+
+void
+gimp_display_shell_set_unit (GimpDisplayShell *shell,
+                             GimpUnit          unit)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->unit != unit)
+    {
+      shell->unit = unit;
+
+      gimp_display_shell_rulers_update (shell);
+
+      gimp_display_shell_scaled (shell);
+
+      g_object_notify (G_OBJECT (shell), "unit");
+    }
+}
+
+GimpUnit
+gimp_display_shell_get_unit (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), GIMP_UNIT_PIXEL);
+
+  return shell->unit;
+}
+
+gboolean
+gimp_display_shell_snap_coords (GimpDisplayShell *shell,
+                                GimpCoords       *coords,
+                                gint              snap_offset_x,
+                                gint              snap_offset_y,
+                                gint              snap_width,
+                                gint              snap_height)
+{
+  GimpImage *image;
+  gboolean   snap_to_guides  = FALSE;
+  gboolean   snap_to_grid    = FALSE;
+  gboolean   snap_to_canvas  = FALSE;
+  gboolean   snap_to_vectors = FALSE;
+  gboolean   snapped         = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (gimp_display_shell_get_snap_to_guides (shell) &&
+      gimp_image_get_guides (image))
+    {
+      snap_to_guides = TRUE;
+    }
+
+  if (gimp_display_shell_get_snap_to_grid (shell) &&
+      gimp_image_get_grid (image))
+    {
+      snap_to_grid = TRUE;
+    }
+
+  snap_to_canvas = gimp_display_shell_get_snap_to_canvas (shell);
+
+  if (gimp_display_shell_get_snap_to_vectors (shell) &&
+      gimp_image_get_active_vectors (image))
+    {
+      snap_to_vectors = TRUE;
+    }
+
+  if (snap_to_guides || snap_to_grid || snap_to_canvas || snap_to_vectors)
+    {
+      gint    snap_distance;
+      gdouble tx, ty;
+
+      snap_distance = shell->display->config->snap_distance;
+
+      if (snap_width > 0 && snap_height > 0)
+        {
+          snapped = gimp_image_snap_rectangle (image,
+                                               coords->x + snap_offset_x,
+                                               coords->y + snap_offset_y,
+                                               coords->x + snap_offset_x +
+                                               snap_width,
+                                               coords->y + snap_offset_y +
+                                               snap_height,
+                                               &tx,
+                                               &ty,
+                                               FUNSCALEX (shell, snap_distance),
+                                               FUNSCALEY (shell, snap_distance),
+                                               snap_to_guides,
+                                               snap_to_grid,
+                                               snap_to_canvas,
+                                               snap_to_vectors);
+        }
+      else
+        {
+          snapped = gimp_image_snap_point (image,
+                                           coords->x + snap_offset_x,
+                                           coords->y + snap_offset_y,
+                                           &tx,
+                                           &ty,
+                                           FUNSCALEX (shell, snap_distance),
+                                           FUNSCALEY (shell, snap_distance),
+                                           snap_to_guides,
+                                           snap_to_grid,
+                                           snap_to_canvas,
+                                           snap_to_vectors,
+                                           shell->show_all);
+        }
+
+      if (snapped)
+        {
+          coords->x = tx - snap_offset_x;
+          coords->y = ty - snap_offset_y;
+        }
+    }
+
+  return snapped;
+}
+
+gboolean
+gimp_display_shell_mask_bounds (GimpDisplayShell *shell,
+                                gint             *x,
+                                gint             *y,
+                                gint             *width,
+                                gint             *height)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+  gint       x1, y1;
+  gint       x2, y2;
+  gdouble    x1_f, y1_f;
+  gdouble    x2_f, y2_f;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+  g_return_val_if_fail (x != NULL, FALSE);
+  g_return_val_if_fail (y != NULL, FALSE);
+  g_return_val_if_fail (width != NULL, FALSE);
+  g_return_val_if_fail (height != NULL, FALSE);
+
+  image = gimp_display_get_image (shell->display);
+
+  /*  If there is a floating selection, handle things differently  */
+  if ((layer = gimp_image_get_floating_selection (image)))
+    {
+      gint fs_x;
+      gint fs_y;
+      gint fs_width;
+      gint fs_height;
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &fs_x, &fs_y);
+      fs_width  = gimp_item_get_width  (GIMP_ITEM (layer));
+      fs_height = gimp_item_get_height (GIMP_ITEM (layer));
+
+      if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                              x, y, width, height))
+        {
+          *x      = fs_x;
+          *y      = fs_y;
+          *width  = fs_width;
+          *height = fs_height;
+        }
+      else
+        {
+          gimp_rectangle_union (*x, *y, *width, *height,
+                                fs_x, fs_y, fs_width, fs_height,
+                                x, y, width, height);
+        }
+    }
+  else if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                               x, y, width, height))
+    {
+      return FALSE;
+    }
+
+  x1 = *x;
+  y1 = *y;
+  x2 = *x + *width;
+  y2 = *y + *height;
+
+  gimp_display_shell_transform_bounds (shell,
+                                       x1, y1, x2, y2,
+                                       &x1_f, &y1_f, &x2_f, &y2_f);
+
+  /*  Make sure the extents are within bounds  */
+  x1 = CLAMP (floor (x1_f), 0, shell->disp_width);
+  y1 = CLAMP (floor (y1_f), 0, shell->disp_height);
+  x2 = CLAMP (ceil (x2_f),  0, shell->disp_width);
+  y2 = CLAMP (ceil (y2_f),  0, shell->disp_height);
+
+  *x      = x1;
+  *y      = y1;
+  *width  = x2 - x1;
+  *height = y2 - y1;
+
+  return (*width > 0) && (*height > 0);
+}
+
+void
+gimp_display_shell_set_show_image (GimpDisplayShell *shell,
+                                   gboolean          show_image)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (show_image != shell->show_image)
+    {
+      shell->show_image = show_image;
+
+      gimp_display_shell_expose_full (shell);
+    }
+}
+
+void
+gimp_display_shell_set_show_all (GimpDisplayShell *shell,
+                                 gboolean          show_all)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (show_all != shell->show_all)
+    {
+      shell->show_all = show_all;
+
+      if (shell->display && gimp_display_get_image (shell->display))
+        {
+          GimpImage   *image = gimp_display_get_image (shell->display);
+          GimpContext *user_context;
+
+          if (show_all)
+            gimp_image_inc_show_all_count (image);
+          else
+            gimp_image_dec_show_all_count (image);
+
+          gimp_image_flush (image);
+
+          gimp_display_update_bounding_box (shell->display);
+
+          gimp_display_shell_update_show_canvas (shell);
+
+          gimp_display_shell_scroll_clamp_and_update (shell);
+          gimp_display_shell_scrollbars_update (shell);
+
+          gimp_display_shell_expose_full (shell);
+
+          user_context = gimp_get_user_context (shell->display->gimp);
+
+          if (shell->display == gimp_context_get_display (user_context))
+            {
+              gimp_display_shell_update_priority_rect (shell);
+
+              gimp_ui_manager_update (shell->popup_manager, shell->display);
+            }
+        }
+
+      g_object_notify (G_OBJECT (shell), "show-all");
+      g_object_notify (G_OBJECT (shell), "infinite-canvas");
+    }
+}
+
+
+GimpPickable *
+gimp_display_shell_get_pickable (GimpDisplayShell *shell)
+{
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      if (! shell->show_all)
+        return GIMP_PICKABLE (image);
+      else
+        return GIMP_PICKABLE (gimp_image_get_projection (image));
+    }
+
+  return NULL;
+}
+
+GimpPickable *
+gimp_display_shell_get_canvas_pickable (GimpDisplayShell *shell)
+{
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      if (! gimp_display_shell_get_infinite_canvas (shell))
+        return GIMP_PICKABLE (image);
+      else
+        return GIMP_PICKABLE (gimp_image_get_projection (image));
+    }
+
+  return NULL;
+}
+
+GeglRectangle
+gimp_display_shell_get_bounding_box (GimpDisplayShell *shell)
+{
+  GeglRectangle  bounding_box = {};
+  GimpImage     *image;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), bounding_box);
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      if (! shell->show_all)
+        {
+          bounding_box.width  = gimp_image_get_width  (image);
+          bounding_box.height = gimp_image_get_height (image);
+        }
+      else
+        {
+          bounding_box = gimp_projectable_get_bounding_box (
+            GIMP_PROJECTABLE (image));
+        }
+    }
+
+  return bounding_box;
+}
+
+gboolean
+gimp_display_shell_get_infinite_canvas (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
+
+  return shell->show_all &&
+         ! gimp_display_shell_get_padding_in_show_all (shell);
+}
+
+void
+gimp_display_shell_update_priority_rect (GimpDisplayShell *shell)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  image = gimp_display_get_image (shell->display);
+
+  if (image)
+    {
+      GimpProjection *projection = gimp_image_get_projection (image);
+      gint            x, y;
+      gint            width, height;
+
+      gimp_display_shell_untransform_viewport (shell, ! shell->show_all,
+                                               &x, &y, &width, &height);
+      gimp_projection_set_priority_rect (projection, x, y, width, height);
+    }
+}
+
+void
+gimp_display_shell_flush (GimpDisplayShell *shell,
+                          gboolean          now)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (now)
+    {
+      gdk_window_process_updates (gtk_widget_get_window (shell->canvas),
+                                  FALSE);
+    }
+  else
+    {
+      GimpImageWindow *window = gimp_display_shell_get_window (shell);
+      GimpContext     *context;
+
+      gimp_display_shell_title_update (shell);
+
+      gimp_canvas_layer_boundary_set_layer (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary),
+                                            gimp_image_get_active_layer (gimp_display_get_image (shell->display)));
+
+      gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary),
+                                             gimp_display_get_image (shell->display));
+
+      if (window && gimp_image_window_get_active_shell (window) == shell)
+        {
+          GimpUIManager *manager = gimp_image_window_get_ui_manager (window);
+
+          gimp_ui_manager_update (manager, shell->display);
+        }
+
+      context = gimp_get_user_context (shell->display->gimp);
+
+      if (shell->display == gimp_context_get_display (context))
+        {
+          gimp_ui_manager_update (shell->popup_manager, shell->display);
+        }
+    }
+}
+
+/**
+ * gimp_display_shell_pause:
+ * @shell: a display shell
+ *
+ * This function increments the pause count or the display shell.
+ * If it was zero coming in, then the function pauses the active tool,
+ * so that operations on the display can take place without corrupting
+ * anything that the tool has drawn.  It "undraws" the current tool
+ * drawing, and must be followed by gimp_display_shell_resume() after
+ * the operation in question is completed.
+ **/
+void
+gimp_display_shell_pause (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  shell->paused_count++;
+
+  if (shell->paused_count == 1)
+    {
+      /*  pause the currently active tool  */
+      tool_manager_control_active (shell->display->gimp,
+                                   GIMP_TOOL_ACTION_PAUSE,
+                                   shell->display);
+    }
+}
+
+/**
+ * gimp_display_shell_resume:
+ * @shell: a display shell
+ *
+ * This function decrements the pause count for the display shell.
+ * If this brings it to zero, then the current tool is resumed.
+ * It is an error to call this function without having previously
+ * called gimp_display_shell_pause().
+ **/
+void
+gimp_display_shell_resume (GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (shell->paused_count > 0);
+
+  shell->paused_count--;
+
+  if (shell->paused_count == 0)
+    {
+      /* start the currently active tool */
+      tool_manager_control_active (shell->display->gimp,
+                                   GIMP_TOOL_ACTION_RESUME,
+                                   shell->display);
+    }
+}
+
+/**
+ * gimp_display_shell_set_highlight:
+ * @shell:     a #GimpDisplayShell
+ * @highlight: a rectangle in image coordinates that should be brought out
+ * @opacity:   how much to hide the unselected area
+ *
+ * This function sets an area of the image that should be
+ * accentuated. The actual implementation is to dim all pixels outside
+ * this rectangle. Passing %NULL for @highlight unsets the rectangle.
+ **/
+void
+gimp_display_shell_set_highlight (GimpDisplayShell   *shell,
+                                  const GdkRectangle *highlight,
+                                  gdouble             opacity)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (highlight)
+    {
+      gimp_canvas_item_begin_change (shell->passe_partout);
+
+      gimp_canvas_rectangle_set (shell->passe_partout,
+                                 highlight->x,
+                                 highlight->y,
+                                 highlight->width,
+                                 highlight->height);
+      g_object_set (shell->passe_partout, "opacity", opacity, NULL);
+
+      gimp_canvas_item_set_visible (shell->passe_partout, TRUE);
+
+      gimp_canvas_item_end_change (shell->passe_partout);
+    }
+  else
+    {
+      gimp_canvas_item_set_visible (shell->passe_partout, FALSE);
+    }
+}
+
+/**
+ * gimp_display_shell_set_mask:
+ * @shell: a #GimpDisplayShell
+ * @mask:  a #GimpDrawable (1 byte per pixel)
+ * @color: the color to use for drawing the mask
+ * @inverted: #TRUE if the mask should be drawn inverted
+ *
+ * Previews a mask originating at offset_x, offset_x. Depending on
+ * @inverted, pixels that are selected or not selected are tinted with
+ * the given color.
+ **/
+void
+gimp_display_shell_set_mask (GimpDisplayShell *shell,
+                             GeglBuffer       *mask,
+                             gint              offset_x,
+                             gint              offset_y,
+                             const GimpRGB    *color,
+                             gboolean          inverted)
+{
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (mask == NULL || GEGL_IS_BUFFER (mask));
+  g_return_if_fail (mask == NULL || color != NULL);
+
+  if (mask)
+    g_object_ref (mask);
+
+  if (shell->mask)
+    g_object_unref (shell->mask);
+
+  shell->mask = mask;
+
+  shell->mask_offset_x = offset_x;
+  shell->mask_offset_y = offset_y;
+
+  if (mask)
+    shell->mask_color = *color;
+
+  shell->mask_inverted = inverted;
+
+  gimp_display_shell_expose_full (shell);
+}
diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h
new file mode 100644
index 0000000..b38123c
--- /dev/null
+++ b/app/display/gimpdisplayshell.h
@@ -0,0 +1,341 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_SHELL_H__
+#define __GIMP_DISPLAY_SHELL_H__
+
+
+/* Apply to a float the same rounding mode used in the renderer */
+#define  PROJ_ROUND(coord)   ((gint) RINT (coord))
+#define  PROJ_ROUND64(coord) ((gint64) RINT (coord))
+
+/* scale values */
+#define  SCALEX(s,x)      PROJ_ROUND ((x) * (s)->scale_x)
+#define  SCALEY(s,y)      PROJ_ROUND ((y) * (s)->scale_y)
+
+/* unscale values */
+#define  UNSCALEX(s,x)    ((gint) ((x) / (s)->scale_x))
+#define  UNSCALEY(s,y)    ((gint) ((y) / (s)->scale_y))
+/* (and float-returning versions) */
+#define  FUNSCALEX(s,x)   ((x) / (s)->scale_x)
+#define  FUNSCALEY(s,y)   ((y) / (s)->scale_y)
+
+
+#define GIMP_TYPE_DISPLAY_SHELL            (gimp_display_shell_get_type ())
+#define GIMP_DISPLAY_SHELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_SHELL, GimpDisplayShell))
+#define GIMP_DISPLAY_SHELL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DISPLAY_SHELL, GimpDisplayShellClass))
+#define GIMP_IS_DISPLAY_SHELL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DISPLAY_SHELL))
+#define GIMP_IS_DISPLAY_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DISPLAY_SHELL))
+#define GIMP_DISPLAY_SHELL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DISPLAY_SHELL, GimpDisplayShellClass))
+
+
+typedef struct _GimpDisplayShellClass  GimpDisplayShellClass;
+
+struct _GimpDisplayShell
+{
+  GtkEventBox        parent_instance;
+
+  GimpDisplay       *display;
+
+  GimpUIManager     *popup_manager;
+  GdkScreen         *initial_screen;
+  gint               initial_monitor;
+
+  GimpDisplayOptions *options;
+  GimpDisplayOptions *fullscreen_options;
+  GimpDisplayOptions *no_image_options;
+
+  GimpUnit           unit;
+
+  gint               offset_x;         /*  offset of display image            */
+  gint               offset_y;
+
+  gdouble            scale_x;          /*  horizontal scale factor            */
+  gdouble            scale_y;          /*  vertical scale factor              */
+
+  gboolean           flip_horizontally;
+  gboolean           flip_vertically;
+  gdouble            rotate_angle;
+  cairo_matrix_t    *rotate_transform;
+  cairo_matrix_t    *rotate_untransform;
+
+  gdouble            monitor_xres;
+  gdouble            monitor_yres;
+  gboolean           dot_for_dot;      /*  ignore monitor resolution          */
+
+  GimpZoomModel     *zoom;
+
+  gdouble            last_scale;       /*  scale used when reverting zoom     */
+  guint              last_scale_time;  /*  time when last_scale was set       */
+  gint               last_offset_x;    /*  offsets used when reverting zoom   */
+  gint               last_offset_y;
+
+  gdouble            other_scale;      /*  scale factor entered in Zoom->Other*/
+
+  gint               disp_width;       /*  width of drawing area              */
+  gint               disp_height;      /*  height of drawing area             */
+
+  gboolean           proximity;        /*  is a device in proximity           */
+
+  gboolean           show_image;       /*  whether to show the image          */
+
+  gboolean           show_all;         /*  show the entire image              */
+
+  Selection         *selection;        /*  Selection (marching ants)          */
+  gint64             selection_update; /*  Last selection index update        */
+
+  GList             *children;
+
+  GtkWidget         *canvas;           /*  GimpCanvas widget                  */
+
+  GtkAdjustment     *hsbdata;          /*  adjustments                        */
+  GtkAdjustment     *vsbdata;
+  GtkWidget         *hsb;              /*  scroll bars                        */
+  GtkWidget         *vsb;
+
+  GtkWidget         *hrule;            /*  rulers                             */
+  GtkWidget         *vrule;
+
+  GtkWidget         *origin;           /*  NW: origin                         */
+  GtkWidget         *quick_mask_button;/*  SW: quick mask button              */
+  GtkWidget         *zoom_button;      /*  NE: zoom toggle button             */
+  GtkWidget         *nav_ebox;         /*  SE: navigation event box           */
+
+  GtkWidget         *statusbar;        /*  statusbar                          */
+
+  GimpCanvasItem    *canvas_item;      /*  items drawn on the canvas          */
+  GimpCanvasItem    *unrotated_item;   /*  unrotated items for e.g. cursor    */
+  GimpCanvasItem    *passe_partout;    /*  item for the highlight             */
+  GimpCanvasItem    *preview_items;    /*  item for previews                  */
+  GimpCanvasItem    *vectors;          /*  item proxy of vectors              */
+  GimpCanvasItem    *grid;             /*  item proxy of the grid             */
+  GimpCanvasItem    *guides;           /*  item proxies of guides             */
+  GimpCanvasItem    *sample_points;    /*  item proxies of sample points      */
+  GimpCanvasItem    *canvas_boundary;  /*  item for the cabvas boundary       */
+  GimpCanvasItem    *layer_boundary;   /*  item for the layer boundary        */
+  GimpCanvasItem    *tool_items;       /*  tools items, below the cursor      */
+  GimpCanvasItem    *cursor;           /*  item for the software cursor       */
+
+  guint              title_idle_id;    /*  title update idle ID               */
+  gchar             *title;            /*  current title                      */
+  gchar             *status;           /*  current default statusbar content  */
+
+  gint               icon_size;        /*  size of the icon pixbuf            */
+  gint               icon_size_small;  /*  size of the icon's wilber pixbuf   */
+  guint              icon_idle_id;     /*  ID of the idle-function            */
+  GdkPixbuf         *icon;             /*  icon                               */
+
+  guint              fill_idle_id;     /*  display_shell_fill() idle ID       */
+
+  GimpHandedness     cursor_handedness;/*  Handedness for cursor display      */
+  GimpCursorType     current_cursor;   /*  Currently installed main cursor    */
+  GimpToolCursorType tool_cursor;      /*  Current Tool cursor                */
+  GimpCursorModifier cursor_modifier;  /*  Cursor modifier (plus, minus, ...) */
+
+  GimpCursorType     override_cursor;  /*  Overriding cursor                  */
+  gboolean           using_override_cursor;
+  gboolean           draw_cursor;      /* should we draw software cursor ?    */
+
+  GtkWidget         *close_dialog;     /*  close dialog                       */
+  GtkWidget         *scale_dialog;     /*  scale (zoom) dialog                */
+  GtkWidget         *rotate_dialog;    /*  rotate dialog                      */
+  GtkWidget         *nav_popup;        /*  navigation popup                   */
+
+  GimpColorConfig   *color_config;     /*  color management settings          */
+  gboolean           color_config_set; /*  settings changed from defaults     */
+
+  GimpColorTransform *profile_transform;
+  GeglBuffer         *profile_buffer;  /*  buffer for profile transform       */
+  guchar             *profile_data;    /*  profile_buffer's pixels            */
+  gint                profile_stride;  /*  profile_buffer's stride            */
+
+  GimpColorDisplayStack *filter_stack; /*  color display conversion stuff     */
+  guint                  filter_idle_id;
+
+  GimpColorTransform *filter_transform;
+  const Babl         *filter_format;   /*  filter_buffer's format             */
+  GeglBuffer         *filter_buffer;   /*  buffer for display filters         */
+  guchar             *filter_data;     /*  filter_buffer's pixels             */
+  gint                filter_stride;   /*  filter_buffer's stride             */
+
+  GimpDisplayXfer   *xfer;             /*  manages image buffer transfers     */
+  cairo_surface_t   *mask_surface;     /*  buffer for rendering the mask      */
+  cairo_pattern_t   *checkerboard;     /*  checkerboard pattern               */
+
+  gint               paused_count;
+
+  GimpTreeHandler   *vectors_freeze_handler;
+  GimpTreeHandler   *vectors_thaw_handler;
+  GimpTreeHandler   *vectors_visible_handler;
+
+  gboolean           zoom_on_resize;
+
+  gboolean           size_allocate_from_configure_event;
+  gboolean           size_allocate_center_image;
+
+  /*  the state of gimp_display_shell_tool_events()  */
+  gboolean           pointer_grabbed;
+  guint32            pointer_grab_time;
+
+  gboolean           keyboard_grabbed;
+  guint32            keyboard_grab_time;
+
+  gboolean           inferior_ignore_mode;
+
+  /* Two states are possible when the shell is grabbed: it can be
+   * grabbed with space (or space+button1 which is the same state),
+   * then if space is released but button1 was still pressed, we wait
+   * for button1 to be released as well.
+   */
+  gboolean           space_release_pending;
+  gboolean           button1_release_pending;
+  const gchar       *space_shaded_tool;
+
+  gboolean           scrolling;
+  gint               scroll_start_x;
+  gint               scroll_start_y;
+  gint               scroll_last_x;
+  gint               scroll_last_y;
+  gboolean           rotating;
+  gdouble            rotate_drag_angle;
+  gboolean           scaling;
+  gpointer           scroll_info;
+  gboolean           layer_picking;
+  GimpLayer         *picked_layer;
+
+  GeglBuffer        *mask;
+  gint               mask_offset_x;
+  gint               mask_offset_y;
+  GimpRGB            mask_color;
+  gboolean           mask_inverted;
+
+  GimpMotionBuffer  *motion_buffer;
+
+  GQueue            *zoom_focus_pointer_queue;
+
+  gboolean           blink;
+  guint              blink_timeout_id;
+};
+
+struct _GimpDisplayShellClass
+{
+  GtkEventBoxClass  parent_class;
+
+  void (* scaled)    (GimpDisplayShell *shell);
+  void (* scrolled)  (GimpDisplayShell *shell);
+  void (* rotated)   (GimpDisplayShell *shell);
+  void (* reconnect) (GimpDisplayShell *shell);
+};
+
+
+GType             gimp_display_shell_get_type      (void) G_GNUC_CONST;
+
+GtkWidget       * gimp_display_shell_new           (GimpDisplay        *display,
+                                                    GimpUnit            unit,
+                                                    gdouble             scale,
+                                                    GimpUIManager      *popup_manager,
+                                                    GdkScreen          *screen,
+                                                    gint                monitor);
+
+void              gimp_display_shell_add_overlay   (GimpDisplayShell   *shell,
+                                                    GtkWidget          *child,
+                                                    gdouble             image_x,
+                                                    gdouble             image_y,
+                                                    GimpHandleAnchor    anchor,
+                                                    gint                spacing_x,
+                                                    gint                spacing_y);
+void              gimp_display_shell_move_overlay  (GimpDisplayShell   *shell,
+                                                    GtkWidget          *child,
+                                                    gdouble             image_x,
+                                                    gdouble             image_y,
+                                                    GimpHandleAnchor    anchor,
+                                                    gint                spacing_x,
+                                                    gint                spacing_y);
+
+GimpImageWindow * gimp_display_shell_get_window    (GimpDisplayShell   *shell);
+GimpStatusbar   * gimp_display_shell_get_statusbar (GimpDisplayShell   *shell);
+
+GimpColorConfig * gimp_display_shell_get_color_config
+                                                   (GimpDisplayShell   *shell);
+
+void              gimp_display_shell_present       (GimpDisplayShell   *shell);
+
+void              gimp_display_shell_reconnect     (GimpDisplayShell   *shell);
+
+void              gimp_display_shell_empty         (GimpDisplayShell   *shell);
+void              gimp_display_shell_fill          (GimpDisplayShell   *shell,
+                                                    GimpImage          *image,
+                                                    GimpUnit            unit,
+                                                    gdouble             scale);
+
+void              gimp_display_shell_scaled        (GimpDisplayShell   *shell);
+void              gimp_display_shell_scrolled      (GimpDisplayShell   *shell);
+void              gimp_display_shell_rotated       (GimpDisplayShell   *shell);
+
+void              gimp_display_shell_set_unit      (GimpDisplayShell   *shell,
+                                                    GimpUnit            unit);
+GimpUnit          gimp_display_shell_get_unit      (GimpDisplayShell   *shell);
+
+gboolean          gimp_display_shell_snap_coords   (GimpDisplayShell   *shell,
+                                                    GimpCoords         *coords,
+                                                    gint                snap_offset_x,
+                                                    gint                snap_offset_y,
+                                                    gint                snap_width,
+                                                    gint                snap_height);
+
+gboolean          gimp_display_shell_mask_bounds   (GimpDisplayShell   *shell,
+                                                    gint               *x,
+                                                    gint               *y,
+                                                    gint               *width,
+                                                    gint               *height);
+
+void              gimp_display_shell_set_show_image
+                                                   (GimpDisplayShell   *shell,
+                                                    gboolean            show_image);
+
+void              gimp_display_shell_set_show_all  (GimpDisplayShell   *shell,
+                                                    gboolean            show_all);
+
+GimpPickable    * gimp_display_shell_get_pickable  (GimpDisplayShell   *shell);
+GimpPickable    * gimp_display_shell_get_canvas_pickable
+                                                   (GimpDisplayShell   *shell);
+GeglRectangle     gimp_display_shell_get_bounding_box
+                                                   (GimpDisplayShell   *shell);
+gboolean          gimp_display_shell_get_infinite_canvas
+                                                   (GimpDisplayShell   *shell);
+
+void              gimp_display_shell_update_priority_rect
+                                                   (GimpDisplayShell *shell);
+
+void              gimp_display_shell_flush         (GimpDisplayShell   *shell,
+                                                    gboolean            now);
+
+void              gimp_display_shell_pause         (GimpDisplayShell   *shell);
+void              gimp_display_shell_resume        (GimpDisplayShell   *shell);
+
+void              gimp_display_shell_set_highlight (GimpDisplayShell   *shell,
+                                                    const GdkRectangle *highlight,
+                                                    double              opacity);
+void              gimp_display_shell_set_mask      (GimpDisplayShell   *shell,
+                                                    GeglBuffer         *mask,
+                                                    gint                offset_x,
+                                                    gint                offset_y,
+                                                    const GimpRGB      *color,
+                                                    gboolean            inverted);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_H__ */
diff --git a/app/display/gimpdisplayxfer.c b/app/display/gimpdisplayxfer.c
new file mode 100644
index 0000000..1dcd13c
--- /dev/null
+++ b/app/display/gimpdisplayxfer.c
@@ -0,0 +1,289 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "gimpdisplayxfer.h"
+
+
+#define NUM_PAGES 2
+
+typedef struct _RTree     RTree;
+typedef struct _RTreeNode RTreeNode;
+
+struct _RTreeNode
+{
+  RTreeNode *children[2];
+  RTreeNode *next;
+  gint       x, y, w, h;
+};
+
+struct _RTree
+{
+  RTreeNode  root;
+  RTreeNode *available;
+};
+
+struct _GimpDisplayXfer
+{
+  /* track subregions of render_surface for efficient uploads */
+  RTree            rtree;
+  cairo_surface_t *render_surface[NUM_PAGES];
+  gint             page;
+};
+
+
+gint GIMP_DISPLAY_RENDER_BUF_WIDTH  = 256;
+gint GIMP_DISPLAY_RENDER_BUF_HEIGHT = 256;
+
+
+static RTreeNode *
+rtree_node_create (RTree      *rtree,
+                   RTreeNode **prev,
+                   gint        x,
+                   gint        y,
+                   gint        w,
+                   gint        h)
+{
+  RTreeNode *node;
+
+  gimp_assert (x >= 0 && x+w <= rtree->root.w);
+  gimp_assert (y >= 0 && y+h <= rtree->root.h);
+
+  if (w <= 0 || h <= 0)
+    return NULL;
+
+  node = g_slice_alloc (sizeof (*node));
+
+  node->children[0] = NULL;
+  node->children[1] = NULL;
+  node->x = x;
+  node->y = y;
+  node->w = w;
+  node->h = h;
+
+  node->next = *prev;
+  *prev = node;
+
+  return node;
+}
+
+static void
+rtree_node_destroy (RTree     *rtree,
+                    RTreeNode *node)
+{
+  gint i;
+
+  for (i = 0; i < 2; i++)
+    {
+      if (node->children[i])
+        rtree_node_destroy (rtree, node->children[i]);
+    }
+
+  g_slice_free (RTreeNode, node);
+}
+
+static RTreeNode *
+rtree_node_insert (RTree      *rtree,
+                   RTreeNode **prev,
+                   RTreeNode  *node,
+                   gint        w,
+                   gint        h)
+{
+  *prev = node->next;
+
+  if (((node->w - w) | (node->h - h)) > 1)
+    {
+      gint ww = node->w - w;
+      gint hh = node->h - h;
+
+      if (ww >= hh)
+        {
+          node->children[0] = rtree_node_create (rtree, prev,
+                                                 node->x + w, node->y,
+                                                 ww, node->h);
+          node->children[1] = rtree_node_create (rtree, prev,
+                                                 node->x, node->y + h,
+                                                 w, hh);
+        }
+      else
+        {
+          node->children[0] = rtree_node_create (rtree, prev,
+                                                 node->x, node->y + h,
+                                                 node->w, hh);
+          node->children[1] = rtree_node_create (rtree, prev,
+                                                 node->x + w, node->y,
+                                                 ww, h);
+        }
+    }
+
+  return node;
+}
+
+static RTreeNode *
+rtree_insert (RTree *rtree,
+              gint   w,
+              gint   h)
+{
+  RTreeNode *node, **prev;
+
+  for (prev = &rtree->available; (node = *prev); prev = &node->next)
+    if (node->w >= w && node->h >= h)
+      return rtree_node_insert (rtree, prev, node, w, h);
+
+  return NULL;
+}
+
+static void
+rtree_init (RTree *rtree,
+            gint   w,
+            gint   h)
+{
+  rtree->root.x = 0;
+  rtree->root.y = 0;
+  rtree->root.w = w;
+  rtree->root.h = h;
+  rtree->root.children[0] = NULL;
+  rtree->root.children[1] = NULL;
+  rtree->root.next = NULL;
+  rtree->available = &rtree->root;
+}
+
+static void
+rtree_reset (RTree *rtree)
+{
+  gint i;
+
+  for (i = 0; i < 2; i++)
+    {
+      if (rtree->root.children[i] == NULL)
+        continue;
+
+      rtree_node_destroy (rtree, rtree->root.children[i]);
+      rtree->root.children[i] = NULL;
+    }
+
+  rtree->root.next = NULL;
+  rtree->available = &rtree->root;
+}
+
+static void
+xfer_destroy (void *data)
+{
+  GimpDisplayXfer *xfer = data;
+  gint             i;
+
+  for (i = 0; i < NUM_PAGES; i++)
+    cairo_surface_destroy (xfer->render_surface[i]);
+
+  rtree_reset (&xfer->rtree);
+  g_free (xfer);
+}
+
+GimpDisplayXfer *
+gimp_display_xfer_realize (GtkWidget *widget)
+{
+  GdkScreen       *screen;
+  GimpDisplayXfer *xfer;
+  const gchar     *env;
+
+  env = g_getenv ("GIMP_DISPLAY_RENDER_BUF_SIZE");
+  if (env)
+    {
+      gint width  = atoi (env);
+      gint height = width;
+
+      env = strchr (env, 'x');
+      if (env)
+        height = atoi (env + 1);
+
+      if (width  > 0 && width  <= 8192 &&
+          height > 0 && height <= 8192)
+        {
+          GIMP_DISPLAY_RENDER_BUF_WIDTH  = width;
+          GIMP_DISPLAY_RENDER_BUF_HEIGHT = height;
+        }
+    }
+
+  screen = gtk_widget_get_screen (widget);
+  xfer = g_object_get_data (G_OBJECT (screen), "gimp-display-xfer");
+
+  if (xfer == NULL)
+    {
+      cairo_t *cr;
+      gint     w = GIMP_DISPLAY_RENDER_BUF_WIDTH;
+      gint     h = GIMP_DISPLAY_RENDER_BUF_HEIGHT;
+      int      n;
+
+      xfer = g_new (GimpDisplayXfer, 1);
+      rtree_init (&xfer->rtree, w, h);
+
+      cr = gdk_cairo_create (gtk_widget_get_window (widget));
+      for (n = 0; n < NUM_PAGES; n++)
+        {
+          xfer->render_surface[n] =
+            cairo_surface_create_similar_image (cairo_get_target (cr),
+                                                CAIRO_FORMAT_ARGB32, w, h);
+          cairo_surface_mark_dirty (xfer->render_surface[n]);
+        }
+      cairo_destroy (cr);
+      xfer->page = 0;
+
+      g_object_set_data_full (G_OBJECT (screen),
+                              "gimp-display-xfer",
+                              xfer, xfer_destroy);
+    }
+
+  return xfer;
+}
+
+cairo_surface_t *
+gimp_display_xfer_get_surface (GimpDisplayXfer *xfer,
+                               gint             w,
+                               gint             h,
+                               gint            *src_x,
+                               gint            *src_y)
+{
+  RTreeNode *node;
+
+  gimp_assert (w <= GIMP_DISPLAY_RENDER_BUF_WIDTH &&
+               h <= GIMP_DISPLAY_RENDER_BUF_HEIGHT);
+
+  node = rtree_insert (&xfer->rtree, w, h);
+  if (node == NULL)
+    {
+      xfer->page = (xfer->page + 1) % NUM_PAGES;
+      cairo_surface_flush (xfer->render_surface[xfer->page]);
+      rtree_reset (&xfer->rtree);
+      cairo_surface_mark_dirty (xfer->render_surface[xfer->page]); /* XXX */
+      node = rtree_insert (&xfer->rtree, w, h);
+      gimp_assert (node != NULL);
+    }
+
+  *src_x = node->x;
+  *src_y = node->y;
+
+  return xfer->render_surface[xfer->page];
+}
diff --git a/app/display/gimpdisplayxfer.h b/app/display/gimpdisplayxfer.h
new file mode 100644
index 0000000..20656b9
--- /dev/null
+++ b/app/display/gimpdisplayxfer.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DISPLAY_XFER_H__
+#define __GIMP_DISPLAY_XFER_H__
+
+
+extern gint GIMP_DISPLAY_RENDER_BUF_WIDTH;
+extern gint GIMP_DISPLAY_RENDER_BUF_HEIGHT;
+
+#define GIMP_DISPLAY_RENDER_MAX_SCALE  4.0
+
+
+GimpDisplayXfer * gimp_display_xfer_realize     (GtkWidget       *widget);
+
+cairo_surface_t * gimp_display_xfer_get_surface (GimpDisplayXfer *xfer,
+                                                 gint             w,
+                                                 gint             h,
+                                                 gint            *src_x,
+                                                 gint            *src_y);
+
+
+#endif  /*  __GIMP_DISPLAY_XFER_H__  */
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
new file mode 100644
index 0000000..fd5c501
--- /dev/null
+++ b/app/display/gimpimagewindow.c
@@ -0,0 +1,2428 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#ifdef G_OS_WIN32
+#include <windef.h>
+#include <winbase.h>
+#include <windows.h>
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+#import <AppKit/AppKit.h>
+#include <gdk/gdkquartz.h>
+#endif /* !GDK_WINDOWING_QUARTZ */
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+#include "core/gimpcontainer.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdockcolumns.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpsessioninfo-aux.h"
+#include "widgets/gimpsessionmanaged.h"
+#include "widgets/gimpsessioninfo-dock.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpview.h"
+#include "widgets/gimpviewrenderer.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplay-foreach.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-close.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-tool-events.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpimagewindow.h"
+#include "gimpstatusbar.h"
+
+#include "gimp-log.h"
+#include "gimp-priorities.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_EMPTY_IMAGE_WINDOW_ENTRY_ID   "gimp-empty-image-window"
+#define GIMP_SINGLE_IMAGE_WINDOW_ENTRY_ID  "gimp-single-image-window"
+
+/* The width of the left and right dock areas */
+#define GIMP_IMAGE_WINDOW_LEFT_DOCKS_WIDTH  "left-docks-width"
+#define GIMP_IMAGE_WINDOW_RIGHT_DOCKS_WIDTH "right-docks-width"
+
+/* deprecated property: GtkPaned position of the right docks area */
+#define GIMP_IMAGE_WINDOW_RIGHT_DOCKS_POS  "right-docks-position"
+
+/* Whether the window's maximized or not */
+#define GIMP_IMAGE_WINDOW_MAXIMIZED        "maximized"
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+#define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8)
+#endif
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_DIALOG_FACTORY,
+  PROP_INITIAL_SCREEN,
+  PROP_INITIAL_MONITOR
+};
+
+
+typedef struct _GimpImageWindowPrivate GimpImageWindowPrivate;
+
+struct _GimpImageWindowPrivate
+{
+  Gimp              *gimp;
+  GimpUIManager     *menubar_manager;
+  GimpDialogFactory *dialog_factory;
+
+  GList             *shells;
+  GimpDisplayShell  *active_shell;
+
+  GtkWidget         *main_vbox;
+  GtkWidget         *menubar;
+  GtkWidget         *hbox;
+  GtkWidget         *left_hpane;
+  GtkWidget         *left_docks;
+  GtkWidget         *right_hpane;
+  GtkWidget         *notebook;
+  GtkWidget         *right_docks;
+
+  GdkWindowState     window_state;
+
+  const gchar       *entry_id;
+
+  GdkScreen         *initial_screen;
+  gint               initial_monitor;
+
+  gint               suspend_keep_pos;
+
+  gint               update_ui_manager_idle_id;
+};
+
+typedef struct
+{
+  gint canvas_x;
+  gint canvas_y;
+  gint window_x;
+  gint window_y;
+} PosCorrectionData;
+
+
+#define GIMP_IMAGE_WINDOW_GET_PRIVATE(window) \
+        ((GimpImageWindowPrivate *) gimp_image_window_get_instance_private ((GimpImageWindow *) (window)))
+
+
+/*  local function prototypes  */
+
+static void      gimp_image_window_dock_container_iface_init
+                                                       (GimpDockContainerInterface
+                                                                            *iface);
+static void      gimp_image_window_session_managed_iface_init
+                                                       (GimpSessionManagedInterface
+                                                                            *iface);
+static void      gimp_image_window_constructed         (GObject             *object);
+static void      gimp_image_window_dispose             (GObject             *object);
+static void      gimp_image_window_finalize            (GObject             *object);
+static void      gimp_image_window_set_property        (GObject             *object,
+                                                        guint                property_id,
+                                                        const GValue        *value,
+                                                        GParamSpec          *pspec);
+static void      gimp_image_window_get_property        (GObject             *object,
+                                                        guint                property_id,
+                                                        GValue              *value,
+                                                        GParamSpec          *pspec);
+
+static void      gimp_image_window_map                 (GtkWidget           *widget);
+static gboolean  gimp_image_window_delete_event        (GtkWidget           *widget,
+                                                        GdkEventAny         *event);
+static gboolean  gimp_image_window_configure_event     (GtkWidget           *widget,
+                                                        GdkEventConfigure   *event);
+static gboolean  gimp_image_window_window_state_event  (GtkWidget           *widget,
+                                                        GdkEventWindowState *event);
+static void      gimp_image_window_style_set           (GtkWidget           *widget,
+                                                        GtkStyle            *prev_style);
+
+static void      gimp_image_window_monitor_changed     (GimpWindow          *window,
+                                                        GdkScreen           *screen,
+                                                        gint                 monitor);
+
+static GList *   gimp_image_window_get_docks           (GimpDockContainer   *dock_container);
+static GimpDialogFactory *
+                 gimp_image_window_dock_container_get_dialog_factory
+                                                       (GimpDockContainer   *dock_container);
+static GimpUIManager *
+                 gimp_image_window_dock_container_get_ui_manager
+                                                       (GimpDockContainer   *dock_container);
+static void      gimp_image_window_add_dock            (GimpDockContainer   *dock_container,
+                                                        GimpDock            *dock,
+                                                        GimpSessionInfoDock *dock_info);
+static GimpAlignmentType
+                 gimp_image_window_get_dock_side       (GimpDockContainer   *dock_container,
+                                                        GimpDock            *dock);
+static GList   * gimp_image_window_get_aux_info        (GimpSessionManaged  *session_managed);
+static void      gimp_image_window_set_aux_info        (GimpSessionManaged  *session_managed,
+                                                        GList               *aux_info);
+
+static void      gimp_image_window_config_notify       (GimpImageWindow     *window,
+                                                        GParamSpec          *pspec,
+                                                        GimpGuiConfig       *config);
+static void      gimp_image_window_session_clear       (GimpImageWindow     *window);
+static void      gimp_image_window_session_apply       (GimpImageWindow     *window,
+                                                        const gchar         *entry_id,
+                                                        GdkScreen           *screen,
+                                                        gint                 monitor);
+static void      gimp_image_window_session_update      (GimpImageWindow     *window,
+                                                        GimpDisplay         *new_display,
+                                                        const gchar         *new_entry_id,
+                                                        GdkScreen           *screen,
+                                                        gint                 monitor);
+static const gchar *
+                 gimp_image_window_config_to_entry_id  (GimpGuiConfig       *config);
+static void      gimp_image_window_show_tooltip        (GimpUIManager       *manager,
+                                                        const gchar         *tooltip,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_hide_tooltip        (GimpUIManager       *manager,
+                                                        GimpImageWindow     *window);
+static gboolean  gimp_image_window_update_ui_manager_idle
+                                                       (GimpImageWindow     *window);
+static void      gimp_image_window_update_ui_manager   (GimpImageWindow     *window);
+
+static void      gimp_image_window_shell_size_allocate (GimpDisplayShell    *shell,
+                                                        GtkAllocation       *allocation,
+                                                        PosCorrectionData   *data);
+static gboolean  gimp_image_window_shell_events        (GtkWidget           *widget,
+                                                        GdkEvent            *event,
+                                                        GimpImageWindow     *window);
+
+static void      gimp_image_window_switch_page         (GtkNotebook         *notebook,
+                                                        gpointer             page,
+                                                        gint                 page_num,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_page_removed        (GtkNotebook         *notebook,
+                                                        GtkWidget           *widget,
+                                                        gint                 page_num,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_page_reordered      (GtkNotebook         *notebook,
+                                                        GtkWidget           *widget,
+                                                        gint                 page_num,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_disconnect_from_active_shell
+                                                       (GimpImageWindow *window);
+
+static void      gimp_image_window_image_notify        (GimpDisplay         *display,
+                                                        const GParamSpec    *pspec,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_shell_scaled        (GimpDisplayShell    *shell,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_shell_rotated       (GimpDisplayShell    *shell,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_shell_title_notify  (GimpDisplayShell    *shell,
+                                                        const GParamSpec    *pspec,
+                                                        GimpImageWindow     *window);
+static void      gimp_image_window_shell_icon_notify   (GimpDisplayShell    *shell,
+                                                        const GParamSpec    *pspec,
+                                                        GimpImageWindow     *window);
+static GtkWidget *
+                 gimp_image_window_create_tab_label    (GimpImageWindow     *window,
+                                                        GimpDisplayShell    *shell);
+static void      gimp_image_window_update_tab_labels   (GimpImageWindow     *window);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpImageWindow, gimp_image_window, GIMP_TYPE_WINDOW,
+                         G_ADD_PRIVATE (GimpImageWindow)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCK_CONTAINER,
+                                                gimp_image_window_dock_container_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_SESSION_MANAGED,
+                                                gimp_image_window_session_managed_iface_init))
+
+#define parent_class gimp_image_window_parent_class
+
+
+static const gchar image_window_rc_style[] =
+  "style \"fullscreen-menubar-style\"\n"
+  "{\n"
+  "  GtkMenuBar::shadow-type      = none\n"
+  "  GtkMenuBar::internal-padding = 0\n"
+  "}\n"
+  "widget \"*.gimp-menubar-fullscreen\" style \"fullscreen-menubar-style\"\n";
+
+static void
+gimp_image_window_class_init (GimpImageWindowClass *klass)
+{
+  GObjectClass    *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass  *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpWindowClass *window_class = GIMP_WINDOW_CLASS (klass);
+
+  object_class->constructed        = gimp_image_window_constructed;
+  object_class->dispose            = gimp_image_window_dispose;
+  object_class->finalize           = gimp_image_window_finalize;
+  object_class->set_property       = gimp_image_window_set_property;
+  object_class->get_property       = gimp_image_window_get_property;
+
+  widget_class->map                = gimp_image_window_map;
+  widget_class->delete_event       = gimp_image_window_delete_event;
+  widget_class->configure_event    = gimp_image_window_configure_event;
+  widget_class->window_state_event = gimp_image_window_window_state_event;
+  widget_class->style_set          = gimp_image_window_style_set;
+
+  window_class->monitor_changed    = gimp_image_window_monitor_changed;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DIALOG_FACTORY,
+                                   g_param_spec_object ("dialog-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DIALOG_FACTORY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_INITIAL_SCREEN,
+                                   g_param_spec_object ("initial-screen",
+                                                        NULL, NULL,
+                                                        GDK_TYPE_SCREEN,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_INITIAL_MONITOR,
+                                   g_param_spec_int ("initial-monitor",
+                                                     NULL, NULL,
+                                                     0, 16, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  gtk_rc_parse_string (image_window_rc_style);
+}
+
+static void
+gimp_image_window_init (GimpImageWindow *window)
+{
+  static gint  role_serial = 1;
+  gchar       *role;
+
+  role = g_strdup_printf ("gimp-image-window-%d", role_serial++);
+  gtk_window_set_role (GTK_WINDOW (window), role);
+  g_free (role);
+
+  gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
+}
+
+static void
+gimp_image_window_dock_container_iface_init (GimpDockContainerInterface *iface)
+{
+  iface->get_docks          = gimp_image_window_get_docks;
+  iface->get_dialog_factory = gimp_image_window_dock_container_get_dialog_factory;
+  iface->get_ui_manager     = gimp_image_window_dock_container_get_ui_manager;
+  iface->add_dock           = gimp_image_window_add_dock;
+  iface->get_dock_side      = gimp_image_window_get_dock_side;
+}
+
+static void
+gimp_image_window_session_managed_iface_init (GimpSessionManagedInterface *iface)
+{
+  iface->get_aux_info = gimp_image_window_get_aux_info;
+  iface->set_aux_info = gimp_image_window_set_aux_info;
+}
+
+static void
+gimp_image_window_constructed (GObject *object)
+{
+  GimpImageWindow        *window  = GIMP_IMAGE_WINDOW (object);
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpMenuFactory        *menu_factory;
+  GimpGuiConfig          *config;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (private->gimp));
+  gimp_assert (GIMP_IS_DIALOG_FACTORY (private->dialog_factory));
+
+  menu_factory = gimp_dialog_factory_get_menu_factory (private->dialog_factory);
+
+  private->menubar_manager = gimp_menu_factory_manager_new (menu_factory,
+                                                            "<Image>",
+                                                            window,
+                                                            FALSE);
+
+  g_signal_connect_object (private->dialog_factory, "dock-window-added",
+                           G_CALLBACK (gimp_image_window_update_ui_manager),
+                           window, G_CONNECT_SWAPPED);
+  g_signal_connect_object (private->dialog_factory, "dock-window-removed",
+                           G_CALLBACK (gimp_image_window_update_ui_manager),
+                           window, G_CONNECT_SWAPPED);
+
+  gtk_window_add_accel_group (GTK_WINDOW (window),
+                              gimp_ui_manager_get_accel_group (private->menubar_manager));
+
+  g_signal_connect (private->menubar_manager, "show-tooltip",
+                    G_CALLBACK (gimp_image_window_show_tooltip),
+                    window);
+  g_signal_connect (private->menubar_manager, "hide-tooltip",
+                    G_CALLBACK (gimp_image_window_hide_tooltip),
+                    window);
+
+  config = GIMP_GUI_CONFIG (private->gimp->config);
+
+  /* Create the window toplevel container */
+  private->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (window), private->main_vbox);
+  gtk_widget_show (private->main_vbox);
+
+  /* Create the menubar */
+#ifndef GDK_WINDOWING_QUARTZ
+  private->menubar = gimp_ui_manager_get_widget (private->menubar_manager,
+                                                 "/image-menubar");
+#endif /* !GDK_WINDOWING_QUARTZ */
+  if (private->menubar)
+    {
+      gtk_box_pack_start (GTK_BOX (private->main_vbox),
+                          private->menubar, FALSE, FALSE, 0);
+
+      /*  make sure we can activate accels even if the menubar is invisible
+       *  (see https://bugzilla.gnome.org/show_bug.cgi?id=137151)
+       */
+      g_signal_connect (private->menubar, "can-activate-accel",
+                        G_CALLBACK (gtk_true),
+                        NULL);
+
+      /*  active display callback  */
+      g_signal_connect (private->menubar, "button-press-event",
+                        G_CALLBACK (gimp_image_window_shell_events),
+                        window);
+      g_signal_connect (private->menubar, "button-release-event",
+                        G_CALLBACK (gimp_image_window_shell_events),
+                        window);
+      g_signal_connect (private->menubar, "key-press-event",
+                        G_CALLBACK (gimp_image_window_shell_events),
+                        window);
+    }
+
+  /* Create the hbox that contains docks and images */
+  private->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (private->main_vbox), private->hbox,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (private->hbox);
+
+  /* Create the left pane */
+  private->left_hpane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_box_pack_start (GTK_BOX (private->hbox), private->left_hpane,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (private->left_hpane);
+
+  /* Create the left dock columns widget */
+  private->left_docks =
+    gimp_dock_columns_new (gimp_get_user_context (private->gimp),
+                           private->dialog_factory,
+                           private->menubar_manager);
+  gtk_paned_pack1 (GTK_PANED (private->left_hpane), private->left_docks,
+                   FALSE, FALSE);
+  gtk_widget_set_visible (private->left_docks, config->single_window_mode);
+
+  /* Create the right pane */
+  private->right_hpane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_paned_pack2 (GTK_PANED (private->left_hpane), private->right_hpane,
+                   TRUE, FALSE);
+  gtk_widget_show (private->right_hpane);
+
+  /* Create notebook that contains images */
+  private->notebook = gtk_notebook_new ();
+  gtk_notebook_set_scrollable (GTK_NOTEBOOK (private->notebook), TRUE);
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_notebook_set_tab_pos (GTK_NOTEBOOK (private->notebook), GTK_POS_TOP);
+
+  gtk_paned_pack1 (GTK_PANED (private->right_hpane), private->notebook,
+                   TRUE, TRUE);
+
+  g_signal_connect (private->notebook, "switch-page",
+                    G_CALLBACK (gimp_image_window_switch_page),
+                    window);
+  g_signal_connect (private->notebook, "page-removed",
+                    G_CALLBACK (gimp_image_window_page_removed),
+                    window);
+  g_signal_connect (private->notebook, "page-reordered",
+                    G_CALLBACK (gimp_image_window_page_reordered),
+                    window);
+  gtk_widget_show (private->notebook);
+
+  /* Create the right dock columns widget */
+  private->right_docks =
+    gimp_dock_columns_new (gimp_get_user_context (private->gimp),
+                           private->dialog_factory,
+                           private->menubar_manager);
+  gtk_paned_pack2 (GTK_PANED (private->right_hpane), private->right_docks,
+                   FALSE, FALSE);
+  gtk_widget_set_visible (private->right_docks, config->single_window_mode);
+
+  g_signal_connect_object (config, "notify::single-window-mode",
+                           G_CALLBACK (gimp_image_window_config_notify),
+                           window, G_CONNECT_SWAPPED);
+  g_signal_connect_object (config, "notify::show-tabs",
+                           G_CALLBACK (gimp_image_window_config_notify),
+                           window, G_CONNECT_SWAPPED);
+  g_signal_connect_object (config, "notify::hide-docks",
+                           G_CALLBACK (gimp_image_window_config_notify),
+                           window, G_CONNECT_SWAPPED);
+  g_signal_connect_object (config, "notify::tabs-position",
+                           G_CALLBACK (gimp_image_window_config_notify),
+                           window, G_CONNECT_SWAPPED);
+
+  gimp_image_window_session_update (window,
+                                    NULL /*new_display*/,
+                                    gimp_image_window_config_to_entry_id (config),
+                                    private->initial_screen,
+                                    private->initial_monitor);
+}
+
+static void
+gimp_image_window_dispose (GObject *object)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (object);
+
+  if (private->dialog_factory)
+    {
+      g_signal_handlers_disconnect_by_func (private->dialog_factory,
+                                            gimp_image_window_update_ui_manager,
+                                            object);
+      private->dialog_factory = NULL;
+    }
+
+  g_clear_object (&private->menubar_manager);
+
+  if (private->update_ui_manager_idle_id)
+    {
+      g_source_remove (private->update_ui_manager_idle_id);
+      private->update_ui_manager_idle_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_image_window_finalize (GObject *object)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (object);
+
+  if (private->shells)
+    {
+      g_list_free (private->shells);
+      private->shells = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_image_window_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpImageWindow        *window  = GIMP_IMAGE_WINDOW (object);
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value);
+      break;
+    case PROP_DIALOG_FACTORY:
+      private->dialog_factory = g_value_get_object (value);
+      break;
+    case PROP_INITIAL_SCREEN:
+      private->initial_screen = g_value_get_object (value);
+      break;
+    case PROP_INITIAL_MONITOR:
+      private->initial_monitor = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_window_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpImageWindow        *window  = GIMP_IMAGE_WINDOW (object);
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+    case PROP_DIALOG_FACTORY:
+      g_value_set_object (value, private->dialog_factory);
+      break;
+    case PROP_INITIAL_SCREEN:
+      g_value_set_object (value, private->initial_screen);
+      break;
+    case PROP_INITIAL_MONITOR:
+      g_value_set_int (value, private->initial_monitor);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_window_map (GtkWidget *widget)
+{
+#ifdef GDK_WINDOWING_QUARTZ
+  GdkWindow *gdk_window;
+  NSWindow  *ns_window;
+#endif /* !GDK_WINDOWING_QUARTZ */
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+#ifdef GDK_WINDOWING_QUARTZ
+  gdk_window = gtk_widget_get_window (GTK_WIDGET (widget));
+  ns_window = gdk_quartz_window_get_nswindow (gdk_window);
+
+  /* Disable the new-style full screen mode. For now only the "old-style"
+   * full screen mode, via the "View" menu, is supported. In the future, and
+   * as soon as GTK+ has proper support for this, we will migrate to the
+   * new-style full screen mode.
+   */
+  ns_window.collectionBehavior |= NSWindowCollectionBehaviorFullScreenAuxiliary;
+#endif /* !GDK_WINDOWING_QUARTZ */
+}
+
+static gboolean
+gimp_image_window_delete_event (GtkWidget   *widget,
+                                GdkEventAny *event)
+{
+  GimpImageWindow        *window  = GIMP_IMAGE_WINDOW (widget);
+  GimpDisplayShell       *shell   = gimp_image_window_get_active_shell (window);
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpGuiConfig          *config  = GIMP_GUI_CONFIG (private->gimp->config);
+
+  if (config->single_window_mode)
+    gimp_ui_manager_activate_action (gimp_image_window_get_ui_manager (window),
+                                     "file", "file-quit");
+  else if (shell)
+    gimp_display_shell_close (shell, FALSE);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_image_window_configure_event (GtkWidget         *widget,
+                                   GdkEventConfigure *event)
+{
+  GimpImageWindow *window = GIMP_IMAGE_WINDOW (widget);
+  GtkAllocation    allocation;
+  gint             current_width;
+  gint             current_height;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  /* Grab the size before we run the parent implementation */
+  current_width  = allocation.width;
+  current_height = allocation.height;
+
+  /* Run the parent implementation */
+  if (GTK_WIDGET_CLASS (parent_class)->configure_event)
+    GTK_WIDGET_CLASS (parent_class)->configure_event (widget, event);
+
+  /* If the window size has changed, make sure additoinal logic is run
+   * in the display shell's size-allocate
+   */
+  if (event->width  != current_width ||
+      event->height != current_height)
+    {
+      /* FIXME multiple shells */
+      GimpDisplayShell *shell = gimp_image_window_get_active_shell (window);
+
+      if (shell && gimp_display_get_image (shell->display))
+        shell->size_allocate_from_configure_event = TRUE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_image_window_window_state_event (GtkWidget           *widget,
+                                      GdkEventWindowState *event)
+{
+  GimpImageWindow        *window  = GIMP_IMAGE_WINDOW (widget);
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpDisplayShell       *shell   = gimp_image_window_get_active_shell (window);
+
+  if (! shell)
+    return FALSE;
+
+  private->window_state = event->new_window_state;
+
+  if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
+    {
+      gboolean fullscreen = gimp_image_window_get_fullscreen (window);
+
+      GIMP_LOG (WM, "Image window '%s' [%p] set fullscreen %s",
+                gtk_window_get_title (GTK_WINDOW (widget)),
+                widget,
+                fullscreen ? "TRUE" : "FALSE");
+
+      if (private->menubar)
+        gtk_widget_set_name (private->menubar,
+                             fullscreen ? "gimp-menubar-fullscreen" : NULL);
+
+      gimp_image_window_suspend_keep_pos (window);
+      gimp_display_shell_appearance_update (shell);
+      gimp_image_window_resume_keep_pos (window);
+    }
+
+  if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED)
+    {
+      GimpStatusbar *statusbar = gimp_display_shell_get_statusbar (shell);
+      gboolean       iconified = gimp_image_window_is_iconified (window);
+
+      GIMP_LOG (WM, "Image window '%s' [%p] set %s",
+                gtk_window_get_title (GTK_WINDOW (widget)),
+                widget,
+                iconified ? "iconified" : "uniconified");
+
+      if (iconified)
+        {
+          if (gimp_displays_get_num_visible (private->gimp) == 0)
+            {
+              GIMP_LOG (WM, "No displays visible any longer");
+
+              gimp_dialog_factory_hide_with_display (private->dialog_factory);
+            }
+        }
+      else
+        {
+          gimp_dialog_factory_show_with_display (private->dialog_factory);
+        }
+
+      if (gimp_progress_is_active (GIMP_PROGRESS (statusbar)))
+        {
+          if (iconified)
+            gimp_statusbar_override_window_title (statusbar);
+          else
+            gtk_window_set_title (GTK_WINDOW (window), shell->title);
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_image_window_style_set (GtkWidget *widget,
+                             GtkStyle  *prev_style)
+{
+  GimpImageWindow        *window        = GIMP_IMAGE_WINDOW (widget);
+  GimpImageWindowPrivate *private       = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpDisplayShell       *shell         = gimp_image_window_get_active_shell (window);
+  GimpStatusbar          *statusbar     = NULL;
+  GtkRequisition          requisition   = { 0, };
+  GdkGeometry             geometry      = { 0, };
+  GdkWindowHints          geometry_mask = 0;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  if (! shell)
+    return;
+
+  statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gtk_widget_size_request (GTK_WIDGET (statusbar), &requisition);
+
+  geometry.min_height = 23;
+
+  geometry.min_width   = requisition.width;
+  geometry.min_height += requisition.height;
+
+  if (private->menubar)
+    {
+      gtk_widget_size_request (private->menubar, &requisition);
+
+      geometry.min_height += requisition.height;
+    }
+
+  geometry_mask = GDK_HINT_MIN_SIZE;
+
+  /*  Only set user pos on the empty display because it gets a pos
+   *  set by gimp. All other displays should be placed by the window
+   *  manager. See https://bugzilla.gnome.org/show_bug.cgi?id=559580
+   */
+  if (! gimp_display_get_image (shell->display))
+    geometry_mask |= GDK_HINT_USER_POS;
+
+  gtk_window_set_geometry_hints (GTK_WINDOW (widget), NULL,
+                                 &geometry, geometry_mask);
+
+  gimp_dialog_factory_set_has_min_size (GTK_WINDOW (widget), TRUE);
+}
+
+static void
+gimp_image_window_monitor_changed (GimpWindow *window,
+                                   GdkScreen  *screen,
+                                   gint        monitor)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GList                  *list;
+
+  for (list = private->shells; list; list = g_list_next (list))
+    {
+      /*  hack, this should live here, and screen_changed call
+       *  monitor_changed
+       */
+      g_signal_emit_by_name (list->data, "screen-changed",
+                             gtk_widget_get_screen (list->data));
+
+      /*  make it fetch the new monitor's resolution  */
+      gimp_display_shell_scale_update (GIMP_DISPLAY_SHELL (list->data));
+
+      /*  make it fetch the right monitor profile  */
+      gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (list->data));
+    }
+}
+
+static GList *
+gimp_image_window_get_docks (GimpDockContainer *dock_container)
+{
+  GimpImageWindowPrivate *private;
+  GList                  *iter;
+  GList                  *all_docks = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (dock_container), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (dock_container);
+
+  for (iter = gimp_dock_columns_get_docks (GIMP_DOCK_COLUMNS (private->left_docks));
+       iter;
+       iter = g_list_next (iter))
+    {
+      all_docks = g_list_append (all_docks, GIMP_DOCK (iter->data));
+    }
+
+  for (iter = gimp_dock_columns_get_docks (GIMP_DOCK_COLUMNS (private->right_docks));
+       iter;
+       iter = g_list_next (iter))
+    {
+      all_docks = g_list_append (all_docks, GIMP_DOCK (iter->data));
+    }
+
+  return all_docks;
+}
+
+static GimpDialogFactory *
+gimp_image_window_dock_container_get_dialog_factory (GimpDockContainer *dock_container)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (dock_container);
+
+  return private->dialog_factory;
+}
+
+static GimpUIManager *
+gimp_image_window_dock_container_get_ui_manager (GimpDockContainer *dock_container)
+{
+  GimpImageWindow *window = GIMP_IMAGE_WINDOW (dock_container);
+
+  return gimp_image_window_get_ui_manager (window);
+}
+
+void
+gimp_image_window_add_dock (GimpDockContainer   *dock_container,
+                            GimpDock            *dock,
+                            GimpSessionInfoDock *dock_info)
+{
+  GimpImageWindow        *window;
+  GimpDisplayShell       *active_shell;
+  GimpImageWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (dock_container));
+
+  window  = GIMP_IMAGE_WINDOW (dock_container);
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  if (dock_info->side == GIMP_ALIGN_LEFT)
+    {
+      gimp_dock_columns_add_dock (GIMP_DOCK_COLUMNS (private->left_docks),
+                                  dock,
+                                  -1 /*index*/);
+    }
+  else
+    {
+      gimp_dock_columns_add_dock (GIMP_DOCK_COLUMNS (private->right_docks),
+                                  dock,
+                                  -1 /*index*/);
+    }
+
+  active_shell = gimp_image_window_get_active_shell (window);
+  if (active_shell)
+    gimp_display_shell_appearance_update (active_shell);
+}
+
+static GimpAlignmentType
+gimp_image_window_get_dock_side (GimpDockContainer *dock_container,
+                                 GimpDock          *dock)
+{
+  GimpAlignmentType       side = -1;
+  GimpImageWindowPrivate *private;
+  GList                  *iter;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (dock_container), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (dock_container);
+
+  for (iter = gimp_dock_columns_get_docks (GIMP_DOCK_COLUMNS (private->left_docks));
+       iter && side == -1;
+       iter = g_list_next (iter))
+    {
+      GimpDock *dock_iter = GIMP_DOCK (iter->data);
+
+      if (dock_iter == dock)
+        side = GIMP_ALIGN_LEFT;
+    }
+
+  for (iter = gimp_dock_columns_get_docks (GIMP_DOCK_COLUMNS (private->right_docks));
+       iter && side == -1;
+       iter = g_list_next (iter))
+    {
+      GimpDock *dock_iter = GIMP_DOCK (iter->data);
+
+      if (dock_iter == dock)
+        side = GIMP_ALIGN_RIGHT;
+    }
+
+  return side;
+}
+
+static GList *
+gimp_image_window_get_aux_info (GimpSessionManaged *session_managed)
+{
+  GList                  *aux_info = NULL;
+  GimpImageWindowPrivate *private;
+  GimpGuiConfig          *config;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (session_managed), NULL);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (session_managed);
+  config  = GIMP_GUI_CONFIG (private->gimp->config);
+
+  if (config->single_window_mode)
+    {
+      GimpSessionInfoAux *aux;
+      GtkAllocation       allocation;
+      gchar               widthbuf[128];
+
+      g_snprintf (widthbuf, sizeof (widthbuf), "%d",
+                  gtk_paned_get_position (GTK_PANED (private->left_hpane)));
+      aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_LEFT_DOCKS_WIDTH,
+                                       widthbuf);
+      aux_info = g_list_append (aux_info, aux);
+
+      gtk_widget_get_allocation (private->right_hpane, &allocation);
+
+      g_snprintf (widthbuf, sizeof (widthbuf), "%d",
+                  allocation.width -
+                  gtk_paned_get_position (GTK_PANED (private->right_hpane)));
+      aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_RIGHT_DOCKS_WIDTH,
+                                       widthbuf);
+      aux_info = g_list_append (aux_info, aux);
+
+      aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_MAXIMIZED,
+                                       gimp_image_window_is_maximized (GIMP_IMAGE_WINDOW (session_managed)) ?
+                                       "yes" : "no");
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
+
+static void
+gimp_image_window_set_right_docks_width (GtkPaned      *paned,
+                                         GtkAllocation *allocation,
+                                         void          *data)
+{
+  gint width = GPOINTER_TO_INT (data);
+
+  g_return_if_fail (GTK_IS_PANED (paned));
+
+  if (width > 0)
+    gtk_paned_set_position (paned, allocation->width - width);
+  else
+    gtk_paned_set_position (paned, - width);
+
+  g_signal_handlers_disconnect_by_func (paned,
+                                        gimp_image_window_set_right_docks_width,
+                                        data);
+}
+
+static void
+gimp_image_window_set_aux_info (GimpSessionManaged *session_managed,
+                                GList              *aux_info)
+{
+  GimpImageWindowPrivate *private;
+  GList                  *iter;
+  gint                    left_docks_width      = G_MININT;
+  gint                    right_docks_width     = G_MININT;
+  gboolean                wait_with_right_docks = FALSE;
+  gboolean                maximized             = FALSE;
+#ifdef G_OS_WIN32
+  STARTUPINFO             StartupInfo;
+
+  GetStartupInfo (&StartupInfo);
+#endif
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (session_managed));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (session_managed);
+
+  for (iter = aux_info; iter; iter = g_list_next (iter))
+    {
+      GimpSessionInfoAux *aux   = iter->data;
+      gint               *width = NULL;
+
+      if (! strcmp (aux->name, GIMP_IMAGE_WINDOW_LEFT_DOCKS_WIDTH))
+        width = &left_docks_width;
+      else if (! strcmp (aux->name, GIMP_IMAGE_WINDOW_RIGHT_DOCKS_WIDTH))
+        width = &right_docks_width;
+      else if (! strcmp (aux->name, GIMP_IMAGE_WINDOW_RIGHT_DOCKS_POS))
+        width = &right_docks_width;
+      else if (! strcmp (aux->name, GIMP_IMAGE_WINDOW_MAXIMIZED))
+        if (! g_ascii_strcasecmp (aux->value, "yes"))
+          maximized = TRUE;
+
+      if (width)
+        sscanf (aux->value, "%d", width);
+
+      /* compat handling for right docks */
+      if (! strcmp (aux->name, GIMP_IMAGE_WINDOW_RIGHT_DOCKS_POS))
+        {
+          /* negate the value because negative docks pos means docks width,
+           * also use the negativenes of a real docks pos as condition below.
+           */
+          *width = - *width;
+        }
+    }
+
+  if (left_docks_width != G_MININT &&
+      gtk_paned_get_position (GTK_PANED (private->left_hpane)) !=
+      left_docks_width)
+    {
+      gtk_paned_set_position (GTK_PANED (private->left_hpane), left_docks_width);
+
+      /* We can't set the position of the right docks, because it will
+       * be undesirably adjusted when its get a new size
+       * allocation. We must wait until after the size allocation.
+       */
+      wait_with_right_docks = TRUE;
+    }
+
+  if (right_docks_width != G_MININT &&
+      gtk_paned_get_position (GTK_PANED (private->right_hpane)) !=
+      right_docks_width)
+    {
+      if (wait_with_right_docks || right_docks_width > 0)
+        {
+          /* We must wait for a size allocation before we can set the
+           * position
+           */
+          g_signal_connect_data (private->right_hpane, "size-allocate",
+                                 G_CALLBACK (gimp_image_window_set_right_docks_width),
+                                 GINT_TO_POINTER (right_docks_width), NULL,
+                                 G_CONNECT_AFTER);
+        }
+      else
+        {
+          /* We can set the position directly, because we didn't
+           * change the left hpane position, and we got the old compat
+           * dock pos property.
+           */
+          gtk_paned_set_position (GTK_PANED (private->right_hpane),
+                                  - right_docks_width);
+        }
+    }
+
+#ifdef G_OS_WIN32
+  /* On Windows, user can provide startup hints to have a program
+   * maximized/minimized on startup. This can be done through command
+   * line: `start /max gimp-2.9.exe` or with the shortcut's "run"
+   * property.
+   * When such a hint is given, we should follow it and bypass the
+   * session's information.
+   */
+  if (StartupInfo.wShowWindow == SW_SHOWMAXIMIZED)
+    gtk_window_maximize (GTK_WINDOW (session_managed));
+  else if (StartupInfo.wShowWindow == SW_SHOWMINIMIZED   ||
+           StartupInfo.wShowWindow == SW_SHOWMINNOACTIVE ||
+           StartupInfo.wShowWindow == SW_MINIMIZE)
+    /* XXX Iconification does not seem to work. I see the
+     * window being iconified and immediately re-raised.
+     * I leave this piece of code for later improvement. */
+    gtk_window_iconify (GTK_WINDOW (session_managed));
+  else
+    /* Another show property not relevant to min/max.
+     * Defaults is: SW_SHOWNORMAL
+     */
+#endif
+    if (maximized)
+      gtk_window_maximize (GTK_WINDOW (session_managed));
+    else
+      gtk_window_unmaximize (GTK_WINDOW (session_managed));
+}
+
+
+/*  public functions  */
+
+GimpImageWindow *
+gimp_image_window_new (Gimp              *gimp,
+                       GimpImage         *image,
+                       GimpDialogFactory *dialog_factory,
+                       GdkScreen         *screen,
+                       gint               monitor)
+{
+  GimpImageWindow        *window;
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  window = g_object_new (GIMP_TYPE_IMAGE_WINDOW,
+                         "gimp",            gimp,
+                         "dialog-factory",  dialog_factory,
+                         "initial-screen",  screen,
+                         "initial-monitor", monitor,
+                         /* The window position will be overridden by the
+                          * dialog factory, it is only really used on first
+                          * startup.
+                          */
+                         image ? NULL : "window-position",
+                         GTK_WIN_POS_CENTER,
+                         NULL);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  gimp->image_windows = g_list_append (gimp->image_windows, window);
+
+  if (! GIMP_GUI_CONFIG (private->gimp->config)->single_window_mode)
+    {
+      GdkScreen *pointer_screen;
+      gint       pointer_monitor;
+
+      pointer_monitor = gimp_get_monitor_at_pointer (&pointer_screen);
+
+      /*  If we are supposed to go to a monitor other than where the
+       *  pointer is, place the window on that monitor manually,
+       *  otherwise simply let the window manager place the window on
+       *  the poiner's monitor.
+       */
+      if (pointer_screen  != screen ||
+          pointer_monitor != monitor)
+        {
+          GdkRectangle rect;
+          gchar        geom[32];
+
+          gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+          /*  FIXME: image window placement
+           *
+           *  This is ugly beyond description but better than showing
+           *  the window on the wrong monitor
+           */
+          g_snprintf (geom, sizeof (geom), "%+d%+d",
+                      rect.x + 300, rect.y + 30);
+          gtk_window_parse_geometry (GTK_WINDOW (window), geom);
+        }
+    }
+
+  return window;
+}
+
+void
+gimp_image_window_destroy (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  private->gimp->image_windows = g_list_remove (private->gimp->image_windows,
+                                                window);
+
+  gtk_widget_destroy (GTK_WIDGET (window));
+}
+
+GimpUIManager *
+gimp_image_window_get_ui_manager (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return private->menubar_manager;
+}
+
+GimpDockColumns  *
+gimp_image_window_get_left_docks (GimpImageWindow  *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return GIMP_DOCK_COLUMNS (private->left_docks);
+}
+
+GimpDockColumns  *
+gimp_image_window_get_right_docks (GimpImageWindow  *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return GIMP_DOCK_COLUMNS (private->right_docks);
+}
+
+void
+gimp_image_window_add_shell (GimpImageWindow  *window,
+                             GimpDisplayShell *shell)
+{
+  GimpImageWindowPrivate *private;
+  GtkWidget              *tab_label;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  g_return_if_fail (g_list_find (private->shells, shell) == NULL);
+
+  private->shells = g_list_append (private->shells, shell);
+
+  tab_label = gimp_image_window_create_tab_label (window, shell);
+
+  gtk_notebook_append_page (GTK_NOTEBOOK (private->notebook),
+                            GTK_WIDGET (shell), tab_label);
+  gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (private->notebook),
+                                    GTK_WIDGET (shell), TRUE);
+
+  gtk_widget_show (GTK_WIDGET (shell));
+
+  /*  make it fetch the right monitor profile  */
+  gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (shell));
+}
+
+GimpDisplayShell *
+gimp_image_window_get_shell (GimpImageWindow *window,
+                             gint             index)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), NULL);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return g_list_nth_data (private->shells, index);
+}
+
+void
+gimp_image_window_remove_shell (GimpImageWindow  *window,
+                                GimpDisplayShell *shell)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  g_return_if_fail (g_list_find (private->shells, shell) != NULL);
+
+  private->shells = g_list_remove (private->shells, shell);
+
+  gtk_container_remove (GTK_CONTAINER (private->notebook),
+                        GTK_WIDGET (shell));
+}
+
+gint
+gimp_image_window_get_n_shells (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), 0);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return g_list_length (private->shells);
+}
+
+void
+gimp_image_window_set_active_shell (GimpImageWindow  *window,
+                                    GimpDisplayShell *shell)
+{
+  GimpImageWindowPrivate *private;
+  gint                    page_num;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  g_return_if_fail (g_list_find (private->shells, shell));
+
+  page_num = gtk_notebook_page_num (GTK_NOTEBOOK (private->notebook),
+                                    GTK_WIDGET (shell));
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (private->notebook), page_num);
+}
+
+GimpDisplayShell *
+gimp_image_window_get_active_shell (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), NULL);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return private->active_shell;
+}
+
+void
+gimp_image_window_set_fullscreen (GimpImageWindow *window,
+                                  gboolean         fullscreen)
+{
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  if (fullscreen != gimp_image_window_get_fullscreen (window))
+    {
+      if (fullscreen)
+        gtk_window_fullscreen (GTK_WINDOW (window));
+      else
+        gtk_window_unfullscreen (GTK_WINDOW (window));
+    }
+}
+
+gboolean
+gimp_image_window_get_fullscreen (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return (private->window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+}
+
+void
+gimp_image_window_set_show_menubar (GimpImageWindow *window,
+                                    gboolean         show)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  if (private->menubar)
+    gtk_widget_set_visible (private->menubar, show);
+}
+
+gboolean
+gimp_image_window_get_show_menubar (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  if (private->menubar)
+    return gtk_widget_get_visible (private->menubar);
+
+  return FALSE;
+}
+
+gboolean
+gimp_image_window_is_iconified (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return (private->window_state & GDK_WINDOW_STATE_ICONIFIED) != 0;
+}
+
+gboolean
+gimp_image_window_is_maximized (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  return (private->window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+}
+
+/**
+ * gimp_image_window_has_toolbox:
+ * @window:
+ *
+ * Returns: %TRUE if the image window contains a GimpToolbox.
+ **/
+gboolean
+gimp_image_window_has_toolbox (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+  GList                  *iter = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), FALSE);
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  for (iter = gimp_dock_columns_get_docks (GIMP_DOCK_COLUMNS (private->left_docks));
+       iter;
+       iter = g_list_next (iter))
+    {
+      if (GIMP_IS_TOOLBOX (iter->data))
+        return TRUE;
+    }
+
+  for (iter = gimp_dock_columns_get_docks (GIMP_DOCK_COLUMNS (private->right_docks));
+       iter;
+       iter = g_list_next (iter))
+    {
+      if (GIMP_IS_TOOLBOX (iter->data))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_image_window_shrink_wrap (GimpImageWindow *window,
+                               gboolean         grow_only)
+{
+  GimpDisplayShell *active_shell;
+  GtkWidget        *widget;
+  GtkAllocation     allocation;
+  GdkScreen        *screen;
+  GdkRectangle      rect;
+  gint              monitor;
+  gint              disp_width, disp_height;
+  gint              width, height;
+  gint              max_auto_width, max_auto_height;
+  gint              border_width, border_height;
+  gboolean          resize = FALSE;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  if (! gtk_widget_get_realized (GTK_WIDGET (window)))
+    return;
+
+  /* FIXME this so needs cleanup and shell/window separation */
+
+  active_shell = gimp_image_window_get_active_shell (window);
+
+  if (!active_shell)
+    return;
+
+  widget = GTK_WIDGET (window);
+  screen = gtk_widget_get_screen (widget);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  monitor = gdk_screen_get_monitor_at_window (screen,
+                                              gtk_widget_get_window (widget));
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  if (! gimp_display_shell_get_infinite_canvas (active_shell))
+    {
+      gimp_display_shell_scale_get_image_size (active_shell,
+                                               &width, &height);
+    }
+  else
+    {
+      gimp_display_shell_scale_get_image_bounding_box (active_shell,
+                                                       NULL,   NULL,
+                                                       &width, &height);
+    }
+
+  disp_width  = active_shell->disp_width;
+  disp_height = active_shell->disp_height;
+
+
+  /* As long as the disp_width/disp_height is larger than 1 we
+   * can reliably depend on it to calculate the
+   * border_width/border_height because that means there is enough
+   * room in the top-level for the canvas as well as the rulers and
+   * scrollbars. If it is 1 or smaller it is likely that the rulers
+   * and scrollbars are overlapping each other and thus we cannot use
+   * the normal approach to border size, so special case that.
+   */
+  if (disp_width > 1 || !active_shell->vsb)
+    {
+      border_width = allocation.width - disp_width;
+    }
+  else
+    {
+      GtkAllocation vsb_allocation;
+
+      gtk_widget_get_allocation (active_shell->vsb, &vsb_allocation);
+
+      border_width = allocation.width - disp_width + vsb_allocation.width;
+    }
+
+  if (disp_height > 1 || !active_shell->hsb)
+    {
+      border_height = allocation.height - disp_height;
+    }
+  else
+    {
+      GtkAllocation hsb_allocation;
+
+      gtk_widget_get_allocation (active_shell->hsb, &hsb_allocation);
+
+      border_height = allocation.height - disp_height + hsb_allocation.height;
+    }
+
+
+  max_auto_width  = (rect.width  - border_width)  * 0.75;
+  max_auto_height = (rect.height - border_height) * 0.75;
+
+  /* If one of the display dimensions has changed and one of the
+   * dimensions fits inside the screen
+   */
+  if (((width  + border_width)  < rect.width ||
+       (height + border_height) < rect.height) &&
+      (width  != disp_width ||
+       height != disp_height))
+    {
+      width  = ((width  + border_width)  < rect.width)  ? width  : max_auto_width;
+      height = ((height + border_height) < rect.height) ? height : max_auto_height;
+
+      resize = TRUE;
+    }
+
+  /*  If the projected dimension is greater than current, but less than
+   *  3/4 of the screen size, expand automagically
+   */
+  else if ((width  > disp_width ||
+            height > disp_height) &&
+           (disp_width  < max_auto_width ||
+            disp_height < max_auto_height))
+    {
+      width  = MIN (max_auto_width,  width);
+      height = MIN (max_auto_height, height);
+
+      resize = TRUE;
+    }
+
+  if (resize)
+    {
+      GimpStatusbar *statusbar = gimp_display_shell_get_statusbar (active_shell);
+      gint           statusbar_width;
+
+      gtk_widget_get_size_request (GTK_WIDGET (statusbar),
+                                   &statusbar_width, NULL);
+
+      if (width < statusbar_width)
+        width = statusbar_width;
+
+      width  = width  + border_width;
+      height = height + border_height;
+
+      if (grow_only)
+        {
+          if (width < allocation.width)
+            width = allocation.width;
+
+          if (height < allocation.height)
+            height = allocation.height;
+        }
+
+      gtk_window_resize (GTK_WINDOW (window), width, height);
+    }
+
+  /* A wrap always means that we should center the image too. If the
+   * window changes size another center will be done in
+   * GimpDisplayShell::configure_event().
+   */
+  /* FIXME multiple shells */
+  gimp_display_shell_scroll_center_content (active_shell, TRUE, TRUE);
+}
+
+static GtkWidget *
+gimp_image_window_get_first_dockbook (GimpDockColumns *columns)
+{
+  GList *dock_iter;
+
+  for (dock_iter = gimp_dock_columns_get_docks (columns);
+       dock_iter;
+       dock_iter = g_list_next (dock_iter))
+    {
+      GimpDock *dock      = GIMP_DOCK (dock_iter->data);
+      GList    *dockbooks = gimp_dock_get_dockbooks (dock);
+
+      if (dockbooks)
+        return GTK_WIDGET (dockbooks->data);
+    }
+
+  return NULL;
+}
+
+/**
+ * gimp_image_window_get_default_dockbook:
+ * @window:
+ *
+ * Gets the default dockbook, which is the dockbook in which new
+ * dockables should be put in single-window mode.
+ *
+ * Returns: The default dockbook for new dockables, or NULL if no
+ *          dockbook were available.
+ **/
+GtkWidget *
+gimp_image_window_get_default_dockbook (GimpImageWindow  *window)
+{
+  GimpImageWindowPrivate *private;
+  GimpDockColumns        *dock_columns;
+  GtkWidget              *dockbook = NULL;
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  /* First try the first dockbook in the right docks */
+  dock_columns = GIMP_DOCK_COLUMNS (private->right_docks);
+  dockbook     = gimp_image_window_get_first_dockbook (dock_columns);
+
+  /* Then the left docks */
+  if (! dockbook)
+    {
+      dock_columns = GIMP_DOCK_COLUMNS (private->left_docks);
+      dockbook     = gimp_image_window_get_first_dockbook (dock_columns);
+    }
+
+  return dockbook;
+}
+
+/**
+ * gimp_image_window_keep_canvas_pos:
+ * @window:
+ *
+ * Stores the coordinates of the current image canvas origin relatively
+ * its GtkWindow; and on the first size-allocate sets the offsets in
+ * the shell so that the image origin remains the same (even on another
+ * GtkWindow).
+ *
+ * Example use case: The user hides docks attached to the side of image
+ * windows. You want the image to remain fixed on the screen though,
+ * so you use this function to keep the image fixed after the docks
+ * have been hidden.
+ **/
+void
+gimp_image_window_keep_canvas_pos (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+  GimpDisplayShell       *shell;
+  gint                    canvas_x;
+  gint                    canvas_y;
+  gint                    window_x;
+  gint                    window_y;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  if (private->suspend_keep_pos > 0)
+    return;
+
+  shell = gimp_image_window_get_active_shell (window);
+
+  gimp_display_shell_transform_xy (shell, 0.0, 0.0, &canvas_x, &canvas_y);
+
+  if (gtk_widget_translate_coordinates (GTK_WIDGET (shell->canvas),
+                                        GTK_WIDGET (window),
+                                        canvas_x, canvas_y,
+                                        &window_x, &window_y))
+    {
+      PosCorrectionData *data = g_new0 (PosCorrectionData, 1);
+
+      data->canvas_x = canvas_x;
+      data->canvas_y = canvas_y;
+      data->window_x = window_x;
+      data->window_y = window_y;
+
+      g_signal_connect_data (shell, "size-allocate",
+                             G_CALLBACK (gimp_image_window_shell_size_allocate),
+                             data, (GClosureNotify) g_free,
+                             G_CONNECT_AFTER);
+    }
+}
+
+void
+gimp_image_window_suspend_keep_pos (GimpImageWindow  *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  private->suspend_keep_pos++;
+}
+
+void
+gimp_image_window_resume_keep_pos (GimpImageWindow  *window)
+{
+  GimpImageWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  g_return_if_fail (private->suspend_keep_pos > 0);
+
+  private->suspend_keep_pos--;
+}
+
+/**
+ * gimp_image_window_update_tabs:
+ * @window: the Image Window to update.
+ *
+ * Holds the logics of whether shell tabs are to be shown or not in the
+ * Image Window @window. This function should be called after every
+ * change to @window where one might expect tab visibility to change.
+ *
+ * No direct call to gtk_notebook_set_show_tabs() should ever be made.
+ * If we change the logics of tab hiding, we should only change this
+ * procedure instead.
+ **/
+void
+gimp_image_window_update_tabs (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private;
+  GimpGuiConfig          *config;
+  GtkPositionType         position;
+
+  g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
+
+  private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  config = GIMP_GUI_CONFIG (private->gimp->config);
+
+  /* Tab visibility. */
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (private->notebook),
+                              config->single_window_mode &&
+                              config->show_tabs          &&
+                              ! config->hide_docks       &&
+                              ((private->active_shell          &&
+                                private->active_shell->display &&
+                                gimp_display_get_image (private->active_shell->display)) ||
+                               g_list_length (private->shells) > 1));
+
+  /* Tab position. */
+  switch (config->tabs_position)
+    {
+    case GIMP_POSITION_TOP:
+      position = GTK_POS_TOP;
+      break;
+    case GIMP_POSITION_BOTTOM:
+      position = GTK_POS_BOTTOM;
+      break;
+    case GIMP_POSITION_LEFT:
+      position = GTK_POS_LEFT;
+      break;
+    case GIMP_POSITION_RIGHT:
+      position = GTK_POS_RIGHT;
+      break;
+    default:
+      /* If we have any strange value, just reset to default. */
+      position = GTK_POS_TOP;
+      break;
+    }
+
+  gtk_notebook_set_tab_pos (GTK_NOTEBOOK (private->notebook), position);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_window_show_tooltip (GimpUIManager   *manager,
+                                const gchar     *tooltip,
+                                GimpImageWindow *window)
+{
+  GimpDisplayShell *shell     = gimp_image_window_get_active_shell (window);
+  GimpStatusbar    *statusbar = NULL;
+
+  if (! shell)
+    return;
+
+  statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_statusbar_push (statusbar, "menu-tooltip",
+                       NULL, "%s", tooltip);
+}
+
+static void
+gimp_image_window_config_notify (GimpImageWindow *window,
+                                 GParamSpec      *pspec,
+                                 GimpGuiConfig   *config)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  /* Dock column visibility */
+  if (strcmp (pspec->name, "single-window-mode") == 0 ||
+      strcmp (pspec->name, "hide-docks")         == 0 ||
+      strcmp (pspec->name, "show-tabs")          == 0 ||
+      strcmp (pspec->name, "tabs-position")      == 0)
+    {
+      if (strcmp (pspec->name, "single-window-mode") == 0 ||
+          strcmp (pspec->name, "hide-docks")         == 0)
+        {
+          gboolean show_docks = (config->single_window_mode &&
+                                 ! config->hide_docks);
+
+          gimp_image_window_keep_canvas_pos (window);
+          gtk_widget_set_visible (private->left_docks, show_docks);
+          gtk_widget_set_visible (private->right_docks, show_docks);
+
+          /* If docks are being shown, and we are in multi-window-mode,
+           * and this is the window of the active display, try to set
+           * the keyboard focus to this window because it might have
+           * been stolen by a dock. See bug #567333.
+           */
+          if (strcmp (pspec->name, "hide-docks") == 0 &&
+              ! config->single_window_mode            &&
+              ! config->hide_docks)
+            {
+              GimpDisplayShell *shell;
+              GimpContext      *user_context;
+
+              shell        = gimp_image_window_get_active_shell (window);
+              user_context = gimp_get_user_context (private->gimp);
+
+              if (gimp_context_get_display (user_context) == shell->display)
+                {
+                  GdkWindow *w = gtk_widget_get_window (GTK_WIDGET (window));
+
+                  if (w)
+                    gdk_window_focus (w, gtk_get_current_event_time ());
+                }
+            }
+        }
+
+      gimp_image_window_update_tabs (window);
+    }
+
+  /* Session management */
+  if (strcmp (pspec->name, "single-window-mode") == 0)
+    {
+      gimp_image_window_session_update (window,
+                                        NULL /*new_display*/,
+                                        gimp_image_window_config_to_entry_id (config),
+                                        gtk_widget_get_screen (GTK_WIDGET (window)),
+                                        gimp_widget_get_monitor (GTK_WIDGET (window)));
+    }
+}
+
+static void
+gimp_image_window_hide_tooltip (GimpUIManager   *manager,
+                                GimpImageWindow *window)
+{
+  GimpDisplayShell *shell     = gimp_image_window_get_active_shell (window);
+  GimpStatusbar    *statusbar = NULL;
+
+  if (! shell)
+    return;
+
+  statusbar = gimp_display_shell_get_statusbar (shell);
+
+  gimp_statusbar_pop (statusbar, "menu-tooltip");
+}
+
+static gboolean
+gimp_image_window_update_ui_manager_idle (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  gimp_assert (private->active_shell != NULL);
+
+  gimp_ui_manager_update (private->menubar_manager,
+                          private->active_shell->display);
+
+  private->update_ui_manager_idle_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_image_window_update_ui_manager (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  if (! private->update_ui_manager_idle_id)
+    {
+      private->update_ui_manager_idle_id =
+        g_idle_add_full (GIMP_PRIORITY_IMAGE_WINDOW_UPDATE_UI_MANAGER_IDLE,
+                         (GSourceFunc) gimp_image_window_update_ui_manager_idle,
+                         window,
+                         NULL);
+    }
+}
+
+static void
+gimp_image_window_shell_size_allocate (GimpDisplayShell  *shell,
+                                       GtkAllocation     *allocation,
+                                       PosCorrectionData *data)
+{
+  GimpImageWindow *window = gimp_display_shell_get_window (shell);
+  gint             new_window_x;
+  gint             new_window_y;
+
+  if (gtk_widget_translate_coordinates (GTK_WIDGET (shell->canvas),
+                                        GTK_WIDGET (window),
+                                        data->canvas_x, data->canvas_y,
+                                        &new_window_x, &new_window_y))
+    {
+      gint off_x = new_window_x - data->window_x;
+      gint off_y = new_window_y - data->window_y;
+
+      if (off_x || off_y)
+        gimp_display_shell_scroll (shell, off_x, off_y);
+    }
+
+  g_signal_handlers_disconnect_by_func (shell,
+                                        gimp_image_window_shell_size_allocate,
+                                        data);
+}
+
+static gboolean
+gimp_image_window_shell_events (GtkWidget       *widget,
+                                GdkEvent        *event,
+                                GimpImageWindow *window)
+{
+  GimpDisplayShell *shell = gimp_image_window_get_active_shell (window);
+
+  if (! shell)
+    return FALSE;
+
+  return gimp_display_shell_events (widget, event, shell);
+}
+
+static void
+gimp_image_window_switch_page (GtkNotebook     *notebook,
+                               gpointer         page,
+                               gint             page_num,
+                               GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpDisplayShell       *shell;
+  GimpDisplay            *active_display;
+
+  shell = GIMP_DISPLAY_SHELL (gtk_notebook_get_nth_page (notebook, page_num));
+
+  if (shell == private->active_shell)
+    return;
+
+  gimp_image_window_disconnect_from_active_shell (window);
+
+  GIMP_LOG (WM, "GimpImageWindow %p, private->active_shell = %p; \n",
+            window, shell);
+  private->active_shell = shell;
+
+  gimp_window_set_primary_focus_widget (GIMP_WINDOW (window),
+                                        shell->canvas);
+
+  active_display = private->active_shell->display;
+
+  g_signal_connect (active_display, "notify::image",
+                    G_CALLBACK (gimp_image_window_image_notify),
+                    window);
+
+  g_signal_connect (private->active_shell, "scaled",
+                    G_CALLBACK (gimp_image_window_shell_scaled),
+                    window);
+  g_signal_connect (private->active_shell, "rotated",
+                    G_CALLBACK (gimp_image_window_shell_rotated),
+                    window);
+  g_signal_connect (private->active_shell, "notify::title",
+                    G_CALLBACK (gimp_image_window_shell_title_notify),
+                    window);
+  g_signal_connect (private->active_shell, "notify::icon",
+                    G_CALLBACK (gimp_image_window_shell_icon_notify),
+                    window);
+
+  gtk_window_set_title (GTK_WINDOW (window), shell->title);
+  gtk_window_set_icon (GTK_WINDOW (window), shell->icon);
+
+  gimp_display_shell_appearance_update (private->active_shell);
+
+  if (gtk_widget_get_window (GTK_WIDGET (window)))
+    {
+      /*  we are fully initialized, use the window's current monitor
+       */
+      gimp_image_window_session_update (window,
+                                        active_display,
+                                        NULL /*new_entry_id*/,
+                                        gtk_widget_get_screen (GTK_WIDGET (window)),
+                                        gimp_widget_get_monitor (GTK_WIDGET (window)));
+    }
+  else
+    {
+      /*  we are in construction, use the initial monitor; calling
+       *  gimp_widget_get_monitor() would get us the monitor where the
+       *  pointer is
+       */
+      gimp_image_window_session_update (window,
+                                        active_display,
+                                        NULL /*new_entry_id*/,
+                                        private->initial_screen,
+                                        private->initial_monitor);
+    }
+
+  gimp_context_set_display (gimp_get_user_context (private->gimp),
+                            active_display);
+
+  gimp_image_window_update_ui_manager (window);
+
+  gimp_image_window_update_tab_labels (window);
+}
+
+static void
+gimp_image_window_page_removed (GtkNotebook     *notebook,
+                                GtkWidget       *widget,
+                                gint             page_num,
+                                GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  if (GTK_WIDGET (private->active_shell) == widget)
+    {
+      GIMP_LOG (WM, "GimpImageWindow %p, private->active_shell = %p; \n",
+                window, NULL);
+      gimp_image_window_disconnect_from_active_shell (window);
+      private->active_shell = NULL;
+    }
+}
+
+static void
+gimp_image_window_page_reordered (GtkNotebook     *notebook,
+                                  GtkWidget       *widget,
+                                  gint             page_num,
+                                  GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private  = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpContainer          *displays = private->gimp->displays;
+  gint                    index    = g_list_index (private->shells, widget);
+
+  if (index != page_num)
+    {
+      private->shells = g_list_remove (private->shells, widget);
+      private->shells = g_list_insert (private->shells, widget, page_num);
+    }
+
+  /* We need to reorder the displays as well in order to update the
+   * numbered accelerators (alt-1, alt-2, etc.).
+   */
+  gimp_container_reorder (displays,
+                          GIMP_OBJECT (GIMP_DISPLAY_SHELL (widget)->display),
+                          page_num);
+
+  gtk_notebook_reorder_child (notebook, widget, page_num);
+}
+
+static void
+gimp_image_window_disconnect_from_active_shell (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private        = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpDisplay            *active_display = NULL;
+
+  if (! private->active_shell)
+    return;
+
+  active_display = private->active_shell->display;
+
+  if (active_display)
+    g_signal_handlers_disconnect_by_func (active_display,
+                                          gimp_image_window_image_notify,
+                                          window);
+
+  g_signal_handlers_disconnect_by_func (private->active_shell,
+                                        gimp_image_window_shell_scaled,
+                                        window);
+  g_signal_handlers_disconnect_by_func (private->active_shell,
+                                        gimp_image_window_shell_rotated,
+                                        window);
+  g_signal_handlers_disconnect_by_func (private->active_shell,
+                                        gimp_image_window_shell_title_notify,
+                                        window);
+  g_signal_handlers_disconnect_by_func (private->active_shell,
+                                        gimp_image_window_shell_icon_notify,
+                                        window);
+
+  if (private->menubar_manager)
+    gimp_image_window_hide_tooltip (private->menubar_manager, window);
+
+  if (private->update_ui_manager_idle_id)
+    {
+      g_source_remove (private->update_ui_manager_idle_id);
+      private->update_ui_manager_idle_id = 0;
+    }
+}
+
+static void
+gimp_image_window_image_notify (GimpDisplay      *display,
+                                const GParamSpec *pspec,
+                                GimpImageWindow  *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GtkWidget              *tab_label;
+  GList                  *children;
+  GtkWidget              *view;
+
+  gimp_image_window_session_update (window,
+                                    display,
+                                    NULL /*new_entry_id*/,
+                                    gtk_widget_get_screen (GTK_WIDGET (window)),
+                                    gimp_widget_get_monitor (GTK_WIDGET (window)));
+
+  tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (private->notebook),
+                                          GTK_WIDGET (gimp_display_get_shell (display)));
+  children  = gtk_container_get_children (GTK_CONTAINER (tab_label));
+  view      = GTK_WIDGET (children->data);
+  g_list_free (children);
+
+  gimp_view_set_viewable (GIMP_VIEW (view),
+                          GIMP_VIEWABLE (gimp_display_get_image (display)));
+
+  gimp_image_window_update_ui_manager (window);
+}
+
+static void
+gimp_image_window_session_clear (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GtkWidget              *widget  = GTK_WIDGET (window);
+
+  if (gimp_dialog_factory_from_widget (widget, NULL))
+    gimp_dialog_factory_remove_dialog (private->dialog_factory,
+                                       widget);
+}
+
+static void
+gimp_image_window_session_apply (GimpImageWindow *window,
+                                 const gchar     *entry_id,
+                                 GdkScreen       *screen,
+                                 gint             monitor)
+{
+  GimpImageWindowPrivate *private      = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GimpSessionInfo        *session_info = NULL;
+  gint                    width        = -1;
+  gint                    height       = -1;
+
+  gtk_window_unfullscreen (GTK_WINDOW (window));
+
+  /*  get the NIW size before adding the display to the dialog
+   *  factory so the window's current size doesn't affect the
+   *  stored session info entry.
+   */
+  session_info =
+    gimp_dialog_factory_find_session_info (private->dialog_factory, entry_id);
+
+  if (session_info)
+    {
+      width  = gimp_session_info_get_width  (session_info);
+      height = gimp_session_info_get_height (session_info);
+    }
+  else
+    {
+      GtkAllocation allocation;
+
+      gtk_widget_get_allocation (GTK_WIDGET (window), &allocation);
+
+      width  = allocation.width;
+      height = allocation.height;
+    }
+
+  gimp_dialog_factory_add_foreign (private->dialog_factory,
+                                   entry_id,
+                                   GTK_WIDGET (window),
+                                   screen,
+                                   monitor);
+
+  gtk_window_unmaximize (GTK_WINDOW (window));
+  gtk_window_resize (GTK_WINDOW (window), width, height);
+}
+
+static void
+gimp_image_window_session_update (GimpImageWindow *window,
+                                  GimpDisplay     *new_display,
+                                  const gchar     *new_entry_id,
+                                  GdkScreen       *screen,
+                                  gint             monitor)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+
+  /* Handle changes to the entry id */
+  if (new_entry_id)
+    {
+      if (! private->entry_id)
+        {
+          /* We're initializing. If we're in single-window mode, this
+           * will be the only window, so start to session manage
+           * it. If we're in multi-window mode, we will find out if we
+           * should session manage ourselves when we get a display
+           */
+          if (strcmp (new_entry_id, GIMP_SINGLE_IMAGE_WINDOW_ENTRY_ID) == 0)
+            {
+              gimp_image_window_session_apply (window, new_entry_id,
+                                               screen, monitor);
+            }
+        }
+      else if (strcmp (private->entry_id, new_entry_id) != 0)
+        {
+          /* The entry id changed, immediately and always stop session
+           * managing the old entry
+           */
+          gimp_image_window_session_clear (window);
+
+          if (strcmp (new_entry_id, GIMP_EMPTY_IMAGE_WINDOW_ENTRY_ID) == 0)
+            {
+              /* If there is only one imageless display, we shall
+               * become the empty image window
+               */
+              if (private->active_shell &&
+                  private->active_shell->display &&
+                  ! gimp_display_get_image (private->active_shell->display) &&
+                  g_list_length (private->shells) <= 1)
+                {
+                  gimp_image_window_session_apply (window, new_entry_id,
+                                                   screen, monitor);
+                }
+            }
+          else if (strcmp (new_entry_id, GIMP_SINGLE_IMAGE_WINDOW_ENTRY_ID) == 0)
+            {
+              /* As soon as we become the single image window, we
+               * shall session manage ourself until single-window mode
+               * is exited
+               */
+              gimp_image_window_session_apply (window, new_entry_id,
+                                               screen, monitor);
+            }
+        }
+
+      private->entry_id = new_entry_id;
+    }
+
+  /* Handle changes to the displays. When in single-window mode, we
+   * just keep session managing the single image window. We only need
+   * to care about the multi-window mode case here
+   */
+  if (new_display &&
+      strcmp (private->entry_id, GIMP_EMPTY_IMAGE_WINDOW_ENTRY_ID) == 0)
+    {
+      if (gimp_display_get_image (new_display))
+        {
+          /* As soon as we have an image we should not affect the size of the
+           * empty image window
+           */
+          gimp_image_window_session_clear (window);
+        }
+      else if (! gimp_display_get_image (new_display) &&
+               g_list_length (private->shells) <= 1)
+        {
+          /* As soon as we have no image (and no other shells that may
+           * contain images) we should become the empty image window
+           */
+          gimp_image_window_session_apply (window, private->entry_id,
+                                           screen, monitor);
+        }
+    }
+}
+
+static const gchar *
+gimp_image_window_config_to_entry_id (GimpGuiConfig *config)
+{
+  return (config->single_window_mode ?
+          GIMP_SINGLE_IMAGE_WINDOW_ENTRY_ID :
+          GIMP_EMPTY_IMAGE_WINDOW_ENTRY_ID);
+}
+
+static void
+gimp_image_window_shell_scaled (GimpDisplayShell *shell,
+                                GimpImageWindow  *window)
+{
+  /* update the <Image>/View/Zoom menu */
+  gimp_image_window_update_ui_manager (window);
+}
+
+static void
+gimp_image_window_shell_rotated (GimpDisplayShell *shell,
+                                 GimpImageWindow  *window)
+{
+  /* update the <Image>/View/Rotate menu */
+  gimp_image_window_update_ui_manager (window);
+}
+
+static void
+gimp_image_window_shell_title_notify (GimpDisplayShell *shell,
+                                      const GParamSpec *pspec,
+                                      GimpImageWindow  *window)
+{
+  gtk_window_set_title (GTK_WINDOW (window), shell->title);
+}
+
+static void
+gimp_image_window_shell_icon_notify (GimpDisplayShell *shell,
+                                     const GParamSpec *pspec,
+                                     GimpImageWindow  *window)
+{
+  gtk_window_set_icon (GTK_WINDOW (window), shell->icon);
+}
+
+static void
+gimp_image_window_shell_close_button_callback (GimpDisplayShell *shell)
+{
+  if (shell)
+    gimp_display_shell_close (shell, FALSE);
+}
+
+static GtkWidget *
+gimp_image_window_create_tab_label (GimpImageWindow  *window,
+                                    GimpDisplayShell *shell)
+{
+  GtkWidget *hbox;
+  GtkWidget *view;
+  GimpImage *image;
+  GtkWidget *button;
+  GtkWidget *gtk_image;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_widget_show (hbox);
+
+  view = gimp_view_new_by_types (gimp_get_user_context (shell->display->gimp),
+                                 GIMP_TYPE_VIEW, GIMP_TYPE_IMAGE,
+                                 GIMP_VIEW_SIZE_LARGE, 0, FALSE);
+  gtk_widget_set_size_request (view, GIMP_VIEW_SIZE_LARGE, -1);
+  gimp_view_renderer_set_color_config (GIMP_VIEW (view)->renderer,
+                                       gimp_display_shell_get_color_config (shell));
+  gtk_box_pack_start (GTK_BOX (hbox), view, FALSE, FALSE, 0);
+  gtk_widget_show (view);
+
+  image = gimp_display_get_image (shell->display);
+  if (image)
+    gimp_view_set_viewable (GIMP_VIEW (view), GIMP_VIEWABLE (image));
+
+  button = gtk_button_new ();
+  gtk_widget_set_can_focus (button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  gtk_image = gtk_image_new_from_icon_name (GIMP_ICON_CLOSE,
+                                            GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (button), gtk_image);
+  gtk_widget_show (gtk_image);
+
+  g_signal_connect_swapped (button, "clicked",
+                            G_CALLBACK (gimp_image_window_shell_close_button_callback),
+                            shell);
+
+  g_object_set_data (G_OBJECT (hbox), "close-button", button);
+
+  return hbox;
+}
+
+static void
+gimp_image_window_update_tab_labels (GimpImageWindow *window)
+{
+  GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
+  GList                  *children;
+  GList                  *list;
+
+  children = gtk_container_get_children (GTK_CONTAINER (private->notebook));
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      GtkWidget *shell = list->data;
+      GtkWidget *tab_widget;
+      GtkWidget *close_button;
+
+      tab_widget = gtk_notebook_get_tab_label (GTK_NOTEBOOK (private->notebook),
+                                               shell);
+
+      close_button = g_object_get_data (G_OBJECT (tab_widget), "close-button");
+
+      if (gimp_context_get_display (gimp_get_user_context (private->gimp)) ==
+          GIMP_DISPLAY_SHELL (shell)->display)
+        {
+          gtk_widget_show (close_button);
+        }
+      else
+        {
+          gtk_widget_hide (close_button);
+        }
+    }
+
+  g_list_free (children);
+}
diff --git a/app/display/gimpimagewindow.h b/app/display/gimpimagewindow.h
new file mode 100644
index 0000000..121dc71
--- /dev/null
+++ b/app/display/gimpimagewindow.h
@@ -0,0 +1,100 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_WINDOW_H__
+#define __GIMP_IMAGE_WINDOW_H__
+
+
+#include "widgets/gimpwindow.h"
+
+
+#define GIMP_TYPE_IMAGE_WINDOW            (gimp_image_window_get_type ())
+#define GIMP_IMAGE_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_WINDOW, GimpImageWindow))
+#define GIMP_IMAGE_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_WINDOW, GimpImageWindowClass))
+#define GIMP_IS_IMAGE_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_WINDOW))
+#define GIMP_IS_IMAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_WINDOW))
+#define GIMP_IMAGE_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_WINDOW, GimpImageWindowClass))
+
+
+typedef struct _GimpImageWindowClass  GimpImageWindowClass;
+
+struct _GimpImageWindow
+{
+  GimpWindow  parent_instance;
+};
+
+struct _GimpImageWindowClass
+{
+  GimpWindowClass  parent_class;
+};
+
+
+GType              gimp_image_window_get_type             (void) G_GNUC_CONST;
+
+GimpImageWindow  * gimp_image_window_new                  (Gimp              *gimp,
+                                                           GimpImage         *image,
+                                                           GimpDialogFactory *dialog_factory,
+                                                           GdkScreen         *screen,
+                                                           gint               monitor);
+void               gimp_image_window_destroy              (GimpImageWindow   *window);
+
+GimpUIManager    * gimp_image_window_get_ui_manager       (GimpImageWindow  *window);
+GimpDockColumns  * gimp_image_window_get_left_docks       (GimpImageWindow  *window);
+GimpDockColumns  * gimp_image_window_get_right_docks      (GimpImageWindow  *window);
+
+void               gimp_image_window_add_shell            (GimpImageWindow  *window,
+                                                           GimpDisplayShell *shell);
+GimpDisplayShell * gimp_image_window_get_shell            (GimpImageWindow  *window,
+                                                           gint              index);
+void               gimp_image_window_remove_shell         (GimpImageWindow  *window,
+                                                           GimpDisplayShell *shell);
+
+gint               gimp_image_window_get_n_shells         (GimpImageWindow  *window);
+
+void               gimp_image_window_set_active_shell     (GimpImageWindow  *window,
+                                                           GimpDisplayShell *shell);
+GimpDisplayShell * gimp_image_window_get_active_shell     (GimpImageWindow  *window);
+
+void               gimp_image_window_set_fullscreen       (GimpImageWindow  *window,
+                                                           gboolean          fullscreen);
+gboolean           gimp_image_window_get_fullscreen       (GimpImageWindow  *window);
+
+void               gimp_image_window_set_show_menubar     (GimpImageWindow  *window,
+                                                           gboolean          show);
+gboolean           gimp_image_window_get_show_menubar     (GimpImageWindow  *window);
+
+void               gimp_image_window_set_show_statusbar   (GimpImageWindow  *window,
+                                                           gboolean          show);
+gboolean           gimp_image_window_get_show_statusbar   (GimpImageWindow  *window);
+
+gboolean           gimp_image_window_is_iconified         (GimpImageWindow  *window);
+gboolean           gimp_image_window_is_maximized         (GimpImageWindow  *window);
+
+gboolean           gimp_image_window_has_toolbox          (GimpImageWindow  *window);
+
+void               gimp_image_window_shrink_wrap          (GimpImageWindow  *window,
+                                                           gboolean          grow_only);
+
+GtkWidget        * gimp_image_window_get_default_dockbook (GimpImageWindow  *window);
+
+void               gimp_image_window_keep_canvas_pos      (GimpImageWindow  *window);
+void               gimp_image_window_suspend_keep_pos     (GimpImageWindow  *window);
+void               gimp_image_window_resume_keep_pos      (GimpImageWindow  *window);
+
+void               gimp_image_window_update_tabs          (GimpImageWindow  *window);
+
+#endif /* __GIMP_IMAGE_WINDOW_H__ */
diff --git a/app/display/gimpmotionbuffer.c b/app/display/gimpmotionbuffer.c
new file mode 100644
index 0000000..549f6f0
--- /dev/null
+++ b/app/display/gimpmotionbuffer.c
@@ -0,0 +1,594 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpcoords.h"
+#include "core/gimpcoords-interpolate.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpmotionbuffer.h"
+
+
+/* Velocity unit is screen pixels per millisecond we pass to tools as 1. */
+#define VELOCITY_UNIT        3.0
+#define EVENT_FILL_PRECISION 6.0
+#define DIRECTION_RADIUS     (1.0 / MAX (scale_x, scale_y))
+#define SMOOTH_FACTOR        0.3
+
+
+enum
+{
+  PROP_0
+};
+
+enum
+{
+  STROKE,
+  HOVER,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_motion_buffer_dispose             (GObject          *object);
+static void     gimp_motion_buffer_finalize            (GObject          *object);
+static void     gimp_motion_buffer_set_property        (GObject          *object,
+                                                        guint             property_id,
+                                                        const GValue     *value,
+                                                        GParamSpec       *pspec);
+static void     gimp_motion_buffer_get_property        (GObject          *object,
+                                                        guint             property_id,
+                                                        GValue           *value,
+                                                        GParamSpec       *pspec);
+
+static void     gimp_motion_buffer_push_event_history  (GimpMotionBuffer *buffer,
+                                                        const GimpCoords *coords);
+static void     gimp_motion_buffer_pop_event_queue     (GimpMotionBuffer *buffer,
+                                                        GimpCoords       *coords);
+
+static void     gimp_motion_buffer_interpolate_stroke  (GimpMotionBuffer *buffer,
+                                                        GimpCoords       *coords);
+static gboolean gimp_motion_buffer_event_queue_timeout (GimpMotionBuffer *buffer);
+
+
+G_DEFINE_TYPE (GimpMotionBuffer, gimp_motion_buffer, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_motion_buffer_parent_class
+
+static guint motion_buffer_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_motion_buffer_class_init (GimpMotionBufferClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  motion_buffer_signals[STROKE] =
+    g_signal_new ("stroke",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpMotionBufferClass, stroke),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER_UINT_FLAGS,
+                  G_TYPE_NONE, 3,
+                  G_TYPE_POINTER,
+                  G_TYPE_UINT,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  motion_buffer_signals[HOVER] =
+    g_signal_new ("hover",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpMotionBufferClass, hover),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER_FLAGS_BOOLEAN,
+                  G_TYPE_NONE, 3,
+                  G_TYPE_POINTER,
+                  GDK_TYPE_MODIFIER_TYPE,
+                  G_TYPE_BOOLEAN);
+
+  object_class->dispose      = gimp_motion_buffer_dispose;
+  object_class->finalize     = gimp_motion_buffer_finalize;
+  object_class->set_property = gimp_motion_buffer_set_property;
+  object_class->get_property = gimp_motion_buffer_get_property;
+}
+
+static void
+gimp_motion_buffer_init (GimpMotionBuffer *buffer)
+{
+  buffer->event_history = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+  buffer->event_queue   = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+}
+
+static void
+gimp_motion_buffer_dispose (GObject *object)
+{
+  GimpMotionBuffer *buffer = GIMP_MOTION_BUFFER (object);
+
+  if (buffer->event_delay_timeout)
+    {
+      g_source_remove (buffer->event_delay_timeout);
+      buffer->event_delay_timeout = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_motion_buffer_finalize (GObject *object)
+{
+  GimpMotionBuffer *buffer = GIMP_MOTION_BUFFER (object);
+
+  if (buffer->event_history)
+    {
+      g_array_free (buffer->event_history, TRUE);
+      buffer->event_history = NULL;
+    }
+
+  if (buffer->event_queue)
+    {
+      g_array_free (buffer->event_queue, TRUE);
+      buffer->event_queue = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_motion_buffer_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_motion_buffer_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GimpMotionBuffer *
+gimp_motion_buffer_new (void)
+{
+  return g_object_new (GIMP_TYPE_MOTION_BUFFER,
+                       NULL);
+}
+
+void
+gimp_motion_buffer_begin_stroke (GimpMotionBuffer *buffer,
+                                 guint32           time,
+                                 GimpCoords       *last_motion)
+{
+  g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
+  g_return_if_fail (last_motion != NULL);
+
+  buffer->last_read_motion_time = time;
+
+  *last_motion = buffer->last_coords;
+}
+
+void
+gimp_motion_buffer_end_stroke (GimpMotionBuffer *buffer)
+{
+  g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
+
+  if (buffer->event_delay_timeout)
+    {
+      g_source_remove (buffer->event_delay_timeout);
+      buffer->event_delay_timeout = 0;
+    }
+
+  gimp_motion_buffer_event_queue_timeout (buffer);
+}
+
+/**
+ * gimp_motion_buffer_motion_event:
+ * @buffer:
+ * @coords:
+ * @time:
+ * @event_fill:
+ *
+ * This function evaluates the event to decide if the change is big
+ * enough to need handling and returns FALSE, if change is less than
+ * set filter level taking a whole lot of load off any draw tools that
+ * have no use for these events anyway. If the event is seen fit at
+ * first look, it is evaluated for speed and smoothed.  Due to lousy
+ * time resolution of events pretty strong smoothing is applied to
+ * timestamps for sensible speed result. This function is also ideal
+ * for other event adjustment like pressure curve or calculating other
+ * derived dynamics factors like angular velocity calculation from
+ * tilt values, to allow for even more dynamic brushes. Calculated
+ * distance to last event is stored in GimpCoords because its a
+ * sideproduct of velocity calculation and is currently calculated in
+ * each tool. If they were to use this distance, more resources on
+ * recalculating the same value would be saved.
+ *
+ * Return value: %TRUE if the motion was significant enough to be
+ *               processed, %FALSE otherwise.
+ **/
+gboolean
+gimp_motion_buffer_motion_event (GimpMotionBuffer *buffer,
+                                 GimpCoords       *coords,
+                                 guint32           time,
+                                 gboolean          event_fill)
+{
+  gdouble  delta_time  = 0.001;
+  gdouble  delta_x     = 0.0;
+  gdouble  delta_y     = 0.0;
+  gdouble  distance    = 1.0;
+  gdouble  scale_x     = coords->xscale;
+  gdouble  scale_y     = coords->yscale;
+
+  g_return_val_if_fail (GIMP_IS_MOTION_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+
+  /*  the last_read_motion_time most be set unconditionally, so set
+   *  it early
+   */
+  buffer->last_read_motion_time = time;
+
+  delta_time = (buffer->last_motion_delta_time * (1 - SMOOTH_FACTOR) +
+                (time - buffer->last_motion_time) * SMOOTH_FACTOR);
+
+  if (buffer->last_motion_time == 0)
+    {
+      /*  First pair is invalid to do any velocity calculation, so we
+       *  apply a constant value.
+       */
+      coords->velocity = 1.0;
+    }
+  else
+    {
+      GimpCoords last_dir_event = buffer->last_coords;
+      gdouble    filter;
+      gdouble    dist;
+      gdouble    delta_dir;
+      gdouble    dir_delta_x = 0.0;
+      gdouble    dir_delta_y = 0.0;
+
+      delta_x = last_dir_event.x - coords->x;
+      delta_y = last_dir_event.y - coords->y;
+
+      /*  Events with distances less than the screen resolution are
+       *  not worth handling.
+       */
+      filter = MIN (1.0 / scale_x, 1.0 / scale_y) / 2.0;
+
+      if (fabs (delta_x) < filter &&
+          fabs (delta_y) < filter)
+        {
+          return FALSE;
+        }
+
+      distance = dist = sqrt (SQR (delta_x) + SQR (delta_y));
+
+      /*  If even smoothed time resolution does not allow to guess for
+       *  speed, use last velocity.
+       */
+      if (delta_time == 0)
+        {
+          coords->velocity = buffer->last_coords.velocity;
+        }
+      else
+        {
+          /*  We need to calculate the velocity in screen coordinates
+           *  for human interaction
+           */
+          gdouble screen_distance = (distance * MIN (scale_x, scale_y));
+
+          /* Calculate raw valocity */
+          coords->velocity = ((screen_distance / delta_time) / VELOCITY_UNIT);
+
+          /* Adding velocity dependent smoothing, feels better in tools. */
+          coords->velocity = (buffer->last_coords.velocity *
+                              (1 - MIN (SMOOTH_FACTOR, coords->velocity)) +
+                              coords->velocity *
+                              MIN (SMOOTH_FACTOR, coords->velocity));
+
+          /* Speed needs upper limit */
+          coords->velocity = MIN (coords->velocity, 1.0);
+        }
+
+      if (((fabs (delta_x) > DIRECTION_RADIUS) &&
+           (fabs (delta_y) > DIRECTION_RADIUS)) ||
+          (buffer->event_history->len < 4))
+        {
+          dir_delta_x = delta_x;
+          dir_delta_y = delta_y;
+        }
+      else
+        {
+          gint x = CLAMP ((buffer->event_history->len - 1), 3, 15);
+
+          while (((fabs (dir_delta_x) < DIRECTION_RADIUS) ||
+                  (fabs (dir_delta_y) < DIRECTION_RADIUS)) &&
+                 (x >= 0))
+            {
+              last_dir_event = g_array_index (buffer->event_history,
+                                              GimpCoords, x);
+
+              dir_delta_x = last_dir_event.x - coords->x;
+              dir_delta_y = last_dir_event.y - coords->y;
+
+              x--;
+            }
+        }
+
+      if ((fabs (dir_delta_x) < DIRECTION_RADIUS) ||
+          (fabs (dir_delta_y) < DIRECTION_RADIUS))
+        {
+          coords->direction = buffer->last_coords.direction;
+        }
+      else
+        {
+          coords->direction = gimp_coords_direction (&last_dir_event, coords);
+        }
+
+      coords->direction = coords->direction - floor (coords->direction);
+
+      delta_dir = coords->direction - buffer->last_coords.direction;
+
+      if (delta_dir < -0.5)
+        {
+          coords->direction = (0.5 * coords->direction +
+                               0.5 * (buffer->last_coords.direction - 1.0));
+        }
+      else if (delta_dir > 0.5)
+        {
+          coords->direction = (0.5 * coords->direction +
+                               0.5 * (buffer->last_coords.direction + 1.0));
+        }
+      else
+        {
+          coords->direction = (0.5 * coords->direction +
+                               0.5 * buffer->last_coords.direction);
+        }
+
+      coords->direction = coords->direction - floor (coords->direction);
+
+      /* do event fill for devices that do not provide enough events */
+      if (distance >= EVENT_FILL_PRECISION &&
+          event_fill                       &&
+          buffer->event_history->len >= 2)
+        {
+          if (buffer->event_delay)
+            {
+              gimp_motion_buffer_interpolate_stroke (buffer, coords);
+            }
+          else
+            {
+              buffer->event_delay = TRUE;
+              gimp_motion_buffer_push_event_history (buffer, coords);
+            }
+        }
+      else
+        {
+          if (buffer->event_delay)
+            buffer->event_delay = FALSE;
+
+          gimp_motion_buffer_push_event_history (buffer, coords);
+        }
+
+#ifdef EVENT_VERBOSE
+      g_printerr ("DIST: %f, DT:%f, Vel:%f, Press:%f,smooth_dd:%f, POS: (%f, %f)\n",
+                  distance,
+                  delta_time,
+                  buffer->last_coords.velocity,
+                  coords->pressure,
+                  distance - dist,
+                  coords->x,
+                  coords->y);
+#endif
+    }
+
+  g_array_append_val (buffer->event_queue, *coords);
+
+  buffer->last_coords            = *coords;
+  buffer->last_motion_time       = time;
+  buffer->last_motion_delta_time = delta_time;
+  buffer->last_motion_delta_x    = delta_x;
+  buffer->last_motion_delta_y    = delta_y;
+  buffer->last_motion_distance   = distance;
+
+  return TRUE;
+}
+
+guint32
+gimp_motion_buffer_get_last_motion_time (GimpMotionBuffer *buffer)
+{
+  g_return_val_if_fail (GIMP_IS_MOTION_BUFFER (buffer), 0);
+
+  return buffer->last_read_motion_time;
+}
+
+void
+gimp_motion_buffer_request_stroke (GimpMotionBuffer *buffer,
+                                   GdkModifierType   state,
+                                   guint32           time)
+{
+  GdkModifierType  event_state;
+  gint             keep = 0;
+
+  g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
+
+  if (buffer->event_delay)
+    {
+      /* If we are in delay we use LAST state, not current */
+      event_state = buffer->last_active_state;
+
+      keep = 1; /* Holding one event in buf */
+    }
+  else
+    {
+      /* Save the state */
+      event_state = state;
+    }
+
+  if (buffer->event_delay_timeout)
+    {
+      g_source_remove (buffer->event_delay_timeout);
+      buffer->event_delay_timeout = 0;
+    }
+
+  buffer->last_active_state = state;
+
+  while (buffer->event_queue->len > keep)
+    {
+      GimpCoords buf_coords;
+
+      gimp_motion_buffer_pop_event_queue (buffer, &buf_coords);
+
+      g_signal_emit (buffer, motion_buffer_signals[STROKE], 0,
+                     &buf_coords, time, event_state);
+    }
+
+  if (buffer->event_delay)
+    {
+      buffer->event_delay_timeout =
+        g_timeout_add (50,
+                       (GSourceFunc) gimp_motion_buffer_event_queue_timeout,
+                       buffer);
+    }
+}
+
+void
+gimp_motion_buffer_request_hover (GimpMotionBuffer *buffer,
+                                  GdkModifierType   state,
+                                  gboolean          proximity)
+{
+  g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
+
+  if (buffer->event_queue->len > 0)
+    {
+      GimpCoords buf_coords = g_array_index (buffer->event_queue,
+                                             GimpCoords,
+                                             buffer->event_queue->len - 1);
+
+      g_signal_emit (buffer, motion_buffer_signals[HOVER], 0,
+                     &buf_coords, state, proximity);
+
+      g_array_set_size (buffer->event_queue, 0);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_motion_buffer_push_event_history (GimpMotionBuffer *buffer,
+                                       const GimpCoords *coords)
+{
+  if (buffer->event_history->len == 4)
+    g_array_remove_index (buffer->event_history, 0);
+
+  g_array_append_val (buffer->event_history, *coords);
+}
+
+static void
+gimp_motion_buffer_pop_event_queue (GimpMotionBuffer *buffer,
+                                    GimpCoords       *coords)
+{
+  *coords = g_array_index (buffer->event_queue, GimpCoords, 0);
+
+  g_array_remove_index (buffer->event_queue, 0);
+}
+
+static void
+gimp_motion_buffer_interpolate_stroke (GimpMotionBuffer *buffer,
+                                       GimpCoords       *coords)
+{
+  GimpCoords  catmull[4];
+  GArray     *ret_coords;
+  gint        i = buffer->event_history->len - 1;
+
+  /* Note that there must be exactly one event in buffer or bad things
+   * can happen. This must never get called under other circumstances.
+   */
+  ret_coords = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+
+  catmull[0] = g_array_index (buffer->event_history, GimpCoords, i - 1);
+  catmull[1] = g_array_index (buffer->event_history, GimpCoords, i);
+  catmull[2] = g_array_index (buffer->event_queue,   GimpCoords, 0);
+  catmull[3] = *coords;
+
+  gimp_coords_interpolate_catmull (catmull, EVENT_FILL_PRECISION / 2,
+                                   ret_coords, NULL);
+
+  /* Push the last actual event in history */
+  gimp_motion_buffer_push_event_history (buffer,
+                                         &g_array_index (buffer->event_queue,
+                                                         GimpCoords, 0));
+
+  g_array_set_size (buffer->event_queue, 0);
+
+  g_array_append_vals (buffer->event_queue,
+                       &g_array_index (ret_coords, GimpCoords, 0),
+                       ret_coords->len);
+
+  g_array_free (ret_coords, TRUE);
+}
+
+static gboolean
+gimp_motion_buffer_event_queue_timeout (GimpMotionBuffer *buffer)
+{
+  buffer->event_delay         = FALSE;
+  buffer->event_delay_timeout = 0;
+
+  if (buffer->event_queue->len > 0)
+    {
+      GimpCoords last_coords = g_array_index (buffer->event_queue,
+                                              GimpCoords,
+                                              buffer->event_queue->len - 1);
+
+      gimp_motion_buffer_push_event_history (buffer, &last_coords);
+
+      gimp_motion_buffer_request_stroke (buffer,
+                                         buffer->last_active_state,
+                                         buffer->last_read_motion_time);
+    }
+
+  return FALSE;
+}
diff --git a/app/display/gimpmotionbuffer.h b/app/display/gimpmotionbuffer.h
new file mode 100644
index 0000000..c7aee64
--- /dev/null
+++ b/app/display/gimpmotionbuffer.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmotionbuffer.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MOTION_BUFFER_H__
+#define __GIMP_MOTION_BUFFER_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_MOTION_BUFFER            (gimp_motion_buffer_get_type ())
+#define GIMP_MOTION_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MOTION_BUFFER, GimpMotionBuffer))
+#define GIMP_MOTION_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MOTION_BUFFER, GimpMotionBufferClass))
+#define GIMP_IS_MOTION_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MOTION_BUFFER))
+#define GIMP_IS_MOTION_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MOTION_BUFFER))
+#define GIMP_MOTION_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MOTION_BUFFER, GimpMotionBufferClass))
+
+
+typedef struct _GimpMotionBufferClass GimpMotionBufferClass;
+
+struct _GimpMotionBuffer
+{
+  GimpObject  parent_instance;
+
+  guint32     last_read_motion_time;
+
+  guint32     last_motion_time; /*  previous time of a forwarded motion event  */
+  gdouble     last_motion_delta_time;
+  gdouble     last_motion_delta_x;
+  gdouble     last_motion_delta_y;
+  gdouble     last_motion_distance;
+
+  GimpCoords  last_coords;      /* last motion event                   */
+
+  GArray     *event_history;
+  GArray     *event_queue;
+  gboolean    event_delay;      /* TRUE if there's an unsent event in
+                                 *  the history buffer
+                                 */
+
+  gint               event_delay_timeout;
+  GdkModifierType    last_active_state;
+};
+
+struct _GimpMotionBufferClass
+{
+  GimpObjectClass  parent_class;
+
+  void (* stroke) (GimpMotionBuffer *buffer,
+                   const GimpCoords *coords,
+                   guint32           time,
+                   GdkModifierType   state);
+  void (* hover)  (GimpMotionBuffer *buffer,
+                   const GimpCoords *coords,
+                   GdkModifierType   state,
+                   gboolean          proximity);
+};
+
+
+GType              gimp_motion_buffer_get_type     (void) G_GNUC_CONST;
+
+GimpMotionBuffer * gimp_motion_buffer_new          (void);
+
+void       gimp_motion_buffer_begin_stroke         (GimpMotionBuffer *buffer,
+                                                    guint32           time,
+                                                    GimpCoords       *last_motion);
+void       gimp_motion_buffer_end_stroke           (GimpMotionBuffer *buffer);
+
+gboolean   gimp_motion_buffer_motion_event         (GimpMotionBuffer *buffer,
+                                                    GimpCoords       *coords,
+                                                    guint32           time,
+                                                    gboolean          event_fill);
+guint32    gimp_motion_buffer_get_last_motion_time (GimpMotionBuffer *buffer);
+
+void       gimp_motion_buffer_request_stroke       (GimpMotionBuffer *buffer,
+                                                    GdkModifierType   state,
+                                                    guint32           time);
+void       gimp_motion_buffer_request_hover        (GimpMotionBuffer *buffer,
+                                                    GdkModifierType   state,
+                                                    gboolean          proximity);
+
+
+#endif /* __GIMP_MOTION_BUFFER_H__ */
diff --git a/app/display/gimpmultiwindowstrategy.c b/app/display/gimpmultiwindowstrategy.c
new file mode 100644
index 0000000..ca5cb22
--- /dev/null
+++ b/app/display/gimpmultiwindowstrategy.c
@@ -0,0 +1,89 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmultiwindowstrategy.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "gimpmultiwindowstrategy.h"
+
+
+static void        gimp_multi_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface);
+static GtkWidget * gimp_multi_window_strategy_show_dockable_dialog       (GimpWindowStrategy          *strategy,
+                                                                          Gimp                        *gimp,
+                                                                          GimpDialogFactory           *factory,
+                                                                          GdkScreen                   *screen,
+                                                                          gint                         monitor,
+                                                                          const gchar                 *identifiers);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpMultiWindowStrategy, gimp_multi_window_strategy, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_WINDOW_STRATEGY,
+                                                gimp_multi_window_strategy_window_strategy_iface_init))
+
+#define parent_class gimp_multi_window_strategy_parent_class
+
+
+static void
+gimp_multi_window_strategy_class_init (GimpMultiWindowStrategyClass *klass)
+{
+}
+
+static void
+gimp_multi_window_strategy_init (GimpMultiWindowStrategy *strategy)
+{
+}
+
+static void
+gimp_multi_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface)
+{
+  iface->show_dockable_dialog = gimp_multi_window_strategy_show_dockable_dialog;
+}
+
+static GtkWidget *
+gimp_multi_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
+                                                 Gimp               *gimp,
+                                                 GimpDialogFactory  *factory,
+                                                 GdkScreen          *screen,
+                                                 gint                monitor,
+                                                 const gchar        *identifiers)
+{
+  return gimp_dialog_factory_dialog_raise (factory, screen, monitor,
+                                           identifiers, -1);
+}
+
+GimpObject *
+gimp_multi_window_strategy_get_singleton (void)
+{
+  static GimpObject *singleton = NULL;
+
+  if (! singleton)
+    singleton = g_object_new (GIMP_TYPE_MULTI_WINDOW_STRATEGY, NULL);
+
+  return singleton;
+}
diff --git a/app/display/gimpmultiwindowstrategy.h b/app/display/gimpmultiwindowstrategy.h
new file mode 100644
index 0000000..4df8873
--- /dev/null
+++ b/app/display/gimpmultiwindowstrategy.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmultiwindowstrategy.h
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MULTI_WINDOW_STRATEGY_H__
+#define __GIMP_MULTI_WINDOW_STRATEGY_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_MULTI_WINDOW_STRATEGY            (gimp_multi_window_strategy_get_type ())
+#define GIMP_MULTI_WINDOW_STRATEGY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MULTI_WINDOW_STRATEGY, GimpMultiWindowStrategy))
+#define GIMP_MULTI_WINDOW_STRATEGY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MULTI_WINDOW_STRATEGY, GimpMultiWindowStrategyClass))
+#define GIMP_IS_MULTI_WINDOW_STRATEGY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MULTI_WINDOW_STRATEGY))
+#define GIMP_IS_MULTI_WINDOW_STRATEGY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MULTI_WINDOW_STRATEGY))
+#define GIMP_MULTI_WINDOW_STRATEGY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MULTI_WINDOW_STRATEGY, GimpMultiWindowStrategyClass))
+
+
+typedef struct _GimpMultiWindowStrategyClass GimpMultiWindowStrategyClass;
+
+struct _GimpMultiWindowStrategy
+{
+  GimpObject  parent_instance;
+};
+
+struct _GimpMultiWindowStrategyClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType        gimp_multi_window_strategy_get_type          (void) G_GNUC_CONST;
+
+GimpObject * gimp_multi_window_strategy_get_singleton     (void);
+
+
+#endif /* __GIMP_MULTI_WINDOW_STRATEGY_H__ */
diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c
new file mode 100644
index 0000000..a518882
--- /dev/null
+++ b/app/display/gimpnavigationeditor.c
@@ -0,0 +1,890 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpnavigationeditor.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * partly based on app/nav_window
+ * Copyright (C) 1999 Andy Thomas <alt@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimageproxy.h"
+
+#include "widgets/gimpdocked.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpnavigationview.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpviewrenderer.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpnavigationeditor.h"
+
+#include "gimp-intl.h"
+
+
+#define UPDATE_DELAY 300 /* From GtkRange in GTK+ 2.22 */
+
+
+static void        gimp_navigation_editor_docked_iface_init            (GimpDockedInterface  *iface);
+
+static void        gimp_navigation_editor_dispose                      (GObject              *object);
+
+static void        gimp_navigation_editor_set_context                  (GimpDocked           *docked,
+                                                                        GimpContext          *context);
+
+static GtkWidget * gimp_navigation_editor_new_private                  (GimpMenuFactory      *menu_factory,
+                                                                        GimpDisplayShell     *shell);
+
+static void        gimp_navigation_editor_set_shell                    (GimpNavigationEditor *editor,
+                                                                        GimpDisplayShell     *shell);
+static gboolean    gimp_navigation_editor_button_release               (GtkWidget            *widget,
+                                                                        GdkEventButton       *bevent,
+                                                                        GimpDisplayShell     *shell);
+static void        gimp_navigation_editor_marker_changed               (GimpNavigationView   *view,
+                                                                        gdouble               center_x,
+                                                                        gdouble               center_y,
+                                                                        gdouble               width,
+                                                                        gdouble               height,
+                                                                        GimpNavigationEditor *editor);
+static void        gimp_navigation_editor_zoom                         (GimpNavigationView   *view,
+                                                                        GimpZoomType          direction,
+                                                                        GimpNavigationEditor *editor);
+static void        gimp_navigation_editor_scroll                       (GimpNavigationView   *view,
+                                                                        GdkScrollDirection    direction,
+                                                                        GimpNavigationEditor *editor);
+
+static void        gimp_navigation_editor_zoom_adj_changed             (GtkAdjustment        *adj,
+                                                                        GimpNavigationEditor *editor);
+
+static void        gimp_navigation_editor_shell_infinite_canvas_notify (GimpDisplayShell     *shell,
+                                                                        const GParamSpec     *pspec,
+                                                                        GimpNavigationEditor *editor);
+static void        gimp_navigation_editor_shell_scaled                 (GimpDisplayShell     *shell,
+                                                                        GimpNavigationEditor *editor);
+static void        gimp_navigation_editor_shell_scrolled               (GimpDisplayShell     *shell,
+                                                                        GimpNavigationEditor *editor);
+static void        gimp_navigation_editor_shell_rotated                (GimpDisplayShell     *shell,
+                                                                        GimpNavigationEditor *editor);
+static void        gimp_navigation_editor_shell_reconnect              (GimpDisplayShell     *shell,
+                                                                        GimpNavigationEditor *editor);
+
+static void        gimp_navigation_editor_viewable_size_changed        (GimpViewable         *viewable,
+                                                                        GimpNavigationEditor *editor);
+
+static void        gimp_navigation_editor_options_show_canvas_notify   (GimpDisplayOptions   *options,
+                                                                        const GParamSpec     *pspec,
+                                                                        GimpNavigationEditor *editor);
+
+static void        gimp_navigation_editor_update_marker                (GimpNavigationEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpNavigationEditor, gimp_navigation_editor,
+                         GIMP_TYPE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_navigation_editor_docked_iface_init))
+
+#define parent_class gimp_navigation_editor_parent_class
+
+
+static void
+gimp_navigation_editor_class_init (GimpNavigationEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_navigation_editor_dispose;
+}
+
+static void
+gimp_navigation_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  iface->set_context = gimp_navigation_editor_set_context;
+}
+
+static void
+gimp_navigation_editor_init (GimpNavigationEditor *editor)
+{
+  GtkWidget *frame;
+
+  editor->context       = NULL;
+  editor->shell         = NULL;
+  editor->scale_timeout = 0;
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  editor->view = gimp_view_new_by_types (NULL,
+                                         GIMP_TYPE_NAVIGATION_VIEW,
+                                         GIMP_TYPE_IMAGE_PROXY,
+                                         GIMP_VIEW_SIZE_MEDIUM, 0, TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), editor->view);
+  gtk_widget_show (editor->view);
+
+  g_signal_connect (editor->view, "marker-changed",
+                    G_CALLBACK (gimp_navigation_editor_marker_changed),
+                    editor);
+  g_signal_connect (editor->view, "zoom",
+                    G_CALLBACK (gimp_navigation_editor_zoom),
+                    editor);
+  g_signal_connect (editor->view, "scroll",
+                    G_CALLBACK (gimp_navigation_editor_scroll),
+                    editor);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+}
+
+static void
+gimp_navigation_editor_dispose (GObject *object)
+{
+  GimpNavigationEditor *editor = GIMP_NAVIGATION_EDITOR (object);
+
+  if (editor->shell)
+    gimp_navigation_editor_set_shell (editor, NULL);
+
+  if (editor->scale_timeout)
+    {
+      g_source_remove (editor->scale_timeout);
+      editor->scale_timeout = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_navigation_editor_display_changed (GimpContext          *context,
+                                        GimpDisplay          *display,
+                                        GimpNavigationEditor *editor)
+{
+  GimpDisplayShell *shell = NULL;
+
+  if (display && gimp_display_get_image (display))
+    shell = gimp_display_get_shell (display);
+
+  gimp_navigation_editor_set_shell (editor, shell);
+}
+
+static void
+gimp_navigation_editor_image_chaged (GimpContext          *context,
+                                     GimpImage            *image,
+                                     GimpNavigationEditor *editor)
+{
+  GimpDisplay      *display = gimp_context_get_display (context);
+  GimpDisplayShell *shell   = NULL;
+
+  if (display && image)
+    shell = gimp_display_get_shell (display);
+
+  gimp_navigation_editor_set_shell (editor, shell);
+}
+
+static void
+gimp_navigation_editor_set_context (GimpDocked  *docked,
+                                    GimpContext *context)
+{
+  GimpNavigationEditor *editor  = GIMP_NAVIGATION_EDITOR (docked);
+  GimpDisplay          *display = NULL;
+
+  if (editor->context)
+    {
+      g_signal_handlers_disconnect_by_func (editor->context,
+                                            gimp_navigation_editor_display_changed,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->context,
+                                            gimp_navigation_editor_image_chaged,
+                                            editor);
+    }
+
+  editor->context = context;
+
+  if (editor->context)
+    {
+      g_signal_connect (context, "display-changed",
+                        G_CALLBACK (gimp_navigation_editor_display_changed),
+                        editor);
+      /* make sure to also call gimp_navigation_editor_set_shell() when the
+       * last image is closed, even though the display isn't changed, so that
+       * the editor is properly cleared.
+       */
+      g_signal_connect (context, "image-changed",
+                        G_CALLBACK (gimp_navigation_editor_image_chaged),
+                        editor);
+
+      display = gimp_context_get_display (context);
+    }
+
+  gimp_view_renderer_set_context (GIMP_VIEW (editor->view)->renderer,
+                                  context);
+
+  gimp_navigation_editor_display_changed (editor->context,
+                                          display,
+                                          editor);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_navigation_editor_new (GimpMenuFactory *menu_factory)
+{
+  return gimp_navigation_editor_new_private (menu_factory, NULL);
+}
+
+void
+gimp_navigation_editor_popup (GimpDisplayShell *shell,
+                              GtkWidget        *widget,
+                              gint              click_x,
+                              gint              click_y)
+{
+  GtkStyle             *style = gtk_widget_get_style (widget);
+  GimpNavigationEditor *editor;
+  GimpNavigationView   *view;
+  GdkScreen            *screen;
+  gint                  x, y;
+  gint                  view_marker_center_x, view_marker_center_y;
+  gint                  view_marker_width, view_marker_height;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (! shell->nav_popup)
+    {
+      GtkWidget *frame;
+
+      shell->nav_popup = gtk_window_new (GTK_WINDOW_POPUP);
+
+      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+      gtk_container_add (GTK_CONTAINER (shell->nav_popup), frame);
+      gtk_widget_show (frame);
+
+      editor =
+        GIMP_NAVIGATION_EDITOR (gimp_navigation_editor_new_private (NULL,
+                                                                    shell));
+      gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (editor));
+      gtk_widget_show (GTK_WIDGET (editor));
+
+      g_signal_connect (editor->view, "button-release-event",
+                        G_CALLBACK (gimp_navigation_editor_button_release),
+                        shell);
+    }
+  else
+    {
+      GtkWidget *bin = gtk_bin_get_child (GTK_BIN (shell->nav_popup));
+
+      editor = GIMP_NAVIGATION_EDITOR (gtk_bin_get_child (GTK_BIN (bin)));
+    }
+
+  view = GIMP_NAVIGATION_VIEW (editor->view);
+
+  /* Set poup screen */
+  screen = gtk_widget_get_screen (widget);
+  gtk_window_set_screen (GTK_WINDOW (shell->nav_popup), screen);
+
+  gimp_navigation_view_get_local_marker (view,
+                                         &view_marker_center_x,
+                                         &view_marker_center_y,
+                                         &view_marker_width,
+                                         &view_marker_height);
+  /* Position the popup */
+  {
+    gint x_origin, y_origin;
+    gint popup_width, popup_height;
+    gint border_width, border_height;
+    gint screen_click_x, screen_click_y;
+
+    gdk_window_get_origin (gtk_widget_get_window (widget),
+                           &x_origin, &y_origin);
+
+    screen_click_x = x_origin + click_x;
+    screen_click_y = y_origin + click_y;
+    border_width   = 2 * style->xthickness;
+    border_height  = 2 * style->ythickness;
+    popup_width    = GIMP_VIEW (view)->renderer->width  - 2 * border_width;
+    popup_height   = GIMP_VIEW (view)->renderer->height - 2 * border_height;
+
+    x = screen_click_x -
+        border_width -
+        view_marker_center_x;
+
+    y = screen_click_y -
+        border_height -
+        view_marker_center_y;
+
+    /* When the image is zoomed out and overscrolled, the above
+     * calculation risks positioning the popup far far away from the
+     * click coordinate. We don't want that, so perform some clamping.
+     */
+    x = CLAMP (x, screen_click_x - popup_width,  screen_click_x);
+    y = CLAMP (y, screen_click_y - popup_height, screen_click_y);
+
+    /* If the popup doesn't fit into the screen, we have a problem.
+     * We move the popup onscreen and risk that the pointer is not
+     * in the square representing the viewable area anymore. Moving
+     * the pointer will make the image scroll by a large amount,
+     * but then it works as usual. Probably better than a popup that
+     * is completely unusable in the lower right of the screen.
+     *
+     * Warping the pointer would be another solution ...
+     */
+    x = CLAMP (x, 0, gdk_screen_get_width (screen)  - popup_width);
+    y = CLAMP (y, 0, gdk_screen_get_height (screen) - popup_height);
+
+    gtk_window_move (GTK_WINDOW (shell->nav_popup), x, y);
+  }
+
+  gtk_widget_show (shell->nav_popup);
+  gdk_flush ();
+
+  /* fill in then grab pointer */
+  gimp_navigation_view_set_motion_offset (view, 0, 0);
+  gimp_navigation_view_grab_pointer (view);
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+gimp_navigation_editor_new_private (GimpMenuFactory  *menu_factory,
+                                    GimpDisplayShell *shell)
+{
+  GimpNavigationEditor *editor;
+
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (shell == NULL || GIMP_IS_DISPLAY_SHELL (shell), NULL);
+  g_return_val_if_fail (menu_factory || shell, NULL);
+
+  if (shell)
+    {
+      Gimp              *gimp   = shell->display->gimp;
+      GimpDisplayConfig *config = shell->display->config;
+      GimpView          *view;
+
+      editor = g_object_new (GIMP_TYPE_NAVIGATION_EDITOR, NULL);
+
+      view = GIMP_VIEW (editor->view);
+
+      gimp_view_renderer_set_size (view->renderer,
+                                   config->nav_preview_size * 3,
+                                   view->renderer->border_width);
+      gimp_view_renderer_set_context (view->renderer,
+                                      gimp_get_user_context (gimp));
+      gimp_view_renderer_set_color_config (view->renderer,
+                                           gimp_display_shell_get_color_config (shell));
+
+      gimp_navigation_editor_set_shell (editor, shell);
+
+    }
+  else
+    {
+      GtkWidget *hscale;
+      GtkWidget *hbox;
+
+      editor = g_object_new (GIMP_TYPE_NAVIGATION_EDITOR,
+                             "menu-factory",    menu_factory,
+                             "menu-identifier", "<NavigationEditor>",
+                             NULL);
+
+      gtk_widget_set_size_request (editor->view,
+                                   GIMP_VIEW_SIZE_HUGE,
+                                   GIMP_VIEW_SIZE_HUGE);
+      gimp_view_set_expand (GIMP_VIEW (editor->view), TRUE);
+
+      /* the editor buttons */
+
+      editor->zoom_out_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
+                                       "view-zoom-out", NULL);
+
+      editor->zoom_in_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
+                                       "view-zoom-in", NULL);
+
+      editor->zoom_100_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
+                                       "view-zoom-1-1", NULL);
+
+      editor->zoom_fit_in_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
+                                       "view-zoom-fit-in", NULL);
+
+      editor->zoom_fill_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
+                                       "view-zoom-fill", NULL);
+
+      editor->shrink_wrap_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
+                                       "view-shrink-wrap", NULL);
+
+      /* the zoom scale */
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_end (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      editor->zoom_adjustment =
+        GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -8.0, 8.0, 0.5, 1.0, 0.0));
+
+      g_signal_connect (editor->zoom_adjustment, "value-changed",
+                        G_CALLBACK (gimp_navigation_editor_zoom_adj_changed),
+                        editor);
+
+      hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
+                              editor->zoom_adjustment);
+      gtk_scale_set_draw_value (GTK_SCALE (hscale), FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
+      gtk_widget_show (hscale);
+
+      /* the zoom label */
+
+      editor->zoom_label = gtk_label_new ("100%");
+      gtk_label_set_width_chars (GTK_LABEL (editor->zoom_label), 7);
+      gtk_box_pack_start (GTK_BOX (hbox), editor->zoom_label, FALSE, FALSE, 0);
+      gtk_widget_show (editor->zoom_label);
+    }
+
+  gimp_view_renderer_set_background (GIMP_VIEW (editor->view)->renderer,
+                                     GIMP_ICON_TEXTURE);
+
+  return GTK_WIDGET (editor);
+}
+
+static void
+gimp_navigation_editor_set_shell (GimpNavigationEditor *editor,
+                                  GimpDisplayShell     *shell)
+{
+  g_return_if_fail (GIMP_IS_NAVIGATION_EDITOR (editor));
+  g_return_if_fail (! shell || GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell == editor->shell)
+    return;
+
+  if (editor->shell)
+    {
+      g_signal_handlers_disconnect_by_func (editor->shell,
+                                            gimp_navigation_editor_shell_infinite_canvas_notify,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->shell,
+                                            gimp_navigation_editor_shell_scaled,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->shell,
+                                            gimp_navigation_editor_shell_scrolled,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->shell,
+                                            gimp_navigation_editor_shell_rotated,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->shell,
+                                            gimp_navigation_editor_shell_reconnect,
+                                            editor);
+
+      g_signal_handlers_disconnect_by_func (editor->shell->options,
+                                            gimp_navigation_editor_options_show_canvas_notify,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->shell->fullscreen_options,
+                                            gimp_navigation_editor_options_show_canvas_notify,
+                                            editor);
+    }
+  else if (shell)
+    {
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+    }
+
+  editor->shell = shell;
+
+  if (editor->shell)
+    {
+      GimpImage *image = gimp_display_get_image (shell->display);
+
+      g_clear_object (&editor->image_proxy);
+
+      if (image)
+        {
+          editor->image_proxy = gimp_image_proxy_new (image);
+
+          g_signal_connect (
+            editor->image_proxy, "size-changed",
+            G_CALLBACK (gimp_navigation_editor_viewable_size_changed),
+            editor);
+        }
+
+      gimp_view_set_viewable (GIMP_VIEW (editor->view),
+                              GIMP_VIEWABLE (editor->image_proxy));
+
+      g_signal_connect (editor->shell, "notify::infinite-canvas",
+                        G_CALLBACK (gimp_navigation_editor_shell_infinite_canvas_notify),
+                        editor);
+      g_signal_connect (editor->shell, "scaled",
+                        G_CALLBACK (gimp_navigation_editor_shell_scaled),
+                        editor);
+      g_signal_connect (editor->shell, "scrolled",
+                        G_CALLBACK (gimp_navigation_editor_shell_scrolled),
+                        editor);
+      g_signal_connect (editor->shell, "rotated",
+                        G_CALLBACK (gimp_navigation_editor_shell_rotated),
+                        editor);
+      g_signal_connect (editor->shell, "reconnect",
+                        G_CALLBACK (gimp_navigation_editor_shell_reconnect),
+                        editor);
+
+      g_signal_connect (editor->shell->options, "notify::show-canvas-boundary",
+                        G_CALLBACK (gimp_navigation_editor_options_show_canvas_notify),
+                        editor);
+      g_signal_connect (editor->shell->fullscreen_options, "notify::show-canvas-boundary",
+                        G_CALLBACK (gimp_navigation_editor_options_show_canvas_notify),
+                        editor);
+
+      gimp_navigation_editor_shell_scaled (editor->shell, editor);
+    }
+  else
+    {
+      gimp_view_set_viewable (GIMP_VIEW (editor->view), NULL);
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+
+      g_clear_object (&editor->image_proxy);
+    }
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static gboolean
+gimp_navigation_editor_button_release (GtkWidget        *widget,
+                                       GdkEventButton   *bevent,
+                                       GimpDisplayShell *shell)
+{
+  if (bevent->button == 1)
+    {
+      gtk_widget_hide (shell->nav_popup);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_navigation_editor_marker_changed (GimpNavigationView   *view,
+                                       gdouble               center_x,
+                                       gdouble               center_y,
+                                       gdouble               width,
+                                       gdouble               height,
+                                       GimpNavigationEditor *editor)
+{
+  GimpViewRenderer *renderer = GIMP_VIEW (editor->view)->renderer;
+
+  if (editor->shell)
+    {
+      if (gimp_display_get_image (editor->shell->display))
+        {
+          GeglRectangle bounding_box;
+
+          bounding_box = gimp_image_proxy_get_bounding_box (
+            GIMP_IMAGE_PROXY (renderer->viewable));
+
+          center_x += bounding_box.x;
+          center_y += bounding_box.y;
+
+          gimp_display_shell_scroll_center_image_xy (editor->shell,
+                                                     center_x, center_y);
+        }
+    }
+}
+
+static void
+gimp_navigation_editor_zoom (GimpNavigationView   *view,
+                             GimpZoomType          direction,
+                             GimpNavigationEditor *editor)
+{
+  g_return_if_fail (direction != GIMP_ZOOM_TO);
+
+  if (editor->shell)
+    {
+      if (gimp_display_get_image (editor->shell->display))
+        gimp_display_shell_scale (editor->shell,
+                                  direction,
+                                  0.0,
+                                  GIMP_ZOOM_FOCUS_BEST_GUESS);
+    }
+}
+
+static void
+gimp_navigation_editor_scroll (GimpNavigationView   *view,
+                               GdkScrollDirection    direction,
+                               GimpNavigationEditor *editor)
+{
+  if (editor->shell)
+    {
+      GtkAdjustment *adj = NULL;
+      gdouble        value;
+
+      switch (direction)
+        {
+        case GDK_SCROLL_LEFT:
+        case GDK_SCROLL_RIGHT:
+          adj = editor->shell->hsbdata;
+          break;
+
+        case GDK_SCROLL_UP:
+        case GDK_SCROLL_DOWN:
+          adj = editor->shell->vsbdata;
+          break;
+        }
+
+      gimp_assert (adj != NULL);
+
+      value = gtk_adjustment_get_value (adj);
+
+      switch (direction)
+        {
+        case GDK_SCROLL_LEFT:
+        case GDK_SCROLL_UP:
+          value -= gtk_adjustment_get_page_increment (adj) / 2;
+          break;
+
+        case GDK_SCROLL_RIGHT:
+        case GDK_SCROLL_DOWN:
+          value += gtk_adjustment_get_page_increment (adj) / 2;
+          break;
+        }
+
+      value = CLAMP (value,
+                     gtk_adjustment_get_lower (adj),
+                     gtk_adjustment_get_upper (adj) -
+                     gtk_adjustment_get_page_size (adj));
+
+      gtk_adjustment_set_value (adj, value);
+    }
+}
+
+static gboolean
+gimp_navigation_editor_zoom_adj_changed_timeout (gpointer data)
+{
+  GimpNavigationEditor *editor = GIMP_NAVIGATION_EDITOR (data);
+  GtkAdjustment        *adj    = editor->zoom_adjustment;
+
+  if (gimp_display_get_image (editor->shell->display))
+    gimp_display_shell_scale (editor->shell,
+                              GIMP_ZOOM_TO,
+                              pow (2.0, gtk_adjustment_get_value (adj)),
+                              GIMP_ZOOM_FOCUS_BEST_GUESS);
+
+  editor->scale_timeout = 0;
+
+  return FALSE;
+}
+
+static void
+gimp_navigation_editor_zoom_adj_changed (GtkAdjustment        *adj,
+                                         GimpNavigationEditor *editor)
+{
+  if (editor->scale_timeout)
+    g_source_remove (editor->scale_timeout);
+
+  editor->scale_timeout =
+    g_timeout_add (UPDATE_DELAY,
+                   gimp_navigation_editor_zoom_adj_changed_timeout,
+                   editor);
+}
+
+static void
+gimp_navigation_editor_shell_infinite_canvas_notify (GimpDisplayShell     *shell,
+                                                     const GParamSpec     *pspec,
+                                                     GimpNavigationEditor *editor)
+{
+  gimp_navigation_editor_update_marker (editor);
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static void
+gimp_navigation_editor_shell_scaled (GimpDisplayShell     *shell,
+                                     GimpNavigationEditor *editor)
+{
+  if (editor->zoom_label)
+    {
+      gchar *str;
+
+      g_object_get (shell->zoom,
+                    "percentage", &str,
+                    NULL);
+      gtk_label_set_text (GTK_LABEL (editor->zoom_label), str);
+      g_free (str);
+    }
+
+  if (editor->zoom_adjustment)
+    {
+      gdouble val;
+
+      val = log (gimp_zoom_model_get_factor (shell->zoom)) / G_LN2;
+
+      g_signal_handlers_block_by_func (editor->zoom_adjustment,
+                                       gimp_navigation_editor_zoom_adj_changed,
+                                       editor);
+
+      gtk_adjustment_set_value (editor->zoom_adjustment, val);
+
+      g_signal_handlers_unblock_by_func (editor->zoom_adjustment,
+                                         gimp_navigation_editor_zoom_adj_changed,
+                                         editor);
+    }
+
+  gimp_navigation_editor_update_marker (editor);
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static void
+gimp_navigation_editor_shell_scrolled (GimpDisplayShell     *shell,
+                                       GimpNavigationEditor *editor)
+{
+  gimp_navigation_editor_update_marker (editor);
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static void
+gimp_navigation_editor_shell_rotated (GimpDisplayShell     *shell,
+                                      GimpNavigationEditor *editor)
+{
+  gimp_navigation_editor_update_marker (editor);
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static void
+gimp_navigation_editor_viewable_size_changed (GimpViewable         *viewable,
+                                              GimpNavigationEditor *editor)
+{
+  gimp_navigation_editor_update_marker (editor);
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static void
+gimp_navigation_editor_options_show_canvas_notify (GimpDisplayOptions   *options,
+                                                   const GParamSpec     *pspec,
+                                                   GimpNavigationEditor *editor)
+{
+  gimp_navigation_editor_update_marker (editor);
+}
+
+static void
+gimp_navigation_editor_shell_reconnect (GimpDisplayShell     *shell,
+                                        GimpNavigationEditor *editor)
+{
+  GimpImage *image = gimp_display_get_image (shell->display);
+
+  g_clear_object (&editor->image_proxy);
+
+  if (image)
+    {
+      editor->image_proxy = gimp_image_proxy_new (image);
+
+      g_signal_connect (
+        editor->image_proxy, "size-changed",
+        G_CALLBACK (gimp_navigation_editor_viewable_size_changed),
+        editor);
+    }
+
+  gimp_view_set_viewable (GIMP_VIEW (editor->view),
+                          GIMP_VIEWABLE (editor->image_proxy));
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
+
+static void
+gimp_navigation_editor_update_marker (GimpNavigationEditor *editor)
+{
+  GimpViewRenderer *renderer = GIMP_VIEW (editor->view)->renderer;
+  GimpDisplayShell *shell    = editor->shell;
+
+  if (renderer->dot_for_dot != shell->dot_for_dot)
+    gimp_view_renderer_set_dot_for_dot (renderer, shell->dot_for_dot);
+
+  if (renderer->viewable)
+    {
+      GimpNavigationView *view = GIMP_NAVIGATION_VIEW (editor->view);
+      GimpImage          *image;
+      GeglRectangle       bounding_box;
+      gdouble             x, y;
+      gdouble             w, h;
+
+      image = gimp_image_proxy_get_image (
+        GIMP_IMAGE_PROXY (renderer->viewable));
+
+      gimp_image_proxy_set_show_all (
+        GIMP_IMAGE_PROXY (renderer->viewable),
+        gimp_display_shell_get_infinite_canvas (shell));
+
+      bounding_box = gimp_image_proxy_get_bounding_box (
+        GIMP_IMAGE_PROXY (renderer->viewable));
+
+      gimp_display_shell_scroll_get_viewport (shell, &x, &y, &w, &h);
+      gimp_display_shell_untransform_xy_f (shell,
+                                           shell->disp_width  / 2,
+                                           shell->disp_height / 2,
+                                           &x, &y);
+
+      x -= bounding_box.x;
+      y -= bounding_box.y;
+
+      gimp_navigation_view_set_marker (view,
+                                       x, y, w, h,
+                                       shell->flip_horizontally,
+                                       shell->flip_vertically,
+                                       shell->rotate_angle);
+
+      gimp_navigation_view_set_canvas (
+        view,
+        gimp_display_shell_get_infinite_canvas (shell) &&
+        gimp_display_shell_get_show_canvas (shell),
+        -bounding_box.x,              -bounding_box.y,
+        gimp_image_get_width (image), gimp_image_get_height (image));
+    }
+}
diff --git a/app/display/gimpnavigationeditor.h b/app/display/gimpnavigationeditor.h
new file mode 100644
index 0000000..8e876c2
--- /dev/null
+++ b/app/display/gimpnavigationeditor.h
@@ -0,0 +1,79 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpnavigationeditor.h
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * partly based on app/nav_window
+ * Copyright (C) 1999 Andy Thomas <alt@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_NAVIGATION_EDITOR_H__
+#define __GIMP_NAVIGATION_EDITOR_H__
+
+
+#include "widgets/gimpeditor.h"
+
+
+#define GIMP_TYPE_NAVIGATION_EDITOR            (gimp_navigation_editor_get_type ())
+#define GIMP_NAVIGATION_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_NAVIGATION_EDITOR, GimpNavigationEditor))
+#define GIMP_NAVIGATION_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_NAVIGATION_EDITOR, GimpNavigationEditorClass))
+#define GIMP_IS_NAVIGATION_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_NAVIGATION_EDITOR))
+#define GIMP_IS_NAVIGATION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_NAVIGATION_EDITOR))
+#define GIMP_NAVIGATION_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_NAVIGATION_EDITOR, GimpNavigationEditorClass))
+
+
+typedef struct _GimpNavigationEditorClass  GimpNavigationEditorClass;
+
+struct _GimpNavigationEditor
+{
+  GimpEditor        parent_instance;
+
+  GimpContext      *context;
+  GimpDisplayShell *shell;
+
+  GimpImageProxy   *image_proxy;
+
+  GtkWidget        *view;
+  GtkWidget        *zoom_label;
+  GtkAdjustment    *zoom_adjustment;
+
+  GtkWidget        *zoom_out_button;
+  GtkWidget        *zoom_in_button;
+  GtkWidget        *zoom_100_button;
+  GtkWidget        *zoom_fit_in_button;
+  GtkWidget        *zoom_fill_button;
+  GtkWidget        *shrink_wrap_button;
+
+  guint             scale_timeout;
+};
+
+struct _GimpNavigationEditorClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType       gimp_navigation_editor_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_navigation_editor_new       (GimpMenuFactory  *menu_factory);
+void        gimp_navigation_editor_popup     (GimpDisplayShell *shell,
+                                              GtkWidget        *widget,
+                                              gint              click_x,
+                                              gint              click_y);
+
+
+#endif  /*  __GIMP_NAVIGATION_EDITOR_H__  */
diff --git a/app/display/gimpscalecombobox.c b/app/display/gimpscalecombobox.c
new file mode 100644
index 0000000..3a5bba0
--- /dev/null
+++ b/app/display/gimpscalecombobox.c
@@ -0,0 +1,562 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpscalecombobox.c
+ * Copyright (C) 2004, 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "stdlib.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include "gdk/gdkkeysyms.h"
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpscalecombobox.h"
+
+
+#define MAX_ITEMS  10
+
+enum
+{
+  COLUMN_SCALE,
+  COLUMN_LABEL,
+  COLUMN_PERSISTENT,
+  N_COLUMNS
+};
+
+enum
+{
+  ENTRY_ACTIVATED,
+  LAST_SIGNAL
+};
+
+
+static void      gimp_scale_combo_box_constructed     (GObject           *object);
+static void      gimp_scale_combo_box_finalize        (GObject           *object);
+
+static void      gimp_scale_combo_box_style_set       (GtkWidget         *widget,
+                                                       GtkStyle          *prev_style);
+
+static void      gimp_scale_combo_box_changed         (GimpScaleComboBox *combo_box);
+static void      gimp_scale_combo_box_entry_activate  (GtkWidget         *entry,
+                                                       GimpScaleComboBox *combo_box);
+static gboolean  gimp_scale_combo_box_entry_key_press (GtkWidget         *entry,
+                                                       GdkEventKey       *event,
+                                                       GimpScaleComboBox *combo_box);
+
+static void      gimp_scale_combo_box_scale_iter_set  (GtkListStore      *store,
+                                                       GtkTreeIter       *iter,
+                                                       gdouble            scale,
+                                                       gboolean           persistent);
+
+
+G_DEFINE_TYPE (GimpScaleComboBox, gimp_scale_combo_box,
+               GTK_TYPE_COMBO_BOX)
+
+#define parent_class gimp_scale_combo_box_parent_class
+
+static guint scale_combo_box_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_scale_combo_box_class_init (GimpScaleComboBoxClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  scale_combo_box_signals[ENTRY_ACTIVATED] =
+    g_signal_new ("entry-activated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpScaleComboBoxClass, entry_activated),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->constructed = gimp_scale_combo_box_constructed;
+  object_class->finalize    = gimp_scale_combo_box_finalize;
+
+  widget_class->style_set   = gimp_scale_combo_box_style_set;
+
+  klass->entry_activated    = NULL;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_double ("label-scale",
+                                                                NULL, NULL,
+                                                                0.0,
+                                                                G_MAXDOUBLE,
+                                                                1.0,
+                                                                GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_scale_combo_box_init (GimpScaleComboBox *combo_box)
+{
+  combo_box->scale     = 1.0;
+  combo_box->last_path = NULL;
+}
+
+static void
+gimp_scale_combo_box_constructed (GObject *object)
+{
+  GimpScaleComboBox *combo_box = GIMP_SCALE_COMBO_BOX (object);
+  GtkWidget         *entry;
+  GtkListStore      *store;
+  GtkCellLayout     *layout;
+  GtkCellRenderer   *cell;
+  GtkTreeIter        iter;
+  GtkBorder          border = { 0, 0, 0, 0 };
+  gint               i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  store = gtk_list_store_new (N_COLUMNS,
+                              G_TYPE_DOUBLE,    /* SCALE       */
+                              G_TYPE_STRING,    /* LABEL       */
+                              G_TYPE_BOOLEAN);  /* PERSISTENT  */
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
+  g_object_unref (store);
+
+  gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo_box),
+                                       COLUMN_LABEL);
+
+  entry = gtk_bin_get_child (GTK_BIN (combo_box));
+
+  g_object_set (entry,
+                "xalign",             1.0,
+                "width-chars",        5,
+                "truncate-multiline", TRUE,
+                "inner-border",       &border,
+                NULL);
+
+  layout = GTK_CELL_LAYOUT (combo_box);
+
+  cell = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
+                       "xalign", 1.0,
+                       NULL);
+
+  gtk_cell_layout_clear (layout);
+  gtk_cell_layout_pack_start (layout, cell, TRUE);
+  gtk_cell_layout_set_attributes (layout, cell,
+                                  "text", COLUMN_LABEL,
+                                  NULL);
+
+  for (i = 8; i > 0; i /= 2)
+    {
+      gtk_list_store_append (store, &iter);
+      gimp_scale_combo_box_scale_iter_set (store, &iter, i, TRUE);
+    }
+
+  for (i = 2; i <= 8; i *= 2)
+    {
+      gtk_list_store_append (store, &iter);
+      gimp_scale_combo_box_scale_iter_set (store, &iter, 1.0 / i, TRUE);
+    }
+
+  g_signal_connect (combo_box, "changed",
+                    G_CALLBACK (gimp_scale_combo_box_changed),
+                    NULL);
+
+  g_signal_connect (entry, "activate",
+                    G_CALLBACK (gimp_scale_combo_box_entry_activate),
+                    combo_box);
+  g_signal_connect (entry, "key-press-event",
+                    G_CALLBACK (gimp_scale_combo_box_entry_key_press),
+                    combo_box);
+}
+
+static void
+gimp_scale_combo_box_finalize (GObject *object)
+{
+  GimpScaleComboBox *combo_box = GIMP_SCALE_COMBO_BOX (object);
+
+  if (combo_box->last_path)
+    {
+      gtk_tree_path_free (combo_box->last_path);
+      combo_box->last_path = NULL;
+    }
+
+  if (combo_box->mru)
+    {
+      g_list_free_full (combo_box->mru,
+                        (GDestroyNotify) gtk_tree_row_reference_free);
+      combo_box->mru = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_scale_combo_box_style_set (GtkWidget *widget,
+                                GtkStyle  *prev_style)
+{
+  GtkWidget            *entry;
+  GtkRcStyle           *rc_style;
+  PangoContext         *context;
+  PangoFontDescription *font_desc;
+  gint                  font_size;
+  gdouble               label_scale;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget, "label-scale", &label_scale, NULL);
+
+  entry = gtk_bin_get_child (GTK_BIN (widget));
+
+  rc_style = gtk_widget_get_modifier_style (GTK_WIDGET (entry));
+
+  if (rc_style->font_desc)
+    pango_font_description_free (rc_style->font_desc);
+
+  context = gtk_widget_get_pango_context (widget);
+  font_desc = pango_context_get_font_description (context);
+  rc_style->font_desc = pango_font_description_copy (font_desc);
+
+  font_size = pango_font_description_get_size (rc_style->font_desc);
+  pango_font_description_set_size (rc_style->font_desc, label_scale * font_size);
+
+  gtk_widget_modify_style (GTK_WIDGET (entry), rc_style);
+}
+
+static void
+gimp_scale_combo_box_changed (GimpScaleComboBox *combo_box)
+{
+  GtkTreeIter iter;
+
+  if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter))
+    {
+      GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+      gdouble       scale;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_SCALE, &scale,
+                          -1);
+      if (scale > 0.0)
+        {
+          combo_box->scale = scale;
+
+          if (combo_box->last_path)
+            gtk_tree_path_free (combo_box->last_path);
+
+          combo_box->last_path = gtk_tree_model_get_path (model, &iter);
+        }
+    }
+}
+
+static gboolean
+gimp_scale_combo_box_parse_text (const gchar *text,
+                                 gdouble     *scale)
+{
+  gchar   *end;
+  gdouble  left_number;
+  gdouble  right_number;
+
+  /* try to parse a number */
+  left_number = strtod (text, &end);
+
+  if (end == text)
+    return FALSE;
+  else
+    text = end;
+
+  /* skip over whitespace */
+  while (g_unichar_isspace (g_utf8_get_char (text)))
+    text = g_utf8_next_char (text);
+
+  if (*text == '\0' || *text == '%')
+    {
+      *scale = left_number / 100.0;
+      return TRUE;
+    }
+
+  /* check for a valid separator */
+  if (*text != '/' && *text != ':')
+    {
+      *scale = left_number;
+      return TRUE;
+    }
+
+  text = g_utf8_next_char (text);
+
+  /* skip over whitespace */
+  while (g_unichar_isspace (g_utf8_get_char (text)))
+    text = g_utf8_next_char (text);
+
+  /* try to parse another number */
+  right_number = strtod (text, &end);
+
+  if (end == text)
+    return FALSE;
+
+  if (right_number == 0.0)
+    return FALSE;
+
+  *scale = left_number / right_number;
+  return TRUE;
+}
+
+static void
+gimp_scale_combo_box_entry_activate (GtkWidget         *entry,
+                                     GimpScaleComboBox *combo_box)
+{
+  const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry));
+  gdouble      scale;
+
+  if (gimp_scale_combo_box_parse_text (text, &scale) &&
+      scale >= 1.0 / 256.0                           &&
+      scale <= 256.0)
+    {
+      gimp_scale_combo_box_set_scale (combo_box, scale);
+    }
+  else
+    {
+      gtk_widget_error_bell (entry);
+
+      gimp_scale_combo_box_set_scale (combo_box, combo_box->scale);
+    }
+
+  g_signal_emit (combo_box, scale_combo_box_signals[ENTRY_ACTIVATED], 0);
+}
+
+static gboolean
+gimp_scale_combo_box_entry_key_press (GtkWidget         *entry,
+                                      GdkEventKey       *event,
+                                      GimpScaleComboBox *combo_box)
+{
+  if (event->keyval == GDK_KEY_Escape)
+    {
+      gimp_scale_combo_box_set_scale (combo_box, combo_box->scale);
+
+      g_signal_emit (combo_box, scale_combo_box_signals[ENTRY_ACTIVATED], 0);
+
+      return TRUE;
+    }
+
+  if (event->keyval == GDK_KEY_Tab    ||
+      event->keyval == GDK_KEY_KP_Tab ||
+      event->keyval == GDK_KEY_ISO_Left_Tab)
+    {
+      gimp_scale_combo_box_entry_activate (entry, combo_box);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_scale_combo_box_scale_iter_set (GtkListStore *store,
+                                     GtkTreeIter  *iter,
+                                     gdouble       scale,
+                                     gboolean      persistent)
+{
+  gchar label[32];
+
+#ifdef G_OS_WIN32
+
+  /*  use a normal space until pango's windows backend uses harfbuzz,
+   *  see bug #735505
+   */
+#define PERCENT_SPACE " "
+
+#else
+
+  /*  use U+2009 THIN SPACE to separate the percent sign from the number */
+#define PERCENT_SPACE "\342\200\211"
+
+#endif
+
+  if (scale > 1.0)
+    g_snprintf (label, sizeof (label),
+                "%d" PERCENT_SPACE "%%", (gint) ROUND (100.0 * scale));
+  else
+    g_snprintf (label, sizeof (label),
+                "%.3g" PERCENT_SPACE "%%", 100.0 * scale);
+
+  gtk_list_store_set (store, iter,
+                      COLUMN_SCALE,      scale,
+                      COLUMN_LABEL,      label,
+                      COLUMN_PERSISTENT, persistent,
+                      -1);
+}
+
+static void
+gimp_scale_combo_box_mru_add (GimpScaleComboBox *combo_box,
+                              GtkTreeIter       *iter)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+  GtkTreePath  *path  = gtk_tree_model_get_path (model, iter);
+  GList        *list;
+  gboolean      found;
+
+  for (list = combo_box->mru, found = FALSE; list && !found; list = list->next)
+    {
+      GtkTreePath *this = gtk_tree_row_reference_get_path (list->data);
+
+      if (gtk_tree_path_compare (this, path) == 0)
+        {
+          if (list->prev)
+            {
+              combo_box->mru = g_list_remove_link (combo_box->mru, list);
+              combo_box->mru = g_list_concat (list, combo_box->mru);
+            }
+
+          found = TRUE;
+        }
+
+      gtk_tree_path_free (this);
+    }
+
+  if (! found)
+    combo_box->mru = g_list_prepend (combo_box->mru,
+                                     gtk_tree_row_reference_new (model, path));
+
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_scale_combo_box_mru_remove_last (GimpScaleComboBox *combo_box)
+{
+  GtkTreeModel *model;
+  GtkTreePath  *path;
+  GList        *last;
+  GtkTreeIter   iter;
+
+  if (! combo_box->mru)
+    return;
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+
+  last = g_list_last (combo_box->mru);
+  path = gtk_tree_row_reference_get_path (last->data);
+
+  if (gtk_tree_model_get_iter (model, &iter, path))
+    {
+      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+      gtk_tree_row_reference_free (last->data);
+      combo_box->mru = g_list_delete_link (combo_box->mru, last);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+
+/**
+ * gimp_scale_combo_box_new:
+ *
+ * Return value: a new #GimpScaleComboBox.
+ **/
+GtkWidget *
+gimp_scale_combo_box_new (void)
+{
+  return g_object_new (GIMP_TYPE_SCALE_COMBO_BOX,
+                       "has-entry", TRUE,
+                       NULL);
+}
+
+void
+gimp_scale_combo_box_set_scale (GimpScaleComboBox *combo_box,
+                                gdouble            scale)
+{
+  GtkTreeModel *model;
+  GtkListStore *store;
+  GtkWidget    *entry;
+  GtkTreeIter   iter;
+  gboolean      iter_valid;
+  gboolean      persistent;
+  gint          n_digits;
+
+  g_return_if_fail (GIMP_IS_SCALE_COMBO_BOX (combo_box));
+  g_return_if_fail (scale > 0.0);
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+  store = GTK_LIST_STORE (model);
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      gdouble  this;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_SCALE, &this,
+                          -1);
+
+      if (fabs (this - scale) < 0.0001)
+        break;
+    }
+
+  if (! iter_valid)
+    {
+      GtkTreeIter  sibling;
+
+      for (iter_valid = gtk_tree_model_get_iter_first (model, &sibling);
+           iter_valid;
+           iter_valid = gtk_tree_model_iter_next (model, &sibling))
+        {
+          gdouble this;
+
+          gtk_tree_model_get (model, &sibling,
+                              COLUMN_SCALE, &this,
+                              -1);
+
+          if (this < scale)
+            break;
+        }
+
+      gtk_list_store_insert_before (store, &iter, iter_valid ? &sibling : NULL);
+      gimp_scale_combo_box_scale_iter_set (store, &iter, scale, FALSE);
+    }
+
+  gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter);
+
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_PERSISTENT, &persistent,
+                      -1);
+  if (! persistent)
+    {
+      gimp_scale_combo_box_mru_add (combo_box, &iter);
+
+      if (gtk_tree_model_iter_n_children (model, NULL) > MAX_ITEMS)
+        gimp_scale_combo_box_mru_remove_last (combo_box);
+    }
+
+  /* Update entry size appropriately. */
+  entry = gtk_bin_get_child (GTK_BIN (combo_box));
+  n_digits = (gint) floor (log10 (scale) + 1);
+
+  g_object_set (entry,
+                "width-chars", MAX (5, n_digits + 4),
+                NULL);
+}
+
+gdouble
+gimp_scale_combo_box_get_scale (GimpScaleComboBox *combo_box)
+{
+  g_return_val_if_fail (GIMP_IS_SCALE_COMBO_BOX (combo_box), 1.0);
+
+  return combo_box->scale;
+}
diff --git a/app/display/gimpscalecombobox.h b/app/display/gimpscalecombobox.h
new file mode 100644
index 0000000..1c35e2f
--- /dev/null
+++ b/app/display/gimpscalecombobox.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpscalecombobox.h
+ * Copyright (C) 2004, 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SCALE_COMBO_BOX_H__
+#define __GIMP_SCALE_COMBO_BOX_H__
+
+
+#define GIMP_TYPE_SCALE_COMBO_BOX            (gimp_scale_combo_box_get_type ())
+#define GIMP_SCALE_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBox))
+#define GIMP_SCALE_COMBO_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBoxClass))
+#define GIMP_IS_SCALE_COMBO_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SCALE_COMBO_BOX))
+#define GIMP_IS_SCALE_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SCALE_COMBO_BOX))
+#define GIMP_SCALE_COMBO_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBoxClass))
+
+
+typedef struct _GimpScaleComboBoxClass  GimpScaleComboBoxClass;
+
+struct _GimpScaleComboBoxClass
+{
+  GtkComboBoxClass  parent_instance;
+
+  void (* entry_activated) (GimpScaleComboBox *combo_box);
+};
+
+struct _GimpScaleComboBox
+{
+  GtkComboBox  parent_instance;
+
+  gdouble      scale;
+  GtkTreePath *last_path;
+  GList       *mru;
+};
+
+
+GType       gimp_scale_combo_box_get_type   (void) G_GNUC_CONST;
+
+GtkWidget * gimp_scale_combo_box_new        (void);
+void        gimp_scale_combo_box_set_scale  (GimpScaleComboBox *combo_box,
+                                             gdouble            scale);
+gdouble     gimp_scale_combo_box_get_scale  (GimpScaleComboBox *combo_box);
+
+
+#endif  /* __GIMP_SCALE_COMBO_BOX_H__ */
diff --git a/app/display/gimpsinglewindowstrategy.c b/app/display/gimpsinglewindowstrategy.c
new file mode 100644
index 0000000..e840dfa
--- /dev/null
+++ b/app/display/gimpsinglewindowstrategy.c
@@ -0,0 +1,157 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsinglewindowstrategy.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdockcolumns.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "gimpimagewindow.h"
+#include "gimpsinglewindowstrategy.h"
+
+
+static void        gimp_single_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface);
+static GtkWidget * gimp_single_window_strategy_show_dockable_dialog       (GimpWindowStrategy          *strategy,
+                                                                           Gimp                        *gimp,
+                                                                           GimpDialogFactory           *factory,
+                                                                           GdkScreen                   *screen,
+                                                                           gint                         monitor,
+                                                                           const gchar                 *identifiers);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpSingleWindowStrategy, gimp_single_window_strategy, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_WINDOW_STRATEGY,
+                                                gimp_single_window_strategy_window_strategy_iface_init))
+
+#define parent_class gimp_single_window_strategy_parent_class
+
+
+static void
+gimp_single_window_strategy_class_init (GimpSingleWindowStrategyClass *klass)
+{
+}
+
+static void
+gimp_single_window_strategy_init (GimpSingleWindowStrategy *strategy)
+{
+}
+
+static void
+gimp_single_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface)
+{
+  iface->show_dockable_dialog = gimp_single_window_strategy_show_dockable_dialog;
+}
+
+static GtkWidget *
+gimp_single_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
+                                                  Gimp               *gimp,
+                                                  GimpDialogFactory  *factory,
+                                                  GdkScreen          *screen,
+                                                  gint                monitor,
+                                                  const gchar        *identifiers)
+{
+  GList           *windows = gimp_get_image_windows (gimp);
+  GtkWidget       *widget  = NULL;
+  GimpImageWindow *window;
+
+  g_return_val_if_fail (windows != NULL, NULL);
+
+  /* In single-window mode, there should only be one window... */
+  window = GIMP_IMAGE_WINDOW (windows->data);
+
+  if (strcmp ("gimp-toolbox", identifiers) == 0)
+    {
+      /* Only allow one toolbox... */
+      if (! gimp_image_window_has_toolbox (window))
+        {
+          GimpDockColumns *columns;
+          GimpUIManager   *ui_manager = gimp_image_window_get_ui_manager (window);
+
+          widget = gimp_dialog_factory_dialog_new (factory,
+                                                   screen,
+                                                   monitor,
+                                                   ui_manager,
+                                                   "gimp-toolbox",
+                                                   -1 /*view_size*/,
+                                                   FALSE /*present*/);
+          gtk_widget_show (widget);
+
+          columns = gimp_image_window_get_left_docks (window);
+          gimp_dock_columns_add_dock (columns,
+                                      GIMP_DOCK (widget),
+                                      -1 /*index*/);
+        }
+    }
+  else if (gimp_dialog_factory_find_widget (factory, identifiers))
+    {
+      /* if the dialog is already open, simply raise it */
+      return gimp_dialog_factory_dialog_raise (factory, screen, monitor,
+                                               identifiers, -1);
+   }
+  else
+    {
+      GtkWidget *dockbook;
+
+      dockbook = gimp_image_window_get_default_dockbook (window);
+
+      if (! dockbook)
+        {
+          GimpDockColumns *dock_columns;
+
+          /* No dock, need to add one */
+          dock_columns = gimp_image_window_get_right_docks (window);
+          gimp_dock_columns_prepare_dockbook (dock_columns,
+                                              -1 /*index*/,
+                                              &dockbook);
+        }
+
+      widget = gimp_dockbook_add_from_dialog_factory (GIMP_DOCKBOOK (dockbook),
+                                                      identifiers,
+                                                      -1 /*index*/);
+    }
+
+
+  g_list_free (windows);
+
+  return widget;
+}
+
+GimpObject *
+gimp_single_window_strategy_get_singleton (void)
+{
+  static GimpObject *singleton = NULL;
+
+  if (! singleton)
+    singleton = g_object_new (GIMP_TYPE_SINGLE_WINDOW_STRATEGY, NULL);
+
+  return singleton;
+}
diff --git a/app/display/gimpsinglewindowstrategy.h b/app/display/gimpsinglewindowstrategy.h
new file mode 100644
index 0000000..5b145c7
--- /dev/null
+++ b/app/display/gimpsinglewindowstrategy.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsinglewindowstrategy.h
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SINGLE_WINDOW_STRATEGY_H__
+#define __GIMP_SINGLE_WINDOW_STRATEGY_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_SINGLE_WINDOW_STRATEGY            (gimp_single_window_strategy_get_type ())
+#define GIMP_SINGLE_WINDOW_STRATEGY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SINGLE_WINDOW_STRATEGY, GimpSingleWindowStrategy))
+#define GIMP_SINGLE_WINDOW_STRATEGY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SINGLE_WINDOW_STRATEGY, GimpSingleWindowStrategyClass))
+#define GIMP_IS_SINGLE_WINDOW_STRATEGY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SINGLE_WINDOW_STRATEGY))
+#define GIMP_IS_SINGLE_WINDOW_STRATEGY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SINGLE_WINDOW_STRATEGY))
+#define GIMP_SINGLE_WINDOW_STRATEGY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SINGLE_WINDOW_STRATEGY, GimpSingleWindowStrategyClass))
+
+
+typedef struct _GimpSingleWindowStrategyClass GimpSingleWindowStrategyClass;
+
+struct _GimpSingleWindowStrategy
+{
+  GimpObject  parent_instance;
+};
+
+struct _GimpSingleWindowStrategyClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType        gimp_single_window_strategy_get_type          (void) G_GNUC_CONST;
+
+GimpObject * gimp_single_window_strategy_get_singleton     (void);
+
+
+#endif /* __GIMP_SINGLE_WINDOW_STRATEGY_H__ */
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
new file mode 100644
index 0000000..2a2648f
--- /dev/null
+++ b/app/display/gimpstatusbar.c
@@ -0,0 +1,1750 @@
+/* GIMP - The GNU Image Manipulation Program Copyright (C) 1995
+ * Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scale.h"
+#include "gimpimagewindow.h"
+#include "gimpscalecombobox.h"
+#include "gimpstatusbar.h"
+
+#include "gimp-intl.h"
+
+
+/*  maximal width of the string holding the cursor-coordinates   */
+#define CURSOR_LEN                      256
+
+/*  the spacing of the hbox                                      */
+#define HBOX_SPACING                      1
+
+/*  spacing between the icon and the statusbar label             */
+#define ICON_SPACING                      2
+
+/*  width/height of the statusbar icon rect                      */
+#define ICON_SIZE                        16
+
+/*  timeout (in milliseconds) for temporary statusbar messages   */
+#define MESSAGE_TIMEOUT                8000
+
+/*  minimal interval (in microseconds) between progress updates  */
+#define MIN_PROGRESS_UPDATE_INTERVAL  50000
+
+
+typedef struct _GimpStatusbarMsg GimpStatusbarMsg;
+
+struct _GimpStatusbarMsg
+{
+  guint  context_id;
+  gchar *icon_name;
+  gchar *text;
+};
+
+
+static void     gimp_statusbar_progress_iface_init (GimpProgressInterface *iface);
+
+static void     gimp_statusbar_dispose            (GObject           *object);
+static void     gimp_statusbar_finalize           (GObject           *object);
+
+static void     gimp_statusbar_screen_changed     (GtkWidget         *widget,
+                                                   GdkScreen         *previous);
+static void     gimp_statusbar_style_set          (GtkWidget         *widget,
+                                                   GtkStyle          *prev_style);
+
+static void     gimp_statusbar_hbox_size_request  (GtkWidget         *widget,
+                                                   GtkRequisition    *requisition,
+                                                   GimpStatusbar     *statusbar);
+
+static GimpProgress *
+                gimp_statusbar_progress_start     (GimpProgress      *progress,
+                                                   gboolean           cancellable,
+                                                   const gchar       *message);
+static void     gimp_statusbar_progress_end       (GimpProgress      *progress);
+static gboolean gimp_statusbar_progress_is_active (GimpProgress      *progress);
+static void     gimp_statusbar_progress_set_text  (GimpProgress      *progress,
+                                                   const gchar       *message);
+static void     gimp_statusbar_progress_set_value (GimpProgress      *progress,
+                                                   gdouble            percentage);
+static gdouble  gimp_statusbar_progress_get_value (GimpProgress      *progress);
+static void     gimp_statusbar_progress_pulse     (GimpProgress      *progress);
+static gboolean gimp_statusbar_progress_message   (GimpProgress      *progress,
+                                                   Gimp              *gimp,
+                                                   GimpMessageSeverity severity,
+                                                   const gchar       *domain,
+                                                   const gchar       *message);
+static void     gimp_statusbar_progress_canceled  (GtkWidget         *button,
+                                                   GimpStatusbar     *statusbar);
+
+static gboolean gimp_statusbar_label_expose       (GtkWidget         *widget,
+                                                   GdkEventExpose    *event,
+                                                   GimpStatusbar     *statusbar);
+
+static void     gimp_statusbar_update             (GimpStatusbar     *statusbar);
+static void     gimp_statusbar_unit_changed       (GimpUnitComboBox  *combo,
+                                                   GimpStatusbar     *statusbar);
+static void     gimp_statusbar_scale_changed      (GimpScaleComboBox *combo,
+                                                   GimpStatusbar     *statusbar);
+static void     gimp_statusbar_scale_activated    (GimpScaleComboBox *combo,
+                                                   GimpStatusbar     *statusbar);
+static gboolean gimp_statusbar_rotate_pressed     (GtkWidget         *event_box,
+                                                   GdkEvent          *event,
+                                                   GimpStatusbar     *statusbar);
+static gboolean gimp_statusbar_horiz_flip_pressed (GtkWidget         *event_box,
+                                                   GdkEvent          *event,
+                                                   GimpStatusbar     *statusbar);
+static gboolean gimp_statusbar_vert_flip_pressed  (GtkWidget         *event_box,
+                                                   GdkEvent          *event,
+                                                   GimpStatusbar     *statusbar);
+static void     gimp_statusbar_shell_scaled       (GimpDisplayShell  *shell,
+                                                   GimpStatusbar     *statusbar);
+static void     gimp_statusbar_shell_rotated      (GimpDisplayShell  *shell,
+                                                   GimpStatusbar     *statusbar);
+static void     gimp_statusbar_shell_status_notify(GimpDisplayShell  *shell,
+                                                   const GParamSpec  *pspec,
+                                                   GimpStatusbar     *statusbar);
+static guint    gimp_statusbar_get_context_id     (GimpStatusbar     *statusbar,
+                                                   const gchar       *context);
+static gboolean gimp_statusbar_temp_timeout       (GimpStatusbar     *statusbar);
+
+static void     gimp_statusbar_add_message        (GimpStatusbar     *statusbar,
+                                                   guint              context_id,
+                                                   const gchar       *icon_name,
+                                                   const gchar       *format,
+                                                   va_list            args,
+                                                   gboolean           move_to_front) G_GNUC_PRINTF (4, 0);
+static void     gimp_statusbar_remove_message     (GimpStatusbar     *statusbar,
+                                                   guint              context_id);
+static void     gimp_statusbar_msg_free           (GimpStatusbarMsg  *msg);
+
+static gchar *  gimp_statusbar_vprintf            (const gchar       *format,
+                                                   va_list            args) G_GNUC_PRINTF (1, 0);
+
+static GdkPixbuf * gimp_statusbar_load_icon       (GimpStatusbar     *statusbar,
+                                                   const gchar       *icon_name);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpStatusbar, gimp_statusbar, GTK_TYPE_STATUSBAR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_statusbar_progress_iface_init))
+
+#define parent_class gimp_statusbar_parent_class
+
+
+static void
+gimp_statusbar_class_init (GimpStatusbarClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose        = gimp_statusbar_dispose;
+  object_class->finalize       = gimp_statusbar_finalize;
+
+  widget_class->screen_changed = gimp_statusbar_screen_changed;
+  widget_class->style_set      = gimp_statusbar_style_set;
+}
+
+static void
+gimp_statusbar_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start     = gimp_statusbar_progress_start;
+  iface->end       = gimp_statusbar_progress_end;
+  iface->is_active = gimp_statusbar_progress_is_active;
+  iface->set_text  = gimp_statusbar_progress_set_text;
+  iface->set_value = gimp_statusbar_progress_set_value;
+  iface->get_value = gimp_statusbar_progress_get_value;
+  iface->pulse     = gimp_statusbar_progress_pulse;
+  iface->message   = gimp_statusbar_progress_message;
+}
+
+static void
+gimp_statusbar_init (GimpStatusbar *statusbar)
+{
+  GtkWidget     *hbox;
+  GtkWidget     *hbox2;
+  GtkWidget     *image;
+  GtkWidget     *label;
+  GimpUnitStore *store;
+  GList         *children;
+
+  statusbar->shell          = NULL;
+  statusbar->messages       = NULL;
+  statusbar->context_ids    = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                     g_free, NULL);
+  statusbar->seq_context_id = 1;
+
+  statusbar->temp_context_id =
+    gimp_statusbar_get_context_id (statusbar, "gimp-statusbar-temp");
+
+  statusbar->cursor_format_str[0]   = '\0';
+  statusbar->cursor_format_str_f[0] = '\0';
+  statusbar->length_format_str[0]   = '\0';
+
+  statusbar->progress_active      = FALSE;
+  statusbar->progress_shown       = FALSE;
+
+  /*  remove the message label from the message area  */
+  hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar));
+  gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING);
+
+  children = gtk_container_get_children (GTK_CONTAINER (hbox));
+  statusbar->label = g_object_ref (children->data);
+  g_list_free (children);
+
+  gtk_container_remove (GTK_CONTAINER (hbox), statusbar->label);
+
+  g_signal_connect (hbox, "size-request",
+                    G_CALLBACK (gimp_statusbar_hbox_size_request),
+                    statusbar);
+
+  statusbar->cursor_label = gtk_label_new ("8888, 8888");
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->cursor_label, FALSE, FALSE, 0);
+  gtk_widget_show (statusbar->cursor_label);
+
+  store = gimp_unit_store_new (2);
+  statusbar->unit_combo = gimp_unit_combo_box_new_with_model (store);
+  g_object_unref (store);
+
+  /* see issue #2642 */
+  gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (statusbar->unit_combo), 1);
+
+  gtk_widget_set_can_focus (statusbar->unit_combo, FALSE);
+  g_object_set (statusbar->unit_combo, "focus-on-click", FALSE, NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->unit_combo, FALSE, FALSE, 0);
+  gtk_widget_show (statusbar->unit_combo);
+
+  g_signal_connect (statusbar->unit_combo, "changed",
+                    G_CALLBACK (gimp_statusbar_unit_changed),
+                    statusbar);
+
+  statusbar->scale_combo = gimp_scale_combo_box_new ();
+  gtk_widget_set_can_focus (statusbar->scale_combo, FALSE);
+  g_object_set (statusbar->scale_combo, "focus-on-click", FALSE, NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->scale_combo, FALSE, FALSE, 0);
+  gtk_widget_show (statusbar->scale_combo);
+
+  g_signal_connect (statusbar->scale_combo, "changed",
+                    G_CALLBACK (gimp_statusbar_scale_changed),
+                    statusbar);
+
+  g_signal_connect (statusbar->scale_combo, "entry-activated",
+                    G_CALLBACK (gimp_statusbar_scale_activated),
+                    statusbar);
+
+  /* Shell transform status */
+  statusbar->rotate_widget = gtk_event_box_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->rotate_widget,
+                      FALSE, FALSE, 1);
+  gtk_widget_show (statusbar->rotate_widget);
+
+  statusbar->rotate_label = gtk_label_new (NULL);
+  gtk_container_add (GTK_CONTAINER (statusbar->rotate_widget),
+                     statusbar->rotate_label);
+  gtk_widget_show (statusbar->rotate_label);
+
+  g_signal_connect (statusbar->rotate_widget, "button-press-event",
+                    G_CALLBACK (gimp_statusbar_rotate_pressed),
+                    statusbar);
+
+  statusbar->horizontal_flip_icon = gtk_event_box_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->horizontal_flip_icon,
+                      FALSE, FALSE, 1);
+  gtk_widget_show (statusbar->horizontal_flip_icon);
+
+  image = gtk_image_new_from_icon_name ("gimp-flip-horizontal",
+                                        GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (statusbar->horizontal_flip_icon), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (statusbar->horizontal_flip_icon, "button-press-event",
+                    G_CALLBACK (gimp_statusbar_horiz_flip_pressed),
+                    statusbar);
+
+  statusbar->vertical_flip_icon = gtk_event_box_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->vertical_flip_icon,
+                      FALSE, FALSE, 1);
+  gtk_widget_show (statusbar->vertical_flip_icon);
+
+  image = gtk_image_new_from_icon_name ("gimp-flip-vertical",
+                                        GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (statusbar->vertical_flip_icon), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (statusbar->vertical_flip_icon, "button-press-event",
+                    G_CALLBACK (gimp_statusbar_vert_flip_pressed),
+                    statusbar);
+
+  /*  put the label back into the message area  */
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->label, TRUE, TRUE, 1);
+
+  g_object_unref (statusbar->label);
+
+  g_signal_connect_after (statusbar->label, "expose-event",
+                          G_CALLBACK (gimp_statusbar_label_expose),
+                          statusbar);
+
+  statusbar->progressbar = g_object_new (GTK_TYPE_PROGRESS_BAR,
+                                         "text-xalign", 0.0,
+                                         "text-yalign", 0.5,
+                                         "ellipsize",   PANGO_ELLIPSIZE_END,
+                                         NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), statusbar->progressbar, TRUE, TRUE, 0);
+  /*  don't show the progress bar  */
+
+  /*  construct the cancel button's contents manually because we
+   *  always want image and label regardless of settings, and we want
+   *  a menu size image.
+   */
+  statusbar->cancel_button = gtk_button_new ();
+  gtk_widget_set_can_focus (statusbar->cancel_button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (statusbar->cancel_button),
+                         GTK_RELIEF_NONE);
+  gtk_widget_set_sensitive (statusbar->cancel_button, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox),
+                    statusbar->cancel_button, FALSE, FALSE, 0);
+  /*  don't show the cancel button  */
+
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_container_add (GTK_CONTAINER (statusbar->cancel_button), hbox2);
+  gtk_widget_show (hbox2);
+
+  image = gtk_image_new_from_icon_name ("gtk-cancel", GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (hbox2), image, FALSE, FALSE, 2);
+  gtk_widget_show (image);
+
+  label = gtk_label_new ("Cancel");
+  gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 2);
+  gtk_widget_show (label);
+
+  g_signal_connect (statusbar->cancel_button, "clicked",
+                    G_CALLBACK (gimp_statusbar_progress_canceled),
+                    statusbar);
+}
+
+static void
+gimp_statusbar_dispose (GObject *object)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (object);
+
+  if (statusbar->temp_timeout_id)
+    {
+      g_source_remove (statusbar->temp_timeout_id);
+      statusbar->temp_timeout_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_statusbar_finalize (GObject *object)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (object);
+
+  g_clear_object (&statusbar->icon);
+  g_clear_pointer (&statusbar->icon_hash, g_hash_table_unref);
+
+  g_slist_free_full (statusbar->messages,
+                     (GDestroyNotify) gimp_statusbar_msg_free);
+  statusbar->messages = NULL;
+
+  g_clear_pointer (&statusbar->context_ids, g_hash_table_destroy);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_statusbar_screen_changed (GtkWidget *widget,
+                               GdkScreen *previous)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (widget);
+
+  if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
+    GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, previous);
+
+  g_clear_pointer (&statusbar->icon_hash, g_hash_table_unref);
+}
+
+static void
+gimp_statusbar_style_set (GtkWidget *widget,
+                          GtkStyle  *prev_style)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  g_clear_pointer (&statusbar->icon_hash, g_hash_table_unref);
+}
+
+static void
+gimp_statusbar_hbox_size_request (GtkWidget      *widget,
+                                  GtkRequisition *requisition,
+                                  GimpStatusbar  *statusbar)
+{
+  GtkRequisition child_requisition;
+  gint           width = 0;
+
+  /*  also consider the children which can be invisible  */
+
+  gtk_widget_size_request (statusbar->cursor_label, &child_requisition);
+  width += child_requisition.width;
+  requisition->height = MAX (requisition->height,
+                             child_requisition.height);
+
+  gtk_widget_size_request (statusbar->unit_combo, &child_requisition);
+  width += child_requisition.width;
+  requisition->height = MAX (requisition->height,
+                             child_requisition.height);
+
+  gtk_widget_size_request (statusbar->scale_combo, &child_requisition);
+  width += child_requisition.width;
+  requisition->height = MAX (requisition->height,
+                             child_requisition.height);
+
+  gtk_widget_size_request (statusbar->progressbar, &child_requisition);
+  requisition->height = MAX (requisition->height,
+                             child_requisition.height);
+
+  gtk_widget_size_request (statusbar->label, &child_requisition);
+  requisition->height = MAX (requisition->height,
+                             child_requisition.height);
+
+  gtk_widget_size_request (statusbar->cancel_button, &child_requisition);
+  requisition->height = MAX (requisition->height,
+                             child_requisition.height);
+
+  requisition->width = MAX (requisition->width, width + 32);
+}
+
+static GimpProgress *
+gimp_statusbar_progress_start (GimpProgress *progress,
+                               gboolean      cancellable,
+                               const gchar  *message)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  if (! statusbar->progress_active)
+    {
+      GtkWidget     *bar = statusbar->progressbar;
+      GtkAllocation  allocation;
+
+      statusbar->progress_active           = TRUE;
+      statusbar->progress_value            = 0.0;
+      statusbar->progress_last_update_time = g_get_monotonic_time ();
+
+      gimp_statusbar_push (statusbar, "progress", NULL, "%s", message);
+      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
+      gtk_widget_set_sensitive (statusbar->cancel_button, cancellable);
+
+      if (cancellable)
+        {
+          if (message)
+            {
+              gchar *tooltip = g_strdup_printf (_("Cancel <i>%s</i>"), message);
+
+              gimp_help_set_help_data_with_markup (statusbar->cancel_button,
+                                                   tooltip, NULL);
+              g_free (tooltip);
+            }
+
+          gtk_widget_show (statusbar->cancel_button);
+        }
+
+      gtk_widget_get_allocation (statusbar->label, &allocation);
+
+      gtk_widget_show (statusbar->progressbar);
+      gtk_widget_hide (statusbar->label);
+
+      /*  This shit is needed so that the progress bar is drawn in the
+       *  correct place in the cases where we suck completely and run
+       *  an operation that blocks the GUI and doesn't let the main
+       *  loop run.
+       */
+      gtk_container_resize_children (GTK_CONTAINER (statusbar));
+      gtk_widget_size_allocate (statusbar->progressbar, &allocation);
+
+      if (! gtk_widget_get_visible (GTK_WIDGET (statusbar)))
+        {
+          gtk_widget_show (GTK_WIDGET (statusbar));
+          statusbar->progress_shown = TRUE;
+        }
+
+      gimp_widget_flush_expose (bar);
+
+      gimp_statusbar_override_window_title (statusbar);
+
+      return progress;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_statusbar_progress_end (GimpProgress *progress)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  if (statusbar->progress_active)
+    {
+      GtkWidget *bar = statusbar->progressbar;
+
+      if (statusbar->progress_shown)
+        {
+          gtk_widget_hide (GTK_WIDGET (statusbar));
+          statusbar->progress_shown = FALSE;
+        }
+
+      statusbar->progress_active = FALSE;
+      statusbar->progress_value  = 0.0;
+
+      gtk_widget_hide (bar);
+      gtk_widget_show (statusbar->label);
+
+      gimp_statusbar_pop (statusbar, "progress");
+
+      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
+      gtk_widget_set_sensitive (statusbar->cancel_button, FALSE);
+      gtk_widget_hide (statusbar->cancel_button);
+
+      gimp_statusbar_restore_window_title (statusbar);
+    }
+}
+
+static gboolean
+gimp_statusbar_progress_is_active (GimpProgress *progress)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  return statusbar->progress_active;
+}
+
+static void
+gimp_statusbar_progress_set_text (GimpProgress *progress,
+                                  const gchar  *message)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  if (statusbar->progress_active)
+    {
+      GtkWidget *bar = statusbar->progressbar;
+
+      gimp_statusbar_replace (statusbar, "progress", NULL, "%s", message);
+
+      gimp_widget_flush_expose (bar);
+
+      gimp_statusbar_override_window_title (statusbar);
+    }
+}
+
+static void
+gimp_statusbar_progress_set_value (GimpProgress *progress,
+                                   gdouble       percentage)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  if (statusbar->progress_active)
+    {
+      guint64 time = g_get_monotonic_time ();
+
+      if (time - statusbar->progress_last_update_time >=
+          MIN_PROGRESS_UPDATE_INTERVAL)
+        {
+          GtkWidget     *bar = statusbar->progressbar;
+          GtkAllocation  allocation;
+          gdouble        diff;
+
+          gtk_widget_get_allocation (bar, &allocation);
+
+          statusbar->progress_value = percentage;
+
+          diff = fabs (percentage -
+                       gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (bar)));
+
+          /* only update the progress bar if this causes a visible change */
+          if (allocation.width * diff >= 1.0)
+            {
+              statusbar->progress_last_update_time = time;
+
+              gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar),
+                                             percentage);
+
+              gimp_widget_flush_expose (bar);
+            }
+        }
+    }
+}
+
+static gdouble
+gimp_statusbar_progress_get_value (GimpProgress *progress)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  if (statusbar->progress_active)
+    return statusbar->progress_value;
+
+  return 0.0;
+}
+
+static void
+gimp_statusbar_progress_pulse (GimpProgress *progress)
+{
+  GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
+
+  if (statusbar->progress_active)
+    {
+      guint64 time = g_get_monotonic_time ();
+
+      if (time - statusbar->progress_last_update_time >=
+          MIN_PROGRESS_UPDATE_INTERVAL)
+        {
+          GtkWidget *bar = statusbar->progressbar;
+
+          statusbar->progress_last_update_time = time;
+
+          gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
+
+          gimp_widget_flush_expose (bar);
+        }
+    }
+}
+
+static gboolean
+gimp_statusbar_progress_message (GimpProgress        *progress,
+                                 Gimp                *gimp,
+                                 GimpMessageSeverity  severity,
+                                 const gchar         *domain,
+                                 const gchar         *message)
+{
+  GimpStatusbar *statusbar  = GIMP_STATUSBAR (progress);
+  PangoLayout   *layout;
+  const gchar   *icon_name;
+  gboolean       handle_msg = FALSE;
+
+  /*  don't accept a message if we are already displaying a more severe one  */
+  if (statusbar->temp_timeout_id && statusbar->temp_severity > severity)
+    return FALSE;
+
+  /*  we can only handle short one-liners  */
+  layout = gtk_widget_create_pango_layout (statusbar->label, message);
+
+  icon_name = gimp_get_message_icon_name (severity);
+
+  if (pango_layout_get_line_count (layout) == 1)
+    {
+      GtkAllocation label_allocation;
+      gint          width;
+
+      gtk_widget_get_allocation (statusbar->label, &label_allocation);
+
+      pango_layout_get_pixel_size (layout, &width, NULL);
+
+      if (width < label_allocation.width)
+        {
+          if (icon_name)
+            {
+              GdkPixbuf *pixbuf;
+
+              pixbuf = gimp_statusbar_load_icon (statusbar, icon_name);
+
+              width += ICON_SPACING + gdk_pixbuf_get_width (pixbuf);
+
+              g_object_unref (pixbuf);
+
+              handle_msg = (width < label_allocation.width);
+            }
+          else
+            {
+              handle_msg = TRUE;
+            }
+        }
+    }
+
+  g_object_unref (layout);
+
+  if (handle_msg)
+    gimp_statusbar_push_temp (statusbar, severity, icon_name, "%s", message);
+
+  return handle_msg;
+}
+
+static void
+gimp_statusbar_progress_canceled (GtkWidget     *button,
+                                  GimpStatusbar *statusbar)
+{
+  if (statusbar->progress_active)
+    gimp_progress_cancel (GIMP_PROGRESS (statusbar));
+}
+
+static void
+gimp_statusbar_set_text (GimpStatusbar *statusbar,
+                         const gchar   *icon_name,
+                         const gchar   *text)
+{
+  if (statusbar->progress_active)
+    {
+      gtk_progress_bar_set_text (GTK_PROGRESS_BAR (statusbar->progressbar),
+                                 text);
+    }
+  else
+    {
+      g_clear_object (&statusbar->icon);
+
+      if (icon_name)
+        statusbar->icon = gimp_statusbar_load_icon (statusbar, icon_name);
+
+      if (statusbar->icon)
+        {
+          PangoAttrList  *attrs;
+          PangoAttribute *attr;
+          PangoRectangle  rect;
+          gchar          *tmp;
+
+          tmp = g_strconcat (" ", text, NULL);
+          gtk_label_set_text (GTK_LABEL (statusbar->label), tmp);
+          g_free (tmp);
+
+          rect.x      = 0;
+          rect.y      = 0;
+          rect.width  = PANGO_SCALE * (gdk_pixbuf_get_width (statusbar->icon) +
+                                       ICON_SPACING);
+          rect.height = 0;
+
+          attrs = pango_attr_list_new ();
+
+          attr = pango_attr_shape_new (&rect, &rect);
+          attr->start_index = 0;
+          attr->end_index   = 1;
+          pango_attr_list_insert (attrs, attr);
+
+          gtk_label_set_attributes (GTK_LABEL (statusbar->label), attrs);
+          pango_attr_list_unref (attrs);
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (statusbar->label), text);
+          gtk_label_set_attributes (GTK_LABEL (statusbar->label), NULL);
+        }
+    }
+}
+
+static void
+gimp_statusbar_update (GimpStatusbar *statusbar)
+{
+  GimpStatusbarMsg *msg = NULL;
+
+  if (statusbar->messages)
+    msg = statusbar->messages->data;
+
+  if (msg && msg->text)
+    {
+      gimp_statusbar_set_text (statusbar, msg->icon_name, msg->text);
+    }
+  else
+    {
+      gimp_statusbar_set_text (statusbar, NULL, "");
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_statusbar_new (void)
+{
+  return g_object_new (GIMP_TYPE_STATUSBAR, NULL);
+}
+
+void
+gimp_statusbar_set_shell (GimpStatusbar    *statusbar,
+                          GimpDisplayShell *shell)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell == statusbar->shell)
+    return;
+
+  if (statusbar->shell)
+    {
+      g_signal_handlers_disconnect_by_func (statusbar->shell,
+                                            gimp_statusbar_shell_scaled,
+                                            statusbar);
+      g_signal_handlers_disconnect_by_func (statusbar->shell,
+                                            gimp_statusbar_shell_rotated,
+                                            statusbar);
+      g_signal_handlers_disconnect_by_func (statusbar->shell,
+                                            gimp_statusbar_shell_status_notify,
+                                            statusbar);
+    }
+
+  statusbar->shell = shell;
+
+  g_signal_connect_object (statusbar->shell, "scaled",
+                           G_CALLBACK (gimp_statusbar_shell_scaled),
+                           statusbar, 0);
+  g_signal_connect_object (statusbar->shell, "rotated",
+                           G_CALLBACK (gimp_statusbar_shell_rotated),
+                           statusbar, 0);
+  g_signal_connect_object (statusbar->shell, "notify::status",
+                           G_CALLBACK (gimp_statusbar_shell_status_notify),
+                           statusbar, 0);
+  gimp_statusbar_shell_rotated (shell, statusbar);
+}
+
+gboolean
+gimp_statusbar_get_visible (GimpStatusbar *statusbar)
+{
+  g_return_val_if_fail (GIMP_IS_STATUSBAR (statusbar), FALSE);
+
+  if (statusbar->progress_shown)
+    return FALSE;
+
+  return gtk_widget_get_visible (GTK_WIDGET (statusbar));
+}
+
+void
+gimp_statusbar_set_visible (GimpStatusbar *statusbar,
+                            gboolean       visible)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  if (statusbar->progress_shown)
+    {
+      if (visible)
+        {
+          statusbar->progress_shown = FALSE;
+          return;
+        }
+    }
+
+  gtk_widget_set_visible (GTK_WIDGET (statusbar), visible);
+}
+
+void
+gimp_statusbar_empty (GimpStatusbar *statusbar)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  gtk_widget_hide (statusbar->cursor_label);
+  gtk_widget_hide (statusbar->unit_combo);
+  gtk_widget_hide (statusbar->scale_combo);
+  gtk_widget_hide (statusbar->rotate_widget);
+  gtk_widget_hide (statusbar->horizontal_flip_icon);
+  gtk_widget_hide (statusbar->vertical_flip_icon);
+}
+
+void
+gimp_statusbar_fill (GimpStatusbar *statusbar)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  gtk_widget_show (statusbar->cursor_label);
+  gtk_widget_show (statusbar->unit_combo);
+  gtk_widget_show (statusbar->scale_combo);
+  gtk_widget_show (statusbar->rotate_widget);
+  gimp_statusbar_shell_rotated (statusbar->shell, statusbar);
+}
+
+void
+gimp_statusbar_override_window_title (GimpStatusbar *statusbar)
+{
+  GtkWidget *toplevel;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (statusbar));
+
+  if (gimp_image_window_is_iconified (GIMP_IMAGE_WINDOW (toplevel)))
+    {
+      const gchar *message = gimp_statusbar_peek (statusbar, "progress");
+
+      if (message)
+        gtk_window_set_title (GTK_WINDOW (toplevel), message);
+    }
+}
+
+void
+gimp_statusbar_restore_window_title (GimpStatusbar *statusbar)
+{
+  GtkWidget *toplevel;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (statusbar));
+
+  if (gimp_image_window_is_iconified (GIMP_IMAGE_WINDOW (toplevel)))
+    {
+      g_object_notify (G_OBJECT (statusbar->shell), "title");
+    }
+}
+
+void
+gimp_statusbar_push (GimpStatusbar *statusbar,
+                     const gchar   *context,
+                     const gchar   *icon_name,
+                     const gchar   *format,
+                     ...)
+{
+  va_list args;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (context != NULL);
+  g_return_if_fail (format != NULL);
+
+  va_start (args, format);
+  gimp_statusbar_push_valist (statusbar, context, icon_name, format, args);
+  va_end (args);
+}
+
+void
+gimp_statusbar_push_valist (GimpStatusbar *statusbar,
+                            const gchar   *context,
+                            const gchar   *icon_name,
+                            const gchar   *format,
+                            va_list        args)
+{
+  guint context_id;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (context != NULL);
+  g_return_if_fail (format != NULL);
+
+  context_id = gimp_statusbar_get_context_id (statusbar, context);
+
+  gimp_statusbar_add_message (statusbar,
+                              context_id,
+                              icon_name, format, args,
+                              /*  move_to_front =  */ TRUE);
+}
+
+void
+gimp_statusbar_push_coords (GimpStatusbar       *statusbar,
+                            const gchar         *context,
+                            const gchar         *icon_name,
+                            GimpCursorPrecision  precision,
+                            const gchar         *title,
+                            gdouble              x,
+                            const gchar         *separator,
+                            gdouble              y,
+                            const gchar         *help)
+{
+  GimpDisplayShell *shell;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (title != NULL);
+  g_return_if_fail (separator != NULL);
+
+  if (help == NULL)
+    help = "";
+
+  shell = statusbar->shell;
+
+  switch (precision)
+    {
+    case GIMP_CURSOR_PRECISION_PIXEL_CENTER:
+      x = (gint) x;
+      y = (gint) y;
+      break;
+
+    case GIMP_CURSOR_PRECISION_PIXEL_BORDER:
+      x = RINT (x);
+      y = RINT (y);
+      break;
+
+    case GIMP_CURSOR_PRECISION_SUBPIXEL:
+      break;
+    }
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    {
+      if (precision == GIMP_CURSOR_PRECISION_SUBPIXEL)
+        {
+          gimp_statusbar_push (statusbar, context,
+                               icon_name,
+                               statusbar->cursor_format_str_f,
+                               title,
+                               x,
+                               separator,
+                               y,
+                               help);
+        }
+      else
+        {
+          gimp_statusbar_push (statusbar, context,
+                               icon_name,
+                               statusbar->cursor_format_str,
+                               title,
+                               (gint) RINT (x),
+                               separator,
+                               (gint) RINT (y),
+                               help);
+        }
+    }
+  else /* show real world units */
+    {
+      gdouble xres;
+      gdouble yres;
+
+      gimp_image_get_resolution (gimp_display_get_image (shell->display),
+                                 &xres, &yres);
+
+      gimp_statusbar_push (statusbar, context,
+                           icon_name,
+                           statusbar->cursor_format_str,
+                           title,
+                           gimp_pixels_to_units (x, shell->unit, xres),
+                           separator,
+                           gimp_pixels_to_units (y, shell->unit, yres),
+                           help);
+    }
+}
+
+void
+gimp_statusbar_push_length (GimpStatusbar       *statusbar,
+                            const gchar         *context,
+                            const gchar         *icon_name,
+                            const gchar         *title,
+                            GimpOrientationType  axis,
+                            gdouble              value,
+                            const gchar         *help)
+{
+  GimpDisplayShell *shell;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (title != NULL);
+
+  if (help == NULL)
+    help = "";
+
+  shell = statusbar->shell;
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    {
+      gimp_statusbar_push (statusbar, context,
+                           icon_name,
+                           statusbar->length_format_str,
+                           title,
+                           (gint) RINT (value),
+                           help);
+    }
+  else /* show real world units */
+    {
+      gdouble xres;
+      gdouble yres;
+      gdouble resolution;
+
+      gimp_image_get_resolution (gimp_display_get_image (shell->display),
+                                 &xres, &yres);
+
+      switch (axis)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          resolution = xres;
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          resolution = yres;
+          break;
+
+        default:
+          g_return_if_reached ();
+          break;
+        }
+
+      gimp_statusbar_push (statusbar, context,
+                           icon_name,
+                           statusbar->length_format_str,
+                           title,
+                           gimp_pixels_to_units (value, shell->unit, resolution),
+                           help);
+    }
+}
+
+void
+gimp_statusbar_replace (GimpStatusbar *statusbar,
+                        const gchar   *context,
+                        const gchar   *icon_name,
+                        const gchar   *format,
+                        ...)
+{
+  va_list args;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (context != NULL);
+  g_return_if_fail (format != NULL);
+
+  va_start (args, format);
+  gimp_statusbar_replace_valist (statusbar, context, icon_name, format, args);
+  va_end (args);
+}
+
+void
+gimp_statusbar_replace_valist (GimpStatusbar *statusbar,
+                               const gchar   *context,
+                               const gchar   *icon_name,
+                               const gchar   *format,
+                               va_list        args)
+{
+  guint context_id;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (context != NULL);
+  g_return_if_fail (format != NULL);
+
+  context_id = gimp_statusbar_get_context_id (statusbar, context);
+
+  gimp_statusbar_add_message (statusbar,
+                              context_id,
+                              icon_name, format, args,
+                              /*  move_to_front =  */ FALSE);
+}
+
+const gchar *
+gimp_statusbar_peek (GimpStatusbar *statusbar,
+                     const gchar   *context)
+{
+  GSList *list;
+  guint   context_id;
+
+  g_return_val_if_fail (GIMP_IS_STATUSBAR (statusbar), NULL);
+  g_return_val_if_fail (context != NULL, NULL);
+
+  context_id = gimp_statusbar_get_context_id (statusbar, context);
+
+  for (list = statusbar->messages; list; list = list->next)
+    {
+      GimpStatusbarMsg *msg = list->data;
+
+      if (msg->context_id == context_id)
+        {
+          return msg->text;
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_statusbar_pop (GimpStatusbar *statusbar,
+                    const gchar   *context)
+{
+  guint context_id;
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (context != NULL);
+
+  context_id = gimp_statusbar_get_context_id (statusbar, context);
+
+  gimp_statusbar_remove_message (statusbar,
+                                 context_id);
+}
+
+void
+gimp_statusbar_push_temp (GimpStatusbar       *statusbar,
+                          GimpMessageSeverity  severity,
+                          const gchar         *icon_name,
+                          const gchar         *format,
+                          ...)
+{
+  va_list args;
+
+  va_start (args, format);
+  gimp_statusbar_push_temp_valist (statusbar, severity, icon_name, format, args);
+  va_end (args);
+}
+
+void
+gimp_statusbar_push_temp_valist (GimpStatusbar       *statusbar,
+                                 GimpMessageSeverity  severity,
+                                 const gchar         *icon_name,
+                                 const gchar         *format,
+                                 va_list              args)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+  g_return_if_fail (severity <= GIMP_MESSAGE_WARNING);
+  g_return_if_fail (format != NULL);
+
+  /*  don't accept a message if we are already displaying a more severe one  */
+  if (statusbar->temp_timeout_id && statusbar->temp_severity > severity)
+    return;
+
+  if (statusbar->temp_timeout_id)
+    g_source_remove (statusbar->temp_timeout_id);
+
+  statusbar->temp_timeout_id =
+    g_timeout_add (MESSAGE_TIMEOUT,
+                   (GSourceFunc) gimp_statusbar_temp_timeout, statusbar);
+
+  statusbar->temp_severity = severity;
+
+  gimp_statusbar_add_message (statusbar,
+                              statusbar->temp_context_id,
+                              icon_name, format, args,
+                              /*  move_to_front =  */ TRUE);
+
+  if (severity >= GIMP_MESSAGE_WARNING)
+    gimp_widget_blink (statusbar->label);
+}
+
+void
+gimp_statusbar_pop_temp (GimpStatusbar *statusbar)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  if (statusbar->temp_timeout_id)
+    {
+      g_source_remove (statusbar->temp_timeout_id);
+      statusbar->temp_timeout_id = 0;
+
+      gimp_statusbar_remove_message (statusbar,
+                                     statusbar->temp_context_id);
+    }
+}
+
+void
+gimp_statusbar_update_cursor (GimpStatusbar       *statusbar,
+                              GimpCursorPrecision  precision,
+                              gdouble              x,
+                              gdouble              y)
+{
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  gchar             buffer[CURSOR_LEN];
+
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  shell = statusbar->shell;
+  image = gimp_display_get_image (shell->display);
+
+  if (! image                            ||
+      x <  0                             ||
+      y <  0                             ||
+      x >= gimp_image_get_width  (image) ||
+      y >= gimp_image_get_height (image))
+    {
+      gtk_widget_set_sensitive (statusbar->cursor_label, FALSE);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (statusbar->cursor_label, TRUE);
+    }
+
+  switch (precision)
+    {
+    case GIMP_CURSOR_PRECISION_PIXEL_CENTER:
+      x = (gint) x;
+      y = (gint) y;
+      break;
+
+    case GIMP_CURSOR_PRECISION_PIXEL_BORDER:
+      x = RINT (x);
+      y = RINT (y);
+      break;
+
+    case GIMP_CURSOR_PRECISION_SUBPIXEL:
+      break;
+    }
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    {
+      if (precision == GIMP_CURSOR_PRECISION_SUBPIXEL)
+        {
+          g_snprintf (buffer, sizeof (buffer),
+                      statusbar->cursor_format_str_f,
+                      "", x, ", ", y, "");
+        }
+      else
+        {
+          g_snprintf (buffer, sizeof (buffer),
+                      statusbar->cursor_format_str,
+                      "", (gint) RINT (x), ", ", (gint) RINT (y), "");
+        }
+    }
+  else /* show real world units */
+    {
+      GtkTreeModel  *model;
+      GimpUnitStore *store;
+
+      model = gtk_combo_box_get_model (GTK_COMBO_BOX (statusbar->unit_combo));
+      store = GIMP_UNIT_STORE (model);
+
+      gimp_unit_store_set_pixel_values (store, x, y);
+      gimp_unit_store_get_values (store, shell->unit, &x, &y);
+
+      g_snprintf (buffer, sizeof (buffer),
+                  statusbar->cursor_format_str,
+                  "", x, ", ", y, "");
+    }
+
+  gtk_label_set_text (GTK_LABEL (statusbar->cursor_label), buffer);
+}
+
+void
+gimp_statusbar_clear_cursor (GimpStatusbar *statusbar)
+{
+  gtk_label_set_text (GTK_LABEL (statusbar->cursor_label), "");
+  gtk_widget_set_sensitive (statusbar->cursor_label, TRUE);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_statusbar_label_expose (GtkWidget      *widget,
+                             GdkEventExpose *event,
+                             GimpStatusbar  *statusbar)
+{
+  if (statusbar->icon)
+    {
+      cairo_t        *cr;
+      PangoRectangle  rect;
+      gint            x, y;
+
+      cr = gdk_cairo_create (event->window);
+
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      gtk_label_get_layout_offsets (GTK_LABEL (widget), &x, &y);
+
+      pango_layout_index_to_pos (gtk_label_get_layout (GTK_LABEL (widget)), 0,
+                                 &rect);
+
+      /*  the rectangle width is negative when rendering right-to-left  */
+      x += PANGO_PIXELS (rect.x) + (rect.width < 0 ?
+                                    PANGO_PIXELS (rect.width) : 0);
+      y += PANGO_PIXELS (rect.y / ICON_SIZE);
+
+      gdk_cairo_set_source_pixbuf (cr, statusbar->icon, x, y);
+      cairo_paint (cr);
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_statusbar_shell_scaled (GimpDisplayShell *shell,
+                             GimpStatusbar    *statusbar)
+{
+  static PangoLayout *layout = NULL;
+
+  GimpImage    *image = gimp_display_get_image (shell->display);
+  GtkTreeModel *model;
+  const gchar  *text;
+  gint          image_width;
+  gint          image_height;
+  gdouble       image_xres;
+  gdouble       image_yres;
+  gint          width;
+
+  if (image)
+    {
+      image_width  = gimp_image_get_width  (image);
+      image_height = gimp_image_get_height (image);
+      gimp_image_get_resolution (image, &image_xres, &image_yres);
+    }
+  else
+    {
+      image_width  = shell->disp_width;
+      image_height = shell->disp_height;
+      image_xres   = shell->display->config->monitor_xres;
+      image_yres   = shell->display->config->monitor_yres;
+    }
+
+  g_signal_handlers_block_by_func (statusbar->scale_combo,
+                                   gimp_statusbar_scale_changed, statusbar);
+  gimp_scale_combo_box_set_scale (GIMP_SCALE_COMBO_BOX (statusbar->scale_combo),
+                                  gimp_zoom_model_get_factor (shell->zoom));
+  g_signal_handlers_unblock_by_func (statusbar->scale_combo,
+                                     gimp_statusbar_scale_changed, statusbar);
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (statusbar->unit_combo));
+  gimp_unit_store_set_resolutions (GIMP_UNIT_STORE (model),
+                                   image_xres, image_yres);
+
+  g_signal_handlers_block_by_func (statusbar->unit_combo,
+                                   gimp_statusbar_unit_changed, statusbar);
+  gimp_unit_combo_box_set_active (GIMP_UNIT_COMBO_BOX (statusbar->unit_combo),
+                                  shell->unit);
+  g_signal_handlers_unblock_by_func (statusbar->unit_combo,
+                                     gimp_statusbar_unit_changed, statusbar);
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    {
+      g_snprintf (statusbar->cursor_format_str,
+                  sizeof (statusbar->cursor_format_str),
+                  "%%s%%d%%s%%d%%s");
+      g_snprintf (statusbar->cursor_format_str_f,
+                  sizeof (statusbar->cursor_format_str_f),
+                  "%%s%%.1f%%s%%.1f%%s");
+      g_snprintf (statusbar->length_format_str,
+                  sizeof (statusbar->length_format_str),
+                  "%%s%%d%%s");
+    }
+  else /* show real world units */
+    {
+      gint w_digits;
+      gint h_digits;
+
+      w_digits = gimp_unit_get_scaled_digits (shell->unit, image_xres);
+      h_digits = gimp_unit_get_scaled_digits (shell->unit, image_yres);
+
+      g_snprintf (statusbar->cursor_format_str,
+                  sizeof (statusbar->cursor_format_str),
+                  "%%s%%.%df%%s%%.%df%%s",
+                  w_digits, h_digits);
+      strcpy (statusbar->cursor_format_str_f, statusbar->cursor_format_str);
+      g_snprintf (statusbar->length_format_str,
+                  sizeof (statusbar->length_format_str),
+                  "%%s%%.%df%%s", MAX (w_digits, h_digits));
+    }
+
+  gimp_statusbar_update_cursor (statusbar, GIMP_CURSOR_PRECISION_SUBPIXEL,
+                                -image_width, -image_height);
+
+  text = gtk_label_get_text (GTK_LABEL (statusbar->cursor_label));
+
+  /* one static layout for all displays should be fine */
+  if (! layout)
+    layout = gtk_widget_create_pango_layout (statusbar->cursor_label, NULL);
+
+  pango_layout_set_text (layout, text, -1);
+  pango_layout_get_pixel_size (layout, &width, NULL);
+
+  gtk_widget_set_size_request (statusbar->cursor_label, width, -1);
+
+  gimp_statusbar_clear_cursor (statusbar);
+}
+
+static void
+gimp_statusbar_shell_rotated (GimpDisplayShell *shell,
+                              GimpStatusbar    *statusbar)
+{
+  if (shell->rotate_angle != 0.0)
+    {
+      /* Degree symbol U+00B0. There are no spaces between the value and the
+       * unit for angular rotation.
+       */
+      gchar *text = g_strdup_printf (" %.2f\xC2\xB0", shell->rotate_angle);
+
+      gtk_label_set_text (GTK_LABEL (statusbar->rotate_label), text);
+      g_free (text);
+
+      gtk_widget_show (statusbar->rotate_widget);
+    }
+  else
+    {
+      gtk_widget_hide (statusbar->rotate_widget);
+    }
+
+  if (shell->flip_horizontally)
+    gtk_widget_show (statusbar->horizontal_flip_icon);
+  else
+    gtk_widget_hide (statusbar->horizontal_flip_icon);
+
+  if (shell->flip_vertically)
+    gtk_widget_show (statusbar->vertical_flip_icon);
+  else
+    gtk_widget_hide (statusbar->vertical_flip_icon);
+}
+
+static void
+gimp_statusbar_shell_status_notify (GimpDisplayShell *shell,
+                                    const GParamSpec *pspec,
+                                    GimpStatusbar    *statusbar)
+{
+  gimp_statusbar_replace (statusbar, "title",
+                          NULL, "%s", shell->status);
+}
+
+static void
+gimp_statusbar_unit_changed (GimpUnitComboBox *combo,
+                             GimpStatusbar    *statusbar)
+{
+  gimp_display_shell_set_unit (statusbar->shell,
+                               gimp_unit_combo_box_get_active (combo));
+}
+
+static void
+gimp_statusbar_scale_changed (GimpScaleComboBox *combo,
+                              GimpStatusbar     *statusbar)
+{
+  gimp_display_shell_scale (statusbar->shell,
+                            GIMP_ZOOM_TO,
+                            gimp_scale_combo_box_get_scale (combo),
+                            GIMP_ZOOM_FOCUS_BEST_GUESS);
+}
+
+static void
+gimp_statusbar_scale_activated (GimpScaleComboBox *combo,
+                                GimpStatusbar     *statusbar)
+{
+  gtk_widget_grab_focus (statusbar->shell->canvas);
+}
+
+static gboolean
+gimp_statusbar_rotate_pressed (GtkWidget     *event_box,
+                               GdkEvent      *event,
+                               GimpStatusbar *statusbar)
+{
+  GimpImageWindow *window = gimp_display_shell_get_window (statusbar->shell);
+  GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+
+  gimp_ui_manager_activate_action (manager, "view", "view-rotate-other");
+  return FALSE;
+}
+
+static gboolean
+gimp_statusbar_horiz_flip_pressed (GtkWidget     *event_box,
+                                   GdkEvent      *event,
+                                   GimpStatusbar *statusbar)
+{
+  GimpImageWindow *window = gimp_display_shell_get_window (statusbar->shell);
+  GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+
+  gimp_ui_manager_activate_action (manager, "view", "view-flip-horizontally");
+
+  return FALSE;
+}
+
+static gboolean
+gimp_statusbar_vert_flip_pressed (GtkWidget     *event_box,
+                                  GdkEvent      *event,
+                                  GimpStatusbar *statusbar)
+{
+  GimpImageWindow *window = gimp_display_shell_get_window (statusbar->shell);
+  GimpUIManager   *manager = gimp_image_window_get_ui_manager (window);
+
+  gimp_ui_manager_activate_action (manager, "view", "view-flip-vertically");
+
+  return FALSE;
+}
+
+static guint
+gimp_statusbar_get_context_id (GimpStatusbar *statusbar,
+                               const gchar   *context)
+{
+  guint id = GPOINTER_TO_UINT (g_hash_table_lookup (statusbar->context_ids,
+                                                    context));
+
+  if (! id)
+    {
+      id = statusbar->seq_context_id++;
+
+      g_hash_table_insert (statusbar->context_ids,
+                           g_strdup (context), GUINT_TO_POINTER (id));
+    }
+
+  return id;
+}
+
+static gboolean
+gimp_statusbar_temp_timeout (GimpStatusbar *statusbar)
+{
+  gimp_statusbar_pop_temp (statusbar);
+
+  return FALSE;
+}
+
+static void
+gimp_statusbar_add_message (GimpStatusbar *statusbar,
+                            guint          context_id,
+                            const gchar   *icon_name,
+                            const gchar   *format,
+                            va_list        args,
+                            gboolean       move_to_front)
+{
+  gchar            *message;
+  GSList           *list;
+  GimpStatusbarMsg *msg;
+  gint              position;
+
+  message = gimp_statusbar_vprintf (format, args);
+
+  for (list = statusbar->messages; list; list = g_slist_next (list))
+    {
+      msg = list->data;
+
+      if (msg->context_id == context_id)
+        {
+          gboolean is_front_message = (list == statusbar->messages);
+
+          if ((is_front_message || ! move_to_front) &&
+              strcmp (msg->text, message) == 0      &&
+              g_strcmp0 (msg->icon_name, icon_name) == 0)
+            {
+              g_free (message);
+              return;
+            }
+
+          if (move_to_front)
+            {
+              statusbar->messages = g_slist_remove (statusbar->messages, msg);
+              gimp_statusbar_msg_free (msg);
+
+              break;
+            }
+          else
+            {
+              g_free (msg->icon_name);
+              msg->icon_name = g_strdup (icon_name);
+
+              g_free (msg->text);
+              msg->text = message;
+
+              if (is_front_message)
+                gimp_statusbar_update (statusbar);
+
+              return;
+            }
+        }
+    }
+
+  msg = g_slice_new (GimpStatusbarMsg);
+
+  msg->context_id = context_id;
+  msg->icon_name  = g_strdup (icon_name);
+  msg->text       = message;
+
+  /*  find the position at which to insert the new message  */
+  position = 0;
+  /*  progress messages are always at the front of the list  */
+  if (! (statusbar->progress_active &&
+         context_id == gimp_statusbar_get_context_id (statusbar, "progress")))
+    {
+      if (statusbar->progress_active)
+        position++;
+
+      /*  temporary messages are in front of all other non-progress messages  */
+      if (statusbar->temp_timeout_id &&
+          context_id != statusbar->temp_context_id)
+        position++;
+    }
+
+  statusbar->messages = g_slist_insert (statusbar->messages, msg, position);
+
+  if (position == 0)
+    gimp_statusbar_update (statusbar);
+}
+
+static void
+gimp_statusbar_remove_message (GimpStatusbar *statusbar,
+                               guint          context_id)
+{
+  GSList   *list;
+  gboolean  needs_update = FALSE;
+
+  for (list = statusbar->messages; list; list = g_slist_next (list))
+    {
+      GimpStatusbarMsg *msg = list->data;
+
+      if (msg->context_id == context_id)
+        {
+          needs_update = (list == statusbar->messages);
+
+          statusbar->messages = g_slist_remove (statusbar->messages, msg);
+          gimp_statusbar_msg_free (msg);
+
+          break;
+        }
+    }
+
+  if (needs_update)
+    gimp_statusbar_update (statusbar);
+}
+
+static void
+gimp_statusbar_msg_free (GimpStatusbarMsg *msg)
+{
+  g_free (msg->icon_name);
+  g_free (msg->text);
+
+  g_slice_free (GimpStatusbarMsg, msg);
+}
+
+static gchar *
+gimp_statusbar_vprintf (const gchar *format,
+                        va_list      args)
+{
+  gchar *message;
+  gchar *newline;
+
+  message = g_strdup_vprintf (format, args);
+
+  /*  guard us from multi-line strings  */
+  newline = strchr (message, '\r');
+  if (newline)
+    *newline = '\0';
+
+  newline = strchr (message, '\n');
+  if (newline)
+    *newline = '\0';
+
+  return message;
+}
+
+static GdkPixbuf *
+gimp_statusbar_load_icon (GimpStatusbar *statusbar,
+                          const gchar   *icon_name)
+{
+  GdkPixbuf *icon;
+
+  if (G_UNLIKELY (! statusbar->icon_hash))
+    {
+      statusbar->icon_hash =
+        g_hash_table_new_full (g_str_hash,
+                               g_str_equal,
+                               (GDestroyNotify) g_free,
+                               (GDestroyNotify) g_object_unref);
+    }
+
+  icon = g_hash_table_lookup (statusbar->icon_hash, icon_name);
+
+  if (icon)
+    return g_object_ref (icon);
+
+  icon = gimp_widget_load_icon (statusbar->label, icon_name, ICON_SIZE);
+
+  /* this is not optimal but so what */
+  if (g_hash_table_size (statusbar->icon_hash) > 16)
+    g_hash_table_remove_all (statusbar->icon_hash);
+
+  g_hash_table_insert (statusbar->icon_hash,
+                       g_strdup (icon_name), g_object_ref (icon));
+
+  return icon;
+}
diff --git a/app/display/gimpstatusbar.h b/app/display/gimpstatusbar.h
new file mode 100644
index 0000000..7d5f279
--- /dev/null
+++ b/app/display/gimpstatusbar.h
@@ -0,0 +1,158 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_STATUSBAR_H__
+#define __GIMP_STATUSBAR_H__
+
+G_BEGIN_DECLS
+
+
+/*  maximal length of the format string for the cursor-coordinates  */
+#define CURSOR_FORMAT_LENGTH 32
+
+
+#define GIMP_TYPE_STATUSBAR            (gimp_statusbar_get_type ())
+#define GIMP_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STATUSBAR, GimpStatusbar))
+#define GIMP_STATUSBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STATUSBAR, GimpStatusbarClass))
+#define GIMP_IS_STATUSBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_STATUSBAR))
+#define GIMP_IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_STATUSBAR))
+#define GIMP_STATUSBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_STATUSBAR, GimpStatusbarClass))
+
+typedef struct _GimpStatusbarClass GimpStatusbarClass;
+
+struct _GimpStatusbar
+{
+  GtkStatusbar         parent_instance;
+
+  GimpDisplayShell    *shell;
+
+  GSList              *messages;
+  GHashTable          *context_ids;
+  guint                seq_context_id;
+
+  GdkPixbuf           *icon;
+  GHashTable          *icon_hash;
+
+  guint                temp_context_id;
+  guint                temp_timeout_id;
+  GimpMessageSeverity  temp_severity;
+
+  gchar                cursor_format_str[CURSOR_FORMAT_LENGTH];
+  gchar                cursor_format_str_f[CURSOR_FORMAT_LENGTH];
+  gchar                length_format_str[CURSOR_FORMAT_LENGTH];
+
+  GtkWidget           *cursor_label;
+  GtkWidget           *unit_combo;
+  GtkWidget           *scale_combo;
+  GtkWidget           *rotate_widget;
+  GtkWidget           *rotate_label;
+  GtkWidget           *horizontal_flip_icon;
+  GtkWidget           *vertical_flip_icon;
+  GtkWidget           *label; /* same as GtkStatusbar->label */
+
+  GtkWidget           *progressbar;
+  GtkWidget           *cancel_button;
+  gboolean             progress_active;
+  gboolean             progress_shown;
+  gdouble              progress_value;
+  guint64              progress_last_update_time;
+};
+
+struct _GimpStatusbarClass
+{
+  GtkStatusbarClass parent_class;
+};
+
+
+GType       gimp_statusbar_get_type              (void) G_GNUC_CONST;
+GtkWidget * gimp_statusbar_new                   (void);
+
+void        gimp_statusbar_set_shell             (GimpStatusbar       *statusbar,
+                                                  GimpDisplayShell    *shell);
+
+gboolean    gimp_statusbar_get_visible           (GimpStatusbar       *statusbar);
+void        gimp_statusbar_set_visible           (GimpStatusbar       *statusbar,
+                                                  gboolean             visible);
+void        gimp_statusbar_empty                 (GimpStatusbar       *statusbar);
+void        gimp_statusbar_fill                  (GimpStatusbar       *statusbar);
+
+void        gimp_statusbar_override_window_title (GimpStatusbar       *statusbar);
+void        gimp_statusbar_restore_window_title  (GimpStatusbar       *statusbar);
+
+void        gimp_statusbar_push                  (GimpStatusbar       *statusbar,
+                                                  const gchar         *context,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *format,
+                                                  ...) G_GNUC_PRINTF (4, 5);
+void        gimp_statusbar_push_valist           (GimpStatusbar       *statusbar,
+                                                  const gchar         *context,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *format,
+                                                  va_list              args) G_GNUC_PRINTF (4, 0);
+void        gimp_statusbar_push_coords           (GimpStatusbar       *statusbar,
+                                                  const gchar         *context,
+                                                  const gchar         *icon_name,
+                                                  GimpCursorPrecision  precision,
+                                                  const gchar         *title,
+                                                  gdouble              x,
+                                                  const gchar         *separator,
+                                                  gdouble              y,
+                                                  const gchar         *help);
+void        gimp_statusbar_push_length           (GimpStatusbar       *statusbar,
+                                                  const gchar         *context,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *title,
+                                                  GimpOrientationType  axis,
+                                                  gdouble              value,
+                                                  const gchar         *help);
+void        gimp_statusbar_replace               (GimpStatusbar       *statusbar,
+                                                  const gchar         *context,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *format,
+                                                  ...) G_GNUC_PRINTF (4, 5);
+void        gimp_statusbar_replace_valist        (GimpStatusbar       *statusbar,
+                                                  const gchar         *context,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *format,
+                                                  va_list              args) G_GNUC_PRINTF (4, 0);
+const gchar * gimp_statusbar_peek                (GimpStatusbar       *statusbar,
+                                                  const gchar         *context);
+void        gimp_statusbar_pop                   (GimpStatusbar       *statusbar,
+                                                  const gchar         *context);
+
+void        gimp_statusbar_push_temp             (GimpStatusbar       *statusbar,
+                                                  GimpMessageSeverity  severity,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *format,
+                                                  ...) G_GNUC_PRINTF (4, 5);
+void        gimp_statusbar_push_temp_valist      (GimpStatusbar       *statusbar,
+                                                  GimpMessageSeverity  severity,
+                                                  const gchar         *icon_name,
+                                                  const gchar         *format,
+                                                  va_list              args) G_GNUC_PRINTF (4, 0);
+void        gimp_statusbar_pop_temp              (GimpStatusbar       *statusbar);
+
+void        gimp_statusbar_update_cursor         (GimpStatusbar       *statusbar,
+                                                  GimpCursorPrecision  precision,
+                                                  gdouble              x,
+                                                  gdouble              y);
+void        gimp_statusbar_clear_cursor          (GimpStatusbar       *statusbar);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_STATUSBAR_H__ */
diff --git a/app/display/gimptoolcompass.c b/app/display/gimptoolcompass.c
new file mode 100644
index 0000000..3d9045b
--- /dev/null
+++ b/app/display/gimptoolcompass.c
@@ -0,0 +1,1218 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolcompass.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Measure tool
+ * Copyright (C) 1999-2003 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpimage.h"
+#include "core/gimpmarshal.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvashandle.h"
+#include "gimpcanvasline.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-appearance.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpdisplayshell-utils.h"
+#include "gimptoolcompass.h"
+
+#include "gimp-intl.h"
+
+
+#define ARC_RADIUS 30
+#define ARC_GAP    (ARC_RADIUS / 2)
+#define EPSILON    1e-6
+
+
+/*  possible measure functions  */
+typedef enum
+{
+  CREATING,
+  ADDING,
+  MOVING,
+  MOVING_ALL,
+  GUIDING,
+  FINISHED
+} CompassFunction;
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_N_POINTS,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2,
+  PROP_X3,
+  PROP_Y3,
+  PROP_PIXEL_ANGLE,
+  PROP_UNIT_ANGLE,
+  PROP_EFFECTIVE_ORIENTATION
+};
+
+enum
+{
+  CREATE_GUIDES,
+  LAST_SIGNAL
+};
+
+struct _GimpToolCompassPrivate
+{
+  GimpCompassOrientation  orientation;
+  gint                    n_points;
+  gint                    x[3];
+  gint                    y[3];
+
+  GimpVector2             radius1;
+  GimpVector2             radius2;
+  gdouble                 display_angle;
+  gdouble                 pixel_angle;
+  gdouble                 unit_angle;
+  GimpCompassOrientation  effective_orientation;
+
+  CompassFunction         function;
+  gdouble                 mouse_x;
+  gdouble                 mouse_y;
+  gint                    last_x;
+  gint                    last_y;
+  gint                    point;
+
+  GimpCanvasItem         *line1;
+  GimpCanvasItem         *line2;
+  GimpCanvasItem         *arc;
+  GimpCanvasItem         *arc_line;
+  GimpCanvasItem         *handles[3];
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_compass_constructed     (GObject                *object);
+static void     gimp_tool_compass_set_property    (GObject                *object,
+                                                   guint                   property_id,
+                                                   const GValue           *value,
+                                                   GParamSpec             *pspec);
+static void     gimp_tool_compass_get_property    (GObject                *object,
+                                                   guint                   property_id,
+                                                   GValue                 *value,
+                                                   GParamSpec             *pspec);
+
+static void     gimp_tool_compass_changed         (GimpToolWidget         *widget);
+static gint     gimp_tool_compass_button_press    (GimpToolWidget         *widget,
+                                                   const GimpCoords       *coords,
+                                                   guint32                 time,
+                                                   GdkModifierType         state,
+                                                   GimpButtonPressType     press_type);
+static void     gimp_tool_compass_button_release  (GimpToolWidget         *widget,
+                                                   const GimpCoords       *coords,
+                                                   guint32                 time,
+                                                   GdkModifierType         state,
+                                                   GimpButtonReleaseType   release_type);
+static void     gimp_tool_compass_motion          (GimpToolWidget         *widget,
+                                                   const GimpCoords       *coords,
+                                                   guint32                 time,
+                                                   GdkModifierType         state);
+static GimpHit  gimp_tool_compass_hit             (GimpToolWidget         *widget,
+                                                   const GimpCoords       *coords,
+                                                   GdkModifierType         state,
+                                                   gboolean                proximity);
+static void     gimp_tool_compass_hover           (GimpToolWidget         *widget,
+                                                   const GimpCoords       *coords,
+                                                   GdkModifierType         state,
+                                                   gboolean                proximity);
+static void     gimp_tool_compass_leave_notify    (GimpToolWidget         *widget);
+static void     gimp_tool_compass_motion_modifier (GimpToolWidget         *widget,
+                                                   GdkModifierType         key,
+                                                   gboolean                press,
+                                                   GdkModifierType         state);
+static gboolean gimp_tool_compass_get_cursor      (GimpToolWidget         *widget,
+                                                   const GimpCoords       *coords,
+                                                   GdkModifierType         state,
+                                                   GimpCursorType         *cursor,
+                                                   GimpToolCursorType     *tool_cursor,
+                                                   GimpCursorModifier     *modifier);
+
+static gint     gimp_tool_compass_get_point       (GimpToolCompass        *compass,
+                                                   const GimpCoords       *coords);
+static void     gimp_tool_compass_update_hilight  (GimpToolCompass        *compass);
+static void     gimp_tool_compass_update_angle    (GimpToolCompass        *compass,
+                                                   GimpCompassOrientation  orientation,
+                                                   gboolean                flip);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolCompass, gimp_tool_compass,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_compass_parent_class
+
+static guint compass_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_tool_compass_class_init (GimpToolCompassClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed      = gimp_tool_compass_constructed;
+  object_class->set_property     = gimp_tool_compass_set_property;
+  object_class->get_property     = gimp_tool_compass_get_property;
+
+  widget_class->changed          = gimp_tool_compass_changed;
+  widget_class->button_press     = gimp_tool_compass_button_press;
+  widget_class->button_release   = gimp_tool_compass_button_release;
+  widget_class->motion           = gimp_tool_compass_motion;
+  widget_class->hit              = gimp_tool_compass_hit;
+  widget_class->hover            = gimp_tool_compass_hover;
+  widget_class->leave_notify     = gimp_tool_compass_leave_notify;
+  widget_class->motion_modifier  = gimp_tool_compass_motion_modifier;
+  widget_class->get_cursor       = gimp_tool_compass_get_cursor;
+  widget_class->update_on_scale  = TRUE;
+  widget_class->update_on_rotate = TRUE;
+
+  compass_signals[CREATE_GUIDES] =
+    g_signal_new ("create-guides",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolCompassClass, create_guides),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT_BOOLEAN_BOOLEAN,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_BOOLEAN,
+                  G_TYPE_BOOLEAN);
+
+  g_object_class_install_property (object_class, PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation", NULL, NULL,
+                                                      GIMP_TYPE_COMPASS_ORIENTATION,
+                                                      GIMP_COMPASS_ORIENTATION_AUTO,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_N_POINTS,
+                                   g_param_spec_int ("n-points", NULL, NULL,
+                                                     1, 3, 1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_int ("x1", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_int ("y1", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_int ("x2", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_int ("y2", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X3,
+                                   g_param_spec_int ("x3", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y3,
+                                   g_param_spec_int ("y3", NULL, NULL,
+                                                     -GIMP_MAX_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIXEL_ANGLE,
+                                   g_param_spec_double ("pixel-angle", NULL, NULL,
+                                                        -G_PI, G_PI, 0.0,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_UNIT_ANGLE,
+                                   g_param_spec_double ("unit-angle", NULL, NULL,
+                                                        -G_PI, G_PI, 0.0,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_EFFECTIVE_ORIENTATION,
+                                   g_param_spec_enum ("effective-orientation", NULL, NULL,
+                                                      GIMP_TYPE_COMPASS_ORIENTATION,
+                                                      GIMP_COMPASS_ORIENTATION_AUTO,
+                                                      GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_tool_compass_init (GimpToolCompass *compass)
+{
+  compass->private = gimp_tool_compass_get_instance_private (compass);
+
+  compass->private->point = -1;
+}
+
+static void
+gimp_tool_compass_constructed (GObject *object)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (object);
+  GimpToolWidget         *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolCompassPrivate *private = compass->private;
+  GimpCanvasGroup        *stroke_group;
+  gint                    i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  stroke_group = gimp_tool_widget_add_stroke_group (widget);
+
+  gimp_tool_widget_push_group (widget, stroke_group);
+
+  private->line1 = gimp_tool_widget_add_line (widget,
+                                              private->x[0],
+                                              private->y[0],
+                                              private->x[1],
+                                              private->y[1]);
+
+  private->line2 = gimp_tool_widget_add_line (widget,
+                                              private->x[0],
+                                              private->y[0],
+                                              private->x[2],
+                                              private->y[2]);
+
+  private->arc = gimp_tool_widget_add_handle (widget,
+                                              GIMP_HANDLE_CIRCLE,
+                                              private->x[0],
+                                              private->y[0],
+                                              ARC_RADIUS * 2 + 1,
+                                              ARC_RADIUS * 2 + 1,
+                                              GIMP_HANDLE_ANCHOR_CENTER);
+
+  private->arc_line = gimp_tool_widget_add_line (widget,
+                                                 private->x[0],
+                                                 private->y[0],
+                                                 private->x[0] + 10,
+                                                 private->y[0]);
+
+  gimp_tool_widget_pop_group (widget);
+
+  for (i = 0; i < 3; i++)
+    {
+      private->handles[i] =
+        gimp_tool_widget_add_handle (widget,
+                                     i == 0 ?
+                                     GIMP_HANDLE_CIRCLE : GIMP_HANDLE_CROSS,
+                                     private->x[i],
+                                     private->y[i],
+                                     GIMP_CANVAS_HANDLE_SIZE_CROSS,
+                                     GIMP_CANVAS_HANDLE_SIZE_CROSS,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+    }
+
+  gimp_tool_compass_changed (widget);
+}
+
+static void
+gimp_tool_compass_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (object);
+  GimpToolCompassPrivate *private = compass->private;
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      private->orientation = g_value_get_enum (value);
+      break;
+    case PROP_N_POINTS:
+      private->n_points = g_value_get_int (value);
+      break;
+    case PROP_X1:
+      private->x[0] = g_value_get_int (value);
+      break;
+    case PROP_Y1:
+      private->y[0] = g_value_get_int (value);
+      break;
+    case PROP_X2:
+      private->x[1] = g_value_get_int (value);
+      break;
+    case PROP_Y2:
+      private->y[1] = g_value_get_int (value);
+      break;
+    case PROP_X3:
+      private->x[2] = g_value_get_int (value);
+      break;
+    case PROP_Y3:
+      private->y[2] = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_compass_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (object);
+  GimpToolCompassPrivate *private = compass->private;
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, private->orientation);
+      break;
+    case PROP_N_POINTS:
+      g_value_set_int (value, private->n_points);
+      break;
+    case PROP_X1:
+      g_value_set_int (value, private->x[0]);
+      break;
+    case PROP_Y1:
+      g_value_set_int (value, private->y[0]);
+      break;
+    case PROP_X2:
+      g_value_set_int (value, private->x[1]);
+      break;
+    case PROP_Y2:
+      g_value_set_int (value, private->y[1]);
+      break;
+    case PROP_X3:
+      g_value_set_int (value, private->x[2]);
+      break;
+    case PROP_Y3:
+      g_value_set_int (value, private->y[2]);
+      break;
+    case PROP_PIXEL_ANGLE:
+      g_value_set_double (value, private->pixel_angle);
+      break;
+    case PROP_UNIT_ANGLE:
+      g_value_set_double (value, private->unit_angle);
+      break;
+    case PROP_EFFECTIVE_ORIENTATION:
+      g_value_set_enum (value, private->effective_orientation);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_compass_changed (GimpToolWidget *widget)
+{
+  GimpToolCompass        *compass       = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private       = compass->private;
+  GimpDisplayShell       *shell         = gimp_tool_widget_get_shell (widget);
+  gdouble                 angle1;
+  gdouble                 angle2;
+  gint                    draw_arc      = 0;
+  gboolean                draw_arc_line = FALSE;
+  gdouble                 arc_line_display_length;
+  gdouble                 arc_line_length;
+
+  gimp_tool_compass_update_angle (compass, private->orientation, FALSE);
+
+  angle1 = -atan2 (private->radius1.y * shell->scale_y,
+                   private->radius1.x * shell->scale_x);
+  angle2 = -private->display_angle;
+
+  gimp_canvas_line_set (private->line1,
+                        private->x[0],
+                        private->y[0],
+                        private->x[1],
+                        private->y[1]);
+  gimp_canvas_item_set_visible (private->line1, private->n_points > 1);
+  if (private->n_points > 1 &&
+      gimp_canvas_item_transform_distance (private->line1,
+                                           private->x[0],
+                                           private->y[0],
+                                           private->x[1],
+                                           private->y[1]) > ARC_RADIUS)
+    {
+      draw_arc++;
+    }
+
+
+  arc_line_display_length = ARC_RADIUS                           +
+                            (GIMP_CANVAS_HANDLE_SIZE_CROSS >> 1) +
+                            ARC_GAP;
+  arc_line_length         = arc_line_display_length              /
+                            hypot (private->radius2.x * shell->scale_x,
+                                  private->radius2.y * shell->scale_y);
+
+  if (private->n_points > 2)
+    {
+      gdouble length = gimp_canvas_item_transform_distance (private->line2,
+                                                            private->x[0],
+                                                            private->y[0],
+                                                            private->x[2],
+                                                            private->y[2]);
+
+      if (length > ARC_RADIUS)
+        {
+          draw_arc++;
+          draw_arc_line = TRUE;
+
+          if (length > arc_line_display_length)
+            {
+              gimp_canvas_line_set (
+                private->line2,
+                private->x[0] + private->radius2.x * arc_line_length,
+                private->y[0] + private->radius2.y * arc_line_length,
+                private->x[2],
+                private->y[2]);
+              gimp_canvas_item_set_visible (private->line2, TRUE);
+            }
+          else
+            {
+              gimp_canvas_item_set_visible (private->line2, FALSE);
+            }
+        }
+      else
+        {
+          gimp_canvas_line_set (private->line2,
+                                private->x[0],
+                                private->y[0],
+                                private->x[2],
+                                private->y[2]);
+          gimp_canvas_item_set_visible (private->line2, TRUE);
+        }
+    }
+  else
+    {
+      gimp_canvas_item_set_visible (private->line2, FALSE);
+    }
+
+  gimp_canvas_handle_set_position (private->arc,
+                                   private->x[0], private->y[0]);
+  gimp_canvas_handle_set_angles (private->arc, angle1, angle2);
+  gimp_canvas_item_set_visible (private->arc,
+                                private->n_points > 1             &&
+                                draw_arc == private->n_points - 1 &&
+                                fabs (angle2) > EPSILON);
+
+  arc_line_length = (ARC_RADIUS + (GIMP_CANVAS_HANDLE_SIZE_CROSS >> 1)) /
+                    hypot (private->radius2.x * shell->scale_x,
+                           private->radius2.y * shell->scale_y);
+
+  gimp_canvas_line_set (private->arc_line,
+                        private->x[0],
+                        private->y[0],
+                        private->x[0] + private->radius2.x * arc_line_length,
+                        private->y[0] + private->radius2.y * arc_line_length);
+  gimp_canvas_item_set_visible (private->arc_line,
+                                (private->n_points == 2 || draw_arc_line) &&
+                                fabs (angle2) > EPSILON);
+
+  gimp_canvas_handle_set_position (private->handles[0],
+                                   private->x[0], private->y[0]);
+  gimp_canvas_item_set_visible (private->handles[0],
+                                private->n_points > 0);
+
+  gimp_canvas_handle_set_position (private->handles[1],
+                                   private->x[1], private->y[1]);
+  gimp_canvas_item_set_visible (private->handles[1],
+                                private->n_points > 1);
+
+  gimp_canvas_handle_set_position (private->handles[2],
+                                   private->x[2], private->y[2]);
+  gimp_canvas_item_set_visible (private->handles[2],
+                                private->n_points > 2);
+
+  gimp_tool_compass_update_hilight (compass);
+}
+
+gint
+gimp_tool_compass_button_press (GimpToolWidget      *widget,
+                                const GimpCoords    *coords,
+                                guint32              time,
+                                GdkModifierType      state,
+                                GimpButtonPressType  press_type)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private = compass->private;
+
+  private->function = CREATING;
+
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  /*  if the cursor is in one of the handles, the new function will be
+   *  moving or adding a new point or guide
+   */
+  if (private->point != -1)
+    {
+      GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      if (state & (toggle_mask | GDK_MOD1_MASK))
+        {
+          gboolean create_hguide = (state & toggle_mask);
+          gboolean create_vguide = (state & GDK_MOD1_MASK);
+
+          g_signal_emit (compass, compass_signals[CREATE_GUIDES], 0,
+                         private->x[private->point],
+                         private->y[private->point],
+                         create_hguide,
+                         create_vguide);
+
+          private->function = GUIDING;
+        }
+      else
+        {
+          if (private->n_points == 1 || (state & extend_mask))
+            private->function = ADDING;
+          else
+            private->function = MOVING;
+        }
+    }
+
+  /*  adding to the middle point makes no sense  */
+  if (private->point    == 0      &&
+      private->function == ADDING &&
+      private->n_points == 3)
+    {
+      private->function = MOVING;
+    }
+
+  /*  if the function is still CREATING, we are outside the handles  */
+  if (private->function == CREATING)
+    {
+      if (private->n_points > 1 && (state & GDK_MOD1_MASK))
+        {
+          private->function = MOVING_ALL;
+
+          private->last_x = coords->x;
+          private->last_y = coords->y;
+        }
+    }
+
+  if (private->function == CREATING)
+    {
+      /*  set the first point and go into ADDING mode  */
+      g_object_set (compass,
+                    "n-points", 1,
+                    "x1",       (gint) (coords->x + 0.5),
+                    "y1",       (gint) (coords->y + 0.5),
+                    "x2",       0,
+                    "y2",       0,
+                    "x3",       0,
+                    "y3",       0,
+                    NULL);
+
+      private->point    = 0;
+      private->function = ADDING;
+    }
+
+  return 1;
+}
+
+void
+gimp_tool_compass_button_release (GimpToolWidget        *widget,
+                                  const GimpCoords      *coords,
+                                  guint32                time,
+                                  GdkModifierType        state,
+                                  GimpButtonReleaseType  release_type)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private = compass->private;
+
+  private->function = FINISHED;
+}
+
+void
+gimp_tool_compass_motion (GimpToolWidget   *widget,
+                          const GimpCoords *coords,
+                          guint32           time,
+                          GdkModifierType   state)
+{
+  GimpToolCompass        *compass  = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private  = compass->private;
+  gint                    new_n_points;
+  gint                    new_x[3];
+  gint                    new_y[3];
+  gint                    dx, dy;
+  gint                    tmp;
+
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  /*  A few comments here, because this routine looks quite weird at first ...
+   *
+   *  The goal is to keep point 0, called the start point, to be
+   *  always the one in the middle or, if there are only two points,
+   *  the one that is fixed.  The angle is then always measured at
+   *  this point.
+   */
+
+  new_n_points = private->n_points;
+  new_x[0]     = private->x[0];
+  new_y[0]     = private->y[0];
+  new_x[1]     = private->x[1];
+  new_y[1]     = private->y[1];
+  new_x[2]     = private->x[2];
+  new_y[2]     = private->y[2];
+
+  switch (private->function)
+    {
+    case ADDING:
+      switch (private->point)
+        {
+        case 0:
+          /*  we are adding to the start point  */
+          break;
+
+        case 1:
+          /*  we are adding to the end point, make it the new start point  */
+          new_x[0] = private->x[1];
+          new_y[0] = private->y[1];
+
+          new_x[1] = private->x[0];
+          new_y[1] = private->y[0];
+          break;
+
+        case 2:
+          /*  we are adding to the third point, make it the new start point  */
+          new_x[1] = private->x[0];
+          new_y[1] = private->y[0];
+          new_x[0] = private->x[2];
+          new_y[0] = private->y[2];
+          break;
+
+        default:
+          break;
+        }
+
+      new_n_points = MIN (new_n_points + 1, 3);
+
+      private->point    = new_n_points - 1;
+      private->function = MOVING;
+      /*  don't break here!  */
+
+    case MOVING:
+      /*  if we are moving the start point and only have two, make it
+       *  the end point
+       */
+      if (new_n_points == 2 && private->point == 0)
+        {
+          tmp = new_x[0];
+          new_x[0] = new_x[1];
+          new_x[1] = tmp;
+
+          tmp = new_y[0];
+          new_y[0] = new_y[1];
+          new_y[1] = tmp;
+
+          private->point = 1;
+        }
+
+      new_x[private->point] = ROUND (coords->x);
+      new_y[private->point] = ROUND (coords->y);
+
+      if (state & gimp_get_constrain_behavior_mask ())
+        {
+          gdouble  x = new_x[private->point];
+          gdouble  y = new_y[private->point];
+
+          gimp_display_shell_constrain_line (gimp_tool_widget_get_shell (widget),
+                                             new_x[0], new_y[0],
+                                             &x, &y,
+                                             GIMP_CONSTRAIN_LINE_15_DEGREES);
+
+          new_x[private->point] = ROUND (x);
+          new_y[private->point] = ROUND (y);
+        }
+
+      g_object_set (compass,
+                    "n-points", new_n_points,
+                    "x1",       new_x[0],
+                    "y1",       new_y[0],
+                    "x2",       new_x[1],
+                    "y2",       new_y[1],
+                    "x3",       new_x[2],
+                    "y3",       new_y[2],
+                    NULL);
+      break;
+
+    case MOVING_ALL:
+      dx = ROUND (coords->x) - private->last_x;
+      dy = ROUND (coords->y) - private->last_y;
+
+      g_object_set (compass,
+                    "x1", new_x[0] + dx,
+                    "y1", new_y[0] + dy,
+                    "x2", new_x[1] + dx,
+                    "y2", new_y[1] + dy,
+                    "x3", new_x[2] + dx,
+                    "y3", new_y[2] + dy,
+                    NULL);
+
+      private->last_x = ROUND (coords->x);
+      private->last_y = ROUND (coords->y);
+      break;
+
+    default:
+      break;
+    }
+}
+
+GimpHit
+gimp_tool_compass_hit (GimpToolWidget   *widget,
+                       const GimpCoords *coords,
+                       GdkModifierType   state,
+                       gboolean          proximity)
+{
+  GimpToolCompass *compass = GIMP_TOOL_COMPASS (widget);
+
+  if (gimp_tool_compass_get_point (compass, coords) >= 0)
+    return GIMP_HIT_DIRECT;
+  else
+    return GIMP_HIT_INDIRECT;
+}
+
+void
+gimp_tool_compass_hover (GimpToolWidget   *widget,
+                         const GimpCoords *coords,
+                         GdkModifierType   state,
+                         gboolean          proximity)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private = compass->private;
+  gint                    point;
+
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  point = gimp_tool_compass_get_point (compass, coords);
+
+  if (point >= 0)
+    {
+      GdkModifierType  extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType  toggle_mask = gimp_get_toggle_behavior_mask ();
+      gchar           *status;
+
+      if (state & toggle_mask)
+        {
+          if (state & GDK_MOD1_MASK)
+            {
+              status = gimp_suggest_modifiers (_("Click to place "
+                                                 "vertical and "
+                                                 "horizontal guides"),
+                                               0,
+                                               NULL, NULL, NULL);
+            }
+          else
+            {
+              status = gimp_suggest_modifiers (_("Click to place a "
+                                                 "horizontal guide"),
+                                               GDK_MOD1_MASK & ~state,
+                                               NULL, NULL, NULL);
+            }
+        }
+      else if (state & GDK_MOD1_MASK)
+        {
+          status = gimp_suggest_modifiers (_("Click to place a "
+                                             "vertical guide"),
+                                           toggle_mask & ~state,
+                                           NULL, NULL, NULL);
+        }
+      else if ((state & extend_mask) &&
+               ! ((point == 0) && (private->n_points == 3)))
+        {
+          status = gimp_suggest_modifiers (_("Click-Drag to add a "
+                                             "new point"),
+                                           (toggle_mask |
+                                            GDK_MOD1_MASK) & ~state,
+                                           NULL, NULL, NULL);
+        }
+      else
+        {
+          if ((point == 0) && (private->n_points == 3))
+            state |= extend_mask;
+
+          status = gimp_suggest_modifiers (_("Click-Drag to move this "
+                                             "point"),
+                                           (extend_mask |
+                                            toggle_mask |
+                                            GDK_MOD1_MASK) & ~state,
+                                           NULL, NULL, NULL);
+        }
+
+      gimp_tool_widget_set_status (widget, status);
+
+      g_free (status);
+    }
+  else
+    {
+      if ((private->n_points > 1) && (state & GDK_MOD1_MASK))
+        {
+          gimp_tool_widget_set_status (widget,
+                                       _("Click-Drag to move all points"));
+        }
+      else
+        {
+          gimp_tool_widget_set_status (widget, NULL);
+        }
+    }
+
+  if (point != private->point)
+    {
+      private->point = point;
+
+      gimp_tool_compass_update_hilight (compass);
+    }
+}
+
+void
+gimp_tool_compass_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private = compass->private;
+
+  if (private->point != -1)
+    {
+      private->point = -1;
+
+      gimp_tool_compass_update_hilight (compass);
+    }
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static void
+gimp_tool_compass_motion_modifier (GimpToolWidget  *widget,
+                                   GdkModifierType  key,
+                                   gboolean         press,
+                                   GdkModifierType  state)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private = compass->private;
+
+  if (key == gimp_get_constrain_behavior_mask () &&
+      private->function == MOVING)
+    {
+      gint    new_x[3];
+      gint    new_y[3];
+      gdouble x = private->mouse_x;
+      gdouble y = private->mouse_y;
+
+      new_x[0] = private->x[0];
+      new_y[0] = private->y[0];
+      new_x[1] = private->x[1];
+      new_y[1] = private->y[1];
+      new_x[2] = private->x[2];
+      new_y[2] = private->y[2];
+
+      if (press)
+        {
+          gimp_display_shell_constrain_line (gimp_tool_widget_get_shell (widget),
+                                             private->x[0], private->y[0],
+                                             &x, &y,
+                                             GIMP_CONSTRAIN_LINE_15_DEGREES);
+        }
+
+      new_x[private->point] = ROUND (x);
+      new_y[private->point] = ROUND (y);
+
+      g_object_set (compass,
+                    "x1", new_x[0],
+                    "y1", new_y[0],
+                    "x2", new_x[1],
+                    "y2", new_y[1],
+                    "x3", new_x[2],
+                    "y3", new_y[2],
+                    NULL);
+    }
+}
+
+static gboolean
+gimp_tool_compass_get_cursor (GimpToolWidget     *widget,
+                              const GimpCoords   *coords,
+                              GdkModifierType     state,
+                              GimpCursorType     *cursor,
+                              GimpToolCursorType *tool_cursor,
+                              GimpCursorModifier *modifier)
+{
+  GimpToolCompass        *compass = GIMP_TOOL_COMPASS (widget);
+  GimpToolCompassPrivate *private = compass->private;
+
+  if (private->point != -1)
+    {
+      GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      if (state & toggle_mask)
+        {
+          if (state & GDK_MOD1_MASK)
+            {
+              *cursor = GIMP_CURSOR_CORNER_BOTTOM_RIGHT;
+              return TRUE;
+            }
+          else
+            {
+              *cursor = GIMP_CURSOR_SIDE_BOTTOM;
+              return TRUE;
+            }
+        }
+      else if (state & GDK_MOD1_MASK)
+        {
+          *cursor = GIMP_CURSOR_SIDE_RIGHT;
+          return TRUE;
+        }
+      else if ((state & extend_mask) &&
+               ! ((private->point == 0) &&
+                  (private->n_points == 3)))
+        {
+          *modifier = GIMP_CURSOR_MODIFIER_PLUS;
+          return TRUE;
+        }
+      else
+        {
+          *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+          return TRUE;
+        }
+    }
+  else
+    {
+      if ((private->n_points > 1) && (state & GDK_MOD1_MASK))
+        {
+          *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_tool_compass_get_point (GimpToolCompass  *compass,
+                             const GimpCoords *coords)
+{
+  GimpToolCompassPrivate *private = compass->private;
+  gint                    i;
+
+  for (i = 0; i < private->n_points; i++)
+    {
+      if (gimp_canvas_item_hit (private->handles[i],
+                                coords->x, coords->y))
+        {
+          return i;
+        }
+    }
+
+  return -1;
+}
+
+static void
+gimp_tool_compass_update_hilight (GimpToolCompass *compass)
+{
+  GimpToolCompassPrivate *private = compass->private;
+  gint                    i;
+
+  for (i = 0; i < private->n_points; i++)
+    {
+      if (private->handles[i])
+        {
+          gimp_canvas_item_set_highlight (private->handles[i],
+                                          private->point == i);
+        }
+    }
+}
+
+static void
+gimp_tool_compass_update_angle (GimpToolCompass        *compass,
+                                GimpCompassOrientation  orientation,
+                                gboolean                flip)
+{
+  GimpToolWidget         *widget  = GIMP_TOOL_WIDGET (compass);
+  GimpToolCompassPrivate *private = compass->private;
+  GimpDisplayShell       *shell   = gimp_tool_widget_get_shell (widget);
+  GimpImage              *image   = gimp_display_get_image (shell->display);
+  GimpVector2             radius1;
+  GimpVector2             radius2;
+  gdouble                 pixel_angle;
+  gdouble                 unit_angle;
+  gdouble                 xres;
+  gdouble                 yres;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  private->radius1.x = private->x[1] - private->x[0];
+  private->radius1.y = private->y[1] - private->y[0];
+
+  if (private->n_points == 3)
+    {
+      orientation = GIMP_COMPASS_ORIENTATION_AUTO;
+
+      private->radius2.x = private->x[2] - private->x[0];
+      private->radius2.y = private->y[2] - private->y[0];
+    }
+  else
+    {
+      gdouble angle = -shell->rotate_angle * G_PI / 180.0;
+
+      if (orientation == GIMP_COMPASS_ORIENTATION_VERTICAL)
+        angle -= G_PI / 2.0;
+
+      if (flip)
+        angle += G_PI;
+
+      if (shell->flip_horizontally)
+        angle = G_PI - angle;
+      if (shell->flip_vertically)
+        angle = -angle;
+
+      private->radius2.x = cos (angle);
+      private->radius2.y = sin (angle);
+
+      if (! shell->dot_for_dot)
+        {
+          private->radius2.x *= xres;
+          private->radius2.y *= yres;
+
+          gimp_vector2_normalize (&private->radius2);
+        }
+    }
+
+  radius1 = private->radius1;
+  radius2 = private->radius2;
+
+  pixel_angle = atan2 (gimp_vector2_cross_product (&radius1, &radius2).x,
+                       gimp_vector2_inner_product (&radius1, &radius2));
+
+  radius1.x /= xres;
+  radius1.y /= yres;
+
+  radius2.x /= xres;
+  radius2.y /= yres;
+
+  unit_angle = atan2 (gimp_vector2_cross_product (&radius1, &radius2).x,
+                      gimp_vector2_inner_product (&radius1, &radius2));
+
+  if (shell->dot_for_dot)
+    private->display_angle = pixel_angle;
+  else
+    private->display_angle = unit_angle;
+
+  if (private->n_points == 2)
+    {
+      if (! flip && fabs (private->display_angle) > G_PI / 2.0 + EPSILON)
+        {
+          gimp_tool_compass_update_angle (compass, orientation, TRUE);
+
+          return;
+        }
+      else if (orientation == GIMP_COMPASS_ORIENTATION_AUTO)
+        {
+          if (fabs (private->display_angle) <= G_PI / 4.0 + EPSILON)
+            {
+              orientation = GIMP_COMPASS_ORIENTATION_HORIZONTAL;
+            }
+          else
+            {
+              gimp_tool_compass_update_angle (compass,
+                                              GIMP_COMPASS_ORIENTATION_VERTICAL,
+                                              FALSE);
+
+              return;
+            }
+        }
+    }
+
+  if (fabs (pixel_angle - private->pixel_angle) > EPSILON)
+    {
+      private->pixel_angle = pixel_angle;
+
+      g_object_notify (G_OBJECT (compass), "pixel-angle");
+    }
+
+  if (fabs (unit_angle - private->unit_angle) > EPSILON)
+    {
+      private->unit_angle = unit_angle;
+
+      g_object_notify (G_OBJECT (compass), "unit-angle");
+    }
+
+  if (orientation != private->effective_orientation)
+    {
+      private->effective_orientation = orientation;
+
+      g_object_notify (G_OBJECT (compass), "effective-orientation");
+    }
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_compass_new (GimpDisplayShell       *shell,
+                       GimpCompassOrientation  orientation,
+                       gint                    n_points,
+                       gint                    x1,
+                       gint                    y1,
+                       gint                    x2,
+                       gint                    y2,
+                       gint                    x3,
+                       gint                    y3)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_COMPASS,
+                       "shell",       shell,
+                       "orientation", orientation,
+                       "n-points",    n_points,
+                       "x1",          x1,
+                       "y1",          y1,
+                       "x2",          x2,
+                       "y2",          y2,
+                       NULL);
+}
diff --git a/app/display/gimptoolcompass.h b/app/display/gimptoolcompass.h
new file mode 100644
index 0000000..8e6fdfe
--- /dev/null
+++ b/app/display/gimptoolcompass.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolcompass.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_COMPASS_H__
+#define __GIMP_TOOL_COMPASS_H__
+
+
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TYPE_TOOL_COMPASS            (gimp_tool_compass_get_type ())
+#define GIMP_TOOL_COMPASS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_COMPASS, GimpToolCompass))
+#define GIMP_TOOL_COMPASS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_COMPASS, GimpToolCompassClass))
+#define GIMP_IS_TOOL_COMPASS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_COMPASS))
+#define GIMP_IS_TOOL_COMPASS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_COMPASS))
+#define GIMP_TOOL_COMPASS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_COMPASS, GimpToolCompassClass))
+
+
+typedef struct _GimpToolCompass        GimpToolCompass;
+typedef struct _GimpToolCompassPrivate GimpToolCompassPrivate;
+typedef struct _GimpToolCompassClass   GimpToolCompassClass;
+
+struct _GimpToolCompass
+{
+  GimpToolWidget          parent_instance;
+
+  GimpToolCompassPrivate *private;
+};
+
+struct _GimpToolCompassClass
+{
+  GimpToolWidgetClass  parent_class;
+
+  void (* create_guides) (GimpToolCompass *compass,
+                          gint             x,
+                          gint             y,
+                          gboolean         horizontal,
+                          gboolean         vertical);
+};
+
+
+GType            gimp_tool_compass_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_compass_new      (GimpDisplayShell       *shell,
+                                             GimpCompassOrientation  orinetation,
+                                             gint                    n_points,
+                                             gint                    x1,
+                                             gint                    y1,
+                                             gint                    x2,
+                                             gint                    y2,
+                                             gint                    y3,
+                                             gint                    x3);
+
+
+#endif /* __GIMP_TOOL_COMPASS_H__ */
diff --git a/app/display/gimptooldialog.c b/app/display/gimptooldialog.c
new file mode 100644
index 0000000..e0bc082
--- /dev/null
+++ b/app/display/gimptooldialog.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooldialog.c
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimpobject.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpdialogfactory.h"
+
+#include "gimpdisplayshell.h"
+#include "gimptooldialog.h"
+
+
+typedef struct _GimpToolDialogPrivate GimpToolDialogPrivate;
+
+struct _GimpToolDialogPrivate
+{
+  GimpDisplayShell *shell;
+};
+
+#define GET_PRIVATE(dialog) ((GimpToolDialogPrivate *) gimp_tool_dialog_get_instance_private ((GimpToolDialog *) (dialog)))
+
+
+static void   gimp_tool_dialog_dispose     (GObject          *object);
+
+static void   gimp_tool_dialog_shell_unmap (GimpDisplayShell *shell,
+                                            GimpToolDialog   *dialog);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolDialog, gimp_tool_dialog,
+                            GIMP_TYPE_VIEWABLE_DIALOG)
+
+
+static void
+gimp_tool_dialog_class_init (GimpToolDialogClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_tool_dialog_dispose;
+}
+
+static void
+gimp_tool_dialog_init (GimpToolDialog *dialog)
+{
+}
+
+static void
+gimp_tool_dialog_dispose (GObject *object)
+{
+  GimpToolDialogPrivate *private = GET_PRIVATE (object);
+
+  if (private->shell)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (private->shell),
+                                    (gpointer) &private->shell);
+      private->shell = NULL;
+    }
+
+  G_OBJECT_CLASS (gimp_tool_dialog_parent_class)->dispose (object);
+}
+
+
+/**
+ * gimp_tool_dialog_new:
+ * @tool_info: a #GimpToolInfo
+ * @desc:      a string to use in the dialog header or %NULL to use the help
+ *             field from #GimpToolInfo
+ * @...:       a %NULL-terminated valist of button parameters as described in
+ *             gtk_dialog_new_with_buttons().
+ *
+ * This function conveniently creates a #GimpViewableDialog using the
+ * information stored in @tool_info. It also registers the tool with
+ * the "toplevel" dialog factory.
+ *
+ * Return value: a new #GimpViewableDialog
+ **/
+GtkWidget *
+gimp_tool_dialog_new (GimpToolInfo *tool_info,
+                      GdkScreen    *screen,
+                      gint          monitor,
+                      const gchar  *title,
+                      const gchar  *description,
+                      const gchar  *icon_name,
+                      const gchar  *help_id,
+                      ...)
+{
+  GtkWidget *dialog;
+  gchar     *identifier;
+  va_list    args;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
+
+  if (! title)
+    title = tool_info->label;
+
+  if (! description)
+    description = tool_info->tooltip;
+
+  if (! help_id)
+    help_id = tool_info->help_id;
+
+  if (! icon_name)
+    icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+
+  dialog = g_object_new (GIMP_TYPE_TOOL_DIALOG,
+                         "title",        title,
+                         "role",         gimp_object_get_name (tool_info),
+                         "description",  description,
+                         "icon-name",    icon_name,
+                         "help-func",    gimp_standard_help_func,
+                         "help-id",      help_id,
+                         NULL);
+
+  va_start (args, help_id);
+  gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args);
+  va_end (args);
+
+  identifier = g_strconcat (gimp_object_get_name (tool_info), "-dialog", NULL);
+
+  gimp_dialog_factory_add_foreign (gimp_dialog_factory_get_singleton (),
+                                   identifier,
+                                   dialog,
+                                   screen,
+                                   monitor);
+
+  g_free (identifier);
+
+  return dialog;
+}
+
+void
+gimp_tool_dialog_set_shell (GimpToolDialog   *tool_dialog,
+                            GimpDisplayShell *shell)
+{
+  GimpToolDialogPrivate *private = GET_PRIVATE (tool_dialog);
+
+  g_return_if_fail (GIMP_IS_TOOL_DIALOG (tool_dialog));
+  g_return_if_fail (shell == NULL || GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell == private->shell)
+    return;
+
+  if (private->shell)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (private->shell),
+                                    (gpointer) &private->shell);
+      g_signal_handlers_disconnect_by_func (private->shell,
+                                            gimp_tool_dialog_shell_unmap,
+                                            tool_dialog);
+
+      gtk_window_set_transient_for (GTK_WINDOW (tool_dialog), NULL);
+    }
+
+  private->shell = shell;
+
+  if (private->shell)
+    {
+      GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+      gtk_window_set_transient_for (GTK_WINDOW (tool_dialog),
+                                    GTK_WINDOW (toplevel));
+
+      g_signal_connect_object (private->shell, "unmap",
+                               G_CALLBACK (gimp_tool_dialog_shell_unmap),
+                               tool_dialog, 0);
+      g_object_add_weak_pointer (G_OBJECT (private->shell),
+                                 (gpointer) &private->shell);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tool_dialog_shell_unmap (GimpDisplayShell *shell,
+                              GimpToolDialog   *dialog)
+{
+  /*  the dialog being mapped while the shell is being unmapped
+   *  happens when switching images in GimpImageWindow
+   */
+  if (gtk_widget_get_mapped (GTK_WIDGET (dialog)))
+    g_signal_emit_by_name (dialog, "close");
+}
diff --git a/app/display/gimptooldialog.h b/app/display/gimptooldialog.h
new file mode 100644
index 0000000..13f437d
--- /dev/null
+++ b/app/display/gimptooldialog.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooldialog.h
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_DIALOG_H__
+#define __GIMP_TOOL_DIALOG_H__
+
+#include "widgets/gimpviewabledialog.h"
+
+
+#define GIMP_TYPE_TOOL_DIALOG            (gimp_tool_dialog_get_type ())
+#define GIMP_TOOL_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_DIALOG, GimpToolDialog))
+#define GIMP_TOOL_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_DIALOG, GimpToolDialogClass))
+#define GIMP_IS_TOOL_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_DIALOG))
+#define GIMP_IS_TOOL_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_DIALOG))
+#define GIMP_TOOL_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_DIALOG, GimpToolDialogClass))
+
+
+typedef struct _GimpViewableDialogClass GimpToolDialogClass;
+
+struct _GimpToolDialog
+{
+  GimpViewableDialog  parent_instance;
+};
+
+
+GType       gimp_tool_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_tool_dialog_new       (GimpToolInfo     *tool_info,
+                                        GdkScreen        *screen,
+                                        gint              monitor,
+                                        const gchar      *title,
+                                        const gchar      *description,
+                                        const gchar      *icon_name,
+                                        const gchar      *help_id,
+                                        ...) G_GNUC_NULL_TERMINATED;
+
+void        gimp_tool_dialog_set_shell (GimpToolDialog   *tool_dialog,
+                                        GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_TOOL_DIALOG_H__ */
diff --git a/app/display/gimptoolfocus.c b/app/display/gimptoolfocus.c
new file mode 100644
index 0000000..a607f06
--- /dev/null
+++ b/app/display/gimptoolfocus.c
@@ -0,0 +1,1209 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolfocus.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvasgroup.h"
+#include "gimpcanvashandle.h"
+#include "gimpcanvaslimit.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimpdisplayshell-utils.h"
+#include "gimptoolfocus.h"
+
+#include "gimp-intl.h"
+
+
+#define HANDLE_SIZE   12.0
+#define SNAP_DISTANCE 12.0
+
+#define EPSILON       1e-6
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_X,
+  PROP_Y,
+  PROP_RADIUS,
+  PROP_ASPECT_RATIO,
+  PROP_ANGLE,
+  PROP_INNER_LIMIT,
+  PROP_MIDPOINT
+};
+
+enum
+{
+  LIMIT_OUTER,
+  LIMIT_INNER,
+  LIMIT_MIDDLE,
+
+  N_LIMITS
+};
+
+
+typedef enum
+{
+  HOVER_NONE,
+  HOVER_LIMIT,
+  HOVER_HANDLE,
+  HOVER_MOVE,
+  HOVER_ROTATE
+} Hover;
+
+
+typedef struct
+{
+  GimpCanvasItem *item;
+
+  GtkOrientation  orientation;
+  GimpVector2     dir;
+} GimpToolFocusHandle;
+
+typedef struct
+{
+  GimpCanvasGroup     *group;
+  GimpCanvasItem      *item;
+
+  gint                 n_handles;
+  GimpToolFocusHandle  handles[4];
+} GimpToolFocusLimit;
+
+struct _GimpToolFocusPrivate
+{
+  GimpLimitType       type;
+
+  gdouble             x;
+  gdouble             y;
+  gdouble             radius;
+  gdouble             aspect_ratio;
+  gdouble             angle;
+
+  gdouble             inner_limit;
+  gdouble             midpoint;
+
+  GimpToolFocusLimit  limits[N_LIMITS];
+
+  Hover               hover;
+  gint                hover_limit;
+  gint                hover_handle;
+  GimpCanvasItem     *hover_item;
+
+  GimpCanvasItem     *last_hover_item;
+
+  gdouble             saved_x;
+  gdouble             saved_y;
+  gdouble             saved_radius;
+  gdouble             saved_aspect_ratio;
+  gdouble             saved_angle;
+
+  gdouble             saved_inner_limit;
+  gdouble             saved_midpoint;
+
+  gdouble             orig_x;
+  gdouble             orig_y;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_tool_focus_constructed      (GObject               *object);
+static void       gimp_tool_focus_set_property     (GObject               *object,
+                                                    guint                  property_id,
+                                                    const GValue          *value,
+                                                    GParamSpec            *pspec);
+static void       gimp_tool_focus_get_property     (GObject               *object,
+                                                    guint                  property_id,
+                                                    GValue                *value,
+                                                    GParamSpec            *pspec);
+
+static void       gimp_tool_focus_changed          (GimpToolWidget        *widget);
+static gint       gimp_tool_focus_button_press     (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    guint32                time,
+                                                    GdkModifierType        state,
+                                                    GimpButtonPressType    press_type);
+static void       gimp_tool_focus_button_release   (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    guint32                time,
+                                                    GdkModifierType        state,
+                                                    GimpButtonReleaseType  release_type);
+static void       gimp_tool_focus_motion           (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    guint32                time,
+                                                    GdkModifierType        state);
+static GimpHit    gimp_tool_focus_hit              (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    GdkModifierType        state,
+                                                    gboolean               proximity);
+static void       gimp_tool_focus_hover            (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    GdkModifierType        state,
+                                                    gboolean               proximity);
+static void       gimp_tool_focus_leave_notify     (GimpToolWidget        *widget);
+static void       gimp_tool_focus_motion_modifier  (GimpToolWidget        *widget,
+                                                    GdkModifierType        key,
+                                                    gboolean               press,
+                                                    GdkModifierType        state);
+static void       gimp_tool_focus_hover_modifier   (GimpToolWidget        *widget,
+                                                    GdkModifierType        key,
+                                                    gboolean               press,
+                                                    GdkModifierType        state);
+static gboolean   gimp_tool_focus_get_cursor       (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    GdkModifierType        state,
+                                                    GimpCursorType        *cursor,
+                                                    GimpToolCursorType    *tool_cursor,
+                                                    GimpCursorModifier    *modifier);
+
+static void       gimp_tool_focus_update_hover     (GimpToolFocus         *focus,
+                                                    const GimpCoords      *coords,
+                                                    gboolean               proximity);
+
+static void       gimp_tool_focus_update_highlight (GimpToolFocus         *focus);
+static void       gimp_tool_focus_update_status    (GimpToolFocus         *focus,
+                                                    GdkModifierType        state);
+
+static void       gimp_tool_focus_save             (GimpToolFocus         *focus);
+static void       gimp_tool_focus_restore          (GimpToolFocus         *focus);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolFocus, gimp_tool_focus,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_focus_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_tool_focus_class_init (GimpToolFocusClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_focus_constructed;
+  object_class->set_property    = gimp_tool_focus_set_property;
+  object_class->get_property    = gimp_tool_focus_get_property;
+
+  widget_class->changed         = gimp_tool_focus_changed;
+  widget_class->button_press    = gimp_tool_focus_button_press;
+  widget_class->button_release  = gimp_tool_focus_button_release;
+  widget_class->motion          = gimp_tool_focus_motion;
+  widget_class->hit             = gimp_tool_focus_hit;
+  widget_class->hover           = gimp_tool_focus_hover;
+  widget_class->leave_notify    = gimp_tool_focus_leave_notify;
+  widget_class->motion_modifier = gimp_tool_focus_motion_modifier;
+  widget_class->hover_modifier  = gimp_tool_focus_hover_modifier;
+  widget_class->get_cursor      = gimp_tool_focus_get_cursor;
+  widget_class->update_on_scale = TRUE;
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("type", NULL, NULL,
+                                                      GIMP_TYPE_LIMIT_TYPE,
+                                                      GIMP_LIMIT_CIRCLE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RADIUS,
+                                   g_param_spec_double ("radius", NULL, NULL,
+                                                        0.0,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ASPECT_RATIO,
+                                   g_param_spec_double ("aspect-ratio", NULL, NULL,
+                                                        -1.0,
+                                                        +1.0,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ANGLE,
+                                   g_param_spec_double ("angle", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_INNER_LIMIT,
+                                   g_param_spec_double ("inner-limit", NULL, NULL,
+                                                        0.0,
+                                                        1.0,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_MIDPOINT,
+                                   g_param_spec_double ("midpoint", NULL, NULL,
+                                                        0.0,
+                                                        1.0,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_focus_init (GimpToolFocus *focus)
+{
+  GimpToolFocusPrivate *priv;
+
+  priv = gimp_tool_focus_get_instance_private (focus);
+
+  focus->priv = priv;
+
+  priv->hover = HOVER_NONE;
+}
+
+static void
+gimp_tool_focus_constructed (GObject *object)
+{
+  GimpToolFocus        *focus  = GIMP_TOOL_FOCUS (object);
+  GimpToolWidget       *widget = GIMP_TOOL_WIDGET (object);
+  GimpToolFocusPrivate *priv   = focus->priv;
+  gint                  i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  for (i = N_LIMITS - 1; i >= 0; i--)
+    {
+      priv->limits[i].group = gimp_tool_widget_add_group (widget);
+
+      gimp_tool_widget_push_group (widget, priv->limits[i].group);
+
+      priv->limits[i].item = gimp_tool_widget_add_limit (
+        widget,
+        GIMP_LIMIT_CIRCLE,
+        0.0, 0.0,
+        0.0,
+        1.0,
+        0.0,
+        /* dashed = */ i == LIMIT_MIDDLE);
+
+      if (i == LIMIT_OUTER || i == LIMIT_INNER)
+        {
+          gint j;
+
+          priv->limits[i].n_handles = 4;
+
+          for (j = priv->limits[i].n_handles - 1; j >= 0; j--)
+            {
+              priv->limits[i].handles[j].item = gimp_tool_widget_add_handle (
+                widget,
+                GIMP_HANDLE_FILLED_CIRCLE,
+                0.0, 0.0, HANDLE_SIZE, HANDLE_SIZE,
+                GIMP_HANDLE_ANCHOR_CENTER);
+
+              priv->limits[i].handles[j].orientation =
+                j % 2 == 0 ? GTK_ORIENTATION_HORIZONTAL :
+                             GTK_ORIENTATION_VERTICAL;
+
+              priv->limits[i].handles[j].dir.x = cos (j * G_PI / 2.0);
+              priv->limits[i].handles[j].dir.y = sin (j * G_PI / 2.0);
+            }
+        }
+
+      gimp_tool_widget_pop_group (widget);
+    }
+
+  gimp_tool_focus_changed (widget);
+}
+
+static void
+gimp_tool_focus_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (object);
+  GimpToolFocusPrivate *priv  = focus->priv;
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      priv->type = g_value_get_enum (value);
+      break;
+
+    case PROP_X:
+      priv->x = g_value_get_double (value);
+      break;
+
+    case PROP_Y:
+      priv->y = g_value_get_double (value);
+      break;
+
+    case PROP_RADIUS:
+      priv->radius = g_value_get_double (value);
+      break;
+
+    case PROP_ASPECT_RATIO:
+      priv->aspect_ratio = g_value_get_double (value);
+      break;
+
+    case PROP_ANGLE:
+      priv->angle = g_value_get_double (value);
+      break;
+
+    case PROP_INNER_LIMIT:
+      priv->inner_limit = g_value_get_double (value);
+      break;
+
+    case PROP_MIDPOINT:
+      priv->midpoint = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_focus_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (object);
+  GimpToolFocusPrivate *priv  = focus->priv;
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, priv->type);
+      break;
+
+    case PROP_X:
+      g_value_set_double (value, priv->x);
+      break;
+
+    case PROP_Y:
+      g_value_set_double (value, priv->y);
+      break;
+
+    case PROP_RADIUS:
+      g_value_set_double (value, priv->radius);
+      break;
+
+    case PROP_ASPECT_RATIO:
+      g_value_set_double (value, priv->aspect_ratio);
+      break;
+
+    case PROP_ANGLE:
+      g_value_set_double (value, priv->angle);
+      break;
+
+    case PROP_INNER_LIMIT:
+      g_value_set_double (value, priv->inner_limit);
+      break;
+
+    case PROP_MIDPOINT:
+      g_value_set_double (value, priv->midpoint);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_focus_changed (GimpToolWidget *widget)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (widget);
+  GimpToolFocusPrivate *priv  = focus->priv;
+  gint                  i;
+
+  for (i = 0; i < N_LIMITS; i++)
+    {
+      gimp_canvas_item_begin_change (priv->limits[i].item);
+
+      g_object_set (priv->limits[i].item,
+                    "type",         priv->type,
+                    "x",            priv->x,
+                    "y",            priv->y,
+                    "aspect-ratio", priv->aspect_ratio,
+                    "angle",        priv->angle,
+                    NULL);
+    }
+
+  g_object_set (priv->limits[LIMIT_OUTER].item,
+                "radius", priv->radius,
+                NULL);
+
+  g_object_set (priv->limits[LIMIT_INNER].item,
+                "radius", priv->radius * priv->inner_limit,
+                NULL);
+
+  g_object_set (priv->limits[LIMIT_MIDDLE].item,
+                "radius", priv->radius * (priv->inner_limit         +
+                                          (1.0 - priv->inner_limit) *
+                                          priv->midpoint),
+                NULL);
+
+  for (i = 0; i < N_LIMITS; i++)
+    {
+      gdouble rx, ry;
+      gdouble max_r = 0.0;
+      gint    j;
+
+      gimp_canvas_limit_get_radii (GIMP_CANVAS_LIMIT (priv->limits[i].item),
+                                   &rx, &ry);
+
+      for (j = 0; j < priv->limits[i].n_handles; j++)
+        {
+          GimpVector2 p = priv->limits[i].handles[j].dir;
+          gdouble     r;
+
+          p.x *= rx;
+          p.y *= ry;
+
+          gimp_vector2_rotate (&p, -priv->angle);
+
+          p.x += priv->x;
+          p.y += priv->y;
+
+          gimp_canvas_handle_set_position (priv->limits[i].handles[j].item,
+                                           p.x, p.y);
+
+          r = gimp_canvas_item_transform_distance (
+            priv->limits[i].handles[j].item,
+            priv->x, priv->y,
+            p.x,     p.y);
+
+          max_r = MAX (max_r, r);
+        }
+
+      for (j = 0; j < priv->limits[i].n_handles; j++)
+        {
+          gimp_canvas_item_set_visible (priv->limits[i].handles[j].item,
+                                        priv->type != GIMP_LIMIT_HORIZONTAL &&
+                                        priv->type != GIMP_LIMIT_VERTICAL   &&
+                                        max_r >= 1.5 * HANDLE_SIZE);
+        }
+
+      gimp_canvas_item_end_change (priv->limits[i].item);
+    }
+}
+
+static gint
+gimp_tool_focus_button_press (GimpToolWidget      *widget,
+                              const GimpCoords    *coords,
+                              guint32              time,
+                              GdkModifierType      state,
+                              GimpButtonPressType  press_type)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (widget);
+  GimpToolFocusPrivate *priv  = focus->priv;
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    {
+      gimp_tool_focus_save (focus);
+
+      priv->orig_x = coords->x;
+      priv->orig_y = coords->y;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_focus_button_release (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonReleaseType  release_type)
+{
+  GimpToolFocus *focus = GIMP_TOOL_FOCUS (widget);
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    gimp_tool_focus_restore (focus);
+}
+
+static void
+gimp_tool_focus_motion (GimpToolWidget   *widget,
+                        const GimpCoords *coords,
+                        guint32           time,
+                        GdkModifierType   state)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (widget);
+  GimpToolFocusPrivate *priv  = focus->priv;
+  GimpDisplayShell     *shell = gimp_tool_widget_get_shell (widget);
+  gboolean              extend;
+  gboolean              constrain;
+
+  extend    = state & gimp_get_extend_selection_mask ();
+  constrain = state & gimp_get_constrain_behavior_mask ();
+
+  switch (priv->hover)
+    {
+    case HOVER_NONE:
+      break;
+
+    case HOVER_LIMIT:
+      {
+        GimpCanvasItem *limit = priv->limits[priv->hover_limit].item;
+        gdouble         radius;
+        gdouble         outer_radius;
+        gdouble         inner_radius;
+        gdouble         x,  y;
+        gdouble         cx, cy;
+
+        x = coords->x;
+        y = coords->y;
+
+        gimp_canvas_limit_center_point (GIMP_CANVAS_LIMIT (limit),
+                                        x,   y,
+                                        &cx, &cy);
+
+        if (gimp_canvas_item_transform_distance (limit,
+                                                 x,  y,
+                                                 cx, cy) <= SNAP_DISTANCE)
+          {
+            x = cx;
+            y = cy;
+          }
+
+        if (fabs (fabs (priv->aspect_ratio) - 1.0) <= EPSILON)
+          {
+            if (priv->radius <= EPSILON)
+              {
+                g_object_set (focus,
+                              "aspect-ratio", 0.0,
+                              NULL);
+              }
+            else
+              {
+                break;
+              }
+          }
+
+        radius = gimp_canvas_limit_boundary_radius (GIMP_CANVAS_LIMIT (limit),
+                                                    x, y);
+
+        outer_radius = priv->radius;
+        inner_radius = priv->radius * priv->inner_limit;
+
+        switch (priv->hover_limit)
+          {
+          case LIMIT_OUTER:
+            {
+              outer_radius = radius;
+
+              if (extend)
+                inner_radius = priv->inner_limit * radius;
+              else
+                outer_radius = MAX (outer_radius, inner_radius);
+            }
+            break;
+
+          case LIMIT_INNER:
+            {
+              inner_radius = radius;
+
+              if (extend)
+                {
+                  if (priv->inner_limit > EPSILON)
+                    outer_radius = inner_radius / priv->inner_limit;
+                  else
+                    inner_radius = 0.0;
+                }
+              else
+                {
+                  inner_radius = MIN (inner_radius, outer_radius);
+                }
+            }
+            break;
+
+          case LIMIT_MIDDLE:
+            {
+              if (extend)
+                {
+                  if (priv->inner_limit > EPSILON || priv->midpoint > EPSILON)
+                    {
+                      outer_radius = radius / (priv->inner_limit         +
+                                               (1.0 - priv->inner_limit) *
+                                               priv->midpoint);
+                      inner_radius = priv->inner_limit * outer_radius;
+                    }
+                  else
+                    {
+                      radius = 0.0;
+                    }
+                }
+              else
+                {
+                  radius = CLAMP (radius, inner_radius, outer_radius);
+                }
+
+              if (fabs (outer_radius - inner_radius) > EPSILON)
+                {
+                  g_object_set (focus,
+                                "midpoint", MAX ((radius       - inner_radius) /
+                                                 (outer_radius - inner_radius),
+                                                 0.0),
+                                NULL);
+                }
+            }
+            break;
+          }
+
+        g_object_set (focus,
+                      "radius", outer_radius,
+                      NULL);
+
+        if (outer_radius > EPSILON)
+          {
+            g_object_set (focus,
+                          "inner-limit", inner_radius / outer_radius,
+                          NULL);
+          }
+      }
+      break;
+
+    case HOVER_HANDLE:
+      {
+        GimpToolFocusHandle *handle;
+        GimpVector2          e;
+        GimpVector2          s;
+        GimpVector2          p;
+        gdouble              rx, ry;
+        gdouble              r;
+
+        handle = &priv->limits[priv->hover_limit].handles[priv->hover_handle];
+
+        e = handle->dir;
+
+        gimp_vector2_rotate (&e, -priv->angle);
+
+        s = e;
+
+        gimp_canvas_limit_get_radii (
+          GIMP_CANVAS_LIMIT (priv->limits[priv->hover_limit].item),
+          &rx, &ry);
+
+        if (handle->orientation == GTK_ORIENTATION_HORIZONTAL)
+          gimp_vector2_mul (&s, ry);
+        else
+          gimp_vector2_mul (&s, rx);
+
+        p.x = coords->x - priv->x;
+        p.y = coords->y - priv->y;
+
+        r = gimp_vector2_inner_product (&p, &e);
+        r = MAX (r, 0.0);
+
+        p = e;
+
+        gimp_vector2_mul (&p, r);
+
+        if (extend)
+          {
+            if (handle->orientation == GTK_ORIENTATION_HORIZONTAL)
+              {
+                if (rx <= EPSILON && ry > EPSILON)
+                  break;
+
+                ry = r * (1.0 - priv->aspect_ratio);
+              }
+            else
+              {
+                if (ry <= EPSILON && rx > EPSILON)
+                  break;
+
+                rx = r * (1.0 + priv->aspect_ratio);
+              }
+          }
+        else
+          {
+            if (gimp_canvas_item_transform_distance (
+                  priv->limits[priv->hover_limit].item,
+                  s.x, s.y,
+                  p.x, p.y) <= SNAP_DISTANCE * 0.75)
+              {
+                if (handle->orientation == GTK_ORIENTATION_HORIZONTAL)
+                  r = ry;
+                else
+                  r = rx;
+              }
+          }
+
+        if (handle->orientation == GTK_ORIENTATION_HORIZONTAL)
+          rx = r;
+        else
+          ry = r;
+
+        r = MAX (rx, ry);
+
+        if (priv->hover_limit == LIMIT_INNER)
+          r /= priv->inner_limit;
+
+        g_object_set (focus,
+                      "radius", r,
+                      NULL);
+
+        if (! extend)
+          {
+            gdouble aspect_ratio;
+
+            if (fabs (rx - ry) <= EPSILON)
+              aspect_ratio = 0.0;
+            else if (rx > ry)
+              aspect_ratio = 1.0 - ry / rx;
+            else
+              aspect_ratio = rx / ry - 1.0;
+
+            g_object_set (focus,
+                          "aspect-ratio", aspect_ratio,
+                          NULL);
+          }
+      }
+      break;
+
+    case HOVER_MOVE:
+      g_object_set (focus,
+                    "x", priv->saved_x + (coords->x - priv->orig_x),
+                    "y", priv->saved_y + (coords->y - priv->orig_y),
+                    NULL);
+      break;
+
+    case HOVER_ROTATE:
+      {
+        gdouble angle;
+        gdouble orig_angle;
+
+        angle      = atan2 (coords->y    - priv->y, coords->x    - priv->x);
+        orig_angle = atan2 (priv->orig_y - priv->y, priv->orig_x - priv->x);
+
+        angle = priv->saved_angle + (angle - orig_angle);
+
+        if (constrain)
+          angle = gimp_display_shell_constrain_angle (shell, angle, 12);
+
+        g_object_set (focus,
+                      "angle", angle,
+                      NULL);
+      }
+      break;
+    }
+}
+
+static GimpHit
+gimp_tool_focus_hit (GimpToolWidget   *widget,
+                     const GimpCoords *coords,
+                     GdkModifierType   state,
+                     gboolean          proximity)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (widget);
+  GimpToolFocusPrivate *priv  = focus->priv;
+
+  gimp_tool_focus_update_hover (focus, coords, proximity);
+
+  switch (priv->hover)
+    {
+    case HOVER_NONE:
+      return GIMP_HIT_NONE;
+
+    case HOVER_LIMIT:
+    case HOVER_HANDLE:
+      return GIMP_HIT_DIRECT;
+
+    case HOVER_MOVE:
+    case HOVER_ROTATE:
+      return GIMP_HIT_INDIRECT;
+    }
+
+  g_return_val_if_reached (GIMP_HIT_NONE);
+}
+
+static void
+gimp_tool_focus_hover (GimpToolWidget   *widget,
+                       const GimpCoords *coords,
+                       GdkModifierType   state,
+                       gboolean          proximity)
+{
+  GimpToolFocus *focus = GIMP_TOOL_FOCUS (widget);
+
+  gimp_tool_focus_update_hover (focus, coords, proximity);
+
+  gimp_tool_focus_update_highlight (focus);
+  gimp_tool_focus_update_status    (focus, state);
+}
+
+static void
+gimp_tool_focus_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolFocus *focus = GIMP_TOOL_FOCUS (widget);
+
+  gimp_tool_focus_update_hover (focus, NULL, FALSE);
+
+  gimp_tool_focus_update_highlight (focus);
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static void
+gimp_tool_focus_motion_modifier (GimpToolWidget  *widget,
+                                 GdkModifierType  key,
+                                 gboolean         press,
+                                 GdkModifierType  state)
+{
+  GimpToolFocus *focus = GIMP_TOOL_FOCUS (widget);
+
+  gimp_tool_focus_update_status (focus, state);
+}
+
+static void
+gimp_tool_focus_hover_modifier (GimpToolWidget  *widget,
+                                GdkModifierType  key,
+                                gboolean         press,
+                                GdkModifierType  state)
+{
+  GimpToolFocus *focus = GIMP_TOOL_FOCUS (widget);
+
+  gimp_tool_focus_update_status (focus, state);
+}
+
+static gboolean
+gimp_tool_focus_get_cursor (GimpToolWidget     *widget,
+                            const GimpCoords   *coords,
+                            GdkModifierType     state,
+                            GimpCursorType     *cursor,
+                            GimpToolCursorType *tool_cursor,
+                            GimpCursorModifier *modifier)
+{
+  GimpToolFocus        *focus = GIMP_TOOL_FOCUS (widget);
+  GimpToolFocusPrivate *priv  = focus->priv;
+
+  switch (priv->hover)
+    {
+    case HOVER_NONE:
+      return FALSE;
+
+    case HOVER_LIMIT:
+    case HOVER_HANDLE:
+      *modifier = GIMP_CURSOR_MODIFIER_RESIZE;
+      return TRUE;
+
+    case HOVER_MOVE:
+      *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+      return TRUE;
+
+    case HOVER_ROTATE:
+      *modifier = GIMP_CURSOR_MODIFIER_ROTATE;
+      return TRUE;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+static void
+gimp_tool_focus_update_hover (GimpToolFocus    *focus,
+                              const GimpCoords *coords,
+                              gboolean          proximity)
+{
+  GimpToolFocusPrivate *priv            = focus->priv;
+  gdouble               min_handle_dist = HANDLE_SIZE;
+  gint                  i;
+
+  priv->hover      = HOVER_NONE;
+  priv->hover_item = NULL;
+
+  if (! proximity)
+    return;
+
+  for (i = 0; i < N_LIMITS; i++)
+    {
+      gint j;
+
+      for (j = 0; j < priv->limits[i].n_handles; j++)
+        {
+          GimpCanvasItem *handle = priv->limits[i].handles[j].item;
+
+          if (gimp_canvas_item_get_visible (handle))
+            {
+              gdouble x, y;
+              gdouble dist;
+
+              g_object_get (handle,
+                            "x", &x,
+                            "y", &y,
+                            NULL);
+
+              dist = gimp_canvas_item_transform_distance (handle,
+                                                          x,         y,
+                                                          coords->x, coords->y);
+
+              if (dist < min_handle_dist)
+                {
+                  min_handle_dist = dist;
+
+                  priv->hover        = HOVER_HANDLE;
+                  priv->hover_limit  = i;
+                  priv->hover_handle = j;
+                  priv->hover_item   = handle;
+                }
+            }
+        }
+    }
+
+  if (priv->hover != HOVER_NONE)
+    return;
+
+  if (  gimp_canvas_limit_is_inside (
+          GIMP_CANVAS_LIMIT (priv->limits[LIMIT_OUTER].item),
+          coords->x, coords->y) &&
+      ! gimp_canvas_limit_is_inside (
+          GIMP_CANVAS_LIMIT (priv->limits[LIMIT_INNER].item),
+          coords->x, coords->y))
+    {
+      if (gimp_canvas_item_hit (priv->limits[LIMIT_MIDDLE].item,
+                                coords->x, coords->y))
+        {
+          priv->hover       = HOVER_LIMIT;
+          priv->hover_limit = LIMIT_MIDDLE;
+          priv->hover_item  = priv->limits[LIMIT_MIDDLE].item;
+
+          return;
+        }
+    }
+
+  if (! gimp_canvas_limit_is_inside (
+          GIMP_CANVAS_LIMIT (priv->limits[LIMIT_INNER].item),
+          coords->x, coords->y))
+    {
+      if (gimp_canvas_item_hit (priv->limits[LIMIT_OUTER].item,
+                                coords->x, coords->y))
+        {
+          priv->hover       = HOVER_LIMIT;
+          priv->hover_limit = LIMIT_OUTER;
+          priv->hover_item  = priv->limits[LIMIT_OUTER].item;
+
+          return;
+        }
+    }
+
+  if (gimp_canvas_item_hit (priv->limits[LIMIT_INNER].item,
+                            coords->x, coords->y))
+    {
+      priv->hover       = HOVER_LIMIT;
+      priv->hover_limit = LIMIT_INNER;
+      priv->hover_item  = priv->limits[LIMIT_INNER].item;
+
+      return;
+    }
+
+  if (gimp_canvas_limit_is_inside (
+        GIMP_CANVAS_LIMIT (priv->limits[LIMIT_OUTER].item),
+        coords->x, coords->y))
+    {
+      priv->hover = HOVER_MOVE;
+    }
+  else
+    {
+      priv->hover = HOVER_ROTATE;
+    }
+}
+
+static void
+gimp_tool_focus_update_highlight (GimpToolFocus *focus)
+{
+  GimpToolWidget       *widget = GIMP_TOOL_WIDGET (focus);
+  GimpToolFocusPrivate *priv   = focus->priv;
+  gint                  i;
+
+  if (priv->hover_item == priv->last_hover_item)
+    return;
+
+  if (priv->last_hover_item)
+    gimp_canvas_item_set_highlight (priv->last_hover_item, FALSE);
+
+  #define RAISE_ITEM(item)                           \
+    G_STMT_START                                     \
+      {                                              \
+        g_object_ref (item);                         \
+                                                     \
+        gimp_tool_widget_remove_item (widget, item); \
+        gimp_tool_widget_add_item    (widget, item); \
+                                                     \
+        g_object_unref (item);                       \
+      }                                              \
+    G_STMT_END
+
+  for (i = N_LIMITS - 1; i >= 0; i--)
+    RAISE_ITEM (GIMP_CANVAS_ITEM (priv->limits[i].group));
+
+  if (priv->hover_item)
+    {
+      gimp_canvas_item_set_highlight (priv->hover_item, TRUE);
+
+      RAISE_ITEM (GIMP_CANVAS_ITEM (priv->limits[priv->hover_limit].group));
+    }
+
+  #undef RAISE_ITEM
+
+  priv->last_hover_item = priv->hover_item;
+}
+
+static void
+gimp_tool_focus_update_status (GimpToolFocus   *focus,
+                               GdkModifierType  state)
+{
+  GimpToolFocusPrivate *priv                    = focus->priv;
+  GdkModifierType       state_mask              = 0;
+  const gchar          *message                 = NULL;
+  const gchar          *extend_selection_format = NULL;
+  const gchar          *toggle_behavior_format  = NULL;
+  gchar                *status;
+
+  switch (priv->hover)
+    {
+    case HOVER_NONE:
+      break;
+
+    case HOVER_LIMIT:
+      if (! (state & gimp_get_extend_selection_mask ()))
+        {
+          if (priv->hover_limit == LIMIT_MIDDLE)
+            message                = _("Click-Drag to change the midpoint");
+          else
+            message                = _("Click-Drag to resize the limit");
+
+          extend_selection_format  = _("%s to resize the focus");
+          state_mask              |= gimp_get_extend_selection_mask ();
+        }
+      else
+        {
+          message                  = _("Click-Drag to resize the focus");
+        }
+      break;
+
+    case HOVER_HANDLE:
+      if (! (state & gimp_get_extend_selection_mask ()))
+        {
+          message                  = _("Click-Drag to change the aspect ratio");
+          extend_selection_format  = _("%s to resize the focus");
+          state_mask              |= gimp_get_extend_selection_mask ();
+        }
+      else
+        {
+          message                  = _("Click-Drag to resize the focus");
+        }
+      break;
+
+    case HOVER_MOVE:
+      message                      = _("Click-Drag to move the focus");
+      break;
+
+    case HOVER_ROTATE:
+      message                      = _("Click-Drag to rotate the focus");
+      toggle_behavior_format       = _("%s for constrained angles");
+      state_mask                  |= gimp_get_constrain_behavior_mask ();
+      break;
+    }
+
+  status = gimp_suggest_modifiers (message,
+                                   ~state & state_mask,
+                                   extend_selection_format,
+                                   toggle_behavior_format,
+                                   NULL);
+
+  gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (focus), status);
+
+  g_free (status);
+}
+
+static void
+gimp_tool_focus_save (GimpToolFocus *focus)
+{
+  GimpToolFocusPrivate *priv = focus->priv;
+
+  priv->saved_x            = priv->x;
+  priv->saved_y            = priv->y;
+  priv->saved_radius       = priv->radius;
+  priv->saved_aspect_ratio = priv->aspect_ratio;
+  priv->saved_angle        = priv->angle;
+
+  priv->saved_inner_limit  = priv->inner_limit;
+  priv->saved_midpoint     = priv->midpoint;
+}
+
+static void
+gimp_tool_focus_restore (GimpToolFocus *focus)
+{
+  GimpToolFocusPrivate *priv = focus->priv;
+
+  g_object_set (focus,
+                "x",            priv->saved_x,
+                "y",            priv->saved_y,
+                "radius",       priv->saved_radius,
+                "aspect-ratio", priv->saved_aspect_ratio,
+                "angle",        priv->saved_angle,
+
+                "inner_limit",  priv->saved_inner_limit,
+                "midpoint",     priv->saved_midpoint,
+
+                NULL);
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_focus_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_FOCUS,
+                       "shell", shell,
+                       NULL);
+}
diff --git a/app/display/gimptoolfocus.h b/app/display/gimptoolfocus.h
new file mode 100644
index 0000000..e2fc5bd
--- /dev/null
+++ b/app/display/gimptoolfocus.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolfocus.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_FOCUS_H__
+#define __GIMP_TOOL_FOCUS_H__
+
+
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TYPE_TOOL_FOCUS            (gimp_tool_focus_get_type ())
+#define GIMP_TOOL_FOCUS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_FOCUS, GimpToolFocus))
+#define GIMP_TOOL_FOCUS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_FOCUS, GimpToolFocusClass))
+#define GIMP_IS_TOOL_FOCUS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_FOCUS))
+#define GIMP_IS_TOOL_FOCUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_FOCUS))
+#define GIMP_TOOL_FOCUS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_FOCUS, GimpToolFocusClass))
+
+
+typedef struct _GimpToolFocus        GimpToolFocus;
+typedef struct _GimpToolFocusPrivate GimpToolFocusPrivate;
+typedef struct _GimpToolFocusClass   GimpToolFocusClass;
+
+struct _GimpToolFocus
+{
+  GimpToolWidget        parent_instance;
+
+  GimpToolFocusPrivate *priv;
+};
+
+struct _GimpToolFocusClass
+{
+  GimpToolWidgetClass  parent_class;
+};
+
+
+GType            gimp_tool_focus_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_focus_new      (GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_TOOL_FOCUS_H__ */
diff --git a/app/display/gimptoolgui.c b/app/display/gimptoolgui.c
new file mode 100644
index 0000000..28c40bf
--- /dev/null
+++ b/app/display/gimptoolgui.c
@@ -0,0 +1,1037 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolgui.c
+ * Copyright (C) 2013  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpoverlaybox.h"
+#include "widgets/gimpoverlaydialog.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplayshell.h"
+#include "gimptooldialog.h"
+#include "gimptoolgui.h"
+
+
+enum
+{
+  RESPONSE,
+  LAST_SIGNAL
+};
+
+
+typedef struct _ResponseEntry ResponseEntry;
+
+struct _ResponseEntry
+{
+  gint      response_id;
+  gchar    *button_text;
+  gint      alternative_position;
+  gboolean  sensitive;
+};
+
+typedef struct _GimpToolGuiPrivate GimpToolGuiPrivate;
+
+struct _GimpToolGuiPrivate
+{
+  GimpToolInfo     *tool_info;
+  gchar            *title;
+  gchar            *description;
+  gchar            *icon_name;
+  gchar            *help_id;
+  GList            *response_entries;
+  gint              default_response;
+  gboolean          focus_on_map;
+
+  gboolean          overlay;
+  gboolean          auto_overlay;
+
+  GimpDisplayShell *shell;
+  GimpViewable     *viewable;
+
+  GtkWidget        *dialog;
+  GtkWidget        *vbox;
+};
+
+#define GET_PRIVATE(gui) ((GimpToolGuiPrivate *) gimp_tool_gui_get_instance_private ((GimpToolGui *) (gui)))
+
+
+static void            gimp_tool_gui_dispose           (GObject       *object);
+static void            gimp_tool_gui_finalize          (GObject       *object);
+
+static void            gimp_tool_gui_create_dialog     (GimpToolGui   *gui,
+                                                        GdkScreen     *screen,
+                                                        gint           monitor);
+static void            gimp_tool_gui_add_dialog_button (GimpToolGui   *gui,
+                                                        ResponseEntry *entry);
+static void            gimp_tool_gui_update_buttons    (GimpToolGui   *gui);
+static void            gimp_tool_gui_update_shell      (GimpToolGui   *gui);
+static void            gimp_tool_gui_update_viewable   (GimpToolGui   *gui);
+
+static void            gimp_tool_gui_dialog_response   (GtkWidget     *dialog,
+                                                        gint           response_id,
+                                                        GimpToolGui   *gui);
+static void            gimp_tool_gui_canvas_resized    (GtkWidget     *canvas,
+                                                        GtkAllocation *allocation,
+                                                        GimpToolGui   *gui);
+
+static ResponseEntry * response_entry_new              (gint           response_id,
+                                                        const gchar   *button_text);
+static void            response_entry_free             (ResponseEntry *entry);
+static ResponseEntry * response_entry_find             (GList         *entries,
+                                                        gint           response_id);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolGui, gimp_tool_gui, GIMP_TYPE_OBJECT)
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+#define parent_class gimp_tool_gui_parent_class
+
+
+static void
+gimp_tool_gui_class_init (GimpToolGuiClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose  = gimp_tool_gui_dispose;
+  object_class->finalize = gimp_tool_gui_finalize;
+
+  signals[RESPONSE] =
+    g_signal_new ("response",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpToolGuiClass, response),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+}
+
+static void
+gimp_tool_gui_init (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+
+  private->default_response = -1;
+  private->focus_on_map     = TRUE;
+
+  private->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  g_object_ref_sink (private->vbox);
+}
+
+static void
+gimp_tool_gui_dispose (GObject *object)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->tool_info);
+
+  if (private->shell)
+    gimp_tool_gui_set_shell (GIMP_TOOL_GUI (object), NULL);
+
+  if (private->viewable)
+    gimp_tool_gui_set_viewable (GIMP_TOOL_GUI (object), NULL);
+
+  g_clear_object (&private->vbox);
+
+  if (private->dialog)
+    {
+      if (gtk_widget_get_visible (private->dialog))
+        gimp_tool_gui_hide (GIMP_TOOL_GUI (object));
+
+      if (private->overlay)
+        g_object_unref (private->dialog);
+      else
+        gtk_widget_destroy (private->dialog);
+
+      private->dialog = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tool_gui_finalize (GObject *object)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->title,       g_free);
+  g_clear_pointer (&private->description, g_free);
+  g_clear_pointer (&private->icon_name,   g_free);
+  g_clear_pointer (&private->help_id,     g_free);
+
+  if (private->response_entries)
+    {
+      g_list_free_full (private->response_entries,
+                        (GDestroyNotify) response_entry_free);
+      private->response_entries = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+/**
+ * gimp_tool_gui_new:
+ * @tool_info:   a #GimpToolInfo
+ * @description: a string to use in the gui header or %NULL to use the help
+ *               field from #GimpToolInfo
+ * @...:         a %NULL-terminated valist of button parameters as described in
+ *               gtk_gui_new_with_buttons().
+ *
+ * This function creates a #GimpToolGui using the information stored
+ * in @tool_info.
+ *
+ * Return value: a new #GimpToolGui
+ **/
+GimpToolGui *
+gimp_tool_gui_new (GimpToolInfo *tool_info,
+                   const gchar  *title,
+                   const gchar  *description,
+                   const gchar  *icon_name,
+                   const gchar  *help_id,
+                   GdkScreen    *screen,
+                   gint          monitor,
+                   gboolean      overlay,
+                   ...)
+{
+  GimpToolGui        *gui;
+  GimpToolGuiPrivate *private;
+  va_list             args;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
+
+  gui = g_object_new (GIMP_TYPE_TOOL_GUI, NULL);
+
+  private = GET_PRIVATE (gui);
+
+  if (! title)
+    title = tool_info->label;
+
+  if (! description)
+    description = tool_info->label;
+
+  if (! icon_name)
+    icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+
+  if (! help_id)
+    help_id = tool_info->help_id;
+
+  private->tool_info   = g_object_ref (tool_info);
+  private->title       = g_strdup (title);
+  private->description = g_strdup (description);
+  private->icon_name   = g_strdup (icon_name);
+  private->help_id     = g_strdup (help_id);
+  private->overlay     = overlay;
+
+  va_start (args, overlay);
+
+  gimp_tool_gui_add_buttons_valist (gui, args);
+
+  va_end (args);
+
+  gimp_tool_gui_create_dialog (gui, screen, monitor);
+
+  return gui;
+}
+
+void
+gimp_tool_gui_set_title (GimpToolGui *gui,
+                         const gchar *title)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (title == private->title)
+    return;
+
+  g_free (private->title);
+  private->title = g_strdup (title);
+
+  if (! title)
+    title = private->tool_info->label;
+
+  g_object_set (private->dialog, "title", title, NULL);
+}
+
+void
+gimp_tool_gui_set_description (GimpToolGui *gui,
+                               const gchar *description)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (description == private->description)
+    return;
+
+  g_free (private->description);
+  private->description = g_strdup (description);
+
+  if (! description)
+    description = private->tool_info->tooltip;
+
+  if (private->overlay)
+    {
+      /* TODO */
+    }
+  else
+    {
+      g_object_set (private->dialog, "description", description, NULL);
+    }
+}
+
+void
+gimp_tool_gui_set_icon_name (GimpToolGui *gui,
+                             const gchar *icon_name)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (icon_name == private->icon_name)
+    return;
+
+  g_free (private->icon_name);
+  private->icon_name = g_strdup (icon_name);
+
+  if (! icon_name)
+    icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (private->tool_info));
+
+  g_object_set (private->dialog, "icon-name", icon_name, NULL);
+}
+
+void
+gimp_tool_gui_set_help_id (GimpToolGui *gui,
+                           const gchar *help_id)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (help_id == private->help_id)
+    return;
+
+  g_free (private->help_id);
+  private->help_id = g_strdup (help_id);
+
+  if (! help_id)
+    help_id = private->tool_info->help_id;
+
+  if (private->overlay)
+    {
+      /* TODO */
+    }
+  else
+    {
+      g_object_set (private->dialog, "help-id", help_id, NULL);
+    }
+}
+
+void
+gimp_tool_gui_set_shell (GimpToolGui      *gui,
+                         GimpDisplayShell *shell)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+  g_return_if_fail (shell == NULL || GIMP_IS_DISPLAY_SHELL (shell));
+
+  private = GET_PRIVATE (gui);
+
+  if (shell == private->shell)
+    return;
+
+  if (private->shell)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (private->shell),
+                                    (gpointer) &private->shell);
+      g_signal_handlers_disconnect_by_func (private->shell->canvas,
+                                            gimp_tool_gui_canvas_resized,
+                                            gui);
+    }
+
+  private->shell = shell;
+
+  if (private->shell)
+    {
+      g_signal_connect (private->shell->canvas, "size-allocate",
+                        G_CALLBACK (gimp_tool_gui_canvas_resized),
+                        gui);
+      g_object_add_weak_pointer (G_OBJECT (private->shell),
+                                 (gpointer) &private->shell);
+    }
+
+  gimp_tool_gui_update_shell (gui);
+}
+
+void
+gimp_tool_gui_set_viewable (GimpToolGui  *gui,
+                            GimpViewable *viewable)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+  g_return_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable));
+
+  private = GET_PRIVATE (gui);
+
+  if (private->viewable == viewable)
+    return;
+
+  if (private->viewable)
+    g_object_remove_weak_pointer (G_OBJECT (private->viewable),
+                                  (gpointer) &private->viewable);
+
+  private->viewable = viewable;
+
+  if (private->viewable)
+    g_object_add_weak_pointer (G_OBJECT (private->viewable),
+                               (gpointer) &private->viewable);
+
+  gimp_tool_gui_update_viewable (gui);
+}
+
+GtkWidget *
+gimp_tool_gui_get_dialog (GimpToolGui *gui)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GUI (gui), NULL);
+
+  return GET_PRIVATE (gui)->dialog;
+}
+
+GtkWidget *
+gimp_tool_gui_get_vbox (GimpToolGui *gui)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GUI (gui), NULL);
+
+  return GET_PRIVATE (gui)->vbox;
+}
+
+gboolean
+gimp_tool_gui_get_visible (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_GUI (gui), FALSE);
+
+  private = GET_PRIVATE (gui);
+
+  if (private->overlay)
+    return gtk_widget_get_parent (private->dialog) != NULL;
+  else
+    return gtk_widget_get_visible (private->dialog);
+}
+
+void
+gimp_tool_gui_show (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  g_return_if_fail (private->shell != NULL);
+
+  if (private->overlay)
+    {
+      if (! gtk_widget_get_parent (private->dialog))
+        {
+          gimp_overlay_box_add_child (GIMP_OVERLAY_BOX (private->shell->canvas),
+                                      private->dialog, 1.0, 0.0);
+          gtk_widget_show (private->dialog);
+        }
+    }
+  else
+    {
+      if (gtk_widget_get_visible (private->dialog))
+        gdk_window_show (gtk_widget_get_window (private->dialog));
+      else
+        gtk_widget_show (private->dialog);
+    }
+}
+
+void
+gimp_tool_gui_hide (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (private->overlay)
+    {
+      if (gtk_widget_get_parent (private->dialog))
+        {
+          gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (private->dialog)),
+                                private->dialog);
+          gtk_widget_hide (private->dialog);
+        }
+    }
+  else
+    {
+      if (gimp_dialog_factory_from_widget (private->dialog, NULL))
+        {
+          gimp_dialog_factory_hide_dialog (private->dialog);
+        }
+      else
+        {
+          gtk_widget_hide (private->dialog);
+        }
+    }
+}
+
+void
+gimp_tool_gui_set_overlay (GimpToolGui *gui,
+                           GdkScreen   *screen,
+                           gint         monitor,
+                           gboolean     overlay)
+{
+  GimpToolGuiPrivate *private;
+  gboolean            visible;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (private->overlay == overlay)
+    return;
+
+  if (! private->dialog)
+    {
+      private->overlay = overlay;
+      return;
+    }
+
+  visible = gtk_widget_get_visible (private->dialog);
+
+  if (visible)
+    gimp_tool_gui_hide (gui);
+
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (private->vbox)),
+                        private->vbox);
+
+  if (private->overlay)
+    g_object_unref (private->dialog);
+  else
+    gtk_widget_destroy (private->dialog);
+
+  private->overlay = overlay;
+
+  gimp_tool_gui_create_dialog (gui, screen, monitor);
+
+  if (visible)
+    gimp_tool_gui_show (gui);
+}
+
+gboolean
+gimp_tool_gui_get_overlay (GimpToolGui *gui)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GUI (gui), FALSE);
+
+  return GET_PRIVATE (gui)->overlay;
+}
+
+void
+gimp_tool_gui_set_auto_overlay (GimpToolGui *gui,
+                                gboolean     auto_overlay)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (private->auto_overlay != auto_overlay)
+    {
+      private->auto_overlay = auto_overlay;
+
+      if (private->shell)
+        gimp_tool_gui_canvas_resized (private->shell->canvas, NULL, gui);
+    }
+}
+
+gboolean
+gimp_tool_gui_get_auto_overlay (GimpToolGui *gui)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GUI (gui), FALSE);
+
+  return GET_PRIVATE (gui)->auto_overlay;
+}
+
+void
+gimp_tool_gui_set_focus_on_map (GimpToolGui *gui,
+                                gboolean     focus_on_map)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  if (private->focus_on_map == focus_on_map)
+    return;
+
+  private->focus_on_map = focus_on_map ? TRUE : FALSE;
+
+  if (! private->overlay)
+    {
+      gtk_window_set_focus_on_map (GTK_WINDOW (private->dialog),
+                                   private->focus_on_map);
+    }
+}
+
+gboolean
+gimp_tool_gui_get_focus_on_map (GimpToolGui *gui)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_GUI (gui), FALSE);
+
+  return GET_PRIVATE (gui)->focus_on_map;
+}
+
+void
+gimp_tool_gui_add_buttons_valist (GimpToolGui *gui,
+                                  va_list      args)
+{
+  const gchar *button_text;
+  gint         response_id;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  while ((button_text = va_arg (args, const gchar *)))
+    {
+      response_id = va_arg (args, gint);
+
+      gimp_tool_gui_add_button (gui, button_text, response_id);
+    }
+}
+
+void
+gimp_tool_gui_add_button (GimpToolGui *gui,
+                          const gchar *button_text,
+                          gint         response_id)
+{
+  GimpToolGuiPrivate *private;
+  ResponseEntry     *entry;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+  g_return_if_fail (button_text != NULL);
+
+  private = GET_PRIVATE (gui);
+
+  entry = response_entry_new (response_id, button_text);
+
+  private->response_entries = g_list_append (private->response_entries,
+                                             entry);
+
+  if (private->dialog)
+    gimp_tool_gui_add_dialog_button (gui, entry);
+}
+
+void
+gimp_tool_gui_set_default_response (GimpToolGui *gui,
+                                    gint         response_id)
+{
+  GimpToolGuiPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  g_return_if_fail (response_entry_find (private->response_entries,
+                                         response_id) != NULL);
+
+  private->default_response = response_id;
+
+  if (private->overlay)
+    {
+      gimp_overlay_dialog_set_default_response (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                response_id);
+    }
+  else
+    {
+      gtk_dialog_set_default_response (GTK_DIALOG (private->dialog),
+                                       response_id);
+    }
+}
+
+void
+gimp_tool_gui_set_response_sensitive (GimpToolGui *gui,
+                                      gint         response_id,
+                                      gboolean     sensitive)
+{
+  GimpToolGuiPrivate *private;
+  ResponseEntry      *entry;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  entry = response_entry_find (private->response_entries, response_id);
+
+  if (! entry)
+    return;
+
+  entry->sensitive = sensitive;
+
+  if (private->overlay)
+    {
+      gimp_overlay_dialog_set_response_sensitive (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                  response_id, sensitive);
+    }
+  else
+    {
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (private->dialog),
+                                         response_id, sensitive);
+    }
+}
+
+void
+gimp_tool_gui_set_alternative_button_order (GimpToolGui *gui,
+                                            ...)
+{
+  GimpToolGuiPrivate *private;
+  va_list             args;
+  gint                response_id;
+  gint                i;
+
+  g_return_if_fail (GIMP_IS_TOOL_GUI (gui));
+
+  private = GET_PRIVATE (gui);
+
+  va_start (args, gui);
+
+  for (response_id = va_arg (args, gint), i = 0;
+       response_id != -1;
+       response_id = va_arg (args, gint), i++)
+    {
+      ResponseEntry *entry = response_entry_find (private->response_entries,
+                                                  response_id);
+
+      if (entry)
+        entry->alternative_position = i;
+    }
+
+  va_end (args);
+
+  gimp_tool_gui_update_buttons (gui);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tool_gui_create_dialog (GimpToolGui *gui,
+                             GdkScreen   *screen,
+                             gint         monitor)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+  GList              *list;
+
+  if (private->overlay)
+    {
+      private->dialog = gimp_overlay_dialog_new (private->tool_info,
+                                                 private->description,
+                                                 NULL);
+      g_object_ref_sink (private->dialog);
+
+      for (list = private->response_entries; list; list = g_list_next (list))
+        {
+          ResponseEntry *entry = list->data;
+
+          gimp_tool_gui_add_dialog_button (gui, entry);
+        }
+
+      if (private->default_response != -1)
+        gimp_overlay_dialog_set_default_response (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                  private->default_response);
+
+      gtk_container_set_border_width (GTK_CONTAINER (private->dialog), 6);
+
+      gtk_container_set_border_width (GTK_CONTAINER (private->vbox), 0);
+      gtk_container_add (GTK_CONTAINER (private->dialog), private->vbox);
+      gtk_widget_show (private->vbox);
+    }
+  else
+    {
+      private->dialog = gimp_tool_dialog_new (private->tool_info,
+                                              screen, monitor,
+                                              private->title,
+                                              private->description,
+                                              private->icon_name,
+                                              private->help_id,
+                                              NULL);
+
+      for (list = private->response_entries; list; list = g_list_next (list))
+        {
+          ResponseEntry *entry = list->data;
+
+          gimp_tool_gui_add_dialog_button (gui, entry);
+        }
+
+      if (private->default_response != -1)
+        gtk_dialog_set_default_response (GTK_DIALOG (private->dialog),
+                                         private->default_response);
+
+      gtk_window_set_focus_on_map (GTK_WINDOW (private->dialog),
+                                   private->focus_on_map);
+
+      gtk_container_set_border_width (GTK_CONTAINER (private->vbox), 6);
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (private->dialog))),
+                          private->vbox, TRUE, TRUE, 0);
+      gtk_widget_show (private->vbox);
+    }
+
+  gimp_tool_gui_update_buttons (gui);
+
+  if (private->shell)
+    gimp_tool_gui_update_shell (gui);
+
+  if (private->viewable)
+    gimp_tool_gui_update_viewable (gui);
+
+  g_signal_connect_object (private->dialog, "response",
+                           G_CALLBACK (gimp_tool_gui_dialog_response),
+                           G_OBJECT (gui), 0);
+}
+
+static void
+gimp_tool_gui_add_dialog_button (GimpToolGui   *gui,
+                                 ResponseEntry *entry)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+
+  if (private->overlay)
+    {
+      gimp_overlay_dialog_add_button (GIMP_OVERLAY_DIALOG (private->dialog),
+                                      entry->button_text,
+                                      entry->response_id);
+
+      if (! entry->sensitive)
+        {
+          gimp_overlay_dialog_set_response_sensitive (
+            GIMP_OVERLAY_DIALOG (private->dialog),
+            entry->response_id, FALSE);
+        }
+    }
+  else
+    {
+      gimp_dialog_add_button (GIMP_DIALOG (private->dialog),
+                              entry->button_text,
+                              entry->response_id);
+
+      if (! entry->sensitive)
+        gtk_dialog_set_response_sensitive (GTK_DIALOG (private->dialog),
+                                           entry->response_id,
+                                           FALSE);
+    }
+}
+
+static void
+gimp_tool_gui_update_buttons (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+  GList              *list;
+  gint               *ids;
+  gint                n_ids;
+  gint                n_alternatives = 0;
+  gint                i;
+
+  n_ids = g_list_length (private->response_entries);
+  ids   = g_new0 (gint, n_ids);
+
+  for (list = private->response_entries, i = 0;
+       list;
+       list = g_list_next (list), i++)
+    {
+      ResponseEntry *entry = list->data;
+
+      if (entry->alternative_position >= 0 &&
+          entry->alternative_position < n_ids)
+        {
+          ids[entry->alternative_position] = entry->response_id;
+          n_alternatives++;
+        }
+    }
+
+  if (n_ids == n_alternatives)
+    {
+      if (private->overlay)
+        {
+          gimp_overlay_dialog_set_alternative_button_order (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                            n_ids, ids);
+        }
+      else
+        {
+          gtk_dialog_set_alternative_button_order_from_array (GTK_DIALOG (private->dialog),
+                                                              n_ids, ids);
+        }
+    }
+
+  g_free (ids);
+}
+
+static void
+gimp_tool_gui_update_shell (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+
+  if (private->overlay)
+    {
+      if (gtk_widget_get_parent (private->dialog))
+        {
+          gimp_tool_gui_hide (gui);
+
+          if (private->shell)
+            gimp_tool_gui_show (gui);
+        }
+    }
+  else
+    {
+      gimp_tool_dialog_set_shell (GIMP_TOOL_DIALOG (private->dialog),
+                                  private->shell);
+    }
+}
+
+static void
+gimp_tool_gui_update_viewable (GimpToolGui *gui)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+
+  if (! private->overlay)
+    {
+      GimpContext *context = NULL;
+
+      if (private->tool_info)
+        context = GIMP_CONTEXT (private->tool_info->tool_options);
+
+      gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (private->dialog),
+                                         private->viewable, context);
+    }
+}
+
+static void
+gimp_tool_gui_dialog_response (GtkWidget   *dialog,
+                               gint         response_id,
+                               GimpToolGui *gui)
+{
+  if (response_id == GIMP_RESPONSE_DETACH)
+    {
+      gimp_tool_gui_set_auto_overlay (gui, FALSE);
+      gimp_tool_gui_set_overlay (gui,
+                                 gtk_widget_get_screen (dialog),
+                                 gimp_widget_get_monitor (dialog),
+                                 FALSE);
+    }
+  else
+    {
+      g_signal_emit (gui, signals[RESPONSE], 0,
+                     response_id);
+    }
+}
+
+static void
+gimp_tool_gui_canvas_resized (GtkWidget     *canvas,
+                              GtkAllocation *unused,
+                              GimpToolGui   *gui)
+{
+  GimpToolGuiPrivate *private = GET_PRIVATE (gui);
+
+  if (private->auto_overlay)
+    {
+      GtkRequisition requisition;
+      GtkAllocation  allocation;
+      gboolean       overlay = FALSE;
+
+      gtk_widget_size_request (private->vbox, &requisition);
+      gtk_widget_get_allocation (canvas, &allocation);
+
+      if (allocation.width  > 2 * requisition.width &&
+          allocation.height > 3 * requisition.height)
+        {
+          overlay = TRUE;
+        }
+
+      gimp_tool_gui_set_overlay (gui,
+                                 gtk_widget_get_screen (private->dialog),
+                                 gimp_widget_get_monitor (private->dialog),
+                                 overlay);
+    }
+}
+
+static ResponseEntry *
+response_entry_new (gint         response_id,
+                    const gchar *button_text)
+{
+  ResponseEntry *entry = g_slice_new0 (ResponseEntry);
+
+  entry->response_id          = response_id;
+  entry->button_text          = g_strdup (button_text);
+  entry->alternative_position = -1;
+  entry->sensitive            = TRUE;
+
+  return entry;
+}
+
+static void
+response_entry_free (ResponseEntry *entry)
+{
+  g_free (entry->button_text);
+
+  g_slice_free (ResponseEntry, entry);
+}
+
+static ResponseEntry *
+response_entry_find (GList *entries,
+                     gint   response_id)
+{
+  for (; entries; entries = g_list_next (entries))
+    {
+      ResponseEntry *entry = entries->data;
+
+      if (entry->response_id == response_id)
+        return entry;
+    }
+
+  return NULL;
+}
diff --git a/app/display/gimptoolgui.h b/app/display/gimptoolgui.h
new file mode 100644
index 0000000..7b099a5
--- /dev/null
+++ b/app/display/gimptoolgui.h
@@ -0,0 +1,115 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolgui.h
+ * Copyright (C) 2013  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_GUI_H__
+#define __GIMP_TOOL_GUI_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_TOOL_GUI            (gimp_tool_gui_get_type ())
+#define GIMP_TOOL_GUI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_GUI, GimpToolGui))
+#define GIMP_TOOL_GUI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_GUI, GimpToolGuiClass))
+#define GIMP_IS_TOOL_GUI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_GUI))
+#define GIMP_IS_TOOL_GUI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_GUI))
+#define GIMP_TOOL_GUI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_GUI, GimpToolGuiClass))
+
+
+typedef struct _GimpToolGuiClass GimpToolGuiClass;
+
+struct _GimpToolGui
+{
+  GimpObject  parent_instance;
+};
+
+struct _GimpToolGuiClass
+{
+  GimpObjectClass  parent_instance;
+
+  void (* response) (GimpToolGui *gui,
+                     gint         response_id);
+
+};
+
+
+GType         gimp_tool_gui_get_type               (void) G_GNUC_CONST;
+
+GimpToolGui * gimp_tool_gui_new                    (GimpToolInfo     *tool_info,
+                                                    const gchar      *title,
+                                                    const gchar      *description,
+                                                    const gchar      *icon_name,
+                                                    const gchar      *help_id,
+                                                    GdkScreen        *screen,
+                                                    gint              monitor,
+                                                    gboolean          overlay,
+                                                    ...) G_GNUC_NULL_TERMINATED;
+
+void          gimp_tool_gui_set_title              (GimpToolGui      *gui,
+                                                    const gchar      *title);
+void          gimp_tool_gui_set_description        (GimpToolGui      *gui,
+                                                    const gchar      *description);
+void          gimp_tool_gui_set_icon_name          (GimpToolGui      *gui,
+                                                    const gchar      *icon_name);
+void          gimp_tool_gui_set_help_id            (GimpToolGui      *gui,
+                                                    const gchar      *help_id);
+
+void          gimp_tool_gui_set_shell              (GimpToolGui      *gui,
+                                                    GimpDisplayShell *shell);
+void          gimp_tool_gui_set_viewable           (GimpToolGui      *gui,
+                                                    GimpViewable     *viewable);
+
+GtkWidget   * gimp_tool_gui_get_dialog             (GimpToolGui      *gui);
+GtkWidget   * gimp_tool_gui_get_vbox               (GimpToolGui      *gui);
+
+gboolean      gimp_tool_gui_get_visible            (GimpToolGui      *gui);
+void          gimp_tool_gui_show                   (GimpToolGui      *gui);
+void          gimp_tool_gui_hide                   (GimpToolGui      *gui);
+
+void          gimp_tool_gui_set_overlay            (GimpToolGui      *gui,
+                                                    GdkScreen        *screen,
+                                                    gint              monitor,
+                                                    gboolean          overlay);
+gboolean      gimp_tool_gui_get_overlay            (GimpToolGui      *gui);
+
+void          gimp_tool_gui_set_auto_overlay       (GimpToolGui      *gui,
+                                                    gboolean          auto_overlay);
+gboolean      gimp_tool_gui_get_auto_overlay       (GimpToolGui      *gui);
+
+void          gimp_tool_gui_set_focus_on_map       (GimpToolGui      *gui,
+                                                    gboolean          focus_on_map);
+gboolean      gimp_tool_gui_get_focus_on_map       (GimpToolGui      *gui);
+
+
+void          gimp_tool_gui_add_buttons_valist     (GimpToolGui      *gui,
+                                                    va_list           args);
+void          gimp_tool_gui_add_button             (GimpToolGui      *gui,
+                                                    const gchar      *button_text,
+                                                    gint              response_id);
+void          gimp_tool_gui_set_default_response   (GimpToolGui      *gui,
+                                                    gint              response_id);
+void          gimp_tool_gui_set_response_sensitive (GimpToolGui      *gui,
+                                                    gint              response_id,
+                                                    gboolean          sensitive);
+void    gimp_tool_gui_set_alternative_button_order (GimpToolGui      *gui,
+                                                    ...);
+
+
+#endif /* __GIMP_TOOL_GUI_H__ */
diff --git a/app/display/gimptoolgyroscope.c b/app/display/gimptoolgyroscope.c
new file mode 100644
index 0000000..4d6b175
--- /dev/null
+++ b/app/display/gimptoolgyroscope.c
@@ -0,0 +1,879 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolgyroscope.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimptoolgyroscope.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON    1e-6
+#define DEG_TO_RAD (G_PI / 180.0)
+
+
+typedef enum
+{
+  MODE_NONE,
+  MODE_PAN,
+  MODE_ROTATE,
+  MODE_ZOOM
+} Mode;
+
+typedef enum
+{
+  CONSTRAINT_NONE,
+  CONSTRAINT_UNKNOWN,
+  CONSTRAINT_HORIZONTAL,
+  CONSTRAINT_VERTICAL
+} Constraint;
+
+enum
+{
+  PROP_0,
+  PROP_YAW,
+  PROP_PITCH,
+  PROP_ROLL,
+  PROP_ZOOM,
+  PROP_INVERT,
+  PROP_SPEED,
+  PROP_PIVOT_X,
+  PROP_PIVOT_Y
+};
+
+struct _GimpToolGyroscopePrivate
+{
+  gdouble    yaw;
+  gdouble    pitch;
+  gdouble    roll;
+  gdouble    zoom;
+
+  gdouble    orig_yaw;
+  gdouble    orig_pitch;
+  gdouble    orig_roll;
+  gdouble    orig_zoom;
+
+  gboolean   invert;
+
+  gdouble    speed;
+
+  gdouble    pivot_x;
+  gdouble    pivot_y;
+
+  Mode       mode;
+  Constraint constraint;
+
+  gdouble    last_x;
+  gdouble    last_y;
+
+  gdouble    last_angle;
+  gdouble    curr_angle;
+
+  gdouble    last_zoom;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_tool_gyroscope_set_property    (GObject               *object,
+                                                       guint                  property_id,
+                                                       const GValue          *value,
+                                                       GParamSpec            *pspec);
+static void       gimp_tool_gyroscope_get_property    (GObject               *object,
+                                                       guint                  property_id,
+                                                       GValue                *value,
+                                                       GParamSpec            *pspec);
+
+static gint       gimp_tool_gyroscope_button_press    (GimpToolWidget        *widget,
+                                                       const GimpCoords      *coords,
+                                                       guint32                time,
+                                                       GdkModifierType        state,
+                                                       GimpButtonPressType    press_type);
+static void       gimp_tool_gyroscope_button_release  (GimpToolWidget        *widget,
+                                                       const GimpCoords      *coords,
+                                                       guint32                time,
+                                                       GdkModifierType        state,
+                                                       GimpButtonReleaseType  release_type);
+static void       gimp_tool_gyroscope_motion          (GimpToolWidget        *widget,
+                                                       const GimpCoords      *coords,
+                                                       guint32                time,
+                                                       GdkModifierType        state);
+static GimpHit    gimp_tool_gyroscope_hit             (GimpToolWidget        *widget,
+                                                       const GimpCoords      *coords,
+                                                       GdkModifierType        state,
+                                                       gboolean               proximity);
+static void       gimp_tool_gyroscope_hover           (GimpToolWidget        *widget,
+                                                       const GimpCoords      *coords,
+                                                       GdkModifierType        state,
+                                                       gboolean               proximity);
+static gboolean   gimp_tool_gyroscope_key_press       (GimpToolWidget        *widget,
+                                                       GdkEventKey           *kevent);
+static void       gimp_tool_gyroscope_motion_modifier (GimpToolWidget        *widget,
+                                                       GdkModifierType        key,
+                                                       gboolean               press,
+                                                       GdkModifierType        state);
+static gboolean   gimp_tool_gyroscope_get_cursor      (GimpToolWidget        *widget,
+                                                       const GimpCoords      *coords,
+                                                       GdkModifierType        state,
+                                                       GimpCursorType        *cursor,
+                                                       GimpToolCursorType    *tool_cursor,
+                                                       GimpCursorModifier    *modifier);
+
+static void       gimp_tool_gyroscope_update_status   (GimpToolGyroscope      *gyroscope,
+                                                       GdkModifierType         state);
+
+static void       gimp_tool_gyroscope_save            (GimpToolGyroscope      *gyroscope);
+static void       gimp_tool_gyroscope_restore         (GimpToolGyroscope      *gyroscope);
+
+static void       gimp_tool_gyroscope_rotate          (GimpToolGyroscope      *gyroscope,
+                                                       const GimpVector3      *axis);
+static void       gimp_tool_gyroscope_rotate_vector   (GimpVector3            *vector,
+                                                       const GimpVector3      *axis);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolGyroscope, gimp_tool_gyroscope,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_gyroscope_parent_class
+
+
+static void
+gimp_tool_gyroscope_class_init (GimpToolGyroscopeClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->set_property    = gimp_tool_gyroscope_set_property;
+  object_class->get_property    = gimp_tool_gyroscope_get_property;
+
+  widget_class->button_press    = gimp_tool_gyroscope_button_press;
+  widget_class->button_release  = gimp_tool_gyroscope_button_release;
+  widget_class->motion          = gimp_tool_gyroscope_motion;
+  widget_class->hit             = gimp_tool_gyroscope_hit;
+  widget_class->hover           = gimp_tool_gyroscope_hover;
+  widget_class->key_press       = gimp_tool_gyroscope_key_press;
+  widget_class->motion_modifier = gimp_tool_gyroscope_motion_modifier;
+  widget_class->get_cursor      = gimp_tool_gyroscope_get_cursor;
+
+  g_object_class_install_property (object_class, PROP_YAW,
+                                   g_param_spec_double ("yaw", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PITCH,
+                                   g_param_spec_double ("pitch", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ROLL,
+                                   g_param_spec_double ("roll", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ZOOM,
+                                   g_param_spec_double ("zoom", NULL, NULL,
+                                                        0.0,
+                                                        +G_MAXDOUBLE,
+                                                        1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_INVERT,
+                                   g_param_spec_boolean ("invert", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SPEED,
+                                   g_param_spec_double ("speed", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_X,
+                                   g_param_spec_double ("pivot-x", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_Y,
+                                   g_param_spec_double ("pivot-y", NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_gyroscope_init (GimpToolGyroscope *gyroscope)
+{
+  gyroscope->private = gimp_tool_gyroscope_get_instance_private (gyroscope);
+}
+
+static void
+gimp_tool_gyroscope_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (object);
+  GimpToolGyroscopePrivate *private = gyroscope->private;
+
+  switch (property_id)
+    {
+    case PROP_YAW:
+      private->yaw = g_value_get_double (value);
+      break;
+    case PROP_PITCH:
+      private->pitch = g_value_get_double (value);
+      break;
+    case PROP_ROLL:
+      private->roll = g_value_get_double (value);
+      break;
+    case PROP_ZOOM:
+      private->zoom = g_value_get_double (value);
+      break;
+    case PROP_INVERT:
+      private->invert = g_value_get_boolean (value);
+      break;
+    case PROP_SPEED:
+      private->speed = g_value_get_double (value);
+      break;
+    case PROP_PIVOT_X:
+      private->pivot_x = g_value_get_double (value);
+      break;
+    case PROP_PIVOT_Y:
+      private->pivot_y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_gyroscope_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (object);
+  GimpToolGyroscopePrivate *private = gyroscope->private;
+
+  switch (property_id)
+    {
+    case PROP_YAW:
+      g_value_set_double (value, private->yaw);
+      break;
+    case PROP_PITCH:
+      g_value_set_double (value, private->pitch);
+      break;
+    case PROP_ROLL:
+      g_value_set_double (value, private->roll);
+      break;
+    case PROP_ZOOM:
+      g_value_set_double (value, private->zoom);
+      break;
+    case PROP_INVERT:
+      g_value_set_boolean (value, private->invert);
+      break;
+    case PROP_SPEED:
+      g_value_set_double (value, private->speed);
+      break;
+    case PROP_PIVOT_X:
+      g_value_set_double (value, private->pivot_x);
+      break;
+    case PROP_PIVOT_Y:
+      g_value_set_double (value, private->pivot_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint
+gimp_tool_gyroscope_button_press (GimpToolWidget      *widget,
+                                  const GimpCoords    *coords,
+                                  guint32              time,
+                                  GdkModifierType      state,
+                                  GimpButtonPressType  press_type)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (widget);
+  GimpToolGyroscopePrivate *private   = gyroscope->private;
+
+  gimp_tool_gyroscope_save (gyroscope);
+
+  if (state & GDK_MOD1_MASK)
+    {
+      private->mode = MODE_ZOOM;
+
+      private->last_zoom = private->zoom;
+    }
+  else if (state & gimp_get_extend_selection_mask ())
+    {
+      private->mode = MODE_ROTATE;
+
+      private->last_angle = atan2 (coords->y - private->pivot_y,
+                                   coords->x - private->pivot_x);
+      private->curr_angle = private->last_angle;
+    }
+  else
+    {
+      private->mode = MODE_PAN;
+
+      if (state & gimp_get_constrain_behavior_mask ())
+        private->constraint = CONSTRAINT_UNKNOWN;
+      else
+        private->constraint = CONSTRAINT_NONE;
+    }
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+
+  gimp_tool_gyroscope_update_status (gyroscope, state);
+
+  return 1;
+}
+
+static void
+gimp_tool_gyroscope_button_release (GimpToolWidget        *widget,
+                                    const GimpCoords      *coords,
+                                    guint32                time,
+                                    GdkModifierType        state,
+                                    GimpButtonReleaseType  release_type)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (widget);
+  GimpToolGyroscopePrivate *private   = gyroscope->private;
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    gimp_tool_gyroscope_restore (gyroscope);
+
+  private->mode = MODE_NONE;
+
+  gimp_tool_gyroscope_update_status (gyroscope, state);
+}
+
+static void
+gimp_tool_gyroscope_motion (GimpToolWidget   *widget,
+                            const GimpCoords *coords,
+                            guint32           time,
+                            GdkModifierType   state)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (widget);
+  GimpToolGyroscopePrivate *private   = gyroscope->private;
+  GimpDisplayShell         *shell     = gimp_tool_widget_get_shell (widget);
+  GimpVector3               axis      = {};
+
+  switch (private->mode)
+    {
+      case MODE_PAN:
+        {
+          gdouble x1     = private->last_x;
+          gdouble y1     = private->last_y;
+          gdouble x2     = coords->x;
+          gdouble y2     = coords->y;
+          gdouble factor = 1.0 / private->zoom;
+
+          if (private->constraint != CONSTRAINT_NONE)
+            {
+              gimp_display_shell_rotate_xy_f (shell, x1, y1, &x1, &y1);
+              gimp_display_shell_rotate_xy_f (shell, x2, y2, &x2, &y2);
+
+              if (private->constraint == CONSTRAINT_UNKNOWN)
+                {
+                  if (fabs (x2 - x1) > fabs (y2 - y1))
+                    private->constraint = CONSTRAINT_HORIZONTAL;
+                  else if (fabs (y2 - y1) > fabs (x2 - x1))
+                    private->constraint = CONSTRAINT_VERTICAL;
+                }
+
+              if (private->constraint == CONSTRAINT_HORIZONTAL)
+                y2 = y1;
+              else if (private->constraint == CONSTRAINT_VERTICAL)
+                x2 = x1;
+
+              gimp_display_shell_unrotate_xy_f (shell, x1, y1, &x1, &y1);
+              gimp_display_shell_unrotate_xy_f (shell, x2, y2, &x2, &y2);
+            }
+
+          if (private->invert)
+            factor = 1.0 / factor;
+
+          gimp_vector3_set (&axis, y2 - y1, x2 - x1, 0.0);
+          gimp_vector3_mul (&axis, factor * private->speed);
+        }
+      break;
+
+    case MODE_ROTATE:
+      {
+        gdouble angle;
+
+        angle = atan2 (coords->y - private->pivot_y,
+                       coords->x - private->pivot_x);
+
+        private->curr_angle = angle;
+
+        angle -= private->last_angle;
+
+        if (state & gimp_get_constrain_behavior_mask ())
+          angle = RINT (angle / (G_PI / 6.0)) * (G_PI / 6.0);
+
+        gimp_vector3_set (&axis, 0.0, 0.0, angle);
+
+        private->last_angle += angle;
+      }
+    break;
+
+    case MODE_ZOOM:
+      {
+        gdouble x1, y1;
+        gdouble x2, y2;
+        gdouble zoom;
+
+        gimp_display_shell_transform_xy_f (shell,
+                                           private->last_x, private->last_y,
+                                           &x1,             &y1);
+        gimp_display_shell_transform_xy_f (shell,
+                                           coords->x,       coords->y,
+                                           &x2,             &y2);
+
+        zoom = (y1 - y2) * shell->scale_y / 128.0;
+
+        if (private->invert)
+          zoom = -zoom;
+
+        private->last_zoom *= pow (2.0, zoom);
+
+        zoom = log (private->last_zoom / private->zoom) / G_LN2;
+
+        if (state & gimp_get_constrain_behavior_mask ())
+          zoom = RINT (zoom * 2.0) / 2.0;
+
+        g_object_set (gyroscope,
+                      "zoom", private->zoom * pow (2.0, zoom),
+                      NULL);
+      }
+      break;
+
+    case MODE_NONE:
+      g_return_if_reached ();
+  }
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+
+  gimp_tool_gyroscope_rotate (gyroscope, &axis);
+}
+
+static GimpHit
+gimp_tool_gyroscope_hit (GimpToolWidget   *widget,
+                         const GimpCoords *coords,
+                         GdkModifierType   state,
+                         gboolean          proximity)
+{
+  return GIMP_HIT_INDIRECT;
+}
+
+static void
+gimp_tool_gyroscope_hover (GimpToolWidget   *widget,
+                           const GimpCoords *coords,
+                           GdkModifierType   state,
+                           gboolean          proximity)
+{
+  gimp_tool_gyroscope_update_status (GIMP_TOOL_GYROSCOPE (widget), state);
+}
+
+static gboolean
+gimp_tool_gyroscope_key_press (GimpToolWidget *widget,
+                               GdkEventKey    *kevent)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (widget);
+  GimpToolGyroscopePrivate *private   = gyroscope->private;
+  GimpDisplayShell         *shell     = gimp_tool_widget_get_shell (widget);
+  GimpVector3               axis      = {};
+  gboolean                  fast;
+  gboolean                  result    = FALSE;
+
+  fast = (kevent->state & gimp_get_constrain_behavior_mask ());
+
+  if (kevent->state & GDK_MOD1_MASK)
+    {
+      /* zoom */
+      gdouble zoom = 0.0;
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Up:
+          zoom   = fast ? +1.0 : +1.0 / 8.0;
+          result = TRUE;
+          break;
+
+        case GDK_KEY_Down:
+          zoom   = fast ? -1.0 : -1.0 / 8.0;
+          result = TRUE;
+          break;
+        }
+
+      if (private->invert)
+        zoom = -zoom;
+
+      if (zoom)
+        {
+          g_object_set (gyroscope,
+                        "zoom", private->zoom * pow (2.0, zoom),
+                        NULL);
+        }
+    }
+  else if (kevent->state & gimp_get_extend_selection_mask ())
+    {
+      /* rotate */
+      gdouble angle = 0.0;
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Left:
+          angle  = fast ? +15.0 : +1.0;
+          result = TRUE;
+          break;
+
+        case GDK_KEY_Right:
+          angle  = fast ? -15.0 : -1.0;
+          result = TRUE;
+          break;
+        }
+
+      if (shell->flip_horizontally ^ shell->flip_vertically)
+        angle = -angle;
+
+      gimp_vector3_set (&axis, 0.0, 0.0, angle * DEG_TO_RAD);
+    }
+  else
+    {
+      /* pan */
+      gdouble x0     = 0.0;
+      gdouble y0     = 0.0;
+      gdouble x      = 0.0;
+      gdouble y      = 0.0;
+      gdouble factor = 1.0 / private->zoom;
+
+      if (private->invert)
+        factor = 1.0 / factor;
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Left:
+          x      = fast ? +15.0 : +1.0;
+          result = TRUE;
+          break;
+
+        case GDK_KEY_Right:
+          x      = fast ? -15.0 : -1.0;
+          result = TRUE;
+          break;
+
+        case GDK_KEY_Up:
+          y      = fast ? +15.0 : +1.0;
+          result = TRUE;
+          break;
+
+        case GDK_KEY_Down:
+          y      = fast ? -15.0 : -1.0;
+          result = TRUE;
+          break;
+        }
+
+      gimp_display_shell_unrotate_xy_f (shell, x0, y0, &x0, &y0);
+      gimp_display_shell_unrotate_xy_f (shell, x,  y,  &x,  &y);
+
+      gimp_vector3_set (&axis,
+                        (y - y0) * DEG_TO_RAD,
+                        (x - x0) * DEG_TO_RAD,
+                        0.0);
+      gimp_vector3_mul (&axis, factor);
+    }
+
+  gimp_tool_gyroscope_rotate (gyroscope, &axis);
+
+  return result;
+}
+
+static void
+gimp_tool_gyroscope_motion_modifier (GimpToolWidget  *widget,
+                                     GdkModifierType  key,
+                                     gboolean         press,
+                                     GdkModifierType  state)
+{
+  GimpToolGyroscope        *gyroscope = GIMP_TOOL_GYROSCOPE (widget);
+  GimpToolGyroscopePrivate *private   = gyroscope->private;
+
+  gimp_tool_gyroscope_update_status (gyroscope, state);
+
+  if (key == gimp_get_constrain_behavior_mask ())
+    {
+      switch (private->mode)
+      {
+        case MODE_PAN:
+          if (state & gimp_get_constrain_behavior_mask ())
+            private->constraint = CONSTRAINT_UNKNOWN;
+          else
+            private->constraint = CONSTRAINT_NONE;
+          break;
+
+        case MODE_ROTATE:
+          if (! (state & gimp_get_constrain_behavior_mask ()))
+            private->last_angle = private->curr_angle;
+          break;
+
+        case MODE_ZOOM:
+          if (! (state & gimp_get_constrain_behavior_mask ()))
+            private->last_zoom = private->zoom;
+          break;
+
+        case MODE_NONE:
+          break;
+      }
+    }
+}
+
+static gboolean
+gimp_tool_gyroscope_get_cursor (GimpToolWidget     *widget,
+                                const GimpCoords   *coords,
+                                GdkModifierType     state,
+                                GimpCursorType     *cursor,
+                                GimpToolCursorType *tool_cursor,
+                                GimpCursorModifier *modifier)
+{
+  if (state & GDK_MOD1_MASK)
+    *modifier = GIMP_CURSOR_MODIFIER_ZOOM;
+  else if (state & gimp_get_extend_selection_mask ())
+    *modifier = GIMP_CURSOR_MODIFIER_ROTATE;
+  else
+    *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+
+  return TRUE;
+}
+
+static void
+gimp_tool_gyroscope_update_status (GimpToolGyroscope *gyroscope,
+                                   GdkModifierType    state)
+{
+  GimpToolGyroscopePrivate *private = gyroscope->private;
+  gchar                    *status;
+
+  if (private->mode == MODE_ZOOM ||
+      (private->mode == MODE_NONE &&
+       state & GDK_MOD1_MASK))
+    {
+      status = gimp_suggest_modifiers (_("Click-Drag to zoom"),
+                                       gimp_get_toggle_behavior_mask () &
+                                       ~state,
+                                       NULL,
+                                       _("%s for constrained steps"),
+                                       NULL);
+    }
+  else if (private->mode == MODE_ROTATE ||
+           (private->mode == MODE_NONE &&
+            state & gimp_get_extend_selection_mask ()))
+    {
+      status = gimp_suggest_modifiers (_("Click-Drag to rotate"),
+                                       gimp_get_toggle_behavior_mask () &
+                                       ~state,
+                                       NULL,
+                                       _("%s for constrained angles"),
+                                       NULL);
+    }
+  else
+    {
+      status = gimp_suggest_modifiers (_("Click-Drag to pan"),
+                                       (((gimp_get_extend_selection_mask () |
+                                          GDK_MOD1_MASK)                    *
+                                         (private->mode == MODE_NONE))      |
+                                        gimp_get_toggle_behavior_mask  ())  &
+                                        ~state,
+                                       _("%s to rotate"),
+                                       _("%s for a constrained axis"),
+                                       _("%s to zoom"));
+    }
+
+  gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (gyroscope), status);
+
+  g_free (status);
+}
+
+static void
+gimp_tool_gyroscope_save (GimpToolGyroscope *gyroscope)
+{
+  GimpToolGyroscopePrivate *private = gyroscope->private;
+
+  private->orig_yaw   = private->yaw;
+  private->orig_pitch = private->pitch;
+  private->orig_roll  = private->roll;
+  private->orig_zoom  = private->zoom;
+}
+
+static void
+gimp_tool_gyroscope_restore (GimpToolGyroscope *gyroscope)
+{
+  GimpToolGyroscopePrivate *private = gyroscope->private;
+
+  g_object_set (gyroscope,
+                "yaw",   private->orig_yaw,
+                "pitch", private->orig_pitch,
+                "roll",  private->orig_roll,
+                "zoom",  private->orig_zoom,
+                NULL);
+}
+
+static void
+gimp_tool_gyroscope_rotate (GimpToolGyroscope *gyroscope,
+                            const GimpVector3 *axis)
+{
+  GimpToolGyroscopePrivate *private = gyroscope->private;
+  GimpVector3               real_axis;
+  GimpVector3               basis[2];
+  gdouble                   yaw;
+  gdouble                   pitch;
+  gdouble                   roll;
+  gint                      i;
+
+  if (gimp_vector3_length (axis) < EPSILON)
+    return;
+
+  real_axis = *axis;
+
+  if (private->invert)
+    gimp_vector3_neg (&real_axis);
+
+  for (i = 0; i < 2; i++)
+    {
+      gimp_vector3_set (&basis[i], i == 0, i == 1, 0.0);
+
+      if (private->invert)
+        gimp_tool_gyroscope_rotate_vector (&basis[i], &real_axis);
+
+      gimp_tool_gyroscope_rotate_vector (
+        &basis[i], &(GimpVector3) {0.0, private->yaw * DEG_TO_RAD, 0.0});
+      gimp_tool_gyroscope_rotate_vector (
+        &basis[i], &(GimpVector3) {private->pitch * DEG_TO_RAD, 0.0, 0.0});
+      gimp_tool_gyroscope_rotate_vector (
+        &basis[i], &(GimpVector3) {0.0, 0.0, private->roll * DEG_TO_RAD});
+
+      if (! private->invert)
+        gimp_tool_gyroscope_rotate_vector (&basis[i], &real_axis);
+    }
+
+  roll = atan2 (basis[1].x, basis[1].y);
+
+  for (i = 0; i < 2; i++)
+    {
+      gimp_tool_gyroscope_rotate_vector (
+        &basis[i], &(GimpVector3) {0.0, 0.0, -roll});
+    }
+
+  pitch = atan2 (-basis[1].z, basis[1].y);
+
+  for (i = 0; i < 1; i++)
+    {
+      gimp_tool_gyroscope_rotate_vector (
+        &basis[i], &(GimpVector3) {-pitch, 0.0, 0.0});
+    }
+
+  yaw = atan2 (basis[0].z, basis[0].x);
+
+  g_object_set (gyroscope,
+                "yaw",   yaw   / DEG_TO_RAD,
+                "pitch", pitch / DEG_TO_RAD,
+                "roll",  roll  / DEG_TO_RAD,
+                NULL);
+}
+
+static void
+gimp_tool_gyroscope_rotate_vector (GimpVector3       *vector,
+                                   const GimpVector3 *axis)
+{
+  GimpVector3 normalized_axis;
+  GimpVector3 projection;
+  GimpVector3 u;
+  GimpVector3 v;
+  gdouble     angle;
+
+  angle = gimp_vector3_length (axis);
+
+  if (angle < EPSILON)
+    return;
+
+  normalized_axis = gimp_vector3_mul_val (*axis, 1.0 / angle);
+
+  projection = gimp_vector3_mul_val (
+    normalized_axis,
+    gimp_vector3_inner_product (vector, &normalized_axis));
+
+  u = gimp_vector3_sub_val (*vector, projection);
+  v = gimp_vector3_cross_product (&u, &normalized_axis);
+
+  gimp_vector3_mul (&u, cos (angle));
+  gimp_vector3_mul (&v, sin (angle));
+
+  gimp_vector3_add (vector, &u, &v);
+  gimp_vector3_add (vector, vector, &projection);
+}
+
+
+/*  public functions  */
+
+
+GimpToolWidget *
+gimp_tool_gyroscope_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_GYROSCOPE,
+                       "shell", shell,
+                       NULL);
+}
diff --git a/app/display/gimptoolgyroscope.h b/app/display/gimptoolgyroscope.h
new file mode 100644
index 0000000..3d89648
--- /dev/null
+++ b/app/display/gimptoolgyroscope.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolgyroscope.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_GYROSCOPE_H__
+#define __GIMP_TOOL_GYROSCOPE_H__
+
+
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TYPE_TOOL_GYROSCOPE            (gimp_tool_gyroscope_get_type ())
+#define GIMP_TOOL_GYROSCOPE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_GYROSCOPE, GimpToolGyroscope))
+#define GIMP_TOOL_GYROSCOPE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_GYROSCOPE, GimpToolGyroscopeClass))
+#define GIMP_IS_TOOL_GYROSCOPE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_GYROSCOPE))
+#define GIMP_IS_TOOL_GYROSCOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_GYROSCOPE))
+#define GIMP_TOOL_GYROSCOPE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_GYROSCOPE, GimpToolGyroscopeClass))
+
+
+typedef struct _GimpToolGyroscope        GimpToolGyroscope;
+typedef struct _GimpToolGyroscopePrivate GimpToolGyroscopePrivate;
+typedef struct _GimpToolGyroscopeClass   GimpToolGyroscopeClass;
+
+struct _GimpToolGyroscope
+{
+  GimpToolWidget            parent_instance;
+
+  GimpToolGyroscopePrivate *private;
+};
+
+struct _GimpToolGyroscopeClass
+{
+  GimpToolWidgetClass  parent_class;
+};
+
+
+GType            gimp_tool_gyroscope_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_gyroscope_new      (GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_TOOL_GYROSCOPE_H__ */
diff --git a/app/display/gimptoolhandlegrid.c b/app/display/gimptoolhandlegrid.c
new file mode 100644
index 0000000..06dc156
--- /dev/null
+++ b/app/display/gimptoolhandlegrid.c
@@ -0,0 +1,1217 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolhandlegrid.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on GimpHandleTransformTool
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvashandle.h"
+#include "gimpdisplayshell.h"
+#include "gimptoolhandlegrid.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_HANDLE_MODE,
+  PROP_N_HANDLES,
+  PROP_ORIG_X1,
+  PROP_ORIG_Y1,
+  PROP_ORIG_X2,
+  PROP_ORIG_Y2,
+  PROP_ORIG_X3,
+  PROP_ORIG_Y3,
+  PROP_ORIG_X4,
+  PROP_ORIG_Y4,
+  PROP_TRANS_X1,
+  PROP_TRANS_Y1,
+  PROP_TRANS_X2,
+  PROP_TRANS_Y2,
+  PROP_TRANS_X3,
+  PROP_TRANS_Y3,
+  PROP_TRANS_X4,
+  PROP_TRANS_Y4
+};
+
+
+struct _GimpToolHandleGridPrivate
+{
+  GimpTransformHandleMode  handle_mode; /* enum to be renamed */
+
+  gint        n_handles;
+  GimpVector2 orig[4];
+  GimpVector2 trans[4];
+
+  gint     handle;
+  gdouble  last_x;
+  gdouble  last_y;
+
+  gboolean hover;
+  gdouble  mouse_x;
+  gdouble  mouse_y;
+
+  GimpCanvasItem *handles[5];
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_tool_handle_grid_constructed    (GObject               *object);
+static void   gimp_tool_handle_grid_set_property   (GObject               *object,
+                                                    guint                  property_id,
+                                                    const GValue          *value,
+                                                    GParamSpec            *pspec);
+static void   gimp_tool_handle_grid_get_property   (GObject               *object,
+                                                    guint                  property_id,
+                                                    GValue                *value,
+                                                    GParamSpec            *pspec);
+
+static void   gimp_tool_handle_grid_changed        (GimpToolWidget        *widget);
+static gint   gimp_tool_handle_grid_button_press   (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    guint32                time,
+                                                    GdkModifierType        state,
+                                                    GimpButtonPressType    press_type);
+static void   gimp_tool_handle_grid_button_release (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    guint32                time,
+                                                    GdkModifierType        state,
+                                                    GimpButtonReleaseType  release_type);
+static void   gimp_tool_handle_grid_motion         (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    guint32                time,
+                                                    GdkModifierType        state);
+static GimpHit  gimp_tool_handle_grid_hit          (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    GdkModifierType        state,
+                                                    gboolean               proximity);
+static void     gimp_tool_handle_grid_hover        (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    GdkModifierType        state,
+                                                    gboolean               proximity);
+static void     gimp_tool_handle_grid_leave_notify (GimpToolWidget        *widget);
+static gboolean gimp_tool_handle_grid_get_cursor   (GimpToolWidget        *widget,
+                                                    const GimpCoords      *coords,
+                                                    GdkModifierType        state,
+                                                    GimpCursorType        *cursor,
+                                                    GimpToolCursorType    *tool_cursor,
+                                                    GimpCursorModifier    *modifier);
+
+static gint     gimp_tool_handle_grid_get_handle     (GimpToolHandleGrid  *grid,
+                                                      const GimpCoords    *coords);
+static void     gimp_tool_handle_grid_update_hilight (GimpToolHandleGrid  *grid);
+static void     gimp_tool_handle_grid_update_matrix  (GimpToolHandleGrid  *grid);
+
+static gboolean is_handle_position_valid           (GimpToolHandleGrid    *grid,
+                                                    gint                   handle);
+static void     handle_micro_move                  (GimpToolHandleGrid    *grid,
+                                                    gint                   handle);
+
+static inline gdouble calc_angle               (gdouble ax,
+                                                gdouble ay,
+                                                gdouble bx,
+                                                gdouble by);
+static inline gdouble calc_len                 (gdouble a,
+                                                gdouble b);
+static inline gdouble calc_lineintersect_ratio (gdouble p1x,
+                                                gdouble p1y,
+                                                gdouble p2x,
+                                                gdouble p2y,
+                                                gdouble q1x,
+                                                gdouble q1y,
+                                                gdouble q2x,
+                                                gdouble q2y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolHandleGrid, gimp_tool_handle_grid,
+                            GIMP_TYPE_TOOL_TRANSFORM_GRID)
+
+#define parent_class gimp_tool_handle_grid_parent_class
+
+
+static void
+gimp_tool_handle_grid_class_init (GimpToolHandleGridClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_handle_grid_constructed;
+  object_class->set_property    = gimp_tool_handle_grid_set_property;
+  object_class->get_property    = gimp_tool_handle_grid_get_property;
+
+  widget_class->changed         = gimp_tool_handle_grid_changed;
+  widget_class->button_press    = gimp_tool_handle_grid_button_press;
+  widget_class->button_release  = gimp_tool_handle_grid_button_release;
+  widget_class->motion          = gimp_tool_handle_grid_motion;
+  widget_class->hit             = gimp_tool_handle_grid_hit;
+  widget_class->hover           = gimp_tool_handle_grid_hover;
+  widget_class->leave_notify    = gimp_tool_handle_grid_leave_notify;
+  widget_class->get_cursor      = gimp_tool_handle_grid_get_cursor;
+
+  g_object_class_install_property (object_class, PROP_HANDLE_MODE,
+                                   g_param_spec_enum ("handle-mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_TRANSFORM_HANDLE_MODE,
+                                                      GIMP_HANDLE_MODE_ADD_TRANSFORM,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_N_HANDLES,
+                                   g_param_spec_int ("n-handles",
+                                                     NULL, NULL,
+                                                     0, 4, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_X1,
+                                   g_param_spec_double ("orig-x1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_Y1,
+                                   g_param_spec_double ("orig-y1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_X2,
+                                   g_param_spec_double ("orig-x2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_Y2,
+                                   g_param_spec_double ("orig-y2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_X3,
+                                   g_param_spec_double ("orig-x3",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_Y3,
+                                   g_param_spec_double ("orig-y3",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_X4,
+                                   g_param_spec_double ("orig-x4",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ORIG_Y4,
+                                   g_param_spec_double ("orig-y4",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_X1,
+                                   g_param_spec_double ("trans-x1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_Y1,
+                                   g_param_spec_double ("trans-y1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_X2,
+                                   g_param_spec_double ("trans-x2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_Y2,
+                                   g_param_spec_double ("trans-y2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_X3,
+                                   g_param_spec_double ("trans-x3",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_Y3,
+                                   g_param_spec_double ("trans-y3",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_X4,
+                                   g_param_spec_double ("trans-x4",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TRANS_Y4,
+                                   g_param_spec_double ("trans-y4",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_handle_grid_init (GimpToolHandleGrid *grid)
+{
+  grid->private = gimp_tool_handle_grid_get_instance_private (grid);
+}
+
+static void
+gimp_tool_handle_grid_constructed (GObject *object)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (object);
+  GimpToolWidget            *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolHandleGridPrivate *private = grid->private;
+  gint                       i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  for (i = 0; i < 4; i++)
+    {
+      private->handles[i + 1] =
+        gimp_tool_widget_add_handle (widget,
+                                     GIMP_HANDLE_CIRCLE,
+                                     0, 0,
+                                     GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                     GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+    }
+
+  gimp_tool_handle_grid_changed (widget);
+}
+
+static void
+gimp_tool_handle_grid_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (object);
+  GimpToolHandleGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_HANDLE_MODE:
+      private->handle_mode = g_value_get_enum (value);
+      break;
+
+    case PROP_N_HANDLES:
+      private->n_handles = g_value_get_int (value);
+      break;
+
+    case PROP_ORIG_X1:
+      private->orig[0].x = g_value_get_double (value);
+      break;
+    case PROP_ORIG_Y1:
+      private->orig[0].y = g_value_get_double (value);
+      break;
+    case PROP_ORIG_X2:
+      private->orig[1].x = g_value_get_double (value);
+      break;
+    case PROP_ORIG_Y2:
+      private->orig[1].y = g_value_get_double (value);
+      break;
+    case PROP_ORIG_X3:
+      private->orig[2].x = g_value_get_double (value);
+      break;
+    case PROP_ORIG_Y3:
+      private->orig[2].y = g_value_get_double (value);
+      break;
+    case PROP_ORIG_X4:
+      private->orig[3].x = g_value_get_double (value);
+      break;
+    case PROP_ORIG_Y4:
+      private->orig[3].y = g_value_get_double (value);
+      break;
+
+    case PROP_TRANS_X1:
+      private->trans[0].x = g_value_get_double (value);
+      break;
+    case PROP_TRANS_Y1:
+      private->trans[0].y = g_value_get_double (value);
+      break;
+    case PROP_TRANS_X2:
+      private->trans[1].x = g_value_get_double (value);
+      break;
+    case PROP_TRANS_Y2:
+      private->trans[1].y = g_value_get_double (value);
+      break;
+    case PROP_TRANS_X3:
+      private->trans[2].x = g_value_get_double (value);
+      break;
+    case PROP_TRANS_Y3:
+      private->trans[2].y = g_value_get_double (value);
+      break;
+    case PROP_TRANS_X4:
+      private->trans[3].x = g_value_get_double (value);
+      break;
+    case PROP_TRANS_Y4:
+      private->trans[3].y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_handle_grid_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (object);
+  GimpToolHandleGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_N_HANDLES:
+      g_value_set_int (value, private->n_handles);
+      break;
+
+    case PROP_HANDLE_MODE:
+      g_value_set_enum (value, private->handle_mode);
+      break;
+
+    case PROP_ORIG_X1:
+      g_value_set_double (value, private->orig[0].x);
+      break;
+    case PROP_ORIG_Y1:
+      g_value_set_double (value, private->orig[0].y);
+      break;
+    case PROP_ORIG_X2:
+      g_value_set_double (value, private->orig[1].x);
+      break;
+    case PROP_ORIG_Y2:
+      g_value_set_double (value, private->orig[1].y);
+      break;
+    case PROP_ORIG_X3:
+      g_value_set_double (value, private->orig[2].x);
+      break;
+    case PROP_ORIG_Y3:
+      g_value_set_double (value, private->orig[2].y);
+      break;
+    case PROP_ORIG_X4:
+      g_value_set_double (value, private->orig[3].x);
+      break;
+    case PROP_ORIG_Y4:
+      g_value_set_double (value, private->orig[3].y);
+      break;
+
+    case PROP_TRANS_X1:
+      g_value_set_double (value, private->trans[0].x);
+      break;
+    case PROP_TRANS_Y1:
+      g_value_set_double (value, private->trans[0].y);
+      break;
+    case PROP_TRANS_X2:
+      g_value_set_double (value, private->trans[1].x);
+      break;
+    case PROP_TRANS_Y2:
+      g_value_set_double (value, private->trans[1].y);
+      break;
+    case PROP_TRANS_X3:
+      g_value_set_double (value, private->trans[2].x);
+      break;
+    case PROP_TRANS_Y3:
+      g_value_set_double (value, private->trans[2].y);
+      break;
+    case PROP_TRANS_X4:
+      g_value_set_double (value, private->trans[3].x);
+      break;
+    case PROP_TRANS_Y4:
+      g_value_set_double (value, private->trans[3].y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_handle_grid_changed (GimpToolWidget *widget)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private = grid->private;
+  gint                       i;
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->changed (widget);
+
+  for (i = 0; i < 4; i++)
+    {
+      gimp_canvas_handle_set_position (private->handles[i + 1],
+                                       private->trans[i].x,
+                                       private->trans[i].y);
+      gimp_canvas_item_set_visible (private->handles[i + 1],
+                                    i < private->n_handles);
+    }
+
+  gimp_tool_handle_grid_update_hilight (grid);
+}
+
+static gint
+gimp_tool_handle_grid_button_press (GimpToolWidget      *widget,
+                                    const GimpCoords    *coords,
+                                    guint32              time,
+                                    GdkModifierType      state,
+                                    GimpButtonPressType  press_type)
+{
+  GimpToolHandleGrid        *grid           = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private        = grid->private;
+  gint                       n_handles      = private->n_handles;
+  gint                       active_handle  = private->handle - 1;
+  GimpCanvasItem            *dragged_handle = NULL;
+
+  switch (private->handle_mode)
+    {
+    case GIMP_HANDLE_MODE_ADD_TRANSFORM:
+      if (n_handles < 4 && active_handle == -1)
+        {
+          /* add handle */
+
+          GimpMatrix3 *matrix;
+
+          active_handle = n_handles;
+
+          private->trans[active_handle].x = coords->x;
+          private->trans[active_handle].y = coords->y;
+          private->n_handles++;
+
+          if (! is_handle_position_valid (grid, active_handle))
+            {
+              handle_micro_move (grid, active_handle);
+            }
+
+          /* handle was added, calculate new original position */
+          g_object_get (grid,
+                        "transform", &matrix,
+                        NULL);
+
+          gimp_matrix3_invert (matrix);
+          gimp_matrix3_transform_point (matrix,
+                                        private->trans[active_handle].x,
+                                        private->trans[active_handle].y,
+                                        &private->orig[active_handle].x,
+                                        &private->orig[active_handle].y);
+
+          g_free (matrix);
+
+          private->handle = active_handle + 1;
+
+          g_object_notify (G_OBJECT (grid), "n-handles");
+        }
+      else if (active_handle >= 0 &&
+               active_handle < 4)
+        {
+          /* existing handle is being dragged. don't set dragged_handle for
+           * newly-created handles, otherwise their snap offset will be wrong
+           */
+          dragged_handle = private->handles[private->handle];
+        }
+      break;
+
+    case GIMP_HANDLE_MODE_MOVE:
+      if (active_handle >= 0 &&
+          active_handle < 4)
+        {
+          /* existing handle is being dragged */
+          dragged_handle = private->handles[private->handle];
+        }
+      /* check for valid position and calculating of OX0...OY3 is
+       * done on button release
+       */
+      break;
+
+    case GIMP_HANDLE_MODE_REMOVE:
+      if (n_handles > 0      &&
+          active_handle >= 0 &&
+          active_handle < 4)
+        {
+          /* remove handle */
+
+          GimpVector2 temp  = private->trans[active_handle];
+          GimpVector2 tempo = private->orig[active_handle];
+          gint        i;
+
+          n_handles--;
+          private->n_handles--;
+
+          for (i = active_handle; i < n_handles; i++)
+            {
+              private->trans[i] = private->trans[i + 1];
+              private->orig[i]  = private->orig[i + 1];
+            }
+
+          private->trans[n_handles] = temp;
+          private->orig[n_handles]  = tempo;
+
+          g_object_notify (G_OBJECT (grid), "n-handles");
+        }
+      break;
+    }
+
+  /* ensure dragged handles snap to guides based on the handle center, not where
+   * the cursor grabbed them
+   */
+  if (dragged_handle)
+    {
+      gdouble x, y;
+
+      gimp_canvas_handle_get_position (dragged_handle,
+                                       &x,
+                                       &y);
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         SIGNED_ROUND (x - coords->x),
+                                         SIGNED_ROUND (y - coords->y),
+                                         0, 0);
+    }
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+
+  return private->handle;
+}
+
+static void
+gimp_tool_handle_grid_button_release (GimpToolWidget        *widget,
+                                      const GimpCoords      *coords,
+                                      guint32                time,
+                                      GdkModifierType        state,
+                                      GimpButtonReleaseType  release_type)
+{
+  GimpToolHandleGrid        *grid          = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private       = grid->private;
+  gint                       active_handle = private->handle - 1;
+
+  if (private->handle_mode == GIMP_HANDLE_MODE_MOVE &&
+      active_handle >= 0 &&
+      active_handle < 4)
+    {
+      GimpMatrix3 *matrix;
+
+      if (! is_handle_position_valid (grid, active_handle))
+        {
+          handle_micro_move (grid, active_handle);
+        }
+
+      /* handle was moved, calculate new original position */
+      g_object_get (grid,
+                    "transform", &matrix,
+                    NULL);
+
+      gimp_matrix3_invert (matrix);
+      gimp_matrix3_transform_point (matrix,
+                                    private->trans[active_handle].x,
+                                    private->trans[active_handle].y,
+                                    &private->orig[active_handle].x,
+                                    &private->orig[active_handle].y);
+
+      g_free (matrix);
+
+      gimp_tool_handle_grid_update_matrix (grid);
+    }
+}
+
+void
+gimp_tool_handle_grid_motion (GimpToolWidget   *widget,
+                              const GimpCoords *coords,
+                              guint32           time,
+                              GdkModifierType   state)
+{
+  GimpToolHandleGrid        *grid          = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private       = grid->private;
+  gint                       n_handles     = private->n_handles;
+  gint                       active_handle = private->handle - 1;
+  gdouble                    diff_x        = coords->x - private->last_x;
+  gdouble                    diff_y        = coords->y - private->last_y;
+
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  if (active_handle >= 0 && active_handle < 4)
+    {
+      if (private->handle_mode == GIMP_HANDLE_MODE_MOVE)
+        {
+          private->trans[active_handle].x += diff_x;
+          private->trans[active_handle].y += diff_y;
+
+          /* check for valid position and calculating of OX0...OY3 is
+           * done on button release hopefully this makes the code run
+           * faster Moving could be even faster if there was caching
+           * for the image preview
+           */
+          gimp_canvas_handle_set_position (private->handles[active_handle + 1],
+                                           private->trans[active_handle].x,
+                                           private->trans[active_handle].y);
+        }
+      else if (private->handle_mode == GIMP_HANDLE_MODE_ADD_TRANSFORM)
+        {
+          gdouble angle, angle_sin, angle_cos, scale;
+          GimpVector2 fixed_handles[3];
+          GimpVector2 oldpos[4];
+          GimpVector2 newpos[4];
+          gint    i, j;
+
+          for (i = 0, j = 0; i < 4; i++)
+            {
+              /* Find all visible handles that are not being moved */
+              if (i < n_handles && i != active_handle)
+                {
+                  fixed_handles[j] = private->trans[i];
+                  j++;
+                }
+
+              newpos[i] = oldpos[i] = private->trans[i];
+            }
+
+          newpos[active_handle].x = oldpos[active_handle].x + diff_x;
+          newpos[active_handle].y = oldpos[active_handle].y + diff_y;
+
+          switch (n_handles)
+            {
+            case 1:
+              /* move */
+              for (i = 0; i < 4; i++)
+                {
+                  newpos[i].x = oldpos[i].x + diff_x;
+                  newpos[i].y = oldpos[i].y + diff_y;
+                }
+              break;
+
+            case 2:
+              /* rotate and keep-aspect-scale */
+              scale =
+                calc_len (newpos[active_handle].x - fixed_handles[0].x,
+                          newpos[active_handle].y - fixed_handles[0].y) /
+                calc_len (oldpos[active_handle].x - fixed_handles[0].x,
+                          oldpos[active_handle].y - fixed_handles[0].y);
+
+              angle = calc_angle (oldpos[active_handle].x - fixed_handles[0].x,
+                                  oldpos[active_handle].y - fixed_handles[0].y,
+                                  newpos[active_handle].x - fixed_handles[0].x,
+                                  newpos[active_handle].y - fixed_handles[0].y);
+
+              angle_sin = sin (angle);
+              angle_cos = cos (angle);
+
+              for (i = 2; i < 4; i++)
+                {
+                  newpos[i].x =
+                    fixed_handles[0].x +
+                    scale * (angle_cos * (oldpos[i].x - fixed_handles[0].x) +
+                             angle_sin * (oldpos[i].y - fixed_handles[0].y));
+
+                  newpos[i].y =
+                    fixed_handles[0].y +
+                    scale * (-angle_sin * (oldpos[i].x - fixed_handles[0].x) +
+                              angle_cos * (oldpos[i].y - fixed_handles[0].y));
+                }
+              break;
+
+            case 3:
+              /* shear and non-aspect-scale */
+              scale = calc_lineintersect_ratio (oldpos[3].x,
+                                                oldpos[3].y,
+                                                oldpos[active_handle].x,
+                                                oldpos[active_handle].y,
+                                                fixed_handles[0].x,
+                                                fixed_handles[0].y,
+                                                fixed_handles[1].x,
+                                                fixed_handles[1].y);
+
+              newpos[3].x = oldpos[3].x + scale * diff_x;
+              newpos[3].y = oldpos[3].y + scale * diff_y;
+              break;
+            }
+
+          for (i = 0; i < 4; i++)
+            {
+              private->trans[i] = newpos[i];
+            }
+
+          gimp_tool_handle_grid_update_matrix (grid);
+        }
+    }
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+}
+
+static GimpHit
+gimp_tool_handle_grid_hit (GimpToolWidget   *widget,
+                           const GimpCoords *coords,
+                           GdkModifierType   state,
+                           gboolean          proximity)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private = grid->private;
+
+  if (proximity)
+    {
+      gint handle = gimp_tool_handle_grid_get_handle (grid, coords);
+
+      switch (private->handle_mode)
+        {
+        case GIMP_HANDLE_MODE_ADD_TRANSFORM:
+          if (handle > 0)
+            return GIMP_HIT_DIRECT;
+          else
+            return GIMP_HIT_INDIRECT;
+          break;
+
+        case GIMP_HANDLE_MODE_MOVE:
+        case GIMP_HANDLE_MODE_REMOVE:
+          if (private->handle > 0)
+            return GIMP_HIT_DIRECT;
+          break;
+        }
+    }
+
+  return GIMP_HIT_NONE;
+}
+
+static void
+gimp_tool_handle_grid_hover (GimpToolWidget   *widget,
+                             const GimpCoords *coords,
+                             GdkModifierType   state,
+                             gboolean          proximity)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private = grid->private;
+  gchar                     *status  = NULL;
+
+  private->hover   = TRUE;
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  private->handle = gimp_tool_handle_grid_get_handle (grid, coords);
+
+  if (proximity)
+    {
+      GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      switch (private->handle_mode)
+        {
+        case GIMP_HANDLE_MODE_ADD_TRANSFORM:
+          if (private->handle > 0)
+            {
+              const gchar *s = NULL;
+
+              switch (private->n_handles)
+                {
+                case 1:
+                  s = _("Click-Drag to move");
+                  break;
+                case 2:
+                  s = _("Click-Drag to rotate and scale");
+                  break;
+                case 3:
+                  s = _("Click-Drag to shear and scale");
+                  break;
+                case 4:
+                  s = _("Click-Drag to change perspective");
+                  break;
+                }
+
+              status = gimp_suggest_modifiers (s,
+                                               extend_mask | toggle_mask,
+                                               NULL, NULL, NULL);
+            }
+          else
+            {
+              if (private->n_handles < 4)
+                status = g_strdup (_("Click to add a handle"));
+            }
+          break;
+
+        case GIMP_HANDLE_MODE_MOVE:
+          if (private->handle > 0)
+            status = g_strdup (_("Click-Drag to move this handle"));
+          break;
+
+        case GIMP_HANDLE_MODE_REMOVE:
+          if (private->handle > 0)
+            status = g_strdup (_("Click-Drag to remove this handle"));
+          break;
+        }
+    }
+
+  gimp_tool_widget_set_status (widget, status);
+  g_free (status);
+
+  gimp_tool_handle_grid_update_hilight (grid);
+}
+
+static void
+gimp_tool_handle_grid_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private = grid->private;
+
+  private->hover  = FALSE;
+  private->handle = 0;
+
+  gimp_tool_handle_grid_update_hilight (grid);
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static gboolean
+gimp_tool_handle_grid_get_cursor (GimpToolWidget     *widget,
+                                  const GimpCoords   *coords,
+                                  GdkModifierType     state,
+                                  GimpCursorType     *cursor,
+                                  GimpToolCursorType *tool_cursor,
+                                  GimpCursorModifier *modifier)
+{
+  GimpToolHandleGrid        *grid    = GIMP_TOOL_HANDLE_GRID (widget);
+  GimpToolHandleGridPrivate *private = grid->private;
+
+  *cursor      = GIMP_CURSOR_CROSSHAIR_SMALL;
+  *tool_cursor = GIMP_TOOL_CURSOR_NONE;
+  *modifier    = GIMP_CURSOR_MODIFIER_NONE;
+
+  switch (private->handle_mode)
+    {
+    case GIMP_HANDLE_MODE_ADD_TRANSFORM:
+      if (private->handle > 0)
+        {
+          switch (private->n_handles)
+            {
+            case 1:
+              *tool_cursor = GIMP_TOOL_CURSOR_MOVE;
+              break;
+            case 2:
+              *tool_cursor = GIMP_TOOL_CURSOR_ROTATE;
+              break;
+            case 3:
+              *tool_cursor = GIMP_TOOL_CURSOR_SHEAR;
+              break;
+            case 4:
+              *tool_cursor = GIMP_TOOL_CURSOR_PERSPECTIVE;
+              break;
+            }
+        }
+      else
+        {
+          if (private->n_handles < 4)
+            *modifier = GIMP_CURSOR_MODIFIER_PLUS;
+          else
+            *modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+      break;
+
+    case GIMP_HANDLE_MODE_MOVE:
+      if (private->handle > 0)
+        *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+      else
+        *modifier = GIMP_CURSOR_MODIFIER_BAD;
+      break;
+
+    case GIMP_HANDLE_MODE_REMOVE:
+      if (private->handle > 0)
+        *modifier = GIMP_CURSOR_MODIFIER_MINUS;
+      else
+        *modifier = GIMP_CURSOR_MODIFIER_BAD;
+      break;
+    }
+
+  return TRUE;
+}
+
+static gint
+gimp_tool_handle_grid_get_handle (GimpToolHandleGrid *grid,
+                                  const GimpCoords   *coords)
+{
+  GimpToolHandleGridPrivate *private = grid->private;
+  gint                       i;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (private->handles[i + 1] &&
+          gimp_canvas_item_hit (private->handles[i + 1],
+                                coords->x, coords->y))
+        {
+          return i + 1;
+        }
+    }
+
+  return 0;
+}
+
+static void
+gimp_tool_handle_grid_update_hilight (GimpToolHandleGrid *grid)
+{
+  GimpToolHandleGridPrivate *private = grid->private;
+  gint                       i;
+
+  for (i = 0; i < 4; i++)
+    {
+      GimpCanvasItem *item = private->handles[i + 1];
+
+      if (item)
+        {
+          gdouble diameter = GIMP_CANVAS_HANDLE_SIZE_CIRCLE;
+
+          if (private->hover)
+            {
+              diameter = gimp_canvas_handle_calc_size (
+                item,
+                private->mouse_x,
+                private->mouse_y,
+                GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                2 * GIMP_CANVAS_HANDLE_SIZE_CIRCLE);
+            }
+
+          gimp_canvas_handle_set_size (item, diameter, diameter);
+          gimp_canvas_item_set_highlight (item, (i + 1) == private->handle);
+        }
+    }
+}
+
+static void
+gimp_tool_handle_grid_update_matrix (GimpToolHandleGrid *grid)
+{
+  GimpToolHandleGridPrivate *private = grid->private;
+  GimpMatrix3                transform;
+  gboolean                   transform_valid;
+
+  gimp_matrix3_identity (&transform);
+  transform_valid = gimp_transform_matrix_generic (&transform,
+                                                   private->orig,
+                                                   private->trans);
+
+  g_object_set (grid,
+                "transform",   &transform,
+                "show-guides", transform_valid,
+                NULL);
+}
+
+/* check if a handle is not on the connection line of two other handles */
+static gboolean
+is_handle_position_valid (GimpToolHandleGrid *grid,
+                          gint                handle)
+{
+  GimpToolHandleGridPrivate *private = grid->private;
+  gint                       i, j, k;
+
+  for (i = 0; i < 2; i++)
+    {
+      for (j = i + 1; j < 3; j++)
+        {
+          for (k = j + 1; i < 4; i++)
+            {
+              if (handle == i ||
+                  handle == j ||
+                  handle == k)
+                {
+                  if ((private->trans[i].x -
+                       private->trans[j].x) *
+                      (private->trans[j].y -
+                       private->trans[k].y) ==
+
+                      (private->trans[j].x -
+                       private->trans[k].x) *
+                      (private->trans[i].y -
+                       private->trans[j].y))
+                    {
+                      return FALSE;
+                    }
+                }
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+/* three handles on a line causes problems.
+ * Let's move the new handle around a bit to find a better position */
+static void
+handle_micro_move (GimpToolHandleGrid *grid,
+                   gint                handle)
+{
+  GimpToolHandleGridPrivate *private = grid->private;
+  gdouble                    posx    = private->trans[handle].x;
+  gdouble                    posy    = private->trans[handle].y;
+  gdouble                    dx, dy;
+
+  for (dx = -0.1; dx < 0.11; dx += 0.1)
+    {
+      private->trans[handle].x = posx + dx;
+
+      for (dy = -0.1; dy < 0.11; dy += 0.1)
+        {
+          private->trans[handle].y = posy + dy;
+
+          if (is_handle_position_valid (grid, handle))
+            {
+              return;
+            }
+        }
+    }
+}
+
+/* finds the clockwise angle between the vectors given, 0-2π */
+static inline gdouble
+calc_angle (gdouble ax,
+            gdouble ay,
+            gdouble bx,
+            gdouble by)
+{
+  gdouble angle;
+  gdouble direction;
+  gdouble length = sqrt ((ax * ax + ay * ay) * (bx * bx + by * by));
+
+  angle = acos ((ax * bx + ay * by) / length);
+  direction = ax * by - ay * bx;
+
+  return ((direction < 0) ? angle : 2 * G_PI - angle);
+}
+
+static inline gdouble
+calc_len  (gdouble a,
+           gdouble b)
+{
+  return sqrt (a * a + b * b);
+}
+
+/* imagine two lines, one through the points p1 and p2, the other one
+ * through the points q1 and q2. Find the intersection point r.
+ * Calculate (distance p1 to r)/(distance p2 to r)
+ */
+static inline gdouble
+calc_lineintersect_ratio (gdouble p1x, gdouble p1y,
+                          gdouble p2x, gdouble p2y,
+                          gdouble q1x, gdouble q1y,
+                          gdouble q2x, gdouble q2y)
+{
+  gdouble denom, u;
+
+  denom = (q2y - q1y) * (p2x - p1x) - (q2x - q1x) * (p2y - p1y);
+  if (denom == 0.0)
+    {
+      /* u is infinite, so u/(u-1) is 1 */
+      return 1.0;
+    }
+
+  u = (q2y - q1y) * (q1x - p1x) - (q1y - p1y) * (q2x - q1x);
+  u /= denom;
+
+  return u / (u - 1);
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_handle_grid_new (GimpDisplayShell *shell,
+                           gdouble           x1,
+                           gdouble           y1,
+                           gdouble           x2,
+                           gdouble           y2)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_HANDLE_GRID,
+                       "shell",       shell,
+                       "x1",          x1,
+                       "y1",          y1,
+                       "x2",          x2,
+                       "y2",          y2,
+                       "clip-guides", TRUE,
+                       NULL);
+}
diff --git a/app/display/gimptoolhandlegrid.h b/app/display/gimptoolhandlegrid.h
new file mode 100644
index 0000000..77d31dc
--- /dev/null
+++ b/app/display/gimptoolhandlegrid.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolhandlegrid.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_HANDLE_GRID_H__
+#define __GIMP_TOOL_HANDLE_GRID_H__
+
+
+#include "gimptooltransformgrid.h"
+
+
+#define GIMP_TYPE_TOOL_HANDLE_GRID            (gimp_tool_handle_grid_get_type ())
+#define GIMP_TOOL_HANDLE_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_HANDLE_GRID, GimpToolHandleGrid))
+#define GIMP_TOOL_HANDLE_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_HANDLE_GRID, GimpToolHandleGridClass))
+#define GIMP_IS_TOOL_HANDLE_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_HANDLE_GRID))
+#define GIMP_IS_TOOL_HANDLE_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_HANDLE_GRID))
+#define GIMP_TOOL_HANDLE_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_HANDLE_GRID, GimpToolHandleGridClass))
+
+
+typedef struct _GimpToolHandleGrid        GimpToolHandleGrid;
+typedef struct _GimpToolHandleGridPrivate GimpToolHandleGridPrivate;
+typedef struct _GimpToolHandleGridClass   GimpToolHandleGridClass;
+
+struct _GimpToolHandleGrid
+{
+  GimpToolTransformGrid      parent_instance;
+
+  GimpToolHandleGridPrivate *private;
+};
+
+struct _GimpToolHandleGridClass
+{
+  GimpToolTransformGridClass  parent_class;
+};
+
+
+GType            gimp_tool_handle_grid_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_handle_grid_new      (GimpDisplayShell  *shell,
+                                                 gdouble            x1,
+                                                 gdouble            y1,
+                                                 gdouble            x2,
+                                                 gdouble            y2);
+
+
+#endif /* __GIMP_TOOL_HANDLE_GRID_H__ */
diff --git a/app/display/gimptoolline.c b/app/display/gimptoolline.c
new file mode 100644
index 0000000..271f926
--- /dev/null
+++ b/app/display/gimptoolline.c
@@ -0,0 +1,1796 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolline.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Major improvements for interactivity
+ * Copyright (C) 2014 Michael Henning <drawoc@darkrefraction.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpmarshal.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvasgroup.h"
+#include "gimpcanvashandle.h"
+#include "gimpcanvasline.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-cursor.h"
+#include "gimpdisplayshell-utils.h"
+#include "gimptoolline.h"
+
+#include "gimp-intl.h"
+
+
+#define SHOW_LINE            TRUE
+#define GRAB_LINE_MASK       GDK_MOD1_MASK
+#define ENDPOINT_HANDLE_TYPE GIMP_HANDLE_CROSS
+#define ENDPOINT_HANDLE_SIZE GIMP_CANVAS_HANDLE_SIZE_CROSS
+#define SLIDER_HANDLE_TYPE   GIMP_HANDLE_FILLED_DIAMOND
+#define SLIDER_HANDLE_SIZE   (ENDPOINT_HANDLE_SIZE * 2 / 3)
+#define HANDLE_CIRCLE_SCALE  1.8
+#define LINE_VICINITY        ((gint) (SLIDER_HANDLE_SIZE * HANDLE_CIRCLE_SCALE) / 2)
+#define SLIDER_TEAR_DISTANCE (5 * LINE_VICINITY)
+
+
+/* hover-only "handles" */
+#define HOVER_NEW_SLIDER     (GIMP_TOOL_LINE_HANDLE_NONE - 1)
+
+
+typedef enum
+{
+  GRAB_NONE,
+  GRAB_SELECTION,
+  GRAB_LINE
+} GimpToolLineGrab;
+
+enum
+{
+  PROP_0,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2,
+  PROP_SLIDERS,
+  PROP_SELECTION,
+  PROP_STATUS_TITLE,
+};
+
+enum
+{
+  CAN_ADD_SLIDER,
+  ADD_SLIDER,
+  PREPARE_TO_REMOVE_SLIDER,
+  REMOVE_SLIDER,
+  SELECTION_CHANGED,
+  HANDLE_CLICKED,
+  LAST_SIGNAL
+};
+
+struct _GimpToolLinePrivate
+{
+  gdouble            x1;
+  gdouble            y1;
+  gdouble            x2;
+  gdouble            y2;
+  GArray            *sliders;
+  gint               selection;
+  gchar             *status_title;
+
+  gdouble            saved_x1;
+  gdouble            saved_y1;
+  gdouble            saved_x2;
+  gdouble            saved_y2;
+  gdouble            saved_slider_value;
+
+  gdouble            mouse_x;
+  gdouble            mouse_y;
+  gint               hover;
+  gdouble            new_slider_value;
+  gboolean           remove_slider;
+  GimpToolLineGrab   grab;
+
+  GimpCanvasItem    *line;
+  GimpCanvasItem    *start_handle;
+  GimpCanvasItem    *end_handle;
+  GimpCanvasItem    *slider_group;
+  GArray            *slider_handles;
+  GimpCanvasItem    *handle_circle;
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_line_constructed     (GObject               *object);
+static void     gimp_tool_line_finalize        (GObject               *object);
+static void     gimp_tool_line_set_property    (GObject               *object,
+                                                guint                  property_id,
+                                                const GValue          *value,
+                                                GParamSpec            *pspec);
+static void     gimp_tool_line_get_property    (GObject               *object,
+                                                guint                  property_id,
+                                                GValue                *value,
+                                                GParamSpec            *pspec);
+
+static void     gimp_tool_line_changed         (GimpToolWidget        *widget);
+static void     gimp_tool_line_focus_changed   (GimpToolWidget        *widget);
+static gint     gimp_tool_line_button_press    (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonPressType    press_type);
+static void     gimp_tool_line_button_release  (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonReleaseType  release_type);
+static void     gimp_tool_line_motion          (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state);
+static GimpHit  gimp_tool_line_hit             (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+static void     gimp_tool_line_hover           (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+static void     gimp_tool_line_leave_notify    (GimpToolWidget        *widget);
+static gboolean gimp_tool_line_key_press       (GimpToolWidget        *widget,
+                                                GdkEventKey           *kevent);
+static void     gimp_tool_line_motion_modifier (GimpToolWidget        *widget,
+                                                GdkModifierType        key,
+                                                gboolean               press,
+                                                GdkModifierType        state);
+static gboolean gimp_tool_line_get_cursor      (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                GimpCursorType        *cursor,
+                                                GimpToolCursorType    *tool_cursor,
+                                                GimpCursorModifier    *modifier);
+
+static gint     gimp_tool_line_get_hover       (GimpToolLine          *line,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state);
+static GimpControllerSlider *
+                gimp_tool_line_get_slider      (GimpToolLine          *line,
+                                                gint                   slider);
+static GimpCanvasItem *
+                gimp_tool_line_get_handle      (GimpToolLine          *line,
+                                                gint                   handle);
+static gdouble  gimp_tool_line_project_point   (GimpToolLine          *line,
+                                                gdouble                x,
+                                                gdouble                y,
+                                                gboolean               constrain,
+                                                gdouble               *dist);
+
+static gboolean
+               gimp_tool_line_selection_motion (GimpToolLine          *line,
+                                                gboolean               constrain);
+
+static void     gimp_tool_line_update_handles  (GimpToolLine          *line);
+static void     gimp_tool_line_update_circle   (GimpToolLine          *line);
+static void     gimp_tool_line_update_hilight  (GimpToolLine          *line);
+static void     gimp_tool_line_update_status   (GimpToolLine          *line,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+
+static gboolean gimp_tool_line_handle_hit      (GimpCanvasItem        *handle,
+                                                gdouble                x,
+                                                gdouble                y,
+                                                gdouble               *min_dist);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolLine, gimp_tool_line, GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_line_parent_class
+
+static guint line_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_tool_line_class_init (GimpToolLineClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_line_constructed;
+  object_class->finalize        = gimp_tool_line_finalize;
+  object_class->set_property    = gimp_tool_line_set_property;
+  object_class->get_property    = gimp_tool_line_get_property;
+
+  widget_class->changed         = gimp_tool_line_changed;
+  widget_class->focus_changed   = gimp_tool_line_focus_changed;
+  widget_class->button_press    = gimp_tool_line_button_press;
+  widget_class->button_release  = gimp_tool_line_button_release;
+  widget_class->motion          = gimp_tool_line_motion;
+  widget_class->hit             = gimp_tool_line_hit;
+  widget_class->hover           = gimp_tool_line_hover;
+  widget_class->leave_notify    = gimp_tool_line_leave_notify;
+  widget_class->key_press       = gimp_tool_line_key_press;
+  widget_class->motion_modifier = gimp_tool_line_motion_modifier;
+  widget_class->get_cursor      = gimp_tool_line_get_cursor;
+
+  line_signals[CAN_ADD_SLIDER] =
+    g_signal_new ("can-add-slider",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpToolLineClass, can_add_slider),
+                  NULL, NULL,
+                  gimp_marshal_BOOLEAN__DOUBLE,
+                  G_TYPE_BOOLEAN, 1,
+                  G_TYPE_DOUBLE);
+
+  line_signals[ADD_SLIDER] =
+    g_signal_new ("add-slider",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpToolLineClass, add_slider),
+                  NULL, NULL,
+                  gimp_marshal_INT__DOUBLE,
+                  G_TYPE_INT, 1,
+                  G_TYPE_DOUBLE);
+
+  line_signals[PREPARE_TO_REMOVE_SLIDER] =
+    g_signal_new ("prepare-to-remove-slider",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolLineClass, prepare_to_remove_slider),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_BOOLEAN,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_INT,
+                  G_TYPE_BOOLEAN);
+
+  line_signals[REMOVE_SLIDER] =
+    g_signal_new ("remove-slider",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolLineClass, remove_slider),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+
+  line_signals[SELECTION_CHANGED] =
+    g_signal_new ("selection-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolLineClass, selection_changed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  line_signals[HANDLE_CLICKED] =
+    g_signal_new ("handle-clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpToolLineClass, handle_clicked),
+                  NULL, NULL,
+                  gimp_marshal_BOOLEAN__INT_UINT_ENUM,
+                  G_TYPE_BOOLEAN, 3,
+                  G_TYPE_INT,
+                  G_TYPE_UINT,
+                  GIMP_TYPE_BUTTON_PRESS_TYPE);
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_double ("x1", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_double ("y1", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_double ("x2", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_double ("y2", NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE, 0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SLIDERS,
+                                   g_param_spec_boxed ("sliders", NULL, NULL,
+                                                       G_TYPE_ARRAY,
+                                                       GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SELECTION,
+                                   g_param_spec_int ("selection", NULL, NULL,
+                                                     GIMP_TOOL_LINE_HANDLE_NONE,
+                                                     G_MAXINT,
+                                                     GIMP_TOOL_LINE_HANDLE_NONE,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_STATUS_TITLE,
+                                   g_param_spec_string ("status-title",
+                                                        NULL, NULL,
+                                                        _("Line: "),
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_line_init (GimpToolLine *line)
+{
+  GimpToolLinePrivate *private;
+
+  private = line->private = gimp_tool_line_get_instance_private (line);
+
+  private->sliders = g_array_new (FALSE, FALSE, sizeof (GimpControllerSlider));
+
+  private->selection = GIMP_TOOL_LINE_HANDLE_NONE;
+  private->hover     = GIMP_TOOL_LINE_HANDLE_NONE;
+  private->grab      = GRAB_NONE;
+
+  private->slider_handles = g_array_new (FALSE, TRUE,
+                                         sizeof (GimpCanvasItem *));
+}
+
+static void
+gimp_tool_line_constructed (GObject *object)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (object);
+  GimpToolWidget      *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolLinePrivate *private = line->private;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  private->line = gimp_tool_widget_add_line (widget,
+                                             private->x1,
+                                             private->y1,
+                                             private->x2,
+                                             private->y2);
+
+  gimp_canvas_item_set_visible (private->line, SHOW_LINE);
+
+  private->start_handle =
+    gimp_tool_widget_add_handle (widget,
+                                 ENDPOINT_HANDLE_TYPE,
+                                 private->x1,
+                                 private->y1,
+                                 ENDPOINT_HANDLE_SIZE,
+                                 ENDPOINT_HANDLE_SIZE,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+  private->end_handle =
+    gimp_tool_widget_add_handle (widget,
+                                 ENDPOINT_HANDLE_TYPE,
+                                 private->x2,
+                                 private->y2,
+                                 ENDPOINT_HANDLE_SIZE,
+                                 ENDPOINT_HANDLE_SIZE,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+  private->slider_group =
+    gimp_canvas_group_new (gimp_tool_widget_get_shell (widget));
+  gimp_tool_widget_add_item (widget, private->slider_group);
+  g_object_unref (private->slider_group);
+
+  private->handle_circle =
+    gimp_tool_widget_add_handle (widget,
+                                 GIMP_HANDLE_CIRCLE,
+                                 private->x1,
+                                 private->y1,
+                                 ENDPOINT_HANDLE_SIZE * HANDLE_CIRCLE_SCALE,
+                                 ENDPOINT_HANDLE_SIZE * HANDLE_CIRCLE_SCALE,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+  gimp_tool_line_changed (widget);
+}
+
+static void
+gimp_tool_line_finalize (GObject *object)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (object);
+  GimpToolLinePrivate *private = line->private;
+
+  g_clear_pointer (&private->sliders, g_array_unref);
+  g_clear_pointer (&private->status_title, g_free);
+  g_clear_pointer (&private->slider_handles, g_array_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_line_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (object);
+  GimpToolLinePrivate *private = line->private;
+
+  switch (property_id)
+    {
+    case PROP_X1:
+      private->x1 = g_value_get_double (value);
+      break;
+    case PROP_Y1:
+      private->y1 = g_value_get_double (value);
+      break;
+    case PROP_X2:
+      private->x2 = g_value_get_double (value);
+      break;
+    case PROP_Y2:
+      private->y2 = g_value_get_double (value);
+      break;
+
+    case PROP_SLIDERS:
+      {
+        GArray   *sliders = g_value_dup_boxed (value);
+        gboolean  deselect;
+
+        g_return_if_fail (sliders != NULL);
+
+        deselect =
+          GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->selection) &&
+          (sliders->len != private->sliders->len               ||
+           ! gimp_tool_line_get_slider (line, private->selection)->selectable);
+
+        g_array_unref (private->sliders);
+        private->sliders = sliders;
+
+        if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->hover))
+          private->hover = GIMP_TOOL_LINE_HANDLE_NONE;
+
+        if (deselect)
+          gimp_tool_line_set_selection (line, GIMP_TOOL_LINE_HANDLE_NONE);
+      }
+      break;
+
+    case PROP_SELECTION:
+      {
+        gint selection = g_value_get_int (value);
+
+        g_return_if_fail (selection < (gint) private->sliders->len);
+        g_return_if_fail (selection < 0 ||
+                          gimp_tool_line_get_slider (line,
+                                                     selection)->selectable);
+
+        if (selection != private->selection)
+          {
+            private->selection = selection;
+
+            if (private->grab == GRAB_SELECTION)
+              private->grab = GRAB_NONE;
+
+            g_signal_emit (line, line_signals[SELECTION_CHANGED], 0);
+          }
+      }
+      break;
+
+    case PROP_STATUS_TITLE:
+      g_free (private->status_title);
+      private->status_title = g_value_dup_string (value);
+      if (! private->status_title)
+        private->status_title = g_strdup (_("Line: "));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_line_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (object);
+  GimpToolLinePrivate *private = line->private;
+
+  switch (property_id)
+    {
+    case PROP_X1:
+      g_value_set_double (value, private->x1);
+      break;
+    case PROP_Y1:
+      g_value_set_double (value, private->y1);
+      break;
+    case PROP_X2:
+      g_value_set_double (value, private->x2);
+      break;
+    case PROP_Y2:
+      g_value_set_double (value, private->y2);
+      break;
+
+    case PROP_SLIDERS:
+      g_value_set_boxed (value, private->sliders);
+      break;
+
+    case PROP_SELECTION:
+      g_value_set_int (value, private->selection);
+      break;
+
+    case PROP_STATUS_TITLE:
+      g_value_set_string (value, private->status_title);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_line_changed (GimpToolWidget *widget)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+  gint                 i;
+
+  gimp_canvas_line_set (private->line,
+                        private->x1,
+                        private->y1,
+                        private->x2,
+                        private->y2);
+
+  gimp_canvas_handle_set_position (private->start_handle,
+                                   private->x1,
+                                   private->y1);
+
+  gimp_canvas_handle_set_position (private->end_handle,
+                                   private->x2,
+                                   private->y2);
+
+  /* remove excessive slider handles */
+  for (i = private->sliders->len; i < private->slider_handles->len; i++)
+    {
+      gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (private->slider_group),
+                                     gimp_tool_line_get_handle (line, i));
+    }
+
+  g_array_set_size (private->slider_handles, private->sliders->len);
+
+  for (i = 0; i < private->sliders->len; i++)
+    {
+      gdouble          value;
+      gdouble          x;
+      gdouble          y;
+      GimpCanvasItem **handle;
+
+      value = gimp_tool_line_get_slider (line, i)->value;
+
+      x = private->x1 + (private->x2 - private->x1) * value;
+      y = private->y1 + (private->y2 - private->y1) * value;
+
+      handle = &g_array_index (private->slider_handles, GimpCanvasItem *, i);
+
+      if (*handle)
+        {
+          gimp_canvas_handle_set_position (*handle, x, y);
+        }
+      else
+        {
+          *handle = gimp_canvas_handle_new (gimp_tool_widget_get_shell (widget),
+                                            SLIDER_HANDLE_TYPE,
+                                            GIMP_HANDLE_ANCHOR_CENTER,
+                                            x,
+                                            y,
+                                            SLIDER_HANDLE_SIZE,
+                                            SLIDER_HANDLE_SIZE);
+
+          gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (private->slider_group),
+                                      *handle);
+          g_object_unref (*handle);
+        }
+    }
+
+  gimp_tool_line_update_handles (line);
+  gimp_tool_line_update_circle (line);
+  gimp_tool_line_update_hilight (line);
+}
+
+static void
+gimp_tool_line_focus_changed (GimpToolWidget *widget)
+{
+  GimpToolLine *line = GIMP_TOOL_LINE (widget);
+
+  gimp_tool_line_update_hilight (line);
+}
+
+gboolean
+gimp_tool_line_button_press (GimpToolWidget      *widget,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+  gboolean             result  = FALSE;
+
+  private->grab          = GRAB_NONE;
+  private->remove_slider = FALSE;
+
+  private->saved_x1 = private->x1;
+  private->saved_y1 = private->y1;
+  private->saved_x2 = private->x2;
+  private->saved_y2 = private->y2;
+
+  if (press_type         != GIMP_BUTTON_PRESS_NORMAL   &&
+      private->hover      > GIMP_TOOL_LINE_HANDLE_NONE &&
+      private->selection  > GIMP_TOOL_LINE_HANDLE_NONE)
+    {
+      g_signal_emit (line, line_signals[HANDLE_CLICKED], 0,
+                     private->selection, state, press_type, &result);
+
+      if (! result)
+        gimp_tool_widget_hover (widget, coords, state, TRUE);
+    }
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL || ! result)
+    {
+      private->saved_x1 = private->x1;
+      private->saved_y1 = private->y1;
+      private->saved_x2 = private->x2;
+      private->saved_y2 = private->y2;
+
+      if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->hover))
+        {
+          private->saved_slider_value =
+            gimp_tool_line_get_slider (line, private->hover)->value;
+        }
+
+      if (private->hover > GIMP_TOOL_LINE_HANDLE_NONE)
+        {
+          gimp_tool_line_set_selection (line, private->hover);
+
+          private->grab = GRAB_SELECTION;
+        }
+      else if (private->hover == HOVER_NEW_SLIDER)
+        {
+          gint slider;
+
+          g_signal_emit (line, line_signals[ADD_SLIDER], 0,
+                         private->new_slider_value, &slider);
+
+          g_return_val_if_fail (slider < (gint) private->sliders->len, FALSE);
+
+          if (slider >= 0)
+            {
+              gimp_tool_line_set_selection (line, slider);
+
+              private->saved_slider_value =
+                gimp_tool_line_get_slider (line, private->selection)->value;
+
+              private->grab = GRAB_SELECTION;
+            }
+        }
+      else if (state & GRAB_LINE_MASK)
+        {
+          private->grab = GRAB_LINE;
+        }
+
+      result = (private->grab != GRAB_NONE);
+    }
+
+  if (! result)
+    {
+      private->hover = GIMP_TOOL_LINE_HANDLE_NONE;
+
+      gimp_tool_line_set_selection (line, GIMP_TOOL_LINE_HANDLE_NONE);
+    }
+
+  gimp_tool_line_update_handles (line);
+  gimp_tool_line_update_circle (line);
+  gimp_tool_line_update_status (line, state, TRUE);
+
+  return result;
+}
+
+void
+gimp_tool_line_button_release (GimpToolWidget        *widget,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+  GimpToolLineGrab     grab    = private->grab;
+
+  private->grab = GRAB_NONE;
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      if (grab != GRAB_NONE)
+        {
+          if (grab == GRAB_SELECTION &&
+              GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->selection))
+            {
+              gimp_tool_line_get_slider (line, private->selection)->value =
+                private->saved_slider_value;
+
+              if (private->remove_slider)
+                {
+                  private->remove_slider = FALSE;
+
+                  g_signal_emit (line, line_signals[PREPARE_TO_REMOVE_SLIDER], 0,
+                                 private->selection, FALSE);
+                }
+            }
+
+          g_object_set (line,
+                        "x1", private->saved_x1,
+                        "y1", private->saved_y1,
+                        "x2", private->saved_x2,
+                        "y2", private->saved_y2,
+                        NULL);
+        }
+    }
+  else if (grab == GRAB_SELECTION)
+    {
+      if (private->remove_slider)
+        {
+          private->remove_slider = FALSE;
+
+          g_signal_emit (line, line_signals[REMOVE_SLIDER], 0,
+                         private->selection);
+        }
+      else if (release_type == GIMP_BUTTON_RELEASE_CLICK)
+        {
+          gboolean result;
+
+          g_signal_emit (line, line_signals[HANDLE_CLICKED], 0,
+                         private->selection, state, GIMP_BUTTON_PRESS_NORMAL,
+                         &result);
+        }
+    }
+}
+
+void
+gimp_tool_line_motion (GimpToolWidget   *widget,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+  gdouble              diff_x  = coords->x - private->mouse_x;
+  gdouble              diff_y  = coords->y - private->mouse_y;
+
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  if (private->grab == GRAB_LINE)
+    {
+      g_object_set (line,
+                    "x1", private->x1 + diff_x,
+                    "y1", private->y1 + diff_y,
+                    "x2", private->x2 + diff_x,
+                    "y2", private->y2 + diff_y,
+                    NULL);
+    }
+  else
+    {
+      gboolean constrain = (state & gimp_get_constrain_behavior_mask ()) != 0;
+
+      gimp_tool_line_selection_motion (line, constrain);
+    }
+
+  gimp_tool_line_update_status (line, state, TRUE);
+}
+
+GimpHit
+gimp_tool_line_hit (GimpToolWidget   *widget,
+                    const GimpCoords *coords,
+                    GdkModifierType   state,
+                    gboolean          proximity)
+{
+  GimpToolLine *line = GIMP_TOOL_LINE (widget);
+
+  if (! (state & GRAB_LINE_MASK))
+    {
+      gint hover = gimp_tool_line_get_hover (line, coords, state);
+
+      if (hover != GIMP_TOOL_LINE_HANDLE_NONE)
+        return GIMP_HIT_DIRECT;
+    }
+  else
+    {
+      return GIMP_HIT_INDIRECT;
+    }
+
+  return GIMP_HIT_NONE;
+}
+
+void
+gimp_tool_line_hover (GimpToolWidget   *widget,
+                      const GimpCoords *coords,
+                      GdkModifierType   state,
+                      gboolean          proximity)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+
+  private->mouse_x = coords->x;
+  private->mouse_y = coords->y;
+
+  if (! (state & GRAB_LINE_MASK))
+    private->hover = gimp_tool_line_get_hover (line, coords, state);
+  else
+    private->hover = GIMP_TOOL_LINE_HANDLE_NONE;
+
+  gimp_tool_line_update_handles (line);
+  gimp_tool_line_update_circle (line);
+  gimp_tool_line_update_status (line, state, proximity);
+}
+
+static void
+gimp_tool_line_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+
+  private->hover = GIMP_TOOL_LINE_HANDLE_NONE;
+
+  gimp_tool_line_update_handles (line);
+  gimp_tool_line_update_circle (line);
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static gboolean
+gimp_tool_line_key_press (GimpToolWidget *widget,
+                          GdkEventKey    *kevent)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+  GimpDisplayShell    *shell;
+  gdouble              pixels  = 1.0;
+  gboolean             move_line;
+
+  move_line = kevent->state & GRAB_LINE_MASK;
+
+  if (private->selection == GIMP_TOOL_LINE_HANDLE_NONE && ! move_line)
+    return GIMP_TOOL_WIDGET_CLASS (parent_class)->key_press (widget, kevent);
+
+  shell = gimp_tool_widget_get_shell (widget);
+
+  if (kevent->state & gimp_get_extend_selection_mask ())
+    pixels = 10.0;
+
+  if (kevent->state & gimp_get_toggle_behavior_mask ())
+    pixels = 50.0;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Left:
+    case GDK_KEY_Right:
+    case GDK_KEY_Up:
+    case GDK_KEY_Down:
+      /* move an endpoint (or both endpoints) */
+      if (private->selection < 0 || move_line)
+        {
+          gdouble xdist, ydist;
+          gdouble dx,    dy;
+
+          xdist = FUNSCALEX (shell, pixels);
+          ydist = FUNSCALEY (shell, pixels);
+
+          dx = 0.0;
+          dy = 0.0;
+
+          switch (kevent->keyval)
+            {
+            case GDK_KEY_Left:  dx = -xdist; break;
+            case GDK_KEY_Right: dx = +xdist; break;
+            case GDK_KEY_Up:    dy = -ydist; break;
+            case GDK_KEY_Down:  dy = +ydist; break;
+            }
+
+          if (private->selection == GIMP_TOOL_LINE_HANDLE_START || move_line)
+            {
+              g_object_set (line,
+                            "x1", private->x1 + dx,
+                            "y1", private->y1 + dy,
+                            NULL);
+            }
+
+          if (private->selection == GIMP_TOOL_LINE_HANDLE_END || move_line)
+            {
+              g_object_set (line,
+                            "x2", private->x2 + dx,
+                            "y2", private->y2 + dy,
+                            NULL);
+            }
+        }
+      /* move a slider */
+      else
+        {
+          GimpControllerSlider *slider;
+          gdouble               dist;
+          gdouble               dvalue;
+
+          slider = gimp_tool_line_get_slider (line, private->selection);
+
+          if (! slider->movable)
+            break;
+
+          dist = gimp_canvas_item_transform_distance (private->line,
+                                                      private->x1, private->y1,
+                                                      private->x2, private->y2);
+
+          if (dist > 0.0)
+            dist = pixels / dist;
+
+          dvalue = 0.0;
+
+          switch (kevent->keyval)
+            {
+            case GDK_KEY_Left:
+              if      (private->x1 < private->x2) dvalue = -dist;
+              else if (private->x1 > private->x2) dvalue = +dist;
+              break;
+
+            case GDK_KEY_Right:
+              if      (private->x1 < private->x2) dvalue = +dist;
+              else if (private->x1 > private->x2) dvalue = -dist;
+              break;
+
+            case GDK_KEY_Up:
+              if      (private->y1 < private->y2) dvalue = -dist;
+              else if (private->y1 > private->y2) dvalue = +dist;
+              break;
+
+            case GDK_KEY_Down:
+              if      (private->y1 < private->y2) dvalue = +dist;
+              else if (private->y1 > private->y2) dvalue = -dist;
+              break;
+            }
+
+          if (dvalue != 0.0)
+            {
+              slider->value += dvalue;
+              slider->value  = CLAMP (slider->value, slider->min, slider->max);
+              slider->value  = CLAMP (slider->value, 0.0, 1.0);
+
+              g_object_set (line,
+                            "sliders", private->sliders,
+                            NULL);
+            }
+        }
+      return TRUE;
+
+    case GDK_KEY_BackSpace:
+    case GDK_KEY_Delete:
+      if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->selection))
+        {
+          if (gimp_tool_line_get_slider (line, private->selection)->removable)
+            {
+              g_signal_emit (line, line_signals[REMOVE_SLIDER], 0,
+                             private->selection);
+            }
+        }
+      return TRUE;
+    }
+
+  return GIMP_TOOL_WIDGET_CLASS (parent_class)->key_press (widget, kevent);
+}
+
+static void
+gimp_tool_line_motion_modifier (GimpToolWidget  *widget,
+                                GdkModifierType  key,
+                                gboolean         press,
+                                GdkModifierType  state)
+{
+  GimpToolLine *line = GIMP_TOOL_LINE (widget);
+
+  if (key == gimp_get_constrain_behavior_mask ())
+    {
+      gimp_tool_line_selection_motion (line, press);
+
+      gimp_tool_line_update_status (line, state, TRUE);
+    }
+}
+
+static gboolean
+gimp_tool_line_get_cursor (GimpToolWidget     *widget,
+                           const GimpCoords   *coords,
+                           GdkModifierType     state,
+                           GimpCursorType     *cursor,
+                           GimpToolCursorType *tool_cursor,
+                           GimpCursorModifier *modifier)
+{
+  GimpToolLine        *line    = GIMP_TOOL_LINE (widget);
+  GimpToolLinePrivate *private = line->private;
+
+  if (private->grab ==GRAB_LINE || (state & GRAB_LINE_MASK))
+    {
+      *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+
+      return TRUE;
+    }
+  else if (private->grab  == GRAB_SELECTION ||
+           private->hover >  GIMP_TOOL_LINE_HANDLE_NONE)
+    {
+      const GimpControllerSlider *slider = NULL;
+
+      if (private->grab == GRAB_SELECTION)
+        {
+          if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->selection))
+            slider = gimp_tool_line_get_slider (line, private->selection);
+        }
+      else if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->hover))
+        {
+          slider = gimp_tool_line_get_slider (line, private->hover);
+        }
+
+      if (private->grab == GRAB_SELECTION && slider && private->remove_slider)
+        {
+          *modifier = GIMP_CURSOR_MODIFIER_MINUS;
+
+          return TRUE;
+        }
+      else if (! slider || slider->movable)
+        {
+          *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+
+          return TRUE;
+        }
+    }
+  else if (private->hover == HOVER_NEW_SLIDER)
+    {
+      *modifier = GIMP_CURSOR_MODIFIER_PLUS;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gint
+gimp_tool_line_get_hover (GimpToolLine     *line,
+                          const GimpCoords *coords,
+                          GdkModifierType   state)
+{
+  GimpToolLinePrivate *private = line->private;
+  gint                 hover   = GIMP_TOOL_LINE_HANDLE_NONE;
+  gdouble              min_dist;
+  gint                 first_handle;
+  gint                 i;
+
+  /* find the closest handle to the cursor */
+  min_dist     = G_MAXDOUBLE;
+  first_handle = private->sliders->len - 1;
+
+  /* skip the sliders if the two endpoints are the same, in particular so
+   * that if the line is created during a button-press event (as in the
+   * blend tool), the end endpoint is dragged, instead of a slider.
+   */
+  if (private->x1 == private->x2 && private->y1 == private->y2)
+    first_handle = -1;
+
+  for (i = first_handle; i > GIMP_TOOL_LINE_HANDLE_NONE; i--)
+    {
+      GimpCanvasItem *handle;
+
+      if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (i))
+        {
+          const GimpControllerSlider *slider;
+
+          slider = gimp_tool_line_get_slider (line, i);
+
+          if (! slider->visible || ! slider->selectable)
+            continue;
+        }
+
+      handle = gimp_tool_line_get_handle (line, i);
+
+      if (gimp_tool_line_handle_hit (handle,
+                                     private->mouse_x,
+                                     private->mouse_y,
+                                     &min_dist))
+        {
+          hover = i;
+        }
+    }
+
+  if (hover == GIMP_TOOL_LINE_HANDLE_NONE)
+    {
+      gboolean constrain;
+      gdouble  value;
+      gdouble  dist;
+
+      constrain = (state & gimp_get_constrain_behavior_mask ()) != 0;
+
+      value = gimp_tool_line_project_point (line,
+                                            private->mouse_x,
+                                            private->mouse_y,
+                                            constrain,
+                                            &dist);
+
+      if (value >= 0.0 && value <= 1.0 && dist <= LINE_VICINITY)
+        {
+          gboolean can_add;
+
+          g_signal_emit (line, line_signals[CAN_ADD_SLIDER], 0,
+                         value, &can_add);
+
+          if (can_add)
+            {
+              hover                     = HOVER_NEW_SLIDER;
+              private->new_slider_value = value;
+            }
+        }
+    }
+
+  return hover;
+}
+
+static GimpControllerSlider *
+gimp_tool_line_get_slider (GimpToolLine *line,
+                           gint          slider)
+{
+  GimpToolLinePrivate *private = line->private;
+
+  gimp_assert (slider >= 0 && slider < private->sliders->len);
+
+  return &g_array_index (private->sliders, GimpControllerSlider, slider);
+}
+
+static GimpCanvasItem *
+gimp_tool_line_get_handle (GimpToolLine *line,
+                           gint          handle)
+{
+  GimpToolLinePrivate *private = line->private;
+
+  switch (handle)
+    {
+    case GIMP_TOOL_LINE_HANDLE_NONE:
+      return NULL;
+
+    case GIMP_TOOL_LINE_HANDLE_START:
+      return private->start_handle;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      return private->end_handle;
+
+    default:
+      gimp_assert (handle >= 0 &&
+                   handle <  (gint) private->slider_handles->len);
+
+      return g_array_index (private->slider_handles,
+                            GimpCanvasItem *, handle);
+    }
+}
+
+static gdouble
+gimp_tool_line_project_point (GimpToolLine *line,
+                              gdouble       x,
+                              gdouble       y,
+                              gboolean      constrain,
+                              gdouble      *dist)
+{
+  GimpToolLinePrivate *private = line->private;
+  gdouble              length_sqr;
+  gdouble              value   = 0.0;
+
+  length_sqr = SQR (private->x2 - private->x1) +
+               SQR (private->y2 - private->y1);
+
+  /* don't calculate the projection for 0-length lines, since we'll just get
+   * NaN.
+   */
+  if (length_sqr > 0.0)
+    {
+      value  = (private->x2 - private->x1) * (x - private->x1) +
+               (private->y2 - private->y1) * (y - private->y1);
+      value /= length_sqr;
+
+      if (dist)
+        {
+          gdouble px;
+          gdouble py;
+
+          px = private->x1 + (private->x2 - private->x1) * value;
+          py = private->y1 + (private->y2 - private->y1) * value;
+
+          *dist = gimp_canvas_item_transform_distance (private->line,
+                                                       x,  y,
+                                                       px, py);
+        }
+
+      if (constrain)
+        value = RINT (12.0 * value) / 12.0;
+    }
+  else
+    {
+      if (dist)
+        {
+          *dist = gimp_canvas_item_transform_distance (private->line,
+                                                       x,           y,
+                                                       private->x1, private->y1);
+        }
+    }
+
+  return value;
+}
+
+static gboolean
+gimp_tool_line_selection_motion (GimpToolLine *line,
+                                 gboolean      constrain)
+{
+  GimpToolLinePrivate *private = line->private;
+  gdouble              x       = private->mouse_x;
+  gdouble              y       = private->mouse_y;
+
+  if (private->grab != GRAB_SELECTION)
+    return FALSE;
+
+  switch (private->selection)
+    {
+    case GIMP_TOOL_LINE_HANDLE_NONE:
+      gimp_assert_not_reached ();
+
+    case GIMP_TOOL_LINE_HANDLE_START:
+      if (constrain)
+        {
+          gimp_display_shell_constrain_line (
+            gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (line)),
+            private->x2, private->y2,
+            &x, &y,
+            GIMP_CONSTRAIN_LINE_15_DEGREES);
+        }
+
+      g_object_set (line,
+                    "x1", x,
+                    "y1", y,
+                    NULL);
+      return TRUE;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      if (constrain)
+        {
+          gimp_display_shell_constrain_line (
+            gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (line)),
+            private->x1, private->y1,
+            &x, &y,
+            GIMP_CONSTRAIN_LINE_15_DEGREES);
+        }
+
+      g_object_set (line,
+                    "x2", x,
+                    "y2", y,
+                    NULL);
+      return TRUE;
+
+    default:
+      {
+        GimpDisplayShell     *shell;
+        GimpControllerSlider *slider;
+        gdouble               value;
+        gdouble               dist;
+        gboolean              remove_slider;
+
+        shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (line));
+
+        slider = gimp_tool_line_get_slider (line, private->selection);
+
+        /* project the cursor position onto the line */
+        value = gimp_tool_line_project_point (line, x, y, constrain, &dist);
+
+        /* slider dragging */
+        if (slider->movable)
+          {
+            value = CLAMP (value, slider->min, slider->max);
+            value = CLAMP (value, 0.0,         1.0);
+
+            value = fabs (value); /* avoid negative zero */
+
+            slider->value = value;
+
+            g_object_set (line,
+                          "sliders", private->sliders,
+                          NULL);
+          }
+
+        /* slider tearing */
+        remove_slider = slider->removable && dist > SLIDER_TEAR_DISTANCE;
+
+        if (remove_slider != private->remove_slider)
+          {
+            private->remove_slider = remove_slider;
+
+            g_signal_emit (line, line_signals[PREPARE_TO_REMOVE_SLIDER], 0,
+                           private->selection, remove_slider);
+
+            /* set the cursor modifier to a minus by talking to the shell
+             * directly -- eek!
+             */
+            {
+              GimpCursorType     cursor;
+              GimpToolCursorType tool_cursor;
+              GimpCursorModifier modifier;
+
+              cursor      = shell->current_cursor;
+              tool_cursor = shell->tool_cursor;
+              modifier    = GIMP_CURSOR_MODIFIER_NONE;
+
+              gimp_tool_line_get_cursor (GIMP_TOOL_WIDGET (line), NULL, 0,
+                                         &cursor, &tool_cursor, &modifier);
+
+              gimp_display_shell_set_cursor (shell, cursor, tool_cursor, modifier);
+            }
+
+            gimp_tool_line_update_handles (line);
+            gimp_tool_line_update_circle (line);
+            gimp_tool_line_update_status (line,
+                                          constrain ?
+                                            gimp_get_constrain_behavior_mask () :
+                                            0,
+                                          TRUE);
+          }
+
+        return TRUE;
+      }
+    }
+}
+
+static void
+gimp_tool_line_update_handles (GimpToolLine *line)
+{
+  GimpToolLinePrivate *private = line->private;
+  gdouble              value;
+  gdouble              dist;
+  gint                 i;
+
+  value = gimp_tool_line_project_point (line,
+                                        private->mouse_x,
+                                        private->mouse_y,
+                                        FALSE,
+                                        &dist);
+
+  for (i = 0; i < private->sliders->len; i++)
+    {
+      const GimpControllerSlider *slider;
+      GimpCanvasItem             *handle;
+      gint                        size;
+      gint                        hit_radius;
+      gboolean                    show_autohidden;
+      gboolean                    visible;
+
+      slider = gimp_tool_line_get_slider (line, i);
+      handle = gimp_tool_line_get_handle (line, i);
+
+      size = slider->size * SLIDER_HANDLE_SIZE;
+      size = MAX (size, 1);
+
+      hit_radius = (MAX (size, SLIDER_HANDLE_SIZE) * HANDLE_CIRCLE_SCALE) / 2;
+
+      /* show a autohidden slider if it's selected, or if no other handle is
+       * grabbed or hovered-over, and the cursor is close enough to the line,
+       * between the slider's min and max values.
+       */
+      show_autohidden = private->selection == i                        ||
+                        (private->grab == GRAB_NONE                    &&
+                         (private->hover <= GIMP_TOOL_LINE_HANDLE_NONE ||
+                          private->hover == i)                         &&
+                         dist <= hit_radius                            &&
+                         value >= slider->min                          &&
+                         value <= slider->max);
+
+      visible = slider->visible                         &&
+                (! slider->autohide || show_autohidden) &&
+                ! (private->selection == i && private->remove_slider);
+
+      handle = gimp_tool_line_get_handle (line, i);
+
+      if (visible)
+        {
+          g_object_set (handle,
+                        "type",   slider->type,
+                        "width",  size,
+                        "height", size,
+                        NULL);
+        }
+
+      gimp_canvas_item_set_visible (handle, visible);
+    }
+}
+
+static void
+gimp_tool_line_update_circle (GimpToolLine *line)
+{
+  GimpToolLinePrivate *private = line->private;
+  gboolean             visible;
+
+  visible = (private->grab == GRAB_NONE                    &&
+             private->hover != GIMP_TOOL_LINE_HANDLE_NONE) ||
+            (private->grab == GRAB_SELECTION               &&
+             private->remove_slider);
+
+  if (visible)
+    {
+      gdouble  x;
+      gdouble  y;
+      gint     width;
+      gint     height;
+      gboolean dashed;
+
+      if (private->grab == GRAB_NONE && private->hover == HOVER_NEW_SLIDER)
+        {
+          /* new slider */
+          x = private->x1 +
+              (private->x2 - private->x1) * private->new_slider_value;
+          y = private->y1 +
+              (private->y2 - private->y1) * private->new_slider_value;
+
+          width = height = SLIDER_HANDLE_SIZE;
+
+          dashed = TRUE;
+        }
+      else
+        {
+          GimpCanvasItem *handle;
+
+          if (private->grab == GRAB_SELECTION)
+            {
+              /* tear slider */
+              handle = gimp_tool_line_get_handle (line, private->selection);
+              dashed = TRUE;
+            }
+          else
+            {
+              /* hover over handle */
+              handle = gimp_tool_line_get_handle (line, private->hover);
+              dashed = FALSE;
+            }
+
+          gimp_canvas_handle_get_position (handle, &x,     &y);
+          gimp_canvas_handle_get_size     (handle, &width, &height);
+        }
+
+      width   = MAX (width,  SLIDER_HANDLE_SIZE);
+      height  = MAX (height, SLIDER_HANDLE_SIZE);
+
+      width  *= HANDLE_CIRCLE_SCALE;
+      height *= HANDLE_CIRCLE_SCALE;
+
+      gimp_canvas_handle_set_position (private->handle_circle, x,     y);
+      gimp_canvas_handle_set_size     (private->handle_circle, width, height);
+
+      g_object_set (private->handle_circle,
+                    "type", dashed ? GIMP_HANDLE_DASHED_CIRCLE :
+                                     GIMP_HANDLE_CIRCLE,
+                    NULL);
+    }
+
+  gimp_canvas_item_set_visible (private->handle_circle, visible);
+}
+
+static void
+gimp_tool_line_update_hilight (GimpToolLine *line)
+{
+  GimpToolLinePrivate *private = line->private;
+  gboolean             focus;
+  gint                 i;
+
+  focus = gimp_tool_widget_get_focus (GIMP_TOOL_WIDGET (line));
+
+  for (i = GIMP_TOOL_LINE_HANDLE_NONE + 1;
+       i < (gint) private->sliders->len;
+       i++)
+    {
+      GimpCanvasItem *handle;
+
+      handle = gimp_tool_line_get_handle (line, i);
+
+      gimp_canvas_item_set_highlight (handle, focus && i == private->selection);
+    }
+}
+
+static void
+gimp_tool_line_update_status (GimpToolLine    *line,
+                              GdkModifierType  state,
+                              gboolean         proximity)
+{
+  GimpToolLinePrivate *private = line->private;
+
+  if (proximity)
+    {
+      GimpDisplayShell *shell;
+      const gchar      *toggle_behavior_format = NULL;
+      const gchar      *message                = NULL;
+      gchar            *line_status            = NULL;
+      gchar            *status;
+      gint              handle;
+
+      shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (line));
+
+      if (private->grab == GRAB_SELECTION)
+        handle = private->selection;
+      else
+        handle = private->hover;
+
+      if (handle == GIMP_TOOL_LINE_HANDLE_START ||
+          handle == GIMP_TOOL_LINE_HANDLE_END)
+        {
+          line_status = gimp_display_shell_get_line_status (shell,
+                                                            _("Click-Drag to move the endpoint"),
+                                                            ". ",
+                                                            private->x1,
+                                                            private->y1,
+                                                            private->x2,
+                                                            private->y2);
+          toggle_behavior_format = _("%s for constrained angles");
+        }
+      else if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (handle) ||
+               handle == HOVER_NEW_SLIDER)
+        {
+          if (private->grab == GRAB_SELECTION && private->remove_slider)
+            {
+              message = _("Release to remove the slider");
+            }
+          else
+            {
+              toggle_behavior_format = _("%s for constrained values");
+
+              if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (handle))
+                {
+                  if (gimp_tool_line_get_slider (line, handle)->movable)
+                    {
+                      if (gimp_tool_line_get_slider (line, handle)->removable)
+                        {
+                          if (private->grab == GRAB_SELECTION)
+                            {
+                              message = _("Click-Drag to move the slider; "
+                                          "drag away to remove the slider");
+                            }
+                          else
+                            {
+                              message = _("Click-Drag to move or remove the slider");
+                            }
+                        }
+                      else
+                        {
+                          message = _("Click-Drag to move the slider");
+                        }
+                    }
+                  else
+                    {
+                      toggle_behavior_format = NULL;
+
+                      if (gimp_tool_line_get_slider (line, handle)->removable)
+                        {
+                          if (private->grab == GRAB_SELECTION)
+                            {
+                              message = _("Click-Drag away to remove the slider");
+                            }
+                          else
+                            {
+                              message = _("Click-Drag to remove the slider");
+                            }
+                        }
+                      else
+                        {
+                          message = NULL;
+                        }
+                    }
+                }
+              else
+                {
+                  message = _("Click or Click-Drag to add a new slider");
+                }
+            }
+        }
+      else if (state & GDK_MOD1_MASK)
+        {
+          message = _("Click-Drag to move the line");
+        }
+
+      status =
+        gimp_suggest_modifiers (message ? message : (line_status ? line_status : ""),
+                                ((toggle_behavior_format ?
+                                   gimp_get_constrain_behavior_mask () : 0) |
+                                 (private->grab == GRAB_NONE ?
+                                   GDK_MOD1_MASK : 0)) &
+                                ~state,
+                                NULL,
+                                toggle_behavior_format,
+                                _("%s to move the whole line"));
+
+      if (message || line_status)
+        {
+          gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (line), status);
+        }
+      else
+        {
+          line_status = gimp_display_shell_get_line_status (shell,
+                                                            private->status_title,
+                                                            ". ",
+                                                            private->x1,
+                                                            private->y1,
+                                                            private->x2,
+                                                            private->y2);
+          gimp_tool_widget_set_status_coords (GIMP_TOOL_WIDGET (line),
+                                              line_status,
+                                              private->x2 - private->x1,
+                                              ", ",
+                                              private->y2 - private->y1,
+                                              status);
+        }
+
+      g_free (status);
+      if (line_status)
+        g_free (line_status);
+    }
+  else
+    {
+      gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (line), NULL);
+    }
+}
+
+static gboolean
+gimp_tool_line_handle_hit (GimpCanvasItem *handle,
+                           gdouble         x,
+                           gdouble         y,
+                           gdouble        *min_dist)
+{
+  gdouble handle_x;
+  gdouble handle_y;
+  gint    handle_width;
+  gint    handle_height;
+  gint    radius;
+  gdouble dist;
+
+  gimp_canvas_handle_get_position (handle, &handle_x,     &handle_y);
+  gimp_canvas_handle_get_size     (handle, &handle_width, &handle_height);
+
+  handle_width  = MAX (handle_width,  SLIDER_HANDLE_SIZE);
+  handle_height = MAX (handle_height, SLIDER_HANDLE_SIZE);
+
+  radius = ((gint) (handle_width * HANDLE_CIRCLE_SCALE)) / 2;
+  radius = MAX (radius, LINE_VICINITY);
+
+  dist = gimp_canvas_item_transform_distance (handle,
+                                              x, y, handle_x, handle_y);
+
+  if (dist <= radius && dist < *min_dist)
+    {
+      *min_dist = dist;
+
+      return TRUE;
+    }
+  else
+    {
+      return FALSE;
+    }
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_line_new (GimpDisplayShell *shell,
+                    gdouble           x1,
+                    gdouble           y1,
+                    gdouble           x2,
+                    gdouble           y2)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_LINE,
+                       "shell", shell,
+                       "x1",    x1,
+                       "y1",    y1,
+                       "x2",    x2,
+                       "y2",    y2,
+                       NULL);
+}
+
+void
+gimp_tool_line_set_sliders (GimpToolLine               *line,
+                            const GimpControllerSlider *sliders,
+                            gint                        n_sliders)
+{
+  GimpToolLinePrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_LINE (line));
+  g_return_if_fail (n_sliders == 0 || (n_sliders > 0 && sliders != NULL));
+
+  private = line->private;
+
+  if (GIMP_TOOL_LINE_HANDLE_IS_SLIDER (private->selection) &&
+      private->sliders->len != n_sliders)
+    {
+      gimp_tool_line_set_selection (line, GIMP_TOOL_LINE_HANDLE_NONE);
+    }
+
+  g_array_set_size (private->sliders, n_sliders);
+
+  memcpy (private->sliders->data, sliders,
+          n_sliders * sizeof (GimpControllerSlider));
+
+  g_object_set (line,
+                "sliders", private->sliders,
+                NULL);
+}
+
+const GimpControllerSlider *
+gimp_tool_line_get_sliders (GimpToolLine *line,
+                            gint         *n_sliders)
+{
+  GimpToolLinePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_LINE (line), NULL);
+
+  private = line->private;
+
+  if (n_sliders) *n_sliders = private->sliders->len;
+
+  return (const GimpControllerSlider *) private->sliders->data;
+}
+
+void
+gimp_tool_line_set_selection (GimpToolLine *line,
+                              gint          handle)
+{
+  GimpToolLinePrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_LINE (line));
+
+  private = line->private;
+
+  g_return_if_fail (handle >= GIMP_TOOL_LINE_HANDLE_NONE &&
+                    handle <  (gint) private->sliders->len);
+
+  g_object_set (line,
+                "selection", handle,
+                NULL);
+}
+
+gint
+gimp_tool_line_get_selection (GimpToolLine *line)
+{
+  GimpToolLinePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_LINE (line), GIMP_TOOL_LINE_HANDLE_NONE);
+
+  private = line->private;
+
+  return private->selection;
+}
diff --git a/app/display/gimptoolline.h b/app/display/gimptoolline.h
new file mode 100644
index 0000000..80d046d
--- /dev/null
+++ b/app/display/gimptoolline.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolline.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_LINE_H__
+#define __GIMP_TOOL_LINE_H__
+
+
+#include "gimptoolwidget.h"
+
+
+/* in the context of GimpToolLine, "handle" is a collective term for either an
+ * endpoint or a slider.  a handle value may be either a (nonnegative) slider
+ * index, or one of the values below:
+ */
+#define GIMP_TOOL_LINE_HANDLE_NONE  (-3)
+#define GIMP_TOOL_LINE_HANDLE_START (-2)
+#define GIMP_TOOL_LINE_HANDLE_END   (-1)
+
+#define GIMP_TOOL_LINE_HANDLE_IS_SLIDER(handle) ((handle) >= 0)
+
+
+#define GIMP_TYPE_TOOL_LINE            (gimp_tool_line_get_type ())
+#define GIMP_TOOL_LINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_LINE, GimpToolLine))
+#define GIMP_TOOL_LINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_LINE, GimpToolLineClass))
+#define GIMP_IS_TOOL_LINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_LINE))
+#define GIMP_IS_TOOL_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_LINE))
+#define GIMP_TOOL_LINE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_LINE, GimpToolLineClass))
+
+
+typedef struct _GimpToolLine        GimpToolLine;
+typedef struct _GimpToolLinePrivate GimpToolLinePrivate;
+typedef struct _GimpToolLineClass   GimpToolLineClass;
+
+struct _GimpToolLine
+{
+  GimpToolWidget       parent_instance;
+
+  GimpToolLinePrivate *private;
+};
+
+struct _GimpToolLineClass
+{
+  GimpToolWidgetClass  parent_class;
+
+  /*  signals  */
+  gboolean (* can_add_slider)           (GimpToolLine        *line,
+                                         gdouble              value);
+  gint     (* add_slider)               (GimpToolLine        *line,
+                                         gdouble              value);
+  void     (* prepare_to_remove_slider) (GimpToolLine        *line,
+                                         gint                 slider,
+                                         gboolean             remove);
+  void     (* remove_slider)            (GimpToolLine        *line,
+                                         gint                 slider);
+  void     (* selection_changed)        (GimpToolLine        *line);
+  gboolean (* handle_clicked)           (GimpToolLine        *line,
+                                         gint                 handle,
+                                         GdkModifierType      state,
+                                         GimpButtonPressType  press_type);
+};
+
+
+GType                        gimp_tool_line_get_type      (void) G_GNUC_CONST;
+
+GimpToolWidget             * gimp_tool_line_new           (GimpDisplayShell           *shell,
+                                                           gdouble                     x1,
+                                                           gdouble                     y1,
+                                                           gdouble                     x2,
+                                                           gdouble                     y2);
+
+void                         gimp_tool_line_set_sliders   (GimpToolLine               *line,
+                                                           const GimpControllerSlider *sliders,
+                                                           gint                        n_sliders);
+const GimpControllerSlider * gimp_tool_line_get_sliders   (GimpToolLine               *line,
+                                                           gint                       *n_sliders);
+
+void                         gimp_tool_line_set_selection (GimpToolLine               *line,
+                                                           gint                        handle);
+gint                         gimp_tool_line_get_selection (GimpToolLine               *line);
+
+
+#endif /* __GIMP_TOOL_LINE_H__ */
diff --git a/app/display/gimptoolpath.c b/app/display/gimptoolpath.c
new file mode 100644
index 0000000..9e2cf54
--- /dev/null
+++ b/app/display/gimptoolpath.c
@@ -0,0 +1,1904 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpath.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Vector tool
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "display-types.h"
+
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "tools/gimptools-utils.h"
+
+#include "gimpcanvashandle.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpcanvasline.h"
+#include "gimpcanvaspath.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimptoolpath.h"
+
+#include "gimp-intl.h"
+
+
+#define TOGGLE_MASK  gimp_get_extend_selection_mask ()
+#define MOVE_MASK    GDK_MOD1_MASK
+#define INSDEL_MASK  gimp_get_toggle_behavior_mask ()
+
+
+/*  possible vector functions  */
+typedef enum
+{
+  VECTORS_SELECT_VECTOR,
+  VECTORS_CREATE_VECTOR,
+  VECTORS_CREATE_STROKE,
+  VECTORS_ADD_ANCHOR,
+  VECTORS_MOVE_ANCHOR,
+  VECTORS_MOVE_ANCHORSET,
+  VECTORS_MOVE_HANDLE,
+  VECTORS_MOVE_CURVE,
+  VECTORS_MOVE_STROKE,
+  VECTORS_MOVE_VECTORS,
+  VECTORS_INSERT_ANCHOR,
+  VECTORS_DELETE_ANCHOR,
+  VECTORS_CONNECT_STROKES,
+  VECTORS_DELETE_SEGMENT,
+  VECTORS_CONVERT_EDGE,
+  VECTORS_FINISHED
+} GimpVectorFunction;
+
+enum
+{
+  PROP_0,
+  PROP_VECTORS,
+  PROP_EDIT_MODE,
+  PROP_POLYGONAL
+};
+
+enum
+{
+  BEGIN_CHANGE,
+  END_CHANGE,
+  ACTIVATE,
+  LAST_SIGNAL
+};
+
+struct _GimpToolPathPrivate
+{
+  GimpVectors          *vectors;        /* the current Vector data           */
+  GimpVectorMode        edit_mode;
+  gboolean              polygonal;
+
+  GimpVectorFunction    function;       /* function we're performing         */
+  GimpAnchorFeatureType restriction;    /* movement restriction              */
+  gboolean              modifier_lock;  /* can we toggle the Shift key?      */
+  GdkModifierType       saved_state;    /* modifier state at button_press    */
+  gdouble               last_x;         /* last x coordinate                 */
+  gdouble               last_y;         /* last y coordinate                 */
+  gboolean              undo_motion;    /* we need a motion to have an undo  */
+  gboolean              have_undo;      /* did we push an undo at            */
+                                        /* ..._button_press?                 */
+
+  GimpAnchor           *cur_anchor;     /* the current Anchor                */
+  GimpAnchor           *cur_anchor2;    /* secondary Anchor (end on_curve)   */
+  GimpStroke           *cur_stroke;     /* the current Stroke                */
+  gdouble               cur_position;   /* the current Position on a segment */
+
+  gint                  sel_count;      /* number of selected anchors        */
+  GimpAnchor           *sel_anchor;     /* currently selected anchor, NULL   */
+                                        /* if multiple anchors are selected  */
+  GimpStroke           *sel_stroke;     /* selected stroke                   */
+
+  GimpVectorMode        saved_mode;     /* used by modifier_key()            */
+
+  GimpCanvasItem       *path;
+  GList                *items;
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_path_constructed     (GObject               *object);
+static void     gimp_tool_path_dispose         (GObject               *object);
+static void     gimp_tool_path_set_property    (GObject               *object,
+                                                guint                  property_id,
+                                                const GValue          *value,
+                                                GParamSpec            *pspec);
+static void     gimp_tool_path_get_property    (GObject               *object,
+                                                guint                  property_id,
+                                                GValue                *value,
+                                                GParamSpec            *pspec);
+
+static void     gimp_tool_path_changed         (GimpToolWidget        *widget);
+static gint     gimp_tool_path_button_press    (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonPressType    press_type);
+static void     gimp_tool_path_button_release  (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonReleaseType  release_type);
+static void     gimp_tool_path_motion          (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state);
+static GimpHit  gimp_tool_path_hit             (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+static void     gimp_tool_path_hover           (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+static gboolean gimp_tool_path_key_press       (GimpToolWidget        *widget,
+                                                GdkEventKey           *kevent);
+static gboolean gimp_tool_path_get_cursor      (GimpToolWidget        *widget,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                GimpCursorType        *cursor,
+                                                GimpToolCursorType    *tool_cursor,
+                                                GimpCursorModifier    *modifier);
+
+static GimpVectorFunction
+                   gimp_tool_path_get_function (GimpToolPath          *path,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state);
+                                                
+static void     gimp_tool_path_update_status   (GimpToolPath          *path,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+
+static void     gimp_tool_path_begin_change    (GimpToolPath          *path,
+                                                const gchar           *desc);
+static void     gimp_tool_path_end_change      (GimpToolPath          *path,
+                                                gboolean               success);
+
+static void     gimp_tool_path_vectors_visible (GimpVectors           *vectors,
+                                                GimpToolPath          *path);
+static void     gimp_tool_path_vectors_freeze  (GimpVectors           *vectors,
+                                                GimpToolPath          *path);
+static void     gimp_tool_path_vectors_thaw    (GimpVectors           *vectors,
+                                                GimpToolPath          *path);
+static void     gimp_tool_path_verify_state    (GimpToolPath          *path);
+
+static void     gimp_tool_path_move_selected_anchors
+                                               (GimpToolPath          *path,
+                                                gdouble                x,
+                                                gdouble                y);
+static void     gimp_tool_path_delete_selected_anchors
+                                               (GimpToolPath          *path);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolPath, gimp_tool_path, GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_path_parent_class
+
+static guint path_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_tool_path_class_init (GimpToolPathClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_path_constructed;
+  object_class->dispose         = gimp_tool_path_dispose;
+  object_class->set_property    = gimp_tool_path_set_property;
+  object_class->get_property    = gimp_tool_path_get_property;
+
+  widget_class->changed         = gimp_tool_path_changed;
+  widget_class->focus_changed   = gimp_tool_path_changed;
+  widget_class->button_press    = gimp_tool_path_button_press;
+  widget_class->button_release  = gimp_tool_path_button_release;
+  widget_class->motion          = gimp_tool_path_motion;
+  widget_class->hit             = gimp_tool_path_hit;
+  widget_class->hover           = gimp_tool_path_hover;
+  widget_class->key_press       = gimp_tool_path_key_press;
+  widget_class->get_cursor      = gimp_tool_path_get_cursor;
+
+  path_signals[BEGIN_CHANGE] =
+    g_signal_new ("begin-change",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolPathClass, begin_change),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  path_signals[END_CHANGE] =
+    g_signal_new ("end-change",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolPathClass, end_change),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__BOOLEAN,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_BOOLEAN);
+
+  path_signals[ACTIVATE] =
+    g_signal_new ("activate",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolPathClass, activate),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__FLAGS,
+                  G_TYPE_NONE, 1,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  g_object_class_install_property (object_class, PROP_VECTORS,
+                                   g_param_spec_object ("vectors", NULL, NULL,
+                                                        GIMP_TYPE_VECTORS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_EDIT_MODE,
+                                   g_param_spec_enum ("edit-mode",
+                                                      _("Edit Mode"),
+                                                      NULL,
+                                                      GIMP_TYPE_VECTOR_MODE,
+                                                      GIMP_VECTOR_MODE_DESIGN,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_POLYGONAL,
+                                   g_param_spec_boolean ("polygonal",
+                                                         _("Polygonal"),
+                                                         _("Restrict editing to polygons"),
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_path_init (GimpToolPath *path)
+{
+  path->private = gimp_tool_path_get_instance_private (path);
+}
+
+static void
+gimp_tool_path_constructed (GObject *object)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (object);
+  GimpToolWidget      *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolPathPrivate *private = path->private;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  private->path = gimp_tool_widget_add_path (widget, NULL);
+
+  gimp_tool_path_changed (widget);
+}
+
+static void
+gimp_tool_path_dispose (GObject *object)
+{
+  GimpToolPath *path = GIMP_TOOL_PATH (object);
+
+  gimp_tool_path_set_vectors (path, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tool_path_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (object);
+  GimpToolPathPrivate *private = path->private;
+
+  switch (property_id)
+    {
+    case PROP_VECTORS:
+      gimp_tool_path_set_vectors (path, g_value_get_object (value));
+      break;
+    case PROP_EDIT_MODE:
+      private->edit_mode = g_value_get_enum (value);
+      break;
+    case PROP_POLYGONAL:
+      private->polygonal = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_path_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (object);
+  GimpToolPathPrivate *private = path->private;
+
+  switch (property_id)
+    {
+    case PROP_VECTORS:
+      g_value_set_object (value, private->vectors);
+      break;
+    case PROP_EDIT_MODE:
+      g_value_set_enum (value, private->edit_mode);
+      break;
+    case PROP_POLYGONAL:
+      g_value_set_boolean (value, private->polygonal);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+item_remove_func (GimpCanvasItem *item,
+                  GimpToolWidget *widget)
+{
+  gimp_tool_widget_remove_item (widget, item);
+}
+
+static void
+gimp_tool_path_changed (GimpToolWidget *widget)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private = path->private;
+  GimpVectors         *vectors = private->vectors;
+
+  if (private->items)
+    {
+      g_list_foreach (private->items, (GFunc) item_remove_func, widget);
+      g_list_free (private->items);
+      private->items = NULL;
+    }
+
+  if (vectors && gimp_vectors_get_bezier (vectors))
+    {
+      GimpStroke *cur_stroke;
+
+      gimp_canvas_path_set (private->path,
+                            gimp_vectors_get_bezier (vectors));
+      gimp_canvas_item_set_visible (private->path,
+                                    ! gimp_item_get_visible (GIMP_ITEM (vectors)));
+
+      for (cur_stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+           cur_stroke;
+           cur_stroke = gimp_vectors_stroke_get_next (vectors, cur_stroke))
+        {
+          GimpCanvasItem *item;
+          GArray         *coords;
+          GList          *draw_anchors;
+          GList          *list;
+
+          /* anchor handles */
+          draw_anchors = gimp_stroke_get_draw_anchors (cur_stroke);
+
+          for (list = draw_anchors; list; list = g_list_next (list))
+            {
+              GimpAnchor *cur_anchor = GIMP_ANCHOR (list->data);
+
+              if (cur_anchor->type == GIMP_ANCHOR_ANCHOR)
+                {
+                  item =
+                    gimp_tool_widget_add_handle (widget,
+                                                 cur_anchor->selected ?
+                                                 GIMP_HANDLE_CIRCLE :
+                                                 GIMP_HANDLE_FILLED_CIRCLE,
+                                                 cur_anchor->position.x,
+                                                 cur_anchor->position.y,
+                                                 GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                 GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+                  private->items = g_list_prepend (private->items, item);
+                }
+            }
+
+          g_list_free (draw_anchors);
+
+          if (private->sel_count <= 2)
+            {
+              /* the lines to the control handles */
+              coords = gimp_stroke_get_draw_lines (cur_stroke);
+
+              if (coords)
+                {
+                  if (coords->len % 2 == 0)
+                    {
+                      gint i;
+
+                      for (i = 0; i < coords->len; i += 2)
+                        {
+                          item = gimp_tool_widget_add_line
+                            (widget,
+                             g_array_index (coords, GimpCoords, i).x,
+                             g_array_index (coords, GimpCoords, i).y,
+                             g_array_index (coords, GimpCoords, i + 1).x,
+                             g_array_index (coords, GimpCoords, i + 1).y);
+
+                          if (gimp_tool_widget_get_focus (widget))
+                            gimp_canvas_item_set_highlight (item, TRUE);
+
+                          private->items = g_list_prepend (private->items, item);
+                        }
+                    }
+
+                  g_array_free (coords, TRUE);
+                }
+
+              /* control handles */
+              draw_anchors = gimp_stroke_get_draw_controls (cur_stroke);
+
+              for (list = draw_anchors; list; list = g_list_next (list))
+                {
+                  GimpAnchor *cur_anchor = GIMP_ANCHOR (list->data);
+
+                  item =
+                    gimp_tool_widget_add_handle (widget,
+                                                 GIMP_HANDLE_SQUARE,
+                                                 cur_anchor->position.x,
+                                                 cur_anchor->position.y,
+                                                 GIMP_CANVAS_HANDLE_SIZE_CIRCLE - 3,
+                                                 GIMP_CANVAS_HANDLE_SIZE_CIRCLE - 3,
+                                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+                  private->items = g_list_prepend (private->items, item);
+                }
+
+              g_list_free (draw_anchors);
+            }
+        }
+    }
+  else
+    {
+      gimp_canvas_path_set (private->path, NULL);
+    }
+}
+
+static gboolean
+gimp_tool_path_check_writable (GimpToolPath *path)
+{
+  GimpToolPathPrivate *private = path->private;
+  GimpToolWidget      *widget  = GIMP_TOOL_WIDGET (path);
+  GimpDisplayShell    *shell   = gimp_tool_widget_get_shell (widget);
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (private->vectors)) ||
+      gimp_item_is_position_locked (GIMP_ITEM (private->vectors)))
+    {
+      gimp_tool_widget_message_literal (GIMP_TOOL_WIDGET (path),
+                                        _("The active path is locked."));
+
+      /* FIXME: this should really be done by the tool */
+      gimp_tools_blink_lock_box (shell->display->gimp,
+                                 GIMP_ITEM (private->vectors));
+
+      private->function = VECTORS_FINISHED;
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_tool_path_button_press (GimpToolWidget      *widget,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private = path->private;
+
+  /* do nothing if we are in a FINISHED state */
+  if (private->function == VECTORS_FINISHED)
+    return 0;
+
+  g_return_val_if_fail (private->vectors  != NULL                  ||
+                        private->function == VECTORS_SELECT_VECTOR ||
+                        private->function == VECTORS_CREATE_VECTOR, 0);
+
+  private->undo_motion = FALSE;
+
+  /* save the current modifier state */
+
+  private->saved_state = state;
+
+
+  /* select a vectors object */
+
+  if (private->function == VECTORS_SELECT_VECTOR)
+    {
+      GimpVectors *vectors;
+
+      if (gimp_canvas_item_on_vectors (private->path,
+                                       coords,
+                                       GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                       GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                       NULL, NULL, NULL, NULL, NULL, &vectors))
+        {
+          gimp_tool_path_set_vectors (path, vectors);
+        }
+
+      private->function = VECTORS_FINISHED;
+    }
+
+
+  /* create a new vector from scratch */
+
+  if (private->function == VECTORS_CREATE_VECTOR)
+    {
+      GimpDisplayShell *shell = gimp_tool_widget_get_shell (widget);
+      GimpImage        *image = gimp_display_get_image (shell->display);
+      GimpVectors      *vectors;
+
+      vectors = gimp_vectors_new (image, _("Unnamed"));
+      g_object_ref_sink (vectors);
+
+      /* Undo step gets added implicitly */
+      private->have_undo = TRUE;
+
+      private->undo_motion = TRUE;
+
+      gimp_tool_path_set_vectors (path, vectors);
+      g_object_unref (vectors);
+
+      private->function = VECTORS_CREATE_STROKE;
+    }
+
+
+  gimp_vectors_freeze (private->vectors);
+
+  /* create a new stroke */
+
+  if (private->function == VECTORS_CREATE_STROKE &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Add Stroke"));
+      private->undo_motion = TRUE;
+
+      private->cur_stroke = gimp_bezier_stroke_new ();
+      gimp_vectors_stroke_add (private->vectors, private->cur_stroke);
+      g_object_unref (private->cur_stroke);
+
+      private->sel_stroke = private->cur_stroke;
+      private->cur_anchor = NULL;
+      private->sel_anchor = NULL;
+      private->function   = VECTORS_ADD_ANCHOR;
+    }
+
+
+  /* add an anchor to an existing stroke */
+
+  if (private->function == VECTORS_ADD_ANCHOR &&
+      gimp_tool_path_check_writable (path))
+    {
+      GimpCoords position = GIMP_COORDS_DEFAULT_VALUES;
+
+      position.x = coords->x;
+      position.y = coords->y;
+
+      gimp_tool_path_begin_change (path, _("Add Anchor"));
+      private->undo_motion = TRUE;
+
+      private->cur_anchor = gimp_bezier_stroke_extend (private->sel_stroke,
+                                                       &position,
+                                                       private->sel_anchor,
+                                                       EXTEND_EDITABLE);
+
+      private->restriction = GIMP_ANCHOR_FEATURE_SYMMETRIC;
+
+      if (! private->polygonal)
+        private->function = VECTORS_MOVE_HANDLE;
+      else
+        private->function = VECTORS_MOVE_ANCHOR;
+
+      private->cur_stroke = private->sel_stroke;
+    }
+
+
+  /* insertion of an anchor in a curve segment */
+
+  if (private->function == VECTORS_INSERT_ANCHOR &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Insert Anchor"));
+      private->undo_motion = TRUE;
+
+      private->cur_anchor = gimp_stroke_anchor_insert (private->cur_stroke,
+                                                       private->cur_anchor,
+                                                       private->cur_position);
+      if (private->cur_anchor)
+        {
+          if (private->polygonal)
+            {
+              gimp_stroke_anchor_convert (private->cur_stroke,
+                                          private->cur_anchor,
+                                          GIMP_ANCHOR_FEATURE_EDGE);
+            }
+
+          private->function = VECTORS_MOVE_ANCHOR;
+        }
+      else
+        {
+          private->function = VECTORS_FINISHED;
+        }
+    }
+
+
+  /* move a handle */
+
+  if (private->function == VECTORS_MOVE_HANDLE &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Drag Handle"));
+
+      if (private->cur_anchor->type == GIMP_ANCHOR_ANCHOR)
+        {
+          if (! private->cur_anchor->selected)
+            {
+              gimp_vectors_anchor_select (private->vectors,
+                                          private->cur_stroke,
+                                          private->cur_anchor,
+                                          TRUE, TRUE);
+              private->undo_motion = TRUE;
+            }
+
+          gimp_canvas_item_on_vectors_handle (private->path,
+                                              private->vectors, coords,
+                                              GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                              GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                              GIMP_ANCHOR_CONTROL, TRUE,
+                                              &private->cur_anchor,
+                                              &private->cur_stroke);
+          if (! private->cur_anchor)
+            private->function = VECTORS_FINISHED;
+        }
+    }
+
+
+  /* move an anchor */
+
+  if (private->function == VECTORS_MOVE_ANCHOR &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Drag Anchor"));
+
+      if (! private->cur_anchor->selected)
+        {
+          gimp_vectors_anchor_select (private->vectors,
+                                      private->cur_stroke,
+                                      private->cur_anchor,
+                                      TRUE, TRUE);
+          private->undo_motion = TRUE;
+        }
+    }
+
+
+  /* move multiple anchors */
+
+  if (private->function == VECTORS_MOVE_ANCHORSET &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Drag Anchors"));
+
+      if (state & TOGGLE_MASK)
+        {
+          gimp_vectors_anchor_select (private->vectors,
+                                      private->cur_stroke,
+                                      private->cur_anchor,
+                                      !private->cur_anchor->selected,
+                                      FALSE);
+          private->undo_motion = TRUE;
+
+          if (private->cur_anchor->selected == FALSE)
+            private->function = VECTORS_FINISHED;
+        }
+    }
+
+
+  /* move a curve segment directly */
+
+  if (private->function == VECTORS_MOVE_CURVE &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Drag Curve"));
+
+      /* the magic numbers are taken from the "feel good" parameter
+       * from gimp_bezier_stroke_point_move_relative in gimpbezierstroke.c. */
+      if (private->cur_position < 5.0 / 6.0)
+        {
+          gimp_vectors_anchor_select (private->vectors,
+                                      private->cur_stroke,
+                                      private->cur_anchor, TRUE, TRUE);
+          private->undo_motion = TRUE;
+        }
+
+      if (private->cur_position > 1.0 / 6.0)
+        {
+          gimp_vectors_anchor_select (private->vectors,
+                                      private->cur_stroke,
+                                      private->cur_anchor2, TRUE,
+                                      (private->cur_position >= 5.0 / 6.0));
+          private->undo_motion = TRUE;
+        }
+
+    }
+
+
+  /* connect two strokes */
+
+  if (private->function == VECTORS_CONNECT_STROKES &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Connect Strokes"));
+      private->undo_motion = TRUE;
+
+      gimp_stroke_connect_stroke (private->sel_stroke,
+                                  private->sel_anchor,
+                                  private->cur_stroke,
+                                  private->cur_anchor);
+
+      if (private->cur_stroke != private->sel_stroke &&
+          gimp_stroke_is_empty (private->cur_stroke))
+        {
+          gimp_vectors_stroke_remove (private->vectors,
+                                      private->cur_stroke);
+        }
+
+      private->sel_anchor = private->cur_anchor;
+      private->cur_stroke = private->sel_stroke;
+
+      gimp_vectors_anchor_select (private->vectors,
+                                  private->sel_stroke,
+                                  private->sel_anchor, TRUE, TRUE);
+
+      private->function = VECTORS_FINISHED;
+    }
+
+
+  /* move a stroke or all strokes of a vectors object */
+
+  if ((private->function == VECTORS_MOVE_STROKE ||
+       private->function == VECTORS_MOVE_VECTORS) &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Drag Path"));
+
+      /* Work is being done in gimp_tool_path_motion()... */
+    }
+
+
+  /* convert an anchor to something that looks like an edge */
+
+  if (private->function == VECTORS_CONVERT_EDGE &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Convert Edge"));
+      private->undo_motion = TRUE;
+
+      gimp_stroke_anchor_convert (private->cur_stroke,
+                                  private->cur_anchor,
+                                  GIMP_ANCHOR_FEATURE_EDGE);
+
+      if (private->cur_anchor->type == GIMP_ANCHOR_ANCHOR)
+        {
+          gimp_vectors_anchor_select (private->vectors,
+                                      private->cur_stroke,
+                                      private->cur_anchor, TRUE, TRUE);
+
+          private->function = VECTORS_MOVE_ANCHOR;
+        }
+      else
+        {
+          private->cur_stroke = NULL;
+          private->cur_anchor = NULL;
+
+          /* avoid doing anything stupid */
+          private->function = VECTORS_FINISHED;
+        }
+    }
+
+
+  /* removal of a node in a stroke */
+
+  if (private->function == VECTORS_DELETE_ANCHOR &&
+      gimp_tool_path_check_writable (path))
+    {
+      gimp_tool_path_begin_change (path, _("Delete Anchor"));
+      private->undo_motion = TRUE;
+
+      gimp_stroke_anchor_delete (private->cur_stroke,
+                                 private->cur_anchor);
+
+      if (gimp_stroke_is_empty (private->cur_stroke))
+        gimp_vectors_stroke_remove (private->vectors,
+                                    private->cur_stroke);
+
+      private->cur_stroke = NULL;
+      private->cur_anchor = NULL;
+      private->function = VECTORS_FINISHED;
+    }
+
+
+  /* deleting a segment (opening up a stroke) */
+
+  if (private->function == VECTORS_DELETE_SEGMENT &&
+      gimp_tool_path_check_writable (path))
+    {
+      GimpStroke *new_stroke;
+
+      gimp_tool_path_begin_change (path, _("Delete Segment"));
+      private->undo_motion = TRUE;
+
+      new_stroke = gimp_stroke_open (private->cur_stroke,
+                                     private->cur_anchor);
+      if (new_stroke)
+        {
+          gimp_vectors_stroke_add (private->vectors, new_stroke);
+          g_object_unref (new_stroke);
+        }
+
+      private->cur_stroke = NULL;
+      private->cur_anchor = NULL;
+      private->function   = VECTORS_FINISHED;
+    }
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+
+  gimp_vectors_thaw (private->vectors);
+
+  return 1;
+}
+
+void
+gimp_tool_path_button_release (GimpToolWidget        *widget,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private = path->private;
+
+  private->function = VECTORS_FINISHED;
+
+  if (private->have_undo)
+    {
+      if (! private->undo_motion ||
+          release_type == GIMP_BUTTON_RELEASE_CANCEL)
+        {
+          gimp_tool_path_end_change (path, FALSE);
+        }
+      else
+        {
+          gimp_tool_path_end_change (path, TRUE);
+        }
+    }
+}
+
+void
+gimp_tool_path_motion (GimpToolWidget   *widget,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state)
+{
+  GimpToolPath        *path     = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private  = path->private;
+  GimpCoords           position = GIMP_COORDS_DEFAULT_VALUES;
+  GimpAnchor          *anchor;
+
+  if (private->function == VECTORS_FINISHED)
+    return;
+
+  position.x = coords->x;
+  position.y = coords->y;
+
+  gimp_vectors_freeze (private->vectors);
+
+  if ((private->saved_state & TOGGLE_MASK) != (state & TOGGLE_MASK))
+    private->modifier_lock = FALSE;
+
+  if (! private->modifier_lock)
+    {
+      if (state & TOGGLE_MASK)
+        {
+          private->restriction = GIMP_ANCHOR_FEATURE_SYMMETRIC;
+        }
+      else
+        {
+          private->restriction = GIMP_ANCHOR_FEATURE_NONE;
+        }
+    }
+
+  switch (private->function)
+    {
+    case VECTORS_MOVE_ANCHOR:
+    case VECTORS_MOVE_HANDLE:
+      anchor = private->cur_anchor;
+
+      if (anchor)
+        {
+          gimp_stroke_anchor_move_absolute (private->cur_stroke,
+                                            private->cur_anchor,
+                                            &position,
+                                            private->restriction);
+          private->undo_motion = TRUE;
+        }
+      break;
+
+    case VECTORS_MOVE_CURVE:
+      if (private->polygonal)
+        {
+          gimp_tool_path_move_selected_anchors (path,
+                                                coords->x - private->last_x,
+                                                coords->y - private->last_y);
+          private->undo_motion = TRUE;
+        }
+      else
+        {
+          gimp_stroke_point_move_absolute (private->cur_stroke,
+                                           private->cur_anchor,
+                                           private->cur_position,
+                                           &position,
+                                           private->restriction);
+          private->undo_motion = TRUE;
+        }
+      break;
+
+    case VECTORS_MOVE_ANCHORSET:
+      gimp_tool_path_move_selected_anchors (path,
+                                            coords->x - private->last_x,
+                                            coords->y - private->last_y);
+      private->undo_motion = TRUE;
+      break;
+
+    case VECTORS_MOVE_STROKE:
+      if (private->cur_stroke)
+        {
+          gimp_stroke_translate (private->cur_stroke,
+                                 coords->x - private->last_x,
+                                 coords->y - private->last_y);
+          private->undo_motion = TRUE;
+        }
+      else if (private->sel_stroke)
+        {
+          gimp_stroke_translate (private->sel_stroke,
+                                 coords->x - private->last_x,
+                                 coords->y - private->last_y);
+          private->undo_motion = TRUE;
+        }
+      break;
+
+    case VECTORS_MOVE_VECTORS:
+      gimp_item_translate (GIMP_ITEM (private->vectors),
+                           coords->x - private->last_x,
+                           coords->y - private->last_y, FALSE);
+      private->undo_motion = TRUE;
+      break;
+
+    default:
+      break;
+    }
+
+  gimp_vectors_thaw (private->vectors);
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+}
+
+GimpHit
+gimp_tool_path_hit (GimpToolWidget   *widget,
+                    const GimpCoords *coords,
+                    GdkModifierType   state,
+                    gboolean          proximity)
+{
+  GimpToolPath *path = GIMP_TOOL_PATH (widget);
+
+  switch (gimp_tool_path_get_function (path, coords, state))
+    {
+    case VECTORS_SELECT_VECTOR:
+    case VECTORS_MOVE_ANCHOR:
+    case VECTORS_MOVE_ANCHORSET:
+    case VECTORS_MOVE_HANDLE:
+    case VECTORS_MOVE_CURVE:
+    case VECTORS_MOVE_STROKE:
+    case VECTORS_DELETE_ANCHOR:
+    case VECTORS_DELETE_SEGMENT:
+    case VECTORS_INSERT_ANCHOR:
+    case VECTORS_CONNECT_STROKES:
+    case VECTORS_CONVERT_EDGE:
+      return GIMP_HIT_DIRECT;
+
+    case VECTORS_CREATE_VECTOR:
+    case VECTORS_CREATE_STROKE:
+    case VECTORS_ADD_ANCHOR:
+    case VECTORS_MOVE_VECTORS:
+      return GIMP_HIT_INDIRECT;
+    
+    case VECTORS_FINISHED:
+      return GIMP_HIT_NONE;
+    }
+
+  return GIMP_HIT_NONE;
+}
+
+void
+gimp_tool_path_hover (GimpToolWidget   *widget,
+                      const GimpCoords *coords,
+                      GdkModifierType   state,
+                      gboolean          proximity)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private = path->private;
+
+  private->function = gimp_tool_path_get_function (path, coords, state);
+
+  gimp_tool_path_update_status (path, state, proximity);
+}
+
+static gboolean
+gimp_tool_path_key_press (GimpToolWidget *widget,
+                          GdkEventKey    *kevent)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private = path->private;
+  GimpDisplayShell    *shell;
+  gdouble              xdist, ydist;
+  gdouble              pixels = 1.0;
+
+  if (! private->vectors)
+    return FALSE;
+
+  shell = gimp_tool_widget_get_shell (widget);
+
+  if (kevent->state & gimp_get_extend_selection_mask ())
+    pixels = 10.0;
+
+  if (kevent->state & gimp_get_toggle_behavior_mask ())
+    pixels = 50.0;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      g_signal_emit (path, path_signals[ACTIVATE], 0,
+                     kevent->state);
+      break;
+
+    case GDK_KEY_BackSpace:
+    case GDK_KEY_Delete:
+      gimp_tool_path_delete_selected_anchors (path);
+      break;
+
+    case GDK_KEY_Left:
+    case GDK_KEY_Right:
+    case GDK_KEY_Up:
+    case GDK_KEY_Down:
+      xdist = FUNSCALEX (shell, pixels);
+      ydist = FUNSCALEY (shell, pixels);
+
+      gimp_tool_path_begin_change (path, _("Move Anchors"));
+      gimp_vectors_freeze (private->vectors);
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Left:
+          gimp_tool_path_move_selected_anchors (path, -xdist, 0);
+          break;
+
+        case GDK_KEY_Right:
+          gimp_tool_path_move_selected_anchors (path, xdist, 0);
+          break;
+
+        case GDK_KEY_Up:
+          gimp_tool_path_move_selected_anchors (path, 0, -ydist);
+          break;
+
+        case GDK_KEY_Down:
+          gimp_tool_path_move_selected_anchors (path, 0, ydist);
+          break;
+
+        default:
+          break;
+        }
+
+      gimp_vectors_thaw (private->vectors);
+      gimp_tool_path_end_change (path, TRUE);
+      break;
+
+    case GDK_KEY_Escape:
+      if (private->edit_mode != GIMP_VECTOR_MODE_DESIGN)
+        g_object_set (private,
+                      "vectors-edit-mode", GIMP_VECTOR_MODE_DESIGN,
+                      NULL);
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_tool_path_get_cursor (GimpToolWidget     *widget,
+                           const GimpCoords   *coords,
+                           GdkModifierType     state,
+                           GimpCursorType     *cursor,
+                           GimpToolCursorType *tool_cursor,
+                           GimpCursorModifier *modifier)
+{
+  GimpToolPath        *path    = GIMP_TOOL_PATH (widget);
+  GimpToolPathPrivate *private = path->private;
+
+  *tool_cursor = GIMP_TOOL_CURSOR_PATHS;
+  *modifier    = GIMP_CURSOR_MODIFIER_NONE;
+
+  switch (private->function)
+    {
+    case VECTORS_SELECT_VECTOR:
+      *tool_cursor = GIMP_TOOL_CURSOR_HAND;
+      break;
+
+    case VECTORS_CREATE_VECTOR:
+    case VECTORS_CREATE_STROKE:
+      *modifier = GIMP_CURSOR_MODIFIER_CONTROL;
+      break;
+
+    case VECTORS_ADD_ANCHOR:
+    case VECTORS_INSERT_ANCHOR:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
+      *modifier    = GIMP_CURSOR_MODIFIER_PLUS;
+      break;
+
+    case VECTORS_DELETE_ANCHOR:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
+      *modifier    = GIMP_CURSOR_MODIFIER_MINUS;
+      break;
+
+    case VECTORS_DELETE_SEGMENT:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
+      *modifier    = GIMP_CURSOR_MODIFIER_MINUS;
+      break;
+
+    case VECTORS_MOVE_HANDLE:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_CONTROL;
+      *modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case VECTORS_CONVERT_EDGE:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_CONTROL;
+      *modifier    = GIMP_CURSOR_MODIFIER_MINUS;
+      break;
+
+    case VECTORS_MOVE_ANCHOR:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
+      *modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case VECTORS_MOVE_CURVE:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
+      *modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case VECTORS_MOVE_STROKE:
+    case VECTORS_MOVE_VECTORS:
+      *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case VECTORS_MOVE_ANCHORSET:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
+      *modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case VECTORS_CONNECT_STROKES:
+      *tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
+      *modifier    = GIMP_CURSOR_MODIFIER_JOIN;
+      break;
+
+    default:
+      *modifier = GIMP_CURSOR_MODIFIER_BAD;
+      break;
+    }
+
+  return TRUE;
+}
+
+static GimpVectorFunction
+gimp_tool_path_get_function (GimpToolPath     *path,
+                             const GimpCoords *coords,
+                             GdkModifierType   state)
+{
+  GimpToolPathPrivate *private    = path->private;
+  GimpAnchor          *anchor     = NULL;
+  GimpAnchor          *anchor2    = NULL;
+  GimpStroke          *stroke     = NULL;
+  gdouble              position   = -1;
+  gboolean             on_handle  = FALSE;
+  gboolean             on_curve   = FALSE;
+  gboolean             on_vectors = FALSE;
+  GimpVectorFunction   function   = VECTORS_FINISHED;
+
+  private->modifier_lock = FALSE;
+
+  /* are we hovering the current vectors on the current display? */
+  if (private->vectors)
+    {
+      on_handle = gimp_canvas_item_on_vectors_handle (private->path,
+                                                      private->vectors,
+                                                      coords,
+                                                      GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                      GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                      GIMP_ANCHOR_ANCHOR,
+                                                      private->sel_count > 2,
+                                                      &anchor, &stroke);
+
+      if (! on_handle)
+        on_curve = gimp_canvas_item_on_vectors_curve (private->path,
+                                                      private->vectors,
+                                                      coords,
+                                                      GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                      GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                      NULL,
+                                                      &position, &anchor,
+                                                      &anchor2, &stroke);
+    }
+
+  if (! on_handle && ! on_curve)
+    {
+      on_vectors = gimp_canvas_item_on_vectors (private->path,
+                                                coords,
+                                                GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                NULL, NULL, NULL, NULL, NULL,
+                                                NULL);
+    }
+
+  private->cur_position = position;
+  private->cur_anchor   = anchor;
+  private->cur_anchor2  = anchor2;
+  private->cur_stroke   = stroke;
+
+  switch (private->edit_mode)
+    {
+    case GIMP_VECTOR_MODE_DESIGN:
+      if (! private->vectors)
+        {
+          if (on_vectors)
+            {
+              function = VECTORS_SELECT_VECTOR;
+            }
+          else
+            {
+              function               = VECTORS_CREATE_VECTOR;
+              private->restriction   = GIMP_ANCHOR_FEATURE_SYMMETRIC;
+              private->modifier_lock = TRUE;
+            }
+        }
+      else if (on_handle)
+        {
+          if (anchor->type == GIMP_ANCHOR_ANCHOR)
+            {
+              if (state & TOGGLE_MASK)
+                {
+                  function = VECTORS_MOVE_ANCHORSET;
+                }
+              else
+                {
+                  if (private->sel_count >= 2 && anchor->selected)
+                    function = VECTORS_MOVE_ANCHORSET;
+                  else
+                    function = VECTORS_MOVE_ANCHOR;
+                }
+            }
+          else
+            {
+              function = VECTORS_MOVE_HANDLE;
+
+              if (state & TOGGLE_MASK)
+                private->restriction = GIMP_ANCHOR_FEATURE_SYMMETRIC;
+              else
+                private->restriction = GIMP_ANCHOR_FEATURE_NONE;
+            }
+        }
+      else if (on_curve)
+        {
+          if (gimp_stroke_point_is_movable (stroke, anchor, position))
+            {
+              function = VECTORS_MOVE_CURVE;
+
+              if (state & TOGGLE_MASK)
+                private->restriction = GIMP_ANCHOR_FEATURE_SYMMETRIC;
+              else
+                private->restriction = GIMP_ANCHOR_FEATURE_NONE;
+            }
+          else
+            {
+              function = VECTORS_FINISHED;
+            }
+        }
+      else
+        {
+          if (private->sel_stroke &&
+              private->sel_anchor &&
+              gimp_stroke_is_extendable (private->sel_stroke,
+                                         private->sel_anchor) &&
+              ! (state & TOGGLE_MASK))
+            function = VECTORS_ADD_ANCHOR;
+          else
+            function = VECTORS_CREATE_STROKE;
+
+          private->restriction   = GIMP_ANCHOR_FEATURE_SYMMETRIC;
+          private->modifier_lock = TRUE;
+        }
+
+      break;
+
+    case GIMP_VECTOR_MODE_EDIT:
+      if (! private->vectors)
+        {
+          if (on_vectors)
+            {
+              function = VECTORS_SELECT_VECTOR;
+            }
+          else
+            {
+              function = VECTORS_FINISHED;
+            }
+        }
+      else if (on_handle)
+        {
+          if (anchor->type == GIMP_ANCHOR_ANCHOR)
+            {
+              if (! (state & TOGGLE_MASK) &&
+                  private->sel_anchor &&
+                  private->sel_anchor != anchor &&
+                  gimp_stroke_is_extendable (private->sel_stroke,
+                                             private->sel_anchor) &&
+                  gimp_stroke_is_extendable (stroke, anchor))
+                {
+                  function = VECTORS_CONNECT_STROKES;
+                }
+              else
+                {
+                  if (state & TOGGLE_MASK)
+                    {
+                      function = VECTORS_DELETE_ANCHOR;
+                    }
+                  else
+                    {
+                      if (private->polygonal)
+                        function = VECTORS_MOVE_ANCHOR;
+                      else
+                        function = VECTORS_MOVE_HANDLE;
+                    }
+                }
+            }
+          else
+            {
+              if (state & TOGGLE_MASK)
+                function = VECTORS_CONVERT_EDGE;
+              else
+                function = VECTORS_MOVE_HANDLE;
+            }
+        }
+      else if (on_curve)
+        {
+          if (state & TOGGLE_MASK)
+            {
+              function = VECTORS_DELETE_SEGMENT;
+            }
+          else if (gimp_stroke_anchor_is_insertable (stroke, anchor, position))
+            {
+              function = VECTORS_INSERT_ANCHOR;
+            }
+          else
+            {
+              function = VECTORS_FINISHED;
+            }
+        }
+      else
+        {
+          function = VECTORS_FINISHED;
+        }
+
+      break;
+
+    case GIMP_VECTOR_MODE_MOVE:
+      if (! private->vectors)
+        {
+          if (on_vectors)
+            {
+              function = VECTORS_SELECT_VECTOR;
+            }
+          else
+            {
+              function = VECTORS_FINISHED;
+            }
+        }
+      else if (on_handle || on_curve)
+        {
+          if (state & TOGGLE_MASK)
+            {
+              function = VECTORS_MOVE_VECTORS;
+            }
+          else
+            {
+              function = VECTORS_MOVE_STROKE;
+            }
+        }
+      else
+        {
+          if (on_vectors)
+            {
+              function = VECTORS_SELECT_VECTOR;
+            }
+          else
+            {
+              function = VECTORS_MOVE_VECTORS;
+            }
+        }
+      break;
+    }
+
+  return function;
+}
+
+static void
+gimp_tool_path_update_status (GimpToolPath    *path,
+                              GdkModifierType  state,
+                              gboolean         proximity)
+{
+  GimpToolPathPrivate *private     = path->private;
+  GdkModifierType      extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType      toggle_mask = gimp_get_toggle_behavior_mask ();
+  const gchar         *status      = NULL;
+  gboolean             free_status = FALSE;
+
+  if (! proximity)
+    {
+      gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (path), NULL);
+      return;
+    }
+
+  switch (private->function)
+    {
+    case VECTORS_SELECT_VECTOR:
+      status = _("Click to pick path to edit");
+      break;
+
+    case VECTORS_CREATE_VECTOR:
+      status = _("Click to create a new path");
+      break;
+
+    case VECTORS_CREATE_STROKE:
+      status = _("Click to create a new component of the path");
+      break;
+
+    case VECTORS_ADD_ANCHOR:
+      status = gimp_suggest_modifiers (_("Click or Click-Drag to create "
+                                         "a new anchor"),
+                                       extend_mask & ~state,
+                                       NULL, NULL, NULL);
+      free_status = TRUE;
+      break;
+
+    case VECTORS_MOVE_ANCHOR:
+      if (private->edit_mode != GIMP_VECTOR_MODE_EDIT)
+        {
+          status = gimp_suggest_modifiers (_("Click-Drag to move the "
+                                             "anchor around"),
+                                           toggle_mask & ~state,
+                                           NULL, NULL, NULL);
+          free_status = TRUE;
+        }
+      else
+        status = _("Click-Drag to move the anchor around");
+      break;
+
+    case VECTORS_MOVE_ANCHORSET:
+      status = _("Click-Drag to move the anchors around");
+      break;
+
+    case VECTORS_MOVE_HANDLE:
+      if (private->restriction != GIMP_ANCHOR_FEATURE_SYMMETRIC)
+        {
+          status = gimp_suggest_modifiers (_("Click-Drag to move the "
+                                             "handle around"),
+                                           extend_mask & ~state,
+                                           NULL, NULL, NULL);
+        }
+      else
+        {
+          status = gimp_suggest_modifiers (_("Click-Drag to move the "
+                                             "handles around symmetrically"),
+                                           extend_mask & ~state,
+                                           NULL, NULL, NULL);
+        }
+      free_status = TRUE;
+      break;
+
+    case VECTORS_MOVE_CURVE:
+      if (private->polygonal)
+        status = gimp_suggest_modifiers (_("Click-Drag to move the "
+                                           "anchors around"),
+                                         extend_mask & ~state,
+                                         NULL, NULL, NULL);
+      else
+        status = gimp_suggest_modifiers (_("Click-Drag to change the "
+                                           "shape of the curve"),
+                                         extend_mask & ~state,
+                                         _("%s: symmetrical"), NULL, NULL);
+      free_status = TRUE;
+      break;
+
+    case VECTORS_MOVE_STROKE:
+      status = gimp_suggest_modifiers (_("Click-Drag to move the "
+                                         "component around"),
+                                       extend_mask & ~state,
+                                       NULL, NULL, NULL);
+      free_status = TRUE;
+      break;
+
+    case VECTORS_MOVE_VECTORS:
+      status = _("Click-Drag to move the path around");
+      break;
+
+    case VECTORS_INSERT_ANCHOR:
+      status = gimp_suggest_modifiers (_("Click-Drag to insert an anchor "
+                                         "on the path"),
+                                       extend_mask & ~state,
+                                       NULL, NULL, NULL);
+      free_status = TRUE;
+      break;
+
+    case VECTORS_DELETE_ANCHOR:
+      status = _("Click to delete this anchor");
+      break;
+
+    case VECTORS_CONNECT_STROKES:
+      status = _("Click to connect this anchor "
+                 "with the selected endpoint");
+      break;
+
+    case VECTORS_DELETE_SEGMENT:
+      status = _("Click to open up the path");
+      break;
+
+    case VECTORS_CONVERT_EDGE:
+      status = _("Click to make this node angular");
+      break;
+
+    case VECTORS_FINISHED:
+      status = _("Clicking here does nothing, try clicking on path elements.");
+      break;
+    }
+
+  gimp_tool_widget_set_status (GIMP_TOOL_WIDGET (path), status);
+
+  if (free_status)
+    g_free ((gchar *) status);
+}
+
+static void
+gimp_tool_path_begin_change (GimpToolPath *path,
+                             const gchar  *desc)
+{
+  GimpToolPathPrivate *private = path->private;
+
+  g_return_if_fail (private->vectors != NULL);
+
+  /* don't push two undos */
+  if (private->have_undo)
+    return;
+
+  g_signal_emit (path, path_signals[BEGIN_CHANGE], 0,
+                 desc);
+
+  private->have_undo = TRUE;
+}
+
+static void
+gimp_tool_path_end_change (GimpToolPath *path,
+                           gboolean      success)
+{
+  GimpToolPathPrivate *private = path->private;
+
+  private->have_undo   = FALSE;
+  private->undo_motion = FALSE;
+
+  g_signal_emit (path, path_signals[END_CHANGE], 0,
+                 success);
+}
+
+static void
+gimp_tool_path_vectors_visible (GimpVectors  *vectors,
+                                GimpToolPath *path)
+{
+  GimpToolPathPrivate *private = path->private;
+
+  gimp_canvas_item_set_visible (private->path,
+                                ! gimp_item_get_visible (GIMP_ITEM (vectors)));
+}
+
+static void
+gimp_tool_path_vectors_freeze (GimpVectors  *vectors,
+                               GimpToolPath *path)
+{
+}
+
+static void
+gimp_tool_path_vectors_thaw (GimpVectors  *vectors,
+                             GimpToolPath *path)
+{
+  /*  Ok, the vector might have changed externally (e.g. Undo) we need
+   *  to validate our internal state.
+   */
+  gimp_tool_path_verify_state (path);
+  gimp_tool_path_changed (GIMP_TOOL_WIDGET (path));
+}
+
+static void
+gimp_tool_path_verify_state (GimpToolPath *path)
+{
+  GimpToolPathPrivate *private          = path->private;
+  GimpStroke          *cur_stroke       = NULL;
+  gboolean             cur_anchor_valid = FALSE;
+  gboolean             cur_stroke_valid = FALSE;
+
+  private->sel_count  = 0;
+  private->sel_anchor = NULL;
+  private->sel_stroke = NULL;
+
+  if (! private->vectors)
+    {
+      private->cur_position = -1;
+      private->cur_anchor   = NULL;
+      private->cur_stroke   = NULL;
+      return;
+    }
+
+  while ((cur_stroke = gimp_vectors_stroke_get_next (private->vectors,
+                                                     cur_stroke)))
+    {
+      GList *anchors;
+      GList *list;
+
+      /* anchor handles */
+      anchors = gimp_stroke_get_draw_anchors (cur_stroke);
+
+      if (cur_stroke == private->cur_stroke)
+        cur_stroke_valid = TRUE;
+
+      for (list = anchors; list; list = g_list_next (list))
+        {
+          GimpAnchor *cur_anchor = list->data;
+
+          if (cur_anchor == private->cur_anchor)
+            cur_anchor_valid = TRUE;
+
+          if (cur_anchor->type == GIMP_ANCHOR_ANCHOR &&
+              cur_anchor->selected)
+            {
+              private->sel_count++;
+              if (private->sel_count == 1)
+                {
+                  private->sel_anchor = cur_anchor;
+                  private->sel_stroke = cur_stroke;
+                }
+              else
+                {
+                  private->sel_anchor = NULL;
+                  private->sel_stroke = NULL;
+                }
+            }
+        }
+
+      g_list_free (anchors);
+
+      anchors = gimp_stroke_get_draw_controls (cur_stroke);
+
+      for (list = anchors; list; list = g_list_next (list))
+        {
+          GimpAnchor *cur_anchor = list->data;
+
+          if (cur_anchor == private->cur_anchor)
+            cur_anchor_valid = TRUE;
+        }
+
+      g_list_free (anchors);
+    }
+
+  if (! cur_stroke_valid)
+    private->cur_stroke = NULL;
+
+  if (! cur_anchor_valid)
+    private->cur_anchor = NULL;
+}
+
+static void
+gimp_tool_path_move_selected_anchors (GimpToolPath *path,
+                                      gdouble       x,
+                                      gdouble       y)
+{
+  GimpToolPathPrivate *private = path->private;
+  GimpAnchor          *cur_anchor;
+  GimpStroke          *cur_stroke = NULL;
+  GList               *anchors;
+  GList               *list;
+  GimpCoords           offset = { 0.0, };
+
+  offset.x = x;
+  offset.y = y;
+
+  while ((cur_stroke = gimp_vectors_stroke_get_next (private->vectors,
+                                                     cur_stroke)))
+    {
+      /* anchors */
+      anchors = gimp_stroke_get_draw_anchors (cur_stroke);
+
+      for (list = anchors; list; list = g_list_next (list))
+        {
+          cur_anchor = GIMP_ANCHOR (list->data);
+
+          if (cur_anchor->selected)
+            gimp_stroke_anchor_move_relative (cur_stroke,
+                                              cur_anchor,
+                                              &offset,
+                                              GIMP_ANCHOR_FEATURE_NONE);
+        }
+
+      g_list_free (anchors);
+    }
+}
+
+static void
+gimp_tool_path_delete_selected_anchors (GimpToolPath *path)
+{
+  GimpToolPathPrivate *private = path->private;
+  GimpAnchor          *cur_anchor;
+  GimpStroke          *cur_stroke = NULL;
+  GList               *anchors;
+  GList               *list;
+  gboolean             have_undo = FALSE;
+
+  gimp_vectors_freeze (private->vectors);
+
+  while ((cur_stroke = gimp_vectors_stroke_get_next (private->vectors,
+                                                     cur_stroke)))
+    {
+      /* anchors */
+      anchors = gimp_stroke_get_draw_anchors (cur_stroke);
+
+      for (list = anchors; list; list = g_list_next (list))
+        {
+          cur_anchor = GIMP_ANCHOR (list->data);
+
+          if (cur_anchor->selected)
+            {
+              if (! have_undo)
+                {
+                  gimp_tool_path_begin_change (path, _("Delete Anchors"));
+                  have_undo = TRUE;
+                }
+
+              gimp_stroke_anchor_delete (cur_stroke, cur_anchor);
+
+              if (gimp_stroke_is_empty (cur_stroke))
+                {
+                  gimp_vectors_stroke_remove (private->vectors, cur_stroke);
+                  cur_stroke = NULL;
+                }
+            }
+        }
+
+      g_list_free (anchors);
+    }
+
+  if (have_undo)
+    gimp_tool_path_end_change (path, TRUE);
+
+  gimp_vectors_thaw (private->vectors);
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_path_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_PATH,
+                       "shell", shell,
+                       NULL);
+}
+
+void
+gimp_tool_path_set_vectors (GimpToolPath *path,
+                            GimpVectors  *vectors)
+{
+  GimpToolPathPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_PATH (path));
+  g_return_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors));
+
+  private = path->private;
+
+  if (vectors == private->vectors)
+    return;
+
+  if (private->vectors)
+    {
+      g_signal_handlers_disconnect_by_func (private->vectors,
+                                            gimp_tool_path_vectors_visible,
+                                            path);
+      g_signal_handlers_disconnect_by_func (private->vectors,
+                                            gimp_tool_path_vectors_freeze,
+                                            path);
+      g_signal_handlers_disconnect_by_func (private->vectors,
+                                            gimp_tool_path_vectors_thaw,
+                                            path);
+
+      g_object_unref (private->vectors);
+    }
+
+  private->vectors  = vectors;
+  private->function = VECTORS_FINISHED;
+  gimp_tool_path_verify_state (path);
+
+  if (private->vectors)
+    {
+      g_object_ref (private->vectors);
+
+      g_signal_connect_object (private->vectors, "visibility-changed",
+                               G_CALLBACK (gimp_tool_path_vectors_visible),
+                               path, 0);
+      g_signal_connect_object (private->vectors, "freeze",
+                               G_CALLBACK (gimp_tool_path_vectors_freeze),
+                               path, 0);
+      g_signal_connect_object (private->vectors, "thaw",
+                               G_CALLBACK (gimp_tool_path_vectors_thaw),
+                               path, 0);
+    }
+
+  g_object_notify (G_OBJECT (path), "vectors");
+}
diff --git a/app/display/gimptoolpath.h b/app/display/gimptoolpath.h
new file mode 100644
index 0000000..861d5e8
--- /dev/null
+++ b/app/display/gimptoolpath.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpath.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PATH_H__
+#define __GIMP_TOOL_PATH_H__
+
+
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TYPE_TOOL_PATH            (gimp_tool_path_get_type ())
+#define GIMP_TOOL_PATH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_PATH, GimpToolPath))
+#define GIMP_TOOL_PATH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_PATH, GimpToolPathClass))
+#define GIMP_IS_TOOL_PATH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_PATH))
+#define GIMP_IS_TOOL_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_PATH))
+#define GIMP_TOOL_PATH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_PATH, GimpToolPathClass))
+
+
+typedef struct _GimpToolPath        GimpToolPath;
+typedef struct _GimpToolPathPrivate GimpToolPathPrivate;
+typedef struct _GimpToolPathClass   GimpToolPathClass;
+
+struct _GimpToolPath
+{
+  GimpToolWidget       parent_instance;
+
+  GimpToolPathPrivate *private;
+};
+
+struct _GimpToolPathClass
+{
+  GimpToolWidgetClass  parent_class;
+
+  void (* begin_change) (GimpToolPath    *path,
+                         const gchar     *desc);
+  void (* end_change)   (GimpToolPath    *path,
+                         gboolean         success);
+  void (* activate)     (GimpToolPath    *path,
+                         GdkModifierType  state);
+};
+
+
+GType            gimp_tool_path_get_type    (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_path_new         (GimpDisplayShell *shell);
+
+void             gimp_tool_path_set_vectors (GimpToolPath     *path,
+                                             GimpVectors      *vectors);
+
+
+#endif /* __GIMP_TOOL_PATH_H__ */
diff --git a/app/display/gimptoolpolygon.c b/app/display/gimptoolpolygon.c
new file mode 100644
index 0000000..4f2c20b
--- /dev/null
+++ b/app/display/gimptoolpolygon.c
@@ -0,0 +1,1495 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpolygon.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on GimpFreeSelectTool
+ *
+ * Major improvement to support polygonal segments
+ * Copyright (C) 2008 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpmarshal.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvashandle.h"
+#include "gimpcanvasline.h"
+#include "gimpcanvaspolygon.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-utils.h"
+#include "gimptoolpolygon.h"
+
+#include "gimp-intl.h"
+
+
+#define POINT_GRAB_THRESHOLD_SQ SQR (GIMP_CANVAS_HANDLE_SIZE_CIRCLE / 2)
+#define POINT_SHOW_THRESHOLD_SQ SQR (GIMP_CANVAS_HANDLE_SIZE_CIRCLE * 7)
+#define N_ITEMS_PER_ALLOC       1024
+#define INVALID_INDEX           (-1)
+#define NO_CLICK_TIME_AVAILABLE 0
+
+
+enum
+{
+  CHANGE_COMPLETE,
+  LAST_SIGNAL
+};
+
+
+struct _GimpToolPolygonPrivate
+{
+  /* Index of grabbed segment index. */
+  gint               grabbed_segment_index;
+
+  /* We need to keep track of a number of points when we move a
+   * segment vertex
+   */
+  GimpVector2       *saved_points_lower_segment;
+  GimpVector2       *saved_points_higher_segment;
+  gint               max_n_saved_points_lower_segment;
+  gint               max_n_saved_points_higher_segment;
+
+  /* Keeps track whether or not a modification of the polygon has been
+   * made between _button_press and _button_release
+   */
+  gboolean           polygon_modified;
+
+  /* Point which is used to draw the polygon but which is not part of
+   * it yet
+   */
+  GimpVector2        pending_point;
+  gboolean           show_pending_point;
+
+  /* The points of the polygon */
+  GimpVector2       *points;
+  gint               max_n_points;
+
+  /* The number of points actually in use */
+  gint               n_points;
+
+
+  /* Any int array containing the indices for the points in the
+   * polygon that connects different segments together
+   */
+  gint              *segment_indices;
+  gint               max_n_segment_indices;
+
+  /* The number of segment indices actually in use */
+  gint               n_segment_indices;
+
+  /* Is the polygon closed? */
+  gboolean           polygon_closed;
+
+  /* Whether or not to constrain the angle for newly created polygonal
+   * segments.
+   */
+  gboolean           constrain_angle;
+
+  /* Whether or not to suppress handles (so that new segments can be
+   * created immediately after an existing segment vertex.
+   */
+  gboolean           suppress_handles;
+
+  /* Last _oper_update or _motion coords */
+  gboolean           hover;
+  GimpVector2        last_coords;
+
+  /* A double-click commits the selection, keep track of last
+   * click-time and click-position.
+   */
+  guint32            last_click_time;
+  GimpCoords         last_click_coord;
+
+  /* Are we in a click-drag-release? */
+  gboolean           button_down;
+
+  GimpCanvasItem    *polygon;
+  GimpCanvasItem    *pending_line;
+  GimpCanvasItem    *closing_line;
+  GPtrArray         *handles;
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_polygon_constructed     (GObject               *object);
+static void     gimp_tool_polygon_finalize        (GObject               *object);
+static void     gimp_tool_polygon_set_property    (GObject               *object,
+                                                   guint                  property_id,
+                                                   const GValue          *value,
+                                                   GParamSpec            *pspec);
+static void     gimp_tool_polygon_get_property    (GObject               *object,
+                                                   guint                  property_id,
+                                                   GValue                *value,
+                                                   GParamSpec            *pspec);
+
+static void     gimp_tool_polygon_changed         (GimpToolWidget        *widget);
+static gint     gimp_tool_polygon_button_press    (GimpToolWidget        *widget,
+                                                   const GimpCoords      *coords,
+                                                   guint32                time,
+                                                   GdkModifierType        state,
+                                                   GimpButtonPressType    press_type);
+static void     gimp_tool_polygon_button_release  (GimpToolWidget        *widget,
+                                                   const GimpCoords      *coords,
+                                                   guint32                time,
+                                                   GdkModifierType        state,
+                                                   GimpButtonReleaseType  release_type);
+static void     gimp_tool_polygon_motion          (GimpToolWidget        *widget,
+                                                   const GimpCoords      *coords,
+                                                   guint32                time,
+                                                   GdkModifierType        state);
+static GimpHit  gimp_tool_polygon_hit             (GimpToolWidget        *widget,
+                                                   const GimpCoords      *coords,
+                                                   GdkModifierType        state,
+                                                   gboolean               proximity);
+static void     gimp_tool_polygon_hover           (GimpToolWidget        *widget,
+                                                   const GimpCoords      *coords,
+                                                   GdkModifierType        state,
+                                                   gboolean               proximity);
+static void     gimp_tool_polygon_leave_notify    (GimpToolWidget        *widget);
+static gboolean gimp_tool_polygon_key_press       (GimpToolWidget        *widget,
+                                                   GdkEventKey           *kevent);
+static void     gimp_tool_polygon_motion_modifier (GimpToolWidget        *widget,
+                                                   GdkModifierType        key,
+                                                   gboolean               press,
+                                                   GdkModifierType        state);
+static void     gimp_tool_polygon_hover_modifier  (GimpToolWidget        *widget,
+                                                   GdkModifierType        key,
+                                                   gboolean               press,
+                                                   GdkModifierType        state);
+static gboolean gimp_tool_polygon_get_cursor      (GimpToolWidget        *widget,
+                                                   const GimpCoords      *coords,
+                                                   GdkModifierType        state,
+                                                   GimpCursorType        *cursor,
+                                                   GimpToolCursorType    *tool_cursor,
+                                                   GimpCursorModifier    *modifier);
+
+static void     gimp_tool_polygon_change_complete (GimpToolPolygon       *polygon);
+
+static gint   gimp_tool_polygon_get_segment_index (GimpToolPolygon       *polygon,
+                                                   const GimpCoords      *coords);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolPolygon, gimp_tool_polygon,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_polygon_parent_class
+
+static guint polygon_signals[LAST_SIGNAL] = { 0, };
+
+static const GimpVector2 vector2_zero = { 0.0, 0.0 };
+
+
+static void
+gimp_tool_polygon_class_init (GimpToolPolygonClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_polygon_constructed;
+  object_class->finalize        = gimp_tool_polygon_finalize;
+  object_class->set_property    = gimp_tool_polygon_set_property;
+  object_class->get_property    = gimp_tool_polygon_get_property;
+
+  widget_class->changed         = gimp_tool_polygon_changed;
+  widget_class->button_press    = gimp_tool_polygon_button_press;
+  widget_class->button_release  = gimp_tool_polygon_button_release;
+  widget_class->motion          = gimp_tool_polygon_motion;
+  widget_class->hit             = gimp_tool_polygon_hit;
+  widget_class->hover           = gimp_tool_polygon_hover;
+  widget_class->leave_notify    = gimp_tool_polygon_leave_notify;
+  widget_class->key_press       = gimp_tool_polygon_key_press;
+  widget_class->motion_modifier = gimp_tool_polygon_motion_modifier;
+  widget_class->hover_modifier  = gimp_tool_polygon_hover_modifier;
+  widget_class->get_cursor      = gimp_tool_polygon_get_cursor;
+
+  polygon_signals[CHANGE_COMPLETE] =
+    g_signal_new ("change-complete",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolPolygonClass, change_complete),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+}
+
+static void
+gimp_tool_polygon_init (GimpToolPolygon *polygon)
+{
+  polygon->private = gimp_tool_polygon_get_instance_private (polygon);
+
+  polygon->private->grabbed_segment_index = INVALID_INDEX;
+  polygon->private->last_click_time       = NO_CLICK_TIME_AVAILABLE;
+}
+
+static void
+gimp_tool_polygon_constructed (GObject *object)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (object);
+  GimpToolWidget         *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolPolygonPrivate *private = polygon->private;
+  GimpCanvasGroup        *stroke_group;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  stroke_group = gimp_tool_widget_add_stroke_group (widget);
+
+  gimp_tool_widget_push_group (widget, stroke_group);
+
+  private->polygon = gimp_tool_widget_add_polygon (widget, NULL,
+                                                   NULL, 0, FALSE);
+
+  private->pending_line = gimp_tool_widget_add_line (widget, 0, 0, 0, 0);
+  private->closing_line = gimp_tool_widget_add_line (widget, 0, 0, 0, 0);
+
+  gimp_tool_widget_pop_group (widget);
+
+  private->handles = g_ptr_array_new ();
+
+  gimp_tool_polygon_changed (widget);
+}
+
+static void
+gimp_tool_polygon_finalize (GObject *object)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (object);
+  GimpToolPolygonPrivate *private = polygon->private;
+
+  g_free (private->points);
+  g_free (private->segment_indices);
+  g_free (private->saved_points_lower_segment);
+  g_free (private->saved_points_higher_segment);
+
+  g_clear_pointer (&private->handles, g_ptr_array_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_polygon_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_polygon_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_polygon_get_segment (GimpToolPolygon  *polygon,
+                               GimpVector2     **points,
+                               gint             *n_points,
+                               gint              segment_start,
+                               gint              segment_end)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  *points   = &priv->points[priv->segment_indices[segment_start]];
+  *n_points = priv->segment_indices[segment_end] -
+              priv->segment_indices[segment_start] +
+              1;
+}
+
+static void
+gimp_tool_polygon_get_segment_point (GimpToolPolygon *polygon,
+                                     gdouble         *start_point_x,
+                                     gdouble         *start_point_y,
+                                     gint             segment_index)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  *start_point_x = priv->points[priv->segment_indices[segment_index]].x;
+  *start_point_y = priv->points[priv->segment_indices[segment_index]].y;
+}
+
+static gboolean
+gimp_tool_polygon_should_close (GimpToolPolygon  *polygon,
+                                guint32           time,
+                                const GimpCoords *coords)
+{
+  GimpToolWidget         *widget       = GIMP_TOOL_WIDGET (polygon);
+  GimpToolPolygonPrivate *priv         = polygon->private;
+  gboolean                double_click = FALSE;
+  gdouble                 dist;
+
+  if (priv->polygon_modified      ||
+      priv->n_segment_indices < 1 ||
+      priv->n_points          < 3 ||
+      priv->polygon_closed)
+    return FALSE;
+
+  dist = gimp_canvas_item_transform_distance_square (priv->polygon,
+                                                     coords->x,
+                                                     coords->y,
+                                                     priv->points[0].x,
+                                                     priv->points[0].y);
+
+  /* Handle double-click. It must be within GTK+ global double-click
+   * time since last click, and it must be within GTK+ global
+   * double-click distance away from the last point
+   */
+  if (time != NO_CLICK_TIME_AVAILABLE)
+    {
+      GimpDisplayShell *shell    = gimp_tool_widget_get_shell (widget);
+      GtkSettings      *settings = gtk_widget_get_settings (GTK_WIDGET (shell));
+      gint              double_click_time;
+      gint              double_click_distance;
+      gint              click_time_passed;
+      gdouble           dist_from_last_point;
+
+      click_time_passed = time - priv->last_click_time;
+
+      dist_from_last_point =
+        gimp_canvas_item_transform_distance_square (priv->polygon,
+                                                    coords->x,
+                                                    coords->y,
+                                                    priv->last_click_coord.x,
+                                                    priv->last_click_coord.y);
+
+      g_object_get (settings,
+                    "gtk-double-click-time",     &double_click_time,
+                    "gtk-double-click-distance", &double_click_distance,
+                    NULL);
+
+      double_click = click_time_passed    < double_click_time &&
+                     dist_from_last_point < double_click_distance;
+    }
+
+  return ((! priv->suppress_handles && dist < POINT_GRAB_THRESHOLD_SQ) ||
+          double_click);
+}
+
+static void
+gimp_tool_polygon_revert_to_last_segment (GimpToolPolygon *polygon)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  priv->n_points = priv->segment_indices[priv->n_segment_indices - 1] + 1;
+}
+
+static void
+gimp_tool_polygon_remove_last_segment (GimpToolPolygon *polygon)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  if (priv->polygon_closed)
+    {
+      priv->polygon_closed = FALSE;
+
+      gimp_tool_polygon_changed (GIMP_TOOL_WIDGET (polygon));
+
+      return;
+    }
+
+  if (priv->n_segment_indices > 0)
+    {
+      GimpCanvasItem *handle;
+
+      priv->n_segment_indices--;
+
+      handle = g_ptr_array_index (priv->handles,
+                                  priv->n_segment_indices);
+
+      gimp_tool_widget_remove_item (GIMP_TOOL_WIDGET (polygon), handle);
+      g_ptr_array_remove (priv->handles, handle);
+    }
+
+  if (priv->n_segment_indices <= 0)
+    {
+      priv->grabbed_segment_index = INVALID_INDEX;
+      priv->show_pending_point    = FALSE;
+      priv->n_points              = 0;
+      priv->n_segment_indices     = 0;
+
+      gimp_tool_widget_response (GIMP_TOOL_WIDGET (polygon),
+                                 GIMP_TOOL_WIDGET_RESPONSE_CANCEL);
+    }
+  else
+    {
+      gimp_tool_polygon_revert_to_last_segment (polygon);
+
+      gimp_tool_polygon_changed (GIMP_TOOL_WIDGET (polygon));
+    }
+}
+
+static void
+gimp_tool_polygon_add_point (GimpToolPolygon *polygon,
+                             gdouble          x,
+                             gdouble          y)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  if (priv->n_points >= priv->max_n_points)
+    {
+      priv->max_n_points += N_ITEMS_PER_ALLOC;
+
+      priv->points = g_realloc (priv->points,
+                                sizeof (GimpVector2) * priv->max_n_points);
+    }
+
+  priv->points[priv->n_points].x = x;
+  priv->points[priv->n_points].y = y;
+
+  priv->n_points++;
+}
+
+static void
+gimp_tool_polygon_add_segment_index (GimpToolPolygon *polygon,
+                                     gint             index)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  if (priv->n_segment_indices >= priv->max_n_segment_indices)
+    {
+      priv->max_n_segment_indices += N_ITEMS_PER_ALLOC;
+
+      priv->segment_indices = g_realloc (priv->segment_indices,
+                                         sizeof (GimpVector2) *
+                                         priv->max_n_segment_indices);
+    }
+
+  priv->segment_indices[priv->n_segment_indices] = index;
+
+  g_ptr_array_add (priv->handles,
+                   gimp_tool_widget_add_handle (GIMP_TOOL_WIDGET (polygon),
+                                                GIMP_HANDLE_CROSS,
+                                                0, 0,
+                                                GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                GIMP_HANDLE_ANCHOR_CENTER));
+
+  priv->n_segment_indices++;
+}
+
+static gboolean
+gimp_tool_polygon_is_point_grabbed (GimpToolPolygon *polygon)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  return priv->grabbed_segment_index != INVALID_INDEX;
+}
+
+static void
+gimp_tool_polygon_fit_segment (GimpToolPolygon   *polygon,
+                               GimpVector2       *dest_points,
+                               GimpVector2        dest_start_target,
+                               GimpVector2        dest_end_target,
+                               const GimpVector2 *source_points,
+                               gint               n_points)
+{
+  GimpVector2 origo_translation_offset;
+  GimpVector2 untranslation_offset;
+  gdouble     rotation;
+  gdouble     scale;
+
+  /* Handle some quick special cases */
+  if (n_points <= 0)
+    {
+      return;
+    }
+  else if (n_points == 1)
+    {
+      dest_points[0] = dest_end_target;
+      return;
+    }
+  else if (n_points == 2)
+    {
+      dest_points[0] = dest_start_target;
+      dest_points[1] = dest_end_target;
+      return;
+    }
+
+  /* Copy from source to dest; we work on the dest data */
+  memcpy (dest_points, source_points, sizeof (GimpVector2) * n_points);
+
+  /* Transform the destination end point */
+  {
+    GimpVector2 *dest_end;
+    GimpVector2  origo_translated_end_target;
+    gdouble      target_rotation;
+    gdouble      current_rotation;
+    gdouble      target_length;
+    gdouble      current_length;
+
+    dest_end = &dest_points[n_points - 1];
+
+    /* Transate to origin */
+    gimp_vector2_sub (&origo_translation_offset,
+                      &vector2_zero,
+                      &dest_points[0]);
+    gimp_vector2_add (dest_end,
+                      dest_end,
+                      &origo_translation_offset);
+
+    /* Calculate origo_translated_end_target */
+    gimp_vector2_sub (&origo_translated_end_target,
+                      &dest_end_target,
+                      &dest_start_target);
+
+    /* Rotate */
+    target_rotation  = atan2 (vector2_zero.y - origo_translated_end_target.y,
+                              vector2_zero.x - origo_translated_end_target.x);
+    current_rotation = atan2 (vector2_zero.y - dest_end->y,
+                              vector2_zero.x - dest_end->x);
+    rotation         = current_rotation - target_rotation;
+
+    gimp_vector2_rotate (dest_end, rotation);
+
+
+    /* Scale */
+    target_length  = gimp_vector2_length (&origo_translated_end_target);
+    current_length = gimp_vector2_length (dest_end);
+    scale          = target_length / current_length;
+
+    gimp_vector2_mul (dest_end, scale);
+
+
+    /* Untranslate */
+    gimp_vector2_sub (&untranslation_offset,
+                      &dest_end_target,
+                      dest_end);
+    gimp_vector2_add (dest_end,
+                      dest_end,
+                      &untranslation_offset);
+  }
+
+  /* Do the same transformation for the rest of the points */
+  {
+    gint i;
+
+    for (i = 0; i < n_points - 1; i++)
+      {
+        /* Translate */
+        gimp_vector2_add (&dest_points[i],
+                          &origo_translation_offset,
+                          &dest_points[i]);
+
+        /* Rotate */
+        gimp_vector2_rotate (&dest_points[i],
+                             rotation);
+
+        /* Scale */
+        gimp_vector2_mul (&dest_points[i],
+                          scale);
+
+        /* Untranslate */
+        gimp_vector2_add (&dest_points[i],
+                          &dest_points[i],
+                          &untranslation_offset);
+      }
+  }
+}
+
+static void
+gimp_tool_polygon_move_segment_vertex_to (GimpToolPolygon *polygon,
+                                          gint             segment_index,
+                                          gdouble          new_x,
+                                          gdouble          new_y)
+{
+  GimpToolPolygonPrivate *priv         = polygon->private;
+  GimpVector2             cursor_point = { new_x, new_y };
+  GimpVector2            *dest;
+  GimpVector2            *dest_start_target;
+  GimpVector2            *dest_end_target;
+  gint                    n_points;
+
+  /* Handle the segment before the grabbed point */
+  if (segment_index > 0)
+    {
+      gimp_tool_polygon_get_segment (polygon,
+                                     &dest,
+                                     &n_points,
+                                     priv->grabbed_segment_index - 1,
+                                     priv->grabbed_segment_index);
+
+      dest_start_target = &dest[0];
+      dest_end_target   = &cursor_point;
+
+      gimp_tool_polygon_fit_segment (polygon,
+                                     dest,
+                                     *dest_start_target,
+                                     *dest_end_target,
+                                     priv->saved_points_lower_segment,
+                                     n_points);
+    }
+
+  /* Handle the segment after the grabbed point */
+  if (segment_index < priv->n_segment_indices - 1)
+    {
+      gimp_tool_polygon_get_segment (polygon,
+                                     &dest,
+                                     &n_points,
+                                     priv->grabbed_segment_index,
+                                     priv->grabbed_segment_index + 1);
+
+      dest_start_target = &cursor_point;
+      dest_end_target   = &dest[n_points - 1];
+
+      gimp_tool_polygon_fit_segment (polygon,
+                                     dest,
+                                     *dest_start_target,
+                                     *dest_end_target,
+                                     priv->saved_points_higher_segment,
+                                     n_points);
+    }
+
+  /* Handle when there only is one point */
+  if (segment_index == 0 &&
+      priv->n_segment_indices == 1)
+    {
+      priv->points[0].x = new_x;
+      priv->points[0].y = new_y;
+    }
+}
+
+static void
+gimp_tool_polygon_revert_to_saved_state (GimpToolPolygon *polygon)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+  GimpVector2            *dest;
+  gint                    n_points;
+
+  /* Without a point grab we have no sensible information to fall back
+   * on, bail out
+   */
+  if (! gimp_tool_polygon_is_point_grabbed (polygon))
+    {
+      return;
+    }
+
+  if (priv->grabbed_segment_index > 0)
+    {
+      gimp_tool_polygon_get_segment (polygon,
+                                     &dest,
+                                     &n_points,
+                                     priv->grabbed_segment_index - 1,
+                                     priv->grabbed_segment_index);
+
+      memcpy (dest,
+              priv->saved_points_lower_segment,
+              sizeof (GimpVector2) * n_points);
+    }
+
+  if (priv->grabbed_segment_index < priv->n_segment_indices - 1)
+    {
+      gimp_tool_polygon_get_segment (polygon,
+                                     &dest,
+                                     &n_points,
+                                     priv->grabbed_segment_index,
+                                     priv->grabbed_segment_index + 1);
+
+      memcpy (dest,
+              priv->saved_points_higher_segment,
+              sizeof (GimpVector2) * n_points);
+    }
+
+  if (priv->grabbed_segment_index == 0 &&
+      priv->n_segment_indices     == 1)
+    {
+      priv->points[0] = *priv->saved_points_lower_segment;
+    }
+}
+
+static void
+gimp_tool_polygon_prepare_for_move (GimpToolPolygon *polygon)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+  GimpVector2            *source;
+  gint                    n_points;
+
+  if (priv->grabbed_segment_index > 0)
+    {
+      gimp_tool_polygon_get_segment (polygon,
+                                     &source,
+                                     &n_points,
+                                     priv->grabbed_segment_index - 1,
+                                     priv->grabbed_segment_index);
+
+      if (n_points > priv->max_n_saved_points_lower_segment)
+        {
+          priv->max_n_saved_points_lower_segment = n_points;
+
+          priv->saved_points_lower_segment =
+            g_realloc (priv->saved_points_lower_segment,
+                       sizeof (GimpVector2) * n_points);
+        }
+
+      memcpy (priv->saved_points_lower_segment,
+              source,
+              sizeof (GimpVector2) * n_points);
+    }
+
+  if (priv->grabbed_segment_index < priv->n_segment_indices - 1)
+    {
+      gimp_tool_polygon_get_segment (polygon,
+                                     &source,
+                                     &n_points,
+                                     priv->grabbed_segment_index,
+                                     priv->grabbed_segment_index + 1);
+
+      if (n_points > priv->max_n_saved_points_higher_segment)
+        {
+          priv->max_n_saved_points_higher_segment = n_points;
+
+          priv->saved_points_higher_segment =
+            g_realloc (priv->saved_points_higher_segment,
+                       sizeof (GimpVector2) * n_points);
+        }
+
+      memcpy (priv->saved_points_higher_segment,
+              source,
+              sizeof (GimpVector2) * n_points);
+    }
+
+  /* A special-case when there only is one point */
+  if (priv->grabbed_segment_index == 0 &&
+      priv->n_segment_indices     == 1)
+    {
+      if (priv->max_n_saved_points_lower_segment == 0)
+        {
+          priv->max_n_saved_points_lower_segment = 1;
+
+          priv->saved_points_lower_segment = g_new0 (GimpVector2, 1);
+        }
+
+      *priv->saved_points_lower_segment = priv->points[0];
+    }
+}
+
+static void
+gimp_tool_polygon_update_motion (GimpToolPolygon *polygon,
+                                 gdouble          new_x,
+                                 gdouble          new_y)
+{
+  GimpToolPolygonPrivate *priv = polygon->private;
+
+  if (gimp_tool_polygon_is_point_grabbed (polygon))
+    {
+      priv->polygon_modified = TRUE;
+
+      if (priv->constrain_angle &&
+          priv->n_segment_indices > 1)
+        {
+          gdouble start_point_x;
+          gdouble start_point_y;
+          gint    segment_index;
+
+          /* Base constraints on the last segment vertex if we move
+           * the first one, otherwise base on the previous segment
+           * vertex
+           */
+          if (priv->grabbed_segment_index == 0)
+            {
+              segment_index = priv->n_segment_indices - 1;
+            }
+          else
+            {
+              segment_index = priv->grabbed_segment_index - 1;
+            }
+
+          gimp_tool_polygon_get_segment_point (polygon,
+                                               &start_point_x,
+                                               &start_point_y,
+                                               segment_index);
+
+          gimp_display_shell_constrain_line (
+            gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (polygon)),
+            start_point_x,
+            start_point_y,
+            &new_x,
+            &new_y,
+            GIMP_CONSTRAIN_LINE_15_DEGREES);
+        }
+
+      gimp_tool_polygon_move_segment_vertex_to (polygon,
+                                                priv->grabbed_segment_index,
+                                                new_x,
+                                                new_y);
+
+      /* We also must update the pending point if we are moving the
+       * first point
+       */
+      if (priv->grabbed_segment_index == 0)
+        {
+          priv->pending_point.x = new_x;
+          priv->pending_point.y = new_y;
+        }
+    }
+  else
+    {
+      /* Don't show the pending point while we are adding points */
+      priv->show_pending_point = FALSE;
+
+      gimp_tool_polygon_add_point (polygon, new_x, new_y);
+    }
+}
+
+static void
+gimp_tool_polygon_status_update (GimpToolPolygon  *polygon,
+                                 const GimpCoords *coords,
+                                 gboolean          proximity)
+{
+  GimpToolWidget         *widget = GIMP_TOOL_WIDGET (polygon);
+  GimpToolPolygonPrivate *priv   = polygon->private;
+
+  if (proximity)
+    {
+      const gchar *status_text = NULL;
+
+      if (gimp_tool_polygon_is_point_grabbed (polygon))
+        {
+          if (gimp_tool_polygon_should_close (polygon,
+                                              NO_CLICK_TIME_AVAILABLE,
+                                              coords))
+            {
+              status_text = _("Click to close shape");
+            }
+          else
+            {
+              status_text = _("Click-Drag to move segment vertex");
+            }
+        }
+      else if (priv->polygon_closed)
+        {
+          status_text = _("Return commits, Escape cancels, Backspace re-opens shape");
+        }
+      else if (priv->n_segment_indices >= 3)
+        {
+          status_text = _("Return commits, Escape cancels, Backspace removes last segment");
+        }
+      else
+        {
+          status_text = _("Click-Drag adds a free segment, Click adds a polygonal segment");
+        }
+
+      if (status_text)
+        {
+          gimp_tool_widget_set_status (widget, status_text);
+        }
+    }
+  else
+    {
+      gimp_tool_widget_set_status (widget, NULL);
+    }
+}
+
+static void
+gimp_tool_polygon_changed (GimpToolWidget *widget)
+{
+  GimpToolPolygon        *polygon               = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *private               = polygon->private;
+  gboolean                hovering_first_point  = FALSE;
+  gboolean                handles_wants_to_show = FALSE;
+  GimpCoords              coords                = { private->last_coords.x,
+                                                    private->last_coords.y,
+                                                    /* pad with 0 */ };
+  gint                    i;
+
+  gimp_canvas_polygon_set_points (private->polygon,
+                                  private->points, private->n_points);
+
+  if (private->show_pending_point)
+    {
+      GimpVector2 last = private->points[private->n_points - 1];
+
+      gimp_canvas_line_set (private->pending_line,
+                            last.x,
+                            last.y,
+                            private->pending_point.x,
+                            private->pending_point.y);
+    }
+
+  gimp_canvas_item_set_visible (private->pending_line,
+                                private->show_pending_point);
+
+  if (private->polygon_closed)
+    {
+      GimpVector2 first = private->points[0];
+      GimpVector2 last  = private->points[private->n_points - 1];
+
+      gimp_canvas_line_set (private->closing_line,
+                            first.x, first.y,
+                            last.x,  last.y);
+    }
+
+  gimp_canvas_item_set_visible (private->closing_line,
+                                private->polygon_closed);
+
+  hovering_first_point =
+    gimp_tool_polygon_should_close (polygon,
+                                    NO_CLICK_TIME_AVAILABLE,
+                                    &coords);
+
+  /* We always show the handle for the first point, even with button1
+   * down, since releasing the button on the first point will close
+   * the polygon, so it's a significant state which we must give
+   * feedback for
+   */
+  handles_wants_to_show = (hovering_first_point || ! private->button_down);
+
+  for (i = 0; i < private->n_segment_indices; i++)
+    {
+      GimpCanvasItem *handle;
+      GimpVector2    *point;
+
+      handle = g_ptr_array_index (private->handles, i);
+      point  = &private->points[private->segment_indices[i]];
+
+      if (private->hover             &&
+          handles_wants_to_show      &&
+          ! private->suppress_handles &&
+
+          /* If the first point is hovered while button1 is held down,
+           * only draw the first handle, the other handles are not
+           * relevant (see comment a few lines up)
+           */
+          (i == 0 ||
+           ! (private->button_down || hovering_first_point)))
+        {
+          gdouble         dist;
+          GimpHandleType  handle_type = -1;
+
+          dist =
+            gimp_canvas_item_transform_distance_square (handle,
+                                                        private->last_coords.x,
+                                                        private->last_coords.y,
+                                                        point->x,
+                                                        point->y);
+
+          /* If the cursor is over the point, fill, if it's just
+           * close, draw an outline
+           */
+          if (dist < POINT_GRAB_THRESHOLD_SQ)
+            handle_type = GIMP_HANDLE_FILLED_CIRCLE;
+          else if (dist < POINT_SHOW_THRESHOLD_SQ)
+            handle_type = GIMP_HANDLE_CIRCLE;
+
+          if (handle_type != -1)
+            {
+              gint size;
+
+              gimp_canvas_item_begin_change (handle);
+
+              gimp_canvas_handle_set_position (handle, point->x, point->y);
+
+              g_object_set (handle,
+                            "type", handle_type,
+                            NULL);
+
+              size = gimp_canvas_handle_calc_size (handle,
+                                                   private->last_coords.x,
+                                                   private->last_coords.y,
+                                                   GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
+                                                   2 * GIMP_CANVAS_HANDLE_SIZE_CIRCLE);
+              if (FALSE)
+                gimp_canvas_handle_set_size (handle, size, size);
+
+              if (dist < POINT_GRAB_THRESHOLD_SQ)
+                gimp_canvas_item_set_highlight (handle, TRUE);
+              else
+                gimp_canvas_item_set_highlight (handle, FALSE);
+
+              gimp_canvas_item_set_visible (handle, TRUE);
+
+              gimp_canvas_item_end_change (handle);
+            }
+          else
+            {
+              gimp_canvas_item_set_visible (handle, FALSE);
+            }
+        }
+      else
+        {
+          gimp_canvas_item_set_visible (handle, FALSE);
+       }
+    }
+}
+
+static gboolean
+gimp_tool_polygon_button_press (GimpToolWidget      *widget,
+                                const GimpCoords    *coords,
+                                guint32              time,
+                                GdkModifierType      state,
+                                GimpButtonPressType  press_type)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  if (gimp_tool_polygon_is_point_grabbed (polygon))
+    {
+      gimp_tool_polygon_prepare_for_move (polygon);
+    }
+  else if (priv->polygon_closed)
+    {
+      if (press_type == GIMP_BUTTON_PRESS_DOUBLE &&
+          gimp_canvas_item_hit (priv->polygon, coords->x, coords->y))
+        {
+          gimp_tool_widget_response (widget, GIMP_TOOL_WIDGET_RESPONSE_CONFIRM);
+        }
+
+      return 0;
+    }
+  else
+    {
+      GimpVector2 point_to_add;
+
+      /* Note that we add the pending point (unless it is the first
+       * point we add) because the pending point is setup correctly
+       * with regards to angle constraints.
+       */
+      if (priv->n_points > 0)
+        {
+          point_to_add = priv->pending_point;
+        }
+      else
+        {
+          point_to_add.x = coords->x;
+          point_to_add.y = coords->y;
+        }
+
+      /* No point was grabbed, add a new point and mark this as a
+       * segment divider. For a line segment, this will be the only
+       * new point. For a free segment, this will be the first point
+       * of the free segment.
+       */
+      gimp_tool_polygon_add_point (polygon,
+                                   point_to_add.x,
+                                   point_to_add.y);
+      gimp_tool_polygon_add_segment_index (polygon, priv->n_points - 1);
+    }
+
+  priv->button_down = TRUE;
+
+  gimp_tool_polygon_changed (widget);
+
+  return 1;
+}
+
+static void
+gimp_tool_polygon_button_release (GimpToolWidget        *widget,
+                                  const GimpCoords      *coords,
+                                  guint32                time,
+                                  GdkModifierType        state,
+                                  GimpButtonReleaseType  release_type)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  g_object_ref (widget);
+
+  priv->button_down = FALSE;
+
+  switch (release_type)
+    {
+    case GIMP_BUTTON_RELEASE_CLICK:
+    case GIMP_BUTTON_RELEASE_NO_MOTION:
+      /* If a click was made, we don't consider the polygon modified */
+      priv->polygon_modified = FALSE;
+
+      /* First finish of the line segment if no point was grabbed */
+      if (! gimp_tool_polygon_is_point_grabbed (polygon))
+        {
+          /* Revert any free segment points that might have been added */
+          gimp_tool_polygon_revert_to_last_segment (polygon);
+        }
+
+      /* After the segments are up to date and we have handled
+       * double-click, see if it's committing time
+       */
+      if (gimp_tool_polygon_should_close (polygon, time, coords))
+        {
+          /* We can get a click notification even though the end point
+           * has been moved a few pixels. Since a move will change the
+           * free selection, revert it before doing the commit.
+           */
+          gimp_tool_polygon_revert_to_saved_state (polygon);
+
+          priv->polygon_closed = TRUE;
+
+          gimp_tool_polygon_change_complete (polygon);
+        }
+
+      priv->last_click_time  = time;
+      priv->last_click_coord = *coords;
+      break;
+
+    case GIMP_BUTTON_RELEASE_NORMAL:
+      /* First finish of the free segment if no point was grabbed */
+      if (! gimp_tool_polygon_is_point_grabbed (polygon))
+        {
+          /* The points are all setup, just make a segment */
+          gimp_tool_polygon_add_segment_index (polygon, priv->n_points - 1);
+        }
+
+      /* After the segments are up to date, see if it's committing time */
+      if (gimp_tool_polygon_should_close (polygon,
+                                          NO_CLICK_TIME_AVAILABLE,
+                                          coords))
+        {
+          priv->polygon_closed = TRUE;
+        }
+
+      gimp_tool_polygon_change_complete (polygon);
+      break;
+
+    case GIMP_BUTTON_RELEASE_CANCEL:
+      if (gimp_tool_polygon_is_point_grabbed (polygon))
+        gimp_tool_polygon_revert_to_saved_state (polygon);
+      else
+        gimp_tool_polygon_remove_last_segment (polygon);
+      break;
+
+    default:
+      break;
+    }
+
+  /* Reset */
+  priv->polygon_modified = FALSE;
+
+  gimp_tool_polygon_changed (widget);
+
+  g_object_unref (widget);
+}
+
+static void
+gimp_tool_polygon_motion (GimpToolWidget   *widget,
+                          const GimpCoords *coords,
+                          guint32           time,
+                          GdkModifierType   state)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  priv->last_coords.x = coords->x;
+  priv->last_coords.y = coords->y;
+
+  gimp_tool_polygon_update_motion (polygon,
+                                   coords->x,
+                                   coords->y);
+
+  gimp_tool_polygon_changed (widget);
+}
+
+static GimpHit
+gimp_tool_polygon_hit (GimpToolWidget   *widget,
+                       const GimpCoords *coords,
+                       GdkModifierType   state,
+                       gboolean          proximity)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  if ((priv->n_points > 0 && ! priv->polygon_closed) ||
+      gimp_tool_polygon_get_segment_index (polygon, coords) != INVALID_INDEX)
+    {
+      return GIMP_HIT_DIRECT;
+    }
+  else if (priv->polygon_closed &&
+           gimp_canvas_item_hit (priv->polygon, coords->x, coords->y))
+    {
+      return GIMP_HIT_INDIRECT;
+    }
+
+  return GIMP_HIT_NONE;
+}
+
+static void
+gimp_tool_polygon_hover (GimpToolWidget   *widget,
+                         const GimpCoords *coords,
+                         GdkModifierType   state,
+                         gboolean          proximity)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+  gboolean                hovering_first_point;
+
+  priv->grabbed_segment_index = gimp_tool_polygon_get_segment_index (polygon,
+                                                                     coords);
+  priv->hover                 = TRUE;
+
+  hovering_first_point =
+    gimp_tool_polygon_should_close (polygon,
+                                    NO_CLICK_TIME_AVAILABLE,
+                                    coords);
+
+  priv->last_coords.x = coords->x;
+  priv->last_coords.y = coords->y;
+
+  if (priv->n_points == 0  ||
+      priv->polygon_closed ||
+      (gimp_tool_polygon_is_point_grabbed (polygon) &&
+       ! hovering_first_point) ||
+      ! proximity)
+    {
+      priv->show_pending_point = FALSE;
+    }
+  else
+    {
+      priv->show_pending_point = TRUE;
+
+      if (hovering_first_point)
+        {
+          priv->pending_point = priv->points[0];
+        }
+      else
+        {
+          priv->pending_point.x = coords->x;
+          priv->pending_point.y = coords->y;
+
+          if (priv->constrain_angle && priv->n_points > 0)
+            {
+              gdouble start_point_x;
+              gdouble start_point_y;
+
+              /*  the last point is the line's start point  */
+              gimp_tool_polygon_get_segment_point (polygon,
+                                                   &start_point_x,
+                                                   &start_point_y,
+                                                   priv->n_segment_indices - 1);
+
+              gimp_display_shell_constrain_line (
+                gimp_tool_widget_get_shell (widget),
+                start_point_x, start_point_y,
+                &priv->pending_point.x,
+                &priv->pending_point.y,
+                GIMP_CONSTRAIN_LINE_15_DEGREES);
+            }
+        }
+    }
+
+  gimp_tool_polygon_status_update (polygon, coords, proximity);
+
+  gimp_tool_polygon_changed (widget);
+}
+
+static void
+gimp_tool_polygon_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  priv->grabbed_segment_index = INVALID_INDEX;
+  priv->hover                 = FALSE;
+  priv->show_pending_point    = FALSE;
+
+  gimp_tool_polygon_changed (widget);
+}
+
+static gboolean
+gimp_tool_polygon_key_press (GimpToolWidget *widget,
+                             GdkEventKey    *kevent)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_BackSpace:
+      gimp_tool_polygon_remove_last_segment (polygon);
+
+      if (priv->n_segment_indices > 0)
+        gimp_tool_polygon_change_complete (polygon);
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return GIMP_TOOL_WIDGET_CLASS (parent_class)->key_press (widget, kevent);
+}
+
+static void
+gimp_tool_polygon_motion_modifier (GimpToolWidget  *widget,
+                                   GdkModifierType  key,
+                                   gboolean         press,
+                                   GdkModifierType  state)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  priv->constrain_angle = ((state & gimp_get_constrain_behavior_mask ()) ?
+                           TRUE : FALSE);
+
+  /* If we didn't came here due to a mouse release, immediately update
+   * the position of the thing we move.
+   */
+  if (state & GDK_BUTTON1_MASK)
+    {
+      gimp_tool_polygon_update_motion (polygon,
+                                       priv->last_coords.x,
+                                       priv->last_coords.y);
+    }
+
+  gimp_tool_polygon_changed (widget);
+}
+
+static void
+gimp_tool_polygon_hover_modifier (GimpToolWidget  *widget,
+                                  GdkModifierType  key,
+                                  gboolean         press,
+                                  GdkModifierType  state)
+{
+  GimpToolPolygon        *polygon = GIMP_TOOL_POLYGON (widget);
+  GimpToolPolygonPrivate *priv    = polygon->private;
+
+  priv->constrain_angle = ((state & gimp_get_constrain_behavior_mask ()) ?
+                           TRUE : FALSE);
+
+  priv->suppress_handles = ((state & gimp_get_extend_selection_mask ()) ?
+                           TRUE : FALSE);
+
+  gimp_tool_polygon_changed (widget);
+}
+
+static gboolean
+gimp_tool_polygon_get_cursor (GimpToolWidget     *widget,
+                              const GimpCoords   *coords,
+                              GdkModifierType     state,
+                              GimpCursorType     *cursor,
+                              GimpToolCursorType *tool_cursor,
+                              GimpCursorModifier *modifier)
+{
+  GimpToolPolygon *polygon = GIMP_TOOL_POLYGON (widget);
+
+  if (gimp_tool_polygon_is_point_grabbed (polygon) &&
+      ! gimp_tool_polygon_should_close (polygon,
+                                        NO_CLICK_TIME_AVAILABLE,
+                                        coords))
+    {
+      *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_polygon_change_complete (GimpToolPolygon *polygon)
+{
+  g_signal_emit (polygon, polygon_signals[CHANGE_COMPLETE], 0);
+}
+
+static gint
+gimp_tool_polygon_get_segment_index (GimpToolPolygon  *polygon,
+                                     const GimpCoords *coords)
+{
+  GimpToolPolygonPrivate *priv          = polygon->private;
+  gint                    segment_index = INVALID_INDEX;
+
+  if (! priv->suppress_handles)
+    {
+      gdouble shortest_dist = POINT_GRAB_THRESHOLD_SQ;
+      gint    i;
+
+      for (i = 0; i < priv->n_segment_indices; i++)
+        {
+          gdouble      dist;
+          GimpVector2 *point;
+
+          point = &priv->points[priv->segment_indices[i]];
+
+          dist = gimp_canvas_item_transform_distance_square (priv->polygon,
+                                                             coords->x,
+                                                             coords->y,
+                                                             point->x,
+                                                             point->y);
+
+          if (dist < shortest_dist)
+            {
+              shortest_dist = dist;
+
+              segment_index = i;
+            }
+        }
+    }
+
+  return segment_index;
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_polygon_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_POLYGON,
+                       "shell", shell,
+                       NULL);
+}
+
+gboolean
+gimp_tool_polygon_is_closed (GimpToolPolygon *polygon)
+{
+  GimpToolPolygonPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_POLYGON (polygon), FALSE);
+
+  private = polygon->private;
+
+  return private->polygon_closed;
+}
+
+void
+gimp_tool_polygon_get_points (GimpToolPolygon    *polygon,
+                              const GimpVector2 **points,
+                              gint               *n_points)
+{
+  GimpToolPolygonPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_POLYGON (polygon));
+
+  private = polygon->private;
+
+  if (points)   *points   = private->points;
+  if (n_points) *n_points = private->n_points;
+}
diff --git a/app/display/gimptoolpolygon.h b/app/display/gimptoolpolygon.h
new file mode 100644
index 0000000..fa3560a
--- /dev/null
+++ b/app/display/gimptoolpolygon.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpolygon.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_POLYGON_H__
+#define __GIMP_TOOL_POLYGON_H__
+
+
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TYPE_TOOL_POLYGON            (gimp_tool_polygon_get_type ())
+#define GIMP_TOOL_POLYGON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_POLYGON, GimpToolPolygon))
+#define GIMP_TOOL_POLYGON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_POLYGON, GimpToolPolygonClass))
+#define GIMP_IS_TOOL_POLYGON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_POLYGON))
+#define GIMP_IS_TOOL_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_POLYGON))
+#define GIMP_TOOL_POLYGON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_POLYGON, GimpToolPolygonClass))
+
+
+typedef struct _GimpToolPolygon        GimpToolPolygon;
+typedef struct _GimpToolPolygonPrivate GimpToolPolygonPrivate;
+typedef struct _GimpToolPolygonClass   GimpToolPolygonClass;
+
+struct _GimpToolPolygon
+{
+  GimpToolWidget          parent_instance;
+
+  GimpToolPolygonPrivate *private;
+};
+
+struct _GimpToolPolygonClass
+{
+  GimpToolWidgetClass  parent_class;
+
+  /*  signals  */
+  void (* change_complete) (GimpToolPolygon *polygon);
+};
+
+
+GType            gimp_tool_polygon_get_type   (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_polygon_new        (GimpDisplayShell   *shell);
+
+gboolean         gimp_tool_polygon_is_closed  (GimpToolPolygon    *polygon);
+void             gimp_tool_polygon_get_points (GimpToolPolygon    *polygon,
+                                               const GimpVector2 **points,
+                                               gint               *n_points);
+
+
+#endif /* __GIMP_TOOL_POLYGON_H__ */
diff --git a/app/display/gimptoolrectangle.c b/app/display/gimptoolrectangle.c
new file mode 100644
index 0000000..5b5a3a7
--- /dev/null
+++ b/app/display/gimptoolrectangle.c
@@ -0,0 +1,4266 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolrectangle.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on GimpRectangleTool
+ * Copyright (C) 2007 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpmarshal.h"
+#include "core/gimppickable.h"
+#include "core/gimppickable-auto-shrink.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvasarc.h"
+#include "gimpcanvascorner.h"
+#include "gimpcanvashandle.h"
+#include "gimpcanvasitem-utils.h"
+#include "gimpcanvasrectangle.h"
+#include "gimpcanvasrectangleguides.h"
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-scroll.h"
+#include "gimptoolrectangle.h"
+
+#include "gimp-intl.h"
+
+
+/*  speed of key movement  */
+#define ARROW_VELOCITY   25
+
+#define MAX_HANDLE_SIZE         50
+#define MIN_HANDLE_SIZE         15
+#define NARROW_MODE_HANDLE_SIZE 15
+#define NARROW_MODE_THRESHOLD   45
+
+
+enum
+{
+  PROP_0,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2,
+  PROP_CONSTRAINT,
+  PROP_PRECISION,
+  PROP_NARROW_MODE,
+  PROP_FORCE_NARROW_MODE,
+  PROP_DRAW_ELLIPSE,
+  PROP_ROUND_CORNERS,
+  PROP_CORNER_RADIUS,
+  PROP_STATUS_TITLE,
+
+  PROP_HIGHLIGHT,
+  PROP_HIGHLIGHT_OPACITY,
+  PROP_GUIDE,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_FIXED_RULE_ACTIVE,
+  PROP_FIXED_RULE,
+  PROP_DESIRED_FIXED_WIDTH,
+  PROP_DESIRED_FIXED_HEIGHT,
+  PROP_DESIRED_FIXED_SIZE_WIDTH,
+  PROP_DESIRED_FIXED_SIZE_HEIGHT,
+  PROP_ASPECT_NUMERATOR,
+  PROP_ASPECT_DENOMINATOR,
+  PROP_FIXED_CENTER
+};
+
+enum
+{
+  CHANGE_COMPLETE,
+  LAST_SIGNAL
+};
+
+typedef enum
+{
+  CLAMPED_NONE   = 0,
+  CLAMPED_LEFT   = 1 << 0,
+  CLAMPED_RIGHT  = 1 << 1,
+  CLAMPED_TOP    = 1 << 2,
+  CLAMPED_BOTTOM = 1 << 3
+} ClampedSide;
+
+typedef enum
+{
+  SIDE_TO_RESIZE_NONE,
+  SIDE_TO_RESIZE_LEFT,
+  SIDE_TO_RESIZE_RIGHT,
+  SIDE_TO_RESIZE_TOP,
+  SIDE_TO_RESIZE_BOTTOM,
+  SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY,
+  SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY,
+} SideToResize;
+
+
+#define FEQUAL(a,b)       (fabs ((a) - (b)) < 0.0001)
+#define PIXEL_FEQUAL(a,b) (fabs ((a) - (b)) < 0.5)
+
+
+struct _GimpToolRectanglePrivate
+{
+  /* The following members are "constants", that is, variables that are setup
+   * during gimp_tool_rectangle_button_press and then only read.
+   */
+
+  /* Whether or not the rectangle currently being rubber-banded is the
+   * first one created with this instance, this determines if we can
+   * undo it on button_release.
+   */
+  gboolean                is_first;
+
+  /* Whether or not the rectangle currently being rubber-banded was
+   * created from scratch.
+   */
+  gboolean                is_new;
+
+  /* Holds the coordinate that should be used as the "other side" when
+   * fixed-center is turned off.
+   */
+  gdouble                 other_side_x;
+  gdouble                 other_side_y;
+
+  /* Holds the coordinate to be used as center when fixed-center is used. */
+  gdouble                 center_x_on_fixed_center;
+  gdouble                 center_y_on_fixed_center;
+
+  /* True when the rectangle is being adjusted (moved or
+   * rubber-banded).
+   */
+  gboolean                rect_adjusting;
+
+
+  /* The rest of the members are internal state variables, that is, variables
+   * that might change during the manipulation session of the rectangle. Make
+   * sure these variables are in consistent states.
+   */
+
+  /* Coordinates of upper left and lower right rectangle corners. */
+  gdouble                 x1, y1;
+  gdouble                 x2, y2;
+
+  /* Integer coordinats of upper left corner and size. We must
+   * calculate this separately from the gdouble ones because sometimes
+   * we don't want to affect the integer size (e.g. when moving the
+   * rectangle), but that will be the case if we always calculate the
+   * integer coordinates based on rounded values of the gdouble
+   * coordinates even if the gdouble width remains constant.
+   *
+   * TODO: Change the internal double-representation of the rectangle
+   * to x,y width,height instead of x1,y1 x2,y2. That way we don't
+   * need to keep a separate representation of the integer version of
+   * the rectangle; rounding width an height will yield consistent
+   * results and not depend on position of the rectangle.
+   */
+  gint                    x1_int,    y1_int;
+  gint                    width_int, height_int;
+
+  /* How to constrain the rectangle. */
+  GimpRectangleConstraint constraint;
+
+  /* What precision the rectangle will appear to have externally (it
+   * will always be double internally)
+   */
+  GimpRectanglePrecision  precision;
+
+  /* Previous coordinate applied to the rectangle. */
+  gdouble                 lastx;
+  gdouble                 lasty;
+
+  /* Width and height of corner handles. */
+  gint                    corner_handle_w;
+  gint                    corner_handle_h;
+
+  /* Width and height of side handles. */
+  gint                    top_and_bottom_handle_w;
+  gint                    left_and_right_handle_h;
+
+  /* Whether or not the rectangle is in a 'narrow situation' i.e. it is
+   * too small for reasonable sized handle to be inside. In this case
+   * we put handles on the outside.
+   */
+  gboolean                narrow_mode;
+
+  /* This boolean allows to always set narrow mode */
+  gboolean                force_narrow_mode;
+
+  /* Whether or not to draw an ellipse inside the rectangle */
+  gboolean                draw_ellipse;
+
+  /* Whether to draw round corners */
+  gboolean                round_corners;
+  gdouble                 corner_radius;
+
+  /* The title for the statusbar coords */
+  gchar                  *status_title;
+
+  /* For saving in case of cancellation. */
+  gdouble                 saved_x1;
+  gdouble                 saved_y1;
+  gdouble                 saved_x2;
+  gdouble                 saved_y2;
+
+  gint                    suppress_updates;
+
+  GimpRectangleFunction   function;
+
+  /* The following values are externally synced with GimpRectangleOptions */
+
+  gboolean                highlight;
+  gdouble                 highlight_opacity;
+  GimpGuidesType          guide;
+
+  gdouble                 x;
+  gdouble                 y;
+  gdouble                 width;
+  gdouble                 height;
+
+  gboolean                fixed_rule_active;
+  GimpRectangleFixedRule  fixed_rule;
+  gdouble                 desired_fixed_width;
+  gdouble                 desired_fixed_height;
+  gdouble                 desired_fixed_size_width;
+  gdouble                 desired_fixed_size_height;
+  gdouble                 aspect_numerator;
+  gdouble                 aspect_denominator;
+  gboolean                fixed_center;
+
+  /* Canvas items for drawing the GUI */
+
+  GimpCanvasItem         *guides;
+  GimpCanvasItem         *rectangle;
+  GimpCanvasItem         *ellipse;
+  GimpCanvasItem         *corners[4];
+  GimpCanvasItem         *center;
+  GimpCanvasItem         *creating_corners[4];
+  GimpCanvasItem         *handles[GIMP_N_TOOL_RECTANGLE_FUNCTIONS];
+  GimpCanvasItem         *highlight_handles[GIMP_N_TOOL_RECTANGLE_FUNCTIONS];
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_rectangle_constructed     (GObject               *object);
+static void     gimp_tool_rectangle_finalize        (GObject               *object);
+static void     gimp_tool_rectangle_set_property    (GObject               *object,
+                                                     guint                  property_id,
+                                                     const GValue          *value,
+                                                     GParamSpec            *pspec);
+static void     gimp_tool_rectangle_get_property    (GObject               *object,
+                                                     guint                  property_id,
+                                                     GValue                *value,
+                                                     GParamSpec            *pspec);
+static void     gimp_tool_rectangle_notify          (GObject               *object,
+                                                     GParamSpec            *pspec);
+
+static void     gimp_tool_rectangle_changed         (GimpToolWidget        *widget);
+static gint     gimp_tool_rectangle_button_press    (GimpToolWidget        *widget,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpButtonPressType    press_type);
+static void     gimp_tool_rectangle_button_release  (GimpToolWidget        *widget,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpButtonReleaseType  release_type);
+static void     gimp_tool_rectangle_motion          (GimpToolWidget        *widget,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state);
+static GimpHit  gimp_tool_rectangle_hit             (GimpToolWidget        *widget,
+                                                     const GimpCoords      *coords,
+                                                     GdkModifierType        state,
+                                                     gboolean               proximity);
+static void     gimp_tool_rectangle_hover           (GimpToolWidget        *widget,
+                                                     const GimpCoords      *coords,
+                                                     GdkModifierType        state,
+                                                     gboolean               proximity);
+static void     gimp_tool_rectangle_leave_notify    (GimpToolWidget        *widget);
+static gboolean gimp_tool_rectangle_key_press       (GimpToolWidget        *widget,
+                                                     GdkEventKey           *kevent);
+static void     gimp_tool_rectangle_motion_modifier (GimpToolWidget        *widget,
+                                                     GdkModifierType        key,
+                                                     gboolean               press,
+                                                     GdkModifierType        state);
+static gboolean gimp_tool_rectangle_get_cursor      (GimpToolWidget        *widget,
+                                                     const GimpCoords      *coords,
+                                                     GdkModifierType        state,
+                                                     GimpCursorType        *cursor,
+                                                     GimpToolCursorType    *tool_cursor,
+                                                     GimpCursorModifier    *modifier);
+
+static void     gimp_tool_rectangle_change_complete (GimpToolRectangle     *rectangle);
+
+static void     gimp_tool_rectangle_update_options  (GimpToolRectangle     *rectangle);
+static void     gimp_tool_rectangle_update_handle_sizes
+                                                    (GimpToolRectangle     *rectangle);
+static void     gimp_tool_rectangle_update_status   (GimpToolRectangle     *rectangle);
+
+static void     gimp_tool_rectangle_synthesize_motion
+                                                    (GimpToolRectangle     *rectangle,
+                                                     gint               function,
+                                                     gdouble            new_x,
+                                                     gdouble            new_y);
+
+static GimpRectangleFunction
+                gimp_tool_rectangle_calc_function   (GimpToolRectangle     *rectangle,
+                                                     const GimpCoords      *coords,
+                                                     gboolean               proximity);
+static void     gimp_tool_rectangle_check_function  (GimpToolRectangle     *rectangle);
+
+static gboolean gimp_tool_rectangle_coord_outside   (GimpToolRectangle     *rectangle,
+                                                     const GimpCoords      *coords);
+
+static gboolean gimp_tool_rectangle_coord_on_handle (GimpToolRectangle     *rectangle,
+                                                     const GimpCoords      *coords,
+                                                     GimpHandleAnchor       anchor);
+
+static GimpHandleAnchor gimp_tool_rectangle_get_anchor
+                                                    (GimpRectangleFunction  function);
+static gboolean gimp_tool_rectangle_rect_rubber_banding_func
+                                                    (GimpToolRectangle     *rectangle);
+static gboolean gimp_tool_rectangle_rect_adjusting_func
+                                                    (GimpToolRectangle     *rectangle);
+
+static void     gimp_tool_rectangle_get_other_side  (GimpToolRectangle     *rectangle,
+                                                     gdouble              **other_x,
+                                                     gdouble              **other_y);
+static void     gimp_tool_rectangle_get_other_side_coord
+                                                    (GimpToolRectangle     *rectangle,
+                                                     gdouble               *other_side_x,
+                                                     gdouble               *other_side_y);
+static void     gimp_tool_rectangle_set_other_side_coord
+                                                    (GimpToolRectangle     *rectangle,
+                                                     gdouble                other_side_x,
+                                                     gdouble                other_side_y);
+
+static void     gimp_tool_rectangle_apply_coord     (GimpToolRectangle     *rectangle,
+                                                     gdouble                coord_x,
+                                                     gdouble                coord_y);
+static void     gimp_tool_rectangle_setup_snap_offsets
+                                                    (GimpToolRectangle     *rectangle,
+                                                     const GimpCoords      *coords);
+
+static void     gimp_tool_rectangle_clamp           (GimpToolRectangle     *rectangle,
+                                                     ClampedSide           *clamped_sides,
+                                                     GimpRectangleConstraint constraint,
+                                                     gboolean               symmetrically);
+static void     gimp_tool_rectangle_clamp_width     (GimpToolRectangle     *rectangle,
+                                                     ClampedSide           *clamped_sides,
+                                                     GimpRectangleConstraint constraint,
+                                                     gboolean               symmetrically);
+static void     gimp_tool_rectangle_clamp_height    (GimpToolRectangle     *rectangle,
+                                                     ClampedSide           *clamped_sides,
+                                                     GimpRectangleConstraint constraint,
+                                                     gboolean               symmetrically);
+
+static void     gimp_tool_rectangle_keep_inside     (GimpToolRectangle     *rectangle,
+                                                     GimpRectangleConstraint constraint);
+static void     gimp_tool_rectangle_keep_inside_horizontally
+                                                    (GimpToolRectangle     *rectangle,
+                                                     GimpRectangleConstraint constraint);
+static void     gimp_tool_rectangle_keep_inside_vertically
+                                                    (GimpToolRectangle     *rectangle,
+                                                     GimpRectangleConstraint constraint);
+
+static void     gimp_tool_rectangle_apply_fixed_width
+                                                    (GimpToolRectangle     *rectangle,
+                                                     GimpRectangleConstraint constraint,
+                                                     gdouble                width);
+static void     gimp_tool_rectangle_apply_fixed_height
+                                                    (GimpToolRectangle     *rectangle,
+                                                     GimpRectangleConstraint constraint,
+                                                     gdouble                height);
+
+static void     gimp_tool_rectangle_apply_aspect    (GimpToolRectangle     *rectangle,
+                                                     gdouble                aspect,
+                                                     gint                   clamped_sides);
+
+static void     gimp_tool_rectangle_update_with_coord
+                                                    (GimpToolRectangle     *rectangle,
+                                                     gdouble                new_x,
+                                                     gdouble                new_y);
+static void     gimp_tool_rectangle_apply_fixed_rule(GimpToolRectangle     *rectangle);
+
+static void     gimp_tool_rectangle_get_constraints (GimpToolRectangle     *rectangle,
+                                                     gint                  *min_x,
+                                                     gint                  *min_y,
+                                                     gint                  *max_x,
+                                                     gint                  *max_y,
+                                                     GimpRectangleConstraint constraint);
+
+static void     gimp_tool_rectangle_handle_general_clamping
+                                                    (GimpToolRectangle     *rectangle);
+static void     gimp_tool_rectangle_update_int_rect (GimpToolRectangle     *rectangle);
+static void     gimp_tool_rectangle_adjust_coord    (GimpToolRectangle     *rectangle,
+                                                     gdouble                coord_x_input,
+                                                     gdouble                coord_y_input,
+                                                     gdouble               *coord_x_output,
+                                                     gdouble               *coord_y_output);
+static void     gimp_tool_rectangle_recalculate_center_xy
+                                                    (GimpToolRectangle     *rectangle);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolRectangle, gimp_tool_rectangle,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_rectangle_parent_class
+
+static guint rectangle_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_tool_rectangle_class_init (GimpToolRectangleClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_rectangle_constructed;
+  object_class->finalize        = gimp_tool_rectangle_finalize;
+  object_class->set_property    = gimp_tool_rectangle_set_property;
+  object_class->get_property    = gimp_tool_rectangle_get_property;
+  object_class->notify          = gimp_tool_rectangle_notify;
+
+  widget_class->changed         = gimp_tool_rectangle_changed;
+  widget_class->button_press    = gimp_tool_rectangle_button_press;
+  widget_class->button_release  = gimp_tool_rectangle_button_release;
+  widget_class->motion          = gimp_tool_rectangle_motion;
+  widget_class->hit             = gimp_tool_rectangle_hit;
+  widget_class->hover           = gimp_tool_rectangle_hover;
+  widget_class->leave_notify    = gimp_tool_rectangle_leave_notify;
+  widget_class->key_press       = gimp_tool_rectangle_key_press;
+  widget_class->motion_modifier = gimp_tool_rectangle_motion_modifier;
+  widget_class->get_cursor      = gimp_tool_rectangle_get_cursor;
+  widget_class->update_on_scale = TRUE;
+
+  rectangle_signals[CHANGE_COMPLETE] =
+    g_signal_new ("change-complete",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolRectangleClass, change_complete),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_double ("x1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_double ("y1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_double ("x2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_double ("y2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAINT,
+                                   g_param_spec_enum ("constraint",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_RECTANGLE_CONSTRAINT,
+                                                      GIMP_RECTANGLE_CONSTRAIN_NONE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PRECISION,
+                                   g_param_spec_enum ("precision",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_RECTANGLE_PRECISION,
+                                                      GIMP_RECTANGLE_PRECISION_INT,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_NARROW_MODE,
+                                   g_param_spec_boolean ("narrow-mode",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FORCE_NARROW_MODE,
+                                   g_param_spec_boolean ("force-narrow-mode",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DRAW_ELLIPSE,
+                                   g_param_spec_boolean ("draw-ellipse",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ROUND_CORNERS,
+                                   g_param_spec_boolean ("round-corners",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CORNER_RADIUS,
+                                   g_param_spec_double ("corner-radius",
+                                                        NULL, NULL,
+                                                        0.0, 10000.0, 10.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_STATUS_TITLE,
+                                   g_param_spec_string ("status-title",
+                                                        NULL, NULL,
+                                                        _("Rectangle: "),
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HIGHLIGHT,
+                                   g_param_spec_boolean ("highlight",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HIGHLIGHT_OPACITY,
+                                   g_param_spec_double ("highlight-opacity",
+                                                        NULL, NULL,
+                                                        0.0, 1.0, 0.5,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GUIDE,
+                                   g_param_spec_enum ("guide",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_GUIDES_TYPE,
+                                                      GIMP_GUIDES_NONE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_double ("width",
+                                                        NULL, NULL,
+                                                        0.0,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_double ("height",
+                                                        NULL, NULL,
+                                                        0.0,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FIXED_RULE_ACTIVE,
+                                   g_param_spec_boolean ("fixed-rule-active",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FIXED_RULE,
+                                   g_param_spec_enum ("fixed-rule",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_RECTANGLE_FIXED_RULE,
+                                                      GIMP_RECTANGLE_FIXED_ASPECT,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DESIRED_FIXED_WIDTH,
+                                   g_param_spec_double ("desired-fixed-width",
+                                                        NULL, NULL,
+                                                        0.0, GIMP_MAX_IMAGE_SIZE,
+                                                        100.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DESIRED_FIXED_HEIGHT,
+                                   g_param_spec_double ("desired-fixed-height",
+                                                        NULL, NULL,
+                                                        0.0, GIMP_MAX_IMAGE_SIZE,
+                                                        100.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DESIRED_FIXED_SIZE_WIDTH,
+                                   g_param_spec_double ("desired-fixed-size-width",
+                                                        NULL, NULL,
+                                                        0.0, GIMP_MAX_IMAGE_SIZE,
+                                                        100.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DESIRED_FIXED_SIZE_HEIGHT,
+                                   g_param_spec_double ("desired-fixed-size-height",
+                                                        NULL, NULL,
+                                                        0.0, GIMP_MAX_IMAGE_SIZE,
+                                                        100.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ASPECT_NUMERATOR,
+                                   g_param_spec_double ("aspect-numerator",
+                                                        NULL, NULL,
+                                                        0.0, GIMP_MAX_IMAGE_SIZE,
+                                                        1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ASPECT_DENOMINATOR,
+                                   g_param_spec_double ("aspect-denominator",
+                                                        NULL, NULL,
+                                                        0.0, GIMP_MAX_IMAGE_SIZE,
+                                                        1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FIXED_CENTER,
+                                   g_param_spec_boolean ("fixed-center",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_rectangle_init (GimpToolRectangle *rectangle)
+{
+  rectangle->private = gimp_tool_rectangle_get_instance_private (rectangle);
+
+  rectangle->private->function = GIMP_TOOL_RECTANGLE_CREATING;
+  rectangle->private->is_first = TRUE;
+}
+
+static void
+gimp_tool_rectangle_constructed (GObject *object)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (object);
+  GimpToolWidget           *widget    = GIMP_TOOL_WIDGET (object);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  GimpCanvasGroup          *stroke_group;
+  gint                      i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  stroke_group = gimp_tool_widget_add_stroke_group (widget);
+
+  gimp_tool_widget_push_group (widget, stroke_group);
+
+  private->guides = gimp_tool_widget_add_rectangle_guides (widget,
+                                                           0, 0, 10, 10,
+                                                           GIMP_GUIDES_NONE);
+
+  private->rectangle = gimp_tool_widget_add_rectangle (widget,
+                                                       0, 0, 10, 10,
+                                                       FALSE);
+
+  private->ellipse = gimp_tool_widget_add_arc (widget,
+                                               0, 0, 10, 10,
+                                               0.0, 2 * G_PI,
+                                               FALSE);
+
+  for (i = 0; i < 4; i++)
+    private->corners[i] = gimp_tool_widget_add_arc (widget,
+                                                    0, 0, 10, 10,
+                                                    0.0, 2 * G_PI,
+                                                    FALSE);
+
+  gimp_tool_widget_pop_group (widget);
+
+  private->center = gimp_tool_widget_add_handle (widget,
+                                                 GIMP_HANDLE_CROSS,
+                                                 0, 0,
+                                                 GIMP_CANVAS_HANDLE_SIZE_SMALL,
+                                                 GIMP_CANVAS_HANDLE_SIZE_SMALL,
+                                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+  gimp_tool_widget_push_group (widget, stroke_group);
+
+  private->creating_corners[0] =
+    gimp_tool_widget_add_corner (widget,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_NORTH_WEST,
+                                 10, 10,
+                                 FALSE);
+
+  private->creating_corners[1] =
+    gimp_tool_widget_add_corner (widget,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_NORTH_EAST,
+                                 10, 10,
+                                 FALSE);
+
+  private->creating_corners[2] =
+    gimp_tool_widget_add_corner (widget,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_SOUTH_WEST,
+                                 10, 10,
+                                 FALSE);
+
+  private->creating_corners[3] =
+    gimp_tool_widget_add_corner (widget,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_SOUTH_EAST,
+                                 10, 10,
+                                 FALSE);
+
+  gimp_tool_widget_pop_group (widget);
+
+  for (i = GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT;
+       i <= GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM;
+       i++)
+    {
+      GimpHandleAnchor anchor;
+
+      anchor = gimp_tool_rectangle_get_anchor (i);
+
+      gimp_tool_widget_push_group (widget, stroke_group);
+
+      private->handles[i] = gimp_tool_widget_add_corner (widget,
+                                                         0, 0, 10, 10,
+                                                         anchor,
+                                                         10, 10,
+                                                         FALSE);
+
+      gimp_tool_widget_pop_group (widget);
+
+      private->highlight_handles[i] = gimp_tool_widget_add_corner (widget,
+                                                                   0, 0, 10, 10,
+                                                                   anchor,
+                                                                   10, 10,
+                                                                   FALSE);
+      gimp_canvas_item_set_highlight (private->highlight_handles[i], TRUE);
+    }
+
+  gimp_tool_rectangle_changed (widget);
+}
+
+static void
+gimp_tool_rectangle_finalize (GObject *object)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (object);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+
+  g_clear_pointer (&private->status_title, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_rectangle_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (object);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+
+  switch (property_id)
+    {
+    case PROP_X1:
+      private->x1 = g_value_get_double (value);
+      break;
+    case PROP_Y1:
+      private->y1 = g_value_get_double (value);
+      break;
+    case PROP_X2:
+      private->x2 = g_value_get_double (value);
+      break;
+    case PROP_Y2:
+      private->y2 = g_value_get_double (value);
+      break;
+
+    case PROP_CONSTRAINT:
+      private->constraint = g_value_get_enum (value);
+      break;
+    case PROP_PRECISION:
+      private->precision = g_value_get_enum (value);
+      break;
+
+    case PROP_NARROW_MODE:
+      private->narrow_mode = g_value_get_boolean (value);
+      break;
+    case PROP_FORCE_NARROW_MODE:
+      private->force_narrow_mode = g_value_get_boolean (value);
+      break;
+    case PROP_DRAW_ELLIPSE:
+      private->draw_ellipse = g_value_get_boolean (value);
+      break;
+    case PROP_ROUND_CORNERS:
+      private->round_corners = g_value_get_boolean (value);
+      break;
+    case PROP_CORNER_RADIUS:
+      private->corner_radius = g_value_get_double (value);
+      break;
+
+    case PROP_STATUS_TITLE:
+      g_free (private->status_title);
+      private->status_title = g_value_dup_string (value);
+      if (! private->status_title)
+        private->status_title = g_strdup (_("Rectangle: "));
+      break;
+
+    case PROP_HIGHLIGHT:
+      private->highlight = g_value_get_boolean (value);
+      break;
+    case PROP_HIGHLIGHT_OPACITY:
+      private->highlight_opacity = g_value_get_double (value);
+      break;
+    case PROP_GUIDE:
+      private->guide = g_value_get_enum (value);
+      break;
+
+    case PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case PROP_WIDTH:
+      private->width = g_value_get_double (value);
+      break;
+    case PROP_HEIGHT:
+      private->height = g_value_get_double (value);
+      break;
+
+    case PROP_FIXED_RULE_ACTIVE:
+      private->fixed_rule_active = g_value_get_boolean (value);
+      break;
+    case PROP_FIXED_RULE:
+      private->fixed_rule = g_value_get_enum (value);
+      break;
+    case PROP_DESIRED_FIXED_WIDTH:
+      private->desired_fixed_width = g_value_get_double (value);
+      break;
+    case PROP_DESIRED_FIXED_HEIGHT:
+      private->desired_fixed_height = g_value_get_double (value);
+      break;
+    case PROP_DESIRED_FIXED_SIZE_WIDTH:
+      private->desired_fixed_size_width = g_value_get_double (value);
+      break;
+    case PROP_DESIRED_FIXED_SIZE_HEIGHT:
+      private->desired_fixed_size_height = g_value_get_double (value);
+      break;
+    case PROP_ASPECT_NUMERATOR:
+      private->aspect_numerator = g_value_get_double (value);
+      break;
+    case PROP_ASPECT_DENOMINATOR:
+      private->aspect_denominator = g_value_get_double (value);
+      break;
+
+    case PROP_FIXED_CENTER:
+      private->fixed_center = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_rectangle_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (object);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+
+  switch (property_id)
+    {
+    case PROP_X1:
+      g_value_set_double (value, private->x1);
+      break;
+    case PROP_Y1:
+      g_value_set_double (value, private->y1);
+      break;
+    case PROP_X2:
+      g_value_set_double (value, private->x2);
+      break;
+    case PROP_Y2:
+      g_value_set_double (value, private->y2);
+      break;
+
+    case PROP_CONSTRAINT:
+      g_value_set_enum (value, private->constraint);
+      break;
+    case PROP_PRECISION:
+      g_value_set_enum (value, private->precision);
+      break;
+
+    case PROP_NARROW_MODE:
+      g_value_set_boolean (value, private->narrow_mode);
+      break;
+    case PROP_FORCE_NARROW_MODE:
+      g_value_set_boolean (value, private->force_narrow_mode);
+      break;
+    case PROP_DRAW_ELLIPSE:
+      g_value_set_boolean (value, private->draw_ellipse);
+      break;
+    case PROP_ROUND_CORNERS:
+      g_value_set_boolean (value, private->round_corners);
+      break;
+    case PROP_CORNER_RADIUS:
+      g_value_set_double (value, private->corner_radius);
+      break;
+
+    case PROP_STATUS_TITLE:
+      g_value_set_string (value, private->status_title);
+      break;
+
+    case PROP_HIGHLIGHT:
+      g_value_set_boolean (value, private->highlight);
+      break;
+    case PROP_HIGHLIGHT_OPACITY:
+      g_value_set_double (value, private->highlight_opacity);
+      break;
+    case PROP_GUIDE:
+      g_value_set_enum (value, private->guide);
+      break;
+
+    case PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_double (value, private->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_double (value, private->height);
+      break;
+
+    case PROP_FIXED_RULE_ACTIVE:
+      g_value_set_boolean (value, private->fixed_rule_active);
+      break;
+    case PROP_FIXED_RULE:
+      g_value_set_enum (value, private->fixed_rule);
+      break;
+    case PROP_DESIRED_FIXED_WIDTH:
+      g_value_set_double (value, private->desired_fixed_width);
+      break;
+    case PROP_DESIRED_FIXED_HEIGHT:
+      g_value_set_double (value, private->desired_fixed_height);
+      break;
+    case PROP_DESIRED_FIXED_SIZE_WIDTH:
+      g_value_set_double (value, private->desired_fixed_size_width);
+      break;
+    case PROP_DESIRED_FIXED_SIZE_HEIGHT:
+      g_value_set_double (value, private->desired_fixed_size_height);
+      break;
+    case PROP_ASPECT_NUMERATOR:
+      g_value_set_double (value, private->aspect_numerator);
+      break;
+    case PROP_ASPECT_DENOMINATOR:
+      g_value_set_double (value, private->aspect_denominator);
+      break;
+
+    case PROP_FIXED_CENTER:
+      g_value_set_boolean (value, private->fixed_center);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_rectangle_notify (GObject    *object,
+                            GParamSpec *pspec)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (object);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+
+  if (G_OBJECT_CLASS (parent_class)->notify)
+    G_OBJECT_CLASS (parent_class)->notify (object, pspec);
+
+  if (! strcmp (pspec->name, "x1") ||
+      ! strcmp (pspec->name, "y1") ||
+      ! strcmp (pspec->name, "x2") ||
+      ! strcmp (pspec->name, "y2"))
+    {
+      gimp_tool_rectangle_update_int_rect (rectangle);
+
+      gimp_tool_rectangle_recalculate_center_xy (rectangle);
+
+      gimp_tool_rectangle_update_options (rectangle);
+    }
+  else if (! strcmp  (pspec->name, "x") &&
+           ! PIXEL_FEQUAL (private->x1, private->x))
+    {
+      gimp_tool_rectangle_synthesize_motion (rectangle,
+                                             GIMP_TOOL_RECTANGLE_MOVING,
+                                             private->x,
+                                             private->y1);
+    }
+  else if (! strcmp  (pspec->name, "y") &&
+           ! PIXEL_FEQUAL (private->y1, private->y))
+    {
+      gimp_tool_rectangle_synthesize_motion (rectangle,
+                                             GIMP_TOOL_RECTANGLE_MOVING,
+                                             private->x1,
+                                             private->y);
+    }
+  else if (! strcmp  (pspec->name, "width") &&
+           ! PIXEL_FEQUAL (private->x2 - private->x1, private->width))
+    {
+      /* Calculate x2, y2 that will create a rectangle of given width,
+       * for the current options.
+       */
+      gdouble x2;
+
+      if (private->fixed_center)
+        {
+          x2 = private->center_x_on_fixed_center +
+               private->width / 2;
+        }
+      else
+        {
+          x2 = private->x1 + private->width;
+        }
+
+      gimp_tool_rectangle_synthesize_motion (rectangle,
+                                             GIMP_TOOL_RECTANGLE_RESIZING_RIGHT,
+                                             x2,
+                                             private->y2);
+    }
+  else if (! strcmp  (pspec->name, "height") &&
+           ! PIXEL_FEQUAL (private->y2 - private->y1, private->height))
+    {
+      /* Calculate x2, y2 that will create a rectangle of given
+       * height, for the current options.
+       */
+      gdouble y2;
+
+      if (private->fixed_center)
+        {
+          y2 = private->center_y_on_fixed_center +
+               private->height / 2;
+        }
+      else
+        {
+          y2 = private->y1 + private->height;
+        }
+
+      gimp_tool_rectangle_synthesize_motion (rectangle,
+                                             GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM,
+                                             private->x2,
+                                             y2);
+    }
+  else if (! strcmp (pspec->name, "desired-fixed-size-width"))
+    {
+      /* We are only interested in when width and height swaps, so
+       * it's enough to only check e.g. for width.
+       */
+
+      gdouble width  = private->x2 - private->x1;
+      gdouble height = private->y2 - private->y1;
+
+      /* Depending on a bunch of conditions, we might want to
+       * immedieately switch width and height of the pending
+       * rectangle.
+       */
+      if (private->fixed_rule_active                          &&
+#if 0
+          tool->button_press_state                            == 0    &&
+          tool->active_modifier_state                         == 0    &&
+#endif
+          FEQUAL (private->desired_fixed_size_width,  height) &&
+          FEQUAL (private->desired_fixed_size_height, width))
+        {
+          gdouble x = private->x1;
+          gdouble y = private->y1;
+
+          gimp_tool_rectangle_synthesize_motion (rectangle,
+                                                 GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT,
+                                                 private->x2,
+                                                 private->y2);
+
+          /* For some reason these needs to be set separately... */
+          g_object_set (rectangle,
+                        "x", x,
+                        NULL);
+          g_object_set (rectangle,
+                        "y", y,
+                        NULL);
+        }
+    }
+  else if (! strcmp (pspec->name, "aspect-numerator"))
+    {
+      /* We are only interested in when numerator and denominator
+       * swaps, so it's enough to only check e.g. for numerator.
+       */
+
+      double    width             = private->x2 - private->x1;
+      double    height            = private->y2 - private->y1;
+      gdouble   new_inverse_ratio = private->aspect_denominator /
+                                    private->aspect_numerator;
+      gdouble   lower_ratio;
+      gdouble   higher_ratio;
+
+      /* The ratio of the Fixed: Aspect ratio rule and the pending
+       * rectangle is very rarely exactly the same so use an
+       * interval. For small rectangles the below code will
+       * automatically yield a more generous accepted ratio interval
+       * which is exactly what we want.
+       */
+      if (width > height && height > 1.0)
+        {
+          lower_ratio  = width / (height + 1.0);
+          higher_ratio = width / (height - 1.0);
+        }
+      else
+        {
+          lower_ratio  = (width - 1.0) / height;
+          higher_ratio = (width + 1.0) / height;
+        }
+
+      /* Depending on a bunch of conditions, we might want to
+       * immedieately switch width and height of the pending
+       * rectangle.
+       */
+      if (private->fixed_rule_active               &&
+#if 0
+          tool->button_press_state    == 0                 &&
+          tool->active_modifier_state == 0                 &&
+#endif
+          lower_ratio                 <  new_inverse_ratio &&
+          higher_ratio                >  new_inverse_ratio)
+        {
+          gdouble new_x2 = private->x1 + private->y2 - private->y1;
+          gdouble new_y2 = private->y1 + private->x2 - private->x1;
+
+          gimp_tool_rectangle_synthesize_motion (rectangle,
+                                                 GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT,
+                                                 new_x2,
+                                                 new_y2);
+        }
+    }
+}
+
+static void
+gimp_tool_rectangle_changed (GimpToolWidget *widget)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  GimpDisplayShell         *shell     = gimp_tool_widget_get_shell (widget);
+  gdouble                   x1, y1, x2, y2;
+  gint                      handle_width;
+  gint                      handle_height;
+  gint                      i;
+
+  gimp_tool_rectangle_update_handle_sizes (rectangle);
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+
+  gimp_canvas_rectangle_guides_set (private->guides,
+                                    x1, y1,
+                                    x2 - x1,
+                                    y2 - y1,
+                                    private->guide, 4);
+
+  gimp_canvas_rectangle_set (private->rectangle,
+                             x1, y1,
+                             x2 - x1,
+                             y2 - y1);
+
+  if (private->draw_ellipse)
+    {
+      gimp_canvas_arc_set (private->ellipse,
+                           (x1 + x2) / 2.0,
+                           (y1 + y2) / 2.0,
+                           (x2 - x1) / 2.0,
+                           (y2 - y1) / 2.0,
+                           0.0, 2 * G_PI);
+      gimp_canvas_item_set_visible (private->ellipse, TRUE);
+    }
+  else
+    {
+      gimp_canvas_item_set_visible (private->ellipse, FALSE);
+    }
+
+  if (private->round_corners && private->corner_radius > 0.0)
+    {
+      gdouble radius;
+
+      radius = MIN (private->corner_radius,
+                    MIN ((x2 - x1) / 2.0, (y2 - y1) / 2.0));
+
+      gimp_canvas_arc_set (private->corners[0],
+                           x1 + radius,
+                           y1 + radius,
+                           radius, radius,
+                           G_PI / 2.0, G_PI / 2.0);
+
+      gimp_canvas_arc_set (private->corners[1],
+                           x2 - radius,
+                           y1 + radius,
+                           radius, radius,
+                           0.0, G_PI / 2.0);
+
+      gimp_canvas_arc_set (private->corners[2],
+                           x1 + radius,
+                           y2 - radius,
+                           radius, radius,
+                           G_PI, G_PI / 2.0);
+
+      gimp_canvas_arc_set (private->corners[3],
+                           x2 - radius,
+                           y2 - radius,
+                           radius, radius,
+                           G_PI * 1.5, G_PI / 2.0);
+
+      for (i = 0; i < 4; i++)
+        gimp_canvas_item_set_visible (private->corners[i], TRUE);
+    }
+  else
+    {
+      for (i = 0; i < 4; i++)
+        gimp_canvas_item_set_visible (private->corners[i], FALSE);
+    }
+
+  gimp_canvas_item_set_visible (private->center, FALSE);
+
+  for (i = 0; i < 4; i++)
+    {
+      gimp_canvas_item_set_visible (private->creating_corners[i], FALSE);
+      gimp_canvas_item_set_highlight (private->creating_corners[i], FALSE);
+    }
+
+  for (i = GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT;
+       i <= GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM;
+       i++)
+    {
+      gimp_canvas_item_set_visible (private->handles[i], FALSE);
+      gimp_canvas_item_set_visible (private->highlight_handles[i], FALSE);
+    }
+
+  handle_width  = private->corner_handle_w;
+  handle_height = private->corner_handle_h;
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_MOVING:
+      if (private->rect_adjusting)
+        {
+          /* Mark the center because we snap to it */
+          gimp_canvas_handle_set_position (private->center,
+                                           (x1 + x2) / 2.0,
+                                           (y1 + y2) / 2.0);
+          gimp_canvas_item_set_visible (private->center, TRUE);
+          break;
+        }
+
+      /* else fallthrough */
+
+    case GIMP_TOOL_RECTANGLE_DEAD:
+    case GIMP_TOOL_RECTANGLE_CREATING:
+    case GIMP_TOOL_RECTANGLE_AUTO_SHRINK:
+      for (i = 0; i < 4; i++)
+        {
+          gimp_canvas_corner_set (private->creating_corners[i],
+                                  x1, y1, x2 - x1, y2 - y1,
+                                  handle_width, handle_height,
+                                  private->narrow_mode);
+          gimp_canvas_item_set_visible (private->creating_corners[i], TRUE);
+        }
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      handle_width = private->top_and_bottom_handle_w;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      handle_height = private->left_and_right_handle_h;
+      break;
+
+    default:
+      break;
+    }
+
+  if (handle_width  >= 3                                           &&
+      handle_height >= 3                                           &&
+      private->function >= GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT &&
+      private->function <= GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM)
+    {
+      GimpCanvasItem *corner;
+
+      if (private->rect_adjusting)
+        corner = private->handles[private->function];
+      else
+        corner = private->highlight_handles[private->function];
+
+      gimp_canvas_corner_set (corner,
+                              x1, y1, x2 - x1, y2 - y1,
+                              handle_width, handle_height,
+                              private->narrow_mode);
+      gimp_canvas_item_set_visible (corner, TRUE);
+    }
+
+  if (private->highlight && ! private->rect_adjusting)
+    {
+      GdkRectangle rect;
+
+      rect.x      = x1;
+      rect.y      = y1;
+      rect.width  = x2 - x1;
+      rect.height = y2 - y1;
+
+      gimp_display_shell_set_highlight (shell, &rect, private->highlight_opacity);
+    }
+  else
+    {
+      gimp_display_shell_set_highlight (shell, NULL, 0.0);
+    }
+}
+
+gint
+gimp_tool_rectangle_button_press (GimpToolWidget      *widget,
+                                  const GimpCoords    *coords,
+                                  guint32              time,
+                                  GdkModifierType      state,
+                                  GimpButtonPressType  press_type)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  gdouble                   snapped_x, snapped_y;
+  gint                      snap_x, snap_y;
+
+  /* save existing shape in case of cancellation */
+  private->saved_x1 = private->x1;
+  private->saved_y1 = private->y1;
+  private->saved_x2 = private->x2;
+  private->saved_y2 = private->y2;
+
+  gimp_tool_rectangle_setup_snap_offsets (rectangle, coords);
+  gimp_tool_widget_get_snap_offsets (widget, &snap_x, &snap_y, NULL, NULL);
+
+  snapped_x = coords->x + snap_x;
+  snapped_y = coords->y + snap_y;
+
+  private->lastx = snapped_x;
+  private->lasty = snapped_y;
+
+  if (private->function == GIMP_TOOL_RECTANGLE_CREATING)
+    {
+      /* Remember that this rectangle was created from scratch. */
+      private->is_new = TRUE;
+
+      private->x1 = private->x2 = snapped_x;
+      private->y1 = private->y2 = snapped_y;
+
+      /* Unless forced, created rectangles should not be started in
+       * narrow-mode
+       */
+      if (private->force_narrow_mode)
+        private->narrow_mode = TRUE;
+      else
+        private->narrow_mode = FALSE;
+
+      /* If the rectangle is being modified we want the center on
+       * fixed_center to be at the center of the currently existing
+       * rectangle, otherwise we want the point where the user clicked
+       * to be the center on fixed_center.
+       */
+      private->center_x_on_fixed_center = snapped_x;
+      private->center_y_on_fixed_center = snapped_y;
+
+      /* When the user toggles modifier keys, we want to keep track of
+       * what coordinates the "other side" should have. If we are
+       * creating a rectangle, use the current mouse coordinates as
+       * the coordinate of the "other side", otherwise use the
+       * immediate "other side" for that.
+       */
+      private->other_side_x = snapped_x;
+      private->other_side_y = snapped_y;
+    }
+  else
+    {
+      /* This rectangle was not created from scratch. */
+      private->is_new = FALSE;
+
+      private->center_x_on_fixed_center = (private->x1 + private->x2) / 2;
+      private->center_y_on_fixed_center = (private->y1 + private->y2) / 2;
+
+      gimp_tool_rectangle_get_other_side_coord (rectangle,
+                                                &private->other_side_x,
+                                                &private->other_side_y);
+    }
+
+  gimp_tool_rectangle_update_int_rect (rectangle);
+
+  /* Is the rectangle being rubber-banded? */
+  private->rect_adjusting = gimp_tool_rectangle_rect_adjusting_func (rectangle);
+
+  gimp_tool_rectangle_changed (widget);
+
+  gimp_tool_rectangle_update_status (rectangle);
+
+  return 1;
+}
+
+void
+gimp_tool_rectangle_button_release (GimpToolWidget        *widget,
+                                    const GimpCoords      *coords,
+                                    guint32                time,
+                                    GdkModifierType        state,
+                                    GimpButtonReleaseType  release_type)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  gint                      response  = 0;
+
+  gimp_tool_widget_set_status (widget, NULL);
+
+  /* On button release, we are not rubber-banding the rectangle any longer. */
+  private->rect_adjusting = FALSE;
+
+  gimp_tool_widget_set_snap_offsets (widget, 0, 0, 0, 0);
+
+  switch (release_type)
+    {
+    case GIMP_BUTTON_RELEASE_NO_MOTION:
+      /* If the first created rectangle was not expanded, halt the
+       * tool...
+       */
+      if (gimp_tool_rectangle_rectangle_is_first (rectangle))
+        {
+          response = GIMP_TOOL_WIDGET_RESPONSE_CANCEL;
+          break;
+        }
+
+      /* ...else fallthrough and treat a long click without movement
+       * like a normal change
+       */
+
+    case GIMP_BUTTON_RELEASE_NORMAL:
+      /* If a normal click-drag-release actually created a rectangle
+       * with content...
+       */
+      if (private->x1 != private->x2 &&
+          private->y1 != private->y2)
+        {
+          gimp_tool_rectangle_change_complete (rectangle);
+          break;
+        }
+
+      /* ...else fallthrough and undo the operation, we can't have
+       * zero-extent rectangles
+       */
+
+    case GIMP_BUTTON_RELEASE_CANCEL:
+      private->x1 = private->saved_x1;
+      private->y1 = private->saved_y1;
+      private->x2 = private->saved_x2;
+      private->y2 = private->saved_y2;
+
+      gimp_tool_rectangle_update_int_rect (rectangle);
+
+      /* If the first created rectangle was canceled, halt the tool */
+      if (gimp_tool_rectangle_rectangle_is_first (rectangle))
+        response = GIMP_TOOL_WIDGET_RESPONSE_CANCEL;
+      break;
+
+    case GIMP_BUTTON_RELEASE_CLICK:
+      /* When a dead area is clicked, don't execute. */
+      if (private->function != GIMP_TOOL_RECTANGLE_DEAD)
+        response = GIMP_TOOL_WIDGET_RESPONSE_CONFIRM;
+      break;
+    }
+
+  /* We must update this. */
+  gimp_tool_rectangle_recalculate_center_xy (rectangle);
+
+  gimp_tool_rectangle_update_options (rectangle);
+
+  gimp_tool_rectangle_changed (widget);
+
+  private->is_first = FALSE;
+
+  /*  emit response at the end, so everything is up to date even if
+   *  a signal handler decides hot to shut down the rectangle
+   */
+  if (response != 0)
+    gimp_tool_widget_response (widget, response);
+}
+
+void
+gimp_tool_rectangle_motion (GimpToolWidget   *widget,
+                            const GimpCoords *coords,
+                            guint32           time,
+                            GdkModifierType   state)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  gdouble                   snapped_x;
+  gdouble                   snapped_y;
+  gint                      snap_x, snap_y;
+
+  /* Motion events should be ignored when we're just waiting for the
+   * button release event to execute or if the user has grabbed a dead
+   * area of the rectangle.
+   */
+  if (private->function == GIMP_TOOL_RECTANGLE_EXECUTING ||
+      private->function == GIMP_TOOL_RECTANGLE_DEAD)
+    return;
+
+  /* Handle snapping. */
+  gimp_tool_widget_get_snap_offsets (widget, &snap_x, &snap_y, NULL, NULL);
+
+  snapped_x = coords->x + snap_x;
+  snapped_y = coords->y + snap_y;
+
+  /* This is the core rectangle shape updating function: */
+  gimp_tool_rectangle_update_with_coord (rectangle, snapped_x, snapped_y);
+
+  gimp_tool_rectangle_update_status (rectangle);
+
+  if (private->function == GIMP_TOOL_RECTANGLE_CREATING)
+    {
+      GimpRectangleFunction function = GIMP_TOOL_RECTANGLE_CREATING;
+      gdouble               dx       = snapped_x - private->lastx;
+      gdouble               dy       = snapped_y - private->lasty;
+
+      /* When the user starts to move the cursor, set the current
+       * function to one of the corner-grabbed functions, depending on
+       * in what direction the user starts dragging the rectangle.
+       */
+      if (dx < 0)
+        {
+          function = (dy < 0 ?
+                      GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT :
+                      GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT);
+        }
+      else if (dx > 0)
+        {
+          function = (dy < 0 ?
+                      GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT :
+                      GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT);
+        }
+      else if (dy < 0)
+        {
+          function = (dx < 0 ?
+                      GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT :
+                      GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT);
+        }
+      else if (dy > 0)
+        {
+          function = (dx < 0 ?
+                      GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT :
+                      GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT);
+        }
+
+      gimp_tool_rectangle_set_function (rectangle, function);
+
+      if (private->fixed_rule_active &&
+          private->fixed_rule == GIMP_RECTANGLE_FIXED_SIZE)
+        {
+          /* For fixed size, set the function to moving immediately since the
+           * rectangle can not be resized anyway.
+           */
+
+          /* We fake a coord update to get the right size. */
+          gimp_tool_rectangle_update_with_coord (rectangle,
+                                                 snapped_x,
+                                                 snapped_y);
+
+          gimp_tool_widget_set_snap_offsets (widget,
+                                             -(private->x2 - private->x1) / 2,
+                                             -(private->y2 - private->y1) / 2,
+                                             private->x2 - private->x1,
+                                             private->y2 - private->y1);
+
+          gimp_tool_rectangle_set_function (rectangle,
+                                            GIMP_TOOL_RECTANGLE_MOVING);
+        }
+    }
+
+  gimp_tool_rectangle_update_options (rectangle);
+
+  private->lastx = snapped_x;
+  private->lasty = snapped_y;
+}
+
+GimpHit
+gimp_tool_rectangle_hit (GimpToolWidget   *widget,
+                         const GimpCoords *coords,
+                         GdkModifierType   state,
+                         gboolean          proximity)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  GimpRectangleFunction     function;
+
+  if (private->suppress_updates)
+    {
+      function = gimp_tool_rectangle_get_function (rectangle);
+    }
+  else
+    {
+      function = gimp_tool_rectangle_calc_function (rectangle,
+                                                    coords, proximity);
+    }
+
+  switch (function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      return GIMP_HIT_DIRECT;
+
+    case GIMP_TOOL_RECTANGLE_CREATING:
+    case GIMP_TOOL_RECTANGLE_MOVING:
+      return GIMP_HIT_INDIRECT;
+
+    case GIMP_TOOL_RECTANGLE_DEAD:
+    case GIMP_TOOL_RECTANGLE_AUTO_SHRINK:
+    case GIMP_TOOL_RECTANGLE_EXECUTING:
+    default:
+      return GIMP_HIT_NONE;
+    }
+}
+
+void
+gimp_tool_rectangle_hover (GimpToolWidget   *widget,
+                           const GimpCoords *coords,
+                           GdkModifierType   state,
+                           gboolean          proximity)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  GimpRectangleFunction     function;
+
+  if (private->suppress_updates)
+    {
+      private->suppress_updates--;
+      return;
+    }
+
+  function = gimp_tool_rectangle_calc_function (rectangle, coords, proximity);
+
+  gimp_tool_rectangle_set_function (rectangle, function);
+}
+
+static void
+gimp_tool_rectangle_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolRectangle *rectangle = GIMP_TOOL_RECTANGLE (widget);
+
+  gimp_tool_rectangle_set_function (rectangle, GIMP_TOOL_RECTANGLE_DEAD);
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static gboolean
+gimp_tool_rectangle_key_press (GimpToolWidget *widget,
+                               GdkEventKey    *kevent)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  gint                      dx        = 0;
+  gint                      dy        = 0;
+  gdouble                   new_x     = 0;
+  gdouble                   new_y     = 0;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Up:
+      dy = -1;
+      break;
+    case GDK_KEY_Left:
+      dx = -1;
+      break;
+    case GDK_KEY_Right:
+      dx = 1;
+      break;
+    case GDK_KEY_Down:
+      dy = 1;
+      break;
+
+    default:
+      return GIMP_TOOL_WIDGET_CLASS (parent_class)->key_press (widget, kevent);
+    }
+
+  /*  If the shift key is down, move by an accelerated increment  */
+  if (kevent->state & gimp_get_extend_selection_mask ())
+    {
+      dx *= ARROW_VELOCITY;
+      dy *= ARROW_VELOCITY;
+    }
+
+  gimp_tool_widget_set_snap_offsets (widget, 0, 0, 0, 0);
+
+  /*  Resize the rectangle if the mouse is over a handle, otherwise move it  */
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_MOVING:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+      new_x = private->x1 + dx;
+      new_y = private->y1 + dy;
+      private->lastx = new_x;
+      private->lasty = new_y;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+      new_x = private->x2 + dx;
+      new_y = private->y1 + dy;
+      private->lastx = new_x;
+      private->lasty = new_y;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+      new_x = private->x1 + dx;
+      new_y = private->y2 + dy;
+      private->lastx = new_x;
+      private->lasty = new_y;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+      new_x = private->x2 + dx;
+      new_y = private->y2 + dy;
+      private->lastx = new_x;
+      private->lasty = new_y;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      new_x = private->x1 + dx;
+      private->lastx = new_x;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      new_x = private->x2 + dx;
+      private->lastx = new_x;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      new_y = private->y1 + dy;
+      private->lasty = new_y;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      new_y = private->y2 + dy;
+      private->lasty = new_y;
+      break;
+
+    default:
+      return TRUE;
+    }
+
+  gimp_tool_rectangle_update_with_coord (rectangle, new_x, new_y);
+
+  gimp_tool_rectangle_recalculate_center_xy (rectangle);
+
+  gimp_tool_rectangle_update_options (rectangle);
+
+  gimp_tool_rectangle_change_complete (rectangle);
+
+  /*  Evil hack to suppress oper updates. We do this because we don't
+   *  want the rectangle tool to change function while the rectangle
+   *  is being resized or moved using the keyboard.
+   */
+  private->suppress_updates = 2;
+
+  return TRUE;
+}
+
+static void
+gimp_tool_rectangle_motion_modifier (GimpToolWidget  *widget,
+                                     GdkModifierType  key,
+                                     gboolean         press,
+                                     GdkModifierType  state)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+  gboolean                  button1_down;
+
+  button1_down = (state & GDK_BUTTON1_MASK);
+
+  if (key == gimp_get_extend_selection_mask ())
+    {
+#if 0
+      /* Here we want to handle manually when to update the rectangle, so we
+       * don't want gimp_tool_rectangle_options_notify to do anything.
+       */
+      g_signal_handlers_block_by_func (options,
+                                       gimp_tool_rectangle_options_notify,
+                                       rectangle);
+#endif
+
+      g_object_set (rectangle,
+                    "fixed-rule-active", ! private->fixed_rule_active,
+                    NULL);
+
+#if 0
+      g_signal_handlers_unblock_by_func (options,
+                                         gimp_tool_rectangle_options_notify,
+                                         rectangle);
+#endif
+
+      /* Only change the shape if the mouse is still down (i.e. the user is
+       * still editing the rectangle.
+       */
+      if (button1_down)
+        {
+          if (! private->fixed_rule_active)
+            {
+              /* Reset anchor point */
+              gimp_tool_rectangle_set_other_side_coord (rectangle,
+                                                        private->other_side_x,
+                                                        private->other_side_y);
+            }
+
+          gimp_tool_rectangle_update_with_coord (rectangle,
+                                                 private->lastx,
+                                                 private->lasty);
+        }
+    }
+
+  if (key == gimp_get_toggle_behavior_mask ())
+    {
+      g_object_set (rectangle,
+                    "fixed-center", ! private->fixed_center,
+                    NULL);
+
+      if (private->fixed_center)
+        {
+          gimp_tool_rectangle_update_with_coord (rectangle,
+                                                 private->lastx,
+                                                 private->lasty);
+
+          /* Only emit the rectangle-changed signal if the button is
+           * not down. If it is down, the signal will and shall be
+           * emitted on _button_release instead.
+           */
+          if (! button1_down)
+            {
+              gimp_tool_rectangle_change_complete (rectangle);
+            }
+        }
+      else if (button1_down)
+        {
+          /* If we are leaving fixed_center mode we want to set the
+           * "other side" where it should be. Don't do anything if we
+           * came here by a mouse-click though, since then the user
+           * has confirmed the shape and we don't want to modify it
+           * afterwards.
+           */
+          gimp_tool_rectangle_set_other_side_coord (rectangle,
+                                                    private->other_side_x,
+                                                    private->other_side_y);
+        }
+    }
+
+  gimp_tool_rectangle_update_options (rectangle);
+}
+
+static gboolean
+gimp_tool_rectangle_get_cursor (GimpToolWidget     *widget,
+                                const GimpCoords   *coords,
+                                GdkModifierType     state,
+                                GimpCursorType     *cursor,
+                                GimpToolCursorType *tool_cursor,
+                                GimpCursorModifier *modifier)
+{
+  GimpToolRectangle        *rectangle = GIMP_TOOL_RECTANGLE (widget);
+  GimpToolRectanglePrivate *private   = rectangle->private;
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_CREATING:
+      *cursor = GIMP_CURSOR_CROSSHAIR_SMALL;
+      break;
+    case GIMP_TOOL_RECTANGLE_MOVING:
+      *cursor   = GIMP_CURSOR_MOVE;
+      *modifier = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+      *cursor = GIMP_CURSOR_CORNER_TOP_LEFT;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+      *cursor = GIMP_CURSOR_CORNER_TOP_RIGHT;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+      *cursor = GIMP_CURSOR_CORNER_BOTTOM_LEFT;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+      *cursor = GIMP_CURSOR_CORNER_BOTTOM_RIGHT;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      *cursor = GIMP_CURSOR_SIDE_LEFT;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      *cursor = GIMP_CURSOR_SIDE_RIGHT;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      *cursor = GIMP_CURSOR_SIDE_TOP;
+      break;
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      *cursor = GIMP_CURSOR_SIDE_BOTTOM;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_tool_rectangle_change_complete (GimpToolRectangle *rectangle)
+{
+  g_signal_emit (rectangle, rectangle_signals[CHANGE_COMPLETE], 0);
+}
+
+static void
+gimp_tool_rectangle_update_options (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gdouble                   x1, y1;
+  gdouble                   x2, y2;
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+
+#if 0
+  g_signal_handlers_block_by_func (options,
+                                   gimp_tool_rectangle_options_notify,
+                                   rect_tool);
+#endif
+
+  g_object_freeze_notify (G_OBJECT (rectangle));
+
+  if (! FEQUAL (private->x, x1))
+    g_object_set (rectangle, "x", x1, NULL);
+
+  if (! FEQUAL (private->y, y1))
+    g_object_set (rectangle, "y", y1, NULL);
+
+  if (! FEQUAL (private->width, x2 - x1))
+    g_object_set (rectangle, "width", x2 - x1, NULL);
+
+  if (! FEQUAL (private->height, y2 - y1))
+    g_object_set (rectangle, "height", y2 - y1, NULL);
+
+  g_object_thaw_notify (G_OBJECT (rectangle));
+
+#if 0
+  g_signal_handlers_unblock_by_func (options,
+                                     gimp_tool_rectangle_options_notify,
+                                     rect_tool);
+#endif
+}
+
+static void
+gimp_tool_rectangle_update_handle_sizes (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  GimpDisplayShell         *shell;
+  gint                      visible_rectangle_width;
+  gint                      visible_rectangle_height;
+  gint                      rectangle_width;
+  gint                      rectangle_height;
+  gdouble                   pub_x1, pub_y1;
+  gdouble                   pub_x2, pub_y2;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+
+  gimp_tool_rectangle_get_public_rect (rectangle,
+                                       &pub_x1, &pub_y1, &pub_x2, &pub_y2);
+  {
+    /* Calculate rectangles of the selection rectangle and the display
+     * shell, with origin at (0, 0) of image, and in screen coordinate
+     * scale.
+     */
+    gint x1 =  pub_x1 * shell->scale_x;
+    gint y1 =  pub_y1 * shell->scale_y;
+    gint w1 = (pub_x2 - pub_x1) * shell->scale_x;
+    gint h1 = (pub_y2 - pub_y1) * shell->scale_y;
+
+    gint x2, y2, w2, h2;
+
+    gimp_display_shell_scroll_get_scaled_viewport (shell, &x2, &y2, &w2, &h2);
+
+    rectangle_width  = w1;
+    rectangle_height = h1;
+
+    /* Handle size calculations shall be based on the visible part of
+     * the rectangle, so calculate the size for the visible rectangle
+     * by intersecting with the viewport rectangle.
+     */
+    gimp_rectangle_intersect (x1, y1,
+                              w1, h1,
+                              x2, y2,
+                              w2, h2,
+                              NULL, NULL,
+                              &visible_rectangle_width,
+                              &visible_rectangle_height);
+
+    /* Determine if we are in narrow-mode or not. */
+    if (private->force_narrow_mode)
+      private->narrow_mode = TRUE;
+    else
+      private->narrow_mode = (visible_rectangle_width  < NARROW_MODE_THRESHOLD ||
+                              visible_rectangle_height < NARROW_MODE_THRESHOLD);
+  }
+
+  if (private->narrow_mode)
+    {
+      /* Corner handles always have the same (on-screen) size in
+       * narrow-mode.
+       */
+      private->corner_handle_w = NARROW_MODE_HANDLE_SIZE;
+      private->corner_handle_h = NARROW_MODE_HANDLE_SIZE;
+
+      private->top_and_bottom_handle_w = CLAMP (rectangle_width,
+                                                MIN (rectangle_width - 2,
+                                                     NARROW_MODE_HANDLE_SIZE),
+                                                G_MAXINT);
+      private->left_and_right_handle_h = CLAMP (rectangle_height,
+                                                MIN (rectangle_height - 2,
+                                                     NARROW_MODE_HANDLE_SIZE),
+                                                G_MAXINT);
+    }
+  else
+    {
+      /* Calculate and clamp corner handle size. */
+
+      private->corner_handle_w = visible_rectangle_width  / 4;
+      private->corner_handle_h = visible_rectangle_height / 4;
+
+      private->corner_handle_w = CLAMP (private->corner_handle_w,
+                                        MIN_HANDLE_SIZE,
+                                        MAX_HANDLE_SIZE);
+      private->corner_handle_h = CLAMP (private->corner_handle_h,
+                                        MIN_HANDLE_SIZE,
+                                        MAX_HANDLE_SIZE);
+
+      /* Calculate and clamp side handle size. */
+
+      private->top_and_bottom_handle_w = rectangle_width  - 3 * private->corner_handle_w;
+      private->left_and_right_handle_h = rectangle_height - 3 * private->corner_handle_h;
+
+      private->top_and_bottom_handle_w = CLAMP (private->top_and_bottom_handle_w,
+                                                MIN_HANDLE_SIZE,
+                                                G_MAXINT);
+      private->left_and_right_handle_h = CLAMP (private->left_and_right_handle_h,
+                                                MIN_HANDLE_SIZE,
+                                                G_MAXINT);
+    }
+}
+
+static void
+gimp_tool_rectangle_update_status (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gdouble                   x1, y1, x2, y2;
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+
+  if (private->function == GIMP_TOOL_RECTANGLE_MOVING)
+    {
+      gimp_tool_widget_set_status_coords (GIMP_TOOL_WIDGET (rectangle),
+                                          _("Position: "),
+                                          x1, ", ", y1,
+                                          NULL);
+    }
+  else
+    {
+      gchar *aspect_text = NULL;
+      gint   width       = x2 - x1;
+      gint   height      = y2 - y1;
+
+      if (width > 0.0 && height > 0.0)
+        {
+          aspect_text = g_strdup_printf ("  (%.2f:1)",
+                                         (gdouble) width / (gdouble) height);
+        }
+
+      gimp_tool_widget_set_status_coords (GIMP_TOOL_WIDGET (rectangle),
+                                          private->status_title,
+                                          width, " × ", height,
+                                          aspect_text);
+      g_free (aspect_text);
+    }
+}
+
+static void
+gimp_tool_rectangle_synthesize_motion (GimpToolRectangle *rectangle,
+                                       gint               function,
+                                       gdouble            new_x,
+                                       gdouble            new_y)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  GimpRectangleFunction     old_function;
+
+  /* We don't want to synthesize motions if the tool control is active
+   * since that means the mouse button is down and the rectangle will
+   * get updated in _motion anyway. The reason we want to prevent this
+   * function from executing is that is emits the
+   * rectangle-changed-complete signal which we don't want in the
+   * middle of a rectangle change.
+   *
+   * In addition to that, we don't want to synthesize a motion if
+   * there is no pending rectangle because that doesn't make any
+   * sense.
+   */
+  if (private->rect_adjusting)
+    return;
+
+  old_function = private->function;
+
+  gimp_tool_rectangle_set_function (rectangle, function);
+
+  gimp_tool_rectangle_update_with_coord (rectangle, new_x, new_y);
+
+  /* We must update this. */
+  gimp_tool_rectangle_recalculate_center_xy (rectangle);
+
+  gimp_tool_rectangle_update_options (rectangle);
+
+  gimp_tool_rectangle_set_function (rectangle, old_function);
+
+  gimp_tool_rectangle_change_complete (rectangle);
+}
+
+static void
+swap_doubles (gdouble *i,
+              gdouble *j)
+{
+  gdouble tmp;
+
+  tmp = *i;
+  *i = *j;
+  *j = tmp;
+}
+
+static GimpRectangleFunction
+gimp_tool_rectangle_calc_function (GimpToolRectangle *rectangle,
+                                   const GimpCoords  *coords,
+                                   gboolean           proximity)
+{
+  if (! proximity)
+    {
+      return GIMP_TOOL_RECTANGLE_DEAD;
+    }
+  else if (gimp_tool_rectangle_coord_outside (rectangle, coords))
+    {
+      /* The cursor is outside of the rectangle, clicking should
+       * create a new rectangle.
+       */
+      return GIMP_TOOL_RECTANGLE_CREATING;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_NORTH_WEST))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_SOUTH_EAST))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT;
+    }
+  else if  (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                 coords,
+                                                 GIMP_HANDLE_ANCHOR_NORTH_EAST))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_SOUTH_WEST))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_WEST))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_LEFT;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_EAST))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_RIGHT;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_NORTH))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_TOP;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_SOUTH))
+    {
+      return GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM;
+    }
+  else if (gimp_tool_rectangle_coord_on_handle (rectangle,
+                                                coords,
+                                                GIMP_HANDLE_ANCHOR_CENTER))
+    {
+      return GIMP_TOOL_RECTANGLE_MOVING;
+    }
+  else
+    {
+      return GIMP_TOOL_RECTANGLE_DEAD;
+    }
+}
+
+/* gimp_tool_rectangle_check_function() is needed to deal with
+ * situations where the user drags a corner or edge across one of the
+ * existing edges, thereby changing its function.  Ugh.
+ */
+static void
+gimp_tool_rectangle_check_function (GimpToolRectangle *rectangle)
+
+{
+  GimpToolRectanglePrivate *private  = rectangle->private;
+  GimpRectangleFunction     function = private->function;
+
+  if (private->x2 < private->x1)
+    {
+      swap_doubles (&private->x1, &private->x2);
+
+      switch (function)
+        {
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_RIGHT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_LEFT;
+          break;
+          /* avoid annoying warnings about unhandled enums */
+        default:
+          break;
+        }
+    }
+
+  if (private->y2 < private->y1)
+    {
+      swap_doubles (&private->y1, &private->y2);
+
+      switch (function)
+        {
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM;
+          break;
+        case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+          function = GIMP_TOOL_RECTANGLE_RESIZING_TOP;
+          break;
+        default:
+          break;
+        }
+    }
+
+  gimp_tool_rectangle_set_function (rectangle, function);
+}
+
+/**
+ * gimp_tool_rectangle_coord_outside:
+ *
+ * Returns: %TRUE if the coord is outside the rectangle bounds
+ *          including any outside handles.
+ */
+static gboolean
+gimp_tool_rectangle_coord_outside (GimpToolRectangle *rectangle,
+                                   const GimpCoords  *coord)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  GimpDisplayShell         *shell;
+  gboolean                  narrow_mode = private->narrow_mode;
+  gdouble                   x1, y1, x2, y2;
+  gdouble                   x1_b, y1_b, x2_b, y2_b;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+
+  x1_b = x1 - (narrow_mode ? private->corner_handle_w / shell->scale_x : 0);
+  x2_b = x2 + (narrow_mode ? private->corner_handle_w / shell->scale_x : 0);
+  y1_b = y1 - (narrow_mode ? private->corner_handle_h / shell->scale_y : 0);
+  y2_b = y2 + (narrow_mode ? private->corner_handle_h / shell->scale_y : 0);
+
+  return (coord->x < x1_b ||
+          coord->x > x2_b ||
+          coord->y < y1_b ||
+          coord->y > y2_b);
+}
+
+/**
+ * gimp_tool_rectangle_coord_on_handle:
+ *
+ * Returns: %TRUE if the coord is on the handle that corresponds to
+ *          @anchor.
+ */
+static gboolean
+gimp_tool_rectangle_coord_on_handle (GimpToolRectangle *rectangle,
+                                     const GimpCoords  *coords,
+                                     GimpHandleAnchor   anchor)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  GimpDisplayShell         *shell;
+  gdouble                   x1, y1, x2, y2;
+  gdouble                   rect_w, rect_h;
+  gdouble                   handle_x          = 0;
+  gdouble                   handle_y          = 0;
+  gdouble                   handle_width      = 0;
+  gdouble                   handle_height     = 0;
+  gint                      narrow_mode_x_dir = 0;
+  gint                      narrow_mode_y_dir = 0;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+
+  rect_w = x2 - x1;
+  rect_h = y2 - y1;
+
+  switch (anchor)
+    {
+    case GIMP_HANDLE_ANCHOR_NORTH_WEST:
+      handle_x      = x1;
+      handle_y      = y1;
+      handle_width  = private->corner_handle_w;
+      handle_height = private->corner_handle_h;
+
+      narrow_mode_x_dir = -1;
+      narrow_mode_y_dir = -1;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_EAST:
+      handle_x      = x2;
+      handle_y      = y2;
+      handle_width  = private->corner_handle_w;
+      handle_height = private->corner_handle_h;
+
+      narrow_mode_x_dir =  1;
+      narrow_mode_y_dir =  1;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH_EAST:
+      handle_x      = x2;
+      handle_y      = y1;
+      handle_width  = private->corner_handle_w;
+      handle_height = private->corner_handle_h;
+
+      narrow_mode_x_dir =  1;
+      narrow_mode_y_dir = -1;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH_WEST:
+      handle_x      = x1;
+      handle_y      = y2;
+      handle_width  = private->corner_handle_w;
+      handle_height = private->corner_handle_h;
+
+      narrow_mode_x_dir = -1;
+      narrow_mode_y_dir =  1;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_WEST:
+      handle_x      = x1;
+      handle_y      = y1 + rect_h / 2;
+      handle_width  = private->corner_handle_w;
+      handle_height = private->left_and_right_handle_h;
+
+      narrow_mode_x_dir = -1;
+      narrow_mode_y_dir =  0;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_EAST:
+      handle_x      = x2;
+      handle_y      = y1 + rect_h / 2;
+      handle_width  = private->corner_handle_w;
+      handle_height = private->left_and_right_handle_h;
+
+      narrow_mode_x_dir =  1;
+      narrow_mode_y_dir =  0;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_NORTH:
+      handle_x      = x1 + rect_w / 2;
+      handle_y      = y1;
+      handle_width  = private->top_and_bottom_handle_w;
+      handle_height = private->corner_handle_h;
+
+      narrow_mode_x_dir =  0;
+      narrow_mode_y_dir = -1;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_SOUTH:
+      handle_x      = x1 + rect_w / 2;
+      handle_y      = y2;
+      handle_width  = private->top_and_bottom_handle_w;
+      handle_height = private->corner_handle_h;
+
+      narrow_mode_x_dir =  0;
+      narrow_mode_y_dir =  1;
+      break;
+
+    case GIMP_HANDLE_ANCHOR_CENTER:
+      handle_x      = x1 + rect_w / 2;
+      handle_y      = y1 + rect_h / 2;
+
+      if (private->narrow_mode)
+        {
+          handle_width  = rect_w * shell->scale_x;
+          handle_height = rect_h * shell->scale_y;
+        }
+      else
+        {
+          handle_width  = rect_w * shell->scale_x - private->corner_handle_w * 2;
+          handle_height = rect_h * shell->scale_y - private->corner_handle_h * 2;
+        }
+
+      narrow_mode_x_dir =  0;
+      narrow_mode_y_dir =  0;
+      break;
+    }
+
+  if (private->narrow_mode)
+    {
+      handle_x += narrow_mode_x_dir * handle_width  / shell->scale_x;
+      handle_y += narrow_mode_y_dir * handle_height / shell->scale_y;
+    }
+
+  return gimp_canvas_item_on_handle (private->rectangle,
+                                     coords->x, coords->y,
+                                     GIMP_HANDLE_SQUARE,
+                                     handle_x,     handle_y,
+                                     handle_width, handle_height,
+                                     anchor);
+}
+
+static GimpHandleAnchor
+gimp_tool_rectangle_get_anchor (GimpRectangleFunction function)
+{
+  switch (function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+      return GIMP_HANDLE_ANCHOR_NORTH_WEST;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+      return GIMP_HANDLE_ANCHOR_NORTH_EAST;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+      return GIMP_HANDLE_ANCHOR_SOUTH_WEST;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+      return GIMP_HANDLE_ANCHOR_SOUTH_EAST;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      return GIMP_HANDLE_ANCHOR_WEST;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      return GIMP_HANDLE_ANCHOR_EAST;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      return GIMP_HANDLE_ANCHOR_NORTH;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      return GIMP_HANDLE_ANCHOR_SOUTH;
+
+    default:
+      return GIMP_HANDLE_ANCHOR_CENTER;
+    }
+}
+
+static gboolean
+gimp_tool_rectangle_rect_rubber_banding_func (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_CREATING:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_AUTO_SHRINK:
+      return TRUE;
+
+    case GIMP_TOOL_RECTANGLE_MOVING:
+    case GIMP_TOOL_RECTANGLE_DEAD:
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_tool_rectangle_rect_adjusting_func:
+ * @rectangle:
+ *
+ * Returns: %TRUE if the current function is a rectangle adjusting
+ *          function.
+ */
+static gboolean
+gimp_tool_rectangle_rect_adjusting_func (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  return (gimp_tool_rectangle_rect_rubber_banding_func (rectangle) ||
+          private->function == GIMP_TOOL_RECTANGLE_MOVING);
+}
+
+/**
+ * gimp_tool_rectangle_get_other_side:
+ * @rectangle: A #GimpToolRectangle.
+ * @other_x:   Pointer to double of the other-x double.
+ * @other_y:   Pointer to double of the other-y double.
+ *
+ * Calculates pointers to member variables that hold the coordinates
+ * of the opposite side (either the opposite corner or literally the
+ * opposite side), based on the current function. The opposite of a
+ * corner needs two coordinates, the opposite of a side only needs
+ * one.
+ */
+static void
+gimp_tool_rectangle_get_other_side (GimpToolRectangle  *rectangle,
+                                    gdouble           **other_x,
+                                    gdouble           **other_y)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      *other_x = &private->x1;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      *other_x = &private->x2;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+    default:
+      *other_x = NULL;
+      break;
+    }
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      *other_y = &private->y1;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      *other_y = &private->y2;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+    default:
+      *other_y = NULL;
+      break;
+    }
+}
+
+static void
+gimp_tool_rectangle_get_other_side_coord (GimpToolRectangle *rectangle,
+                                          gdouble           *other_side_x,
+                                          gdouble           *other_side_y)
+{
+  gdouble *other_x = NULL;
+  gdouble *other_y = NULL;
+
+  gimp_tool_rectangle_get_other_side (rectangle, &other_x, &other_y);
+
+  if (other_x)
+    *other_side_x = *other_x;
+  if (other_y)
+    *other_side_y = *other_y;
+}
+
+static void
+gimp_tool_rectangle_set_other_side_coord (GimpToolRectangle *rectangle,
+                                          gdouble            other_side_x,
+                                          gdouble            other_side_y)
+{
+  gdouble *other_x = NULL;
+  gdouble *other_y = NULL;
+
+  gimp_tool_rectangle_get_other_side (rectangle, &other_x, &other_y);
+
+  if (other_x)
+    *other_x = other_side_x;
+  if (other_y)
+    *other_y = other_side_y;
+
+  gimp_tool_rectangle_check_function (rectangle);
+
+  gimp_tool_rectangle_update_int_rect (rectangle);
+}
+
+/**
+ * gimp_tool_rectangle_apply_coord:
+ * @param:     A #GimpToolRectangle.
+ * @coord_x:   X of coord.
+ * @coord_y:   Y of coord.
+ *
+ * Adjust the rectangle to the new position specified by passed
+ * coordinate, taking fixed_center into account, which means it
+ * expands the rectangle around the center point.
+ */
+static void
+gimp_tool_rectangle_apply_coord (GimpToolRectangle *rectangle,
+                                 gdouble            coord_x,
+                                 gdouble            coord_y)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  if (private->function == GIMP_TOOL_RECTANGLE_MOVING)
+    {
+      /* Preserve width and height while moving the grab-point to where the
+       * cursor is.
+       */
+      gdouble w = private->x2 - private->x1;
+      gdouble h = private->y2 - private->y1;
+
+      private->x1 = coord_x;
+      private->y1 = coord_y;
+
+      private->x2 = private->x1 + w;
+      private->y2 = private->y1 + h;
+
+      /* We are done already. */
+      return;
+    }
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      private->x1 = coord_x;
+
+      if (private->fixed_center)
+        private->x2 = 2 * private->center_x_on_fixed_center - private->x1;
+
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      private->x2 = coord_x;
+
+      if (private->fixed_center)
+        private->x1 = 2 * private->center_x_on_fixed_center - private->x2;
+
+      break;
+
+    default:
+      break;
+    }
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      private->y1 = coord_y;
+
+      if (private->fixed_center)
+        private->y2 = 2 * private->center_y_on_fixed_center - private->y1;
+
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      private->y2 = coord_y;
+
+      if (private->fixed_center)
+        private->y1 = 2 * private->center_y_on_fixed_center - private->y2;
+
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gimp_tool_rectangle_setup_snap_offsets (GimpToolRectangle *rectangle,
+                                        const GimpCoords  *coords)
+{
+  GimpToolWidget           *widget  = GIMP_TOOL_WIDGET (rectangle);
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gdouble                   x1, y1, x2, y2;
+  gdouble                   coord_x, coord_y;
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+  gimp_tool_rectangle_adjust_coord (rectangle,
+                                    coords->x, coords->y,
+                                    &coord_x, &coord_y);
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_CREATING:
+      gimp_tool_widget_set_snap_offsets (widget, 0, 0, 0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x1 - coord_x,
+                                         y1 - coord_y,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x2 - coord_x,
+                                         y1 - coord_y,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x1 - coord_x,
+                                         y2 - coord_y,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x2 - coord_x,
+                                         y2 - coord_y,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x1 - coord_x, 0,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x2 - coord_x, 0,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         0, y1 - coord_y,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         0, y2 - coord_y,
+                                         0, 0);
+      break;
+
+    case GIMP_TOOL_RECTANGLE_MOVING:
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         x1 - coord_x,
+                                         y1 - coord_y,
+                                         x2 - x1,
+                                         y2 - y1);
+      break;
+
+    default:
+      break;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_clamp:
+ * @rectangle:      A #GimpToolRectangle.
+ * @clamped_sides:  Where to put contrainment information.
+ * @constraint:     Constraint to use.
+ * @symmetrically:  Whether or not to clamp symmetrically.
+ *
+ * Clamps rectangle inside specified bounds, providing information of
+ * where clamping was done. Can also clamp symmetrically.
+ */
+static void
+gimp_tool_rectangle_clamp (GimpToolRectangle       *rectangle,
+                           ClampedSide             *clamped_sides,
+                           GimpRectangleConstraint  constraint,
+                           gboolean                 symmetrically)
+{
+  gimp_tool_rectangle_clamp_width (rectangle,
+                                   clamped_sides,
+                                   constraint,
+                                   symmetrically);
+
+  gimp_tool_rectangle_clamp_height (rectangle,
+                                    clamped_sides,
+                                    constraint,
+                                    symmetrically);
+}
+
+/**
+ * gimp_tool_rectangle_clamp_width:
+ * @rectangle:      A #GimpToolRectangle.
+ * @clamped_sides:  Where to put contrainment information.
+ * @constraint:     Constraint to use.
+ * @symmetrically:  Whether or not to clamp symmetrically.
+ *
+ * Clamps height of rectangle. Set symmetrically to true when using
+ * for fixed_center:ed rectangles, since that will clamp symmetrically
+ * which is just what is needed.
+ *
+ * When this function constrains, it puts what it constrains in
+ * @constraint. This information is essential when an aspect ratio is
+ * to be applied.
+ */
+static void
+gimp_tool_rectangle_clamp_width (GimpToolRectangle       *rectangle,
+                                 ClampedSide             *clamped_sides,
+                                 GimpRectangleConstraint  constraint,
+                                 gboolean                 symmetrically)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gint                      min_x;
+  gint                      max_x;
+
+  if (constraint == GIMP_RECTANGLE_CONSTRAIN_NONE)
+    return;
+
+  gimp_tool_rectangle_get_constraints (rectangle,
+                                       &min_x, NULL,
+                                       &max_x, NULL,
+                                       constraint);
+  if (private->x1 < min_x)
+    {
+      gdouble dx = min_x - private->x1;
+
+      private->x1 += dx;
+
+      if (symmetrically)
+        private->x2 -= dx;
+
+      if (private->x2 < min_x)
+        private->x2 = min_x;
+
+      if (clamped_sides)
+        *clamped_sides |= CLAMPED_LEFT;
+    }
+
+  if (private->x2 > max_x)
+    {
+      gdouble dx = max_x - private->x2;
+
+      private->x2 += dx;
+
+      if (symmetrically)
+        private->x1 -= dx;
+
+      if (private->x1 > max_x)
+        private->x1 = max_x;
+
+      if (clamped_sides)
+        *clamped_sides |= CLAMPED_RIGHT;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_clamp_height:
+ * @rectangle:      A #GimpToolRectangle.
+ * @clamped_sides:  Where to put contrainment information.
+ * @constraint:     Constraint to use.
+ * @symmetrically:  Whether or not to clamp symmetrically.
+ *
+ * Clamps height of rectangle. Set symmetrically to true when using for
+ * fixed_center:ed rectangles, since that will clamp symmetrically which is just
+ * what is needed.
+ *
+ * When this function constrains, it puts what it constrains in
+ * @constraint. This information is essential when an aspect ratio is to be
+ * applied.
+ */
+static void
+gimp_tool_rectangle_clamp_height (GimpToolRectangle       *rectangle,
+                                  ClampedSide             *clamped_sides,
+                                  GimpRectangleConstraint  constraint,
+                                  gboolean                 symmetrically)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gint                      min_y;
+  gint                      max_y;
+
+  if (constraint == GIMP_RECTANGLE_CONSTRAIN_NONE)
+    return;
+
+  gimp_tool_rectangle_get_constraints (rectangle,
+                                       NULL, &min_y,
+                                       NULL, &max_y,
+                                       constraint);
+  if (private->y1 < min_y)
+    {
+      gdouble dy = min_y - private->y1;
+
+      private->y1 += dy;
+
+      if (symmetrically)
+        private->y2 -= dy;
+
+      if (private->y2 < min_y)
+        private->y2 = min_y;
+
+      if (clamped_sides)
+        *clamped_sides |= CLAMPED_TOP;
+    }
+
+  if (private->y2 > max_y)
+    {
+      gdouble dy = max_y - private->y2;
+
+      private->y2 += dy;
+
+      if (symmetrically)
+        private->y1 -= dy;
+
+      if (private->y1 > max_y)
+        private->y1 = max_y;
+
+      if (clamped_sides)
+        *clamped_sides |= CLAMPED_BOTTOM;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_keep_inside:
+ * @rectangle: A #GimpToolRectangle.
+ *
+ * If the rectangle is outside of the canvas, move it into it. If the rectangle is
+ * larger than the canvas in any direction, make it fill the canvas in that direction.
+ */
+static void
+gimp_tool_rectangle_keep_inside (GimpToolRectangle      *rectangle,
+                                 GimpRectangleConstraint constraint)
+{
+  gimp_tool_rectangle_keep_inside_horizontally (rectangle, constraint);
+  gimp_tool_rectangle_keep_inside_vertically   (rectangle, constraint);
+}
+
+/**
+ * gimp_tool_rectangle_keep_inside_horizontally:
+ * @rectangle:      A #GimpToolRectangle.
+ * @constraint:     Constraint to use.
+ *
+ * If the rectangle is outside of the given constraint horizontally, move it
+ * inside. If it is too big to fit inside, make it just as big as the width
+ * limit.
+ */
+static void
+gimp_tool_rectangle_keep_inside_horizontally (GimpToolRectangle       *rectangle,
+                                              GimpRectangleConstraint  constraint)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gint                      min_x;
+  gint                      max_x;
+
+  if (constraint == GIMP_RECTANGLE_CONSTRAIN_NONE)
+    return;
+
+  gimp_tool_rectangle_get_constraints (rectangle,
+                                       &min_x, NULL,
+                                       &max_x, NULL,
+                                       constraint);
+
+  if (max_x - min_x < private->x2 - private->x1)
+    {
+      private->x1 = min_x;
+      private->x2 = max_x;
+    }
+  else
+    {
+      if (private->x1 < min_x)
+        {
+          gdouble dx = min_x - private->x1;
+
+          private->x1 += dx;
+          private->x2 += dx;
+        }
+      if (private->x2 > max_x)
+        {
+          gdouble dx = max_x - private->x2;
+
+          private->x1 += dx;
+          private->x2 += dx;
+        }
+    }
+}
+
+/**
+ * gimp_tool_rectangle_keep_inside_vertically:
+ * @rectangle:      A #GimpToolRectangle.
+ * @constraint:     Constraint to use.
+ *
+ * If the rectangle is outside of the given constraint vertically,
+ * move it inside. If it is too big to fit inside, make it just as big
+ * as the width limit.
+ */
+static void
+gimp_tool_rectangle_keep_inside_vertically (GimpToolRectangle       *rectangle,
+                                            GimpRectangleConstraint  constraint)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gint                      min_y;
+  gint                      max_y;
+
+  if (constraint == GIMP_RECTANGLE_CONSTRAIN_NONE)
+    return;
+
+  gimp_tool_rectangle_get_constraints (rectangle,
+                                       NULL, &min_y,
+                                       NULL, &max_y,
+                                       constraint);
+
+  if (max_y - min_y < private->y2 - private->y1)
+    {
+      private->y1 = min_y;
+      private->y2 = max_y;
+    }
+  else
+    {
+      if (private->y1 < min_y)
+        {
+          gdouble dy = min_y - private->y1;
+
+          private->y1 += dy;
+          private->y2 += dy;
+        }
+      if (private->y2 > max_y)
+        {
+          gdouble dy = max_y - private->y2;
+
+          private->y1 += dy;
+          private->y2 += dy;
+        }
+    }
+}
+
+/**
+ * gimp_tool_rectangle_apply_fixed_width:
+ * @rectangle:      A #GimpToolRectangle.
+ * @constraint:     Constraint to use.
+ * @width:
+ *
+ * Makes the rectangle have a fixed_width, following the constrainment
+ * rules of fixed widths as well. Please refer to the rectangle tools
+ * spec.
+ */
+static void
+gimp_tool_rectangle_apply_fixed_width (GimpToolRectangle      *rectangle,
+                                       GimpRectangleConstraint constraint,
+                                       gdouble                 width)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+      /* We always want to center around fixed_center here, since we want the
+       * anchor point to be directly on the opposite side.
+       */
+      private->x1 = private->center_x_on_fixed_center -
+                    width / 2;
+      private->x2 = private->x1 + width;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+      /* We always want to center around fixed_center here, since we want the
+       * anchor point to be directly on the opposite side.
+       */
+      private->x1 = private->center_x_on_fixed_center -
+                    width / 2;
+      private->x2 = private->x1 + width;
+      break;
+
+    default:
+      break;
+    }
+
+  /* Width shall be kept even after constraints, so we move the
+   * rectangle sideways rather than adjusting a side.
+   */
+  gimp_tool_rectangle_keep_inside_horizontally (rectangle, constraint);
+}
+
+/**
+ * gimp_tool_rectangle_apply_fixed_height:
+ * @rectangle:      A #GimpToolRectangle.
+ * @constraint:     Constraint to use.
+ * @height:
+ *
+ * Makes the rectangle have a fixed_height, following the
+ * constrainment rules of fixed heights as well. Please refer to the
+ * rectangle tools spec.
+ */
+static void
+gimp_tool_rectangle_apply_fixed_height (GimpToolRectangle      *rectangle,
+                                        GimpRectangleConstraint constraint,
+                                        gdouble                 height)
+
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  switch (private->function)
+    {
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+      /* We always want to center around fixed_center here, since we
+       * want the anchor point to be directly on the opposite side.
+       */
+      private->y1 = private->center_y_on_fixed_center -
+                    height / 2;
+      private->y2 = private->y1 + height;
+      break;
+
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+    case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+      /* We always want to center around fixed_center here, since we
+       * want the anchor point to be directly on the opposite side.
+       */
+      private->y1 = private->center_y_on_fixed_center -
+                    height / 2;
+      private->y2 = private->y1 + height;
+      break;
+
+    default:
+      break;
+    }
+
+  /* Width shall be kept even after constraints, so we move the
+   * rectangle sideways rather than adjusting a side.
+   */
+  gimp_tool_rectangle_keep_inside_vertically (rectangle, constraint);
+}
+
+/**
+ * gimp_tool_rectangle_apply_aspect:
+ * @rectangle:      A #GimpToolRectangle.
+ * @aspect:         The desired aspect.
+ * @clamped_sides:  Bitfield of sides that have been clamped.
+ *
+ * Adjust the rectangle to the desired aspect.
+ *
+ * Sometimes, a side must not be moved outwards, for example if a the
+ * RIGHT side has been clamped previously, we must not move the RIGHT
+ * side to the right, since that would violate the constraint
+ * again. The clamped_sides bitfield keeps track of sides that have
+ * previously been clamped.
+ *
+ * If fixed_center is used, the function adjusts the aspect by
+ * symmetrically adjusting the left and right, or top and bottom side.
+ */
+static void
+gimp_tool_rectangle_apply_aspect (GimpToolRectangle *rectangle,
+                                  gdouble            aspect,
+                                  gint               clamped_sides)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  gdouble                   current_w;
+  gdouble                   current_h;
+  gdouble                   current_aspect;
+  SideToResize              side_to_resize = SIDE_TO_RESIZE_NONE;
+
+  current_w = private->x2 - private->x1;
+  current_h = private->y2 - private->y1;
+
+  current_aspect = (gdouble) current_w / (gdouble) current_h;
+
+  /* Do we have to do anything? */
+  if (current_aspect == aspect)
+    return;
+
+  if (private->fixed_center)
+    {
+      /* We may only adjust the sides symmetrically to get desired aspect. */
+      if (current_aspect > aspect)
+        {
+          /* We prefer to use top and bottom (since that will make the
+           * cursor remain on the rectangle edge), unless that is what
+           * the user has grabbed.
+           */
+          switch (private->function)
+            {
+            case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+              if (! (clamped_sides & CLAMPED_TOP) &&
+                  ! (clamped_sides & CLAMPED_BOTTOM))
+                {
+                  side_to_resize = SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY;
+                }
+              else
+                {
+                  side_to_resize = SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY;
+                }
+              break;
+
+            case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+            case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+            default:
+              side_to_resize = SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY;
+              break;
+            }
+        }
+      else /* (current_aspect < aspect) */
+        {
+          /* We prefer to use left and right (since that will make the
+           * cursor remain on the rectangle edge), unless that is what
+           * the user has grabbed.
+           */
+          switch (private->function)
+            {
+            case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+            case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+            case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+              if (! (clamped_sides & CLAMPED_LEFT) &&
+                  ! (clamped_sides & CLAMPED_RIGHT))
+                {
+                  side_to_resize = SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY;
+                }
+              else
+                {
+                  side_to_resize = SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY;
+                }
+              break;
+
+            case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+            case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+            default:
+              side_to_resize = SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY;
+              break;
+            }
+        }
+    }
+  else if (current_aspect > aspect)
+    {
+      /* We can safely pick LEFT or RIGHT, since using those sides
+       * will make the rectangle smaller, so we don't need to check
+       * for clamped_sides. We may only use TOP and BOTTOM if not
+       * those sides have been clamped, since using them will make the
+       * rectangle bigger.
+       */
+      switch (private->function)
+        {
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+          if (! (clamped_sides & CLAMPED_TOP))
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          else
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+          if (! (clamped_sides & CLAMPED_TOP))
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          else
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+          if (! (clamped_sides & CLAMPED_BOTTOM))
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          else
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+          if (! (clamped_sides & CLAMPED_BOTTOM))
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          else
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+          if (! (clamped_sides & CLAMPED_TOP) &&
+              ! (clamped_sides & CLAMPED_BOTTOM))
+            side_to_resize = SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY;
+          else
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+          if (! (clamped_sides & CLAMPED_TOP) &&
+              ! (clamped_sides & CLAMPED_BOTTOM))
+            side_to_resize = SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY;
+          else
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+        case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+          side_to_resize = SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_MOVING:
+        default:
+          if (! (clamped_sides & CLAMPED_BOTTOM))
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          else if (! (clamped_sides & CLAMPED_RIGHT))
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          else if (! (clamped_sides & CLAMPED_TOP))
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          else if (! (clamped_sides & CLAMPED_LEFT))
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          break;
+        }
+    }
+  else /* (current_aspect < aspect) */
+    {
+      /* We can safely pick TOP or BOTTOM, since using those sides
+       * will make the rectangle smaller, so we don't need to check
+       * for clamped_sides. We may only use LEFT and RIGHT if not
+       * those sides have been clamped, since using them will make the
+       * rectangle bigger.
+       */
+      switch (private->function)
+        {
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT:
+          if (! (clamped_sides & CLAMPED_LEFT))
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          else
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT:
+          if (! (clamped_sides & CLAMPED_RIGHT))
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          else
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT:
+          if (! (clamped_sides & CLAMPED_LEFT))
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          else
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT:
+          if (! (clamped_sides & CLAMPED_RIGHT))
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          else
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_TOP:
+          if (! (clamped_sides & CLAMPED_LEFT) &&
+              ! (clamped_sides & CLAMPED_RIGHT))
+            side_to_resize = SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY;
+          else
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM:
+          if (! (clamped_sides & CLAMPED_LEFT) &&
+              ! (clamped_sides & CLAMPED_RIGHT))
+            side_to_resize = SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY;
+          else
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_RESIZING_LEFT:
+        case GIMP_TOOL_RECTANGLE_RESIZING_RIGHT:
+          side_to_resize = SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY;
+          break;
+
+        case GIMP_TOOL_RECTANGLE_MOVING:
+        default:
+          if (! (clamped_sides & CLAMPED_BOTTOM))
+            side_to_resize = SIDE_TO_RESIZE_BOTTOM;
+          else if (! (clamped_sides & CLAMPED_RIGHT))
+            side_to_resize = SIDE_TO_RESIZE_RIGHT;
+          else if (! (clamped_sides & CLAMPED_TOP))
+            side_to_resize = SIDE_TO_RESIZE_TOP;
+          else if (! (clamped_sides & CLAMPED_LEFT))
+            side_to_resize = SIDE_TO_RESIZE_LEFT;
+          break;
+        }
+    }
+
+  /* We now know what side(s) we should resize, so now we just solve
+   * the aspect equation for that side(s).
+   */
+  switch (side_to_resize)
+    {
+    case SIDE_TO_RESIZE_NONE:
+      return;
+
+    case SIDE_TO_RESIZE_LEFT:
+      private->x1 = private->x2 - aspect * current_h;
+      break;
+
+    case SIDE_TO_RESIZE_RIGHT:
+      private->x2 = private->x1 + aspect * current_h;
+      break;
+
+    case SIDE_TO_RESIZE_TOP:
+      private->y1 = private->y2 - current_w / aspect;
+      break;
+
+    case SIDE_TO_RESIZE_BOTTOM:
+      private->y2 = private->y1 + current_w / aspect;
+      break;
+
+    case SIDE_TO_RESIZE_TOP_AND_BOTTOM_SYMMETRICALLY:
+      {
+        gdouble correct_h = current_w / aspect;
+
+        private->y1 = private->center_y_on_fixed_center - correct_h / 2;
+        private->y2 = private->y1 + correct_h;
+      }
+      break;
+
+    case SIDE_TO_RESIZE_LEFT_AND_RIGHT_SYMMETRICALLY:
+      {
+        gdouble correct_w = current_h * aspect;
+
+        private->x1 = private->center_x_on_fixed_center - correct_w / 2;
+        private->x2 = private->x1 + correct_w;
+      }
+      break;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_update_with_coord:
+ * @rectangle:      A #GimpToolRectangle.
+ * @new_x:          New X-coordinate in the context of the current function.
+ * @new_y:          New Y-coordinate in the context of the current function.
+ *
+ * The core rectangle adjustment function. It updates the rectangle
+ * for the passed cursor coordinate, taking current function and tool
+ * options into account.  It also updates the current
+ * private->function if necessary.
+ */
+static void
+gimp_tool_rectangle_update_with_coord (GimpToolRectangle *rectangle,
+                                       gdouble            new_x,
+                                       gdouble            new_y)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  /* Move the corner or edge the user currently has grabbed. */
+  gimp_tool_rectangle_apply_coord (rectangle, new_x, new_y);
+
+  /* Update private->function. The function changes if the user
+   * "flips" the rectangle.
+   */
+  gimp_tool_rectangle_check_function (rectangle);
+
+  /* Clamp the rectangle if necessary */
+  gimp_tool_rectangle_handle_general_clamping (rectangle);
+
+  /* If the rectangle is being moved, do not run through any further
+   * rectangle adjusting functions since it's shape should not change
+   * then.
+   */
+  if (private->function != GIMP_TOOL_RECTANGLE_MOVING)
+    {
+      gimp_tool_rectangle_apply_fixed_rule (rectangle);
+    }
+
+  gimp_tool_rectangle_update_int_rect (rectangle);
+}
+
+static void
+gimp_tool_rectangle_apply_fixed_rule (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate    *private = rectangle->private;
+  GimpRectangleConstraint      constraint_to_use;
+  GimpDisplayShell            *shell;
+  GimpImage                   *image;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+  image = gimp_display_get_image (shell->display);
+
+  /* Calculate what constraint to use when needed. */
+  constraint_to_use = gimp_tool_rectangle_get_constraint (rectangle);
+
+  if (private->fixed_rule_active &&
+      private->fixed_rule == GIMP_RECTANGLE_FIXED_ASPECT)
+    {
+      gdouble aspect;
+
+      aspect = CLAMP (private->aspect_numerator /
+                      private->aspect_denominator,
+                      1.0 / gimp_image_get_height (image),
+                      gimp_image_get_width (image));
+
+      if (constraint_to_use == GIMP_RECTANGLE_CONSTRAIN_NONE)
+        {
+          gimp_tool_rectangle_apply_aspect (rectangle,
+                                            aspect,
+                                            CLAMPED_NONE);
+        }
+      else
+        {
+          if (private->function != GIMP_TOOL_RECTANGLE_MOVING)
+            {
+              ClampedSide clamped_sides = CLAMPED_NONE;
+
+              gimp_tool_rectangle_apply_aspect (rectangle,
+                                                aspect,
+                                                clamped_sides);
+
+              /* After we have applied aspect, we might have taken the
+               * rectangle outside of constraint, so clamp and apply
+               * aspect again. We will get the right result this time,
+               * since 'clamped_sides' will be setup correctly now.
+               */
+              gimp_tool_rectangle_clamp (rectangle,
+                                         &clamped_sides,
+                                         constraint_to_use,
+                                         private->fixed_center);
+
+              gimp_tool_rectangle_apply_aspect (rectangle,
+                                                aspect,
+                                                clamped_sides);
+            }
+          else
+            {
+              gimp_tool_rectangle_apply_aspect (rectangle,
+                                                aspect,
+                                                CLAMPED_NONE);
+
+              gimp_tool_rectangle_keep_inside (rectangle,
+                                               constraint_to_use);
+            }
+        }
+    }
+  else if (private->fixed_rule_active &&
+           private->fixed_rule == GIMP_RECTANGLE_FIXED_SIZE)
+    {
+      gimp_tool_rectangle_apply_fixed_width (rectangle,
+                                             constraint_to_use,
+                                             private->desired_fixed_size_width);
+      gimp_tool_rectangle_apply_fixed_height (rectangle,
+                                              constraint_to_use,
+                                              private->desired_fixed_size_height);
+    }
+  else if (private->fixed_rule_active &&
+           private->fixed_rule == GIMP_RECTANGLE_FIXED_WIDTH)
+    {
+      gimp_tool_rectangle_apply_fixed_width (rectangle,
+                                             constraint_to_use,
+                                             private->desired_fixed_width);
+    }
+  else if (private->fixed_rule_active &&
+           private->fixed_rule == GIMP_RECTANGLE_FIXED_HEIGHT)
+    {
+      gimp_tool_rectangle_apply_fixed_height (rectangle,
+                                              constraint_to_use,
+                                              private->desired_fixed_height);
+    }
+}
+
+/**
+ * gimp_tool_rectangle_get_constraints:
+ * @rectangle:      A #GimpToolRectangle.
+ * @min_x:
+ * @min_y:
+ * @max_x:
+ * @max_y:          Pointers of where to put constraints. NULL allowed.
+ * @constraint:     Whether to return image or layer constraints.
+ *
+ * Calculates constraint coordinates for image or layer.
+ */
+static void
+gimp_tool_rectangle_get_constraints (GimpToolRectangle       *rectangle,
+                                     gint                    *min_x,
+                                     gint                    *min_y,
+                                     gint                    *max_x,
+                                     gint                    *max_y,
+                                     GimpRectangleConstraint  constraint)
+{
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  gint              min_x_dummy;
+  gint              min_y_dummy;
+  gint              max_x_dummy;
+  gint              max_y_dummy;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+  image = gimp_display_get_image (shell->display);
+
+  if (! min_x) min_x = &min_x_dummy;
+  if (! min_y) min_y = &min_y_dummy;
+  if (! max_x) max_x = &max_x_dummy;
+  if (! max_y) max_y = &max_y_dummy;
+
+  *min_x = 0;
+  *min_y = 0;
+  *max_x = 0;
+  *max_y = 0;
+
+  switch (constraint)
+    {
+    case GIMP_RECTANGLE_CONSTRAIN_IMAGE:
+      if (image)
+        {
+          *min_x = 0;
+          *min_y = 0;
+          *max_x = gimp_image_get_width  (image);
+          *max_y = gimp_image_get_height (image);
+        }
+      break;
+
+    case GIMP_RECTANGLE_CONSTRAIN_DRAWABLE:
+      if (image)
+        {
+          GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
+          if (item)
+            {
+              gimp_item_get_offset (item, min_x, min_y);
+              *max_x = *min_x + gimp_item_get_width  (item);
+              *max_y = *min_y + gimp_item_get_height (item);
+            }
+        }
+      break;
+
+    default:
+      g_warning ("Invalid rectangle constraint.\n");
+      return;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_handle_general_clamping:
+ * @rectangle: A #GimpToolRectangle.
+ *
+ * Make sure that constraints are applied to the rectangle, either by
+ * manually doing it, or by looking at the rectangle tool options and
+ * concluding it will be done later.
+ */
+static void
+gimp_tool_rectangle_handle_general_clamping (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+  GimpRectangleConstraint   constraint;
+
+  constraint = gimp_tool_rectangle_get_constraint (rectangle);
+
+  /* fixed_aspect takes care of clamping by it self, so just return in
+   * case that is in use. Also return if no constraints should be
+   * enforced.
+   */
+  if (constraint == GIMP_RECTANGLE_CONSTRAIN_NONE)
+    return;
+
+  if (private->function != GIMP_TOOL_RECTANGLE_MOVING)
+    {
+      gimp_tool_rectangle_clamp (rectangle,
+                                 NULL,
+                                 constraint,
+                                 private->fixed_center);
+    }
+  else
+    {
+      gimp_tool_rectangle_keep_inside (rectangle, constraint);
+    }
+}
+
+/**
+ * gimp_tool_rectangle_update_int_rect:
+ * @rectangle:
+ *
+ * Update integer representation of rectangle.
+ **/
+static void
+gimp_tool_rectangle_update_int_rect (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  private->x1_int = SIGNED_ROUND (private->x1);
+  private->y1_int = SIGNED_ROUND (private->y1);
+
+  if (gimp_tool_rectangle_rect_rubber_banding_func (rectangle))
+    {
+      private->width_int  = (gint) SIGNED_ROUND (private->x2) - private->x1_int;
+      private->height_int = (gint) SIGNED_ROUND (private->y2) - private->y1_int;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_adjust_coord:
+ * @rectangle:
+ * @ccoord_x_input:
+ * @ccoord_x_input:
+ * @ccoord_x_output:
+ * @ccoord_x_output:
+ *
+ * Transforms a coordinate to better fit the public behaviour of the
+ * rectangle.
+ */
+static void
+gimp_tool_rectangle_adjust_coord (GimpToolRectangle *rectangle,
+                                  gdouble            coord_x_input,
+                                  gdouble            coord_y_input,
+                                  gdouble           *coord_x_output,
+                                  gdouble           *coord_y_output)
+{
+  GimpToolRectanglePrivate *priv = rectangle->private;
+
+  switch (priv->precision)
+    {
+    case GIMP_RECTANGLE_PRECISION_INT:
+      *coord_x_output = RINT (coord_x_input);
+      *coord_y_output = RINT (coord_y_input);
+      break;
+
+    case GIMP_RECTANGLE_PRECISION_DOUBLE:
+    default:
+      *coord_x_output = coord_x_input;
+      *coord_y_output = coord_y_input;
+      break;
+    }
+}
+
+static void
+gimp_tool_rectangle_recalculate_center_xy (GimpToolRectangle *rectangle)
+{
+  GimpToolRectanglePrivate *private = rectangle->private;
+
+  private->center_x_on_fixed_center = (private->x1 + private->x2) / 2;
+  private->center_y_on_fixed_center = (private->y1 + private->y2) / 2;
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_rectangle_new (GimpDisplayShell  *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_RECTANGLE,
+                       "shell",      shell,
+                       NULL);
+}
+
+GimpRectangleFunction
+gimp_tool_rectangle_get_function (GimpToolRectangle *rectangle)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle),
+                        GIMP_TOOL_RECTANGLE_DEAD);
+
+  return rectangle->private->function;
+}
+
+void
+gimp_tool_rectangle_set_function (GimpToolRectangle     *rectangle,
+                                  GimpRectangleFunction  function)
+{
+  GimpToolRectanglePrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+
+  private = rectangle->private;
+
+  if (private->function != function)
+    {
+      private->function = function;
+
+      gimp_tool_rectangle_changed (GIMP_TOOL_WIDGET (rectangle));
+    }
+}
+
+void
+gimp_tool_rectangle_set_constraint (GimpToolRectangle       *rectangle,
+                                    GimpRectangleConstraint  constraint)
+{
+  GimpToolRectanglePrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+
+  private = rectangle->private;
+
+  if (constraint != private->constraint)
+    {
+      g_object_freeze_notify (G_OBJECT (rectangle));
+
+      private->constraint = constraint;
+      g_object_notify (G_OBJECT (rectangle), "constraint");
+
+      gimp_tool_rectangle_clamp (rectangle, NULL, constraint, FALSE);
+
+      g_object_thaw_notify (G_OBJECT (rectangle));
+
+      gimp_tool_rectangle_change_complete (rectangle);
+    }
+}
+
+GimpRectangleConstraint
+gimp_tool_rectangle_get_constraint (GimpToolRectangle *rectangle)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle), 0);
+
+  return rectangle->private->constraint;
+}
+
+/**
+ * gimp_tool_rectangle_get_public_rect:
+ * @rectangle:
+ * @x1:
+ * @y1:
+ * @x2:
+ * @y2:
+ *
+ * This function returns the rectangle as it appears to be publicly
+ * (based on integer or double precision-mode).
+ **/
+void
+gimp_tool_rectangle_get_public_rect (GimpToolRectangle *rectangle,
+                                     gdouble           *x1,
+                                     gdouble           *y1,
+                                     gdouble           *x2,
+                                     gdouble           *y2)
+{
+  GimpToolRectanglePrivate *priv;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+  g_return_if_fail (x1 != NULL);
+  g_return_if_fail (y1 != NULL);
+  g_return_if_fail (x2 != NULL);
+  g_return_if_fail (y2 != NULL);
+
+  priv = rectangle->private;
+
+  switch (priv->precision)
+    {
+    case GIMP_RECTANGLE_PRECISION_INT:
+      *x1 = priv->x1_int;
+      *y1 = priv->y1_int;
+      *x2 = priv->x1_int + priv->width_int;
+      *y2 = priv->y1_int + priv->height_int;
+      break;
+
+    case GIMP_RECTANGLE_PRECISION_DOUBLE:
+    default:
+      *x1 = priv->x1;
+      *y1 = priv->y1;
+      *x2 = priv->x2;
+      *y2 = priv->y2;
+      break;
+    }
+}
+
+/**
+ * gimp_tool_rectangle_pending_size_set:
+ * @width_property:  Option property to set to pending rectangle width.
+ * @height_property: Option property to set to pending rectangle height.
+ *
+ * Sets specified rectangle tool options properties to the width and
+ * height of the current pending rectangle.
+ */
+void
+gimp_tool_rectangle_pending_size_set (GimpToolRectangle *rectangle,
+                                      GObject           *object,
+                                      const gchar       *width_property,
+                                      const gchar       *height_property)
+{
+  GimpToolRectanglePrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+  g_return_if_fail (width_property  != NULL);
+  g_return_if_fail (height_property != NULL);
+
+  private = rectangle->private;
+
+  g_object_set (object,
+                width_property,  MAX (private->x2 - private->x1, 1.0),
+                height_property, MAX (private->y2 - private->y1, 1.0),
+                NULL);
+}
+
+/**
+ * gimp_tool_rectangle_constraint_size_set:
+ * @width_property:  Option property to set to current constraint width.
+ * @height_property: Option property to set to current constraint height.
+ *
+ * Sets specified rectangle tool options properties to the width and
+ * height of the current constraint size.
+ */
+void
+gimp_tool_rectangle_constraint_size_set (GimpToolRectangle *rectangle,
+                                         GObject           *object,
+                                         const gchar       *width_property,
+                                         const gchar       *height_property)
+{
+  GimpDisplayShell *shell;
+  GimpContext      *context;
+  GimpImage        *image;
+  gdouble           width;
+  gdouble           height;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+
+  shell   = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+  context = gimp_get_user_context (shell->display->gimp);
+  image   = gimp_context_get_image (context);
+
+  if (! image)
+    {
+      width  = 1.0;
+      height = 1.0;
+    }
+  else
+    {
+      GimpRectangleConstraint constraint;
+
+      constraint = gimp_tool_rectangle_get_constraint (rectangle);
+
+      switch (constraint)
+        {
+        case GIMP_RECTANGLE_CONSTRAIN_DRAWABLE:
+          {
+            GimpItem *item = GIMP_ITEM (gimp_image_get_active_layer (image));
+
+            if (! item)
+              {
+                width  = 1.0;
+                height = 1.0;
+              }
+            else
+              {
+                width  = gimp_item_get_width  (item);
+                height = gimp_item_get_height (item);
+              }
+          }
+          break;
+
+        case GIMP_RECTANGLE_CONSTRAIN_IMAGE:
+        default:
+          {
+            width  = gimp_image_get_width  (image);
+            height = gimp_image_get_height (image);
+          }
+          break;
+        }
+    }
+
+  g_object_set (object,
+                width_property,  width,
+                height_property, height,
+                NULL);
+}
+
+/**
+ * gimp_tool_rectangle_rectangle_is_first:
+ * @rectangle:
+ *
+ * Returns: %TRUE if the user is creating the first rectangle with
+ * this instance from scratch, %FALSE if modifying an existing
+ * rectangle, or creating a new rectangle, discarding the existing
+ * one. This function is only meaningful in _motion and
+ * _button_release.
+ */
+gboolean
+gimp_tool_rectangle_rectangle_is_first (GimpToolRectangle *rectangle)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle), FALSE);
+
+  return rectangle->private->is_first;
+}
+
+/**
+ * gimp_tool_rectangle_rectangle_is_new:
+ * @rectangle:
+ *
+ * Returns: %TRUE if the user is creating a new rectangle from
+ * scratch, %FALSE if modifying n previously existing rectangle. This
+ * function is only meaningful in _motion and _button_release.
+ */
+gboolean
+gimp_tool_rectangle_rectangle_is_new (GimpToolRectangle *rectangle)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle), FALSE);
+
+  return rectangle->private->is_new;
+}
+
+/**
+ * gimp_tool_rectangle_point_in_rectangle:
+ * @rectangle:
+ * @x:         X-coord of point to test (in image coordinates)
+ * @y:         Y-coord of point to test (in image coordinates)
+ *
+ * Returns: %TRUE if the passed point was within the rectangle
+ **/
+gboolean
+gimp_tool_rectangle_point_in_rectangle (GimpToolRectangle *rectangle,
+                                        gdouble            x,
+                                        gdouble            y)
+{
+  gdouble  x1, y1, x2, y2;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle), FALSE);
+
+  gimp_tool_rectangle_get_public_rect (rectangle, &x1, &y1, &x2, &y2);
+
+  return (x >= x1 && x <= x2 &&
+          y >= y1 && y <= y2);
+}
+
+/**
+ * gimp_tool_rectangle_frame_item:
+ * @rectangle: a #GimpToolRectangle interface
+ * @item:      a #GimpItem attached to the image on which a
+ *             rectangle is being shown.
+ *
+ * Convenience function to set the corners of the rectangle to
+ * match the bounds of the specified item.  The rectangle interface
+ * must be active (i.e., showing a rectangle), and the item must be
+ * attached to the image on which the rectangle is active.
+ **/
+void
+gimp_tool_rectangle_frame_item (GimpToolRectangle *rectangle,
+                                GimpItem          *item)
+{
+  GimpDisplayShell *shell;
+  gint              offset_x;
+  gint              offset_y;
+  gint              width;
+  gint              height;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+  g_return_if_fail (GIMP_IS_ITEM (item));
+  g_return_if_fail (gimp_item_is_attached (item));
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+
+  g_return_if_fail (gimp_display_get_image (shell->display) ==
+                    gimp_item_get_image (item));
+
+  width  = gimp_item_get_width  (item);
+  height = gimp_item_get_height (item);
+
+  gimp_item_get_offset (item, &offset_x, &offset_y);
+
+  gimp_tool_rectangle_set_function (rectangle, GIMP_TOOL_RECTANGLE_CREATING);
+
+  g_object_set (rectangle,
+                "x1", (gdouble) offset_x,
+                "y1", (gdouble) offset_y,
+                "x2", (gdouble) (offset_x + width),
+                "y2", (gdouble) (offset_y + height),
+                NULL);
+
+  /* kludge to force handle sizes to update.  This call may be harmful
+   * if this function is ever moved out of the text tool code.
+   */
+  gimp_tool_rectangle_set_constraint (rectangle, GIMP_RECTANGLE_CONSTRAIN_NONE);
+}
+
+void
+gimp_tool_rectangle_auto_shrink (GimpToolRectangle *rectangle,
+                                 gboolean           shrink_merged)
+{
+  GimpToolRectanglePrivate *private;
+  GimpDisplayShell         *shell;
+  GimpImage                *image;
+  GimpPickable             *pickable;
+  gint                      offset_x = 0;
+  gint                      offset_y = 0;
+  gint                      x1, y1;
+  gint                      x2, y2;
+  gint                      shrunk_x;
+  gint                      shrunk_y;
+  gint                      shrunk_width;
+  gint                      shrunk_height;
+
+  g_return_if_fail (GIMP_IS_TOOL_RECTANGLE (rectangle));
+
+  private = rectangle->private;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (rectangle));
+  image = gimp_display_get_image (shell->display);
+
+  if (shrink_merged)
+    {
+      pickable = GIMP_PICKABLE (image);
+
+      x1 = private->x1;
+      y1 = private->y1;
+      x2 = private->x2;
+      y2 = private->y2;
+    }
+  else
+    {
+      pickable = GIMP_PICKABLE (gimp_image_get_active_drawable (image));
+
+      if (! pickable)
+        return;
+
+      gimp_item_get_offset (GIMP_ITEM (pickable), &offset_x, &offset_y);
+
+      x1 = private->x1 - offset_x;
+      y1 = private->y1 - offset_y;
+      x2 = private->x2 - offset_x;
+      y2 = private->y2 - offset_y;
+    }
+
+  switch (gimp_pickable_auto_shrink (pickable,
+                                     x1, y1, x2 - x1, y2 - y1,
+                                     &shrunk_x,
+                                     &shrunk_y,
+                                     &shrunk_width,
+                                     &shrunk_height))
+    {
+    case GIMP_AUTO_SHRINK_SHRINK:
+      {
+        GimpRectangleFunction original_function = private->function;
+
+        private->function = GIMP_TOOL_RECTANGLE_AUTO_SHRINK;
+
+        private->x1 = offset_x + shrunk_x;
+        private->y1 = offset_y + shrunk_y;
+        private->x2 = offset_x + shrunk_x + shrunk_width;
+        private->y2 = offset_y + shrunk_y + shrunk_height;
+
+        gimp_tool_rectangle_update_int_rect (rectangle);
+
+        gimp_tool_rectangle_change_complete (rectangle);
+
+        private->function = original_function;
+
+        gimp_tool_rectangle_update_options (rectangle);
+      }
+      break;
+
+    default:
+      break;
+    }
+}
diff --git a/app/display/gimptoolrectangle.h b/app/display/gimptoolrectangle.h
new file mode 100644
index 0000000..361839a
--- /dev/null
+++ b/app/display/gimptoolrectangle.h
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolrectangle.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on GimpRectangleTool
+ * Copyright (C) 2007 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_RECTANGLE_H__
+#define __GIMP_TOOL_RECTANGLE_H__
+
+
+#include "gimptoolwidget.h"
+
+
+typedef enum
+{
+  GIMP_TOOL_RECTANGLE_DEAD,
+  GIMP_TOOL_RECTANGLE_CREATING,
+  GIMP_TOOL_RECTANGLE_MOVING,
+  GIMP_TOOL_RECTANGLE_RESIZING_UPPER_LEFT,
+  GIMP_TOOL_RECTANGLE_RESIZING_UPPER_RIGHT,
+  GIMP_TOOL_RECTANGLE_RESIZING_LOWER_LEFT,
+  GIMP_TOOL_RECTANGLE_RESIZING_LOWER_RIGHT,
+  GIMP_TOOL_RECTANGLE_RESIZING_LEFT,
+  GIMP_TOOL_RECTANGLE_RESIZING_RIGHT,
+  GIMP_TOOL_RECTANGLE_RESIZING_TOP,
+  GIMP_TOOL_RECTANGLE_RESIZING_BOTTOM,
+  GIMP_TOOL_RECTANGLE_AUTO_SHRINK,
+  GIMP_TOOL_RECTANGLE_EXECUTING,
+  GIMP_N_TOOL_RECTANGLE_FUNCTIONS
+} GimpRectangleFunction;
+
+
+#define GIMP_TYPE_TOOL_RECTANGLE            (gimp_tool_rectangle_get_type ())
+#define GIMP_TOOL_RECTANGLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_RECTANGLE, GimpToolRectangle))
+#define GIMP_TOOL_RECTANGLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_RECTANGLE, GimpToolRectangleClass))
+#define GIMP_IS_TOOL_RECTANGLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_RECTANGLE))
+#define GIMP_IS_TOOL_RECTANGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_RECTANGLE))
+#define GIMP_TOOL_RECTANGLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_RECTANGLE, GimpToolRectangleClass))
+
+
+typedef struct _GimpToolRectangle        GimpToolRectangle;
+typedef struct _GimpToolRectanglePrivate GimpToolRectanglePrivate;
+typedef struct _GimpToolRectangleClass   GimpToolRectangleClass;
+
+struct _GimpToolRectangle
+{
+  GimpToolWidget            parent_instance;
+
+  GimpToolRectanglePrivate *private;
+};
+
+struct _GimpToolRectangleClass
+{
+  GimpToolWidgetClass  parent_class;
+
+  /*  signals  */
+
+  gboolean (* change_complete) (GimpToolRectangle *rectangle);
+};
+
+
+GType    gimp_tool_rectangle_get_type         (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_rectangle_new      (GimpDisplayShell       *shell);
+
+GimpRectangleFunction
+         gimp_tool_rectangle_get_function     (GimpToolRectangle      *rectangle);
+void     gimp_tool_rectangle_set_function     (GimpToolRectangle      *rectangle,
+                                               GimpRectangleFunction   function);
+
+void     gimp_tool_rectangle_set_constraint   (GimpToolRectangle      *rectangle,
+                                               GimpRectangleConstraint constraint);
+GimpRectangleConstraint
+         gimp_tool_rectangle_get_constraint   (GimpToolRectangle      *rectangle);
+
+void     gimp_tool_rectangle_get_public_rect  (GimpToolRectangle      *rectangle,
+                                               gdouble                *pub_x1,
+                                               gdouble                *pub_y1,
+                                               gdouble                *pub_x2,
+                                               gdouble                *pub_y2);
+
+void     gimp_tool_rectangle_pending_size_set (GimpToolRectangle      *rectangle,
+                                               GObject                *object,
+                                               const gchar            *width_property,
+                                               const gchar            *height_property);
+
+void     gimp_tool_rectangle_constraint_size_set
+                                              (GimpToolRectangle      *rectangle,
+                                               GObject                *object,
+                                               const gchar            *width_property,
+                                               const gchar            *height_property);
+
+gboolean gimp_tool_rectangle_rectangle_is_first
+                                              (GimpToolRectangle      *rectangle);
+gboolean gimp_tool_rectangle_rectangle_is_new (GimpToolRectangle      *rectangle);
+gboolean gimp_tool_rectangle_point_in_rectangle
+                                              (GimpToolRectangle      *rectangle,
+                                               gdouble                 x,
+                                               gdouble                 y);
+
+void     gimp_tool_rectangle_frame_item       (GimpToolRectangle      *rectangle,
+                                               GimpItem               *item);
+void     gimp_tool_rectangle_auto_shrink      (GimpToolRectangle      *rectrectangle,
+                                               gboolean                shrink_merged);
+
+
+#endif /* __GIMP_TOOL_RECTANGLE_H__ */
diff --git a/app/display/gimptoolrotategrid.c b/app/display/gimptoolrotategrid.c
new file mode 100644
index 0000000..c583490
--- /dev/null
+++ b/app/display/gimptoolrotategrid.c
@@ -0,0 +1,330 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolrotategrid.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+
+#include "gimpdisplayshell.h"
+#include "gimptoolrotategrid.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ANGLE
+};
+
+
+struct _GimpToolRotateGridPrivate
+{
+  gdouble  angle;
+
+  gboolean rotate_grab;
+  gdouble  real_angle;
+  gdouble  last_x;
+  gdouble  last_y;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_tool_rotate_grid_set_property (GObject             *object,
+                                                  guint                property_id,
+                                                  const GValue        *value,
+                                                  GParamSpec          *pspec);
+static void   gimp_tool_rotate_grid_get_property (GObject             *object,
+                                                  guint                property_id,
+                                                  GValue              *value,
+                                                  GParamSpec          *pspec);
+
+static gint   gimp_tool_rotate_grid_button_press (GimpToolWidget      *widget,
+                                                  const GimpCoords    *coords,
+                                                  guint32              time,
+                                                  GdkModifierType      state,
+                                                  GimpButtonPressType  press_type);
+static void   gimp_tool_rotate_grid_motion       (GimpToolWidget      *widget,
+                                                  const GimpCoords    *coords,
+                                                  guint32              time,
+                                                  GdkModifierType      state);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolRotateGrid, gimp_tool_rotate_grid,
+                            GIMP_TYPE_TOOL_TRANSFORM_GRID)
+
+#define parent_class gimp_tool_rotate_grid_parent_class
+
+
+static void
+gimp_tool_rotate_grid_class_init (GimpToolRotateGridClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->set_property    = gimp_tool_rotate_grid_set_property;
+  object_class->get_property    = gimp_tool_rotate_grid_get_property;
+
+  widget_class->button_press    = gimp_tool_rotate_grid_button_press;
+  widget_class->motion          = gimp_tool_rotate_grid_motion;
+
+  g_object_class_install_property (object_class, PROP_ANGLE,
+                                   g_param_spec_double ("angle",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_rotate_grid_init (GimpToolRotateGrid *grid)
+{
+  grid->private = gimp_tool_rotate_grid_get_instance_private (grid);
+}
+
+static void
+gimp_tool_rotate_grid_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpToolRotateGrid        *grid    = GIMP_TOOL_ROTATE_GRID (object);
+  GimpToolRotateGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_ANGLE:
+      private->angle = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_rotate_grid_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpToolRotateGrid        *grid    = GIMP_TOOL_ROTATE_GRID (object);
+  GimpToolRotateGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_ANGLE:
+      g_value_set_double (value, private->angle);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint
+gimp_tool_rotate_grid_button_press (GimpToolWidget      *widget,
+                                    const GimpCoords    *coords,
+                                    guint32              time,
+                                    GdkModifierType      state,
+                                    GimpButtonPressType  press_type)
+{
+  GimpToolRotateGrid        *grid    = GIMP_TOOL_ROTATE_GRID (widget);
+  GimpToolRotateGridPrivate *private = grid->private;
+  GimpTransformHandle        handle;
+
+  handle = GIMP_TOOL_WIDGET_CLASS (parent_class)->button_press (widget,
+                                                                coords, time,
+                                                                state,
+                                                                press_type);
+
+  if (handle == GIMP_TRANSFORM_HANDLE_ROTATION)
+    {
+      private->rotate_grab = TRUE;
+      private->real_angle  = private->angle;
+      private->last_x      = coords->x;
+      private->last_y      = coords->y;
+    }
+  else
+    {
+      private->rotate_grab = FALSE;
+    }
+
+  return handle;
+}
+
+void
+gimp_tool_rotate_grid_motion (GimpToolWidget   *widget,
+                              const GimpCoords *coords,
+                              guint32           time,
+                              GdkModifierType   state)
+{
+  GimpToolRotateGrid        *grid    = GIMP_TOOL_ROTATE_GRID (widget);
+  GimpToolRotateGridPrivate *private = grid->private;
+  gdouble                    angle1, angle2, angle;
+  gdouble                    pivot_x, pivot_y;
+  gdouble                    x1, y1, x2, y2;
+  gboolean                   constrain;
+  GimpMatrix3                transform;
+
+  if (! private->rotate_grab)
+    {
+      gdouble old_pivot_x;
+      gdouble old_pivot_y;
+
+      g_object_get (widget,
+                    "pivot-x", &old_pivot_x,
+                    "pivot-y", &old_pivot_y,
+                    NULL);
+
+      g_object_freeze_notify (G_OBJECT (widget));
+
+      GIMP_TOOL_WIDGET_CLASS (parent_class)->motion (widget,
+                                                     coords, time, state);
+
+      g_object_get (widget,
+                    "pivot-x", &pivot_x,
+                    "pivot-y", &pivot_y,
+                    NULL);
+
+      if (old_pivot_x != pivot_x ||
+          old_pivot_y != pivot_y)
+        {
+          gimp_matrix3_identity (&transform);
+          gimp_transform_matrix_rotate_center (&transform,
+                                               pivot_x, pivot_y,
+                                               private->angle);
+
+          g_object_set (widget,
+                        "transform", &transform,
+                        NULL);
+       }
+
+      g_object_thaw_notify (G_OBJECT (widget));
+
+      return;
+    }
+
+  g_object_get (widget,
+                "pivot-x",          &pivot_x,
+                "pivot-y",          &pivot_y,
+                "constrain-rotate", &constrain,
+                NULL);
+
+  x1 = coords->x       - pivot_x;
+  x2 = private->last_x - pivot_x;
+  y1 = pivot_y - coords->y;
+  y2 = pivot_y - private->last_y;
+
+  /*  find the first angle  */
+  angle1 = atan2 (y1, x1);
+
+  /*  find the angle  */
+  angle2 = atan2 (y2, x2);
+
+  angle = angle2 - angle1;
+
+  if (angle > G_PI || angle < -G_PI)
+    angle = angle2 - ((angle1 < 0) ? 2.0 * G_PI + angle1 : angle1 - 2.0 * G_PI);
+
+  /*  increment the transform tool's angle  */
+  private->real_angle += angle;
+
+  /*  limit the angle to between -180 and 180 degrees  */
+  if (private->real_angle < - G_PI)
+    {
+      private->real_angle += 2.0 * G_PI;
+    }
+  else if (private->real_angle > G_PI)
+    {
+      private->real_angle -= 2.0 * G_PI;
+    }
+
+  /*  constrain the angle to 15-degree multiples if ctrl is held down  */
+#define FIFTEEN_DEG (G_PI / 12.0)
+
+  if (constrain)
+    {
+      angle = FIFTEEN_DEG * (gint) ((private->real_angle +
+                                     FIFTEEN_DEG / 2.0) / FIFTEEN_DEG);
+    }
+  else
+    {
+      angle = private->real_angle;
+    }
+
+  gimp_matrix3_identity (&transform);
+  gimp_transform_matrix_rotate_center (&transform, pivot_x, pivot_y, angle);
+
+  g_object_set (widget,
+                "transform", &transform,
+                "angle",     angle,
+                NULL);
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_rotate_grid_new (GimpDisplayShell *shell,
+                           gdouble           x1,
+                           gdouble           y1,
+                           gdouble           x2,
+                           gdouble           y2,
+                           gdouble           pivot_x,
+                           gdouble           pivot_y,
+                           gdouble           angle)
+{
+  GimpMatrix3 transform;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  gimp_matrix3_identity (&transform);
+  gimp_transform_matrix_rotate_center (&transform, pivot_x, pivot_y, angle);
+
+  return g_object_new (GIMP_TYPE_TOOL_ROTATE_GRID,
+                       "shell",     shell,
+                       "transform", &transform,
+                       "x1",        x1,
+                       "y1",        y1,
+                       "x2",        x2,
+                       "y2",        y2,
+                       "pivot-x",   pivot_x,
+                       "pivot-y",   pivot_y,
+                       "angle",     angle,
+                       NULL);
+}
diff --git a/app/display/gimptoolrotategrid.h b/app/display/gimptoolrotategrid.h
new file mode 100644
index 0000000..2254c8d
--- /dev/null
+++ b/app/display/gimptoolrotategrid.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolrotategrid.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_ROTATE_GRID_H__
+#define __GIMP_TOOL_ROTATE_GRID_H__
+
+
+#include "gimptooltransformgrid.h"
+
+
+#define GIMP_TYPE_TOOL_ROTATE_GRID            (gimp_tool_rotate_grid_get_type ())
+#define GIMP_TOOL_ROTATE_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_ROTATE_GRID, GimpToolRotateGrid))
+#define GIMP_TOOL_ROTATE_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_ROTATE_GRID, GimpToolRotateGridClass))
+#define GIMP_IS_TOOL_ROTATE_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_ROTATE_GRID))
+#define GIMP_IS_TOOL_ROTATE_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_ROTATE_GRID))
+#define GIMP_TOOL_ROTATE_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_ROTATE_GRID, GimpToolRotateGridClass))
+
+
+typedef struct _GimpToolRotateGrid        GimpToolRotateGrid;
+typedef struct _GimpToolRotateGridPrivate GimpToolRotateGridPrivate;
+typedef struct _GimpToolRotateGridClass   GimpToolRotateGridClass;
+
+struct _GimpToolRotateGrid
+{
+  GimpToolTransformGrid      parent_instance;
+
+  GimpToolRotateGridPrivate *private;
+};
+
+struct _GimpToolRotateGridClass
+{
+  GimpToolTransformGridClass  parent_class;
+};
+
+
+GType            gimp_tool_rotate_grid_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_rotate_grid_new      (GimpDisplayShell  *shell,
+                                                 gdouble            x1,
+                                                 gdouble            y1,
+                                                 gdouble            x2,
+                                                 gdouble            y2,
+                                                 gdouble            pivot_x,
+                                                 gdouble            pivot_y,
+                                                 gdouble            angle);
+
+
+#endif /* __GIMP_TOOL_ROTATE_GRID_H__ */
diff --git a/app/display/gimptoolsheargrid.c b/app/display/gimptoolsheargrid.c
new file mode 100644
index 0000000..878c549
--- /dev/null
+++ b/app/display/gimptoolsheargrid.c
@@ -0,0 +1,360 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolsheargrid.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+
+#include "gimpdisplayshell.h"
+#include "gimptoolsheargrid.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_SHEAR_X,
+  PROP_SHEAR_Y
+};
+
+
+struct _GimpToolShearGridPrivate
+{
+  GimpOrientationType orientation;
+  gdouble             shear_x;
+  gdouble             shear_y;
+
+  gdouble             last_x;
+  gdouble             last_y;
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_shear_grid_set_property (GObject             *object,
+                                                   guint                property_id,
+                                                   const GValue        *value,
+                                                   GParamSpec          *pspec);
+static void     gimp_tool_shear_grid_get_property (GObject             *object,
+                                                   guint                property_id,
+                                                   GValue              *value,
+                                                   GParamSpec          *pspec);
+
+static gint     gimp_tool_shear_grid_button_press (GimpToolWidget      *widget,
+                                                   const GimpCoords    *coords,
+                                                   guint32              time,
+                                                   GdkModifierType      state,
+                                                   GimpButtonPressType  press_type);
+static void     gimp_tool_shear_grid_motion        (GimpToolWidget      *widget,
+                                                    const GimpCoords    *coords,
+                                                    guint32              time,
+                                                    GdkModifierType      state);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolShearGrid, gimp_tool_shear_grid,
+                            GIMP_TYPE_TOOL_TRANSFORM_GRID)
+
+#define parent_class gimp_tool_shear_grid_parent_class
+
+
+static void
+gimp_tool_shear_grid_class_init (GimpToolShearGridClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->set_property    = gimp_tool_shear_grid_set_property;
+  object_class->get_property    = gimp_tool_shear_grid_get_property;
+
+  widget_class->button_press    = gimp_tool_shear_grid_button_press;
+  widget_class->motion          = gimp_tool_shear_grid_motion;
+
+  g_object_class_install_property (object_class, PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_ORIENTATION_TYPE,
+                                                      GIMP_ORIENTATION_UNKNOWN,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SHEAR_X,
+                                   g_param_spec_double ("shear-x",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SHEAR_Y,
+                                   g_param_spec_double ("shear-y",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_shear_grid_init (GimpToolShearGrid *grid)
+{
+  grid->private = gimp_tool_shear_grid_get_instance_private (grid);
+
+  g_object_set (grid,
+                "inside-function",         GIMP_TRANSFORM_FUNCTION_SHEAR,
+                "outside-function",        GIMP_TRANSFORM_FUNCTION_SHEAR,
+                "use-corner-handles",      FALSE,
+                "use-perspective-handles", FALSE,
+                "use-side-handles",        FALSE,
+                "use-shear-handles",       FALSE,
+                "use-center-handle",       FALSE,
+                "use-pivot-handle",        FALSE,
+                NULL);
+}
+
+static void
+gimp_tool_shear_grid_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpToolShearGrid        *grid    = GIMP_TOOL_SHEAR_GRID (object);
+  GimpToolShearGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      private->orientation = g_value_get_enum (value);
+      break;
+    case PROP_SHEAR_X:
+      private->shear_x = g_value_get_double (value);
+      break;
+    case PROP_SHEAR_Y:
+      private->shear_y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_shear_grid_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpToolShearGrid        *grid    = GIMP_TOOL_SHEAR_GRID (object);
+  GimpToolShearGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, private->orientation);
+      break;
+    case PROP_SHEAR_X:
+      g_value_set_double (value, private->shear_x);
+      break;
+    case PROP_SHEAR_Y:
+      g_value_set_double (value, private->shear_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint
+gimp_tool_shear_grid_button_press (GimpToolWidget      *widget,
+                                   const GimpCoords    *coords,
+                                   guint32              time,
+                                   GdkModifierType      state,
+                                   GimpButtonPressType  press_type)
+{
+  GimpToolShearGrid        *grid    = GIMP_TOOL_SHEAR_GRID (widget);
+  GimpToolShearGridPrivate *private = grid->private;
+
+  private->last_x = coords->x;
+  private->last_y = coords->y;
+
+  return 1;
+}
+
+void
+gimp_tool_shear_grid_motion (GimpToolWidget   *widget,
+                             const GimpCoords *coords,
+                             guint32           time,
+                             GdkModifierType   state)
+{
+  GimpToolShearGrid        *grid    = GIMP_TOOL_SHEAR_GRID (widget);
+  GimpToolShearGridPrivate *private = grid->private;
+  gdouble                   diffx   = coords->x - private->last_x;
+  gdouble                   diffy   = coords->y - private->last_y;
+  gdouble                   amount  = 0.0;
+  GimpMatrix3               transform;
+  GimpMatrix3              *t;
+  gdouble                   x1, y1;
+  gdouble                   x2, y2;
+  gdouble                   tx1, ty1;
+  gdouble                   tx2, ty2;
+  gdouble                   tx3, ty3;
+  gdouble                   tx4, ty4;
+  gdouble                   current_x;
+  gdouble                   current_y;
+
+  g_object_get (widget,
+                "transform", &t,
+                "x1",        &x1,
+                "y1",        &y1,
+                "x2",        &x2,
+                "y2",        &y2,
+                NULL);
+
+  gimp_matrix3_transform_point (t, x1, y1, &tx1, &ty1);
+  gimp_matrix3_transform_point (t, x2, y1, &tx2, &ty2);
+  gimp_matrix3_transform_point (t, x1, y2, &tx3, &ty3);
+  gimp_matrix3_transform_point (t, x2, y2, &tx4, &ty4);
+
+  g_free (t);
+
+  current_x = coords->x;
+  current_y = coords->y;
+
+  diffx = current_x - private->last_x;
+  diffy = current_y - private->last_y;
+
+  /*  If we haven't yet decided on which way to control shearing
+   *  decide using the maximum differential
+   */
+  if (private->orientation == GIMP_ORIENTATION_UNKNOWN)
+    {
+#define MIN_MOVE 5
+
+      if (ABS (diffx) > MIN_MOVE || ABS (diffy) > MIN_MOVE)
+        {
+          if (ABS (diffx) > ABS (diffy))
+            {
+              private->orientation = GIMP_ORIENTATION_HORIZONTAL;
+              private->shear_x     = 0.0;
+            }
+          else
+            {
+              private->orientation = GIMP_ORIENTATION_VERTICAL;
+              private->shear_y     = 0.0;
+            }
+        }
+      /*  set the current coords to the last ones  */
+      else
+        {
+          current_x = private->last_x;
+          current_y = private->last_y;
+        }
+    }
+
+  /*  if the direction is known, keep track of the magnitude  */
+  if (private->orientation == GIMP_ORIENTATION_HORIZONTAL)
+    {
+      if (current_y > (ty1 + ty3) / 2)
+        private->shear_x += diffx;
+      else
+        private->shear_x -= diffx;
+
+      amount = private->shear_x;
+    }
+  else if (private->orientation == GIMP_ORIENTATION_VERTICAL)
+    {
+      if (current_x > (tx1 + tx2) / 2)
+        private->shear_y += diffy;
+      else
+        private->shear_y -= diffy;
+
+      amount = private->shear_y;
+    }
+
+  gimp_matrix3_identity (&transform);
+  gimp_transform_matrix_shear (&transform,
+                               x1, y1, x2 - x1, y2 - y1,
+                               private->orientation, amount);
+
+  g_object_set (widget,
+                "transform",   &transform,
+                "orientation", private->orientation,
+                "shear-x",     private->shear_x,
+                "shear_y",     private->shear_y,
+                NULL);
+
+  private->last_x = current_x;
+  private->last_y = current_y;
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_shear_grid_new (GimpDisplayShell    *shell,
+                          gdouble              x1,
+                          gdouble              y1,
+                          gdouble              x2,
+                          gdouble              y2,
+                          GimpOrientationType  orientation,
+                          gdouble              shear_x,
+                          gdouble              shear_y)
+{
+  GimpMatrix3 transform;
+  gdouble     amount;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+    amount = shear_x;
+  else
+    amount = shear_y;
+
+  gimp_matrix3_identity (&transform);
+  gimp_transform_matrix_shear (&transform,
+                               x1, y1, x2 - x1, y2 - y1,
+                               orientation, amount);
+
+  return g_object_new (GIMP_TYPE_TOOL_SHEAR_GRID,
+                       "shell",       shell,
+                       "transform",   &transform,
+                       "x1",          x1,
+                       "y1",          y1,
+                       "x2",          x2,
+                       "y2",          y2,
+                       "orientation", orientation,
+                       "shear-x",     shear_x,
+                       "shear-y",     shear_y,
+                       NULL);
+}
diff --git a/app/display/gimptoolsheargrid.h b/app/display/gimptoolsheargrid.h
new file mode 100644
index 0000000..dab96d5
--- /dev/null
+++ b/app/display/gimptoolsheargrid.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolsheargrid.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_SHEAR_GRID_H__
+#define __GIMP_TOOL_SHEAR_GRID_H__
+
+
+#include "gimptooltransformgrid.h"
+
+
+#define GIMP_TYPE_TOOL_SHEAR_GRID            (gimp_tool_shear_grid_get_type ())
+#define GIMP_TOOL_SHEAR_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_SHEAR_GRID, GimpToolShearGrid))
+#define GIMP_TOOL_SHEAR_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_SHEAR_GRID, GimpToolShearGridClass))
+#define GIMP_IS_TOOL_SHEAR_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_SHEAR_GRID))
+#define GIMP_IS_TOOL_SHEAR_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_SHEAR_GRID))
+#define GIMP_TOOL_SHEAR_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_SHEAR_GRID, GimpToolShearGridClass))
+
+
+typedef struct _GimpToolShearGrid        GimpToolShearGrid;
+typedef struct _GimpToolShearGridPrivate GimpToolShearGridPrivate;
+typedef struct _GimpToolShearGridClass   GimpToolShearGridClass;
+
+struct _GimpToolShearGrid
+{
+  GimpToolTransformGrid     parent_instance;
+
+  GimpToolShearGridPrivate *private;
+};
+
+struct _GimpToolShearGridClass
+{
+  GimpToolTransformGridClass  parent_class;
+};
+
+
+GType            gimp_tool_shear_grid_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_shear_grid_new      (GimpDisplayShell    *shell,
+                                                gdouble              x1,
+                                                gdouble              y1,
+                                                gdouble              x2,
+                                                gdouble              y2,
+                                                GimpOrientationType  orientation,
+                                                gdouble              shear_x,
+                                                gdouble              shear_y);
+
+
+#endif /* __GIMP_TOOL_SHEAR_GRID_H__ */
diff --git a/app/display/gimptooltransform3dgrid.c b/app/display/gimptooltransform3dgrid.c
new file mode 100644
index 0000000..06cd955
--- /dev/null
+++ b/app/display/gimptooltransform3dgrid.c
@@ -0,0 +1,1162 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptool3dtransformgrid.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "core/gimp-transform-3d-utils.h"
+#include "core/gimp-utils.h"
+
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+#include "gimptooltransform3dgrid.h"
+
+#include "gimp-intl.h"
+
+
+#define CONSTRAINT_MIN_DIST   8.0
+#define PIXELS_PER_REVOLUTION 1000
+
+
+enum
+{
+  PROP_0,
+  PROP_MODE,
+  PROP_UNIFIED,
+  PROP_CONSTRAIN_AXIS,
+  PROP_Z_AXIS,
+  PROP_LOCAL_FRAME,
+  PROP_CAMERA_X,
+  PROP_CAMERA_Y,
+  PROP_CAMERA_Z,
+  PROP_OFFSET_X,
+  PROP_OFFSET_Y,
+  PROP_OFFSET_Z,
+  PROP_ROTATION_ORDER,
+  PROP_ANGLE_X,
+  PROP_ANGLE_Y,
+  PROP_ANGLE_Z,
+  PROP_PIVOT_3D_X,
+  PROP_PIVOT_3D_Y,
+  PROP_PIVOT_3D_Z
+};
+
+typedef enum
+{
+  AXIS_NONE,
+  AXIS_X,
+  AXIS_Y
+} Axis;
+
+struct _GimpToolTransform3DGridPrivate
+{
+  GimpTransform3DMode mode;
+  gboolean            unified;
+
+  gboolean            constrain_axis;
+  gboolean            z_axis;
+  gboolean            local_frame;
+
+  gdouble             camera_x;
+  gdouble             camera_y;
+  gdouble             camera_z;
+
+  gdouble             offset_x;
+  gdouble             offset_y;
+  gdouble             offset_z;
+
+  gint                rotation_order;
+  gdouble             angle_x;
+  gdouble             angle_y;
+  gdouble             angle_z;
+
+  gdouble             pivot_x;
+  gdouble             pivot_y;
+  gdouble             pivot_z;
+
+  GimpTransformHandle handle;
+
+  gdouble             orig_x;
+  gdouble             orig_y;
+  gdouble             orig_offset_x;
+  gdouble             orig_offset_y;
+  gdouble             orig_offset_z;
+  GimpMatrix3         orig_transform;
+
+  gdouble             last_x;
+  gdouble             last_y;
+
+  Axis                constrained_axis;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_tool_transform_3d_grid_constructed            (GObject                 *object);
+static void       gimp_tool_transform_3d_grid_set_property           (GObject                 *object,
+                                                                      guint                    property_id,
+                                                                      const GValue            *value,
+                                                                      GParamSpec              *pspec);
+static void       gimp_tool_transform_3d_grid_get_property           (GObject                 *object,
+                                                                      guint                    property_id,
+                                                                      GValue                  *value,
+                                                                      GParamSpec              *pspec);
+
+static gint       gimp_tool_transform_3d_grid_button_press           (GimpToolWidget          *widget,
+                                                                      const GimpCoords        *coords,
+                                                                      guint32                  time,
+                                                                      GdkModifierType          state,
+                                                                      GimpButtonPressType      press_type);
+static void       gimp_tool_transform_3d_grid_motion                 (GimpToolWidget          *widget,
+                                                                      const GimpCoords        *coords,
+                                                                      guint32                  time,
+                                                                      GdkModifierType          state);
+static void       gimp_tool_transform_3d_grid_hover                  (GimpToolWidget          *widget,
+                                                                      const GimpCoords        *coords,
+                                                                      GdkModifierType          state,
+                                                                      gboolean                 proximity);
+static void       gimp_tool_transform_3d_grid_hover_modifier         (GimpToolWidget          *widget,
+                                                                      GdkModifierType          key,
+                                                                      gboolean                 press,
+                                                                      GdkModifierType          state);
+static gboolean   gimp_tool_transform_3d_grid_get_cursor              (GimpToolWidget          *widget,
+                                                                      const GimpCoords        *coords,
+                                                                      GdkModifierType          state,
+                                                                      GimpCursorType          *cursor,
+                                                                      GimpToolCursorType      *tool_cursor,
+                                                                      GimpCursorModifier      *modifier);
+
+static void       gimp_tool_transform_3d_grid_update_mode            (GimpToolTransform3DGrid *grid);
+static void       gimp_tool_transform_3d_grid_reset_motion           (GimpToolTransform3DGrid *grid);
+static gboolean   gimp_tool_transform_3d_grid_constrain              (GimpToolTransform3DGrid *grid,
+                                                                      gdouble                  x,
+                                                                      gdouble                  y,
+                                                                      gdouble                  ox,
+                                                                      gdouble                  oy,
+                                                                      gdouble                 *tx,
+                                                                      gdouble                 *ty);
+
+static gboolean   gimp_tool_transform_3d_grid_motion_vanishing_point (GimpToolTransform3DGrid *grid,
+                                                                      gdouble                  x,
+                                                                      gdouble                  y);
+static gboolean   gimp_tool_transform_3d_grid_motion_move            (GimpToolTransform3DGrid *grid,
+                                                                      gdouble                  x,
+                                                                      gdouble                  y);
+static gboolean   gimp_tool_transform_3d_grid_motion_rotate          (GimpToolTransform3DGrid *grid,
+                                                                      gdouble                  x,
+                                                                      gdouble                  y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolTransform3DGrid, gimp_tool_transform_3d_grid,
+                            GIMP_TYPE_TOOL_TRANSFORM_GRID)
+
+#define parent_class gimp_tool_transform_3d_grid_parent_class
+
+
+static void
+gimp_tool_transform_3d_grid_class_init (GimpToolTransform3DGridClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_transform_3d_grid_constructed;
+  object_class->set_property    = gimp_tool_transform_3d_grid_set_property;
+  object_class->get_property    = gimp_tool_transform_3d_grid_get_property;
+
+  widget_class->button_press    = gimp_tool_transform_3d_grid_button_press;
+  widget_class->motion          = gimp_tool_transform_3d_grid_motion;
+  widget_class->hover           = gimp_tool_transform_3d_grid_hover;
+  widget_class->hover_modifier  = gimp_tool_transform_3d_grid_hover_modifier;
+  widget_class->get_cursor      = gimp_tool_transform_3d_grid_get_cursor;
+
+  g_object_class_install_property (object_class, PROP_MODE,
+                                   g_param_spec_enum ("mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_TRANSFORM_3D_MODE,
+                                                      GIMP_TRANSFORM_3D_MODE_CAMERA,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_UNIFIED,
+                                   g_param_spec_boolean ("unified",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAIN_AXIS,
+                                   g_param_spec_boolean ("constrain-axis",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Z_AXIS,
+                                   g_param_spec_boolean ("z-axis",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_LOCAL_FRAME,
+                                   g_param_spec_boolean ("local-frame",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CAMERA_X,
+                                   g_param_spec_double ("camera-x",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CAMERA_Y,
+                                   g_param_spec_double ("camera-y",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CAMERA_Z,
+                                   g_param_spec_double ("camera-z",
+                                                        NULL, NULL,
+                                                        -(1.0 / 0.0),
+                                                        1.0 / 0.0,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_X,
+                                   g_param_spec_double ("offset-x",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_Y,
+                                   g_param_spec_double ("offset-y",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_OFFSET_Z,
+                                   g_param_spec_double ("offset-z",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ROTATION_ORDER,
+                                   g_param_spec_int ("rotation-order",
+                                                     NULL, NULL,
+                                                     0, 6, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ANGLE_X,
+                                   g_param_spec_double ("angle-x",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ANGLE_Y,
+                                   g_param_spec_double ("angle-y",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ANGLE_Z,
+                                   g_param_spec_double ("angle-z",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_3D_X,
+                                   g_param_spec_double ("pivot-3d-x",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_3D_Y,
+                                   g_param_spec_double ("pivot-3d-y",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_3D_Z,
+                                   g_param_spec_double ("pivot-3d-z",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_transform_3d_grid_init (GimpToolTransform3DGrid *grid)
+{
+  grid->priv = gimp_tool_transform_3d_grid_get_instance_private (grid);
+}
+
+static void
+gimp_tool_transform_3d_grid_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_object_set (object,
+                "clip-guides",         TRUE,
+                "dynamic-handle-size", FALSE,
+                NULL);
+}
+
+static void
+gimp_tool_transform_3d_grid_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpToolTransform3DGrid        *grid = GIMP_TOOL_TRANSFORM_3D_GRID (object);
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      priv->mode = g_value_get_enum (value);
+      gimp_tool_transform_3d_grid_update_mode (grid);
+      break;
+
+    case PROP_UNIFIED:
+      priv->unified = g_value_get_boolean (value);
+      gimp_tool_transform_3d_grid_update_mode (grid);
+      break;
+
+    case PROP_CONSTRAIN_AXIS:
+      priv->constrain_axis = g_value_get_boolean (value);
+      gimp_tool_transform_3d_grid_reset_motion (grid);
+      break;
+    case PROP_Z_AXIS:
+      priv->z_axis = g_value_get_boolean (value);
+      gimp_tool_transform_3d_grid_reset_motion (grid);
+      break;
+    case PROP_LOCAL_FRAME:
+      priv->local_frame = g_value_get_boolean (value);
+      gimp_tool_transform_3d_grid_reset_motion (grid);
+      break;
+
+    case PROP_CAMERA_X:
+      priv->camera_x = g_value_get_double (value);
+      g_object_set (grid,
+                    "pivot-x", priv->camera_x,
+                    NULL);
+      break;
+    case PROP_CAMERA_Y:
+      priv->camera_y = g_value_get_double (value);
+      g_object_set (grid,
+                    "pivot-y", priv->camera_y,
+                    NULL);
+      break;
+    case PROP_CAMERA_Z:
+      priv->camera_z = g_value_get_double (value);
+      break;
+
+    case PROP_OFFSET_X:
+      priv->offset_x = g_value_get_double (value);
+      break;
+    case PROP_OFFSET_Y:
+      priv->offset_y = g_value_get_double (value);
+      break;
+    case PROP_OFFSET_Z:
+      priv->offset_z = g_value_get_double (value);
+      break;
+
+    case PROP_ROTATION_ORDER:
+      priv->rotation_order = g_value_get_int (value);
+      break;
+    case PROP_ANGLE_X:
+      priv->angle_x = g_value_get_double (value);
+      break;
+    case PROP_ANGLE_Y:
+      priv->angle_y = g_value_get_double (value);
+      break;
+    case PROP_ANGLE_Z:
+      priv->angle_z = g_value_get_double (value);
+      break;
+
+    case PROP_PIVOT_3D_X:
+      priv->pivot_x = g_value_get_double (value);
+      break;
+    case PROP_PIVOT_3D_Y:
+      priv->pivot_y = g_value_get_double (value);
+      break;
+    case PROP_PIVOT_3D_Z:
+      priv->pivot_z = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_transform_3d_grid_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpToolTransform3DGrid        *grid = GIMP_TOOL_TRANSFORM_3D_GRID (object);
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      g_value_set_enum (value, priv->mode);
+      break;
+    case PROP_UNIFIED:
+      g_value_set_boolean (value, priv->unified);
+      break;
+
+    case PROP_CONSTRAIN_AXIS:
+      g_value_set_boolean (value, priv->constrain_axis);
+      break;
+    case PROP_Z_AXIS:
+      g_value_set_boolean (value, priv->z_axis);
+      break;
+    case PROP_LOCAL_FRAME:
+      g_value_set_boolean (value, priv->local_frame);
+      break;
+
+    case PROP_CAMERA_X:
+      g_value_set_double (value, priv->camera_x);
+      break;
+    case PROP_CAMERA_Y:
+      g_value_set_double (value, priv->camera_y);
+      break;
+    case PROP_CAMERA_Z:
+      g_value_set_double (value, priv->camera_z);
+      break;
+
+    case PROP_OFFSET_X:
+      g_value_set_double (value, priv->offset_x);
+      break;
+    case PROP_OFFSET_Y:
+      g_value_set_double (value, priv->offset_y);
+      break;
+    case PROP_OFFSET_Z:
+      g_value_set_double (value, priv->offset_z);
+      break;
+
+    case PROP_ROTATION_ORDER:
+      g_value_set_int (value, priv->rotation_order);
+      break;
+    case PROP_ANGLE_X:
+      g_value_set_double (value, priv->angle_x);
+      break;
+    case PROP_ANGLE_Y:
+      g_value_set_double (value, priv->angle_y);
+      break;
+    case PROP_ANGLE_Z:
+      g_value_set_double (value, priv->angle_z);
+      break;
+
+    case PROP_PIVOT_3D_X:
+      g_value_set_double (value, priv->pivot_x);
+      break;
+    case PROP_PIVOT_3D_Y:
+      g_value_set_double (value, priv->pivot_y);
+      break;
+    case PROP_PIVOT_3D_Z:
+      g_value_set_double (value, priv->pivot_z);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint
+gimp_tool_transform_3d_grid_button_press (GimpToolWidget      *widget,
+                                          const GimpCoords    *coords,
+                                          guint32              time,
+                                          GdkModifierType      state,
+                                          GimpButtonPressType  press_type)
+{
+  GimpToolTransform3DGrid        *grid = GIMP_TOOL_TRANSFORM_3D_GRID (widget);
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+
+  priv->handle = GIMP_TOOL_WIDGET_CLASS (parent_class)->button_press (
+    widget, coords, time, state, press_type);
+
+  priv->orig_x           = coords->x;
+  priv->orig_y           = coords->y;
+  priv->orig_offset_x    = priv->offset_x;
+  priv->orig_offset_y    = priv->offset_y;
+  priv->orig_offset_z    = priv->offset_z;
+  priv->last_x           = coords->x;
+  priv->last_y           = coords->y;
+
+  gimp_tool_transform_3d_grid_reset_motion (grid);
+
+  return priv->handle;
+}
+
+void
+gimp_tool_transform_3d_grid_motion (GimpToolWidget   *widget,
+                                    const GimpCoords *coords,
+                                    guint32           time,
+                                    GdkModifierType   state)
+{
+  GimpToolTransform3DGrid        *grid = GIMP_TOOL_TRANSFORM_3D_GRID (widget);
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+  GimpMatrix3                     transform;
+  gboolean                        update = TRUE;
+
+  switch (priv->handle)
+    {
+    case GIMP_TRANSFORM_HANDLE_PIVOT:
+      update = gimp_tool_transform_3d_grid_motion_vanishing_point (
+        grid, coords->x, coords->y);
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_CENTER:
+      update = gimp_tool_transform_3d_grid_motion_move (
+        grid, coords->x, coords->y);
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_ROTATION:
+      update = gimp_tool_transform_3d_grid_motion_rotate (
+        grid, coords->x, coords->y);
+    break;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  if (update)
+    {
+      gimp_transform_3d_matrix (&transform,
+
+                                priv->camera_x,
+                                priv->camera_y,
+                                priv->camera_z,
+
+                                priv->offset_x,
+                                priv->offset_y,
+                                priv->offset_z,
+
+                                priv->rotation_order,
+                                priv->angle_x,
+                                priv->angle_y,
+                                priv->angle_z,
+
+                                priv->pivot_x,
+                                priv->pivot_y,
+                                priv->pivot_z);
+
+      g_object_set (widget,
+                    "transform", &transform,
+                    NULL);
+    }
+}
+
+static void
+gimp_tool_transform_3d_grid_hover (GimpToolWidget   *widget,
+                                   const GimpCoords *coords,
+                                   GdkModifierType   state,
+                                   gboolean          proximity)
+{
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->hover (widget,
+                                                coords, state, proximity);
+
+  if (proximity &&
+      gimp_tool_transform_grid_get_handle (GIMP_TOOL_TRANSFORM_GRID (widget)) ==
+      GIMP_TRANSFORM_HANDLE_PIVOT)
+    {
+      gimp_tool_widget_set_status (widget,
+                                   _("Click-Drag to move the vanishing point"));
+    }
+}
+
+static void
+gimp_tool_transform_3d_grid_hover_modifier (GimpToolWidget  *widget,
+                                            GdkModifierType  key,
+                                            gboolean         press,
+                                            GdkModifierType  state)
+{
+  GimpToolTransform3DGrid        *grid = GIMP_TOOL_TRANSFORM_3D_GRID (widget);
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->hover_modifier (widget,
+                                                         key, press, state);
+
+  priv->local_frame = (state & gimp_get_extend_selection_mask ()) != 0;
+}
+
+static gboolean
+gimp_tool_transform_3d_grid_get_cursor (GimpToolWidget     *widget,
+                                        const GimpCoords   *coords,
+                                        GdkModifierType     state,
+                                        GimpCursorType     *cursor,
+                                        GimpToolCursorType *tool_cursor,
+                                        GimpCursorModifier *modifier)
+{
+  if (! GIMP_TOOL_WIDGET_CLASS (parent_class)->get_cursor (widget,
+                                                           coords,
+                                                           state,
+                                                           cursor,
+                                                           tool_cursor,
+                                                           modifier))
+    {
+      return FALSE;
+    }
+
+  if (gimp_tool_transform_grid_get_handle (GIMP_TOOL_TRANSFORM_GRID (widget)) ==
+      GIMP_TRANSFORM_HANDLE_PIVOT)
+    {
+      *tool_cursor = GIMP_TOOL_CURSOR_TRANSFORM_3D_CAMERA;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_tool_transform_3d_grid_update_mode (GimpToolTransform3DGrid *grid)
+{
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+
+  if (priv->unified)
+    {
+      g_object_set (grid,
+                    "inside-function",  GIMP_TRANSFORM_FUNCTION_MOVE,
+                    "outside-function", GIMP_TRANSFORM_FUNCTION_ROTATE,
+                    "use-pivot-handle", TRUE,
+                    NULL);
+    }
+  else
+    {
+      switch (priv->mode)
+        {
+        case GIMP_TRANSFORM_3D_MODE_CAMERA:
+          g_object_set (grid,
+                        "inside-function",  GIMP_TRANSFORM_FUNCTION_NONE,
+                        "outside-function", GIMP_TRANSFORM_FUNCTION_NONE,
+                        "use-pivot-handle", TRUE,
+                        NULL);
+          break;
+
+        case GIMP_TRANSFORM_3D_MODE_MOVE:
+          g_object_set (grid,
+                        "inside-function",  GIMP_TRANSFORM_FUNCTION_MOVE,
+                        "outside-function", GIMP_TRANSFORM_FUNCTION_MOVE,
+                        "use-pivot-handle", FALSE,
+                        NULL);
+          break;
+
+        case GIMP_TRANSFORM_3D_MODE_ROTATE:
+          g_object_set (grid,
+                        "inside-function",  GIMP_TRANSFORM_FUNCTION_ROTATE,
+                        "outside-function", GIMP_TRANSFORM_FUNCTION_ROTATE,
+                        "use-pivot-handle", FALSE,
+                        NULL);
+          break;
+        }
+    }
+}
+
+static void
+gimp_tool_transform_3d_grid_reset_motion (GimpToolTransform3DGrid *grid)
+{
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+  GimpMatrix3                    *transform;
+
+  priv->constrained_axis = AXIS_NONE;
+
+  g_object_get (grid,
+                "transform", &transform,
+                NULL);
+
+  priv->orig_transform = *transform;
+
+  g_free (transform);
+}
+
+static gboolean
+gimp_tool_transform_3d_grid_constrain (GimpToolTransform3DGrid *grid,
+                                       gdouble                  x,
+                                       gdouble                  y,
+                                       gdouble                  ox,
+                                       gdouble                  oy,
+                                       gdouble                 *tx,
+                                       gdouble                 *ty)
+{
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+
+  if (! priv->constrain_axis)
+    return TRUE;
+
+  if (priv->constrained_axis == AXIS_NONE)
+    {
+      GimpDisplayShell *shell;
+      gdouble           x1, y1;
+      gdouble           x2, y2;
+
+      shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (grid));
+
+      gimp_display_shell_transform_xy_f (shell,
+                                         priv->last_x, priv->last_y,
+                                         &x1,          &y1);
+      gimp_display_shell_transform_xy_f (shell,
+                                         x,            y,
+                                         &x2,          &y2);
+
+      if (hypot (x2 - x1, y2 - y1) < CONSTRAINT_MIN_DIST)
+        return FALSE;
+
+      if (fabs (*tx - ox) >= fabs (*ty - oy))
+        priv->constrained_axis = AXIS_X;
+      else
+        priv->constrained_axis = AXIS_Y;
+    }
+
+  if (priv->constrained_axis == AXIS_X)
+    *ty = oy;
+  else
+    *tx = ox;
+
+  return TRUE;
+}
+
+static gboolean
+gimp_tool_transform_3d_grid_motion_vanishing_point (GimpToolTransform3DGrid *grid,
+                                                    gdouble                  x,
+                                                    gdouble                  y)
+{
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+  GimpCoords                      c    = {};
+  gdouble                         pivot_x;
+  gdouble                         pivot_y;
+
+  if (! gimp_tool_transform_3d_grid_constrain (grid,
+                                               x,            y,
+                                               priv->last_x, priv->last_y,
+                                               &x,           &y))
+    {
+      return FALSE;
+    }
+
+  c.x = x;
+  c.y = y;
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->motion (GIMP_TOOL_WIDGET (grid),
+                                                 &c, 0, 0);
+
+  g_object_get (grid,
+                "pivot-x", &pivot_x,
+                "pivot-y", &pivot_y,
+                NULL);
+
+  g_object_set (grid,
+                "camera-x", pivot_x,
+                "camera-y", pivot_y,
+                NULL);
+
+  priv->last_x = c.x;
+  priv->last_y = c.y;
+
+  return TRUE;
+}
+
+static gboolean
+gimp_tool_transform_3d_grid_motion_move (GimpToolTransform3DGrid *grid,
+                                         gdouble                  x,
+                                         gdouble                  y)
+{
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+  GimpMatrix4                     matrix;
+
+  if (! priv->z_axis)
+    {
+      gdouble x1, y1, z1, w1;
+      gdouble x2, y2, z2, w2;
+
+      if (! priv->local_frame)
+        {
+          gimp_matrix4_identity (&matrix);
+        }
+      else
+        {
+          GimpMatrix3 transform_inv = priv->orig_transform;;
+
+          gimp_matrix3_invert (&transform_inv);
+
+          gimp_transform_3d_matrix3_to_matrix4 (&transform_inv, &matrix, 2);
+        }
+
+      w1 = gimp_matrix4_transform_point (&matrix,
+                                         priv->last_x, priv->last_y, 0.0,
+                                         &x1,          &y1,          &z1);
+      w2 = gimp_matrix4_transform_point (&matrix,
+                                         x,            y,            0.0,
+                                         &x2,          &y2,          &z2);
+
+      if (w1 <= 0.0)
+        return FALSE;
+
+      if (! gimp_tool_transform_3d_grid_constrain (grid,
+                                                   x,   y,
+                                                   x1,  y1,
+                                                   &x2, &y2))
+        {
+          return FALSE;
+        }
+
+      if (priv->local_frame)
+        {
+          gimp_matrix4_identity (&matrix);
+
+          gimp_transform_3d_matrix4_rotate_euler (&matrix,
+                                                  priv->rotation_order,
+                                                  priv->angle_x,
+                                                  priv->angle_y,
+                                                  priv->angle_z,
+                                                  0.0, 0.0, 0.0);
+
+          gimp_matrix4_transform_point (&matrix,
+                                        x1,  y1,  z1,
+                                        &x1, &y1, &z1);
+          gimp_matrix4_transform_point (&matrix,
+                                        x2,  y2,  z2,
+                                        &x2, &y2, &z2);
+        }
+
+      if (w2 > 0.0)
+        {
+          g_object_set (grid,
+                        "offset-x", priv->offset_x + (x2 - x1),
+                        "offset-y", priv->offset_y + (y2 - y1),
+                        "offset-z", priv->offset_z + (z2 - z1),
+                        NULL);
+
+          priv->last_x = x;
+          priv->last_y = y;
+        }
+      else
+        {
+          g_object_set (grid,
+                        "offset-x", priv->orig_offset_x,
+                        "offset-y", priv->orig_offset_y,
+                        "offset-z", priv->orig_offset_z,
+                        NULL);
+
+          priv->last_x = priv->orig_x;
+          priv->last_y = priv->orig_y;
+        }
+    }
+  else
+    {
+      GimpVector3 axis;
+      gdouble     amount;
+
+      if (! priv->local_frame)
+        {
+          axis.x = 0.0;
+          axis.y = 0.0;
+          axis.z = 1.0;
+        }
+      else
+        {
+          gimp_matrix4_identity (&matrix);
+
+          gimp_transform_3d_matrix4_rotate_euler (&matrix,
+                                                  priv->rotation_order,
+                                                  priv->angle_x,
+                                                  priv->angle_y,
+                                                  priv->angle_z,
+                                                  0.0, 0.0, 0.0);
+
+          axis.x = matrix.coeff[0][2];
+          axis.y = matrix.coeff[1][2];
+          axis.z = matrix.coeff[2][2];
+
+          if (axis.x < 0.0)
+            gimp_vector3_neg (&axis);
+        }
+
+      amount = x - priv->last_x;
+
+      g_object_set (grid,
+                    "offset-x", priv->offset_x + axis.x * amount,
+                    "offset-y", priv->offset_y + axis.y * amount,
+                    "offset-z", priv->offset_z + axis.z * amount,
+                    NULL);
+
+      priv->last_x = x;
+      priv->last_y = y;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_tool_transform_3d_grid_motion_rotate (GimpToolTransform3DGrid *grid,
+                                           gdouble                  x,
+                                           gdouble                  y)
+{
+  GimpToolTransform3DGridPrivate *priv = grid->priv;
+  GimpDisplayShell               *shell;
+  GimpMatrix4                     matrix;
+  GimpMatrix2                     basis_inv;
+  GimpVector3                     omega;
+  gdouble                         z_sign;
+  gboolean                        local_frame;
+
+  shell = gimp_tool_widget_get_shell (GIMP_TOOL_WIDGET (grid));
+
+  local_frame = priv->local_frame && (priv->constrain_axis || priv->z_axis);
+
+  if (! local_frame)
+    {
+      gimp_matrix2_identity (&basis_inv);
+      z_sign = 1.0;
+    }
+  else
+    {
+      {
+        GimpVector3 o, n, c;
+
+        gimp_matrix4_identity (&matrix);
+
+        gimp_transform_3d_matrix4_rotate_euler (&matrix,
+                                                priv->rotation_order,
+                                                priv->angle_x,
+                                                priv->angle_y,
+                                                priv->angle_z,
+                                                priv->pivot_x,
+                                                priv->pivot_y,
+                                                priv->pivot_z);
+
+        gimp_transform_3d_matrix4_translate (&matrix,
+                                             priv->offset_x,
+                                             priv->offset_y,
+                                             priv->offset_z);
+
+        gimp_matrix4_transform_point (&matrix,
+                                      0.0,  0.0,  0.0,
+                                      &o.x, &o.y, &o.z);
+        gimp_matrix4_transform_point (&matrix,
+                                      0.0,  0.0,  1.0,
+                                      &n.x, &n.y, &n.z);
+
+        c.x = priv->camera_x;
+        c.y = priv->camera_y;
+        c.z = priv->camera_z;
+
+        gimp_vector3_sub (&n, &n, &o);
+        gimp_vector3_sub (&c, &c, &o);
+
+        z_sign = gimp_vector3_inner_product (&c, &n) <= 0.0 ? +1.0 : -1.0;
+      }
+
+      {
+        GimpVector2 o, u, v;
+
+        gimp_matrix3_transform_point (&priv->orig_transform,
+                                      priv->pivot_x, priv->pivot_y,
+                                      &o.x, &o.y);
+        gimp_matrix3_transform_point (&priv->orig_transform,
+                                      priv->pivot_x + 1.0, priv->pivot_y,
+                                      &u.x, &u.y);
+        gimp_matrix3_transform_point (&priv->orig_transform,
+                                      priv->pivot_x, priv->pivot_y + 1.0,
+                                      &v.x, &v.y);
+
+        gimp_vector2_sub (&u, &u, &o);
+        gimp_vector2_sub (&v, &v, &o);
+
+        gimp_vector2_normalize (&u);
+        gimp_vector2_normalize (&v);
+
+        basis_inv.coeff[0][0] = u.x;
+        basis_inv.coeff[1][0] = u.y;
+        basis_inv.coeff[0][1] = v.x;
+        basis_inv.coeff[1][1] = v.y;
+
+        gimp_matrix2_invert (&basis_inv);
+      }
+    }
+
+  if (! priv->z_axis)
+    {
+      GimpVector2 scale;
+      gdouble     norm;
+
+      gimp_matrix2_transform_point (&basis_inv,
+                                    -(y - priv->last_y),
+                                    x - priv->last_x,
+                                    &omega.x, &omega.y);
+
+      omega.z = 0.0;
+
+      if (! gimp_tool_transform_3d_grid_constrain (grid,
+                                                   x,        y,
+                                                   0.0,      0.0,
+                                                   &omega.x, &omega.y))
+        {
+          return FALSE;
+        }
+
+      norm = gimp_vector3_length (&omega);
+
+      if (norm > 0.0)
+        {
+          scale.x = shell->scale_x * omega.y / norm;
+          scale.y = shell->scale_y * omega.x / norm;
+
+          gimp_vector3_mul (&omega, gimp_vector2_length (&scale));
+          gimp_vector3_mul (&omega, 2.0 * G_PI / PIXELS_PER_REVOLUTION);
+        }
+    }
+  else
+    {
+      GimpVector2 o;
+      GimpVector2 v1 = {priv->last_x,  priv->last_y};
+      GimpVector2 v2 = {x,             y};
+
+      g_warn_if_fail (priv->pivot_z == 0.0);
+
+      gimp_matrix3_transform_point (&priv->orig_transform,
+                                    priv->pivot_x, priv->pivot_y,
+                                    &o.x,          &o.y);
+
+      gimp_vector2_sub (&v1, &v1, &o);
+      gimp_vector2_sub (&v2, &v2, &o);
+
+      gimp_vector2_normalize (&v1);
+      gimp_vector2_normalize (&v2);
+
+      omega.x = 0.0;
+      omega.y = 0.0;
+      omega.z = atan2 (gimp_vector2_cross_product (&v1, &v2).y,
+                       gimp_vector2_inner_product (&v1, &v2));
+
+      omega.z *= z_sign;
+    }
+
+  gimp_matrix4_identity (&matrix);
+
+  if (local_frame)
+    gimp_transform_3d_matrix4_rotate (&matrix, &omega);
+
+  gimp_transform_3d_matrix4_rotate_euler (&matrix,
+                                          priv->rotation_order,
+                                          priv->angle_x,
+                                          priv->angle_y,
+                                          priv->angle_z,
+                                          0.0, 0.0, 0.0);
+
+  if (! local_frame)
+    gimp_transform_3d_matrix4_rotate (&matrix, &omega);
+
+  gimp_transform_3d_matrix4_rotate_euler_decompose (&matrix,
+                                                    priv->rotation_order,
+                                                    &priv->angle_x,
+                                                    &priv->angle_y,
+                                                    &priv->angle_z);
+
+  priv->last_x = x;
+  priv->last_y = y;
+
+  g_object_set (grid,
+                "angle-x", priv->angle_x,
+                "angle-y", priv->angle_y,
+                "angle-z", priv->angle_z,
+                NULL);
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_transform_3d_grid_new (GimpDisplayShell *shell,
+                                 gdouble           x1,
+                                 gdouble           y1,
+                                 gdouble           x2,
+                                 gdouble           y2,
+                                 gdouble           camera_x,
+                                 gdouble           camera_y,
+                                 gdouble           camera_z)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_TRANSFORM_3D_GRID,
+                       "shell",      shell,
+                       "x1",         x1,
+                       "y1",         y1,
+                       "x2",         x2,
+                       "y2",         y2,
+                       "camera-x",   camera_x,
+                       "camera-y",   camera_y,
+                       "camera-z",   camera_z,
+                       "pivot-3d-x", (x1 + x2) / 2.0,
+                       "pivot-3d-y", (y1 + y2) / 2.0,
+                       "pivot-3d-z", 0.0,
+                       NULL);
+}
diff --git a/app/display/gimptooltransform3dgrid.h b/app/display/gimptooltransform3dgrid.h
new file mode 100644
index 0000000..42ac3ea
--- /dev/null
+++ b/app/display/gimptooltransform3dgrid.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptool3dtransformgrid.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_TRANSFORM_3D_GRID_H__
+#define __GIMP_TOOL_TRANSFORM_3D_GRID_H__
+
+
+#include "gimptooltransformgrid.h"
+
+
+#define GIMP_TYPE_TOOL_TRANSFORM_3D_GRID            (gimp_tool_transform_3d_grid_get_type ())
+#define GIMP_TOOL_TRANSFORM_3D_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_TRANSFORM_3D_GRID, GimpToolTransform3DGrid))
+#define GIMP_TOOL_TRANSFORM_3D_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_TRANSFORM_3D_GRID, GimpToolTransform3DGridClass))
+#define GIMP_IS_TOOL_TRANSFORM_3D_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_TRANSFORM_3D_GRID))
+#define GIMP_IS_TOOL_TRANSFORM_3D_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_TRANSFORM_3D_GRID))
+#define GIMP_TOOL_TRANSFORM_3D_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_TRANSFORM_3D_GRID, GimpToolTransform3DGridClass))
+
+
+typedef struct _GimpToolTransform3DGrid        GimpToolTransform3DGrid;
+typedef struct _GimpToolTransform3DGridPrivate GimpToolTransform3DGridPrivate;
+typedef struct _GimpToolTransform3DGridClass   GimpToolTransform3DGridClass;
+
+struct _GimpToolTransform3DGrid
+{
+  GimpToolTransformGrid     parent_instance;
+
+  GimpToolTransform3DGridPrivate *priv;
+};
+
+struct _GimpToolTransform3DGridClass
+{
+  GimpToolTransformGridClass  parent_class;
+};
+
+
+GType            gimp_tool_transform_3d_grid_get_type (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_transform_3d_grid_new      (GimpDisplayShell    *shell,
+                                                       gdouble              x1,
+                                                       gdouble              y1,
+                                                       gdouble              x2,
+                                                       gdouble              y2,
+                                                       gdouble              camera_x,
+                                                       gdouble              camera_y,
+                                                       gdouble              camera_z);
+
+
+#endif /* __GIMP_TOOL_TRANSFORM_3D_GRID_H__ */
diff --git a/app/display/gimptooltransformgrid.c b/app/display/gimptooltransformgrid.c
new file mode 100644
index 0000000..b186b91
--- /dev/null
+++ b/app/display/gimptooltransformgrid.c
@@ -0,0 +1,2494 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooltransformgrid.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on GimpUnifiedTransformTool
+ * Copyright (C) 2011 Mikael Magnusson <mikachu@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcanvashandle.h"
+#include "gimpcanvastransformguides.h"
+#include "gimpdisplayshell.h"
+#include "gimptooltransformgrid.h"
+
+#include "gimp-intl.h"
+
+
+#define MIN_HANDLE_SIZE 6
+
+
+enum
+{
+  PROP_0,
+  PROP_TRANSFORM,
+  PROP_X1,
+  PROP_Y1,
+  PROP_X2,
+  PROP_Y2,
+  PROP_PIVOT_X,
+  PROP_PIVOT_Y,
+  PROP_GUIDE_TYPE,
+  PROP_N_GUIDES,
+  PROP_CLIP_GUIDES,
+  PROP_SHOW_GUIDES,
+  PROP_INSIDE_FUNCTION,
+  PROP_OUTSIDE_FUNCTION,
+  PROP_USE_CORNER_HANDLES,
+  PROP_USE_PERSPECTIVE_HANDLES,
+  PROP_USE_SIDE_HANDLES,
+  PROP_USE_SHEAR_HANDLES,
+  PROP_USE_CENTER_HANDLE,
+  PROP_USE_PIVOT_HANDLE,
+  PROP_DYNAMIC_HANDLE_SIZE,
+  PROP_CONSTRAIN_MOVE,
+  PROP_CONSTRAIN_SCALE,
+  PROP_CONSTRAIN_ROTATE,
+  PROP_CONSTRAIN_SHEAR,
+  PROP_CONSTRAIN_PERSPECTIVE,
+  PROP_FROMPIVOT_SCALE,
+  PROP_FROMPIVOT_SHEAR,
+  PROP_FROMPIVOT_PERSPECTIVE,
+  PROP_CORNERSNAP,
+  PROP_FIXEDPIVOT
+};
+
+
+struct _GimpToolTransformGridPrivate
+{
+  GimpMatrix3            transform;
+  gdouble                x1, y1;
+  gdouble                x2, y2;
+  gdouble                pivot_x;
+  gdouble                pivot_y;
+  GimpGuidesType         guide_type;
+  gint                   n_guides;
+  gboolean               clip_guides;
+  gboolean               show_guides;
+  GimpTransformFunction  inside_function;
+  GimpTransformFunction  outside_function;
+  gboolean               use_corner_handles;
+  gboolean               use_perspective_handles;
+  gboolean               use_side_handles;
+  gboolean               use_shear_handles;
+  gboolean               use_center_handle;
+  gboolean               use_pivot_handle;
+  gboolean               dynamic_handle_size;
+  gboolean               constrain_move;
+  gboolean               constrain_scale;
+  gboolean               constrain_rotate;
+  gboolean               constrain_shear;
+  gboolean               constrain_perspective;
+  gboolean               frompivot_scale;
+  gboolean               frompivot_shear;
+  gboolean               frompivot_perspective;
+  gboolean               cornersnap;
+  gboolean               fixedpivot;
+
+  gdouble                curx;         /*  current x coord                    */
+  gdouble                cury;         /*  current y coord                    */
+
+  gdouble                button_down;  /*  is the mouse button pressed        */
+  gdouble                mousex;       /*  x coord where mouse was clicked    */
+  gdouble                mousey;       /*  y coord where mouse was clicked    */
+
+  gdouble                cx, cy;       /*  center point (for moving)          */
+
+  /*  transformed handle coords */
+  gdouble                tx1, ty1;
+  gdouble                tx2, ty2;
+  gdouble                tx3, ty3;
+  gdouble                tx4, ty4;
+  gdouble                tcx, tcy;
+  gdouble                tpx, tpy;
+
+  /*  previous transformed handle coords */
+  gdouble                prev_tx1, prev_ty1;
+  gdouble                prev_tx2, prev_ty2;
+  gdouble                prev_tx3, prev_ty3;
+  gdouble                prev_tx4, prev_ty4;
+  gdouble                prev_tcx, prev_tcy;
+  gdouble                prev_tpx, prev_tpy;
+
+  GimpTransformHandle    handle;        /*  current tool activity              */
+
+  GimpCanvasItem        *guides;
+  GimpCanvasItem        *handles[GIMP_N_TRANSFORM_HANDLES];
+  GimpCanvasItem        *center_items[2];
+  GimpCanvasItem        *pivot_items[2];
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_transform_grid_constructed    (GObject               *object);
+static void     gimp_tool_transform_grid_set_property   (GObject               *object,
+                                                         guint                  property_id,
+                                                         const GValue          *value,
+                                                         GParamSpec            *pspec);
+static void     gimp_tool_transform_grid_get_property   (GObject               *object,
+                                                         guint                  property_id,
+                                                         GValue                *value,
+                                                         GParamSpec            *pspec);
+
+static void     gimp_tool_transform_grid_changed        (GimpToolWidget        *widget);
+static gint     gimp_tool_transform_grid_button_press   (GimpToolWidget        *widget,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpButtonPressType    press_type);
+static void     gimp_tool_transform_grid_button_release (GimpToolWidget        *widget,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpButtonReleaseType  release_type);
+static void     gimp_tool_transform_grid_motion         (GimpToolWidget        *widget,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state);
+static GimpHit  gimp_tool_transform_grid_hit            (GimpToolWidget        *widget,
+                                                         const GimpCoords      *coords,
+                                                         GdkModifierType        state,
+                                                         gboolean               proximity);
+static void     gimp_tool_transform_grid_hover          (GimpToolWidget        *widget,
+                                                         const GimpCoords      *coords,
+                                                         GdkModifierType        state,
+                                                         gboolean               proximity);
+static void     gimp_tool_transform_grid_leave_notify   (GimpToolWidget        *widget);
+static void     gimp_tool_transform_grid_hover_modifier (GimpToolWidget        *widget,
+                                                         GdkModifierType        key,
+                                                         gboolean               press,
+                                                         GdkModifierType        state);
+static gboolean gimp_tool_transform_grid_get_cursor     (GimpToolWidget        *widget,
+                                                         const GimpCoords      *coords,
+                                                         GdkModifierType        state,
+                                                         GimpCursorType        *cursor,
+                                                         GimpToolCursorType    *tool_cursor,
+                                                         GimpCursorModifier    *modifier);
+
+static GimpTransformHandle
+                gimp_tool_transform_grid_get_handle_for_coords
+                                                        (GimpToolTransformGrid *grid,
+                                                         const GimpCoords      *coords);
+static void     gimp_tool_transform_grid_update_hilight (GimpToolTransformGrid *grid);
+static void     gimp_tool_transform_grid_update_box     (GimpToolTransformGrid *grid);
+static void     gimp_tool_transform_grid_update_matrix  (GimpToolTransformGrid *grid);
+static void     gimp_tool_transform_grid_calc_handles   (GimpToolTransformGrid *grid,
+                                                         gint                  *handle_w,
+                                                         gint                  *handle_h);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolTransformGrid, gimp_tool_transform_grid,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_transform_grid_parent_class
+
+
+static void
+gimp_tool_transform_grid_class_init (GimpToolTransformGridClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->constructed     = gimp_tool_transform_grid_constructed;
+  object_class->set_property    = gimp_tool_transform_grid_set_property;
+  object_class->get_property    = gimp_tool_transform_grid_get_property;
+
+  widget_class->changed         = gimp_tool_transform_grid_changed;
+  widget_class->button_press    = gimp_tool_transform_grid_button_press;
+  widget_class->button_release  = gimp_tool_transform_grid_button_release;
+  widget_class->motion          = gimp_tool_transform_grid_motion;
+  widget_class->hit             = gimp_tool_transform_grid_hit;
+  widget_class->hover           = gimp_tool_transform_grid_hover;
+  widget_class->leave_notify    = gimp_tool_transform_grid_leave_notify;
+  widget_class->hover_modifier  = gimp_tool_transform_grid_hover_modifier;
+  widget_class->get_cursor      = gimp_tool_transform_grid_get_cursor;
+  widget_class->update_on_scale = TRUE;
+
+  g_object_class_install_property (object_class, PROP_TRANSFORM,
+                                   gimp_param_spec_matrix3 ("transform",
+                                                            NULL, NULL,
+                                                            NULL,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X1,
+                                   g_param_spec_double ("x1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y1,
+                                   g_param_spec_double ("y1",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X2,
+                                   g_param_spec_double ("x2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y2,
+                                   g_param_spec_double ("y2",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_X,
+                                   g_param_spec_double ("pivot-x",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PIVOT_Y,
+                                   g_param_spec_double ("pivot-y",
+                                                        NULL, NULL,
+                                                        -GIMP_MAX_IMAGE_SIZE,
+                                                        GIMP_MAX_IMAGE_SIZE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GUIDE_TYPE,
+                                   g_param_spec_enum ("guide-type", NULL, NULL,
+                                                      GIMP_TYPE_GUIDES_TYPE,
+                                                      GIMP_GUIDES_NONE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_N_GUIDES,
+                                   g_param_spec_int ("n-guides", NULL, NULL,
+                                                     1, 128, 4,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CLIP_GUIDES,
+                                   g_param_spec_boolean ("clip-guides", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SHOW_GUIDES,
+                                   g_param_spec_boolean ("show-guides", NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_INSIDE_FUNCTION,
+                                   g_param_spec_enum ("inside-function",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_TRANSFORM_FUNCTION,
+                                                      GIMP_TRANSFORM_FUNCTION_MOVE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_OUTSIDE_FUNCTION,
+                                   g_param_spec_enum ("outside-function",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_TRANSFORM_FUNCTION,
+                                                      GIMP_TRANSFORM_FUNCTION_ROTATE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USE_CORNER_HANDLES,
+                                   g_param_spec_boolean ("use-corner-handles",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USE_PERSPECTIVE_HANDLES,
+                                   g_param_spec_boolean ("use-perspective-handles",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USE_SIDE_HANDLES,
+                                   g_param_spec_boolean ("use-side-handles",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USE_SHEAR_HANDLES,
+                                   g_param_spec_boolean ("use-shear-handles",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USE_CENTER_HANDLE,
+                                   g_param_spec_boolean ("use-center-handle",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_USE_PIVOT_HANDLE,
+                                   g_param_spec_boolean ("use-pivot-handle",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DYNAMIC_HANDLE_SIZE,
+                                   g_param_spec_boolean ("dynamic-handle-size",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAIN_MOVE,
+                                   g_param_spec_boolean ("constrain-move",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAIN_SCALE,
+                                   g_param_spec_boolean ("constrain-scale",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAIN_ROTATE,
+                                   g_param_spec_boolean ("constrain-rotate",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAIN_SHEAR,
+                                   g_param_spec_boolean ("constrain-shear",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONSTRAIN_PERSPECTIVE,
+                                   g_param_spec_boolean ("constrain-perspective",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FROMPIVOT_SCALE,
+                                   g_param_spec_boolean ("frompivot-scale",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FROMPIVOT_SHEAR,
+                                   g_param_spec_boolean ("frompivot-shear",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FROMPIVOT_PERSPECTIVE,
+                                   g_param_spec_boolean ("frompivot-perspective",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CORNERSNAP,
+                                   g_param_spec_boolean ("cornersnap",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FIXEDPIVOT,
+                                   g_param_spec_boolean ("fixedpivot",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tool_transform_grid_init (GimpToolTransformGrid *grid)
+{
+  grid->private = gimp_tool_transform_grid_get_instance_private (grid);
+}
+
+static void
+gimp_tool_transform_grid_constructed (GObject *object)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (object);
+  GimpToolWidget               *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpCanvasGroup              *stroke_group;
+  gint                          i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  private->guides = gimp_tool_widget_add_transform_guides (widget,
+                                                           &private->transform,
+                                                           private->x1,
+                                                           private->y1,
+                                                           private->x2,
+                                                           private->y2,
+                                                           private->guide_type,
+                                                           private->n_guides,
+                                                           private->clip_guides);
+
+  for (i = 0; i < 4; i++)
+    {
+      /*  draw the scale handles  */
+      private->handles[GIMP_TRANSFORM_HANDLE_NW + i] =
+        gimp_tool_widget_add_handle (widget,
+                                     GIMP_HANDLE_SQUARE,
+                                     0, 0, 10, 10,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+
+      /*  draw the perspective handles  */
+      private->handles[GIMP_TRANSFORM_HANDLE_NW_P + i] =
+        gimp_tool_widget_add_handle (widget,
+                                     GIMP_HANDLE_DIAMOND,
+                                     0, 0, 10, 10,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+
+      /*  draw the side handles  */
+      private->handles[GIMP_TRANSFORM_HANDLE_N + i] =
+        gimp_tool_widget_add_handle (widget,
+                                     GIMP_HANDLE_SQUARE,
+                                     0, 0, 10, 10,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+
+      /*  draw the shear handles  */
+      private->handles[GIMP_TRANSFORM_HANDLE_N_S + i] =
+        gimp_tool_widget_add_handle (widget,
+                                     GIMP_HANDLE_FILLED_DIAMOND,
+                                     0, 0, 10, 10,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+    }
+
+  /*  draw the rotation center axis handle  */
+  stroke_group = gimp_tool_widget_add_stroke_group (widget);
+
+  private->handles[GIMP_TRANSFORM_HANDLE_PIVOT] =
+    GIMP_CANVAS_ITEM (stroke_group);
+
+  gimp_tool_widget_push_group (widget, stroke_group);
+
+  private->pivot_items[0] =
+    gimp_tool_widget_add_handle (widget,
+                                 GIMP_HANDLE_CIRCLE,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+  private->pivot_items[1] =
+    gimp_tool_widget_add_handle (widget,
+                                 GIMP_HANDLE_CROSS,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+  gimp_tool_widget_pop_group (widget);
+
+  /*  draw the center handle  */
+  stroke_group = gimp_tool_widget_add_stroke_group (widget);
+
+  private->handles[GIMP_TRANSFORM_HANDLE_CENTER] =
+    GIMP_CANVAS_ITEM (stroke_group);
+
+  gimp_tool_widget_push_group (widget, stroke_group);
+
+  private->center_items[0] =
+    gimp_tool_widget_add_handle (widget,
+                                 GIMP_HANDLE_SQUARE,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+  private->center_items[1] =
+    gimp_tool_widget_add_handle (widget,
+                                 GIMP_HANDLE_CROSS,
+                                 0, 0, 10, 10,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+  gimp_tool_widget_pop_group (widget);
+
+  gimp_tool_transform_grid_changed (widget);
+}
+
+static void
+gimp_tool_transform_grid_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (object);
+  GimpToolTransformGridPrivate *private = grid->private;
+  gboolean                      box     = FALSE;
+
+  switch (property_id)
+    {
+    case PROP_TRANSFORM:
+      {
+        GimpMatrix3 *transform = g_value_get_boxed (value);
+
+        if (transform)
+          private->transform = *transform;
+        else
+          gimp_matrix3_identity (&private->transform);
+      }
+      break;
+
+    case PROP_X1:
+      private->x1 = g_value_get_double (value);
+      box = TRUE;
+      break;
+    case PROP_Y1:
+      private->y1 = g_value_get_double (value);
+      box = TRUE;
+      break;
+    case PROP_X2:
+      private->x2 = g_value_get_double (value);
+      box = TRUE;
+      break;
+    case PROP_Y2:
+      private->y2 = g_value_get_double (value);
+      box = TRUE;
+      break;
+
+    case PROP_PIVOT_X:
+      private->pivot_x = g_value_get_double (value);
+      break;
+    case PROP_PIVOT_Y:
+      private->pivot_y = g_value_get_double (value);
+      break;
+
+    case PROP_GUIDE_TYPE:
+      private->guide_type = g_value_get_enum (value);
+      break;
+    case PROP_N_GUIDES:
+      private->n_guides = g_value_get_int (value);
+      break;
+    case PROP_CLIP_GUIDES:
+      private->clip_guides = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_GUIDES:
+      private->show_guides = g_value_get_boolean (value);
+      break;
+
+    case PROP_INSIDE_FUNCTION:
+      private->inside_function = g_value_get_enum (value);
+      break;
+    case PROP_OUTSIDE_FUNCTION:
+      private->outside_function = g_value_get_enum (value);
+      break;
+
+    case PROP_USE_CORNER_HANDLES:
+      private->use_corner_handles = g_value_get_boolean (value);
+      break;
+    case PROP_USE_PERSPECTIVE_HANDLES:
+      private->use_perspective_handles = g_value_get_boolean (value);
+      break;
+    case PROP_USE_SIDE_HANDLES:
+      private->use_side_handles = g_value_get_boolean (value);
+      break;
+    case PROP_USE_SHEAR_HANDLES:
+      private->use_shear_handles = g_value_get_boolean (value);
+      break;
+    case PROP_USE_CENTER_HANDLE:
+      private->use_center_handle = g_value_get_boolean (value);
+      break;
+    case PROP_USE_PIVOT_HANDLE:
+      private->use_pivot_handle = g_value_get_boolean (value);
+      break;
+
+    case PROP_DYNAMIC_HANDLE_SIZE:
+      private->dynamic_handle_size = g_value_get_boolean (value);
+      break;
+
+    case PROP_CONSTRAIN_MOVE:
+      private->constrain_move = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_SCALE:
+      private->constrain_scale = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_ROTATE:
+      private->constrain_rotate = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_SHEAR:
+      private->constrain_shear = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_PERSPECTIVE:
+      private->constrain_perspective = g_value_get_boolean (value);
+      break;
+
+    case PROP_FROMPIVOT_SCALE:
+      private->frompivot_scale = g_value_get_boolean (value);
+      break;
+    case PROP_FROMPIVOT_SHEAR:
+      private->frompivot_shear = g_value_get_boolean (value);
+      break;
+    case PROP_FROMPIVOT_PERSPECTIVE:
+      private->frompivot_perspective = g_value_get_boolean (value);
+      break;
+
+    case PROP_CORNERSNAP:
+      private->cornersnap = g_value_get_boolean (value);
+      break;
+    case PROP_FIXEDPIVOT:
+      private->fixedpivot = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+
+  if (box)
+    {
+      private->cx = (private->x1 + private->x2) / 2.0;
+      private->cy = (private->y1 + private->y2) / 2.0;
+    }
+}
+
+static void
+gimp_tool_transform_grid_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (object);
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  switch (property_id)
+    {
+    case PROP_TRANSFORM:
+      g_value_set_boxed (value, &private->transform);
+      break;
+
+    case PROP_X1:
+      g_value_set_double (value, private->x1);
+      break;
+    case PROP_Y1:
+      g_value_set_double (value, private->y1);
+      break;
+    case PROP_X2:
+      g_value_set_double (value, private->x2);
+      break;
+    case PROP_Y2:
+      g_value_set_double (value, private->y2);
+      break;
+
+    case PROP_PIVOT_X:
+      g_value_set_double (value, private->pivot_x);
+      break;
+    case PROP_PIVOT_Y:
+      g_value_set_double (value, private->pivot_y);
+      break;
+
+    case PROP_GUIDE_TYPE:
+      g_value_set_enum (value, private->guide_type);
+      break;
+    case PROP_N_GUIDES:
+      g_value_set_int (value, private->n_guides);
+      break;
+    case PROP_CLIP_GUIDES:
+      g_value_set_boolean (value, private->clip_guides);
+      break;
+    case PROP_SHOW_GUIDES:
+      g_value_set_boolean (value, private->show_guides);
+      break;
+
+    case PROP_INSIDE_FUNCTION:
+      g_value_set_enum (value, private->inside_function);
+      break;
+    case PROP_OUTSIDE_FUNCTION:
+      g_value_set_enum (value, private->outside_function);
+      break;
+
+    case PROP_USE_CORNER_HANDLES:
+      g_value_set_boolean (value, private->use_corner_handles);
+      break;
+    case PROP_USE_PERSPECTIVE_HANDLES:
+      g_value_set_boolean (value, private->use_perspective_handles);
+      break;
+    case PROP_USE_SIDE_HANDLES:
+      g_value_set_boolean (value, private->use_side_handles);
+      break;
+    case PROP_USE_SHEAR_HANDLES:
+      g_value_set_boolean (value, private->use_shear_handles);
+      break;
+    case PROP_USE_CENTER_HANDLE:
+      g_value_set_boolean (value, private->use_center_handle);
+      break;
+    case PROP_USE_PIVOT_HANDLE:
+      g_value_set_boolean (value, private->use_pivot_handle);
+      break;
+
+    case PROP_DYNAMIC_HANDLE_SIZE:
+      g_value_set_boolean (value, private->dynamic_handle_size);
+      break;
+
+    case PROP_CONSTRAIN_MOVE:
+      g_value_set_boolean (value, private->constrain_move);
+      break;
+    case PROP_CONSTRAIN_SCALE:
+      g_value_set_boolean (value, private->constrain_scale);
+      break;
+    case PROP_CONSTRAIN_ROTATE:
+      g_value_set_boolean (value, private->constrain_rotate);
+      break;
+    case PROP_CONSTRAIN_SHEAR:
+      g_value_set_boolean (value, private->constrain_shear);
+      break;
+    case PROP_CONSTRAIN_PERSPECTIVE:
+      g_value_set_boolean (value, private->constrain_perspective);
+      break;
+
+    case PROP_FROMPIVOT_SCALE:
+      g_value_set_boolean (value, private->frompivot_scale);
+      break;
+    case PROP_FROMPIVOT_SHEAR:
+      g_value_set_boolean (value, private->frompivot_shear);
+      break;
+    case PROP_FROMPIVOT_PERSPECTIVE:
+      g_value_set_boolean (value, private->frompivot_perspective);
+      break;
+
+    case PROP_CORNERSNAP:
+      g_value_set_boolean (value, private->cornersnap);
+      break;
+    case PROP_FIXEDPIVOT:
+      g_value_set_boolean (value, private->fixedpivot);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+transform_is_convex (GimpVector2 *pos)
+{
+  return gimp_transform_polygon_is_convex (pos[0].x, pos[0].y,
+                                           pos[1].x, pos[1].y,
+                                           pos[2].x, pos[2].y,
+                                           pos[3].x, pos[3].y);
+}
+
+static gboolean
+transform_grid_is_convex (GimpToolTransformGrid *grid)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  return gimp_transform_polygon_is_convex (private->tx1, private->ty1,
+                                           private->tx2, private->ty2,
+                                           private->tx3, private->ty3,
+                                           private->tx4, private->ty4);
+}
+
+static inline gboolean
+vectorisnull (GimpVector2 v)
+{
+  return ((v.x == 0.0) && (v.y == 0.0));
+}
+
+static inline gdouble
+dotprod (GimpVector2 a,
+         GimpVector2 b)
+{
+  return a.x * b.x + a.y * b.y;
+}
+
+static inline gdouble
+norm (GimpVector2 a)
+{
+  return sqrt (dotprod (a, a));
+}
+
+static inline GimpVector2
+vectorsubtract (GimpVector2 a,
+                GimpVector2 b)
+{
+  GimpVector2 c;
+
+  c.x = a.x - b.x;
+  c.y = a.y - b.y;
+
+  return c;
+}
+
+static inline GimpVector2
+vectoradd (GimpVector2 a,
+           GimpVector2 b)
+{
+  GimpVector2 c;
+
+  c.x = a.x + b.x;
+  c.y = a.y + b.y;
+
+  return c;
+}
+
+static inline GimpVector2
+scalemult (GimpVector2 a,
+           gdouble     b)
+{
+  GimpVector2 c;
+
+  c.x = a.x * b;
+  c.y = a.y * b;
+
+  return c;
+}
+
+static inline GimpVector2
+vectorproject (GimpVector2 a,
+               GimpVector2 b)
+{
+  return scalemult (b, dotprod (a, b) / dotprod (b, b));
+}
+
+/* finds the clockwise angle between the vectors given, 0-2π */
+static inline gdouble
+calcangle (GimpVector2 a,
+           GimpVector2 b)
+{
+  gdouble angle, angle2;
+  gdouble length;
+
+  if (vectorisnull (a) || vectorisnull (b))
+    return 0.0;
+
+  length = norm (a) * norm (b);
+
+  angle = acos (SAFE_CLAMP (dotprod (a, b) / length, -1.0, +1.0));
+  angle2 = b.y;
+  b.y = -b.x;
+  b.x = angle2;
+  angle2 = acos (SAFE_CLAMP (dotprod (a, b) / length, -1.0, +1.0));
+
+  return ((angle2 > G_PI / 2.0) ? angle : 2.0 * G_PI - angle);
+}
+
+static inline GimpVector2
+rotate2d (GimpVector2 p,
+          gdouble     angle)
+{
+  GimpVector2 ret;
+
+  ret.x = cos (angle) * p.x-sin (angle) * p.y;
+  ret.y = sin (angle) * p.x+cos (angle) * p.y;
+
+  return ret;
+}
+
+static inline GimpVector2
+lineintersect (GimpVector2 p1, GimpVector2 p2,
+               GimpVector2 q1, GimpVector2 q2)
+{
+  gdouble     denom, u;
+  GimpVector2 p;
+
+  denom = (q2.y - q1.y) * (p2.x - p1.x) - (q2.x - q1.x) * (p2.y - p1.y);
+  if (denom == 0.0)
+    {
+      p.x = (p1.x + p2.x + q1.x + q2.x) / 4;
+      p.y = (p1.y + p2.y + q1.y + q2.y) / 4;
+    }
+  else
+    {
+      u = (q2.x - q1.x) * (p1.y - q1.y) - (q2.y - q1.y) * (p1.x - q1.x);
+      u /= denom;
+
+      p.x = p1.x + u * (p2.x - p1.x);
+      p.y = p1.y + u * (p2.y - p1.y);
+    }
+
+  return p;
+}
+
+static inline GimpVector2
+get_pivot_delta (GimpToolTransformGrid *grid,
+                 GimpVector2           *oldpos,
+                 GimpVector2           *newpos,
+                 GimpVector2            pivot)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpMatrix3                   transform_before;
+  GimpMatrix3                   transform_after;
+  GimpVector2                   delta;
+
+  gimp_matrix3_identity (&transform_before);
+  gimp_matrix3_identity (&transform_after);
+
+  gimp_transform_matrix_perspective (&transform_before,
+                                     private->x1,
+                                     private->y1,
+                                     private->x2 - private->x1,
+                                     private->y2 - private->y1,
+                                     oldpos[0].x, oldpos[0].y,
+                                     oldpos[1].x, oldpos[1].y,
+                                     oldpos[2].x, oldpos[2].y,
+                                     oldpos[3].x, oldpos[3].y);
+  gimp_transform_matrix_perspective (&transform_after,
+                                     private->x1,
+                                     private->y1,
+                                     private->x2 - private->x1,
+                                     private->y2 - private->y1,
+                                     newpos[0].x, newpos[0].y,
+                                     newpos[1].x, newpos[1].y,
+                                     newpos[2].x, newpos[2].y,
+                                     newpos[3].x, newpos[3].y);
+  gimp_matrix3_invert (&transform_before);
+  gimp_matrix3_mult (&transform_after, &transform_before);
+  gimp_matrix3_transform_point (&transform_before,
+                                pivot.x, pivot.y, &delta.x, &delta.y);
+
+  delta = vectorsubtract (delta, pivot);
+
+  return delta;
+}
+
+static gboolean
+point_is_inside_polygon (gint     n,
+                         gdouble *x,
+                         gdouble *y,
+                         gdouble  px,
+                         gdouble  py)
+{
+  gint     i, j;
+  gboolean odd = FALSE;
+
+  for (i = 0, j = n - 1; i < n; j = i++)
+    {
+      if ((y[i] < py && y[j] >= py) ||
+          (y[j] < py && y[i] >= py))
+        {
+          if (x[i] + (py - y[i]) / (y[j] - y[i]) * (x[j] - x[i]) < px)
+            odd = !odd;
+        }
+    }
+
+  return odd;
+}
+
+static gboolean
+point_is_inside_polygon_pos (GimpVector2 *pos,
+                             GimpVector2  point)
+{
+  return point_is_inside_polygon (4,
+                                  (gdouble[4]){ pos[0].x, pos[1].x,
+                                                pos[3].x, pos[2].x },
+                                  (gdouble[4]){ pos[0].y, pos[1].y,
+                                                pos[3].y, pos[2].y },
+                                  point.x, point.y);
+}
+
+static void
+get_handle_geometry (GimpToolTransformGrid *grid,
+                     GimpVector2           *position,
+                     gdouble               *angle)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  GimpVector2 o[] = { { .x = private->tx1, .y = private->ty1 },
+                      { .x = private->tx2, .y = private->ty2 },
+                      { .x = private->tx3, .y = private->ty3 },
+                      { .x = private->tx4, .y = private->ty4 } };
+  GimpVector2 right = { .x = 1.0, .y = 0.0 };
+  GimpVector2 up    = { .x = 0.0, .y = 1.0 };
+
+  if (position)
+    {
+      position[0] = o[0];
+      position[1] = o[1];
+      position[2] = o[2];
+      position[3] = o[3];
+    }
+
+  angle[0] = calcangle (vectorsubtract (o[1], o[0]), right);
+  angle[1] = calcangle (vectorsubtract (o[3], o[2]), right);
+  angle[2] = calcangle (vectorsubtract (o[3], o[1]), up);
+  angle[3] = calcangle (vectorsubtract (o[2], o[0]), up);
+
+  angle[4] = (angle[0] + angle[3]) / 2.0;
+  angle[5] = (angle[0] + angle[2]) / 2.0;
+  angle[6] = (angle[1] + angle[3]) / 2.0;
+  angle[7] = (angle[1] + angle[2]) / 2.0;
+
+  angle[8] = (angle[0] + angle[1] + angle[2] + angle[3]) / 4.0;
+}
+
+static void
+gimp_tool_transform_grid_changed (GimpToolWidget *widget)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+  gdouble                       angle[9];
+  GimpVector2                   o[4], t[4];
+  gint                          handle_w;
+  gint                          handle_h;
+  gint                          d, i;
+
+  gimp_tool_transform_grid_update_box (grid);
+
+  gimp_canvas_transform_guides_set (private->guides,
+                                    &private->transform,
+                                    private->x1,
+                                    private->y1,
+                                    private->x2,
+                                    private->y2,
+                                    private->guide_type,
+                                    private->n_guides,
+                                    private->clip_guides);
+  gimp_canvas_item_set_visible (private->guides, private->show_guides);
+
+  get_handle_geometry (grid, o, angle);
+  gimp_tool_transform_grid_calc_handles (grid, &handle_w, &handle_h);
+
+  for (i = 0; i < 4; i++)
+    {
+      GimpCanvasItem *h;
+      gdouble         factor;
+
+      /*  the scale handles  */
+      factor = 1.0;
+      if (private->use_perspective_handles)
+        factor = 1.5;
+
+      h = private->handles[GIMP_TRANSFORM_HANDLE_NW + i];
+      gimp_canvas_item_set_visible (h, private->use_corner_handles);
+
+      if (private->use_corner_handles)
+        {
+          gimp_canvas_handle_set_position (h, o[i].x, o[i].y);
+          gimp_canvas_handle_set_size (h, handle_w * factor, handle_h * factor);
+          gimp_canvas_handle_set_angles (h, angle[i + 4], 0.0);
+        }
+
+      /*  the perspective handles  */
+      factor = 1.0;
+      if (private->use_corner_handles)
+        factor = 0.8;
+
+      h = private->handles[GIMP_TRANSFORM_HANDLE_NW_P + i];
+      gimp_canvas_item_set_visible (h, private->use_perspective_handles);
+
+      if (private->use_perspective_handles)
+        {
+          gimp_canvas_handle_set_position (h, o[i].x, o[i].y);
+          gimp_canvas_handle_set_size (h, handle_w * factor, handle_h * factor);
+          gimp_canvas_handle_set_angles (h, angle[i + 4], 0.0);
+        }
+    }
+
+  /*  draw the side handles  */
+  t[0] = scalemult (vectoradd (o[0], o[1]), 0.5);
+  t[1] = scalemult (vectoradd (o[2], o[3]), 0.5);
+  t[2] = scalemult (vectoradd (o[1], o[3]), 0.5);
+  t[3] = scalemult (vectoradd (o[2], o[0]), 0.5);
+
+  for (i = 0; i < 4; i++)
+    {
+      GimpCanvasItem *h;
+
+      h = private->handles[GIMP_TRANSFORM_HANDLE_N + i];
+      gimp_canvas_item_set_visible (h, private->use_side_handles);
+
+      if (private->use_side_handles)
+        {
+          gimp_canvas_handle_set_position (h, t[i].x, t[i].y);
+          gimp_canvas_handle_set_size (h, handle_w, handle_h);
+          gimp_canvas_handle_set_angles (h, angle[i], 0.0);
+        }
+    }
+
+  /*  draw the shear handles  */
+  t[0] = scalemult (vectoradd (           o[0]      , scalemult (o[1], 3.0)),
+                    0.25);
+  t[1] = scalemult (vectoradd (scalemult (o[2], 3.0),            o[3]      ),
+                    0.25);
+  t[2] = scalemult (vectoradd (           o[1]      , scalemult (o[3], 3.0)),
+                    0.25);
+  t[3] = scalemult (vectoradd (scalemult (o[0], 3.0),            o[2]      ),
+                    0.25);
+
+  for (i = 0; i < 4; i++)
+    {
+      GimpCanvasItem *h;
+
+      h = private->handles[GIMP_TRANSFORM_HANDLE_N_S + i];
+      gimp_canvas_item_set_visible (h, private->use_shear_handles);
+
+      if (private->use_shear_handles)
+        {
+          gimp_canvas_handle_set_position (h, t[i].x, t[i].y);
+          gimp_canvas_handle_set_size (h, handle_w, handle_h);
+          gimp_canvas_handle_set_angles (h, angle[i], 0.0);
+        }
+    }
+
+  d = MIN (handle_w, handle_h);
+  if (private->use_center_handle)
+    d *= 2; /* so you can grab it from under the center handle */
+
+  gimp_canvas_item_set_visible (private->handles[GIMP_TRANSFORM_HANDLE_PIVOT],
+                                private->use_pivot_handle);
+
+  if (private->use_pivot_handle)
+    {
+      gimp_canvas_handle_set_position (private->pivot_items[0],
+                                       private->tpx, private->tpy);
+      gimp_canvas_handle_set_size (private->pivot_items[0], d, d);
+
+      gimp_canvas_handle_set_position (private->pivot_items[1],
+                                       private->tpx, private->tpy);
+      gimp_canvas_handle_set_size (private->pivot_items[1], d, d);
+    }
+
+  d = MIN (handle_w, handle_h);
+
+  gimp_canvas_item_set_visible (private->handles[GIMP_TRANSFORM_HANDLE_CENTER],
+                                private->use_center_handle);
+
+  if (private->use_center_handle)
+    {
+      gimp_canvas_handle_set_position (private->center_items[0],
+                                       private->tcx, private->tcy);
+      gimp_canvas_handle_set_size (private->center_items[0], d, d);
+      gimp_canvas_handle_set_angles (private->center_items[0], angle[8], 0.0);
+
+      gimp_canvas_handle_set_position (private->center_items[1],
+                                       private->tcx, private->tcy);
+      gimp_canvas_handle_set_size (private->center_items[1], d, d);
+      gimp_canvas_handle_set_angles (private->center_items[1], angle[8], 0.0);
+    }
+
+  gimp_tool_transform_grid_update_hilight (grid);
+}
+
+gint
+gimp_tool_transform_grid_button_press (GimpToolWidget      *widget,
+                                       const GimpCoords    *coords,
+                                       guint32              time,
+                                       GdkModifierType      state,
+                                       GimpButtonPressType  press_type)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  private->button_down = TRUE;
+  private->mousex      = coords->x;
+  private->mousey      = coords->y;
+
+  if (private->handle != GIMP_TRANSFORM_HANDLE_NONE)
+    {
+      if (private->handles[private->handle])
+        {
+          GimpCanvasItem *handle;
+          gdouble         x, y;
+
+          switch (private->handle)
+            {
+            case GIMP_TRANSFORM_HANDLE_CENTER:
+              handle = private->center_items[0];
+              break;
+
+            case GIMP_TRANSFORM_HANDLE_PIVOT:
+              handle = private->pivot_items[0];
+              break;
+
+             default:
+              handle = private->handles[private->handle];
+              break;
+            }
+
+          gimp_canvas_handle_get_position (handle, &x, &y);
+
+          gimp_tool_widget_set_snap_offsets (widget,
+                                             SIGNED_ROUND (x - coords->x),
+                                             SIGNED_ROUND (y - coords->y),
+                                             0, 0);
+        }
+      else
+        {
+          gimp_tool_widget_set_snap_offsets (widget, 0, 0, 0, 0);
+        }
+
+      private->prev_tx1 = private->tx1;
+      private->prev_ty1 = private->ty1;
+      private->prev_tx2 = private->tx2;
+      private->prev_ty2 = private->ty2;
+      private->prev_tx3 = private->tx3;
+      private->prev_ty3 = private->ty3;
+      private->prev_tx4 = private->tx4;
+      private->prev_ty4 = private->ty4;
+      private->prev_tpx = private->tpx;
+      private->prev_tpy = private->tpy;
+      private->prev_tcx = private->tcx;
+      private->prev_tcy = private->tcy;
+
+      return private->handle;
+    }
+
+  gimp_tool_widget_set_snap_offsets (widget, 0, 0, 0, 0);
+
+  return 0;
+}
+
+void
+gimp_tool_transform_grid_button_release (GimpToolWidget        *widget,
+                                         const GimpCoords      *coords,
+                                         guint32                time,
+                                         GdkModifierType        state,
+                                         GimpButtonReleaseType  release_type)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  private->button_down = FALSE;
+}
+
+void
+gimp_tool_transform_grid_motion (GimpToolWidget   *widget,
+                                 const GimpCoords *coords,
+                                 guint32           time,
+                                 GdkModifierType   state)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+  gdouble                      *x[4], *y[4];
+  gdouble                      *newpivot_x, *newpivot_y;
+
+  GimpVector2                  oldpos[5], newpos[4];
+  GimpVector2                  cur   = { .x = coords->x,
+                                         .y = coords->y };
+  GimpVector2                  mouse = { .x = private->mousex,
+                                         .y = private->mousey };
+  GimpVector2                  d;
+  GimpVector2                  pivot;
+
+  gboolean                     fixedpivot = private->fixedpivot;
+  GimpTransformHandle          handle     = private->handle;
+  gint                         i;
+
+  private->curx = coords->x;
+  private->cury = coords->y;
+
+  x[0] = &private->tx1;
+  y[0] = &private->ty1;
+  x[1] = &private->tx2;
+  y[1] = &private->ty2;
+  x[2] = &private->tx3;
+  y[2] = &private->ty3;
+  x[3] = &private->tx4;
+  y[3] = &private->ty4;
+
+  newpos[0].x = oldpos[0].x = private->prev_tx1;
+  newpos[0].y = oldpos[0].y = private->prev_ty1;
+  newpos[1].x = oldpos[1].x = private->prev_tx2;
+  newpos[1].y = oldpos[1].y = private->prev_ty2;
+  newpos[2].x = oldpos[2].x = private->prev_tx3;
+  newpos[2].y = oldpos[2].y = private->prev_ty3;
+  newpos[3].x = oldpos[3].x = private->prev_tx4;
+  newpos[3].y = oldpos[3].y = private->prev_ty4;
+
+  /* put center point in this array too */
+  oldpos[4].x = private->prev_tcx;
+  oldpos[4].y = private->prev_tcy;
+
+  d = vectorsubtract (cur, mouse);
+
+  newpivot_x = &private->tpx;
+  newpivot_y = &private->tpy;
+
+  if (private->use_pivot_handle)
+    {
+      pivot.x = private->prev_tpx;
+      pivot.y = private->prev_tpy;
+    }
+  else
+    {
+      /* when the transform grid doesn't use a pivot handle, use the center
+       * point as the pivot instead.
+       */
+      pivot.x = private->prev_tcx;
+      pivot.y = private->prev_tcy;
+
+      fixedpivot = TRUE;
+    }
+
+  /* move */
+  if (handle == GIMP_TRANSFORM_HANDLE_CENTER)
+    {
+      if (private->constrain_move)
+        {
+          /* snap to 45 degree vectors from starting point */
+          gdouble angle = 16.0 * calcangle ((GimpVector2) { 1.0, 0.0 },
+                                            d) / (2.0 * G_PI);
+          gdouble dist  = norm (d) / sqrt (2);
+
+          if (angle < 1.0 || angle >= 15.0)
+            d.y = 0;
+          else if (angle < 3.0)
+            d.y = -(d.x = dist);
+          else if (angle < 5.0)
+            d.x = 0;
+          else if (angle < 7.0)
+            d.x = d.y = -dist;
+          else if (angle < 9.0)
+            d.y = 0;
+          else if (angle < 11.0)
+            d.x = -(d.y = dist);
+          else if (angle < 13.0)
+            d.x = 0;
+          else if (angle < 15.0)
+            d.x = d.y = dist;
+        }
+
+      for (i = 0; i < 4; i++)
+        newpos[i] = vectoradd (oldpos[i], d);
+    }
+
+  /* rotate */
+  if (handle == GIMP_TRANSFORM_HANDLE_ROTATION)
+    {
+      gdouble angle = calcangle (vectorsubtract (cur, pivot),
+                                 vectorsubtract (mouse, pivot));
+
+      if (private->constrain_rotate)
+        {
+          /* round to 15 degree multiple */
+          angle /= 2 * G_PI / 24.0;
+          angle = round (angle);
+          angle *= 2 * G_PI / 24.0;
+        }
+
+      for (i = 0; i < 4; i++)
+        newpos[i] = vectoradd (pivot,
+                               rotate2d (vectorsubtract (oldpos[i], pivot),
+                                         angle));
+
+      fixedpivot = TRUE;
+    }
+
+  /* move rotation axis */
+  if (handle == GIMP_TRANSFORM_HANDLE_PIVOT)
+    {
+      pivot = vectoradd (pivot, d);
+
+      if (private->cornersnap)
+        {
+          /* snap to corner points and center */
+          gint    closest = 0;
+          gdouble closest_dist = G_MAXDOUBLE, dist;
+
+          for (i = 0; i < 5; i++)
+            {
+              dist = norm (vectorsubtract (pivot, oldpos[i]));
+              if (dist < closest_dist)
+                {
+                  closest_dist = dist;
+                  closest = i;
+                }
+            }
+
+          if (closest_dist *
+              gimp_tool_widget_get_shell (widget)->scale_x < 50)
+            {
+              pivot = oldpos[closest];
+            }
+        }
+
+      fixedpivot = TRUE;
+    }
+
+  /* scaling via corner */
+  if (handle == GIMP_TRANSFORM_HANDLE_NW ||
+      handle == GIMP_TRANSFORM_HANDLE_NE ||
+      handle == GIMP_TRANSFORM_HANDLE_SE ||
+      handle == GIMP_TRANSFORM_HANDLE_SW)
+    {
+      /* Scaling through scale handles means translating one corner point,
+       * with all sides at constant angles.
+       */
+
+      gint this, left, right, opposite;
+
+      /* 0: northwest, 1: northeast, 2: southwest, 3: southeast */
+      if (handle == GIMP_TRANSFORM_HANDLE_NW)
+        {
+          this = 0; left = 1; right = 2; opposite = 3;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_NE)
+        {
+          this = 1; left = 3; right = 0; opposite = 2;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_SW)
+        {
+          this = 2; left = 0; right = 3; opposite = 1;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_SE)
+        {
+          this = 3; left = 2; right = 1; opposite = 0;
+        }
+      else
+        gimp_assert_not_reached ();
+
+      /* when the keep aspect transformation constraint is enabled,
+       * the translation shall only be along the diagonal that runs
+       * trough this corner point.
+       */
+      if (private->constrain_scale)
+        {
+          /* restrict to movement along the diagonal */
+          GimpVector2 diag = vectorsubtract (oldpos[this], oldpos[opposite]);
+
+          d = vectorproject (d, diag);
+        }
+
+      /* Move the corner being interacted with */
+      /*    rp---------tp
+       *   /           /\ <- d, the interaction vector
+       *  /           /  tp
+       * op----------/
+       *
+       */
+      newpos[this] = vectoradd (oldpos[this], d);
+
+      /* Where the corner to the right and left would go, need these to form
+       * lines to intersect with the sides */
+      /*    rp----------/
+       *   /\          /\
+       *  /  nr       /  nt
+       * op----------lp
+       *              \
+       *               nl
+       */
+
+      newpos[right] = vectoradd (oldpos[right], d);
+      newpos[left]  = vectoradd (oldpos[left], d);
+
+      /* Now we just need to find the intersection of op-rp and nr-nt.
+       *    rp----------/
+       *   /           /
+       *  /  nr==========nt
+       * op----------/
+       *
+       */
+      newpos[right] = lineintersect (newpos[right], newpos[this],
+                                     oldpos[opposite], oldpos[right]);
+      newpos[left]  = lineintersect (newpos[left], newpos[this],
+                                     oldpos[opposite], oldpos[left]);
+      /*    /-----------/
+       *   /           /
+       *  rp============nt
+       * op----------/
+       *
+       */
+
+      /*
+       *
+       *  /--------------/
+       * /--------------/
+       *
+       */
+
+      if (private->frompivot_scale &&
+          transform_is_convex (newpos) &&
+          transform_is_convex (oldpos))
+        {
+          /* transform the pivot point before the interaction and
+           * after, and move everything by this difference
+           */
+          //TODO the handle doesn't actually end up where the mouse cursor is
+          GimpVector2 delta = get_pivot_delta (grid, oldpos, newpos, pivot);
+          for (i = 0; i < 4; i++)
+            newpos[i] = vectorsubtract (newpos[i], delta);
+
+          fixedpivot = TRUE;
+        }
+    }
+
+  /* scaling via sides */
+  if (handle == GIMP_TRANSFORM_HANDLE_N ||
+      handle == GIMP_TRANSFORM_HANDLE_E ||
+      handle == GIMP_TRANSFORM_HANDLE_S ||
+      handle == GIMP_TRANSFORM_HANDLE_W)
+    {
+      gint        this_l, this_r, opp_l, opp_r;
+      GimpVector2 side_l, side_r, midline;
+
+      /* 0: northwest, 1: northeast, 2: southwest, 3: southeast */
+      if (handle == GIMP_TRANSFORM_HANDLE_N)
+        {
+          this_l = 1; this_r = 0;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_E)
+        {
+          this_l = 3; this_r = 1;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_S)
+        {
+          this_l = 2; this_r = 3;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_W)
+        {
+          this_l = 0; this_r = 2;
+        }
+      else
+        gimp_assert_not_reached ();
+
+      opp_l = 3 - this_r; opp_r = 3 - this_l;
+
+      side_l = vectorsubtract (oldpos[opp_l], oldpos[this_l]);
+      side_r = vectorsubtract (oldpos[opp_r], oldpos[this_r]);
+      midline = vectoradd (side_l, side_r);
+
+      /* restrict to movement along the midline */
+      d = vectorproject (d, midline);
+
+      if (private->constrain_scale)
+        {
+          GimpVector2 before, after, effective_pivot = pivot;
+          gdouble     distance;
+
+          if (! private->frompivot_scale)
+            {
+              /* center of the opposite side is pivot */
+              effective_pivot = scalemult (vectoradd (oldpos[opp_l],
+                                                      oldpos[opp_r]), 0.5);
+            }
+
+          /* get the difference between the distance from the pivot to
+           * where interaction started and the distance from the pivot
+           * to where cursor is now, and scale all corners distance
+           * from the pivot with this factor
+           */
+          before = vectorsubtract (effective_pivot, mouse);
+          after = vectorsubtract (effective_pivot, cur);
+          after = vectorproject (after, before);
+
+          distance = 0.5 * (after.x / before.x + after.y / before.y);
+
+          for (i = 0; i < 4; i++)
+            newpos[i] = vectoradd (effective_pivot,
+                                   scalemult (vectorsubtract (oldpos[i],
+                                                              effective_pivot),
+                                              distance));
+        }
+      else
+        {
+          /* just move the side */
+          newpos[this_l] = vectoradd (oldpos[this_l], d);
+          newpos[this_r] = vectoradd (oldpos[this_r], d);
+        }
+
+      if (! private->constrain_scale   &&
+          private->frompivot_scale     &&
+          transform_is_convex (newpos) &&
+          transform_is_convex (oldpos))
+        {
+          GimpVector2 delta = get_pivot_delta (grid, oldpos, newpos, pivot);
+          for (i = 0; i < 4; i++)
+            newpos[i] = vectorsubtract (newpos[i], delta);
+
+          fixedpivot = TRUE;
+        }
+    }
+
+  /* shear */
+  if (handle == GIMP_TRANSFORM_HANDLE_N_S ||
+      handle == GIMP_TRANSFORM_HANDLE_E_S ||
+      handle == GIMP_TRANSFORM_HANDLE_S_S ||
+      handle == GIMP_TRANSFORM_HANDLE_W_S)
+    {
+      gint this_l, this_r;
+
+      /* set up indices for this edge and the opposite edge */
+      if (handle == GIMP_TRANSFORM_HANDLE_N_S)
+        {
+          this_l = 1; this_r = 0;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_W_S)
+        {
+          this_l = 0; this_r = 2;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_S_S)
+        {
+          this_l = 2; this_r = 3;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_E_S)
+        {
+          this_l = 3; this_r = 1;
+        }
+      else
+        gimp_assert_not_reached ();
+
+      if (private->constrain_shear)
+        {
+          /* restrict to movement along the side */
+          GimpVector2 side = vectorsubtract (oldpos[this_r], oldpos[this_l]);
+
+          d = vectorproject (d, side);
+        }
+
+      newpos[this_l] = vectoradd (oldpos[this_l], d);
+      newpos[this_r] = vectoradd (oldpos[this_r], d);
+
+      if (private->frompivot_shear     &&
+          transform_is_convex (newpos) &&
+          transform_is_convex (oldpos))
+        {
+          GimpVector2 delta = get_pivot_delta (grid, oldpos, newpos, pivot);
+          for (i = 0; i < 4; i++)
+            newpos[i] = vectorsubtract (newpos[i], delta);
+
+          fixedpivot = TRUE;
+        }
+    }
+
+  /* perspective transform */
+  if (handle == GIMP_TRANSFORM_HANDLE_NW_P ||
+      handle == GIMP_TRANSFORM_HANDLE_NE_P ||
+      handle == GIMP_TRANSFORM_HANDLE_SE_P ||
+      handle == GIMP_TRANSFORM_HANDLE_SW_P)
+    {
+      gint this, left, right, opposite;
+
+      /* 0: northwest, 1: northeast, 2: southwest, 3: southeast */
+      if (handle == GIMP_TRANSFORM_HANDLE_NW_P)
+        {
+          this = 0; left = 1; right = 2; opposite = 3;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_NE_P)
+        {
+          this = 1; left = 3; right = 0; opposite = 2;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_SW_P)
+        {
+          this = 2; left = 0; right = 3; opposite = 1;
+        }
+      else if (handle == GIMP_TRANSFORM_HANDLE_SE_P)
+        {
+          this = 3; left = 2; right = 1; opposite = 0;
+        }
+      else
+        gimp_assert_not_reached ();
+
+      if (private->constrain_perspective)
+        {
+          /* when the constrain transformation constraint is enabled,
+           * the translation shall only be either along the side
+           * angles of the two sides that run to this corner point, or
+           * along the diagonal that runs trough this corner point.
+           */
+          GimpVector2 proj[4];
+          gdouble     rej[4];
+
+          for (i = 0; i < 4; i++)
+            {
+              if (i == this)
+                continue;
+
+              /* get the vectors along the sides and the diagonal */
+              proj[i] = vectorsubtract (oldpos[this], oldpos[i]);
+
+              /* project d on each candidate vector and see which has
+               * the shortest rejection
+               */
+              proj[i] = vectorproject (d, proj[i]);
+              rej[i] = norm (vectorsubtract (d, proj[i]));
+            }
+
+          if (rej[left] < rej[right] && rej[left] < rej[opposite])
+            d = proj[left];
+          else if (rej[right] < rej[opposite])
+            d = proj[right];
+          else
+            d = proj[opposite];
+        }
+
+      newpos[this] = vectoradd (oldpos[this], d);
+
+      if (private->frompivot_perspective &&
+          transform_is_convex (newpos)   &&
+          transform_is_convex (oldpos))
+        {
+          GimpVector2 delta = get_pivot_delta (grid, oldpos, newpos, pivot);
+
+          for (i = 0; i < 4; i++)
+            newpos[i] = vectorsubtract (newpos[i], delta);
+
+          fixedpivot = TRUE;
+        }
+    }
+
+  /* this will have been set to TRUE if an operation used the pivot in
+   * addition to being a user option
+   */
+  if (! fixedpivot                 &&
+      transform_is_convex (newpos) &&
+      transform_is_convex (oldpos) &&
+      point_is_inside_polygon_pos (oldpos, pivot))
+    {
+      GimpVector2 delta = get_pivot_delta (grid, oldpos, newpos, pivot);
+      pivot = vectoradd (pivot, delta);
+    }
+
+  /* make sure the new coordinates are valid */
+  for (i = 0; i < 4; i++)
+    {
+      if (! isfinite (newpos[i].x) || ! isfinite (newpos[i].y))
+        return;
+    }
+
+  if (! isfinite (pivot.x) || ! isfinite (pivot.y))
+    return;
+
+  for (i = 0; i < 4; i++)
+    {
+      *x[i] = newpos[i].x;
+      *y[i] = newpos[i].y;
+    }
+
+  /* set unconditionally: if options get toggled during operation, we
+   * have to move pivot back
+   */
+  *newpivot_x = pivot.x;
+  *newpivot_y = pivot.y;
+
+  gimp_tool_transform_grid_update_matrix (grid);
+}
+
+static const gchar *
+get_friendly_operation_name (GimpTransformHandle handle)
+{
+  switch (handle)
+    {
+    case GIMP_TRANSFORM_HANDLE_NONE:
+      return "";
+    case GIMP_TRANSFORM_HANDLE_NW_P:
+    case GIMP_TRANSFORM_HANDLE_NE_P:
+    case GIMP_TRANSFORM_HANDLE_SW_P:
+    case GIMP_TRANSFORM_HANDLE_SE_P:
+      return _("Click-Drag to change perspective");
+    case GIMP_TRANSFORM_HANDLE_NW:
+    case GIMP_TRANSFORM_HANDLE_NE:
+    case GIMP_TRANSFORM_HANDLE_SW:
+    case GIMP_TRANSFORM_HANDLE_SE:
+      return _("Click-Drag to scale");
+    case GIMP_TRANSFORM_HANDLE_N:
+    case GIMP_TRANSFORM_HANDLE_S:
+    case GIMP_TRANSFORM_HANDLE_E:
+    case GIMP_TRANSFORM_HANDLE_W:
+      return _("Click-Drag to scale");
+    case GIMP_TRANSFORM_HANDLE_CENTER:
+      return _("Click-Drag to move");
+    case GIMP_TRANSFORM_HANDLE_PIVOT:
+      return _("Click-Drag to move the pivot point");
+    case GIMP_TRANSFORM_HANDLE_N_S:
+    case GIMP_TRANSFORM_HANDLE_S_S:
+    case GIMP_TRANSFORM_HANDLE_E_S:
+    case GIMP_TRANSFORM_HANDLE_W_S:
+      return _("Click-Drag to shear");
+    case GIMP_TRANSFORM_HANDLE_ROTATION:
+      return _("Click-Drag to rotate");
+    default:
+      gimp_assert_not_reached ();
+    }
+}
+
+static GimpTransformHandle
+gimp_tool_transform_get_area_handle (GimpToolTransformGrid *grid,
+                                     const GimpCoords      *coords,
+                                     GimpTransformFunction  function)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpTransformHandle           handle  = GIMP_TRANSFORM_HANDLE_NONE;
+
+  switch (function)
+    {
+    case GIMP_TRANSFORM_FUNCTION_NONE:
+      break;
+
+    case GIMP_TRANSFORM_FUNCTION_MOVE:
+      handle = GIMP_TRANSFORM_HANDLE_CENTER;
+      break;
+
+    case GIMP_TRANSFORM_FUNCTION_ROTATE:
+      handle = GIMP_TRANSFORM_HANDLE_ROTATION;
+      break;
+
+    case GIMP_TRANSFORM_FUNCTION_SCALE:
+    case GIMP_TRANSFORM_FUNCTION_PERSPECTIVE:
+      {
+        gdouble closest_dist;
+        gdouble dist;
+
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           private->tx1,
+                                                           private->ty1);
+        closest_dist = dist;
+        if (function == GIMP_TRANSFORM_FUNCTION_PERSPECTIVE)
+          handle = GIMP_TRANSFORM_HANDLE_NW_P;
+        else
+          handle = GIMP_TRANSFORM_HANDLE_NW;
+
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           private->tx2,
+                                                           private->ty2);
+        if (dist < closest_dist)
+          {
+            closest_dist = dist;
+            if (function == GIMP_TRANSFORM_FUNCTION_PERSPECTIVE)
+              handle = GIMP_TRANSFORM_HANDLE_NE_P;
+            else
+              handle = GIMP_TRANSFORM_HANDLE_NE;
+          }
+
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           private->tx3,
+                                                           private->ty3);
+        if (dist < closest_dist)
+          {
+            closest_dist = dist;
+            if (function == GIMP_TRANSFORM_FUNCTION_PERSPECTIVE)
+              handle = GIMP_TRANSFORM_HANDLE_SW_P;
+            else
+              handle = GIMP_TRANSFORM_HANDLE_SW;
+          }
+
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           private->tx4,
+                                                           private->ty4);
+        if (dist < closest_dist)
+          {
+            closest_dist = dist;
+            if (function == GIMP_TRANSFORM_FUNCTION_PERSPECTIVE)
+              handle = GIMP_TRANSFORM_HANDLE_SE_P;
+            else
+              handle = GIMP_TRANSFORM_HANDLE_SE;
+          }
+      }
+      break;
+
+    case GIMP_TRANSFORM_FUNCTION_SHEAR:
+      {
+        gdouble handle_x;
+        gdouble handle_y;
+        gdouble closest_dist;
+        gdouble dist;
+
+        gimp_canvas_handle_get_position (private->handles[GIMP_TRANSFORM_HANDLE_N],
+                                         &handle_x, &handle_y);
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           handle_x, handle_y);
+        closest_dist = dist;
+        handle = GIMP_TRANSFORM_HANDLE_N_S;
+
+        gimp_canvas_handle_get_position (private->handles[GIMP_TRANSFORM_HANDLE_W],
+                                         &handle_x, &handle_y);
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           handle_x, handle_y);
+        if (dist < closest_dist)
+          {
+            closest_dist = dist;
+            handle = GIMP_TRANSFORM_HANDLE_W_S;
+          }
+
+        gimp_canvas_handle_get_position (private->handles[GIMP_TRANSFORM_HANDLE_E],
+                                         &handle_x, &handle_y);
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           handle_x, handle_y);
+        if (dist < closest_dist)
+          {
+            closest_dist = dist;
+            handle = GIMP_TRANSFORM_HANDLE_E_S;
+          }
+
+        gimp_canvas_handle_get_position (private->handles[GIMP_TRANSFORM_HANDLE_S],
+                                         &handle_x, &handle_y);
+        dist = gimp_canvas_item_transform_distance_square (private->guides,
+                                                           coords->x, coords->y,
+                                                           handle_x, handle_y);
+        if (dist < closest_dist)
+          {
+            closest_dist = dist;
+            handle = GIMP_TRANSFORM_HANDLE_S_S;
+          }
+      }
+      break;
+    }
+
+  return handle;
+}
+
+GimpHit
+gimp_tool_transform_grid_hit (GimpToolWidget   *widget,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              gboolean          proximity)
+{
+  GimpToolTransformGrid *grid = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpTransformHandle    handle;
+
+  handle = gimp_tool_transform_grid_get_handle_for_coords (grid, coords);
+
+  if (handle != GIMP_TRANSFORM_HANDLE_NONE)
+    return GIMP_HIT_DIRECT;
+
+  return GIMP_HIT_INDIRECT;
+}
+
+void
+gimp_tool_transform_grid_hover (GimpToolWidget   *widget,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                gboolean          proximity)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpTransformHandle           handle;
+
+  handle = gimp_tool_transform_grid_get_handle_for_coords (grid, coords);
+
+  if (handle == GIMP_TRANSFORM_HANDLE_NONE)
+    {
+      /* points passed in clockwise order */
+      if (point_is_inside_polygon (4,
+                                   (gdouble[4]){ private->tx1, private->tx2,
+                                                 private->tx4, private->tx3 },
+                                   (gdouble[4]){ private->ty1, private->ty2,
+                                                 private->ty4, private->ty3 },
+                                   coords->x, coords->y))
+        {
+          handle = gimp_tool_transform_get_area_handle (grid, coords,
+                                                        private->inside_function);
+        }
+      else
+        {
+          handle = gimp_tool_transform_get_area_handle (grid, coords,
+                                                        private->outside_function);
+        }
+    }
+
+  if (handle != GIMP_TRANSFORM_HANDLE_NONE && proximity)
+    {
+      gimp_tool_widget_set_status (widget,
+                                   get_friendly_operation_name (handle));
+    }
+  else
+    {
+      gimp_tool_widget_set_status (widget, NULL);
+    }
+
+  private->handle = handle;
+
+  gimp_tool_transform_grid_update_hilight (grid);
+}
+
+void
+gimp_tool_transform_grid_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  private->handle = GIMP_TRANSFORM_HANDLE_NONE;
+
+  gimp_tool_transform_grid_update_hilight (grid);
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static void
+gimp_tool_transform_grid_modifier (GimpToolWidget  *widget,
+                                   GdkModifierType  key)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  if (key == gimp_get_constrain_behavior_mask ())
+    {
+      g_object_set (widget,
+                    "frompivot-scale",       ! private->frompivot_scale,
+                    "frompivot-shear",       ! private->frompivot_shear,
+                    "frompivot-perspective", ! private->frompivot_perspective,
+                    NULL);
+    }
+  else if (key == gimp_get_extend_selection_mask ())
+    {
+      g_object_set (widget,
+                    "cornersnap",            ! private->cornersnap,
+                    "constrain-move",        ! private->constrain_move,
+                    "constrain-scale",       ! private->constrain_scale,
+                    "constrain-rotate",      ! private->constrain_rotate,
+                    "constrain-shear",       ! private->constrain_shear,
+                    "constrain-perspective", ! private->constrain_perspective,
+                    NULL);
+    }
+}
+
+static void
+gimp_tool_transform_grid_hover_modifier (GimpToolWidget  *widget,
+                                         GdkModifierType  key,
+                                         gboolean         press,
+                                         GdkModifierType  state)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpCoords                    coords  = { 0.0, };
+
+  gimp_tool_transform_grid_modifier (widget, key);
+
+  if (private->button_down)
+    {
+      /*  send a non-motion to update the grid with the new constraints  */
+      coords.x = private->curx;
+      coords.y = private->cury;
+      gimp_tool_transform_grid_motion (widget, &coords, 0, state);
+    }
+}
+
+static gboolean
+gimp_tool_transform_grid_get_cursor (GimpToolWidget     *widget,
+                                     const GimpCoords   *coords,
+                                     GdkModifierType     state,
+                                     GimpCursorType     *cursor,
+                                     GimpToolCursorType *tool_cursor,
+                                     GimpCursorModifier *modifier)
+{
+  GimpToolTransformGrid        *grid    = GIMP_TOOL_TRANSFORM_GRID (widget);
+  GimpToolTransformGridPrivate *private = grid->private;
+  gdouble                       angle[9];
+  gint                          i;
+  GimpCursorType                map[8];
+  GimpVector2                   pos[4], this, that;
+  gboolean                      flip       = FALSE;
+  gboolean                      side       = FALSE;
+  gboolean                      set_cursor = TRUE;
+
+  map[0] = GIMP_CURSOR_CORNER_TOP_LEFT;
+  map[1] = GIMP_CURSOR_CORNER_TOP;
+  map[2] = GIMP_CURSOR_CORNER_TOP_RIGHT;
+  map[3] = GIMP_CURSOR_CORNER_RIGHT;
+  map[4] = GIMP_CURSOR_CORNER_BOTTOM_RIGHT;
+  map[5] = GIMP_CURSOR_CORNER_BOTTOM;
+  map[6] = GIMP_CURSOR_CORNER_BOTTOM_LEFT;
+  map[7] = GIMP_CURSOR_CORNER_LEFT;
+
+  get_handle_geometry (grid, pos, angle);
+
+  for (i = 0; i < 8; i++)
+    angle[i] = round (angle[i] * 180.0 / G_PI / 45.0);
+
+  switch (private->handle)
+    {
+    case GIMP_TRANSFORM_HANDLE_NW_P:
+    case GIMP_TRANSFORM_HANDLE_NW:
+      i = (gint) angle[4] + 0;
+      this = pos[0];
+      that = pos[3];
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_NE_P:
+    case GIMP_TRANSFORM_HANDLE_NE:
+      i = (gint) angle[5] + 2;
+      this = pos[1];
+      that = pos[2];
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_SW_P:
+    case GIMP_TRANSFORM_HANDLE_SW:
+      i = (gint) angle[6] + 6;
+      this = pos[2];
+      that = pos[1];
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_SE_P:
+    case GIMP_TRANSFORM_HANDLE_SE:
+      i = (gint) angle[7] + 4;
+      this = pos[3];
+      that = pos[0];
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_N:
+    case GIMP_TRANSFORM_HANDLE_N_S:
+      i = (gint) angle[0] + 1;
+      this = vectoradd (pos[0], pos[1]);
+      that = vectoradd (pos[2], pos[3]);
+      side = TRUE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_S:
+    case GIMP_TRANSFORM_HANDLE_S_S:
+      i = (gint) angle[1] + 5;
+      this = vectoradd (pos[2], pos[3]);
+      that = vectoradd (pos[0], pos[1]);
+      side = TRUE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_E:
+    case GIMP_TRANSFORM_HANDLE_E_S:
+      i = (gint) angle[2] + 3;
+      this = vectoradd (pos[1], pos[3]);
+      that = vectoradd (pos[0], pos[2]);
+      side = TRUE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_W:
+    case GIMP_TRANSFORM_HANDLE_W_S:
+      i = (gint) angle[3] + 7;
+      this = vectoradd (pos[0], pos[2]);
+      that = vectoradd (pos[1], pos[3]);
+      side = TRUE;
+      break;
+
+    default:
+      set_cursor = FALSE;
+      break;
+    }
+
+  if (set_cursor)
+    {
+      i %= 8;
+
+      switch (map[i])
+        {
+        case GIMP_CURSOR_CORNER_TOP_LEFT:
+          if (this.x + this.y > that.x + that.y)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_TOP:
+          if (this.y > that.y)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_TOP_RIGHT:
+          if (this.x - this.y < that.x - that.y)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_RIGHT:
+          if (this.x < that.x)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_BOTTOM_RIGHT:
+          if (this.x + this.y < that.x + that.y)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_BOTTOM:
+          if (this.y < that.y)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_BOTTOM_LEFT:
+          if (this.x - this.y > that.x - that.y)
+            flip = TRUE;
+          break;
+        case GIMP_CURSOR_CORNER_LEFT:
+          if (this.x > that.x)
+            flip = TRUE;
+          break;
+        default:
+          gimp_assert_not_reached ();
+        }
+
+      if (flip)
+        *cursor = map[(i + 4) % 8];
+      else
+        *cursor = map[i];
+
+      if (side)
+        *cursor += 8;
+    }
+
+  /* parent class handles *cursor and *modifier for most handles */
+  switch (private->handle)
+    {
+    case GIMP_TRANSFORM_HANDLE_NONE:
+      *tool_cursor = GIMP_TOOL_CURSOR_NONE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_NW_P:
+    case GIMP_TRANSFORM_HANDLE_NE_P:
+    case GIMP_TRANSFORM_HANDLE_SW_P:
+    case GIMP_TRANSFORM_HANDLE_SE_P:
+      *tool_cursor = GIMP_TOOL_CURSOR_PERSPECTIVE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_NW:
+    case GIMP_TRANSFORM_HANDLE_NE:
+    case GIMP_TRANSFORM_HANDLE_SW:
+    case GIMP_TRANSFORM_HANDLE_SE:
+    case GIMP_TRANSFORM_HANDLE_N:
+    case GIMP_TRANSFORM_HANDLE_S:
+    case GIMP_TRANSFORM_HANDLE_E:
+    case GIMP_TRANSFORM_HANDLE_W:
+      *tool_cursor = GIMP_TOOL_CURSOR_RESIZE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_CENTER:
+      *tool_cursor = GIMP_TOOL_CURSOR_MOVE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_PIVOT:
+      *tool_cursor = GIMP_TOOL_CURSOR_ROTATE;
+      *modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_N_S:
+    case GIMP_TRANSFORM_HANDLE_S_S:
+    case GIMP_TRANSFORM_HANDLE_E_S:
+    case GIMP_TRANSFORM_HANDLE_W_S:
+      *tool_cursor = GIMP_TOOL_CURSOR_SHEAR;
+      break;
+
+    case GIMP_TRANSFORM_HANDLE_ROTATION:
+      *tool_cursor = GIMP_TOOL_CURSOR_ROTATE;
+      break;
+
+    default:
+      g_return_val_if_reached (FALSE);
+    }
+
+  return TRUE;
+}
+
+static GimpTransformHandle
+gimp_tool_transform_grid_get_handle_for_coords (GimpToolTransformGrid *grid,
+                                                const GimpCoords      *coords)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpTransformHandle           i;
+
+  for (i = GIMP_TRANSFORM_HANDLE_NONE + 1; i < GIMP_N_TRANSFORM_HANDLES; i++)
+    {
+      if (private->handles[i] &&
+          gimp_canvas_item_hit (private->handles[i], coords->x, coords->y))
+        {
+          return i;
+        }
+    }
+
+  return GIMP_TRANSFORM_HANDLE_NONE;
+}
+
+static void
+gimp_tool_transform_grid_update_hilight (GimpToolTransformGrid *grid)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+  GimpTransformHandle           handle;
+
+  for (handle = GIMP_TRANSFORM_HANDLE_NONE;
+       handle < GIMP_N_TRANSFORM_HANDLES;
+       handle++)
+    {
+      if (private->handles[handle])
+        {
+          gimp_canvas_item_set_highlight (private->handles[handle],
+                                          handle == private->handle);
+        }
+    }
+}
+
+static void
+gimp_tool_transform_grid_update_box (GimpToolTransformGrid  *grid)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  gimp_matrix3_transform_point (&private->transform,
+                                private->x1, private->y1,
+                                &private->tx1, &private->ty1);
+  gimp_matrix3_transform_point (&private->transform,
+                                private->x2, private->y1,
+                                &private->tx2, &private->ty2);
+  gimp_matrix3_transform_point (&private->transform,
+                                private->x1, private->y2,
+                                &private->tx3, &private->ty3);
+  gimp_matrix3_transform_point (&private->transform,
+                                private->x2, private->y2,
+                                &private->tx4, &private->ty4);
+
+  /* don't transform pivot */
+  private->tpx = private->pivot_x;
+  private->tpy = private->pivot_y;
+
+  if (transform_grid_is_convex (grid))
+    {
+      gimp_matrix3_transform_point (&private->transform,
+                                    (private->x1 + private->x2) / 2.0,
+                                    (private->y1 + private->y2) / 2.0,
+                                    &private->tcx, &private->tcy);
+    }
+  else
+    {
+      private->tcx = (private->tx1 +
+                      private->tx2 +
+                      private->tx3 +
+                      private->tx4) / 4.0;
+      private->tcy = (private->ty1 +
+                      private->ty2 +
+                      private->ty3 +
+                      private->ty4) / 4.0;
+    }
+}
+
+static void
+gimp_tool_transform_grid_update_matrix (GimpToolTransformGrid *grid)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+
+  gimp_matrix3_identity (&private->transform);
+  gimp_transform_matrix_perspective (&private->transform,
+                                     private->x1,
+                                     private->y1,
+                                     private->x2 - private->x1,
+                                     private->y2 - private->y1,
+                                     private->tx1,
+                                     private->ty1,
+                                     private->tx2,
+                                     private->ty2,
+                                     private->tx3,
+                                     private->ty3,
+                                     private->tx4,
+                                     private->ty4);
+
+  private->pivot_x = private->tpx;
+  private->pivot_y = private->tpy;
+
+  g_object_freeze_notify (G_OBJECT (grid));
+  g_object_notify (G_OBJECT (grid), "transform");
+  g_object_notify (G_OBJECT (grid), "pivot-x");
+  g_object_notify (G_OBJECT (grid), "pivot-x");
+  g_object_thaw_notify (G_OBJECT (grid));
+}
+
+static void
+gimp_tool_transform_grid_calc_handles (GimpToolTransformGrid *grid,
+                                       gint                  *handle_w,
+                                       gint                  *handle_h)
+{
+  GimpToolTransformGridPrivate *private = grid->private;
+  gint                          dx1, dy1;
+  gint                          dx2, dy2;
+  gint                          dx3, dy3;
+  gint                          dx4, dy4;
+  gint                          x1, y1;
+  gint                          x2, y2;
+
+  if (! private->dynamic_handle_size)
+    {
+      *handle_w = GIMP_CANVAS_HANDLE_SIZE_LARGE;
+      *handle_h = GIMP_CANVAS_HANDLE_SIZE_LARGE;
+
+      return;
+    }
+
+  gimp_canvas_item_transform_xy (private->guides,
+                                 private->tx1, private->ty1,
+                                 &dx1, &dy1);
+  gimp_canvas_item_transform_xy (private->guides,
+                                 private->tx2, private->ty2,
+                                 &dx2, &dy2);
+  gimp_canvas_item_transform_xy (private->guides,
+                                 private->tx3, private->ty3,
+                                 &dx3, &dy3);
+  gimp_canvas_item_transform_xy (private->guides,
+                                 private->tx4, private->ty4,
+                                 &dx4, &dy4);
+
+  x1 = MIN4 (dx1, dx2, dx3, dx4);
+  y1 = MIN4 (dy1, dy2, dy3, dy4);
+  x2 = MAX4 (dx1, dx2, dx3, dx4);
+  y2 = MAX4 (dy1, dy2, dy3, dy4);
+
+  *handle_w = CLAMP ((x2 - x1) / 3,
+                     MIN_HANDLE_SIZE, GIMP_CANVAS_HANDLE_SIZE_LARGE);
+  *handle_h = CLAMP ((y2 - y1) / 3,
+                     MIN_HANDLE_SIZE, GIMP_CANVAS_HANDLE_SIZE_LARGE);
+}
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_tool_transform_grid_new (GimpDisplayShell  *shell,
+                              const GimpMatrix3 *transform,
+                              gdouble            x1,
+                              gdouble            y1,
+                              gdouble            x2,
+                              gdouble            y2)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_TRANSFORM_GRID,
+                       "shell",      shell,
+                       "transform",  transform,
+                       "x1",         x1,
+                       "y1",         y1,
+                       "x2",         x2,
+                       "y2",         y2,
+                       NULL);
+}
+
+
+/*  protected functions  */
+
+GimpTransformHandle
+gimp_tool_transform_grid_get_handle (GimpToolTransformGrid *grid)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_TRANSFORM_GRID (grid),
+                        GIMP_TRANSFORM_HANDLE_NONE);
+
+  return grid->private->handle;
+}
diff --git a/app/display/gimptooltransformgrid.h b/app/display/gimptooltransformgrid.h
new file mode 100644
index 0000000..949beb2
--- /dev/null
+++ b/app/display/gimptooltransformgrid.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooltransformgrid.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_TRANSFORM_GRID_H__
+#define __GIMP_TOOL_TRANSFORM_GRID_H__
+
+
+#include "gimpcanvashandle.h"
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE \
+  (1.5 * GIMP_CANVAS_HANDLE_SIZE_LARGE)
+
+
+typedef enum
+{
+  GIMP_TRANSFORM_HANDLE_NONE,
+  GIMP_TRANSFORM_HANDLE_NW_P,     /* north west perspective         */
+  GIMP_TRANSFORM_HANDLE_NE_P,     /* north east perspective         */
+  GIMP_TRANSFORM_HANDLE_SW_P,     /* south west perspective         */
+  GIMP_TRANSFORM_HANDLE_SE_P,     /* south east perspective         */
+  GIMP_TRANSFORM_HANDLE_NW,       /* north west                     */
+  GIMP_TRANSFORM_HANDLE_NE,       /* north east                     */
+  GIMP_TRANSFORM_HANDLE_SW,       /* south west                     */
+  GIMP_TRANSFORM_HANDLE_SE,       /* south east                     */
+  GIMP_TRANSFORM_HANDLE_N,        /* north                          */
+  GIMP_TRANSFORM_HANDLE_S,        /* south                          */
+  GIMP_TRANSFORM_HANDLE_E,        /* east                           */
+  GIMP_TRANSFORM_HANDLE_W,        /* west                           */
+  GIMP_TRANSFORM_HANDLE_CENTER,   /* center for moving              */
+  GIMP_TRANSFORM_HANDLE_PIVOT,    /* pivot for rotation and scaling */
+  GIMP_TRANSFORM_HANDLE_N_S,      /* north shearing                 */
+  GIMP_TRANSFORM_HANDLE_S_S,      /* south shearing                 */
+  GIMP_TRANSFORM_HANDLE_E_S,      /* east shearing                  */
+  GIMP_TRANSFORM_HANDLE_W_S,      /* west shearing                  */
+  GIMP_TRANSFORM_HANDLE_ROTATION, /* rotation                       */
+
+  GIMP_N_TRANSFORM_HANDLES /* keep this last so *handles[] is the right size */
+} GimpTransformHandle;
+
+
+#define GIMP_TYPE_TOOL_TRANSFORM_GRID            (gimp_tool_transform_grid_get_type ())
+#define GIMP_TOOL_TRANSFORM_GRID(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_TRANSFORM_GRID, GimpToolTransformGrid))
+#define GIMP_TOOL_TRANSFORM_GRID_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_TRANSFORM_GRID, GimpToolTransformGridClass))
+#define GIMP_IS_TOOL_TRANSFORM_GRID(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_TRANSFORM_GRID))
+#define GIMP_IS_TOOL_TRANSFORM_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_TRANSFORM_GRID))
+#define GIMP_TOOL_TRANSFORM_GRID_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_TRANSFORM_GRID, GimpToolTransformGridClass))
+
+
+typedef struct _GimpToolTransformGrid        GimpToolTransformGrid;
+typedef struct _GimpToolTransformGridPrivate GimpToolTransformGridPrivate;
+typedef struct _GimpToolTransformGridClass   GimpToolTransformGridClass;
+
+struct _GimpToolTransformGrid
+{
+  GimpToolWidget                parent_instance;
+
+  GimpToolTransformGridPrivate *private;
+};
+
+struct _GimpToolTransformGridClass
+{
+  GimpToolWidgetClass  parent_class;
+};
+
+
+GType                 gimp_tool_transform_grid_get_type   (void) G_GNUC_CONST;
+
+GimpToolWidget      * gimp_tool_transform_grid_new        (GimpDisplayShell      *shell,
+                                                           const GimpMatrix3     *transform,
+                                                           gdouble                x1,
+                                                           gdouble                y1,
+                                                           gdouble                x2,
+                                                           gdouble                y2);
+
+/*  protected functions  */
+
+GimpTransformHandle   gimp_tool_transform_grid_get_handle (GimpToolTransformGrid *grid);
+
+
+#endif /* __GIMP_TOOL_TRANSFORM_GRID_H__ */
diff --git a/app/display/gimptoolwidget.c b/app/display/gimptoolwidget.c
new file mode 100644
index 0000000..516f366
--- /dev/null
+++ b/app/display/gimptoolwidget.c
@@ -0,0 +1,1117 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolwidget.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "display-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpcanvasarc.h"
+#include "gimpcanvascorner.h"
+#include "gimpcanvasgroup.h"
+#include "gimpcanvashandle.h"
+#include "gimpcanvaslimit.h"
+#include "gimpcanvasline.h"
+#include "gimpcanvaspath.h"
+#include "gimpcanvaspolygon.h"
+#include "gimpcanvasrectangle.h"
+#include "gimpcanvasrectangleguides.h"
+#include "gimpcanvastransformguides.h"
+#include "gimpdisplayshell.h"
+#include "gimptoolwidget.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SHELL,
+  PROP_ITEM
+};
+
+enum
+{
+  CHANGED,
+  RESPONSE,
+  SNAP_OFFSETS,
+  STATUS,
+  STATUS_COORDS,
+  MESSAGE,
+  FOCUS_CHANGED,
+  LAST_SIGNAL
+};
+
+struct _GimpToolWidgetPrivate
+{
+  GimpDisplayShell *shell;
+  GimpCanvasItem   *item;
+  GList            *group_stack;
+
+  gint              snap_offset_x;
+  gint              snap_offset_y;
+  gint              snap_width;
+  gint              snap_height;
+
+  gboolean          visible;
+  gboolean          focus;
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_tool_widget_finalize           (GObject         *object);
+static void     gimp_tool_widget_constructed        (GObject         *object);
+static void     gimp_tool_widget_set_property       (GObject         *object,
+                                                     guint            property_id,
+                                                     const GValue    *value,
+                                                     GParamSpec      *pspec);
+static void     gimp_tool_widget_get_property       (GObject         *object,
+                                                     guint            property_id,
+                                                     GValue          *value,
+                                                     GParamSpec      *pspec);
+static void     gimp_tool_widget_properties_changed (GObject         *object,
+                                                     guint            n_pspecs,
+                                                     GParamSpec     **pspecs);
+
+static void     gimp_tool_widget_real_leave_notify  (GimpToolWidget  *widget);
+static gboolean gimp_tool_widget_real_key_press     (GimpToolWidget  *widget,
+                                                     GdkEventKey     *kevent);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolWidget, gimp_tool_widget, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_tool_widget_parent_class
+
+static guint widget_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_tool_widget_class_init (GimpToolWidgetClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize                    = gimp_tool_widget_finalize;
+  object_class->constructed                 = gimp_tool_widget_constructed;
+  object_class->set_property                = gimp_tool_widget_set_property;
+  object_class->get_property                = gimp_tool_widget_get_property;
+  object_class->dispatch_properties_changed = gimp_tool_widget_properties_changed;
+
+  klass->leave_notify                       = gimp_tool_widget_real_leave_notify;
+  klass->key_press                          = gimp_tool_widget_real_key_press;
+
+  widget_signals[CHANGED] =
+    g_signal_new ("changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, changed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  widget_signals[RESPONSE] =
+    g_signal_new ("response",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, response),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+
+  widget_signals[SNAP_OFFSETS] =
+    g_signal_new ("snap-offsets",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, snap_offsets),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT_INT_INT,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  widget_signals[STATUS] =
+    g_signal_new ("status",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, status),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  widget_signals[STATUS_COORDS] =
+    g_signal_new ("status-coords",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, status_coords),
+                  NULL, NULL,
+                  gimp_marshal_VOID__STRING_DOUBLE_STRING_DOUBLE_STRING,
+                  G_TYPE_NONE, 5,
+                  G_TYPE_STRING,
+                  G_TYPE_DOUBLE,
+                  G_TYPE_STRING,
+                  G_TYPE_DOUBLE,
+                  G_TYPE_STRING);
+
+  widget_signals[MESSAGE] =
+    g_signal_new ("message",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, message),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  widget_signals[FOCUS_CHANGED] =
+    g_signal_new ("focus-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpToolWidgetClass, focus_changed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  g_object_class_install_property (object_class, PROP_SHELL,
+                                   g_param_spec_object ("shell",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DISPLAY_SHELL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ITEM,
+                                   g_param_spec_object ("item",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CANVAS_ITEM,
+                                                        GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_tool_widget_init (GimpToolWidget *widget)
+{
+  widget->private = gimp_tool_widget_get_instance_private (widget);
+
+  widget->private->visible = TRUE;
+}
+
+static void
+gimp_tool_widget_constructed (GObject *object)
+{
+  GimpToolWidget        *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolWidgetPrivate *private = widget->private;
+  GimpToolWidgetClass   *klass   = GIMP_TOOL_WIDGET_GET_CLASS (widget);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_DISPLAY_SHELL (private->shell));
+
+  private->item = gimp_canvas_group_new (private->shell);
+
+  gimp_canvas_item_set_visible (private->item, private->visible);
+
+  if (klass->changed)
+    {
+      if (klass->update_on_scale)
+        {
+          g_signal_connect_object (private->shell, "scaled",
+                                   G_CALLBACK (klass->changed),
+                                   widget,
+                                   G_CONNECT_SWAPPED);
+        }
+
+      if (klass->update_on_scroll)
+        {
+          g_signal_connect_object (private->shell, "scrolled",
+                                   G_CALLBACK (klass->changed),
+                                   widget,
+                                   G_CONNECT_SWAPPED);
+        }
+
+      if (klass->update_on_rotate)
+        {
+          g_signal_connect_object (private->shell, "rotated",
+                                   G_CALLBACK (klass->changed),
+                                   widget,
+                                   G_CONNECT_SWAPPED);
+        }
+    }
+}
+
+static void
+gimp_tool_widget_finalize (GObject *object)
+{
+  GimpToolWidget        *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolWidgetPrivate *private = widget->private;
+
+  g_clear_object (&private->item);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_widget_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpToolWidget        *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolWidgetPrivate *private = widget->private;
+
+  switch (property_id)
+    {
+    case PROP_SHELL:
+      private->shell = g_value_get_object (value); /* don't ref */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_widget_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpToolWidget        *widget  = GIMP_TOOL_WIDGET (object);
+  GimpToolWidgetPrivate *private = widget->private;
+
+  switch (property_id)
+    {
+    case PROP_SHELL:
+      g_value_set_object (value, private->shell);
+      break;
+
+    case PROP_ITEM:
+      g_value_set_object (value, private->item);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_widget_properties_changed (GObject     *object,
+                                     guint        n_pspecs,
+                                     GParamSpec **pspecs)
+{
+  GimpToolWidget *widget = GIMP_TOOL_WIDGET (object);
+
+  G_OBJECT_CLASS (parent_class)->dispatch_properties_changed (object,
+                                                              n_pspecs,
+                                                              pspecs);
+
+  gimp_tool_widget_changed (widget);
+}
+
+static void
+gimp_tool_widget_real_leave_notify (GimpToolWidget *widget)
+{
+  gimp_tool_widget_set_status (widget, NULL);
+}
+
+static gboolean
+gimp_tool_widget_real_key_press (GimpToolWidget *widget,
+                                 GdkEventKey    *kevent)
+{
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      gimp_tool_widget_response (widget, GIMP_TOOL_WIDGET_RESPONSE_CONFIRM);
+      return TRUE;
+
+    case GDK_KEY_Escape:
+      gimp_tool_widget_response (widget, GIMP_TOOL_WIDGET_RESPONSE_CANCEL);
+      return TRUE;
+
+    case GDK_KEY_BackSpace:
+      gimp_tool_widget_response (widget, GIMP_TOOL_WIDGET_RESPONSE_RESET);
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+
+/*  public functions  */
+
+GimpDisplayShell *
+gimp_tool_widget_get_shell (GimpToolWidget *widget)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  return widget->private->shell;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_get_item (GimpToolWidget *widget)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  return widget->private->item;
+}
+
+void
+gimp_tool_widget_set_visible (GimpToolWidget *widget,
+                              gboolean        visible)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  if (visible != widget->private->visible)
+    {
+      widget->private->visible = visible;
+
+      if (widget->private->item)
+        gimp_canvas_item_set_visible (widget->private->item, visible);
+
+      if (! visible)
+        gimp_tool_widget_set_status (widget, NULL);
+    }
+}
+
+gboolean
+gimp_tool_widget_get_visible (GimpToolWidget *widget)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), FALSE);
+
+  return widget->private->visible;
+}
+
+void
+gimp_tool_widget_set_focus (GimpToolWidget *widget,
+                            gboolean        focus)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  if (focus != widget->private->focus)
+    {
+      widget->private->focus = focus;
+
+      g_signal_emit (widget, widget_signals[FOCUS_CHANGED], 0);
+    }
+}
+
+gboolean
+gimp_tool_widget_get_focus (GimpToolWidget *widget)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), FALSE);
+
+  return widget->private->focus;
+}
+
+void
+gimp_tool_widget_changed (GimpToolWidget *widget)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  g_signal_emit (widget, widget_signals[CHANGED], 0);
+}
+
+void
+gimp_tool_widget_response (GimpToolWidget *widget,
+                           gint            response_id)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  g_signal_emit (widget, widget_signals[RESPONSE], 0,
+                 response_id);
+}
+
+void
+gimp_tool_widget_set_snap_offsets (GimpToolWidget *widget,
+                                   gint            offset_x,
+                                   gint            offset_y,
+                                   gint            width,
+                                   gint            height)
+{
+  GimpToolWidgetPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  private = widget->private;
+
+  if (offset_x != private->snap_offset_x ||
+      offset_y != private->snap_offset_y ||
+      width    != private->snap_width    ||
+      height   != private->snap_height)
+    {
+      private->snap_offset_x = offset_x;
+      private->snap_offset_y = offset_y;
+      private->snap_width    = width;
+      private->snap_height   = height;
+
+      g_signal_emit (widget, widget_signals[SNAP_OFFSETS], 0,
+                 offset_x, offset_y, width, height);
+    }
+}
+
+void
+gimp_tool_widget_get_snap_offsets (GimpToolWidget *widget,
+                                   gint           *offset_x,
+                                   gint           *offset_y,
+                                   gint           *width,
+                                   gint           *height)
+{
+  GimpToolWidgetPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  private = widget->private;
+
+  if (offset_x) *offset_x = private->snap_offset_x;
+  if (offset_y) *offset_y = private->snap_offset_y;
+  if (width)    *width    = private->snap_width;
+  if (height)   *height   = private->snap_height;
+}
+
+void
+gimp_tool_widget_set_status (GimpToolWidget *widget,
+                             const gchar    *status)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  g_signal_emit (widget, widget_signals[STATUS], 0,
+                 status);
+}
+
+void
+gimp_tool_widget_set_status_coords (GimpToolWidget *widget,
+                                    const gchar    *title,
+                                    gdouble         x,
+                                    const gchar    *separator,
+                                    gdouble         y,
+                                    const gchar    *help)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  g_signal_emit (widget, widget_signals[STATUS_COORDS], 0,
+                 title, x, separator, y, help);
+}
+
+void
+gimp_tool_widget_message (GimpToolWidget *widget,
+                          const gchar    *format,
+                          ...)
+{
+  va_list  args;
+  gchar   *message;
+
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (format != NULL);
+
+  va_start (args, format);
+
+  message = g_strdup_vprintf (format, args);
+
+  va_end (args);
+
+  gimp_tool_widget_message_literal (widget, message);
+
+  g_free (message);
+}
+
+void
+gimp_tool_widget_message_literal (GimpToolWidget *widget,
+                                  const gchar    *message)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (message != NULL);
+
+  g_signal_emit (widget, widget_signals[MESSAGE], 0,
+                 message);
+}
+
+void
+gimp_tool_widget_add_item (GimpToolWidget *widget,
+                           GimpCanvasItem *item)
+{
+  GimpCanvasGroup *group;
+
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  group = GIMP_CANVAS_GROUP (widget->private->item);
+
+  if (widget->private->group_stack)
+    group = widget->private->group_stack->data;
+
+  gimp_canvas_group_add_item (group, item);
+}
+
+void
+gimp_tool_widget_remove_item (GimpToolWidget *widget,
+                              GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (widget->private->item),
+                                 item);
+}
+
+GimpCanvasGroup *
+gimp_tool_widget_add_group (GimpToolWidget *widget)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_group_new (widget->private->shell);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return GIMP_CANVAS_GROUP (item);
+}
+
+GimpCanvasGroup *
+gimp_tool_widget_add_stroke_group (GimpToolWidget *widget)
+{
+  GimpCanvasGroup *group;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  group = gimp_tool_widget_add_group (widget);
+  gimp_canvas_group_set_group_stroking (group, TRUE);
+
+  return group;
+}
+
+GimpCanvasGroup *
+gimp_tool_widget_add_fill_group (GimpToolWidget *widget)
+{
+  GimpCanvasGroup *group;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  group = gimp_tool_widget_add_group (widget);
+  gimp_canvas_group_set_group_filling (group, TRUE);
+
+  return group;
+}
+
+void
+gimp_tool_widget_push_group (GimpToolWidget  *widget,
+                             GimpCanvasGroup *group)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+
+  widget->private->group_stack = g_list_prepend (widget->private->group_stack,
+                                                 group);
+}
+
+void
+gimp_tool_widget_pop_group (GimpToolWidget *widget)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (widget->private->group_stack != NULL);
+
+  widget->private->group_stack = g_list_remove (widget->private->group_stack,
+                                                widget->private->group_stack->data);
+}
+
+/**
+ * gimp_tool_widget_add_line:
+ * @widget: the #GimpToolWidget
+ * @x1:     start point X in image coordinates
+ * @y1:     start point Y in image coordinates
+ * @x2:     end point X in image coordinates
+ * @y2:     end point Y in image coordinates
+ *
+ * This function adds a #GimpCanvasLine to @widget.
+ **/
+GimpCanvasItem *
+gimp_tool_widget_add_line (GimpToolWidget *widget,
+                           gdouble         x1,
+                           gdouble         y1,
+                           gdouble         x2,
+                           gdouble         y2)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_line_new (widget->private->shell,
+                               x1, y1, x2, y2);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_rectangle (GimpToolWidget *widget,
+                                gdouble         x,
+                                gdouble         y,
+                                gdouble         width,
+                                gdouble         height,
+                                gboolean        filled)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_rectangle_new (widget->private->shell,
+                                    x, y, width, height, filled);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_arc (GimpToolWidget *widget,
+                          gdouble         center_x,
+                          gdouble         center_y,
+                          gdouble         radius_x,
+                          gdouble         radius_y,
+                          gdouble         start_angle,
+                          gdouble         slice_angle,
+                          gboolean        filled)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_arc_new (widget->private->shell,
+                              center_x, center_y,
+                              radius_x, radius_y,
+                              start_angle, slice_angle,
+                              filled);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_limit (GimpToolWidget *widget,
+                            GimpLimitType   type,
+                            gdouble         x,
+                            gdouble         y,
+                            gdouble         radius,
+                            gdouble         aspect_ratio,
+                            gdouble         angle,
+                            gboolean        dashed)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_limit_new (widget->private->shell,
+                                type,
+                                x, y,
+                                radius,
+                                aspect_ratio,
+                                angle,
+                                dashed);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_polygon (GimpToolWidget    *widget,
+                              GimpMatrix3       *transform,
+                              const GimpVector2 *points,
+                              gint               n_points,
+                              gboolean           filled)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+  g_return_val_if_fail (points == NULL || n_points > 0, NULL);
+
+  item = gimp_canvas_polygon_new (widget->private->shell,
+                                  points, n_points,
+                                  transform, filled);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_polygon_from_coords (GimpToolWidget    *widget,
+                                          GimpMatrix3       *transform,
+                                          const GimpCoords  *points,
+                                          gint               n_points,
+                                          gboolean           filled)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+  g_return_val_if_fail (points == NULL || n_points > 0, NULL);
+
+  item = gimp_canvas_polygon_new_from_coords (widget->private->shell,
+                                              points, n_points,
+                                              transform, filled);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_path (GimpToolWidget       *widget,
+                           const GimpBezierDesc *desc)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_path_new (widget->private->shell,
+                               desc, 0, 0, FALSE, GIMP_PATH_STYLE_DEFAULT);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_handle (GimpToolWidget   *widget,
+                             GimpHandleType    type,
+                             gdouble           x,
+                             gdouble           y,
+                             gint              width,
+                             gint              height,
+                             GimpHandleAnchor  anchor)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_handle_new (widget->private->shell,
+                                 type, anchor, x, y, width, height);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_corner (GimpToolWidget   *widget,
+                             gdouble           x,
+                             gdouble           y,
+                             gdouble           width,
+                             gdouble           height,
+                             GimpHandleAnchor  anchor,
+                             gint              corner_width,
+                             gint              corner_height,
+                             gboolean          outside)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_corner_new (widget->private->shell,
+                                 x, y, width, height,
+                                 anchor, corner_width, corner_height,
+                                 outside);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_rectangle_guides (GimpToolWidget *widget,
+                                       gdouble         x,
+                                       gdouble         y,
+                                       gdouble         width,
+                                       gdouble         height,
+                                       GimpGuidesType  type)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_rectangle_guides_new (widget->private->shell,
+                                           x, y, width, height, type, 4);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_tool_widget_add_transform_guides (GimpToolWidget    *widget,
+                                       const GimpMatrix3 *transform,
+                                       gdouble            x1,
+                                       gdouble            y1,
+                                       gdouble            x2,
+                                       gdouble            y2,
+                                       GimpGuidesType     type,
+                                       gint               n_guides,
+                                       gboolean           clip)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_canvas_transform_guides_new (widget->private->shell,
+                                           transform, x1, y1, x2, y2,
+                                           type, n_guides, clip);
+
+  gimp_tool_widget_add_item (widget, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+gint
+gimp_tool_widget_button_press (GimpToolWidget      *widget,
+                               const GimpCoords    *coords,
+                               guint32              time,
+                               GdkModifierType      state,
+                               GimpButtonPressType  press_type)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), 0);
+  g_return_val_if_fail (coords != NULL, 0);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->button_press)
+    {
+      return GIMP_TOOL_WIDGET_GET_CLASS (widget)->button_press (widget,
+                                                                coords, time,
+                                                                state,
+                                                                press_type);
+    }
+
+  return 0;
+}
+
+void
+gimp_tool_widget_button_release (GimpToolWidget        *widget,
+                                 const GimpCoords      *coords,
+                                 guint32                time,
+                                 GdkModifierType        state,
+                                 GimpButtonReleaseType  release_type)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (coords != NULL);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->button_release)
+    {
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->button_release (widget,
+                                                           coords, time, state,
+                                                           release_type);
+    }
+}
+
+void
+gimp_tool_widget_motion (GimpToolWidget   *widget,
+                         const GimpCoords *coords,
+                         guint32           time,
+                         GdkModifierType   state)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (coords != NULL);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->motion)
+    {
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->motion (widget,
+                                                   coords, time, state);
+    }
+}
+
+GimpHit
+gimp_tool_widget_hit (GimpToolWidget   *widget,
+                      const GimpCoords *coords,
+                      GdkModifierType   state,
+                      gboolean          proximity)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), GIMP_HIT_NONE);
+  g_return_val_if_fail (coords != NULL, GIMP_HIT_NONE);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->hit)
+    {
+      return GIMP_TOOL_WIDGET_GET_CLASS (widget)->hit (widget,
+                                                       coords, state,
+                                                       proximity);
+    }
+
+  return GIMP_HIT_NONE;
+}
+
+void
+gimp_tool_widget_hover (GimpToolWidget   *widget,
+                        const GimpCoords *coords,
+                        GdkModifierType   state,
+                        gboolean          proximity)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (coords != NULL);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->hover)
+    {
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->hover (widget,
+                                                  coords, state, proximity);
+    }
+}
+
+void
+gimp_tool_widget_leave_notify (GimpToolWidget *widget)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->leave_notify)
+    {
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->leave_notify (widget);
+    }
+}
+
+gboolean
+gimp_tool_widget_key_press (GimpToolWidget *widget,
+                            GdkEventKey    *kevent)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), FALSE);
+  g_return_val_if_fail (kevent != NULL, FALSE);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->key_press)
+    {
+      return GIMP_TOOL_WIDGET_GET_CLASS (widget)->key_press (widget, kevent);
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_tool_widget_key_release (GimpToolWidget *widget,
+                              GdkEventKey    *kevent)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), FALSE);
+  g_return_val_if_fail (kevent != NULL, FALSE);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->key_release)
+    {
+      return GIMP_TOOL_WIDGET_GET_CLASS (widget)->key_release (widget, kevent);
+    }
+
+  return FALSE;
+}
+
+void
+gimp_tool_widget_motion_modifier (GimpToolWidget  *widget,
+                                  GdkModifierType  key,
+                                  gboolean         press,
+                                  GdkModifierType  state)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->motion_modifier)
+    {
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->motion_modifier (widget,
+                                                            key, press, state);
+    }
+}
+
+void
+gimp_tool_widget_hover_modifier (GimpToolWidget  *widget,
+                                 GdkModifierType  key,
+                                 gboolean         press,
+                                 GdkModifierType  state)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->hover_modifier)
+    {
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->hover_modifier (widget,
+                                                           key, press, state);
+    }
+}
+
+gboolean
+gimp_tool_widget_get_cursor (GimpToolWidget      *widget,
+                             const GimpCoords    *coords,
+                             GdkModifierType      state,
+                             GimpCursorType      *cursor,
+                             GimpToolCursorType  *tool_cursor,
+                             GimpCursorModifier  *modifier)
+
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+
+  if (widget->private->visible &&
+      GIMP_TOOL_WIDGET_GET_CLASS (widget)->get_cursor)
+    {
+      GimpCursorType     my_cursor;
+      GimpToolCursorType my_tool_cursor;
+      GimpCursorModifier my_modifier;
+
+      if (cursor)      my_cursor      = *cursor;
+      if (tool_cursor) my_tool_cursor = *tool_cursor;
+      if (modifier)    my_modifier    = *modifier;
+
+      if (GIMP_TOOL_WIDGET_GET_CLASS (widget)->get_cursor (widget, coords,
+                                                           state,
+                                                           &my_cursor,
+                                                           &my_tool_cursor,
+                                                           &my_modifier))
+        {
+          if (cursor)      *cursor      = my_cursor;
+          if (tool_cursor) *tool_cursor = my_tool_cursor;
+          if (modifier)    *modifier    = my_modifier;
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
diff --git a/app/display/gimptoolwidget.h b/app/display/gimptoolwidget.h
new file mode 100644
index 0000000..742aa2a
--- /dev/null
+++ b/app/display/gimptoolwidget.h
@@ -0,0 +1,318 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolwidget.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_WIDGET_H__
+#define __GIMP_TOOL_WIDGET_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TOOL_WIDGET_RESPONSE_CONFIRM -1
+#define GIMP_TOOL_WIDGET_RESPONSE_CANCEL  -2
+#define GIMP_TOOL_WIDGET_RESPONSE_RESET   -3
+
+
+#define GIMP_TYPE_TOOL_WIDGET            (gimp_tool_widget_get_type ())
+#define GIMP_TOOL_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_WIDGET, GimpToolWidget))
+#define GIMP_TOOL_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_WIDGET, GimpToolWidgetClass))
+#define GIMP_IS_TOOL_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_WIDGET))
+#define GIMP_IS_TOOL_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_WIDGET))
+#define GIMP_TOOL_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_WIDGET, GimpToolWidgetClass))
+
+
+typedef struct _GimpToolWidgetPrivate GimpToolWidgetPrivate;
+typedef struct _GimpToolWidgetClass   GimpToolWidgetClass;
+
+struct _GimpToolWidget
+{
+  GimpObject             parent_instance;
+
+  GimpToolWidgetPrivate *private;
+};
+
+struct _GimpToolWidgetClass
+{
+  GimpObjectClass  parent_class;
+
+  /*  signals  */
+  void     (* changed)         (GimpToolWidget        *widget);
+  void     (* response)        (GimpToolWidget        *widget,
+                                gint                   response_id);
+  void     (* snap_offsets)    (GimpToolWidget        *widget,
+                                gint                   offset_x,
+                                gint                   offset_y,
+                                gint                   width,
+                                gint                   height);
+  void     (* status)          (GimpToolWidget        *widget,
+                                const gchar           *status);
+  void     (* status_coords)   (GimpToolWidget        *widget,
+                                const gchar           *title,
+                                gdouble                x,
+                                const gchar           *separator,
+                                gdouble                y,
+                                const gchar           *help);
+  void     (* message)         (GimpToolWidget        *widget,
+                                const gchar           *message);
+  void     (* focus_changed)   (GimpToolWidget        *widget);
+
+  /*  virtual functions  */
+  gint     (* button_press)    (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonPressType    press_type);
+  void     (* button_release)  (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonReleaseType  release_type);
+  void     (* motion)          (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state);
+
+  GimpHit  (* hit)             (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                GdkModifierType        state,
+                                gboolean               proximity);
+  void     (* hover)           (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                GdkModifierType        state,
+                                gboolean               proximity);
+  void     (* leave_notify)    (GimpToolWidget        *widget);
+
+  gboolean (* key_press)       (GimpToolWidget        *widget,
+                                GdkEventKey           *kevent);
+  gboolean (* key_release)     (GimpToolWidget        *widget,
+                                GdkEventKey           *kevent);
+
+  void     (* motion_modifier) (GimpToolWidget        *widget,
+                                GdkModifierType        key,
+                                gboolean               press,
+                                GdkModifierType        state);
+  void     (* hover_modifier)  (GimpToolWidget        *widget,
+                                GdkModifierType        key,
+                                gboolean               press,
+                                GdkModifierType        state);
+
+  gboolean (* get_cursor)      (GimpToolWidget        *widget,
+                                const GimpCoords      *coords,
+                                GdkModifierType        state,
+                                GimpCursorType        *cursor,
+                                GimpToolCursorType    *tool_cursor,
+                                GimpCursorModifier    *modifier);
+
+  gboolean update_on_scale;
+  gboolean update_on_scroll;
+  gboolean update_on_rotate;
+};
+
+
+GType              gimp_tool_widget_get_type          (void) G_GNUC_CONST;
+
+GimpDisplayShell * gimp_tool_widget_get_shell         (GimpToolWidget  *widget);
+GimpCanvasItem   * gimp_tool_widget_get_item          (GimpToolWidget  *widget);
+
+void               gimp_tool_widget_set_visible       (GimpToolWidget  *widget,
+                                                       gboolean         visible);
+gboolean           gimp_tool_widget_get_visible       (GimpToolWidget  *widget);
+
+void               gimp_tool_widget_set_focus         (GimpToolWidget  *widget,
+                                                       gboolean         focus);
+gboolean           gimp_tool_widget_get_focus         (GimpToolWidget  *widget);
+
+/*  for subclasses, to notify the handling tool
+ */
+void               gimp_tool_widget_changed           (GimpToolWidget  *widget);
+
+void               gimp_tool_widget_response          (GimpToolWidget  *widget,
+                                                       gint             response_id);
+
+void               gimp_tool_widget_set_snap_offsets  (GimpToolWidget  *widget,
+                                                       gint             offset_x,
+                                                       gint             offset_y,
+                                                       gint             width,
+                                                       gint             height);
+void               gimp_tool_widget_get_snap_offsets  (GimpToolWidget  *widget,
+                                                       gint            *offset_x,
+                                                       gint            *offset_y,
+                                                       gint            *width,
+                                                       gint            *height);
+
+void               gimp_tool_widget_set_status        (GimpToolWidget  *widget,
+                                                       const gchar     *status);
+void               gimp_tool_widget_set_status_coords (GimpToolWidget  *widget,
+                                                       const gchar     *title,
+                                                       gdouble          x,
+                                                       const gchar     *separator,
+                                                       gdouble          y,
+                                                       const gchar     *help);
+
+void               gimp_tool_widget_message           (GimpToolWidget  *widget,
+                                                       const gchar     *format,
+                                                       ...) G_GNUC_PRINTF (2, 3);
+void               gimp_tool_widget_message_literal   (GimpToolWidget  *widget,
+                                                       const gchar     *message);
+
+/*  for subclasses, to add and manage their items
+ */
+void               gimp_tool_widget_add_item         (GimpToolWidget  *widget,
+                                                      GimpCanvasItem  *item);
+void               gimp_tool_widget_remove_item      (GimpToolWidget  *widget,
+                                                      GimpCanvasItem  *item);
+
+GimpCanvasGroup  * gimp_tool_widget_add_group        (GimpToolWidget  *widget);
+GimpCanvasGroup  * gimp_tool_widget_add_stroke_group (GimpToolWidget  *widget);
+GimpCanvasGroup  * gimp_tool_widget_add_fill_group   (GimpToolWidget  *widget);
+
+void               gimp_tool_widget_push_group       (GimpToolWidget  *widget,
+                                                      GimpCanvasGroup *group);
+void               gimp_tool_widget_pop_group        (GimpToolWidget  *widget);
+
+/*  for subclasses, convenience functions to add specific items
+ */
+GimpCanvasItem * gimp_tool_widget_add_line      (GimpToolWidget       *widget,
+                                                 gdouble               x1,
+                                                 gdouble               y1,
+                                                 gdouble               x2,
+                                                 gdouble               y2);
+GimpCanvasItem * gimp_tool_widget_add_rectangle (GimpToolWidget       *widget,
+                                                 gdouble               x,
+                                                 gdouble               y,
+                                                 gdouble               width,
+                                                 gdouble               height,
+                                                 gboolean              filled);
+GimpCanvasItem * gimp_tool_widget_add_arc       (GimpToolWidget       *widget,
+                                                 gdouble               center_x,
+                                                 gdouble               center_y,
+                                                 gdouble               radius_x,
+                                                 gdouble               radius_y,
+                                                 gdouble               start_angle,
+                                                 gdouble               slice_angle,
+                                                 gboolean              filled);
+GimpCanvasItem * gimp_tool_widget_add_limit     (GimpToolWidget       *widget,
+                                                 GimpLimitType         type,
+                                                 gdouble               x,
+                                                 gdouble               y,
+                                                 gdouble               radius,
+                                                 gdouble               aspect_ratio,
+                                                 gdouble               angle,
+                                                 gboolean              dashed);
+GimpCanvasItem * gimp_tool_widget_add_polygon   (GimpToolWidget       *widget,
+                                                 GimpMatrix3          *transform,
+                                                 const GimpVector2    *points,
+                                                 gint                  n_points,
+                                                 gboolean              filled);
+GimpCanvasItem * gimp_tool_widget_add_polygon_from_coords
+                                                (GimpToolWidget       *widget,
+                                                 GimpMatrix3          *transform,
+                                                 const GimpCoords     *points,
+                                                 gint                  n_points,
+                                                 gboolean              filled);
+GimpCanvasItem * gimp_tool_widget_add_path      (GimpToolWidget       *widget,
+                                                 const GimpBezierDesc *desc);
+
+GimpCanvasItem * gimp_tool_widget_add_handle    (GimpToolWidget       *widget,
+                                                 GimpHandleType        type,
+                                                 gdouble               x,
+                                                 gdouble               y,
+                                                 gint                  width,
+                                                 gint                  height,
+                                                 GimpHandleAnchor      anchor);
+GimpCanvasItem * gimp_tool_widget_add_corner    (GimpToolWidget       *widget,
+                                                 gdouble               x,
+                                                 gdouble               y,
+                                                 gdouble               width,
+                                                 gdouble               height,
+                                                 GimpHandleAnchor      anchor,
+                                                 gint                  corner_width,
+                                                 gint                  corner_height,
+                                                 gboolean              outside);
+
+GimpCanvasItem * gimp_tool_widget_add_rectangle_guides
+                                                (GimpToolWidget       *widget,
+                                                 gdouble               x,
+                                                 gdouble               y,
+                                                 gdouble               width,
+                                                 gdouble               height,
+                                                 GimpGuidesType        type);
+GimpCanvasItem * gimp_tool_widget_add_transform_guides
+                                                (GimpToolWidget       *widget,
+                                                 const GimpMatrix3    *transform,
+                                                 gdouble               x1,
+                                                 gdouble               y1,
+                                                 gdouble               x2,
+                                                 gdouble               y2,
+                                                 GimpGuidesType        type,
+                                                 gint                  n_guides,
+                                                 gboolean              clip);
+
+/*  for tools, to be called from the respective GimpTool method
+ *  implementations
+ */
+gint       gimp_tool_widget_button_press    (GimpToolWidget        *widget,
+                                             const GimpCoords      *coords,
+                                             guint32                time,
+                                             GdkModifierType        state,
+                                             GimpButtonPressType    press_type);
+void       gimp_tool_widget_button_release  (GimpToolWidget        *widget,
+                                             const GimpCoords      *coords,
+                                             guint32                time,
+                                             GdkModifierType        state,
+                                             GimpButtonReleaseType  release_type);
+void       gimp_tool_widget_motion          (GimpToolWidget        *widget,
+                                             const GimpCoords      *coords,
+                                             guint32                time,
+                                             GdkModifierType        state);
+
+GimpHit    gimp_tool_widget_hit             (GimpToolWidget        *widget,
+                                             const GimpCoords      *coords,
+                                             GdkModifierType        state,
+                                             gboolean               proximity);
+void       gimp_tool_widget_hover           (GimpToolWidget        *widget,
+                                             const GimpCoords      *coords,
+                                             GdkModifierType        state,
+                                             gboolean               proximity);
+void       gimp_tool_widget_leave_notify    (GimpToolWidget        *widget);
+
+gboolean   gimp_tool_widget_key_press       (GimpToolWidget        *widget,
+                                             GdkEventKey           *kevent);
+gboolean   gimp_tool_widget_key_release     (GimpToolWidget        *widget,
+                                             GdkEventKey           *kevent);
+
+void       gimp_tool_widget_motion_modifier (GimpToolWidget        *widget,
+                                             GdkModifierType        key,
+                                             gboolean               press,
+                                             GdkModifierType        state);
+void       gimp_tool_widget_hover_modifier  (GimpToolWidget        *widget,
+                                             GdkModifierType        key,
+                                             gboolean               press,
+                                             GdkModifierType        state);
+
+gboolean   gimp_tool_widget_get_cursor      (GimpToolWidget        *widget,
+                                             const GimpCoords      *coords,
+                                             GdkModifierType        state,
+                                             GimpCursorType        *cursor,
+                                             GimpToolCursorType    *tool_cursor,
+                                             GimpCursorModifier    *modifier);
+
+
+#endif /* __GIMP_TOOL_WIDGET_H__ */
diff --git a/app/display/gimptoolwidgetgroup.c b/app/display/gimptoolwidgetgroup.c
new file mode 100644
index 0000000..d62f4c9
--- /dev/null
+++ b/app/display/gimptoolwidgetgroup.c
@@ -0,0 +1,731 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolwidgetgroup.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimplist.h"
+
+#include "gimpcanvasgroup.h"
+#include "gimpdisplayshell.h"
+#include "gimptoolwidgetgroup.h"
+
+
+struct _GimpToolWidgetGroupPrivate
+{
+  GimpContainer  *children;
+
+  GimpToolWidget *focus_widget;
+  GimpToolWidget *hover_widget;
+
+  gboolean        auto_raise;
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_tool_widget_group_finalize            (GObject               *object);
+
+static void             gimp_tool_widget_group_focus_changed       (GimpToolWidget        *widget);
+static gint             gimp_tool_widget_group_button_press        (GimpToolWidget        *widget,
+                                                                    const GimpCoords      *coords,
+                                                                    guint32                time,
+                                                                    GdkModifierType        state,
+                                                                    GimpButtonPressType    press_type);
+static void             gimp_tool_widget_group_button_release      (GimpToolWidget        *widget,
+                                                                    const GimpCoords      *coords,
+                                                                    guint32                time,
+                                                                    GdkModifierType        state,
+                                                                    GimpButtonReleaseType  release_type);
+static void             gimp_tool_widget_group_motion              (GimpToolWidget        *widget,
+                                                                    const GimpCoords      *coords,
+                                                                    guint32                time,
+                                                                    GdkModifierType        state);
+static GimpHit          gimp_tool_widget_group_hit                 (GimpToolWidget        *widget,
+                                                                    const GimpCoords      *coords,
+                                                                    GdkModifierType        state,
+                                                                    gboolean               proximity);
+static void             gimp_tool_widget_group_hover               (GimpToolWidget        *widget,
+                                                                    const GimpCoords      *coords,
+                                                                    GdkModifierType        state,
+                                                                    gboolean               proximity);
+static void             gimp_tool_widget_group_leave_notify        (GimpToolWidget        *widget);
+static gboolean         gimp_tool_widget_group_key_press           (GimpToolWidget        *widget,
+                                                                    GdkEventKey           *kevent);
+static gboolean         gimp_tool_widget_group_key_release         (GimpToolWidget        *widget,
+                                                                    GdkEventKey           *kevent);
+static void             gimp_tool_widget_group_motion_modifier     (GimpToolWidget        *widget,
+                                                                    GdkModifierType        key,
+                                                                    gboolean               press,
+                                                                    GdkModifierType        state);
+static void             gimp_tool_widget_group_hover_modifier      (GimpToolWidget        *widget,
+                                                                    GdkModifierType        key,
+                                                                    gboolean               press,
+                                                                    GdkModifierType        state);
+static gboolean         gimp_tool_widget_group_get_cursor          (GimpToolWidget        *widget,
+                                                                    const GimpCoords      *coords,
+                                                                    GdkModifierType        state,
+                                                                    GimpCursorType        *cursor,
+                                                                    GimpToolCursorType    *tool_cursor,
+                                                                    GimpCursorModifier    *modifier);
+
+static void             gimp_tool_widget_group_children_add        (GimpContainer         *container,
+                                                                    GimpToolWidget        *child,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_children_remove     (GimpContainer         *container,
+                                                                    GimpToolWidget        *child,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_children_reorder    (GimpContainer         *container,
+                                                                    GimpToolWidget        *child,
+                                                                    gint                   new_index,
+                                                                    GimpToolWidgetGroup   *group);
+
+static void             gimp_tool_widget_group_child_changed       (GimpToolWidget        *child,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_child_response      (GimpToolWidget        *child,
+                                                                    gint                   response_id,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_child_snap_offsets  (GimpToolWidget        *child,
+                                                                    gint                   offset_x,
+                                                                    gint                   offset_y,
+                                                                    gint                   width,
+                                                                    gint                   height,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_child_status        (GimpToolWidget        *child,
+                                                                    const gchar           *status,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_child_status_coords (GimpToolWidget        *child,
+                                                                    const gchar           *title,
+                                                                    gdouble                x,
+                                                                    const gchar           *separator,
+                                                                    gdouble                y,
+                                                                    const gchar           *help,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_child_message       (GimpToolWidget        *child,
+                                                                    const gchar           *message,
+                                                                    GimpToolWidgetGroup   *group);
+static void             gimp_tool_widget_group_child_focus_changed (GimpToolWidget        *child,
+                                                                    GimpToolWidgetGroup   *group);
+
+static GimpToolWidget * gimp_tool_widget_group_get_hover_widget    (GimpToolWidgetGroup   *group,
+                                                                    const GimpCoords      *coords,
+                                                                    GdkModifierType        state,
+                                                                    gboolean               proximity,
+                                                                    GimpHit               *hit);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolWidgetGroup, gimp_tool_widget_group,
+                            GIMP_TYPE_TOOL_WIDGET)
+
+#define parent_class gimp_tool_widget_group_parent_class
+
+
+/*  priv functions  */
+
+
+static void
+gimp_tool_widget_group_class_init (GimpToolWidgetGroupClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpToolWidgetClass *widget_class = GIMP_TOOL_WIDGET_CLASS (klass);
+
+  object_class->finalize        = gimp_tool_widget_group_finalize;
+
+  widget_class->focus_changed   = gimp_tool_widget_group_focus_changed;
+  widget_class->button_press    = gimp_tool_widget_group_button_press;
+  widget_class->button_release  = gimp_tool_widget_group_button_release;
+  widget_class->motion          = gimp_tool_widget_group_motion;
+  widget_class->hit             = gimp_tool_widget_group_hit;
+  widget_class->hover           = gimp_tool_widget_group_hover;
+  widget_class->leave_notify    = gimp_tool_widget_group_leave_notify;
+  widget_class->key_press       = gimp_tool_widget_group_key_press;
+  widget_class->key_release     = gimp_tool_widget_group_key_release;
+  widget_class->motion_modifier = gimp_tool_widget_group_motion_modifier;
+  widget_class->hover_modifier  = gimp_tool_widget_group_hover_modifier;
+  widget_class->get_cursor      = gimp_tool_widget_group_get_cursor;
+}
+
+static void
+gimp_tool_widget_group_init (GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv;
+
+  priv = group->priv = gimp_tool_widget_group_get_instance_private (group);
+
+  priv->children = g_object_new (GIMP_TYPE_LIST,
+                                 "children-type", GIMP_TYPE_TOOL_WIDGET,
+                                 "append",        TRUE,
+                                 NULL);
+
+  g_signal_connect (priv->children, "add",
+                    G_CALLBACK (gimp_tool_widget_group_children_add),
+                    group);
+  g_signal_connect (priv->children, "remove",
+                    G_CALLBACK (gimp_tool_widget_group_children_remove),
+                    group);
+  g_signal_connect (priv->children, "reorder",
+                    G_CALLBACK (gimp_tool_widget_group_children_reorder),
+                    group);
+
+  gimp_container_add_handler (priv->children, "changed",
+                              G_CALLBACK (gimp_tool_widget_group_child_changed),
+                              group);
+  gimp_container_add_handler (priv->children, "response",
+                              G_CALLBACK (gimp_tool_widget_group_child_response),
+                              group);
+  gimp_container_add_handler (priv->children, "snap-offsets",
+                              G_CALLBACK (gimp_tool_widget_group_child_snap_offsets),
+                              group);
+  gimp_container_add_handler (priv->children, "status",
+                              G_CALLBACK (gimp_tool_widget_group_child_status),
+                              group);
+  gimp_container_add_handler (priv->children, "status-coords",
+                              G_CALLBACK (gimp_tool_widget_group_child_status_coords),
+                              group);
+  gimp_container_add_handler (priv->children, "message",
+                              G_CALLBACK (gimp_tool_widget_group_child_message),
+                              group);
+  gimp_container_add_handler (priv->children, "focus-changed",
+                              G_CALLBACK (gimp_tool_widget_group_child_focus_changed),
+                              group);
+}
+
+static void
+gimp_tool_widget_group_finalize (GObject *object)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (object);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  g_clear_object (&priv->children);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint
+gimp_tool_widget_group_button_press (GimpToolWidget      *widget,
+                                     const GimpCoords    *coords,
+                                     guint32              time,
+                                     GdkModifierType      state,
+                                     GimpButtonPressType  press_type)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  gimp_tool_widget_group_hover (widget, coords, state, TRUE);
+
+  if (priv->focus_widget != priv->hover_widget)
+    {
+      if (priv->hover_widget)
+        gimp_tool_widget_set_focus (priv->hover_widget, TRUE);
+      else if (priv->focus_widget)
+        gimp_tool_widget_set_focus (priv->focus_widget, FALSE);
+    }
+
+  if (priv->hover_widget)
+    {
+      if (priv->auto_raise)
+        {
+          gimp_container_reorder (priv->children,
+                                  GIMP_OBJECT (priv->hover_widget), -1);
+        }
+
+      return gimp_tool_widget_button_press (priv->hover_widget,
+                                            coords, time, state, press_type);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_widget_group_focus_changed (GimpToolWidget *widget)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->focus_widget)
+    {
+      GimpToolWidget *focus_widget = priv->focus_widget;
+
+      gimp_tool_widget_set_focus (priv->focus_widget,
+                                  gimp_tool_widget_get_focus (widget));
+
+      priv->focus_widget = focus_widget;
+    }
+}
+
+static void
+gimp_tool_widget_group_button_release (GimpToolWidget        *widget,
+                                       const GimpCoords      *coords,
+                                       guint32                time,
+                                       GdkModifierType        state,
+                                       GimpButtonReleaseType  release_type)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->hover_widget)
+    {
+      gimp_tool_widget_button_release (priv->hover_widget,
+                                       coords, time, state, release_type);
+    }
+}
+
+static void
+gimp_tool_widget_group_motion (GimpToolWidget   *widget,
+                        const GimpCoords *coords,
+                        guint32           time,
+                        GdkModifierType   state)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv = group->priv;
+
+  if (priv->hover_widget)
+    gimp_tool_widget_motion (priv->hover_widget, coords, time, state);
+}
+
+static GimpHit
+gimp_tool_widget_group_hit (GimpToolWidget   *widget,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity)
+{
+  GimpToolWidgetGroup *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpHit              hit;
+
+  gimp_tool_widget_group_get_hover_widget (group,
+                                           coords, state, proximity,
+                                           &hit);
+
+  return hit;
+}
+
+static void
+gimp_tool_widget_group_hover (GimpToolWidget   *widget,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              gboolean          proximity)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+  GimpToolWidget             *hover_widget;
+
+  hover_widget =
+    gimp_tool_widget_group_get_hover_widget (group,
+                                             coords, state, proximity,
+                                             NULL);
+
+  if (priv->hover_widget && priv->hover_widget != hover_widget)
+    gimp_tool_widget_leave_notify (priv->hover_widget);
+
+  priv->hover_widget = hover_widget;
+
+  if (priv->hover_widget)
+    gimp_tool_widget_hover (priv->hover_widget, coords, state, proximity);
+}
+
+static void
+gimp_tool_widget_group_leave_notify (GimpToolWidget *widget)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->hover_widget)
+    {
+      gimp_tool_widget_leave_notify (priv->hover_widget);
+
+      priv->hover_widget = NULL;
+    }
+
+  GIMP_TOOL_WIDGET_CLASS (parent_class)->leave_notify (widget);
+}
+
+static gboolean
+gimp_tool_widget_group_key_press (GimpToolWidget *widget,
+                                  GdkEventKey    *kevent)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->focus_widget)
+    return gimp_tool_widget_key_press (priv->focus_widget, kevent);
+
+  return GIMP_TOOL_WIDGET_CLASS (parent_class)->key_press (widget, kevent);
+}
+
+static gboolean
+gimp_tool_widget_group_key_release (GimpToolWidget *widget,
+                                    GdkEventKey    *kevent)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->focus_widget)
+    return gimp_tool_widget_key_release (priv->focus_widget, kevent);
+
+  return FALSE;
+}
+
+static void
+gimp_tool_widget_group_motion_modifier (GimpToolWidget  *widget,
+                                        GdkModifierType  key,
+                                        gboolean         press,
+                                        GdkModifierType  state)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->hover_widget)
+    gimp_tool_widget_motion_modifier (priv->hover_widget, key, press, state);
+}
+
+static void
+gimp_tool_widget_group_hover_modifier (GimpToolWidget  *widget,
+                                       GdkModifierType  key,
+                                       gboolean         press,
+                                       GdkModifierType  state)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+  GList                      *iter;
+
+  for (iter = g_queue_peek_head_link (GIMP_LIST (priv->children)->queue);
+       iter;
+       iter = g_list_next (iter))
+    {
+      gimp_tool_widget_hover_modifier (iter->data, key, press, state);
+    }
+}
+
+static gboolean
+gimp_tool_widget_group_get_cursor (GimpToolWidget     *widget,
+                                   const GimpCoords   *coords,
+                                   GdkModifierType     state,
+                                   GimpCursorType     *cursor,
+                                   GimpToolCursorType *tool_cursor,
+                                   GimpCursorModifier *modifier)
+{
+  GimpToolWidgetGroup        *group = GIMP_TOOL_WIDGET_GROUP (widget);
+  GimpToolWidgetGroupPrivate *priv  = group->priv;
+
+  if (priv->hover_widget)
+    {
+      return gimp_tool_widget_get_cursor (priv->hover_widget,
+                                          coords, state,
+                                          cursor, tool_cursor, modifier);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_widget_group_children_add (GimpContainer       *container,
+                                     GimpToolWidget      *child,
+                                     GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+  GimpCanvasGroup            *canvas_group;
+
+  canvas_group = GIMP_CANVAS_GROUP (gimp_tool_widget_get_item (widget));
+
+  gimp_canvas_group_add_item (canvas_group,
+                              gimp_tool_widget_get_item (child));
+
+  if (gimp_tool_widget_get_focus (child) && priv->focus_widget)
+    {
+      gimp_tool_widget_set_focus (priv->focus_widget, FALSE);
+
+      priv->focus_widget = NULL;
+    }
+
+  if (! priv->focus_widget)
+    {
+      priv->focus_widget = child;
+
+      gimp_tool_widget_set_focus (child, gimp_tool_widget_get_focus (widget));
+    }
+
+  gimp_tool_widget_changed (widget);
+}
+
+static void
+gimp_tool_widget_group_children_remove (GimpContainer       *container,
+                                        GimpToolWidget      *child,
+                                        GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+  GimpCanvasGroup            *canvas_group;
+
+  canvas_group = GIMP_CANVAS_GROUP (gimp_tool_widget_get_item (widget));
+
+  if (priv->focus_widget == child)
+    {
+      gimp_tool_widget_set_focus (child, FALSE);
+
+      priv->focus_widget = NULL;
+    }
+
+  if (priv->hover_widget == child)
+    {
+      gimp_tool_widget_leave_notify (child);
+
+      priv->hover_widget = NULL;
+    }
+
+  if (! priv->focus_widget)
+    {
+      priv->focus_widget =
+        GIMP_TOOL_WIDGET (gimp_container_get_last_child (container));
+
+      if (priv->focus_widget)
+        gimp_tool_widget_set_focus (priv->focus_widget, TRUE);
+    }
+
+  gimp_canvas_group_remove_item (canvas_group,
+                                 gimp_tool_widget_get_item (child));
+
+  gimp_tool_widget_changed (widget);
+}
+
+static void
+gimp_tool_widget_group_children_reorder (GimpContainer       *container,
+                                         GimpToolWidget      *child,
+                                         gint                 new_index,
+                                         GimpToolWidgetGroup *group)
+{
+  GimpToolWidget  *widget = GIMP_TOOL_WIDGET (group);
+  GimpCanvasGroup *canvas_group;
+  GList           *iter;
+
+  canvas_group = GIMP_CANVAS_GROUP (gimp_tool_widget_get_item (widget));
+
+  for (iter = g_queue_peek_head_link (GIMP_LIST (container)->queue);
+       iter;
+       iter = g_list_next (iter))
+    {
+      GimpCanvasItem *item = gimp_tool_widget_get_item (iter->data);
+
+      gimp_canvas_group_remove_item (canvas_group, item);
+      gimp_canvas_group_add_item    (canvas_group, item);
+    }
+
+  gimp_tool_widget_changed (widget);
+}
+
+static void
+gimp_tool_widget_group_child_changed (GimpToolWidget      *child,
+                                      GimpToolWidgetGroup *group)
+{
+  GimpToolWidget *widget = GIMP_TOOL_WIDGET (group);
+
+  gimp_tool_widget_changed (widget);
+}
+
+static void
+gimp_tool_widget_group_child_response (GimpToolWidget      *child,
+                                       gint                 response_id,
+                                       GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+
+  if (priv->focus_widget == child)
+    gimp_tool_widget_response (widget, response_id);
+}
+
+static void
+gimp_tool_widget_group_child_snap_offsets (GimpToolWidget      *child,
+                                           gint                 offset_x,
+                                           gint                 offset_y,
+                                           gint                 width,
+                                           gint                 height,
+                                           GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+
+  if (priv->hover_widget == child)
+    {
+      gimp_tool_widget_set_snap_offsets (widget,
+                                         offset_x, offset_y, width, height);
+    }
+}
+
+static void
+gimp_tool_widget_group_child_status (GimpToolWidget      *child,
+                                     const gchar         *status,
+                                     GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+
+  if (priv->hover_widget == child)
+    gimp_tool_widget_set_status (widget, status);
+}
+
+static void
+gimp_tool_widget_group_child_status_coords (GimpToolWidget      *child,
+                                            const gchar         *title,
+                                            gdouble              x,
+                                            const gchar         *separator,
+                                            gdouble              y,
+                                            const gchar         *help,
+                                            GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+
+  if (priv->hover_widget == child)
+    gimp_tool_widget_set_status_coords (widget, title, x, separator, y, help);
+}
+
+static void
+gimp_tool_widget_group_child_message (GimpToolWidget      *child,
+                                      const gchar         *message,
+                                      GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+
+  if (priv->focus_widget == child)
+    gimp_tool_widget_message_literal (widget, message);
+}
+
+static void
+gimp_tool_widget_group_child_focus_changed (GimpToolWidget      *child,
+                                            GimpToolWidgetGroup *group)
+{
+  GimpToolWidgetGroupPrivate *priv   = group->priv;
+  GimpToolWidget             *widget = GIMP_TOOL_WIDGET (group);
+
+  if (gimp_tool_widget_get_focus (child))
+    {
+      if (priv->focus_widget && priv->focus_widget != child)
+        gimp_tool_widget_set_focus (priv->focus_widget, FALSE);
+
+      priv->focus_widget = child;
+
+      gimp_tool_widget_set_focus (widget, TRUE);
+    }
+  else
+    {
+      if (priv->focus_widget == child)
+        priv->focus_widget = NULL;
+    }
+}
+
+static GimpToolWidget *
+gimp_tool_widget_group_get_hover_widget (GimpToolWidgetGroup *group,
+                                         const GimpCoords    *coords,
+                                         GdkModifierType      state,
+                                         gboolean             proximity,
+                                         GimpHit             *hit)
+{
+  GimpToolWidgetGroupPrivate *priv           = group->priv;
+  GimpToolWidget             *indirect_child = NULL;
+  gboolean                    indirect       = FALSE;
+  GList                      *iter;
+
+  for (iter = g_queue_peek_tail_link (GIMP_LIST (priv->children)->queue);
+       iter;
+       iter = g_list_previous (iter))
+    {
+      GimpToolWidget *child = iter->data;
+
+      switch (gimp_tool_widget_hit (child, coords, state, proximity))
+        {
+        case GIMP_HIT_DIRECT:
+          if (hit) *hit = GIMP_HIT_DIRECT;
+
+          return child;
+
+        case GIMP_HIT_INDIRECT:
+          if (! indirect || child == priv->focus_widget)
+            indirect_child = child;
+          else if (indirect_child != priv->focus_widget)
+            indirect_child = NULL;
+
+          indirect = TRUE;
+
+          break;
+
+        case GIMP_HIT_NONE:
+          break;
+        }
+    }
+
+  if (hit) *hit = indirect_child ? GIMP_HIT_INDIRECT : GIMP_HIT_NONE;
+
+  return indirect_child;
+}
+
+
+/*  public functions  */
+
+
+GimpToolWidget *
+gimp_tool_widget_group_new (GimpDisplayShell *shell)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_WIDGET_GROUP,
+                       "shell", shell,
+                       NULL);
+}
+
+GimpContainer *
+gimp_tool_widget_group_get_children (GimpToolWidgetGroup *group)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET_GROUP (group), NULL);
+
+  return group->priv->children;
+}
+
+GimpToolWidget *
+gimp_tool_widget_group_get_focus_widget (GimpToolWidgetGroup *group)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET_GROUP (group), NULL);
+
+  return group->priv->focus_widget;
+}
+
+void
+gimp_tool_widget_group_set_auto_raise (GimpToolWidgetGroup *group,
+                                       gboolean             auto_raise)
+{
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET_GROUP (group));
+
+  group->priv->auto_raise = auto_raise;
+}
+
+gboolean
+gimp_tool_widget_group_get_auto_raise (GimpToolWidgetGroup *group)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET_GROUP (group), FALSE);
+
+  return group->priv->auto_raise;
+}
+
diff --git a/app/display/gimptoolwidgetgroup.h b/app/display/gimptoolwidgetgroup.h
new file mode 100644
index 0000000..0a8331f
--- /dev/null
+++ b/app/display/gimptoolwidgetgroup.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolwidgetgroup.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_WIDGET_GROUP_H__
+#define __GIMP_TOOL_WIDGET_GROUP_H__
+
+
+#include "gimptoolwidget.h"
+
+
+#define GIMP_TYPE_TOOL_WIDGET_GROUP            (gimp_tool_widget_group_get_type ())
+#define GIMP_TOOL_WIDGET_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_WIDGET_GROUP, GimpToolWidgetGroup))
+#define GIMP_TOOL_WIDGET_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_WIDGET_GROUP, GimpToolWidgetGroupClass))
+#define GIMP_IS_TOOL_WIDGET_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_WIDGET_GROUP))
+#define GIMP_IS_TOOL_WIDGET_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_WIDGET_GROUP))
+#define GIMP_TOOL_WIDGET_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_WIDGET_GROUP, GimpToolWidgetGroupClass))
+
+
+typedef struct _GimpToolWidgetGroupPrivate GimpToolWidgetGroupPrivate;
+typedef struct _GimpToolWidgetGroupClass   GimpToolWidgetGroupClass;
+
+struct _GimpToolWidgetGroup
+{
+  GimpToolWidget              parent_instance;
+
+  GimpToolWidgetGroupPrivate *priv;
+};
+
+struct _GimpToolWidgetGroupClass
+{
+  GimpToolWidgetClass  parent_class;
+};
+
+
+GType            gimp_tool_widget_group_get_type         (void) G_GNUC_CONST;
+
+GimpToolWidget * gimp_tool_widget_group_new              (GimpDisplayShell    *shell);
+
+GimpContainer  * gimp_tool_widget_group_get_children     (GimpToolWidgetGroup *group);
+
+GimpToolWidget * gimp_tool_widget_group_get_focus_widget (GimpToolWidgetGroup *group);
+
+void             gimp_tool_widget_group_set_auto_raise   (GimpToolWidgetGroup *group,
+                                                          gboolean             auto_raise);
+gboolean         gimp_tool_widget_group_get_auto_raise   (GimpToolWidgetGroup *group);
+
+
+#endif /* __GIMP_TOOL_WIDGET_GROUP_H__ */
diff --git a/app/errors.c b/app/errors.c
new file mode 100644
index 0000000..5baea9f
--- /dev/null
+++ b/app/errors.c
@@ -0,0 +1,475 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#define _GNU_SOURCE  /* need the POSIX signal API */
+
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <gio/gio.h>
+#include <glib/gstdio.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpparamspecs.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "pdb/gimppdb.h"
+
+#include "errors.h"
+#include "gimp-log.h"
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+/*  private variables  */
+
+static Gimp                *the_errors_gimp    = NULL;
+static gboolean             use_debug_handler  = FALSE;
+static GimpStackTraceMode   stack_trace_mode   = GIMP_STACK_TRACE_QUERY;
+static gchar               *full_prog_name     = NULL;
+static gchar               *backtrace_file     = NULL;
+static gchar               *backup_path        = NULL;
+static GimpLogHandler       log_domain_handler = 0;
+static guint                global_handler_id  = 0;
+
+
+/*  local function prototypes  */
+
+static void    gimp_message_log_func             (const gchar        *log_domain,
+                                                  GLogLevelFlags      flags,
+                                                  const gchar        *message,
+                                                  gpointer            data);
+static void    gimp_error_log_func               (const gchar        *domain,
+                                                  GLogLevelFlags      flags,
+                                                  const gchar        *message,
+                                                  gpointer            data) G_GNUC_NORETURN;
+
+static G_GNUC_NORETURN void  gimp_eek            (const gchar        *reason,
+                                                  const gchar        *message,
+                                                  gboolean            use_handler);
+
+
+/*  public functions  */
+
+void
+errors_init (Gimp               *gimp,
+             const gchar        *_full_prog_name,
+             gboolean            _use_debug_handler,
+             GimpStackTraceMode  _stack_trace_mode,
+             const gchar        *_backtrace_file)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (_full_prog_name != NULL);
+  g_return_if_fail (full_prog_name == NULL);
+
+#ifdef GIMP_UNSTABLE
+  g_printerr ("This is a development version of GIMP.  "
+              "Debug messages may appear here.\n\n");
+#endif /* GIMP_UNSTABLE */
+
+  the_errors_gimp   = gimp;
+  use_debug_handler = _use_debug_handler ? TRUE : FALSE;
+  stack_trace_mode  = _stack_trace_mode;
+  full_prog_name    = g_strdup (_full_prog_name);
+
+  /* Create parent directories for both the crash and backup files. */
+  backtrace_file    = g_path_get_dirname (_backtrace_file);
+  backup_path       = g_build_filename (gimp_directory (), "backups", NULL);
+
+  g_mkdir_with_parents (backtrace_file, S_IRUSR | S_IWUSR | S_IXUSR);
+  g_free (backtrace_file);
+  backtrace_file = g_strdup (_backtrace_file);
+
+  g_mkdir_with_parents (backup_path, S_IRUSR | S_IWUSR | S_IXUSR);
+  g_free (backup_path);
+  backup_path = g_build_filename (gimp_directory (), "backups",
+                                  "backup-XXX.xcf", NULL);
+
+  log_domain_handler = gimp_log_set_handler (FALSE,
+                                             G_LOG_LEVEL_WARNING |
+                                             G_LOG_LEVEL_MESSAGE |
+                                             G_LOG_LEVEL_CRITICAL,
+                                             gimp_message_log_func, gimp);
+
+  global_handler_id = g_log_set_handler (NULL,
+                                         G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL,
+                                         gimp_error_log_func, gimp);
+}
+
+void
+errors_exit (void)
+{
+  if (log_domain_handler)
+    {
+      gimp_log_remove_handler (log_domain_handler);
+
+      log_domain_handler = 0;
+    }
+
+  if (global_handler_id)
+    {
+      g_log_remove_handler (NULL, global_handler_id);
+
+      global_handler_id = 0;
+    }
+
+  the_errors_gimp = NULL;
+
+  if (backtrace_file)
+    g_free (backtrace_file);
+  if (full_prog_name)
+    g_free (full_prog_name);
+  if (backup_path)
+    g_free (backup_path);
+}
+
+GList *
+errors_recovered (void)
+{
+  GList *recovered   = NULL;
+  gchar *backup_path = g_build_filename (gimp_directory (), "backups", NULL);
+  GDir  *backup_dir  = NULL;
+
+  if ((backup_dir = g_dir_open (backup_path, 0, NULL)))
+    {
+      const gchar *file;
+
+      while ((file = g_dir_read_name (backup_dir)))
+        {
+          if (g_str_has_suffix (file, ".xcf"))
+            {
+              gchar *path = g_build_filename (backup_path, file, NULL);
+
+              if (g_file_test (path, G_FILE_TEST_IS_REGULAR) &&
+                  ! g_file_test (path, G_FILE_TEST_IS_SYMLINK))
+                {
+                  /* A quick basic security check. It is not foolproof,
+                   * but better than nothing to make sure we are not
+                   * trying to read, then delete a folder or a symlink
+                   * to a file outside the backup directory.
+                   */
+                  recovered = g_list_append (recovered, path);
+                }
+              else
+                {
+                  g_free (path);
+                }
+            }
+        }
+
+      g_dir_close (backup_dir);
+    }
+  g_free (backup_path);
+
+  return recovered;
+}
+
+void
+gimp_fatal_error (const gchar *message)
+{
+  gimp_eek ("fatal error", message, TRUE);
+}
+
+void
+gimp_terminate (const gchar *message)
+{
+  gimp_eek ("terminated", message, use_debug_handler);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_message_log_func (const gchar    *log_domain,
+                       GLogLevelFlags  flags,
+                       const gchar    *message,
+                       gpointer        data)
+{
+  Gimp                *gimp        = data;
+  GimpCoreConfig      *config      = gimp->config;
+  const gchar         *msg_domain  = NULL;
+  GimpMessageSeverity  severity    = GIMP_MESSAGE_WARNING;
+  gboolean             gui_message = TRUE;
+  GimpDebugPolicy      debug_policy;
+
+  /* All GIMP messages are processed under the same domain, but
+   * we need to keep the log domain information for third party
+   * messages.
+   */
+  if (! log_domain ||
+      (! g_str_has_prefix (log_domain, "Gimp") &&
+       ! g_str_has_prefix (log_domain, "LibGimp")))
+    msg_domain = log_domain;
+
+  /* If debug policy requires it, WARNING and CRITICAL errors must be
+   * routed for appropriate debugging.
+   */
+  g_object_get (G_OBJECT (config),
+                "debug-policy", &debug_policy,
+                NULL);
+
+  switch (flags & G_LOG_LEVEL_MASK)
+    {
+    case G_LOG_LEVEL_WARNING:
+      severity = GIMP_MESSAGE_BUG_WARNING;
+      if (debug_policy > GIMP_DEBUG_POLICY_WARNING)
+        gui_message = FALSE;
+      break;
+    case G_LOG_LEVEL_CRITICAL:
+      severity = GIMP_MESSAGE_BUG_CRITICAL;
+      if (debug_policy > GIMP_DEBUG_POLICY_CRITICAL)
+        gui_message = FALSE;
+      break;
+    }
+
+  if (gimp && gui_message)
+    {
+      gimp_show_message (gimp, NULL, severity, msg_domain, message);
+    }
+  else
+    {
+      const gchar *reason = "Message";
+
+      gimp_enum_get_value (GIMP_TYPE_MESSAGE_SEVERITY, severity,
+                           NULL, NULL, &reason, NULL);
+
+      g_printerr ("%s: %s-%s: %s\n",
+                  gimp_filename_to_utf8 (full_prog_name),
+                  log_domain, reason, message);
+    }
+}
+
+static void
+gimp_error_log_func (const gchar    *domain,
+                     GLogLevelFlags  flags,
+                     const gchar    *message,
+                     gpointer        data)
+{
+  gimp_fatal_error (message);
+}
+
+static void
+gimp_eek (const gchar *reason,
+          const gchar *message,
+          gboolean     use_handler)
+{
+  GimpCoreConfig  *config        = the_errors_gimp->config;
+  gboolean         eek_handled   = FALSE;
+  GimpDebugPolicy  debug_policy;
+  GList           *iter;
+  gint             num_idx;
+  gint             i = 0;
+
+  /* GIMP has 2 ways to handle termination signals and fatal errors: one
+   * is the stack trace mode which is set at start as command line
+   * option --stack-trace-mode, this won't change for the length of the
+   * session and outputs a trace in terminal; the other is set in
+   * preferences, outputs a trace in a GUI and can change anytime during
+   * the session.
+   * The GUI backtrace has priority if it is set.
+   */
+  g_object_get (G_OBJECT (config),
+                "debug-policy", &debug_policy,
+                NULL);
+
+  /* Let's just always output on stdout at least so that there is a
+   * trace if the rest fails. */
+  g_printerr ("%s: %s: %s\n", full_prog_name, reason, message);
+
+#if ! defined (G_OS_WIN32) || defined (HAVE_EXCHNDL)
+
+  if (use_handler)
+    {
+#ifndef GIMP_CONSOLE_COMPILATION
+      if (debug_policy != GIMP_DEBUG_POLICY_NEVER &&
+          ! the_errors_gimp->no_interface         &&
+          backtrace_file)
+        {
+          FILE     *fd;
+          gboolean  has_backtrace = TRUE;
+
+          /* If GUI backtrace enabled (it is disabled by default), it
+           * takes precedence over the command line argument.
+           */
+#ifdef G_OS_WIN32
+          const gchar *gimpdebug = "gimp-debug-tool-" GIMP_TOOL_VERSION ".exe";
+#elif defined (PLATFORM_OSX)
+          const gchar *gimpdebug = "gimp-debug-tool-" GIMP_TOOL_VERSION;
+#else
+          const gchar *gimpdebug = LIBEXECDIR "/gimp-debug-tool-" GIMP_TOOL_VERSION;
+#endif
+          gchar *args[9] = { (gchar *) gimpdebug, full_prog_name, NULL,
+                             (gchar *) reason, (gchar *) message,
+                             backtrace_file, the_errors_gimp->config->last_known_release,
+                             NULL, NULL };
+          gchar  pid[16];
+          gchar  timestamp[16];
+
+          g_snprintf (pid, 16, "%u", (guint) getpid ());
+          args[2] = pid;
+
+          g_snprintf (timestamp, 16, "%lu", the_errors_gimp->config->last_release_timestamp);
+          args[7] = timestamp;
+
+#ifndef G_OS_WIN32
+          /* On Win32, the trace has already been processed by ExcHnl
+           * and is waiting for us in a text file.
+           */
+          fd = g_fopen (backtrace_file, "w");
+          has_backtrace = gimp_stack_trace_print ((const gchar *) full_prog_name,
+                                                  fd, NULL);
+          fclose (fd);
+#endif
+
+          /* We don't care about any return value. If it fails, too
+           * bad, we just won't have any stack trace.
+           * We still need to use the sync() variant because we have
+           * to keep GIMP up long enough for the debugger to get its
+           * trace.
+           */
+          if (has_backtrace &&
+              g_file_test (backtrace_file, G_FILE_TEST_IS_REGULAR) &&
+              g_spawn_async (NULL, args, NULL,
+                             G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_STDOUT_TO_DEV_NULL,
+                             NULL, NULL, NULL, NULL))
+            eek_handled = TRUE;
+        }
+#endif /* !GIMP_CONSOLE_COMPILATION */
+
+#ifndef G_OS_WIN32
+      if (! eek_handled)
+        {
+          switch (stack_trace_mode)
+            {
+            case GIMP_STACK_TRACE_NEVER:
+              break;
+
+            case GIMP_STACK_TRACE_QUERY:
+                {
+                  sigset_t sigset;
+
+                  sigemptyset (&sigset);
+                  sigprocmask (SIG_SETMASK, &sigset, NULL);
+
+                  if (the_errors_gimp)
+                    gimp_gui_ungrab (the_errors_gimp);
+
+                  gimp_stack_trace_query ((const gchar *) full_prog_name);
+                }
+              break;
+
+            case GIMP_STACK_TRACE_ALWAYS:
+                {
+                  sigset_t sigset;
+
+                  sigemptyset (&sigset);
+                  sigprocmask (SIG_SETMASK, &sigset, NULL);
+
+                  gimp_stack_trace_print ((const gchar *) full_prog_name,
+                                          stdout, NULL);
+                }
+              break;
+
+            default:
+              break;
+            }
+        }
+#endif /* ! G_OS_WIN32 */
+    }
+#endif /* ! G_OS_WIN32 || HAVE_EXCHNDL */
+
+#if defined (G_OS_WIN32) && ! defined (GIMP_CONSOLE_COMPILATION)
+  /* g_on_error_* don't do anything reasonable on Win32. */
+  if (! eek_handled && ! the_errors_gimp->no_interface)
+    MessageBox (NULL, g_strdup_printf ("%s: %s", reason, message),
+                full_prog_name, MB_OK|MB_ICONERROR);
+#endif
+
+  /* Let's try to back-up all unsaved images!
+   * It is not 100%: when I tested with various bugs created on purpose,
+   * I had cases where saving failed. I am not sure if this is because
+   * of some memory management along the way to XCF saving or some other
+   * messed up state of GIMP, but this is normal not to expect too much
+   * during a crash.
+   * Nevertheless in various test cases, I had successful backups XCF of
+   * the work in progress. Yeah!
+   */
+  if (backup_path)
+    {
+      /* increase the busy counter, so XCF saving calling
+       * gimp_set_busy() and gimp_unset_busy() won't call the GUI
+       * layer and do whatever windowing system calls to set cursors.
+       */
+      the_errors_gimp->busy++;
+
+      /* The index of 'XXX' in backup_path string. */
+      num_idx = strlen (backup_path) - 7;
+
+      iter = gimp_get_image_iter (the_errors_gimp);
+      for (; iter && i < 1000; iter = iter->next)
+        {
+          GimpImage *image = iter->data;
+          GimpItem  *item;
+
+          if (! gimp_image_is_dirty (image))
+            continue;
+
+          item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
+          /* This is a trick because we want to avoid any memory
+           * allocation when the process is abnormally terminated.
+           * We just assume that you'll never have more than 1000 images
+           * open (which is already far fetched).
+           */
+          backup_path[num_idx + 2] = '0' + (i % 10);
+          backup_path[num_idx + 1] = '0' + ((i/10) % 10);
+          backup_path[num_idx]     = '0' + ((i/100) % 10);
+
+          /* Saving. */
+          gimp_pdb_execute_procedure_by_name (the_errors_gimp->pdb,
+                                              gimp_get_user_context (the_errors_gimp),
+                                              NULL, NULL,
+                                              "gimp-xcf-save",
+                                              GIMP_TYPE_INT32, 0,
+                                              GIMP_TYPE_IMAGE_ID,    gimp_image_get_ID (image),
+                                              GIMP_TYPE_DRAWABLE_ID, gimp_item_get_ID (item),
+                                              G_TYPE_STRING,         backup_path,
+                                              G_TYPE_STRING,         backup_path,
+                                              G_TYPE_NONE);
+          i++;
+        }
+    }
+
+  exit (EXIT_FAILURE);
+}
diff --git a/app/errors.h b/app/errors.h
new file mode 100644
index 0000000..0c306da
--- /dev/null
+++ b/app/errors.h
@@ -0,0 +1,39 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ERRORS_H__
+#define __ERRORS_H__
+
+#ifndef GIMP_APP_GLUE_COMPILATION
+#error You must not #include "errors.h" from an app/ subdir
+#endif
+
+
+void    errors_init      (Gimp               *gimp,
+                          const gchar        *full_prog_name,
+                          gboolean            use_debug_handler,
+                          GimpStackTraceMode  stack_trace_mode,
+                          const gchar        *backtrace_file);
+void    errors_exit      (void);
+
+GList * errors_recovered (void);
+
+void    gimp_fatal_error (const gchar        *message) G_GNUC_NORETURN;
+void    gimp_terminate   (const gchar        *message) G_GNUC_NORETURN;
+
+
+#endif /* __ERRORS_H__ */
diff --git a/app/file-data/Makefile.am b/app/file-data/Makefile.am
new file mode 100644
index 0000000..ba0fd57
--- /dev/null
+++ b/app/file-data/Makefile.am
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-File-Data\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappfile-data.a
+
+libappfile_data_a_SOURCES = \
+	file-data.c	\
+	file-data.h	\
+	file-data-gbr.c	\
+	file-data-gbr.h	\
+	file-data-gih.c	\
+	file-data-gih.h	\
+	file-data-pat.c	\
+	file-data-pat.h
diff --git a/app/file-data/Makefile.in b/app/file-data/Makefile.in
new file mode 100644
index 0000000..5f3e362
--- /dev/null
+++ b/app/file-data/Makefile.in
@@ -0,0 +1,934 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/file-data
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappfile_data_a_AR = $(AR) $(ARFLAGS)
+libappfile_data_a_LIBADD =
+am_libappfile_data_a_OBJECTS = file-data.$(OBJEXT) \
+	file-data-gbr.$(OBJEXT) file-data-gih.$(OBJEXT) \
+	file-data-pat.$(OBJEXT)
+libappfile_data_a_OBJECTS = $(am_libappfile_data_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/file-data-gbr.Po \
+	./$(DEPDIR)/file-data-gih.Po ./$(DEPDIR)/file-data-pat.Po \
+	./$(DEPDIR)/file-data.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappfile_data_a_SOURCES)
+DIST_SOURCES = $(libappfile_data_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-File-Data\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappfile-data.a
+libappfile_data_a_SOURCES = \
+	file-data.c	\
+	file-data.h	\
+	file-data-gbr.c	\
+	file-data-gbr.h	\
+	file-data-gih.c	\
+	file-data-gih.h	\
+	file-data-pat.c	\
+	file-data-pat.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/file-data/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/file-data/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappfile-data.a: $(libappfile_data_a_OBJECTS) $(libappfile_data_a_DEPENDENCIES) $(EXTRA_libappfile_data_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappfile-data.a
+	$(AM_V_AR)$(libappfile_data_a_AR) libappfile-data.a $(libappfile_data_a_OBJECTS) $(libappfile_data_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappfile-data.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-data-gbr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-data-gih.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-data-pat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-data.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/file-data-gbr.Po
+	-rm -f ./$(DEPDIR)/file-data-gih.Po
+	-rm -f ./$(DEPDIR)/file-data-pat.Po
+	-rm -f ./$(DEPDIR)/file-data.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/file-data-gbr.Po
+	-rm -f ./$(DEPDIR)/file-data-gih.Po
+	-rm -f ./$(DEPDIR)/file-data-pat.Po
+	-rm -f ./$(DEPDIR)/file-data.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/file-data/file-data-gbr.c b/app/file-data/file-data-gbr.c
new file mode 100644
index 0000000..63d4c0e
--- /dev/null
+++ b/app/file-data/file-data-gbr.c
@@ -0,0 +1,417 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpbrush-load.h"
+#include "core/gimpbrush-private.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-new.h"
+#include "core/gimpimage-resize.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "file-data-gbr.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static GimpImage * file_gbr_brush_to_image (Gimp         *gimp,
+                                            GimpBrush    *brush);
+static GimpBrush * file_gbr_image_to_brush (GimpImage    *image,
+                                            GimpDrawable *drawable,
+                                            const gchar  *name,
+                                            gdouble       spacing);
+
+
+/*  public functions  */
+
+GimpValueArray *
+file_gbr_load_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image = NULL;
+  const gchar    *uri;
+  GFile          *file;
+  GInputStream   *input;
+  GError         *my_error = NULL;
+
+  gimp_set_busy (gimp);
+
+  uri  = g_value_get_string (gimp_value_array_index (args, 1));
+  file = g_file_new_for_uri (uri);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+
+  if (input)
+    {
+      GimpBrush *brush = gimp_brush_load_brush (context, file, input, error);
+
+      if (brush)
+        {
+          image = file_gbr_brush_to_image (gimp, brush);
+          g_object_unref (brush);
+        }
+
+      g_object_unref (input);
+    }
+  else
+    {
+      g_propagate_prefixed_error (error, my_error,
+                                  _("Could not open '%s' for reading: "),
+                                  gimp_file_get_utf8_name (file));
+    }
+
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, image != NULL,
+                                                  error ? *error : NULL);
+
+  if (image)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+GimpValueArray *
+file_gbr_save_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image;
+  GimpDrawable   *drawable;
+  GimpBrush      *brush;
+  const gchar    *uri;
+  const gchar    *name;
+  GFile          *file;
+  gint            spacing;
+  gboolean        success;
+
+  gimp_set_busy (gimp);
+
+  image    = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  uri      = g_value_get_string (gimp_value_array_index (args, 3));
+  spacing  = g_value_get_int (gimp_value_array_index (args, 5));
+  name     = g_value_get_string (gimp_value_array_index (args, 6));
+
+  file = g_file_new_for_uri (uri);
+
+  brush = file_gbr_image_to_brush (image, drawable, name, spacing);
+
+  gimp_data_set_file (GIMP_DATA (brush), file, TRUE, TRUE);
+
+  success = gimp_data_save (GIMP_DATA (brush), error);
+
+  g_object_unref (brush);
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+GimpLayer *
+file_gbr_brush_to_layer (GimpImage *image,
+                         GimpBrush *brush)
+{
+  GimpLayer    *layer;
+  const Babl   *format;
+  gboolean      alpha;
+  gint          width;
+  gint          height;
+  gint          image_width;
+  gint          image_height;
+  GimpTempBuf  *mask;
+  GimpTempBuf  *pixmap;
+  GeglBuffer   *buffer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_BRUSH (brush), NULL);
+
+  mask   = gimp_brush_get_mask   (brush);
+  pixmap = gimp_brush_get_pixmap (brush);
+
+  if (pixmap)
+    alpha = TRUE;
+  else
+    alpha = FALSE;
+
+  width  = gimp_temp_buf_get_width  (mask);
+  height = gimp_temp_buf_get_height (mask);
+
+  image_width  = gimp_image_get_width  (image);
+  image_height = gimp_image_get_height (image);
+
+  if (width > image_width || height > image_height)
+    {
+      gint new_width  = MAX (image_width,  width);
+      gint new_height = MAX (image_height, height);
+
+      gimp_image_resize (image, gimp_get_user_context (image->gimp),
+                         new_width, new_height,
+                         (new_width  - image_width) / 2,
+                         (new_height - image_height) / 2,
+                         NULL);
+
+      image_width  = new_width;
+      image_height = new_height;
+    }
+
+  format = gimp_image_get_layer_format (image, alpha);
+
+  layer = gimp_layer_new (image, width, height, format,
+                          gimp_object_get_name (brush),
+                          1.0, GIMP_LAYER_MODE_NORMAL);
+
+  gimp_item_set_offset (GIMP_ITEM (layer),
+                        (image_width  - width)  / 2,
+                        (image_height - height) / 2);
+
+  buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
+
+  if (pixmap)
+    {
+      guchar *pixmap_data;
+      guchar *mask_data;
+      guchar *p;
+      guchar *m;
+      gint    i;
+
+      gegl_buffer_set (buffer, GEGL_RECTANGLE (0, 0, width, height), 0,
+                       babl_format ("R'G'B' u8"),
+                       gimp_temp_buf_get_data (pixmap), GEGL_AUTO_ROWSTRIDE);
+
+      pixmap_data = gegl_buffer_linear_open (buffer, NULL, NULL, NULL);
+      mask_data   = gimp_temp_buf_get_data (mask);
+
+      for (i = 0, p = pixmap_data, m = mask_data;
+           i < width * height;
+           i++, p += 4, m += 1)
+        {
+          p[3] = *m;
+        }
+
+      gegl_buffer_linear_close (buffer, pixmap_data);
+    }
+  else
+    {
+      guchar *mask_data = gimp_temp_buf_get_data (mask);
+      gint    i;
+
+      for (i = 0; i < width * height; i++)
+        mask_data[i] = 255 - mask_data[i];
+
+      gegl_buffer_set (buffer, GEGL_RECTANGLE (0, 0, width, height), 0,
+                       babl_format ("Y' u8"),
+                       mask_data, GEGL_AUTO_ROWSTRIDE);
+    }
+
+  return layer;
+}
+
+GimpBrush *
+file_gbr_drawable_to_brush (GimpDrawable        *drawable,
+                            const GeglRectangle *rect,
+                            const gchar         *name,
+                            gdouble              spacing)
+{
+  GimpBrush   *brush;
+  GeglBuffer  *buffer;
+  GimpTempBuf *mask;
+  GimpTempBuf *pixmap = NULL;
+  gint         width;
+  gint         height;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (rect != NULL, NULL);
+
+  buffer = gimp_drawable_get_buffer (drawable);
+  width  = rect->width;
+  height = rect->height;
+
+  brush = g_object_new (GIMP_TYPE_BRUSH,
+                        "name",      name,
+                        "mime-type", "image/x-gimp-gbr",
+                        "spacing",   spacing,
+                        NULL);
+
+  mask = gimp_temp_buf_new (width, height, babl_format ("Y u8"));
+
+  if (gimp_drawable_is_gray (drawable))
+    {
+      guchar *m = gimp_temp_buf_get_data (mask);
+      gint    i;
+
+      if (gimp_drawable_has_alpha (drawable))
+        {
+          GeglBufferIterator *iter;
+          GimpRGB             white;
+
+          gimp_rgba_set_uchar (&white, 255, 255, 255, 255);
+
+          iter = gegl_buffer_iterator_new (buffer, rect, 0,
+                                           babl_format ("Y'A u8"),
+                                           GEGL_ACCESS_READ, GEGL_ABYSS_NONE,
+                                           1);
+
+          while (gegl_buffer_iterator_next (iter))
+            {
+              guint8 *data = (guint8 *) iter->items[0].data;
+              gint    j;
+
+              for (j = 0; j < iter->length; j++)
+                {
+                  GimpRGB gray;
+                  gint    x, y;
+                  gint    dest;
+
+                  gimp_rgba_set_uchar (&gray,
+                                       data[0], data[0], data[0],
+                                       data[1]);
+
+                  gimp_rgb_composite (&gray, &white,
+                                      GIMP_RGB_COMPOSITE_BEHIND);
+
+                  x = iter->items[0].roi.x + j % iter->items[0].roi.width;
+                  y = iter->items[0].roi.y + j / iter->items[0].roi.width;
+
+                  dest = y * width + x;
+
+                  gimp_rgba_get_uchar (&gray, &m[dest], NULL, NULL, NULL);
+
+                  data += 2;
+                }
+            }
+        }
+      else
+        {
+          gegl_buffer_get (buffer, rect, 1.0,
+                           babl_format ("Y' u8"), m,
+                           GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+        }
+
+      /*  invert  */
+      for (i = 0; i < width * height; i++)
+        m[i] = 255 - m[i];
+    }
+  else
+    {
+      pixmap = gimp_temp_buf_new (width, height, babl_format ("R'G'B' u8"));
+
+      gegl_buffer_get (buffer, rect, 1.0,
+                       babl_format ("R'G'B' u8"),
+                       gimp_temp_buf_get_data (pixmap),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      gegl_buffer_get (buffer, rect, 1.0,
+                       babl_format ("A u8"),
+                       gimp_temp_buf_get_data (mask),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+    }
+
+
+  brush->priv->mask   = mask;
+  brush->priv->pixmap = pixmap;
+
+  return brush;
+}
+
+
+/*  private functions  */
+
+static GimpImage *
+file_gbr_brush_to_image (Gimp      *gimp,
+                         GimpBrush *brush)
+{
+  GimpImage         *image;
+  GimpLayer         *layer;
+  const gchar       *name;
+  GimpImageBaseType  base_type;
+  gint               width;
+  gint               height;
+  GimpTempBuf       *mask   = gimp_brush_get_mask   (brush);
+  GimpTempBuf       *pixmap = gimp_brush_get_pixmap (brush);
+  GimpParasite      *parasite;
+
+  if (pixmap)
+    base_type = GIMP_RGB;
+  else
+    base_type = GIMP_GRAY;
+
+  name   = gimp_object_get_name (brush);
+  width  = gimp_temp_buf_get_width  (mask);
+  height = gimp_temp_buf_get_height (mask);
+
+  image = gimp_image_new (gimp, width, height, base_type,
+                          GIMP_PRECISION_U8_GAMMA);
+
+  parasite = gimp_parasite_new ("gimp-brush-name",
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (name) + 1, name);
+  gimp_image_parasite_attach (image, parasite, FALSE);
+  gimp_parasite_free (parasite);
+
+  layer = file_gbr_brush_to_layer (image, brush);
+  gimp_image_add_layer (image, layer, NULL, 0, FALSE);
+
+  return image;
+}
+
+static GimpBrush *
+file_gbr_image_to_brush (GimpImage    *image,
+                         GimpDrawable *drawable,
+                         const gchar  *name,
+                         gdouble       spacing)
+{
+  gint width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+  gint height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  return file_gbr_drawable_to_brush (drawable,
+                                     GEGL_RECTANGLE (0, 0, width, height),
+                                     name, spacing);
+}
diff --git a/app/file-data/file-data-gbr.h b/app/file-data/file-data-gbr.h
new file mode 100644
index 0000000..fb3bf47
--- /dev/null
+++ b/app/file-data/file-data-gbr.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_DATA_GBR_H__
+#define __FILE_DATA_GBR_H__
+
+
+GimpValueArray * file_gbr_load_invoker      (GimpProcedure         *procedure,
+                                             Gimp                  *gimp,
+                                             GimpContext           *context,
+                                             GimpProgress          *progress,
+                                             const GimpValueArray  *args,
+                                             GError               **error);
+
+GimpValueArray * file_gbr_save_invoker      (GimpProcedure         *procedure,
+                                             Gimp                  *gimp,
+                                             GimpContext           *context,
+                                             GimpProgress          *progress,
+                                             const GimpValueArray  *args,
+                                             GError               **error);
+
+GimpLayer      * file_gbr_brush_to_layer    (GimpImage             *image,
+                                             GimpBrush             *brush);
+GimpBrush      * file_gbr_drawable_to_brush (GimpDrawable          *drawable,
+                                             const GeglRectangle   *rect,
+                                             const gchar           *name,
+                                             gdouble                spacing);
+
+
+#endif /* __FILE_DATA_GBR_H__ */
diff --git a/app/file-data/file-data-gih.c b/app/file-data/file-data-gih.c
new file mode 100644
index 0000000..d28e521
--- /dev/null
+++ b/app/file-data/file-data-gih.c
@@ -0,0 +1,364 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpparasiteio.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrushpipe.h"
+#include "core/gimpbrushpipe-load.h"
+#include "core/gimpbrush-private.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-new.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "file-data-gbr.h"
+#include "file-data-gih.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static GimpImage     * file_gih_pipe_to_image (Gimp          *gimp,
+                                               GimpBrushPipe *pipe);
+static GimpBrushPipe * file_gih_image_to_pipe (GimpImage     *image,
+                                               const gchar   *name,
+                                               gdouble        spacing,
+                                               const gchar   *paramstring);
+
+
+/*  public functions  */
+
+GimpValueArray *
+file_gih_load_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image = NULL;
+  const gchar    *uri;
+  GFile          *file;
+  GInputStream   *input;
+  GError         *my_error = NULL;
+
+  gimp_set_busy (gimp);
+
+  uri  = g_value_get_string (gimp_value_array_index (args, 1));
+  file = g_file_new_for_uri (uri);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+
+  if (input)
+    {
+      GList *list = gimp_brush_pipe_load (context, file, input, error);
+
+      if (list)
+        {
+          GimpBrushPipe *pipe = list->data;
+
+          g_list_free (list);
+
+          image = file_gih_pipe_to_image (gimp, pipe);
+          g_object_unref (pipe);
+        }
+
+      g_object_unref (input);
+    }
+  else
+    {
+      g_propagate_prefixed_error (error, my_error,
+                                  _("Could not open '%s' for reading: "),
+                                  gimp_file_get_utf8_name (file));
+    }
+
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, image != NULL,
+                                                  error ? *error : NULL);
+
+  if (image)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+GimpValueArray *
+file_gih_save_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image;
+  GimpBrushPipe  *pipe;
+  const gchar    *uri;
+  const gchar    *name;
+  const gchar    *params;
+  GFile          *file;
+  gint            spacing;
+  gboolean        success;
+
+  gimp_set_busy (gimp);
+
+  image   = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  uri     = g_value_get_string (gimp_value_array_index (args, 3));
+  spacing = g_value_get_int (gimp_value_array_index (args, 5));
+  name    = g_value_get_string (gimp_value_array_index (args, 6));
+  params  = g_value_get_string (gimp_value_array_index (args, 7));
+
+  file = g_file_new_for_uri (uri);
+
+  pipe = file_gih_image_to_pipe (image, name, spacing, params);
+
+  gimp_data_set_file (GIMP_DATA (pipe), file, TRUE, TRUE);
+
+  success = gimp_data_save (GIMP_DATA (pipe), error);
+
+  g_object_unref (pipe);
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+
+/*  private functions  */
+
+static GimpImage *
+file_gih_pipe_to_image (Gimp          *gimp,
+                        GimpBrushPipe *pipe)
+{
+  GimpImage         *image;
+  const gchar       *name;
+  GimpImageBaseType  base_type;
+  GimpParasite      *parasite;
+  gchar              spacing[8];
+  gint               i;
+
+  if (gimp_brush_get_pixmap (pipe->current))
+    base_type = GIMP_RGB;
+  else
+    base_type = GIMP_GRAY;
+
+  name = gimp_object_get_name (pipe);
+
+  image = gimp_image_new (gimp, 1, 1, base_type,
+                          GIMP_PRECISION_U8_GAMMA);
+
+  parasite = gimp_parasite_new ("gimp-brush-pipe-name",
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (name) + 1, name);
+  gimp_image_parasite_attach (image, parasite, FALSE);
+  gimp_parasite_free (parasite);
+
+  g_snprintf (spacing, sizeof (spacing), "%d",
+              gimp_brush_get_spacing (GIMP_BRUSH (pipe)));
+
+  parasite = gimp_parasite_new ("gimp-brush-pipe-spacing",
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (spacing) + 1, spacing);
+  gimp_image_parasite_attach (image, parasite, FALSE);
+  gimp_parasite_free (parasite);
+
+  for (i = 0; i < pipe->n_brushes; i++)
+    {
+      GimpLayer *layer;
+
+      layer = file_gbr_brush_to_layer (image, pipe->brushes[i]);
+      gimp_image_add_layer (image, layer, NULL, i, FALSE);
+    }
+
+  if (pipe->params)
+    {
+      GimpPixPipeParams  params;
+      gchar             *paramstring;
+
+      /* Since we do not (yet) load the pipe as described in the
+       * header, but use one layer per brush, we have to alter the
+       * paramstring before attaching it as a parasite.
+       *
+       * (this comment copied over from file-gih, whatever "as
+       * described in the header" means) -- mitch
+       */
+
+      gimp_pixpipe_params_init (&params);
+      gimp_pixpipe_params_parse (pipe->params, &params);
+
+      params.cellwidth  = gimp_image_get_width  (image);
+      params.cellheight = gimp_image_get_height (image);
+      params.cols       = 1;
+      params.rows       = 1;
+
+      paramstring = gimp_pixpipe_params_build (&params);
+      if (paramstring)
+        {
+          parasite = gimp_parasite_new ("gimp-brush-pipe-parameters",
+                                        GIMP_PARASITE_PERSISTENT,
+                                        strlen (paramstring) + 1,
+                                        paramstring);
+          gimp_image_parasite_attach (image, parasite, FALSE);
+          gimp_parasite_free (parasite);
+          g_free (paramstring);
+        }
+    }
+
+  return image;
+}
+
+static GimpBrushPipe *
+file_gih_image_to_pipe (GimpImage   *image,
+                        const gchar *name,
+                        gdouble      spacing,
+                        const gchar *paramstring)
+{
+  GimpBrushPipe     *pipe;
+  GimpPixPipeParams  params;
+  GList             *layers;
+  GList             *list;
+  GList             *brushes = NULL;
+  gint               image_width;
+  gint               image_height;
+  gint               i;
+
+  pipe = g_object_new (GIMP_TYPE_BRUSH_PIPE,
+                       "name",      name,
+                       "mime-type", "image/x-gimp-gih",
+                       "spacing",   spacing,
+                       NULL);
+
+  gimp_pixpipe_params_init (&params);
+  gimp_pixpipe_params_parse (paramstring, &params);
+
+  image_width  = gimp_image_get_width  (image);
+  image_height = gimp_image_get_height (image);
+
+  layers = gimp_image_get_layer_iter (image);
+
+  for (list = layers; list; list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+      gint       width;
+      gint       height;
+      gint       offset_x;
+      gint       offset_y;
+      gint       row;
+
+      width  = gimp_item_get_width  (GIMP_ITEM (layer));
+      height = gimp_item_get_height (GIMP_ITEM (layer));
+
+      gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+
+      /* Since we assume positive layer offsets we need to make sure this
+       * is always the case or we will crash for grayscale layers.
+       * See issue #6436. */
+      if (offset_x < 0)
+        {
+          g_warning (_("Negative x offset: %d for layer %s corrected."),
+                     offset_x, gimp_object_get_name (layer));
+          width += offset_x;
+          offset_x = 0;
+        }
+      if (offset_y < 0)
+        {
+          g_warning (_("Negative y offset: %d for layer %s corrected."),
+                     offset_y, gimp_object_get_name (layer));
+          height += offset_y;
+          offset_y = 0;
+        }
+
+      for (row = 0; row < params.rows; row++)
+        {
+          gint y, ynext;
+          gint thisy, thish;
+          gint col;
+
+          y     = (row * image_height) / params.rows;
+          ynext = ((row + 1) * image_height / params.rows);
+
+          /* Assume layer is offset to positive direction in x and y.
+           * That's reasonable, as otherwise all of the layer
+           * won't be visible.
+           * thisy and thisx are in the drawable's coordinate space.
+           */
+          thisy = MAX (0, y - offset_y);
+          thish = (ynext - offset_y) - thisy;
+          thish = MIN (thish, height - thisy);
+
+          for (col = 0; col < params.cols; col++)
+            {
+              GimpBrush *brush;
+              gint       x, xnext;
+              gint       thisx, thisw;
+
+              x     = (col * image_width / params.cols);
+              xnext = ((col + 1) * image_width / params.cols);
+              thisx = MAX (0, x - offset_x);
+              thisw = (xnext - offset_x) - thisx;
+              thisw = MIN (thisw, width - thisx);
+
+              brush = file_gbr_drawable_to_brush (GIMP_DRAWABLE (layer),
+                                                  GEGL_RECTANGLE (thisx, thisy,
+                                                                  thisw, thish),
+                                                  gimp_object_get_name (layer),
+                                                  spacing);
+
+              brushes = g_list_prepend (brushes, brush);
+            }
+        }
+    }
+
+  brushes = g_list_reverse (brushes);
+
+  pipe->n_brushes = g_list_length (brushes);
+  pipe->brushes   = g_new0 (GimpBrush *, pipe->n_brushes);
+
+  for (list = brushes, i = 0; list; list = g_list_next (list), i++)
+    pipe->brushes[i] = list->data;
+
+  g_list_free (brushes);
+
+  gimp_pixpipe_params_free (&params);
+
+  gimp_brush_pipe_set_params (pipe, paramstring);
+
+  return pipe;
+}
diff --git a/app/file-data/file-data-gih.h b/app/file-data/file-data-gih.h
new file mode 100644
index 0000000..877e4a5
--- /dev/null
+++ b/app/file-data/file-data-gih.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_DATA_GIH_H__
+#define __FILE_DATA_GIH_H__
+
+
+GimpValueArray * file_gih_load_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error);
+
+GimpValueArray * file_gih_save_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error);
+
+
+#endif /* __FILE_DATA_GIH_H__ */
diff --git a/app/file-data/file-data-pat.c b/app/file-data/file-data-pat.c
new file mode 100644
index 0000000..21506fe
--- /dev/null
+++ b/app/file-data/file-data-pat.c
@@ -0,0 +1,263 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-new.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppattern.h"
+#include "core/gimppattern-load.h"
+#include "core/gimptempbuf.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "file-data-pat.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static GimpImage   * file_pat_pattern_to_image (Gimp         *gimp,
+                                                GimpPattern  *pattern);
+static GimpPattern * file_pat_image_to_pattern (GimpImage    *image,
+                                                GimpDrawable *drawable,
+                                                const gchar  *name);
+
+
+/*  public functions  */
+
+GimpValueArray *
+file_pat_load_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image = NULL;
+  const gchar    *uri;
+  GFile          *file;
+  GInputStream   *input;
+  GError         *my_error = NULL;
+
+  gimp_set_busy (gimp);
+
+  uri  = g_value_get_string (gimp_value_array_index (args, 1));
+  file = g_file_new_for_uri (uri);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+
+  if (input)
+    {
+      GList *list = gimp_pattern_load (context, file, input, error);
+
+      if (list)
+        {
+          GimpPattern *pattern = list->data;
+
+          g_list_free (list);
+
+          image = file_pat_pattern_to_image (gimp, pattern);
+          g_object_unref (pattern);
+        }
+
+      g_object_unref (input);
+    }
+  else
+    {
+      g_propagate_prefixed_error (error, my_error,
+                                  _("Could not open '%s' for reading: "),
+                                  gimp_file_get_utf8_name (file));
+    }
+
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, image != NULL,
+                                                  error ? *error : NULL);
+
+  if (image)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+GimpValueArray *
+file_pat_save_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image;
+  GimpDrawable   *drawable;
+  GimpPattern    *pattern;
+  const gchar    *uri;
+  const gchar    *name;
+  GFile          *file;
+  gboolean        success;
+
+  gimp_set_busy (gimp);
+
+  image    = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  uri      = g_value_get_string (gimp_value_array_index (args, 3));
+  name     = g_value_get_string (gimp_value_array_index (args, 5));
+
+  file = g_file_new_for_uri (uri);
+
+  pattern = file_pat_image_to_pattern (image, drawable, name);
+
+  gimp_data_set_file (GIMP_DATA (pattern), file, TRUE, TRUE);
+
+  success = gimp_data_save (GIMP_DATA (pattern), error);
+
+  g_object_unref (pattern);
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+
+/*  private functions  */
+
+static GimpImage *
+file_pat_pattern_to_image (Gimp        *gimp,
+                           GimpPattern *pattern)
+{
+  GimpImage         *image;
+  GimpLayer         *layer;
+  const Babl        *format;
+  const gchar       *name;
+  GimpImageBaseType  base_type;
+  gboolean           alpha;
+  gint               width;
+  gint               height;
+  GimpTempBuf       *mask   = gimp_pattern_get_mask (pattern);
+  GeglBuffer        *buffer;
+  GimpParasite      *parasite;
+
+  format = gimp_temp_buf_get_format (mask);
+
+  switch (babl_format_get_bytes_per_pixel (format))
+    {
+    case 1:
+      base_type = GIMP_GRAY;
+      alpha     = FALSE;
+      break;
+
+    case 2:
+      base_type = GIMP_GRAY;
+      alpha     = TRUE;
+      break;
+
+    case 3:
+      base_type = GIMP_RGB;
+      alpha     = FALSE;
+      break;
+
+    case 4:
+      base_type = GIMP_RGB;
+      alpha     = TRUE;
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+
+  name   = gimp_object_get_name (pattern);
+  width  = gimp_temp_buf_get_width  (mask);
+  height = gimp_temp_buf_get_height (mask);
+
+  image = gimp_image_new (gimp, width, height, base_type,
+                          GIMP_PRECISION_U8_GAMMA);
+
+  parasite = gimp_parasite_new ("gimp-pattern-name",
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (name) + 1, name);
+  gimp_image_parasite_attach (image, parasite, FALSE);
+  gimp_parasite_free (parasite);
+
+  format = gimp_image_get_layer_format (image, alpha);
+
+  layer = gimp_layer_new (image, width, height, format, name,
+                          1.0, GIMP_LAYER_MODE_NORMAL);
+  gimp_image_add_layer (image, layer, NULL, 0, FALSE);
+
+  buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
+
+  gegl_buffer_set (buffer, GEGL_RECTANGLE (0, 0, width, height), 0,
+                   NULL,
+                   gimp_temp_buf_get_data (mask), GEGL_AUTO_ROWSTRIDE);
+
+  return image;
+}
+
+static GimpPattern *
+file_pat_image_to_pattern (GimpImage    *image,
+                           GimpDrawable *drawable,
+                           const gchar  *name)
+{
+  GimpPattern *pattern;
+  const Babl  *format;
+  gint         width;
+  gint         height;
+
+  format = gimp_babl_format (gimp_drawable_is_gray (drawable) ?
+                             GIMP_GRAY : GIMP_RGB,
+                             GIMP_PRECISION_U8_GAMMA,
+                             gimp_drawable_has_alpha (drawable));
+
+  width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+  height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  pattern = g_object_new (GIMP_TYPE_PATTERN,
+                          "name",      name,
+                          "mime-type", "image/x-gimp-pat",
+                          NULL);
+
+  pattern->mask = gimp_temp_buf_new (width, height, format);
+
+  gegl_buffer_get (gimp_drawable_get_buffer (drawable),
+                   GEGL_RECTANGLE (0, 0, width, height), 1.0,
+                   format, gimp_temp_buf_get_data (pattern->mask),
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  return pattern;
+}
diff --git a/app/file-data/file-data-pat.h b/app/file-data/file-data-pat.h
new file mode 100644
index 0000000..1417139
--- /dev/null
+++ b/app/file-data/file-data-pat.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_DATA_PAT_H__
+#define __FILE_DATA_PAT_H__
+
+
+GimpValueArray * file_pat_load_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error);
+
+GimpValueArray * file_pat_save_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error);
+
+
+#endif /* __FILE_DATA_PAT_H__ */
diff --git a/app/file-data/file-data.c b/app/file-data/file-data.c
new file mode 100644
index 0000000..411d2ca
--- /dev/null
+++ b/app/file-data/file-data.c
@@ -0,0 +1,503 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "file-data.h"
+#include "file-data-gbr.h"
+#include "file-data-gih.h"
+#include "file-data-pat.h"
+
+#include "gimp-intl.h"
+
+
+void
+file_data_init (Gimp *gimp)
+{
+  GimpPlugInProcedure *proc;
+  GFile               *file;
+  GimpProcedure       *procedure;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /*  file-gbr-load  */
+  file = g_file_new_for_path ("file-gbr-load");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = file_gbr_load_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP brush"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-brush",
+                                   strlen ("gimp-brush") + 1);
+  gimp_plug_in_procedure_set_image_types (proc, NULL);
+  gimp_plug_in_procedure_set_file_proc (proc, "gbr, gbp", "",
+                                        "20, string, GIMP");
+  gimp_plug_in_procedure_set_mime_types (proc, "image/gimp-x-gbr");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "file-gbr-load");
+  gimp_procedure_set_static_strings (procedure,
+                                     "file-gbr-load",
+                                     "Loads GIMP brushes",
+                                     "Loads GIMP brushes (1 or 4 bpp "
+                                     "and old .gpb format)",
+                                     "Tim Newsome, Jens Lautenbacher, "
+                                     "Sven Neumann, Michael Natterer",
+                                     "Tim Newsome, Jens Lautenbacher, "
+                                     "Sven Neumann, Michael Natterer",
+                                     "1995-2019",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "URI",
+                                                       "The URI of the file "
+                                                       "to load",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-uri",
+                                                       "Raw URI",
+                                                       "The URI of the file "
+                                                       "to load",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "Image",
+                                                             "Output image",
+                                                             gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+
+  /*  file-gbr-save-internal  */
+  file = g_file_new_for_path ("file-gbr-save-internal");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = file_gbr_save_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP brush"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-brush",
+                                   strlen ("gimp-brush") + 1);
+
+#if 0
+  /* do not register as file procedure */
+  gimp_plug_in_procedure_set_image_types (proc, "RGB*, GRAY*, INDEXED*");
+  gimp_plug_in_procedure_set_file_proc (proc, "gbr", "", NULL);
+  gimp_plug_in_procedure_set_mime_types (proc, "image/x-gimp-gbr");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+#endif
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "file-gbr-save-internal");
+  gimp_procedure_set_static_strings (procedure,
+                                     "file-gbr-save-internal",
+                                     "Exports Gimp brush file (.GBR)",
+                                     "Exports Gimp brush file (.GBR)",
+                                     "Tim Newsome, Michael Natterer",
+                                     "Tim Newsome, Michael Natterer",
+                                     "1995-2019",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "Image",
+                                                         "Input image",
+                                                         gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "Drawable",
+                                                            "Active drawable "
+                                                            "of input image",
+                                                            gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "URI",
+                                                       "The URI of the file "
+                                                       "to export",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-uri",
+                                                       "Raw URI",
+                                                       "The URI of the file "
+                                                       "to export",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spacing",
+                                                      "spacing",
+                                                      "Spacing of the brush",
+                                                      1, 1000, 10,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the "
+                                                       "brush",
+                                                       FALSE, FALSE, TRUE,
+                                                       "GIMP Brush",
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+
+  /*  file-gih-load  */
+  file = g_file_new_for_path ("file-gih-load");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = file_gih_load_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP brush (animated)"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-brush",
+                                   strlen ("gimp-brush") + 1);
+  gimp_plug_in_procedure_set_image_types (proc, NULL);
+  gimp_plug_in_procedure_set_file_proc (proc, "gih", "", "");
+  gimp_plug_in_procedure_set_mime_types (proc, "image/gimp-x-gih");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "file-gih-load");
+  gimp_procedure_set_static_strings (procedure,
+                                     "file-gih-load",
+                                     "Loads GIMP animated brushes",
+                                     "This procedure loads a GIMP brush "
+                                     "pipe as an image.",
+                                     "Tor Lillqvist, Michael Natterer",
+                                     "Tor Lillqvist, Michael Natterer",
+                                     "1999-2019",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "URI",
+                                                       "The URI of the file "
+                                                       "to load",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-uri",
+                                                       "Raw URI",
+                                                       "The URI of the file "
+                                                       "to load",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "Image",
+                                                             "Output image",
+                                                             gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+
+  /*  file-gih-save-internal  */
+  file = g_file_new_for_path ("file-gih-save-internal");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = file_gih_save_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP brush (animated)"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-brush",
+                                   strlen ("gimp-brush") + 1);
+
+#if 0
+  /* do not register as file procedure */
+  gimp_plug_in_procedure_set_image_types (proc, "RGB*, GRAY*, INDEXED*");
+  gimp_plug_in_procedure_set_file_proc (proc, "gih", "", NULL);
+  gimp_plug_in_procedure_set_mime_types (proc, "image/x-gimp-gih");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+#endif
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "file-gih-save-internal");
+  gimp_procedure_set_static_strings (procedure,
+                                     "file-gih-save-internal",
+                                     "Exports Gimp animated brush file (.gih)",
+                                     "Exports Gimp animated brush file (.gih)",
+                                     "Tor Lillqvist, Michael Natterer",
+                                     "Tor Lillqvist, Michael Natterer",
+                                     "1999-2019",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "Image",
+                                                         "Input image",
+                                                         gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "Drawable",
+                                                            "Active drawable "
+                                                            "of input image",
+                                                            gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "URI",
+                                                       "The URI of the file "
+                                                       "to export",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-uri",
+                                                       "Raw URI",
+                                                       "The URI of the file "
+                                                       "to export",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spacing",
+                                                      "spacing",
+                                                      "Spacing of the brush",
+                                                      1, 1000, 10,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the "
+                                                       "brush",
+                                                       FALSE, FALSE, TRUE,
+                                                       "GIMP Brush",
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("params",
+                                                       "params",
+                                                       "The pipe's parameters",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+
+  /*  file-pat-load  */
+  file = g_file_new_for_path ("file-pat-load");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = file_pat_load_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP pattern"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-pattern",
+                                   strlen ("gimp-pattern") + 1);
+  gimp_plug_in_procedure_set_image_types (proc, NULL);
+  gimp_plug_in_procedure_set_file_proc (proc, "pat", "",
+                                        "20,string,GPAT");
+  gimp_plug_in_procedure_set_mime_types (proc, "image/gimp-x-pat");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "file-pat-load");
+  gimp_procedure_set_static_strings (procedure,
+                                     "file-pat-load",
+                                     "Loads GIMP patterns",
+                                     "Loads GIMP patterns",
+                                     "Tim Newsome, Michael Natterer",
+                                     "Tim Newsome, Michael Natterer",
+                                     "1997-2019",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "URI",
+                                                       "The URI of the file "
+                                                       "to load",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-uri",
+                                                       "Raw URI",
+                                                       "The URI of the file "
+                                                       "to load",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "Image",
+                                                             "Output image",
+                                                             gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+
+  /*  file-pat-save-internal  */
+  file = g_file_new_for_path ("file-pat-save-internal");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = file_pat_save_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP pattern"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-pattern",
+                                   strlen ("gimp-pattern") + 1);
+
+#if 0
+  /* do not register as file procedure */
+  gimp_plug_in_procedure_set_image_types (proc, "RGB*, GRAY*, INDEXED*");
+  gimp_plug_in_procedure_set_file_proc (proc, "pat", "", NULL);
+  gimp_plug_in_procedure_set_mime_types (proc, "image/x-gimp-pat");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+#endif
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "file-pat-save-internal");
+  gimp_procedure_set_static_strings (procedure,
+                                     "file-pat-save-internal",
+                                     "Exports Gimp pattern file (.PAT)",
+                                     "Exports Gimp pattern file (.PAT)",
+                                     "Tim Newsome, Michael Natterer",
+                                     "Tim Newsome, Michael Natterer",
+                                     "1995-2019",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "Image",
+                                                         "Input image",
+                                                         gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "Drawable",
+                                                            "Active drawable "
+                                                            "of input image",
+                                                            gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "URI",
+                                                       "The URI of the file "
+                                                       "to export",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-uri",
+                                                       "Raw URI",
+                                                       "The URI of the file "
+                                                       "to export",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the "
+                                                       "pattern",
+                                                       FALSE, FALSE, TRUE,
+                                                       "GIMP Pattern",
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+}
+
+void
+file_data_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+}
diff --git a/app/file-data/file-data.h b/app/file-data/file-data.h
new file mode 100644
index 0000000..a36381d
--- /dev/null
+++ b/app/file-data/file-data.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_DATA_H__
+#define __FILE_DATA_H__
+
+
+void   file_data_init (Gimp *gimp);
+void   file_data_exit (Gimp *gimp);
+
+
+#endif /* __FILE_DATA_H__ */
diff --git a/app/file/Makefile.am b/app/file/Makefile.am
new file mode 100644
index 0000000..90b107f
--- /dev/null
+++ b/app/file/Makefile.am
@@ -0,0 +1,26 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-File\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappfile.a
+
+libappfile_a_SOURCES = \
+	file-import.c	\
+	file-import.h	\
+	file-open.c	\
+	file-open.h	\
+	file-remote.c	\
+	file-remote.h	\
+	file-save.c	\
+	file-save.h	\
+	file-utils.c	\
+	file-utils.h	\
+	gimp-file.h
diff --git a/app/file/Makefile.in b/app/file/Makefile.in
new file mode 100644
index 0000000..74a398e
--- /dev/null
+++ b/app/file/Makefile.in
@@ -0,0 +1,938 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/file
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappfile_a_AR = $(AR) $(ARFLAGS)
+libappfile_a_LIBADD =
+am_libappfile_a_OBJECTS = file-import.$(OBJEXT) file-open.$(OBJEXT) \
+	file-remote.$(OBJEXT) file-save.$(OBJEXT) file-utils.$(OBJEXT)
+libappfile_a_OBJECTS = $(am_libappfile_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/file-import.Po \
+	./$(DEPDIR)/file-open.Po ./$(DEPDIR)/file-remote.Po \
+	./$(DEPDIR)/file-save.Po ./$(DEPDIR)/file-utils.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappfile_a_SOURCES)
+DIST_SOURCES = $(libappfile_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-File\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappfile.a
+libappfile_a_SOURCES = \
+	file-import.c	\
+	file-import.h	\
+	file-open.c	\
+	file-open.h	\
+	file-remote.c	\
+	file-remote.h	\
+	file-save.c	\
+	file-save.h	\
+	file-utils.c	\
+	file-utils.h	\
+	gimp-file.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/file/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/file/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappfile.a: $(libappfile_a_OBJECTS) $(libappfile_a_DEPENDENCIES) $(EXTRA_libappfile_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappfile.a
+	$(AM_V_AR)$(libappfile_a_AR) libappfile.a $(libappfile_a_OBJECTS) $(libappfile_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappfile.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-import.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-open.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-remote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-utils.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/file-import.Po
+	-rm -f ./$(DEPDIR)/file-open.Po
+	-rm -f ./$(DEPDIR)/file-remote.Po
+	-rm -f ./$(DEPDIR)/file-save.Po
+	-rm -f ./$(DEPDIR)/file-utils.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/file-import.Po
+	-rm -f ./$(DEPDIR)/file-open.Po
+	-rm -f ./$(DEPDIR)/file-remote.Po
+	-rm -f ./$(DEPDIR)/file-save.Po
+	-rm -f ./$(DEPDIR)/file-utils.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/file/file-import.c b/app/file/file-import.c
new file mode 100644
index 0000000..f5e9baf
--- /dev/null
+++ b/app/file/file-import.c
@@ -0,0 +1,109 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * file-import.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "core/core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpimage-convert-precision.h"
+#include "core/gimplayer.h"
+#include "core/gimpprogress.h"
+
+#include "text/gimptextlayer.h"
+
+#include "file-import.h"
+
+
+/*  public functions  */
+
+void
+file_import_image (GimpImage    *image,
+                   GimpContext  *context,
+                   GFile        *file,
+                   gboolean      interactive,
+                   GimpProgress *progress)
+{
+  GimpCoreConfig *config;
+
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  config = image->gimp->config;
+
+  if (interactive && gimp_image_get_base_type (image) != GIMP_INDEXED)
+    {
+      if (config->import_promote_float)
+        {
+          GimpPrecision old_precision = gimp_image_get_precision (image);
+
+          if (old_precision != GIMP_PRECISION_FLOAT_LINEAR)
+            {
+              gimp_image_convert_precision (image,
+                                            GIMP_PRECISION_FLOAT_LINEAR,
+                                            GEGL_DITHER_NONE,
+                                            GEGL_DITHER_NONE,
+                                            GEGL_DITHER_NONE,
+                                            progress);
+
+              if (config->import_promote_dither &&
+                  old_precision == GIMP_PRECISION_U8_GAMMA)
+                {
+                  gimp_image_convert_dither_u8 (image, progress);
+                }
+            }
+        }
+
+      if (config->import_add_alpha)
+        {
+          GList *layers = gimp_image_get_layer_list (image);
+          GList *list;
+
+          for (list = layers; list; list = g_list_next (list))
+            {
+              if (! gimp_viewable_get_children (list->data) &&
+                  ! gimp_item_is_text_layer (list->data)    &&
+                  ! gimp_drawable_has_alpha (list->data))
+                {
+                  gimp_layer_add_alpha (list->data);
+                }
+            }
+
+          g_list_free (layers);
+        }
+    }
+
+  gimp_image_import_color_profile (image, context, progress, interactive);
+
+  /* Remember the import source */
+  gimp_image_set_imported_file (image, file);
+
+  /* We shall treat this file as an Untitled file */
+  gimp_image_set_file (image, NULL);
+}
diff --git a/app/file/file-import.h b/app/file/file-import.h
new file mode 100644
index 0000000..d23eff6
--- /dev/null
+++ b/app/file/file-import.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * file-import.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_IMPORT_H__
+#define __FILE_IMPORT_H__
+
+
+void   file_import_image (GimpImage    *image,
+                          GimpContext  *context,
+                          GFile        *file,
+                          gboolean      interactive,
+                          GimpProgress *progress);
+
+
+#endif /* __FILE_IMPORT_H__ */
diff --git a/app/file/file-open.c b/app/file/file-open.c
new file mode 100644
index 0000000..b3ae129
--- /dev/null
+++ b/app/file/file-open.c
@@ -0,0 +1,833 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * file-open.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdocumentlist.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-merge.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimagefile.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimppdb.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "file-import.h"
+#include "file-open.h"
+#include "file-remote.h"
+#include "gimp-file.h"
+
+#include "gimp-intl.h"
+
+
+static void     file_open_sanitize_image       (GimpImage           *image,
+                                                gboolean             as_new);
+static void     file_open_convert_items        (GimpImage           *dest_image,
+                                                const gchar         *basename,
+                                                GList               *items);
+static GList *  file_open_get_layers           (GimpImage           *image,
+                                                gboolean             merge_visible,
+                                                gint                *n_visible);
+static gboolean file_open_file_proc_is_import  (GimpPlugInProcedure *file_proc);
+
+
+/*  public functions  */
+
+GimpImage *
+file_open_image (Gimp                *gimp,
+                 GimpContext         *context,
+                 GimpProgress        *progress,
+                 GFile               *file,
+                 GFile               *entered_file,
+                 gboolean             as_new,
+                 GimpPlugInProcedure *file_proc,
+                 GimpRunMode          run_mode,
+                 GimpPDBStatusType   *status,
+                 const gchar        **mime_type,
+                 GError             **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image       = NULL;
+  GFile          *local_file  = NULL;
+  gchar          *path        = NULL;
+  gchar          *entered_uri = NULL;
+  gboolean        mounted     = TRUE;
+  GError         *my_error    = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_FILE (entered_file), NULL);
+  g_return_val_if_fail (status != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  *status = GIMP_PDB_EXECUTION_ERROR;
+
+  if (! g_file_is_native (file) &&
+      ! file_remote_mount_file (gimp, file, progress, &my_error))
+    {
+      if (my_error)
+        {
+          g_printerr ("%s: mounting remote volume failed, trying to download"
+                      "the file: %s\n",
+                      G_STRFUNC, my_error->message);
+          g_clear_error (&my_error);
+
+          mounted = FALSE;
+        }
+      else
+        {
+          *status = GIMP_PDB_CANCEL;
+
+          return NULL;
+        }
+    }
+
+  /* FIXME enable these tests for remote files again, needs testing */
+  if (g_file_is_native (file) &&
+      g_file_query_exists (file, NULL))
+    {
+      GFileInfo *info;
+
+      info = g_file_query_info (file,
+                                G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                G_FILE_ATTRIBUTE_ACCESS_CAN_READ,
+                                G_FILE_QUERY_INFO_NONE,
+                                NULL, error);
+      if (! info)
+        return NULL;
+
+      if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR)
+        {
+          g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Not a regular file"));
+          g_object_unref (info);
+          return NULL;
+        }
+
+      if (! g_file_info_get_attribute_boolean (info,
+                                               G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
+        {
+          g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Permission denied"));
+          g_object_unref (info);
+          return NULL;
+        }
+
+      g_object_unref (info);
+    }
+
+  if (! file_proc)
+    file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                          GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                          file, error);
+
+  if (! file_proc || ! file_proc->handles_uri || ! mounted)
+    {
+      gchar *my_path = g_file_get_path (file);
+
+      if (! my_path)
+        {
+          g_clear_error (error);
+
+          local_file = file_remote_download_image (gimp, file, progress,
+                                                   &my_error);
+
+          if (! local_file)
+            {
+              if (my_error)
+                g_propagate_error (error, my_error);
+              else
+                *status = GIMP_PDB_CANCEL;
+
+              return NULL;
+            }
+
+          /*  if we don't have a file proc yet, try again on the local
+           *  file
+           */
+          if (! file_proc)
+            file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                                  GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                                  local_file, error);
+        }
+
+      g_free (my_path);
+    }
+
+  if (! file_proc)
+    {
+      if (local_file)
+        {
+          g_file_delete (local_file, NULL, NULL);
+          g_object_unref (local_file);
+        }
+
+      return NULL;
+    }
+
+  if (file_proc->handles_uri)
+    path = g_file_get_uri (local_file ? local_file : file);
+  else
+    path = g_file_get_path (local_file ? local_file : file);
+
+  entered_uri = g_file_get_uri (entered_file);
+
+  if (! entered_uri)
+    entered_uri = g_strdup (path);
+
+  if (progress)
+    g_object_add_weak_pointer (G_OBJECT (progress), (gpointer) &progress);
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name (gimp->pdb,
+                                        context, progress, error,
+                                        gimp_object_get_name (file_proc),
+                                        GIMP_TYPE_INT32, run_mode,
+                                        G_TYPE_STRING,   path,
+                                        G_TYPE_STRING,   entered_uri,
+                                        G_TYPE_NONE);
+
+  if (progress)
+    g_object_remove_weak_pointer (G_OBJECT (progress), (gpointer) &progress);
+
+  g_free (path);
+  g_free (entered_uri);
+
+  *status = g_value_get_enum (gimp_value_array_index (return_vals, 0));
+
+  if (*status == GIMP_PDB_SUCCESS)
+    image = gimp_value_get_image (gimp_value_array_index (return_vals, 1),
+                                  gimp);
+
+  if (local_file)
+    {
+      if (image)
+        gimp_image_set_file (image, file);
+
+      g_file_delete (local_file, NULL, NULL);
+      g_object_unref (local_file);
+    }
+
+  if (*status == GIMP_PDB_SUCCESS)
+    {
+      if (image)
+        {
+          /* Only set the load procedure if it hasn't already been set. */
+          if (! gimp_image_get_load_proc (image))
+            gimp_image_set_load_proc (image, file_proc);
+
+          file_proc = gimp_image_get_load_proc (image);
+
+          if (mime_type)
+            *mime_type = g_slist_nth_data (file_proc->mime_types_list, 0);
+        }
+      else
+        {
+          if (error && ! *error)
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                         _("%s plug-in returned SUCCESS but did not "
+                           "return an image"),
+                         gimp_procedure_get_label (GIMP_PROCEDURE (file_proc)));
+
+          *status = GIMP_PDB_EXECUTION_ERROR;
+        }
+    }
+  else if (*status != GIMP_PDB_CANCEL)
+    {
+      if (error && ! *error)
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                     _("%s plug-in could not open image"),
+                     gimp_procedure_get_label (GIMP_PROCEDURE (file_proc)));
+    }
+
+  gimp_value_array_unref (return_vals);
+
+  if (image)
+    {
+      gimp_image_undo_disable (image);
+
+      if (file_open_file_proc_is_import (file_proc))
+        {
+          file_import_image (image, context, file,
+                             run_mode == GIMP_RUN_INTERACTIVE,
+                             progress);
+        }
+
+      /* Enables undo again */
+      file_open_sanitize_image (image, as_new);
+    }
+
+  return image;
+}
+
+/**
+ * file_open_thumbnail:
+ * @gimp:
+ * @context:
+ * @progress:
+ * @file:         an image file
+ * @size:         requested size of the thumbnail
+ * @mime_type:    return location for image MIME type
+ * @image_width:  return location for image width
+ * @image_height: return location for image height
+ * @format:       return location for image format (set to NULL if unknown)
+ * @num_layers:   return location for number of layers
+ *                (set to -1 if the number of layers is not known)
+ * @error:
+ *
+ * Attempts to load a thumbnail by using a registered thumbnail loader.
+ *
+ * Return value: the thumbnail image
+ */
+GimpImage *
+file_open_thumbnail (Gimp           *gimp,
+                     GimpContext    *context,
+                     GimpProgress   *progress,
+                     GFile          *file,
+                     gint            size,
+                     const gchar   **mime_type,
+                     gint           *image_width,
+                     gint           *image_height,
+                     const Babl    **format,
+                     gint           *num_layers,
+                     GError        **error)
+{
+  GimpPlugInProcedure *file_proc;
+  GimpProcedure       *procedure;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (mime_type != NULL, NULL);
+  g_return_val_if_fail (image_width != NULL, NULL);
+  g_return_val_if_fail (image_height != NULL, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
+  g_return_val_if_fail (num_layers != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  *image_width  = 0;
+  *image_height = 0;
+  *format       = NULL;
+  *num_layers   = -1;
+
+  file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                        GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                        file, NULL);
+
+  if (! file_proc || ! file_proc->thumb_loader)
+    return NULL;
+
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb, file_proc->thumb_loader);
+
+  if (procedure && procedure->num_args >= 2 && procedure->num_values >= 1)
+    {
+      GimpPDBStatusType  status;
+      GimpValueArray    *return_vals;
+      GimpImage         *image = NULL;
+      gchar             *path  = NULL;
+
+      if (! file_proc->handles_uri)
+        path = g_file_get_path (file);
+
+      if (! path)
+        path = g_file_get_uri (file);
+
+      return_vals =
+        gimp_pdb_execute_procedure_by_name (gimp->pdb,
+                                            context, progress, error,
+                                            gimp_object_get_name (procedure),
+                                            G_TYPE_STRING,   path,
+                                            GIMP_TYPE_INT32, size,
+                                            G_TYPE_NONE);
+
+      g_free (path);
+
+      status = g_value_get_enum (gimp_value_array_index (return_vals, 0));
+
+      if (status == GIMP_PDB_SUCCESS &&
+          GIMP_VALUE_HOLDS_IMAGE_ID (gimp_value_array_index (return_vals, 1)))
+        {
+          image = gimp_value_get_image (gimp_value_array_index (return_vals, 1),
+                                        gimp);
+
+          if (gimp_value_array_length (return_vals) >= 3 &&
+              G_VALUE_HOLDS_INT (gimp_value_array_index (return_vals, 2)) &&
+              G_VALUE_HOLDS_INT (gimp_value_array_index (return_vals, 3)))
+            {
+              *image_width =
+                MAX (0, g_value_get_int (gimp_value_array_index (return_vals, 2)));
+
+              *image_height =
+                MAX (0, g_value_get_int (gimp_value_array_index (return_vals, 3)));
+
+              if (gimp_value_array_length (return_vals) >= 5 &&
+                  G_VALUE_HOLDS_INT (gimp_value_array_index (return_vals, 4)))
+                {
+                  gint value = g_value_get_int (gimp_value_array_index (return_vals, 4));
+
+                  switch (value)
+                    {
+                    case GIMP_RGB_IMAGE:
+                      *format = gimp_babl_format (GIMP_RGB,
+                                                  GIMP_PRECISION_U8_GAMMA,
+                                                  FALSE);
+                      break;
+
+                    case GIMP_RGBA_IMAGE:
+                      *format = gimp_babl_format (GIMP_RGB,
+                                                  GIMP_PRECISION_U8_GAMMA,
+                                                  TRUE);
+                      break;
+
+                    case GIMP_GRAY_IMAGE:
+                      *format = gimp_babl_format (GIMP_GRAY,
+                                                  GIMP_PRECISION_U8_GAMMA,
+                                                  FALSE);
+                      break;
+
+                    case GIMP_GRAYA_IMAGE:
+                      *format = gimp_babl_format (GIMP_GRAY,
+                                                  GIMP_PRECISION_U8_GAMMA,
+                                                  TRUE);
+                      break;
+
+                    case GIMP_INDEXED_IMAGE:
+                    case GIMP_INDEXEDA_IMAGE:
+                      {
+                        const Babl *rgb;
+                        const Babl *rgba;
+
+                        babl_new_palette ("-gimp-indexed-format-dummy",
+                                          &rgb, &rgba);
+
+                        if (value == GIMP_INDEXED_IMAGE)
+                          *format = rgb;
+                        else
+                          *format = rgba;
+                      }
+                      break;
+
+                    default:
+                      break;
+                    }
+                }
+
+              if (gimp_value_array_length (return_vals) >= 6 &&
+                  G_VALUE_HOLDS_INT (gimp_value_array_index (return_vals, 5)))
+                {
+                  *num_layers =
+                    MAX (0, g_value_get_int (gimp_value_array_index (return_vals, 5)));
+                }
+            }
+
+          if (image)
+            {
+              file_open_sanitize_image (image, FALSE);
+
+              *mime_type = g_slist_nth_data (file_proc->mime_types_list, 0);
+
+#ifdef GIMP_UNSTABLE
+              g_printerr ("opened thumbnail at %d x %d\n",
+                          gimp_image_get_width  (image),
+                          gimp_image_get_height (image));
+#endif
+            }
+        }
+
+      gimp_value_array_unref (return_vals);
+
+      return image;
+    }
+
+  return NULL;
+}
+
+GimpImage *
+file_open_with_display (Gimp               *gimp,
+                        GimpContext        *context,
+                        GimpProgress       *progress,
+                        GFile              *file,
+                        gboolean            as_new,
+                        GObject            *screen,
+                        gint                monitor,
+                        GimpPDBStatusType  *status,
+                        GError            **error)
+{
+  return file_open_with_proc_and_display (gimp, context, progress,
+                                          file, file, as_new, NULL,
+                                          screen, monitor,
+                                          status, error);
+}
+
+GimpImage *
+file_open_with_proc_and_display (Gimp                *gimp,
+                                 GimpContext         *context,
+                                 GimpProgress        *progress,
+                                 GFile               *file,
+                                 GFile               *entered_file,
+                                 gboolean             as_new,
+                                 GimpPlugInProcedure *file_proc,
+                                 GObject             *screen,
+                                 gint                 monitor,
+                                 GimpPDBStatusType   *status,
+                                 GError             **error)
+{
+  GimpImage   *image;
+  const gchar *mime_type = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_FILE (entered_file), NULL);
+  g_return_val_if_fail (screen == NULL || G_IS_OBJECT (screen), NULL);
+  g_return_val_if_fail (status != NULL, NULL);
+
+  image = file_open_image (gimp, context, progress,
+                           file,
+                           entered_file,
+                           as_new,
+                           file_proc,
+                           GIMP_RUN_INTERACTIVE,
+                           status,
+                           &mime_type,
+                           error);
+
+  if (image)
+    {
+      /* If the file was imported we want to set the layer name to the
+       * file name. For now, assume that multi-layered imported images
+       * have named the layers already, so only rename the layer of
+       * single-layered imported files. Note that this will also
+       * rename already named layers from e.g. single-layered PSD
+       * files. To solve this properly, we would need new file plug-in
+       * API.
+       */
+      if (! file_proc)
+        file_proc = gimp_image_get_load_proc (image);
+
+      if (file_open_file_proc_is_import (file_proc) &&
+          gimp_image_get_n_layers (image) == 1)
+        {
+          GimpObject *layer = gimp_image_get_layer_iter (image)->data;
+          gchar      *basename;
+
+          basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+
+          gimp_item_rename (GIMP_ITEM (layer), basename, NULL);
+          gimp_image_undo_free (image);
+          gimp_image_clean_all (image);
+
+          g_free (basename);
+        }
+
+      if (gimp_create_display (image->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                               screen, monitor))
+        {
+          /*  the display owns the image now  */
+          g_object_unref (image);
+        }
+
+      if (! as_new)
+        {
+          GimpDocumentList *documents = GIMP_DOCUMENT_LIST (gimp->documents);
+          GimpImagefile    *imagefile;
+          GFile            *any_file;
+
+          imagefile = gimp_document_list_add_file (documents, file, mime_type);
+
+          /*  can only create a thumbnail if the passed file and the
+           *  resulting image's file match. Use any_file() here so we
+           *  create thumbnails for both XCF and imported images.
+           */
+          any_file = gimp_image_get_any_file (image);
+
+          if (any_file && g_file_equal (file, any_file))
+            {
+              /*  no need to save a thumbnail if there's a good one already  */
+              if (! gimp_imagefile_check_thumbnail (imagefile))
+                {
+                  gimp_imagefile_save_thumbnail (imagefile, mime_type, image,
+                                                 NULL);
+                }
+            }
+        }
+
+      /*  announce that we opened this image  */
+      gimp_image_opened (image->gimp, file);
+    }
+
+  return image;
+}
+
+GList *
+file_open_layers (Gimp                *gimp,
+                  GimpContext         *context,
+                  GimpProgress        *progress,
+                  GimpImage           *dest_image,
+                  gboolean             merge_visible,
+                  GFile               *file,
+                  GimpRunMode          run_mode,
+                  GimpPlugInProcedure *file_proc,
+                  GimpPDBStatusType   *status,
+                  GError             **error)
+{
+  GimpImage   *new_image;
+  GList       *layers    = NULL;
+  const gchar *mime_type = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (status != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  new_image = file_open_image (gimp, context, progress,
+                               file, file, FALSE,
+                               file_proc,
+                               run_mode,
+                               status, &mime_type, error);
+
+  if (new_image)
+    {
+      gint n_visible = 0;
+
+      gimp_image_undo_disable (new_image);
+
+      layers = file_open_get_layers (new_image, merge_visible, &n_visible);
+
+      if (merge_visible && n_visible > 1)
+        {
+          GimpLayer *layer;
+
+          g_list_free (layers);
+
+          layer = gimp_image_merge_visible_layers (new_image, context,
+                                                   GIMP_CLIP_TO_IMAGE,
+                                                   FALSE, FALSE,
+                                                   NULL);
+
+          layers = g_list_prepend (NULL, layer);
+        }
+
+      if (layers)
+        {
+          gchar *basename;
+
+          basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+          file_open_convert_items (dest_image, basename, layers);
+          g_free (basename);
+
+          gimp_document_list_add_file (GIMP_DOCUMENT_LIST (gimp->documents),
+                                       file, mime_type);
+        }
+      else
+        {
+          g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Image doesn't contain any layers"));
+          *status = GIMP_PDB_EXECUTION_ERROR;
+        }
+
+      g_object_unref (new_image);
+    }
+
+  return g_list_reverse (layers);
+}
+
+
+/*  This function is called for filenames passed on the command-line
+ *  or from the D-Bus service.
+ */
+gboolean
+file_open_from_command_line (Gimp     *gimp,
+                             GFile    *file,
+                             gboolean  as_new,
+                             GObject  *screen,
+                             gint      monitor)
+
+{
+  GimpImage         *image;
+  GimpObject        *display;
+  GimpPDBStatusType  status;
+  gboolean           success = FALSE;
+  GError            *error   = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (screen == NULL || G_IS_OBJECT (screen), FALSE);
+
+  display = gimp_get_empty_display (gimp);
+
+  /* show the progress in the last opened display, see bug #704896 */
+  if (! display)
+    display = gimp_context_get_display (gimp_get_user_context (gimp));
+
+  if (display)
+    g_object_add_weak_pointer (G_OBJECT (display), (gpointer) &display);
+
+  image = file_open_with_display (gimp,
+                                  gimp_get_user_context (gimp),
+                                  GIMP_PROGRESS (display),
+                                  file, as_new,
+                                  screen, monitor,
+                                  &status, &error);
+
+  if (image)
+    {
+      success = TRUE;
+
+      g_object_set_data_full (G_OBJECT (gimp), GIMP_FILE_OPEN_LAST_FILE_KEY,
+                              g_object_ref (file),
+                              (GDestroyNotify) g_object_unref);
+    }
+  else if (status != GIMP_PDB_CANCEL && display)
+    {
+      gimp_message (gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
+                    _("Opening '%s' failed: %s"),
+                    gimp_file_get_utf8_name (file), error->message);
+      g_clear_error (&error);
+    }
+
+  if (display)
+    g_object_remove_weak_pointer (G_OBJECT (display), (gpointer) &display);
+
+  return success;
+}
+
+
+/*  private functions  */
+
+static void
+file_open_sanitize_image (GimpImage *image,
+                          gboolean   as_new)
+{
+  if (as_new)
+    gimp_image_set_file (image, NULL);
+
+  /* clear all undo steps */
+  gimp_image_undo_free (image);
+
+  /* make sure that undo is enabled */
+  while (! gimp_image_undo_is_enabled (image))
+    gimp_image_undo_thaw (image);
+
+  /* Set the image to clean. Note that export dirtiness is not set to
+   * clean here; we can only consider export clean after the first
+   * export
+   */
+  gimp_image_clean_all (image);
+
+  /* Make sure the projection is completely constructed from valid
+   * layers, this is needed in case something triggers projection or
+   * image preview creation before all layers are loaded, see bug #767663.
+   */
+  gimp_image_invalidate_all (image);
+
+  /* Make sure all image states are up-to-date */
+  gimp_image_flush (image);
+}
+
+/* Converts items from one image to another */
+static void
+file_open_convert_items (GimpImage   *dest_image,
+                         const gchar *basename,
+                         GList       *items)
+{
+  GList *list;
+
+  for (list = items; list; list = g_list_next (list))
+    {
+      GimpItem *src = list->data;
+      GimpItem *item;
+
+      item = gimp_item_convert (src, dest_image, G_TYPE_FROM_INSTANCE (src));
+
+      if (g_list_length (items) == 1)
+        {
+          gimp_object_set_name (GIMP_OBJECT (item), basename);
+        }
+      else
+        {
+          gimp_object_set_name (GIMP_OBJECT (item),
+                                gimp_object_get_name (src));
+        }
+
+      list->data = item;
+    }
+}
+
+static GList *
+file_open_get_layers (GimpImage *image,
+                      gboolean   merge_visible,
+                      gint      *n_visible)
+{
+  GList *iter   = NULL;
+  GList *layers = NULL;
+
+  for (iter = gimp_image_get_layer_iter (image);
+       iter;
+       iter = g_list_next (iter))
+    {
+      GimpItem *item = iter->data;
+
+      if (! merge_visible)
+        layers = g_list_prepend (layers, item);
+
+      if (gimp_item_get_visible (item))
+        {
+          if (n_visible)
+            (*n_visible)++;
+
+          if (! layers)
+            layers = g_list_prepend (layers, item);
+        }
+    }
+
+  return layers;
+}
+
+static gboolean
+file_open_file_proc_is_import (GimpPlugInProcedure *file_proc)
+{
+  return !(file_proc &&
+           file_proc->mime_types &&
+           strcmp (file_proc->mime_types, "image/x-xcf") == 0);
+}
diff --git a/app/file/file-open.h b/app/file/file-open.h
new file mode 100644
index 0000000..361dd1f
--- /dev/null
+++ b/app/file/file-open.h
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * file-open.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_OPEN_H__
+#define __FILE_OPEN_H__
+
+
+GimpImage * file_open_image                 (Gimp                *gimp,
+                                             GimpContext         *context,
+                                             GimpProgress        *progress,
+                                             GFile               *file,
+                                             GFile               *entered_file,
+                                             gboolean             as_new,
+                                             GimpPlugInProcedure *file_proc,
+                                             GimpRunMode          run_mode,
+                                             GimpPDBStatusType   *status,
+                                             const gchar        **mime_type,
+                                             GError             **error);
+
+GimpImage * file_open_thumbnail             (Gimp                *gimp,
+                                             GimpContext         *context,
+                                             GimpProgress        *progress,
+                                             GFile               *file,
+                                             gint                 size,
+                                             const gchar        **mime_type,
+                                             gint                *image_width,
+                                             gint                *image_height,
+                                             const Babl         **format,
+                                             gint                *num_layers,
+                                             GError             **error);
+GimpImage * file_open_with_display          (Gimp                *gimp,
+                                             GimpContext         *context,
+                                             GimpProgress        *progress,
+                                             GFile               *file,
+                                             gboolean             as_new,
+                                             GObject             *screen,
+                                             gint                 monitor,
+                                             GimpPDBStatusType   *status,
+                                             GError             **error);
+
+GimpImage * file_open_with_proc_and_display (Gimp                *gimp,
+                                             GimpContext         *context,
+                                             GimpProgress        *progress,
+                                             GFile               *file,
+                                             GFile               *entered_file,
+                                             gboolean             as_new,
+                                             GimpPlugInProcedure *file_proc,
+                                             GObject             *screen,
+                                             gint                 monitor,
+                                             GimpPDBStatusType   *status,
+                                             GError             **error);
+
+GList     * file_open_layers                (Gimp                *gimp,
+                                             GimpContext         *context,
+                                             GimpProgress        *progress,
+                                             GimpImage           *dest_image,
+                                             gboolean             merge_visible,
+                                             GFile               *file,
+                                             GimpRunMode          run_mode,
+                                             GimpPlugInProcedure *file_proc,
+                                             GimpPDBStatusType   *status,
+                                             GError             **error);
+
+gboolean    file_open_from_command_line     (Gimp                *gimp,
+                                             GFile               *file,
+                                             gboolean             as_new,
+                                             GObject             *screen,
+                                             gint                 monitor);
+
+
+#endif /* __FILE_OPEN_H__ */
diff --git a/app/file/file-remote.c b/app/file/file-remote.c
new file mode 100644
index 0000000..498115a
--- /dev/null
+++ b/app/file/file-remote.c
@@ -0,0 +1,401 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * file-remote.c
+ * Copyright (C) 2014  Michael Natterer <mitch@gimp.org>
+ *
+ * Based on: URI plug-in, GIO/GVfs backend
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpprogress.h"
+
+#include "file-remote.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  DOWNLOAD,
+  UPLOAD
+} RemoteCopyMode;
+
+typedef struct
+{
+  GimpProgress *progress;
+  GCancellable *cancellable;
+  gboolean      cancel;
+  GMainLoop    *main_loop;
+  GError       *error;
+} RemoteMount;
+
+typedef struct
+{
+  RemoteCopyMode  mode;
+  GimpProgress   *progress;
+  GCancellable   *cancellable;
+  gboolean        cancel;
+  gint64          last_time;
+} RemoteProgress;
+
+
+static void       file_remote_mount_volume_ready (GFile           *file,
+                                                  GAsyncResult    *result,
+                                                  RemoteMount     *mount);
+static void       file_remote_mount_file_cancel  (GimpProgress    *progress,
+                                                  RemoteMount     *mount);
+
+static GFile    * file_remote_get_temp_file      (Gimp            *gimp,
+                                                  GFile           *file);
+static gboolean   file_remote_copy_file          (Gimp            *gimp,
+                                                  GFile           *src_file,
+                                                  GFile           *dest_file,
+                                                  RemoteCopyMode   mode,
+                                                  GimpProgress    *progress,
+                                                  GError         **error);
+static void       file_remote_copy_file_cancel   (GimpProgress    *progress,
+                                                  RemoteProgress  *remote_progress);
+
+static void       file_remote_progress_callback  (goffset          current_num_bytes,
+                                                  goffset          total_num_bytes,
+                                                  gpointer         user_data);
+
+
+/*  public functions  */
+
+gboolean
+file_remote_mount_file (Gimp          *gimp,
+                        GFile         *file,
+                        GimpProgress  *progress,
+                        GError       **error)
+{
+  GMountOperation *operation;
+  RemoteMount      mount = { 0, };
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  mount.progress  = progress;
+  mount.main_loop = g_main_loop_new (NULL, FALSE);
+
+  operation = gimp_get_mount_operation (gimp, progress);
+
+  if (progress)
+    {
+      gimp_progress_start (progress, TRUE, _("Mounting remote volume"));
+
+      mount.cancellable = g_cancellable_new ();
+
+      g_signal_connect (progress, "cancel",
+                        G_CALLBACK (file_remote_mount_file_cancel),
+                        &mount);
+    }
+
+  g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE,
+                                 operation, mount.cancellable,
+                                 (GAsyncReadyCallback) file_remote_mount_volume_ready,
+                                 &mount);
+
+  g_main_loop_run (mount.main_loop);
+  g_main_loop_unref (mount.main_loop);
+
+  if (progress)
+    {
+      g_signal_handlers_disconnect_by_func (progress,
+                                            file_remote_mount_file_cancel,
+                                            &mount);
+
+      g_object_unref (mount.cancellable);
+
+      gimp_progress_end (progress);
+    }
+
+  g_object_unref (operation);
+
+  if (mount.error)
+    {
+      if (mount.error->domain != G_IO_ERROR ||
+          mount.error->code   != G_IO_ERROR_ALREADY_MOUNTED)
+        {
+          g_propagate_error (error, mount.error);
+          return FALSE;
+        }
+      else
+        {
+          g_clear_error (&mount.error);
+        }
+    }
+
+  return TRUE;
+}
+
+GFile *
+file_remote_download_image (Gimp          *gimp,
+                            GFile         *file,
+                            GimpProgress  *progress,
+                            GError       **error)
+{
+  GFile *local_file;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  local_file = file_remote_get_temp_file (gimp, file);
+
+  if (! file_remote_copy_file (gimp, file, local_file, DOWNLOAD,
+                               progress, error))
+    {
+      g_object_unref (local_file);
+      return NULL;
+    }
+
+  return local_file;
+}
+
+GFile *
+file_remote_upload_image_prepare (Gimp          *gimp,
+                                  GFile         *file,
+                                  GimpProgress  *progress,
+                                  GError       **error)
+{
+  GFile *local_file;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  local_file = file_remote_get_temp_file (gimp, file);
+
+  return local_file;
+}
+
+gboolean
+file_remote_upload_image_finish (Gimp          *gimp,
+                                 GFile         *file,
+                                 GFile         *local_file,
+                                 GimpProgress  *progress,
+                                 GError       **error)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (G_IS_FILE (local_file), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! file_remote_copy_file (gimp, local_file, file, UPLOAD,
+                               progress, error))
+    {
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*  private functions  */
+
+static void
+file_remote_mount_volume_ready (GFile        *file,
+                                GAsyncResult *result,
+                                RemoteMount  *mount)
+{
+  g_file_mount_enclosing_volume_finish (file, result, &mount->error);
+
+  g_main_loop_quit (mount->main_loop);
+}
+
+static void
+file_remote_mount_file_cancel (GimpProgress *progress,
+                               RemoteMount  *mount)
+{
+  mount->cancel = TRUE;
+
+  g_cancellable_cancel (mount->cancellable);
+}
+
+static GFile *
+file_remote_get_temp_file (Gimp  *gimp,
+                           GFile *file)
+{
+  gchar *basename;
+  GFile *temp_file = NULL;
+
+  basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+
+  if (basename)
+    {
+      const gchar *ext = strchr (basename, '.');
+
+      if (ext && strlen (ext))
+        temp_file = gimp_get_temp_file (gimp, ext + 1);
+
+      g_free (basename);
+    }
+
+  if (! temp_file)
+    temp_file = gimp_get_temp_file (gimp, "xxx");
+
+  return temp_file;
+}
+
+static gboolean
+file_remote_copy_file (Gimp            *gimp,
+                       GFile           *src_file,
+                       GFile           *dest_file,
+                       RemoteCopyMode   mode,
+                       GimpProgress    *progress,
+                       GError         **error)
+{
+  RemoteProgress  remote_progress = { 0, };
+  gboolean        success;
+  GError         *my_error = NULL;
+
+  remote_progress.mode     = mode;
+  remote_progress.progress = progress;
+
+  if (progress)
+    {
+      gimp_progress_start (progress, TRUE, _("Opening remote file"));
+
+      remote_progress.cancellable = g_cancellable_new ();
+
+      g_signal_connect (progress, "cancel",
+                        G_CALLBACK (file_remote_copy_file_cancel),
+                        &remote_progress);
+
+      success = g_file_copy (src_file, dest_file, G_FILE_COPY_OVERWRITE,
+                             remote_progress.cancellable,
+                             file_remote_progress_callback, &remote_progress,
+                             &my_error);
+
+      g_signal_handlers_disconnect_by_func (progress,
+                                            file_remote_copy_file_cancel,
+                                            &remote_progress);
+
+      g_object_unref (remote_progress.cancellable);
+
+      gimp_progress_set_value (progress, 1.0);
+      gimp_progress_end (progress);
+    }
+  else
+    {
+      success = g_file_copy (src_file, dest_file, G_FILE_COPY_OVERWRITE,
+                             NULL, NULL, NULL,
+                             &my_error);
+    }
+
+  return success;
+}
+
+static void
+file_remote_copy_file_cancel (GimpProgress   *progress,
+                              RemoteProgress *remote_progress)
+{
+  remote_progress->cancel = TRUE;
+
+  g_cancellable_cancel (remote_progress->cancellable);
+}
+
+static void
+file_remote_progress_callback (goffset  current_num_bytes,
+                               goffset  total_num_bytes,
+                               gpointer user_data)
+{
+  RemoteProgress *progress = user_data;
+  gint64          now;
+
+  /*  update the progress only up to 10 times a second  */
+  now = g_get_monotonic_time ();
+
+  if ((now - progress->last_time) / 1000 < 100)
+    return;
+
+  progress->last_time = now;
+
+  if (total_num_bytes > 0)
+    {
+      const gchar *format;
+      gchar       *done  = g_format_size (current_num_bytes);
+      gchar       *total = g_format_size (total_num_bytes);
+
+      switch (progress->mode)
+        {
+        case DOWNLOAD:
+          format = _("Downloading image (%s of %s)");
+          break;
+
+        case UPLOAD:
+          format = _("Uploading image (%s of %s)");
+          break;
+
+        default:
+          gimp_assert_not_reached ();
+        }
+
+      gimp_progress_set_text (progress->progress, format, done, total);
+      g_free (total);
+      g_free (done);
+
+      gimp_progress_set_value (progress->progress,
+                               (gdouble) current_num_bytes /
+                               (gdouble) total_num_bytes);
+    }
+  else
+    {
+      const gchar *format;
+      gchar       *done = g_format_size (current_num_bytes);
+
+      switch (progress->mode)
+        {
+        case DOWNLOAD:
+          format = _("Downloaded %s of image data");
+          break;
+
+        case UPLOAD:
+          format = _("Uploaded %s of image data");
+          break;
+
+        default:
+          gimp_assert_not_reached ();
+        }
+
+      gimp_progress_set_text (progress->progress, format, done);
+      g_free (done);
+
+      gimp_progress_pulse (progress->progress);
+    }
+
+  while (! progress->cancel && g_main_context_pending (NULL))
+    g_main_context_iteration (NULL, FALSE);
+}
diff --git a/app/file/file-remote.h b/app/file/file-remote.h
new file mode 100644
index 0000000..e5f38cc
--- /dev/null
+++ b/app/file/file-remote.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * file-remote.h
+ * Copyright (C) 2014  Michael Natterer <mitch@gimp.org>
+ *
+ * Based on: URI plug-in, GIO/GVfs backend
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_REMOTE_H__
+#define __FILE_REMOTE_H__
+
+
+gboolean   file_remote_mount_file           (Gimp          *gimp,
+                                             GFile         *file,
+                                             GimpProgress  *progress,
+                                             GError       **error);
+
+GFile    * file_remote_download_image       (Gimp          *gimp,
+                                             GFile         *file,
+                                             GimpProgress  *progress,
+                                             GError       **error);
+
+GFile    * file_remote_upload_image_prepare (Gimp          *gimp,
+                                             GFile         *file,
+                                             GimpProgress  *progress,
+                                             GError       **error);
+gboolean   file_remote_upload_image_finish  (Gimp          *gimp,
+                                             GFile         *file,
+                                             GFile         *local_file,
+                                             GimpProgress  *progress,
+                                             GError       **error);
+
+#endif /* __FILE_REMOTE_H__ */
diff --git a/app/file/file-save.c b/app/file/file-save.c
new file mode 100644
index 0000000..7fc2dfd
--- /dev/null
+++ b/app/file/file-save.c
@@ -0,0 +1,325 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * file-save.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdocumentlist.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimppdb.h"
+
+#include "plug-in/gimppluginprocedure.h"
+
+#include "file-remote.h"
+#include "file-save.h"
+#include "gimp-file.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GimpPDBStatusType
+file_save (Gimp                *gimp,
+           GimpImage           *image,
+           GimpProgress        *progress,
+           GFile               *file,
+           GimpPlugInProcedure *file_proc,
+           GimpRunMode          run_mode,
+           gboolean             change_saved_state,
+           gboolean             export_backward,
+           gboolean             export_forward,
+           GError             **error)
+{
+  GimpDrawable      *drawable;
+  GimpValueArray    *return_vals;
+  GimpPDBStatusType  status     = GIMP_PDB_EXECUTION_ERROR;
+  GFile             *local_file = NULL;
+  gchar             *path       = NULL;
+  gchar             *uri        = NULL;
+  gboolean           mounted    = TRUE;
+  gint32             image_ID;
+  gint32             drawable_ID;
+  GError            *my_error   = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_PDB_CALLING_ERROR);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress),
+                        GIMP_PDB_CALLING_ERROR);
+  g_return_val_if_fail (G_IS_FILE (file), GIMP_PDB_CALLING_ERROR);
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (file_proc),
+                        GIMP_PDB_CALLING_ERROR);
+  g_return_val_if_fail ((export_backward && export_forward) == FALSE,
+                        GIMP_PDB_CALLING_ERROR);
+  g_return_val_if_fail (error == NULL || *error == NULL,
+                        GIMP_PDB_CALLING_ERROR);
+
+  /*  ref image and file, so they can't get deleted during save  */
+  g_object_ref (image);
+  g_object_ref (file);
+
+  gimp_image_saving (image);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                           _("There is no active layer to save"));
+      goto out;
+    }
+
+  /* FIXME enable these tests for remote files again, needs testing */
+  if (g_file_is_native (file) &&
+      g_file_query_exists (file, NULL))
+    {
+      GFileInfo *info;
+
+      info = g_file_query_info (file,
+                                G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
+                                G_FILE_QUERY_INFO_NONE,
+                                NULL, error);
+      if (! info)
+        {
+          /* extra paranoia */
+          if (error && ! *error)
+            g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                                 _("Failed to get file information"));
+          goto out;
+        }
+
+      if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR)
+        {
+          g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Not a regular file"));
+          g_object_unref (info);
+          goto out;
+        }
+
+      if (! g_file_info_get_attribute_boolean (info,
+                                               G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
+        {
+          g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Permission denied"));
+          g_object_unref (info);
+          goto out;
+        }
+
+      g_object_unref (info);
+    }
+
+  if (! g_file_is_native (file) &&
+      ! file_remote_mount_file (gimp, file, progress, &my_error))
+    {
+      if (my_error)
+        {
+          g_printerr ("%s: mounting remote volume failed, trying to upload"
+                      "the file: %s\n",
+                      G_STRFUNC, my_error->message);
+          g_clear_error (&my_error);
+
+          mounted = FALSE;
+        }
+      else
+        {
+          status = GIMP_PDB_CANCEL;
+
+          goto out;
+        }
+    }
+
+  if (! file_proc->handles_uri || ! mounted)
+    {
+      gchar *my_path = g_file_get_path (file);
+
+      if (! my_path)
+        {
+          local_file = file_remote_upload_image_prepare (gimp, file, progress,
+                                                         &my_error);
+
+          if (! local_file)
+            {
+              if (my_error)
+                g_propagate_error (error, my_error);
+              else
+                status = GIMP_PDB_CANCEL;
+
+              goto out;
+            }
+
+          if (file_proc->handles_uri)
+            path = g_file_get_uri (local_file);
+          else
+            path = g_file_get_path (local_file);
+        }
+
+      g_free (my_path);
+    }
+
+  if (! path)
+    {
+      if (file_proc->handles_uri)
+        path = g_file_get_uri (file);
+      else
+        path = g_file_get_path (file);
+    }
+
+  uri = g_file_get_uri (file);
+
+  image_ID    = gimp_image_get_ID (image);
+  drawable_ID = gimp_item_get_ID (GIMP_ITEM (drawable));
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name (image->gimp->pdb,
+                                        gimp_get_user_context (gimp),
+                                        progress, error,
+                                        gimp_object_get_name (file_proc),
+                                        GIMP_TYPE_INT32,       run_mode,
+                                        GIMP_TYPE_IMAGE_ID,    image_ID,
+                                        GIMP_TYPE_DRAWABLE_ID, drawable_ID,
+                                        G_TYPE_STRING,         path,
+                                        G_TYPE_STRING,         uri,
+                                        G_TYPE_NONE);
+
+  status = g_value_get_enum (gimp_value_array_index (return_vals, 0));
+
+  gimp_value_array_unref (return_vals);
+
+  if (local_file)
+    {
+      if (status == GIMP_PDB_SUCCESS)
+        {
+          GError *my_error = NULL;
+
+          if (! file_remote_upload_image_finish (gimp, file, local_file,
+                                                 progress, &my_error))
+            {
+              status = GIMP_PDB_EXECUTION_ERROR;
+
+              if (my_error)
+                g_propagate_error (error, my_error);
+              else
+                status = GIMP_PDB_CANCEL;
+            }
+        }
+
+      g_file_delete (local_file, NULL, NULL);
+      g_object_unref (local_file);
+    }
+
+  if (status == GIMP_PDB_SUCCESS)
+    {
+      GimpDocumentList *documents;
+      GimpImagefile    *imagefile;
+
+      if (change_saved_state)
+        {
+          gimp_image_set_file (image, file);
+          gimp_image_set_save_proc (image, file_proc);
+
+          /* Forget the import source when we save. We interpret a
+           * save as that the user is not interested in being able
+           * to quickly export back to the original any longer
+           */
+          gimp_image_set_imported_file (image, NULL);
+
+          gimp_image_clean_all (image);
+        }
+      else if (export_backward)
+        {
+          /* We exported the image back to its imported source,
+           * change nothing about export/import flags, only set
+           * the export state to clean
+           */
+          gimp_image_export_clean_all (image);
+        }
+      else if (export_forward)
+        {
+          /* Remember the last entered Export URI for the image. We
+           * only need to do this explicitly when exporting. It
+           * happens implicitly when saving since the GimpObject name
+           * of a GimpImage is the last-save URI
+           */
+          gimp_image_set_exported_file (image, file);
+          gimp_image_set_export_proc (image, file_proc);
+
+          /* An image can not be considered both exported and imported
+           * at the same time, so stop consider it as imported now
+           * that we consider it exported.
+           */
+          gimp_image_set_imported_file (image, NULL);
+
+          gimp_image_export_clean_all (image);
+        }
+
+      if (export_backward || export_forward)
+        gimp_image_exported (image, file);
+      else
+        gimp_image_saved (image, file);
+
+      documents = GIMP_DOCUMENT_LIST (image->gimp->documents);
+
+      imagefile = gimp_document_list_add_file (documents, file,
+                                               g_slist_nth_data (file_proc->mime_types_list, 0));
+
+      /* only save a thumbnail if we are saving as XCF, see bug #25272 */
+      if (GIMP_PROCEDURE (file_proc)->proc_type == GIMP_INTERNAL)
+        gimp_imagefile_save_thumbnail (imagefile,
+                                       g_slist_nth_data (file_proc->mime_types_list, 0),
+                                       image,
+                                       NULL);
+    }
+  else if (status != GIMP_PDB_CANCEL)
+    {
+      if (error && *error == NULL)
+        {
+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                       _("%s plug-in could not save image"),
+                       gimp_procedure_get_label (GIMP_PROCEDURE (file_proc)));
+        }
+    }
+
+  gimp_image_flush (image);
+
+ out:
+  g_object_unref (file);
+  g_object_unref (image);
+
+  g_free (path);
+  g_free (uri);
+
+  return status;
+}
diff --git a/app/file/file-save.h b/app/file/file-save.h
new file mode 100644
index 0000000..fcfac0c
--- /dev/null
+++ b/app/file/file-save.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * file-save.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_SAVE_H__
+#define __FILE_SAVE_H__
+
+
+GimpPDBStatusType   file_save (Gimp                 *gimp,
+                               GimpImage            *image,
+                               GimpProgress         *progress,
+                               GFile                *file,
+                               GimpPlugInProcedure  *file_proc,
+                               GimpRunMode           run_mode,
+                               gboolean              change_saved_state,
+                               gboolean              export_backward,
+                               gboolean              export_forward,
+                               GError              **error);
+
+
+#endif /* __FILE_SAVE_H__ */
diff --git a/app/file/file-utils.c b/app/file/file-utils.c
new file mode 100644
index 0000000..230c1ef
--- /dev/null
+++ b/app/file/file-utils.c
@@ -0,0 +1,249 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * file-utils.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpthumb/gimpthumb.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "file-utils.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean
+file_utils_filename_is_uri (const gchar  *filename,
+                            GError      **error)
+{
+  g_return_val_if_fail (filename != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (strstr (filename, "://"))
+    {
+      gchar *scheme;
+      gchar *canon;
+
+      scheme = g_strndup (filename, (strstr (filename, "://") - filename));
+      canon  = g_strdup (scheme);
+
+      g_strcanon (canon, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "+-.", '-');
+
+      if (strcmp (scheme, canon) || ! g_ascii_isgraph (canon[0]))
+        {
+          g_set_error (error, G_FILE_ERROR, 0,
+                       _("'%s:' is not a valid URI scheme"), scheme);
+
+          g_free (scheme);
+          g_free (canon);
+
+          return FALSE;
+        }
+
+      g_free (scheme);
+      g_free (canon);
+
+      if (! g_utf8_validate (filename, -1, NULL))
+        {
+          g_set_error_literal (error,
+                               G_CONVERT_ERROR,
+                               G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+                               _("Invalid character sequence in URI"));
+          return FALSE;
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+GFile *
+file_utils_filename_to_file (Gimp         *gimp,
+                             const gchar  *filename,
+                             GError      **error)
+{
+  GFile  *file;
+  gchar  *absolute;
+  GError *temp_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (filename != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  file = g_file_new_for_uri (filename);
+
+  if (! file)
+    {
+      /* Despite the docs says it never fails, it actually can on Windows.
+       * See issue #3093 (and glib#1819).
+       */
+      g_set_error_literal (error,
+                           G_CONVERT_ERROR,
+                           G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+                           _("Invalid character sequence in URI"));
+      return NULL;
+    }
+
+  /*  check for prefixes like http or ftp  */
+  if (gimp_plug_in_manager_file_procedure_find_by_prefix (gimp->plug_in_manager,
+                                                          GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                          file))
+    {
+      if (g_utf8_validate (filename, -1, NULL))
+        {
+          return file;
+        }
+      else
+        {
+          g_set_error_literal (error,
+                               G_CONVERT_ERROR,
+                               G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+                               _("Invalid character sequence in URI"));
+          return NULL;
+        }
+    }
+  else if (file_utils_filename_is_uri (filename, &temp_error))
+    {
+      return file;
+    }
+  else if (temp_error)
+    {
+      g_propagate_error (error, temp_error);
+      g_object_unref (file);
+
+      return NULL;
+    }
+
+  g_object_unref (file);
+
+  if (! g_path_is_absolute (filename))
+    {
+      gchar *current;
+
+      current = g_get_current_dir ();
+      absolute = g_build_filename (current, filename, NULL);
+      g_free (current);
+    }
+  else
+    {
+      absolute = g_strdup (filename);
+    }
+
+  file = g_file_new_for_path (absolute);
+
+  g_free (absolute);
+
+  return file;
+}
+
+GdkPixbuf *
+file_utils_load_thumbnail (const gchar *filename)
+{
+  GimpThumbnail *thumbnail = NULL;
+  GdkPixbuf     *pixbuf    = NULL;
+  gchar         *uri;
+
+  g_return_val_if_fail (filename != NULL, NULL);
+
+  uri = g_filename_to_uri (filename, NULL, NULL);
+
+  if (uri)
+    {
+      thumbnail = gimp_thumbnail_new ();
+      gimp_thumbnail_set_uri (thumbnail, uri);
+
+      pixbuf = gimp_thumbnail_load_thumb (thumbnail,
+                                          (GimpThumbSize) GIMP_THUMBNAIL_SIZE_NORMAL,
+                                          NULL);
+    }
+
+  g_free (uri);
+
+  if (pixbuf)
+    {
+      gint width  = gdk_pixbuf_get_width (pixbuf);
+      gint height = gdk_pixbuf_get_height (pixbuf);
+
+      if (gdk_pixbuf_get_n_channels (pixbuf) != 3)
+        {
+          GdkPixbuf *tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                           width, height);
+
+          gdk_pixbuf_composite_color (pixbuf, tmp,
+                                      0, 0, width, height, 0, 0, 1.0, 1.0,
+                                      GDK_INTERP_NEAREST, 255,
+                                      0, 0, GIMP_CHECK_SIZE_SM,
+                                      0x66666666, 0x99999999);
+
+          g_object_unref (pixbuf);
+          pixbuf = tmp;
+        }
+    }
+
+  return pixbuf;
+}
+
+gboolean
+file_utils_save_thumbnail (GimpImage   *image,
+                           const gchar *filename)
+{
+  GFile    *file;
+  gboolean  success = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (filename != NULL, FALSE);
+
+  file = gimp_image_get_file (image);
+
+  if (file)
+    {
+      gchar *image_uri = g_file_get_uri (file);
+      gchar *uri       = g_filename_to_uri (filename, NULL, NULL);
+
+      if (uri && image_uri && ! strcmp (uri, image_uri))
+        {
+          GimpImagefile *imagefile;
+
+          imagefile = gimp_imagefile_new (image->gimp, file);
+          success = gimp_imagefile_save_thumbnail (imagefile, NULL, image,
+                                                   NULL);
+          g_object_unref (imagefile);
+        }
+
+      g_free (image_uri);
+      g_free (uri);
+    }
+
+  return success;
+}
diff --git a/app/file/file-utils.h b/app/file/file-utils.h
new file mode 100644
index 0000000..02a30cc
--- /dev/null
+++ b/app/file/file-utils.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * file-utils.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_UTILS_H__
+#define __FILE_UTILS_H__
+
+
+GFile     * file_utils_filename_to_file  (Gimp         *gimp,
+                                          const gchar  *filename,
+                                          GError      **error);
+
+GdkPixbuf * file_utils_load_thumbnail    (const gchar  *filename);
+gboolean    file_utils_save_thumbnail    (GimpImage    *image,
+                                          const gchar  *filename);
+
+
+#endif /* __FILE_UTILS_H__ */
diff --git a/app/file/gimp-file.h b/app/file/gimp-file.h
new file mode 100644
index 0000000..a18442f
--- /dev/null
+++ b/app/file/gimp-file.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-file.h
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILE_H__
+#define __GIMP_FILE_H__
+
+/* Data keys for Gimp */
+#define GIMP_FILE_OPEN_LAST_FILE_KEY     "gimp-file-open-last-file"
+#define GIMP_FILE_SAVE_LAST_FILE_KEY     "gimp-file-save-last-file"
+#define GIMP_FILE_EXPORT_LAST_FILE_KEY   "gimp-file-export-last-file"
+
+
+#endif /* __GIMP_FILE_H__ */
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
new file mode 100644
index 0000000..e402056
--- /dev/null
+++ b/app/gegl/Makefile.am
@@ -0,0 +1,99 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-GEGL\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libappgegl-generic.a	\
+	libappgegl-sse2.a	\
+	libappgegl.a
+
+libappgegl_generic_a_sources = \
+	gimp-gegl-enums.h		\
+	gimp-gegl-types.h		\
+	gimp-babl.c			\
+	gimp-babl.h			\
+	gimp-babl-compat.c		\
+	gimp-babl-compat.h		\
+	gimp-gegl.c			\
+	gimp-gegl.h			\
+	gimp-gegl-apply-operation.c	\
+	gimp-gegl-apply-operation.h	\
+	gimp-gegl-loops.cc		\
+	gimp-gegl-loops.h		\
+	gimp-gegl-mask.c		\
+	gimp-gegl-mask.h		\
+	gimp-gegl-mask-combine.cc	\
+	gimp-gegl-mask-combine.h	\
+	gimp-gegl-nodes.c		\
+	gimp-gegl-nodes.h		\
+	gimp-gegl-tile-compat.c		\
+	gimp-gegl-tile-compat.h		\
+	gimp-gegl-utils.c		\
+	gimp-gegl-utils.h		\
+	gimpapplicator.c		\
+	gimpapplicator.h		\
+	gimptilehandlervalidate.c	\
+	gimptilehandlervalidate.h
+
+libappgegl_generic_a_built_sources = gimp-gegl-enums.c
+
+libappgegl_sse2_a_sources = \
+	gimp-gegl-loops-sse2.c		\
+	gimp-gegl-loops-sse2.h
+
+libappgegl_generic_a_SOURCES = $(libappgegl_generic_a_built_sources) $(libappgegl_generic_a_sources)
+
+libappgegl_sse2_a_SOURCES = $(libappgegl_sse2_a_sources)
+
+libappgegl_sse2_a_CFLAGS = $(SSE2_EXTRA_CFLAGS)
+
+libappgegl_a_SOURCES =
+
+
+libappgegl.a: libappgegl-generic.a \
+	      libappgegl-sse2.a
+	$(AR) $(ARFLAGS) libappgegl.a \
+	  $(libappgegl_generic_a_OBJECTS) \
+	  $(libappgegl_sse2_a_OBJECTS)
+	$(RANLIB) libappgegl.a
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-ggec
+CLEANFILES = $(gen_sources)
+
+xgen-ggec: $(srcdir)/gimp-gegl-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"gimp-gegl-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/gimp-gegl-enums.c: xgen-ggec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/gegl/Makefile.in b/app/gegl/Makefile.in
new file mode 100644
index 0000000..1e9d24b
--- /dev/null
+++ b/app/gegl/Makefile.in
@@ -0,0 +1,1116 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/gegl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappgegl_generic_a_AR = $(AR) $(ARFLAGS)
+libappgegl_generic_a_LIBADD =
+am__objects_1 = gimp-gegl-enums.$(OBJEXT)
+am__objects_2 = gimp-babl.$(OBJEXT) gimp-babl-compat.$(OBJEXT) \
+	gimp-gegl.$(OBJEXT) gimp-gegl-apply-operation.$(OBJEXT) \
+	gimp-gegl-loops.$(OBJEXT) gimp-gegl-mask.$(OBJEXT) \
+	gimp-gegl-mask-combine.$(OBJEXT) gimp-gegl-nodes.$(OBJEXT) \
+	gimp-gegl-tile-compat.$(OBJEXT) gimp-gegl-utils.$(OBJEXT) \
+	gimpapplicator.$(OBJEXT) gimptilehandlervalidate.$(OBJEXT)
+am_libappgegl_generic_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappgegl_generic_a_OBJECTS = $(am_libappgegl_generic_a_OBJECTS)
+libappgegl_sse2_a_AR = $(AR) $(ARFLAGS)
+libappgegl_sse2_a_LIBADD =
+am__objects_3 = libappgegl_sse2_a-gimp-gegl-loops-sse2.$(OBJEXT)
+am_libappgegl_sse2_a_OBJECTS = $(am__objects_3)
+libappgegl_sse2_a_OBJECTS = $(am_libappgegl_sse2_a_OBJECTS)
+libappgegl_a_AR = $(AR) $(ARFLAGS)
+libappgegl_a_LIBADD =
+am_libappgegl_a_OBJECTS =
+libappgegl_a_OBJECTS = $(am_libappgegl_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp-babl-compat.Po \
+	./$(DEPDIR)/gimp-babl.Po \
+	./$(DEPDIR)/gimp-gegl-apply-operation.Po \
+	./$(DEPDIR)/gimp-gegl-enums.Po ./$(DEPDIR)/gimp-gegl-loops.Po \
+	./$(DEPDIR)/gimp-gegl-mask-combine.Po \
+	./$(DEPDIR)/gimp-gegl-mask.Po ./$(DEPDIR)/gimp-gegl-nodes.Po \
+	./$(DEPDIR)/gimp-gegl-tile-compat.Po \
+	./$(DEPDIR)/gimp-gegl-utils.Po ./$(DEPDIR)/gimp-gegl.Po \
+	./$(DEPDIR)/gimpapplicator.Po \
+	./$(DEPDIR)/gimptilehandlervalidate.Po \
+	./$(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Po
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libappgegl_generic_a_SOURCES) $(libappgegl_sse2_a_SOURCES) \
+	$(libappgegl_a_SOURCES)
+DIST_SOURCES = $(libappgegl_generic_a_SOURCES) \
+	$(libappgegl_sse2_a_SOURCES) $(libappgegl_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-GEGL\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libappgegl-generic.a	\
+	libappgegl-sse2.a	\
+	libappgegl.a
+
+libappgegl_generic_a_sources = \
+	gimp-gegl-enums.h		\
+	gimp-gegl-types.h		\
+	gimp-babl.c			\
+	gimp-babl.h			\
+	gimp-babl-compat.c		\
+	gimp-babl-compat.h		\
+	gimp-gegl.c			\
+	gimp-gegl.h			\
+	gimp-gegl-apply-operation.c	\
+	gimp-gegl-apply-operation.h	\
+	gimp-gegl-loops.cc		\
+	gimp-gegl-loops.h		\
+	gimp-gegl-mask.c		\
+	gimp-gegl-mask.h		\
+	gimp-gegl-mask-combine.cc	\
+	gimp-gegl-mask-combine.h	\
+	gimp-gegl-nodes.c		\
+	gimp-gegl-nodes.h		\
+	gimp-gegl-tile-compat.c		\
+	gimp-gegl-tile-compat.h		\
+	gimp-gegl-utils.c		\
+	gimp-gegl-utils.h		\
+	gimpapplicator.c		\
+	gimpapplicator.h		\
+	gimptilehandlervalidate.c	\
+	gimptilehandlervalidate.h
+
+libappgegl_generic_a_built_sources = gimp-gegl-enums.c
+libappgegl_sse2_a_sources = \
+	gimp-gegl-loops-sse2.c		\
+	gimp-gegl-loops-sse2.h
+
+libappgegl_generic_a_SOURCES = $(libappgegl_generic_a_built_sources) $(libappgegl_generic_a_sources)
+libappgegl_sse2_a_SOURCES = $(libappgegl_sse2_a_sources)
+libappgegl_sse2_a_CFLAGS = $(SSE2_EXTRA_CFLAGS)
+libappgegl_a_SOURCES = 
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-ggec
+CLEANFILES = $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gegl/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/gegl/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappgegl-generic.a: $(libappgegl_generic_a_OBJECTS) $(libappgegl_generic_a_DEPENDENCIES) $(EXTRA_libappgegl_generic_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappgegl-generic.a
+	$(AM_V_AR)$(libappgegl_generic_a_AR) libappgegl-generic.a $(libappgegl_generic_a_OBJECTS) $(libappgegl_generic_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappgegl-generic.a
+
+libappgegl-sse2.a: $(libappgegl_sse2_a_OBJECTS) $(libappgegl_sse2_a_DEPENDENCIES) $(EXTRA_libappgegl_sse2_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappgegl-sse2.a
+	$(AM_V_AR)$(libappgegl_sse2_a_AR) libappgegl-sse2.a $(libappgegl_sse2_a_OBJECTS) $(libappgegl_sse2_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappgegl-sse2.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-babl-compat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-babl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-apply-operation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-enums.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-loops.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-mask-combine.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-mask.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-nodes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-tile-compat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-gegl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpapplicator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptilehandlervalidate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libappgegl_sse2_a-gimp-gegl-loops-sse2.o: gimp-gegl-loops-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappgegl_sse2_a_CFLAGS) $(CFLAGS) -MT libappgegl_sse2_a-gimp-gegl-loops-sse2.o -MD -MP -MF $(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Tpo -c -o libappgegl_sse2_a-gimp-gegl-loops-sse2.o `test -f 'gimp-gegl-loops-sse2.c' || echo '$(srcdir)/'`gimp-gegl-loops-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Tpo $(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-gegl-loops-sse2.c' object='libappgegl_sse2_a-gimp-gegl-loops-sse2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappgegl_sse2_a_CFLAGS) $(CFLAGS) -c -o libappgegl_sse2_a-gimp-gegl-loops-sse2.o `test -f 'gimp-gegl-loops-sse2.c' || echo '$(srcdir)/'`gimp-gegl-loops-sse2.c
+
+libappgegl_sse2_a-gimp-gegl-loops-sse2.obj: gimp-gegl-loops-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappgegl_sse2_a_CFLAGS) $(CFLAGS) -MT libappgegl_sse2_a-gimp-gegl-loops-sse2.obj -MD -MP -MF $(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Tpo -c -o libappgegl_sse2_a-gimp-gegl-loops-sse2.obj `if test -f 'gimp-gegl-loops-sse2.c'; then $(CYGPATH_W) 'gimp-gegl-loops-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimp-gegl-loops-sse2.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Tpo $(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimp-gegl-loops-sse2.c' object='libappgegl_sse2_a-gimp-gegl-loops-sse2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappgegl_sse2_a_CFLAGS) $(CFLAGS) -c -o libappgegl_sse2_a-gimp-gegl-loops-sse2.obj `if test -f 'gimp-gegl-loops-sse2.c'; then $(CYGPATH_W) 'gimp-gegl-loops-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimp-gegl-loops-sse2.c'; fi`
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimp-babl-compat.Po
+	-rm -f ./$(DEPDIR)/gimp-babl.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-apply-operation.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-enums.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-loops.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-mask-combine.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-mask.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-nodes.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-tile-compat.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl.Po
+	-rm -f ./$(DEPDIR)/gimpapplicator.Po
+	-rm -f ./$(DEPDIR)/gimptilehandlervalidate.Po
+	-rm -f ./$(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimp-babl-compat.Po
+	-rm -f ./$(DEPDIR)/gimp-babl.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-apply-operation.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-enums.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-loops.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-mask-combine.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-mask.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-nodes.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-tile-compat.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-gegl.Po
+	-rm -f ./$(DEPDIR)/gimpapplicator.Po
+	-rm -f ./$(DEPDIR)/gimptilehandlervalidate.Po
+	-rm -f ./$(DEPDIR)/libappgegl_sse2_a-gimp-gegl-loops-sse2.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+libappgegl.a: libappgegl-generic.a \
+	      libappgegl-sse2.a
+	$(AR) $(ARFLAGS) libappgegl.a \
+	  $(libappgegl_generic_a_OBJECTS) \
+	  $(libappgegl_sse2_a_OBJECTS)
+	$(RANLIB) libappgegl.a
+
+xgen-ggec: $(srcdir)/gimp-gegl-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"gimp-gegl-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/gimp-gegl-enums.c: xgen-ggec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/gegl/gimp-babl-compat.c b/app/gegl/gimp-babl-compat.c
new file mode 100644
index 0000000..b077f86
--- /dev/null
+++ b/app/gegl/gimp-babl-compat.c
@@ -0,0 +1,93 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-babl-compat.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-babl.h"
+#include "gimp-babl-compat.h"
+
+
+GimpImageType
+gimp_babl_format_get_image_type (const Babl *format)
+{
+  const Babl *model;
+
+  g_return_val_if_fail (format != NULL, -1);
+
+  model = babl_format_get_model (format);
+
+  if (model == babl_model ("Y") ||
+      model == babl_model ("Y'"))
+    {
+      return GIMP_GRAY_IMAGE;
+    }
+  else if (model == babl_model ("YA") ||
+           model == babl_model ("Y'A"))
+    {
+      return GIMP_GRAYA_IMAGE;
+    }
+  else if (model == babl_model ("RGB") ||
+           model == babl_model ("R'G'B'"))
+    {
+      return GIMP_RGB_IMAGE;
+    }
+  else if (model == babl_model ("RGBA") ||
+           model == babl_model ("R'G'B'A"))
+    {
+      return GIMP_RGBA_IMAGE;
+    }
+  else if (babl_format_is_palette (format))
+    {
+      if (babl_format_has_alpha (format))
+        return GIMP_INDEXEDA_IMAGE;
+      else
+        return GIMP_INDEXED_IMAGE;
+    }
+
+  g_return_val_if_reached (-1);
+}
+
+const Babl *
+gimp_babl_compat_u8_format (const Babl *format)
+{
+  g_return_val_if_fail (format != NULL, NULL);
+
+  /*  indexed images only exist in u8, return the same format  */
+  if (babl_format_is_palette (format))
+    return format;
+
+  return gimp_babl_format (gimp_babl_format_get_base_type (format),
+                           GIMP_PRECISION_U8_GAMMA,
+                           babl_format_has_alpha (format));
+}
+
+const Babl *
+gimp_babl_compat_u8_mask_format (const Babl *format)
+{
+  g_return_val_if_fail (format != NULL, NULL);
+
+  return gimp_babl_format (gimp_babl_format_get_base_type (format),
+                           GIMP_PRECISION_U8_LINEAR,
+                           FALSE);
+}
diff --git a/app/gegl/gimp-babl-compat.h b/app/gegl/gimp-babl-compat.h
new file mode 100644
index 0000000..778bf3e
--- /dev/null
+++ b/app/gegl/gimp-babl-compat.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-babl-compat.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BABL_COMPAT_H__
+#define __GIMP_BABL_COMPAT_H__
+
+
+GimpImageType   gimp_babl_format_get_image_type (const Babl *format);
+
+const Babl    * gimp_babl_compat_u8_format      (const Babl *format);
+const Babl    * gimp_babl_compat_u8_mask_format (const Babl *format);
+
+
+#endif /* __GIMP_BABL_COMPAT_H__ */
diff --git a/app/gegl/gimp-babl.c b/app/gegl/gimp-babl.c
new file mode 100644
index 0000000..b2dc20a
--- /dev/null
+++ b/app/gegl/gimp-babl.c
@@ -0,0 +1,1415 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-babl.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-babl.h"
+
+#include "gimp-intl.h"
+
+
+void
+gimp_babl_init (void)
+{
+  babl_format_new ("name", "R u8",
+                   babl_model ("RGBA"),
+                   babl_type ("u8"),
+                   babl_component ("R"),
+                   NULL);
+  babl_format_new ("name", "R' u8",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u8"),
+                   babl_component ("R'"),
+                   NULL);
+  babl_format_new ("name", "G u8",
+                   babl_model ("RGBA"),
+                   babl_type ("u8"),
+                   babl_component ("G"),
+                   NULL);
+  babl_format_new ("name", "G' u8",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u8"),
+                   babl_component ("G'"),
+                   NULL);
+  babl_format_new ("name", "B u8",
+                   babl_model ("RGBA"),
+                   babl_type ("u8"),
+                   babl_component ("B"),
+                   NULL);
+  babl_format_new ("name", "B' u8",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u8"),
+                   babl_component ("B'"),
+                   NULL);
+  babl_format_new ("name", "A u8",
+                   babl_model ("RGBA"),
+                   babl_type ("u8"),
+                   babl_component ("A"),
+                   NULL);
+
+  babl_format_new ("name", "R u16",
+                   babl_model ("RGBA"),
+                   babl_type ("u16"),
+                   babl_component ("R"),
+                   NULL);
+  babl_format_new ("name", "R' u16",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u16"),
+                   babl_component ("R'"),
+                   NULL);
+  babl_format_new ("name", "G u16",
+                   babl_model ("RGBA"),
+                   babl_type ("u16"),
+                   babl_component ("G"),
+                   NULL);
+  babl_format_new ("name", "G' u16",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u16"),
+                   babl_component ("G'"),
+                   NULL);
+  babl_format_new ("name", "B u16",
+                   babl_model ("RGBA"),
+                   babl_type ("u16"),
+                   babl_component ("B"),
+                   NULL);
+  babl_format_new ("name", "B' u16",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u16"),
+                   babl_component ("B'"),
+                   NULL);
+  babl_format_new ("name", "A u16",
+                   babl_model ("RGBA"),
+                   babl_type ("u16"),
+                   babl_component ("A"),
+                   NULL);
+
+  babl_format_new ("name", "R u32",
+                   babl_model ("RGBA"),
+                   babl_type ("u32"),
+                   babl_component ("R"),
+                   NULL);
+  babl_format_new ("name", "R' u32",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u32"),
+                   babl_component ("R'"),
+                   NULL);
+  babl_format_new ("name", "G u32",
+                   babl_model ("RGBA"),
+                   babl_type ("u32"),
+                   babl_component ("G"),
+                   NULL);
+  babl_format_new ("name", "G' u32",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u32"),
+                   babl_component ("G'"),
+                   NULL);
+  babl_format_new ("name", "B u32",
+                   babl_model ("RGBA"),
+                   babl_type ("u32"),
+                   babl_component ("B"),
+                   NULL);
+  babl_format_new ("name", "B' u32",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("u32"),
+                   babl_component ("B'"),
+                   NULL);
+  babl_format_new ("name", "A u32",
+                   babl_model ("RGBA"),
+                   babl_type ("u32"),
+                   babl_component ("A"),
+                   NULL);
+
+  babl_format_new ("name", "R half",
+                   babl_model ("RGBA"),
+                   babl_type ("half"),
+                   babl_component ("R"),
+                   NULL);
+  babl_format_new ("name", "R' half",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("half"),
+                   babl_component ("R'"),
+                   NULL);
+  babl_format_new ("name", "G half",
+                   babl_model ("RGBA"),
+                   babl_type ("half"),
+                   babl_component ("G"),
+                   NULL);
+  babl_format_new ("name", "G' half",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("half"),
+                   babl_component ("G'"),
+                   NULL);
+  babl_format_new ("name", "B half",
+                   babl_model ("RGBA"),
+                   babl_type ("half"),
+                   babl_component ("B"),
+                   NULL);
+  babl_format_new ("name", "B' half",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("half"),
+                   babl_component ("B'"),
+                   NULL);
+  babl_format_new ("name", "A half",
+                   babl_model ("RGBA"),
+                   babl_type ("half"),
+                   babl_component ("A"),
+                   NULL);
+
+  babl_format_new ("name", "R float",
+                   babl_model ("RGBA"),
+                   babl_type ("float"),
+                   babl_component ("R"),
+                   NULL);
+  babl_format_new ("name", "R' float",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("float"),
+                   babl_component ("R'"),
+                   NULL);
+  babl_format_new ("name", "G float",
+                   babl_model ("RGBA"),
+                   babl_type ("float"),
+                   babl_component ("G"),
+                   NULL);
+  babl_format_new ("name", "G' float",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("float"),
+                   babl_component ("G'"),
+                   NULL);
+  babl_format_new ("name", "B float",
+                   babl_model ("RGBA"),
+                   babl_type ("float"),
+                   babl_component ("B"),
+                   NULL);
+  babl_format_new ("name", "B' float",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("float"),
+                   babl_component ("B'"),
+                   NULL);
+  babl_format_new ("name", "A float",
+                   babl_model ("RGBA"),
+                   babl_type ("float"),
+                   babl_component ("A"),
+                   NULL);
+
+  babl_format_new ("name", "R double",
+                   babl_model ("RGBA"),
+                   babl_type ("double"),
+                   babl_component ("R"),
+                   NULL);
+  babl_format_new ("name", "R' double",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("double"),
+                   babl_component ("R'"),
+                   NULL);
+  babl_format_new ("name", "G double",
+                   babl_model ("RGBA"),
+                   babl_type ("double"),
+                   babl_component ("G"),
+                   NULL);
+  babl_format_new ("name", "G' double",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("double"),
+                   babl_component ("G'"),
+                   NULL);
+  babl_format_new ("name", "B double",
+                   babl_model ("RGBA"),
+                   babl_type ("double"),
+                   babl_component ("B"),
+                   NULL);
+  babl_format_new ("name", "B' double",
+                   babl_model ("R'G'B'A"),
+                   babl_type ("double"),
+                   babl_component ("B'"),
+                   NULL);
+  babl_format_new ("name", "A double",
+                   babl_model ("RGBA"),
+                   babl_type ("double"),
+                   babl_component ("A"),
+                   NULL);
+}
+
+void
+gimp_babl_init_fishes (GimpInitStatusFunc status_callback)
+{
+  /* create a bunch of fishes - to decrease the initial lazy
+   * initialization cost for some interactions
+   */
+  static const struct
+  {
+    const gchar *from_format;
+    const gchar *to_format;
+  }
+  fishes[] =
+  {
+    { "Y' u8",          "RaGaBaA float" },
+    { "Y u8",           "RaGaBaA float" },
+    { "R'G'B'A u8",     "RaGaBaA float" },
+    { "R'G'B'A float",  "R'G'B'A u8"    },
+    { "R'G'B'A float",  "R'G'B' u8"     },
+    { "R'G'B'A u8",     "RGBA float"    },
+    { "RGBA float",     "R'G'B'A u8"    },
+    { "RGBA float",     "R'G'B'A u8"    },
+    { "RGBA float",     "R'G'B'A float" },
+    { "Y' u8",          "R'G'B' u8"     },
+    { "Y u8",           "Y float"       },
+    { "R'G'B' u8",      "cairo-RGB24"   },
+    { "R'G'B' u8",      "R'G'B'A float" },
+    { "R'G'B' u8",      "R'G'B'A u8"    },
+    { "R'G'B'A u8",     "R'G'B'A float" },
+    { "R'G'B'A u8",     "cairo-ARGB32"  },
+    { "R'G'B'A double", "RGBA float"    },
+    { "R'G'B'A float",  "RGBA double"   },
+    { "R'G'B' u8",      "RGB float"     },
+    { "RGB float",      "R'G'B'A float" },
+    { "R'G'B' u8",      "RGBA float"    },
+    { "RaGaBaA float",  "R'G'B'A float" },
+    { "RaGaBaA float",  "RGBA float"    },
+    { "RGBA float",     "RaGaBaA float" },
+    { "R'G'B' u8",      "RaGaBaA float" },
+    { "cairo-ARGB32",   "R'G'B'A u8"    }
+  };
+
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (fishes); i++)
+    {
+      status_callback (NULL, NULL,
+                       (gdouble) (i + 1) /
+                       (gdouble) G_N_ELEMENTS (fishes) * 0.8);
+
+      babl_fish (babl_format (fishes[i].from_format),
+                 babl_format (fishes[i].to_format));
+    }
+}
+
+static const struct
+{
+  const gchar *name;
+  const gchar *description;
+}
+babl_descriptions[] =
+{
+  { "RGB u8",         N_("RGB") },
+  { "R'G'B' u8",      N_("RGB") },
+  { "RGB u16",        N_("RGB") },
+  { "R'G'B' u16",     N_("RGB") },
+  { "RGB u32",        N_("RGB") },
+  { "R'G'B' u32",     N_("RGB") },
+  { "RGB half",       N_("RGB") },
+  { "R'G'B' half",    N_("RGB") },
+  { "RGB float",      N_("RGB") },
+  { "R'G'B' float",   N_("RGB") },
+  { "RGB double",     N_("RGB") },
+  { "R'G'B' double",  N_("RGB") },
+
+  { "RGBA u8",        N_("RGB-alpha") },
+  { "R'G'B'A u8",     N_("RGB-alpha") },
+  { "RGBA u16",       N_("RGB-alpha") },
+  { "R'G'B'A u16",    N_("RGB-alpha") },
+  { "RGBA u32",       N_("RGB-alpha") },
+  { "R'G'B'A u32",    N_("RGB-alpha") },
+  { "RGBA half",      N_("RGB-alpha") },
+  { "R'G'B'A half",   N_("RGB-alpha") },
+  { "RGBA float",     N_("RGB-alpha") },
+  { "R'G'B'A float",  N_("RGB-alpha") },
+  { "RGBA double",    N_("RGB-alpha") },
+  { "R'G'B'A double", N_("RGB-alpha") },
+
+  { "Y u8",           N_("Grayscale") },
+  { "Y' u8",          N_("Grayscale") },
+  { "Y u16",          N_("Grayscale") },
+  { "Y' u16",         N_("Grayscale") },
+  { "Y u32",          N_("Grayscale") },
+  { "Y' u32",         N_("Grayscale") },
+  { "Y half",         N_("Grayscale") },
+  { "Y' half",        N_("Grayscale") },
+  { "Y float",        N_("Grayscale") },
+  { "Y' float",       N_("Grayscale") },
+  { "Y double",       N_("Grayscale") },
+  { "Y' double",      N_("Grayscale") },
+
+  { "YA u8",          N_("Grayscale-alpha") },
+  { "Y'A u8",         N_("Grayscale-alpha") },
+  { "YA u16",         N_("Grayscale-alpha") },
+  { "Y'A u16",        N_("Grayscale-alpha") },
+  { "YA u32",         N_("Grayscale-alpha") },
+  { "Y'A u32",        N_("Grayscale-alpha") },
+  { "YA half",        N_("Grayscale-alpha") },
+  { "Y'A half",       N_("Grayscale-alpha") },
+  { "YA float",       N_("Grayscale-alpha") },
+  { "Y'A float",      N_("Grayscale-alpha") },
+  { "YA double",      N_("Grayscale-alpha") },
+  { "Y'A double",     N_("Grayscale-alpha") },
+
+  { "R u8",           N_("Red component") },
+  { "R' u8",          N_("Red component") },
+  { "R u16",          N_("Red component") },
+  { "R' u16",         N_("Red component") },
+  { "R u32",          N_("Red component") },
+  { "R' u32",         N_("Red component") },
+  { "R half",         N_("Red component") },
+  { "R' half",        N_("Red component") },
+  { "R float",        N_("Red component") },
+  { "R' float",       N_("Red component") },
+  { "R double",       N_("Red component") },
+  { "R' double",      N_("Red component") },
+
+  { "G u8",           N_("Green component") },
+  { "G' u8",          N_("Green component") },
+  { "G u16",          N_("Green component") },
+  { "G' u16",         N_("Green component") },
+  { "G u32",          N_("Green component") },
+  { "G' u32",         N_("Green component") },
+  { "G half",         N_("Green component") },
+  { "G' half",        N_("Green component") },
+  { "G float",        N_("Green component") },
+  { "G' float",       N_("Green component") },
+  { "G double",       N_("Green component") },
+  { "G' double",      N_("Green component") },
+
+  { "B u8",           N_("Blue component") },
+  { "B' u8",          N_("Blue component") },
+  { "B u16",          N_("Blue component") },
+  { "B' u16",         N_("Blue component") },
+  { "B u32",          N_("Blue component") },
+  { "B' u32",         N_("Blue component") },
+  { "B half",         N_("Blue component") },
+  { "B' half",        N_("Blue component") },
+  { "B float",        N_("Blue component") },
+  { "B' float",       N_("Blue component") },
+  { "B double",       N_("Blue component") },
+  { "B' double",      N_("Blue component") },
+
+  { "A u8",          N_("Alpha component") },
+  { "A u16",         N_("Alpha component") },
+  { "A u32",         N_("Alpha component") },
+  { "A half",        N_("Alpha component") },
+  { "A float",       N_("Alpha component") },
+  { "A double",      N_("Alpha component") }
+};
+
+static GHashTable *babl_description_hash = NULL;
+
+const gchar *
+gimp_babl_format_get_description (const Babl *babl)
+{
+  const gchar *description;
+
+  g_return_val_if_fail (babl != NULL, NULL);
+
+  if (G_UNLIKELY (! babl_description_hash))
+    {
+      gint i;
+
+      babl_description_hash = g_hash_table_new (g_str_hash,
+                                                g_str_equal);
+
+      for (i = 0; i < G_N_ELEMENTS (babl_descriptions); i++)
+        g_hash_table_insert (babl_description_hash,
+                             (gpointer) babl_descriptions[i].name,
+                             gettext (babl_descriptions[i].description));
+    }
+
+  if (babl_format_is_palette (babl))
+    {
+      if (babl_format_has_alpha (babl))
+        return _("Indexed-alpha");
+      else
+        return _("Indexed");
+    }
+
+  description = g_hash_table_lookup (babl_description_hash,
+                                     babl_get_name (babl));
+
+  if (description)
+    return description;
+
+  return g_strconcat ("ERROR: unknown Babl format ",
+                      babl_get_name (babl), NULL);
+}
+
+GimpColorProfile *
+gimp_babl_format_get_color_profile (const Babl *format)
+{
+  static GimpColorProfile *srgb_profile        = NULL;
+  static GimpColorProfile *linear_rgb_profile  = NULL;
+  static GimpColorProfile *gray_profile        = NULL;
+  static GimpColorProfile *linear_gray_profile = NULL;
+
+  g_return_val_if_fail (format != NULL, NULL);
+
+  if (gimp_babl_format_get_base_type (format) == GIMP_GRAY)
+    {
+      if (gimp_babl_format_get_linear (format))
+        {
+          if (! linear_gray_profile)
+            {
+              linear_gray_profile = gimp_color_profile_new_d65_gray_linear ();
+              g_object_add_weak_pointer (G_OBJECT (linear_gray_profile),
+                                         (gpointer) &linear_gray_profile);
+            }
+
+          return linear_gray_profile;
+        }
+      else
+        {
+          if (! gray_profile)
+            {
+              gray_profile = gimp_color_profile_new_d65_gray_srgb_trc ();
+              g_object_add_weak_pointer (G_OBJECT (gray_profile),
+                                         (gpointer) &gray_profile);
+            }
+
+          return gray_profile;
+        }
+    }
+  else
+    {
+      if (gimp_babl_format_get_linear (format))
+        {
+          if (! linear_rgb_profile)
+            {
+              linear_rgb_profile = gimp_color_profile_new_rgb_srgb_linear ();
+              g_object_add_weak_pointer (G_OBJECT (linear_rgb_profile),
+                                         (gpointer) &linear_rgb_profile);
+            }
+
+          return linear_rgb_profile;
+        }
+      else
+        {
+          if (! srgb_profile)
+            {
+              srgb_profile = gimp_color_profile_new_rgb_srgb ();
+              g_object_add_weak_pointer (G_OBJECT (srgb_profile),
+                                         (gpointer) &srgb_profile);
+            }
+
+          return srgb_profile;
+        }
+    }
+}
+
+GimpImageBaseType
+gimp_babl_format_get_base_type (const Babl *format)
+{
+  const Babl *model;
+
+  g_return_val_if_fail (format != NULL, -1);
+
+  model = babl_format_get_model (format);
+
+  if (model == babl_model ("Y")  ||
+      model == babl_model ("Y'") ||
+      model == babl_model ("YA") ||
+      model == babl_model ("Y'A"))
+    {
+      return GIMP_GRAY;
+    }
+  else if (model == babl_model ("RGB")     ||
+           model == babl_model ("R'G'B'")  ||
+           model == babl_model ("RGBA")    ||
+           model == babl_model ("R'G'B'A") ||
+           model == babl_model ("RaGaBaA") ||
+           model == babl_model ("R'aG'aB'aA"))
+    {
+      return GIMP_RGB;
+    }
+  else if (babl_format_is_palette (format))
+    {
+      return GIMP_INDEXED;
+    }
+
+  g_return_val_if_reached (-1);
+}
+
+GimpComponentType
+gimp_babl_format_get_component_type (const Babl *format)
+{
+  const Babl *type;
+
+  g_return_val_if_fail (format != NULL, -1);
+
+  type = babl_format_get_type (format, 0);
+
+  if (type == babl_type ("u8"))
+    return GIMP_COMPONENT_TYPE_U8;
+  else if (type == babl_type ("u16"))
+    return GIMP_COMPONENT_TYPE_U16;
+  else if (type == babl_type ("u32"))
+    return GIMP_COMPONENT_TYPE_U32;
+  else if (type == babl_type ("half"))
+    return GIMP_COMPONENT_TYPE_HALF;
+  else if (type == babl_type ("float"))
+    return GIMP_COMPONENT_TYPE_FLOAT;
+  else if (type == babl_type ("double"))
+    return GIMP_COMPONENT_TYPE_DOUBLE;
+
+  g_return_val_if_reached (-1);
+}
+
+GimpPrecision
+gimp_babl_format_get_precision (const Babl *format)
+{
+  const Babl *type;
+
+  g_return_val_if_fail (format != NULL, -1);
+
+  type = babl_format_get_type (format, 0);
+
+  if (gimp_babl_format_get_linear (format))
+    {
+      if (type == babl_type ("u8"))
+        return GIMP_PRECISION_U8_LINEAR;
+      else if (type == babl_type ("u16"))
+        return GIMP_PRECISION_U16_LINEAR;
+      else if (type == babl_type ("u32"))
+        return GIMP_PRECISION_U32_LINEAR;
+      else if (type == babl_type ("half"))
+        return GIMP_PRECISION_HALF_LINEAR;
+      else if (type == babl_type ("float"))
+        return GIMP_PRECISION_FLOAT_LINEAR;
+      else if (type == babl_type ("double"))
+        return GIMP_PRECISION_DOUBLE_LINEAR;
+    }
+  else
+    {
+      if (type == babl_type ("u8"))
+        return GIMP_PRECISION_U8_GAMMA;
+      else if (type == babl_type ("u16"))
+        return GIMP_PRECISION_U16_GAMMA;
+      else if (type == babl_type ("u32"))
+        return GIMP_PRECISION_U32_GAMMA;
+      else if (type == babl_type ("half"))
+        return GIMP_PRECISION_HALF_GAMMA;
+      else if (type == babl_type ("float"))
+        return GIMP_PRECISION_FLOAT_GAMMA;
+      else if (type == babl_type ("double"))
+        return GIMP_PRECISION_DOUBLE_GAMMA;
+    }
+
+  g_return_val_if_reached (-1);
+}
+
+gboolean
+gimp_babl_format_get_linear (const Babl *format)
+{
+  const Babl *model;
+
+  g_return_val_if_fail (format != NULL, FALSE);
+
+  model = babl_format_get_model (format);
+
+  if (model == babl_model ("Y")    ||
+      model == babl_model ("YA")   ||
+      model == babl_model ("RGB")  ||
+      model == babl_model ("RGBA") ||
+      model == babl_model ("RaGaBaA"))
+    {
+      return TRUE;
+    }
+  else if (model == babl_model ("Y'")      ||
+           model == babl_model ("Y'A")     ||
+           model == babl_model ("R'G'B'")  ||
+           model == babl_model ("R'G'B'A") ||
+           model == babl_model ("R'aG'aB'aA"))
+    {
+      return FALSE;
+    }
+  else if (babl_format_is_palette (format))
+    {
+      return FALSE;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+GimpComponentType
+gimp_babl_component_type (GimpPrecision precision)
+{
+  switch (precision)
+    {
+    case GIMP_PRECISION_U8_LINEAR:
+    case GIMP_PRECISION_U8_GAMMA:
+      return GIMP_COMPONENT_TYPE_U8;
+
+    case GIMP_PRECISION_U16_LINEAR:
+    case GIMP_PRECISION_U16_GAMMA:
+      return GIMP_COMPONENT_TYPE_U16;
+
+    case GIMP_PRECISION_U32_LINEAR:
+    case GIMP_PRECISION_U32_GAMMA:
+      return GIMP_COMPONENT_TYPE_U32;
+
+    case GIMP_PRECISION_HALF_LINEAR:
+    case GIMP_PRECISION_HALF_GAMMA:
+      return GIMP_COMPONENT_TYPE_HALF;
+
+    case GIMP_PRECISION_FLOAT_LINEAR:
+    case GIMP_PRECISION_FLOAT_GAMMA:
+      return GIMP_COMPONENT_TYPE_FLOAT;
+
+    case GIMP_PRECISION_DOUBLE_LINEAR:
+    case GIMP_PRECISION_DOUBLE_GAMMA:
+      return GIMP_COMPONENT_TYPE_DOUBLE;
+    }
+
+  g_return_val_if_reached (-1);
+}
+
+gboolean
+gimp_babl_linear (GimpPrecision precision)
+{
+  switch (precision)
+    {
+    case GIMP_PRECISION_U8_LINEAR:
+    case GIMP_PRECISION_U16_LINEAR:
+    case GIMP_PRECISION_U32_LINEAR:
+    case GIMP_PRECISION_HALF_LINEAR:
+    case GIMP_PRECISION_FLOAT_LINEAR:
+    case GIMP_PRECISION_DOUBLE_LINEAR:
+      return TRUE;
+
+    case GIMP_PRECISION_U8_GAMMA:
+    case GIMP_PRECISION_U16_GAMMA:
+    case GIMP_PRECISION_U32_GAMMA:
+    case GIMP_PRECISION_HALF_GAMMA:
+    case GIMP_PRECISION_FLOAT_GAMMA:
+    case GIMP_PRECISION_DOUBLE_GAMMA:
+      return FALSE;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+GimpPrecision
+gimp_babl_precision (GimpComponentType component,
+                     gboolean          linear)
+{
+  switch (component)
+    {
+    case GIMP_COMPONENT_TYPE_U8:
+      if (linear)
+        return GIMP_PRECISION_U8_LINEAR;
+      else
+        return GIMP_PRECISION_U8_GAMMA;
+
+    case GIMP_COMPONENT_TYPE_U16:
+      if (linear)
+        return GIMP_PRECISION_U16_LINEAR;
+      else
+        return GIMP_PRECISION_U16_GAMMA;
+
+    case GIMP_COMPONENT_TYPE_U32:
+      if (linear)
+        return GIMP_PRECISION_U32_LINEAR;
+      else
+        return GIMP_PRECISION_U32_GAMMA;
+
+    case GIMP_COMPONENT_TYPE_HALF:
+      if (linear)
+        return GIMP_PRECISION_HALF_LINEAR;
+      else
+        return GIMP_PRECISION_HALF_GAMMA;
+
+    case GIMP_COMPONENT_TYPE_FLOAT:
+      if (linear)
+        return GIMP_PRECISION_FLOAT_LINEAR;
+      else
+        return GIMP_PRECISION_FLOAT_GAMMA;
+
+    case GIMP_COMPONENT_TYPE_DOUBLE:
+      if (linear)
+        return GIMP_PRECISION_DOUBLE_LINEAR;
+      else
+        return GIMP_PRECISION_DOUBLE_GAMMA;
+
+    default:
+      break;
+    }
+
+  g_return_val_if_reached (-1);
+}
+
+gboolean
+gimp_babl_is_valid (GimpImageBaseType base_type,
+                    GimpPrecision     precision)
+{
+  switch (base_type)
+    {
+    case GIMP_RGB:
+    case GIMP_GRAY:
+      return TRUE;
+
+    case GIMP_INDEXED:
+      switch (precision)
+        {
+        case GIMP_PRECISION_U8_GAMMA:
+          return TRUE;
+
+        default:
+          return FALSE;
+        }
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+GimpComponentType
+gimp_babl_is_bounded (GimpPrecision precision)
+{
+  switch (gimp_babl_component_type (precision))
+    {
+    case GIMP_COMPONENT_TYPE_U8:
+    case GIMP_COMPONENT_TYPE_U16:
+    case GIMP_COMPONENT_TYPE_U32:
+      return TRUE;
+
+    case GIMP_COMPONENT_TYPE_HALF:
+    case GIMP_COMPONENT_TYPE_FLOAT:
+    case GIMP_COMPONENT_TYPE_DOUBLE:
+      return FALSE;
+    }
+
+  g_return_val_if_reached (FALSE);
+}
+
+const Babl *
+gimp_babl_format (GimpImageBaseType  base_type,
+                  GimpPrecision      precision,
+                  gboolean           with_alpha)
+{
+  switch (base_type)
+    {
+    case GIMP_RGB:
+      switch (precision)
+        {
+        case GIMP_PRECISION_U8_LINEAR:
+          if (with_alpha)
+            return babl_format ("RGBA u8");
+          else
+            return babl_format ("RGB u8");
+
+        case GIMP_PRECISION_U8_GAMMA:
+          if (with_alpha)
+            return babl_format ("R'G'B'A u8");
+          else
+            return babl_format ("R'G'B' u8");
+
+        case GIMP_PRECISION_U16_LINEAR:
+          if (with_alpha)
+            return babl_format ("RGBA u16");
+          else
+            return babl_format ("RGB u16");
+
+        case GIMP_PRECISION_U16_GAMMA:
+          if (with_alpha)
+            return babl_format ("R'G'B'A u16");
+          else
+            return babl_format ("R'G'B' u16");
+
+        case GIMP_PRECISION_U32_LINEAR:
+          if (with_alpha)
+            return babl_format ("RGBA u32");
+          else
+            return babl_format ("RGB u32");
+
+        case GIMP_PRECISION_U32_GAMMA:
+          if (with_alpha)
+            return babl_format ("R'G'B'A u32");
+          else
+            return babl_format ("R'G'B' u32");
+
+        case GIMP_PRECISION_HALF_LINEAR:
+          if (with_alpha)
+            return babl_format ("RGBA half");
+          else
+            return babl_format ("RGB half");
+
+        case GIMP_PRECISION_HALF_GAMMA:
+          if (with_alpha)
+            return babl_format ("R'G'B'A half");
+          else
+            return babl_format ("R'G'B' half");
+
+        case GIMP_PRECISION_FLOAT_LINEAR:
+          if (with_alpha)
+            return babl_format ("RGBA float");
+          else
+            return babl_format ("RGB float");
+
+        case GIMP_PRECISION_FLOAT_GAMMA:
+          if (with_alpha)
+            return babl_format ("R'G'B'A float");
+          else
+            return babl_format ("R'G'B' float");
+
+        case GIMP_PRECISION_DOUBLE_LINEAR:
+          if (with_alpha)
+            return babl_format ("RGBA double");
+          else
+            return babl_format ("RGB double");
+
+        case GIMP_PRECISION_DOUBLE_GAMMA:
+          if (with_alpha)
+            return babl_format ("R'G'B'A double");
+          else
+            return babl_format ("R'G'B' double");
+
+        default:
+          break;
+        }
+      break;
+
+    case GIMP_GRAY:
+      switch (precision)
+        {
+        case GIMP_PRECISION_U8_LINEAR:
+          if (with_alpha)
+            return babl_format ("YA u8");
+          else
+            return babl_format ("Y u8");
+
+        case GIMP_PRECISION_U8_GAMMA:
+          if (with_alpha)
+            return babl_format ("Y'A u8");
+          else
+            return babl_format ("Y' u8");
+
+        case GIMP_PRECISION_U16_LINEAR:
+          if (with_alpha)
+            return babl_format ("YA u16");
+          else
+            return babl_format ("Y u16");
+
+        case GIMP_PRECISION_U16_GAMMA:
+          if (with_alpha)
+            return babl_format ("Y'A u16");
+          else
+            return babl_format ("Y' u16");
+
+        case GIMP_PRECISION_U32_LINEAR:
+          if (with_alpha)
+            return babl_format ("YA u32");
+          else
+            return babl_format ("Y u32");
+
+        case GIMP_PRECISION_U32_GAMMA:
+          if (with_alpha)
+            return babl_format ("Y'A u32");
+          else
+            return babl_format ("Y' u32");
+
+        case GIMP_PRECISION_HALF_LINEAR:
+          if (with_alpha)
+            return babl_format ("YA half");
+          else
+            return babl_format ("Y half");
+
+        case GIMP_PRECISION_HALF_GAMMA:
+          if (with_alpha)
+            return babl_format ("Y'A half");
+          else
+            return babl_format ("Y' half");
+
+        case GIMP_PRECISION_FLOAT_LINEAR:
+          if (with_alpha)
+            return babl_format ("YA float");
+          else
+            return babl_format ("Y float");
+
+        case GIMP_PRECISION_FLOAT_GAMMA:
+          if (with_alpha)
+            return babl_format ("Y'A float");
+          else
+            return babl_format ("Y' float");
+
+        case GIMP_PRECISION_DOUBLE_LINEAR:
+          if (with_alpha)
+            return babl_format ("YA double");
+          else
+            return babl_format ("Y double");
+
+        case GIMP_PRECISION_DOUBLE_GAMMA:
+          if (with_alpha)
+            return babl_format ("Y'A double");
+          else
+            return babl_format ("Y' double");
+
+        default:
+          break;
+        }
+      break;
+
+    case GIMP_INDEXED:
+      /* need to use the image's api for this */
+      break;
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+const Babl *
+gimp_babl_mask_format (GimpPrecision precision)
+{
+  switch (gimp_babl_component_type (precision))
+    {
+    case GIMP_COMPONENT_TYPE_U8:     return babl_format ("Y u8");
+    case GIMP_COMPONENT_TYPE_U16:    return babl_format ("Y u16");
+    case GIMP_COMPONENT_TYPE_U32:    return babl_format ("Y u32");
+    case GIMP_COMPONENT_TYPE_HALF:   return babl_format ("Y half");
+    case GIMP_COMPONENT_TYPE_FLOAT:  return babl_format ("Y float");
+    case GIMP_COMPONENT_TYPE_DOUBLE: return babl_format ("Y double");
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+const Babl *
+gimp_babl_component_format (GimpImageBaseType base_type,
+                            GimpPrecision     precision,
+                            gint              index)
+{
+  switch (base_type)
+    {
+    case GIMP_RGB:
+      switch (precision)
+        {
+        case GIMP_PRECISION_U8_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("R u8");
+            case 1: return babl_format ("G u8");
+            case 2: return babl_format ("B u8");
+            case 3: return babl_format ("A u8");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U8_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("R' u8");
+            case 1: return babl_format ("G' u8");
+            case 2: return babl_format ("B' u8");
+            case 3: return babl_format ("A u8");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U16_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("R u16");
+            case 1: return babl_format ("G u16");
+            case 2: return babl_format ("B u16");
+            case 3: return babl_format ("A u16");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U16_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("R' u16");
+            case 1: return babl_format ("G' u16");
+            case 2: return babl_format ("B' u16");
+            case 3: return babl_format ("A u16");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U32_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("R u32");
+            case 1: return babl_format ("G u32");
+            case 2: return babl_format ("B u32");
+            case 3: return babl_format ("A u32");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U32_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("R' u32");
+            case 1: return babl_format ("G' u32");
+            case 2: return babl_format ("B' u32");
+            case 3: return babl_format ("A u32");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_HALF_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("R half");
+            case 1: return babl_format ("G half");
+            case 2: return babl_format ("B half");
+            case 3: return babl_format ("A half");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_HALF_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("R' half");
+            case 1: return babl_format ("G' half");
+            case 2: return babl_format ("B' half");
+            case 3: return babl_format ("A half");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_FLOAT_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("R float");
+            case 1: return babl_format ("G float");
+            case 2: return babl_format ("B float");
+            case 3: return babl_format ("A float");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_FLOAT_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("R' float");
+            case 1: return babl_format ("G' float");
+            case 2: return babl_format ("B' float");
+            case 3: return babl_format ("A float");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_DOUBLE_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("R double");
+            case 1: return babl_format ("G double");
+            case 2: return babl_format ("B double");
+            case 3: return babl_format ("A double");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_DOUBLE_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("R' double");
+            case 1: return babl_format ("G' double");
+            case 2: return babl_format ("B' double");
+            case 3: return babl_format ("A double");
+            default:
+              break;
+            }
+          break;
+
+        default:
+          break;
+        }
+      break;
+
+    case GIMP_GRAY:
+      switch (precision)
+        {
+        case GIMP_PRECISION_U8_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("Y u8");
+            case 1: return babl_format ("A u8");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U8_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("Y' u8");
+            case 1: return babl_format ("A u8");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U16_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("Y u16");
+            case 1: return babl_format ("A u16");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U16_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("Y' u16");
+            case 1: return babl_format ("A u16");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U32_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("Y u32");
+            case 1: return babl_format ("A u32");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_U32_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("Y' u32");
+            case 1: return babl_format ("A u32");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_HALF_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("Y half");
+            case 1: return babl_format ("A half");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_HALF_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("Y' half");
+            case 1: return babl_format ("A half");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_FLOAT_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("Y float");
+            case 1: return babl_format ("A float");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_FLOAT_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("Y' float");
+            case 1: return babl_format ("A float");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_DOUBLE_LINEAR:
+          switch (index)
+            {
+            case 0: return babl_format ("Y double");
+            case 1: return babl_format ("A double");
+            default:
+              break;
+            }
+          break;
+
+        case GIMP_PRECISION_DOUBLE_GAMMA:
+          switch (index)
+            {
+            case 0: return babl_format ("Y' double");
+            case 1: return babl_format ("A double");
+            default:
+              break;
+            }
+          break;
+
+        default:
+          break;
+        }
+      break;
+
+    case GIMP_INDEXED:
+      /* need to use the image's api for this */
+      break;
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+const Babl *
+gimp_babl_format_change_component_type (const Babl        *format,
+                                        GimpComponentType  component)
+{
+  g_return_val_if_fail (format != NULL, NULL);
+
+  return gimp_babl_format (gimp_babl_format_get_base_type (format),
+                           gimp_babl_precision (
+                             component,
+                             gimp_babl_format_get_linear (format)),
+                           babl_format_has_alpha (format));
+}
+
+const Babl *
+gimp_babl_format_change_linear (const Babl *format,
+                                gboolean    linear)
+{
+  g_return_val_if_fail (format != NULL, NULL);
+
+  return gimp_babl_format (gimp_babl_format_get_base_type (format),
+                           gimp_babl_precision (
+                             gimp_babl_format_get_component_type (format),
+                             linear),
+                           babl_format_has_alpha (format));
+}
+
+gchar **
+gimp_babl_print_pixel (const Babl *format,
+                       gpointer    pixel)
+{
+  GimpPrecision   precision;
+  gint            n_components;
+  guchar          tmp_pixel[32];
+  gchar         **strings;
+
+  g_return_val_if_fail (format != NULL, NULL);
+  g_return_val_if_fail (pixel != NULL, NULL);
+
+  precision = gimp_babl_format_get_precision (format);
+
+  if (babl_format_is_palette (format))
+    {
+      const Babl *f = gimp_babl_format (GIMP_RGB, precision,
+                                        babl_format_has_alpha (format));
+
+      babl_process (babl_fish (format, f), pixel, tmp_pixel, 1);
+
+      format = f;
+      pixel  = tmp_pixel;
+    }
+
+  n_components = babl_format_get_n_components (format);
+
+  strings = g_new0 (gchar *, n_components + 1);
+
+  switch (gimp_babl_format_get_component_type (format))
+    {
+    case GIMP_COMPONENT_TYPE_U8:
+      {
+        guchar *color = pixel;
+        gint    i;
+
+        for (i = 0; i < n_components; i++)
+          strings[i] = g_strdup_printf ("%d", color[i]);
+      }
+      break;
+
+    case GIMP_COMPONENT_TYPE_U16:
+      {
+        guint16 *color = pixel;
+        gint     i;
+
+        for (i = 0; i < n_components; i++)
+          strings[i] = g_strdup_printf ("%u", color[i]);
+      }
+      break;
+
+    case GIMP_COMPONENT_TYPE_U32:
+      {
+        guint32 *color = pixel;
+        gint     i;
+
+        for (i = 0; i < n_components; i++)
+          strings[i] = g_strdup_printf ("%u", color[i]);
+      }
+      break;
+
+    case GIMP_COMPONENT_TYPE_HALF:
+      {
+        GimpPrecision p;
+        const Babl   *f;
+
+        p = gimp_babl_precision (GIMP_COMPONENT_TYPE_FLOAT,
+                                 gimp_babl_format_get_linear (format));
+
+        f = gimp_babl_format (gimp_babl_format_get_base_type (format),
+                              p,
+                              babl_format_has_alpha (format));
+
+        babl_process (babl_fish (format, f), pixel, tmp_pixel, 1);
+
+        pixel = tmp_pixel;
+      }
+      /* fall through */
+
+    case GIMP_COMPONENT_TYPE_FLOAT:
+      {
+        gfloat *color = pixel;
+        gint    i;
+
+        for (i = 0; i < n_components; i++)
+          strings[i] = g_strdup_printf ("%0.6f", color[i]);
+      }
+      break;
+
+    case GIMP_COMPONENT_TYPE_DOUBLE:
+      {
+        gdouble *color = pixel;
+        gint     i;
+
+        for (i = 0; i < n_components; i++)
+          strings[i] = g_strdup_printf ("%0.6f", color[i]);
+      }
+      break;
+    }
+
+  return strings;
+}
diff --git a/app/gegl/gimp-babl.h b/app/gegl/gimp-babl.h
new file mode 100644
index 0000000..3062e02
--- /dev/null
+++ b/app/gegl/gimp-babl.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-babl.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BABL_H__
+#define __GIMP_BABL_H__
+
+
+void                gimp_babl_init                         (void);
+void                gimp_babl_init_fishes                  (GimpInitStatusFunc  status_callback);
+
+const gchar       * gimp_babl_format_get_description       (const Babl         *format);
+GimpColorProfile  * gimp_babl_format_get_color_profile     (const Babl         *format);
+
+GimpImageBaseType   gimp_babl_format_get_base_type         (const Babl         *format);
+GimpComponentType   gimp_babl_format_get_component_type    (const Babl         *format);
+GimpPrecision       gimp_babl_format_get_precision         (const Babl         *format);
+gboolean            gimp_babl_format_get_linear            (const Babl         *format);
+
+GimpComponentType   gimp_babl_component_type               (GimpPrecision       precision);
+gboolean            gimp_babl_linear                       (GimpPrecision       precision);
+GimpPrecision       gimp_babl_precision                    (GimpComponentType   component,
+                                                            gboolean            linear);
+
+gboolean            gimp_babl_is_valid                     (GimpImageBaseType   base_type,
+                                                            GimpPrecision       precision);
+GimpComponentType   gimp_babl_is_bounded                   (GimpPrecision       precision);
+
+const Babl        * gimp_babl_format                       (GimpImageBaseType   base_type,
+                                                            GimpPrecision       precision,
+                                                            gboolean            with_alpha);
+const Babl        * gimp_babl_mask_format                  (GimpPrecision       precision);
+const Babl        * gimp_babl_component_format             (GimpImageBaseType   base_type,
+                                                            GimpPrecision       precision,
+                                                            gint                index);
+
+const Babl        * gimp_babl_format_change_component_type (const Babl         *format,
+                                                            GimpComponentType   component);
+const Babl        * gimp_babl_format_change_linear         (const Babl         *format,
+                                                            gboolean            linear);
+
+gchar            ** gimp_babl_print_pixel                  (const Babl         *format,
+                                                            gpointer            pixel);
+
+
+#endif /* __GIMP_BABL_H__ */
diff --git a/app/gegl/gimp-gegl-apply-operation.c b/app/gegl/gimp-gegl-apply-operation.c
new file mode 100644
index 0000000..d76b3b1
--- /dev/null
+++ b/app/gegl/gimp-gegl-apply-operation.c
@@ -0,0 +1,827 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-apply-operation.c
+ * Copyright (C) 2012 Øyvind Kolås <pippin@gimp.org>
+ *                    Sven Neumann <sven@gimp.org>
+ *                    Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimp-utils.h"
+#include "core/gimpchunkiterator.h"
+#include "core/gimpprogress.h"
+
+#include "gimp-gegl-apply-operation.h"
+#include "gimp-gegl-loops.h"
+#include "gimp-gegl-nodes.h"
+#include "gimp-gegl-utils.h"
+
+
+/* iteration interval when applying an operation interactively
+ * (with progress indication)
+ */
+#define APPLY_OPERATION_INTERACTIVE_INTERVAL    (1.0 / 8.0) /* seconds */
+
+/* iteration interval when applying an operation non-interactively
+ * (without progress indication)
+ */
+#define APPLY_OPERATION_NON_INTERACTIVE_INTERVAL 1.0 /* seconds */
+
+
+void
+gimp_gegl_apply_operation (GeglBuffer          *src_buffer,
+                           GimpProgress        *progress,
+                           const gchar         *undo_desc,
+                           GeglNode            *operation,
+                           GeglBuffer          *dest_buffer,
+                           const GeglRectangle *dest_rect,
+                           gboolean             crop_input)
+{
+  gimp_gegl_apply_cached_operation (src_buffer,
+                                    progress, undo_desc,
+                                    operation,
+                                    src_buffer != NULL,
+                                    dest_buffer,
+                                    dest_rect,
+                                    crop_input,
+                                    NULL, NULL, 0,
+                                    FALSE);
+}
+
+static void
+gimp_gegl_apply_operation_cancel (GimpProgress *progress,
+                                  gboolean     *cancel)
+{
+  *cancel = TRUE;
+}
+
+gboolean
+gimp_gegl_apply_cached_operation (GeglBuffer          *src_buffer,
+                                  GimpProgress        *progress,
+                                  const gchar         *undo_desc,
+                                  GeglNode            *operation,
+                                  gboolean             connect_src_buffer,
+                                  GeglBuffer          *dest_buffer,
+                                  const GeglRectangle *dest_rect,
+                                  gboolean             crop_input,
+                                  GeglBuffer          *cache,
+                                  const GeglRectangle *valid_rects,
+                                  gint                 n_valid_rects,
+                                  gboolean             cancelable)
+{
+  GeglNode          *gegl;
+  GeglNode          *effect;
+  GeglNode          *dest_node;
+  GeglNode          *underlying_operation;
+  GeglNode          *operation_src_node = NULL;
+  GeglBuffer        *result_buffer;
+  GimpChunkIterator *iter;
+  cairo_region_t    *region;
+  gboolean           progress_started   = FALSE;
+  gboolean           cancel             = FALSE;
+  gint64             all_pixels;
+  gint64             done_pixels;
+
+  g_return_val_if_fail (src_buffer == NULL || GEGL_IS_BUFFER (src_buffer), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (GEGL_IS_NODE (operation), FALSE);
+  g_return_val_if_fail (GEGL_IS_BUFFER (dest_buffer), FALSE);
+  g_return_val_if_fail (cache == NULL || GEGL_IS_BUFFER (cache), FALSE);
+  g_return_val_if_fail (valid_rects == NULL || cache != NULL, FALSE);
+  g_return_val_if_fail (valid_rects == NULL || n_valid_rects != 0, FALSE);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  if (progress)
+    {
+      if (gimp_progress_is_active (progress))
+        {
+          if (undo_desc)
+            gimp_progress_set_text_literal (progress, undo_desc);
+
+          progress_started = FALSE;
+          cancelable       = FALSE;
+        }
+      else
+        {
+          gimp_progress_start (progress, cancelable, "%s", undo_desc);
+
+          if (cancelable)
+            g_signal_connect (progress, "cancel",
+                              G_CALLBACK (gimp_gegl_apply_operation_cancel),
+                              &cancel);
+
+          progress_started = TRUE;
+        }
+    }
+  else
+    {
+      cancelable = FALSE;
+    }
+
+  gegl_buffer_freeze_changed (dest_buffer);
+
+  underlying_operation = gimp_gegl_node_get_underlying_operation (operation);
+
+  result_buffer = dest_buffer;
+
+  if (result_buffer == src_buffer &&
+      ! (gimp_gegl_node_is_point_operation  (underlying_operation) ||
+         gimp_gegl_node_is_source_operation (underlying_operation)))
+    {
+      /* Write the result to a temporary buffer, instead of directly to
+       * dest_buffer, since reading and writing the same buffer doesn't
+       * generally work with non-point ops when working in chunks.
+       *
+       * See bug #701875.
+       */
+
+      if (cache)
+        {
+          /* If we have a cache, use it directly as the temporary result
+           * buffer, and skip copying the cached results to result_buffer
+           * below.  Instead, the cached results are copied together with the
+           * newly rendered results in a single step at the end of processing.
+           */
+
+          g_warn_if_fail (cache != dest_buffer);
+
+          result_buffer = g_object_ref (cache);
+
+          cache = NULL;
+        }
+      else
+        {
+          result_buffer = gegl_buffer_new (
+            dest_rect, gegl_buffer_get_format (dest_buffer));
+        }
+    }
+
+  all_pixels  = (gint64) dest_rect->width * (gint64) dest_rect->height;
+  done_pixels = 0;
+
+  region = cairo_region_create_rectangle ((cairo_rectangle_int_t *) dest_rect);
+
+  if (n_valid_rects > 0)
+    {
+      gint i;
+
+      for (i = 0; i < n_valid_rects; i++)
+        {
+          GeglRectangle valid_rect;
+
+          if (! gegl_rectangle_intersect (&valid_rect,
+                                          &valid_rects[i], dest_rect))
+            {
+              continue;
+            }
+
+          if (cache)
+            {
+              gimp_gegl_buffer_copy (
+                cache,         &valid_rect, GEGL_ABYSS_NONE,
+                result_buffer, &valid_rect);
+            }
+
+          cairo_region_subtract_rectangle (region,
+                                           (cairo_rectangle_int_t *)
+                                           &valid_rect);
+
+          done_pixels += (gint64) valid_rect.width * (gint64) valid_rect.height;
+
+          if (progress)
+            {
+              gimp_progress_set_value (progress,
+                                       (gdouble) done_pixels /
+                                       (gdouble) all_pixels);
+            }
+        }
+    }
+
+  gegl = gegl_node_new ();
+
+  if (! gegl_node_get_parent (operation))
+    gegl_node_add_child (gegl, operation);
+
+  effect = operation;
+
+  if (connect_src_buffer || crop_input)
+    {
+      GeglNode *src_node;
+
+      operation_src_node = gegl_node_get_producer (operation, "input", NULL);
+
+      src_node = operation_src_node;
+
+      if (connect_src_buffer)
+        {
+          src_node = gegl_node_new_child (gegl,
+                                          "operation", "gegl:buffer-source",
+                                          "buffer",    src_buffer,
+                                          NULL);
+        }
+
+      if (crop_input)
+        {
+          GeglNode *crop_node;
+
+          crop_node = gegl_node_new_child (gegl,
+                                           "operation", "gegl:crop",
+                                           "x",         (gdouble) dest_rect->x,
+                                           "y",         (gdouble) dest_rect->y,
+                                           "width",     (gdouble) dest_rect->width,
+                                           "height",    (gdouble) dest_rect->height,
+                                           NULL);
+
+          gegl_node_connect_to (src_node,  "output",
+                                crop_node, "input");
+
+          src_node = crop_node;
+        }
+
+      if (! gegl_node_has_pad (operation, "input"))
+        {
+          effect = gegl_node_new_child (gegl,
+                                        "operation", "gimp:normal",
+                                        NULL);
+
+          gegl_node_connect_to (operation, "output",
+                                effect,    "aux");
+        }
+
+      gegl_node_connect_to (src_node, "output",
+                            effect,   "input");
+    }
+
+  dest_node = gegl_node_new_child (gegl,
+                                   "operation", "gegl:write-buffer",
+                                   "buffer",    result_buffer,
+                                   NULL);
+
+  gegl_node_connect_to (effect,    "output",
+                        dest_node, "input");
+
+  iter = gimp_chunk_iterator_new (region);
+
+  if (progress &&
+      /* avoid the interactive iteration interval for area filters (or meta ops
+       * that potentially involve area filters), since their processing speed
+       * tends to be sensitive to the chunk size.
+       */
+      ! gimp_gegl_node_is_area_filter_operation (underlying_operation))
+    {
+      /* we use a shorter iteration interval for interactive use (when there's
+       * progress indication), to stay responsive.
+       */
+      gimp_chunk_iterator_set_interval (
+        iter,
+        APPLY_OPERATION_INTERACTIVE_INTERVAL);
+    }
+  else
+    {
+      /* we use a longer iteration interval for non-interactive use (when
+       * there's no progress indication), or when applying an area filter (see
+       * above), as this generally allows for faster processing.  we don't
+       * avoid chunking altogether, since *some* chunking is still desirable to
+       * reduce the space needed for intermediate results.
+       */
+      gimp_chunk_iterator_set_interval (
+        iter,
+        APPLY_OPERATION_NON_INTERACTIVE_INTERVAL);
+    }
+
+  while (gimp_chunk_iterator_next (iter))
+    {
+      GeglRectangle render_rect;
+
+      if (cancelable)
+        {
+          while (! cancel && g_main_context_pending (NULL))
+            g_main_context_iteration (NULL, FALSE);
+
+          if (cancel)
+            break;
+        }
+
+      while (gimp_chunk_iterator_get_rect (iter, &render_rect))
+        {
+          gegl_node_blit (dest_node, 1.0, &render_rect, NULL, NULL, 0,
+                          GEGL_BLIT_DEFAULT);
+
+          done_pixels += (gint64) render_rect.width *
+                         (gint64) render_rect.height;
+        }
+
+      if (progress)
+        {
+          gimp_progress_set_value (progress,
+                                   (gdouble) done_pixels /
+                                   (gdouble) all_pixels);
+        }
+    }
+
+  if (result_buffer != dest_buffer)
+    {
+      if (! cancel)
+        gimp_gegl_buffer_copy (result_buffer, dest_rect, GEGL_ABYSS_NONE,
+                               dest_buffer,   dest_rect);
+
+      g_object_unref (result_buffer);
+    }
+
+  gegl_buffer_thaw_changed (dest_buffer);
+
+  g_object_unref (gegl);
+
+  if (operation_src_node)
+    {
+      gegl_node_connect_to (operation_src_node, "output",
+                            operation,          "input");
+    }
+
+  if (progress_started)
+    {
+      gimp_progress_end (progress);
+
+      if (cancelable)
+        g_signal_handlers_disconnect_by_func (progress,
+                                              gimp_gegl_apply_operation_cancel,
+                                              &cancel);
+    }
+
+  return ! cancel;
+}
+
+void
+gimp_gegl_apply_dither (GeglBuffer   *src_buffer,
+                        GimpProgress *progress,
+                        const gchar  *undo_desc,
+                        GeglBuffer   *dest_buffer,
+                        gint          levels,
+                        gint          dither_type)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  levels = CLAMP (levels, 2, 65536);
+
+  node = gegl_node_new_child (NULL,
+                              "operation",     "gegl:dither",
+                              "red-levels",    levels,
+                              "green-levels",  levels,
+                              "blue-levels",   levels,
+                              "alpha-bits",    levels,
+                              "dither-method", dither_type,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_flatten (GeglBuffer          *src_buffer,
+                         GimpProgress        *progress,
+                         const gchar         *undo_desc,
+                         GeglBuffer          *dest_buffer,
+                         const GimpRGB       *background,
+                         GimpLayerColorSpace  composite_space)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+  g_return_if_fail (background != NULL);
+
+  node = gimp_gegl_create_flatten_node (background, composite_space);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_feather (GeglBuffer          *src_buffer,
+                         GimpProgress        *progress,
+                         const gchar         *undo_desc,
+                         GeglBuffer          *dest_buffer,
+                         const GeglRectangle *dest_rect,
+                         gdouble              radius_x,
+                         gdouble              radius_y,
+                         gboolean             edge_lock)
+{
+  GaussianBlurAbyssPolicy abyss_policy;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  if (edge_lock)
+    abyss_policy = GAUSSIAN_BLUR_ABYSS_CLAMP;
+  else
+    abyss_policy = GAUSSIAN_BLUR_ABYSS_NONE;
+
+  /* 3.5 is completely magic and picked to visually match the old
+   * gaussian_blur_region() on a crappy laptop display
+   */
+  gimp_gegl_apply_gaussian_blur (src_buffer,
+                                 progress, undo_desc,
+                                 dest_buffer, dest_rect,
+                                 radius_x / 3.5,
+                                 radius_y / 3.5,
+                                 abyss_policy);
+}
+
+void
+gimp_gegl_apply_border (GeglBuffer             *src_buffer,
+                        GimpProgress           *progress,
+                        const gchar            *undo_desc,
+                        GeglBuffer             *dest_buffer,
+                        const GeglRectangle    *dest_rect,
+                        gint                    radius_x,
+                        gint                    radius_y,
+                        GimpChannelBorderStyle  style,
+                        gboolean                edge_lock)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  switch (style)
+    {
+    case GIMP_CHANNEL_BORDER_STYLE_HARD:
+    case GIMP_CHANNEL_BORDER_STYLE_FEATHERED:
+      {
+        gboolean feather = style == GIMP_CHANNEL_BORDER_STYLE_FEATHERED;
+
+        node = gegl_node_new_child (NULL,
+                                    "operation", "gimp:border",
+                                    "radius-x",  radius_x,
+                                    "radius-y",  radius_y,
+                                    "feather",   feather,
+                                    "edge-lock", edge_lock,
+                                    NULL);
+      }
+      break;
+
+    case GIMP_CHANNEL_BORDER_STYLE_SMOOTH:
+      {
+        GeglNode *input, *output;
+        GeglNode *grow, *shrink, *subtract;
+
+        node   = gegl_node_new ();
+
+        input  = gegl_node_get_input_proxy (node, "input");
+        output = gegl_node_get_output_proxy (node, "output");
+
+        /* Duplicate special-case behavior of "gimp:border". */
+        if (radius_x == 1 && radius_y == 1)
+          {
+            grow   = gegl_node_new_child (node,
+                                          "operation", "gegl:nop",
+                                          NULL);
+            shrink = gegl_node_new_child (node,
+                                          "operation", "gimp:shrink",
+                                          "radius-x",  1,
+                                          "radius-y",  1,
+                                          "edge-lock", edge_lock,
+                                          NULL);
+          }
+        else
+          {
+            grow   = gegl_node_new_child (node,
+                                          "operation", "gimp:grow",
+                                          "radius-x",  radius_x,
+                                          "radius-y",  radius_y,
+                                          NULL);
+            shrink = gegl_node_new_child (node,
+                                          "operation", "gimp:shrink",
+                                          "radius-x",  radius_x + 1,
+                                          "radius-y",  radius_y + 1,
+                                          "edge-lock", edge_lock,
+                                          NULL);
+          }
+
+        subtract = gegl_node_new_child (node,
+                                        "operation", "gegl:subtract",
+                                        NULL);
+
+        gegl_node_link_many (input, grow, subtract, output, NULL);
+        gegl_node_link (input, shrink);
+        gegl_node_connect_to (shrink, "output", subtract, "aux");
+      }
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, dest_rect, TRUE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_grow (GeglBuffer          *src_buffer,
+                      GimpProgress        *progress,
+                      const gchar         *undo_desc,
+                      GeglBuffer          *dest_buffer,
+                      const GeglRectangle *dest_rect,
+                      gint                 radius_x,
+                      gint                 radius_y)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gimp:grow",
+                              "radius-x",  radius_x,
+                              "radius-y",  radius_y,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, dest_rect, TRUE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_shrink (GeglBuffer          *src_buffer,
+                        GimpProgress        *progress,
+                        const gchar         *undo_desc,
+                        GeglBuffer          *dest_buffer,
+                        const GeglRectangle *dest_rect,
+                        gint                 radius_x,
+                        gint                 radius_y,
+                        gboolean             edge_lock)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gimp:shrink",
+                              "radius-x",  radius_x,
+                              "radius-y",  radius_y,
+                              "edge-lock", edge_lock,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, dest_rect, TRUE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_flood (GeglBuffer          *src_buffer,
+                       GimpProgress        *progress,
+                       const gchar         *undo_desc,
+                       GeglBuffer          *dest_buffer,
+                       const GeglRectangle *dest_rect)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gimp:flood",
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, dest_rect, TRUE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_gaussian_blur (GeglBuffer              *src_buffer,
+                               GimpProgress            *progress,
+                               const gchar             *undo_desc,
+                               GeglBuffer              *dest_buffer,
+                               const GeglRectangle     *dest_rect,
+                               gdouble                  std_dev_x,
+                               gdouble                  std_dev_y,
+                               GaussianBlurAbyssPolicy  abyss_policy)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation",    "gegl:gaussian-blur",
+                              "std-dev-x",    std_dev_x,
+                              "std-dev-y",    std_dev_y,
+                              "abyss-policy", abyss_policy,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, dest_rect, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_invert_gamma (GeglBuffer    *src_buffer,
+                              GimpProgress  *progress,
+                              const gchar   *undo_desc,
+                              GeglBuffer    *dest_buffer)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gegl:invert-gamma",
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_invert_linear (GeglBuffer    *src_buffer,
+                               GimpProgress  *progress,
+                               const gchar   *undo_desc,
+                               GeglBuffer    *dest_buffer)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gegl:invert-linear",
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_opacity (GeglBuffer    *src_buffer,
+                         GimpProgress  *progress,
+                         const gchar   *undo_desc,
+                         GeglBuffer    *dest_buffer,
+                         GeglBuffer    *mask,
+                         gint           mask_offset_x,
+                         gint           mask_offset_y,
+                         gdouble        opacity)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+  g_return_if_fail (mask == NULL || GEGL_IS_BUFFER (mask));
+
+  node = gimp_gegl_create_apply_opacity_node (mask,
+                                              mask_offset_x,
+                                              mask_offset_y,
+                                              opacity);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_scale (GeglBuffer            *src_buffer,
+                       GimpProgress          *progress,
+                       const gchar           *undo_desc,
+                       GeglBuffer            *dest_buffer,
+                       GimpInterpolationType  interpolation_type,
+                       gdouble                x,
+                       gdouble                y)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation",   "gegl:scale-ratio",
+                              "origin-x",     0.0,
+                              "origin-y",     0.0,
+                              "sampler",      interpolation_type,
+                              "abyss-policy", GEGL_ABYSS_CLAMP,
+                              "x",            x,
+                              "y",            y,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_set_alpha (GeglBuffer    *src_buffer,
+                           GimpProgress  *progress,
+                           const gchar   *undo_desc,
+                           GeglBuffer    *dest_buffer,
+                           gdouble        value)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gimp:set-alpha",
+                              "value",     value,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_threshold (GeglBuffer    *src_buffer,
+                           GimpProgress  *progress,
+                           const gchar   *undo_desc,
+                           GeglBuffer    *dest_buffer,
+                           gdouble        value)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gegl:threshold",
+                              "value",     value,
+                              NULL);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
+
+void
+gimp_gegl_apply_transform (GeglBuffer            *src_buffer,
+                           GimpProgress          *progress,
+                           const gchar           *undo_desc,
+                           GeglBuffer            *dest_buffer,
+                           GimpInterpolationType  interpolation_type,
+                           GimpMatrix3           *transform)
+{
+  GeglNode *node;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gegl:transform",
+                              "near-z",    GIMP_TRANSFORM_NEAR_Z,
+                              "sampler",   interpolation_type,
+                              NULL);
+
+  gimp_gegl_node_set_matrix (node, transform);
+
+  gimp_gegl_apply_operation (src_buffer, progress, undo_desc,
+                             node, dest_buffer, NULL, FALSE);
+  g_object_unref (node);
+}
diff --git a/app/gegl/gimp-gegl-apply-operation.h b/app/gegl/gimp-gegl-apply-operation.h
new file mode 100644
index 0000000..3b19ee0
--- /dev/null
+++ b/app/gegl/gimp-gegl-apply-operation.h
@@ -0,0 +1,172 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-apply-operation.h
+ * Copyright (C) 2012 Øyvind Kolås <pippin@gimp.org>
+ *                    Sven Neumann <sven@gimp.org>
+ *                    Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_APPLY_OPERATION_H__
+#define __GIMP_GEGL_APPLY_OPERATION_H__
+
+
+/*  generic functions, also used by the specific ones below  */
+
+void       gimp_gegl_apply_operation        (GeglBuffer          *src_buffer,
+                                             GimpProgress        *progress,
+                                             const gchar         *undo_desc,
+                                             GeglNode            *operation,
+                                             GeglBuffer          *dest_buffer,
+                                             const GeglRectangle *dest_rect,
+                                             gboolean             crop_input);
+
+gboolean   gimp_gegl_apply_cached_operation (GeglBuffer          *src_buffer,
+                                             GimpProgress        *progress,
+                                             const gchar         *undo_desc,
+                                             GeglNode            *operation,
+                                             gboolean             connect_src_buffer,
+                                             GeglBuffer          *dest_buffer,
+                                             const GeglRectangle *dest_rect,
+                                             gboolean             crop_input,
+                                             GeglBuffer          *cache,
+                                             const GeglRectangle *valid_rects,
+                                             gint                 n_valid_rects,
+                                             gboolean             cancellable);
+
+
+/*  apply specific operations  */
+
+void   gimp_gegl_apply_dither          (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        gint                    levels,
+                                        gint                    dither_type);
+
+void   gimp_gegl_apply_flatten         (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GimpRGB          *background,
+                                        GimpLayerColorSpace     composite_space);
+
+void   gimp_gegl_apply_feather         (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GeglRectangle    *dest_rect,
+                                        gdouble                 radius_x,
+                                        gdouble                 radius_y,
+                                        gboolean                edge_lock);
+
+void   gimp_gegl_apply_border          (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GeglRectangle    *dest_rect,
+                                        gint                    radius_x,
+                                        gint                    radius_y,
+                                        GimpChannelBorderStyle  style,
+                                        gboolean                edge_lock);
+
+void   gimp_gegl_apply_grow            (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GeglRectangle    *dest_rect,
+                                        gint                    radius_x,
+                                        gint                    radius_y);
+
+void   gimp_gegl_apply_shrink          (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GeglRectangle    *dest_rect,
+                                        gint                    radius_x,
+                                        gint                    radius_y,
+                                        gboolean                edge_lock);
+
+void   gimp_gegl_apply_flood           (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GeglRectangle    *dest_rect);
+
+/* UGLY: private enum of gegl:gaussian-blur */
+typedef enum
+{
+  GAUSSIAN_BLUR_ABYSS_NONE,
+  GAUSSIAN_BLUR_ABYSS_CLAMP
+} GaussianBlurAbyssPolicy;
+
+void   gimp_gegl_apply_gaussian_blur   (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        const GeglRectangle    *dest_rect,
+                                        gdouble                 std_dev_x,
+                                        gdouble                 std_dev_y,
+                                        GaussianBlurAbyssPolicy abyss_policy);
+
+void   gimp_gegl_apply_invert_gamma    (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer);
+
+void   gimp_gegl_apply_invert_linear   (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer);
+
+void   gimp_gegl_apply_opacity         (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        GeglBuffer             *mask,
+                                        gint                    mask_offset_x,
+                                        gint                    mask_offset_y,
+                                        gdouble                 opacity);
+
+void   gimp_gegl_apply_scale           (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        GimpInterpolationType   interpolation_type,
+                                        gdouble                 x,
+                                        gdouble                 y);
+
+void   gimp_gegl_apply_set_alpha       (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        gdouble                 value);
+
+void   gimp_gegl_apply_threshold       (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        gdouble                 value);
+
+void   gimp_gegl_apply_transform       (GeglBuffer             *src_buffer,
+                                        GimpProgress           *progress,
+                                        const gchar            *undo_desc,
+                                        GeglBuffer             *dest_buffer,
+                                        GimpInterpolationType   interpolation_type,
+                                        GimpMatrix3            *transform);
+
+
+#endif /* __GIMP_GEGL_APPLY_OPERATION_H__ */
diff --git a/app/gegl/gimp-gegl-enums.c b/app/gegl/gimp-gegl-enums.c
new file mode 100644
index 0000000..de9c7b5
--- /dev/null
+++ b/app/gegl/gimp-gegl-enums.c
@@ -0,0 +1,43 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "core/core-enums.h"
+#include "gimp-gegl-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "gimp-gegl-enums.h" */
+GType
+gimp_cage_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CAGE_MODE_CAGE_CHANGE, "GIMP_CAGE_MODE_CAGE_CHANGE", "cage-change" },
+    { GIMP_CAGE_MODE_DEFORM, "GIMP_CAGE_MODE_DEFORM", "deform" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CAGE_MODE_CAGE_CHANGE, NC_("cage-mode", "Create or adjust the cage"), NULL },
+    { GIMP_CAGE_MODE_DEFORM, NC_("cage-mode", "Deform the cage\nto deform the image"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCageMode", values);
+      gimp_type_set_translation_context (type, "cage-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/gegl/gimp-gegl-enums.h b/app/gegl/gimp-gegl-enums.h
new file mode 100644
index 0000000..022c93a
--- /dev/null
+++ b/app/gegl/gimp-gegl-enums.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-enums.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_ENUMS_H__
+#define __GIMP_GEGL_ENUMS_H__
+
+
+#define GIMP_TYPE_CAGE_MODE (gimp_cage_mode_get_type ())
+
+GType gimp_cage_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CAGE_MODE_CAGE_CHANGE, /*< desc="Create or adjust the cage"            >*/
+  GIMP_CAGE_MODE_DEFORM       /*< desc="Deform the cage\nto deform the image" >*/
+} GimpCageMode;
+
+
+#endif /* __GIMP_GEGL_ENUMS_H__ */
diff --git a/app/gegl/gimp-gegl-loops-sse2.c b/app/gegl/gimp-gegl-loops-sse2.c
new file mode 100644
index 0000000..b9bf3ae
--- /dev/null
+++ b/app/gegl/gimp-gegl-loops-sse2.c
@@ -0,0 +1,127 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-loops-sse2.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-gegl-loops-sse2.h"
+
+
+#if COMPILE_SSE2_INTRINISICS
+
+#include <emmintrin.h>
+
+
+/* helper function of gimp_gegl_smudge_with_paint_process_sse2()
+ * src and dest can be the same address
+ */
+static inline void
+gimp_gegl_smudge_with_paint_blend_sse2 (const gfloat *src1,
+                                        gfloat        src1_rate,
+                                        const gfloat *src2,
+                                        gfloat        src2_rate,
+                                        gfloat       *dest,
+                                        gboolean      no_erasing_src2)
+{
+  /* 2017/4/13 shark0r : According to my test, SSE decreases about 25%
+   * execution time
+   */
+
+  __m128  v_src1 = _mm_loadu_ps (src1);
+  __m128  v_src2 = _mm_loadu_ps (src2);
+  __m128 *v_dest = (__v4sf *) dest;
+
+  gfloat  orginal_src2_alpha;
+  gfloat  src1_alpha;
+  gfloat  src2_alpha;
+  gfloat  result_alpha;
+
+  orginal_src2_alpha = v_src2[3];
+  src1_alpha         = src1_rate * v_src1[3];
+  src2_alpha         = src2_rate * orginal_src2_alpha;
+  result_alpha       = src1_alpha + src2_alpha;
+
+  if (result_alpha == 0)
+    {
+      *v_dest = _mm_set1_ps (0);
+      return;
+    }
+
+  *v_dest = (v_src1 * _mm_set1_ps (src1_alpha) +
+             v_src2 * _mm_set1_ps (src2_alpha)) /
+            _mm_set1_ps (result_alpha);
+
+  if (no_erasing_src2)
+    {
+      result_alpha = MAX (result_alpha, orginal_src2_alpha);
+    }
+
+  dest[3] = result_alpha;
+}
+
+/* helper function of gimp_gegl_smudge_with_paint()
+ *
+ * note that it's the caller's responsibility to verify that the buffers are
+ * properly aligned
+ */
+void
+gimp_gegl_smudge_with_paint_process_sse2 (gfloat       *accum,
+                                          const gfloat *canvas,
+                                          gfloat       *paint,
+                                          gint          count,
+                                          const gfloat *brush_color,
+                                          gfloat        brush_a,
+                                          gboolean      no_erasing,
+                                          gfloat        flow,
+                                          gfloat        rate)
+{
+  while (count--)
+    {
+      /* blend accum_buffer and canvas_buffer to accum_buffer */
+      gimp_gegl_smudge_with_paint_blend_sse2 (accum, rate, canvas, 1 - rate,
+                                              accum, no_erasing);
+
+      /* blend accum_buffer and brush color/pixmap to paint_buffer */
+      if (brush_a == 0) /* pure smudge */
+        {
+          memcpy (paint, accum, sizeof (gfloat) * 4);
+        }
+      else
+        {
+          const gfloat *src1 = brush_color ? brush_color : paint;
+
+          gimp_gegl_smudge_with_paint_blend_sse2 (src1, flow, accum, 1 - flow,
+                                                  paint, no_erasing);
+        }
+
+      accum  += 4;
+      canvas += 4;
+      paint  += 4;
+    }
+}
+
+#endif /* COMPILE_SSE2_INTRINISICS */
diff --git a/app/gegl/gimp-gegl-loops-sse2.h b/app/gegl/gimp-gegl-loops-sse2.h
new file mode 100644
index 0000000..fc8100c
--- /dev/null
+++ b/app/gegl/gimp-gegl-loops-sse2.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-loops-sse2.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_LOOPS_SSE2_H__
+#define __GIMP_GEGL_LOOPS_SSE2_H__
+
+
+#if COMPILE_SSE2_INTRINISICS
+
+void   gimp_gegl_smudge_with_paint_process_sse2 (gfloat       *accum,
+                                                 const gfloat *canvas,
+                                                 gfloat       *paint,
+                                                 gint          count,
+                                                 const gfloat *brush_color,
+                                                 gfloat        brush_a,
+                                                 gboolean      no_erasing,
+                                                 gfloat        flow,
+                                                 gfloat        rate);
+
+#endif /* COMPILE_SSE2_INTRINISICS */
+
+
+#endif /* __GIMP_GEGL_LOOPS_SSE2_H__ */
diff --git a/app/gegl/gimp-gegl-loops.cc b/app/gegl/gimp-gegl-loops.cc
new file mode 100644
index 0000000..4564bcd
--- /dev/null
+++ b/app/gegl/gimp-gegl-loops.cc
@@ -0,0 +1,1089 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-loops.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+#include <gegl-buffer-backend.h>
+
+extern "C"
+{
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-babl.h"
+#include "gimp-gegl-loops.h"
+#include "gimp-gegl-loops-sse2.h"
+
+#include "core/gimp-atomic.h"
+#include "core/gimp-utils.h"
+#include "core/gimpprogress.h"
+
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+#define SHIFTED_AREA(dest, src)                                                \
+  const GeglRectangle dest##_area_ = {                                         \
+    src##_area->x + (dest##_rect->x - src##_rect->x),                          \
+    src##_area->y + (dest##_rect->y - src##_rect->y),                          \
+    src##_area->width, src##_area->height                                      \
+  };                                                                           \
+  const GeglRectangle * const dest##_area = &dest##_area_
+
+
+void
+gimp_gegl_buffer_copy (GeglBuffer          *src_buffer,
+                       const GeglRectangle *src_rect,
+                       GeglAbyssPolicy      abyss_policy,
+                       GeglBuffer          *dest_buffer,
+                       const GeglRectangle *dest_rect)
+{
+  GeglRectangle real_dest_rect;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
+
+  if (! src_rect)
+    src_rect = gegl_buffer_get_extent (src_buffer);
+
+  if (! dest_rect)
+    dest_rect = src_rect;
+
+  real_dest_rect        = *dest_rect;
+  real_dest_rect.width  = src_rect->width;
+  real_dest_rect.height = src_rect->height;
+
+  dest_rect = &real_dest_rect;
+
+  if (gegl_buffer_get_format (src_buffer) ==
+      gegl_buffer_get_format (dest_buffer))
+    {
+      gboolean      skip_abyss = FALSE;
+      GeglRectangle src_abyss;
+      GeglRectangle dest_abyss;
+
+      if (abyss_policy == GEGL_ABYSS_NONE)
+        {
+          src_abyss  = *gegl_buffer_get_abyss (src_buffer);
+          dest_abyss = *gegl_buffer_get_abyss (dest_buffer);
+
+          skip_abyss = ! (gegl_rectangle_contains (&src_abyss,  src_rect) &&
+                          gegl_rectangle_contains (&dest_abyss, dest_rect));
+        }
+
+      if (skip_abyss)
+        {
+          if (src_buffer < dest_buffer)
+            {
+              gegl_tile_handler_lock (GEGL_TILE_HANDLER (src_buffer));
+              gegl_tile_handler_lock (GEGL_TILE_HANDLER (dest_buffer));
+            }
+          else
+            {
+              gegl_tile_handler_lock (GEGL_TILE_HANDLER (dest_buffer));
+              gegl_tile_handler_lock (GEGL_TILE_HANDLER (src_buffer));
+            }
+
+          gegl_buffer_set_abyss (src_buffer,  src_rect);
+          gegl_buffer_set_abyss (dest_buffer, dest_rect);
+        }
+
+      gegl_buffer_copy (src_buffer, src_rect, abyss_policy,
+                        dest_buffer, dest_rect);
+
+      if (skip_abyss)
+        {
+          gegl_buffer_set_abyss (src_buffer,  &src_abyss);
+          gegl_buffer_set_abyss (dest_buffer, &dest_abyss);
+
+          gegl_tile_handler_unlock (GEGL_TILE_HANDLER (src_buffer));
+          gegl_tile_handler_unlock (GEGL_TILE_HANDLER (dest_buffer));
+        }
+    }
+  else
+    {
+      gegl_parallel_distribute_area (
+        src_rect, PIXELS_PER_THREAD,
+        [=] (const GeglRectangle *src_area)
+        {
+          SHIFTED_AREA (dest, src);
+
+          gegl_buffer_copy (src_buffer, src_area, abyss_policy,
+                            dest_buffer, dest_area);
+        });
+    }
+}
+
+void
+gimp_gegl_clear (GeglBuffer          *buffer,
+                 const GeglRectangle *rect)
+{
+  const Babl *format;
+  gint        bpp;
+  gint        n_components;
+  gint        bpc;
+  gint        alpha_offset;
+
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+
+  if (! rect)
+    rect = gegl_buffer_get_extent (buffer);
+
+  format = gegl_buffer_get_format (buffer);
+
+  if (! babl_format_has_alpha (format))
+    return;
+
+  bpp          = babl_format_get_bytes_per_pixel (format);
+  n_components = babl_format_get_n_components (format);
+  bpc          = bpp / n_components;
+  alpha_offset = (n_components - 1) * bpc;
+
+  gegl_parallel_distribute_area (
+    rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *area)
+    {
+      GeglBufferIterator *iter;
+
+      iter = gegl_buffer_iterator_new (buffer, area, 0, format,
+                                       GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE,
+                                       1);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          guint8 *data = (guint8 *) iter->items[0].data;
+          gint    i;
+
+          data += alpha_offset;
+
+          for (i = 0; i < iter->length; i++)
+            {
+              memset (data, 0, bpc);
+
+              data += bpp;
+            }
+        }
+    });
+}
+
+void
+gimp_gegl_convolve (GeglBuffer          *src_buffer,
+                    const GeglRectangle *src_rect,
+                    GeglBuffer          *dest_buffer,
+                    const GeglRectangle *dest_rect,
+                    const gfloat        *kernel,
+                    gint                 kernel_size,
+                    gdouble              divisor,
+                    GimpConvolutionType  mode,
+                    gboolean             alpha_weighting)
+{
+  gfloat     *src;
+  gint        src_rowstride;
+
+  const Babl *src_format;
+  const Babl *dest_format;
+  gint        src_components;
+  gint        dest_components;
+  gfloat      offset;
+
+  if (! src_rect)
+    src_rect = gegl_buffer_get_extent (src_buffer);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  src_format = gegl_buffer_get_format (src_buffer);
+
+  if (babl_format_is_palette (src_format))
+    src_format = gimp_babl_format (GIMP_RGB,
+                                   GIMP_PRECISION_FLOAT_LINEAR,
+                                   babl_format_has_alpha (src_format));
+  else
+    src_format = gimp_babl_format (gimp_babl_format_get_base_type (src_format),
+                                   GIMP_PRECISION_FLOAT_LINEAR,
+                                   babl_format_has_alpha (src_format));
+
+  dest_format = gegl_buffer_get_format (dest_buffer);
+
+  if (babl_format_is_palette (dest_format))
+    dest_format = gimp_babl_format (GIMP_RGB,
+                                    GIMP_PRECISION_FLOAT_LINEAR,
+                                    babl_format_has_alpha (dest_format));
+  else
+    dest_format = gimp_babl_format (gimp_babl_format_get_base_type (dest_format),
+                                    GIMP_PRECISION_FLOAT_LINEAR,
+                                    babl_format_has_alpha (dest_format));
+
+  src_components  = babl_format_get_n_components (src_format);
+  dest_components = babl_format_get_n_components (dest_format);
+
+  /* Get source pixel data */
+  src_rowstride = src_components * src_rect->width;
+  src = g_new (gfloat, src_rowstride * src_rect->height);
+  gegl_buffer_get (src_buffer, src_rect, 1.0, src_format, src,
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  /*  If the mode is NEGATIVE_CONVOL, the offset should be 0.5  */
+  if (mode == GIMP_NEGATIVE_CONVOL)
+    {
+      offset = 0.5;
+      mode = GIMP_NORMAL_CONVOL;
+    }
+  else
+    {
+      offset = 0.0;
+    }
+
+  gegl_parallel_distribute_area (
+    dest_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *dest_area)
+    {
+      const gint          components  = src_components;
+      const gint          a_component = components - 1;
+      const gint          margin      = kernel_size / 2;
+      GeglBufferIterator *dest_iter;
+
+      /* Set up dest iterator */
+      dest_iter = gegl_buffer_iterator_new (dest_buffer, dest_area, 0, dest_format,
+                                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE, 1);
+
+      while (gegl_buffer_iterator_next (dest_iter))
+        {
+          /*  Convolve the src image using the convolution kernel, writing
+           *  to dest Convolve is not tile-enabled--use accordingly
+           */
+          gfloat     *dest    = (gfloat *) dest_iter->items[0].data;
+          const gint  x1      = 0;
+          const gint  y1      = 0;
+          const gint  x2      = src_rect->width  - 1;
+          const gint  y2      = src_rect->height - 1;
+          const gint  dest_x1 = dest_iter->items[0].roi.x;
+          const gint  dest_y1 = dest_iter->items[0].roi.y;
+          const gint  dest_x2 = dest_iter->items[0].roi.x + dest_iter->items[0].roi.width;
+          const gint  dest_y2 = dest_iter->items[0].roi.y + dest_iter->items[0].roi.height;
+          gint        x, y;
+
+          for (y = dest_y1; y < dest_y2; y++)
+            {
+              gfloat *d = dest;
+
+              if (alpha_weighting)
+                {
+                  for (x = dest_x1; x < dest_x2; x++)
+                    {
+                      const gfloat *m                = kernel;
+                      gdouble       total[4]         = { 0.0, 0.0, 0.0, 0.0 };
+                      gdouble       weighted_divisor = 0.0;
+                      gint          i, j, b;
+
+                      for (j = y - margin; j <= y + margin; j++)
+                        {
+                          for (i = x - margin; i <= x + margin; i++, m++)
+                            {
+                              gint          xx = CLAMP (i, x1, x2);
+                              gint          yy = CLAMP (j, y1, y2);
+                              const gfloat *s  = src + yy * src_rowstride + xx * components;
+                              const gfloat  a  = s[a_component];
+
+                              if (a)
+                                {
+                                  gdouble mult_alpha = *m * a;
+
+                                  weighted_divisor += mult_alpha;
+
+                                  for (b = 0; b < a_component; b++)
+                                    total[b] += mult_alpha * s[b];
+
+                                  total[a_component] += mult_alpha;
+                                }
+                            }
+                        }
+
+                      if (weighted_divisor == 0.0)
+                        weighted_divisor = divisor;
+
+                      for (b = 0; b < a_component; b++)
+                        total[b] /= weighted_divisor;
+
+                      total[a_component] /= divisor;
+
+                      for (b = 0; b < components; b++)
+                        {
+                          total[b] += offset;
+
+                          if (mode != GIMP_NORMAL_CONVOL && total[b] < 0.0)
+                            total[b] = - total[b];
+
+                          *d++ = CLAMP (total[b], 0.0, 1.0);
+                        }
+                    }
+                }
+              else
+                {
+                  for (x = dest_x1; x < dest_x2; x++)
+                    {
+                      const gfloat *m        = kernel;
+                      gdouble       total[4] = { 0.0, 0.0, 0.0, 0.0 };
+                      gint          i, j, b;
+
+                      for (j = y - margin; j <= y + margin; j++)
+                        {
+                          for (i = x - margin; i <= x + margin; i++, m++)
+                            {
+                              gint          xx = CLAMP (i, x1, x2);
+                              gint          yy = CLAMP (j, y1, y2);
+                              const gfloat *s  = src + yy * src_rowstride + xx * components;
+
+                              for (b = 0; b < components; b++)
+                                total[b] += *m * s[b];
+                            }
+                        }
+
+                      for (b = 0; b < components; b++)
+                        {
+                          total[b] = total[b] / divisor + offset;
+
+                          if (mode != GIMP_NORMAL_CONVOL && total[b] < 0.0)
+                            total[b] = - total[b];
+
+                          *d++ = CLAMP (total[b], 0.0, 1.0);
+                        }
+                    }
+                }
+
+              dest += dest_iter->items[0].roi.width * dest_components;
+            }
+        }
+    });
+
+  g_free (src);
+}
+
+static inline gfloat
+odd_powf (gfloat x,
+          gfloat y)
+{
+  if (x >= 0.0f)
+    return  powf ( x, y);
+  else
+    return -powf (-x, y);
+}
+
+void
+gimp_gegl_dodgeburn (GeglBuffer          *src_buffer,
+                     const GeglRectangle *src_rect,
+                     GeglBuffer          *dest_buffer,
+                     const GeglRectangle *dest_rect,
+                     gdouble              exposure,
+                     GimpDodgeBurnType    type,
+                     GimpTransferMode     mode)
+{
+  if (type == GIMP_DODGE_BURN_TYPE_BURN)
+    exposure = -exposure;
+
+  if (! src_rect)
+    src_rect = gegl_buffer_get_extent (src_buffer);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  gegl_parallel_distribute_area (
+    src_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *src_area)
+    {
+      GeglBufferIterator *iter;
+
+      SHIFTED_AREA (dest, src);
+
+      iter = gegl_buffer_iterator_new (src_buffer, src_area, 0,
+                                       babl_format ("R'G'B'A float"),
+                                       GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0,
+                                babl_format ("R'G'B'A float"),
+                                GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+      switch (mode)
+        {
+          gfloat factor;
+
+        case GIMP_TRANSFER_HIGHLIGHTS:
+          factor = 1.0 + exposure * (0.333333);
+
+          while (gegl_buffer_iterator_next (iter))
+            {
+              gfloat *src   = (gfloat *) iter->items[0].data;
+              gfloat *dest  = (gfloat *) iter->items[1].data;
+              gint    count = iter->length;
+
+              while (count--)
+                {
+                  *dest++ = *src++ * factor;
+                  *dest++ = *src++ * factor;
+                  *dest++ = *src++ * factor;
+
+                  *dest++ = *src++;
+                }
+            }
+          break;
+
+        case GIMP_TRANSFER_MIDTONES:
+          if (exposure < 0)
+            factor = 1.0 - exposure * (0.333333);
+          else
+            factor = 1.0 / (1.0 + exposure);
+
+          while (gegl_buffer_iterator_next (iter))
+            {
+              gfloat *src   = (gfloat *) iter->items[0].data;
+              gfloat *dest  = (gfloat *) iter->items[1].data;
+              gint    count = iter->length;
+
+              while (count--)
+                {
+                  *dest++ = odd_powf (*src++, factor);
+                  *dest++ = odd_powf (*src++, factor);
+                  *dest++ = odd_powf (*src++, factor);
+
+                  *dest++ = *src++;
+                }
+            }
+          break;
+
+        case GIMP_TRANSFER_SHADOWS:
+          if (exposure >= 0)
+            factor = 0.333333 * exposure;
+          else
+            factor = -0.333333 * exposure;
+
+          while (gegl_buffer_iterator_next (iter))
+            {
+              gfloat *src   = (gfloat *) iter->items[0].data;
+              gfloat *dest  = (gfloat *) iter->items[1].data;
+              gint    count = iter->length;
+
+              while (count--)
+                {
+                  if (exposure >= 0)
+                    {
+                      gfloat s;
+
+                      s = *src++; *dest++ = factor + s - factor * s;
+                      s = *src++; *dest++ = factor + s - factor * s;
+                      s = *src++; *dest++ = factor + s - factor * s;
+                    }
+                  else
+                    {
+                      gfloat s;
+
+                      s = *src++;
+                      if (s < factor)
+                        *dest++ = 0;
+                      else /* factor <= value <=1 */
+                        *dest++ = (s - factor) / (1.0 - factor);
+
+                      s = *src++;
+                      if (s < factor)
+                        *dest++ = 0;
+                      else /* factor <= value <=1 */
+                        *dest++ = (s - factor) / (1.0 - factor);
+
+                      s = *src++;
+                      if (s < factor)
+                        *dest++ = 0;
+                      else /* factor <= value <=1 */
+                        *dest++ = (s - factor) / (1.0 - factor);
+                    }
+
+                  *dest++ = *src++;
+               }
+            }
+          break;
+        }
+    });
+}
+
+/* helper function of gimp_gegl_smudge_with_paint_process()
+   src and dest can be the same address
+ */
+static inline void
+gimp_gegl_smudge_with_paint_blend (const gfloat *src1,
+                                   gfloat        src1_rate,
+                                   const gfloat *src2,
+                                   gfloat        src2_rate,
+                                   gfloat       *dest,
+                                   gboolean      no_erasing_src2)
+{
+  gfloat orginal_src2_alpha;
+  gfloat src1_alpha;
+  gfloat src2_alpha;
+  gfloat result_alpha;
+  gint   b;
+
+  orginal_src2_alpha = src2[3];
+  src1_alpha         = src1_rate * src1[3];
+  src2_alpha         = src2_rate * orginal_src2_alpha;
+  result_alpha       = src1_alpha + src2_alpha;
+
+  if (result_alpha == 0)
+    {
+      memset (dest, 0, sizeof (gfloat) * 4);
+      return;
+    }
+
+  for (b = 0; b < 3; b++)
+    dest[b] = (src1[b] * src1_alpha + src2[b] * src2_alpha) / result_alpha;
+
+  if (no_erasing_src2)
+    {
+      result_alpha = MAX (result_alpha, orginal_src2_alpha);
+    }
+
+  dest[3] = result_alpha;
+}
+
+/* helper function of gimp_gegl_smudge_with_paint() */
+static void
+gimp_gegl_smudge_with_paint_process (gfloat       *accum,
+                                     const gfloat *canvas,
+                                     gfloat       *paint,
+                                     gint          count,
+                                     const gfloat *brush_color,
+                                     gfloat        brush_a,
+                                     gboolean      no_erasing,
+                                     gfloat        flow,
+                                     gfloat        rate)
+{
+  while (count--)
+    {
+      /* blend accum_buffer and canvas_buffer to accum_buffer */
+      gimp_gegl_smudge_with_paint_blend (accum, rate, canvas, 1 - rate,
+                                         accum, no_erasing);
+
+      /* blend accum_buffer and brush color/pixmap to paint_buffer */
+      if (brush_a == 0) /* pure smudge */
+        {
+          memcpy (paint, accum, sizeof (gfloat) * 4);
+        }
+      else
+        {
+          const gfloat *src1 = brush_color ? brush_color : paint;
+
+          gimp_gegl_smudge_with_paint_blend (src1, flow, accum, 1 - flow,
+                                             paint, no_erasing);
+        }
+
+      accum  += 4;
+      canvas += 4;
+      paint  += 4;
+    }
+}
+
+/*  smudge painting calculation. Currently only smudge tool uses this function
+ *  Accum = rate*Accum + (1-rate)*Canvas
+ *  if brush_color!=NULL
+ *    Paint = flow*brushColor + (1-flow)*Accum
+ *  else
+ *    Paint = flow*Paint + (1-flow)*Accum
+ */
+void
+gimp_gegl_smudge_with_paint (GeglBuffer          *accum_buffer,
+                             const GeglRectangle *accum_rect,
+                             GeglBuffer          *canvas_buffer,
+                             const GeglRectangle *canvas_rect,
+                             const GimpRGB       *brush_color,
+                             GeglBuffer          *paint_buffer,
+                             gboolean             no_erasing,
+                             gdouble              flow,
+                             gdouble              rate)
+{
+  gfloat         brush_color_float[4];
+  gfloat         brush_a = flow;
+  GeglAccessMode paint_buffer_access_mode = (brush_color ?
+                                             GEGL_ACCESS_WRITE :
+                                             GEGL_ACCESS_READWRITE);
+#if COMPILE_SSE2_INTRINISICS
+  gboolean       sse2 = (gimp_cpu_accel_get_support () &
+                         GIMP_CPU_ACCEL_X86_SSE2);
+#endif
+
+  if (! accum_rect)
+    accum_rect = gegl_buffer_get_extent (accum_buffer);
+
+  if (! canvas_rect)
+    canvas_rect = gegl_buffer_get_extent (canvas_buffer);
+
+  /* convert brush color from double to float */
+  if (brush_color)
+    {
+      const gdouble *brush_color_ptr = &brush_color->r;
+      gint           b;
+
+      for (b = 0; b < 4; b++)
+        brush_color_float[b] = brush_color_ptr[b];
+
+      brush_a *= brush_color_ptr[3];
+    }
+
+  gegl_parallel_distribute_area (
+    accum_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *accum_area)
+    {
+      GeglBufferIterator *iter;
+
+      SHIFTED_AREA (canvas, accum);
+
+      iter = gegl_buffer_iterator_new (accum_buffer, accum_area, 0,
+                                       babl_format ("RGBA float"),
+                                       GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE, 3);
+
+      gegl_buffer_iterator_add (iter, canvas_buffer, canvas_area, 0,
+                                babl_format ("RGBA float"),
+                                GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+
+      gegl_buffer_iterator_add (iter, paint_buffer,
+                                GEGL_RECTANGLE (accum_area->x - accum_rect->x,
+                                                accum_area->y - accum_rect->y,
+                                                0, 0),
+                                0,
+                                babl_format ("RGBA float"),
+                                paint_buffer_access_mode, GEGL_ABYSS_NONE);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          gfloat       *accum  = (gfloat *)       iter->items[0].data;
+          const gfloat *canvas = (const gfloat *) iter->items[1].data;
+          gfloat       *paint  = (gfloat *)       iter->items[2].data;
+          gint          count  = iter->length;
+
+#if COMPILE_SSE2_INTRINISICS
+          if (sse2 && ((guintptr) accum                                     |
+                       (guintptr) canvas                                    |
+                       (guintptr) (brush_color ? brush_color_float : paint) |
+                       (guintptr) paint) % 16 == 0)
+            {
+              gimp_gegl_smudge_with_paint_process_sse2 (accum, canvas, paint, count,
+                                                        brush_color ? brush_color_float :
+                                                                      NULL,
+                                                        brush_a,
+                                                        no_erasing, flow, rate);
+            }
+          else
+#endif
+            {
+              gimp_gegl_smudge_with_paint_process (accum, canvas, paint, count,
+                                                   brush_color ? brush_color_float :
+                                                                 NULL,
+                                                   brush_a,
+                                                   no_erasing, flow, rate);
+            }
+        }
+    });
+}
+
+void
+gimp_gegl_apply_mask (GeglBuffer          *mask_buffer,
+                      const GeglRectangle *mask_rect,
+                      GeglBuffer          *dest_buffer,
+                      const GeglRectangle *dest_rect,
+                      gdouble              opacity)
+{
+  if (! mask_rect)
+    mask_rect = gegl_buffer_get_extent (mask_buffer);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  gegl_parallel_distribute_area (
+    mask_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *mask_area)
+    {
+      GeglBufferIterator *iter;
+
+      SHIFTED_AREA (dest, mask);
+
+      iter = gegl_buffer_iterator_new (mask_buffer, mask_area, 0,
+                                       babl_format ("Y float"),
+                                       GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0,
+                                babl_format ("RGBA float"),
+                                GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const gfloat *mask  = (const gfloat *) iter->items[0].data;
+          gfloat       *dest  = (gfloat *)       iter->items[1].data;
+          gint          count = iter->length;
+
+          while (count--)
+            {
+              dest[3] *= *mask * opacity;
+
+              mask += 1;
+              dest += 4;
+            }
+        }
+    });
+}
+
+void
+gimp_gegl_combine_mask (GeglBuffer          *mask_buffer,
+                        const GeglRectangle *mask_rect,
+                        GeglBuffer          *dest_buffer,
+                        const GeglRectangle *dest_rect,
+                        gdouble              opacity)
+{
+  if (! mask_rect)
+    mask_rect = gegl_buffer_get_extent (mask_buffer);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  gegl_parallel_distribute_area (
+    mask_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *mask_area)
+    {
+      GeglBufferIterator *iter;
+
+      SHIFTED_AREA (dest, mask);
+
+      iter = gegl_buffer_iterator_new (mask_buffer, mask_area, 0,
+                                       babl_format ("Y float"),
+                                       GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0,
+                                babl_format ("Y float"),
+                                GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const gfloat *mask  = (const gfloat *) iter->items[0].data;
+          gfloat       *dest  = (gfloat *)       iter->items[1].data;
+          gint          count = iter->length;
+
+          while (count--)
+            {
+              *dest *= *mask * opacity;
+
+              mask += 1;
+              dest += 1;
+            }
+        }
+    });
+}
+
+void
+gimp_gegl_combine_mask_weird (GeglBuffer          *mask_buffer,
+                              const GeglRectangle *mask_rect,
+                              GeglBuffer          *dest_buffer,
+                              const GeglRectangle *dest_rect,
+                              gdouble              opacity,
+                              gboolean             stipple)
+{
+  if (! mask_rect)
+    mask_rect = gegl_buffer_get_extent (mask_buffer);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  gegl_parallel_distribute_area (
+    mask_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *mask_area)
+    {
+      GeglBufferIterator *iter;
+
+      SHIFTED_AREA (dest, mask);
+
+      iter = gegl_buffer_iterator_new (mask_buffer, mask_area, 0,
+                                       babl_format ("Y float"),
+                                       GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, dest_buffer, dest_area, 0,
+                                babl_format ("Y float"),
+                                GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const gfloat *mask  = (const gfloat *) iter->items[0].data;
+          gfloat       *dest  = (gfloat *)       iter->items[1].data;
+          gint          count = iter->length;
+
+          if (stipple)
+            {
+              while (count--)
+                {
+                  dest[0] += (1.0 - dest[0]) * *mask * opacity;
+
+                  mask += 1;
+                  dest += 1;
+                }
+            }
+          else
+            {
+              while (count--)
+                {
+                  if (opacity > dest[0])
+                    dest[0] += (opacity - dest[0]) * *mask * opacity;
+
+                  mask += 1;
+                  dest += 1;
+                }
+            }
+        }
+    });
+}
+
+void
+gimp_gegl_index_to_mask (GeglBuffer          *indexed_buffer,
+                         const GeglRectangle *indexed_rect,
+                         const Babl          *indexed_format,
+                         GeglBuffer          *mask_buffer,
+                         const GeglRectangle *mask_rect,
+                         gint                 index)
+{
+  if (! indexed_rect)
+    indexed_rect = gegl_buffer_get_extent (indexed_buffer);
+
+  if (! mask_rect)
+    mask_rect = gegl_buffer_get_extent (mask_buffer);
+
+  gegl_parallel_distribute_area (
+    indexed_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *indexed_area)
+    {
+      GeglBufferIterator *iter;
+
+      SHIFTED_AREA (mask, indexed);
+
+      iter = gegl_buffer_iterator_new (indexed_buffer, indexed_area, 0,
+                                       indexed_format,
+                                       GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, mask_buffer, mask_area, 0,
+                                babl_format ("Y float"),
+                                GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const guchar *indexed = (const guchar *) iter->items[0].data;
+          gfloat       *mask    = (gfloat *)       iter->items[1].data;
+          gint          count   = iter->length;
+
+          while (count--)
+            {
+              if (*indexed == index)
+                *mask = 1.0;
+              else
+                *mask = 0.0;
+
+              indexed++;
+              mask++;
+            }
+        }
+    });
+}
+
+static void
+gimp_gegl_convert_color_profile_progress (GimpProgress *progress,
+                                          gdouble       value)
+{
+  if (gegl_is_main_thread ())
+    gimp_progress_set_value (progress, value);
+}
+
+void
+gimp_gegl_convert_color_profile (GeglBuffer               *src_buffer,
+                                 const GeglRectangle      *src_rect,
+                                 GimpColorProfile         *src_profile,
+                                 GeglBuffer               *dest_buffer,
+                                 const GeglRectangle      *dest_rect,
+                                 GimpColorProfile         *dest_profile,
+                                 GimpColorRenderingIntent  intent,
+                                 gboolean                  bpc,
+                                 GimpProgress             *progress)
+{
+  GimpColorTransform *transform;
+  guint               flags = 0;
+  const Babl         *src_format;
+  const Babl         *dest_format;
+
+  src_format  = gegl_buffer_get_format (src_buffer);
+  dest_format = gegl_buffer_get_format (dest_buffer);
+
+  if (bpc)
+    flags |= GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION;
+
+  flags |= GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE;
+
+  transform = gimp_color_transform_new (src_profile,  src_format,
+                                        dest_profile, dest_format,
+                                        intent,
+                                        (GimpColorTransformFlags) flags);
+
+  if (! src_rect)
+    src_rect = gegl_buffer_get_extent (src_buffer);
+
+  if (! dest_rect)
+    dest_rect = gegl_buffer_get_extent (dest_buffer);
+
+  if (transform)
+    {
+      if (progress)
+        {
+          g_signal_connect_swapped (
+            transform, "progress",
+            G_CALLBACK (gimp_gegl_convert_color_profile_progress),
+            progress);
+        }
+
+      GIMP_TIMER_START ();
+
+      gegl_parallel_distribute_area (
+        src_rect, PIXELS_PER_THREAD,
+        [=] (const GeglRectangle *src_area)
+        {
+          SHIFTED_AREA (dest, src);
+
+          gimp_color_transform_process_buffer (transform,
+                                               src_buffer,  src_area,
+                                               dest_buffer, dest_area);
+        });
+
+      GIMP_TIMER_END ("converting buffer");
+
+      g_object_unref (transform);
+    }
+  else
+    {
+      gimp_gegl_buffer_copy (src_buffer,  src_rect, GEGL_ABYSS_NONE,
+                             dest_buffer, dest_rect);
+
+      if (progress)
+        gimp_progress_set_value (progress, 1.0);
+    }
+}
+
+void
+gimp_gegl_average_color (GeglBuffer          *buffer,
+                         const GeglRectangle *rect,
+                         gboolean             clip_to_buffer,
+                         GeglAbyssPolicy      abyss_policy,
+                         const Babl          *format,
+                         gpointer             color)
+{
+  typedef struct
+  {
+    gfloat color[4];
+    gint   n;
+  } Sum;
+
+  const Babl        *average_format = babl_format ("RaGaBaA float");
+  GeglRectangle      roi;
+  GSList * volatile  sums           = NULL;
+  GSList            *list;
+  Sum                average        = {};
+  gint               c;
+
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+  g_return_if_fail (color != NULL);
+
+  if (! rect)
+    rect = gegl_buffer_get_extent (buffer);
+
+  if (! format)
+    format = gegl_buffer_get_format (buffer);
+
+  if (clip_to_buffer)
+    gegl_rectangle_intersect (&roi, rect, gegl_buffer_get_extent (buffer));
+  else
+    roi = *rect;
+
+  gegl_parallel_distribute_area (
+    &roi, PIXELS_PER_THREAD,
+    [&] (const GeglRectangle *area)
+    {
+      Sum                *sum;
+      GeglBufferIterator *iter;
+      gfloat              color[4] = {};
+      gint                n        = 0;
+
+      iter = gegl_buffer_iterator_new (buffer, area, 0, average_format,
+                                       GEGL_BUFFER_READ, abyss_policy, 1);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const gfloat *p = (const gfloat *) iter->items[0].data;
+          gint          i;
+
+          for (i = 0; i < iter->length; i++)
+            {
+              gint c;
+
+              for (c = 0; c < 4; c++)
+                color[c] += p[c];
+
+              p += 4;
+            }
+
+          n += iter->length;
+        }
+
+      sum = g_slice_new (Sum);
+
+      memcpy (sum->color, color, sizeof (color));
+      sum->n = n;
+
+      gimp_atomic_slist_push_head (&sums, sum);
+    });
+
+  for (list = sums; list; list = g_slist_next (list))
+    {
+      Sum *sum = (Sum *) list->data;
+
+      for (c = 0; c < 4; c++)
+        average.color[c] += sum->color[c];
+
+      average.n += sum->n;
+
+      g_slice_free (Sum, sum);
+    }
+
+  g_slist_free (sums);
+
+  if (average.n > 0)
+    {
+      for (c = 0; c < 4; c++)
+        average.color[c] /= average.n;
+    }
+
+  babl_process (babl_fish (average_format, format), average.color, color, 1);
+}
+
+} /* extern "C" */
diff --git a/app/gegl/gimp-gegl-loops.h b/app/gegl/gimp-gegl-loops.h
new file mode 100644
index 0000000..872c2b4
--- /dev/null
+++ b/app/gegl/gimp-gegl-loops.h
@@ -0,0 +1,109 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-loops.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_LOOPS_H__
+#define __GIMP_GEGL_LOOPS_H__
+
+
+void   gimp_gegl_buffer_copy           (GeglBuffer               *src_buffer,
+                                        const GeglRectangle      *src_rect,
+                                        GeglAbyssPolicy           abyss_policy,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect);
+
+void   gimp_gegl_clear                 (GeglBuffer               *buffer,
+                                        const GeglRectangle      *rect);
+
+/*  this is a pretty stupid port of concolve_region() that only works
+ *  on a linear source buffer
+ */
+void   gimp_gegl_convolve              (GeglBuffer               *src_buffer,
+                                        const GeglRectangle      *src_rect,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect,
+                                        const gfloat             *kernel,
+                                        gint                      kernel_size,
+                                        gdouble                   divisor,
+                                        GimpConvolutionType       mode,
+                                        gboolean                  alpha_weighting);
+
+void   gimp_gegl_dodgeburn             (GeglBuffer               *src_buffer,
+                                        const GeglRectangle      *src_rect,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect,
+                                        gdouble                   exposure,
+                                        GimpDodgeBurnType         type,
+                                        GimpTransferMode          mode);
+
+void   gimp_gegl_smudge_with_paint     (GeglBuffer               *accum_buffer,
+                                        const GeglRectangle      *accum_rect,
+                                        GeglBuffer               *canvas_buffer,
+                                        const GeglRectangle      *canvas_rect,
+                                        const GimpRGB            *brush_color,
+                                        GeglBuffer               *paint_buffer,
+                                        gboolean                  no_erasing,
+                                        gdouble                   flow,
+                                        gdouble                   rate);
+
+void   gimp_gegl_apply_mask            (GeglBuffer               *mask_buffer,
+                                        const GeglRectangle      *mask_rect,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect,
+                                        gdouble                   opacity);
+
+void   gimp_gegl_combine_mask          (GeglBuffer               *mask_buffer,
+                                        const GeglRectangle      *mask_rect,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect,
+                                        gdouble                   opacity);
+
+void   gimp_gegl_combine_mask_weird    (GeglBuffer               *mask_buffer,
+                                        const GeglRectangle      *mask_rect,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect,
+                                        gdouble                   opacity,
+                                        gboolean                  stipple);
+
+void   gimp_gegl_index_to_mask         (GeglBuffer               *indexed_buffer,
+                                        const GeglRectangle      *indexed_rect,
+                                        const Babl               *indexed_format,
+                                        GeglBuffer               *mask_buffer,
+                                        const GeglRectangle      *mask_rect,
+                                        gint                      index);
+
+void   gimp_gegl_convert_color_profile (GeglBuffer               *src_buffer,
+                                        const GeglRectangle      *src_rect,
+                                        GimpColorProfile         *src_profile,
+                                        GeglBuffer               *dest_buffer,
+                                        const GeglRectangle      *dest_rect,
+                                        GimpColorProfile         *dest_profile,
+                                        GimpColorRenderingIntent  intent,
+                                        gboolean                  bpc,
+                                        GimpProgress             *progress);
+
+void   gimp_gegl_average_color         (GeglBuffer               *buffer,
+                                        const GeglRectangle      *rect,
+                                        gboolean                  clip_to_buffer,
+                                        GeglAbyssPolicy           abyss_policy,
+                                        const Babl               *format,
+                                        gpointer                  color);
+
+
+#endif /* __GIMP_GEGL_LOOPS_H__ */
diff --git a/app/gegl/gimp-gegl-mask-combine.cc b/app/gegl/gimp-gegl-mask-combine.cc
new file mode 100644
index 0000000..0e61c0e
--- /dev/null
+++ b/app/gegl/gimp-gegl-mask-combine.cc
@@ -0,0 +1,653 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+extern "C"
+{
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-babl.h"
+#include "gimp-gegl-loops.h"
+#include "gimp-gegl-mask-combine.h"
+
+
+#define EPSILON 1e-6
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+
+gboolean
+gimp_gegl_mask_combine_rect (GeglBuffer     *mask,
+                             GimpChannelOps  op,
+                             gint            x,
+                             gint            y,
+                             gint            w,
+                             gint            h)
+{
+  GeglRectangle rect;
+  gfloat        value;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (mask), FALSE);
+
+  if (! gegl_rectangle_intersect (&rect,
+                                  GEGL_RECTANGLE (x, y, w, h),
+                                  gegl_buffer_get_abyss (mask)))
+    {
+      return FALSE;
+    }
+
+  switch (op)
+    {
+    case GIMP_CHANNEL_OP_REPLACE:
+    case GIMP_CHANNEL_OP_ADD:
+      value = 1.0f;
+      break;
+
+    case GIMP_CHANNEL_OP_SUBTRACT:
+      value = 0.0f;
+      break;
+
+    case GIMP_CHANNEL_OP_INTERSECT:
+      return TRUE;
+    }
+
+  gegl_buffer_set_color_from_pixel (mask, &rect, &value,
+                                    babl_format ("Y float"));
+
+  return TRUE;
+}
+
+gboolean
+gimp_gegl_mask_combine_ellipse (GeglBuffer     *mask,
+                                GimpChannelOps  op,
+                                gint            x,
+                                gint            y,
+                                gint            w,
+                                gint            h,
+                                gboolean        antialias)
+{
+  return gimp_gegl_mask_combine_ellipse_rect (mask, op, x, y, w, h,
+                                              w / 2.0, h / 2.0, antialias);
+}
+
+gboolean
+gimp_gegl_mask_combine_ellipse_rect (GeglBuffer     *mask,
+                                     GimpChannelOps  op,
+                                     gint            x,
+                                     gint            y,
+                                     gint            w,
+                                     gint            h,
+                                     gdouble         rx,
+                                     gdouble         ry,
+                                     gboolean        antialias)
+{
+  GeglRectangle  rect;
+  const Babl    *format;
+  gint           bpp;
+  gfloat         one_f = 1.0f;
+  gpointer       one;
+  gdouble        cx;
+  gdouble        cy;
+  gint           left;
+  gint           right;
+  gint           top;
+  gint           bottom;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (mask), FALSE);
+
+  if (rx <= EPSILON || ry <= EPSILON)
+    return gimp_gegl_mask_combine_rect (mask, op, x, y, w, h);
+
+  left   = x;
+  right  = x + w;
+  top    = y;
+  bottom = y + h;
+
+  cx = (left + right)  / 2.0;
+  cy = (top  + bottom) / 2.0;
+
+  rx = MIN (rx, w / 2.0);
+  ry = MIN (ry, h / 2.0);
+
+  if (! gegl_rectangle_intersect (&rect,
+                                  GEGL_RECTANGLE (x, y, w, h),
+                                  gegl_buffer_get_abyss (mask)))
+    {
+      return FALSE;
+    }
+
+  format = gegl_buffer_get_format (mask);
+
+  if (antialias)
+    {
+      format = gimp_babl_format_change_component_type (
+        format, GIMP_COMPONENT_TYPE_FLOAT);
+    }
+
+  bpp = babl_format_get_bytes_per_pixel (format);
+  one = g_alloca (bpp);
+
+  babl_process (babl_fish ("Y float", format), &one_f, one, 1);
+
+  /* coordinate-system transforms.  (x, y) coordinates are in the image
+   * coordinate-system, and (u, v) coordinates are in a coordinate-system
+   * aligned with the center of one of the elliptic corners, with the positive
+   * directions pointing away from the rectangle.  when converting from (x, y)
+   * to (u, v), we use the closest elliptic corner.
+   */
+  auto x_to_u = [=] (gdouble x)
+  {
+    if (x < cx)
+      return (left + rx) - x;
+    else
+      return x - (right - rx);
+  };
+
+  auto y_to_v = [=] (gdouble y)
+  {
+    if (y < cy)
+      return (top + ry) - y;
+    else
+      return y - (bottom - ry);
+  };
+
+  auto u_to_x_left = [=] (gdouble u)
+  {
+    return (left + rx) - u;
+  };
+
+  auto u_to_x_right = [=] (gdouble u)
+  {
+    return (right - rx) + u;
+  };
+
+  /* intersection of a horizontal line with the ellipse */
+  auto v_to_u = [=] (gdouble v)
+  {
+    if (v > 0.0)
+      return sqrt (MAX (SQR (rx) - SQR (rx * v / ry), 0.0));
+    else
+      return rx;
+  };
+
+  /* intersection of a vertical line with the ellipse */
+  auto u_to_v = [=] (gdouble u)
+  {
+    if (u > 0.0)
+      return sqrt (MAX (SQR (ry) - SQR (ry * u / rx), 0.0));
+    else
+      return ry;
+  };
+
+  /* signed, normalized distance of a point from the ellipse's circumference.
+   * the sign of the result determines if the point is inside (positive) or
+   * outside (negative) the ellipse.  the result is normalized to the cross-
+   * section length of a pixel, in the direction of the closest point along the
+   * ellipse.
+   *
+   * we use the following method to approximate the distance: pass horizontal
+   * and vertical lines at the given point, P, and find their (positive) points
+   * of intersection with the ellipse, A and B.  the segment AB is an
+   * approximation of the corresponding elliptic arc (see bug #147836).  find
+   * the closest point, C, to P, along the segment AB.  find the (positive)
+   * point of intersection, Q, of the line PC and the ellipse.  Q is an
+   * approximation for the closest point to P along the ellipse, and the
+   * approximated distance is the distance from P to Q.
+   */
+  auto ellipse_distance = [=] (gdouble u,
+                               gdouble v)
+  {
+    gdouble du;
+    gdouble dv;
+    gdouble t;
+    gdouble a, b, c;
+    gdouble d;
+
+    u = MAX (u, 0.0);
+    v = MAX (v, 0.0);
+
+    du = v_to_u (v) - u;
+    dv = u_to_v (u) - v;
+
+    t = SQR (du) / (SQR (du) + SQR (dv));
+
+    du *= 1.0 - t;
+    dv *= t;
+
+    v  *= rx / ry;
+    dv *= rx / ry;
+
+    a = SQR (du) + SQR (dv);
+    b = u * du + v * dv;
+    c = SQR (u) + SQR (v) - SQR (rx);
+
+    if (a <= EPSILON)
+      return 0.0;
+
+    if (c < 0.0)
+      t = (-b + sqrt (MAX (SQR (b) - a * c, 0.0))) / a;
+    else
+      t = (-b - sqrt (MAX (SQR (b) - a * c, 0.0))) / a;
+
+    dv *= ry / rx;
+
+    d = sqrt (SQR (du * t) + SQR (dv * t));
+
+    if (c > 0.0)
+      d = -d;
+
+    d /= sqrt (SQR (MIN (du / dv, dv / du)) + 1.0);
+
+    return d;
+  };
+
+  /* anti-aliased value of a pixel */
+  auto pixel_value = [=] (gint x,
+                          gint y)
+  {
+    gdouble u = x_to_u (x + 0.5);
+    gdouble v = y_to_v (y + 0.5);
+    gdouble d = ellipse_distance (u, v);
+
+    /* use the distance of the pixel's center from the ellipse to approximate
+     * the coverage
+     */
+    d = CLAMP (0.5 + d, 0.0, 1.0);
+
+    /* we're at the horizontal boundary of an elliptic corner */
+    if (u < 0.5)
+      d = d * (0.5 + u) + (0.5 - u);
+
+    /* we're at the vertical boundary of an elliptic corner */
+    if (v < 0.5)
+      d = d * (0.5 + v) + (0.5 - v);
+
+    /* opposite horizontal corners intersect the pixel */
+    if (x == (right - 1) - (x - left))
+      d = 2.0 * d - 1.0;
+
+    /* opposite vertical corners intersect the pixel */
+    if (y == (bottom - 1) - (y - top))
+      d = 2.0 * d - 1.0;
+
+    return d;
+  };
+
+  auto ellipse_range = [=] (gdouble  y,
+                            gdouble *x0,
+                            gdouble *x1)
+  {
+    gdouble u = v_to_u (y_to_v (y));
+
+    *x0 = u_to_x_left  (u);
+    *x1 = u_to_x_right (u);
+  };
+
+  auto fill0 = [=] (gpointer dest,
+                    gint     n)
+  {
+    switch (op)
+      {
+      case GIMP_CHANNEL_OP_REPLACE:
+      case GIMP_CHANNEL_OP_INTERSECT:
+        memset (dest, 0, bpp * n);
+        break;
+
+      case GIMP_CHANNEL_OP_ADD:
+      case GIMP_CHANNEL_OP_SUBTRACT:
+        break;
+      }
+
+    return (gpointer) ((guint8 *) dest + bpp * n);
+  };
+
+  auto fill1 = [=] (gpointer dest,
+                    gint     n)
+  {
+    switch (op)
+      {
+      case GIMP_CHANNEL_OP_REPLACE:
+      case GIMP_CHANNEL_OP_ADD:
+        gegl_memset_pattern (dest, one, bpp, n);
+        break;
+
+      case GIMP_CHANNEL_OP_SUBTRACT:
+        memset (dest, 0, bpp * n);
+        break;
+
+      case GIMP_CHANNEL_OP_INTERSECT:
+        break;
+      }
+
+    return (gpointer) ((guint8 *) dest + bpp * n);
+  };
+
+  auto set = [=] (gpointer dest,
+                  gfloat   value)
+  {
+    gfloat *p = (gfloat *) dest;
+
+    switch (op)
+      {
+      case GIMP_CHANNEL_OP_REPLACE:
+        *p = value;
+        break;
+
+      case GIMP_CHANNEL_OP_ADD:
+        *p = MIN (*p + value, 1.0);
+        break;
+
+      case GIMP_CHANNEL_OP_SUBTRACT:
+        *p = MAX (*p - value, 0.0);
+        break;
+
+      case GIMP_CHANNEL_OP_INTERSECT:
+        *p = MIN (*p, value);
+        break;
+      }
+
+    return (gpointer) (p + 1);
+  };
+
+  gegl_parallel_distribute_area (
+    &rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *area)
+    {
+      GeglBufferIterator *iter;
+
+      iter = gegl_buffer_iterator_new (
+        mask, area, 0, format,
+        op == GIMP_CHANNEL_OP_REPLACE ? GEGL_ACCESS_WRITE :
+                                        GEGL_ACCESS_READWRITE,
+        GEGL_ABYSS_NONE, 1);
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          const GeglRectangle *roi = &iter->items[0].roi;
+          gpointer             d   = iter->items[0].data;
+          gdouble              tx0, ty0;
+          gdouble              tx1, ty1;
+          gdouble              x0;
+          gdouble              x1;
+          gint                 y;
+
+          /* tile bounds */
+          tx0 = roi->x;
+          ty0 = roi->y;
+
+          tx1 = roi->x + roi->width;
+          ty1 = roi->y + roi->height;
+
+          if (! antialias)
+            {
+              tx0 += 0.5;
+              ty0 += 0.5;
+
+              tx1 -= 0.5;
+              ty1 -= 0.5;
+            }
+
+          /* if the tile is fully inside/outside the ellipse, fill it with 1/0,
+           * respectively, and skip the rest.
+           */
+          ellipse_range (ty0, &x0, &x1);
+
+          if (tx0 >= x0 && tx1 <= x1)
+            {
+              ellipse_range (ty1, &x0, &x1);
+
+              if (tx0 >= x0 && tx1 <= x1)
+                {
+                  fill1 (d, iter->length);
+
+                  continue;
+                }
+            }
+          else if (tx1 < x0 || tx0 > x1)
+            {
+              ellipse_range (ty1, &x0, &x1);
+
+              if (tx1 < x0 || tx0 > x1)
+                {
+                  if ((ty0 - cy) * (ty1 - cy) >= 0.0)
+                    {
+                      fill0 (d, iter->length);
+
+                      continue;
+                    }
+                }
+            }
+
+          for (y = roi->y; y < roi->y + roi->height; y++)
+            {
+              gint a, b;
+
+              if (antialias)
+                {
+                  gdouble v  = y_to_v (y + 0.5);
+                  gdouble u0 = v_to_u (v - 0.5);
+                  gdouble u1 = v_to_u (v + 0.5);
+                  gint    x;
+
+                  a = floor (u_to_x_left (u0)) - roi->x;
+                  a = CLAMP (a, 0, roi->width);
+
+                  b = ceil  (u_to_x_left (u1)) - roi->x;
+                  b = CLAMP (b, a, roi->width);
+
+                  d = fill0 (d, a);
+
+                  for (x = roi->x + a; x < roi->x + b; x++)
+                    d = set (d, pixel_value (x, y));
+
+                  a = floor (u_to_x_right (u1)) - roi->x;
+                  a = CLAMP (a, b, roi->width);
+
+                  d = fill1 (d, a - b);
+
+                  b = ceil  (u_to_x_right (u0)) - roi->x;
+                  b = CLAMP (b, a, roi->width);
+
+                  for (x = roi->x + a; x < roi->x + b; x++)
+                    d = set (d, pixel_value (x, y));
+
+                  d = fill0 (d, roi->width - b);
+                }
+              else
+                {
+                  ellipse_range (y + 0.5, &x0, &x1);
+
+                  a = ceil  (x0 - 0.5) - roi->x;
+                  a = CLAMP (a, 0, roi->width);
+
+                  b = floor (x1 + 0.5) - roi->x;
+                  b = CLAMP (b, 0, roi->width);
+
+                  d = fill0 (d, a);
+                  d = fill1 (d, b - a);
+                  d = fill0 (d, roi->width - b);
+                }
+            }
+        }
+    });
+
+  return TRUE;
+}
+
+gboolean
+gimp_gegl_mask_combine_buffer (GeglBuffer     *mask,
+                               GeglBuffer     *add_on,
+                               GimpChannelOps  op,
+                               gint            off_x,
+                               gint            off_y)
+{
+  GeglRectangle  mask_rect;
+  GeglRectangle  add_on_rect;
+  const Babl    *mask_format;
+  const Babl    *add_on_format;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (mask), FALSE);
+  g_return_val_if_fail (GEGL_IS_BUFFER (add_on), FALSE);
+
+  if (! gegl_rectangle_intersect (&mask_rect,
+                                  GEGL_RECTANGLE (
+                                    off_x + gegl_buffer_get_x (add_on),
+                                    off_y + gegl_buffer_get_y (add_on),
+                                    gegl_buffer_get_width  (add_on),
+                                    gegl_buffer_get_height (add_on)),
+                                  gegl_buffer_get_abyss (mask)))
+    {
+      return FALSE;
+    }
+
+  add_on_rect    = mask_rect;
+  add_on_rect.x -= off_x;
+  add_on_rect.y -= off_y;
+
+  mask_format   = gegl_buffer_get_format (mask);
+  add_on_format = gegl_buffer_get_format (add_on);
+
+  if (op == GIMP_CHANNEL_OP_REPLACE                                          &&
+      (gimp_babl_is_bounded (gimp_babl_format_get_precision (add_on_format)) ||
+       gimp_babl_is_bounded (gimp_babl_format_get_precision (mask_format))))
+    {
+      /*  See below: this additional hack is only needed for the
+       *  gimp-channel-combine-masks procedure, it's the only place that
+       *  allows to combine arbitrary channels with each other.
+       */
+      gegl_buffer_set_format (
+        add_on,
+        gimp_babl_format_change_linear (
+          add_on_format, gimp_babl_format_get_linear (mask_format)));
+
+      gimp_gegl_buffer_copy (add_on, &add_on_rect, GEGL_ABYSS_NONE,
+                             mask,   &mask_rect);
+
+      gegl_buffer_set_format (add_on, NULL);
+
+      return TRUE;
+    }
+
+  /*  This is a hack: all selections/layer masks/channels are always
+   *  linear except for channels in 8-bit images. We don't want these
+   *  "Y' u8" to be converted to "Y float" because that would cause a
+   *  gamma canversion and give unexpected results for
+   *  "add/subtract/etc channel from selection". Instead, use all
+   *  channel values "as-is", which makes no differce except in the
+   *  8-bit case where we need it.
+   *
+   *  See https://bugzilla.gnome.org/show_bug.cgi?id=791519
+   */
+  mask_format = gimp_babl_format_change_component_type (
+    mask_format, GIMP_COMPONENT_TYPE_FLOAT);
+
+  add_on_format = gimp_babl_format_change_component_type (
+    add_on_format, GIMP_COMPONENT_TYPE_FLOAT);
+
+  gegl_parallel_distribute_area (
+    &mask_rect, PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *mask_area)
+    {
+      GeglBufferIterator *iter;
+      GeglRectangle       add_on_area;
+
+      add_on_area    = *mask_area;
+      add_on_area.x -= off_x;
+      add_on_area.y -= off_y;
+
+      iter = gegl_buffer_iterator_new (mask, mask_area, 0,
+                                       mask_format,
+                                       op == GIMP_CHANNEL_OP_REPLACE ?
+                                         GEGL_ACCESS_WRITE :
+                                         GEGL_ACCESS_READWRITE,
+                                       GEGL_ABYSS_NONE, 2);
+
+      gegl_buffer_iterator_add (iter, add_on, &add_on_area, 0,
+                                add_on_format,
+                                GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+
+      auto process = [=] (auto value)
+      {
+        while (gegl_buffer_iterator_next (iter))
+          {
+            gfloat       *mask_data   = (gfloat       *) iter->items[0].data;
+            const gfloat *add_on_data = (const gfloat *) iter->items[1].data;
+            gint          count       = iter->length;
+
+            while (count--)
+              {
+                const gfloat val = value (mask_data, add_on_data);
+
+                *mask_data = CLAMP (val, 0.0f, 1.0f);
+
+                add_on_data++;
+                mask_data++;
+              }
+          }
+      };
+
+      switch (op)
+        {
+        case GIMP_CHANNEL_OP_REPLACE:
+          process ([] (const gfloat *mask,
+                       const gfloat *add_on)
+                   {
+                     return *add_on;
+                   });
+          break;
+
+        case GIMP_CHANNEL_OP_ADD:
+          process ([] (const gfloat *mask,
+                       const gfloat *add_on)
+                   {
+                     return *mask + *add_on;
+                   });
+          break;
+
+        case GIMP_CHANNEL_OP_SUBTRACT:
+          process ([] (const gfloat *mask,
+                       const gfloat *add_on)
+                   {
+                     return *mask - *add_on;
+                   });
+          break;
+
+        case GIMP_CHANNEL_OP_INTERSECT:
+          process ([] (const gfloat *mask,
+                       const gfloat *add_on)
+                   {
+                     return MIN (*mask, *add_on);
+                   });
+          break;
+        }
+    });
+
+  return TRUE;
+}
+
+} /* extern "C" */
diff --git a/app/gegl/gimp-gegl-mask-combine.h b/app/gegl/gimp-gegl-mask-combine.h
new file mode 100644
index 0000000..d8e0fa2
--- /dev/null
+++ b/app/gegl/gimp-gegl-mask-combine.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_MASK_COMBINE_H__
+#define __GIMP_GEGL_MASK_COMBINE_H__
+
+
+gboolean   gimp_gegl_mask_combine_rect         (GeglBuffer     *mask,
+                                                GimpChannelOps  op,
+                                                gint            x,
+                                                gint            y,
+                                                gint            w,
+                                                gint            h);
+gboolean   gimp_gegl_mask_combine_ellipse      (GeglBuffer     *mask,
+                                                GimpChannelOps  op,
+                                                gint            x,
+                                                gint            y,
+                                                gint            w,
+                                                gint            h,
+                                                gboolean        antialias);
+gboolean   gimp_gegl_mask_combine_ellipse_rect (GeglBuffer     *mask,
+                                                GimpChannelOps  op,
+                                                gint            x,
+                                                gint            y,
+                                                gint            w,
+                                                gint            h,
+                                                gdouble         rx,
+                                                gdouble         ry,
+                                                gboolean        antialias);
+gboolean   gimp_gegl_mask_combine_buffer       (GeglBuffer     *mask,
+                                                GeglBuffer     *add_on,
+                                                GimpChannelOps  op,
+                                                gint            off_x,
+                                                gint            off_y);
+
+
+#endif /* __GIMP_GEGL_MASK_COMBINE_H__ */
diff --git a/app/gegl/gimp-gegl-mask.c b/app/gegl/gimp-gegl-mask.c
new file mode 100644
index 0000000..325289c
--- /dev/null
+++ b/app/gegl/gimp-gegl-mask.c
@@ -0,0 +1,253 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "gegl/gimp-gegl-mask.h"
+
+
+gboolean
+gimp_gegl_mask_bounds (GeglBuffer *buffer,
+                       gint        *x1,
+                       gint        *y1,
+                       gint        *x2,
+                       gint        *y2)
+{
+  GeglBufferIterator  *iter;
+  const GeglRectangle *extent;
+  const GeglRectangle *roi;
+  const Babl          *format;
+  gint                 bpp;
+  gint                 tx1, tx2, ty1, ty2;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (x1 != NULL, FALSE);
+  g_return_val_if_fail (y1 != NULL, FALSE);
+  g_return_val_if_fail (x2 != NULL, FALSE);
+  g_return_val_if_fail (y2 != NULL, FALSE);
+
+  extent = gegl_buffer_get_extent (buffer);
+
+  /*  go through and calculate the bounds  */
+  tx1 = extent->x + extent->width;
+  ty1 = extent->y + extent->height;
+  tx2 = extent->x;
+  ty2 = extent->y;
+
+  format = gegl_buffer_get_format (buffer);
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+  roi = &iter->items[0].roi;
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      const guint8 *data_u8 = iter->items[0].data;
+      gint          ex      = roi->x + roi->width;
+      gint          ey      = roi->y + roi->height;
+
+      /*  only check the pixels if this tile is not fully within the
+       *  currently computed bounds
+       */
+      if (roi->x < tx1 || ex > tx2 ||
+          roi->y < ty1 || ey > ty2)
+        {
+          /* Check upper left and lower right corners to see if we can
+           * avoid checking the rest of the pixels in this tile
+           */
+          if (! gegl_memeq_zero (data_u8,                            bpp) &&
+              ! gegl_memeq_zero (data_u8 + (iter->length - 1) * bpp, bpp))
+            {
+              /*  "ex/ey - 1" because the internal variables are the
+               *  right/bottom pixel of the mask's contents, not one
+               *  right/below it like the return values.
+               */
+
+              if (roi->x < tx1) tx1 = roi->x;
+              if (ex > tx2)     tx2 = ex - 1;
+
+              if (roi->y < ty1) ty1 = roi->y;
+              if (ey > ty2)     ty2 = ey - 1;
+            }
+          else
+            {
+              #define FIND_BOUNDS(bpp, type)                                 \
+                G_STMT_START                                                 \
+                  {                                                          \
+                    const type *data;                                        \
+                    gint        y;                                           \
+                                                                             \
+                    if ((guintptr) data_u8 % bpp)                            \
+                      goto generic;                                          \
+                                                                             \
+                    data = (const type *) data_u8;                           \
+                                                                             \
+                    for (y = roi->y; y < ey; y++)                            \
+                      {                                                      \
+                        gint x1;                                             \
+                                                                             \
+                        for (x1 = 0; x1 < roi->width; x1++)                  \
+                          {                                                  \
+                            if (data[x1])                                    \
+                              {                                              \
+                                gint x2;                                     \
+                                gint x2_end = MAX (x1, tx2 - roi->x);        \
+                                                                             \
+                                for (x2 = roi->width - 1; x2 > x2_end; x2--) \
+                                  {                                          \
+                                    if (data[x2])                            \
+                                      break;                                 \
+                                  }                                          \
+                                                                             \
+                                x1 += roi->x;                                \
+                                x2 += roi->x;                                \
+                                                                             \
+                                if (x1 < tx1) tx1 = x1;                      \
+                                if (x2 > tx2) tx2 = x2;                      \
+                                                                             \
+                                if (y < ty1) ty1 = y;                        \
+                                if (y > ty2) ty2 = y;                        \
+                                                                             \
+                                break;                                       \
+                              }                                              \
+                          }                                                  \
+                                                                             \
+                        data += roi->width;                                  \
+                      }                                                      \
+                  }                                                          \
+                G_STMT_END
+
+              switch (bpp)
+                {
+                case 1:
+                  FIND_BOUNDS (1, guint8);
+                  break;
+
+                case 2:
+                  FIND_BOUNDS (2, guint16);
+                  break;
+
+                case 4:
+                  FIND_BOUNDS (4, guint32);
+                  break;
+
+                case 8:
+                  FIND_BOUNDS (8, guint64);
+                  break;
+
+                default:
+                generic:
+                  {
+                    const guint8 *data = data_u8;
+                    gint          y;
+
+                    for (y = roi->y; y < ey; y++)
+                      {
+                        gint x1;
+
+                        for (x1 = 0; x1 < roi->width; x1++)
+                          {
+                            if (! gegl_memeq_zero (data + x1 * bpp, bpp))
+                              {
+                                gint x2;
+                                gint x2_end = MAX (x1, tx2 - roi->x);
+
+                                for (x2 = roi->width - 1; x2 > x2_end; x2--)
+                                  {
+                                    if (! gegl_memeq_zero (data + x2 * bpp,
+                                                           bpp))
+                                      {
+                                        break;
+                                      }
+                                  }
+
+                                x1 += roi->x;
+                                x2 += roi->x;
+
+                                if (x1 < tx1) tx1 = x1;
+                                if (x2 > tx2) tx2 = x2;
+
+                                if (y < ty1) ty1 = y;
+                                if (y > ty2) ty2 = y;
+                              }
+                          }
+
+                        data += roi->width * bpp;
+                      }
+                  }
+                  break;
+                }
+
+              #undef FIND_BOUNDS
+            }
+        }
+    }
+
+  tx2 = CLAMP (tx2 + 1, 0, gegl_buffer_get_width  (buffer));
+  ty2 = CLAMP (ty2 + 1, 0, gegl_buffer_get_height (buffer));
+
+  if (tx1 == gegl_buffer_get_width  (buffer) &&
+      ty1 == gegl_buffer_get_height (buffer))
+    {
+      *x1 = 0;
+      *y1 = 0;
+      *x2 = gegl_buffer_get_width  (buffer);
+      *y2 = gegl_buffer_get_height (buffer);
+
+      return FALSE;
+    }
+
+  *x1 = tx1;
+  *y1 = ty1;
+  *x2 = tx2;
+  *y2 = ty2;
+
+  return TRUE;
+}
+
+gboolean
+gimp_gegl_mask_is_empty (GeglBuffer *buffer)
+{
+  GeglBufferIterator *iter;
+  const Babl         *format;
+  gint                bpp;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
+
+  format = gegl_buffer_get_format (buffer);
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      if (! gegl_memeq_zero (iter->items[0].data, bpp * iter->length))
+        {
+          gegl_buffer_iterator_stop (iter);
+
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/gegl/gimp-gegl-mask.h b/app/gegl/gimp-gegl-mask.h
new file mode 100644
index 0000000..e14d838
--- /dev/null
+++ b/app/gegl/gimp-gegl-mask.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_MASK_H__
+#define __GIMP_GEGL_MASK_H__
+
+
+gboolean   gimp_gegl_mask_bounds   (GeglBuffer *buffer,
+                                    gint        *x1,
+                                    gint        *y1,
+                                    gint        *x2,
+                                    gint        *y2);
+gboolean   gimp_gegl_mask_is_empty (GeglBuffer *buffer);
+
+
+#endif /* __GIMP_GEGL_MASK_H__ */
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
new file mode 100644
index 0000000..5067da2
--- /dev/null
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-nodes.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimp-gegl-nodes.h"
+#include "gimp-gegl-utils.h"
+
+
+GeglNode *
+gimp_gegl_create_flatten_node (const GimpRGB       *background,
+                               GimpLayerColorSpace  composite_space)
+{
+  GeglNode  *node;
+  GeglNode  *input;
+  GeglNode  *output;
+  GeglNode  *color;
+  GeglNode  *mode;
+  GeglColor *c;
+
+  g_return_val_if_fail (background != NULL, NULL);
+  g_return_val_if_fail (composite_space == GIMP_LAYER_COLOR_SPACE_RGB_LINEAR ||
+                        composite_space == GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+                        NULL);
+
+  node = gegl_node_new ();
+
+  input  = gegl_node_get_input_proxy  (node, "input");
+  output = gegl_node_get_output_proxy (node, "output");
+
+  c = gimp_gegl_color_new (background);
+  color = gegl_node_new_child (node,
+                               "operation", "gegl:color",
+                               "value",     c,
+                               "format",    gimp_layer_mode_get_format (
+                                              GIMP_LAYER_MODE_NORMAL,
+                                              GIMP_LAYER_COLOR_SPACE_AUTO,
+                                              composite_space,
+                                              GIMP_LAYER_COMPOSITE_AUTO,
+                                              NULL),
+                               NULL);
+  g_object_unref (c);
+
+  gimp_gegl_node_set_underlying_operation (node, color);
+
+  mode = gegl_node_new_child (node,
+                              "operation", "gimp:normal",
+                              NULL);
+  gimp_gegl_mode_node_set_mode (mode,
+                                GIMP_LAYER_MODE_NORMAL,
+                                GIMP_LAYER_COLOR_SPACE_AUTO,
+                                composite_space,
+                                GIMP_LAYER_COMPOSITE_AUTO);
+
+  gegl_node_connect_to (input,  "output",
+                        mode,   "aux");
+  gegl_node_connect_to (color,  "output",
+                        mode,   "input");
+  gegl_node_connect_to (mode,   "output",
+                        output, "input");
+
+  return node;
+}
+
+GeglNode *
+gimp_gegl_create_apply_opacity_node (GeglBuffer *mask,
+                                     gint        mask_offset_x,
+                                     gint        mask_offset_y,
+                                     gdouble     opacity)
+{
+  GeglNode  *node;
+  GeglNode  *input;
+  GeglNode  *output;
+  GeglNode  *opacity_node;
+  GeglNode  *mask_source;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (mask), NULL);
+
+  node = gegl_node_new ();
+
+  input  = gegl_node_get_input_proxy  (node, "input");
+  output = gegl_node_get_output_proxy (node, "output");
+
+  opacity_node = gegl_node_new_child (node,
+                                      "operation", "gegl:opacity",
+                                      "value",     opacity,
+                                      NULL);
+
+  gimp_gegl_node_set_underlying_operation (node, opacity_node);
+
+  mask_source = gimp_gegl_add_buffer_source (node, mask,
+                                             mask_offset_x,
+                                             mask_offset_y);
+
+  gegl_node_connect_to (input,        "output",
+                        opacity_node, "input");
+  gegl_node_connect_to (mask_source,  "output",
+                        opacity_node, "aux");
+  gegl_node_connect_to (opacity_node, "output",
+                        output,       "input");
+
+  return node;
+}
+
+GeglNode *
+gimp_gegl_create_transform_node (const GimpMatrix3 *matrix)
+{
+  GeglNode *node;
+
+  g_return_val_if_fail (matrix != NULL, NULL);
+
+  node = gegl_node_new_child (NULL,
+                              "operation", "gegl:transform",
+                              NULL);
+
+  gimp_gegl_node_set_matrix (node, matrix);
+
+  return node;
+}
+
+GeglNode *
+gimp_gegl_add_buffer_source (GeglNode   *parent,
+                             GeglBuffer *buffer,
+                             gint        offset_x,
+                             gint        offset_y)
+{
+  GeglNode *buffer_source;
+
+  g_return_val_if_fail (GEGL_IS_NODE (parent), NULL);
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  buffer_source = gegl_node_new_child (parent,
+                                       "operation", "gegl:buffer-source",
+                                       "buffer",    buffer,
+                                       NULL);
+
+  if (offset_x != 0 || offset_y != 0)
+    {
+      GeglNode *translate =
+        gegl_node_new_child (parent,
+                             "operation", "gegl:translate",
+                             "x",         (gdouble) offset_x,
+                             "y",         (gdouble) offset_y,
+                             NULL);
+
+      gegl_node_connect_to (buffer_source, "output",
+                            translate,     "input");
+
+      buffer_source = translate;
+    }
+
+  return buffer_source;
+}
+
+void
+gimp_gegl_mode_node_set_mode (GeglNode               *node,
+                              GimpLayerMode           mode,
+                              GimpLayerColorSpace     blend_space,
+                              GimpLayerColorSpace     composite_space,
+                              GimpLayerCompositeMode  composite_mode)
+{
+  gdouble opacity;
+
+  g_return_if_fail (GEGL_IS_NODE (node));
+
+  if (blend_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+    blend_space = gimp_layer_mode_get_blend_space (mode);
+
+  if (composite_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+    composite_space = gimp_layer_mode_get_composite_space (mode);
+
+  if (composite_mode == GIMP_LAYER_COMPOSITE_AUTO)
+    composite_mode = gimp_layer_mode_get_composite_mode (mode);
+
+  gegl_node_get (node,
+                 "opacity", &opacity,
+                 NULL);
+
+  /* setting the operation creates a new instance, so we have to set
+   * all its properties
+   */
+  gegl_node_set (node,
+                 "operation",       gimp_layer_mode_get_operation (mode),
+                 "layer-mode",      mode,
+                 "opacity",         opacity,
+                 "blend-space",     blend_space,
+                 "composite-space", composite_space,
+                 "composite-mode",  composite_mode,
+                 NULL);
+}
+
+void
+gimp_gegl_mode_node_set_opacity (GeglNode *node,
+                                 gdouble   opacity)
+{
+  g_return_if_fail (GEGL_IS_NODE (node));
+
+  gegl_node_set (node,
+                 "opacity", opacity,
+                 NULL);
+}
+
+void
+gimp_gegl_node_set_matrix (GeglNode          *node,
+                           const GimpMatrix3 *matrix)
+{
+  gchar *matrix_string;
+
+  g_return_if_fail (GEGL_IS_NODE (node));
+  g_return_if_fail (matrix != NULL);
+
+  matrix_string = gegl_matrix3_to_string ((GeglMatrix3 *) matrix);
+
+  gegl_node_set (node,
+                 "transform", matrix_string,
+                 NULL);
+
+  g_free (matrix_string);
+}
+
+void
+gimp_gegl_node_set_color (GeglNode      *node,
+                          const GimpRGB *color)
+{
+  GeglColor *gegl_color;
+
+  g_return_if_fail (GEGL_IS_NODE (node));
+  g_return_if_fail (color != NULL);
+
+  gegl_color = gimp_gegl_color_new (color);
+
+  gegl_node_set (node,
+                 "value", gegl_color,
+                 NULL);
+
+  g_object_unref (gegl_color);
+}
diff --git a/app/gegl/gimp-gegl-nodes.h b/app/gegl/gimp-gegl-nodes.h
new file mode 100644
index 0000000..0f627ff
--- /dev/null
+++ b/app/gegl/gimp-gegl-nodes.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-nodes.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_NODES_H__
+#define __GIMP_GEGL_NODES_H__
+
+
+GeglNode * gimp_gegl_create_flatten_node       (const GimpRGB         *background,
+                                                GimpLayerColorSpace    composite_space);
+GeglNode * gimp_gegl_create_apply_opacity_node (GeglBuffer            *mask,
+                                                gint                   mask_offset_x,
+                                                gint                   mask_offset_y,
+                                                gdouble                opacity);
+GeglNode * gimp_gegl_create_transform_node     (const GimpMatrix3     *matrix);
+
+GeglNode * gimp_gegl_add_buffer_source         (GeglNode              *parent,
+                                                GeglBuffer            *buffer,
+                                                gint                   offset_x,
+                                                gint                   offset_y);
+
+void       gimp_gegl_mode_node_set_mode        (GeglNode               *node,
+                                                GimpLayerMode           mode,
+                                                GimpLayerColorSpace     blend_space,
+                                                GimpLayerColorSpace     composite_space,
+                                                GimpLayerCompositeMode  composite_mode);
+void       gimp_gegl_mode_node_set_opacity     (GeglNode               *node,
+                                                gdouble                 opacity);
+
+void       gimp_gegl_node_set_matrix           (GeglNode               *node,
+                                                const GimpMatrix3      *matrix);
+void       gimp_gegl_node_set_color            (GeglNode               *node,
+                                                const GimpRGB          *color);
+
+
+#endif /* __GIMP_GEGL_NODES_H__ */
diff --git a/app/gegl/gimp-gegl-tile-compat.c b/app/gegl/gimp-gegl-tile-compat.c
new file mode 100644
index 0000000..54d917c
--- /dev/null
+++ b/app/gegl/gimp-gegl-tile-compat.c
@@ -0,0 +1,79 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-tile-compat.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-gegl-tile-compat.h"
+
+
+gint
+gimp_gegl_buffer_get_n_tile_rows (GeglBuffer *buffer,
+                                  gint        tile_height)
+{
+  return (gegl_buffer_get_height (buffer) + tile_height - 1) / tile_height;
+}
+
+gint
+gimp_gegl_buffer_get_n_tile_cols (GeglBuffer *buffer,
+                                  gint        tile_width)
+{
+  return (gegl_buffer_get_width (buffer) + tile_width - 1) / tile_width;
+}
+
+gboolean
+gimp_gegl_buffer_get_tile_rect (GeglBuffer    *buffer,
+                                gint           tile_width,
+                                gint           tile_height,
+                                gint           tile_num,
+                                GeglRectangle *rect)
+{
+  gint n_tile_rows;
+  gint n_tile_columns;
+  gint tile_row;
+  gint tile_column;
+
+  n_tile_rows    = gimp_gegl_buffer_get_n_tile_rows (buffer, tile_height);
+  n_tile_columns = gimp_gegl_buffer_get_n_tile_cols (buffer, tile_width);
+
+  if (tile_num > n_tile_rows * n_tile_columns - 1)
+    return FALSE;
+
+  tile_row    = tile_num / n_tile_columns;
+  tile_column = tile_num % n_tile_columns;
+
+  rect->x = tile_column * tile_width;
+  rect->y = tile_row    * tile_height;
+
+  if (tile_column == n_tile_columns - 1)
+    rect->width = gegl_buffer_get_width (buffer) - rect->x;
+  else
+    rect->width = tile_width;
+
+  if (tile_row == n_tile_rows - 1)
+    rect->height = gegl_buffer_get_height (buffer) - rect->y;
+  else
+    rect->height = tile_height;
+
+  return TRUE;
+}
diff --git a/app/gegl/gimp-gegl-tile-compat.h b/app/gegl/gimp-gegl-tile-compat.h
new file mode 100644
index 0000000..e35f288
--- /dev/null
+++ b/app/gegl/gimp-gegl-tile-compat.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-tile-compat.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_TILE_COMPAT_H__
+#define __GIMP_GEGL_TILE_COMPAT_H__
+
+
+gint       gimp_gegl_buffer_get_n_tile_rows (GeglBuffer    *buffer,
+                                             gint           tile_height);
+gint       gimp_gegl_buffer_get_n_tile_cols (GeglBuffer    *buffer,
+                                             gint           tile_width);
+gboolean   gimp_gegl_buffer_get_tile_rect   (GeglBuffer    *buffer,
+                                             gint           tile_width,
+                                             gint           tile_height,
+                                             gint           tile_num,
+                                             GeglRectangle *rect);
+
+
+#endif /* __GIMP_GEGL_TILE_COMPAT_H__ */
diff --git a/app/gegl/gimp-gegl-types.h b/app/gegl/gimp-gegl-types.h
new file mode 100644
index 0000000..ecea87e
--- /dev/null
+++ b/app/gegl/gimp-gegl-types.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-types.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_TYPES_H__
+#define __GIMP_GEGL_TYPES_H__
+
+
+#include "core/core-types.h"
+
+#include "gegl/gimp-gegl-enums.h"
+
+#include "operations/operations-types.h"
+
+
+typedef struct _GimpApplicator GimpApplicator;
+
+
+#endif /* __GIMP_GEGL_TYPES_H__ */
diff --git a/app/gegl/gimp-gegl-utils.c b/app/gegl/gimp-gegl-utils.c
new file mode 100644
index 0000000..efc3a1e
--- /dev/null
+++ b/app/gegl/gimp-gegl-utils.c
@@ -0,0 +1,348 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-utils.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gegl-plugin.h>
+
+#include "gimp-gegl-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "gimp-gegl-loops.h"
+#include "gimp-gegl-utils.h"
+
+
+GType
+gimp_gegl_get_op_enum_type (const gchar *operation,
+                            const gchar *property)
+{
+  GeglNode   *node;
+  GObject    *op;
+  GParamSpec *pspec;
+
+  g_return_val_if_fail (operation != NULL, G_TYPE_NONE);
+  g_return_val_if_fail (property != NULL, G_TYPE_NONE);
+
+  node = g_object_new (GEGL_TYPE_NODE,
+                       "operation", operation,
+                       NULL);
+  g_object_get (node, "gegl-operation", &op, NULL);
+  g_object_unref (node);
+
+  g_return_val_if_fail (op != NULL, G_TYPE_NONE);
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (op), property);
+
+  g_return_val_if_fail (G_IS_PARAM_SPEC_ENUM (pspec), G_TYPE_NONE);
+
+  g_object_unref (op);
+
+  return G_TYPE_FROM_CLASS (G_PARAM_SPEC_ENUM (pspec)->enum_class);
+}
+
+GeglColor *
+gimp_gegl_color_new (const GimpRGB *rgb)
+{
+  GeglColor *color;
+
+  g_return_val_if_fail (rgb != NULL, NULL);
+
+  color = gegl_color_new (NULL);
+  gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), rgb);
+
+  return color;
+}
+
+static void
+gimp_gegl_progress_callback (GObject      *object,
+                             gdouble       value,
+                             GimpProgress *progress)
+{
+  if (value == 0.0)
+    {
+      const gchar *text = g_object_get_data (object, "gimp-progress-text");
+
+      if (gimp_progress_is_active (progress))
+        gimp_progress_set_text (progress, "%s", text);
+      else
+        gimp_progress_start (progress, FALSE, "%s", text);
+    }
+  else
+    {
+      gimp_progress_set_value (progress, value);
+
+      if (value == 1.0)
+        gimp_progress_end (progress);
+    }
+}
+
+void
+gimp_gegl_progress_connect (GeglNode     *node,
+                            GimpProgress *progress,
+                            const gchar  *text)
+{
+  g_return_if_fail (GEGL_IS_NODE (node));
+  g_return_if_fail (GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (text != NULL);
+
+  g_signal_connect (node, "progress",
+                    G_CALLBACK (gimp_gegl_progress_callback),
+                    progress);
+
+  g_object_set_data_full (G_OBJECT (node),
+                          "gimp-progress-text", g_strdup (text),
+                          (GDestroyNotify) g_free);
+}
+
+gboolean
+gimp_gegl_node_is_source_operation (GeglNode *node)
+{
+  GeglOperation *operation;
+
+  g_return_val_if_fail (GEGL_IS_NODE (node), FALSE);
+
+  operation = gegl_node_get_gegl_operation (node);
+
+  if (! operation)
+    return FALSE;
+
+  return GEGL_IS_OPERATION_SOURCE (operation);
+}
+
+gboolean
+gimp_gegl_node_is_point_operation (GeglNode *node)
+{
+  GeglOperation *operation;
+
+  g_return_val_if_fail (GEGL_IS_NODE (node), FALSE);
+
+  operation = gegl_node_get_gegl_operation (node);
+
+  if (! operation)
+    return FALSE;
+
+  return GEGL_IS_OPERATION_POINT_RENDER    (operation) ||
+         GEGL_IS_OPERATION_POINT_FILTER    (operation) ||
+         GEGL_IS_OPERATION_POINT_COMPOSER  (operation) ||
+         GEGL_IS_OPERATION_POINT_COMPOSER3 (operation);
+}
+
+gboolean
+gimp_gegl_node_is_area_filter_operation (GeglNode *node)
+{
+  GeglOperation *operation;
+
+  g_return_val_if_fail (GEGL_IS_NODE (node), FALSE);
+
+  operation = gegl_node_get_gegl_operation (node);
+
+  if (! operation)
+    return FALSE;
+
+  return GEGL_IS_OPERATION_AREA_FILTER (operation) ||
+         /* be conservative and return TRUE for meta ops, since they may
+          * involve an area op
+          */
+         GEGL_IS_OPERATION_META (operation);
+}
+
+const gchar *
+gimp_gegl_node_get_key (GeglNode    *node,
+                        const gchar *key)
+{
+  const gchar *operation_name;
+
+  g_return_val_if_fail (GEGL_IS_NODE (node), NULL);
+
+  operation_name = gegl_node_get_operation (node);
+
+  if (operation_name)
+    return gegl_operation_get_key (operation_name, key);
+  else
+    return NULL;
+}
+
+gboolean
+gimp_gegl_node_has_key (GeglNode    *node,
+                        const gchar *key)
+{
+  return gimp_gegl_node_get_key (node, key) != NULL;
+}
+
+const Babl *
+gimp_gegl_node_get_format (GeglNode    *node,
+                           const gchar *pad_name)
+{
+  GeglOperation *op;
+  const Babl    *format = NULL;
+
+  g_return_val_if_fail (GEGL_IS_NODE (node), NULL);
+  g_return_val_if_fail (pad_name != NULL, NULL);
+
+  g_object_get (node, "gegl-operation", &op, NULL);
+
+  if (op)
+    {
+      format = gegl_operation_get_format (op, pad_name);
+
+      g_object_unref (op);
+    }
+
+  if (! format)
+    format = babl_format ("RGBA float");
+
+  return format;
+}
+
+void
+gimp_gegl_node_set_underlying_operation (GeglNode *node,
+                                         GeglNode *operation)
+{
+  g_return_if_fail (GEGL_IS_NODE (node));
+  g_return_if_fail (operation == NULL || GEGL_IS_NODE (operation));
+
+  g_object_set_data (G_OBJECT (node),
+                     "gimp-gegl-node-underlying-operation", operation);
+}
+
+GeglNode *
+gimp_gegl_node_get_underlying_operation (GeglNode *node)
+{
+  GeglNode *operation;
+
+  g_return_val_if_fail (GEGL_IS_NODE (node), NULL);
+
+  operation = g_object_get_data (G_OBJECT (node),
+                                 "gimp-gegl-node-underlying-operation");
+
+  if (operation)
+    return gimp_gegl_node_get_underlying_operation (operation);
+  else
+    return node;
+}
+
+gboolean
+gimp_gegl_param_spec_has_key (GParamSpec  *pspec,
+                              const gchar *key,
+                              const gchar *value)
+{
+  const gchar *v = gegl_param_spec_get_property_key (pspec, key);
+
+  if (v && ! strcmp (v, value))
+    return TRUE;
+
+  return FALSE;
+}
+
+GeglBuffer *
+gimp_gegl_buffer_dup (GeglBuffer *buffer)
+{
+  GeglBuffer          *new_buffer;
+  const GeglRectangle *extent;
+  const GeglRectangle *abyss;
+  GeglRectangle        rect;
+  gint                 shift_x;
+  gint                 shift_y;
+  gint                 tile_width;
+  gint                 tile_height;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  extent = gegl_buffer_get_extent (buffer);
+  abyss  = gegl_buffer_get_abyss  (buffer);
+
+  g_object_get (buffer,
+                "shift-x",     &shift_x,
+                "shift-y",     &shift_y,
+                "tile-width",  &tile_width,
+                "tile-height", &tile_height,
+                NULL);
+
+  new_buffer = g_object_new (GEGL_TYPE_BUFFER,
+                             "format",       gegl_buffer_get_format (buffer),
+                             "x",            extent->x,
+                             "y",            extent->y,
+                             "width",        extent->width,
+                             "height",       extent->height,
+                             "abyss-x",      abyss->x,
+                             "abyss-y",      abyss->y,
+                             "abyss-width",  abyss->width,
+                             "abyss-height", abyss->height,
+                             "shift-x",      shift_x,
+                             "shift-y",      shift_y,
+                             "tile-width",   tile_width,
+                             "tile-height",  tile_height,
+                             NULL);
+
+  gegl_rectangle_align_to_buffer (&rect, extent, buffer,
+                                  GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+  gimp_gegl_buffer_copy (buffer, &rect, GEGL_ABYSS_NONE,
+                         new_buffer, &rect);
+
+  return new_buffer;
+}
+
+gboolean
+gimp_gegl_buffer_set_extent (GeglBuffer          *buffer,
+                             const GeglRectangle *extent)
+{
+  GeglRectangle aligned_old_extent;
+  GeglRectangle aligned_extent;
+  GeglRectangle old_extent_rem;
+  GeglRectangle diff_rects[4];
+  gint          n_diff_rects;
+  gint          i;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (extent != NULL, FALSE);
+
+  gegl_rectangle_align_to_buffer (&aligned_old_extent,
+                                  gegl_buffer_get_extent (buffer), buffer,
+                                  GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+  gegl_rectangle_align_to_buffer (&aligned_extent,
+                                  extent, buffer,
+                                  GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+  n_diff_rects = gegl_rectangle_subtract (diff_rects,
+                                          &aligned_old_extent,
+                                          &aligned_extent);
+
+  for (i = 0; i < n_diff_rects; i++)
+    gegl_buffer_clear (buffer, &diff_rects[i]);
+
+  if (gegl_rectangle_intersect (&old_extent_rem,
+                                gegl_buffer_get_extent (buffer),
+                                &aligned_extent))
+    {
+      n_diff_rects = gegl_rectangle_subtract (diff_rects,
+                                              &old_extent_rem,
+                                              extent);
+
+      for (i = 0; i < n_diff_rects; i++)
+        gegl_buffer_clear (buffer, &diff_rects[i]);
+    }
+
+  return gegl_buffer_set_extent (buffer, extent);
+}
diff --git a/app/gegl/gimp-gegl-utils.h b/app/gegl/gimp-gegl-utils.h
new file mode 100644
index 0000000..cee725f
--- /dev/null
+++ b/app/gegl/gimp-gegl-utils.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl-utils.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_UTILS_H__
+#define __GIMP_GEGL_UTILS_H__
+
+
+GType         gimp_gegl_get_op_enum_type              (const gchar         *operation,
+                                                       const gchar         *property);
+
+GeglColor   * gimp_gegl_color_new                     (const GimpRGB       *rgb);
+
+void          gimp_gegl_progress_connect              (GeglNode            *node,
+                                                       GimpProgress        *progress,
+                                                       const gchar         *text);
+
+gboolean      gimp_gegl_node_is_source_operation      (GeglNode            *node);
+gboolean      gimp_gegl_node_is_point_operation       (GeglNode            *node);
+gboolean      gimp_gegl_node_is_area_filter_operation (GeglNode            *node);
+
+const gchar * gimp_gegl_node_get_key                  (GeglNode            *node,
+                                                       const gchar         *key);
+gboolean      gimp_gegl_node_has_key                  (GeglNode            *node,
+                                                       const gchar         *key);
+
+const Babl  * gimp_gegl_node_get_format               (GeglNode            *node,
+                                                       const gchar         *pad_name);
+
+void          gimp_gegl_node_set_underlying_operation (GeglNode           *node,
+                                                       GeglNode           *operation);
+GeglNode    * gimp_gegl_node_get_underlying_operation (GeglNode           *node);
+
+gboolean      gimp_gegl_param_spec_has_key            (GParamSpec          *pspec,
+                                                       const gchar         *key,
+                                                       const gchar         *value);
+
+GeglBuffer  * gimp_gegl_buffer_dup                    (GeglBuffer          *buffer);
+
+gboolean      gimp_gegl_buffer_set_extent             (GeglBuffer          *buffer,
+                                                       const GeglRectangle *extent);
+
+
+#endif /* __GIMP_GEGL_UTILS_H__ */
diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c
new file mode 100644
index 0000000..64046b6
--- /dev/null
+++ b/app/gegl/gimp-gegl.c
@@ -0,0 +1,171 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl.c
+ * Copyright (C) 2007 Øyvind Kolås <pippin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "gimp-gegl-types.h"
+
+#include "config/gimpgeglconfig.h"
+
+#include "operations/gimp-operations.h"
+
+#include "core/gimp.h"
+#include "core/gimp-parallel.h"
+
+#include "gimp-babl.h"
+#include "gimp-gegl.h"
+
+#include <operation/gegl-operation.h>
+
+
+static void  gimp_gegl_notify_temp_path        (GimpGeglConfig *config);
+static void  gimp_gegl_notify_swap_path        (GimpGeglConfig *config);
+static void  gimp_gegl_notify_swap_compression (GimpGeglConfig *config);
+static void  gimp_gegl_notify_tile_cache_size  (GimpGeglConfig *config);
+static void  gimp_gegl_notify_num_processors   (GimpGeglConfig *config);
+static void  gimp_gegl_notify_use_opencl       (GimpGeglConfig *config);
+
+
+/*  public functions  */
+
+void
+gimp_gegl_init (Gimp *gimp)
+{
+  GimpGeglConfig *config;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  config = GIMP_GEGL_CONFIG (gimp->config);
+
+  /* make sure temp and swap directories exist */
+  gimp_gegl_notify_temp_path (config);
+  gimp_gegl_notify_swap_path (config);
+
+  g_object_set (gegl_config (),
+                "swap-compression", config->swap_compression,
+                "tile-cache-size",  (guint64) config->tile_cache_size,
+                "threads",          config->num_processors,
+                "use-opencl",       config->use_opencl,
+                NULL);
+
+  gimp_parallel_init (gimp);
+
+  g_signal_connect (config, "notify::temp-path",
+                    G_CALLBACK (gimp_gegl_notify_temp_path),
+                    NULL);
+  g_signal_connect (config, "notify::swap-path",
+                    G_CALLBACK (gimp_gegl_notify_swap_path),
+                    NULL);
+  g_signal_connect (config, "notify::swap-compression",
+                    G_CALLBACK (gimp_gegl_notify_swap_compression),
+                    NULL);
+  g_signal_connect (config, "notify::num-processors",
+                    G_CALLBACK (gimp_gegl_notify_num_processors),
+                    NULL);
+  g_signal_connect (config, "notify::tile-cache-size",
+                    G_CALLBACK (gimp_gegl_notify_tile_cache_size),
+                    NULL);
+  g_signal_connect (config, "notify::num-processors",
+                    G_CALLBACK (gimp_gegl_notify_num_processors),
+                    NULL);
+  g_signal_connect (config, "notify::use-opencl",
+                    G_CALLBACK (gimp_gegl_notify_use_opencl),
+                    NULL);
+
+  gimp_babl_init ();
+
+  gimp_operations_init (gimp);
+}
+
+void
+gimp_gegl_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_parallel_exit (gimp);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_gegl_notify_temp_path (GimpGeglConfig *config)
+{
+  GFile *file = gimp_file_new_for_config_path (config->temp_path, NULL);
+
+  if (! g_file_query_exists (file, NULL))
+    g_file_make_directory_with_parents (file, NULL, NULL);
+
+  g_object_unref (file);
+}
+
+static void
+gimp_gegl_notify_swap_path (GimpGeglConfig *config)
+{
+  GFile *file = gimp_file_new_for_config_path (config->swap_path, NULL);
+  gchar *path = g_file_get_path (file);
+
+  if (! g_file_query_exists (file, NULL))
+    g_file_make_directory_with_parents (file, NULL, NULL);
+
+  g_object_set (gegl_config (),
+                "swap", path,
+                NULL);
+
+  g_free (path);
+  g_object_unref (file);
+}
+
+static void
+gimp_gegl_notify_swap_compression (GimpGeglConfig *config)
+{
+  g_object_set (gegl_config (),
+                "swap-compression", config->swap_compression,
+                NULL);
+}
+
+static void
+gimp_gegl_notify_tile_cache_size (GimpGeglConfig *config)
+{
+  g_object_set (gegl_config (),
+                "tile-cache-size", (guint64) config->tile_cache_size,
+                NULL);
+}
+
+static void
+gimp_gegl_notify_num_processors (GimpGeglConfig *config)
+{
+  g_object_set (gegl_config (),
+                "threads", config->num_processors,
+                NULL);
+}
+
+static void
+gimp_gegl_notify_use_opencl (GimpGeglConfig *config)
+{
+  g_object_set (gegl_config (),
+                "use-opencl", config->use_opencl,
+                NULL);
+}
diff --git a/app/gegl/gimp-gegl.h b/app/gegl/gimp-gegl.h
new file mode 100644
index 0000000..a8e12c2
--- /dev/null
+++ b/app/gegl/gimp-gegl.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-gegl.h
+ * Copyright (C) 2007 Øyvind Kolås <pippin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_H__
+#define __GIMP_GEGL_H__
+
+
+void   gimp_gegl_init (Gimp *gimp);
+void   gimp_gegl_exit (Gimp *gimp);
+
+
+#endif /* __GIMP_GEGL_H__ */
diff --git a/app/gegl/gimpapplicator.c b/app/gegl/gimpapplicator.c
new file mode 100644
index 0000000..ac8c2db
--- /dev/null
+++ b/app/gegl/gimpapplicator.c
@@ -0,0 +1,652 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpapplicator.c
+ * Copyright (C) 2012-2013 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "gimp-gegl-nodes.h"
+#include "gimpapplicator.h"
+
+
+static void   gimp_applicator_finalize     (GObject      *object);
+static void   gimp_applicator_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec);
+static void   gimp_applicator_get_property (GObject      *object,
+                                            guint         property_id,
+                                            GValue       *value,
+                                            GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpApplicator, gimp_applicator, G_TYPE_OBJECT)
+
+#define parent_class gimp_applicator_parent_class
+
+
+static void
+gimp_applicator_class_init (GimpApplicatorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_applicator_finalize;
+  object_class->set_property = gimp_applicator_set_property;
+  object_class->get_property = gimp_applicator_get_property;
+}
+
+static void
+gimp_applicator_init (GimpApplicator *applicator)
+{
+  applicator->active          = TRUE;
+  applicator->opacity         = 1.0;
+  applicator->paint_mode      = GIMP_LAYER_MODE_NORMAL;
+  applicator->blend_space     = GIMP_LAYER_COLOR_SPACE_AUTO;
+  applicator->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+  applicator->composite_mode  = GIMP_LAYER_COMPOSITE_AUTO;
+  applicator->affect          = GIMP_COMPONENT_MASK_ALL;
+}
+
+static void
+gimp_applicator_finalize (GObject *object)
+{
+  GimpApplicator *applicator = GIMP_APPLICATOR (object);
+
+  g_clear_object (&applicator->node);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_applicator_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_applicator_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GimpApplicator *
+gimp_applicator_new (GeglNode *parent)
+{
+  GimpApplicator *applicator;
+
+  g_return_val_if_fail (parent == NULL || GEGL_IS_NODE (parent), NULL);
+
+  applicator = g_object_new (GIMP_TYPE_APPLICATOR, NULL);
+
+  if (parent)
+    applicator->node = g_object_ref (parent);
+  else
+    applicator->node = gegl_node_new ();
+
+  applicator->input_node =
+    gegl_node_get_input_proxy  (applicator->node, "input");
+
+  applicator->aux_node =
+    gegl_node_get_input_proxy  (applicator->node, "aux");
+
+  applicator->output_node =
+    gegl_node_get_output_proxy (applicator->node, "output");
+
+  applicator->mode_node = gegl_node_new_child (applicator->node,
+                                               "operation", "gimp:normal",
+                                               NULL);
+
+  gimp_gegl_mode_node_set_mode (applicator->mode_node,
+                                applicator->paint_mode,
+                                applicator->blend_space,
+                                applicator->composite_space,
+                                applicator->composite_mode);
+  gimp_gegl_mode_node_set_opacity (applicator->mode_node,
+                                   applicator->opacity);
+
+  gegl_node_connect_to (applicator->input_node, "output",
+                        applicator->mode_node,  "input");
+
+  applicator->apply_offset_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gegl:translate",
+                         NULL);
+
+  gegl_node_link_many (applicator->aux_node,
+                       applicator->apply_offset_node,
+                       NULL);
+
+  gegl_node_connect_to (applicator->apply_offset_node, "output",
+                        applicator->mode_node,         "aux");
+
+  applicator->mask_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gegl:buffer-source",
+                         NULL);
+
+  applicator->mask_offset_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gegl:translate",
+                         NULL);
+
+  gegl_node_connect_to (applicator->mask_node,        "output",
+                        applicator->mask_offset_node, "input");
+  /* don't connect the the mask offset node to mode's aux2 yet */
+
+  applicator->affect_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gimp:mask-components",
+                         "mask",      applicator->affect,
+                         NULL);
+
+  applicator->convert_format_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gegl:nop",
+                         NULL);
+
+  applicator->cache_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gegl:nop",
+                         NULL);
+
+  applicator->crop_node =
+    gegl_node_new_child (applicator->node,
+                         "operation", "gegl:nop",
+                         NULL);
+
+  gegl_node_link_many (applicator->input_node,
+                       applicator->affect_node,
+                       applicator->convert_format_node,
+                       applicator->cache_node,
+                       applicator->crop_node,
+                       applicator->output_node,
+                       NULL);
+
+  gegl_node_connect_to (applicator->mode_node,   "output",
+                        applicator->affect_node, "aux");
+
+  return applicator;
+}
+
+void
+gimp_applicator_set_active (GimpApplicator *applicator,
+                            gboolean        active)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (active != applicator->active)
+    {
+      applicator->active = active;
+
+      if (active)
+        gegl_node_link (applicator->crop_node, applicator->output_node);
+      else
+        gegl_node_link (applicator->input_node, applicator->output_node);
+    }
+}
+
+void
+gimp_applicator_set_src_buffer (GimpApplicator *applicator,
+                                GeglBuffer     *src_buffer)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+  g_return_if_fail (src_buffer == NULL || GEGL_IS_BUFFER (src_buffer));
+
+  if (src_buffer == applicator->src_buffer)
+    return;
+
+  if (src_buffer)
+    {
+      if (! applicator->src_node)
+        {
+          applicator->src_node =
+            gegl_node_new_child (applicator->node,
+                                 "operation", "gegl:buffer-source",
+                                 "buffer",    src_buffer,
+                                 NULL);
+        }
+      else
+        {
+          gegl_node_set (applicator->src_node,
+                         "buffer", src_buffer,
+                         NULL);
+        }
+
+      if (! applicator->src_buffer)
+        gegl_node_link (applicator->src_node, applicator->input_node);
+    }
+  else if (applicator->src_buffer)
+    {
+      gegl_node_disconnect (applicator->input_node, "input");
+
+      gegl_node_set (applicator->src_node,
+                     "buffer", NULL,
+                     NULL);
+    }
+
+  applicator->src_buffer = src_buffer;
+}
+
+void
+gimp_applicator_set_dest_buffer (GimpApplicator *applicator,
+                                 GeglBuffer     *dest_buffer)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+  g_return_if_fail (dest_buffer == NULL || GEGL_IS_BUFFER (dest_buffer));
+
+  if (dest_buffer == applicator->dest_buffer)
+    return;
+
+  if (dest_buffer)
+    {
+      if (! applicator->dest_node)
+        {
+          applicator->dest_node =
+            gegl_node_new_child (applicator->node,
+                                 "operation", "gegl:write-buffer",
+                                 "buffer",    dest_buffer,
+                                 NULL);
+        }
+      else
+        {
+          gegl_node_set (applicator->dest_node,
+                         "buffer", dest_buffer,
+                         NULL);
+        }
+
+      if (! applicator->dest_buffer)
+        gegl_node_link (applicator->affect_node, applicator->dest_node);
+    }
+  else if (applicator->dest_buffer)
+    {
+      gegl_node_disconnect (applicator->dest_node, "input");
+
+      gegl_node_set (applicator->dest_node,
+                     "buffer", NULL,
+                     NULL);
+    }
+
+  applicator->dest_buffer = dest_buffer;
+}
+
+void
+gimp_applicator_set_mask_buffer (GimpApplicator *applicator,
+                                 GeglBuffer     *mask_buffer)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+  g_return_if_fail (mask_buffer == NULL || GEGL_IS_BUFFER (mask_buffer));
+
+  if (applicator->mask_buffer == mask_buffer)
+    return;
+
+  gegl_node_set (applicator->mask_node,
+                 "buffer", mask_buffer,
+                 NULL);
+
+  if (mask_buffer)
+    {
+      gegl_node_connect_to (applicator->mask_offset_node, "output",
+                            applicator->mode_node,        "aux2");
+    }
+  else
+    {
+      gegl_node_disconnect (applicator->mode_node, "aux2");
+    }
+
+  applicator->mask_buffer = mask_buffer;
+}
+
+void
+gimp_applicator_set_mask_offset (GimpApplicator *applicator,
+                                 gint            mask_offset_x,
+                                 gint            mask_offset_y)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->mask_offset_x != mask_offset_x ||
+      applicator->mask_offset_y != mask_offset_y)
+    {
+      applicator->mask_offset_x = mask_offset_x;
+      applicator->mask_offset_y = mask_offset_y;
+
+      gegl_node_set (applicator->mask_offset_node,
+                     "x", (gdouble) mask_offset_x,
+                     "y", (gdouble) mask_offset_y,
+                     NULL);
+    }
+}
+
+void
+gimp_applicator_set_apply_buffer (GimpApplicator *applicator,
+                                  GeglBuffer     *apply_buffer)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+  g_return_if_fail (apply_buffer == NULL || GEGL_IS_BUFFER (apply_buffer));
+
+  if (apply_buffer == applicator->apply_buffer)
+    return;
+
+  if (apply_buffer)
+    {
+      if (! applicator->apply_src_node)
+        {
+          applicator->apply_src_node =
+            gegl_node_new_child (applicator->node,
+                                 "operation", "gegl:buffer-source",
+                                 "buffer",    apply_buffer,
+                                 NULL);
+        }
+      else
+        {
+          gegl_node_set (applicator->apply_src_node,
+                         "buffer", apply_buffer,
+                         NULL);
+        }
+
+      if (! applicator->apply_buffer)
+        {
+          gegl_node_connect_to (applicator->apply_src_node,    "output",
+                                applicator->apply_offset_node, "input");
+        }
+    }
+  else if (applicator->apply_buffer)
+    {
+      gegl_node_connect_to (applicator->aux_node,          "output",
+                            applicator->apply_offset_node, "input");
+    }
+
+  applicator->apply_buffer = apply_buffer;
+}
+
+void
+gimp_applicator_set_apply_offset (GimpApplicator *applicator,
+                                  gint            apply_offset_x,
+                                  gint            apply_offset_y)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->apply_offset_x != apply_offset_x ||
+      applicator->apply_offset_y != apply_offset_y)
+    {
+      applicator->apply_offset_x = apply_offset_x;
+      applicator->apply_offset_y = apply_offset_y;
+
+      gegl_node_set (applicator->apply_offset_node,
+                     "x", (gdouble) apply_offset_x,
+                     "y", (gdouble) apply_offset_y,
+                     NULL);
+    }
+}
+
+void
+gimp_applicator_set_opacity (GimpApplicator *applicator,
+                             gdouble         opacity)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->opacity != opacity)
+    {
+      applicator->opacity = opacity;
+
+      gimp_gegl_mode_node_set_opacity (applicator->mode_node,
+                                       opacity);
+    }
+}
+
+void
+gimp_applicator_set_mode (GimpApplicator         *applicator,
+                          GimpLayerMode           paint_mode,
+                          GimpLayerColorSpace     blend_space,
+                          GimpLayerColorSpace     composite_space,
+                          GimpLayerCompositeMode  composite_mode)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->paint_mode      != paint_mode      ||
+      applicator->blend_space     != blend_space     ||
+      applicator->composite_space != composite_space ||
+      applicator->composite_mode  != composite_mode)
+    {
+      applicator->paint_mode      = paint_mode;
+      applicator->blend_space     = blend_space;
+      applicator->composite_space = composite_space;
+      applicator->composite_mode  = composite_mode;
+
+      gimp_gegl_mode_node_set_mode (applicator->mode_node,
+                                    paint_mode, blend_space,
+                                    composite_space, composite_mode);
+    }
+}
+
+void
+gimp_applicator_set_affect (GimpApplicator    *applicator,
+                            GimpComponentMask  affect)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->affect != affect)
+    {
+      applicator->affect = affect;
+
+      gegl_node_set (applicator->affect_node,
+                     "mask", affect,
+                     NULL);
+    }
+}
+
+void
+gimp_applicator_set_output_format (GimpApplicator *applicator,
+                                   const Babl     *format)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->output_format != format)
+    {
+      if (format)
+        {
+          if (! applicator->output_format)
+            {
+              gegl_node_set (applicator->convert_format_node,
+                             "operation", "gegl:convert-format",
+                             "format",    format,
+                             NULL);
+            }
+          else
+            {
+              gegl_node_set (applicator->convert_format_node,
+                             "format", format,
+                             NULL);
+            }
+        }
+      else
+        {
+          gegl_node_set (applicator->convert_format_node,
+                         "operation", "gegl:nop",
+                         NULL);
+        }
+
+      applicator->output_format = format;
+    }
+}
+
+const Babl *
+gimp_applicator_get_output_format (GimpApplicator *applicator)
+{
+  g_return_val_if_fail (GIMP_IS_APPLICATOR (applicator), NULL);
+
+  return applicator->output_format;
+}
+
+void
+gimp_applicator_set_cache (GimpApplicator *applicator,
+                           gboolean        enable)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->cache_enabled != enable)
+    {
+      if (enable)
+        {
+          gegl_node_set (applicator->cache_node,
+                         "operation", "gegl:cache",
+                         NULL);
+        }
+      else
+        {
+          gegl_node_set (applicator->cache_node,
+                         "operation", "gegl:nop",
+                         NULL);
+        }
+
+      applicator->cache_enabled = enable;
+    }
+}
+
+gboolean
+gimp_applicator_get_cache (GimpApplicator *applicator)
+{
+  g_return_val_if_fail (GIMP_IS_APPLICATOR (applicator), FALSE);
+
+  return applicator->cache_enabled;
+}
+
+gboolean gegl_buffer_list_valid_rectangles (GeglBuffer     *buffer,
+                                            GeglRectangle **rectangles,
+                                            gint           *n_rectangles);
+
+GeglBuffer *
+gimp_applicator_get_cache_buffer (GimpApplicator  *applicator,
+                                  GeglRectangle  **rectangles,
+                                  gint            *n_rectangles)
+{
+  g_return_val_if_fail (GIMP_IS_APPLICATOR (applicator), NULL);
+  g_return_val_if_fail (rectangles != NULL, NULL);
+  g_return_val_if_fail (n_rectangles != NULL, NULL);
+
+  if (applicator->cache_enabled)
+    {
+      GeglBuffer *cache;
+
+      gegl_node_get (applicator->cache_node,
+                     "cache", &cache,
+                     NULL);
+
+      if (cache)
+        {
+          if (gegl_buffer_list_valid_rectangles (cache,
+                                                 rectangles, n_rectangles))
+            {
+              return cache;
+            }
+
+          g_object_unref (cache);
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_applicator_set_crop (GimpApplicator      *applicator,
+                          const GeglRectangle *rect)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  if (applicator->crop_enabled != (rect != NULL) ||
+      (rect && ! gegl_rectangle_equal (&applicator->crop_rect, rect)))
+    {
+      if (rect)
+        {
+          if (! applicator->crop_enabled)
+            {
+              gegl_node_set (applicator->crop_node,
+                             "operation", "gimp:compose-crop",
+                             "x",         rect->x,
+                             "y",         rect->y,
+                             "width",     rect->width,
+                             "height",    rect->height,
+                             NULL);
+
+              gegl_node_connect_to (applicator->input_node, "output",
+                                    applicator->crop_node,  "aux");
+            }
+          else
+            {
+              gegl_node_set (applicator->crop_node,
+                             "x",      rect->x,
+                             "y",      rect->y,
+                             "width",  rect->width,
+                             "height", rect->height,
+                             NULL);
+            }
+
+          applicator->crop_enabled = TRUE;
+          applicator->crop_rect    = *rect;
+        }
+      else
+        {
+          gegl_node_disconnect (applicator->crop_node, "aux");
+          gegl_node_set (applicator->crop_node,
+                         "operation", "gegl:nop",
+                         NULL);
+
+          applicator->crop_enabled = FALSE;
+        }
+    }
+}
+
+const GeglRectangle *
+gimp_applicator_get_crop (GimpApplicator *applicator)
+{
+  g_return_val_if_fail (GIMP_IS_APPLICATOR (applicator), NULL);
+
+  if (applicator->crop_enabled)
+    return &applicator->crop_rect;
+
+  return NULL;
+}
+
+void
+gimp_applicator_blit (GimpApplicator      *applicator,
+                      const GeglRectangle *rect)
+{
+  g_return_if_fail (GIMP_IS_APPLICATOR (applicator));
+
+  gegl_node_blit (applicator->dest_node, 1.0, rect,
+                  NULL, NULL, 0, GEGL_BLIT_DEFAULT);
+}
diff --git a/app/gegl/gimpapplicator.h b/app/gegl/gimpapplicator.h
new file mode 100644
index 0000000..e2919c2
--- /dev/null
+++ b/app/gegl/gimpapplicator.h
@@ -0,0 +1,146 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpapplicator.h
+ * Copyright (C) 2012-2013 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_APPLICATOR_H__
+#define __GIMP_APPLICATOR_H__
+
+
+#define GIMP_TYPE_APPLICATOR            (gimp_applicator_get_type ())
+#define GIMP_APPLICATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_APPLICATOR, GimpApplicator))
+#define GIMP_APPLICATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_APPLICATOR, GimpApplicatorClass))
+#define GIMP_IS_APPLICATOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_APPLICATOR))
+#define GIMP_IS_APPLICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_APPLICATOR))
+#define GIMP_APPLICATOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_APPLICATOR, GimpApplicatorClass))
+
+
+typedef struct _GimpApplicatorClass GimpApplicatorClass;
+
+struct _GimpApplicator
+{
+  GObject                 parent_instance;
+
+  GeglNode               *node;
+  GeglNode               *input_node;
+  GeglNode               *aux_node;
+  GeglNode               *output_node;
+
+  gboolean                active;
+
+  GeglBuffer             *apply_buffer;
+  GeglNode               *apply_src_node;
+
+  gint                    apply_offset_x;
+  gint                    apply_offset_y;
+  GeglNode               *apply_offset_node;
+
+  gdouble                 opacity;
+  GimpLayerMode           paint_mode;
+  GimpLayerColorSpace     blend_space;
+  GimpLayerColorSpace     composite_space;
+  GimpLayerCompositeMode  composite_mode;
+  GeglNode               *mode_node;
+
+  GimpComponentMask       affect;
+  GeglNode               *affect_node;
+
+  const Babl             *output_format;
+  GeglNode               *convert_format_node;
+
+  gboolean                cache_enabled;
+  GeglNode               *cache_node;
+
+  gboolean                crop_enabled;
+  GeglRectangle           crop_rect;
+  GeglNode               *crop_node;
+
+  GeglBuffer             *src_buffer;
+  GeglNode               *src_node;
+
+  GeglBuffer             *dest_buffer;
+  GeglNode               *dest_node;
+
+  GeglBuffer             *mask_buffer;
+  GeglNode               *mask_node;
+
+  gint                    mask_offset_x;
+  gint                    mask_offset_y;
+  GeglNode               *mask_offset_node;
+};
+
+struct _GimpApplicatorClass
+{
+  GObjectClass  parent_class;
+};
+
+
+GType        gimp_applicator_get_type          (void) G_GNUC_CONST;
+
+GimpApplicator * gimp_applicator_new           (GeglNode             *parent);
+
+void         gimp_applicator_set_active        (GimpApplicator       *applicator,
+                                                gboolean              active);
+
+void         gimp_applicator_set_src_buffer    (GimpApplicator       *applicator,
+                                                GeglBuffer           *dest_buffer);
+void         gimp_applicator_set_dest_buffer   (GimpApplicator       *applicator,
+                                                GeglBuffer           *dest_buffer);
+
+void         gimp_applicator_set_mask_buffer   (GimpApplicator       *applicator,
+                                                GeglBuffer           *mask_buffer);
+void         gimp_applicator_set_mask_offset   (GimpApplicator       *applicator,
+                                                gint                  mask_offset_x,
+                                                gint                  mask_offset_y);
+
+void         gimp_applicator_set_apply_buffer  (GimpApplicator       *applicator,
+                                                GeglBuffer           *apply_buffer);
+void         gimp_applicator_set_apply_offset  (GimpApplicator       *applicator,
+                                                gint                  apply_offset_x,
+                                                gint                  apply_offset_y);
+
+void         gimp_applicator_set_opacity       (GimpApplicator       *applicator,
+                                                gdouble               opacity);
+void         gimp_applicator_set_mode          (GimpApplicator       *applicator,
+                                                GimpLayerMode         paint_mode,
+                                                GimpLayerColorSpace   blend_space,
+                                                GimpLayerColorSpace   composite_space,
+                                                GimpLayerCompositeMode composite_mode);
+void         gimp_applicator_set_affect        (GimpApplicator       *applicator,
+                                                GimpComponentMask     affect);
+
+void         gimp_applicator_set_output_format (GimpApplicator       *applicator,
+                                                const Babl           *format);
+const Babl * gimp_applicator_get_output_format (GimpApplicator       *applicator);
+
+void         gimp_applicator_set_cache         (GimpApplicator       *applicator,
+                                                gboolean              enable);
+gboolean     gimp_applicator_get_cache         (GimpApplicator       *applicator);
+GeglBuffer * gimp_applicator_get_cache_buffer  (GimpApplicator       *applicator,
+                                                GeglRectangle       **rectangles,
+                                                gint                 *n_rectangles);
+
+void         gimp_applicator_set_crop          (GimpApplicator       *applicator,
+                                                const GeglRectangle  *rect);
+const GeglRectangle * gimp_applicator_get_crop (GimpApplicator       *applicator);
+
+void         gimp_applicator_blit              (GimpApplicator       *applicator,
+                                                const GeglRectangle  *rect);
+
+
+#endif  /*  __GIMP_APPLICATOR_H__  */
diff --git a/app/gegl/gimptilehandlervalidate.c b/app/gegl/gimptilehandlervalidate.c
new file mode 100644
index 0000000..01915d5
--- /dev/null
+++ b/app/gegl/gimptilehandlervalidate.c
@@ -0,0 +1,766 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+
+#include "gimp-gegl-types.h"
+
+#include "core/gimpchunkiterator.h"
+#include "core/gimpmarshal.h"
+
+#include "gimp-gegl-loops.h"
+#include "gimp-gegl-utils.h"
+#include "gimptilehandlervalidate.h"
+
+
+enum
+{
+  INVALIDATED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_FORMAT,
+  PROP_TILE_WIDTH,
+  PROP_TILE_HEIGHT,
+  PROP_WHOLE_TILE
+};
+
+
+static void     gimp_tile_handler_validate_finalize             (GObject         *object);
+static void     gimp_tile_handler_validate_set_property         (GObject         *object,
+                                                                 guint            property_id,
+                                                                 const GValue    *value,
+                                                                 GParamSpec      *pspec);
+static void     gimp_tile_handler_validate_get_property         (GObject         *object,
+                                                                 guint            property_id,
+                                                                 GValue          *value,
+                                                                 GParamSpec      *pspec);
+
+static void     gimp_tile_handler_validate_real_begin_validate  (GimpTileHandlerValidate *validate);
+static void     gimp_tile_handler_validate_real_end_validate    (GimpTileHandlerValidate *validate);
+static void     gimp_tile_handler_validate_real_validate        (GimpTileHandlerValidate *validate,
+                                                                 const GeglRectangle     *rect,
+                                                                 const Babl              *format,
+                                                                 gpointer                 dest_buf,
+                                                                 gint                     dest_stride);
+static void     gimp_tile_handler_validate_real_validate_buffer (GimpTileHandlerValidate *validate,
+                                                                 const GeglRectangle     *rect,
+                                                                 GeglBuffer              *buffer);
+
+static gpointer gimp_tile_handler_validate_command              (GeglTileSource  *source,
+                                                                 GeglTileCommand  command,
+                                                                 gint             x,
+                                                                 gint             y,
+                                                                 gint             z,
+                                                                 gpointer         data);
+
+
+G_DEFINE_TYPE (GimpTileHandlerValidate, gimp_tile_handler_validate,
+               GEGL_TYPE_TILE_HANDLER)
+
+#define parent_class gimp_tile_handler_validate_parent_class
+
+static guint gimp_tile_handler_validate_signals[LAST_SIGNAL];
+
+
+static void
+gimp_tile_handler_validate_class_init (GimpTileHandlerValidateClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  gimp_tile_handler_validate_signals[INVALIDATED] =
+    g_signal_new ("invalidated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpTileHandlerValidateClass, invalidated),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__BOXED,
+                  G_TYPE_NONE, 1,
+                  GEGL_TYPE_RECTANGLE);
+
+  object_class->finalize     = gimp_tile_handler_validate_finalize;
+  object_class->set_property = gimp_tile_handler_validate_set_property;
+  object_class->get_property = gimp_tile_handler_validate_get_property;
+
+  klass->begin_validate      = gimp_tile_handler_validate_real_begin_validate;
+  klass->end_validate        = gimp_tile_handler_validate_real_end_validate;
+  klass->validate            = gimp_tile_handler_validate_real_validate;
+  klass->validate_buffer     = gimp_tile_handler_validate_real_validate_buffer;
+
+  g_object_class_install_property (object_class, PROP_FORMAT,
+                                   g_param_spec_pointer ("format", NULL, NULL,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_TILE_WIDTH,
+                                   g_param_spec_int ("tile-width", NULL, NULL,
+                                                     1, G_MAXINT, 1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TILE_HEIGHT,
+                                   g_param_spec_int ("tile-height", NULL, NULL,
+                                                     1, G_MAXINT, 1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_WHOLE_TILE,
+                                   g_param_spec_boolean ("whole-tile", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_tile_handler_validate_init (GimpTileHandlerValidate *validate)
+{
+  GeglTileSource *source = GEGL_TILE_SOURCE (validate);
+
+  source->command = gimp_tile_handler_validate_command;
+
+  validate->dirty_region = cairo_region_create ();
+}
+
+static void
+gimp_tile_handler_validate_finalize (GObject *object)
+{
+  GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (object);
+
+  g_clear_object (&validate->graph);
+  g_clear_pointer (&validate->dirty_region, cairo_region_destroy);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tile_handler_validate_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (object);
+
+  switch (property_id)
+    {
+    case PROP_FORMAT:
+      validate->format = g_value_get_pointer (value);
+      break;
+    case PROP_TILE_WIDTH:
+      validate->tile_width = g_value_get_int (value);
+      break;
+    case PROP_TILE_HEIGHT:
+      validate->tile_height = g_value_get_int (value);
+      break;
+    case PROP_WHOLE_TILE:
+      validate->whole_tile = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tile_handler_validate_get_property (GObject    *object,
+                                         guint       property_id,
+                                         GValue     *value,
+                                         GParamSpec *pspec)
+{
+  GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (object);
+
+  switch (property_id)
+    {
+    case PROP_FORMAT:
+      g_value_set_pointer (value, (gpointer) validate->format);
+      break;
+    case PROP_TILE_WIDTH:
+      g_value_set_int (value, validate->tile_width);
+      break;
+    case PROP_TILE_HEIGHT:
+      g_value_set_int (value, validate->tile_height);
+      break;
+    case PROP_WHOLE_TILE:
+      g_value_set_boolean (value, validate->whole_tile);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tile_handler_validate_real_begin_validate (GimpTileHandlerValidate *validate)
+{
+  validate->suspend_validate++;
+}
+
+static void
+gimp_tile_handler_validate_real_end_validate (GimpTileHandlerValidate *validate)
+{
+  validate->suspend_validate--;
+}
+
+static void
+gimp_tile_handler_validate_real_validate (GimpTileHandlerValidate *validate,
+                                          const GeglRectangle     *rect,
+                                          const Babl              *format,
+                                          gpointer                 dest_buf,
+                                          gint                     dest_stride)
+{
+#if 0
+  g_printerr ("validating at %d %d %d %d\n",
+              rect.x,
+              rect.y,
+              rect.width,
+              rect.height);
+#endif
+
+  gegl_node_blit (validate->graph, 1.0, rect, format,
+                  dest_buf, dest_stride,
+                  GEGL_BLIT_DEFAULT);
+}
+
+static void
+gimp_tile_handler_validate_real_validate_buffer (GimpTileHandlerValidate *validate,
+                                                 const GeglRectangle     *rect,
+                                                 GeglBuffer              *buffer)
+{
+  GimpTileHandlerValidateClass *klass;
+
+  klass = GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate);
+
+  if (klass->validate == gimp_tile_handler_validate_real_validate)
+    {
+      gegl_node_blit_buffer (validate->graph, buffer, rect, 0,
+                             GEGL_ABYSS_NONE);
+    }
+  else
+    {
+      const Babl *format = gegl_buffer_get_format (buffer);
+      gpointer    data;
+      gint        stride;
+
+      data = gegl_buffer_linear_open (buffer, rect, &stride, format);
+
+      klass->validate (validate, rect, format, data, stride);
+
+      gegl_buffer_linear_close (buffer, data);
+    }
+}
+
+static GeglTile *
+gimp_tile_handler_validate_validate_tile (GeglTileSource *source,
+                                          gint            x,
+                                          gint            y)
+{
+  GimpTileHandlerValidate *validate = GIMP_TILE_HANDLER_VALIDATE (source);
+  GeglTile                *tile;
+  cairo_rectangle_int_t    tile_rect;
+  cairo_region_overlap_t   overlap;
+
+  if (validate->suspend_validate ||
+      cairo_region_is_empty (validate->dirty_region))
+    {
+      return gegl_tile_handler_source_command (source,
+                                               GEGL_TILE_GET, x, y, 0, NULL);
+    }
+
+  tile_rect.x      = x * validate->tile_width;
+  tile_rect.y      = y * validate->tile_height;
+  tile_rect.width  = validate->tile_width;
+  tile_rect.height = validate->tile_height;
+
+  overlap = cairo_region_contains_rectangle (validate->dirty_region,
+                                             &tile_rect);
+
+  if (overlap == CAIRO_REGION_OVERLAP_OUT)
+    {
+      return gegl_tile_handler_source_command (source,
+                                               GEGL_TILE_GET, x, y, 0, NULL);
+    }
+
+  if (overlap == CAIRO_REGION_OVERLAP_IN || validate->whole_tile)
+    {
+      gint tile_bpp;
+      gint tile_stride;
+
+      cairo_region_subtract_rectangle (validate->dirty_region, &tile_rect);
+
+      tile_bpp    = babl_format_get_bytes_per_pixel (validate->format);
+      tile_stride = tile_bpp * validate->tile_width;
+
+      tile = gegl_tile_handler_get_source_tile (GEGL_TILE_HANDLER (source),
+                                                x, y, 0, FALSE);
+
+      gimp_tile_handler_validate_begin_validate (validate);
+
+      gegl_tile_lock (tile);
+
+      GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate)->validate
+        (validate,
+         GEGL_RECTANGLE (tile_rect.x,
+                         tile_rect.y,
+                         tile_rect.width,
+                         tile_rect.height),
+         validate->format,
+         gegl_tile_get_data (tile),
+         tile_stride);
+
+      gegl_tile_unlock (tile);
+
+      gimp_tile_handler_validate_end_validate (validate);
+    }
+  else
+    {
+      cairo_region_t *tile_region;
+      gint            tile_bpp;
+      gint            tile_stride;
+      gint            n_rects;
+      gint            i;
+
+      tile_region = cairo_region_copy (validate->dirty_region);
+      cairo_region_intersect_rectangle (tile_region, &tile_rect);
+
+      cairo_region_subtract_rectangle (validate->dirty_region, &tile_rect);
+
+      tile_bpp    = babl_format_get_bytes_per_pixel (validate->format);
+      tile_stride = tile_bpp * validate->tile_width;
+
+      tile = gegl_tile_handler_source_command (source,
+                                               GEGL_TILE_GET, x, y, 0, NULL);
+
+      if (! tile)
+        {
+          tile = gegl_tile_handler_create_tile (GEGL_TILE_HANDLER (source),
+                                                x, y, 0);
+
+          memset (gegl_tile_get_data (tile),
+                  0, tile_stride * validate->tile_height);
+        }
+
+      gimp_tile_handler_validate_begin_validate (validate);
+
+      gegl_tile_lock (tile);
+
+      n_rects = cairo_region_num_rectangles (tile_region);
+
+#if 0
+      g_printerr ("%d chunks\n", n_rects);
+#endif
+
+      for (i = 0; i < n_rects; i++)
+        {
+          cairo_rectangle_int_t blit_rect;
+          gint                  tile_x;
+          gint                  tile_y;
+
+          cairo_region_get_rectangle (tile_region, i, &blit_rect);
+
+          tile_x = blit_rect.x % validate->tile_width;
+          if (tile_x < 0) tile_x += validate->tile_width;
+
+          tile_y = blit_rect.y % validate->tile_height;
+          if (tile_y < 0) tile_y += validate->tile_height;
+
+          GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate)->validate
+            (validate,
+             GEGL_RECTANGLE (blit_rect.x,
+                             blit_rect.y,
+                             blit_rect.width,
+                             blit_rect.height),
+             validate->format,
+             gegl_tile_get_data (tile) +
+             tile_y * tile_stride      +
+             tile_x * tile_bpp,
+             tile_stride);
+        }
+
+      gegl_tile_unlock (tile);
+
+      gimp_tile_handler_validate_end_validate (validate);
+
+      cairo_region_destroy (tile_region);
+    }
+
+  return tile;
+}
+
+static gpointer
+gimp_tile_handler_validate_command (GeglTileSource  *source,
+                                    GeglTileCommand  command,
+                                    gint             x,
+                                    gint             y,
+                                    gint             z,
+                                    gpointer         data)
+{
+  if (command == GEGL_TILE_GET && z == 0)
+    return gimp_tile_handler_validate_validate_tile (source, x, y);
+
+  return gegl_tile_handler_source_command (source, command, x, y, z, data);
+}
+
+
+/*  public functions  */
+
+GeglTileHandler *
+gimp_tile_handler_validate_new (GeglNode *graph)
+{
+  GimpTileHandlerValidate *validate;
+
+  g_return_val_if_fail (GEGL_IS_NODE (graph), NULL);
+
+  validate = g_object_new (GIMP_TYPE_TILE_HANDLER_VALIDATE, NULL);
+
+  validate->graph = g_object_ref (graph);
+
+  return GEGL_TILE_HANDLER (validate);
+}
+
+void
+gimp_tile_handler_validate_assign (GimpTileHandlerValidate *validate,
+                                   GeglBuffer              *buffer)
+{
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+  g_return_if_fail (gimp_tile_handler_validate_get_assigned (buffer) == NULL);
+
+  gegl_buffer_add_handler (buffer, validate);
+
+  g_object_get (buffer,
+                "format",      &validate->format,
+                "tile-width",  &validate->tile_width,
+                "tile-height", &validate->tile_height,
+                NULL);
+
+  g_object_set_data (G_OBJECT (buffer),
+                     "gimp-tile-handler-validate", validate);
+}
+
+void
+gimp_tile_handler_validate_unassign (GimpTileHandlerValidate *validate,
+                                     GeglBuffer              *buffer)
+{
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+  g_return_if_fail (GEGL_IS_BUFFER (buffer));
+  g_return_if_fail (gimp_tile_handler_validate_get_assigned (buffer) == validate);
+
+  g_object_set_data (G_OBJECT (buffer),
+                     "gimp-tile-handler-validate", NULL);
+
+  gegl_buffer_remove_handler (buffer, validate);
+}
+
+GimpTileHandlerValidate *
+gimp_tile_handler_validate_get_assigned (GeglBuffer *buffer)
+{
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
+
+  return g_object_get_data (G_OBJECT (buffer),
+                            "gimp-tile-handler-validate");
+}
+
+void
+gimp_tile_handler_validate_invalidate (GimpTileHandlerValidate *validate,
+                                       const GeglRectangle     *rect)
+{
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+  g_return_if_fail (rect != NULL);
+
+  cairo_region_union_rectangle (validate->dirty_region,
+                                (cairo_rectangle_int_t *) rect);
+
+  gegl_tile_handler_damage_rect (GEGL_TILE_HANDLER (validate), rect);
+
+  g_signal_emit (validate, gimp_tile_handler_validate_signals[INVALIDATED],
+                 0, rect, NULL);
+}
+
+void
+gimp_tile_handler_validate_undo_invalidate (GimpTileHandlerValidate *validate,
+                                            const GeglRectangle     *rect)
+{
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+  g_return_if_fail (rect != NULL);
+
+  cairo_region_subtract_rectangle (validate->dirty_region,
+                                   (cairo_rectangle_int_t *) rect);
+}
+
+void
+gimp_tile_handler_validate_begin_validate (GimpTileHandlerValidate *validate)
+{
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+
+  if (validate->validating++ == 0)
+    GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate)->begin_validate (validate);
+}
+
+void
+gimp_tile_handler_validate_end_validate (GimpTileHandlerValidate *validate)
+{
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+  g_return_if_fail (validate->validating > 0);
+
+  if (--validate->validating == 0)
+    GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate)->end_validate (validate);
+}
+
+void
+gimp_tile_handler_validate_validate (GimpTileHandlerValidate *validate,
+                                     GeglBuffer              *buffer,
+                                     const GeglRectangle     *rect,
+                                     gboolean                 intersect,
+                                     gboolean                 chunked)
+{
+  GimpTileHandlerValidateClass *klass;
+  cairo_region_t               *region = NULL;
+
+  g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
+  g_return_if_fail (gimp_tile_handler_validate_get_assigned (buffer) ==
+                    validate);
+
+  klass = GIMP_TILE_HANDLER_VALIDATE_GET_CLASS (validate);
+
+  if (! rect)
+    rect = gegl_buffer_get_extent (buffer);
+
+  if (intersect)
+    {
+      region = cairo_region_copy (validate->dirty_region);
+
+      cairo_region_intersect_rectangle (region,
+                                        (const cairo_rectangle_int_t *) rect);
+    }
+  else if (chunked)
+    {
+      region = cairo_region_create_rectangle (
+        (const cairo_rectangle_int_t *) rect);
+    }
+
+  if (region)
+    {
+      if (! cairo_region_is_empty (region))
+        {
+          gimp_tile_handler_validate_begin_validate (validate);
+
+          if (chunked)
+            {
+              GimpChunkIterator *iter;
+
+              iter   = gimp_chunk_iterator_new (region);
+              region = NULL;
+
+              while (gimp_chunk_iterator_next (iter))
+                {
+                  GeglRectangle blit_rect;
+
+                  while (gimp_chunk_iterator_get_rect (iter, &blit_rect))
+                    klass->validate_buffer (validate, &blit_rect, buffer);
+                }
+            }
+          else
+            {
+              gint n_rects;
+              gint i;
+
+              n_rects = cairo_region_num_rectangles (region);
+
+              for (i = 0; i < n_rects; i++)
+                {
+                  cairo_rectangle_int_t blit_rect;
+
+                  cairo_region_get_rectangle (region, i, &blit_rect);
+
+                  klass->validate_buffer (validate,
+                                          (const GeglRectangle *) &blit_rect,
+                                          buffer);
+                }
+              }
+
+          gimp_tile_handler_validate_end_validate (validate);
+
+          cairo_region_subtract_rectangle (
+            validate->dirty_region,
+            (const cairo_rectangle_int_t *) rect);
+        }
+
+      g_clear_pointer (&region, cairo_region_destroy);
+    }
+  else
+    {
+      gimp_tile_handler_validate_begin_validate (validate);
+
+      klass->validate_buffer (validate, rect, buffer);
+
+      gimp_tile_handler_validate_end_validate (validate);
+
+      cairo_region_subtract_rectangle (
+            validate->dirty_region,
+            (const cairo_rectangle_int_t *) rect);
+    }
+}
+
+gboolean
+gimp_tile_handler_validate_buffer_set_extent (GeglBuffer          *buffer,
+                                              const GeglRectangle *extent)
+{
+  GimpTileHandlerValidate *validate;
+
+  g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (extent != NULL, FALSE);
+
+  validate = gimp_tile_handler_validate_get_assigned (buffer);
+
+  g_return_val_if_fail (validate != NULL, FALSE);
+
+  validate->suspend_validate++;
+
+  if (gimp_gegl_buffer_set_extent (buffer, extent))
+    {
+      validate->suspend_validate--;
+
+      cairo_region_intersect_rectangle (validate->dirty_region,
+                                        (const cairo_rectangle_int_t *) extent);
+
+      return TRUE;
+    }
+
+  validate->suspend_validate--;
+
+  return FALSE;
+}
+
+void
+gimp_tile_handler_validate_buffer_copy (GeglBuffer          *src_buffer,
+                                        const GeglRectangle *src_rect,
+                                        GeglBuffer          *dst_buffer,
+                                        const GeglRectangle *dst_rect)
+{
+  GimpTileHandlerValidate *src_validate;
+  GimpTileHandlerValidate *dst_validate;
+  GeglRectangle            real_src_rect;
+  GeglRectangle            real_dst_rect;
+
+  g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
+  g_return_if_fail (GEGL_IS_BUFFER (dst_buffer));
+  g_return_if_fail (src_rect != dst_rect);
+
+  src_validate = gimp_tile_handler_validate_get_assigned (src_buffer);
+  dst_validate = gimp_tile_handler_validate_get_assigned (dst_buffer);
+
+  g_return_if_fail (dst_validate != NULL);
+
+  if (! src_rect)
+    src_rect = gegl_buffer_get_extent (src_buffer);
+
+  if (! dst_rect)
+    dst_rect = src_rect;
+
+  real_src_rect = *src_rect;
+
+  gegl_rectangle_intersect (&real_dst_rect,
+                            dst_rect, gegl_buffer_get_extent (dst_buffer));
+
+  real_src_rect.x      += real_dst_rect.x - dst_rect->x;
+  real_src_rect.y      += real_dst_rect.y - dst_rect->y;
+  real_src_rect.width  -= real_dst_rect.x - dst_rect->x;
+  real_src_rect.height -= real_dst_rect.y - dst_rect->y;
+
+  real_src_rect.width  = CLAMP (real_src_rect.width,  0, real_dst_rect.width);
+  real_src_rect.height = CLAMP (real_src_rect.height, 0, real_dst_rect.height);
+
+  /* temporarily remove the source buffer's validate handler, so that
+   * gegl_buffer_copy() can use fast tile copying, using the TILE_COPY command.
+   * currently, gegl only uses TILE_COPY when the source buffer has no user-
+   * provided tile handlers.
+   */
+  if (src_validate)
+    {
+      g_object_ref (src_validate);
+
+      gimp_tile_handler_validate_unassign (src_validate, src_buffer);
+    }
+
+  dst_validate->suspend_validate++;
+
+  gimp_gegl_buffer_copy (src_buffer, &real_src_rect, GEGL_ABYSS_NONE,
+                         dst_buffer, &real_dst_rect);
+
+  dst_validate->suspend_validate--;
+
+  if (src_validate)
+    {
+      gimp_tile_handler_validate_assign (src_validate, src_buffer);
+
+      g_object_unref (src_validate);
+    }
+
+  cairo_region_subtract_rectangle (dst_validate->dirty_region,
+                                   (cairo_rectangle_int_t *) &real_dst_rect);
+
+  if (src_validate)
+    {
+      if (real_src_rect.x == real_dst_rect.x &&
+          real_src_rect.y == real_dst_rect.y &&
+          gegl_rectangle_equal (&real_src_rect,
+                                gegl_buffer_get_extent (src_buffer)))
+        {
+          cairo_region_union (dst_validate->dirty_region,
+                              src_validate->dirty_region);
+        }
+      else if (cairo_region_contains_rectangle (
+                 src_validate->dirty_region,
+                 (cairo_rectangle_int_t *) &real_src_rect) !=
+               CAIRO_REGION_OVERLAP_OUT)
+        {
+          cairo_region_t *region;
+
+          region = cairo_region_copy (src_validate->dirty_region);
+
+          if (! gegl_rectangle_equal (&real_src_rect,
+                                      gegl_buffer_get_extent (src_buffer)))
+            {
+              cairo_region_intersect_rectangle (
+                region, (cairo_rectangle_int_t *) &real_src_rect);
+            }
+
+          cairo_region_translate (region,
+                                  real_dst_rect.x - real_src_rect.x,
+                                  real_dst_rect.y - real_src_rect.y);
+
+          if (cairo_region_is_empty (dst_validate->dirty_region))
+            {
+              cairo_region_destroy (dst_validate->dirty_region);
+
+              dst_validate->dirty_region = region;
+            }
+          else
+            {
+              cairo_region_union (dst_validate->dirty_region, region);
+
+              cairo_region_destroy (region);
+            }
+        }
+    }
+}
diff --git a/app/gegl/gimptilehandlervalidate.h b/app/gegl/gimptilehandlervalidate.h
new file mode 100644
index 0000000..998430f
--- /dev/null
+++ b/app/gegl/gimptilehandlervalidate.h
@@ -0,0 +1,112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TILE_HANDLER_VALIDATE_H__
+#define __GIMP_TILE_HANDLER_VALIDATE_H__
+
+#include <gegl-buffer-backend.h>
+
+/***
+ * GimpTileHandlerValidate is a GeglTileHandler that renders the
+ * projection.
+ */
+
+G_BEGIN_DECLS
+
+#define GIMP_TYPE_TILE_HANDLER_VALIDATE            (gimp_tile_handler_validate_get_type ())
+#define GIMP_TILE_HANDLER_VALIDATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidate))
+#define GIMP_TILE_HANDLER_VALIDATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidateClass))
+#define GIMP_IS_TILE_HANDLER_VALIDATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TILE_HANDLER_VALIDATE))
+#define GIMP_IS_TILE_HANDLER_VALIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_TILE_HANDLER_VALIDATE))
+#define GIMP_TILE_HANDLER_VALIDATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidateClass))
+
+
+typedef struct _GimpTileHandlerValidate      GimpTileHandlerValidate;
+typedef struct _GimpTileHandlerValidateClass GimpTileHandlerValidateClass;
+
+struct _GimpTileHandlerValidate
+{
+  GeglTileHandler  parent_instance;
+
+  GeglNode        *graph;
+  cairo_region_t  *dirty_region;
+  const Babl      *format;
+  gint             tile_width;
+  gint             tile_height;
+  gboolean         whole_tile;
+  gint             validating;
+  gint             suspend_validate;
+};
+
+struct _GimpTileHandlerValidateClass
+{
+  GeglTileHandlerClass  parent_class;
+
+  /*  signals  */
+  void (* invalidated)     (GimpTileHandlerValidate *validate,
+                            const GeglRectangle     *rect);
+
+  /*  virtual functions  */
+  void (* begin_validate)  (GimpTileHandlerValidate *validate);
+  void (* end_validate)    (GimpTileHandlerValidate *validate);
+  void (* validate)        (GimpTileHandlerValidate *validate,
+                            const GeglRectangle     *rect,
+                            const Babl              *format,
+                            gpointer                 dest_buf,
+                            gint                     dest_stride);
+  void (* validate_buffer) (GimpTileHandlerValidate *validate,
+                            const GeglRectangle     *rect,
+                            GeglBuffer              *buffer);
+};
+
+
+GType                     gimp_tile_handler_validate_get_type          (void) G_GNUC_CONST;
+
+GeglTileHandler         * gimp_tile_handler_validate_new               (GeglNode                *graph);
+
+void                      gimp_tile_handler_validate_assign            (GimpTileHandlerValidate *validate,
+                                                                        GeglBuffer              *buffer);
+void                      gimp_tile_handler_validate_unassign          (GimpTileHandlerValidate *validate,
+                                                                        GeglBuffer              *buffer);
+GimpTileHandlerValidate * gimp_tile_handler_validate_get_assigned      (GeglBuffer              *buffer);
+
+void                      gimp_tile_handler_validate_invalidate        (GimpTileHandlerValidate *validate,
+                                                                        const GeglRectangle     *rect);
+void                      gimp_tile_handler_validate_undo_invalidate   (GimpTileHandlerValidate *validate,
+                                                                        const GeglRectangle     *rect);
+
+void                      gimp_tile_handler_validate_begin_validate    (GimpTileHandlerValidate *validate);
+void                      gimp_tile_handler_validate_end_validate      (GimpTileHandlerValidate *validate);
+
+void                      gimp_tile_handler_validate_validate          (GimpTileHandlerValidate *validate,
+                                                                        GeglBuffer              *buffer,
+                                                                        const GeglRectangle     *rect,
+                                                                        gboolean                 intersect,
+                                                                        gboolean                 chunked);
+
+gboolean                  gimp_tile_handler_validate_buffer_set_extent (GeglBuffer              *buffer,
+                                                                        const GeglRectangle     *extent);
+
+void                      gimp_tile_handler_validate_buffer_copy       (GeglBuffer              *src_buffer,
+                                                                        const GeglRectangle     *src_rect,
+                                                                        GeglBuffer              *dst_buffer,
+                                                                        const GeglRectangle     *dst_rect);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_TILE_HANDLER_VALIDATE_H__ */
diff --git a/app/gimp-debug.c b/app/gimp-debug.c
new file mode 100644
index 0000000..a5668ef
--- /dev/null
+++ b/app/gimp-debug.c
@@ -0,0 +1,122 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-debug.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core/core-types.h"
+
+#include "core/gimpobject.h"
+
+#include "gimp-debug.h"
+
+
+static GHashTable *class_hash = NULL;
+
+
+void
+gimp_debug_enable_instances (void)
+{
+  g_return_if_fail (class_hash == NULL);
+
+  class_hash = g_hash_table_new_full (g_str_hash,
+                                      g_str_equal,
+                                      NULL,
+                                      (GDestroyNotify ) g_hash_table_unref);
+}
+
+void
+gimp_debug_add_instance (GObject      *instance,
+                         GObjectClass *klass)
+{
+  if (class_hash)
+    {
+      GHashTable  *instance_hash;
+      const gchar *type_name;
+
+      type_name = g_type_name (G_TYPE_FROM_CLASS (klass));
+
+      instance_hash = g_hash_table_lookup (class_hash, type_name);
+
+      if (! instance_hash)
+        {
+          instance_hash = g_hash_table_new (g_direct_hash,
+                                            g_direct_equal);
+          g_hash_table_insert (class_hash, (gchar *) type_name, instance_hash);
+        }
+
+      g_hash_table_insert (instance_hash, instance, instance);
+    }
+}
+
+void
+gimp_debug_remove_instance (GObject *instance)
+{
+  if (class_hash)
+    {
+      GHashTable  *instance_hash;
+      const gchar *type_name;
+
+      type_name = g_type_name (G_OBJECT_TYPE (instance));
+
+      instance_hash = g_hash_table_lookup (class_hash, type_name);
+
+      if (instance_hash)
+        {
+          g_hash_table_remove (instance_hash, instance);
+
+          if (g_hash_table_size (instance_hash) == 0)
+            g_hash_table_remove (class_hash, type_name);
+        }
+    }
+}
+
+static void
+gimp_debug_instance_foreach (GObject *instance)
+{
+  g_printerr ("  \'%s\': ref_count = %d\n",
+              GIMP_IS_OBJECT (instance) ?
+              gimp_object_get_name (instance) : "GObject",
+              instance->ref_count);
+}
+
+static void
+gimp_debug_class_foreach (const gchar *type_name,
+                          GHashTable  *instance_hash)
+{
+  g_printerr ("Leaked %s instances: %d\n",
+              type_name, g_hash_table_size (instance_hash));
+
+  g_hash_table_foreach (instance_hash,
+                        (GHFunc) gimp_debug_instance_foreach,
+                        NULL);
+}
+
+void
+gimp_debug_instances (void)
+{
+  if (class_hash)
+    {
+      g_hash_table_foreach (class_hash,
+                            (GHFunc) gimp_debug_class_foreach,
+                            NULL);
+    }
+}
diff --git a/app/gimp-debug.h b/app/gimp-debug.h
new file mode 100644
index 0000000..59b43f8
--- /dev/null
+++ b/app/gimp-debug.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-debug.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEBUG_H__
+#define __GIMP_DEBUG_H__
+
+
+void  gimp_debug_enable_instances (void);
+
+void  gimp_debug_add_instance     (GObject      *instance,
+                                   GObjectClass *klass);
+void  gimp_debug_remove_instance  (GObject      *instance);
+
+void  gimp_debug_instances        (void);
+
+
+#endif /* __GIMP_DEBUG_H__ */
diff --git a/app/gimp-intl.h b/app/gimp-intl.h
new file mode 100644
index 0000000..178ae47
--- /dev/null
+++ b/app/gimp-intl.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_INTL_H__
+#define __GIMP_INTL_H__
+
+#ifndef GETTEXT_PACKAGE
+#error "config.h must be included prior to gimp-intl.h"
+#endif
+
+#include <glib/gi18n.h>
+
+#endif /* __GIMP_INTL_H__ */
diff --git a/app/gimp-log.c b/app/gimp-log.c
new file mode 100644
index 0000000..30a74a4
--- /dev/null
+++ b/app/gimp-log.c
@@ -0,0 +1,219 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "glib-object.h"
+
+#include "gimp-debug.h"
+#include "gimp-log.h"
+
+
+static const GDebugKey log_keys[] =
+{
+  { "tool-events",        GIMP_LOG_TOOL_EVENTS        },
+  { "tool-focus",         GIMP_LOG_TOOL_FOCUS         },
+  { "dnd",                GIMP_LOG_DND                },
+  { "help",               GIMP_LOG_HELP               },
+  { "dialog-factory",     GIMP_LOG_DIALOG_FACTORY     },
+  { "menus",              GIMP_LOG_MENUS              },
+  { "save-dialog",        GIMP_LOG_SAVE_DIALOG        },
+  { "image-scale",        GIMP_LOG_IMAGE_SCALE        },
+  { "shadow-tiles",       GIMP_LOG_SHADOW_TILES       },
+  { "scale",              GIMP_LOG_SCALE              },
+  { "wm",                 GIMP_LOG_WM                 },
+  { "floating-selection", GIMP_LOG_FLOATING_SELECTION },
+  { "shm",                GIMP_LOG_SHM                },
+  { "text-editing",       GIMP_LOG_TEXT_EDITING       },
+  { "key-events",         GIMP_LOG_KEY_EVENTS         },
+  { "auto-tab-style",     GIMP_LOG_AUTO_TAB_STYLE     },
+  { "instances",          GIMP_LOG_INSTANCES          },
+  { "rectangle-tool",     GIMP_LOG_RECTANGLE_TOOL     },
+  { "brush-cache",        GIMP_LOG_BRUSH_CACHE        },
+  { "projection",         GIMP_LOG_PROJECTION         },
+  { "xcf",                GIMP_LOG_XCF                }
+};
+
+static const gchar * const log_domains[] =
+{
+  "Gimp",
+  "Gimp-Actions",
+  "Gimp-Base",
+  "Gimp-Composite",
+  "Gimp-Config",
+  "Gimp-Core",
+  "Gimp-Dialogs",
+  "Gimp-Display",
+  "Gimp-File",
+  "Gimp-GEGL",
+  "Gimp-GUI",
+  "Gimp-Menus",
+  "Gimp-Operations",
+  "Gimp-PDB",
+  "Gimp-Paint",
+  "Gimp-Paint-Funcs",
+  "Gimp-Plug-In",
+  "Gimp-Text",
+  "Gimp-Tools",
+  "Gimp-Vectors",
+  "Gimp-Widgets",
+  "Gimp-XCF",
+  "LibGimpBase",
+  "LibGimpColor",
+  "LibGimpConfig",
+  "LibGimpMath",
+  "LibGimpModule",
+  "LibGimpThumb",
+  "LibGimpWidgets",
+  "GEGL",
+  NULL
+};
+
+
+GimpLogFlags gimp_log_flags = 0;
+
+
+void
+gimp_log_init (void)
+{
+  const gchar *env_log_val = g_getenv ("GIMP_LOG");
+
+  if (! env_log_val)
+    env_log_val = g_getenv ("GIMP_DEBUG");
+
+  if (env_log_val)
+    g_setenv ("G_MESSAGES_DEBUG", env_log_val, TRUE);
+
+  if (env_log_val)
+    {
+      /*  g_parse_debug_string() has special treatment of the string 'help',
+       *  but we want to use it for the GIMP_LOG_HELP domain. "list-all"
+       *  is a replacement for "help" in GIMP.
+       */
+      if (g_ascii_strcasecmp (env_log_val, "list-all") == 0)
+        gimp_log_flags = g_parse_debug_string ("help",
+                                               log_keys,
+                                               G_N_ELEMENTS (log_keys));
+      else if (g_ascii_strcasecmp (env_log_val, "help") == 0)
+        gimp_log_flags = GIMP_LOG_HELP;
+      else
+        gimp_log_flags = g_parse_debug_string (env_log_val,
+                                               log_keys,
+                                               G_N_ELEMENTS (log_keys));
+
+      if (gimp_log_flags & GIMP_LOG_INSTANCES)
+        {
+          gimp_debug_enable_instances ();
+        }
+      else if (! gimp_log_flags)
+        {
+          /* If the environment variable was set but no log flags are
+           * set as a result, let's assume one is not sure how to use
+           * the log flags and output the list of keys as a helper.
+           */
+          gimp_log_flags = g_parse_debug_string ("help",
+                                                 log_keys,
+                                                 G_N_ELEMENTS (log_keys));
+        }
+    }
+}
+
+void
+gimp_log (GimpLogFlags  flags,
+          const gchar  *function,
+          gint          line,
+          const gchar  *format,
+          ...)
+{
+  va_list args;
+
+  va_start (args, format);
+  gimp_logv (flags, function, line, format, args);
+  va_end (args);
+}
+
+void
+gimp_logv (GimpLogFlags  flags,
+           const gchar  *function,
+           gint          line,
+           const gchar  *format,
+           va_list       args)
+{
+  const gchar *domain = "unknown";
+  gchar       *message;
+  gint         i;
+
+  for (i = 0; i < G_N_ELEMENTS (log_keys); i++)
+    if (log_keys[i].value == flags)
+      {
+        domain = log_keys[i].key;
+        break;
+      }
+
+  if (format)
+    message = g_strdup_vprintf (format, args);
+  else
+    message = g_strdup ("called");
+
+  g_log (domain, G_LOG_LEVEL_DEBUG,
+         "%s(%d): %s", function, line, message);
+
+  g_free (message);
+}
+
+GimpLogHandler
+gimp_log_set_handler (gboolean       global,
+                      GLogLevelFlags log_levels,
+                      GLogFunc       log_func,
+                      gpointer       user_data)
+{
+  GimpLogHandler handler;
+  gint           n;
+  gint           i;
+
+  g_return_val_if_fail (log_func != NULL, NULL);
+
+  n = G_N_ELEMENTS (log_domains) - (global ? 1 : 0);
+
+  handler = g_new (guint, n + 1);
+
+  handler[0] = n;
+
+  for (i = 0; i < n; i++)
+    {
+      handler[i + 1] = g_log_set_handler (log_domains[i], log_levels,
+                                          log_func, user_data);
+    }
+
+  return handler;
+}
+
+void
+gimp_log_remove_handler (GimpLogHandler handler)
+{
+  gint n;
+  gint i;
+
+  g_return_if_fail (handler != NULL);
+
+  n = handler[0];
+
+  for (i = 0; i < n; i++)
+    g_log_remove_handler (log_domains[i], handler[i + 1]);
+
+  g_free (handler);
+}
diff --git a/app/gimp-log.h b/app/gimp-log.h
new file mode 100644
index 0000000..41e0589
--- /dev/null
+++ b/app/gimp-log.h
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LOG_H__
+#define __GIMP_LOG_H__
+
+
+typedef guint *GimpLogHandler;
+
+
+typedef enum
+{
+  GIMP_LOG_TOOL_EVENTS        = 1 << 0,
+  GIMP_LOG_TOOL_FOCUS         = 1 << 1,
+  GIMP_LOG_DND                = 1 << 2,
+  GIMP_LOG_HELP               = 1 << 3,
+  GIMP_LOG_DIALOG_FACTORY     = 1 << 4,
+  GIMP_LOG_MENUS              = 1 << 5,
+  GIMP_LOG_SAVE_DIALOG        = 1 << 6,
+  GIMP_LOG_IMAGE_SCALE        = 1 << 7,
+  GIMP_LOG_SHADOW_TILES       = 1 << 8,
+  GIMP_LOG_SCALE              = 1 << 9,
+  GIMP_LOG_WM                 = 1 << 10,
+  GIMP_LOG_FLOATING_SELECTION = 1 << 11,
+  GIMP_LOG_SHM                = 1 << 12,
+  GIMP_LOG_TEXT_EDITING       = 1 << 13,
+  GIMP_LOG_KEY_EVENTS         = 1 << 14,
+  GIMP_LOG_AUTO_TAB_STYLE     = 1 << 15,
+  GIMP_LOG_INSTANCES          = 1 << 16,
+  GIMP_LOG_RECTANGLE_TOOL     = 1 << 17,
+  GIMP_LOG_BRUSH_CACHE        = 1 << 18,
+  GIMP_LOG_PROJECTION         = 1 << 19,
+  GIMP_LOG_XCF                = 1 << 20,
+  GIMP_LOG_MAGIC_MATCH        = 1 << 21
+} GimpLogFlags;
+
+
+extern GimpLogFlags gimp_log_flags;
+
+
+void             gimp_log_init           (void);
+void             gimp_log                (GimpLogFlags    flags,
+                                          const gchar    *function,
+                                          gint            line,
+                                          const gchar    *format,
+                                          ...) G_GNUC_PRINTF (4, 5);
+void             gimp_logv               (GimpLogFlags    flags,
+                                          const gchar    *function,
+                                          gint            line,
+                                          const gchar    *format,
+                                          va_list         args) G_GNUC_PRINTF (4, 0);
+
+GimpLogHandler   gimp_log_set_handler    (gboolean        global,
+                                          GLogLevelFlags  log_levels,
+                                          GLogFunc        log_func,
+                                          gpointer        user_data);
+void             gimp_log_remove_handler (GimpLogHandler  handler);
+
+
+#ifdef G_HAVE_ISO_VARARGS
+
+#define GIMP_LOG(type, ...) \
+        G_STMT_START { \
+        if (gimp_log_flags & GIMP_LOG_##type) \
+          gimp_log (GIMP_LOG_##type, G_STRFUNC, __LINE__, __VA_ARGS__);       \
+        } G_STMT_END
+
+#elif defined(G_HAVE_GNUC_VARARGS)
+
+#define GIMP_LOG(type, format...) \
+        G_STMT_START { \
+        if (gimp_log_flags & GIMP_LOG_##type) \
+          gimp_log (GIMP_LOG_##type, G_STRFUNC, __LINE__, format);  \
+        } G_STMT_END
+
+#else /* no varargs macros */
+
+/* need to expand all the short forms
+ * to make them known constants at compile time
+ */
+#define TOOL_EVENTS        GIMP_LOG_TOOL_EVENTS
+#define TOOL_FOCUS         GIMP_LOG_TOOL_FOCUS
+#define DND                GIMP_LOG_DND
+#define HELP               GIMP_LOG_HELP
+#define DIALOG_FACTORY     GIMP_LOG_DIALOG_FACTORY
+#define MENUS              GIMP_LOG_MENUS
+#define SAVE_DIALOG        GIMP_LOG_SAVE_DIALOG
+#define IMAGE_SCALE        GIMP_LOG_IMAGE_SCALE
+#define SHADOW_TILES       GIMP_LOG_SHADOW_TILES
+#define SCALE              GIMP_LOG_SCALE
+#define WM                 GIMP_LOG_WM
+#define FLOATING_SELECTION GIMP_LOG_FLOATING_SELECTION
+#define SHM                GIMP_LOG_SHM
+#define TEXT_EDITING       GIMP_LOG_TEXT_EDITING
+#define KEY_EVENTS         GIMP_LOG_KEY_EVENTS
+#define AUTO_TAB_STYLE     GIMP_LOG_AUTO_TAB_STYLE
+#define INSTANCES          GIMP_LOG_INSTANCES
+#define RECTANGLE_TOOL     GIMP_LOG_RECTANGLE_TOOL
+#define BRUSH_CACHE        GIMP_LOG_BRUSH_CACHE
+#define PROJECTION         GIMP_LOG_PROJECTION
+#define XCF                GIMP_LOG_XCF
+
+#if 0 /* last resort */
+#  define GIMP_LOG /* nothing => no varargs, no log */
+#endif
+
+static void
+GIMP_LOG (GimpLogFlags flags,
+          const gchar *format,
+          ...)
+{
+  va_list args;
+  va_start (args, format);
+  if (gimp_log_flags & flags)
+    gimp_logv (type, "", 0, format, args);
+  va_end (args);
+}
+
+#endif  /* !__GNUC__ */
+
+#define geimnum(vienna)  gimp_l##vienna##l_dialog()
+#define fnord(kosmoso)   void gimp_##kosmoso##bl_dialog(void);
+
+#endif /* __GIMP_LOG_H__ */
diff --git a/app/gimp-priorities.h b/app/gimp-priorities.h
new file mode 100644
index 0000000..198f1d3
--- /dev/null
+++ b/app/gimp-priorities.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PRIORITIES_H__
+#define __GIMP_PRIORITIES_H__
+
+
+/* #define G_PRIORITY_HIGH -100 */
+
+/* #define G_PRIORITY_DEFAULT 0 */
+
+/* #define G_PRIORITY_HIGH_IDLE 100 */
+
+/* #define GTK_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 20) */
+
+/*  a bit higher than projection construction  */
+#define GIMP_PRIORITY_DISPLAY_SHELL_FILL_IDLE             (G_PRIORITY_HIGH_IDLE + 21)
+#define GIMP_PRIORITY_IMAGE_WINDOW_UPDATE_UI_MANAGER_IDLE (G_PRIORITY_HIGH_IDLE + 21)
+
+/*  just a bit less than GDK_PRIORITY_REDRAW   */
+#define GIMP_PRIORITY_PROJECTION_IDLE (G_PRIORITY_HIGH_IDLE + 22)
+
+/* #define G_PRIORITY_DEFAULT_IDLE 200 */
+
+#define GIMP_PRIORITY_VIEWABLE_IDLE (G_PRIORITY_LOW)
+
+/* #define G_PRIORITY_LOW 300 */
+
+
+#endif /* __GIMP_PRIORITIES_H__ */
diff --git a/app/gimp-update.c b/app/gimp-update.c
new file mode 100644
index 0000000..79d7b38
--- /dev/null
+++ b/app/gimp-update.c
@@ -0,0 +1,593 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-update.c
+ * Copyright (C) 2019 Jehan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <json-glib/json-glib.h>
+#include <stdio.h>
+
+#ifdef PLATFORM_OSX
+#import <Foundation/Foundation.h>
+#endif /* PLATFORM_OSX */
+
+#ifndef GIMP_CONSOLE_COMPILATION
+#include <gtk/gtk.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#ifndef GIMP_CONSOLE_COMPILATION
+#include "dialogs/about-dialog.h"
+#endif
+
+#include "gimp-intl.h"
+#include "gimp-update.h"
+#include "gimp-version.h"
+
+static gboolean      gimp_update_known               (GimpCoreConfig   *config,
+                                                      const gchar      *last_version,
+                                                      gint64            release_timestamp,
+                                                      gint              build_revision,
+                                                      const gchar      *comment);
+static void          gimp_check_updates_process      (const gchar      *source,
+                                                      gchar            *file_contents,
+                                                      gsize             file_length,
+                                                      GimpCoreConfig   *config);
+#ifndef PLATFORM_OSX
+static void          gimp_check_updates_callback     (GObject          *source,
+                                                      GAsyncResult     *result,
+                                                      gpointer          user_data);
+#endif /* PLATFORM_OSX */
+static void          gimp_update_about_dialog        (GimpCoreConfig   *config,
+                                                      const GParamSpec *pspec,
+                                                      gpointer          user_data);
+
+static gboolean      gimp_version_break              (const gchar      *v,
+                                                      gint             *major,
+                                                      gint             *minor,
+                                                      gint             *micro);
+
+static const gchar * gimp_get_version_url            (void);
+
+#ifdef PLATFORM_OSX
+static gint          gimp_check_updates_process_idle (gpointer          data);
+#endif
+
+/* Private Functions */
+
+/**
+ * gimp_update_known:
+ * @config:
+ * @last_version:
+ * @release_timestamp: must be non-zero is @last_version is not %NULL.
+ * @build_revision:
+ * @build_comment:
+ *
+ * Compare @last_version with currently running version. If the checked
+ * version is more recent than running version, then @config properties
+ * are updated appropriately (which may trigger a dialog depending on
+ * update policy settings).
+ * If @last_version is %NULL, the currently stored "last known release"
+ * is compared. Even if we haven't made any new remote checks, it is
+ * important to always compare again stored last release, otherwise we
+ * might warn of the same current version, or worse an older version.
+ *
+ * Returns: %TRUE is @last_version (or stored last known release if
+ * @last_version was %NULL) is newer than running version.
+ */
+static gboolean
+gimp_update_known (GimpCoreConfig *config,
+                   const gchar    *last_version,
+                   gint64          release_timestamp,
+                   gint            build_revision,
+                   const gchar    *build_comment)
+{
+  gboolean new_check = (last_version != NULL);
+  gint     major;
+  gint     minor;
+  gint     micro;
+
+  if (last_version && release_timestamp == 0)
+    {
+      /* I don't exit with a g_return_val_if_fail() assert because this
+       * is not necessarily a code bug. It may be data issues. So let's
+       * just return with an error printed on stderr.
+       */
+      g_printerr ("%s: version %s with no release dates.\n",
+                  G_STRFUNC, last_version);
+      return FALSE;
+    }
+
+  if (last_version == NULL)
+    {
+      last_version      = config->last_known_release;
+      release_timestamp = config->last_release_timestamp;
+      build_revision    = config->last_revision;
+      build_comment     = config->last_release_comment;
+    }
+
+  if (last_version)
+    {
+      if (gimp_version_break (last_version, &major, &minor, &micro))
+        {
+          if (/* We are using a newer version than last check. This could
+               * happen if updating the config files without having
+               * re-checked the remote JSON file.
+               */
+              (major < GIMP_MAJOR_VERSION ||
+               (major == GIMP_MAJOR_VERSION && minor < GIMP_MINOR_VERSION) ||
+               (major == GIMP_MAJOR_VERSION && minor == GIMP_MINOR_VERSION && micro < GIMP_MICRO_VERSION)) ||
+              /* Already using the last officially released
+               * revision. */
+              (major == GIMP_MAJOR_VERSION &&
+               minor == GIMP_MINOR_VERSION &&
+               micro == GIMP_MICRO_VERSION &&
+               build_revision <= gimp_version_get_revision ()))
+            {
+              last_version      = NULL;
+            }
+        }
+      else
+        {
+          /* If version is not properly parsed, something is wrong with
+           * upstream version number or parsing. This should not happen.
+           */
+          g_printerr ("%s: version not properly formatted: %s\n",
+                      G_STRFUNC, last_version);
+
+          return FALSE;
+        }
+    }
+
+  if (last_version == NULL)
+    {
+      release_timestamp = 0;
+      build_revision    = 0;
+      build_comment     = NULL;
+    }
+
+  if (new_check)
+    g_object_set (config,
+                  "check-update-timestamp", g_get_real_time() / G_USEC_PER_SEC,
+                  NULL);
+
+  g_object_set (config,
+                "last-release-timestamp", release_timestamp,
+                "last-known-release",     last_version,
+                "last-revision",          build_revision,
+                "last-release-comment",   build_comment,
+                NULL);
+
+  /* Are we running an old GIMP? */
+  return (last_version != NULL);
+}
+
+static gboolean
+gimp_version_break (const gchar *v,
+                    gint        *major,
+                    gint        *minor,
+                    gint        *micro)
+{
+  gchar **versions;
+
+  *major = 0;
+  *minor = 0;
+  *micro = 0;
+
+  if (v == NULL)
+    return FALSE;
+
+  versions = g_strsplit_set (v, ".", 3);
+  if (versions[0] != NULL)
+    {
+      *major = g_ascii_strtoll (versions[0], NULL, 10);
+      if (versions[1] != NULL)
+        {
+          *minor = g_ascii_strtoll (versions[1], NULL, 10);
+          if (versions[2] != NULL)
+            {
+              *micro = g_ascii_strtoll (versions[2], NULL, 10);
+              return TRUE;
+            }
+        }
+    }
+  g_strfreev (versions);
+
+  return (*major > 0);
+}
+
+static void
+gimp_check_updates_process (const gchar    *source,
+                            gchar          *file_contents,
+                            gsize           file_length,
+                            GimpCoreConfig *config)
+{
+  const gchar *platform;
+  const gchar *last_version      = NULL;
+  const gchar *release_date      = NULL;
+  const gchar *build_comment     = NULL;
+  GError      *error             = NULL;
+  gint64       release_timestamp = 0;
+  gint         build_revision    = 0;
+  JsonParser  *parser;
+  JsonPath    *path;
+  JsonNode    *result;
+  JsonArray   *versions;
+  gint         i;
+
+  /* For Windows and macOS, let's look if installers are available.
+    * For other platforms, let's just look for source release.
+    */
+  if (g_strcmp0 (GIMP_BUILD_PLATFORM_FAMILY, "windows") == 0 ||
+      g_strcmp0 (GIMP_BUILD_PLATFORM_FAMILY, "macos") == 0)
+    platform = GIMP_BUILD_PLATFORM_FAMILY;
+  else
+    platform = "source";
+
+  parser = json_parser_new ();
+  if (! json_parser_load_from_data (parser, file_contents, file_length, &error))
+    {
+      g_printerr ("%s: parsing of %s failed: %s\n", G_STRFUNC,
+                  source, error->message);
+      g_free (file_contents);
+      g_clear_object (&parser);
+      g_clear_error (&error);
+
+      return;
+    }
+
+  path = json_path_new ();
+  /* Ideally we could just use Json path filters like this to
+    * retrieve only released binaries for a given platform:
+    * g_strdup_printf ("$['STABLE'][?(@.%s)]['version']", platform);
+    * json_array_get_string_element (result, 0);
+    * And that would be it! We'd have our last release for given
+    * platform.
+    * Unfortunately json-glib does not support filter syntax, so we
+    * end up looping through releases.
+    */
+  if (! json_path_compile (path, "$['STABLE'][*]", &error))
+    {
+#ifdef GIMP_UNSTABLE
+      g_printerr("Path compilation failed: %s\n", error->message);
+#endif
+      g_free (file_contents);
+      g_clear_object (&parser);
+      g_clear_error (&error);
+
+      return;
+    }
+  result = json_path_match (path, json_parser_get_root (parser));
+  g_return_if_fail (JSON_NODE_HOLDS_ARRAY (result));
+
+  versions = json_node_get_array (result);
+  for (i = 0; i < (gint) json_array_get_length (versions); i++)
+    {
+      JsonObject *version;
+
+      /* Note that we don't actually look for the highest version,
+        * but for the highest version for which a build for your
+        * platform (and optional build-id) is available.
+        *
+        * So we loop through the version list then the build array
+        * and break at first compatible release, since JSON arrays
+        * are ordered.
+        */
+      version = json_array_get_object_element (versions, i);
+      if (json_object_has_member (version, platform))
+        {
+          JsonArray *builds;
+          gint       j;
+
+          builds = json_object_get_array_member (version, platform);
+
+          for (j = 0; j < (gint) json_array_get_length (builds); j++)
+            {
+              const gchar *build_id = NULL;
+              JsonObject  *build;
+
+              build = json_array_get_object_element (builds, j);
+              if (json_object_has_member (build, "build-id"))
+                build_id = json_object_get_string_member (build, "build-id");
+              if (g_strcmp0 (build_id, GIMP_BUILD_ID) == 0 ||
+                  g_strcmp0 (platform, "source") == 0)
+                {
+                  /* Release date is the build date if any set,
+                    * otherwise the main version release date.
+                    */
+                  if (json_object_has_member (build, "date"))
+                    release_date = json_object_get_string_member (build, "date");
+                  else
+                    release_date = json_object_get_string_member (version, "date");
+
+                  /* These are optional data. */
+                  if (json_object_has_member (build, "revision"))
+                    build_revision = json_object_get_int_member (build, "revision");
+                  if (json_object_has_member (build, "comment"))
+                    build_comment = json_object_get_string_member (build, "comment");
+                  break;
+                }
+            }
+
+          if (release_date)
+            {
+              last_version = json_object_get_string_member (version, "version");
+              break;
+            }
+        }
+    }
+
+  if (last_version && release_date)
+    {
+      GDateTime *datetime;
+      gchar     *str;
+
+      str = g_strdup_printf ("%s 00:00:00Z", release_date);
+      datetime = g_date_time_new_from_iso8601 (str, NULL);
+      g_free (str);
+
+      if (datetime)
+        {
+          release_timestamp = g_date_time_to_unix (datetime);
+          g_date_time_unref (datetime);
+        }
+      else
+        {
+          /* JSON file data bug. */
+          g_printerr ("%s: release date for version %s not properly formatted: %s\n",
+                      G_STRFUNC, last_version, release_date);
+
+          last_version   = NULL;
+          release_date   = NULL;
+          build_revision = 0;
+          build_comment  = NULL;
+        }
+    }
+  gimp_update_known (config, last_version, release_timestamp, build_revision, build_comment);
+
+  g_object_unref (path);
+  g_object_unref (parser);
+  g_free (file_contents);
+}
+
+#ifndef PLATFORM_OSX
+static void
+gimp_check_updates_callback (GObject      *source,
+                             GAsyncResult *result,
+                             gpointer      user_data)
+{
+  GimpCoreConfig *config        = user_data;
+  char           *file_contents = NULL;
+  gsize           file_length   = 0;
+  GError         *error         = NULL;
+
+  if (g_file_load_contents_finish (G_FILE (source), result,
+                                   &file_contents, &file_length,
+                                   NULL, &error))
+    {
+      gimp_check_updates_process (g_file_get_uri (G_FILE (source)), file_contents, file_length, config);
+    }
+  else
+    {
+      g_printerr("%s: loading of %s failed: %s\n", G_STRFUNC,
+                 g_file_get_uri (G_FILE (source)), error->message);
+      g_clear_error (&error);
+    }
+}
+#endif /* PLATFORM_OSX */
+
+static void
+gimp_update_about_dialog (GimpCoreConfig   *config,
+                          const GParamSpec *pspec,
+                          gpointer          user_data)
+{
+  g_signal_handlers_disconnect_by_func (config,
+                                        (GCallback) gimp_update_about_dialog,
+                                        NULL);
+
+  if (config->last_known_release != NULL)
+    {
+#ifndef GIMP_CONSOLE_COMPILATION
+      gtk_widget_show (about_dialog_create (config));
+#else
+      g_warning (_("A new version of GIMP (%s) was released.\n"
+                   "It is recommended to update."),
+                 config->last_known_release);
+#endif
+    }
+}
+
+static const gchar *
+gimp_get_version_url ()
+{
+#ifdef GIMP_RELEASE
+  return "https://www.gimp.org/gimp_versions.json";
+#else
+  if (g_getenv ("GIMP_DEV_VERSIONS_JSON"))
+    return g_getenv ("GIMP_DEV_VERSIONS_JSON");
+  else
+    return "https://testing.gimp.org/gimp_versions.json";
+#endif
+}
+
+#ifdef PLATFORM_OSX
+typedef struct _GimpCheckUpdatesData
+{
+  const gchar    *gimp_versions;
+  gchar          *json_result;
+  gsize           json_size;
+  GimpCoreConfig *config;
+} GimpCheckUpdatesData;
+
+static int
+gimp_check_updates_process_idle (gpointer data)
+{
+  GimpCheckUpdatesData *check_updates_data = (GimpCheckUpdatesData *) data;
+
+  gimp_check_updates_process (check_updates_data->gimp_versions,
+                              check_updates_data->json_result,
+                              check_updates_data->json_size,
+                              check_updates_data->config);
+
+  g_free (check_updates_data);
+
+  return FALSE; /* remove idle */
+}
+#endif /* PLATFORM_OSX */
+
+/* Public Functions */
+
+/*
+ * gimp_update_auto_check:
+ * @config:
+ *
+ * Run the check for newer versions of GIMP if conditions are right.
+ *
+ * Returns: %TRUE if a check was actually run.
+ */
+gboolean
+gimp_update_auto_check (GimpCoreConfig *config)
+{
+  gint64 prev_update_timestamp;
+  gint64 current_timestamp;
+
+  /* Builds with update check deactivated just always return FALSE. */
+#ifdef CHECK_UPDATE
+  /* Allows to disable updates at package level with a build having the
+   * version check code built-in.
+   * For instance, it would allow to use the same Windows installer for
+   * the Windows Store (with update check disabled because it comes with
+   * its own update channel).
+   */
+  if (! gimp_version_check_update () ||
+      ! config->check_updates)
+#endif
+    return FALSE;
+
+  g_object_get (config,
+                "check-update-timestamp", &prev_update_timestamp,
+                NULL);
+  current_timestamp = g_get_real_time() / G_USEC_PER_SEC;
+
+  /* Get rid of invalid saved timestamps. */
+  if (prev_update_timestamp > current_timestamp)
+    prev_update_timestamp = -1;
+
+#ifdef GIMP_RELEASE
+  /* Do not check more than once a week. */
+  if (current_timestamp - prev_update_timestamp < 3600L * 24L * 7L)
+    return FALSE;
+#endif
+
+  g_signal_connect (config, "notify::last-known-release",
+                    (GCallback) gimp_update_about_dialog,
+                    NULL);
+
+  gimp_update_check (config);
+
+  return TRUE;
+}
+
+/*
+ * gimp_update_check:
+ * @config:
+ *
+ * Run the check for newer versions of GIMP inconditionnally.
+ */
+void
+gimp_update_check (GimpCoreConfig *config)
+{
+#ifdef PLATFORM_OSX
+  const gchar *gimp_versions;
+
+  gimp_versions = gimp_get_version_url ();
+
+  NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
+  [request setURL:[NSURL URLWithString:@(gimp_versions)]];
+  [request setHTTPMethod:@"GET"];
+
+  NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
+  /* completionHandler is called on a background thread */
+  [[session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+    NSString             *reply;
+    gchar                *json_result;
+    GimpCheckUpdatesData *update_results;
+
+    if (error)
+      {
+        g_printerr ("%s: gimp_update_check failed to get update from %s, with error: %s\n",
+                    G_STRFUNC,
+                    gimp_versions,
+                    [error.localizedDescription UTF8String]);
+        return;
+      }
+
+    if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+        NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
+
+        if (statusCode != 200)
+          {
+            g_printerr ("%s: gimp_update_check failed to get update from %s, with status code: %d\n",
+                        G_STRFUNC,
+                        gimp_versions,
+                        (int)statusCode);
+            return;
+          }
+    }
+
+    reply       = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    json_result = g_strdup ([reply UTF8String]); /* will be freed by gimp_check_updates_process */
+
+    update_results = g_new (GimpCheckUpdatesData, 1);
+
+    update_results->gimp_versions = gimp_versions;
+    update_results->json_result   = json_result;
+    update_results->json_size     = [reply lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+    update_results->config        = config;
+
+    g_idle_add ((GSourceFunc) gimp_check_updates_process_idle, (gpointer) update_results);
+  }] resume];
+#else
+  GFile *gimp_versions;
+
+  gimp_versions = g_file_new_for_uri (gimp_get_version_url ());
+
+  g_file_load_contents_async (gimp_versions, NULL, gimp_check_updates_callback, config);
+  g_object_unref (gimp_versions);
+#endif /* PLATFORM_OSX */
+}
+
+/*
+ * gimp_update_refresh:
+ * @config:
+ *
+ * Do not execute a remote check, but refresh the known release data as
+ * it may be outdated.
+ */
+void
+gimp_update_refresh (GimpCoreConfig *config)
+{
+  gimp_update_known (config, NULL, 0, 0, NULL);
+}
diff --git a/app/gimp-update.h b/app/gimp-update.h
new file mode 100644
index 0000000..836f2bc
--- /dev/null
+++ b/app/gimp-update.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-update.h
+ * Copyright (C) 2019 Jehan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_UPDATE_H__
+#define __APP_GIMP_UPDATE_H__
+
+
+gboolean gimp_update_auto_check (GimpCoreConfig *config);
+void     gimp_update_check      (GimpCoreConfig *config);
+void     gimp_update_refresh    (GimpCoreConfig *config);
+
+
+#endif /* __APP_GIMP_UPDATE_H__ */
diff --git a/app/gimp-version.c b/app/gimp-version.c
new file mode 100644
index 0000000..e56149a
--- /dev/null
+++ b/app/gimp-version.c
@@ -0,0 +1,311 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <cairo.h>
+#include <fontconfig/fontconfig.h>
+#include <pango/pango.h>
+#include <pango/pangoft2.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#ifndef GIMP_CONSOLE_COMPILATION
+#include <gtk/gtk.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+
+#include "about.h"
+#include "git-version.h"
+
+#include "gimp-intl.h"
+#include "gimp-version.h"
+
+
+static gchar *
+gimp_library_version (const gchar *package,
+                      gint         build_time_major,
+                      gint         build_time_minor,
+                      gint         build_time_micro,
+                      gint         run_time_major,
+                      gint         run_time_minor,
+                      gint         run_time_micro,
+                      gboolean     localized)
+{
+  gchar *lib_version;
+  gchar *build_time_version;
+  gchar *run_time_version;
+
+  build_time_version = g_strdup_printf ("%d.%d.%d",
+                                        build_time_major,
+                                        build_time_minor,
+                                        build_time_micro);
+  run_time_version = g_strdup_printf ("%d.%d.%d",
+                                      run_time_major,
+                                      run_time_minor,
+                                      run_time_micro);
+
+  /* show versions of libraries used by GIMP */
+  lib_version = g_strdup_printf (localized ?
+                                 _("using %s version %s (compiled against version %s)") :
+                                 "using %s version %s (compiled against version %s)",
+                                 package, run_time_version, build_time_version);
+  g_free (run_time_version);
+  g_free (build_time_version);
+
+  return lib_version;
+}
+
+static gchar *
+gimp_library_versions (gboolean localized)
+{
+  gchar *lib_versions;
+  gchar *lib_version;
+  gchar *temp;
+  gint   babl_major_version;
+  gint   babl_minor_version;
+  gint   babl_micro_version;
+  gint   gegl_major_version;
+  gint   gegl_minor_version;
+  gint   gegl_micro_version;
+
+  babl_get_version (&babl_major_version,
+                    &babl_minor_version,
+                    &babl_micro_version);
+
+  lib_versions = gimp_library_version ("babl",
+                                       BABL_MAJOR_VERSION,
+                                       BABL_MINOR_VERSION,
+                                       BABL_MICRO_VERSION,
+                                       babl_major_version,
+                                       babl_minor_version,
+                                       babl_micro_version,
+                                       localized);
+
+  gegl_get_version (&gegl_major_version,
+                    &gegl_minor_version,
+                    &gegl_micro_version);
+
+  lib_version = gimp_library_version ("GEGL",
+                                       GEGL_MAJOR_VERSION,
+                                       GEGL_MINOR_VERSION,
+                                       GEGL_MICRO_VERSION,
+                                       gegl_major_version,
+                                       gegl_minor_version,
+                                       gegl_micro_version,
+                                       localized);
+
+  temp = g_strdup_printf ("%s\n%s", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+
+  lib_version = gimp_library_version ("GLib",
+                                      GLIB_MAJOR_VERSION,
+                                      GLIB_MINOR_VERSION,
+                                      GLIB_MICRO_VERSION,
+                                      glib_major_version,
+                                      glib_minor_version,
+                                      glib_micro_version,
+                                      localized);
+  temp = g_strdup_printf ("%s\n%s", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+
+  lib_version = gimp_library_version ("GdkPixbuf",
+                                      GDK_PIXBUF_MAJOR,
+                                      GDK_PIXBUF_MINOR,
+                                      GDK_PIXBUF_MICRO,
+                                      gdk_pixbuf_major_version,
+                                      gdk_pixbuf_minor_version,
+                                      gdk_pixbuf_micro_version,
+                                      localized);
+  temp = g_strdup_printf ("%s\n%s", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+
+#ifndef GIMP_CONSOLE_COMPILATION
+  lib_version = gimp_library_version ("GTK+",
+                                      GTK_MAJOR_VERSION,
+                                      GTK_MINOR_VERSION,
+                                      GTK_MICRO_VERSION,
+                                      gtk_major_version,
+                                      gtk_minor_version,
+                                      gtk_micro_version,
+                                      localized);
+  temp = g_strdup_printf ("%s\n%s", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+#endif
+
+  lib_version = gimp_library_version ("Pango",
+                                      PANGO_VERSION_MAJOR,
+                                      PANGO_VERSION_MINOR,
+                                      PANGO_VERSION_MICRO,
+                                      pango_version () / 100 / 100,
+                                      pango_version () / 100 % 100,
+                                      pango_version () % 100,
+                                      localized);
+  temp = g_strdup_printf ("%s\n%s", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+
+  lib_version = gimp_library_version ("Fontconfig",
+                                      FC_MAJOR, FC_MINOR, FC_REVISION,
+                                      FcGetVersion () / 100 / 100,
+                                      FcGetVersion () / 100 % 100,
+                                      FcGetVersion () % 100,
+                                      localized);
+  temp = g_strdup_printf ("%s\n%s", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+
+  lib_version = g_strdup_printf (localized ?
+                                 _("using %s version %s (compiled against version %s)") :
+                                 "using %s version %s (compiled against version %s)",
+                                 "Cairo", cairo_version_string (), CAIRO_VERSION_STRING);
+  temp = g_strdup_printf ("%s\n%s\n", lib_versions, lib_version);
+  g_free (lib_versions);
+  g_free (lib_version);
+  lib_versions = temp;
+
+  return lib_versions;
+}
+
+void
+gimp_version_show (gboolean be_verbose)
+{
+  gchar *version = gimp_version (be_verbose, TRUE);
+
+  g_print ("%s", version);
+
+  g_free (version);
+}
+
+gchar *
+gimp_version (gboolean be_verbose,
+              gboolean localized)
+{
+  gchar *version;
+  gchar *temp;
+
+  version = g_strdup_printf (localized ? _("%s version %s") : "%s version %s",
+                             GIMP_NAME, GIMP_VERSION);;
+  temp = g_strconcat (version, "\n", NULL);
+  g_free (version);
+  version = temp;
+
+  if (be_verbose)
+    {
+      gchar *verbose_info;
+      gchar *lib_versions;
+      gchar *flatpak_info = NULL;
+
+      lib_versions = gimp_library_versions (localized);
+      verbose_info = g_strdup_printf ("git-describe: %s\n"
+                                      "Build: %s rev %d for %s\n"
+                                      "# C compiler #\n%s\n"
+                                      "# Libraries #\n%s",
+                                      GIMP_GIT_VERSION,
+                                      GIMP_BUILD_ID,
+                                      gimp_version_get_revision (),
+                                      GIMP_BUILD_PLATFORM_FAMILY,
+                                      CC_VERSION,
+                                      lib_versions);
+      g_free (lib_versions);
+
+      /* This file should be available at root path in a flatpak
+       * environment. Just add its contents to the verbose output if it
+       * exists. Silently ignore otherwise.
+       */
+      if (g_file_get_contents ("/.flatpak-info", &flatpak_info, NULL, NULL))
+        {
+          temp = g_strdup_printf ("\n# Flatpak info #\n%s",
+                                  flatpak_info);
+          g_free (flatpak_info);
+          flatpak_info = temp;
+        }
+      temp = g_strconcat (version, verbose_info, flatpak_info, NULL);
+      g_free (version);
+      g_free (verbose_info);
+      g_free (flatpak_info);
+
+      version = temp;
+    }
+
+  return version;
+}
+
+gint
+gimp_version_get_revision (void)
+{
+  GKeyFile *key_file;
+  gchar    *gimp_release;
+  gint      revision = 0;
+
+  key_file = g_key_file_new ();
+
+  /* The gimp-release file is inspired by /etc/os-release and similar
+   * distribution files. Right now its main use is to number the package
+   * revision. This information is not a build variable because a new
+   * package version does not necessarily imply a rebuild (maybe just
+   * installed data or dependencies change).
+   */
+  gimp_release = g_build_filename (gimp_data_directory (), "gimp-release", NULL);
+  /* Absence of the file is not an error. Actually most third-party
+   * builds probably won't install such file.
+   */
+  if (g_key_file_load_from_file (key_file, gimp_release, G_KEY_FILE_NONE, NULL))
+    {
+      if (g_key_file_has_key (key_file, "package", "revision", NULL))
+        revision = g_key_file_get_integer (key_file, "package", "revision", NULL);
+    }
+  g_key_file_free (key_file);
+  g_free (gimp_release);
+
+  return revision;
+}
+
+gboolean
+gimp_version_check_update (void)
+{
+  GKeyFile *key_file;
+  gchar    *gimp_release;
+  gboolean  check_update = FALSE;
+
+  key_file = g_key_file_new ();
+
+  gimp_release = g_build_filename (gimp_data_directory (), "gimp-release", NULL);
+  if (g_key_file_load_from_file (key_file, gimp_release, G_KEY_FILE_NONE, NULL))
+    {
+      check_update = TRUE;
+
+      if (g_key_file_has_key (key_file, "package", "check-update", NULL))
+        check_update = g_key_file_get_boolean (key_file, "package", "check-update", NULL);
+    }
+  g_key_file_free (key_file);
+  g_free (gimp_release);
+
+  return check_update;
+}
diff --git a/app/gimp-version.h b/app/gimp-version.h
new file mode 100644
index 0000000..556a41a
--- /dev/null
+++ b/app/gimp-version.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_VERSION_H__
+#define __APP_GIMP_VERSION_H__
+
+
+void       gimp_version_show         (gboolean be_verbose);
+gchar    * gimp_version              (gboolean be_verbose,
+                                      gboolean localized);
+
+gint       gimp_version_get_revision (void);
+
+gboolean   gimp_version_check_update (void);
+
+
+#endif /* __APP_GIMP_VERSION_H__ */
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
new file mode 100644
index 0000000..579cd63
--- /dev/null
+++ b/app/gui/Makefile.am
@@ -0,0 +1,80 @@
+## Process this file with automake to produce Makefile.in
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+xobjective_cxx = "-xobjective-c++"
+xnone = "-xnone"
+endif
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-GUI\"		\
+	-DGIMP_COMMAND=\"@GIMP_COMMAND@\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(GIO_UNIX_CFLAGS)			\
+	$(GEGL_CFLAGS)				\
+	$(GTK_CFLAGS)				\
+	$(GTK_MAC_INTEGRATION_CFLAGS)		\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappgui.a
+
+libappgui_a_sources = \
+	gimpdbusservice.c	\
+	gimpdbusservice.h	\
+	gimpuiconfigurer.c	\
+	gimpuiconfigurer.h	\
+	gui.c			\
+	gui.h			\
+	gui-message.c		\
+	gui-message.h		\
+	gui-unique.c		\
+	gui-unique.h		\
+	gui-vtable.c		\
+	gui-vtable.h		\
+	gui-types.h		\
+	icon-themes.c		\
+	icon-themes.h		\
+	session.c		\
+	session.h		\
+	splash.c		\
+	splash.h		\
+	themes.c		\
+	themes.h
+
+libappgui_a_built_sources = \
+	gimpdbusservice-generated.c	\
+	gimpdbusservice-generated.h
+
+libappgui_a_SOURCES = $(libappgui_a_built_sources) $(libappgui_a_sources)
+
+BUILT_SOURCES = $(libappgui_a_built_sources)
+
+EXTRA_DIST = \
+	dbus-service.xml
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = $(libappgui_a_built_sources)
+CLEANFILES = $(gen_sources)
+
+$(srcdir)/gimpdbusservice.c: $(libappgui_a_built_sources)
+
+$(libappgui_a_built_sources): $(srcdir)/dbus-service.xml
+	$(GDBUS_CODEGEN) --interface-prefix org.gimp.GIMP. \
+			 --generate-c-code gimpdbusservice-generated \
+			 --c-namespace GimpDBusService \
+			 $(srcdir)/dbus-service.xml
diff --git a/app/gui/Makefile.in b/app/gui/Makefile.in
new file mode 100644
index 0000000..5bc3164
--- /dev/null
+++ b/app/gui/Makefile.in
@@ -0,0 +1,1018 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/gui
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappgui_a_AR = $(AR) $(ARFLAGS)
+libappgui_a_LIBADD =
+am__objects_1 = gimpdbusservice-generated.$(OBJEXT)
+am__objects_2 = gimpdbusservice.$(OBJEXT) gimpuiconfigurer.$(OBJEXT) \
+	gui.$(OBJEXT) gui-message.$(OBJEXT) gui-unique.$(OBJEXT) \
+	gui-vtable.$(OBJEXT) icon-themes.$(OBJEXT) session.$(OBJEXT) \
+	splash.$(OBJEXT) themes.$(OBJEXT)
+am_libappgui_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappgui_a_OBJECTS = $(am_libappgui_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimpdbusservice-generated.Po \
+	./$(DEPDIR)/gimpdbusservice.Po ./$(DEPDIR)/gimpuiconfigurer.Po \
+	./$(DEPDIR)/gui-message.Po ./$(DEPDIR)/gui-unique.Po \
+	./$(DEPDIR)/gui-vtable.Po ./$(DEPDIR)/gui.Po \
+	./$(DEPDIR)/icon-themes.Po ./$(DEPDIR)/session.Po \
+	./$(DEPDIR)/splash.Po ./$(DEPDIR)/themes.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappgui_a_SOURCES)
+DIST_SOURCES = $(libappgui_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
+@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
+@PLATFORM_OSX_TRUE@xnone = "-xnone"
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-GUI\"		\
+	-DGIMP_COMMAND=\"@GIMP_COMMAND@\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(GIO_UNIX_CFLAGS)			\
+	$(GEGL_CFLAGS)				\
+	$(GTK_CFLAGS)				\
+	$(GTK_MAC_INTEGRATION_CFLAGS)		\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappgui.a
+libappgui_a_sources = \
+	gimpdbusservice.c	\
+	gimpdbusservice.h	\
+	gimpuiconfigurer.c	\
+	gimpuiconfigurer.h	\
+	gui.c			\
+	gui.h			\
+	gui-message.c		\
+	gui-message.h		\
+	gui-unique.c		\
+	gui-unique.h		\
+	gui-vtable.c		\
+	gui-vtable.h		\
+	gui-types.h		\
+	icon-themes.c		\
+	icon-themes.h		\
+	session.c		\
+	session.h		\
+	splash.c		\
+	splash.h		\
+	themes.c		\
+	themes.h
+
+libappgui_a_built_sources = \
+	gimpdbusservice-generated.c	\
+	gimpdbusservice-generated.h
+
+libappgui_a_SOURCES = $(libappgui_a_built_sources) $(libappgui_a_sources)
+BUILT_SOURCES = $(libappgui_a_built_sources)
+EXTRA_DIST = \
+	dbus-service.xml
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = $(libappgui_a_built_sources)
+CLEANFILES = $(gen_sources)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gui/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/gui/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappgui.a: $(libappgui_a_OBJECTS) $(libappgui_a_DEPENDENCIES) $(EXTRA_libappgui_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappgui.a
+	$(AM_V_AR)$(libappgui_a_AR) libappgui.a $(libappgui_a_OBJECTS) $(libappgui_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappgui.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdbusservice-generated.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdbusservice.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpuiconfigurer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-message.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-unique.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-vtable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icon-themes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splash.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/themes.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimpdbusservice-generated.Po
+	-rm -f ./$(DEPDIR)/gimpdbusservice.Po
+	-rm -f ./$(DEPDIR)/gimpuiconfigurer.Po
+	-rm -f ./$(DEPDIR)/gui-message.Po
+	-rm -f ./$(DEPDIR)/gui-unique.Po
+	-rm -f ./$(DEPDIR)/gui-vtable.Po
+	-rm -f ./$(DEPDIR)/gui.Po
+	-rm -f ./$(DEPDIR)/icon-themes.Po
+	-rm -f ./$(DEPDIR)/session.Po
+	-rm -f ./$(DEPDIR)/splash.Po
+	-rm -f ./$(DEPDIR)/themes.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimpdbusservice-generated.Po
+	-rm -f ./$(DEPDIR)/gimpdbusservice.Po
+	-rm -f ./$(DEPDIR)/gimpuiconfigurer.Po
+	-rm -f ./$(DEPDIR)/gui-message.Po
+	-rm -f ./$(DEPDIR)/gui-unique.Po
+	-rm -f ./$(DEPDIR)/gui-vtable.Po
+	-rm -f ./$(DEPDIR)/gui.Po
+	-rm -f ./$(DEPDIR)/icon-themes.Po
+	-rm -f ./$(DEPDIR)/session.Po
+	-rm -f ./$(DEPDIR)/splash.Po
+	-rm -f ./$(DEPDIR)/themes.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check install install-am install-exec install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(srcdir)/gimpdbusservice.c: $(libappgui_a_built_sources)
+
+$(libappgui_a_built_sources): $(srcdir)/dbus-service.xml
+	$(GDBUS_CODEGEN) --interface-prefix org.gimp.GIMP. \
+			 --generate-c-code gimpdbusservice-generated \
+			 --c-namespace GimpDBusService \
+			 $(srcdir)/dbus-service.xml
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/gui/dbus-service.xml b/app/gui/dbus-service.xml
new file mode 100644
index 0000000..5badd9b
--- /dev/null
+++ b/app/gui/dbus-service.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node>
+
+  <interface name="org.gimp.GIMP.UI">
+
+    <method name="Open">
+      <arg type="s" name="uri" direction="in" />
+      <arg type="b" name="success" direction="out" />
+    </method>
+
+    <method name="OpenAsNew">
+      <arg type="s" name="uri" direction="in" />
+      <arg type="b" name="success" direction="out" />
+    </method>
+
+    <method name="BatchRun">
+      <arg type="s" name="interpreter" direction="in" />
+      <arg type="s" name="command" direction="in" />
+      <arg type="b" name="success" direction="out" />
+    </method>
+
+    <method name="Activate" />
+
+    <signal name="Opened">
+      <arg type="s" name="uri" />
+    </signal>
+
+  </interface>
+
+</node>
diff --git a/app/gui/gimpdbusservice-generated.c b/app/gui/gimpdbusservice-generated.c
new file mode 100644
index 0000000..9ede0fd
--- /dev/null
+++ b/app/gui/gimpdbusservice-generated.c
@@ -0,0 +1,1721 @@
+/*
+ * This file is generated by gdbus-codegen, do not modify it.
+ *
+ * The license of this code is the same as for the D-Bus interface description
+ * it was derived from. Note that it links to GLib, so must comply with the
+ * LGPL linking clauses.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "gimpdbusservice-generated.h"
+
+#include <string.h>
+#ifdef G_OS_UNIX
+#  include <gio/gunixfdlist.h>
+#endif
+
+typedef struct
+{
+  GDBusArgInfo parent_struct;
+  gboolean use_gvariant;
+} _ExtendedGDBusArgInfo;
+
+typedef struct
+{
+  GDBusMethodInfo parent_struct;
+  const gchar *signal_name;
+  gboolean pass_fdlist;
+} _ExtendedGDBusMethodInfo;
+
+typedef struct
+{
+  GDBusSignalInfo parent_struct;
+  const gchar *signal_name;
+} _ExtendedGDBusSignalInfo;
+
+typedef struct
+{
+  GDBusPropertyInfo parent_struct;
+  const gchar *hyphen_name;
+  guint use_gvariant : 1;
+  guint emits_changed_signal : 1;
+} _ExtendedGDBusPropertyInfo;
+
+typedef struct
+{
+  GDBusInterfaceInfo parent_struct;
+  const gchar *hyphen_name;
+} _ExtendedGDBusInterfaceInfo;
+
+typedef struct
+{
+  const _ExtendedGDBusPropertyInfo *info;
+  guint prop_id;
+  GValue orig_value; /* the value before the change */
+} ChangedProperty;
+
+static void
+_changed_property_free (ChangedProperty *data)
+{
+  g_value_unset (&data->orig_value);
+  g_free (data);
+}
+
+static gboolean
+_g_strv_equal0 (gchar **a, gchar **b)
+{
+  gboolean ret = FALSE;
+  guint n;
+  if (a == NULL && b == NULL)
+    {
+      ret = TRUE;
+      goto out;
+    }
+  if (a == NULL || b == NULL)
+    goto out;
+  if (g_strv_length (a) != g_strv_length (b))
+    goto out;
+  for (n = 0; a[n] != NULL; n++)
+    if (g_strcmp0 (a[n], b[n]) != 0)
+      goto out;
+  ret = TRUE;
+out:
+  return ret;
+}
+
+static gboolean
+_g_variant_equal0 (GVariant *a, GVariant *b)
+{
+  gboolean ret = FALSE;
+  if (a == NULL && b == NULL)
+    {
+      ret = TRUE;
+      goto out;
+    }
+  if (a == NULL || b == NULL)
+    goto out;
+  ret = g_variant_equal (a, b);
+out:
+  return ret;
+}
+
+G_GNUC_UNUSED static gboolean
+_g_value_equal (const GValue *a, const GValue *b)
+{
+  gboolean ret = FALSE;
+  g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
+  switch (G_VALUE_TYPE (a))
+    {
+      case G_TYPE_BOOLEAN:
+        ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
+        break;
+      case G_TYPE_UCHAR:
+        ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
+        break;
+      case G_TYPE_INT:
+        ret = (g_value_get_int (a) == g_value_get_int (b));
+        break;
+      case G_TYPE_UINT:
+        ret = (g_value_get_uint (a) == g_value_get_uint (b));
+        break;
+      case G_TYPE_INT64:
+        ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
+        break;
+      case G_TYPE_UINT64:
+        ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
+        break;
+      case G_TYPE_DOUBLE:
+        {
+          /* Avoid -Wfloat-equal warnings by doing a direct bit compare */
+          gdouble da = g_value_get_double (a);
+          gdouble db = g_value_get_double (b);
+          ret = memcmp (&da, &db, sizeof (gdouble)) == 0;
+        }
+        break;
+      case G_TYPE_STRING:
+        ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
+        break;
+      case G_TYPE_VARIANT:
+        ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
+        break;
+      default:
+        if (G_VALUE_TYPE (a) == G_TYPE_STRV)
+          ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
+        else
+          g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
+        break;
+    }
+  return ret;
+}
+
+/* ------------------------------------------------------------------------
+ * Code for interface org.gimp.GIMP.UI
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:GimpDBusServiceUI
+ * @title: GimpDBusServiceUI
+ * @short_description: Generated C code for the org.gimp.GIMP.UI D-Bus interface
+ *
+ * This section contains code for working with the <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link> D-Bus interface in C.
+ */
+
+/* ---- Introspection data for org.gimp.GIMP.UI ---- */
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_open_IN_ARG_uri =
+{
+  {
+    -1,
+    (gchar *) "uri",
+    (gchar *) "s",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_method_info_open_IN_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_open_IN_ARG_uri.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_open_OUT_ARG_success =
+{
+  {
+    -1,
+    (gchar *) "success",
+    (gchar *) "b",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_method_info_open_OUT_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_open_OUT_ARG_success.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusMethodInfo _gimp_dbus_service_ui_method_info_open =
+{
+  {
+    -1,
+    (gchar *) "Open",
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_method_info_open_IN_ARG_pointers,
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_method_info_open_OUT_ARG_pointers,
+    NULL
+  },
+  "handle-open",
+  FALSE
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_open_as_new_IN_ARG_uri =
+{
+  {
+    -1,
+    (gchar *) "uri",
+    (gchar *) "s",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_method_info_open_as_new_IN_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_open_as_new_IN_ARG_uri.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_open_as_new_OUT_ARG_success =
+{
+  {
+    -1,
+    (gchar *) "success",
+    (gchar *) "b",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_method_info_open_as_new_OUT_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_open_as_new_OUT_ARG_success.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusMethodInfo _gimp_dbus_service_ui_method_info_open_as_new =
+{
+  {
+    -1,
+    (gchar *) "OpenAsNew",
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_method_info_open_as_new_IN_ARG_pointers,
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_method_info_open_as_new_OUT_ARG_pointers,
+    NULL
+  },
+  "handle-open-as-new",
+  FALSE
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_batch_run_IN_ARG_interpreter =
+{
+  {
+    -1,
+    (gchar *) "interpreter",
+    (gchar *) "s",
+    NULL
+  },
+  FALSE
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_batch_run_IN_ARG_command =
+{
+  {
+    -1,
+    (gchar *) "command",
+    (gchar *) "s",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_method_info_batch_run_IN_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_batch_run_IN_ARG_interpreter.parent_struct,
+  &_gimp_dbus_service_ui_method_info_batch_run_IN_ARG_command.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_method_info_batch_run_OUT_ARG_success =
+{
+  {
+    -1,
+    (gchar *) "success",
+    (gchar *) "b",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_method_info_batch_run_OUT_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_batch_run_OUT_ARG_success.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusMethodInfo _gimp_dbus_service_ui_method_info_batch_run =
+{
+  {
+    -1,
+    (gchar *) "BatchRun",
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_method_info_batch_run_IN_ARG_pointers,
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_method_info_batch_run_OUT_ARG_pointers,
+    NULL
+  },
+  "handle-batch-run",
+  FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _gimp_dbus_service_ui_method_info_activate =
+{
+  {
+    -1,
+    (gchar *) "Activate",
+    NULL,
+    NULL,
+    NULL
+  },
+  "handle-activate",
+  FALSE
+};
+
+static const GDBusMethodInfo * const _gimp_dbus_service_ui_method_info_pointers[] =
+{
+  &_gimp_dbus_service_ui_method_info_open.parent_struct,
+  &_gimp_dbus_service_ui_method_info_open_as_new.parent_struct,
+  &_gimp_dbus_service_ui_method_info_batch_run.parent_struct,
+  &_gimp_dbus_service_ui_method_info_activate.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusArgInfo _gimp_dbus_service_ui_signal_info_opened_ARG_uri =
+{
+  {
+    -1,
+    (gchar *) "uri",
+    (gchar *) "s",
+    NULL
+  },
+  FALSE
+};
+
+static const GDBusArgInfo * const _gimp_dbus_service_ui_signal_info_opened_ARG_pointers[] =
+{
+  &_gimp_dbus_service_ui_signal_info_opened_ARG_uri.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusSignalInfo _gimp_dbus_service_ui_signal_info_opened =
+{
+  {
+    -1,
+    (gchar *) "Opened",
+    (GDBusArgInfo **) &_gimp_dbus_service_ui_signal_info_opened_ARG_pointers,
+    NULL
+  },
+  "opened"
+};
+
+static const GDBusSignalInfo * const _gimp_dbus_service_ui_signal_info_pointers[] =
+{
+  &_gimp_dbus_service_ui_signal_info_opened.parent_struct,
+  NULL
+};
+
+static const _ExtendedGDBusInterfaceInfo _gimp_dbus_service_ui_interface_info =
+{
+  {
+    -1,
+    (gchar *) "org.gimp.GIMP.UI",
+    (GDBusMethodInfo **) &_gimp_dbus_service_ui_method_info_pointers,
+    (GDBusSignalInfo **) &_gimp_dbus_service_ui_signal_info_pointers,
+    NULL,
+    NULL
+  },
+  "ui",
+};
+
+
+/**
+ * gimp_dbus_service_ui_interface_info:
+ *
+ * Gets a machine-readable description of the <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link> D-Bus interface.
+ *
+ * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
+ */
+GDBusInterfaceInfo *
+gimp_dbus_service_ui_interface_info (void)
+{
+  return (GDBusInterfaceInfo *) &_gimp_dbus_service_ui_interface_info.parent_struct;
+}
+
+/**
+ * gimp_dbus_service_ui_override_properties:
+ * @klass: The class structure for a #GObject derived class.
+ * @property_id_begin: The property id to assign to the first overridden property.
+ *
+ * Overrides all #GObject properties in the #GimpDBusServiceUI interface for a concrete class.
+ * The properties are overridden in the order they are defined.
+ *
+ * Returns: The last property id.
+ */
+guint
+gimp_dbus_service_ui_override_properties (GObjectClass *klass, guint property_id_begin)
+{
+  return property_id_begin - 1;
+}
+
+
+
+/**
+ * GimpDBusServiceUI:
+ *
+ * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link>.
+ */
+
+/**
+ * GimpDBusServiceUIIface:
+ * @parent_iface: The parent interface.
+ * @handle_activate: Handler for the #GimpDBusServiceUI::handle-activate signal.
+ * @handle_batch_run: Handler for the #GimpDBusServiceUI::handle-batch-run signal.
+ * @handle_open: Handler for the #GimpDBusServiceUI::handle-open signal.
+ * @handle_open_as_new: Handler for the #GimpDBusServiceUI::handle-open-as-new signal.
+ * @opened: Handler for the #GimpDBusServiceUI::opened signal.
+ *
+ * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link>.
+ */
+
+typedef GimpDBusServiceUIIface GimpDBusServiceUIInterface;
+G_DEFINE_INTERFACE (GimpDBusServiceUI, gimp_dbus_service_ui, G_TYPE_OBJECT)
+
+static void
+gimp_dbus_service_ui_default_init (GimpDBusServiceUIIface *iface)
+{
+  /* GObject signals for incoming D-Bus method calls: */
+  /**
+   * GimpDBusServiceUI::handle-open:
+   * @object: A #GimpDBusServiceUI.
+   * @invocation: A #GDBusMethodInvocation.
+   * @arg_uri: Argument passed by remote caller.
+   *
+   * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-gimp-GIMP-UI.Open">Open()</link> D-Bus method.
+   *
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gimp_dbus_service_ui_complete_open() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   *
+   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+   */
+  g_signal_new ("handle-open",
+    G_TYPE_FROM_INTERFACE (iface),
+    G_SIGNAL_RUN_LAST,
+    G_STRUCT_OFFSET (GimpDBusServiceUIIface, handle_open),
+    g_signal_accumulator_true_handled,
+    NULL,
+    g_cclosure_marshal_generic,
+    G_TYPE_BOOLEAN,
+    2,
+    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
+
+  /**
+   * GimpDBusServiceUI::handle-open-as-new:
+   * @object: A #GimpDBusServiceUI.
+   * @invocation: A #GDBusMethodInvocation.
+   * @arg_uri: Argument passed by remote caller.
+   *
+   * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-gimp-GIMP-UI.OpenAsNew">OpenAsNew()</link> D-Bus method.
+   *
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gimp_dbus_service_ui_complete_open_as_new() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   *
+   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+   */
+  g_signal_new ("handle-open-as-new",
+    G_TYPE_FROM_INTERFACE (iface),
+    G_SIGNAL_RUN_LAST,
+    G_STRUCT_OFFSET (GimpDBusServiceUIIface, handle_open_as_new),
+    g_signal_accumulator_true_handled,
+    NULL,
+    g_cclosure_marshal_generic,
+    G_TYPE_BOOLEAN,
+    2,
+    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
+
+  /**
+   * GimpDBusServiceUI::handle-batch-run:
+   * @object: A #GimpDBusServiceUI.
+   * @invocation: A #GDBusMethodInvocation.
+   * @arg_interpreter: Argument passed by remote caller.
+   * @arg_command: Argument passed by remote caller.
+   *
+   * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-gimp-GIMP-UI.BatchRun">BatchRun()</link> D-Bus method.
+   *
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gimp_dbus_service_ui_complete_batch_run() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   *
+   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+   */
+  g_signal_new ("handle-batch-run",
+    G_TYPE_FROM_INTERFACE (iface),
+    G_SIGNAL_RUN_LAST,
+    G_STRUCT_OFFSET (GimpDBusServiceUIIface, handle_batch_run),
+    g_signal_accumulator_true_handled,
+    NULL,
+    g_cclosure_marshal_generic,
+    G_TYPE_BOOLEAN,
+    3,
+    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING);
+
+  /**
+   * GimpDBusServiceUI::handle-activate:
+   * @object: A #GimpDBusServiceUI.
+   * @invocation: A #GDBusMethodInvocation.
+   *
+   * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-gimp-GIMP-UI.Activate">Activate()</link> D-Bus method.
+   *
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gimp_dbus_service_ui_complete_activate() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   *
+   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+   */
+  g_signal_new ("handle-activate",
+    G_TYPE_FROM_INTERFACE (iface),
+    G_SIGNAL_RUN_LAST,
+    G_STRUCT_OFFSET (GimpDBusServiceUIIface, handle_activate),
+    g_signal_accumulator_true_handled,
+    NULL,
+    g_cclosure_marshal_generic,
+    G_TYPE_BOOLEAN,
+    1,
+    G_TYPE_DBUS_METHOD_INVOCATION);
+
+  /* GObject signals for received D-Bus signals: */
+  /**
+   * GimpDBusServiceUI::opened:
+   * @object: A #GimpDBusServiceUI.
+   * @arg_uri: Argument.
+   *
+   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-gimp-GIMP-UI.Opened">"Opened"</link> is received.
+   *
+   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
+   */
+  g_signal_new ("opened",
+    G_TYPE_FROM_INTERFACE (iface),
+    G_SIGNAL_RUN_LAST,
+    G_STRUCT_OFFSET (GimpDBusServiceUIIface, opened),
+    NULL,
+    NULL,
+    g_cclosure_marshal_generic,
+    G_TYPE_NONE,
+    1, G_TYPE_STRING);
+
+}
+
+/**
+ * gimp_dbus_service_ui_emit_opened:
+ * @object: A #GimpDBusServiceUI.
+ * @arg_uri: Argument to pass with the signal.
+ *
+ * Emits the <link linkend="gdbus-signal-org-gimp-GIMP-UI.Opened">"Opened"</link> D-Bus signal.
+ */
+void
+gimp_dbus_service_ui_emit_opened (
+    GimpDBusServiceUI *object,
+    const gchar *arg_uri)
+{
+  g_signal_emit_by_name (object, "opened", arg_uri);
+}
+
+/**
+ * gimp_dbus_service_ui_call_open:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @arg_uri: Argument to pass with the method invocation.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.Open">Open()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
+ * You can then call gimp_dbus_service_ui_call_open_finish() to get the result of the operation.
+ *
+ * See gimp_dbus_service_ui_call_open_sync() for the synchronous, blocking version of this method.
+ */
+void
+gimp_dbus_service_ui_call_open (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+    "Open",
+    g_variant_new ("(s)",
+                   arg_uri),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    callback,
+    user_data);
+}
+
+/**
+ * gimp_dbus_service_ui_call_open_finish:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @out_success: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gimp_dbus_service_ui_call_open().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with gimp_dbus_service_ui_call_open().
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_open_finish (
+    GimpDBusServiceUI *proxy,
+    gboolean *out_success,
+    GAsyncResult *res,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "(b)",
+                 out_success);
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_open_sync:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @arg_uri: Argument to pass with the method invocation.
+ * @out_success: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.Open">Open()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See gimp_dbus_service_ui_call_open() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_open_sync (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    gboolean *out_success,
+    GCancellable *cancellable,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+    "Open",
+    g_variant_new ("(s)",
+                   arg_uri),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "(b)",
+                 out_success);
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_open_as_new:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @arg_uri: Argument to pass with the method invocation.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.OpenAsNew">OpenAsNew()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
+ * You can then call gimp_dbus_service_ui_call_open_as_new_finish() to get the result of the operation.
+ *
+ * See gimp_dbus_service_ui_call_open_as_new_sync() for the synchronous, blocking version of this method.
+ */
+void
+gimp_dbus_service_ui_call_open_as_new (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+    "OpenAsNew",
+    g_variant_new ("(s)",
+                   arg_uri),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    callback,
+    user_data);
+}
+
+/**
+ * gimp_dbus_service_ui_call_open_as_new_finish:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @out_success: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gimp_dbus_service_ui_call_open_as_new().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with gimp_dbus_service_ui_call_open_as_new().
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_open_as_new_finish (
+    GimpDBusServiceUI *proxy,
+    gboolean *out_success,
+    GAsyncResult *res,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "(b)",
+                 out_success);
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_open_as_new_sync:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @arg_uri: Argument to pass with the method invocation.
+ * @out_success: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.OpenAsNew">OpenAsNew()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See gimp_dbus_service_ui_call_open_as_new() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_open_as_new_sync (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    gboolean *out_success,
+    GCancellable *cancellable,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+    "OpenAsNew",
+    g_variant_new ("(s)",
+                   arg_uri),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "(b)",
+                 out_success);
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_batch_run:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @arg_interpreter: Argument to pass with the method invocation.
+ * @arg_command: Argument to pass with the method invocation.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.BatchRun">BatchRun()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
+ * You can then call gimp_dbus_service_ui_call_batch_run_finish() to get the result of the operation.
+ *
+ * See gimp_dbus_service_ui_call_batch_run_sync() for the synchronous, blocking version of this method.
+ */
+void
+gimp_dbus_service_ui_call_batch_run (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_interpreter,
+    const gchar *arg_command,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+    "BatchRun",
+    g_variant_new ("(ss)",
+                   arg_interpreter,
+                   arg_command),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    callback,
+    user_data);
+}
+
+/**
+ * gimp_dbus_service_ui_call_batch_run_finish:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @out_success: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gimp_dbus_service_ui_call_batch_run().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with gimp_dbus_service_ui_call_batch_run().
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_batch_run_finish (
+    GimpDBusServiceUI *proxy,
+    gboolean *out_success,
+    GAsyncResult *res,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "(b)",
+                 out_success);
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_batch_run_sync:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @arg_interpreter: Argument to pass with the method invocation.
+ * @arg_command: Argument to pass with the method invocation.
+ * @out_success: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.BatchRun">BatchRun()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See gimp_dbus_service_ui_call_batch_run() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_batch_run_sync (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_interpreter,
+    const gchar *arg_command,
+    gboolean *out_success,
+    GCancellable *cancellable,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+    "BatchRun",
+    g_variant_new ("(ss)",
+                   arg_interpreter,
+                   arg_command),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "(b)",
+                 out_success);
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_activate:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.Activate">Activate()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
+ * You can then call gimp_dbus_service_ui_call_activate_finish() to get the result of the operation.
+ *
+ * See gimp_dbus_service_ui_call_activate_sync() for the synchronous, blocking version of this method.
+ */
+void
+gimp_dbus_service_ui_call_activate (
+    GimpDBusServiceUI *proxy,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+    "Activate",
+    g_variant_new ("()"),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    callback,
+    user_data);
+}
+
+/**
+ * gimp_dbus_service_ui_call_activate_finish:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gimp_dbus_service_ui_call_activate().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with gimp_dbus_service_ui_call_activate().
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_activate_finish (
+    GimpDBusServiceUI *proxy,
+    GAsyncResult *res,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "()");
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_call_activate_sync:
+ * @proxy: A #GimpDBusServiceUIProxy.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-gimp-GIMP-UI.Activate">Activate()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See gimp_dbus_service_ui_call_activate() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set.
+ */
+gboolean
+gimp_dbus_service_ui_call_activate_sync (
+    GimpDBusServiceUI *proxy,
+    GCancellable *cancellable,
+    GError **error)
+{
+  GVariant *_ret;
+  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+    "Activate",
+    g_variant_new ("()"),
+    G_DBUS_CALL_FLAGS_NONE,
+    -1,
+    cancellable,
+    error);
+  if (_ret == NULL)
+    goto _out;
+  g_variant_get (_ret,
+                 "()");
+  g_variant_unref (_ret);
+_out:
+  return _ret != NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_complete_open:
+ * @object: A #GimpDBusServiceUI.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ * @success: Parameter to return.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-gimp-GIMP-UI.Open">Open()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+gimp_dbus_service_ui_complete_open (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    gboolean success)
+{
+  g_dbus_method_invocation_return_value (invocation,
+    g_variant_new ("(b)",
+                   success));
+}
+
+/**
+ * gimp_dbus_service_ui_complete_open_as_new:
+ * @object: A #GimpDBusServiceUI.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ * @success: Parameter to return.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-gimp-GIMP-UI.OpenAsNew">OpenAsNew()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+gimp_dbus_service_ui_complete_open_as_new (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    gboolean success)
+{
+  g_dbus_method_invocation_return_value (invocation,
+    g_variant_new ("(b)",
+                   success));
+}
+
+/**
+ * gimp_dbus_service_ui_complete_batch_run:
+ * @object: A #GimpDBusServiceUI.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ * @success: Parameter to return.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-gimp-GIMP-UI.BatchRun">BatchRun()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+gimp_dbus_service_ui_complete_batch_run (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    gboolean success)
+{
+  g_dbus_method_invocation_return_value (invocation,
+    g_variant_new ("(b)",
+                   success));
+}
+
+/**
+ * gimp_dbus_service_ui_complete_activate:
+ * @object: A #GimpDBusServiceUI.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-gimp-GIMP-UI.Activate">Activate()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+gimp_dbus_service_ui_complete_activate (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation)
+{
+  g_dbus_method_invocation_return_value (invocation,
+    g_variant_new ("()"));
+}
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * GimpDBusServiceUIProxy:
+ *
+ * The #GimpDBusServiceUIProxy structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * GimpDBusServiceUIProxyClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #GimpDBusServiceUIProxy.
+ */
+
+struct _GimpDBusServiceUIProxyPrivate
+{
+  GData *qdata;
+};
+
+static void gimp_dbus_service_ui_proxy_iface_init (GimpDBusServiceUIIface *iface);
+
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
+G_DEFINE_TYPE_WITH_CODE (GimpDBusServiceUIProxy, gimp_dbus_service_ui_proxy, G_TYPE_DBUS_PROXY,
+                         G_ADD_PRIVATE (GimpDBusServiceUIProxy)
+                         G_IMPLEMENT_INTERFACE (GIMP_DBUS_SERVICE_TYPE_UI, gimp_dbus_service_ui_proxy_iface_init))
+
+#else
+G_DEFINE_TYPE_WITH_CODE (GimpDBusServiceUIProxy, gimp_dbus_service_ui_proxy, G_TYPE_DBUS_PROXY,
+                         G_IMPLEMENT_INTERFACE (GIMP_DBUS_SERVICE_TYPE_UI, gimp_dbus_service_ui_proxy_iface_init))
+
+#endif
+static void
+gimp_dbus_service_ui_proxy_finalize (GObject *object)
+{
+  GimpDBusServiceUIProxy *proxy = GIMP_DBUS_SERVICE_UI_PROXY (object);
+  g_datalist_clear (&proxy->priv->qdata);
+  G_OBJECT_CLASS (gimp_dbus_service_ui_proxy_parent_class)->finalize (object);
+}
+
+static void
+gimp_dbus_service_ui_proxy_get_property (GObject      *object,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec G_GNUC_UNUSED)
+{
+}
+
+static void
+gimp_dbus_service_ui_proxy_set_property (GObject      *object,
+  guint         prop_id,
+  const GValue *value,
+  GParamSpec   *pspec G_GNUC_UNUSED)
+{
+}
+
+static void
+gimp_dbus_service_ui_proxy_g_signal (GDBusProxy *proxy,
+  const gchar *sender_name G_GNUC_UNUSED,
+  const gchar *signal_name,
+  GVariant *parameters)
+{
+  _ExtendedGDBusSignalInfo *info;
+  GVariantIter iter;
+  GVariant *child;
+  GValue *paramv;
+  gsize num_params;
+  gsize n;
+  guint signal_id;
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gimp_dbus_service_ui_interface_info.parent_struct, signal_name);
+  if (info == NULL)
+    return;
+  num_params = g_variant_n_children (parameters);
+  paramv = g_new0 (GValue, num_params + 1);
+  g_value_init (&paramv[0], GIMP_DBUS_SERVICE_TYPE_UI);
+  g_value_set_object (&paramv[0], proxy);
+  g_variant_iter_init (&iter, parameters);
+  n = 1;
+  while ((child = g_variant_iter_next_value (&iter)) != NULL)
+    {
+      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
+      if (arg_info->use_gvariant)
+        {
+          g_value_init (&paramv[n], G_TYPE_VARIANT);
+          g_value_set_variant (&paramv[n], child);
+          n++;
+        }
+      else
+        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
+      g_variant_unref (child);
+    }
+  signal_id = g_signal_lookup (info->signal_name, GIMP_DBUS_SERVICE_TYPE_UI);
+  g_signal_emitv (paramv, signal_id, 0, NULL);
+  for (n = 0; n < num_params + 1; n++)
+    g_value_unset (&paramv[n]);
+  g_free (paramv);
+}
+
+static void
+gimp_dbus_service_ui_proxy_g_properties_changed (GDBusProxy *_proxy,
+  GVariant *changed_properties,
+  const gchar *const *invalidated_properties)
+{
+  GimpDBusServiceUIProxy *proxy = GIMP_DBUS_SERVICE_UI_PROXY (_proxy);
+  guint n;
+  const gchar *key;
+  GVariantIter *iter;
+  _ExtendedGDBusPropertyInfo *info;
+  g_variant_get (changed_properties, "a{sv}", &iter);
+  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
+    {
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gimp_dbus_service_ui_interface_info.parent_struct, key);
+      g_datalist_remove_data (&proxy->priv->qdata, key);
+      if (info != NULL)
+        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
+    }
+  g_variant_iter_free (iter);
+  for (n = 0; invalidated_properties[n] != NULL; n++)
+    {
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gimp_dbus_service_ui_interface_info.parent_struct, invalidated_properties[n]);
+      g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
+      if (info != NULL)
+        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
+    }
+}
+
+static void
+gimp_dbus_service_ui_proxy_init (GimpDBusServiceUIProxy *proxy)
+{
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
+  proxy->priv = gimp_dbus_service_ui_proxy_get_instance_private (proxy);
+#else
+  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GIMP_DBUS_SERVICE_TYPE_UI_PROXY, GimpDBusServiceUIProxyPrivate);
+#endif
+
+  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gimp_dbus_service_ui_interface_info ());
+}
+
+static void
+gimp_dbus_service_ui_proxy_class_init (GimpDBusServiceUIProxyClass *klass)
+{
+  GObjectClass *gobject_class;
+  GDBusProxyClass *proxy_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize     = gimp_dbus_service_ui_proxy_finalize;
+  gobject_class->get_property = gimp_dbus_service_ui_proxy_get_property;
+  gobject_class->set_property = gimp_dbus_service_ui_proxy_set_property;
+
+  proxy_class = G_DBUS_PROXY_CLASS (klass);
+  proxy_class->g_signal = gimp_dbus_service_ui_proxy_g_signal;
+  proxy_class->g_properties_changed = gimp_dbus_service_ui_proxy_g_properties_changed;
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
+  g_type_class_add_private (klass, sizeof (GimpDBusServiceUIProxyPrivate));
+#endif
+}
+
+static void
+gimp_dbus_service_ui_proxy_iface_init (GimpDBusServiceUIIface *iface)
+{
+}
+
+/**
+ * gimp_dbus_service_ui_proxy_new:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link>. See g_dbus_proxy_new() for more details.
+ *
+ * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
+ * You can then call gimp_dbus_service_ui_proxy_new_finish() to get the result of the operation.
+ *
+ * See gimp_dbus_service_ui_proxy_new_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+gimp_dbus_service_ui_proxy_new (
+    GDBusConnection     *connection,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GAsyncReadyCallback  callback,
+    gpointer             user_data)
+{
+  g_async_initable_new_async (GIMP_DBUS_SERVICE_TYPE_UI_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.gimp.GIMP.UI", NULL);
+}
+
+/**
+ * gimp_dbus_service_ui_proxy_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gimp_dbus_service_ui_proxy_new().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with gimp_dbus_service_ui_proxy_new().
+ *
+ * Returns: (transfer full) (type GimpDBusServiceUIProxy): The constructed proxy object or %NULL if @error is set.
+ */
+GimpDBusServiceUI *
+gimp_dbus_service_ui_proxy_new_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return GIMP_DBUS_SERVICE_UI (ret);
+  else
+    return NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_proxy_new_sync:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link>. See g_dbus_proxy_new_sync() for more details.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See gimp_dbus_service_ui_proxy_new() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type GimpDBusServiceUIProxy): The constructed proxy object or %NULL if @error is set.
+ */
+GimpDBusServiceUI *
+gimp_dbus_service_ui_proxy_new_sync (
+    GDBusConnection     *connection,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GError             **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (GIMP_DBUS_SERVICE_TYPE_UI_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.gimp.GIMP.UI", NULL);
+  if (ret != NULL)
+    return GIMP_DBUS_SERVICE_UI (ret);
+  else
+    return NULL;
+}
+
+
+/**
+ * gimp_dbus_service_ui_proxy_new_for_bus:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Like gimp_dbus_service_ui_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from (see g_main_context_push_thread_default()).
+ * You can then call gimp_dbus_service_ui_proxy_new_for_bus_finish() to get the result of the operation.
+ *
+ * See gimp_dbus_service_ui_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+gimp_dbus_service_ui_proxy_new_for_bus (
+    GBusType             bus_type,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GAsyncReadyCallback  callback,
+    gpointer             user_data)
+{
+  g_async_initable_new_async (GIMP_DBUS_SERVICE_TYPE_UI_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.gimp.GIMP.UI", NULL);
+}
+
+/**
+ * gimp_dbus_service_ui_proxy_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gimp_dbus_service_ui_proxy_new_for_bus().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with gimp_dbus_service_ui_proxy_new_for_bus().
+ *
+ * Returns: (transfer full) (type GimpDBusServiceUIProxy): The constructed proxy object or %NULL if @error is set.
+ */
+GimpDBusServiceUI *
+gimp_dbus_service_ui_proxy_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return GIMP_DBUS_SERVICE_UI (ret);
+  else
+    return NULL;
+}
+
+/**
+ * gimp_dbus_service_ui_proxy_new_for_bus_sync:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Like gimp_dbus_service_ui_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See gimp_dbus_service_ui_proxy_new_for_bus() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type GimpDBusServiceUIProxy): The constructed proxy object or %NULL if @error is set.
+ */
+GimpDBusServiceUI *
+gimp_dbus_service_ui_proxy_new_for_bus_sync (
+    GBusType             bus_type,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GError             **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (GIMP_DBUS_SERVICE_TYPE_UI_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.gimp.GIMP.UI", NULL);
+  if (ret != NULL)
+    return GIMP_DBUS_SERVICE_UI (ret);
+  else
+    return NULL;
+}
+
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * GimpDBusServiceUISkeleton:
+ *
+ * The #GimpDBusServiceUISkeleton structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * GimpDBusServiceUISkeletonClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #GimpDBusServiceUISkeleton.
+ */
+
+struct _GimpDBusServiceUISkeletonPrivate
+{
+  GValue *properties;
+  GList *changed_properties;
+  GSource *changed_properties_idle_source;
+  GMainContext *context;
+  GMutex lock;
+};
+
+static void
+_gimp_dbus_service_ui_skeleton_handle_method_call (
+  GDBusConnection *connection G_GNUC_UNUSED,
+  const gchar *sender G_GNUC_UNUSED,
+  const gchar *object_path G_GNUC_UNUSED,
+  const gchar *interface_name,
+  const gchar *method_name,
+  GVariant *parameters,
+  GDBusMethodInvocation *invocation,
+  gpointer user_data)
+{
+  GimpDBusServiceUISkeleton *skeleton = GIMP_DBUS_SERVICE_UI_SKELETON (user_data);
+  _ExtendedGDBusMethodInfo *info;
+  GVariantIter iter;
+  GVariant *child;
+  GValue *paramv;
+  gsize num_params;
+  guint num_extra;
+  gsize n;
+  guint signal_id;
+  GValue return_value = G_VALUE_INIT;
+  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
+  g_assert (info != NULL);
+  num_params = g_variant_n_children (parameters);
+  num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
+  n = 0;
+  g_value_init (&paramv[n], GIMP_DBUS_SERVICE_TYPE_UI);
+  g_value_set_object (&paramv[n++], skeleton);
+  g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
+  g_value_set_object (&paramv[n++], invocation);
+  if (info->pass_fdlist)
+    {
+#ifdef G_OS_UNIX
+      g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
+      g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
+#else
+      g_assert_not_reached ();
+#endif
+    }
+  g_variant_iter_init (&iter, parameters);
+  while ((child = g_variant_iter_next_value (&iter)) != NULL)
+    {
+      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
+      if (arg_info->use_gvariant)
+        {
+          g_value_init (&paramv[n], G_TYPE_VARIANT);
+          g_value_set_variant (&paramv[n], child);
+          n++;
+        }
+      else
+        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
+      g_variant_unref (child);
+    }
+  signal_id = g_signal_lookup (info->signal_name, GIMP_DBUS_SERVICE_TYPE_UI);
+  g_value_init (&return_value, G_TYPE_BOOLEAN);
+  g_signal_emitv (paramv, signal_id, 0, &return_value);
+  if (!g_value_get_boolean (&return_value))
+    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
+  g_value_unset (&return_value);
+  for (n = 0; n < num_params + num_extra; n++)
+    g_value_unset (&paramv[n]);
+  g_free (paramv);
+}
+
+static GVariant *
+_gimp_dbus_service_ui_skeleton_handle_get_property (
+  GDBusConnection *connection G_GNUC_UNUSED,
+  const gchar *sender G_GNUC_UNUSED,
+  const gchar *object_path G_GNUC_UNUSED,
+  const gchar *interface_name G_GNUC_UNUSED,
+  const gchar *property_name,
+  GError **error,
+  gpointer user_data)
+{
+  GimpDBusServiceUISkeleton *skeleton = GIMP_DBUS_SERVICE_UI_SKELETON (user_data);
+  GValue value = G_VALUE_INIT;
+  GParamSpec *pspec;
+  _ExtendedGDBusPropertyInfo *info;
+  GVariant *ret;
+  ret = NULL;
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gimp_dbus_service_ui_interface_info.parent_struct, property_name);
+  g_assert (info != NULL);
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
+  if (pspec == NULL)
+    {
+      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
+    }
+  else
+    {
+      g_value_init (&value, pspec->value_type);
+      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
+      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
+      g_value_unset (&value);
+    }
+  return ret;
+}
+
+static gboolean
+_gimp_dbus_service_ui_skeleton_handle_set_property (
+  GDBusConnection *connection G_GNUC_UNUSED,
+  const gchar *sender G_GNUC_UNUSED,
+  const gchar *object_path G_GNUC_UNUSED,
+  const gchar *interface_name G_GNUC_UNUSED,
+  const gchar *property_name,
+  GVariant *variant,
+  GError **error,
+  gpointer user_data)
+{
+  GimpDBusServiceUISkeleton *skeleton = GIMP_DBUS_SERVICE_UI_SKELETON (user_data);
+  GValue value = G_VALUE_INIT;
+  GParamSpec *pspec;
+  _ExtendedGDBusPropertyInfo *info;
+  gboolean ret;
+  ret = FALSE;
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gimp_dbus_service_ui_interface_info.parent_struct, property_name);
+  g_assert (info != NULL);
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
+  if (pspec == NULL)
+    {
+      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
+    }
+  else
+    {
+      if (info->use_gvariant)
+        g_value_set_variant (&value, variant);
+      else
+        g_dbus_gvariant_to_gvalue (variant, &value);
+      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
+      g_value_unset (&value);
+      ret = TRUE;
+    }
+  return ret;
+}
+
+static const GDBusInterfaceVTable _gimp_dbus_service_ui_skeleton_vtable =
+{
+  _gimp_dbus_service_ui_skeleton_handle_method_call,
+  _gimp_dbus_service_ui_skeleton_handle_get_property,
+  _gimp_dbus_service_ui_skeleton_handle_set_property,
+  {NULL}
+};
+
+static GDBusInterfaceInfo *
+gimp_dbus_service_ui_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+{
+  return gimp_dbus_service_ui_interface_info ();
+}
+
+static GDBusInterfaceVTable *
+gimp_dbus_service_ui_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+{
+  return (GDBusInterfaceVTable *) &_gimp_dbus_service_ui_skeleton_vtable;
+}
+
+static GVariant *
+gimp_dbus_service_ui_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
+{
+  GimpDBusServiceUISkeleton *skeleton = GIMP_DBUS_SERVICE_UI_SKELETON (_skeleton);
+
+  GVariantBuilder builder;
+  guint n;
+  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+  if (_gimp_dbus_service_ui_interface_info.parent_struct.properties == NULL)
+    goto out;
+  for (n = 0; _gimp_dbus_service_ui_interface_info.parent_struct.properties[n] != NULL; n++)
+    {
+      GDBusPropertyInfo *info = _gimp_dbus_service_ui_interface_info.parent_struct.properties[n];
+      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
+        {
+          GVariant *value;
+          value = _gimp_dbus_service_ui_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.gimp.GIMP.UI", info->name, NULL, skeleton);
+          if (value != NULL)
+            {
+              g_variant_take_ref (value);
+              g_variant_builder_add (&builder, "{sv}", info->name, value);
+              g_variant_unref (value);
+            }
+        }
+    }
+out:
+  return g_variant_builder_end (&builder);
+}
+
+static void
+gimp_dbus_service_ui_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
+{
+}
+
+static void
+_gimp_dbus_service_ui_on_signal_opened (
+    GimpDBusServiceUI *object,
+    const gchar *arg_uri)
+{
+  GimpDBusServiceUISkeleton *skeleton = GIMP_DBUS_SERVICE_UI_SKELETON (object);
+
+  GList      *connections, *l;
+  GVariant   *signal_variant;
+  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
+
+  signal_variant = g_variant_ref_sink (g_variant_new ("(s)",
+                   arg_uri));
+  for (l = connections; l != NULL; l = l->next)
+    {
+      GDBusConnection *connection = l->data;
+      g_dbus_connection_emit_signal (connection,
+        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.gimp.GIMP.UI", "Opened",
+        signal_variant, NULL);
+    }
+  g_variant_unref (signal_variant);
+  g_list_free_full (connections, g_object_unref);
+}
+
+static void gimp_dbus_service_ui_skeleton_iface_init (GimpDBusServiceUIIface *iface);
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
+G_DEFINE_TYPE_WITH_CODE (GimpDBusServiceUISkeleton, gimp_dbus_service_ui_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_ADD_PRIVATE (GimpDBusServiceUISkeleton)
+                         G_IMPLEMENT_INTERFACE (GIMP_DBUS_SERVICE_TYPE_UI, gimp_dbus_service_ui_skeleton_iface_init))
+
+#else
+G_DEFINE_TYPE_WITH_CODE (GimpDBusServiceUISkeleton, gimp_dbus_service_ui_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_IMPLEMENT_INTERFACE (GIMP_DBUS_SERVICE_TYPE_UI, gimp_dbus_service_ui_skeleton_iface_init))
+
+#endif
+static void
+gimp_dbus_service_ui_skeleton_finalize (GObject *object)
+{
+  GimpDBusServiceUISkeleton *skeleton = GIMP_DBUS_SERVICE_UI_SKELETON (object);
+  g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
+  if (skeleton->priv->changed_properties_idle_source != NULL)
+    g_source_destroy (skeleton->priv->changed_properties_idle_source);
+  g_main_context_unref (skeleton->priv->context);
+  g_mutex_clear (&skeleton->priv->lock);
+  G_OBJECT_CLASS (gimp_dbus_service_ui_skeleton_parent_class)->finalize (object);
+}
+
+static void
+gimp_dbus_service_ui_skeleton_init (GimpDBusServiceUISkeleton *skeleton)
+{
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
+  skeleton->priv = gimp_dbus_service_ui_skeleton_get_instance_private (skeleton);
+#else
+  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GIMP_DBUS_SERVICE_TYPE_UI_SKELETON, GimpDBusServiceUISkeletonPrivate);
+#endif
+
+  g_mutex_init (&skeleton->priv->lock);
+  skeleton->priv->context = g_main_context_ref_thread_default ();
+}
+
+static void
+gimp_dbus_service_ui_skeleton_class_init (GimpDBusServiceUISkeletonClass *klass)
+{
+  GObjectClass *gobject_class;
+  GDBusInterfaceSkeletonClass *skeleton_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = gimp_dbus_service_ui_skeleton_finalize;
+
+  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
+  skeleton_class->get_info = gimp_dbus_service_ui_skeleton_dbus_interface_get_info;
+  skeleton_class->get_properties = gimp_dbus_service_ui_skeleton_dbus_interface_get_properties;
+  skeleton_class->flush = gimp_dbus_service_ui_skeleton_dbus_interface_flush;
+  skeleton_class->get_vtable = gimp_dbus_service_ui_skeleton_dbus_interface_get_vtable;
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
+  g_type_class_add_private (klass, sizeof (GimpDBusServiceUISkeletonPrivate));
+#endif
+}
+
+static void
+gimp_dbus_service_ui_skeleton_iface_init (GimpDBusServiceUIIface *iface)
+{
+  iface->opened = _gimp_dbus_service_ui_on_signal_opened;
+}
+
+/**
+ * gimp_dbus_service_ui_skeleton_new:
+ *
+ * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-gimp-GIMP-UI.top_of_page">org.gimp.GIMP.UI</link>.
+ *
+ * Returns: (transfer full) (type GimpDBusServiceUISkeleton): The skeleton object.
+ */
+GimpDBusServiceUI *
+gimp_dbus_service_ui_skeleton_new (void)
+{
+  return GIMP_DBUS_SERVICE_UI (g_object_new (GIMP_DBUS_SERVICE_TYPE_UI_SKELETON, NULL));
+}
+
diff --git a/app/gui/gimpdbusservice-generated.h b/app/gui/gimpdbusservice-generated.h
new file mode 100644
index 0000000..5c8c465
--- /dev/null
+++ b/app/gui/gimpdbusservice-generated.h
@@ -0,0 +1,282 @@
+/*
+ * This file is generated by gdbus-codegen, do not modify it.
+ *
+ * The license of this code is the same as for the D-Bus interface description
+ * it was derived from. Note that it links to GLib, so must comply with the
+ * LGPL linking clauses.
+ */
+
+#ifndef __GIMPDBUSSERVICE_GENERATED_H__
+#define __GIMPDBUSSERVICE_GENERATED_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+
+/* ------------------------------------------------------------------------ */
+/* Declarations for org.gimp.GIMP.UI */
+
+#define GIMP_DBUS_SERVICE_TYPE_UI (gimp_dbus_service_ui_get_type ())
+#define GIMP_DBUS_SERVICE_UI(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GIMP_DBUS_SERVICE_TYPE_UI, GimpDBusServiceUI))
+#define GIMP_DBUS_SERVICE_IS_UI(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GIMP_DBUS_SERVICE_TYPE_UI))
+#define GIMP_DBUS_SERVICE_UI_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GIMP_DBUS_SERVICE_TYPE_UI, GimpDBusServiceUIIface))
+
+struct _GimpDBusServiceUI;
+typedef struct _GimpDBusServiceUI GimpDBusServiceUI;
+typedef struct _GimpDBusServiceUIIface GimpDBusServiceUIIface;
+
+struct _GimpDBusServiceUIIface
+{
+  GTypeInterface parent_iface;
+
+
+  gboolean (*handle_activate) (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation);
+
+  gboolean (*handle_batch_run) (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    const gchar *arg_interpreter,
+    const gchar *arg_command);
+
+  gboolean (*handle_open) (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    const gchar *arg_uri);
+
+  gboolean (*handle_open_as_new) (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    const gchar *arg_uri);
+
+  void (*opened) (
+    GimpDBusServiceUI *object,
+    const gchar *arg_uri);
+
+};
+
+GType gimp_dbus_service_ui_get_type (void) G_GNUC_CONST;
+
+GDBusInterfaceInfo *gimp_dbus_service_ui_interface_info (void);
+guint gimp_dbus_service_ui_override_properties (GObjectClass *klass, guint property_id_begin);
+
+
+/* D-Bus method call completion functions: */
+void gimp_dbus_service_ui_complete_open (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    gboolean success);
+
+void gimp_dbus_service_ui_complete_open_as_new (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    gboolean success);
+
+void gimp_dbus_service_ui_complete_batch_run (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation,
+    gboolean success);
+
+void gimp_dbus_service_ui_complete_activate (
+    GimpDBusServiceUI *object,
+    GDBusMethodInvocation *invocation);
+
+
+
+/* D-Bus signal emissions functions: */
+void gimp_dbus_service_ui_emit_opened (
+    GimpDBusServiceUI *object,
+    const gchar *arg_uri);
+
+
+
+/* D-Bus method calls: */
+void gimp_dbus_service_ui_call_open (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+gboolean gimp_dbus_service_ui_call_open_finish (
+    GimpDBusServiceUI *proxy,
+    gboolean *out_success,
+    GAsyncResult *res,
+    GError **error);
+
+gboolean gimp_dbus_service_ui_call_open_sync (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    gboolean *out_success,
+    GCancellable *cancellable,
+    GError **error);
+
+void gimp_dbus_service_ui_call_open_as_new (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+gboolean gimp_dbus_service_ui_call_open_as_new_finish (
+    GimpDBusServiceUI *proxy,
+    gboolean *out_success,
+    GAsyncResult *res,
+    GError **error);
+
+gboolean gimp_dbus_service_ui_call_open_as_new_sync (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_uri,
+    gboolean *out_success,
+    GCancellable *cancellable,
+    GError **error);
+
+void gimp_dbus_service_ui_call_batch_run (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_interpreter,
+    const gchar *arg_command,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+gboolean gimp_dbus_service_ui_call_batch_run_finish (
+    GimpDBusServiceUI *proxy,
+    gboolean *out_success,
+    GAsyncResult *res,
+    GError **error);
+
+gboolean gimp_dbus_service_ui_call_batch_run_sync (
+    GimpDBusServiceUI *proxy,
+    const gchar *arg_interpreter,
+    const gchar *arg_command,
+    gboolean *out_success,
+    GCancellable *cancellable,
+    GError **error);
+
+void gimp_dbus_service_ui_call_activate (
+    GimpDBusServiceUI *proxy,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+gboolean gimp_dbus_service_ui_call_activate_finish (
+    GimpDBusServiceUI *proxy,
+    GAsyncResult *res,
+    GError **error);
+
+gboolean gimp_dbus_service_ui_call_activate_sync (
+    GimpDBusServiceUI *proxy,
+    GCancellable *cancellable,
+    GError **error);
+
+
+
+/* ---- */
+
+#define GIMP_DBUS_SERVICE_TYPE_UI_PROXY (gimp_dbus_service_ui_proxy_get_type ())
+#define GIMP_DBUS_SERVICE_UI_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GIMP_DBUS_SERVICE_TYPE_UI_PROXY, GimpDBusServiceUIProxy))
+#define GIMP_DBUS_SERVICE_UI_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GIMP_DBUS_SERVICE_TYPE_UI_PROXY, GimpDBusServiceUIProxyClass))
+#define GIMP_DBUS_SERVICE_UI_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GIMP_DBUS_SERVICE_TYPE_UI_PROXY, GimpDBusServiceUIProxyClass))
+#define GIMP_DBUS_SERVICE_IS_UI_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GIMP_DBUS_SERVICE_TYPE_UI_PROXY))
+#define GIMP_DBUS_SERVICE_IS_UI_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GIMP_DBUS_SERVICE_TYPE_UI_PROXY))
+
+typedef struct _GimpDBusServiceUIProxy GimpDBusServiceUIProxy;
+typedef struct _GimpDBusServiceUIProxyClass GimpDBusServiceUIProxyClass;
+typedef struct _GimpDBusServiceUIProxyPrivate GimpDBusServiceUIProxyPrivate;
+
+struct _GimpDBusServiceUIProxy
+{
+  /*< private >*/
+  GDBusProxy parent_instance;
+  GimpDBusServiceUIProxyPrivate *priv;
+};
+
+struct _GimpDBusServiceUIProxyClass
+{
+  GDBusProxyClass parent_class;
+};
+
+GType gimp_dbus_service_ui_proxy_get_type (void) G_GNUC_CONST;
+
+#if GLIB_CHECK_VERSION(2, 44, 0)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GimpDBusServiceUIProxy, g_object_unref)
+#endif
+
+void gimp_dbus_service_ui_proxy_new (
+    GDBusConnection     *connection,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GAsyncReadyCallback  callback,
+    gpointer             user_data);
+GimpDBusServiceUI *gimp_dbus_service_ui_proxy_new_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GimpDBusServiceUI *gimp_dbus_service_ui_proxy_new_sync (
+    GDBusConnection     *connection,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GError             **error);
+
+void gimp_dbus_service_ui_proxy_new_for_bus (
+    GBusType             bus_type,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GAsyncReadyCallback  callback,
+    gpointer             user_data);
+GimpDBusServiceUI *gimp_dbus_service_ui_proxy_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GimpDBusServiceUI *gimp_dbus_service_ui_proxy_new_for_bus_sync (
+    GBusType             bus_type,
+    GDBusProxyFlags      flags,
+    const gchar         *name,
+    const gchar         *object_path,
+    GCancellable        *cancellable,
+    GError             **error);
+
+
+/* ---- */
+
+#define GIMP_DBUS_SERVICE_TYPE_UI_SKELETON (gimp_dbus_service_ui_skeleton_get_type ())
+#define GIMP_DBUS_SERVICE_UI_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GIMP_DBUS_SERVICE_TYPE_UI_SKELETON, GimpDBusServiceUISkeleton))
+#define GIMP_DBUS_SERVICE_UI_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GIMP_DBUS_SERVICE_TYPE_UI_SKELETON, GimpDBusServiceUISkeletonClass))
+#define GIMP_DBUS_SERVICE_UI_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GIMP_DBUS_SERVICE_TYPE_UI_SKELETON, GimpDBusServiceUISkeletonClass))
+#define GIMP_DBUS_SERVICE_IS_UI_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GIMP_DBUS_SERVICE_TYPE_UI_SKELETON))
+#define GIMP_DBUS_SERVICE_IS_UI_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GIMP_DBUS_SERVICE_TYPE_UI_SKELETON))
+
+typedef struct _GimpDBusServiceUISkeleton GimpDBusServiceUISkeleton;
+typedef struct _GimpDBusServiceUISkeletonClass GimpDBusServiceUISkeletonClass;
+typedef struct _GimpDBusServiceUISkeletonPrivate GimpDBusServiceUISkeletonPrivate;
+
+struct _GimpDBusServiceUISkeleton
+{
+  /*< private >*/
+  GDBusInterfaceSkeleton parent_instance;
+  GimpDBusServiceUISkeletonPrivate *priv;
+};
+
+struct _GimpDBusServiceUISkeletonClass
+{
+  GDBusInterfaceSkeletonClass parent_class;
+};
+
+GType gimp_dbus_service_ui_skeleton_get_type (void) G_GNUC_CONST;
+
+#if GLIB_CHECK_VERSION(2, 44, 0)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GimpDBusServiceUISkeleton, g_object_unref)
+#endif
+
+GimpDBusServiceUI *gimp_dbus_service_ui_skeleton_new (void);
+
+
+G_END_DECLS
+
+#endif /* __GIMPDBUSSERVICE_GENERATED_H__ */
diff --git a/app/gui/gimpdbusservice.c b/app/gui/gimpdbusservice.c
new file mode 100644
index 0000000..462d7d4
--- /dev/null
+++ b/app/gui/gimpdbusservice.c
@@ -0,0 +1,457 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDBusService
+ * Copyright (C) 2007, 2008 Sven Neumann <sven@gimp.org>
+ * Copyright (C) 2013       Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "gui-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-batch.h"
+#include "core/gimpcontainer.h"
+
+#include "file/file-open.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "gimpdbusservice.h"
+
+
+typedef struct
+{
+  GFile    *file;
+  gboolean  as_new;
+
+  gchar    *interpreter;
+  gchar    *command;
+} IdleData;
+
+static void       gimp_dbus_service_ui_iface_init  (GimpDBusServiceUIIface *iface);
+
+static void       gimp_dbus_service_dispose        (GObject               *object);
+static void       gimp_dbus_service_finalize       (GObject               *object);
+
+static gboolean   gimp_dbus_service_activate       (GimpDBusServiceUI     *service,
+                                                    GDBusMethodInvocation *invocation);
+static gboolean   gimp_dbus_service_open           (GimpDBusServiceUI     *service,
+                                                    GDBusMethodInvocation *invocation,
+                                                    const gchar           *uri);
+
+static gboolean   gimp_dbus_service_open_as_new    (GimpDBusServiceUI     *service,
+                                                    GDBusMethodInvocation *invocation,
+                                                    const gchar           *uri);
+
+static gboolean   gimp_dbus_service_batch_run      (GimpDBusServiceUI     *service,
+                                                    GDBusMethodInvocation *invocation,
+                                                    const gchar           *batch_interpreter,
+                                                    const gchar           *batch_command);
+
+static void       gimp_dbus_service_gimp_opened    (Gimp                  *gimp,
+                                                    GFile                 *file,
+                                                    GimpDBusService       *service);
+
+static gboolean   gimp_dbus_service_queue_open     (GimpDBusService       *service,
+                                                    const gchar           *uri,
+                                                    gboolean               as_new);
+static gboolean   gimp_dbus_service_queue_batch    (GimpDBusService       *service,
+                                                    const gchar           *interpreter,
+                                                    const gchar           *command);
+
+static gboolean   gimp_dbus_service_process_idle   (GimpDBusService       *service);
+static IdleData * gimp_dbus_service_open_data_new  (GimpDBusService       *service,
+                                                    const gchar           *uri,
+                                                    gboolean               as_new);
+static IdleData * gimp_dbus_service_batch_data_new (GimpDBusService       *service,
+                                                    const gchar           *interpreter,
+                                                    const gchar           *command);
+static void       gimp_dbus_service_idle_data_free (IdleData              *data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDBusService, gimp_dbus_service,
+                         GIMP_DBUS_SERVICE_TYPE_UI_SKELETON,
+                         G_IMPLEMENT_INTERFACE (GIMP_DBUS_SERVICE_TYPE_UI,
+                                                gimp_dbus_service_ui_iface_init))
+
+#define parent_class gimp_dbus_service_parent_class
+
+
+static void
+gimp_dbus_service_class_init (GimpDBusServiceClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose  = gimp_dbus_service_dispose;
+  object_class->finalize = gimp_dbus_service_finalize;
+}
+
+static void
+gimp_dbus_service_init (GimpDBusService *service)
+{
+  service->queue = g_queue_new ();
+}
+
+static void
+gimp_dbus_service_ui_iface_init (GimpDBusServiceUIIface *iface)
+{
+  iface->handle_activate    = gimp_dbus_service_activate;
+  iface->handle_open        = gimp_dbus_service_open;
+  iface->handle_open_as_new = gimp_dbus_service_open_as_new;
+  iface->handle_batch_run   = gimp_dbus_service_batch_run;
+}
+
+GObject *
+gimp_dbus_service_new (Gimp *gimp)
+{
+  GimpDBusService *service;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  service = g_object_new (GIMP_TYPE_DBUS_SERVICE, NULL);
+
+  service->gimp = gimp;
+
+  g_signal_connect_object (gimp, "image-opened",
+                           G_CALLBACK (gimp_dbus_service_gimp_opened),
+                           service, 0);
+
+  return G_OBJECT (service);
+}
+
+static void
+gimp_dbus_service_dispose (GObject *object)
+{
+  GimpDBusService *service = GIMP_DBUS_SERVICE (object);
+
+  if (service->source)
+    {
+      g_source_remove (g_source_get_id (service->source));
+      service->source = NULL;
+      service->timeout_source = FALSE;
+    }
+
+  while (! g_queue_is_empty (service->queue))
+    {
+      gimp_dbus_service_idle_data_free (g_queue_pop_head (service->queue));
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dbus_service_finalize (GObject *object)
+{
+  GimpDBusService *service = GIMP_DBUS_SERVICE (object);
+
+  if (service->queue)
+    {
+      g_queue_free (service->queue);
+      service->queue = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+gboolean
+gimp_dbus_service_activate (GimpDBusServiceUI     *service,
+                            GDBusMethodInvocation *invocation)
+{
+  Gimp *gimp = GIMP_DBUS_SERVICE (service)->gimp;
+
+  /*  We want to be called again later in case that GIMP is not fully
+   *  started yet.
+   */
+  if (gimp_is_restored (gimp))
+    {
+      GimpObject *display;
+
+      display = gimp_container_get_first_child (gimp->displays);
+
+      if (display)
+        gimp_display_shell_present (gimp_display_get_shell (GIMP_DISPLAY (display)));
+    }
+
+  gimp_dbus_service_ui_complete_activate (service, invocation);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dbus_service_open (GimpDBusServiceUI     *service,
+                        GDBusMethodInvocation *invocation,
+                        const gchar           *uri)
+{
+  gboolean success;
+
+  success = gimp_dbus_service_queue_open (GIMP_DBUS_SERVICE (service),
+                                          uri, FALSE);
+
+  gimp_dbus_service_ui_complete_open (service, invocation, success);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dbus_service_open_as_new (GimpDBusServiceUI     *service,
+                               GDBusMethodInvocation *invocation,
+                               const gchar           *uri)
+{
+  gboolean success;
+
+  success = gimp_dbus_service_queue_open (GIMP_DBUS_SERVICE (service),
+                                          uri, TRUE);
+
+  gimp_dbus_service_ui_complete_open_as_new (service, invocation, success);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dbus_service_batch_run (GimpDBusServiceUI     *service,
+                             GDBusMethodInvocation *invocation,
+                             const gchar           *batch_interpreter,
+                             const gchar           *batch_command)
+{
+  gboolean success;
+
+  success = gimp_dbus_service_queue_batch (GIMP_DBUS_SERVICE (service),
+                                           batch_interpreter,
+                                           batch_command);
+
+  gimp_dbus_service_ui_complete_batch_run (service, invocation, success);
+
+  return TRUE;
+}
+
+static void
+gimp_dbus_service_gimp_opened (Gimp            *gimp,
+                               GFile           *file,
+                               GimpDBusService *service)
+{
+  gchar *uri = g_file_get_uri (file);
+
+  g_signal_emit_by_name (service, "opened", uri);
+
+  g_free (uri);
+}
+
+/*
+ * Adds a request to open a file to the end of the queue and
+ * starts an idle source if it is not already running.
+ */
+static gboolean
+gimp_dbus_service_queue_open (GimpDBusService *service,
+                              const gchar     *uri,
+                              gboolean         as_new)
+{
+  g_queue_push_tail (service->queue,
+                     gimp_dbus_service_open_data_new (service, uri, as_new));
+
+  if (! service->source)
+    {
+      service->source = g_idle_source_new ();
+      service->timeout_source = FALSE;
+
+      g_source_set_priority (service->source, G_PRIORITY_LOW);
+      g_source_set_callback (service->source,
+                             (GSourceFunc) gimp_dbus_service_process_idle,
+                             service,
+                             NULL);
+      g_source_attach (service->source, NULL);
+      g_source_unref (service->source);
+    }
+
+  /*  The call always succeeds as it is handled in one way or another.
+   *  Even presenting an error message is considered success ;-)
+   */
+  return TRUE;
+}
+
+/*
+ * Adds a request to run a batch command to the end of the queue and
+ * starts an idle source if it is not already running.
+ */
+static gboolean
+gimp_dbus_service_queue_batch (GimpDBusService *service,
+                               const gchar     *interpreter,
+                               const gchar     *command)
+{
+  g_queue_push_tail (service->queue,
+                     gimp_dbus_service_batch_data_new (service,
+                                                       interpreter,
+                                                       command));
+
+  if (! service->source)
+    {
+      service->source = g_idle_source_new ();
+      service->timeout_source = FALSE;
+
+      g_source_set_priority (service->source, G_PRIORITY_LOW);
+      g_source_set_callback (service->source,
+                             (GSourceFunc) gimp_dbus_service_process_idle,
+                             service,
+                             NULL);
+      g_source_attach (service->source, NULL);
+      g_source_unref (service->source);
+    }
+
+  /*  The call always succeeds as it is handled in one way or another.
+   *  Even presenting an error message is considered success ;-)
+   */
+  return TRUE;
+}
+
+/*
+ * Idle callback that removes the first request from the queue and
+ * handles it. If there are no more requests, the idle source is
+ * removed.
+ */
+static gboolean
+gimp_dbus_service_process_idle (GimpDBusService *service)
+{
+  IdleData *data;
+
+  if (! service->gimp->initialized || ! service->gimp->restored)
+    {
+      if (! service->timeout_source)
+        {
+          /* We are probably starting the program. No need to spam GIMP with
+           * an idle handler (which might make GIMP slower to start even
+           * with low priority).
+           * Instead let's add a timeout of half a second.
+           */
+          service->source = g_timeout_source_new (500);
+          service->timeout_source = TRUE;
+
+          g_source_set_priority (service->source, G_PRIORITY_LOW);
+          g_source_set_callback (service->source,
+                                 (GSourceFunc) gimp_dbus_service_process_idle,
+                                 service,
+                                 NULL);
+          g_source_attach (service->source, NULL);
+          g_source_unref (service->source);
+
+          return G_SOURCE_REMOVE;
+        }
+      else
+        {
+          return G_SOURCE_CONTINUE;
+        }
+    }
+
+  /* Process data as a FIFO. */
+  data = g_queue_pop_head (service->queue);
+
+  if (data)
+    {
+      if (data->file)
+        file_open_from_command_line (service->gimp, data->file, data->as_new,
+                                     NULL, /* FIXME monitor */
+                                     0 /* FIXME monitor */);
+      if (data->command)
+        {
+          const gchar *commands[2] = {data->command, 0};
+
+          gimp_batch_run (service->gimp, data->interpreter,
+                          commands);
+        }
+
+      gimp_dbus_service_idle_data_free (data);
+
+      if (service->timeout_source)
+        {
+          /* Now GIMP is fully functional and can respond quickly to
+           * DBus calls. Switch to a usual idle source.
+           */
+          service->source = g_idle_source_new ();
+          service->timeout_source = FALSE;
+
+          g_source_set_priority (service->source, G_PRIORITY_LOW);
+          g_source_set_callback (service->source,
+                                 (GSourceFunc) gimp_dbus_service_process_idle,
+                                 service,
+                                 NULL);
+          g_source_attach (service->source, NULL);
+          g_source_unref (service->source);
+
+          return G_SOURCE_REMOVE;
+        }
+      else
+        {
+          return G_SOURCE_CONTINUE;
+        }
+    }
+
+  service->source = NULL;
+
+  return G_SOURCE_REMOVE;
+}
+
+static IdleData *
+gimp_dbus_service_open_data_new (GimpDBusService *service,
+                                 const gchar     *uri,
+                                 gboolean         as_new)
+{
+  IdleData *data    = g_slice_new (IdleData);
+
+  data->file        = g_file_new_for_uri (uri);
+  data->as_new      = as_new;
+  data->interpreter = NULL;
+  data->command     = NULL;
+
+  return data;
+}
+
+static IdleData *
+gimp_dbus_service_batch_data_new (GimpDBusService *service,
+                                  const gchar     *interpreter,
+                                  const gchar     *command)
+{
+  IdleData *data = g_slice_new (IdleData);
+
+  data->file     = NULL;
+  data->as_new   = FALSE;
+
+  data->command  = g_strdup (command);
+
+  if (g_strcmp0 (interpreter, "") == 0)
+    data->interpreter = NULL;
+  else
+    data->interpreter = g_strdup (interpreter);
+
+  return data;
+}
+
+static void
+gimp_dbus_service_idle_data_free (IdleData *data)
+{
+  if (data->file)
+    g_object_unref (data->file);
+
+  if (data->command)
+    g_free (data->command);
+  if (data->interpreter)
+    g_free (data->interpreter);
+
+  g_slice_free (IdleData, data);
+}
diff --git a/app/gui/gimpdbusservice.h b/app/gui/gimpdbusservice.h
new file mode 100644
index 0000000..71f1493
--- /dev/null
+++ b/app/gui/gimpdbusservice.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpDBusService
+ * Copyright (C) 2007, 2008 Sven Neumann <sven@gimp.org>
+ * Copyright (C) 2013       Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DBUS_SERVICE_H__
+#define __GIMP_DBUS_SERVICE_H__
+
+
+#include "gimpdbusservice-generated.h"
+
+/* service name and path should really be org.gimp.GIMP and
+ * /org/gimp/GIMP and only the interface be called UI.
+ */
+#define GIMP_DBUS_SERVICE_NAME   "org.gimp.GIMP.UI"
+#define GIMP_DBUS_SERVICE_PATH   "/org/gimp/GIMP/UI"
+#define GIMP_DBUS_INTERFACE_NAME "org.gimp.GIMP.UI"
+#define GIMP_DBUS_INTERFACE_PATH "/org/gimp/GIMP/UI"
+
+
+#define GIMP_TYPE_DBUS_SERVICE            (gimp_dbus_service_get_type ())
+#define GIMP_DBUS_SERVICE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DBUS_SERVICE, GimpDBusService))
+#define GIMP_DBUS_SERVICE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DBUS_SERVICE, GimpDBusServiceClass))
+#define GIMP_IS_DBUS_SERVICE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DBUS_SERVICE))
+#define GIMP_IS_DBUS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DBUS_SERVICE))
+#define GIMP_DBUS_SERVICE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DBUS_SERVICE, GimpDBusServiceClass))
+
+
+typedef struct _GimpDBusService      GimpDBusService;
+typedef struct _GimpDBusServiceClass GimpDBusServiceClass;
+
+struct _GimpDBusService
+{
+  GimpDBusServiceUISkeleton  parent_instance;
+
+  Gimp     *gimp;
+  GQueue   *queue;
+  GSource  *source;
+  gboolean  timeout_source;
+};
+
+struct _GimpDBusServiceClass
+{
+  GimpDBusServiceUISkeletonClass  parent_class;
+};
+
+
+GType     gimp_dbus_service_get_type (void) G_GNUC_CONST;
+
+GObject * gimp_dbus_service_new      (Gimp *gimp);
+
+
+#endif /* __GIMP_DBUS_SERVICE_H__ */
diff --git a/app/gui/gimpuiconfigurer.c b/app/gui/gimpuiconfigurer.c
new file mode 100644
index 0000000..dd9aa5d
--- /dev/null
+++ b/app/gui/gimpuiconfigurer.c
@@ -0,0 +1,622 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpuiconfigurer.c
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "gui-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockcolumns.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimpimagewindow.h"
+
+#include "gimpuiconfigurer.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+
+struct _GimpUIConfigurerPrivate
+{
+  Gimp *gimp;
+};
+
+
+static void              gimp_ui_configurer_set_property                (GObject           *object,
+                                                                         guint              property_id,
+                                                                         const GValue      *value,
+                                                                         GParamSpec        *pspec);
+static void              gimp_ui_configurer_get_property                (GObject           *object,
+                                                                         guint              property_id,
+                                                                         GValue            *value,
+                                                                         GParamSpec        *pspec);
+static void              gimp_ui_configurer_move_docks_to_columns       (GimpUIConfigurer  *ui_configurer,
+                                                                         GimpImageWindow   *uber_image_window);
+static void              gimp_ui_configurer_move_shells                 (GimpUIConfigurer  *ui_configurer,
+                                                                         GimpImageWindow   *source_image_window,
+                                                                         GimpImageWindow   *target_image_window);
+static void              gimp_ui_configurer_separate_docks              (GimpUIConfigurer  *ui_configurer,
+                                                                         GimpImageWindow   *source_image_window);
+static void              gimp_ui_configurer_move_docks_to_window        (GimpUIConfigurer  *ui_configurer,
+                                                                         GimpDockColumns   *dock_columns,
+                                                                         GimpAlignmentType  screen_side);
+static void              gimp_ui_configurer_separate_shells             (GimpUIConfigurer  *ui_configurer,
+                                                                         GimpImageWindow   *source_image_window);
+static void              gimp_ui_configurer_configure_for_single_window (GimpUIConfigurer  *ui_configurer);
+static void              gimp_ui_configurer_configure_for_multi_window  (GimpUIConfigurer  *ui_configurer);
+static GimpImageWindow * gimp_ui_configurer_get_uber_window             (GimpUIConfigurer  *ui_configurer);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpUIConfigurer, gimp_ui_configurer,
+                            GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_ui_configurer_parent_class
+
+
+static void
+gimp_ui_configurer_class_init (GimpUIConfigurerClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_ui_configurer_set_property;
+  object_class->get_property = gimp_ui_configurer_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_ui_configurer_init (GimpUIConfigurer *ui_configurer)
+{
+  ui_configurer->p = gimp_ui_configurer_get_instance_private (ui_configurer);
+}
+
+static void
+gimp_ui_configurer_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpUIConfigurer *ui_configurer = GIMP_UI_CONFIGURER (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      ui_configurer->p->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_ui_configurer_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpUIConfigurer *ui_configurer = GIMP_UI_CONFIGURER (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, ui_configurer->p->gimp);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+static void
+gimp_ui_configurer_get_window_center_pos (GtkWindow *window,
+                                          gint      *out_x,
+                                          gint      *out_y)
+{
+  gint x, y, w, h;
+  gtk_window_get_position (window, &x, &y);
+  gtk_window_get_size (window, &w, &h);
+
+  if (out_x)
+    *out_x = x + w / 2;
+  if (out_y)
+    *out_y = y + h / 2;
+}
+
+/**
+ * gimp_ui_configurer_get_relative_window_pos:
+ * @window_a:
+ * @window_b:
+ *
+ * Returns: At what side @window_b is relative to @window_a. Either
+ * GIMP_ALIGN_LEFT or GIMP_ALIGN_RIGHT.
+ **/
+static GimpAlignmentType
+gimp_ui_configurer_get_relative_window_pos (GtkWindow *window_a,
+                                            GtkWindow *window_b)
+{
+  gint a_x, b_x;
+
+  gimp_ui_configurer_get_window_center_pos (window_a, &a_x, NULL);
+  gimp_ui_configurer_get_window_center_pos (window_b, &b_x, NULL);
+
+  return b_x < a_x ? GIMP_ALIGN_LEFT : GIMP_ALIGN_RIGHT;
+}
+
+static void
+gimp_ui_configurer_move_docks_to_columns (GimpUIConfigurer *ui_configurer,
+                                          GimpImageWindow  *uber_image_window)
+{
+  GList *dialogs     = NULL;
+  GList *dialog_iter = NULL;
+
+  dialogs =
+    g_list_copy (gimp_dialog_factory_get_open_dialogs (gimp_dialog_factory_get_singleton ()));
+
+  for (dialog_iter = dialogs; dialog_iter; dialog_iter = dialog_iter->next)
+    {
+      GimpDockWindow    *dock_window;
+      GimpDockContainer *dock_container;
+      GimpDockColumns   *dock_columns;
+      GList             *docks;
+      GList             *dock_iter;
+
+      if (!GIMP_IS_DOCK_WINDOW (dialog_iter->data))
+        continue;
+
+      dock_window = GIMP_DOCK_WINDOW (dialog_iter->data);
+
+      /* If the dock window is on the left side of the image window,
+       * move the docks to the left side. If the dock window is on the
+       * right side, move the docks to the right side of the image
+       * window.
+       */
+      if (gimp_ui_configurer_get_relative_window_pos (GTK_WINDOW (uber_image_window),
+                                                      GTK_WINDOW (dock_window)) == GIMP_ALIGN_LEFT)
+        dock_columns = gimp_image_window_get_left_docks (uber_image_window);
+      else
+        dock_columns = gimp_image_window_get_right_docks (uber_image_window);
+
+      dock_container = GIMP_DOCK_CONTAINER (dock_window);
+      g_object_add_weak_pointer (G_OBJECT (dock_window),
+                                 (gpointer) &dock_window);
+
+      docks = gimp_dock_container_get_docks (dock_container);
+      for (dock_iter = docks; dock_iter; dock_iter = dock_iter->next)
+        {
+          GimpDock *dock = GIMP_DOCK (dock_iter->data);
+
+          /* Move the dock from the image window to the dock columns
+           * widget. Note that we need a ref while the dock is parentless
+           */
+          g_object_ref (dock);
+          gimp_dock_window_remove_dock (dock_window, dock);
+          gimp_dock_columns_add_dock (dock_columns, dock, -1);
+          g_object_unref (dock);
+        }
+      g_list_free (docks);
+
+      if (dock_window)
+        g_object_remove_weak_pointer (G_OBJECT (dock_window),
+                                      (gpointer) &dock_window);
+
+      /* Kill the window if removing the dock didn't destroy it
+       * already. This will be the case for the toolbox dock window
+       */
+      if (GTK_IS_WIDGET (dock_window))
+        {
+          guint docks_len;
+
+          docks     = gimp_dock_container_get_docks (dock_container);
+          docks_len = g_list_length (docks);
+
+          if (docks_len == 0)
+            {
+              gimp_dialog_factory_remove_dialog (gimp_dialog_factory_get_singleton (),
+                                                 GTK_WIDGET (dock_window));
+              gtk_widget_destroy (GTK_WIDGET (dock_window));
+            }
+
+          g_list_free (docks);
+        }
+    }
+
+  g_list_free (dialogs);
+}
+
+/**
+ * gimp_ui_configurer_move_shells:
+ * @ui_configurer:
+ * @source_image_window:
+ * @target_image_window:
+ *
+ * Move all display shells from one image window to the another.
+ **/
+static void
+gimp_ui_configurer_move_shells (GimpUIConfigurer  *ui_configurer,
+                                GimpImageWindow   *source_image_window,
+                                GimpImageWindow   *target_image_window)
+{
+  while (gimp_image_window_get_n_shells (source_image_window) > 0)
+    {
+      GimpDisplayShell *shell;
+
+      shell = gimp_image_window_get_shell (source_image_window, 0);
+
+      g_object_ref (shell);
+      gimp_image_window_remove_shell (source_image_window, shell);
+      gimp_image_window_add_shell (target_image_window, shell);
+      g_object_unref (shell);
+    }
+}
+
+/**
+ * gimp_ui_configurer_separate_docks:
+ * @ui_configurer:
+ * @image_window:
+ *
+ * Move out the docks from the image window.
+ **/
+static void
+gimp_ui_configurer_separate_docks (GimpUIConfigurer  *ui_configurer,
+                                   GimpImageWindow   *image_window)
+{
+  GimpDockColumns *left_docks  = NULL;
+  GimpDockColumns *right_docks = NULL;
+
+  left_docks  = gimp_image_window_get_left_docks (image_window);
+  right_docks = gimp_image_window_get_right_docks (image_window);
+
+  gimp_ui_configurer_move_docks_to_window (ui_configurer, left_docks, GIMP_ALIGN_LEFT);
+  gimp_ui_configurer_move_docks_to_window (ui_configurer, right_docks, GIMP_ALIGN_RIGHT);
+}
+
+/**
+ * gimp_ui_configurer_move_docks_to_window:
+ * @dock_columns:
+ * @screen_side: At what side of the screen the dock window should be put.
+ *
+ * Moves docks in @dock_columns into a new #GimpDockWindow and
+ * position it on the screen in a non-overlapping manner.
+ */
+static void
+gimp_ui_configurer_move_docks_to_window (GimpUIConfigurer  *ui_configurer,
+                                         GimpDockColumns   *dock_columns,
+                                         GimpAlignmentType  screen_side)
+{
+  GdkScreen     *screen;
+  gint           monitor;
+  GdkRectangle   monitor_rect;
+  GList         *docks;
+  GList         *iter;
+  gboolean       contains_toolbox = FALSE;
+  GtkWidget     *dock_window;
+  GtkAllocation  original_size;
+  gchar          geometry[32];
+
+  docks = g_list_copy (gimp_dock_columns_get_docks (dock_columns));
+  if (! docks)
+    return;
+
+  screen  = gtk_widget_get_screen (GTK_WIDGET (dock_columns));
+  monitor = gimp_widget_get_monitor (GTK_WIDGET (dock_columns));
+
+  gdk_screen_get_monitor_workarea (screen, monitor, &monitor_rect);
+
+  /* Remember the size so we can set the new dock window to the same
+   * size
+   */
+  gtk_widget_get_allocation (GTK_WIDGET (dock_columns), &original_size);
+
+  /* Do we need a toolbox window? */
+  for (iter = docks; iter; iter = g_list_next (iter))
+    {
+      GimpDock *dock = GIMP_DOCK (iter->data);
+
+      if (GIMP_IS_TOOLBOX (dock))
+        {
+          contains_toolbox = TRUE;
+          break;
+        }
+    }
+
+  /* Create a dock window to put the dock in. Checking for
+   * GIMP_IS_TOOLBOX() is kind of ugly but not a disaster. We need
+   * the dock window correctly configured if we create it for the
+   * toolbox
+   */
+  dock_window =
+    gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                    screen,
+                                    monitor,
+                                    NULL /*ui_manager*/,
+                                    (contains_toolbox ?
+                                     "gimp-toolbox-window" :
+                                     "gimp-dock-window"),
+                                    -1 /*view_size*/,
+                                    FALSE /*present*/);
+
+  for (iter = docks; iter; iter = g_list_next (iter))
+    {
+      GimpDock *dock = GIMP_DOCK (iter->data);
+
+      /* Move the dock to the window */
+      g_object_ref (dock);
+      gimp_dock_columns_remove_dock (dock_columns, dock);
+      gimp_dock_window_add_dock (GIMP_DOCK_WINDOW (dock_window), dock, -1);
+      g_object_unref (dock);
+    }
+
+  /* Position the window */
+  if (screen_side == GIMP_ALIGN_LEFT)
+    {
+      g_snprintf (geometry, sizeof (geometry), "%+d%+d",
+                  monitor_rect.x,
+                  monitor_rect.y);
+    }
+  else if (screen_side == GIMP_ALIGN_RIGHT)
+    {
+      g_snprintf (geometry, sizeof (geometry), "%+d%+d",
+                  monitor_rect.x + monitor_rect.width - original_size.width,
+                  monitor_rect.y);
+    }
+  else
+    {
+      gimp_assert_not_reached ();
+    }
+
+  gtk_window_parse_geometry (GTK_WINDOW (dock_window), geometry);
+
+  /* Try to keep the same size */
+  gtk_window_set_default_size (GTK_WINDOW (dock_window),
+                               original_size.width,
+                               original_size.height);
+
+  /* Don't forget to show the window */
+  gtk_widget_show (dock_window);
+
+  g_list_free (docks);
+}
+
+/**
+ * gimp_ui_configurer_separate_shells:
+ * @ui_configurer:
+ * @source_image_window:
+ *
+ * Create one image window per display shell and move it there.
+ **/
+static void
+gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer,
+                                    GimpImageWindow  *source_image_window)
+{
+  GimpDisplayShell *active_shell  = gimp_image_window_get_active_shell (source_image_window);
+  GimpImageWindow  *active_window = NULL;
+
+  /* The last display shell remains in its window */
+  while (gimp_image_window_get_n_shells (source_image_window) > 1)
+    {
+      GimpImageWindow  *new_image_window;
+      GimpDisplayShell *shell;
+
+      /* Create a new image window */
+      new_image_window = gimp_image_window_new (ui_configurer->p->gimp,
+                                                NULL,
+                                                gimp_dialog_factory_get_singleton (),
+                                                gtk_widget_get_screen (GTK_WIDGET (source_image_window)),
+                                                gimp_widget_get_monitor (GTK_WIDGET (source_image_window)));
+      /* Move the shell there */
+      shell = gimp_image_window_get_shell (source_image_window, 1);
+
+      if (shell == active_shell)
+        active_window = new_image_window;
+
+      g_object_ref (shell);
+      gimp_image_window_remove_shell (source_image_window, shell);
+      gimp_image_window_add_shell (new_image_window, shell);
+      g_object_unref (shell);
+
+      /* FIXME: If we don't set a size request here the window will be
+       * too small. Get rid of this hack and fix it the proper way
+       */
+      gtk_widget_set_size_request (GTK_WIDGET (new_image_window), 640, 480);
+
+      /* Show after we have added the shell */
+      gtk_widget_show (GTK_WIDGET (new_image_window));
+    }
+
+  /* If none of the shells were active, I assume the first one is. */
+  if (active_window == NULL)
+    active_window = source_image_window;
+
+  /* The active tab must stay at the top of the windows stack. */
+  gtk_window_present (GTK_WINDOW (active_window));
+}
+
+/**
+ * gimp_ui_configurer_configure_for_single_window:
+ * @ui_configurer:
+ *
+ * Move docks and display shells into a single window.
+ **/
+static void
+gimp_ui_configurer_configure_for_single_window (GimpUIConfigurer *ui_configurer)
+{
+  Gimp             *gimp              = ui_configurer->p->gimp;
+  GList            *windows           = gimp_get_image_windows (gimp);
+  GList            *iter              = NULL;
+  GimpImageWindow  *uber_image_window = NULL;
+  GimpDisplay      *active_display    = gimp_context_get_display (gimp_get_user_context (gimp));
+  GimpDisplayShell *active_shell      = gimp_display_get_shell (active_display);
+
+  /* Get and setup the window to put everything in */
+  uber_image_window = gimp_ui_configurer_get_uber_window (ui_configurer);
+
+  /* Mve docks to the left and right side of the image window */
+  gimp_ui_configurer_move_docks_to_columns (ui_configurer,
+                                            uber_image_window);
+
+  /* Move image shells from other windows to the uber image window */
+  for (iter = windows; iter; iter = g_list_next (iter))
+    {
+      GimpImageWindow *image_window = GIMP_IMAGE_WINDOW (iter->data);
+
+      /* Don't move stuff to itself */
+      if (image_window == uber_image_window)
+        continue;
+
+      /* Put the displays in the rest of the image windows into
+       * the uber image window
+       */
+      gimp_ui_configurer_move_shells (ui_configurer,
+                                      image_window,
+                                      uber_image_window);
+      /* Destroy the window */
+      gimp_image_window_destroy (image_window);
+    }
+
+  /* Ensure the context shell remains active after mode switch. */
+  gimp_image_window_set_active_shell (uber_image_window, active_shell);
+
+  g_list_free (windows);
+}
+
+/**
+ * gimp_ui_configurer_configure_for_multi_window:
+ * @ui_configurer:
+ *
+ * Moves all display shells into their own image window.
+ **/
+static void
+gimp_ui_configurer_configure_for_multi_window (GimpUIConfigurer *ui_configurer)
+{
+  Gimp  *gimp    = ui_configurer->p->gimp;
+  GList *windows = gimp_get_image_windows (gimp);
+  GList *iter    = NULL;
+
+  for (iter = windows; iter; iter = g_list_next (iter))
+    {
+      GimpImageWindow *image_window = GIMP_IMAGE_WINDOW (iter->data);
+
+      gimp_ui_configurer_separate_docks (ui_configurer, image_window);
+
+      gimp_ui_configurer_separate_shells (ui_configurer, image_window);
+    }
+
+  g_list_free (windows);
+}
+
+/**
+ * gimp_ui_configurer_get_uber_window:
+ * @ui_configurer:
+ *
+ * Returns: The window to be used as the main window for single-window
+ *          mode.
+ **/
+static GimpImageWindow *
+gimp_ui_configurer_get_uber_window (GimpUIConfigurer *ui_configurer)
+{
+  Gimp             *gimp         = ui_configurer->p->gimp;
+  GimpDisplay      *display      = gimp_get_display_iter (gimp)->data;
+  GimpDisplayShell *shell        = gimp_display_get_shell (display);
+  GimpImageWindow  *image_window = gimp_display_shell_get_window (shell);
+
+  return image_window;
+}
+
+/**
+ * gimp_ui_configurer_update_appearance:
+ * @ui_configurer:
+ *
+ * Updates the appearance of all shells in all image windows, so they
+ * do whatever they deem necessary to fit the new UI mode mode.
+ **/
+static void
+gimp_ui_configurer_update_appearance (GimpUIConfigurer *ui_configurer)
+{
+  Gimp  *gimp    = ui_configurer->p->gimp;
+  GList *windows = gimp_get_image_windows (gimp);
+  GList *list;
+
+  for (list = windows; list; list = g_list_next (list))
+    {
+      GimpImageWindow *image_window = GIMP_IMAGE_WINDOW (list->data);
+      gint             n_shells;
+      gint             i;
+
+      n_shells = gimp_image_window_get_n_shells (image_window);
+
+      for (i = 0; i < n_shells; i++)
+        {
+          GimpDisplayShell *shell;
+
+          shell = gimp_image_window_get_shell (image_window, i);
+
+          gimp_display_shell_appearance_update (shell);
+        }
+    }
+
+  g_list_free (windows);
+}
+
+/**
+ * gimp_ui_configurer_configure:
+ * @ui_configurer:
+ * @single_window_mode:
+ *
+ * Configure the UI.
+ **/
+void
+gimp_ui_configurer_configure (GimpUIConfigurer *ui_configurer,
+                              gboolean          single_window_mode)
+{
+  if (single_window_mode)
+    gimp_ui_configurer_configure_for_single_window (ui_configurer);
+  else
+    gimp_ui_configurer_configure_for_multi_window (ui_configurer);
+
+  gimp_ui_configurer_update_appearance (ui_configurer);
+}
diff --git a/app/gui/gimpuiconfigurer.h b/app/gui/gimpuiconfigurer.h
new file mode 100644
index 0000000..db22ffc
--- /dev/null
+++ b/app/gui/gimpuiconfigurer.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpuiconfigurer.h
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UI_CONFIGURER_H__
+#define __GIMP_UI_CONFIGURER_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_UI_CONFIGURER              (gimp_ui_configurer_get_type ())
+#define GIMP_UI_CONFIGURER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UI_CONFIGURER, GimpUIConfigurer))
+#define GIMP_UI_CONFIGURER_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GIMP_TYPE_UI_CONFIGURER, GimpUIConfigurerClass))
+#define GIMP_IS_UI_CONFIGURER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UI_CONFIGURER))
+#define GIMP_IS_UI_CONFIGURER_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GIMP_TYPE_UI_CONFIGURER))
+#define GIMP_UI_CONFIGURER_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((inst), GIMP_TYPE_UI_CONFIGURER, GimpUIConfigurerClass))
+
+
+typedef struct _GimpUIConfigurerClass   GimpUIConfigurerClass;
+typedef struct _GimpUIConfigurerPrivate GimpUIConfigurerPrivate;
+
+struct _GimpUIConfigurer
+{
+  GimpObject parent_instance;
+
+  GimpUIConfigurerPrivate *p;
+};
+
+struct _GimpUIConfigurerClass
+{
+  GimpObjectClass parent_class;
+};
+
+
+GType         gimp_ui_configurer_get_type  (void) G_GNUC_CONST;
+void          gimp_ui_configurer_configure (GimpUIConfigurer *ui_configurer,
+                                            gboolean          single_window_mode);
+
+
+#endif  /* __GIMP_UI_CONFIGURER_H__ */
diff --git a/app/gui/gui-message.c b/app/gui/gui-message.c
new file mode 100644
index 0000000..90e6314
--- /dev/null
+++ b/app/gui/gui-message.c
@@ -0,0 +1,501 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "gui-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpprogress.h"
+
+#include "plug-in/gimpplugin.h"
+
+#include "widgets/gimpcriticaldialog.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimperrorconsole.h"
+#include "widgets/gimperrordialog.h"
+#include "widgets/gimpprogressdialog.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "about.h"
+
+#include "gui-message.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_TRACES 3
+#define MAX_ERRORS 10
+
+
+typedef struct
+{
+  Gimp                *gimp;
+  gchar               *domain;
+  gchar               *message;
+  gchar               *trace;
+  GObject             *handler;
+  GimpMessageSeverity  severity;
+} GimpLogMessageData;
+
+
+static gboolean  gui_message_idle           (gpointer             user_data);
+static gboolean  gui_message_error_console  (Gimp                *gimp,
+                                             GimpMessageSeverity  severity,
+                                             const gchar         *domain,
+                                             const gchar         *message);
+static gboolean  gui_message_error_dialog   (Gimp                *gimp,
+                                             GObject             *handler,
+                                             GimpMessageSeverity  severity,
+                                             const gchar         *domain,
+                                             const gchar         *message,
+                                             const gchar         *trace);
+static void      gui_message_console        (GimpMessageSeverity  severity,
+                                             const gchar         *domain,
+                                             const gchar         *message);
+static gchar *   gui_message_format         (GimpMessageSeverity  severity,
+                                             const gchar         *domain,
+                                             const gchar         *message);
+
+static GtkWidget * global_error_dialog      (void);
+static GtkWidget * global_critical_dialog   (void);
+
+static void        gui_message_reset_errors (GObject             *object,
+                                             gpointer             user_data);
+
+
+static GMutex mutex;
+static gint   n_traces = 0;
+static gint   n_errors = 0;
+
+
+void
+gui_message (Gimp                *gimp,
+             GObject             *handler,
+             GimpMessageSeverity  severity,
+             const gchar         *domain,
+             const gchar         *message)
+{
+  gchar    *trace     = NULL;
+  gboolean  gen_trace = FALSE;
+
+  switch (gimp->message_handler)
+    {
+    case GIMP_ERROR_CONSOLE:
+      if (gui_message_error_console (gimp, severity, domain, message))
+        return;
+
+      gimp->message_handler = GIMP_MESSAGE_BOX;
+      /*  fallthru  */
+
+    case GIMP_MESSAGE_BOX:
+      if (severity >= GIMP_MESSAGE_BUG_WARNING)
+        {
+          g_mutex_lock (&mutex);
+          /* Trace creation can be time consuming so don't block the
+           * mutex for too long and only increment and set a boolean
+           * here.
+           */
+          if (n_traces < MAX_TRACES)
+            {
+              gen_trace = TRUE;
+              n_traces++;
+            }
+          g_mutex_unlock (&mutex);
+        }
+
+      if (gen_trace)
+        {
+          /* We need to create the trace here because for multi-thread
+           * errors (i.e. non-GIMP ones), the backtrace after a idle
+           * function will simply be useless. It needs to happen in the
+           * buggy thread to be meaningful.
+           */
+          gimp_stack_trace_print (NULL, NULL, &trace);
+        }
+
+      if (g_strcmp0 (GIMP_ACRONYM, domain) != 0)
+        {
+          /* Handle non-GIMP messages in a multi-thread safe way,
+           * because we can't know for sure whether the log message may
+           * not have been called from a thread other than the main one.
+           */
+          GimpLogMessageData *data;
+
+          data = g_new0 (GimpLogMessageData, 1);
+          data->gimp     = gimp;
+          data->domain   = g_strdup (domain);
+          data->message  = g_strdup (message);
+          data->trace    = trace;
+          data->handler  = handler? g_object_ref (handler) : NULL;
+          data->severity = severity;
+
+          gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
+                                     gui_message_idle,
+                                     data, g_free);
+          return;
+        }
+      if (gui_message_error_dialog (gimp, handler, severity,
+                                    domain, message, trace))
+        break;
+
+      gimp->message_handler = GIMP_CONSOLE;
+      /*  fallthru  */
+
+    case GIMP_CONSOLE:
+      gui_message_console (severity, domain, message);
+      break;
+    }
+  if (trace)
+    g_free (trace);
+}
+
+static gboolean
+gui_message_idle (gpointer user_data)
+{
+  GimpLogMessageData *data = (GimpLogMessageData *) user_data;
+
+  if (! gui_message_error_dialog (data->gimp,
+                                  data->handler,
+                                  data->severity,
+                                  data->domain,
+                                  data->message,
+                                  data->trace))
+    {
+      gui_message_console (data->severity,
+                           data->domain,
+                           data->message);
+    }
+  g_free (data->domain);
+  g_free (data->message);
+  if (data->trace)
+    g_free (data->trace);
+  if (data->handler)
+    g_object_unref (data->handler);
+
+  return FALSE;
+}
+
+static gboolean
+gui_message_error_console (Gimp                *gimp,
+                           GimpMessageSeverity  severity,
+                           const gchar         *domain,
+                           const gchar         *message)
+{
+  GtkWidget *dockable;
+
+  dockable = gimp_dialog_factory_find_widget (gimp_dialog_factory_get_singleton (),
+                                              "gimp-error-console");
+
+  /* avoid raising the error console for unhighlighted messages */
+  if (dockable)
+    {
+      GtkWidget *child = gtk_bin_get_child (GTK_BIN (dockable));
+
+      if (GIMP_ERROR_CONSOLE (child)->highlight[severity])
+        dockable = NULL;
+    }
+
+  if (! dockable)
+    {
+      GdkScreen *screen;
+      gint       monitor;
+
+      monitor = gimp_get_monitor_at_pointer (&screen);
+
+      dockable =
+        gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)),
+                                                   gimp,
+                                                   gimp_dialog_factory_get_singleton (),
+                                                   screen, monitor,
+                                                   "gimp-error-console");
+    }
+
+  if (dockable)
+    {
+      GtkWidget *child = gtk_bin_get_child (GTK_BIN (dockable));
+
+      gimp_error_console_add (GIMP_ERROR_CONSOLE (child),
+                              severity, domain, message);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+progress_error_dialog_unset (GimpProgress *progress)
+{
+  g_object_set_data (G_OBJECT (progress), "gimp-error-dialog", NULL);
+}
+
+static GtkWidget *
+progress_error_dialog (GimpProgress *progress)
+{
+  GtkWidget *dialog;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), NULL);
+
+  dialog = g_object_get_data (G_OBJECT (progress), "gimp-error-dialog");
+
+  if (! dialog)
+    {
+      dialog = gimp_error_dialog_new (_("GIMP Message"));
+
+      g_object_set_data (G_OBJECT (progress), "gimp-error-dialog", dialog);
+
+      g_signal_connect_object (dialog, "destroy",
+                               G_CALLBACK (progress_error_dialog_unset),
+                               progress, G_CONNECT_SWAPPED);
+
+      if (GTK_IS_WIDGET (progress))
+        {
+          GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (progress));
+
+          if (GTK_IS_WINDOW (toplevel))
+            gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                          GTK_WINDOW (toplevel));
+        }
+      else
+        {
+          guint32 window_id = gimp_progress_get_window_id (progress);
+
+          if (window_id)
+            gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
+        }
+    }
+
+  return dialog;
+}
+
+static gboolean
+gui_message_error_dialog (Gimp                *gimp,
+                          GObject             *handler,
+                          GimpMessageSeverity  severity,
+                          const gchar         *domain,
+                          const gchar         *message,
+                          const gchar         *trace)
+{
+  GtkWidget      *dialog;
+  GtkMessageType  type   = GTK_MESSAGE_ERROR;
+
+  switch (severity)
+    {
+    case GIMP_MESSAGE_INFO:
+      type = GTK_MESSAGE_INFO;
+      break;
+    case GIMP_MESSAGE_WARNING:
+      type = GTK_MESSAGE_WARNING;
+      break;
+    case GIMP_MESSAGE_ERROR:
+      type = GTK_MESSAGE_ERROR;
+      break;
+    case GIMP_MESSAGE_BUG_WARNING:
+    case GIMP_MESSAGE_BUG_CRITICAL:
+      type = GTK_MESSAGE_OTHER;
+      break;
+    }
+
+  if (severity >= GIMP_MESSAGE_BUG_WARNING)
+    {
+      /* Process differently programming errors.
+       * The reason is that we will generate traces, which will take
+       * significant place, and cannot be processed as a progress
+       * message or in the global dialog. It will require its own
+       * dedicated dialog which will encourage people to report the bug.
+       */
+      gboolean gui_error = FALSE;
+
+      g_mutex_lock (&mutex);
+      if (n_errors < MAX_ERRORS)
+        {
+          gui_error = TRUE;
+          n_errors++;
+        }
+      g_mutex_unlock (&mutex);
+
+      if (gui_error || trace)
+        {
+          gchar *text;
+
+          dialog = global_critical_dialog ();
+
+          text = gui_message_format (severity, domain, message);
+          gimp_critical_dialog_add (dialog, text, trace, FALSE, NULL, 0);
+
+          gtk_widget_show (dialog);
+
+          g_free (text);
+
+          return TRUE;
+        }
+      else
+        {
+          const gchar *reason = "Message";
+
+          gimp_enum_get_value (GIMP_TYPE_MESSAGE_SEVERITY, severity,
+                               NULL, NULL, &reason, NULL);
+
+          /* Since we overridden glib default's WARNING and CRITICAL
+           * handler, if we decide not to handle this error in the end,
+           * let's just print it in terminal in a similar fashion as
+           * glib's default handler (though without the fancy terminal
+           * colors right now).
+           */
+          g_printerr ("%s-%s: %s\n", domain, reason, message);
+
+          return TRUE;
+        }
+    }
+  else if (GIMP_IS_PROGRESS (handler))
+    {
+      /* If there's already an error dialog associated with this
+       * progress, then continue without trying gimp_progress_message().
+       */
+      if (! g_object_get_data (handler, "gimp-error-dialog") &&
+          gimp_progress_message (GIMP_PROGRESS (handler), gimp,
+                                 severity, domain, message))
+        {
+          return TRUE;
+        }
+    }
+  else if (GTK_IS_WIDGET (handler))
+    {
+      GtkWidget *parent = GTK_WIDGET (handler);
+
+      dialog =
+        gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)),
+                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                type, GTK_BUTTONS_OK,
+                                "%s", message);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_widget_destroy),
+                        NULL);
+
+      gtk_widget_show (dialog);
+
+      return TRUE;
+    }
+
+  if (GIMP_IS_PROGRESS (handler) && ! GIMP_IS_PROGRESS_DIALOG (handler))
+    dialog = progress_error_dialog (GIMP_PROGRESS (handler));
+  else
+    dialog = global_error_dialog ();
+
+  if (dialog)
+    {
+      gimp_error_dialog_add (GIMP_ERROR_DIALOG (dialog),
+                             gimp_get_message_icon_name (severity),
+                             domain, message);
+      gtk_window_present (GTK_WINDOW (dialog));
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gui_message_console (GimpMessageSeverity  severity,
+                     const gchar         *domain,
+                     const gchar         *message)
+{
+  gchar *formatted_message;
+
+  formatted_message = gui_message_format (severity, domain, message);
+  g_printerr ("%s\n\n", formatted_message);
+  g_free (formatted_message);
+}
+
+static gchar *
+gui_message_format (GimpMessageSeverity  severity,
+                    const gchar         *domain,
+                    const gchar         *message)
+{
+  const gchar *desc = "Message";
+  gchar       *formatted_message;
+
+  gimp_enum_get_value (GIMP_TYPE_MESSAGE_SEVERITY, severity,
+                       NULL, NULL, &desc, NULL);
+
+  formatted_message = g_strdup_printf ("%s-%s: %s", domain, desc, message);
+
+  return formatted_message;
+}
+
+static GtkWidget *
+global_error_dialog (void)
+{
+  GdkScreen *screen;
+  gint       monitor;
+
+  monitor = gimp_get_monitor_at_pointer (&screen);
+
+  return gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                         screen, monitor,
+                                         NULL /*ui_manager*/,
+                                         "gimp-error-dialog", -1,
+                                         FALSE);
+}
+
+static GtkWidget *
+global_critical_dialog (void)
+{
+  GtkWidget *dialog;
+  GdkScreen *screen;
+  gint       monitor;
+
+  monitor = gimp_get_monitor_at_pointer (&screen);
+
+  dialog = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                           screen, monitor,
+                                           NULL /*ui_manager*/,
+                                           "gimp-critical-dialog", -1,
+                                           FALSE);
+  g_signal_handlers_disconnect_by_func (dialog,
+                                        gui_message_reset_errors,
+                                        NULL);
+  g_signal_connect (dialog, "destroy",
+                    G_CALLBACK (gui_message_reset_errors),
+                    NULL);
+  return dialog;
+}
+
+static void
+gui_message_reset_errors (GObject  *object,
+                          gpointer  user_data)
+{
+  g_mutex_lock (&mutex);
+  n_errors = 0;
+  n_traces = 0;
+  g_mutex_unlock (&mutex);
+}
diff --git a/app/gui/gui-message.h b/app/gui/gui-message.h
new file mode 100644
index 0000000..e866f2a
--- /dev/null
+++ b/app/gui/gui-message.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GUI_MESSAGE_H__
+#define __GUI_MESSAGE_H__
+
+
+void gui_message (Gimp                *gimp,
+                  GObject             *handler,
+                  GimpMessageSeverity  severity,
+                  const gchar         *domain,
+                  const gchar         *message);
+
+
+#endif /* __GUI_VTABLE_H__ */
diff --git a/app/gui/gui-types.h b/app/gui/gui-types.h
new file mode 100644
index 0000000..82e9f20
--- /dev/null
+++ b/app/gui/gui-types.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GUI_TYPES_H__
+#define __GUI_TYPES_H__
+
+
+#include "tools/tools-types.h"
+#include "dialogs/dialogs-types.h"
+#include "menus/menus-types.h"
+
+
+#endif /* __GUI_TYPES_H__ */
diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c
new file mode 100644
index 0000000..c54a05b
--- /dev/null
+++ b/app/gui/gui-unique.c
@@ -0,0 +1,442 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+#import <AppKit/AppKit.h>
+#include <gtkosxapplication.h>
+#endif
+
+#include "gui/gui-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
+
+#include "file/file-open.h"
+
+#include "gimpdbusservice.h"
+#include "gui-unique.h"
+
+
+#ifdef G_OS_WIN32
+
+static void  gui_unique_win32_init (Gimp *gimp);
+static void  gui_unique_win32_exit (void);
+
+static Gimp *unique_gimp  = NULL;
+static HWND  proxy_window = NULL;
+
+#elif defined (GDK_WINDOWING_QUARTZ)
+
+static void gui_unique_quartz_init (Gimp *gimp);
+static void gui_unique_quartz_exit (void);
+
+@interface GimpAppleEventHandler : NSObject {}
+- (void) handleEvent:(NSAppleEventDescriptor *) inEvent
+        andReplyWith:(NSAppleEventDescriptor *) replyEvent;
+@end
+
+static Gimp                   *unique_gimp   = NULL;
+static GimpAppleEventHandler  *event_handler = NULL;
+
+#else
+
+static void  gui_dbus_service_init (Gimp *gimp);
+static void  gui_dbus_service_exit (void);
+
+static GDBusObjectManagerServer *dbus_manager = NULL;
+static guint                     dbus_name_id = 0;
+
+#endif
+
+
+void
+gui_unique_init (Gimp *gimp)
+{
+#ifdef G_OS_WIN32
+  gui_unique_win32_init (gimp);
+#elif defined (GDK_WINDOWING_QUARTZ)
+  gui_unique_quartz_init (gimp);
+#else
+  gui_dbus_service_init (gimp);
+#endif
+}
+
+void
+gui_unique_exit (void)
+{
+#ifdef G_OS_WIN32
+  gui_unique_win32_exit ();
+#elif defined (GDK_WINDOWING_QUARTZ)
+  gui_unique_quartz_exit ();
+#else
+  gui_dbus_service_exit ();
+#endif
+}
+
+
+#ifdef G_OS_WIN32
+
+typedef struct
+{
+  GFile    *file;
+  gboolean  as_new;
+} IdleOpenData;
+
+static IdleOpenData *
+idle_open_data_new (GFile    *file,
+                    gboolean  as_new)
+{
+  IdleOpenData *data = g_slice_new0 (IdleOpenData);
+
+  data->file   = g_object_ref (file);
+  data->as_new = as_new;
+
+  return data;
+}
+
+static void
+idle_open_data_free (IdleOpenData *data)
+{
+  g_object_unref (data->file);
+  g_slice_free (IdleOpenData, data);
+}
+
+static gboolean
+gui_unique_win32_idle_open (IdleOpenData *data)
+{
+  /*  We want to be called again later in case that GIMP is not fully
+   *  started yet.
+   */
+  if (! gimp_is_restored (unique_gimp))
+    return TRUE;
+
+  if (data->file)
+    {
+      file_open_from_command_line (unique_gimp, data->file,
+                                   data->as_new, NULL, 0);
+    }
+  else
+    {
+      /*  raise the first display  */
+      GimpObject *display;
+
+      display = gimp_container_get_first_child (unique_gimp->displays);
+
+      gimp_display_shell_present (gimp_display_get_shell (GIMP_DISPLAY (display)));
+    }
+
+  return FALSE;
+}
+
+static LRESULT CALLBACK
+gui_unique_win32_message_handler (HWND   hWnd,
+                                  UINT   uMsg,
+                                  WPARAM wParam,
+                                  LPARAM lParam)
+{
+  switch (uMsg)
+    {
+    case WM_COPYDATA:
+      if (unique_gimp)
+        {
+          COPYDATASTRUCT *copydata = (COPYDATASTRUCT *) lParam;
+          GimpObject     *display;
+
+          if (copydata->cbData > 0)
+            {
+              GSource        *source;
+              GClosure       *closure;
+              GFile          *file;
+              IdleOpenData   *data;
+
+              file = g_file_new_for_uri (copydata->lpData);
+
+              data = idle_open_data_new (file,
+                                         copydata->dwData != 0);
+
+              g_object_unref (file);
+
+              closure = g_cclosure_new (G_CALLBACK (gui_unique_win32_idle_open),
+                                        data,
+                                        (GClosureNotify) idle_open_data_free);
+
+              g_object_watch_closure (G_OBJECT (unique_gimp), closure);
+
+              source = g_idle_source_new ();
+              g_source_set_priority (source, G_PRIORITY_LOW);
+              g_source_set_closure (source, closure);
+              g_source_attach (source, NULL);
+              g_source_unref (source);
+            }
+
+          /* Deiconify the window if minimized. */
+          display = gimp_container_get_first_child (unique_gimp->displays);
+          if (display)
+            gimp_display_shell_present (gimp_display_get_shell (GIMP_DISPLAY (display)));
+        }
+      return TRUE;
+
+    default:
+      return DefWindowProcW (hWnd, uMsg, wParam, lParam);
+    }
+}
+
+static void
+gui_unique_win32_init (Gimp *gimp)
+{
+  WNDCLASSW wc;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (unique_gimp == NULL);
+
+  unique_gimp = gimp;
+
+  /* register window class for proxy window */
+  memset (&wc, 0, sizeof (wc));
+
+  wc.hInstance     = GetModuleHandle (NULL);
+  wc.lpfnWndProc   = gui_unique_win32_message_handler;
+  wc.lpszClassName = GIMP_UNIQUE_WIN32_WINDOW_CLASS;
+
+  RegisterClassW (&wc);
+
+  proxy_window = CreateWindowExW (0,
+                                  GIMP_UNIQUE_WIN32_WINDOW_CLASS,
+                                  GIMP_UNIQUE_WIN32_WINDOW_NAME,
+                                  WS_POPUP, 0, 0, 1, 1, NULL, NULL, wc.hInstance, NULL);
+}
+
+static void
+gui_unique_win32_exit (void)
+{
+  g_return_if_fail (GIMP_IS_GIMP (unique_gimp));
+
+  unique_gimp = NULL;
+
+  DestroyWindow (proxy_window);
+}
+
+#elif defined (GDK_WINDOWING_QUARTZ)
+
+static gboolean
+gui_unique_quartz_idle_open (GFile *file)
+{
+  /*  We want to be called again later in case that GIMP is not fully
+   *  started yet.
+   */
+  if (! gimp_is_restored (unique_gimp))
+    return TRUE;
+
+  if (file)
+    {
+      file_open_from_command_line (unique_gimp, file, FALSE, NULL, 0);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gui_unique_quartz_nsopen_file_callback (GtkosxApplication *osx_app,
+                                        gchar             *path,
+                                        gpointer           user_data)
+{
+  GSource  *source;
+  GClosure *closure;
+
+  closure = g_cclosure_new (G_CALLBACK (gui_unique_quartz_idle_open),
+                            g_file_new_for_path (path),
+                            (GClosureNotify) g_object_unref);
+
+  g_object_watch_closure (G_OBJECT (unique_gimp), closure);
+
+  source = g_idle_source_new ();
+
+  g_source_set_priority (source, G_PRIORITY_LOW);
+  g_source_set_closure (source, closure);
+  g_source_attach (source, NULL);
+  g_source_unref (source);
+
+  return TRUE;
+}
+
+@implementation GimpAppleEventHandler
+- (void) handleEvent: (NSAppleEventDescriptor *) inEvent
+        andReplyWith: (NSAppleEventDescriptor *) replyEvent
+{
+  NSAutoreleasePool *urlpool;
+  NSInteger          count;
+  NSInteger          i;
+
+  urlpool = [[NSAutoreleasePool alloc] init];
+
+  count = [inEvent numberOfItems];
+
+  for (i = 1; i <= count; i++)
+    {
+      NSURL       *url;
+      const gchar *path;
+      GSource     *source;
+      GClosure    *closure;
+
+      url = [NSURL URLWithString: [[inEvent descriptorAtIndex: i] stringValue]];
+      path = [[url path] UTF8String];
+
+      closure = g_cclosure_new (G_CALLBACK (gui_unique_quartz_idle_open),
+                                g_file_new_for_path (path),
+                                (GClosureNotify) g_object_unref);
+
+      g_object_watch_closure (G_OBJECT (unique_gimp), closure);
+
+      source = g_idle_source_new ();
+      g_source_set_priority (source, G_PRIORITY_LOW);
+      g_source_set_closure (source, closure);
+      g_source_attach (source, NULL);
+      g_source_unref (source);
+    }
+
+  [urlpool drain];
+}
+@end
+
+static void
+gui_unique_quartz_init (Gimp *gimp)
+{
+  GtkosxApplication *osx_app;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (unique_gimp == NULL);
+
+  osx_app = gtkosx_application_get ();
+
+  unique_gimp = gimp;
+
+  g_signal_connect (osx_app, "NSApplicationOpenFile",
+                    G_CALLBACK (gui_unique_quartz_nsopen_file_callback),
+                    gimp);
+
+  /* Using the event handler is a hack, it is necessary because
+   * gtkosx_application will drop the file open events if any
+   * event processing is done before gtkosx_application_ready is
+   * called, which we unfortuantly can't avoid doing right now.
+   */
+  event_handler = [[GimpAppleEventHandler alloc] init];
+
+  [[NSAppleEventManager sharedAppleEventManager]
+      setEventHandler: event_handler
+          andSelector: @selector (handleEvent: andReplyWith:)
+        forEventClass: kCoreEventClass
+           andEventID: kAEOpenDocuments];
+}
+
+static void
+gui_unique_quartz_exit (void)
+{
+  g_return_if_fail (GIMP_IS_GIMP (unique_gimp));
+
+  unique_gimp = NULL;
+
+  [[NSAppleEventManager sharedAppleEventManager]
+      removeEventHandlerForEventClass: kCoreEventClass
+                           andEventID: kAEOpenDocuments];
+
+  [event_handler release];
+
+  event_handler = NULL;
+}
+
+#else
+
+static void
+gui_dbus_bus_acquired (GDBusConnection *connection,
+                       const gchar     *name,
+                       Gimp            *gimp)
+{
+  GDBusObjectSkeleton *object;
+  GObject             *service;
+
+  /* this should use GIMP_DBUS_SERVICE_PATH, but that's historically wrong */
+  dbus_manager = g_dbus_object_manager_server_new ("/org/gimp/GIMP");
+
+  object = g_dbus_object_skeleton_new (GIMP_DBUS_INTERFACE_PATH);
+
+  service = gimp_dbus_service_new (gimp);
+  g_dbus_object_skeleton_add_interface (object,
+                                        G_DBUS_INTERFACE_SKELETON (service));
+  g_object_unref (service);
+
+  g_dbus_object_manager_server_export (dbus_manager, object);
+  g_object_unref (object);
+
+  g_dbus_object_manager_server_set_connection (dbus_manager, connection);
+}
+
+static void
+gui_dbus_name_acquired (GDBusConnection *connection,
+                        const gchar     *name,
+                        Gimp            *gimp)
+{
+}
+
+static void
+gui_dbus_name_lost (GDBusConnection *connection,
+                    const gchar     *name,
+                    Gimp            *gimp)
+{
+  if (connection == NULL)
+    g_printerr ("%s: connection to the bus cannot be established.\n",
+                G_STRFUNC);
+  else
+    g_printerr ("%s: the name \"%s\" could not be acquired on the bus.\n",
+                G_STRFUNC, name);
+}
+
+static void
+gui_dbus_service_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (dbus_name_id == 0);
+
+  dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                                 GIMP_DBUS_SERVICE_NAME,
+                                 G_BUS_NAME_OWNER_FLAGS_NONE,
+                                 (GBusAcquiredCallback) gui_dbus_bus_acquired,
+                                 (GBusNameAcquiredCallback) gui_dbus_name_acquired,
+                                 (GBusNameLostCallback) gui_dbus_name_lost,
+                                 gimp, NULL);
+}
+
+static void
+gui_dbus_service_exit (void)
+{
+  g_bus_unown_name (dbus_name_id);
+  g_clear_object (&dbus_manager);
+}
+
+#endif
diff --git a/app/gui/gui-unique.h b/app/gui/gui-unique.h
new file mode 100644
index 0000000..73b9231
--- /dev/null
+++ b/app/gui/gui-unique.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GUI_UNIQUE_H__
+#define __GUI_UNIQUE_H__
+
+#ifdef G_OS_WIN32
+#define GIMP_UNIQUE_WIN32_WINDOW_CLASS  L"GimpWin32UniqueHandler"
+#define GIMP_UNIQUE_WIN32_WINDOW_NAME   L"GimpProxy"
+#endif
+
+
+void  gui_unique_init (Gimp *gimp);
+void  gui_unique_exit (void);
+
+
+#endif /* __GUI_UNIQUE_H__ */
diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
new file mode 100644
index 0000000..28c999a
--- /dev/null
+++ b/app/gui/gui-vtable.c
@@ -0,0 +1,934 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <errno.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <fcntl.h>
+#include <io.h>
+
+#ifndef pipe
+#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
+#endif
+#else
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <unistd.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "gui-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-parallel.h"
+#include "core/gimp-spawn.h"
+#include "core/gimp-utils.h"
+#include "core/gimpasync.h"
+#include "core/gimpbrush.h"
+#include "core/gimpcancelable.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+#include "core/gimplist.h"
+#include "core/gimppalette.h"
+#include "core/gimppattern.h"
+#include "core/gimpprogress.h"
+#include "core/gimpwaitable.h"
+
+#include "text/gimpfont.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimpprocedure.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpbrushselect.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpfontselect.h"
+#include "widgets/gimpgradientselect.h"
+#include "widgets/gimphelp.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimppaletteselect.h"
+#include "widgets/gimppatternselect.h"
+#include "widgets/gimpprogressdialog.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplay-foreach.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpsinglewindowstrategy.h"
+#include "display/gimpmultiwindowstrategy.h"
+
+#include "actions/plug-in-actions.h"
+
+#include "menus/menus.h"
+
+#include "dialogs/color-profile-import-dialog.h"
+
+#include "gui.h"
+#include "gui-message.h"
+#include "gui-vtable.h"
+#include "icon-themes.h"
+#include "themes.h"
+
+
+/*  local function prototypes  */
+
+static void           gui_ungrab                 (Gimp                *gimp);
+
+static void           gui_threads_enter          (Gimp                *gimp);
+static void           gui_threads_leave          (Gimp                *gimp);
+
+static void           gui_set_busy               (Gimp                *gimp);
+static void           gui_unset_busy             (Gimp                *gimp);
+
+static void           gui_help                   (Gimp                *gimp,
+                                                  GimpProgress        *progress,
+                                                  const gchar         *help_domain,
+                                                  const gchar         *help_id);
+static const gchar  * gui_get_program_class      (Gimp                *gimp);
+static gchar        * gui_get_display_name       (Gimp                *gimp,
+                                                  gint                 display_ID,
+                                                  GObject            **screen,
+                                                  gint                *monitor);
+static guint32        gui_get_user_time          (Gimp                *gimp);
+static GFile        * gui_get_theme_dir          (Gimp                *gimp);
+static GFile        * gui_get_icon_theme_dir     (Gimp                *gimp);
+static GimpObject   * gui_get_window_strategy    (Gimp                *gimp);
+static GimpObject   * gui_get_empty_display      (Gimp                *gimp);
+static GimpObject   * gui_display_get_by_ID      (Gimp                *gimp,
+                                                  gint                 ID);
+static gint           gui_display_get_ID         (GimpObject          *display);
+static guint32        gui_display_get_window_id  (GimpObject          *display);
+static GimpObject   * gui_display_create         (Gimp                *gimp,
+                                                  GimpImage           *image,
+                                                  GimpUnit             unit,
+                                                  gdouble              scale,
+                                                  GObject             *screen,
+                                                  gint                 monitor);
+static void           gui_display_delete         (GimpObject          *display);
+static void           gui_displays_reconnect     (Gimp                *gimp,
+                                                  GimpImage           *old_image,
+                                                  GimpImage           *new_image);
+static gboolean       gui_wait                   (Gimp                *gimp,
+                                                  GimpWaitable        *waitable,
+                                                  const gchar         *message);
+static GimpProgress * gui_new_progress           (Gimp                *gimp,
+                                                  GimpObject          *display);
+static void           gui_free_progress          (Gimp                *gimp,
+                                                  GimpProgress        *progress);
+static gboolean       gui_pdb_dialog_new         (Gimp                *gimp,
+                                                  GimpContext         *context,
+                                                  GimpProgress        *progress,
+                                                  GimpContainer       *container,
+                                                  const gchar         *title,
+                                                  const gchar         *callback_name,
+                                                  const gchar         *object_name,
+                                                  va_list              args);
+static gboolean       gui_pdb_dialog_set         (Gimp                *gimp,
+                                                  GimpContainer       *container,
+                                                  const gchar         *callback_name,
+                                                  const gchar         *object_name,
+                                                  va_list              args);
+static gboolean       gui_pdb_dialog_close       (Gimp                *gimp,
+                                                  GimpContainer       *container,
+                                                  const gchar         *callback_name);
+static gboolean       gui_recent_list_add_file   (Gimp                *gimp,
+                                                  GFile               *file,
+                                                  const gchar         *mime_type);
+static void           gui_recent_list_load       (Gimp                *gimp);
+
+static GMountOperation
+                    * gui_get_mount_operation    (Gimp                *gimp,
+                                                  GimpProgress        *progress);
+
+static GimpColorProfilePolicy
+                      gui_query_profile_policy   (Gimp                *gimp,
+                                                  GimpImage           *image,
+                                                  GimpContext         *context,
+                                                  GimpColorProfile   **dest_profile,
+                                                  GimpColorRenderingIntent *intent,
+                                                  gboolean            *bpc,
+                                                  gboolean            *dont_ask);
+
+
+/*  public functions  */
+
+void
+gui_vtable_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp->gui.ungrab                 = gui_ungrab;
+  gimp->gui.threads_enter          = gui_threads_enter;
+  gimp->gui.threads_leave          = gui_threads_leave;
+  gimp->gui.set_busy               = gui_set_busy;
+  gimp->gui.unset_busy             = gui_unset_busy;
+  gimp->gui.show_message           = gui_message;
+  gimp->gui.help                   = gui_help;
+  gimp->gui.get_program_class      = gui_get_program_class;
+  gimp->gui.get_display_name       = gui_get_display_name;
+  gimp->gui.get_user_time          = gui_get_user_time;
+  gimp->gui.get_theme_dir          = gui_get_theme_dir;
+  gimp->gui.get_icon_theme_dir     = gui_get_icon_theme_dir;
+  gimp->gui.get_window_strategy    = gui_get_window_strategy;
+  gimp->gui.get_empty_display      = gui_get_empty_display;
+  gimp->gui.display_get_by_id      = gui_display_get_by_ID;
+  gimp->gui.display_get_id         = gui_display_get_ID;
+  gimp->gui.display_get_window_id  = gui_display_get_window_id;
+  gimp->gui.display_create         = gui_display_create;
+  gimp->gui.display_delete         = gui_display_delete;
+  gimp->gui.displays_reconnect     = gui_displays_reconnect;
+  gimp->gui.wait                   = gui_wait;
+  gimp->gui.progress_new           = gui_new_progress;
+  gimp->gui.progress_free          = gui_free_progress;
+  gimp->gui.pdb_dialog_new         = gui_pdb_dialog_new;
+  gimp->gui.pdb_dialog_set         = gui_pdb_dialog_set;
+  gimp->gui.pdb_dialog_close       = gui_pdb_dialog_close;
+  gimp->gui.recent_list_add_file   = gui_recent_list_add_file;
+  gimp->gui.recent_list_load       = gui_recent_list_load;
+  gimp->gui.get_mount_operation    = gui_get_mount_operation;
+  gimp->gui.query_profile_policy   = gui_query_profile_policy;
+}
+
+
+/*  private functions  */
+
+static void
+gui_ungrab (Gimp *gimp)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  if (display)
+    {
+      gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
+      gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
+    }
+}
+
+static void
+gui_threads_enter (Gimp *gimp)
+{
+  GDK_THREADS_ENTER ();
+}
+
+static void
+gui_threads_leave (Gimp *gimp)
+{
+  GDK_THREADS_LEAVE ();
+}
+
+static void
+gui_set_busy (Gimp *gimp)
+{
+  gimp_displays_set_busy (gimp);
+  gimp_dialog_factory_set_busy (gimp_dialog_factory_get_singleton ());
+
+  gdk_flush ();
+}
+
+static void
+gui_unset_busy (Gimp *gimp)
+{
+  gimp_displays_unset_busy (gimp);
+  gimp_dialog_factory_unset_busy (gimp_dialog_factory_get_singleton ());
+
+  gdk_flush ();
+}
+
+static void
+gui_help (Gimp         *gimp,
+          GimpProgress *progress,
+          const gchar  *help_domain,
+          const gchar  *help_id)
+{
+  gimp_help_show (gimp, progress, help_domain, help_id);
+}
+
+static const gchar *
+gui_get_program_class (Gimp *gimp)
+{
+  return gdk_get_program_class ();
+}
+
+static gchar *
+gui_get_display_name (Gimp     *gimp,
+                      gint      display_ID,
+                      GObject **screen,
+                      gint     *monitor)
+{
+  GimpDisplay *display   = NULL;
+  GdkScreen   *my_screen = NULL;
+
+  if (display_ID > 0)
+    display = gimp_display_get_by_ID (gimp, display_ID);
+
+  if (display)
+    {
+      GimpDisplayShell *shell  = gimp_display_get_shell (display);
+      GdkWindow        *window = gtk_widget_get_window (GTK_WIDGET (shell));
+
+      my_screen = gtk_widget_get_screen (GTK_WIDGET (shell));
+      *monitor = gdk_screen_get_monitor_at_window (my_screen, window);
+    }
+  else
+    {
+      *monitor = gui_get_initial_monitor (gimp, &my_screen);
+
+      if (*monitor == -1)
+        *monitor = gimp_get_monitor_at_pointer (&my_screen);
+    }
+
+  *screen = G_OBJECT (my_screen);
+
+  if (my_screen)
+    return gdk_screen_make_display_name (my_screen);
+
+  return NULL;
+}
+
+static guint32
+gui_get_user_time (Gimp *gimp)
+{
+#ifdef GDK_WINDOWING_X11
+  return gdk_x11_display_get_user_time (gdk_display_get_default ());
+#endif
+  return 0;
+}
+
+static GFile *
+gui_get_theme_dir (Gimp *gimp)
+{
+  return themes_get_theme_dir (gimp, GIMP_GUI_CONFIG (gimp->config)->theme);
+}
+
+static GFile *
+gui_get_icon_theme_dir (Gimp *gimp)
+{
+  return icon_themes_get_theme_dir (gimp, GIMP_GUI_CONFIG (gimp->config)->icon_theme);
+}
+
+static GimpObject *
+gui_get_window_strategy (Gimp *gimp)
+{
+  if (GIMP_GUI_CONFIG (gimp->config)->single_window_mode)
+    return gimp_single_window_strategy_get_singleton ();
+  else
+    return gimp_multi_window_strategy_get_singleton ();
+}
+
+static GimpObject *
+gui_get_empty_display (Gimp *gimp)
+{
+  GimpObject *display = NULL;
+
+  if (gimp_container_get_n_children (gimp->displays) == 1)
+    {
+      display = gimp_container_get_first_child (gimp->displays);
+
+      if (gimp_display_get_image (GIMP_DISPLAY (display)))
+        {
+          /* The display was not empty */
+          display = NULL;
+        }
+    }
+
+  return display;
+}
+
+static GimpObject *
+gui_display_get_by_ID (Gimp *gimp,
+                       gint  ID)
+{
+  return (GimpObject *) gimp_display_get_by_ID (gimp, ID);
+}
+
+static gint
+gui_display_get_ID (GimpObject *display)
+{
+  return gimp_display_get_ID (GIMP_DISPLAY (display));
+}
+
+static guint32
+gui_display_get_window_id (GimpObject *display)
+{
+  GimpDisplay      *disp  = GIMP_DISPLAY (display);
+  GimpDisplayShell *shell = gimp_display_get_shell (disp);
+
+  if (shell)
+    {
+      GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+      if (GTK_IS_WINDOW (toplevel))
+        return gimp_window_get_native_id (GTK_WINDOW (toplevel));
+    }
+
+  return 0;
+}
+
+static GimpObject *
+gui_display_create (Gimp      *gimp,
+                    GimpImage *image,
+                    GimpUnit   unit,
+                    gdouble    scale,
+                    GObject   *screen,
+                    gint       monitor)
+{
+  GimpContext *context = gimp_get_user_context (gimp);
+  GimpDisplay *display = GIMP_DISPLAY (gui_get_empty_display (gimp));
+
+  if (! screen)
+    monitor = gimp_get_monitor_at_pointer ((GdkScreen **) &screen);
+
+  if (display)
+    {
+      gimp_display_fill (display, image, unit, scale);
+    }
+  else
+    {
+      GList *image_managers = gimp_ui_managers_from_name ("<Image>");
+
+      g_return_val_if_fail (image_managers != NULL, NULL);
+
+      display = gimp_display_new (gimp, image, unit, scale,
+                                  image_managers->data,
+                                  gimp_dialog_factory_get_singleton (),
+                                  GDK_SCREEN (screen),
+                                  monitor);
+   }
+
+  if (gimp_context_get_display (context) == display)
+    {
+      gimp_context_set_image (context, image);
+      gimp_context_display_changed (context);
+    }
+  else
+    {
+      gimp_context_set_display (context, display);
+    }
+
+  return GIMP_OBJECT (display);
+}
+
+static void
+gui_display_delete (GimpObject *display)
+{
+  gimp_display_close (GIMP_DISPLAY (display));
+}
+
+static void
+gui_displays_reconnect (Gimp      *gimp,
+                        GimpImage *old_image,
+                        GimpImage *new_image)
+{
+  gimp_displays_reconnect (gimp, old_image, new_image);
+}
+
+static void
+gui_wait_input_async (GimpAsync  *async,
+                      const gint  input_pipe[2])
+{
+  guint8 buffer[1];
+
+  while (read (input_pipe[0], buffer, sizeof (buffer)) == -1 &&
+         errno == EINTR);
+
+  gimp_async_finish (async, NULL);
+}
+
+static gboolean
+gui_wait (Gimp         *gimp,
+          GimpWaitable *waitable,
+          const gchar  *message)
+{
+  GimpProcedure  *procedure;
+  GimpValueArray *args;
+  GimpAsync      *input_async = NULL;
+  GError         *error       = NULL;
+  gint            input_pipe[2];
+  gint            output_pipe[2];
+
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb, "plug-in-busy-dialog");
+
+  if (! procedure)
+    return FALSE;
+
+  if (pipe (input_pipe))
+    return FALSE;
+
+  if (pipe (output_pipe))
+    {
+      close (input_pipe[0]);
+      close (input_pipe[1]);
+
+      return FALSE;
+    }
+
+  gimp_spawn_set_cloexec (input_pipe[0]);
+  gimp_spawn_set_cloexec (output_pipe[1]);
+
+  args = gimp_procedure_get_arguments (procedure);
+  gimp_value_array_truncate (args, 5);
+
+  g_value_set_int    (gimp_value_array_index (args, 0),
+                      GIMP_RUN_INTERACTIVE);
+  g_value_set_int    (gimp_value_array_index (args, 1),
+                      output_pipe[0]);
+  g_value_set_int    (gimp_value_array_index (args, 2),
+                      input_pipe[1]);
+  g_value_set_string (gimp_value_array_index (args, 3),
+                      message);
+  g_value_set_int    (gimp_value_array_index (args, 4),
+                      GIMP_IS_CANCELABLE (waitable));
+
+  gimp_procedure_execute_async (procedure, gimp,
+                                gimp_get_user_context (gimp),
+                                NULL, args, NULL, &error);
+
+  gimp_value_array_unref (args);
+
+  close (input_pipe[1]);
+  close (output_pipe[0]);
+
+  if (error)
+    {
+      g_clear_error (&error);
+
+      close (input_pipe[0]);
+      close (output_pipe[1]);
+
+      return FALSE;
+    }
+
+  if (GIMP_IS_CANCELABLE (waitable))
+    {
+      /* listens for a cancellation request */
+      input_async = gimp_parallel_run_async_independent (
+        (GimpRunAsyncFunc) gui_wait_input_async,
+        input_pipe);
+
+      while (! gimp_waitable_wait_for (waitable, 0.1 * G_TIME_SPAN_SECOND))
+        {
+          /* check for a cancellation request */
+          if (gimp_waitable_try_wait (GIMP_WAITABLE (input_async)))
+            {
+              gimp_cancelable_cancel (GIMP_CANCELABLE (waitable));
+
+              break;
+            }
+        }
+    }
+
+  gimp_waitable_wait (waitable);
+
+  /* signal completion to the plug-in */
+  close (output_pipe[1]);
+
+  if (input_async)
+    {
+      gimp_waitable_wait (GIMP_WAITABLE (input_async));
+
+      g_object_unref (input_async);
+    }
+
+  close (input_pipe[0]);
+
+  return TRUE;
+}
+
+static GimpProgress *
+gui_new_progress (Gimp       *gimp,
+                  GimpObject *display)
+{
+  g_return_val_if_fail (display == NULL || GIMP_IS_DISPLAY (display), NULL);
+
+  if (display)
+    return GIMP_PROGRESS (display);
+
+  return GIMP_PROGRESS (gimp_progress_dialog_new ());
+}
+
+static void
+gui_free_progress (Gimp          *gimp,
+                   GimpProgress  *progress)
+{
+  g_return_if_fail (GIMP_IS_PROGRESS_DIALOG (progress));
+
+  if (GIMP_IS_PROGRESS_DIALOG (progress))
+    gtk_widget_destroy (GTK_WIDGET (progress));
+}
+
+static gboolean
+gui_pdb_dialog_present (GtkWindow *window)
+{
+  gtk_window_present (window);
+
+  return FALSE;
+}
+
+static gboolean
+gui_pdb_dialog_new (Gimp          *gimp,
+                    GimpContext   *context,
+                    GimpProgress  *progress,
+                    GimpContainer *container,
+                    const gchar   *title,
+                    const gchar   *callback_name,
+                    const gchar   *object_name,
+                    va_list        args)
+{
+  GType        dialog_type = G_TYPE_NONE;
+  const gchar *dialog_role = NULL;
+  const gchar *help_id     = NULL;
+
+  if (gimp_container_get_children_type (container) == GIMP_TYPE_BRUSH)
+    {
+      dialog_type = GIMP_TYPE_BRUSH_SELECT;
+      dialog_role = "gimp-brush-selection";
+      help_id     = GIMP_HELP_BRUSH_DIALOG;
+    }
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_FONT)
+    {
+      dialog_type = GIMP_TYPE_FONT_SELECT;
+      dialog_role = "gimp-font-selection";
+      help_id     = GIMP_HELP_FONT_DIALOG;
+    }
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_GRADIENT)
+    {
+      dialog_type = GIMP_TYPE_GRADIENT_SELECT;
+      dialog_role = "gimp-gradient-selection";
+      help_id     = GIMP_HELP_GRADIENT_DIALOG;
+    }
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_PALETTE)
+    {
+      dialog_type = GIMP_TYPE_PALETTE_SELECT;
+      dialog_role = "gimp-palette-selection";
+      help_id     = GIMP_HELP_PALETTE_DIALOG;
+    }
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_PATTERN)
+    {
+      dialog_type = GIMP_TYPE_PATTERN_SELECT;
+      dialog_role = "gimp-pattern-selection";
+      help_id     = GIMP_HELP_PATTERN_DIALOG;
+    }
+
+  if (dialog_type != G_TYPE_NONE)
+    {
+      GimpObject *object = NULL;
+
+      if (object_name && strlen (object_name))
+        object = gimp_container_get_child_by_name (container, object_name);
+
+      if (! object)
+        object = gimp_context_get_by_type (context,
+                                           gimp_container_get_children_type (container));
+
+      if (object)
+        {
+          gint        n_properties = 0;
+          gchar     **names        = NULL;
+          GValue     *values       = NULL;
+          GtkWidget  *dialog;
+          GtkWidget  *view;
+
+          names = gimp_properties_append (dialog_type,
+                                          &n_properties, names, &values,
+                                          "title",          title,
+                                          "role",           dialog_role,
+                                          "help-func",      gimp_standard_help_func,
+                                          "help-id",        help_id,
+                                          "pdb",            gimp->pdb,
+                                          "context",        context,
+                                          "select-type",    gimp_container_get_children_type (container),
+                                          "initial-object", object,
+                                          "callback-name",  callback_name,
+                                          "menu-factory",   global_menu_factory,
+                                          NULL);
+
+          names = gimp_properties_append_valist (dialog_type,
+                                                 &n_properties, names, &values,
+                                                 args);
+
+          dialog = (GtkWidget *)
+            g_object_new_with_properties (dialog_type,
+                                          n_properties,
+                                          (const gchar **) names,
+                                          (const GValue *) values);
+
+          gimp_properties_free (n_properties, names, values);
+
+          view = GIMP_PDB_DIALOG (dialog)->view;
+          if (view)
+            gimp_docked_set_show_button_bar (GIMP_DOCKED (view), FALSE);
+
+          if (progress)
+            {
+              guint32 window_id = gimp_progress_get_window_id (progress);
+
+              if (window_id)
+                gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
+            }
+
+          gtk_widget_show (dialog);
+
+          /*  workaround for bug #360106  */
+          {
+            GSource  *source = g_timeout_source_new (100);
+            GClosure *closure;
+
+            closure = g_cclosure_new_object (G_CALLBACK (gui_pdb_dialog_present),
+                                             G_OBJECT (dialog));
+
+            g_source_set_closure (source, closure);
+            g_source_attach (source, NULL);
+            g_source_unref (source);
+          }
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gui_pdb_dialog_set (Gimp          *gimp,
+                    GimpContainer *container,
+                    const gchar   *callback_name,
+                    const gchar   *object_name,
+                    va_list        args)
+{
+  GimpPdbDialogClass *klass = NULL;
+
+  if (gimp_container_get_children_type (container) == GIMP_TYPE_BRUSH)
+    klass = g_type_class_peek (GIMP_TYPE_BRUSH_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_FONT)
+    klass = g_type_class_peek (GIMP_TYPE_FONT_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_GRADIENT)
+    klass = g_type_class_peek (GIMP_TYPE_GRADIENT_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_PALETTE)
+    klass = g_type_class_peek (GIMP_TYPE_PALETTE_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_PATTERN)
+    klass = g_type_class_peek (GIMP_TYPE_PATTERN_SELECT);
+
+  if (klass)
+    {
+      GimpPdbDialog *dialog;
+
+      dialog = gimp_pdb_dialog_get_by_callback (klass, callback_name);
+
+      if (dialog && dialog->select_type == gimp_container_get_children_type (container))
+        {
+          GimpObject *object;
+
+          object = gimp_container_get_child_by_name (container, object_name);
+
+          if (object)
+            {
+              const gchar *prop_name = va_arg (args, const gchar *);
+
+              gimp_context_set_by_type (dialog->context, dialog->select_type,
+                                        object);
+
+              if (prop_name)
+                g_object_set_valist (G_OBJECT (dialog), prop_name, args);
+
+              gtk_window_present (GTK_WINDOW (dialog));
+
+              return TRUE;
+            }
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gui_pdb_dialog_close (Gimp          *gimp,
+                      GimpContainer *container,
+                      const gchar   *callback_name)
+{
+  GimpPdbDialogClass *klass = NULL;
+
+  if (gimp_container_get_children_type (container) == GIMP_TYPE_BRUSH)
+    klass = g_type_class_peek (GIMP_TYPE_BRUSH_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_FONT)
+    klass = g_type_class_peek (GIMP_TYPE_FONT_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_GRADIENT)
+    klass = g_type_class_peek (GIMP_TYPE_GRADIENT_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_PALETTE)
+    klass = g_type_class_peek (GIMP_TYPE_PALETTE_SELECT);
+  else if (gimp_container_get_children_type (container) == GIMP_TYPE_PATTERN)
+    klass = g_type_class_peek (GIMP_TYPE_PATTERN_SELECT);
+
+  if (klass)
+    {
+      GimpPdbDialog *dialog;
+
+      dialog = gimp_pdb_dialog_get_by_callback (klass, callback_name);
+
+      if (dialog && dialog->select_type == gimp_container_get_children_type (container))
+        {
+          gtk_widget_destroy (GTK_WIDGET (dialog));
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gui_recent_list_add_file (Gimp        *gimp,
+                          GFile       *file,
+                          const gchar *mime_type)
+{
+  GtkRecentData  recent;
+  const gchar   *groups[2] = { "Graphics", NULL };
+  gchar         *uri;
+  gboolean       success;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+
+  /* use last part of the URI */
+  recent.display_name = NULL;
+
+  /* no special description */
+  recent.description  = NULL;
+  recent.mime_type    = (mime_type ?
+                         (gchar *) mime_type : "application/octet-stream");
+  recent.app_name     = "GNU Image Manipulation Program";
+  recent.app_exec     = GIMP_COMMAND " %u";
+  recent.groups       = (gchar **) groups;
+  recent.is_private   = FALSE;
+
+  uri = g_file_get_uri (file);
+
+  success = gtk_recent_manager_add_full (gtk_recent_manager_get_default (),
+                                         uri, &recent);
+
+  g_free (uri);
+
+  return success;
+}
+
+static gint
+gui_recent_list_compare (gconstpointer a,
+                         gconstpointer b)
+{
+  return (gtk_recent_info_get_modified ((GtkRecentInfo *) a) -
+          gtk_recent_info_get_modified ((GtkRecentInfo *) b));
+}
+
+static void
+gui_recent_list_load (Gimp *gimp)
+{
+  GList *items;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_container_freeze (gimp->documents);
+  gimp_container_clear (gimp->documents);
+
+  items = gtk_recent_manager_get_items (gtk_recent_manager_get_default ());
+
+  items = g_list_sort (items, gui_recent_list_compare);
+
+  for (list = items; list; list = list->next)
+    {
+      GtkRecentInfo *info = list->data;
+
+      if (gtk_recent_info_has_application (info,
+                                           "GNU Image Manipulation Program"))
+        {
+          const gchar *mime_type = gtk_recent_info_get_mime_type (info);
+
+          if (mime_type &&
+              gimp_plug_in_manager_file_procedure_find_by_mime_type (gimp->plug_in_manager,
+                                                                     GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                                     mime_type))
+            {
+              GimpImagefile *imagefile;
+              GFile         *file;
+
+              file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
+              imagefile = gimp_imagefile_new (gimp, file);
+              g_object_unref (file);
+
+              gimp_imagefile_set_mime_type (imagefile, mime_type);
+
+              gimp_container_add (gimp->documents, GIMP_OBJECT (imagefile));
+              g_object_unref (imagefile);
+            }
+        }
+
+      gtk_recent_info_unref (info);
+    }
+
+  g_list_free (items);
+
+  gimp_container_thaw (gimp->documents);
+}
+
+static GMountOperation *
+gui_get_mount_operation (Gimp         *gimp,
+                         GimpProgress *progress)
+{
+  GtkWidget *toplevel = NULL;
+
+  if (GTK_IS_WIDGET (progress))
+    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (progress));
+
+  return gtk_mount_operation_new (GTK_WINDOW (toplevel));
+}
+
+static GimpColorProfilePolicy
+gui_query_profile_policy (Gimp                      *gimp,
+                          GimpImage                 *image,
+                          GimpContext               *context,
+                          GimpColorProfile         **dest_profile,
+                          GimpColorRenderingIntent  *intent,
+                          gboolean                  *bpc,
+                          gboolean                  *dont_ask)
+{
+  return color_profile_import_dialog_run (image, context, NULL,
+                                          dest_profile,
+                                          intent, bpc,
+                                          dont_ask);
+}
diff --git a/app/gui/gui-vtable.h b/app/gui/gui-vtable.h
new file mode 100644
index 0000000..e52009b
--- /dev/null
+++ b/app/gui/gui-vtable.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GUI_VTABLE_H__
+#define __GUI_VTABLE_H__
+
+
+void   gui_vtable_init        (Gimp       *gimp);
+
+/*  this function lives in gui.c but must only be used from gui-vtable.c;
+ *  also, gui.h can't contain any Gdk types.
+ */
+gint  gui_get_initial_monitor (Gimp       *gimp,
+                               GdkScreen **screen);
+
+
+#endif /* __GUI_VTABLE_H__ */
diff --git a/app/gui/gui.c b/app/gui/gui.c
new file mode 100644
index 0000000..e5928eb
--- /dev/null
+++ b/app/gui/gui.c
@@ -0,0 +1,1077 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+#include "libgimpwidgets/gimpwidgets-private.h"
+
+#include "gui-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolinfo.h"
+
+#include "plug-in/gimpenvirontable.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplay-foreach.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpstatusbar.h"
+
+#include "tools/gimp-tools.h"
+#include "tools/gimptool.h"
+#include "tools/tool_manager.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactiongroup.h"
+#include "widgets/gimpaction-history.h"
+#include "widgets/gimpclipboard.h"
+#include "widgets/gimpcolorselectorpalette.h"
+#include "widgets/gimpcontrollers.h"
+#include "widgets/gimpdevices.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdnd.h"
+#include "widgets/gimprender.h"
+#include "widgets/gimphelp.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimplanguagestore-parser.h"
+
+#include "actions/actions.h"
+#include "actions/windows-commands.h"
+
+#include "menus/menus.h"
+
+#include "dialogs/dialogs.h"
+
+#include "gimpuiconfigurer.h"
+#include "gui.h"
+#include "gui-unique.h"
+#include "gui-vtable.h"
+#include "icon-themes.h"
+#include "session.h"
+#include "splash.h"
+#include "themes.h"
+
+#ifdef GDK_WINDOWING_QUARTZ
+#import <AppKit/AppKit.h>
+#include <gtkosxapplication.h>
+#include <gdk/gdkquartz.h>
+
+/* Forward declare since we are building against old SDKs. */
+#if !defined(MAC_OS_X_VERSION_10_12) || \
+    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12
+
+@interface NSWindow(ForwardDeclarations)
++ (void)setAllowsAutomaticWindowTabbing:(BOOL)allow;
+@end
+
+#endif
+
+#endif /* GDK_WINDOWING_QUARTZ */
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static gchar    * gui_sanity_check              (void);
+static void       gui_help_func                 (const gchar        *help_id,
+                                                 gpointer            help_data);
+static gboolean   gui_get_background_func       (GimpRGB            *color);
+static gboolean   gui_get_foreground_func       (GimpRGB            *color);
+
+static void       gui_initialize_after_callback (Gimp               *gimp,
+                                                 GimpInitStatusFunc  callback);
+
+static void       gui_restore_callback          (Gimp               *gimp,
+                                                 GimpInitStatusFunc  callback);
+static void       gui_restore_after_callback    (Gimp               *gimp,
+                                                 GimpInitStatusFunc  callback);
+
+static gboolean   gui_exit_callback             (Gimp               *gimp,
+                                                 gboolean            force);
+static gboolean   gui_exit_after_callback       (Gimp               *gimp,
+                                                 gboolean            force);
+
+static void       gui_show_tooltips_notify      (GimpGuiConfig      *gui_config,
+                                                 GParamSpec         *pspec,
+                                                 Gimp               *gimp);
+static void       gui_show_help_button_notify   (GimpGuiConfig      *gui_config,
+                                                 GParamSpec         *pspec,
+                                                 Gimp               *gimp);
+static void       gui_user_manual_notify        (GimpGuiConfig      *gui_config,
+                                                 GParamSpec         *pspec,
+                                                 Gimp               *gimp);
+static void       gui_single_window_mode_notify (GimpGuiConfig      *gui_config,
+                                                 GParamSpec         *pspec,
+                                                 GimpUIConfigurer   *ui_configurer);
+static void       gui_tearoff_menus_notify      (GimpGuiConfig      *gui_config,
+                                                 GParamSpec         *pspec,
+                                                 GtkUIManager       *manager);
+
+static void       gui_clipboard_changed         (Gimp               *gimp);
+
+static void       gui_menu_show_tooltip         (GimpUIManager      *manager,
+                                                 const gchar        *tooltip,
+                                                 Gimp               *gimp);
+static void       gui_menu_hide_tooltip         (GimpUIManager      *manager,
+                                                 Gimp               *gimp);
+
+static void       gui_display_changed           (GimpContext        *context,
+                                                 GimpDisplay        *display,
+                                                 Gimp               *gimp);
+
+static void       gui_compare_accelerator       (gpointer            data,
+                                                 const gchar        *accel_path,
+                                                 guint               accel_key,
+                                                 GdkModifierType     accel_mods,
+                                                 gboolean            changed);
+static void      gui_check_unique_accelerator   (gpointer            data,
+                                                 const gchar        *accel_path,
+                                                 guint               accel_key,
+                                                 GdkModifierType     accel_mods,
+                                                 gboolean            changed);
+static gboolean  gui_check_action_exists        (const gchar *accel_path);
+
+
+/*  private variables  */
+
+static Gimp             *the_gui_gimp     = NULL;
+static GimpUIManager    *image_ui_manager = NULL;
+static GimpUIConfigurer *ui_configurer    = NULL;
+static GdkScreen        *initial_screen   = NULL;
+static gint              initial_monitor  = -1;
+
+
+/*  public functions  */
+
+void
+gui_libs_init (GOptionContext *context)
+{
+  g_return_if_fail (context != NULL);
+
+  g_option_context_add_group (context, gtk_get_option_group (TRUE));
+}
+
+void
+gui_abort (const gchar *abort_message)
+{
+  GtkWidget *dialog;
+  GtkWidget *box;
+
+  g_return_if_fail (abort_message != NULL);
+
+  dialog = gimp_dialog_new (_("GIMP Message"), "gimp-abort",
+                            NULL, GTK_DIALOG_MODAL, NULL, NULL,
+
+                            _("_OK"), GTK_RESPONSE_OK,
+
+                            NULL);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  box = g_object_new (GIMP_TYPE_MESSAGE_BOX,
+                      "icon-name",    GIMP_ICON_WILBER_EEK,
+                      "border-width", 12,
+                      NULL);
+
+  gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message);
+
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      box, TRUE, TRUE, 0);
+  gtk_widget_show (box);
+
+  gimp_dialog_run (GIMP_DIALOG (dialog));
+
+  exit (EXIT_FAILURE);
+}
+
+GimpInitStatusFunc
+gui_init (Gimp     *gimp,
+          gboolean  no_splash)
+{
+  GimpInitStatusFunc  status_callback = NULL;
+  gchar              *abort_message;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (the_gui_gimp == NULL, NULL);
+
+  abort_message = gui_sanity_check ();
+  if (abort_message)
+    gui_abort (abort_message);
+
+  the_gui_gimp = gimp;
+
+  /* TRANSLATORS: there is no need to translate this in GIMP. This uses
+   * "gtk20" domain as a special trick to determine language direction,
+   * but xgettext extracts it anyway mistakenly into GIMP po files.
+   * Leave an empty string as translation. It does not matter.
+   */
+  if (g_strcmp0 (dgettext ("gtk20", "default:LTR"), "default:RTL") == 0)
+    /* Normally this should have been taken care of during command line
+     * parsing as a post-parse hook of gtk_get_option_group(), using the
+     * system locales.
+     * But user config may have overridden the language, therefore we must
+     * check the widget directions again.
+     */
+    gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
+  else
+    gtk_widget_set_default_direction (GTK_TEXT_DIR_LTR);
+
+  gui_unique_init (gimp);
+  gimp_language_store_parser_init ();
+
+  /*  initialize icon themes before gimp_widgets_init() so we avoid
+   *  setting the configured theme twice
+   */
+  icon_themes_init (gimp);
+
+  gimp_widgets_init (gui_help_func,
+                     gui_get_foreground_func,
+                     gui_get_background_func,
+                     NULL);
+
+  g_type_class_ref (GIMP_TYPE_COLOR_SELECT);
+
+  /*  disable automatic startup notification  */
+  gtk_window_set_auto_startup_notification (FALSE);
+
+#ifdef GDK_WINDOWING_QUARTZ
+  /* Before the first window is created (typically the splash window),
+   * we need to disable automatic tabbing behavior introduced on Sierra.
+   * This is known to cause all kinds of weird issues (see for instance
+   * Bugzilla #776294) and needs proper GTK+ support if we would want to
+   * enable it.
+   */
+  if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)])
+    [NSWindow setAllowsAutomaticWindowTabbing:NO];
+
+  /* MacOS 11 (Big Sur) has added a new, dynamic "accent" as default.
+   * This uses a 10-bit colorspace so every GIMP drawing operation
+   * has the additional cost of an 8-bit (ARGB) to 10-bit conversion.
+   * Let's disable this mode to regain the lost performance.
+   */
+  if (gdk_quartz_osx_version () >= GDK_OSX_BIG_SUR)
+    {
+      NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+      [userDefaults setBool: NO forKey:@"NSViewUsesAutomaticLayerBackingStores"];
+    }
+
+#endif /* GDK_WINDOWING_QUARTZ */
+
+  gimp_dnd_init (gimp);
+
+  themes_init (gimp);
+
+  initial_monitor = gimp_get_monitor_at_pointer (&initial_screen);
+  gtk_widget_set_default_colormap (gdk_screen_get_rgb_colormap (initial_screen));
+
+  if (! no_splash)
+    {
+      splash_create (gimp->be_verbose, initial_screen, initial_monitor);
+      status_callback = splash_update;
+    }
+
+  g_signal_connect_after (gimp, "initialize",
+                          G_CALLBACK (gui_initialize_after_callback),
+                          NULL);
+
+  g_signal_connect (gimp, "restore",
+                    G_CALLBACK (gui_restore_callback),
+                    NULL);
+  g_signal_connect_after (gimp, "restore",
+                          G_CALLBACK (gui_restore_after_callback),
+                          NULL);
+
+  g_signal_connect (gimp, "exit",
+                    G_CALLBACK (gui_exit_callback),
+                    NULL);
+  g_signal_connect_after (gimp, "exit",
+                          G_CALLBACK (gui_exit_after_callback),
+                          NULL);
+
+  return status_callback;
+}
+
+/*
+ * gui_recover:
+ * @n_recoveries: number of recovered files.
+ *
+ * Query the user interactively if files were saved from a previous
+ * crash, asking whether to try and recover or discard them.
+ *
+ * Returns: TRUE if answer is to try and recover, FALSE otherwise.
+ */
+gboolean
+gui_recover (gint n_recoveries)
+{
+  GtkWidget *dialog;
+  GtkWidget *box;
+  gboolean   recover;
+
+  dialog = gimp_dialog_new (_("Image Recovery"), "gimp-recovery",
+                            NULL, GTK_DIALOG_MODAL, NULL, NULL,
+                            _("_Discard"), GTK_RESPONSE_CANCEL,
+                            _("_Recover"), GTK_RESPONSE_OK,
+                            NULL);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+                                   GTK_RESPONSE_OK);
+
+  box = gimp_message_box_new (GIMP_ICON_WILBER_EEK);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      box, TRUE, TRUE, 0);
+  gtk_widget_show (box);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box),
+                                     _("Eeek! It looks like GIMP recovered from a crash!"));
+
+  gimp_message_box_set_text (GIMP_MESSAGE_BOX (box),
+                             /* TRANSLATORS: even if English singular form does
+                              * not use %d, you can use %d for translation in
+                              * any singular/plural form of your language if
+                              * suited. It will just work and be replaced by the
+                              * number of images as expected.
+                              */
+                             ngettext ("An image was salvaged from the crash. "
+                                       "Do you want to try and recover it?",
+                                       "%d images were salvaged from the crash. "
+                                       "Do you want to try and recover them?",
+                                       n_recoveries), n_recoveries);
+
+  recover = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
+  gtk_widget_destroy (dialog);
+
+  return recover;
+}
+
+gint
+gui_get_initial_monitor (Gimp       *gimp,
+                         GdkScreen **screen)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+  g_return_val_if_fail (screen != NULL, 0);
+
+  *screen = initial_screen;
+
+  return initial_monitor;
+}
+
+
+/*  private functions  */
+
+static gchar *
+gui_sanity_check (void)
+{
+#define GTK_REQUIRED_MAJOR 2
+#define GTK_REQUIRED_MINOR 24
+#define GTK_REQUIRED_MICRO 10
+
+  const gchar *mismatch = gtk_check_version (GTK_REQUIRED_MAJOR,
+                                             GTK_REQUIRED_MINOR,
+                                             GTK_REQUIRED_MICRO);
+
+  if (mismatch)
+    {
+      return g_strdup_printf
+        ("%s\n\n"
+         "GIMP requires GTK+ version %d.%d.%d or later.\n"
+         "Installed GTK+ version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older GTK+ version.\n\n"
+         "Please upgrade to GTK+ version %d.%d.%d or later.",
+         mismatch,
+         GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO,
+         gtk_major_version, gtk_minor_version, gtk_micro_version,
+         GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO);
+    }
+
+#undef GTK_REQUIRED_MAJOR
+#undef GTK_REQUIRED_MINOR
+#undef GTK_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static void
+gui_help_func (const gchar *help_id,
+               gpointer     help_data)
+{
+  g_return_if_fail (GIMP_IS_GIMP (the_gui_gimp));
+
+  gimp_help (the_gui_gimp, NULL, NULL, help_id);
+}
+
+static gboolean
+gui_get_foreground_func (GimpRGB *color)
+{
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (the_gui_gimp), FALSE);
+
+  gimp_context_get_foreground (gimp_get_user_context (the_gui_gimp), color);
+
+  return TRUE;
+}
+
+static gboolean
+gui_get_background_func (GimpRGB *color)
+{
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (the_gui_gimp), FALSE);
+
+  gimp_context_get_background (gimp_get_user_context (the_gui_gimp), color);
+
+  return TRUE;
+}
+
+static void
+gui_initialize_after_callback (Gimp               *gimp,
+                               GimpInitStatusFunc  status_callback)
+{
+  const gchar *name = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+#if defined (GDK_WINDOWING_X11)
+  name = "DISPLAY";
+#elif defined (GDK_WINDOWING_DIRECTFB) || defined (GDK_WINDOWING_FB)
+  name = "GDK_DISPLAY";
+#endif
+
+  /* TODO: Need to care about display migration with GTK+ 2.2 at some point */
+
+  if (name)
+    {
+      gchar *display = gdk_get_display ();
+
+      gimp_environ_table_add (gimp->plug_in_manager->environ_table,
+                              name, display, NULL);
+      g_free (display);
+    }
+
+  gimp_tools_init (gimp);
+
+  gimp_context_set_tool (gimp_get_user_context (gimp),
+                         gimp_tool_info_get_standard (gimp));
+}
+
+static void
+gui_restore_callback (Gimp               *gimp,
+                      GimpInitStatusFunc  status_callback)
+{
+  GimpDisplayConfig *display_config = GIMP_DISPLAY_CONFIG (gimp->config);
+  GimpGuiConfig     *gui_config     = GIMP_GUI_CONFIG (gimp->config);
+
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  gui_vtable_init (gimp);
+
+  if (! gui_config->show_tooltips)
+    gimp_help_disable_tooltips ();
+
+  g_signal_connect (gui_config, "notify::show-tooltips",
+                    G_CALLBACK (gui_show_tooltips_notify),
+                    gimp);
+
+  gimp_dialogs_show_help_button (gui_config->use_help &&
+                                 gui_config->show_help_button);
+
+  g_signal_connect (gui_config, "notify::use-help",
+                    G_CALLBACK (gui_show_help_button_notify),
+                    gimp);
+  g_signal_connect (gui_config, "notify::user-manual-online",
+                    G_CALLBACK (gui_user_manual_notify),
+                    gimp);
+  g_signal_connect (gui_config, "notify::show-help-button",
+                    G_CALLBACK (gui_show_help_button_notify),
+                    gimp);
+
+  g_signal_connect (gimp_get_user_context (gimp), "display-changed",
+                    G_CALLBACK (gui_display_changed),
+                    gimp);
+
+  /* make sure the monitor resolution is valid */
+  if (display_config->monitor_res_from_gdk               ||
+      display_config->monitor_xres < GIMP_MIN_RESOLUTION ||
+      display_config->monitor_yres < GIMP_MIN_RESOLUTION)
+    {
+      gdouble xres, yres;
+
+      gimp_get_monitor_resolution (initial_screen,
+                                   initial_monitor,
+                                   &xres, &yres);
+
+      g_object_set (gimp->config,
+                    "monitor-xresolution",                      xres,
+                    "monitor-yresolution",                      yres,
+                    "monitor-resolution-from-windowing-system", TRUE,
+                    NULL);
+    }
+
+  actions_init (gimp);
+  menus_init (gimp, global_action_factory);
+  gimp_render_init (gimp);
+
+  dialogs_init (gimp, global_menu_factory);
+
+  gimp_clipboard_init (gimp);
+  if (gimp_get_clipboard_image (gimp))
+    gimp_clipboard_set_image (gimp, gimp_get_clipboard_image (gimp));
+  else
+    gimp_clipboard_set_buffer (gimp, gimp_get_clipboard_buffer (gimp));
+
+  g_signal_connect (gimp, "clipboard-changed",
+                    G_CALLBACK (gui_clipboard_changed),
+                    NULL);
+
+  gimp_devices_init (gimp);
+  gimp_controllers_init (gimp);
+  session_init (gimp);
+
+  g_type_class_unref (g_type_class_ref (GIMP_TYPE_COLOR_SELECTOR_PALETTE));
+
+  status_callback (NULL, _("Tool Options"), 1.0);
+  gimp_tools_restore (gimp);
+}
+
+#ifdef GDK_WINDOWING_QUARTZ
+static void
+gui_add_to_app_menu (GimpUIManager     *ui_manager,
+                     GtkosxApplication *osx_app,
+                     const gchar       *action_path,
+                     gint               index)
+{
+  GtkWidget *item;
+
+  item = gimp_ui_manager_get_widget (ui_manager, action_path);
+
+  if (GTK_IS_MENU_ITEM (item))
+    gtkosx_application_insert_app_menu_item (osx_app, GTK_WIDGET (item), index);
+}
+
+static gboolean
+gui_quartz_quit_callback (GtkosxApplication *osx_app,
+                          GimpUIManager     *ui_manager)
+{
+  gimp_ui_manager_activate_action (ui_manager, "file", "file-quit");
+
+  return TRUE;
+}
+#endif
+
+static void
+gui_restore_after_callback (Gimp               *gimp,
+                            GimpInitStatusFunc  status_callback)
+{
+  GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (gimp->config);
+  GimpDisplay   *display;
+
+  if (gimp->be_verbose)
+    g_print ("INIT: %s\n", G_STRFUNC);
+
+  gimp->message_handler = GIMP_MESSAGE_BOX;
+
+  /*  load the recent documents after gimp_real_restore() because we
+   *  need the mime-types implemented by plug-ins
+   */
+  status_callback (NULL, _("Documents"), 0.9);
+  gimp_recent_list_load (gimp);
+
+  /*  enable this to always have icons everywhere  */
+  if (g_getenv ("GIMP_ICONS_LIKE_A_BOSS"))
+    {
+      GdkScreen *screen = gdk_screen_get_default ();
+
+      g_object_set (G_OBJECT (gtk_settings_get_for_screen (screen)),
+                    "gtk-button-images", TRUE,
+                    "gtk-menu-images",   TRUE,
+                    NULL);
+    }
+
+  if (gui_config->restore_accels)
+    menus_restore (gimp);
+
+  ui_configurer = g_object_new (GIMP_TYPE_UI_CONFIGURER,
+                                "gimp", gimp,
+                                NULL);
+
+  image_ui_manager = gimp_menu_factory_manager_new (global_menu_factory,
+                                                    "<Image>",
+                                                    gimp,
+                                                    gui_config->tearoff_menus);
+  gimp_ui_manager_update (image_ui_manager, gimp);
+
+  /* Check that every accelerator is unique. */
+  gtk_accel_map_foreach_unfiltered (NULL,
+                                    gui_check_unique_accelerator);
+
+  gimp_action_history_init (gimp);
+
+  g_signal_connect_object (gui_config, "notify::single-window-mode",
+                           G_CALLBACK (gui_single_window_mode_notify),
+                           ui_configurer, 0);
+  g_signal_connect_object (gui_config, "notify::tearoff-menus",
+                           G_CALLBACK (gui_tearoff_menus_notify),
+                           image_ui_manager, 0);
+  g_signal_connect (image_ui_manager, "show-tooltip",
+                    G_CALLBACK (gui_menu_show_tooltip),
+                    gimp);
+  g_signal_connect (image_ui_manager, "hide-tooltip",
+                    G_CALLBACK (gui_menu_hide_tooltip),
+                    gimp);
+
+  gimp_devices_restore (gimp);
+  gimp_controllers_restore (gimp, image_ui_manager);
+
+  if (status_callback == splash_update)
+    splash_destroy ();
+
+  if (gimp_get_show_gui (gimp))
+    {
+      GimpDisplayShell *shell;
+      GtkWidget        *toplevel;
+
+      /*  create the empty display  */
+      display = GIMP_DISPLAY (gimp_create_display (gimp, NULL,
+                                                   GIMP_UNIT_PIXEL, 1.0,
+                                                   G_OBJECT (initial_screen),
+                                                   initial_monitor));
+
+      shell = gimp_display_get_shell (display);
+
+      if (gui_config->restore_session)
+        session_restore (gimp,
+                         initial_screen,
+                         initial_monitor);
+
+      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+#ifdef GDK_WINDOWING_QUARTZ
+      {
+        GtkosxApplication *osx_app;
+        GtkWidget         *menu;
+        GtkWidget         *item;
+
+        [[NSUserDefaults standardUserDefaults] setObject:@"NO"
+                                                  forKey:@"NSTreatUnknownArgumentsAsOpen"];
+
+        osx_app = gtkosx_application_get ();
+
+        menu = gimp_ui_manager_get_widget (image_ui_manager,
+                                           "/image-menubar");
+        /* menu should have window parent for accelerator support */
+        gtk_widget_set_parent(menu, toplevel);
+
+        if (GTK_IS_MENU_ITEM (menu))
+          menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
+
+        /* do not activate OSX menu if tests are running */
+        if (! g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"))
+          gtkosx_application_set_menu_bar (osx_app, GTK_MENU_SHELL (menu));
+
+        gtkosx_application_set_use_quartz_accelerators (osx_app, FALSE);
+
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             "/image-menubar/Help/dialogs-about", 0);
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             "/image-menubar/Help/dialogs-search-action", 1);
+
+#define PREFERENCES "/image-menubar/Edit/Preferences/"
+
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             PREFERENCES "dialogs-preferences", 3);
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             PREFERENCES "dialogs-input-devices", 4);
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             PREFERENCES "dialogs-keyboard-shortcuts", 5);
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             PREFERENCES "dialogs-module-dialog", 6);
+        gui_add_to_app_menu (image_ui_manager, osx_app,
+                             PREFERENCES "plug-in-unit-editor", 7);
+
+#undef PREFERENCES
+
+        item = gtk_separator_menu_item_new ();
+        gtkosx_application_insert_app_menu_item (osx_app, item, 8);
+
+        item = gimp_ui_manager_get_widget (image_ui_manager,
+                                           "/image-menubar/File/file-quit");
+        gtk_widget_hide (item);
+
+        g_signal_connect (osx_app, "NSApplicationBlockTermination",
+                          G_CALLBACK (gui_quartz_quit_callback),
+                          image_ui_manager);
+
+        gtkosx_application_ready (osx_app);
+      }
+#endif /* GDK_WINDOWING_QUARTZ */
+
+      /*  move keyboard focus to the display  */
+      gtk_window_present (GTK_WINDOW (toplevel));
+    }
+
+  /*  indicate that the application has finished loading  */
+  gdk_notify_startup_complete ();
+
+  /*  clear startup monitor variables  */
+  initial_screen  = NULL;
+  initial_monitor = -1;
+}
+
+static gboolean
+gui_exit_callback (Gimp     *gimp,
+                   gboolean  force)
+{
+  GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (gimp->config);
+  GimpTool      *active_tool;
+
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  if (! force && gimp_displays_dirty (gimp))
+    {
+      GdkScreen *screen;
+      gint       monitor;
+
+      monitor = gimp_get_monitor_at_pointer (&screen);
+
+      gimp_dialog_factory_dialog_raise (gimp_dialog_factory_get_singleton (),
+                                        screen, monitor,
+                                        "gimp-quit-dialog", -1);
+
+      return TRUE; /* stop exit for now */
+    }
+
+  gimp->message_handler = GIMP_CONSOLE;
+
+  gui_unique_exit ();
+
+  /* If any modifier is set when quitting (typically when exiting with
+   * Ctrl-q for instance!), when serializing the tool options, it will
+   * save any alternate value instead of the main one. Make sure that
+   * any modifier is reset before saving options.
+   */
+  active_tool = tool_manager_get_active (gimp);
+  if  (active_tool && active_tool->focus_display)
+    gimp_tool_set_modifier_state  (active_tool, 0, active_tool->focus_display);
+
+  if (gui_config->save_session_info)
+    session_save (gimp, FALSE);
+
+  if (gui_config->save_device_status)
+    gimp_devices_save (gimp, FALSE);
+
+  if (TRUE /* gui_config->save_controllers */)
+    gimp_controllers_save (gimp);
+
+  g_signal_handlers_disconnect_by_func (gimp_get_user_context (gimp),
+                                        gui_display_changed,
+                                        gimp);
+
+  gimp_displays_delete (gimp);
+
+  if (gui_config->save_accels)
+    menus_save (gimp, FALSE);
+
+  gimp_tools_save (gimp, gui_config->save_tool_options, FALSE);
+  gimp_tools_exit (gimp);
+
+  gimp_language_store_parser_clean ();
+
+  return FALSE; /* continue exiting */
+}
+
+static gboolean
+gui_exit_after_callback (Gimp     *gimp,
+                         gboolean  force)
+{
+  if (gimp->be_verbose)
+    g_print ("EXIT: %s\n", G_STRFUNC);
+
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        gui_show_help_button_notify,
+                                        gimp);
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        gui_user_manual_notify,
+                                        gimp);
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        gui_show_tooltips_notify,
+                                        gimp);
+
+  gimp_action_history_exit (gimp);
+
+  g_object_unref (image_ui_manager);
+  image_ui_manager = NULL;
+
+  g_object_unref (ui_configurer);
+  ui_configurer = NULL;
+
+  /*  exit the clipboard before shutting down the GUI because it runs
+   *  a whole lot of code paths. See bug #731389.
+   */
+  g_signal_handlers_disconnect_by_func (gimp,
+                                        G_CALLBACK (gui_clipboard_changed),
+                                        NULL);
+  gimp_clipboard_exit (gimp);
+
+  session_exit (gimp);
+  menus_exit (gimp);
+  actions_exit (gimp);
+  gimp_render_exit (gimp);
+
+  gimp_controllers_exit (gimp);
+  gimp_devices_exit (gimp);
+  dialogs_exit (gimp);
+  themes_exit (gimp);
+
+  g_type_class_unref (g_type_class_peek (GIMP_TYPE_COLOR_SELECT));
+
+  return FALSE; /* continue exiting */
+}
+
+static void
+gui_show_tooltips_notify (GimpGuiConfig *gui_config,
+                          GParamSpec    *param_spec,
+                          Gimp          *gimp)
+{
+  if (gui_config->show_tooltips)
+    gimp_help_enable_tooltips ();
+  else
+    gimp_help_disable_tooltips ();
+}
+
+static void
+gui_show_help_button_notify (GimpGuiConfig *gui_config,
+                             GParamSpec    *param_spec,
+                             Gimp          *gimp)
+{
+  gimp_dialogs_show_help_button (gui_config->use_help &&
+                                 gui_config->show_help_button);
+}
+
+static void
+gui_user_manual_notify (GimpGuiConfig *gui_config,
+                        GParamSpec    *param_spec,
+                        Gimp          *gimp)
+{
+  gimp_help_user_manual_changed (gimp);
+}
+
+static void
+gui_single_window_mode_notify (GimpGuiConfig      *gui_config,
+                               GParamSpec         *pspec,
+                               GimpUIConfigurer   *ui_configurer)
+{
+  gimp_ui_configurer_configure (ui_configurer,
+                                gui_config->single_window_mode);
+}
+static void
+gui_tearoff_menus_notify (GimpGuiConfig *gui_config,
+                          GParamSpec    *pspec,
+                          GtkUIManager  *manager)
+{
+  gtk_ui_manager_set_add_tearoffs (manager, gui_config->tearoff_menus);
+}
+
+static void
+gui_clipboard_changed (Gimp *gimp)
+{
+  if (gimp_get_clipboard_image (gimp))
+    gimp_clipboard_set_image (gimp, gimp_get_clipboard_image (gimp));
+  else
+    gimp_clipboard_set_buffer (gimp, gimp_get_clipboard_buffer (gimp));
+}
+
+static void
+gui_menu_show_tooltip (GimpUIManager *manager,
+                       const gchar   *tooltip,
+                       Gimp          *gimp)
+{
+  GimpContext *context = gimp_get_user_context (gimp);
+  GimpDisplay *display = gimp_context_get_display (context);
+
+  if (display)
+    {
+      GimpDisplayShell *shell     = gimp_display_get_shell (display);
+      GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+      gimp_statusbar_push (statusbar, "menu-tooltip",
+                           NULL, "%s", tooltip);
+    }
+}
+
+static void
+gui_menu_hide_tooltip (GimpUIManager *manager,
+                       Gimp          *gimp)
+{
+  GimpContext *context = gimp_get_user_context (gimp);
+  GimpDisplay *display = gimp_context_get_display (context);
+
+  if (display)
+    {
+      GimpDisplayShell *shell     = gimp_display_get_shell (display);
+      GimpStatusbar    *statusbar = gimp_display_shell_get_statusbar (shell);
+
+      gimp_statusbar_pop (statusbar, "menu-tooltip");
+    }
+}
+
+static void
+gui_display_changed (GimpContext *context,
+                     GimpDisplay *display,
+                     Gimp        *gimp)
+{
+  if (! display)
+    {
+      GimpImage *image = gimp_context_get_image (context);
+
+      if (image)
+        {
+          GList *list;
+
+          for (list = gimp_get_display_iter (gimp);
+               list;
+               list = g_list_next (list))
+            {
+              GimpDisplay *display2 = list->data;
+
+              if (gimp_display_get_image (display2) == image)
+                {
+                  gimp_context_set_display (context, display2);
+
+                  /* stop the emission of the original signal
+                   * (the emission of the recursive signal is finished)
+                   */
+                  g_signal_stop_emission_by_name (context, "display-changed");
+                  return;
+                }
+            }
+
+          gimp_context_set_image (context, NULL);
+        }
+    }
+
+  gimp_ui_manager_update (image_ui_manager, display);
+}
+
+typedef struct
+{
+  const gchar     *path;
+  guint            key;
+  GdkModifierType  mods;
+}
+accelData;
+
+static void
+gui_compare_accelerator (gpointer         data,
+                         const gchar     *accel_path,
+                         guint            accel_key,
+                         GdkModifierType  accel_mods,
+                         gboolean         changed)
+{
+  accelData *accel = data;
+
+  if (accel->key == accel_key && accel->mods == accel_mods &&
+      g_strcmp0 (accel->path, accel_path))
+    {
+      g_printerr ("Actions \"%s\" and \"%s\" use the same accelerator.\n"
+                  "  Disabling the accelerator on \"%s\".\n",
+                  accel->path, accel_path, accel_path);
+      gtk_accel_map_change_entry (accel_path, 0, 0, FALSE);
+    }
+}
+
+static void
+gui_check_unique_accelerator (gpointer         data,
+                              const gchar     *accel_path,
+                              guint            accel_key,
+                              GdkModifierType  accel_mods,
+                              gboolean         changed)
+{
+  if (gtk_accelerator_valid (accel_key, accel_mods) &&
+      gui_check_action_exists (accel_path))
+    {
+      accelData accel;
+
+      accel.path = accel_path;
+      accel.key  = accel_key;
+      accel.mods = accel_mods;
+
+      gtk_accel_map_foreach_unfiltered (&accel,
+                                        gui_compare_accelerator);
+    }
+}
+
+static gboolean
+gui_check_action_exists (const gchar *accel_path)
+{
+  GimpUIManager *manager;
+  gboolean       action_exists = FALSE;
+  GList         *list;
+
+  manager = gimp_ui_managers_from_name ("<Image>")->data;
+
+  for (list = gimp_ui_manager_get_action_groups (manager);
+       list;
+       list = g_list_next (list))
+    {
+      GimpActionGroup *group   = list->data;
+      GList           *actions = NULL;
+      GList           *list2;
+
+      actions = gimp_action_group_list_actions (group);
+
+      for (list2 = actions; list2; list2 = g_list_next (list2))
+        {
+          GimpAction  *action = list2->data;
+          const gchar *path   = gimp_action_get_accel_path (action);
+
+          if (g_strcmp0 (path, accel_path) == 0)
+            {
+              action_exists = TRUE;
+              break;
+            }
+        }
+
+      g_list_free (actions);
+
+      if (action_exists)
+        break;
+    }
+
+  return action_exists;
+}
diff --git a/app/gui/gui.h b/app/gui/gui.h
new file mode 100644
index 0000000..4b0435d
--- /dev/null
+++ b/app/gui/gui.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GUI_H__
+#define __GUI_H__
+
+
+void               gui_libs_init (GOptionContext *context);
+void               gui_abort     (const gchar    *abort_message);
+
+GimpInitStatusFunc gui_init      (Gimp           *gimp,
+                                  gboolean        no_splash);
+
+gboolean           gui_recover   (gint            n_recoveries);
+
+#endif /* __GUI_H__ */
diff --git a/app/gui/icon-themes.c b/app/gui/icon-themes.c
new file mode 100644
index 0000000..27c39eb
--- /dev/null
+++ b/app/gui/icon-themes.c
@@ -0,0 +1,250 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * icon-themes.c
+ * Copyright (C) 2015 Benoit Touchette
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "gui-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "icon-themes.h"
+
+#include "gimp-intl.h"
+
+
+static void   icons_apply_theme         (Gimp          *gimp,
+                                         const gchar   *icon_theme_name);
+static void   icons_list_icons_foreach  (gpointer       key,
+                                         gpointer       value,
+                                         gpointer       data);
+static gint   icons_name_compare        (const void    *p1,
+                                         const void    *p2);
+static void   icons_theme_change_notify (GimpGuiConfig *config,
+                                         GParamSpec    *pspec,
+                                         Gimp          *gimp);
+
+
+static GHashTable *icon_themes_hash = NULL;
+
+
+void
+icon_themes_init (Gimp *gimp)
+{
+  GimpGuiConfig *config;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  icon_themes_hash = g_hash_table_new_full (g_str_hash,
+                                            g_str_equal,
+                                            g_free,
+                                            g_object_unref);
+
+  if (config->icon_theme_path)
+    {
+      GList *path;
+      GList *list;
+
+      path = gimp_config_path_expand_to_files (config->icon_theme_path, NULL);
+
+      for (list = path; list; list = g_list_next (list))
+        {
+          GFile           *dir = list->data;
+          GFileEnumerator *enumerator;
+
+          enumerator =
+            g_file_enumerate_children (dir,
+                                       G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                       G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                       G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                       G_FILE_QUERY_INFO_NONE,
+                                       NULL, NULL);
+
+          if (enumerator)
+            {
+              GFileInfo *info;
+
+              while ((info = g_file_enumerator_next_file (enumerator,
+                                                          NULL, NULL)))
+                {
+                  if (! g_file_info_get_is_hidden (info) &&
+                      g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
+                    {
+                      GFile *file;
+                      GFile *index_theme;
+
+                      file = g_file_enumerator_get_child (enumerator, info);
+
+                      /* make sure there is a hicolor/index.theme file */
+                      index_theme = g_file_get_child (file, "index.theme");
+
+                      if (g_file_query_exists (index_theme, NULL))
+                        {
+                          const gchar *name;
+                          gchar       *basename;
+
+                          name     = gimp_file_get_utf8_name (file);
+                          basename = g_path_get_basename (name);
+
+                          if (strcmp ("hicolor", basename))
+                            {
+                              if (gimp->be_verbose)
+                                g_print ("Adding icon theme '%s' (%s)\n",
+                                         basename, name);
+
+                              g_hash_table_insert (icon_themes_hash, basename,
+                                                   g_object_ref (file));
+                            }
+                          else
+                            {
+                              g_free (basename);
+                            }
+                        }
+
+                      g_object_unref (index_theme);
+                      g_object_unref (file);
+                    }
+
+                  g_object_unref (info);
+                }
+
+              g_object_unref (enumerator);
+            }
+        }
+
+      g_list_free_full (path, (GDestroyNotify) g_object_unref);
+    }
+
+  g_signal_connect (config, "notify::icon-theme",
+                    G_CALLBACK (icons_theme_change_notify),
+                    gimp);
+
+  icons_theme_change_notify (config, NULL, gimp);
+}
+
+void
+icon_themes_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (icon_themes_hash)
+    {
+      g_signal_handlers_disconnect_by_func (gimp->config,
+                                            icons_theme_change_notify,
+                                            gimp);
+
+      g_hash_table_destroy (icon_themes_hash);
+      icon_themes_hash = NULL;
+    }
+}
+
+gchar **
+icon_themes_list_themes (Gimp *gimp,
+                         gint *n_icon_themes)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (n_icon_themes != NULL, NULL);
+
+  *n_icon_themes = g_hash_table_size (icon_themes_hash);
+
+  if (*n_icon_themes > 0)
+    {
+      gchar **icon_themes;
+      gchar **index;
+
+      icon_themes = g_new0 (gchar *, *n_icon_themes + 1);
+
+      index = icon_themes;
+
+      g_hash_table_foreach (icon_themes_hash, icons_list_icons_foreach, &index);
+
+      qsort (icon_themes, *n_icon_themes, sizeof (gchar *), icons_name_compare);
+
+      return icon_themes;
+    }
+
+  return NULL;
+}
+
+GFile *
+icon_themes_get_theme_dir (Gimp        *gimp,
+                           const gchar *icon_theme_name)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (! icon_theme_name)
+    icon_theme_name = GIMP_CONFIG_DEFAULT_ICON_THEME;
+
+  return g_hash_table_lookup (icon_themes_hash, icon_theme_name);
+}
+
+static void
+icons_apply_theme (Gimp        *gimp,
+                   const gchar *icon_theme_name)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (! icon_theme_name)
+    icon_theme_name = GIMP_CONFIG_DEFAULT_ICON_THEME;
+
+  if (gimp->be_verbose)
+    g_print ("Loading icon theme '%s'\n", icon_theme_name);
+
+  gimp_icons_set_icon_theme (icon_themes_get_theme_dir (gimp, icon_theme_name));
+}
+
+static void
+icons_list_icons_foreach (gpointer key,
+                          gpointer value,
+                          gpointer data)
+{
+  gchar ***index = data;
+
+  **index = g_strdup ((gchar *) key);
+
+  (*index)++;
+}
+
+static gint
+icons_name_compare (const void *p1,
+                    const void *p2)
+{
+  return strcmp (* (char **) p1, * (char **) p2);
+}
+
+static void
+icons_theme_change_notify (GimpGuiConfig *config,
+                           GParamSpec    *pspec,
+                           Gimp          *gimp)
+{
+  icons_apply_theme (gimp, config->icon_theme);
+}
diff --git a/app/gui/icon-themes.h b/app/gui/icon-themes.h
new file mode 100644
index 0000000..14ecef9
--- /dev/null
+++ b/app/gui/icon-themes.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * icon-themes.h
+ * Copyright (C) 2015 Benoit Touchette
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ICONS_THEMES_H__
+#define __ICONS_THEMES_H__
+
+
+void     icon_themes_init          (Gimp        *gimp);
+void     icon_themes_exit          (Gimp        *gimp);
+
+gchar ** icon_themes_list_themes   (Gimp        *gimp,
+                                    gint        *n_themes);
+GFile  * icon_themes_get_theme_dir (Gimp        *gimp,
+                                    const gchar *theme_name);
+
+
+#endif /* __ICONS_THEMES_H__ */
diff --git a/app/gui/session.c b/app/gui/session.c
new file mode 100644
index 0000000..cfbc1c8
--- /dev/null
+++ b/app/gui/session.c
@@ -0,0 +1,486 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Session-managment stuff
+ * Copyright (C) 1998 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "gui-types.h"
+
+#include "config/gimpconfig-file.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimperror.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "dialogs/dialogs.h"
+
+#include "session.h"
+#include "gimp-log.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  SESSION_INFO = 1,
+  HIDE_DOCKS,
+  SINGLE_WINDOW_MODE,
+  SHOW_TABS,
+  TABS_POSITION,
+  LAST_TIP_SHOWN
+};
+
+
+static GFile * session_file (Gimp *gimp);
+
+
+/*  private variables  */
+
+static gboolean   sessionrc_deleted = FALSE;
+
+
+/*  public functions  */
+
+void
+session_init (Gimp *gimp)
+{
+  GFile      *file;
+  GScanner   *scanner;
+  GTokenType  token;
+  GError     *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  file = session_file (gimp);
+
+  scanner = gimp_scanner_new_gfile (file, &error);
+
+  if (! scanner && error->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
+    {
+      g_clear_error (&error);
+      g_object_unref (file);
+
+      file = gimp_sysconf_directory_file ("sessionrc", NULL);
+
+      scanner = gimp_scanner_new_gfile (file, NULL);
+    }
+
+  if (! scanner)
+    {
+      g_clear_error (&error);
+      g_object_unref (file);
+      return;
+    }
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  g_scanner_scope_add_symbol (scanner, 0, "session-info",
+                              GINT_TO_POINTER (SESSION_INFO));
+  g_scanner_scope_add_symbol (scanner, 0,  "hide-docks",
+                              GINT_TO_POINTER (HIDE_DOCKS));
+  g_scanner_scope_add_symbol (scanner, 0,  "single-window-mode",
+                              GINT_TO_POINTER (SINGLE_WINDOW_MODE));
+  g_scanner_scope_add_symbol (scanner, 0,  "show-tabs",
+                              GINT_TO_POINTER (SHOW_TABS));
+  g_scanner_scope_add_symbol (scanner, 0,  "tabs-position",
+                              GINT_TO_POINTER (TABS_POSITION));
+  g_scanner_scope_add_symbol (scanner, 0,  "last-tip-shown",
+                              GINT_TO_POINTER (LAST_TIP_SHOWN));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          if (scanner->value.v_symbol == GINT_TO_POINTER (SESSION_INFO))
+            {
+              GimpDialogFactory      *factory      = NULL;
+              GimpSessionInfo        *info         = NULL;
+              gchar                  *factory_name = NULL;
+              gchar                  *entry_name   = NULL;
+              GimpDialogFactoryEntry *entry        = NULL;
+
+              token = G_TOKEN_STRING;
+
+              if (! gimp_scanner_parse_string (scanner, &factory_name))
+                break;
+
+              /* In versions <= GIMP 2.6 there was a "toolbox", a
+               * "dock", a "display" and a "toplevel" factory. These
+               * are now merged to a single gimp_dialog_factory_get_singleton (). We
+               * need the legacy name though, so keep it around.
+               */
+              factory = gimp_dialog_factory_get_singleton ();
+
+              info = gimp_session_info_new ();
+
+              /* GIMP 2.6 has the entry name as part of the
+               * session-info header, so try to get it
+               */
+              gimp_scanner_parse_string (scanner, &entry_name);
+              if (entry_name)
+                {
+                  /* Previously, GimpDock was a toplevel. That is why
+                   * versions <= GIMP 2.6 has "dock" as the entry name. We
+                   * want "dock" to be interpreted as 'dock window'
+                   * however so have some special-casing for that. When
+                   * the entry name is "dock" the factory name is either
+                   * "dock" or "toolbox".
+                   */
+                  if (strcmp (entry_name, "dock") == 0)
+                    {
+                      entry =
+                        gimp_dialog_factory_find_entry (factory,
+                                                        (strcmp (factory_name, "toolbox") == 0 ?
+                                                         "gimp-toolbox-window" :
+                                                         "gimp-dock-window"));
+                    }
+                  else
+                    {
+                      entry = gimp_dialog_factory_find_entry (factory,
+                                                              entry_name);
+                    }
+                }
+
+              /* We're done with these now */
+              g_free (factory_name);
+              g_free (entry_name);
+
+              /* We can get the factory entry either now (the GIMP <=
+               * 2.6 way), or when we deserialize (the GIMP 2.8 way)
+               */
+              if (entry)
+                {
+                  gimp_session_info_set_factory_entry (info, entry);
+                }
+
+              /* Always try to deserialize */
+              if (gimp_config_deserialize (GIMP_CONFIG (info), scanner, 1, NULL))
+                {
+                  /* Make sure we got a factory entry either the 2.6
+                   * or 2.8 way
+                   */
+                  if (gimp_session_info_get_factory_entry (info))
+                    {
+                      GIMP_LOG (DIALOG_FACTORY,
+                                "successfully parsed and added session info %p",
+                                info);
+
+                      gimp_dialog_factory_add_session_info (factory, info);
+                    }
+                  else
+                    {
+                      GIMP_LOG (DIALOG_FACTORY,
+                                "failed to parse session info %p, not adding",
+                                info);
+                    }
+
+                  g_object_unref (info);
+                }
+              else
+                {
+                  g_object_unref (info);
+
+                  /* set token to left paren to we won't set another
+                   * error below, gimp_config_deserialize() already did
+                   */
+                  token = G_TOKEN_LEFT_PAREN;
+                  goto error;
+                }
+            }
+          else if (scanner->value.v_symbol == GINT_TO_POINTER (HIDE_DOCKS))
+            {
+              gboolean hide_docks;
+
+              token = G_TOKEN_IDENTIFIER;
+
+              if (! gimp_scanner_parse_boolean (scanner, &hide_docks))
+                break;
+
+              g_object_set (gimp->config,
+                            "hide-docks", hide_docks,
+                            NULL);
+            }
+          else if (scanner->value.v_symbol == GINT_TO_POINTER (SINGLE_WINDOW_MODE))
+            {
+              gboolean single_window_mode;
+
+              token = G_TOKEN_IDENTIFIER;
+
+              if (! gimp_scanner_parse_boolean (scanner, &single_window_mode))
+                break;
+
+              g_object_set (gimp->config,
+                            "single-window-mode", single_window_mode,
+                            NULL);
+            }
+          else if (scanner->value.v_symbol == GINT_TO_POINTER (SHOW_TABS))
+          {
+            gboolean show_tabs;
+
+            token = G_TOKEN_IDENTIFIER;
+
+            if (! gimp_scanner_parse_boolean (scanner, &show_tabs))
+              break;
+
+            g_object_set (gimp->config,
+                          "show-tabs", show_tabs,
+                          NULL);
+          }
+          else if (scanner->value.v_symbol == GINT_TO_POINTER (TABS_POSITION))
+            {
+              gint tabs_position;
+
+              token = G_TOKEN_INT;
+
+              if (! gimp_scanner_parse_int (scanner, &tabs_position))
+                break;
+
+              g_object_set (gimp->config,
+                            "tabs-position", tabs_position,
+                            NULL);
+            }
+          else if (scanner->value.v_symbol == GINT_TO_POINTER (LAST_TIP_SHOWN))
+            {
+              gint last_tip_shown;
+
+              token = G_TOKEN_INT;
+
+              if (! gimp_scanner_parse_int (scanner, &last_tip_shown))
+                break;
+
+              g_object_set (gimp->config,
+                            "last-tip-shown", last_tip_shown,
+                            NULL);
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+ error:
+
+  if (token != G_TOKEN_LEFT_PAREN)
+    {
+      g_scanner_get_next_token (scanner);
+      g_scanner_unexp_token (scanner, token, NULL, NULL, NULL,
+                             _("fatal parse error"), TRUE);
+    }
+
+  if (error)
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_clear_error (&error);
+
+      gimp_config_file_backup_on_error (file, "sessionrc", NULL);
+    }
+
+  gimp_scanner_destroy (scanner);
+  g_object_unref (file);
+
+  dialogs_load_recent_docks (gimp);
+}
+
+void
+session_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+}
+
+void
+session_restore (Gimp      *gimp,
+                 GdkScreen *screen,
+                 gint       monitor)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  gimp_dialog_factory_restore (gimp_dialog_factory_get_singleton (),
+                               screen, monitor);
+
+  /* make sure GimpImageWindow acts upon hide-docks at the right time,
+   * see bug #678043.
+   */
+  if (GIMP_GUI_CONFIG (gimp->config)->single_window_mode &&
+      GIMP_GUI_CONFIG (gimp->config)->hide_docks)
+    {
+      g_object_notify (G_OBJECT (gimp->config), "hide-docks");
+    }
+}
+
+void
+session_save (Gimp     *gimp,
+              gboolean  always_save)
+{
+  GimpConfigWriter *writer;
+  GFile            *file;
+  GError           *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (sessionrc_deleted && ! always_save)
+    return;
+
+  file = session_file (gimp);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  writer =
+    gimp_config_writer_new_gfile (file,
+                                  TRUE,
+                                  "GIMP sessionrc\n\n"
+                                  "This file takes session-specific info "
+                                  "(that is info, you want to keep between "
+                                  "two GIMP sessions).  You are not supposed "
+                                  "to edit it manually, but of course you "
+                                  "can do.  The sessionrc will be entirely "
+                                  "rewritten every time you quit GIMP.  "
+                                  "If this file isn't found, defaults are "
+                                  "used.",
+                                  NULL);
+  g_object_unref (file);
+
+  if (!writer)
+    return;
+
+  gimp_dialog_factory_save (gimp_dialog_factory_get_singleton (), writer);
+  gimp_config_writer_linefeed (writer);
+
+  gimp_config_writer_open (writer, "hide-docks");
+  gimp_config_writer_identifier (writer,
+                                 GIMP_GUI_CONFIG (gimp->config)->hide_docks ?
+                                 "yes" : "no");
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_open (writer, "single-window-mode");
+  gimp_config_writer_identifier (writer,
+                                 GIMP_GUI_CONFIG (gimp->config)->single_window_mode ?
+                                 "yes" : "no");
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_open (writer, "show-tabs");
+  gimp_config_writer_printf (writer,
+                             GIMP_GUI_CONFIG (gimp->config)->show_tabs ?
+                             "yes" : "no");
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_open (writer, "tabs-position");
+  gimp_config_writer_printf (writer, "%d",
+                             GIMP_GUI_CONFIG (gimp->config)->tabs_position);
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_open (writer, "last-tip-shown");
+  gimp_config_writer_printf (writer, "%d",
+                             GIMP_GUI_CONFIG (gimp->config)->last_tip_shown);
+  gimp_config_writer_close (writer);
+
+  if (! gimp_config_writer_finish (writer, "end of sessionrc", &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_clear_error (&error);
+    }
+
+  dialogs_save_recent_docks (gimp);
+
+  sessionrc_deleted = FALSE;
+}
+
+gboolean
+session_clear (Gimp    *gimp,
+               GError **error)
+{
+  GFile    *file;
+  GError   *my_error = NULL;
+  gboolean  success  = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file = session_file (gimp);
+
+  if (! g_file_delete (file, NULL, &my_error) &&
+      my_error->code != G_IO_ERROR_NOT_FOUND)
+    {
+      success = FALSE;
+
+      g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                   _("Deleting \"%s\" failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+    }
+  else
+    {
+      sessionrc_deleted = TRUE;
+    }
+
+  g_clear_error (&my_error);
+  g_object_unref (file);
+
+  return success;
+}
+
+
+static GFile *
+session_file (Gimp *gimp)
+{
+  const gchar *basename;
+  gchar       *filename;
+  GFile       *file;
+
+  basename = g_getenv ("GIMP_TESTING_SESSIONRC_NAME");
+  if (! basename)
+    basename = "sessionrc";
+
+  if (gimp->session_name)
+    filename = g_strconcat (basename, ".", gimp->session_name, NULL);
+  else
+    filename = g_strdup (basename);
+
+  file = gimp_directory_file (filename, NULL);
+
+  g_free (filename);
+
+  return file;
+}
diff --git a/app/gui/session.h b/app/gui/session.h
new file mode 100644
index 0000000..aff1145
--- /dev/null
+++ b/app/gui/session.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SESSION_H__
+#define __SESSION_H__
+
+
+void       session_init    (Gimp      *gimp);
+void       session_exit    (Gimp      *gimp);
+
+void       session_restore (Gimp      *gimp,
+                            GdkScreen *screen,
+                            gint       monitor);
+void       session_save    (Gimp      *gimp,
+                            gboolean   always_save);
+
+gboolean   session_clear   (Gimp      *gimp,
+                            GError   **error);
+
+
+#endif  /*  __SESSION_H__  */
diff --git a/app/gui/splash.c b/app/gui/splash.c
new file mode 100644
index 0000000..f257e7b
--- /dev/null
+++ b/app/gui/splash.c
@@ -0,0 +1,736 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "gui-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "splash.h"
+
+#include "gimp-intl.h"
+
+
+#define MEASURE_UPPER "1235678901234567890"
+#define MEASURE_LOWER "12356789012345678901234567890"
+
+
+typedef struct
+{
+  GtkWidget      *window;
+  GtkWidget      *area;
+  gint            width;
+  gint            height;
+  GtkWidget      *progress;
+  GdkColor        color;
+  PangoLayout    *upper;
+  gint            upper_x;
+  gint            upper_y;
+  PangoLayout    *lower;
+  gint            lower_x;
+  gint            lower_y;
+
+  gdouble         percentage;
+  gchar          *text1;
+  gchar          *text2;
+
+  /* debug timer */
+  GTimer         *timer;
+  gdouble         last_time;
+} GimpSplash;
+
+static GimpSplash *splash = NULL;
+
+
+static void        splash_position_layouts     (GimpSplash     *splash,
+                                                const gchar    *text1,
+                                                const gchar    *text2,
+                                                GdkRectangle   *area);
+static gboolean    splash_area_expose          (GtkWidget      *widget,
+                                                GdkEventExpose *event,
+                                                GimpSplash     *splash);
+static void        splash_rectangle_union      (GdkRectangle   *dest,
+                                                PangoRectangle *pango_rect,
+                                                gint            offset_x,
+                                                gint            offset_y);
+static gboolean    splash_average_text_area    (GimpSplash     *splash,
+                                                GdkPixbuf      *pixbuf,
+                                                GdkColor       *color);
+
+static GdkPixbufAnimation *
+                   splash_image_load           (gint            max_width,
+                                                gint            max_height,
+                                                gboolean        be_verbose);
+static GdkPixbufAnimation *
+                   splash_image_load_from_path (const gchar    *filename,
+                                                gint            max_width,
+                                                gint            max_height,
+                                                gboolean        be_verbose);
+static GdkPixbufAnimation *
+                   splash_image_load_from_file (GFile    *file,
+                                                gint      max_width,
+                                                gint      max_height,
+                                                gboolean  be_verbose);
+static GdkPixbufAnimation *
+                   splash_image_pick_from_dirs (GList          *dirs,
+                                                gint            max_width,
+                                                gint            max_height,
+                                                gboolean        be_verbose);
+
+static void        splash_timer_elapsed        (void);
+
+
+/*  public functions  */
+
+void
+splash_create (gboolean   be_verbose,
+               GdkScreen *screen,
+               gint       monitor)
+{
+  GtkWidget          *frame;
+  GtkWidget          *vbox;
+  GdkPixbufAnimation *pixbuf;
+  PangoRectangle      ink;
+  gint                max_width;
+  gint                max_height;
+
+  g_return_if_fail (splash == NULL);
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  max_width  = gdk_screen_get_width (screen) / 2;
+  max_height = gdk_screen_get_height (screen) / 2;
+  pixbuf = splash_image_load (max_width, max_height, be_verbose);
+
+  if (! pixbuf)
+    return;
+
+  splash = g_slice_new0 (GimpSplash);
+
+  splash->window =
+    g_object_new (GTK_TYPE_WINDOW,
+                  "type",            GTK_WINDOW_TOPLEVEL,
+                  "type-hint",       GDK_WINDOW_TYPE_HINT_SPLASHSCREEN,
+                  "title",           _("GIMP Startup"),
+                  "role",            "gimp-startup",
+                  "screen",          screen,
+                  "window-position", GTK_WIN_POS_CENTER,
+                  "resizable",       FALSE,
+                  NULL);
+
+  /* Don't remove this call, it's necessary to remove decorations on Windows
+   * (which is the natural state of splash-screens). Looks like the
+   * GDK_WINDOW_TYPE_HINT_SPLASHSCREEN hint is not used on some platforms.
+   */
+  gtk_window_set_decorated (GTK_WINDOW (splash->window), FALSE);
+
+  g_signal_connect_swapped (splash->window, "delete-event",
+                            G_CALLBACK (exit),
+                            GINT_TO_POINTER (0));
+
+  splash->width  = MIN (gdk_pixbuf_animation_get_width (pixbuf),
+                        gdk_screen_get_width (screen));
+  splash->height = MIN (gdk_pixbuf_animation_get_height (pixbuf),
+                        gdk_screen_get_height (screen));
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (splash->window), frame);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  splash->area = gtk_image_new_from_animation (pixbuf);
+  gtk_box_pack_start (GTK_BOX (vbox), splash->area, TRUE, TRUE, 0);
+  gtk_widget_show (splash->area);
+
+  gtk_widget_set_size_request (splash->area, splash->width, splash->height);
+
+  /*  create the pango layouts  */
+  splash->upper = gtk_widget_create_pango_layout (splash->area,
+                                                  MEASURE_UPPER);
+  pango_layout_get_pixel_extents (splash->upper, &ink, NULL);
+
+  if (splash->width > 4 * ink.width)
+    gimp_pango_layout_set_scale (splash->upper, PANGO_SCALE_X_LARGE);
+  else if (splash->width > 3 * ink.width)
+    gimp_pango_layout_set_scale (splash->upper, PANGO_SCALE_LARGE);
+  else if (splash->width > 2 * ink.width)
+    gimp_pango_layout_set_scale (splash->upper, PANGO_SCALE_MEDIUM);
+  else
+    gimp_pango_layout_set_scale (splash->upper, PANGO_SCALE_MEDIUM);
+
+  splash->lower = gtk_widget_create_pango_layout (splash->area,
+                                                  MEASURE_LOWER);
+  pango_layout_get_pixel_extents (splash->lower, &ink, NULL);
+
+  if (splash->width > 4 * ink.width)
+    gimp_pango_layout_set_scale (splash->lower, PANGO_SCALE_LARGE);
+  else if (splash->width > 3 * ink.width)
+    gimp_pango_layout_set_scale (splash->lower, PANGO_SCALE_MEDIUM);
+  else if (splash->width > 2 * ink.width)
+    gimp_pango_layout_set_scale (splash->lower, PANGO_SCALE_SMALL);
+  else
+    gimp_pango_layout_set_scale (splash->lower, PANGO_SCALE_X_SMALL);
+
+  /*  this sets the initial layout positions  */
+  splash_position_layouts (splash, "", "", NULL);
+
+  splash_average_text_area (splash,
+                            gdk_pixbuf_animation_get_static_image (pixbuf),
+                            &splash->color);
+
+  g_object_unref (pixbuf);
+
+  g_signal_connect_after (splash->area, "expose-event",
+                          G_CALLBACK (splash_area_expose),
+                          splash);
+
+  /*  add a progress bar  */
+  splash->progress = gtk_progress_bar_new ();
+  gtk_box_pack_end (GTK_BOX (vbox), splash->progress, FALSE, FALSE, 0);
+  gtk_widget_show (splash->progress);
+
+  gtk_widget_show (splash->window);
+
+  if (FALSE)
+    splash->timer = g_timer_new ();
+}
+
+void
+splash_destroy (void)
+{
+  if (! splash)
+    return;
+
+  gtk_widget_destroy (splash->window);
+
+  g_object_unref (splash->upper);
+  g_object_unref (splash->lower);
+
+  g_free (splash->text1);
+  g_free (splash->text2);
+
+  if (splash->timer)
+    g_timer_destroy (splash->timer);
+
+  g_slice_free (GimpSplash, splash);
+  splash = NULL;
+}
+
+void
+splash_update (const gchar *text1,
+               const gchar *text2,
+               gdouble      percentage)
+{
+  static GdkRectangle prev_expose = { 0, 0, 0, 0 };
+  GdkRectangle        expose      = { 0, 0, 0, 0 };
+
+  g_return_if_fail (percentage >= 0.0 && percentage <= 1.0);
+
+  if (! splash)
+    return;
+
+  splash_position_layouts (splash, text1, text2, &expose);
+  gdk_rectangle_union (&expose, &prev_expose, &expose);
+
+  if (expose.width > 0 && expose.height > 0)
+    gtk_widget_queue_draw_area (splash->area,
+                                expose.x, expose.y,
+                                expose.width, expose.height);
+
+  prev_expose = expose;
+
+  if ((text1 == NULL || ! g_strcmp0 (text1, splash->text1)) &&
+      (text2 == NULL || ! g_strcmp0 (text2, splash->text2)) &&
+      percentage == splash->percentage)
+    {
+      if (text1)
+        {
+          g_free (splash->text1);
+          splash->text1 = g_strdup (text1);
+        }
+
+      if (text2)
+        {
+          g_free (splash->text2);
+          splash->text2 = g_strdup (text2);
+        }
+
+      gtk_progress_bar_pulse (GTK_PROGRESS_BAR (splash->progress));
+    }
+  else
+    {
+      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (splash->progress),
+                                     percentage);
+    }
+
+  splash->percentage = percentage;
+
+  if (splash->timer)
+    splash_timer_elapsed ();
+
+  if (gtk_events_pending ())
+    gtk_main_iteration ();
+}
+
+
+/*  private functions  */
+
+static gboolean
+splash_area_expose (GtkWidget      *widget,
+                    GdkEventExpose *event,
+                    GimpSplash     *splash)
+{
+  cairo_t *cr = gdk_cairo_create (event->window);
+
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  gdk_cairo_set_source_color (cr, &splash->color);
+
+  cairo_move_to (cr, splash->upper_x, splash->upper_y);
+  pango_cairo_show_layout (cr, splash->upper);
+
+  cairo_move_to (cr, splash->lower_x, splash->lower_y);
+  pango_cairo_show_layout (cr, splash->lower);
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+/* area returns the union of the previous and new ink rectangles */
+static void
+splash_position_layouts (GimpSplash   *splash,
+                         const gchar  *text1,
+                         const gchar  *text2,
+                         GdkRectangle *area)
+{
+  PangoRectangle  upper_ink;
+  PangoRectangle  lower_ink;
+  gint            text_height = 0;
+
+  if (text1)
+    {
+      pango_layout_get_pixel_extents (splash->upper, &upper_ink, NULL);
+
+      if (area)
+        splash_rectangle_union (area, &upper_ink,
+                                splash->upper_x, splash->upper_y);
+
+      pango_layout_set_text (splash->upper, text1, -1);
+      pango_layout_get_pixel_extents (splash->upper,
+                                      &upper_ink, NULL);
+
+      splash->upper_x = (splash->width - upper_ink.width) / 2;
+      text_height += upper_ink.height;
+    }
+
+  if (text2)
+    {
+      pango_layout_get_pixel_extents (splash->lower, &lower_ink, NULL);
+
+      if (area)
+        splash_rectangle_union (area, &lower_ink,
+                                splash->lower_x, splash->lower_y);
+
+      pango_layout_set_text (splash->lower, text2, -1);
+      pango_layout_get_pixel_extents (splash->lower,
+                                      &lower_ink, NULL);
+
+      splash->lower_x = (splash->width - lower_ink.width) / 2;
+      text_height += lower_ink.height;
+    }
+
+  /* For pretty printing, let's say we want at least double space. */
+  text_height *= 2;
+
+  /* The ordinates are computed in 2 steps, because we are first
+   * checking the minimal height needed for text (text_height).
+   *
+   * Ideally we are printing in the bottom quarter of the splash image,
+   * with well centered positions. But if this zone appears to be too
+   * small, we will end up using this previously computed text_height
+   * instead. Since splash images are designed to have text in the lower
+   * quarter, this may end up a bit uglier, but at least top and bottom
+   * texts won't overlay each other.
+   */
+  if (text1)
+    {
+      splash->upper_y = MIN (splash->height - text_height,
+                             splash->height * 13 / 16 -
+                             upper_ink.height / 2);
+
+      if (area)
+        splash_rectangle_union (area, &upper_ink,
+                                splash->upper_x, splash->upper_y);
+    }
+
+  if (text2)
+    {
+      splash->lower_y = ((splash->height + splash->upper_y) / 2 -
+                         lower_ink.height / 2);
+
+      if (area)
+        splash_rectangle_union (area, &lower_ink,
+                                splash->lower_x, splash->lower_y);
+    }
+}
+
+static void
+splash_rectangle_union (GdkRectangle   *dest,
+                        PangoRectangle *pango_rect,
+                        gint            offset_x,
+                        gint            offset_y)
+{
+  GdkRectangle  rect;
+
+  rect.x      = pango_rect->x + offset_x;
+  rect.y      = pango_rect->y + offset_y;
+  rect.width  = pango_rect->width;
+  rect.height = pango_rect->height;
+
+  if (dest->width > 0 && dest->height > 0)
+    gdk_rectangle_union (dest, &rect, dest);
+  else
+    *dest = rect;
+}
+
+/* This function chooses a gray value for the text color, based on
+ * the average luminance of the text area of the splash image.
+ */
+static gboolean
+splash_average_text_area (GimpSplash *splash,
+                          GdkPixbuf  *pixbuf,
+                          GdkColor   *color)
+{
+  const guchar *pixels;
+  gint          rowstride;
+  gint          channels;
+  gint          luminance = 0;
+  guint         sum[3]    = { 0, 0, 0 };
+  GdkRectangle  image     = { 0, 0, 0, 0 };
+  GdkRectangle  area      = { 0, 0, 0, 0 };
+
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE);
+  g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8, FALSE);
+
+  image.width  = gdk_pixbuf_get_width (pixbuf);
+  image.height = gdk_pixbuf_get_height (pixbuf);
+  rowstride    = gdk_pixbuf_get_rowstride (pixbuf);
+  channels     = gdk_pixbuf_get_n_channels (pixbuf);
+  pixels       = gdk_pixbuf_get_pixels (pixbuf);
+
+  splash_position_layouts (splash, MEASURE_UPPER, MEASURE_LOWER, &area);
+  splash_position_layouts (splash, "", "", NULL);
+
+  if (gdk_rectangle_intersect (&image, &area, &area))
+    {
+      const gint count = area.width * area.height;
+      gint       x, y;
+
+      pixels += area.x * channels;
+      pixels += area.y * rowstride;
+
+      for (y = 0; y < area.height; y++)
+        {
+          const guchar *src = pixels;
+
+          for (x = 0; x < area.width; x++)
+            {
+              sum[0] += src[0];
+              sum[1] += src[1];
+              sum[2] += src[2];
+
+              src += channels;
+            }
+
+          pixels += rowstride;
+        }
+
+      luminance = GIMP_RGB_LUMINANCE (sum[0] / count,
+                                      sum[1] / count,
+                                      sum[2] / count);
+
+      luminance = CLAMP0255 (luminance > 127 ?
+                             luminance - 223 : luminance + 223);
+
+    }
+
+  color->red = color->green = color->blue = (luminance << 8 | luminance);
+
+  return gdk_colormap_alloc_color (gtk_widget_get_colormap (splash->area),
+                                   color, FALSE, TRUE);
+}
+
+static GdkPixbufAnimation *
+splash_image_load (gint      max_width,
+                   gint      max_height,
+                   gboolean  be_verbose)
+{
+  GdkPixbufAnimation *animation = NULL;
+  gchar              *filename;
+  GFile              *file;
+  GList              *list;
+
+  /* File "gimp-splash.png" in personal configuration directory. */
+  filename = gimp_personal_rc_file ("gimp-splash.png");
+  animation = splash_image_load_from_path (filename,
+                                           max_width, max_height,
+                                           be_verbose);
+  g_free (filename);
+  if (animation)
+    return animation;
+
+  /* Random image under splashes/ directory in personal config dir. */
+  filename = gimp_personal_rc_file ("splashes");
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+  list = NULL;
+  list = g_list_prepend (list, file);
+  animation = splash_image_pick_from_dirs (list,
+                                           max_width, max_height,
+                                           be_verbose);
+  g_list_free_full (list, g_object_unref);
+  if (animation)
+    return animation;
+
+  /* Release splash image. */
+  filename = g_build_filename (gimp_data_directory (),
+                               "images", "gimp-splash.png", NULL);
+  animation = splash_image_load_from_path (filename,
+                                           max_width, max_height,
+                                           be_verbose);
+  g_free (filename);
+  if (animation)
+    return animation;
+
+  /* Random release image in installed splashes/ directory. */
+  filename = g_build_filename (gimp_data_directory (), "splashes", NULL);
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+  list = NULL;
+  list = g_list_prepend (list, file);
+  animation = splash_image_pick_from_dirs (list,
+                                           max_width, max_height,
+                                           be_verbose);
+  g_list_free_full (list, g_object_unref);
+
+  return animation;
+}
+
+static GdkPixbufAnimation *
+splash_image_load_from_path (const gchar *filename,
+                             gint         max_width,
+                             gint         max_height,
+                             gboolean     be_verbose)
+{
+  GdkPixbufAnimation *animation;
+  GFile              *file;
+
+  file = g_file_new_for_path (filename);
+  animation = splash_image_load_from_file (file,
+                                           max_width, max_height,
+                                           be_verbose);
+  g_object_unref (file);
+
+  return animation;
+}
+
+static GdkPixbufAnimation *
+splash_image_load_from_file (GFile    *file,
+                             gint      max_width,
+                             gint      max_height,
+                             gboolean  be_verbose)
+{
+  GdkPixbufAnimation *animation = NULL;
+  GFileInfo          *info;
+  GFileInputStream   *input;
+  gboolean            is_svg = FALSE;
+
+  if (be_verbose)
+    {
+      gchar *path;
+
+      path = g_file_get_path (file);
+
+      g_printerr ("Trying splash '%s' ... ", path);
+
+      g_free (path);
+    }
+
+  info = g_file_query_info (file,
+                            G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+                            G_FILE_QUERY_INFO_NONE, NULL, NULL);
+  if (info)
+    {
+      const gchar *content_type;
+
+      content_type = g_file_info_get_content_type (info);
+      if (content_type)
+        {
+          gchar *mime_type;
+
+          mime_type = g_content_type_get_mime_type (content_type);
+          if (mime_type)
+            {
+              if (g_strcmp0 (mime_type, "image/svg+xml") == 0)
+                {
+                  /* We want to treat vector images differently than
+                   * pixel images. We only scale down bitmaps, but we
+                   * don't try to scale them up.
+                   * On the other hand, we can always scale down and up
+                   * vector images so that they end up in an ideal size
+                   * in all cases.
+                   */
+                  is_svg = TRUE;
+                }
+              g_free (mime_type);
+            }
+        }
+      g_object_unref (info);
+    }
+
+  input = g_file_read (file, NULL, NULL);
+  if (input)
+    {
+      animation = gdk_pixbuf_animation_new_from_stream (G_INPUT_STREAM (input),
+                                                        NULL, NULL);
+      g_object_unref (input);
+    }
+
+  /* FIXME Right now, we only try to scale static images.
+   * Animated images may end up bigger than the expected max dimensions.
+   */
+  if (animation && gdk_pixbuf_animation_is_static_image (animation) &&
+      (gdk_pixbuf_animation_get_width (animation) > max_width        ||
+       gdk_pixbuf_animation_get_height (animation) > max_height      ||
+       is_svg))
+    {
+      GdkPixbuf *pixbuf;
+
+      input = g_file_read (file, NULL, NULL);
+      pixbuf = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (input),
+                                                    max_width, max_height,
+                                                    TRUE, NULL, NULL);
+      g_object_unref (input);
+      if (pixbuf)
+        {
+          GdkPixbufSimpleAnim *simple_anim = NULL;
+
+          simple_anim = gdk_pixbuf_simple_anim_new (gdk_pixbuf_get_width (pixbuf),
+                                                    gdk_pixbuf_get_height (pixbuf),
+                                                    1.0);
+          if (simple_anim)
+            {
+              gdk_pixbuf_simple_anim_add_frame (simple_anim, pixbuf);
+
+              g_object_unref (animation);
+              animation = GDK_PIXBUF_ANIMATION (simple_anim);
+            }
+          g_object_unref (pixbuf);
+        }
+    }
+
+  if (be_verbose)
+    g_printerr (animation ? "OK\n" : "failed\n");
+
+  return animation;
+}
+
+static GdkPixbufAnimation *
+splash_image_pick_from_dirs (GList    *dirs,
+                             gint      max_width,
+                             gint      max_height,
+                             gboolean  be_verbose)
+{
+  GdkPixbufAnimation *animation = NULL;
+  GList              *splashes = NULL;
+  GList              *iter;
+
+  for (iter = dirs; iter; iter = iter->next)
+    {
+      GFileEnumerator *enumerator;
+
+      enumerator = g_file_enumerate_children (iter->data,
+                                              G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                              G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                              G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                              G_FILE_QUERY_INFO_NONE,
+                                              NULL, NULL);
+      if (enumerator)
+        {
+          GFileInfo *info;
+
+          while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
+            {
+              GFile *child;
+
+              child = g_file_enumerator_get_child (enumerator, info);
+              if (g_file_query_file_type (child,
+                                          G_FILE_QUERY_INFO_NONE,
+                                          NULL) == G_FILE_TYPE_REGULAR)
+                splashes = g_list_prepend (splashes, child);
+              else
+                g_object_unref (child);
+              g_object_unref (info);
+            }
+
+          g_object_unref (enumerator);
+        }
+    }
+
+  if (splashes)
+    {
+      gint32 i = g_random_int_range (0, g_list_length (splashes));
+
+      animation = splash_image_load_from_file (g_list_nth_data (splashes, i),
+                                               max_width, max_height,
+                                               be_verbose);
+      g_list_free_full (splashes, (GDestroyNotify) g_object_unref);
+    }
+
+  return animation;
+}
+
+static void
+splash_timer_elapsed (void)
+{
+  gdouble elapsed = g_timer_elapsed (splash->timer, NULL);
+
+  g_printerr ("%8g  %8g  -  %s %g%%  -  %s\n",
+              elapsed,
+              elapsed - splash->last_time,
+              splash->text1 ? splash->text1 : "",
+              splash->percentage * 100.0,
+              splash->text2 ? splash->text2 : "");
+
+  splash->last_time = elapsed;
+}
diff --git a/app/gui/splash.h b/app/gui/splash.h
new file mode 100644
index 0000000..a44f9b3
--- /dev/null
+++ b/app/gui/splash.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SPLASH_H__
+#define __SPLASH_H__
+
+
+void   splash_create    (gboolean     be_verbose,
+                         GdkScreen   *screen,
+                         gint         monitor);
+void   splash_destroy   (void);
+
+void   splash_update    (const gchar *label1,
+                         const gchar *label2,
+                         gdouble      percentage);
+
+
+#endif /* __SPLASH_H__ */
diff --git a/app/gui/themes.c b/app/gui/themes.c
new file mode 100644
index 0000000..0307094
--- /dev/null
+++ b/app/gui/themes.c
@@ -0,0 +1,535 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#ifdef GDK_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#endif
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "gui-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "themes.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   themes_write_style         (GimpGuiConfig          *config,
+                                          GOutputStream          *output,
+                                          GError                **error);
+static void   themes_apply_theme         (Gimp                   *gimp,
+                                          GimpGuiConfig          *config);
+static void   themes_list_themes_foreach (gpointer                key,
+                                          gpointer                value,
+                                          gpointer                data);
+static gint   themes_name_compare        (const void             *p1,
+                                          const void             *p2);
+static void   themes_theme_change_notify (GimpGuiConfig          *config,
+                                          GParamSpec             *pspec,
+                                          Gimp                   *gimp);
+
+static void   themes_fix_pixbuf_style    (void);
+static void   themes_draw_pixbuf_layout  (GtkStyle               *style,
+                                          GdkWindow              *window,
+                                          GtkStateType            state_type,
+                                          gboolean                use_text,
+                                          GdkRectangle           *area,
+                                          GtkWidget              *widget,
+                                          const gchar            *detail,
+                                          gint                    x,
+                                          gint                    y,
+                                          PangoLayout            *layout);
+
+/*  private variables  */
+
+static GHashTable    *themes_hash        = NULL;
+static GtkStyleClass *pixbuf_style_class = NULL;
+
+
+/*  public functions  */
+
+void
+themes_init (Gimp *gimp)
+{
+  GimpGuiConfig *config;
+  gchar         *themerc;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  themes_hash = g_hash_table_new_full (g_str_hash,
+                                       g_str_equal,
+                                       g_free,
+                                       g_object_unref);
+
+  if (config->theme_path)
+    {
+      GList *path;
+      GList *list;
+
+      path = gimp_config_path_expand_to_files (config->theme_path, NULL);
+
+      for (list = path; list; list = g_list_next (list))
+        {
+          GFile           *dir = list->data;
+          GFileEnumerator *enumerator;
+
+          enumerator =
+            g_file_enumerate_children (dir,
+                                       G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                       G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                       G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                       G_FILE_QUERY_INFO_NONE,
+                                       NULL, NULL);
+
+          if (enumerator)
+            {
+              GFileInfo *info;
+
+              while ((info = g_file_enumerator_next_file (enumerator,
+                                                          NULL, NULL)))
+                {
+                  if (! g_file_info_get_is_hidden (info) &&
+                      g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
+                    {
+                      GFile       *file;
+                      const gchar *name;
+                      gchar       *basename;
+
+                      file = g_file_enumerator_get_child (enumerator, info);
+                      name = gimp_file_get_utf8_name (file);
+
+                      basename = g_path_get_basename (name);
+
+                      if (gimp->be_verbose)
+                        g_print ("Adding theme '%s' (%s)\n",
+                                 basename, name);
+
+                      g_hash_table_insert (themes_hash, basename, file);
+                    }
+
+                  g_object_unref (info);
+                }
+
+              g_object_unref (enumerator);
+            }
+        }
+
+      g_list_free_full (path, (GDestroyNotify) g_object_unref);
+    }
+
+  themes_apply_theme (gimp, config);
+
+  themerc = gimp_personal_rc_file ("themerc");
+  gtk_rc_parse (themerc);
+  g_free (themerc);
+
+  themes_fix_pixbuf_style ();
+
+  g_signal_connect (config, "notify::theme",
+                    G_CALLBACK (themes_theme_change_notify),
+                    gimp);
+  g_signal_connect (config, "notify::compact-sliders",
+                    G_CALLBACK (themes_theme_change_notify),
+                    gimp);
+}
+
+void
+themes_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (themes_hash)
+    {
+      g_signal_handlers_disconnect_by_func (gimp->config,
+                                            themes_theme_change_notify,
+                                            gimp);
+
+      g_hash_table_destroy (themes_hash);
+      themes_hash = NULL;
+    }
+
+  g_clear_pointer (&pixbuf_style_class, g_type_class_unref);
+}
+
+gchar **
+themes_list_themes (Gimp *gimp,
+                    gint *n_themes)
+{
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (n_themes != NULL, NULL);
+
+  *n_themes = g_hash_table_size (themes_hash);
+
+  if (*n_themes > 0)
+    {
+      gchar **themes;
+      gchar **index;
+
+      themes = g_new0 (gchar *, *n_themes + 1);
+
+      index = themes;
+
+      g_hash_table_foreach (themes_hash, themes_list_themes_foreach, &index);
+
+      qsort (themes, *n_themes, sizeof (gchar *), themes_name_compare);
+
+      return themes;
+    }
+
+  return NULL;
+}
+
+GFile *
+themes_get_theme_dir (Gimp        *gimp,
+                      const gchar *theme_name)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  if (! theme_name)
+    theme_name = GIMP_CONFIG_DEFAULT_THEME;
+
+  return g_hash_table_lookup (themes_hash, theme_name);
+}
+
+GFile *
+themes_get_theme_file (Gimp        *gimp,
+                       const gchar *first_component,
+                       ...)
+{
+  GimpGuiConfig *gui_config;
+  GFile         *file;
+  const gchar   *component;
+  va_list        args;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (first_component != NULL, NULL);
+
+  gui_config = GIMP_GUI_CONFIG (gimp->config);
+
+  file      = g_object_ref (themes_get_theme_dir (gimp, gui_config->theme));
+  component = first_component;
+
+  va_start (args, first_component);
+
+  do
+    {
+      GFile *tmp = g_file_get_child (file, component);
+      g_object_unref (file);
+      file = tmp;
+    }
+  while ((component = va_arg (args, gchar *)));
+
+  va_end (args);
+
+  if (! g_file_query_exists (file, NULL))
+    {
+      g_object_unref (file);
+
+      file      = g_object_ref (themes_get_theme_dir (gimp, NULL));
+      component = first_component;
+
+      va_start (args, first_component);
+
+      do
+        {
+          GFile *tmp = g_file_get_child (file, component);
+          g_object_unref (file);
+          file = tmp;
+        }
+      while ((component = va_arg (args, gchar *)));
+
+      va_end (args);
+    }
+
+  return file;
+}
+
+
+/*  private functions  */
+
+static void
+themes_write_style (GimpGuiConfig  *config,
+                    GOutputStream  *output,
+                    GError        **error)
+{
+  if (! *error)
+    {
+      g_output_stream_printf (
+        output, NULL, NULL, error,
+        "style \"gimp-spin-scale-style\"\n"
+        "{\n"
+        "  GimpSpinScale::compact = %d\n"
+        "}\n"
+        "\n"
+        "class \"GimpSpinScale\" style \"gimp-spin-scale-style\"\n"
+        "\n",
+        config->compact_sliders);
+    }
+}
+
+static void
+themes_apply_theme (Gimp          *gimp,
+                    GimpGuiConfig *config)
+{
+  GFile         *themerc;
+  GOutputStream *output;
+  GError        *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  themerc = gimp_directory_file ("themerc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (themerc));
+
+  output = G_OUTPUT_STREAM (g_file_replace (themerc,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, &error));
+  if (! output)
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      GFile  *theme_dir   = themes_get_theme_dir (gimp, config->theme);
+      GFile  *gtkrc_user;
+      GSList *gtkrc_files = NULL;
+      GSList *iter;
+
+      if (theme_dir)
+        {
+          gtkrc_files = g_slist_prepend (
+            gtkrc_files,
+            g_file_get_child (theme_dir, "gtkrc"));
+        }
+      else
+        {
+          /*  get the hardcoded default theme gtkrc  */
+          gtkrc_files = g_slist_prepend (
+            gtkrc_files,
+            g_file_new_for_path (gimp_gtkrc ()));
+        }
+
+      gtkrc_files = g_slist_prepend (
+        gtkrc_files,
+        gimp_sysconf_directory_file ("gtkrc", NULL));
+
+      gtkrc_user  = gimp_directory_file ("gtkrc", NULL);
+      gtkrc_files = g_slist_prepend (
+        gtkrc_files,
+        gtkrc_user);
+
+      gtkrc_files = g_slist_reverse (gtkrc_files);
+
+      g_output_stream_printf (
+        output, NULL, NULL, &error,
+        "# GIMP themerc\n"
+        "#\n"
+        "# This file is written on GIMP startup and on every theme change.\n"
+        "# It is NOT supposed to be edited manually. Edit your personal\n"
+        "# gtkrc file instead (%s).\n"
+        "\n",
+        gimp_file_get_utf8_name (gtkrc_user));
+
+      themes_write_style (config, output, &error);
+
+      for (iter = gtkrc_files; ! error && iter; iter = g_slist_next (iter))
+        {
+          GFile *file = iter->data;
+
+          if (g_file_query_exists (file, NULL))
+            {
+              gchar *path;
+              gchar *esc_path;
+
+              path     = g_file_get_path (file);
+              esc_path = g_strescape (path, NULL);
+              g_free (path);
+
+              g_output_stream_printf (
+                output, NULL, NULL, &error,
+                "include \"%s\"\n",
+                esc_path);
+
+              g_free (esc_path);
+            }
+        }
+
+      if (! error)
+        {
+          g_output_stream_printf (
+            output, NULL, NULL, &error,
+            "\n"
+            "# end of themerc\n");
+        }
+
+      if (error)
+        {
+          GCancellable *cancellable = g_cancellable_new ();
+
+          gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
+                        _("Error writing '%s': %s"),
+                        gimp_file_get_utf8_name (themerc), error->message);
+          g_clear_error (&error);
+
+          /* Cancel the overwrite initiated by g_file_replace(). */
+          g_cancellable_cancel (cancellable);
+          g_output_stream_close (output, cancellable, NULL);
+          g_object_unref (cancellable);
+        }
+      else if (! g_output_stream_close (output, NULL, &error))
+        {
+          gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
+                        _("Error closing '%s': %s"),
+                        gimp_file_get_utf8_name (themerc), error->message);
+          g_clear_error (&error);
+        }
+
+      g_slist_free_full (gtkrc_files, g_object_unref);
+      g_object_unref (output);
+    }
+
+  g_object_unref (themerc);
+}
+
+static void
+themes_list_themes_foreach (gpointer key,
+                            gpointer value,
+                            gpointer data)
+{
+  gchar ***index = data;
+
+  **index = g_strdup ((gchar *) key);
+
+  (*index)++;
+}
+
+static gint
+themes_name_compare (const void *p1,
+                     const void *p2)
+{
+  return strcmp (* (char **) p1, * (char **) p2);
+}
+
+static void
+themes_theme_change_notify (GimpGuiConfig *config,
+                            GParamSpec    *pspec,
+                            Gimp          *gimp)
+{
+  themes_apply_theme (gimp, config);
+
+  gtk_rc_reparse_all ();
+
+  themes_fix_pixbuf_style ();
+}
+
+static void
+themes_fix_pixbuf_style (void)
+{
+  /* This is a "quick'n dirty" trick to get appropriate colors for
+   * themes in GTK+2, and in particular dark themes which would display
+   * insensitive items with a barely readable layout.
+   *
+   * This piece of code partly duplicates code from GTK+2 (slightly
+   * modified to get readable insensitive items) and will likely have to
+   * be removed for GIMP 3.
+   *
+   * See https://bugzilla.gnome.org/show_bug.cgi?id=770424
+   */
+
+  if (! pixbuf_style_class)
+    {
+      GType type = g_type_from_name ("PixbufStyle");
+
+      if (type)
+        {
+          pixbuf_style_class = g_type_class_ref (type);
+
+          if (pixbuf_style_class)
+            pixbuf_style_class->draw_layout = themes_draw_pixbuf_layout;
+        }
+    }
+}
+
+static void
+themes_draw_pixbuf_layout (GtkStyle      *style,
+                           GdkWindow     *window,
+                           GtkStateType   state_type,
+                           gboolean       use_text,
+                           GdkRectangle  *area,
+                           GtkWidget     *widget,
+                           const gchar   *detail,
+                           gint           x,
+                           gint           y,
+                           PangoLayout   *layout)
+{
+  GdkGC *gc;
+
+  gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type];
+
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, area);
+
+  if (state_type == GTK_STATE_INSENSITIVE)
+    {
+      GdkGC       *copy = gdk_gc_new (window);
+      GdkGCValues  orig;
+      GdkColor     fore;
+      guint16      r, g, b;
+
+      gdk_gc_copy (copy, gc);
+      gdk_gc_get_values (gc, &orig);
+
+      r = 0x40 + (((orig.foreground.pixel >> 16) & 0xff) >> 1);
+      g = 0x40 + (((orig.foreground.pixel >>  8) & 0xff) >> 1);
+      b = 0x40 + (((orig.foreground.pixel >>  0) & 0xff) >> 1);
+
+      fore.pixel = (r << 16) | (g << 8) | b;
+      fore.red   = r * 257;
+      fore.green = g * 257;
+      fore.blue  = b * 257;
+
+      gdk_gc_set_foreground (copy, &fore);
+      gdk_draw_layout (window, copy, x, y, layout);
+
+      g_object_unref (copy);
+    }
+  else
+    {
+      gdk_draw_layout (window, gc, x, y, layout);
+    }
+
+  if (area)
+    gdk_gc_set_clip_rectangle (gc, NULL);
+}
diff --git a/app/gui/themes.h b/app/gui/themes.h
new file mode 100644
index 0000000..0b7e74f
--- /dev/null
+++ b/app/gui/themes.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __THEMES_H__
+#define __THEMES_H__
+
+
+void     themes_init           (Gimp        *gimp);
+void     themes_exit           (Gimp        *gimp);
+
+gchar ** themes_list_themes    (Gimp        *gimp,
+                                gint        *n_themes);
+GFile  * themes_get_theme_dir  (Gimp        *gimp,
+                                const gchar *theme_name);
+GFile  * themes_get_theme_file (Gimp        *gimp,
+                                const gchar *first_component,
+                                ...) G_GNUC_NULL_TERMINATED;
+
+
+#endif /* __THEMES_H__ */
diff --git a/app/language.c b/app/language.c
new file mode 100644
index 0000000..581ff67
--- /dev/null
+++ b/app/language.c
@@ -0,0 +1,739 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* Win32 language lookup table:
+ * Copyright (C) 2007-2008 Dieter Verfaillie <dieterv@optionexplicit.be>
+ */
+
+#include "config.h"
+
+#include <locale.h>
+
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <winnls.h>
+#endif
+
+#include "language.h"
+
+
+void
+language_init (const gchar *language)
+{
+#ifdef G_OS_WIN32
+  if (! language                       &&
+      g_getenv ("LANG")        == NULL &&
+      g_getenv ("LC_MESSAGES") == NULL &&
+      g_getenv ("LC_ALL")      == NULL &&
+      g_getenv ("LANGUAGE")    == NULL)
+    {
+      /* FIXME: This is a hack. gettext doesn't pick the right language
+       * by default on Windows, so we enforce the right one. The
+       * following code is an adaptation of Python code from
+       * pynicotine. For reasons why this approach is needed, and why
+       * the GetLocaleInfo() approach in other libs falls flat, see:
+       * http://blogs.msdn.com/b/michkap/archive/2007/04/15/2146890.aspx
+       */
+
+      switch (GetUserDefaultUILanguage())
+        {
+        case 1078:
+          language = "af";          /* Afrikaans - South Africa */
+          break;
+        case 1052:
+          language = "sq";          /* Albanian - Albania */
+          break;
+        case 1118:
+          language = "am";          /* Amharic - Ethiopia */
+          break;
+        case 1025:
+          language = "ar_SA";       /* Arabic - Saudi Arabia */
+          break;
+        case 5121:
+          language = "ar_DZ";       /* Arabic - Algeria */
+          break;
+        case 15361:
+          language = "ar_BH";       /* Arabic - Bahrain */
+          break;
+        case 3073:
+          language = "ar_EG";       /* Arabic - Egypt */
+          break;
+        case 2049:
+          language = "ar_IQ";       /* Arabic - Iraq */
+          break;
+        case 11265:
+          language = "ar_JO";       /* Arabic - Jordan */
+          break;
+        case 13313:
+          language = "ar_KW";       /* Arabic - Kuwait */
+          break;
+        case 12289:
+          language = "ar_LB";       /* Arabic - Lebanon */
+          break;
+        case 4097:
+          language = "ar_LY";       /* Arabic - Libya */
+          break;
+        case 6145:
+          language = "ar_MO";       /* Arabic - Morocco */
+          break;
+        case 8193:
+          language = "ar_OM";       /* Arabic - Oman */
+          break;
+        case 16385:
+          language = "ar_QA";       /* Arabic - Qatar */
+          break;
+        case 10241:
+          language = "ar_SY";       /* Arabic - Syria */
+          break;
+        case 7169:
+          language = "ar_TN";       /* Arabic - Tunisia */
+          break;
+        case 14337:
+          language = "ar_AE";       /* Arabic - U.A.E. */
+          break;
+        case 9217:
+          language = "ar_YE";       /* Arabic - Yemen */
+          break;
+        case 1067:
+          language = "hy";          /* Armenian - Armenia */
+          break;
+        case 1101:
+          language = "as";          /* Assamese */
+          break;
+        case 2092:
+          language = NULL;          /* Azeri (Cyrillic) */
+          break;
+        case 1068:
+          language = NULL;          /* Azeri (Latin) */
+          break;
+        case 1069:
+          language = "eu";          /* Basque */
+          break;
+        case 1059:
+          language = "be";          /* Belarusian */
+          break;
+        case 1093:
+          language = "bn_IN";       /* Bengali (India) */
+          break;
+        case 2117:
+          language = "bn_BD";       /* Bengali (Bangladesh) */
+          break;
+        case 5146:
+          language = "bs";          /* Bosnian (Bosnia/Herzegovina) */
+          break;
+        case 1026:
+          language = "bg";          /* Bulgarian */
+          break;
+        case 1109:
+          language = "my";          /* Burmese */
+          break;
+        case 1027:
+          language = "ca";          /* Catalan */
+          break;
+        case 1116:
+          language = NULL;          /* Cherokee - United States */
+          break;
+        case 2052:
+          language = "zh_CN";       /* Chinese - People"s Republic of China */
+          break;
+        case 4100:
+          language = "zh_SG";       /* Chinese - Singapore */
+          break;
+        case 1028:
+          language = "zh_TW";       /* Chinese - Taiwan */
+          break;
+        case 3076:
+          language = "zh_HK";       /* Chinese - Hong Kong SAR */
+          break;
+        case 5124:
+          language = "zh_MO";       /* Chinese - Macao SAR */
+          break;
+        case 1050:
+          language = "hr_HR";       /* Croatian */
+          break;
+        case 4122:
+          language = "hr_BA";       /* Croatian (Bosnia/Herzegovina) */
+          break;
+        case 1029:
+          language = "cs";          /* Czech */
+          break;
+        case 1030:
+          language = "da";          /* Danish */
+          break;
+        case 1125:
+          language = "dv";          /* Divehi */
+          break;
+        case 1043:
+          language = "nl_NL";       /* Dutch - Netherlands */
+          break;
+        case 2067:
+          language = "nl_BE";       /* Dutch - Belgium */
+          break;
+        case 1126:
+          language = NULL;          /* Edo */
+          break;
+        case 1033:
+          language = "en_US";       /* English - United States */
+          break;
+        case 2057:
+          language = "en_UK";       /* English - United Kingdom */
+          break;
+        case 3081:
+          language = "en_AU";       /* English - Australia */
+          break;
+        case 10249:
+          language = "en_BZ";       /* English - Belize */
+          break;
+        case 4105:
+          language = "en_CA";       /* English - Canada */
+          break;
+        case 9225:
+          language = "en";          /* English - Caribbean */
+          break;
+        case 15369:
+          language = "en_HK";       /* English - Hong Kong SAR */
+          break;
+        case 16393:
+          language = "en_IN";       /* English - India */
+          break;
+        case 14345:
+          language = "en_ID";       /* English - Indonesia */
+          break;
+        case 6153:
+          language = "en_IR";       /* English - Ireland */
+          break;
+        case 8201:
+          language = "en_JM";       /* English - Jamaica */
+          break;
+        case 17417:
+          language = "en_MW";       /* English - Malaysia */
+          break;
+        case 5129:
+          language = "en_NZ";       /* English - New Zealand */
+          break;
+        case 13321:
+          language = "en_PH";       /* English - Philippines */
+          break;
+        case 18441:
+          language = "en_SG";       /* English - Singapore */
+          break;
+        case 7177:
+          language = "en_ZA";       /* English - South Africa */
+          break;
+        case 11273:
+          language = "en_TT";       /* English - Trinidad */
+          break;
+        case 12297:
+          language = "en_ZW";       /* English - Zimbabwe */
+          break;
+        case 1061:
+          language = "et";          /* Estonian */
+          break;
+        case 1080:
+          language = "fo";          /* Faroese */
+          break;
+        case 1065:
+          language = "fa";          /* Farsi */
+          break;
+        case 1124:
+          language = NULL;          /* Filipino */
+          break;
+        case 1035:
+          language = "fi";          /* Finnish */
+          break;
+        case 1036:
+          language = "fr_FR";       /* French - France */
+          break;
+        case 2060:
+          language = "fr_BE";       /* French - Belgium */
+          break;
+        case 11276:
+          language = "fr_CM";       /* French - Cameroon */
+          break;
+        case 3084:
+          language = "fr_CA";       /* French - Canada */
+          break;
+        case 9228:
+          language = "fr_CD";       /* French - Democratic Rep. of Congo */
+          break;
+        case 12300:
+          language = "fr_CI";       /* French - Cote d"Ivoire */
+          break;
+        case 15372:
+          language = "fr_HT";       /* French - Haiti */
+          break;
+        case 5132:
+          language = "fr_LU";       /* French - Luxembourg */
+          break;
+        case 13324:
+          language = "fr_ML";       /* French - Mali */
+          break;
+        case 6156:
+          language = "fr_MC";       /* French - Monaco */
+          break;
+        case 14348:
+          language = "fr_MA";       /* French - Morocco */
+          break;
+        case 58380:
+          language = "fr";          /* French - North Africa */
+          break;
+        case 8204:
+          language = "fr_RE";       /* French - Reunion */
+          break;
+        case 10252:
+          language = "fr_SN";       /* French - Senegal */
+          break;
+        case 4108:
+          language = "fr_CH";       /* French - Switzerland */
+          break;
+        case 7180:
+          language = "fr";          /* French - West Indies */
+          break;
+        case 1122:
+          language = "fy";          /* Frisian - Netherlands */
+          break;
+        case 1127:
+          language = NULL;          /* Fulfulde - Nigeria */
+          break;
+        case 1071:
+          language = "mk";          /* FYRO Macedonian */
+          break;
+        case 2108:
+          language = "ga";          /* Gaelic (Ireland) */
+          break;
+        case 1084:
+          language = "gd";          /* Gaelic (Scotland) */
+          break;
+        case 1110:
+          language = "gl";          /* Galician */
+          break;
+        case 1079:
+          language = "ka";          /* Georgian */
+          break;
+        case 1031:
+          language = "de_DE";       /* German - Germany */
+          break;
+        case 3079:
+          language = "de_AT";       /* German - Austria */
+          break;
+        case 5127:
+          language = "de_LI";       /* German - Liechtenstein */
+          break;
+        case 4103:
+          language = "de_LU";       /* German - Luxembourg */
+          break;
+        case 2055:
+          language = "de_CH";       /* German - Switzerland */
+          break;
+        case 1032:
+          language = "el";          /* Greek */
+          break;
+        case 1140:
+          language = "gn";          /* Guarani - Paraguay */
+          break;
+        case 1095:
+          language = "gu";          /* Gujarati */
+          break;
+        case 1128:
+          language = "ha";          /* Hausa - Nigeria */
+          break;
+        case 1141:
+          language = NULL;          /* Hawaiian - United States */
+          break;
+        case 1037:
+          language = "he";          /* Hebrew */
+          break;
+        case 1081:
+          language = "hi";          /* Hindi */
+          break;
+        case 1038:
+          language = "hu";          /* Hungarian */
+          break;
+        case 1129:
+          language = NULL;          /* Ibibio - Nigeria */
+          break;
+        case 1039:
+          language = "is";          /* Icelandic */
+          break;
+        case 1136:
+          language = "ig";          /* Igbo - Nigeria */
+          break;
+        case 1057:
+          language = "id";          /* Indonesian */
+          break;
+        case 1117:
+          language = "iu";          /* Inuktitut */
+          break;
+        case 1040:
+          language = "it_IT";       /* Italian - Italy */
+          break;
+        case 2064:
+          language = "it_CH";       /* Italian - Switzerland */
+          break;
+        case 1041:
+          language = "ja";          /* Japanese */
+          break;
+        case 1099:
+          language = "kn";          /* Kannada */
+          break;
+        case 1137:
+          language = "kr";          /* Kanuri - Nigeria */
+          break;
+        case 2144:
+          language = "ks";          /* Kashmiri */
+          break;
+        case 1120:
+          language = "ks";          /* Kashmiri (Arabic) */
+          break;
+        case 1087:
+          language = "kk";          /* Kazakh */
+          break;
+        case 1107:
+          language = "km";          /* Khmer */
+          break;
+        case 1111:
+          language = NULL;          /* Konkani */
+          break;
+        case 1042:
+          language = "ko";          /* Korean */
+          break;
+        case 1088:
+          language = "ky";          /* Kyrgyz (Cyrillic) */
+          break;
+        case 1108:
+          language = "lo";          /* Lao */
+          break;
+        case 1142:
+          language = "la";          /* Latin */
+          break;
+        case 1062:
+          language = "lv";          /* Latvian */
+          break;
+        case 1063:
+          language = "lt";          /* Lithuanian */
+          break;
+        case 1086:
+          language = "ms_MY";       /* Malay - Malaysia */
+          break;
+        case 2110:
+          language = "ms_BN";       /* Malay - Brunei Darussalam */
+          break;
+        case 1100:
+          language = "ml";          /* Malayalam */
+          break;
+        case 1082:
+          language = "mt";          /* Maltese */
+          break;
+        case 1112:
+          language = NULL;          /* Manipuri */
+          break;
+        case 1153:
+          language = "mi";          /* Maori - New Zealand */
+          break;
+        case 1102:
+          language = "mr";          /* Marathi */
+          break;
+        case 1104:
+          language = "mn";          /* Mongolian (Cyrillic) */
+          break;
+        case 2128:
+          language = "mn";          /* Mongolian (Mongolian) */
+          break;
+        case 1121:
+          language = "ne_NP";       /* Nepali */
+          break;
+        case 2145:
+          language = "ne_IN";       /* Nepali - India */
+          break;
+        case 1044:
+          language = "no";          /* Norwegian (Bokmￃﾥl) */
+          break;
+        case 2068:
+          language = "no";          /* Norwegian (Nynorsk) */
+          break;
+        case 1096:
+          language = "or";          /* Oriya */
+          break;
+        case 1138:
+          language = "om";          /* Oromo */
+          break;
+        case 1145:
+          language = NULL;          /* Papiamentu */
+          break;
+        case 1123:
+          language = "ps";          /* Pashto */
+          break;
+        case 1045:
+          language = "pl";          /* Polish */
+          break;
+        case 1046:
+          language = "pt_BR";       /* Portuguese - Brazil */
+          break;
+        case 2070:
+          language = "pt_PT";       /* Portuguese - Portugal */
+          break;
+        case 1094:
+          language = "pa";          /* Punjabi */
+          break;
+        case 2118:
+          language = "pa_PK";       /* Punjabi (Pakistan) */
+          break;
+        case 1131:
+          language = "qu_BO";       /* Quecha - Bolivia */
+          break;
+        case 2155:
+          language = "qu_EC";       /* Quecha - Ecuador */
+          break;
+        case 3179:
+          language = "qu_PE";       /* Quecha - Peru */
+          break;
+        case 1047:
+          language = "rm";          /* Rhaeto-Romanic */
+          break;
+        case 1048:
+          language = "ro_RO";       /* Romanian */
+          break;
+        case 2072:
+          language = "ro_MD";       /* Romanian - Moldava */
+          break;
+        case 1049:
+          language = "ru_RU";       /* Russian */
+          break;
+        case 2073:
+          language = "ru_MD";       /* Russian - Moldava */
+          break;
+        case 1083:
+          language = NULL;          /* Sami (Lappish) */
+          break;
+        case 1103:
+          language = "sa";          /* Sanskrit */
+          break;
+        case 1132:
+          language = NULL;          /* Sepedi */
+          break;
+        case 3098:
+          language = "sr";          /* Serbian (Cyrillic) */
+          break;
+        case 2074:
+          language = "sr@latin";    /* Serbian (Latin) */
+          break;
+        case 1113:
+          language = "sd_IN";       /* Sindhi - India */
+          break;
+        case 2137:
+          language = "sd_PK";       /* Sindhi - Pakistan */
+          break;
+        case 1115:
+          language = "si";          /* Sinhalese - Sri Lanka */
+          break;
+        case 1051:
+          language = "sk";          /* Slovak */
+          break;
+        case 1060:
+          language = "sl";          /* Slovenian */
+          break;
+        case 1143:
+          language = "so";          /* Somali */
+          break;
+        case 1070:
+          language = NULL;          /* Sorbian */
+          break;
+        case 3082:
+          language = "es";          /* Spanish - Spain (Modern Sort) */
+          break;
+        case 1034:
+          language = "es";          /* Spanish - Spain (Traditional Sort) */
+          break;
+        case 11274:
+          language = "es_AR";       /* Spanish - Argentina */
+          break;
+        case 16394:
+          language = "es_BO";       /* Spanish - Bolivia */
+          break;
+        case 13322:
+          language = "es_CL";       /* Spanish - Chile */
+          break;
+        case 9226:
+          language = "es_CO";       /* Spanish - Colombia */
+          break;
+        case 5130:
+          language = "es_CR";       /* Spanish - Costa Rica */
+          break;
+        case 7178:
+          language = "es_DO";       /* Spanish - Dominican Republic */
+          break;
+        case 12298:
+          language = "es_EC";       /* Spanish - Ecuador */
+          break;
+        case 17418:
+          language = "es_SV";       /* Spanish - El Salvador */
+          break;
+        case 4106:
+          language = "es_GT";       /* Spanish - Guatemala */
+          break;
+        case 18442:
+          language = "es_HN";       /* Spanish - Honduras */
+          break;
+        case 58378:
+          language = "es";          /* Spanish - Latin America */
+          break;
+        case 2058:
+          language = "es_MX";       /* Spanish - Mexico */
+          break;
+        case 19466:
+          language = "es_NI";       /* Spanish - Nicaragua */
+          break;
+        case 6154:
+          language = "es_PA";       /* Spanish - Panama */
+          break;
+        case 15370:
+          language = "es_PY";       /* Spanish - Paraguay */
+          break;
+        case 10250:
+          language = "es_PE";       /* Spanish - Peru */
+          break;
+        case 20490:
+          language = "es_PR";       /* Spanish - Puerto Rico */
+          break;
+        case 21514:
+          language = "es_US";       /* Spanish - United States */
+          break;
+        case 14346:
+          language = "es_UY";       /* Spanish - Uruguay */
+          break;
+        case 8202:
+          language = "es_VE";       /* Spanish - Venezuela */
+          break;
+        case 1072:
+          language = NULL;          /* Sutu */
+          break;
+        case 1089:
+          language = "sw";          /* Swahili */
+          break;
+        case 1053:
+          language = "sv_SE";       /* Swedish */
+          break;
+        case 2077:
+          language = "sv_FI";       /* Swedish - Finland */
+          break;
+        case 1114:
+          language = NULL;          /* Syriac */
+          break;
+        case 1064:
+          language = "tg";          /* Tajik */
+          break;
+        case 1119:
+          language = NULL;          /* Tamazight (Arabic) */
+          break;
+        case 2143:
+          language = NULL;          /* Tamazight (Latin) */
+          break;
+        case 1097:
+          language = "ta";          /* Tamil */
+          break;
+        case 1092:
+          language = "tt";          /* Tatar */
+          break;
+        case 1098:
+          language = "te";          /* Telugu */
+          break;
+        case 1054:
+          language = "th";          /* Thai */
+          break;
+        case 2129:
+          language = "bo_BT";       /* Tibetan - Bhutan */
+          break;
+        case 1105:
+          language = "bo_CN";       /* Tibetan - People"s Republic of China */
+          break;
+        case 2163:
+          language = "ti_ER";       /* Tigrigna - Eritrea */
+          break;
+        case 1139:
+          language = "ti_ET";       /* Tigrigna - Ethiopia */
+          break;
+        case 1073:
+          language = "ts";          /* Tsonga */
+          break;
+        case 1074:
+          language = "tn";          /* Tswana */
+          break;
+        case 1055:
+          language = "tr";          /* Turkish */
+          break;
+        case 1090:
+          language = "tk";          /* Turkmen */
+          break;
+        case 1152:
+          language = "ug";          /* Uighur - China */
+          break;
+        case 1058:
+          language = "uk";          /* Ukrainian */
+          break;
+        case 1056:
+          language = "ur";          /* Urdu */
+          break;
+        case 2080:
+          language = "ur_IN";       /* Urdu - India */
+          break;
+        case 2115:
+          language = "uz";          /* Uzbek (Cyrillic) */
+          break;
+        case 1091:
+          language = "uz@latin";    /* Uzbek (Latin) */
+          break;
+        case 1075:
+          language = "ve";          /* Venda */
+          break;
+        case 1066:
+          language = "vi";          /* Vietnamese */
+          break;
+        case 1106:
+          language = "cy";          /* Welsh */
+          break;
+        case 1076:
+          language = "xh";          /* Xhosa */
+          break;
+        case 1144:
+          language = NULL;          /* Yi */
+          break;
+        case 1085:
+          language = "yi";          /* Yiddish */
+          break;
+        case 1130:
+          language = "yo";          /* Yoruba */
+          break;
+        case 1077:
+          language = "zu";          /* Zulu */
+          break;
+        default:
+          language = NULL;
+        }
+    }
+#endif
+
+  /*  We already set the locale according to the environment, so just
+   *  return early if no language is set in gimprc.
+   */
+  if (! language)
+    return;
+
+  g_setenv ("LANGUAGE", language, TRUE);
+  setlocale (LC_ALL, "");
+}
diff --git a/app/language.h b/app/language.h
new file mode 100644
index 0000000..39d6929
--- /dev/null
+++ b/app/language.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LANGUAGE_H__
+#define __LANGUAGE_H__
+
+#ifndef GIMP_APP_GLUE_COMPILATION
+#error You must not #include "language.h" from a subdir
+#endif
+
+
+void language_init (const gchar *language);
+
+
+#endif /* __LANGUAGE_H__ */
diff --git a/app/main.c b/app/main.c
new file mode 100644
index 0000000..ba38758
--- /dev/null
+++ b/app/main.c
@@ -0,0 +1,953 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef __GLIBC__
+#include <malloc.h>
+#endif
+
+#include <locale.h>
+
+#include <gio/gio.h>
+
+#ifdef G_OS_WIN32
+#include <io.h> /* get_osfhandle */
+
+#endif /* G_OS_WIN32 */
+
+#if defined(ENABLE_RELOCATABLE_RESOURCES) && defined(__APPLE__)
+#include <libgen.h> /* dirname */
+#include <sys/stat.h>
+#endif /* __APPLE__ */
+
+#ifndef GIMP_CONSOLE_COMPILATION
+#include <gdk/gdk.h>
+#else
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
+
+#include <babl/babl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb/pdb-types.h"
+
+#include "config/gimpconfig-dump.h"
+
+#include "core/gimp.h"
+#include "core/gimpbacktrace.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimpprocedure.h"
+#include "pdb/internal-procs.h"
+
+#include "about.h"
+#include "app.h"
+#include "sanity.h"
+#include "signals.h"
+#include "unique.h"
+
+#ifdef G_OS_WIN32
+/* To get PROCESS_DEP_* defined we need _WIN32_WINNT at 0x0601. We still
+ * use the API optionally only if present, though.
+ */
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0601
+#include <windows.h>
+#include <conio.h>
+#endif
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+#include "gimp-version.h"
+
+
+static gboolean  gimp_option_fatal_warnings   (const gchar  *option_name,
+                                               const gchar  *value,
+                                               gpointer      data,
+                                               GError      **error);
+static gboolean  gimp_option_stack_trace_mode (const gchar  *option_name,
+                                               const gchar  *value,
+                                               gpointer      data,
+                                               GError      **error);
+static gboolean  gimp_option_pdb_compat_mode  (const gchar  *option_name,
+                                               const gchar  *value,
+                                               gpointer      data,
+                                               GError      **error);
+static gboolean  gimp_option_dump_gimprc      (const gchar  *option_name,
+                                               const gchar  *value,
+                                               gpointer      data,
+                                               GError      **error);
+static gboolean  gimp_option_dump_pdb_procedures_deprecated
+                                              (const gchar  *option_name,
+                                               const gchar  *value,
+                                               gpointer      data,
+                                               GError      **error);
+
+static void      gimp_show_version_and_exit   (void) G_GNUC_NORETURN;
+static void      gimp_show_license_and_exit   (void) G_GNUC_NORETURN;
+
+static void      gimp_init_i18n               (void);
+static void      gimp_init_malloc             (void);
+
+#if defined (G_OS_WIN32) && !defined (GIMP_CONSOLE_COMPILATION)
+static void      gimp_open_console_window     (void);
+#else
+#define gimp_open_console_window() /* as nothing */
+#endif
+
+static const gchar        *system_gimprc     = NULL;
+static const gchar        *user_gimprc       = NULL;
+static const gchar        *session_name      = NULL;
+static const gchar        *batch_interpreter = NULL;
+static const gchar       **batch_commands    = NULL;
+static const gchar       **filenames         = NULL;
+static gboolean            as_new            = FALSE;
+static gboolean            no_interface      = FALSE;
+static gboolean            no_data           = FALSE;
+static gboolean            no_fonts          = FALSE;
+static gboolean            no_splash         = FALSE;
+static gboolean            be_verbose        = FALSE;
+static gboolean            new_instance      = FALSE;
+#if defined (USE_SYSV_SHM) || defined (USE_POSIX_SHM) || defined (G_OS_WIN32)
+static gboolean            use_shm           = TRUE;
+#else
+static gboolean            use_shm           = FALSE;
+#endif
+static gboolean            use_cpu_accel     = TRUE;
+static gboolean            console_messages  = FALSE;
+static gboolean            use_debug_handler = FALSE;
+
+#ifdef GIMP_UNSTABLE
+static gboolean            show_playground   = TRUE;
+static gboolean            show_debug_menu   = TRUE;
+static GimpStackTraceMode  stack_trace_mode  = GIMP_STACK_TRACE_QUERY;
+static GimpPDBCompatMode   pdb_compat_mode   = GIMP_PDB_COMPAT_WARN;
+#else
+static gboolean            show_playground   = FALSE;
+static gboolean            show_debug_menu   = FALSE;
+static GimpStackTraceMode  stack_trace_mode  = GIMP_STACK_TRACE_NEVER;
+static GimpPDBCompatMode   pdb_compat_mode   = GIMP_PDB_COMPAT_ON;
+#endif
+
+
+static const GOptionEntry main_entries[] =
+{
+  { "version", 'v', G_OPTION_FLAG_NO_ARG,
+    G_OPTION_ARG_CALLBACK, (GOptionArgFunc) gimp_show_version_and_exit,
+    N_("Show version information and exit"), NULL
+  },
+  {
+    "license", 0, G_OPTION_FLAG_NO_ARG,
+    G_OPTION_ARG_CALLBACK, (GOptionArgFunc) gimp_show_license_and_exit,
+    N_("Show license information and exit"), NULL
+  },
+  {
+    "verbose", 0, 0,
+    G_OPTION_ARG_NONE, &be_verbose,
+    N_("Be more verbose"), NULL
+  },
+  {
+    "new-instance", 'n', 0,
+    G_OPTION_ARG_NONE, &new_instance,
+    N_("Start a new GIMP instance"), NULL
+  },
+  {
+    "as-new", 'a', 0,
+    G_OPTION_ARG_NONE, &as_new,
+    N_("Open images as new"), NULL
+  },
+  {
+    "no-interface", 'i', 0,
+    G_OPTION_ARG_NONE, &no_interface,
+    N_("Run without a user interface"), NULL
+  },
+  {
+    "no-data", 'd', 0,
+    G_OPTION_ARG_NONE, &no_data,
+    N_("Do not load brushes, gradients, patterns, ..."), NULL
+  },
+  {
+    "no-fonts", 'f', 0,
+    G_OPTION_ARG_NONE, &no_fonts,
+    N_("Do not load any fonts"), NULL
+  },
+  {
+    "no-splash", 's', 0,
+    G_OPTION_ARG_NONE, &no_splash,
+    N_("Do not show a splash screen"), NULL
+  },
+  {
+    "no-shm", 0, G_OPTION_FLAG_REVERSE,
+    G_OPTION_ARG_NONE, &use_shm,
+    N_("Do not use shared memory between GIMP and plug-ins"), NULL
+  },
+  {
+    "no-cpu-accel", 0, G_OPTION_FLAG_REVERSE,
+    G_OPTION_ARG_NONE, &use_cpu_accel,
+    N_("Do not use special CPU acceleration functions"), NULL
+  },
+  {
+    "session", 0, 0,
+    G_OPTION_ARG_FILENAME, &session_name,
+    N_("Use an alternate sessionrc file"), "<name>"
+  },
+  {
+    "gimprc", 'g', 0,
+    G_OPTION_ARG_FILENAME, &user_gimprc,
+    N_("Use an alternate user gimprc file"), "<filename>"
+  },
+  {
+    "system-gimprc", 0, 0,
+    G_OPTION_ARG_FILENAME, &system_gimprc,
+    N_("Use an alternate system gimprc file"), "<filename>"
+  },
+  {
+    "batch", 'b', 0,
+    G_OPTION_ARG_STRING_ARRAY, &batch_commands,
+    N_("Batch command to run (can be used multiple times)"), "<command>"
+  },
+  {
+    "batch-interpreter", 0, 0,
+    G_OPTION_ARG_STRING, &batch_interpreter,
+    N_("The procedure to process batch commands with"), "<proc>"
+  },
+  {
+    "console-messages", 'c', 0,
+    G_OPTION_ARG_NONE, &console_messages,
+    N_("Send messages to console instead of using a dialog"), NULL
+  },
+  {
+    "pdb-compat-mode", 0, 0,
+    G_OPTION_ARG_CALLBACK, gimp_option_pdb_compat_mode,
+    /*  don't translate the mode names (off|on|warn)  */
+    N_("PDB compatibility mode (off|on|warn)"), "<mode>"
+  },
+  {
+    "stack-trace-mode", 0, 0,
+    G_OPTION_ARG_CALLBACK, gimp_option_stack_trace_mode,
+    /*  don't translate the mode names (never|query|always)  */
+    N_("Debug in case of a crash (never|query|always)"), "<mode>"
+  },
+  {
+    "debug-handlers", 0, 0,
+    G_OPTION_ARG_NONE, &use_debug_handler,
+    N_("Enable non-fatal debugging signal handlers"), NULL
+  },
+  {
+    "g-fatal-warnings", 0, G_OPTION_FLAG_NO_ARG,
+    G_OPTION_ARG_CALLBACK, gimp_option_fatal_warnings,
+    N_("Make all warnings fatal"), NULL
+  },
+  {
+    "dump-gimprc", 0, G_OPTION_FLAG_NO_ARG,
+    G_OPTION_ARG_CALLBACK, gimp_option_dump_gimprc,
+    N_("Output a gimprc file with default settings"), NULL
+  },
+  {
+    "dump-gimprc-system", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN,
+    G_OPTION_ARG_CALLBACK, gimp_option_dump_gimprc,
+    NULL, NULL
+  },
+  {
+    "dump-gimprc-manpage", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN,
+    G_OPTION_ARG_CALLBACK, gimp_option_dump_gimprc,
+    NULL, NULL
+  },
+  {
+    "dump-pdb-procedures-deprecated", 0,
+    G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN,
+    G_OPTION_ARG_CALLBACK, gimp_option_dump_pdb_procedures_deprecated,
+    N_("Output a sorted list of deprecated procedures in the PDB"), NULL
+  },
+  {
+    "show-playground", 0, 0,
+    G_OPTION_ARG_NONE, &show_playground,
+    N_("Show a preferences page with experimental features"), NULL
+  },
+  {
+    "show-debug-menu", 0, G_OPTION_FLAG_HIDDEN,
+    G_OPTION_ARG_NONE, &show_debug_menu,
+    N_("Show an image submenu with debug actions"), NULL
+  },
+  {
+    G_OPTION_REMAINING, 0, 0,
+    G_OPTION_ARG_FILENAME_ARRAY, &filenames,
+    NULL, NULL
+  },
+  { NULL }
+};
+
+#if defined(ENABLE_RELOCATABLE_RESOURCES) && defined(__APPLE__)
+static void
+gimp_macos_setenv (const char * progname)
+{
+  /* helper to set environment variables for GIMP to be relocatable.
+   * Due to the latest changes it is not recommended to set it in the shell
+   * wrapper anymore.
+   */
+  gchar  *resolved_path;
+  /* on some OSX installations open file limit is 256 and GIMP needs more */
+  struct  rlimit limit;
+
+  limit.rlim_cur = 10000;
+  limit.rlim_max = 10000;
+  setrlimit (RLIMIT_NOFILE, &limit);
+  resolved_path = g_canonicalize_filename (progname, NULL);
+  if (resolved_path && ! g_getenv ("GIMP_NO_WRAPPER"))
+    {
+      /* set path to the app folder to make sure that our python is called
+       * instead of system one
+       */
+      static gboolean            show_playground   = TRUE;
+
+      gchar *path;
+      gchar *tmp;
+      gchar *app_dir;
+      gchar *res_dir;
+      size_t path_len;
+      struct stat sb;
+
+      app_dir = g_path_get_dirname (resolved_path);
+      tmp = g_strdup_printf ("%s/../Resources", app_dir);
+      res_dir = g_canonicalize_filename (tmp, NULL);
+      g_free (tmp);
+      if (res_dir && !stat (res_dir, &sb) && S_ISDIR (sb.st_mode))
+        {
+          g_print ("GIMP is started as MacOS application\n");
+        }
+      else
+        {
+          g_free (res_dir);
+          return;
+        }
+
+      path_len = strlen (g_getenv ("PATH") ? g_getenv ("PATH") : "") + strlen (app_dir) + 2;
+      path = g_try_malloc (path_len);
+      if (path == NULL)
+        {
+          g_warning ("Failed to allocate memory");
+          app_exit (EXIT_FAILURE);
+        }
+      if (g_getenv ("PATH"))
+        g_snprintf (path, path_len, "%s:%s", app_dir, g_getenv ("PATH"));
+      else
+        g_snprintf (path, path_len, "%s", app_dir);
+      g_free (app_dir);
+      g_setenv ("PATH", path, TRUE);
+      g_free (path);
+      tmp = g_strdup_printf ("%s/lib/gtk-2.0/2.10.0", res_dir);
+      g_setenv ("GTK_PATH", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/etc/gtk-2.0/gtk.immodules", res_dir);
+      g_setenv ("GTK_IM_MODULE_FILE", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/lib/gegl-0.4", res_dir);
+      g_setenv ("GEGL_PATH", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/lib/babl-0.1", res_dir);
+      g_setenv ("BABL_PATH", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache", res_dir);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/etc/fonts", res_dir);
+      g_setenv ("FONTCONFIG_PATH", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s", res_dir);
+      g_setenv ("PYTHONHOME", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/lib/python2.7:%s/lib/gimp/2.0/python", res_dir, res_dir);
+      g_setenv ("PYTHONPATH", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/lib/gio/modules", res_dir);
+      g_setenv ("GIO_MODULE_DIR", tmp, TRUE);
+      g_free (tmp);
+      tmp = g_strdup_printf ("%s/share/libwmf/fonts", res_dir);
+      g_setenv ("WMF_FONTDIR", tmp, TRUE);
+      g_free (tmp);
+      if (g_getenv ("HOME") != NULL)
+        {
+          tmp = g_strdup_printf ("%s/Library/Application Support/GIMP/2.10/cache",
+                                 g_getenv ("HOME"));
+          g_setenv ("XDG_CACHE_HOME", tmp, TRUE);
+          g_free (tmp);
+        }
+      g_free (res_dir);
+    }
+  g_free (resolved_path);
+}
+#endif
+
+int
+main (int    argc,
+      char **argv)
+{
+  GOptionContext *context;
+  GError         *error = NULL;
+  const gchar    *abort_message;
+  gchar          *basename;
+  GFile          *system_gimprc_file = NULL;
+  GFile          *user_gimprc_file   = NULL;
+  gchar          *backtrace_file     = NULL;
+  gint            i;
+
+#ifdef ENABLE_WIN32_DEBUG_CONSOLE
+  gimp_open_console_window ();
+#endif
+#if defined(ENABLE_RELOCATABLE_RESOURCES) && defined(__APPLE__)
+  /* remove MacOS session identifier from the command line args */
+  gint newargc = 0;
+  for (gint i = 0; i < argc; i++)
+    {
+      if (!g_str_has_prefix (argv[i], "-psn_"))
+        {
+          argv[newargc] = argv[i];
+          newargc++;
+        }
+    }
+  if (argc > newargc)
+    {
+      argv[newargc] = NULL; /* glib expects NULL terminated array */
+      argc = newargc;
+    }
+
+  gimp_macos_setenv (argv[0]);
+#endif
+
+#if defined (__GNUC__) && defined (_WIN64)
+  /* mingw-w64, at least the unstable build from late July 2008,
+   * starts subsystem:windows programs in main(), but passes them
+   * bogus argc and argv. __argc and __argv are OK, though, so just
+   * use them.
+   */
+  argc = __argc;
+  argv = __argv;
+#endif
+
+  /* Initialize GimpBacktrace early on.  In particular, we want the
+   * Windows backend to catch the SET_THREAD_NAME exceptions of newly
+   * created threads.
+   */
+  gimp_backtrace_init ();
+
+  /* Start signal handlers early. */
+  gimp_init_signal_handlers (&backtrace_file);
+
+#ifdef G_OS_WIN32
+  /* Reduce risks */
+  {
+    typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
+    t_SetDllDirectoryA p_SetDllDirectoryA;
+
+    p_SetDllDirectoryA =
+      (t_SetDllDirectoryA) GetProcAddress (GetModuleHandle ("kernel32.dll"),
+                                           "SetDllDirectoryA");
+    if (p_SetDllDirectoryA)
+      (*p_SetDllDirectoryA) ("");
+  }
+
+  /* On Windows, set DLL search path to $INSTALLDIR/bin so that .exe
+     plug-ins in the plug-ins directory can find libgimp and file
+     library DLLs without needing to set external PATH. */
+  {
+    const gchar *install_dir;
+    gchar       *bin_dir;
+    LPWSTR       w_bin_dir;
+    int          n;
+
+    w_bin_dir = NULL;
+    install_dir = gimp_installation_directory ();
+    bin_dir = g_build_filename (install_dir, "bin", NULL);
+
+    n = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS,
+                             bin_dir, -1, NULL, 0);
+    if (n == 0)
+      goto out;
+
+    w_bin_dir = g_malloc_n (n + 1, sizeof (wchar_t));
+    n = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS,
+                             bin_dir, -1,
+                             w_bin_dir, (n + 1) * sizeof (wchar_t));
+    if (n == 0)
+      goto out;
+
+    SetDllDirectoryW (w_bin_dir);
+
+  out:
+    if (w_bin_dir)
+      g_free (w_bin_dir);
+    g_free (bin_dir);
+  }
+
+#ifndef _WIN64
+  {
+    typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
+    t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
+
+    p_SetProcessDEPPolicy =
+      (t_SetProcessDEPPolicy) GetProcAddress (GetModuleHandle ("kernel32.dll"),
+                                              "SetProcessDEPPolicy");
+    if (p_SetProcessDEPPolicy)
+      (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
+  }
+#endif
+
+  /* Group all our windows together on the taskbar */
+  {
+    typedef HRESULT (WINAPI *t_SetCurrentProcessExplicitAppUserModelID) (PCWSTR lpPathName);
+    t_SetCurrentProcessExplicitAppUserModelID p_SetCurrentProcessExplicitAppUserModelID;
+
+    p_SetCurrentProcessExplicitAppUserModelID =
+      (t_SetCurrentProcessExplicitAppUserModelID) GetProcAddress (GetModuleHandle ("shell32.dll"),
+                                                                  "SetCurrentProcessExplicitAppUserModelID");
+    if (p_SetCurrentProcessExplicitAppUserModelID)
+      (*p_SetCurrentProcessExplicitAppUserModelID) (L"gimp.GimpApplication");
+  }
+#endif
+
+  gimp_init_malloc ();
+
+  gimp_env_init (FALSE);
+
+  gimp_log_init ();
+
+  gimp_init_i18n ();
+
+  g_set_application_name (GIMP_NAME);
+
+#ifdef G_OS_WIN32
+  argv = g_win32_get_command_line ();
+#else
+  argv = g_strdupv (argv);
+#endif
+
+  basename = g_path_get_basename (argv[0]);
+  g_set_prgname (basename);
+  g_free (basename);
+
+  /* Check argv[] for "--verbose" first */
+  for (i = 1; i < argc; i++)
+    {
+      const gchar *arg = argv[i];
+
+      if (arg[0] != '-')
+        continue;
+
+      if ((strcmp (arg, "--verbose") == 0) || (strcmp (arg, "-v") == 0))
+        {
+          be_verbose = TRUE;
+        }
+    }
+
+  /* Check argv[] for "--no-interface" before trying to initialize gtk+. */
+  for (i = 1; i < argc; i++)
+    {
+      const gchar *arg = argv[i];
+
+      if (arg[0] != '-')
+        continue;
+
+      if ((strcmp (arg, "--no-interface") == 0) || (strcmp (arg, "-i") == 0))
+        {
+          no_interface = TRUE;
+        }
+      else if ((strcmp (arg, "--version") == 0) || (strcmp (arg, "-v") == 0))
+        {
+          gimp_show_version_and_exit ();
+        }
+#if defined (G_OS_WIN32) && !defined (GIMP_CONSOLE_COMPILATION)
+      else if ((strcmp (arg, "--help") == 0) ||
+               (strcmp (arg, "-?") == 0) ||
+               (strncmp (arg, "--help-", 7) == 0))
+        {
+          gimp_open_console_window ();
+        }
+#endif
+    }
+
+#ifdef GIMP_CONSOLE_COMPILATION
+  no_interface = TRUE;
+#endif
+
+  context = g_option_context_new (_("[FILE|URI...]"));
+  g_option_context_set_summary (context, GIMP_NAME);
+
+  g_option_context_add_main_entries (context, main_entries, GETTEXT_PACKAGE);
+
+  app_libs_init (context, no_interface);
+
+  if (! g_option_context_parse_strv (context, &argv, &error))
+    {
+      if (error)
+        {
+          gimp_open_console_window ();
+          g_print ("%s\n", error->message);
+          g_error_free (error);
+        }
+      else
+        {
+          g_print ("%s\n",
+                   _("GIMP could not initialize the graphical user interface.\n"
+                     "Make sure a proper setup for your display environment "
+                     "exists."));
+        }
+
+      app_exit (EXIT_FAILURE);
+    }
+
+  if (no_interface || be_verbose || console_messages || batch_commands != NULL)
+    gimp_open_console_window ();
+
+  if (no_interface)
+    new_instance = TRUE;
+
+#ifndef GIMP_CONSOLE_COMPILATION
+  if (! new_instance && gimp_unique_open (filenames, as_new))
+    {
+      if (be_verbose)
+        g_print ("%s\n",
+                 _("Another GIMP instance is already running."));
+
+      if (batch_commands)
+        gimp_unique_batch_run (batch_interpreter, batch_commands);
+
+      gdk_notify_startup_complete ();
+
+      return EXIT_SUCCESS;
+    }
+#endif
+
+  abort_message = sanity_check_early ();
+  if (abort_message)
+    app_abort (no_interface, abort_message);
+
+  if (system_gimprc)
+    system_gimprc_file = g_file_new_for_commandline_arg (system_gimprc);
+
+  if (user_gimprc)
+    user_gimprc_file = g_file_new_for_commandline_arg (user_gimprc);
+
+  app_run (argv[0],
+           filenames,
+           system_gimprc_file,
+           user_gimprc_file,
+           session_name,
+           batch_interpreter,
+           batch_commands,
+           as_new,
+           no_interface,
+           no_data,
+           no_fonts,
+           no_splash,
+           be_verbose,
+           use_shm,
+           use_cpu_accel,
+           console_messages,
+           use_debug_handler,
+           show_playground,
+           show_debug_menu,
+           stack_trace_mode,
+           pdb_compat_mode,
+           backtrace_file);
+
+  if (backtrace_file)
+    g_free (backtrace_file);
+
+  if (system_gimprc_file)
+    g_object_unref (system_gimprc_file);
+
+  if (user_gimprc_file)
+    g_object_unref (user_gimprc_file);
+
+  g_strfreev (argv);
+
+  g_option_context_free (context);
+
+  return EXIT_SUCCESS;
+}
+
+
+#ifdef G_OS_WIN32
+
+/* Provide WinMain in case we build GIMP as a subsystem:windows
+ * application. Well, we do. When built with mingw, though, user code
+ * execution still starts in main() in that case. So WinMain() gets
+ * used on MSVC builds only.
+ */
+
+#ifdef __GNUC__
+#  ifndef _stdcall
+#    define _stdcall  __attribute__((stdcall))
+#  endif
+#endif
+
+int _stdcall
+WinMain (struct HINSTANCE__ *hInstance,
+         struct HINSTANCE__ *hPrevInstance,
+         char               *lpszCmdLine,
+         int                 nCmdShow)
+{
+  return main (__argc, __argv);
+}
+
+#ifndef GIMP_CONSOLE_COMPILATION
+
+static void
+wait_console_window (void)
+{
+  FILE *console = fopen ("CONOUT$", "w");
+
+  SetConsoleTitleW (g_utf8_to_utf16 (_("GIMP output. Type any character to close this window."), -1, NULL, NULL, NULL));
+  fprintf (console, _("(Type any character to close this window)\n"));
+  fflush (console);
+  _getch ();
+}
+
+static void
+gimp_open_console_window (void)
+{
+  if (((HANDLE) _get_osfhandle (fileno (stdout)) == INVALID_HANDLE_VALUE ||
+       (HANDLE) _get_osfhandle (fileno (stderr)) == INVALID_HANDLE_VALUE) && AllocConsole ())
+    {
+      if ((HANDLE) _get_osfhandle (fileno (stdout)) == INVALID_HANDLE_VALUE)
+        freopen ("CONOUT$", "w", stdout);
+
+      if ((HANDLE) _get_osfhandle (fileno (stderr)) == INVALID_HANDLE_VALUE)
+        freopen ("CONOUT$", "w", stderr);
+
+      SetConsoleTitleW (g_utf8_to_utf16 (_("GIMP output. You can minimize this window, but don't close it."), -1, NULL, NULL, NULL));
+
+      atexit (wait_console_window);
+    }
+}
+#endif
+
+#endif /* G_OS_WIN32 */
+
+
+static gboolean
+gimp_option_fatal_warnings (const gchar  *option_name,
+                            const gchar  *value,
+                            gpointer      data,
+                            GError      **error)
+{
+  GLogLevelFlags fatal_mask;
+
+  fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+  fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+
+  g_log_set_always_fatal (fatal_mask);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_option_stack_trace_mode (const gchar  *option_name,
+                              const gchar  *value,
+                              gpointer      data,
+                              GError      **error)
+{
+  if (strcmp (value, "never") == 0)
+    stack_trace_mode = GIMP_STACK_TRACE_NEVER;
+  else if (strcmp (value, "query") == 0)
+    stack_trace_mode = GIMP_STACK_TRACE_QUERY;
+  else if (strcmp (value, "always") == 0)
+    stack_trace_mode = GIMP_STACK_TRACE_ALWAYS;
+  else
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gimp_option_pdb_compat_mode (const gchar  *option_name,
+                             const gchar  *value,
+                             gpointer      data,
+                             GError      **error)
+{
+  if (! strcmp (value, "off"))
+    pdb_compat_mode = GIMP_PDB_COMPAT_OFF;
+  else if (! strcmp (value, "on"))
+    pdb_compat_mode = GIMP_PDB_COMPAT_ON;
+  else if (! strcmp (value, "warn"))
+    pdb_compat_mode = GIMP_PDB_COMPAT_WARN;
+  else
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gimp_option_dump_gimprc (const gchar  *option_name,
+                         const gchar  *value,
+                         gpointer      data,
+                         GError      **error)
+{
+  GimpConfigDumpFormat format = GIMP_CONFIG_DUMP_NONE;
+
+  gimp_open_console_window ();
+
+  if (strcmp (option_name, "--dump-gimprc") == 0)
+    format = GIMP_CONFIG_DUMP_GIMPRC;
+  if (strcmp (option_name, "--dump-gimprc-system") == 0)
+    format = GIMP_CONFIG_DUMP_GIMPRC_SYSTEM;
+  else if (strcmp (option_name, "--dump-gimprc-manpage") == 0)
+    format = GIMP_CONFIG_DUMP_GIMPRC_MANPAGE;
+
+  if (format)
+    {
+      Gimp     *gimp;
+      gboolean  success;
+
+      babl_init ();
+      gimp = g_object_new (GIMP_TYPE_GIMP, NULL);
+      gimp_load_config (gimp, NULL, NULL);
+
+      success = gimp_config_dump (G_OBJECT (gimp), format);
+
+      g_object_unref (gimp);
+
+      app_exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_option_dump_pdb_procedures_deprecated (const gchar  *option_name,
+                                            const gchar  *value,
+                                            gpointer      data,
+                                            GError      **error)
+{
+  Gimp  *gimp;
+  GList *deprecated_procs;
+  GList *iter;
+
+  babl_init ();
+  gimp = g_object_new (GIMP_TYPE_GIMP, NULL);
+  gimp_load_config (gimp, NULL, NULL);
+
+  /* Make sure to turn on compatibility mode so deprecated procedures
+   * are included
+   */
+  gimp->pdb_compat_mode = GIMP_PDB_COMPAT_ON;
+
+  /* Initialize the list of procedures */
+  internal_procs_init (gimp->pdb);
+
+  /* Get deprecated procedures */
+  deprecated_procs = gimp_pdb_get_deprecated_procedures (gimp->pdb);
+
+  for (iter = deprecated_procs; iter; iter = g_list_next (iter))
+    {
+      GimpProcedure *procedure = GIMP_PROCEDURE (iter->data);
+
+      g_print ("%s\n", procedure->original_name);
+    }
+
+  g_list_free (deprecated_procs);
+
+  g_object_unref (gimp);
+
+  app_exit (EXIT_SUCCESS);
+
+  return FALSE;
+}
+
+static void
+gimp_show_version_and_exit (void)
+{
+  gimp_open_console_window ();
+  gimp_version_show (be_verbose);
+
+  app_exit (EXIT_SUCCESS);
+}
+
+static void
+gimp_show_license_and_exit (void)
+{
+  gimp_open_console_window ();
+  gimp_version_show (be_verbose);
+
+  g_print ("\n");
+  g_print (GIMP_LICENSE);
+  g_print ("\n\n");
+
+  app_exit (EXIT_SUCCESS);
+}
+
+static void
+gimp_init_malloc (void)
+{
+#ifdef GIMP_GLIB_MEM_PROFILER
+  g_mem_set_vtable (glib_mem_profiler_table);
+  g_atexit (g_mem_profile);
+#endif
+
+#ifdef __GLIBC__
+  /* Tweak memory allocation so that memory allocated in chunks >= 4k
+   * (64x64 pixel 1bpp tile) gets returned to the system when free()'d.
+   *
+   * The default value for M_MMAP_THRESHOLD in glibc-2.3 is 128k.
+   * This is said to be an empirically derived value that works well
+   * in most systems. Lowering it to 4k is thus probably not the ideal
+   * solution.
+   *
+   * An alternative to tuning this parameter would be to use
+   * malloc_trim(), for example after releasing a large tile-manager.
+   */
+#if 0
+  mallopt (M_MMAP_THRESHOLD, TILE_WIDTH * TILE_HEIGHT);
+#endif
+#endif
+}
+
+static void
+gimp_init_i18n (void)
+{
+  /*  We may change the locale later if the user specifies a language
+   *  in the gimprc file. Here we are just initializing the locale
+   *  according to the environment variables and set up the paths to
+   *  the message catalogs.
+   */
+
+  setlocale (LC_ALL, "");
+
+  bindtextdomain (GETTEXT_PACKAGE"-libgimp", gimp_locale_directory ());
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+  bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8");
+#endif
+
+  bindtextdomain (GETTEXT_PACKAGE, gimp_locale_directory ());
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+
+  textdomain (GETTEXT_PACKAGE);
+}
diff --git a/app/menus/Makefile.am b/app/menus/Makefile.am
new file mode 100644
index 0000000..32968bb
--- /dev/null
+++ b/app/menus/Makefile.am
@@ -0,0 +1,34 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Menus\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappmenus.a
+
+libappmenus_a_SOURCES = \
+	menus-types.h		\
+	menus.c			\
+	menus.h			\
+	dockable-menu.c		\
+	dockable-menu.h		\
+	file-menu.c		\
+	file-menu.h		\
+	filters-menu.c		\
+	filters-menu.h		\
+	image-menu.c		\
+	image-menu.h		\
+	plug-in-menus.c		\
+	plug-in-menus.h		\
+	tool-options-menu.c	\
+	tool-options-menu.h	\
+	window-menu.c		\
+	window-menu.h		\
+	windows-menu.c		\
+	windows-menu.h
diff --git a/app/menus/Makefile.in b/app/menus/Makefile.in
new file mode 100644
index 0000000..50da784
--- /dev/null
+++ b/app/menus/Makefile.in
@@ -0,0 +1,963 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/menus
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappmenus_a_AR = $(AR) $(ARFLAGS)
+libappmenus_a_LIBADD =
+am_libappmenus_a_OBJECTS = menus.$(OBJEXT) dockable-menu.$(OBJEXT) \
+	file-menu.$(OBJEXT) filters-menu.$(OBJEXT) \
+	image-menu.$(OBJEXT) plug-in-menus.$(OBJEXT) \
+	tool-options-menu.$(OBJEXT) window-menu.$(OBJEXT) \
+	windows-menu.$(OBJEXT)
+libappmenus_a_OBJECTS = $(am_libappmenus_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/dockable-menu.Po \
+	./$(DEPDIR)/file-menu.Po ./$(DEPDIR)/filters-menu.Po \
+	./$(DEPDIR)/image-menu.Po ./$(DEPDIR)/menus.Po \
+	./$(DEPDIR)/plug-in-menus.Po ./$(DEPDIR)/tool-options-menu.Po \
+	./$(DEPDIR)/window-menu.Po ./$(DEPDIR)/windows-menu.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappmenus_a_SOURCES)
+DIST_SOURCES = $(libappmenus_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Menus\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappmenus.a
+libappmenus_a_SOURCES = \
+	menus-types.h		\
+	menus.c			\
+	menus.h			\
+	dockable-menu.c		\
+	dockable-menu.h		\
+	file-menu.c		\
+	file-menu.h		\
+	filters-menu.c		\
+	filters-menu.h		\
+	image-menu.c		\
+	image-menu.h		\
+	plug-in-menus.c		\
+	plug-in-menus.h		\
+	tool-options-menu.c	\
+	tool-options-menu.h	\
+	window-menu.c		\
+	window-menu.h		\
+	windows-menu.c		\
+	windows-menu.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/menus/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/menus/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappmenus.a: $(libappmenus_a_OBJECTS) $(libappmenus_a_DEPENDENCIES) $(EXTRA_libappmenus_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappmenus.a
+	$(AM_V_AR)$(libappmenus_a_AR) libappmenus.a $(libappmenus_a_OBJECTS) $(libappmenus_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappmenus.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-menu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-menu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-menu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-menu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menus.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-menus.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-menu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-menu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-menu.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/dockable-menu.Po
+	-rm -f ./$(DEPDIR)/file-menu.Po
+	-rm -f ./$(DEPDIR)/filters-menu.Po
+	-rm -f ./$(DEPDIR)/image-menu.Po
+	-rm -f ./$(DEPDIR)/menus.Po
+	-rm -f ./$(DEPDIR)/plug-in-menus.Po
+	-rm -f ./$(DEPDIR)/tool-options-menu.Po
+	-rm -f ./$(DEPDIR)/window-menu.Po
+	-rm -f ./$(DEPDIR)/windows-menu.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/dockable-menu.Po
+	-rm -f ./$(DEPDIR)/file-menu.Po
+	-rm -f ./$(DEPDIR)/filters-menu.Po
+	-rm -f ./$(DEPDIR)/image-menu.Po
+	-rm -f ./$(DEPDIR)/menus.Po
+	-rm -f ./$(DEPDIR)/plug-in-menus.Po
+	-rm -f ./$(DEPDIR)/tool-options-menu.Po
+	-rm -f ./$(DEPDIR)/window-menu.Po
+	-rm -f ./$(DEPDIR)/windows-menu.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/menus/dockable-menu.c b/app/menus/dockable-menu.c
new file mode 100644
index 0000000..ccc6537
--- /dev/null
+++ b/app/menus/dockable-menu.c
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "menus-types.h"
+
+#include "dockable-menu.h"
+#include "window-menu.h"
+
+
+void
+dockable_menu_setup (GimpUIManager *manager,
+                     const gchar   *ui_path)
+{
+  window_menu_setup (manager, "dock", ui_path);
+}
diff --git a/app/menus/dockable-menu.h b/app/menus/dockable-menu.h
new file mode 100644
index 0000000..1fd2483
--- /dev/null
+++ b/app/menus/dockable-menu.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DOCKABLE_MENU_H__
+#define __DOCKABLE_MENU_H__
+
+
+void   dockable_menu_setup (GimpUIManager *manager,
+                            const gchar   *ui_path);
+
+
+#endif /* __DOCKABLE_MENU_H__ */
diff --git a/app/menus/file-menu.c b/app/menus/file-menu.c
new file mode 100644
index 0000000..019b6b0
--- /dev/null
+++ b/app/menus/file-menu.c
@@ -0,0 +1,120 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpthumb/gimpthumb.h"
+
+#include "menus-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpviewable.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactionimpl.h"
+#include "widgets/gimpuimanager.h"
+
+#include "file-menu.h"
+
+
+static gboolean file_menu_open_recent_query_tooltip (GtkWidget  *widget,
+                                                     gint        x,
+                                                     gint        y,
+                                                     gboolean    keyboard_mode,
+                                                     GtkTooltip *tooltip,
+                                                     GimpAction *action);
+
+
+void
+file_menu_setup (GimpUIManager *manager,
+                 const gchar   *ui_path)
+{
+  gint  n_entries;
+  guint merge_id;
+  gint  i;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+
+  n_entries = GIMP_GUI_CONFIG (manager->gimp->config)->last_opened_size;
+
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GtkWidget *widget;
+      gchar     *action_name;
+      gchar     *action_path;
+      gchar     *full_path;
+
+      action_name = g_strdup_printf ("file-open-recent-%02d", i + 1);
+      action_path = g_strdup_printf ("%s/File/Open Recent/Files", ui_path);
+
+      gimp_ui_manager_add_ui (manager, merge_id,
+                              action_path, action_name, action_name,
+                              GTK_UI_MANAGER_MENUITEM,
+                              FALSE);
+
+      full_path = g_strconcat (action_path, "/", action_name, NULL);
+
+      widget = gimp_ui_manager_get_widget (manager, full_path);
+
+      if (widget)
+        {
+          GimpAction *action;
+
+          action = gimp_ui_manager_find_action (manager, "file", action_name);
+
+          g_signal_connect_object (widget, "query-tooltip",
+                                   G_CALLBACK (file_menu_open_recent_query_tooltip),
+                                   action, 0);
+        }
+
+      g_free (action_name);
+      g_free (action_path);
+      g_free (full_path);
+    }
+}
+
+static gboolean
+file_menu_open_recent_query_tooltip (GtkWidget  *widget,
+                                     gint        x,
+                                     gint        y,
+                                     gboolean    keyboard_mode,
+                                     GtkTooltip *tooltip,
+                                     GimpAction *action)
+{
+  GimpActionImpl *impl = GIMP_ACTION_IMPL (action);
+  gchar          *text;
+
+  text = gtk_widget_get_tooltip_text (widget);
+  gtk_tooltip_set_text (tooltip, text);
+  g_free (text);
+
+  gtk_tooltip_set_icon (tooltip,
+                        gimp_viewable_get_pixbuf (impl->viewable,
+                                                  impl->context,
+                                                  GIMP_THUMB_SIZE_NORMAL,
+                                                  GIMP_THUMB_SIZE_NORMAL));
+
+  return TRUE;
+}
diff --git a/app/menus/file-menu.h b/app/menus/file-menu.h
new file mode 100644
index 0000000..e439e8d
--- /dev/null
+++ b/app/menus/file-menu.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILE_MENU_H__
+#define __FILE_MENU_H__
+
+
+void   file_menu_setup (GimpUIManager *manager,
+                        const gchar   *ui_path);
+
+
+#endif /* __FILE_MENU_H__ */
diff --git a/app/menus/filters-menu.c b/app/menus/filters-menu.c
new file mode 100644
index 0000000..8ffbcc3
--- /dev/null
+++ b/app/menus/filters-menu.c
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "menus-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-filter-history.h"
+
+#include "widgets/gimpuimanager.h"
+
+#include "filters-menu.h"
+
+
+/*  public functions  */
+
+void
+filters_menu_setup (GimpUIManager *manager,
+                    const gchar   *ui_path)
+{
+  guint merge_id;
+  gint  i;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+
+  for (i = 0; i < gimp_filter_history_size (manager->gimp); i++)
+    {
+      gchar *action_name;
+      gchar *action_path;
+
+      action_name = g_strdup_printf ("filters-recent-%02d", i + 1);
+      action_path = g_strdup_printf ("%s/Filters/Recently Used/Filters",
+                                     ui_path);
+
+      gimp_ui_manager_add_ui (manager, merge_id,
+                              action_path, action_name, action_name,
+                              GTK_UI_MANAGER_MENUITEM,
+                              FALSE);
+
+      g_free (action_name);
+      g_free (action_path);
+    }
+}
diff --git a/app/menus/filters-menu.h b/app/menus/filters-menu.h
new file mode 100644
index 0000000..9c1a705
--- /dev/null
+++ b/app/menus/filters-menu.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FILTERS_MENU_H__
+#define __FILTERS_MENU_H__
+
+
+void   filters_menu_setup (GimpUIManager *manager,
+                           const gchar   *ui_path);
+
+
+#endif /* __FILTERS_MENU_H__ */
diff --git a/app/menus/image-menu.c b/app/menus/image-menu.c
new file mode 100644
index 0000000..64bd9cd
--- /dev/null
+++ b/app/menus/image-menu.c
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "menus-types.h"
+
+#include "file-menu.h"
+#include "filters-menu.h"
+#include "image-menu.h"
+#include "plug-in-menus.h"
+#include "window-menu.h"
+#include "windows-menu.h"
+
+
+void
+image_menu_setup (GimpUIManager *manager,
+                  const gchar   *ui_path)
+{
+  gchar *path;
+
+  if (! strcmp (ui_path, "/dummy-menubar"))
+    ui_path = "/dummy-menubar/image-popup";
+
+  file_menu_setup (manager, ui_path);
+  windows_menu_setup (manager, ui_path);
+  plug_in_menus_setup (manager, ui_path);
+  filters_menu_setup (manager, ui_path);
+
+  path = g_strconcat (ui_path, "/View", NULL);
+  window_menu_setup (manager, "view", path);
+  g_free (path);
+}
diff --git a/app/menus/image-menu.h b/app/menus/image-menu.h
new file mode 100644
index 0000000..0ae5418
--- /dev/null
+++ b/app/menus/image-menu.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IMAGE_MENU_H__
+#define __IMAGE_MENU_H__
+
+
+void   image_menu_setup (GimpUIManager *manager,
+                         const gchar   *ui_path);
+
+
+#endif /* __IMAGE_MENU_H__ */
diff --git a/app/menus/menus-types.h b/app/menus/menus-types.h
new file mode 100644
index 0000000..1c05529
--- /dev/null
+++ b/app/menus/menus-types.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MENUS_TYPES_H__
+#define __MENUS_TYPES_H__
+
+
+#include "actions/actions-types.h"
+
+
+#endif /* __MENUS_TYPES_H__ */
diff --git a/app/menus/menus.c b/app/menus/menus.c
new file mode 100644
index 0000000..79a3f25
--- /dev/null
+++ b/app/menus/menus.c
@@ -0,0 +1,519 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "menus-types.h"
+
+#include "config/gimpconfig-file.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpactionfactory.h"
+#include "widgets/gimpdashboard.h"
+#include "widgets/gimpmenufactory.h"
+
+#include "dockable-menu.h"
+#include "image-menu.h"
+#include "menus.h"
+#include "plug-in-menus.h"
+#include "tool-options-menu.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   menus_can_change_accels (GimpGuiConfig   *config);
+static void   menus_remove_accels     (gpointer         data,
+                                       const gchar     *accel_path,
+                                       guint            accel_key,
+                                       GdkModifierType  accel_mods,
+                                       gboolean         changed);
+
+
+/*  global variables  */
+
+GimpMenuFactory * global_menu_factory = NULL;
+
+
+/*  private variables  */
+
+static gboolean   menurc_deleted      = FALSE;
+
+
+/*  public functions  */
+
+void
+menus_init (Gimp              *gimp,
+            GimpActionFactory *action_factory)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_ACTION_FACTORY (action_factory));
+  g_return_if_fail (global_menu_factory == NULL);
+
+  /* We need to make sure the property is installed before using it */
+  g_type_class_ref (GTK_TYPE_MENU);
+
+  menus_can_change_accels (GIMP_GUI_CONFIG (gimp->config));
+
+  g_signal_connect (gimp->config, "notify::can-change-accels",
+                    G_CALLBACK (menus_can_change_accels), NULL);
+
+  global_menu_factory = gimp_menu_factory_new (gimp, action_factory);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Image>",
+                                      "file",
+                                      "context",
+                                      "debug",
+                                      "help",
+                                      "edit",
+                                      "select",
+                                      "view",
+                                      "image",
+                                      "drawable",
+                                      "layers",
+                                      "channels",
+                                      "vectors",
+                                      "tools",
+                                      "dialogs",
+                                      "windows",
+                                      "plug-in",
+                                      "filters",
+                                      "quick-mask",
+                                      NULL,
+                                      "/image-menubar",
+                                      "image-menu.xml", image_menu_setup,
+                                      "/dummy-menubar",
+                                      "image-menu.xml", image_menu_setup,
+                                      "/quick-mask-popup",
+                                      "quick-mask-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Toolbox>",
+                                      "file",
+                                      "context",
+                                      "help",
+                                      "edit",
+                                      "select",
+                                      "view",
+                                      "image",
+                                      "drawable",
+                                      "layers",
+                                      "channels",
+                                      "vectors",
+                                      "tools",
+                                      "windows",
+                                      "dialogs",
+                                      "plug-in",
+                                      "filters",
+                                      "quick-mask",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Dock>",
+                                      "file",
+                                      "context",
+                                      "edit",
+                                      "select",
+                                      "view",
+                                      "image",
+                                      "drawable",
+                                      "layers",
+                                      "channels",
+                                      "vectors",
+                                      "tools",
+                                      "windows",
+                                      "dialogs",
+                                      "plug-in",
+                                      "quick-mask",
+                                      "dock",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Layers>",
+                                      "layers",
+                                      "plug-in",
+                                      "filters",
+                                      NULL,
+                                      "/layers-popup",
+                                      "layers-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Channels>",
+                                      "channels",
+                                      "plug-in",
+                                      "filters",
+                                      NULL,
+                                      "/channels-popup",
+                                      "channels-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Vectors>",
+                                      "vectors",
+                                      "plug-in",
+                                      NULL,
+                                      "/vectors-popup",
+                                      "vectors-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Colormap>",
+                                      "colormap",
+                                      "plug-in",
+                                      NULL,
+                                      "/colormap-popup",
+                                      "colormap-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Dockable>",
+                                      "dockable",
+                                      "dock",
+                                      NULL,
+                                      "/dockable-popup",
+                                      "dockable-menu.xml", dockable_menu_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Brushes>",
+                                      "brushes",
+                                      "plug-in",
+                                      NULL,
+                                      "/brushes-popup",
+                                      "brushes-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Dynamics>",
+                                      "dynamics",
+                                      "plug-in",
+                                      NULL,
+                                      "/dynamics-popup",
+                                      "dynamics-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<MyPaintBrushes>",
+                                      "mypaint-brushes",
+                                      "plug-in",
+                                      NULL,
+                                      "/mypaint-brushes-popup",
+                                      "mypaint-brushes-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Patterns>",
+                                      "patterns",
+                                      "plug-in",
+                                      NULL,
+                                      "/patterns-popup",
+                                      "patterns-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Gradients>",
+                                      "gradients",
+                                      "plug-in",
+                                      NULL,
+                                      "/gradients-popup",
+                                      "gradients-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Palettes>",
+                                      "palettes",
+                                      "plug-in",
+                                      NULL,
+                                      "/palettes-popup",
+                                      "palettes-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<ToolPresets>",
+                                      "tool-presets",
+                                      "plug-in",
+                                      NULL,
+                                      "/tool-presets-popup",
+                                      "tool-presets-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Fonts>",
+                                      "fonts",
+                                      "plug-in",
+                                      NULL,
+                                      "/fonts-popup",
+                                      "fonts-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Buffers>",
+                                      "buffers",
+                                      "plug-in",
+                                      NULL,
+                                      "/buffers-popup",
+                                      "buffers-menu.xml", plug_in_menus_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Documents>",
+                                      "documents",
+                                      NULL,
+                                      "/documents-popup",
+                                      "documents-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Templates>",
+                                      "templates",
+                                      NULL,
+                                      "/templates-popup",
+                                      "templates-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Images>",
+                                      "images",
+                                      NULL,
+                                      "/images-popup",
+                                      "images-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<BrushEditor>",
+                                      "brush-editor",
+                                      NULL,
+                                      "/brush-editor-popup",
+                                      "brush-editor-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<DynamicsEditor>",
+                                      "dynamics-editor",
+                                      NULL,
+                                      "/dynamics-editor-popup",
+                                      "dynamics-editor-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<GradientEditor>",
+                                      "gradient-editor",
+                                      NULL,
+                                      "/gradient-editor-popup",
+                                      "gradient-editor-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<PaletteEditor>",
+                                      "palette-editor",
+                                      NULL,
+                                      "/palette-editor-popup",
+                                      "palette-editor-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<ToolPresetEditor>",
+                                      "tool-preset-editor",
+                                      NULL,
+                                      "/tool-preset-editor-popup",
+                                      "tool-preset-editor-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Selection>",
+                                      "select",
+                                      "vectors",
+                                      NULL,
+                                      "/selection-popup",
+                                      "selection-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<NavigationEditor>",
+                                      "view",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Undo>",
+                                      "edit",
+                                      NULL,
+                                      "/undo-popup",
+                                      "undo-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<ErrorConsole>",
+                                      "error-console",
+                                      NULL,
+                                      "/error-console-popup",
+                                      "error-console-menu.xml", NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<ToolOptions>",
+                                      "tool-options",
+                                      NULL,
+                                      "/tool-options-popup",
+                                      "tool-options-menu.xml",
+                                      tool_options_menu_setup,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<TextEditor>",
+                                      "text-editor",
+                                      NULL,
+                                      "/text-editor-toolbar",
+                                      "text-editor-toolbar.xml",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<TextTool>",
+                                      "text-tool",
+                                      NULL,
+                                      "/text-tool-popup",
+                                      "text-tool-menu.xml",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<CursorInfo>",
+                                      "cursor-info",
+                                      NULL,
+                                      "/cursor-info-popup",
+                                      "cursor-info-menu.xml",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<SamplePoints>",
+                                      "sample-points",
+                                      NULL,
+                                      "/sample-points-popup",
+                                      "sample-points-menu.xml",
+                                      NULL,
+                                      NULL);
+
+  gimp_menu_factory_manager_register (global_menu_factory, "<Dashboard>",
+                                      "dashboard",
+                                      NULL,
+                                      "/dashboard-popup",
+                                      "dashboard-menu.xml", gimp_dashboard_menu_setup,
+                                       NULL);
+}
+
+void
+menus_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (global_menu_factory != NULL);
+
+  g_object_unref (global_menu_factory);
+  global_menu_factory = NULL;
+
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        menus_can_change_accels,
+                                        NULL);
+}
+
+void
+menus_restore (Gimp *gimp)
+{
+  gchar *filename;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  filename = gimp_personal_rc_file ("menurc");
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_filename_to_utf8 (filename));
+
+  gtk_accel_map_load (filename);
+  g_free (filename);
+}
+
+void
+menus_save (Gimp     *gimp,
+            gboolean  always_save)
+{
+  gchar *filename;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (menurc_deleted && ! always_save)
+    return;
+
+  filename = gimp_personal_rc_file ("menurc");
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_filename_to_utf8 (filename));
+
+  gtk_accel_map_save (filename);
+  g_free (filename);
+
+  menurc_deleted = FALSE;
+}
+
+gboolean
+menus_clear (Gimp    *gimp,
+             GError **error)
+{
+  GFile    *file;
+  GFile    *source;
+  gboolean  success  = TRUE;
+  GError   *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  file   = gimp_directory_file ("menurc", NULL);
+  source = gimp_sysconf_directory_file ("menurc", NULL);
+
+  if (g_file_copy (source, file, G_FILE_COPY_OVERWRITE,
+                   NULL, NULL, NULL, NULL))
+    {
+      menurc_deleted = TRUE;
+    }
+  else if (! g_file_delete (file, NULL, &my_error) &&
+           my_error->code != G_IO_ERROR_NOT_FOUND)
+    {
+      g_set_error (error, my_error->domain, my_error->code,
+                   _("Deleting \"%s\" failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+      success = FALSE;
+    }
+  else
+    {
+      menurc_deleted = TRUE;
+    }
+
+  g_clear_error (&my_error);
+  g_object_unref (source);
+  g_object_unref (file);
+
+  return success;
+}
+
+void
+menus_remove (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gtk_accel_map_foreach (gimp, menus_remove_accels);
+}
+
+
+/*  private functions  */
+
+static void
+menus_can_change_accels (GimpGuiConfig *config)
+{
+  g_object_set (gtk_settings_get_for_screen (gdk_screen_get_default ()),
+                "gtk-can-change-accels", config->can_change_accels,
+                NULL);
+}
+
+static void
+menus_remove_accels (gpointer        data,
+                     const gchar    *accel_path,
+                     guint           accel_key,
+                     GdkModifierType accel_mods,
+                     gboolean        changed)
+{
+  gtk_accel_map_change_entry (accel_path, 0, 0, TRUE);
+}
diff --git a/app/menus/menus.h b/app/menus/menus.h
new file mode 100644
index 0000000..ba59045
--- /dev/null
+++ b/app/menus/menus.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MENUS_H__
+#define __MENUS_H__
+
+
+extern GimpMenuFactory *global_menu_factory;
+
+
+void       menus_init    (Gimp               *gimp,
+                          GimpActionFactory  *action_factory);
+void       menus_exit    (Gimp               *gimp);
+
+void       menus_restore (Gimp               *gimp);
+void       menus_save    (Gimp               *gimp,
+                          gboolean            always_save);
+
+gboolean   menus_clear   (Gimp               *gimp,
+                          GError            **error);
+void       menus_remove  (Gimp               *gimp);
+
+
+#endif /* __MENUS_H__ */
diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c
new file mode 100644
index 0000000..8efdeb4
--- /dev/null
+++ b/app/menus/plug-in-menus.c
@@ -0,0 +1,574 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "menus-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginmanager-locale-domain.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "widgets/gimpuimanager.h"
+
+#include "plug-in-menus.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+typedef struct _PlugInMenuEntry PlugInMenuEntry;
+
+struct _PlugInMenuEntry
+{
+  GimpPlugInProcedure *proc;
+  const gchar         *menu_path;
+};
+
+
+/*  local function prototypes  */
+
+static void    plug_in_menus_register_procedure   (GimpPDB             *pdb,
+                                                   GimpProcedure       *procedure,
+                                                   GimpUIManager       *manager);
+static void    plug_in_menus_unregister_procedure (GimpPDB             *pdb,
+                                                   GimpProcedure       *procedure,
+                                                   GimpUIManager       *manager);
+static void    plug_in_menus_menu_path_added      (GimpPlugInProcedure *plug_in_proc,
+                                                   const gchar         *menu_path,
+                                                   GimpUIManager       *manager);
+static void    plug_in_menus_add_proc             (GimpUIManager       *manager,
+                                                   const gchar         *ui_path,
+                                                   GimpPlugInProcedure *proc,
+                                                   const gchar         *menu_path);
+static void    plug_in_menus_tree_insert          (GTree               *entries,
+                                                   const gchar     *    path,
+                                                   PlugInMenuEntry     *entry);
+static gboolean   plug_in_menus_tree_traverse     (gpointer             key,
+                                                   PlugInMenuEntry     *entry,
+                                                   GimpUIManager       *manager);
+static gchar * plug_in_menus_build_path           (GimpUIManager       *manager,
+                                                   const gchar         *ui_path,
+                                                   guint                merge_id,
+                                                   const gchar         *menu_path,
+                                                   gboolean             for_menu);
+static void    plug_in_menu_entry_free            (PlugInMenuEntry     *entry);
+
+
+/*  public functions  */
+
+void
+plug_in_menus_setup (GimpUIManager *manager,
+                     const gchar   *ui_path)
+{
+  GimpPlugInManager *plug_in_manager;
+  GTree             *menu_entries;
+  GSList            *list;
+  guint              merge_id;
+  gint               i;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+
+  plug_in_manager = manager->gimp->plug_in_manager;
+
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+
+  for (i = 0; i < manager->gimp->config->filter_history_size; i++)
+    {
+      gchar *action_name;
+      gchar *action_path;
+
+      action_name = g_strdup_printf ("filter-recent-%02d", i + 1);
+      action_path = g_strdup_printf ("%s/Filters/Recently Used/Plug-ins",
+                                     ui_path);
+
+      gimp_ui_manager_add_ui (manager, merge_id,
+                              action_path, action_name, action_name,
+                              GTK_UI_MANAGER_MENUITEM,
+                              FALSE);
+
+      g_free (action_name);
+      g_free (action_path);
+    }
+
+  menu_entries = g_tree_new_full ((GCompareDataFunc) strcmp, NULL,
+                                  g_free,
+                                  (GDestroyNotify) plug_in_menu_entry_free);
+
+  for (list = plug_in_manager->plug_in_procedures;
+       list;
+       list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *plug_in_proc = list->data;
+
+      if (! plug_in_proc->file)
+        continue;
+
+      g_signal_connect_object (plug_in_proc, "menu-path-added",
+                               G_CALLBACK (plug_in_menus_menu_path_added),
+                               manager, 0);
+
+      if (plug_in_proc->menu_paths &&
+          ! plug_in_proc->file_proc)
+        {
+          GList *path;
+
+          for (path = plug_in_proc->menu_paths; path; path = g_list_next (path))
+            {
+              if (g_str_has_prefix (path->data, manager->name))
+                {
+                  PlugInMenuEntry *entry = g_slice_new0 (PlugInMenuEntry);
+                  GFile           *file;
+                  const gchar     *locale_domain;
+
+                  entry->proc      = plug_in_proc;
+                  entry->menu_path = path->data;
+
+                  file = gimp_plug_in_procedure_get_file (plug_in_proc);
+
+                  locale_domain =
+                    gimp_plug_in_manager_get_locale_domain (plug_in_manager,
+                                                            file, NULL);
+
+                  if (plug_in_proc->menu_label)
+                    {
+                      gchar *menu;
+
+                      menu = g_strconcat (dgettext (locale_domain,
+                                                    path->data),
+                                          "/",
+                                          dgettext (locale_domain,
+                                                    plug_in_proc->menu_label),
+                                          NULL);
+
+                      plug_in_menus_tree_insert (menu_entries, menu, entry);
+                      g_free (menu);
+                    }
+                  else
+                    {
+                      plug_in_menus_tree_insert (menu_entries,
+                                                 dgettext (locale_domain,
+                                                           path->data),
+                                                 entry);
+                    }
+                }
+            }
+        }
+    }
+
+  g_object_set_data (G_OBJECT (manager), "ui-path", (gpointer) ui_path);
+
+  g_tree_foreach (menu_entries,
+                  (GTraverseFunc) plug_in_menus_tree_traverse,
+                  manager);
+
+  g_object_set_data (G_OBJECT (manager), "ui-path", NULL);
+
+  g_tree_destroy (menu_entries);
+
+  g_signal_connect_object (manager->gimp->pdb, "register-procedure",
+                           G_CALLBACK (plug_in_menus_register_procedure),
+                           manager, 0);
+  g_signal_connect_object (manager->gimp->pdb, "unregister-procedure",
+                           G_CALLBACK (plug_in_menus_unregister_procedure),
+                           manager, 0);
+}
+
+
+/*  private functions  */
+
+static void
+plug_in_menus_register_procedure (GimpPDB       *pdb,
+                                  GimpProcedure *procedure,
+                                  GimpUIManager *manager)
+{
+  if (GIMP_IS_PLUG_IN_PROCEDURE (procedure))
+    {
+      GimpPlugInProcedure *plug_in_proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+      g_signal_connect_object (plug_in_proc, "menu-path-added",
+                               G_CALLBACK (plug_in_menus_menu_path_added),
+                               manager, 0);
+
+      if ((plug_in_proc->menu_label || plug_in_proc->menu_paths) &&
+          ! plug_in_proc->file_proc)
+        {
+          GList *list;
+
+
+          GIMP_LOG (MENUS, "register procedure: %s",
+                    gimp_object_get_name (procedure));
+
+          for (list = plug_in_proc->menu_paths; list; list = g_list_next (list))
+            plug_in_menus_menu_path_added (plug_in_proc, list->data, manager);
+        }
+    }
+}
+
+static void
+plug_in_menus_unregister_procedure (GimpPDB       *pdb,
+                                    GimpProcedure *procedure,
+                                    GimpUIManager *manager)
+{
+  if (GIMP_IS_PLUG_IN_PROCEDURE (procedure))
+    {
+      GimpPlugInProcedure *plug_in_proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+      g_signal_handlers_disconnect_by_func (plug_in_proc,
+                                            plug_in_menus_menu_path_added,
+                                            manager);
+
+      if ((plug_in_proc->menu_label || plug_in_proc->menu_paths) &&
+          ! plug_in_proc->file_proc)
+        {
+          GList *list;
+
+          GIMP_LOG (MENUS, "unregister procedure: %s",
+                   gimp_object_get_name (procedure));
+
+          for (list = plug_in_proc->menu_paths; list; list = g_list_next (list))
+            {
+              if (g_str_has_prefix (list->data, manager->name))
+                {
+                  gchar *merge_key;
+                  guint  merge_id;
+
+                  merge_key = g_strdup_printf ("%s-merge-id",
+                                               gimp_object_get_name (plug_in_proc));
+                  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                                  merge_key));
+                  g_free (merge_key);
+
+                  if (merge_id)
+                    gimp_ui_manager_remove_ui (manager, merge_id);
+
+                  break;
+                }
+            }
+        }
+    }
+}
+
+static void
+plug_in_menus_menu_path_added (GimpPlugInProcedure *plug_in_proc,
+                               const gchar         *menu_path,
+                               GimpUIManager       *manager)
+{
+  GIMP_LOG (MENUS, "menu path added: %s (%s)",
+           gimp_object_get_name (plug_in_proc), menu_path);
+
+  if (g_str_has_prefix (menu_path, manager->name))
+    {
+      if (! strcmp (manager->name, "<Image>"))
+        {
+          plug_in_menus_add_proc (manager, "/image-menubar",
+                                  plug_in_proc, menu_path);
+          plug_in_menus_add_proc (manager, "/dummy-menubar/image-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Layers>"))
+        {
+          plug_in_menus_add_proc (manager, "/layers-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Channels>"))
+        {
+          plug_in_menus_add_proc (manager, "/channels-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Vectors>"))
+        {
+          plug_in_menus_add_proc (manager, "/vectors-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Colormap>"))
+        {
+          plug_in_menus_add_proc (manager, "/colormap-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Brushes>"))
+        {
+          plug_in_menus_add_proc (manager, "/brushes-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Dynamics>"))
+        {
+          plug_in_menus_add_proc (manager, "/dynamics-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<MyPaintBrushes>"))
+        {
+          plug_in_menus_add_proc (manager, "/mypaint-brushes-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Gradients>"))
+        {
+          plug_in_menus_add_proc (manager, "/gradients-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Palettes>"))
+        {
+          plug_in_menus_add_proc (manager, "/palettes-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Patterns>"))
+        {
+          plug_in_menus_add_proc (manager, "/patterns-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<ToolPresets>"))
+        {
+          plug_in_menus_add_proc (manager, "/tool-presets-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Fonts>"))
+        {
+          plug_in_menus_add_proc (manager, "/fonts-popup",
+                                  plug_in_proc, menu_path);
+        }
+      else if (! strcmp (manager->name, "<Buffers>"))
+        {
+          plug_in_menus_add_proc (manager, "/buffers-popup",
+                                  plug_in_proc, menu_path);
+        }
+    }
+}
+
+static void
+plug_in_menus_add_proc (GimpUIManager       *manager,
+                        const gchar         *ui_path,
+                        GimpPlugInProcedure *proc,
+                        const gchar         *menu_path)
+{
+  gchar *path;
+  gchar *merge_key;
+  gchar *stripped_path;
+  gchar *action_path;
+  guint  merge_id;
+  guint  menu_merge_id;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  path = g_strdup (menu_path);
+
+  if (! proc->menu_label)
+    {
+      gchar *p;
+
+      if (! path)
+        return;
+
+      p = strrchr (path, '/');
+      if (! p)
+        {
+          g_free (path);
+          return;
+        }
+
+      *p = '\0';
+    }
+
+  merge_key = g_strdup_printf ("%s-merge-id", gimp_object_get_name (proc));
+
+  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                  merge_key));
+
+  if (! merge_id)
+    {
+      merge_id = gimp_ui_manager_new_merge_id (manager);
+      g_object_set_data (G_OBJECT (manager), merge_key,
+                         GUINT_TO_POINTER (merge_id));
+    }
+
+  g_free (merge_key);
+
+  menu_merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                       "plug-in-menu-merge-id"));
+
+  if (! menu_merge_id)
+    {
+      menu_merge_id = gimp_ui_manager_new_merge_id (manager);
+      g_object_set_data (G_OBJECT (manager), "plug-in-menu-merge-id",
+                         GUINT_TO_POINTER (menu_merge_id));
+    }
+
+  stripped_path = gimp_strip_uline (path);
+  action_path = plug_in_menus_build_path (manager, ui_path, menu_merge_id,
+                                          stripped_path, FALSE);
+  g_free (stripped_path);
+
+  if (! action_path)
+    {
+      g_free (path);
+      return;
+    }
+
+  GIMP_LOG (MENUS, "adding menu item for '%s' (@ %s)",
+            gimp_object_get_name (proc), action_path);
+
+  gimp_ui_manager_add_ui (manager, merge_id,
+                          action_path,
+                          gimp_object_get_name (proc),
+                          gimp_object_get_name (proc),
+                          GTK_UI_MANAGER_MENUITEM,
+                          FALSE);
+
+  g_free (action_path);
+  g_free (path);
+}
+
+static void
+plug_in_menus_tree_insert (GTree           *entries,
+                           const gchar     *path,
+                           PlugInMenuEntry *entry)
+{
+  gchar *strip = gimp_strip_uline (path);
+  gchar *key;
+
+  /* Append the procedure name to the menu path in order to get a unique
+   * key even if two procedures are installed to the same menu entry.
+   */
+  key = g_strconcat (strip, gimp_object_get_name (entry->proc), NULL);
+
+  g_tree_insert (entries, g_utf8_collate_key (key, -1), entry);
+
+  g_free (key);
+  g_free (strip);
+}
+
+static gboolean
+plug_in_menus_tree_traverse (gpointer         key,
+                             PlugInMenuEntry *entry,
+                             GimpUIManager   *manager)
+{
+  const gchar *ui_path = g_object_get_data (G_OBJECT (manager), "ui-path");
+
+  plug_in_menus_add_proc (manager, ui_path, entry->proc, entry->menu_path);
+
+  return FALSE;
+}
+
+static gchar *
+plug_in_menus_build_path (GimpUIManager *manager,
+                          const gchar   *ui_path,
+                          guint          merge_id,
+                          const gchar   *menu_path,
+                          gboolean       for_menu)
+{
+  gchar *action_path;
+
+  if (! strchr (menu_path, '/'))
+    {
+      action_path = g_strdup (ui_path);
+      goto make_placeholder;
+    }
+
+  action_path = g_strdup_printf ("%s%s", ui_path, strchr (menu_path, '/'));
+
+  if (! gimp_ui_manager_get_widget (manager, action_path))
+    {
+      gchar *parent_menu_path   = g_strdup (menu_path);
+      gchar *parent_action_path = NULL;
+      gchar *menu_item_name;
+
+      menu_item_name = strrchr (parent_menu_path, '/');
+
+      if (menu_item_name)
+        {
+          *menu_item_name++ = '\0';
+
+          parent_action_path = plug_in_menus_build_path (manager,
+                                                         ui_path, merge_id,
+                                                         parent_menu_path, TRUE);
+        }
+
+      if (parent_action_path)
+        {
+          g_free (action_path);
+          action_path = g_strdup_printf ("%s/%s",
+                                         parent_action_path, menu_item_name);
+
+          if (! gimp_ui_manager_get_widget (manager, action_path))
+            {
+              GIMP_LOG (MENUS, "adding menu '%s' at path '%s' for action '%s'",
+                        menu_item_name, action_path, menu_path);
+
+              gimp_ui_manager_add_ui (manager, merge_id,
+                                      parent_action_path, menu_item_name,
+                                      menu_path,
+                                      GTK_UI_MANAGER_MENU,
+                                      FALSE);
+
+              gimp_ui_manager_add_ui (manager, merge_id,
+                                      action_path, "Menus", NULL,
+                                      GTK_UI_MANAGER_PLACEHOLDER,
+                                      FALSE);
+              gimp_ui_manager_add_ui (manager, merge_id,
+                                      action_path, "Separator", NULL,
+                                      GTK_UI_MANAGER_SEPARATOR,
+                                      FALSE);
+            }
+
+          g_free (parent_action_path);
+        }
+      else
+        {
+          g_free (action_path);
+          action_path = NULL;
+        }
+
+      g_free (parent_menu_path);
+    }
+
+ make_placeholder:
+
+  if (action_path && for_menu)
+    {
+      gchar *placeholder_path = g_strdup_printf ("%s/%s", action_path, "Menus");
+
+      if (gimp_ui_manager_get_widget (manager, placeholder_path))
+        {
+          g_free (action_path);
+
+          return placeholder_path;
+        }
+
+      g_free (placeholder_path);
+    }
+
+  return action_path;
+}
+
+static void
+plug_in_menu_entry_free (PlugInMenuEntry *entry)
+{
+  g_slice_free (PlugInMenuEntry, entry);
+}
diff --git a/app/menus/plug-in-menus.h b/app/menus/plug-in-menus.h
new file mode 100644
index 0000000..4e07e2e
--- /dev/null
+++ b/app/menus/plug-in-menus.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_MENUS_H__
+#define __PLUG_IN_MENUS_H__
+
+
+void   plug_in_menus_setup (GimpUIManager *manager,
+                            const gchar   *ui_path);
+
+
+#endif /* __PLUG_IN_MENUS_H__ */
diff --git a/app/menus/tool-options-menu.c b/app/menus/tool-options-menu.c
new file mode 100644
index 0000000..6ba21a1
--- /dev/null
+++ b/app/menus/tool-options-menu.c
@@ -0,0 +1,161 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "menus-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+
+#include "tool-options-menu.h"
+
+
+/*  local function prototypes  */
+
+static void   tool_options_menu_update         (GimpUIManager *manager,
+                                                gpointer       update_data,
+                                                const gchar   *ui_path);
+static void   tool_options_menu_update_after   (GimpUIManager *manager,
+                                                gpointer       update_data,
+                                                const gchar   *ui_path);
+static void   tool_options_menu_update_presets (GimpUIManager *manager,
+                                                guint          merge_id,
+                                                const gchar   *ui_path,
+                                                const gchar   *menu_path,
+                                                const gchar   *which_action,
+                                                GimpContainer *presets);
+
+
+/*  public functions  */
+
+void
+tool_options_menu_setup (GimpUIManager *manager,
+                         const gchar   *ui_path)
+{
+  g_signal_connect (manager, "update",
+                    G_CALLBACK (tool_options_menu_update),
+                    (gpointer) ui_path);
+  g_signal_connect_after (manager, "update",
+                          G_CALLBACK (tool_options_menu_update_after),
+                          (gpointer) ui_path);
+}
+
+
+/*  private functions  */
+
+static void
+tool_options_menu_update (GimpUIManager *manager,
+                          gpointer       update_data,
+                          const gchar   *ui_path)
+{
+  guint merge_id;
+
+  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                  "tool-options-merge-id"));
+
+  if (merge_id)
+    {
+      gimp_ui_manager_remove_ui (manager, merge_id);
+
+      g_object_set_data (G_OBJECT (manager), "tool-options-merge-id",
+                         GINT_TO_POINTER (0));
+
+      gimp_ui_manager_ensure_update (manager);
+    }
+}
+
+static void
+tool_options_menu_update_after (GimpUIManager *manager,
+                                gpointer       update_data,
+                                const gchar   *ui_path)
+{
+  GimpContext  *context;
+  GimpToolInfo *tool_info;
+  guint         merge_id;
+
+  context   = gimp_get_user_context (manager->gimp);
+  tool_info = gimp_context_get_tool (context);
+
+  if (! tool_info->presets)
+    return;
+
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+
+  g_object_set_data (G_OBJECT (manager), "tool-options-merge-id",
+                     GUINT_TO_POINTER (merge_id));
+
+  tool_options_menu_update_presets (manager, merge_id, ui_path,
+                                    "Save", "save",
+                                    tool_info->presets);
+
+  tool_options_menu_update_presets (manager, merge_id, ui_path,
+                                    "Restore", "restore",
+                                    tool_info->presets);
+
+  tool_options_menu_update_presets (manager, merge_id, ui_path,
+                                    "Edit", "edit",
+                                    tool_info->presets);
+
+  tool_options_menu_update_presets (manager, merge_id, ui_path,
+                                    "Delete", "delete",
+                                    tool_info->presets);
+
+  gimp_ui_manager_ensure_update (manager);
+}
+
+static void
+tool_options_menu_update_presets (GimpUIManager *manager,
+                                  guint          merge_id,
+                                  const gchar   *ui_path,
+                                  const gchar   *menu_path,
+                                  const gchar   *which_action,
+                                  GimpContainer *presets)
+{
+  gint n_children;
+  gint i;
+
+  n_children = gimp_container_get_n_children (presets);
+
+  for (i = 0; i < n_children; i++)
+    {
+      gchar *action_name;
+      gchar *path;
+
+      action_name = g_strdup_printf ("tool-options-%s-preset-%03d",
+                                     which_action, i);
+      path        = g_strdup_printf ("%s/%s", ui_path, menu_path);
+
+      gimp_ui_manager_add_ui (manager, merge_id,
+                              path, action_name, action_name,
+                              GTK_UI_MANAGER_MENUITEM,
+                              FALSE);
+
+      g_free (action_name);
+      g_free (path);
+    }
+}
diff --git a/app/menus/tool-options-menu.h b/app/menus/tool-options-menu.h
new file mode 100644
index 0000000..9fbc291
--- /dev/null
+++ b/app/menus/tool-options-menu.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_OPTIONS_MENU_H__
+#define __TOOL_OPTIONS_MENU_H__
+
+
+void   tool_options_menu_setup (GimpUIManager *manager,
+                                const gchar   *ui_path);
+
+
+#endif /* __TOOL_OPTIONS_MENU_H__ */
diff --git a/app/menus/window-menu.c b/app/menus/window-menu.c
new file mode 100644
index 0000000..7391e92
--- /dev/null
+++ b/app/menus/window-menu.c
@@ -0,0 +1,168 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "menus-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimpuimanager.h"
+
+#include "window-menu.h"
+
+
+/*  private functions  */
+
+static void   window_menu_display_opened (GdkDisplayManager *disp_manager,
+                                          GdkDisplay        *display,
+                                          GimpUIManager     *manager);
+static void   window_menu_display_closed (GdkDisplay        *display,
+                                          gboolean           is_error,
+                                          GimpUIManager     *manager);
+
+
+/*  public functions  */
+
+void
+window_menu_setup (GimpUIManager *manager,
+                   const gchar   *group_name,
+                   const gchar   *ui_path)
+{
+  GdkDisplayManager *disp_manager = gdk_display_manager_get ();
+  GSList            *displays;
+  GSList            *list;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+
+  g_object_set_data_full (G_OBJECT (manager), "move-to-screen-group-name",
+                          g_strdup (group_name),
+                          (GDestroyNotify) g_free);
+  g_object_set_data_full (G_OBJECT (manager), "move-to-screen-ui-path",
+                          g_strdup (ui_path),
+                          (GDestroyNotify) g_free);
+
+  displays = gdk_display_manager_list_displays (disp_manager);
+
+  /*  present displays in the order in which they were opened  */
+  displays = g_slist_reverse (displays);
+
+  for (list = displays; list; list = g_slist_next (list))
+    {
+      window_menu_display_opened (disp_manager, list->data, manager);
+    }
+
+  g_slist_free (displays);
+
+  g_signal_connect_object (disp_manager, "display-opened",
+                           G_CALLBACK (window_menu_display_opened),
+                           G_OBJECT (manager), 0);
+}
+
+
+/*  private functions  */
+
+static void
+window_menu_display_opened (GdkDisplayManager *disp_manager,
+                            GdkDisplay        *display,
+                            GimpUIManager     *manager)
+{
+  const gchar *group_name;
+  const gchar *ui_path;
+  const gchar *display_name;
+  gchar       *action_path;
+  gchar       *merge_key;
+  guint        merge_id;
+  gint         n_screens;
+  gint         i;
+
+  group_name = g_object_get_data (G_OBJECT (manager),
+                                  "move-to-screen-group-name");
+  ui_path    = g_object_get_data (G_OBJECT (manager),
+                                  "move-to-screen-ui-path");
+
+  action_path = g_strdup_printf ("%s/Move to Screen", ui_path);
+
+  display_name = gdk_display_get_name (display);
+  if (! display_name)
+    display_name = "eek";
+
+  merge_key = g_strdup_printf ("%s-display-merge-id", display_name);
+
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+  g_object_set_data (G_OBJECT (manager), merge_key,
+                     GUINT_TO_POINTER (merge_id));
+
+  g_free (merge_key);
+
+  n_screens = gdk_display_get_n_screens (display);
+
+  for (i = 0; i < n_screens; i++)
+    {
+      GdkScreen *screen;
+      gchar     *screen_name;
+      gchar     *action_name;
+
+      screen = gdk_display_get_screen (display, i);
+
+      screen_name = gdk_screen_make_display_name (screen);
+      action_name = g_strdup_printf ("%s-move-to-screen-%s",
+                                     group_name, screen_name);
+      g_free (screen_name);
+
+      gimp_ui_manager_add_ui (manager, merge_id,
+                              action_path, action_name, action_name,
+                              GTK_UI_MANAGER_MENUITEM,
+                              FALSE);
+
+      g_free (action_name);
+    }
+
+  g_free (action_path);
+
+  g_signal_connect_object (display, "closed",
+                           G_CALLBACK (window_menu_display_closed),
+                           G_OBJECT (manager), 0);
+}
+
+static void
+window_menu_display_closed (GdkDisplay    *display,
+                            gboolean       is_error,
+                            GimpUIManager *manager)
+{
+  const gchar *display_name;
+  gchar       *merge_key;
+  guint        merge_id;
+
+  display_name = gdk_display_get_name (display);
+  if (! display_name)
+    display_name = "eek";
+
+  merge_key = g_strdup_printf ("%s-display-merge-id", display_name);
+  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                  merge_key));
+  g_free (merge_key);
+
+  if (merge_id)
+    gimp_ui_manager_remove_ui (manager, merge_id);
+}
diff --git a/app/menus/window-menu.h b/app/menus/window-menu.h
new file mode 100644
index 0000000..acce261
--- /dev/null
+++ b/app/menus/window-menu.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WINDOW_MENU_H__
+#define __WINDOW_MENU_H__
+
+
+void   window_menu_setup (GimpUIManager *manager,
+                          const gchar   *group_name,
+                          const gchar   *ui_path);
+
+
+#endif /* __WINDOW_MENU_H__ */
diff --git a/app/menus/windows-menu.c b/app/menus/windows-menu.c
new file mode 100644
index 0000000..9e203e0
--- /dev/null
+++ b/app/menus/windows-menu.c
@@ -0,0 +1,440 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpthumb/gimpthumb.h"
+
+#include "menus-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+#include "core/gimpviewable.h"
+
+#include "widgets/gimpaction.h"
+#include "widgets/gimpactionimpl.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpuimanager.h"
+
+#include "display/gimpdisplay.h"
+
+#include "dialogs/dialogs.h"
+
+#include "actions/windows-actions.h"
+
+#include "windows-menu.h"
+
+
+static void      windows_menu_display_add                (GimpContainer     *container,
+                                                          GimpDisplay       *display,
+                                                          GimpUIManager     *manager);
+static void      windows_menu_display_remove             (GimpContainer     *container,
+                                                          GimpDisplay       *display,
+                                                          GimpUIManager     *manager);
+static void      windows_menu_display_reorder            (GimpContainer     *container,
+                                                          GimpDisplay       *display,
+                                                          gint               new_index,
+                                                          GimpUIManager     *manager);
+static void      windows_menu_image_notify               (GimpDisplay       *display,
+                                                          const GParamSpec  *unused,
+                                                          GimpUIManager     *manager);
+static void      windows_menu_dock_window_added          (GimpDialogFactory *factory,
+                                                          GimpDockWindow    *dock_window,
+                                                          GimpUIManager     *manager);
+static void      windows_menu_dock_window_removed        (GimpDialogFactory *factory,
+                                                          GimpDockWindow    *dock_window,
+                                                          GimpUIManager     *manager);
+static gchar   * windows_menu_dock_window_to_merge_id    (GimpDockWindow    *dock_window);
+static void      windows_menu_recent_add                 (GimpContainer     *container,
+                                                          GimpSessionInfo   *info,
+                                                          GimpUIManager     *manager);
+static void      windows_menu_recent_remove              (GimpContainer     *container,
+                                                          GimpSessionInfo   *info,
+                                                          GimpUIManager     *manager);
+static gboolean  windows_menu_display_query_tooltip      (GtkWidget         *widget,
+                                                          gint               x,
+                                                          gint               y,
+                                                          gboolean           keyboard_mode,
+                                                          GtkTooltip        *tooltip,
+                                                          GimpAction        *action);
+
+
+void
+windows_menu_setup (GimpUIManager *manager,
+                    const gchar   *ui_path)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+
+  g_object_set_data (G_OBJECT (manager), "image-menu-ui-path",
+                     (gpointer) ui_path);
+
+  g_signal_connect_object (manager->gimp->displays, "add",
+                           G_CALLBACK (windows_menu_display_add),
+                           manager, 0);
+  g_signal_connect_object (manager->gimp->displays, "remove",
+                           G_CALLBACK (windows_menu_display_remove),
+                           manager, 0);
+  g_signal_connect_object (manager->gimp->displays, "reorder",
+                           G_CALLBACK (windows_menu_display_reorder),
+                           manager, 0);
+
+  for (list = gimp_get_display_iter (manager->gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+
+      windows_menu_display_add (manager->gimp->displays, display, manager);
+    }
+
+  g_signal_connect_object (gimp_dialog_factory_get_singleton (), "dock-window-added",
+                           G_CALLBACK (windows_menu_dock_window_added),
+                           manager, 0);
+  g_signal_connect_object (gimp_dialog_factory_get_singleton (), "dock-window-removed",
+                           G_CALLBACK (windows_menu_dock_window_removed),
+                           manager, 0);
+
+  for (list = gimp_dialog_factory_get_open_dialogs (gimp_dialog_factory_get_singleton ());
+       list;
+       list = g_list_next (list))
+    {
+      GimpDockWindow *dock_window = list->data;
+
+      if (GIMP_IS_DOCK_WINDOW (dock_window))
+        windows_menu_dock_window_added (gimp_dialog_factory_get_singleton (),
+                                        dock_window,
+                                        manager);
+    }
+
+  g_signal_connect_object (global_recent_docks, "add",
+                           G_CALLBACK (windows_menu_recent_add),
+                           manager, 0);
+  g_signal_connect_object (global_recent_docks, "remove",
+                           G_CALLBACK (windows_menu_recent_remove),
+                           manager, 0);
+
+  for (list = g_list_last (GIMP_LIST (global_recent_docks)->queue->head);
+       list;
+       list = g_list_previous (list))
+    {
+      GimpSessionInfo *info = list->data;
+
+      windows_menu_recent_add (global_recent_docks, info, manager);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+windows_menu_display_add (GimpContainer *container,
+                          GimpDisplay   *display,
+                          GimpUIManager *manager)
+{
+  g_signal_connect_object (display, "notify::image",
+                           G_CALLBACK (windows_menu_image_notify),
+                           manager, 0);
+
+  if (gimp_display_get_image (display))
+    windows_menu_image_notify (display, NULL, manager);
+}
+
+static void
+windows_menu_display_remove (GimpContainer *container,
+                             GimpDisplay   *display,
+                             GimpUIManager *manager)
+{
+  gchar *merge_key = g_strdup_printf ("windows-display-%04d-merge-id",
+                                      gimp_display_get_ID (display));
+  guint  merge_id;
+
+  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                  merge_key));
+
+  if (merge_id)
+    gimp_ui_manager_remove_ui (manager, merge_id);
+
+  g_object_set_data (G_OBJECT (manager), merge_key, NULL);
+
+  g_free (merge_key);
+}
+
+static void
+windows_menu_display_reorder (GimpContainer *container,
+                              GimpDisplay   *display,
+                              gint           new_index,
+                              GimpUIManager *manager)
+{
+  gint n_display = gimp_container_get_n_children (container);
+  gint i;
+
+  for (i = new_index; i < n_display; i++)
+    {
+      GimpObject *d = gimp_container_get_child_by_index (container, i);
+
+      windows_menu_display_remove (container, GIMP_DISPLAY (d), manager);
+    }
+
+  /* If I don't ensure the menu items are effectively removed, adding
+   * the same ones may simply cancel the effect of the removal, hence
+   * losing the menu reordering.
+   */
+  gimp_ui_manager_ensure_update (manager);
+
+  for (i = new_index; i < n_display; i++)
+    {
+      GimpObject *d = gimp_container_get_child_by_index (container, i);
+
+      windows_menu_display_add (container, GIMP_DISPLAY (d), manager);
+    }
+}
+
+static void
+windows_menu_image_notify (GimpDisplay      *display,
+                           const GParamSpec *unused,
+                           GimpUIManager    *manager)
+{
+  if (gimp_display_get_image (display))
+    {
+      gchar *merge_key = g_strdup_printf ("windows-display-%04d-merge-id",
+                                          gimp_display_get_ID (display));
+      guint  merge_id;
+
+      merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                      merge_key));
+
+      if (! merge_id)
+        {
+          GtkWidget   *widget;
+          const gchar *ui_path;
+          gchar       *action_name;
+          gchar       *action_path;
+          gchar       *full_path;
+
+          ui_path = g_object_get_data (G_OBJECT (manager),
+                                       "image-menu-ui-path");
+
+          action_name = gimp_display_get_action_name (display);
+          action_path = g_strdup_printf ("%s/Windows/Images", ui_path);
+
+          merge_id = gimp_ui_manager_new_merge_id (manager);
+
+          g_object_set_data (G_OBJECT (manager), merge_key,
+                             GUINT_TO_POINTER (merge_id));
+
+          gimp_ui_manager_add_ui (manager, merge_id,
+                                  action_path, action_name, action_name,
+                                  GTK_UI_MANAGER_MENUITEM,
+                                  FALSE);
+
+          full_path = g_strconcat (action_path, "/", action_name, NULL);
+
+          widget = gimp_ui_manager_get_widget (manager, full_path);
+
+          if (widget)
+            {
+              GimpAction *action;
+
+              action = gimp_ui_manager_find_action (manager,
+                                                    "windows", action_name);
+
+              g_signal_connect_object (widget, "query-tooltip",
+                                       G_CALLBACK (windows_menu_display_query_tooltip),
+                                       action, 0);
+            }
+
+          g_free (action_name);
+          g_free (action_path);
+          g_free (full_path);
+        }
+
+      g_free (merge_key);
+    }
+  else
+    {
+      windows_menu_display_remove (manager->gimp->displays, display, manager);
+    }
+}
+
+static void
+windows_menu_dock_window_added (GimpDialogFactory *factory,
+                                GimpDockWindow    *dock_window,
+                                GimpUIManager     *manager)
+{
+  const gchar *ui_path;
+  gchar       *action_name;
+  gchar       *action_path;
+  gchar       *merge_key;
+  guint        merge_id;
+
+  ui_path = g_object_get_data (G_OBJECT (manager), "image-menu-ui-path");
+
+  action_name = windows_actions_dock_window_to_action_name (dock_window);
+  action_path = g_strdup_printf ("%s/Windows/Docks",
+                                 ui_path);
+
+  merge_key = windows_menu_dock_window_to_merge_id (dock_window);
+  merge_id  = gimp_ui_manager_new_merge_id (manager);
+
+  g_object_set_data (G_OBJECT (manager), merge_key,
+                     GUINT_TO_POINTER (merge_id));
+
+  gimp_ui_manager_add_ui (manager, merge_id,
+                          action_path, action_name, action_name,
+                          GTK_UI_MANAGER_MENUITEM,
+                          FALSE);
+
+  g_free (merge_key);
+  g_free (action_path);
+  g_free (action_name);
+}
+
+static void
+windows_menu_dock_window_removed (GimpDialogFactory *factory,
+                                  GimpDockWindow    *dock_window,
+                                  GimpUIManager     *manager)
+{
+  gchar *merge_key = windows_menu_dock_window_to_merge_id (dock_window);
+  guint  merge_id  = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                          merge_key));
+  if (merge_id)
+    gimp_ui_manager_remove_ui (manager, merge_id);
+
+  g_object_set_data (G_OBJECT (manager), merge_key, NULL);
+
+  g_free (merge_key);
+}
+
+static gchar *
+windows_menu_dock_window_to_merge_id (GimpDockWindow *dock_window)
+{
+  return g_strdup_printf ("windows-dock-%04d-merge-id",
+                          gimp_dock_window_get_id (dock_window));
+}
+
+static void
+windows_menu_recent_add (GimpContainer   *container,
+                         GimpSessionInfo *info,
+                         GimpUIManager   *manager)
+{
+  const gchar *ui_path;
+  gchar       *action_name;
+  gchar       *action_path;
+  gint         info_id;
+  gchar       *merge_key;
+  guint        merge_id;
+
+  ui_path = g_object_get_data (G_OBJECT (manager), "image-menu-ui-path");
+
+  info_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (info),
+                                                "recent-action-id"));
+
+  action_name = g_strdup_printf ("windows-recent-%04d", info_id);
+  action_path = g_strdup_printf ("%s/Windows/Recently Closed Docks", ui_path);
+
+  merge_key = g_strdup_printf ("windows-recent-%04d-merge-id", info_id);
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+
+  g_object_set_data (G_OBJECT (manager), merge_key,
+                     GUINT_TO_POINTER (merge_id));
+
+  gimp_ui_manager_add_ui (manager, merge_id,
+                          action_path, action_name, action_name,
+                          GTK_UI_MANAGER_MENUITEM,
+                          TRUE);
+
+  g_free (merge_key);
+  g_free (action_path);
+  g_free (action_name);
+}
+
+static void
+windows_menu_recent_remove (GimpContainer   *container,
+                            GimpSessionInfo *info,
+                            GimpUIManager   *manager)
+{
+  gint   info_id;
+  gchar *merge_key;
+  guint  merge_id;
+
+  info_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (info),
+                                                "recent-action-id"));
+
+  merge_key = g_strdup_printf ("windows-recent-%04d-merge-id", info_id);
+
+  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
+                                                  merge_key));
+
+  if (merge_id)
+    gimp_ui_manager_remove_ui (manager, merge_id);
+
+  g_object_set_data (G_OBJECT (manager), merge_key, NULL);
+
+  g_free (merge_key);
+}
+
+static gboolean
+windows_menu_display_query_tooltip (GtkWidget  *widget,
+                                    gint        x,
+                                    gint        y,
+                                    gboolean    keyboard_mode,
+                                    GtkTooltip *tooltip,
+                                    GimpAction *action)
+{
+  GimpActionImpl *impl  = GIMP_ACTION_IMPL (action);
+  GimpImage      *image = GIMP_IMAGE (impl->viewable);
+  gchar          *text;
+  gdouble         xres;
+  gdouble         yres;
+  gint            width;
+  gint            height;
+
+  if (! image)
+    return FALSE;
+
+  text = gtk_widget_get_tooltip_text (widget);
+  gtk_tooltip_set_text (tooltip, text);
+  g_free (text);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  gimp_viewable_calc_preview_size (gimp_image_get_width  (image),
+                                   gimp_image_get_height (image),
+                                   GIMP_VIEW_SIZE_HUGE, GIMP_VIEW_SIZE_HUGE,
+                                   FALSE, xres, yres,
+                                   &width, &height, NULL);
+
+  gtk_tooltip_set_icon (tooltip,
+                        gimp_viewable_get_pixbuf (impl->viewable,
+                                                  impl->context,
+                                                  width, height));
+
+  return TRUE;
+}
diff --git a/app/menus/windows-menu.h b/app/menus/windows-menu.h
new file mode 100644
index 0000000..e57ac79
--- /dev/null
+++ b/app/menus/windows-menu.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WINDOWS_MENU_H__
+#define __WINDOWS_MENU_H__
+
+
+void   windows_menu_setup (GimpUIManager *manager,
+                           const gchar   *ui_path);
+
+
+#endif /* __WINDOWS_MENU_H__ */
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
new file mode 100644
index 0000000..24bfe6d
--- /dev/null
+++ b/app/operations/Makefile.am
@@ -0,0 +1,140 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = \
+	layer-modes		\
+	layer-modes-legacy	\
+	tests
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Operations\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libappoperations.a
+
+libappoperations_a_sources = \
+	operations-types.h			\
+	operations-enums.h			\
+	gimp-operations.c			\
+	gimp-operations.h			\
+	\
+	gimp-operation-config.c			\
+	gimp-operation-config.h			\
+	gimpoperationsettings.c			\
+	gimpoperationsettings.h			\
+	gimpbrightnesscontrastconfig.c		\
+	gimpbrightnesscontrastconfig.h		\
+	gimpcageconfig.c			\
+	gimpcageconfig.h			\
+	gimpcolorbalanceconfig.c		\
+	gimpcolorbalanceconfig.h		\
+	gimpcurvesconfig.c			\
+	gimpcurvesconfig.h			\
+	gimphuesaturationconfig.c		\
+	gimphuesaturationconfig.h		\
+	gimplevelsconfig.c			\
+	gimplevelsconfig.h			\
+	\
+	gimpoperationborder.c			\
+	gimpoperationborder.h			\
+	gimpoperationbuffersourcevalidate.c	\
+	gimpoperationbuffersourcevalidate.h	\
+	gimpoperationcagecoefcalc.c		\
+	gimpoperationcagecoefcalc.h		\
+	gimpoperationcagetransform.c		\
+	gimpoperationcagetransform.h		\
+	gimpoperationcomposecrop.c		\
+	gimpoperationcomposecrop.h		\
+	gimpoperationequalize.c			\
+	gimpoperationequalize.h			\
+	gimpoperationfillsource.c		\
+	gimpoperationfillsource.h		\
+	gimpoperationflood.c			\
+	gimpoperationflood.h			\
+	gimpoperationgradient.c			\
+	gimpoperationgradient.h			\
+	gimpoperationgrow.c			\
+	gimpoperationgrow.h			\
+	gimpoperationhistogramsink.c		\
+	gimpoperationhistogramsink.h		\
+	gimpoperationmaskcomponents.cc		\
+	gimpoperationmaskcomponents.h		\
+	gimpoperationoffset.c			\
+	gimpoperationoffset.h			\
+	gimpoperationprofiletransform.c		\
+	gimpoperationprofiletransform.h		\
+	gimpoperationscalarmultiply.c		\
+	gimpoperationscalarmultiply.h		\
+	gimpoperationsemiflatten.c		\
+	gimpoperationsemiflatten.h		\
+	gimpoperationsetalpha.c			\
+	gimpoperationsetalpha.h			\
+	gimpoperationshrink.c			\
+	gimpoperationshrink.h			\
+	gimpoperationthresholdalpha.c		\
+	gimpoperationthresholdalpha.h		\
+	\
+	gimpoperationpointfilter.c		\
+	gimpoperationpointfilter.h		\
+	gimpoperationbrightnesscontrast.c	\
+	gimpoperationbrightnesscontrast.h	\
+	gimpoperationcolorbalance.c		\
+	gimpoperationcolorbalance.h		\
+	gimpoperationcolorize.c			\
+	gimpoperationcolorize.h			\
+	gimpoperationcurves.c			\
+	gimpoperationcurves.h			\
+	gimpoperationdesaturate.c		\
+	gimpoperationdesaturate.h		\
+	gimpoperationhuesaturation.c		\
+	gimpoperationhuesaturation.h		\
+	gimpoperationlevels.c			\
+	gimpoperationlevels.h			\
+	gimpoperationposterize.c		\
+	gimpoperationposterize.h		\
+	gimpoperationthreshold.c		\
+	gimpoperationthreshold.h
+
+libappoperations_a_built_sources = operations-enums.c
+
+libappoperations_a_SOURCES = \
+	$(libappoperations_a_built_sources)	\
+	$(libappoperations_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-oec
+CLEANFILES = $(gen_sources)
+
+xgen-oec: $(srcdir)/operations-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"operations-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/operations-enums.c: xgen-oec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/operations/Makefile.in b/app/operations/Makefile.in
new file mode 100644
index 0000000..e960ea3
--- /dev/null
+++ b/app/operations/Makefile.in
@@ -0,0 +1,1376 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/operations
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappoperations_a_AR = $(AR) $(ARFLAGS)
+libappoperations_a_LIBADD =
+am__objects_1 = operations-enums.$(OBJEXT)
+am__objects_2 = gimp-operations.$(OBJEXT) \
+	gimp-operation-config.$(OBJEXT) \
+	gimpoperationsettings.$(OBJEXT) \
+	gimpbrightnesscontrastconfig.$(OBJEXT) \
+	gimpcageconfig.$(OBJEXT) gimpcolorbalanceconfig.$(OBJEXT) \
+	gimpcurvesconfig.$(OBJEXT) gimphuesaturationconfig.$(OBJEXT) \
+	gimplevelsconfig.$(OBJEXT) gimpoperationborder.$(OBJEXT) \
+	gimpoperationbuffersourcevalidate.$(OBJEXT) \
+	gimpoperationcagecoefcalc.$(OBJEXT) \
+	gimpoperationcagetransform.$(OBJEXT) \
+	gimpoperationcomposecrop.$(OBJEXT) \
+	gimpoperationequalize.$(OBJEXT) \
+	gimpoperationfillsource.$(OBJEXT) gimpoperationflood.$(OBJEXT) \
+	gimpoperationgradient.$(OBJEXT) gimpoperationgrow.$(OBJEXT) \
+	gimpoperationhistogramsink.$(OBJEXT) \
+	gimpoperationmaskcomponents.$(OBJEXT) \
+	gimpoperationoffset.$(OBJEXT) \
+	gimpoperationprofiletransform.$(OBJEXT) \
+	gimpoperationscalarmultiply.$(OBJEXT) \
+	gimpoperationsemiflatten.$(OBJEXT) \
+	gimpoperationsetalpha.$(OBJEXT) gimpoperationshrink.$(OBJEXT) \
+	gimpoperationthresholdalpha.$(OBJEXT) \
+	gimpoperationpointfilter.$(OBJEXT) \
+	gimpoperationbrightnesscontrast.$(OBJEXT) \
+	gimpoperationcolorbalance.$(OBJEXT) \
+	gimpoperationcolorize.$(OBJEXT) gimpoperationcurves.$(OBJEXT) \
+	gimpoperationdesaturate.$(OBJEXT) \
+	gimpoperationhuesaturation.$(OBJEXT) \
+	gimpoperationlevels.$(OBJEXT) gimpoperationposterize.$(OBJEXT) \
+	gimpoperationthreshold.$(OBJEXT)
+am_libappoperations_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappoperations_a_OBJECTS = $(am_libappoperations_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp-operation-config.Po \
+	./$(DEPDIR)/gimp-operations.Po \
+	./$(DEPDIR)/gimpbrightnesscontrastconfig.Po \
+	./$(DEPDIR)/gimpcageconfig.Po \
+	./$(DEPDIR)/gimpcolorbalanceconfig.Po \
+	./$(DEPDIR)/gimpcurvesconfig.Po \
+	./$(DEPDIR)/gimphuesaturationconfig.Po \
+	./$(DEPDIR)/gimplevelsconfig.Po \
+	./$(DEPDIR)/gimpoperationborder.Po \
+	./$(DEPDIR)/gimpoperationbrightnesscontrast.Po \
+	./$(DEPDIR)/gimpoperationbuffersourcevalidate.Po \
+	./$(DEPDIR)/gimpoperationcagecoefcalc.Po \
+	./$(DEPDIR)/gimpoperationcagetransform.Po \
+	./$(DEPDIR)/gimpoperationcolorbalance.Po \
+	./$(DEPDIR)/gimpoperationcolorize.Po \
+	./$(DEPDIR)/gimpoperationcomposecrop.Po \
+	./$(DEPDIR)/gimpoperationcurves.Po \
+	./$(DEPDIR)/gimpoperationdesaturate.Po \
+	./$(DEPDIR)/gimpoperationequalize.Po \
+	./$(DEPDIR)/gimpoperationfillsource.Po \
+	./$(DEPDIR)/gimpoperationflood.Po \
+	./$(DEPDIR)/gimpoperationgradient.Po \
+	./$(DEPDIR)/gimpoperationgrow.Po \
+	./$(DEPDIR)/gimpoperationhistogramsink.Po \
+	./$(DEPDIR)/gimpoperationhuesaturation.Po \
+	./$(DEPDIR)/gimpoperationlevels.Po \
+	./$(DEPDIR)/gimpoperationmaskcomponents.Po \
+	./$(DEPDIR)/gimpoperationoffset.Po \
+	./$(DEPDIR)/gimpoperationpointfilter.Po \
+	./$(DEPDIR)/gimpoperationposterize.Po \
+	./$(DEPDIR)/gimpoperationprofiletransform.Po \
+	./$(DEPDIR)/gimpoperationscalarmultiply.Po \
+	./$(DEPDIR)/gimpoperationsemiflatten.Po \
+	./$(DEPDIR)/gimpoperationsetalpha.Po \
+	./$(DEPDIR)/gimpoperationsettings.Po \
+	./$(DEPDIR)/gimpoperationshrink.Po \
+	./$(DEPDIR)/gimpoperationthreshold.Po \
+	./$(DEPDIR)/gimpoperationthresholdalpha.Po \
+	./$(DEPDIR)/operations-enums.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libappoperations_a_SOURCES)
+DIST_SOURCES = $(libappoperations_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = \
+	layer-modes		\
+	layer-modes-legacy	\
+	tests
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Operations\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libappoperations.a
+
+libappoperations_a_sources = \
+	operations-types.h			\
+	operations-enums.h			\
+	gimp-operations.c			\
+	gimp-operations.h			\
+	\
+	gimp-operation-config.c			\
+	gimp-operation-config.h			\
+	gimpoperationsettings.c			\
+	gimpoperationsettings.h			\
+	gimpbrightnesscontrastconfig.c		\
+	gimpbrightnesscontrastconfig.h		\
+	gimpcageconfig.c			\
+	gimpcageconfig.h			\
+	gimpcolorbalanceconfig.c		\
+	gimpcolorbalanceconfig.h		\
+	gimpcurvesconfig.c			\
+	gimpcurvesconfig.h			\
+	gimphuesaturationconfig.c		\
+	gimphuesaturationconfig.h		\
+	gimplevelsconfig.c			\
+	gimplevelsconfig.h			\
+	\
+	gimpoperationborder.c			\
+	gimpoperationborder.h			\
+	gimpoperationbuffersourcevalidate.c	\
+	gimpoperationbuffersourcevalidate.h	\
+	gimpoperationcagecoefcalc.c		\
+	gimpoperationcagecoefcalc.h		\
+	gimpoperationcagetransform.c		\
+	gimpoperationcagetransform.h		\
+	gimpoperationcomposecrop.c		\
+	gimpoperationcomposecrop.h		\
+	gimpoperationequalize.c			\
+	gimpoperationequalize.h			\
+	gimpoperationfillsource.c		\
+	gimpoperationfillsource.h		\
+	gimpoperationflood.c			\
+	gimpoperationflood.h			\
+	gimpoperationgradient.c			\
+	gimpoperationgradient.h			\
+	gimpoperationgrow.c			\
+	gimpoperationgrow.h			\
+	gimpoperationhistogramsink.c		\
+	gimpoperationhistogramsink.h		\
+	gimpoperationmaskcomponents.cc		\
+	gimpoperationmaskcomponents.h		\
+	gimpoperationoffset.c			\
+	gimpoperationoffset.h			\
+	gimpoperationprofiletransform.c		\
+	gimpoperationprofiletransform.h		\
+	gimpoperationscalarmultiply.c		\
+	gimpoperationscalarmultiply.h		\
+	gimpoperationsemiflatten.c		\
+	gimpoperationsemiflatten.h		\
+	gimpoperationsetalpha.c			\
+	gimpoperationsetalpha.h			\
+	gimpoperationshrink.c			\
+	gimpoperationshrink.h			\
+	gimpoperationthresholdalpha.c		\
+	gimpoperationthresholdalpha.h		\
+	\
+	gimpoperationpointfilter.c		\
+	gimpoperationpointfilter.h		\
+	gimpoperationbrightnesscontrast.c	\
+	gimpoperationbrightnesscontrast.h	\
+	gimpoperationcolorbalance.c		\
+	gimpoperationcolorbalance.h		\
+	gimpoperationcolorize.c			\
+	gimpoperationcolorize.h			\
+	gimpoperationcurves.c			\
+	gimpoperationcurves.h			\
+	gimpoperationdesaturate.c		\
+	gimpoperationdesaturate.h		\
+	gimpoperationhuesaturation.c		\
+	gimpoperationhuesaturation.h		\
+	gimpoperationlevels.c			\
+	gimpoperationlevels.h			\
+	gimpoperationposterize.c		\
+	gimpoperationposterize.h		\
+	gimpoperationthreshold.c		\
+	gimpoperationthreshold.h
+
+libappoperations_a_built_sources = operations-enums.c
+libappoperations_a_SOURCES = \
+	$(libappoperations_a_built_sources)	\
+	$(libappoperations_a_sources)
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-oec
+CLEANFILES = $(gen_sources)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/operations/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/operations/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappoperations.a: $(libappoperations_a_OBJECTS) $(libappoperations_a_DEPENDENCIES) $(EXTRA_libappoperations_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappoperations.a
+	$(AM_V_AR)$(libappoperations_a_AR) libappoperations.a $(libappoperations_a_OBJECTS) $(libappoperations_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappoperations.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-operation-config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-operations.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrightnesscontrastconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcageconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorbalanceconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurvesconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphuesaturationconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplevelsconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationborder.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationbrightnesscontrast.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationbuffersourcevalidate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationcagecoefcalc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationcagetransform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationcolorbalance.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationcolorize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationcomposecrop.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationcurves.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdesaturate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationequalize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationfillsource.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationflood.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationgradient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationgrow.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhistogramsink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhuesaturation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationlevels.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationmaskcomponents.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationoffset.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationpointfilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationposterize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationprofiletransform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationscalarmultiply.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationsemiflatten.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationsetalpha.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationsettings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationshrink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationthreshold.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationthresholdalpha.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/operations-enums.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+		-rm -f ./$(DEPDIR)/gimp-operation-config.Po
+	-rm -f ./$(DEPDIR)/gimp-operations.Po
+	-rm -f ./$(DEPDIR)/gimpbrightnesscontrastconfig.Po
+	-rm -f ./$(DEPDIR)/gimpcageconfig.Po
+	-rm -f ./$(DEPDIR)/gimpcolorbalanceconfig.Po
+	-rm -f ./$(DEPDIR)/gimpcurvesconfig.Po
+	-rm -f ./$(DEPDIR)/gimphuesaturationconfig.Po
+	-rm -f ./$(DEPDIR)/gimplevelsconfig.Po
+	-rm -f ./$(DEPDIR)/gimpoperationborder.Po
+	-rm -f ./$(DEPDIR)/gimpoperationbrightnesscontrast.Po
+	-rm -f ./$(DEPDIR)/gimpoperationbuffersourcevalidate.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcagecoefcalc.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcagetransform.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcolorbalance.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcolorize.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcomposecrop.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcurves.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdesaturate.Po
+	-rm -f ./$(DEPDIR)/gimpoperationequalize.Po
+	-rm -f ./$(DEPDIR)/gimpoperationfillsource.Po
+	-rm -f ./$(DEPDIR)/gimpoperationflood.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgradient.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgrow.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhistogramsink.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhuesaturation.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlevels.Po
+	-rm -f ./$(DEPDIR)/gimpoperationmaskcomponents.Po
+	-rm -f ./$(DEPDIR)/gimpoperationoffset.Po
+	-rm -f ./$(DEPDIR)/gimpoperationpointfilter.Po
+	-rm -f ./$(DEPDIR)/gimpoperationposterize.Po
+	-rm -f ./$(DEPDIR)/gimpoperationprofiletransform.Po
+	-rm -f ./$(DEPDIR)/gimpoperationscalarmultiply.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsemiflatten.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsetalpha.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsettings.Po
+	-rm -f ./$(DEPDIR)/gimpoperationshrink.Po
+	-rm -f ./$(DEPDIR)/gimpoperationthreshold.Po
+	-rm -f ./$(DEPDIR)/gimpoperationthresholdalpha.Po
+	-rm -f ./$(DEPDIR)/operations-enums.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+		-rm -f ./$(DEPDIR)/gimp-operation-config.Po
+	-rm -f ./$(DEPDIR)/gimp-operations.Po
+	-rm -f ./$(DEPDIR)/gimpbrightnesscontrastconfig.Po
+	-rm -f ./$(DEPDIR)/gimpcageconfig.Po
+	-rm -f ./$(DEPDIR)/gimpcolorbalanceconfig.Po
+	-rm -f ./$(DEPDIR)/gimpcurvesconfig.Po
+	-rm -f ./$(DEPDIR)/gimphuesaturationconfig.Po
+	-rm -f ./$(DEPDIR)/gimplevelsconfig.Po
+	-rm -f ./$(DEPDIR)/gimpoperationborder.Po
+	-rm -f ./$(DEPDIR)/gimpoperationbrightnesscontrast.Po
+	-rm -f ./$(DEPDIR)/gimpoperationbuffersourcevalidate.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcagecoefcalc.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcagetransform.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcolorbalance.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcolorize.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcomposecrop.Po
+	-rm -f ./$(DEPDIR)/gimpoperationcurves.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdesaturate.Po
+	-rm -f ./$(DEPDIR)/gimpoperationequalize.Po
+	-rm -f ./$(DEPDIR)/gimpoperationfillsource.Po
+	-rm -f ./$(DEPDIR)/gimpoperationflood.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgradient.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgrow.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhistogramsink.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhuesaturation.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlevels.Po
+	-rm -f ./$(DEPDIR)/gimpoperationmaskcomponents.Po
+	-rm -f ./$(DEPDIR)/gimpoperationoffset.Po
+	-rm -f ./$(DEPDIR)/gimpoperationpointfilter.Po
+	-rm -f ./$(DEPDIR)/gimpoperationposterize.Po
+	-rm -f ./$(DEPDIR)/gimpoperationprofiletransform.Po
+	-rm -f ./$(DEPDIR)/gimpoperationscalarmultiply.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsemiflatten.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsetalpha.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsettings.Po
+	-rm -f ./$(DEPDIR)/gimpoperationshrink.Po
+	-rm -f ./$(DEPDIR)/gimpoperationthreshold.Po
+	-rm -f ./$(DEPDIR)/gimpoperationthresholdalpha.Po
+	-rm -f ./$(DEPDIR)/operations-enums.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-am clean clean-generic clean-libtool \
+	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-oec: $(srcdir)/operations-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"operations-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/operations-enums.c: xgen-oec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/operations/gimp-operation-config.c b/app/operations/gimp-operation-config.c
new file mode 100644
index 0000000..492cefd
--- /dev/null
+++ b/app/operations/gimp-operation-config.c
@@ -0,0 +1,827 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "core/gimp.h"
+
+#include "core/gimplist.h"
+#include "core/gimpparamspecs-duplicate.h"
+#include "core/gimpviewable.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimp-operation-config.h"
+#include "gimpoperationsettings.h"
+
+
+/*  local function prototypes  */
+
+static void    gimp_operation_config_config_sync   (GObject          *config,
+                                                    const GParamSpec *gimp_pspec,
+                                                    GeglNode         *node);
+static void    gimp_operation_config_config_notify (GObject          *config,
+                                                    const GParamSpec *gimp_pspec,
+                                                    GeglNode         *node);
+static void    gimp_operation_config_node_notify   (GeglNode         *node,
+                                                    const GParamSpec *gegl_pspec,
+                                                    GObject          *config);
+
+static GFile * gimp_operation_config_get_file      (GType             config_type);
+static void    gimp_operation_config_add_sep       (GimpContainer    *container);
+static void    gimp_operation_config_remove_sep    (GimpContainer    *container);
+
+
+/*  public functions  */
+
+static GHashTable *
+gimp_operation_config_get_type_table (Gimp *gimp)
+{
+  static GHashTable *config_types = NULL;
+
+  if (! config_types)
+    config_types = g_hash_table_new_full (g_str_hash,
+                                          g_str_equal,
+                                          (GDestroyNotify) g_free,
+                                          NULL);
+
+  return config_types;
+}
+
+static GHashTable *
+gimp_operation_config_get_container_table (Gimp *gimp)
+{
+  static GHashTable *config_containers = NULL;
+
+  if (! config_containers)
+    config_containers = g_hash_table_new_full (g_direct_hash,
+                                               g_direct_equal,
+                                               NULL,
+                                               (GDestroyNotify) g_object_unref);
+
+  return config_containers;
+}
+
+static GValue *
+gimp_operation_config_value_new (GParamSpec *pspec)
+{
+  GValue *value = g_slice_new0 (GValue);
+
+  g_value_init (value, pspec->value_type);
+  g_param_value_set_default (pspec, value);
+
+  return value;
+}
+
+static void
+gimp_operation_config_value_free (GValue *value)
+{
+  g_value_unset (value);
+  g_slice_free (GValue, value);
+}
+
+static GHashTable *
+gimp_operation_config_get_properties (GObject *object)
+{
+  GHashTable *properties = g_object_get_data (object, "properties");
+
+  if (! properties)
+    {
+      properties = g_hash_table_new_full (g_str_hash,
+                                          g_str_equal,
+                                          (GDestroyNotify) g_free,
+                                          (GDestroyNotify) gimp_operation_config_value_free);
+
+      g_object_set_data_full (object, "properties", properties,
+                              (GDestroyNotify) g_hash_table_unref);
+    }
+
+  return properties;
+}
+
+static GValue *
+gimp_operation_config_value_get (GObject    *object,
+                                 GParamSpec *pspec)
+{
+  GHashTable *properties = gimp_operation_config_get_properties (object);
+  GValue     *value;
+
+  value = g_hash_table_lookup (properties, pspec->name);
+
+  if (! value)
+    {
+      value = gimp_operation_config_value_new (pspec);
+      g_hash_table_insert (properties, g_strdup (pspec->name), value);
+    }
+
+  return value;
+}
+
+static void
+gimp_operation_config_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GValue *val = gimp_operation_config_value_get (object, pspec);
+
+  g_value_copy (value, val);
+}
+
+static void
+gimp_operation_config_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GValue *val = gimp_operation_config_value_get (object, pspec);
+
+  g_value_copy (val, value);
+}
+
+static void
+gimp_operation_config_class_init (GObjectClass *klass,
+                                  const gchar  *operation)
+{
+  GParamSpec **pspecs;
+  guint        n_pspecs;
+  gint         i;
+
+  klass->set_property = gimp_operation_config_set_property;
+  klass->get_property = gimp_operation_config_get_property;
+
+  pspecs = gegl_operation_list_properties (operation, &n_pspecs);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *pspec = pspecs[i];
+
+      if ((pspec->flags & G_PARAM_READABLE) &&
+          (pspec->flags & G_PARAM_WRITABLE) &&
+          strcmp (pspec->name, "input")     &&
+          strcmp (pspec->name, "output"))
+        {
+          GParamSpec *copy = gimp_param_spec_duplicate (pspec);
+
+          if (copy)
+            {
+              g_object_class_install_property (klass, i + 1, copy);
+            }
+        }
+    }
+
+  g_free (pspecs);
+}
+
+static gboolean
+gimp_operation_config_equal (GimpConfig *a,
+                             GimpConfig *b)
+{
+  GList    *diff;
+  gboolean  equal = TRUE;
+
+  diff = gimp_config_diff (G_OBJECT (a), G_OBJECT (b),
+                           GIMP_CONFIG_PARAM_SERIALIZE);
+
+  if (G_TYPE_FROM_INSTANCE (a) == G_TYPE_FROM_INSTANCE (b))
+    {
+      GList *list;
+
+      for (list = diff; list; list = g_list_next (list))
+        {
+          GParamSpec *pspec = list->data;
+
+          if (g_type_is_a (pspec->owner_type, GIMP_TYPE_OPERATION_SETTINGS))
+            {
+              equal = FALSE;
+              break;
+            }
+        }
+    }
+  else if (diff)
+    {
+      equal = FALSE;
+    }
+
+  g_list_free (diff);
+
+  return equal;
+}
+
+static void
+gimp_operation_config_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->equal = gimp_operation_config_equal;
+}
+
+
+/*  public functions  */
+
+void
+gimp_operation_config_register (Gimp        *gimp,
+                                const gchar *operation,
+                                GType        config_type)
+{
+  GHashTable *config_types;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (operation != NULL);
+  g_return_if_fail (g_type_is_a (config_type, GIMP_TYPE_OBJECT));
+
+  config_types = gimp_operation_config_get_type_table (gimp);
+
+  g_hash_table_insert (config_types,
+                       g_strdup (operation),
+                       (gpointer) config_type);
+ }
+
+GType
+gimp_operation_config_get_type (Gimp        *gimp,
+                                const gchar *operation,
+                                const gchar *icon_name,
+                                GType        parent_type)
+{
+  GHashTable *config_types;
+  GType       config_type;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), G_TYPE_NONE);
+  g_return_val_if_fail (operation != NULL, G_TYPE_NONE);
+
+  config_types = gimp_operation_config_get_type_table (gimp);
+
+  config_type = (GType) g_hash_table_lookup (config_types, operation);
+
+  if (! config_type)
+    {
+      GTypeQuery query;
+
+      g_return_val_if_fail (g_type_is_a (parent_type, GIMP_TYPE_OBJECT),
+                            G_TYPE_NONE);
+
+      g_type_query (parent_type, &query);
+
+      {
+        GTypeInfo info =
+        {
+          query.class_size,
+          (GBaseInitFunc) NULL,
+          (GBaseFinalizeFunc) NULL,
+          (GClassInitFunc) gimp_operation_config_class_init,
+          NULL,           /* class_finalize */
+          operation,
+          query.instance_size,
+          0,              /* n_preallocs */
+          (GInstanceInitFunc) NULL,
+        };
+
+        const GInterfaceInfo config_info =
+        {
+          (GInterfaceInitFunc) gimp_operation_config_config_iface_init,
+          NULL, /* interface_finalize */
+          NULL  /* interface_data     */
+        };
+
+        gchar *type_name = g_strdup_printf ("GimpGegl-%s-config",
+                                            operation);
+
+        g_strcanon (type_name,
+                    G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+
+        config_type = g_type_register_static (parent_type, type_name,
+                                              &info, 0);
+
+        g_free (type_name);
+
+        g_type_add_interface_static (config_type, GIMP_TYPE_CONFIG,
+                                     &config_info);
+
+        if (icon_name && g_type_is_a (config_type, GIMP_TYPE_VIEWABLE))
+          {
+            GimpViewableClass *viewable_class = g_type_class_ref (config_type);
+
+            viewable_class->default_icon_name = g_strdup (icon_name);
+
+            g_type_class_unref (viewable_class);
+          }
+
+        gimp_operation_config_register (gimp, operation, config_type);
+      }
+    }
+
+  return config_type;
+}
+
+GimpContainer *
+gimp_operation_config_get_container (Gimp         *gimp,
+                                     GType         config_type,
+                                     GCompareFunc  sort_func)
+{
+  GHashTable    *config_containers;
+  GimpContainer *container;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (g_type_is_a (config_type, GIMP_TYPE_OBJECT), NULL);
+
+  config_containers = gimp_operation_config_get_container_table (gimp);
+
+  container = g_hash_table_lookup (config_containers, (gpointer) config_type);
+
+  if (! container)
+    {
+      container = gimp_list_new (config_type, TRUE);
+      gimp_list_set_sort_func (GIMP_LIST (container), sort_func);
+
+      g_hash_table_insert (config_containers,
+                           (gpointer) config_type, container);
+
+      gimp_operation_config_deserialize (gimp, container, NULL);
+
+      if (gimp_container_get_n_children (container) == 0)
+        {
+          GFile *file = gimp_operation_config_get_file (config_type);
+
+          if (! g_file_query_exists (file, NULL))
+            {
+              GQuark  quark = g_quark_from_static_string ("compat-file");
+              GFile  *compat_file;
+
+              compat_file = g_type_get_qdata (config_type, quark);
+
+              if (compat_file)
+                {
+                  if (! g_file_move (compat_file, file, 0,
+                                     NULL, NULL, NULL, NULL))
+                    {
+                      gimp_operation_config_deserialize (gimp, container,
+                                                         compat_file);
+                    }
+                  else
+                    {
+                      gimp_operation_config_deserialize (gimp, container, NULL);
+                    }
+                }
+            }
+
+          g_object_unref (file);
+        }
+
+      gimp_operation_config_add_sep (container);
+    }
+
+  return container;
+}
+
+void
+gimp_operation_config_serialize (Gimp          *gimp,
+                                 GimpContainer *container,
+                                 GFile         *file)
+{
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  if (file)
+    {
+      g_object_ref (file);
+    }
+  else
+    {
+      GType config_type = gimp_container_get_children_type (container);
+
+      file = gimp_operation_config_get_file (config_type);
+    }
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  gimp_operation_config_remove_sep (container);
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (container),
+                                        file,
+                                        "settings",
+                                        "end of settings",
+                                        NULL, &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+    }
+
+  gimp_operation_config_add_sep (container);
+
+  g_object_unref (file);
+}
+
+void
+gimp_operation_config_deserialize (Gimp          *gimp,
+                                   GimpContainer *container,
+                                   GFile         *file)
+{
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  if (file)
+    {
+      g_object_ref (file);
+    }
+  else
+    {
+      GType config_type = gimp_container_get_children_type (container);
+
+      file = gimp_operation_config_get_file (config_type);
+    }
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (container),
+                                       file,
+                                       NULL, &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+                              error->message);
+
+      g_clear_error (&error);
+    }
+
+  g_object_unref (file);
+}
+
+void
+gimp_operation_config_sync_node (GObject  *config,
+                                 GeglNode *node)
+{
+  GParamSpec **pspecs;
+  gchar       *operation;
+  guint        n_pspecs;
+  gint         i;
+
+  g_return_if_fail (G_IS_OBJECT (config));
+  g_return_if_fail (GEGL_IS_NODE (node));
+
+  gegl_node_get (node,
+                 "operation", &operation,
+                 NULL);
+
+  g_return_if_fail (operation != NULL);
+
+  pspecs = gegl_operation_list_properties (operation, &n_pspecs);
+  g_free (operation);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *gegl_pspec = pspecs[i];
+      GParamSpec *gimp_pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                                             gegl_pspec->name);
+
+      /*  if the operation has an object property of the config's
+       *  type, use the config object directly
+       */
+      if (G_IS_PARAM_SPEC_OBJECT (gegl_pspec) &&
+          gegl_pspec->value_type == G_TYPE_FROM_INSTANCE (config))
+        {
+          gegl_node_set (node,
+                         gegl_pspec->name, config,
+                         NULL);
+        }
+      else if (gimp_pspec)
+        {
+          GValue value = G_VALUE_INIT;
+
+          g_value_init (&value, gimp_pspec->value_type);
+
+          g_object_get_property (G_OBJECT (config), gimp_pspec->name,
+                                 &value);
+
+          if (GEGL_IS_PARAM_SPEC_COLOR (gegl_pspec))
+            {
+              GimpRGB    gimp_color;
+              GeglColor *gegl_color;
+
+              gimp_value_get_rgb (&value, &gimp_color);
+              g_value_unset (&value);
+
+              gegl_color = gimp_gegl_color_new (&gimp_color);
+
+              g_value_init (&value, gegl_pspec->value_type);
+              g_value_take_object (&value, gegl_color);
+            }
+
+          gegl_node_set_property (node, gegl_pspec->name,
+                                  &value);
+
+          g_value_unset (&value);
+        }
+    }
+
+  g_free (pspecs);
+}
+
+void
+gimp_operation_config_connect_node (GObject  *config,
+                                    GeglNode *node)
+{
+  GParamSpec **pspecs;
+  gchar       *operation;
+  guint        n_pspecs;
+  gint         i;
+
+  g_return_if_fail (G_IS_OBJECT (config));
+  g_return_if_fail (GEGL_IS_NODE (node));
+
+  gegl_node_get (node,
+                 "operation", &operation,
+                 NULL);
+
+  g_return_if_fail (operation != NULL);
+
+  pspecs = gegl_operation_list_properties (operation, &n_pspecs);
+  g_free (operation);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *pspec = pspecs[i];
+
+      /*  if the operation has an object property of the config's
+       *  type, connect it to a special callback and done
+       */
+      if (G_IS_PARAM_SPEC_OBJECT (pspec) &&
+          pspec->value_type == G_TYPE_FROM_INSTANCE (config))
+        {
+          g_signal_connect_object (config, "notify",
+                                   G_CALLBACK (gimp_operation_config_config_sync),
+                                   node, 0);
+          g_free (pspecs);
+          return;
+        }
+    }
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *gegl_pspec = pspecs[i];
+      GParamSpec *gimp_pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                                             gegl_pspec->name);
+
+      if (gimp_pspec)
+        {
+          gchar *notify_name = g_strconcat ("notify::", gimp_pspec->name, NULL);
+
+          g_signal_connect_object (config, notify_name,
+                                   G_CALLBACK (gimp_operation_config_config_notify),
+                                   node, 0);
+
+          g_signal_connect_object (node, notify_name,
+                                   G_CALLBACK (gimp_operation_config_node_notify),
+                                   config, 0);
+
+          g_free (notify_name);
+        }
+    }
+
+  g_free (pspecs);
+}
+
+GParamSpec **
+gimp_operation_config_list_properties (GObject     *config,
+                                       GType        owner_type,
+                                       GParamFlags  flags,
+                                       guint       *n_pspecs)
+{
+  GParamSpec **param_specs;
+  guint        n_param_specs;
+  gint         i, j;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+
+  param_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (config),
+                                                &n_param_specs);
+
+  for (i = 0, j = 0; i < n_param_specs; i++)
+    {
+      GParamSpec *pspec = param_specs[i];
+
+      /*  ignore properties of parent classes of owner_type  */
+      if (! g_type_is_a (pspec->owner_type, owner_type))
+        continue;
+
+      if (flags && ((pspec->flags & flags) != flags))
+        continue;
+
+      if (gimp_gegl_param_spec_has_key (pspec, "role", "output-extent"))
+        continue;
+
+      param_specs[j] = param_specs[i];
+      j++;
+    }
+
+  if (n_pspecs)
+    *n_pspecs = j;
+
+  if (j == 0)
+    {
+      g_free (param_specs);
+      param_specs = NULL;
+    }
+
+  return param_specs;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_operation_config_config_sync (GObject          *config,
+                                   const GParamSpec *gimp_pspec,
+                                   GeglNode         *node)
+{
+  gimp_operation_config_sync_node (config, node);
+}
+
+static void
+gimp_operation_config_config_notify (GObject          *config,
+                                     const GParamSpec *gimp_pspec,
+                                     GeglNode         *node)
+{
+  GParamSpec *gegl_pspec = gegl_node_find_property (node, gimp_pspec->name);
+
+  if (gegl_pspec)
+    {
+      GValue value = G_VALUE_INIT;
+      gulong handler;
+
+      g_value_init (&value, gimp_pspec->value_type);
+      g_object_get_property (config, gimp_pspec->name, &value);
+
+      if (GEGL_IS_PARAM_SPEC_COLOR (gegl_pspec))
+        {
+          GimpRGB    gimp_color;
+          GeglColor *gegl_color;
+
+          gimp_value_get_rgb (&value, &gimp_color);
+          g_value_unset (&value);
+
+          gegl_color = gimp_gegl_color_new (&gimp_color);
+
+          g_value_init (&value, gegl_pspec->value_type);
+          g_value_take_object (&value, gegl_color);
+        }
+
+      handler = g_signal_handler_find (node,
+                                       G_SIGNAL_MATCH_DETAIL |
+                                       G_SIGNAL_MATCH_FUNC   |
+                                       G_SIGNAL_MATCH_DATA,
+                                       0,
+                                       g_quark_from_string (gegl_pspec->name),
+                                       NULL,
+                                       gimp_operation_config_node_notify,
+                                       config);
+
+      if (handler)
+        g_signal_handler_block (node, handler);
+
+      gegl_node_set_property (node, gegl_pspec->name, &value);
+      g_value_unset (&value);
+
+      if (handler)
+        g_signal_handler_unblock (node, handler);
+
+    }
+}
+
+static void
+gimp_operation_config_node_notify (GeglNode         *node,
+                                   const GParamSpec *gegl_pspec,
+                                   GObject          *config)
+{
+  GParamSpec *gimp_pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                                         gegl_pspec->name);
+
+  if (gimp_pspec)
+    {
+      GValue value = G_VALUE_INIT;
+      gulong handler;
+
+      g_value_init (&value, gegl_pspec->value_type);
+      gegl_node_get_property (node, gegl_pspec->name, &value);
+
+      if (GEGL_IS_PARAM_SPEC_COLOR (gegl_pspec))
+        {
+          GeglColor *gegl_color;
+          GimpRGB    gimp_color;
+
+          gegl_color = g_value_dup_object (&value);
+          g_value_unset (&value);
+
+          if (gegl_color)
+            {
+              gegl_color_get_rgba (gegl_color,
+                                   &gimp_color.r,
+                                   &gimp_color.g,
+                                   &gimp_color.b,
+                                   &gimp_color.a);
+              g_object_unref (gegl_color);
+            }
+          else
+            {
+              gimp_rgba_set (&gimp_color, 0.0, 0.0, 0.0, 1.0);
+            }
+
+          g_value_init (&value, gimp_pspec->value_type);
+          gimp_value_set_rgb (&value, &gimp_color);
+        }
+
+      handler = g_signal_handler_find (config,
+                                       G_SIGNAL_MATCH_DETAIL |
+                                       G_SIGNAL_MATCH_FUNC   |
+                                       G_SIGNAL_MATCH_DATA,
+                                       0,
+                                       g_quark_from_string (gimp_pspec->name),
+                                       NULL,
+                                       gimp_operation_config_config_notify,
+                                       node);
+
+      if (handler)
+        g_signal_handler_block (config, handler);
+
+      g_object_set_property (config, gimp_pspec->name, &value);
+      g_value_unset (&value);
+
+      if (handler)
+        g_signal_handler_unblock (config, handler);
+    }
+}
+
+static GFile *
+gimp_operation_config_get_file (GType config_type)
+{
+  GFile *file;
+  gchar *basename;
+
+  basename = g_strconcat (g_type_name (config_type), ".settings", NULL);
+  file = gimp_directory_file ("filters", basename, NULL);
+  g_free (basename);
+
+  return file;
+}
+
+static void
+gimp_operation_config_add_sep (GimpContainer *container)
+{
+  GimpObject *sep = g_object_get_data (G_OBJECT (container), "separator");
+
+  if (! sep)
+    {
+      sep = g_object_new (gimp_container_get_children_type (container),
+                          NULL);
+
+      gimp_container_add (container, sep);
+      g_object_unref (sep);
+
+      g_object_set_data (G_OBJECT (container), "separator", sep);
+    }
+}
+
+static void
+gimp_operation_config_remove_sep (GimpContainer *container)
+{
+  GimpObject *sep = g_object_get_data (G_OBJECT (container), "separator");
+
+  if (sep)
+    {
+      gimp_container_remove (container, sep);
+
+      g_object_set_data (G_OBJECT (container), "separator", NULL);
+    }
+}
diff --git a/app/operations/gimp-operation-config.h b/app/operations/gimp-operation-config.h
new file mode 100644
index 0000000..5f920e0
--- /dev/null
+++ b/app/operations/gimp-operation-config.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_CONFIG_H__
+#define __GIMP_OPERATION_CONFIG_H__
+
+
+void            gimp_operation_config_register      (Gimp          *gimp,
+                                                     const gchar   *operation,
+                                                     GType          config_type);
+
+GType           gimp_operation_config_get_type      (Gimp          *gimp,
+                                                     const gchar   *operation,
+                                                     const gchar   *icon_name,
+                                                     GType          parent_type);
+
+GimpContainer * gimp_operation_config_get_container (Gimp          *gimp,
+                                                     GType          config_type,
+                                                     GCompareFunc   sort_func);
+
+void            gimp_operation_config_serialize     (Gimp          *gimp,
+                                                     GimpContainer *container,
+                                                     GFile         *file);
+void            gimp_operation_config_deserialize   (Gimp          *gimp,
+                                                     GimpContainer *container,
+                                                     GFile         *file);
+
+void            gimp_operation_config_sync_node     (GObject       *config,
+                                                     GeglNode      *node);
+void            gimp_operation_config_connect_node  (GObject       *config,
+                                                     GeglNode      *node);
+
+GParamSpec ** gimp_operation_config_list_properties (GObject      *config,
+                                                     GType         owner_type,
+                                                     GParamFlags   flags,
+                                                     guint        *n_pspecs);
+
+
+#endif /* __GIMP_OPERATION_CONFIG_H__ */
diff --git a/app/operations/gimp-operations.c b/app/operations/gimp-operations.c
new file mode 100644
index 0000000..7cb30fd
--- /dev/null
+++ b/app/operations/gimp-operations.c
@@ -0,0 +1,225 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-operations.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "operations-types.h"
+
+#include "core/gimp.h"
+
+#include "gimp-operations.h"
+
+#include "gimpoperationborder.h"
+#include "gimpoperationbuffersourcevalidate.h"
+#include "gimpoperationcagecoefcalc.h"
+#include "gimpoperationcagetransform.h"
+#include "gimpoperationcomposecrop.h"
+#include "gimpoperationequalize.h"
+#include "gimpoperationfillsource.h"
+#include "gimpoperationflood.h"
+#include "gimpoperationgradient.h"
+#include "gimpoperationgrow.h"
+#include "gimpoperationhistogramsink.h"
+#include "gimpoperationmaskcomponents.h"
+#include "gimpoperationoffset.h"
+#include "gimpoperationprofiletransform.h"
+#include "gimpoperationscalarmultiply.h"
+#include "gimpoperationsemiflatten.h"
+#include "gimpoperationsetalpha.h"
+#include "gimpoperationshrink.h"
+#include "gimpoperationthresholdalpha.h"
+
+#include "gimpoperationbrightnesscontrast.h"
+#include "gimpoperationcolorbalance.h"
+#include "gimpoperationcolorize.h"
+#include "gimpoperationcurves.h"
+#include "gimpoperationdesaturate.h"
+#include "gimpoperationhuesaturation.h"
+#include "gimpoperationlevels.h"
+#include "gimpoperationposterize.h"
+#include "gimpoperationthreshold.h"
+
+#include "gimp-operation-config.h"
+#include "gimpbrightnesscontrastconfig.h"
+#include "gimpcolorbalanceconfig.h"
+#include "gimpcurvesconfig.h"
+#include "gimphuesaturationconfig.h"
+#include "gimplevelsconfig.h"
+
+#include "layer-modes-legacy/gimpoperationadditionlegacy.h"
+#include "layer-modes-legacy/gimpoperationburnlegacy.h"
+#include "layer-modes-legacy/gimpoperationdarkenonlylegacy.h"
+#include "layer-modes-legacy/gimpoperationdifferencelegacy.h"
+#include "layer-modes-legacy/gimpoperationdividelegacy.h"
+#include "layer-modes-legacy/gimpoperationdodgelegacy.h"
+#include "layer-modes-legacy/gimpoperationgrainextractlegacy.h"
+#include "layer-modes-legacy/gimpoperationgrainmergelegacy.h"
+#include "layer-modes-legacy/gimpoperationhardlightlegacy.h"
+#include "layer-modes-legacy/gimpoperationhslcolorlegacy.h"
+#include "layer-modes-legacy/gimpoperationhsvhuelegacy.h"
+#include "layer-modes-legacy/gimpoperationhsvsaturationlegacy.h"
+#include "layer-modes-legacy/gimpoperationhsvvaluelegacy.h"
+#include "layer-modes-legacy/gimpoperationlightenonlylegacy.h"
+#include "layer-modes-legacy/gimpoperationmultiplylegacy.h"
+#include "layer-modes-legacy/gimpoperationscreenlegacy.h"
+#include "layer-modes-legacy/gimpoperationsoftlightlegacy.h"
+#include "layer-modes-legacy/gimpoperationsubtractlegacy.h"
+
+#include "layer-modes/gimp-layer-modes.h"
+#include "layer-modes/gimpoperationantierase.h"
+#include "layer-modes/gimpoperationbehind.h"
+#include "layer-modes/gimpoperationdissolve.h"
+#include "layer-modes/gimpoperationerase.h"
+#include "layer-modes/gimpoperationmerge.h"
+#include "layer-modes/gimpoperationnormal.h"
+#include "layer-modes/gimpoperationpassthrough.h"
+#include "layer-modes/gimpoperationreplace.h"
+#include "layer-modes/gimpoperationsplit.h"
+
+
+static void
+set_compat_file (GType        type,
+                 const gchar *basename)
+{
+  GFile *file  = gimp_directory_file ("tool-options", basename, NULL);
+  GQuark quark = g_quark_from_static_string ("compat-file");
+
+  g_type_set_qdata (type, quark, file);
+}
+
+static void
+set_settings_folder (GType        type,
+                     const gchar *basename)
+{
+  GFile *file  = gimp_directory_file (basename, NULL);
+  GQuark quark = g_quark_from_static_string ("settings-folder");
+
+  g_type_set_qdata (type, quark, file);
+}
+
+void
+gimp_operations_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_layer_modes_init ();
+
+  g_type_class_ref (GIMP_TYPE_OPERATION_BORDER);
+  g_type_class_ref (GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_COEF_CALC);
+  g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_TRANSFORM);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COMPOSE_CROP);
+  g_type_class_ref (GIMP_TYPE_OPERATION_EQUALIZE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_FILL_SOURCE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_FLOOD);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GRADIENT);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GROW);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HISTOGRAM_SINK);
+  g_type_class_ref (GIMP_TYPE_OPERATION_MASK_COMPONENTS);
+  g_type_class_ref (GIMP_TYPE_OPERATION_OFFSET);
+  g_type_class_ref (GIMP_TYPE_OPERATION_PROFILE_TRANSFORM);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SCALAR_MULTIPLY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SEMI_FLATTEN);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SET_ALPHA);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SHRINK);
+  g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD_ALPHA);
+
+  g_type_class_ref (GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_BALANCE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COLORIZE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_CURVES);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DESATURATE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HUE_SATURATION);
+  g_type_class_ref (GIMP_TYPE_OPERATION_LEVELS);
+  g_type_class_ref (GIMP_TYPE_OPERATION_POSTERIZE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD);
+
+  g_type_class_ref (GIMP_TYPE_OPERATION_NORMAL);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND);
+  g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SCREEN_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_ADDITION_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SUBTRACT_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DARKEN_ONLY_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HSV_HUE_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DIVIDE_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DODGE_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_BURN_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY);
+  g_type_class_ref (GIMP_TYPE_OPERATION_ERASE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_MERGE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SPLIT);
+  g_type_class_ref (GIMP_TYPE_OPERATION_PASS_THROUGH);
+  g_type_class_ref (GIMP_TYPE_OPERATION_REPLACE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_ANTI_ERASE);
+
+  gimp_operation_config_register (gimp,
+                                  "gimp:brightness-contrast",
+                                  GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG);
+  set_compat_file (GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG,
+                   "gimp-brightness-contrast-tool.settings");
+  set_settings_folder (GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG,
+                       "brightness-contrast");
+
+  gimp_operation_config_register (gimp,
+                                  "gimp:color-balance",
+                                  GIMP_TYPE_COLOR_BALANCE_CONFIG);
+  set_compat_file (GIMP_TYPE_COLOR_BALANCE_CONFIG,
+                   "gimp-color-balance-tool.settings");
+  set_settings_folder (GIMP_TYPE_COLOR_BALANCE_CONFIG,
+                       "color-balance");
+
+  gimp_operation_config_register (gimp,
+                                  "gimp:curves",
+                                  GIMP_TYPE_CURVES_CONFIG);
+  set_compat_file (GIMP_TYPE_CURVES_CONFIG,
+                   "gimp-curves-tool.settings");
+  set_settings_folder (GIMP_TYPE_CURVES_CONFIG,
+                       "curves");
+
+  gimp_operation_config_register (gimp,
+                                  "gimp:hue-saturation",
+                                  GIMP_TYPE_HUE_SATURATION_CONFIG);
+  set_compat_file (GIMP_TYPE_HUE_SATURATION_CONFIG,
+                   "gimp-hue-saturation-tool.settings");
+  set_settings_folder (GIMP_TYPE_HUE_SATURATION_CONFIG,
+                       "hue-saturation");
+
+  gimp_operation_config_register (gimp,
+                                  "gimp:levels",
+                                  GIMP_TYPE_LEVELS_CONFIG);
+  set_compat_file (GIMP_TYPE_LEVELS_CONFIG,
+                   "gimp-levels-tool.settings");
+  set_settings_folder (GIMP_TYPE_LEVELS_CONFIG,
+                       "levels");
+}
diff --git a/app/operations/gimp-operations.h b/app/operations/gimp-operations.h
new file mode 100644
index 0000000..6f2b222
--- /dev/null
+++ b/app/operations/gimp-operations.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-operations.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATIONS_H__
+#define __GIMP_OPERATIONS_H__
+
+
+void   gimp_operations_init (Gimp *gimp);
+
+
+#endif /* __GIMP_OPERATIONS_H__ */
diff --git a/app/operations/gimpbrightnesscontrastconfig.c b/app/operations/gimpbrightnesscontrastconfig.c
new file mode 100644
index 0000000..75ee36a
--- /dev/null
+++ b/app/operations/gimpbrightnesscontrastconfig.c
@@ -0,0 +1,248 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrightnesscontrastconfig.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gimpbrightnesscontrastconfig.h"
+#include "gimplevelsconfig.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_BRIGHTNESS,
+  PROP_CONTRAST
+};
+
+
+static void     gimp_brightness_contrast_config_iface_init   (GimpConfigInterface *iface);
+
+static void     gimp_brightness_contrast_config_get_property (GObject      *object,
+                                                              guint         property_id,
+                                                              GValue       *value,
+                                                              GParamSpec   *pspec);
+static void     gimp_brightness_contrast_config_set_property (GObject      *object,
+                                                              guint         property_id,
+                                                              const GValue *value,
+                                                              GParamSpec   *pspec);
+
+static gboolean gimp_brightness_contrast_config_equal        (GimpConfig   *a,
+                                                              GimpConfig   *b);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBrightnessContrastConfig,
+                         gimp_brightness_contrast_config,
+                         GIMP_TYPE_OPERATION_SETTINGS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_brightness_contrast_config_iface_init))
+
+#define parent_class gimp_brightness_contrast_config_parent_class
+
+
+static void
+gimp_brightness_contrast_config_class_init (GimpBrightnessContrastConfigClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->set_property        = gimp_brightness_contrast_config_set_property;
+  object_class->get_property        = gimp_brightness_contrast_config_get_property;
+
+  viewable_class->default_icon_name = "gimp-tool-brightness-contrast";
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRIGHTNESS,
+                           "brightness",
+                           _("Brightness"),
+                           _("Brightness"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_CONTRAST,
+                           "contrast",
+                           _("Contrast"),
+                           _("Contrast"),
+                           -1.0, 1.0, 0.0, 0);
+}
+
+static void
+gimp_brightness_contrast_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->equal = gimp_brightness_contrast_config_equal;
+}
+
+static void
+gimp_brightness_contrast_config_init (GimpBrightnessContrastConfig *self)
+{
+}
+
+static void
+gimp_brightness_contrast_config_get_property (GObject    *object,
+                                              guint       property_id,
+                                              GValue     *value,
+                                              GParamSpec *pspec)
+{
+  GimpBrightnessContrastConfig *self = GIMP_BRIGHTNESS_CONTRAST_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_BRIGHTNESS:
+      g_value_set_double (value, self->brightness);
+      break;
+
+    case PROP_CONTRAST:
+      g_value_set_double (value, self->contrast);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_brightness_contrast_config_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec)
+{
+  GimpBrightnessContrastConfig *self = GIMP_BRIGHTNESS_CONTRAST_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_BRIGHTNESS:
+      self->brightness = g_value_get_double (value);
+      break;
+
+    case PROP_CONTRAST:
+      self->contrast = g_value_get_double (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_brightness_contrast_config_equal (GimpConfig *a,
+                                       GimpConfig *b)
+{
+  GimpBrightnessContrastConfig *config_a = GIMP_BRIGHTNESS_CONTRAST_CONFIG (a);
+  GimpBrightnessContrastConfig *config_b = GIMP_BRIGHTNESS_CONTRAST_CONFIG (b);
+
+  if (! gimp_operation_settings_config_equal_base (a, b) ||
+      config_a->brightness != config_b->brightness       ||
+      config_a->contrast   != config_b->contrast)
+    {
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GimpLevelsConfig *
+gimp_brightness_contrast_config_to_levels_config (GimpBrightnessContrastConfig *config)
+{
+  GimpLevelsConfig *levels;
+  gdouble           brightness;
+  gdouble           slant;
+  gdouble           value;
+
+  g_return_val_if_fail (GIMP_IS_BRIGHTNESS_CONTRAST_CONFIG (config), NULL);
+
+  levels = g_object_new (GIMP_TYPE_LEVELS_CONFIG, NULL);
+
+  gimp_operation_settings_config_copy_base (GIMP_CONFIG (config),
+                                            GIMP_CONFIG (levels),
+                                            0);
+
+  brightness = config->brightness / 2.0;
+  slant = tan ((config->contrast + 1) * G_PI_4);
+
+  if (config->brightness >= 0)
+    {
+      value = -0.5 * slant + brightness * slant + 0.5;
+
+      if (value < 0.0)
+        {
+          value = 0.0;
+
+          /* this slightly convoluted math follows by inverting the
+           * calculation of the brightness/contrast LUT in base/lut-funcs.h */
+
+          levels->low_input[GIMP_HISTOGRAM_VALUE] =
+            (- brightness * slant + 0.5 * slant - 0.5) / (slant - brightness * slant);
+        }
+
+      levels->low_output[GIMP_HISTOGRAM_VALUE] = value;
+
+      value = 0.5 * slant + 0.5;
+
+      if (value > 1.0)
+        {
+          value = 1.0;
+
+          levels->high_input[GIMP_HISTOGRAM_VALUE] =
+            (- brightness * slant + 0.5 * slant + 0.5) / (slant - brightness * slant);
+        }
+
+      levels->high_output[GIMP_HISTOGRAM_VALUE] = value;
+    }
+  else
+    {
+      value = 0.5 - 0.5 * slant;
+
+      if (value < 0.0)
+        {
+          value = 0.0;
+
+          levels->low_input[GIMP_HISTOGRAM_VALUE] =
+            (0.5 * slant - 0.5) / (slant + brightness * slant);
+        }
+
+      levels->low_output[GIMP_HISTOGRAM_VALUE] = value;
+
+      value = slant * brightness + slant * 0.5 + 0.5;
+
+      if (value > 1.0)
+        {
+          value = 1.0;
+
+          levels->high_input[GIMP_HISTOGRAM_VALUE] =
+            (0.5 * slant + 0.5) / (slant + brightness * slant);
+        }
+
+      levels->high_output[GIMP_HISTOGRAM_VALUE] = value;
+    }
+
+  return levels;
+}
diff --git a/app/operations/gimpbrightnesscontrastconfig.h b/app/operations/gimpbrightnesscontrastconfig.h
new file mode 100644
index 0000000..bab1a03
--- /dev/null
+++ b/app/operations/gimpbrightnesscontrastconfig.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrightnesscontrastconfig.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__
+#define __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__
+
+
+#include "gimpoperationsettings.h"
+
+
+#define GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG            (gimp_brightness_contrast_config_get_type ())
+#define GIMP_BRIGHTNESS_CONTRAST_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG, GimpBrightnessContrastConfig))
+#define GIMP_BRIGHTNESS_CONTRAST_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG, GimpBrightnessContrastConfigClass))
+#define GIMP_IS_BRIGHTNESS_CONTRAST_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG))
+#define GIMP_IS_BRIGHTNESS_CONTRAST_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG))
+#define GIMP_BRIGHTNESS_CONTRAST_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG, GimpBrightnessContrastConfigClass))
+
+
+typedef struct _GimpBrightnessContrastConfigClass GimpBrightnessContrastConfigClass;
+
+struct _GimpBrightnessContrastConfig
+{
+  GimpOperationSettings  parent_instance;
+
+  gdouble                brightness;
+  gdouble                contrast;
+};
+
+struct _GimpBrightnessContrastConfigClass
+{
+  GimpOperationSettingsClass  parent_class;
+};
+
+
+GType   gimp_brightness_contrast_config_get_type (void) G_GNUC_CONST;
+
+GimpLevelsConfig *
+gimp_brightness_contrast_config_to_levels_config (GimpBrightnessContrastConfig *config);
+
+
+#endif /* __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__ */
diff --git a/app/operations/gimpcageconfig.c b/app/operations/gimpcageconfig.c
new file mode 100644
index 0000000..17548cf
--- /dev/null
+++ b/app/operations/gimpcageconfig.c
@@ -0,0 +1,832 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpcageconfig.c
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+
+#include "operations-types.h"
+
+#include "gimpcageconfig.h"
+
+
+/*#define DEBUG_CAGE */
+
+/* This DELTA is aimed to not have handle on exact pixel during computation,
+ * to avoid particular case. It shouldn't be so useful, but it's a double
+ * safety. */
+#define DELTA             0.010309278351
+
+
+static void   gimp_cage_config_finalize               (GObject        *object);
+static void   gimp_cage_config_get_property           (GObject        *object,
+                                                       guint           property_id,
+                                                       GValue         *value,
+                                                       GParamSpec     *pspec);
+static void   gimp_cage_config_set_property           (GObject        *object,
+                                                       guint           property_id,
+                                                       const GValue   *value,
+                                                       GParamSpec     *pspec);
+
+static void   gimp_cage_config_compute_scaling_factor (GimpCageConfig *gcc);
+static void   gimp_cage_config_compute_edges_normal   (GimpCageConfig *gcc);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpCageConfig, gimp_cage_config,
+                         GIMP_TYPE_OPERATION_SETTINGS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                NULL))
+
+#define parent_class gimp_cage_config_parent_class
+
+#ifdef DEBUG_CAGE
+static void
+print_cage (GimpCageConfig *gcc)
+{
+  gint i;
+  GeglRectangle bounding_box;
+  GimpCagePoint *point;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  bounding_box = gimp_cage_config_get_bounding_box (gcc);
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      point = &g_array_index (gcc->cage_points, GimpCagePoint, i);
+      g_printerr ("cgx: %.0f    cgy: %.0f    cvdx: %.0f    cvdy: %.0f  sf: %.2f  normx: %.2f  normy: %.2f %s\n",
+                  point->src_point.x + ((gcc->cage_mode==GIMP_CAGE_MODE_CAGE_CHANGE)?gcc->displacement_x:0),
+                  point->src_point.y + ((gcc->cage_mode==GIMP_CAGE_MODE_CAGE_CHANGE)?gcc->displacement_y:0),
+                  point->dest_point.x + ((gcc->cage_mode==GIMP_CAGE_MODE_DEFORM)?gcc->displacement_x:0),
+                  point->dest_point.y + ((gcc->cage_mode==GIMP_CAGE_MODE_DEFORM)?gcc->displacement_y:0),
+                  point->edge_scaling_factor,
+                  point->edge_normal.x,
+                  point->edge_normal.y,
+                  ((point->selected) ? "S" : "NS"));
+    }
+
+  g_printerr ("bounding box: x: %d  y: %d  width: %d  height: %d\n", bounding_box.x, bounding_box.y, bounding_box.width, bounding_box.height);
+  g_printerr ("disp x: %f  disp y: %f\n", gcc->displacement_x, gcc->displacement_y);
+  g_printerr ("done\n");
+}
+#endif
+
+static void
+gimp_cage_config_class_init (GimpCageConfigClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_cage_config_set_property;
+  object_class->get_property = gimp_cage_config_get_property;
+
+  object_class->finalize     = gimp_cage_config_finalize;
+}
+
+static void
+gimp_cage_config_init (GimpCageConfig *self)
+{
+  /*pre-allocation for 50 vertices for the cage.*/
+  self->cage_points = g_array_sized_new (FALSE, FALSE, sizeof(GimpCagePoint), 50);
+}
+
+static void
+gimp_cage_config_finalize (GObject *object)
+{
+  GimpCageConfig *gcc = GIMP_CAGE_CONFIG (object);
+
+  g_array_free (gcc->cage_points, TRUE);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_cage_config_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_cage_config_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_cage_config_get_n_points:
+ * @gcc: the cage config
+ *
+ * Returns: the number of points of the cage
+ */
+guint
+gimp_cage_config_get_n_points (GimpCageConfig *gcc)
+{
+  return gcc->cage_points->len;
+}
+
+/**
+ * gimp_cage_config_add_cage_point:
+ * @gcc: the cage config
+ * @x: x value of the new point
+ * @y: y value of the new point
+ *
+ * Add a new point in the last index of the polygon of the cage.
+ * Point is added in both source and destination cage
+ */
+void
+gimp_cage_config_add_cage_point (GimpCageConfig  *gcc,
+                                 gdouble          x,
+                                 gdouble          y)
+{
+  gimp_cage_config_insert_cage_point (gcc, gcc->cage_points->len, x, y);
+}
+
+/**
+ * gimp_cage_config_insert_cage_point:
+ * @gcc: the cage config
+ * @point_number: index where the point will be inserted
+ * @x: x value of the new point
+ * @y: y value of the new point
+ *
+ * Insert a new point in the polygon of the cage at the given index.
+ * Point is added in both source and destination cage
+ */
+void
+gimp_cage_config_insert_cage_point (GimpCageConfig  *gcc,
+                                    gint             point_number,
+                                    gdouble          x,
+                                    gdouble          y)
+{
+  GimpCagePoint point;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+  g_return_if_fail (point_number <= gcc->cage_points->len);
+  g_return_if_fail (point_number >= 0);
+
+  point.src_point.x = x + DELTA;
+  point.src_point.y = y + DELTA;
+
+  point.dest_point.x = x + DELTA;
+  point.dest_point.y = y + DELTA;
+
+  g_array_insert_val (gcc->cage_points, point_number, point);
+
+  gimp_cage_config_compute_scaling_factor (gcc);
+  gimp_cage_config_compute_edges_normal (gcc);
+}
+
+/**
+ * gimp_cage_config_remove_last_cage_point:
+ * @gcc: the cage config
+ *
+ * Remove the last point of the cage, in both source and destination cage
+ */
+void
+gimp_cage_config_remove_last_cage_point (GimpCageConfig  *gcc)
+{
+  gimp_cage_config_remove_cage_point (gcc, gcc->cage_points->len - 1);
+}
+
+/**
+ * gimp_cage_config_remove_cage_point:
+ * @gcc: the cage config
+ * @point_number: the index of the point to remove
+ *
+ * Remove the given point from the cage
+ */
+void
+gimp_cage_config_remove_cage_point (GimpCageConfig *gcc,
+                                    gint            point_number)
+{
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+  g_return_if_fail (point_number < gcc->cage_points->len);
+  g_return_if_fail (point_number >= 0);
+
+  if (gcc->cage_points->len > 0)
+    g_array_remove_index (gcc->cage_points, gcc->cage_points->len - 1);
+
+  gimp_cage_config_compute_scaling_factor (gcc);
+  gimp_cage_config_compute_edges_normal (gcc);
+}
+
+/**
+ * gimp_cage_config_remove_selected_points:
+ * @gcc: the cage config
+ *
+ * Remove all the selected points from the cage
+ */
+void
+gimp_cage_config_remove_selected_points (GimpCageConfig  *gcc)
+{
+  gint           i;
+  GimpCagePoint *point;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      point = &g_array_index (gcc->cage_points, GimpCagePoint, i);
+
+      if (point->selected)
+        {
+          g_array_remove_index (gcc->cage_points, i);
+          i--;
+        }
+    }
+
+  gimp_cage_config_compute_scaling_factor (gcc);
+  gimp_cage_config_compute_edges_normal (gcc);
+}
+
+/**
+ * gimp_cage_config_get_point_coordinate:
+ * @gcc: the cage config
+ * @mode: the actual mode of the cage, GIMP_CAGE_MODE_CAGE_CHANGE or GIMP_CAGE_MODE_DEFORM
+ * @point_number: the index of the point to return
+ *
+ * Returns: the real position of the given point, as a GimpVector2
+ */
+GimpVector2
+gimp_cage_config_get_point_coordinate (GimpCageConfig *gcc,
+                                       GimpCageMode    mode,
+                                       gint            point_number)
+{
+  GimpVector2     result = { 0.0, 0.0 };
+  GimpCagePoint  *point;
+
+  g_return_val_if_fail (GIMP_IS_CAGE_CONFIG (gcc), result);
+  g_return_val_if_fail (point_number < gcc->cage_points->len, result);
+  g_return_val_if_fail (point_number >= 0, result);
+
+  point = &g_array_index (gcc->cage_points, GimpCagePoint, point_number);
+
+  if (point->selected)
+    {
+      if (mode == GIMP_CAGE_MODE_CAGE_CHANGE)
+        {
+          result.x = point->src_point.x + gcc->displacement_x;
+          result.y = point->src_point.y + gcc->displacement_y;
+        }
+      else
+        {
+          result.x = point->dest_point.x + gcc->displacement_x;
+          result.y = point->dest_point.y + gcc->displacement_y;
+        }
+    }
+  else
+    {
+      if (mode == GIMP_CAGE_MODE_CAGE_CHANGE)
+        {
+          result.x = point->src_point.x;
+          result.y = point->src_point.y;
+        }
+      else
+        {
+          result.x = point->dest_point.x;
+          result.y = point->dest_point.y;
+        }
+    }
+
+  return result;
+}
+
+/**
+ * gimp_cage_config_add_displacement:
+ * @gcc: the cage config
+ * @mode: the actual mode of the cage, GIMP_CAGE_MODE_CAGE_CHANGE or GIMP_CAGE_MODE_DEFORM
+ * @point_number: the point of the cage to move
+ * @x: x displacement value
+ * @y: y displacement value
+ *
+ * Add a displacement for all selected points of the cage.
+ * This displacement need to be committed to become effective.
+ */
+void
+gimp_cage_config_add_displacement (GimpCageConfig *gcc,
+                                   GimpCageMode    mode,
+                                   gdouble         x,
+                                   gdouble         y)
+{
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  gcc->cage_mode = mode;
+  gcc->displacement_x = x;
+  gcc->displacement_y = y;
+
+  #ifdef DEBUG_CAGE
+    print_cage (gcc);
+  #endif
+}
+
+/**
+ * gimp_cage_config_commit_displacement:
+ * @gcc: the cage config
+ *
+ * Apply the displacement to the cage
+ */
+void
+gimp_cage_config_commit_displacement (GimpCageConfig *gcc)
+{
+  gint  i;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      GimpCagePoint *point;
+      point = &g_array_index (gcc->cage_points, GimpCagePoint, i);
+
+      if (point->selected)
+        {
+          if (gcc->cage_mode == GIMP_CAGE_MODE_CAGE_CHANGE)
+            {
+              point->src_point.x += gcc->displacement_x;
+              point->src_point.y += gcc->displacement_y;
+              point->dest_point.x += gcc->displacement_x;
+              point->dest_point.y += gcc->displacement_y;
+            }
+          else
+            {
+              point->dest_point.x += gcc->displacement_x;
+              point->dest_point.y += gcc->displacement_y;
+            }
+        }
+    }
+
+  gimp_cage_config_compute_scaling_factor (gcc);
+  gimp_cage_config_compute_edges_normal (gcc);
+  gimp_cage_config_reset_displacement (gcc);
+}
+
+/**
+ * gimp_cage_config_reset_displacement:
+ * @gcc: the cage config
+ *
+ * Set the displacement to zero.
+ */
+void
+gimp_cage_config_reset_displacement (GimpCageConfig *gcc)
+{
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  gcc->displacement_x = 0.0;
+  gcc->displacement_y = 0.0;
+}
+
+/**
+ * gimp_cage_config_get_bounding_box:
+ * @gcc: the cage config
+ *
+ * Compute the bounding box of the source cage
+ *
+ * Returns: the bounding box of the source cage, as a GeglRectangle
+ */
+GeglRectangle
+gimp_cage_config_get_bounding_box (GimpCageConfig *gcc)
+{
+  GeglRectangle  bounding_box = { 0, 0, 0, 0};
+  gint           i;
+  GimpCagePoint *point;
+
+  g_return_val_if_fail (GIMP_IS_CAGE_CONFIG (gcc), bounding_box);
+
+  if (gcc->cage_points->len == 0)
+    return bounding_box;
+
+  point = &g_array_index (gcc->cage_points, GimpCagePoint, 0);
+
+  if (point->selected)
+    {
+      bounding_box.x = point->src_point.x + gcc->displacement_x;
+      bounding_box.y = point->src_point.y + gcc->displacement_y;
+    }
+  else
+    {
+      bounding_box.x = point->src_point.x;
+      bounding_box.y = point->src_point.y;
+    }
+
+  for (i = 1; i < gcc->cage_points->len; i++)
+    {
+      gdouble x,y;
+      point = &g_array_index (gcc->cage_points, GimpCagePoint, i);
+
+      if (point->selected)
+        {
+          x = point->src_point.x + gcc->displacement_x;
+          y = point->src_point.y + gcc->displacement_y;
+        }
+      else
+        {
+          x = point->src_point.x;
+          y = point->src_point.y;
+        }
+
+      if (x < bounding_box.x)
+        {
+          bounding_box.width += bounding_box.x - x;
+          bounding_box.x = x;
+        }
+
+      if (y < bounding_box.y)
+        {
+          bounding_box.height += bounding_box.y - y;
+          bounding_box.y = y;
+        }
+
+      if (x > bounding_box.x + bounding_box.width)
+        {
+          bounding_box.width = x - bounding_box.x;
+        }
+
+      if (y > bounding_box.y + bounding_box.height)
+        {
+          bounding_box.height = y - bounding_box.y;
+        }
+    }
+
+  return bounding_box;
+}
+
+/**
+ * gimp_cage_config_reverse_cage:
+ * @gcc: the cage config
+ *
+ * When using non-simple cage (like a cage in 8), user may want to
+ * manually inverse inside and outside of the cage. This function
+ * reverse the cage
+ */
+void
+gimp_cage_config_reverse_cage (GimpCageConfig *gcc)
+{
+  GimpCagePoint temp;
+  gint          i;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  for (i = 0; i < gcc->cage_points->len / 2; i++)
+    {
+      temp = g_array_index (gcc->cage_points, GimpCagePoint, i);
+
+      g_array_index (gcc->cage_points, GimpCagePoint, i) =
+        g_array_index (gcc->cage_points, GimpCagePoint, gcc->cage_points->len - i - 1);
+
+      g_array_index (gcc->cage_points, GimpCagePoint, gcc->cage_points->len - i - 1) = temp;
+    }
+
+  gimp_cage_config_compute_scaling_factor (gcc);
+  gimp_cage_config_compute_edges_normal (gcc);
+}
+
+/**
+ * gimp_cage_config_reverse_cage_if_needed:
+ * @gcc: the cage config
+ *
+ * Since the cage need to be defined counter-clockwise to have the
+ * topological inside in the actual 'physical' inside of the cage,
+ * this function compute if the cage is clockwise or not, and reverse
+ * the cage if needed.
+ *
+ * This function does not take into account an eventual displacement
+ */
+void
+gimp_cage_config_reverse_cage_if_needed (GimpCageConfig *gcc)
+{
+  gint    i;
+  gdouble sum;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  sum = 0.0;
+
+  /* this is a bit crappy, but should works most of the case */
+  /* we do the sum of the projection of each point to the previous
+     segment, and see the final sign */
+  for (i = 0; i < gcc->cage_points->len ; i++)
+    {
+      GimpVector2 P1, P2, P3;
+      gdouble     z;
+
+      P1 = (g_array_index (gcc->cage_points, GimpCagePoint, i)).src_point;
+      P2 = (g_array_index (gcc->cage_points, GimpCagePoint, (i+1) % gcc->cage_points->len)).src_point;
+      P3 = (g_array_index (gcc->cage_points, GimpCagePoint, (i+2) % gcc->cage_points->len)).src_point;
+
+      z = P1.x * (P2.y - P3.y) + P2.x * (P3.y - P1.y) + P3.x * (P1.y - P2.y);
+
+      sum += z;
+    }
+
+  /* sum > 0 mean a cage defined counter-clockwise, so we reverse it */
+  if (sum > 0)
+    {
+      gimp_cage_config_reverse_cage (gcc);
+    }
+}
+
+/**
+ * gimp_cage_config_compute_scaling_factor:
+ * @gcc: the cage config
+ *
+ * Update Green Coordinate scaling factor for the destination cage.
+ * This function does not take into account an eventual displacement.
+ */
+static void
+gimp_cage_config_compute_scaling_factor (GimpCageConfig *gcc)
+{
+  GimpVector2    edge;
+  gdouble        length, length_d;
+  gint           i;
+  GimpCagePoint *current, *last;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+  if (gcc->cage_points->len < 2)
+    return;
+
+  last = &g_array_index (gcc->cage_points, GimpCagePoint, 0);
+
+  for (i = 1; i <= gcc->cage_points->len; i++)
+    {
+      current = &g_array_index (gcc->cage_points, GimpCagePoint, i % gcc->cage_points->len);
+
+      gimp_vector2_sub (&edge,
+                        &(last->src_point),
+                        &(current->src_point));
+      length = gimp_vector2_length (&edge);
+
+      gimp_vector2_sub (&edge,
+                        &(last->dest_point),
+                        &(current->dest_point));
+      length_d = gimp_vector2_length (&edge);
+
+      last->edge_scaling_factor = length_d / length;
+      last = current;
+    }
+}
+
+/**
+ * gimp_cage_config_compute_edges_normal:
+ * @gcc: the cage config
+ *
+ * Update edges normal for the destination cage.
+ * This function does not take into account an eventual displacement.
+ */
+static void
+gimp_cage_config_compute_edges_normal (GimpCageConfig *gcc)
+{
+  GimpVector2    normal;
+  gint           i;
+  GimpCagePoint *current, *last;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  last = &g_array_index (gcc->cage_points, GimpCagePoint, 0);
+
+  for (i = 1; i <= gcc->cage_points->len; i++)
+    {
+      current = &g_array_index (gcc->cage_points, GimpCagePoint, i % gcc->cage_points->len);
+
+      gimp_vector2_sub (&normal,
+                        &(current->dest_point),
+                        &(last->dest_point));
+
+      last->edge_normal = gimp_vector2_normal (&normal);
+      last = current;
+    }
+}
+
+/**
+ * gimp_cage_config_point_inside:
+ * @gcc: the cage config
+ * @x: x coordinate of the point to test
+ * @y: y coordinate of the point to test
+ *
+ * Check if the given point is inside the cage. This test is done in
+ * the regard of the topological inside of the source cage.
+ *
+ * Returns: TRUE if the point is inside, FALSE if not.
+ * This function does not take into account an eventual displacement.
+ */
+gboolean
+gimp_cage_config_point_inside (GimpCageConfig *gcc,
+                               gfloat          x,
+                               gfloat          y)
+{
+  GimpVector2   *last, *current;
+  gboolean       inside = FALSE;
+  gint           i;
+
+  g_return_val_if_fail (GIMP_IS_CAGE_CONFIG (gcc), FALSE);
+
+  last = &((g_array_index (gcc->cage_points, GimpCagePoint, gcc->cage_points->len - 1)).src_point);
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      current = &((g_array_index (gcc->cage_points, GimpCagePoint, i)).src_point);
+
+      if ((((current->y <= y) && (y < last->y))
+           || ((last->y <= y) && (y < current->y)))
+          && (x < (last->x - current->x) * (y - current->y) / (last->y - current->y) + current->x))
+        {
+          inside = !inside;
+        }
+
+      last = current;
+    }
+
+  return inside;
+}
+
+/**
+ * gimp_cage_config_select_point:
+ * @gcc: the cage config
+ * @point_number: the index of the point to select
+ *
+ * Select the given point of the cage, and deselect the others.
+ */
+void
+gimp_cage_config_select_point (GimpCageConfig  *gcc,
+                               gint             point_number)
+{
+  gint           i;
+  GimpCagePoint *point;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+  g_return_if_fail (point_number < gcc->cage_points->len);
+  g_return_if_fail (point_number >= 0);
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      point = &g_array_index (gcc->cage_points, GimpCagePoint, i);
+
+      if (i == point_number)
+        {
+          point->selected = TRUE;
+        }
+      else
+        {
+          point->selected = FALSE;
+        }
+    }
+}
+
+/**
+ * gimp_cage_config_select_area:
+ * @gcc: the cage config
+ * @mode: the actual mode of the cage, GIMP_CAGE_MODE_CAGE_CHANGE or GIMP_CAGE_MODE_DEFORM
+ * @area: the area to select
+ *
+ * Select cage's point inside the given area and deselect others
+ */
+void
+gimp_cage_config_select_area  (GimpCageConfig  *gcc,
+                               GimpCageMode     mode,
+                               GeglRectangle    area)
+{
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  gimp_cage_config_deselect_points (gcc);
+  gimp_cage_config_select_add_area (gcc, mode, area);
+}
+
+/**
+ * gimp_cage_config_select_add_area:
+ * @gcc: the cage config
+ * @mode: the actual mode of the cage, GIMP_CAGE_MODE_CAGE_CHANGE or GIMP_CAGE_MODE_DEFORM
+ * @area: the area to select
+ *
+ * Select cage's point inside the given area. Already selected point stay selected.
+ */
+void
+gimp_cage_config_select_add_area (GimpCageConfig *gcc,
+                                  GimpCageMode    mode,
+                                  GeglRectangle   area)
+{
+  gint           i;
+  GimpCagePoint *point;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      point = &g_array_index (gcc->cage_points, GimpCagePoint, i);
+
+      if (mode == GIMP_CAGE_MODE_CAGE_CHANGE)
+        {
+          if (point->src_point.x >= area.x &&
+              point->src_point.x <= area.x + area.width &&
+              point->src_point.y >= area.y &&
+              point->src_point.y <= area.y + area.height)
+            {
+              point->selected = TRUE;
+            }
+        }
+      else
+        {
+          if (point->dest_point.x >= area.x &&
+              point->dest_point.x <= area.x + area.width &&
+              point->dest_point.y >= area.y &&
+              point->dest_point.y <= area.y + area.height)
+            {
+              point->selected = TRUE;
+            }
+        }
+    }
+}
+
+/**
+ * gimp_cage_config_toggle_point_selection:
+ * @gcc: the cage config
+ * @point_number: the index of the point to toggle selection
+ *
+ * Toggle the selection of the given cage point
+ */
+void
+gimp_cage_config_toggle_point_selection (GimpCageConfig *gcc,
+                                         gint            point_number)
+{
+  GimpCagePoint *point;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+  g_return_if_fail (point_number < gcc->cage_points->len);
+  g_return_if_fail (point_number >= 0);
+
+  point = &g_array_index (gcc->cage_points, GimpCagePoint, point_number);
+  point->selected = ! point->selected;
+}
+
+/**
+ * gimp_cage_deselect_points:
+ * @gcc: the cage config
+ *
+ * Deselect all cage points.
+ */
+void
+gimp_cage_config_deselect_points (GimpCageConfig *gcc)
+{
+  gint  i;
+
+  g_return_if_fail (GIMP_IS_CAGE_CONFIG (gcc));
+
+  for (i = 0; i < gcc->cage_points->len; i++)
+    {
+      (g_array_index (gcc->cage_points, GimpCagePoint, i)).selected = FALSE;
+    }
+}
+
+/**
+ * gimp_cage_config_point_is_selected:
+ * @gcc: the cage config
+ * @point_number: the index of the point to test
+ *
+ * Returns: TRUE if the point is selected, FALSE otherwise.
+ */
+gboolean
+gimp_cage_config_point_is_selected (GimpCageConfig  *gcc,
+                                    gint             point_number)
+{
+  GimpCagePoint *point;
+
+  g_return_val_if_fail (GIMP_IS_CAGE_CONFIG (gcc), FALSE);
+  g_return_val_if_fail (point_number < gcc->cage_points->len, FALSE);
+  g_return_val_if_fail (point_number >= 0, FALSE);
+
+  point = &(g_array_index (gcc->cage_points, GimpCagePoint, point_number));
+
+  return point->selected;
+}
diff --git a/app/operations/gimpcageconfig.h b/app/operations/gimpcageconfig.h
new file mode 100644
index 0000000..8106d52
--- /dev/null
+++ b/app/operations/gimpcageconfig.h
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpcageconfig.h
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CAGE_CONFIG_H__
+#define __GIMP_CAGE_CONFIG_H__
+
+
+#include "gimpoperationsettings.h"
+
+
+struct _GimpCagePoint
+{
+  GimpVector2 src_point;
+  GimpVector2 dest_point;
+  GimpVector2 edge_normal;
+  gdouble     edge_scaling_factor;
+  gboolean    selected;
+};
+
+
+#define GIMP_TYPE_CAGE_CONFIG            (gimp_cage_config_get_type ())
+#define GIMP_CAGE_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CAGE_CONFIG, GimpCageConfig))
+#define GIMP_CAGE_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CAGE_CONFIG, GimpCageConfigClass))
+#define GIMP_IS_CAGE_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CAGE_CONFIG))
+#define GIMP_IS_CAGE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CAGE_CONFIG))
+#define GIMP_CAGE_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CAGE_CONFIG, GimpCageConfigClass))
+
+
+typedef struct _GimpCageConfigClass GimpCageConfigClass;
+
+struct _GimpCageConfig
+{
+  GimpOperationSettings  parent_instance;
+
+  GArray                *cage_points;
+
+  gdouble                displacement_x;
+  gdouble                displacement_y;
+  GimpCageMode           cage_mode;  /* Cage mode, used to commit displacement */
+};
+
+struct _GimpCageConfigClass
+{
+  GimpOperationSettingsClass  parent_class;
+};
+
+
+GType           gimp_cage_config_get_type               (void) G_GNUC_CONST;
+
+guint           gimp_cage_config_get_n_points           (GimpCageConfig  *gcc);
+void            gimp_cage_config_add_cage_point         (GimpCageConfig  *gcc,
+                                                         gdouble          x,
+                                                         gdouble          y);
+void            gimp_cage_config_insert_cage_point      (GimpCageConfig  *gcc,
+                                                         gint             point_number,
+                                                         gdouble          x,
+                                                         gdouble          y);
+void            gimp_cage_config_remove_last_cage_point (GimpCageConfig  *gcc);
+void            gimp_cage_config_remove_cage_point      (GimpCageConfig  *gcc,
+                                                         gint             point_number);
+void            gimp_cage_config_remove_selected_points (GimpCageConfig  *gcc);
+GimpVector2     gimp_cage_config_get_point_coordinate   (GimpCageConfig  *gcc,
+                                                         GimpCageMode     mode,
+                                                         gint             point_number);
+void            gimp_cage_config_add_displacement       (GimpCageConfig  *gcc,
+                                                         GimpCageMode     mode,
+                                                         gdouble          x,
+                                                         gdouble          y);
+void            gimp_cage_config_commit_displacement    (GimpCageConfig  *gcc);
+void            gimp_cage_config_reset_displacement     (GimpCageConfig  *gcc);
+GeglRectangle   gimp_cage_config_get_bounding_box       (GimpCageConfig  *gcc);
+void            gimp_cage_config_reverse_cage_if_needed (GimpCageConfig  *gcc);
+void            gimp_cage_config_reverse_cage           (GimpCageConfig  *gcc);
+gboolean        gimp_cage_config_point_inside           (GimpCageConfig  *gcc,
+                                                         gfloat           x,
+                                                         gfloat           y);
+void            gimp_cage_config_select_point           (GimpCageConfig  *gcc,
+                                                         gint             point_number);
+void            gimp_cage_config_select_area            (GimpCageConfig  *gcc,
+                                                         GimpCageMode     mode,
+                                                         GeglRectangle    area);
+void            gimp_cage_config_select_add_area        (GimpCageConfig  *gcc,
+                                                         GimpCageMode     mode,
+                                                         GeglRectangle    area);
+void            gimp_cage_config_toggle_point_selection (GimpCageConfig  *gcc,
+                                                         gint             point_number);
+void            gimp_cage_config_deselect_points        (GimpCageConfig  *gcc);
+gboolean        gimp_cage_config_point_is_selected      (GimpCageConfig  *gcc,
+                                                         gint             point_number);
+
+
+#endif /* __GIMP_CAGE_CONFIG_H__ */
diff --git a/app/operations/gimpcolorbalanceconfig.c b/app/operations/gimpcolorbalanceconfig.c
new file mode 100644
index 0000000..7011a86
--- /dev/null
+++ b/app/operations/gimpcolorbalanceconfig.c
@@ -0,0 +1,382 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolorbalanceconfig.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gimpcolorbalanceconfig.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_RANGE,
+  PROP_CYAN_RED,
+  PROP_MAGENTA_GREEN,
+  PROP_YELLOW_BLUE,
+  PROP_PRESERVE_LUMINOSITY
+};
+
+
+static void     gimp_color_balance_config_iface_init   (GimpConfigInterface *iface);
+
+static void     gimp_color_balance_config_get_property (GObject          *object,
+                                                        guint             property_id,
+                                                        GValue           *value,
+                                                        GParamSpec       *pspec);
+static void     gimp_color_balance_config_set_property (GObject          *object,
+                                                        guint             property_id,
+                                                        const GValue     *value,
+                                                        GParamSpec       *pspec);
+
+static gboolean gimp_color_balance_config_serialize    (GimpConfig       *config,
+                                                        GimpConfigWriter *writer,
+                                                        gpointer          data);
+static gboolean gimp_color_balance_config_deserialize  (GimpConfig       *config,
+                                                        GScanner         *scanner,
+                                                        gint              nest_level,
+                                                        gpointer          data);
+static gboolean gimp_color_balance_config_equal        (GimpConfig       *a,
+                                                        GimpConfig       *b);
+static void     gimp_color_balance_config_reset        (GimpConfig       *config);
+static gboolean gimp_color_balance_config_copy         (GimpConfig       *src,
+                                                        GimpConfig       *dest,
+                                                        GParamFlags       flags);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpColorBalanceConfig, gimp_color_balance_config,
+                         GIMP_TYPE_OPERATION_SETTINGS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_color_balance_config_iface_init))
+
+#define parent_class gimp_color_balance_config_parent_class
+
+
+static void
+gimp_color_balance_config_class_init (GimpColorBalanceConfigClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->set_property        = gimp_color_balance_config_set_property;
+  object_class->get_property        = gimp_color_balance_config_get_property;
+
+  viewable_class->default_icon_name = "gimp-tool-color-balance";
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_RANGE,
+                         "range",
+                         _("Range"),
+                         _("The affected range"),
+                         GIMP_TYPE_TRANSFER_MODE,
+                         GIMP_TRANSFER_MIDTONES, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_CYAN_RED,
+                           "cyan-red",
+                           _("Cyan-Red"),
+                           _("Cyan-Red"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_MAGENTA_GREEN,
+                           "magenta-green",
+                           _("Magenta-Green"),
+                           _("Magenta-Green"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_YELLOW_BLUE,
+                           "yellow-blue",
+                           _("Yellow-Blue"),
+                           _("Yellow-Blue"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PRESERVE_LUMINOSITY,
+                            "preserve-luminosity",
+                            _("Preserve Luminosity"),
+                            _("Preserve Luminosity"),
+                            TRUE, 0);
+}
+
+static void
+gimp_color_balance_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_color_balance_config_serialize;
+  iface->deserialize = gimp_color_balance_config_deserialize;
+  iface->equal       = gimp_color_balance_config_equal;
+  iface->reset       = gimp_color_balance_config_reset;
+  iface->copy        = gimp_color_balance_config_copy;
+}
+
+static void
+gimp_color_balance_config_init (GimpColorBalanceConfig *self)
+{
+  gimp_config_reset (GIMP_CONFIG (self));
+}
+
+static void
+gimp_color_balance_config_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpColorBalanceConfig *self = GIMP_COLOR_BALANCE_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_RANGE:
+      g_value_set_enum (value, self->range);
+      break;
+
+    case PROP_CYAN_RED:
+      g_value_set_double (value, self->cyan_red[self->range]);
+      break;
+
+    case PROP_MAGENTA_GREEN:
+      g_value_set_double (value, self->magenta_green[self->range]);
+      break;
+
+    case PROP_YELLOW_BLUE:
+      g_value_set_double (value, self->yellow_blue[self->range]);
+      break;
+
+    case PROP_PRESERVE_LUMINOSITY:
+      g_value_set_boolean (value, self->preserve_luminosity);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_balance_config_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpColorBalanceConfig *self = GIMP_COLOR_BALANCE_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_RANGE:
+      self->range = g_value_get_enum (value);
+      g_object_notify (object, "cyan-red");
+      g_object_notify (object, "magenta-green");
+      g_object_notify (object, "yellow-blue");
+      break;
+
+    case PROP_CYAN_RED:
+      self->cyan_red[self->range] = g_value_get_double (value);
+      break;
+
+    case PROP_MAGENTA_GREEN:
+      self->magenta_green[self->range] = g_value_get_double (value);
+      break;
+
+    case PROP_YELLOW_BLUE:
+      self->yellow_blue[self->range] = g_value_get_double (value);
+      break;
+
+    case PROP_PRESERVE_LUMINOSITY:
+      self->preserve_luminosity = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_color_balance_config_serialize (GimpConfig       *config,
+                                     GimpConfigWriter *writer,
+                                     gpointer          data)
+{
+  GimpColorBalanceConfig *bc_config = GIMP_COLOR_BALANCE_CONFIG (config);
+  GimpTransferMode        range;
+  GimpTransferMode        old_range;
+  gboolean                success = TRUE;
+
+  if (! gimp_operation_settings_config_serialize_base (config, writer, data))
+    return FALSE;
+
+  old_range = bc_config->range;
+
+  for (range = GIMP_TRANSFER_SHADOWS;
+       range <= GIMP_TRANSFER_HIGHLIGHTS;
+       range++)
+    {
+      bc_config->range = range;
+
+      success = (gimp_config_serialize_property_by_name (config,
+                                                         "range",
+                                                         writer) &&
+                 gimp_config_serialize_property_by_name (config,
+                                                         "cyan-red",
+                                                         writer) &&
+                 gimp_config_serialize_property_by_name (config,
+                                                         "magenta-green",
+                                                         writer) &&
+                 gimp_config_serialize_property_by_name (config,
+                                                         "yellow-blue",
+                                                         writer));
+
+      if (! success)
+        break;
+    }
+
+  if (success)
+    success = gimp_config_serialize_property_by_name (config,
+                                                      "preserve-luminosity",
+                                                      writer);
+
+  bc_config->range = old_range;
+
+  return success;
+}
+
+static gboolean
+gimp_color_balance_config_deserialize (GimpConfig *config,
+                                       GScanner   *scanner,
+                                       gint        nest_level,
+                                       gpointer    data)
+{
+  GimpColorBalanceConfig *cb_config = GIMP_COLOR_BALANCE_CONFIG (config);
+  GimpTransferMode        old_range;
+  gboolean                success = TRUE;
+
+  old_range = cb_config->range;
+
+  success = gimp_config_deserialize_properties (config, scanner, nest_level);
+
+  g_object_set (config, "range", old_range, NULL);
+
+  return success;
+}
+
+static gboolean
+gimp_color_balance_config_equal (GimpConfig *a,
+                                 GimpConfig *b)
+{
+  GimpColorBalanceConfig *config_a = GIMP_COLOR_BALANCE_CONFIG (a);
+  GimpColorBalanceConfig *config_b = GIMP_COLOR_BALANCE_CONFIG (b);
+  GimpTransferMode        range;
+
+  if (! gimp_operation_settings_config_equal_base (a, b))
+    return FALSE;
+
+  for (range = GIMP_TRANSFER_SHADOWS;
+       range <= GIMP_TRANSFER_HIGHLIGHTS;
+       range++)
+    {
+      if (config_a->cyan_red[range]      != config_b->cyan_red[range]      ||
+          config_a->magenta_green[range] != config_b->magenta_green[range] ||
+          config_a->yellow_blue[range]   != config_b->yellow_blue[range])
+        return FALSE;
+    }
+
+  /* don't compare "range" */
+
+  if (config_a->preserve_luminosity != config_b->preserve_luminosity)
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+gimp_color_balance_config_reset (GimpConfig *config)
+{
+  GimpColorBalanceConfig *cb_config = GIMP_COLOR_BALANCE_CONFIG (config);
+  GimpTransferMode        range;
+
+  gimp_operation_settings_config_reset_base (config);
+
+  for (range = GIMP_TRANSFER_SHADOWS;
+       range <= GIMP_TRANSFER_HIGHLIGHTS;
+       range++)
+    {
+      cb_config->range = range;
+      gimp_color_balance_config_reset_range (cb_config);
+    }
+
+  gimp_config_reset_property (G_OBJECT (config), "range");
+  gimp_config_reset_property (G_OBJECT (config), "preserve-luminosity");
+}
+
+static gboolean
+gimp_color_balance_config_copy (GimpConfig  *src,
+                                GimpConfig  *dest,
+                                GParamFlags  flags)
+{
+  GimpColorBalanceConfig *src_config  = GIMP_COLOR_BALANCE_CONFIG (src);
+  GimpColorBalanceConfig *dest_config = GIMP_COLOR_BALANCE_CONFIG (dest);
+  GimpTransferMode        range;
+
+  if (! gimp_operation_settings_config_copy_base (src, dest, flags))
+    return FALSE;
+
+  for (range = GIMP_TRANSFER_SHADOWS;
+       range <= GIMP_TRANSFER_HIGHLIGHTS;
+       range++)
+    {
+      dest_config->cyan_red[range]      = src_config->cyan_red[range];
+      dest_config->magenta_green[range] = src_config->magenta_green[range];
+      dest_config->yellow_blue[range]   = src_config->yellow_blue[range];
+    }
+
+  g_object_notify (G_OBJECT (dest), "cyan-red");
+  g_object_notify (G_OBJECT (dest), "magenta-green");
+  g_object_notify (G_OBJECT (dest), "yellow-blue");
+
+  dest_config->range               = src_config->range;
+  dest_config->preserve_luminosity = src_config->preserve_luminosity;
+
+  g_object_notify (G_OBJECT (dest), "range");
+  g_object_notify (G_OBJECT (dest), "preserve-luminosity");
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_color_balance_config_reset_range (GimpColorBalanceConfig *config)
+{
+  g_return_if_fail (GIMP_IS_COLOR_BALANCE_CONFIG (config));
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  gimp_config_reset_property (G_OBJECT (config), "cyan-red");
+  gimp_config_reset_property (G_OBJECT (config), "magenta-green");
+  gimp_config_reset_property (G_OBJECT (config), "yellow-blue");
+
+  g_object_thaw_notify (G_OBJECT (config));
+}
diff --git a/app/operations/gimpcolorbalanceconfig.h b/app/operations/gimpcolorbalanceconfig.h
new file mode 100644
index 0000000..4c58cea
--- /dev/null
+++ b/app/operations/gimpcolorbalanceconfig.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolorbalanceconfig.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_BALANCE_CONFIG_H__
+#define __GIMP_COLOR_BALANCE_CONFIG_H__
+
+
+#include "gimpoperationsettings.h"
+
+
+#define GIMP_TYPE_COLOR_BALANCE_CONFIG            (gimp_color_balance_config_get_type ())
+#define GIMP_COLOR_BALANCE_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_BALANCE_CONFIG, GimpColorBalanceConfig))
+#define GIMP_COLOR_BALANCE_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_COLOR_BALANCE_CONFIG, GimpColorBalanceConfigClass))
+#define GIMP_IS_COLOR_BALANCE_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_BALANCE_CONFIG))
+#define GIMP_IS_COLOR_BALANCE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_COLOR_BALANCE_CONFIG))
+#define GIMP_COLOR_BALANCE_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_COLOR_BALANCE_CONFIG, GimpColorBalanceConfigClass))
+
+
+typedef struct _GimpColorBalanceConfigClass GimpColorBalanceConfigClass;
+
+struct _GimpColorBalanceConfig
+{
+  GimpOperationSettings  parent_instance;
+
+  GimpTransferMode       range;
+
+  gdouble                cyan_red[3];
+  gdouble                magenta_green[3];
+  gdouble                yellow_blue[3];
+
+  gboolean               preserve_luminosity;
+};
+
+struct _GimpColorBalanceConfigClass
+{
+  GimpOperationSettingsClass  parent_class;
+};
+
+
+GType   gimp_color_balance_config_get_type    (void) G_GNUC_CONST;
+
+void    gimp_color_balance_config_reset_range (GimpColorBalanceConfig *config);
+
+
+#endif /* __GIMP_COLOR_BALANCE_CONFIG_H__ */
diff --git a/app/operations/gimpcurvesconfig.c b/app/operations/gimpcurvesconfig.c
new file mode 100644
index 0000000..b63bcf3
--- /dev/null
+++ b/app/operations/gimpcurvesconfig.c
@@ -0,0 +1,695 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcurvesconfig.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpcurve.h"
+#include "core/gimphistogram.h"
+
+#include "gimpcurvesconfig.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LINEAR,
+  PROP_CHANNEL,
+  PROP_CURVE
+};
+
+
+static void     gimp_curves_config_iface_init   (GimpConfigInterface *iface);
+
+static void     gimp_curves_config_finalize     (GObject          *object);
+static void     gimp_curves_config_get_property (GObject          *object,
+                                                 guint             property_id,
+                                                 GValue           *value,
+                                                 GParamSpec       *pspec);
+static void     gimp_curves_config_set_property (GObject          *object,
+                                                 guint             property_id,
+                                                 const GValue     *value,
+                                                 GParamSpec       *pspec);
+
+static gboolean gimp_curves_config_serialize    (GimpConfig       *config,
+                                                 GimpConfigWriter *writer,
+                                                 gpointer          data);
+static gboolean gimp_curves_config_deserialize  (GimpConfig       *config,
+                                                 GScanner         *scanner,
+                                                 gint              nest_level,
+                                                 gpointer          data);
+static gboolean gimp_curves_config_equal        (GimpConfig       *a,
+                                                 GimpConfig       *b);
+static void     gimp_curves_config_reset        (GimpConfig       *config);
+static gboolean gimp_curves_config_copy         (GimpConfig       *src,
+                                                 GimpConfig       *dest,
+                                                 GParamFlags       flags);
+
+static void     gimp_curves_config_curve_dirty  (GimpCurve        *curve,
+                                                 GimpCurvesConfig *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpCurvesConfig, gimp_curves_config,
+                         GIMP_TYPE_OPERATION_SETTINGS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_curves_config_iface_init))
+
+#define parent_class gimp_curves_config_parent_class
+
+
+static void
+gimp_curves_config_class_init (GimpCurvesConfigClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->finalize            = gimp_curves_config_finalize;
+  object_class->set_property        = gimp_curves_config_set_property;
+  object_class->get_property        = gimp_curves_config_get_property;
+
+  viewable_class->default_icon_name = "gimp-tool-curves";
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LINEAR,
+                            "linear",
+                            _("Linear"),
+                            _("Work on linear RGB"),
+                            FALSE, 0);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CHANNEL,
+                         "channel",
+                         _("Channel"),
+                         _("The affected channel"),
+                         GIMP_TYPE_HISTOGRAM_CHANNEL,
+                         GIMP_HISTOGRAM_VALUE, 0);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_CURVE,
+                           "curve",
+                           _("Curve"),
+                           _("Curve"),
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+}
+
+static void
+gimp_curves_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_curves_config_serialize;
+  iface->deserialize = gimp_curves_config_deserialize;
+  iface->equal       = gimp_curves_config_equal;
+  iface->reset       = gimp_curves_config_reset;
+  iface->copy        = gimp_curves_config_copy;
+}
+
+static void
+gimp_curves_config_init (GimpCurvesConfig *self)
+{
+  GimpHistogramChannel channel;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      self->curve[channel] = GIMP_CURVE (gimp_curve_new ("curves config"));
+
+      g_signal_connect_object (self->curve[channel], "dirty",
+                               G_CALLBACK (gimp_curves_config_curve_dirty),
+                               self, 0);
+    }
+
+  gimp_config_reset (GIMP_CONFIG (self));
+}
+
+static void
+gimp_curves_config_finalize (GObject *object)
+{
+  GimpCurvesConfig     *self = GIMP_CURVES_CONFIG (object);
+  GimpHistogramChannel  channel;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      g_object_unref (self->curve[channel]);
+      self->curve[channel] = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_curves_config_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpCurvesConfig *self = GIMP_CURVES_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_LINEAR:
+      g_value_set_boolean (value, self->linear);
+      break;
+
+    case PROP_CHANNEL:
+      g_value_set_enum (value, self->channel);
+      break;
+
+    case PROP_CURVE:
+      g_value_set_object (value, self->curve[self->channel]);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_curves_config_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpCurvesConfig *self = GIMP_CURVES_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_LINEAR:
+      self->linear = g_value_get_boolean (value);
+      break;
+
+    case PROP_CHANNEL:
+      self->channel = g_value_get_enum (value);
+      g_object_notify (object, "curve");
+      break;
+
+    case PROP_CURVE:
+      {
+        GimpCurve *src_curve  = g_value_get_object (value);
+        GimpCurve *dest_curve = self->curve[self->channel];
+
+        if (src_curve && dest_curve)
+          {
+            gimp_config_copy (GIMP_CONFIG (src_curve),
+                              GIMP_CONFIG (dest_curve), 0);
+          }
+      }
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_curves_config_serialize (GimpConfig       *config,
+                              GimpConfigWriter *writer,
+                              gpointer          data)
+{
+  GimpCurvesConfig     *c_config = GIMP_CURVES_CONFIG (config);
+  GimpHistogramChannel  channel;
+  GimpHistogramChannel  old_channel;
+  gboolean              success = TRUE;
+
+  if (! gimp_operation_settings_config_serialize_base (config, writer, data) ||
+      ! gimp_config_serialize_property_by_name (config, "linear", writer))
+    return FALSE;
+
+  old_channel = c_config->channel;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      c_config->channel = channel;
+
+      /*  serialize the channel properties manually (not using
+       *  gimp_config_serialize_properties()), so the parent class'
+       *  properties don't end up in the config file one per channel.
+       *  See bug #700653.
+       */
+      success =
+        (gimp_config_serialize_property_by_name (config, "channel", writer) &&
+         gimp_config_serialize_property_by_name (config, "curve",   writer));
+
+      if (! success)
+        break;
+    }
+
+  c_config->channel = old_channel;
+
+  return success;
+}
+
+static gboolean
+gimp_curves_config_deserialize (GimpConfig *config,
+                                GScanner   *scanner,
+                                gint        nest_level,
+                                gpointer    data)
+{
+  GimpCurvesConfig     *c_config = GIMP_CURVES_CONFIG (config);
+  GimpHistogramChannel  old_channel;
+  gboolean              success = TRUE;
+
+  old_channel = c_config->channel;
+
+  success = gimp_config_deserialize_properties (config, scanner, nest_level);
+
+  g_object_set (config, "channel", old_channel, NULL);
+
+  return success;
+}
+
+static gboolean
+gimp_curves_config_equal (GimpConfig *a,
+                          GimpConfig *b)
+{
+  GimpCurvesConfig     *config_a = GIMP_CURVES_CONFIG (a);
+  GimpCurvesConfig     *config_b = GIMP_CURVES_CONFIG (b);
+  GimpHistogramChannel  channel;
+
+  if (! gimp_operation_settings_config_equal_base (a, b) ||
+      config_a->linear != config_b->linear)
+    return FALSE;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      GimpCurve *curve_a = config_a->curve[channel];
+      GimpCurve *curve_b = config_b->curve[channel];
+
+      if (curve_a && curve_b)
+        {
+          if (! gimp_config_is_equal_to (GIMP_CONFIG (curve_a),
+                                         GIMP_CONFIG (curve_b)))
+            return FALSE;
+        }
+      else if (curve_a || curve_b)
+        {
+          return FALSE;
+        }
+    }
+
+  /* don't compare "channel" */
+
+  return TRUE;
+}
+
+static void
+gimp_curves_config_reset (GimpConfig *config)
+{
+  GimpCurvesConfig     *c_config = GIMP_CURVES_CONFIG (config);
+  GimpHistogramChannel  channel;
+
+  gimp_operation_settings_config_reset_base (config);
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      c_config->channel = channel;
+      gimp_curves_config_reset_channel (c_config);
+    }
+
+  gimp_config_reset_property (G_OBJECT (config), "linear");
+  gimp_config_reset_property (G_OBJECT (config), "channel");
+}
+
+static gboolean
+gimp_curves_config_copy (GimpConfig  *src,
+                         GimpConfig  *dest,
+                         GParamFlags  flags)
+{
+  GimpCurvesConfig     *src_config  = GIMP_CURVES_CONFIG (src);
+  GimpCurvesConfig     *dest_config = GIMP_CURVES_CONFIG (dest);
+  GimpHistogramChannel  channel;
+
+  if (! gimp_operation_settings_config_copy_base (src, dest, flags))
+    return FALSE;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      gimp_config_copy (GIMP_CONFIG (src_config->curve[channel]),
+                        GIMP_CONFIG (dest_config->curve[channel]),
+                        flags);
+    }
+
+  dest_config->linear  = src_config->linear;
+  dest_config->channel = src_config->channel;
+
+  g_object_notify (G_OBJECT (dest), "linear");
+  g_object_notify (G_OBJECT (dest), "channel");
+
+  return TRUE;
+}
+
+static void
+gimp_curves_config_curve_dirty (GimpCurve        *curve,
+                                GimpCurvesConfig *config)
+{
+  g_object_notify (G_OBJECT (config), "curve");
+}
+
+
+/*  public functions  */
+
+GObject *
+gimp_curves_config_new_spline (gint32         channel,
+                               const gdouble *points,
+                               gint           n_points)
+{
+  GimpCurvesConfig *config;
+  GimpCurve        *curve;
+  gint              i;
+
+  g_return_val_if_fail (channel >= GIMP_HISTOGRAM_VALUE &&
+                        channel <= GIMP_HISTOGRAM_ALPHA, NULL);
+  g_return_val_if_fail (points != NULL, NULL);
+  g_return_val_if_fail (n_points >= 2 && n_points <= 1024, NULL);
+
+  config = g_object_new (GIMP_TYPE_CURVES_CONFIG, NULL);
+
+  curve = config->curve[channel];
+
+  gimp_data_freeze (GIMP_DATA (curve));
+
+  gimp_curve_set_curve_type (curve, GIMP_CURVE_SMOOTH);
+  gimp_curve_clear_points (curve);
+
+  for (i = 0; i < n_points; i++)
+    gimp_curve_add_point (curve,
+                          (gdouble) points[i * 2],
+                          (gdouble) points[i * 2 + 1]);
+
+  gimp_data_thaw (GIMP_DATA (curve));
+
+  return G_OBJECT (config);
+}
+
+GObject *
+gimp_curves_config_new_explicit (gint32         channel,
+                                 const gdouble *samples,
+                                 gint           n_samples)
+{
+  GimpCurvesConfig *config;
+  GimpCurve        *curve;
+  gint              i;
+
+  g_return_val_if_fail (channel >= GIMP_HISTOGRAM_VALUE &&
+                        channel <= GIMP_HISTOGRAM_ALPHA, NULL);
+  g_return_val_if_fail (samples != NULL, NULL);
+  g_return_val_if_fail (n_samples >= 2 && n_samples <= 4096, NULL);
+
+  config = g_object_new (GIMP_TYPE_CURVES_CONFIG, NULL);
+
+  curve = config->curve[channel];
+
+  gimp_data_freeze (GIMP_DATA (curve));
+
+  gimp_curve_set_curve_type (curve, GIMP_CURVE_FREE);
+  gimp_curve_set_n_samples (curve, n_samples);
+
+  for (i = 0; i < n_samples; i++)
+    gimp_curve_set_curve (curve,
+                          (gdouble) i / (gdouble) (n_samples - 1),
+                          (gdouble) samples[i]);
+
+  gimp_data_thaw (GIMP_DATA (curve));
+
+  return G_OBJECT (config);
+}
+
+GObject *
+gimp_curves_config_new_spline_cruft (gint32        channel,
+                                     const guint8 *points,
+                                     gint          n_points)
+{
+  GObject *config;
+  gdouble *d_points;
+  gint     i;
+
+  g_return_val_if_fail (channel >= GIMP_HISTOGRAM_VALUE &&
+                        channel <= GIMP_HISTOGRAM_ALPHA, NULL);
+  g_return_val_if_fail (points != NULL, NULL);
+  g_return_val_if_fail (n_points >= 2 && n_points <= 1024, NULL);
+
+  d_points = g_new (gdouble, 2 * n_points);
+
+  for (i = 0; i < n_points; i++)
+    {
+      d_points[i * 2]     = (gdouble) points[i * 2]     / 255.0;
+      d_points[i * 2 + 1] = (gdouble) points[i * 2 + 1] / 255.0;
+    }
+
+  config = gimp_curves_config_new_spline (channel, d_points, n_points);
+
+  g_free (d_points);
+
+  return config;
+}
+
+GObject *
+gimp_curves_config_new_explicit_cruft (gint32        channel,
+                                       const guint8 *samples,
+                                       gint          n_samples)
+{
+  GObject *config;
+  gdouble *d_samples;
+  gint     i;
+
+  g_return_val_if_fail (channel >= GIMP_HISTOGRAM_VALUE &&
+                        channel <= GIMP_HISTOGRAM_ALPHA, NULL);
+  g_return_val_if_fail (samples != NULL, NULL);
+  g_return_val_if_fail (n_samples >= 2 && n_samples <= 4096, NULL);
+
+  d_samples = g_new (gdouble, n_samples);
+
+  for (i = 0; i < n_samples; i++)
+    {
+      d_samples[i] = (gdouble) samples[i] / 255.0;
+    }
+
+  config = gimp_curves_config_new_explicit (channel, d_samples, n_samples);
+
+  g_free (d_samples);
+
+  return config;
+}
+
+void
+gimp_curves_config_reset_channel (GimpCurvesConfig *config)
+{
+  g_return_if_fail (GIMP_IS_CURVES_CONFIG (config));
+
+  gimp_config_reset (GIMP_CONFIG (config->curve[config->channel]));
+}
+
+#define GIMP_CURVE_N_CRUFT_POINTS 17
+
+gboolean
+gimp_curves_config_load_cruft (GimpCurvesConfig  *config,
+                               GInputStream      *input,
+                               GError           **error)
+{
+  GDataInputStream *data_input;
+  gint              index[5][GIMP_CURVE_N_CRUFT_POINTS];
+  gint              value[5][GIMP_CURVE_N_CRUFT_POINTS];
+  gchar            *line;
+  gsize             line_len;
+  gint              i, j;
+
+  g_return_val_if_fail (GIMP_IS_CURVES_CONFIG (config), FALSE);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  data_input = g_data_input_stream_new (input);
+
+  line_len = 64;
+  line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                  NULL, error);
+  if (! line)
+    return FALSE;
+
+  if (strcmp (line, "# GIMP Curves File") != 0)
+    {
+      g_set_error_literal (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+                           _("not a GIMP Curves file"));
+      g_object_unref (data_input);
+      g_free (line);
+      return FALSE;
+    }
+
+  for (i = 0; i < 5; i++)
+    {
+      for (j = 0; j < GIMP_CURVE_N_CRUFT_POINTS; j++)
+        {
+          gchar *x_str = NULL;
+          gchar *y_str = NULL;
+
+          if (! (x_str = g_data_input_stream_read_upto (data_input, " ", -1,
+                                                        NULL, NULL, error)) ||
+              ! g_data_input_stream_read_byte (data_input,  NULL, error) ||
+              ! (y_str = g_data_input_stream_read_upto (data_input, " ", -1,
+                                                        NULL, NULL, error)) ||
+              ! g_data_input_stream_read_byte (data_input,  NULL, error))
+            {
+              g_free (x_str);
+              g_free (y_str);
+              g_object_unref (data_input);
+              return FALSE;
+            }
+
+          if (sscanf (x_str, "%d", &index[i][j]) != 1 ||
+              sscanf (y_str, "%d", &value[i][j]) != 1)
+            {
+              g_set_error_literal (error,
+                                   GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+                                   _("Parse error, didn't find 2 integers"));
+              g_free (x_str);
+              g_free (y_str);
+              g_object_unref (data_input);
+              return FALSE;
+            }
+
+          g_free (x_str);
+          g_free (y_str);
+        }
+    }
+
+  g_object_unref (data_input);
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  for (i = 0; i < 5; i++)
+    {
+      GimpCurve *curve = config->curve[i];
+
+      gimp_data_freeze (GIMP_DATA (curve));
+
+      gimp_curve_set_curve_type (curve, GIMP_CURVE_SMOOTH);
+      gimp_curve_clear_points (curve);
+
+      for (j = 0; j < GIMP_CURVE_N_CRUFT_POINTS; j++)
+        {
+          gdouble x;
+          gdouble y;
+
+          x = (gdouble) index[i][j] / 255.0;
+          y = (gdouble) value[i][j] / 255.0;
+
+          if (x >= 0.0)
+            gimp_curve_add_point (curve, x, y);
+        }
+
+      gimp_data_thaw (GIMP_DATA (curve));
+    }
+
+  config->linear = FALSE;
+
+  g_object_notify (G_OBJECT (config), "linear");
+
+  g_object_thaw_notify (G_OBJECT (config));
+
+  return TRUE;
+}
+
+gboolean
+gimp_curves_config_save_cruft (GimpCurvesConfig  *config,
+                               GOutputStream     *output,
+                               GError           **error)
+{
+  GString *string;
+  gint     i;
+
+  g_return_val_if_fail (GIMP_IS_CURVES_CONFIG (config), FALSE);
+  g_return_val_if_fail (G_IS_OUTPUT_STREAM (output), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  string = g_string_new ("# GIMP Curves File\n");
+
+  for (i = 0; i < 5; i++)
+    {
+      GimpCurve *curve = config->curve[i];
+      gint       j;
+
+      if (curve->curve_type == GIMP_CURVE_SMOOTH)
+        {
+          g_object_ref (curve);
+        }
+      else
+        {
+          curve = GIMP_CURVE (gimp_data_duplicate (GIMP_DATA (curve)));
+
+          gimp_curve_set_curve_type (curve, GIMP_CURVE_SMOOTH);
+        }
+
+      for (j = 0; j < GIMP_CURVE_N_CRUFT_POINTS; j++)
+        {
+          gint x = -1;
+          gint y = -1;
+
+          if (j < gimp_curve_get_n_points (curve))
+            {
+              gdouble point_x;
+              gdouble point_y;
+
+              gimp_curve_get_point (curve, j, &point_x, &point_y);
+
+              x = floor (point_x * 255.999);
+              y = floor (point_y * 255.999);
+            }
+
+          g_string_append_printf (string, "%d %d ", x, y);
+        }
+
+      g_string_append_printf (string, "\n");
+
+      g_object_unref (curve);
+    }
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, error))
+    {
+      g_prefix_error (error, _("Writing curves file failed: "));
+      g_string_free (string, TRUE);
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpcurvesconfig.h b/app/operations/gimpcurvesconfig.h
new file mode 100644
index 0000000..c6241fe
--- /dev/null
+++ b/app/operations/gimpcurvesconfig.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcurvesconfig.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVES_CONFIG_H__
+#define __GIMP_CURVES_CONFIG_H__
+
+
+#include "gimpoperationsettings.h"
+
+
+#define GIMP_TYPE_CURVES_CONFIG            (gimp_curves_config_get_type ())
+#define GIMP_CURVES_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CURVES_CONFIG, GimpCurvesConfig))
+#define GIMP_CURVES_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_CURVES_CONFIG, GimpCurvesConfigClass))
+#define GIMP_IS_CURVES_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CURVES_CONFIG))
+#define GIMP_IS_CURVES_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_CURVES_CONFIG))
+#define GIMP_CURVES_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_CURVES_CONFIG, GimpCurvesConfigClass))
+
+
+typedef struct _GimpCurvesConfigClass GimpCurvesConfigClass;
+
+struct _GimpCurvesConfig
+{
+  GimpOperationSettings  parent_instance;
+
+  gboolean               linear;
+
+  GimpHistogramChannel   channel;
+
+  GimpCurve              *curve[5];
+};
+
+struct _GimpCurvesConfigClass
+{
+  GimpOperationSettingsClass  parent_class;
+};
+
+
+GType      gimp_curves_config_get_type            (void) G_GNUC_CONST;
+
+GObject  * gimp_curves_config_new_spline          (gint32             channel,
+                                                   const gdouble     *points,
+                                                   gint               n_points);
+GObject *  gimp_curves_config_new_explicit        (gint32             channel,
+                                                   const gdouble     *samples,
+                                                   gint               n_samples);
+
+GObject  * gimp_curves_config_new_spline_cruft    (gint32             channel,
+                                                   const guint8      *points,
+                                                   gint               n_points);
+GObject *  gimp_curves_config_new_explicit_cruft  (gint32             channel,
+                                                   const guint8      *samples,
+                                                   gint               n_samples);
+
+void       gimp_curves_config_reset_channel       (GimpCurvesConfig  *config);
+
+gboolean   gimp_curves_config_load_cruft          (GimpCurvesConfig  *config,
+                                                   GInputStream      *input,
+                                                   GError           **error);
+gboolean   gimp_curves_config_save_cruft          (GimpCurvesConfig  *config,
+                                                   GOutputStream     *output,
+                                                   GError           **error);
+
+
+#endif /* __GIMP_CURVES_CONFIG_H__ */
diff --git a/app/operations/gimphuesaturationconfig.c b/app/operations/gimphuesaturationconfig.c
new file mode 100644
index 0000000..4f0a397
--- /dev/null
+++ b/app/operations/gimphuesaturationconfig.c
@@ -0,0 +1,367 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphuesaturationconfig.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gimphuesaturationconfig.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_RANGE,
+  PROP_HUE,
+  PROP_SATURATION,
+  PROP_LIGHTNESS,
+  PROP_OVERLAP
+};
+
+
+static void     gimp_hue_saturation_config_iface_init   (GimpConfigInterface *iface);
+
+static void     gimp_hue_saturation_config_get_property (GObject          *object,
+                                                         guint             property_id,
+                                                         GValue           *value,
+                                                         GParamSpec       *pspec);
+static void     gimp_hue_saturation_config_set_property (GObject          *object,
+                                                         guint             property_id,
+                                                         const GValue     *value,
+                                                         GParamSpec       *pspec);
+
+static gboolean gimp_hue_saturation_config_serialize    (GimpConfig       *config,
+                                                         GimpConfigWriter *writer,
+                                                         gpointer          data);
+static gboolean gimp_hue_saturation_config_deserialize  (GimpConfig       *config,
+                                                         GScanner         *scanner,
+                                                         gint              nest_level,
+                                                         gpointer          data);
+static gboolean gimp_hue_saturation_config_equal        (GimpConfig       *a,
+                                                         GimpConfig       *b);
+static void     gimp_hue_saturation_config_reset        (GimpConfig       *config);
+static gboolean gimp_hue_saturation_config_copy         (GimpConfig       *src,
+                                                         GimpConfig       *dest,
+                                                         GParamFlags       flags);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpHueSaturationConfig, gimp_hue_saturation_config,
+                         GIMP_TYPE_OPERATION_SETTINGS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_hue_saturation_config_iface_init))
+
+#define parent_class gimp_hue_saturation_config_parent_class
+
+
+static void
+gimp_hue_saturation_config_class_init (GimpHueSaturationConfigClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->set_property        = gimp_hue_saturation_config_set_property;
+  object_class->get_property        = gimp_hue_saturation_config_get_property;
+
+  viewable_class->default_icon_name = "gimp-tool-hue-saturation";
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_RANGE,
+                         "range",
+                         _("Range"),
+                         _("The affected range"),
+                         GIMP_TYPE_HUE_RANGE,
+                         GIMP_HUE_RANGE_ALL, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HUE,
+                           "hue",
+                           _("Hue"),
+                           _("Hue"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SATURATION,
+                           "saturation",
+                           _("Saturation"),
+                           _("Saturation"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LIGHTNESS,
+                           "lightness",
+                           _("Lightness"),
+                           _("Lightness"),
+                           -1.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OVERLAP,
+                           "overlap",
+                           _("Overlap"),
+                           _("Overlap"),
+                           0.0, 1.0, 0.0, 0);
+}
+
+static void
+gimp_hue_saturation_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_hue_saturation_config_serialize;
+  iface->deserialize = gimp_hue_saturation_config_deserialize;
+  iface->equal       = gimp_hue_saturation_config_equal;
+  iface->reset       = gimp_hue_saturation_config_reset;
+  iface->copy        = gimp_hue_saturation_config_copy;
+}
+
+static void
+gimp_hue_saturation_config_init (GimpHueSaturationConfig *self)
+{
+  gimp_config_reset (GIMP_CONFIG (self));
+}
+
+static void
+gimp_hue_saturation_config_get_property (GObject    *object,
+                                         guint       property_id,
+                                         GValue     *value,
+                                         GParamSpec *pspec)
+{
+  GimpHueSaturationConfig *self = GIMP_HUE_SATURATION_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_RANGE:
+      g_value_set_enum (value, self->range);
+      break;
+
+    case PROP_HUE:
+      g_value_set_double (value, self->hue[self->range]);
+      break;
+
+    case PROP_SATURATION:
+      g_value_set_double (value, self->saturation[self->range]);
+      break;
+
+    case PROP_LIGHTNESS:
+      g_value_set_double (value, self->lightness[self->range]);
+      break;
+
+    case PROP_OVERLAP:
+      g_value_set_double (value, self->overlap);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_hue_saturation_config_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpHueSaturationConfig *self = GIMP_HUE_SATURATION_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_RANGE:
+      self->range = g_value_get_enum (value);
+      g_object_notify (object, "hue");
+      g_object_notify (object, "saturation");
+      g_object_notify (object, "lightness");
+      break;
+
+    case PROP_HUE:
+      self->hue[self->range] = g_value_get_double (value);
+      break;
+
+    case PROP_SATURATION:
+      self->saturation[self->range] = g_value_get_double (value);
+      break;
+
+    case PROP_LIGHTNESS:
+      self->lightness[self->range] = g_value_get_double (value);
+      break;
+
+    case PROP_OVERLAP:
+      self->overlap = g_value_get_double (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_hue_saturation_config_serialize (GimpConfig       *config,
+                                      GimpConfigWriter *writer,
+                                      gpointer          data)
+{
+  GimpHueSaturationConfig *hs_config = GIMP_HUE_SATURATION_CONFIG (config);
+  GimpHueRange             range;
+  GimpHueRange             old_range;
+  gboolean                 success = TRUE;
+
+  if (! gimp_operation_settings_config_serialize_base (config, writer, data))
+    return FALSE;
+
+  old_range = hs_config->range;
+
+  for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++)
+    {
+      hs_config->range = range;
+
+      success = (gimp_config_serialize_property_by_name (config, "range",
+                                                         writer) &&
+                 gimp_config_serialize_property_by_name (config, "hue",
+                                                         writer) &&
+                 gimp_config_serialize_property_by_name (config, "saturation",
+                                                         writer) &&
+                 gimp_config_serialize_property_by_name (config, "lightness",
+                                                         writer));
+
+      if (! success)
+        break;
+    }
+
+  if (success)
+    success = gimp_config_serialize_property_by_name (config, "overlap",
+                                                      writer);
+
+  hs_config->range = old_range;
+
+  return success;
+}
+
+static gboolean
+gimp_hue_saturation_config_deserialize (GimpConfig *config,
+                                        GScanner   *scanner,
+                                        gint        nest_level,
+                                        gpointer    data)
+{
+  GimpHueSaturationConfig *hs_config = GIMP_HUE_SATURATION_CONFIG (config);
+  GimpHueRange             old_range;
+  gboolean                 success = TRUE;
+
+  old_range = hs_config->range;
+
+  success = gimp_config_deserialize_properties (config, scanner, nest_level);
+
+  g_object_set (config, "range", old_range, NULL);
+
+  return success;
+}
+
+static gboolean
+gimp_hue_saturation_config_equal (GimpConfig *a,
+                                  GimpConfig *b)
+{
+  GimpHueSaturationConfig *config_a = GIMP_HUE_SATURATION_CONFIG (a);
+  GimpHueSaturationConfig *config_b = GIMP_HUE_SATURATION_CONFIG (b);
+  GimpHueRange             range;
+
+  if (! gimp_operation_settings_config_equal_base (a, b))
+    return FALSE;
+
+  for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++)
+    {
+      if (config_a->hue[range]        != config_b->hue[range]        ||
+          config_a->saturation[range] != config_b->saturation[range] ||
+          config_a->lightness[range]  != config_b->lightness[range])
+        return FALSE;
+    }
+
+  /* don't compare "range" */
+
+  if (config_a->overlap != config_b->overlap)
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+gimp_hue_saturation_config_reset (GimpConfig *config)
+{
+  GimpHueSaturationConfig *hs_config = GIMP_HUE_SATURATION_CONFIG (config);
+  GimpHueRange             range;
+
+  gimp_operation_settings_config_reset_base (config);
+
+  for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++)
+    {
+      hs_config->range = range;
+      gimp_hue_saturation_config_reset_range (hs_config);
+    }
+
+  gimp_config_reset_property (G_OBJECT (config), "range");
+  gimp_config_reset_property (G_OBJECT (config), "overlap");
+}
+
+static gboolean
+gimp_hue_saturation_config_copy (GimpConfig   *src,
+                                 GimpConfig   *dest,
+                                 GParamFlags   flags)
+{
+  GimpHueSaturationConfig *src_config  = GIMP_HUE_SATURATION_CONFIG (src);
+  GimpHueSaturationConfig *dest_config = GIMP_HUE_SATURATION_CONFIG (dest);
+  GimpHueRange             range;
+
+  if (! gimp_operation_settings_config_copy_base (src, dest, flags))
+    return FALSE;
+
+  for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++)
+    {
+      dest_config->hue[range]        = src_config->hue[range];
+      dest_config->saturation[range] = src_config->saturation[range];
+      dest_config->lightness[range]  = src_config->lightness[range];
+    }
+
+  g_object_notify (G_OBJECT (dest), "hue");
+  g_object_notify (G_OBJECT (dest), "saturation");
+  g_object_notify (G_OBJECT (dest), "lightness");
+
+  dest_config->range   = src_config->range;
+  dest_config->overlap = src_config->overlap;
+
+  g_object_notify (G_OBJECT (dest), "range");
+  g_object_notify (G_OBJECT (dest), "overlap");
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_hue_saturation_config_reset_range (GimpHueSaturationConfig *config)
+{
+  g_return_if_fail (GIMP_IS_HUE_SATURATION_CONFIG (config));
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  gimp_config_reset_property (G_OBJECT (config), "hue");
+  gimp_config_reset_property (G_OBJECT (config), "saturation");
+  gimp_config_reset_property (G_OBJECT (config), "lightness");
+
+  g_object_thaw_notify (G_OBJECT (config));
+}
diff --git a/app/operations/gimphuesaturationconfig.h b/app/operations/gimphuesaturationconfig.h
new file mode 100644
index 0000000..151ac05
--- /dev/null
+++ b/app/operations/gimphuesaturationconfig.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphuesaturationconfig.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HUE_SATURATION_CONFIG_H__
+#define __GIMP_HUE_SATURATION_CONFIG_H__
+
+
+#include "gimpoperationsettings.h"
+
+
+#define GIMP_TYPE_HUE_SATURATION_CONFIG            (gimp_hue_saturation_config_get_type ())
+#define GIMP_HUE_SATURATION_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HUE_SATURATION_CONFIG, GimpHueSaturationConfig))
+#define GIMP_HUE_SATURATION_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_HUE_SATURATION_CONFIG, GimpHueSaturationConfigClass))
+#define GIMP_IS_HUE_SATURATION_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HUE_SATURATION_CONFIG))
+#define GIMP_IS_HUE_SATURATION_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_HUE_SATURATION_CONFIG))
+#define GIMP_HUE_SATURATION_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_HUE_SATURATION_CONFIG, GimpHueSaturationConfigClass))
+
+
+typedef struct _GimpHueSaturationConfigClass GimpHueSaturationConfigClass;
+
+struct _GimpHueSaturationConfig
+{
+  GimpOperationSettings  parent_instance;
+
+  GimpHueRange           range;
+
+  gdouble                hue[7];
+  gdouble                saturation[7];
+  gdouble                lightness[7];
+
+  gdouble                overlap;
+};
+
+struct _GimpHueSaturationConfigClass
+{
+  GimpOperationSettingsClass  parent_class;
+};
+
+
+GType   gimp_hue_saturation_config_get_type    (void) G_GNUC_CONST;
+
+void    gimp_hue_saturation_config_reset_range (GimpHueSaturationConfig *config);
+
+
+#endif /* __GIMP_HUE_SATURATION_CONFIG_H__ */
diff --git a/app/operations/gimplevelsconfig.c b/app/operations/gimplevelsconfig.c
new file mode 100644
index 0000000..df5d349
--- /dev/null
+++ b/app/operations/gimplevelsconfig.c
@@ -0,0 +1,964 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplevelsconfig.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpcurve.h"
+#include "core/gimphistogram.h"
+
+#include "gimpcurvesconfig.h"
+#include "gimplevelsconfig.h"
+#include "gimpoperationlevels.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LINEAR,
+  PROP_CHANNEL,
+  PROP_LOW_INPUT,
+  PROP_HIGH_INPUT,
+  PROP_CLAMP_INPUT,
+  PROP_GAMMA,
+  PROP_LOW_OUTPUT,
+  PROP_HIGH_OUTPUT,
+  PROP_CLAMP_OUTPUT
+};
+
+
+static void     gimp_levels_config_iface_init   (GimpConfigInterface *iface);
+
+static void     gimp_levels_config_get_property (GObject          *object,
+                                                 guint             property_id,
+                                                 GValue           *value,
+                                                 GParamSpec       *pspec);
+static void     gimp_levels_config_set_property (GObject          *object,
+                                                 guint             property_id,
+                                                 const GValue     *value,
+                                                 GParamSpec       *pspec);
+
+static gboolean gimp_levels_config_serialize    (GimpConfig       *config,
+                                                 GimpConfigWriter *writer,
+                                                 gpointer          data);
+static gboolean gimp_levels_config_deserialize  (GimpConfig       *config,
+                                                 GScanner         *scanner,
+                                                 gint              nest_level,
+                                                 gpointer          data);
+static gboolean gimp_levels_config_equal        (GimpConfig       *a,
+                                                 GimpConfig       *b);
+static void     gimp_levels_config_reset        (GimpConfig       *config);
+static gboolean gimp_levels_config_copy         (GimpConfig       *src,
+                                                 GimpConfig       *dest,
+                                                 GParamFlags       flags);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpLevelsConfig, gimp_levels_config,
+                         GIMP_TYPE_OPERATION_SETTINGS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_levels_config_iface_init))
+
+#define parent_class gimp_levels_config_parent_class
+
+
+static void
+gimp_levels_config_class_init (GimpLevelsConfigClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->set_property        = gimp_levels_config_set_property;
+  object_class->get_property        = gimp_levels_config_get_property;
+
+  viewable_class->default_icon_name = "gimp-tool-levels";
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LINEAR,
+                            "linear",
+                            _("Linear"),
+                            _("Work on linear RGB"),
+                            FALSE, 0);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CHANNEL,
+                         "channel",
+                         _("Channel"),
+                         _("The affected channel"),
+                         GIMP_TYPE_HISTOGRAM_CHANNEL,
+                         GIMP_HISTOGRAM_VALUE, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LOW_INPUT,
+                           "low-input",
+                           _("Low Input"),
+                           _("Low Input"),
+                           0.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HIGH_INPUT,
+                           "high-input",
+                           _("High Input"),
+                           _("High Input"),
+                           0.0, 1.0, 1.0, 0);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CLAMP_INPUT,
+                           "clamp-input",
+                           _("Clamp Input"),
+                           _("Clamp input values before applying output mapping."),
+                            FALSE, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_GAMMA,
+                           "gamma",
+                           _("Gamma"),
+                           _("Gamma"),
+                           0.1, 10.0, 1.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LOW_OUTPUT,
+                           "low-output",
+                           _("Low Output"),
+                           _("Low Output"),
+                           0.0, 1.0, 0.0, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HIGH_OUTPUT,
+                           "high-output",
+                           _("High Output"),
+                           _("High Output"),
+                           0.0, 1.0, 1.0, 0);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CLAMP_OUTPUT,
+                           "clamp-output",
+                           _("Clamp Output"),
+                           _("Clamp final output values."),
+                            FALSE, 0);
+}
+
+static void
+gimp_levels_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_levels_config_serialize;
+  iface->deserialize = gimp_levels_config_deserialize;
+  iface->equal       = gimp_levels_config_equal;
+  iface->reset       = gimp_levels_config_reset;
+  iface->copy        = gimp_levels_config_copy;
+}
+
+static void
+gimp_levels_config_init (GimpLevelsConfig *self)
+{
+  gimp_config_reset (GIMP_CONFIG (self));
+}
+
+static void
+gimp_levels_config_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpLevelsConfig *self = GIMP_LEVELS_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_LINEAR:
+      g_value_set_boolean (value, self->linear);
+      break;
+
+    case PROP_CHANNEL:
+      g_value_set_enum (value, self->channel);
+      break;
+
+    case PROP_LOW_INPUT:
+      g_value_set_double (value, self->low_input[self->channel]);
+      break;
+
+    case PROP_HIGH_INPUT:
+      g_value_set_double (value, self->high_input[self->channel]);
+      break;
+
+    case PROP_CLAMP_INPUT:
+      g_value_set_boolean (value, self->clamp_input);
+      break;
+
+    case PROP_GAMMA:
+      g_value_set_double (value, self->gamma[self->channel]);
+      break;
+
+    case PROP_LOW_OUTPUT:
+      g_value_set_double (value, self->low_output[self->channel]);
+      break;
+
+    case PROP_HIGH_OUTPUT:
+      g_value_set_double (value, self->high_output[self->channel]);
+      break;
+
+    case PROP_CLAMP_OUTPUT:
+      g_value_set_boolean (value, self->clamp_output);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_levels_config_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpLevelsConfig *self = GIMP_LEVELS_CONFIG (object);
+
+  switch (property_id)
+    {
+    case PROP_LINEAR:
+      self->linear = g_value_get_boolean (value);
+      break;
+
+    case PROP_CHANNEL:
+      self->channel = g_value_get_enum (value);
+      g_object_notify (object, "low-input");
+      g_object_notify (object, "high-input");
+      g_object_notify (object, "gamma");
+      g_object_notify (object, "low-output");
+      g_object_notify (object, "high-output");
+      break;
+
+    case PROP_LOW_INPUT:
+      self->low_input[self->channel] = g_value_get_double (value);
+      break;
+
+    case PROP_HIGH_INPUT:
+      self->high_input[self->channel] = g_value_get_double (value);
+      break;
+
+    case PROP_CLAMP_INPUT:
+      self->clamp_input = g_value_get_boolean (value);
+      break;
+
+    case PROP_GAMMA:
+      self->gamma[self->channel] = g_value_get_double (value);
+      break;
+
+    case PROP_LOW_OUTPUT:
+      self->low_output[self->channel] = g_value_get_double (value);
+      break;
+
+    case PROP_HIGH_OUTPUT:
+      self->high_output[self->channel] = g_value_get_double (value);
+      break;
+
+    case PROP_CLAMP_OUTPUT:
+      self->clamp_output = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_levels_config_serialize (GimpConfig       *config,
+                              GimpConfigWriter *writer,
+                              gpointer          data)
+{
+  GimpLevelsConfig     *l_config = GIMP_LEVELS_CONFIG (config);
+  GimpHistogramChannel  channel;
+  GimpHistogramChannel  old_channel;
+  gboolean              success = TRUE;
+
+  if (! gimp_operation_settings_config_serialize_base (config, writer, data)    ||
+      ! gimp_config_serialize_property_by_name (config, "linear",       writer) ||
+      ! gimp_config_serialize_property_by_name (config, "clamp-input",  writer) ||
+      ! gimp_config_serialize_property_by_name (config, "clamp-output", writer))
+    return FALSE;
+
+  old_channel = l_config->channel;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      l_config->channel = channel;
+
+      /*  serialize the channel properties manually (not using
+       *  gimp_config_serialize_properties()), so the parent class'
+       *  properties don't end up in the config file one per channel.
+       *  See bug #700653.
+       */
+      success =
+        (gimp_config_serialize_property_by_name (config, "channel",     writer) &&
+         gimp_config_serialize_property_by_name (config, "low-input",   writer) &&
+         gimp_config_serialize_property_by_name (config, "high-input",  writer) &&
+         gimp_config_serialize_property_by_name (config, "gamma",       writer) &&
+         gimp_config_serialize_property_by_name (config, "low-output",  writer) &&
+         gimp_config_serialize_property_by_name (config, "high-output", writer));
+
+      if (! success)
+        break;
+    }
+
+  l_config->channel = old_channel;
+
+  return success;
+}
+
+static gboolean
+gimp_levels_config_deserialize (GimpConfig *config,
+                                GScanner   *scanner,
+                                gint        nest_level,
+                                gpointer    data)
+{
+  GimpLevelsConfig     *l_config = GIMP_LEVELS_CONFIG (config);
+  GimpHistogramChannel  old_channel;
+  gboolean              success = TRUE;
+
+  old_channel = l_config->channel;
+
+  success = gimp_config_deserialize_properties (config, scanner, nest_level);
+
+  g_object_set (config, "channel", old_channel, NULL);
+
+  return success;
+}
+
+static gboolean
+gimp_levels_config_equal (GimpConfig *a,
+                          GimpConfig *b)
+{
+  GimpLevelsConfig     *config_a = GIMP_LEVELS_CONFIG (a);
+  GimpLevelsConfig     *config_b = GIMP_LEVELS_CONFIG (b);
+  GimpHistogramChannel  channel;
+
+  if (! gimp_operation_settings_config_equal_base (a, b) ||
+      config_a->linear       != config_b->linear         ||
+      config_a->clamp_input  != config_b->clamp_input    ||
+      config_a->clamp_output != config_b->clamp_output)
+    return FALSE;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      if (config_a->gamma[channel]       != config_b->gamma[channel]      ||
+          config_a->low_input[channel]   != config_b->low_input[channel]  ||
+          config_a->high_input[channel]  != config_b->high_input[channel] ||
+          config_a->low_output[channel]  != config_b->low_output[channel] ||
+          config_a->high_output[channel] != config_b->high_output[channel])
+        return FALSE;
+    }
+
+  /* don't compare "channel" */
+
+  return TRUE;
+}
+
+static void
+gimp_levels_config_reset (GimpConfig *config)
+{
+  GimpLevelsConfig     *l_config = GIMP_LEVELS_CONFIG (config);
+  GimpHistogramChannel  channel;
+
+  gimp_operation_settings_config_reset_base (config);
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      l_config->channel = channel;
+      gimp_levels_config_reset_channel (l_config);
+    }
+
+  gimp_config_reset_property (G_OBJECT (config), "linear");
+  gimp_config_reset_property (G_OBJECT (config), "channel");
+  gimp_config_reset_property (G_OBJECT (config), "clamp-input");
+  gimp_config_reset_property (G_OBJECT (config), "clamp_output");
+}
+
+static gboolean
+gimp_levels_config_copy (GimpConfig  *src,
+                         GimpConfig  *dest,
+                         GParamFlags  flags)
+{
+  GimpLevelsConfig     *src_config  = GIMP_LEVELS_CONFIG (src);
+  GimpLevelsConfig     *dest_config = GIMP_LEVELS_CONFIG (dest);
+  GimpHistogramChannel  channel;
+
+  if (! gimp_operation_settings_config_copy_base (src, dest, flags))
+    return FALSE;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      dest_config->gamma[channel]       = src_config->gamma[channel];
+      dest_config->low_input[channel]   = src_config->low_input[channel];
+      dest_config->high_input[channel]  = src_config->high_input[channel];
+      dest_config->low_output[channel]  = src_config->low_output[channel];
+      dest_config->high_output[channel] = src_config->high_output[channel];
+    }
+
+  g_object_notify (G_OBJECT (dest), "gamma");
+  g_object_notify (G_OBJECT (dest), "low-input");
+  g_object_notify (G_OBJECT (dest), "high-input");
+  g_object_notify (G_OBJECT (dest), "low-output");
+  g_object_notify (G_OBJECT (dest), "high-output");
+
+  dest_config->linear       = src_config->linear;
+  dest_config->channel      = src_config->channel;
+  dest_config->clamp_input  = src_config->clamp_input;
+  dest_config->clamp_output = src_config->clamp_output;
+
+  g_object_notify (G_OBJECT (dest), "linear");
+  g_object_notify (G_OBJECT (dest), "channel");
+  g_object_notify (G_OBJECT (dest), "clamp-input");
+  g_object_notify (G_OBJECT (dest), "clamp-output");
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_levels_config_reset_channel (GimpLevelsConfig *config)
+{
+  g_return_if_fail (GIMP_IS_LEVELS_CONFIG (config));
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  gimp_config_reset_property (G_OBJECT (config), "gamma");
+  gimp_config_reset_property (G_OBJECT (config), "low-input");
+  gimp_config_reset_property (G_OBJECT (config), "high-input");
+  gimp_config_reset_property (G_OBJECT (config), "low-output");
+  gimp_config_reset_property (G_OBJECT (config), "high-output");
+
+  g_object_thaw_notify (G_OBJECT (config));
+}
+
+void
+gimp_levels_config_stretch (GimpLevelsConfig *config,
+                            GimpHistogram    *histogram,
+                            gboolean          is_color)
+{
+  g_return_if_fail (GIMP_IS_LEVELS_CONFIG (config));
+  g_return_if_fail (histogram != NULL);
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  if (is_color)
+    {
+      GimpHistogramChannel channel;
+
+      /*  Set the overall value to defaults  */
+      channel = config->channel;
+      config->channel = GIMP_HISTOGRAM_VALUE;
+      gimp_levels_config_reset_channel (config);
+      config->channel = channel;
+
+      for (channel = GIMP_HISTOGRAM_RED;
+           channel <= GIMP_HISTOGRAM_BLUE;
+           channel++)
+        {
+          gimp_levels_config_stretch_channel (config, histogram, channel);
+        }
+    }
+  else
+    {
+      gimp_levels_config_stretch_channel (config, histogram,
+                                          GIMP_HISTOGRAM_VALUE);
+    }
+
+  g_object_thaw_notify (G_OBJECT (config));
+}
+
+void
+gimp_levels_config_stretch_channel (GimpLevelsConfig     *config,
+                                    GimpHistogram        *histogram,
+                                    GimpHistogramChannel  channel)
+{
+  gdouble count;
+  gdouble bias = 0.006;
+  gint    n_bins;
+  gint    i;
+
+  g_return_if_fail (GIMP_IS_LEVELS_CONFIG (config));
+  g_return_if_fail (histogram != NULL);
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  config->gamma[channel]       = 1.0;
+  config->low_output[channel]  = 0.0;
+  config->high_output[channel] = 1.0;
+
+  n_bins = gimp_histogram_n_bins (histogram);
+  count  = gimp_histogram_get_count (histogram, channel, 0, n_bins - 1);
+
+  if (count == 0.0)
+    {
+      config->low_input[channel]  = 0.0;
+      config->high_input[channel] = 0.0;
+    }
+  else
+    {
+      gdouble new_count;
+      gdouble percentage;
+      gdouble next_percentage;
+
+      /*  Set the low input  */
+      new_count = 0.0;
+
+      for (i = 0; i < (n_bins - 1); i++)
+        {
+          new_count += gimp_histogram_get_value (histogram, channel, i);
+          percentage = new_count / count;
+          next_percentage = (new_count +
+                             gimp_histogram_get_value (histogram,
+                                                       channel,
+                                                       i + 1)) / count;
+
+          if (fabs (percentage - bias) < fabs (next_percentage - bias))
+            {
+              config->low_input[channel] = (gdouble) (i + 1) / (n_bins - 1);
+              break;
+            }
+        }
+
+      /*  Set the high input  */
+      new_count = 0.0;
+
+      for (i = (n_bins - 1); i > 0; i--)
+        {
+          new_count += gimp_histogram_get_value (histogram, channel, i);
+          percentage = new_count / count;
+          next_percentage = (new_count +
+                             gimp_histogram_get_value (histogram,
+                                                       channel,
+                                                       i - 1)) / count;
+
+          if (fabs (percentage - bias) < fabs (next_percentage - bias))
+            {
+              config->high_input[channel] = (gdouble) (i - 1) / (n_bins - 1);
+              break;
+            }
+        }
+    }
+
+  g_object_notify (G_OBJECT (config), "gamma");
+  g_object_notify (G_OBJECT (config), "low-input");
+  g_object_notify (G_OBJECT (config), "high-input");
+  g_object_notify (G_OBJECT (config), "low-output");
+  g_object_notify (G_OBJECT (config), "high-output");
+
+  g_object_thaw_notify (G_OBJECT (config));
+}
+
+static gdouble
+gimp_levels_config_input_from_color (GimpHistogramChannel  channel,
+                                     const GimpRGB        *color)
+{
+  switch (channel)
+    {
+    case GIMP_HISTOGRAM_VALUE:
+      return MAX (MAX (color->r, color->g), color->b);
+
+    case GIMP_HISTOGRAM_RED:
+      return color->r;
+
+    case GIMP_HISTOGRAM_GREEN:
+      return color->g;
+
+    case GIMP_HISTOGRAM_BLUE:
+      return color->b;
+
+    case GIMP_HISTOGRAM_ALPHA:
+      return color->a;
+
+    case GIMP_HISTOGRAM_RGB:
+      return MIN (MIN (color->r, color->g), color->b);
+
+    case GIMP_HISTOGRAM_LUMINANCE:
+      return GIMP_RGB_LUMINANCE (color->r, color->g, color->b);
+    }
+
+  return 0.0;
+}
+
+void
+gimp_levels_config_adjust_by_colors (GimpLevelsConfig     *config,
+                                     GimpHistogramChannel  channel,
+                                     const GimpRGB        *black,
+                                     const GimpRGB        *gray,
+                                     const GimpRGB        *white)
+{
+  g_return_if_fail (GIMP_IS_LEVELS_CONFIG (config));
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  if (black)
+    {
+      config->low_input[channel] = gimp_levels_config_input_from_color (channel,
+                                                                        black);
+      g_object_notify (G_OBJECT (config), "low-input");
+    }
+
+
+  if (white)
+    {
+      config->high_input[channel] = gimp_levels_config_input_from_color (channel,
+                                                                         white);
+      g_object_notify (G_OBJECT (config), "high-input");
+    }
+
+  if (gray)
+    {
+      gdouble input;
+      gdouble range;
+      gdouble inten;
+      gdouble out_light;
+      gdouble lightness;
+
+      /* Calculate lightness value */
+      lightness = GIMP_RGB_LUMINANCE (gray->r, gray->g, gray->b);
+
+      input = gimp_levels_config_input_from_color (channel, gray);
+
+      range = config->high_input[channel] - config->low_input[channel];
+      if (range <= 0)
+        goto out;
+
+      input -= config->low_input[channel];
+      if (input < 0)
+        goto out;
+
+      /* Normalize input and lightness */
+      inten = input / range;
+      out_light = lightness / range;
+
+      /* See bug 622054: picking pure black or white as gamma doesn't
+       * work. But we cannot compare to 0.0 or 1.0 because cpus and
+       * compilers are shit. If you try to check out_light using
+       * printf() it will give exact 0.0 or 1.0 anyway, probably
+       * because the generated code is different and out_light doesn't
+       * live in a register. That must be why the cpu/compiler mafia
+       * invented epsilon and defined this shit to be the programmer's
+       * responsibility.
+       */
+      if (out_light <= 0.0001 || out_light >= 0.9999)
+        goto out;
+
+      /* Map selected color to corresponding lightness */
+      config->gamma[channel] = log (inten) / log (out_light);
+      config->gamma[channel] = CLAMP (config->gamma[channel], 0.1, 10.0);
+      g_object_notify (G_OBJECT (config), "gamma");
+    }
+
+ out:
+  g_object_thaw_notify (G_OBJECT (config));
+}
+
+GimpCurvesConfig *
+gimp_levels_config_to_curves_config (GimpLevelsConfig *config)
+{
+  GimpCurvesConfig     *curves;
+  GimpHistogramChannel  channel;
+
+  g_return_val_if_fail (GIMP_IS_LEVELS_CONFIG (config), NULL);
+
+  curves = g_object_new (GIMP_TYPE_CURVES_CONFIG, NULL);
+
+  gimp_operation_settings_config_copy_base (GIMP_CONFIG (config),
+                                            GIMP_CONFIG (curves),
+                                            0);
+
+  curves->linear = config->linear;
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      GimpCurve  *curve    = curves->curve[channel];
+      static const gint n  = 8;
+      gdouble     gamma    = config->gamma[channel];
+      gdouble     delta_in;
+      gdouble     delta_out;
+      gdouble     x, y;
+
+      /* clear the points set by default */
+      gimp_curve_clear_points (curve);
+
+      delta_in  = config->high_input[channel] - config->low_input[channel];
+      delta_out = config->high_output[channel] - config->low_output[channel];
+
+      x = config->low_input[channel];
+      y = config->low_output[channel];
+
+      gimp_curve_add_point (curve, x, y);
+
+      if (delta_out != 0 && gamma != 1.0)
+        {
+          /* The Levels tool performs gamma adjustment, which is a
+           * power law, while the Curves tool uses cubic Bézier
+           * curves. Here we try to approximate this gamma adjustment
+           * with a Bézier curve with 5 control points. Two of them
+           * must be (low_input, low_output) and (high_input,
+           * high_output), so we need to add 3 more control points in
+           * the middle.
+           */
+          gint i;
+
+          if (gamma > 1)
+            {
+              /* Case no. 1: γ > 1
+               *
+               * The curve should look like a horizontal
+               * parabola. Since its curvature is greatest when x is
+               * small, we add more control points there, so the
+               * approximation is more accurate. I decided to set the
+               * length of the consecutive segments to x₀, γ⋅x₀, γ²⋅x₀
+               * and γ³⋅x₀ and I saw that the curves looked
+               * good. Still, this is completely arbitrary.
+               */
+              gdouble dx = 0;
+              gdouble x0;
+
+              for (i = 0; i < n; ++i)
+                dx = dx * gamma + 1;
+              x0 = delta_in / dx;
+
+              dx = 0;
+              for (i = 1; i < n; ++i)
+                {
+                  dx = dx * gamma + x0;
+                  x = config->low_input[channel] + dx;
+                  y = config->low_output[channel] + delta_out *
+                      gimp_operation_levels_map_input (config, channel, x);
+                  gimp_curve_add_point (curve, x, y);
+                }
+            }
+          else
+            {
+              /* Case no. 2: γ < 1
+               *
+               * The curve is the same as the one in case no. 1,
+               * observed through a reflexion along the y = x axis. So
+               * if we invert γ and swap the x and y axes we can use
+               * the same method as in case no. 1.
+               */
+              GimpLevelsConfig *config_inv;
+              gdouble           dy = 0;
+              gdouble           y0;
+              const gdouble     gamma_inv = 1 / gamma;
+
+              config_inv = gimp_config_duplicate (GIMP_CONFIG (config));
+
+              config_inv->gamma[channel]       = gamma_inv;
+              config_inv->low_input[channel]   = config->low_output[channel];
+              config_inv->low_output[channel]  = config->low_input[channel];
+              config_inv->high_input[channel]  = config->high_output[channel];
+              config_inv->high_output[channel] = config->high_input[channel];
+
+              for (i = 0; i < n; ++i)
+                dy = dy * gamma_inv + 1;
+              y0 = delta_out / dy;
+
+              dy = 0;
+              for (i = 1; i < n; ++i)
+                {
+                  dy = dy * gamma_inv + y0;
+                  y = config->low_output[channel] + dy;
+                  x = config->low_input[channel] + delta_in *
+                      gimp_operation_levels_map_input (config_inv, channel, y);
+                  gimp_curve_add_point (curve, x, y);
+                }
+
+              g_object_unref (config_inv);
+            }
+        }
+
+      x = config->high_input[channel];
+      y = config->high_output[channel];
+
+      gimp_curve_add_point (curve, x, y);
+    }
+
+  return curves;
+}
+
+gboolean
+gimp_levels_config_load_cruft (GimpLevelsConfig  *config,
+                               GInputStream      *input,
+                               GError           **error)
+{
+  GDataInputStream *data_input;
+  gint              low_input[5];
+  gint              high_input[5];
+  gint              low_output[5];
+  gint              high_output[5];
+  gdouble           gamma[5];
+  gchar            *line;
+  gsize             line_len;
+  gint              i;
+
+  g_return_val_if_fail (GIMP_IS_LEVELS_CONFIG (config), FALSE);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  data_input = g_data_input_stream_new (input);
+
+  line_len = 64;
+  line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                  NULL, error);
+  if (! line)
+    return FALSE;
+
+  if (strcmp (line, "# GIMP Levels File") != 0)
+    {
+      g_set_error_literal (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+                           _("not a GIMP Levels file"));
+      g_object_unref (data_input);
+      g_free (line);
+      return FALSE;
+    }
+
+  g_free (line);
+
+  for (i = 0; i < 5; i++)
+    {
+      gchar  float_buf[32];
+      gchar *endp;
+      gint   fields;
+
+      line_len = 64;
+      line = gimp_data_input_stream_read_line_always (data_input, &line_len,
+                                                      NULL, error);
+      if (! line)
+        {
+          g_object_unref (data_input);
+          return FALSE;
+        }
+
+      fields = sscanf (line, "%d %d %d %d %31s",
+                       &low_input[i],
+                       &high_input[i],
+                       &low_output[i],
+                       &high_output[i],
+                       float_buf);
+
+      g_free (line);
+
+      if (fields != 5)
+        goto error;
+
+      gamma[i] = g_ascii_strtod (float_buf, &endp);
+
+      if (endp == float_buf || errno == ERANGE)
+        goto error;
+    }
+
+  g_object_unref (data_input);
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  for (i = 0; i < 5; i++)
+    {
+      config->low_input[i]   = low_input[i]   / 255.0;
+      config->high_input[i]  = high_input[i]  / 255.0;
+      config->gamma[i]       = gamma[i];
+      config->low_output[i]  = low_output[i]  / 255.0;
+      config->high_output[i] = high_output[i] / 255.0;
+    }
+
+  config->linear       = FALSE;
+  config->clamp_input  = TRUE;
+  config->clamp_output = TRUE;
+
+  g_object_notify (G_OBJECT (config), "linear");
+  g_object_notify (G_OBJECT (config), "low-input");
+  g_object_notify (G_OBJECT (config), "high-input");
+  g_object_notify (G_OBJECT (config), "clamp-input");
+  g_object_notify (G_OBJECT (config), "gamma");
+  g_object_notify (G_OBJECT (config), "low-output");
+  g_object_notify (G_OBJECT (config), "high-output");
+  g_object_notify (G_OBJECT (config), "clamp-output");
+
+  g_object_thaw_notify (G_OBJECT (config));
+
+  return TRUE;
+
+ error:
+  g_object_unref (data_input);
+
+  g_set_error_literal (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+                       _("parse error"));
+  return FALSE;
+}
+
+gboolean
+gimp_levels_config_save_cruft (GimpLevelsConfig  *config,
+                               GOutputStream     *output,
+                               GError           **error)
+{
+  GString *string;
+  gint     i;
+
+  g_return_val_if_fail (GIMP_IS_LEVELS_CONFIG (config), FALSE);
+  g_return_val_if_fail (G_IS_OUTPUT_STREAM (output), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  string = g_string_new ("# GIMP Levels File\n");
+
+  for (i = 0; i < 5; i++)
+    {
+      gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
+
+      g_string_append_printf (string,
+                              "%d %d %d %d %s\n",
+                              (gint) (config->low_input[i]   * 255.999),
+                              (gint) (config->high_input[i]  * 255.999),
+                              (gint) (config->low_output[i]  * 255.999),
+                              (gint) (config->high_output[i] * 255.999),
+                              g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE,
+                                              config->gamma[i]));
+    }
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, error))
+    {
+      g_prefix_error (error, _("Writing levels file failed: "));
+      g_string_free (string, TRUE);
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+
+  return TRUE;
+}
diff --git a/app/operations/gimplevelsconfig.h b/app/operations/gimplevelsconfig.h
new file mode 100644
index 0000000..2e7569c
--- /dev/null
+++ b/app/operations/gimplevelsconfig.h
@@ -0,0 +1,92 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplevelsconfig.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LEVELS_CONFIG_H__
+#define __GIMP_LEVELS_CONFIG_H__
+
+
+#include "gimpoperationsettings.h"
+
+
+#define GIMP_TYPE_LEVELS_CONFIG            (gimp_levels_config_get_type ())
+#define GIMP_LEVELS_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LEVELS_CONFIG, GimpLevelsConfig))
+#define GIMP_LEVELS_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_LEVELS_CONFIG, GimpLevelsConfigClass))
+#define GIMP_IS_LEVELS_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LEVELS_CONFIG))
+#define GIMP_IS_LEVELS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_LEVELS_CONFIG))
+#define GIMP_LEVELS_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_LEVELS_CONFIG, GimpLevelsConfigClass))
+
+
+typedef struct _GimpLevelsConfigClass GimpLevelsConfigClass;
+
+struct _GimpLevelsConfig
+{
+  GimpOperationSettings  parent_instance;
+
+  gboolean               linear;
+
+  GimpHistogramChannel   channel;
+
+  gdouble                low_input[5];
+  gdouble                high_input[5];
+
+  gboolean               clamp_input;
+
+  gdouble                gamma[5];
+
+  gdouble                low_output[5];
+  gdouble                high_output[5];
+
+  gboolean               clamp_output;
+};
+
+struct _GimpLevelsConfigClass
+{
+  GimpOperationSettingsClass  parent_class;
+};
+
+
+GType      gimp_levels_config_get_type         (void) G_GNUC_CONST;
+
+void       gimp_levels_config_reset_channel    (GimpLevelsConfig      *config);
+
+void       gimp_levels_config_stretch          (GimpLevelsConfig      *config,
+                                                GimpHistogram         *histogram,
+                                                gboolean               is_color);
+void       gimp_levels_config_stretch_channel  (GimpLevelsConfig      *config,
+                                                GimpHistogram         *histogram,
+                                                GimpHistogramChannel   channel);
+void       gimp_levels_config_adjust_by_colors (GimpLevelsConfig      *config,
+                                                GimpHistogramChannel   channel,
+                                                const GimpRGB         *black,
+                                                const GimpRGB         *gray,
+                                                const GimpRGB         *white);
+
+GimpCurvesConfig *
+           gimp_levels_config_to_curves_config (GimpLevelsConfig      *config);
+
+gboolean   gimp_levels_config_load_cruft       (GimpLevelsConfig      *config,
+                                                GInputStream          *input,
+                                                GError               **error);
+gboolean   gimp_levels_config_save_cruft       (GimpLevelsConfig      *config,
+                                                GOutputStream         *output,
+                                                GError               **error);
+
+
+#endif /* __GIMP_LEVELS_CONFIG_H__ */
diff --git a/app/operations/gimpoperationborder.c b/app/operations/gimpoperationborder.c
new file mode 100644
index 0000000..e08481c
--- /dev/null
+++ b/app/operations/gimpoperationborder.c
@@ -0,0 +1,748 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationborder.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationborder.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_RADIUS_X,
+  PROP_RADIUS_Y,
+  PROP_FEATHER,
+  PROP_EDGE_LOCK
+};
+
+
+static void     gimp_operation_border_get_property (GObject      *object,
+                                                    guint         property_id,
+                                                    GValue       *value,
+                                                    GParamSpec   *pspec);
+static void     gimp_operation_border_set_property (GObject      *object,
+                                                    guint         property_id,
+                                                    const GValue *value,
+                                                    GParamSpec   *pspec);
+
+static GeglRectangle
+gimp_operation_border_get_required_for_output (GeglOperation       *self,
+                                               const gchar         *input_pad,
+                                               const GeglRectangle *roi);
+static GeglRectangle
+      gimp_operation_border_get_cached_region (GeglOperation       *self,
+                                               const GeglRectangle *roi);
+static void     gimp_operation_border_prepare (GeglOperation       *operation);
+static gboolean gimp_operation_border_process (GeglOperation       *operation,
+                                               GeglBuffer          *input,
+                                               GeglBuffer          *output,
+                                               const GeglRectangle *roi,
+                                               gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationBorder, gimp_operation_border,
+               GEGL_TYPE_OPERATION_FILTER)
+
+#define parent_class gimp_operation_border_parent_class
+
+
+static void
+gimp_operation_border_class_init (GimpOperationBorderClass *klass)
+{
+  GObjectClass             *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationFilterClass *filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_border_set_property;
+  object_class->get_property   = gimp_operation_border_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:border",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Border operation",
+                                 NULL);
+
+  operation_class->prepare                 = gimp_operation_border_prepare;
+  operation_class->get_required_for_output = gimp_operation_border_get_required_for_output;
+  operation_class->get_cached_region       = gimp_operation_border_get_cached_region;
+  operation_class->threaded                = FALSE;
+
+  filter_class->process                    = gimp_operation_border_process;
+
+  g_object_class_install_property (object_class, PROP_RADIUS_X,
+                                   g_param_spec_int ("radius-x",
+                                                     "Radius X",
+                                                     "Border radius in X diection",
+                                                     1, 2342, 1,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RADIUS_Y,
+                                   g_param_spec_int ("radius-y",
+                                                     "Radius Y",
+                                                     "Border radius in Y diection",
+                                                     1, 2342, 1,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FEATHER,
+                                   g_param_spec_boolean ("feather",
+                                                         "Feather",
+                                                         "Feather the border",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_EDGE_LOCK,
+                                   g_param_spec_boolean ("edge-lock",
+                                                         "Edge Lock",
+                                                         "Shrink from border",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_border_init (GimpOperationBorder *self)
+{
+}
+
+static void
+gimp_operation_border_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+ GimpOperationBorder *self = GIMP_OPERATION_BORDER (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS_X:
+      g_value_set_int (value, self->radius_x);
+      break;
+
+    case PROP_RADIUS_Y:
+      g_value_set_int (value, self->radius_y);
+      break;
+
+    case PROP_FEATHER:
+      g_value_set_boolean (value, self->feather);
+      break;
+
+    case PROP_EDGE_LOCK:
+      g_value_set_boolean (value, self->edge_lock);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_border_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpOperationBorder *self = GIMP_OPERATION_BORDER (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS_X:
+      self->radius_x = g_value_get_int (value);
+      break;
+
+    case PROP_RADIUS_Y:
+      self->radius_y = g_value_get_int (value);
+      break;
+
+    case PROP_FEATHER:
+      self->feather = g_value_get_boolean (value);
+      break;
+
+    case PROP_EDGE_LOCK:
+      self->edge_lock = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_border_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("Y float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("Y float", space));
+}
+
+static GeglRectangle
+gimp_operation_border_get_required_for_output (GeglOperation       *self,
+                                               const gchar         *input_pad,
+                                               const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static GeglRectangle
+gimp_operation_border_get_cached_region (GeglOperation       *self,
+                                         const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static inline void
+rotate_pointers (gfloat  **p,
+                 guint32   n)
+{
+  guint32  i;
+  gfloat  *tmp;
+
+  tmp = p[0];
+
+  for (i = 0; i < n - 1; i++)
+    p[i] = p[i + 1];
+
+  p[i] = tmp;
+}
+
+/* Computes whether pixels in `buf[1]', if they are selected, have neighbouring
+   pixels that are unselected. Put result in `transition'. */
+static void
+compute_transition (gfloat    *transition,
+                    gfloat   **buf,
+                    gint32     width,
+                    gboolean   edge_lock)
+{
+  register gint32 x = 0;
+
+  if (width == 1)
+    {
+      if (buf[1][0] >= 0.5 && (buf[0][0] < 0.5 || buf[2][0] < 0.5))
+        transition[0] = 1.0;
+      else
+        transition[0] = 0.0;
+      return;
+    }
+
+  if (buf[1][0] >= 0.5 && edge_lock)
+    {
+      /* The pixel to the left (outside of the canvas) is considered selected,
+         so we check if there are any unselected pixels in neighbouring pixels
+         _on_ the canvas. */
+      if (buf[0][x] < 0.5 || buf[0][x + 1] < 0.5 ||
+                             buf[1][x + 1] < 0.5 ||
+          buf[2][x] < 0.5 || buf[2][x + 1] < 0.5 )
+        {
+          transition[x] = 1.0;
+        }
+      else
+        {
+          transition[x] = 0.0;
+        }
+    }
+  else if (buf[1][0] >= 0.5 && !edge_lock)
+    {
+      /* We must not care about neighbouring pixels on the image canvas since
+         there always are unselected pixels to the left (which is outside of
+         the image canvas). */
+      transition[x] = 1.0;
+    }
+  else
+    {
+      transition[x] = 0.0;
+    }
+
+  for (x = 1; x < width - 1; x++)
+    {
+      if (buf[1][x] >= 0.5)
+        {
+          if (buf[0][x - 1] < 0.5 || buf[0][x] < 0.5 || buf[0][x + 1] < 0.5 ||
+              buf[1][x - 1] < 0.5 ||                    buf[1][x + 1] < 0.5 ||
+              buf[2][x - 1] < 0.5 || buf[2][x] < 0.5 || buf[2][x + 1] < 0.5)
+            transition[x] = 1.0;
+          else
+            transition[x] = 0.0;
+        }
+      else
+        {
+          transition[x] = 0.0;
+        }
+    }
+
+  if (buf[1][width - 1] >= 0.5 && edge_lock)
+    {
+      /* The pixel to the right (outside of the canvas) is considered selected,
+         so we check if there are any unselected pixels in neighbouring pixels
+         _on_ the canvas. */
+      if ( buf[0][x - 1] < 0.5 || buf[0][x] < 0.5 ||
+           buf[1][x - 1] < 0.5 ||
+           buf[2][x - 1] < 0.5 || buf[2][x] < 0.5)
+        {
+          transition[width - 1] = 1.0;
+        }
+      else
+        {
+          transition[width - 1] = 0.0;
+        }
+    }
+  else if (buf[1][width - 1] >= 0.5 && !edge_lock)
+    {
+      /* We must not care about neighbouring pixels on the image canvas since
+         there always are unselected pixels to the right (which is outside of
+         the image canvas). */
+      transition[width - 1] = 1.0;
+    }
+  else
+    {
+      transition[width - 1] = 0.0;
+    }
+}
+
+static gboolean
+gimp_operation_border_process (GeglOperation       *operation,
+                               GeglBuffer          *input,
+                               GeglBuffer          *output,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  /* This function has no bugs, but if you imagine some you can blame
+   * them on jaycox@gimp.org
+   */
+  GimpOperationBorder *self          = GIMP_OPERATION_BORDER (operation);
+  const Babl          *input_format  = gegl_operation_get_format (operation, "input");
+  const Babl          *output_format = gegl_operation_get_format (operation, "output");
+
+  gint32 i, j, x, y;
+
+  /* A cache used in the algorithm as it works its way down. `buf[1]' is the
+     current row. Thus, at algorithm initialization, `buf[0]' represents the
+     row 'above' the first row of the region. */
+  gfloat  *buf[3];
+
+  /* The resulting selection is calculated row by row, and this buffer holds the
+     output for each individual row, on each iteration. */
+  gfloat  *out;
+
+  /* Keeps track of transitional pixels (pixels that are selected and have
+     unselected neighbouring pixels). */
+  gfloat **transition;
+
+  /* TODO: Figure out role clearly in algorithm. */
+  gint16  *max;
+
+  /* TODO: Figure out role clearly in algorithm. */
+  gfloat **density;
+
+  gint16   last_index;
+
+  /* optimize this case specifically */
+  if (self->radius_x == 1 && self->radius_y == 1)
+    {
+      gfloat *transition;
+      gfloat *source[3];
+
+      for (i = 0; i < 3; i++)
+        source[i] = g_new (gfloat, roi->width);
+
+      transition = g_new (gfloat, roi->width);
+
+      /* With `self->edge_lock', initialize row above image as
+       * selected, otherwise, initialize as unselected.
+       */
+      if (self->edge_lock)
+        {
+          for (i = 0; i < roi->width; i++)
+            source[0][i] = 1.0;
+        }
+      else
+        {
+          memset (source[0], 0, roi->width * sizeof (gfloat));
+        }
+
+      gegl_buffer_get (input,
+                       GEGL_RECTANGLE (roi->x, roi->y + 0,
+                                       roi->width, 1),
+                       1.0, input_format, source[1],
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      if (roi->height > 1)
+        gegl_buffer_get (input,
+                         GEGL_RECTANGLE (roi->x, roi->y + 1,
+                                         roi->width, 1),
+                         1.0, input_format, source[2],
+                         GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      else
+        memcpy (source[2], source[1], roi->width * sizeof (gfloat));
+
+      compute_transition (transition, source, roi->width, self->edge_lock);
+      gegl_buffer_set (output,
+                       GEGL_RECTANGLE (roi->x, roi->y,
+                                       roi->width, 1),
+                       0, output_format, transition,
+                       GEGL_AUTO_ROWSTRIDE);
+
+      for (y = 1; y < roi->height; y++)
+        {
+          rotate_pointers (source, 3);
+
+          if (y + 1 < roi->height)
+            {
+              gegl_buffer_get (input,
+                               GEGL_RECTANGLE (roi->x, roi->y + y + 1,
+                                               roi->width, 1),
+                               1.0, input_format, source[2],
+                               GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+            }
+          else
+            {
+              /* Depending on `self->edge_lock', set the row below the
+               * image as either selected or non-selected.
+               */
+              if (self->edge_lock)
+                {
+                  for (i = 0; i < roi->width; i++)
+                    source[2][i] = 1.0;
+                }
+              else
+                {
+                  memset (source[2], 0, roi->width * sizeof (gfloat));
+                }
+            }
+
+          compute_transition (transition, source, roi->width, self->edge_lock);
+          gegl_buffer_set (output,
+                           GEGL_RECTANGLE (roi->x, roi->y + y,
+                                           roi->width, 1),
+                           0, output_format, transition,
+                           GEGL_AUTO_ROWSTRIDE);
+        }
+
+      for (i = 0; i < 3; i++)
+        g_free (source[i]);
+
+      g_free (transition);
+
+      /* Finished handling the radius = 1 special case, return here. */
+      return TRUE;
+    }
+
+  max = g_new (gint16, roi->width + 2 * self->radius_x);
+
+  for (i = 0; i < (roi->width + 2 * self->radius_x); i++)
+    max[i] = self->radius_y + 2;
+
+  max += self->radius_x;
+
+  for (i = 0; i < 3; i++)
+    buf[i] = g_new (gfloat, roi->width);
+
+  transition = g_new (gfloat *, self->radius_y + 1);
+
+  for (i = 0; i < self->radius_y + 1; i++)
+    {
+      transition[i] = g_new (gfloat, roi->width + 2 * self->radius_x);
+      memset (transition[i], 0,
+              (roi->width + 2 * self->radius_x) * sizeof (gfloat));
+      transition[i] += self->radius_x;
+    }
+
+  out = g_new (gfloat, roi->width);
+
+  density = g_new (gfloat *, 2 * self->radius_x + 1);
+  density += self->radius_x;
+
+  /* allocate density[][] */
+  for (x = 0; x < (self->radius_x + 1); x++)
+    {
+      density[ x]  = g_new (gfloat, 2 * self->radius_y + 1);
+      density[ x] += self->radius_y;
+      density[-x]  = density[x];
+    }
+
+  /* compute density[][] */
+  for (x = 0; x < (self->radius_x + 1); x++)
+    {
+      gdouble tmpx, tmpy, dist;
+      gfloat  a;
+
+      if (x > 0)
+        tmpx = x - 0.5;
+      else if (x < 0)
+        tmpx = x + 0.5;
+      else
+        tmpx = 0.0;
+
+      for (y = 0; y < (self->radius_y + 1); y++)
+        {
+          if (y > 0)
+            tmpy = y - 0.5;
+          else if (y < 0)
+            tmpy = y + 0.5;
+          else
+            tmpy = 0.0;
+
+          dist = ((tmpy * tmpy) / (self->radius_y * self->radius_y) +
+                  (tmpx * tmpx) / (self->radius_x * self->radius_x));
+
+          if (dist < 1.0)
+            {
+              if (self->feather)
+                a = 1.0 - sqrt (dist);
+              else
+                a = 1.0;
+            }
+          else
+            {
+              a = 0.0;
+            }
+
+          density[ x][ y] = a;
+          density[ x][-y] = a;
+          density[-x][ y] = a;
+          density[-x][-y] = a;
+        }
+    }
+
+  /* Since the algorithm considerers `buf[0]' to be 'over' the row
+   * currently calculated, we must start with `buf[0]' as non-selected
+   * if there is no `self->edge_lock. If there is an
+   * 'self->edge_lock', initialize the first row to 'selected'. Refer
+   * to bug #350009.
+   */
+  if (self->edge_lock)
+    {
+      for (i = 0; i < roi->width; i++)
+        buf[0][i] = 1.0;
+    }
+  else
+    {
+      memset (buf[0], 0, roi->width * sizeof (gfloat));
+    }
+
+  gegl_buffer_get (input,
+                   GEGL_RECTANGLE (roi->x, roi->y + 0,
+                                   roi->width, 1),
+                   1.0, input_format, buf[1],
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  if (roi->height > 1)
+    gegl_buffer_get (input,
+                     GEGL_RECTANGLE (roi->x, roi->y + 1,
+                                     roi->width, 1),
+                     1.0, input_format, buf[2],
+                     GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+  else
+    memcpy (buf[2], buf[1], roi->width * sizeof (gfloat));
+
+  compute_transition (transition[1], buf, roi->width, self->edge_lock);
+
+   /* set up top of image */
+  for (y = 1; y < self->radius_y && y + 1 < roi->height; y++)
+    {
+      rotate_pointers (buf, 3);
+      gegl_buffer_get (input,
+                       GEGL_RECTANGLE (roi->x, roi->y + y + 1,
+                                       roi->width, 1),
+                       1.0, input_format, buf[2],
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      compute_transition (transition[y + 1], buf, roi->width, self->edge_lock);
+    }
+
+  /* set up max[] for top of image */
+  for (x = 0; x < roi->width; x++)
+    {
+      max[x] = -(self->radius_y + 7);
+
+      for (j = 1; j < self->radius_y + 1; j++)
+        if (transition[j][x])
+          {
+            max[x] = j;
+            break;
+          }
+    }
+
+  /* main calculation loop */
+  for (y = 0; y < roi->height; y++)
+    {
+      rotate_pointers (buf, 3);
+      rotate_pointers (transition, self->radius_y + 1);
+
+      if (y < roi->height - (self->radius_y + 1))
+        {
+          gegl_buffer_get (input,
+                           GEGL_RECTANGLE (roi->x,
+                                           roi->y + y + self->radius_y + 1,
+                                           roi->width, 1),
+                           1.0, input_format, buf[2],
+                           GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+          compute_transition (transition[self->radius_y], buf, roi->width, self->edge_lock);
+        }
+      else
+        {
+          if (self->edge_lock)
+            {
+              memcpy (transition[self->radius_y], transition[self->radius_y - 1], roi->width * sizeof (gfloat));
+            }
+          else
+            {
+              /* No edge lock, set everything 'below canvas' as seen
+               * from the algorithm as unselected.
+               */
+              memset (buf[2], 0, roi->width * sizeof (gfloat));
+              compute_transition (transition[self->radius_y], buf, roi->width, self->edge_lock);
+            }
+        }
+
+      /* update max array */
+      for (x = 0; x < roi->width; x++)
+        {
+          if (max[x] < 1)
+            {
+              if (max[x] <= -self->radius_y)
+                {
+                  if (transition[self->radius_y][x])
+                    max[x] = self->radius_y;
+                  else
+                    max[x]--;
+                }
+              else
+                {
+                  if (transition[-max[x]][x])
+                    max[x] = -max[x];
+                  else if (transition[-max[x] + 1][x])
+                    max[x] = -max[x] + 1;
+                  else
+                    max[x]--;
+                }
+            }
+          else
+            {
+              max[x]--;
+            }
+
+          if (max[x] < -self->radius_y - 1)
+            max[x] = -self->radius_y - 1;
+        }
+
+      last_index = 1;
+
+       /* render scan line */
+      for (x = 0 ; x < roi->width; x++)
+        {
+          gfloat last_max;
+
+          last_index--;
+
+          if (last_index >= 0)
+            {
+              last_max = 0.0;
+
+              for (i = self->radius_x; i >= 0; i--)
+                if (max[x + i] <= self->radius_y && max[x + i] >= -self->radius_y &&
+                    density[i][max[x+i]] > last_max)
+                  {
+                    last_max = density[i][max[x + i]];
+                    last_index = i;
+                  }
+
+              out[x] = last_max;
+            }
+          else
+            {
+              last_max = 0.0;
+
+              for (i = self->radius_x; i >= -self->radius_x; i--)
+                if (max[x + i] <= self->radius_y && max[x + i] >= -self->radius_y &&
+                    density[i][max[x + i]] > last_max)
+                  {
+                    last_max = density[i][max[x + i]];
+                    last_index = i;
+                  }
+
+              out[x] = last_max;
+            }
+
+          if (last_max <= 0.0)
+            {
+              for (i = x + 1; i < roi->width; i++)
+                {
+                  if (max[i] >= -self->radius_y)
+                    break;
+                }
+
+              if (i - x > self->radius_x)
+                {
+                  for (; x < i - self->radius_x; x++)
+                    out[x] = 0;
+
+                  x--;
+                }
+
+              last_index = self->radius_x;
+            }
+        }
+
+      gegl_buffer_set (output,
+                       GEGL_RECTANGLE (roi->x, roi->y + y,
+                                       roi->width, 1),
+                       0, output_format, out,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  g_free (out);
+
+  for (i = 0; i < 3; i++)
+    g_free (buf[i]);
+
+  max -= self->radius_x;
+  g_free (max);
+
+  for (i = 0; i < self->radius_y + 1; i++)
+    {
+      transition[i] -= self->radius_x;
+      g_free (transition[i]);
+    }
+
+  g_free (transition);
+
+  for (i = 0; i < self->radius_x + 1 ; i++)
+    {
+      density[i] -= self->radius_y;
+      g_free (density[i]);
+    }
+
+  density -= self->radius_x;
+  g_free (density);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationborder.h b/app/operations/gimpoperationborder.h
new file mode 100644
index 0000000..83eb9fa
--- /dev/null
+++ b/app/operations/gimpoperationborder.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationborder.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_BORDER_H__
+#define __GIMP_OPERATION_BORDER_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_BORDER            (gimp_operation_border_get_type ())
+#define GIMP_OPERATION_BORDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_BORDER, GimpOperationBorder))
+#define GIMP_OPERATION_BORDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_BORDER, GimpOperationBorderClass))
+#define GIMP_IS_OPERATION_BORDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_BORDER))
+#define GIMP_IS_OPERATION_BORDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_BORDER))
+#define GIMP_OPERATION_BORDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BORDER, GimpOperationBorderClass))
+
+
+typedef struct _GimpOperationBorder      GimpOperationBorder;
+typedef struct _GimpOperationBorderClass GimpOperationBorderClass;
+
+struct _GimpOperationBorder
+{
+  GeglOperationFilter  parent_instance;
+
+  gint                 radius_x;
+  gint                 radius_y;
+  gboolean             feather;
+  gboolean             edge_lock;
+};
+
+struct _GimpOperationBorderClass
+{
+  GeglOperationFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_border_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_BORDER_H__ */
diff --git a/app/operations/gimpoperationbrightnesscontrast.c b/app/operations/gimpoperationbrightnesscontrast.c
new file mode 100644
index 0000000..1dd9186
--- /dev/null
+++ b/app/operations/gimpoperationbrightnesscontrast.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationbrightnesscontrast.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpbrightnesscontrastconfig.h"
+#include "gimpoperationbrightnesscontrast.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean gimp_operation_brightness_contrast_process (GeglOperation       *operation,
+                                                            void                *in_buf,
+                                                            void                *out_buf,
+                                                            glong                samples,
+                                                            const GeglRectangle *roi,
+                                                            gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationBrightnessContrast, gimp_operation_brightness_contrast,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_brightness_contrast_parent_class
+
+
+static void
+gimp_operation_brightness_contrast_class_init (GimpOperationBrightnessContrastClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_point_filter_set_property;
+  object_class->get_property   = gimp_operation_point_filter_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:brightness-contrast",
+                                 "categories",  "color",
+                                 "description", _("Adjust brightness and contrast"),
+                                 NULL);
+
+  point_class->process         = gimp_operation_brightness_contrast_process;
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "The config object",
+                                                        GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_brightness_contrast_init (GimpOperationBrightnessContrast *self)
+{
+}
+
+static inline gfloat
+gimp_operation_brightness_contrast_map (gfloat  value,
+                                        gdouble brightness,
+                                        gdouble slant)
+{
+  /* apply brightness */
+  if (brightness < 0.0)
+    value = value * (1.0 + brightness);
+  else
+    value = value + ((1.0 - value) * brightness);
+
+  value = (value - 0.5) * slant + 0.5;
+
+  return value;
+}
+
+static gboolean
+gimp_operation_brightness_contrast_process (GeglOperation       *operation,
+                                            void                *in_buf,
+                                            void                *out_buf,
+                                            glong                samples,
+                                            const GeglRectangle *roi,
+                                            gint                 level)
+{
+  GimpOperationPointFilter     *point  = GIMP_OPERATION_POINT_FILTER (operation);
+  GimpBrightnessContrastConfig *config = GIMP_BRIGHTNESS_CONTRAST_CONFIG (point->config);
+  gfloat                       *src    = in_buf;
+  gfloat                       *dest   = out_buf;
+  gdouble                       brightness;
+  gdouble                       slant;
+
+  if (! config)
+    return FALSE;
+
+  brightness = config->brightness / 2.0;
+  slant = tan ((config->contrast + 1) * G_PI_4);
+
+  while (samples--)
+    {
+      dest[RED] = gimp_operation_brightness_contrast_map (src[RED],
+                                                          brightness,
+                                                          slant);
+      dest[GREEN] = gimp_operation_brightness_contrast_map (src[GREEN],
+                                                            brightness,
+                                                            slant);
+      dest[BLUE] = gimp_operation_brightness_contrast_map (src[BLUE],
+                                                           brightness,
+                                                           slant);
+      dest[ALPHA] = src[ALPHA];
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationbrightnesscontrast.h b/app/operations/gimpoperationbrightnesscontrast.h
new file mode 100644
index 0000000..d93ff20
--- /dev/null
+++ b/app/operations/gimpoperationbrightnesscontrast.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationbrightnesscontrast.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_BRIGHTNESS_CONTRAST_H__
+#define __GIMP_OPERATION_BRIGHTNESS_CONTRAST_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST            (gimp_operation_brightness_contrast_get_type ())
+#define GIMP_OPERATION_BRIGHTNESS_CONTRAST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST, GimpOperationBrightnessContrast))
+#define GIMP_OPERATION_BRIGHTNESS_CONTRAST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST, GimpOperationBrightnessContrastClass))
+#define GIMP_IS_OPERATION_BRIGHTNESS_CONTRAST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST))
+#define GIMP_IS_OPERATION_BRIGHTNESS_CONTRAST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST))
+#define GIMP_OPERATION_BRIGHTNESS_CONTRAST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST, GimpOperationBrightnessContrastClass))
+
+
+typedef struct _GimpOperationBrightnessContrast      GimpOperationBrightnessContrast;
+typedef struct _GimpOperationBrightnessContrastClass GimpOperationBrightnessContrastClass;
+
+struct _GimpOperationBrightnessContrast
+{
+  GimpOperationPointFilter  parent_instance;
+};
+
+struct _GimpOperationBrightnessContrastClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_brightness_contrast_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_BRIGHTNESS_CONTRAST_H__ */
diff --git a/app/operations/gimpoperationbuffersourcevalidate.c b/app/operations/gimpoperationbuffersourcevalidate.c
new file mode 100644
index 0000000..d277653
--- /dev/null
+++ b/app/operations/gimpoperationbuffersourcevalidate.c
@@ -0,0 +1,307 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationbuffersourcevalidate.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "operations-types.h"
+
+#include "gegl/gimptilehandlervalidate.h"
+
+#include "gimpoperationbuffersourcevalidate.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_BUFFER
+};
+
+
+static void           gimp_operation_buffer_source_validate_dispose          (GObject                           *object);
+static void           gimp_operation_buffer_source_validate_get_property     (GObject                           *object,
+                                                                              guint                              property_id,
+                                                                              GValue                            *value,
+                                                                              GParamSpec                        *pspec);
+static void           gimp_operation_buffer_source_validate_set_property     (GObject                           *object,
+                                                                              guint                              property_id,
+                                                                              const GValue                      *value,
+                                                                              GParamSpec                        *pspec);
+
+static GeglRectangle  gimp_operation_buffer_source_validate_get_bounding_box (GeglOperation                     *operation);
+static void           gimp_operation_buffer_source_validate_prepare          (GeglOperation                     *operation);
+static gboolean       gimp_operation_buffer_source_validate_process          (GeglOperation                     *operation,
+                                                                              GeglOperationContext              *context,
+                                                                              const gchar                       *output_pad,
+                                                                              const GeglRectangle               *result,
+                                                                              gint                               level);
+
+static void           gimp_operation_buffer_source_validate_invalidate       (gpointer                           object,
+                                                                              const GeglRectangle               *rect,
+                                                                              GimpOperationBufferSourceValidate *buffer_source_validate);
+
+
+G_DEFINE_TYPE (GimpOperationBufferSourceValidate, gimp_operation_buffer_source_validate,
+               GEGL_TYPE_OPERATION_SOURCE)
+
+#define parent_class gimp_operation_buffer_source_validate_parent_class
+
+
+static void
+gimp_operation_buffer_source_validate_class_init (GimpOperationBufferSourceValidateClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+
+  object_class->dispose             = gimp_operation_buffer_source_validate_dispose;
+  object_class->set_property        = gimp_operation_buffer_source_validate_set_property;
+  object_class->get_property        = gimp_operation_buffer_source_validate_get_property;
+
+  operation_class->get_bounding_box = gimp_operation_buffer_source_validate_get_bounding_box;
+  operation_class->prepare          = gimp_operation_buffer_source_validate_prepare;
+  operation_class->process          = gimp_operation_buffer_source_validate_process;
+
+  operation_class->threaded         = FALSE;
+  operation_class->cache_policy     = GEGL_CACHE_POLICY_NEVER;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:buffer-source-validate",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Buffer-Source Validate operation",
+                                 NULL);
+
+  g_object_class_install_property (object_class, PROP_BUFFER,
+                                   g_param_spec_object ("buffer",
+                                                        "Buffer",
+                                                        "Input buffer",
+                                                        GEGL_TYPE_BUFFER,
+                                                        G_PARAM_READWRITE));
+}
+
+static void
+gimp_operation_buffer_source_validate_init (GimpOperationBufferSourceValidate *self)
+{
+}
+
+static void
+gimp_operation_buffer_source_validate_dispose (GObject *object)
+{
+  GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (object);
+
+  if (buffer_source_validate->buffer)
+    {
+      GimpTileHandlerValidate *validate_handler;
+
+      validate_handler = gimp_tile_handler_validate_get_assigned (
+        buffer_source_validate->buffer);
+
+      if (validate_handler)
+        {
+          g_signal_connect (
+            validate_handler,
+            "invalidated",
+            G_CALLBACK (gimp_operation_buffer_source_validate_invalidate),
+            buffer_source_validate);
+        }
+
+      g_signal_handlers_disconnect_by_func (
+        buffer_source_validate->buffer,
+        gimp_operation_buffer_source_validate_invalidate,
+        buffer_source_validate);
+
+      g_clear_object (&buffer_source_validate->buffer);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_operation_buffer_source_validate_get_property (GObject    *object,
+                                                    guint       property_id,
+                                                    GValue     *value,
+                                                    GParamSpec *pspec)
+{
+  GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      g_value_set_object (value, buffer_source_validate->buffer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_buffer_source_validate_set_property (GObject      *object,
+                                                    guint         property_id,
+                                                    const GValue *value,
+                                                    GParamSpec   *pspec)
+{
+  GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (object);
+
+  switch (property_id)
+    {
+    case PROP_BUFFER:
+      {
+        if (buffer_source_validate->buffer)
+          {
+            GimpTileHandlerValidate *validate_handler;
+
+            validate_handler = gimp_tile_handler_validate_get_assigned (
+              buffer_source_validate->buffer);
+
+            gimp_operation_buffer_source_validate_invalidate (
+              buffer_source_validate->buffer,
+              gegl_buffer_get_extent (buffer_source_validate->buffer),
+              buffer_source_validate);
+
+            g_signal_handlers_disconnect_by_func (
+              buffer_source_validate->buffer,
+              gimp_operation_buffer_source_validate_invalidate,
+              buffer_source_validate);
+
+            if (validate_handler)
+              {
+                g_signal_handlers_disconnect_by_func (
+                  validate_handler,
+                  gimp_operation_buffer_source_validate_invalidate,
+                  buffer_source_validate);
+              }
+
+            g_clear_object (&buffer_source_validate->buffer);
+          }
+
+        buffer_source_validate->buffer = g_value_dup_object (value);
+
+        if (buffer_source_validate->buffer)
+          {
+            GimpTileHandlerValidate *validate_handler;
+
+            validate_handler = gimp_tile_handler_validate_get_assigned (
+              buffer_source_validate->buffer);
+
+            if (validate_handler)
+              {
+                g_signal_connect (
+                  validate_handler,
+                  "invalidated",
+                  G_CALLBACK (gimp_operation_buffer_source_validate_invalidate),
+                  buffer_source_validate);
+              }
+
+            gegl_buffer_signal_connect (
+              buffer_source_validate->buffer,
+              "changed",
+              G_CALLBACK (gimp_operation_buffer_source_validate_invalidate),
+              buffer_source_validate);
+
+            gimp_operation_buffer_source_validate_invalidate (
+              buffer_source_validate->buffer,
+              gegl_buffer_get_extent (buffer_source_validate->buffer),
+              buffer_source_validate);
+          }
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GeglRectangle
+gimp_operation_buffer_source_validate_get_bounding_box (GeglOperation *operation)
+{
+  GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (operation);
+
+  GeglRectangle result = {};
+
+  if (buffer_source_validate->buffer)
+    result = *gegl_buffer_get_extent (buffer_source_validate->buffer);
+
+  return result;
+}
+
+static void
+gimp_operation_buffer_source_validate_prepare (GeglOperation *operation)
+{
+  GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (operation);
+  const Babl                        *format                 = NULL;
+
+  if (buffer_source_validate->buffer)
+    format = gegl_buffer_get_format (buffer_source_validate->buffer);
+
+  gegl_operation_set_format (operation, "output", format);
+}
+
+static gboolean
+gimp_operation_buffer_source_validate_process (GeglOperation        *operation,
+                                               GeglOperationContext *context,
+                                               const gchar          *output_pad,
+                                               const GeglRectangle  *result,
+                                               gint                  level)
+{
+  GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (operation);
+  GeglBuffer                        *buffer                 = buffer_source_validate->buffer;
+
+  if (buffer)
+    {
+      GimpTileHandlerValidate *validate_handler;
+
+      validate_handler = gimp_tile_handler_validate_get_assigned (buffer);
+
+      if (validate_handler)
+        {
+          GeglRectangle rect;
+
+          /* align the rectangle to the tile grid */
+          gegl_rectangle_align_to_buffer (
+            &rect, result, buffer_source_validate->buffer,
+            GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+          gimp_tile_handler_validate_validate (validate_handler,
+                                               buffer_source_validate->buffer,
+                                               &rect,
+                                               TRUE, FALSE);
+        }
+
+      gegl_operation_context_set_object (context, "output", G_OBJECT (buffer));
+
+      gegl_object_set_has_forked (G_OBJECT (buffer));
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_operation_buffer_source_validate_invalidate (gpointer                           object,
+                                                  const GeglRectangle               *rect,
+                                                  GimpOperationBufferSourceValidate *buffer_source_validate)
+{
+  gegl_operation_invalidate (GEGL_OPERATION (buffer_source_validate),
+                             rect, FALSE);
+}
diff --git a/app/operations/gimpoperationbuffersourcevalidate.h b/app/operations/gimpoperationbuffersourcevalidate.h
new file mode 100644
index 0000000..c47c333
--- /dev/null
+++ b/app/operations/gimpoperationbuffersourcevalidate.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationbuffersourcevalidate.h
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_H__
+#define __GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_H__
+
+
+#define GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE            (gimp_operation_buffer_source_validate_get_type ())
+#define GIMP_OPERATION_BUFFER_SOURCE_VALIDATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE, GimpOperationBufferSourceValidate))
+#define GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE, GimpOperationBufferSourceValidateClass))
+#define GIMP_IS_OPERATION_BUFFER_SOURCE_VALIDATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE))
+#define GIMP_IS_OPERATION_BUFFER_SOURCE_VALIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE))
+#define GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE, GimpOperationBufferSourceValidateClass))
+
+
+typedef struct _GimpOperationBufferSourceValidate      GimpOperationBufferSourceValidate;
+typedef struct _GimpOperationBufferSourceValidateClass GimpOperationBufferSourceValidateClass;
+
+struct _GimpOperationBufferSourceValidate
+{
+  GeglOperationSource  parent_instance;
+
+  GeglBuffer          *buffer;
+};
+
+struct _GimpOperationBufferSourceValidateClass
+{
+  GeglOperationSourceClass  parent_class;
+};
+
+
+GType   gimp_operation_buffer_source_validate_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_H__ */
diff --git a/app/operations/gimpoperationcagecoefcalc.c b/app/operations/gimpoperationcagecoefcalc.c
new file mode 100644
index 0000000..9c78054
--- /dev/null
+++ b/app/operations/gimpoperationcagecoefcalc.c
@@ -0,0 +1,294 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpoperationcagecoefcalc.c
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationcagecoefcalc.h"
+#include "gimpcageconfig.h"
+
+#include "gimp-intl.h"
+
+
+static void           gimp_operation_cage_coef_calc_finalize         (GObject              *object);
+static void           gimp_operation_cage_coef_calc_get_property     (GObject              *object,
+                                                                      guint                 property_id,
+                                                                      GValue               *value,
+                                                                      GParamSpec           *pspec);
+static void           gimp_operation_cage_coef_calc_set_property     (GObject              *object,
+                                                                      guint                 property_id,
+                                                                      const GValue         *value,
+                                                                      GParamSpec           *pspec);
+
+static void           gimp_operation_cage_coef_calc_prepare          (GeglOperation        *operation);
+static GeglRectangle  gimp_operation_cage_coef_calc_get_bounding_box (GeglOperation        *operation);
+static gboolean       gimp_operation_cage_coef_calc_process          (GeglOperation        *operation,
+                                                                      GeglBuffer           *output,
+                                                                      const GeglRectangle  *roi,
+                                                                      gint                  level);
+
+
+G_DEFINE_TYPE (GimpOperationCageCoefCalc, gimp_operation_cage_coef_calc,
+               GEGL_TYPE_OPERATION_SOURCE)
+
+#define parent_class gimp_operation_cage_coef_calc_parent_class
+
+
+static void
+gimp_operation_cage_coef_calc_class_init (GimpOperationCageCoefCalcClass *klass)
+{
+  GObjectClass             *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationSourceClass *source_class    = GEGL_OPERATION_SOURCE_CLASS (klass);
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:cage-coef-calc",
+                                 "categories",  "transform",
+                                 "description", _("Compute a set of coefficient buffer for the GIMP cage tool"),
+                                 NULL);
+
+  operation_class->prepare            = gimp_operation_cage_coef_calc_prepare;
+  operation_class->get_bounding_box   = gimp_operation_cage_coef_calc_get_bounding_box;
+  operation_class->cache_policy       = GEGL_CACHE_POLICY_ALWAYS;
+  operation_class->get_cached_region  = NULL;
+
+  source_class->process               = gimp_operation_cage_coef_calc_process;
+
+  object_class->get_property          = gimp_operation_cage_coef_calc_get_property;
+  object_class->set_property          = gimp_operation_cage_coef_calc_set_property;
+  object_class->finalize              = gimp_operation_cage_coef_calc_finalize;
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_CAGE_COEF_CALC_PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "A GimpCageConfig object, that define the transformation",
+                                                        GIMP_TYPE_CAGE_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_cage_coef_calc_init (GimpOperationCageCoefCalc *self)
+{
+}
+
+static void
+gimp_operation_cage_coef_calc_finalize (GObject *object)
+{
+  GimpOperationCageCoefCalc *self = GIMP_OPERATION_CAGE_COEF_CALC (object);
+
+  g_clear_object (&self->config);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_operation_cage_coef_calc_get_property (GObject    *object,
+                                            guint       property_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpOperationCageCoefCalc *self = GIMP_OPERATION_CAGE_COEF_CALC (object);
+
+  switch (property_id)
+    {
+    case GIMP_OPERATION_CAGE_COEF_CALC_PROP_CONFIG:
+      g_value_set_object (value, self->config);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_cage_coef_calc_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpOperationCageCoefCalc *self = GIMP_OPERATION_CAGE_COEF_CALC (object);
+
+  switch (property_id)
+    {
+    case GIMP_OPERATION_CAGE_COEF_CALC_PROP_CONFIG:
+      if (self->config)
+        g_object_unref (self->config);
+      self->config = g_value_dup_object (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_operation_cage_coef_calc_is_on_straight (GimpVector2 *d1,
+                                              GimpVector2 *d2,
+                                              GimpVector2 *p)
+{
+  GimpVector2 v1, v2;
+  gfloat      deter;
+
+  v1.x = p->x - d1->x;
+  v1.y = p->y - d1->y;
+  v2.x = d2->x - d1->x;
+  v2.y = d2->y - d1->y;
+
+  gimp_vector2_normalize (&v1);
+  gimp_vector2_normalize (&v2);
+
+  deter = v1.x * v2.y - v2.x * v1.y;
+
+  return (deter < 0.000000001) && (deter > -0.000000001);
+}
+
+static void
+gimp_operation_cage_coef_calc_prepare (GeglOperation *operation)
+{
+  GimpOperationCageCoefCalc *occc   = GIMP_OPERATION_CAGE_COEF_CALC (operation);
+  GimpCageConfig            *config = GIMP_CAGE_CONFIG (occc->config);
+
+  gegl_operation_set_format (operation,
+                             "output",
+                             babl_format_n (babl_type ("float"),
+                                            2 * gimp_cage_config_get_n_points (config)));
+}
+
+static GeglRectangle
+gimp_operation_cage_coef_calc_get_bounding_box (GeglOperation *operation)
+{
+  GimpOperationCageCoefCalc *occc   = GIMP_OPERATION_CAGE_COEF_CALC (operation);
+  GimpCageConfig            *config = GIMP_CAGE_CONFIG (occc->config);
+
+  return gimp_cage_config_get_bounding_box (config);
+}
+
+static gboolean
+gimp_operation_cage_coef_calc_process (GeglOperation       *operation,
+                                       GeglBuffer          *output,
+                                       const GeglRectangle *roi,
+                                       gint                 level)
+{
+  GimpOperationCageCoefCalc *occc   = GIMP_OPERATION_CAGE_COEF_CALC (operation);
+  GimpCageConfig            *config = GIMP_CAGE_CONFIG (occc->config);
+
+  const Babl *format;
+
+  GeglBufferIterator *it;
+  guint               n_cage_vertices;
+  GimpCagePoint      *current, *last;
+
+  if (! config)
+    return FALSE;
+
+  format = babl_format_n (babl_type ("float"), 2 * gimp_cage_config_get_n_points (config));
+
+  n_cage_vertices   = gimp_cage_config_get_n_points (config);
+
+  it = gegl_buffer_iterator_new (output, roi, 0, format,
+                                 GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE, 1);
+
+  while (gegl_buffer_iterator_next (it))
+    {
+      /* iterate inside the roi */
+      gfloat *coef     = it->items[0].data;
+      gint    n_pixels = it->length;
+      gint    x        = it->items[0].roi.x; /* initial x         */
+      gint    y        = it->items[0].roi.y; /* and y coordinates */
+      gint    j;
+
+      memset (coef, 0, sizeof * coef * n_pixels * 2 * n_cage_vertices);
+      while(n_pixels--)
+        {
+          if (gimp_cage_config_point_inside(config, x, y))
+            {
+              last = &(g_array_index (config->cage_points, GimpCagePoint, 0));
+
+              for( j = 0; j < n_cage_vertices; j++)
+                {
+                  GimpVector2 v1,v2,a,b,p;
+                  gdouble BA,SRT,L0,L1,A0,A1,A10,L10, Q,S,R, absa;
+
+                  current = &(g_array_index (config->cage_points, GimpCagePoint, (j+1) % n_cage_vertices));
+                  v1 = last->src_point;
+                  v2 = current->src_point;
+                  p.x = x;
+                  p.y = y;
+                  a.x = v2.x - v1.x;
+                  a.y = v2.y - v1.y;
+                  absa = gimp_vector2_length (&a);
+
+                  b.x = v1.x - x;
+                  b.y = v1.y - y;
+                  Q = a.x * a.x + a.y * a.y;
+                  S = b.x * b.x + b.y * b.y;
+                  R = 2.0 * (a.x * b.x + a.y * b.y);
+                  BA = b.x * a.y - b.y * a.x;
+                  SRT = sqrt(4.0 * S * Q - R * R);
+
+                  L0 = log(S);
+                  L1 = log(S + Q + R);
+                  A0 = atan2(R, SRT) / SRT;
+                  A1 = atan2(2.0 * Q + R, SRT) / SRT;
+                  A10 = A1 - A0;
+                  L10 = L1 - L0;
+
+                  /* edge coef */
+                  coef[j + n_cage_vertices] = (-absa / (4.0 * G_PI)) * ((4.0*S-(R*R)/Q) * A10 + (R / (2.0 * Q)) * L10 + L1 - 2.0);
+
+                  if (isnan(coef[j + n_cage_vertices]))
+                    {
+                      coef[j + n_cage_vertices] = 0.0;
+                    }
+
+                  /* vertice coef */
+                  if (!gimp_operation_cage_coef_calc_is_on_straight (&v1, &v2, &p))
+                    {
+                      coef[j] += (BA / (2.0 * G_PI)) * (L10 /(2.0*Q) - A10 * (2.0 + R / Q));
+                      coef[(j+1)%n_cage_vertices] -= (BA / (2.0 * G_PI)) * (L10 / (2.0 * Q) - A10 * (R / Q));
+                    }
+
+                  last = current;
+                }
+            }
+
+          coef += 2 * n_cage_vertices;
+
+          /* update x and y coordinates */
+          x++;
+          if (x >= (it->items[0].roi.x + it->items[0].roi.width))
+            {
+              x = it->items[0].roi.x;
+              y++;
+            }
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationcagecoefcalc.h b/app/operations/gimpoperationcagecoefcalc.h
new file mode 100644
index 0000000..e63be27
--- /dev/null
+++ b/app/operations/gimpoperationcagecoefcalc.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpoperationcagecoefcalc.h
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_CAGE_COEF_CALC_H__
+#define __GIMP_OPERATION_CAGE_COEF_CALC_H__
+
+
+#include <gegl-plugin.h>
+#include <operation/gegl-operation-source.h>
+
+
+enum
+{
+  GIMP_OPERATION_CAGE_COEF_CALC_PROP_0,
+  GIMP_OPERATION_CAGE_COEF_CALC_PROP_CONFIG
+};
+
+
+#define GIMP_TYPE_OPERATION_CAGE_COEF_CALC            (gimp_operation_cage_coef_calc_get_type ())
+#define GIMP_OPERATION_CAGE_COEF_CALC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_CAGE_COEF_CALC, GimpOperationCageCoefCalc))
+#define GIMP_OPERATION_CAGE_COEF_CALC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_CAGE_COEF_CALC, GimpOperationCageCoefCalcClass))
+#define GIMP_IS_OPERATION_CAGE_COEF_CALC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_CAGE_COEF_CALC))
+#define GIMP_IS_OPERATION_CAGE_COEF_CALC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_CAGE_COEF_CALC))
+#define GIMP_OPERATION_CAGE_COEF_CALC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_CAGE_COEF_CALC, GimpOperationCageCoefCalcClass))
+
+
+typedef struct _GimpOperationCageCoefCalc      GimpOperationCageCoefCalc;
+typedef struct _GimpOperationCageCoefCalcClass GimpOperationCageCoefCalcClass;
+
+struct _GimpOperationCageCoefCalc
+{
+  GeglOperationSource  parent_instance;
+
+  GimpCageConfig      *config;
+};
+
+struct _GimpOperationCageCoefCalcClass
+{
+  GeglOperationSourceClass  parent_class;
+};
+
+
+GType   gimp_operation_cage_coef_calc_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_CAGE_COEF_CALC_H__ */
diff --git a/app/operations/gimpoperationcagetransform.c b/app/operations/gimpoperationcagetransform.c
new file mode 100644
index 0000000..d2f0450
--- /dev/null
+++ b/app/operations/gimpoperationcagetransform.c
@@ -0,0 +1,603 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpoperationcage.c
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationcagetransform.h"
+#include "gimpcageconfig.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  PROP_0,
+  PROP_CONFIG,
+  PROP_FILL,
+};
+
+
+static void         gimp_operation_cage_transform_finalize                (GObject             *object);
+static void         gimp_operation_cage_transform_get_property            (GObject             *object,
+                                                                           guint                property_id,
+                                                                           GValue              *value,
+                                                                           GParamSpec          *pspec);
+static void         gimp_operation_cage_transform_set_property            (GObject             *object,
+                                                                           guint                property_id,
+                                                                           const GValue        *value,
+                                                                           GParamSpec          *pspec);
+static void         gimp_operation_cage_transform_prepare                 (GeglOperation       *operation);
+static gboolean     gimp_operation_cage_transform_process                 (GeglOperation       *operation,
+                                                                           GeglBuffer          *in_buf,
+                                                                           GeglBuffer          *aux_buf,
+                                                                           GeglBuffer          *out_buf,
+                                                                           const GeglRectangle *roi,
+                                                                           gint                 level);
+static void         gimp_operation_cage_transform_interpolate_source_coords_recurs
+                                                                          (GimpOperationCageTransform  *oct,
+                                                                           GeglBuffer          *out_buf,
+                                                                           const GeglRectangle *roi,
+                                                                           GimpVector2          p1_s,
+                                                                           GimpVector2          p1_d,
+                                                                           GimpVector2          p2_s,
+                                                                           GimpVector2          p2_d,
+                                                                           GimpVector2          p3_s,
+                                                                           GimpVector2          p3_d,
+                                                                           gint                 recursion_depth,
+                                                                           gfloat              *coords);
+static GimpVector2  gimp_cage_transform_compute_destination               (GimpCageConfig      *config,
+                                                                           gfloat              *coef,
+                                                                           GeglSampler         *coef_sampler,
+                                                                           GimpVector2          coords);
+GeglRectangle       gimp_operation_cage_transform_get_cached_region       (GeglOperation       *operation,
+                                                                           const GeglRectangle *roi);
+GeglRectangle       gimp_operation_cage_transform_get_required_for_output (GeglOperation       *operation,
+                                                                           const gchar         *input_pad,
+                                                                           const GeglRectangle *roi);
+GeglRectangle       gimp_operation_cage_transform_get_bounding_box        (GeglOperation       *operation);
+
+
+G_DEFINE_TYPE (GimpOperationCageTransform, gimp_operation_cage_transform,
+                      GEGL_TYPE_OPERATION_COMPOSER)
+
+#define parent_class gimp_operation_cage_transform_parent_class
+
+
+static void
+gimp_operation_cage_transform_class_init (GimpOperationCageTransformClass *klass)
+{
+  GObjectClass               *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass         *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationComposerClass *filter_class    = GEGL_OPERATION_COMPOSER_CLASS (klass);
+
+  object_class->get_property               = gimp_operation_cage_transform_get_property;
+  object_class->set_property               = gimp_operation_cage_transform_set_property;
+  object_class->finalize                   = gimp_operation_cage_transform_finalize;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:cage-transform",
+                                 "categories",  "transform",
+                                 "description", _("Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage tool"),
+                                 NULL);
+
+  operation_class->prepare                 = gimp_operation_cage_transform_prepare;
+
+  operation_class->get_required_for_output = gimp_operation_cage_transform_get_required_for_output;
+  operation_class->get_cached_region       = gimp_operation_cage_transform_get_cached_region;
+  operation_class->get_bounding_box        = gimp_operation_cage_transform_get_bounding_box;
+  /* XXX Temporarily disable multi-threading on this operation because
+   * it is much faster when single-threaded. See bug 787663.
+   */
+  operation_class->threaded                = FALSE;
+
+  filter_class->process                    = gimp_operation_cage_transform_process;
+
+  g_object_class_install_property (object_class, PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "A GimpCageConfig object, that define the transformation",
+                                                        GIMP_TYPE_CAGE_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FILL,
+                                   g_param_spec_boolean ("fill-plain-color",
+                                                         _("Fill with plain color"),
+                                                         _("Fill the original position of the cage with a plain color"),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+}
+
+static void
+gimp_operation_cage_transform_init (GimpOperationCageTransform *self)
+{
+  self->format_coords = babl_format_n(babl_type("float"), 2);
+}
+
+static void
+gimp_operation_cage_transform_finalize (GObject *object)
+{
+  GimpOperationCageTransform *self = GIMP_OPERATION_CAGE_TRANSFORM (object);
+
+  g_clear_object (&self->config);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_operation_cage_transform_get_property (GObject    *object,
+                                            guint       property_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpOperationCageTransform *self = GIMP_OPERATION_CAGE_TRANSFORM (object);
+
+  switch (property_id)
+    {
+    case PROP_CONFIG:
+      g_value_set_object (value, self->config);
+      break;
+    case PROP_FILL:
+      g_value_set_boolean (value, self->fill_plain_color);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_cage_transform_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpOperationCageTransform *self = GIMP_OPERATION_CAGE_TRANSFORM (object);
+
+  switch (property_id)
+    {
+    case PROP_CONFIG:
+      if (self->config)
+        g_object_unref (self->config);
+      self->config = g_value_dup_object (value);
+      break;
+    case PROP_FILL:
+      self->fill_plain_color = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_cage_transform_prepare (GeglOperation *operation)
+{
+  GimpOperationCageTransform *oct    = GIMP_OPERATION_CAGE_TRANSFORM (operation);
+  GimpCageConfig             *config = GIMP_CAGE_CONFIG (oct->config);
+
+  gegl_operation_set_format (operation, "input",
+                             babl_format_n (babl_type ("float"),
+                                            2 * gimp_cage_config_get_n_points (config)));
+  gegl_operation_set_format (operation, "output",
+                             babl_format_n (babl_type ("float"), 2));
+}
+
+static gboolean
+gimp_operation_cage_transform_process (GeglOperation       *operation,
+                                       GeglBuffer          *in_buf,
+                                       GeglBuffer          *aux_buf,
+                                       GeglBuffer          *out_buf,
+                                       const GeglRectangle *roi,
+                                       gint                 level)
+{
+  GimpOperationCageTransform *oct    = GIMP_OPERATION_CAGE_TRANSFORM (operation);
+  GimpCageConfig             *config = GIMP_CAGE_CONFIG (oct->config);
+  GeglRectangle               cage_bb;
+  gfloat                     *coords;
+  gfloat                     *coef;
+  const Babl                 *format_coef;
+  GeglSampler                *coef_sampler;
+  GimpVector2                 plain_color;
+  GeglBufferIterator         *it;
+  gint                        x, y;
+  gboolean                    output_set;
+  GimpCagePoint              *point;
+  guint                       n_cage_vertices;
+
+  /* pre-fill the out buffer with no-displacement coordinate */
+  it      = gegl_buffer_iterator_new (out_buf, roi, 0, NULL,
+                                      GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE, 1);
+  cage_bb = gimp_cage_config_get_bounding_box (config);
+
+  point = &(g_array_index (config->cage_points, GimpCagePoint, 0));
+  plain_color.x = (gint) point->src_point.x;
+  plain_color.y = (gint) point->src_point.y;
+
+  n_cage_vertices = gimp_cage_config_get_n_points (config);
+
+  while (gegl_buffer_iterator_next (it))
+    {
+      /* iterate inside the roi */
+      gint    n_pixels = it->length;
+      gfloat *output   = it->items[0].data;
+
+      x = it->items[0].roi.x; /* initial x         */
+      y = it->items[0].roi.y; /* and y coordinates */
+
+      while (n_pixels--)
+        {
+          output_set = FALSE;
+          if (oct->fill_plain_color)
+            {
+              if (x > cage_bb.x &&
+                  y > cage_bb.y &&
+                  x < cage_bb.x + cage_bb.width &&
+                  y < cage_bb.y + cage_bb.height)
+                {
+                  if (gimp_cage_config_point_inside (config, x, y))
+                    {
+                      output[0] = plain_color.x;
+                      output[1] = plain_color.y;
+                      output_set = TRUE;
+                    }
+                }
+            }
+          if (!output_set)
+            {
+              output[0] = x + 0.5;
+              output[1] = y + 0.5;
+            }
+
+          output += 2;
+
+          /* update x and y coordinates */
+          x++;
+          if (x >= (it->items[0].roi.x + it->items[0].roi.width))
+            {
+              x = it->items[0].roi.x;
+              y++;
+            }
+        }
+    }
+
+  if (! aux_buf)
+    return TRUE;
+
+  gegl_operation_progress (operation, 0.0, "");
+
+  /* pre-allocate memory outside of the loop */
+  coords       = g_slice_alloc (2 * sizeof (gfloat));
+  coef         = g_malloc (n_cage_vertices * 2 * sizeof (gfloat));
+  format_coef  = babl_format_n (babl_type ("float"), 2 * n_cage_vertices);
+  coef_sampler = gegl_buffer_sampler_new (aux_buf,
+                                          format_coef, GEGL_SAMPLER_NEAREST);
+
+  /* compute, reverse and interpolate the transformation */
+  for (y = cage_bb.y; y < cage_bb.y + cage_bb.height - 1; y++)
+    {
+      GimpVector2 p1_d, p2_d, p3_d, p4_d;
+      GimpVector2 p1_s, p2_s, p3_s, p4_s;
+
+      p1_s.y = y;
+      p2_s.y = y+1;
+      p3_s.y = y+1;
+      p3_s.x = cage_bb.x;
+      p4_s.y = y;
+      p4_s.x = cage_bb.x;
+
+      p3_d = gimp_cage_transform_compute_destination (config, coef, coef_sampler, p3_s);
+      p4_d = gimp_cage_transform_compute_destination (config, coef, coef_sampler, p4_s);
+
+      for (x = cage_bb.x; x < cage_bb.x + cage_bb.width - 1; x++)
+        {
+          p1_s = p4_s;
+          p2_s = p3_s;
+          p3_s.x = x+1;
+          p4_s.x = x+1;
+
+          p1_d = p4_d;
+          p2_d = p3_d;
+          p3_d = gimp_cage_transform_compute_destination (config, coef, coef_sampler, p3_s);
+          p4_d = gimp_cage_transform_compute_destination (config, coef, coef_sampler, p4_s);
+
+          if (gimp_cage_config_point_inside (config, x, y))
+            {
+              gimp_operation_cage_transform_interpolate_source_coords_recurs (oct,
+                                                                              out_buf,
+                                                                              roi,
+                                                                              p1_s, p1_d,
+                                                                              p2_s, p2_d,
+                                                                              p3_s, p3_d,
+                                                                              0,
+                                                                              coords);
+
+              gimp_operation_cage_transform_interpolate_source_coords_recurs (oct,
+                                                                              out_buf,
+                                                                              roi,
+                                                                              p1_s, p1_d,
+                                                                              p3_s, p3_d,
+                                                                              p4_s, p4_d,
+                                                                              0,
+                                                                              coords);
+            }
+        }
+
+      if ((y - cage_bb.y) % 20 == 0)
+        {
+          gdouble fraction = ((gdouble) (y - cage_bb.y) /
+                              (gdouble) (cage_bb.height));
+
+          /*  0.0 and 1.0 indicate progress start/end, so avoid them  */
+          if (fraction > 0.0 && fraction < 1.0)
+            {
+              gegl_operation_progress (operation, fraction, "");
+            }
+        }
+    }
+
+  g_object_unref (coef_sampler);
+  g_free (coef);
+  g_slice_free1 (2 * sizeof (gfloat), coords);
+
+  gegl_operation_progress (operation, 1.0, "");
+
+  return TRUE;
+}
+
+
+static void
+gimp_operation_cage_transform_interpolate_source_coords_recurs (GimpOperationCageTransform *oct,
+                                                                GeglBuffer                 *out_buf,
+                                                                const GeglRectangle        *roi,
+                                                                GimpVector2                 p1_s,
+                                                                GimpVector2                 p1_d,
+                                                                GimpVector2                 p2_s,
+                                                                GimpVector2                 p2_d,
+                                                                GimpVector2                 p3_s,
+                                                                GimpVector2                 p3_d,
+                                                                gint                        recursion_depth,
+                                                                gfloat                     *coords)
+{
+  gint xmin, xmax, ymin, ymax, x, y;
+
+  /* Stop recursion if all 3 vertices of the triangle are outside the
+   * ROI (left/right or above/below).
+   */
+  if (p1_d.x >= roi->x + roi->width &&
+      p2_d.x >= roi->x + roi->width &&
+      p3_d.x >= roi->x + roi->width) return;
+  if (p1_d.y >= roi->y + roi->height &&
+      p2_d.y >= roi->y + roi->height &&
+      p3_d.y >= roi->y + roi->height) return;
+
+  if (p1_d.x < roi->x &&
+      p2_d.x < roi->x &&
+      p3_d.x < roi->x) return;
+  if (p1_d.y < roi->y &&
+      p2_d.y < roi->y &&
+      p3_d.y < roi->y) return;
+
+  xmin = xmax = lrint (p1_d.x);
+  ymin = ymax = lrint (p1_d.y);
+
+  x = lrint (p2_d.x);
+  xmin = MIN (x, xmin);
+  xmax = MAX (x, xmax);
+
+  x = lrint (p3_d.x);
+  xmin = MIN (x, xmin);
+  xmax = MAX (x, xmax);
+
+  y = lrint (p2_d.y);
+  ymin = MIN (y, ymin);
+  ymax = MAX (y, ymax);
+
+  y = lrint (p3_d.y);
+  ymin = MIN (y, ymin);
+  ymax = MAX (y, ymax);
+
+  /* test if there is no more pixel in the triangle */
+  if (xmin == xmax || ymin == ymax)
+    return;
+
+  /* test if the triangle is implausibly large as manifested by too deep recursion */
+  if (recursion_depth > 5)
+    return;
+
+  /* test if the triangle is small enough.
+   *
+   * if yes, we compute the coefficient of the barycenter for the
+   * pixel (x,y) and see if a pixel is inside (ie the 3 coef have the
+   * same sign).
+   */
+  if (xmax - xmin == 1 && ymax - ymin == 1)
+    {
+      gdouble a, b, c, denom, x, y;
+
+      x = (gdouble) xmin + 0.5;
+      y = (gdouble) ymin + 0.5;
+
+      denom = (p2_d.x - p1_d.x) * p3_d.y + (p1_d.x - p3_d.x) * p2_d.y + (p3_d.x - p2_d.x) * p1_d.y;
+      a = ((p2_d.x - x) * p3_d.y + (x - p3_d.x) * p2_d.y + (p3_d.x - p2_d.x) * y) / denom;
+      b = - ((p1_d.x - x) * p3_d.y + (x - p3_d.x) * p1_d.y + (p3_d.x - p1_d.x) * y) / denom;
+      c = 1.0 - a - b;
+
+      /* if a pixel is inside, we compute its source coordinate and
+       * set it in the output buffer
+       */
+      if ((a > 0 && b > 0 && c > 0) || (a < 0 && b < 0 && c < 0))
+        {
+          GeglRectangle rect = { 0, 0, 1, 1 };
+          gfloat        coords[2];
+
+          rect.x = xmin;
+          rect.y = ymin;
+
+          coords[0] = (a * p1_s.x + b * p2_s.x + c * p3_s.x);
+          coords[1] = (a * p1_s.y + b * p2_s.y + c * p3_s.y);
+
+          gegl_buffer_set (out_buf,
+                           &rect,
+                           0,
+                           oct->format_coords,
+                           coords,
+                           GEGL_AUTO_ROWSTRIDE);
+        }
+
+      return;
+    }
+  else
+    {
+      /* we cut the triangle in 4 sub-triangle and treat it recursively */
+      /*
+       *       /\
+       *      /__\
+       *     /\  /\
+       *    /__\/__\
+       *
+       */
+
+      GimpVector2 pm1_d, pm2_d, pm3_d;
+      GimpVector2 pm1_s, pm2_s, pm3_s;
+      gint        next_depth = recursion_depth + 1;
+
+      pm1_d.x = (p1_d.x + p2_d.x) / 2.0;
+      pm1_d.y = (p1_d.y + p2_d.y) / 2.0;
+
+      pm2_d.x = (p2_d.x + p3_d.x) / 2.0;
+      pm2_d.y = (p2_d.y + p3_d.y) / 2.0;
+
+      pm3_d.x = (p3_d.x + p1_d.x) / 2.0;
+      pm3_d.y = (p3_d.y + p1_d.y) / 2.0;
+
+      pm1_s.x = (p1_s.x + p2_s.x) / 2.0;
+      pm1_s.y = (p1_s.y + p2_s.y) / 2.0;
+
+      pm2_s.x = (p2_s.x + p3_s.x) / 2.0;
+      pm2_s.y = (p2_s.y + p3_s.y) / 2.0;
+
+      pm3_s.x = (p3_s.x + p1_s.x) / 2.0;
+      pm3_s.y = (p3_s.y + p1_s.y) / 2.0;
+
+      gimp_operation_cage_transform_interpolate_source_coords_recurs (oct,
+                                                                      out_buf,
+                                                                      roi,
+                                                                      p1_s, p1_d,
+                                                                      pm1_s, pm1_d,
+                                                                      pm3_s, pm3_d,
+                                                                      next_depth,
+                                                                      coords);
+
+      gimp_operation_cage_transform_interpolate_source_coords_recurs (oct,
+                                                                      out_buf,
+                                                                      roi,
+                                                                      pm1_s, pm1_d,
+                                                                      p2_s, p2_d,
+                                                                      pm2_s, pm2_d,
+                                                                      next_depth,
+                                                                      coords);
+
+      gimp_operation_cage_transform_interpolate_source_coords_recurs (oct,
+                                                                      out_buf,
+                                                                      roi,
+                                                                      pm1_s, pm1_d,
+                                                                      pm2_s, pm2_d,
+                                                                      pm3_s, pm3_d,
+                                                                      next_depth,
+                                                                      coords);
+
+      gimp_operation_cage_transform_interpolate_source_coords_recurs (oct,
+                                                                      out_buf,
+                                                                      roi,
+                                                                      pm3_s, pm3_d,
+                                                                      pm2_s, pm2_d,
+                                                                      p3_s, p3_d,
+                                                                      next_depth,
+                                                                      coords);
+    }
+}
+
+static GimpVector2
+gimp_cage_transform_compute_destination (GimpCageConfig *config,
+                                         gfloat         *coef,
+                                         GeglSampler    *coef_sampler,
+                                         GimpVector2     coords)
+{
+  GimpVector2    result = {0, 0};
+  gint           n_cage_vertices = gimp_cage_config_get_n_points (config);
+  gint           i;
+  GimpCagePoint *point;
+
+  gegl_sampler_get (coef_sampler,
+                    coords.x, coords.y, NULL, coef, GEGL_ABYSS_NONE);
+
+  for (i = 0; i < n_cage_vertices; i++)
+    {
+      point = &g_array_index (config->cage_points, GimpCagePoint, i);
+
+      result.x += coef[i] * point->dest_point.x;
+      result.y += coef[i] * point->dest_point.y;
+
+      result.x += coef[i + n_cage_vertices] * point->edge_scaling_factor * point->edge_normal.x;
+      result.y += coef[i + n_cage_vertices] * point->edge_scaling_factor * point->edge_normal.y;
+    }
+
+  return result;
+}
+
+GeglRectangle
+gimp_operation_cage_transform_get_cached_region (GeglOperation       *operation,
+                                                 const GeglRectangle *roi)
+{
+  GeglRectangle result = *gegl_operation_source_get_bounding_box (operation,
+                                                                  "input");
+
+  return result;
+}
+
+GeglRectangle
+gimp_operation_cage_transform_get_required_for_output (GeglOperation       *operation,
+                                                       const gchar         *input_pad,
+                                                       const GeglRectangle *roi)
+{
+  GeglRectangle result = *gegl_operation_source_get_bounding_box (operation,
+                                                                  "input");
+
+  return result;
+}
+
+GeglRectangle
+gimp_operation_cage_transform_get_bounding_box (GeglOperation *operation)
+{
+  GeglRectangle result = *gegl_operation_source_get_bounding_box (operation,
+                                                                  "input");
+
+  return result;
+}
diff --git a/app/operations/gimpoperationcagetransform.h b/app/operations/gimpoperationcagetransform.h
new file mode 100644
index 0000000..8ee9286
--- /dev/null
+++ b/app/operations/gimpoperationcagetransform.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpoperationcagetransform.h
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_CAGE_TRANSFORM_H__
+#define __GIMP_OPERATION_CAGE_TRANSFORM_H__
+
+
+#include <gegl-plugin.h>
+#include <operation/gegl-operation-composer.h>
+
+
+#define GIMP_TYPE_OPERATION_CAGE_TRANSFORM            (gimp_operation_cage_transform_get_type ())
+#define GIMP_OPERATION_CAGE_TRANSFORM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_CAGE_TRANSFORM, GimpOperationCageTransform))
+#define GIMP_OPERATION_CAGE_TRANSFORM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_CAGE_TRANSFORM, GimpOperationCageTransformClass))
+#define GIMP_IS_OPERATION_CAGE_TRANSFORM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_CAGE_TRANSFORM))
+#define GIMP_IS_OPERATION_CAGE_TRANSFORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_CAGE_TRANSFORM))
+#define GIMP_OPERATION_CAGE_TRANSFORM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_CAGE_TRANSFORM, GimpOperationCageTransformClass))
+
+
+typedef struct _GimpOperationCageTransform      GimpOperationCageTransform;
+typedef struct _GimpOperationCageTransformClass GimpOperationCageTransformClass;
+
+struct _GimpOperationCageTransform
+{
+  GeglOperationComposer  parent_instance;
+
+  GimpCageConfig        *config;
+  gboolean               fill_plain_color;
+
+  const Babl            *format_coords;
+};
+
+struct _GimpOperationCageTransformClass
+{
+  GeglOperationComposerClass  parent_class;
+};
+
+
+GType   gimp_operation_cage_transform_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_CAGE_TRANSFORM_H__ */
diff --git a/app/operations/gimpoperationcolorbalance.c b/app/operations/gimpoperationcolorbalance.c
new file mode 100644
index 0000000..9988158
--- /dev/null
+++ b/app/operations/gimpoperationcolorbalance.c
@@ -0,0 +1,198 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcolorbalance.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpcolorbalanceconfig.h"
+#include "gimpoperationcolorbalance.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean gimp_operation_color_balance_process (GeglOperation       *operation,
+                                                      void                *in_buf,
+                                                      void                *out_buf,
+                                                      glong                samples,
+                                                      const GeglRectangle *roi,
+                                                      gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationColorBalance, gimp_operation_color_balance,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_color_balance_parent_class
+
+
+static void
+gimp_operation_color_balance_class_init (GimpOperationColorBalanceClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_point_filter_set_property;
+  object_class->get_property   = gimp_operation_point_filter_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:color-balance",
+                                 "categories",  "color",
+                                 "description", _("Adjust color distribution"),
+                                 NULL);
+
+  point_class->process = gimp_operation_color_balance_process;
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "The config object",
+                                                        GIMP_TYPE_COLOR_BALANCE_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_color_balance_init (GimpOperationColorBalance *self)
+{
+}
+
+static inline gfloat
+gimp_operation_color_balance_map (gfloat  value,
+                                  gdouble lightness,
+                                  gdouble shadows,
+                                  gdouble midtones,
+                                  gdouble highlights)
+{
+  /* Apply masks to the corrections for shadows, midtones and
+   * highlights so that each correction affects only one range.
+   * Those masks look like this:
+   *     ‾\___
+   *     _/‾\_
+   *     ___/‾
+   * with ramps of width a at x = b and x = 1 - b.
+   *
+   * The sum of these masks equals 1 for x in 0..1, so applying the
+   * same correction in the shadows and in the midtones is equivalent
+   * to applying this correction on a virtual shadows_and_midtones
+   * range.
+   */
+  static const gdouble a = 0.25, b = 0.333, scale = 0.7;
+
+  shadows    *= CLAMP ((lightness - b) / -a + 0.5, 0, 1) * scale;
+  midtones   *= CLAMP ((lightness - b) /  a + 0.5, 0, 1) *
+                CLAMP ((lightness + b - 1) / -a + 0.5, 0, 1) * scale;
+  highlights *= CLAMP ((lightness + b - 1) /  a + 0.5, 0, 1) * scale;
+
+  value += shadows;
+  value += midtones;
+  value += highlights;
+  value = CLAMP (value, 0.0, 1.0);
+
+  return value;
+}
+
+static gboolean
+gimp_operation_color_balance_process (GeglOperation       *operation,
+                                      void                *in_buf,
+                                      void                *out_buf,
+                                      glong                samples,
+                                      const GeglRectangle *roi,
+                                      gint                 level)
+{
+  GimpOperationPointFilter *point  = GIMP_OPERATION_POINT_FILTER (operation);
+  GimpColorBalanceConfig   *config = GIMP_COLOR_BALANCE_CONFIG (point->config);
+  gfloat                   *src    = in_buf;
+  gfloat                   *dest   = out_buf;
+
+  if (! config)
+    return FALSE;
+
+  while (samples--)
+    {
+      gfloat r = src[RED];
+      gfloat g = src[GREEN];
+      gfloat b = src[BLUE];
+      gfloat r_n;
+      gfloat g_n;
+      gfloat b_n;
+
+      GimpRGB rgb = { r, g, b};
+      GimpHSL hsl;
+
+      gimp_rgb_to_hsl (&rgb, &hsl);
+
+      r_n = gimp_operation_color_balance_map (r, hsl.l,
+                                              config->cyan_red[GIMP_TRANSFER_SHADOWS],
+                                              config->cyan_red[GIMP_TRANSFER_MIDTONES],
+                                              config->cyan_red[GIMP_TRANSFER_HIGHLIGHTS]);
+
+      g_n = gimp_operation_color_balance_map (g, hsl.l,
+                                              config->magenta_green[GIMP_TRANSFER_SHADOWS],
+                                              config->magenta_green[GIMP_TRANSFER_MIDTONES],
+                                              config->magenta_green[GIMP_TRANSFER_HIGHLIGHTS]);
+
+      b_n = gimp_operation_color_balance_map (b, hsl.l,
+                                              config->yellow_blue[GIMP_TRANSFER_SHADOWS],
+                                              config->yellow_blue[GIMP_TRANSFER_MIDTONES],
+                                              config->yellow_blue[GIMP_TRANSFER_HIGHLIGHTS]);
+
+      if (config->preserve_luminosity)
+        {
+          GimpHSL hsl2;
+
+          rgb.r = r_n;
+          rgb.g = g_n;
+          rgb.b = b_n;
+          gimp_rgb_to_hsl (&rgb, &hsl);
+
+          rgb.r = r;
+          rgb.g = g;
+          rgb.b = b;
+          gimp_rgb_to_hsl (&rgb, &hsl2);
+
+          hsl.l = hsl2.l;
+
+          gimp_hsl_to_rgb (&hsl, &rgb);
+
+          r_n = rgb.r;
+          g_n = rgb.g;
+          b_n = rgb.b;
+        }
+
+      dest[RED]   = r_n;
+      dest[GREEN] = g_n;
+      dest[BLUE]  = b_n;
+      dest[ALPHA] = src[ALPHA];
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationcolorbalance.h b/app/operations/gimpoperationcolorbalance.h
new file mode 100644
index 0000000..a6ba386
--- /dev/null
+++ b/app/operations/gimpoperationcolorbalance.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcolorbalance.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_COLOR_BALANCE_H__
+#define __GIMP_OPERATION_COLOR_BALANCE_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_COLOR_BALANCE            (gimp_operation_color_balance_get_type ())
+#define GIMP_OPERATION_COLOR_BALANCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_COLOR_BALANCE, GimpOperationColorBalance))
+#define GIMP_OPERATION_COLOR_BALANCE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_COLOR_BALANCE, GimpOperationColorBalanceClass))
+#define GIMP_IS_OPERATION_COLOR_BALANCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_COLOR_BALANCE))
+#define GIMP_IS_OPERATION_COLOR_BALANCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_COLOR_BALANCE))
+#define GIMP_OPERATION_COLOR_BALANCE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COLOR_BALANCE, GimpOperationColorBalanceClass))
+
+
+typedef struct _GimpOperationColorBalance      GimpOperationColorBalance;
+typedef struct _GimpOperationColorBalanceClass GimpOperationColorBalanceClass;
+
+struct _GimpOperationColorBalance
+{
+  GimpOperationPointFilter  parent_instance;
+};
+
+struct _GimpOperationColorBalanceClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_color_balance_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_COLOR_BALANCE_H__ */
diff --git a/app/operations/gimpoperationcolorize.c b/app/operations/gimpoperationcolorize.c
new file mode 100644
index 0000000..fd64840
--- /dev/null
+++ b/app/operations/gimpoperationcolorize.c
@@ -0,0 +1,274 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcolorize.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationcolorize.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_HUE,
+  PROP_SATURATION,
+  PROP_LIGHTNESS,
+  PROP_COLOR
+};
+
+
+static void     gimp_operation_colorize_get_property (GObject      *object,
+                                                      guint         property_id,
+                                                      GValue       *value,
+                                                      GParamSpec   *pspec);
+static void     gimp_operation_colorize_set_property (GObject      *object,
+                                                      guint         property_id,
+                                                      const GValue *value,
+                                                      GParamSpec   *pspec);
+
+static gboolean gimp_operation_colorize_process (GeglOperation       *operation,
+                                                 void                *in_buf,
+                                                 void                *out_buf,
+                                                 glong                samples,
+                                                 const GeglRectangle *roi,
+                                                 gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationColorize, gimp_operation_colorize,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_colorize_parent_class
+
+
+static void
+gimp_operation_colorize_class_init (GimpOperationColorizeClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+  GimpHSL                        hsl;
+  GimpRGB                        rgb;
+
+  object_class->set_property   = gimp_operation_colorize_set_property;
+  object_class->get_property   = gimp_operation_colorize_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:colorize",
+                                 "categories",  "color",
+                                 "description", _("Colorize the image"),
+                                 NULL);
+
+  point_class->process = gimp_operation_colorize_process;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HUE,
+                           "hue",
+                           _("Hue"),
+                           _("Hue"),
+                           0.0, 1.0, 0.5, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SATURATION,
+                           "saturation",
+                           _("Saturation"),
+                           _("Saturation"),
+                           0.0, 1.0, 0.5, 0);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LIGHTNESS,
+                           "lightness",
+                           _("Lightness"),
+                           _("Lightness"),
+                           -1.0, 1.0, 0.0, 0);
+
+  gimp_hsl_set (&hsl, 0.5, 0.5, 0.5);
+  gimp_hsl_set_alpha (&hsl, 1.0);
+  gimp_hsl_to_rgb (&hsl, &rgb);
+
+  g_object_class_install_property (object_class, PROP_COLOR,
+                                   gimp_param_spec_rgb ("color",
+                                                        _("Color"),
+                                                        _("Color"),
+                                                        FALSE, &rgb,
+                                                        G_PARAM_READWRITE));
+}
+
+static void
+gimp_operation_colorize_init (GimpOperationColorize *self)
+{
+}
+
+static void
+gimp_operation_colorize_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpOperationColorize *self = GIMP_OPERATION_COLORIZE (object);
+
+  switch (property_id)
+    {
+    case PROP_HUE:
+      g_value_set_double (value, self->hue);
+      break;
+
+    case PROP_SATURATION:
+      g_value_set_double (value, self->saturation);
+      break;
+
+    case PROP_LIGHTNESS:
+      g_value_set_double (value, self->lightness);
+      break;
+
+    case PROP_COLOR:
+      {
+        GimpHSL hsl;
+        GimpRGB rgb;
+
+        gimp_hsl_set (&hsl,
+                      self->hue,
+                      self->saturation,
+                      (self->lightness + 1.0) / 2.0);
+        gimp_hsl_set_alpha (&hsl, 1.0);
+        gimp_hsl_to_rgb (&hsl, &rgb);
+        gimp_value_set_rgb (value, &rgb);
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_colorize_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpOperationColorize *self = GIMP_OPERATION_COLORIZE (object);
+
+  switch (property_id)
+    {
+    case PROP_HUE:
+      self->hue = g_value_get_double (value);
+      g_object_notify (object, "color");
+      break;
+
+    case PROP_SATURATION:
+      self->saturation = g_value_get_double (value);
+      g_object_notify (object, "color");
+      break;
+
+    case PROP_LIGHTNESS:
+      self->lightness = g_value_get_double (value);
+      g_object_notify (object, "color");
+      break;
+
+    case PROP_COLOR:
+      {
+        GimpRGB rgb;
+        GimpHSL hsl;
+
+        gimp_value_get_rgb (value, &rgb);
+        gimp_rgb_to_hsl (&rgb, &hsl);
+
+        if (hsl.h == -1)
+          hsl.h = self->hue;
+
+        if (hsl.l == 0.0 || hsl.l == 1.0)
+          hsl.s = self->saturation;
+
+        g_object_set (self,
+                      "hue",        hsl.h,
+                      "saturation", hsl.s,
+                      "lightness",  hsl.l * 2.0 - 1.0,
+                      NULL);
+      }
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_operation_colorize_process (GeglOperation       *operation,
+                                 void                *in_buf,
+                                 void                *out_buf,
+                                 glong                samples,
+                                 const GeglRectangle *roi,
+                                 gint                 level)
+{
+  GimpOperationColorize *colorize  = GIMP_OPERATION_COLORIZE (operation);
+  gfloat                *src    = in_buf;
+  gfloat                *dest   = out_buf;
+  GimpHSL                hsl;
+
+  hsl.h = colorize->hue;
+  hsl.s = colorize->saturation;
+
+  while (samples--)
+    {
+      GimpRGB rgb;
+      gfloat  lum = GIMP_RGB_LUMINANCE (src[RED],
+                                        src[GREEN],
+                                        src[BLUE]);
+
+      if (colorize->lightness > 0)
+        {
+          lum = lum * (1.0 - colorize->lightness);
+
+          lum += 1.0 - (1.0 - colorize->lightness);
+        }
+      else if (colorize->lightness < 0)
+        {
+          lum = lum * (colorize->lightness + 1.0);
+        }
+
+      hsl.l = lum;
+
+      gimp_hsl_to_rgb (&hsl, &rgb);
+
+      /*  the code in base/colorize.c would multiply r,b,g with lum,
+       *  but this is a bug since it should multiply with 255. We
+       *  don't repeat this bug here (this is the reason why the gegl
+       *  colorize is brighter than the legacy one).
+       */
+      dest[RED]   = rgb.r; /* * lum */
+      dest[GREEN] = rgb.g; /* * lum */
+      dest[BLUE]  = rgb.b; /* * lum */
+      dest[ALPHA] = src[ALPHA];
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationcolorize.h b/app/operations/gimpoperationcolorize.h
new file mode 100644
index 0000000..cfb5545
--- /dev/null
+++ b/app/operations/gimpoperationcolorize.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcolorize.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_COLORIZE_H__
+#define __GIMP_OPERATION_COLORIZE_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_COLORIZE            (gimp_operation_colorize_get_type ())
+#define GIMP_OPERATION_COLORIZE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_COLORIZE, GimpOperationColorize))
+#define GIMP_OPERATION_COLORIZE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_COLORIZE, GimpOperationColorizeClass))
+#define GIMP_IS_OPERATION_COLORIZE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_COLORIZE))
+#define GIMP_IS_OPERATION_COLORIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_COLORIZE))
+#define GIMP_OPERATION_COLORIZE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COLORIZE, GimpOperationColorizeClass))
+
+
+typedef struct _GimpOperationColorize      GimpOperationColorize;
+typedef struct _GimpOperationColorizeClass GimpOperationColorizeClass;
+
+struct _GimpOperationColorize
+{
+  GimpOperationPointFilter  parent_instance;
+
+  gdouble                   hue;
+  gdouble                   saturation;
+  gdouble                   lightness;
+};
+
+struct _GimpOperationColorizeClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_colorize_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_COLORIZE_H__ */
diff --git a/app/operations/gimpoperationcomposecrop.c b/app/operations/gimpoperationcomposecrop.c
new file mode 100644
index 0000000..25e6247
--- /dev/null
+++ b/app/operations/gimpoperationcomposecrop.c
@@ -0,0 +1,329 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcomposecrop.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2016 Massimo Valentini <mvalentini@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "gimpoperationcomposecrop.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_X,
+  PROP_Y,
+  PROP_WIDTH,
+  PROP_HEIGHT
+};
+
+
+static void            gimp_operation_compose_crop_get_property            (GObject              *object,
+                                                                            guint                 property_id,
+                                                                            GValue               *value,
+                                                                            GParamSpec           *pspec);
+static void            gimp_operation_compose_crop_set_property            (GObject              *object,
+                                                                            guint                 property_id,
+                                                                            const GValue         *value,
+                                                                            GParamSpec           *pspec);
+
+static void            gimp_operation_compose_crop_prepare                 (GeglOperation        *operation);
+static GeglRectangle   gimp_operation_compose_crop_get_required_for_output (GeglOperation        *operation,
+                                                                            const gchar          *input_pad,
+                                                                            const GeglRectangle  *output_roi);
+static gboolean        gimp_operation_compose_crop_parent_process          (GeglOperation        *operation,
+                                                                            GeglOperationContext *context,
+                                                                            const gchar          *output_pad,
+                                                                            const GeglRectangle  *roi,
+                                                                            gint                  level);
+
+static gboolean        gimp_operation_compose_crop_process                 (GeglOperation        *operation,
+                                                                            void                 *in_buf,
+                                                                            void                 *aux_buf,
+                                                                            void                 *out_buf,
+                                                                            glong                 samples,
+                                                                            const GeglRectangle  *roi,
+                                                                            gint                  level);
+
+
+G_DEFINE_TYPE (GimpOperationComposeCrop, gimp_operation_compose_crop,
+               GEGL_TYPE_OPERATION_POINT_COMPOSER)
+
+#define parent_class gimp_operation_compose_crop_parent_class
+
+
+static void
+gimp_operation_compose_crop_class_init (GimpOperationComposeCropClass *klass)
+{
+  GObjectClass                    *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass              *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointComposerClass *point_class     = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_compose_crop_set_property;
+  object_class->get_property = gimp_operation_compose_crop_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:compose-crop",
+                                 "categories",  "gimp",
+                                 "description", "Selectively pick components from src or aux",
+                                 NULL);
+
+  operation_class->prepare                   = gimp_operation_compose_crop_prepare;
+  operation_class->get_invalidated_by_change = gimp_operation_compose_crop_get_required_for_output;
+  operation_class->get_required_for_output   = gimp_operation_compose_crop_get_required_for_output;
+  operation_class->process                   = gimp_operation_compose_crop_parent_process;
+
+  point_class->process                       = gimp_operation_compose_crop_process;
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_int ("x",
+                                                     "x",
+                                                     "x",
+                                                     G_MININT, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_int ("y",
+                                                     "y",
+                                                     "y",
+                                                     G_MININT, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width",
+                                                     "width",
+                                                     "width",
+                                                     0, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_int ("height",
+                                                     "height",
+                                                     "height",
+                                                     0, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_compose_crop_init (GimpOperationComposeCrop *self)
+{
+}
+
+static void
+gimp_operation_compose_crop_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpOperationComposeCrop *self = GIMP_OPERATION_COMPOSE_CROP (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      g_value_set_int (value, self->rect.x);
+      break;
+    case PROP_Y:
+      g_value_set_int (value, self->rect.y);
+      break;
+    case PROP_WIDTH:
+      g_value_set_int (value, self->rect.width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_int (value, self->rect.height);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_compose_crop_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpOperationComposeCrop *self = GIMP_OPERATION_COMPOSE_CROP (object);
+
+  switch (property_id)
+    {
+    case PROP_X:
+      self->rect.x = g_value_get_int (value);
+      break;
+    case PROP_Y:
+      self->rect.y = g_value_get_int (value);
+      break;
+    case PROP_WIDTH:
+      self->rect.width = g_value_get_int (value);
+      break;
+    case PROP_HEIGHT:
+      self->rect.height = g_value_get_int (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_compose_crop_prepare (GeglOperation *operation)
+{
+  const Babl *input_format  = gegl_operation_get_source_format (operation, "input");
+  const Babl *aux_format    = gegl_operation_get_source_format (operation, "aux");
+  const Babl *format;
+
+  if (input_format)
+    {
+      if (input_format == aux_format)
+        {
+          format = input_format;
+        }
+      else
+        {
+          const Babl *model = babl_format_get_model (input_format);
+
+          if (model == babl_model ("R'G'B'A"))
+            format = babl_format_with_space ("R'G'B'A float", input_format);
+          else
+            format = babl_format_with_space ("RGBA float", input_format);
+        }
+    }
+  else
+    {
+      format = babl_format_with_space ("RGBA float", input_format);
+    }
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "aux",    format);
+  gegl_operation_set_format (operation, "output", format);
+}
+
+static GeglRectangle
+gimp_operation_compose_crop_get_required_for_output (GeglOperation       *operation,
+                                                     const gchar         *input_pad,
+                                                     const GeglRectangle *output_roi)
+{
+  GimpOperationComposeCrop *self = GIMP_OPERATION_COMPOSE_CROP (operation);
+  GeglRectangle             result;
+
+  if (! strcmp (input_pad, "input"))
+    gegl_rectangle_intersect (&result, output_roi, &self->rect);
+  else if (! strcmp (input_pad, "aux"))
+    gegl_rectangle_subtract_bounding_box (&result, output_roi, &self->rect);
+  else
+    g_return_val_if_reached (*output_roi);
+
+  return result;
+}
+
+static gboolean
+gimp_operation_compose_crop_parent_process (GeglOperation        *operation,
+                                            GeglOperationContext *context,
+                                            const gchar          *output_pad,
+                                            const GeglRectangle  *roi,
+                                            gint                  level)
+{
+  GimpOperationComposeCrop *self = GIMP_OPERATION_COMPOSE_CROP (operation);
+
+  if (gegl_rectangle_contains (&self->rect, roi))
+    {
+      GObject *input;
+
+      input = gegl_operation_context_get_object (context, "input");
+      gegl_operation_context_set_object (context, "output", input);
+
+      return TRUE;
+    }
+  else if (! gegl_rectangle_intersect (NULL, &self->rect, roi))
+    {
+      GObject *aux;
+
+      aux = gegl_operation_context_get_object (context, "aux");
+      gegl_operation_context_set_object (context, "output", aux);
+
+      return TRUE;
+    }
+
+  return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
+                                                       output_pad, roi, level);
+}
+
+static gboolean
+gimp_operation_compose_crop_process (GeglOperation       *operation,
+                                     void                *in_buf,
+                                     void                *aux_buf,
+                                     void                *out_buf,
+                                     glong                samples,
+                                     const GeglRectangle *roi,
+                                     gint                 level)
+{
+  GimpOperationComposeCrop *self   = GIMP_OPERATION_COMPOSE_CROP (operation);
+  const Babl               *format = gegl_operation_get_format (operation, "output");
+  gint                      bpp    = babl_format_get_bytes_per_pixel (format);
+  const guchar             *in     = in_buf;
+  const guchar             *aux    = aux_buf;
+  guchar                   *out    = out_buf;
+  gint                      x0, x1;
+  gint                      y0, y1;
+  gint                      y;
+
+#define COPY(src, n)                                                           \
+  do                                                                           \
+    {                                                                          \
+      gint size = (n) * bpp;                                                   \
+                                                                               \
+      if (src)                                                                 \
+        memcpy (out, (src), size);                                             \
+      else                                                                     \
+        memset (out, 0, size);                                                 \
+                                                                               \
+      in           += size;                                                    \
+      if (aux) aux += size;                                                    \
+      out          += size;                                                    \
+    }                                                                          \
+  while (FALSE)
+
+  x0 = CLAMP (self->rect.x,                     roi->x, roi->x + roi->width);
+  x1 = CLAMP (self->rect.x + self->rect.width,  roi->x, roi->x + roi->width);
+
+  y0 = CLAMP (self->rect.y,                     roi->y, roi->y + roi->height);
+  y1 = CLAMP (self->rect.y + self->rect.height, roi->y, roi->y + roi->height);
+
+  COPY (aux, (y0 - roi->y) * roi->width);
+
+  for (y = y0; y < y1; y++)
+    {
+      COPY (aux, x0 - roi->x);
+      COPY (in,  x1 - x0);
+      COPY (aux, roi->x + roi->width - x1);
+    }
+
+  COPY (aux, (roi->y + roi->height - y1) * roi->width);
+
+#undef COPY
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationcomposecrop.h b/app/operations/gimpoperationcomposecrop.h
new file mode 100644
index 0000000..83b7613
--- /dev/null
+++ b/app/operations/gimpoperationcomposecrop.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcomposecrop.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2016 Massimo Valentini <mvalentini@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_COMPOSE_CROP_H__
+#define __GIMP_OPERATION_COMPOSE_CROP_H__
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_COMPOSE_CROP            (gimp_operation_compose_crop_get_type ())
+#define GIMP_OPERATION_COMPOSE_CROP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_COMPOSE_CROP, GimpOperationComposeCrop))
+#define GIMP_OPERATION_COMPOSE_CROP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_COMPOSE_CROP, GimpOperationComposeCropClass))
+#define GIMP_IS_OPERATION_COMPOSE_CROP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_COMPOSE_CROP))
+#define GIMP_IS_OPERATION_COMPOSE_CROP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_COMPOSE_CROP))
+#define GIMP_OPERATION_COMPOSE_CROP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COMPOSE_CROP, GimpOperationComposeCropClass))
+
+
+typedef struct _GimpOperationComposeCrop      GimpOperationComposeCrop;
+typedef struct _GimpOperationComposeCropClass GimpOperationComposeCropClass;
+
+struct _GimpOperationComposeCrop
+{
+  GeglOperationPointComposer  parent_instance;
+
+  GeglRectangle               rect;
+};
+
+struct _GimpOperationComposeCropClass
+{
+  GeglOperationPointComposerClass  parent_class;
+};
+
+
+GType   gimp_operation_compose_crop_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_COMPOSE_CROP_H__ */
diff --git a/app/operations/gimpoperationcurves.c b/app/operations/gimpoperationcurves.c
new file mode 100644
index 0000000..e83b142
--- /dev/null
+++ b/app/operations/gimpoperationcurves.c
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcurves.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "core/gimpcurve.h"
+#include "core/gimpcurve-map.h"
+
+#include "gimpcurvesconfig.h"
+#include "gimpoperationcurves.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean gimp_operation_curves_process (GeglOperation       *operation,
+                                               void                *in_buf,
+                                               void                *out_buf,
+                                               glong                samples,
+                                               const GeglRectangle *roi,
+                                               gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationCurves, gimp_operation_curves,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_curves_parent_class
+
+
+static void
+gimp_operation_curves_class_init (GimpOperationCurvesClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_point_filter_set_property;
+  object_class->get_property   = gimp_operation_point_filter_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:curves",
+                                 "categories",  "color",
+                                 "description", _("Adjust color curves"),
+                                 NULL);
+
+  point_class->process = gimp_operation_curves_process;
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_LINEAR,
+                                   g_param_spec_boolean ("linear",
+                                                         "Linear",
+                                                         "Whether to operate on linear RGB",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "The config object",
+                                                        GIMP_TYPE_CURVES_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_curves_init (GimpOperationCurves *self)
+{
+}
+
+static gboolean
+gimp_operation_curves_process (GeglOperation       *operation,
+                               void                *in_buf,
+                               void                *out_buf,
+                               glong                samples,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  GimpOperationPointFilter *point  = GIMP_OPERATION_POINT_FILTER (operation);
+  GimpCurvesConfig         *config = GIMP_CURVES_CONFIG (point->config);
+  gfloat                   *src    = in_buf;
+  gfloat                   *dest   = out_buf;
+
+  if (! config)
+    return FALSE;
+
+  gimp_curve_map_pixels (config->curve[0],
+                         config->curve[1],
+                         config->curve[2],
+                         config->curve[3],
+                         config->curve[4], src, dest, samples);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationcurves.h b/app/operations/gimpoperationcurves.h
new file mode 100644
index 0000000..ab097b2
--- /dev/null
+++ b/app/operations/gimpoperationcurves.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcurves.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_CURVES_H__
+#define __GIMP_OPERATION_CURVES_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_CURVES            (gimp_operation_curves_get_type ())
+#define GIMP_OPERATION_CURVES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_CURVES, GimpOperationCurves))
+#define GIMP_OPERATION_CURVES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_CURVES, GimpOperationCurvesClass))
+#define GIMP_IS_OPERATION_CURVES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_CURVES))
+#define GIMP_IS_OPERATION_CURVES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_CURVES))
+#define GIMP_OPERATION_CURVES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_CURVES, GimpOperationCurvesClass))
+
+
+typedef struct _GimpOperationCurves      GimpOperationCurves;
+typedef struct _GimpOperationCurvesClass GimpOperationCurvesClass;
+
+struct _GimpOperationCurves
+{
+  GimpOperationPointFilter  parent_instance;
+};
+
+struct _GimpOperationCurvesClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_curves_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_CURVES_H__ */
diff --git a/app/operations/gimpoperationdesaturate.c b/app/operations/gimpoperationdesaturate.c
new file mode 100644
index 0000000..9f833db
--- /dev/null
+++ b/app/operations/gimpoperationdesaturate.c
@@ -0,0 +1,257 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdesaturate.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationdesaturate.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_MODE
+};
+
+
+static void     gimp_operation_desaturate_get_property (GObject             *object,
+                                                        guint                property_id,
+                                                        GValue              *value,
+                                                        GParamSpec          *pspec);
+static void     gimp_operation_desaturate_set_property (GObject             *object,
+                                                        guint                property_id,
+                                                        const GValue        *value,
+                                                        GParamSpec          *pspec);
+
+static void     gimp_operation_desaturate_prepare      (GeglOperation       *operation);
+static gboolean gimp_operation_desaturate_process      (GeglOperation       *operation,
+                                                        void                *in_buf,
+                                                        void                *out_buf,
+                                                        glong                samples,
+                                                        const GeglRectangle *roi,
+                                                        gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationDesaturate, gimp_operation_desaturate,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_desaturate_parent_class
+
+
+static void
+gimp_operation_desaturate_class_init (GimpOperationDesaturateClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_desaturate_set_property;
+  object_class->get_property = gimp_operation_desaturate_get_property;
+
+  operation_class->prepare   = gimp_operation_desaturate_prepare;
+
+  point_class->process       = gimp_operation_desaturate_process;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:desaturate",
+                                 "categories",  "color",
+                                 "description", _("Turn colors into shades of gray"),
+                                 NULL);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_MODE,
+                         "mode",
+                         _("Mode"),
+                         _("Choose shade of gray based on"),
+                         GIMP_TYPE_DESATURATE_MODE,
+                         GIMP_DESATURATE_LUMINANCE,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_operation_desaturate_init (GimpOperationDesaturate *self)
+{
+}
+
+static void
+gimp_operation_desaturate_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpOperationDesaturate *desaturate = GIMP_OPERATION_DESATURATE (object);
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      g_value_set_enum (value, desaturate->mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_desaturate_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpOperationDesaturate *desaturate = GIMP_OPERATION_DESATURATE (object);
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      desaturate->mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_desaturate_prepare (GeglOperation *operation)
+{
+  GimpOperationDesaturate *desaturate = GIMP_OPERATION_DESATURATE (operation);
+  const Babl              *format = gegl_operation_get_source_format (operation, "input");
+
+  if (desaturate->mode == GIMP_DESATURATE_LUMINANCE)
+    {
+      format = babl_format_with_space ("RGBA float", format);
+    }
+  else
+    {
+      format = babl_format_with_space ("R'G'B'A float", format);
+    }
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "output", format);
+}
+
+static gboolean
+gimp_operation_desaturate_process (GeglOperation       *operation,
+                                   void                *in_buf,
+                                   void                *out_buf,
+                                   glong                samples,
+                                   const GeglRectangle *roi,
+                                   gint                 level)
+{
+  GimpOperationDesaturate *desaturate = GIMP_OPERATION_DESATURATE (operation);
+  gfloat                  *src        = in_buf;
+  gfloat                  *dest       = out_buf;
+
+  switch (desaturate->mode)
+    {
+    case GIMP_DESATURATE_LIGHTNESS:
+      /* This is the formula for Lightness in the HSL "bi-hexcone"
+       * model: https://en.wikipedia.org/wiki/HSL_and_HSV
+       */
+      while (samples--)
+        {
+          gfloat min, max, value;
+
+          max = MAX (src[0], src[1]);
+          max = MAX (max, src[2]);
+          min = MIN (src[0], src[1]);
+          min = MIN (min, src[2]);
+
+          value = (max + min) / 2;
+
+          dest[0] = value;
+          dest[1] = value;
+          dest[2] = value;
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case GIMP_DESATURATE_LUMA:
+    case GIMP_DESATURATE_LUMINANCE:
+      while (samples--)
+        {
+          gfloat value = GIMP_RGB_LUMINANCE (src[0], src[1], src[2]);
+
+          dest[0] = value;
+          dest[1] = value;
+          dest[2] = value;
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case GIMP_DESATURATE_AVERAGE:
+      /* This is the formula for Intensity in the HSI model:
+       * https://en.wikipedia.org/wiki/HSL_and_HSV
+       */
+      while (samples--)
+        {
+          gfloat value = (src[0] + src[1] + src[2]) / 3;
+
+          dest[0] = value;
+          dest[1] = value;
+          dest[2] = value;
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+
+    case GIMP_DESATURATE_VALUE:
+      /* This is the formula for Value in the HSV model:
+       * https://en.wikipedia.org/wiki/HSL_and_HSV
+       */
+      while (samples--)
+        {
+          gfloat value;
+
+          value = MAX (src[0], src[1]);
+          value = MAX (value, src[2]);
+
+          dest[0] = value;
+          dest[1] = value;
+          dest[2] = value;
+          dest[3] = src[3];
+
+          src  += 4;
+          dest += 4;
+        }
+      break;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationdesaturate.h b/app/operations/gimpoperationdesaturate.h
new file mode 100644
index 0000000..3117a61
--- /dev/null
+++ b/app/operations/gimpoperationdesaturate.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdesaturate.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DESATURATE_H__
+#define __GIMP_OPERATION_DESATURATE_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_DESATURATE            (gimp_operation_desaturate_get_type ())
+#define GIMP_OPERATION_DESATURATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturate))
+#define GIMP_OPERATION_DESATURATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
+#define GIMP_IS_OPERATION_DESATURATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DESATURATE))
+#define GIMP_IS_OPERATION_DESATURATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DESATURATE))
+#define GIMP_OPERATION_DESATURATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
+
+
+typedef struct _GimpOperationDesaturate      GimpOperationDesaturate;
+typedef struct _GimpOperationDesaturateClass GimpOperationDesaturateClass;
+
+struct _GimpOperationDesaturate
+{
+  GimpOperationPointFilter  parent_instance;
+
+  GimpDesaturateMode        mode;
+};
+
+struct _GimpOperationDesaturateClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_desaturate_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_DESATURATE_H__ */
diff --git a/app/operations/gimpoperationequalize.c b/app/operations/gimpoperationequalize.c
new file mode 100644
index 0000000..119be23
--- /dev/null
+++ b/app/operations/gimpoperationequalize.c
@@ -0,0 +1,248 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationequalize.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "core/gimphistogram.h"
+
+#include "gimpoperationequalize.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_HISTOGRAM
+};
+
+
+static void     gimp_operation_equalize_finalize     (GObject             *object);
+static void     gimp_operation_equalize_get_property (GObject             *object,
+                                                      guint                property_id,
+                                                      GValue              *value,
+                                                      GParamSpec          *pspec);
+static void     gimp_operation_equalize_set_property (GObject             *object,
+                                                      guint                property_id,
+                                                      const GValue        *value,
+                                                      GParamSpec          *pspec);
+
+static gboolean gimp_operation_equalize_process      (GeglOperation       *operation,
+                                                      void                *in_buf,
+                                                      void                *out_buf,
+                                                      glong                samples,
+                                                      const GeglRectangle *roi,
+                                                      gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationEqualize, gimp_operation_equalize,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_equalize_parent_class
+
+
+static void
+gimp_operation_equalize_class_init (GimpOperationEqualizeClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->finalize       = gimp_operation_equalize_finalize;
+  object_class->set_property   = gimp_operation_equalize_set_property;
+  object_class->get_property   = gimp_operation_equalize_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:equalize",
+                                 "categories",  "color",
+                                 "description", "GIMP Equalize operation",
+                                 NULL);
+
+  point_class->process = gimp_operation_equalize_process;
+
+  g_object_class_install_property (object_class, PROP_HISTOGRAM,
+                                   g_param_spec_object ("histogram",
+                                                        "Histogram",
+                                                        "The histogram",
+                                                        GIMP_TYPE_HISTOGRAM,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_operation_equalize_init (GimpOperationEqualize *self)
+{
+  self->values = NULL;
+  self->n_bins = 0;
+}
+
+static void
+gimp_operation_equalize_finalize (GObject *object)
+{
+  GimpOperationEqualize *self = GIMP_OPERATION_EQUALIZE (object);
+
+  g_clear_pointer (&self->values, g_free);
+  g_clear_object (&self->histogram);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_operation_equalize_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpOperationEqualize *self = GIMP_OPERATION_EQUALIZE (object);
+
+  switch (property_id)
+    {
+    case PROP_HISTOGRAM:
+      g_value_set_pointer (value, self->histogram);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_equalize_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpOperationEqualize *self = GIMP_OPERATION_EQUALIZE (object);
+
+  switch (property_id)
+    {
+    case PROP_HISTOGRAM:
+      if (self->histogram)
+        g_object_unref (self->histogram);
+
+      self->histogram = g_value_dup_object (value);
+
+      if (self->histogram)
+        {
+          gdouble pixels;
+          gint    n_bins;
+          gint    max;
+          gint    k;
+
+          n_bins = gimp_histogram_n_bins (self->histogram);
+
+          if ((self->values != NULL) && (self->n_bins != n_bins))
+            {
+              g_free (self->values);
+              self->values = NULL;
+            }
+
+          if (self->values == NULL)
+            {
+              self->values = g_new (gdouble, 3 * n_bins);
+            }
+
+          self->n_bins = n_bins;
+
+          pixels = gimp_histogram_get_count (self->histogram,
+                                             GIMP_HISTOGRAM_VALUE, 0, n_bins - 1);
+
+          if (gimp_histogram_n_components (self->histogram) == 1 ||
+              gimp_histogram_n_components (self->histogram) == 2)
+            max = 1;
+          else
+            max = 3;
+
+          for (k = 0; k < 3; k++)
+            {
+              gdouble sum = 0;
+              gint    i;
+
+             for (i = 0; i < n_bins; i++)
+                {
+                  gdouble histi;
+
+                  histi = gimp_histogram_get_component (self->histogram, k, i);
+
+                  sum += histi;
+
+                  self->values[k * n_bins + i] = sum / pixels;
+
+                  if (max == 1)
+                    {
+                      self->values[n_bins + i] = self->values[i];
+                      self->values[2 * n_bins + i] = self->values[i];
+                    }
+                }
+           }
+        }
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static inline float
+gimp_operation_equalize_map (GimpOperationEqualize *self,
+                             gint                   component,
+                             gfloat                 value)
+{
+  gint index;
+  index = component * self->n_bins + \
+            (gint) (CLAMP (value * (self->n_bins - 1), 0.0, self->n_bins - 1));
+
+  return self->values[index];
+}
+
+static gboolean
+gimp_operation_equalize_process (GeglOperation       *operation,
+                                 void                *in_buf,
+                                 void                *out_buf,
+                                 glong                samples,
+                                 const GeglRectangle *roi,
+                                 gint                 level)
+{
+  GimpOperationEqualize *self = GIMP_OPERATION_EQUALIZE (operation);
+  gfloat                *src  = in_buf;
+  gfloat                *dest = out_buf;
+
+  while (samples--)
+    {
+      dest[RED]   = gimp_operation_equalize_map (self, RED,   src[RED]);
+      dest[GREEN] = gimp_operation_equalize_map (self, GREEN, src[GREEN]);
+      dest[BLUE]  = gimp_operation_equalize_map (self, BLUE,  src[BLUE]);
+      dest[ALPHA] = src[ALPHA];
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationequalize.h b/app/operations/gimpoperationequalize.h
new file mode 100644
index 0000000..ea03b18
--- /dev/null
+++ b/app/operations/gimpoperationequalize.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationequalize.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_EQUALIZE_H__
+#define __GIMP_OPERATION_EQUALIZE_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_EQUALIZE            (gimp_operation_equalize_get_type ())
+#define GIMP_OPERATION_EQUALIZE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_EQUALIZE, GimpOperationEqualize))
+#define GIMP_OPERATION_EQUALIZE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_EQUALIZE, GimpOperationEqualizeClass))
+#define GIMP_IS_OPERATION_EQUALIZE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_EQUALIZE))
+#define GIMP_IS_OPERATION_EQUALIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_EQUALIZE))
+#define GIMP_OPERATION_EQUALIZE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_EQUALIZE, GimpOperationEqualizeClass))
+
+
+typedef struct _GimpOperationEqualize      GimpOperationEqualize;
+typedef struct _GimpOperationEqualizeClass GimpOperationEqualizeClass;
+
+struct _GimpOperationEqualize
+{
+  GimpOperationPointFilter  parent_instance;
+
+  GimpHistogram            *histogram;
+  gdouble                  *values;
+  gint                      n_bins;
+};
+
+struct _GimpOperationEqualizeClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_equalize_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_EQUALIZE_H__ */
diff --git a/app/operations/gimpoperationfillsource.c b/app/operations/gimpoperationfillsource.c
new file mode 100644
index 0000000..5811611
--- /dev/null
+++ b/app/operations/gimpoperationfillsource.c
@@ -0,0 +1,254 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationfillsource.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "operations-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpfilloptions.h"
+
+#include "gimpoperationfillsource.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OPTIONS,
+  PROP_DRAWABLE,
+  PROP_PATTERN_OFFSET_X,
+  PROP_PATTERN_OFFSET_Y,
+};
+
+
+static void            gimp_operation_fill_source_dispose          (GObject              *object);
+static void            gimp_operation_fill_source_get_property     (GObject              *object,
+                                                                    guint                 property_id,
+                                                                    GValue               *value,
+                                                                    GParamSpec           *pspec);
+static void            gimp_operation_fill_source_set_property     (GObject              *object,
+                                                                    guint                 property_id,
+                                                                    const GValue         *value,
+                                                                    GParamSpec           *pspec);
+
+static GeglRectangle   gimp_operation_fill_source_get_bounding_box (GeglOperation        *operation);
+static void            gimp_operation_fill_source_prepare          (GeglOperation        *operation);
+static gboolean        gimp_operation_fill_source_process          (GeglOperation        *operation,
+                                                                    GeglOperationContext *context,
+                                                                    const gchar          *output_pad,
+                                                                    const GeglRectangle  *result,
+                                                                    gint                  level);
+
+
+G_DEFINE_TYPE (GimpOperationFillSource, gimp_operation_fill_source,
+               GEGL_TYPE_OPERATION_SOURCE)
+
+#define parent_class gimp_operation_fill_source_parent_class
+
+
+static void
+gimp_operation_fill_source_class_init (GimpOperationFillSourceClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+
+  object_class->dispose             = gimp_operation_fill_source_dispose;
+  object_class->set_property        = gimp_operation_fill_source_set_property;
+  object_class->get_property        = gimp_operation_fill_source_get_property;
+
+  operation_class->get_bounding_box = gimp_operation_fill_source_get_bounding_box;
+  operation_class->prepare          = gimp_operation_fill_source_prepare;
+  operation_class->process          = gimp_operation_fill_source_process;
+
+  operation_class->threaded         = FALSE;
+  operation_class->cache_policy     = GEGL_CACHE_POLICY_NEVER;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:fill-source",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Fill Source operation",
+                                 NULL);
+
+  g_object_class_install_property (object_class, PROP_OPTIONS,
+                                   g_param_spec_object ("options",
+                                                        "Options",
+                                                        "Fill options",
+                                                        GIMP_TYPE_FILL_OPTIONS,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_DRAWABLE,
+                                   g_param_spec_object ("drawable",
+                                                        "Drawable",
+                                                        "Fill drawable",
+                                                        GIMP_TYPE_DRAWABLE,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_PATTERN_OFFSET_X,
+                                   g_param_spec_int  ("pattern-offset-x",
+                                                      "Pattern X-offset",
+                                                      "Pattern X-offset",
+                                                      G_MININT, G_MAXINT, 0,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PATTERN_OFFSET_Y,
+                                   g_param_spec_int  ("pattern-offset-y",
+                                                      "Pattern Y-offset",
+                                                      "Pattern Y-offset",
+                                                      G_MININT, G_MAXINT, 0,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_fill_source_init (GimpOperationFillSource *self)
+{
+}
+
+static void
+gimp_operation_fill_source_dispose (GObject *object)
+{
+  GimpOperationFillSource *fill_source = GIMP_OPERATION_FILL_SOURCE (object);
+
+  g_clear_object (&fill_source->options);
+  g_clear_object (&fill_source->drawable);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_operation_fill_source_get_property (GObject    *object,
+                                         guint       property_id,
+                                         GValue     *value,
+                                         GParamSpec *pspec)
+{
+  GimpOperationFillSource *fill_source = GIMP_OPERATION_FILL_SOURCE (object);
+
+  switch (property_id)
+    {
+    case PROP_OPTIONS:
+      g_value_set_object (value, fill_source->options);
+      break;
+
+    case PROP_DRAWABLE:
+      g_value_set_object (value, fill_source->drawable);
+      break;
+
+    case PROP_PATTERN_OFFSET_X:
+      g_value_set_int (value, fill_source->pattern_offset_x);
+      break;
+
+    case PROP_PATTERN_OFFSET_Y:
+      g_value_set_int (value, fill_source->pattern_offset_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_fill_source_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpOperationFillSource *fill_source = GIMP_OPERATION_FILL_SOURCE (object);
+
+  switch (property_id)
+    {
+    case PROP_OPTIONS:
+      g_set_object (&fill_source->options, g_value_get_object (value));
+      break;
+
+    case PROP_DRAWABLE:
+      g_set_object (&fill_source->drawable, g_value_get_object (value));
+      break;
+
+    case PROP_PATTERN_OFFSET_X:
+      fill_source->pattern_offset_x = g_value_get_int (value);
+      break;
+
+    case PROP_PATTERN_OFFSET_Y:
+      fill_source->pattern_offset_y = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GeglRectangle
+gimp_operation_fill_source_get_bounding_box (GeglOperation *operation)
+{
+  return gegl_rectangle_infinite_plane ();
+}
+
+static void
+gimp_operation_fill_source_prepare (GeglOperation *operation)
+{
+  GimpOperationFillSource *fill_source = GIMP_OPERATION_FILL_SOURCE (operation);
+  const Babl              *format      = NULL;
+
+  if (fill_source->options && fill_source->drawable)
+    {
+      format = gimp_fill_options_get_format (fill_source->options,
+                                             fill_source->drawable);
+    }
+
+  gegl_operation_set_format (operation, "output", format);
+}
+
+static gboolean
+gimp_operation_fill_source_process (GeglOperation        *operation,
+                                    GeglOperationContext *context,
+                                    const gchar          *output_pad,
+                                    const GeglRectangle  *result,
+                                    gint                  level)
+{
+  GimpOperationFillSource *fill_source = GIMP_OPERATION_FILL_SOURCE (operation);
+
+  if (fill_source->options && fill_source->drawable)
+    {
+      GeglBuffer    *buffer;
+      GeglRectangle  rect;
+
+      gegl_rectangle_align_to_buffer (
+        &rect, result,
+        gimp_drawable_get_buffer (fill_source->drawable),
+        GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      buffer = gimp_fill_options_create_buffer (fill_source->options,
+                                                fill_source->drawable,
+                                                &rect,
+                                                fill_source->pattern_offset_x,
+                                                fill_source->pattern_offset_y);
+
+      gegl_operation_context_take_object (context, "output", G_OBJECT (buffer));
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationfillsource.h b/app/operations/gimpoperationfillsource.h
new file mode 100644
index 0000000..6a9f468
--- /dev/null
+++ b/app/operations/gimpoperationfillsource.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationfillsource.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_FILL_SOURCE_H__
+#define __GIMP_OPERATION_FILL_SOURCE_H__
+
+
+#define GIMP_TYPE_OPERATION_FILL_SOURCE            (gimp_operation_fill_source_get_type ())
+#define GIMP_OPERATION_FILL_SOURCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_FILL_SOURCE, GimpOperationFillSource))
+#define GIMP_OPERATION_FILL_SOURCE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_FILL_SOURCE, GimpOperationFillSourceClass))
+#define GIMP_IS_OPERATION_FILL_SOURCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_FILL_SOURCE))
+#define GIMP_IS_OPERATION_FILL_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_FILL_SOURCE))
+#define GIMP_OPERATION_FILL_SOURCE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_FILL_SOURCE, GimpOperationFillSourceClass))
+
+
+typedef struct _GimpOperationFillSource      GimpOperationFillSource;
+typedef struct _GimpOperationFillSourceClass GimpOperationFillSourceClass;
+
+struct _GimpOperationFillSource
+{
+  GeglOperationSource  parent_instance;
+
+  GimpFillOptions     *options;
+  GimpDrawable        *drawable;
+  gint                 pattern_offset_x;
+  gint                 pattern_offset_y;
+};
+
+struct _GimpOperationFillSourceClass
+{
+  GeglOperationSourceClass  parent_class;
+};
+
+
+GType   gimp_operation_fill_source_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_FILL_SOURCE_H__ */
diff --git a/app/operations/gimpoperationflood.c b/app/operations/gimpoperationflood.c
new file mode 100644
index 0000000..b35fe2e
--- /dev/null
+++ b/app/operations/gimpoperationflood.c
@@ -0,0 +1,1104 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationflood.c
+ * Copyright (C) 2016 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+/* Implementation of the Flood algorithm.
+ * See https://wiki.gimp.org/wiki/Algorithms:Flood for details.
+ */
+
+
+#include "config.h"
+
+#include <string.h> /* For `memcpy()`. */
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationflood.h"
+
+
+/* Maximal gap, in pixels, between consecutive dirty ranges, below (and
+ * including) which they are coalesced, at the beginning of the distribution
+ * step.
+ */
+#define GIMP_OPERATION_FLOOD_COALESCE_MAX_GAP 32
+
+
+typedef struct _GimpOperationFloodSegment    GimpOperationFloodSegment;
+typedef struct _GimpOperationFloodDirtyRange GimpOperationFloodDirtyRange;
+typedef struct _GimpOperationFloodContext    GimpOperationFloodContext;
+
+
+/* A segment. */
+struct _GimpOperationFloodSegment
+{
+  /* A boolean flag indicating whether the image- and ROI-virtual coordinate
+   * systems should be transposed when processing this segment.  TRUE iff the
+   * segment is vertical.
+   */
+  guint  transpose      : 1;
+
+  /* The y-coordinate of the segment, in the ROI-virtual coordinate system. */
+  guint  y              : 8 * sizeof (guint) - 3;
+  /* The difference between the y-coordinates of the source segment and this
+   * segment, in the ROI-virtual coordinate system.  Either -1 or +1 for
+   * ordinary segments, and 0 for seed segments, as a special case.
+   *
+   * Note the use of `signed` as the type specifier.  The C standard doesn't
+   * specify the signedness of bit-fields whose type specifier is `int`, or a
+   * typedef-name defined as `int`, such as `gint`.
+   */
+  signed source_y_delta : 2;
+
+  /* The x-coordinates of the first and last pixels of the segment, in the ROI-
+   * virtual coordinate system.  Note that this is a closed range:
+   * [x[0], x[1]].
+   */
+  gint   x[2];
+};
+/* Make sure the maximal image dimension fits in
+ * `GimpOperationFloodSegment::y`.
+ */
+G_STATIC_ASSERT (GIMP_MAX_IMAGE_SIZE <= (1 << (8 * sizeof (guint) - 3)));
+
+/* A dirty range of the current segment. */
+struct _GimpOperationFloodDirtyRange
+{
+  /* A boolean flag indicating whether the range was extended, or its existing
+   * pixels were modified, during the horizontal propagation step.
+   */
+  gboolean modified;
+
+  /* The x-coordinates of the first and last pixels of the range, in the ROI-
+   * virtual coordinate system.  Note that this is a closed range:
+   * [x[0], x[1]].
+   */
+  gint     x[2];
+};
+
+/* Common parameters for the various parts of the algorithm. */
+struct _GimpOperationFloodContext
+{
+  /* Input image. */
+  GeglBuffer                *input;
+  /* Input image format. */
+  const Babl                *input_format;
+  /* Output image. */
+  GeglBuffer                *output;
+  /* Output image format. */
+  const Babl                *output_format;
+
+  /* Region of interset. */
+  GeglRectangle  roi;
+
+  /* Current segment. */
+  GimpOperationFloodSegment  segment;
+
+  /* The following arrays hold the ground- and water-level of the current- and
+   * source-segments.  The vertical- and horizontal-propagation steps don't
+   * generally access the input and output GEGL buffers directly, but rather
+   * read from, and write to, these arrays, for efficiency.  These arrays are
+   * read-from, and written-to, the corresponding GEGL buffers before and after
+   * these steps.
+   */
+
+  /* Ground level of the current segment, indexed by x-coordinate in the ROI-
+   * virtual coordinate system.  Only valid inside the range
+   * `[segment.x[0], segment.x[1]]`.
+   */
+  gfloat                    *ground;
+  /* Water level of the current segment, indexed by x-coordinate in the ROI-
+   * virtual coordinate system.  Initially only valid inside the range
+   * `[segment.x[0], segment.x[1]]`, but may be written-to outside this range
+   * during horizontal propagation, if the dirty ranges are extended past the
+   * bounds of the segment.
+   */
+  gfloat                    *water;
+  /* Water level of the source segment, indexed by x-coordinate in the ROI-
+   * virtual coordinate system.  Only valid inside the range
+   * `[segment.x[0], segment.x[1]]`.
+   */
+  gfloat                    *source_water;
+
+  /* A common buffer for the water level of the current- and source-segments.
+   * `water` and `source_water` are pointers into this buffer.  This buffer is
+   * used as an optimization, in order to read the water level of both segments
+   * from the output GEGL buffer in a single call, and is otherwise not used
+   * directly (`water` and `source_water` are used to access the water level
+   * instead.)
+   */
+  gfloat                    *water_buffer;
+};
+
+
+static void          gimp_operation_flood_prepare                      (GeglOperation                     *operation);
+static GeglRectangle gimp_operation_flood_get_required_for_output      (GeglOperation                     *self,
+                                                                        const gchar                       *input_pad,
+                                                                        const GeglRectangle               *roi);
+static GeglRectangle gimp_operation_flood_get_cached_region            (GeglOperation                     *self,
+                                                                        const GeglRectangle               *roi);
+
+static void          gimp_operation_flood_process_push                 (GQueue                            *queue,
+                                                                        gboolean                           transpose,
+                                                                        gint                               y,
+                                                                        gint                               source_y_delta,
+                                                                        gint                               x0,
+                                                                        gint                               x1);
+static void          gimp_operation_flood_process_seed                 (GQueue                            *queue,
+                                                                        const GeglRectangle               *roi);
+static void          gimp_operation_flood_process_transform_rect       (const GimpOperationFloodContext    *ctx,
+                                                                        GeglRectangle                      *dest,
+                                                                        const GeglRectangle                *src);
+static void          gimp_operation_flood_process_fetch                (GimpOperationFloodContext          *ctx);
+static gint          gimp_operation_flood_process_propagate_vertical   (GimpOperationFloodContext          *ctx,
+                                                                        GimpOperationFloodDirtyRange       *dirty_ranges);
+static void          gimp_operation_flood_process_propagate_horizontal (GimpOperationFloodContext          *ctx,
+                                                                        gint                                dir,
+                                                                        GimpOperationFloodDirtyRange       *dirty_ranges,
+                                                                        gint                                range_count);
+static gint         gimp_operation_flood_process_coalesce              (const GimpOperationFloodContext    *ctx,
+                                                                        GimpOperationFloodDirtyRange       *dirty_ranges,
+                                                                        gint                                range_count,
+                                                                        gint                                gap);
+static void          gimp_operation_flood_process_commit               (const GimpOperationFloodContext    *ctx,
+                                                                        const GimpOperationFloodDirtyRange *dirty_ranges,
+                                                                        gint                                range_count);
+static void          gimp_operation_flood_process_distribute           (const GimpOperationFloodContext    *ctx,
+                                                                        GQueue                             *queue,
+                                                                        const GimpOperationFloodDirtyRange *dirty_ranges,
+                                                                        gint                                range_count);
+static gboolean      gimp_operation_flood_process                      (GeglOperation                      *operation,
+                                                                        GeglBuffer                         *input,
+                                                                        GeglBuffer                         *output,
+                                                                        const GeglRectangle                *roi,
+                                                                        gint                                level);
+
+
+G_DEFINE_TYPE (GimpOperationFlood, gimp_operation_flood,
+               GEGL_TYPE_OPERATION_FILTER)
+
+#define parent_class gimp_operation_flood_parent_class
+
+
+/* GEGL graph for the test case. */
+static const gchar* reference_xml = "<?xml version='1.0' encoding='UTF-8'?>"
+"<gegl>"
+"<node operation='gimp:flood'> </node>"
+"<node operation='gegl:load'>"
+"  <params>"
+"    <param name='path'>flood-input.png</param>"
+"  </params>"
+"</node>"
+"</gegl>";
+
+
+static void
+gimp_operation_flood_class_init (GimpOperationFloodClass *klass)
+{
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationFilterClass *filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
+
+  /* The input and output buffers must be different, since we generally need to
+   * be able to access the input-image values after having written to the
+   * output buffer.
+   */
+  operation_class->want_in_place = FALSE;
+  /* We don't want `GeglOperationFilter` to split the image across multiple
+   * threads, since this operation depends on, and affects, the image as a
+   * whole.
+   */
+  operation_class->threaded      = FALSE;
+  /* Note that both of these options are the default; we set them here for
+   * explicitness.
+   */
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:flood",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Flood operation",
+                                 "reference", "https://wiki.gimp.org/wiki/Algorithms:Flood",
+                                 "reference-image", "flood-output.png",
+                                 "reference-composition", reference_xml,
+                                 NULL);
+
+  operation_class->prepare                 = gimp_operation_flood_prepare;
+  operation_class->get_required_for_output = gimp_operation_flood_get_required_for_output;
+  operation_class->get_cached_region       = gimp_operation_flood_get_cached_region;
+
+  filter_class->process                    = gimp_operation_flood_process;
+}
+
+static void
+gimp_operation_flood_init (GimpOperationFlood *self)
+{
+}
+
+static void
+gimp_operation_flood_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("Y float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("Y float", space));
+}
+
+static GeglRectangle
+gimp_operation_flood_get_required_for_output (GeglOperation       *self,
+                                              const gchar         *input_pad,
+                                              const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static GeglRectangle
+gimp_operation_flood_get_cached_region (GeglOperation       *self,
+                                        const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+
+/* Pushes a single segment into the queue. */
+static void
+gimp_operation_flood_process_push (GQueue   *queue,
+                                   gboolean  transpose,
+                                   gint      y,
+                                   gint      source_y_delta,
+                                   gint      x0,
+                                   gint      x1)
+{
+  GimpOperationFloodSegment *segment;
+
+  segment                 = g_slice_new (GimpOperationFloodSegment);
+
+  segment->transpose      = transpose;
+  segment->y              = y;
+  segment->source_y_delta = source_y_delta;
+  segment->x[0]           = x0;
+  segment->x[1]           = x1;
+
+  g_queue_push_tail (queue, segment);
+}
+
+/* Pushes the seed segments into the queue.  Recall that the seed segments are
+ * indicated by having their `source_y_delta` field equal 0.
+ *
+ * `roi` is given in the image-physical coordinate system.
+ */
+static void
+gimp_operation_flood_process_seed (GQueue              *queue,
+                                   const GeglRectangle *roi)
+{
+  if (roi->width == 0 || roi->height == 0)
+    return;
+
+  /* Top edge. */
+  gimp_operation_flood_process_push (queue,
+                                     /* transpose      = */ FALSE,
+                                     /* y              = */ 0,
+                                     /* source_y_delta = */ 0,
+                                     /* x0             = */ 0,
+                                     /* x1             = */ roi->width - 1);
+
+  if (roi->height == 1)
+    return;
+
+  /* Bottom edge. */
+  gimp_operation_flood_process_push (queue,
+                                     /* transpose      = */ FALSE,
+                                     /* y              = */ roi->height - 1,
+                                     /* source_y_delta = */ 0,
+                                     /* x0             = */ 0,
+                                     /* x1             = */ roi->width - 1);
+
+  if (roi->height == 2)
+    return;
+
+  /* Left edge. */
+  gimp_operation_flood_process_push (queue,
+                                     /* transpose      = */ TRUE,
+                                     /* y              = */ 0,
+                                     /* source_y_delta = */ 0,
+                                     /* x0             = */ 1,
+                                     /* x1             = */ roi->height - 2);
+
+  if (roi->width == 1)
+    return;
+
+  /* Right edge. */
+  gimp_operation_flood_process_push (queue,
+                                     /* transpose      = */ TRUE,
+                                     /* y              = */ roi->width - 1,
+                                     /* source_y_delta = */ 0,
+                                     /* x0             = */ 1,
+                                     /* x1             = */ roi->height - 2);
+}
+
+/* Transforms a `GeglRectangle` between the image-physical and image-virtual
+ * coordinate systems, in either direction, based on the attributes of the
+ * current segment (namely, its `transpose` flag.)
+ *
+ * Takes the input rectangle through `src`, and stores the result in `dest`.
+ * Both parameters may refer to the same object.
+ */
+static void
+gimp_operation_flood_process_transform_rect (const GimpOperationFloodContext *ctx,
+                                             GeglRectangle                   *dest,
+                                             const GeglRectangle             *src)
+{
+  if (! ctx->segment.transpose)
+    *dest = *src;
+  else
+    {
+      gint temp;
+
+      temp         = src->x;
+      dest->x      = src->y;
+      dest->y      = temp;
+
+      temp         = src->width;
+      dest->width  = src->height;
+      dest->height = temp;
+    }
+}
+
+/* Reads the ground- and water-level for the current- and source-segments from
+ * the GEGL buffers into the corresponding arrays.  Sets up the `water` and
+ * `source_water` pointers of `ctx` to point to the right location in
+ * `water_buffer`.
+ */
+static void
+gimp_operation_flood_process_fetch (GimpOperationFloodContext *ctx)
+{
+  /* Image-virtual and image-physical rectangles, respectively. */
+  GeglRectangle iv_rect, ip_rect;
+
+  /* Set the horizontal extent of the rectangle to span the entire segment. */
+  iv_rect.x     = ctx->roi.x + ctx->segment.x[0];
+  iv_rect.width = ctx->segment.x[1] - ctx->segment.x[0] + 1;
+
+  /* For reading the water level, we treat ordinary (non-seed) and seed
+   * segments differently.
+   */
+  if (ctx->segment.source_y_delta != 0)
+    {
+      /* Ordinary segment. */
+
+      /* We set the vertical extent of the rectangle to span both the current-
+       * and the source-segments, and set the `water` and `source_water`
+       * pointers to point to two consecutive rows of the `water_buffer` array
+       * (the y-coordinate of the rectangle, and which row is above which,
+       * depends on whether the source segment is above, or below, the current
+       * one.)
+       */
+      if (ctx->segment.source_y_delta < 0)
+        {
+          iv_rect.y         = ctx->roi.y + ctx->segment.y - 1;
+          ctx->water        = ctx->water_buffer + ctx->roi.width;
+          ctx->source_water = ctx->water_buffer;
+        }
+      else
+        {
+          iv_rect.y         = ctx->roi.y + ctx->segment.y;
+          ctx->water        = ctx->water_buffer;
+          ctx->source_water = ctx->water_buffer + ctx->roi.width;
+        }
+      iv_rect.height        = 2;
+
+      /* Transform `iv_rect` to the image-physical coordinate system, and store
+       * the result in `ip_rect`.
+       */
+      gimp_operation_flood_process_transform_rect (ctx, &ip_rect, &iv_rect);
+
+      /* Read the water level from the output GEGL buffer into `water_buffer`.
+       *
+       * Notice the stride:  If the current segment is horizontal, then we're
+       * reading a pair of rows directly into the correct locations inside
+       * `water_buffer` (i.e., `water` and `source_water`).  On the other hand,
+       * if the current segment is vertical, then we're reading a pair of
+       * *columns*; we set the stride to 2-pixels so that the current- and
+       * source-water levels are interleaved in `water_buffer`, and reorder
+       * them below.
+       */
+      gegl_buffer_get (ctx->output, &ip_rect, 1.0, ctx->output_format,
+                       ctx->water_buffer + ctx->segment.x[0],
+                       sizeof (gfloat) *
+                       (ctx->segment.transpose ? 2 : ctx->roi.width),
+                       GEGL_ABYSS_NONE);
+
+      /* As mentioned above, if the current segment is vertical, then the
+       * water levels of the current- and source-segments are interleaved in
+       * `water_buffer`.  We deinterleave the water levels into `water` and
+       * `source_water`, using the yet-to-be-written-to `ground` array as a
+       * temporary buffer, as necessary.
+       */
+      if (ctx->segment.transpose)
+        {
+          const gfloat *src;
+          gfloat       *dest1, *dest2, *temp;
+          gint          size, temp_size;
+          gint          i;
+
+          src       = ctx->water_buffer + ctx->segment.x[0];
+
+          dest1     = ctx->water_buffer + ctx->segment.x[0];
+          dest2     = ctx->water_buffer + ctx->roi.width + ctx->segment.x[0];
+          temp      = ctx->ground;
+
+          size      = ctx->segment.x[1] - ctx->segment.x[0] + 1;
+          temp_size = MAX (0, 2 * size - ctx->roi.width);
+
+          for (i = 0; i < temp_size; i++)
+            {
+              dest1[i] = src[2 * i];
+              temp[i]  = src[2 * i + 1];
+            }
+          for (; i < size; i++)
+            {
+              dest1[i] = src[2 * i];
+              dest2[i] = src[2 * i + 1];
+            }
+
+          memcpy (dest2, temp, sizeof (gfloat) * temp_size);
+        }
+    }
+  else
+    {
+      /* Seed segment. */
+
+      gint x;
+
+      /* Set the `water` and `source_water` pointers to point to consecutive
+       * rows of the `water_buffer` array.
+       */
+      ctx->water        = ctx->water_buffer;
+      ctx->source_water = ctx->water_buffer + ctx->roi.width;
+
+      /* Set the vertical extent of the rectangle to span a the current
+       * segment's row.
+       */
+      iv_rect.y      = ctx->roi.y + ctx->segment.y;
+      iv_rect.height = 1;
+
+      /* Transform `iv_rect` to the image-physical coordinate system, and store
+       * the result in `ip_rect`.
+       */
+      gimp_operation_flood_process_transform_rect (ctx, &ip_rect, &iv_rect);
+
+      /* Read the water level of the current segment from the output GEGL
+       * buffer into `water`.
+       */
+      gegl_buffer_get (ctx->output, &ip_rect, 1.0, ctx->output_format,
+                       ctx->water + ctx->segment.x[0],
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      /* Initialize `source_water` to 0, as this is a seed segment. */
+      for (x = ctx->segment.x[0]; x <= ctx->segment.x[1]; x++)
+        ctx->source_water[x] = 0.0;
+    }
+
+  /* Set the vertical extent of the rectangle to span a the current segment's
+   * row.
+   */
+  iv_rect.y      = ctx->roi.y + ctx->segment.y;
+  iv_rect.height = 1;
+
+  /* Transform `iv_rect` to the image-physical coordinate system, and store the
+   * result in `ip_rect`.
+   */
+  gimp_operation_flood_process_transform_rect (ctx, &ip_rect, &iv_rect);
+
+  /* Read the ground level of the current segment from the input GEGL buffer
+   * into `ground`.
+   */
+  gegl_buffer_get (ctx->input, &ip_rect, 1.0, ctx->input_format,
+                   ctx->ground + ctx->segment.x[0],
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+}
+
+/* Performs the vertical propagation step of the algorithm.  Writes the dirty
+ * ranges to the `dirty_ranges` parameter, and returns the number of dirty
+ * ranges as the function's result.
+ */
+static gint
+gimp_operation_flood_process_propagate_vertical (GimpOperationFloodContext    *ctx,
+                                                 GimpOperationFloodDirtyRange *dirty_ranges)
+{
+  GimpOperationFloodDirtyRange *range = dirty_ranges;
+  gint                          x;
+
+  for (x = ctx->segment.x[0]; x <= ctx->segment.x[1]; x++)
+    {
+      /* Scan the segment until we find a pixel whose water level needs to be
+       * updated.
+       */
+      if (ctx->source_water[x] < ctx->water[x] &&
+          ctx->ground[x]       < ctx->water[x])
+        {
+          /* Compute and update the water level. */
+          gfloat level = MAX (ctx->source_water[x], ctx->ground[x]);
+
+          ctx->water[x] = level;
+
+          /* Start a new dirty range at the current pixel. */
+          range->x[0]     = x;
+          range->modified = FALSE;
+
+          for (x++; x <= ctx->segment.x[1]; x++)
+            {
+              /* Keep scanning the segment while the water level of consecutive
+               * pixels needs to be updated.
+               */
+              if (ctx->source_water[x] < ctx->water[x] &&
+                  ctx->ground[x]       < ctx->water[x])
+                {
+                  /* Compute and update the water level. */
+                  gfloat other_level = MAX (ctx->source_water[x],
+                                            ctx->ground[x]);
+
+                  ctx->water[x] = other_level;
+
+                  /* If the water level of the current pixel, `other_level`,
+                   * equals the water level of the current dirty range,
+                   * `level`, we keep scanning, making the current pixel part
+                   * of the current range.  On the other hand, if the current
+                   * pixel's water level is different than the that of the
+                   * current range, we finalize the range, and start a new one
+                   * at the current pixel.
+                   */
+                  if (other_level != level)
+                    {
+                      range->x[1]     = x - 1;
+                      range++;
+
+                      range->x[0]     = x;
+                      range->modified = FALSE;
+                      level           = other_level;
+                    }
+                }
+              else
+                break;
+            }
+
+          /* Finalize the current dirty range. */
+          range->x[1] = x - 1;
+          range++;
+
+          /* Make sure we don't over-increment `x` on the continuation of the
+           * loop.
+           */
+          if (x > ctx->segment.x[1])
+            break;
+        }
+    }
+
+  /* Return the number of dirty ranges. */
+  return range - dirty_ranges;
+}
+
+/* Performs a single pass of the horizontal propagation step of the algorithm.
+ * `dir` controls the direction of the pass: either +1 for a left-to-right
+ * pass, or -1 for a right-to-left pass.  The dirty ranges are passed through
+ * the `dirty_ranges` array (and their number in `range_count`), and are
+ * modified in-place.
+ */
+static void
+gimp_operation_flood_process_propagate_horizontal (GimpOperationFloodContext    *ctx,
+                                                   gint                          dir,
+                                                   GimpOperationFloodDirtyRange *dirty_ranges,
+                                                   gint                          range_count)
+{
+  /* The index of the terminal (i.e., "`dir`-most") component of the `x[]`
+   * array of `GimpOperationFloodSegment` and `GimpOperationFloodDirtyRange`,
+   * based on the scan direction.  Equals 1 (i.e., the right component) when
+   * `dir` is +1 (i.e., left-to-right), and equals 0 (i.e., the left component)
+   * when `dir` is -1 (i.e., right-to-left).
+   */
+  gint          x_component;
+  /* One-past the final x-coordinate of the ROI, in the ROI-virtual coordinate
+   * system, based on the scan direction.  That is, the x-coordinate of the
+   * pixel to the right of the rightmost pixel, for a left-to-right scan, and
+   * of the pixel to the left of the leftmost pixel, for a right-to-left scan.
+   */
+  gint          roi_lim;
+  /* One-past the final x-coordinate of the segment, in the ROI-virtual
+   * coordinate system, based on the scan direction, in a similar fashion to
+   * `roi_lim`.
+   */
+  gint          segment_lim;
+  /* The indices of the first, and one-past-the-last dirty ranges, based on the
+   * direction of the scan.  Recall that when scanning right-to-left, we
+   * iterate over the ranges in reverse.
+   */
+  gint          first_range, last_range;
+  /* Index of the current dirty range. */
+  gint          range_index;
+  /* Image-virtual and image-physical rectangles, respectively. */
+  GeglRectangle iv_rect, ip_rect;
+
+  /* Initialize the above variables based on the scan direction. */
+  if (dir > 0)
+    {
+      /* Left-to-right. */
+      x_component = 1;
+      roi_lim     = ctx->roi.width;
+      first_range = 0;
+      last_range  = range_count;
+    }
+  else
+    {
+      /* Right-to-left. */
+      x_component = 0;
+      roi_lim     = -1;
+      first_range = range_count - 1;
+      last_range  = -1;
+    }
+  segment_lim     = ctx->segment.x[x_component] + dir;
+
+  /* We loop over the dirty ranges, in the direction of the scan.  For each
+   * range, we iterate over the pixels, in the scan direction, starting at the
+   * outer edge of the range, and update the water level, considering only the
+   * water level of the previous and current pixels, until we arrive at a pixel
+   * whose water level remains the same, at which point we move to the next
+   * range, as described in the algorithm overview.
+   */
+  for (range_index  = first_range;
+       range_index != last_range;
+       range_index += dir)
+    {
+      /* Current dirty range. */
+      GimpOperationFloodDirtyRange *range;
+      /* Current pixel, in the ROI-virtual coordinate system. */
+      gint                          x;
+      /* We use `level` to compute the water level of the current pixel.  At
+       * the beginning of each iteration, it holds the water level of the
+       * previous pixel.
+       */
+      gfloat                        level;
+      /* The `inside` flag indicates whether `x` is inside the current segment.
+       * Recall that we may iterate past the bounds of the current segment, in
+       * which case we need to read the ground- and water-levels from the GEGL
+       * buffers directly, instead of the corresponding arrays.
+       */
+      gboolean                      inside;
+      /* Loop limit. */
+      gint                          lim;
+
+      range  = &dirty_ranges[range_index];
+      /* Last x-coordinate of the range, in the direction of the scan. */
+      x      = range->x[x_component];
+      /* We start iterating on the pixel after `x`; initialize `level` to the
+       * water level of the previous pixel.
+       */
+      level  = ctx->water[x];
+      /* The ranges produced by the vertical propagation step are all within
+       * the bounds of the segment; the horizontal propagation step may only
+       * extend them in the direction of the scan.  Therefore, on both passes
+       * of the horizontal propagation step, the last pixel of each range, in
+       * the direction of the scan, is initially inside the segment.
+       */
+      inside = TRUE;
+      /* If this isn't the last range, break the loop at the beginning of the
+       * next range.  Otherwise, break the loop at the edge of the ROI.
+       */
+      if (range_index + dir != last_range)
+        lim  = (range + dir)->x[1 - x_component];
+      else
+        lim  = roi_lim;
+
+      /* Loop over the pixels between the edge of the current range, and the
+       * beginning of the next range (or the edge of the ROI).
+       */
+      for (x += dir; x != lim; x += dir)
+        {
+          gfloat ground_level, water_level;
+
+          /* Recall that `segment_lim` is one-past the last pixel of the
+           * segment.  If we hit it, we've gone outside the segment bounds.
+           */
+          if (x == segment_lim)
+            {
+              inside         = FALSE;
+              /* Initialize the rectangle to sample pixels directly from the
+               * GEGL buffers.
+               */
+              iv_rect.y      = ctx->roi.y + ctx->segment.y;
+              iv_rect.width  = 1;
+              iv_rect.height = 1;
+            }
+
+          /* If we're inside the segment, read the ground- and water-levels
+           * from the corresponding arrays; otherwise, read them from the GEGL
+           * buffers directly.  Note that, on each pass, we may only write to
+           * pixels outside the segment *in direction of the scan* (in which
+           * case, the new values are written to the `water` array, but not
+           * directly to the output GEGL buffer), hence, when reading from the
+           * GEGL buffers, there's no danger of reading stale values, that were
+           * changed on the previous pass.
+           */
+          if (inside)
+            {
+              ground_level = ctx->ground[x];
+              water_level  = ctx->water[x];
+            }
+          else
+            {
+              iv_rect.x = ctx->roi.x + x;
+
+              /* Transform `iv_rect` to the image-physical coordinate system,
+               * and store the result in `ip_rect`.
+               */
+              gimp_operation_flood_process_transform_rect (ctx,
+                                                           &ip_rect, &iv_rect);
+
+              /* Read the current pixel's ground level. */
+              gegl_buffer_get (ctx->input, &ip_rect, 1.0, ctx->input_format,
+                               &ground_level,
+                               GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+              /* Read the current pixel's water level. */
+              gegl_buffer_get (ctx->output, &ip_rect, 1.0, ctx->output_format,
+                               &water_level,
+                               GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+            }
+
+          /* The new water level is the maximum of the current ground level,
+           * and the minimum of the current and previous water levels.  Recall
+           * that `level` holds the previous water level, and that the current
+           * water level is never less than the ground level.
+           */
+          if (level < ground_level)
+            level             = ground_level;
+          if (level < water_level)
+            {
+              /* The water level changed.  Update the current pixel, and set
+               * the `modified` flag of the current range, since it will be
+               * extended to include the current pixel.
+               */
+              ctx->water[x]   = level;
+              range->modified = TRUE;
+            }
+          else
+            /* The water level stayed the same.  Break the loop. */
+            break;
+        }
+
+      /* Extend the current dirty range to include the last modified pixel, if
+       * any.
+       */
+      range->x[x_component] = x - dir;
+
+      /* If we stopped the loop before hitting the edge of the next range, or
+       * if we're at the last range, continue to the next range (or quit).
+       */
+      if (x != lim || range_index + dir == last_range)
+        continue;
+
+      /* If we hit the edge of the next range, we keep propagating the changes
+       * *inside* the next range, until we hit its other edge, or until the
+       * water level stays the same.
+       */
+      range += dir;
+      lim    = range->x[x_component] + dir;
+
+      for (; x != lim; x += dir)
+        {
+          /* Note that we're necessarily inside the segment right now, since
+           * the only range that could have been extended past the edge of the
+           * segment by the previous pass, is the first range of the current
+           * pass, while the range we're currently inside is at least the
+           * second.
+           */
+          if (level < ctx->ground[x])
+            level             = ctx->ground[x];
+          if (level < ctx->water[x])
+            {
+              ctx->water[x]   = level;
+              /* Set the `modified` flag of the range, since the water level of
+               * its existing pixels changed.
+               */
+              range->modified = TRUE;
+            }
+          else
+            break;
+        }
+    }
+}
+
+/* Coalesces consecutive dirty ranges that are separated by a gap less-than or
+ * equal-to `max_gap`, in-place, and returns the new number of ranges.
+ */
+static gint
+gimp_operation_flood_process_coalesce (const GimpOperationFloodContext *ctx,
+                                       GimpOperationFloodDirtyRange    *dirty_ranges,
+                                       gint                             range_count,
+                                       gint                             max_gap)
+{
+  /* First and last ranges to coalesce, respectively. */
+  const GimpOperationFloodDirtyRange *first_range, *last_range;
+  /* Destination range. */
+  GimpOperationFloodDirtyRange       *range = dirty_ranges;
+
+  for (first_range  = dirty_ranges;
+       first_range != dirty_ranges + range_count;
+       first_range++)
+    {
+      /* The `modified` flag of the coalesced range -- the logical-OR of the
+       * `modified` flags of the individual ranges.
+       */
+      gboolean modified = first_range->modified;
+
+      /* Find all consecutive ranges with a small-enough gap. */
+      for (last_range      = first_range;
+           last_range + 1 != dirty_ranges + range_count;
+           last_range++)
+        {
+          if ((last_range + 1)->x[0] - last_range->x[1] > max_gap)
+            break;
+
+          modified |= (last_range + 1)->modified;
+        }
+
+      /* Write the coalesced range, or copy the current range, to the
+       * destination range.
+       */
+      if (first_range != last_range || first_range != range)
+        {
+          range->x[0]     = first_range->x[0];
+          range->x[1]     = last_range->x[1];
+          range->modified = modified;
+        }
+
+      first_range = last_range;
+      range++;
+    }
+
+  /* Return the new range count. */
+  return range - dirty_ranges;
+}
+
+/* Writes the updated water level of the dirty ranges back to the output GEGL
+ * buffer.
+ */
+static void
+gimp_operation_flood_process_commit (const GimpOperationFloodContext    *ctx,
+                                     const GimpOperationFloodDirtyRange *dirty_ranges,
+                                     gint                                range_count)
+{
+  const GimpOperationFloodDirtyRange *range;
+  /* Image-virtual and image-physical rectangles, respectively. */
+  GeglRectangle                       iv_rect, ip_rect;
+
+  /* Set the vertical extent of the rectangle to span a the current segment's
+   * row.
+   */
+  iv_rect.y      = ctx->roi.y + ctx->segment.y;
+  iv_rect.height = 1;
+
+  for (range = dirty_ranges; range != dirty_ranges + range_count; range++)
+    {
+      /* Set the horizontal extent of the rectangle to span the dirty range. */
+      iv_rect.x     = ctx->roi.x + range->x[0];
+      iv_rect.width = range->x[1] - range->x[0] + 1;
+
+      /* Transform `iv_rect` to the image-physical coordinate system, and store
+       * the result in `ip_rect`.
+       */
+      gimp_operation_flood_process_transform_rect (ctx, &ip_rect, &iv_rect);
+
+      /* Write the updated water level to the output GEGL buffer. */
+      gegl_buffer_set (ctx->output, &ip_rect, 0, ctx->output_format,
+                       ctx->water + range->x[0],
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+}
+
+/* Pushes the new segments, corresponding to the dirty ranges of the current
+ * segment, into the queue.
+ */
+static void
+gimp_operation_flood_process_distribute (const GimpOperationFloodContext    *ctx,
+                                         GQueue                             *queue,
+                                         const GimpOperationFloodDirtyRange *dirty_ranges,
+                                         gint                                range_count)
+{
+  const GimpOperationFloodDirtyRange *range;
+  static const gint                   y_deltas[] = {-1, +1};
+  gint                                i;
+
+  /* For each neighboring row... */
+  for (i = 0; i < G_N_ELEMENTS (y_deltas); i++)
+    {
+      /* The difference between the negihboring row's y-coordinate and the
+       * current row's y-corindate, in the ROI-virtual coordinate system.
+       */
+      gint y_delta = y_deltas[i];
+      /* The negihboring row's y-coordinate in the ROI-virtual coordinate
+       * system.
+       */
+      gint y = ctx->segment.y + y_delta;
+
+      /* If the neighboring row is outside the ROI, skip it. */
+      if (y < 0 || y >= ctx->roi.height)
+        continue;
+
+      /* For each dirty range... */
+      for (range = dirty_ranges; range != dirty_ranges + range_count; range++)
+        {
+          /* If the range was modified during horizontal propagation, or if the
+           * neighboring row is not the source segment's row... (note that the
+           * latter is always true for seed segments.)
+           */
+          if (range->modified || y_delta != ctx->segment.source_y_delta)
+            {
+              /* Push a new segment into the queue, spanning the same pixels as
+               * the dirty range on the neighboring row, using the current row
+               * as its source segment.
+               */
+              gimp_operation_flood_process_push (queue,
+                                                 ctx->segment.transpose,
+                                                 y,
+                                                 -y_delta,
+                                                 range->x[0],
+                                                 range->x[1]);
+            }
+        }
+    }
+}
+
+/* Main algorithm. */
+static gboolean
+gimp_operation_flood_process (GeglOperation       *operation,
+                              GeglBuffer          *input,
+                              GeglBuffer          *output,
+                              const GeglRectangle *roi,
+                              gint                 level)
+{
+  const Babl                   *input_format  = gegl_operation_get_format (operation, "input");
+  const Babl                   *output_format = gegl_operation_get_format (operation, "output");
+  GeglColor                    *color;
+  gint                          max_size;
+  GimpOperationFloodContext     ctx;
+  GimpOperationFloodDirtyRange *dirty_ranges;
+  GQueue                       *queue;
+
+  /* Make sure the input- and output-buffers are different. */
+  g_return_val_if_fail (input != output, FALSE);
+
+  /* Make sure the ROI is small enough for the `GimpOperationFloodSegment::y`
+   * field.
+   */
+  g_return_val_if_fail (roi->width  <= GIMP_MAX_IMAGE_SIZE &&
+                        roi->height <= GIMP_MAX_IMAGE_SIZE, FALSE);
+
+  ctx.input         = input;
+  ctx.input_format  = input_format;
+  ctx.output        = output;
+  ctx.output_format = output_format;
+
+  /* All buffers need to have enough capacity to process a full row, or a full
+   * column, since, when processing vertical segments, we treat the image as
+   * transposed.
+   */
+  max_size          = MAX (roi->width, roi->height);
+  ctx.ground        = g_new (gfloat, max_size);
+  /* The `water_buffer` array needs to be able to hold two rows (or columns). */
+  ctx.water_buffer  = g_new (gfloat, 2 * max_size);
+  dirty_ranges      = g_new (GimpOperationFloodDirtyRange, max_size);
+
+  /* Initialize the water level to 1 everywhere. */
+  color = gegl_color_new ("#fff");
+  gegl_buffer_set_color (output, roi, color);
+  g_object_unref (color);
+
+  /* Create the queue and push the seed segments. */
+  queue  = g_queue_new ();
+  gimp_operation_flood_process_seed (queue, roi);
+
+  /* While there are segments to process in the queue... */
+  while (! g_queue_is_empty (queue))
+    {
+      GimpOperationFloodSegment *segment;
+      gint                       range_count;
+
+      /* Pop a segment off the top of the queue, copy it to `ctx.segment`, and
+       * free its memory.
+       */
+      segment     = (GimpOperationFloodSegment *) g_queue_pop_head (queue);
+      ctx.segment = *segment;
+      g_slice_free (GimpOperationFloodSegment, segment);
+
+      /* Transform the ROI from the image-physical coordinate system to the
+       * image-virtual coordinate system, and store the result in `ctx.roi`.
+       */
+      gimp_operation_flood_process_transform_rect (&ctx, &ctx.roi, roi);
+
+      /* Read the ground- and water-levels of the current- and source-segments
+       * from the corresponding GEGL buffers to the corresponding arrays.
+       */
+      gimp_operation_flood_process_fetch (&ctx);
+
+      /* Perform the vertical propagation step. */
+      range_count = gimp_operation_flood_process_propagate_vertical (&ctx,
+                                                                     dirty_ranges);
+      /* If no dirty ranges were produced during vertical propagation, then the
+       * water level of the current segment didn't change, and we can short-
+       * circuit early.
+       */
+      if (range_count == 0)
+        continue;
+
+      /* Perform both passes of the horizontal propagation step. */
+      gimp_operation_flood_process_propagate_horizontal (&ctx,
+                                                         /* Left-to-right */ +1,
+                                                         dirty_ranges,
+                                                         range_count);
+      gimp_operation_flood_process_propagate_horizontal (&ctx,
+                                                         /* Right-to-left */ -1,
+                                                         dirty_ranges,
+                                                         range_count);
+
+      /* Coalesce consecutive dirty ranges separated by a gap less-than or
+       * equal-to `GIMP_OPERATION_FLOOD_COALESCE_MAX_GAP`.
+       */
+      range_count = gimp_operation_flood_process_coalesce (&ctx,
+                                                           dirty_ranges,
+                                                           range_count,
+                                                           GIMP_OPERATION_FLOOD_COALESCE_MAX_GAP);
+
+      /* Write the updated water level back to the output GEGL buffer. */
+      gimp_operation_flood_process_commit (&ctx, dirty_ranges, range_count);
+
+      /* Push the new segments into the queue. */
+      gimp_operation_flood_process_distribute (&ctx, queue,
+                                               dirty_ranges, range_count);
+    }
+
+  g_queue_free (queue);
+
+  g_free (dirty_ranges);
+  g_free (ctx.water_buffer);
+  g_free (ctx.ground);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationflood.h b/app/operations/gimpoperationflood.h
new file mode 100644
index 0000000..ed2c1c6
--- /dev/null
+++ b/app/operations/gimpoperationflood.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationflood.h
+ * Copyright (C) 2016 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_FLOOD_H__
+#define __GIMP_OPERATION_FLOOD_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_FLOOD            (gimp_operation_flood_get_type ())
+#define GIMP_OPERATION_FLOOD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_FLOOD, GimpOperationFlood))
+#define GIMP_OPERATION_FLOOD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_FLOOD, GimpOperationFloodClass))
+#define GIMP_IS_OPERATION_FLOOD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_FLOOD))
+#define GIMP_IS_OPERATION_FLOOD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_FLOOD))
+#define GIMP_OPERATION_FLOOD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_FLOOD, GimpOperationFloodClass))
+
+
+typedef struct _GimpOperationFlood      GimpOperationFlood;
+typedef struct _GimpOperationFloodClass GimpOperationFloodClass;
+
+struct _GimpOperationFlood
+{
+  GeglOperationFilter  parent_instance;
+};
+
+struct _GimpOperationFloodClass
+{
+  GeglOperationFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_flood_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_FLOOD_H__ */
diff --git a/app/operations/gimpoperationgradient.c b/app/operations/gimpoperationgradient.c
new file mode 100644
index 0000000..2dbb746
--- /dev/null
+++ b/app/operations/gimpoperationgradient.c
@@ -0,0 +1,1283 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Largely based on gimpdrawable-gradient.c
+ *
+ * gimpoperationgradient.c
+ * Copyright (C) 2014 Michael Henning <drawoc@darkrefraction.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "core/gimpgradient.h"
+
+#include "gimpoperationgradient.h"
+
+
+#define GRADIENT_CACHE_N_SUPERSAMPLES 4
+#define GRADIENT_CACHE_MAX_SIZE       ((1 << 20) / sizeof (GimpRGB))
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_GRADIENT,
+  PROP_START_X,
+  PROP_START_Y,
+  PROP_END_X,
+  PROP_END_Y,
+  PROP_GRADIENT_TYPE,
+  PROP_GRADIENT_REPEAT,
+  PROP_OFFSET,
+  PROP_GRADIENT_REVERSE,
+  PROP_GRADIENT_BLEND_COLOR_SPACE,
+  PROP_SUPERSAMPLE,
+  PROP_SUPERSAMPLE_DEPTH,
+  PROP_SUPERSAMPLE_THRESHOLD,
+  PROP_DITHER
+};
+
+typedef struct
+{
+  GimpGradient                *gradient;
+  gboolean                     reverse;
+  GimpGradientBlendColorSpace  blend_color_space;
+  GimpRGB                     *gradient_cache;
+  gint                         gradient_cache_size;
+  GimpGradientSegment         *last_seg;
+  gdouble                      offset;
+  gdouble                      sx, sy;
+  GimpGradientType             gradient_type;
+  gdouble                      dist;
+  gdouble                      vec[2];
+  GimpRepeatMode               repeat;
+  GeglSampler                 *dist_sampler;
+} RenderBlendData;
+
+
+typedef struct
+{
+  gfloat        *data;
+  GeglRectangle  roi;
+  GRand         *dither_rand;
+} PutPixelData;
+
+
+/*  local function prototypes  */
+
+static void            gimp_operation_gradient_dispose           (GObject               *gobject);
+static void            gimp_operation_gradient_finalize          (GObject               *gobject);
+static void            gimp_operation_gradient_get_property      (GObject               *object,
+                                                                  guint                  property_id,
+                                                                  GValue                *value,
+                                                                  GParamSpec            *pspec);
+static void            gimp_operation_gradient_set_property      (GObject               *object,
+                                                                  guint                  property_id,
+                                                                  const GValue          *value,
+                                                                  GParamSpec            *pspec);
+
+static void            gimp_operation_gradient_prepare           (GeglOperation         *operation);
+
+static GeglRectangle   gimp_operation_gradient_get_bounding_box  (GeglOperation         *operation);
+
+static gdouble         gradient_calc_conical_sym_factor          (gdouble                dist,
+                                                                  gdouble               *axis,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_conical_asym_factor         (gdouble                dist,
+                                                                  gdouble               *axis,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_square_factor               (gdouble                dist,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_radial_factor               (gdouble                dist,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_linear_factor               (gdouble                dist,
+                                                                  gdouble               *vec,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_bilinear_factor             (gdouble                dist,
+                                                                  gdouble               *vec,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_spiral_factor               (gdouble                dist,
+                                                                  gdouble               *axis,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y,
+                                                                  gboolean               clockwise);
+
+static gdouble         gradient_calc_shapeburst_angular_factor   (GeglSampler           *dist_sampler,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_shapeburst_spherical_factor (GeglSampler           *dist_sampler,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+static gdouble         gradient_calc_shapeburst_dimpled_factor   (GeglSampler           *dist_sampler,
+                                                                  gdouble                offset,
+                                                                  gdouble                x,
+                                                                  gdouble                y);
+
+static void            gradient_render_pixel                     (gdouble                x,
+                                                                  gdouble                y,
+                                                                  GimpRGB               *color,
+                                                                  gpointer               render_data);
+
+static void            gradient_put_pixel                        (gint                   x,
+                                                                  gint                   y,
+                                                                  GimpRGB               *color,
+                                                                  gpointer               put_pixel_data);
+
+static void            gradient_dither_pixel                     (GimpRGB               *color,
+                                                                  GRand                 *dither_rand,
+                                                                  gfloat                *dest);
+
+static gboolean        gimp_operation_gradient_process           (GeglOperation         *operation,
+                                                                  GeglBuffer            *input,
+                                                                  GeglBuffer            *output,
+                                                                  const GeglRectangle   *result,
+                                                                  gint                   level);
+
+static void            gimp_operation_gradient_invalidate_cache  (GimpOperationGradient *self);
+static void            gimp_operation_gradient_validate_cache    (GimpOperationGradient *self);
+
+
+G_DEFINE_TYPE (GimpOperationGradient, gimp_operation_gradient,
+               GEGL_TYPE_OPERATION_FILTER)
+
+#define parent_class gimp_operation_gradient_parent_class
+
+
+static void
+gimp_operation_gradient_class_init (GimpOperationGradientClass *klass)
+{
+  GObjectClass             *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationFilterClass *filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
+
+  object_class->dispose             = gimp_operation_gradient_dispose;
+  object_class->finalize            = gimp_operation_gradient_finalize;
+  object_class->set_property        = gimp_operation_gradient_set_property;
+  object_class->get_property        = gimp_operation_gradient_get_property;
+
+  operation_class->prepare          = gimp_operation_gradient_prepare;
+  operation_class->get_bounding_box = gimp_operation_gradient_get_bounding_box;
+
+  filter_class->process             = gimp_operation_gradient_process;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:gradient",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Gradient operation",
+                                 NULL);
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        "Context",
+                                                        "A GimpContext",
+                                                        GIMP_TYPE_OBJECT,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GRADIENT,
+                                   g_param_spec_object ("gradient",
+                                                        "Gradient",
+                                                        "A GimpGradient to render",
+                                                        GIMP_TYPE_OBJECT,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_START_X,
+                                   g_param_spec_double ("start-x",
+                                                        "Start X",
+                                                        "X coordinate of the first point",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_START_Y,
+                                   g_param_spec_double ("start-y",
+                                                        "Start Y",
+                                                        "Y coordinate of the first point",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_END_X,
+                                   g_param_spec_double ("end-x",
+                                                        "End X",
+                                                        "X coordinate of the second point",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 200,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_END_Y,
+                                   g_param_spec_double ("end-y",
+                                                        "End Y",
+                                                        "Y coordinate of the second point",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 200,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GRADIENT_TYPE,
+                                   g_param_spec_enum ("gradient-type",
+                                                      "Gradient Type",
+                                                      "The type of gradient to render",
+                                                      GIMP_TYPE_GRADIENT_TYPE,
+                                                      GIMP_GRADIENT_LINEAR,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GRADIENT_REPEAT,
+                                   g_param_spec_enum ("gradient-repeat",
+                                                      "Repeat mode",
+                                                      "Repeat mode",
+                                                      GIMP_TYPE_REPEAT_MODE,
+                                                      GIMP_REPEAT_NONE,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_OFFSET,
+                                   g_param_spec_double ("offset",
+                                                        "Offset",
+                                                        "Offset relates to the starting and ending coordinates "
+                                                        "specified for the blend. This parameter is mode dependent.",
+                                                        0, G_MAXDOUBLE, 0,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GRADIENT_REVERSE,
+                                   g_param_spec_boolean ("gradient-reverse",
+                                                         "Reverse",
+                                                         "Reverse the gradient",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GRADIENT_BLEND_COLOR_SPACE,
+                                   g_param_spec_enum ("gradient-blend-color-space",
+                                                      "Blend Color Space",
+                                                      "Which color space to use when blending RGB gradient segments",
+                                                      GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE,
+                                                      GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SUPERSAMPLE,
+                                   g_param_spec_boolean ("supersample",
+                                                         "Supersample",
+                                                         "Do adaptive supersampling",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SUPERSAMPLE_DEPTH,
+                                   g_param_spec_int ("supersample-depth",
+                                                     "Max depth",
+                                                     "Maximum recursion levels for supersampling",
+                                                     1, 9, 3,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SUPERSAMPLE_THRESHOLD,
+                                   g_param_spec_double ("supersample-threshold",
+                                                        "Threshold",
+                                                        "Supersampling threshold",
+                                                        0, 4, 0.20,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DITHER,
+                                   g_param_spec_boolean ("dither",
+                                                         "Dither",
+                                                         "Use dithering to reduce banding",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_gradient_init (GimpOperationGradient *self)
+{
+  g_mutex_init (&self->gradient_cache_mutex);
+}
+
+static void
+gimp_operation_gradient_dispose (GObject *object)
+{
+  GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object);
+
+  gimp_operation_gradient_invalidate_cache (self);
+
+  g_clear_object (&self->gradient);
+  g_clear_object (&self->context);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_operation_gradient_finalize (GObject *object)
+{
+  GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object);
+
+  g_mutex_clear (&self->gradient_cache_mutex);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_operation_gradient_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+ GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, self->context);
+      break;
+
+    case PROP_GRADIENT:
+      g_value_set_object (value, self->gradient);
+      break;
+
+    case PROP_START_X:
+      g_value_set_double (value, self->start_x);
+      break;
+
+    case PROP_START_Y:
+      g_value_set_double (value, self->start_y);
+      break;
+
+    case PROP_END_X:
+      g_value_set_double (value, self->end_x);
+      break;
+
+    case PROP_END_Y:
+      g_value_set_double (value, self->end_y);
+      break;
+
+    case PROP_GRADIENT_TYPE:
+      g_value_set_enum (value, self->gradient_type);
+      break;
+
+    case PROP_GRADIENT_REPEAT:
+      g_value_set_enum (value, self->gradient_repeat);
+      break;
+
+    case PROP_OFFSET:
+      g_value_set_double (value, self->offset);
+      break;
+
+    case PROP_GRADIENT_REVERSE:
+      g_value_set_boolean (value, self->gradient_reverse);
+      break;
+
+    case PROP_GRADIENT_BLEND_COLOR_SPACE:
+      g_value_set_enum (value, self->gradient_blend_color_space);
+      break;
+
+    case PROP_SUPERSAMPLE:
+      g_value_set_boolean (value, self->supersample);
+      break;
+
+    case PROP_SUPERSAMPLE_DEPTH:
+      g_value_set_int (value, self->supersample_depth);
+      break;
+
+    case PROP_SUPERSAMPLE_THRESHOLD:
+      g_value_set_double (value, self->supersample_threshold);
+      break;
+
+    case PROP_DITHER:
+      g_value_set_boolean (value, self->dither);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_gradient_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      if (self->context)
+        g_object_unref (self->context);
+
+      self->context = g_value_dup_object (value);
+      break;
+
+    case PROP_GRADIENT:
+      {
+        GimpGradient *gradient = g_value_get_object (value);
+
+        g_clear_object (&self->gradient);
+
+        if (gradient)
+          {
+            if (gimp_gradient_has_fg_bg_segments (gradient))
+              self->gradient = gimp_gradient_flatten (gradient, self->context);
+            else
+              self->gradient = g_object_ref (gradient);
+          }
+
+        gimp_operation_gradient_invalidate_cache (self);
+      }
+      break;
+
+    case PROP_START_X:
+      self->start_x = g_value_get_double (value);
+
+      gimp_operation_gradient_invalidate_cache (self);
+      break;
+
+    case PROP_START_Y:
+      self->start_y = g_value_get_double (value);
+
+      gimp_operation_gradient_invalidate_cache (self);
+      break;
+
+    case PROP_END_X:
+      self->end_x = g_value_get_double (value);
+
+      gimp_operation_gradient_invalidate_cache (self);
+      break;
+
+    case PROP_END_Y:
+      self->end_y = g_value_get_double (value);
+
+      gimp_operation_gradient_invalidate_cache (self);
+      break;
+
+    case PROP_GRADIENT_TYPE:
+      self->gradient_type = g_value_get_enum (value);
+      break;
+
+    case PROP_GRADIENT_REPEAT:
+      self->gradient_repeat = g_value_get_enum (value);
+      break;
+
+    case PROP_OFFSET:
+      self->offset = g_value_get_double (value);
+      break;
+
+    case PROP_GRADIENT_REVERSE:
+      self->gradient_reverse = g_value_get_boolean (value);
+
+      gimp_operation_gradient_invalidate_cache (self);
+      break;
+
+    case PROP_GRADIENT_BLEND_COLOR_SPACE:
+      self->gradient_blend_color_space = g_value_get_enum (value);
+
+      gimp_operation_gradient_invalidate_cache (self);
+      break;
+
+    case PROP_SUPERSAMPLE:
+      self->supersample = g_value_get_boolean (value);
+      break;
+
+    case PROP_SUPERSAMPLE_DEPTH:
+      self->supersample_depth = g_value_get_int (value);
+      break;
+
+    case PROP_SUPERSAMPLE_THRESHOLD:
+      self->supersample_threshold = g_value_get_double (value);
+      break;
+
+    case PROP_DITHER:
+      self->dither = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_gradient_prepare (GeglOperation *operation)
+{
+  gegl_operation_set_format (operation, "output", babl_format ("R'G'B'A float"));
+}
+
+static GeglRectangle
+gimp_operation_gradient_get_bounding_box (GeglOperation *operation)
+{
+  return gegl_rectangle_infinite_plane ();
+}
+
+static gdouble
+gradient_calc_conical_sym_factor (gdouble  dist,
+                                  gdouble *axis,
+                                  gdouble  offset,
+                                  gdouble  x,
+                                  gdouble  y)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else if ((x != 0) || (y != 0))
+    {
+      gdouble vec[2];
+      gdouble r;
+      gdouble rat;
+
+      /* Calculate offset from the start in pixels */
+
+      r = sqrt (SQR (x) + SQR (y));
+
+      vec[0] = x / r;
+      vec[1] = y / r;
+
+      rat = axis[0] * vec[0] + axis[1] * vec[1]; /* Dot product */
+
+      if (rat > 1.0)
+        rat = 1.0;
+      else if (rat < -1.0)
+        rat = -1.0;
+
+      /* This cool idea is courtesy Josh MacDonald,
+       * Ali Rahimi --- two more XCF losers.  */
+
+      rat = acos (rat) / G_PI;
+      rat = pow (rat, (offset / 10.0) + 1.0);
+
+      return CLAMP (rat, 0.0, 1.0);
+    }
+  else
+    {
+      return 0.5;
+    }
+}
+
+static gdouble
+gradient_calc_conical_asym_factor (gdouble  dist,
+                                   gdouble *axis,
+                                   gdouble  offset,
+                                   gdouble  x,
+                                   gdouble  y)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else if (x != 0 || y != 0)
+    {
+      gdouble ang0, ang1;
+      gdouble ang;
+      gdouble rat;
+
+      ang0 = atan2 (axis[0], axis[1]) + G_PI;
+
+      ang1 = atan2 (x, y) + G_PI;
+
+      ang = ang1 - ang0;
+
+      if (ang < 0.0)
+        ang += (2.0 * G_PI);
+
+      rat = ang / (2.0 * G_PI);
+      rat = pow (rat, (offset / 10.0) + 1.0);
+
+      return CLAMP (rat, 0.0, 1.0);
+    }
+  else
+    {
+      return 0.5; /* We are on middle point */
+    }
+}
+
+static gdouble
+gradient_calc_square_factor (gdouble dist,
+                             gdouble offset,
+                             gdouble x,
+                             gdouble y)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else
+    {
+      gdouble r;
+      gdouble rat;
+
+      /* Calculate offset from start as a value in [0, 1] */
+
+      offset = offset / 100.0;
+
+      r   = MAX (fabs (x), fabs (y));
+      rat = r / dist;
+
+      if (rat < offset)
+        return 0.0;
+      else if (offset == 1.0)
+        return (rat >= 1.0) ? 1.0 : 0.0;
+      else
+        return (rat - offset) / (1.0 - offset);
+    }
+}
+
+static gdouble
+gradient_calc_radial_factor (gdouble dist,
+                             gdouble offset,
+                             gdouble x,
+                             gdouble y)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else
+    {
+      gdouble r;
+      gdouble rat;
+
+      /* Calculate radial offset from start as a value in [0, 1] */
+
+      offset = offset / 100.0;
+
+      r   = sqrt (SQR (x) + SQR (y));
+      rat = r / dist;
+
+      if (rat < offset)
+        return 0.0;
+      else if (offset == 1.0)
+        return (rat >= 1.0) ? 1.0 : 0.0;
+      else
+        return (rat - offset) / (1.0 - offset);
+    }
+}
+
+static gdouble
+gradient_calc_linear_factor (gdouble  dist,
+                             gdouble *vec,
+                             gdouble  offset,
+                             gdouble  x,
+                             gdouble  y)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else
+    {
+      gdouble r;
+      gdouble rat;
+
+      offset = offset / 100.0;
+
+      r   = vec[0] * x + vec[1] * y;
+      rat = r / dist;
+
+      if (rat >= 0.0 && rat < offset)
+        return 0.0;
+      else if (offset == 1.0)
+        return (rat >= 1.0) ? 1.0 : 0.0;
+      else if (rat < 0.0)
+        return rat / (1.0 - offset);
+      else
+        return (rat - offset) / (1.0 - offset);
+    }
+}
+
+static gdouble
+gradient_calc_bilinear_factor (gdouble  dist,
+                               gdouble *vec,
+                               gdouble  offset,
+                               gdouble  x,
+                               gdouble  y)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else
+    {
+      gdouble r;
+      gdouble rat;
+
+      /* Calculate linear offset from the start line outward */
+
+      offset = offset / 100.0;
+
+      r   = vec[0] * x + vec[1] * y;
+      rat = r / dist;
+
+      if (fabs (rat) < offset)
+        return 0.0;
+      else if (offset == 1.0)
+        return (rat == 1.0) ? 1.0 : 0.0;
+      else
+        return (fabs (rat) - offset) / (1.0 - offset);
+    }
+}
+
+static gdouble
+gradient_calc_spiral_factor (gdouble   dist,
+                             gdouble  *axis,
+                             gdouble   offset,
+                             gdouble   x,
+                             gdouble   y,
+                             gboolean  clockwise)
+{
+  if (dist == 0.0)
+    {
+      return 0.0;
+    }
+  else if (x != 0.0 || y != 0.0)
+    {
+      gdouble ang0, ang1;
+      gdouble ang;
+      double  r;
+
+      offset = offset / 100.0;
+
+      ang0 = atan2 (axis[0], axis[1]) + G_PI;
+      ang1 = atan2 (x, y) + G_PI;
+
+      if (clockwise)
+        ang = ang1 - ang0;
+      else
+        ang = ang0 - ang1;
+
+      if (ang < 0.0)
+        ang += (2.0 * G_PI);
+
+      r = sqrt (SQR (x) + SQR (y)) / dist;
+
+      return fmod (ang / (2.0 * G_PI) + r + offset, 1.0);
+    }
+  else
+    {
+      return 0.5 ; /* We are on the middle point */
+    }
+}
+
+static gdouble
+gradient_calc_shapeburst_angular_factor (GeglSampler *dist_sampler,
+                                         gdouble      offset,
+                                         gdouble      x,
+                                         gdouble      y)
+{
+  gfloat value;
+
+  offset = offset / 100.0;
+
+  gegl_sampler_get (dist_sampler, x, y, NULL, &value, GEGL_ABYSS_NONE);
+
+  value = 1.0 - value;
+
+  if (value < offset)
+    value = 0.0;
+  else if (offset == 1.0)
+    value = (value >= 1.0) ? 1.0 : 0.0;
+  else
+    value = (value - offset) / (1.0 - offset);
+
+  return value;
+}
+
+
+static gdouble
+gradient_calc_shapeburst_spherical_factor (GeglSampler *dist_sampler,
+                                           gdouble      offset,
+                                           gdouble      x,
+                                           gdouble      y)
+{
+  gfloat value;
+
+  offset = 1.0 - offset / 100.0;
+
+  gegl_sampler_get (dist_sampler, x, y, NULL, &value, GEGL_ABYSS_NONE);
+
+  if (value > offset)
+    value = 1.0;
+  else if (offset == 0.0)
+    value = (value <= 0.0) ? 0.0 : 1.0;
+  else
+    value = value / offset;
+
+  value = 1.0 - sin (0.5 * G_PI * value);
+
+  return value;
+}
+
+
+static gdouble
+gradient_calc_shapeburst_dimpled_factor (GeglSampler *dist_sampler,
+                                         gdouble      offset,
+                                         gdouble      x,
+                                         gdouble      y)
+{
+  gfloat value;
+
+  offset = 1.0 - offset / 100.0;
+
+  gegl_sampler_get (dist_sampler, x, y, NULL, &value, GEGL_ABYSS_NONE);
+
+  if (value > offset)
+    value = 1.0;
+  else if (offset == 0.0)
+    value = (value <= 0.0) ? 0.0 : 1.0;
+  else
+    value = value / offset;
+
+  value = cos (0.5 * G_PI * value);
+
+  return value;
+}
+
+static void
+gradient_render_pixel (gdouble   x,
+                       gdouble   y,
+                       GimpRGB  *color,
+                       gpointer  render_data)
+{
+  RenderBlendData *rbd = render_data;
+  gdouble          factor;
+
+  /*  we want to calculate the color at the pixel's center  */
+  x += 0.5;
+  y += 0.5;
+
+  /* Calculate blending factor */
+
+  switch (rbd->gradient_type)
+    {
+    case GIMP_GRADIENT_LINEAR:
+      factor = gradient_calc_linear_factor (rbd->dist,
+                                            rbd->vec, rbd->offset,
+                                            x - rbd->sx, y - rbd->sy);
+      break;
+
+    case GIMP_GRADIENT_BILINEAR:
+      factor = gradient_calc_bilinear_factor (rbd->dist,
+                                              rbd->vec, rbd->offset,
+                                              x - rbd->sx, y - rbd->sy);
+      break;
+
+    case GIMP_GRADIENT_RADIAL:
+      factor = gradient_calc_radial_factor (rbd->dist,
+                                            rbd->offset,
+                                            x - rbd->sx, y - rbd->sy);
+      break;
+
+    case GIMP_GRADIENT_SQUARE:
+      factor = gradient_calc_square_factor (rbd->dist, rbd->offset,
+                                            x - rbd->sx, y - rbd->sy);
+      break;
+
+    case GIMP_GRADIENT_CONICAL_SYMMETRIC:
+      factor = gradient_calc_conical_sym_factor (rbd->dist,
+                                                 rbd->vec, rbd->offset,
+                                                 x - rbd->sx, y - rbd->sy);
+      break;
+
+    case GIMP_GRADIENT_CONICAL_ASYMMETRIC:
+      factor = gradient_calc_conical_asym_factor (rbd->dist,
+                                                  rbd->vec, rbd->offset,
+                                                  x - rbd->sx, y - rbd->sy);
+      break;
+
+    case GIMP_GRADIENT_SHAPEBURST_ANGULAR:
+      factor = gradient_calc_shapeburst_angular_factor (rbd->dist_sampler,
+                                                        rbd->offset,
+                                                        x, y);
+      break;
+
+    case GIMP_GRADIENT_SHAPEBURST_SPHERICAL:
+      factor = gradient_calc_shapeburst_spherical_factor (rbd->dist_sampler,
+                                                          rbd->offset,
+                                                          x, y);
+      break;
+
+    case GIMP_GRADIENT_SHAPEBURST_DIMPLED:
+      factor = gradient_calc_shapeburst_dimpled_factor (rbd->dist_sampler,
+                                                        rbd->offset,
+                                                        x, y);
+      break;
+
+    case GIMP_GRADIENT_SPIRAL_CLOCKWISE:
+      factor = gradient_calc_spiral_factor (rbd->dist,
+                                            rbd->vec, rbd->offset,
+                                            x - rbd->sx, y - rbd->sy, TRUE);
+      break;
+
+    case GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE:
+      factor = gradient_calc_spiral_factor (rbd->dist,
+                                            rbd->vec, rbd->offset,
+                                            x - rbd->sx, y - rbd->sy, FALSE);
+      break;
+
+    default:
+      g_return_if_reached ();
+      break;
+    }
+
+  /* Adjust for repeat */
+
+  switch (rbd->repeat)
+    {
+    case GIMP_REPEAT_NONE:
+      break;
+
+    case GIMP_REPEAT_SAWTOOTH:
+      factor = factor - floor (factor);
+      break;
+
+    case GIMP_REPEAT_TRIANGULAR:
+      {
+        guint ifactor;
+
+        if (factor < 0.0)
+          factor = -factor;
+
+        ifactor = (guint) factor;
+        factor = factor - floor (factor);
+
+        if (ifactor & 1)
+          factor = 1.0 - factor;
+      }
+      break;
+
+    case GIMP_REPEAT_TRUNCATE:
+      if (factor < 0.0 || factor > 1.0)
+        {
+          gimp_rgba_set (color, 0.0, 0.0, 0.0, 0.0);
+          return;
+        }
+      break;
+    }
+
+  /* Blend the colors */
+
+  if (rbd->gradient_cache)
+    {
+      factor = CLAMP (factor, 0.0, 1.0);
+
+      *color =
+        rbd->gradient_cache[ROUND (factor * (rbd->gradient_cache_size - 1))];
+    }
+  else
+    {
+      rbd->last_seg = gimp_gradient_get_color_at (rbd->gradient, NULL,
+                                                  rbd->last_seg, factor,
+                                                  rbd->reverse,
+                                                  rbd->blend_color_space,
+                                                  color);
+    }
+}
+
+static void
+gradient_put_pixel (gint      x,
+                    gint      y,
+                    GimpRGB  *color,
+                    gpointer  put_pixel_data)
+{
+  PutPixelData *ppd   = put_pixel_data;
+  const gint    index = (y - ppd->roi.y) * ppd->roi.width + (x - ppd->roi.x);
+  gfloat       *dest  = ppd->data + 4 * index;
+
+  if (ppd->dither_rand)
+    {
+      gradient_dither_pixel (color, ppd->dither_rand, dest);
+
+      dest += 4;
+    }
+  else
+    {
+      *dest++ = color->r;
+      *dest++ = color->g;
+      *dest++ = color->b;
+      *dest++ = color->a;
+    }
+}
+
+static void
+gradient_dither_pixel (GimpRGB *color,
+                       GRand   *dither_rand,
+                       gfloat  *dest)
+{
+  gfloat r, g, b, a;
+  guint  i;
+
+  i = g_rand_int (dither_rand);
+
+  r = color->r + (gdouble) (i & 0xff) / 256.0 / 256.0 - 0.5 / 256.0; i >>= 8;
+  g = color->g + (gdouble) (i & 0xff) / 256.0 / 256.0 - 0.5 / 256.0; i >>= 8;
+  b = color->b + (gdouble) (i & 0xff) / 256.0 / 256.0 - 0.5 / 256.0; i >>= 8;
+
+  if (color->a > 0.0 && color->a < 1.0)
+    a = color->a + (gdouble) (i & 0xff) / 256.0 / 256.0 - 0.5 / 256.0;
+  else
+    a = color->a;
+
+  *dest++ = CLAMP (r, 0.0, 1.0);
+  *dest++ = CLAMP (g, 0.0, 1.0);
+  *dest++ = CLAMP (b, 0.0, 1.0);
+  *dest++ = CLAMP (a, 0.0, 1.0);
+}
+
+static gboolean
+gimp_operation_gradient_process (GeglOperation       *operation,
+                                 GeglBuffer          *input,
+                                 GeglBuffer          *output,
+                                 const GeglRectangle *result,
+                                 gint                 level)
+{
+  GimpOperationGradient *self = GIMP_OPERATION_GRADIENT (operation);
+
+  const gdouble sx = self->start_x;
+  const gdouble sy = self->start_y;
+  const gdouble ex = self->end_x;
+  const gdouble ey = self->end_y;
+
+  RenderBlendData rbd = { 0, };
+
+  GeglBufferIterator *iter;
+  GeglRectangle      *roi;
+  GRand              *dither_rand = NULL;
+
+  if (! self->gradient)
+    return TRUE;
+
+  gimp_operation_gradient_validate_cache (self);
+
+  rbd.gradient            = self->gradient;
+  rbd.reverse             = self->gradient_reverse;
+  rbd.blend_color_space   = self->gradient_blend_color_space;
+  rbd.gradient_cache      = self->gradient_cache;
+  rbd.gradient_cache_size = self->gradient_cache_size;
+
+  /* Calculate type-specific parameters */
+
+  switch (self->gradient_type)
+    {
+    case GIMP_GRADIENT_RADIAL:
+      rbd.dist = sqrt (SQR (ex - sx) + SQR (ey - sy));
+      break;
+
+    case GIMP_GRADIENT_SQUARE:
+      rbd.dist = MAX (fabs (ex - sx), fabs (ey - sy));
+      break;
+
+    case GIMP_GRADIENT_CONICAL_SYMMETRIC:
+    case GIMP_GRADIENT_CONICAL_ASYMMETRIC:
+    case GIMP_GRADIENT_SPIRAL_CLOCKWISE:
+    case GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE:
+    case GIMP_GRADIENT_LINEAR:
+    case GIMP_GRADIENT_BILINEAR:
+      rbd.dist = sqrt (SQR (ex - sx) + SQR (ey - sy));
+
+      if (rbd.dist > 0.0)
+        {
+          rbd.vec[0] = (ex - sx) / rbd.dist;
+          rbd.vec[1] = (ey - sy) / rbd.dist;
+        }
+
+      break;
+
+    case GIMP_GRADIENT_SHAPEBURST_ANGULAR:
+    case GIMP_GRADIENT_SHAPEBURST_SPHERICAL:
+    case GIMP_GRADIENT_SHAPEBURST_DIMPLED:
+      rbd.dist = sqrt (SQR (ex - sx) + SQR (ey - sy));
+      rbd.dist_sampler = gegl_buffer_sampler_new_at_level (
+        input, babl_format ("Y float"), GEGL_SAMPLER_NEAREST, level);
+      break;
+
+    default:
+      g_return_val_if_reached (FALSE);
+      break;
+    }
+
+  /* Initialize render data */
+
+  rbd.offset        = self->offset;
+  rbd.sx            = self->start_x;
+  rbd.sy            = self->start_y;
+  rbd.gradient_type = self->gradient_type;
+  rbd.repeat        = self->gradient_repeat;
+
+  /* Render the gradient! */
+
+  iter = gegl_buffer_iterator_new (output, result, 0,
+                                   babl_format ("R'G'B'A float"),
+                                   GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE, 1);
+  roi = &iter->items[0].roi;
+
+  if (self->dither)
+    dither_rand = g_rand_new ();
+
+  if (self->supersample)
+    {
+      PutPixelData ppd;
+
+      ppd.dither_rand = dither_rand;
+
+      while (gegl_buffer_iterator_next (iter))
+        {
+          ppd.data = iter->items[0].data;
+          ppd.roi  = *roi;
+
+          gimp_adaptive_supersample_area (roi->x, roi->y,
+                                          roi->x + roi->width  - 1,
+                                          roi->y + roi->height - 1,
+                                          self->supersample_depth,
+                                          self->supersample_threshold,
+                                          gradient_render_pixel, &rbd,
+                                          gradient_put_pixel, &ppd,
+                                          NULL,
+                                          NULL);
+        }
+    }
+  else
+    {
+      while (gegl_buffer_iterator_next (iter))
+        {
+          gfloat *dest = iter->items[0].data;
+          gint    endx = roi->x + roi->width;
+          gint    endy = roi->y + roi->height;
+          gint    x, y;
+
+          if (dither_rand)
+            {
+              for (y = roi->y; y < endy; y++)
+                for (x = roi->x; x < endx; x++)
+                  {
+                    GimpRGB  color = { 0.0, 0.0, 0.0, 1.0 };
+
+                    gradient_render_pixel (x, y, &color, &rbd);
+                    gradient_dither_pixel (&color, dither_rand, dest);
+
+                    dest += 4;
+                  }
+            }
+          else
+            {
+              for (y = roi->y; y < endy; y++)
+                for (x = roi->x; x < endx; x++)
+                  {
+                    GimpRGB  color = { 0.0, 0.0, 0.0, 1.0 };
+
+                    gradient_render_pixel (x, y, &color, &rbd);
+
+                    *dest++ = color.r;
+                    *dest++ = color.g;
+                    *dest++ = color.b;
+                    *dest++ = color.a;
+                  }
+            }
+        }
+    }
+
+  if (self->dither)
+    g_rand_free (dither_rand);
+
+  g_clear_object (&rbd.dist_sampler);
+
+  return TRUE;
+}
+
+static void
+gimp_operation_gradient_invalidate_cache (GimpOperationGradient *self)
+{
+  g_clear_pointer (&self->gradient_cache, g_free);
+}
+
+static void
+gimp_operation_gradient_validate_cache (GimpOperationGradient *self)
+{
+  GimpGradientSegment *last_seg = NULL;
+  gint                 cache_size;
+  gint                 i;
+
+  if (! self->gradient)
+    return;
+
+  g_mutex_lock (&self->gradient_cache_mutex);
+
+  if (self->gradient_cache)
+    {
+      g_mutex_unlock (&self->gradient_cache_mutex);
+
+      return;
+    }
+
+  cache_size = ceil (hypot (self->start_x - self->end_x,
+                            self->start_y - self->end_y)) *
+               GRADIENT_CACHE_N_SUPERSAMPLES;
+
+  /*  have at least two values in the cache  */
+  cache_size = MAX (cache_size, 2);
+
+  /*  don't use a cache if its necessary size is too big  */
+  if (cache_size > GRADIENT_CACHE_MAX_SIZE)
+    {
+      g_mutex_unlock (&self->gradient_cache_mutex);
+
+      return;
+    }
+
+  self->gradient_cache      = g_new0 (GimpRGB, cache_size);
+  self->gradient_cache_size = cache_size;
+
+  for (i = 0; i < self->gradient_cache_size; i++)
+    {
+      gdouble factor = (gdouble) i / (gdouble) (self->gradient_cache_size - 1);
+
+      last_seg = gimp_gradient_get_color_at (self->gradient, NULL, last_seg,
+                                             factor,
+                                             self->gradient_reverse,
+                                             self->gradient_blend_color_space,
+                                             self->gradient_cache + i);
+    }
+
+  g_mutex_unlock (&self->gradient_cache_mutex);
+}
diff --git a/app/operations/gimpoperationgradient.h b/app/operations/gimpoperationgradient.h
new file mode 100644
index 0000000..e2aa19c
--- /dev/null
+++ b/app/operations/gimpoperationgradient.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgradient.h
+ * Copyright (C) 2014 Michael Henning <drawoc@darkrefraction.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_GRADIENT_H__
+#define __GIMP_OPERATION_GRADIENT_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_GRADIENT            (gimp_operation_gradient_get_type ())
+#define GIMP_OPERATION_GRADIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_GRADIENT, GimpOperationGradient))
+#define GIMP_OPERATION_GRADIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_GRADIENT, GimpOperationGradientClass))
+#define GIMP_IS_OPERATION_GRADIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_GRADIENT))
+#define GIMP_IS_OPERATION_GRADIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_GRADIENT))
+#define GIMP_OPERATION_GRADIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GRADIENT, GimpOperationGradientClass))
+
+
+typedef struct _GimpOperationGradient      GimpOperationGradient;
+typedef struct _GimpOperationGradientClass GimpOperationGradientClass;
+
+struct _GimpOperationGradient
+{
+  GeglOperationFilter          parent_instance;
+
+  GimpContext                 *context;
+
+  GimpGradient                *gradient;
+  gdouble                      start_x, start_y, end_x, end_y;
+  GimpGradientType             gradient_type;
+  GimpRepeatMode               gradient_repeat;
+  gdouble                      offset;
+  gboolean                     gradient_reverse;
+  GimpGradientBlendColorSpace  gradient_blend_color_space;
+
+  gboolean                     supersample;
+  gint                         supersample_depth;
+  gdouble                      supersample_threshold;
+
+  gboolean                     dither;
+
+  GimpRGB                     *gradient_cache;
+  gint                         gradient_cache_size;
+  GMutex                       gradient_cache_mutex;
+};
+
+struct _GimpOperationGradientClass
+{
+  GeglOperationFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_gradient_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_GRADIENT_H__ */
diff --git a/app/operations/gimpoperationgrow.c b/app/operations/gimpoperationgrow.c
new file mode 100644
index 0000000..2aabcee
--- /dev/null
+++ b/app/operations/gimpoperationgrow.c
@@ -0,0 +1,391 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgrow.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationgrow.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_RADIUS_X,
+  PROP_RADIUS_Y
+};
+
+
+static void          gimp_operation_grow_get_property (GObject             *object,
+                                                       guint                property_id,
+                                                       GValue              *value,
+                                                       GParamSpec          *pspec);
+static void          gimp_operation_grow_set_property (GObject             *object,
+                                                       guint                property_id,
+                                                       const GValue        *value,
+                                                       GParamSpec          *pspec);
+
+static void          gimp_operation_grow_prepare      (GeglOperation       *operation);
+static GeglRectangle
+          gimp_operation_grow_get_required_for_output (GeglOperation       *self,
+                                                       const gchar         *input_pad,
+                                                       const GeglRectangle *roi);
+static GeglRectangle
+                gimp_operation_grow_get_cached_region (GeglOperation       *self,
+                                                       const GeglRectangle *roi);
+
+static gboolean gimp_operation_grow_process           (GeglOperation       *operation,
+                                                       GeglBuffer          *input,
+                                                       GeglBuffer          *output,
+                                                       const GeglRectangle *roi,
+                                                       gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationGrow, gimp_operation_grow,
+               GEGL_TYPE_OPERATION_FILTER)
+
+#define parent_class gimp_operation_grow_parent_class
+
+
+static void
+gimp_operation_grow_class_init (GimpOperationGrowClass *klass)
+{
+  GObjectClass             *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationFilterClass *filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_grow_set_property;
+  object_class->get_property   = gimp_operation_grow_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:grow",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Grow operation",
+                                 NULL);
+
+  operation_class->prepare                 = gimp_operation_grow_prepare;
+  operation_class->get_required_for_output = gimp_operation_grow_get_required_for_output;
+  operation_class->get_cached_region       = gimp_operation_grow_get_cached_region;
+  operation_class->threaded                = FALSE;
+
+  filter_class->process                    = gimp_operation_grow_process;
+
+  g_object_class_install_property (object_class, PROP_RADIUS_X,
+                                   g_param_spec_int ("radius-x",
+                                                     "Radius X",
+                                                     "Grow radius in X direction",
+                                                     1, 2342, 1,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RADIUS_Y,
+                                   g_param_spec_int ("radius-y",
+                                                     "Radius Y",
+                                                     "Grow radius in Y direction",
+                                                     1, 2342, 1,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_grow_init (GimpOperationGrow *self)
+{
+}
+
+static void
+gimp_operation_grow_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+ GimpOperationGrow *self = GIMP_OPERATION_GROW (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS_X:
+      g_value_set_int (value, self->radius_x);
+      break;
+
+    case PROP_RADIUS_Y:
+      g_value_set_int (value, self->radius_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_grow_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpOperationGrow *self = GIMP_OPERATION_GROW (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS_X:
+      self->radius_x = g_value_get_int (value);
+      break;
+
+    case PROP_RADIUS_Y:
+      self->radius_y = g_value_get_int (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_grow_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("Y float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("Y float", space));
+}
+
+static GeglRectangle
+gimp_operation_grow_get_required_for_output (GeglOperation       *self,
+                                             const gchar         *input_pad,
+                                             const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static GeglRectangle
+gimp_operation_grow_get_cached_region (GeglOperation       *self,
+                                       const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static void
+compute_border (gint16  *circ,
+                guint16  xradius,
+                guint16  yradius)
+{
+  gint32  i;
+  gint32  diameter = xradius * 2 + 1;
+  gdouble tmp;
+
+  for (i = 0; i < diameter; i++)
+    {
+      if (i > xradius)
+        tmp = (i - xradius) - 0.5;
+      else if (i < xradius)
+        tmp = (xradius - i) - 0.5;
+      else
+        tmp = 0.0;
+
+      circ[i] = RINT (yradius /
+                      (gdouble) xradius * sqrt (SQR (xradius) - SQR (tmp)));
+    }
+}
+
+static inline void
+rotate_pointers (gfloat  **p,
+                 guint32   n)
+{
+  guint32  i;
+  gfloat  *tmp;
+
+  tmp = p[0];
+
+  for (i = 0; i < n - 1; i++)
+    p[i] = p[i + 1];
+
+  p[i] = tmp;
+}
+
+static gboolean
+gimp_operation_grow_process (GeglOperation       *operation,
+                             GeglBuffer          *input,
+                             GeglBuffer          *output,
+                             const GeglRectangle *roi,
+                             gint                 level)
+{
+  /* Any bugs in this function are probably also in thin_region.
+   * Blame all bugs in this function on jaycox@gimp.org
+   */
+  GimpOperationGrow *self          = GIMP_OPERATION_GROW (operation);
+  const Babl        *input_format  = gegl_operation_get_format (operation, "input");
+  const Babl        *output_format = gegl_operation_get_format (operation, "output");
+  gint32             i, j, x, y;
+  gfloat           **buf;  /* caches the region's pixel data */
+  gfloat            *out;  /* holds the new scan line we are computing */
+  gfloat           **max;  /* caches the largest values for each column */
+  gint16            *circ; /* holds the y coords of the filter's mask */
+  gfloat             last_max;
+  gint16             last_index;
+  gfloat            *buffer;
+
+  max = g_new (gfloat *, roi->width + 2 * self->radius_x);
+  buf = g_new (gfloat *, self->radius_y + 1);
+
+  for (i = 0; i < self->radius_y + 1; i++)
+    buf[i] = g_new (gfloat, roi->width);
+
+  buffer = g_new (gfloat,
+                  (roi->width + 2 * self->radius_x) * (self->radius_y + 1));
+
+  for (i = 0; i < roi->width + 2 * self->radius_x; i++)
+    {
+      if (i < self->radius_x)
+        max[i] = buffer;
+      else if (i < roi->width + self->radius_x)
+        max[i] = &buffer[(self->radius_y + 1) * (i - self->radius_x)];
+      else
+        max[i] = &buffer[(self->radius_y + 1) * (roi->width + self->radius_x - 1)];
+
+      for (j = 0; j < self->radius_y + 1; j++)
+        max[i][j] = 0.0;
+    }
+
+  /* offset the max pointer by self->radius_x so the range of the
+   * array is [-self->radius_x] to [roi->width + self->radius_x]
+   */
+  max += self->radius_x;
+
+  out =  g_new (gfloat, roi->width);
+
+  circ = g_new (gint16, 2 * self->radius_x + 1);
+  compute_border (circ, self->radius_x, self->radius_y);
+
+  /* offset the circ pointer by self->radius_x so the range of the
+   * array is [-self->radius_x] to [self->radius_x]
+   */
+  circ += self->radius_x;
+
+  memset (buf[0], 0, roi->width * sizeof (gfloat));
+
+  for (i = 0; i < self->radius_y && i < roi->height; i++) /* load top of image */
+    gegl_buffer_get (input,
+                     GEGL_RECTANGLE (roi->x, roi->y + i,
+                                     roi->width, 1),
+                     1.0, input_format, buf[i + 1],
+                     GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  for (x = 0; x < roi->width; x++) /* set up max for top of image */
+    {
+      max[x][0] = 0.0;       /* buf[0][x] is always 0 */
+      max[x][1] = buf[1][x]; /* MAX (buf[1][x], max[x][0]) always = buf[1][x]*/
+
+      for (j = 2; j < self->radius_y + 1; j++)
+        max[x][j] = MAX (buf[j][x], max[x][j - 1]);
+    }
+
+  for (y = 0; y < roi->height; y++)
+    {
+      rotate_pointers (buf, self->radius_y + 1);
+
+      if (y < roi->height - (self->radius_y))
+        gegl_buffer_get (input,
+                         GEGL_RECTANGLE (roi->x,  roi->y + y + self->radius_y,
+                                         roi->width, 1),
+                         1.0, input_format, buf[self->radius_y],
+                         GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+      else
+        memset (buf[self->radius_y], 0, roi->width * sizeof (gfloat));
+
+      for (x = 0; x < roi->width; x++) /* update max array */
+        {
+          for (i = self->radius_y; i > 0; i--)
+            max[x][i] = MAX (MAX (max[x][i - 1], buf[i - 1][x]), buf[i][x]);
+
+          max[x][0] = buf[0][x];
+        }
+
+      last_max = max[0][circ[-1]];
+      last_index = 1;
+
+      for (x = 0; x < roi->width; x++) /* render scan line */
+        {
+          last_index--;
+
+          if (last_index >= 0)
+            {
+              if (last_max >= 1.0)
+                {
+                  out[x] = 1.0;
+                }
+              else
+                {
+                  last_max = 0.0;
+
+                  for (i = self->radius_x; i >= 0; i--)
+                    if (last_max < max[x + i][circ[i]])
+                      {
+                        last_max = max[x + i][circ[i]];
+                        last_index = i;
+                      }
+
+                  out[x] = last_max;
+                }
+            }
+          else
+            {
+              last_index = self->radius_x;
+              last_max = max[x + self->radius_x][circ[self->radius_x]];
+
+              for (i = self->radius_x - 1; i >= -self->radius_x; i--)
+                if (last_max < max[x + i][circ[i]])
+                  {
+                    last_max = max[x + i][circ[i]];
+                    last_index = i;
+                  }
+
+              out[x] = last_max;
+            }
+        }
+
+      gegl_buffer_set (output,
+                       GEGL_RECTANGLE (roi->x, roi->y + y,
+                                       roi->width, 1),
+                       0, output_format, out,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  /* undo the offsets to the pointers so we can free the malloced memory */
+  circ -= self->radius_x;
+  max -= self->radius_x;
+
+  g_free (circ);
+  g_free (buffer);
+  g_free (max);
+
+  for (i = 0; i < self->radius_y + 1; i++)
+    g_free (buf[i]);
+
+  g_free (buf);
+  g_free (out);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationgrow.h b/app/operations/gimpoperationgrow.h
new file mode 100644
index 0000000..d680997
--- /dev/null
+++ b/app/operations/gimpoperationgrow.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgrow.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_GROW_H__
+#define __GIMP_OPERATION_GROW_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_GROW            (gimp_operation_grow_get_type ())
+#define GIMP_OPERATION_GROW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_GROW, GimpOperationGrow))
+#define GIMP_OPERATION_GROW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_GROW, GimpOperationGrowClass))
+#define GIMP_IS_OPERATION_GROW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_GROW))
+#define GIMP_IS_OPERATION_GROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_GROW))
+#define GIMP_OPERATION_GROW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GROW, GimpOperationGrowClass))
+
+
+typedef struct _GimpOperationGrow      GimpOperationGrow;
+typedef struct _GimpOperationGrowClass GimpOperationGrowClass;
+
+struct _GimpOperationGrow
+{
+  GeglOperationFilter  parent_instance;
+
+  gint                 radius_x;
+  gint                 radius_y;
+};
+
+struct _GimpOperationGrowClass
+{
+  GeglOperationFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_grow_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_GROW_H__ */
diff --git a/app/operations/gimpoperationhistogramsink.c b/app/operations/gimpoperationhistogramsink.c
new file mode 100644
index 0000000..cb0a7ac
--- /dev/null
+++ b/app/operations/gimpoperationhistogramsink.c
@@ -0,0 +1,244 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhistogramsink.c
+ * Copyright (C) 2012 Øyvind Kolås
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "core/gimphistogram.h"
+
+#include "gimpoperationhistogramsink.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_AUX,
+  PROP_HISTOGRAM
+};
+
+
+static void     gimp_operation_histogram_sink_finalize     (GObject             *object);
+static void     gimp_operation_histogram_sink_get_property (GObject             *object,
+                                                            guint                prop_id,
+                                                            GValue              *value,
+                                                            GParamSpec          *pspec);
+static void     gimp_operation_histogram_sink_set_property (GObject             *object,
+                                                            guint                prop_id,
+                                                            const GValue        *value,
+                                                            GParamSpec          *pspec);
+
+static void     gimp_operation_histogram_sink_attach       (GeglOperation       *operation);
+static void     gimp_operation_histogram_sink_prepare      (GeglOperation       *operation);
+static GeglRectangle
+     gimp_operation_histogram_sink_get_required_for_output (GeglOperation        *self,
+                                                            const gchar         *input_pad,
+                                                            const GeglRectangle *roi);
+static gboolean gimp_operation_histogram_sink_process      (GeglOperation       *operation,
+                                                            GeglOperationContext     *context,
+                                                            const gchar         *output_prop,
+                                                            const GeglRectangle *result,
+                                                            gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHistogramSink, gimp_operation_histogram_sink,
+               GEGL_TYPE_OPERATION_SINK)
+
+#define parent_class gimp_operation_histogram_sink_parent_class
+
+
+static void
+gimp_operation_histogram_sink_class_init (GimpOperationHistogramSinkClass *klass)
+{
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+
+  object_class->finalize     = gimp_operation_histogram_sink_finalize;
+  object_class->set_property = gimp_operation_histogram_sink_set_property;
+  object_class->get_property = gimp_operation_histogram_sink_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name"       , "gimp:histogram-sink",
+                                 "categories" , "color",
+                                 "description", "GIMP Histogram sink operation",
+                                 NULL);
+
+  operation_class->attach                  = gimp_operation_histogram_sink_attach;
+  operation_class->prepare                 = gimp_operation_histogram_sink_prepare;
+  operation_class->get_required_for_output = gimp_operation_histogram_sink_get_required_for_output;
+  operation_class->process                 = gimp_operation_histogram_sink_process;
+
+  g_object_class_install_property (object_class, PROP_AUX,
+                                   g_param_spec_object ("aux",
+                                                        "Aux",
+                                                        "Auxiliary image buffer input pad.",
+                                                        GEGL_TYPE_BUFFER,
+                                                        G_PARAM_READWRITE |
+                                                        GEGL_PARAM_PAD_INPUT));
+
+  g_object_class_install_property (object_class, PROP_HISTOGRAM,
+                                   g_param_spec_object ("histogram",
+                                                        "Histogram",
+                                                        "The result histogram",
+                                                        GIMP_TYPE_HISTOGRAM,
+                                                        G_PARAM_READWRITE));
+}
+
+static void
+gimp_operation_histogram_sink_init (GimpOperationHistogramSink *self)
+{
+}
+
+static void
+gimp_operation_histogram_sink_finalize (GObject *object)
+{
+  GimpOperationHistogramSink *sink = GIMP_OPERATION_HISTOGRAM_SINK (object);
+
+  g_clear_object (&sink->histogram);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_operation_histogram_sink_get_property (GObject    *object,
+                                            guint       prop_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpOperationHistogramSink *sink = GIMP_OPERATION_HISTOGRAM_SINK (object);
+
+  switch (prop_id)
+    {
+    case PROP_AUX:
+      break;
+
+    case PROP_HISTOGRAM:
+      g_value_set_pointer (value, sink->histogram);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_histogram_sink_set_property (GObject      *object,
+                                            guint         prop_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpOperationHistogramSink *sink = GIMP_OPERATION_HISTOGRAM_SINK (object);
+
+  switch (prop_id)
+    {
+    case PROP_AUX:
+      break;
+
+    case PROP_HISTOGRAM:
+      if (sink->histogram)
+        g_object_unref (sink->histogram);
+      sink->histogram = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_histogram_sink_attach (GeglOperation *self)
+{
+  GeglOperation *operation    = GEGL_OPERATION (self);
+  GObjectClass  *object_class = G_OBJECT_GET_CLASS (self);
+
+  GEGL_OPERATION_CLASS (parent_class)->attach (self);
+
+  gegl_operation_create_pad (operation,
+                             g_object_class_find_property (object_class,
+                                                           "aux"));
+}
+
+static void
+gimp_operation_histogram_sink_prepare (GeglOperation *operation)
+{
+  /* XXX gegl_operation_set_format (operation, "input", babl_format ("Y u8")); */
+  gegl_operation_set_format (operation, "aux",   babl_format ("Y float"));
+}
+
+static GeglRectangle
+gimp_operation_histogram_sink_get_required_for_output (GeglOperation       *self,
+                                                       const gchar         *input_pad,
+                                                       const GeglRectangle *roi)
+{
+  /* dunno what to do here, make a wild guess */
+  return *roi;
+}
+
+static gboolean
+gimp_operation_histogram_sink_process (GeglOperation        *operation,
+                                       GeglOperationContext *context,
+                                       const gchar          *output_prop,
+                                       const GeglRectangle  *result,
+                                       gint                  level)
+{
+  GeglBuffer *input;
+  GeglBuffer *aux;
+
+  if (strcmp (output_prop, "output"))
+    {
+      g_warning ("requested processing of %s pad on a sink", output_prop);
+      return FALSE;
+    }
+
+  input = (GeglBuffer*) gegl_operation_context_dup_object (context, "input");
+  aux   = (GeglBuffer*) gegl_operation_context_dup_object (context, "aux");
+
+  if (! input)
+    {
+      g_warning ("received NULL input");
+
+      return FALSE;
+    }
+
+  if (aux)
+    {
+      /* do hist with mask */
+
+      g_printerr ("aux format: %s\n",
+                  babl_get_name (gegl_buffer_get_format (aux)));
+
+      g_object_unref (aux);
+    }
+  else
+    {
+      /* without */
+    }
+
+  g_printerr ("input format: %s\n",
+              babl_get_name (gegl_buffer_get_format (input)));
+
+  g_object_unref (input);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationhistogramsink.h b/app/operations/gimpoperationhistogramsink.h
new file mode 100644
index 0000000..719719c
--- /dev/null
+++ b/app/operations/gimpoperationhistogramsink.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhistogramsink.h
+ * Copyright (C) 2012 Øyvind Kolås
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HISTOGRAM_SINK_H__
+#define __GIMP_OPERATION_HISTOGRAM_SINK_H__
+
+
+#include <gegl-plugin.h>
+#include <operation/gegl-operation-sink.h>
+
+
+#define GIMP_TYPE_OPERATION_HISTOGRAM_SINK            (gimp_operation_histogram_sink_get_type ())
+#define GIMP_OPERATION_HISTOGRAM_SINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HISTOGRAM_SINK, GimpOperationHistogramSink))
+#define GIMP_OPERATION_HISTOGRAM_SINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HISTOGRAM_SINK, GimpOperationHistogramSinkClass))
+#define GEGL_IS_OPERATION_HISTOGRAM_SINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HISTOGRAM_SINK))
+#define GEGL_IS_OPERATION_HISTOGRAM_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HISTOGRAM_SINK))
+#define GIMP_OPERATION_HISTOGRAM_SINK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HISTOGRAM_SINK, GimpOperationHistogramSinkClass))
+
+
+typedef struct _GimpOperationHistogramSink      GimpOperationHistogramSink;
+typedef struct _GimpOperationHistogramSinkClass GimpOperationHistogramSinkClass;
+
+struct _GimpOperationHistogramSink
+{
+  GeglOperation  parent_instance;
+
+  GimpHistogram *histogram;
+};
+
+struct _GimpOperationHistogramSinkClass
+{
+  GeglOperationSinkClass  parent_class;
+};
+
+
+GType   gimp_operation_histogram_sink_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_HISTOGRAM_SINK_C__ */
diff --git a/app/operations/gimpoperationhuesaturation.c b/app/operations/gimpoperationhuesaturation.c
new file mode 100644
index 0000000..cdfb7d7
--- /dev/null
+++ b/app/operations/gimpoperationhuesaturation.c
@@ -0,0 +1,302 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhuesaturation.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimphuesaturationconfig.h"
+#include "gimpoperationhuesaturation.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean gimp_operation_hue_saturation_process (GeglOperation       *operation,
+                                                       void                *in_buf,
+                                                       void                *out_buf,
+                                                       glong                samples,
+                                                       const GeglRectangle *roi,
+                                                       gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHueSaturation, gimp_operation_hue_saturation,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_hue_saturation_parent_class
+
+
+static void
+gimp_operation_hue_saturation_class_init (GimpOperationHueSaturationClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_point_filter_set_property;
+  object_class->get_property   = gimp_operation_point_filter_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:hue-saturation",
+                                 "categories",  "color",
+                                 "description", _("Adjust hue, saturation, and lightness"),
+                                 NULL);
+
+  point_class->process = gimp_operation_hue_saturation_process;
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "The config object",
+                                                        GIMP_TYPE_HUE_SATURATION_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_hue_saturation_init (GimpOperationHueSaturation *self)
+{
+}
+
+static inline gdouble
+map_hue (GimpHueSaturationConfig *config,
+         GimpHueRange             range,
+         gdouble                  value)
+{
+  value += (config->hue[GIMP_HUE_RANGE_ALL] + config->hue[range]) / 2.0;
+
+  if (value < 0)
+    return value + 1.0;
+  else if (value > 1.0)
+    return value - 1.0;
+  else
+    return value;
+}
+
+static inline gdouble
+map_hue_overlap (GimpHueSaturationConfig *config,
+                 GimpHueRange             primary_range,
+                 GimpHueRange             secondary_range,
+                 gdouble                  value,
+                 gdouble                  primary_intensity,
+                 gdouble                  secondary_intensity)
+{
+  /*  When calculating an overlap between two ranges, interpolate the
+   *  hue adjustment from config->hue[primary_range] and
+   *  config->hue[secondary_range] BEFORE mapping it to the input
+   *  value.  This fixes odd edge cases where only one of the ranges
+   *  crosses the red/magenta wraparound (bug #527085), or if
+   *  adjustments to different channels yield more than 180 degree
+   *  difference from each other. (Why anyone would do that is beyond
+   *  me, but still.)
+   *
+   *  See bugs #527085 and #644032 for examples of such cases.
+   */
+  gdouble v = config->hue[primary_range]   * primary_intensity +
+              config->hue[secondary_range] * secondary_intensity;
+
+  value += (config->hue[GIMP_HUE_RANGE_ALL] + v) / 2.0;
+
+  if (value < 0)
+    return value + 1.0;
+  else if (value > 1.0)
+    return value - 1.0;
+  else
+    return value;
+}
+
+static inline gdouble
+map_saturation (GimpHueSaturationConfig *config,
+                GimpHueRange             range,
+                gdouble                  value)
+{
+  gdouble v = config->saturation[GIMP_HUE_RANGE_ALL] + config->saturation[range];
+
+  /* This change affects the way saturation is computed. With the old
+   * code (different code for value < 0), increasing the saturation
+   * affected muted colors very much, and bright colors less. With the
+   * new code, it affects muted colors and bright colors more or less
+   * evenly. For enhancing the color in photos, the new behavior is
+   * exactly what you want. It's hard for me to imagine a case in
+   * which the old behavior is better.
+  */
+  value *= (v + 1.0);
+
+  return CLAMP (value, 0.0, 1.0);
+}
+
+static inline gdouble
+map_lightness (GimpHueSaturationConfig *config,
+               GimpHueRange             range,
+               gdouble                  value)
+{
+  gdouble v = (config->lightness[GIMP_HUE_RANGE_ALL] + config->lightness[range]) / 2.0;
+
+  if (v < 0)
+    return value * (v + 1.0);
+  else
+    return value + (v * (1.0 - value));
+}
+
+static gboolean
+gimp_operation_hue_saturation_process (GeglOperation       *operation,
+                                       void                *in_buf,
+                                       void                *out_buf,
+                                       glong                samples,
+                                       const GeglRectangle *roi,
+                                       gint                 level)
+{
+  GimpOperationPointFilter *point  = GIMP_OPERATION_POINT_FILTER (operation);
+  GimpHueSaturationConfig  *config = GIMP_HUE_SATURATION_CONFIG (point->config);
+  gfloat                   *src    = in_buf;
+  gfloat                   *dest   = out_buf;
+  gfloat                    overlap;
+
+  if (! config)
+    return FALSE;
+
+  overlap = config->overlap / 2.0;
+
+  while (samples--)
+    {
+      GimpRGB  rgb;
+      GimpHSL  hsl;
+      gdouble  h;
+      gint     hue_counter;
+      gint     hue                 = 0;
+      gint     secondary_hue       = 0;
+      gboolean use_secondary_hue   = FALSE;
+      gfloat   primary_intensity   = 0.0;
+      gfloat   secondary_intensity = 0.0;
+
+      rgb.r = src[RED];
+      rgb.g = src[GREEN];
+      rgb.b = src[BLUE];
+      rgb.a = src[ALPHA];
+
+      gimp_rgb_to_hsl (&rgb, &hsl);
+
+      h = hsl.h * 6.0;
+
+      for (hue_counter = 0; hue_counter < 7; hue_counter++)
+        {
+          gdouble hue_threshold = (gdouble) hue_counter + 0.5;
+
+          if (h < ((gdouble) hue_threshold + overlap))
+            {
+              hue = hue_counter;
+
+              if (overlap > 0.0 && h > ((gdouble) hue_threshold - overlap))
+                {
+                  use_secondary_hue = TRUE;
+
+                  secondary_hue = hue_counter + 1;
+
+                  secondary_intensity =
+                    (h - (gdouble) hue_threshold + overlap) / (2.0 * overlap);
+
+                  primary_intensity = 1.0 - secondary_intensity;
+                }
+              else
+                {
+                  use_secondary_hue = FALSE;
+                }
+
+              break;
+            }
+        }
+
+      if (hue >= 6)
+        {
+          hue = 0;
+          use_secondary_hue = FALSE;
+        }
+
+      if (secondary_hue >= 6)
+        {
+          secondary_hue = 0;
+        }
+
+      /*  transform into GimpHueRange values  */
+      hue++;
+      secondary_hue++;
+
+      if (use_secondary_hue)
+        {
+          hsl.h = map_hue_overlap (config, hue, secondary_hue, hsl.h,
+                                   primary_intensity, secondary_intensity);
+
+          hsl.s = (map_saturation (config, hue,           hsl.s) * primary_intensity +
+                   map_saturation (config, secondary_hue, hsl.s) * secondary_intensity);
+
+          hsl.l = (map_lightness (config, hue,           hsl.l) * primary_intensity +
+                   map_lightness (config, secondary_hue, hsl.l) * secondary_intensity);
+        }
+      else
+        {
+          hsl.h = map_hue        (config, hue, hsl.h);
+          hsl.s = map_saturation (config, hue, hsl.s);
+          hsl.l = map_lightness  (config, hue, hsl.l);
+        }
+
+      gimp_hsl_to_rgb (&hsl, &rgb);
+
+      dest[RED]   = rgb.r;
+      dest[GREEN] = rgb.g;
+      dest[BLUE]  = rgb.b;
+      dest[ALPHA] = rgb.a;
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_operation_hue_saturation_map (GimpHueSaturationConfig *config,
+                                   const GimpRGB           *color,
+                                   GimpHueRange             range,
+                                   GimpRGB                 *result)
+{
+  GimpHSL hsl;
+
+  g_return_if_fail (GIMP_IS_HUE_SATURATION_CONFIG (config));
+  g_return_if_fail (color != NULL);
+  g_return_if_fail (result != NULL);
+
+  gimp_rgb_to_hsl (color, &hsl);
+
+  hsl.h = map_hue        (config, range, hsl.h);
+  hsl.s = map_saturation (config, range, hsl.s);
+  hsl.l = map_lightness  (config, range, hsl.l);
+
+  gimp_hsl_to_rgb (&hsl, result);
+}
diff --git a/app/operations/gimpoperationhuesaturation.h b/app/operations/gimpoperationhuesaturation.h
new file mode 100644
index 0000000..b084bbe
--- /dev/null
+++ b/app/operations/gimpoperationhuesaturation.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhuesaturation.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HUE_SATURATION_H__
+#define __GIMP_OPERATION_HUE_SATURATION_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_HUE_SATURATION            (gimp_operation_hue_saturation_get_type ())
+#define GIMP_OPERATION_HUE_SATURATION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HUE_SATURATION, GimpOperationHueSaturation))
+#define GIMP_OPERATION_HUE_SATURATION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HUE_SATURATION, GimpOperationHueSaturationClass))
+#define GIMP_IS_OPERATION_HUE_SATURATION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HUE_SATURATION))
+#define GIMP_IS_OPERATION_HUE_SATURATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HUE_SATURATION))
+#define GIMP_OPERATION_HUE_SATURATION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HUE_SATURATION, GimpOperationHueSaturationClass))
+
+
+typedef struct _GimpOperationHueSaturation      GimpOperationHueSaturation;
+typedef struct _GimpOperationHueSaturationClass GimpOperationHueSaturationClass;
+
+struct _GimpOperationHueSaturation
+{
+  GimpOperationPointFilter  parent_instance;
+};
+
+struct _GimpOperationHueSaturationClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_hue_saturation_get_type (void) G_GNUC_CONST;
+
+void    gimp_operation_hue_saturation_map      (GimpHueSaturationConfig *config,
+                                                const GimpRGB           *color,
+                                                GimpHueRange             range,
+                                                GimpRGB                 *result);
+
+
+#endif /* __GIMP_OPERATION_HUE_SATURATION_H__ */
diff --git a/app/operations/gimpoperationlevels.c b/app/operations/gimpoperationlevels.c
new file mode 100644
index 0000000..1bf0b06
--- /dev/null
+++ b/app/operations/gimpoperationlevels.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlevels.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimplevelsconfig.h"
+#include "gimpoperationlevels.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean gimp_operation_levels_process (GeglOperation       *operation,
+                                               void                *in_buf,
+                                               void                *out_buf,
+                                               glong                samples,
+                                               const GeglRectangle *roi,
+                                               gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationLevels, gimp_operation_levels,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_levels_parent_class
+
+
+static void
+gimp_operation_levels_class_init (GimpOperationLevelsClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_point_filter_set_property;
+  object_class->get_property   = gimp_operation_point_filter_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:levels",
+                                 "categories",  "color",
+                                 "description", _("Adjust color levels"),
+                                 NULL);
+
+  point_class->process = gimp_operation_levels_process;
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_LINEAR,
+                                   g_param_spec_boolean ("linear",
+                                                         "Linear",
+                                                         "Whether to operate on linear RGB",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   GIMP_OPERATION_POINT_FILTER_PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        "Config",
+                                                        "The config object",
+                                                        GIMP_TYPE_LEVELS_CONFIG,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_levels_init (GimpOperationLevels *self)
+{
+}
+
+static inline gdouble
+gimp_operation_levels_map (gdouble  value,
+                           gdouble  low_input,
+                           gdouble  high_input,
+                           gboolean clamp_input,
+                           gdouble  inv_gamma,
+                           gdouble  low_output,
+                           gdouble  high_output,
+                           gboolean clamp_output)
+{
+  /*  determine input intensity  */
+  if (high_input != low_input)
+    value = (value - low_input) / (high_input - low_input);
+  else
+    value = (value - low_input);
+
+  if (clamp_input)
+    value = CLAMP (value, 0.0, 1.0);
+
+  if (inv_gamma != 1.0 && value > 0)
+    value =  pow (value, inv_gamma);
+
+  /*  determine the output intensity  */
+  if (high_output >= low_output)
+    value = value * (high_output - low_output) + low_output;
+  else if (high_output < low_output)
+    value = low_output - value * (low_output - high_output);
+
+  if (clamp_output)
+    value = CLAMP (value, 0.0, 1.0);
+
+  return value;
+}
+
+static gboolean
+gimp_operation_levels_process (GeglOperation       *operation,
+                               void                *in_buf,
+                               void                *out_buf,
+                               glong                samples,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  GimpOperationPointFilter *point  = GIMP_OPERATION_POINT_FILTER (operation);
+  GimpLevelsConfig         *config = GIMP_LEVELS_CONFIG (point->config);
+  gfloat                   *src    = in_buf;
+  gfloat                   *dest   = out_buf;
+  gfloat                    inv_gamma[5];
+  gint                      channel;
+
+  if (! config)
+    return FALSE;
+
+  for (channel = 0; channel < 5; channel++)
+    {
+      g_return_val_if_fail (config->gamma[channel] != 0.0, FALSE);
+
+      inv_gamma[channel] = 1.0 / config->gamma[channel];
+    }
+
+  while (samples--)
+    {
+      for (channel = 0; channel < 4; channel++)
+        {
+          gdouble value;
+
+          value = gimp_operation_levels_map (src[channel],
+                                             config->low_input[channel + 1],
+                                             config->high_input[channel + 1],
+                                             config->clamp_input,
+                                             inv_gamma[channel + 1],
+                                             config->low_output[channel + 1],
+                                             config->high_output[channel + 1],
+                                             config->clamp_output);
+
+          /* don't apply the overall curve to the alpha channel */
+          if (channel != ALPHA)
+            value = gimp_operation_levels_map (value,
+                                               config->low_input[0],
+                                               config->high_input[0],
+                                               config->clamp_input,
+                                               inv_gamma[0],
+                                               config->low_output[0],
+                                               config->high_output[0],
+                                               config->clamp_output);
+
+          dest[channel] = value;
+        }
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+gdouble
+gimp_operation_levels_map_input (GimpLevelsConfig     *config,
+                                 GimpHistogramChannel  channel,
+                                 gdouble               value)
+{
+  g_return_val_if_fail (GIMP_IS_LEVELS_CONFIG (config), 0.0);
+
+  /*  determine input intensity  */
+  if (config->high_input[channel] != config->low_input[channel])
+    value = ((value - config->low_input[channel]) /
+             (config->high_input[channel] - config->low_input[channel]));
+  else
+    value = (value - config->low_input[channel]);
+
+  if (config->gamma[channel] != 0.0 && value > 0.0)
+    value = pow (value, 1.0 / config->gamma[channel]);
+
+  return value;
+}
diff --git a/app/operations/gimpoperationlevels.h b/app/operations/gimpoperationlevels.h
new file mode 100644
index 0000000..d977f42
--- /dev/null
+++ b/app/operations/gimpoperationlevels.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlevels.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_LEVELS_H__
+#define __GIMP_OPERATION_LEVELS_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_LEVELS            (gimp_operation_levels_get_type ())
+#define GIMP_OPERATION_LEVELS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_LEVELS, GimpOperationLevels))
+#define GIMP_OPERATION_LEVELS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_LEVELS, GimpOperationLevelsClass))
+#define GIMP_IS_OPERATION_LEVELS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_LEVELS))
+#define GIMP_IS_OPERATION_LEVELS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_LEVELS))
+#define GIMP_OPERATION_LEVELS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_LEVELS, GimpOperationLevelsClass))
+
+
+typedef struct _GimpOperationLevels      GimpOperationLevels;
+typedef struct _GimpOperationLevelsClass GimpOperationLevelsClass;
+
+struct _GimpOperationLevels
+{
+  GimpOperationPointFilter  parent_instance;
+};
+
+struct _GimpOperationLevelsClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType     gimp_operation_levels_get_type  (void) G_GNUC_CONST;
+
+gdouble   gimp_operation_levels_map_input (GimpLevelsConfig     *config,
+                                           GimpHistogramChannel  channel,
+                                           gdouble               value);
+
+
+#endif /* __GIMP_OPERATION_LEVELS_H__ */
diff --git a/app/operations/gimpoperationmaskcomponents.cc b/app/operations/gimpoperationmaskcomponents.cc
new file mode 100644
index 0000000..779dfac
--- /dev/null
+++ b/app/operations/gimpoperationmaskcomponents.cc
@@ -0,0 +1,586 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationmaskcomponents.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+extern "C"
+{
+
+#include "operations-types.h"
+
+#include "gimpoperationmaskcomponents.h"
+
+} /* extern "C" */
+
+
+enum
+{
+  PROP_0,
+  PROP_MASK,
+  PROP_ALPHA
+};
+
+
+static void            gimp_operation_mask_components_get_property     (GObject             *object,
+                                                                        guint                property_id,
+                                                                        GValue              *value,
+                                                                        GParamSpec          *pspec);
+static void            gimp_operation_mask_components_set_property     (GObject             *object,
+                                                                        guint                property_id,
+                                                                        const GValue        *value,
+                                                                        GParamSpec          *pspec);
+
+static void            gimp_operation_mask_components_prepare          (GeglOperation       *operation);
+static GeglRectangle   gimp_operation_mask_components_get_bounding_box (GeglOperation       *operation);
+static gboolean        gimp_operation_mask_components_parent_process   (GeglOperation        *operation,
+                                                                        GeglOperationContext *context,
+                                                                        const gchar          *output_prop,
+                                                                        const GeglRectangle  *result,
+                                                                        gint                  level);
+
+static gboolean        gimp_operation_mask_components_process          (GeglOperation       *operation,
+                                                                        void                *in_buf,
+                                                                        void                *aux_buf,
+                                                                        void                *out_buf,
+                                                                        glong                samples,
+                                                                        const GeglRectangle *roi,
+                                                                        gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationMaskComponents, gimp_operation_mask_components,
+               GEGL_TYPE_OPERATION_POINT_COMPOSER)
+
+#define parent_class gimp_operation_mask_components_parent_class
+
+
+static void
+gimp_operation_mask_components_class_init (GimpOperationMaskComponentsClass *klass)
+{
+  GObjectClass                    *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass              *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointComposerClass *point_class     = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_mask_components_set_property;
+  object_class->get_property = gimp_operation_mask_components_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:mask-components",
+                                 "categories",  "gimp",
+                                 "description", "Selectively pick components from src or aux",
+                                 NULL);
+
+  operation_class->prepare          = gimp_operation_mask_components_prepare;
+  operation_class->get_bounding_box = gimp_operation_mask_components_get_bounding_box;
+  operation_class->process          = gimp_operation_mask_components_parent_process;
+
+  point_class->process              = gimp_operation_mask_components_process;
+
+  g_object_class_install_property (object_class, PROP_MASK,
+                                   g_param_spec_flags ("mask",
+                                                       "Mask",
+                                                       "The component mask",
+                                                       GIMP_TYPE_COMPONENT_MASK,
+                                                       GIMP_COMPONENT_MASK_ALL,
+                                                       (GParamFlags) (
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property (object_class, PROP_ALPHA,
+                                   g_param_spec_double ("alpha",
+                                                        "Alpha",
+                                                        "The masked-in alpha value when there's no aux input",
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        (GParamFlags) (
+                                                          G_PARAM_READWRITE |
+                                                          G_PARAM_CONSTRUCT)));
+}
+
+static void
+gimp_operation_mask_components_init (GimpOperationMaskComponents *self)
+{
+}
+
+static void
+gimp_operation_mask_components_get_property (GObject    *object,
+                                             guint       property_id,
+                                             GValue     *value,
+                                             GParamSpec *pspec)
+{
+  GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (object);
+
+  switch (property_id)
+    {
+    case PROP_MASK:
+      g_value_set_flags (value, self->mask);
+      break;
+
+    case PROP_ALPHA:
+      g_value_set_double (value, self->alpha);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_mask_components_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec)
+{
+  GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (object);
+
+  switch (property_id)
+    {
+    case PROP_MASK:
+      self->mask = (GimpComponentMask) g_value_get_flags (value);
+      break;
+
+    case PROP_ALPHA:
+      self->alpha = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static guint32
+get_alpha_value (const Babl *format,
+                 gfloat      alpha)
+{
+  switch (babl_format_get_bytes_per_pixel (format))
+    {
+    #define DEF_CASE(bpp, type)                                            \
+      case bpp:                                                            \
+      {                                                                    \
+        type alpha_value;                                                  \
+                                                                           \
+        babl_process (                                                     \
+          babl_fish (babl_format_n (babl_type ("float"),              1),  \
+                     babl_format_n (babl_format_get_type (format, 0), 1)), \
+          &alpha, &alpha_value, 1);                                        \
+                                                                           \
+        return alpha_value;                                                \
+      }
+
+    DEF_CASE ( 4, guint8)
+    DEF_CASE ( 8, guint16)
+    DEF_CASE (16, guint32)
+
+    #undef DEF_CASE
+
+    default:
+      g_return_val_if_reached (0);
+    }
+}
+
+template <class T>
+struct ProcessGeneric
+{
+  static void
+  process (gconstpointer     in_buf,
+           gconstpointer     aux_buf,
+           gpointer          out_buf,
+           gint              n,
+           GimpComponentMask mask,
+           T                 alpha_value)
+  {
+    T    *out = (T *) out_buf;
+    gint  i;
+    gint  c;
+
+    if (aux_buf)
+      {
+        const T *in[4];
+
+        for (c = 0; c < 4; c++)
+          {
+            if (mask & (1 << c))
+              in[c] = (const T *) aux_buf + c;
+            else
+              in[c] = (const T *) in_buf  + c;
+          }
+
+        for (i = 0; i < n; i++)
+          {
+            for (c = 0; c < 4; c++)
+              {
+                out[c] = *in[c];
+
+                in[c] += 4;
+              }
+
+            out += 4;
+          }
+      }
+    else
+      {
+        const T *in = (const T*) in_buf;
+
+        for (i = 0; i < n; i++)
+          {
+            for (c = 0; c < 3; c++)
+              {
+                if (mask & (1 << c))
+                  out[c] = 0;
+                else
+                  out[c] = in[c];
+              }
+
+            if (mask & (1 << 3))
+              out[3] = alpha_value;
+            else
+              out[3] = in[3];
+
+            in  += 4;
+            out += 4;
+          }
+      }
+  }
+};
+
+template <class T>
+struct Process : ProcessGeneric<T>
+{
+};
+
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+
+template <>
+struct Process<guint8>
+{
+  static void
+  process (gconstpointer     in_buf,
+           gconstpointer     aux_buf,
+           gpointer          out_buf,
+           gint              n,
+           GimpComponentMask mask,
+           guint8            alpha_value)
+  {
+    const guint32 *in;
+    guint32       *out;
+    guint32        in_mask = 0;
+    gint           i;
+    gint           c;
+
+    if (((guintptr) in_buf | (guintptr) aux_buf | (guintptr) out_buf) % 4)
+      {
+        ProcessGeneric<guint8>::process (in_buf, aux_buf, out_buf, n,
+                                         mask, alpha_value);
+
+        return;
+      }
+
+    in  = (const guint32 *) in_buf;
+    out = (guint32       *) out_buf;
+
+    for (c = 0; c < 4; c++)
+      {
+        if (! (mask & (1 << c)))
+          in_mask |= 0xff << (8 * c);
+      }
+
+    if (aux_buf)
+      {
+        const guint32 *aux      = (const guint32 *) aux_buf;
+        guint32        aux_mask = ~in_mask;
+
+        for (i = 0; i < n; i++)
+          {
+            *out = (*in & in_mask) | (*aux & aux_mask);
+
+            in++;
+            aux++;
+            out++;
+          }
+      }
+    else
+      {
+        if (! (mask & GIMP_COMPONENT_MASK_ALPHA) || ! alpha_value)
+          {
+            for (i = 0; i < n; i++)
+              {
+                *out = *in & in_mask;
+
+                in++;
+                out++;
+              }
+          }
+        else
+          {
+            guint32 alpha_mask = alpha_value << 24;
+
+            for (i = 0; i < n; i++)
+              {
+                *out = (*in & in_mask) | alpha_mask;
+
+                in++;
+                out++;
+              }
+          }
+      }
+  }
+};
+
+#endif /* G_BYTE_ORDER == G_LITTLE_ENDIAN */
+
+template <class T>
+static gboolean
+gimp_operation_mask_components_process (GimpOperationMaskComponents *self,
+                                        void                        *in_buf,
+                                        void                        *aux_buf,
+                                        void                        *out_buf,
+                                        glong                        samples,
+                                        const GeglRectangle         *roi,
+                                        gint                         level)
+{
+  Process<T>::process (in_buf, aux_buf, out_buf, samples,
+                       self->mask, self->alpha_value);
+
+  return TRUE;
+}
+
+static void
+gimp_operation_mask_components_prepare (GeglOperation *operation)
+{
+  GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation);
+  const Babl                  *format;
+
+  format = gimp_operation_mask_components_get_format (
+    gegl_operation_get_source_format (operation, "input"));
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "aux",    format);
+  gegl_operation_set_format (operation, "output", format);
+
+  if (format != self->format)
+    {
+      self->format = format;
+
+      self->alpha_value = get_alpha_value (format, self->alpha);
+
+      switch (babl_format_get_bytes_per_pixel (format))
+        {
+        case 4:
+          self->process = (gpointer)
+                            gimp_operation_mask_components_process<guint8>;
+          break;
+
+        case 8:
+          self->process = (gpointer)
+                            gimp_operation_mask_components_process<guint16>;
+          break;
+
+        case 16:
+          self->process = (gpointer)
+                            gimp_operation_mask_components_process<guint32>;
+          break;
+
+        default:
+          g_return_if_reached ();
+        }
+    }
+}
+
+static GeglRectangle
+gimp_operation_mask_components_get_bounding_box (GeglOperation *operation)
+{
+  GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation);
+  GeglRectangle               *in_rect;
+  GeglRectangle               *aux_rect;
+  GeglRectangle                result = {};
+
+  in_rect  = gegl_operation_source_get_bounding_box (operation, "input");
+  aux_rect = gegl_operation_source_get_bounding_box (operation, "aux");
+
+  if (self->mask == 0)
+    {
+      if (in_rect)
+        return *in_rect;
+    }
+  else if (self->mask == GIMP_COMPONENT_MASK_ALL)
+    {
+      if (aux_rect)
+        return *aux_rect;
+    }
+
+  if (in_rect)
+    gegl_rectangle_bounding_box (&result, &result, in_rect);
+
+  if (aux_rect)
+    gegl_rectangle_bounding_box (&result, &result, aux_rect);
+
+  return result;
+}
+
+static gboolean
+gimp_operation_mask_components_parent_process (GeglOperation        *operation,
+                                               GeglOperationContext *context,
+                                               const gchar          *output_prop,
+                                               const GeglRectangle  *result,
+                                               gint                  level)
+{
+  GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation);
+
+  if (self->mask == 0)
+    {
+      GObject *input = gegl_operation_context_get_object (context, "input");
+
+      gegl_operation_context_set_object (context, "output", input);
+
+      return TRUE;
+    }
+  else if (self->mask == GIMP_COMPONENT_MASK_ALL)
+    {
+      GObject *aux = gegl_operation_context_get_object (context, "aux");
+
+      /* when there's no aux and the alpha component is masked-in, we set the
+       * result's alpha component to the value of the "alpha" property; if it
+       * doesn't equal 0, we can't forward an empty aux.
+       */
+      if (aux || ! self->alpha_value)
+        {
+          gegl_operation_context_set_object (context, "output", aux);
+
+          return TRUE;
+        }
+    }
+
+  return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
+                                                       output_prop, result,
+                                                       level);
+}
+
+static gboolean
+gimp_operation_mask_components_process (GeglOperation       *operation,
+                                        void                *in_buf,
+                                        void                *aux_buf,
+                                        void                *out_buf,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  typedef gboolean (* ProcessFunc) (GimpOperationMaskComponents *self,
+                                    void                        *in_buf,
+                                    void                        *aux_buf,
+                                    void                        *out_buf,
+                                    glong                        samples,
+                                    const GeglRectangle         *roi,
+                                    gint                         level);
+
+  GimpOperationMaskComponents *self = (GimpOperationMaskComponents *) operation;
+
+  return ((ProcessFunc) self->process) (self,
+                                        in_buf, aux_buf, out_buf, samples,
+                                        roi, level);
+}
+
+const Babl *
+gimp_operation_mask_components_get_format (const Babl *input_format)
+{
+  const Babl *format = NULL;
+
+  if (input_format)
+    {
+      const Babl  *model      = babl_format_get_model (input_format);
+      const gchar *model_name = babl_get_name (model);
+      const Babl  *type       = babl_format_get_type (input_format, 0);
+      const gchar *type_name  = babl_get_name (type);
+
+      if (! strcmp (model_name, "Y")   ||
+          ! strcmp (model_name, "YA")  ||
+          ! strcmp (model_name, "RGB") ||
+          ! strcmp (model_name, "RGBA"))
+        {
+          if (! strcmp (type_name, "u8"))
+            format = babl_format ("RGBA u8");
+          else if (! strcmp (type_name, "u16"))
+            format = babl_format ("RGBA u16");
+          else if (! strcmp (type_name, "u32"))
+            format = babl_format ("RGBA u32");
+          else if (! strcmp (type_name, "half"))
+            format = babl_format ("RGBA half");
+          else if (! strcmp (type_name, "float"))
+            format = babl_format ("RGBA float");
+        }
+      else if (! strcmp (model_name, "Y'")      ||
+               ! strcmp (model_name, "Y'A")     ||
+               ! strcmp (model_name, "R'G'B'")  ||
+               ! strcmp (model_name, "R'G'B'A") ||
+               babl_format_is_palette (input_format))
+        {
+          if (! strcmp (type_name, "u8"))
+            format = babl_format ("R'G'B'A u8");
+          else if (! strcmp (type_name, "u16"))
+            format = babl_format ("R'G'B'A u16");
+          else if (! strcmp (type_name, "u32"))
+            format = babl_format ("R'G'B'A u32");
+          else if (! strcmp (type_name, "half"))
+            format = babl_format ("R'G'B'A half");
+          else if (! strcmp (type_name, "float"))
+            format = babl_format ("R'G'B'A float");
+        }
+    }
+
+  if (! format)
+    format = babl_format ("RGBA float");
+
+  return format;
+}
+
+void
+gimp_operation_mask_components_process (const Babl        *format,
+                                        gconstpointer      in,
+                                        gconstpointer      aux,
+                                        gpointer           out,
+                                        gint               n,
+                                        GimpComponentMask  mask)
+{
+  g_return_if_fail (format != NULL);
+  g_return_if_fail (in != NULL);
+  g_return_if_fail (out != NULL);
+  g_return_if_fail (n >= 0);
+
+  switch (babl_format_get_bytes_per_pixel (format))
+    {
+    case 4:
+      Process<guint8>::process (in, aux, out, n, mask, 0);
+      break;
+
+    case 8:
+      Process<guint16>::process (in, aux, out, n, mask, 0);
+      break;
+
+    case 16:
+      Process<guint32>::process (in, aux, out, n, mask, 0);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+}
diff --git a/app/operations/gimpoperationmaskcomponents.h b/app/operations/gimpoperationmaskcomponents.h
new file mode 100644
index 0000000..0919a38
--- /dev/null
+++ b/app/operations/gimpoperationmaskcomponents.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationmaskcomponents.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_MASK_COMPONENTS_H__
+#define __GIMP_OPERATION_MASK_COMPONENTS_H__
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_MASK_COMPONENTS            (gimp_operation_mask_components_get_type ())
+#define GIMP_OPERATION_MASK_COMPONENTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_MASK_COMPONENTS, GimpOperationMaskComponents))
+#define GIMP_OPERATION_MASK_COMPONENTS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_MASK_COMPONENTS, GimpOperationMaskComponentsClass))
+#define GIMP_IS_OPERATION_MASK_COMPONENTS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_MASK_COMPONENTS))
+#define GIMP_IS_OPERATION_MASK_COMPONENTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_MASK_COMPONENTS))
+#define GIMP_OPERATION_MASK_COMPONENTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_MASK_COMPONENTS, GimpOperationMaskComponentsClass))
+
+
+typedef struct _GimpOperationMaskComponents      GimpOperationMaskComponents;
+typedef struct _GimpOperationMaskComponentsClass GimpOperationMaskComponentsClass;
+
+struct _GimpOperationMaskComponents
+{
+  GeglOperationPointComposer  parent_instance;
+
+  GimpComponentMask           mask;
+  gdouble                     alpha;
+
+  guint32                     alpha_value;
+  gpointer                    process;
+  const Babl                 *format;
+};
+
+struct _GimpOperationMaskComponentsClass
+{
+  GeglOperationPointComposerClass  parent_class;
+};
+
+
+GType        gimp_operation_mask_components_get_type   (void) G_GNUC_CONST;
+
+const Babl * gimp_operation_mask_components_get_format (const Babl        *input_format);
+
+void         gimp_operation_mask_components_process    (const Babl        *format,
+                                                        gconstpointer      in,
+                                                        gconstpointer      aux,
+                                                        gpointer           out,
+                                                        gint               n,
+                                                        GimpComponentMask  mask);
+
+
+#endif /* __GIMP_OPERATION_MASK_COMPONENTS_H__ */
diff --git a/app/operations/gimpoperationoffset.c b/app/operations/gimpoperationoffset.c
new file mode 100644
index 0000000..ee269ed
--- /dev/null
+++ b/app/operations/gimpoperationoffset.c
@@ -0,0 +1,497 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationoffset.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "operations-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimpoperationoffset.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_TYPE,
+  PROP_X,
+  PROP_Y
+};
+
+
+static void            gimp_operation_offset_dispose                   (GObject              *object);
+static void            gimp_operation_offset_get_property              (GObject              *object,
+                                                                        guint                 property_id,
+                                                                        GValue               *value,
+                                                                        GParamSpec           *pspec);
+static void            gimp_operation_offset_set_property              (GObject              *object,
+                                                                        guint                 property_id,
+                                                                        const GValue         *value,
+                                                                        GParamSpec           *pspec);
+
+static GeglRectangle   gimp_operation_offset_get_required_for_output   (GeglOperation        *operation,
+                                                                        const gchar          *input_pad,
+                                                                        const GeglRectangle  *output_roi);
+static GeglRectangle   gimp_operation_offset_get_invalidated_by_change (GeglOperation        *operation,
+                                                                        const gchar          *input_pad,
+                                                                        const GeglRectangle  *input_roi);
+static void            gimp_operation_offset_prepare                   (GeglOperation        *operation);
+static gboolean        gimp_operation_offset_parent_process            (GeglOperation        *operation,
+                                                                        GeglOperationContext *context,
+                                                                        const gchar          *output_pad,
+                                                                        const GeglRectangle  *result,
+                                                                        gint                  level);
+
+static gboolean        gimp_operation_offset_process                   (GeglOperation        *operation,
+                                                                        GeglBuffer           *input,
+                                                                        GeglBuffer           *output,
+                                                                        const GeglRectangle  *roi,
+                                                                        gint                  level);
+
+static void            gimp_operation_offset_get_offset                (GimpOperationOffset  *offset,
+                                                                        gboolean              invert,
+                                                                        gint                 *x,
+                                                                        gint                 *y);
+static void            gimp_operation_offset_get_rect                  (GimpOperationOffset  *offset,
+                                                                        gboolean              invert,
+                                                                        const GeglRectangle  *roi,
+                                                                        GeglRectangle        *rect);
+
+
+G_DEFINE_TYPE (GimpOperationOffset, gimp_operation_offset,
+               GEGL_TYPE_OPERATION_FILTER)
+
+#define parent_class gimp_operation_offset_parent_class
+
+
+static void
+gimp_operation_offset_class_init (GimpOperationOffsetClass *klass)
+{
+  GObjectClass             *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationFilterClass *filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
+
+  object_class->dispose                      = gimp_operation_offset_dispose;
+  object_class->set_property                 = gimp_operation_offset_set_property;
+  object_class->get_property                 = gimp_operation_offset_get_property;
+
+  operation_class->get_required_for_output   = gimp_operation_offset_get_required_for_output;
+  operation_class->get_invalidated_by_change = gimp_operation_offset_get_invalidated_by_change;
+  operation_class->prepare                   = gimp_operation_offset_prepare;
+  operation_class->process                   = gimp_operation_offset_parent_process;
+
+  operation_class->threaded                  = FALSE;
+  operation_class->cache_policy              = GEGL_CACHE_POLICY_NEVER;
+
+  filter_class->process                      = gimp_operation_offset_process;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:offset",
+                                 "categories",  "transform",
+                                 "description", _("Shift the pixels, optionally wrapping them at the borders"),
+                                 NULL);
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        "Context",
+                                                        "A GimpContext",
+                                                        GIMP_TYPE_CONTEXT,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum  ("type",
+                                                       "Type",
+                                                       "Offset type",
+                                                       GIMP_TYPE_OFFSET_TYPE,
+                                                       GIMP_OFFSET_WRAP_AROUND,
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_int ("x",
+                                                     "X Offset",
+                                                     "X offset",
+                                                     G_MININT, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_int ("y",
+                                                     "Y Offset",
+                                                     "Y offset",
+                                                     G_MININT, G_MAXINT, 0,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_offset_init (GimpOperationOffset *self)
+{
+}
+
+static void
+gimp_operation_offset_dispose (GObject *object)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (object);
+
+  g_clear_object (&offset->context);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_operation_offset_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, offset->context);
+      break;
+
+    case PROP_TYPE:
+      g_value_set_enum (value, offset->type);
+      break;
+
+    case PROP_X:
+      g_value_set_int (value, offset->x);
+      break;
+
+    case PROP_Y:
+      g_value_set_int (value, offset->y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_offset_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_set_object (&offset->context, g_value_get_object (value));
+      break;
+
+    case PROP_TYPE:
+      offset->type = g_value_get_enum (value);
+      break;
+
+    case PROP_X:
+      offset->x = g_value_get_int (value);
+      break;
+
+    case PROP_Y:
+      offset->y = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GeglRectangle
+gimp_operation_offset_get_required_for_output (GeglOperation       *operation,
+                                               const gchar         *input_pad,
+                                               const GeglRectangle *output_roi)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (operation);
+  GeglRectangle        rect;
+
+  gimp_operation_offset_get_rect (offset, TRUE, output_roi, &rect);
+
+  return rect;
+}
+
+static GeglRectangle
+gimp_operation_offset_get_invalidated_by_change (GeglOperation       *operation,
+                                                 const gchar         *input_pad,
+                                                 const GeglRectangle *input_roi)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (operation);
+  GeglRectangle        rect;
+
+  gimp_operation_offset_get_rect (offset, FALSE, input_roi, &rect);
+
+  return rect;
+}
+
+static void
+gimp_operation_offset_prepare (GeglOperation *operation)
+{
+  const Babl *format;
+
+  format = gegl_operation_get_source_format (operation, "input");
+
+  if (! format)
+    format = babl_format ("RGBA float");
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "output", format);
+}
+
+static gboolean
+gimp_operation_offset_parent_process (GeglOperation        *operation,
+                                      GeglOperationContext *context,
+                                      const gchar          *output_pad,
+                                      const GeglRectangle  *result,
+                                      gint                  level)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (operation);
+  GObject             *input;
+  gint                 x;
+  gint                 y;
+
+  input = gegl_operation_context_get_object (context, "input");
+
+  gimp_operation_offset_get_offset (offset, FALSE, &x, &y);
+
+  if (x == 0 && y == 0)
+    {
+      gegl_operation_context_set_object (context, "output", input);
+
+      return TRUE;
+    }
+  else if (offset->type  == GIMP_OFFSET_TRANSPARENT ||
+           (offset->type == GIMP_OFFSET_BACKGROUND  &&
+            ! offset->context))
+    {
+      GObject *output = NULL;
+
+      if (input)
+        {
+          GeglRectangle bounds;
+          GeglRectangle extent;
+
+          bounds = gegl_operation_get_bounding_box (GEGL_OPERATION (offset));
+
+          extent = *gegl_buffer_get_extent (GEGL_BUFFER (input));
+
+          extent.x += x;
+          extent.y += y;
+
+          if (gegl_rectangle_intersect (&extent, &extent, &bounds))
+            {
+              output = g_object_new (GEGL_TYPE_BUFFER,
+                                     "source",  input,
+                                     "x",       extent.x,
+                                     "y",       extent.y,
+                                     "width",   extent.width,
+                                     "height",  extent.height,
+                                     "shift-x", -x,
+                                     "shift-y", -y,
+                                     NULL);
+
+              if (gegl_object_get_has_forked (input))
+                gegl_object_set_has_forked (output);
+            }
+        }
+
+      gegl_operation_context_take_object (context, "output", output);
+
+      return TRUE;
+    }
+
+  return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
+                                                       output_pad, result,
+                                                       level);
+}
+
+static gboolean
+gimp_operation_offset_process (GeglOperation       *operation,
+                               GeglBuffer          *input,
+                               GeglBuffer          *output,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  GimpOperationOffset *offset = GIMP_OPERATION_OFFSET (operation);
+  GeglColor           *color  = NULL;
+  GeglRectangle        bounds;
+  gint                 x;
+  gint                 y;
+  gint                 i;
+
+  bounds = gegl_operation_get_bounding_box (GEGL_OPERATION (offset));
+
+  gimp_operation_offset_get_offset (offset, FALSE, &x, &y);
+
+  if (offset->type == GIMP_OFFSET_BACKGROUND && offset->context)
+    {
+      GimpRGB bg;
+
+      gimp_context_get_background (offset->context, &bg);
+
+      color = gimp_gegl_color_new (&bg);
+    }
+
+  for (i = 0; i < 4; i++)
+    {
+      GeglRectangle offset_bounds = bounds;
+      gint          offset_x      = x;
+      gint          offset_y      = y;
+
+      if (i & 1)
+        offset_x += x < 0 ? bounds.width  : -bounds.width;
+      if (i & 2)
+        offset_y += y < 0 ? bounds.height : -bounds.height;
+
+      offset_bounds.x += offset_x;
+      offset_bounds.y += offset_y;
+
+      if (gegl_rectangle_intersect (&offset_bounds, &offset_bounds, roi))
+        {
+          if (i == 0 || offset->type == GIMP_OFFSET_WRAP_AROUND)
+            {
+              GeglRectangle offset_roi = offset_bounds;
+
+              offset_roi.x -= offset_x;
+              offset_roi.y -= offset_y;
+
+              gimp_gegl_buffer_copy (input,  &offset_roi, GEGL_ABYSS_NONE,
+                                     output, &offset_bounds);
+            }
+          else if (color)
+            {
+              gegl_buffer_set_color (output, &offset_bounds, color);
+            }
+        }
+    }
+
+  g_clear_object (&color);
+
+  return TRUE;
+}
+
+static void
+gimp_operation_offset_get_offset (GimpOperationOffset *offset,
+                                  gboolean             invert,
+                                  gint                *x,
+                                  gint                *y)
+{
+  GeglRectangle bounds;
+
+  bounds = gegl_operation_get_bounding_box (GEGL_OPERATION (offset));
+
+  if (gegl_rectangle_is_empty (&bounds))
+    {
+      *x = 0;
+      *y = 0;
+
+      return;
+    }
+
+  *x = offset->x;
+  *y = offset->y;
+
+  if (invert)
+    {
+      *x = -*x;
+      *y = -*y;
+    }
+
+  if (offset->type == GIMP_OFFSET_WRAP_AROUND)
+    {
+      *x %= bounds.width;
+
+      if (*x < 0)
+        *x += bounds.width;
+
+      *y %= bounds.height;
+
+      if (*y < 0)
+        *y += bounds.height;
+    }
+  else
+    {
+      *x = CLAMP (*x, -bounds.width,  +bounds.width);
+      *y = CLAMP (*y, -bounds.height, +bounds.height);
+    }
+}
+
+static void
+gimp_operation_offset_get_rect (GimpOperationOffset *offset,
+                                gboolean             invert,
+                                const GeglRectangle *roi,
+                                GeglRectangle       *rect)
+{
+  GeglRectangle bounds;
+  gint          x;
+  gint          y;
+
+  bounds = gegl_operation_get_bounding_box (GEGL_OPERATION (offset));
+
+  if (gegl_rectangle_is_empty (&bounds))
+    {
+      rect->x      = 0;
+      rect->y      = 0;
+      rect->width  = 0;
+      rect->height = 0;
+
+      return;
+    }
+
+  gimp_operation_offset_get_offset (offset, invert, &x, &y);
+
+  *rect = *roi;
+
+  rect->x += x;
+  rect->y += y;
+
+  if (offset->type == GIMP_OFFSET_WRAP_AROUND)
+    {
+      if (rect->x + rect->width > bounds.x + bounds.width)
+        {
+          rect->x      = bounds.x;
+          rect->width  = bounds.width;
+        }
+
+      if (rect->y + rect->height > bounds.y + bounds.height)
+        {
+          rect->y      = bounds.y;
+          rect->height = bounds.height;
+        }
+    }
+
+  gegl_rectangle_intersect (rect, rect, &bounds);
+}
diff --git a/app/operations/gimpoperationoffset.h b/app/operations/gimpoperationoffset.h
new file mode 100644
index 0000000..dcd0e0b
--- /dev/null
+++ b/app/operations/gimpoperationoffset.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationoffset.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_OFFSET_H__
+#define __GIMP_OPERATION_OFFSET_H__
+
+
+#define GIMP_TYPE_OPERATION_OFFSET            (gimp_operation_offset_get_type ())
+#define GIMP_OPERATION_OFFSET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_OFFSET, GimpOperationOffset))
+#define GIMP_OPERATION_OFFSET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_OFFSET, GimpOperationOffsetClass))
+#define GIMP_IS_OPERATION_OFFSET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_OFFSET))
+#define GIMP_IS_OPERATION_OFFSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_OFFSET))
+#define GIMP_OPERATION_OFFSET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_OFFSET, GimpOperationOffsetClass))
+
+
+typedef struct _GimpOperationOffset      GimpOperationOffset;
+typedef struct _GimpOperationOffsetClass GimpOperationOffsetClass;
+
+struct _GimpOperationOffset
+{
+  GeglOperationFilter  parent_instance;
+
+  GimpContext         *context;
+  GimpOffsetType       type;
+  gint                 x;
+  gint                 y;
+};
+
+struct _GimpOperationOffsetClass
+{
+  GeglOperationFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_offset_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_OFFSET_H__ */
diff --git a/app/operations/gimpoperationpointfilter.c b/app/operations/gimpoperationpointfilter.c
new file mode 100644
index 0000000..b9bfa1d
--- /dev/null
+++ b/app/operations/gimpoperationpointfilter.c
@@ -0,0 +1,131 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationpointfilter.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "gimpoperationpointfilter.h"
+
+
+static void   gimp_operation_point_filter_finalize (GObject       *object);
+static void   gimp_operation_point_filter_prepare  (GeglOperation *operation);
+
+
+G_DEFINE_ABSTRACT_TYPE (GimpOperationPointFilter, gimp_operation_point_filter,
+                        GEGL_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_point_filter_parent_class
+
+
+static void
+gimp_operation_point_filter_class_init (GimpOperationPointFilterClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GeglOperationClass  *operation_class = GEGL_OPERATION_CLASS (klass);
+
+  object_class->finalize = gimp_operation_point_filter_finalize;
+
+  operation_class->prepare = gimp_operation_point_filter_prepare;
+}
+
+static void
+gimp_operation_point_filter_init (GimpOperationPointFilter *self)
+{
+}
+
+static void
+gimp_operation_point_filter_finalize (GObject *object)
+{
+  GimpOperationPointFilter *self = GIMP_OPERATION_POINT_FILTER (object);
+
+  g_clear_object (&self->config);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+void
+gimp_operation_point_filter_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpOperationPointFilter *self = GIMP_OPERATION_POINT_FILTER (object);
+
+  switch (property_id)
+    {
+    case GIMP_OPERATION_POINT_FILTER_PROP_LINEAR:
+      g_value_set_boolean (value, self->linear);
+      break;
+
+    case GIMP_OPERATION_POINT_FILTER_PROP_CONFIG:
+      g_value_set_object (value, self->config);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+void
+gimp_operation_point_filter_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpOperationPointFilter *self = GIMP_OPERATION_POINT_FILTER (object);
+
+  switch (property_id)
+    {
+    case GIMP_OPERATION_POINT_FILTER_PROP_LINEAR:
+      self->linear = g_value_get_boolean (value);
+      break;
+
+    case GIMP_OPERATION_POINT_FILTER_PROP_CONFIG:
+      if (self->config)
+        g_object_unref (self->config);
+      self->config = g_value_dup_object (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_point_filter_prepare (GeglOperation *operation)
+{
+  GimpOperationPointFilter *self = GIMP_OPERATION_POINT_FILTER (operation);
+  const Babl               *space = gegl_operation_get_source_space (operation,
+                                                                     "input");
+  const Babl               *format;
+
+  if (self->linear)
+    format = babl_format_with_space ("RGBA float", space);
+  else
+    format = babl_format_with_space ("R'G'B'A float", space);
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "output", format);
+}
diff --git a/app/operations/gimpoperationpointfilter.h b/app/operations/gimpoperationpointfilter.h
new file mode 100644
index 0000000..f039af7
--- /dev/null
+++ b/app/operations/gimpoperationpointfilter.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationpointfilter.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_POINT_FILTER_H__
+#define __GIMP_OPERATION_POINT_FILTER_H__
+
+
+#include <gegl-plugin.h>
+#include <operation/gegl-operation-point-filter.h>
+
+
+enum
+{
+  GIMP_OPERATION_POINT_FILTER_PROP_0,
+  GIMP_OPERATION_POINT_FILTER_PROP_LINEAR,
+  GIMP_OPERATION_POINT_FILTER_PROP_CONFIG
+};
+
+
+#define GIMP_TYPE_OPERATION_POINT_FILTER            (gimp_operation_point_filter_get_type ())
+#define GIMP_OPERATION_POINT_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_POINT_FILTER, GimpOperationPointFilter))
+#define GIMP_OPERATION_POINT_FILTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_POINT_FILTER, GimpOperationPointFilterClass))
+#define GIMP_IS_OPERATION_POINT_FILTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_POINT_FILTER))
+#define GIMP_IS_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_POINT_FILTER))
+#define GIMP_OPERATION_POINT_FILTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_POINT_FILTER, GimpOperationPointFilterClass))
+
+
+typedef struct _GimpOperationPointFilterClass GimpOperationPointFilterClass;
+
+struct _GimpOperationPointFilter
+{
+  GeglOperationPointFilter  parent_instance;
+
+  gboolean                  linear;
+  GObject                  *config;
+};
+
+struct _GimpOperationPointFilterClass
+{
+  GeglOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_point_filter_get_type     (void) G_GNUC_CONST;
+
+void    gimp_operation_point_filter_get_property (GObject      *object,
+                                                  guint         property_id,
+                                                  GValue       *value,
+                                                  GParamSpec   *pspec);
+void    gimp_operation_point_filter_set_property (GObject      *object,
+                                                  guint         property_id,
+                                                  const GValue *value,
+                                                  GParamSpec   *pspec);
+
+
+#endif /* __GIMP_OPERATION_POINT_FILTER_H__ */
diff --git a/app/operations/gimpoperationposterize.c b/app/operations/gimpoperationposterize.c
new file mode 100644
index 0000000..88f5d26
--- /dev/null
+++ b/app/operations/gimpoperationposterize.c
@@ -0,0 +1,165 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationposterize.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationposterize.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LEVELS
+};
+
+
+static void     gimp_operation_posterize_get_property (GObject             *object,
+                                                       guint                property_id,
+                                                       GValue              *value,
+                                                       GParamSpec          *pspec);
+static void     gimp_operation_posterize_set_property (GObject             *object,
+                                                       guint                property_id,
+                                                       const GValue        *value,
+                                                       GParamSpec          *pspec);
+
+static gboolean gimp_operation_posterize_process      (GeglOperation       *operation,
+                                                       void                *in_buf,
+                                                       void                *out_buf,
+                                                       glong                samples,
+                                                       const GeglRectangle *roi,
+                                                       gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationPosterize, gimp_operation_posterize,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_posterize_parent_class
+
+
+static void
+gimp_operation_posterize_class_init (GimpOperationPosterizeClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_posterize_set_property;
+  object_class->get_property = gimp_operation_posterize_get_property;
+
+  point_class->process       = gimp_operation_posterize_process;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:posterize",
+                                 "categories",  "color",
+                                 "description", _("Reduce to a limited set of colors"),
+                                 NULL);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LEVELS,
+                        "levels",
+                        _("Posterize levels"),
+                        NULL,
+                        2, 256, 3,
+                        GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_operation_posterize_init (GimpOperationPosterize *self)
+{
+}
+
+static void
+gimp_operation_posterize_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpOperationPosterize *posterize = GIMP_OPERATION_POSTERIZE (object);
+
+  switch (property_id)
+    {
+    case PROP_LEVELS:
+      g_value_set_int (value, posterize->levels);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_posterize_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpOperationPosterize *posterize = GIMP_OPERATION_POSTERIZE (object);
+
+  switch (property_id)
+    {
+    case PROP_LEVELS:
+      posterize->levels = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_operation_posterize_process (GeglOperation       *operation,
+                                  void                *in_buf,
+                                  void                *out_buf,
+                                  glong                samples,
+                                  const GeglRectangle *roi,
+                                  gint                 level)
+{
+  GimpOperationPosterize *posterize = GIMP_OPERATION_POSTERIZE (operation);
+  gfloat                 *src       = in_buf;
+  gfloat                 *dest      = out_buf;
+  gfloat                  levels;
+
+  levels = posterize->levels - 1.0;
+
+  while (samples--)
+    {
+      dest[RED]   = RINT (src[RED]   * levels) / levels;
+      dest[GREEN] = RINT (src[GREEN] * levels) / levels;
+      dest[BLUE]  = RINT (src[BLUE]  * levels) / levels;
+      dest[ALPHA] = RINT (src[ALPHA] * levels) / levels;
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationposterize.h b/app/operations/gimpoperationposterize.h
new file mode 100644
index 0000000..06e5731
--- /dev/null
+++ b/app/operations/gimpoperationposterize.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationposterize.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_POSTERIZE_H__
+#define __GIMP_OPERATION_POSTERIZE_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_POSTERIZE            (gimp_operation_posterize_get_type ())
+#define GIMP_OPERATION_POSTERIZE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_POSTERIZE, GimpOperationPosterize))
+#define GIMP_OPERATION_POSTERIZE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_POSTERIZE, GimpOperationPosterizeClass))
+#define GIMP_IS_OPERATION_POSTERIZE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_POSTERIZE))
+#define GIMP_IS_OPERATION_POSTERIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_POSTERIZE))
+#define GIMP_OPERATION_POSTERIZE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_POSTERIZE, GimpOperationPosterizeClass))
+
+
+typedef struct _GimpOperationPosterize      GimpOperationPosterize;
+typedef struct _GimpOperationPosterizeClass GimpOperationPosterizeClass;
+
+struct _GimpOperationPosterize
+{
+  GimpOperationPointFilter  parent_instance;
+
+  gint                      levels;
+};
+
+struct _GimpOperationPosterizeClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_posterize_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_POSTERIZE_H__ */
diff --git a/app/operations/gimpoperationprofiletransform.c b/app/operations/gimpoperationprofiletransform.c
new file mode 100644
index 0000000..2e42459
--- /dev/null
+++ b/app/operations/gimpoperationprofiletransform.c
@@ -0,0 +1,307 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationprofiletransform.c
+ * Copyright (C) 2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationprofiletransform.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SRC_PROFILE,
+  PROP_SRC_FORMAT,
+  PROP_DEST_PROFILE,
+  PROP_DEST_FORMAT,
+  PROP_RENDERING_INTENT,
+  PROP_BLACK_POINT_COMPENSATION
+};
+
+
+static void       gimp_operation_profile_transform_finalize     (GObject             *object);
+
+static void       gimp_operation_profile_transform_get_property (GObject             *object,
+                                                                 guint                property_id,
+                                                                 GValue              *value,
+                                                                 GParamSpec          *pspec);
+static void       gimp_operation_profile_transform_set_property (GObject             *object,
+                                                                 guint                property_id,
+                                                                 const GValue        *value,
+                                                                 GParamSpec          *pspec);
+
+static void       gimp_operation_profile_transform_prepare      (GeglOperation       *operation);
+static gboolean   gimp_operation_profile_transform_process      (GeglOperation       *operation,
+                                                                 void                *in_buf,
+                                                                 void                *out_buf,
+                                                                 glong                samples,
+                                                                 const GeglRectangle *roi,
+                                                                 gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationProfileTransform, gimp_operation_profile_transform,
+               GEGL_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_profile_transform_parent_class
+
+
+static void
+gimp_operation_profile_transform_class_init (GimpOperationProfileTransformClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->finalize     = gimp_operation_profile_transform_finalize;
+  object_class->set_property = gimp_operation_profile_transform_set_property;
+  object_class->get_property = gimp_operation_profile_transform_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:profile-transform",
+                                 "categories",  "color",
+                                 "description",
+                                 "Transform between two color profiles",
+                                 NULL);
+
+  operation_class->prepare = gimp_operation_profile_transform_prepare;
+
+  point_class->process     = gimp_operation_profile_transform_process;
+
+  g_object_class_install_property (object_class, PROP_SRC_PROFILE,
+                                   g_param_spec_object ("src-profile",
+                                                        "Source Profile",
+                                                        "Source Profile",
+                                                        GIMP_TYPE_COLOR_PROFILE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SRC_FORMAT,
+                                   g_param_spec_pointer ("src-format",
+                                                         "Source Format",
+                                                         "Source Format",
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DEST_PROFILE,
+                                   g_param_spec_object ("dest-profile",
+                                                        "Destination Profile",
+                                                        "Destination Profile",
+                                                        GIMP_TYPE_COLOR_PROFILE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DEST_FORMAT,
+                                   g_param_spec_pointer ("dest-format",
+                                                         "Destination Format",
+                                                         "Destination Format",
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RENDERING_INTENT,
+                                   g_param_spec_enum ("rendering-intent",
+                                                      "Rendering Intent",
+                                                      "Rendering Intent",
+                                                      GIMP_TYPE_COLOR_RENDERING_INTENT,
+                                                      GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BLACK_POINT_COMPENSATION,
+                                   g_param_spec_boolean ("black-point-compensation",
+                                                         "Black Point Compensation",
+                                                         "Black Point Compensation",
+                                                         TRUE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_profile_transform_init (GimpOperationProfileTransform *self)
+{
+}
+
+static void
+gimp_operation_profile_transform_finalize (GObject *object)
+{
+  GimpOperationProfileTransform *self = GIMP_OPERATION_PROFILE_TRANSFORM (object);
+
+  g_clear_object (&self->src_profile);
+  g_clear_object (&self->dest_profile);
+  g_clear_object (&self->transform);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_operation_profile_transform_get_property (GObject    *object,
+                                               guint       property_id,
+                                               GValue     *value,
+                                               GParamSpec *pspec)
+{
+  GimpOperationProfileTransform *self = GIMP_OPERATION_PROFILE_TRANSFORM (object);
+
+  switch (property_id)
+    {
+    case PROP_SRC_PROFILE:
+      g_value_set_object (value, self->src_profile);
+      break;
+
+    case PROP_SRC_FORMAT:
+      g_value_set_pointer (value, (gpointer) self->src_format);
+      break;
+
+    case PROP_DEST_PROFILE:
+      g_value_set_object (value, self->dest_profile);
+      break;
+
+    case PROP_DEST_FORMAT:
+      g_value_set_pointer (value, (gpointer) self->dest_format);
+      break;
+
+    case PROP_RENDERING_INTENT:
+      g_value_set_enum (value, self->rendering_intent);
+      break;
+
+    case PROP_BLACK_POINT_COMPENSATION:
+      g_value_set_boolean (value, self->black_point_compensation);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_profile_transform_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec)
+{
+  GimpOperationProfileTransform *self = GIMP_OPERATION_PROFILE_TRANSFORM (object);
+
+  switch (property_id)
+    {
+    case PROP_SRC_PROFILE:
+      if (self->src_profile)
+        g_object_unref (self->src_profile);
+      self->src_profile = g_value_dup_object (value);
+      break;
+
+    case PROP_SRC_FORMAT:
+      self->src_format = g_value_get_pointer (value);
+      break;
+
+    case PROP_DEST_PROFILE:
+      if (self->dest_profile)
+        g_object_unref (self->dest_profile);
+      self->dest_profile = g_value_dup_object (value);
+      break;
+
+    case PROP_DEST_FORMAT:
+      self->dest_format = g_value_get_pointer (value);
+      break;
+
+    case PROP_RENDERING_INTENT:
+      self->rendering_intent = g_value_get_enum (value);
+      break;
+
+    case PROP_BLACK_POINT_COMPENSATION:
+      self->black_point_compensation = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_profile_transform_prepare (GeglOperation *operation)
+{
+  GimpOperationProfileTransform *self = GIMP_OPERATION_PROFILE_TRANSFORM (operation);
+
+  g_clear_object (&self->transform);
+
+  if (! self->src_format)
+    self->src_format = babl_format ("RGBA float");
+
+  if (! self->dest_format)
+    self->dest_format = babl_format ("RGBA float");
+
+  if (self->src_profile && self->dest_profile)
+    {
+      GimpColorTransformFlags flags = 0;
+
+      if (self->black_point_compensation)
+        flags |= GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION;
+
+      flags |= GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE;
+
+      self->transform = gimp_color_transform_new (self->src_profile,
+                                                  self->src_format,
+                                                  self->dest_profile,
+                                                  self->dest_format,
+                                                  self->rendering_intent,
+                                                  flags);
+    }
+
+  gegl_operation_set_format (operation, "input",  self->src_format);
+  gegl_operation_set_format (operation, "output", self->dest_format);
+}
+
+static gboolean
+gimp_operation_profile_transform_process (GeglOperation       *operation,
+                                          void                *in_buf,
+                                          void                *out_buf,
+                                          glong                samples,
+                                          const GeglRectangle *roi,
+                                          gint                 level)
+{
+  GimpOperationProfileTransform *self = GIMP_OPERATION_PROFILE_TRANSFORM (operation);
+  gpointer                      *src  = in_buf;
+  gpointer                      *dest = out_buf;
+
+  if (self->transform)
+    {
+      gimp_color_transform_process_pixels (self->transform,
+                                           self->src_format,
+                                           src,
+                                           self->dest_format,
+                                           dest,
+                                           samples);
+    }
+  else
+    {
+      babl_process (babl_fish (self->src_format,
+                               self->dest_format),
+                    src, dest, samples);
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationprofiletransform.h b/app/operations/gimpoperationprofiletransform.h
new file mode 100644
index 0000000..52aaf4a
--- /dev/null
+++ b/app/operations/gimpoperationprofiletransform.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationprofiletransform.h
+ * Copyright (C) 2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_PROFILE_TRANSFORM_H__
+#define __GIMP_OPERATION_PROFILE_TRANSFORM_H__
+
+
+#include <gegl-plugin.h>
+#include <operation/gegl-operation-point-filter.h>
+
+
+#define GIMP_TYPE_OPERATION_PROFILE_TRANSFORM            (gimp_operation_profile_transform_get_type ())
+#define GIMP_OPERATION_PROFILE_TRANSFORM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_PROFILE_TRANSFORM, GimpOperationProfileTransform))
+#define GIMP_OPERATION_PROFILE_TRANSFORM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_PROFILE_TRANSFORM, GimpOperationProfileTransformClass))
+#define GIMP_IS_OPERATION_PROFILE_TRANSFORM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_PROFILE_TRANSFORM))
+#define GIMP_IS_OPERATION_PROFILE_TRANSFORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_PROFILE_TRANSFORM))
+#define GIMP_OPERATION_PROFILE_TRANSFORM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_PROFILE_TRANSFORM, GimpOperationProfileTransformClass))
+
+
+typedef struct _GimpOperationProfileTransform      GimpOperationProfileTransform;
+typedef struct _GimpOperationProfileTransformClass GimpOperationProfileTransformClass;
+
+struct _GimpOperationProfileTransform
+{
+  GeglOperationPointFilter  parent_instance;
+
+  GimpColorProfile         *src_profile;
+  const Babl               *src_format;
+
+  GimpColorProfile         *dest_profile;
+  const Babl               *dest_format;
+
+  GimpColorRenderingIntent  rendering_intent;
+  gboolean                  black_point_compensation;
+
+  GimpColorTransform       *transform;
+};
+
+struct _GimpOperationProfileTransformClass
+{
+  GeglOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_profile_transform_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_PROFILE_TRANSFORM_H__ */
diff --git a/app/operations/gimpoperationscalarmultiply.c b/app/operations/gimpoperationscalarmultiply.c
new file mode 100644
index 0000000..6416300
--- /dev/null
+++ b/app/operations/gimpoperationscalarmultiply.c
@@ -0,0 +1,189 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationscalarmultiply.c
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "gimpoperationscalarmultiply.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_N_COMPONENTS,
+  PROP_FACTOR
+};
+
+
+static void       gimp_operation_scalar_multiply_get_property (GObject             *object,
+                                                               guint                property_id,
+                                                               GValue              *value,
+                                                               GParamSpec          *pspec);
+static void       gimp_operation_scalar_multiply_set_property (GObject             *object,
+                                                               guint                property_id,
+                                                               const GValue        *value,
+                                                               GParamSpec          *pspec);
+
+static void       gimp_operation_scalar_multiply_prepare      (GeglOperation       *operation);
+static gboolean   gimp_operation_scalar_multiply_process      (GeglOperation       *operation,
+                                                               void                *in_buf,
+                                                               void                *out_buf,
+                                                               glong                samples,
+                                                               const GeglRectangle *roi,
+                                                               gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationScalarMultiply, gimp_operation_scalar_multiply,
+               GEGL_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_scalar_multiply_parent_class
+
+
+static void
+gimp_operation_scalar_multiply_class_init (GimpOperationScalarMultiplyClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_scalar_multiply_set_property;
+  object_class->get_property = gimp_operation_scalar_multiply_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:scalar-multiply",
+                                 "categories",  "gimp",
+                                 "description", "Multiply all floats in a buffer by a factor",
+                                 NULL);
+
+  operation_class->prepare = gimp_operation_scalar_multiply_prepare;
+
+  point_class->process     = gimp_operation_scalar_multiply_process;
+
+  g_object_class_install_property (object_class, PROP_N_COMPONENTS,
+                                   g_param_spec_int ("n-components",
+                                                     "N Components",
+                                                     "Number of components in the input/output vectors",
+                                                     1, 16, 2,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_FACTOR,
+                                   g_param_spec_double ("factor",
+                                                        "Factor",
+                                                        "The scalar factor",
+                                                        G_MINFLOAT, G_MAXFLOAT,
+                                                        1.0,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_scalar_multiply_init (GimpOperationScalarMultiply *self)
+{
+}
+
+static void
+gimp_operation_scalar_multiply_get_property (GObject    *object,
+                                             guint       property_id,
+                                             GValue     *value,
+                                             GParamSpec *pspec)
+{
+  GimpOperationScalarMultiply *self = GIMP_OPERATION_SCALAR_MULTIPLY (object);
+
+  switch (property_id)
+    {
+    case PROP_N_COMPONENTS:
+      g_value_set_int (value, self->n_components);
+      break;
+
+    case PROP_FACTOR:
+      g_value_set_double (value, self->factor);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_scalar_multiply_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec)
+{
+  GimpOperationScalarMultiply *self = GIMP_OPERATION_SCALAR_MULTIPLY (object);
+
+  switch (property_id)
+    {
+    case PROP_N_COMPONENTS:
+      self->n_components = g_value_get_int (value);
+      break;
+
+    case PROP_FACTOR:
+      self->factor = g_value_get_double (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_scalar_multiply_prepare (GeglOperation *operation)
+{
+  GimpOperationScalarMultiply *self = GIMP_OPERATION_SCALAR_MULTIPLY (operation);
+  const Babl                  *format;
+
+  format = babl_format_n (babl_type ("float"), self->n_components);
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "output", format);
+}
+
+static gboolean
+gimp_operation_scalar_multiply_process (GeglOperation       *operation,
+                                        void                *in_buf,
+                                        void                *out_buf,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  GimpOperationScalarMultiply *self = GIMP_OPERATION_SCALAR_MULTIPLY (operation);
+  gfloat                      *src  = in_buf;
+  gfloat                      *dest = out_buf;
+  glong                        n_samples;
+
+  n_samples = samples * self->n_components;
+
+  while (n_samples--)
+    {
+      *dest = *src * self->factor;
+
+      src++;
+      dest++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationscalarmultiply.h b/app/operations/gimpoperationscalarmultiply.h
new file mode 100644
index 0000000..61122b7
--- /dev/null
+++ b/app/operations/gimpoperationscalarmultiply.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationscalarmultiply.h
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SCALAR_MULTIPLY_H__
+#define __GIMP_OPERATION_SCALAR_MULTIPLY_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_SCALAR_MULTIPLY            (gimp_operation_scalar_multiply_get_type ())
+#define GIMP_OPERATION_SCALAR_MULTIPLY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SCALAR_MULTIPLY, GimpOperationScalarMultiply))
+#define GIMP_OPERATION_SCALAR_MULTIPLY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SCALAR_MULTIPLY, GimpOperationScalarMultiplyClass))
+#define GIMP_IS_OPERATION_SCALAR_MULTIPLY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SCALAR_MULTIPLY))
+#define GIMP_IS_OPERATION_SCALAR_MULTIPLY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SCALAR_MULTIPLY))
+#define GIMP_OPERATION_SCALAR_MULTIPLY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SCALAR_MULTIPLY, GimpOperationScalarMultiplyClass))
+
+
+typedef struct _GimpOperationScalarMultiply      GimpOperationScalarMultiply;
+typedef struct _GimpOperationScalarMultiplyClass GimpOperationScalarMultiplyClass;
+
+struct _GimpOperationScalarMultiply
+{
+  GeglOperationPointFilter  parent_instance;
+
+  gint                      n_components;
+  gdouble                   factor;
+};
+
+struct _GimpOperationScalarMultiplyClass
+{
+  GeglOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_scalar_multiply_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SCALAR_MULTIPLY_H__ */
diff --git a/app/operations/gimpoperationsemiflatten.c b/app/operations/gimpoperationsemiflatten.c
new file mode 100644
index 0000000..1352f02
--- /dev/null
+++ b/app/operations/gimpoperationsemiflatten.c
@@ -0,0 +1,191 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsemiflatten.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Ported from the semi-flatten plug-in
+ * by Adam D. Moss, adam@foxbox.org.  1998/01/27
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationsemiflatten.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_COLOR
+};
+
+
+static void       gimp_operation_semi_flatten_get_property (GObject             *object,
+                                                            guint                property_id,
+                                                            GValue              *value,
+                                                            GParamSpec          *pspec);
+static void       gimp_operation_semi_flatten_set_property (GObject             *object,
+                                                            guint                property_id,
+                                                            const GValue        *value,
+                                                            GParamSpec          *pspec);
+
+static void       gimp_operation_semi_flatten_prepare      (GeglOperation       *operation);
+static gboolean   gimp_operation_semi_flatten_process      (GeglOperation       *operation,
+                                                            void                *in_buf,
+                                                            void                *out_buf,
+                                                            glong                samples,
+                                                            const GeglRectangle *roi,
+                                                            gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationSemiFlatten, gimp_operation_semi_flatten,
+               GEGL_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_semi_flatten_parent_class
+
+
+static void
+gimp_operation_semi_flatten_class_init (GimpOperationSemiFlattenClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+  GimpRGB                        white;
+
+  object_class->set_property = gimp_operation_semi_flatten_set_property;
+  object_class->get_property = gimp_operation_semi_flatten_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:semi-flatten",
+                                 "categories",  "color",
+                                 "description", _("Replace partial transparency with a color"),
+                                 NULL);
+
+  operation_class->prepare = gimp_operation_semi_flatten_prepare;
+
+  point_class->process     = gimp_operation_semi_flatten_process;
+
+  gimp_rgba_set (&white, 1.0, 1.0, 1.0, 1.0);
+
+  g_object_class_install_property (object_class, PROP_COLOR,
+                                   gimp_param_spec_rgb ("color",
+                                                        _("Color"),
+                                                        _("The color"),
+                                                        FALSE, &white,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_semi_flatten_init (GimpOperationSemiFlatten *self)
+{
+}
+
+static void
+gimp_operation_semi_flatten_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpOperationSemiFlatten *self = GIMP_OPERATION_SEMI_FLATTEN (object);
+
+  switch (property_id)
+    {
+    case PROP_COLOR:
+      gimp_value_set_rgb (value, &self->color);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_semi_flatten_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpOperationSemiFlatten *self = GIMP_OPERATION_SEMI_FLATTEN (object);
+
+  switch (property_id)
+    {
+    case PROP_COLOR:
+      gimp_value_get_rgb (value, &self->color);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_semi_flatten_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("RGBA float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("RGBA float", space));
+}
+
+static gboolean
+gimp_operation_semi_flatten_process (GeglOperation       *operation,
+                                     void                *in_buf,
+                                     void                *out_buf,
+                                     glong                samples,
+                                     const GeglRectangle *roi,
+                                     gint                 level)
+{
+  GimpOperationSemiFlatten *self = GIMP_OPERATION_SEMI_FLATTEN (operation);
+  gfloat                   *src  = in_buf;
+  gfloat                   *dest = out_buf;
+
+  while (samples--)
+    {
+      gfloat alpha = src[ALPHA];
+
+      if (alpha <= 0.0 || alpha >= 1.0)
+        {
+          dest[RED]   = src[RED];
+          dest[GREEN] = src[GREEN];
+          dest[BLUE]  = src[BLUE];
+          dest[ALPHA] = alpha;
+        }
+      else
+        {
+          dest[RED]   = src[RED]   * alpha + self->color.r * (1.0 - alpha);
+          dest[GREEN] = src[GREEN] * alpha + self->color.g * (1.0 - alpha);
+          dest[BLUE]  = src[BLUE]  * alpha + self->color.b * (1.0 - alpha);
+          dest[ALPHA] = 1.0;
+        }
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationsemiflatten.h b/app/operations/gimpoperationsemiflatten.h
new file mode 100644
index 0000000..be6311e
--- /dev/null
+++ b/app/operations/gimpoperationsemiflatten.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsemiflatten.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SEMI_FLATTEN_H__
+#define __GIMP_OPERATION_SEMI_FLATTEN_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_SEMI_FLATTEN            (gimp_operation_semi_flatten_get_type ())
+#define GIMP_OPERATION_SEMI_FLATTEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SEMI_FLATTEN, GimpOperationSemiFlatten))
+#define GIMP_OPERATION_SEMI_FLATTEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SEMI_FLATTEN, GimpOperationSemiFlattenClass))
+#define GIMP_IS_OPERATION_SEMI_FLATTEN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SEMI_FLATTEN))
+#define GIMP_IS_OPERATION_SEMI_FLATTEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SEMI_FLATTEN))
+#define GIMP_OPERATION_SEMI_FLATTEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SEMI_FLATTEN, GimpOperationSemiFlattenClass))
+
+
+typedef struct _GimpOperationSemiFlatten      GimpOperationSemiFlatten;
+typedef struct _GimpOperationSemiFlattenClass GimpOperationSemiFlattenClass;
+
+struct _GimpOperationSemiFlatten
+{
+  GeglOperationPointFilter  parent_instance;
+
+  GimpRGB                   color;
+};
+
+struct _GimpOperationSemiFlattenClass
+{
+  GeglOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_semi_flatten_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SEMI_FLATTEN_H__ */
diff --git a/app/operations/gimpoperationsetalpha.c b/app/operations/gimpoperationsetalpha.c
new file mode 100644
index 0000000..b41af3c
--- /dev/null
+++ b/app/operations/gimpoperationsetalpha.c
@@ -0,0 +1,188 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsetalpha.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "gimpoperationsetalpha.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VALUE
+};
+
+
+static void       gimp_operation_set_alpha_get_property (GObject             *object,
+                                                         guint                property_id,
+                                                         GValue              *value,
+                                                         GParamSpec          *pspec);
+static void       gimp_operation_set_alpha_set_property (GObject             *object,
+                                                         guint                property_id,
+                                                         const GValue        *value,
+                                                         GParamSpec          *pspec);
+
+static void       gimp_operation_set_alpha_prepare      (GeglOperation       *operation);
+static gboolean   gimp_operation_set_alpha_process      (GeglOperation       *operation,
+                                                         void                *in_buf,
+                                                         void                *aux_buf,
+                                                         void                *out_buf,
+                                                         glong                samples,
+                                                         const GeglRectangle *roi,
+                                                         gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationSetAlpha, gimp_operation_set_alpha,
+               GEGL_TYPE_OPERATION_POINT_COMPOSER)
+
+#define parent_class gimp_operation_set_alpha_parent_class
+
+
+static void
+gimp_operation_set_alpha_class_init (GimpOperationSetAlphaClass *klass)
+{
+  GObjectClass                    *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass              *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointComposerClass *point_class     = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_set_alpha_set_property;
+  object_class->get_property = gimp_operation_set_alpha_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:set-alpha",
+                                 "categories",  "color",
+                                 "description", "Set a buffer's alpha channel to a value",
+                                 NULL);
+
+  operation_class->prepare = gimp_operation_set_alpha_prepare;
+
+  point_class->process     = gimp_operation_set_alpha_process;
+
+  g_object_class_install_property (object_class, PROP_VALUE,
+                                   g_param_spec_double ("value",
+                                                        "Value",
+                                                        "The alpha value",
+                                                        0.0, 1.0, 1.0,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_set_alpha_init (GimpOperationSetAlpha *self)
+{
+}
+
+static void
+gimp_operation_set_alpha_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpOperationSetAlpha *self = GIMP_OPERATION_SET_ALPHA (object);
+
+  switch (property_id)
+    {
+    case PROP_VALUE:
+      g_value_set_double (value, self->value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_set_alpha_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpOperationSetAlpha *self = GIMP_OPERATION_SET_ALPHA (object);
+
+  switch (property_id)
+    {
+    case PROP_VALUE:
+      self->value = g_value_get_double (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_set_alpha_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("RGBA float", space));
+  gegl_operation_set_format (operation, "aux",    babl_format_with_space ("Y float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("RGBA float", space));
+}
+
+static gboolean
+gimp_operation_set_alpha_process (GeglOperation       *operation,
+                                  void                *in_buf,
+                                  void                *aux_buf,
+                                  void                *out_buf,
+                                  glong                samples,
+                                  const GeglRectangle *roi,
+                                  gint                 level)
+{
+  GimpOperationSetAlpha *self = GIMP_OPERATION_SET_ALPHA (operation);
+  gfloat                *src  = in_buf;
+  gfloat                *aux  = aux_buf;
+  gfloat                *dest = out_buf;
+
+  if (aux)
+    {
+      while (samples--)
+        {
+          dest[RED]   = src[RED];
+          dest[GREEN] = src[GREEN];
+          dest[BLUE]  = src[BLUE];
+          dest[ALPHA] = self->value * *aux;
+
+          src  += 4;
+          aux  += 1;
+          dest += 4;
+        }
+    }
+  else
+    {
+      while (samples--)
+        {
+          dest[RED]   = src[RED];
+          dest[GREEN] = src[GREEN];
+          dest[BLUE]  = src[BLUE];
+          dest[ALPHA] = self->value;
+
+          src  += 4;
+          dest += 4;
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationsetalpha.h b/app/operations/gimpoperationsetalpha.h
new file mode 100644
index 0000000..741ae1e
--- /dev/null
+++ b/app/operations/gimpoperationsetalpha.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsetalpha.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SET_ALPHA_H__
+#define __GIMP_OPERATION_SET_ALPHA_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_SET_ALPHA            (gimp_operation_set_alpha_get_type ())
+#define GIMP_OPERATION_SET_ALPHA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SET_ALPHA, GimpOperationSetAlpha))
+#define GIMP_OPERATION_SET_ALPHA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SET_ALPHA, GimpOperationSetAlphaClass))
+#define GIMP_IS_OPERATION_SET_ALPHA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SET_ALPHA))
+#define GIMP_IS_OPERATION_SET_ALPHA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SET_ALPHA))
+#define GIMP_OPERATION_SET_ALPHA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SET_ALPHA, GimpOperationSetAlphaClass))
+
+
+typedef struct _GimpOperationSetAlpha      GimpOperationSetAlpha;
+typedef struct _GimpOperationSetAlphaClass GimpOperationSetAlphaClass;
+
+struct _GimpOperationSetAlpha
+{
+  GeglOperationPointComposer  parent_instance;
+
+  gdouble                     value;
+};
+
+struct _GimpOperationSetAlphaClass
+{
+  GeglOperationPointComposerClass  parent_class;
+};
+
+
+GType   gimp_operation_set_alpha_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SET_ALPHA_H__ */
diff --git a/app/operations/gimpoperationsettings.c b/app/operations/gimpoperationsettings.c
new file mode 100644
index 0000000..88a6ace
--- /dev/null
+++ b/app/operations/gimpoperationsettings.c
@@ -0,0 +1,320 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsettings.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawablefilter.h"
+
+#include "gimpoperationsettings.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CLIP,
+  PROP_REGION,
+  PROP_MODE,
+  PROP_OPACITY,
+  PROP_COLOR_MANAGED,
+  PROP_GAMMA_HACK
+};
+
+
+static void   gimp_operation_settings_get_property (GObject      *object,
+                                                    guint         property_id,
+                                                    GValue       *value,
+                                                    GParamSpec   *pspec);
+static void   gimp_operation_settings_set_property (GObject      *object,
+                                                    guint         property_id,
+                                                    const GValue *value,
+                                                    GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpOperationSettings, gimp_operation_settings,
+               GIMP_TYPE_SETTINGS)
+
+#define parent_class gimp_operation_settings_parent_class
+
+
+static void
+gimp_operation_settings_class_init (GimpOperationSettingsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_operation_settings_set_property;
+  object_class->get_property = gimp_operation_settings_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CLIP,
+                         "gimp-clip",
+                         _("Clipping"),
+                         _("How to clip"),
+                         GIMP_TYPE_TRANSFORM_RESIZE,
+                         GIMP_TRANSFORM_RESIZE_ADJUST,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_REGION,
+                         "gimp-region",
+                         NULL, NULL,
+                         GIMP_TYPE_FILTER_REGION,
+                         GIMP_FILTER_REGION_SELECTION,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_MODE,
+                         "gimp-mode",
+                         _("Mode"),
+                         NULL,
+                         GIMP_TYPE_LAYER_MODE,
+                         GIMP_LAYER_MODE_REPLACE,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OPACITY,
+                           "gimp-opacity",
+                           _("Opacity"),
+                           NULL,
+                           0.0, 1.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COLOR_MANAGED,
+                            "gimp-color-managed",
+                            _("Color _managed"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GAMMA_HACK,
+                            "gimp-gamma-hack",
+                            "Gamma hack (temp hack, please ignore)",
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_DEFAULTS);
+}
+
+static void
+gimp_operation_settings_init (GimpOperationSettings *settings)
+{
+}
+
+static void
+gimp_operation_settings_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpOperationSettings *settings = GIMP_OPERATION_SETTINGS (object);
+
+  switch (property_id)
+    {
+    case PROP_CLIP:
+      g_value_set_enum (value, settings->clip);
+      break;
+
+    case PROP_REGION:
+      g_value_set_enum (value, settings->region);
+      break;
+
+    case PROP_MODE:
+      g_value_set_enum (value, settings->mode);
+      break;
+
+    case PROP_OPACITY:
+      g_value_set_double (value, settings->opacity);
+      break;
+
+    case PROP_COLOR_MANAGED:
+      g_value_set_boolean (value, settings->color_managed);
+      break;
+
+    case PROP_GAMMA_HACK:
+      g_value_set_boolean (value, settings->gamma_hack);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_settings_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpOperationSettings *settings = GIMP_OPERATION_SETTINGS (object);
+
+  switch (property_id)
+    {
+    case PROP_CLIP:
+      settings->clip = g_value_get_enum (value);
+      break;
+
+    case PROP_REGION:
+      settings->region = g_value_get_enum (value);
+      break;
+
+    case PROP_MODE:
+      settings->mode = g_value_get_enum (value);
+      break;
+
+    case PROP_OPACITY:
+      settings->opacity = g_value_get_double (value);
+      break;
+
+    case PROP_COLOR_MANAGED:
+      settings->color_managed = g_value_get_boolean (value);
+      break;
+
+    case PROP_GAMMA_HACK:
+      settings->gamma_hack = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_operation_settings_sync_drawable_filter (GimpOperationSettings *settings,
+                                              GimpDrawableFilter    *filter)
+{
+  gboolean clip;
+
+  g_return_if_fail (GIMP_IS_OPERATION_SETTINGS (settings));
+  g_return_if_fail (GIMP_IS_DRAWABLE_FILTER (filter));
+
+  clip = settings->clip == GIMP_TRANSFORM_RESIZE_CLIP ||
+         ! babl_format_has_alpha (gimp_drawable_filter_get_format (filter));
+
+  gimp_drawable_filter_set_region        (filter, settings->region);
+  gimp_drawable_filter_set_clip          (filter, clip);
+  gimp_drawable_filter_set_mode          (filter,
+                                          settings->mode,
+                                          GIMP_LAYER_COLOR_SPACE_AUTO,
+                                          GIMP_LAYER_COLOR_SPACE_AUTO,
+                                          GIMP_LAYER_COMPOSITE_AUTO);
+  gimp_drawable_filter_set_opacity       (filter, settings->opacity);
+  gimp_drawable_filter_set_color_managed (filter, settings->color_managed);
+  gimp_drawable_filter_set_gamma_hack    (filter, settings->gamma_hack);
+}
+
+
+/*  protected functions  */
+
+static const gchar * const base_properties[] =
+{
+  "time",
+  "gimp-clip",
+  "gimp-region",
+  "gimp-mode",
+  "gimp-opacity",
+  "gimp-color-managed",
+  "gimp-gamma-hack"
+};
+
+gboolean
+gimp_operation_settings_config_serialize_base (GimpConfig       *config,
+                                               GimpConfigWriter *writer,
+                                               gpointer          data)
+{
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (base_properties); i++)
+    {
+      if (! gimp_config_serialize_property_by_name (config,
+                                                    base_properties[i],
+                                                    writer))
+        {
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_operation_settings_config_equal_base (GimpConfig *a,
+                                           GimpConfig *b)
+{
+  GimpOperationSettings *settings_a = GIMP_OPERATION_SETTINGS (a);
+  GimpOperationSettings *settings_b = GIMP_OPERATION_SETTINGS (b);
+
+  return settings_a->clip          == settings_b->clip          &&
+         settings_a->region        == settings_b->region        &&
+         settings_a->mode          == settings_b->mode          &&
+         settings_a->opacity       == settings_b->opacity       &&
+         settings_a->color_managed == settings_b->color_managed &&
+         settings_a->gamma_hack    == settings_b->gamma_hack;
+}
+
+void
+gimp_operation_settings_config_reset_base (GimpConfig *config)
+{
+  gint i;
+
+  g_object_freeze_notify (G_OBJECT (config));
+
+  for (i = 0; i < G_N_ELEMENTS (base_properties); i++)
+    gimp_config_reset_property (G_OBJECT (config), base_properties[i]);
+
+  g_object_thaw_notify (G_OBJECT (config));
+}
+
+gboolean
+gimp_operation_settings_config_copy_base (GimpConfig  *src,
+                                          GimpConfig  *dest,
+                                          GParamFlags  flags)
+{
+  gint i;
+
+  g_object_freeze_notify (G_OBJECT (dest));
+
+  for (i = 0; i < G_N_ELEMENTS (base_properties); i++)
+    {
+      g_object_unref (g_object_bind_property (src,  base_properties[i],
+                                              dest, base_properties[i],
+                                              G_BINDING_SYNC_CREATE));
+    }
+
+  g_object_thaw_notify (G_OBJECT (dest));
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationsettings.h b/app/operations/gimpoperationsettings.h
new file mode 100644
index 0000000..a081fce
--- /dev/null
+++ b/app/operations/gimpoperationsettings.h
@@ -0,0 +1,75 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsettings.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SETTINGS_H__
+#define __GIMP_OPERATION_SETTINGS_H__
+
+
+#include "core/gimpsettings.h"
+
+
+#define GIMP_TYPE_OPERATION_SETTINGS            (gimp_operation_settings_get_type ())
+#define GIMP_OPERATION_SETTINGS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SETTINGS, GimpOperationSettings))
+#define GIMP_OPERATION_SETTINGS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SETTINGS, GimpOperationSettingsClass))
+#define GIMP_IS_OPERATION_SETTINGS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SETTINGS))
+#define GIMP_IS_OPERATION_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SETTINGS))
+#define GIMP_OPERATION_SETTINGS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SETTINGS, GimpOperationSettingsClass))
+
+
+typedef struct _GimpOperationSettingsClass GimpOperationSettingsClass;
+
+struct _GimpOperationSettings
+{
+  GimpSettings         parent_instance;
+
+  GimpTransformResize  clip;
+  GimpFilterRegion     region;
+  GimpLayerMode        mode;
+  gdouble              opacity;
+  gboolean             color_managed;
+  gboolean             gamma_hack;
+};
+
+struct _GimpOperationSettingsClass
+{
+  GimpSettingsClass  parent_class;
+};
+
+
+GType      gimp_operation_settings_get_type              (void) G_GNUC_CONST;
+
+void       gimp_operation_settings_sync_drawable_filter  (GimpOperationSettings *settings,
+                                                          GimpDrawableFilter    *filter);
+
+
+/*  protected  */
+
+gboolean   gimp_operation_settings_config_serialize_base (GimpConfig            *config,
+                                                          GimpConfigWriter      *writer,
+                                                          gpointer               data);
+gboolean   gimp_operation_settings_config_equal_base     (GimpConfig            *a,
+                                                          GimpConfig            *b);
+void       gimp_operation_settings_config_reset_base     (GimpConfig            *config);
+gboolean   gimp_operation_settings_config_copy_base      (GimpConfig            *src,
+                                                          GimpConfig            *dest,
+                                                          GParamFlags            flags);
+
+
+#endif /* __GIMP_OPERATION_SETTINGS_H__ */
diff --git a/app/operations/gimpoperationshrink.c b/app/operations/gimpoperationshrink.c
new file mode 100644
index 0000000..c862edb
--- /dev/null
+++ b/app/operations/gimpoperationshrink.c
@@ -0,0 +1,443 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationshrink.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationshrink.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_RADIUS_X,
+  PROP_RADIUS_Y,
+  PROP_EDGE_LOCK
+};
+
+
+static void     gimp_operation_shrink_get_property (GObject             *object,
+                                                    guint                property_id,
+                                                    GValue              *value,
+                                                    GParamSpec          *pspec);
+static void     gimp_operation_shrink_set_property (GObject             *object,
+                                                    guint                property_id,
+                                                    const GValue        *value,
+                                                    GParamSpec          *pspec);
+
+static void          gimp_operation_shrink_prepare (GeglOperation       *operation);
+static GeglRectangle
+     gimp_operation_shrink_get_required_for_output (GeglOperation       *self,
+                                                    const gchar         *input_pad,
+                                                    const GeglRectangle *roi);
+static GeglRectangle
+           gimp_operation_shrink_get_cached_region (GeglOperation       *self,
+                                                    const GeglRectangle *roi);
+
+static gboolean      gimp_operation_shrink_process (GeglOperation       *operation,
+                                                    GeglBuffer          *input,
+                                                    GeglBuffer          *output,
+                                                    const GeglRectangle *roi,
+                                                    gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationShrink, gimp_operation_shrink,
+               GEGL_TYPE_OPERATION_FILTER)
+
+#define parent_class gimp_operation_shrink_parent_class
+
+
+static void
+gimp_operation_shrink_class_init (GimpOperationShrinkClass *klass)
+{
+  GObjectClass             *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass       *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationFilterClass *filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
+
+  object_class->set_property   = gimp_operation_shrink_set_property;
+  object_class->get_property   = gimp_operation_shrink_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:shrink",
+                                 "categories",  "gimp",
+                                 "description", "GIMP Shrink operation",
+                                 NULL);
+
+  operation_class->prepare                 = gimp_operation_shrink_prepare;
+  operation_class->get_required_for_output = gimp_operation_shrink_get_required_for_output;
+  operation_class->get_cached_region       = gimp_operation_shrink_get_cached_region;
+  operation_class->threaded                = FALSE;
+
+  filter_class->process                    = gimp_operation_shrink_process;
+
+  g_object_class_install_property (object_class, PROP_RADIUS_X,
+                                   g_param_spec_int ("radius-x",
+                                                     "Radius X",
+                                                     "Shrink radius in X diection",
+                                                     1, 2342, 1,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RADIUS_Y,
+                                   g_param_spec_int ("radius-y",
+                                                     "Radius Y",
+                                                     "Shrink radius in Y diection",
+                                                     1, 2342, 1,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_EDGE_LOCK,
+                                   g_param_spec_boolean ("edge-lock",
+                                                         "Edge Lock",
+                                                         "Shrink from border",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_shrink_init (GimpOperationShrink *self)
+{
+}
+
+static void
+gimp_operation_shrink_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+ GimpOperationShrink *self = GIMP_OPERATION_SHRINK (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS_X:
+      g_value_set_int (value, self->radius_x);
+      break;
+
+    case PROP_RADIUS_Y:
+      g_value_set_int (value, self->radius_y);
+      break;
+
+    case PROP_EDGE_LOCK:
+      g_value_set_boolean (value, self->edge_lock);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_shrink_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpOperationShrink *self = GIMP_OPERATION_SHRINK (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS_X:
+      self->radius_x = g_value_get_int (value);
+      break;
+
+    case PROP_RADIUS_Y:
+      self->radius_y = g_value_get_int (value);
+      break;
+
+    case PROP_EDGE_LOCK:
+      self->edge_lock = g_value_get_boolean (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_shrink_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("Y float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("Y float", space));
+}
+
+static GeglRectangle
+gimp_operation_shrink_get_required_for_output (GeglOperation       *self,
+                                               const gchar         *input_pad,
+                                               const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static GeglRectangle
+gimp_operation_shrink_get_cached_region (GeglOperation       *self,
+                                         const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box (self, "input");
+}
+
+static void
+compute_border (gint16  *circ,
+                guint16  xradius,
+                guint16  yradius)
+{
+  gint32  i;
+  gint32  diameter = xradius * 2 + 1;
+  gdouble tmp;
+
+  for (i = 0; i < diameter; i++)
+    {
+      if (i > xradius)
+        tmp = (i - xradius) - 0.5;
+      else if (i < xradius)
+        tmp = (xradius - i) - 0.5;
+      else
+        tmp = 0.0;
+
+      circ[i] = RINT (yradius /
+                      (gdouble) xradius * sqrt (SQR (xradius) - SQR (tmp)));
+    }
+}
+
+static inline void
+rotate_pointers (gfloat  **p,
+                 guint32   n)
+{
+  guint32  i;
+  gfloat  *tmp;
+
+  tmp = p[0];
+
+  for (i = 0; i < n - 1; i++)
+    p[i] = p[i + 1];
+
+  p[i] = tmp;
+}
+
+static gboolean
+gimp_operation_shrink_process (GeglOperation       *operation,
+                               GeglBuffer          *input,
+                               GeglBuffer          *output,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  /* Pretty much the same as fatten_region only different.
+   * Blame all bugs in this function on jaycox@gimp.org
+   *
+   * If edge_lock is true we assume that pixels outside the region we
+   * are passed are identical to the edge pixels.  If edge_lock is
+   * false, we assume that pixels outside the region are 0
+   */
+  GimpOperationShrink *self          = GIMP_OPERATION_SHRINK (operation);
+  const Babl          *input_format  = babl_format ("Y float");
+  const Babl          *output_format = babl_format ("Y float");
+  gint32               i, j, x, y;
+  gfloat             **buf;  /* caches the the region's pixels */
+  gfloat              *out;  /* holds the new scan line we are computing */
+  gfloat             **max;  /* caches the smallest values for each column */
+  gint16              *circ; /* holds the y coords of the filter's mask */
+  gfloat               last_max;
+  gint16               last_index;
+  gfloat              *buffer;
+  gint                 buffer_size;
+
+  max = g_new (gfloat *, roi->width + 2 * self->radius_x);
+  buf = g_new (gfloat *, self->radius_y + 1);
+
+  for (i = 0; i < self->radius_y + 1; i++)
+    buf[i] = g_new (gfloat, roi->width);
+
+  buffer_size = (roi->width+ 2 * self->radius_x + 1) * (self->radius_y + 1);
+  buffer = g_new (gfloat, buffer_size);
+
+  if (self->edge_lock)
+    {
+      for (i = 0; i < buffer_size; i++)
+        buffer[i] = 1.0;
+    }
+  else
+    {
+      memset (buffer, 0, buffer_size * sizeof (gfloat));
+    }
+
+  for (i = 0; i < roi->width + 2 * self->radius_x; i++)
+    {
+      if (i < self->radius_x)
+        {
+          if (self->edge_lock)
+            max[i] = buffer;
+          else
+            max[i] = &buffer[(self->radius_y + 1) * (roi->width + self->radius_x)];
+        }
+      else if (i < roi->width + self->radius_x)
+        {
+          max[i] = &buffer[(self->radius_y + 1) * (i - self->radius_x)];
+        }
+      else
+        {
+          if (self->edge_lock)
+            max[i] = &buffer[(self->radius_y + 1) * (roi->width + self->radius_x - 1)];
+          else
+            max[i] = &buffer[(self->radius_y + 1) * (roi->width + self->radius_x)];
+        }
+    }
+
+  if (! self->edge_lock)
+    for (j = 0 ; j < self->radius_y + 1; j++)
+      max[0][j] = 0.0;
+
+  /* offset the max pointer by self->radius_x so the range of the
+   * array is [-self->radius_x] to [roi->width + self->radius_x]
+   */
+  max += self->radius_x;
+
+  out = g_new (gfloat, roi->width);
+
+  circ = g_new (gint16, 2 * self->radius_x + 1);
+  compute_border (circ, self->radius_x, self->radius_y);
+
+ /* offset the circ pointer by self->radius_x so the range of the
+  * array is [-self->radius_x] to [self->radius_x]
+  */
+  circ += self->radius_x;
+
+  for (i = 0; i < self->radius_y && i < roi->height; i++) /* load top of image */
+    gegl_buffer_get (input,
+                     GEGL_RECTANGLE (roi->x, roi->y + i,
+                                     roi->width, 1),
+                     1.0, input_format, buf[i + 1],
+                     GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  if (self->edge_lock)
+    memcpy (buf[0], buf[1], roi->width * sizeof (gfloat));
+  else
+    memset (buf[0], 0, roi->width * sizeof (gfloat));
+
+  for (x = 0; x < roi->width; x++) /* set up max for top of image */
+    {
+      max[x][0] = buf[0][x];
+
+      for (j = 1; j < self->radius_y + 1; j++)
+        max[x][j] = MIN (buf[j][x], max[x][j - 1]);
+    }
+
+  for (y = 0; y < roi->height; y++)
+    {
+      rotate_pointers (buf, self->radius_y + 1);
+
+      if (y < roi->height - self->radius_y)
+        gegl_buffer_get (input,
+                         GEGL_RECTANGLE (roi->x,  roi->y + y + self->radius_y,
+                                         roi->width, 1),
+                         1.0, input_format, buf[self->radius_y],
+                         GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      else if (self->edge_lock)
+        memcpy (buf[self->radius_y], buf[self->radius_y - 1],
+                roi->width * sizeof (gfloat));
+      else
+        memset (buf[self->radius_y], 0, roi->width * sizeof (gfloat));
+
+      for (x = 0 ; x < roi->width; x++) /* update max array */
+        {
+          for (i = self->radius_y; i > 0; i--)
+            max[x][i] = MIN (MIN (max[x][i - 1], buf[i - 1][x]), buf[i][x]);
+
+          max[x][0] = buf[0][x];
+        }
+
+      last_max =  max[0][circ[-1]];
+      last_index = 0;
+
+      for (x = 0 ; x < roi->width; x++) /* render scan line */
+        {
+          last_index--;
+
+          if (last_index >= 0)
+            {
+              if (last_max <= 0.0)
+                {
+                  out[x] = 0.0;
+                }
+              else
+                {
+                  last_max = 1.0;
+
+                  for (i = self->radius_x; i >= 0; i--)
+                    if (last_max > max[x + i][circ[i]])
+                      {
+                        last_max = max[x + i][circ[i]];
+                        last_index = i;
+                      }
+
+                  out[x] = last_max;
+                }
+            }
+          else
+            {
+              last_index = self->radius_x;
+              last_max = max[x + self->radius_x][circ[self->radius_x]];
+
+              for (i = self->radius_x - 1; i >= -self->radius_x; i--)
+                if (last_max > max[x + i][circ[i]])
+                  {
+                    last_max = max[x + i][circ[i]];
+                    last_index = i;
+                  }
+
+              out[x] = last_max;
+            }
+        }
+
+      gegl_buffer_set (output,
+                       GEGL_RECTANGLE (roi->x, roi->y + y,
+                                       roi->width, 1),
+                       0, output_format, out,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  /* undo the offsets to the pointers so we can free the malloced memory */
+  circ -= self->radius_x;
+  max -= self->radius_x;
+
+  /* free the memory */
+  g_free (circ);
+  g_free (buffer);
+  g_free (max);
+
+  for (i = 0; i < self->radius_y + 1; i++)
+    g_free (buf[i]);
+
+  g_free (buf);
+  g_free (out);
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationshrink.h b/app/operations/gimpoperationshrink.h
new file mode 100644
index 0000000..1ba58e6
--- /dev/null
+++ b/app/operations/gimpoperationshrink.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationshrink.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SHRINK_H__
+#define __GIMP_OPERATION_SHRINK_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_SHRINK            (gimp_operation_shrink_get_type ())
+#define GIMP_OPERATION_SHRINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SHRINK, GimpOperationShrink))
+#define GIMP_OPERATION_SHRINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SHRINK, GimpOperationShrinkClass))
+#define GIMP_IS_OPERATION_SHRINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SHRINK))
+#define GIMP_IS_OPERATION_SHRINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SHRINK))
+#define GIMP_OPERATION_SHRINK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SHRINK, GimpOperationShrinkClass))
+
+
+typedef struct _GimpOperationShrink      GimpOperationShrink;
+typedef struct _GimpOperationShrinkClass GimpOperationShrinkClass;
+
+struct _GimpOperationShrink
+{
+  GeglOperationFilter  parent_instance;
+
+  gint                 radius_x;
+  gint                 radius_y;
+  gboolean             edge_lock;
+};
+
+struct _GimpOperationShrinkClass
+{
+  GeglOperationFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_shrink_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SHRINK_H__ */
diff --git a/app/operations/gimpoperationthreshold.c b/app/operations/gimpoperationthreshold.c
new file mode 100644
index 0000000..e33a9ec
--- /dev/null
+++ b/app/operations/gimpoperationthreshold.c
@@ -0,0 +1,232 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationthreshold.c
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "operations-types.h"
+
+#include "gimpoperationthreshold.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CHANNEL,
+  PROP_LOW,
+  PROP_HIGH
+};
+
+
+static void     gimp_operation_threshold_get_property (GObject      *object,
+                                                       guint         property_id,
+                                                       GValue       *value,
+                                                       GParamSpec   *pspec);
+static void     gimp_operation_threshold_set_property (GObject      *object,
+                                                       guint         property_id,
+                                                       const GValue *value,
+                                                       GParamSpec   *pspec);
+
+static gboolean gimp_operation_threshold_process (GeglOperation       *operation,
+                                                  void                *in_buf,
+                                                  void                *out_buf,
+                                                  glong                samples,
+                                                  const GeglRectangle *roi,
+                                                  gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationThreshold, gimp_operation_threshold,
+               GIMP_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_threshold_parent_class
+
+
+static void
+gimp_operation_threshold_class_init (GimpOperationThresholdClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_threshold_set_property;
+  object_class->get_property = gimp_operation_threshold_get_property;
+
+  point_class->process       = gimp_operation_threshold_process;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:threshold",
+                                 "categories",  "color",
+                                 "description", _("Reduce image to two colors using a threshold"),
+                                 NULL);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CHANNEL,
+                         "channel",
+                         _("Channel"),
+                         NULL,
+                         GIMP_TYPE_HISTOGRAM_CHANNEL,
+                         GIMP_HISTOGRAM_VALUE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LOW,
+                           "low",
+                           _("Low threshold"),
+                           NULL,
+                           0.0, 1.0, 0.5,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HIGH,
+                           "high",
+                           _("High threshold"),
+                           NULL,
+                           0.0, 1.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_operation_threshold_init (GimpOperationThreshold *self)
+{
+}
+
+static void
+gimp_operation_threshold_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpOperationThreshold *self = GIMP_OPERATION_THRESHOLD (object);
+
+  switch (property_id)
+    {
+    case PROP_CHANNEL:
+      g_value_set_enum (value, self->channel);
+      break;
+
+    case PROP_LOW:
+      g_value_set_double (value, self->low);
+      break;
+
+    case PROP_HIGH:
+      g_value_set_double (value, self->high);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_threshold_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpOperationThreshold *self = GIMP_OPERATION_THRESHOLD (object);
+
+  switch (property_id)
+    {
+    case PROP_CHANNEL:
+      self->channel = g_value_get_enum (value);
+      break;
+
+    case PROP_LOW:
+      self->low = g_value_get_double (value);
+      break;
+
+    case PROP_HIGH:
+      self->high = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+ static gboolean
+gimp_operation_threshold_process (GeglOperation       *operation,
+                                  void                *in_buf,
+                                  void                *out_buf,
+                                  glong                samples,
+                                  const GeglRectangle *roi,
+                                  gint                 level)
+{
+  GimpOperationThreshold *threshold = GIMP_OPERATION_THRESHOLD (operation);
+  gfloat                 *src       = in_buf;
+  gfloat                 *dest      = out_buf;
+
+  while (samples--)
+    {
+      gfloat value = 0.0;
+
+      switch (threshold->channel)
+        {
+        case GIMP_HISTOGRAM_VALUE:
+          value = MAX (src[RED], src[GREEN]);
+          value = MAX (value, src[BLUE]);
+          break;
+
+        case GIMP_HISTOGRAM_RED:
+          value = src[RED];
+          break;
+
+        case GIMP_HISTOGRAM_GREEN:
+          value = src[GREEN];
+          break;
+
+        case GIMP_HISTOGRAM_BLUE:
+          value = src[BLUE];
+          break;
+
+        case GIMP_HISTOGRAM_ALPHA:
+          value = src[ALPHA];
+          break;
+
+        case GIMP_HISTOGRAM_RGB:
+          value = MIN (src[RED], src[GREEN]);
+          value = MIN (value, src[BLUE]);
+          break;
+
+        case GIMP_HISTOGRAM_LUMINANCE:
+          value = GIMP_RGB_LUMINANCE (src[RED], src[GREEN], src[BLUE]);
+          break;
+        }
+
+      value = (value >= threshold->low && value <= threshold->high) ? 1.0 : 0.0;
+
+      dest[RED]   = value;
+      dest[GREEN] = value;
+      dest[BLUE]  = value;
+      dest[ALPHA] = src[ALPHA];
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationthreshold.h b/app/operations/gimpoperationthreshold.h
new file mode 100644
index 0000000..dcdf52b
--- /dev/null
+++ b/app/operations/gimpoperationthreshold.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationthreshold.h
+ * Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_THRESHOLD_H__
+#define __GIMP_OPERATION_THRESHOLD_H__
+
+
+#include "gimpoperationpointfilter.h"
+
+
+#define GIMP_TYPE_OPERATION_THRESHOLD            (gimp_operation_threshold_get_type ())
+#define GIMP_OPERATION_THRESHOLD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_THRESHOLD, GimpOperationThreshold))
+#define GIMP_OPERATION_THRESHOLD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_THRESHOLD, GimpOperationThresholdClass))
+#define GIMP_IS_OPERATION_THRESHOLD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_THRESHOLD))
+#define GIMP_IS_OPERATION_THRESHOLD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_THRESHOLD))
+#define GIMP_OPERATION_THRESHOLD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_THRESHOLD, GimpOperationThresholdClass))
+
+
+typedef struct _GimpOperationThreshold      GimpOperationThreshold;
+typedef struct _GimpOperationThresholdClass GimpOperationThresholdClass;
+
+struct _GimpOperationThreshold
+{
+  GimpOperationPointFilter  parent_instance;
+
+  GimpHistogramChannel      channel;
+  gdouble                   low;
+  gdouble                   high;
+};
+
+struct _GimpOperationThresholdClass
+{
+  GimpOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_threshold_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_THRESHOLD_H__ */
diff --git a/app/operations/gimpoperationthresholdalpha.c b/app/operations/gimpoperationthresholdalpha.c
new file mode 100644
index 0000000..94cbaf5
--- /dev/null
+++ b/app/operations/gimpoperationthresholdalpha.c
@@ -0,0 +1,178 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationthresholdalpha.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Ported from the threshold-alpha plug-in
+ * Copyright (C) 1997 Shuji Narazaki <narazaki@InetQ.or.jp>
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "gimpoperationthresholdalpha.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VALUE
+};
+
+
+static void       gimp_operation_threshold_alpha_get_property (GObject             *object,
+                                                               guint                property_id,
+                                                               GValue              *value,
+                                                               GParamSpec          *pspec);
+static void       gimp_operation_threshold_alpha_set_property (GObject             *object,
+                                                               guint                property_id,
+                                                               const GValue        *value,
+                                                               GParamSpec          *pspec);
+
+static void       gimp_operation_threshold_alpha_prepare      (GeglOperation       *operation);
+static gboolean   gimp_operation_threshold_alpha_process      (GeglOperation       *operation,
+                                                               void                *in_buf,
+                                                               void                *out_buf,
+                                                               glong                samples,
+                                                               const GeglRectangle *roi,
+                                                               gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationThresholdAlpha, gimp_operation_threshold_alpha,
+               GEGL_TYPE_OPERATION_POINT_FILTER)
+
+#define parent_class gimp_operation_threshold_alpha_parent_class
+
+
+static void
+gimp_operation_threshold_alpha_class_init (GimpOperationThresholdAlphaClass *klass)
+{
+  GObjectClass                  *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass            *operation_class = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointFilterClass *point_class     = GEGL_OPERATION_POINT_FILTER_CLASS (klass);
+
+  object_class->set_property = gimp_operation_threshold_alpha_set_property;
+  object_class->get_property = gimp_operation_threshold_alpha_get_property;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:threshold-alpha",
+                                 "categories",  "color",
+                                 "description",
+                                 _("Make transparency all-or-nothing, by "
+                                   "thresholding the alpha channel to a value"),
+                                 NULL);
+
+  operation_class->prepare = gimp_operation_threshold_alpha_prepare;
+
+  point_class->process     = gimp_operation_threshold_alpha_process;
+
+  g_object_class_install_property (object_class, PROP_VALUE,
+                                   g_param_spec_double ("value",
+                                                        _("Value"),
+                                                        _("The alpha value"),
+                                                        0.0, 1.0, 0.5,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_operation_threshold_alpha_init (GimpOperationThresholdAlpha *self)
+{
+}
+
+static void
+gimp_operation_threshold_alpha_get_property (GObject    *object,
+                                             guint       property_id,
+                                             GValue     *value,
+                                             GParamSpec *pspec)
+{
+  GimpOperationThresholdAlpha *self = GIMP_OPERATION_THRESHOLD_ALPHA (object);
+
+  switch (property_id)
+    {
+    case PROP_VALUE:
+      g_value_set_double (value, self->value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_threshold_alpha_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec)
+{
+  GimpOperationThresholdAlpha *self = GIMP_OPERATION_THRESHOLD_ALPHA (object);
+
+  switch (property_id)
+    {
+    case PROP_VALUE:
+      self->value = g_value_get_double (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_threshold_alpha_prepare (GeglOperation *operation)
+{
+  const Babl *space = gegl_operation_get_source_space (operation, "input");
+  gegl_operation_set_format (operation, "input",  babl_format_with_space ("RGBA float", space));
+  gegl_operation_set_format (operation, "output", babl_format_with_space ("RGBA float", space));
+}
+
+static gboolean
+gimp_operation_threshold_alpha_process (GeglOperation       *operation,
+                                        void                *in_buf,
+                                        void                *out_buf,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  GimpOperationThresholdAlpha *self = GIMP_OPERATION_THRESHOLD_ALPHA (operation);
+  gfloat                      *src  = in_buf;
+  gfloat                      *dest = out_buf;
+
+  while (samples--)
+    {
+      dest[RED]   = src[RED];
+      dest[GREEN] = src[GREEN];
+      dest[BLUE]  = src[BLUE];
+
+      if (src[ALPHA] > self->value)
+        dest[ALPHA] = 1.0;
+      else
+        dest[ALPHA] = 0.0;
+
+      src  += 4;
+      dest += 4;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/gimpoperationthresholdalpha.h b/app/operations/gimpoperationthresholdalpha.h
new file mode 100644
index 0000000..0339289
--- /dev/null
+++ b/app/operations/gimpoperationthresholdalpha.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationthresholdalpha.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_THRESHOLD_ALPHA_H__
+#define __GIMP_OPERATION_THRESHOLD_ALPHA_H__
+
+
+#include <gegl-plugin.h>
+#include <operation/gegl-operation-point-filter.h>
+
+
+#define GIMP_TYPE_OPERATION_THRESHOLD_ALPHA            (gimp_operation_threshold_alpha_get_type ())
+#define GIMP_OPERATION_THRESHOLD_ALPHA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_THRESHOLD_ALPHA, GimpOperationThresholdAlpha))
+#define GIMP_OPERATION_THRESHOLD_ALPHA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_THRESHOLD_ALPHA, GimpOperationThresholdAlphaClass))
+#define GIMP_IS_OPERATION_THRESHOLD_ALPHA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_THRESHOLD_ALPHA))
+#define GIMP_IS_OPERATION_THRESHOLD_ALPHA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_THRESHOLD_ALPHA))
+#define GIMP_OPERATION_THRESHOLD_ALPHA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_THRESHOLD_ALPHA, GimpOperationThresholdAlphaClass))
+
+
+typedef struct _GimpOperationThresholdAlpha      GimpOperationThresholdAlpha;
+typedef struct _GimpOperationThresholdAlphaClass GimpOperationThresholdAlphaClass;
+
+struct _GimpOperationThresholdAlpha
+{
+  GeglOperationPointFilter  parent_instance;
+
+  gdouble                   value;
+};
+
+struct _GimpOperationThresholdAlphaClass
+{
+  GeglOperationPointFilterClass  parent_class;
+};
+
+
+GType   gimp_operation_threshold_alpha_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_THRESHOLD_ALPHA_H__ */
diff --git a/app/operations/layer-modes-legacy/Makefile.am b/app/operations/layer-modes-legacy/Makefile.am
new file mode 100644
index 0000000..b8241da
--- /dev/null
+++ b/app/operations/layer-modes-legacy/Makefile.am
@@ -0,0 +1,54 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Layer-Modes-Legacy\"	\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)/app				\
+	-I$(top_srcdir)/app				\
+	$(CAIRO_CFLAGS)					\
+	$(GEGL_CFLAGS)					\
+	$(GDK_PIXBUF_CFLAGS)				\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libapplayermodeslegacy.a
+
+libapplayermodeslegacy_a_SOURCES = \
+	gimpoperationadditionlegacy.c		\
+	gimpoperationadditionlegacy.h		\
+	gimpoperationburnlegacy.c		\
+	gimpoperationburnlegacy.h		\
+	gimpoperationdarkenonlylegacy.c		\
+	gimpoperationdarkenonlylegacy.h		\
+	gimpoperationdifferencelegacy.c		\
+	gimpoperationdifferencelegacy.h		\
+	gimpoperationdividelegacy.c		\
+	gimpoperationdividelegacy.h		\
+	gimpoperationdodgelegacy.c		\
+	gimpoperationdodgelegacy.h		\
+	gimpoperationgrainextractlegacy.c	\
+	gimpoperationgrainextractlegacy.h	\
+	gimpoperationgrainmergelegacy.c		\
+	gimpoperationgrainmergelegacy.h		\
+	gimpoperationhardlightlegacy.c		\
+	gimpoperationhardlightlegacy.h		\
+	gimpoperationhslcolorlegacy.c		\
+	gimpoperationhslcolorlegacy.h		\
+	gimpoperationhsvhuelegacy.c		\
+	gimpoperationhsvhuelegacy.h		\
+	gimpoperationhsvsaturationlegacy.c	\
+	gimpoperationhsvsaturationlegacy.h	\
+	gimpoperationhsvvaluelegacy.c		\
+	gimpoperationhsvvaluelegacy.h		\
+	gimpoperationlightenonlylegacy.c	\
+	gimpoperationlightenonlylegacy.h	\
+	gimpoperationmultiplylegacy.c		\
+	gimpoperationmultiplylegacy.h		\
+	gimpoperationscreenlegacy.c		\
+	gimpoperationscreenlegacy.h		\
+	gimpoperationsoftlightlegacy.c		\
+	gimpoperationsoftlightlegacy.h		\
+	gimpoperationsubtractlegacy.c		\
+	gimpoperationsubtractlegacy.h
+
diff --git a/app/operations/layer-modes-legacy/Makefile.in b/app/operations/layer-modes-legacy/Makefile.in
new file mode 100644
index 0000000..f51eeed
--- /dev/null
+++ b/app/operations/layer-modes-legacy/Makefile.in
@@ -0,0 +1,1038 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/operations/layer-modes-legacy
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapplayermodeslegacy_a_AR = $(AR) $(ARFLAGS)
+libapplayermodeslegacy_a_LIBADD =
+am_libapplayermodeslegacy_a_OBJECTS =  \
+	gimpoperationadditionlegacy.$(OBJEXT) \
+	gimpoperationburnlegacy.$(OBJEXT) \
+	gimpoperationdarkenonlylegacy.$(OBJEXT) \
+	gimpoperationdifferencelegacy.$(OBJEXT) \
+	gimpoperationdividelegacy.$(OBJEXT) \
+	gimpoperationdodgelegacy.$(OBJEXT) \
+	gimpoperationgrainextractlegacy.$(OBJEXT) \
+	gimpoperationgrainmergelegacy.$(OBJEXT) \
+	gimpoperationhardlightlegacy.$(OBJEXT) \
+	gimpoperationhslcolorlegacy.$(OBJEXT) \
+	gimpoperationhsvhuelegacy.$(OBJEXT) \
+	gimpoperationhsvsaturationlegacy.$(OBJEXT) \
+	gimpoperationhsvvaluelegacy.$(OBJEXT) \
+	gimpoperationlightenonlylegacy.$(OBJEXT) \
+	gimpoperationmultiplylegacy.$(OBJEXT) \
+	gimpoperationscreenlegacy.$(OBJEXT) \
+	gimpoperationsoftlightlegacy.$(OBJEXT) \
+	gimpoperationsubtractlegacy.$(OBJEXT)
+libapplayermodeslegacy_a_OBJECTS =  \
+	$(am_libapplayermodeslegacy_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimpoperationadditionlegacy.Po \
+	./$(DEPDIR)/gimpoperationburnlegacy.Po \
+	./$(DEPDIR)/gimpoperationdarkenonlylegacy.Po \
+	./$(DEPDIR)/gimpoperationdifferencelegacy.Po \
+	./$(DEPDIR)/gimpoperationdividelegacy.Po \
+	./$(DEPDIR)/gimpoperationdodgelegacy.Po \
+	./$(DEPDIR)/gimpoperationgrainextractlegacy.Po \
+	./$(DEPDIR)/gimpoperationgrainmergelegacy.Po \
+	./$(DEPDIR)/gimpoperationhardlightlegacy.Po \
+	./$(DEPDIR)/gimpoperationhslcolorlegacy.Po \
+	./$(DEPDIR)/gimpoperationhsvhuelegacy.Po \
+	./$(DEPDIR)/gimpoperationhsvsaturationlegacy.Po \
+	./$(DEPDIR)/gimpoperationhsvvaluelegacy.Po \
+	./$(DEPDIR)/gimpoperationlightenonlylegacy.Po \
+	./$(DEPDIR)/gimpoperationmultiplylegacy.Po \
+	./$(DEPDIR)/gimpoperationscreenlegacy.Po \
+	./$(DEPDIR)/gimpoperationsoftlightlegacy.Po \
+	./$(DEPDIR)/gimpoperationsubtractlegacy.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapplayermodeslegacy_a_SOURCES)
+DIST_SOURCES = $(libapplayermodeslegacy_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Layer-Modes-Legacy\"	\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)/app				\
+	-I$(top_srcdir)/app				\
+	$(CAIRO_CFLAGS)					\
+	$(GEGL_CFLAGS)					\
+	$(GDK_PIXBUF_CFLAGS)				\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libapplayermodeslegacy.a
+
+libapplayermodeslegacy_a_SOURCES = \
+	gimpoperationadditionlegacy.c		\
+	gimpoperationadditionlegacy.h		\
+	gimpoperationburnlegacy.c		\
+	gimpoperationburnlegacy.h		\
+	gimpoperationdarkenonlylegacy.c		\
+	gimpoperationdarkenonlylegacy.h		\
+	gimpoperationdifferencelegacy.c		\
+	gimpoperationdifferencelegacy.h		\
+	gimpoperationdividelegacy.c		\
+	gimpoperationdividelegacy.h		\
+	gimpoperationdodgelegacy.c		\
+	gimpoperationdodgelegacy.h		\
+	gimpoperationgrainextractlegacy.c	\
+	gimpoperationgrainextractlegacy.h	\
+	gimpoperationgrainmergelegacy.c		\
+	gimpoperationgrainmergelegacy.h		\
+	gimpoperationhardlightlegacy.c		\
+	gimpoperationhardlightlegacy.h		\
+	gimpoperationhslcolorlegacy.c		\
+	gimpoperationhslcolorlegacy.h		\
+	gimpoperationhsvhuelegacy.c		\
+	gimpoperationhsvhuelegacy.h		\
+	gimpoperationhsvsaturationlegacy.c	\
+	gimpoperationhsvsaturationlegacy.h	\
+	gimpoperationhsvvaluelegacy.c		\
+	gimpoperationhsvvaluelegacy.h		\
+	gimpoperationlightenonlylegacy.c	\
+	gimpoperationlightenonlylegacy.h	\
+	gimpoperationmultiplylegacy.c		\
+	gimpoperationmultiplylegacy.h		\
+	gimpoperationscreenlegacy.c		\
+	gimpoperationscreenlegacy.h		\
+	gimpoperationsoftlightlegacy.c		\
+	gimpoperationsoftlightlegacy.h		\
+	gimpoperationsubtractlegacy.c		\
+	gimpoperationsubtractlegacy.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/operations/layer-modes-legacy/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/operations/layer-modes-legacy/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapplayermodeslegacy.a: $(libapplayermodeslegacy_a_OBJECTS) $(libapplayermodeslegacy_a_DEPENDENCIES) $(EXTRA_libapplayermodeslegacy_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapplayermodeslegacy.a
+	$(AM_V_AR)$(libapplayermodeslegacy_a_AR) libapplayermodeslegacy.a $(libapplayermodeslegacy_a_OBJECTS) $(libapplayermodeslegacy_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapplayermodeslegacy.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationadditionlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationburnlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdarkenonlylegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdifferencelegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdividelegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdodgelegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationgrainextractlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationgrainmergelegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhardlightlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhslcolorlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhsvhuelegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhsvsaturationlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationhsvvaluelegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationlightenonlylegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationmultiplylegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationscreenlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationsoftlightlegacy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationsubtractlegacy.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimpoperationadditionlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationburnlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdarkenonlylegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdifferencelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdividelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdodgelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgrainextractlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgrainmergelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhardlightlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhslcolorlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhsvhuelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhsvsaturationlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhsvvaluelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlightenonlylegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationmultiplylegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationscreenlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsoftlightlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsubtractlegacy.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimpoperationadditionlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationburnlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdarkenonlylegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdifferencelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdividelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdodgelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgrainextractlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationgrainmergelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhardlightlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhslcolorlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhsvhuelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhsvsaturationlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationhsvvaluelegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlightenonlylegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationmultiplylegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationscreenlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsoftlightlegacy.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsubtractlegacy.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
new file mode 100644
index 0000000..02992f2
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
@@ -0,0 +1,126 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationadditionmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationadditionlegacy.h"
+
+
+static gboolean   gimp_operation_addition_legacy_process (GeglOperation       *op,
+                                                          void                *in,
+                                                          void                *layer,
+                                                          void                *mask,
+                                                          void                *out,
+                                                          glong                samples,
+                                                          const GeglRectangle *roi,
+                                                          gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationAdditionLegacy, gimp_operation_addition_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_addition_legacy_class_init (GimpOperationAdditionLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:addition-legacy",
+                                 "description", "GIMP addition mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_addition_legacy_process;
+}
+
+static void
+gimp_operation_addition_legacy_init (GimpOperationAdditionLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_addition_legacy_process (GeglOperation       *op,
+                                        void                *in_p,
+                                        void                *layer_p,
+                                        void                *mask_p,
+                                        void                *out_p,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (has_mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] + layer[b];
+              comp = CLAMP (comp, 0.0f, 1.0f);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (has_mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
new file mode 100644
index 0000000..7f9df60
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationadditionlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_ADDITION_LEGACY_H__
+#define __GIMP_OPERATION_ADDITION_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_ADDITION_LEGACY            (gimp_operation_addition_legacy_get_type ())
+#define GIMP_OPERATION_ADDITION_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_ADDITION_LEGACY, GimpOperationAdditionLegacy))
+#define GIMP_OPERATION_ADDITION_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_ADDITION_LEGACY, GimpOperationAdditionLegacyClass))
+#define GIMP_IS_OPERATION_ADDITION_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_ADDITION_LEGACY))
+#define GIMP_IS_OPERATION_ADDITION_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_ADDITION_LEGACY))
+#define GIMP_OPERATION_ADDITION_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_ADDITION_LEGACY, GimpOperationAdditionLegacyClass))
+
+
+typedef struct _GimpOperationAdditionLegacy      GimpOperationAdditionLegacy;
+typedef struct _GimpOperationAdditionLegacyClass GimpOperationAdditionLegacyClass;
+
+struct _GimpOperationAdditionLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationAdditionLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_addition_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_ADDITION_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
new file mode 100644
index 0000000..5511b69
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
@@ -0,0 +1,128 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationburnmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationburnlegacy.h"
+
+
+static gboolean   gimp_operation_burn_legacy_process (GeglOperation       *op,
+                                                      void                *in,
+                                                      void                *layer,
+                                                      void                *mask,
+                                                      void                *out,
+                                                      glong                samples,
+                                                      const GeglRectangle *roi,
+                                                      gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationBurnLegacy, gimp_operation_burn_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_burn_legacy_class_init (GimpOperationBurnLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:burn-legacy",
+                                 "description", "GIMP burn mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_burn_legacy_process;
+}
+
+static void
+gimp_operation_burn_legacy_init (GimpOperationBurnLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_burn_legacy_process (GeglOperation       *op,
+                                    void                *in_p,
+                                    void                *layer_p,
+                                    void                *mask_p,
+                                    void                *out_p,
+                                    glong                samples,
+                                    const GeglRectangle *roi,
+                                    gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = 1.0f - (1.0f - in[b]) / layer[b];
+              /* The CLAMP macro is deliberately inlined and
+               * written to map comp == NAN (0 / 0) -> 1
+               */
+              comp = comp < 0.0f ? 0.0f : comp < 1.0f ? comp : 1.0f;
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
new file mode 100644
index 0000000..dc13e3f
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationburnlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_BURN_LEGACY_H__
+#define __GIMP_OPERATION_BURN_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_BURN_LEGACY            (gimp_operation_burn_legacy_get_type ())
+#define GIMP_OPERATION_BURN_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_BURN_LEGACY, GimpOperationBurnLegacy))
+#define GIMP_OPERATION_BURN_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_BURN_LEGACY, GimpOperationBurnLegacyClass))
+#define GIMP_IS_OPERATION_BURN_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_BURN_LEGACY))
+#define GIMP_IS_OPERATION_BURN_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_BURN_LEGACY))
+#define GIMP_OPERATION_BURN_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BURN_LEGACY, GimpOperationBurnLegacyClass))
+
+
+typedef struct _GimpOperationBurnLegacy      GimpOperationBurnLegacy;
+typedef struct _GimpOperationBurnLegacyClass GimpOperationBurnLegacyClass;
+
+struct _GimpOperationBurnLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationBurnLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_burn_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_BURN_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
new file mode 100644
index 0000000..1a3ebdf
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdarkenonlymode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationdarkenonlylegacy.h"
+
+
+static gboolean   gimp_operation_darken_only_legacy_process (GeglOperation       *op,
+                                                             void                *in,
+                                                             void                *layer,
+                                                             void                *mask,
+                                                             void                *out,
+                                                             glong                samples,
+                                                             const GeglRectangle *roi,
+                                                             gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationDarkenOnlyLegacy, gimp_operation_darken_only_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_darken_only_legacy_class_init (GimpOperationDarkenOnlyLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:darken-only-legacy",
+                                 "description", "GIMP darken only mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_darken_only_legacy_process;
+}
+
+static void
+gimp_operation_darken_only_legacy_init (GimpOperationDarkenOnlyLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_darken_only_legacy_process (GeglOperation       *op,
+                                           void                *in_p,
+                                           void                *layer_p,
+                                           void                *mask_p,
+                                           void                *out_p,
+                                           glong                samples,
+                                           const GeglRectangle *roi,
+                                           gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (new_alpha && comp_alpha)
+        {
+          gint   b;
+          gfloat ratio = comp_alpha / new_alpha;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = MIN (in[b], layer[b]);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
new file mode 100644
index 0000000..c0406a1
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdarkenonlylegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__
+#define __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_DARKEN_ONLY_LEGACY            (gimp_operation_darken_only_legacy_get_type ())
+#define GIMP_OPERATION_DARKEN_ONLY_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE, GimpOperationDarkenOnlyLegacy))
+#define GIMP_OPERATION_DARKEN_ONLY_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE, GimpOperationDarkenOnlyLegacyClass))
+#define GIMP_IS_OPERATION_DARKEN_ONLY_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE))
+#define GIMP_IS_OPERATION_DARKEN_ONLY_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE))
+#define GIMP_OPERATION_DARKEN_ONLY_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE, GimpOperationDarkenOnlyLegacyClass))
+
+
+typedef struct _GimpOperationDarkenOnlyLegacy      GimpOperationDarkenOnlyLegacy;
+typedef struct _GimpOperationDarkenOnlyLegacyClass GimpOperationDarkenOnlyLegacyClass;
+
+struct _GimpOperationDarkenOnlyLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationDarkenOnlyLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_darken_only_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
new file mode 100644
index 0000000..55f3328
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
@@ -0,0 +1,126 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdifferencemode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationdifferencelegacy.h"
+
+
+static gboolean   gimp_operation_difference_legacy_process (GeglOperation       *op,
+                                                            void                *in,
+                                                            void                *layer,
+                                                            void                *mask,
+                                                            void                *out,
+                                                            glong                samples,
+                                                            const GeglRectangle *roi,
+                                                            gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationDifferenceLegacy, gimp_operation_difference_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_difference_legacy_class_init (GimpOperationDifferenceLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:difference-legacy",
+                                 "description", "GIMP difference mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_difference_legacy_process;
+}
+
+static void
+gimp_operation_difference_legacy_init (GimpOperationDifferenceLegacy *self)
+{
+}
+
+
+static gboolean
+gimp_operation_difference_legacy_process (GeglOperation       *op,
+                                          void                *in_p,
+                                          void                *layer_p,
+                                          void                *mask_p,
+                                          void                *out_p,
+                                          glong                samples,
+                                          const GeglRectangle *roi,
+                                          gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] - layer[b];
+              comp = (comp < 0.0f) ? -comp : comp;
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
new file mode 100644
index 0000000..145b9c2
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdifferencelegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
+#define __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY            (gimp_operation_difference_legacy_get_type ())
+#define GIMP_OPERATION_DIFFERENCE_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY, GimpOperationDifferenceLegacy))
+#define GIMP_OPERATION_DIFFERENCE_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY, GimpOperationDifferenceLegacyClass))
+#define GIMP_IS_OPERATION_DIFFERENCE_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY))
+#define GIMP_IS_OPERATION_DIFFERENCE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY))
+#define GIMP_OPERATION_DIFFERENCE_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY, GimpOperationDifferenceLegacyClass))
+
+
+typedef struct _GimpOperationDifferenceLegacy      GimpOperationDifferenceLegacy;
+typedef struct _GimpOperationDifferenceLegacyClass GimpOperationDifferenceLegacyClass;
+
+struct _GimpOperationDifferenceLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationDifferenceLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_difference_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_DIFFERENCE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
new file mode 100644
index 0000000..8fe8dd8
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
@@ -0,0 +1,127 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdividemode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationdividelegacy.h"
+
+
+static gboolean   gimp_operation_divide_legacy_process (GeglOperation       *op,
+                                                        void                *in,
+                                                        void                *layer,
+                                                        void                *mask,
+                                                        void                *out,
+                                                        glong                samples,
+                                                        const GeglRectangle *roi,
+                                                        gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationDivideLegacy, gimp_operation_divide_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_divide_legacy_class_init (GimpOperationDivideLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:divide-legacy",
+                                 "description", "GIMP divide mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_divide_legacy_process;
+}
+
+static void
+gimp_operation_divide_legacy_init (GimpOperationDivideLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_divide_legacy_process (GeglOperation       *op,
+                                      void                *in_p,
+                                      void                *layer_p,
+                                      void                *mask_p,
+                                      void                *out_p,
+                                      glong                samples,
+                                      const GeglRectangle *roi,
+                                      gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat ratio = comp_alpha / new_alpha;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] / layer[b];
+              comp = SAFE_CLAMP (comp, 0.0f, 1.0f);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
new file mode 100644
index 0000000..fa5de12
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdividelegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DIVIDE_LEGACY_H__
+#define __GIMP_OPERATION_DIVIDE_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_DIVIDE_LEGACY            (gimp_operation_divide_legacy_get_type ())
+#define GIMP_OPERATION_DIVIDE_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DIVIDE_LEGACY, GimpOperationDivideLegacy))
+#define GIMP_OPERATION_DIVIDE_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DIVIDE_LEGACY, GimpOperationDivideLegacyClass))
+#define GIMP_IS_OPERATION_DIVIDE_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DIVIDE_LEGACY))
+#define GIMP_IS_OPERATION_DIVIDE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DIVIDE_LEGACY))
+#define GIMP_OPERATION_DIVIDE_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DIVIDE_LEGACY, GimpOperationDivideLegacyClass))
+
+
+typedef struct _GimpOperationDivideLegacy      GimpOperationDivideLegacy;
+typedef struct _GimpOperationDivideLegacyClass GimpOperationDivideLegacyClass;
+
+struct _GimpOperationDivideLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationDivideLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_divide_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_DIVIDE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
new file mode 100644
index 0000000..65adaef
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
@@ -0,0 +1,127 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdodgelegacy.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationdodgelegacy.h"
+
+
+static gboolean   gimp_operation_dodge_legacy_process (GeglOperation       *op,
+                                                       void                *in,
+                                                       void                *layer,
+                                                       void                *mask,
+                                                       void                *out,
+                                                       glong                samples,
+                                                       const GeglRectangle *roi,
+                                                       gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationDodgeLegacy, gimp_operation_dodge_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_dodge_legacy_class_init (GimpOperationDodgeLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:dodge-legacy",
+                                 "description", "GIMP dodge mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_dodge_legacy_process;
+}
+
+static void
+gimp_operation_dodge_legacy_init (GimpOperationDodgeLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_dodge_legacy_process (GeglOperation       *op,
+                                     void                *in_p,
+                                     void                *layer_p,
+                                     void                *mask_p,
+                                     void                *out_p,
+                                     glong                samples,
+                                     const GeglRectangle *roi,
+                                     gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat ratio = comp_alpha / new_alpha;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] / (1.0f - layer[b]);
+              comp = SAFE_CLAMP (comp, 0.0f, 1.0f);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
new file mode 100644
index 0000000..b640fed
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdodgelegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DODGE_LEGACY_H__
+#define __GIMP_OPERATION_DODGE_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_DODGE_LEGACY            (gimp_operation_dodge_legacy_get_type ())
+#define GIMP_OPERATION_DODGE_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DODGE_LEGACY, GimpOperationDodgeLegacy))
+#define GIMP_OPERATION_DODGE_LEGACY_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DODGE_LEGACY, GimpOperationDodgeLegacyClass))
+#define GIMP_IS_OPERATION_DODGE_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DODGE_LEGACY))
+#define GIMP_IS_OPERATION_DODGE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DODGE_LEGACY))
+#define GIMP_OPERATION_DODGE_LEGACY_GET_CLASS(obj)(G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DODGE_LEGACY, GimpOperationDodgeLegacyClass))
+
+
+typedef struct _GimpOperationDodgeLegacy      GimpOperationDodgeLegacy;
+typedef struct _GimpOperationDodgeLegacyClass GimpOperationDodgeLegacyClass;
+
+struct _GimpOperationDodgeLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationDodgeLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_dodge_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_DODGE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
new file mode 100644
index 0000000..77338c4
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgrainextractmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationgrainextractlegacy.h"
+
+
+static gboolean   gimp_operation_grain_extract_legacy_process (GeglOperation       *op,
+                                                               void                *in,
+                                                               void                *layer,
+                                                               void                *mask,
+                                                               void                *out,
+                                                               glong                samples,
+                                                               const GeglRectangle *roi,
+                                                               gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationGrainExtractLegacy, gimp_operation_grain_extract_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_grain_extract_legacy_class_init (GimpOperationGrainExtractLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:grain-extract-legacy",
+                                 "description", "GIMP grain extract mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_grain_extract_legacy_process;
+}
+
+static void
+gimp_operation_grain_extract_legacy_init (GimpOperationGrainExtractLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_grain_extract_legacy_process (GeglOperation       *op,
+                                             void                *in_p,
+                                             void                *layer_p,
+                                             void                *mask_p,
+                                             void                *out_p,
+                                             glong                samples,
+                                             const GeglRectangle *roi,
+                                             gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] - layer[b] + 128.0f / 255.0f;
+              comp = CLAMP (comp, 0.0f, 1.0f);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
new file mode 100644
index 0000000..149ee09
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgrainextractlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__
+#define __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY            (gimp_operation_grain_extract_legacy_get_type ())
+#define GIMP_OPERATION_GRAIN_EXTRACT_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY, GimpOperationGrainExtractLegacy))
+#define GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY, GimpOperationGrainExtractLegacyClass))
+#define GIMP_IS_OPERATION_GRAIN_EXTRACT_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY))
+#define GIMP_IS_OPERATION_GRAIN_EXTRACT_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY))
+#define GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY, GimpOperationGrainExtractLegacyClass))
+
+
+typedef struct _GimpOperationGrainExtractLegacy      GimpOperationGrainExtractLegacy;
+typedef struct _GimpOperationGrainExtractLegacyClass GimpOperationGrainExtractLegacyClass;
+
+struct _GimpOperationGrainExtractLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationGrainExtractLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_grain_extract_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
new file mode 100644
index 0000000..c12a995
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgrainmergemode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationgrainmergelegacy.h"
+
+
+static gboolean   gimp_operation_grain_merge_legacy_process (GeglOperation       *op,
+                                                             void                *in,
+                                                             void                *layer,
+                                                             void                *mask,
+                                                             void                *out,
+                                                             glong                samples,
+                                                             const GeglRectangle *roi,
+                                                             gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationGrainMergeLegacy, gimp_operation_grain_merge_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_grain_merge_legacy_class_init (GimpOperationGrainMergeLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:grain-merge-legacy",
+                                 "description", "GIMP grain merge mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_grain_merge_legacy_process;
+}
+
+static void
+gimp_operation_grain_merge_legacy_init (GimpOperationGrainMergeLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_grain_merge_legacy_process (GeglOperation       *op,
+                                           void                *in_p,
+                                           void                *layer_p,
+                                           void                *mask_p,
+                                           void                *out_p,
+                                           glong                samples,
+                                           const GeglRectangle *roi,
+                                           gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] + layer[b] - 128.0f / 255.0f;
+              comp = CLAMP (comp, 0.0f, 1.0f);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask ++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
new file mode 100644
index 0000000..344e895
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationgrainmergelegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__
+#define __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY            (gimp_operation_grain_merge_legacy_get_type ())
+#define GIMP_OPERATION_GRAIN_MERGE_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY, GimpOperationGrainMergeLegacy))
+#define GIMP_OPERATION_GRAIN_MERGE_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY, GimpOperationGrainMergeLegacyClass))
+#define GIMP_IS_OPERATION_GRAIN_MERGE_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY))
+#define GIMP_IS_OPERATION_GRAIN_MERGE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY))
+#define GIMP_OPERATION_GRAIN_MERGE_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY, GimpOperationGrainMergeLegacyClass))
+
+
+typedef struct _GimpOperationGrainMergeLegacy      GimpOperationGrainMergeLegacy;
+typedef struct _GimpOperationGrainMergeLegacyClass GimpOperationGrainMergeLegacyClass;
+
+struct _GimpOperationGrainMergeLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationGrainMergeLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_grain_merge_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
new file mode 100644
index 0000000..68f8eda
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
@@ -0,0 +1,135 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhardlightmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationhardlightlegacy.h"
+
+
+static gboolean   gimp_operation_hardlight_legacy_process (GeglOperation       *op,
+                                                           void                *in,
+                                                           void                *layer,
+                                                           void                *mask,
+                                                           void                *out,
+                                                           glong                samples,
+                                                           const GeglRectangle *roi,
+                                                           gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHardlightLegacy, gimp_operation_hardlight_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_hardlight_legacy_class_init (GimpOperationHardlightLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:hardlight-legacy",
+                                 "description", "GIMP hardlight mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_hardlight_legacy_process;
+}
+
+static void
+gimp_operation_hardlight_legacy_init (GimpOperationHardlightLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_hardlight_legacy_process (GeglOperation       *op,
+                                         void                *in_p,
+                                         void                *layer_p,
+                                         void                *mask_p,
+                                         void                *out_p,
+                                         glong                samples,
+                                         const GeglRectangle *roi,
+                                         gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp;
+
+              if (layer[b] > 128.0f / 255.0f)
+                {
+                  comp = (1.0 - in[b]) * (1.0 - (layer[b] - 128.0f / 255.0f) * 2.0f);
+                  comp = MIN (1.0f - comp, 1.0f);
+                }
+              else
+                {
+                  comp = in[b] * (layer[b] * 2.0f);
+                  comp = MIN (comp, 1.0f);
+                }
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask ++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
new file mode 100644
index 0000000..38791be
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhardlightlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HARDLIGHT_LEGACY_H__
+#define __GIMP_OPERATION_HARDLIGHT_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY            (gimp_operation_hardlight_legacy_get_type ())
+#define GIMP_OPERATION_HARDLIGHT_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY, GimpOperationHardlightLegacy))
+#define GIMP_OPERATION_HARDLIGHT_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY, GimpOperationHardlightLegacyClass))
+#define GIMP_IS_OPERATION_HARDLIGHT_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY))
+#define GIMP_IS_OPERATION_HARDLIGHT_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY))
+#define GIMP_OPERATION_HARDLIGHT_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY, GimpOperationHardlightLegacyClass))
+
+
+typedef struct _GimpOperationHardlightLegacy      GimpOperationHardlightLegacy;
+typedef struct _GimpOperationHardlightLegacyClass GimpOperationHardlightLegacyClass;
+
+struct _GimpOperationHardlightLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationHardlightLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_hardlight_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_HARDLIGHT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.c b/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.c
new file mode 100644
index 0000000..6fd7a95
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.c
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationcolormode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationhslcolorlegacy.h"
+
+
+static gboolean   gimp_operation_hsl_color_legacy_process (GeglOperation       *op,
+                                                           void                *in,
+                                                           void                *layer,
+                                                           void                *mask,
+                                                           void                *out,
+                                                           glong                samples,
+                                                           const GeglRectangle *roi,
+                                                           gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHslColorLegacy, gimp_operation_hsl_color_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_hsl_color_legacy_class_init (GimpOperationHslColorLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:hsl-color-legacy",
+                                 "description", "GIMP color mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_hsl_color_legacy_process;
+}
+
+static void
+gimp_operation_hsl_color_legacy_init (GimpOperationHslColorLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_hsl_color_legacy_process (GeglOperation       *op,
+                                         void                *in_p,
+                                         void                *layer_p,
+                                         void                *mask_p,
+                                         void                *out_p,
+                                         glong                samples,
+                                         const GeglRectangle *roi,
+                                         gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      GimpHSL layer_hsl, out_hsl;
+      GimpRGB layer_rgb = {layer[0], layer[1], layer[2]};
+      GimpRGB out_rgb   = {in[0], in[1], in[2]};
+      gfloat  comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat out_tmp[3];
+          gfloat ratio = comp_alpha / new_alpha;
+
+          gimp_rgb_to_hsl (&layer_rgb, &layer_hsl);
+          gimp_rgb_to_hsl (&out_rgb, &out_hsl);
+
+          out_hsl.h = layer_hsl.h;
+          out_hsl.s = layer_hsl.s;
+          gimp_hsl_to_rgb (&out_hsl, &out_rgb);
+
+          out_tmp[0] = out_rgb.r;
+          out_tmp[1] = out_rgb.g;
+          out_tmp[2] = out_rgb.b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = out_tmp[b] * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h b/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h
new file mode 100644
index 0000000..add2933
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhslcolorlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HSL_COLOR_LEGACY_H__
+#define __GIMP_OPERATION_HSL_COLOR_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY            (gimp_operation_hsl_color_legacy_get_type ())
+#define GIMP_OPERATION_HSL_COLOR_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY, GimpOperationHslColorLegacy))
+#define GIMP_OPERATION_HSL_COLOR_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY, GimpOperationHslColorLegacyClass))
+#define GIMP_IS_OPERATION_HSL_COLOR_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY))
+#define GIMP_IS_OPERATION_HSL_COLOR_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY))
+#define GIMP_OPERATION_HSL_COLOR_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY, GimpOperationHslColorLegacyClass))
+
+
+typedef struct _GimpOperationHslColorLegacy      GimpOperationHslColorLegacy;
+typedef struct _GimpOperationHslColorLegacyClass GimpOperationHslColorLegacyClass;
+
+struct _GimpOperationHslColorLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationHslColorLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_hsl_color_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_HSL_COLOR_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
new file mode 100644
index 0000000..eb9c040
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
@@ -0,0 +1,146 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhuemode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationhsvhuelegacy.h"
+
+
+static gboolean   gimp_operation_hsv_hue_legacy_process (GeglOperation       *op,
+                                                         void                *in,
+                                                         void                *layer,
+                                                         void                *mask,
+                                                         void                *out,
+                                                         glong                samples,
+                                                         const GeglRectangle *roi,
+                                                         gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHsvHueLegacy, gimp_operation_hsv_hue_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_hsv_hue_legacy_class_init (GimpOperationHsvHueLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:hsv-hue-legacy",
+                                 "description", "GIMP hue mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_hsv_hue_legacy_process;
+}
+
+static void
+gimp_operation_hsv_hue_legacy_init (GimpOperationHsvHueLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_hsv_hue_legacy_process (GeglOperation       *op,
+                                       void                *in_p,
+                                       void                *layer_p,
+                                       void                *mask_p,
+                                       void                *out_p,
+                                       glong                samples,
+                                       const GeglRectangle *roi,
+                                       gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      GimpHSV layer_hsv, out_hsv;
+      GimpRGB layer_rgb = {layer[0], layer[1], layer[2]};
+      GimpRGB out_rgb   = {in[0], in[1], in[2]};
+      gfloat  comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat out_tmp[3];
+          gfloat ratio = comp_alpha / new_alpha;
+
+          gimp_rgb_to_hsv (&layer_rgb, &layer_hsv);
+          gimp_rgb_to_hsv (&out_rgb, &out_hsv);
+
+          /*  Composition should have no effect if saturation is zero.
+           *  otherwise, black would be painted red (see bug #123296).
+           */
+          if (layer_hsv.s)
+            {
+              out_hsv.h = layer_hsv.h;
+            }
+          gimp_hsv_to_rgb (&out_hsv, &out_rgb);
+
+          out_tmp[0] = out_rgb.r;
+          out_tmp[1] = out_rgb.g;
+          out_tmp[2] = out_rgb.b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = out_tmp[b] * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
new file mode 100644
index 0000000..59ef125
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhsvhuelegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HSV_HUE_LEGACY_H__
+#define __GIMP_OPERATION_HSV_HUE_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_HSV_HUE_LEGACY            (gimp_operation_hsv_hue_legacy_get_type ())
+#define GIMP_OPERATION_HSV_HUE_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HSV_HUE_LEGACY, GimpOperationHsvHueLegacy))
+#define GIMP_OPERATION_HSV_HUE_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HSV_HUE_LEGACY, GimpOperationHsvHueLegacyClass))
+#define GIMP_IS_OPERATION_HSV_HUE_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HSV_HUE_LEGACY))
+#define GIMP_IS_OPERATION_HSV_HUE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HSV_HUE_LEGACY))
+#define GIMP_OPERATION_HSV_HUE_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HSV_HUE_LEGACY, GimpOperationHsvHueLegacyClass))
+
+
+typedef struct _GimpOperationHsvHueLegacy      GimpOperationHsvHueLegacy;
+typedef struct _GimpOperationHsvHueLegacyClass GimpOperationHsvHueLegacyClass;
+
+struct _GimpOperationHsvHueLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationHsvHueLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_hsv_hue_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_HSV_HUE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
new file mode 100644
index 0000000..d150aa1
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsaturationmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationhsvsaturationlegacy.h"
+
+
+static gboolean   gimp_operation_hsv_saturation_legacy_process (GeglOperation       *op,
+                                                                void                *in,
+                                                                void                *layer,
+                                                                void                *mask,
+                                                                void                *out,
+                                                                glong                samples,
+                                                                const GeglRectangle *roi,
+                                                                gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHsvSaturationLegacy, gimp_operation_hsv_saturation_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_hsv_saturation_legacy_class_init (GimpOperationHsvSaturationLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:hsv-saturation-legacy",
+                                 "description", "GIMP saturation mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_hsv_saturation_legacy_process;
+}
+
+static void
+gimp_operation_hsv_saturation_legacy_init (GimpOperationHsvSaturationLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_hsv_saturation_legacy_process (GeglOperation       *op,
+                                              void                *in_p,
+                                              void                *layer_p,
+                                              void                *mask_p,
+                                              void                *out_p,
+                                              glong                samples,
+                                              const GeglRectangle *roi,
+                                              gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      GimpHSV layer_hsv, out_hsv;
+      GimpRGB layer_rgb = {layer[0], layer[1], layer[2]};
+      GimpRGB out_rgb   = {in[0], in[1], in[2]};
+      gfloat  comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat out_tmp[3];
+          gfloat ratio = comp_alpha / new_alpha;
+
+          gimp_rgb_to_hsv (&layer_rgb, &layer_hsv);
+          gimp_rgb_to_hsv (&out_rgb, &out_hsv);
+
+          out_hsv.s = layer_hsv.s;
+          gimp_hsv_to_rgb (&out_hsv, &out_rgb);
+
+          out_tmp[0] = out_rgb.r;
+          out_tmp[1] = out_rgb.g;
+          out_tmp[2] = out_rgb.b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = out_tmp[b] * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
new file mode 100644
index 0000000..ecb5589
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhsvsaturationlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__
+#define __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY            (gimp_operation_hsv_saturation_legacy_get_type ())
+#define GIMP_OPERATION_HSV_SATURATION_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY, GimpOperationHsvSaturationLegacy))
+#define GIMP_OPERATION_HSV_SATURATION_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY, GimpOperationHsvSaturationLegacyClass))
+#define GIMP_IS_OPERATION_HSV_SATURATION_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY))
+#define GIMP_IS_OPERATION_HSV_SATURATION_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY))
+#define GIMP_OPERATION_HSV_SATURATION_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY, GimpOperationHsvSaturationLegacyClass))
+
+
+typedef struct _GimpOperationHsvSaturationLegacy      GimpOperationHsvSaturationLegacy;
+typedef struct _GimpOperationHsvSaturationLegacyClass GimpOperationHsvSaturationLegacyClass;
+
+struct _GimpOperationHsvSaturationLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationHsvSaturationLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_hsv_saturation_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
new file mode 100644
index 0000000..b873325
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationvaluemode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationhsvvaluelegacy.h"
+
+
+static gboolean   gimp_operation_hsv_value_legacy_process (GeglOperation       *op,
+                                                           void                *in,
+                                                           void                *layer,
+                                                           void                *mask,
+                                                           void                *out,
+                                                           glong                samples,
+                                                           const GeglRectangle *roi,
+                                                           gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationHsvValueLegacy, gimp_operation_hsv_value_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_hsv_value_legacy_class_init (GimpOperationHsvValueLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:hsv-value-legacy",
+                                 "description", "GIMP value mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_hsv_value_legacy_process;
+}
+
+static void
+gimp_operation_hsv_value_legacy_init (GimpOperationHsvValueLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_hsv_value_legacy_process (GeglOperation       *op,
+                                         void                *in_p,
+                                         void                *layer_p,
+                                         void                *mask_p,
+                                         void                *out_p,
+                                         glong                samples,
+                                         const GeglRectangle *roi,
+                                         gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      GimpHSV layer_hsv, out_hsv;
+      GimpRGB layer_rgb = {layer[0], layer[1], layer[2]};
+      GimpRGB out_rgb   = {in[0], in[1], in[2]};
+      gfloat  comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat out_tmp[3];
+          gfloat ratio = comp_alpha / new_alpha;
+
+          gimp_rgb_to_hsv (&layer_rgb, &layer_hsv);
+          gimp_rgb_to_hsv (&out_rgb, &out_hsv);
+
+          out_hsv.v = layer_hsv.v;
+          gimp_hsv_to_rgb (&out_hsv, &out_rgb);
+
+          out_tmp[0] = out_rgb.r;
+          out_tmp[1] = out_rgb.g;
+          out_tmp[2] = out_rgb.b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = out_tmp[b] * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
new file mode 100644
index 0000000..7701ffd
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationhsvvaluelegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_HSV_VALUE_LEGACY_H__
+#define __GIMP_OPERATION_HSV_VALUE_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY            (gimp_operation_hsv_value_legacy_get_type ())
+#define GIMP_OPERATION_HSV_VALUE_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY, GimpOperationHsvValueLegacy))
+#define GIMP_OPERATION_HSV_VALUE_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY, GimpOperationHsvValueLegacyClass))
+#define GIMP_IS_OPERATION_HSV_VALUE_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY))
+#define GIMP_IS_OPERATION_HSV_VALUE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY))
+#define GIMP_OPERATION_HSV_VALUE_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY, GimpOperationHsvValueLegacyClass))
+
+
+typedef struct _GimpOperationHsvValueLegacy      GimpOperationHsvValueLegacy;
+typedef struct _GimpOperationHsvValueLegacyClass GimpOperationHsvValueLegacyClass;
+
+struct _GimpOperationHsvValueLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationHsvValueLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_hsv_value_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_HSV_VALUE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
new file mode 100644
index 0000000..0e54a0c
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlightenonlylegacy.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationlightenonlylegacy.h"
+
+
+static gboolean   gimp_operation_lighten_only_legacy_process (GeglOperation       *op,
+                                                              void                *in,
+                                                              void                *layer,
+                                                              void                *mask,
+                                                              void                *out,
+                                                              glong                samples,
+                                                              const GeglRectangle *roi,
+                                                              gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationLightenOnlyLegacy, gimp_operation_lighten_only_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_lighten_only_legacy_class_init (GimpOperationLightenOnlyLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:lighten-only-legacy",
+                                 "description", "GIMP lighten only legacy operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_lighten_only_legacy_process;
+}
+
+static void
+gimp_operation_lighten_only_legacy_init (GimpOperationLightenOnlyLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_lighten_only_legacy_process (GeglOperation       *op,
+                                            void                *in_p,
+                                            void                *layer_p,
+                                            void                *mask_p,
+                                            void                *out_p,
+                                            glong                samples,
+                                            const GeglRectangle *roi,
+                                            gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat ratio = comp_alpha / new_alpha;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = MAX (layer[b], in[b]);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
new file mode 100644
index 0000000..2417d57
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlightenonlylegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__
+#define __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY            (gimp_operation_lighten_only_legacy_get_type ())
+#define GIMP_OPERATION_LIGHTEN_ONLY_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY, GimpOperationLightenOnlyLegacy))
+#define GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY, GimpOperationLightenOnlyLegacyClass))
+#define GIMP_IS_OPERATION_LIGHTEN_ONLY_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY))
+#define GIMP_IS_OPERATION_LIGHTEN_ONLY_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY))
+#define GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY, GimpOperationLightenOnlyLegacyClass))
+
+
+typedef struct _GimpOperationLightenOnlyLegacy      GimpOperationLightenOnlyLegacy;
+typedef struct _GimpOperationLightenOnlyLegacyClass GimpOperationLightenOnlyLegacyClass;
+
+struct _GimpOperationLightenOnlyLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationLightenOnlyLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_lighten_only_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
new file mode 100644
index 0000000..69c63c4
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationmultiplylegacy.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "operations/operations-types.h"
+
+#include "gimpoperationmultiplylegacy.h"
+
+
+static gboolean   gimp_operation_multiply_legacy_process (GeglOperation       *op,
+                                                          void                *in,
+                                                          void                *layer,
+                                                          void                *mask,
+                                                          void                *out,
+                                                          glong                samples,
+                                                          const GeglRectangle *roi,
+                                                          gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationMultiplyLegacy, gimp_operation_multiply_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_multiply_legacy_class_init (GimpOperationMultiplyLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:multiply-legacy",
+                                 "description", "GIMP multiply legacy operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_multiply_legacy_process;
+}
+
+static void
+gimp_operation_multiply_legacy_init (GimpOperationMultiplyLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_multiply_legacy_process (GeglOperation       *op,
+                                        void                *in_p,
+                                        void                *layer_p,
+                                        void                *mask_p,
+                                        void                *out_p,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = layer[b] * in[b];
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
new file mode 100644
index 0000000..f099ebd
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationmultiplylegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_MULTIPLY_LEGACY_H__
+#define __GIMP_OPERATION_MULTIPLY_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_MULTIPLY_LEGACY            (gimp_operation_multiply_legacy_get_type ())
+#define GIMP_OPERATION_MULTIPLY_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_MULTIPLY_LEGACY, GimpOperationMultiplyLegacy))
+#define GIMP_OPERATION_MULTIPLY_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_MULTIPLY_LEGACY, GimpOperationMultiplyLegacyClass))
+#define GIMP_IS_OPERATION_MULTIPLY_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_MULTIPLY_LEGACY))
+#define GIMP_IS_OPERATION_MULTIPLY_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_MULTIPLY_LEGACY))
+#define GIMP_OPERATION_MULTIPLY_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_MULTIPLY_LEGACY, GimpOperationMultiplyLegacyClass))
+
+
+typedef struct _GimpOperationMultiplyLegacy      GimpOperationMultiplyLegacy;
+typedef struct _GimpOperationMultiplyLegacyClass GimpOperationMultiplyLegacyClass;
+
+struct _GimpOperationMultiplyLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationMultiplyLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_multiply_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_MULTIPLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
new file mode 100644
index 0000000..f2ff2fc
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationscreenlegacy.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationscreenlegacy.h"
+
+
+static gboolean   gimp_operation_screen_legacy_process (GeglOperation       *op,
+                                                        void                *in,
+                                                        void                *layer,
+                                                        void                *mask,
+                                                        void                *out,
+                                                        glong                samples,
+                                                        const GeglRectangle *roi,
+                                                        gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationScreenLegacy, gimp_operation_screen_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_screen_legacy_class_init (GimpOperationScreenLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:screen-legacy",
+                                 "description", "GIMP screen mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_screen_legacy_process;
+}
+
+static void
+gimp_operation_screen_legacy_init (GimpOperationScreenLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_screen_legacy_process (GeglOperation       *op,
+                                      void                *in_p,
+                                      void                *layer_p,
+                                      void                *mask_p,
+                                      void                *out_p,
+                                      glong                samples,
+                                      const GeglRectangle *roi,
+                                      gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = 1.0f - (1.0f - in[b]) * (1.0f - layer[b]);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
new file mode 100644
index 0000000..5d0dc9e
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationscreenlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SCREEN_LEGACY_H__
+#define __GIMP_OPERATION_SCREEN_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_SCREEN_LEGACY            (gimp_operation_screen_legacy_get_type ())
+#define GIMP_OPERATION_SCREEN_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SCREEN_LEGACY, GimpOperationScreenLegacy))
+#define GIMP_OPERATION_SCREEN_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SCREEN_LEGACY, GimpOperationScreenLegacyClass))
+#define GIMP_IS_OPERATION_SCREEN_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SCREEN_LEGACY))
+#define GIMP_IS_OPERATION_SCREEN_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SCREEN_LEGACY))
+#define GIMP_OPERATION_SCREEN_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SCREEN_LEGACY, GimpOperationScreenLegacyClass))
+
+
+typedef struct _GimpOperationScreenLegacy      GimpOperationScreenLegacy;
+typedef struct _GimpOperationScreenLegacyClass GimpOperationScreenLegacyClass;
+
+struct _GimpOperationScreenLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationScreenLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_screen_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SCREEN_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c
new file mode 100644
index 0000000..1736e00
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c
@@ -0,0 +1,157 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsoftlightmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationsoftlightlegacy.h"
+
+
+static gboolean   gimp_operation_softlight_legacy_process (GeglOperation       *op,
+                                                           void                *in,
+                                                           void                *layer,
+                                                           void                *mask,
+                                                           void                *out,
+                                                           glong                samples,
+                                                           const GeglRectangle *roi,
+                                                           gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationSoftlightLegacy, gimp_operation_softlight_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static const gchar* reference_xml = "<?xml version='1.0' encoding='UTF-8'?>"
+"<gegl>"
+"<node operation='gimp:softlight-legacy'>"
+"  <node operation='gegl:load'>"
+"    <params>"
+"      <param name='path'>B.png</param>"
+"    </params>"
+"  </node>"
+"</node>"
+"<node operation='gegl:load'>"
+"  <params>"
+"    <param name='path'>A.png</param>"
+"  </params>"
+"</node>"
+"</gegl>";
+
+
+static void
+gimp_operation_softlight_legacy_class_init (GimpOperationSoftlightLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:softlight-legacy",
+                                 "description", "GIMP softlight mode operation",
+                                 "reference-image", "soft-light-mode.png",
+                                 "reference-composition", reference_xml,
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_softlight_legacy_process;
+}
+
+static void
+gimp_operation_softlight_legacy_init (GimpOperationSoftlightLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_softlight_legacy_process (GeglOperation       *op,
+                                         void                *in_p,
+                                         void                *layer_p,
+                                         void                *mask_p,
+                                         void                *out_p,
+                                         glong                samples,
+                                         const GeglRectangle *roi,
+                                         gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+#if 0
+              /* softlight is now used for what GIMP formerly called
+               * OVERLAY.  We fixed OVERLAY to use the right math
+               * (under the name NEW_OVERLAY), and redirect uses of
+               * the old OVERLAY blend mode here. This math was
+               * formerly used for OVERLAY and is exactly the same as
+               * the multiply, screen, comp math used below.
+               * See bug #673501.
+               */
+              gfloat comp = in[b] * (in[b] + (2.0f * layer[b]) * (1.0f - in[b]));
+#endif
+
+              gfloat multiply = in[b] * layer[b];
+              gfloat screen   = 1.0f - (1.0f - in[b]) * (1.0f - layer[b]);
+              gfloat comp     = (1.0f - in[b]) * multiply + in[b] * screen;
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask ++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
new file mode 100644
index 0000000..aa8930e
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsoftlightlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__
+#define __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY            (gimp_operation_softlight_legacy_get_type ())
+#define GIMP_OPERATION_SOFTLIGHT_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY, GimpOperationSoftlightLegacy))
+#define GIMP_OPERATION_SOFTLIGHT_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY, GimpOperationSoftlightLegacyClass))
+#define GIMP_IS_OPERATION_SOFTLIGHT_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY))
+#define GIMP_IS_OPERATION_SOFTLIGHT_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY))
+#define GIMP_OPERATION_SOFTLIGHT_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY, GimpOperationSoftlightLegacyClass))
+
+
+typedef struct _GimpOperationSoftlightLegacy      GimpOperationSoftlightLegacy;
+typedef struct _GimpOperationSoftlightLegacyClass GimpOperationSoftlightLegacyClass;
+
+struct _GimpOperationSoftlightLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationSoftlightLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_softlight_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
new file mode 100644
index 0000000..0bf3b5e
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsubtractmode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationsubtractlegacy.h"
+
+
+static gboolean   gimp_operation_subtract_legacy_process (GeglOperation       *op,
+                                                          void                *in,
+                                                          void                *layer,
+                                                          void                *mask,
+                                                          void                *out,
+                                                          glong                samples,
+                                                          const GeglRectangle *roi,
+                                                          gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationSubtractLegacy, gimp_operation_subtract_legacy,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_subtract_legacy_class_init (GimpOperationSubtractLegacyClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:subtract-legacy",
+                                 "description", "GIMP subtract mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_subtract_legacy_process;
+}
+
+static void
+gimp_operation_subtract_legacy_init (GimpOperationSubtractLegacy *self)
+{
+}
+
+static gboolean
+gimp_operation_subtract_legacy_process (GeglOperation       *op,
+                                        void                *in_p,
+                                        void                *layer_p,
+                                        void                *mask_p,
+                                        void                *out_p,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+
+  while (samples--)
+    {
+      gfloat comp_alpha, new_alpha;
+
+      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      if (mask)
+        comp_alpha *= *mask;
+
+      new_alpha = in[ALPHA] + (1.0f - in[ALPHA]) * comp_alpha;
+
+      if (comp_alpha && new_alpha)
+        {
+          gint   b;
+          gfloat ratio = comp_alpha / new_alpha;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              gfloat comp = in[b] - layer[b];
+              comp = CLAMP (comp, 0.0f, 1.0f);
+
+              out[b] = comp * ratio + in[b] * (1.0f - ratio);
+            }
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in    += 4;
+      layer += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
new file mode 100644
index 0000000..34a55d5
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsubtractlegacy.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SUBTRACT_LEGACY_H__
+#define __GIMP_OPERATION_SUBTRACT_LEGACY_H__
+
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_SUBTRACT_LEGACY            (gimp_operation_subtract_legacy_get_type ())
+#define GIMP_OPERATION_SUBTRACT_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SUBTRACT_LEGACY, GimpOperationSubtractLegacy))
+#define GIMP_OPERATION_SUBTRACT_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SUBTRACT_LEGACY, GimpOperationSubtractLegacyClass))
+#define GIMP_IS_OPERATION_SUBTRACT_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SUBTRACT_LEGACY))
+#define GIMP_IS_OPERATION_SUBTRACT_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SUBTRACT_LEGACY))
+#define GIMP_OPERATION_SUBTRACT_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SUBTRACT_LEGACY, GimpOperationSubtractLegacyClass))
+
+
+typedef struct _GimpOperationSubtractLegacy      GimpOperationSubtractLegacy;
+typedef struct _GimpOperationSubtractLegacyClass GimpOperationSubtractLegacyClass;
+
+struct _GimpOperationSubtractLegacy
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationSubtractLegacyClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_subtract_legacy_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SUBTRACT_LEGACY_H__ */
diff --git a/app/operations/layer-modes/Makefile.am b/app/operations/layer-modes/Makefile.am
new file mode 100644
index 0000000..24af8fe
--- /dev/null
+++ b/app/operations/layer-modes/Makefile.am
@@ -0,0 +1,79 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Layer-Modes\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libapplayermodes-generic.a	\
+	libapplayermodes-sse2.a		\
+	libapplayermodes-sse4.a		\
+	libapplayermodes.a
+
+libapplayermodes_generic_a_sources = \
+	gimp-layer-modes.c			\
+	gimp-layer-modes.h			\
+	\
+	gimpoperationlayermode.c		\
+	gimpoperationlayermode.h		\
+	gimpoperationlayermode-blend.c		\
+	gimpoperationlayermode-blend.h		\
+	gimpoperationlayermode-composite.c	\
+	gimpoperationlayermode-composite.h	\
+	\
+	gimpoperationantierase.c		\
+	gimpoperationantierase.h		\
+	gimpoperationbehind.c			\
+	gimpoperationbehind.h			\
+	gimpoperationdissolve.c			\
+	gimpoperationdissolve.h			\
+	gimpoperationerase.c			\
+	gimpoperationerase.h			\
+	gimpoperationmerge.c			\
+	gimpoperationmerge.h			\
+	gimpoperationnormal.c			\
+	gimpoperationnormal.h			\
+	gimpoperationpassthrough.c		\
+	gimpoperationpassthrough.h		\
+	gimpoperationreplace.c			\
+	gimpoperationreplace.h			\
+	gimpoperationsplit.c			\
+	gimpoperationsplit.h
+
+libapplayermodes_sse2_a_sources = \
+	gimpoperationlayermode-composite-sse2.c	\
+	\
+	gimpoperationnormal-sse2.c
+
+libapplayermodes_sse4_a_sources = \
+	gimpoperationnormal-sse4.c
+
+
+libapplayermodes_generic_a_SOURCES = $(libapplayermodes_generic_a_sources)
+
+libapplayermodes_sse2_a_SOURCES = $(libapplayermodes_sse2_a_sources)
+
+libapplayermodes_sse2_a_CFLAGS = $(SSE2_EXTRA_CFLAGS)
+
+libapplayermodes_sse4_a_SOURCES = $(libapplayermodes_sse4_a_sources)
+
+libapplayermodes_sse4_a_CFLAGS = $(SSE4_1_EXTRA_CFLAGS)
+
+libapplayermodes_a_SOURCES =
+
+
+libapplayermodes.a: libapplayermodes-generic.a \
+                    libapplayermodes-sse2.a \
+                    libapplayermodes-sse4.a
+	$(AR) $(ARFLAGS) libapplayermodes.a \
+	  $(libapplayermodes_generic_a_OBJECTS) \
+	  $(libapplayermodes_sse2_a_OBJECTS) \
+	  $(libapplayermodes_sse4_a_OBJECTS)
+	$(RANLIB) libapplayermodes.a
diff --git a/app/operations/layer-modes/Makefile.in b/app/operations/layer-modes/Makefile.in
new file mode 100644
index 0000000..ad8d4c1
--- /dev/null
+++ b/app/operations/layer-modes/Makefile.in
@@ -0,0 +1,1115 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/operations/layer-modes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapplayermodes_generic_a_AR = $(AR) $(ARFLAGS)
+libapplayermodes_generic_a_LIBADD =
+am__objects_1 = gimp-layer-modes.$(OBJEXT) \
+	gimpoperationlayermode.$(OBJEXT) \
+	gimpoperationlayermode-blend.$(OBJEXT) \
+	gimpoperationlayermode-composite.$(OBJEXT) \
+	gimpoperationantierase.$(OBJEXT) gimpoperationbehind.$(OBJEXT) \
+	gimpoperationdissolve.$(OBJEXT) gimpoperationerase.$(OBJEXT) \
+	gimpoperationmerge.$(OBJEXT) gimpoperationnormal.$(OBJEXT) \
+	gimpoperationpassthrough.$(OBJEXT) \
+	gimpoperationreplace.$(OBJEXT) gimpoperationsplit.$(OBJEXT)
+am_libapplayermodes_generic_a_OBJECTS = $(am__objects_1)
+libapplayermodes_generic_a_OBJECTS =  \
+	$(am_libapplayermodes_generic_a_OBJECTS)
+libapplayermodes_sse2_a_AR = $(AR) $(ARFLAGS)
+libapplayermodes_sse2_a_LIBADD =
+am__objects_2 = libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.$(OBJEXT) \
+	libapplayermodes_sse2_a-gimpoperationnormal-sse2.$(OBJEXT)
+am_libapplayermodes_sse2_a_OBJECTS = $(am__objects_2)
+libapplayermodes_sse2_a_OBJECTS =  \
+	$(am_libapplayermodes_sse2_a_OBJECTS)
+libapplayermodes_sse4_a_AR = $(AR) $(ARFLAGS)
+libapplayermodes_sse4_a_LIBADD =
+am__objects_3 =  \
+	libapplayermodes_sse4_a-gimpoperationnormal-sse4.$(OBJEXT)
+am_libapplayermodes_sse4_a_OBJECTS = $(am__objects_3)
+libapplayermodes_sse4_a_OBJECTS =  \
+	$(am_libapplayermodes_sse4_a_OBJECTS)
+libapplayermodes_a_AR = $(AR) $(ARFLAGS)
+libapplayermodes_a_LIBADD =
+am_libapplayermodes_a_OBJECTS =
+libapplayermodes_a_OBJECTS = $(am_libapplayermodes_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp-layer-modes.Po \
+	./$(DEPDIR)/gimpoperationantierase.Po \
+	./$(DEPDIR)/gimpoperationbehind.Po \
+	./$(DEPDIR)/gimpoperationdissolve.Po \
+	./$(DEPDIR)/gimpoperationerase.Po \
+	./$(DEPDIR)/gimpoperationlayermode-blend.Po \
+	./$(DEPDIR)/gimpoperationlayermode-composite.Po \
+	./$(DEPDIR)/gimpoperationlayermode.Po \
+	./$(DEPDIR)/gimpoperationmerge.Po \
+	./$(DEPDIR)/gimpoperationnormal.Po \
+	./$(DEPDIR)/gimpoperationpassthrough.Po \
+	./$(DEPDIR)/gimpoperationreplace.Po \
+	./$(DEPDIR)/gimpoperationsplit.Po \
+	./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Po \
+	./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Po \
+	./$(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Po
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapplayermodes_generic_a_SOURCES) \
+	$(libapplayermodes_sse2_a_SOURCES) \
+	$(libapplayermodes_sse4_a_SOURCES) \
+	$(libapplayermodes_a_SOURCES)
+DIST_SOURCES = $(libapplayermodes_generic_a_SOURCES) \
+	$(libapplayermodes_sse2_a_SOURCES) \
+	$(libapplayermodes_sse4_a_SOURCES) \
+	$(libapplayermodes_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Layer-Modes\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = \
+	libapplayermodes-generic.a	\
+	libapplayermodes-sse2.a		\
+	libapplayermodes-sse4.a		\
+	libapplayermodes.a
+
+libapplayermodes_generic_a_sources = \
+	gimp-layer-modes.c			\
+	gimp-layer-modes.h			\
+	\
+	gimpoperationlayermode.c		\
+	gimpoperationlayermode.h		\
+	gimpoperationlayermode-blend.c		\
+	gimpoperationlayermode-blend.h		\
+	gimpoperationlayermode-composite.c	\
+	gimpoperationlayermode-composite.h	\
+	\
+	gimpoperationantierase.c		\
+	gimpoperationantierase.h		\
+	gimpoperationbehind.c			\
+	gimpoperationbehind.h			\
+	gimpoperationdissolve.c			\
+	gimpoperationdissolve.h			\
+	gimpoperationerase.c			\
+	gimpoperationerase.h			\
+	gimpoperationmerge.c			\
+	gimpoperationmerge.h			\
+	gimpoperationnormal.c			\
+	gimpoperationnormal.h			\
+	gimpoperationpassthrough.c		\
+	gimpoperationpassthrough.h		\
+	gimpoperationreplace.c			\
+	gimpoperationreplace.h			\
+	gimpoperationsplit.c			\
+	gimpoperationsplit.h
+
+libapplayermodes_sse2_a_sources = \
+	gimpoperationlayermode-composite-sse2.c	\
+	\
+	gimpoperationnormal-sse2.c
+
+libapplayermodes_sse4_a_sources = \
+	gimpoperationnormal-sse4.c
+
+libapplayermodes_generic_a_SOURCES = $(libapplayermodes_generic_a_sources)
+libapplayermodes_sse2_a_SOURCES = $(libapplayermodes_sse2_a_sources)
+libapplayermodes_sse2_a_CFLAGS = $(SSE2_EXTRA_CFLAGS)
+libapplayermodes_sse4_a_SOURCES = $(libapplayermodes_sse4_a_sources)
+libapplayermodes_sse4_a_CFLAGS = $(SSE4_1_EXTRA_CFLAGS)
+libapplayermodes_a_SOURCES = 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/operations/layer-modes/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/operations/layer-modes/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapplayermodes-generic.a: $(libapplayermodes_generic_a_OBJECTS) $(libapplayermodes_generic_a_DEPENDENCIES) $(EXTRA_libapplayermodes_generic_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapplayermodes-generic.a
+	$(AM_V_AR)$(libapplayermodes_generic_a_AR) libapplayermodes-generic.a $(libapplayermodes_generic_a_OBJECTS) $(libapplayermodes_generic_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapplayermodes-generic.a
+
+libapplayermodes-sse2.a: $(libapplayermodes_sse2_a_OBJECTS) $(libapplayermodes_sse2_a_DEPENDENCIES) $(EXTRA_libapplayermodes_sse2_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapplayermodes-sse2.a
+	$(AM_V_AR)$(libapplayermodes_sse2_a_AR) libapplayermodes-sse2.a $(libapplayermodes_sse2_a_OBJECTS) $(libapplayermodes_sse2_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapplayermodes-sse2.a
+
+libapplayermodes-sse4.a: $(libapplayermodes_sse4_a_OBJECTS) $(libapplayermodes_sse4_a_DEPENDENCIES) $(EXTRA_libapplayermodes_sse4_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapplayermodes-sse4.a
+	$(AM_V_AR)$(libapplayermodes_sse4_a_AR) libapplayermodes-sse4.a $(libapplayermodes_sse4_a_OBJECTS) $(libapplayermodes_sse4_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapplayermodes-sse4.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-layer-modes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationantierase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationbehind.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationdissolve.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationerase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationlayermode-blend.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationlayermode-composite.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationlayermode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationmerge.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationnormal.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationpassthrough.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationreplace.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationsplit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.o: gimpoperationlayermode-composite-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -MT libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.o -MD -MP -MF $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Tpo -c -o libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.o `test -f 'gimpoperationlayermode-composite-sse2.c' || echo '$(srcdir)/'`gimpoperationlayermode-composite-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Tpo $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimpoperationlayermode-composite-sse2.c' object='libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -c -o libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.o `test -f 'gimpoperationlayermode-composite-sse2.c' || echo '$(srcdir)/'`gimpoperationlayermode-composite-sse2.c
+
+libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.obj: gimpoperationlayermode-composite-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -MT libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.obj -MD -MP -MF $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Tpo -c -o libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.obj `if test -f 'gimpoperationlayermode-composite-sse2.c'; then $(CYGPATH_W) 'gimpoperationlayermode-composite-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimpoperationlayermode-composite-sse2.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Tpo $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimpoperationlayermode-composite-sse2.c' object='libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -c -o libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.obj `if test -f 'gimpoperationlayermode-composite-sse2.c'; then $(CYGPATH_W) 'gimpoperationlayermode-composite-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimpoperationlayermode-composite-sse2.c'; fi`
+
+libapplayermodes_sse2_a-gimpoperationnormal-sse2.o: gimpoperationnormal-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -MT libapplayermodes_sse2_a-gimpoperationnormal-sse2.o -MD -MP -MF $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Tpo -c -o libapplayermodes_sse2_a-gimpoperationnormal-sse2.o `test -f 'gimpoperationnormal-sse2.c' || echo '$(srcdir)/'`gimpoperationnormal-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Tpo $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimpoperationnormal-sse2.c' object='libapplayermodes_sse2_a-gimpoperationnormal-sse2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -c -o libapplayermodes_sse2_a-gimpoperationnormal-sse2.o `test -f 'gimpoperationnormal-sse2.c' || echo '$(srcdir)/'`gimpoperationnormal-sse2.c
+
+libapplayermodes_sse2_a-gimpoperationnormal-sse2.obj: gimpoperationnormal-sse2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -MT libapplayermodes_sse2_a-gimpoperationnormal-sse2.obj -MD -MP -MF $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Tpo -c -o libapplayermodes_sse2_a-gimpoperationnormal-sse2.obj `if test -f 'gimpoperationnormal-sse2.c'; then $(CYGPATH_W) 'gimpoperationnormal-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimpoperationnormal-sse2.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Tpo $(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimpoperationnormal-sse2.c' object='libapplayermodes_sse2_a-gimpoperationnormal-sse2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse2_a_CFLAGS) $(CFLAGS) -c -o libapplayermodes_sse2_a-gimpoperationnormal-sse2.obj `if test -f 'gimpoperationnormal-sse2.c'; then $(CYGPATH_W) 'gimpoperationnormal-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimpoperationnormal-sse2.c'; fi`
+
+libapplayermodes_sse4_a-gimpoperationnormal-sse4.o: gimpoperationnormal-sse4.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse4_a_CFLAGS) $(CFLAGS) -MT libapplayermodes_sse4_a-gimpoperationnormal-sse4.o -MD -MP -MF $(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Tpo -c -o libapplayermodes_sse4_a-gimpoperationnormal-sse4.o `test -f 'gimpoperationnormal-sse4.c' || echo '$(srcdir)/'`gimpoperationnormal-sse4.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Tpo $(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimpoperationnormal-sse4.c' object='libapplayermodes_sse4_a-gimpoperationnormal-sse4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse4_a_CFLAGS) $(CFLAGS) -c -o libapplayermodes_sse4_a-gimpoperationnormal-sse4.o `test -f 'gimpoperationnormal-sse4.c' || echo '$(srcdir)/'`gimpoperationnormal-sse4.c
+
+libapplayermodes_sse4_a-gimpoperationnormal-sse4.obj: gimpoperationnormal-sse4.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse4_a_CFLAGS) $(CFLAGS) -MT libapplayermodes_sse4_a-gimpoperationnormal-sse4.obj -MD -MP -MF $(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Tpo -c -o libapplayermodes_sse4_a-gimpoperationnormal-sse4.obj `if test -f 'gimpoperationnormal-sse4.c'; then $(CYGPATH_W) 'gimpoperationnormal-sse4.c'; else $(CYGPATH_W) '$(srcdir)/gimpoperationnormal-sse4.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Tpo $(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimpoperationnormal-sse4.c' object='libapplayermodes_sse4_a-gimpoperationnormal-sse4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplayermodes_sse4_a_CFLAGS) $(CFLAGS) -c -o libapplayermodes_sse4_a-gimpoperationnormal-sse4.obj `if test -f 'gimpoperationnormal-sse4.c'; then $(CYGPATH_W) 'gimpoperationnormal-sse4.c'; else $(CYGPATH_W) '$(srcdir)/gimpoperationnormal-sse4.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimp-layer-modes.Po
+	-rm -f ./$(DEPDIR)/gimpoperationantierase.Po
+	-rm -f ./$(DEPDIR)/gimpoperationbehind.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdissolve.Po
+	-rm -f ./$(DEPDIR)/gimpoperationerase.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlayermode-blend.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlayermode-composite.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlayermode.Po
+	-rm -f ./$(DEPDIR)/gimpoperationmerge.Po
+	-rm -f ./$(DEPDIR)/gimpoperationnormal.Po
+	-rm -f ./$(DEPDIR)/gimpoperationpassthrough.Po
+	-rm -f ./$(DEPDIR)/gimpoperationreplace.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsplit.Po
+	-rm -f ./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Po
+	-rm -f ./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Po
+	-rm -f ./$(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimp-layer-modes.Po
+	-rm -f ./$(DEPDIR)/gimpoperationantierase.Po
+	-rm -f ./$(DEPDIR)/gimpoperationbehind.Po
+	-rm -f ./$(DEPDIR)/gimpoperationdissolve.Po
+	-rm -f ./$(DEPDIR)/gimpoperationerase.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlayermode-blend.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlayermode-composite.Po
+	-rm -f ./$(DEPDIR)/gimpoperationlayermode.Po
+	-rm -f ./$(DEPDIR)/gimpoperationmerge.Po
+	-rm -f ./$(DEPDIR)/gimpoperationnormal.Po
+	-rm -f ./$(DEPDIR)/gimpoperationpassthrough.Po
+	-rm -f ./$(DEPDIR)/gimpoperationreplace.Po
+	-rm -f ./$(DEPDIR)/gimpoperationsplit.Po
+	-rm -f ./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationlayermode-composite-sse2.Po
+	-rm -f ./$(DEPDIR)/libapplayermodes_sse2_a-gimpoperationnormal-sse2.Po
+	-rm -f ./$(DEPDIR)/libapplayermodes_sse4_a-gimpoperationnormal-sse4.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+libapplayermodes.a: libapplayermodes-generic.a \
+                    libapplayermodes-sse2.a \
+                    libapplayermodes-sse4.a
+	$(AR) $(ARFLAGS) libapplayermodes.a \
+	  $(libapplayermodes_generic_a_OBJECTS) \
+	  $(libapplayermodes_sse2_a_OBJECTS) \
+	  $(libapplayermodes_sse4_a_OBJECTS)
+	$(RANLIB) libapplayermodes.a
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
new file mode 100644
index 0000000..deb1f3d
--- /dev/null
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -0,0 +1,1522 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-layer-modes.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *                    Øyvind Kolås <pippin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <gegl.h>
+
+#include "../operations-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimpoperationlayermode.h"
+#include "gimpoperationlayermode-blend.h"
+
+#include "gimp-layer-modes.h"
+
+
+typedef struct _GimpLayerModeInfo GimpLayerModeInfo;
+
+struct _GimpLayerModeInfo
+{
+  GimpLayerMode             layer_mode;
+  const gchar              *op_name;
+  GimpLayerModeBlendFunc    blend_function;
+  GimpLayerModeFlags        flags;
+  GimpLayerModeContext      context;
+  GimpLayerCompositeMode    paint_composite_mode;
+  GimpLayerCompositeMode    composite_mode;
+  GimpLayerColorSpace       composite_space;
+  GimpLayerColorSpace       blend_space;
+};
+
+
+/*  static variables  */
+
+static const GimpLayerModeInfo layer_mode_infos[] =
+{
+  { GIMP_LAYER_MODE_NORMAL_LEGACY,
+
+    .op_name              = "gimp:normal",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE  |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DISSOLVE,
+
+    .op_name              = "gimp:dissolve",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION
+  },
+
+  { GIMP_LAYER_MODE_BEHIND_LEGACY,
+
+    .op_name              = "gimp:behind",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_PAINT |
+                            GIMP_LAYER_MODE_CONTEXT_FILTER,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_MULTIPLY_LEGACY,
+
+    .op_name              = "gimp:multiply-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_SCREEN_LEGACY,
+
+    .op_name              = "gimp:screen-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_OVERLAY_LEGACY,
+
+    .op_name              = "gimp:softlight-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
+
+    .op_name              = "gimp:difference-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_ADDITION_LEGACY,
+
+    .op_name              = "gimp:addition-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_SUBTRACT_LEGACY,
+
+    .op_name              = "gimp:subtract-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
+
+    .op_name              = "gimp:darken-only-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+
+    .op_name              = "gimp:lighten-only-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+
+    .op_name              = "gimp:hsv-hue-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+
+    .op_name              = "gimp:hsv-saturation-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSL_COLOR_LEGACY,
+
+    .op_name              = "gimp:hsl-color-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
+
+    .op_name              = "gimp:hsv-value-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DIVIDE_LEGACY,
+
+    .op_name              = "gimp:divide-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DODGE_LEGACY,
+
+    .op_name              = "gimp:dodge-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_BURN_LEGACY,
+
+    .op_name              = "gimp:burn-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
+
+    .op_name              = "gimp:hardlight-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+
+    .op_name              = "gimp:softlight-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+
+    .op_name              = "gimp:grain-extract-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
+
+    .op_name              = "gimp:grain-merge-legacy",
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_COLOR_ERASE_LEGACY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_color_erase,
+    .flags                = GIMP_LAYER_MODE_FLAG_LEGACY                    |
+                            GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE  |
+                            GIMP_LAYER_MODE_FLAG_SUBTRACTIVE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_PAINT |
+                            GIMP_LAYER_MODE_CONTEXT_FILTER,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_OVERLAY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_overlay,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LCH_HUE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_lch_hue,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_LAB
+  },
+
+  { GIMP_LAYER_MODE_LCH_CHROMA,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_lch_chroma,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_LAB
+  },
+
+  { GIMP_LAYER_MODE_LCH_COLOR,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_lch_color,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_LAB
+  },
+
+  { GIMP_LAYER_MODE_LCH_LIGHTNESS,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_lch_lightness,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_LAB
+  },
+
+  { GIMP_LAYER_MODE_NORMAL,
+
+    .op_name              = "gimp:normal",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_BEHIND,
+
+    .op_name              = "gimp:behind",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_PAINT |
+                            GIMP_LAYER_MODE_CONTEXT_FILTER,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_MULTIPLY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_multiply,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_SCREEN,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_screen,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DIFFERENCE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_difference,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_ADDITION,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_addition,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_SUBTRACT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_subtract,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_DARKEN_ONLY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_darken_only,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+    /* no blend_space: reuse composite space, no conversion thus fewer copies */
+  },
+
+  { GIMP_LAYER_MODE_LIGHTEN_ONLY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_lighten_only,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+    /* no blend_space: reuse composite space, no conversion thus fewer copies */
+  },
+
+  { GIMP_LAYER_MODE_HSV_HUE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_hsv_hue,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSV_SATURATION,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_hsv_saturation,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSL_COLOR,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_hsl_color,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HSV_VALUE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_hsv_value,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_DIVIDE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_divide,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_DODGE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_dodge,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_BURN,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_burn,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HARDLIGHT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_hardlight,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_SOFTLIGHT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_softlight,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_GRAIN_EXTRACT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_grain_extract,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_GRAIN_MERGE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_grain_merge,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_VIVID_LIGHT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_vivid_light,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_PIN_LIGHT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_pin_light,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LINEAR_LIGHT,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_linear_light,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_HARD_MIX,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_hard_mix,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_EXCLUSION,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_exclusion,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LINEAR_BURN,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_linear_burn,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_luma_darken_only,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_luma_lighten_only,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
+  },
+
+  { GIMP_LAYER_MODE_LUMINANCE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_luminance,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_COLOR_ERASE,
+
+    .op_name              = "gimp:layer-mode",
+    .blend_function       = gimp_operation_layer_mode_blend_color_erase,
+    .flags                = GIMP_LAYER_MODE_FLAG_SUBTRACTIVE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_ERASE,
+
+    .op_name              = "gimp:erase",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_SUBTRACTIVE           |
+                            GIMP_LAYER_MODE_FLAG_ALPHA_ONLY            |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_MERGE,
+
+    .op_name              = "gimp:merge",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_SPLIT,
+
+    .op_name              = "gimp:split",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_SUBTRACTIVE               |
+                            GIMP_LAYER_MODE_FLAG_ALPHA_ONLY                |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP
+  },
+
+  { GIMP_LAYER_MODE_PASS_THROUGH,
+
+    .op_name              = "gimp:pass-through",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE    |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_GROUP,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_REPLACE,
+
+    .op_name              = "gimp:replace",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_TRIVIAL,
+    .context              = GIMP_LAYER_MODE_CONTEXT_FILTER,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
+  { GIMP_LAYER_MODE_ANTI_ERASE,
+
+    .op_name              = "gimp:anti-erase",
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
+                            GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
+                            GIMP_LAYER_MODE_FLAG_ALPHA_ONLY,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_UNION
+  }
+};
+
+static const GimpLayerMode layer_mode_group_default[] =
+{
+  GIMP_LAYER_MODE_PASS_THROUGH,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_REPLACE,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_NORMAL,
+  GIMP_LAYER_MODE_DISSOLVE,
+  GIMP_LAYER_MODE_BEHIND,
+  GIMP_LAYER_MODE_COLOR_ERASE,
+  GIMP_LAYER_MODE_ERASE,
+  GIMP_LAYER_MODE_ANTI_ERASE,
+  GIMP_LAYER_MODE_MERGE,
+  GIMP_LAYER_MODE_SPLIT,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_LIGHTEN_ONLY,
+  GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,
+  GIMP_LAYER_MODE_SCREEN,
+  GIMP_LAYER_MODE_DODGE,
+  GIMP_LAYER_MODE_ADDITION,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_DARKEN_ONLY,
+  GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,
+  GIMP_LAYER_MODE_MULTIPLY,
+  GIMP_LAYER_MODE_BURN,
+  GIMP_LAYER_MODE_LINEAR_BURN,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_OVERLAY,
+  GIMP_LAYER_MODE_SOFTLIGHT,
+  GIMP_LAYER_MODE_HARDLIGHT,
+  GIMP_LAYER_MODE_VIVID_LIGHT,
+  GIMP_LAYER_MODE_PIN_LIGHT,
+  GIMP_LAYER_MODE_LINEAR_LIGHT,
+  GIMP_LAYER_MODE_HARD_MIX,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_DIFFERENCE,
+  GIMP_LAYER_MODE_EXCLUSION,
+  GIMP_LAYER_MODE_SUBTRACT,
+  GIMP_LAYER_MODE_GRAIN_EXTRACT,
+  GIMP_LAYER_MODE_GRAIN_MERGE,
+  GIMP_LAYER_MODE_DIVIDE,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_HSV_HUE,
+  GIMP_LAYER_MODE_HSV_SATURATION,
+  GIMP_LAYER_MODE_HSL_COLOR,
+  GIMP_LAYER_MODE_HSV_VALUE,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_LCH_HUE,
+  GIMP_LAYER_MODE_LCH_CHROMA,
+  GIMP_LAYER_MODE_LCH_COLOR,
+  GIMP_LAYER_MODE_LCH_LIGHTNESS,
+  GIMP_LAYER_MODE_LUMINANCE
+};
+
+static const GimpLayerMode layer_mode_group_legacy[] =
+{
+  GIMP_LAYER_MODE_NORMAL_LEGACY,
+  GIMP_LAYER_MODE_DISSOLVE,
+  GIMP_LAYER_MODE_BEHIND_LEGACY,
+  GIMP_LAYER_MODE_COLOR_ERASE_LEGACY,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
+  GIMP_LAYER_MODE_SCREEN_LEGACY,
+  GIMP_LAYER_MODE_DODGE_LEGACY,
+  GIMP_LAYER_MODE_ADDITION_LEGACY,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
+  GIMP_LAYER_MODE_MULTIPLY_LEGACY,
+  GIMP_LAYER_MODE_BURN_LEGACY,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_OVERLAY,
+  GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
+  GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
+  GIMP_LAYER_MODE_SUBTRACT_LEGACY,
+  GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+  GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
+  GIMP_LAYER_MODE_DIVIDE_LEGACY,
+
+  GIMP_LAYER_MODE_SEPARATOR,
+
+  GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+  GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+  GIMP_LAYER_MODE_HSL_COLOR_LEGACY,
+  GIMP_LAYER_MODE_HSV_VALUE_LEGACY
+};
+
+static const GimpLayerMode layer_mode_groups[][2] =
+{
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_NORMAL,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_NORMAL_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DISSOLVE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_DISSOLVE
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_BEHIND,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_BEHIND_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_MULTIPLY,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_MULTIPLY_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_SCREEN,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_SCREEN_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_OVERLAY,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DIFFERENCE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_DIFFERENCE_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_ADDITION,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_ADDITION_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_SUBTRACT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_SUBTRACT_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DARKEN_ONLY,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_LIGHTEN_ONLY,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSV_HUE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSV_HUE_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSV_SATURATION,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSL_COLOR,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSL_COLOR_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSV_VALUE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSV_VALUE_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DIVIDE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_DIVIDE_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DODGE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_DODGE_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_BURN,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_BURN_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HARDLIGHT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HARDLIGHT_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_SOFTLIGHT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_GRAIN_EXTRACT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_GRAIN_MERGE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_COLOR_ERASE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_COLOR_ERASE_LEGACY,
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_VIVID_LIGHT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_PIN_LIGHT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_LINEAR_LIGHT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HARD_MIX,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_EXCLUSION,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_LINEAR_BURN,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_LUMINANCE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_ERASE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_MERGE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_SPLIT,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_PASS_THROUGH,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1,
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_REPLACE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  },
+
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_ANTI_ERASE,
+    [GIMP_LAYER_MODE_GROUP_LEGACY ] = -1
+  }
+};
+
+
+/*  public functions  */
+
+void
+gimp_layer_modes_init (void)
+{
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (layer_mode_infos); i++)
+    {
+      gimp_assert ((GimpLayerMode) i == layer_mode_infos[i].layer_mode);
+    }
+}
+
+static const GimpLayerModeInfo *
+gimp_layer_mode_info (GimpLayerMode mode)
+{
+  g_return_val_if_fail (mode >= 0 && mode < G_N_ELEMENTS (layer_mode_infos),
+                        &layer_mode_infos[0]);
+
+  return &layer_mode_infos[mode];
+}
+
+gboolean
+gimp_layer_mode_is_legacy (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_LEGACY) != 0;
+}
+
+gboolean
+gimp_layer_mode_is_blend_space_mutable (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE) == 0;
+}
+
+gboolean
+gimp_layer_mode_is_composite_space_mutable (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE) == 0;
+}
+
+gboolean
+gimp_layer_mode_is_composite_mode_mutable (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE) == 0;
+}
+
+gboolean
+gimp_layer_mode_is_subtractive (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_SUBTRACTIVE) != 0;
+}
+
+gboolean
+gimp_layer_mode_is_alpha_only (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_ALPHA_ONLY) != 0;
+}
+
+gboolean
+gimp_layer_mode_is_trivial (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return FALSE;
+
+  return (info->flags & GIMP_LAYER_MODE_FLAG_TRIVIAL) != 0;
+}
+
+GimpLayerColorSpace
+gimp_layer_mode_get_blend_space (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
+
+  return info->blend_space;
+}
+
+GimpLayerColorSpace
+gimp_layer_mode_get_composite_space (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
+
+  return info->composite_space;
+}
+
+GimpLayerCompositeMode
+gimp_layer_mode_get_composite_mode (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return GIMP_LAYER_COMPOSITE_UNION;
+
+  return info->composite_mode;
+}
+
+GimpLayerCompositeMode
+gimp_layer_mode_get_paint_composite_mode (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return GIMP_LAYER_COMPOSITE_UNION;
+
+  return info->paint_composite_mode;
+}
+
+const gchar *
+gimp_layer_mode_get_operation (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return "gimp:layer-mode";
+
+  return info->op_name;
+}
+
+GimpLayerModeFunc
+gimp_layer_mode_get_function (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo  *info = gimp_layer_mode_info (mode);
+  static GimpLayerModeFunc  funcs[G_N_ELEMENTS (layer_mode_infos)];
+
+  if (! info)
+    info = layer_mode_infos;
+
+  mode = info - layer_mode_infos;
+
+  if (! funcs[mode])
+    {
+      GeglNode      *node;
+      GeglOperation *operation;
+
+      node = gegl_node_new_child (NULL,
+                                  "operation", info->op_name,
+                                  NULL);
+
+      operation = gegl_node_get_gegl_operation (node);
+
+      funcs[mode] = GIMP_OPERATION_LAYER_MODE_GET_CLASS (operation)->process;
+
+      g_object_unref (node);
+    }
+
+  return funcs[mode];
+}
+
+GimpLayerModeBlendFunc
+gimp_layer_mode_get_blend_function (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return NULL;
+
+  return info->blend_function;
+}
+
+GimpLayerModeContext
+gimp_layer_mode_get_context (GimpLayerMode mode)
+{
+  const GimpLayerModeInfo *info = gimp_layer_mode_info (mode);
+
+  if (! info)
+    return 0;
+
+  return info->context;
+}
+
+GimpLayerMode *
+gimp_layer_mode_get_context_array (GimpLayerMode         mode,
+                                   GimpLayerModeContext  context,
+                                   gint                 *n_modes)
+{
+  GimpLayerModeGroup   group;
+  const GimpLayerMode *group_modes;
+  gint                 n_group_modes;
+  GimpLayerMode       *array;
+  gint                 i;
+
+  group = gimp_layer_mode_get_group (mode);
+
+  group_modes = gimp_layer_mode_get_group_array (group, &n_group_modes);
+
+  array = g_new0 (GimpLayerMode, n_group_modes);
+  *n_modes = 0;
+
+  for (i = 0; i < n_group_modes; i++)
+    {
+      if (group_modes[i] != GIMP_LAYER_MODE_SEPARATOR &&
+          (gimp_layer_mode_get_context (group_modes[i]) & context))
+        {
+          array[*n_modes] = group_modes[i];
+          (*n_modes)++;
+        }
+    }
+
+  return array;
+}
+
+static gboolean
+is_mode_in_array (const GimpLayerMode *modes,
+                  gint                 n_modes,
+                  GimpLayerMode        mode)
+{
+  gint i;
+
+  for (i = 0; i < n_modes; i++)
+    {
+      if (modes[i] == mode)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+GimpLayerModeGroup
+gimp_layer_mode_get_group (GimpLayerMode mode)
+{
+  if (is_mode_in_array (layer_mode_group_default,
+                        G_N_ELEMENTS (layer_mode_group_default), mode))
+    {
+      return GIMP_LAYER_MODE_GROUP_DEFAULT;
+    }
+  else if (is_mode_in_array (layer_mode_group_legacy,
+                             G_N_ELEMENTS (layer_mode_group_legacy), mode))
+    {
+      return GIMP_LAYER_MODE_GROUP_LEGACY;
+    }
+
+  return GIMP_LAYER_MODE_GROUP_DEFAULT;
+}
+
+const GimpLayerMode *
+gimp_layer_mode_get_group_array (GimpLayerModeGroup  group,
+                                 gint               *n_modes)
+{
+  g_return_val_if_fail (n_modes != NULL, NULL);
+
+  switch (group)
+    {
+    case GIMP_LAYER_MODE_GROUP_DEFAULT:
+      *n_modes = G_N_ELEMENTS (layer_mode_group_default);
+      return layer_mode_group_default;
+
+    case GIMP_LAYER_MODE_GROUP_LEGACY:
+      *n_modes = G_N_ELEMENTS (layer_mode_group_legacy);
+      return layer_mode_group_legacy;
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+}
+
+gboolean
+gimp_layer_mode_get_for_group (GimpLayerMode       old_mode,
+                               GimpLayerModeGroup  new_group,
+                               GimpLayerMode      *new_mode)
+{
+  gint i;
+
+  g_return_val_if_fail (new_mode != NULL, FALSE);
+
+  for (i = 0; i < G_N_ELEMENTS (layer_mode_groups); i++)
+    {
+      if (is_mode_in_array (layer_mode_groups[i], 2, old_mode))
+        {
+          *new_mode = layer_mode_groups[i][new_group];
+
+          if (*new_mode != -1)
+            return TRUE;
+
+          return FALSE;
+        }
+    }
+
+  *new_mode = -1;
+
+  return FALSE;
+}
+
+const Babl *
+gimp_layer_mode_get_format (GimpLayerMode           mode,
+                            GimpLayerColorSpace     blend_space,
+                            GimpLayerColorSpace     composite_space,
+                            GimpLayerCompositeMode  composite_mode,
+                            const Babl             *preferred_format)
+{
+  GimpLayerCompositeRegion composite_region;
+
+  /* for now, all modes perform i/o in the composite space. */
+  (void) mode;
+  (void) blend_space;
+
+  if (composite_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+    composite_space = gimp_layer_mode_get_composite_space (mode);
+
+  if (composite_mode == GIMP_LAYER_COMPOSITE_AUTO)
+    composite_mode = gimp_layer_mode_get_composite_mode (mode);
+
+  composite_region = gimp_layer_mode_get_included_region (mode, composite_mode);
+
+  if (gimp_layer_mode_is_alpha_only (mode))
+    {
+      if (composite_region != GIMP_LAYER_COMPOSITE_REGION_UNION)
+        {
+          /* alpha-only layer modes don't combine colors in non-union composite
+           * modes, hence we can disregard the composite space.
+           */
+          composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+        }
+    }
+  else if (gimp_layer_mode_is_trivial (mode))
+    {
+      if (! (composite_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION))
+        {
+          /* trivial layer modes don't combine colors when only the source
+           * region is included, hence we can disregard the composite space.
+           */
+          composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+        }
+    }
+
+  switch (composite_space)
+    {
+    case GIMP_LAYER_COLOR_SPACE_AUTO:
+      /* compositing is color-space agnostic.  return a format that has a fast
+       * conversion path to/from the preferred format.
+       */
+      if (! preferred_format || gimp_babl_format_get_linear (preferred_format))
+        return babl_format ("RGBA float");
+      else
+        return babl_format ("R'G'B'A float");
+
+    case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
+      return babl_format ("RGBA float");
+
+    case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
+      return babl_format ("R'G'B'A float");
+
+    case GIMP_LAYER_COLOR_SPACE_LAB:
+      return babl_format ("CIE Lab alpha float");
+    }
+
+  g_return_val_if_reached (babl_format ("RGBA float"));
+}
+
+GimpLayerCompositeRegion
+gimp_layer_mode_get_included_region (GimpLayerMode          mode,
+                                     GimpLayerCompositeMode composite_mode)
+{
+  if (composite_mode == GIMP_LAYER_COMPOSITE_AUTO)
+    composite_mode = gimp_layer_mode_get_composite_mode (mode);
+
+  switch (composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+      return GIMP_LAYER_COMPOSITE_REGION_UNION;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+      return GIMP_LAYER_COMPOSITE_REGION_DESTINATION;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      return GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      return GIMP_LAYER_COMPOSITE_REGION_INTERSECTION;
+
+    default:
+      g_return_val_if_reached (GIMP_LAYER_COMPOSITE_REGION_INTERSECTION);
+    }
+}
diff --git a/app/operations/layer-modes/gimp-layer-modes.h b/app/operations/layer-modes/gimp-layer-modes.h
new file mode 100644
index 0000000..30c5e15
--- /dev/null
+++ b/app/operations/layer-modes/gimp-layer-modes.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-layer-modes.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *                    Øyvind Kolås <pippin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_MODES_H__
+#define __GIMP_LAYER_MODES_H__
+
+
+void                       gimp_layer_modes_init                      (void);
+
+gboolean                   gimp_layer_mode_is_legacy                  (GimpLayerMode           mode);
+
+gboolean                   gimp_layer_mode_is_blend_space_mutable     (GimpLayerMode           mode);
+gboolean                   gimp_layer_mode_is_composite_space_mutable (GimpLayerMode           mode);
+gboolean                   gimp_layer_mode_is_composite_mode_mutable  (GimpLayerMode           mode);
+
+gboolean                   gimp_layer_mode_is_subtractive             (GimpLayerMode           mode);
+gboolean                   gimp_layer_mode_is_alpha_only              (GimpLayerMode           mode);
+gboolean                   gimp_layer_mode_is_trivial                 (GimpLayerMode           mode);
+
+GimpLayerColorSpace        gimp_layer_mode_get_blend_space            (GimpLayerMode           mode);
+GimpLayerColorSpace        gimp_layer_mode_get_composite_space        (GimpLayerMode           mode);
+GimpLayerCompositeMode     gimp_layer_mode_get_composite_mode         (GimpLayerMode           mode);
+GimpLayerCompositeMode     gimp_layer_mode_get_paint_composite_mode   (GimpLayerMode           mode);
+
+const gchar              * gimp_layer_mode_get_operation              (GimpLayerMode           mode);
+
+GimpLayerModeFunc          gimp_layer_mode_get_function               (GimpLayerMode           mode);
+GimpLayerModeBlendFunc     gimp_layer_mode_get_blend_function         (GimpLayerMode           mode);
+
+GimpLayerModeContext       gimp_layer_mode_get_context                (GimpLayerMode           mode);
+
+GimpLayerMode            * gimp_layer_mode_get_context_array          (GimpLayerMode           mode,
+                                                                       GimpLayerModeContext    context,
+                                                                       gint                   *n_modes);
+
+GimpLayerModeGroup         gimp_layer_mode_get_group                  (GimpLayerMode           mode);
+
+const GimpLayerMode      * gimp_layer_mode_get_group_array            (GimpLayerModeGroup      group,
+                                                                       gint                   *n_modes);
+
+gboolean                   gimp_layer_mode_get_for_group              (GimpLayerMode           old_mode,
+                                                                       GimpLayerModeGroup      new_group,
+                                                                       GimpLayerMode          *new_mode);
+
+const Babl               * gimp_layer_mode_get_format                 (GimpLayerMode           mode,
+                                                                       GimpLayerColorSpace     blend_space,
+                                                                       GimpLayerColorSpace     composite_space,
+                                                                       GimpLayerCompositeMode  composite_mode,
+                                                                       const Babl             *preferred_format);
+
+GimpLayerCompositeRegion   gimp_layer_mode_get_included_region        (GimpLayerMode           mode,
+                                                                       GimpLayerCompositeMode  composite_mode);
+
+
+#endif /* __GIMP_LAYER_MODES_H__ */
diff --git a/app/operations/layer-modes/gimpoperationantierase.c b/app/operations/layer-modes/gimpoperationantierase.c
new file mode 100644
index 0000000..3fb2947
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationantierase.c
@@ -0,0 +1,188 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationantierase.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationantierase.h"
+
+
+
+static gboolean                   gimp_operation_anti_erase_process             (GeglOperation          *op,
+                                                                                 void                   *in,
+                                                                                 void                   *layer,
+                                                                                 void                   *mask,
+                                                                                 void                   *out,
+                                                                                 glong                   samples,
+                                                                                 const GeglRectangle    *roi,
+                                                                                 gint                    level);
+static GimpLayerCompositeRegion   gimp_operation_anti_erase_get_affected_region (GimpOperationLayerMode *layer_mode);
+
+
+G_DEFINE_TYPE (GimpOperationAntiErase, gimp_operation_anti_erase,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_anti_erase_class_init (GimpOperationAntiEraseClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:anti-erase",
+                                 "description", "GIMP anti erase mode operation",
+                                 NULL);
+
+  layer_mode_class->process             = gimp_operation_anti_erase_process;
+  layer_mode_class->get_affected_region = gimp_operation_anti_erase_get_affected_region;
+}
+
+static void
+gimp_operation_anti_erase_init (GimpOperationAntiErase *self)
+{
+}
+
+static gboolean
+gimp_operation_anti_erase_process (GeglOperation       *op,
+                                   void                *in_p,
+                                   void                *layer_p,
+                                   void                *mask_p,
+                                   void                *out_p,
+                                   glong                samples,
+                                   const GeglRectangle *roi,
+                                   gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat value = opacity;
+          gint   b;
+
+          if (has_mask)
+            value *= *mask;
+
+          out[ALPHA] = in[ALPHA] + (1.0 - in[ALPHA]) * layer[ALPHA] * value;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+      while (samples--)
+        {
+          gint b;
+
+          out[ALPHA] = in[ALPHA];
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          in  += 4;
+          out += 4;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat value = opacity;
+          gint   b;
+
+          if (has_mask)
+            value *= *mask;
+
+          out[ALPHA] = layer[ALPHA] * value;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      while (samples--)
+        {
+          gfloat value = opacity;
+          gint   b;
+
+          if (has_mask)
+            value *= *mask;
+
+          out[ALPHA] = in[ALPHA] * layer[ALPHA] * value;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+    }
+
+  return TRUE;
+}
+
+static GimpLayerCompositeRegion
+gimp_operation_anti_erase_get_affected_region (GimpOperationLayerMode *layer_mode)
+{
+  return GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+}
diff --git a/app/operations/layer-modes/gimpoperationantierase.h b/app/operations/layer-modes/gimpoperationantierase.h
new file mode 100644
index 0000000..0c5ddf8
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationantierase.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationantierase.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_ANTI_ERASE_H__
+#define __GIMP_OPERATION_ANTI_ERASE_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_ANTI_ERASE            (gimp_operation_anti_erase_get_type ())
+#define GIMP_OPERATION_ANTI_ERASE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_ANTI_ERASE, GimpOperationAntiErase))
+#define GIMP_OPERATION_ANTI_ERASE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_ANTI_ERASE, GimpOperationAntiEraseClass))
+#define GIMP_IS_OPERATION_ANTI_ERASE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_ANTI_ERASE))
+#define GIMP_IS_OPERATION_ANTI_ERASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_ANTI_ERASE))
+#define GIMP_OPERATION_ANTI_ERASE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_ANTI_ERASE, GimpOperationAntiEraseClass))
+
+
+typedef struct _GimpOperationAntiErase      GimpOperationAntiErase;
+typedef struct _GimpOperationAntiEraseClass GimpOperationAntiEraseClass;
+
+struct _GimpOperationAntiErase
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationAntiEraseClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_anti_erase_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_ANTI_ERASE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationbehind.c b/app/operations/layer-modes/gimpoperationbehind.c
new file mode 100644
index 0000000..1dc2630
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationbehind.c
@@ -0,0 +1,236 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationbehind.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationbehind.h"
+
+
+
+static gboolean   gimp_operation_behind_process (GeglOperation       *op,
+                                                 void                *in,
+                                                 void                *layer,
+                                                 void                *mask,
+                                                 void                *out,
+                                                 glong                samples,
+                                                 const GeglRectangle *roi,
+                                                 gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationBehind, gimp_operation_behind,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_behind_class_init (GimpOperationBehindClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:behind",
+                                 "description", "GIMP behind mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_behind_process;
+}
+
+static void
+gimp_operation_behind_init (GimpOperationBehind *self)
+{
+}
+
+static gboolean
+gimp_operation_behind_process (GeglOperation       *op,
+                               void                *in_p,
+                               void                *layer_p,
+                               void                *mask_p,
+                               void                *out_p,
+                               glong                samples,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat src1_alpha = in[ALPHA];
+          gfloat src2_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            src2_alpha *= *mask;
+
+          new_alpha = src2_alpha + (1.0 - src2_alpha) * src1_alpha;
+
+          if (new_alpha)
+            {
+              gfloat ratio = in[ALPHA] / new_alpha;
+              gfloat compl_ratio = 1.0f - ratio;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b] * ratio + layer[b] * compl_ratio;
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+      while (samples--)
+        {
+          gfloat src1_alpha = in[ALPHA];
+          gfloat new_alpha;
+          gint   b;
+
+          new_alpha = src1_alpha;
+
+          if (new_alpha)
+            {
+              for (b = RED; b < ALPHA; b++)
+                out[b] = in[b];
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                out[b] = layer[b];
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat src1_alpha = in[ALPHA];
+          gfloat src2_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            src2_alpha *= *mask;
+
+          new_alpha = src2_alpha;
+
+          if (new_alpha)
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b] + (in[b] - layer[b]) * src1_alpha;
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+      case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      while (samples--)
+        {
+          gfloat src1_alpha = in[ALPHA];
+          gfloat src2_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            src2_alpha *= *mask;
+
+          new_alpha = src1_alpha * src2_alpha;
+
+          if (new_alpha)
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes/gimpoperationbehind.h b/app/operations/layer-modes/gimpoperationbehind.h
new file mode 100644
index 0000000..46b9ac4
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationbehind.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationbehind.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_BEHIND_H__
+#define __GIMP_OPERATION_BEHIND_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_BEHIND            (gimp_operation_behind_get_type ())
+#define GIMP_OPERATION_BEHIND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_BEHIND, GimpOperationBehind))
+#define GIMP_OPERATION_BEHIND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_BEHIND, GimpOperationBehindClass))
+#define GIMP_IS_OPERATION_BEHIND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_BEHIND))
+#define GIMP_IS_OPERATION_BEHIND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_BEHIND))
+#define GIMP_OPERATION_BEHIND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BEHIND, GimpOperationBehindClass))
+
+
+typedef struct _GimpOperationBehind      GimpOperationBehind;
+typedef struct _GimpOperationBehindClass GimpOperationBehindClass;
+
+struct _GimpOperationBehind
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationBehindClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType    gimp_operation_behind_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_BEHIND_H__ */
diff --git a/app/operations/layer-modes/gimpoperationdissolve.c b/app/operations/layer-modes/gimpoperationdissolve.c
new file mode 100644
index 0000000..fb4b1d0
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationdissolve.c
@@ -0,0 +1,175 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdissolve.c
+ * Copyright (C) 2012 Ville Sokk <ville.sokk@gmail.com>
+ *               2012 Øyvind Kolås <pippin@gimp.org>
+ *               2003 Helvetix Victorinox
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationdissolve.h"
+
+
+#define RANDOM_TABLE_SIZE 4096
+
+
+static gboolean                   gimp_operation_dissolve_process             (GeglOperation          *op,
+                                                                               void                   *in,
+                                                                               void                   *layer,
+                                                                               void                   *mask,
+                                                                               void                   *out,
+                                                                               glong                   samples,
+                                                                               const GeglRectangle    *result,
+                                                                               gint                    level);
+static GimpLayerCompositeRegion   gimp_operation_dissolve_get_affected_region (GimpOperationLayerMode *layer_mode);
+
+
+G_DEFINE_TYPE (GimpOperationDissolve, gimp_operation_dissolve,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static gint32 random_table[RANDOM_TABLE_SIZE];
+
+
+static void
+gimp_operation_dissolve_class_init (GimpOperationDissolveClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+  GRand                       *gr;
+  gint                         i;
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:dissolve",
+                                 "description", "GIMP dissolve mode operation",
+                                 "categories",  "compositors",
+                                 NULL);
+
+  layer_mode_class->process             = gimp_operation_dissolve_process;
+  layer_mode_class->get_affected_region = gimp_operation_dissolve_get_affected_region;
+
+  /* generate a table of random seeds */
+  gr = g_rand_new_with_seed (314159265);
+  for (i = 0; i < RANDOM_TABLE_SIZE; i++)
+    random_table[i] = g_rand_int (gr);
+
+  g_rand_free (gr);
+}
+
+static void
+gimp_operation_dissolve_init (GimpOperationDissolve *self)
+{
+}
+
+static gboolean
+gimp_operation_dissolve_process (GeglOperation       *op,
+                                 void                *in_p,
+                                 void                *layer_p,
+                                 void                *mask_p,
+                                 void                *out_p,
+                                 glong                samples,
+                                 const GeglRectangle *result,
+                                 gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+  gint                    x, y;
+
+  for (y = result->y; y < result->y + result->height; y++)
+    {
+      GRand *gr;
+
+      /* The offset can be negative. I could just abs() the result, but we
+       * probably prefer to use different indexes of the table when possible for
+       * nicer randomization, so let's cycle the modulo so that -1 is the last
+       * table index.
+       */
+      gr = g_rand_new_with_seed (random_table[((y % RANDOM_TABLE_SIZE) + RANDOM_TABLE_SIZE) % RANDOM_TABLE_SIZE]);
+
+      /* fast forward through the rows pseudo random sequence */
+      for (x = 0; x < result->x; x++)
+        g_rand_int (gr);
+
+      for (x = result->x; x < result->x + result->width; x++)
+        {
+          gfloat value = layer[ALPHA] * opacity * 255;
+
+          if (has_mask)
+            value *= *mask;
+
+          if (g_rand_int_range (gr, 0, 255) >= value)
+            {
+              out[0] = in[0];
+              out[1] = in[1];
+              out[2] = in[2];
+
+              if (layer_mode->composite_mode == GIMP_LAYER_COMPOSITE_UNION ||
+                  layer_mode->composite_mode == GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP)
+                {
+                  out[3] = in[3];
+                }
+              else
+                {
+                  out[3] = 0.0f;
+                }
+            }
+          else
+            {
+              out[0] = layer[0];
+              out[1] = layer[1];
+              out[2] = layer[2];
+
+              if (layer_mode->composite_mode == GIMP_LAYER_COMPOSITE_UNION ||
+                  layer_mode->composite_mode == GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER)
+                {
+                  out[3] = 1.0f;
+                }
+              else
+                {
+                  out[3] = in[3];
+                }
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+
+      g_rand_free (gr);
+    }
+
+  return TRUE;
+}
+
+static GimpLayerCompositeRegion
+gimp_operation_dissolve_get_affected_region (GimpOperationLayerMode *layer_mode)
+{
+  return GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+}
diff --git a/app/operations/layer-modes/gimpoperationdissolve.h b/app/operations/layer-modes/gimpoperationdissolve.h
new file mode 100644
index 0000000..d448918
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationdissolve.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdissolve.h
+ * Copyright (C) 2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DISSOLVE_H__
+#define __GIMP_OPERATION_DISSOLVE_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_DISSOLVE            (gimp_operation_dissolve_get_type ())
+#define GIMP_OPERATION_DISSOLVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DISSOLVE, GimpOperationDissolve))
+#define GIMP_OPERATION_DISSOLVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DISSOLVE, GimpOperationDissolveClass))
+#define GIMP_IS_OPERATION_DISSOLVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DISSOLVE))
+#define GIMP_IS_OPERATION_DISSOLVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DISSOLVE))
+#define GIMP_OPERATION_DISSOLVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DISSOLVE, GimpOperationDissolveClass))
+
+
+typedef struct _GimpOperationDissolve      GimpOperationDissolve;
+typedef struct _GimpOperationDissolveClass GimpOperationDissolveClass;
+
+struct _GimpOperationDissolveClass
+{
+  GimpOperationLayerModeClass parent_class;
+};
+
+struct _GimpOperationDissolve
+{
+  GimpOperationLayerMode parent_instance;
+};
+
+
+GType   gimp_operation_dissolve_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_DISSOLVE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationerase.c b/app/operations/layer-modes/gimpoperationerase.c
new file mode 100644
index 0000000..aae6eac
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationerase.c
@@ -0,0 +1,214 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationerase.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2012 Ville Sokk <ville.sokk@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationerase.h"
+
+
+static gboolean   gimp_operation_erase_process (GeglOperation       *op,
+                                                void                *in,
+                                                void                *layer,
+                                                void                *mask,
+                                                void                *out,
+                                                glong                samples,
+                                                const GeglRectangle *roi,
+                                                gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationErase, gimp_operation_erase,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_erase_class_init (GimpOperationEraseClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:erase",
+                                 "description", "GIMP erase mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_erase_process;
+}
+
+static void
+gimp_operation_erase_init (GimpOperationErase *self)
+{
+}
+
+static gboolean
+gimp_operation_erase_process (GeglOperation       *op,
+                              void                *in_p,
+                              void                *layer_p,
+                              void                *mask_p,
+                              void                *out_p,
+                              glong                samples,
+                              const GeglRectangle *roi,
+                              gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+      while (samples--)
+        {
+          gfloat layer_alpha;
+          gfloat new_alpha;
+          gint   b;
+
+          layer_alpha = layer[ALPHA] * opacity;
+
+          if (has_mask)
+            layer_alpha *= (*mask);
+
+          new_alpha = in[ALPHA] + layer_alpha - 2.0f * in[ALPHA] * layer_alpha;
+
+          if (new_alpha != 0.0f)
+            {
+              gfloat ratio;
+
+              ratio = (1.0f - in[ALPHA]) * layer_alpha / new_alpha;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = ratio * layer[b] + (1.0f - ratio) * in[b];
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask ++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat layer_alpha;
+          gfloat new_alpha;
+          gint   b;
+
+          layer_alpha = layer[ALPHA] * opacity;
+
+          if (has_mask)
+            layer_alpha *= (*mask);
+
+          new_alpha = (1.0f - layer_alpha) * in[ALPHA];
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask ++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat        layer_alpha;
+          gfloat        new_alpha;
+          const gfloat *src;
+          gint          b;
+
+          layer_alpha = layer[ALPHA] * opacity;
+
+          if (has_mask)
+            layer_alpha *= (*mask);
+
+          new_alpha = (1.0f - in[ALPHA]) * layer_alpha;
+
+          src = layer;
+
+          if (new_alpha == 0.0f)
+            src = in;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = src[b];
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask ++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      while (samples--)
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          out[ALPHA] = 0.0f;
+
+          in    += 4;
+          out   += 4;
+        }
+      break;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes/gimpoperationerase.h b/app/operations/layer-modes/gimpoperationerase.h
new file mode 100644
index 0000000..fec309b
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationerase.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationerase.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_ERASE_H__
+#define __GIMP_OPERATION_ERASE_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_ERASE            (gimp_operation_erase_get_type ())
+#define GIMP_OPERATION_ERASE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_ERASE, GimpOperationErase))
+#define GIMP_OPERATION_ERASE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_ERASE, GimpOperationEraseClass))
+#define GIMP_IS_OPERATION_ERASE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_ERASE))
+#define GIMP_IS_OPERATION_ERASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_ERASE))
+#define GIMP_OPERATION_ERASE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_ERASE, GimpOperationEraseClass))
+
+
+typedef struct _GimpOperationErase      GimpOperationErase;
+typedef struct _GimpOperationEraseClass GimpOperationEraseClass;
+
+struct _GimpOperationErase
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationEraseClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_erase_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_ERASE_MODE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlayermode-blend.c b/app/operations/layer-modes/gimpoperationlayermode-blend.c
new file mode 100644
index 0000000..e107462
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode-blend.c
@@ -0,0 +1,1215 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode-blend.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *               2017 Øyvind Kolås <pippin@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationlayermode-blend.h"
+
+
+#define EPSILON      1e-6f
+
+#define SAFE_DIV_MIN EPSILON
+#define SAFE_DIV_MAX (1.0f / SAFE_DIV_MIN)
+
+
+/*  local function prototypes  */
+
+static inline gfloat   safe_div (gfloat a,
+                                 gfloat b);
+
+
+/*  private functions  */
+
+
+/* returns a / b, clamped to [-SAFE_DIV_MAX, SAFE_DIV_MAX].
+ * if -SAFE_DIV_MIN <= a <= SAFE_DIV_MIN, returns 0.
+ */
+static inline gfloat
+safe_div (gfloat a,
+          gfloat b)
+{
+  gfloat result = 0.0f;
+
+  if (fabsf (a) > SAFE_DIV_MIN)
+    {
+      result = a / b;
+      result = CLAMP (result, -SAFE_DIV_MAX, SAFE_DIV_MAX);
+    }
+
+  return result;
+}
+
+
+/*  public functions  */
+
+
+/*  non-subtractive blending functions.  these functions must set comp[ALPHA]
+ *  to the same value as layer[ALPHA].  when in[ALPHA] or layer[ALPHA] are
+ *  zero, the value of comp[RED..BLUE] is unconstrained (in particular, it may
+ *  be NaN).
+ */
+
+
+void /* aka linear_dodge */
+gimp_operation_layer_mode_blend_addition (GeglOperation *operation,
+                                          const gfloat  *in,
+                                          const gfloat  *layer,
+                                          gfloat        *comp,
+                                          gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] + layer[c];
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_burn (GeglOperation *operation,
+                                      const gfloat  *in,
+                                      const gfloat  *layer,
+                                      gfloat        *comp,
+                                      gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = 1.0f - safe_div (1.0f - in[c], layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_darken_only (GeglOperation *operation,
+                                             const gfloat  *in,
+                                             const gfloat  *layer,
+                                             gfloat        *comp,
+                                             gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = MIN (in[c], layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_difference (GeglOperation *operation,
+                                            const gfloat  *in,
+                                            const gfloat  *layer,
+                                            gfloat        *comp,
+                                            gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = fabsf (in[c] - layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_divide (GeglOperation *operation,
+                                        const gfloat  *in,
+                                        const gfloat  *layer,
+                                        gfloat        *comp,
+                                        gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = safe_div (in[c], layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_dodge (GeglOperation *operation,
+                                       const gfloat  *in,
+                                       const gfloat  *layer,
+                                       gfloat        *comp,
+                                       gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = safe_div (in[c], 1.0f - layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_exclusion (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = 0.5f - 2.0f * (in[c] - 0.5f) * (layer[c] - 0.5f);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_grain_extract (GeglOperation *operation,
+                                               const gfloat  *in,
+                                               const gfloat  *layer,
+                                               gfloat        *comp,
+                                               gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] - layer[c] + 0.5f;
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_grain_merge (GeglOperation *operation,
+                                             const gfloat  *in,
+                                             const gfloat  *layer,
+                                             gfloat        *comp,
+                                             gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] + layer[c] - 0.5f;
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_hard_mix (GeglOperation *operation,
+                                          const gfloat  *in,
+                                          const gfloat  *layer,
+                                          gfloat        *comp,
+                                          gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] + layer[c] < 1.0f ? 0.0f : 1.0f;
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_hardlight (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat val;
+
+              if (layer[c] > 0.5f)
+                {
+                  val = (1.0f - in[c]) * (1.0f - (layer[c] - 0.5f) * 2.0f);
+                  val = MIN (1.0f - val, 1.0f);
+                }
+              else
+                {
+                  val = in[c] * (layer[c] * 2.0f);
+                  val = MIN (val, 1.0f);
+                }
+
+              comp[c] = val;
+            }
+        }
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_hsl_color (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat dest_min, dest_max, dest_l;
+          gfloat src_min,  src_max,  src_l;
+
+          dest_min = MIN (in[0],  in[1]);
+          dest_min = MIN (dest_min, in[2]);
+          dest_max = MAX (in[0],  in[1]);
+          dest_max = MAX (dest_max, in[2]);
+          dest_l   = (dest_min + dest_max) / 2.0f;
+
+          src_min  = MIN (layer[0],  layer[1]);
+          src_min  = MIN (src_min, layer[2]);
+          src_max  = MAX (layer[0],  layer[1]);
+          src_max  = MAX (src_max, layer[2]);
+          src_l    = (src_min + src_max) / 2.0f;
+
+          if (fabs (src_l) > EPSILON && fabs (1.0 - src_l) > EPSILON)
+            {
+              gboolean dest_high;
+              gboolean src_high;
+              gfloat   ratio;
+              gfloat   offset;
+              gint     c;
+
+              dest_high = dest_l > 0.5f;
+              src_high  = src_l  > 0.5f;
+
+              dest_l = MIN (dest_l, 1.0f - dest_l);
+              src_l  = MIN (src_l,  1.0f - src_l);
+
+              ratio                  = dest_l / src_l;
+
+              offset                 = 0.0f;
+              if (dest_high) offset += 1.0f - 2.0f * dest_l;
+              if (src_high)  offset += 2.0f * dest_l - ratio;
+
+              for (c = 0; c < 3; c++)
+                comp[c] = layer[c] * ratio + offset;
+            }
+          else
+            {
+              comp[RED]   = dest_l;
+              comp[GREEN] = dest_l;
+              comp[BLUE]  = dest_l;
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_hsv_hue (GeglOperation *operation,
+                                         const gfloat  *in,
+                                         const gfloat  *layer,
+                                         gfloat        *comp,
+                                         gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat src_min,  src_max,  src_delta;
+          gfloat dest_min, dest_max, dest_delta, dest_s;
+
+          src_min   = MIN (layer[0], layer[1]);
+          src_min   = MIN (src_min, layer[2]);
+          src_max   = MAX (layer[0], layer[1]);
+          src_max   = MAX (src_max, layer[2]);
+          src_delta = src_max - src_min;
+
+          if (src_delta > EPSILON)
+            {
+              gfloat ratio;
+              gfloat offset;
+              gint   c;
+
+              dest_min   = MIN (in[0], in[1]);
+              dest_min   = MIN (dest_min, in[2]);
+              dest_max   = MAX (in[0], in[1]);
+              dest_max   = MAX (dest_max, in[2]);
+              dest_delta = dest_max - dest_min;
+              dest_s     = dest_max ? dest_delta / dest_max : 0.0f;
+
+              ratio  = dest_s * dest_max / src_delta;
+              offset = dest_max - src_max * ratio;
+
+              for (c = 0; c < 3; c++)
+                comp[c] = layer[c] * ratio + offset;
+            }
+          else
+            {
+              gint c;
+
+              for (c = 0; c < 3; c++)
+                comp[c] = in[c];
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_hsv_saturation (GeglOperation *operation,
+                                                const gfloat  *in,
+                                                const gfloat  *layer,
+                                                gfloat        *comp,
+                                                gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat src_min,  src_max,  src_delta, src_s;
+          gfloat dest_min, dest_max, dest_delta;
+
+          dest_min   = MIN (in[0], in[1]);
+          dest_min   = MIN (dest_min, in[2]);
+          dest_max   = MAX (in[0], in[1]);
+          dest_max   = MAX (dest_max, in[2]);
+          dest_delta = dest_max - dest_min;
+
+          if (dest_delta > EPSILON)
+            {
+              gfloat ratio;
+              gfloat offset;
+              gint   c;
+
+              src_min   = MIN (layer[0], layer[1]);
+              src_min   = MIN (src_min, layer[2]);
+              src_max   = MAX (layer[0], layer[1]);
+              src_max   = MAX (src_max, layer[2]);
+              src_delta = src_max - src_min;
+              src_s     = src_max ? src_delta / src_max : 0.0f;
+
+              ratio  = src_s * dest_max / dest_delta;
+              offset = (1.0f - ratio) * dest_max;
+
+              for (c = 0; c < 3; c++)
+                comp[c] = in[c] * ratio + offset;
+            }
+          else
+            {
+              comp[RED]   = dest_max;
+              comp[GREEN] = dest_max;
+              comp[BLUE]  = dest_max;
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_hsv_value (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat dest_v;
+          gfloat src_v;
+
+          dest_v = MAX (in[0], in[1]);
+          dest_v = MAX (dest_v, in[2]);
+
+          src_v  = MAX (layer[0], layer[1]);
+          src_v  = MAX (src_v, layer[2]);
+
+          if (fabs (dest_v) > EPSILON)
+            {
+              gfloat ratio = src_v / dest_v;
+              gint   c;
+
+              for (c = 0; c < 3; c++)
+                comp[c] = in[c] * ratio;
+            }
+          else
+            {
+              comp[RED]   = src_v;
+              comp[GREEN] = src_v;
+              comp[BLUE]  = src_v;
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_lch_chroma (GeglOperation *operation,
+                                            const gfloat  *in,
+                                            const gfloat  *layer,
+                                            gfloat        *comp,
+                                            gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat A1 = in[1];
+          gfloat B1 = in[2];
+          gfloat c1 = hypotf (A1, B1);
+
+          if (c1 > EPSILON)
+            {
+              gfloat A2 = layer[1];
+              gfloat B2 = layer[2];
+              gfloat c2 = hypotf (A2, B2);
+              gfloat A  = c2 * A1 / c1;
+              gfloat B  = c2 * B1 / c1;
+
+              comp[0] = in[0];
+              comp[1] = A;
+              comp[2] = B;
+            }
+          else
+            {
+              comp[0] = in[0];
+              comp[1] = in[1];
+              comp[2] = in[2];
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_lch_color (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          comp[0] = in[0];
+          comp[1] = layer[1];
+          comp[2] = layer[2];
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+  }
+}
+
+void
+gimp_operation_layer_mode_blend_lch_hue (GeglOperation *operation,
+                                         const gfloat  *in,
+                                         const gfloat  *layer,
+                                         gfloat        *comp,
+                                         gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat A2 = layer[1];
+          gfloat B2 = layer[2];
+          gfloat c2 = hypotf (A2, B2);
+
+          if (c2 > EPSILON)
+            {
+              gfloat A1 = in[1];
+              gfloat B1 = in[2];
+              gfloat c1 = hypotf (A1, B1);
+              gfloat A  = c1 * A2 / c2;
+              gfloat B  = c1 * B2 / c2;
+
+              comp[0] = in[0];
+              comp[1] = A;
+              comp[2] = B;
+            }
+          else
+            {
+              comp[0] = in[0];
+              comp[1] = in[1];
+              comp[2] = in[2];
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_lch_lightness (GeglOperation *operation,
+                                               const gfloat  *in,
+                                               const gfloat  *layer,
+                                               gfloat        *comp,
+                                               gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          comp[0] = layer[0];
+          comp[1] = in[1];
+          comp[2] = in[2];
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_lighten_only (GeglOperation *operation,
+                                              const gfloat  *in,
+                                              const gfloat  *layer,
+                                              gfloat        *comp,
+                                              gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = MAX (in[c], layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_linear_burn (GeglOperation *operation,
+                                             const gfloat  *in,
+                                             const gfloat  *layer,
+                                             gfloat        *comp,
+                                             gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] + layer[c] - 1.0f;
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+/* added according to:
+    http://www.deepskycolors.com/archivo/2010/04/21/formulas-for-Photoshop-blending-modes.html */
+void
+gimp_operation_layer_mode_blend_linear_light (GeglOperation *operation,
+                                              const gfloat  *in,
+                                              const gfloat  *layer,
+                                              gfloat        *comp,
+                                              gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat val;
+
+              if (layer[c] <= 0.5f)
+                val = in[c] + 2.0f * layer[c] - 1.0f;
+              else
+                val = in[c] + 2.0f * (layer[c] - 0.5f);
+
+              comp[c] = val;
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_luma_darken_only (GeglOperation *operation,
+                                                  const gfloat  *in,
+                                                  const gfloat  *layer,
+                                                  gfloat        *comp,
+                                                  gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat dest_luminance;
+          gfloat src_luminance;
+          gint   c;
+
+          dest_luminance = GIMP_RGB_LUMINANCE (in[0],    in[1],    in[2]);
+          src_luminance  = GIMP_RGB_LUMINANCE (layer[0], layer[1], layer[2]);
+
+          if (dest_luminance <= src_luminance)
+            {
+              for (c = 0; c < 3; c++)
+                comp[c] = in[c];
+            }
+          else
+            {
+              for (c = 0; c < 3; c++)
+                comp[c] = layer[c];
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_luma_lighten_only (GeglOperation *operation,
+                                                   const gfloat  *in,
+                                                   const gfloat  *layer,
+                                                   gfloat        *comp,
+                                                   gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gfloat dest_luminance;
+          gfloat src_luminance;
+          gint   c;
+
+          dest_luminance = GIMP_RGB_LUMINANCE (in[0],    in[1],    in[2]);
+          src_luminance  = GIMP_RGB_LUMINANCE (layer[0], layer[1], layer[2]);
+
+          if (dest_luminance >= src_luminance)
+            {
+              for (c = 0; c < 3; c++)
+                comp[c] = in[c];
+            }
+          else
+            {
+              for (c = 0; c < 3; c++)
+                comp[c] = layer[c];
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_luminance (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  static const Babl *fish;
+  gfloat            *scratch;
+  gfloat            *in_Y;
+  gfloat            *layer_Y;
+
+  if (! fish)
+    fish = babl_fish ("RGBA float", "Y float");
+
+  scratch = gegl_scratch_new (gfloat, 2 * samples);
+
+  in_Y    = scratch;
+  layer_Y = scratch + samples;
+
+  babl_process (fish, in,    in_Y,    samples);
+  babl_process (fish, layer, layer_Y, samples);
+
+  while (samples--)
+    {
+      if (layer[ALPHA] != 0.0f && in[ALPHA] != 0.0f)
+        {
+          gfloat ratio = safe_div (layer_Y[0], in_Y[0]);
+          gint   c;
+
+          for (c = 0; c < 3; c ++)
+            comp[c] = in[c] * ratio;
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp    += 4;
+      in      += 4;
+      layer   += 4;
+      in_Y    ++;
+      layer_Y ++;
+    }
+
+  gegl_scratch_free (scratch);
+}
+
+void
+gimp_operation_layer_mode_blend_multiply (GeglOperation *operation,
+                                          const gfloat  *in,
+                                          const gfloat  *layer,
+                                          gfloat        *comp,
+                                          gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] * layer[c];
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_overlay (GeglOperation *operation,
+                                         const gfloat  *in,
+                                         const gfloat  *layer,
+                                         gfloat        *comp,
+                                         gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat val;
+
+              if (in[c] < 0.5f)
+                val = 2.0f * in[c] * layer[c];
+              else
+                val = 1.0f - 2.0f * (1.0f - layer[c]) * (1.0f - in[c]);
+
+              comp[c] = val;
+            }
+        }
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+/* added according to:
+    http://www.deepskycolors.com/archivo/2010/04/21/formulas-for-Photoshop-blending-modes.html */
+void
+gimp_operation_layer_mode_blend_pin_light (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat val;
+
+              if (layer[c] > 0.5f)
+                val = MAX(in[c], 2.0f * (layer[c] - 0.5f));
+              else
+                val = MIN(in[c], 2.0f * layer[c]);
+
+              comp[c] = val;
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_screen (GeglOperation *operation,
+                                        const gfloat  *in,
+                                        const gfloat  *layer,
+                                        gfloat        *comp,
+                                        gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = 1.0f - (1.0f - in[c])   * (1.0f - layer[c]);
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_softlight (GeglOperation *operation,
+                                           const gfloat  *in,
+                                           const gfloat  *layer,
+                                           gfloat        *comp,
+                                           gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat multiply = in[c] * layer[c];
+              gfloat screen   = 1.0f - (1.0f - in[c]) * (1.0f - layer[c]);
+              gfloat val      = (1.0f - in[c]) * multiply + in[c] * screen;
+
+              comp[c] = val;
+            }
+        }
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+void
+gimp_operation_layer_mode_blend_subtract (GeglOperation *operation,
+                                          const gfloat  *in,
+                                          const gfloat  *layer,
+                                          gfloat        *comp,
+                                          gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            comp[c] = in[c] - layer[c];
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+/* added according to:
+    http://www.simplefilter.de/en/basics/mixmods.html */
+void
+gimp_operation_layer_mode_blend_vivid_light (GeglOperation *operation,
+                                             const gfloat  *in,
+                                             const gfloat  *layer,
+                                             gfloat        *comp,
+                                             gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat val;
+
+              if (layer[c] <= 0.5f)
+                {
+                  val = 1.0f - safe_div (1.0f - in[c], 2.0f * layer[c]);
+                  val = MAX (val, 0.0f);
+                }
+              else
+                {
+                  val = safe_div (in[c], 2.0f * (1.0f - layer[c]));
+                  val = MIN (val, 1.0f);
+                }
+
+              comp[c] = val;
+            }
+        }
+
+      comp[ALPHA] = layer[ALPHA];
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
+
+
+/*  subtractive blending functions.  these functions must set comp[ALPHA] to
+ *  the modified alpha of the overlapping content, as a fraction of the
+ *  original overlapping content (i.e., an alpha of 1.0 specifies that no
+ *  content is subtracted.)  when in[ALPHA] or layer[ALPHA] are zero, the value
+ *  of comp[RED..BLUE] is unconstrained (in particular, it may be NaN).
+ */
+
+
+void
+gimp_operation_layer_mode_blend_color_erase (GeglOperation *operation,
+                                             const gfloat  *in,
+                                             const gfloat  *layer,
+                                             gfloat        *comp,
+                                             gint           samples)
+{
+  while (samples--)
+    {
+      if (in[ALPHA] != 0.0f && layer[ALPHA] != 0.0f)
+        {
+          const gfloat *color   = in;
+          const gfloat *bgcolor = layer;
+          gfloat       alpha;
+          gint         c;
+
+          alpha = 0.0f;
+
+          for (c = 0; c < 3; c++)
+            {
+              gfloat col   = CLAMP (color[c],   0.0f, 1.0f);
+              gfloat bgcol = CLAMP (bgcolor[c], 0.0f, 1.0f);
+
+              if (fabs (col - bgcol) > EPSILON)
+                {
+                  gfloat a;
+
+                  if (col > bgcol)
+                    a = (col - bgcol) / (1.0f - bgcol);
+                  else
+                    a = (bgcol - col) / bgcol;
+
+                  alpha = MAX (alpha, a);
+                }
+            }
+
+          if (alpha > EPSILON)
+            {
+              gfloat alpha_inv = 1.0f / alpha;
+
+              for (c = 0; c < 3; c++)
+                comp[c] = (color[c] - bgcolor[c]) * alpha_inv + bgcolor[c];
+            }
+          else
+            {
+              comp[RED] = comp[GREEN] = comp[BLUE] = 0.0f;
+            }
+
+          comp[ALPHA] = alpha;
+        }
+      else
+        comp[ALPHA] = 0.0f;
+
+      comp  += 4;
+      layer += 4;
+      in    += 4;
+    }
+}
diff --git a/app/operations/layer-modes/gimpoperationlayermode-blend.h b/app/operations/layer-modes/gimpoperationlayermode-blend.h
new file mode 100644
index 0000000..3a8f995
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode-blend.h
@@ -0,0 +1,200 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode-blend.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *               2017 Øyvind Kolås <pippin@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; withcomp even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_LAYER_MODE_BLEND_H__
+#define __GIMP_OPERATION_LAYER_MODE_BLEND_H__
+
+
+/*  nonsubtractive blend functions  */
+
+void gimp_operation_layer_mode_blend_addition          (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_burn              (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_darken_only       (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_difference        (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_divide            (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_dodge             (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_exclusion         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_grain_extract     (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_grain_merge       (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_hard_mix          (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_hardlight         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_hsl_color         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_hsv_hue           (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_hsv_saturation    (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_hsv_value         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_lch_chroma        (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_lch_color         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_lch_hue           (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_lch_lightness     (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_lighten_only      (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_linear_burn       (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_linear_light      (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_luma_darken_only  (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_luma_lighten_only (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_luminance         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_multiply          (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_overlay           (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_pin_light         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_screen            (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_softlight         (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_subtract          (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+void gimp_operation_layer_mode_blend_vivid_light       (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+
+
+/*  subtractive blend functions  */
+
+void gimp_operation_layer_mode_blend_color_erase       (GeglOperation *operation,
+                                                        const gfloat  *in,
+                                                        const gfloat  *layer,
+                                                        gfloat        *comp,
+                                                        gint           samples);
+
+
+#endif /* __GIMP_OPERATION_LAYER_MODE_BLEND_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlayermode-composite-sse2.c b/app/operations/layer-modes/gimpoperationlayermode-composite-sse2.c
new file mode 100644
index 0000000..2630751
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode-composite-sse2.c
@@ -0,0 +1,105 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode-composite-sse2.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *               2017 Øyvind Kolås <pippin@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationlayermode-composite.h"
+
+
+#if COMPILE_SSE2_INTRINISICS
+
+/* SSE2 */
+#include <emmintrin.h>
+
+
+/*  non-subtractive compositing functions.  these functions expect comp[ALPHA]
+ *  to be the same as layer[ALPHA].  when in[ALPHA] or layer[ALPHA] are zero,
+ *  the value of comp[RED..BLUE] is unconstrained (in particular, it may be
+ *  NaN).
+ */
+
+
+void
+gimp_operation_layer_mode_composite_clip_to_backdrop_sse2 (const gfloat *in,
+                                                           const gfloat *layer,
+                                                           const gfloat *comp,
+                                                           const gfloat *mask,
+                                                           gfloat        opacity,
+                                                           gfloat       *out,
+                                                           gint          samples)
+{
+  if ((((uintptr_t)in)   | /* alignment check */
+       ((uintptr_t)comp) |
+       ((uintptr_t)out)   ) & 0x0F)
+    {
+      gimp_operation_layer_mode_composite_clip_to_backdrop (in, layer, comp,
+                                                            mask, opacity, out,
+                                                            samples);
+    }
+  else
+    {
+      const __v4sf *v_in      = (const __v4sf*) in;
+      const __v4sf *v_comp    = (const __v4sf*) comp;
+            __v4sf *v_out     = (__v4sf*) out;
+      const __v4sf  v_one     =  _mm_set1_ps (1.0f);
+      const __v4sf  v_opacity =  _mm_set1_ps (opacity);
+
+      while (samples--)
+        {
+          __v4sf alpha, rgba_in, rgba_comp;
+
+          rgba_in   = *v_in ++;
+          rgba_comp = *v_comp++;
+
+          alpha = (__v4sf)_mm_shuffle_epi32((__m128i)rgba_comp,_MM_SHUFFLE(3,3,3,3)) * v_opacity;
+
+          if (mask)
+            {
+              alpha = alpha * _mm_set1_ps (*mask++);
+            }
+
+          if (rgba_in[ALPHA] != 0.0f && _mm_ucomineq_ss (alpha, _mm_setzero_ps ()))
+            {
+              __v4sf out_pixel, out_pixel_rbaa, out_alpha;
+
+              out_alpha      = (__v4sf)_mm_shuffle_epi32((__m128i)rgba_in,_MM_SHUFFLE(3,3,3,3));
+              out_pixel      = rgba_comp * alpha + rgba_in * (v_one - alpha);
+              out_pixel_rbaa = _mm_shuffle_ps (out_pixel, out_alpha, _MM_SHUFFLE (3, 3, 2, 0));
+              out_pixel      = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
+
+              *v_out++ = out_pixel;
+            }
+          else
+            {
+              *v_out ++ = rgba_in;
+            }
+        }
+    }
+}
+
+#endif /* COMPILE_SSE2_INTRINISICS */
diff --git a/app/operations/layer-modes/gimpoperationlayermode-composite.c b/app/operations/layer-modes/gimpoperationlayermode-composite.c
new file mode 100644
index 0000000..4275818
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode-composite.c
@@ -0,0 +1,434 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode-composite.c
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *               2017 Øyvind Kolås <pippin@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationlayermode-composite.h"
+
+
+/*  non-subtractive compositing functions.  these functions expect comp[ALPHA]
+ *  to be the same as layer[ALPHA].  when in[ALPHA] or layer[ALPHA] are zero,
+ *  the value of comp[RED..BLUE] is unconstrained (in particular, it may be
+ *  NaN).
+ */
+
+
+void
+gimp_operation_layer_mode_composite_union (const gfloat *in,
+                                           const gfloat *layer,
+                                           const gfloat *comp,
+                                           const gfloat *mask,
+                                           gfloat        opacity,
+                                           gfloat       *out,
+                                           gint          samples)
+{
+  while (samples--)
+    {
+      gfloat new_alpha;
+      gfloat in_alpha    = in[ALPHA];
+      gfloat layer_alpha = layer[ALPHA] * opacity;
+
+      if (mask)
+        layer_alpha *= *mask;
+
+      new_alpha = layer_alpha + (1.0f - layer_alpha) * in_alpha;
+
+      if (layer_alpha == 0.0f || new_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else if (in_alpha == 0.0f)
+        {
+          out[RED]   = layer[RED];
+          out[GREEN] = layer[GREEN];
+          out[BLUE]  = layer[BLUE];
+        }
+      else
+        {
+          gfloat ratio = layer_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = ratio * (in_alpha * (comp[b] - layer[b]) + layer[b] - in[b]) + in[b];
+        }
+
+      out[ALPHA] = new_alpha;
+
+      in    += 4;
+      layer += 4;
+      comp  += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+void
+gimp_operation_layer_mode_composite_clip_to_backdrop (const gfloat *in,
+                                                      const gfloat *layer,
+                                                      const gfloat *comp,
+                                                      const gfloat *mask,
+                                                      gfloat        opacity,
+                                                      gfloat       *out,
+                                                      gint          samples)
+{
+  while (samples--)
+    {
+      gfloat layer_alpha = comp[ALPHA] * opacity;
+
+      if (mask)
+        layer_alpha *= *mask;
+
+      if (in[ALPHA] == 0.0f || layer_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = comp[b] * layer_alpha + in[b] * (1.0f - layer_alpha);
+        }
+
+      out[ALPHA] = in[ALPHA];
+
+      in   += 4;
+      comp += 4;
+      out  += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+void
+gimp_operation_layer_mode_composite_clip_to_layer (const gfloat *in,
+                                                   const gfloat *layer,
+                                                   const gfloat *comp,
+                                                   const gfloat *mask,
+                                                   gfloat        opacity,
+                                                   gfloat       *out,
+                                                   gint          samples)
+{
+  while (samples--)
+    {
+      gfloat layer_alpha = layer[ALPHA] * opacity;
+
+      if (mask)
+        layer_alpha *= *mask;
+
+      if (layer_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else if (in[ALPHA] == 0.0f)
+        {
+          out[RED]   = layer[RED];
+          out[GREEN] = layer[GREEN];
+          out[BLUE]  = layer[BLUE];
+        }
+      else
+        {
+          gint b;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = comp[b] * in[ALPHA] + layer[b] * (1.0f - in[ALPHA]);
+        }
+
+      out[ALPHA] = layer_alpha;
+
+      in    += 4;
+      layer += 4;
+      comp  += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+void
+gimp_operation_layer_mode_composite_intersection (const gfloat *in,
+                                                  const gfloat *layer,
+                                                  const gfloat *comp,
+                                                  const gfloat *mask,
+                                                  gfloat        opacity,
+                                                  gfloat       *out,
+                                                  gint          samples)
+{
+  while (samples--)
+    {
+      gfloat new_alpha = in[ALPHA] * comp[ALPHA] * opacity;
+
+      if (mask)
+        new_alpha *= *mask;
+
+      if (new_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else
+        {
+          out[RED]   = comp[RED];
+          out[GREEN] = comp[GREEN];
+          out[BLUE]  = comp[BLUE];
+        }
+
+      out[ALPHA] = new_alpha;
+
+      in   += 4;
+      comp += 4;
+      out  += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+/*  subtractive compositing functions.  these functions expect comp[ALPHA] to
+ *  specify the modified alpha of the overlapping content, as a fraction of the
+ *  original overlapping content (i.e., an alpha of 1.0 specifies that no
+ *  content is subtracted.)  when in[ALPHA] or layer[ALPHA] are zero, the value
+ *  of comp[RED..BLUE] is unconstrained (in particular, it may be NaN).
+ */
+
+void
+gimp_operation_layer_mode_composite_union_sub (const gfloat *in,
+                                               const gfloat *layer,
+                                               const gfloat *comp,
+                                               const gfloat *mask,
+                                               gfloat        opacity,
+                                               gfloat       *out,
+                                               gint          samples)
+{
+  while (samples--)
+    {
+      gfloat in_alpha    = in[ALPHA];
+      gfloat layer_alpha = layer[ALPHA] * opacity;
+      gfloat comp_alpha  = comp[ALPHA];
+      gfloat new_alpha;
+
+      if (mask)
+        layer_alpha *= *mask;
+
+      new_alpha = in_alpha + layer_alpha -
+                  (2.0f - comp_alpha) * in_alpha * layer_alpha;
+
+      if (layer_alpha == 0.0f || new_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else if (in_alpha == 0.0f)
+        {
+          out[RED]   = layer[RED];
+          out[GREEN] = layer[GREEN];
+          out[BLUE]  = layer[BLUE];
+        }
+      else
+        {
+          gfloat ratio       = in_alpha / new_alpha;
+          gfloat layer_coeff = 1.0f / in_alpha - 1.0f;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = ratio * (layer_alpha * (comp_alpha * comp[b] + layer_coeff * layer[b] - in[b]) + in[b]);
+        }
+
+      out[ALPHA] = new_alpha;
+
+      in    += 4;
+      layer += 4;
+      comp  += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+void
+gimp_operation_layer_mode_composite_clip_to_backdrop_sub (const gfloat *in,
+                                                          const gfloat *layer,
+                                                          const gfloat *comp,
+                                                          const gfloat *mask,
+                                                          gfloat        opacity,
+                                                          gfloat       *out,
+                                                          gint          samples)
+{
+  while (samples--)
+    {
+      gfloat layer_alpha = layer[ALPHA] * opacity;
+      gfloat comp_alpha  = comp[ALPHA];
+      gfloat new_alpha;
+
+      if (mask)
+        layer_alpha *= *mask;
+
+      comp_alpha *= layer_alpha;
+
+      new_alpha = 1.0f - layer_alpha + comp_alpha;
+
+      if (in[ALPHA] == 0.0f || comp_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = comp[b] * ratio + in[b] * (1.0f - ratio);
+        }
+
+      new_alpha *= in[ALPHA];
+
+      out[ALPHA] = new_alpha;
+
+      in    += 4;
+      layer += 4;
+      comp  += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+void
+gimp_operation_layer_mode_composite_clip_to_layer_sub (const gfloat *in,
+                                                       const gfloat *layer,
+                                                       const gfloat *comp,
+                                                       const gfloat *mask,
+                                                       gfloat        opacity,
+                                                       gfloat       *out,
+                                                       gint          samples)
+{
+  while (samples--)
+    {
+      gfloat in_alpha    = in[ALPHA];
+      gfloat layer_alpha = layer[ALPHA] * opacity;
+      gfloat comp_alpha  = comp[ALPHA];
+      gfloat new_alpha;
+
+      if (mask)
+        layer_alpha *= *mask;
+
+      comp_alpha *= in_alpha;
+
+      new_alpha = 1.0f - in_alpha + comp_alpha;
+
+      if (layer_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else if (in_alpha == 0.0f)
+        {
+          out[RED]   = layer[RED];
+          out[GREEN] = layer[GREEN];
+          out[BLUE]  = layer[BLUE];
+        }
+      else
+        {
+          gfloat ratio = comp_alpha / new_alpha;
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = comp[b] * ratio + layer[b] * (1.0f - ratio);
+        }
+
+      new_alpha *= layer_alpha;
+
+      out[ALPHA] = new_alpha;
+
+      in    += 4;
+      layer += 4;
+      comp  += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+}
+
+void
+gimp_operation_layer_mode_composite_intersection_sub (const gfloat *in,
+                                                      const gfloat *layer,
+                                                      const gfloat *comp,
+                                                      const gfloat *mask,
+                                                      gfloat        opacity,
+                                                      gfloat       *out,
+                                                      gint          samples)
+{
+  while (samples--)
+    {
+      gfloat new_alpha = in[ALPHA] * layer[ALPHA] * comp[ALPHA] * opacity;
+
+      if (mask)
+        new_alpha *= *mask;
+
+      if (new_alpha == 0.0f)
+        {
+          out[RED]   = in[RED];
+          out[GREEN] = in[GREEN];
+          out[BLUE]  = in[BLUE];
+        }
+      else
+        {
+          out[RED]   = comp[RED];
+          out[GREEN] = comp[GREEN];
+          out[BLUE]  = comp[BLUE];
+        }
+
+      out[ALPHA] = new_alpha;
+
+      in    += 4;
+      layer += 4;
+      comp  += 4;
+      out   += 4;
+
+      if (mask)
+        mask++;
+    }
+}
diff --git a/app/operations/layer-modes/gimpoperationlayermode-composite.h b/app/operations/layer-modes/gimpoperationlayermode-composite.h
new file mode 100644
index 0000000..f9ec2a5
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode-composite.h
@@ -0,0 +1,98 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode-composite.h
+ * Copyright (C) 2017 Michael Natterer <mitch@gimp.org>
+ *               2017 Øyvind Kolås <pippin@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_LAYER_MODE_COMPOSITE_H__
+#define __GIMP_OPERATION_LAYER_MODE_COMPOSITE_H__
+
+
+void gimp_operation_layer_mode_composite_union                 (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+void gimp_operation_layer_mode_composite_clip_to_backdrop      (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+void gimp_operation_layer_mode_composite_clip_to_layer         (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+void gimp_operation_layer_mode_composite_intersection          (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+
+void gimp_operation_layer_mode_composite_union_sub             (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+void gimp_operation_layer_mode_composite_clip_to_backdrop_sub  (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+void gimp_operation_layer_mode_composite_clip_to_layer_sub     (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+void gimp_operation_layer_mode_composite_intersection_sub      (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+
+#if COMPILE_SSE2_INTRINISICS
+
+void gimp_operation_layer_mode_composite_clip_to_backdrop_sse2 (const gfloat        *in,
+                                                                const gfloat        *layer,
+                                                                const gfloat        *comp,
+                                                                const gfloat        *mask,
+                                                                gfloat               opacity,
+                                                                gfloat              *out,
+                                                                gint                 samples);
+
+#endif /* COMPILE_SSE2_INTRINISICS */
+
+
+#endif /* __GIMP_OPERATION_LAYER_MODE_COMPOSITE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlayermode.c b/app/operations/layer-modes/gimpoperationlayermode.c
new file mode 100644
index 0000000..db74ed5
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode.c
@@ -0,0 +1,914 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2008 Martin Nordholts <martinn@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "../operations-types.h"
+
+#include "gimp-layer-modes.h"
+#include "gimpoperationlayermode.h"
+#include "gimpoperationlayermode-composite.h"
+
+
+/* the maximum number of samples to process in one go.  used to limit
+ * the size of the buffers we allocate on the stack.
+ */
+#define GIMP_COMPOSITE_BLEND_MAX_SAMPLES ((1 << 18) /* 256 KiB */  /      \
+                                          16 /* bytes per pixel */ /      \
+                                          2  /* max number of buffers */)
+
+/* number of consecutive unblended samples (whose source or destination alpha
+ * is zero) above which to split the blending process, in order to avoid
+ * performing too many unnecessary conversions.
+ */
+#define GIMP_COMPOSITE_BLEND_SPLIT_THRESHOLD 32
+
+
+enum
+{
+  PROP_0,
+  PROP_LAYER_MODE,
+  PROP_OPACITY,
+  PROP_BLEND_SPACE,
+  PROP_COMPOSITE_SPACE,
+  PROP_COMPOSITE_MODE
+};
+
+
+typedef void (* CompositeFunc) (const gfloat *in,
+                                const gfloat *layer,
+                                const gfloat *comp,
+                                const gfloat *mask,
+                                float         opacity,
+                                gfloat       *out,
+                                gint          samples);
+
+
+static void            gimp_operation_layer_mode_set_property        (GObject                *object,
+                                                                      guint                   property_id,
+                                                                      const GValue           *value,
+                                                                      GParamSpec             *pspec);
+static void            gimp_operation_layer_mode_get_property        (GObject                *object,
+                                                                      guint                   property_id,
+                                                                      GValue                 *value,
+                                                                      GParamSpec             *pspec);
+
+static void            gimp_operation_layer_mode_prepare             (GeglOperation          *operation);
+static GeglRectangle   gimp_operation_layer_mode_get_bounding_box    (GeglOperation          *operation);
+static gboolean        gimp_operation_layer_mode_parent_process      (GeglOperation          *operation,
+                                                                      GeglOperationContext   *context,
+                                                                      const gchar            *output_prop,
+                                                                      const GeglRectangle    *result,
+                                                                      gint                    level);
+
+static gboolean        gimp_operation_layer_mode_process             (GeglOperation          *operation,
+                                                                      void                   *in,
+                                                                      void                   *layer,
+                                                                      void                   *mask,
+                                                                      void                   *out,
+                                                                      glong                   samples,
+                                                                      const GeglRectangle    *roi,
+                                                                      gint                    level);
+
+static gboolean        gimp_operation_layer_mode_real_parent_process (GeglOperation          *operation,
+                                                                      GeglOperationContext   *context,
+                                                                      const gchar            *output_prop,
+                                                                      const GeglRectangle    *result,
+                                                                      gint                    level);
+static gboolean        gimp_operation_layer_mode_real_process        (GeglOperation          *operation,
+                                                                      void                   *in,
+                                                                      void                   *layer,
+                                                                      void                   *mask,
+                                                                      void                   *out,
+                                                                      glong                   samples,
+                                                                      const GeglRectangle    *roi,
+                                                                      gint                    level);
+
+static gboolean        process_last_node                             (GeglOperation       *operation,
+                                                                      void                *in,
+                                                                      void                *layer,
+                                                                      void                *mask,
+                                                                      void                *out,
+                                                                      glong                samples,
+                                                                      const GeglRectangle *roi,
+                                                                      gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationLayerMode, gimp_operation_layer_mode,
+               GEGL_TYPE_OPERATION_POINT_COMPOSER3)
+
+#define parent_class gimp_operation_layer_mode_parent_class
+
+
+static const Babl *gimp_layer_color_space_fish[3 /* from */][3 /* to */];
+
+static CompositeFunc composite_union                = gimp_operation_layer_mode_composite_union;
+static CompositeFunc composite_clip_to_backdrop     = gimp_operation_layer_mode_composite_clip_to_backdrop;
+static CompositeFunc composite_clip_to_layer        = gimp_operation_layer_mode_composite_clip_to_layer;
+static CompositeFunc composite_intersection         = gimp_operation_layer_mode_composite_intersection;
+
+static CompositeFunc composite_union_sub            = gimp_operation_layer_mode_composite_union_sub;
+static CompositeFunc composite_clip_to_backdrop_sub = gimp_operation_layer_mode_composite_clip_to_backdrop_sub;
+static CompositeFunc composite_clip_to_layer_sub    = gimp_operation_layer_mode_composite_clip_to_layer_sub;
+static CompositeFunc composite_intersection_sub     = gimp_operation_layer_mode_composite_intersection_sub;
+
+
+static void
+gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass)
+{
+  GObjectClass                     *object_class          = G_OBJECT_CLASS (klass);
+  GeglOperationClass               *operation_class       = GEGL_OPERATION_CLASS (klass);
+  GeglOperationPointComposer3Class *point_composer3_class = GEGL_OPERATION_POINT_COMPOSER3_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name", "gimp:layer-mode", NULL);
+
+  object_class->set_property        = gimp_operation_layer_mode_set_property;
+  object_class->get_property        = gimp_operation_layer_mode_get_property;
+
+  operation_class->prepare          = gimp_operation_layer_mode_prepare;
+  operation_class->get_bounding_box = gimp_operation_layer_mode_get_bounding_box;
+  operation_class->process          = gimp_operation_layer_mode_parent_process;
+
+  point_composer3_class->process    = gimp_operation_layer_mode_process;
+
+  klass->parent_process             = gimp_operation_layer_mode_real_parent_process;
+  klass->process                    = gimp_operation_layer_mode_real_process;
+  klass->get_affected_region        = NULL;
+
+  g_object_class_install_property (object_class, PROP_LAYER_MODE,
+                                   g_param_spec_enum ("layer-mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_OPACITY,
+                                   g_param_spec_double ("opacity",
+                                                        NULL, NULL,
+                                                        0.0, 1.0, 1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BLEND_SPACE,
+                                   g_param_spec_enum ("blend-space",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                      GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+
+  g_object_class_install_property (object_class, PROP_COMPOSITE_SPACE,
+                                   g_param_spec_enum ("composite-space",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                      GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_COMPOSITE_MODE,
+                                   g_param_spec_enum ("composite-mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_COMPOSITE_MODE,
+                                                      GIMP_LAYER_COMPOSITE_UNION,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  gimp_layer_color_space_fish
+    /* from */ [GIMP_LAYER_COLOR_SPACE_RGB_LINEAR     - 1]
+    /* to   */ [GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL - 1] =
+      babl_fish ("RGBA float", "R'G'B'A float");
+  gimp_layer_color_space_fish
+    /* from */ [GIMP_LAYER_COLOR_SPACE_RGB_LINEAR     - 1]
+    /* to   */ [GIMP_LAYER_COLOR_SPACE_LAB            - 1] =
+      babl_fish ("RGBA float", "CIE Lab alpha float");
+
+  gimp_layer_color_space_fish
+    /* from */ [GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL - 1]
+    /* to   */ [GIMP_LAYER_COLOR_SPACE_RGB_LINEAR     - 1] =
+      babl_fish ("R'G'B'A float", "RGBA float");
+  gimp_layer_color_space_fish
+    /* from */ [GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL - 1]
+    /* to   */ [GIMP_LAYER_COLOR_SPACE_LAB            - 1] =
+      babl_fish ("R'G'B'A float", "CIE Lab alpha float");
+
+  gimp_layer_color_space_fish
+    /* from */ [GIMP_LAYER_COLOR_SPACE_LAB            - 1]
+    /* to   */ [GIMP_LAYER_COLOR_SPACE_RGB_LINEAR     - 1] =
+      babl_fish ("CIE Lab alpha float", "RGBA float");
+  gimp_layer_color_space_fish
+    /* from */ [GIMP_LAYER_COLOR_SPACE_LAB            - 1]
+    /* to   */ [GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL - 1] =
+      babl_fish ("CIE Lab alpha float", "R'G'B'A float");
+
+#if COMPILE_SSE2_INTRINISICS
+  if (gimp_cpu_accel_get_support () & GIMP_CPU_ACCEL_X86_SSE2)
+    composite_clip_to_backdrop = gimp_operation_layer_mode_composite_clip_to_backdrop_sse2;
+#endif
+}
+
+static void
+gimp_operation_layer_mode_init (GimpOperationLayerMode *self)
+{
+}
+
+static void
+gimp_operation_layer_mode_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpOperationLayerMode *self = GIMP_OPERATION_LAYER_MODE (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER_MODE:
+      self->layer_mode = g_value_get_enum (value);
+      break;
+
+    case PROP_OPACITY:
+      self->prop_opacity = g_value_get_double (value);
+      break;
+
+    case PROP_BLEND_SPACE:
+      self->blend_space = g_value_get_enum (value);
+      break;
+
+    case PROP_COMPOSITE_SPACE:
+      self->composite_space = g_value_get_enum (value);
+      break;
+
+    case PROP_COMPOSITE_MODE:
+      self->prop_composite_mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_layer_mode_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpOperationLayerMode *self = GIMP_OPERATION_LAYER_MODE (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER_MODE:
+      g_value_set_enum (value, self->layer_mode);
+      break;
+
+    case PROP_OPACITY:
+      g_value_set_double (value, self->prop_opacity);
+      break;
+
+    case PROP_BLEND_SPACE:
+      g_value_set_enum (value, self->blend_space);
+      break;
+
+    case PROP_COMPOSITE_SPACE:
+      g_value_set_enum (value, self->composite_space);
+      break;
+
+    case PROP_COMPOSITE_MODE:
+      g_value_set_enum (value, self->prop_composite_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_operation_layer_mode_prepare (GeglOperation *operation)
+{
+  GimpOperationLayerMode *self = GIMP_OPERATION_LAYER_MODE (operation);
+  const GeglRectangle    *input_extent;
+  const GeglRectangle    *mask_extent;
+  const Babl             *preferred_format;
+  const Babl             *format;
+
+  self->composite_mode = self->prop_composite_mode;
+
+  if (self->composite_mode == GIMP_LAYER_COMPOSITE_AUTO)
+    {
+      self->composite_mode =
+        gimp_layer_mode_get_composite_mode (self->layer_mode);
+
+      g_warn_if_fail (self->composite_mode != GIMP_LAYER_COMPOSITE_AUTO);
+    }
+
+  self->function       = gimp_layer_mode_get_function       (self->layer_mode);
+  self->blend_function = gimp_layer_mode_get_blend_function (self->layer_mode);
+
+  input_extent = gegl_operation_source_get_bounding_box (operation, "input");
+  mask_extent  = gegl_operation_source_get_bounding_box (operation, "aux2");
+
+  /* if the input pad has data, work as usual. */
+  if (input_extent && ! gegl_rectangle_is_empty (input_extent))
+    {
+      self->is_last_node = FALSE;
+
+      preferred_format = gegl_operation_get_source_format (operation, "input");
+    }
+  /* otherwise, we're the last node (corresponding to the bottom layer).
+   * in this case, we render the layer (as if) using UNION mode.
+   */
+  else
+    {
+      self->is_last_node = TRUE;
+
+      /* if the layer mode doesn't affect the source, use a shortcut
+       * function that only applies the opacity/mask to the layer.
+       */
+      if (! (gimp_operation_layer_mode_get_affected_region (self) &
+             GIMP_LAYER_COMPOSITE_REGION_SOURCE))
+        {
+          self->function = process_last_node;
+        }
+      /* otherwise, use the original process function, but force the
+       * composite mode to UNION.
+       */
+      else
+        {
+          self->composite_mode = GIMP_LAYER_COMPOSITE_UNION;
+        }
+
+      preferred_format = gegl_operation_get_source_format (operation, "aux");
+    }
+
+  self->has_mask = mask_extent && ! gegl_rectangle_is_empty (mask_extent);
+
+  format = gimp_layer_mode_get_format (self->layer_mode,
+                                       self->blend_space,
+                                       self->composite_space,
+                                       self->composite_mode,
+                                       preferred_format);
+
+  gegl_operation_set_format (operation, "input",  format);
+  gegl_operation_set_format (operation, "output", format);
+  gegl_operation_set_format (operation, "aux",    format);
+  gegl_operation_set_format (operation, "aux2",   babl_format ("Y float"));
+}
+
+static GeglRectangle
+gimp_operation_layer_mode_get_bounding_box (GeglOperation *op)
+{
+  GimpOperationLayerMode   *self     = (gpointer) op;
+  GeglRectangle            *in_rect;
+  GeglRectangle            *aux_rect;
+  GeglRectangle            *aux2_rect;
+  GeglRectangle             src_rect = {};
+  GeglRectangle             dst_rect = {};
+  GeglRectangle             result;
+  GimpLayerCompositeRegion  included_region;
+
+  in_rect   = gegl_operation_source_get_bounding_box (op, "input");
+  aux_rect  = gegl_operation_source_get_bounding_box (op, "aux");
+  aux2_rect = gegl_operation_source_get_bounding_box (op, "aux2");
+
+  if (in_rect)
+    dst_rect = *in_rect;
+
+  if (aux_rect)
+    {
+      src_rect = *aux_rect;
+
+      if (aux2_rect)
+        gegl_rectangle_intersect (&src_rect, &src_rect, aux2_rect);
+    }
+
+  if (self->is_last_node)
+    {
+      included_region = GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+    }
+  else
+    {
+      included_region = gimp_layer_mode_get_included_region (self->layer_mode,
+                                                             self->composite_mode);
+    }
+
+  if (self->prop_opacity == 0.0)
+    included_region &= ~GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+
+  gegl_rectangle_intersect (&result, &src_rect, &dst_rect);
+
+  if (included_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE)
+    gegl_rectangle_bounding_box (&result, &result, &src_rect);
+
+  if (included_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION)
+    gegl_rectangle_bounding_box (&result, &result, &dst_rect);
+
+  return result;
+}
+
+static gboolean
+gimp_operation_layer_mode_parent_process (GeglOperation        *operation,
+                                          GeglOperationContext *context,
+                                          const gchar          *output_prop,
+                                          const GeglRectangle  *result,
+                                          gint                  level)
+{
+  GimpOperationLayerMode *point = GIMP_OPERATION_LAYER_MODE (operation);
+
+  point->opacity = point->prop_opacity;
+
+  /* if we have a mask, but it's not included in the output, pretend the
+   * opacity is 0, so that we don't composite 'aux' over 'input' as if there
+   * was no mask.
+   */
+  if (point->has_mask)
+    {
+      GObject  *mask;
+      gboolean  has_mask;
+
+      /* get the raw value.  this does not increase the reference count. */
+      mask = gegl_operation_context_get_object (context, "aux2");
+
+      /* disregard 'mask' if it's not included in the roi. */
+      has_mask =
+        mask &&
+        gegl_rectangle_intersect (NULL,
+                                  gegl_buffer_get_extent (GEGL_BUFFER (mask)),
+                                  result);
+
+      if (! has_mask)
+        point->opacity = 0.0;
+    }
+
+  return GIMP_OPERATION_LAYER_MODE_GET_CLASS (point)->parent_process (
+    operation, context, output_prop, result, level);
+}
+
+static gboolean
+gimp_operation_layer_mode_process (GeglOperation       *operation,
+                                   void                *in,
+                                   void                *layer,
+                                   void                *mask,
+                                   void                *out,
+                                   glong                samples,
+                                   const GeglRectangle *roi,
+                                   gint                 level)
+{
+  return ((GimpOperationLayerMode *) operation)->function (
+    operation, in, layer, mask, out, samples, roi, level);
+}
+
+static gboolean
+gimp_operation_layer_mode_real_parent_process (GeglOperation        *operation,
+                                               GeglOperationContext *context,
+                                               const gchar          *output_prop,
+                                               const GeglRectangle  *result,
+                                               gint                  level)
+{
+  GimpOperationLayerMode   *point = GIMP_OPERATION_LAYER_MODE (operation);
+  GObject                  *input;
+  GObject                  *aux;
+  gboolean                  has_input;
+  gboolean                  has_aux;
+  GimpLayerCompositeRegion  included_region;
+
+  /* get the raw values.  this does not increase the reference count. */
+  input = gegl_operation_context_get_object (context, "input");
+  aux   = gegl_operation_context_get_object (context, "aux");
+
+  /* disregard 'input' if it's not included in the roi. */
+  has_input =
+    input &&
+    gegl_rectangle_intersect (NULL,
+                              gegl_buffer_get_extent (GEGL_BUFFER (input)),
+                              result);
+
+  /* disregard 'aux' if it's not included in the roi, or if it's fully
+   * transparent.
+   */
+  has_aux =
+    aux &&
+    point->opacity != 0.0 &&
+    gegl_rectangle_intersect (NULL,
+                              gegl_buffer_get_extent (GEGL_BUFFER (aux)),
+                              result);
+
+  if (point->is_last_node)
+    {
+      included_region = GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+    }
+  else
+    {
+      included_region = gimp_layer_mode_get_included_region (point->layer_mode,
+                                                             point->composite_mode);
+    }
+
+  /* if there's no 'input' ... */
+  if (! has_input)
+    {
+      /* ... and there's 'aux', and the composite mode includes it (or we're
+       * the last node) ...
+       */
+      if (has_aux && (included_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE))
+        {
+          GimpLayerCompositeRegion affected_region;
+
+          affected_region =
+            gimp_operation_layer_mode_get_affected_region (point);
+
+          /* ... and the op doesn't otherwise affect 'aux', or changes its
+           * alpha ...
+           */
+          if (! (affected_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE) &&
+              point->opacity == 1.0                                    &&
+              ! gegl_operation_context_get_object (context, "aux2"))
+            {
+              /* pass 'aux' directly as output; */
+              gegl_operation_context_set_object (context, "output", aux);
+              return TRUE;
+            }
+
+          /* otherwise, if the op affects 'aux', or changes its alpha, process
+           * it even though there's no 'input';
+           */
+        }
+      /* otherwise, there's no 'aux', or the composite mode doesn't include it,
+       * and so ...
+       */
+      else
+        {
+          /* ... the output is empty. */
+          gegl_operation_context_set_object (context, "output", NULL);
+          return TRUE;
+        }
+    }
+  /* otherwise, if there's 'input' but no 'aux' ... */
+  else if (! has_aux)
+    {
+      /* ... and the composite mode includes 'input' ... */
+      if (included_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION)
+        {
+          GimpLayerCompositeRegion affected_region;
+
+          affected_region =
+            gimp_operation_layer_mode_get_affected_region (point);
+
+          /* ... and the op doesn't otherwise affect 'input' ... */
+          if (! (affected_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION))
+            {
+              /* pass 'input' directly as output; */
+              gegl_operation_context_set_object (context, "output", input);
+              return TRUE;
+            }
+
+          /* otherwise, if the op affects 'input', process it even though
+           * there's no 'aux';
+           */
+        }
+
+      /* otherwise, the output is fully transparent, but we process it anyway
+       * to maintain the 'input' color values.
+       */
+    }
+
+  /* FIXME: we don't actually handle the case where one of the inputs
+   * is NULL -- it'll just segfault.  'input' is not expected to be NULL,
+   * but 'aux' might be, currently.
+   */
+  if (! input || ! aux)
+    {
+      GObject *empty = G_OBJECT (gegl_buffer_new (NULL, NULL));
+
+      if (! input) gegl_operation_context_set_object (context, "input", empty);
+      if (! aux)   gegl_operation_context_set_object (context, "aux",   empty);
+
+      if (! input && ! aux)
+        gegl_object_set_has_forked (G_OBJECT (empty));
+
+      g_object_unref (empty);
+    }
+
+  /* chain up, which will create the needed buffers for our actual
+   * process function
+   */
+  return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
+                                                       output_prop, result,
+                                                       level);
+}
+
+static gboolean
+gimp_operation_layer_mode_real_process (GeglOperation       *operation,
+                                        void                *in_p,
+                                        void                *layer_p,
+                                        void                *mask_p,
+                                        void                *out_p,
+                                        glong                samples,
+                                        const GeglRectangle *roi,
+                                        gint                 level)
+{
+  GimpOperationLayerMode *layer_mode              = (gpointer) operation;
+  gfloat                 *in                      = in_p;
+  gfloat                 *out                     = out_p;
+  gfloat                 *layer                   = layer_p;
+  gfloat                 *mask                    = mask_p;
+  gfloat                  opacity                 = layer_mode->opacity;
+  GimpLayerColorSpace     blend_space             = layer_mode->blend_space;
+  GimpLayerColorSpace     composite_space         = layer_mode->composite_space;
+  GimpLayerCompositeMode  composite_mode          = layer_mode->composite_mode;
+  GimpLayerModeBlendFunc  blend_function          = layer_mode->blend_function;
+  gboolean                composite_needs_in_color;
+  gfloat                 *blend_in;
+  gfloat                 *blend_layer;
+  gfloat                 *blend_out;
+  const Babl             *composite_to_blend_fish = NULL;
+  const Babl             *blend_to_composite_fish = NULL;
+
+  /* make sure we don't process more than GIMP_COMPOSITE_BLEND_MAX_SAMPLES
+   * at a time, so that we don't overflow the stack if we allocate buffers
+   * on it.  note that this has to be done with a nested function call,
+   * because alloca'd buffers remain for the duration of the stack frame.
+   */
+  while (samples > GIMP_COMPOSITE_BLEND_MAX_SAMPLES)
+    {
+      gimp_operation_layer_mode_real_process (operation,
+                                              in, layer, mask, out,
+                                              GIMP_COMPOSITE_BLEND_MAX_SAMPLES,
+                                              roi, level);
+
+      in      += 4 * GIMP_COMPOSITE_BLEND_MAX_SAMPLES;
+      layer   += 4 * GIMP_COMPOSITE_BLEND_MAX_SAMPLES;
+      if (mask)
+        mask  +=     GIMP_COMPOSITE_BLEND_MAX_SAMPLES;
+      out     += 4 * GIMP_COMPOSITE_BLEND_MAX_SAMPLES;
+
+      samples -= GIMP_COMPOSITE_BLEND_MAX_SAMPLES;
+    }
+
+  composite_needs_in_color =
+    composite_mode == GIMP_LAYER_COMPOSITE_UNION ||
+    composite_mode == GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP;
+
+  blend_in    = in;
+  blend_layer = layer;
+  blend_out   = out;
+
+  if (blend_space != GIMP_LAYER_COLOR_SPACE_AUTO)
+    {
+      gimp_assert (composite_space >= 1 && composite_space < 4);
+      gimp_assert (blend_space     >= 1 && blend_space     < 4);
+
+      composite_to_blend_fish = gimp_layer_color_space_fish [composite_space - 1]
+                                                            [blend_space     - 1];
+
+      blend_to_composite_fish = gimp_layer_color_space_fish [blend_space     - 1]
+                                                            [composite_space - 1];
+    }
+
+  /* if we need to convert the samples between the composite and blend
+   * spaces...
+   */
+  if (composite_to_blend_fish)
+    {
+      gint i;
+      gint end;
+
+      if (in != out || composite_needs_in_color)
+        {
+          /* don't convert input in-place if we're not doing in-place output,
+           * or if we're going to need the original input for compositing.
+           */
+          blend_in = g_alloca (sizeof (gfloat) * 4 * samples);
+        }
+      blend_layer  = g_alloca (sizeof (gfloat) * 4 * samples);
+
+      if (in == out) /* in-place detected, avoid clobbering since we need to
+                        read 'in' for the compositing stage  */
+        {
+          if (blend_layer != layer)
+            blend_out = blend_layer;
+          else
+            blend_out = g_alloca (sizeof (gfloat) * 4 * samples);
+        }
+
+      /* samples whose the source or destination alpha is zero are not blended,
+       * and therefore do not need to be converted.  while it's generally
+       * desirable to perform conversion and blending in bulk, when we have
+       * more than a certain number of consecutive unblended samples, the cost
+       * of converting them outweighs the cost of splitting the process around
+       * them to avoid the conversion.
+       */
+
+      i   = ALPHA;
+      end = 4 * samples + ALPHA;
+
+      while (TRUE)
+        {
+          gint first;
+          gint last;
+          gint count;
+
+          /* skip any unblended samples.  the color values of `blend_out` for
+           * these samples are unconstrained, in particular, they may be NaN,
+           * but the alpha values should generally be finite, and specifically
+           * 0 when the source alpha is 0.
+           */
+          while (i < end && (in[i] == 0.0f || layer[i] == 0.0f))
+            {
+              blend_out[i] = 0.0f;
+              i += 4;
+            }
+
+          /* stop if there are no more samples */
+          if (i == end)
+            break;
+
+          /* otherwise, keep scanning the samples until we find
+           * GIMP_COMPOSITE_BLEND_SPLIT_THRESHOLD consecutive unblended
+           * samples.
+           */
+
+          first  = i;
+          i     += 4;
+          last   = i;
+
+          while (i < end && i - last < 4 * GIMP_COMPOSITE_BLEND_SPLIT_THRESHOLD)
+            {
+              gboolean blended;
+
+              blended = (in[i] != 0.0f && layer[i] != 0.0f);
+
+              i += 4;
+              if (blended)
+                last = i;
+            }
+
+          /* convert and blend the samples in the range [first, last) */
+
+          count  = (last - first) / 4;
+          first -= ALPHA;
+
+          babl_process (composite_to_blend_fish,
+                        in + first, blend_in + first, count);
+          babl_process (composite_to_blend_fish,
+                        layer + first, blend_layer + first, count);
+
+          blend_function (operation, blend_in + first, blend_layer + first,
+                          blend_out + first, count);
+
+          babl_process (blend_to_composite_fish,
+                        blend_out + first, blend_out + first, count);
+
+          /* make sure the alpha values of `blend_out` are valid for the
+           * trailing unblended samples.
+           */
+          for (; last < i; last += 4)
+            blend_out[last] = 0.0f;
+        }
+    }
+  else
+    {
+      /* if both blending and compositing use the same color space, things are
+       * much simpler.
+       */
+
+      if (in == out) /* in-place detected, avoid clobbering since we need to
+                        read 'in' for the compositing stage  */
+        {
+          blend_out = g_alloca (sizeof (gfloat) * 4 * samples);
+        }
+
+      blend_function (operation, blend_in, blend_layer, blend_out, samples);
+    }
+
+  if (! gimp_layer_mode_is_subtractive (layer_mode->layer_mode))
+    {
+      switch (composite_mode)
+        {
+        case GIMP_LAYER_COMPOSITE_UNION:
+        case GIMP_LAYER_COMPOSITE_AUTO:
+          composite_union (in, layer, blend_out, mask, opacity,
+                           out, samples);
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+          composite_clip_to_backdrop (in, layer, blend_out, mask, opacity,
+                                      out, samples);
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+          composite_clip_to_layer (in, layer, blend_out, mask, opacity,
+                                   out, samples);
+          break;
+
+        case GIMP_LAYER_COMPOSITE_INTERSECTION:
+          composite_intersection (in, layer, blend_out, mask, opacity,
+                                  out, samples);
+          break;
+        }
+    }
+  else
+    {
+      switch (composite_mode)
+        {
+        case GIMP_LAYER_COMPOSITE_UNION:
+        case GIMP_LAYER_COMPOSITE_AUTO:
+          composite_union_sub (in, layer, blend_out, mask, opacity,
+                               out, samples);
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+          composite_clip_to_backdrop_sub (in, layer, blend_out, mask, opacity,
+                                          out, samples);
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+          composite_clip_to_layer_sub (in, layer, blend_out, mask, opacity,
+                                       out, samples);
+          break;
+
+        case GIMP_LAYER_COMPOSITE_INTERSECTION:
+          composite_intersection_sub (in, layer, blend_out, mask, opacity,
+                                      out, samples);
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+process_last_node (GeglOperation       *operation,
+                   void                *in_p,
+                   void                *layer_p,
+                   void                *mask_p,
+                   void                *out_p,
+                   glong                samples,
+                   const GeglRectangle *roi,
+                   gint                 level)
+{
+  gfloat *out     = out_p;
+  gfloat *layer   = layer_p;
+  gfloat *mask    = mask_p;
+  gfloat  opacity = GIMP_OPERATION_LAYER_MODE (operation)->opacity;
+
+  while (samples--)
+    {
+      memcpy (out, layer, 3 * sizeof (gfloat));
+
+      out[ALPHA] = layer[ALPHA] * opacity;
+      if (mask)
+        out[ALPHA] *= *mask++;
+
+      layer += 4;
+      out   += 4;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+
+GimpLayerCompositeRegion
+gimp_operation_layer_mode_get_affected_region (GimpOperationLayerMode *layer_mode)
+{
+  GimpOperationLayerModeClass *klass;
+
+  g_return_val_if_fail (GIMP_IS_OPERATION_LAYER_MODE (layer_mode),
+                        GIMP_LAYER_COMPOSITE_REGION_INTERSECTION);
+
+  klass = GIMP_OPERATION_LAYER_MODE_GET_CLASS (layer_mode);
+
+  if (klass->get_affected_region)
+    return klass->get_affected_region (layer_mode);
+
+  return GIMP_LAYER_COMPOSITE_REGION_INTERSECTION;
+}
diff --git a/app/operations/layer-modes/gimpoperationlayermode.h b/app/operations/layer-modes/gimpoperationlayermode.h
new file mode 100644
index 0000000..a2a5463
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationlayermode.h
@@ -0,0 +1,89 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationlayermode.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_LAYER_MODE_H__
+#define __GIMP_OPERATION_LAYER_MODE_H__
+
+
+#include <gegl-plugin.h>
+
+
+#define GIMP_TYPE_OPERATION_LAYER_MODE            (gimp_operation_layer_mode_get_type ())
+#define GIMP_OPERATION_LAYER_MODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_LAYER_MODE, GimpOperationLayerMode))
+#define GIMP_OPERATION_LAYER_MODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_LAYER_MODE, GimpOperationLayerModeClass))
+#define GIMP_IS_OPERATION_LAYER_MODE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_LAYER_MODE))
+#define GIMP_IS_OPERATION_LAYER_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_LAYER_MODE))
+#define GIMP_OPERATION_LAYER_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_LAYER_MODE, GimpOperationLayerModeClass))
+
+
+typedef struct _GimpOperationLayerModeClass GimpOperationLayerModeClass;
+
+struct _GimpOperationLayerMode
+{
+  GeglOperationPointComposer3  parent_instance;
+
+  GimpLayerMode                layer_mode;
+  gdouble                      opacity;
+  GimpLayerColorSpace          blend_space;
+  GimpLayerColorSpace          composite_space;
+  GimpLayerCompositeMode       composite_mode;
+
+  gdouble                      prop_opacity;
+  GimpLayerCompositeMode       prop_composite_mode;
+
+  GimpLayerModeFunc            function;
+  GimpLayerModeBlendFunc       blend_function;
+  gboolean                     is_last_node;
+  gboolean                     has_mask;
+};
+
+struct _GimpOperationLayerModeClass
+{
+  GeglOperationPointComposer3Class  parent_class;
+
+  /*  virtual functions  */
+  gboolean                 (* parent_process)      (GeglOperation          *operation,
+                                                    GeglOperationContext   *context,
+                                                    const gchar            *output_prop,
+                                                    const GeglRectangle    *result,
+                                                    gint                    level);
+  gboolean                 (* process)             (GeglOperation          *operation,
+                                                    void                   *in,
+                                                    void                   *aux,
+                                                    void                   *mask,
+                                                    void                   *out,
+                                                    glong                   samples,
+                                                    const GeglRectangle    *roi,
+                                                    gint                    level);
+
+  /* Returns the composite region (any combination of the layer and the
+   * backdrop) that the layer mode affects.  Most modes only affect the
+   * overlapping region, and don't need to override this function.
+   */
+  GimpLayerCompositeRegion (* get_affected_region) (GimpOperationLayerMode *layer_mode);
+};
+
+
+GType                    gimp_operation_layer_mode_get_type            (void) G_GNUC_CONST;
+
+GimpLayerCompositeRegion gimp_operation_layer_mode_get_affected_region (GimpOperationLayerMode *layer_mode);
+
+
+#endif /* __GIMP_OPERATION_LAYER_MODE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationmerge.c b/app/operations/layer-modes/gimpoperationmerge.c
new file mode 100644
index 0000000..e1b25ca
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationmerge.c
@@ -0,0 +1,243 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationmerge.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationmerge.h"
+
+
+static gboolean   gimp_operation_merge_process (GeglOperation       *op,
+                                                void                *in,
+                                                void                *layer,
+                                                void                *mask,
+                                                void                *out,
+                                                glong                samples,
+                                                const GeglRectangle *roi,
+                                                gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationMerge, gimp_operation_merge,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_merge_class_init (GimpOperationMergeClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:merge",
+                                 "description", "GIMP merge mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_merge_process;
+}
+
+static void
+gimp_operation_merge_init (GimpOperationMerge *self)
+{
+}
+
+static gboolean
+gimp_operation_merge_process (GeglOperation       *op,
+                              void                *in_p,
+                              void                *layer_p,
+                              void                *mask_p,
+                              void                *out_p,
+                              glong                samples,
+                              const GeglRectangle *roi,
+                              gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat in_alpha    = in[ALPHA];
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          in_alpha = MIN (in_alpha, 1.0f - layer_alpha);
+          new_alpha  = in_alpha + layer_alpha;
+
+          if (new_alpha)
+            {
+              gfloat ratio = layer_alpha / new_alpha;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b] + (layer[b] - in[b]) * ratio;
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+      while (samples--)
+        {
+          gfloat in_alpha    = in[ALPHA];
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          layer_alpha -= 1.0f - in_alpha;
+
+          if (layer_alpha > 0.0f)
+            {
+              gfloat ratio = layer_alpha / in_alpha;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b] + (layer[b] - in[b]) * ratio;
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          out[ALPHA] = in_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          if (layer_alpha != 0.0f)
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          out[ALPHA] = layer_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      while (samples--)
+        {
+          gfloat in_alpha    = in[ALPHA];
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          layer_alpha -= 1.0f - in_alpha;
+          layer_alpha = MAX (layer_alpha, 0.0f);
+
+          if (layer_alpha != 0.0f)
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          out[ALPHA] = layer_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes/gimpoperationmerge.h b/app/operations/layer-modes/gimpoperationmerge.h
new file mode 100644
index 0000000..01afde1
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationmerge.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationmerge.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_MERGE_H__
+#define __GIMP_OPERATION_MERGE_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_MERGE            (gimp_operation_merge_get_type ())
+#define GIMP_OPERATION_MERGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_MERGE, GimpOperationMerge))
+#define GIMP_OPERATION_MERGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_MERGE, GimpOperationMergeClass))
+#define GIMP_IS_OPERATION_MERGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_MERGE))
+#define GIMP_IS_OPERATION_MERGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_MERGE))
+#define GIMP_OPERATION_MERGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_MERGE, GimpOperationMergeClass))
+
+
+typedef struct _GimpOperationMerge      GimpOperationMerge;
+typedef struct _GimpOperationMergeClass GimpOperationMergeClass;
+
+struct _GimpOperationMerge
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationMergeClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_merge_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_MERGE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationnormal-sse2.c b/app/operations/layer-modes/gimpoperationnormal-sse2.c
new file mode 100644
index 0000000..73e42ed
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationnormal-sse2.c
@@ -0,0 +1,264 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationnormal-sse2.c
+ * Copyright (C) 2013 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "operations/operations-types.h"
+
+#include "gimpoperationnormal.h"
+
+
+#if COMPILE_SSE2_INTRINISICS
+
+/* SSE2 */
+#include <emmintrin.h>
+
+
+gboolean
+gimp_operation_normal_process_sse2 (GeglOperation       *op,
+                                    void                *in_p,
+                                    void                *layer_p,
+                                    void                *mask_p,
+                                    void                *out_p,
+                                    glong                samples,
+                                    const GeglRectangle *roi,
+                                    gint                 level)
+{
+  /* check alignment */
+  if ((((uintptr_t)in_p) | ((uintptr_t)layer_p) | ((uintptr_t)out_p)) & 0x0F)
+    {
+      return gimp_operation_normal_process (op,
+                                            in_p, layer_p, mask_p, out_p,
+                                            samples, roi, level);
+    }
+  else
+    {
+      GimpOperationLayerMode *layer_mode      = (gpointer) op;
+      gfloat                  opacity         = layer_mode->opacity;
+      gfloat                 *mask            = mask_p;
+      const                   __v4sf *v_in    = (const __v4sf*) in_p;
+      const                   __v4sf *v_layer = (const __v4sf*) layer_p;
+                              __v4sf *v_out   = (      __v4sf*) out_p;
+
+      const __v4sf one       = _mm_set1_ps (1.0f);
+      const __v4sf v_opacity = _mm_set1_ps (opacity);
+
+      switch (layer_mode->composite_mode)
+        {
+        case GIMP_LAYER_COMPOSITE_UNION:
+        case GIMP_LAYER_COMPOSITE_AUTO:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  __v4sf dst_alpha, a_term, out_pixel, out_alpha, out_pixel_rbaa;
+
+                  /* expand alpha */
+                  dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
+                                                         _MM_SHUFFLE (3, 3, 3, 3));
+
+                  /* a_term = dst_a * (1.0 - src_a) */
+                  a_term = dst_alpha * (one - alpha);
+
+                  /* out(color) = src * src_a + dst * a_term */
+                  out_pixel = rgba_layer * alpha + rgba_in * a_term;
+
+                  /* out(alpha) = 1.0 * src_a + 1.0 * a_term */
+                  out_alpha = alpha + a_term;
+
+                  /* un-premultiply */
+                  out_pixel = out_pixel / out_alpha;
+
+                  /* swap in the real alpha */
+                  out_pixel_rbaa = _mm_shuffle_ps (out_pixel, out_alpha, _MM_SHUFFLE (3, 3, 2, 0));
+                  out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
+
+                  *v_out++ = out_pixel;
+                }
+              else
+                {
+                  *v_out++ = rgba_in;
+                }
+            }
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  __v4sf dst_alpha, out_pixel, out_pixel_rbaa;
+
+                  /* expand alpha */
+                  dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
+                                                         _MM_SHUFFLE (3, 3, 3, 3));
+
+                  /* out(color) = dst * (1 - src_a) + src * src_a */
+                  out_pixel = rgba_in + (rgba_layer - rgba_in) * alpha;
+
+                  /* swap in the real alpha */
+                  out_pixel_rbaa = _mm_shuffle_ps (out_pixel, dst_alpha, _MM_SHUFFLE (3, 3, 2, 0));
+                  out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
+
+                  *v_out++ = out_pixel;
+                }
+              else
+                {
+                  *v_out++ = rgba_in;
+                }
+            }
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+              __v4sf out_pixel, out_pixel_rbaa;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  /* out(color) = src */
+                  out_pixel = rgba_layer;
+                }
+              else
+                {
+                  out_pixel = rgba_in;
+                }
+
+              /* swap in the real alpha */
+              out_pixel_rbaa = _mm_shuffle_ps (out_pixel, alpha, _MM_SHUFFLE (3, 3, 2, 0));
+              out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
+
+              *v_out++ = out_pixel;
+            }
+          break;
+
+        case GIMP_LAYER_COMPOSITE_INTERSECTION:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+              __v4sf out_pixel, out_pixel_rbaa;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              /* multiply the alpha by in's alpha */
+              alpha *= (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
+                                                  _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  /* out(color) = src */
+                  out_pixel = rgba_layer;
+                }
+              else
+                {
+                  out_pixel = rgba_in;
+                }
+
+              /* swap in the real alpha */
+              out_pixel_rbaa = _mm_shuffle_ps (out_pixel, alpha, _MM_SHUFFLE (3, 3, 2, 0));
+              out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
+
+              *v_out++ = out_pixel;
+            }
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+#endif /* COMPILE_SSE2_INTRINISICS */
diff --git a/app/operations/layer-modes/gimpoperationnormal-sse4.c b/app/operations/layer-modes/gimpoperationnormal-sse4.c
new file mode 100644
index 0000000..ba621a2
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationnormal-sse4.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationnormalmode-sse2.c
+ * Copyright (C) 2013 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "operations/operations-types.h"
+
+#include "gimpoperationnormal.h"
+
+
+#if COMPILE_SSE4_1_INTRINISICS
+
+/* SSE4 */
+#include <smmintrin.h>
+
+
+gboolean
+gimp_operation_normal_process_sse4 (GeglOperation       *op,
+                                    void                *in_p,
+                                    void                *layer_p,
+                                    void                *mask_p,
+                                    void                *out_p,
+                                    glong                samples,
+                                    const GeglRectangle *roi,
+                                    gint                 level)
+{
+  /* check alignment */
+  if ((((uintptr_t)in_p) | ((uintptr_t)layer_p) | ((uintptr_t)out_p)) & 0x0F)
+    {
+      return gimp_operation_normal_process (op,
+                                            in_p, layer_p, mask_p, out_p,
+                                            samples, roi, level);
+    }
+  else
+    {
+      GimpOperationLayerMode *layer_mode      = (gpointer) op;
+      gfloat                  opacity         = layer_mode->opacity;
+      gfloat                 *mask            = mask_p;
+      const                   __v4sf *v_in    = (const __v4sf*) in_p;
+      const                   __v4sf *v_layer = (const __v4sf*) layer_p;
+                              __v4sf *v_out   = (      __v4sf*) out_p;
+
+      const __v4sf one       = _mm_set1_ps (1.0f);
+      const __v4sf v_opacity = _mm_set1_ps (opacity);
+
+      switch (layer_mode->composite_mode)
+        {
+        case GIMP_LAYER_COMPOSITE_UNION:
+        case GIMP_LAYER_COMPOSITE_AUTO:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  __v4sf dst_alpha, a_term, out_pixel, out_alpha;
+
+                  /* expand alpha */
+                  dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
+                                                         _MM_SHUFFLE (3, 3, 3, 3));
+
+                  /* a_term = dst_a * (1.0 - src_a) */
+                  a_term = dst_alpha * (one - alpha);
+
+                  /* out(color) = src * src_a + dst * a_term */
+                  out_pixel = rgba_layer * alpha + rgba_in * a_term;
+
+                  /* out(alpha) = 1.0 * src_a + 1.0 * a_term */
+                  out_alpha = alpha + a_term;
+
+                  /* un-premultiply */
+                  out_pixel = out_pixel / out_alpha;
+
+                  /* swap in the real alpha */
+                  out_pixel = _mm_blend_ps (out_pixel, out_alpha, 0x08);
+
+                  *v_out++ = out_pixel;
+                }
+              else
+                {
+                  *v_out++ = rgba_in;
+                }
+            }
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  __v4sf dst_alpha, out_pixel;
+
+                  /* expand alpha */
+                  dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
+                                                         _MM_SHUFFLE (3, 3, 3, 3));
+
+                  /* out(color) = dst * (1 - src_a) + src * src_a */
+                  out_pixel = rgba_in + (rgba_layer - rgba_in) * alpha;
+
+                  /* swap in the real alpha */
+                  out_pixel = _mm_blend_ps (out_pixel, dst_alpha, 0x08);
+
+                  *v_out++ = out_pixel;
+                }
+              else
+                {
+                  *v_out++ = rgba_in;
+                }
+            }
+          break;
+
+        case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+              __v4sf out_pixel;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  /* out(color) = src */
+                  out_pixel = rgba_layer;
+                }
+              else
+                {
+                  out_pixel = rgba_in;
+                }
+
+              /* swap in the real alpha */
+              out_pixel = _mm_blend_ps (out_pixel, alpha, 0x08);
+
+              *v_out++ = out_pixel;
+            }
+          break;
+
+        case GIMP_LAYER_COMPOSITE_INTERSECTION:
+          while (samples--)
+            {
+              __v4sf rgba_in, rgba_layer, alpha;
+              __v4sf out_pixel;
+
+              rgba_in    = *v_in++;
+              rgba_layer = *v_layer++;
+
+              /* expand alpha */
+              alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_layer,
+                                                 _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (mask)
+                {
+                  __v4sf mask_alpha;
+
+                  /* multiply layer's alpha by the mask */
+                  mask_alpha = _mm_set1_ps (*mask++);
+                  alpha = alpha * mask_alpha;
+                }
+
+              alpha = alpha * v_opacity;
+
+              /* multiply the alpha by in's alpha */
+              alpha *= (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
+                                                  _MM_SHUFFLE (3, 3, 3, 3));
+
+              if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
+                {
+                  /* out(color) = src */
+                  out_pixel = rgba_layer;
+                }
+              else
+                {
+                  out_pixel = rgba_in;
+                }
+
+              /* swap in the real alpha */
+              out_pixel = _mm_blend_ps (out_pixel, alpha, 0x08);
+
+              *v_out++ = out_pixel;
+            }
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+#endif /* COMPILE_SSE4_1_INTRINISICS */
diff --git a/app/operations/layer-modes/gimpoperationnormal.c b/app/operations/layer-modes/gimpoperationnormal.c
new file mode 100644
index 0000000..9bd8705
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationnormal.c
@@ -0,0 +1,266 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationnormalmode.c
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <gegl-plugin.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "../operations-types.h"
+
+#include "gimpoperationnormal.h"
+
+
+G_DEFINE_TYPE (GimpOperationNormal, gimp_operation_normal,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static const gchar* reference_xml = "<?xml version='1.0' encoding='UTF-8'?>"
+"<gegl>"
+"<node operation='gimp:normal'>"
+"  <node operation='gegl:load'>"
+"    <params>"
+"      <param name='path'>blending-test-B.png</param>"
+"    </params>"
+"  </node>"
+"</node>"
+"<node operation='gegl:load'>"
+"  <params>"
+"    <param name='path'>blending-test-A.png</param>"
+"  </params>"
+"</node>"
+"</gegl>";
+
+
+static void
+gimp_operation_normal_class_init (GimpOperationNormalClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",                  "gimp:normal",
+                                 "description",           "GIMP normal mode operation",
+                                 "reference-image",       "normal-mode.png",
+                                 "reference-composition", reference_xml,
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_normal_process;
+
+#if COMPILE_SSE2_INTRINISICS
+  if (gimp_cpu_accel_get_support() & GIMP_CPU_ACCEL_X86_SSE2)
+    layer_mode_class->process = gimp_operation_normal_process_sse2;
+#endif /* COMPILE_SSE2_INTRINISICS */
+
+#if COMPILE_SSE4_1_INTRINISICS
+  if (gimp_cpu_accel_get_support() & GIMP_CPU_ACCEL_X86_SSE4_1)
+    layer_mode_class->process = gimp_operation_normal_process_sse4;
+#endif /* COMPILE_SSE4_1_INTRINISICS */
+}
+
+static void
+gimp_operation_normal_init (GimpOperationNormal *self)
+{
+}
+
+gboolean
+gimp_operation_normal_process (GeglOperation       *op,
+                               void                *in_p,
+                               void                *layer_p,
+                               void                *mask_p,
+                               void                *out_p,
+                               glong                samples,
+                               const GeglRectangle *roi,
+                               gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat layer_alpha;
+
+          layer_alpha = layer[ALPHA] * opacity;
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          out[ALPHA] = layer_alpha + in[ALPHA] - layer_alpha * in[ALPHA];
+
+          if (out[ALPHA])
+            {
+              gfloat layer_weight = layer_alpha / out[ALPHA];
+              gfloat in_weight    = 1.0f - layer_weight;
+              gint   b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b] * layer_weight + in[b] * in_weight;
+                }
+            }
+          else
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+      while (samples--)
+        {
+          gfloat layer_alpha;
+
+          layer_alpha = layer[ALPHA] * opacity;
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          out[ALPHA] = in[ALPHA];
+
+          if (out[ALPHA])
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b] + (layer[b] - in[b]) * layer_alpha;
+                }
+            }
+          else
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat layer_alpha;
+
+          layer_alpha = layer[ALPHA] * opacity;
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          out[ALPHA] = layer_alpha;
+
+          if (out[ALPHA])
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+          else
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      while (samples--)
+        {
+          gfloat layer_alpha;
+
+          layer_alpha = layer[ALPHA] * opacity;
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          out[ALPHA] = in[ALPHA] * layer_alpha;
+
+          if (out[ALPHA])
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+          else
+            {
+              gint b;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes/gimpoperationnormal.h b/app/operations/layer-modes/gimpoperationnormal.h
new file mode 100644
index 0000000..6fa1b36
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationnormal.h
@@ -0,0 +1,91 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationnormal.h
+ * Copyright (C) 2012 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_NORMAL_H__
+#define __GIMP_OPERATION_NORMAL_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_NORMAL            (gimp_operation_normal_get_type ())
+#define GIMP_OPERATION_NORMAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_NORMAL, GimpOperationNormal))
+#define GIMP_OPERATION_NORMAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_NORMAL, GimpOperationNormalClass))
+#define GIMP_IS_OPERATION_NORMAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_NORMAL))
+#define GIMP_IS_OPERATION_NORMAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_NORMAL))
+#define GIMP_OPERATION_NORMAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_NORMAL, GimpOperationNormalClass))
+
+
+typedef struct _GimpOperationNormal      GimpOperationNormal;
+typedef struct _GimpOperationNormalClass GimpOperationNormalClass;
+
+struct _GimpOperationNormal
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationNormalClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType      gimp_operation_normal_get_type     (void) G_GNUC_CONST;
+
+
+/*  protected  */
+
+gboolean   gimp_operation_normal_process      (GeglOperation       *op,
+                                               void                *in,
+                                               void                *layer,
+                                               void                *mask,
+                                               void                *out,
+                                               glong                samples,
+                                               const GeglRectangle *roi,
+                                               gint                 level);
+
+#if COMPILE_SSE2_INTRINISICS
+
+gboolean   gimp_operation_normal_process_sse2 (GeglOperation       *op,
+                                               void                *in,
+                                               void                *layer,
+                                               void                *mask,
+                                               void                *out,
+                                               glong                samples,
+                                               const GeglRectangle *roi,
+                                               gint                 level);
+
+#endif /* COMPILE_SSE2_INTRINISICS */
+
+#if COMPILE_SSE4_1_INTRINISICS
+
+gboolean   gimp_operation_normal_process_sse4 (GeglOperation       *op,
+                                               void                *in,
+                                               void                *layer,
+                                               void                *mask,
+                                               void                *out,
+                                               glong                samples,
+                                               const GeglRectangle *roi,
+                                               gint                 level);
+
+#endif /* COMPILE_SSE4_1_INTRINISICS */
+
+
+#endif /* __GIMP_OPERATION_NORMAL_H__ */
diff --git a/app/operations/layer-modes/gimpoperationpassthrough.c b/app/operations/layer-modes/gimpoperationpassthrough.c
new file mode 100644
index 0000000..bc7d328
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationpassthrough.c
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationpassthrough.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationpassthrough.h"
+
+
+G_DEFINE_TYPE (GimpOperationPassThrough, gimp_operation_pass_through,
+               GIMP_TYPE_OPERATION_REPLACE)
+
+
+static void
+gimp_operation_pass_through_class_init (GimpOperationPassThroughClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:pass-through",
+                                 "description", "GIMP pass through mode operation",
+                                 NULL);
+
+  /* don't use REPLACE mode's specialized get_affected_region(); PASS_THROUGH
+   * behaves like an ordinary layer mode here.
+   */
+  layer_mode_class->get_affected_region = NULL;
+}
+
+static void
+gimp_operation_pass_through_init (GimpOperationPassThrough *self)
+{
+}
diff --git a/app/operations/layer-modes/gimpoperationpassthrough.h b/app/operations/layer-modes/gimpoperationpassthrough.h
new file mode 100644
index 0000000..5a5b838
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationpassthrough.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationpassthrough.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_PASS_THROUGH_H__
+#define __GIMP_OPERATION_PASS_THROUGH_H__
+
+
+#include "gimpoperationreplace.h"
+
+
+#define GIMP_TYPE_OPERATION_PASS_THROUGH            (gimp_operation_pass_through_get_type ())
+#define GIMP_OPERATION_PASS_THROUGH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_PASS_THROUGH, GimpOperationPassThrough))
+#define GIMP_OPERATION_PASS_THROUGH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_PASS_THROUGH, GimpOperationPassThroughClass))
+#define GIMP_IS_OPERATION_PASS_THROUGH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_PASS_THROUGH))
+#define GIMP_IS_OPERATION_PASS_THROUGH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_PASS_THROUGH))
+#define GIMP_OPERATION_PASS_THROUGH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_PASS_THROUGH, GimpOperationPassThroughClass))
+
+
+typedef struct _GimpOperationPassThrough      GimpOperationPassThrough;
+typedef struct _GimpOperationPassThroughClass GimpOperationPassThroughClass;
+
+struct _GimpOperationPassThrough
+{
+  GimpOperationReplace parent_instance;
+};
+
+struct _GimpOperationPassThroughClass
+{
+  GimpOperationReplaceClass parent_class;
+};
+
+
+GType   gimp_operation_pass_through_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_PASS_THROUGH_H__ */
diff --git a/app/operations/layer-modes/gimpoperationreplace.c b/app/operations/layer-modes/gimpoperationreplace.c
new file mode 100644
index 0000000..ed1ac19
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationreplace.c
@@ -0,0 +1,347 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationreplace.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimp-layer-modes.h"
+#include "gimpoperationreplace.h"
+
+
+static GeglRectangle              gimp_operation_replace_get_bounding_box    (GeglOperation        *op);
+
+static gboolean                   gimp_operation_replace_parent_process      (GeglOperation        *op,
+                                                                              GeglOperationContext *context,
+                                                                              const gchar          *output_prop,
+                                                                              const GeglRectangle  *result,
+                                                                              gint                  level);
+static gboolean                   gimp_operation_replace_process             (GeglOperation          *op,
+                                                                              void                   *in,
+                                                                              void                   *layer,
+                                                                              void                   *mask,
+                                                                              void                   *out,
+                                                                              glong                   samples,
+                                                                              const GeglRectangle    *roi,
+                                                                              gint                    level);
+static GimpLayerCompositeRegion   gimp_operation_replace_get_affected_region (GimpOperationLayerMode *layer_mode);
+
+
+G_DEFINE_TYPE (GimpOperationReplace, gimp_operation_replace,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+#define parent_class gimp_operation_replace_parent_class
+
+
+static void
+gimp_operation_replace_class_init (GimpOperationReplaceClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:replace",
+                                 "description", "GIMP replace mode operation",
+                                 NULL);
+
+  operation_class->get_bounding_box     = gimp_operation_replace_get_bounding_box;
+
+  layer_mode_class->parent_process      = gimp_operation_replace_parent_process;
+  layer_mode_class->process             = gimp_operation_replace_process;
+  layer_mode_class->get_affected_region = gimp_operation_replace_get_affected_region;
+}
+
+static void
+gimp_operation_replace_init (GimpOperationReplace *self)
+{
+}
+
+static GeglRectangle
+gimp_operation_replace_get_bounding_box (GeglOperation *op)
+{
+  GimpOperationLayerMode   *self     = (gpointer) op;
+  GeglRectangle            *in_rect;
+  GeglRectangle            *aux_rect;
+  GeglRectangle            *aux2_rect;
+  GeglRectangle             src_rect = {};
+  GeglRectangle             dst_rect = {};
+  GeglRectangle             result;
+  GimpLayerCompositeRegion  included_region;
+
+  in_rect   = gegl_operation_source_get_bounding_box (op, "input");
+  aux_rect  = gegl_operation_source_get_bounding_box (op, "aux");
+  aux2_rect = gegl_operation_source_get_bounding_box (op, "aux2");
+
+  if (in_rect)
+    dst_rect = *in_rect;
+
+  if (aux_rect)
+    {
+      src_rect = *aux_rect;
+
+      if (aux2_rect)
+        gegl_rectangle_intersect (&src_rect, &src_rect, aux2_rect);
+    }
+
+  if (self->is_last_node)
+    {
+      included_region = GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+    }
+  else
+    {
+      included_region = gimp_layer_mode_get_included_region (self->layer_mode,
+                                                             self->composite_mode);
+    }
+
+  if (self->prop_opacity == 0.0)
+    included_region &= ~GIMP_LAYER_COMPOSITE_REGION_SOURCE;
+  else if (self->prop_opacity == 1.0 && ! aux2_rect)
+    included_region &= ~GIMP_LAYER_COMPOSITE_REGION_DESTINATION;
+
+  gegl_rectangle_intersect (&result, &src_rect, &dst_rect);
+
+  if (included_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE)
+    gegl_rectangle_bounding_box (&result, &result, &src_rect);
+
+  if (included_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION)
+    gegl_rectangle_bounding_box (&result, &result, &dst_rect);
+
+  return result;
+}
+
+static gboolean
+gimp_operation_replace_parent_process (GeglOperation        *op,
+                                       GeglOperationContext *context,
+                                       const gchar          *output_prop,
+                                       const GeglRectangle  *result,
+                                       gint                  level)
+{
+  GimpOperationLayerMode   *layer_mode = (gpointer) op;
+  GimpLayerCompositeRegion  included_region;
+
+  included_region = gimp_layer_mode_get_included_region
+    (layer_mode->layer_mode, layer_mode->composite_mode);
+
+  /* if the layer's opacity is 100%, it has no mask, and its composite mode
+   * contains "aux" (the latter should always be the case in practice,
+   * currently,) we can just pass "aux" directly as output.
+   */
+  if (layer_mode->opacity == 1.0                       &&
+      ! gegl_operation_context_get_object (context, "aux2") &&
+      (included_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE))
+    {
+      GObject *aux;
+
+      aux = gegl_operation_context_get_object (context, "aux");
+
+      gegl_operation_context_set_object (context, "output", aux);
+
+      return TRUE;
+    }
+  /* the opposite case, where the opacity is 0%, is handled by
+   * GimpOperationLayerMode.
+   */
+  else if (layer_mode->opacity == 0.0)
+    {
+    }
+  /* if both buffers are included in the result, and if both of them have the
+   * same content -- i.e., if they share the same storage, same alignment, and
+   * same abyss (or if the abyss is irrelevant) -- we can just pass either of
+   * them directly as output.
+   */
+  else if (included_region == GIMP_LAYER_COMPOSITE_REGION_UNION)
+    {
+      GObject *input;
+      GObject *aux;
+
+      input = gegl_operation_context_get_object (context, "input");
+      aux   = gegl_operation_context_get_object (context, "aux");
+
+      if (input && aux &&
+          gegl_buffer_share_storage (GEGL_BUFFER (input), GEGL_BUFFER (aux)))
+        {
+          gint input_shift_x;
+          gint input_shift_y;
+          gint aux_shift_x;
+          gint aux_shift_y;
+
+          g_object_get (input,
+                        "shift-x", &input_shift_x,
+                        "shift-y", &input_shift_y,
+                        NULL);
+          g_object_get (aux,
+                        "shift-x", &aux_shift_x,
+                        "shift-y", &aux_shift_y,
+                        NULL);
+
+          if (input_shift_x == aux_shift_x && input_shift_y == aux_shift_y)
+            {
+              const GeglRectangle *input_abyss;
+              const GeglRectangle *aux_abyss;
+
+              input_abyss = gegl_buffer_get_abyss (GEGL_BUFFER (input));
+              aux_abyss   = gegl_buffer_get_abyss (GEGL_BUFFER (aux));
+
+              if (gegl_rectangle_equal (input_abyss, aux_abyss)  ||
+                  (gegl_rectangle_contains (input_abyss, result) &&
+                   gegl_rectangle_contains (aux_abyss,   result)))
+                {
+                  gegl_operation_context_set_object (context, "output", input);
+
+                  return TRUE;
+                }
+            }
+        }
+    }
+
+  return GIMP_OPERATION_LAYER_MODE_CLASS (parent_class)->parent_process (
+    op, context, output_prop, result, level);
+}
+
+static gboolean
+gimp_operation_replace_process (GeglOperation       *op,
+                                void                *in_p,
+                                void                *layer_p,
+                                void                *mask_p,
+                                void                *out_p,
+                                glong                samples,
+                                const GeglRectangle *roi,
+                                gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat opacity_value = opacity;
+          gfloat new_alpha;
+          gfloat ratio;
+          gint   b;
+
+          if (has_mask)
+            opacity_value *= *mask;
+
+          new_alpha = (layer[ALPHA] - in[ALPHA]) * opacity_value + in[ALPHA];
+
+          ratio = opacity_value;
+
+          if (new_alpha)
+            ratio *= layer[ALPHA] / new_alpha;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = (layer[b] - in[b]) * ratio + in[b];
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+      while (samples--)
+        {
+          gfloat opacity_value = opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            opacity_value *= *mask;
+
+          new_alpha = in[ALPHA] * (1.0f - opacity_value);
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = in[b];
+
+          out[ALPHA] = new_alpha;
+
+          in  += 4;
+          out += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat opacity_value = opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            opacity_value *= *mask;
+
+          new_alpha = layer[ALPHA] * opacity_value;
+
+          for (b = RED; b < ALPHA; b++)
+            out[b] = layer[b];
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      memset (out, 0, 4 * samples * sizeof (gfloat));
+      break;
+    }
+
+  return TRUE;
+}
+
+static GimpLayerCompositeRegion
+gimp_operation_replace_get_affected_region (GimpOperationLayerMode *layer_mode)
+{
+  GimpLayerCompositeRegion affected_region = GIMP_LAYER_COMPOSITE_REGION_INTERSECTION;
+
+  if (layer_mode->prop_opacity != 0.0)
+    affected_region |= GIMP_LAYER_COMPOSITE_REGION_DESTINATION;
+
+  /* if opacity != 1.0, or we have a mask, then we also affect SOURCE, but this
+   * is considered the case anyway, so no need for special handling.
+   */
+
+  return affected_region;
+}
diff --git a/app/operations/layer-modes/gimpoperationreplace.h b/app/operations/layer-modes/gimpoperationreplace.h
new file mode 100644
index 0000000..f8d7b0c
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationreplace.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationreplace.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_REPLACE_H__
+#define __GIMP_OPERATION_REPLACE_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_REPLACE            (gimp_operation_replace_get_type ())
+#define GIMP_OPERATION_REPLACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_REPLACE, GimpOperationReplace))
+#define GIMP_OPERATION_REPLACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_REPLACE, GimpOperationReplaceClass))
+#define GIMP_IS_OPERATION_REPLACE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_REPLACE))
+#define GIMP_IS_OPERATION_REPLACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_REPLACE))
+#define GIMP_OPERATION_REPLACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_REPLACE, GimpOperationReplaceClass))
+
+
+typedef struct _GimpOperationReplace      GimpOperationReplace;
+typedef struct _GimpOperationReplaceClass GimpOperationReplaceClass;
+
+struct _GimpOperationReplace
+{
+  GimpOperationLayerMode parent_instance;
+};
+
+struct _GimpOperationReplaceClass
+{
+  GimpOperationLayerModeClass parent_class;
+};
+
+
+GType   gimp_operation_replace_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_REPLACE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationsplit.c b/app/operations/layer-modes/gimpoperationsplit.c
new file mode 100644
index 0000000..fe83d3f
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationsplit.c
@@ -0,0 +1,213 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsplit.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationsplit.h"
+
+
+static gboolean   gimp_operation_split_process (GeglOperation       *op,
+                                                void                *in,
+                                                void                *layer,
+                                                void                *mask,
+                                                void                *out,
+                                                glong                samples,
+                                                const GeglRectangle *roi,
+                                                gint                 level);
+
+
+G_DEFINE_TYPE (GimpOperationSplit, gimp_operation_split,
+               GIMP_TYPE_OPERATION_LAYER_MODE)
+
+
+static void
+gimp_operation_split_class_init (GimpOperationSplitClass *klass)
+{
+  GeglOperationClass          *operation_class  = GEGL_OPERATION_CLASS (klass);
+  GimpOperationLayerModeClass *layer_mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
+
+  gegl_operation_class_set_keys (operation_class,
+                                 "name",        "gimp:split",
+                                 "description", "GIMP split mode operation",
+                                 NULL);
+
+  layer_mode_class->process = gimp_operation_split_process;
+}
+
+static void
+gimp_operation_split_init (GimpOperationSplit *self)
+{
+}
+
+static gboolean
+gimp_operation_split_process (GeglOperation       *op,
+                              void                *in_p,
+                              void                *layer_p,
+                              void                *mask_p,
+                              void                *out_p,
+                              glong                samples,
+                              const GeglRectangle *roi,
+                              gint                 level)
+{
+  GimpOperationLayerMode *layer_mode = (gpointer) op;
+  gfloat                 *in         = in_p;
+  gfloat                 *out        = out_p;
+  gfloat                 *layer      = layer_p;
+  gfloat                 *mask       = mask_p;
+  gfloat                  opacity    = layer_mode->opacity;
+  const gboolean          has_mask   = mask != NULL;
+
+  switch (layer_mode->composite_mode)
+    {
+    case GIMP_LAYER_COMPOSITE_UNION:
+      while (samples--)
+        {
+          gfloat in_alpha    = in[ALPHA];
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          if (layer_alpha <= in_alpha)
+            {
+              new_alpha = in_alpha - layer_alpha;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+          else
+            {
+              new_alpha = layer_alpha - in_alpha;
+
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP:
+    case GIMP_LAYER_COMPOSITE_AUTO:
+      while (samples--)
+        {
+          gfloat in_alpha    = in[ALPHA];
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          new_alpha = MAX (in_alpha - layer_alpha, 0.0f);
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER:
+      while (samples--)
+        {
+          gfloat in_alpha    = in[ALPHA];
+          gfloat layer_alpha = layer[ALPHA] * opacity;
+          gfloat new_alpha;
+          gint   b;
+
+          if (has_mask)
+            layer_alpha *= *mask;
+
+          new_alpha = MAX (layer_alpha - in_alpha, 0.0f);
+
+          if (new_alpha != 0.0f)
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = layer[b];
+                }
+            }
+          else
+            {
+              for (b = RED; b < ALPHA; b++)
+                {
+                  out[b] = in[b];
+                }
+            }
+
+          out[ALPHA] = new_alpha;
+
+          in    += 4;
+          layer += 4;
+          out   += 4;
+
+          if (has_mask)
+            mask++;
+        }
+      break;
+
+    case GIMP_LAYER_COMPOSITE_INTERSECTION:
+      while (samples--)
+        {
+          gint   b;
+
+          for (b = RED; b < ALPHA; b++)
+            {
+              out[b] = in[b];
+            }
+
+          out[ALPHA] = 0.0f;
+
+          in    += 4;
+          out   += 4;
+        }
+      break;
+    }
+
+  return TRUE;
+}
diff --git a/app/operations/layer-modes/gimpoperationsplit.h b/app/operations/layer-modes/gimpoperationsplit.h
new file mode 100644
index 0000000..e1dbbe9
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationsplit.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationsplit.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *               2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_SPLIT_H__
+#define __GIMP_OPERATION_SPLIT_H__
+
+
+#include "gimpoperationlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_SPLIT            (gimp_operation_split_get_type ())
+#define GIMP_OPERATION_SPLIT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SPLIT, GimpOperationSplit))
+#define GIMP_OPERATION_SPLIT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_SPLIT, GimpOperationSplitClass))
+#define GIMP_IS_OPERATION_SPLIT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SPLIT))
+#define GIMP_IS_OPERATION_SPLIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_SPLIT))
+#define GIMP_OPERATION_SPLIT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SPLIT, GimpOperationSplitClass))
+
+
+typedef struct _GimpOperationSplit      GimpOperationSplit;
+typedef struct _GimpOperationSplitClass GimpOperationSplitClass;
+
+struct _GimpOperationSplit
+{
+  GimpOperationLayerMode  parent_instance;
+};
+
+struct _GimpOperationSplitClass
+{
+  GimpOperationLayerModeClass  parent_class;
+};
+
+
+GType   gimp_operation_split_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_OPERATION_SPLIT_H__ */
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
new file mode 100644
index 0000000..1e8101d
--- /dev/null
+++ b/app/operations/operations-enums.c
@@ -0,0 +1,370 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "operations-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "operations-enums.h" */
+GType
+gimp_layer_color_space_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_LAYER_COLOR_SPACE_AUTO, "GIMP_LAYER_COLOR_SPACE_AUTO", "auto" },
+    { GIMP_LAYER_COLOR_SPACE_RGB_LINEAR, "GIMP_LAYER_COLOR_SPACE_RGB_LINEAR", "rgb-linear" },
+    { GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL, "GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL", "rgb-perceptual" },
+    { GIMP_LAYER_COLOR_SPACE_LAB, "GIMP_LAYER_COLOR_SPACE_LAB", "lab" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_LAYER_COLOR_SPACE_AUTO, NC_("layer-color-space", "Auto"), NULL },
+    { GIMP_LAYER_COLOR_SPACE_RGB_LINEAR, NC_("layer-color-space", "RGB (linear)"), NULL },
+    { GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL, NC_("layer-color-space", "RGB (perceptual)"), NULL },
+    { GIMP_LAYER_COLOR_SPACE_LAB, NC_("layer-color-space", "LAB"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpLayerColorSpace", values);
+      gimp_type_set_translation_context (type, "layer-color-space");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_layer_composite_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_LAYER_COMPOSITE_AUTO, "GIMP_LAYER_COMPOSITE_AUTO", "auto" },
+    { GIMP_LAYER_COMPOSITE_UNION, "GIMP_LAYER_COMPOSITE_UNION", "union" },
+    { GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP, "GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP", "clip-to-backdrop" },
+    { GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER, "GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER", "clip-to-layer" },
+    { GIMP_LAYER_COMPOSITE_INTERSECTION, "GIMP_LAYER_COMPOSITE_INTERSECTION", "intersection" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_LAYER_COMPOSITE_AUTO, NC_("layer-composite-mode", "Auto"), NULL },
+    { GIMP_LAYER_COMPOSITE_UNION, NC_("layer-composite-mode", "Union"), NULL },
+    { GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP, NC_("layer-composite-mode", "Clip to backdrop"), NULL },
+    { GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER, NC_("layer-composite-mode", "Clip to layer"), NULL },
+    { GIMP_LAYER_COMPOSITE_INTERSECTION, NC_("layer-composite-mode", "Intersection"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpLayerCompositeMode", values);
+      gimp_type_set_translation_context (type, "layer-composite-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_layer_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_LAYER_MODE_NORMAL_LEGACY, "GIMP_LAYER_MODE_NORMAL_LEGACY", "normal-legacy" },
+    { GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" },
+    { GIMP_LAYER_MODE_BEHIND_LEGACY, "GIMP_LAYER_MODE_BEHIND_LEGACY", "behind-legacy" },
+    { GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" },
+    { GIMP_LAYER_MODE_SCREEN_LEGACY, "GIMP_LAYER_MODE_SCREEN_LEGACY", "screen-legacy" },
+    { GIMP_LAYER_MODE_OVERLAY_LEGACY, "GIMP_LAYER_MODE_OVERLAY_LEGACY", "overlay-legacy" },
+    { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, "GIMP_LAYER_MODE_DIFFERENCE_LEGACY", "difference-legacy" },
+    { GIMP_LAYER_MODE_ADDITION_LEGACY, "GIMP_LAYER_MODE_ADDITION_LEGACY", "addition-legacy" },
+    { GIMP_LAYER_MODE_SUBTRACT_LEGACY, "GIMP_LAYER_MODE_SUBTRACT_LEGACY", "subtract-legacy" },
+    { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, "GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY", "darken-only-legacy" },
+    { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, "GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY", "lighten-only-legacy" },
+    { GIMP_LAYER_MODE_HSV_HUE_LEGACY, "GIMP_LAYER_MODE_HSV_HUE_LEGACY", "hsv-hue-legacy" },
+    { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, "GIMP_LAYER_MODE_HSV_SATURATION_LEGACY", "hsv-saturation-legacy" },
+    { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, "GIMP_LAYER_MODE_HSL_COLOR_LEGACY", "hsl-color-legacy" },
+    { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, "GIMP_LAYER_MODE_HSV_VALUE_LEGACY", "hsv-value-legacy" },
+    { GIMP_LAYER_MODE_DIVIDE_LEGACY, "GIMP_LAYER_MODE_DIVIDE_LEGACY", "divide-legacy" },
+    { GIMP_LAYER_MODE_DODGE_LEGACY, "GIMP_LAYER_MODE_DODGE_LEGACY", "dodge-legacy" },
+    { GIMP_LAYER_MODE_BURN_LEGACY, "GIMP_LAYER_MODE_BURN_LEGACY", "burn-legacy" },
+    { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, "GIMP_LAYER_MODE_HARDLIGHT_LEGACY", "hardlight-legacy" },
+    { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, "GIMP_LAYER_MODE_SOFTLIGHT_LEGACY", "softlight-legacy" },
+    { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, "GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY", "grain-extract-legacy" },
+    { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, "GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY", "grain-merge-legacy" },
+    { GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, "GIMP_LAYER_MODE_COLOR_ERASE_LEGACY", "color-erase-legacy" },
+    { GIMP_LAYER_MODE_OVERLAY, "GIMP_LAYER_MODE_OVERLAY", "overlay" },
+    { GIMP_LAYER_MODE_LCH_HUE, "GIMP_LAYER_MODE_LCH_HUE", "lch-hue" },
+    { GIMP_LAYER_MODE_LCH_CHROMA, "GIMP_LAYER_MODE_LCH_CHROMA", "lch-chroma" },
+    { GIMP_LAYER_MODE_LCH_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" },
+    { GIMP_LAYER_MODE_LCH_LIGHTNESS, "GIMP_LAYER_MODE_LCH_LIGHTNESS", "lch-lightness" },
+    { GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" },
+    { GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" },
+    { GIMP_LAYER_MODE_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" },
+    { GIMP_LAYER_MODE_SCREEN, "GIMP_LAYER_MODE_SCREEN", "screen" },
+    { GIMP_LAYER_MODE_DIFFERENCE, "GIMP_LAYER_MODE_DIFFERENCE", "difference" },
+    { GIMP_LAYER_MODE_ADDITION, "GIMP_LAYER_MODE_ADDITION", "addition" },
+    { GIMP_LAYER_MODE_SUBTRACT, "GIMP_LAYER_MODE_SUBTRACT", "subtract" },
+    { GIMP_LAYER_MODE_DARKEN_ONLY, "GIMP_LAYER_MODE_DARKEN_ONLY", "darken-only" },
+    { GIMP_LAYER_MODE_LIGHTEN_ONLY, "GIMP_LAYER_MODE_LIGHTEN_ONLY", "lighten-only" },
+    { GIMP_LAYER_MODE_HSV_HUE, "GIMP_LAYER_MODE_HSV_HUE", "hsv-hue" },
+    { GIMP_LAYER_MODE_HSV_SATURATION, "GIMP_LAYER_MODE_HSV_SATURATION", "hsv-saturation" },
+    { GIMP_LAYER_MODE_HSL_COLOR, "GIMP_LAYER_MODE_HSL_COLOR", "hsl-color" },
+    { GIMP_LAYER_MODE_HSV_VALUE, "GIMP_LAYER_MODE_HSV_VALUE", "hsv-value" },
+    { GIMP_LAYER_MODE_DIVIDE, "GIMP_LAYER_MODE_DIVIDE", "divide" },
+    { GIMP_LAYER_MODE_DODGE, "GIMP_LAYER_MODE_DODGE", "dodge" },
+    { GIMP_LAYER_MODE_BURN, "GIMP_LAYER_MODE_BURN", "burn" },
+    { GIMP_LAYER_MODE_HARDLIGHT, "GIMP_LAYER_MODE_HARDLIGHT", "hardlight" },
+    { GIMP_LAYER_MODE_SOFTLIGHT, "GIMP_LAYER_MODE_SOFTLIGHT", "softlight" },
+    { GIMP_LAYER_MODE_GRAIN_EXTRACT, "GIMP_LAYER_MODE_GRAIN_EXTRACT", "grain-extract" },
+    { GIMP_LAYER_MODE_GRAIN_MERGE, "GIMP_LAYER_MODE_GRAIN_MERGE", "grain-merge" },
+    { GIMP_LAYER_MODE_VIVID_LIGHT, "GIMP_LAYER_MODE_VIVID_LIGHT", "vivid-light" },
+    { GIMP_LAYER_MODE_PIN_LIGHT, "GIMP_LAYER_MODE_PIN_LIGHT", "pin-light" },
+    { GIMP_LAYER_MODE_LINEAR_LIGHT, "GIMP_LAYER_MODE_LINEAR_LIGHT", "linear-light" },
+    { GIMP_LAYER_MODE_HARD_MIX, "GIMP_LAYER_MODE_HARD_MIX", "hard-mix" },
+    { GIMP_LAYER_MODE_EXCLUSION, "GIMP_LAYER_MODE_EXCLUSION", "exclusion" },
+    { GIMP_LAYER_MODE_LINEAR_BURN, "GIMP_LAYER_MODE_LINEAR_BURN", "linear-burn" },
+    { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, "GIMP_LAYER_MODE_LUMA_DARKEN_ONLY", "luma-darken-only" },
+    { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, "GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY", "luma-lighten-only" },
+    { GIMP_LAYER_MODE_LUMINANCE, "GIMP_LAYER_MODE_LUMINANCE", "luminance" },
+    { GIMP_LAYER_MODE_COLOR_ERASE, "GIMP_LAYER_MODE_COLOR_ERASE", "color-erase" },
+    { GIMP_LAYER_MODE_ERASE, "GIMP_LAYER_MODE_ERASE", "erase" },
+    { GIMP_LAYER_MODE_MERGE, "GIMP_LAYER_MODE_MERGE", "merge" },
+    { GIMP_LAYER_MODE_SPLIT, "GIMP_LAYER_MODE_SPLIT", "split" },
+    { GIMP_LAYER_MODE_PASS_THROUGH, "GIMP_LAYER_MODE_PASS_THROUGH", "pass-through" },
+    { GIMP_LAYER_MODE_REPLACE, "GIMP_LAYER_MODE_REPLACE", "replace" },
+    { GIMP_LAYER_MODE_ANTI_ERASE, "GIMP_LAYER_MODE_ANTI_ERASE", "anti-erase" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_LAYER_MODE_NORMAL_LEGACY, NC_("layer-mode", "Normal (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Normal (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_NORMAL_LEGACY, NC_("layer-mode", "Normal (l)"), NULL },
+    { GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL },
+    { GIMP_LAYER_MODE_BEHIND_LEGACY, NC_("layer-mode", "Behind (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Behind (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_BEHIND_LEGACY, NC_("layer-mode", "Behind (l)"), NULL },
+    { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Multiply (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (l)"), NULL },
+    { GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Screen (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen (l)"), NULL },
+    { GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old broken Overlay"), NULL },
+    /* Translators: this is an abbreviated version of "Old broken Overlay".
+       Keep it short. */
+    { GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old Overlay"), NULL },
+    { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Difference (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference (l)"), NULL },
+    { GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Addition (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition (l)"), NULL },
+    { GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Subtract (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract (l)"), NULL },
+    { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Darken only (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only (l)"), NULL },
+    { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Lighten only (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only (l)"), NULL },
+    { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "HSV Hue (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "HSV Hue (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "HSV Hue (l)"), NULL },
+    { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "HSV Saturation (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "HSV Saturation (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "HSV Saturation (l)"), NULL },
+    { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "HSL Color (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "HSL Color (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "HSL Color (l)"), NULL },
+    { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "HSV Value (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "HSV Value (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "HSV Value (l)"), NULL },
+    { GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Divide (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide (l)"), NULL },
+    { GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Dodge (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge (l)"), NULL },
+    { GIMP_LAYER_MODE_BURN_LEGACY, NC_("layer-mode", "Burn (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Burn (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_BURN_LEGACY, NC_("layer-mode", "Burn (l)"), NULL },
+    { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, NC_("layer-mode", "Hard light (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Hard light (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, NC_("layer-mode", "Hard light (l)"), NULL },
+    { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, NC_("layer-mode", "Soft light (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Soft light (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, NC_("layer-mode", "Soft light (l)"), NULL },
+    { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, NC_("layer-mode", "Grain extract (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Grain extract (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, NC_("layer-mode", "Grain extract (l)"), NULL },
+    { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, NC_("layer-mode", "Grain merge (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Grain merge (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, NC_("layer-mode", "Grain merge (l)"), NULL },
+    { GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, NC_("layer-mode", "Color erase (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Color erase (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, NC_("layer-mode", "Color erase (l)"), NULL },
+    { GIMP_LAYER_MODE_OVERLAY, NC_("layer-mode", "Overlay"), NULL },
+    { GIMP_LAYER_MODE_LCH_HUE, NC_("layer-mode", "LCh Hue"), NULL },
+    { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "LCh Chroma"), NULL },
+    { GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "LCh Color"), NULL },
+    { GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "LCh Lightness"), NULL },
+    { GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL },
+    { GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
+    { GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL },
+    { GIMP_LAYER_MODE_SCREEN, NC_("layer-mode", "Screen"), NULL },
+    { GIMP_LAYER_MODE_DIFFERENCE, NC_("layer-mode", "Difference"), NULL },
+    { GIMP_LAYER_MODE_ADDITION, NC_("layer-mode", "Addition"), NULL },
+    { GIMP_LAYER_MODE_SUBTRACT, NC_("layer-mode", "Subtract"), NULL },
+    { GIMP_LAYER_MODE_DARKEN_ONLY, NC_("layer-mode", "Darken only"), NULL },
+    { GIMP_LAYER_MODE_LIGHTEN_ONLY, NC_("layer-mode", "Lighten only"), NULL },
+    { GIMP_LAYER_MODE_HSV_HUE, NC_("layer-mode", "HSV Hue"), NULL },
+    { GIMP_LAYER_MODE_HSV_SATURATION, NC_("layer-mode", "HSV Saturation"), NULL },
+    { GIMP_LAYER_MODE_HSL_COLOR, NC_("layer-mode", "HSL Color"), NULL },
+    { GIMP_LAYER_MODE_HSV_VALUE, NC_("layer-mode", "HSV Value"), NULL },
+    { GIMP_LAYER_MODE_DIVIDE, NC_("layer-mode", "Divide"), NULL },
+    { GIMP_LAYER_MODE_DODGE, NC_("layer-mode", "Dodge"), NULL },
+    { GIMP_LAYER_MODE_BURN, NC_("layer-mode", "Burn"), NULL },
+    { GIMP_LAYER_MODE_HARDLIGHT, NC_("layer-mode", "Hard light"), NULL },
+    { GIMP_LAYER_MODE_SOFTLIGHT, NC_("layer-mode", "Soft light"), NULL },
+    { GIMP_LAYER_MODE_GRAIN_EXTRACT, NC_("layer-mode", "Grain extract"), NULL },
+    { GIMP_LAYER_MODE_GRAIN_MERGE, NC_("layer-mode", "Grain merge"), NULL },
+    { GIMP_LAYER_MODE_VIVID_LIGHT, NC_("layer-mode", "Vivid light"), NULL },
+    { GIMP_LAYER_MODE_PIN_LIGHT, NC_("layer-mode", "Pin light"), NULL },
+    { GIMP_LAYER_MODE_LINEAR_LIGHT, NC_("layer-mode", "Linear light"), NULL },
+    { GIMP_LAYER_MODE_HARD_MIX, NC_("layer-mode", "Hard mix"), NULL },
+    { GIMP_LAYER_MODE_EXCLUSION, NC_("layer-mode", "Exclusion"), NULL },
+    { GIMP_LAYER_MODE_LINEAR_BURN, NC_("layer-mode", "Linear burn"), NULL },
+    { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, NC_("layer-mode", "Luma/Luminance darken only"), NULL },
+    /* Translators: this is an abbreviated version of "Luma/Luminance darken only".
+       Keep it short. */
+    { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, NC_("layer-mode", "Luma darken only"), NULL },
+    { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, NC_("layer-mode", "Luma/Luminance lighten only"), NULL },
+    /* Translators: this is an abbreviated version of "Luma/Luminance lighten only".
+       Keep it short. */
+    { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, NC_("layer-mode", "Luma lighten only"), NULL },
+    { GIMP_LAYER_MODE_LUMINANCE, NC_("layer-mode", "Luminance"), NULL },
+    { GIMP_LAYER_MODE_COLOR_ERASE, NC_("layer-mode", "Color erase"), NULL },
+    { GIMP_LAYER_MODE_ERASE, NC_("layer-mode", "Erase"), NULL },
+    { GIMP_LAYER_MODE_MERGE, NC_("layer-mode", "Merge"), NULL },
+    { GIMP_LAYER_MODE_SPLIT, NC_("layer-mode", "Split"), NULL },
+    { GIMP_LAYER_MODE_PASS_THROUGH, NC_("layer-mode", "Pass through"), NULL },
+    { GIMP_LAYER_MODE_REPLACE, NC_("layer-mode", "Replace"), NULL },
+    { GIMP_LAYER_MODE_ANTI_ERASE, NC_("layer-mode", "Anti erase"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpLayerMode", values);
+      gimp_type_set_translation_context (type, "layer-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_layer_mode_group_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_LAYER_MODE_GROUP_DEFAULT, "GIMP_LAYER_MODE_GROUP_DEFAULT", "default" },
+    { GIMP_LAYER_MODE_GROUP_LEGACY, "GIMP_LAYER_MODE_GROUP_LEGACY", "legacy" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_LAYER_MODE_GROUP_DEFAULT, NC_("layer-mode-group", "Default"), NULL },
+    { GIMP_LAYER_MODE_GROUP_LEGACY, NC_("layer-mode-group", "Legacy"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpLayerModeGroup", values);
+      gimp_type_set_translation_context (type, "layer-mode-group");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_layer_mode_context_get_type (void)
+{
+  static const GFlagsValue values[] =
+  {
+    { GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", "layer" },
+    { GIMP_LAYER_MODE_CONTEXT_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", "group" },
+    { GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", "paint" },
+    { GIMP_LAYER_MODE_CONTEXT_FILTER, "GIMP_LAYER_MODE_CONTEXT_FILTER", "filter" },
+    { GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", "all" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpFlagsDesc descs[] =
+  {
+    { GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", NULL },
+    { GIMP_LAYER_MODE_CONTEXT_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", NULL },
+    { GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", NULL },
+    { GIMP_LAYER_MODE_CONTEXT_FILTER, "GIMP_LAYER_MODE_CONTEXT_FILTER", NULL },
+    { GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_flags_register_static ("GimpLayerModeContext", values);
+      gimp_type_set_translation_context (type, "layer-mode-context");
+      gimp_flags_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
new file mode 100644
index 0000000..0dc51b9
--- /dev/null
+++ b/app/operations/operations-enums.h
@@ -0,0 +1,190 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * operations-enums.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OPERATIONS_ENUMS_H__
+#define __OPERATIONS_ENUMS_H__
+
+
+#define GIMP_TYPE_LAYER_COLOR_SPACE (gimp_layer_color_space_get_type ())
+
+GType gimp_layer_color_space_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_LAYER_COLOR_SPACE_AUTO,           /*< desc="Auto"             >*/
+  GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,     /*< desc="RGB (linear)"     >*/
+  GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL, /*< desc="RGB (perceptual)" >*/
+  GIMP_LAYER_COLOR_SPACE_LAB,            /*< desc="LAB", pdb-skip    >*/
+} GimpLayerColorSpace;
+
+
+#define GIMP_TYPE_LAYER_COMPOSITE_MODE (gimp_layer_composite_mode_get_type ())
+
+GType gimp_layer_composite_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_LAYER_COMPOSITE_AUTO,             /*< desc="Auto"             >*/
+  GIMP_LAYER_COMPOSITE_UNION,            /*< desc="Union"            >*/
+  GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP, /*< desc="Clip to backdrop" >*/
+  GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER,    /*< desc="Clip to layer"    >*/
+  GIMP_LAYER_COMPOSITE_INTERSECTION      /*< desc="Intersection"     >*/
+} GimpLayerCompositeMode;
+
+
+#define GIMP_TYPE_LAYER_MODE (gimp_layer_mode_get_type ())
+
+GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  /*  Modes that exist since ancient times  */
+  GIMP_LAYER_MODE_NORMAL_LEGACY,         /*< desc="Normal (legacy)",         abbrev="Normal (l)"            >*/
+  GIMP_LAYER_MODE_DISSOLVE,              /*< desc="Dissolve"                                                >*/
+  GIMP_LAYER_MODE_BEHIND_LEGACY,         /*< desc="Behind (legacy)",         abbrev="Behind (l)"            >*/
+  GIMP_LAYER_MODE_MULTIPLY_LEGACY,       /*< desc="Multiply (legacy)",       abbrev="Multiply (l)"          >*/
+  GIMP_LAYER_MODE_SCREEN_LEGACY,         /*< desc="Screen (legacy)",         abbrev="Screen (l)"            >*/
+  GIMP_LAYER_MODE_OVERLAY_LEGACY,        /*< desc="Old broken Overlay",      abbrev="Old Overlay"           >*/
+  GIMP_LAYER_MODE_DIFFERENCE_LEGACY,     /*< desc="Difference (legacy)",     abbrev="Difference (l)"        >*/
+  GIMP_LAYER_MODE_ADDITION_LEGACY,       /*< desc="Addition (legacy)",       abbrev="Addition (l)"          >*/
+  GIMP_LAYER_MODE_SUBTRACT_LEGACY,       /*< desc="Subtract (legacy)",       abbrev="Subtract (l)"          >*/
+  GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,    /*< desc="Darken only (legacy)",    abbrev="Darken only (l)"       >*/
+  GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,   /*< desc="Lighten only (legacy)",   abbrev="Lighten only (l)"      >*/
+  GIMP_LAYER_MODE_HSV_HUE_LEGACY,        /*< desc="HSV Hue (legacy)",        abbrev="HSV Hue (l)"           >*/
+  GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="HSV Saturation (legacy)", abbrev="HSV Saturation (l)"    >*/
+  GIMP_LAYER_MODE_HSL_COLOR_LEGACY,      /*< desc="HSL Color (legacy)",      abbrev="HSL Color (l)"         >*/
+  GIMP_LAYER_MODE_HSV_VALUE_LEGACY,      /*< desc="HSV Value (legacy)",      abbrev="HSV Value (l)"         >*/
+  GIMP_LAYER_MODE_DIVIDE_LEGACY,         /*< desc="Divide (legacy)",         abbrev="Divide (l)"            >*/
+  GIMP_LAYER_MODE_DODGE_LEGACY,          /*< desc="Dodge (legacy)",          abbrev="Dodge (l)"             >*/
+  GIMP_LAYER_MODE_BURN_LEGACY,           /*< desc="Burn (legacy)",           abbrev="Burn (l)"              >*/
+  GIMP_LAYER_MODE_HARDLIGHT_LEGACY,      /*< desc="Hard light (legacy)",     abbrev="Hard light (l)"        >*/
+
+  /*  Since 2.8 (XCF version 2)  */
+  GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,      /*< desc="Soft light (legacy)",     abbrev="Soft light (l)"        >*/
+  GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,  /*< desc="Grain extract (legacy)",  abbrev="Grain extract (l)"     >*/
+  GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,    /*< desc="Grain merge (legacy)",    abbrev="Grain merge (l)"       >*/
+  GIMP_LAYER_MODE_COLOR_ERASE_LEGACY,    /*< desc="Color erase (legacy)",    abbrev="Color erase (l)"       >*/
+
+  /*  Since 2.10 (XCF version 9) */
+  GIMP_LAYER_MODE_OVERLAY,               /*< desc="Overlay"                                                 >*/
+  GIMP_LAYER_MODE_LCH_HUE,               /*< desc="LCh Hue"                                                 >*/
+  GIMP_LAYER_MODE_LCH_CHROMA,            /*< desc="LCh Chroma"                                              >*/
+  GIMP_LAYER_MODE_LCH_COLOR,             /*< desc="LCh Color"                                               >*/
+  GIMP_LAYER_MODE_LCH_LIGHTNESS,         /*< desc="LCh Lightness"                                           >*/
+
+  /*  Since 2.10 (XCF version 10)  */
+  GIMP_LAYER_MODE_NORMAL,                /*< desc="Normal"                                                  >*/
+  GIMP_LAYER_MODE_BEHIND,                /*< desc="Behind"                                                  >*/
+  GIMP_LAYER_MODE_MULTIPLY,              /*< desc="Multiply"                                                >*/
+  GIMP_LAYER_MODE_SCREEN,                /*< desc="Screen"                                                  >*/
+  GIMP_LAYER_MODE_DIFFERENCE,            /*< desc="Difference"                                              >*/
+  GIMP_LAYER_MODE_ADDITION,              /*< desc="Addition"                                                >*/
+  GIMP_LAYER_MODE_SUBTRACT,              /*< desc="Subtract"                                                >*/
+  GIMP_LAYER_MODE_DARKEN_ONLY,           /*< desc="Darken only"                                             >*/
+  GIMP_LAYER_MODE_LIGHTEN_ONLY,          /*< desc="Lighten only"                                            >*/
+  GIMP_LAYER_MODE_HSV_HUE,               /*< desc="HSV Hue"                                                 >*/
+  GIMP_LAYER_MODE_HSV_SATURATION,        /*< desc="HSV Saturation"                                          >*/
+  GIMP_LAYER_MODE_HSL_COLOR,             /*< desc="HSL Color"                                               >*/
+  GIMP_LAYER_MODE_HSV_VALUE,             /*< desc="HSV Value"                                               >*/
+  GIMP_LAYER_MODE_DIVIDE,                /*< desc="Divide"                                                  >*/
+  GIMP_LAYER_MODE_DODGE,                 /*< desc="Dodge"                                                   >*/
+  GIMP_LAYER_MODE_BURN,                  /*< desc="Burn"                                                    >*/
+  GIMP_LAYER_MODE_HARDLIGHT,             /*< desc="Hard light"                                              >*/
+  GIMP_LAYER_MODE_SOFTLIGHT,             /*< desc="Soft light"                                              >*/
+  GIMP_LAYER_MODE_GRAIN_EXTRACT,         /*< desc="Grain extract"                                           >*/
+  GIMP_LAYER_MODE_GRAIN_MERGE,           /*< desc="Grain merge"                                             >*/
+  GIMP_LAYER_MODE_VIVID_LIGHT,           /*< desc="Vivid light"                                             >*/
+  GIMP_LAYER_MODE_PIN_LIGHT,             /*< desc="Pin light"                                               >*/
+  GIMP_LAYER_MODE_LINEAR_LIGHT,          /*< desc="Linear light"                                            >*/
+  GIMP_LAYER_MODE_HARD_MIX,              /*< desc="Hard mix"                                                >*/
+  GIMP_LAYER_MODE_EXCLUSION,             /*< desc="Exclusion"                                               >*/
+  GIMP_LAYER_MODE_LINEAR_BURN,           /*< desc="Linear burn"                                             >*/
+  GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,      /*< desc="Luma/Luminance darken only",  abbrev="Luma darken only"  >*/
+  GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,     /*< desc="Luma/Luminance lighten only", abbrev="Luma lighten only" >*/
+  GIMP_LAYER_MODE_LUMINANCE,             /*< desc="Luminance"                                               >*/
+  GIMP_LAYER_MODE_COLOR_ERASE,           /*< desc="Color erase"                                             >*/
+  GIMP_LAYER_MODE_ERASE,                 /*< desc="Erase"                                                   >*/
+  GIMP_LAYER_MODE_MERGE,                 /*< desc="Merge"                                                   >*/
+  GIMP_LAYER_MODE_SPLIT,                 /*< desc="Split"                                                   >*/
+  GIMP_LAYER_MODE_PASS_THROUGH,          /*< desc="Pass through"                                            >*/
+
+  /*  Internal modes, not available to the PDB, must be kept at the end  */
+  GIMP_LAYER_MODE_REPLACE,               /*< pdb-skip, desc="Replace"                                       >*/
+  GIMP_LAYER_MODE_ANTI_ERASE,            /*< pdb-skip, desc="Anti erase"                                    >*/
+
+  /*  Layer mode menu separator  */
+  GIMP_LAYER_MODE_SEPARATOR = -1         /*< pdb-skip, skip                                                 >*/
+} GimpLayerMode;
+
+
+#define GIMP_TYPE_LAYER_MODE_GROUP (gimp_layer_mode_group_get_type ())
+
+GType gimp_layer_mode_group_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_LAYER_MODE_GROUP_DEFAULT,     /*< desc="Default"      >*/
+  GIMP_LAYER_MODE_GROUP_LEGACY,      /*< desc="Legacy"       >*/
+} GimpLayerModeGroup;
+
+
+#define GIMP_TYPE_LAYER_MODE_CONTEXT (gimp_layer_mode_context_get_type ())
+
+GType gimp_layer_mode_context_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_LAYER_MODE_CONTEXT_LAYER  = 1 << 0,
+  GIMP_LAYER_MODE_CONTEXT_GROUP  = 1 << 1,
+  GIMP_LAYER_MODE_CONTEXT_PAINT  = 1 << 2,
+  GIMP_LAYER_MODE_CONTEXT_FILTER = 1 << 3,
+
+  GIMP_LAYER_MODE_CONTEXT_ALL = (GIMP_LAYER_MODE_CONTEXT_LAYER |
+                                 GIMP_LAYER_MODE_CONTEXT_GROUP |
+                                 GIMP_LAYER_MODE_CONTEXT_PAINT |
+                                 GIMP_LAYER_MODE_CONTEXT_FILTER)
+} GimpLayerModeContext;
+
+
+/*
+ * non-registered enums; register them if needed
+ */
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_LAYER_COMPOSITE_REGION_INTERSECTION = 0,
+  GIMP_LAYER_COMPOSITE_REGION_DESTINATION  = 1 << 0,
+  GIMP_LAYER_COMPOSITE_REGION_SOURCE       = 1 << 1,
+  GIMP_LAYER_COMPOSITE_REGION_UNION        = (GIMP_LAYER_COMPOSITE_REGION_DESTINATION |
+                                              GIMP_LAYER_COMPOSITE_REGION_SOURCE),
+} GimpLayerCompositeRegion;
+
+typedef enum  /*< pdb-skip, skip >*/
+{
+  GIMP_LAYER_MODE_FLAG_LEGACY                    =  1 << 0,
+  GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     =  1 << 1,
+  GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE =  1 << 2,
+  GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE  =  1 << 3,
+  GIMP_LAYER_MODE_FLAG_SUBTRACTIVE               =  1 << 4,
+  GIMP_LAYER_MODE_FLAG_ALPHA_ONLY                =  1 << 5,
+  GIMP_LAYER_MODE_FLAG_TRIVIAL                   =  1 << 6
+} GimpLayerModeFlags;
+
+
+#endif /* __OPERATIONS_ENUMS_H__ */
diff --git a/app/operations/operations-types.h b/app/operations/operations-types.h
new file mode 100644
index 0000000..15e97d8
--- /dev/null
+++ b/app/operations/operations-types.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * operations-types.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OPERATIONS_TYPES_H__
+#define __OPERATIONS_TYPES_H__
+
+
+#include <gegl-types.h>
+
+#include "gegl/gimp-gegl-types.h"
+
+#include "operations-enums.h"
+
+
+/*  operations  */
+
+typedef struct _GimpOperationPointFilter        GimpOperationPointFilter;
+typedef struct _GimpOperationLayerMode          GimpOperationLayerMode;
+
+
+/*  operation config objects  */
+
+typedef struct _GimpOperationSettings           GimpOperationSettings;
+
+typedef struct _GimpBrightnessContrastConfig    GimpBrightnessContrastConfig;
+typedef struct _GimpCageConfig                  GimpCageConfig;
+typedef struct _GimpColorBalanceConfig          GimpColorBalanceConfig;
+typedef struct _GimpColorizeConfig              GimpColorizeConfig;
+typedef struct _GimpCurvesConfig                GimpCurvesConfig;
+typedef struct _GimpDesaturateConfig            GimpDesaturateConfig;
+typedef struct _GimpHueSaturationConfig         GimpHueSaturationConfig;
+typedef struct _GimpLevelsConfig                GimpLevelsConfig;
+typedef struct _GimpPosterizeConfig             GimpPosterizeConfig;
+typedef struct _GimpThresholdConfig             GimpThresholdConfig;
+
+
+/*  non-object types  */
+
+typedef struct _GimpCagePoint                   GimpCagePoint;
+
+
+/*  functions  */
+
+typedef gboolean (* GimpLayerModeFunc)      (GeglOperation          *operation,
+                                             void                   *in,
+                                             void                   *aux,
+                                             void                   *mask,
+                                             void                   *out,
+                                             glong                   samples,
+                                             const GeglRectangle    *roi,
+                                             gint                    level);
+
+typedef  void    (* GimpLayerModeBlendFunc) (GeglOperation          *operation,
+                                             const gfloat           *in,
+                                             const gfloat           *layer,
+                                             gfloat                 *out,
+                                             gint                    samples);
+
+
+#endif /* __OPERATIONS_TYPES_H__ */
diff --git a/app/operations/tests/Makefile.am b/app/operations/tests/Makefile.am
new file mode 100644
index 0000000..fdf0a9a
--- /dev/null
+++ b/app/operations/tests/Makefile.am
@@ -0,0 +1,71 @@
+#TESTS = test-operations
+
+EXTRA_PROGRAMS = $(TESTS)
+CLEANFILES = $(EXTRA_PROGRAMS)
+
+$(TESTS): output-dir
+
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+
+if OS_WIN32
+else
+libm = -lm
+endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/app	\
+	$(GEGL_CFLAGS)		\
+	-I$(includedir)
+
+# We need this due to circular dependencies, see more detailed
+# comments about it in app/Makefile.am
+AM_LDFLAGS = \
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type
+
+# Note that we have some duplicate entries here too to work around
+# circular dependencies and systems on the same architectural layer as
+# an alternative to LDFLAGS above
+LDADD = \
+	$(top_builddir)/app/xcf/libappxcf.a			\
+	$(top_builddir)/app/pdb/libappinternal-procs.a		\
+	$(top_builddir)/app/pdb/libapppdb.a			\
+	$(top_builddir)/app/plug-in/libappplug-in.a		\
+	$(top_builddir)/app/vectors/libappvectors.a		\
+	$(top_builddir)/app/core/libappcore.a			\
+	$(top_builddir)/app/file/libappfile.a			\
+	$(top_builddir)/app/text/libapptext.a			\
+	$(top_builddir)/app/paint/libapppaint.a			\
+	$(top_builddir)/app/config/libappconfig.a		\
+	$(top_builddir)/app/libapp.a				\
+	$(top_builddir)/app/gegl/libappgegl.a			\
+	$(top_builddir)/app/operations/libappoperations.a	\
+	$(libgimpconfig)					\
+	$(libgimpmath)						\
+	$(libgimpthumb)						\
+	$(libgimpcolor)						\
+	$(libgimpmodule)					\
+	$(libgimpbase)						\
+	$(GDK_PIXBUF_LIBS)					\
+	$(PANGOCAIRO_LIBS)					\
+	$(GEGL_LIBS)						\
+	$(GLIB_LIBS)						\
+	$(libm)
+
+output-dir:
+	mkdir -p output
+
+clean-local:
+	rm -rf output
diff --git a/app/operations/tests/Makefile.in b/app/operations/tests/Makefile.in
new file mode 100644
index 0000000..41af881
--- /dev/null
+++ b/app/operations/tests/Makefile.in
@@ -0,0 +1,815 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#TESTS = test-operations
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+EXTRA_PROGRAMS =
+subdir = app/operations/tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+CLEANFILES = $(EXTRA_PROGRAMS)
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+@OS_WIN32_FALSE@libm = -lm
+AM_CPPFLAGS = \
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/app	\
+	$(GEGL_CFLAGS)		\
+	-I$(includedir)
+
+
+# We need this due to circular dependencies, see more detailed
+# comments about it in app/Makefile.am
+AM_LDFLAGS = \
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type
+
+
+# Note that we have some duplicate entries here too to work around
+# circular dependencies and systems on the same architectural layer as
+# an alternative to LDFLAGS above
+LDADD = \
+	$(top_builddir)/app/xcf/libappxcf.a			\
+	$(top_builddir)/app/pdb/libappinternal-procs.a		\
+	$(top_builddir)/app/pdb/libapppdb.a			\
+	$(top_builddir)/app/plug-in/libappplug-in.a		\
+	$(top_builddir)/app/vectors/libappvectors.a		\
+	$(top_builddir)/app/core/libappcore.a			\
+	$(top_builddir)/app/file/libappfile.a			\
+	$(top_builddir)/app/text/libapptext.a			\
+	$(top_builddir)/app/paint/libapppaint.a			\
+	$(top_builddir)/app/config/libappconfig.a		\
+	$(top_builddir)/app/libapp.a				\
+	$(top_builddir)/app/gegl/libappgegl.a			\
+	$(top_builddir)/app/operations/libappoperations.a	\
+	$(libgimpconfig)					\
+	$(libgimpmath)						\
+	$(libgimpthumb)						\
+	$(libgimpcolor)						\
+	$(libgimpmodule)					\
+	$(libgimpbase)						\
+	$(GDK_PIXBUF_LIBS)					\
+	$(PANGOCAIRO_LIBS)					\
+	$(GEGL_LIBS)						\
+	$(GLIB_LIBS)						\
+	$(libm)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/operations/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/operations/tests/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(TESTS): output-dir
+
+output-dir:
+	mkdir -p output
+
+clean-local:
+	rm -rf output
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am
new file mode 100644
index 0000000..1cc625e
--- /dev/null
+++ b/app/paint/Makefile.am
@@ -0,0 +1,125 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Paint\"		\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	$(LIBMYPAINT_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapppaint.a
+
+libapppaint_a_sources = \
+	paint-enums.h			\
+	paint-types.h			\
+	gimp-paint.c			\
+	gimp-paint.h			\
+	gimpairbrush.c			\
+	gimpairbrush.h			\
+	gimpairbrushoptions.c		\
+	gimpairbrushoptions.h		\
+	gimpbrushcore.c			\
+	gimpbrushcore.h			\
+	gimpbrushcore-loops.cc		\
+	gimpbrushcore-loops.h		\
+	gimpbrushcore-kernels.h		\
+	gimpclone.c			\
+	gimpclone.h			\
+	gimpcloneoptions.c		\
+	gimpcloneoptions.h		\
+	gimpconvolve.c			\
+	gimpconvolve.h			\
+	gimpconvolveoptions.c		\
+	gimpconvolveoptions.h		\
+	gimpdodgeburn.c			\
+	gimpdodgeburn.h			\
+	gimpdodgeburnoptions.c		\
+	gimpdodgeburnoptions.h		\
+	gimperaser.c			\
+	gimperaser.h			\
+	gimperaseroptions.c		\
+	gimperaseroptions.h		\
+	gimpheal.c			\
+	gimpheal.h			\
+	gimpink.c			\
+	gimpink.h			\
+	gimpink-blob.c			\
+	gimpink-blob.h			\
+	gimpinkoptions.c		\
+	gimpinkoptions.h		\
+	gimpinkundo.c			\
+	gimpinkundo.h			\
+	gimpmybrushcore.c		\
+	gimpmybrushcore.h		\
+	gimpmybrushoptions.c		\
+	gimpmybrushoptions.h		\
+	gimpmybrushsurface.c		\
+	gimpmybrushsurface.h		\
+	gimppaintcore.c			\
+	gimppaintcore.h			\
+	gimppaintcore-loops.cc		\
+	gimppaintcore-loops.h		\
+	gimppaintcore-stroke.c		\
+	gimppaintcore-stroke.h		\
+	gimppaintcoreundo.c		\
+	gimppaintcoreundo.h		\
+	gimppaintoptions.c		\
+	gimppaintoptions.h		\
+	gimppencil.c			\
+	gimppencil.h			\
+	gimppenciloptions.c		\
+	gimppenciloptions.h		\
+	gimppaintbrush.c		\
+	gimppaintbrush.h		\
+	gimpperspectiveclone.c		\
+	gimpperspectiveclone.h		\
+	gimpperspectivecloneoptions.c	\
+	gimpperspectivecloneoptions.h	\
+	gimpsmudge.c			\
+	gimpsmudge.h			\
+	gimpsmudgeoptions.c		\
+	gimpsmudgeoptions.h		\
+	gimpsourcecore.c		\
+	gimpsourcecore.h		\
+	gimpsourceoptions.c		\
+	gimpsourceoptions.h
+
+libapppaint_a_built_sources = paint-enums.c
+
+libapppaint_a_SOURCES = $(libapppaint_a_built_sources) $(libapppaint_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-pec
+CLEANFILES = $(gen_sources)
+
+xgen-pec: $(srcdir)/paint-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"paint-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/paint-enums.c: xgen-pec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/paint/Makefile.in b/app/paint/Makefile.in
new file mode 100644
index 0000000..7cdaca4
--- /dev/null
+++ b/app/paint/Makefile.in
@@ -0,0 +1,1208 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/paint
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapppaint_a_AR = $(AR) $(ARFLAGS)
+libapppaint_a_LIBADD =
+am__objects_1 = paint-enums.$(OBJEXT)
+am__objects_2 = gimp-paint.$(OBJEXT) gimpairbrush.$(OBJEXT) \
+	gimpairbrushoptions.$(OBJEXT) gimpbrushcore.$(OBJEXT) \
+	gimpbrushcore-loops.$(OBJEXT) gimpclone.$(OBJEXT) \
+	gimpcloneoptions.$(OBJEXT) gimpconvolve.$(OBJEXT) \
+	gimpconvolveoptions.$(OBJEXT) gimpdodgeburn.$(OBJEXT) \
+	gimpdodgeburnoptions.$(OBJEXT) gimperaser.$(OBJEXT) \
+	gimperaseroptions.$(OBJEXT) gimpheal.$(OBJEXT) \
+	gimpink.$(OBJEXT) gimpink-blob.$(OBJEXT) \
+	gimpinkoptions.$(OBJEXT) gimpinkundo.$(OBJEXT) \
+	gimpmybrushcore.$(OBJEXT) gimpmybrushoptions.$(OBJEXT) \
+	gimpmybrushsurface.$(OBJEXT) gimppaintcore.$(OBJEXT) \
+	gimppaintcore-loops.$(OBJEXT) gimppaintcore-stroke.$(OBJEXT) \
+	gimppaintcoreundo.$(OBJEXT) gimppaintoptions.$(OBJEXT) \
+	gimppencil.$(OBJEXT) gimppenciloptions.$(OBJEXT) \
+	gimppaintbrush.$(OBJEXT) gimpperspectiveclone.$(OBJEXT) \
+	gimpperspectivecloneoptions.$(OBJEXT) gimpsmudge.$(OBJEXT) \
+	gimpsmudgeoptions.$(OBJEXT) gimpsourcecore.$(OBJEXT) \
+	gimpsourceoptions.$(OBJEXT)
+am_libapppaint_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libapppaint_a_OBJECTS = $(am_libapppaint_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp-paint.Po \
+	./$(DEPDIR)/gimpairbrush.Po ./$(DEPDIR)/gimpairbrushoptions.Po \
+	./$(DEPDIR)/gimpbrushcore-loops.Po \
+	./$(DEPDIR)/gimpbrushcore.Po ./$(DEPDIR)/gimpclone.Po \
+	./$(DEPDIR)/gimpcloneoptions.Po ./$(DEPDIR)/gimpconvolve.Po \
+	./$(DEPDIR)/gimpconvolveoptions.Po \
+	./$(DEPDIR)/gimpdodgeburn.Po \
+	./$(DEPDIR)/gimpdodgeburnoptions.Po ./$(DEPDIR)/gimperaser.Po \
+	./$(DEPDIR)/gimperaseroptions.Po ./$(DEPDIR)/gimpheal.Po \
+	./$(DEPDIR)/gimpink-blob.Po ./$(DEPDIR)/gimpink.Po \
+	./$(DEPDIR)/gimpinkoptions.Po ./$(DEPDIR)/gimpinkundo.Po \
+	./$(DEPDIR)/gimpmybrushcore.Po \
+	./$(DEPDIR)/gimpmybrushoptions.Po \
+	./$(DEPDIR)/gimpmybrushsurface.Po \
+	./$(DEPDIR)/gimppaintbrush.Po \
+	./$(DEPDIR)/gimppaintcore-loops.Po \
+	./$(DEPDIR)/gimppaintcore-stroke.Po \
+	./$(DEPDIR)/gimppaintcore.Po ./$(DEPDIR)/gimppaintcoreundo.Po \
+	./$(DEPDIR)/gimppaintoptions.Po ./$(DEPDIR)/gimppencil.Po \
+	./$(DEPDIR)/gimppenciloptions.Po \
+	./$(DEPDIR)/gimpperspectiveclone.Po \
+	./$(DEPDIR)/gimpperspectivecloneoptions.Po \
+	./$(DEPDIR)/gimpsmudge.Po ./$(DEPDIR)/gimpsmudgeoptions.Po \
+	./$(DEPDIR)/gimpsourcecore.Po ./$(DEPDIR)/gimpsourceoptions.Po \
+	./$(DEPDIR)/paint-enums.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libapppaint_a_SOURCES)
+DIST_SOURCES = $(libapppaint_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Paint\"		\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
+	$(LIBMYPAINT_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapppaint.a
+libapppaint_a_sources = \
+	paint-enums.h			\
+	paint-types.h			\
+	gimp-paint.c			\
+	gimp-paint.h			\
+	gimpairbrush.c			\
+	gimpairbrush.h			\
+	gimpairbrushoptions.c		\
+	gimpairbrushoptions.h		\
+	gimpbrushcore.c			\
+	gimpbrushcore.h			\
+	gimpbrushcore-loops.cc		\
+	gimpbrushcore-loops.h		\
+	gimpbrushcore-kernels.h		\
+	gimpclone.c			\
+	gimpclone.h			\
+	gimpcloneoptions.c		\
+	gimpcloneoptions.h		\
+	gimpconvolve.c			\
+	gimpconvolve.h			\
+	gimpconvolveoptions.c		\
+	gimpconvolveoptions.h		\
+	gimpdodgeburn.c			\
+	gimpdodgeburn.h			\
+	gimpdodgeburnoptions.c		\
+	gimpdodgeburnoptions.h		\
+	gimperaser.c			\
+	gimperaser.h			\
+	gimperaseroptions.c		\
+	gimperaseroptions.h		\
+	gimpheal.c			\
+	gimpheal.h			\
+	gimpink.c			\
+	gimpink.h			\
+	gimpink-blob.c			\
+	gimpink-blob.h			\
+	gimpinkoptions.c		\
+	gimpinkoptions.h		\
+	gimpinkundo.c			\
+	gimpinkundo.h			\
+	gimpmybrushcore.c		\
+	gimpmybrushcore.h		\
+	gimpmybrushoptions.c		\
+	gimpmybrushoptions.h		\
+	gimpmybrushsurface.c		\
+	gimpmybrushsurface.h		\
+	gimppaintcore.c			\
+	gimppaintcore.h			\
+	gimppaintcore-loops.cc		\
+	gimppaintcore-loops.h		\
+	gimppaintcore-stroke.c		\
+	gimppaintcore-stroke.h		\
+	gimppaintcoreundo.c		\
+	gimppaintcoreundo.h		\
+	gimppaintoptions.c		\
+	gimppaintoptions.h		\
+	gimppencil.c			\
+	gimppencil.h			\
+	gimppenciloptions.c		\
+	gimppenciloptions.h		\
+	gimppaintbrush.c		\
+	gimppaintbrush.h		\
+	gimpperspectiveclone.c		\
+	gimpperspectiveclone.h		\
+	gimpperspectivecloneoptions.c	\
+	gimpperspectivecloneoptions.h	\
+	gimpsmudge.c			\
+	gimpsmudge.h			\
+	gimpsmudgeoptions.c		\
+	gimpsmudgeoptions.h		\
+	gimpsourcecore.c		\
+	gimpsourcecore.h		\
+	gimpsourceoptions.c		\
+	gimpsourceoptions.h
+
+libapppaint_a_built_sources = paint-enums.c
+libapppaint_a_SOURCES = $(libapppaint_a_built_sources) $(libapppaint_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-pec
+CLEANFILES = $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/paint/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapppaint.a: $(libapppaint_a_OBJECTS) $(libapppaint_a_DEPENDENCIES) $(EXTRA_libapppaint_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapppaint.a
+	$(AM_V_AR)$(libapppaint_a_AR) libapppaint.a $(libapppaint_a_OBJECTS) $(libapppaint_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapppaint.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-paint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpairbrush.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpairbrushoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushcore-loops.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushcore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpclone.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcloneoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpconvolve.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpconvolveoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdodgeburn.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdodgeburnoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimperaser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimperaseroptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpheal.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpink-blob.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpinkoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpinkundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrushcore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrushoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrushsurface.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintbrush.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintcore-loops.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintcore-stroke.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintcore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintcoreundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppencil.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppenciloptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpperspectiveclone.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpperspectivecloneoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsmudge.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsmudgeoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsourcecore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsourceoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paint-enums.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimp-paint.Po
+	-rm -f ./$(DEPDIR)/gimpairbrush.Po
+	-rm -f ./$(DEPDIR)/gimpairbrushoptions.Po
+	-rm -f ./$(DEPDIR)/gimpbrushcore-loops.Po
+	-rm -f ./$(DEPDIR)/gimpbrushcore.Po
+	-rm -f ./$(DEPDIR)/gimpclone.Po
+	-rm -f ./$(DEPDIR)/gimpcloneoptions.Po
+	-rm -f ./$(DEPDIR)/gimpconvolve.Po
+	-rm -f ./$(DEPDIR)/gimpconvolveoptions.Po
+	-rm -f ./$(DEPDIR)/gimpdodgeburn.Po
+	-rm -f ./$(DEPDIR)/gimpdodgeburnoptions.Po
+	-rm -f ./$(DEPDIR)/gimperaser.Po
+	-rm -f ./$(DEPDIR)/gimperaseroptions.Po
+	-rm -f ./$(DEPDIR)/gimpheal.Po
+	-rm -f ./$(DEPDIR)/gimpink-blob.Po
+	-rm -f ./$(DEPDIR)/gimpink.Po
+	-rm -f ./$(DEPDIR)/gimpinkoptions.Po
+	-rm -f ./$(DEPDIR)/gimpinkundo.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushcore.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushsurface.Po
+	-rm -f ./$(DEPDIR)/gimppaintbrush.Po
+	-rm -f ./$(DEPDIR)/gimppaintcore-loops.Po
+	-rm -f ./$(DEPDIR)/gimppaintcore-stroke.Po
+	-rm -f ./$(DEPDIR)/gimppaintcore.Po
+	-rm -f ./$(DEPDIR)/gimppaintcoreundo.Po
+	-rm -f ./$(DEPDIR)/gimppaintoptions.Po
+	-rm -f ./$(DEPDIR)/gimppencil.Po
+	-rm -f ./$(DEPDIR)/gimppenciloptions.Po
+	-rm -f ./$(DEPDIR)/gimpperspectiveclone.Po
+	-rm -f ./$(DEPDIR)/gimpperspectivecloneoptions.Po
+	-rm -f ./$(DEPDIR)/gimpsmudge.Po
+	-rm -f ./$(DEPDIR)/gimpsmudgeoptions.Po
+	-rm -f ./$(DEPDIR)/gimpsourcecore.Po
+	-rm -f ./$(DEPDIR)/gimpsourceoptions.Po
+	-rm -f ./$(DEPDIR)/paint-enums.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimp-paint.Po
+	-rm -f ./$(DEPDIR)/gimpairbrush.Po
+	-rm -f ./$(DEPDIR)/gimpairbrushoptions.Po
+	-rm -f ./$(DEPDIR)/gimpbrushcore-loops.Po
+	-rm -f ./$(DEPDIR)/gimpbrushcore.Po
+	-rm -f ./$(DEPDIR)/gimpclone.Po
+	-rm -f ./$(DEPDIR)/gimpcloneoptions.Po
+	-rm -f ./$(DEPDIR)/gimpconvolve.Po
+	-rm -f ./$(DEPDIR)/gimpconvolveoptions.Po
+	-rm -f ./$(DEPDIR)/gimpdodgeburn.Po
+	-rm -f ./$(DEPDIR)/gimpdodgeburnoptions.Po
+	-rm -f ./$(DEPDIR)/gimperaser.Po
+	-rm -f ./$(DEPDIR)/gimperaseroptions.Po
+	-rm -f ./$(DEPDIR)/gimpheal.Po
+	-rm -f ./$(DEPDIR)/gimpink-blob.Po
+	-rm -f ./$(DEPDIR)/gimpink.Po
+	-rm -f ./$(DEPDIR)/gimpinkoptions.Po
+	-rm -f ./$(DEPDIR)/gimpinkundo.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushcore.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushsurface.Po
+	-rm -f ./$(DEPDIR)/gimppaintbrush.Po
+	-rm -f ./$(DEPDIR)/gimppaintcore-loops.Po
+	-rm -f ./$(DEPDIR)/gimppaintcore-stroke.Po
+	-rm -f ./$(DEPDIR)/gimppaintcore.Po
+	-rm -f ./$(DEPDIR)/gimppaintcoreundo.Po
+	-rm -f ./$(DEPDIR)/gimppaintoptions.Po
+	-rm -f ./$(DEPDIR)/gimppencil.Po
+	-rm -f ./$(DEPDIR)/gimppenciloptions.Po
+	-rm -f ./$(DEPDIR)/gimpperspectiveclone.Po
+	-rm -f ./$(DEPDIR)/gimpperspectivecloneoptions.Po
+	-rm -f ./$(DEPDIR)/gimpsmudge.Po
+	-rm -f ./$(DEPDIR)/gimpsmudgeoptions.Po
+	-rm -f ./$(DEPDIR)/gimpsourcecore.Po
+	-rm -f ./$(DEPDIR)/gimpsourceoptions.Po
+	-rm -f ./$(DEPDIR)/paint-enums.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-pec: $(srcdir)/paint-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"paint-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/paint-enums.c: xgen-pec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/paint/gimp-paint.c b/app/paint/gimp-paint.c
new file mode 100644
index 0000000..f3904a3
--- /dev/null
+++ b/app/paint/gimp-paint.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "core/gimp.h"
+#include "core/gimplist.h"
+#include "core/gimppaintinfo.h"
+
+#include "gimp-paint.h"
+#include "gimpairbrush.h"
+#include "gimpclone.h"
+#include "gimpconvolve.h"
+#include "gimpdodgeburn.h"
+#include "gimperaser.h"
+#include "gimpheal.h"
+#include "gimpink.h"
+#include "gimpmybrushcore.h"
+#include "gimppaintoptions.h"
+#include "gimppaintbrush.h"
+#include "gimppencil.h"
+#include "gimpperspectiveclone.h"
+#include "gimpsmudge.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_paint_register (Gimp        *gimp,
+                                   GType        paint_type,
+                                   GType        paint_options_type,
+                                   const gchar *identifier,
+                                   const gchar *blurb,
+                                   const gchar *icon_name);
+
+
+/*  public functions  */
+
+void
+gimp_paint_init (Gimp *gimp)
+{
+  GimpPaintRegisterFunc register_funcs[] =
+  {
+    gimp_dodge_burn_register,
+    gimp_smudge_register,
+    gimp_convolve_register,
+    gimp_perspective_clone_register,
+    gimp_heal_register,
+    gimp_clone_register,
+    gimp_mybrush_core_register,
+    gimp_ink_register,
+    gimp_airbrush_register,
+    gimp_eraser_register,
+    gimp_paintbrush_register,
+    gimp_pencil_register
+  };
+
+  gint i;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp->paint_info_list = gimp_list_new (GIMP_TYPE_PAINT_INFO, FALSE);
+  gimp_object_set_static_name (GIMP_OBJECT (gimp->paint_info_list),
+                               "paint infos");
+
+  gimp_container_freeze (gimp->paint_info_list);
+
+  for (i = 0; i < G_N_ELEMENTS (register_funcs); i++)
+    {
+      register_funcs[i] (gimp, gimp_paint_register);
+    }
+
+  gimp_container_thaw (gimp->paint_info_list);
+}
+
+void
+gimp_paint_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_paint_info_set_standard (gimp, NULL);
+
+  if (gimp->paint_info_list)
+    {
+      gimp_container_foreach (gimp->paint_info_list,
+                              (GFunc) g_object_run_dispose, NULL);
+      g_clear_object (&gimp->paint_info_list);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_paint_register (Gimp        *gimp,
+                     GType        paint_type,
+                     GType        paint_options_type,
+                     const gchar *identifier,
+                     const gchar *blurb,
+                     const gchar *icon_name)
+{
+  GimpPaintInfo *paint_info;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (g_type_is_a (paint_type, GIMP_TYPE_PAINT_CORE));
+  g_return_if_fail (g_type_is_a (paint_options_type, GIMP_TYPE_PAINT_OPTIONS));
+  g_return_if_fail (identifier != NULL);
+  g_return_if_fail (blurb != NULL);
+
+  paint_info = gimp_paint_info_new (gimp,
+                                    paint_type,
+                                    paint_options_type,
+                                    identifier,
+                                    blurb,
+                                    icon_name);
+
+  gimp_container_add (gimp->paint_info_list, GIMP_OBJECT (paint_info));
+  g_object_unref (paint_info);
+
+  if (paint_type == GIMP_TYPE_PAINTBRUSH)
+    gimp_paint_info_set_standard (gimp, paint_info);
+}
diff --git a/app/paint/gimp-paint.h b/app/paint/gimp-paint.h
new file mode 100644
index 0000000..97dee10
--- /dev/null
+++ b/app/paint/gimp-paint.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_H__
+#define __GIMP_PAINT_H__
+
+
+void   gimp_paint_init (Gimp *gimp);
+void   gimp_paint_exit (Gimp *gimp);
+
+
+#endif  /* __GIMP_PAINT_H__ */
diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c
new file mode 100644
index 0000000..b4bf5b4
--- /dev/null
+++ b/app/paint/gimpairbrush.c
@@ -0,0 +1,266 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimpairbrush.h"
+#include "gimpairbrushoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define STAMP_MAX_FPS 60
+
+
+enum
+{
+  STAMP,
+  LAST_SIGNAL
+};
+
+
+static void       gimp_airbrush_finalize (GObject          *object);
+
+static void       gimp_airbrush_paint    (GimpPaintCore    *paint_core,
+                                          GimpDrawable     *drawable,
+                                          GimpPaintOptions *paint_options,
+                                          GimpSymmetry     *sym,
+                                          GimpPaintState    paint_state,
+                                          guint32           time);
+static void       gimp_airbrush_motion   (GimpPaintCore    *paint_core,
+                                          GimpDrawable     *drawable,
+                                          GimpPaintOptions *paint_options,
+                                          GimpSymmetry     *sym);
+
+static gboolean   gimp_airbrush_timeout  (gpointer          data);
+
+
+G_DEFINE_TYPE (GimpAirbrush, gimp_airbrush, GIMP_TYPE_PAINTBRUSH)
+
+#define parent_class gimp_airbrush_parent_class
+
+static guint airbrush_signals[LAST_SIGNAL] = { 0 };
+
+
+void
+gimp_airbrush_register (Gimp                      *gimp,
+                        GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_AIRBRUSH,
+                GIMP_TYPE_AIRBRUSH_OPTIONS,
+                "gimp-airbrush",
+                _("Airbrush"),
+                "gimp-tool-airbrush");
+}
+
+static void
+gimp_airbrush_class_init (GimpAirbrushClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+
+  object_class->finalize  = gimp_airbrush_finalize;
+
+  paint_core_class->paint = gimp_airbrush_paint;
+
+  airbrush_signals[STAMP] =
+    g_signal_new ("stamp",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpAirbrushClass, stamp),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+}
+
+static void
+gimp_airbrush_init (GimpAirbrush *airbrush)
+{
+}
+
+static void
+gimp_airbrush_finalize (GObject *object)
+{
+  GimpAirbrush *airbrush = GIMP_AIRBRUSH (object);
+
+  if (airbrush->timeout_id)
+    {
+      g_source_remove (airbrush->timeout_id);
+      airbrush->timeout_id = 0;
+    }
+
+  g_clear_object (&airbrush->sym);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_airbrush_paint (GimpPaintCore    *paint_core,
+                     GimpDrawable     *drawable,
+                     GimpPaintOptions *paint_options,
+                     GimpSymmetry     *sym,
+                     GimpPaintState    paint_state,
+                     guint32           time)
+{
+  GimpAirbrush        *airbrush = GIMP_AIRBRUSH (paint_core);
+  GimpAirbrushOptions *options  = GIMP_AIRBRUSH_OPTIONS (paint_options);
+  GimpDynamics        *dynamics = GIMP_BRUSH_CORE (paint_core)->dynamics;
+
+  if (airbrush->timeout_id)
+    {
+      g_source_remove (airbrush->timeout_id);
+      airbrush->timeout_id = 0;
+    }
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      GIMP_PAINT_CORE_CLASS (parent_class)->paint (paint_core, drawable,
+                                                   paint_options,
+                                                   sym,
+                                                   paint_state, time);
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      gimp_airbrush_motion (paint_core, drawable, paint_options, sym);
+
+      if ((options->rate != 0.0) && ! options->motion_only)
+        {
+          GimpImage  *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          gdouble     fade_point;
+          gdouble     dynamic_rate;
+          gint        timeout;
+          GimpCoords *coords;
+
+          fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                                    paint_core->pixel_dist);
+
+          airbrush->drawable      = drawable;
+          airbrush->paint_options = paint_options;
+
+          if (airbrush->sym)
+            g_object_unref (airbrush->sym);
+          airbrush->sym = g_object_ref (sym);
+
+          /* Base our timeout on the original stroke. */
+          coords = gimp_symmetry_get_origin (sym);
+
+          airbrush->coords = *coords;
+
+          dynamic_rate = gimp_dynamics_get_linear_value (dynamics,
+                                                         GIMP_DYNAMICS_OUTPUT_RATE,
+                                                         coords,
+                                                         paint_options,
+                                                         fade_point);
+
+          timeout = (1000.0 / STAMP_MAX_FPS) /
+                    ((options->rate / 100.0) * dynamic_rate);
+
+          airbrush->timeout_id = g_timeout_add_full (G_PRIORITY_HIGH,
+                                                     timeout,
+                                                     gimp_airbrush_timeout,
+                                                     airbrush, NULL);
+        }
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      GIMP_PAINT_CORE_CLASS (parent_class)->paint (paint_core, drawable,
+                                                   paint_options,
+                                                   sym,
+                                                   paint_state, time);
+
+      g_clear_object (&airbrush->sym);
+      break;
+    }
+}
+
+static void
+gimp_airbrush_motion (GimpPaintCore    *paint_core,
+                      GimpDrawable     *drawable,
+                      GimpPaintOptions *paint_options,
+                      GimpSymmetry     *sym)
+
+{
+  GimpAirbrushOptions *options  = GIMP_AIRBRUSH_OPTIONS (paint_options);
+  GimpDynamics        *dynamics = GIMP_BRUSH_CORE (paint_core)->dynamics;
+  GimpImage           *image    = gimp_item_get_image (GIMP_ITEM (drawable));
+  gdouble              opacity;
+  gdouble              fade_point;
+  GimpCoords          *coords;
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  coords = gimp_symmetry_get_origin (sym);
+
+  opacity = (options->flow / 100.0 *
+             gimp_dynamics_get_linear_value (dynamics,
+                                             GIMP_DYNAMICS_OUTPUT_FLOW,
+                                             coords,
+                                             paint_options,
+                                             fade_point));
+
+  _gimp_paintbrush_motion (paint_core, drawable, paint_options,
+                           sym, opacity);
+}
+
+static gboolean
+gimp_airbrush_timeout (gpointer data)
+{
+  GimpAirbrush *airbrush = GIMP_AIRBRUSH (data);
+
+  airbrush->timeout_id = 0;
+
+  g_signal_emit (airbrush, airbrush_signals[STAMP], 0);
+
+  return G_SOURCE_REMOVE;
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_airbrush_stamp (GimpAirbrush *airbrush)
+{
+  g_return_if_fail (GIMP_IS_AIRBRUSH (airbrush));
+
+  gimp_symmetry_set_origin (airbrush->sym,
+                            airbrush->drawable, &airbrush->coords);
+
+  gimp_airbrush_paint (GIMP_PAINT_CORE (airbrush),
+                       airbrush->drawable,
+                       airbrush->paint_options,
+                       airbrush->sym,
+                       GIMP_PAINT_STATE_MOTION, 0);
+
+  gimp_symmetry_clear_origin (airbrush->sym);
+}
diff --git a/app/paint/gimpairbrush.h b/app/paint/gimpairbrush.h
new file mode 100644
index 0000000..23b2b85
--- /dev/null
+++ b/app/paint/gimpairbrush.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_AIRBRUSH_H__
+#define __GIMP_AIRBRUSH_H__
+
+
+#include "gimppaintbrush.h"
+
+
+#define GIMP_TYPE_AIRBRUSH            (gimp_airbrush_get_type ())
+#define GIMP_AIRBRUSH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_AIRBRUSH, GimpAirbrush))
+#define GIMP_AIRBRUSH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_AIRBRUSH, GimpAirbrushClass))
+#define GIMP_IS_AIRBRUSH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_AIRBRUSH))
+#define GIMP_IS_AIRBRUSH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_AIRBRUSH))
+#define GIMP_AIRBRUSH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH, GimpAirbrushClass))
+
+
+typedef struct _GimpAirbrushClass GimpAirbrushClass;
+
+struct _GimpAirbrush
+{
+  GimpPaintbrush    parent_instance;
+
+  guint             timeout_id;
+
+  GimpSymmetry     *sym;
+  GimpDrawable     *drawable;
+  GimpPaintOptions *paint_options;
+  GimpCoords        coords;
+};
+
+struct _GimpAirbrushClass
+{
+  GimpPaintbrushClass  parent_class;
+
+  /*  signals  */
+  void (* stamp) (GimpAirbrush *airbrush);
+};
+
+
+void    gimp_airbrush_register (Gimp                      *gimp,
+                                GimpPaintRegisterCallback  callback);
+
+GType   gimp_airbrush_get_type (void) G_GNUC_CONST;
+
+void    gimp_airbrush_stamp    (GimpAirbrush              *airbrush);
+
+
+#endif  /*  __GIMP_AIRBRUSH_H__  */
diff --git a/app/paint/gimpairbrushoptions.c b/app/paint/gimpairbrushoptions.c
new file mode 100644
index 0000000..37c7e78
--- /dev/null
+++ b/app/paint/gimpairbrushoptions.c
@@ -0,0 +1,155 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpairbrushoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define AIRBRUSH_DEFAULT_RATE        50.0
+#define AIRBRUSH_DEFAULT_FLOW        10.0
+#define AIRBRUSH_DEFAULT_MOTION_ONLY FALSE
+
+enum
+{
+  PROP_0,
+  PROP_RATE,
+  PROP_MOTION_ONLY,
+  PROP_FLOW,
+  PROP_PRESSURE /*for backwards copatibility of tool options*/
+};
+
+
+static void   gimp_airbrush_options_set_property (GObject      *object,
+                                                  guint         property_id,
+                                                  const GValue *value,
+                                                  GParamSpec   *pspec);
+static void   gimp_airbrush_options_get_property (GObject      *object,
+                                                  guint         property_id,
+                                                  GValue       *value,
+                                                  GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpAirbrushOptions, gimp_airbrush_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_airbrush_options_class_init (GimpAirbrushOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_airbrush_options_set_property;
+  object_class->get_property = gimp_airbrush_options_get_property;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_RATE,
+                           "rate",
+                           C_("airbrush-tool", "Rate"),
+                           NULL,
+                           0.0, 100.0, AIRBRUSH_DEFAULT_RATE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MOTION_ONLY,
+                            "motion-only",
+                            _("Motion only"),
+                            NULL,
+                            AIRBRUSH_DEFAULT_MOTION_ONLY,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FLOW,
+                           "flow",
+                           _("Flow"),
+                           NULL,
+                           0.0, 100.0, AIRBRUSH_DEFAULT_FLOW,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  /* backwads-compadibility prop for flow fomerly known as pressure */
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_PRESSURE,
+                           "pressure",
+                           NULL, NULL,
+                           0.0, 100.0, AIRBRUSH_DEFAULT_FLOW,
+                           GIMP_CONFIG_PARAM_IGNORE);
+}
+
+static void
+gimp_airbrush_options_init (GimpAirbrushOptions *options)
+{
+}
+
+static void
+gimp_airbrush_options_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpAirbrushOptions *options = GIMP_AIRBRUSH_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_RATE:
+      options->rate = g_value_get_double (value);
+      break;
+    case PROP_MOTION_ONLY:
+      options->motion_only = g_value_get_boolean (value);
+      break;
+    case PROP_PRESSURE:
+    case PROP_FLOW:
+      options->flow = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_airbrush_options_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpAirbrushOptions *options = GIMP_AIRBRUSH_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_RATE:
+      g_value_set_double (value, options->rate);
+      break;
+    case PROP_MOTION_ONLY:
+      g_value_set_boolean (value, options->motion_only);
+      break;
+    case PROP_PRESSURE:
+    case PROP_FLOW:
+      g_value_set_double (value, options->flow);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpairbrushoptions.h b/app/paint/gimpairbrushoptions.h
new file mode 100644
index 0000000..d7d8bcd
--- /dev/null
+++ b/app/paint/gimpairbrushoptions.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_AIRBRUSH_OPTIONS_H__
+#define __GIMP_AIRBRUSH_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_AIRBRUSH_OPTIONS            (gimp_airbrush_options_get_type ())
+#define GIMP_AIRBRUSH_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_AIRBRUSH_OPTIONS, GimpAirbrushOptions))
+#define GIMP_AIRBRUSH_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_AIRBRUSH_OPTIONS, GimpAirbrushOptionsClass))
+#define GIMP_IS_AIRBRUSH_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_AIRBRUSH_OPTIONS))
+#define GIMP_IS_AIRBRUSH_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_AIRBRUSH_OPTIONS))
+#define GIMP_AIRBRUSH_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH_OPTIONS, GimpAirbrushOptionsClass))
+
+
+typedef struct _GimpAirbrushOptionsClass GimpAirbrushOptionsClass;
+
+struct _GimpAirbrushOptions
+{
+  GimpPaintOptions  parent_instance;
+
+  gdouble           rate;
+  gboolean          motion_only;
+  gdouble           flow;
+};
+
+struct _GimpAirbrushOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_airbrush_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_AIRBRUSH_OPTIONS_H__  */
diff --git a/app/paint/gimpbrushcore-kernels.h b/app/paint/gimpbrushcore-kernels.h
new file mode 100644
index 0000000..ea5eb45
--- /dev/null
+++ b/app/paint/gimpbrushcore-kernels.h
@@ -0,0 +1,116 @@
+/* gimpbrushcore-kernels.h
+ *
+ *   This file was generated using kernelgen as found in the tools dir.
+ *   (threshold = 0.25)
+ */
+
+#ifndef __GIMP_BRUSH_CORE_KERNELS_H__
+#define __GIMP_BRUSH_CORE_KERNELS_H__
+
+
+#define KERNEL_WIDTH     3
+#define KERNEL_HEIGHT    3
+#define KERNEL_SUBSAMPLE 4
+
+
+#ifdef __cplusplus
+
+template <class T>
+struct Kernel;
+
+template <>
+struct Kernel<guchar>
+{
+  using value_type  = guchar;
+  using kernel_type = guint;
+  using accum_type  = gulong;
+
+  static constexpr kernel_type
+  coeff (kernel_type x)
+  {
+    return x;
+  }
+
+  static constexpr value_type
+  round (accum_type x)
+  {
+    return (x + 128) / 256;
+  }
+};
+
+template <>
+struct Kernel<gfloat>
+{
+  using value_type  = gfloat;
+  using kernel_type = gfloat;
+  using accum_type  = gfloat;
+
+  static constexpr kernel_type
+  coeff (kernel_type x)
+  {
+    return x / 256.0f;
+  }
+
+  static constexpr value_type
+  round (accum_type x)
+  {
+    return x;
+  }
+};
+
+
+/*  Brush pixel subsampling kernels  */
+template <class T>
+struct Subsample : Kernel<T>
+{
+  #define C(x) (Subsample::coeff (x))
+
+  static constexpr typename Subsample::kernel_type kernel[5][5][9] =
+  {
+    {
+      { C( 64), C( 64), C(  0), C( 64), C( 64), C(  0), C(  0), C(  0), C(  0), },
+      { C( 25), C(103), C(  0), C( 25), C(103), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C(128), C(  0), C(  0), C(128), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C(103), C( 25), C(  0), C(103), C( 25), C(  0), C(  0), C(  0), },
+      { C(  0), C( 64), C( 64), C(  0), C( 64), C( 64), C(  0), C(  0), C(  0), }
+    },
+    {
+      { C( 25), C( 25), C(  0), C(103), C(103), C(  0), C(  0), C(  0), C(  0), },
+      { C(  6), C( 44), C(  0), C( 44), C(162), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C( 50), C(  0), C(  0), C(206), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C( 44), C(  6), C(  0), C(162), C( 44), C(  0), C(  0), C(  0), },
+      { C(  0), C( 25), C( 25), C(  0), C(103), C(103), C(  0), C(  0), C(  0), }
+    },
+    {
+      { C(  0), C(  0), C(  0), C(128), C(128), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C(  0), C(  0), C( 50), C(206), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(256), C(  0), C(  0), C(  0), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(206), C( 50), C(  0), C(  0), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(128), C(128), C(  0), C(  0), C(  0), }
+    },
+    {
+      { C(  0), C(  0), C(  0), C(103), C(103), C(  0), C( 25), C( 25), C(  0), },
+      { C(  0), C(  0), C(  0), C( 44), C(162), C(  0), C(  6), C( 44), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(206), C(  0), C(  0), C( 50), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(162), C( 44), C(  0), C( 44), C(  6), },
+      { C(  0), C(  0), C(  0), C(  0), C(103), C(103), C(  0), C( 25), C( 25), }
+    },
+    {
+      { C(  0), C(  0), C(  0), C( 64), C( 64), C(  0), C( 64), C( 64), C(  0), },
+      { C(  0), C(  0), C(  0), C( 25), C(103), C(  0), C( 25), C(103), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(128), C(  0), C(  0), C(128), C(  0), },
+      { C(  0), C(  0), C(  0), C(  0), C(103), C( 25), C(  0), C(103), C( 25), },
+      { C(  0), C(  0), C(  0), C(  0), C( 64), C( 64), C(  0), C( 64), C( 64), }
+    }
+  };
+
+  #undef C
+};
+
+template <class T>
+constexpr typename Subsample<T>::kernel_type Subsample<T>::kernel[5][5][9];
+
+#endif /* __cplusplus */
+
+
+#endif /* __GIMP_BRUSH_CORE_KERNELS_H__ */
diff --git a/app/paint/gimpbrushcore-loops.cc b/app/paint/gimpbrushcore-loops.cc
new file mode 100644
index 0000000..31b4afb
--- /dev/null
+++ b/app/paint/gimpbrushcore-loops.cc
@@ -0,0 +1,647 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+extern "C"
+{
+
+#include "paint-types.h"
+
+#include "core/gimptempbuf.h"
+
+#include "gimpbrushcore.h"
+#include "gimpbrushcore-loops.h"
+
+} /* extern "C" */
+
+#include "gimpbrushcore-kernels.h"
+
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+#define EPSILON 1e-6
+
+
+static void
+clear_edges (GimpTempBuf *buf,
+             gint         top,
+             gint         bottom,
+             gint         left,
+             gint         right)
+{
+  guchar     *data;
+  const Babl *format = gimp_temp_buf_get_format (buf);
+  gint        bpp    = babl_format_get_bytes_per_pixel (format);
+  gint        width  = gimp_temp_buf_get_width  (buf);
+  gint        height = gimp_temp_buf_get_height (buf);
+
+  if (top + bottom >= height || left + right >= width)
+    {
+      gimp_temp_buf_data_clear (buf);
+
+      return;
+    }
+
+  data = gimp_temp_buf_get_data (buf);
+
+  memset (data, 0, (top * width + left) * bpp);
+
+  if (left + right)
+    {
+      gint stride = width * bpp;
+      gint size   = (left + right) * bpp;
+      gint y;
+
+      data = gimp_temp_buf_get_data (buf) +
+             ((top + 1) * width - right) * bpp;
+
+      for (y = top; y < height - bottom - 1; y++)
+        {
+          memset (data, 0, size);
+
+          data += stride;
+        }
+    }
+
+  data = gimp_temp_buf_get_data (buf) +
+         ((height - bottom) * width - right) * bpp;
+
+  memset (data, 0, (bottom * width + right) * bpp);
+}
+
+template <class T>
+static inline void
+rotate_pointers (T    **p,
+                 gint   n)
+{
+  T    *tmp;
+  gint  i;
+
+  tmp = p[0];
+
+  for (i = 0; i < n - 1; i++)
+    p[i] = p[i + 1];
+
+  p[i] = tmp;
+}
+
+template <class T>
+static void
+gimp_brush_core_subsample_mask_impl (const GimpTempBuf *mask,
+                                     GimpTempBuf       *dest,
+                                     gint               dest_offset_x,
+                                     gint               dest_offset_y,
+                                     gint               index1,
+                                     gint               index2)
+{
+  using value_type  = typename Subsample<T>::value_type;
+  using kernel_type = typename Subsample<T>::kernel_type;
+  using accum_type  = typename Subsample<T>::accum_type;
+
+  Subsample<T>       subsample;
+  const kernel_type *kernel      = subsample.kernel[index2][index1];
+  gint               mask_width  = gimp_temp_buf_get_width  (mask);
+  gint               mask_height = gimp_temp_buf_get_height (mask);
+  gint               dest_width  = gimp_temp_buf_get_width  (dest);
+  gint               dest_height = gimp_temp_buf_get_height (dest);
+
+  gegl_parallel_distribute_range (
+    mask_height, PIXELS_PER_THREAD / mask_width,
+    [=] (gint y, gint height)
+    {
+      const value_type  *m;
+      value_type        *d;
+      const kernel_type *k;
+      gint               y0;
+      gint               i, j;
+      gint               r, s;
+      gint               offs;
+      accum_type        *accum[KERNEL_HEIGHT];
+
+      /* Allocate and initialize the accum buffer */
+      for (i = 0; i < KERNEL_HEIGHT ; i++)
+        accum[i] = gegl_scratch_new0 (accum_type, dest_width + 1);
+
+      y0 = MAX (y - (KERNEL_HEIGHT - 1), 0);
+
+      m = (const value_type *) gimp_temp_buf_get_data (mask) +
+          y0 * mask_width;
+
+      for (i = y0; i < y; i++)
+        {
+          for (j = 0; j < mask_width; j++)
+            {
+              k = kernel + KERNEL_WIDTH * (y - i);
+              for (r = y - i; r < KERNEL_HEIGHT; r++)
+                {
+                  offs = j + dest_offset_x;
+                  s = KERNEL_WIDTH;
+                  while (s--)
+                    accum[r][offs++] += *m * *k++;
+                }
+              m++;
+            }
+
+          rotate_pointers (accum, KERNEL_HEIGHT);
+        }
+
+      for (i = y; i < y + height; i++)
+        {
+          for (j = 0; j < mask_width; j++)
+            {
+              k = kernel;
+              for (r = 0; r < KERNEL_HEIGHT; r++)
+                {
+                  offs = j + dest_offset_x;
+                  s = KERNEL_WIDTH;
+                  while (s--)
+                    accum[r][offs++] += *m * *k++;
+                }
+              m++;
+            }
+
+          /* store the accum buffer into the destination mask */
+          d = (value_type *) gimp_temp_buf_get_data (dest) +
+              (i + dest_offset_y) * dest_width;
+          for (j = 0; j < dest_width; j++)
+            *d++ = subsample.round (accum[0][j]);
+
+          rotate_pointers (accum, KERNEL_HEIGHT);
+
+          memset (accum[KERNEL_HEIGHT - 1], 0,
+                  sizeof (accum_type) * dest_width);
+        }
+
+      if (y + height == mask_height)
+        {
+          /* store the rest of the accum buffer into the dest mask */
+          while (i + dest_offset_y < dest_height)
+            {
+              d = (value_type *) gimp_temp_buf_get_data (dest) +
+                  (i + dest_offset_y) * dest_width;
+              for (j = 0; j < dest_width; j++)
+                *d++ = subsample.round (accum[0][j]);
+
+              rotate_pointers (accum, KERNEL_HEIGHT);
+              i++;
+            }
+        }
+
+      for (i = KERNEL_HEIGHT - 1; i >= 0; i--)
+        gegl_scratch_free (accum[i]);
+    });
+}
+
+const GimpTempBuf *
+gimp_brush_core_subsample_mask (GimpBrushCore     *core,
+                                const GimpTempBuf *mask,
+                                gdouble            x,
+                                gdouble            y)
+{
+  GimpTempBuf *dest;
+  const Babl  *mask_format;
+  gdouble      left;
+  gint         index1;
+  gint         index2;
+  gint         dest_offset_x = 0;
+  gint         dest_offset_y = 0;
+  gint         mask_width  = gimp_temp_buf_get_width  (mask);
+  gint         mask_height = gimp_temp_buf_get_height (mask);
+
+  left = x - floor (x);
+  index1 = (gint) (left * (gdouble) (KERNEL_SUBSAMPLE + 1));
+
+  left = y - floor (y);
+  index2 = (gint) (left * (gdouble) (KERNEL_SUBSAMPLE + 1));
+
+  if ((mask_width % 2) == 0)
+    {
+      index1 += KERNEL_SUBSAMPLE >> 1;
+
+      if (index1 > KERNEL_SUBSAMPLE)
+        {
+          index1 -= KERNEL_SUBSAMPLE + 1;
+          dest_offset_x = 1;
+        }
+    }
+
+  if ((mask_height % 2) == 0)
+    {
+      index2 += KERNEL_SUBSAMPLE >> 1;
+
+      if (index2 > KERNEL_SUBSAMPLE)
+        {
+          index2 -= KERNEL_SUBSAMPLE + 1;
+          dest_offset_y = 1;
+        }
+    }
+
+  if (mask == core->last_subsample_brush_mask &&
+      ! core->subsample_cache_invalid)
+    {
+      if (core->subsample_brushes[index2][index1])
+        return core->subsample_brushes[index2][index1];
+    }
+  else
+    {
+      gint i, j;
+
+      for (i = 0; i < KERNEL_SUBSAMPLE + 1; i++)
+        for (j = 0; j < KERNEL_SUBSAMPLE + 1; j++)
+          g_clear_pointer (&core->subsample_brushes[i][j], gimp_temp_buf_unref);
+
+      core->last_subsample_brush_mask = mask;
+      core->subsample_cache_invalid   = FALSE;
+    }
+
+  mask_format = gimp_temp_buf_get_format (mask);
+
+  dest = gimp_temp_buf_new (mask_width  + 2,
+                            mask_height + 2,
+                            mask_format);
+  clear_edges (dest, dest_offset_y, 0, 0, 0);
+
+  core->subsample_brushes[index2][index1] = dest;
+
+  if (mask_format == babl_format ("Y u8"))
+    {
+      gimp_brush_core_subsample_mask_impl<guchar> (mask, dest,
+                                                   dest_offset_x, dest_offset_y,
+                                                   index1, index2);
+    }
+  else if (mask_format == babl_format ("Y float"))
+    {
+      gimp_brush_core_subsample_mask_impl<gfloat> (mask, dest,
+                                                   dest_offset_x, dest_offset_y,
+                                                   index1, index2);
+    }
+  else
+    {
+      g_warn_if_reached ();
+    }
+
+  return dest;
+}
+
+/* The simple pressure profile
+ *
+ * It is: I'(I) = MIN (2 * pressure * I, 1)
+ */
+class SimplePressure
+{
+  gfloat scale;
+
+public:
+  SimplePressure (gdouble pressure)
+  {
+    scale = 2.0 * pressure;
+  }
+
+  guchar
+  operator () (guchar x) const
+  {
+    gint v = RINT (scale * x);
+
+    return MIN (v, 255);
+  }
+
+  gfloat
+  operator () (gfloat x) const
+  {
+    gfloat v = scale * x;
+
+    return MIN (v, 1.0f);
+  }
+
+  template <class T>
+  T
+  operator () (T x) const = delete;
+};
+
+/* The fancy pressure profile
+ *
+ * It is: I'(I) = tanh (20 * (pressure - 0.5) * I)           : pressure > 0.5
+ *        I'(I) = 1 - tanh (20 * (0.5 - pressure) * (1 - I)) : pressure < 0.5
+ *
+ * It looks like:
+ *
+ *    low pressure      medium pressure     high pressure
+ *
+ *         |                   /                  --
+ *         |                  /                  /
+ *        /                  /                  |
+ *      --                  /                   |
+ */
+class FancyPressure
+{
+  gfloat map[257];
+
+public:
+  FancyPressure (gdouble pressure)
+  {
+    gdouble ds, s, c;
+    gint    i;
+
+    ds = (pressure - 0.5) * (20.0 / 256.0);
+    s  = 0;
+    c  = 1.0;
+
+    if (ds > 0)
+      {
+        for (i = 0; i < 256; i++)
+          {
+            map[i] = s / c;
+            s += c * ds;
+            c += s * ds;
+          }
+
+        for (i = 0; i < 256; i++)
+          map[i] = map[i] / map[255];
+      }
+    else
+      {
+        ds = -ds;
+
+        for (i = 255; i >= 0; i--)
+          {
+            map[i] = s / c;
+            s += c * ds;
+            c += s * ds;
+          }
+
+        for (i = 255; i >= 0; i--)
+          map[i] = 1.0f - map[i] / map[0];
+      }
+
+    map[256] = map[255];
+  }
+
+  guchar
+  operator () (guchar x) const
+  {
+    return RINT (255.0f * map[x]);
+  }
+
+  gfloat
+  operator () (gfloat x) const
+  {
+    gint   i;
+    gfloat f;
+
+    x *= 255.0f;
+
+    i = floorf (x);
+    f = x - i;
+
+    return map[i] + (map[i + 1] - map[i]) * f;
+  }
+
+  template <class T>
+  T
+  operator () (T x) const = delete;
+};
+
+template <class T>
+class CachedPressure
+{
+  T map[T (~0) + 1];
+
+public:
+  template <class Pressure>
+  CachedPressure (Pressure pressure)
+  {
+    gint i;
+
+    for (i = 0; i < (gint) G_N_ELEMENTS (map); i++)
+      map[i] = pressure (T (i));
+  }
+
+  T
+  operator () (T x) const
+  {
+    return map[x];
+  }
+
+  template <class U>
+  U
+  operator () (U x) const = delete;
+};
+
+template <class T,
+          class Pressure>
+void
+gimp_brush_core_pressurize_mask_impl (const GimpTempBuf *mask,
+                                      GimpTempBuf       *dest,
+                                      Pressure           pressure)
+{
+  gegl_parallel_distribute_range (
+    gimp_temp_buf_get_width (mask) * gimp_temp_buf_get_height (mask),
+    PIXELS_PER_THREAD,
+    [=] (gint offset, gint size)
+    {
+      const T *m;
+      T       *d;
+      gint     i;
+
+      m = (const T *) gimp_temp_buf_get_data (mask) + offset;
+      d = (      T *) gimp_temp_buf_get_data (dest) + offset;
+
+      for (i = 0; i < size; i++)
+        *d++ = pressure (*m++);
+    });
+}
+
+/* #define FANCY_PRESSURE */
+
+const GimpTempBuf *
+gimp_brush_core_pressurize_mask (GimpBrushCore     *core,
+                                 const GimpTempBuf *brush_mask,
+                                 gdouble            x,
+                                 gdouble            y,
+                                 gdouble            pressure)
+{
+  const GimpTempBuf *subsample_mask;
+  const Babl        *subsample_mask_format;
+
+  /* Get the raw subsampled mask */
+  subsample_mask = gimp_brush_core_subsample_mask (core,
+                                                   brush_mask,
+                                                   x, y);
+
+  /* Special case pressure = 0.5 */
+  if (fabs (pressure - 0.5) <= EPSILON)
+    return subsample_mask;
+
+  g_clear_pointer (&core->pressure_brush, gimp_temp_buf_unref);
+
+  subsample_mask_format = gimp_temp_buf_get_format (subsample_mask);
+
+  core->pressure_brush =
+    gimp_temp_buf_new (gimp_temp_buf_get_width  (brush_mask) + 2,
+                       gimp_temp_buf_get_height (brush_mask) + 2,
+                       subsample_mask_format);
+
+#ifdef FANCY_PRESSURE
+  using Pressure = FancyPressure;
+#else
+  using Pressure = SimplePressure;
+#endif
+
+  if (subsample_mask_format == babl_format ("Y u8"))
+    {
+      gimp_brush_core_pressurize_mask_impl<guchar> (subsample_mask,
+                                                    core->pressure_brush,
+                                                    CachedPressure<guchar> (
+                                                      Pressure (pressure)));
+    }
+  else if (subsample_mask_format == babl_format ("Y float"))
+    {
+      gimp_brush_core_pressurize_mask_impl<gfloat> (subsample_mask,
+                                                    core->pressure_brush,
+                                                    Pressure (pressure));
+    }
+  else
+    {
+      g_warn_if_reached ();
+    }
+
+  return core->pressure_brush;
+}
+
+template <class T>
+static void
+gimp_brush_core_solidify_mask_impl (const GimpTempBuf *mask,
+                                    GimpTempBuf       *dest,
+                                    gint               dest_offset_x,
+                                    gint               dest_offset_y)
+{
+  gint mask_width  = gimp_temp_buf_get_width  (mask);
+  gint mask_height = gimp_temp_buf_get_height (mask);
+  gint dest_width  = gimp_temp_buf_get_width  (dest);
+
+  gegl_parallel_distribute_area (
+    GEGL_RECTANGLE (0, 0, mask_width, mask_height),
+    PIXELS_PER_THREAD,
+    [=] (const GeglRectangle *area)
+    {
+      const T *m;
+      gfloat  *d;
+      gint     i, j;
+
+      m = (const T *) gimp_temp_buf_get_data (mask) +
+          area->y * mask_width + area->x;
+      d = ((gfloat *) gimp_temp_buf_get_data (dest) +
+           ((dest_offset_y + 1 + area->y) * dest_width +
+            (dest_offset_x + 1 + area->x)));
+
+      for (i = 0; i < area->height; i++)
+        {
+          for (j = 0; j < area->width; j++)
+            *d++ = (*m++) ? 1.0 : 0.0;
+
+          m += mask_width - area->width;
+          d += dest_width - area->width;
+        }
+    });
+}
+
+const GimpTempBuf *
+gimp_brush_core_solidify_mask (GimpBrushCore     *core,
+                               const GimpTempBuf *brush_mask,
+                               gdouble            x,
+                               gdouble            y)
+{
+  GimpTempBuf  *dest;
+  const Babl   *brush_mask_format;
+  gint          dest_offset_x     = 0;
+  gint          dest_offset_y     = 0;
+  gint          brush_mask_width  = gimp_temp_buf_get_width  (brush_mask);
+  gint          brush_mask_height = gimp_temp_buf_get_height (brush_mask);
+
+  if ((brush_mask_width % 2) == 0)
+    {
+      if (x < 0.0)
+        x = fmod (x, brush_mask_width) + brush_mask_width;
+
+      if ((x - floor (x)) >= 0.5)
+        dest_offset_x++;
+    }
+
+  if ((brush_mask_height % 2) == 0)
+    {
+      if (y < 0.0)
+        y = fmod (y, brush_mask_height) + brush_mask_height;
+
+      if ((y - floor (y)) >= 0.5)
+        dest_offset_y++;
+    }
+
+  if (! core->solid_cache_invalid &&
+      brush_mask == core->last_solid_brush_mask)
+    {
+      if (core->solid_brushes[dest_offset_y][dest_offset_x])
+        return core->solid_brushes[dest_offset_y][dest_offset_x];
+    }
+  else
+    {
+      gint i, j;
+
+      for (i = 0; i < BRUSH_CORE_SOLID_SUBSAMPLE; i++)
+        for (j = 0; j < BRUSH_CORE_SOLID_SUBSAMPLE; j++)
+          g_clear_pointer (&core->solid_brushes[i][j], gimp_temp_buf_unref);
+
+      core->last_solid_brush_mask = brush_mask;
+      core->solid_cache_invalid   = FALSE;
+    }
+
+  brush_mask_format = gimp_temp_buf_get_format (brush_mask);
+
+  dest = gimp_temp_buf_new (brush_mask_width  + 2,
+                            brush_mask_height + 2,
+                            babl_format ("Y float"));
+  clear_edges (dest,
+               1 + dest_offset_y, 1 - dest_offset_y,
+               1 + dest_offset_x, 1 - dest_offset_x);
+
+  core->solid_brushes[dest_offset_y][dest_offset_x] = dest;
+
+  if (brush_mask_format == babl_format ("Y u8"))
+    {
+      gimp_brush_core_solidify_mask_impl<guchar> (brush_mask, dest,
+                                                  dest_offset_x, dest_offset_y);
+    }
+  else if (brush_mask_format == babl_format ("Y float"))
+    {
+      gimp_brush_core_solidify_mask_impl<gfloat> (brush_mask, dest,
+                                                  dest_offset_x, dest_offset_y);
+    }
+  else
+    {
+      g_warn_if_reached ();
+    }
+
+  return dest;
+}
diff --git a/app/paint/gimpbrushcore-loops.h b/app/paint/gimpbrushcore-loops.h
new file mode 100644
index 0000000..6fde397
--- /dev/null
+++ b/app/paint/gimpbrushcore-loops.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_CORE_LOOPS_H__
+#define __GIMP_BRUSH_CORE_LOOPS_H__
+
+
+const GimpTempBuf * gimp_brush_core_subsample_mask  (GimpBrushCore     *core,
+                                                     const GimpTempBuf *mask,
+                                                     gdouble            x,
+                                                     gdouble            y);
+const GimpTempBuf * gimp_brush_core_pressurize_mask (GimpBrushCore     *core,
+                                                     const GimpTempBuf *brush_mask,
+                                                     gdouble            x,
+                                                     gdouble            y,
+                                                     gdouble            pressure);
+const GimpTempBuf * gimp_brush_core_solidify_mask   (GimpBrushCore     *core,
+                                                     const GimpTempBuf *brush_mask,
+                                                     gdouble            x,
+                                                     gdouble            y);
+
+
+#endif  /*  __GIMP_BRUSH_CORE_LOOPS_H__  */
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
new file mode 100644
index 0000000..da4f26b
--- /dev/null
+++ b/app/paint/gimpbrushcore.c
@@ -0,0 +1,1344 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimpbrush-header.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpdynamicsoutput.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpbrushcore.h"
+#include "gimpbrushcore-loops.h"
+#include "gimpbrushcore-kernels.h"
+
+#include "gimppaintoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON  0.00001
+
+enum
+{
+  SET_BRUSH,
+  SET_DYNAMICS,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void      gimp_brush_core_finalize           (GObject          *object);
+
+static gboolean  gimp_brush_core_start              (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     const GimpCoords *coords,
+                                                     GError          **error);
+static gboolean  gimp_brush_core_pre_paint          (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     GimpPaintState    paint_state,
+                                                     guint32           time);
+static void      gimp_brush_core_post_paint         (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     GimpPaintState    paint_state,
+                                                     guint32           time);
+static void      gimp_brush_core_interpolate        (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     guint32           time);
+
+static GeglBuffer * gimp_brush_core_get_paint_buffer(GimpPaintCore    *paint_core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     GimpLayerMode     paint_mode,
+                                                     const GimpCoords *coords,
+                                                     gint             *paint_buffer_x,
+                                                     gint             *paint_buffer_y,
+                                                     gint             *paint_width,
+                                                     gint             *paint_height);
+
+static void      gimp_brush_core_real_set_brush     (GimpBrushCore    *core,
+                                                     GimpBrush        *brush);
+static void      gimp_brush_core_real_set_dynamics  (GimpBrushCore    *core,
+                                                     GimpDynamics     *dynamics);
+
+static gdouble   gimp_brush_core_get_angle          (GimpBrushCore     *core);
+static gboolean  gimp_brush_core_get_reflect        (GimpBrushCore     *core);
+
+static const GimpTempBuf *
+                 gimp_brush_core_transform_mask     (GimpBrushCore     *core,
+                                                     GimpBrush         *brush);
+
+static void      gimp_brush_core_invalidate_cache   (GimpBrush         *brush,
+                                                     GimpBrushCore     *core);
+
+
+G_DEFINE_TYPE (GimpBrushCore, gimp_brush_core, GIMP_TYPE_PAINT_CORE)
+
+#define parent_class gimp_brush_core_parent_class
+
+static guint core_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_brush_core_class_init (GimpBrushCoreClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+
+  core_signals[SET_BRUSH] =
+    g_signal_new ("set-brush",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpBrushCoreClass, set_brush),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_BRUSH);
+
+  core_signals[SET_DYNAMICS] =
+    g_signal_new ("set-dynamics",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpBrushCoreClass, set_dynamics),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DYNAMICS);
+
+  object_class->finalize                    = gimp_brush_core_finalize;
+
+  paint_core_class->start                   = gimp_brush_core_start;
+  paint_core_class->pre_paint               = gimp_brush_core_pre_paint;
+  paint_core_class->post_paint              = gimp_brush_core_post_paint;
+  paint_core_class->interpolate             = gimp_brush_core_interpolate;
+  paint_core_class->get_paint_buffer        = gimp_brush_core_get_paint_buffer;
+
+  klass->handles_changing_brush             = FALSE;
+  klass->handles_transforming_brush         = TRUE;
+  klass->handles_dynamic_transforming_brush = TRUE;
+
+  klass->set_brush                          = gimp_brush_core_real_set_brush;
+  klass->set_dynamics                       = gimp_brush_core_real_set_dynamics;
+}
+
+static void
+gimp_brush_core_init (GimpBrushCore *core)
+{
+  gint i, j;
+
+  core->main_brush                   = NULL;
+  core->brush                        = NULL;
+  core->dynamics                     = NULL;
+  core->spacing                      = 1.0;
+  core->scale                        = 1.0;
+  core->angle                        = 0.0;
+  core->reflect                      = FALSE;
+  core->hardness                     = 1.0;
+  core->aspect_ratio                 = 0.0;
+
+  core->symmetry_angle               = 0.0;
+  core->symmetry_reflect             = FALSE;
+
+  core->pressure_brush               = NULL;
+
+  core->last_solid_brush_mask        = NULL;
+  core->solid_cache_invalid          = FALSE;
+
+  core->transform_brush              = NULL;
+  core->transform_pixmap             = NULL;
+
+  core->last_subsample_brush_mask    = NULL;
+  core->subsample_cache_invalid      = FALSE;
+
+  core->rand                         = g_rand_new ();
+
+  for (i = 0; i < BRUSH_CORE_SOLID_SUBSAMPLE; i++)
+    {
+      for (j = 0; j < BRUSH_CORE_SOLID_SUBSAMPLE; j++)
+        {
+          core->solid_brushes[i][j] = NULL;
+        }
+    }
+
+  for (i = 0; i < BRUSH_CORE_JITTER_LUTSIZE - 1; ++i)
+    {
+      core->jitter_lut_y[i] = cos (gimp_deg_to_rad (i * 360 /
+                                                    BRUSH_CORE_JITTER_LUTSIZE));
+      core->jitter_lut_x[i] = sin (gimp_deg_to_rad (i * 360 /
+                                                    BRUSH_CORE_JITTER_LUTSIZE));
+    }
+
+  gimp_assert (BRUSH_CORE_SUBSAMPLE == KERNEL_SUBSAMPLE);
+
+  for (i = 0; i < KERNEL_SUBSAMPLE + 1; i++)
+    {
+      for (j = 0; j < KERNEL_SUBSAMPLE + 1; j++)
+        {
+          core->subsample_brushes[i][j] = NULL;
+        }
+    }
+}
+
+static void
+gimp_brush_core_finalize (GObject *object)
+{
+  GimpBrushCore *core = GIMP_BRUSH_CORE (object);
+  gint           i, j;
+
+  g_clear_pointer (&core->pressure_brush, gimp_temp_buf_unref);
+
+  for (i = 0; i < BRUSH_CORE_SOLID_SUBSAMPLE; i++)
+    for (j = 0; j < BRUSH_CORE_SOLID_SUBSAMPLE; j++)
+      g_clear_pointer (&core->solid_brushes[i][j], gimp_temp_buf_unref);
+
+  g_clear_pointer (&core->rand, g_rand_free);
+
+  for (i = 0; i < KERNEL_SUBSAMPLE + 1; i++)
+    for (j = 0; j < KERNEL_SUBSAMPLE + 1; j++)
+      g_clear_pointer (&core->subsample_brushes[i][j], gimp_temp_buf_unref);
+
+  if (core->main_brush)
+    {
+      g_signal_handlers_disconnect_by_func (core->main_brush,
+                                            gimp_brush_core_invalidate_cache,
+                                            core);
+      gimp_brush_end_use (core->main_brush);
+      g_clear_object (&core->main_brush);
+    }
+
+  g_clear_object (&core->dynamics);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_brush_core_pre_paint (GimpPaintCore    *paint_core,
+                           GimpDrawable     *drawable,
+                           GimpPaintOptions *paint_options,
+                           GimpPaintState    paint_state,
+                           guint32           time)
+{
+  GimpBrushCore *core = GIMP_BRUSH_CORE (paint_core);
+
+  if (paint_state == GIMP_PAINT_STATE_MOTION)
+    {
+      GimpCoords last_coords;
+      GimpCoords current_coords;
+      gdouble scale;
+
+      gimp_paint_core_get_last_coords (paint_core, &last_coords);
+      gimp_paint_core_get_current_coords (paint_core, &current_coords);
+
+      /* If we current point == last point, check if the brush
+       * wants to be painted in that case. (Direction dependent
+       * pixmap brush pipes don't, as they don't know which
+       * pixmap to select.)
+       */
+      if (last_coords.x == current_coords.x &&
+          last_coords.y == current_coords.y &&
+          ! gimp_brush_want_null_motion (core->main_brush,
+                                         &last_coords,
+                                         &current_coords))
+        {
+          return FALSE;
+        }
+      /*No drawing anything if the scale is too small*/
+      if (GIMP_BRUSH_CORE_GET_CLASS (core)->handles_transforming_brush)
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          gdouble    fade_point;
+
+          if (GIMP_BRUSH_CORE_GET_CLASS (core)->handles_dynamic_transforming_brush)
+            {
+              gdouble width;
+              gdouble height;
+
+              fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                                        paint_core->pixel_dist);
+              width = gimp_brush_get_width  (core->main_brush);
+              height = gimp_brush_get_height (core->main_brush);
+
+              scale = paint_options->brush_size /
+                      MAX (width, height) *
+                      gimp_dynamics_get_linear_value (core->dynamics,
+                                                      GIMP_DYNAMICS_OUTPUT_SIZE,
+                                                      &current_coords,
+                                                      paint_options,
+                                                      fade_point);
+
+              if (paint_options->brush_lock_to_view &&
+                  MAX (current_coords.xscale, current_coords.yscale) > 0)
+                {
+                  scale /= MAX (current_coords.xscale, current_coords.yscale);
+
+                  /* Cap transform result for brushes or OOM can occur */
+                  if ((scale * MAX (width, height)) > GIMP_BRUSH_MAX_SIZE)
+                    {
+                      scale = GIMP_BRUSH_MAX_SIZE / MAX (width, height);
+                    }
+                }
+
+              if (scale < 0.0000001)
+                return FALSE;
+            }
+        }
+
+      if (GIMP_BRUSH_CORE_GET_CLASS (paint_core)->handles_changing_brush)
+        {
+          core->brush = gimp_brush_select_brush (core->main_brush,
+                                                 &last_coords,
+                                                 &current_coords);
+        }
+      if ((! GIMP_IS_BRUSH_GENERATED(core->main_brush)) &&
+          (paint_options->brush_hardness != gimp_brush_get_blur_hardness(core->main_brush)))
+        {
+          gimp_brush_flush_blur_caches(core->main_brush);
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_brush_core_post_paint (GimpPaintCore    *paint_core,
+                            GimpDrawable     *drawable,
+                            GimpPaintOptions *paint_options,
+                            GimpPaintState    paint_state,
+                            guint32           time)
+{
+  GimpBrushCore *core = GIMP_BRUSH_CORE (paint_core);
+
+  if (paint_state == GIMP_PAINT_STATE_MOTION)
+    {
+      core->brush = core->main_brush;
+    }
+}
+
+static gboolean
+gimp_brush_core_start (GimpPaintCore     *paint_core,
+                       GimpDrawable      *drawable,
+                       GimpPaintOptions  *paint_options,
+                       const GimpCoords  *coords,
+                       GError           **error)
+{
+  GimpBrushCore *core    = GIMP_BRUSH_CORE (paint_core);
+  GimpContext   *context = GIMP_CONTEXT (paint_options);
+
+  gimp_brush_core_set_brush (core, gimp_context_get_brush (context));
+
+  gimp_brush_core_set_dynamics (core, gimp_context_get_dynamics (context));
+
+  if (! core->main_brush)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("No brushes available for use with this tool."));
+      return FALSE;
+    }
+
+  if (! core->dynamics)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("No paint dynamics available for use with this tool."));
+      return FALSE;
+    }
+
+  if (GIMP_BRUSH_CORE_GET_CLASS (core)->handles_transforming_brush)
+    {
+      gimp_brush_core_eval_transform_dynamics (core,
+                                               drawable,
+                                               paint_options,
+                                               coords);
+
+      gimp_brush_core_eval_transform_symmetry (core, NULL, 0);
+    }
+
+  core->spacing = paint_options->brush_spacing;
+
+  core->brush = core->main_brush;
+
+  core->jitter =
+    gimp_paint_options_get_jitter (paint_options,
+                                   gimp_item_get_image (GIMP_ITEM (drawable)));
+
+  return TRUE;
+}
+
+/**
+ * gimp_avoid_exact_integer
+ * @x: points to a gdouble
+ *
+ * Adjusts *x such that it is not too close to an integer. This is used
+ * for decision algorithms that would be vulnerable to rounding glitches
+ * if exact integers were input.
+ *
+ * Side effects: Changes the value of *x
+ **/
+static void
+gimp_avoid_exact_integer (gdouble *x)
+{
+  const gdouble integral   = floor (*x);
+  const gdouble fractional = *x - integral;
+
+  if (fractional < EPSILON)
+    {
+      *x = integral + EPSILON;
+    }
+  else if (fractional > (1 -EPSILON))
+    {
+      *x = integral + (1 - EPSILON);
+    }
+}
+
+static void
+gimp_brush_core_interpolate (GimpPaintCore    *paint_core,
+                             GimpDrawable     *drawable,
+                             GimpPaintOptions *paint_options,
+                             guint32           time)
+{
+  GimpBrushCore      *core  = GIMP_BRUSH_CORE (paint_core);
+  GimpImage          *image = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpDynamicsOutput *spacing_output;
+  GimpCoords          last_coords;
+  GimpCoords          current_coords;
+  GimpVector2         delta_vec;
+  gdouble             delta_pressure;
+  gdouble             delta_xtilt, delta_ytilt;
+  gdouble             delta_wheel;
+  gdouble             delta_velocity;
+  gdouble             temp_direction;
+  GimpVector2         temp_vec;
+  gint                n, num_points;
+  gdouble             t0, dt, tn;
+  gdouble             st_factor, st_offset;
+  gdouble             initial;
+  gdouble             dist;
+  gdouble             total;
+  gdouble             pixel_dist;
+  gdouble             pixel_initial;
+  gdouble             xd, yd;
+  gdouble             mag;
+  gdouble             dyn_spacing = core->spacing;
+  gdouble             fade_point;
+  gboolean            use_dyn_spacing;
+
+  g_return_if_fail (GIMP_IS_BRUSH (core->brush));
+
+  gimp_paint_core_get_last_coords (paint_core, &last_coords);
+  gimp_paint_core_get_current_coords (paint_core, &current_coords);
+
+  gimp_avoid_exact_integer (&last_coords.x);
+  gimp_avoid_exact_integer (&last_coords.y);
+  gimp_avoid_exact_integer (&current_coords.x);
+  gimp_avoid_exact_integer (&current_coords.y);
+
+  delta_vec.x    = current_coords.x        - last_coords.x;
+  delta_vec.y    = current_coords.y        - last_coords.y;
+  delta_pressure = current_coords.pressure - last_coords.pressure;
+  delta_xtilt    = current_coords.xtilt    - last_coords.xtilt;
+  delta_ytilt    = current_coords.ytilt    - last_coords.ytilt;
+  delta_wheel    = current_coords.wheel    - last_coords.wheel;
+  delta_velocity = current_coords.velocity - last_coords.velocity;
+  temp_direction = current_coords.direction;
+
+  /*  return if there has been no motion  */
+  if (! delta_vec.x    &&
+      ! delta_vec.y    &&
+      ! delta_pressure &&
+      ! delta_xtilt    &&
+      ! delta_ytilt    &&
+      ! delta_wheel    &&
+      ! delta_velocity)
+    return;
+
+  pixel_dist    = gimp_vector2_length (&delta_vec);
+  pixel_initial = paint_core->pixel_dist;
+
+  /*  Zero sized brushes are unfit for interpolate, so we just let
+   *  paint core fail on its own
+   */
+  if (core->scale == 0.0)
+    {
+      gimp_paint_core_set_last_coords (paint_core, &current_coords);
+
+      gimp_paint_core_paint (paint_core, drawable, paint_options,
+                             GIMP_PAINT_STATE_MOTION, time);
+
+      paint_core->pixel_dist = pixel_initial + pixel_dist; /* Don't forget to update pixel distance*/
+
+      return;
+    }
+
+  /* Handle dynamic spacing */
+  spacing_output = gimp_dynamics_get_output (core->dynamics,
+                                             GIMP_DYNAMICS_OUTPUT_SPACING);
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  use_dyn_spacing = gimp_dynamics_output_is_enabled (spacing_output);
+
+  if (use_dyn_spacing)
+    {
+      dyn_spacing = gimp_dynamics_output_get_linear_value (spacing_output,
+                                                           &current_coords,
+                                                           paint_options,
+                                                           fade_point);
+
+      /* Dynamic spacing assumes that the value set in core is the min
+       * value and the max is full 200% spacing. This approach differs
+       * from the usual factor from user input approach because making
+       * spacing smaller than the nominal value is unlikely and
+       * spacing has a hard defined max.
+       */
+      dyn_spacing = (core->spacing +
+                     ((2.0 - core->spacing) * (1.0 - dyn_spacing)));
+
+      /*  Limiting spacing to minimum 1%  */
+      dyn_spacing = MAX (core->spacing, dyn_spacing);
+    }
+
+  /* calculate the distance traveled in the coordinate space of the brush */
+  temp_vec = gimp_brush_get_x_axis (core->brush);
+  gimp_vector2_mul (&temp_vec, core->scale);
+  gimp_vector2_rotate (&temp_vec, core->angle * G_PI * 2);
+
+  mag = gimp_vector2_length (&temp_vec);
+  xd  = gimp_vector2_inner_product (&delta_vec, &temp_vec) / (mag * mag);
+
+  temp_vec = gimp_brush_get_y_axis (core->brush);
+  gimp_vector2_mul (&temp_vec, core->scale);
+  gimp_vector2_rotate (&temp_vec, core->angle * G_PI * 2);
+
+  mag = gimp_vector2_length (&temp_vec);
+  yd  = gimp_vector2_inner_product (&delta_vec, &temp_vec) / (mag * mag);
+
+  dist    = 0.5 * sqrt (xd * xd + yd * yd);
+  total   = dist + paint_core->distance;
+  initial = paint_core->distance;
+
+
+  if (delta_vec.x * delta_vec.x > delta_vec.y * delta_vec.y)
+    {
+      st_factor = delta_vec.x;
+      st_offset = last_coords.x - 0.5;
+    }
+  else
+    {
+      st_factor = delta_vec.y;
+      st_offset = last_coords.y - 0.5;
+    }
+
+  if (use_dyn_spacing)
+    {
+      gint s0;
+
+      num_points = dist / dyn_spacing;
+
+      s0 = (gint) floor (st_offset + 0.5);
+      t0 = (s0 - st_offset) / st_factor;
+      dt = dyn_spacing / dist;
+
+      if (num_points == 0)
+        return;
+    }
+  else if (fabs (st_factor) > dist / core->spacing)
+    {
+      /*  The stripe principle leads to brush positions that are spaced
+       *  *closer* than the official brush spacing. Use the official
+       *  spacing instead. This is the common case when the brush spacing
+       *  is large.
+       *  The net effect is then to put a lower bound on the spacing, but
+       *  one that varies with the slope of the line. This is suppose to
+       *  make thin lines (say, with a 1x1 brush) prettier while leaving
+       *  lines with larger brush spacing as they used to look in 1.2.x.
+       */
+
+      dt = core->spacing / dist;
+      n = (gint) (initial / core->spacing + 1.0 + EPSILON);
+      t0 = (n * core->spacing - initial) / dist;
+      num_points = 1 + (gint) floor ((1 + EPSILON - t0) / dt);
+
+      /* if we arnt going to paint anything this time and the brush
+       * has only moved on one axis return without updating the brush
+       * position, distance etc. so that we can more accurately space
+       * brush strokes when curves are supplied to us in single pixel
+       * chunks.
+       */
+
+      if (num_points == 0 && (delta_vec.x == 0 || delta_vec.y == 0))
+        return;
+    }
+  else if (fabs (st_factor) < EPSILON)
+    {
+      /* Hm, we've hardly moved at all. Don't draw anything, but reset the
+       * old coordinates and hope we've gone longer the next time...
+       */
+      current_coords.x = last_coords.x;
+      current_coords.y = last_coords.y;
+
+      gimp_paint_core_set_current_coords (paint_core, &current_coords);
+
+      /* ... but go along with the current pressure, tilt and wheel */
+      return;
+    }
+  else
+    {
+      gint direction = st_factor > 0 ? 1 : -1;
+      gint x, y;
+      gint s0, sn;
+
+      /*  Choose the first and last stripe to paint.
+       *    FIRST PRIORITY is to avoid gaps painting with a 1x1 aliasing
+       *  brush when a horizontalish line segment follows a verticalish
+       *  one or vice versa - no matter what the angle between the two
+       *  lines is. This will also limit the local thinning that a 1x1
+       *  subsampled brush may suffer in the same situation.
+       *    SECOND PRIORITY is to avoid making free-hand drawings
+       *  unpleasantly fat by plotting redundant points.
+       *    These are achieved by the following rules, but it is a little
+       *  tricky to see just why. Do not change this algorithm unless you
+       *  are sure you know what you're doing!
+       */
+
+      /*  Basic case: round the beginning and ending point to nearest
+       *  stripe center.
+       */
+      s0 = (gint) floor (st_offset + 0.5);
+      sn = (gint) floor (st_offset + st_factor + 0.5);
+
+      t0 = (s0 - st_offset) / st_factor;
+      tn = (sn - st_offset) / st_factor;
+
+      x = (gint) floor (last_coords.x + t0 * delta_vec.x);
+      y = (gint) floor (last_coords.y + t0 * delta_vec.y);
+
+      if (t0 < 0.0 && !( x == (gint) floor (last_coords.x) &&
+                         y == (gint) floor (last_coords.y) ))
+        {
+          /*  Exception A: If the first stripe's brush position is
+           *  EXTRApolated into a different pixel square than the
+           *  ideal starting point, don't plot it.
+           */
+          s0 += direction;
+        }
+      else if (x == (gint) floor (paint_core->last_paint.x) &&
+               y == (gint) floor (paint_core->last_paint.y))
+        {
+          /*  Exception B: If first stripe's brush position is within the
+           *  same pixel square as the last plot of the previous line,
+           *  don't plot it either.
+           */
+          s0 += direction;
+        }
+
+      x = (gint) floor (last_coords.x + tn * delta_vec.x);
+      y = (gint) floor (last_coords.y + tn * delta_vec.y);
+
+      if (tn > 1.0 && !( x == (gint) floor (current_coords.x) &&
+                         y == (gint) floor (current_coords.y)))
+        {
+          /*  Exception C: If the last stripe's brush position is
+           *  EXTRApolated into a different pixel square than the
+           *  ideal ending point, don't plot it.
+           */
+          sn -= direction;
+        }
+
+      t0 = (s0 - st_offset) / st_factor;
+      tn = (sn - st_offset) / st_factor;
+      dt         =     direction * 1.0 / st_factor;
+      num_points = 1 + direction * (sn - s0);
+
+      if (num_points >= 1)
+        {
+          /*  Hack the reported total distance such that it looks to the
+           *  next line as if the the last pixel plotted were at an integer
+           *  multiple of the brush spacing. This helps prevent artifacts
+           *  for connected lines when the brush spacing is such that some
+           *  slopes will use the stripe regime and other slopes will use
+           *  the nominal brush spacing.
+           */
+
+          if (tn < 1)
+            total = initial + tn * dist;
+
+          total = core->spacing * (gint) (total / core->spacing + 0.5);
+          total += (1.0 - tn) * dist;
+        }
+    }
+
+  for (n = 0; n < num_points; n++)
+    {
+      gdouble t = t0 + n * dt;
+      gdouble p = (gdouble) n / num_points;
+
+      current_coords.x         = last_coords.x        + t * delta_vec.x;
+      current_coords.y         = last_coords.y        + t * delta_vec.y;
+      current_coords.pressure  = last_coords.pressure + p * delta_pressure;
+      current_coords.xtilt     = last_coords.xtilt    + p * delta_xtilt;
+      current_coords.ytilt     = last_coords.ytilt    + p * delta_ytilt;
+      current_coords.wheel     = last_coords.wheel    + p * delta_wheel;
+      current_coords.velocity  = last_coords.velocity + p * delta_velocity;
+      current_coords.direction = temp_direction;
+      current_coords.xscale    = last_coords.xscale;
+      current_coords.yscale    = last_coords.yscale;
+      current_coords.angle     = last_coords.angle;
+      current_coords.reflect   = last_coords.reflect;
+
+      if (core->jitter > 0.0)
+        {
+          GimpVector2 x_axis;
+          GimpVector2 y_axis;
+          gdouble     dyn_jitter;
+          gdouble     jitter_dist;
+          gint32      jitter_angle;
+
+          x_axis = gimp_brush_get_x_axis (core->brush);
+          y_axis = gimp_brush_get_y_axis (core->brush);
+
+          dyn_jitter = (core->jitter *
+                        gimp_dynamics_get_linear_value (core->dynamics,
+                                                        GIMP_DYNAMICS_OUTPUT_JITTER,
+                                                        &current_coords,
+                                                        paint_options,
+                                                        fade_point));
+
+          jitter_dist  = g_rand_double_range (core->rand, 0, dyn_jitter);
+          jitter_angle = g_rand_int_range (core->rand,
+                                           0, BRUSH_CORE_JITTER_LUTSIZE);
+
+          current_coords.x +=
+            (x_axis.x + y_axis.x) *
+            jitter_dist * core->jitter_lut_x[jitter_angle] * core->scale;
+
+          current_coords.y +=
+            (y_axis.y + x_axis.y) *
+            jitter_dist * core->jitter_lut_y[jitter_angle] * core->scale;
+        }
+
+      gimp_paint_core_set_current_coords (paint_core, &current_coords);
+
+      paint_core->distance   = initial       + t * dist;
+      paint_core->pixel_dist = pixel_initial + t * pixel_dist;
+
+      gimp_paint_core_paint (paint_core, drawable, paint_options,
+                             GIMP_PAINT_STATE_MOTION, time);
+    }
+
+  current_coords.x        = last_coords.x        + delta_vec.x;
+  current_coords.y        = last_coords.y        + delta_vec.y;
+  current_coords.pressure = last_coords.pressure + delta_pressure;
+  current_coords.xtilt    = last_coords.xtilt    + delta_xtilt;
+  current_coords.ytilt    = last_coords.ytilt    + delta_ytilt;
+  current_coords.wheel    = last_coords.wheel    + delta_wheel;
+  current_coords.velocity = last_coords.velocity + delta_velocity;
+  current_coords.xscale   = last_coords.xscale;
+  current_coords.yscale   = last_coords.yscale;
+  current_coords.angle    = last_coords.angle;
+  current_coords.reflect  = last_coords.reflect;
+
+  gimp_paint_core_set_current_coords (paint_core, &current_coords);
+  gimp_paint_core_set_last_coords (paint_core, &current_coords);
+
+  paint_core->distance   = total;
+  paint_core->pixel_dist = pixel_initial + pixel_dist;
+}
+
+static GeglBuffer *
+gimp_brush_core_get_paint_buffer (GimpPaintCore    *paint_core,
+                                  GimpDrawable     *drawable,
+                                  GimpPaintOptions *paint_options,
+                                  GimpLayerMode     paint_mode,
+                                  const GimpCoords *coords,
+                                  gint             *paint_buffer_x,
+                                  gint             *paint_buffer_y,
+                                  gint             *paint_width,
+                                  gint             *paint_height)
+{
+  GimpBrushCore *core = GIMP_BRUSH_CORE (paint_core);
+  gint           x, y;
+  gint           x1, y1, x2, y2;
+  gint           drawable_width, drawable_height;
+  gint           brush_width, brush_height;
+
+  gimp_brush_transform_size (core->brush,
+                             core->scale, core->aspect_ratio,
+                             gimp_brush_core_get_angle (core),
+                             gimp_brush_core_get_reflect (core),
+                             &brush_width, &brush_height);
+
+  if (paint_width)
+    *paint_width  = brush_width;
+  if (paint_height)
+    *paint_height = brush_height;
+
+  /*  adjust the x and y coordinates to the upper left corner of the brush  */
+  x = (gint) floor (coords->x) - (brush_width  / 2);
+  y = (gint) floor (coords->y) - (brush_height / 2);
+
+  drawable_width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+  drawable_height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  x1 = CLAMP (x - 1, 0, drawable_width);
+  y1 = CLAMP (y - 1, 0, drawable_height);
+  x2 = CLAMP (x + brush_width  + 1, 0, drawable_width);
+  y2 = CLAMP (y + brush_height + 1, 0, drawable_height);
+
+  /*  configure the canvas buffer  */
+  if ((x2 - x1) && (y2 - y1))
+    {
+      GimpTempBuf            *temp_buf;
+      const Babl             *format;
+      GimpLayerCompositeMode  composite_mode;
+
+      composite_mode = gimp_layer_mode_get_paint_composite_mode (paint_mode);
+
+      format = gimp_layer_mode_get_format (paint_mode,
+                                           GIMP_LAYER_COLOR_SPACE_AUTO,
+                                           GIMP_LAYER_COLOR_SPACE_AUTO,
+                                           composite_mode,
+                                           gimp_drawable_get_format (drawable));
+
+      if (paint_core->paint_buffer                                       &&
+          gegl_buffer_get_width  (paint_core->paint_buffer) == (x2 - x1) &&
+          gegl_buffer_get_height (paint_core->paint_buffer) == (y2 - y1) &&
+          gegl_buffer_get_format (paint_core->paint_buffer) == format)
+        {
+          *paint_buffer_x = x1;
+          *paint_buffer_y = y1;
+
+          return paint_core->paint_buffer;
+        }
+
+      g_clear_object (&paint_core->paint_buffer);
+
+      temp_buf = gimp_temp_buf_new ((x2 - x1), (y2 - y1),
+                                    format);
+
+      *paint_buffer_x = x1;
+      *paint_buffer_y = y1;
+
+      paint_core->paint_buffer = gimp_temp_buf_create_buffer (temp_buf);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      return paint_core->paint_buffer;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_brush_core_real_set_brush (GimpBrushCore *core,
+                                GimpBrush     *brush)
+{
+  if (brush == core->main_brush)
+    return;
+
+  if (core->main_brush)
+    {
+      g_signal_handlers_disconnect_by_func (core->main_brush,
+                                            gimp_brush_core_invalidate_cache,
+                                            core);
+      gimp_brush_end_use (core->main_brush);
+    }
+
+  g_set_object (&core->main_brush, brush);
+
+  if (core->main_brush)
+    {
+      gimp_brush_begin_use (core->main_brush);
+      g_signal_connect (core->main_brush, "invalidate-preview",
+                        G_CALLBACK (gimp_brush_core_invalidate_cache),
+                        core);
+    }
+}
+
+static void
+gimp_brush_core_real_set_dynamics (GimpBrushCore *core,
+                                   GimpDynamics  *dynamics)
+{
+  g_set_object (&core->dynamics, dynamics);
+}
+
+void
+gimp_brush_core_set_brush (GimpBrushCore *core,
+                           GimpBrush     *brush)
+{
+  g_return_if_fail (GIMP_IS_BRUSH_CORE (core));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  if (brush != core->main_brush)
+    g_signal_emit (core, core_signals[SET_BRUSH], 0, brush);
+}
+
+void
+gimp_brush_core_set_dynamics (GimpBrushCore *core,
+                              GimpDynamics  *dynamics)
+{
+  g_return_if_fail (GIMP_IS_BRUSH_CORE (core));
+  g_return_if_fail (dynamics == NULL || GIMP_IS_DYNAMICS (dynamics));
+
+  if (dynamics != core->dynamics)
+    g_signal_emit (core, core_signals[SET_DYNAMICS], 0, dynamics);
+}
+
+void
+gimp_brush_core_paste_canvas (GimpBrushCore            *core,
+                              GimpDrawable             *drawable,
+                              const GimpCoords         *coords,
+                              gdouble                   brush_opacity,
+                              gdouble                   image_opacity,
+                              GimpLayerMode             paint_mode,
+                              GimpBrushApplicationMode  brush_hardness,
+                              gdouble                   dynamic_force,
+                              GimpPaintApplicationMode  mode)
+{
+  const GimpTempBuf *brush_mask;
+
+  brush_mask = gimp_brush_core_get_brush_mask (core, coords,
+                                               brush_hardness,
+                                               dynamic_force);
+
+  if (brush_mask)
+    {
+      GimpPaintCore *paint_core = GIMP_PAINT_CORE (core);
+      gint           x;
+      gint           y;
+      gint           off_x;
+      gint           off_y;
+
+      x = (gint) floor (coords->x) - (gimp_temp_buf_get_width  (brush_mask) >> 1);
+      y = (gint) floor (coords->y) - (gimp_temp_buf_get_height (brush_mask) >> 1);
+
+      off_x = (x < 0) ? -x : 0;
+      off_y = (y < 0) ? -y : 0;
+
+      gimp_paint_core_paste (paint_core, brush_mask,
+                             off_x, off_y,
+                             drawable,
+                             brush_opacity,
+                             image_opacity,
+                             paint_mode,
+                             mode);
+    }
+}
+
+/* Similar to gimp_brush_core_paste_canvas, but replaces the alpha channel
+ * rather than using it to composite (i.e. transparent over opaque
+ * becomes transparent rather than opauqe.
+ */
+void
+gimp_brush_core_replace_canvas (GimpBrushCore            *core,
+                                GimpDrawable             *drawable,
+                                const GimpCoords         *coords,
+                                gdouble                   brush_opacity,
+                                gdouble                   image_opacity,
+                                GimpBrushApplicationMode  brush_hardness,
+                                gdouble                   dynamic_force,
+                                GimpPaintApplicationMode  mode)
+{
+  const GimpTempBuf *brush_mask;
+
+  brush_mask = gimp_brush_core_get_brush_mask (core, coords,
+                                               brush_hardness,
+                                               dynamic_force);
+
+  if (brush_mask)
+    {
+      GimpPaintCore *paint_core = GIMP_PAINT_CORE (core);
+      gint           x;
+      gint           y;
+      gint           off_x;
+      gint           off_y;
+
+      x = (gint) floor (coords->x) - (gimp_temp_buf_get_width  (brush_mask) >> 1);
+      y = (gint) floor (coords->y) - (gimp_temp_buf_get_height (brush_mask) >> 1);
+
+      off_x = (x < 0) ? -x : 0;
+      off_y = (y < 0) ? -y : 0;
+
+      gimp_paint_core_replace (paint_core, brush_mask,
+                               off_x, off_y,
+                               drawable,
+                               brush_opacity,
+                               image_opacity,
+                               mode);
+    }
+}
+
+
+static void
+gimp_brush_core_invalidate_cache (GimpBrush     *brush,
+                                  GimpBrushCore *core)
+{
+  /* Make sure we don't cache data for a brush that has changed */
+
+  core->subsample_cache_invalid = TRUE;
+  core->solid_cache_invalid     = TRUE;
+
+  /* Notify of the brush change */
+
+  g_signal_emit (core, core_signals[SET_BRUSH], 0, brush);
+}
+
+
+/************************************************************
+ *             LOCAL FUNCTION DEFINITIONS                   *
+ ************************************************************/
+
+static gdouble
+gimp_brush_core_get_angle (GimpBrushCore *core)
+{
+  gdouble angle = core->angle;
+
+  if (core->reflect)
+    angle -= core->symmetry_angle;
+  else
+    angle += core->symmetry_angle;
+
+  angle = fmod (angle, 1.0);
+
+  if (angle < 0.0)
+    angle += 1.0;
+
+  return angle;
+}
+
+static gboolean
+gimp_brush_core_get_reflect (GimpBrushCore *core)
+{
+  return core->reflect ^ core->symmetry_reflect;
+}
+
+static const GimpTempBuf *
+gimp_brush_core_transform_mask (GimpBrushCore *core,
+                                GimpBrush     *brush)
+{
+  const GimpTempBuf *mask;
+
+  if (core->scale <= 0.0)
+    return NULL;
+
+  mask = gimp_brush_transform_mask (brush,
+                                    core->scale,
+                                    core->aspect_ratio,
+                                    gimp_brush_core_get_angle (core),
+                                    gimp_brush_core_get_reflect (core),
+                                    core->hardness);
+
+  if (mask == core->transform_brush)
+    return mask;
+
+  core->transform_brush         = mask;
+  core->subsample_cache_invalid = TRUE;
+  core->solid_cache_invalid     = TRUE;
+
+  return core->transform_brush;
+}
+
+const GimpTempBuf *
+gimp_brush_core_get_brush_mask (GimpBrushCore            *core,
+                                const GimpCoords         *coords,
+                                GimpBrushApplicationMode  brush_hardness,
+                                gdouble                   dynamic_force)
+{
+  const GimpTempBuf *mask;
+
+  if (dynamic_force <= 0.0)
+    return NULL;
+
+  mask = gimp_brush_core_transform_mask (core, core->brush);
+
+  if (! mask)
+    return NULL;
+
+  switch (brush_hardness)
+    {
+    case GIMP_BRUSH_SOFT:
+      return gimp_brush_core_subsample_mask (core, mask,
+                                             coords->x,
+                                             coords->y);
+      break;
+
+    case GIMP_BRUSH_HARD:
+      return gimp_brush_core_solidify_mask (core, mask,
+                                            coords->x,
+                                            coords->y);
+      break;
+
+    case GIMP_BRUSH_PRESSURE:
+      return gimp_brush_core_pressurize_mask (core, mask,
+                                              coords->x,
+                                              coords->y,
+                                              dynamic_force);
+      break;
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+const GimpTempBuf *
+gimp_brush_core_get_brush_pixmap (GimpBrushCore *core)
+{
+  const GimpTempBuf *pixmap;
+
+  if (core->scale <= 0.0)
+    return NULL;
+
+  pixmap = gimp_brush_transform_pixmap (core->brush,
+                                        core->scale,
+                                        core->aspect_ratio,
+                                        gimp_brush_core_get_angle (core),
+                                        gimp_brush_core_get_reflect (core),
+                                        core->hardness);
+
+  if (pixmap == core->transform_pixmap)
+    return pixmap;
+
+  core->transform_pixmap        = pixmap;
+  core->subsample_cache_invalid = TRUE;
+
+  return core->transform_pixmap;
+}
+
+void
+gimp_brush_core_eval_transform_dynamics (GimpBrushCore     *core,
+                                         GimpDrawable      *drawable,
+                                         GimpPaintOptions  *paint_options,
+                                         const GimpCoords  *coords)
+{
+  if (core->main_brush)
+    {
+      gdouble max_side;
+
+      max_side = MAX (gimp_brush_get_width  (core->main_brush),
+                      gimp_brush_get_height (core->main_brush));
+
+      core->scale = paint_options->brush_size / max_side;
+
+      if (paint_options->brush_lock_to_view &&
+          MAX (coords->xscale, coords->yscale) > 0)
+        {
+          core->scale /= MAX (coords->xscale, coords->yscale);
+
+          /* Cap transform result for brushes or OOM can occur */
+          if ((core->scale * max_side) > GIMP_BRUSH_MAX_SIZE)
+            {
+              core->scale = GIMP_BRUSH_MAX_SIZE / max_side;
+            }
+        }
+   }
+  else
+    core->scale = -1;
+
+  core->aspect_ratio = paint_options->brush_aspect_ratio;
+  core->angle        = paint_options->brush_angle;
+  core->reflect      = FALSE;
+  core->hardness     = paint_options->brush_hardness;
+
+  if (paint_options->brush_lock_to_view)
+    {
+      core->angle   += coords->angle;
+      core->reflect  = coords->reflect;
+    }
+
+  if (! GIMP_IS_DYNAMICS (core->dynamics))
+    return;
+
+  if (GIMP_BRUSH_CORE_GET_CLASS (core)->handles_dynamic_transforming_brush)
+    {
+      gdouble fade_point = 1.0;
+
+      if (drawable)
+        {
+          GimpImage     *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpPaintCore *paint_core = GIMP_PAINT_CORE (core);
+
+          fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                                    paint_core->pixel_dist);
+        }
+
+      core->scale *= gimp_dynamics_get_linear_value (core->dynamics,
+                                                     GIMP_DYNAMICS_OUTPUT_SIZE,
+                                                     coords,
+                                                     paint_options,
+                                                     fade_point);
+
+      core->angle += gimp_dynamics_get_angular_value (core->dynamics,
+                                                      GIMP_DYNAMICS_OUTPUT_ANGLE,
+                                                      coords,
+                                                      paint_options,
+                                                      fade_point);
+
+      core->hardness *= gimp_dynamics_get_linear_value (core->dynamics,
+                                                        GIMP_DYNAMICS_OUTPUT_HARDNESS,
+                                                        coords,
+                                                        paint_options,
+                                                        fade_point);
+
+      if (gimp_dynamics_is_output_enabled (core->dynamics,
+                                           GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO))
+        {
+          gdouble dyn_aspect;
+
+          dyn_aspect = gimp_dynamics_get_aspect_value (core->dynamics,
+                                                       GIMP_DYNAMICS_OUTPUT_ASPECT_RATIO,
+                                                       coords,
+                                                       paint_options,
+                                                       fade_point);
+
+          /* Zero aspect ratio is special cased to half of all ar range,
+           * to force dynamics to have any effect. Forcing to full results
+           * in disappearing stamp if applied to maximum.
+           */
+          if (core->aspect_ratio == 0.0)
+            core->aspect_ratio = 10.0 * dyn_aspect;
+          else
+            core->aspect_ratio *= dyn_aspect;
+        }
+    }
+}
+
+void
+gimp_brush_core_eval_transform_symmetry (GimpBrushCore *core,
+                                         GimpSymmetry  *symmetry,
+                                         gint           stroke)
+{
+  g_return_if_fail (GIMP_IS_BRUSH_CORE (core));
+  g_return_if_fail (symmetry == NULL || GIMP_IS_SYMMETRY (symmetry));
+
+  core->symmetry_angle   = 0.0;
+  core->symmetry_reflect = FALSE;
+
+  if (symmetry)
+    {
+      gimp_symmetry_get_transform (symmetry,
+                                   stroke,
+                                   &core->symmetry_angle,
+                                   &core->symmetry_reflect);
+
+      core->symmetry_angle /= 360.0;
+    }
+}
+
+void
+gimp_brush_core_color_area_with_pixmap (GimpBrushCore    *core,
+                                        GimpDrawable     *drawable,
+                                        const GimpCoords *coords,
+                                        GeglBuffer       *area,
+                                        gint              area_x,
+                                        gint              area_y,
+                                        gboolean          apply_mask)
+{
+  const GimpTempBuf *pixmap;
+  GeglBuffer        *pixmap_buffer;
+  const GimpTempBuf *mask;
+  GeglBuffer        *mask_buffer;
+  gint               area_width;
+  gint               area_height;
+  gint               ul_x;
+  gint               ul_y;
+  gint               offset_x;
+  gint               offset_y;
+
+  g_return_if_fail (GIMP_IS_BRUSH (core->brush));
+  g_return_if_fail (gimp_brush_get_pixmap (core->brush) != NULL);
+
+  /*  scale the brush  */
+  pixmap = gimp_brush_core_get_brush_pixmap (core);
+
+  if (! pixmap)
+    return;
+
+  if (apply_mask)
+    mask = gimp_brush_core_transform_mask (core, core->brush);
+  else
+    mask = NULL;
+
+  /*  Calculate upper left corner of brush as in
+   *  gimp_paint_core_get_paint_area.  Ugly to have to do this here, too.
+   */
+  ul_x = (gint) floor (coords->x) - (gimp_temp_buf_get_width  (pixmap) >> 1);
+  ul_y = (gint) floor (coords->y) - (gimp_temp_buf_get_height (pixmap) >> 1);
+
+  /*  Not sure why this is necessary, but empirically the code does
+   *  not work without it for even-sided brushes.  See bug #166622.
+   */
+  if (gimp_temp_buf_get_width (pixmap) % 2 == 0)
+    ul_x += ROUND (coords->x) - floor (coords->x);
+  if (gimp_temp_buf_get_height (pixmap) % 2 == 0)
+    ul_y += ROUND (coords->y) - floor (coords->y);
+
+  offset_x = area_x - ul_x;
+  offset_y = area_y - ul_y;
+
+  area_width  = gegl_buffer_get_width  (area);
+  area_height = gegl_buffer_get_height (area);
+
+  pixmap_buffer = gimp_temp_buf_create_buffer (pixmap);
+
+  gimp_gegl_buffer_copy (pixmap_buffer,
+                         GEGL_RECTANGLE (offset_x,   offset_y,
+                                         area_width, area_height),
+                         GEGL_ABYSS_NONE,
+                         area,
+                         GEGL_RECTANGLE (0,          0,
+                                         area_width, area_height));
+
+  g_object_unref (pixmap_buffer);
+
+  if (mask)
+    {
+      mask_buffer = gimp_temp_buf_create_buffer (mask);
+
+      gimp_gegl_apply_mask (mask_buffer,
+                            GEGL_RECTANGLE (offset_x,   offset_y,
+                                            area_width, area_height),
+                            area,
+                            GEGL_RECTANGLE (0,          0,
+                                            area_width, area_height),
+                            1.0);
+
+      g_object_unref (mask_buffer);
+    }
+}
diff --git a/app/paint/gimpbrushcore.h b/app/paint/gimpbrushcore.h
new file mode 100644
index 0000000..3ba4a41
--- /dev/null
+++ b/app/paint/gimpbrushcore.h
@@ -0,0 +1,152 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_CORE_H__
+#define __GIMP_BRUSH_CORE_H__
+
+
+#include "gimppaintcore.h"
+
+
+#define BRUSH_CORE_SUBSAMPLE        4
+#define BRUSH_CORE_SOLID_SUBSAMPLE  2
+#define BRUSH_CORE_JITTER_LUTSIZE   360
+
+
+#define GIMP_TYPE_BRUSH_CORE            (gimp_brush_core_get_type ())
+#define GIMP_BRUSH_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_CORE, GimpBrushCore))
+#define GIMP_BRUSH_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_CORE, GimpBrushCoreClass))
+#define GIMP_IS_BRUSH_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_CORE))
+#define GIMP_IS_BRUSH_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_CORE))
+#define GIMP_BRUSH_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_CORE, GimpBrushCoreClass))
+
+
+typedef struct _GimpBrushCoreClass GimpBrushCoreClass;
+
+struct _GimpBrushCore
+{
+  GimpPaintCore      parent_instance;
+
+  GimpBrush         *main_brush;
+  GimpBrush         *brush;
+  GimpDynamics      *dynamics;
+  gdouble            spacing;
+  gdouble            scale;
+  gdouble            aspect_ratio;
+  gdouble            angle;
+  gboolean           reflect;
+  gdouble            hardness;
+
+  gdouble            symmetry_angle;
+  gboolean           symmetry_reflect;
+
+  /*  brush buffers  */
+  GimpTempBuf       *pressure_brush;
+
+  GimpTempBuf       *solid_brushes[BRUSH_CORE_SOLID_SUBSAMPLE][BRUSH_CORE_SOLID_SUBSAMPLE];
+  const GimpTempBuf *last_solid_brush_mask;
+  gboolean           solid_cache_invalid;
+
+  const GimpTempBuf *transform_brush;
+  const GimpTempBuf *transform_pixmap;
+
+  GimpTempBuf       *subsample_brushes[BRUSH_CORE_SUBSAMPLE + 1][BRUSH_CORE_SUBSAMPLE + 1];
+  const GimpTempBuf *last_subsample_brush_mask;
+  gboolean           subsample_cache_invalid;
+
+  gdouble            jitter;
+  gdouble            jitter_lut_x[BRUSH_CORE_JITTER_LUTSIZE];
+  gdouble            jitter_lut_y[BRUSH_CORE_JITTER_LUTSIZE];
+
+  GRand             *rand;
+};
+
+struct _GimpBrushCoreClass
+{
+  GimpPaintCoreClass  parent_class;
+
+  /*  Set for tools that don't mind if the brush changes while painting  */
+  gboolean            handles_changing_brush;
+
+  /*  Set for tools that don't mind if the brush scales while painting  */
+  gboolean            handles_transforming_brush;
+
+  /*  Set for tools that don't mind if the brush scales mid stroke  */
+  gboolean            handles_dynamic_transforming_brush;
+
+  void (* set_brush)    (GimpBrushCore *core,
+                         GimpBrush     *brush);
+  void (* set_dynamics) (GimpBrushCore *core,
+                         GimpDynamics  *brush);
+};
+
+
+GType  gimp_brush_core_get_type       (void) G_GNUC_CONST;
+
+void   gimp_brush_core_set_brush      (GimpBrushCore            *core,
+                                       GimpBrush                *brush);
+
+void   gimp_brush_core_set_dynamics   (GimpBrushCore            *core,
+                                       GimpDynamics             *dynamics);
+
+void   gimp_brush_core_paste_canvas   (GimpBrushCore            *core,
+                                       GimpDrawable             *drawable,
+                                       const GimpCoords         *coords,
+                                       gdouble                   brush_opacity,
+                                       gdouble                   image_opacity,
+                                       GimpLayerMode             paint_mode,
+                                       GimpBrushApplicationMode  brush_hardness,
+                                       gdouble                   dynamic_hardness,
+                                       GimpPaintApplicationMode  mode);
+void   gimp_brush_core_replace_canvas (GimpBrushCore            *core,
+                                       GimpDrawable             *drawable,
+                                       const GimpCoords         *coords,
+                                       gdouble                   brush_opacity,
+                                       gdouble                   image_opacity,
+                                       GimpBrushApplicationMode  brush_hardness,
+                                       gdouble                   dynamic_hardness,
+                                       GimpPaintApplicationMode  mode);
+
+void   gimp_brush_core_color_area_with_pixmap
+                                      (GimpBrushCore            *core,
+                                       GimpDrawable             *drawable,
+                                       const GimpCoords         *coords,
+                                       GeglBuffer               *area,
+                                       gint                      area_x,
+                                       gint                      area_y,
+                                       gboolean                  apply_mask);
+
+const GimpTempBuf * gimp_brush_core_get_brush_mask
+                                      (GimpBrushCore            *core,
+                                       const GimpCoords         *coords,
+                                       GimpBrushApplicationMode  brush_hardness,
+                                       gdouble                   dynamic_hardness);
+const GimpTempBuf * gimp_brush_core_get_brush_pixmap
+                                      (GimpBrushCore            *core);
+
+void   gimp_brush_core_eval_transform_dynamics
+                                      (GimpBrushCore            *core,
+                                       GimpDrawable             *drawable,
+                                       GimpPaintOptions         *paint_options,
+                                       const GimpCoords         *coords);
+void   gimp_brush_core_eval_transform_symmetry
+                                      (GimpBrushCore            *core,
+                                       GimpSymmetry             *symmetry,
+                                       gint                      stroke);
+
+
+#endif  /*  __GIMP_BRUSH_CORE_H__  */
diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c
new file mode 100644
index 0000000..9c807f4
--- /dev/null
+++ b/app/paint/gimpclone.c
@@ -0,0 +1,256 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimppattern.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimpclone.h"
+#include "gimpcloneoptions.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean   gimp_clone_start      (GimpPaintCore     *paint_core,
+                                         GimpDrawable      *drawable,
+                                         GimpPaintOptions  *paint_options,
+                                         const GimpCoords  *coords,
+                                         GError           **error);
+
+static void       gimp_clone_motion     (GimpSourceCore    *source_core,
+                                         GimpDrawable      *drawable,
+                                         GimpPaintOptions  *paint_options,
+                                         const GimpCoords  *coords,
+                                         GeglNode          *op,
+                                         gdouble            opacity,
+                                         GimpPickable      *src_pickable,
+                                         GeglBuffer        *src_buffer,
+                                         GeglRectangle     *src_rect,
+                                         gint               src_offset_x,
+                                         gint               src_offset_y,
+                                         GeglBuffer        *paint_buffer,
+                                         gint               paint_buffer_x,
+                                         gint               paint_buffer_y,
+                                         gint               paint_area_offset_x,
+                                         gint               paint_area_offset_y,
+                                         gint               paint_area_width,
+                                         gint               paint_area_height);
+
+static gboolean   gimp_clone_use_source (GimpSourceCore    *source_core,
+                                         GimpSourceOptions *options);
+
+
+G_DEFINE_TYPE (GimpClone, gimp_clone, GIMP_TYPE_SOURCE_CORE)
+
+#define parent_class gimp_clone_parent_class
+
+
+void
+gimp_clone_register (Gimp                      *gimp,
+                     GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_CLONE,
+                GIMP_TYPE_CLONE_OPTIONS,
+                "gimp-clone",
+                _("Clone"),
+                "gimp-tool-clone");
+}
+
+static void
+gimp_clone_class_init (GimpCloneClass *klass)
+{
+  GimpPaintCoreClass  *paint_core_class  = GIMP_PAINT_CORE_CLASS (klass);
+  GimpSourceCoreClass *source_core_class = GIMP_SOURCE_CORE_CLASS (klass);
+
+  paint_core_class->start       = gimp_clone_start;
+
+  source_core_class->use_source = gimp_clone_use_source;
+  source_core_class->motion     = gimp_clone_motion;
+}
+
+static void
+gimp_clone_init (GimpClone *clone)
+{
+}
+
+static gboolean
+gimp_clone_start (GimpPaintCore     *paint_core,
+                  GimpDrawable      *drawable,
+                  GimpPaintOptions  *paint_options,
+                  const GimpCoords  *coords,
+                  GError           **error)
+{
+  GimpCloneOptions *options = GIMP_CLONE_OPTIONS (paint_options);
+
+  if (! GIMP_PAINT_CORE_CLASS (parent_class)->start (paint_core, drawable,
+                                                     paint_options, coords,
+                                                     error))
+    {
+      return FALSE;
+    }
+
+  if (options->clone_type == GIMP_CLONE_PATTERN)
+    {
+      if (! gimp_context_get_pattern (GIMP_CONTEXT (options)))
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("No patterns available for use with this tool."));
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_clone_motion (GimpSourceCore   *source_core,
+                   GimpDrawable     *drawable,
+                   GimpPaintOptions *paint_options,
+                   const GimpCoords *coords,
+                   GeglNode         *op,
+                   gdouble           opacity,
+                   GimpPickable     *src_pickable,
+                   GeglBuffer       *src_buffer,
+                   GeglRectangle    *src_rect,
+                   gint              src_offset_x,
+                   gint              src_offset_y,
+                   GeglBuffer       *paint_buffer,
+                   gint              paint_buffer_x,
+                   gint              paint_buffer_y,
+                   gint              paint_area_offset_x,
+                   gint              paint_area_offset_y,
+                   gint              paint_area_width,
+                   gint              paint_area_height)
+{
+  GimpPaintCore     *paint_core     = GIMP_PAINT_CORE (source_core);
+  GimpBrushCore     *brush_core     = GIMP_BRUSH_CORE (source_core);
+  GimpCloneOptions  *options        = GIMP_CLONE_OPTIONS (paint_options);
+  GimpSourceOptions *source_options = GIMP_SOURCE_OPTIONS (paint_options);
+  GimpContext       *context        = GIMP_CONTEXT (paint_options);
+  GimpDynamics      *dynamics       = brush_core->dynamics;
+  GimpImage         *image          = gimp_item_get_image (GIMP_ITEM (drawable));
+  gdouble            fade_point;
+  gdouble            force;
+
+  if (gimp_source_core_use_source (source_core, source_options))
+    {
+      if (! op)
+        {
+          gimp_gegl_buffer_copy (src_buffer,
+                                 GEGL_RECTANGLE (src_rect->x,
+                                                 src_rect->y,
+                                                 paint_area_width,
+                                                 paint_area_height),
+                                 GEGL_ABYSS_NONE,
+                                 paint_buffer,
+                                 GEGL_RECTANGLE (paint_area_offset_x,
+                                                 paint_area_offset_y,
+                                                 0, 0));
+        }
+      else
+        {
+          gimp_gegl_apply_operation (src_buffer, NULL, NULL, op,
+                                     paint_buffer,
+                                     GEGL_RECTANGLE (paint_area_offset_x,
+                                                     paint_area_offset_y,
+                                                     paint_area_width,
+                                                     paint_area_height),
+                                     FALSE);
+        }
+    }
+  else if (options->clone_type == GIMP_CLONE_PATTERN)
+    {
+      GimpPattern *pattern    = gimp_context_get_pattern (context);
+      GeglBuffer  *src_buffer = gimp_pattern_create_buffer (pattern);
+
+      src_offset_x += gegl_buffer_get_width (src_buffer) / 2;
+      src_offset_y += gegl_buffer_get_height (src_buffer) / 2;
+
+      gegl_buffer_set_pattern (paint_buffer,
+                               GEGL_RECTANGLE (paint_area_offset_x,
+                                               paint_area_offset_y,
+                                               paint_area_width,
+                                               paint_area_height),
+                               src_buffer,
+                               - paint_buffer_x - src_offset_x,
+                               - paint_buffer_y - src_offset_y);
+
+      g_object_unref (src_buffer);
+    }
+  else
+    {
+      g_return_if_reached ();
+    }
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_FORCE))
+    force = gimp_dynamics_get_linear_value (dynamics,
+                                            GIMP_DYNAMICS_OUTPUT_FORCE,
+                                            coords,
+                                            paint_options,
+                                            fade_point);
+  else
+    force = paint_options->brush_force;
+
+  gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
+                                coords,
+                                MIN (opacity, GIMP_OPACITY_OPAQUE),
+                                gimp_context_get_opacity (context),
+                                gimp_context_get_paint_mode (context),
+                                gimp_paint_options_get_brush_mode (paint_options),
+                                force,
+
+                                /* In fixed mode, paint incremental so the
+                                 * individual brushes are properly applied
+                                 * on top of each other.
+                                 * Otherwise the stuff we paint is seamless
+                                 * and we don't need intermediate masking.
+                                 */
+                                source_options->align_mode ==
+                                GIMP_SOURCE_ALIGN_FIXED ?
+                                GIMP_PAINT_INCREMENTAL : GIMP_PAINT_CONSTANT);
+}
+
+static gboolean
+gimp_clone_use_source (GimpSourceCore    *source_core,
+                       GimpSourceOptions *options)
+{
+  return GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_CLONE_IMAGE;
+}
diff --git a/app/paint/gimpclone.h b/app/paint/gimpclone.h
new file mode 100644
index 0000000..dced05b
--- /dev/null
+++ b/app/paint/gimpclone.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CLONE_H__
+#define __GIMP_CLONE_H__
+
+
+#include "gimpsourcecore.h"
+
+
+#define GIMP_TYPE_CLONE            (gimp_clone_get_type ())
+#define GIMP_CLONE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CLONE, GimpClone))
+#define GIMP_CLONE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CLONE, GimpCloneClass))
+#define GIMP_IS_CLONE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CLONE))
+#define GIMP_IS_CLONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CLONE))
+#define GIMP_CLONE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE, GimpCloneClass))
+
+
+typedef struct _GimpCloneClass GimpCloneClass;
+
+struct _GimpClone
+{
+  GimpSourceCore  parent_instance;
+};
+
+struct _GimpCloneClass
+{
+  GimpSourceCoreClass  parent_class;
+};
+
+
+void    gimp_clone_register (Gimp                      *gimp,
+                             GimpPaintRegisterCallback  callback);
+
+GType   gimp_clone_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CLONE_H__  */
diff --git a/app/paint/gimpcloneoptions.c b/app/paint/gimpcloneoptions.c
new file mode 100644
index 0000000..4f398d6
--- /dev/null
+++ b/app/paint/gimpcloneoptions.c
@@ -0,0 +1,114 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpcloneoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CLONE_TYPE
+};
+
+
+static void   gimp_clone_options_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void   gimp_clone_options_get_property (GObject      *object,
+                                               guint         property_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpCloneOptions, gimp_clone_options, GIMP_TYPE_SOURCE_OPTIONS)
+
+#define parent_class gimp_clone_options_parent_class
+
+
+static void
+gimp_clone_options_class_init (GimpCloneOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_clone_options_set_property;
+  object_class->get_property = gimp_clone_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CLONE_TYPE,
+                         "clone-type",
+                         _("Source"),
+                         NULL,
+                         GIMP_TYPE_CLONE_TYPE,
+                         GIMP_CLONE_IMAGE,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_clone_options_init (GimpCloneOptions *options)
+{
+}
+
+static void
+gimp_clone_options_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpCloneOptions *options = GIMP_CLONE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_CLONE_TYPE:
+      options->clone_type = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_clone_options_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpCloneOptions *options = GIMP_CLONE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_CLONE_TYPE:
+      g_value_set_enum (value, options->clone_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpcloneoptions.h b/app/paint/gimpcloneoptions.h
new file mode 100644
index 0000000..b71f217
--- /dev/null
+++ b/app/paint/gimpcloneoptions.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CLONE_OPTIONS_H__
+#define __GIMP_CLONE_OPTIONS_H__
+
+
+#include "gimpsourceoptions.h"
+
+
+#define GIMP_TYPE_CLONE_OPTIONS            (gimp_clone_options_get_type ())
+#define GIMP_CLONE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CLONE_OPTIONS, GimpCloneOptions))
+#define GIMP_CLONE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CLONE_OPTIONS, GimpCloneOptionsClass))
+#define GIMP_IS_CLONE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CLONE_OPTIONS))
+#define GIMP_IS_CLONE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CLONE_OPTIONS))
+#define GIMP_CLONE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE_OPTIONS, GimpCloneOptionsClass))
+
+
+typedef struct _GimpCloneOptionsClass GimpCloneOptionsClass;
+
+struct _GimpCloneOptions
+{
+  GimpSourceOptions  parent_instance;
+
+  GimpCloneType      clone_type;
+};
+
+struct _GimpCloneOptionsClass
+{
+  GimpSourceOptionsClass  parent_class;
+};
+
+
+GType   gimp_clone_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CLONE_OPTIONS_H__  */
diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c
new file mode 100644
index 0000000..f2eea47
--- /dev/null
+++ b/app/paint/gimpconvolve.c
@@ -0,0 +1,277 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpconvolve.h"
+#include "gimpconvolveoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define FIELD_COLS    4
+#define MIN_BLUR      64         /*  (8/9 original pixel)   */
+#define MAX_BLUR      0.25       /*  (1/33 original pixel)  */
+#define MIN_SHARPEN   -512
+#define MAX_SHARPEN   -64
+
+
+static void    gimp_convolve_paint            (GimpPaintCore    *paint_core,
+                                               GimpDrawable     *drawable,
+                                               GimpPaintOptions *paint_options,
+                                               GimpSymmetry     *sym,
+                                               GimpPaintState    paint_state,
+                                               guint32           time);
+static void    gimp_convolve_motion           (GimpPaintCore    *paint_core,
+                                               GimpDrawable     *drawable,
+                                               GimpPaintOptions *paint_options,
+                                               GimpSymmetry     *sym);
+
+static void    gimp_convolve_calculate_matrix (GimpConvolve     *convolve,
+                                               GimpConvolveType  type,
+                                               gint              radius_x,
+                                               gint              radius_y,
+                                               gdouble           rate);
+static gdouble gimp_convolve_sum_matrix       (const gfloat     *matrix);
+
+
+G_DEFINE_TYPE (GimpConvolve, gimp_convolve, GIMP_TYPE_BRUSH_CORE)
+
+
+void
+gimp_convolve_register (Gimp                      *gimp,
+                        GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_CONVOLVE,
+                GIMP_TYPE_CONVOLVE_OPTIONS,
+                "gimp-convolve",
+                _("Convolve"),
+                "gimp-tool-blur");
+}
+
+static void
+gimp_convolve_class_init (GimpConvolveClass *klass)
+{
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+
+  paint_core_class->paint = gimp_convolve_paint;
+}
+
+static void
+gimp_convolve_init (GimpConvolve *convolve)
+{
+  gint i;
+
+  for (i = 0; i < 9; i++)
+    convolve->matrix[i] = 1.0;
+
+  convolve->matrix_divisor = 9.0;
+}
+
+static void
+gimp_convolve_paint (GimpPaintCore    *paint_core,
+                     GimpDrawable     *drawable,
+                     GimpPaintOptions *paint_options,
+                     GimpSymmetry     *sym,
+                     GimpPaintState    paint_state,
+                     guint32           time)
+{
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_MOTION:
+      gimp_convolve_motion (paint_core, drawable, paint_options, sym);
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gimp_convolve_motion (GimpPaintCore    *paint_core,
+                      GimpDrawable     *drawable,
+                      GimpPaintOptions *paint_options,
+                      GimpSymmetry     *sym)
+{
+  GimpConvolve        *convolve   = GIMP_CONVOLVE (paint_core);
+  GimpBrushCore       *brush_core = GIMP_BRUSH_CORE (paint_core);
+  GimpConvolveOptions *options    = GIMP_CONVOLVE_OPTIONS (paint_options);
+  GimpContext         *context    = GIMP_CONTEXT (paint_options);
+  GimpDynamics        *dynamics   = GIMP_BRUSH_CORE (paint_core)->dynamics;
+  GimpImage           *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+  GeglBuffer          *paint_buffer;
+  gint                 paint_buffer_x;
+  gint                 paint_buffer_y;
+  GimpTempBuf         *temp_buf;
+  GeglBuffer          *convolve_buffer;
+  gdouble              fade_point;
+  gdouble              opacity;
+  gdouble              rate;
+  const GimpCoords    *coords;
+  gint                 paint_width, paint_height;
+  gint                 n_strokes;
+  gint                 i;
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  coords = gimp_symmetry_get_origin (sym);
+  opacity = gimp_dynamics_get_linear_value (dynamics,
+                                            GIMP_DYNAMICS_OUTPUT_OPACITY,
+                                            coords,
+                                            paint_options,
+                                            fade_point);
+  if (opacity == 0.0)
+    return;
+
+  gimp_brush_core_eval_transform_dynamics (GIMP_BRUSH_CORE (paint_core),
+                                           drawable,
+                                           paint_options,
+                                           coords);
+  n_strokes = gimp_symmetry_get_size (sym);
+  for (i = 0; i < n_strokes; i++)
+    {
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      gimp_brush_core_eval_transform_symmetry (brush_core, sym, i);
+
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       GIMP_LAYER_MODE_NORMAL,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       &paint_width,
+                                                       &paint_height);
+      if (! paint_buffer)
+        continue;
+
+      rate = (options->rate *
+              gimp_dynamics_get_linear_value (dynamics,
+                                              GIMP_DYNAMICS_OUTPUT_RATE,
+                                              coords,
+                                              paint_options,
+                                              fade_point));
+
+      gimp_convolve_calculate_matrix (convolve, options->type,
+                                      gimp_brush_get_width  (brush_core->brush) / 2,
+                                      gimp_brush_get_height (brush_core->brush) / 2,
+                                      rate);
+
+      /*  need a linear buffer for gimp_gegl_convolve()  */
+      temp_buf = gimp_temp_buf_new (gegl_buffer_get_width  (paint_buffer),
+                                    gegl_buffer_get_height (paint_buffer),
+                                    gegl_buffer_get_format (paint_buffer));
+      convolve_buffer = gimp_temp_buf_create_buffer (temp_buf);
+      gimp_temp_buf_unref (temp_buf);
+
+      gimp_gegl_buffer_copy (
+        gimp_drawable_get_buffer (drawable),
+        GEGL_RECTANGLE (paint_buffer_x,
+                        paint_buffer_y,
+                        gegl_buffer_get_width  (paint_buffer),
+                        gegl_buffer_get_height (paint_buffer)),
+        GEGL_ABYSS_NONE,
+        convolve_buffer,
+        GEGL_RECTANGLE (0, 0, 0, 0));
+
+      gimp_gegl_convolve (convolve_buffer,
+                          GEGL_RECTANGLE (0, 0,
+                                          gegl_buffer_get_width  (convolve_buffer),
+                                          gegl_buffer_get_height (convolve_buffer)),
+                          paint_buffer,
+                          GEGL_RECTANGLE (0, 0,
+                                          gegl_buffer_get_width  (paint_buffer),
+                                          gegl_buffer_get_height (paint_buffer)),
+                          convolve->matrix, 3, convolve->matrix_divisor,
+                          GIMP_NORMAL_CONVOL, TRUE);
+
+      g_object_unref (convolve_buffer);
+
+      gimp_brush_core_replace_canvas (brush_core, drawable,
+                                      coords,
+                                      MIN (opacity, GIMP_OPACITY_OPAQUE),
+                                      gimp_context_get_opacity (context),
+                                      gimp_paint_options_get_brush_mode (paint_options),
+                                      1.0,
+                                      GIMP_PAINT_INCREMENTAL);
+    }
+}
+
+static void
+gimp_convolve_calculate_matrix (GimpConvolve    *convolve,
+                                GimpConvolveType type,
+                                gint             radius_x,
+                                gint             radius_y,
+                                gdouble          rate)
+{
+  /*  find percent of tool pressure  */
+  const gdouble percent = MIN (rate / 100.0, 1.0);
+
+  convolve->matrix[0] = (radius_x && radius_y) ? 1.0 : 0.0;
+  convolve->matrix[1] = (radius_y)             ? 1.0 : 0.0;
+  convolve->matrix[2] = (radius_x && radius_y) ? 1.0 : 0.0;
+  convolve->matrix[3] = (radius_x)             ? 1.0 : 0.0;
+
+  /*  get the appropriate convolution matrix and size and divisor  */
+  switch (type)
+    {
+    case GIMP_CONVOLVE_BLUR:
+      convolve->matrix[4] = MIN_BLUR + percent * (MAX_BLUR - MIN_BLUR);
+      break;
+
+    case GIMP_CONVOLVE_SHARPEN:
+      convolve->matrix[4] = MIN_SHARPEN + percent * (MAX_SHARPEN - MIN_SHARPEN);
+      break;
+    }
+
+  convolve->matrix[5] = (radius_x)             ? 1.0 : 0.0;
+  convolve->matrix[6] = (radius_x && radius_y) ? 1.0 : 0.0;
+  convolve->matrix[7] = (radius_y)             ? 1.0 : 0.0;
+  convolve->matrix[8] = (radius_x && radius_y) ? 1.0 : 0.0;
+
+  convolve->matrix_divisor = gimp_convolve_sum_matrix (convolve->matrix);
+}
+
+static gdouble
+gimp_convolve_sum_matrix (const gfloat *matrix)
+{
+  gdouble sum = 0.0;
+  gint    i;
+
+  for (i = 0; i < 9; i++)
+    sum += matrix[i];
+
+  return sum;
+}
diff --git a/app/paint/gimpconvolve.h b/app/paint/gimpconvolve.h
new file mode 100644
index 0000000..1aecf03
--- /dev/null
+++ b/app/paint/gimpconvolve.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONVOLVE_H__
+#define __GIMP_CONVOLVE_H__
+
+
+#include "gimpbrushcore.h"
+
+
+#define GIMP_TYPE_CONVOLVE            (gimp_convolve_get_type ())
+#define GIMP_CONVOLVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONVOLVE, GimpConvolve))
+#define GIMP_CONVOLVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONVOLVE, GimpConvolveClass))
+#define GIMP_IS_CONVOLVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONVOLVE))
+#define GIMP_IS_CONVOLVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONVOLVE))
+#define GIMP_CONVOLVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE, GimpConvolveClass))
+
+
+typedef struct _GimpConvolveClass GimpConvolveClass;
+
+struct _GimpConvolve
+{
+  GimpBrushCore  parent_instance;
+  gfloat         matrix[9];
+  gfloat         matrix_divisor;
+};
+
+struct _GimpConvolveClass
+{
+  GimpBrushCoreClass parent_class;
+};
+
+
+void    gimp_convolve_register (Gimp                      *gimp,
+                                GimpPaintRegisterCallback  callback);
+
+GType   gimp_convolve_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CONVOLVE_H__  */
diff --git a/app/paint/gimpconvolveoptions.c b/app/paint/gimpconvolveoptions.c
new file mode 100644
index 0000000..dffec68
--- /dev/null
+++ b/app/paint/gimpconvolveoptions.c
@@ -0,0 +1,129 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpconvolveoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_CONVOLVE_TYPE  GIMP_CONVOLVE_BLUR
+#define DEFAULT_CONVOLVE_RATE  50.0
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_RATE
+};
+
+
+static void   gimp_convolve_options_set_property (GObject      *object,
+                                                  guint         property_id,
+                                                  const GValue *value,
+                                                  GParamSpec   *pspec);
+static void   gimp_convolve_options_get_property (GObject      *object,
+                                                  guint         property_id,
+                                                  GValue       *value,
+                                                  GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpConvolveOptions, gimp_convolve_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_convolve_options_class_init (GimpConvolveOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_convolve_options_set_property;
+  object_class->get_property = gimp_convolve_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TYPE,
+                         "type",
+                         _("Convolve Type"),
+                         NULL,
+                         GIMP_TYPE_CONVOLVE_TYPE,
+                         DEFAULT_CONVOLVE_TYPE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_RATE,
+                           "rate",
+                           C_("convolve-tool", "Rate"),
+                           NULL,
+                           0.0, 100.0, DEFAULT_CONVOLVE_RATE,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_convolve_options_init (GimpConvolveOptions *options)
+{
+}
+
+static void
+gimp_convolve_options_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpConvolveOptions *options = GIMP_CONVOLVE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      options->type = g_value_get_enum (value);
+      break;
+    case PROP_RATE:
+      options->rate = g_value_get_double (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_convolve_options_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpConvolveOptions *options = GIMP_CONVOLVE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, options->type);
+      break;
+    case PROP_RATE:
+      g_value_set_double (value, options->rate);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpconvolveoptions.h b/app/paint/gimpconvolveoptions.h
new file mode 100644
index 0000000..62bd99b
--- /dev/null
+++ b/app/paint/gimpconvolveoptions.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONVOLVE_OPTIONS_H__
+#define __GIMP_CONVOLVE_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_CONVOLVE_OPTIONS            (gimp_convolve_options_get_type ())
+#define GIMP_CONVOLVE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONVOLVE_OPTIONS, GimpConvolveOptions))
+#define GIMP_CONVOLVE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONVOLVE_OPTIONS, GimpConvolveOptionsClass))
+#define GIMP_IS_CONVOLVE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONVOLVE_OPTIONS))
+#define GIMP_IS_CONVOLVE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONVOLVE_OPTIONS))
+#define GIMP_CONVOLVE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE_OPTIONS, GimpConvolveOptionsClass))
+
+
+typedef struct _GimpConvolveOptionsClass GimpConvolveOptionsClass;
+
+struct _GimpConvolveOptions
+{
+  GimpPaintOptions  parent_instance;
+
+  GimpConvolveType  type;
+  gdouble           rate;
+};
+
+struct _GimpConvolveOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_convolve_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CONVOLVE_OPTIONS_H__  */
diff --git a/app/paint/gimpdodgeburn.c b/app/paint/gimpdodgeburn.c
new file mode 100644
index 0000000..cdfc176
--- /dev/null
+++ b/app/paint/gimpdodgeburn.c
@@ -0,0 +1,201 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpimage.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimpdodgeburn.h"
+#include "gimpdodgeburnoptions.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_dodge_burn_paint  (GimpPaintCore    *paint_core,
+                                      GimpDrawable     *drawable,
+                                      GimpPaintOptions *paint_options,
+                                      GimpSymmetry     *sym,
+                                      GimpPaintState    paint_state,
+                                      guint32           time);
+static void   gimp_dodge_burn_motion (GimpPaintCore    *paint_core,
+                                      GimpDrawable     *drawable,
+                                      GimpPaintOptions *paint_options,
+                                      GimpSymmetry     *sym);
+
+
+G_DEFINE_TYPE (GimpDodgeBurn, gimp_dodge_burn, GIMP_TYPE_BRUSH_CORE)
+
+#define parent_class gimp_dodge_burn_parent_class
+
+
+void
+gimp_dodge_burn_register (Gimp                      *gimp,
+                          GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_DODGE_BURN,
+                GIMP_TYPE_DODGE_BURN_OPTIONS,
+                "gimp-dodge-burn",
+                _("Dodge/Burn"),
+                "gimp-tool-dodge");
+}
+
+static void
+gimp_dodge_burn_class_init (GimpDodgeBurnClass *klass)
+{
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+  GimpBrushCoreClass *brush_core_class = GIMP_BRUSH_CORE_CLASS (klass);
+
+  paint_core_class->paint = gimp_dodge_burn_paint;
+
+  brush_core_class->handles_changing_brush = TRUE;
+}
+
+static void
+gimp_dodge_burn_init (GimpDodgeBurn *dodgeburn)
+{
+}
+
+static void
+gimp_dodge_burn_paint (GimpPaintCore    *paint_core,
+                       GimpDrawable     *drawable,
+                       GimpPaintOptions *paint_options,
+                       GimpSymmetry     *sym,
+                       GimpPaintState    paint_state,
+                       guint32           time)
+{
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      gimp_dodge_burn_motion (paint_core, drawable, paint_options, sym);
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      break;
+    }
+}
+
+static void
+gimp_dodge_burn_motion (GimpPaintCore    *paint_core,
+                        GimpDrawable     *drawable,
+                        GimpPaintOptions *paint_options,
+                        GimpSymmetry     *sym)
+{
+  GimpBrushCore        *brush_core = GIMP_BRUSH_CORE (paint_core);
+  GimpDodgeBurnOptions *options    = GIMP_DODGE_BURN_OPTIONS (paint_options);
+  GimpContext          *context    = GIMP_CONTEXT (paint_options);
+  GimpDynamics         *dynamics   = GIMP_BRUSH_CORE (paint_core)->dynamics;
+  GimpImage            *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+  GeglBuffer           *src_buffer;
+  GeglBuffer           *paint_buffer;
+  gint                  paint_buffer_x;
+  gint                  paint_buffer_y;
+  gdouble               fade_point;
+  gdouble               opacity;
+  gdouble               force;
+  const GimpCoords     *coords;
+  gint                  paint_width, paint_height;
+  gint                  n_strokes;
+  gint                  i;
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  coords = gimp_symmetry_get_origin (sym);
+  opacity = gimp_dynamics_get_linear_value (dynamics,
+                                            GIMP_DYNAMICS_OUTPUT_OPACITY,
+                                            coords,
+                                            paint_options,
+                                            fade_point);
+  if (opacity == 0.0)
+    return;
+
+  if (paint_options->application_mode == GIMP_PAINT_CONSTANT)
+    src_buffer = gimp_paint_core_get_orig_image (paint_core);
+  else
+    src_buffer = gimp_drawable_get_buffer (drawable);
+
+  gimp_brush_core_eval_transform_dynamics (brush_core,
+                                           drawable,
+                                           paint_options,
+                                           coords);
+  n_strokes = gimp_symmetry_get_size (sym);
+  for (i = 0; i < n_strokes; i++)
+    {
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      gimp_brush_core_eval_transform_symmetry (brush_core, sym, i);
+
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       GIMP_LAYER_MODE_NORMAL,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       &paint_width,
+                                                       &paint_height);
+      if (! paint_buffer)
+        continue;
+
+      /*  DodgeBurn the region  */
+      gimp_gegl_dodgeburn (src_buffer,
+                           GEGL_RECTANGLE (paint_buffer_x,
+                                           paint_buffer_y,
+                                           gegl_buffer_get_width  (paint_buffer),
+                                           gegl_buffer_get_height (paint_buffer)),
+                           paint_buffer,
+                           GEGL_RECTANGLE (0, 0, 0, 0),
+                           options->exposure / 100.0,
+                           options->type,
+                           options->mode);
+
+      if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_FORCE))
+        force = gimp_dynamics_get_linear_value (dynamics,
+                                                GIMP_DYNAMICS_OUTPUT_FORCE,
+                                                coords,
+                                                paint_options,
+                                                fade_point);
+      else
+        force = paint_options->brush_force;
+
+      /* Replace the newly dodgedburned area (paint_area) to the image */
+      gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
+                                      coords,
+                                      MIN (opacity, GIMP_OPACITY_OPAQUE),
+                                      gimp_context_get_opacity (context),
+                                      gimp_paint_options_get_brush_mode (paint_options),
+                                      force,
+                                      paint_options->application_mode);
+    }
+}
diff --git a/app/paint/gimpdodgeburn.h b/app/paint/gimpdodgeburn.h
new file mode 100644
index 0000000..859887b
--- /dev/null
+++ b/app/paint/gimpdodgeburn.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DODGE_BURN_H__
+#define __GIMP_DODGE_BURN_H__
+
+
+#include "gimpbrushcore.h"
+
+
+#define GIMP_TYPE_DODGE_BURN            (gimp_dodge_burn_get_type ())
+#define GIMP_DODGE_BURN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DODGE_BURN, GimpDodgeBurn))
+#define GIMP_IS_DODGE_BURN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DODGE_BURN))
+#define GIMP_DODGE_BURN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DODGEBURN, GimpDodgeBurnClass))
+#define GIMP_IS_DODGE_BURN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DODGE_BURN))
+
+
+typedef struct _GimpDodgeBurnClass GimpDodgeBurnClass;
+
+struct _GimpDodgeBurn
+{
+  GimpBrushCore  parent_instance;
+};
+
+struct _GimpDodgeBurnClass
+{
+  GimpBrushCoreClass  parent_class;
+};
+
+
+void    gimp_dodge_burn_register (Gimp                      *gimp,
+                                  GimpPaintRegisterCallback  callback);
+
+GType   gimp_dodge_burn_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_DODGE_BURN_H__  */
diff --git a/app/paint/gimpdodgeburnoptions.c b/app/paint/gimpdodgeburnoptions.c
new file mode 100644
index 0000000..b897b7e
--- /dev/null
+++ b/app/paint/gimpdodgeburnoptions.c
@@ -0,0 +1,145 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpdodgeburnoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define DODGE_BURN_DEFAULT_TYPE     GIMP_DODGE_BURN_TYPE_DODGE
+#define DODGE_BURN_DEFAULT_MODE     GIMP_TRANSFER_MIDTONES
+#define DODGE_BURN_DEFAULT_EXPOSURE 50.0
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_MODE,
+  PROP_EXPOSURE
+};
+
+
+static void   gimp_dodge_burn_options_set_property (GObject      *object,
+                                                    guint         property_id,
+                                                    const GValue *value,
+                                                    GParamSpec   *pspec);
+static void   gimp_dodge_burn_options_get_property (GObject      *object,
+                                                    guint         property_id,
+                                                    GValue       *value,
+                                                    GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpDodgeBurnOptions, gimp_dodge_burn_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_dodge_burn_options_class_init (GimpDodgeBurnOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_dodge_burn_options_set_property;
+  object_class->get_property = gimp_dodge_burn_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TYPE,
+                         "type",
+                         _("Type"),
+                         NULL,
+                         GIMP_TYPE_DODGE_BURN_TYPE,
+                         DODGE_BURN_DEFAULT_TYPE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_MODE,
+                         "mode",
+                         _("Range"),
+                         NULL,
+                         GIMP_TYPE_TRANSFER_MODE,
+                         DODGE_BURN_DEFAULT_MODE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EXPOSURE,
+                           "exposure",
+                           _("Exposure"),
+                           NULL,
+                           0.0, 100.0, DODGE_BURN_DEFAULT_EXPOSURE,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_dodge_burn_options_init (GimpDodgeBurnOptions *options)
+{
+}
+
+static void
+gimp_dodge_burn_options_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpDodgeBurnOptions *options = GIMP_DODGE_BURN_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      options->type = g_value_get_enum (value);
+      break;
+    case PROP_MODE:
+      options->mode = g_value_get_enum (value);
+      break;
+    case PROP_EXPOSURE:
+      options->exposure = g_value_get_double (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dodge_burn_options_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpDodgeBurnOptions *options = GIMP_DODGE_BURN_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, options->type);
+      break;
+    case PROP_MODE:
+      g_value_set_enum (value, options->mode);
+      break;
+    case PROP_EXPOSURE:
+      g_value_set_double (value, options->exposure);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpdodgeburnoptions.h b/app/paint/gimpdodgeburnoptions.h
new file mode 100644
index 0000000..02eed8a
--- /dev/null
+++ b/app/paint/gimpdodgeburnoptions.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DODGE_BURN_OPTIONS_H__
+#define __GIMP_DODGE_BURN_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_DODGE_BURN_OPTIONS            (gimp_dodge_burn_options_get_type ())
+#define GIMP_DODGE_BURN_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DODGE_BURN_OPTIONS, GimpDodgeBurnOptions))
+#define GIMP_DODGE_BURN_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DODGE_BURN_OPTIONS, GimpDodgeBurnOptionsClass))
+#define GIMP_IS_DODGE_BURN_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DODGE_BURN_OPTIONS))
+#define GIMP_IS_DODGE_BURN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DODGE_BURN_OPTIONS))
+#define GIMP_DODGE_BURN_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DODGE_BURN_OPTIONS, GimpDodgeBurnOptionsClass))
+
+
+typedef struct _GimpDodgeBurnOptionsClass GimpDodgeBurnOptionsClass;
+
+struct _GimpDodgeBurnOptions
+{
+  GimpPaintOptions   parent_instance;
+
+  GimpDodgeBurnType  type;
+  GimpTransferMode   mode;     /*highlights, midtones, shadows*/
+  gdouble            exposure;
+};
+
+struct _GimpDodgeBurnOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_dodge_burn_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_DODGE_BURN_OPTIONS_H__  */
diff --git a/app/paint/gimperaser.c b/app/paint/gimperaser.c
new file mode 100644
index 0000000..68a535e
--- /dev/null
+++ b/app/paint/gimperaser.c
@@ -0,0 +1,130 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-palettes.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimperaser.h"
+#include "gimperaseroptions.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean   gimp_eraser_get_color_history_color (GimpPaintbrush            *paintbrush,
+                                                       GimpDrawable              *drawable,
+                                                       GimpPaintOptions          *paint_options,
+                                                       GimpRGB                   *color);
+static void       gimp_eraser_get_paint_params        (GimpPaintbrush            *paintbrush,
+                                                       GimpDrawable              *drawable,
+                                                       GimpPaintOptions          *paint_options,
+                                                       GimpSymmetry              *sym,
+                                                       gdouble                    grad_point,
+                                                       GimpLayerMode             *paint_mode,
+                                                       GimpPaintApplicationMode  *paint_appl_mode,
+                                                       const GimpTempBuf        **paint_pixmap,
+                                                       GimpRGB                   *paint_color);
+
+
+G_DEFINE_TYPE (GimpEraser, gimp_eraser, GIMP_TYPE_PAINTBRUSH)
+
+
+void
+gimp_eraser_register (Gimp                      *gimp,
+                      GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_ERASER,
+                GIMP_TYPE_ERASER_OPTIONS,
+                "gimp-eraser",
+                _("Eraser"),
+                "gimp-tool-eraser");
+}
+
+static void
+gimp_eraser_class_init (GimpEraserClass *klass)
+{
+  GimpPaintbrushClass *paintbrush_class = GIMP_PAINTBRUSH_CLASS (klass);
+
+  paintbrush_class->get_color_history_color = gimp_eraser_get_color_history_color;
+  paintbrush_class->get_paint_params        = gimp_eraser_get_paint_params;
+}
+
+static void
+gimp_eraser_init (GimpEraser *eraser)
+{
+}
+
+static gboolean
+gimp_eraser_get_color_history_color (GimpPaintbrush   *paintbrush,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     GimpRGB          *color)
+{
+  /* Erasing on a drawable without alpha is equivalent to
+   * drawing with background color. So let's save history.
+   */
+  if (! gimp_drawable_has_alpha (drawable))
+    {
+      GimpContext *context = GIMP_CONTEXT (paint_options);
+
+      gimp_context_get_background (context, color);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_eraser_get_paint_params (GimpPaintbrush            *paintbrush,
+                              GimpDrawable              *drawable,
+                              GimpPaintOptions          *paint_options,
+                              GimpSymmetry              *sym,
+                              gdouble                    grad_point,
+                              GimpLayerMode             *paint_mode,
+                              GimpPaintApplicationMode  *paint_appl_mode,
+                              const GimpTempBuf        **paint_pixmap,
+                              GimpRGB                   *paint_color)
+{
+  GimpEraserOptions *options = GIMP_ERASER_OPTIONS (paint_options);
+  GimpContext       *context = GIMP_CONTEXT (paint_options);
+
+  gimp_context_get_background (context, paint_color);
+  gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                     paint_color, paint_color);
+
+  if (options->anti_erase)
+    *paint_mode = GIMP_LAYER_MODE_ANTI_ERASE;
+  else if (gimp_drawable_has_alpha (drawable))
+    *paint_mode = GIMP_LAYER_MODE_ERASE;
+  else
+    *paint_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
+}
diff --git a/app/paint/gimperaser.h b/app/paint/gimperaser.h
new file mode 100644
index 0000000..5b04a32
--- /dev/null
+++ b/app/paint/gimperaser.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ERASER_H__
+#define __GIMP_ERASER_H__
+
+
+#include "gimppaintbrush.h"
+
+
+#define GIMP_TYPE_ERASER            (gimp_eraser_get_type ())
+#define GIMP_ERASER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ERASER, GimpEraser))
+#define GIMP_ERASER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ERASER, GimpEraserClass))
+#define GIMP_IS_ERASER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ERASER))
+#define GIMP_IS_ERASER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ERASER))
+#define GIMP_ERASER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER, GimpEraserClass))
+
+
+typedef struct _GimpEraserClass GimpEraserClass;
+
+struct _GimpEraser
+{
+  GimpPaintbrush  parent_instance;
+};
+
+struct _GimpEraserClass
+{
+  GimpPaintbrushClass  parent_class;
+};
+
+
+void    gimp_eraser_register (Gimp                      *gimp,
+                              GimpPaintRegisterCallback  callback);
+
+GType   gimp_eraser_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ERASER_H__  */
diff --git a/app/paint/gimperaseroptions.c b/app/paint/gimperaseroptions.c
new file mode 100644
index 0000000..0b5a3fc
--- /dev/null
+++ b/app/paint/gimperaseroptions.c
@@ -0,0 +1,113 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimperaseroptions.h"
+
+#include "gimp-intl.h"
+
+
+#define ERASER_DEFAULT_ANTI_ERASE FALSE
+
+
+enum
+{
+  PROP_0,
+  PROP_ANTI_ERASE
+};
+
+
+static void   gimp_eraser_options_set_property (GObject         *object,
+                                                guint            property_id,
+                                                const GValue    *value,
+                                                GParamSpec      *pspec);
+static void   gimp_eraser_options_get_property (GObject         *object,
+                                                guint            property_id,
+                                                GValue          *value,
+                                                GParamSpec      *pspec);
+
+
+G_DEFINE_TYPE (GimpEraserOptions, gimp_eraser_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_eraser_options_class_init (GimpEraserOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_eraser_options_set_property;
+  object_class->get_property = gimp_eraser_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTI_ERASE,
+                            "anti-erase",
+                            _("Anti erase"),
+                            NULL,
+                            ERASER_DEFAULT_ANTI_ERASE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_eraser_options_init (GimpEraserOptions *options)
+{
+}
+
+static void
+gimp_eraser_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpEraserOptions *options = GIMP_ERASER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ANTI_ERASE:
+      options->anti_erase = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_eraser_options_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpEraserOptions *options = GIMP_ERASER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ANTI_ERASE:
+      g_value_set_boolean (value, options->anti_erase);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimperaseroptions.h b/app/paint/gimperaseroptions.h
new file mode 100644
index 0000000..3551d11
--- /dev/null
+++ b/app/paint/gimperaseroptions.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ERASER_OPTIONS_H__
+#define __GIMP_ERASER_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_ERASER_OPTIONS            (gimp_eraser_options_get_type ())
+#define GIMP_ERASER_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ERASER_OPTIONS, GimpEraserOptions))
+#define GIMP_ERASER_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ERASER_OPTIONS, GimpEraserOptionsClass))
+#define GIMP_IS_ERASER_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ERASER_OPTIONS))
+#define GIMP_IS_ERASER_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ERASER_OPTIONS))
+#define GIMP_ERASER_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER_OPTIONS, GimpEraserOptionsClass))
+
+
+typedef struct _GimpEraserOptionsClass GimpEraserOptionsClass;
+
+struct _GimpEraserOptions
+{
+  GimpPaintOptions  parent_instance;
+
+  gboolean          anti_erase;
+};
+
+struct _GimpEraserOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_eraser_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ERASER_OPTIONS_H__  */
diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c
new file mode 100644
index 0000000..814fd26
--- /dev/null
+++ b/app/paint/gimpheal.c
@@ -0,0 +1,642 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpheal.c
+ * Copyright (C) Jean-Yves Couleaud <cjyves@free.fr>
+ * Copyright (C) 2013 Loren Merritt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimpbrush.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpheal.h"
+#include "gimpsourceoptions.h"
+
+#include "gimp-intl.h"
+
+
+
+/* NOTES
+ *
+ * The method used here is similar to the lighting invariant correction
+ * method but slightly different: we do not divide the RGB components,
+ * but subtract them I2 = I0 - I1, where I0 is the sample image to be
+ * corrected, I1 is the reference pattern. Then we solve DeltaI=0
+ * (Laplace) with I2 Dirichlet conditions at the borders of the
+ * mask. The solver is a red/black checker Gauss-Seidel with over-relaxation.
+ * It could benefit from a multi-grid evaluation of an initial solution
+ * before the main iteration loop.
+ *
+ * I reduced the convergence criteria to 0.1% (0.001) as we are
+ * dealing here with RGB integer components, more is overkill.
+ *
+ * Jean-Yves Couleaud cjyves@free.fr
+ */
+
+static gboolean     gimp_heal_start              (GimpPaintCore    *paint_core,
+                                                  GimpDrawable     *drawable,
+                                                  GimpPaintOptions *paint_options,
+                                                  const GimpCoords *coords,
+                                                  GError          **error);
+static GeglBuffer * gimp_heal_get_paint_buffer   (GimpPaintCore    *core,
+                                                  GimpDrawable     *drawable,
+                                                  GimpPaintOptions *paint_options,
+                                                  GimpLayerMode     paint_mode,
+                                                  const GimpCoords *coords,
+                                                  gint             *paint_buffer_x,
+                                                  gint             *paint_buffer_y,
+                                                  gint             *paint_width,
+                                                  gint             *paint_height);
+
+static void         gimp_heal_motion             (GimpSourceCore   *source_core,
+                                                  GimpDrawable     *drawable,
+                                                  GimpPaintOptions *paint_options,
+                                                  const GimpCoords *coords,
+                                                  GeglNode         *op,
+                                                  gdouble           opacity,
+                                                  GimpPickable     *src_pickable,
+                                                  GeglBuffer       *src_buffer,
+                                                  GeglRectangle    *src_rect,
+                                                  gint              src_offset_x,
+                                                  gint              src_offset_y,
+                                                  GeglBuffer       *paint_buffer,
+                                                  gint              paint_buffer_x,
+                                                  gint              paint_buffer_y,
+                                                  gint              paint_area_offset_x,
+                                                  gint              paint_area_offset_y,
+                                                  gint              paint_area_width,
+                                                  gint              paint_area_height);
+
+
+G_DEFINE_TYPE (GimpHeal, gimp_heal, GIMP_TYPE_SOURCE_CORE)
+
+#define parent_class gimp_heal_parent_class
+
+
+void
+gimp_heal_register (Gimp                      *gimp,
+                    GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_HEAL,
+                GIMP_TYPE_SOURCE_OPTIONS,
+                "gimp-heal",
+                _("Healing"),
+                "gimp-tool-heal");
+}
+
+static void
+gimp_heal_class_init (GimpHealClass *klass)
+{
+  GimpPaintCoreClass  *paint_core_class  = GIMP_PAINT_CORE_CLASS (klass);
+  GimpSourceCoreClass *source_core_class = GIMP_SOURCE_CORE_CLASS (klass);
+
+  paint_core_class->start            = gimp_heal_start;
+  paint_core_class->get_paint_buffer = gimp_heal_get_paint_buffer;
+
+  source_core_class->motion          = gimp_heal_motion;
+}
+
+static void
+gimp_heal_init (GimpHeal *heal)
+{
+}
+
+static gboolean
+gimp_heal_start (GimpPaintCore     *paint_core,
+                 GimpDrawable      *drawable,
+                 GimpPaintOptions  *paint_options,
+                 const GimpCoords  *coords,
+                 GError           **error)
+{
+  GimpSourceCore *source_core = GIMP_SOURCE_CORE (paint_core);
+
+  if (! GIMP_PAINT_CORE_CLASS (parent_class)->start (paint_core, drawable,
+                                                     paint_options, coords,
+                                                     error))
+    {
+      return FALSE;
+    }
+
+  if (! source_core->set_source && gimp_drawable_is_indexed (drawable))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Healing does not operate on indexed layers."));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static GeglBuffer *
+gimp_heal_get_paint_buffer (GimpPaintCore    *core,
+                            GimpDrawable     *drawable,
+                            GimpPaintOptions *paint_options,
+                            GimpLayerMode     paint_mode,
+                            const GimpCoords *coords,
+                            gint             *paint_buffer_x,
+                            gint             *paint_buffer_y,
+                            gint             *paint_width,
+                            gint             *paint_height)
+{
+  return GIMP_PAINT_CORE_CLASS (parent_class)->get_paint_buffer (core,
+                                                                 drawable,
+                                                                 paint_options,
+                                                                 GIMP_LAYER_MODE_NORMAL,
+                                                                 coords,
+                                                                 paint_buffer_x,
+                                                                 paint_buffer_y,
+                                                                 paint_width,
+                                                                 paint_height);
+}
+
+/* Subtract bottom from top and store in result as a float
+ */
+static void
+gimp_heal_sub (GeglBuffer          *top_buffer,
+               const GeglRectangle *top_rect,
+               GeglBuffer          *bottom_buffer,
+               const GeglRectangle *bottom_rect,
+               GeglBuffer          *result_buffer,
+               const GeglRectangle *result_rect)
+{
+  GeglBufferIterator *iter;
+  const Babl         *format       = gegl_buffer_get_format (top_buffer);
+  gint                n_components = babl_format_get_n_components (format);
+
+  if (n_components == 2)
+    format = babl_format ("Y'A float");
+  else if (n_components == 4)
+    format = babl_format ("R'G'B'A float");
+  else
+    g_return_if_reached ();
+
+  iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0, format,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 3);
+
+  gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0, format,
+                            GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+
+  gegl_buffer_iterator_add (iter, result_buffer, result_rect, 0,
+                            babl_format_n (babl_type ("float"), n_components),
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      gfloat *t      = iter->items[0].data;
+      gfloat *b      = iter->items[1].data;
+      gfloat *r      = iter->items[2].data;
+      gint    length = iter->length * n_components;
+
+      while (length--)
+        *r++ = *t++ - *b++;
+    }
+}
+
+/* Add first to second and store in result
+ */
+static void
+gimp_heal_add (GeglBuffer          *first_buffer,
+               const GeglRectangle *first_rect,
+               GeglBuffer          *second_buffer,
+               const GeglRectangle *second_rect,
+               GeglBuffer          *result_buffer,
+               const GeglRectangle *result_rect)
+{
+  GeglBufferIterator *iter;
+  const Babl         *format       = gegl_buffer_get_format (result_buffer);
+  gint                n_components = babl_format_get_n_components (format);
+
+  if (n_components == 2)
+    format = babl_format ("Y'A float");
+  else if (n_components == 4)
+    format = babl_format ("R'G'B'A float");
+  else
+    g_return_if_reached ();
+
+  iter = gegl_buffer_iterator_new (first_buffer, first_rect, 0,
+                                   babl_format_n (babl_type ("float"),
+                                                  n_components),
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 3);
+
+  gegl_buffer_iterator_add (iter, second_buffer, second_rect, 0, format,
+                            GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+
+  gegl_buffer_iterator_add (iter, result_buffer, result_rect, 0, format,
+                            GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      gfloat *f      = iter->items[0].data;
+      gfloat *s      = iter->items[1].data;
+      gfloat *r      = iter->items[2].data;
+      gint    length = iter->length * n_components;
+
+      while (length--)
+        *r++ = *f++ + *s++;
+    }
+}
+
+#if defined(__SSE__) && defined(__GNUC__) && __GNUC__ >= 4
+static float
+gimp_heal_laplace_iteration_sse (gfloat *pixels,
+                                 gfloat *Adiag,
+                                 gint   *Aidx,
+                                 gfloat  w,
+                                 gint    nmask)
+{
+  typedef float v4sf __attribute__((vector_size(16)));
+  gint i;
+  v4sf wv  = { w, w, w, w };
+  v4sf err = { 0, 0, 0, 0 };
+  union { v4sf v; float f[4]; } erru;
+
+#define Xv(j) (*(v4sf*)&pixels[Aidx[i * 5 + j]])
+
+  for (i = 0; i < nmask; i++)
+    {
+      v4sf a    = { Adiag[i], Adiag[i], Adiag[i], Adiag[i] };
+      v4sf diff = a * Xv(0) - wv * (Xv(1) + Xv(2) + Xv(3) + Xv(4));
+
+      Xv(0) -= diff;
+      err += diff * diff;
+    }
+
+  erru.v = err;
+
+  return erru.f[0] + erru.f[1] + erru.f[2] + erru.f[3];
+}
+#endif
+
+/* Perform one iteration of Gauss-Seidel, and return the sum squared residual.
+ */
+static float
+gimp_heal_laplace_iteration (gfloat *pixels,
+                             gfloat *Adiag,
+                             gint   *Aidx,
+                             gfloat  w,
+                             gint    nmask,
+                             gint    depth)
+{
+  gint   i, k;
+  gfloat err = 0;
+
+#if defined(__SSE__) && defined(__GNUC__) && __GNUC__ >= 4
+  if (depth == 4)
+    return gimp_heal_laplace_iteration_sse (pixels, Adiag, Aidx, w, nmask);
+#endif
+
+  for (i = 0; i < nmask; i++)
+    {
+      gint   j0 = Aidx[i * 5 + 0];
+      gint   j1 = Aidx[i * 5 + 1];
+      gint   j2 = Aidx[i * 5 + 2];
+      gint   j3 = Aidx[i * 5 + 3];
+      gint   j4 = Aidx[i * 5 + 4];
+      gfloat a  = Adiag[i];
+
+      for (k = 0; k < depth; k++)
+        {
+          gfloat diff = (a * pixels[j0 + k] -
+                         w * (pixels[j1 + k] +
+                              pixels[j2 + k] +
+                              pixels[j3 + k] +
+                              pixels[j4 + k]));
+
+          pixels[j0 + k] -= diff;
+          err += diff * diff;
+        }
+    }
+
+  return err;
+}
+
+/* Solve the laplace equation for pixels and store the result in-place.
+ */
+static void
+gimp_heal_laplace_loop (gfloat *pixels,
+                        gint    height,
+                        gint    depth,
+                        gint    width,
+                        guchar *mask)
+{
+  /* Tolerate a total deviation-from-smoothness of 0.1 LSBs at 8bit depth. */
+#define EPSILON  (0.1/255)
+#define MAX_ITER 500
+
+  gint    i, j, iter, parity, nmask, zero;
+  gfloat *Adiag;
+  gint   *Aidx;
+  gfloat  w;
+
+  Adiag = g_new (gfloat, width * height);
+  Aidx  = g_new (gint, 5 * width * height);
+
+  /* All off-diagonal elements of A are either -1 or 0. We could store it as a
+   * general-purpose sparse matrix, but that adds some unnecessary overhead to
+   * the inner loop. Instead, assume exactly 4 off-diagonal elements in each
+   * row, all of which have value -1. Any row that in fact wants less than 4
+   * coefs can put them in a dummy column to be multiplied by an empty pixel.
+   */
+  zero = depth * width * height;
+  memset (pixels + zero, 0, depth * sizeof (gfloat));
+
+  /* Construct the system of equations.
+   * Arrange Aidx in checkerboard order, so that a single linear pass over that
+   * array results updating all of the red cells and then all of the black cells.
+   */
+  nmask = 0;
+  for (parity = 0; parity < 2; parity++)
+    for (i = 0; i < height; i++)
+      for (j = (i&1)^parity; j < width; j+=2)
+        if (mask[j + i * width])
+          {
+#define A_NEIGHBOR(o,di,dj) \
+            if ((dj<0 && j==0) || (dj>0 && j==width-1) || (di<0 && i==0) || (di>0 && i==height-1)) \
+              Aidx[o + nmask * 5] = zero; \
+            else                                               \
+              Aidx[o + nmask * 5] = ((i + di) * width + (j + dj)) * depth;
+
+            /* Omit Dirichlet conditions for any neighbors off the
+             * edge of the canvas.
+             */
+            Adiag[nmask] = 4 - (i==0) - (j==0) - (i==height-1) - (j==width-1);
+            A_NEIGHBOR (0,  0,  0);
+            A_NEIGHBOR (1,  0,  1);
+            A_NEIGHBOR (2,  1,  0);
+            A_NEIGHBOR (3,  0, -1);
+            A_NEIGHBOR (4, -1,  0);
+            nmask++;
+          }
+
+  /* Empirically optimal over-relaxation factor. (Benchmarked on
+   * round brushes, at least. I don't know whether aspect ratio
+   * affects it.)
+   */
+  w = 2.0 - 1.0 / (0.1575 * sqrt (nmask) + 0.8);
+  w *= 0.25;
+  for (i = 0; i < nmask; i++)
+    Adiag[i] *= w;
+
+  /* Gauss-Seidel with successive over-relaxation */
+  for (iter = 0; iter < MAX_ITER; iter++)
+    {
+      gfloat err = gimp_heal_laplace_iteration (pixels, Adiag, Aidx,
+                                                w, nmask, depth);
+      if (err < EPSILON * EPSILON * w * w)
+        break;
+    }
+
+  g_free (Adiag);
+  g_free (Aidx);
+}
+
+/* Original Algorithm Design:
+ *
+ * T. Georgiev, "Photoshop Healing Brush: a Tool for Seamless Cloning
+ * http://www.tgeorgiev.net/Photoshop_Healing.pdf
+ */
+static void
+gimp_heal (GeglBuffer          *src_buffer,
+           const GeglRectangle *src_rect,
+           GeglBuffer          *dest_buffer,
+           const GeglRectangle *dest_rect,
+           GeglBuffer          *mask_buffer,
+           const GeglRectangle *mask_rect)
+{
+  const Babl *src_format;
+  const Babl *dest_format;
+  gint        src_components;
+  gint        dest_components;
+  gint        width;
+  gint        height;
+  gfloat     *diff, *diff_alloc;
+  GeglBuffer *diff_buffer;
+  guchar     *mask;
+
+  src_format  = gegl_buffer_get_format (src_buffer);
+  dest_format = gegl_buffer_get_format (dest_buffer);
+
+  src_components  = babl_format_get_n_components (src_format);
+  dest_components = babl_format_get_n_components (dest_format);
+
+  width  = gegl_buffer_get_width  (src_buffer);
+  height = gegl_buffer_get_height (src_buffer);
+
+  g_return_if_fail (src_components == dest_components);
+
+  diff_alloc = g_new (gfloat, 4 + (width * height + 1) * src_components);
+  diff = (gfloat*)(((uintptr_t)diff_alloc + 15) & ~15);
+
+  diff_buffer =
+    gegl_buffer_linear_new_from_data (diff,
+                                      babl_format_n (babl_type ("float"),
+                                                     src_components),
+                                      GEGL_RECTANGLE (0, 0, width, height),
+                                      GEGL_AUTO_ROWSTRIDE,
+                                      (GDestroyNotify) g_free, diff_alloc);
+
+  /* subtract pattern from image and store the result as a float in diff */
+  gimp_heal_sub (dest_buffer, dest_rect,
+                 src_buffer, src_rect,
+                 diff_buffer, GEGL_RECTANGLE (0, 0, width, height));
+
+  mask = g_new (guchar, mask_rect->width * mask_rect->height);
+
+  gegl_buffer_get (mask_buffer, mask_rect, 1.0, babl_format ("Y u8"),
+                   mask, GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  gimp_heal_laplace_loop (diff, height, src_components, width, mask);
+
+  g_free (mask);
+
+  /* add solution to original image and store in dest */
+  gimp_heal_add (diff_buffer, GEGL_RECTANGLE (0, 0, width, height),
+                 src_buffer, src_rect,
+                 dest_buffer, dest_rect);
+
+  g_object_unref (diff_buffer);
+}
+
+static void
+gimp_heal_motion (GimpSourceCore   *source_core,
+                  GimpDrawable     *drawable,
+                  GimpPaintOptions *paint_options,
+                  const GimpCoords *coords,
+                  GeglNode         *op,
+                  gdouble           opacity,
+                  GimpPickable     *src_pickable,
+                  GeglBuffer       *src_buffer,
+                  GeglRectangle    *src_rect,
+                  gint              src_offset_x,
+                  gint              src_offset_y,
+                  GeglBuffer       *paint_buffer,
+                  gint              paint_buffer_x,
+                  gint              paint_buffer_y,
+                  gint              paint_area_offset_x,
+                  gint              paint_area_offset_y,
+                  gint              paint_area_width,
+                  gint              paint_area_height)
+{
+  GimpPaintCore     *paint_core  = GIMP_PAINT_CORE (source_core);
+  GimpContext       *context     = GIMP_CONTEXT (paint_options);
+  GimpSourceOptions *src_options = GIMP_SOURCE_OPTIONS (paint_options);
+  GimpDynamics      *dynamics    = GIMP_BRUSH_CORE (paint_core)->dynamics;
+  GimpImage         *image       = gimp_item_get_image (GIMP_ITEM (drawable));
+  GeglBuffer        *src_copy;
+  GeglBuffer        *mask_buffer;
+  GimpPickable      *dest_pickable;
+  const GimpTempBuf *mask_buf;
+  gdouble            fade_point;
+  gdouble            force;
+  gint               mask_off_x;
+  gint               mask_off_y;
+  gint               dest_pickable_off_x;
+  gint               dest_pickable_off_y;
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_FORCE))
+    force = gimp_dynamics_get_linear_value (dynamics,
+                                            GIMP_DYNAMICS_OUTPUT_FORCE,
+                                            coords,
+                                            paint_options,
+                                            fade_point);
+  else
+    force = paint_options->brush_force;
+
+  mask_buf = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (source_core),
+                                             coords,
+                                             GIMP_BRUSH_HARD,
+                                             force);
+
+  if (! mask_buf)
+    return;
+
+  /* check that all buffers are of the same size */
+  if (src_rect->width  != gegl_buffer_get_width  (paint_buffer) ||
+      src_rect->height != gegl_buffer_get_height (paint_buffer))
+    {
+      /* this generally means that the source point has hit the edge
+       * of the layer, so it is not an error and we should not
+       * complain, just don't do anything
+       */
+      return;
+    }
+
+  /*  heal should work in perceptual space, use R'G'B' instead of RGB  */
+  src_copy = gegl_buffer_new (GEGL_RECTANGLE (paint_area_offset_x,
+                                              paint_area_offset_y,
+                                              src_rect->width,
+                                              src_rect->height),
+                              babl_format ("R'G'B'A float"));
+
+  if (! op)
+    {
+      gimp_gegl_buffer_copy (src_buffer, src_rect, GEGL_ABYSS_NONE,
+                             src_copy, gegl_buffer_get_extent (src_copy));
+    }
+  else
+    {
+      gimp_gegl_apply_operation (src_buffer, NULL, NULL, op,
+                                 src_copy, gegl_buffer_get_extent (src_copy),
+                                 FALSE);
+    }
+
+  if (src_options->sample_merged)
+    {
+      dest_pickable = GIMP_PICKABLE (image);
+
+      gimp_item_get_offset (GIMP_ITEM (drawable),
+                            &dest_pickable_off_x,
+                            &dest_pickable_off_y);
+    }
+  else
+    {
+      dest_pickable = GIMP_PICKABLE (drawable);
+
+      dest_pickable_off_x = 0;
+      dest_pickable_off_y = 0;
+    }
+
+  gimp_gegl_buffer_copy (gimp_pickable_get_buffer (dest_pickable),
+                         GEGL_RECTANGLE (paint_buffer_x + dest_pickable_off_x,
+                                         paint_buffer_y + dest_pickable_off_y,
+                                         gegl_buffer_get_width  (paint_buffer),
+                                         gegl_buffer_get_height (paint_buffer)),
+                         GEGL_ABYSS_NONE,
+                         paint_buffer,
+                         GEGL_RECTANGLE (paint_area_offset_x,
+                                         paint_area_offset_y,
+                                         paint_area_width,
+                                         paint_area_height));
+
+  mask_buffer = gimp_temp_buf_create_buffer ((GimpTempBuf *) mask_buf);
+
+  /* find the offset of the brush mask's rect */
+  {
+    gint x = (gint) floor (coords->x) - (gegl_buffer_get_width  (mask_buffer) >> 1);
+    gint y = (gint) floor (coords->y) - (gegl_buffer_get_height (mask_buffer) >> 1);
+
+    mask_off_x = (x < 0) ? -x : 0;
+    mask_off_y = (y < 0) ? -y : 0;
+  }
+
+  gimp_heal (src_copy, gegl_buffer_get_extent (src_copy),
+             paint_buffer,
+             GEGL_RECTANGLE (paint_area_offset_x,
+                             paint_area_offset_y,
+                             paint_area_width,
+                             paint_area_height),
+             mask_buffer,
+             GEGL_RECTANGLE (mask_off_x, mask_off_y,
+                             paint_area_width,
+                             paint_area_height));
+
+  g_object_unref (src_copy);
+  g_object_unref (mask_buffer);
+
+  /* replace the canvas with our healed data */
+  gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
+                                  coords,
+                                  MIN (opacity, GIMP_OPACITY_OPAQUE),
+                                  gimp_context_get_opacity (context),
+                                  gimp_paint_options_get_brush_mode (paint_options),
+                                  force,
+                                  GIMP_PAINT_INCREMENTAL);
+}
diff --git a/app/paint/gimpheal.h b/app/paint/gimpheal.h
new file mode 100644
index 0000000..780609d
--- /dev/null
+++ b/app/paint/gimpheal.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HEAL_H__
+#define __GIMP_HEAL_H__
+
+
+#include "gimpsourcecore.h"
+
+
+#define GIMP_TYPE_HEAL            (gimp_heal_get_type ())
+#define GIMP_HEAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HEAL, GimpHeal))
+#define GIMP_HEAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HEAL, GimpHealClass))
+#define GIMP_IS_HEAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HEAL))
+#define GIMP_IS_HEAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HEAL))
+#define GIMP_HEAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HEAL, GimpHealClass))
+
+
+typedef struct _GimpHealClass GimpHealClass;
+
+struct _GimpHeal
+{
+  GimpSourceCore  parent_instance;
+};
+
+struct _GimpHealClass
+{
+  GimpSourceCoreClass  parent_class;
+};
+
+
+void    gimp_heal_register (Gimp                      *gimp,
+                            GimpPaintRegisterCallback  callback);
+
+GType   gimp_heal_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_HEAL_H__  */
diff --git a/app/paint/gimpink-blob.c b/app/paint/gimpink-blob.c
new file mode 100644
index 0000000..68a135a
--- /dev/null
+++ b/app/paint/gimpink-blob.c
@@ -0,0 +1,875 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpink-blob.c: routines for manipulating scan converted convex polygons.
+ * Copyright 1998-1999, Owen Taylor <otaylor@gtk.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "gimpink-blob.h"
+
+
+typedef enum
+{
+  EDGE_NONE  = 0,
+  EDGE_LEFT  = 1 << 0,
+  EDGE_RIGHT = 1 << 1
+} EdgeType;
+
+
+/*  local function prototypes  */
+
+static GimpBlob * gimp_blob_new            (gint      y,
+                                            gint      height);
+static void       gimp_blob_fill           (GimpBlob *b,
+                                            EdgeType *present);
+static void       gimp_blob_make_convex    (GimpBlob *b,
+                                            EdgeType *present);
+
+#if 0
+static void       gimp_blob_line_add_pixel (GimpBlob *b,
+                                            gint      x,
+                                            gint      y);
+static void       gimp_blob_line           (GimpBlob *b,
+                                            gint      x0,
+                                            gint      y0,
+                                            gint      x1,
+                                            gint      y1);
+#endif
+
+
+/*  public functions  */
+
+/* Return blob for the given (convex) polygon
+ */
+GimpBlob *
+gimp_blob_polygon (GimpBlobPoint *points,
+                   gint           n_points)
+{
+  GimpBlob *result;
+  EdgeType *present;
+  gint      i;
+  gint      im1;
+  gint      ip1;
+  gint      ymin, ymax;
+
+  ymax = points[0].y;
+  ymin = points[0].y;
+
+  for (i = 1; i < n_points; i++)
+    {
+      if (points[i].y > ymax)
+        ymax = points[i].y;
+      if (points[i].y < ymin)
+        ymin = points[i].y;
+    }
+
+  result = gimp_blob_new (ymin, ymax - ymin + 1);
+  present = g_new0 (EdgeType, result->height);
+
+  im1 = n_points - 1;
+  i = 0;
+  ip1 = 1;
+
+  for (; i < n_points ; i++)
+    {
+      gint sides = 0;
+      gint j     = points[i].y - ymin;
+
+      if (points[i].y < points[im1].y)
+        sides |= EDGE_RIGHT;
+      else if (points[i].y > points[im1].y)
+        sides |= EDGE_LEFT;
+
+      if (points[ip1].y < points[i].y)
+        sides |= EDGE_RIGHT;
+      else if (points[ip1].y > points[i].y)
+        sides |= EDGE_LEFT;
+
+      if (sides & EDGE_RIGHT)
+        {
+          if (present[j] & EDGE_RIGHT)
+            {
+              result->data[j].right = MAX (result->data[j].right, points[i].x);
+            }
+          else
+            {
+              present[j] |= EDGE_RIGHT;
+              result->data[j].right = points[i].x;
+            }
+        }
+
+      if (sides & EDGE_LEFT)
+        {
+          if (present[j] & EDGE_LEFT)
+            {
+              result->data[j].left = MIN (result->data[j].left, points[i].x);
+            }
+          else
+            {
+              present[j] |= EDGE_LEFT;
+              result->data[j].left = points[i].x;
+            }
+        }
+
+      im1 = i;
+      ip1++;
+      if (ip1 == n_points)
+        ip1 = 0;
+    }
+
+  gimp_blob_fill (result, present);
+  g_free (present);
+
+  return result;
+}
+
+/* Scan convert a square specified by _offsets_ of major and minor
+ * axes, and by center into a blob
+ */
+GimpBlob *
+gimp_blob_square (gdouble xc,
+                  gdouble yc,
+                  gdouble xp,
+                  gdouble yp,
+                  gdouble xq,
+                  gdouble yq)
+{
+  GimpBlobPoint points[4];
+
+  /* Make sure we order points ccw */
+
+  if (xp * yq - xq * yp < 0)
+    {
+      xq = -xq;
+      yq = -yq;
+    }
+
+  points[0].x = xc + xp + xq;
+  points[0].y = yc + yp + yq;
+  points[1].x = xc + xp - xq;
+  points[1].y = yc + yp - yq;
+  points[2].x = xc - xp - xq;
+  points[2].y = yc - yp - yq;
+  points[3].x = xc - xp + xq;
+  points[3].y = yc - yp + yq;
+
+  return gimp_blob_polygon (points, 4);
+}
+
+/* Scan convert a diamond specified by _offsets_ of major and minor
+ * axes, and by center into a blob
+ */
+GimpBlob *
+gimp_blob_diamond (gdouble xc,
+                   gdouble yc,
+                   gdouble xp,
+                   gdouble yp,
+                   gdouble xq,
+                   gdouble yq)
+{
+  GimpBlobPoint points[4];
+
+  /* Make sure we order points ccw */
+
+  if (xp * yq - xq * yp < 0)
+    {
+      xq = -xq;
+      yq = -yq;
+    }
+
+  points[0].x = xc + xp;
+  points[0].y = yc + yp;
+  points[1].x = xc - xq;
+  points[1].y = yc - yq;
+  points[2].x = xc - xp;
+  points[2].y = yc - yp;
+  points[3].x = xc + xq;
+  points[3].y = yc + yq;
+
+  return gimp_blob_polygon (points, 4);
+}
+
+
+#define TABLE_SIZE 256
+
+#define ELLIPSE_SHIFT 2
+#define TABLE_SHIFT   12
+#define TOTAL_SHIFT   (ELLIPSE_SHIFT + TABLE_SHIFT)
+
+/*
+ * The choose of this values limits the maximal image_size to
+ * 16384 x 16384 pixels. The values will overflow as soon as
+ * x or y > INT_MAX / (1 << (ELLIPSE_SHIFT + TABLE_SHIFT)) / SUBSAMPLE
+ *
+ * Alternatively the code could be change the code as follows:
+ *
+ *   xc_base = floor (xc)
+ *   xc_shift = 0.5 + (xc - xc_base) * (1 << TOTAL_SHIFT);
+ *
+ *    gint x = xc_base + (xc_shift + c * xp_shift + s * xq_shift +
+ *             (1 << (TOTAL_SHIFT - 1))) >> TOTAL_SHIFT;
+ *
+ * which would change the limit from the image to the ellipse size
+ *
+ * Update: this change was done, and now there apparently is a limit
+ * on the ellipse size. I'm too lazy to fully understand what's going
+ * on here and simply leave this comment here for
+ * documentation. --Mitch
+ */
+
+static gboolean trig_initialized = FALSE;
+static gint     trig_table[TABLE_SIZE];
+
+/* Scan convert an ellipse specified by _offsets_ of major and
+ * minor axes, and by center into a blob
+ */
+GimpBlob *
+gimp_blob_ellipse (gdouble xc,
+                   gdouble yc,
+                   gdouble xp,
+                   gdouble yp,
+                   gdouble xq,
+                   gdouble yq)
+{
+  GimpBlob *result;
+  EdgeType *present;
+  gint      i;
+  gdouble   r1, r2;
+  gint      maxy, miny;
+  gint      step;
+  gdouble   max_radius;
+
+  gint      xc_shift, yc_shift;
+  gint      xp_shift, yp_shift;
+  gint      xq_shift, yq_shift;
+  gint      xc_base, yc_base;
+
+  if (! trig_initialized)
+    {
+      trig_initialized = TRUE;
+
+      for (i = 0; i < 256; i++)
+        trig_table[i] = 0.5 + sin (i * (G_PI / 128.0)) * (1 << TABLE_SHIFT);
+    }
+
+  /* Make sure we traverse ellipse in ccw direction */
+
+  if (xp * yq - xq * yp < 0)
+    {
+      xq = -xq;
+      yq = -yq;
+    }
+
+  /* Compute bounds as if we were drawing a rectangle */
+
+  maxy = ceil  (yc + fabs (yp) + fabs (yq));
+  miny = floor (yc - fabs (yp) - fabs (yq));
+
+  result = gimp_blob_new (miny, maxy - miny + 1);
+  present = g_new0 (EdgeType, result->height);
+
+  xc_base = floor (xc);
+  yc_base = floor (yc);
+
+  /* Figure out a step that will draw most of the points */
+
+  r1 = sqrt (xp * xp + yp * yp);
+  r2 = sqrt (xq * xq + yq * yq);
+  max_radius = MAX (r1, r2);
+  step = TABLE_SIZE;
+
+  while (step > 1 && (TABLE_SIZE / step < 4 * max_radius))
+    step >>= 1;
+
+  /* Fill in the edge points */
+
+  xc_shift = 0.5 + (xc - xc_base) * (1 << TOTAL_SHIFT);
+  yc_shift = 0.5 + (yc - yc_base) * (1 << TOTAL_SHIFT);
+  xp_shift = 0.5 + xp * (1 << ELLIPSE_SHIFT);
+  yp_shift = 0.5 + yp * (1 << ELLIPSE_SHIFT);
+  xq_shift = 0.5 + xq * (1 << ELLIPSE_SHIFT);
+  yq_shift = 0.5 + yq * (1 << ELLIPSE_SHIFT);
+
+  for (i = 0 ; i < TABLE_SIZE ; i += step)
+    {
+      gint s = trig_table[i];
+      gint c = trig_table[(TABLE_SIZE + TABLE_SIZE / 4 - i) % TABLE_SIZE];
+
+      gint x = ((xc_shift + c * xp_shift + s * xq_shift +
+                 (1 << (TOTAL_SHIFT - 1))) >> TOTAL_SHIFT) + xc_base;
+      gint y = (((yc_shift + c * yp_shift + s * yq_shift +
+                 (1 << (TOTAL_SHIFT - 1))) >> TOTAL_SHIFT)) + yc_base
+                  - result->y;
+
+      gint dydi = c * yq_shift  - s * yp_shift;
+
+      if (dydi <= 0) /* left edge */
+        {
+          if (present[y] & EDGE_LEFT)
+            {
+              result->data[y].left = MIN (result->data[y].left, x);
+            }
+          else
+            {
+              present[y] |= EDGE_LEFT;
+              result->data[y].left = x;
+            }
+        }
+
+      if (dydi >= 0) /* right edge */
+        {
+          if (present[y] & EDGE_RIGHT)
+            {
+              result->data[y].right = MAX (result->data[y].right, x);
+            }
+          else
+            {
+              present[y] |= EDGE_RIGHT;
+              result->data[y].right = x;
+            }
+        }
+    }
+
+  /* Now fill in missing points */
+
+  gimp_blob_fill (result, present);
+  g_free (present);
+
+  return result;
+}
+
+void
+gimp_blob_bounds (GimpBlob *b,
+                  gint     *x,
+                  gint     *y,
+                  gint     *width,
+                  gint     *height)
+{
+  gint i;
+  gint x0, x1, y0, y1;
+
+  i = 0;
+  while (i < b->height && b->data[i].left > b->data[i].right)
+    i++;
+
+  if (i < b->height)
+    {
+      y0 = b->y + i;
+      x0 = b->data[i].left;
+      x1 = b->data[i].right + 1;
+
+      while (i < b->height && b->data[i].left <= b->data[i].right)
+        {
+          x0 = MIN (b->data[i].left,      x0);
+          x1 = MAX (b->data[i].right + 1, x1);
+          i++;
+        }
+
+      y1 = b->y + i;
+    }
+  else
+    {
+      x0 = y0 = 0;
+      x1 = y1 = 0;
+    }
+
+  *x = x0;
+  *y = y0;
+  *width = x1 - x0;
+  *height = y1 - y0;
+}
+
+GimpBlob *
+gimp_blob_convex_union (GimpBlob *b1,
+                        GimpBlob *b2)
+{
+  GimpBlob *result;
+  gint      y;
+  gint      i, j;
+  EdgeType *present;
+
+  /* Create the storage for the result */
+
+  y = MIN (b1->y, b2->y);
+  result = gimp_blob_new (y, MAX (b1->y + b1->height, b2->y + b2->height)-y);
+
+  if (result->height == 0)
+    return result;
+
+  present = g_new0 (EdgeType, result->height);
+
+  /* Initialize spans from original objects */
+
+  for (i = 0, j = b1->y-y; i < b1->height; i++, j++)
+    {
+      if (b1->data[i].right >= b1->data[i].left)
+        {
+          present[j] = EDGE_LEFT | EDGE_RIGHT;
+          result->data[j].left  = b1->data[i].left;
+          result->data[j].right = b1->data[i].right;
+        }
+    }
+
+  for (i = 0, j = b2->y - y; i < b2->height; i++, j++)
+    {
+      if (b2->data[i].right >= b2->data[i].left)
+        {
+          if (present[j])
+            {
+              if (result->data[j].left > b2->data[i].left)
+                result->data[j].left = b2->data[i].left;
+              if (result->data[j].right < b2->data[i].right)
+                result->data[j].right = b2->data[i].right;
+            }
+          else
+            {
+              present[j] = EDGE_LEFT | EDGE_RIGHT;
+              result->data[j].left = b2->data[i].left;
+              result->data[j].right = b2->data[i].right;
+            }
+        }
+    }
+
+  gimp_blob_make_convex (result, present);
+
+  g_free (present);
+
+  return result;
+}
+
+GimpBlob *
+gimp_blob_duplicate (GimpBlob *b)
+{
+  g_return_val_if_fail (b != NULL, NULL);
+
+  return g_memdup (b, sizeof (GimpBlob) +  sizeof (GimpBlobSpan) * (b->height - 1));
+}
+
+#if 0
+void
+gimp_blob_dump (GimpBlob *b)
+{
+  gint i,j;
+
+  for (i = 0; i < b->height; i++)
+    {
+      for (j = 0; j < b->data[i].left; j++)
+        putchar (' ');
+
+      for (j = b->data[i].left; j <= b->data[i].right; j++)
+        putchar ('*');
+
+      putchar ('\n');
+    }
+}
+#endif
+
+
+/*  private functions  */
+
+static GimpBlob *
+gimp_blob_new (gint y,
+               gint height)
+{
+  GimpBlob *result;
+
+  result = g_malloc (sizeof (GimpBlob) +  sizeof (GimpBlobSpan) * (height - 1));
+
+  result->y      = y;
+  result->height = height;
+
+  return result;
+}
+
+static void
+gimp_blob_fill (GimpBlob *b,
+                EdgeType *present)
+{
+  gint start;
+  gint x1, x2, i1, i2;
+  gint i;
+
+  /* Mark empty lines at top and bottom as unused */
+
+  start = 0;
+  while (! present[start])
+    {
+      b->data[start].left  = 0;
+      b->data[start].right = -1;
+      start++;
+    }
+
+  if (present[start] != (EDGE_RIGHT | EDGE_LEFT))
+    {
+      if (present[start] == EDGE_RIGHT)
+        b->data[start].left = b->data[start].right;
+      else
+        b->data[start].right = b->data[start].left;
+
+      present[start] = EDGE_RIGHT | EDGE_LEFT;
+    }
+
+  for (i = b->height - 1; ! present[i]; i--)
+    {
+      b->data[i].left  = 0;
+      b->data[i].right = -1;
+    }
+
+  if (present[i] != (EDGE_RIGHT | EDGE_LEFT))
+    {
+      if (present[i] == EDGE_RIGHT)
+        b->data[i].left = b->data[i].right;
+      else
+        b->data[i].right = b->data[i].left;
+
+      present[i] = EDGE_RIGHT | EDGE_LEFT;
+    }
+
+
+  /* Restore missing edges  */
+
+  /* We fill only interior regions of convex hull, as if we were
+   * filling polygons. But since we draw ellipses with nearest points,
+   * not interior points, maybe it would look better if we did the
+   * same here. Probably not a big deal either way after anti-aliasing
+   */
+
+  /* left edge */
+  for (i1 = start; i1 < b->height - 2; i1++)
+    {
+      /* Find empty gaps */
+      if (! (present[i1 + 1] & EDGE_LEFT))
+        {
+          gint increment; /* fractional part */
+          gint denom;     /* denominator of fraction */
+          gint step;      /* integral step */
+          gint frac;      /* fractional step */
+          gint reverse;
+
+          /* find bottom of gap */
+          i2 = i1 + 2;
+          while (i2 < b->height && ! (present[i2] & EDGE_LEFT))
+            i2++;
+
+          if (i2 < b->height)
+            {
+              denom = i2 - i1;
+              x1 = b->data[i1].left;
+              x2 = b->data[i2].left;
+              step = (x2 - x1) / denom;
+              frac = x2 - x1 - step * denom;
+              if (frac < 0)
+                {
+                  frac = -frac;
+                  reverse = 1;
+                }
+              else
+                reverse = 0;
+
+              increment = 0;
+              for (i = i1 + 1; i < i2; i++)
+                {
+                  x1 += step;
+                  increment += frac;
+                  if (increment >= denom)
+                    {
+                      increment -= denom;
+                      x1 += reverse ? -1 : 1;
+                    }
+                  if (increment == 0 || reverse)
+                    b->data[i].left = x1;
+                  else
+                    b->data[i].left = x1 + 1;
+                }
+            }
+
+          i1 = i2 - 1;        /* advance to next possibility */
+        }
+    }
+
+  /* right edge */
+  for (i1 = start; i1 < b->height - 2; i1++)
+    {
+      /* Find empty gaps */
+      if (! (present[i1 + 1] & EDGE_RIGHT))
+        {
+          gint increment; /* fractional part */
+          gint denom;     /* denominator of fraction */
+          gint step;      /* integral step */
+          gint frac;      /* fractional step */
+          gint reverse;
+
+          /* find bottom of gap */
+          i2 = i1 + 2;
+          while (i2 < b->height && ! (present[i2] & EDGE_RIGHT))
+            i2++;
+
+          if (i2 < b->height)
+            {
+              denom = i2 - i1;
+              x1 = b->data[i1].right;
+              x2 = b->data[i2].right;
+              step = (x2 - x1) / denom;
+              frac = x2 - x1 - step * denom;
+              if (frac < 0)
+                {
+                  frac = -frac;
+                  reverse = 1;
+                }
+              else
+                reverse = 0;
+
+              increment = 0;
+              for (i = i1 + 1; i<i2; i++)
+                {
+                  x1 += step;
+                  increment += frac;
+                  if (increment >= denom)
+                    {
+                      increment -= denom;
+                      x1 += reverse ? -1 : 1;
+                    }
+                  if (reverse && increment != 0)
+                    b->data[i].right = x1 - 1;
+                  else
+                    b->data[i].right = x1;
+                }
+            }
+
+          i1 = i2 - 1;        /* advance to next possibility */
+        }
+    }
+
+}
+
+static void
+gimp_blob_make_convex (GimpBlob *b,
+                       EdgeType *present)
+{
+  gint x1, x2, y1, y2, i1, i2;
+  gint i;
+  gint start;
+
+  /* Walk through edges, deleting points that aren't on convex hull */
+
+  start = 0;
+  while (! present[start])
+    start++;
+
+  /*    left edge */
+
+  i1 = start - 1;
+  i2 = start;
+  x1 = b->data[start].left - b->data[start].right;
+  y1 = 0;
+
+  for (i = start + 1; i < b->height; i++)
+    {
+      if (! (present[i] & EDGE_LEFT))
+        continue;
+
+      x2 = b->data[i].left - b->data[i2].left;
+      y2 = i - i2;
+
+      while (x2 * y1 - x1 * y2 < 0) /* clockwise rotation */
+        {
+          present[i2] &= ~EDGE_LEFT;
+          i2 = i1;
+          while ((--i1) >= start && (! (present[i1] & EDGE_LEFT)));
+
+          if (i1 < start)
+            {
+              x1 = b->data[start].left - b->data[start].right;
+              y1 = 0;
+            }
+          else
+            {
+              x1 = b->data[i2].left - b->data[i1].left;
+              y1 = i2 - i1;
+            }
+          x2 = b->data[i].left - b->data[i2].left;
+          y2 = i - i2;
+        }
+
+      x1 = x2;
+      y1 = y2;
+      i1 = i2;
+      i2 = i;
+    }
+
+  /*     Right edge */
+
+  i1 = start -1;
+  i2 = start;
+  x1 = b->data[start].right - b->data[start].left;
+  y1 = 0;
+
+  for (i = start + 1; i < b->height; i++)
+    {
+      if (! (present[i] & EDGE_RIGHT))
+        continue;
+
+      x2 = b->data[i].right - b->data[i2].right;
+      y2 = i - i2;
+
+      while (x2 * y1 - x1 * y2 > 0) /* counter-clockwise rotation */
+        {
+          present[i2] &= ~EDGE_RIGHT;
+          i2 = i1;
+          while ((--i1) >= start && (! (present[i1] & EDGE_RIGHT)));
+
+          if (i1 < start)
+            {
+              x1 = b->data[start].right - b->data[start].left;
+              y1 = 0;
+            }
+          else
+            {
+              x1 = b->data[i2].right - b->data[i1].right;
+              y1 = i2 - i1;
+            }
+
+          x2 = b->data[i].right - b->data[i2].right;
+          y2 = i - i2;
+        }
+
+      x1 = x2;
+      y1 = y2;
+      i1 = i2;
+      i2 = i;
+    }
+
+  gimp_blob_fill (b, present);
+}
+
+
+#if 0
+
+static void
+gimp_blob_line_add_pixel (GimpBlob *b,
+                          gint      x,
+                          gint      y)
+{
+  if (b->data[y - b->y].left > b->data[y - b->y].right)
+    {
+      b->data[y - b->y].left = b->data[y - b->y].right = x;
+    }
+  else
+    {
+      b->data[y - b->y].left  = MIN (b->data[y - b->y].left,  x);
+      b->data[y - b->y].right = MAX (b->data[y - b->y].right, x);
+    }
+}
+
+static void
+gimp_blob_line (GimpBlob *b,
+                gint      x0,
+                gint      y0,
+                gint      x1,
+                gint      y1)
+{
+  gint dx, dy, d;
+  gint incrE, incrNE;
+  gint x, y;
+
+  gint xstep = 1;
+  gint ystep = 1;
+
+  dx = x1 - x0;
+  dy = y1 - y0;
+
+  if (dx < 0)
+    {
+      dx = -dx;
+      xstep = -1;
+    }
+
+  if (dy < 0)
+    {
+      dy = -dy;
+      ystep = -1;
+    }
+
+  /*  for (y = y0; y != y1 + ystep ; y += ystep)
+    {
+      b->data[y-b->y].left = 0;
+      b->data[y-b->y].right = -1;
+      }*/
+
+  x = x0;
+  y = y0;
+
+  if (dy < dx)
+    {
+      d = 2 * dy - dx;        /* initial value of d */
+      incrE  = 2 * dy;        /* increment used for move to E */
+      incrNE = 2 * (dy - dx); /* increment used for move to NE */
+
+      gimp_blob_line_add_pixel (b, x, y);
+
+      while (x != x1)
+        {
+          if (d <= 0)
+            {
+              d += incrE;
+              x += xstep;
+            }
+          else
+            {
+              d += incrNE;
+              x += xstep;
+              y += ystep;
+            }
+
+          gimp_blob_line_add_pixel (b, x, y);
+        }
+    }
+  else
+    {
+      d = 2 * dx - dy;        /* initial value of d */
+      incrE  = 2 * dx;        /* increment used for move to E */
+      incrNE = 2 * (dx - dy); /* increment used for move to NE */
+
+      gimp_blob_line_add_pixel (b, x, y);
+
+      while (y != y1)
+        {
+          if (d <= 0)
+            {
+              d += incrE;
+              y += ystep;
+            }
+          else
+            {
+              d += incrNE;
+              x += xstep;
+              y += ystep;
+            }
+
+          gimp_blob_line_add_pixel (b, x, y);
+        }
+    }
+}
+
+#endif
diff --git a/app/paint/gimpink-blob.h b/app/paint/gimpink-blob.h
new file mode 100644
index 0000000..2ddbf76
--- /dev/null
+++ b/app/paint/gimpink-blob.h
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpink-blob.h: routines for manipulating scan converted convex polygons.
+ * Copyright 1998, Owen Taylor <otaylor@gtk.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+*/
+
+#ifndef __GIMP_INK_BLOB_H__
+#define __GIMP_INK_BLOB_H__
+
+
+typedef struct _GimpBlobPoint GimpBlobPoint;
+typedef struct _GimpBlobSpan  GimpBlobSpan;
+typedef struct _GimpBlob      GimpBlob;
+
+typedef GimpBlob * (* GimpBlobFunc) (gdouble xc,
+                                     gdouble yc,
+                                     gdouble xp,
+                                     gdouble yp,
+                                     gdouble xq,
+                                     gdouble yq);
+
+struct _GimpBlobPoint
+{
+  gint x;
+  gint y;
+};
+
+struct _GimpBlobSpan
+{
+  gint left;
+  gint right;
+};
+
+struct _GimpBlob
+{
+  gint         y;
+  gint         height;
+  GimpBlobSpan data[1];
+};
+
+
+GimpBlob * gimp_blob_polygon      (GimpBlobPoint *points,
+                                   gint           n_points);
+GimpBlob * gimp_blob_square       (gdouble        xc,
+                                   gdouble        yc,
+                                   gdouble        xp,
+                                   gdouble        yp,
+                                   gdouble        xq,
+                                   gdouble        yq);
+GimpBlob * gimp_blob_diamond      (gdouble        xc,
+                                   gdouble        yc,
+                                   gdouble        xp,
+                                   gdouble        yp,
+                                   gdouble        xq,
+                                   gdouble        yq);
+GimpBlob * gimp_blob_ellipse      (gdouble        xc,
+                                   gdouble        yc,
+                                   gdouble        xp,
+                                   gdouble        yp,
+                                   gdouble        xq,
+                                   gdouble        yq);
+void       gimp_blob_bounds       (GimpBlob      *b,
+                                   gint          *x,
+                                   gint          *y,
+                                   gint          *width,
+                                   gint          *height);
+GimpBlob * gimp_blob_convex_union (GimpBlob      *b1,
+                                   GimpBlob      *b2);
+GimpBlob * gimp_blob_duplicate    (GimpBlob      *b);
+
+
+#endif /* __GIMP_INK_BLOB_H__ */
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
new file mode 100644
index 0000000..50f72b8
--- /dev/null
+++ b/app/paint/gimpink.c
@@ -0,0 +1,785 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp-palettes.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpinkoptions.h"
+#include "gimpink.h"
+#include "gimpink-blob.h"
+#include "gimpinkundo.h"
+
+#include "gimp-intl.h"
+
+
+#define SUBSAMPLE 8
+
+
+/*  local function prototypes  */
+
+static void         gimp_ink_finalize         (GObject           *object);
+
+static void         gimp_ink_paint            (GimpPaintCore     *paint_core,
+                                               GimpDrawable      *drawable,
+                                               GimpPaintOptions  *paint_options,
+                                               GimpSymmetry      *sym,
+                                               GimpPaintState     paint_state,
+                                               guint32            time);
+static GeglBuffer * gimp_ink_get_paint_buffer (GimpPaintCore     *paint_core,
+                                               GimpDrawable      *drawable,
+                                               GimpPaintOptions  *paint_options,
+                                               GimpLayerMode      paint_mode,
+                                               const GimpCoords  *coords,
+                                               gint              *paint_buffer_x,
+                                               gint              *paint_buffer_y,
+                                               gint              *paint_width,
+                                               gint              *paint_height);
+static GimpUndo   * gimp_ink_push_undo        (GimpPaintCore     *core,
+                                               GimpImage         *image,
+                                               const gchar       *undo_desc);
+
+static void         gimp_ink_motion           (GimpPaintCore     *paint_core,
+                                               GimpDrawable      *drawable,
+                                               GimpPaintOptions  *paint_options,
+                                               GimpSymmetry      *sym,
+                                               guint32            time);
+
+static GimpBlob   * ink_pen_ellipse           (GimpInkOptions    *options,
+                                               gdouble            x_center,
+                                               gdouble            y_center,
+                                               gdouble            pressure,
+                                               gdouble            xtilt,
+                                               gdouble            ytilt,
+                                               gdouble            velocity,
+                                               const GimpMatrix3 *transform);
+
+static void         render_blob               (GeglBuffer        *buffer,
+                                               GeglRectangle     *rect,
+                                               GimpBlob          *blob);
+
+
+G_DEFINE_TYPE (GimpInk, gimp_ink, GIMP_TYPE_PAINT_CORE)
+
+#define parent_class gimp_ink_parent_class
+
+
+void
+gimp_ink_register (Gimp                      *gimp,
+                   GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_INK,
+                GIMP_TYPE_INK_OPTIONS,
+                "gimp-ink",
+                _("Ink"),
+                "gimp-tool-ink");
+}
+
+static void
+gimp_ink_class_init (GimpInkClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+
+  object_class->finalize             = gimp_ink_finalize;
+
+  paint_core_class->paint            = gimp_ink_paint;
+  paint_core_class->get_paint_buffer = gimp_ink_get_paint_buffer;
+  paint_core_class->push_undo        = gimp_ink_push_undo;
+}
+
+static void
+gimp_ink_init (GimpInk *ink)
+{
+}
+
+static void
+gimp_ink_finalize (GObject *object)
+{
+  GimpInk *ink = GIMP_INK (object);
+
+  if (ink->start_blobs)
+    {
+      g_list_free_full (ink->start_blobs, g_free);
+      ink->start_blobs = NULL;
+    }
+
+  if (ink->last_blobs)
+    {
+      g_list_free_full (ink->last_blobs, g_free);
+      ink->last_blobs = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_ink_paint (GimpPaintCore    *paint_core,
+                GimpDrawable     *drawable,
+                GimpPaintOptions *paint_options,
+                GimpSymmetry     *sym,
+                GimpPaintState    paint_state,
+                guint32           time)
+{
+  GimpInk    *ink = GIMP_INK (paint_core);
+  GimpCoords *cur_coords;
+  GimpCoords  last_coords;
+
+  gimp_paint_core_get_last_coords (paint_core, &last_coords);
+  cur_coords = gimp_symmetry_get_origin (sym);
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+        {
+          GimpContext *context = GIMP_CONTEXT (paint_options);
+          GimpRGB      foreground;
+
+          gimp_symmetry_set_stateful (sym, TRUE);
+          gimp_context_get_foreground (context, &foreground);
+          gimp_palettes_add_color_history (context->gimp,
+                                           &foreground);
+
+          if (cur_coords->x == last_coords.x &&
+              cur_coords->y == last_coords.y)
+            {
+              if (ink->start_blobs)
+                {
+                  g_list_free_full (ink->start_blobs, g_free);
+                  ink->start_blobs = NULL;
+                }
+
+              if (ink->last_blobs)
+                {
+                  g_list_free_full (ink->last_blobs, g_free);
+                  ink->last_blobs = NULL;
+                }
+            }
+          else if (ink->last_blobs)
+            {
+              GimpBlob *last_blob;
+              GList    *iter;
+              gint      i;
+
+              if (ink->start_blobs)
+                {
+                  g_list_free_full (ink->start_blobs, g_free);
+                  ink->start_blobs = NULL;
+                }
+
+              /*  save the start blobs of each stroke for undo otherwise  */
+              for (iter = ink->last_blobs, i = 0; iter; iter = g_list_next (iter), i++)
+                {
+                  last_blob = g_list_nth_data (ink->last_blobs, i);
+
+                  ink->start_blobs = g_list_prepend (ink->start_blobs,
+                                                     gimp_blob_duplicate (last_blob));
+                }
+              ink->start_blobs = g_list_reverse (ink->start_blobs);
+            }
+        }
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      gimp_ink_motion (paint_core, drawable, paint_options, sym, time);
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      gimp_symmetry_set_stateful (sym, FALSE);
+      break;
+    }
+}
+
+static GeglBuffer *
+gimp_ink_get_paint_buffer (GimpPaintCore    *paint_core,
+                           GimpDrawable     *drawable,
+                           GimpPaintOptions *paint_options,
+                           GimpLayerMode     paint_mode,
+                           const GimpCoords *coords,
+                           gint             *paint_buffer_x,
+                           gint             *paint_buffer_y,
+                           gint             *paint_width,
+                           gint             *paint_height)
+{
+  GimpInk *ink = GIMP_INK (paint_core);
+  gint     x, y;
+  gint     width, height;
+  gint     dwidth, dheight;
+  gint     x1, y1, x2, y2;
+
+  gimp_blob_bounds (ink->cur_blob, &x, &y, &width, &height);
+
+  dwidth  = gimp_item_get_width  (GIMP_ITEM (drawable));
+  dheight = gimp_item_get_height (GIMP_ITEM (drawable));
+
+  x1 = CLAMP (x / SUBSAMPLE - 1,            0, dwidth);
+  y1 = CLAMP (y / SUBSAMPLE - 1,            0, dheight);
+  x2 = CLAMP ((x + width)  / SUBSAMPLE + 2, 0, dwidth);
+  y2 = CLAMP ((y + height) / SUBSAMPLE + 2, 0, dheight);
+
+  if (paint_width)
+    *paint_width = width / SUBSAMPLE + 3;
+  if (paint_height)
+    *paint_height = height / SUBSAMPLE + 3;
+
+  /*  configure the canvas buffer  */
+  if ((x2 - x1) && (y2 - y1))
+    {
+      GimpTempBuf            *temp_buf;
+      const Babl             *format;
+      GimpLayerCompositeMode  composite_mode;
+
+      composite_mode = gimp_layer_mode_get_paint_composite_mode (paint_mode);
+
+      format = gimp_layer_mode_get_format (paint_mode,
+                                           GIMP_LAYER_COLOR_SPACE_AUTO,
+                                           GIMP_LAYER_COLOR_SPACE_AUTO,
+                                           composite_mode,
+                                           gimp_drawable_get_format (drawable));
+
+      temp_buf = gimp_temp_buf_new ((x2 - x1), (y2 - y1),
+                                    format);
+
+      *paint_buffer_x = x1;
+      *paint_buffer_y = y1;
+
+      if (paint_core->paint_buffer)
+        g_object_unref (paint_core->paint_buffer);
+
+      paint_core->paint_buffer = gimp_temp_buf_create_buffer (temp_buf);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      return paint_core->paint_buffer;
+    }
+
+  return NULL;
+}
+
+static GimpUndo *
+gimp_ink_push_undo (GimpPaintCore *core,
+                    GimpImage     *image,
+                    const gchar   *undo_desc)
+{
+  return gimp_image_undo_push (image, GIMP_TYPE_INK_UNDO,
+                               GIMP_UNDO_INK, undo_desc,
+                               0,
+                               "paint-core", core,
+                               NULL);
+}
+
+static void
+gimp_ink_motion (GimpPaintCore    *paint_core,
+                 GimpDrawable     *drawable,
+                 GimpPaintOptions *paint_options,
+                 GimpSymmetry     *sym,
+                 guint32           time)
+{
+  GimpInk        *ink             = GIMP_INK (paint_core);
+  GimpInkOptions *options         = GIMP_INK_OPTIONS (paint_options);
+  GimpContext    *context         = GIMP_CONTEXT (paint_options);
+  GList          *blob_unions     = NULL;
+  GList          *blobs_to_render = NULL;
+  GeglBuffer     *paint_buffer;
+  gint            paint_buffer_x;
+  gint            paint_buffer_y;
+  GimpLayerMode   paint_mode;
+  GimpRGB         foreground;
+  GeglColor      *color;
+  GimpBlob       *last_blob;
+  GimpCoords     *coords;
+  gint            n_strokes;
+  gint            i;
+
+  n_strokes = gimp_symmetry_get_size (sym);
+
+  if (ink->last_blobs &&
+      g_list_length (ink->last_blobs) != n_strokes)
+    {
+      g_list_free_full (ink->last_blobs, g_free);
+      ink->last_blobs = NULL;
+    }
+
+  if (! ink->last_blobs)
+    {
+      if (ink->start_blobs)
+        {
+          g_list_free_full (ink->start_blobs, g_free);
+          ink->start_blobs = NULL;
+        }
+
+      for (i = 0; i < n_strokes; i++)
+        {
+          GimpMatrix3 transform;
+
+          coords = gimp_symmetry_get_coords (sym, i);
+
+          gimp_symmetry_get_matrix (sym, i, &transform);
+
+          last_blob = ink_pen_ellipse (options,
+                                       coords->x,
+                                       coords->y,
+                                       coords->pressure,
+                                       coords->xtilt,
+                                       coords->ytilt,
+                                       100,
+                                       &transform);
+
+          ink->last_blobs = g_list_prepend (ink->last_blobs,
+                                            last_blob);
+          ink->start_blobs = g_list_prepend (ink->start_blobs,
+                                             gimp_blob_duplicate (last_blob));
+          blobs_to_render = g_list_prepend (blobs_to_render, last_blob);
+        }
+      ink->start_blobs = g_list_reverse (ink->start_blobs);
+      ink->last_blobs = g_list_reverse (ink->last_blobs);
+      blobs_to_render = g_list_reverse (blobs_to_render);
+    }
+  else
+    {
+      for (i = 0; i < n_strokes; i++)
+        {
+          GimpBlob    *blob;
+          GimpBlob    *blob_union = NULL;
+          GimpMatrix3  transform;
+
+          coords = gimp_symmetry_get_coords (sym, i);
+
+          gimp_symmetry_get_matrix (sym, i, &transform);
+
+          blob = ink_pen_ellipse (options,
+                                  coords->x,
+                                  coords->y,
+                                  coords->pressure,
+                                  coords->xtilt,
+                                  coords->ytilt,
+                                  coords->velocity * 100,
+                                  &transform);
+
+          last_blob = g_list_nth_data (ink->last_blobs, i);
+          blob_union = gimp_blob_convex_union (last_blob, blob);
+
+          g_free (last_blob);
+          g_list_nth (ink->last_blobs, i)->data = blob;
+
+          blobs_to_render = g_list_prepend (blobs_to_render, blob_union);
+          blob_unions = g_list_prepend (blob_unions, blob_union);
+        }
+      blobs_to_render = g_list_reverse (blobs_to_render);
+    }
+
+  paint_mode = gimp_context_get_paint_mode (context);
+
+  gimp_context_get_foreground (context, &foreground);
+  gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                     &foreground, &foreground);
+  color = gimp_gegl_color_new (&foreground);
+
+  for (i = 0; i < n_strokes; i++)
+    {
+      GimpBlob *blob_to_render = g_list_nth_data (blobs_to_render, i);
+
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      ink->cur_blob = blob_to_render;
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       paint_mode,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       NULL, NULL);
+      ink->cur_blob = NULL;
+
+      if (! paint_buffer)
+        continue;
+
+      gegl_buffer_set_color (paint_buffer, NULL, color);
+
+      /*  draw the blob directly to the canvas_buffer  */
+      render_blob (paint_core->canvas_buffer,
+                   GEGL_RECTANGLE (paint_core->paint_buffer_x,
+                                   paint_core->paint_buffer_y,
+                                   gegl_buffer_get_width  (paint_core->paint_buffer),
+                                   gegl_buffer_get_height (paint_core->paint_buffer)),
+                   blob_to_render);
+
+      /*  draw the paint_area using the just rendered canvas_buffer as mask */
+      gimp_paint_core_paste (paint_core,
+                             NULL,
+                             paint_core->paint_buffer_x,
+                             paint_core->paint_buffer_y,
+                             drawable,
+                             GIMP_OPACITY_OPAQUE,
+                             gimp_context_get_opacity (context),
+                             paint_mode,
+                             GIMP_PAINT_CONSTANT);
+
+    }
+
+  g_object_unref (color);
+
+  g_list_free_full (blob_unions, g_free);
+}
+
+static GimpBlob *
+ink_pen_ellipse (GimpInkOptions    *options,
+                 gdouble            x_center,
+                 gdouble            y_center,
+                 gdouble            pressure,
+                 gdouble            xtilt,
+                 gdouble            ytilt,
+                 gdouble            velocity,
+                 const GimpMatrix3 *transform)
+{
+  GimpBlobFunc blob_function;
+  gdouble      size;
+  gdouble      tsin, tcos;
+  gdouble      aspect, radmin;
+  gdouble      x,y;
+  gdouble      tscale;
+  gdouble      tscale_c;
+  gdouble      tscale_s;
+
+  /* Adjust the size depending on pressure. */
+
+  size = options->size * (1.0 + options->size_sensitivity *
+                          (2.0 * pressure - 1.0));
+
+  /* Adjust the size further depending on pointer velocity and
+   * velocity-sensitivity.  These 'magic constants' are 'feels
+   * natural' tigert-approved. --ADM
+   */
+
+  if (velocity < 3.0)
+    velocity = 3.0;
+
+#ifdef VERBOSE
+  g_printerr ("%g (%g) -> ", size, velocity);
+#endif
+
+  size = (options->vel_sensitivity *
+          ((4.5 * size) / (1.0 + options->vel_sensitivity * (2.0 * velocity)))
+          + (1.0 - options->vel_sensitivity) * size);
+
+#ifdef VERBOSE
+  g_printerr ("%g\n", (gfloat) size);
+#endif
+
+  /* Clamp resulting size to sane limits */
+
+  if (size > options->size * (1.0 + options->size_sensitivity))
+    size = options->size * (1.0 + options->size_sensitivity);
+
+  if (size * SUBSAMPLE < 1.0)
+    size = 1.0 / SUBSAMPLE;
+
+  /* Add brush angle/aspect to tilt vectorially */
+
+  /* I'm not happy with the way the brush widget info is combined with
+   * tilt info from the brush. My personal feeling is that
+   * representing both as affine transforms would make the most
+   * sense. -RLL
+   */
+
+  tscale   = options->tilt_sensitivity * 10.0;
+  tscale_c = tscale * cos (gimp_deg_to_rad (options->tilt_angle));
+  tscale_s = tscale * sin (gimp_deg_to_rad (options->tilt_angle));
+
+  x = (options->blob_aspect * cos (options->blob_angle) +
+       xtilt * tscale_c - ytilt * tscale_s);
+  y = (options->blob_aspect * sin (options->blob_angle) +
+       ytilt * tscale_c + xtilt * tscale_s);
+
+#ifdef VERBOSE
+  g_printerr ("angle %g aspect %g; %g %g; %g %g\n",
+              options->blob_angle, options->blob_aspect,
+              tscale_c, tscale_s, x, y);
+#endif
+
+  aspect = sqrt (SQR (x) + SQR (y));
+
+  if (aspect != 0)
+    {
+      tcos = x / aspect;
+      tsin = y / aspect;
+    }
+  else
+    {
+      tcos = cos (options->blob_angle);
+      tsin = sin (options->blob_angle);
+    }
+
+  gimp_matrix3_transform_point (transform,
+                                tcos,  tsin,
+                                &tcos, &tsin);
+
+  aspect = CLAMP (aspect, 1.0, 10.0);
+
+  radmin = MAX (1.0, SUBSAMPLE * size / aspect);
+
+  switch (options->blob_type)
+    {
+    case GIMP_INK_BLOB_TYPE_CIRCLE:
+      blob_function = gimp_blob_ellipse;
+      break;
+
+    case GIMP_INK_BLOB_TYPE_SQUARE:
+      blob_function = gimp_blob_square;
+      break;
+
+    case GIMP_INK_BLOB_TYPE_DIAMOND:
+      blob_function = gimp_blob_diamond;
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+      break;
+    }
+
+  return (* blob_function) (x_center * SUBSAMPLE,
+                            y_center * SUBSAMPLE,
+                            radmin * aspect * tcos,
+                            radmin * aspect * tsin,
+                            -radmin * tsin,
+                            radmin * tcos);
+}
+
+
+/*********************************/
+/*  Rendering functions          */
+/*********************************/
+
+/* Some of this stuff should probably be combined with the
+ * code it was copied from in paint_core.c; but I wanted
+ * to learn this stuff, so I've kept it simple.
+ *
+ * The following only supports CONSTANT mode. Incremental
+ * would, I think, interact strangely with the way we
+ * do things. But it wouldn't be hard to implement at all.
+ */
+
+enum
+{
+  ROW_START,
+  ROW_STOP
+};
+
+/* The insertion sort here, for SUBSAMPLE = 8, tends to beat out
+ * qsort() by 4x with CFLAGS=-O2, 2x with CFLAGS=-g
+ */
+static void
+insert_sort (gint *data,
+             gint  n)
+{
+  gint i, j, k;
+
+  for (i = 2; i < 2 * n; i += 2)
+    {
+      gint tmp1 = data[i];
+      gint tmp2 = data[i + 1];
+
+      j = 0;
+
+      while (data[j] < tmp1)
+        j += 2;
+
+      for (k = i; k > j; k -= 2)
+        {
+          data[k]     = data[k - 2];
+          data[k + 1] = data[k - 1];
+        }
+
+      data[j]     = tmp1;
+      data[j + 1] = tmp2;
+    }
+}
+
+static void
+fill_run (gfloat *dest,
+          gfloat  alpha,
+          gint    w)
+{
+  if (alpha == 1.0)
+    {
+      while (w--)
+        {
+          *dest = 1.0;
+          dest++;
+        }
+    }
+  else
+    {
+      while (w--)
+        {
+          *dest = MAX (*dest, alpha);
+          dest++;
+        }
+    }
+}
+
+static void
+render_blob_line (GimpBlob *blob,
+                  gfloat   *dest,
+                  gint      x,
+                  gint      y,
+                  gint      width)
+{
+  gint  buf[4 * SUBSAMPLE];
+  gint *data    = buf;
+  gint  n       = 0;
+  gint  i, j;
+  gint  current = 0;  /* number of filled rows at this point
+                       * in the scan line
+                       */
+  gint last_x;
+
+  /* Sort start and ends for all lines */
+
+  j = y * SUBSAMPLE - blob->y;
+  for (i = 0; i < SUBSAMPLE; i++)
+    {
+      if (j >= blob->height)
+        break;
+
+      if ((j > 0) && (blob->data[j].left <= blob->data[j].right))
+        {
+          data[2 * n]                     = blob->data[j].left;
+          data[2 * n + 1]                 = ROW_START;
+          data[2 * SUBSAMPLE + 2 * n]     = blob->data[j].right;
+          data[2 * SUBSAMPLE + 2 * n + 1] = ROW_STOP;
+          n++;
+        }
+      j++;
+    }
+
+  /*   If we have less than SUBSAMPLE rows, compress */
+  if (n < SUBSAMPLE)
+    {
+      for (i = 0; i < 2 * n; i++)
+        data[2 * n + i] = data[2 * SUBSAMPLE + i];
+    }
+
+  /*   Now count start and end separately */
+  n *= 2;
+
+  insert_sort (data, n);
+
+  /* Discard portions outside of tile */
+
+  while ((n > 0) && (data[0] < SUBSAMPLE*x))
+    {
+      if (data[1] == ROW_START)
+        current++;
+      else
+        current--;
+      data += 2;
+      n--;
+    }
+
+  while ((n > 0) && (data[2*(n-1)] >= SUBSAMPLE*(x+width)))
+    n--;
+
+  /* Render the row */
+
+  last_x = 0;
+  for (i = 0; i < n;)
+    {
+      gint cur_x = data[2 * i] / SUBSAMPLE - x;
+      gint pixel;
+
+      /* Fill in portion leading up to this pixel */
+      if (current && cur_x != last_x)
+        fill_run (dest + last_x, (gfloat) current / SUBSAMPLE, cur_x - last_x);
+
+      /* Compute the value for this pixel */
+      pixel = current * SUBSAMPLE;
+
+      while (i<n)
+        {
+          gint tmp_x = data[2 * i] / SUBSAMPLE;
+
+          if (tmp_x - x != cur_x)
+            break;
+
+          if (data[2 * i + 1] == ROW_START)
+            {
+              current++;
+              pixel += ((tmp_x + 1) * SUBSAMPLE) - data[2 * i];
+            }
+          else
+            {
+              current--;
+              pixel -= ((tmp_x + 1) * SUBSAMPLE) - data[2 * i];
+            }
+
+          i++;
+        }
+
+      dest[cur_x] = MAX (dest[cur_x], (gfloat) pixel / (SUBSAMPLE * SUBSAMPLE));
+
+      last_x = cur_x + 1;
+    }
+
+  if (current != 0)
+    fill_run (dest + last_x, (gfloat) current / SUBSAMPLE, width - last_x);
+}
+
+static void
+render_blob (GeglBuffer    *buffer,
+             GeglRectangle *rect,
+             GimpBlob      *blob)
+{
+  GeglBufferIterator *iter;
+  GeglRectangle      *roi;
+
+  iter = gegl_buffer_iterator_new (buffer, rect, 0, babl_format ("Y float"),
+                                   GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE, 1);
+  roi = &iter->items[0].roi;
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      gfloat *d = iter->items[0].data;
+      gint    h = roi->height;
+      gint    y;
+
+      for (y = 0; y < h; y++, d += roi->width * 1)
+        {
+          render_blob_line (blob, d, roi->x, roi->y + y, roi->width);
+        }
+    }
+}
diff --git a/app/paint/gimpink.h b/app/paint/gimpink.h
new file mode 100644
index 0000000..ac31592
--- /dev/null
+++ b/app/paint/gimpink.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_INK_H__
+#define  __GIMP_INK_H__
+
+
+#include "gimppaintcore.h"
+#include "gimpink-blob.h"
+
+
+#define GIMP_TYPE_INK            (gimp_ink_get_type ())
+#define GIMP_INK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_INK, GimpInk))
+#define GIMP_INK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_INK, GimpInkClass))
+#define GIMP_IS_INK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_INK))
+#define GIMP_IS_INK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_INK))
+#define GIMP_INK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK, GimpInkClass))
+
+
+typedef struct _GimpInkClass GimpInkClass;
+
+struct _GimpInk
+{
+  GimpPaintCore  parent_instance;
+
+  GList         *start_blobs;  /*  starting blobs per stroke (for undo) */
+
+  GimpBlob      *cur_blob;     /*  current blob                         */
+  GList         *last_blobs;   /*  blobs for last stroke positions      */
+};
+
+struct _GimpInkClass
+{
+  GimpPaintCoreClass  parent_class;
+};
+
+
+void    gimp_ink_register (Gimp                      *gimp,
+                           GimpPaintRegisterCallback  callback);
+
+GType   gimp_ink_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_INK_H__  */
diff --git a/app/paint/gimpinkoptions.c b/app/paint/gimpinkoptions.c
new file mode 100644
index 0000000..d660179
--- /dev/null
+++ b/app/paint/gimpinkoptions.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimppaintinfo.h"
+
+#include "gimpinkoptions.h"
+#include "gimpink-blob.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SIZE,
+  PROP_TILT_ANGLE,
+  PROP_SIZE_SENSITIVITY,
+  PROP_VEL_SENSITIVITY,
+  PROP_TILT_SENSITIVITY,
+  PROP_BLOB_TYPE,
+  PROP_BLOB_ASPECT,
+  PROP_BLOB_ANGLE
+};
+
+
+static void   gimp_ink_options_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void   gimp_ink_options_get_property (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpInkOptions, gimp_ink_options, GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_ink_options_class_init (GimpInkOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_ink_options_set_property;
+  object_class->get_property = gimp_ink_options_get_property;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SIZE,
+                           "size",
+                           _("Size"),
+                           _("Ink Blob Size"),
+                           0.0, 200.0, 16.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_TILT_ANGLE,
+                           "tilt-angle",
+                           _("Angle"),
+                           NULL,
+                           -90.0, 90.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SIZE_SENSITIVITY,
+                           "size-sensitivity",
+                           _("Size"),
+                           NULL,
+                           0.0, 1.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_VEL_SENSITIVITY,
+                           "vel-sensitivity",
+                           _("Speed"),
+                           NULL,
+                           0.0, 1.0, 0.8,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_TILT_SENSITIVITY,
+                           "tilt-sensitivity",
+                           _("Tilt"),
+                           NULL,
+                           0.0, 1.0, 0.4,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BLOB_TYPE,
+                         "blob-type",
+                         _("Shape"),
+                         NULL,
+                         GIMP_TYPE_INK_BLOB_TYPE,
+                         GIMP_INK_BLOB_TYPE_CIRCLE,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BLOB_ASPECT,
+                           "blob-aspect",
+                           _("Aspect ratio"),
+                           _("Ink Blob Aspect Ratio"),
+                           1.0, 10.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BLOB_ANGLE,
+                           "blob-angle",
+                           _("Angle"),
+                           _("Ink Blob Angle"),
+                           -G_PI, G_PI, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_ink_options_init (GimpInkOptions *options)
+{
+}
+
+static void
+gimp_ink_options_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpInkOptions *options = GIMP_INK_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SIZE:
+      options->size = g_value_get_double (value);
+      break;
+    case PROP_TILT_ANGLE:
+      options->tilt_angle = g_value_get_double (value);
+      break;
+    case PROP_SIZE_SENSITIVITY:
+      options->size_sensitivity = g_value_get_double (value);
+      break;
+    case PROP_VEL_SENSITIVITY:
+      options->vel_sensitivity = g_value_get_double (value);
+      break;
+    case PROP_TILT_SENSITIVITY:
+      options->tilt_sensitivity = g_value_get_double (value);
+      break;
+    case PROP_BLOB_TYPE:
+      options->blob_type = g_value_get_enum (value);
+      break;
+    case PROP_BLOB_ASPECT:
+      options->blob_aspect = g_value_get_double (value);
+      break;
+    case PROP_BLOB_ANGLE:
+      options->blob_angle = g_value_get_double (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_ink_options_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpInkOptions *options = GIMP_INK_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SIZE:
+      g_value_set_double (value, options->size);
+      break;
+    case PROP_TILT_ANGLE:
+      g_value_set_double (value, options->tilt_angle);
+      break;
+    case PROP_SIZE_SENSITIVITY:
+      g_value_set_double (value, options->size_sensitivity);
+      break;
+    case PROP_VEL_SENSITIVITY:
+      g_value_set_double (value, options->vel_sensitivity);
+      break;
+    case PROP_TILT_SENSITIVITY:
+      g_value_set_double (value, options->tilt_sensitivity);
+      break;
+    case PROP_BLOB_TYPE:
+      g_value_set_enum (value, options->blob_type);
+      break;
+    case PROP_BLOB_ASPECT:
+      g_value_set_double (value, options->blob_aspect);
+      break;
+    case PROP_BLOB_ANGLE:
+      g_value_set_double (value, options->blob_angle);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpinkoptions.h b/app/paint/gimpinkoptions.h
new file mode 100644
index 0000000..7776b60
--- /dev/null
+++ b/app/paint/gimpinkoptions.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_INK_OPTIONS_H__
+#define  __GIMP_INK_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_INK_OPTIONS            (gimp_ink_options_get_type ())
+#define GIMP_INK_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_INK_OPTIONS, GimpInkOptions))
+#define GIMP_INK_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_INK_OPTIONS, GimpInkOptionsClass))
+#define GIMP_IS_INK_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_INK_OPTIONS))
+#define GIMP_IS_INK_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_INK_OPTIONS))
+#define GIMP_INK_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK_OPTIONS, GimpInkOptionsClass))
+
+
+typedef struct _GimpInkOptionsClass GimpInkOptionsClass;
+
+struct _GimpInkOptions
+{
+  GimpPaintOptions  parent_instance;
+
+  gdouble           size;
+  gdouble           tilt_angle;
+
+  gdouble           size_sensitivity;
+  gdouble           vel_sensitivity;
+  gdouble           tilt_sensitivity;
+
+  GimpInkBlobType   blob_type;
+  gdouble           blob_aspect;
+  gdouble           blob_angle;
+};
+
+struct _GimpInkOptionsClass
+{
+  GimpPaintOptionsClass  parent_instance;
+};
+
+
+GType   gimp_ink_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_INK_OPTIONS_H__  */
diff --git a/app/paint/gimpinkundo.c b/app/paint/gimpinkundo.c
new file mode 100644
index 0000000..a0b604b
--- /dev/null
+++ b/app/paint/gimpinkundo.c
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "gimpink.h"
+#include "gimpink-blob.h"
+#include "gimpinkundo.h"
+
+
+static void   gimp_ink_undo_constructed (GObject             *object);
+
+static void   gimp_ink_undo_pop         (GimpUndo            *undo,
+                                         GimpUndoMode         undo_mode,
+                                         GimpUndoAccumulator *accum);
+static void   gimp_ink_undo_free        (GimpUndo            *undo,
+                                         GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpInkUndo, gimp_ink_undo, GIMP_TYPE_PAINT_CORE_UNDO)
+
+#define parent_class gimp_ink_undo_parent_class
+
+
+static void
+gimp_ink_undo_class_init (GimpInkUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_ink_undo_constructed;
+
+  undo_class->pop           = gimp_ink_undo_pop;
+  undo_class->free          = gimp_ink_undo_free;
+}
+
+static void
+gimp_ink_undo_init (GimpInkUndo *undo)
+{
+  undo->last_blobs = NULL;
+}
+
+static void
+gimp_ink_undo_constructed (GObject *object)
+{
+  GimpInkUndo *ink_undo = GIMP_INK_UNDO (object);
+  GimpInk     *ink;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_INK (GIMP_PAINT_CORE_UNDO (ink_undo)->paint_core));
+
+  ink = GIMP_INK (GIMP_PAINT_CORE_UNDO (ink_undo)->paint_core);
+
+  if (ink->start_blobs)
+    {
+      gint      i;
+      GimpBlob *blob;
+
+      for (i = 0; i < g_list_length (ink->start_blobs); i++)
+        {
+          blob = g_list_nth_data (ink->start_blobs, i);
+
+          ink_undo->last_blobs = g_list_prepend (ink_undo->last_blobs,
+                                                 gimp_blob_duplicate (blob));
+        }
+      ink_undo->last_blobs = g_list_reverse (ink_undo->last_blobs);
+    }
+}
+
+static void
+gimp_ink_undo_pop (GimpUndo              *undo,
+                   GimpUndoMode           undo_mode,
+                   GimpUndoAccumulator   *accum)
+{
+  GimpInkUndo *ink_undo = GIMP_INK_UNDO (undo);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  if (GIMP_PAINT_CORE_UNDO (ink_undo)->paint_core)
+    {
+      GimpInk  *ink = GIMP_INK (GIMP_PAINT_CORE_UNDO (ink_undo)->paint_core);
+      GList    *tmp_blobs;
+
+      tmp_blobs = ink->last_blobs;
+      ink->last_blobs = ink_undo->last_blobs;
+      ink_undo->last_blobs = tmp_blobs;
+    }
+}
+
+static void
+gimp_ink_undo_free (GimpUndo     *undo,
+                    GimpUndoMode  undo_mode)
+{
+  GimpInkUndo *ink_undo = GIMP_INK_UNDO (undo);
+
+  if (ink_undo->last_blobs)
+    {
+      g_list_free_full (ink_undo->last_blobs, g_free);
+      ink_undo->last_blobs = NULL;
+    }
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/paint/gimpinkundo.h b/app/paint/gimpinkundo.h
new file mode 100644
index 0000000..59abf02
--- /dev/null
+++ b/app/paint/gimpinkundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_INK_UNDO_H__
+#define __GIMP_INK_UNDO_H__
+
+
+#include "gimppaintcoreundo.h"
+
+
+#define GIMP_TYPE_INK_UNDO            (gimp_ink_undo_get_type ())
+#define GIMP_INK_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_INK_UNDO, GimpInkUndo))
+#define GIMP_INK_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_INK_UNDO, GimpInkUndoClass))
+#define GIMP_IS_INK_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_INK_UNDO))
+#define GIMP_IS_INK_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_INK_UNDO))
+#define GIMP_INK_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK_UNDO, GimpInkUndoClass))
+
+
+typedef struct _GimpInkUndo      GimpInkUndo;
+typedef struct _GimpInkUndoClass GimpInkUndoClass;
+
+struct _GimpInkUndo
+{
+  GimpPaintCoreUndo  parent_instance;
+
+  GList             *last_blobs;
+};
+
+struct _GimpInkUndoClass
+{
+  GimpPaintCoreUndoClass  parent_class;
+};
+
+
+GType   gimp_ink_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_INK_UNDO_H__ */
diff --git a/app/paint/gimpmybrushcore.c b/app/paint/gimpmybrushcore.c
new file mode 100644
index 0000000..9e96821
--- /dev/null
+++ b/app/paint/gimpmybrushcore.c
@@ -0,0 +1,421 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include <mypaint-brush.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-palettes.h"
+#include "core/gimpdrawable.h"
+#include "core/gimperror.h"
+#include "core/gimpmybrush.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimpmybrushcore.h"
+#include "gimpmybrushsurface.h"
+#include "gimpmybrushoptions.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpMybrushCorePrivate
+{
+  GimpMybrush        *mybrush;
+  GimpMybrushSurface *surface;
+  GList              *brushes;
+  gboolean            synthetic;
+  gint64              last_time;
+};
+
+
+/*  local function prototypes  */
+
+static void      gimp_mybrush_core_finalize       (GObject           *object);
+
+static gboolean  gimp_mybrush_core_start          (GimpPaintCore     *paint_core,
+                                                   GimpDrawable      *drawable,
+                                                   GimpPaintOptions  *paint_options,
+                                                   const GimpCoords  *coords,
+                                                   GError           **error);
+static void      gimp_mybrush_core_interpolate    (GimpPaintCore     *paint_core,
+                                                   GimpDrawable      *drawable,
+                                                   GimpPaintOptions  *paint_options,
+                                                   guint32            time);
+static void      gimp_mybrush_core_paint          (GimpPaintCore     *paint_core,
+                                                   GimpDrawable      *drawable,
+                                                   GimpPaintOptions  *paint_options,
+                                                   GimpSymmetry      *sym,
+                                                   GimpPaintState     paint_state,
+                                                   guint32            time);
+static void      gimp_mybrush_core_motion         (GimpPaintCore     *paint_core,
+                                                   GimpDrawable      *drawable,
+                                                   GimpPaintOptions  *paint_options,
+                                                   GimpSymmetry      *sym,
+                                                   guint32            time);
+static void      gimp_mybrush_core_create_brushes (GimpMybrushCore   *mybrush,
+                                                   GimpDrawable      *drawable,
+                                                   GimpPaintOptions  *paint_options,
+                                                   GimpSymmetry      *sym);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpMybrushCore, gimp_mybrush_core,
+                            GIMP_TYPE_PAINT_CORE)
+
+#define parent_class gimp_mybrush_core_parent_class
+
+
+void
+gimp_mybrush_core_register (Gimp                      *gimp,
+                            GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_MYBRUSH_CORE,
+                GIMP_TYPE_MYBRUSH_OPTIONS,
+                "gimp-mybrush",
+                _("Mybrush"),
+                "gimp-tool-mypaint-brush");
+}
+
+static void
+gimp_mybrush_core_class_init (GimpMybrushCoreClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+
+  object_class->finalize        = gimp_mybrush_core_finalize;
+
+  paint_core_class->start       = gimp_mybrush_core_start;
+  paint_core_class->paint       = gimp_mybrush_core_paint;
+  paint_core_class->interpolate = gimp_mybrush_core_interpolate;
+}
+
+static void
+gimp_mybrush_core_init (GimpMybrushCore *mybrush)
+{
+  mybrush->private = gimp_mybrush_core_get_instance_private (mybrush);
+}
+
+static void
+gimp_mybrush_core_finalize (GObject *object)
+{
+  GimpMybrushCore *core = GIMP_MYBRUSH_CORE (object);
+
+  if (core->private->brushes)
+    {
+      g_list_free_full (core->private->brushes,
+                        (GDestroyNotify) mypaint_brush_unref);
+      core->private->brushes = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_mybrush_core_start (GimpPaintCore     *paint_core,
+                         GimpDrawable      *drawable,
+                         GimpPaintOptions  *paint_options,
+                         const GimpCoords  *coords,
+                         GError           **error)
+{
+  GimpMybrushCore *core    = GIMP_MYBRUSH_CORE (paint_core);
+  GimpContext     *context = GIMP_CONTEXT (paint_options);
+
+  core->private->mybrush = gimp_context_get_mybrush (context);
+
+  if (! core->private->mybrush)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("No MyPaint brushes available for use with this tool."));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_mybrush_core_interpolate (GimpPaintCore    *paint_core,
+                               GimpDrawable     *drawable,
+                               GimpPaintOptions *paint_options,
+                               guint32           time)
+{
+  GimpMybrushCore *mybrush = GIMP_MYBRUSH_CORE (paint_core);
+
+  /* If this is the first motion the brush has received then
+   * we're being asked to draw a synthetic stroke in line mode
+   */
+  if (mybrush->private->last_time < 0)
+    {
+      GimpCoords saved_coords = paint_core->cur_coords;
+
+      paint_core->cur_coords = paint_core->last_coords;
+
+      mybrush->private->synthetic = TRUE;
+
+      gimp_paint_core_paint (paint_core, drawable, paint_options,
+                             GIMP_PAINT_STATE_MOTION, time);
+
+      paint_core->cur_coords = saved_coords;
+    }
+
+  gimp_paint_core_paint (paint_core, drawable, paint_options,
+                         GIMP_PAINT_STATE_MOTION, time);
+
+  paint_core->last_coords = paint_core->cur_coords;
+}
+
+static void
+gimp_mybrush_core_paint (GimpPaintCore    *paint_core,
+                         GimpDrawable     *drawable,
+                         GimpPaintOptions *paint_options,
+                         GimpSymmetry     *sym,
+                         GimpPaintState    paint_state,
+                         guint32           time)
+{
+  GimpMybrushCore *mybrush = GIMP_MYBRUSH_CORE (paint_core);
+  GimpContext     *context = GIMP_CONTEXT (paint_options);
+  GimpRGB          fg;
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      gimp_context_get_foreground (context, &fg);
+      gimp_palettes_add_color_history (context->gimp, &fg);
+      gimp_symmetry_set_stateful (sym, TRUE);
+
+      mybrush->private->surface =
+        gimp_mypaint_surface_new (gimp_drawable_get_buffer (drawable),
+                                  gimp_drawable_get_active_mask (drawable),
+                                  paint_core->mask_buffer,
+                                  paint_core->mask_x_offset,
+                                  paint_core->mask_y_offset,
+                                  GIMP_MYBRUSH_OPTIONS (paint_options));
+
+      gimp_mybrush_core_create_brushes (mybrush, drawable, paint_options, sym);
+
+      mybrush->private->last_time = -1;
+      mybrush->private->synthetic = FALSE;
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      gimp_mybrush_core_motion (paint_core, drawable, paint_options,
+                                sym, time);
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      gimp_symmetry_set_stateful (sym, FALSE);
+      mypaint_surface_unref ((MyPaintSurface *) mybrush->private->surface);
+      mybrush->private->surface = NULL;
+
+      g_list_free_full (mybrush->private->brushes,
+                        (GDestroyNotify) mypaint_brush_unref);
+      mybrush->private->brushes = NULL;
+      break;
+    }
+}
+
+static void
+gimp_mybrush_core_motion (GimpPaintCore    *paint_core,
+                          GimpDrawable     *drawable,
+                          GimpPaintOptions *paint_options,
+                          GimpSymmetry     *sym,
+                          guint32           time)
+{
+  GimpMybrushCore  *mybrush = GIMP_MYBRUSH_CORE (paint_core);
+  MyPaintRectangle  rect;
+  GList            *iter;
+  gdouble           dt = 0.0;
+  gint              n_strokes;
+  gint              i;
+
+  n_strokes = gimp_symmetry_get_size (sym);
+
+  /* The number of strokes may change during a motion, depending on
+   * the type of symmetry. When that happens, reset the brushes.
+   */
+  if (g_list_length (mybrush->private->brushes) != n_strokes)
+    {
+      gimp_mybrush_core_create_brushes (mybrush, drawable, paint_options, sym);
+    }
+
+  mypaint_surface_begin_atomic ((MyPaintSurface *) mybrush->private->surface);
+
+  if (mybrush->private->last_time < 0)
+    {
+      /* First motion, so we need zero pressure events to start the strokes */
+      for (iter = mybrush->private->brushes, i = 0;
+           iter;
+           iter = g_list_next (iter), i++)
+        {
+          MyPaintBrush *brush  = iter->data;
+          GimpCoords   *coords = gimp_symmetry_get_coords (sym, i);
+
+          mypaint_brush_stroke_to (brush,
+                                   (MyPaintSurface *) mybrush->private->surface,
+                                   coords->x,
+                                   coords->y,
+                                   0.0f,
+                                   coords->xtilt,
+                                   coords->ytilt,
+                                   1.0f /* Pretend the cursor hasn't moved in a while */);
+        }
+
+      dt = 0.015;
+    }
+  else if (mybrush->private->synthetic)
+    {
+      GimpVector2 v = { paint_core->cur_coords.x - paint_core->last_coords.x,
+                        paint_core->cur_coords.y - paint_core->last_coords.y };
+
+      dt = 0.0005 * gimp_vector2_length_val (v);
+    }
+  else
+    {
+      dt = (time - mybrush->private->last_time) * 0.001;
+    }
+
+  for (iter = mybrush->private->brushes, i = 0;
+       iter;
+       iter = g_list_next (iter), i++)
+    {
+      MyPaintBrush *brush    = iter->data;
+      GimpCoords   *coords   = gimp_symmetry_get_coords (sym, i);
+      gdouble       pressure = coords->pressure;
+
+      /* libmypaint expects non-extended devices to default to 0.5 pressure */
+      if (! coords->extended)
+        pressure = 0.5f;
+
+      mypaint_brush_stroke_to (brush,
+                               (MyPaintSurface *) mybrush->private->surface,
+                               coords->x,
+                               coords->y,
+                               pressure,
+                               coords->xtilt,
+                               coords->ytilt,
+                               dt);
+    }
+
+  mybrush->private->last_time = time;
+
+  mypaint_surface_end_atomic ((MyPaintSurface *) mybrush->private->surface,
+                              &rect);
+
+  if (rect.width > 0 && rect.height > 0)
+    {
+      paint_core->x1 = MIN (paint_core->x1, rect.x);
+      paint_core->y1 = MIN (paint_core->y1, rect.y);
+      paint_core->x2 = MAX (paint_core->x2, rect.x + rect.width);
+      paint_core->y2 = MAX (paint_core->y2, rect.y + rect.height);
+
+      gimp_drawable_update (drawable, rect.x, rect.y, rect.width, rect.height);
+    }
+}
+
+static void
+gimp_mybrush_core_create_brushes (GimpMybrushCore  *mybrush,
+                                  GimpDrawable     *drawable,
+                                  GimpPaintOptions *paint_options,
+                                  GimpSymmetry     *sym)
+{
+  GimpMybrushOptions *options = GIMP_MYBRUSH_OPTIONS (paint_options);
+  GimpContext        *context = GIMP_CONTEXT (paint_options);
+  GimpRGB             fg;
+  GimpHSV             hsv;
+  gint                n_strokes;
+  gint                i;
+
+  if (mybrush->private->brushes)
+    {
+      g_list_free_full (mybrush->private->brushes,
+                        (GDestroyNotify) mypaint_brush_unref);
+      mybrush->private->brushes = NULL;
+    }
+
+  if (options->eraser)
+    gimp_context_get_background (context, &fg);
+  else
+    gimp_context_get_foreground (context, &fg);
+
+  gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                     &fg, &fg);
+  gimp_rgb_to_hsv (&fg, &hsv);
+
+  n_strokes = gimp_symmetry_get_size (sym);
+
+  for (i = 0; i < n_strokes; i++)
+    {
+      MyPaintBrush *brush = mypaint_brush_new ();
+      const gchar  *brush_data;
+
+      mypaint_brush_from_defaults (brush);
+      brush_data = gimp_mybrush_get_brush_json (mybrush->private->mybrush);
+      if (brush_data)
+        mypaint_brush_from_string (brush, brush_data);
+
+      if (! mypaint_brush_get_base_value (brush,
+                                          MYPAINT_BRUSH_SETTING_RESTORE_COLOR))
+        {
+          mypaint_brush_set_base_value (brush,
+                                        MYPAINT_BRUSH_SETTING_COLOR_H,
+                                        hsv.h);
+          mypaint_brush_set_base_value (brush,
+                                        MYPAINT_BRUSH_SETTING_COLOR_S,
+                                        hsv.s);
+          mypaint_brush_set_base_value (brush,
+                                        MYPAINT_BRUSH_SETTING_COLOR_V,
+                                        hsv.v);
+        }
+
+      mypaint_brush_set_base_value (brush,
+                                    MYPAINT_BRUSH_SETTING_RADIUS_LOGARITHMIC,
+                                    options->radius);
+      mypaint_brush_set_base_value (brush,
+                                    MYPAINT_BRUSH_SETTING_OPAQUE,
+                                    options->opaque *
+                                    gimp_context_get_opacity (context));
+      mypaint_brush_set_base_value (brush,
+                                    MYPAINT_BRUSH_SETTING_HARDNESS,
+                                    options->hardness);
+      mypaint_brush_set_base_value (brush,
+                                    MYPAINT_BRUSH_SETTING_ERASER,
+                                    (options->eraser &&
+                                     gimp_drawable_has_alpha (drawable)) ?
+                                    1.0f : 0.0f);
+
+      mypaint_brush_new_stroke (brush);
+
+      mybrush->private->brushes = g_list_prepend (mybrush->private->brushes,
+                                                  brush);
+    }
+
+  mybrush->private->brushes = g_list_reverse (mybrush->private->brushes);
+}
diff --git a/app/paint/gimpmybrushcore.h b/app/paint/gimpmybrushcore.h
new file mode 100644
index 0000000..9dadfb8
--- /dev/null
+++ b/app/paint/gimpmybrushcore.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_MYBRUSH_CORE_H__
+#define  __GIMP_MYBRUSH_CORE_H__
+
+
+#include "gimppaintcore.h"
+
+
+#define GIMP_TYPE_MYBRUSH_CORE            (gimp_mybrush_core_get_type ())
+#define GIMP_MYBRUSH_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MYBRUSH_CORE, GimpMybrushCore))
+#define GIMP_MYBRUSH_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MYBRUSH_CORE, GimpMybrushCoreClass))
+#define GIMP_IS_MYBRUSH_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MYBRUSH_CORE))
+#define GIMP_IS_MYBRUSH_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MYBRUSH_CORE))
+#define GIMP_MYBRUSH_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MYBRUSH_CORE, GimpMybrushCoreClass))
+
+
+typedef struct _GimpMybrushCorePrivate GimpMybrushCorePrivate;
+typedef struct _GimpMybrushCoreClass   GimpMybrushCoreClass;
+
+struct _GimpMybrushCore
+{
+  GimpPaintCore           parent_instance;
+
+  GimpMybrushCorePrivate *private;
+};
+
+struct _GimpMybrushCoreClass
+{
+  GimpPaintCoreClass  parent_class;
+};
+
+
+void    gimp_mybrush_core_register (Gimp                      *gimp,
+                                    GimpPaintRegisterCallback  callback);
+
+GType   gimp_mybrush_core_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MYBRUSH_CORE_H__  */
diff --git a/app/paint/gimpmybrushoptions.c b/app/paint/gimpmybrushoptions.c
new file mode 100644
index 0000000..40fa517
--- /dev/null
+++ b/app/paint/gimpmybrushoptions.c
@@ -0,0 +1,219 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpmybrush.h"
+#include "core/gimppaintinfo.h"
+
+#include "gimpmybrushoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_RADIUS,
+  PROP_OPAQUE,
+  PROP_HARDNESS,
+  PROP_ERASER,
+  PROP_NO_ERASING
+};
+
+
+static void   gimp_mybrush_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void   gimp_mybrush_options_set_property     (GObject      *object,
+                                                     guint         property_id,
+                                                     const GValue *value,
+                                                     GParamSpec   *pspec);
+static void   gimp_mybrush_options_get_property     (GObject      *object,
+                                                     guint         property_id,
+                                                     GValue       *value,
+                                                     GParamSpec   *pspec);
+
+static void    gimp_mybrush_options_mybrush_changed (GimpContext  *context,
+                                                     GimpMybrush  *brush);
+
+static void    gimp_mybrush_options_reset           (GimpConfig   *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpMybrushOptions, gimp_mybrush_options,
+                         GIMP_TYPE_PAINT_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_mybrush_options_config_iface_init))
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_mybrush_options_class_init (GimpMybrushOptionsClass *klass)
+{
+  GObjectClass     *object_class  = G_OBJECT_CLASS (klass);
+  GimpContextClass *context_class = GIMP_CONTEXT_CLASS (klass);
+
+  object_class->set_property     = gimp_mybrush_options_set_property;
+  object_class->get_property     = gimp_mybrush_options_get_property;
+
+  context_class->mybrush_changed = gimp_mybrush_options_mybrush_changed;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_RADIUS,
+                           "radius",
+                           _("Radius"),
+                           NULL,
+                           -2.0, 6.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OPAQUE,
+                           "opaque",
+                           _("Base Opacity"),
+                           NULL,
+                           0.0, 2.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HARDNESS,
+                           "hardness",
+                           _("Hardness"),
+                           NULL,
+                           0.0, 1.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ERASER,
+                            "eraser",
+                            _("Erase with this brush"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_NO_ERASING,
+                            "no-erasing",
+                            _("No erasing effect"),
+                            _("Never decrease alpha of existing pixels"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_mybrush_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_mybrush_options_reset;
+}
+
+static void
+gimp_mybrush_options_init (GimpMybrushOptions *options)
+{
+}
+
+static void
+gimp_mybrush_options_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpMybrushOptions *options = GIMP_MYBRUSH_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS:
+      options->radius = g_value_get_double (value);
+      break;
+    case PROP_HARDNESS:
+      options->hardness = g_value_get_double (value);
+      break;
+    case PROP_OPAQUE:
+      options->opaque = g_value_get_double (value);
+      break;
+    case PROP_ERASER:
+      options->eraser = g_value_get_boolean (value);
+      break;
+    case PROP_NO_ERASING:
+      options->no_erasing = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mybrush_options_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpMybrushOptions *options = GIMP_MYBRUSH_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_RADIUS:
+      g_value_set_double (value, options->radius);
+      break;
+    case PROP_OPAQUE:
+      g_value_set_double (value, options->opaque);
+      break;
+    case PROP_HARDNESS:
+      g_value_set_double (value, options->hardness);
+      break;
+    case PROP_ERASER:
+      g_value_set_boolean (value, options->eraser);
+      break;
+    case PROP_NO_ERASING:
+      g_value_set_boolean (value, options->no_erasing);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_mybrush_options_mybrush_changed (GimpContext *context,
+                                      GimpMybrush *brush)
+{
+  if (brush)
+    g_object_set (context,
+                  "radius",   gimp_mybrush_get_radius (brush),
+                  "opaque",   gimp_mybrush_get_opaque (brush),
+                  "hardness", gimp_mybrush_get_hardness (brush),
+                  "eraser",   gimp_mybrush_get_is_eraser (brush),
+                  NULL);
+}
+
+static void
+gimp_mybrush_options_reset (GimpConfig *config)
+{
+  GimpContext *context = GIMP_CONTEXT (config);
+  GimpMybrush *brush   = gimp_context_get_mybrush (context);
+
+  parent_config_iface->reset (config);
+
+  gimp_mybrush_options_mybrush_changed (context, brush);
+}
diff --git a/app/paint/gimpmybrushoptions.h b/app/paint/gimpmybrushoptions.h
new file mode 100644
index 0000000..b1b5cd5
--- /dev/null
+++ b/app/paint/gimpmybrushoptions.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_MYBRUSH_OPTIONS_H__
+#define  __GIMP_MYBRUSH_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_MYBRUSH_OPTIONS            (gimp_mybrush_options_get_type ())
+#define GIMP_MYBRUSH_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MYBRUSH_OPTIONS, GimpMybrushOptions))
+#define GIMP_MYBRUSH_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MYBRUSH_OPTIONS, GimpMybrushOptionsClass))
+#define GIMP_IS_MYBRUSH_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MYBRUSH_OPTIONS))
+#define GIMP_IS_MYBRUSH_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MYBRUSH_OPTIONS))
+#define GIMP_MYBRUSH_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MYBRUSH_OPTIONS, GimpMybrushOptionsClass))
+
+
+typedef struct _GimpMybrushOptionsClass GimpMybrushOptionsClass;
+
+struct _GimpMybrushOptions
+{
+  GimpPaintOptions  parent_instance;
+
+  gdouble           radius;
+  gdouble           opaque;
+  gdouble           hardness;
+  gboolean          eraser;
+  gboolean          no_erasing;
+};
+
+struct _GimpMybrushOptionsClass
+{
+  GimpPaintOptionsClass  parent_instance;
+};
+
+
+GType   gimp_mybrush_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MYBRUSH_OPTIONS_H__  */
diff --git a/app/paint/gimpmybrushsurface.c b/app/paint/gimpmybrushsurface.c
new file mode 100644
index 0000000..9b4283c
--- /dev/null
+++ b/app/paint/gimpmybrushsurface.c
@@ -0,0 +1,560 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include <gegl.h>
+
+#include <mypaint-surface.h>
+
+#include "paint-types.h"
+
+#include "libgimpmath/gimpmath.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include "libgimpcolor/gimpcolor.h"
+
+#include "gimpmybrushoptions.h"
+#include "gimpmybrushsurface.h"
+
+
+struct _GimpMybrushSurface
+{
+  MyPaintSurface surface;
+  GeglBuffer *buffer;
+  GeglBuffer *paint_mask;
+  gint        paint_mask_x;
+  gint        paint_mask_y;
+  GeglRectangle dirty;
+  GimpComponentMask component_mask;
+  GimpMybrushOptions *options;
+};
+
+/* --- Taken from mypaint-tiled-surface.c --- */
+static inline float
+calculate_rr (int   xp,
+              int   yp,
+              float x,
+              float y,
+              float aspect_ratio,
+              float sn,
+              float cs,
+              float one_over_radius2)
+{
+    /* code duplication, see brush::count_dabs_to() */
+    const float yy = (yp + 0.5f - y);
+    const float xx = (xp + 0.5f - x);
+    const float yyr=(yy*cs-xx*sn)*aspect_ratio;
+    const float xxr=yy*sn+xx*cs;
+    const float rr = (yyr*yyr + xxr*xxr) * one_over_radius2;
+    /* rr is in range 0.0..1.0*sqrt(2) */
+    return rr;
+}
+
+static inline float
+calculate_r_sample (float x,
+                    float y,
+                    float aspect_ratio,
+                    float sn,
+                    float cs)
+{
+    const float yyr=(y*cs-x*sn)*aspect_ratio;
+    const float xxr=y*sn+x*cs;
+    const float r = (yyr*yyr + xxr*xxr);
+    return r;
+}
+
+static inline float
+sign_point_in_line (float px,
+                    float py,
+                    float vx,
+                    float vy)
+{
+    return (px - vx) * (-vy) - (vx) * (py - vy);
+}
+
+static inline void
+closest_point_to_line (float  lx,
+                       float  ly,
+                       float  px,
+                       float  py,
+                       float *ox,
+                       float *oy)
+{
+    const float l2 = lx*lx + ly*ly;
+    const float ltp_dot = px*lx + py*ly;
+    const float t = ltp_dot / l2;
+    *ox = lx * t;
+    *oy = ly * t;
+}
+
+
+/* This works by taking the visibility at the nearest point
+ * and dividing by 1.0 + delta.
+ *
+ * - nearest point: point where the dab has more influence
+ * - farthest point: point at a fixed distance away from
+ *                   the nearest point
+ * - delta: how much occluded is the farthest point relative
+ *          to the nearest point
+ */
+static inline float
+calculate_rr_antialiased (int  xp,
+                          int  yp,
+                          float x,
+                          float y,
+                          float aspect_ratio,
+                          float sn,
+                          float cs,
+                          float one_over_radius2,
+                          float r_aa_start)
+{
+    /* calculate pixel position and borders in a way
+     * that the dab's center is always at zero */
+    float pixel_right = x - (float)xp;
+    float pixel_bottom = y - (float)yp;
+    float pixel_center_x = pixel_right - 0.5f;
+    float pixel_center_y = pixel_bottom - 0.5f;
+    float pixel_left = pixel_right - 1.0f;
+    float pixel_top = pixel_bottom - 1.0f;
+
+    float nearest_x, nearest_y; /* nearest to origin, but still inside pixel */
+    float farthest_x, farthest_y; /* farthest from origin, but still inside pixel */
+    float r_near, r_far, rr_near, rr_far;
+    float center_sign, rad_area_1, visibilityNear, delta, delta2;
+
+    /* Dab's center is inside pixel? */
+    if( pixel_left<0 && pixel_right>0 &&
+        pixel_top<0 && pixel_bottom>0 )
+    {
+        nearest_x = 0;
+        nearest_y = 0;
+        r_near = rr_near = 0;
+    }
+    else
+    {
+        closest_point_to_line( cs, sn, pixel_center_x, pixel_center_y, &nearest_x, &nearest_y );
+        nearest_x = CLAMP( nearest_x, pixel_left, pixel_right );
+        nearest_y = CLAMP( nearest_y, pixel_top, pixel_bottom );
+        /* XXX: precision of "nearest" values could be improved
+         * by intersecting the line that goes from nearest_x/Y to 0
+         * with the pixel's borders here, however the improvements
+         * would probably not justify the perdormance cost.
+         */
+        r_near = calculate_r_sample( nearest_x, nearest_y, aspect_ratio, sn, cs );
+        rr_near = r_near * one_over_radius2;
+    }
+
+    /* out of dab's reach? */
+    if( rr_near > 1.0f )
+        return rr_near;
+
+    /* check on which side of the dab's line is the pixel center */
+    center_sign = sign_point_in_line( pixel_center_x, pixel_center_y, cs, -sn );
+
+    /* radius of a circle with area=1
+     *   A = pi * r * r
+     *   r = sqrt(1/pi)
+     */
+    rad_area_1 = sqrtf( 1.0f / M_PI );
+
+    /* center is below dab */
+    if( center_sign < 0 )
+    {
+        farthest_x = nearest_x - sn*rad_area_1;
+        farthest_y = nearest_y + cs*rad_area_1;
+    }
+    /* above dab */
+    else
+    {
+        farthest_x = nearest_x + sn*rad_area_1;
+        farthest_y = nearest_y - cs*rad_area_1;
+    }
+
+    r_far = calculate_r_sample( farthest_x, farthest_y, aspect_ratio, sn, cs );
+    rr_far = r_far * one_over_radius2;
+
+    /* check if we can skip heavier AA */
+    if( r_far < r_aa_start )
+        return (rr_far+rr_near) * 0.5f;
+
+    /* calculate AA approximate */
+    visibilityNear = 1.0f - rr_near;
+    delta = rr_far - rr_near;
+    delta2 = 1.0f + delta;
+    visibilityNear /= delta2;
+
+    return 1.0f - visibilityNear;
+}
+/* -- end mypaint code */
+
+static inline float
+calculate_alpha_for_rr (float rr,
+                        float hardness,
+                        float slope1,
+                        float slope2)
+{
+  if (rr > 1.0f)
+    return 0.0f;
+  else if (rr <= hardness)
+    return 1.0f + rr * slope1;
+  else
+    return rr * slope2 - slope2;
+}
+
+static GeglRectangle
+calculate_dab_roi (float x,
+                   float y,
+                   float radius)
+{
+  int x0 = floor (x - radius);
+  int x1 = ceil (x + radius);
+  int y0 = floor (y - radius);
+  int y1 = ceil (y + radius);
+
+  return *GEGL_RECTANGLE (x0, y0, x1 - x0, y1 - y0);
+}
+
+static void
+gimp_mypaint_surface_get_color (MyPaintSurface *base_surface,
+                                float           x,
+                                float           y,
+                                float           radius,
+                                float          *color_r,
+                                float          *color_g,
+                                float          *color_b,
+                                float          *color_a)
+{
+  GimpMybrushSurface *surface = (GimpMybrushSurface *)base_surface;
+  GeglRectangle dabRect;
+
+  if (radius < 1.0f)
+    radius = 1.0f;
+
+  dabRect = calculate_dab_roi (x, y, radius);
+
+  *color_r = 0.0f;
+  *color_g = 0.0f;
+  *color_b = 0.0f;
+  *color_a = 0.0f;
+
+  if (dabRect.width > 0 || dabRect.height > 0)
+  {
+    const float one_over_radius2 = 1.0f / (radius * radius);
+    float sum_weight = 0.0f;
+    float sum_r = 0.0f;
+    float sum_g = 0.0f;
+    float sum_b = 0.0f;
+    float sum_a = 0.0f;
+
+     /* Read in clamp mode to avoid transparency bleeding in at the edges */
+    GeglBufferIterator *iter = gegl_buffer_iterator_new (surface->buffer, &dabRect, 0,
+                                                         babl_format ("R'aG'aB'aA float"),
+                                                         GEGL_BUFFER_READ,
+                                                         GEGL_ABYSS_CLAMP, 2);
+    if (surface->paint_mask)
+      {
+        GeglRectangle mask_roi = dabRect;
+        mask_roi.x -= surface->paint_mask_x;
+        mask_roi.y -= surface->paint_mask_y;
+        gegl_buffer_iterator_add (iter, surface->paint_mask, &mask_roi, 0,
+                                  babl_format ("Y float"),
+                                  GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+      }
+
+    while (gegl_buffer_iterator_next (iter))
+      {
+        float *pixel = (float *)iter->items[0].data;
+        float *mask;
+        int iy, ix;
+
+        if (surface->paint_mask)
+          mask = iter->items[1].data;
+        else
+          mask = NULL;
+
+        for (iy = iter->items[0].roi.y; iy < iter->items[0].roi.y + iter->items[0].roi.height; iy++)
+          {
+            float yy = (iy + 0.5f - y);
+            for (ix = iter->items[0].roi.x; ix < iter->items[0].roi.x +  iter->items[0].roi.width; ix++)
+              {
+                /* pixel_weight == a standard dab with hardness = 0.5, aspect_ratio = 1.0, and angle = 0.0 */
+                float xx = (ix + 0.5f - x);
+                float rr = (yy * yy + xx * xx) * one_over_radius2;
+                float pixel_weight = 0.0f;
+                if (rr <= 1.0f)
+                  pixel_weight = 1.0f - rr;
+                if (mask)
+                  pixel_weight *= *mask;
+
+                sum_r += pixel_weight * pixel[RED];
+                sum_g += pixel_weight * pixel[GREEN];
+                sum_b += pixel_weight * pixel[BLUE];
+                sum_a += pixel_weight * pixel[ALPHA];
+                sum_weight += pixel_weight;
+
+                pixel += 4;
+                if (mask)
+                  mask += 1;
+              }
+          }
+      }
+
+    if (sum_a > 0.0f && sum_weight > 0.0f)
+      {
+        sum_r /= sum_weight;
+        sum_g /= sum_weight;
+        sum_b /= sum_weight;
+        sum_a /= sum_weight;
+
+        sum_r /= sum_a;
+        sum_g /= sum_a;
+        sum_b /= sum_a;
+
+        /* FIXME: Clamping is wrong because GEGL allows alpha > 1, this should probably re-multipy things */
+        *color_r = CLAMP(sum_r, 0.0f, 1.0f);
+        *color_g = CLAMP(sum_g, 0.0f, 1.0f);
+        *color_b = CLAMP(sum_b, 0.0f, 1.0f);
+        *color_a = CLAMP(sum_a, 0.0f, 1.0f);
+      }
+  }
+
+}
+
+static int
+gimp_mypaint_surface_draw_dab (MyPaintSurface *base_surface,
+                               float           x,
+                               float           y,
+                               float           radius,
+                               float           color_r,
+                               float           color_g,
+                               float           color_b,
+                               float           opaque,
+                               float           hardness,
+                               float           color_a,
+                               float           aspect_ratio,
+                               float           angle,
+                               float           lock_alpha,
+                               float           colorize)
+{
+  GimpMybrushSurface *surface = (GimpMybrushSurface *)base_surface;
+  GeglBufferIterator *iter;
+  GeglRectangle       dabRect;
+  GimpComponentMask   component_mask = surface->component_mask;
+
+  const float one_over_radius2 = 1.0f / (radius * radius);
+  const double angle_rad = angle / 360 * 2 * M_PI;
+  const float cs = cos(angle_rad);
+  const float sn = sin(angle_rad);
+  float normal_mode;
+  float segment1_slope;
+  float segment2_slope;
+  float r_aa_start;
+
+  hardness = CLAMP (hardness, 0.0f, 1.0f);
+  segment1_slope = -(1.0f / hardness - 1.0f);
+  segment2_slope = -hardness / (1.0f - hardness);
+  aspect_ratio = MAX (1.0f, aspect_ratio);
+
+  r_aa_start = radius - 1.0f;
+  r_aa_start = MAX (r_aa_start, 0);
+  r_aa_start = (r_aa_start * r_aa_start) / aspect_ratio;
+
+  normal_mode = opaque * (1.0f - colorize);
+  colorize = opaque * colorize;
+
+  /* FIXME: This should use the real matrix values to trim aspect_ratio dabs */
+  dabRect = calculate_dab_roi (x, y, radius);
+  gegl_rectangle_intersect (&dabRect, &dabRect, gegl_buffer_get_extent (surface->buffer));
+
+  if (dabRect.width <= 0 || dabRect.height <= 0)
+    return 0;
+
+  gegl_rectangle_bounding_box (&surface->dirty, &surface->dirty, &dabRect);
+
+  iter = gegl_buffer_iterator_new (surface->buffer, &dabRect, 0,
+                                   babl_format ("R'G'B'A float"),
+                                   GEGL_BUFFER_READWRITE,
+                                   GEGL_ABYSS_NONE, 2);
+  if (surface->paint_mask)
+    {
+      GeglRectangle mask_roi = dabRect;
+      mask_roi.x -= surface->paint_mask_x;
+      mask_roi.y -= surface->paint_mask_y;
+      gegl_buffer_iterator_add (iter, surface->paint_mask, &mask_roi, 0,
+                                babl_format ("Y float"),
+                                GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+    }
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      float *pixel = (float *)iter->items[0].data;
+      float *mask;
+      int iy, ix;
+
+      if (surface->paint_mask)
+        mask = iter->items[1].data;
+      else
+        mask = NULL;
+
+      for (iy = iter->items[0].roi.y; iy < iter->items[0].roi.y + iter->items[0].roi.height; iy++)
+        {
+          for (ix = iter->items[0].roi.x; ix < iter->items[0].roi.x +  iter->items[0].roi.width; ix++)
+            {
+              float rr, base_alpha, alpha, dst_alpha, r, g, b, a;
+              if (radius < 3.0f)
+                rr = calculate_rr_antialiased (ix, iy, x, y, aspect_ratio, sn, cs, one_over_radius2, r_aa_start);
+              else
+                rr = calculate_rr (ix, iy, x, y, aspect_ratio, sn, cs, one_over_radius2);
+              base_alpha = calculate_alpha_for_rr (rr, hardness, segment1_slope, segment2_slope);
+              alpha = base_alpha * normal_mode;
+              if (mask)
+                alpha *= *mask;
+              dst_alpha = pixel[ALPHA];
+              /* a = alpha * color_a + dst_alpha * (1.0f - alpha);
+               * which converts to: */
+              a = alpha * (color_a - dst_alpha) + dst_alpha;
+              r = pixel[RED];
+              g = pixel[GREEN];
+              b = pixel[BLUE];
+
+              if (a > 0.0f)
+                {
+                  /* By definition the ratio between each color[] and pixel[] component in a non-pre-multipled blend always sums to 1.0f.
+                   * Originally this would have been "(color[n] * alpha * color_a + pixel[n] * dst_alpha * (1.0f - alpha)) / a",
+                   * instead we only calculate the cheaper term. */
+                  float src_term = (alpha * color_a) / a;
+                  float dst_term = 1.0f - src_term;
+                  r = color_r * src_term + r * dst_term;
+                  g = color_g * src_term + g * dst_term;
+                  b = color_b * src_term + b * dst_term;
+                }
+
+              if (colorize > 0.0f && base_alpha > 0.0f)
+                {
+                  alpha = base_alpha * colorize;
+                  a = alpha + dst_alpha - alpha * dst_alpha;
+                  if (a > 0.0f)
+                    {
+                      GimpHSL pixel_hsl, out_hsl;
+                      GimpRGB pixel_rgb = {color_r, color_g, color_b};
+                      GimpRGB out_rgb   = {r, g, b};
+                      float src_term = alpha / a;
+                      float dst_term = 1.0f - src_term;
+
+                      gimp_rgb_to_hsl (&pixel_rgb, &pixel_hsl);
+                      gimp_rgb_to_hsl (&out_rgb, &out_hsl);
+
+                      out_hsl.h = pixel_hsl.h;
+                      out_hsl.s = pixel_hsl.s;
+                      gimp_hsl_to_rgb (&out_hsl, &out_rgb);
+
+                      r = (float)out_rgb.r * src_term + r * dst_term;
+                      g = (float)out_rgb.g * src_term + g * dst_term;
+                      b = (float)out_rgb.b * src_term + b * dst_term;
+                    }
+                }
+
+              if (surface->options->no_erasing)
+                a = MAX (a, pixel[ALPHA]);
+
+              if (component_mask != GIMP_COMPONENT_MASK_ALL)
+                {
+                  if (component_mask & GIMP_COMPONENT_MASK_RED)
+                    pixel[RED]   = r;
+                  if (component_mask & GIMP_COMPONENT_MASK_GREEN)
+                    pixel[GREEN] = g;
+                  if (component_mask & GIMP_COMPONENT_MASK_BLUE)
+                    pixel[BLUE]  = b;
+                  if (component_mask & GIMP_COMPONENT_MASK_ALPHA)
+                    pixel[ALPHA] = a;
+                }
+              else
+                {
+                  pixel[RED]   = r;
+                  pixel[GREEN] = g;
+                  pixel[BLUE]  = b;
+                  pixel[ALPHA] = a;
+                }
+
+              pixel += 4;
+              if (mask)
+                mask += 1;
+            }
+        }
+    }
+
+  return 1;
+}
+
+static void
+gimp_mypaint_surface_begin_atomic (MyPaintSurface *base_surface)
+{
+
+}
+
+static void
+gimp_mypaint_surface_end_atomic (MyPaintSurface   *base_surface,
+                                 MyPaintRectangle *roi)
+{
+  GimpMybrushSurface *surface = (GimpMybrushSurface *)base_surface;
+
+  roi->x         = surface->dirty.x;
+  roi->y         = surface->dirty.y;
+  roi->width     = surface->dirty.width;
+  roi->height    = surface->dirty.height;
+  surface->dirty = *GEGL_RECTANGLE (0, 0, 0, 0);
+}
+
+static void
+gimp_mypaint_surface_destroy (MyPaintSurface *base_surface)
+{
+  GimpMybrushSurface *surface = (GimpMybrushSurface *)base_surface;
+
+  g_clear_object (&surface->buffer);
+  g_clear_object (&surface->paint_mask);
+}
+
+GimpMybrushSurface *
+gimp_mypaint_surface_new (GeglBuffer         *buffer,
+                          GimpComponentMask   component_mask,
+                          GeglBuffer         *paint_mask,
+                          gint                paint_mask_x,
+                          gint                paint_mask_y,
+                          GimpMybrushOptions *options)
+{
+  GimpMybrushSurface *surface = g_malloc0 (sizeof (GimpMybrushSurface));
+
+  mypaint_surface_init ((MyPaintSurface *)surface);
+
+  surface->surface.get_color    = gimp_mypaint_surface_get_color;
+  surface->surface.draw_dab     = gimp_mypaint_surface_draw_dab;
+  surface->surface.begin_atomic = gimp_mypaint_surface_begin_atomic;
+  surface->surface.end_atomic   = gimp_mypaint_surface_end_atomic;
+  surface->surface.destroy      = gimp_mypaint_surface_destroy;
+  surface->component_mask       = component_mask;
+  surface->options              = options;
+  surface->buffer               = g_object_ref (buffer);
+  if (paint_mask)
+    surface->paint_mask         = g_object_ref (paint_mask);
+
+  surface->paint_mask_x         = paint_mask_x;
+  surface->paint_mask_y         = paint_mask_y;
+  surface->dirty                = *GEGL_RECTANGLE (0, 0, 0, 0);
+
+  return surface;
+}
diff --git a/app/paint/gimpmybrushsurface.h b/app/paint/gimpmybrushsurface.h
new file mode 100644
index 0000000..71bc0ba
--- /dev/null
+++ b/app/paint/gimpmybrushsurface.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_MYBRUSH_SURFACE_H__
+#define  __GIMP_MYBRUSH_SURFACE_H__
+
+
+typedef struct _GimpMybrushSurface GimpMybrushSurface;
+
+GimpMybrushSurface *
+gimp_mypaint_surface_new (GeglBuffer         *buffer,
+                          GimpComponentMask   component_mask,
+                          GeglBuffer         *paint_mask,
+                          gint                paint_mask_x,
+                          gint                paint_mask_y,
+                          GimpMybrushOptions *options);
+
+
+#endif  /*  __GIMP_MYBRUSH_SURFACE_H__  */
diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c
new file mode 100644
index 0000000..2afd13c
--- /dev/null
+++ b/app/paint/gimppaintbrush.c
@@ -0,0 +1,395 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-palettes.h"
+#include "core/gimpbrush.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptempbuf.h"
+
+#include "gimppaintbrush.h"
+#include "gimppaintoptions.h"
+
+#include "gimp-intl.h"
+
+
+static void       gimp_paintbrush_paint                        (GimpPaintCore             *paint_core,
+                                                                GimpDrawable              *drawable,
+                                                                GimpPaintOptions          *paint_options,
+                                                                GimpSymmetry              *sym,
+                                                                GimpPaintState             paint_state,
+                                                                guint32                    time);
+
+static gboolean   gimp_paintbrush_real_get_color_history_color (GimpPaintbrush            *paintbrush,
+                                                                GimpDrawable              *drawable,
+                                                                GimpPaintOptions          *paint_options,
+                                                                GimpRGB                   *color);
+static void       gimp_paintbrush_real_get_paint_params        (GimpPaintbrush            *paintbrush,
+                                                                GimpDrawable              *drawable,
+                                                                GimpPaintOptions          *paint_options,
+                                                                GimpSymmetry              *sym,
+                                                                gdouble                    grad_point,
+                                                                GimpLayerMode             *paint_mode,
+                                                                GimpPaintApplicationMode  *paint_appl_mode,
+                                                                const GimpTempBuf        **paint_pixmap,
+                                                                GimpRGB                   *paint_color);
+
+
+G_DEFINE_TYPE (GimpPaintbrush, gimp_paintbrush, GIMP_TYPE_BRUSH_CORE)
+
+
+void
+gimp_paintbrush_register (Gimp                      *gimp,
+                          GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_PAINTBRUSH,
+                GIMP_TYPE_PAINT_OPTIONS,
+                "gimp-paintbrush",
+                _("Paintbrush"),
+                "gimp-tool-paintbrush");
+}
+
+static void
+gimp_paintbrush_class_init (GimpPaintbrushClass *klass)
+{
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+  GimpBrushCoreClass *brush_core_class = GIMP_BRUSH_CORE_CLASS (klass);
+
+  paint_core_class->paint                  = gimp_paintbrush_paint;
+
+  brush_core_class->handles_changing_brush = TRUE;
+
+  klass->get_color_history_color           = gimp_paintbrush_real_get_color_history_color;
+  klass->get_paint_params                  = gimp_paintbrush_real_get_paint_params;
+}
+
+static void
+gimp_paintbrush_init (GimpPaintbrush *paintbrush)
+{
+}
+
+static void
+gimp_paintbrush_paint (GimpPaintCore    *paint_core,
+                       GimpDrawable     *drawable,
+                       GimpPaintOptions *paint_options,
+                       GimpSymmetry     *sym,
+                       GimpPaintState    paint_state,
+                       guint32           time)
+{
+  GimpPaintbrush *paintbrush = GIMP_PAINTBRUSH (paint_core);
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      {
+        GimpRGB color;
+
+        if (GIMP_PAINTBRUSH_GET_CLASS (paintbrush)->get_color_history_color &&
+            GIMP_PAINTBRUSH_GET_CLASS (paintbrush)->get_color_history_color (
+              paintbrush, drawable, paint_options, &color))
+          {
+            GimpContext *context = GIMP_CONTEXT (paint_options);
+
+            gimp_palettes_add_color_history (context->gimp, &color);
+          }
+      }
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      _gimp_paintbrush_motion (paint_core, drawable, paint_options,
+                               sym, GIMP_OPACITY_OPAQUE);
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      {
+        if (paintbrush->paint_buffer)
+          {
+            g_object_remove_weak_pointer (
+              G_OBJECT (paintbrush->paint_buffer),
+              (gpointer) &paintbrush->paint_buffer);
+
+            paintbrush->paint_buffer = NULL;
+          }
+
+        g_clear_pointer (&paintbrush->paint_pixmap, gimp_temp_buf_unref);
+      }
+      break;
+    }
+}
+
+static gboolean
+gimp_paintbrush_real_get_color_history_color (GimpPaintbrush   *paintbrush,
+                                              GimpDrawable     *drawable,
+                                              GimpPaintOptions *paint_options,
+                                              GimpRGB          *color)
+{
+  GimpContext   *context    = GIMP_CONTEXT (paint_options);
+  GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paintbrush);
+  GimpDynamics  *dynamics   = gimp_context_get_dynamics (context);
+
+  /* We don't save gradient color history and pixmap brushes
+   * have no color to save.
+   */
+  if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_COLOR) ||
+      (brush_core->brush && gimp_brush_get_pixmap (brush_core->brush)))
+    {
+      return FALSE;
+    }
+
+  gimp_context_get_foreground (context, color);
+
+  return TRUE;
+}
+
+static void
+gimp_paintbrush_real_get_paint_params (GimpPaintbrush            *paintbrush,
+                                       GimpDrawable              *drawable,
+                                       GimpPaintOptions          *paint_options,
+                                       GimpSymmetry              *sym,
+                                       gdouble                    grad_point,
+                                       GimpLayerMode             *paint_mode,
+                                       GimpPaintApplicationMode  *paint_appl_mode,
+                                       const GimpTempBuf        **paint_pixmap,
+                                       GimpRGB                   *paint_color)
+{
+  GimpPaintCore *paint_core = GIMP_PAINT_CORE (paintbrush);
+  GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paintbrush);
+  GimpContext   *context    = GIMP_CONTEXT (paint_options);
+  GimpImage     *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  *paint_mode = gimp_context_get_paint_mode (context);
+
+  if (gimp_paint_options_get_gradient_color (paint_options, image,
+                                             grad_point,
+                                             paint_core->pixel_dist,
+                                             paint_color))
+    {
+      /* optionally take the color from the current gradient */
+      gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                         paint_color, paint_color);
+
+      *paint_appl_mode = GIMP_PAINT_INCREMENTAL;
+    }
+  else if (brush_core->brush && gimp_brush_get_pixmap (brush_core->brush))
+    {
+      /* otherwise check if the brush has a pixmap and use that to
+       * color the area
+       */
+      *paint_pixmap = gimp_brush_core_get_brush_pixmap (brush_core);
+
+      *paint_appl_mode = GIMP_PAINT_INCREMENTAL;
+    }
+  else
+    {
+      /* otherwise fill the area with the foreground color */
+      gimp_context_get_foreground (context, paint_color);
+
+      gimp_pickable_srgb_to_image_color (GIMP_PICKABLE (drawable),
+                                         paint_color, paint_color);
+    }
+}
+
+void
+_gimp_paintbrush_motion (GimpPaintCore    *paint_core,
+                         GimpDrawable     *drawable,
+                         GimpPaintOptions *paint_options,
+                         GimpSymmetry     *sym,
+                         gdouble           opacity)
+{
+  GimpBrushCore    *brush_core = GIMP_BRUSH_CORE (paint_core);
+  GimpPaintbrush   *paintbrush = GIMP_PAINTBRUSH (paint_core);
+  GimpContext      *context    = GIMP_CONTEXT (paint_options);
+  GimpDynamics     *dynamics   = brush_core->dynamics;
+  GimpImage        *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+  gdouble           fade_point;
+  gdouble           grad_point;
+  gdouble           force;
+  const GimpCoords *coords;
+  gint              n_strokes;
+  gint              i;
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  coords = gimp_symmetry_get_origin (sym);
+  /* Some settings are based on the original stroke. */
+  opacity *= gimp_dynamics_get_linear_value (dynamics,
+                                             GIMP_DYNAMICS_OUTPUT_OPACITY,
+                                             coords,
+                                             paint_options,
+                                             fade_point);
+  if (opacity == 0.0)
+    return;
+
+  if (GIMP_BRUSH_CORE_GET_CLASS (brush_core)->handles_transforming_brush)
+    {
+      gimp_brush_core_eval_transform_dynamics (brush_core,
+                                               drawable,
+                                               paint_options,
+                                               coords);
+    }
+
+  grad_point = gimp_dynamics_get_linear_value (dynamics,
+                                               GIMP_DYNAMICS_OUTPUT_COLOR,
+                                               coords,
+                                               paint_options,
+                                               fade_point);
+
+  n_strokes = gimp_symmetry_get_size (sym);
+  for (i = 0; i < n_strokes; i++)
+    {
+      GimpLayerMode             paint_mode;
+      GimpPaintApplicationMode  paint_appl_mode;
+      GeglBuffer               *paint_buffer;
+      gint                      paint_buffer_x;
+      gint                      paint_buffer_y;
+      const GimpTempBuf        *paint_pixmap = NULL;
+      GimpRGB                   paint_color;
+      gint                      paint_width, paint_height;
+
+      paint_appl_mode = paint_options->application_mode;
+
+      GIMP_PAINTBRUSH_GET_CLASS (paintbrush)->get_paint_params (paintbrush,
+                                                                drawable,
+                                                                paint_options,
+                                                                sym,
+                                                                grad_point,
+                                                                &paint_mode,
+                                                                &paint_appl_mode,
+                                                                &paint_pixmap,
+                                                                &paint_color);
+
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      if (GIMP_BRUSH_CORE_GET_CLASS (brush_core)->handles_transforming_brush)
+        gimp_brush_core_eval_transform_symmetry (brush_core, sym, i);
+
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       paint_mode,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       &paint_width,
+                                                       &paint_height);
+      if (! paint_buffer)
+        continue;
+
+      if (! paint_pixmap)
+        {
+          opacity *= paint_color.a;
+          gimp_rgb_set_alpha (&paint_color, GIMP_OPACITY_OPAQUE);
+        }
+
+      /* fill the paint buffer.  we can skip this step when reusing the
+       * previous paint buffer, if the paint color/pixmap hasn't changed
+       * (unless using an applicator, which currently modifies the paint buffer
+       * in-place).
+       */
+      if (paint_core->applicator                   ||
+          paint_buffer != paintbrush->paint_buffer ||
+          paint_pixmap != paintbrush->paint_pixmap ||
+          (! paint_pixmap && (gimp_rgba_distance (&paint_color,
+                                                  &paintbrush->paint_color))))
+        {
+          if (paint_buffer != paintbrush->paint_buffer)
+            {
+              if (paintbrush->paint_buffer)
+                {
+                  g_object_remove_weak_pointer (
+                    G_OBJECT (paintbrush->paint_buffer),
+                    (gpointer) &paintbrush->paint_buffer);
+                }
+
+              paintbrush->paint_buffer = paint_buffer;
+
+              g_object_add_weak_pointer (
+                G_OBJECT (paintbrush->paint_buffer),
+                (gpointer) &paintbrush->paint_buffer);
+            }
+
+          if (paint_pixmap != paintbrush->paint_pixmap)
+            {
+              g_clear_pointer (&paintbrush->paint_pixmap, gimp_temp_buf_unref);
+
+              if (paint_pixmap)
+                paintbrush->paint_pixmap = gimp_temp_buf_ref (paint_pixmap);
+            }
+
+          paintbrush->paint_color = paint_color;
+
+          if (paint_pixmap)
+            {
+              gimp_brush_core_color_area_with_pixmap (brush_core, drawable,
+                                                      coords,
+                                                      paint_buffer,
+                                                      paint_buffer_x,
+                                                      paint_buffer_y,
+                                                      FALSE);
+            }
+          else
+            {
+              GeglColor *color;
+
+              color = gimp_gegl_color_new (&paint_color);
+
+              gegl_buffer_set_color (paint_buffer, NULL, color);
+
+              g_object_unref (color);
+            }
+        }
+
+      if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_FORCE))
+        force = gimp_dynamics_get_linear_value (dynamics,
+                                                GIMP_DYNAMICS_OUTPUT_FORCE,
+                                                coords,
+                                                paint_options,
+                                                fade_point);
+      else
+        force = paint_options->brush_force;
+
+      /* finally, let the brush core paste the colored area on the canvas */
+      gimp_brush_core_paste_canvas (brush_core, drawable,
+                                    coords,
+                                    MIN (opacity, GIMP_OPACITY_OPAQUE),
+                                    gimp_context_get_opacity (context),
+                                    paint_mode,
+                                    gimp_paint_options_get_brush_mode (paint_options),
+                                    force,
+                                    paint_appl_mode);
+    }
+}
diff --git a/app/paint/gimppaintbrush.h b/app/paint/gimppaintbrush.h
new file mode 100644
index 0000000..61f8d85
--- /dev/null
+++ b/app/paint/gimppaintbrush.h
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINTBRUSH_H__
+#define __GIMP_PAINTBRUSH_H__
+
+
+#include "gimpbrushcore.h"
+
+
+#define GIMP_TYPE_PAINTBRUSH            (gimp_paintbrush_get_type ())
+#define GIMP_PAINTBRUSH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINTBRUSH, GimpPaintbrush))
+#define GIMP_PAINTBRUSH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINTBRUSH, GimpPaintbrushClass))
+#define GIMP_IS_PAINTBRUSH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINTBRUSH))
+#define GIMP_IS_PAINTBRUSH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINTBRUSH))
+#define GIMP_PAINTBRUSH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINTBRUSH, GimpPaintbrushClass))
+
+
+typedef struct _GimpPaintbrushClass GimpPaintbrushClass;
+
+struct _GimpPaintbrush
+{
+  GimpBrushCore      parent_instance;
+
+  GeglBuffer        *paint_buffer;
+  const GimpTempBuf *paint_pixmap;
+  GimpRGB            paint_color;
+};
+
+struct _GimpPaintbrushClass
+{
+  GimpBrushCoreClass  parent_class;
+
+  /*  virtual functions  */
+  gboolean   (* get_color_history_color) (GimpPaintbrush            *paintbrush,
+                                          GimpDrawable              *drawable,
+                                          GimpPaintOptions          *paint_options,
+                                          GimpRGB                   *color);
+  void       (* get_paint_params)        (GimpPaintbrush            *paintbrush,
+                                          GimpDrawable              *drawable,
+                                          GimpPaintOptions          *paint_options,
+                                          GimpSymmetry              *sym,
+                                          gdouble                    grad_point,
+                                          GimpLayerMode             *paint_mode,
+                                          GimpPaintApplicationMode  *paint_appl_mode,
+                                          const GimpTempBuf        **paint_pixmap,
+                                          GimpRGB                   *paint_color);
+};
+
+
+void    gimp_paintbrush_register (Gimp                      *gimp,
+                                  GimpPaintRegisterCallback  callback);
+
+GType   gimp_paintbrush_get_type (void) G_GNUC_CONST;
+
+
+/*  protected  */
+
+void    _gimp_paintbrush_motion  (GimpPaintCore             *paint_core,
+                                  GimpDrawable              *drawable,
+                                  GimpPaintOptions          *paint_options,
+                                  GimpSymmetry              *sym,
+                                  gdouble                    opacity);
+
+
+#endif  /*  __GIMP_PAINTBRUSH_H__  */
diff --git a/app/paint/gimppaintcore-loops.cc b/app/paint/gimppaintcore-loops.cc
new file mode 100644
index 0000000..c92370d
--- /dev/null
+++ b/app/paint/gimppaintcore-loops.cc
@@ -0,0 +1,2268 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2013 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+extern "C"
+{
+
+#include "paint-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "core/gimptempbuf.h"
+
+#include "operations/gimpoperationmaskcomponents.h"
+
+#include "operations/layer-modes/gimpoperationlayermode.h"
+
+#include "gimppaintcore-loops.h"
+
+} /* extern "C" */
+
+
+#define PIXELS_PER_THREAD \
+  (/* each thread costs as much as */ 64.0 * 64.0 /* pixels */)
+
+
+/* In order to avoid iterating over the same region of the same buffers
+ * multiple times, when calling more than one of the paint-core loop functions
+ * (hereafter referred to as "algorithms") in succession, we provide a single
+ * function, gimp_paint_core_loops_process(), which can be used to perform
+ * multiple algorithms in a row.  This function takes a pointer to a
+ * GimpPaintCoreLoopsParams structure, providing the parameters for the
+ * algorithms, and a GimpPaintCoreLoopsAlgorithm bitset, which specifies the
+ * set of algorithms to run; currently, the algorithms are always run in a
+ * fixed order.  For convenience, we provide public functions for the
+ * individual algorithms, but they're merely wrappers around
+ * gimp_paint_core_loops_process().
+ *
+ * We use some C++ magic to statically generate specialized versions of
+ * gimp_paint_core_loops_process() for all possible combinations of algorithms,
+ * and, where relevant, formats and input parameters, and to dispatch to the
+ * correct version at runtime.
+ *
+ * To achieve this, each algorithm provides two components:
+ *
+ *   - The algorithm class template, which implements the algorithm, following
+ *     a common interface.  See the AlgorithmBase class for a description of
+ *     the interface.  Each algorithm class takes its base class as a template
+ *     parameter, which allows us to construct a class hierarchy corresponding
+ *     to a specific set of algorithms.  Some classes in the hierarchy are not
+ *     algorithms themselves, but are rather helpers, which provide some
+ *     functionality to the algorithms further down the hierarchy, such as
+ *     access to specific buffers.
+ *
+ *   - A dispatch function, which takes the input parameters, the requested set
+ *     of algorithms, the (type of) the current algorithm hierarchy, and a
+ *     visitor object.  The function calls the visitor with a (potentially)
+ *     modified hierarchy, depending on the input.  Ihe dispatch function for
+ *     an algorithm checks if the requested set of algorithms contains a
+ *     certain algorithm, adds the said algorithm to the hierarchy accordingly,
+ *     and calls the visitor with the new hierarchy.  See the AlgorithmDispatch
+ *     class, which provides a dispatch-function implementation which
+ *     algorithms can use instead of providing their own dispatch function.
+ *
+ *     Helper classes in the hierarchy may also provide dispatch functions,
+ *     which likewise modify the hierarchy based on the input parameters.  For
+ *     example, the dispatch_paint_mask() function adds a certain PaintMask
+ *     specialization to the hierarchy, depending on the format of the paint
+ *     mask buffer; this can be used to specialize algorithms based on the mask
+ *     format; an algorithm that depends on the paint mask may dispatch through
+ *     this function, before modifying the hierarchy itself.
+ *
+ * The dispatch() function is used to construct an algorithm hierarchy by
+ * dispatching through a list of functions.  gimp_paint_core_loops_process()
+ * calls dispatch() with the full list of algorithm dispatch functions,
+ * receiving in return the algorithm hierarchy matching the input.  It then
+ * uses the algorithm interface to perform the actual processing.
+ */
+
+
+enum
+{
+  ALGORITHM_PAINT_BUF              = 1u << 31,
+  ALGORITHM_PAINT_MASK             = 1u << 30,
+  ALGORITHM_STIPPLE                = 1u << 29,
+  ALGORITHM_COMP_MASK              = 1u << 28,
+  ALGORITHM_TEMP_COMP_MASK         = 1u << 27,
+  ALGORITHM_COMP_BUFFER            = 1u << 26,
+  ALGORITHM_TEMP_COMP_BUFFER       = 1u << 25,
+  ALGORITHM_CANVAS_BUFFER_ITERATOR = 1u << 24,
+  ALGORITHM_MASK_BUFFER_ITERATOR   = 1u << 23
+};
+
+
+template <class T>
+struct identity
+{
+  using type = T;
+};
+
+
+/* dispatch():
+ *
+ * Takes a list of dispatch function objects, and calls each of them, in order,
+ * with the same 'params' and 'algorithms' parameters, passing 'algorithm' as
+ * the input hierarchy to the first dispatch function, and passing the output
+ * hierarchy of the previous dispatch function as the input hierarchy for the
+ * next dispatch function.  Calls 'visitor' with the output hierarchy of the
+ * last dispatch function.
+ *
+ * Each algorithm hierarchy should provide a 'filter' static data member, and
+ * each dispatch function object should provide a 'mask' static data member.
+ * If the bitwise-AND of the current hierarchy's 'filter' member and the
+ * current dispatch function's 'mask' member is equal to 'mask', the dispatch
+ * function is skipped.  This can be used to make sure that a class appears
+ * only once in the hierarchy, even if its dispatch function is used multiple
+ * times, or to prevent an algorithm from being dispatched, if it cannot be
+ * used together with another algorithm.
+ */
+
+template <class Visitor,
+          class Algorithm>
+static inline void
+dispatch (Visitor                         visitor,
+          const GimpPaintCoreLoopsParams *params,
+          GimpPaintCoreLoopsAlgorithm     algorithms,
+          identity<Algorithm>             algorithm)
+{
+  visitor (algorithm);
+}
+
+template <class Algorithm,
+          class Dispatch,
+          gboolean = (Algorithm::filter & Dispatch::mask) == Dispatch::mask>
+struct dispatch_impl
+{
+  template <class    Visitor,
+            class... DispatchRest>
+  static void
+  apply (Visitor                         visitor,
+         const GimpPaintCoreLoopsParams *params,
+         GimpPaintCoreLoopsAlgorithm     algorithms,
+         identity<Algorithm>             algorithm,
+         Dispatch                        disp,
+         DispatchRest...                 disp_rest)
+  {
+    disp (
+      [&] (auto algorithm)
+      {
+        dispatch (visitor, params, algorithms, algorithm, disp_rest...);
+      },
+      params, algorithms, algorithm);
+  }
+};
+
+template <class Algorithm,
+          class Dispatch>
+struct dispatch_impl<Algorithm, Dispatch, TRUE>
+{
+  template <class    Visitor,
+            class... DispatchRest>
+  static void
+  apply (Visitor                         visitor,
+         const GimpPaintCoreLoopsParams *params,
+         GimpPaintCoreLoopsAlgorithm     algorithms,
+         identity<Algorithm>             algorithm,
+         Dispatch                        disp,
+         DispatchRest...                 disp_rest)
+  {
+    dispatch (visitor, params, algorithms, algorithm, disp_rest...);
+  }
+};
+
+template <class    Visitor,
+          class    Algorithm,
+          class    Dispatch,
+          class... DispatchRest>
+static inline void
+dispatch (Visitor                         visitor,
+          const GimpPaintCoreLoopsParams *params,
+          GimpPaintCoreLoopsAlgorithm     algorithms,
+          identity<Algorithm>             algorithm,
+          Dispatch                        disp,
+          DispatchRest...                 disp_rest)
+{
+  dispatch_impl<Algorithm, Dispatch>::apply (
+    visitor, params, algorithms, algorithm, disp, disp_rest...);
+}
+
+
+/* value_to_float():
+ *
+ * Converts a component value to float.
+ */
+
+static inline gfloat
+value_to_float (guint8 value)
+{
+  return value / 255.0f;
+}
+
+static inline gfloat
+value_to_float (gfloat value)
+{
+  return value;
+}
+
+template <class T>
+static inline gfloat
+value_to_float (T value) = delete;
+
+
+/* AlgorithmBase:
+ *
+ * The base class of the algorithm hierarchy.
+ */
+
+struct AlgorithmBase
+{
+  /* Used to filter-out dispatch functions; see the description of dispatch().
+   * Algorithms that redefine 'filter' should bitwise-OR their filter with that
+   * of their base class.
+   */
+  static constexpr guint          filter          = 0;
+
+  /* The current maximal number of iterators used by the hierarchy.  Algorithms
+   * should redefine 'max_n_iterators' by adding the maximal number of
+   * iterators they use to this value.
+   */
+  static constexpr gint           max_n_iterators = 0;
+
+  /* Non-static data members should be initialized in the constructor, and
+   * should not be further modified.
+   */
+  explicit
+  AlgorithmBase (const GimpPaintCoreLoopsParams *params)
+  {
+  }
+
+  /* Algorithms should store their dynamic state in the 'State' member class
+   * template.  This template will be instantiated with the most-derived type
+   * of the hierarchy, which allows an algorithm to depend on the properties of
+   * its descendants.  Algorithms that provide their own 'State' class should
+   * derive it from the 'State' class of their base class, passing 'Derived' as
+   * the template argument.
+   *
+   * Algorithms can be run in parallel on multiple threads.  In this case, each
+   * thread uses its own 'State' object, while the algorithm object itself is
+   * either shared, or is a copy of a shared algorithm object.  Either way, the
+   * algorithm object itself is immutable, while the state object is mutable.
+   */
+  template <class Derived>
+  struct State
+  {
+  };
+
+  /* The 'init()' function is called once per state object before processing
+   * starts, and should initialize the state object, and, if necessary, the
+   * iterator.
+   *
+   * 'params' is the same parameter struct passed to the constructor.  'state'
+   * is the state object.  'iter' is the iterator; each distinct state object
+   * uses a distinct iterator; if the algorithm hierarchy doesn't use any
+   * iterator, 'iter' may be NULL.  'roi' is the full region to be processed.
+   * 'area' is the subregion to be processed by the current state object.
+   *
+   * An algorithm that overrides this function should call the 'init()'
+   * function of its base class first, using the same arguments.
+   */
+  template <class Derived>
+  void
+  init (const GimpPaintCoreLoopsParams *params,
+        State<Derived>                 *state,
+        GeglBufferIterator             *iter,
+        const GeglRectangle            *roi,
+        const GeglRectangle            *area) const
+  {
+  }
+
+  /* The 'init_step()' function is called once after each
+   * 'gegl_buffer_iterator_next()' call, and should perform any necessary
+   * initialization required before processing the current chunk.
+   *
+   * The parameters are the same as for 'init()', with the addition of 'rect',
+   * which is the area of the current chunk.
+   *
+   * An algorithm that overrides this function should call the 'init_step()'
+   * function of its base class first, using the same arguments.
+   */
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+  }
+
+  /* The 'process_row()' function is called for each row in the current chunk,
+   * and should perform the actual processing.
+   *
+   * The parameters are the same as for 'init_step()', with the addition of
+   * 'y', which is the current row.
+   *
+   * An algorithm that overrides this function should call the 'process_row()'
+   * function of its base class first, using the same arguments.
+   */
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+  }
+
+  /* The 'finalize_step()' function is called once per chunk after its
+   * processing is done, and should finalize any chunk-specific resources of
+   * the state object.
+   *
+   * 'params' is the same parameter struct passed to the constructor.  'state'
+   * is the state object.
+   *
+   * An algorithm that overrides this function should call the
+   * 'finalize_step()' function of its base class after performing its own
+   * finalization, using the same arguments.
+   */
+  template <class Derived>
+  void
+  finalize_step (const GimpPaintCoreLoopsParams *params,
+                 State<Derived>                 *state) const
+  {
+  }
+
+  /* The 'finalize()' function is called once per state object after processing
+   * is done, and should finalize the state object.
+   *
+   * 'params' is the same parameter struct passed to the constructor.  'state'
+   * is the state object.
+   *
+   * An algorithm that overrides this function should call the 'finalize()'
+   * function of its base class after performing its own finalization, using
+   * the same arguments.
+   */
+  template <class Derived>
+  void
+  finalize (const GimpPaintCoreLoopsParams *params,
+            State<Derived>                 *state) const
+  {
+  }
+};
+
+
+/* BasicDispatch:
+ *
+ * A class template implementing a simple dispatch function object, which adds
+ * an algorithm to the hierarchy unconditionally.  'AlgorithmTemplate' is the
+ * alogithm class template (usually a helper class, rather than an actual
+ * algorithm), 'Mask' is the dispatch function mask, as described in
+ * 'dispatch()', and 'Dependencies' is a list of (types of) dispatch functions
+ * the algorithm depends on.
+ *
+ * Before adding the algorithm to the hierarchy, the hierarchy is augmented by
+ * dispatching through the list of dependencies, in order.
+ */
+
+template <template <class Base> class AlgorithmTemplate,
+          guint                       Mask,
+          class...                    Dependencies>
+struct BasicDispatch
+{
+  static constexpr guint mask = Mask;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    dispatch (
+      [&] (auto algorithm)
+      {
+        using NewAlgorithm = typename decltype (algorithm)::type;
+
+        visitor (identity<AlgorithmTemplate<NewAlgorithm>> ());
+      },
+      params, algorithms, algorithm, Dependencies ()...);
+  }
+};
+
+template <template <class Base> class AlgorithmTemplate,
+          guint                       Mask>
+struct BasicDispatch<AlgorithmTemplate, Mask>
+{
+  static constexpr guint mask = Mask;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    visitor (identity<AlgorithmTemplate<Algorithm>> ());
+  }
+};
+
+
+/* AlgorithmDispatch:
+ *
+ * A class template implementing a dispatch function suitable for dispatching
+ * algorithms.  'AlgorithmTemplate' is the algorithm class template, 'Mask' is
+ * the dispatch function mask, as described in 'dispatch()', and 'Dependencies'
+ * is a list of (types of) dispatch functions the algorithm depends on, used as
+ * explained below.
+ *
+ * 'AlgorithmDispatch' adds the algorithm to the hierarchy if it's included in
+ * the set of requested algorithms; specifically, if the bitwise-AND of the
+ * requested-algorithms bitset and of 'Mask' is equal to 'Mask'.
+ *
+ * Before adding the algorithm to the hierarchy, the hierarchy is augmented by
+ * dispatching through the list of dependencies, in order.
+ */
+
+template <template <class Base> class AlgorithmTemplate,
+          guint                       Mask,
+          class...                    Dependencies>
+struct AlgorithmDispatch
+{
+  static constexpr guint mask = Mask;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    if ((algorithms & mask) == mask)
+      {
+        dispatch (
+          [&] (auto algorithm)
+          {
+            using NewAlgorithm = typename decltype (algorithm)::type;
+
+            visitor (identity<AlgorithmTemplate<NewAlgorithm>> ());
+          },
+          params, algorithms, algorithm, Dependencies ()...);
+      }
+    else
+      {
+        visitor (algorithm);
+      }
+  }
+};
+
+
+/* MandatoryAlgorithmDispatch:
+ *
+ * A class template implementing a dispatch function suitable for dispatching
+ * algorithms that must be included in all hierarchies.  'AlgorithmTemplate' is
+ * the algorithm class template, 'Mask' is the dispatch function mask, as
+ * described in 'dispatch()', and 'Dependencies' is a list of (types of)
+ * dispatch functions the algorithm depends on, used as explained below.
+ *
+ * 'MandatoryAlgorithmDispatch' verifies that the algorithm is included in the
+ * set of requested algorithms (specifically, that the bitwise-AND of the
+ * requested-algorithms bitset and of 'Mask' is equal to 'Mask'), and adds the
+ * it to the hierarchy unconditionally.
+ *
+ * Before adding the algorithm to the hierarchy, the hierarchy is augmented by
+ * dispatching through the list of dependencies, in order.
+ */
+
+template <template <class Base> class AlgorithmTemplate,
+          guint                       Mask,
+          class...                    Dependencies>
+struct MandatoryAlgorithmDispatch
+{
+  static constexpr guint mask = Mask;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    g_return_if_fail ((algorithms & Mask) == Mask);
+
+    BasicDispatch<AlgorithmTemplate, Mask, Dependencies...> () (visitor,
+                                                                params,
+                                                                algorithms,
+                                                                algorithm);
+  }
+};
+
+/* SuppressedAlgorithmDispatch:
+ *
+ * A class template implementing a placeholder dispatch function suitable for
+ * dispatching algorithms that are never included in any hierarchy.
+ * 'AlgorithmTemplate' is the algorithm class template, 'Mask' is the dispatch
+ * function mask, as described in 'dispatch()', and 'Dependencies' is a list of
+ * (types of) dispatch functions the algorithm depends on.  Note that
+ * 'AlgorithmTemplate' and 'Dependencies' are not actually used, and are merely
+ * included for exposition.
+ *
+ * 'SuppressedAlgorithmDispatch' verifies that the algorithm is not included in
+ * the set of requested algorithms (specifically, that the bitwise-AND of the
+ * requested-algorithms bitset and of 'Mask' is not equal to 'Mask'), and
+ * doesn't modify the hierarchy.
+ */
+
+template <template <class Base> class AlgorithmTemplate,
+          guint                       Mask,
+          class...                    Dependencies>
+struct SuppressedAlgorithmDispatch
+{
+  static constexpr guint mask = Mask;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    g_return_if_fail ((algorithms & Mask) != Mask);
+
+    visitor (algorithm);
+  }
+};
+
+
+/* PaintBuf, dispatch_paint_buf():
+ *
+ * An algorithm helper class, providing access to the paint buffer.  Algorithms
+ * that use the paint buffer should specify 'dispatch_paint_buf()' as a
+ * dependency, and access 'PaintBuf' members through their base type/subobject.
+ */
+
+template <class Base>
+struct PaintBuf : Base
+{
+  /* Component type of the paint buffer. */
+  using paint_type = gfloat;
+
+  static constexpr guint filter = Base::filter | ALGORITHM_PAINT_BUF;
+
+  /* Paint buffer stride, in 'paint_type' elements. */
+  gint        paint_stride;
+  /* Pointer to the start of the paint buffer data. */
+  paint_type *paint_data;
+
+  explicit
+  PaintBuf (const GimpPaintCoreLoopsParams *params) :
+    Base (params)
+  {
+    paint_stride = gimp_temp_buf_get_width (params->paint_buf) * 4;
+    paint_data   = (paint_type *) gimp_temp_buf_get_data (params->paint_buf);
+  }
+};
+
+static BasicDispatch<PaintBuf, ALGORITHM_PAINT_BUF> dispatch_paint_buf;
+
+
+/* PaintMask, dispatch_paint_mask():
+ *
+ * An algorithm helper class, providing access to the paint mask.  Algorithms
+ * that use the paint mask should specify 'dispatch_paint_mask()' as a
+ * dependency, and access 'PaintMask' members through their base type/
+ * subobject.
+ */
+
+template <class Base,
+          class MaskType>
+struct PaintMask : Base
+{
+  /* Component type of the paint mask. */
+  using mask_type = MaskType;
+
+  static constexpr guint filter = Base::filter | ALGORITHM_PAINT_MASK;
+
+  /* Paint mask stride, in 'mask_type' elements. */
+  gint             mask_stride;
+  /* Pointer to the start of the paint mask data, taking the mask offset into
+   * account.
+   */
+  const mask_type *mask_data;
+
+  explicit
+  PaintMask (const GimpPaintCoreLoopsParams *params) :
+    Base (params)
+  {
+    mask_stride = gimp_temp_buf_get_width (params->paint_mask);
+    mask_data   =
+      (const mask_type *) gimp_temp_buf_get_data (params->paint_mask) +
+      params->paint_mask_offset_y * mask_stride                       +
+      params->paint_mask_offset_x;
+  }
+};
+
+struct DispatchPaintMask
+{
+  static constexpr guint mask = ALGORITHM_PAINT_MASK;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    const Babl *mask_format = gimp_temp_buf_get_format (params->paint_mask);
+
+    if (mask_format == babl_format ("Y u8"))
+      visitor (identity<PaintMask<Algorithm, guint8>> ());
+    else if (mask_format == babl_format ("Y float"))
+      visitor (identity<PaintMask<Algorithm, gfloat>> ());
+    else
+      g_warning ("Mask format not supported: %s", babl_get_name (mask_format));
+  }
+} static dispatch_paint_mask;
+
+
+/* Stipple, dispatch_stipple():
+ *
+ * An algorithm helper class, providing access to the 'stipple' parameter.
+ * Algorithms that use the 'stipple' parameter should specify
+ * 'dispatch_stipple()' as a dependency, and access 'Stipple' members through
+ * their base type/subobject.
+ */
+
+template <class    Base,
+          gboolean StippleFlag>
+struct Stipple : Base
+{
+  static constexpr guint filter = Base::filter | ALGORITHM_STIPPLE;
+
+  /* The value of the 'stipple' parameter, usable as a constant expression. */
+  static constexpr gboolean stipple = StippleFlag;
+
+  using Base::Base;
+};
+
+struct DispatchStipple
+{
+  static constexpr guint mask = ALGORITHM_STIPPLE;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    if (params->stipple)
+      visitor (identity<Stipple<Algorithm, TRUE>> ());
+    else
+      visitor (identity<Stipple<Algorithm, FALSE>> ());
+  }
+} static dispatch_stipple;
+
+
+/* CompMask, dispatch_comp_mask(), has_comp_mask(), comp_mask_data():
+ *
+ * An algorithm helper class, providing access to the mask used for
+ * compositing.  When this class is part of the hierarchy, 'DoLayerBlend' uses
+ * this buffer as the mask, instead of the input parameters' 'mask_buffer'.
+ * Algorithms that use the compositing mask should specify
+ * 'dispatch_comp_mask()' as a dependency, and access 'CompMask' members
+ * through their base type/subobject.
+ *
+ * Note that 'CompMask' only provides *access* to the compositing mask, but
+ * doesn't provide its actual *storage*.  This is the responsibility of the
+ * algorithms that use 'CompMask'.  Algorithms that need temporary storage for
+ * the compositing mask can use 'TempCompMask'.
+ *
+ * The 'has_comp_mask()' constexpr function determines if a given algorithm
+ * hierarchy uses the compositing mask.
+ *
+ * The 'comp_mask_data()' function returns a pointer to the compositing mask
+ * data for the current row if the hierarchy uses the compositing mask, or NULL
+ * otherwise.
+ */
+
+template <class Base>
+struct CompMask : Base
+{
+  /* Component type of the compositing mask. */
+  using comp_mask_type = gfloat;
+
+  static constexpr guint filter = Base::filter | ALGORITHM_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    /* Pointer to the compositing mask data for the current row. */
+    comp_mask_type *comp_mask_data;
+  };
+};
+
+static BasicDispatch<CompMask, ALGORITHM_COMP_MASK> dispatch_comp_mask;
+
+template <class Base>
+static constexpr gboolean
+has_comp_mask (const CompMask<Base> *algorithm)
+{
+  return TRUE;
+}
+
+static constexpr gboolean
+has_comp_mask (const AlgorithmBase *algorithm)
+{
+  return FALSE;
+}
+
+template <class Base,
+          class State>
+static gfloat *
+comp_mask_data (const CompMask<Base> *algorithm,
+                State                *state)
+{
+  return state->comp_mask_data;
+}
+
+template <class State>
+static gfloat *
+comp_mask_data (const AlgorithmBase *algorithm,
+                State               *state)
+{
+  return NULL;
+}
+
+
+/* TempCompMask, dispatch_temp_comp_mask():
+ *
+ * An algorithm helper class, providing temporary storage for the compositing
+ * mask.  Algorithms that need a temporary compositing mask should specify
+ * 'dispatch_temp_comp_mask()' as a dependency, which itself includes
+ * 'dispatch_comp_mask()' as a dependency.
+ */
+
+template <class Base>
+struct TempCompMask : Base
+{
+  static constexpr guint filter = Base::filter | ALGORITHM_TEMP_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  using State = typename Base::template State<Derived>;
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->comp_mask_data = gegl_scratch_new (gfloat, rect->width);
+  }
+
+
+  template <class Derived>
+  void
+  finalize_step (const GimpPaintCoreLoopsParams *params,
+                 State<Derived>                 *state) const
+  {
+    gegl_scratch_free (state->comp_mask_data);
+
+    Base::finalize_step (params, state);
+  }
+};
+
+static BasicDispatch<
+  TempCompMask,
+  ALGORITHM_TEMP_COMP_MASK,
+  decltype (dispatch_comp_mask)
+> dispatch_temp_comp_mask;
+
+
+/* CompBuffer, dispatch_comp_buffer(), has_comp_buffer(), comp_buffer_data():
+ *
+ * An algorithm helper class, providing access to the output buffer used for
+ * compositing.  When this class is part of the hierarchy, 'DoLayerBlend' uses
+ * this buffer as the output buffer, instead of the input parameters'
+ * 'dest_buffer'.  Algorithms that use the compositing buffer should specify
+ * 'dispatch_comp_buffer()' as a dependency, and access 'CompBuffer' members
+ * through their base type/subobject.
+ *
+ * Note that 'CompBuffer' only provides *access* to the compositing buffer, but
+ * doesn't provide its actual *storage*.  This is the responsibility of the
+ * algorithms that use 'CompBuffer'.  Algorithms that need temporary storage
+ * for the compositing buffer can use 'TempCompBuffer'.
+ *
+ * The 'has_comp_buffer()' constexpr function determines if a given algorithm
+ * hierarchy uses the compositing buffer.
+ *
+ * The 'comp_buffer_data()' function returns a pointer to the compositing
+ * buffer data for the current row if the hierarchy uses the compositing
+ * buffer, or NULL otherwise.
+ */
+
+template <class Base>
+struct CompBuffer : Base
+{
+  /* Component type of the compositing buffer. */
+  using comp_buffer_type = gfloat;
+
+  static constexpr guint filter = Base::filter | ALGORITHM_COMP_BUFFER;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    /* Pointer to the compositing buffer data for the current row. */
+    comp_buffer_type *comp_buffer_data;
+  };
+};
+
+static BasicDispatch<CompBuffer, ALGORITHM_COMP_BUFFER> dispatch_comp_buffer;
+
+template <class Base>
+static constexpr gboolean
+has_comp_buffer (const CompBuffer<Base> *algorithm)
+{
+  return TRUE;
+}
+
+static constexpr gboolean
+has_comp_buffer (const AlgorithmBase *algorithm)
+{
+  return FALSE;
+}
+
+template <class Base,
+          class State>
+static gfloat *
+comp_buffer_data (const CompBuffer<Base> *algorithm,
+                  State                  *state)
+{
+  return state->comp_buffer_data;
+}
+
+template <class State>
+static gfloat *
+comp_buffer_data (const AlgorithmBase *algorithm,
+                  State               *state)
+{
+  return NULL;
+}
+
+
+/* TempCompBuffer, dispatch_temp_comp_buffer():
+ *
+ * An algorithm helper class, providing temporary storage for the compositing
+ * buffer.  Algorithms that need a temporary compositing buffer should specify
+ * 'dispatch_temp_comp_buffer()' as a dependency, which itself includes
+ * 'dispatch_comp_buffer()' as a dependency.
+ */
+
+template <class Base>
+struct TempCompBuffer : Base
+{
+  static constexpr guint filter = Base::filter | ALGORITHM_TEMP_COMP_BUFFER;
+
+  using Base::Base;
+
+  template <class Derived>
+  using State = typename Base::template State<Derived>;
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->comp_buffer_data = gegl_scratch_new (gfloat, 4 * rect->width);
+  }
+
+
+  template <class Derived>
+  void
+  finalize_step (const GimpPaintCoreLoopsParams *params,
+                 State<Derived>                 *state) const
+  {
+    gegl_scratch_free (state->comp_buffer_data);
+
+    Base::finalize_step (params, state);
+  }
+};
+
+static BasicDispatch<
+  TempCompBuffer,
+  ALGORITHM_TEMP_COMP_BUFFER,
+  decltype (dispatch_comp_buffer)
+> dispatch_temp_comp_buffer;
+
+
+/* CanvasBufferIterator, DispatchCanvasBufferIterator:
+ *
+ * An algorithm helper class, providing iterator-access to the canvas buffer.
+ * Algorithms that iterate over the canvas buffer should specify
+ * 'DispatchCanvasBufferIterator<Access>' as a dependency, where 'Access' is
+ * the desired access mode to the canvas buffer, and access its members through
+ * their base type/subobject.
+ */
+
+template <class    Base,
+          guint    Access,
+          gboolean First>
+struct CanvasBufferIterator;
+
+template <class Base,
+          guint Access>
+static constexpr gboolean
+canvas_buffer_iterator_is_first (CanvasBufferIterator<Base, Access, TRUE> *algorithm)
+{
+  return FALSE;
+}
+
+static constexpr gboolean
+canvas_buffer_iterator_is_first (AlgorithmBase *algorithm)
+{
+  return TRUE;
+}
+
+template <class    Base,
+          guint    Access,
+          gboolean First = canvas_buffer_iterator_is_first ((Base *) NULL)>
+struct CanvasBufferIterator : Base
+{
+  /* The combined canvas-buffer access mode used by the hierarchy, up to, and
+   * including, the current class.
+   */
+  static constexpr GeglAccessMode canvas_buffer_access =
+    (GeglAccessMode) (Base::canvas_buffer_access | Access);
+
+  using Base::Base;
+};
+
+template <class Base,
+          guint Access>
+struct CanvasBufferIterator<Base, Access, TRUE> : Base
+{
+  /* The combined canvas-buffer access mode used by the hierarchy, up to, and
+   * including, the current class.
+   */
+  static constexpr GeglAccessMode canvas_buffer_access =
+    (GeglAccessMode) Access;
+
+  static constexpr gint           max_n_iterators      =
+    Base::max_n_iterators + 1;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    gint canvas_buffer_iterator;
+  };
+
+  template <class Derived>
+  void
+  init (const GimpPaintCoreLoopsParams *params,
+        State<Derived>                 *state,
+        GeglBufferIterator             *iter,
+        const GeglRectangle            *roi,
+        const GeglRectangle            *area) const
+  {
+    state->canvas_buffer_iterator = gegl_buffer_iterator_add (
+      iter, params->canvas_buffer, area, 0, babl_format ("Y float"),
+      Derived::canvas_buffer_access, GEGL_ABYSS_NONE);
+
+    /* initialize the base class *after* initializing the iterator, to make
+     * sure that canvas_buffer is the primary buffer of the iterator, if no
+     * subclass added an iterator first.
+     */
+    Base::init (params, state, iter, roi, area);
+  }
+};
+
+template <guint Access>
+struct DispatchCanvasBufferIteratorHelper
+{
+  template <class Base>
+  using algorithm_template = CanvasBufferIterator<Base, Access>;
+};
+
+template <guint Access>
+using DispatchCanvasBufferIterator = BasicDispatch<
+  DispatchCanvasBufferIteratorHelper<Access>::template algorithm_template,
+  ALGORITHM_CANVAS_BUFFER_ITERATOR
+>;
+
+
+/* MaskBufferIterator, mask_buffer_iterator_dispatch(),
+ * has_mask_buffer_iterator():
+ *
+ * An algorithm helper class, providing read-only iterator-access to the mask
+ * buffer.  Algorithms that iterate over the mask buffer should specify
+ * 'dispatch_mask_buffer_iterator()' as a dependency, and access
+ * 'MaskBufferIterator' members through their base type/subobject.
+ *
+ * The 'has_mask_buffer_iterator()' constexpr function determines if a given
+ * algorithm hierarchy uses has a mask-buffer iterator.
+ *
+ * The 'mask_buffer_iterator()' function returns the index of the mask-buffer
+ * iterator if the hierarchy has one, or -1 otherwise.
+ */
+
+template <class Base>
+struct MaskBufferIterator : Base
+{
+  static constexpr guint filter = Base::filter | ALGORITHM_MASK_BUFFER_ITERATOR;
+
+  static constexpr gint max_n_iterators = Base::max_n_iterators + 1;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    gint mask_buffer_iterator;
+  };
+
+  template <class Derived>
+  void
+  init (const GimpPaintCoreLoopsParams *params,
+        State<Derived>                 *state,
+        GeglBufferIterator             *iter,
+        const GeglRectangle            *roi,
+        const GeglRectangle            *area) const
+  {
+    Base::init (params, state, iter, roi, area);
+
+    GeglRectangle mask_area = *area;
+
+    mask_area.x -= params->mask_offset_x;
+    mask_area.y -= params->mask_offset_y;
+
+    state->mask_buffer_iterator = gegl_buffer_iterator_add (
+      iter, params->mask_buffer, &mask_area, 0, babl_format ("Y float"),
+      GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+  }
+};
+
+struct DispatchMaskBufferIterator
+{
+  static constexpr guint mask = ALGORITHM_MASK_BUFFER_ITERATOR;
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    if (params->mask_buffer)
+      visitor (identity<MaskBufferIterator<Algorithm>> ());
+    else
+      visitor (algorithm);
+  }
+} static dispatch_mask_buffer_iterator;
+
+template <class Base>
+static constexpr gboolean
+has_mask_buffer_iterator (const MaskBufferIterator<Base> *algorithm)
+{
+  return TRUE;
+}
+
+static constexpr gboolean
+has_mask_buffer_iterator (const AlgorithmBase *algorithm)
+{
+  return FALSE;
+}
+
+template <class Base,
+          class State>
+static gint
+mask_buffer_iterator (const MaskBufferIterator<Base> *algorithm,
+                      State                          *state)
+{
+  return state->mask_buffer_iterator;
+}
+
+template <class State>
+static gint
+mask_buffer_iterator (const AlgorithmBase *algorithm,
+                      State               *state)
+{
+  return -1;
+}
+
+
+/* CombinePaintMaskToCanvasBufferToPaintBufAlpha,
+ * dispatch_combine_paint_mask_to_canvas_buffer_to_paint_buf_alpha():
+ *
+ * An algorithm class, providing an optimized version combining both the
+ * COMBINE_PAINT_MASK_TO_CANVAS_BUFFER and the CANVAS_BUFFER_TO_PAINT_BUF_ALPHA
+ * algorithms.  Used instead of the individual implementations, when both
+ * algorithms are requested.
+ */
+
+template <class Base>
+struct CombinePaintMaskToCanvasBufferToPaintBufAlpha : Base
+{
+  using mask_type = typename Base::mask_type;
+
+  static constexpr guint filter =
+    Base::filter                                                        |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA    |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA       |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK          |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    gfloat *canvas_pixel;
+  };
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->canvas_pixel =
+      (gfloat *) iter->items[state->canvas_buffer_iterator].data;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    gint             mask_offset  = (y       - roi->y) * this->mask_stride +
+                                    (rect->x - roi->x);
+    const mask_type *mask_pixel   = &this->mask_data[mask_offset];
+    gint             paint_offset = (y       - roi->y) * this->paint_stride +
+                                    (rect->x - roi->x) * 4;
+    gfloat          *paint_pixel  = &this->paint_data[paint_offset];
+    gint             x;
+
+    for (x = 0; x < rect->width; x++)
+      {
+        if (Base::stipple)
+          {
+            state->canvas_pixel[0] += (1.0 - state->canvas_pixel[0])  *
+                                      value_to_float (*mask_pixel)    *
+                                      params->paint_opacity;
+          }
+        else
+          {
+            if (params->paint_opacity > state->canvas_pixel[0])
+              {
+                state->canvas_pixel[0] += (params->paint_opacity - state->canvas_pixel[0]) *
+                                           value_to_float (*mask_pixel)                    *
+                                           params->paint_opacity;
+              }
+          }
+
+        paint_pixel[3] *= state->canvas_pixel[0];
+
+        mask_pixel          += 1;
+        state->canvas_pixel += 1;
+        paint_pixel         += 4;
+      }
+  }
+};
+
+static SuppressedAlgorithmDispatch<
+  CombinePaintMaskToCanvasBufferToPaintBufAlpha,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER |
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA,
+  decltype (dispatch_paint_buf),
+  decltype (dispatch_paint_mask),
+  decltype (dispatch_stipple),
+  DispatchCanvasBufferIterator<GEGL_BUFFER_READWRITE>
+>
+dispatch_combine_paint_mask_to_canvas_buffer_to_paint_buf_alpha;
+
+
+/* CombinePaintMaskToCanvasBuffer,
+ * dispatch_combine_paint_mask_to_canvas_buffer():
+ *
+ * An algorithm class, implementing the COMBINE_PAINT_MASK_TO_CANVAS_BUFFER
+ * algorithm.
+ */
+
+template <class Base>
+struct CombinePaintMaskToCanvasBuffer : Base
+{
+  using mask_type = typename Base::mask_type;
+
+  static constexpr guint filter =
+    Base::filter                                                        |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA    |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA       |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    gfloat *canvas_pixel;
+  };
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->canvas_pixel =
+      (gfloat *) iter->items[state->canvas_buffer_iterator].data;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    gint             mask_offset = (y       - roi->y) * this->mask_stride +
+                                   (rect->x - roi->x);
+    const mask_type *mask_pixel  = &this->mask_data[mask_offset];
+    gint             x;
+
+    for (x = 0; x < rect->width; x++)
+      {
+        if (Base::stipple)
+          {
+            state->canvas_pixel[0] += (1.0 - state->canvas_pixel[0]) *
+                                      value_to_float (*mask_pixel)   *
+                                      params->paint_opacity;
+          }
+        else
+          {
+            if (params->paint_opacity > state->canvas_pixel[0])
+              {
+                state->canvas_pixel[0] += (params->paint_opacity - state->canvas_pixel[0]) *
+                                          value_to_float (*mask_pixel)                     *
+                                          params->paint_opacity;
+              }
+          }
+
+        mask_pixel          += 1;
+        state->canvas_pixel += 1;
+      }
+  }
+};
+
+static AlgorithmDispatch<
+  CombinePaintMaskToCanvasBuffer,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER,
+  decltype (dispatch_paint_mask),
+  decltype (dispatch_stipple),
+  DispatchCanvasBufferIterator<GEGL_BUFFER_READWRITE>
+>
+dispatch_combine_paint_mask_to_canvas_buffer;
+
+
+/* CanvasBufferToPaintBufAlpha, dispatch_canvas_buffer_to_paint_buf_alpha():
+ *
+ * An algorithm class, implementing the CANVAS_BUFFER_TO_PAINT_BUF_ALPHA
+ * algorithm.
+ */
+
+template <class Base>
+struct CanvasBufferToPaintBufAlpha : Base
+{
+  static constexpr guint filter =
+    Base::filter                                                     |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA    |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK       |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    const gfloat *canvas_pixel;
+  };
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->canvas_pixel =
+      (const gfloat *) iter->items[state->canvas_buffer_iterator].data;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    /* Copy the canvas buffer in rect to the paint buffer's alpha channel */
+
+    gint    paint_offset = (y       - roi->y) * this->paint_stride +
+                           (rect->x - roi->x) * 4;
+    gfloat *paint_pixel  = &this->paint_data[paint_offset];
+    gint    x;
+
+    for (x = 0; x < rect->width; x++)
+      {
+        paint_pixel[3] *= *state->canvas_pixel;
+
+        state->canvas_pixel += 1;
+        paint_pixel         += 4;
+      }
+  }
+};
+
+static SuppressedAlgorithmDispatch<
+  CanvasBufferToPaintBufAlpha,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA,
+  decltype (dispatch_paint_buf),
+  DispatchCanvasBufferIterator<GEGL_BUFFER_READ>
+>
+dispatch_canvas_buffer_to_paint_buf_alpha;
+
+
+/* PaintMaskToPaintBufAlpha, dispatch_paint_mask_to_paint_buf_alpha():
+ *
+ * An algorithm class, implementing the PAINT_MASK_TO_PAINT_BUF_ALPHA
+ * algorithm.
+ */
+
+template <class Base>
+struct PaintMaskToPaintBufAlpha : Base
+{
+  using mask_type = typename Base::mask_type;
+
+  static constexpr guint filter =
+    Base::filter |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK    |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  explicit
+  PaintMaskToPaintBufAlpha (const GimpPaintCoreLoopsParams *params) :
+    Base (params)
+  {
+    /* Validate that the paint buffer is within the bounds of the paint mask */
+    g_return_if_fail (gimp_temp_buf_get_width (params->paint_buf) <=
+                      gimp_temp_buf_get_width (params->paint_mask) -
+                      params->paint_mask_offset_x);
+    g_return_if_fail (gimp_temp_buf_get_height (params->paint_buf) <=
+                      gimp_temp_buf_get_height (params->paint_mask) -
+                      params->paint_mask_offset_y);
+  }
+
+  template <class Derived>
+  using State = typename Base::template State<Derived>;
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    gint             paint_offset = (y       - roi->y) * this->paint_stride +
+                                    (rect->x - roi->x) * 4;
+    gfloat          *paint_pixel  = &this->paint_data[paint_offset];
+    gint             mask_offset  = (y       - roi->y) * this->mask_stride +
+                                    (rect->x - roi->x);
+    const mask_type *mask_pixel   = &this->mask_data[mask_offset];
+    gint             x;
+
+    for (x = 0; x < rect->width; x++)
+      {
+        paint_pixel[3] *= value_to_float (*mask_pixel) * params->paint_opacity;
+
+        mask_pixel  += 1;
+        paint_pixel += 4;
+      }
+  }
+};
+
+static SuppressedAlgorithmDispatch<
+  PaintMaskToPaintBufAlpha,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA,
+  decltype (dispatch_paint_buf),
+  decltype (dispatch_paint_mask)
+>
+dispatch_paint_mask_to_paint_buf_alpha;
+
+
+/* CanvasBufferToCompMask, dispatch_canvas_buffer_to_comp_mask():
+ *
+ * An algorithm class, implementing the CANVAS_BUFFER_TO_COMP_MASK algorithm.
+ */
+
+template <class    Base,
+          gboolean Direct>
+struct CanvasBufferToCompMask : Base
+{
+  using comp_mask_type = typename Base::comp_mask_type;
+
+  static constexpr guint filter =
+    Base::filter                                               |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    const gfloat *canvas_pixel;
+    const gfloat *mask_pixel;
+  };
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->canvas_pixel =
+      (const gfloat *) iter->items[state->canvas_buffer_iterator].data;
+    state->mask_pixel   =
+      (const gfloat *) iter->items[state->mask_buffer_iterator].data;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    comp_mask_type *comp_mask_pixel = state->comp_mask_data;
+    gint            x;
+
+    for (x = 0; x < rect->width; x++)
+      {
+        comp_mask_pixel[0] = state->canvas_pixel[0] * state->mask_pixel[0];
+
+        comp_mask_pixel     += 1;
+        state->canvas_pixel += 1;
+        state->mask_pixel   += 1;
+      }
+  }
+};
+
+template <class Base>
+struct CanvasBufferToCompMask<Base, TRUE> : Base
+{
+  static constexpr guint filter =
+    Base::filter                                               |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  using State = typename Base::template State<Derived>;
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->comp_mask_data =
+      (gfloat *) iter->items[state->canvas_buffer_iterator].data - rect->width;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    state->comp_mask_data += rect->width;
+  }
+};
+
+struct DispatchCanvasBufferToCompMask
+{
+  static constexpr guint mask =
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK;
+
+  template <class Base>
+  using AlgorithmDirect   = CanvasBufferToCompMask<Base, TRUE>;
+  template <class Base>
+  using AlgorithmIndirect = CanvasBufferToCompMask<Base, FALSE>;
+
+  using DispatchDirect    = BasicDispatch<
+    AlgorithmDirect,
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK,
+    decltype (dispatch_comp_mask)
+  >;
+  using DispatchIndirect  = BasicDispatch<
+    AlgorithmIndirect,
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK,
+    decltype (dispatch_temp_comp_mask)
+  >;
+
+  template <class Algorithm,
+            gboolean HasMaskBufferIterator = has_mask_buffer_iterator (
+                                               (Algorithm *) NULL)>
+  struct Dispatch : DispatchIndirect
+  {
+  };
+
+  template <class Algorithm>
+  struct Dispatch<Algorithm, FALSE> : DispatchDirect
+  {
+  };
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    if ((algorithms & mask) == mask)
+      {
+        dispatch (
+          [&] (auto algorithm)
+          {
+            using NewAlgorithm = typename decltype (algorithm)::type;
+
+            Dispatch<NewAlgorithm> () (visitor, params, algorithms, algorithm);
+          },
+          params, algorithms, algorithm,
+          DispatchCanvasBufferIterator<GEGL_BUFFER_READ> (),
+          dispatch_mask_buffer_iterator);
+      }
+    else
+      {
+        visitor (algorithm);
+      }
+  }
+} static dispatch_canvas_buffer_to_comp_mask;
+
+
+/* PaintMaskToCompMask, dispatch_paint_mask_to_comp_mask():
+ *
+ * An algorithm class, implementing the PAINT_MASK_TO_COMP_MASK algorithm.
+ */
+
+template <class    Base,
+          gboolean Direct>
+struct PaintMaskToCompMask : Base
+{
+  using mask_type      = typename Base::mask_type;
+  using comp_mask_type = typename Base::comp_mask_type;
+
+  static constexpr guint filter =
+    Base::filter |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    const gfloat *mask_pixel;
+  };
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    if (has_mask_buffer_iterator (this))
+      {
+        state->mask_pixel =
+          (const gfloat *) iter->items[mask_buffer_iterator (this, state)].data;
+      }
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    gint             mask_offset = (y       - roi->y) * this->mask_stride +
+                                   (rect->x - roi->x);
+    const mask_type *mask_pixel  = &this->mask_data[mask_offset];
+    comp_mask_type  *comp_mask_pixel = state->comp_mask_data;
+    gint             x;
+
+    if (has_mask_buffer_iterator (this))
+      {
+        for (x = 0; x < rect->width; x++)
+          {
+            comp_mask_pixel[0] = value_to_float (mask_pixel[0]) *
+                                 state->mask_pixel[0]           *
+                                 params->paint_opacity;
+
+            comp_mask_pixel   += 1;
+            mask_pixel        += 1;
+            state->mask_pixel += 1;
+          }
+      }
+    else
+      {
+        for (x = 0; x < rect->width; x++)
+          {
+            comp_mask_pixel[0] = value_to_float (mask_pixel[0]) *
+                                 params->paint_opacity;
+
+            comp_mask_pixel += 1;
+            mask_pixel      += 1;
+          }
+      }
+  }
+};
+
+template <class Base>
+struct PaintMaskToCompMask<Base, TRUE> : Base
+{
+  using mask_type = typename Base::mask_type;
+
+  static constexpr guint filter =
+    Base::filter                                            |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK;
+
+  using Base::Base;
+
+  template <class Derived>
+  using State = typename Base::template State<Derived>;
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    gint mask_offset = (rect->y - roi->y) * this->mask_stride +
+                       (rect->x - roi->x);
+
+    state->comp_mask_data = (mask_type *) &this->mask_data[mask_offset] -
+                            this->mask_stride;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    state->comp_mask_data += this->mask_stride;
+  }
+};
+
+struct DispatchPaintMaskToCompMask
+{
+  static constexpr guint mask =
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+  template <class Base>
+  using AlgorithmDirect   = PaintMaskToCompMask<Base, TRUE>;
+  template <class Base>
+  using AlgorithmIndirect = PaintMaskToCompMask<Base, FALSE>;
+
+  using DispatchDirect    = BasicDispatch<
+    AlgorithmDirect,
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK,
+    decltype (dispatch_comp_mask)
+  >;
+  using DispatchIndirect  = BasicDispatch<
+    AlgorithmIndirect,
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK,
+    decltype (dispatch_temp_comp_mask)
+  >;
+
+  template <class Algorithm,
+            class MaskType                 = typename Algorithm::mask_type,
+            gboolean HasMaskBufferIterator = has_mask_buffer_iterator (
+                                               (Algorithm *) NULL)>
+  struct Dispatch : DispatchIndirect
+  {
+  };
+
+  template <class Algorithm>
+  struct Dispatch<Algorithm, gfloat, FALSE> : DispatchDirect
+  {
+  };
+
+  template <class Visitor,
+            class Algorithm>
+  void
+  operator () (Visitor                         visitor,
+               const GimpPaintCoreLoopsParams *params,
+               GimpPaintCoreLoopsAlgorithm     algorithms,
+               identity<Algorithm>             algorithm) const
+  {
+    if ((algorithms & mask) == mask)
+      {
+        dispatch (
+          [&] (auto algorithm)
+          {
+            using NewAlgorithm = typename decltype (algorithm)::type;
+
+            if (params->paint_opacity == GIMP_OPACITY_OPAQUE)
+              Dispatch<NewAlgorithm> () (visitor, params, algorithms, algorithm);
+            else
+              DispatchIndirect       () (visitor, params, algorithms, algorithm);
+          },
+          params, algorithms, algorithm,
+          dispatch_paint_mask,
+          dispatch_mask_buffer_iterator);
+      }
+    else
+      {
+        visitor (algorithm);
+      }
+  }
+} static dispatch_paint_mask_to_comp_mask;
+
+
+/* DoLayerBlend, dispatch_do_layer_blend():
+ *
+ * An algorithm class, implementing the DO_LAYER_BLEND algorithm.
+ */
+
+template <class Base>
+struct DoLayerBlend : Base
+{
+  static constexpr guint filter =
+    Base::filter |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_DO_LAYER_BLEND;
+
+  static constexpr gint max_n_iterators = Base::max_n_iterators + 2;
+
+  const Babl             *iterator_format;
+  GimpOperationLayerMode  layer_mode;
+
+  explicit
+  DoLayerBlend (const GimpPaintCoreLoopsParams *params) :
+    Base (params)
+  {
+    layer_mode.layer_mode      = params->paint_mode;
+    layer_mode.opacity         = params->image_opacity;
+    layer_mode.function        = gimp_layer_mode_get_function (params->paint_mode);
+    layer_mode.blend_function  = gimp_layer_mode_get_blend_function (params->paint_mode);
+    layer_mode.blend_space     = gimp_layer_mode_get_blend_space (params->paint_mode);
+    layer_mode.composite_space = gimp_layer_mode_get_composite_space (params->paint_mode);
+    layer_mode.composite_mode  = gimp_layer_mode_get_paint_composite_mode (params->paint_mode);
+
+    iterator_format = gimp_layer_mode_get_format (params->paint_mode,
+                                                  layer_mode.blend_space,
+                                                  layer_mode.composite_space,
+                                                  layer_mode.composite_mode,
+                                                  gimp_temp_buf_get_format (params->paint_buf));
+
+    g_return_if_fail (gimp_temp_buf_get_format (params->paint_buf) == iterator_format);
+  }
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    gint           iterator_base;
+
+    GeglRectangle  process_roi;
+
+    gfloat        *out_pixel;
+    gfloat        *in_pixel;
+    gfloat        *mask_pixel;
+    gfloat        *paint_pixel;
+  };
+
+  template <class Derived>
+  void
+  init (const GimpPaintCoreLoopsParams *params,
+        State<Derived>                 *state,
+        GeglBufferIterator             *iter,
+        const GeglRectangle            *roi,
+        const GeglRectangle            *area) const
+  {
+    state->iterator_base = gegl_buffer_iterator_add (iter, params->src_buffer,
+                                                     area, 0, iterator_format,
+                                                     GEGL_ACCESS_READ,
+                                                     GEGL_ABYSS_NONE);
+
+    if (! has_comp_buffer ((const Derived *) this))
+      {
+        gegl_buffer_iterator_add (iter, params->dest_buffer, area, 0,
+                                  iterator_format,
+                                  GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
+      }
+
+    /* initialize the base class *after* initializing the iterator, to make
+     * sure that src_buffer is the primary buffer of the iterator, if no
+     * subclass added an iterator first.
+     */
+    Base::init (params, state, iter, roi, area);
+  }
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->in_pixel = (gfloat *) iter->items[state->iterator_base + 0].data;
+
+    state->paint_pixel = this->paint_data                        +
+                         (rect->y - roi->y) * this->paint_stride +
+                         (rect->x - roi->x) * 4;
+
+    if (! has_comp_mask (this) && has_mask_buffer_iterator (this))
+      {
+        state->mask_pixel =
+          (gfloat *) iter->items[mask_buffer_iterator (this, state)].data;
+      }
+
+    if (! has_comp_buffer ((const Derived *) this))
+      state->out_pixel = (gfloat *) iter->items[state->iterator_base + 1].data;
+
+    state->process_roi.x      = rect->x;
+    state->process_roi.width  = rect->width;
+    state->process_roi.height = 1;
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    gfloat *mask_pixel;
+    gfloat *out_pixel;
+
+    if (has_comp_mask (this))
+      mask_pixel = comp_mask_data (this, state);
+    else if (has_mask_buffer_iterator (this))
+      mask_pixel = state->mask_pixel;
+    else
+      mask_pixel = NULL;
+
+    if (! has_comp_buffer ((const Derived *) this))
+      {
+        out_pixel = state->out_pixel;
+      }
+    else
+      {
+        out_pixel = comp_buffer_data (
+          (const Derived *) this,
+          (typename Derived::template State<Derived> *) state);
+      }
+
+    state->process_roi.y = y;
+
+    layer_mode.function ((GeglOperation*) &layer_mode,
+                         state->in_pixel,
+                         state->paint_pixel,
+                         mask_pixel,
+                         out_pixel,
+                         rect->width,
+                         &state->process_roi,
+                         0);
+
+    state->in_pixel     += rect->width * 4;
+    state->paint_pixel  += this->paint_stride;
+    if (! has_comp_mask (this) && has_mask_buffer_iterator (this))
+      state->mask_pixel += rect->width;
+    if (! has_comp_buffer ((const Derived *) this))
+      state->out_pixel  += rect->width * 4;
+  }
+};
+
+static MandatoryAlgorithmDispatch<
+  DoLayerBlend,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_DO_LAYER_BLEND,
+  decltype (dispatch_paint_buf),
+  decltype (dispatch_mask_buffer_iterator)
+>
+dispatch_do_layer_blend;
+
+
+/* MaskComponents, dispatch_mask_components():
+ *
+ * An algorithm class, implementing the MASK_COMPONENTS algorithm.
+ */
+
+template <class Base>
+struct MaskComponents : Base
+{
+  static constexpr guint filter =
+    Base::filter |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_MASK_COMPONENTS;
+
+  static constexpr gint max_n_iterators = Base::max_n_iterators + 1;
+
+  const Babl *format;
+  const Babl *comp_fish = NULL;
+
+  explicit
+  MaskComponents (const GimpPaintCoreLoopsParams *params) :
+    Base (params)
+  {
+    format = gimp_operation_mask_components_get_format (
+      gegl_buffer_get_format (params->dest_buffer));
+
+    if (format != this->iterator_format)
+      comp_fish = babl_fish (this->iterator_format, format);
+  }
+
+  template <class Derived>
+  struct State : Base::template State<Derived>
+  {
+    gint    dest_buffer_iterator;
+
+    guint8 *dest_pixel;
+    guint8 *comp_pixel;
+  };
+
+  template <class Derived>
+  void
+  init (const GimpPaintCoreLoopsParams *params,
+        State<Derived>                 *state,
+        GeglBufferIterator             *iter,
+        const GeglRectangle            *roi,
+        const GeglRectangle            *area) const
+  {
+    state->dest_buffer_iterator = gegl_buffer_iterator_add (
+      iter, params->dest_buffer, area, 0, format,
+      GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
+
+    /* initialize the base class *after* initializing the iterator, to make
+     * sure that dest_buffer is the primary buffer of the iterator, if no
+     * subclass added an iterator first.
+     */
+    Base::init (params, state, iter, roi, area);
+  }
+
+  template <class Derived>
+  void
+  init_step (const GimpPaintCoreLoopsParams *params,
+             State<Derived>                 *state,
+             GeglBufferIterator             *iter,
+             const GeglRectangle            *roi,
+             const GeglRectangle            *area,
+             const GeglRectangle            *rect) const
+  {
+    Base::init_step (params, state, iter, roi, area, rect);
+
+    state->dest_pixel =
+      (guint8 *) iter->items[state->dest_buffer_iterator].data;
+
+    if (comp_fish)
+      {
+        state->comp_pixel = (guint8 *) gegl_scratch_alloc (
+          rect->width * babl_format_get_bytes_per_pixel (format));
+      }
+  }
+
+  template <class Derived>
+  void
+  process_row (const GimpPaintCoreLoopsParams *params,
+               State<Derived>                 *state,
+               GeglBufferIterator             *iter,
+               const GeglRectangle            *roi,
+               const GeglRectangle            *area,
+               const GeglRectangle            *rect,
+               gint                            y) const
+  {
+    Base::process_row (params, state, iter, roi, area, rect, y);
+
+    gpointer comp_pixel;
+
+    if (comp_fish)
+      {
+        babl_process (comp_fish,
+                      state->comp_buffer_data, state->comp_pixel,
+                      rect->width);
+
+        comp_pixel = state->comp_pixel;
+      }
+    else
+      {
+        comp_pixel = state->comp_buffer_data;
+      }
+
+    gimp_operation_mask_components_process (format,
+                                            state->dest_pixel, comp_pixel,
+                                            state->dest_pixel,
+                                            rect->width, params->affect);
+
+    state->dest_pixel += rect->width * babl_format_get_bytes_per_pixel (format);
+  }
+
+  template <class Derived>
+  void
+  finalize_step (const GimpPaintCoreLoopsParams *params,
+                 State<Derived>                 *state) const
+  {
+    if (comp_fish)
+      gegl_scratch_free (state->comp_pixel);
+
+    Base::finalize_step (params, state);
+  }
+};
+
+static AlgorithmDispatch<
+  MaskComponents,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_MASK_COMPONENTS,
+  decltype (dispatch_temp_comp_buffer)
+>
+dispatch_mask_components;
+
+
+/* gimp_paint_core_loops_process():
+ *
+ * Performs the set of algorithms requested in 'algorithms', specified as a
+ * bitwise-OR of 'GimpPaintCoreLoopsAlgorithm' values, given the set of
+ * parameters 'params'.
+ *
+ * Note that the order in which the algorithms are performed is currently
+ * fixed, and follows their order of appearance in the
+ * 'GimpPaintCoreLoopsAlgorithm' enum.
+ */
+
+void
+gimp_paint_core_loops_process (const GimpPaintCoreLoopsParams *params,
+                               GimpPaintCoreLoopsAlgorithm     algorithms)
+{
+  GeglRectangle roi;
+
+  if (params->paint_buf)
+    {
+      roi.x      = params->paint_buf_offset_x;
+      roi.y      = params->paint_buf_offset_y;
+      roi.width  = gimp_temp_buf_get_width  (params->paint_buf);
+      roi.height = gimp_temp_buf_get_height (params->paint_buf);
+    }
+  else
+    {
+      roi.x      = params->paint_buf_offset_x;
+      roi.y      = params->paint_buf_offset_y;
+      roi.width  = gimp_temp_buf_get_width (params->paint_mask) -
+                   params->paint_mask_offset_x;
+      roi.height = gimp_temp_buf_get_height (params->paint_mask) -
+                   params->paint_mask_offset_y;
+    }
+
+  dispatch (
+    [&] (auto algorithm_type)
+    {
+      using Algorithm = typename decltype (algorithm_type)::type;
+      using State     = typename Algorithm::template State<Algorithm>;
+
+      Algorithm algorithm (params);
+
+      gegl_parallel_distribute_area (
+        &roi, PIXELS_PER_THREAD,
+        [=] (const GeglRectangle *area)
+        {
+          State state;
+          gint  y;
+
+          if (Algorithm::max_n_iterators > 0)
+            {
+              GeglBufferIterator *iter;
+
+              iter = gegl_buffer_iterator_empty_new (
+                Algorithm::max_n_iterators);
+
+              algorithm.init (params, &state, iter, &roi, area);
+
+              while (gegl_buffer_iterator_next (iter))
+                {
+                  const GeglRectangle *rect = &iter->items[0].roi;
+
+                  algorithm.init_step (params, &state, iter, &roi, area, rect);
+
+                  for (y = 0; y < rect->height; y++)
+                    {
+                      algorithm.process_row (params, &state,
+                                             iter, &roi, area, rect,
+                                             rect->y + y);
+                    }
+
+                  algorithm.finalize_step (params, &state);
+                }
+
+              algorithm.finalize (params, &state);
+            }
+          else
+            {
+              algorithm.init      (params, &state, NULL, &roi, area);
+              algorithm.init_step (params, &state, NULL, &roi, area, area);
+
+              for (y = 0; y < area->height; y++)
+                {
+                  algorithm.process_row (params, &state,
+                                         NULL, &roi, area, area,
+                                         area->y + y);
+                }
+
+              algorithm.finalize_step (params, &state);
+              algorithm.finalize      (params, &state);
+            }
+        });
+    },
+    params, algorithms, identity<AlgorithmBase> (),
+    dispatch_combine_paint_mask_to_canvas_buffer_to_paint_buf_alpha,
+    dispatch_combine_paint_mask_to_canvas_buffer,
+    dispatch_canvas_buffer_to_paint_buf_alpha,
+    dispatch_paint_mask_to_paint_buf_alpha,
+    dispatch_canvas_buffer_to_comp_mask,
+    dispatch_paint_mask_to_comp_mask,
+    dispatch_do_layer_blend,
+    dispatch_mask_components);
+}
diff --git a/app/paint/gimppaintcore-loops.h b/app/paint/gimppaintcore-loops.h
new file mode 100644
index 0000000..1d7e1fd
--- /dev/null
+++ b/app/paint/gimppaintcore-loops.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2013 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_CORE_LOOPS_H__
+#define __GIMP_PAINT_CORE_LOOPS_H__
+
+
+typedef enum
+{
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_NONE                                = 0,
+
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER = 1 << 0,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA    = 1 << 1,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA       = 1 << 2,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK          = 1 << 3,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK             = 1 << 4,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_DO_LAYER_BLEND                      = 1 << 5,
+  GIMP_PAINT_CORE_LOOPS_ALGORITHM_MASK_COMPONENTS                     = 1 << 6
+} GimpPaintCoreLoopsAlgorithm;
+
+
+typedef struct
+{
+  GeglBuffer        *canvas_buffer;
+
+  GimpTempBuf       *paint_buf;
+  gint               paint_buf_offset_x;
+  gint               paint_buf_offset_y;
+
+  const GimpTempBuf *paint_mask;
+  gint               paint_mask_offset_x;
+  gint               paint_mask_offset_y;
+
+  gboolean           stipple;
+
+  GeglBuffer        *src_buffer;
+  GeglBuffer        *dest_buffer;
+
+  GeglBuffer        *mask_buffer;
+  gint               mask_offset_x;
+  gint               mask_offset_y;
+
+  gdouble            paint_opacity;
+  gdouble            image_opacity;
+
+  GimpLayerMode      paint_mode;
+
+  GimpComponentMask  affect;
+} GimpPaintCoreLoopsParams;
+
+
+void   gimp_paint_core_loops_process (const GimpPaintCoreLoopsParams *params,
+                                      GimpPaintCoreLoopsAlgorithm     algorithms);
+
+
+#endif /* __GIMP_PAINT_CORE_LOOPS_H__ */
diff --git a/app/paint/gimppaintcore-stroke.c b/app/paint/gimppaintcore-stroke.c
new file mode 100644
index 0000000..3beac93
--- /dev/null
+++ b/app/paint/gimppaintcore-stroke.c
@@ -0,0 +1,388 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "core/gimpboundary.h"
+#include "core/gimpdrawable.h"
+#include "core/gimperror.h"
+#include "core/gimpcoords.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimppaintcore.h"
+#include "gimppaintcore-stroke.h"
+#include "gimppaintoptions.h"
+
+#include "gimp-intl.h"
+
+
+static void gimp_paint_core_stroke_emulate_dynamics (GimpCoords *coords,
+                                                     gint        length);
+
+
+static const GimpCoords default_coords = GIMP_COORDS_DEFAULT_VALUES;
+
+
+gboolean
+gimp_paint_core_stroke (GimpPaintCore     *core,
+                        GimpDrawable      *drawable,
+                        GimpPaintOptions  *paint_options,
+                        GimpCoords        *strokes,
+                        gint               n_strokes,
+                        gboolean           push_undo,
+                        GError           **error)
+{
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
+  g_return_val_if_fail (strokes != NULL, FALSE);
+  g_return_val_if_fail (n_strokes > 0, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_paint_core_start (core, drawable, paint_options, &strokes[0],
+                             error))
+    {
+      gint i;
+
+      core->last_coords = strokes[0];
+
+      gimp_paint_core_paint (core, drawable, paint_options,
+                             GIMP_PAINT_STATE_INIT, 0);
+
+      gimp_paint_core_paint (core, drawable, paint_options,
+                             GIMP_PAINT_STATE_MOTION, 0);
+
+      for (i = 1; i < n_strokes; i++)
+        {
+          gimp_paint_core_interpolate (core, drawable, paint_options,
+                                       &strokes[i], 0);
+        }
+
+      gimp_paint_core_paint (core, drawable, paint_options,
+                             GIMP_PAINT_STATE_FINISH, 0);
+
+      gimp_paint_core_finish (core, drawable, push_undo);
+
+      gimp_paint_core_cleanup (core);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_paint_core_stroke_boundary (GimpPaintCore      *core,
+                                 GimpDrawable       *drawable,
+                                 GimpPaintOptions   *paint_options,
+                                 gboolean            emulate_dynamics,
+                                 const GimpBoundSeg *bound_segs,
+                                 gint                n_bound_segs,
+                                 gint                offset_x,
+                                 gint                offset_y,
+                                 gboolean            push_undo,
+                                 GError            **error)
+{
+  GimpBoundSeg *stroke_segs;
+  gint          n_stroke_segs;
+  gint          off_x;
+  gint          off_y;
+  GimpCoords   *coords;
+  gboolean      initialized = FALSE;
+  gint          n_coords;
+  gint          seg;
+  gint          s;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
+  g_return_val_if_fail (bound_segs != NULL && n_bound_segs > 0, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  stroke_segs = gimp_boundary_sort (bound_segs, n_bound_segs,
+                                    &n_stroke_segs);
+
+  if (n_stroke_segs == 0)
+    return TRUE;
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  off_x -= offset_x;
+  off_y -= offset_y;
+
+  coords = g_new0 (GimpCoords, n_bound_segs + 4);
+
+  seg      = 0;
+  n_coords = 0;
+
+  /* we offset all coordinates by 0.5 to align the brush with the path */
+
+  coords[n_coords]   = default_coords;
+  coords[n_coords].x = (gdouble) (stroke_segs[0].x1 - off_x + 0.5);
+  coords[n_coords].y = (gdouble) (stroke_segs[0].y1 - off_y + 0.5);
+
+  n_coords++;
+
+  for (s = 0; s < n_stroke_segs; s++)
+    {
+      while (stroke_segs[seg].x1 != -1 ||
+             stroke_segs[seg].x2 != -1 ||
+             stroke_segs[seg].y1 != -1 ||
+             stroke_segs[seg].y2 != -1)
+        {
+          coords[n_coords]   = default_coords;
+          coords[n_coords].x = (gdouble) (stroke_segs[seg].x1 - off_x + 0.5);
+          coords[n_coords].y = (gdouble) (stroke_segs[seg].y1 - off_y + 0.5);
+
+          n_coords++;
+          seg++;
+        }
+
+      /* Close the stroke points up */
+      coords[n_coords] = coords[0];
+
+      n_coords++;
+
+      if (emulate_dynamics)
+        gimp_paint_core_stroke_emulate_dynamics (coords, n_coords);
+
+      if (initialized ||
+          gimp_paint_core_start (core, drawable, paint_options, &coords[0],
+                                 error))
+        {
+          gint i;
+
+          initialized = TRUE;
+
+          core->cur_coords  = coords[0];
+          core->last_coords = coords[0];
+
+          gimp_paint_core_paint (core, drawable, paint_options,
+                                 GIMP_PAINT_STATE_INIT, 0);
+
+          gimp_paint_core_paint (core, drawable, paint_options,
+                                 GIMP_PAINT_STATE_MOTION, 0);
+
+          for (i = 1; i < n_coords; i++)
+            {
+              gimp_paint_core_interpolate (core, drawable, paint_options,
+                                           &coords[i], 0);
+            }
+
+          gimp_paint_core_paint (core, drawable, paint_options,
+                                 GIMP_PAINT_STATE_FINISH, 0);
+        }
+      else
+        {
+          break;
+        }
+
+      n_coords = 0;
+      seg++;
+
+      coords[n_coords]   = default_coords;
+      coords[n_coords].x = (gdouble) (stroke_segs[seg].x1 - off_x + 0.5);
+      coords[n_coords].y = (gdouble) (stroke_segs[seg].y1 - off_y + 0.5);
+
+      n_coords++;
+    }
+
+  if (initialized)
+    {
+      gimp_paint_core_finish (core, drawable, push_undo);
+
+      gimp_paint_core_cleanup (core);
+    }
+
+  g_free (coords);
+  g_free (stroke_segs);
+
+  return initialized;
+}
+
+gboolean
+gimp_paint_core_stroke_vectors (GimpPaintCore     *core,
+                                GimpDrawable      *drawable,
+                                GimpPaintOptions  *paint_options,
+                                gboolean           emulate_dynamics,
+                                GimpVectors       *vectors,
+                                gboolean           push_undo,
+                                GError           **error)
+{
+  GList    *stroke;
+  gboolean  initialized = FALSE;
+  gboolean  due_to_lack_of_points = FALSE;
+  gint      off_x, off_y;
+  gint      vectors_off_x, vectors_off_y;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  gimp_item_get_offset (GIMP_ITEM (vectors),  &vectors_off_x, &vectors_off_y);
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  off_x -= vectors_off_x;
+  off_y -= vectors_off_y;
+
+  for (stroke = vectors->strokes->head;
+       stroke;
+       stroke = stroke->next)
+    {
+      GArray   *coords;
+      gboolean  closed;
+
+      coords = gimp_stroke_interpolate (GIMP_STROKE (stroke->data),
+                                        1.0, &closed);
+
+      if (coords && coords->len)
+        {
+          gint i;
+
+          for (i = 0; i < coords->len; i++)
+            {
+              g_array_index (coords, GimpCoords, i).x -= off_x;
+              g_array_index (coords, GimpCoords, i).y -= off_y;
+            }
+
+          if (emulate_dynamics)
+            gimp_paint_core_stroke_emulate_dynamics ((GimpCoords *) coords->data,
+                                                     coords->len);
+
+          if (initialized ||
+              gimp_paint_core_start (core, drawable, paint_options,
+                                     &g_array_index (coords, GimpCoords, 0),
+                                     error))
+            {
+              initialized = TRUE;
+
+              core->cur_coords  = g_array_index (coords, GimpCoords, 0);
+              core->last_coords = g_array_index (coords, GimpCoords, 0);
+
+              gimp_paint_core_paint (core, drawable, paint_options,
+                                     GIMP_PAINT_STATE_INIT, 0);
+
+              gimp_paint_core_paint (core, drawable, paint_options,
+                                     GIMP_PAINT_STATE_MOTION, 0);
+
+              for (i = 1; i < coords->len; i++)
+                {
+                  gimp_paint_core_interpolate (core, drawable, paint_options,
+                                               &g_array_index (coords, GimpCoords, i),
+                                               0);
+                }
+
+              gimp_paint_core_paint (core, drawable, paint_options,
+                                     GIMP_PAINT_STATE_FINISH, 0);
+            }
+          else
+            {
+              if (coords)
+                g_array_free (coords, TRUE);
+
+              break;
+            }
+        }
+      else
+        {
+          due_to_lack_of_points = TRUE;
+        }
+
+      if (coords)
+        g_array_free (coords, TRUE);
+    }
+
+  if (initialized)
+    {
+      gimp_paint_core_finish (core, drawable, push_undo);
+
+      gimp_paint_core_cleanup (core);
+    }
+
+  if (! initialized && due_to_lack_of_points && *error == NULL)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Not enough points to stroke"));
+    }
+
+  return initialized;
+}
+
+static void
+gimp_paint_core_stroke_emulate_dynamics (GimpCoords *coords,
+                                         gint        length)
+{
+  const gint ramp_length = length / 3;
+
+  /* Calculate and create pressure ramp parameters */
+  if (ramp_length > 0)
+    {
+      gdouble slope = 1.0 / (gdouble) (ramp_length);
+      gint    i;
+
+      /* Calculate pressure start ramp */
+      for (i = 0; i < ramp_length; i++)
+        {
+          coords[i].pressure =  i * slope;
+        }
+
+      /* Calculate pressure end ramp */
+      for (i = length - ramp_length; i < length; i++)
+        {
+          coords[i].pressure = 1.0 - (i - (length - ramp_length)) * slope;
+        }
+    }
+
+  /* Calculate and create velocity ramp parameters */
+  if (length > 0)
+    {
+      gdouble slope = 1.0 / length;
+      gint    i;
+
+      /* Calculate velocity end ramp */
+      for (i = 0; i < length; i++)
+        {
+          coords[i].velocity = i * slope;
+        }
+    }
+
+  if (length > 1)
+    {
+      gint i;
+      /* Fill in direction */
+      for (i = 1; i < length; i++)
+        {
+          coords[i].direction = gimp_coords_direction (&coords[i-1], &coords[i]);
+        }
+
+      coords[0].direction = coords[1].direction;
+    }
+}
diff --git a/app/paint/gimppaintcore-stroke.h b/app/paint/gimppaintcore-stroke.h
new file mode 100644
index 0000000..e52b839
--- /dev/null
+++ b/app/paint/gimppaintcore-stroke.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_CORE_STROKE_H__
+#define __GIMP_PAINT_CORE_STROKE_H__
+
+
+gboolean   gimp_paint_core_stroke          (GimpPaintCore      *core,
+                                            GimpDrawable       *drawable,
+                                            GimpPaintOptions   *paint_options,
+                                            GimpCoords         *strokes,
+                                            gint                n_strokes,
+                                            gboolean            push_undo,
+                                            GError            **error);
+gboolean   gimp_paint_core_stroke_boundary (GimpPaintCore      *core,
+                                            GimpDrawable       *drawable,
+                                            GimpPaintOptions   *paint_options,
+                                            gboolean            emulate_dynamics,
+                                            const GimpBoundSeg *bound_segs,
+                                            gint                n_bound_segs,
+                                            gint                offset_x,
+                                            gint                offset_y,
+                                            gboolean            push_undo,
+                                            GError            **error);
+gboolean   gimp_paint_core_stroke_vectors  (GimpPaintCore      *core,
+                                            GimpDrawable       *drawable,
+                                            GimpPaintOptions   *paint_options,
+                                            gboolean            emulate_dynamics,
+                                            GimpVectors        *vectors,
+                                            gboolean            push_undo,
+                                            GError            **error);
+
+
+#endif  /*  __GIMP_PAINT_CORE_STROKE_H__  */
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
new file mode 100644
index 0000000..94f684b
--- /dev/null
+++ b/app/paint/gimppaintcore.c
@@ -0,0 +1,1242 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ * Copyright (C) 2013 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimp-gegl-utils.h"
+#include "gegl/gimpapplicator.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-symmetry.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimppickable.h"
+#include "core/gimpprojection.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptempbuf.h"
+
+#include "gimppaintcore.h"
+#include "gimppaintcoreundo.h"
+#include "gimppaintcore-loops.h"
+#include "gimppaintoptions.h"
+
+#include "gimpairbrush.h"
+
+#include "gimp-intl.h"
+
+
+#define STROKE_BUFFER_INIT_SIZE 2000
+
+enum
+{
+  PROP_0,
+  PROP_UNDO_DESC
+};
+
+
+/*  local function prototypes  */
+
+static void      gimp_paint_core_finalize            (GObject          *object);
+static void      gimp_paint_core_set_property        (GObject          *object,
+                                                      guint             property_id,
+                                                      const GValue     *value,
+                                                      GParamSpec       *pspec);
+static void      gimp_paint_core_get_property        (GObject          *object,
+                                                      guint             property_id,
+                                                      GValue           *value,
+                                                      GParamSpec       *pspec);
+
+static gboolean  gimp_paint_core_real_start          (GimpPaintCore    *core,
+                                                      GimpDrawable     *drawable,
+                                                      GimpPaintOptions *paint_options,
+                                                      const GimpCoords *coords,
+                                                      GError          **error);
+static gboolean  gimp_paint_core_real_pre_paint      (GimpPaintCore    *core,
+                                                      GimpDrawable     *drawable,
+                                                      GimpPaintOptions *options,
+                                                      GimpPaintState    paint_state,
+                                                      guint32           time);
+static void      gimp_paint_core_real_paint          (GimpPaintCore    *core,
+                                                      GimpDrawable     *drawable,
+                                                      GimpPaintOptions *options,
+                                                      GimpSymmetry     *sym,
+                                                      GimpPaintState    paint_state,
+                                                      guint32           time);
+static void      gimp_paint_core_real_post_paint     (GimpPaintCore    *core,
+                                                      GimpDrawable     *drawable,
+                                                      GimpPaintOptions *options,
+                                                      GimpPaintState    paint_state,
+                                                      guint32           time);
+static void      gimp_paint_core_real_interpolate    (GimpPaintCore    *core,
+                                                      GimpDrawable     *drawable,
+                                                      GimpPaintOptions *options,
+                                                      guint32           time);
+static GeglBuffer *
+               gimp_paint_core_real_get_paint_buffer (GimpPaintCore    *core,
+                                                      GimpDrawable     *drawable,
+                                                      GimpPaintOptions *options,
+                                                      GimpLayerMode     paint_mode,
+                                                      const GimpCoords *coords,
+                                                      gint             *paint_buffer_x,
+                                                      gint             *paint_buffer_y,
+                                                      gint             *paint_width,
+                                                      gint             *paint_height);
+static GimpUndo* gimp_paint_core_real_push_undo      (GimpPaintCore    *core,
+                                                      GimpImage        *image,
+                                                      const gchar      *undo_desc);
+
+
+G_DEFINE_TYPE (GimpPaintCore, gimp_paint_core, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_paint_core_parent_class
+
+static gint global_core_ID = 1;
+
+
+static void
+gimp_paint_core_class_init (GimpPaintCoreClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_paint_core_finalize;
+  object_class->set_property = gimp_paint_core_set_property;
+  object_class->get_property = gimp_paint_core_get_property;
+
+  klass->start               = gimp_paint_core_real_start;
+  klass->pre_paint           = gimp_paint_core_real_pre_paint;
+  klass->paint               = gimp_paint_core_real_paint;
+  klass->post_paint          = gimp_paint_core_real_post_paint;
+  klass->interpolate         = gimp_paint_core_real_interpolate;
+  klass->get_paint_buffer    = gimp_paint_core_real_get_paint_buffer;
+  klass->push_undo           = gimp_paint_core_real_push_undo;
+
+  g_object_class_install_property (object_class, PROP_UNDO_DESC,
+                                   g_param_spec_string ("undo-desc", NULL, NULL,
+                                                        _("Paint"),
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_paint_core_init (GimpPaintCore *core)
+{
+  core->ID = global_core_ID++;
+}
+
+static void
+gimp_paint_core_finalize (GObject *object)
+{
+  GimpPaintCore *core = GIMP_PAINT_CORE (object);
+
+  gimp_paint_core_cleanup (core);
+
+  g_clear_pointer (&core->undo_desc, g_free);
+
+  if (core->stroke_buffer)
+    {
+      g_array_free (core->stroke_buffer, TRUE);
+      core->stroke_buffer = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_paint_core_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpPaintCore *core = GIMP_PAINT_CORE (object);
+
+  switch (property_id)
+    {
+    case PROP_UNDO_DESC:
+      g_free (core->undo_desc);
+      core->undo_desc = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_paint_core_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpPaintCore *core = GIMP_PAINT_CORE (object);
+
+  switch (property_id)
+    {
+    case PROP_UNDO_DESC:
+      g_value_set_string (value, core->undo_desc);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_paint_core_real_start (GimpPaintCore    *core,
+                            GimpDrawable     *drawable,
+                            GimpPaintOptions *paint_options,
+                            const GimpCoords *coords,
+                            GError          **error)
+{
+  return TRUE;
+}
+
+static gboolean
+gimp_paint_core_real_pre_paint (GimpPaintCore    *core,
+                                GimpDrawable     *drawable,
+                                GimpPaintOptions *paint_options,
+                                GimpPaintState    paint_state,
+                                guint32           time)
+{
+  return TRUE;
+}
+
+static void
+gimp_paint_core_real_paint (GimpPaintCore    *core,
+                            GimpDrawable     *drawable,
+                            GimpPaintOptions *paint_options,
+                            GimpSymmetry     *sym,
+                            GimpPaintState    paint_state,
+                            guint32           time)
+{
+}
+
+static void
+gimp_paint_core_real_post_paint (GimpPaintCore    *core,
+                                 GimpDrawable     *drawable,
+                                 GimpPaintOptions *paint_options,
+                                 GimpPaintState    paint_state,
+                                 guint32           time)
+{
+}
+
+static void
+gimp_paint_core_real_interpolate (GimpPaintCore    *core,
+                                  GimpDrawable     *drawable,
+                                  GimpPaintOptions *paint_options,
+                                  guint32           time)
+{
+  gimp_paint_core_paint (core, drawable, paint_options,
+                         GIMP_PAINT_STATE_MOTION, time);
+
+  core->last_coords = core->cur_coords;
+}
+
+static GeglBuffer *
+gimp_paint_core_real_get_paint_buffer (GimpPaintCore    *core,
+                                       GimpDrawable     *drawable,
+                                       GimpPaintOptions *paint_options,
+                                       GimpLayerMode     paint_mode,
+                                       const GimpCoords *coords,
+                                       gint             *paint_buffer_x,
+                                       gint             *paint_buffer_y,
+                                       gint             *paint_width,
+                                       gint             *paint_height)
+{
+  return NULL;
+}
+
+static GimpUndo *
+gimp_paint_core_real_push_undo (GimpPaintCore *core,
+                                GimpImage     *image,
+                                const gchar   *undo_desc)
+{
+  return gimp_image_undo_push (image, GIMP_TYPE_PAINT_CORE_UNDO,
+                               GIMP_UNDO_PAINT, undo_desc,
+                               0,
+                               "paint-core", core,
+                               NULL);
+}
+
+
+/*  public functions  */
+
+void
+gimp_paint_core_paint (GimpPaintCore    *core,
+                       GimpDrawable     *drawable,
+                       GimpPaintOptions *paint_options,
+                       GimpPaintState    paint_state,
+                       guint32           time)
+{
+  GimpPaintCoreClass *core_class;
+
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+
+  core_class = GIMP_PAINT_CORE_GET_CLASS (core);
+
+  if (core_class->pre_paint (core, drawable,
+                             paint_options,
+                             paint_state, time))
+    {
+      GimpSymmetry *sym;
+      GimpImage    *image;
+      GimpItem     *item;
+
+      item  = GIMP_ITEM (drawable);
+      image = gimp_item_get_image (item);
+
+      if (paint_state == GIMP_PAINT_STATE_MOTION)
+        {
+          /* Save coordinates for gimp_paint_core_interpolate() */
+          core->last_paint.x = core->cur_coords.x;
+          core->last_paint.y = core->cur_coords.y;
+        }
+
+      sym = g_object_ref (gimp_image_get_active_symmetry (image));
+      gimp_symmetry_set_origin (sym, drawable, &core->cur_coords);
+
+      core_class->paint (core, drawable,
+                         paint_options,
+                         sym, paint_state, time);
+
+      gimp_symmetry_clear_origin (sym);
+      g_object_unref (sym);
+
+      core_class->post_paint (core, drawable,
+                              paint_options,
+                              paint_state, time);
+    }
+}
+
+gboolean
+gimp_paint_core_start (GimpPaintCore     *core,
+                       GimpDrawable      *drawable,
+                       GimpPaintOptions  *paint_options,
+                       const GimpCoords  *coords,
+                       GError           **error)
+{
+  GimpImage   *image;
+  GimpItem    *item;
+  GimpChannel *mask;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  item  = GIMP_ITEM (drawable);
+  image = gimp_item_get_image (item);
+
+  if (core->stroke_buffer)
+    {
+      g_array_free (core->stroke_buffer, TRUE);
+      core->stroke_buffer = NULL;
+    }
+
+  core->stroke_buffer = g_array_sized_new (TRUE, TRUE,
+                                           sizeof (GimpCoords),
+                                           STROKE_BUFFER_INIT_SIZE);
+
+  /* remember the last stroke's endpoint for later undo */
+  core->start_coords = core->last_coords;
+
+  core->cur_coords = *coords;
+
+  if (! GIMP_PAINT_CORE_GET_CLASS (core)->start (core, drawable,
+                                                 paint_options,
+                                                 coords, error))
+    {
+      return FALSE;
+    }
+
+  /*  Allocate the undo structure  */
+  if (core->undo_buffer)
+    g_object_unref (core->undo_buffer);
+
+  core->undo_buffer = gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
+
+  /*  Set the image pickable  */
+  if (! core->show_all)
+    core->image_pickable = GIMP_PICKABLE (image);
+  else
+    core->image_pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+
+  /*  Allocate the saved proj structure  */
+  g_clear_object (&core->saved_proj_buffer);
+
+  if (core->use_saved_proj)
+    {
+      GeglBuffer *buffer = gimp_pickable_get_buffer (core->image_pickable);
+
+      core->saved_proj_buffer = gimp_gegl_buffer_dup (buffer);
+    }
+
+  /*  Allocate the canvas blocks structure  */
+  if (core->canvas_buffer)
+    g_object_unref (core->canvas_buffer);
+
+  core->canvas_buffer =
+    gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                     gimp_item_get_width  (item),
+                                     gimp_item_get_height (item)),
+                     babl_format ("Y float"));
+
+  /*  Get the initial undo extents  */
+
+  core->x1 = core->x2 = core->cur_coords.x;
+  core->y1 = core->y2 = core->cur_coords.y;
+
+  core->last_paint.x = -1e6;
+  core->last_paint.y = -1e6;
+
+  mask = gimp_image_get_mask (image);
+
+  /*  don't apply the mask to itself and don't apply an empty mask  */
+  if (GIMP_DRAWABLE (mask) != drawable && ! gimp_channel_is_empty (mask))
+    {
+      GeglBuffer *mask_buffer;
+      gint        offset_x;
+      gint        offset_y;
+
+      mask_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
+      gimp_item_get_offset (item, &offset_x, &offset_y);
+
+      core->mask_buffer   = g_object_ref (mask_buffer);
+      core->mask_x_offset = -offset_x;
+      core->mask_y_offset = -offset_y;
+    }
+  else
+    {
+      core->mask_buffer = NULL;
+    }
+
+  if (paint_options->use_applicator)
+    {
+      core->applicator = gimp_applicator_new (NULL);
+
+      if (core->mask_buffer)
+        {
+          gimp_applicator_set_mask_buffer (core->applicator,
+                                           core->mask_buffer);
+          gimp_applicator_set_mask_offset (core->applicator,
+                                           core->mask_x_offset,
+                                           core->mask_y_offset);
+        }
+
+      gimp_applicator_set_affect (core->applicator,
+                                  gimp_drawable_get_active_mask (drawable));
+      gimp_applicator_set_dest_buffer (core->applicator,
+                                       gimp_drawable_get_buffer (drawable));
+    }
+
+  /*  Freeze the drawable preview so that it isn't constantly updated.  */
+  gimp_viewable_preview_freeze (GIMP_VIEWABLE (drawable));
+
+  return TRUE;
+}
+
+void
+gimp_paint_core_finish (GimpPaintCore *core,
+                        GimpDrawable  *drawable,
+                        gboolean       push_undo)
+{
+  GimpImage *image;
+
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+
+  g_clear_object (&core->applicator);
+
+  if (core->stroke_buffer)
+    {
+      g_array_free (core->stroke_buffer, TRUE);
+      core->stroke_buffer = NULL;
+    }
+
+  g_clear_object (&core->mask_buffer);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  /*  Determine if any part of the image has been altered--
+   *  if nothing has, then just return...
+   */
+  if ((core->x2 == core->x1) || (core->y2 == core->y1))
+    {
+      gimp_viewable_preview_thaw (GIMP_VIEWABLE (drawable));
+      return;
+    }
+
+  if (push_undo)
+    {
+      GeglBuffer    *buffer;
+      GeglRectangle  rect;
+
+      gimp_rectangle_intersect (core->x1, core->y1,
+                                core->x2 - core->x1, core->y2 - core->y1,
+                                0, 0,
+                                gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                gimp_item_get_height (GIMP_ITEM (drawable)),
+                                &rect.x, &rect.y, &rect.width, &rect.height);
+
+      gegl_rectangle_align_to_buffer (&rect, &rect, core->undo_buffer,
+                                      GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_PAINT,
+                                   core->undo_desc);
+
+      GIMP_PAINT_CORE_GET_CLASS (core)->push_undo (core, image, NULL);
+
+      buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, rect.width, rect.height),
+                                gimp_drawable_get_format (drawable));
+
+      gimp_gegl_buffer_copy (core->undo_buffer,
+                             &rect,
+                             GEGL_ABYSS_NONE,
+                             buffer,
+                             GEGL_RECTANGLE (0, 0, 0, 0));
+
+      gimp_drawable_push_undo (drawable, NULL,
+                               buffer, rect.x, rect.y, rect.width, rect.height);
+
+      g_object_unref (buffer);
+
+      gimp_image_undo_group_end (image);
+    }
+
+  core->image_pickable = NULL;
+
+  g_clear_object (&core->undo_buffer);
+  g_clear_object (&core->saved_proj_buffer);
+
+  gimp_viewable_preview_thaw (GIMP_VIEWABLE (drawable));
+}
+
+void
+gimp_paint_core_cancel (GimpPaintCore *core,
+                        GimpDrawable  *drawable)
+{
+  gint x, y;
+  gint width, height;
+
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+
+  /*  Determine if any part of the image has been altered--
+   *  if nothing has, then just return...
+   */
+  if ((core->x2 == core->x1) || (core->y2 == core->y1))
+    return;
+
+  if (gimp_rectangle_intersect (core->x1, core->y1,
+                                core->x2 - core->x1,
+                                core->y2 - core->y1,
+                                0, 0,
+                                gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                gimp_item_get_height (GIMP_ITEM (drawable)),
+                                &x, &y, &width, &height))
+    {
+      GeglRectangle rect;
+
+      gegl_rectangle_align_to_buffer (&rect,
+                                      GEGL_RECTANGLE (x, y, width, height),
+                                      gimp_drawable_get_buffer (drawable),
+                                      GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+      gimp_gegl_buffer_copy (core->undo_buffer,
+                             &rect,
+                             GEGL_ABYSS_NONE,
+                             gimp_drawable_get_buffer (drawable),
+                             &rect);
+    }
+
+  g_clear_object (&core->undo_buffer);
+  g_clear_object (&core->saved_proj_buffer);
+
+  gimp_drawable_update (drawable, x, y, width, height);
+
+  gimp_viewable_preview_thaw (GIMP_VIEWABLE (drawable));
+}
+
+void
+gimp_paint_core_cleanup (GimpPaintCore *core)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+
+  g_clear_object (&core->undo_buffer);
+  g_clear_object (&core->saved_proj_buffer);
+  g_clear_object (&core->canvas_buffer);
+  g_clear_object (&core->paint_buffer);
+}
+
+void
+gimp_paint_core_interpolate (GimpPaintCore    *core,
+                             GimpDrawable     *drawable,
+                             GimpPaintOptions *paint_options,
+                             const GimpCoords *coords,
+                             guint32           time)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+  g_return_if_fail (coords != NULL);
+
+  core->cur_coords = *coords;
+
+  GIMP_PAINT_CORE_GET_CLASS (core)->interpolate (core, drawable,
+                                                 paint_options, time);
+}
+
+void
+gimp_paint_core_set_show_all (GimpPaintCore *core,
+                              gboolean       show_all)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+
+  core->show_all = show_all;
+}
+
+gboolean
+gimp_paint_core_get_show_all (GimpPaintCore *core)
+{
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
+
+  return core->show_all;
+}
+
+void
+gimp_paint_core_set_current_coords (GimpPaintCore    *core,
+                                    const GimpCoords *coords)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (coords != NULL);
+
+  core->cur_coords = *coords;
+}
+
+void
+gimp_paint_core_get_current_coords (GimpPaintCore    *core,
+                                    GimpCoords       *coords)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (coords != NULL);
+
+  *coords = core->cur_coords;
+}
+
+void
+gimp_paint_core_set_last_coords (GimpPaintCore    *core,
+                                 const GimpCoords *coords)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (coords != NULL);
+
+  core->last_coords = *coords;
+}
+
+void
+gimp_paint_core_get_last_coords (GimpPaintCore *core,
+                                 GimpCoords    *coords)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (coords != NULL);
+
+  *coords = core->last_coords;
+}
+
+/**
+ * gimp_paint_core_round_line:
+ * @core:                   the #GimpPaintCore
+ * @options:                the #GimpPaintOptions to use
+ * @constrain_15_degrees:   the modifier state
+ * @constrain_offset_angle: the angle by which to offset the lines, in degrees
+ * @constrain_xres:         the horizontal resolution
+ * @constrain_yres:         the vertical resolution
+ *
+ * Adjusts core->last_coords and core_cur_coords in preparation to
+ * drawing a straight line. If @center_pixels is TRUE the endpoints
+ * get pushed to the center of the pixels. This avoids artifacts
+ * for e.g. the hard mode. The rounding of the slope to 15 degree
+ * steps if ctrl is pressed happens, as does rounding the start and
+ * end coordinates (which may be fractional in high zoom modes) to
+ * the center of pixels.
+ **/
+void
+gimp_paint_core_round_line (GimpPaintCore    *core,
+                            GimpPaintOptions *paint_options,
+                            gboolean          constrain_15_degrees,
+                            gdouble           constrain_offset_angle,
+                            gdouble           constrain_xres,
+                            gdouble           constrain_yres)
+{
+  g_return_if_fail (GIMP_IS_PAINT_CORE (core));
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+
+  if (gimp_paint_options_get_brush_mode (paint_options) == GIMP_BRUSH_HARD)
+    {
+      core->last_coords.x = floor (core->last_coords.x) + 0.5;
+      core->last_coords.y = floor (core->last_coords.y) + 0.5;
+      core->cur_coords.x  = floor (core->cur_coords.x ) + 0.5;
+      core->cur_coords.y  = floor (core->cur_coords.y ) + 0.5;
+    }
+
+  if (constrain_15_degrees)
+    gimp_constrain_line (core->last_coords.x, core->last_coords.y,
+                         &core->cur_coords.x, &core->cur_coords.y,
+                         GIMP_CONSTRAIN_LINE_15_DEGREES,
+                         constrain_offset_angle,
+                         constrain_xres, constrain_yres);
+}
+
+
+/*  protected functions  */
+
+GeglBuffer *
+gimp_paint_core_get_paint_buffer (GimpPaintCore    *core,
+                                  GimpDrawable     *drawable,
+                                  GimpPaintOptions *paint_options,
+                                  GimpLayerMode     paint_mode,
+                                  const GimpCoords *coords,
+                                  gint             *paint_buffer_x,
+                                  gint             *paint_buffer_y,
+                                  gint             *paint_width,
+                                  gint             *paint_height)
+{
+  GeglBuffer *paint_buffer;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), NULL);
+  g_return_val_if_fail (coords != NULL, NULL);
+  g_return_val_if_fail (paint_buffer_x != NULL, NULL);
+  g_return_val_if_fail (paint_buffer_y != NULL, NULL);
+
+  paint_buffer =
+    GIMP_PAINT_CORE_GET_CLASS (core)->get_paint_buffer (core, drawable,
+                                                        paint_options,
+                                                        paint_mode,
+                                                        coords,
+                                                        paint_buffer_x,
+                                                        paint_buffer_y,
+                                                        paint_width,
+                                                        paint_height);
+
+  core->paint_buffer_x = *paint_buffer_x;
+  core->paint_buffer_y = *paint_buffer_y;
+
+  return paint_buffer;
+}
+
+GimpPickable *
+gimp_paint_core_get_image_pickable (GimpPaintCore *core)
+{
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), NULL);
+  g_return_val_if_fail (core->image_pickable != NULL, NULL);
+
+  return core->image_pickable;
+}
+
+GeglBuffer *
+gimp_paint_core_get_orig_image (GimpPaintCore *core)
+{
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), NULL);
+  g_return_val_if_fail (core->undo_buffer != NULL, NULL);
+
+  return core->undo_buffer;
+}
+
+GeglBuffer *
+gimp_paint_core_get_orig_proj (GimpPaintCore *core)
+{
+  g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), NULL);
+  g_return_val_if_fail (core->saved_proj_buffer != NULL, NULL);
+
+  return core->saved_proj_buffer;
+}
+
+void
+gimp_paint_core_paste (GimpPaintCore            *core,
+                       const GimpTempBuf        *paint_mask,
+                       gint                      paint_mask_offset_x,
+                       gint                      paint_mask_offset_y,
+                       GimpDrawable             *drawable,
+                       gdouble                   paint_opacity,
+                       gdouble                   image_opacity,
+                       GimpLayerMode             paint_mode,
+                       GimpPaintApplicationMode  mode)
+{
+  gint              width  = gegl_buffer_get_width  (core->paint_buffer);
+  gint              height = gegl_buffer_get_height (core->paint_buffer);
+  GimpComponentMask affect = gimp_drawable_get_active_mask (drawable);
+
+  if (! affect)
+    return;
+
+  if (core->applicator)
+    {
+      /*  If the mode is CONSTANT:
+       *   combine the canvas buffer and the paint mask to the paint buffer
+       */
+      if (mode == GIMP_PAINT_CONSTANT)
+        {
+          /* Some tools (ink) paint the mask to paint_core->canvas_buffer
+           * directly. Don't need to copy it in this case.
+           */
+          if (paint_mask != NULL)
+            {
+              GeglBuffer *paint_mask_buffer =
+                gimp_temp_buf_create_buffer ((GimpTempBuf *) paint_mask);
+
+              gimp_gegl_combine_mask_weird (paint_mask_buffer,
+                                            GEGL_RECTANGLE (paint_mask_offset_x,
+                                                            paint_mask_offset_y,
+                                                            width, height),
+                                            core->canvas_buffer,
+                                            GEGL_RECTANGLE (core->paint_buffer_x,
+                                                            core->paint_buffer_y,
+                                                            width, height),
+                                            paint_opacity,
+                                            GIMP_IS_AIRBRUSH (core));
+
+              g_object_unref (paint_mask_buffer);
+            }
+
+          gimp_gegl_apply_mask (core->canvas_buffer,
+                                GEGL_RECTANGLE (core->paint_buffer_x,
+                                                core->paint_buffer_y,
+                                                width, height),
+                                core->paint_buffer,
+                                GEGL_RECTANGLE (0, 0, width, height),
+                                1.0);
+
+          gimp_applicator_set_src_buffer (core->applicator,
+                                          core->undo_buffer);
+        }
+      /*  Otherwise:
+       *   combine the paint mask to the paint buffer directly
+       */
+      else
+        {
+          GeglBuffer *paint_mask_buffer =
+            gimp_temp_buf_create_buffer ((GimpTempBuf *) paint_mask);
+
+          gimp_gegl_apply_mask (paint_mask_buffer,
+                                GEGL_RECTANGLE (paint_mask_offset_x,
+                                                paint_mask_offset_y,
+                                                width, height),
+                                core->paint_buffer,
+                                GEGL_RECTANGLE (0, 0, width, height),
+                                paint_opacity);
+
+          g_object_unref (paint_mask_buffer);
+
+          gimp_applicator_set_src_buffer (core->applicator,
+                                          gimp_drawable_get_buffer (drawable));
+        }
+
+      gimp_applicator_set_apply_buffer (core->applicator,
+                                        core->paint_buffer);
+      gimp_applicator_set_apply_offset (core->applicator,
+                                        core->paint_buffer_x,
+                                        core->paint_buffer_y);
+
+      gimp_applicator_set_opacity (core->applicator, image_opacity);
+      gimp_applicator_set_mode (core->applicator, paint_mode,
+                                GIMP_LAYER_COLOR_SPACE_AUTO,
+                                GIMP_LAYER_COLOR_SPACE_AUTO,
+                                gimp_layer_mode_get_paint_composite_mode (paint_mode));
+
+      /*  apply the paint area to the image  */
+      gimp_applicator_blit (core->applicator,
+                            GEGL_RECTANGLE (core->paint_buffer_x,
+                                            core->paint_buffer_y,
+                                            width, height));
+    }
+  else
+    {
+      GimpPaintCoreLoopsParams    params = {};
+      GimpPaintCoreLoopsAlgorithm algorithms = GIMP_PAINT_CORE_LOOPS_ALGORITHM_NONE;
+
+      params.paint_buf          = gimp_gegl_buffer_get_temp_buf (core->paint_buffer);
+      params.paint_buf_offset_x = core->paint_buffer_x;
+      params.paint_buf_offset_y = core->paint_buffer_y;
+
+      if (! params.paint_buf)
+        return;
+
+      params.dest_buffer = gimp_drawable_get_buffer (drawable);
+
+      if (mode == GIMP_PAINT_CONSTANT)
+        {
+          params.canvas_buffer = core->canvas_buffer;
+
+          /* This step is skipped by the ink tool, which writes
+           * directly to canvas_buffer
+           */
+          if (paint_mask != NULL)
+            {
+              /* Mix paint mask and canvas_buffer */
+              params.paint_mask          = paint_mask;
+              params.paint_mask_offset_x = paint_mask_offset_x;
+              params.paint_mask_offset_y = paint_mask_offset_y;
+              params.stipple             = GIMP_IS_AIRBRUSH (core);
+              params.paint_opacity       = paint_opacity;
+
+              algorithms |= GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER;
+            }
+
+          /* Write canvas_buffer to paint_buf */
+          algorithms |= GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_COMP_MASK;
+
+          /* undo buf -> paint_buf -> dest_buffer */
+          params.src_buffer = core->undo_buffer;
+        }
+      else
+        {
+          g_return_if_fail (paint_mask);
+
+          /* Write paint_mask to paint_buf, does not modify canvas_buffer */
+          params.paint_mask          = paint_mask;
+          params.paint_mask_offset_x = paint_mask_offset_x;
+          params.paint_mask_offset_y = paint_mask_offset_y;
+          params.paint_opacity       = paint_opacity;
+
+          algorithms |= GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
+
+          /* dest_buffer -> paint_buf -> dest_buffer */
+          params.src_buffer = params.dest_buffer;
+        }
+
+      params.mask_buffer   = core->mask_buffer;
+      params.mask_offset_x = core->mask_x_offset;
+      params.mask_offset_y = core->mask_y_offset;
+      params.image_opacity = image_opacity;
+      params.paint_mode    = paint_mode;
+
+      algorithms |= GIMP_PAINT_CORE_LOOPS_ALGORITHM_DO_LAYER_BLEND;
+
+      if (affect != GIMP_COMPONENT_MASK_ALL)
+        {
+          params.affect = affect;
+
+          algorithms |= GIMP_PAINT_CORE_LOOPS_ALGORITHM_MASK_COMPONENTS;
+        }
+
+      gimp_paint_core_loops_process (&params, algorithms);
+    }
+
+  /*  Update the undo extents  */
+  core->x1 = MIN (core->x1, core->paint_buffer_x);
+  core->y1 = MIN (core->y1, core->paint_buffer_y);
+  core->x2 = MAX (core->x2, core->paint_buffer_x + width);
+  core->y2 = MAX (core->y2, core->paint_buffer_y + height);
+
+  /*  Update the drawable  */
+  gimp_drawable_update (drawable,
+                        core->paint_buffer_x,
+                        core->paint_buffer_y,
+                        width, height);
+}
+
+/* This works similarly to gimp_paint_core_paste. However, instead of
+ * combining the canvas to the paint core drawable using one of the
+ * combination modes, it uses a "replace" mode (i.e. transparent
+ * pixels in the canvas erase the paint core drawable).
+
+ * When not drawing on alpha-enabled images, it just paints using
+ * NORMAL mode.
+ */
+void
+gimp_paint_core_replace (GimpPaintCore            *core,
+                         const GimpTempBuf        *paint_mask,
+                         gint                      paint_mask_offset_x,
+                         gint                      paint_mask_offset_y,
+                         GimpDrawable             *drawable,
+                         gdouble                   paint_opacity,
+                         gdouble                   image_opacity,
+                         GimpPaintApplicationMode  mode)
+{
+  gint              width, height;
+  GimpComponentMask affect;
+
+  if (! gimp_drawable_has_alpha (drawable))
+    {
+      gimp_paint_core_paste (core, paint_mask,
+                             paint_mask_offset_x,
+                             paint_mask_offset_y,
+                             drawable,
+                             paint_opacity,
+                             image_opacity,
+                             GIMP_LAYER_MODE_NORMAL,
+                             mode);
+      return;
+    }
+
+  width  = gegl_buffer_get_width  (core->paint_buffer);
+  height = gegl_buffer_get_height (core->paint_buffer);
+
+  affect = gimp_drawable_get_active_mask (drawable);
+
+  if (! affect)
+    return;
+
+  if (core->applicator)
+    {
+      GeglRectangle  mask_rect;
+      GeglBuffer    *mask_buffer;
+
+      /*  If the mode is CONSTANT:
+       *   combine the paint mask to the canvas buffer, and use it as the mask
+       *   buffer
+       */
+      if (mode == GIMP_PAINT_CONSTANT)
+        {
+          /* Some tools (ink) paint the mask to paint_core->canvas_buffer
+           * directly. Don't need to copy it in this case.
+           */
+          if (paint_mask != NULL)
+            {
+              GeglBuffer *paint_mask_buffer =
+                gimp_temp_buf_create_buffer ((GimpTempBuf *) paint_mask);
+
+              gimp_gegl_combine_mask_weird (paint_mask_buffer,
+                                            GEGL_RECTANGLE (paint_mask_offset_x,
+                                                            paint_mask_offset_y,
+                                                            width, height),
+                                            core->canvas_buffer,
+                                            GEGL_RECTANGLE (core->paint_buffer_x,
+                                                            core->paint_buffer_y,
+                                                            width, height),
+                                            paint_opacity,
+                                            GIMP_IS_AIRBRUSH (core));
+
+              g_object_unref (paint_mask_buffer);
+            }
+
+          mask_buffer = g_object_ref (core->canvas_buffer);
+          mask_rect   = *GEGL_RECTANGLE (core->paint_buffer_x,
+                                         core->paint_buffer_y,
+                                         width, height);
+
+          gimp_applicator_set_src_buffer (core->applicator,
+                                          core->undo_buffer);
+        }
+      /*  Otherwise:
+       *   use the paint mask as the mask buffer directly
+       */
+      else
+        {
+          mask_buffer =
+            gimp_temp_buf_create_buffer ((GimpTempBuf *) paint_mask);
+          mask_rect   = *GEGL_RECTANGLE (paint_mask_offset_x,
+                                         paint_mask_offset_y,
+                                         width, height);
+
+          gimp_applicator_set_src_buffer (core->applicator,
+                                          gimp_drawable_get_buffer (drawable));
+        }
+
+      if (core->mask_buffer)
+        {
+          GeglBuffer    *combined_mask_buffer;
+          GeglRectangle  combined_mask_rect;
+          GeglRectangle  aligned_combined_mask_rect;
+
+          combined_mask_rect = *GEGL_RECTANGLE (core->paint_buffer_x,
+                                                core->paint_buffer_y,
+                                                width, height);
+
+          gegl_rectangle_align_to_buffer (
+            &aligned_combined_mask_rect, &combined_mask_rect,
+            gimp_drawable_get_buffer (drawable),
+            GEGL_RECTANGLE_ALIGNMENT_SUPERSET);
+
+          combined_mask_buffer = gegl_buffer_new (&aligned_combined_mask_rect,
+                                                  babl_format ("Y float"));
+
+          gimp_gegl_buffer_copy (
+            core->mask_buffer,
+            GEGL_RECTANGLE (aligned_combined_mask_rect.x -
+                            core->mask_x_offset,
+                            aligned_combined_mask_rect.y -
+                            core->mask_y_offset,
+                            aligned_combined_mask_rect.width,
+                            aligned_combined_mask_rect.height),
+            GEGL_ABYSS_NONE,
+            combined_mask_buffer,
+            &aligned_combined_mask_rect);
+
+          gimp_gegl_combine_mask (mask_buffer,          &mask_rect,
+                                  combined_mask_buffer, &combined_mask_rect,
+                                  1.0);
+
+          g_object_unref (mask_buffer);
+
+          mask_buffer = combined_mask_buffer;
+          mask_rect   = combined_mask_rect;
+        }
+
+      gimp_applicator_set_mask_buffer (core->applicator, mask_buffer);
+      gimp_applicator_set_mask_offset (core->applicator,
+                                       core->paint_buffer_x - mask_rect.x,
+                                       core->paint_buffer_y - mask_rect.y);
+
+      gimp_applicator_set_apply_buffer (core->applicator,
+                                        core->paint_buffer);
+      gimp_applicator_set_apply_offset (core->applicator,
+                                        core->paint_buffer_x,
+                                        core->paint_buffer_y);
+
+      gimp_applicator_set_opacity (core->applicator, image_opacity);
+      gimp_applicator_set_mode (core->applicator, GIMP_LAYER_MODE_REPLACE,
+                                GIMP_LAYER_COLOR_SPACE_AUTO,
+                                GIMP_LAYER_COLOR_SPACE_AUTO,
+                                gimp_layer_mode_get_paint_composite_mode (
+                                  GIMP_LAYER_MODE_REPLACE));
+
+      /*  apply the paint area to the image  */
+      gimp_applicator_blit (core->applicator,
+                            GEGL_RECTANGLE (core->paint_buffer_x,
+                                            core->paint_buffer_y,
+                                            width, height));
+
+      gimp_applicator_set_mask_buffer (core->applicator, core->mask_buffer);
+      gimp_applicator_set_mask_offset (core->applicator,
+                                       core->mask_x_offset,
+                                       core->mask_y_offset);
+
+      g_object_unref (mask_buffer);
+    }
+  else
+    {
+      gimp_paint_core_paste (core, paint_mask,
+                             paint_mask_offset_x,
+                             paint_mask_offset_y,
+                             drawable,
+                             paint_opacity,
+                             image_opacity,
+                             GIMP_LAYER_MODE_REPLACE,
+                             mode);
+      return;
+    }
+
+  /*  Update the undo extents  */
+  core->x1 = MIN (core->x1, core->paint_buffer_x);
+  core->y1 = MIN (core->y1, core->paint_buffer_y);
+  core->x2 = MAX (core->x2, core->paint_buffer_x + width);
+  core->y2 = MAX (core->y2, core->paint_buffer_y + height);
+
+  /*  Update the drawable  */
+  gimp_drawable_update (drawable,
+                        core->paint_buffer_x,
+                        core->paint_buffer_y,
+                        width, height);
+}
+
+/**
+ * Smooth and store coords in the stroke buffer
+ */
+
+void
+gimp_paint_core_smooth_coords (GimpPaintCore    *core,
+                               GimpPaintOptions *paint_options,
+                               GimpCoords       *coords)
+{
+  GimpSmoothingOptions *smoothing_options = paint_options->smoothing_options;
+  GArray               *history           = core->stroke_buffer;
+
+  if (core->stroke_buffer == NULL)
+    return; /* Paint core has not initialized yet */
+
+  if (smoothing_options->use_smoothing &&
+      smoothing_options->smoothing_quality > 0)
+    {
+      gint       i;
+      guint      length;
+      gint       min_index;
+      gdouble    gaussian_weight  = 0.0;
+      gdouble    gaussian_weight2 = SQR (smoothing_options->smoothing_factor);
+      gdouble    velocity_sum     = 0.0;
+      gdouble    scale_sum        = 0.0;
+
+      g_array_append_val (history, *coords);
+
+      if (history->len < 2)
+        return; /* Just don't bother, nothing to do */
+
+      coords->x = coords->y = 0.0;
+
+      length = MIN (smoothing_options->smoothing_quality, history->len);
+
+      min_index = history->len - length;
+
+      if (gaussian_weight2 != 0.0)
+        gaussian_weight = 1 / (sqrt (2 * G_PI) * smoothing_options->smoothing_factor);
+
+      for (i = history->len - 1; i >= min_index; i--)
+        {
+          gdouble     rate        = 0.0;
+          GimpCoords *next_coords = &g_array_index (history,
+                                                    GimpCoords, i);
+
+          if (gaussian_weight2 != 0.0)
+            {
+              /* We use gaussian function with velocity as a window function */
+              velocity_sum += next_coords->velocity * 100;
+              rate = gaussian_weight * exp (-velocity_sum * velocity_sum /
+                                            (2 * gaussian_weight2));
+            }
+
+          scale_sum += rate;
+          coords->x += rate * next_coords->x;
+          coords->y += rate * next_coords->y;
+        }
+
+      if (scale_sum != 0.0)
+        {
+          coords->x /= scale_sum;
+          coords->y /= scale_sum;
+        }
+    }
+}
diff --git a/app/paint/gimppaintcore.h b/app/paint/gimppaintcore.h
new file mode 100644
index 0000000..6e7f4d4
--- /dev/null
+++ b/app/paint/gimppaintcore.h
@@ -0,0 +1,216 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_CORE_H__
+#define __GIMP_PAINT_CORE_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_PAINT_CORE            (gimp_paint_core_get_type ())
+#define GIMP_PAINT_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINT_CORE, GimpPaintCore))
+#define GIMP_PAINT_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINT_CORE, GimpPaintCoreClass))
+#define GIMP_IS_PAINT_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINT_CORE))
+#define GIMP_IS_PAINT_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINT_CORE))
+#define GIMP_PAINT_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINT_CORE, GimpPaintCoreClass))
+
+
+typedef struct _GimpPaintCoreClass GimpPaintCoreClass;
+
+struct _GimpPaintCore
+{
+  GimpObject      parent_instance;
+
+  gint            ID;                /*  unique instance ID                  */
+
+  gchar          *undo_desc;         /*  undo description                    */
+
+  gboolean        show_all;          /*  whether working in show-all mode    */
+
+  GimpCoords      start_coords;      /*  the last stroke's endpoint for undo */
+
+  GimpCoords      cur_coords;        /*  current coords                      */
+  GimpCoords      last_coords;       /*  last coords                         */
+
+  GimpVector2     last_paint;        /*  last point that was painted         */
+
+  gdouble         distance;          /*  distance traveled by brush          */
+  gdouble         pixel_dist;        /*  distance in pixels                  */
+
+  gint            x1, y1;            /*  undo extents in image coords        */
+  gint            x2, y2;            /*  undo extents in image coords        */
+
+  gboolean        use_saved_proj;    /*  keep the unmodified proj around     */
+
+  GimpPickable   *image_pickable;    /*  the image pickable                  */
+
+  GeglBuffer     *undo_buffer;       /*  pixels which have been modified     */
+  GeglBuffer     *saved_proj_buffer; /*  proj tiles which have been modified */
+  GeglBuffer     *canvas_buffer;     /*  the buffer to paint the mask to     */
+  GeglBuffer     *paint_buffer;      /*  the buffer to paint pixels to       */
+  gint            paint_buffer_x;
+  gint            paint_buffer_y;
+
+  GeglBuffer     *mask_buffer;       /*  the target drawable's mask          */
+  gint            mask_x_offset;
+  gint            mask_y_offset;
+
+  GimpApplicator *applicator;
+
+  GArray         *stroke_buffer;
+};
+
+struct _GimpPaintCoreClass
+{
+  GimpObjectClass  parent_class;
+
+  /*  virtual functions  */
+  gboolean     (* start)            (GimpPaintCore    *core,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     const GimpCoords *coords,
+                                     GError          **error);
+
+  gboolean     (* pre_paint)        (GimpPaintCore    *core,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     GimpPaintState    paint_state,
+                                     guint32           time);
+  void         (* paint)            (GimpPaintCore    *core,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     GimpSymmetry     *sym,
+                                     GimpPaintState    paint_state,
+                                     guint32           time);
+  void         (* post_paint)       (GimpPaintCore    *core,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     GimpPaintState    paint_state,
+                                     guint32           time);
+
+  void         (* interpolate)      (GimpPaintCore    *core,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     guint32           time);
+
+  GeglBuffer * (* get_paint_buffer) (GimpPaintCore    *core,
+                                     GimpDrawable     *drawable,
+                                     GimpPaintOptions *paint_options,
+                                     GimpLayerMode     paint_mode,
+                                     const GimpCoords *coords,
+                                     gint             *paint_buffer_x,
+                                     gint             *paint_buffer_y,
+                                     gint             *paint_width,
+                                     gint             *paint_height);
+
+  GimpUndo   * (* push_undo)        (GimpPaintCore    *core,
+                                     GimpImage        *image,
+                                     const gchar      *undo_desc);
+};
+
+
+GType     gimp_paint_core_get_type                  (void) G_GNUC_CONST;
+
+void      gimp_paint_core_paint                     (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     GimpPaintState    state,
+                                                     guint32           time);
+
+gboolean  gimp_paint_core_start                     (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     const GimpCoords *coords,
+                                                     GError          **error);
+void      gimp_paint_core_finish                    (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     gboolean          push_undo);
+void      gimp_paint_core_cancel                    (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable);
+void      gimp_paint_core_cleanup                   (GimpPaintCore    *core);
+
+void      gimp_paint_core_interpolate               (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *paint_options,
+                                                     const GimpCoords *coords,
+                                                     guint32           time);
+
+void      gimp_paint_core_set_show_all              (GimpPaintCore    *core,
+                                                     gboolean          show_all);
+gboolean  gimp_paint_core_get_show_all              (GimpPaintCore    *core);
+
+void      gimp_paint_core_set_current_coords        (GimpPaintCore    *core,
+                                                     const GimpCoords *coords);
+void      gimp_paint_core_get_current_coords        (GimpPaintCore    *core,
+                                                     GimpCoords       *coords);
+
+void      gimp_paint_core_set_last_coords           (GimpPaintCore    *core,
+                                                     const GimpCoords *coords);
+void      gimp_paint_core_get_last_coords           (GimpPaintCore    *core,
+                                                     GimpCoords       *coords);
+
+void      gimp_paint_core_round_line                (GimpPaintCore    *core,
+                                                     GimpPaintOptions *options,
+                                                     gboolean          constrain_15_degrees,
+                                                     gdouble           constrain_offset_angle,
+                                                     gdouble           constrain_xres,
+                                                     gdouble           constrain_yres);
+
+
+/*  protected functions  */
+
+GeglBuffer * gimp_paint_core_get_paint_buffer       (GimpPaintCore    *core,
+                                                     GimpDrawable     *drawable,
+                                                     GimpPaintOptions *options,
+                                                     GimpLayerMode     paint_mode,
+                                                     const GimpCoords *coords,
+                                                     gint             *paint_buffer_x,
+                                                     gint             *paint_buffer_y,
+                                                     gint             *paint_width,
+                                                     gint             *paint_height);
+
+GimpPickable * gimp_paint_core_get_image_pickable   (GimpPaintCore    *core);
+
+GeglBuffer * gimp_paint_core_get_orig_image         (GimpPaintCore    *core);
+GeglBuffer * gimp_paint_core_get_orig_proj          (GimpPaintCore    *core);
+
+void      gimp_paint_core_paste             (GimpPaintCore            *core,
+                                             const GimpTempBuf        *paint_mask,
+                                             gint                      paint_mask_offset_x,
+                                             gint                      paint_mask_offset_y,
+                                             GimpDrawable             *drawable,
+                                             gdouble                   paint_opacity,
+                                             gdouble                   image_opacity,
+                                             GimpLayerMode             paint_mode,
+                                             GimpPaintApplicationMode  mode);
+
+void      gimp_paint_core_replace           (GimpPaintCore            *core,
+                                             const GimpTempBuf        *paint_mask,
+                                             gint                      paint_mask_offset_x,
+                                             gint                      paint_mask_offset_y,
+                                             GimpDrawable             *drawable,
+                                             gdouble                   paint_opacity,
+                                             gdouble                   image_opacity,
+                                             GimpPaintApplicationMode  mode);
+
+void      gimp_paint_core_smooth_coords             (GimpPaintCore    *core,
+                                                     GimpPaintOptions *paint_options,
+                                                     GimpCoords       *coords);
+
+
+#endif  /*  __GIMP_PAINT_CORE_H__  */
diff --git a/app/paint/gimppaintcoreundo.c b/app/paint/gimppaintcoreundo.c
new file mode 100644
index 0000000..861642f
--- /dev/null
+++ b/app/paint/gimppaintcoreundo.c
@@ -0,0 +1,172 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "gimppaintcore.h"
+#include "gimppaintcoreundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PAINT_CORE
+};
+
+
+static void   gimp_paint_core_undo_constructed  (GObject             *object);
+static void   gimp_paint_core_undo_set_property (GObject             *object,
+                                                 guint                property_id,
+                                                 const GValue        *value,
+                                                 GParamSpec          *pspec);
+static void   gimp_paint_core_undo_get_property (GObject             *object,
+                                                 guint                property_id,
+                                                 GValue              *value,
+                                                 GParamSpec          *pspec);
+
+static void   gimp_paint_core_undo_pop          (GimpUndo            *undo,
+                                                 GimpUndoMode         undo_mode,
+                                                 GimpUndoAccumulator *accum);
+static void   gimp_paint_core_undo_free         (GimpUndo            *undo,
+                                                 GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpPaintCoreUndo, gimp_paint_core_undo, GIMP_TYPE_UNDO)
+
+#define parent_class gimp_paint_core_undo_parent_class
+
+
+static void
+gimp_paint_core_undo_class_init (GimpPaintCoreUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed  = gimp_paint_core_undo_constructed;
+  object_class->set_property = gimp_paint_core_undo_set_property;
+  object_class->get_property = gimp_paint_core_undo_get_property;
+
+  undo_class->pop            = gimp_paint_core_undo_pop;
+  undo_class->free           = gimp_paint_core_undo_free;
+
+  g_object_class_install_property (object_class, PROP_PAINT_CORE,
+                                   g_param_spec_object ("paint-core", NULL, NULL,
+                                                        GIMP_TYPE_PAINT_CORE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_paint_core_undo_init (GimpPaintCoreUndo *undo)
+{
+}
+
+static void
+gimp_paint_core_undo_constructed (GObject *object)
+{
+  GimpPaintCoreUndo *paint_core_undo = GIMP_PAINT_CORE_UNDO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_PAINT_CORE (paint_core_undo->paint_core));
+
+  paint_core_undo->last_coords = paint_core_undo->paint_core->start_coords;
+
+  g_object_add_weak_pointer (G_OBJECT (paint_core_undo->paint_core),
+                             (gpointer) &paint_core_undo->paint_core);
+}
+
+static void
+gimp_paint_core_undo_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpPaintCoreUndo *paint_core_undo = GIMP_PAINT_CORE_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PAINT_CORE:
+      paint_core_undo->paint_core = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_paint_core_undo_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpPaintCoreUndo *paint_core_undo = GIMP_PAINT_CORE_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PAINT_CORE:
+      g_value_set_object (value, paint_core_undo->paint_core);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_paint_core_undo_pop (GimpUndo              *undo,
+                          GimpUndoMode           undo_mode,
+                          GimpUndoAccumulator   *accum)
+{
+  GimpPaintCoreUndo *paint_core_undo = GIMP_PAINT_CORE_UNDO (undo);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  /*  only pop if the core still exists  */
+  if (paint_core_undo->paint_core)
+    {
+      GimpCoords tmp_coords;
+
+      tmp_coords = paint_core_undo->paint_core->last_coords;
+      paint_core_undo->paint_core->last_coords = paint_core_undo->last_coords;
+      paint_core_undo->last_coords = tmp_coords;
+    }
+}
+
+static void
+gimp_paint_core_undo_free (GimpUndo     *undo,
+                           GimpUndoMode  undo_mode)
+{
+  GimpPaintCoreUndo *paint_core_undo = GIMP_PAINT_CORE_UNDO (undo);
+
+  if (paint_core_undo->paint_core)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (paint_core_undo->paint_core),
+                                    (gpointer) &paint_core_undo->paint_core);
+      paint_core_undo->paint_core = NULL;
+    }
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/paint/gimppaintcoreundo.h b/app/paint/gimppaintcoreundo.h
new file mode 100644
index 0000000..dca5c34
--- /dev/null
+++ b/app/paint/gimppaintcoreundo.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_CORE_UNDO_H__
+#define __GIMP_PAINT_CORE_UNDO_H__
+
+
+#include "core/gimpundo.h"
+
+
+#define GIMP_TYPE_PAINT_CORE_UNDO            (gimp_paint_core_undo_get_type ())
+#define GIMP_PAINT_CORE_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINT_CORE_UNDO, GimpPaintCoreUndo))
+#define GIMP_PAINT_CORE_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINT_CORE_UNDO, GimpPaintCoreUndoClass))
+#define GIMP_IS_PAINT_CORE_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINT_CORE_UNDO))
+#define GIMP_IS_PAINT_CORE_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINT_CORE_UNDO))
+#define GIMP_PAINT_CORE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINT_CORE_UNDO, GimpPaintCoreUndoClass))
+
+
+typedef struct _GimpPaintCoreUndo      GimpPaintCoreUndo;
+typedef struct _GimpPaintCoreUndoClass GimpPaintCoreUndoClass;
+
+struct _GimpPaintCoreUndo
+{
+  GimpUndo       parent_instance;
+
+  GimpPaintCore *paint_core;
+  GimpCoords     last_coords;
+};
+
+struct _GimpPaintCoreUndoClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType   gimp_paint_core_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_PAINT_CORE_UNDO_H__ */
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
new file mode 100644
index 0000000..60c5959
--- /dev/null
+++ b/app/paint/gimppaintoptions.c
@@ -0,0 +1,1272 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush-header.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpimage.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpdynamicsoutput.h"
+#include "core/gimpgradient.h"
+#include "core/gimppaintinfo.h"
+
+#include "gimpbrushcore.h"
+#include "gimppaintoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_BRUSH_SIZE              20.0
+#define DEFAULT_BRUSH_ASPECT_RATIO      0.0
+#define DEFAULT_BRUSH_ANGLE             0.0
+#define DEFAULT_BRUSH_SPACING           0.1
+#define DEFAULT_BRUSH_HARDNESS          1.0 /* Generated brushes have their own */
+#define DEFAULT_BRUSH_FORCE             0.5
+
+#define DEFAULT_BRUSH_LINK_SIZE         TRUE
+#define DEFAULT_BRUSH_LINK_ASPECT_RATIO TRUE
+#define DEFAULT_BRUSH_LINK_ANGLE        TRUE
+#define DEFAULT_BRUSH_LINK_SPACING      TRUE
+#define DEFAULT_BRUSH_LINK_HARDNESS     TRUE
+
+#define DEFAULT_BRUSH_LOCK_TO_VIEW      FALSE
+
+#define DEFAULT_APPLICATION_MODE        GIMP_PAINT_CONSTANT
+#define DEFAULT_HARD                    FALSE
+
+#define DEFAULT_USE_JITTER              FALSE
+#define DEFAULT_JITTER_AMOUNT           0.2
+
+#define DEFAULT_DYNAMICS_EXPANDED       FALSE
+
+#define DEFAULT_FADE_LENGTH             100.0
+#define DEFAULT_FADE_REVERSE            FALSE
+#define DEFAULT_FADE_REPEAT             GIMP_REPEAT_NONE
+#define DEFAULT_FADE_UNIT               GIMP_UNIT_PIXEL
+
+#define DEFAULT_GRADIENT_REVERSE        FALSE
+#define DEFAULT_GRADIENT_BLEND_SPACE    GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL
+#define DEFAULT_GRADIENT_REPEAT         GIMP_REPEAT_NONE
+
+#define DYNAMIC_MAX_VALUE               1.0
+#define DYNAMIC_MIN_VALUE               0.0
+
+#define DEFAULT_SMOOTHING_QUALITY       20
+#define DEFAULT_SMOOTHING_FACTOR        50
+
+enum
+{
+  PROP_0,
+
+  PROP_PAINT_INFO,
+
+  PROP_USE_APPLICATOR, /* temp debug */
+
+  PROP_BRUSH_SIZE,
+  PROP_BRUSH_ASPECT_RATIO,
+  PROP_BRUSH_ANGLE,
+  PROP_BRUSH_SPACING,
+  PROP_BRUSH_HARDNESS,
+  PROP_BRUSH_FORCE,
+
+  PROP_BRUSH_LINK_SIZE,
+  PROP_BRUSH_LINK_ASPECT_RATIO,
+  PROP_BRUSH_LINK_ANGLE,
+  PROP_BRUSH_LINK_SPACING,
+  PROP_BRUSH_LINK_HARDNESS,
+
+  PROP_BRUSH_LOCK_TO_VIEW,
+
+  PROP_APPLICATION_MODE,
+  PROP_HARD,
+
+  PROP_USE_JITTER,
+  PROP_JITTER_AMOUNT,
+
+  PROP_DYNAMICS_EXPANDED,
+
+  PROP_FADE_LENGTH,
+  PROP_FADE_REVERSE,
+  PROP_FADE_REPEAT,
+  PROP_FADE_UNIT,
+
+  PROP_GRADIENT_REVERSE,
+  PROP_GRADIENT_BLEND_COLOR_SPACE,
+  PROP_GRADIENT_REPEAT,
+
+  PROP_BRUSH_VIEW_TYPE,
+  PROP_BRUSH_VIEW_SIZE,
+  PROP_DYNAMICS_VIEW_TYPE,
+  PROP_DYNAMICS_VIEW_SIZE,
+  PROP_PATTERN_VIEW_TYPE,
+  PROP_PATTERN_VIEW_SIZE,
+  PROP_GRADIENT_VIEW_TYPE,
+  PROP_GRADIENT_VIEW_SIZE,
+
+  PROP_USE_SMOOTHING,
+  PROP_SMOOTHING_QUALITY,
+  PROP_SMOOTHING_FACTOR
+};
+
+
+static void         gimp_paint_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void         gimp_paint_options_dispose           (GObject          *object);
+static void         gimp_paint_options_finalize          (GObject          *object);
+static void         gimp_paint_options_set_property      (GObject          *object,
+                                                          guint             property_id,
+                                                          const GValue     *value,
+                                                          GParamSpec       *pspec);
+static void         gimp_paint_options_get_property      (GObject          *object,
+                                                          guint             property_id,
+                                                          GValue           *value,
+                                                          GParamSpec       *pspec);
+
+static void         gimp_paint_options_brush_changed     (GimpContext      *context,
+                                                          GimpBrush        *brush);
+static void         gimp_paint_options_brush_notify      (GimpBrush        *brush,
+                                                          const GParamSpec *pspec,
+                                                          GimpPaintOptions *options);
+
+static GimpConfig * gimp_paint_options_duplicate         (GimpConfig       *config);
+static gboolean     gimp_paint_options_copy              (GimpConfig       *src,
+                                                          GimpConfig       *dest,
+                                                          GParamFlags       flags);
+static void         gimp_paint_options_reset             (GimpConfig       *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpPaintOptions, gimp_paint_options,
+                         GIMP_TYPE_TOOL_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_paint_options_config_iface_init))
+
+#define parent_class gimp_paint_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_paint_options_class_init (GimpPaintOptionsClass *klass)
+{
+  GObjectClass     *object_class  = G_OBJECT_CLASS (klass);
+  GimpContextClass *context_class = GIMP_CONTEXT_CLASS (klass);
+
+  object_class->dispose         = gimp_paint_options_dispose;
+  object_class->finalize        = gimp_paint_options_finalize;
+  object_class->set_property    = gimp_paint_options_set_property;
+  object_class->get_property    = gimp_paint_options_get_property;
+
+  context_class->brush_changed  = gimp_paint_options_brush_changed;
+
+  g_object_class_install_property (object_class, PROP_PAINT_INFO,
+                                   g_param_spec_object ("paint-info",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_PAINT_INFO,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_USE_APPLICATOR,
+                                   g_param_spec_boolean ("use-applicator",
+                                                         "Use GimpApplicator",
+                                                         NULL,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRUSH_SIZE,
+                           "brush-size",
+                           _("Size"),
+                           _("Brush Size"),
+                           1.0, GIMP_BRUSH_MAX_SIZE, DEFAULT_BRUSH_SIZE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRUSH_ASPECT_RATIO,
+                           "brush-aspect-ratio",
+                           _("Aspect Ratio"),
+                           _("Brush Aspect Ratio"),
+                           -20.0, 20.0, DEFAULT_BRUSH_ASPECT_RATIO,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRUSH_ANGLE,
+                           "brush-angle",
+                           _("Angle"),
+                           _("Brush Angle"),
+                           -180.0, 180.0, DEFAULT_BRUSH_ANGLE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRUSH_SPACING,
+                           "brush-spacing",
+                           _("Spacing"),
+                           _("Brush Spacing"),
+                           0.01, 50.0, DEFAULT_BRUSH_SPACING,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRUSH_HARDNESS,
+                           "brush-hardness",
+                           _("Hardness"),
+                           _("Brush Hardness"),
+                           0.0, 1.0, DEFAULT_BRUSH_HARDNESS,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BRUSH_FORCE,
+                           "brush-force",
+                           _("Force"),
+                           _("Brush Force"),
+                           0.0, 1.0, DEFAULT_BRUSH_FORCE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BRUSH_LINK_SIZE,
+                            "brush-link-size",
+                            _("Link Size"),
+                            _("Link brush size to brush native"),
+                            DEFAULT_BRUSH_LINK_SIZE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BRUSH_LINK_ASPECT_RATIO,
+                            "brush-link-aspect-ratio",
+                            _("Link Aspect Ratio"),
+                            _("Link brush aspect ratio to brush native"),
+                            DEFAULT_BRUSH_LINK_ASPECT_RATIO,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BRUSH_LINK_ANGLE,
+                            "brush-link-angle",
+                            _("Link Angle"),
+                            _("Link brush angle to brush native"),
+                            DEFAULT_BRUSH_LINK_ANGLE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BRUSH_LINK_SPACING,
+                            "brush-link-spacing",
+                            _("Link Spacing"),
+                            _("Link brush spacing to brush native"),
+                            DEFAULT_BRUSH_LINK_SPACING,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BRUSH_LINK_HARDNESS,
+                            "brush-link-hardness",
+                            _("Link Hardness"),
+                            _("Link brush hardness to brush native"),
+                            DEFAULT_BRUSH_LINK_HARDNESS,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BRUSH_LOCK_TO_VIEW,
+                            "brush-lock-to-view",
+                            _("Lock brush to view"),
+                            _("Keep brush appearance fixed relative to the view"),
+                            DEFAULT_BRUSH_LOCK_TO_VIEW,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_APPLICATION_MODE,
+                         "application-mode",
+                         _("Incremental"),
+                         _("Every stamp has its own opacity"),
+                         GIMP_TYPE_PAINT_APPLICATION_MODE,
+                         DEFAULT_APPLICATION_MODE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_HARD,
+                            "hard",
+                            _("Hard edge"),
+                            _("Ignore fuzziness of the current brush"),
+                            DEFAULT_HARD,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_JITTER,
+                            "use-jitter",
+                            _("Apply Jitter"),
+                            _("Scatter brush as you paint"),
+                            DEFAULT_USE_JITTER,
+                            GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_JITTER_AMOUNT,
+                           "jitter-amount",
+                           _("Amount"),
+                           _("Distance of scattering"),
+                           0.0, 50.0, DEFAULT_JITTER_AMOUNT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DYNAMICS_EXPANDED,
+                            "dynamics-expanded",
+                            _("Dynamics Options"),
+                            NULL,
+                            DEFAULT_DYNAMICS_EXPANDED,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FADE_LENGTH,
+                           "fade-length",
+                           _("Fade length"),
+                           _("Distance over which strokes fade out"),
+                           0.0, 32767.0, DEFAULT_FADE_LENGTH,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_FADE_UNIT,
+                         "fade-unit",
+                         NULL, NULL,
+                         TRUE, TRUE, DEFAULT_FADE_UNIT,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FADE_REVERSE,
+                            "fade-reverse",
+                            _("Reverse"),
+                            _("Reverse direction of fading"),
+                            DEFAULT_FADE_REVERSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FADE_REPEAT,
+                         "fade-repeat",
+                         _("Repeat"),
+                         _("How fade is repeated as you paint"),
+                         GIMP_TYPE_REPEAT_MODE,
+                         DEFAULT_FADE_REPEAT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_GRADIENT_REVERSE,
+                            "gradient-reverse",
+                            NULL, NULL,
+                            DEFAULT_GRADIENT_REVERSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRADIENT_BLEND_COLOR_SPACE,
+                         "gradient-blend-color-space",
+                         _("Blend Color Space"),
+                         _("Which color space to use when blending RGB gradient segments"),
+                         GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE,
+                         DEFAULT_GRADIENT_BLEND_SPACE,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRADIENT_REPEAT,
+                         "gradient-repeat",
+                         _("Repeat"),
+                         NULL,
+                         GIMP_TYPE_REPEAT_MODE,
+                         DEFAULT_GRADIENT_REPEAT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BRUSH_VIEW_TYPE,
+                         "brush-view-type",
+                         NULL, NULL,
+                         GIMP_TYPE_VIEW_TYPE,
+                         GIMP_VIEW_TYPE_GRID,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_BRUSH_VIEW_SIZE,
+                        "brush-view-size",
+                        NULL, NULL,
+                        GIMP_VIEW_SIZE_TINY,
+                        GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                        GIMP_VIEW_SIZE_SMALL,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DYNAMICS_VIEW_TYPE,
+                         "dynamics-view-type",
+                         NULL, NULL,
+                         GIMP_TYPE_VIEW_TYPE,
+                         GIMP_VIEW_TYPE_LIST,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_DYNAMICS_VIEW_SIZE,
+                        "dynamics-view-size",
+                        NULL, NULL,
+                        GIMP_VIEW_SIZE_TINY,
+                        GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                        GIMP_VIEW_SIZE_SMALL,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PATTERN_VIEW_TYPE,
+                         "pattern-view-type",
+                         NULL, NULL,
+                         GIMP_TYPE_VIEW_TYPE,
+                         GIMP_VIEW_TYPE_GRID,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_PATTERN_VIEW_SIZE,
+                        "pattern-view-size",
+                        NULL, NULL,
+                        GIMP_VIEW_SIZE_TINY,
+                        GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                        GIMP_VIEW_SIZE_SMALL,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRADIENT_VIEW_TYPE,
+                         "gradient-view-type",
+                         NULL, NULL,
+                         GIMP_TYPE_VIEW_TYPE,
+                         GIMP_VIEW_TYPE_LIST,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_GRADIENT_VIEW_SIZE,
+                        "gradient-view-size",
+                        NULL, NULL,
+                        GIMP_VIEW_SIZE_TINY,
+                        GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                        GIMP_VIEW_SIZE_LARGE,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_SMOOTHING,
+                            "use-smoothing",
+                            _("Smooth stroke"),
+                            _("Paint smoother strokes"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_SMOOTHING_QUALITY,
+                        "smoothing-quality",
+                        _("Quality"),
+                        _("Depth of smoothing"),
+                        1, 100, DEFAULT_SMOOTHING_QUALITY,
+                        GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SMOOTHING_FACTOR,
+                           "smoothing-factor",
+                           _("Weight"),
+                           _("Gravity of the pen"),
+                           /* Max velocity is set to 3; allowing for
+                            * smoothing factor to be less than velcoty
+                            * results in numeric instablility
+                            */
+                           3.0, 1000.0, DEFAULT_SMOOTHING_FACTOR,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_paint_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  if (! parent_config_iface)
+    parent_config_iface = g_type_default_interface_peek (GIMP_TYPE_CONFIG);
+
+  config_iface->duplicate = gimp_paint_options_duplicate;
+  config_iface->copy      = gimp_paint_options_copy;
+  config_iface->reset     = gimp_paint_options_reset;
+}
+
+static void
+gimp_paint_options_init (GimpPaintOptions *options)
+{
+  options->application_mode_save = DEFAULT_APPLICATION_MODE;
+
+  options->jitter_options    = g_slice_new0 (GimpJitterOptions);
+  options->fade_options      = g_slice_new0 (GimpFadeOptions);
+  options->gradient_options  = g_slice_new0 (GimpGradientPaintOptions);
+  options->smoothing_options = g_slice_new0 (GimpSmoothingOptions);
+}
+
+static void
+gimp_paint_options_dispose (GObject *object)
+{
+  GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
+
+  g_clear_object (&options->paint_info);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_paint_options_finalize (GObject *object)
+{
+  GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
+
+  g_slice_free (GimpJitterOptions,        options->jitter_options);
+  g_slice_free (GimpFadeOptions,          options->fade_options);
+  g_slice_free (GimpGradientPaintOptions, options->gradient_options);
+  g_slice_free (GimpSmoothingOptions,     options->smoothing_options);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_paint_options_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpPaintOptions         *options           = GIMP_PAINT_OPTIONS (object);
+  GimpFadeOptions          *fade_options      = options->fade_options;
+  GimpJitterOptions        *jitter_options    = options->jitter_options;
+  GimpGradientPaintOptions *gradient_options  = options->gradient_options;
+  GimpSmoothingOptions     *smoothing_options = options->smoothing_options;
+
+  switch (property_id)
+    {
+    case PROP_PAINT_INFO:
+      options->paint_info = g_value_dup_object (value);
+      break;
+
+    case PROP_USE_APPLICATOR:
+      options->use_applicator = g_value_get_boolean (value);
+      break;
+
+    case PROP_BRUSH_SIZE:
+      options->brush_size = g_value_get_double (value);
+      break;
+    case PROP_BRUSH_ASPECT_RATIO:
+      options->brush_aspect_ratio = g_value_get_double (value);
+      break;
+    case PROP_BRUSH_ANGLE:
+      options->brush_angle = - 1.0 * g_value_get_double (value) / 360.0; /* let's make the angle mathematically correct */
+      break;
+    case PROP_BRUSH_SPACING:
+      options->brush_spacing = g_value_get_double (value);
+      break;
+    case PROP_BRUSH_HARDNESS:
+      options->brush_hardness = g_value_get_double (value);
+      break;
+    case PROP_BRUSH_FORCE:
+      options->brush_force = g_value_get_double (value);
+      break;
+
+    case PROP_BRUSH_LINK_SIZE:
+      options->brush_link_size = g_value_get_boolean (value);
+      break;
+    case PROP_BRUSH_LINK_ASPECT_RATIO:
+      options->brush_link_aspect_ratio = g_value_get_boolean (value);
+      break;
+    case PROP_BRUSH_LINK_ANGLE:
+      options->brush_link_angle = g_value_get_boolean (value);
+      break;
+    case PROP_BRUSH_LINK_SPACING:
+      options->brush_link_spacing = g_value_get_boolean (value);
+      break;
+    case PROP_BRUSH_LINK_HARDNESS:
+      options->brush_link_hardness = g_value_get_boolean (value);
+      break;
+
+    case PROP_BRUSH_LOCK_TO_VIEW:
+      options->brush_lock_to_view = g_value_get_boolean (value);
+      break;
+
+    case PROP_APPLICATION_MODE:
+      options->application_mode = g_value_get_enum (value);
+      break;
+    case PROP_HARD:
+      options->hard = g_value_get_boolean (value);
+      break;
+
+    case PROP_USE_JITTER:
+      jitter_options->use_jitter = g_value_get_boolean (value);
+      break;
+    case PROP_JITTER_AMOUNT:
+      jitter_options->jitter_amount = g_value_get_double (value);
+      break;
+
+    case PROP_DYNAMICS_EXPANDED:
+      options->dynamics_expanded = g_value_get_boolean (value);
+      break;
+
+    case PROP_FADE_LENGTH:
+      fade_options->fade_length = g_value_get_double (value);
+      break;
+    case PROP_FADE_REVERSE:
+      fade_options->fade_reverse = g_value_get_boolean (value);
+      break;
+    case PROP_FADE_REPEAT:
+      fade_options->fade_repeat = g_value_get_enum (value);
+      break;
+    case PROP_FADE_UNIT:
+      fade_options->fade_unit = g_value_get_int (value);
+      break;
+
+    case PROP_GRADIENT_REVERSE:
+      gradient_options->gradient_reverse = g_value_get_boolean (value);
+      break;
+    case PROP_GRADIENT_BLEND_COLOR_SPACE:
+      gradient_options->gradient_blend_color_space = g_value_get_enum (value);
+      break;
+    case PROP_GRADIENT_REPEAT:
+      gradient_options->gradient_repeat = g_value_get_enum (value);
+      break;
+
+    case PROP_BRUSH_VIEW_TYPE:
+      options->brush_view_type = g_value_get_enum (value);
+      break;
+    case PROP_BRUSH_VIEW_SIZE:
+      options->brush_view_size = g_value_get_int (value);
+      break;
+
+    case PROP_DYNAMICS_VIEW_TYPE:
+      options->dynamics_view_type = g_value_get_enum (value);
+      break;
+    case PROP_DYNAMICS_VIEW_SIZE:
+      options->dynamics_view_size = g_value_get_int (value);
+      break;
+
+    case PROP_PATTERN_VIEW_TYPE:
+      options->pattern_view_type = g_value_get_enum (value);
+      break;
+    case PROP_PATTERN_VIEW_SIZE:
+      options->pattern_view_size = g_value_get_int (value);
+      break;
+
+    case PROP_GRADIENT_VIEW_TYPE:
+      options->gradient_view_type = g_value_get_enum (value);
+      break;
+    case PROP_GRADIENT_VIEW_SIZE:
+      options->gradient_view_size = g_value_get_int (value);
+      break;
+
+    case PROP_USE_SMOOTHING:
+      smoothing_options->use_smoothing = g_value_get_boolean (value);
+      break;
+    case PROP_SMOOTHING_QUALITY:
+      smoothing_options->smoothing_quality = g_value_get_int (value);
+      break;
+    case PROP_SMOOTHING_FACTOR:
+      smoothing_options->smoothing_factor = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_paint_options_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpPaintOptions         *options           = GIMP_PAINT_OPTIONS (object);
+  GimpFadeOptions          *fade_options      = options->fade_options;
+  GimpJitterOptions        *jitter_options    = options->jitter_options;
+  GimpGradientPaintOptions *gradient_options  = options->gradient_options;
+  GimpSmoothingOptions     *smoothing_options = options->smoothing_options;
+
+  switch (property_id)
+    {
+    case PROP_PAINT_INFO:
+      g_value_set_object (value, options->paint_info);
+      break;
+
+    case PROP_USE_APPLICATOR:
+      g_value_set_boolean (value, options->use_applicator);
+      break;
+
+    case PROP_BRUSH_SIZE:
+      g_value_set_double (value, options->brush_size);
+      break;
+    case PROP_BRUSH_ASPECT_RATIO:
+      g_value_set_double (value, options->brush_aspect_ratio);
+      break;
+    case PROP_BRUSH_ANGLE:
+      g_value_set_double (value, - 1.0 * options->brush_angle * 360.0); /* mathematically correct -> intuitively correct */
+      break;
+    case PROP_BRUSH_SPACING:
+      g_value_set_double (value, options->brush_spacing);
+      break;
+    case PROP_BRUSH_HARDNESS:
+      g_value_set_double (value, options->brush_hardness);
+      break;
+    case PROP_BRUSH_FORCE:
+      g_value_set_double (value, options->brush_force);
+      break;
+
+    case PROP_BRUSH_LINK_SIZE:
+      g_value_set_boolean (value, options->brush_link_size);
+      break;
+    case PROP_BRUSH_LINK_ASPECT_RATIO:
+      g_value_set_boolean (value, options->brush_link_aspect_ratio);
+      break;
+    case PROP_BRUSH_LINK_ANGLE:
+      g_value_set_boolean (value, options->brush_link_angle);
+      break;
+    case PROP_BRUSH_LINK_SPACING:
+      g_value_set_boolean (value, options->brush_link_spacing);
+      break;
+    case PROP_BRUSH_LINK_HARDNESS:
+      g_value_set_boolean (value, options->brush_link_hardness);
+      break;
+
+    case PROP_BRUSH_LOCK_TO_VIEW:
+      g_value_set_boolean (value, options->brush_lock_to_view);
+      break;
+
+    case PROP_APPLICATION_MODE:
+      g_value_set_enum (value, options->application_mode);
+      break;
+    case PROP_HARD:
+      g_value_set_boolean (value, options->hard);
+      break;
+
+    case PROP_USE_JITTER:
+      g_value_set_boolean (value, jitter_options->use_jitter);
+      break;
+    case PROP_JITTER_AMOUNT:
+      g_value_set_double (value, jitter_options->jitter_amount);
+      break;
+
+    case PROP_DYNAMICS_EXPANDED:
+      g_value_set_boolean (value, options->dynamics_expanded);
+      break;
+
+    case PROP_FADE_LENGTH:
+      g_value_set_double (value, fade_options->fade_length);
+      break;
+    case PROP_FADE_REVERSE:
+      g_value_set_boolean (value, fade_options->fade_reverse);
+      break;
+    case PROP_FADE_REPEAT:
+      g_value_set_enum (value, fade_options->fade_repeat);
+      break;
+    case PROP_FADE_UNIT:
+      g_value_set_int (value, fade_options->fade_unit);
+      break;
+
+    case PROP_GRADIENT_REVERSE:
+      g_value_set_boolean (value, gradient_options->gradient_reverse);
+      break;
+    case PROP_GRADIENT_BLEND_COLOR_SPACE:
+      g_value_set_enum (value, gradient_options->gradient_blend_color_space);
+      break;
+    case PROP_GRADIENT_REPEAT:
+      g_value_set_enum (value, gradient_options->gradient_repeat);
+      break;
+
+    case PROP_BRUSH_VIEW_TYPE:
+      g_value_set_enum (value, options->brush_view_type);
+      break;
+    case PROP_BRUSH_VIEW_SIZE:
+      g_value_set_int (value, options->brush_view_size);
+      break;
+
+    case PROP_DYNAMICS_VIEW_TYPE:
+      g_value_set_enum (value, options->dynamics_view_type);
+      break;
+    case PROP_DYNAMICS_VIEW_SIZE:
+      g_value_set_int (value, options->dynamics_view_size);
+      break;
+
+    case PROP_PATTERN_VIEW_TYPE:
+      g_value_set_enum (value, options->pattern_view_type);
+      break;
+    case PROP_PATTERN_VIEW_SIZE:
+      g_value_set_int (value, options->pattern_view_size);
+      break;
+
+    case PROP_GRADIENT_VIEW_TYPE:
+      g_value_set_enum (value, options->gradient_view_type);
+      break;
+    case PROP_GRADIENT_VIEW_SIZE:
+      g_value_set_int (value, options->gradient_view_size);
+      break;
+
+    case PROP_USE_SMOOTHING:
+      g_value_set_boolean (value, smoothing_options->use_smoothing);
+      break;
+    case PROP_SMOOTHING_QUALITY:
+      g_value_set_int (value, smoothing_options->smoothing_quality);
+      break;
+    case PROP_SMOOTHING_FACTOR:
+      g_value_set_double (value, smoothing_options->smoothing_factor);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_paint_options_brush_changed (GimpContext *context,
+                                  GimpBrush   *brush)
+{
+  GimpPaintOptions *options = GIMP_PAINT_OPTIONS (context);
+
+  if (options->paint_info &&
+      g_type_is_a (options->paint_info->paint_type,
+                   GIMP_TYPE_BRUSH_CORE))
+    {
+      if (options->brush)
+        {
+          g_signal_handlers_disconnect_by_func (options->brush,
+                                                gimp_paint_options_brush_notify,
+                                                options);
+          g_object_remove_weak_pointer (G_OBJECT (options->brush),
+                                        (gpointer) &options->brush);
+        }
+
+      options->brush = brush;
+
+      if (options->brush)
+        {
+          g_object_add_weak_pointer (G_OBJECT (options->brush),
+                                     (gpointer) &options->brush);
+          g_signal_connect_object (options->brush, "notify",
+                                   G_CALLBACK (gimp_paint_options_brush_notify),
+                                   options, 0);
+
+          gimp_paint_options_brush_notify (options->brush, NULL, options);
+        }
+    }
+}
+
+static void
+gimp_paint_options_brush_notify (GimpBrush        *brush,
+                                 const GParamSpec *pspec,
+                                 GimpPaintOptions *options)
+{
+  if (gimp_tool_options_get_gui_mode (GIMP_TOOL_OPTIONS (options)))
+    {
+#define IS_PSPEC(p,n) (p == NULL || ! strcmp (n, p->name))
+
+      if (options->brush_link_size && IS_PSPEC (pspec, "radius"))
+        gimp_paint_options_set_default_brush_size (options, brush);
+
+      if (options->brush_link_aspect_ratio && IS_PSPEC (pspec, "aspect-ratio"))
+        gimp_paint_options_set_default_brush_aspect_ratio (options, brush);
+
+      if (options->brush_link_angle && IS_PSPEC (pspec, "angle"))
+        gimp_paint_options_set_default_brush_angle (options, brush);
+
+      if (options->brush_link_spacing && IS_PSPEC (pspec, "spacing"))
+        gimp_paint_options_set_default_brush_spacing (options, brush);
+
+      if (options->brush_link_hardness && IS_PSPEC (pspec, "hardness"))
+        gimp_paint_options_set_default_brush_hardness (options, brush);
+
+#undef IS_SPEC
+    }
+}
+
+static GimpConfig *
+gimp_paint_options_duplicate (GimpConfig *config)
+{
+  return parent_config_iface->duplicate (config);
+}
+
+static gboolean
+gimp_paint_options_copy (GimpConfig  *src,
+                         GimpConfig  *dest,
+                         GParamFlags  flags)
+{
+  return parent_config_iface->copy (src, dest, flags);
+}
+
+static void
+gimp_paint_options_reset (GimpConfig *config)
+{
+  GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (config));
+
+  parent_config_iface->reset (config);
+
+  if (brush)
+    {
+      gimp_paint_options_set_default_brush_size (GIMP_PAINT_OPTIONS (config),
+                                                 brush);
+      gimp_paint_options_set_default_brush_hardness (GIMP_PAINT_OPTIONS (config),
+                                                     brush);
+      gimp_paint_options_set_default_brush_aspect_ratio (GIMP_PAINT_OPTIONS (config),
+                                                         brush);
+      gimp_paint_options_set_default_brush_angle (GIMP_PAINT_OPTIONS (config),
+                                                  brush);
+      gimp_paint_options_set_default_brush_spacing (GIMP_PAINT_OPTIONS (config),
+                                                    brush);
+    }
+}
+
+GimpPaintOptions *
+gimp_paint_options_new (GimpPaintInfo *paint_info)
+{
+  GimpPaintOptions *options;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_INFO (paint_info), NULL);
+
+  options = g_object_new (paint_info->paint_options_type,
+                          "gimp",       paint_info->gimp,
+                          "name",       gimp_object_get_name (paint_info),
+                          "paint-info", paint_info,
+                          NULL);
+
+  return options;
+}
+
+gdouble
+gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
+                             GimpImage        *image,
+                             gdouble           pixel_dist)
+{
+  GimpFadeOptions *fade_options;
+  gdouble          z        = -1.0;
+  gdouble          fade_out =  0.0;
+  gdouble          unit_factor;
+  gdouble          pos;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options),
+                        DYNAMIC_MAX_VALUE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), DYNAMIC_MAX_VALUE);
+
+  fade_options = paint_options->fade_options;
+
+  switch (fade_options->fade_unit)
+    {
+    case GIMP_UNIT_PIXEL:
+      fade_out = fade_options->fade_length;
+      break;
+
+    case GIMP_UNIT_PERCENT:
+      fade_out = (MAX (gimp_image_get_width  (image),
+                       gimp_image_get_height (image)) *
+                  fade_options->fade_length / 100);
+      break;
+
+    default:
+      {
+        gdouble xres;
+        gdouble yres;
+
+        gimp_image_get_resolution (image, &xres, &yres);
+
+        unit_factor = gimp_unit_get_factor (fade_options->fade_unit);
+        fade_out    = (fade_options->fade_length *
+                       MAX (xres, yres) / unit_factor);
+      }
+      break;
+    }
+
+  /*  factor in the fade out value  */
+  if (fade_out > 0.0)
+    {
+      pos = pixel_dist / fade_out;
+    }
+  else
+    pos = DYNAMIC_MAX_VALUE;
+
+  /*  for no repeat, set pos close to 1.0 after the first chunk  */
+  if (fade_options->fade_repeat == GIMP_REPEAT_NONE && pos >= DYNAMIC_MAX_VALUE)
+    pos = DYNAMIC_MAX_VALUE - 0.0000001;
+
+  if (((gint) pos & 1) &&
+      fade_options->fade_repeat != GIMP_REPEAT_SAWTOOTH)
+    pos = DYNAMIC_MAX_VALUE - (pos - (gint) pos);
+  else
+    pos = pos - (gint) pos;
+
+  z = pos;
+
+  if (fade_options->fade_reverse)
+    z = 1.0 - z;
+
+  return z;    /*  ln (1/255)  */
+}
+
+gdouble
+gimp_paint_options_get_jitter (GimpPaintOptions *paint_options,
+                               GimpImage        *image)
+{
+  GimpJitterOptions *jitter_options;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), 0.0);
+
+  jitter_options = paint_options->jitter_options;
+
+  if (jitter_options->use_jitter)
+    {
+      return jitter_options->jitter_amount;
+    }
+
+  return 0.0;
+}
+
+gboolean
+gimp_paint_options_get_gradient_color (GimpPaintOptions *paint_options,
+                                       GimpImage        *image,
+                                       gdouble           grad_point,
+                                       gdouble           pixel_dist,
+                                       GimpRGB          *color)
+{
+  GimpDynamics *dynamics;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+
+  dynamics = gimp_context_get_dynamics (GIMP_CONTEXT (paint_options));
+
+  if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_COLOR))
+    {
+      GimpGradientPaintOptions *gradient_options = paint_options->gradient_options;
+      GimpGradient             *gradient;
+
+      gradient = gimp_context_get_gradient (GIMP_CONTEXT (paint_options));
+
+      gimp_gradient_get_color_at (gradient, GIMP_CONTEXT (paint_options),
+                                  NULL, grad_point,
+                                  gradient_options->gradient_reverse,
+                                  gradient_options->gradient_blend_color_space,
+                                  color);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+GimpBrushApplicationMode
+gimp_paint_options_get_brush_mode (GimpPaintOptions *paint_options)
+{
+  GimpDynamics *dynamics;
+  gboolean      dynamic_force = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), GIMP_BRUSH_SOFT);
+
+  if (paint_options->hard)
+    return GIMP_BRUSH_HARD;
+
+  dynamics = gimp_context_get_dynamics (GIMP_CONTEXT (paint_options));
+
+  dynamic_force = gimp_dynamics_is_output_enabled (dynamics,
+                                                   GIMP_DYNAMICS_OUTPUT_FORCE);
+
+  if (dynamic_force || (paint_options->brush_force != 0.5))
+    return GIMP_BRUSH_PRESSURE;
+
+  return GIMP_BRUSH_SOFT;
+}
+
+void
+gimp_paint_options_set_default_brush_size (GimpPaintOptions *paint_options,
+                                           GimpBrush        *brush)
+{
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  if (! brush)
+    brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    {
+      gint height;
+      gint width;
+
+      gimp_brush_transform_size (brush, 1.0, 0.0, 0.0, FALSE, &width, &height);
+
+      g_object_set (paint_options,
+                    "brush-size", (gdouble) MAX (height, width),
+                    NULL);
+    }
+}
+
+void
+gimp_paint_options_set_default_brush_angle (GimpPaintOptions *paint_options,
+                                            GimpBrush        *brush)
+{
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  if (! brush)
+    brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (GIMP_IS_BRUSH_GENERATED (brush))
+    {
+      GimpBrushGenerated *generated_brush = GIMP_BRUSH_GENERATED (brush);
+
+      g_object_set (paint_options,
+                    "brush-angle", (gdouble) gimp_brush_generated_get_angle (generated_brush),
+                    NULL);
+    }
+  else
+    {
+      g_object_set (paint_options,
+                    "brush-angle", DEFAULT_BRUSH_ANGLE,
+                    NULL);
+    }
+}
+
+void
+gimp_paint_options_set_default_brush_aspect_ratio (GimpPaintOptions *paint_options,
+                                                   GimpBrush        *brush)
+{
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  if (! brush)
+    brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (GIMP_IS_BRUSH_GENERATED (brush))
+    {
+      GimpBrushGenerated *generated_brush = GIMP_BRUSH_GENERATED (brush);
+      gdouble             ratio;
+
+      ratio = gimp_brush_generated_get_aspect_ratio (generated_brush);
+
+      ratio = (ratio - 1.0) * 20.0 / 19.0;
+
+      g_object_set (paint_options,
+                    "brush-aspect-ratio", ratio,
+                    NULL);
+    }
+  else
+    {
+      g_object_set (paint_options,
+                    "brush-aspect-ratio", DEFAULT_BRUSH_ASPECT_RATIO,
+                    NULL);
+    }
+}
+
+void
+gimp_paint_options_set_default_brush_spacing (GimpPaintOptions *paint_options,
+                                              GimpBrush        *brush)
+{
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  if (! brush)
+    brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    {
+      g_object_set (paint_options,
+                    "brush-spacing", (gdouble) gimp_brush_get_spacing (brush) / 100.0,
+                    NULL);
+    }
+}
+
+void
+gimp_paint_options_set_default_brush_hardness (GimpPaintOptions *paint_options,
+                                               GimpBrush        *brush)
+{
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options));
+  g_return_if_fail (brush == NULL || GIMP_IS_BRUSH (brush));
+
+  if (! brush)
+    brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (GIMP_IS_BRUSH_GENERATED (brush))
+    {
+      GimpBrushGenerated *generated_brush = GIMP_BRUSH_GENERATED (brush);
+
+      g_object_set (paint_options,
+                    "brush-hardness", (gdouble) gimp_brush_generated_get_hardness (generated_brush),
+                    NULL);
+    }
+  else
+    {
+      g_object_set (paint_options,
+                    "brush-hardness", DEFAULT_BRUSH_HARDNESS,
+                    NULL);
+    }
+}
+
+static const gchar *brush_props[] =
+{
+  "brush-size",
+  "brush-angle",
+  "brush-aspect-ratio",
+  "brush-spacing",
+  "brush-hardness",
+  "brush-force",
+  "brush-link-size",
+  "brush-link-angle",
+  "brush-link-aspect-ratio",
+  "brush-link-spacing",
+  "brush-link-hardness",
+  "brush-lock-to-view"
+};
+
+static const gchar *dynamics_props[] =
+{
+  "dynamics-expanded",
+  "fade-reverse",
+  "fade-length",
+  "fade-unit",
+  "fade-repeat"
+};
+
+static const gchar *gradient_props[] =
+{
+  "gradient-reverse",
+  "gradient-blend-color-space",
+  "gradient-repeat"
+};
+
+static const gint max_n_props = (G_N_ELEMENTS (brush_props) +
+                                 G_N_ELEMENTS (dynamics_props) +
+                                 G_N_ELEMENTS (gradient_props));
+
+gboolean
+gimp_paint_options_is_prop (const gchar         *prop_name,
+                            GimpContextPropMask  prop_mask)
+{
+  gint i;
+
+  g_return_val_if_fail (prop_name != NULL, FALSE);
+
+  if (prop_mask & GIMP_CONTEXT_PROP_MASK_BRUSH)
+    {
+      for (i = 0; i < G_N_ELEMENTS (brush_props); i++)
+        if (! strcmp (prop_name, brush_props[i]))
+          return TRUE;
+    }
+
+  if (prop_mask & GIMP_CONTEXT_PROP_MASK_DYNAMICS)
+    {
+      for (i = 0; i < G_N_ELEMENTS (dynamics_props); i++)
+        if (! strcmp (prop_name, dynamics_props[i]))
+          return TRUE;
+    }
+
+  if (prop_mask & GIMP_CONTEXT_PROP_MASK_GRADIENT)
+    {
+      for (i = 0; i < G_N_ELEMENTS (gradient_props); i++)
+        if (! strcmp (prop_name, gradient_props[i]))
+          return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_paint_options_copy_props (GimpPaintOptions    *src,
+                               GimpPaintOptions    *dest,
+                               GimpContextPropMask  prop_mask)
+{
+  const gchar *names[max_n_props];
+  GValue       values[max_n_props];
+  gint         n_props = 0;
+  gint         i;
+
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (src));
+  g_return_if_fail (GIMP_IS_PAINT_OPTIONS (dest));
+
+  if (prop_mask & GIMP_CONTEXT_PROP_MASK_BRUSH)
+    {
+      for (i = 0; i < G_N_ELEMENTS (brush_props); i++)
+        names[n_props++] = brush_props[i];
+    }
+
+  if (prop_mask & GIMP_CONTEXT_PROP_MASK_DYNAMICS)
+    {
+      for (i = 0; i < G_N_ELEMENTS (dynamics_props); i++)
+        names[n_props++] = dynamics_props[i];
+    }
+
+  if (prop_mask & GIMP_CONTEXT_PROP_MASK_GRADIENT)
+    {
+      for (i = 0; i < G_N_ELEMENTS (gradient_props); i++)
+        names[n_props++] = gradient_props[i];
+    }
+
+  if (n_props > 0)
+    {
+      g_object_getv (G_OBJECT (src), n_props, names, values);
+      g_object_setv (G_OBJECT (dest), n_props, names, values);
+
+      while (n_props--)
+        g_value_unset (&values[n_props]);
+    }
+}
diff --git a/app/paint/gimppaintoptions.h b/app/paint/gimppaintoptions.h
new file mode 100644
index 0000000..10218ee
--- /dev/null
+++ b/app/paint/gimppaintoptions.h
@@ -0,0 +1,176 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_OPTIONS_H__
+#define __GIMP_PAINT_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_PAINT_OPTIONS_CONTEXT_MASK GIMP_CONTEXT_PROP_MASK_FOREGROUND | \
+                                        GIMP_CONTEXT_PROP_MASK_BACKGROUND | \
+                                        GIMP_CONTEXT_PROP_MASK_OPACITY    | \
+                                        GIMP_CONTEXT_PROP_MASK_PAINT_MODE | \
+                                        GIMP_CONTEXT_PROP_MASK_BRUSH      | \
+                                        GIMP_CONTEXT_PROP_MASK_DYNAMICS   | \
+                                        GIMP_CONTEXT_PROP_MASK_PALETTE
+
+
+typedef struct _GimpJitterOptions        GimpJitterOptions;
+typedef struct _GimpFadeOptions          GimpFadeOptions;
+typedef struct _GimpGradientPaintOptions GimpGradientPaintOptions;
+typedef struct _GimpSmoothingOptions     GimpSmoothingOptions;
+
+struct _GimpJitterOptions
+{
+  gboolean  use_jitter;
+  gdouble   jitter_amount;
+};
+
+struct _GimpFadeOptions
+{
+  gboolean        fade_reverse;
+  gdouble         fade_length;
+  GimpUnit        fade_unit;
+  GimpRepeatMode  fade_repeat;
+};
+
+struct _GimpGradientPaintOptions
+{
+  gboolean                    gradient_reverse;
+  GimpGradientBlendColorSpace gradient_blend_color_space;
+  GimpRepeatMode              gradient_repeat; /* only used by gradient tool */
+};
+
+struct _GimpSmoothingOptions
+{
+  gboolean use_smoothing;
+  gint     smoothing_quality;
+  gdouble  smoothing_factor;
+};
+
+
+#define GIMP_TYPE_PAINT_OPTIONS            (gimp_paint_options_get_type ())
+#define GIMP_PAINT_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINT_OPTIONS, GimpPaintOptions))
+#define GIMP_PAINT_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINT_OPTIONS, GimpPaintOptionsClass))
+#define GIMP_IS_PAINT_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINT_OPTIONS))
+#define GIMP_IS_PAINT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINT_OPTIONS))
+#define GIMP_PAINT_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINT_OPTIONS, GimpPaintOptionsClass))
+
+
+typedef struct _GimpPaintOptionsClass GimpPaintOptionsClass;
+
+struct _GimpPaintOptions
+{
+  GimpToolOptions           parent_instance;
+
+  GimpPaintInfo            *paint_info;
+
+  gboolean                  use_applicator;
+
+  GimpBrush                *brush; /* weak-refed storage for the GUI */
+
+  gdouble                   brush_size;
+  gdouble                   brush_angle;
+  gdouble                   brush_aspect_ratio;
+  gdouble                   brush_spacing;
+  gdouble                   brush_hardness;
+  gdouble                   brush_force;
+
+  gboolean                  brush_link_size;
+  gboolean                  brush_link_aspect_ratio;
+  gboolean                  brush_link_angle;
+  gboolean                  brush_link_spacing;
+  gboolean                  brush_link_hardness;
+
+  gboolean                  brush_lock_to_view;
+
+  GimpPaintApplicationMode  application_mode;
+  GimpPaintApplicationMode  application_mode_save;
+
+  gboolean                  hard;
+
+  GimpJitterOptions        *jitter_options;
+
+  gboolean                  dynamics_expanded;
+  GimpFadeOptions          *fade_options;
+  GimpGradientPaintOptions *gradient_options;
+  GimpSmoothingOptions     *smoothing_options;
+
+  GimpViewType              brush_view_type;
+  GimpViewSize              brush_view_size;
+  GimpViewType              dynamics_view_type;
+  GimpViewSize              dynamics_view_size;
+  GimpViewType              pattern_view_type;
+  GimpViewSize              pattern_view_size;
+  GimpViewType              gradient_view_type;
+  GimpViewSize              gradient_view_size;
+};
+
+struct _GimpPaintOptionsClass
+{
+  GimpToolOptionsClass  parent_instance;
+};
+
+
+GType    gimp_paint_options_get_type (void) G_GNUC_CONST;
+
+GimpPaintOptions *
+         gimp_paint_options_new                (GimpPaintInfo       *paint_info);
+
+gdouble  gimp_paint_options_get_fade           (GimpPaintOptions    *options,
+                                                GimpImage           *image,
+                                                gdouble              pixel_dist);
+
+gdouble  gimp_paint_options_get_jitter         (GimpPaintOptions    *options,
+                                                GimpImage           *image);
+
+gboolean gimp_paint_options_get_gradient_color (GimpPaintOptions    *options,
+                                                GimpImage           *image,
+                                                gdouble              grad_point,
+                                                gdouble              pixel_dist,
+                                                GimpRGB             *color);
+
+GimpBrushApplicationMode
+         gimp_paint_options_get_brush_mode     (GimpPaintOptions    *options);
+
+void     gimp_paint_options_set_default_brush_size
+                                               (GimpPaintOptions    *options,
+                                                GimpBrush           *brush);
+void     gimp_paint_options_set_default_brush_angle
+                                               (GimpPaintOptions    *options,
+                                                GimpBrush           *brush);
+void     gimp_paint_options_set_default_brush_aspect_ratio
+                                               (GimpPaintOptions    *options,
+                                                GimpBrush           *brush);
+void     gimp_paint_options_set_default_brush_spacing
+                                               (GimpPaintOptions    *options,
+                                                GimpBrush           *brush);
+
+void     gimp_paint_options_set_default_brush_hardness
+                                               (GimpPaintOptions    *options,
+                                                GimpBrush           *brush);
+
+gboolean gimp_paint_options_is_prop            (const gchar         *prop_name,
+                                                GimpContextPropMask  prop_mask);
+void     gimp_paint_options_copy_props         (GimpPaintOptions    *src,
+                                                GimpPaintOptions    *dest,
+                                                GimpContextPropMask  prop_mask);
+
+
+#endif  /*  __GIMP_PAINT_OPTIONS_H__  */
diff --git a/app/paint/gimppencil.c b/app/paint/gimppencil.c
new file mode 100644
index 0000000..14c5cfe
--- /dev/null
+++ b/app/paint/gimppencil.c
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "paint-types.h"
+
+#include "gimppencil.h"
+#include "gimppenciloptions.h"
+
+#include "gimp-intl.h"
+
+
+G_DEFINE_TYPE (GimpPencil, gimp_pencil, GIMP_TYPE_PAINTBRUSH)
+
+
+void
+gimp_pencil_register (Gimp                      *gimp,
+                      GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_PENCIL,
+                GIMP_TYPE_PENCIL_OPTIONS,
+                "gimp-pencil",
+                _("Pencil"),
+                "gimp-tool-pencil");
+}
+
+static void
+gimp_pencil_class_init (GimpPencilClass *klass)
+{
+}
+
+static void
+gimp_pencil_init (GimpPencil *pencil)
+{
+}
diff --git a/app/paint/gimppencil.h b/app/paint/gimppencil.h
new file mode 100644
index 0000000..21fd8d2
--- /dev/null
+++ b/app/paint/gimppencil.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PENCIL_H__
+#define __GIMP_PENCIL_H__
+
+
+#include "gimppaintbrush.h"
+
+
+#define GIMP_TYPE_PENCIL            (gimp_pencil_get_type ())
+#define GIMP_PENCIL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PENCIL, GimpPencil))
+#define GIMP_PENCIL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PENCIL, GimpPencilClass))
+#define GIMP_IS_PENCIL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PENCIL))
+#define GIMP_IS_PENCIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PENCIL))
+#define GIMP_PENCIL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL, GimpPencilClass))
+
+
+typedef struct _GimpPencilClass GimpPencilClass;
+
+struct _GimpPencil
+{
+  GimpPaintbrush  parent_instance;
+};
+
+struct _GimpPencilClass
+{
+  GimpPaintbrushClass  parent_class;
+};
+
+
+void    gimp_pencil_register (Gimp                      *gimp,
+                              GimpPaintRegisterCallback  callback);
+
+GType   gimp_pencil_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PENCIL_H__  */
diff --git a/app/paint/gimppenciloptions.c b/app/paint/gimppenciloptions.c
new file mode 100644
index 0000000..804e99f
--- /dev/null
+++ b/app/paint/gimppenciloptions.c
@@ -0,0 +1,110 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimppenciloptions.h"
+
+
+#define PENCIL_DEFAULT_HARD TRUE
+
+
+enum
+{
+  PROP_0,
+  PROP_HARD
+};
+
+
+static void   gimp_pencil_options_set_property (GObject      *object,
+                                                guint         property_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec);
+static void   gimp_pencil_options_get_property (GObject      *object,
+                                                guint         property_id,
+                                                GValue       *value,
+                                                GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpPencilOptions, gimp_pencil_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_pencil_options_class_init (GimpPencilOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_pencil_options_set_property;
+  object_class->get_property = gimp_pencil_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_HARD,
+                            "hard",
+                            NULL, NULL,
+                            PENCIL_DEFAULT_HARD,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_pencil_options_init (GimpPencilOptions *options)
+{
+}
+
+static void
+gimp_pencil_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_HARD:
+      options->hard = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pencil_options_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_HARD:
+      g_value_set_boolean (value, options->hard);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimppenciloptions.h b/app/paint/gimppenciloptions.h
new file mode 100644
index 0000000..f73850e
--- /dev/null
+++ b/app/paint/gimppenciloptions.h
@@ -0,0 +1,49 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PENCIL_OPTIONS_H__
+#define __GIMP_PENCIL_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_PENCIL_OPTIONS            (gimp_pencil_options_get_type ())
+#define GIMP_PENCIL_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PENCIL_OPTIONS, GimpPencilOptions))
+#define GIMP_PENCIL_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PENCIL_OPTIONS, GimpPencilOptionsClass))
+#define GIMP_IS_PENCIL_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PENCIL_OPTIONS))
+#define GIMP_IS_PENCIL_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PENCIL_OPTIONS))
+#define GIMP_PENCIL_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL_OPTIONS, GimpPencilOptionsClass))
+
+
+typedef struct _GimpPencilOptionsClass GimpPencilOptionsClass;
+
+struct _GimpPencilOptions
+{
+  GimpPaintOptions  parent_instance;
+};
+
+struct _GimpPencilOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_pencil_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PENCIL_OPTIONS_H__  */
diff --git a/app/paint/gimpperspectiveclone.c b/app/paint/gimpperspectiveclone.c
new file mode 100644
index 0000000..abb9fab
--- /dev/null
+++ b/app/paint/gimpperspectiveclone.c
@@ -0,0 +1,537 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpdrawable.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimppattern.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimpperspectiveclone.h"
+#include "gimpperspectivecloneoptions.h"
+
+#include "gimp-intl.h"
+
+
+static void         gimp_perspective_clone_paint      (GimpPaintCore     *paint_core,
+                                                       GimpDrawable      *drawable,
+                                                       GimpPaintOptions  *paint_options,
+                                                       GimpSymmetry      *sym,
+                                                       GimpPaintState     paint_state,
+                                                       guint32            time);
+
+static gboolean     gimp_perspective_clone_use_source (GimpSourceCore    *source_core,
+                                                       GimpSourceOptions *options);
+static GeglBuffer * gimp_perspective_clone_get_source (GimpSourceCore    *source_core,
+                                                       GimpDrawable      *drawable,
+                                                       GimpPaintOptions  *paint_options,
+                                                       GimpPickable      *src_pickable,
+                                                       gint               src_offset_x,
+                                                       gint               src_offset_y,
+                                                       GeglBuffer        *paint_buffer,
+                                                       gint               paint_buffer_x,
+                                                       gint               paint_buffer_y,
+                                                       gint              *paint_area_offset_x,
+                                                       gint              *paint_area_offset_y,
+                                                       gint              *paint_area_width,
+                                                       gint              *paint_area_height,
+                                                       GeglRectangle     *src_rect);
+
+static void         gimp_perspective_clone_get_matrix (GimpPerspectiveClone *clone,
+                                                       GimpMatrix3          *matrix);
+
+
+G_DEFINE_TYPE (GimpPerspectiveClone, gimp_perspective_clone,
+               GIMP_TYPE_CLONE)
+
+#define parent_class gimp_perspective_clone_parent_class
+
+
+void
+gimp_perspective_clone_register (Gimp                      *gimp,
+                                 GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_PERSPECTIVE_CLONE,
+                GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS,
+                "gimp-perspective-clone",
+                _("Perspective Clone"),
+                "gimp-tool-perspective-clone");
+}
+
+static void
+gimp_perspective_clone_class_init (GimpPerspectiveCloneClass *klass)
+{
+  GimpPaintCoreClass  *paint_core_class  = GIMP_PAINT_CORE_CLASS (klass);
+  GimpSourceCoreClass *source_core_class = GIMP_SOURCE_CORE_CLASS (klass);
+
+  paint_core_class->paint       = gimp_perspective_clone_paint;
+
+  source_core_class->use_source = gimp_perspective_clone_use_source;
+  source_core_class->get_source = gimp_perspective_clone_get_source;
+}
+
+static void
+gimp_perspective_clone_init (GimpPerspectiveClone *clone)
+{
+  clone->src_x_fv  = 0.0;    /* source coords in front_view perspective */
+  clone->src_y_fv  = 0.0;
+
+  clone->dest_x_fv = 0.0;    /* destination coords in front_view perspective */
+  clone->dest_y_fv = 0.0;
+
+  gimp_matrix3_identity (&clone->transform);
+  gimp_matrix3_identity (&clone->transform_inv);
+}
+
+static void
+gimp_perspective_clone_paint (GimpPaintCore    *paint_core,
+                              GimpDrawable     *drawable,
+                              GimpPaintOptions *paint_options,
+                              GimpSymmetry     *sym,
+                              GimpPaintState    paint_state,
+                              guint32           time)
+{
+  GimpSourceCore       *source_core   = GIMP_SOURCE_CORE (paint_core);
+  GimpPerspectiveClone *clone         = GIMP_PERSPECTIVE_CLONE (paint_core);
+  GimpContext          *context       = GIMP_CONTEXT (paint_options);
+  GimpCloneOptions     *clone_options = GIMP_CLONE_OPTIONS (paint_options);
+  GimpSourceOptions    *options       = GIMP_SOURCE_OPTIONS (paint_options);
+  const GimpCoords     *coords;
+
+  /* The source is based on the original stroke */
+  coords = gimp_symmetry_get_origin (sym);
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      if (source_core->set_source)
+        {
+          g_object_set (source_core, "src-drawable", drawable, NULL);
+
+          source_core->src_x = floor (coords->x);
+          source_core->src_y = floor (coords->y);
+
+          /* get source coordinates in front view perspective */
+          gimp_matrix3_transform_point (&clone->transform_inv,
+                                        source_core->src_x,
+                                        source_core->src_y,
+                                        &clone->src_x_fv,
+                                        &clone->src_y_fv);
+
+          source_core->first_stroke = TRUE;
+        }
+      else
+        {
+          GeglBuffer *orig_buffer = NULL;
+          GeglNode   *tile        = NULL;
+          GeglNode   *src_node;
+
+          if (options->align_mode == GIMP_SOURCE_ALIGN_NO)
+            {
+              source_core->orig_src_x = source_core->src_x;
+              source_core->orig_src_y = source_core->src_y;
+
+              source_core->first_stroke = TRUE;
+            }
+
+          clone->node = gegl_node_new ();
+
+          g_object_set (clone->node,
+                        "cache-policy", GEGL_CACHE_POLICY_NEVER,
+                        NULL);
+
+          switch (clone_options->clone_type)
+            {
+            case GIMP_CLONE_IMAGE:
+              {
+                GimpPickable *src_pickable;
+                GimpImage    *src_image;
+                GimpImage    *dest_image;
+
+                /*  If the source image is different from the
+                 *  destination, then we should copy straight from the
+                 *  source image to the canvas.
+                 *  Otherwise, we need a call to get_orig_image to make sure
+                 *  we get a copy of the unblemished (offset) image
+                 */
+                src_pickable = GIMP_PICKABLE (source_core->src_drawable);
+                src_image    = gimp_pickable_get_image (src_pickable);
+
+                if (options->sample_merged)
+                  src_pickable = GIMP_PICKABLE (src_image);
+
+                dest_image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+                if ((options->sample_merged &&
+                     (src_image != dest_image)) ||
+                    (! options->sample_merged &&
+                     (source_core->src_drawable != drawable)))
+                  {
+                    orig_buffer = gimp_pickable_get_buffer (src_pickable);
+                  }
+                else
+                  {
+                    if (options->sample_merged)
+                      orig_buffer = gimp_paint_core_get_orig_proj (paint_core);
+                    else
+                      orig_buffer = gimp_paint_core_get_orig_image (paint_core);
+                  }
+              }
+              break;
+
+            case GIMP_CLONE_PATTERN:
+              {
+                GimpPattern *pattern = gimp_context_get_pattern (context);
+
+                orig_buffer = gimp_pattern_create_buffer (pattern);
+
+                tile = gegl_node_new_child (clone->node,
+                                            "operation", "gegl:tile",
+                                            NULL);
+                clone->crop = gegl_node_new_child (clone->node,
+                                                   "operation", "gegl:crop",
+                                                   NULL);
+              }
+              break;
+            }
+
+          src_node = gegl_node_new_child (clone->node,
+                                          "operation", "gegl:buffer-source",
+                                          "buffer",    orig_buffer,
+                                          NULL);
+
+          clone->transform_node =
+            gegl_node_new_child (clone->node,
+                                 "operation", "gegl:transform",
+                                 "sampler",    GIMP_INTERPOLATION_LINEAR,
+                                 NULL);
+
+          clone->dest_node =
+            gegl_node_new_child (clone->node,
+                                 "operation", "gegl:write-buffer",
+                                 NULL);
+
+          if (tile)
+            {
+              gegl_node_link_many (src_node,
+                                   tile,
+                                   clone->crop,
+                                   clone->transform_node,
+                                   clone->dest_node,
+                                   NULL);
+
+              g_object_unref (orig_buffer);
+            }
+          else
+            {
+              gegl_node_link_many (src_node,
+                                   clone->transform_node,
+                                   clone->dest_node,
+                                   NULL);
+            }
+        }
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      if (source_core->set_source)
+        {
+          /*  If the control key is down, move the src target and return */
+
+          source_core->src_x = floor (coords->x);
+          source_core->src_y = floor (coords->y);
+
+          /* get source coordinates in front view perspective */
+          gimp_matrix3_transform_point (&clone->transform_inv,
+                                        source_core->src_x,
+                                        source_core->src_y,
+                                        &clone->src_x_fv,
+                                        &clone->src_y_fv);
+
+          source_core->first_stroke = TRUE;
+        }
+      else
+        {
+          /*  otherwise, update the target  */
+
+          gint dest_x;
+          gint dest_y;
+          gint n_strokes;
+          gint i;
+
+          n_strokes = gimp_symmetry_get_size (sym);
+          for (i = 0; i < n_strokes; i++)
+            {
+              coords = gimp_symmetry_get_coords (sym, i);
+
+              dest_x = floor (coords->x);
+              dest_y = floor (coords->y);
+
+              if (options->align_mode == GIMP_SOURCE_ALIGN_REGISTERED)
+                {
+                  source_core->offset_x = 0;
+                  source_core->offset_y = 0;
+                }
+              else if (options->align_mode == GIMP_SOURCE_ALIGN_FIXED)
+                {
+                  source_core->offset_x = source_core->src_x - dest_x;
+                  source_core->offset_y = source_core->src_y - dest_y;
+                }
+              else if (source_core->first_stroke)
+                {
+                  source_core->offset_x = source_core->src_x - dest_x;
+                  source_core->offset_y = source_core->src_y - dest_y;
+
+                  /* get destination coordinates in front view perspective */
+                  gimp_matrix3_transform_point (&clone->transform_inv,
+                                                dest_x,
+                                                dest_y,
+                                                &clone->dest_x_fv,
+                                                &clone->dest_y_fv);
+
+                  source_core->first_stroke = FALSE;
+                }
+            }
+
+          gimp_source_core_motion (source_core, drawable, paint_options, sym);
+        }
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      g_clear_object (&clone->node);
+      clone->crop           = NULL;
+      clone->transform_node = NULL;
+      clone->dest_node      = NULL;
+      break;
+
+    default:
+      break;
+    }
+
+  g_object_notify (G_OBJECT (clone), "src-x");
+  g_object_notify (G_OBJECT (clone), "src-y");
+}
+
+static gboolean
+gimp_perspective_clone_use_source (GimpSourceCore    *source_core,
+                                   GimpSourceOptions *options)
+{
+  return TRUE;
+}
+
+static GeglBuffer *
+gimp_perspective_clone_get_source (GimpSourceCore   *source_core,
+                                   GimpDrawable     *drawable,
+                                   GimpPaintOptions *paint_options,
+                                   GimpPickable     *src_pickable,
+                                   gint              src_offset_x,
+                                   gint              src_offset_y,
+                                   GeglBuffer       *paint_buffer,
+                                   gint              paint_buffer_x,
+                                   gint              paint_buffer_y,
+                                   gint             *paint_area_offset_x,
+                                   gint             *paint_area_offset_y,
+                                   gint             *paint_area_width,
+                                   gint             *paint_area_height,
+                                   GeglRectangle    *src_rect)
+{
+  GimpPerspectiveClone *clone         = GIMP_PERSPECTIVE_CLONE (source_core);
+  GimpCloneOptions     *clone_options = GIMP_CLONE_OPTIONS (paint_options);
+  GeglBuffer           *src_buffer;
+  GeglBuffer           *dest_buffer;
+  const Babl           *src_format_alpha;
+  gint                  x1d, y1d, x2d, y2d;
+  gdouble               x1s, y1s, x2s, y2s, x3s, y3s, x4s, y4s;
+  gint                  xmin, ymin, xmax, ymax;
+  GimpMatrix3           matrix;
+  GimpMatrix3           gegl_matrix;
+
+  src_buffer       = gimp_pickable_get_buffer (src_pickable);
+  src_format_alpha = gimp_pickable_get_format_with_alpha (src_pickable);
+
+  /* Destination coordinates that will be painted */
+  x1d = paint_buffer_x;
+  y1d = paint_buffer_y;
+  x2d = paint_buffer_x + gegl_buffer_get_width  (paint_buffer);
+  y2d = paint_buffer_y + gegl_buffer_get_height (paint_buffer);
+
+  /* Boundary box for source pixels to copy: Convert all the vertex of
+   * the box to paint in destination area to its correspondent in
+   * source area bearing in mind perspective
+   */
+  gimp_perspective_clone_get_source_point (clone, x1d, y1d, &x1s, &y1s);
+  gimp_perspective_clone_get_source_point (clone, x1d, y2d, &x2s, &y2s);
+  gimp_perspective_clone_get_source_point (clone, x2d, y1d, &x3s, &y3s);
+  gimp_perspective_clone_get_source_point (clone, x2d, y2d, &x4s, &y4s);
+
+  xmin = floor (MIN4 (x1s, x2s, x3s, x4s));
+  ymin = floor (MIN4 (y1s, y2s, y3s, y4s));
+  xmax = ceil  (MAX4 (x1s, x2s, x3s, x4s));
+  ymax = ceil  (MAX4 (y1s, y2s, y3s, y4s));
+
+  switch (clone_options->clone_type)
+    {
+    case GIMP_CLONE_IMAGE:
+      if (! gimp_rectangle_intersect (xmin, ymin,
+                                      xmax - xmin, ymax - ymin,
+                                      gegl_buffer_get_x      (src_buffer),
+                                      gegl_buffer_get_y      (src_buffer),
+                                      gegl_buffer_get_width  (src_buffer),
+                                      gegl_buffer_get_height (src_buffer),
+                                      NULL, NULL, NULL, NULL))
+        {
+          /* if the source area is completely out of the image */
+          return NULL;
+        }
+      break;
+
+    case GIMP_CLONE_PATTERN:
+      gegl_node_set (clone->crop,
+                     "x",      (gdouble) xmin,
+                     "y",      (gdouble) ymin,
+                     "width",  (gdouble) xmax - xmin,
+                     "height", (gdouble) ymax - ymin,
+                     NULL);
+      break;
+    }
+
+  dest_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, x2d - x1d, y2d - y1d),
+                                 src_format_alpha);
+
+  gimp_perspective_clone_get_matrix (clone, &matrix);
+
+  gimp_matrix3_identity (&gegl_matrix);
+  gimp_matrix3_mult (&matrix, &gegl_matrix);
+  gimp_matrix3_translate (&gegl_matrix, -x1d, -y1d);
+
+  gimp_gegl_node_set_matrix (clone->transform_node, &gegl_matrix);
+
+  gegl_node_set (clone->dest_node,
+                 "buffer", dest_buffer,
+                 NULL);
+
+  gegl_node_blit (clone->dest_node, 1.0,
+                  GEGL_RECTANGLE (0, 0, x2d - x1d, y2d - y1d),
+                  NULL, NULL, 0, GEGL_BLIT_DEFAULT);
+
+  *src_rect = *GEGL_RECTANGLE (0, 0, x2d - x1d, y2d - y1d);
+
+  return dest_buffer;
+}
+
+
+/*  public functions  */
+
+void
+gimp_perspective_clone_set_transform (GimpPerspectiveClone *clone,
+                                      GimpMatrix3          *transform)
+{
+  g_return_if_fail (GIMP_IS_PERSPECTIVE_CLONE (clone));
+  g_return_if_fail (transform != NULL);
+
+  clone->transform = *transform;
+
+  clone->transform_inv = clone->transform;
+  gimp_matrix3_invert (&clone->transform_inv);
+
+#if 0
+  g_printerr ("%f\t%f\t%f\n%f\t%f\t%f\n%f\t%f\t%f\n\n",
+              clone->transform.coeff[0][0],
+              clone->transform.coeff[0][1],
+              clone->transform.coeff[0][2],
+              clone->transform.coeff[1][0],
+              clone->transform.coeff[1][1],
+              clone->transform.coeff[1][2],
+              clone->transform.coeff[2][0],
+              clone->transform.coeff[2][1],
+              clone->transform.coeff[2][2]);
+#endif
+}
+
+void
+gimp_perspective_clone_get_source_point (GimpPerspectiveClone *clone,
+                                         gdouble               x,
+                                         gdouble               y,
+                                         gdouble              *newx,
+                                         gdouble              *newy)
+{
+  gdouble temp_x, temp_y;
+
+  g_return_if_fail (GIMP_IS_PERSPECTIVE_CLONE (clone));
+  g_return_if_fail (newx != NULL);
+  g_return_if_fail (newy != NULL);
+
+  gimp_matrix3_transform_point (&clone->transform_inv,
+                                x, y, &temp_x, &temp_y);
+
+#if 0
+  /* Get the offset of each pixel in destination area from the
+   * destination pixel in front view perspective
+   */
+  offset_x_fv = temp_x - clone->dest_x_fv;
+  offset_y_fv = temp_y - clone->dest_y_fv;
+
+  /* Get the source pixel in front view perspective */
+  temp_x = offset_x_fv + clone->src_x_fv;
+  temp_y = offset_y_fv + clone->src_y_fv;
+#endif
+
+  temp_x += clone->src_x_fv - clone->dest_x_fv;
+  temp_y += clone->src_y_fv - clone->dest_y_fv;
+
+  /* Convert the source pixel to perspective view */
+  gimp_matrix3_transform_point (&clone->transform,
+                                temp_x, temp_y, newx, newy);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_perspective_clone_get_matrix (GimpPerspectiveClone *clone,
+                                   GimpMatrix3          *matrix)
+{
+  GimpMatrix3 temp;
+
+  gimp_matrix3_identity (&temp);
+  gimp_matrix3_translate (&temp,
+                          clone->dest_x_fv - clone->src_x_fv,
+                          clone->dest_y_fv - clone->src_y_fv);
+
+  *matrix = clone->transform_inv;
+  gimp_matrix3_mult (&temp, matrix);
+  gimp_matrix3_mult (&clone->transform, matrix);
+}
diff --git a/app/paint/gimpperspectiveclone.h b/app/paint/gimpperspectiveclone.h
new file mode 100644
index 0000000..1d24957
--- /dev/null
+++ b/app/paint/gimpperspectiveclone.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PERSPECTIVE_CLONE_H__
+#define __GIMP_PERSPECTIVE_CLONE_H__
+
+
+#include "gimpclone.h"
+
+
+#define GIMP_TYPE_PERSPECTIVE_CLONE            (gimp_perspective_clone_get_type ())
+#define GIMP_PERSPECTIVE_CLONE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PERSPECTIVE_CLONE, GimpPerspectiveClone))
+#define GIMP_PERSPECTIVE_CLONE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PERSPECTIVE_CLONE, GimpPerspectiveCloneClass))
+#define GIMP_IS_PERSPECTIVE_CLONE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PERSPECTIVE_CLONE))
+#define GIMP_IS_PERSPECTIVE_CLONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PERSPECTIVE_CLONE))
+#define GIMP_PERSPECTIVE_CLONE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE, GimpPerspectiveCloneClass))
+
+
+typedef struct _GimpPerspectiveCloneClass GimpPerspectiveCloneClass;
+
+struct _GimpPerspectiveClone
+{
+  GimpClone      parent_instance;
+
+  gdouble        src_x_fv;     /* source coords in front_view perspective */
+  gdouble        src_y_fv;
+
+  gdouble        dest_x_fv;    /* destination coords in front_view perspective */
+  gdouble        dest_y_fv;
+
+  GimpMatrix3    transform;
+  GimpMatrix3    transform_inv;
+
+  GeglNode      *node;
+  GeglNode      *crop;
+  GeglNode      *transform_node;
+  GeglNode      *dest_node;
+};
+
+struct _GimpPerspectiveCloneClass
+{
+  GimpCloneClass  parent_class;
+};
+
+
+void    gimp_perspective_clone_register      (Gimp                      *gimp,
+                                              GimpPaintRegisterCallback  callback);
+
+GType   gimp_perspective_clone_get_type         (void) G_GNUC_CONST;
+
+void    gimp_perspective_clone_set_transform    (GimpPerspectiveClone   *clone,
+                                                 GimpMatrix3            *transform);
+void    gimp_perspective_clone_get_source_point (GimpPerspectiveClone   *clone,
+                                                 gdouble                 x,
+                                                 gdouble                 y,
+                                                 gdouble                *newx,
+                                                 gdouble                *newy);
+
+
+#endif  /*  __GIMP_PERSPECTIVE_CLONE_H__  */
diff --git a/app/paint/gimpperspectivecloneoptions.c b/app/paint/gimpperspectivecloneoptions.c
new file mode 100644
index 0000000..cdd0f32
--- /dev/null
+++ b/app/paint/gimpperspectivecloneoptions.c
@@ -0,0 +1,112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpperspectivecloneoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CLONE_MODE
+};
+
+
+static void   gimp_perspective_clone_options_set_property (GObject      *object,
+                                                           guint         property_id,
+                                                           const GValue *value,
+                                                           GParamSpec   *pspec);
+static void   gimp_perspective_clone_options_get_property (GObject      *object,
+                                                           guint         property_id,
+                                                           GValue       *value,
+                                                           GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpPerspectiveCloneOptions, gimp_perspective_clone_options,
+               GIMP_TYPE_CLONE_OPTIONS)
+
+
+static void
+gimp_perspective_clone_options_class_init (GimpPerspectiveCloneOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_perspective_clone_options_set_property;
+  object_class->get_property = gimp_perspective_clone_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CLONE_MODE,
+                         "clone-mode",
+                         NULL, NULL,
+                         GIMP_TYPE_PERSPECTIVE_CLONE_MODE,
+                         GIMP_PERSPECTIVE_CLONE_MODE_ADJUST,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_perspective_clone_options_init (GimpPerspectiveCloneOptions *options)
+{
+}
+
+static void
+gimp_perspective_clone_options_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec)
+{
+  GimpPerspectiveCloneOptions *options = GIMP_PERSPECTIVE_CLONE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_CLONE_MODE:
+      options->clone_mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_perspective_clone_options_get_property (GObject    *object,
+                                             guint       property_id,
+                                             GValue     *value,
+                                             GParamSpec *pspec)
+{
+  GimpPerspectiveCloneOptions *options = GIMP_PERSPECTIVE_CLONE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_CLONE_MODE:
+      g_value_set_enum (value, options->clone_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpperspectivecloneoptions.h b/app/paint/gimpperspectivecloneoptions.h
new file mode 100644
index 0000000..026c24b
--- /dev/null
+++ b/app/paint/gimpperspectivecloneoptions.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PERSPECTIVE_CLONE_OPTIONS_H__
+#define __GIMP_PERSPECTIVE_CLONE_OPTIONS_H__
+
+
+#include "gimpcloneoptions.h"
+
+
+#define GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS            (gimp_perspective_clone_options_get_type ())
+#define GIMP_PERSPECTIVE_CLONE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS, GimpPerspectiveCloneOptions))
+#define GIMP_PERSPECTIVE_CLONE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS, GimpPerspectiveCloneOptionsClass))
+#define GIMP_IS_PERSPECTIVE_CLONE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS))
+#define GIMP_IS_PERSPECTIVE_CLONE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS))
+#define GIMP_PERSPECTIVE_CLONE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS, GimpPerspectiveCloneOptionsClass))
+
+
+typedef struct _GimpPerspectiveCloneOptionsClass GimpPerspectiveCloneOptionsClass;
+
+struct _GimpPerspectiveCloneOptions
+{
+  GimpCloneOptions          paint_instance;
+
+  GimpPerspectiveCloneMode  clone_mode;
+};
+
+struct _GimpPerspectiveCloneOptionsClass
+{
+  GimpCloneOptionsClass  parent_class;
+};
+
+
+GType   gimp_perspective_clone_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PERSPECTIVE_CLONE_OPTIONS_H__  */
diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c
new file mode 100644
index 0000000..86f61bf
--- /dev/null
+++ b/app/paint/gimpsmudge.c
@@ -0,0 +1,575 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp-palettes.h"
+#include "core/gimpbrush.h"
+#include "core/gimpbrush-header.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpsmudge.h"
+#include "gimpsmudgeoptions.h"
+
+#include "gimp-intl.h"
+
+
+static void       gimp_smudge_finalize     (GObject          *object);
+
+static void       gimp_smudge_paint        (GimpPaintCore    *paint_core,
+                                            GimpDrawable     *drawable,
+                                            GimpPaintOptions *paint_options,
+                                            GimpSymmetry     *sym,
+                                            GimpPaintState    paint_state,
+                                            guint32           time);
+static gboolean   gimp_smudge_start        (GimpPaintCore    *paint_core,
+                                            GimpDrawable     *drawable,
+                                            GimpPaintOptions *paint_options,
+                                            GimpSymmetry     *sym);
+static void       gimp_smudge_motion       (GimpPaintCore    *paint_core,
+                                            GimpDrawable     *drawable,
+                                            GimpPaintOptions *paint_options,
+                                            GimpSymmetry     *sym);
+
+static void       gimp_smudge_accumulator_coords (GimpPaintCore    *paint_core,
+                                                  const GimpCoords *coords,
+                                                  gint              stroke,
+                                                  gint             *x,
+                                                  gint             *y);
+
+static void       gimp_smudge_accumulator_size   (GimpPaintOptions *paint_options,
+                                                  const GimpCoords *coords,
+                                                  gint             *accumulator_size);
+
+
+G_DEFINE_TYPE (GimpSmudge, gimp_smudge, GIMP_TYPE_BRUSH_CORE)
+
+#define parent_class gimp_smudge_parent_class
+
+
+void
+gimp_smudge_register (Gimp                      *gimp,
+                      GimpPaintRegisterCallback  callback)
+{
+  (* callback) (gimp,
+                GIMP_TYPE_SMUDGE,
+                GIMP_TYPE_SMUDGE_OPTIONS,
+                "gimp-smudge",
+                _("Smudge"),
+                "gimp-tool-smudge");
+}
+
+static void
+gimp_smudge_class_init (GimpSmudgeClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+  GimpBrushCoreClass *brush_core_class = GIMP_BRUSH_CORE_CLASS (klass);
+
+  object_class->finalize  = gimp_smudge_finalize;
+
+  paint_core_class->paint = gimp_smudge_paint;
+
+  brush_core_class->handles_changing_brush             = TRUE;
+  brush_core_class->handles_transforming_brush         = TRUE;
+  brush_core_class->handles_dynamic_transforming_brush = TRUE;
+}
+
+static void
+gimp_smudge_init (GimpSmudge *smudge)
+{
+}
+
+static void
+gimp_smudge_finalize (GObject *object)
+{
+  GimpSmudge *smudge = GIMP_SMUDGE (object);
+
+  if (smudge->accum_buffers)
+    {
+      GList *iter;
+
+      for (iter = smudge->accum_buffers; iter; iter = g_list_next (iter))
+        {
+          if (iter->data)
+            g_object_unref (iter->data);
+        }
+
+      g_list_free (smudge->accum_buffers);
+      smudge->accum_buffers = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_smudge_paint (GimpPaintCore    *paint_core,
+                   GimpDrawable     *drawable,
+                   GimpPaintOptions *paint_options,
+                   GimpSymmetry     *sym,
+                   GimpPaintState    paint_state,
+                   guint32           time)
+{
+  GimpSmudge *smudge = GIMP_SMUDGE (paint_core);
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      {
+        GimpContext       *context    = GIMP_CONTEXT (paint_options);
+        GimpSmudgeOptions *options    = GIMP_SMUDGE_OPTIONS (paint_options);
+        GimpBrushCore     *brush_core = GIMP_BRUSH_CORE (paint_core);
+        GimpDynamics      *dynamics   = gimp_context_get_dynamics (context);
+
+        /* Don't add to color history when
+         * 1. pure smudging (flow=0)
+         * 2. color is from gradient or pixmap brushes
+         */
+        if (options->flow > 0.0 &&
+            ! gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_COLOR) &&
+            ! (brush_core->brush && gimp_brush_get_pixmap (brush_core->brush)))
+          {
+            GimpRGB foreground;
+
+            gimp_context_get_foreground (context, &foreground);
+            gimp_palettes_add_color_history (context->gimp, &foreground);
+          }
+      }
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      /* initialization fails if the user starts outside the drawable */
+      if (! smudge->initialized)
+        smudge->initialized = gimp_smudge_start (paint_core, drawable,
+                                                 paint_options, sym);
+
+      if (smudge->initialized)
+        gimp_smudge_motion (paint_core, drawable, paint_options, sym);
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      if (smudge->accum_buffers)
+        {
+          GList *iter;
+
+          for  (iter = smudge->accum_buffers; iter; iter = g_list_next (iter))
+            {
+              if (iter->data)
+                g_object_unref (iter->data);
+            }
+
+          g_list_free (smudge->accum_buffers);
+          smudge->accum_buffers = NULL;
+        }
+
+      smudge->initialized = FALSE;
+      break;
+
+    default:
+      break;
+    }
+}
+
+static gboolean
+gimp_smudge_start (GimpPaintCore    *paint_core,
+                   GimpDrawable     *drawable,
+                   GimpPaintOptions *paint_options,
+                   GimpSymmetry     *sym)
+{
+  GimpSmudge        *smudge     = GIMP_SMUDGE (paint_core);
+  GimpBrushCore     *brush_core = GIMP_BRUSH_CORE (paint_core);
+  GimpSmudgeOptions *options    = GIMP_SMUDGE_OPTIONS (paint_options);
+  GimpPickable      *dest_pickable;
+  GeglBuffer        *pickable_buffer;
+  GeglBuffer        *paint_buffer;
+  GimpCoords        *coords;
+  gint               dest_pickable_off_x;
+  gint               dest_pickable_off_y;
+  gint               paint_buffer_x;
+  gint               paint_buffer_y;
+  gint               accum_size;
+  gint               n_strokes;
+  gint               i;
+  gint               x, y;
+
+  coords = gimp_symmetry_get_origin (sym);
+  gimp_brush_core_eval_transform_dynamics (brush_core,
+                                           drawable,
+                                           paint_options,
+                                           coords);
+
+  if (options->sample_merged)
+    {
+      dest_pickable = gimp_paint_core_get_image_pickable (paint_core);
+
+      gimp_item_get_offset (GIMP_ITEM (drawable),
+                            &dest_pickable_off_x,
+                            &dest_pickable_off_y);
+    }
+  else
+    {
+      dest_pickable = GIMP_PICKABLE (drawable);
+
+      dest_pickable_off_x = 0;
+      dest_pickable_off_y = 0;
+    }
+
+  pickable_buffer = gimp_pickable_get_buffer (dest_pickable);
+
+  n_strokes = gimp_symmetry_get_size (sym);
+  for (i = 0; i < n_strokes; i++)
+    {
+      GeglBuffer *accum_buffer;
+
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      gimp_smudge_accumulator_size (paint_options, coords, &accum_size);
+
+      /*  Allocate the accumulation buffer */
+      accum_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                                      accum_size,
+                                                      accum_size),
+                                      babl_format ("RGBA float"));
+      smudge->accum_buffers = g_list_prepend (smudge->accum_buffers,
+                                              accum_buffer);
+
+      /*  adjust the x and y coordinates to the upper left corner of the
+       *  accumulator
+       */
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       GIMP_LAYER_MODE_NORMAL,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       NULL, NULL);
+      if (! paint_buffer)
+        continue;
+
+      gimp_smudge_accumulator_coords (paint_core, coords, 0, &x, &y);
+
+      /*  If clipped, prefill the smudge buffer with the color at the
+       *  brush position.
+       */
+      if (x != paint_buffer_x ||
+          y != paint_buffer_y ||
+          accum_size != gegl_buffer_get_width  (paint_buffer) ||
+          accum_size != gegl_buffer_get_height (paint_buffer))
+        {
+          gfloat     pixel[4];
+          GeglColor *color;
+          gint       pick_x;
+          gint       pick_y;
+
+          pick_x = CLAMP ((gint) coords->x + dest_pickable_off_x,
+                          0,
+                          gegl_buffer_get_width (pickable_buffer) - 1);
+          pick_y = CLAMP ((gint) coords->y + dest_pickable_off_y,
+                          0,
+                          gegl_buffer_get_height (pickable_buffer) - 1);
+
+          gimp_pickable_get_pixel_at (dest_pickable,
+                                      pick_x, pick_y,
+                                      babl_format ("RGBA float"),
+                                      pixel);
+
+          color = gegl_color_new (NULL);
+          gegl_color_set_pixel (color, babl_format ("RGBA float"), pixel);
+          gegl_buffer_set_color (accum_buffer, NULL, color);
+          g_object_unref (color);
+        }
+
+      /* copy the region under the original painthit. */
+      gimp_gegl_buffer_copy
+        (pickable_buffer,
+         GEGL_RECTANGLE (paint_buffer_x + dest_pickable_off_x,
+                         paint_buffer_y + dest_pickable_off_y,
+                         gegl_buffer_get_width  (paint_buffer),
+                         gegl_buffer_get_height (paint_buffer)),
+         GEGL_ABYSS_NONE,
+         accum_buffer,
+         GEGL_RECTANGLE (paint_buffer_x - x,
+                         paint_buffer_y - y,
+                         0, 0));
+    }
+
+  smudge->accum_buffers = g_list_reverse (smudge->accum_buffers);
+
+  return TRUE;
+}
+
+static void
+gimp_smudge_motion (GimpPaintCore    *paint_core,
+                    GimpDrawable     *drawable,
+                    GimpPaintOptions *paint_options,
+                    GimpSymmetry     *sym)
+{
+  GimpSmudge         *smudge     = GIMP_SMUDGE (paint_core);
+  GimpBrushCore      *brush_core = GIMP_BRUSH_CORE (paint_core);
+  GimpSmudgeOptions  *options    = GIMP_SMUDGE_OPTIONS (paint_options);
+  GimpContext        *context    = GIMP_CONTEXT (paint_options);
+  GimpDynamics       *dynamics   = GIMP_BRUSH_CORE (paint_core)->dynamics;
+  GimpImage          *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpPickable       *dest_pickable;
+  GeglBuffer         *paint_buffer;
+  gint                dest_pickable_off_x;
+  gint                dest_pickable_off_y;
+  gint                paint_buffer_x;
+  gint                paint_buffer_y;
+  gint                paint_buffer_width;
+  gint                paint_buffer_height;
+  /* brush dynamics */
+  gdouble             fade_point;
+  gdouble             opacity;
+  gdouble             rate;
+  gdouble             flow;
+  gdouble             grad_point;
+  /* brush color */
+  GimpRGB             brush_color;
+  GimpRGB            *brush_color_ptr; /* whether use single color or pixmap */
+  /* accum buffer */
+  gint                x, y;
+  GeglBuffer         *accum_buffer;
+  /* other variables */
+  gdouble             force;
+  GimpCoords         *coords;
+  gint                paint_width, paint_height;
+  gint                n_strokes;
+  gint                i;
+
+  if (options->sample_merged)
+    {
+      dest_pickable = gimp_paint_core_get_image_pickable (paint_core);
+
+      gimp_item_get_offset (GIMP_ITEM (drawable),
+                            &dest_pickable_off_x,
+                            &dest_pickable_off_y);
+    }
+  else
+    {
+      dest_pickable = GIMP_PICKABLE (drawable);
+
+      dest_pickable_off_x = 0;
+      dest_pickable_off_y = 0;
+    }
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  coords = gimp_symmetry_get_origin (sym);
+  opacity = gimp_dynamics_get_linear_value (dynamics,
+                                            GIMP_DYNAMICS_OUTPUT_OPACITY,
+                                            coords,
+                                            paint_options,
+                                            fade_point);
+  if (opacity == 0.0)
+    return;
+
+  gimp_brush_core_eval_transform_dynamics (brush_core,
+                                           drawable,
+                                           paint_options,
+                                           coords);
+
+  /* Get brush dynamic values other than opacity */
+  rate = ((options->rate / 100.0) *
+          gimp_dynamics_get_linear_value (dynamics,
+                                          GIMP_DYNAMICS_OUTPUT_RATE,
+                                          coords,
+                                          paint_options,
+                                          fade_point));
+
+  flow = ((options->flow / 100.0) *
+          gimp_dynamics_get_linear_value (dynamics,
+                                          GIMP_DYNAMICS_OUTPUT_FLOW,
+                                          coords,
+                                          paint_options,
+                                          fade_point));
+
+  grad_point = gimp_dynamics_get_linear_value (dynamics,
+                                               GIMP_DYNAMICS_OUTPUT_COLOR,
+                                               coords,
+                                               paint_options,
+                                               fade_point);
+
+  /* Get current gradient color, brush pixmap, or foreground color */
+  brush_color_ptr = &brush_color;
+  if (gimp_paint_options_get_gradient_color (paint_options, image,
+                                             grad_point,
+                                             paint_core->pixel_dist,
+                                             &brush_color))
+    {
+      /* No more processing needed */
+    }
+  else if (brush_core->brush && gimp_brush_get_pixmap (brush_core->brush))
+    {
+      brush_color_ptr = NULL;
+    }
+  else
+    {
+      gimp_context_get_foreground (context, &brush_color);
+    }
+
+  /* Convert to linear RGBA */
+  if (brush_color_ptr)
+    gimp_pickable_srgb_to_pixel (dest_pickable,
+                                 &brush_color,
+                                 babl_format ("RGBA double"),
+                                 &brush_color);
+
+  n_strokes = gimp_symmetry_get_size (sym);
+  for (i = 0; i < n_strokes; i++)
+    {
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      gimp_brush_core_eval_transform_symmetry (brush_core, sym, i);
+
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       GIMP_LAYER_MODE_NORMAL,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       &paint_width,
+                                                       &paint_height);
+      if (! paint_buffer)
+        continue;
+
+      paint_buffer_width  = gegl_buffer_get_width  (paint_buffer);
+      paint_buffer_height = gegl_buffer_get_height (paint_buffer);
+
+      /*  Get the unclipped acumulator coordinates  */
+      gimp_smudge_accumulator_coords (paint_core, coords, i, &x, &y);
+
+      accum_buffer = g_list_nth_data (smudge->accum_buffers, i);
+
+      /* Old smudge tool:
+       *  Smudge uses the buffer Accum.
+       *  For each successive painthit Accum is built like this
+       *    Accum =  rate*Accum  + (1-rate)*I.
+       *  where I is the pixels under the current painthit.
+       *  Then the paint area (paint_area) is built as
+       *    (Accum,1) (if no alpha),
+       */
+
+      /* 2017/4/22: New smudge painting tool:
+       * Accum=rate*Accum + (1-rate)*I
+       * if brush_color_ptr!=NULL
+       *   Paint=(1-flow)*Accum + flow*BrushColor
+       * else, draw brush pixmap on the paint_buffer and
+       *   Paint=(1-flow)*Accum + flow*Paint
+       *
+       * For non-pixmap brushes, calculate blending in
+       * gimp_gegl_smudge_with_paint() instead of calling
+       * gegl_buffer_set_color() to reduce gegl's internal processing.
+       */
+      if (! brush_color_ptr && flow > 0.0)
+        {
+          gimp_brush_core_color_area_with_pixmap (brush_core, drawable,
+                                                  coords,
+                                                  paint_buffer,
+                                                  paint_buffer_x,
+                                                  paint_buffer_y,
+                                                  TRUE);
+        }
+
+      gimp_gegl_smudge_with_paint (accum_buffer,
+                                   GEGL_RECTANGLE (paint_buffer_x - x,
+                                                   paint_buffer_y - y,
+                                                   paint_buffer_width,
+                                                   paint_buffer_height),
+                                   gimp_pickable_get_buffer (dest_pickable),
+                                   GEGL_RECTANGLE (paint_buffer_x +
+                                                   dest_pickable_off_x,
+                                                   paint_buffer_y +
+                                                   dest_pickable_off_y,
+                                                   paint_buffer_width,
+                                                   paint_buffer_height),
+                                   brush_color_ptr,
+                                   paint_buffer,
+                                   options->no_erasing,
+                                   flow,
+                                   rate);
+
+      if (gimp_dynamics_is_output_enabled (dynamics, GIMP_DYNAMICS_OUTPUT_FORCE))
+        force = gimp_dynamics_get_linear_value (dynamics,
+                                                GIMP_DYNAMICS_OUTPUT_FORCE,
+                                                coords,
+                                                paint_options,
+                                                fade_point);
+      else
+        force = paint_options->brush_force;
+
+      gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
+                                      coords,
+                                      MIN (opacity, GIMP_OPACITY_OPAQUE),
+                                      gimp_context_get_opacity (context),
+                                      gimp_paint_options_get_brush_mode (paint_options),
+                                      force,
+                                      GIMP_PAINT_INCREMENTAL);
+    }
+}
+
+static void
+gimp_smudge_accumulator_coords (GimpPaintCore    *paint_core,
+                                const GimpCoords *coords,
+                                gint              stroke,
+                                gint             *x,
+                                gint             *y)
+{
+  GimpSmudge *smudge = GIMP_SMUDGE (paint_core);
+  GeglBuffer *accum_buffer;
+
+  accum_buffer = g_list_nth_data (smudge->accum_buffers, stroke);
+
+  *x = (gint) coords->x - gegl_buffer_get_width  (accum_buffer) / 2;
+  *y = (gint) coords->y - gegl_buffer_get_height (accum_buffer) / 2;
+}
+
+static void
+gimp_smudge_accumulator_size (GimpPaintOptions *paint_options,
+                              const GimpCoords *coords,
+                              gint             *accumulator_size)
+{
+  gdouble max_view_scale = 1.0;
+  gdouble max_brush_size;
+
+  if (paint_options->brush_lock_to_view)
+    max_view_scale = MAX (coords->xscale, coords->yscale);
+
+  max_brush_size = MIN (paint_options->brush_size / max_view_scale,
+                        GIMP_BRUSH_MAX_SIZE);
+
+  /* Note: the max brush mask size plus a border of 1 pixel and a
+   * little headroom
+   */
+  *accumulator_size = ceil (sqrt (2 * SQR (max_brush_size + 1)) + 2);
+}
diff --git a/app/paint/gimpsmudge.h b/app/paint/gimpsmudge.h
new file mode 100644
index 0000000..28be505
--- /dev/null
+++ b/app/paint/gimpsmudge.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SMUDGE_H__
+#define __GIMP_SMUDGE_H__
+
+
+#include "gimpbrushcore.h"
+
+
+#define GIMP_TYPE_SMUDGE            (gimp_smudge_get_type ())
+#define GIMP_SMUDGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SMUDGE, GimpSmudge))
+#define GIMP_SMUDGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SMUDGE, GimpSmudgeClass))
+#define GIMP_IS_SMUDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SMUDGE))
+#define GIMP_IS_SMUDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SMUDGE))
+#define GIMP_SMUDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE, GimpSmudgeClass))
+
+
+typedef struct _GimpSmudgeClass GimpSmudgeClass;
+
+struct _GimpSmudge
+{
+  GimpBrushCore  parent_instance;
+
+  gboolean       initialized;
+  GList         *accum_buffers;
+};
+
+struct _GimpSmudgeClass
+{
+  GimpBrushCoreClass  parent_class;
+};
+
+
+void    gimp_smudge_register (Gimp                      *gimp,
+                              GimpPaintRegisterCallback  callback);
+
+GType   gimp_smudge_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SMUDGE_H__  */
diff --git a/app/paint/gimpsmudgeoptions.c b/app/paint/gimpsmudgeoptions.c
new file mode 100644
index 0000000..cdf6f0b
--- /dev/null
+++ b/app/paint/gimpsmudgeoptions.c
@@ -0,0 +1,159 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpsmudgeoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define SMUDGE_DEFAULT_RATE       50.0
+#define SMUDGE_DEFAULT_FLOW       0.0
+#define SMUDGE_DEFAULT_NO_ERASING FALSE
+
+
+enum
+{
+  PROP_0,
+  PROP_RATE,
+  PROP_FLOW,
+  PROP_NO_ERASING,
+  PROP_SAMPLE_MERGED
+};
+
+
+static void   gimp_smudge_options_set_property (GObject      *object,
+                                                guint         property_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec);
+static void   gimp_smudge_options_get_property (GObject      *object,
+                                                guint         property_id,
+                                                GValue       *value,
+                                                GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpSmudgeOptions, gimp_smudge_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_smudge_options_class_init (GimpSmudgeOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_smudge_options_set_property;
+  object_class->get_property = gimp_smudge_options_get_property;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_RATE,
+                           "rate",
+                           C_("smudge-tool", "Rate"),
+                           _("The strength of smudging"),
+                           0.0, 100.0, SMUDGE_DEFAULT_RATE,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FLOW,
+                           "flow",
+                           C_("smudge-tool", "Flow"),
+                           _("The amount of brush color to blend"),
+                           0.0, 100.0, SMUDGE_DEFAULT_FLOW,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_NO_ERASING,
+                            "no-erasing",
+                            C_("smudge-tool", "No erasing effect"),
+                            _("Never decrease alpha of existing pixels"),
+                            SMUDGE_DEFAULT_NO_ERASING,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_smudge_options_init (GimpSmudgeOptions *options)
+{
+}
+
+static void
+gimp_smudge_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpSmudgeOptions *options = GIMP_SMUDGE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_RATE:
+      options->rate = g_value_get_double (value);
+      break;
+    case PROP_FLOW:
+      options->flow = g_value_get_double (value);
+      break;
+    case PROP_NO_ERASING:
+      options->no_erasing = g_value_get_boolean (value);
+      break;
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_smudge_options_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpSmudgeOptions *options = GIMP_SMUDGE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_RATE:
+      g_value_set_double (value, options->rate);
+      break;
+    case PROP_FLOW:
+      g_value_set_double (value, options->flow);
+      break;
+    case PROP_NO_ERASING:
+      g_value_set_boolean (value, options->no_erasing);
+      break;
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpsmudgeoptions.h b/app/paint/gimpsmudgeoptions.h
new file mode 100644
index 0000000..910ff52
--- /dev/null
+++ b/app/paint/gimpsmudgeoptions.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SMUDGE_OPTIONS_H__
+#define __GIMP_SMUDGE_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_SMUDGE_OPTIONS            (gimp_smudge_options_get_type ())
+#define GIMP_SMUDGE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SMUDGE_OPTIONS, GimpSmudgeOptions))
+#define GIMP_SMUDGE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SMUDGE_OPTIONS, GimpSmudgeOptionsClass))
+#define GIMP_IS_SMUDGE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SMUDGE_OPTIONS))
+#define GIMP_IS_SMUDGE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SMUDGE_OPTIONS))
+#define GIMP_SMUDGE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE_OPTIONS, GimpSmudgeOptionsClass))
+
+
+typedef struct _GimpSmudgeOptionsClass GimpSmudgeOptionsClass;
+
+struct _GimpSmudgeOptions
+{
+  GimpPaintOptions  parent_instance;
+
+  gdouble           rate;
+  gdouble           flow;
+  gboolean          no_erasing;
+  gboolean          sample_merged;
+};
+
+struct _GimpSmudgeOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_smudge_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SMUDGE_OPTIONS_H__  */
diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c
new file mode 100644
index 0000000..94238ad
--- /dev/null
+++ b/app/paint/gimpsourcecore.c
@@ -0,0 +1,679 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "paint-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpsymmetry.h"
+
+#include "gimpsourcecore.h"
+#include "gimpsourceoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SRC_DRAWABLE,
+  PROP_SRC_X,
+  PROP_SRC_Y
+};
+
+
+static void     gimp_source_core_set_property    (GObject           *object,
+                                                  guint              property_id,
+                                                  const GValue      *value,
+                                                  GParamSpec        *pspec);
+static void     gimp_source_core_get_property    (GObject           *object,
+                                                  guint              property_id,
+                                                  GValue            *value,
+                                                  GParamSpec        *pspec);
+
+static gboolean gimp_source_core_start           (GimpPaintCore     *paint_core,
+                                                  GimpDrawable      *drawable,
+                                                  GimpPaintOptions  *paint_options,
+                                                  const GimpCoords  *coords,
+                                                  GError           **error);
+static void     gimp_source_core_paint           (GimpPaintCore     *paint_core,
+                                                  GimpDrawable      *drawable,
+                                                  GimpPaintOptions  *paint_options,
+                                                  GimpSymmetry      *sym,
+                                                  GimpPaintState     paint_state,
+                                                  guint32            time);
+
+#if 0
+static void     gimp_source_core_motion          (GimpSourceCore    *source_core,
+                                                  GimpDrawable      *drawable,
+                                                  GimpPaintOptions  *paint_options,
+                                                  GimpSymmetry      *sym);
+#endif
+
+static gboolean gimp_source_core_real_use_source (GimpSourceCore    *source_core,
+                                                  GimpSourceOptions *options);
+static GeglBuffer *
+                gimp_source_core_real_get_source (GimpSourceCore    *source_core,
+                                                  GimpDrawable      *drawable,
+                                                  GimpPaintOptions  *paint_options,
+                                                  GimpPickable      *src_pickable,
+                                                  gint               src_offset_x,
+                                                  gint               src_offset_y,
+                                                  GeglBuffer        *paint_buffer,
+                                                  gint               paint_buffer_x,
+                                                  gint               paint_buffer_y,
+                                                  gint              *paint_area_offset_x,
+                                                  gint              *paint_area_offset_y,
+                                                  gint              *paint_area_width,
+                                                  gint              *paint_area_height,
+                                                  GeglRectangle     *src_rect);
+
+static void    gimp_source_core_set_src_drawable (GimpSourceCore    *source_core,
+                                                  GimpDrawable      *drawable);
+
+
+G_DEFINE_TYPE (GimpSourceCore, gimp_source_core, GIMP_TYPE_BRUSH_CORE)
+
+#define parent_class gimp_source_core_parent_class
+
+
+static void
+gimp_source_core_class_init (GimpSourceCoreClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpPaintCoreClass *paint_core_class = GIMP_PAINT_CORE_CLASS (klass);
+  GimpBrushCoreClass *brush_core_class = GIMP_BRUSH_CORE_CLASS (klass);
+
+  object_class->set_property               = gimp_source_core_set_property;
+  object_class->get_property               = gimp_source_core_get_property;
+
+  paint_core_class->start                  = gimp_source_core_start;
+  paint_core_class->paint                  = gimp_source_core_paint;
+
+  brush_core_class->handles_changing_brush = TRUE;
+
+  klass->use_source                        = gimp_source_core_real_use_source;
+  klass->get_source                        = gimp_source_core_real_get_source;
+  klass->motion                            = NULL;
+
+  g_object_class_install_property (object_class, PROP_SRC_DRAWABLE,
+                                   g_param_spec_object ("src-drawable",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DRAWABLE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SRC_X,
+                                   g_param_spec_int ("src-x", NULL, NULL,
+                                                     0, GIMP_MAX_IMAGE_SIZE,
+                                                     0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SRC_Y,
+                                   g_param_spec_int ("src-y", NULL, NULL,
+                                                     0, GIMP_MAX_IMAGE_SIZE,
+                                                     0,
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_source_core_init (GimpSourceCore *source_core)
+{
+  source_core->set_source   = FALSE;
+
+  source_core->src_drawable = NULL;
+  source_core->src_x        = 0;
+  source_core->src_y        = 0;
+
+  source_core->orig_src_x   = 0;
+  source_core->orig_src_y   = 0;
+
+  source_core->offset_x     = 0;
+  source_core->offset_y     = 0;
+  source_core->first_stroke = TRUE;
+}
+
+static void
+gimp_source_core_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpSourceCore *source_core = GIMP_SOURCE_CORE (object);
+
+  switch (property_id)
+    {
+    case PROP_SRC_DRAWABLE:
+      gimp_source_core_set_src_drawable (source_core,
+                                         g_value_get_object (value));
+      break;
+    case PROP_SRC_X:
+      source_core->src_x = g_value_get_int (value);
+      break;
+    case PROP_SRC_Y:
+      source_core->src_y = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_source_core_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpSourceCore *source_core = GIMP_SOURCE_CORE (object);
+
+  switch (property_id)
+    {
+    case PROP_SRC_DRAWABLE:
+      g_value_set_object (value, source_core->src_drawable);
+      break;
+    case PROP_SRC_X:
+      g_value_set_int (value, source_core->src_x);
+      break;
+    case PROP_SRC_Y:
+      g_value_set_int (value, source_core->src_y);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_source_core_start (GimpPaintCore     *paint_core,
+                        GimpDrawable      *drawable,
+                        GimpPaintOptions  *paint_options,
+                        const GimpCoords  *coords,
+                        GError           **error)
+{
+  GimpSourceCore    *source_core = GIMP_SOURCE_CORE (paint_core);
+  GimpSourceOptions *options     = GIMP_SOURCE_OPTIONS (paint_options);
+
+  if (! GIMP_PAINT_CORE_CLASS (parent_class)->start (paint_core, drawable,
+                                                     paint_options, coords,
+                                                     error))
+    {
+      return FALSE;
+    }
+
+  paint_core->use_saved_proj = FALSE;
+
+  if (! source_core->set_source &&
+      gimp_source_core_use_source (source_core, options))
+    {
+      if (! source_core->src_drawable)
+        {
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("Set a source image first."));
+          return FALSE;
+        }
+
+      if (options->sample_merged &&
+          gimp_item_get_image (GIMP_ITEM (source_core->src_drawable)) ==
+          gimp_item_get_image (GIMP_ITEM (drawable)))
+        {
+          paint_core->use_saved_proj = TRUE;
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_source_core_paint (GimpPaintCore    *paint_core,
+                        GimpDrawable     *drawable,
+                        GimpPaintOptions *paint_options,
+                        GimpSymmetry     *sym,
+                        GimpPaintState    paint_state,
+                        guint32           time)
+{
+  GimpSourceCore    *source_core = GIMP_SOURCE_CORE (paint_core);
+  GimpSourceOptions *options     = GIMP_SOURCE_OPTIONS (paint_options);
+  const GimpCoords  *coords;
+
+  /* The source is based on the original stroke */
+  coords = gimp_symmetry_get_origin (sym);
+
+  switch (paint_state)
+    {
+    case GIMP_PAINT_STATE_INIT:
+      if (source_core->set_source)
+        {
+          gimp_source_core_set_src_drawable (source_core, drawable);
+
+          /* FIXME(?): subpixel source sampling */
+          source_core->src_x = floor (coords->x);
+          source_core->src_y = floor (coords->y);
+
+          source_core->first_stroke = TRUE;
+        }
+      else if (options->align_mode == GIMP_SOURCE_ALIGN_NO)
+        {
+          source_core->orig_src_x = source_core->src_x;
+          source_core->orig_src_y = source_core->src_y;
+
+          source_core->first_stroke = TRUE;
+        }
+      break;
+
+    case GIMP_PAINT_STATE_MOTION:
+      if (source_core->set_source)
+        {
+          /*  If the control key is down, move the src target and return */
+
+          source_core->src_x = floor (coords->x);
+          source_core->src_y = floor (coords->y);
+
+          source_core->first_stroke = TRUE;
+        }
+      else
+        {
+          /*  otherwise, update the target  */
+
+          gint dest_x;
+          gint dest_y;
+
+          dest_x = floor (coords->x);
+          dest_y = floor (coords->y);
+
+          if (options->align_mode == GIMP_SOURCE_ALIGN_REGISTERED)
+            {
+              source_core->offset_x = 0;
+              source_core->offset_y = 0;
+            }
+          else if (options->align_mode == GIMP_SOURCE_ALIGN_FIXED)
+            {
+              source_core->offset_x = source_core->src_x - dest_x;
+              source_core->offset_y = source_core->src_y - dest_y;
+            }
+          else if (source_core->first_stroke)
+            {
+              source_core->offset_x = source_core->src_x - dest_x;
+              source_core->offset_y = source_core->src_y - dest_y;
+
+              source_core->first_stroke = FALSE;
+            }
+
+          source_core->src_x = dest_x + source_core->offset_x;
+          source_core->src_y = dest_y + source_core->offset_y;
+
+          gimp_source_core_motion (source_core, drawable, paint_options,
+                                   sym);
+        }
+      break;
+
+    case GIMP_PAINT_STATE_FINISH:
+      if (options->align_mode == GIMP_SOURCE_ALIGN_NO &&
+          ! source_core->first_stroke)
+        {
+          source_core->src_x = source_core->orig_src_x;
+          source_core->src_y = source_core->orig_src_y;
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  g_object_notify (G_OBJECT (source_core), "src-x");
+  g_object_notify (G_OBJECT (source_core), "src-y");
+}
+
+void
+gimp_source_core_motion (GimpSourceCore   *source_core,
+                         GimpDrawable     *drawable,
+                         GimpPaintOptions *paint_options,
+                         GimpSymmetry     *sym)
+
+{
+  GimpPaintCore     *paint_core   = GIMP_PAINT_CORE (source_core);
+  GimpBrushCore     *brush_core   = GIMP_BRUSH_CORE (source_core);
+  GimpSourceOptions *options      = GIMP_SOURCE_OPTIONS (paint_options);
+  GimpDynamics      *dynamics     = GIMP_BRUSH_CORE (paint_core)->dynamics;
+  GimpImage         *image        = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpPickable      *src_pickable = NULL;
+  GeglBuffer        *src_buffer   = NULL;
+  GeglRectangle      src_rect;
+  gint               base_src_offset_x;
+  gint               base_src_offset_y;
+  gint               src_offset_x;
+  gint               src_offset_y;
+  GeglBuffer        *paint_buffer;
+  gint               paint_buffer_x;
+  gint               paint_buffer_y;
+  gint               paint_area_offset_x;
+  gint               paint_area_offset_y;
+  gint               paint_area_width;
+  gint               paint_area_height;
+  gdouble            fade_point;
+  gdouble            opacity;
+  GimpLayerMode      paint_mode;
+  GeglNode          *op;
+  GimpCoords        *origin;
+  GimpCoords        *coords;
+  gint               n_strokes;
+  gint               i;
+
+  fade_point = gimp_paint_options_get_fade (paint_options, image,
+                                            paint_core->pixel_dist);
+
+  origin     = gimp_symmetry_get_origin (sym);
+  /* Some settings are based on the original stroke. */
+  opacity = gimp_dynamics_get_linear_value (dynamics,
+                                            GIMP_DYNAMICS_OUTPUT_OPACITY,
+                                            origin,
+                                            paint_options,
+                                            fade_point);
+  if (opacity == 0.0)
+    return;
+
+  base_src_offset_x = source_core->offset_x;
+  base_src_offset_y = source_core->offset_y;
+
+  if (gimp_source_core_use_source (source_core, options))
+    {
+      src_pickable = GIMP_PICKABLE (source_core->src_drawable);
+
+      if (options->sample_merged)
+        {
+          GimpImage *src_image = gimp_pickable_get_image (src_pickable);
+          gint       off_x, off_y;
+
+          if (! gimp_paint_core_get_show_all (paint_core))
+            {
+              src_pickable = GIMP_PICKABLE (src_image);
+            }
+          else
+            {
+              src_pickable = GIMP_PICKABLE (
+                gimp_image_get_projection (src_image));
+            }
+
+          gimp_item_get_offset (GIMP_ITEM (source_core->src_drawable),
+                                &off_x, &off_y);
+
+          base_src_offset_x += off_x;
+          base_src_offset_y += off_y;
+        }
+    }
+
+  gimp_brush_core_eval_transform_dynamics (brush_core,
+                                           drawable,
+                                           paint_options,
+                                           origin);
+
+  paint_mode = gimp_context_get_paint_mode (GIMP_CONTEXT (paint_options));
+
+  n_strokes  = gimp_symmetry_get_size (sym);
+  for (i = 0; i < n_strokes; i++)
+    {
+      coords = gimp_symmetry_get_coords (sym, i);
+
+      gimp_brush_core_eval_transform_symmetry (brush_core, sym, i);
+
+      paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
+                                                       paint_options,
+                                                       paint_mode,
+                                                       coords,
+                                                       &paint_buffer_x,
+                                                       &paint_buffer_y,
+                                                       NULL, NULL);
+      if (! paint_buffer)
+        continue;
+
+      paint_area_offset_x = 0;
+      paint_area_offset_y = 0;
+      paint_area_width    = gegl_buffer_get_width  (paint_buffer);
+      paint_area_height   = gegl_buffer_get_height (paint_buffer);
+
+      src_offset_x = base_src_offset_x;
+      src_offset_y = base_src_offset_y;
+      if (gimp_source_core_use_source (source_core, options))
+        {
+          /* When using a source, use the same for every stroke. */
+          src_offset_x += floor (origin->x) - floor (coords->x);
+          src_offset_y += floor (origin->y) - floor (coords->y);
+          src_buffer =
+            GIMP_SOURCE_CORE_GET_CLASS (source_core)->get_source (source_core,
+                                                                  drawable,
+                                                                  paint_options,
+                                                                  src_pickable,
+                                                                  src_offset_x,
+                                                                  src_offset_y,
+                                                                  paint_buffer,
+                                                                  paint_buffer_x,
+                                                                  paint_buffer_y,
+                                                                  &paint_area_offset_x,
+                                                                  &paint_area_offset_y,
+                                                                  &paint_area_width,
+                                                                  &paint_area_height,
+                                                                  &src_rect);
+
+          if (! src_buffer)
+            continue;
+        }
+
+      /*  Set the paint buffer to transparent  */
+      gegl_buffer_clear (paint_buffer, NULL);
+
+      op = gimp_symmetry_get_operation (sym, i);
+
+      if (op)
+        {
+          GeglNode *node;
+          GeglNode *input;
+          GeglNode *translate_before;
+          GeglNode *translate_after;
+          GeglNode *output;
+
+          node = gegl_node_new ();
+
+          input = gegl_node_get_input_proxy (node, "input");
+
+          translate_before = gegl_node_new_child (
+            node,
+            "operation", "gegl:translate",
+            "x",         -(source_core->src_x + 0.5),
+            "y",         -(source_core->src_y + 0.5),
+            NULL);
+
+          gegl_node_add_child (node, op);
+
+          translate_after = gegl_node_new_child (
+            node,
+            "operation", "gegl:translate",
+            "x",         (source_core->src_x + 0.5) +
+                         (paint_area_offset_x - src_rect.x),
+            "y",         (source_core->src_y + 0.5) +
+                         (paint_area_offset_y - src_rect.y),
+            NULL);
+
+          output = gegl_node_get_output_proxy (node, "output");
+
+          gegl_node_link_many (input,
+                               translate_before,
+                               op,
+                               translate_after,
+                               output,
+                               NULL);
+
+          g_object_unref (op);
+
+          op = node;
+        }
+
+      GIMP_SOURCE_CORE_GET_CLASS (source_core)->motion (source_core,
+                                                        drawable,
+                                                        paint_options,
+                                                        coords,
+                                                        op,
+                                                        opacity,
+                                                        src_pickable,
+                                                        src_buffer,
+                                                        &src_rect,
+                                                        src_offset_x,
+                                                        src_offset_y,
+                                                        paint_buffer,
+                                                        paint_buffer_x,
+                                                        paint_buffer_y,
+                                                        paint_area_offset_x,
+                                                        paint_area_offset_y,
+                                                        paint_area_width,
+                                                        paint_area_height);
+
+      g_clear_object (&op);
+
+      g_clear_object (&src_buffer);
+    }
+}
+
+gboolean
+gimp_source_core_use_source (GimpSourceCore    *source_core,
+                             GimpSourceOptions *options)
+{
+  return GIMP_SOURCE_CORE_GET_CLASS (source_core)->use_source (source_core,
+                                                               options);
+}
+
+static gboolean
+gimp_source_core_real_use_source (GimpSourceCore    *source_core,
+                                  GimpSourceOptions *options)
+{
+  return TRUE;
+}
+
+static GeglBuffer *
+gimp_source_core_real_get_source (GimpSourceCore   *source_core,
+                                  GimpDrawable     *drawable,
+                                  GimpPaintOptions *paint_options,
+                                  GimpPickable     *src_pickable,
+                                  gint              src_offset_x,
+                                  gint              src_offset_y,
+                                  GeglBuffer       *paint_buffer,
+                                  gint              paint_buffer_x,
+                                  gint              paint_buffer_y,
+                                  gint             *paint_area_offset_x,
+                                  gint             *paint_area_offset_y,
+                                  gint             *paint_area_width,
+                                  gint             *paint_area_height,
+                                  GeglRectangle    *src_rect)
+{
+  GimpSourceOptions *options    = GIMP_SOURCE_OPTIONS (paint_options);
+  GimpImage         *image      = gimp_item_get_image (GIMP_ITEM (drawable));
+  GimpImage         *src_image  = gimp_pickable_get_image (src_pickable);
+  GeglBuffer        *src_buffer = gimp_pickable_get_buffer (src_pickable);
+  GeglBuffer        *dest_buffer;
+  gint               x, y;
+  gint               width, height;
+
+  if (! gimp_rectangle_intersect (paint_buffer_x + src_offset_x,
+                                  paint_buffer_y + src_offset_y,
+                                  gegl_buffer_get_width  (paint_buffer),
+                                  gegl_buffer_get_height (paint_buffer),
+                                  gegl_buffer_get_x      (src_buffer),
+                                  gegl_buffer_get_y      (src_buffer),
+                                  gegl_buffer_get_width  (src_buffer),
+                                  gegl_buffer_get_height (src_buffer),
+                                  &x, &y,
+                                  &width, &height))
+    {
+      return FALSE;
+    }
+
+  /*  If the source image is different from the destination,
+   *  then we should copy straight from the source image
+   *  to the canvas.
+   *  Otherwise, we need a call to get_orig_image to make sure
+   *  we get a copy of the unblemished (offset) image
+   */
+  if ((  options->sample_merged && (src_image                 != image)) ||
+      (! options->sample_merged && (source_core->src_drawable != drawable)))
+    {
+      dest_buffer = src_buffer;
+    }
+  else
+    {
+      /*  get the original image  */
+      if (options->sample_merged)
+        dest_buffer = gimp_paint_core_get_orig_proj (GIMP_PAINT_CORE (source_core));
+      else
+        dest_buffer = gimp_paint_core_get_orig_image (GIMP_PAINT_CORE (source_core));
+    }
+
+  *paint_area_offset_x = x - (paint_buffer_x + src_offset_x);
+  *paint_area_offset_y = y - (paint_buffer_y + src_offset_y);
+  *paint_area_width    = width;
+  *paint_area_height   = height;
+
+  *src_rect = *GEGL_RECTANGLE (x, y, width, height);
+
+  return g_object_ref (dest_buffer);
+}
+
+static void
+gimp_source_core_src_drawable_removed (GimpDrawable   *drawable,
+                                       GimpSourceCore *source_core)
+{
+  if (drawable == source_core->src_drawable)
+    {
+      source_core->src_drawable = NULL;
+    }
+
+  g_signal_handlers_disconnect_by_func (drawable,
+                                        gimp_source_core_src_drawable_removed,
+                                        source_core);
+}
+
+static void
+gimp_source_core_set_src_drawable (GimpSourceCore *source_core,
+                                   GimpDrawable   *drawable)
+{
+  if (source_core->src_drawable == drawable)
+    return;
+
+  if (source_core->src_drawable)
+    g_signal_handlers_disconnect_by_func (source_core->src_drawable,
+                                          gimp_source_core_src_drawable_removed,
+                                          source_core);
+
+  source_core->src_drawable = drawable;
+
+  if (source_core->src_drawable)
+    g_signal_connect (source_core->src_drawable, "removed",
+                      G_CALLBACK (gimp_source_core_src_drawable_removed),
+                      source_core);
+
+  g_object_notify (G_OBJECT (source_core), "src-drawable");
+}
diff --git a/app/paint/gimpsourcecore.h b/app/paint/gimpsourcecore.h
new file mode 100644
index 0000000..158920b
--- /dev/null
+++ b/app/paint/gimpsourcecore.h
@@ -0,0 +1,110 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SOURCE_CORE_H__
+#define __GIMP_SOURCE_CORE_H__
+
+
+#include "gimpbrushcore.h"
+
+
+#define GIMP_TYPE_SOURCE_CORE            (gimp_source_core_get_type ())
+#define GIMP_SOURCE_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SOURCE_CORE, GimpSourceCore))
+#define GIMP_SOURCE_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SOURCE_CORE, GimpSourceCoreClass))
+#define GIMP_IS_SOURCE_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SOURCE_CORE))
+#define GIMP_IS_SOURCE_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SOURCE_CORE))
+#define GIMP_SOURCE_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_CORE, GimpSourceCoreClass))
+
+
+typedef struct _GimpSourceCoreClass GimpSourceCoreClass;
+
+struct _GimpSourceCore
+{
+  GimpBrushCore  parent_instance;
+
+  gboolean       set_source;
+
+  GimpDrawable  *src_drawable;
+  gint           src_x;
+  gint           src_y;
+
+  gint           orig_src_x;
+  gint           orig_src_y;
+
+  gint           offset_x;
+  gint           offset_y;
+  gboolean       first_stroke;
+};
+
+struct _GimpSourceCoreClass
+{
+  GimpBrushCoreClass  parent_class;
+
+  gboolean     (* use_source) (GimpSourceCore    *source_core,
+                               GimpSourceOptions *options);
+
+  GeglBuffer * (* get_source) (GimpSourceCore    *source_core,
+                               GimpDrawable      *drawable,
+                               GimpPaintOptions  *paint_options,
+                               GimpPickable      *src_pickable,
+                               gint               src_offset_x,
+                               gint               src_offset_y,
+                               GeglBuffer        *paint_buffer,
+                               gint               paint_buffer_x,
+                               gint               paint_buffer_y,
+                               /* offsets *into* the paint_buffer: */
+                               gint              *paint_area_offset_x,
+                               gint              *paint_area_offset_y,
+                               gint              *paint_area_width,
+                               gint              *paint_area_height,
+                               GeglRectangle     *src_rect);
+
+  void         (*  motion)    (GimpSourceCore    *source_core,
+                               GimpDrawable      *drawable,
+                               GimpPaintOptions  *paint_options,
+                               const GimpCoords  *coords,
+                               GeglNode          *op,
+                               gdouble            opacity,
+                               GimpPickable      *src_pickable,
+                               GeglBuffer        *src_buffer,
+                               GeglRectangle     *src_rect,
+                               gint               src_offset_x,
+                               gint               src_offset_y,
+                               GeglBuffer        *paint_buffer,
+                               gint               paint_buffer_x,
+                               gint               paint_buffer_y,
+                               /* offsets *into* the paint_buffer: */
+                               gint               paint_area_offset_x,
+                               gint               paint_area_offset_y,
+                               gint               paint_area_width,
+                               gint               paint_area_height);
+};
+
+
+GType    gimp_source_core_get_type   (void) G_GNUC_CONST;
+
+gboolean gimp_source_core_use_source (GimpSourceCore    *source_core,
+                                      GimpSourceOptions *options);
+
+/* TEMP HACK */
+void     gimp_source_core_motion     (GimpSourceCore    *source_core,
+                                      GimpDrawable      *drawable,
+                                      GimpPaintOptions  *paint_options,
+                                      GimpSymmetry      *sym);
+
+
+#endif  /*  __GIMP_SOURCE_CORE_H__  */
diff --git a/app/paint/gimpsourceoptions.c b/app/paint/gimpsourceoptions.c
new file mode 100644
index 0000000..7190d1c
--- /dev/null
+++ b/app/paint/gimpsourceoptions.c
@@ -0,0 +1,124 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "paint-types.h"
+
+#include "gimpsourceoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ALIGN_MODE,
+  PROP_SAMPLE_MERGED
+};
+
+
+static void   gimp_source_options_set_property (GObject      *object,
+                                                guint         property_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec);
+static void   gimp_source_options_get_property (GObject      *object,
+                                                guint         property_id,
+                                                GValue       *value,
+                                                GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpSourceOptions, gimp_source_options, GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_source_options_class_init (GimpSourceOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_source_options_set_property;
+  object_class->get_property = gimp_source_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ALIGN_MODE,
+                         "align-mode",
+                         _("Alignment"),
+                         NULL,
+                         GIMP_TYPE_SOURCE_ALIGN_MODE,
+                         GIMP_SOURCE_ALIGN_NO,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_source_options_init (GimpSourceOptions *options)
+{
+}
+
+static void
+gimp_source_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpSourceOptions *options = GIMP_SOURCE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ALIGN_MODE:
+      options->align_mode = g_value_get_enum (value);
+      break;
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_source_options_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpSourceOptions *options = GIMP_SOURCE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ALIGN_MODE:
+      g_value_set_enum (value, options->align_mode);
+      break;
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/paint/gimpsourceoptions.h b/app/paint/gimpsourceoptions.h
new file mode 100644
index 0000000..e4e2e2e
--- /dev/null
+++ b/app/paint/gimpsourceoptions.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SOURCE_OPTIONS_H__
+#define __GIMP_SOURCE_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_SOURCE_OPTIONS            (gimp_source_options_get_type ())
+#define GIMP_SOURCE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SOURCE_OPTIONS, GimpSourceOptions))
+#define GIMP_SOURCE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SOURCE_OPTIONS, GimpSourceOptionsClass))
+#define GIMP_IS_SOURCE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SOURCE_OPTIONS))
+#define GIMP_IS_SOURCE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SOURCE_OPTIONS))
+#define GIMP_SOURCE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_OPTIONS, GimpSourceOptionsClass))
+
+
+typedef struct _GimpSourceOptionsClass GimpSourceOptionsClass;
+
+struct _GimpSourceOptions
+{
+  GimpPaintOptions     parent_instance;
+
+  GimpSourceAlignMode  align_mode;
+  gboolean             sample_merged;
+};
+
+struct _GimpSourceOptionsClass
+{
+  GimpPaintOptionsClass  parent_class;
+};
+
+
+GType   gimp_source_options_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SOURCE_OPTIONS_H__  */
diff --git a/app/paint/paint-enums.c b/app/paint/paint-enums.c
new file mode 100644
index 0000000..8f6de34
--- /dev/null
+++ b/app/paint/paint-enums.c
@@ -0,0 +1,104 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "paint-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "paint-enums.h" */
+GType
+gimp_brush_application_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_BRUSH_HARD, "GIMP_BRUSH_HARD", "hard" },
+    { GIMP_BRUSH_SOFT, "GIMP_BRUSH_SOFT", "soft" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_BRUSH_HARD, "GIMP_BRUSH_HARD", NULL },
+    { GIMP_BRUSH_SOFT, "GIMP_BRUSH_SOFT", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpBrushApplicationMode", values);
+      gimp_type_set_translation_context (type, "brush-application-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_perspective_clone_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_PERSPECTIVE_CLONE_MODE_ADJUST, "GIMP_PERSPECTIVE_CLONE_MODE_ADJUST", "adjust" },
+    { GIMP_PERSPECTIVE_CLONE_MODE_PAINT, "GIMP_PERSPECTIVE_CLONE_MODE_PAINT", "paint" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_PERSPECTIVE_CLONE_MODE_ADJUST, NC_("perspective-clone-mode", "Modify Perspective"), NULL },
+    { GIMP_PERSPECTIVE_CLONE_MODE_PAINT, NC_("perspective-clone-mode", "Perspective Clone"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpPerspectiveCloneMode", values);
+      gimp_type_set_translation_context (type, "perspective-clone-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_source_align_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_SOURCE_ALIGN_NO, "GIMP_SOURCE_ALIGN_NO", "no" },
+    { GIMP_SOURCE_ALIGN_YES, "GIMP_SOURCE_ALIGN_YES", "yes" },
+    { GIMP_SOURCE_ALIGN_REGISTERED, "GIMP_SOURCE_ALIGN_REGISTERED", "registered" },
+    { GIMP_SOURCE_ALIGN_FIXED, "GIMP_SOURCE_ALIGN_FIXED", "fixed" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_SOURCE_ALIGN_NO, NC_("source-align-mode", "None"), NULL },
+    { GIMP_SOURCE_ALIGN_YES, NC_("source-align-mode", "Aligned"), NULL },
+    { GIMP_SOURCE_ALIGN_REGISTERED, NC_("source-align-mode", "Registered"), NULL },
+    { GIMP_SOURCE_ALIGN_FIXED, NC_("source-align-mode", "Fixed"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpSourceAlignMode", values);
+      gimp_type_set_translation_context (type, "source-align-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/paint/paint-enums.h b/app/paint/paint-enums.h
new file mode 100644
index 0000000..b764b6d
--- /dev/null
+++ b/app/paint/paint-enums.h
@@ -0,0 +1,85 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PAINT_ENUMS_H__
+#define __PAINT_ENUMS_H__
+
+#if 0
+   This file is parsed by two scripts, enumgen.pl in pdb,
+   and gimp-mkenums. All enums that are not marked with
+   /*< pdb-skip >*/ are exported to libgimp and the PDB. Enums that are
+   not marked with /*< skip >*/ are registered with the GType system.
+   If you want the enum to be skipped by both scripts, you have to use
+   /*< pdb-skip, skip >*/.
+
+   The same syntax applies to enum values.
+#endif
+
+
+/*
+ * enums that are registered with the type system
+ */
+
+#define GIMP_TYPE_BRUSH_APPLICATION_MODE (gimp_brush_application_mode_get_type ())
+
+GType gimp_brush_application_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_BRUSH_HARD,
+  GIMP_BRUSH_SOFT,
+  GIMP_BRUSH_PRESSURE  /*< pdb-skip, skip >*/
+} GimpBrushApplicationMode;
+
+
+#define GIMP_TYPE_PERSPECTIVE_CLONE_MODE (gimp_perspective_clone_mode_get_type ())
+
+GType gimp_perspective_clone_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum  /*< pdb-skip >*/
+{
+  GIMP_PERSPECTIVE_CLONE_MODE_ADJUST,  /*< desc="Modify Perspective" >*/
+  GIMP_PERSPECTIVE_CLONE_MODE_PAINT    /*< desc="Perspective Clone"  >*/
+} GimpPerspectiveCloneMode;
+
+
+#define GIMP_TYPE_SOURCE_ALIGN_MODE (gimp_source_align_mode_get_type ())
+
+GType gimp_source_align_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< pdb-skip >*/
+{
+  GIMP_SOURCE_ALIGN_NO,          /*< desc="None"        >*/
+  GIMP_SOURCE_ALIGN_YES,         /*< desc="Aligned"     >*/
+  GIMP_SOURCE_ALIGN_REGISTERED,  /*< desc="Registered"  >*/
+  GIMP_SOURCE_ALIGN_FIXED        /*< desc="Fixed"       >*/
+} GimpSourceAlignMode;
+
+
+/*
+ * non-registered enums; register them if needed
+ */
+
+typedef enum  /*< skip, pdb-skip >*/
+{
+  GIMP_PAINT_STATE_INIT,    /*  Setup PaintFunc internals                    */
+  GIMP_PAINT_STATE_MOTION,  /*  PaintFunc performs motion-related rendering  */
+  GIMP_PAINT_STATE_FINISH   /*  Cleanup and/or reset PaintFunc operation     */
+} GimpPaintState;
+
+
+#endif /* __PAINT_ENUMS_H__ */
diff --git a/app/paint/paint-types.h b/app/paint/paint-types.h
new file mode 100644
index 0000000..1c9d8eb
--- /dev/null
+++ b/app/paint/paint-types.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PAINT_TYPES_H__
+#define __PAINT_TYPES_H__
+
+
+#include "core/core-types.h"
+#include "paint/paint-enums.h"
+
+
+/*  paint cores  */
+
+typedef struct _GimpPaintCore        GimpPaintCore;
+typedef struct _GimpBrushCore        GimpBrushCore;
+typedef struct _GimpSourceCore       GimpSourceCore;
+
+typedef struct _GimpAirbrush         GimpAirbrush;
+typedef struct _GimpClone            GimpClone;
+typedef struct _GimpConvolve         GimpConvolve;
+typedef struct _GimpDodgeBurn        GimpDodgeBurn;
+typedef struct _GimpEraser           GimpEraser;
+typedef struct _GimpHeal             GimpHeal;
+typedef struct _GimpInk              GimpInk;
+typedef struct _GimpMybrushCore      GimpMybrushCore;
+typedef struct _GimpPaintbrush       GimpPaintbrush;
+typedef struct _GimpPencil           GimpPencil;
+typedef struct _GimpPerspectiveClone GimpPerspectiveClone;
+typedef struct _GimpSmudge           GimpSmudge;
+
+
+/*  paint options  */
+
+typedef struct _GimpPaintOptions            GimpPaintOptions;
+typedef struct _GimpSourceOptions           GimpSourceOptions;
+
+typedef struct _GimpAirbrushOptions         GimpAirbrushOptions;
+typedef struct _GimpCloneOptions            GimpCloneOptions;
+typedef struct _GimpConvolveOptions         GimpConvolveOptions;
+typedef struct _GimpDodgeBurnOptions        GimpDodgeBurnOptions;
+typedef struct _GimpEraserOptions           GimpEraserOptions;
+typedef struct _GimpInkOptions              GimpInkOptions;
+typedef struct _GimpMybrushOptions          GimpMybrushOptions;
+typedef struct _GimpPencilOptions           GimpPencilOptions;
+typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions;
+typedef struct _GimpSmudgeOptions           GimpSmudgeOptions;
+
+
+/*  functions  */
+
+typedef void (* GimpPaintRegisterCallback) (Gimp        *gimp,
+                                            GType        paint_type,
+                                            GType        paint_options_type,
+                                            const gchar *identifier,
+                                            const gchar *blurb,
+                                            const gchar *icon_name);
+
+typedef void (* GimpPaintRegisterFunc)     (Gimp                      *gimp,
+                                            GimpPaintRegisterCallback  callback);
+
+
+#endif /* __PAINT_TYPES_H__ */
diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am
new file mode 100644
index 0000000..f4b9dcd
--- /dev/null
+++ b/app/pdb/Makefile.am
@@ -0,0 +1,93 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-PDB\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapppdb.a libappinternal-procs.a
+
+libapppdb_a_SOURCES = \
+	pdb-types.h			\
+	\
+	gimp-pdb-compat.c		\
+	gimp-pdb-compat.h		\
+	gimppdb.c			\
+	gimppdb.h			\
+	gimppdb-query.c			\
+	gimppdb-query.h			\
+	gimppdb-utils.c			\
+	gimppdb-utils.h			\
+	gimppdbcontext.c		\
+	gimppdbcontext.h		\
+	gimppdberror.c			\
+	gimppdberror.h			\
+	gimpprocedure.c			\
+	gimpprocedure.h
+
+libappinternal_procs_a_SOURCES = \
+	internal-procs.c		\
+	internal-procs.h		\
+	brush-cmds.c			\
+	brush-select-cmds.c		\
+	brushes-cmds.c			\
+	buffer-cmds.c			\
+	channel-cmds.c			\
+	color-cmds.c			\
+	context-cmds.c			\
+	debug-cmds.c			\
+	display-cmds.c			\
+	drawable-cmds.c			\
+	drawable-color-cmds.c		\
+	drawable-edit-cmds.c		\
+	drawable-transform-cmds.c	\
+	dynamics-cmds.c			\
+	edit-cmds.c			\
+	fileops-cmds.c			\
+	floating-sel-cmds.c		\
+	font-select-cmds.c		\
+	fonts-cmds.c			\
+	gimp-cmds.c			\
+	gimprc-cmds.c			\
+	gradient-cmds.c			\
+	gradient-select-cmds.c		\
+	gradients-cmds.c		\
+	help-cmds.c			\
+	image-cmds.c			\
+	image-color-profile-cmds.c	\
+	image-convert-cmds.c		\
+	image-grid-cmds.c		\
+	image-guides-cmds.c		\
+	image-sample-points-cmds.c	\
+	image-select-cmds.c		\
+	image-transform-cmds.c		\
+	image-undo-cmds.c		\
+	item-cmds.c			\
+	item-transform-cmds.c		\
+	layer-cmds.c			\
+	message-cmds.c			\
+	paint-tools-cmds.c		\
+	palette-cmds.c			\
+	palette-select-cmds.c		\
+	palettes-cmds.c			\
+	paths-cmds.c			\
+	pattern-cmds.c			\
+	pattern-select-cmds.c		\
+	patterns-cmds.c			\
+	plug-in-cmds.c			\
+	plug-in-compat-cmds.c		\
+	procedural-db-cmds.c		\
+	progress-cmds.c			\
+	selection-cmds.c		\
+	selection-tools-cmds.c		\
+	text-layer-cmds.c		\
+	text-tool-cmds.c		\
+	transform-tools-cmds.c		\
+	unit-cmds.c			\
+	vectors-cmds.c
diff --git a/app/pdb/Makefile.in b/app/pdb/Makefile.in
new file mode 100644
index 0000000..b6e339d
--- /dev/null
+++ b/app/pdb/Makefile.in
@@ -0,0 +1,1264 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/pdb
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappinternal_procs_a_AR = $(AR) $(ARFLAGS)
+libappinternal_procs_a_LIBADD =
+am_libappinternal_procs_a_OBJECTS = internal-procs.$(OBJEXT) \
+	brush-cmds.$(OBJEXT) brush-select-cmds.$(OBJEXT) \
+	brushes-cmds.$(OBJEXT) buffer-cmds.$(OBJEXT) \
+	channel-cmds.$(OBJEXT) color-cmds.$(OBJEXT) \
+	context-cmds.$(OBJEXT) debug-cmds.$(OBJEXT) \
+	display-cmds.$(OBJEXT) drawable-cmds.$(OBJEXT) \
+	drawable-color-cmds.$(OBJEXT) drawable-edit-cmds.$(OBJEXT) \
+	drawable-transform-cmds.$(OBJEXT) dynamics-cmds.$(OBJEXT) \
+	edit-cmds.$(OBJEXT) fileops-cmds.$(OBJEXT) \
+	floating-sel-cmds.$(OBJEXT) font-select-cmds.$(OBJEXT) \
+	fonts-cmds.$(OBJEXT) gimp-cmds.$(OBJEXT) gimprc-cmds.$(OBJEXT) \
+	gradient-cmds.$(OBJEXT) gradient-select-cmds.$(OBJEXT) \
+	gradients-cmds.$(OBJEXT) help-cmds.$(OBJEXT) \
+	image-cmds.$(OBJEXT) image-color-profile-cmds.$(OBJEXT) \
+	image-convert-cmds.$(OBJEXT) image-grid-cmds.$(OBJEXT) \
+	image-guides-cmds.$(OBJEXT) image-sample-points-cmds.$(OBJEXT) \
+	image-select-cmds.$(OBJEXT) image-transform-cmds.$(OBJEXT) \
+	image-undo-cmds.$(OBJEXT) item-cmds.$(OBJEXT) \
+	item-transform-cmds.$(OBJEXT) layer-cmds.$(OBJEXT) \
+	message-cmds.$(OBJEXT) paint-tools-cmds.$(OBJEXT) \
+	palette-cmds.$(OBJEXT) palette-select-cmds.$(OBJEXT) \
+	palettes-cmds.$(OBJEXT) paths-cmds.$(OBJEXT) \
+	pattern-cmds.$(OBJEXT) pattern-select-cmds.$(OBJEXT) \
+	patterns-cmds.$(OBJEXT) plug-in-cmds.$(OBJEXT) \
+	plug-in-compat-cmds.$(OBJEXT) procedural-db-cmds.$(OBJEXT) \
+	progress-cmds.$(OBJEXT) selection-cmds.$(OBJEXT) \
+	selection-tools-cmds.$(OBJEXT) text-layer-cmds.$(OBJEXT) \
+	text-tool-cmds.$(OBJEXT) transform-tools-cmds.$(OBJEXT) \
+	unit-cmds.$(OBJEXT) vectors-cmds.$(OBJEXT)
+libappinternal_procs_a_OBJECTS = $(am_libappinternal_procs_a_OBJECTS)
+libapppdb_a_AR = $(AR) $(ARFLAGS)
+libapppdb_a_LIBADD =
+am_libapppdb_a_OBJECTS = gimp-pdb-compat.$(OBJEXT) gimppdb.$(OBJEXT) \
+	gimppdb-query.$(OBJEXT) gimppdb-utils.$(OBJEXT) \
+	gimppdbcontext.$(OBJEXT) gimppdberror.$(OBJEXT) \
+	gimpprocedure.$(OBJEXT)
+libapppdb_a_OBJECTS = $(am_libapppdb_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/brush-cmds.Po \
+	./$(DEPDIR)/brush-select-cmds.Po ./$(DEPDIR)/brushes-cmds.Po \
+	./$(DEPDIR)/buffer-cmds.Po ./$(DEPDIR)/channel-cmds.Po \
+	./$(DEPDIR)/color-cmds.Po ./$(DEPDIR)/context-cmds.Po \
+	./$(DEPDIR)/debug-cmds.Po ./$(DEPDIR)/display-cmds.Po \
+	./$(DEPDIR)/drawable-cmds.Po \
+	./$(DEPDIR)/drawable-color-cmds.Po \
+	./$(DEPDIR)/drawable-edit-cmds.Po \
+	./$(DEPDIR)/drawable-transform-cmds.Po \
+	./$(DEPDIR)/dynamics-cmds.Po ./$(DEPDIR)/edit-cmds.Po \
+	./$(DEPDIR)/fileops-cmds.Po ./$(DEPDIR)/floating-sel-cmds.Po \
+	./$(DEPDIR)/font-select-cmds.Po ./$(DEPDIR)/fonts-cmds.Po \
+	./$(DEPDIR)/gimp-cmds.Po ./$(DEPDIR)/gimp-pdb-compat.Po \
+	./$(DEPDIR)/gimppdb-query.Po ./$(DEPDIR)/gimppdb-utils.Po \
+	./$(DEPDIR)/gimppdb.Po ./$(DEPDIR)/gimppdbcontext.Po \
+	./$(DEPDIR)/gimppdberror.Po ./$(DEPDIR)/gimpprocedure.Po \
+	./$(DEPDIR)/gimprc-cmds.Po ./$(DEPDIR)/gradient-cmds.Po \
+	./$(DEPDIR)/gradient-select-cmds.Po \
+	./$(DEPDIR)/gradients-cmds.Po ./$(DEPDIR)/help-cmds.Po \
+	./$(DEPDIR)/image-cmds.Po \
+	./$(DEPDIR)/image-color-profile-cmds.Po \
+	./$(DEPDIR)/image-convert-cmds.Po \
+	./$(DEPDIR)/image-grid-cmds.Po \
+	./$(DEPDIR)/image-guides-cmds.Po \
+	./$(DEPDIR)/image-sample-points-cmds.Po \
+	./$(DEPDIR)/image-select-cmds.Po \
+	./$(DEPDIR)/image-transform-cmds.Po \
+	./$(DEPDIR)/image-undo-cmds.Po ./$(DEPDIR)/internal-procs.Po \
+	./$(DEPDIR)/item-cmds.Po ./$(DEPDIR)/item-transform-cmds.Po \
+	./$(DEPDIR)/layer-cmds.Po ./$(DEPDIR)/message-cmds.Po \
+	./$(DEPDIR)/paint-tools-cmds.Po ./$(DEPDIR)/palette-cmds.Po \
+	./$(DEPDIR)/palette-select-cmds.Po \
+	./$(DEPDIR)/palettes-cmds.Po ./$(DEPDIR)/paths-cmds.Po \
+	./$(DEPDIR)/pattern-cmds.Po ./$(DEPDIR)/pattern-select-cmds.Po \
+	./$(DEPDIR)/patterns-cmds.Po ./$(DEPDIR)/plug-in-cmds.Po \
+	./$(DEPDIR)/plug-in-compat-cmds.Po \
+	./$(DEPDIR)/procedural-db-cmds.Po ./$(DEPDIR)/progress-cmds.Po \
+	./$(DEPDIR)/selection-cmds.Po \
+	./$(DEPDIR)/selection-tools-cmds.Po \
+	./$(DEPDIR)/text-layer-cmds.Po ./$(DEPDIR)/text-tool-cmds.Po \
+	./$(DEPDIR)/transform-tools-cmds.Po ./$(DEPDIR)/unit-cmds.Po \
+	./$(DEPDIR)/vectors-cmds.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappinternal_procs_a_SOURCES) $(libapppdb_a_SOURCES)
+DIST_SOURCES = $(libappinternal_procs_a_SOURCES) \
+	$(libapppdb_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-PDB\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapppdb.a libappinternal-procs.a
+libapppdb_a_SOURCES = \
+	pdb-types.h			\
+	\
+	gimp-pdb-compat.c		\
+	gimp-pdb-compat.h		\
+	gimppdb.c			\
+	gimppdb.h			\
+	gimppdb-query.c			\
+	gimppdb-query.h			\
+	gimppdb-utils.c			\
+	gimppdb-utils.h			\
+	gimppdbcontext.c		\
+	gimppdbcontext.h		\
+	gimppdberror.c			\
+	gimppdberror.h			\
+	gimpprocedure.c			\
+	gimpprocedure.h
+
+libappinternal_procs_a_SOURCES = \
+	internal-procs.c		\
+	internal-procs.h		\
+	brush-cmds.c			\
+	brush-select-cmds.c		\
+	brushes-cmds.c			\
+	buffer-cmds.c			\
+	channel-cmds.c			\
+	color-cmds.c			\
+	context-cmds.c			\
+	debug-cmds.c			\
+	display-cmds.c			\
+	drawable-cmds.c			\
+	drawable-color-cmds.c		\
+	drawable-edit-cmds.c		\
+	drawable-transform-cmds.c	\
+	dynamics-cmds.c			\
+	edit-cmds.c			\
+	fileops-cmds.c			\
+	floating-sel-cmds.c		\
+	font-select-cmds.c		\
+	fonts-cmds.c			\
+	gimp-cmds.c			\
+	gimprc-cmds.c			\
+	gradient-cmds.c			\
+	gradient-select-cmds.c		\
+	gradients-cmds.c		\
+	help-cmds.c			\
+	image-cmds.c			\
+	image-color-profile-cmds.c	\
+	image-convert-cmds.c		\
+	image-grid-cmds.c		\
+	image-guides-cmds.c		\
+	image-sample-points-cmds.c	\
+	image-select-cmds.c		\
+	image-transform-cmds.c		\
+	image-undo-cmds.c		\
+	item-cmds.c			\
+	item-transform-cmds.c		\
+	layer-cmds.c			\
+	message-cmds.c			\
+	paint-tools-cmds.c		\
+	palette-cmds.c			\
+	palette-select-cmds.c		\
+	palettes-cmds.c			\
+	paths-cmds.c			\
+	pattern-cmds.c			\
+	pattern-select-cmds.c		\
+	patterns-cmds.c			\
+	plug-in-cmds.c			\
+	plug-in-compat-cmds.c		\
+	procedural-db-cmds.c		\
+	progress-cmds.c			\
+	selection-cmds.c		\
+	selection-tools-cmds.c		\
+	text-layer-cmds.c		\
+	text-tool-cmds.c		\
+	transform-tools-cmds.c		\
+	unit-cmds.c			\
+	vectors-cmds.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/pdb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/pdb/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappinternal-procs.a: $(libappinternal_procs_a_OBJECTS) $(libappinternal_procs_a_DEPENDENCIES) $(EXTRA_libappinternal_procs_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappinternal-procs.a
+	$(AM_V_AR)$(libappinternal_procs_a_AR) libappinternal-procs.a $(libappinternal_procs_a_OBJECTS) $(libappinternal_procs_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappinternal-procs.a
+
+libapppdb.a: $(libapppdb_a_OBJECTS) $(libapppdb_a_DEPENDENCIES) $(EXTRA_libapppdb_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapppdb.a
+	$(AM_V_AR)$(libapppdb_a_AR) libapppdb.a $(libapppdb_a_OBJECTS) $(libapppdb_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapppdb.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brush-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brush-select-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brushes-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-color-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-edit-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-transform-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileops-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floating-sel-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font-select-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-pdb-compat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdb-query.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdb-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdb.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdbcontext.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdberror.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprocedure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprc-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-select-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-color-profile-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-convert-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-grid-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-guides-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-sample-points-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-select-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-transform-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-undo-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/internal-procs.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item-transform-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paint-tools-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-select-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paths-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern-select-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterns-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-compat-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procedural-db-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progress-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection-tools-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-layer-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transform-tools-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit-cmds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-cmds.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/brush-cmds.Po
+	-rm -f ./$(DEPDIR)/brush-select-cmds.Po
+	-rm -f ./$(DEPDIR)/brushes-cmds.Po
+	-rm -f ./$(DEPDIR)/buffer-cmds.Po
+	-rm -f ./$(DEPDIR)/channel-cmds.Po
+	-rm -f ./$(DEPDIR)/color-cmds.Po
+	-rm -f ./$(DEPDIR)/context-cmds.Po
+	-rm -f ./$(DEPDIR)/debug-cmds.Po
+	-rm -f ./$(DEPDIR)/display-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-color-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-edit-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-transform-cmds.Po
+	-rm -f ./$(DEPDIR)/dynamics-cmds.Po
+	-rm -f ./$(DEPDIR)/edit-cmds.Po
+	-rm -f ./$(DEPDIR)/fileops-cmds.Po
+	-rm -f ./$(DEPDIR)/floating-sel-cmds.Po
+	-rm -f ./$(DEPDIR)/font-select-cmds.Po
+	-rm -f ./$(DEPDIR)/fonts-cmds.Po
+	-rm -f ./$(DEPDIR)/gimp-cmds.Po
+	-rm -f ./$(DEPDIR)/gimp-pdb-compat.Po
+	-rm -f ./$(DEPDIR)/gimppdb-query.Po
+	-rm -f ./$(DEPDIR)/gimppdb-utils.Po
+	-rm -f ./$(DEPDIR)/gimppdb.Po
+	-rm -f ./$(DEPDIR)/gimppdbcontext.Po
+	-rm -f ./$(DEPDIR)/gimppdberror.Po
+	-rm -f ./$(DEPDIR)/gimpprocedure.Po
+	-rm -f ./$(DEPDIR)/gimprc-cmds.Po
+	-rm -f ./$(DEPDIR)/gradient-cmds.Po
+	-rm -f ./$(DEPDIR)/gradient-select-cmds.Po
+	-rm -f ./$(DEPDIR)/gradients-cmds.Po
+	-rm -f ./$(DEPDIR)/help-cmds.Po
+	-rm -f ./$(DEPDIR)/image-cmds.Po
+	-rm -f ./$(DEPDIR)/image-color-profile-cmds.Po
+	-rm -f ./$(DEPDIR)/image-convert-cmds.Po
+	-rm -f ./$(DEPDIR)/image-grid-cmds.Po
+	-rm -f ./$(DEPDIR)/image-guides-cmds.Po
+	-rm -f ./$(DEPDIR)/image-sample-points-cmds.Po
+	-rm -f ./$(DEPDIR)/image-select-cmds.Po
+	-rm -f ./$(DEPDIR)/image-transform-cmds.Po
+	-rm -f ./$(DEPDIR)/image-undo-cmds.Po
+	-rm -f ./$(DEPDIR)/internal-procs.Po
+	-rm -f ./$(DEPDIR)/item-cmds.Po
+	-rm -f ./$(DEPDIR)/item-transform-cmds.Po
+	-rm -f ./$(DEPDIR)/layer-cmds.Po
+	-rm -f ./$(DEPDIR)/message-cmds.Po
+	-rm -f ./$(DEPDIR)/paint-tools-cmds.Po
+	-rm -f ./$(DEPDIR)/palette-cmds.Po
+	-rm -f ./$(DEPDIR)/palette-select-cmds.Po
+	-rm -f ./$(DEPDIR)/palettes-cmds.Po
+	-rm -f ./$(DEPDIR)/paths-cmds.Po
+	-rm -f ./$(DEPDIR)/pattern-cmds.Po
+	-rm -f ./$(DEPDIR)/pattern-select-cmds.Po
+	-rm -f ./$(DEPDIR)/patterns-cmds.Po
+	-rm -f ./$(DEPDIR)/plug-in-cmds.Po
+	-rm -f ./$(DEPDIR)/plug-in-compat-cmds.Po
+	-rm -f ./$(DEPDIR)/procedural-db-cmds.Po
+	-rm -f ./$(DEPDIR)/progress-cmds.Po
+	-rm -f ./$(DEPDIR)/selection-cmds.Po
+	-rm -f ./$(DEPDIR)/selection-tools-cmds.Po
+	-rm -f ./$(DEPDIR)/text-layer-cmds.Po
+	-rm -f ./$(DEPDIR)/text-tool-cmds.Po
+	-rm -f ./$(DEPDIR)/transform-tools-cmds.Po
+	-rm -f ./$(DEPDIR)/unit-cmds.Po
+	-rm -f ./$(DEPDIR)/vectors-cmds.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/brush-cmds.Po
+	-rm -f ./$(DEPDIR)/brush-select-cmds.Po
+	-rm -f ./$(DEPDIR)/brushes-cmds.Po
+	-rm -f ./$(DEPDIR)/buffer-cmds.Po
+	-rm -f ./$(DEPDIR)/channel-cmds.Po
+	-rm -f ./$(DEPDIR)/color-cmds.Po
+	-rm -f ./$(DEPDIR)/context-cmds.Po
+	-rm -f ./$(DEPDIR)/debug-cmds.Po
+	-rm -f ./$(DEPDIR)/display-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-color-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-edit-cmds.Po
+	-rm -f ./$(DEPDIR)/drawable-transform-cmds.Po
+	-rm -f ./$(DEPDIR)/dynamics-cmds.Po
+	-rm -f ./$(DEPDIR)/edit-cmds.Po
+	-rm -f ./$(DEPDIR)/fileops-cmds.Po
+	-rm -f ./$(DEPDIR)/floating-sel-cmds.Po
+	-rm -f ./$(DEPDIR)/font-select-cmds.Po
+	-rm -f ./$(DEPDIR)/fonts-cmds.Po
+	-rm -f ./$(DEPDIR)/gimp-cmds.Po
+	-rm -f ./$(DEPDIR)/gimp-pdb-compat.Po
+	-rm -f ./$(DEPDIR)/gimppdb-query.Po
+	-rm -f ./$(DEPDIR)/gimppdb-utils.Po
+	-rm -f ./$(DEPDIR)/gimppdb.Po
+	-rm -f ./$(DEPDIR)/gimppdbcontext.Po
+	-rm -f ./$(DEPDIR)/gimppdberror.Po
+	-rm -f ./$(DEPDIR)/gimpprocedure.Po
+	-rm -f ./$(DEPDIR)/gimprc-cmds.Po
+	-rm -f ./$(DEPDIR)/gradient-cmds.Po
+	-rm -f ./$(DEPDIR)/gradient-select-cmds.Po
+	-rm -f ./$(DEPDIR)/gradients-cmds.Po
+	-rm -f ./$(DEPDIR)/help-cmds.Po
+	-rm -f ./$(DEPDIR)/image-cmds.Po
+	-rm -f ./$(DEPDIR)/image-color-profile-cmds.Po
+	-rm -f ./$(DEPDIR)/image-convert-cmds.Po
+	-rm -f ./$(DEPDIR)/image-grid-cmds.Po
+	-rm -f ./$(DEPDIR)/image-guides-cmds.Po
+	-rm -f ./$(DEPDIR)/image-sample-points-cmds.Po
+	-rm -f ./$(DEPDIR)/image-select-cmds.Po
+	-rm -f ./$(DEPDIR)/image-transform-cmds.Po
+	-rm -f ./$(DEPDIR)/image-undo-cmds.Po
+	-rm -f ./$(DEPDIR)/internal-procs.Po
+	-rm -f ./$(DEPDIR)/item-cmds.Po
+	-rm -f ./$(DEPDIR)/item-transform-cmds.Po
+	-rm -f ./$(DEPDIR)/layer-cmds.Po
+	-rm -f ./$(DEPDIR)/message-cmds.Po
+	-rm -f ./$(DEPDIR)/paint-tools-cmds.Po
+	-rm -f ./$(DEPDIR)/palette-cmds.Po
+	-rm -f ./$(DEPDIR)/palette-select-cmds.Po
+	-rm -f ./$(DEPDIR)/palettes-cmds.Po
+	-rm -f ./$(DEPDIR)/paths-cmds.Po
+	-rm -f ./$(DEPDIR)/pattern-cmds.Po
+	-rm -f ./$(DEPDIR)/pattern-select-cmds.Po
+	-rm -f ./$(DEPDIR)/patterns-cmds.Po
+	-rm -f ./$(DEPDIR)/plug-in-cmds.Po
+	-rm -f ./$(DEPDIR)/plug-in-compat-cmds.Po
+	-rm -f ./$(DEPDIR)/procedural-db-cmds.Po
+	-rm -f ./$(DEPDIR)/progress-cmds.Po
+	-rm -f ./$(DEPDIR)/selection-cmds.Po
+	-rm -f ./$(DEPDIR)/selection-tools-cmds.Po
+	-rm -f ./$(DEPDIR)/text-layer-cmds.Po
+	-rm -f ./$(DEPDIR)/text-tool-cmds.Po
+	-rm -f ./$(DEPDIR)/transform-tools-cmds.Po
+	-rm -f ./$(DEPDIR)/unit-cmds.Po
+	-rm -f ./$(DEPDIR)/vectors-cmds.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/pdb/README b/app/pdb/README
new file mode 100644
index 0000000..2205ba6
--- /dev/null
+++ b/app/pdb/README
@@ -0,0 +1,7 @@
+This directory contains the PDB-wrappers for various internal
+Gimp functions.
+
+THESE FILES ARE AUTOGENERATED AND CHANGES HERE ARE USELESS!
+
+If you need to change the code please have a look in ../../pdb/groups.
+
diff --git a/app/pdb/brush-cmds.c b/app/pdb/brush-cmds.c
new file mode 100644
index 0000000..2415d63
--- /dev/null
+++ b/app/pdb/brush-cmds.c
@@ -0,0 +1,1677 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
+#include "gegl/gimp-babl-compat.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+brush_new_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *actual_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpData *data = gimp_data_factory_data_new (gimp->brush_factory,
+                                                   context, name);
+
+      if (data)
+        actual_name = g_strdup (gimp_object_get_name (data));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_duplicate_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *copy_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        {
+          GimpBrush *brush_copy = (GimpBrush *)
+            gimp_data_factory_data_duplicate (gimp->brush_factory,
+                                              GIMP_DATA (brush));
+
+          if (brush_copy)
+            copy_name = g_strdup (gimp_object_get_name (brush_copy));
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), copy_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_is_generated_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gboolean generated = FALSE;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        generated = GIMP_IS_BRUSH_GENERATED (brush);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), generated);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_rename_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  const gchar *new_name;
+  gchar *actual_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  new_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_RENAME, error);
+
+      if (brush)
+        {
+          gimp_object_set_name (GIMP_OBJECT (brush), new_name);
+          actual_name = g_strdup (gimp_object_get_name (brush));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_delete_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush && gimp_data_is_deletable (GIMP_DATA (brush)))
+        success = gimp_data_factory_data_delete (gimp->brush_factory,
+                                                 GIMP_DATA (brush),
+                                                 TRUE, error);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+brush_is_editable_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gboolean editable = FALSE;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        editable = gimp_data_is_writable (GIMP_DATA (brush));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), editable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_info_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 mask_bpp = 0;
+  gint32 color_bpp = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        {
+          GimpTempBuf *mask   = gimp_brush_get_mask (brush);
+          GimpTempBuf *pixmap = gimp_brush_get_pixmap (brush);
+          const Babl  *format;
+
+          format = gimp_babl_compat_u8_mask_format (
+            gimp_temp_buf_get_format (mask));
+
+          width    = gimp_brush_get_width  (brush);
+          height   = gimp_brush_get_height (brush);
+          mask_bpp = babl_format_get_bytes_per_pixel (format);
+
+          if (pixmap)
+            {
+              format = gimp_babl_compat_u8_format (
+                gimp_temp_buf_get_format (pixmap));
+
+              color_bpp = babl_format_get_bytes_per_pixel (format);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), mask_bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), color_bpp);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_pixels_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 mask_bpp = 0;
+  gint32 num_mask_bytes = 0;
+  guint8 *mask_bytes = NULL;
+  gint32 color_bpp = 0;
+  gint32 num_color_bytes = 0;
+  guint8 *color_bytes = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        {
+          GimpTempBuf *mask   = gimp_brush_get_mask (brush);
+          GimpTempBuf *pixmap = gimp_brush_get_pixmap (brush);
+          const Babl  *format;
+          gpointer     data;
+
+          format = gimp_babl_compat_u8_mask_format (
+            gimp_temp_buf_get_format (mask));
+          data   = gimp_temp_buf_lock (mask, format, GEGL_ACCESS_READ);
+
+          width          = gimp_temp_buf_get_width  (mask);
+          height         = gimp_temp_buf_get_height (mask);
+          mask_bpp       = babl_format_get_bytes_per_pixel (format);
+          num_mask_bytes = gimp_temp_buf_get_height (mask) *
+                           gimp_temp_buf_get_width  (mask) * mask_bpp;
+          mask_bytes     = g_memdup (data, num_mask_bytes);
+
+          gimp_temp_buf_unlock (mask, data);
+
+          if (pixmap)
+            {
+              format = gimp_babl_compat_u8_format (
+                gimp_temp_buf_get_format (pixmap));
+              data   = gimp_temp_buf_lock (pixmap, format, GEGL_ACCESS_READ);
+
+              color_bpp       = babl_format_get_bytes_per_pixel (format);
+              num_color_bytes = gimp_temp_buf_get_height (pixmap) *
+                                gimp_temp_buf_get_width  (pixmap) *
+                                color_bpp;
+              color_bytes     = g_memdup (data, num_color_bytes);
+
+              gimp_temp_buf_unlock (pixmap, data);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), mask_bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), num_mask_bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 5), mask_bytes, num_mask_bytes);
+      g_value_set_int (gimp_value_array_index (return_vals, 6), color_bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 7), num_color_bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 8), color_bytes, num_color_bytes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_spacing_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 spacing = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        spacing = gimp_brush_get_spacing (brush);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), spacing);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_spacing_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 spacing;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  spacing = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        gimp_brush_set_spacing (brush, spacing);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+brush_get_shape_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 shape = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        shape = GIMP_BRUSH_GENERATED (brush)->shape;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), shape);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_shape_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 shape_in;
+  gint32 shape_out = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  shape_in = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        {
+          gimp_brush_generated_set_shape (GIMP_BRUSH_GENERATED (brush),
+                                          shape_in);
+          shape_out = GIMP_BRUSH_GENERATED (brush)->shape;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), shape_out);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_radius_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble radius = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        radius = GIMP_BRUSH_GENERATED (brush)->radius;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), radius);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_radius_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble radius_in;
+  gdouble radius_out = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  radius_in = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        {
+          gimp_brush_generated_set_radius (GIMP_BRUSH_GENERATED (brush),
+                                           radius_in);
+          radius_out = GIMP_BRUSH_GENERATED (brush)->radius;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), radius_out);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_spikes_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 spikes = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        spikes = GIMP_BRUSH_GENERATED (brush)->spikes;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), spikes);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_spikes_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 spikes_in;
+  gint32 spikes_out = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  spikes_in = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        {
+          gimp_brush_generated_set_spikes (GIMP_BRUSH_GENERATED (brush),
+                                           spikes_in);
+          spikes_out = GIMP_BRUSH_GENERATED (brush)->spikes;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), spikes_out);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_hardness_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble hardness = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        hardness = GIMP_BRUSH_GENERATED (brush)->hardness;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), hardness);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_hardness_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble hardness_in;
+  gdouble hardness_out = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  hardness_in = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        {
+          gimp_brush_generated_set_hardness (GIMP_BRUSH_GENERATED (brush),
+                                             hardness_in);
+          hardness_out = GIMP_BRUSH_GENERATED (brush)->hardness;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), hardness_out);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_aspect_ratio_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble aspect_ratio = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        aspect_ratio = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), aspect_ratio);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_aspect_ratio_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble aspect_ratio_in;
+  gdouble aspect_ratio_out = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  aspect_ratio_in = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        {
+          gimp_brush_generated_set_aspect_ratio (GIMP_BRUSH_GENERATED (brush),
+                                                 aspect_ratio_in);
+          aspect_ratio_out = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), aspect_ratio_out);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_get_angle_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble angle = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        angle = GIMP_BRUSH_GENERATED (brush)->angle;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), angle);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brush_set_angle_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gdouble angle_in;
+  gdouble angle_out = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  angle_in = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (brush)
+        {
+          gimp_brush_generated_set_angle (GIMP_BRUSH_GENERATED (brush),
+                                          angle_in);
+          angle_out = GIMP_BRUSH_GENERATED (brush)->angle;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), angle_out);
+
+  return return_vals;
+}
+
+void
+register_brush_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-brush-new
+   */
+  procedure = gimp_procedure_new (brush_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-new",
+                                     "Creates a new brush.",
+                                     "This procedure creates a new, uninitialized brush.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The requested name of the new brush",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The actual new brush name. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-duplicate
+   */
+  procedure = gimp_procedure_new (brush_duplicate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-duplicate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-duplicate",
+                                     "Duplicates a brush.",
+                                     "This procedure creates an identical brush by a different name.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("copy-name",
+                                                           "copy name",
+                                                           "The name of the brush's copy. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-is-generated
+   */
+  procedure = gimp_procedure_new (brush_is_generated_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-is-generated");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-is-generated",
+                                     "Tests if brush is generated.",
+                                     "Returns TRUE if this brush is parametric, FALSE for other types.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("generated",
+                                                         "generated",
+                                                         "TRUE if the brush is generated",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-rename
+   */
+  procedure = gimp_procedure_new (brush_rename_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-rename");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-rename",
+                                     "Renames a brush.",
+                                     "This procedure renames a brush.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("new-name",
+                                                       "new name",
+                                                       "The new name of the brush",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The actual new name of the brush. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-delete
+   */
+  procedure = gimp_procedure_new (brush_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-delete",
+                                     "Deletes a brush.",
+                                     "This procedure deletes a brush.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-is-editable
+   */
+  procedure = gimp_procedure_new (brush_is_editable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-is-editable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-is-editable",
+                                     "Tests if brush can be edited.",
+                                     "Returns TRUE if you have permission to change the brush.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("editable",
+                                                         "editable",
+                                                         "TRUE if the brush can be edited",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-info
+   */
+  procedure = gimp_procedure_new (brush_get_info_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-info");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-info",
+                                     "Retrieves information about the specified brush.",
+                                     "This procedure retrieves information about the specified brush: brush extents (width and height), color depth and mask depth.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The brush width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The brush height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("mask-bpp",
+                                                          "mask bpp",
+                                                          "The brush mask bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("color-bpp",
+                                                          "color bpp",
+                                                          "The brush color bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-pixels
+   */
+  procedure = gimp_procedure_new (brush_get_pixels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-pixels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-pixels",
+                                     "Retrieves information about the specified brush.",
+                                     "This procedure retrieves information about the specified brush. This includes the brush extents (width and height) and its pixels data.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The brush width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The brush height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("mask-bpp",
+                                                          "mask bpp",
+                                                          "The brush mask bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-mask-bytes",
+                                                          "num mask bytes",
+                                                          "Length of brush mask data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("mask-bytes",
+                                                               "mask bytes",
+                                                               "The brush mask data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("color-bpp",
+                                                          "color bpp",
+                                                          "The brush color bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-color-bytes",
+                                                          "num color bytes",
+                                                          "Length of brush color data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("color-bytes",
+                                                               "color bytes",
+                                                               "The brush color data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-spacing
+   */
+  procedure = gimp_procedure_new (brush_get_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-spacing",
+                                     "Gets the brush spacing.",
+                                     "This procedure returns the spacing setting for the specified brush. The return value is an integer between 0 and 1000 which represents percentage of the maximum of the width and height of the mask.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("spacing",
+                                                          "spacing",
+                                                          "The brush spacing",
+                                                          0, 1000, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-spacing
+   */
+  procedure = gimp_procedure_new (brush_set_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-spacing",
+                                     "Sets the brush spacing.",
+                                     "This procedure modifies the spacing setting for the specified brush. The value should be a integer between 0 and 1000.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spacing",
+                                                      "spacing",
+                                                      "The brush spacing",
+                                                      0, 1000, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-shape
+   */
+  procedure = gimp_procedure_new (brush_get_shape_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-shape");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-shape",
+                                     "Gets the shape of a generated brush.",
+                                     "This procedure gets the shape value for a generated brush. If called for any other type of brush, it does not succeed. The current possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square (GIMP_BRUSH_GENERATED_SQUARE), and Diamond (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added in the future.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("shape",
+                                                      "shape",
+                                                      "The brush shape",
+                                                      GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                                      GIMP_BRUSH_GENERATED_CIRCLE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-shape
+   */
+  procedure = gimp_procedure_new (brush_set_shape_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-shape");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-shape",
+                                     "Sets the shape of a generated brush.",
+                                     "This procedure sets the shape value for a generated brush. If called for any other type of brush, it does not succeed. The current possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square (GIMP_BRUSH_GENERATED_SQUARE), and Diamond (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added in the future.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("shape-in",
+                                                  "shape in",
+                                                  "The brush shape",
+                                                  GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                                  GIMP_BRUSH_GENERATED_CIRCLE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("shape-out",
+                                                      "shape out",
+                                                      "The brush shape actually assigned",
+                                                      GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                                      GIMP_BRUSH_GENERATED_CIRCLE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-radius
+   */
+  procedure = gimp_procedure_new (brush_get_radius_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-radius");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-radius",
+                                     "Gets the radius of a generated brush.",
+                                     "This procedure gets the radius value for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("radius",
+                                                        "radius",
+                                                        "The radius of the brush in pixels",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-radius
+   */
+  procedure = gimp_procedure_new (brush_set_radius_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-radius");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-radius",
+                                     "Sets the radius of a generated brush.",
+                                     "This procedure sets the radius for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius-in",
+                                                    "radius in",
+                                                    "The desired brush radius in pixel",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("radius-out",
+                                                        "radius out",
+                                                        "The brush radius actually assigned",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-spikes
+   */
+  procedure = gimp_procedure_new (brush_get_spikes_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-spikes");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-spikes",
+                                     "Gets the number of spikes for a generated brush.",
+                                     "This procedure gets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("spikes",
+                                                          "spikes",
+                                                          "The number of spikes on the brush.",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-spikes
+   */
+  procedure = gimp_procedure_new (brush_set_spikes_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-spikes");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-spikes",
+                                     "Sets the number of spikes for a generated brush.",
+                                     "This procedure sets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spikes-in",
+                                                      "spikes in",
+                                                      "The desired number of spikes",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("spikes-out",
+                                                          "spikes out",
+                                                          "The number of spikes actually assigned",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-hardness
+   */
+  procedure = gimp_procedure_new (brush_get_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-hardness");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-hardness",
+                                     "Gets the hardness of a generated brush.",
+                                     "This procedure gets the hardness of a generated brush. The hardness of a brush is the amount its intensity fades at the outside edge, as a float between 0.0 and 1.0. If called for any other type of brush, the function does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("hardness",
+                                                        "hardness",
+                                                        "The hardness of the brush.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-hardness
+   */
+  procedure = gimp_procedure_new (brush_set_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-hardness");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-hardness",
+                                     "Sets the hardness of a generated brush.",
+                                     "This procedure sets the hardness for a generated brush. If called for any other type of brush, it does not succeed. The value should be a float between 0.0 and 1.0.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("hardness-in",
+                                                    "hardness in",
+                                                    "The desired brush hardness",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("hardness-out",
+                                                        "hardness out",
+                                                        "The brush hardness actually assigned",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-aspect-ratio
+   */
+  procedure = gimp_procedure_new (brush_get_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-aspect-ratio");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-aspect-ratio",
+                                     "Gets the aspect ratio of a generated brush.",
+                                     "This procedure gets the aspect ratio of a generated brush. If called for any other type of brush, it does not succeed. The return value is a float between 0.0 and 1000.0.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("aspect-ratio",
+                                                        "aspect ratio",
+                                                        "The aspect ratio of the brush.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-aspect-ratio
+   */
+  procedure = gimp_procedure_new (brush_set_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-aspect-ratio");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-aspect-ratio",
+                                     "Sets the aspect ratio of a generated brush.",
+                                     "This procedure sets the aspect ratio for a generated brush. If called for any other type of brush, it does not succeed. The value should be a float between 0.0 and 1000.0.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("aspect-ratio-in",
+                                                    "aspect ratio in",
+                                                    "The desired brush aspect ratio",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("aspect-ratio-out",
+                                                        "aspect ratio out",
+                                                        "The brush aspect ratio actually assigned",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-get-angle
+   */
+  procedure = gimp_procedure_new (brush_get_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-get-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-get-angle",
+                                     "Gets the rotation angle of a generated brush.",
+                                     "This procedure gets the angle of rotation for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("angle",
+                                                        "angle",
+                                                        "The rotation angle of the brush in degree.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brush-set-angle
+   */
+  procedure = gimp_procedure_new (brush_set_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brush-set-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brush-set-angle",
+                                     "Sets the rotation angle of a generated brush.",
+                                     "This procedure sets the rotation angle for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle-in",
+                                                    "angle in",
+                                                    "The desired brush rotation angle in degree",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("angle-out",
+                                                        "angle out",
+                                                        "The brush rotation angle actually assigned",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c
new file mode 100644
index 0000000..180bcbf
--- /dev/null
+++ b/app/pdb/brush-select-cmds.c
@@ -0,0 +1,285 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+brushes_popup_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *brush_callback;
+  const gchar *popup_title;
+  const gchar *initial_brush;
+  gdouble opacity;
+  gint32 spacing;
+  gint32 paint_mode;
+
+  brush_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  popup_title = g_value_get_string (gimp_value_array_index (args, 1));
+  initial_brush = g_value_get_string (gimp_value_array_index (args, 2));
+  opacity = g_value_get_double (gimp_value_array_index (args, 3));
+  spacing = g_value_get_int (gimp_value_array_index (args, 4));
+  paint_mode = g_value_get_enum (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
+          ! gimp_pdb_dialog_new (gimp, context, progress,
+                                 gimp_data_factory_get_container (gimp->brush_factory),
+                                 popup_title, brush_callback, initial_brush,
+                                 "opacity",    opacity / 100.0,
+                                 "paint-mode", paint_mode,
+                                 "spacing",    spacing,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+brushes_close_popup_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *brush_callback;
+
+  brush_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
+          ! gimp_pdb_dialog_close (gimp, gimp_data_factory_get_container (gimp->brush_factory),
+                                   brush_callback))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+brushes_set_popup_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *brush_callback;
+  const gchar *brush_name;
+  gdouble opacity;
+  gint32 spacing;
+  gint32 paint_mode;
+
+  brush_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  brush_name = g_value_get_string (gimp_value_array_index (args, 1));
+  opacity = g_value_get_double (gimp_value_array_index (args, 2));
+  spacing = g_value_get_int (gimp_value_array_index (args, 3));
+  paint_mode = g_value_get_enum (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
+          ! gimp_pdb_dialog_set (gimp, gimp_data_factory_get_container (gimp->brush_factory),
+                                 brush_callback, brush_name,
+                                 "opacity",    opacity / 100.0,
+                                 "paint-mode", paint_mode,
+                                 "spacing",    spacing,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_brush_select_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-brushes-popup
+   */
+  procedure = gimp_procedure_new (brushes_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-popup",
+                                     "Invokes the Gimp brush selection.",
+                                     "This procedure opens the brush selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("brush-callback",
+                                                       "brush callback",
+                                                       "The callback PDB proc to call when brush selection is made",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("popup-title",
+                                                       "popup title",
+                                                       "Title of the brush selection dialog",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("initial-brush",
+                                                       "initial brush",
+                                                       "The name of the brush to set as the first selected",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The initial opacity of the brush",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spacing",
+                                                      "spacing",
+                                                      "The initial spacing of the brush (if < 0 then use brush default spacing)",
+                                                      G_MININT32, 1000, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("paint-mode",
+                                                  "paint mode",
+                                                  "The initial paint mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-close-popup
+   */
+  procedure = gimp_procedure_new (brushes_close_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-close-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-close-popup",
+                                     "Close the brush selection dialog.",
+                                     "This procedure closes an opened brush selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("brush-callback",
+                                                       "brush callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-set-popup
+   */
+  procedure = gimp_procedure_new (brushes_set_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-set-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-set-popup",
+                                     "Sets the current brush in a brush selection dialog.",
+                                     "Sets the current brush in a brush selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("brush-callback",
+                                                       "brush callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("brush-name",
+                                                       "brush name",
+                                                       "The name of the brush to set as selected",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The initial opacity of the brush",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spacing",
+                                                      "spacing",
+                                                      "The initial spacing of the brush (if < 0 then use brush default spacing)",
+                                                      G_MININT32, 1000, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("paint-mode",
+                                                  "paint mode",
+                                                  "The initial paint mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c
new file mode 100644
index 0000000..c6444c0
--- /dev/null
+++ b/app/pdb/brushes-cmds.c
@@ -0,0 +1,470 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+brushes_refresh_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gimp_data_factory_data_refresh (gimp->brush_factory, context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+brushes_get_list_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_brushes = 0;
+  gchar **brush_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      brush_list = gimp_container_get_filtered_name_array (gimp_data_factory_get_container (gimp->brush_factory),
+                                                           filter, &num_brushes);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_brushes);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), brush_list, num_brushes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brushes_get_brush_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 spacing = 0;
+
+  GimpBrush *brush = gimp_context_get_brush (context);
+
+  if (brush)
+    {
+      name    = g_strdup (gimp_object_get_name (brush));
+      width   = gimp_brush_get_width  (brush);
+      height  = gimp_brush_get_height (brush);
+      spacing = gimp_brush_get_spacing (brush);
+    }
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), spacing);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brushes_get_spacing_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 spacing = 0;
+
+  GimpBrush *brush = gimp_context_get_brush (context);
+
+  if (brush)
+    spacing = gimp_brush_get_spacing (brush);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), spacing);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+brushes_set_spacing_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 spacing;
+
+  spacing = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gimp_brush_set_spacing (gimp_context_get_brush (context), spacing);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+brushes_get_brush_data_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *actual_name = NULL;
+  gdouble opacity = 0.0;
+  gint32 spacing = 0;
+  gint32 paint_mode = 0;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 length = 0;
+  guint8 *mask_data = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush;
+
+      if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+      if (name && strlen (name))
+        brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
+      else
+        brush = gimp_context_get_brush (context);
+
+      if (brush)
+        {
+          GimpTempBuf *mask = gimp_brush_get_mask (brush);
+
+          actual_name = g_strdup (gimp_object_get_name (brush));
+          opacity     = 1.0;
+          spacing     = gimp_brush_get_spacing (brush);
+          paint_mode  = 0;
+          width       = gimp_brush_get_width  (brush);
+          height      = gimp_brush_get_height (brush);
+          length      = gimp_temp_buf_get_data_size (mask);
+          mask_data   = g_memdup (gimp_temp_buf_get_data (mask), length);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), opacity);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), spacing);
+      g_value_set_enum (gimp_value_array_index (return_vals, 4), paint_mode);
+      g_value_set_int (gimp_value_array_index (return_vals, 5), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 6), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 7), length);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 8), mask_data, length);
+    }
+
+  return return_vals;
+}
+
+void
+register_brushes_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-brushes-refresh
+   */
+  procedure = gimp_procedure_new (brushes_refresh_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-refresh");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-refresh",
+                                     "Refresh current brushes. This function always succeeds.",
+                                     "This procedure retrieves all brushes currently in the user's brush path and updates the brush dialogs accordingly.",
+                                     "Seth Burgess",
+                                     "Seth Burgess",
+                                     "1997",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-get-list
+   */
+  procedure = gimp_procedure_new (brushes_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-get-list",
+                                     "Retrieve a complete listing of the available brushes.",
+                                     "This procedure returns a complete listing of available GIMP brushes. Each name returned can be used as input to the 'gimp-context-set-brush' procedure.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-brushes",
+                                                          "num brushes",
+                                                          "The number of brushes in the brush list",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("brush-list",
+                                                                 "brush list",
+                                                                 "The list of brush names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-get-brush
+   */
+  procedure = gimp_procedure_new (brushes_get_brush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-get-brush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-get-brush",
+                                     "Deprecated: Use 'gimp-context-get-brush' instead.",
+                                     "Deprecated: Use 'gimp-context-get-brush' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-context-get-brush");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The brush name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The brush width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The brush height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("spacing",
+                                                          "spacing",
+                                                          "The brush spacing",
+                                                          0, 1000, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-get-spacing
+   */
+  procedure = gimp_procedure_new (brushes_get_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-get-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-get-spacing",
+                                     "Deprecated: Use 'gimp-brush-get-spacing' instead.",
+                                     "Deprecated: Use 'gimp-brush-get-spacing' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-brush-get-spacing");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("spacing",
+                                                          "spacing",
+                                                          "The brush spacing",
+                                                          0, 1000, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-set-spacing
+   */
+  procedure = gimp_procedure_new (brushes_set_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-set-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-set-spacing",
+                                     "Deprecated: Use 'gimp-brush-set-spacing' instead.",
+                                     "Deprecated: Use 'gimp-brush-set-spacing' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-brush-set-spacing");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spacing",
+                                                      "spacing",
+                                                      "The brush spacing",
+                                                      0, 1000, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-brushes-get-brush-data
+   */
+  procedure = gimp_procedure_new (brushes_get_brush_data_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brushes-get-brush-data");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brushes-get-brush-data",
+                                     "Deprecated: Use 'gimp-brush-get-pixels' instead.",
+                                     "Deprecated: Use 'gimp-brush-get-pixels' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-brush-get-pixels");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The brush name (\"\" means current active brush)",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The brush name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("opacity",
+                                                        "opacity",
+                                                        "The brush opacity",
+                                                        0, 100, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("spacing",
+                                                          "spacing",
+                                                          "The brush spacing",
+                                                          0, 1000, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("paint-mode",
+                                                      "paint mode",
+                                                      "The paint mode",
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The brush width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The brush height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("length",
+                                                          "length",
+                                                          "Length of brush mask data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("mask-data",
+                                                               "mask data",
+                                                               "The brush mask data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/buffer-cmds.c b/app/pdb/buffer-cmds.c
new file mode 100644
index 0000000..23f5a8f
--- /dev/null
+++ b/app/pdb/buffer-cmds.c
@@ -0,0 +1,507 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpparamspecs.h"
+#include "gegl/gimp-babl-compat.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+buffers_get_list_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_buffers = 0;
+  gchar **buffer_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      buffer_list = gimp_container_get_filtered_name_array (gimp->named_buffers,
+                                                            filter, &num_buffers);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_buffers);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), buffer_list, num_buffers);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+buffer_rename_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *buffer_name;
+  const gchar *new_name;
+  gchar *real_name = NULL;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+  new_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        {
+          gimp_object_set_name (GIMP_OBJECT (buffer), new_name);
+          real_name = g_strdup (gimp_object_get_name (buffer));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), real_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+buffer_delete_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *buffer_name;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        success = gimp_container_remove (gimp->named_buffers, GIMP_OBJECT (buffer));
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+buffer_get_width_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *buffer_name;
+  gint32 width = 0;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        width = gimp_buffer_get_width (buffer);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+buffer_get_height_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *buffer_name;
+  gint32 height = 0;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        height = gimp_buffer_get_height (buffer);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), height);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+buffer_get_bytes_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *buffer_name;
+  gint32 bytes = 0;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        {
+          const Babl *format = gimp_buffer_get_format (buffer);
+
+          bytes = babl_format_get_bytes_per_pixel (format);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), bytes);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+buffer_get_image_type_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *buffer_name;
+  gint32 image_type = 0;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        image_type = gimp_babl_format_get_image_type (gimp_buffer_get_format (buffer));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), image_type);
+
+  return return_vals;
+}
+
+void
+register_buffer_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-buffers-get-list
+   */
+  procedure = gimp_procedure_new (buffers_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffers-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffers-get-list",
+                                     "Retrieve a complete listing of the available buffers.",
+                                     "This procedure returns a complete listing of available named buffers.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-buffers",
+                                                          "num buffers",
+                                                          "The number of buffers",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("buffer-list",
+                                                                 "buffer list",
+                                                                 "The list of buffer names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-buffer-rename
+   */
+  procedure = gimp_procedure_new (buffer_rename_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffer-rename");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffer-rename",
+                                     "Renames a named buffer.",
+                                     "This procedure renames a named buffer.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The buffer name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("new-name",
+                                                       "new name",
+                                                       "The buffer's new name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("real-name",
+                                                           "real name",
+                                                           "The real name given to the buffer",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-buffer-delete
+   */
+  procedure = gimp_procedure_new (buffer_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffer-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffer-delete",
+                                     "Deletes a named buffer.",
+                                     "This procedure deletes a named buffer.",
+                                     "David Gowers <neota@softhome.net>",
+                                     "David Gowers <neota@softhome.net>",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The buffer name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-buffer-get-width
+   */
+  procedure = gimp_procedure_new (buffer_get_width_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffer-get-width");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffer-get-width",
+                                     "Retrieves the specified buffer's width.",
+                                     "This procedure retrieves the specified named buffer's width.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The buffer name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The buffer width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-buffer-get-height
+   */
+  procedure = gimp_procedure_new (buffer_get_height_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffer-get-height");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffer-get-height",
+                                     "Retrieves the specified buffer's height.",
+                                     "This procedure retrieves the specified named buffer's height.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The buffer name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The buffer height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-buffer-get-bytes
+   */
+  procedure = gimp_procedure_new (buffer_get_bytes_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffer-get-bytes");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffer-get-bytes",
+                                     "Retrieves the specified buffer's bytes.",
+                                     "This procedure retrieves the specified named buffer's bytes.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The buffer name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bytes",
+                                                          "bytes",
+                                                          "The buffer bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-buffer-get-image-type
+   */
+  procedure = gimp_procedure_new (buffer_get_image_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-buffer-get-image-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-buffer-get-image-type",
+                                     "Retrieves the specified buffer's image type.",
+                                     "This procedure retrieves the specified named buffer's image type.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The buffer name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("image-type",
+                                                      "image type",
+                                                      "The buffer image type",
+                                                      GIMP_TYPE_IMAGE_BASE_TYPE,
+                                                      GIMP_RGB,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/channel-cmds.c b/app/pdb/channel-cmds.c
new file mode 100644
index 0000000..8d706b6
--- /dev/null
+++ b/app/pdb/channel-cmds.c
@@ -0,0 +1,736 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpchannel-combine.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+channel_new_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 width;
+  gint32 height;
+  const gchar *name;
+  gdouble opacity;
+  GimpRGB color;
+  GimpChannel *channel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  width = g_value_get_int (gimp_value_array_index (args, 1));
+  height = g_value_get_int (gimp_value_array_index (args, 2));
+  name = g_value_get_string (gimp_value_array_index (args, 3));
+  opacity = g_value_get_double (gimp_value_array_index (args, 4));
+  gimp_value_get_rgb (gimp_value_array_index (args, 5), &color);
+
+  if (success)
+    {
+      GimpRGB rgb_color = color;
+
+      rgb_color.a = opacity / 100.0;
+      channel = gimp_channel_new (image, width, height, name, &rgb_color);
+
+      if (! channel)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+channel_new_from_component_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 component;
+  const gchar *name;
+  GimpChannel *channel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  component = g_value_get_enum (gimp_value_array_index (args, 1));
+  name = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_image_get_component_format (image, component) != NULL)
+        channel = gimp_channel_new_from_component (image,
+                                                   component, name, NULL);
+
+      if (channel)
+        gimp_item_set_visible (GIMP_ITEM (channel), FALSE, FALSE);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+channel_copy_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpChannel *channel;
+  GimpChannel *channel_copy = NULL;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpImage *image  = gimp_item_get_image (GIMP_ITEM (channel));
+      gint       width  = gimp_image_get_width  (image);
+      gint       height = gimp_image_get_height (image);
+
+      if (gimp_item_get_width  (GIMP_ITEM (channel)) == width &&
+          gimp_item_get_height (GIMP_ITEM (channel)) == height)
+        {
+          channel_copy = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (channel),
+                                                            GIMP_TYPE_CHANNEL));
+
+          if (! channel_copy)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), channel_copy);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+channel_combine_masks_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpChannel *channel1;
+  GimpChannel *channel2;
+  gint32 operation;
+  gint32 offx;
+  gint32 offy;
+
+  channel1 = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+  channel2 = gimp_value_get_channel (gimp_value_array_index (args, 1), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 2));
+  offx = g_value_get_int (gimp_value_array_index (args, 3));
+  offy = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_item_is_attached (GIMP_ITEM (channel1)))
+        gimp_channel_push_undo (channel1, _("Combine Masks"));
+
+      gimp_channel_combine_mask (channel1, channel2, operation, offx, offy);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+channel_get_show_masked_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpChannel *channel;
+  gboolean show_masked = FALSE;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      show_masked = gimp_channel_get_show_masked (channel);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), show_masked);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+channel_set_show_masked_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpChannel *channel;
+  gboolean show_masked;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+  show_masked = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_channel_set_show_masked (channel, show_masked);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+channel_get_opacity_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpChannel *channel;
+  gdouble opacity = 0.0;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      opacity = gimp_channel_get_opacity (channel) * 100;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), opacity);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+channel_set_opacity_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpChannel *channel;
+  gdouble opacity;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+  opacity = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_channel_set_opacity (channel, opacity / 100.0, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+channel_get_color_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpChannel *channel;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_channel_get_color (channel, &color);
+      gimp_rgb_set_alpha (&color, 1.0);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &color);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+channel_set_color_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpChannel *channel;
+  GimpRGB color;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 1), &color);
+
+  if (success)
+    {
+      GimpRGB rgb_color = color;
+
+      rgb_color.a = channel->color.a;
+      gimp_channel_set_color (channel, &rgb_color, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_channel_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-channel-new
+   */
+  procedure = gimp_procedure_new (channel_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-new",
+                                     "Create a new channel.",
+                                     "This procedure creates a new channel with the specified width, height, name, opacity and color.\n"
+                                     "The new channel still needs to be added to the image, as this is not automatic. Add the new channel with 'gimp-image-insert-channel'. Other attributes, such as channel visibility, should be set with explicit procedure calls.\n"
+                                     "The channel's contents are undefined initially.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to which to add the channel",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "The channel width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "The channel height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The channel name",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The channel opacity",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The channel compositing color",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("channel",
+                                                               "channel",
+                                                               "The newly created channel",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-new-from-component
+   */
+  procedure = gimp_procedure_new (channel_new_from_component_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-new-from-component");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-new-from-component",
+                                     "Create a new channel from a color component",
+                                     "This procedure creates a new channel from a color component.\n"
+                                     "The new channel still needs to be added to the image, as this is not automatic. Add the new channel with 'gimp-image-insert-channel'. Other attributes, such as channel visibility, should be set with explicit procedure calls.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to which to add the channel",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("component",
+                                                  "component",
+                                                  "The image component",
+                                                  GIMP_TYPE_CHANNEL_TYPE,
+                                                  GIMP_CHANNEL_RED,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The channel name",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("channel",
+                                                               "channel",
+                                                               "The newly created channel",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-copy
+   */
+  procedure = gimp_procedure_new (channel_copy_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-copy");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-copy",
+                                     "Copy a channel.",
+                                     "This procedure copies the specified channel and returns the copy.\n"
+                                     "The new channel still needs to be added to the image, as this is not automatic. Add the new channel with 'gimp-image-insert-channel'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel to copy",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("channel-copy",
+                                                               "channel copy",
+                                                               "The newly copied channel",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-combine-masks
+   */
+  procedure = gimp_procedure_new (channel_combine_masks_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-combine-masks");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-combine-masks",
+                                     "Combine two channel masks.",
+                                     "This procedure combines two channel masks. The result is stored in the first channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel1",
+                                                           "channel1",
+                                                           "The channel1",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel2",
+                                                           "channel2",
+                                                           "The channel2",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "x offset between upper left corner of channels: (second - first)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "y offset between upper left corner of channels: (second - first)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-get-show-masked
+   */
+  procedure = gimp_procedure_new (channel_get_show_masked_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-get-show-masked");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-get-show-masked",
+                                     "Get the composite method of the specified channel.",
+                                     "This procedure returns the specified channel's composite method. If it is TRUE, then the channel is composited with the image so that masked regions are shown. Otherwise, selected regions are shown.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("show-masked",
+                                                         "show masked",
+                                                         "The channel composite method",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-set-show-masked
+   */
+  procedure = gimp_procedure_new (channel_set_show_masked_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-set-show-masked");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-set-show-masked",
+                                     "Set the composite method of the specified channel.",
+                                     "This procedure sets the specified channel's composite method. If it is TRUE, then the channel is composited with the image so that masked regions are shown. Otherwise, selected regions are shown.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("show-masked",
+                                                     "show masked",
+                                                     "The new channel composite method",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-get-opacity
+   */
+  procedure = gimp_procedure_new (channel_get_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-get-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-get-opacity",
+                                     "Get the opacity of the specified channel.",
+                                     "This procedure returns the specified channel's opacity.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("opacity",
+                                                        "opacity",
+                                                        "The channel opacity",
+                                                        0, 100, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-set-opacity
+   */
+  procedure = gimp_procedure_new (channel_set_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-set-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-set-opacity",
+                                     "Set the opacity of the specified channel.",
+                                     "This procedure sets the specified channel's opacity.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The new channel opacity",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-get-color
+   */
+  procedure = gimp_procedure_new (channel_get_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-get-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-get-color",
+                                     "Get the compositing color of the specified channel.",
+                                     "This procedure returns the specified channel's compositing color.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The channel compositing color",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-channel-set-color
+   */
+  procedure = gimp_procedure_new (channel_set_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-channel-set-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-channel-set-color",
+                                     "Set the compositing color of the specified channel.",
+                                     "This procedure sets the specified channel's compositing color.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The new channel compositing color",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/color-cmds.c b/app/pdb/color-cmds.c
new file mode 100644
index 0000000..50949f7
--- /dev/null
+++ b/app/pdb/color-cmds.c
@@ -0,0 +1,1413 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable-equalize.h"
+#include "core/gimpdrawable-histogram.h"
+#include "core/gimpdrawable-levels.h"
+#include "core/gimpdrawable-operation.h"
+#include "core/gimpdrawable.h"
+#include "core/gimphistogram.h"
+#include "core/gimpparamspecs.h"
+#include "operations/gimpbrightnesscontrastconfig.h"
+#include "operations/gimpcolorbalanceconfig.h"
+#include "operations/gimpcurvesconfig.h"
+#include "operations/gimphuesaturationconfig.h"
+#include "operations/gimplevelsconfig.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+brightness_contrast_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 brightness;
+  gint32 contrast;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  brightness = g_value_get_int (gimp_value_array_index (args, 1));
+  contrast = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG,
+                                          "brightness", brightness / 127.0,
+                                          "contrast",   contrast   / 127.0,
+                                          NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Brightness-Contrast"),
+                                                 "gimp:brightness-contrast",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+levels_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gint32 low_input;
+  gint32 high_input;
+  gdouble gamma;
+  gint32 low_output;
+  gint32 high_output;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  low_input = g_value_get_int (gimp_value_array_index (args, 2));
+  high_input = g_value_get_int (gimp_value_array_index (args, 3));
+  gamma = g_value_get_double (gimp_value_array_index (args, 4));
+  low_output = g_value_get_int (gimp_value_array_index (args, 5));
+  high_output = g_value_get_int (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          channel != GIMP_HISTOGRAM_LUMINANCE &&
+          (gimp_drawable_has_alpha (drawable) || channel != GIMP_HISTOGRAM_ALPHA) &&
+          (! gimp_drawable_is_gray (drawable) ||
+           channel == GIMP_HISTOGRAM_VALUE || channel == GIMP_HISTOGRAM_ALPHA))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_LEVELS_CONFIG,
+                                          "channel", channel,
+                                          NULL);
+
+          g_object_set (config,
+                        "low-input",    low_input   / 255.0,
+                        "high-input",   high_input  / 255.0,
+                        "clamp-input",  TRUE,
+                        "gamma",        gamma,
+                        "low-output",   low_output  / 255.0,
+                        "high-output",  high_output / 255.0,
+                        "clamp-input",  TRUE,
+                        NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Levels"),
+                                                 "gimp:levels",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = TRUE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+levels_auto_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_levels_stretch (drawable, progress);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+levels_stretch_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_levels_stretch (drawable, progress);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+posterize_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 levels;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  levels = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:posterize",
+                                 "levels",    levels,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Posterize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+desaturate_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_drawable_is_rgb (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:desaturate",
+                                 "mode",      GIMP_DESATURATE_LIGHTNESS,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Desaturate"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+desaturate_full_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 desaturate_mode;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  desaturate_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_drawable_is_rgb (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:desaturate",
+                                 "mode",      desaturate_mode,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Desaturate"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+equalize_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean mask_only;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  mask_only = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                       GIMP_PDB_ITEM_CONTENT, error) ||
+          ! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        success = FALSE;
+
+      if (success)
+        gimp_drawable_equalize (drawable, mask_only);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+invert_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 _("Invert"),
+                                                 "gegl:invert-gamma",
+                                                 NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+curves_spline_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gint32 num_points;
+  const guint8 *control_pts;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  num_points = g_value_get_int (gimp_value_array_index (args, 2));
+  control_pts = gimp_value_get_int8array (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          ! (num_points & 1) &&
+          (gimp_drawable_has_alpha (drawable) || channel != GIMP_HISTOGRAM_ALPHA) &&
+          (! gimp_drawable_is_gray (drawable) ||
+           channel == GIMP_HISTOGRAM_VALUE || channel == GIMP_HISTOGRAM_ALPHA)  &&
+           channel != GIMP_HISTOGRAM_LUMINANCE)
+        {
+          GObject *config = gimp_curves_config_new_spline_cruft (channel,
+                                                                 control_pts,
+                                                                 num_points / 2);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Curves"),
+                                                 "gimp:curves",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+curves_explicit_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gint32 num_bytes;
+  const guint8 *curve;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  num_bytes = g_value_get_int (gimp_value_array_index (args, 2));
+  curve = gimp_value_get_int8array (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          (num_bytes == 256) &&
+          (gimp_drawable_has_alpha (drawable) || channel != GIMP_HISTOGRAM_ALPHA) &&
+          (! gimp_drawable_is_gray (drawable) ||
+           channel == GIMP_HISTOGRAM_VALUE || channel == GIMP_HISTOGRAM_ALPHA) &&
+           channel != GIMP_HISTOGRAM_LUMINANCE)
+        {
+          GObject *config = gimp_curves_config_new_explicit_cruft (channel,
+                                                                   curve,
+                                                                   num_bytes);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Curves"),
+                                                 "gimp:curves",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+color_balance_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 transfer_mode;
+  gboolean preserve_lum;
+  gdouble cyan_red;
+  gdouble magenta_green;
+  gdouble yellow_blue;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  transfer_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+  preserve_lum = g_value_get_boolean (gimp_value_array_index (args, 2));
+  cyan_red = g_value_get_double (gimp_value_array_index (args, 3));
+  magenta_green = g_value_get_double (gimp_value_array_index (args, 4));
+  yellow_blue = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error)  &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_COLOR_BALANCE_CONFIG,
+                                          "range",               transfer_mode,
+                                          "preserve-luminosity", preserve_lum,
+                                          NULL);
+
+          g_object_set (config,
+                        "cyan-red",      cyan_red      / 100.0,
+                        "magenta-green", magenta_green / 100.0,
+                        "yellow-blue",   yellow_blue   / 100.0,
+                        NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Color Balance"),
+                                                 "gimp:color-balance",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+colorize_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble hue;
+  gdouble saturation;
+  gdouble lightness;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  hue = g_value_get_double (gimp_value_array_index (args, 1));
+  saturation = g_value_get_double (gimp_value_array_index (args, 2));
+  lightness = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          ! gimp_drawable_is_gray (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:colorize",
+                                 "hue",        hue        / 360.0,
+                                 "saturation", saturation / 100.0,
+                                 "lightness",  lightness  / 100.0,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Colorize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+histogram_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gint32 start_range;
+  gint32 end_range;
+  gdouble mean = 0.0;
+  gdouble std_dev = 0.0;
+  gdouble median = 0.0;
+  gdouble pixels = 0.0;
+  gdouble count = 0.0;
+  gdouble percentile = 0.0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  start_range = g_value_get_int (gimp_value_array_index (args, 2));
+  end_range = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error) ||
+          (! gimp_drawable_has_alpha (drawable) &&
+           channel == GIMP_HISTOGRAM_ALPHA) ||
+          (gimp_drawable_is_gray (drawable) &&
+           channel != GIMP_HISTOGRAM_VALUE && channel != GIMP_HISTOGRAM_ALPHA))
+        success = FALSE;
+
+      if (success)
+        {
+          GimpHistogram *histogram;
+          gint           start = start_range;
+          gint           end   = end_range;
+          gboolean       precision_enabled;
+          gboolean       linear;
+          gint           n_bins;
+
+          precision_enabled =
+            gimp->plug_in_manager->current_plug_in &&
+            gimp_plug_in_precision_enabled (gimp->plug_in_manager->current_plug_in);
+
+          if (precision_enabled)
+            linear = gimp_drawable_get_linear (drawable);
+          else
+            linear = FALSE;
+
+          histogram = gimp_histogram_new (linear);
+          gimp_drawable_calculate_histogram (drawable, histogram, FALSE);
+
+          n_bins = gimp_histogram_n_bins (histogram);
+
+          if (n_bins != 256)
+            {
+              start = ROUND ((gdouble) start * (n_bins - 1) / 255);
+              end   = ROUND ((gdouble) end   * (n_bins - 1) / 255);
+            }
+
+          mean       = gimp_histogram_get_mean (histogram, channel,
+                                                 start, end);
+          std_dev    = gimp_histogram_get_std_dev (histogram, channel,
+                                                   start, end);
+          median     = gimp_histogram_get_median (histogram, channel,
+                                                  start, end);
+          pixels     = gimp_histogram_get_count (histogram, channel, 0, n_bins - 1);
+          count      = gimp_histogram_get_count (histogram, channel,
+                                                 start, end);
+          percentile = count / pixels;
+
+          g_object_unref (histogram);
+
+          if (n_bins == 256 || ! precision_enabled)
+            {
+              mean    *= 255;
+              std_dev *= 255;
+              median  *= 255;
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), mean);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), std_dev);
+      g_value_set_double (gimp_value_array_index (return_vals, 3), median);
+      g_value_set_double (gimp_value_array_index (return_vals, 4), pixels);
+      g_value_set_double (gimp_value_array_index (return_vals, 5), count);
+      g_value_set_double (gimp_value_array_index (return_vals, 6), percentile);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+hue_saturation_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 hue_range;
+  gdouble hue_offset;
+  gdouble lightness;
+  gdouble saturation;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  hue_range = g_value_get_enum (gimp_value_array_index (args, 1));
+  hue_offset = g_value_get_double (gimp_value_array_index (args, 2));
+  lightness = g_value_get_double (gimp_value_array_index (args, 3));
+  saturation = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_HUE_SATURATION_CONFIG,
+                                          "range", hue_range,
+                                          NULL);
+
+           g_object_set (config,
+                         "hue",        hue_offset / 180.0,
+                         "saturation", saturation / 100.0,
+                         "lightness",  lightness  / 100.0,
+                         NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 _("Hue-Saturation"),
+                                                 "gimp:hue-saturation",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+threshold_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 low_threshold;
+  gint32 high_threshold;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  low_threshold = g_value_get_int (gimp_value_array_index (args, 1));
+  high_threshold = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:threshold",
+                                 "low",       low_threshold  / 255.0,
+                                 "high",      high_threshold / 255.0,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Threshold"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_color_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-brightness-contrast
+   */
+  procedure = gimp_procedure_new (brightness_contrast_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-brightness-contrast");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-brightness-contrast",
+                                     "Deprecated: Use 'gimp-drawable-brightness-contrast' instead.",
+                                     "Deprecated: Use 'gimp-drawable-brightness-contrast' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-brightness-contrast");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("brightness",
+                                                      "brightness",
+                                                      "Brightness adjustment",
+                                                      -127, 127, -127,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("contrast",
+                                                      "contrast",
+                                                      "Contrast adjustment",
+                                                      -127, 127, -127,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-levels
+   */
+  procedure = gimp_procedure_new (levels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-levels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-levels",
+                                     "Deprecated: Use 'gimp-drawable-levels' instead.",
+                                     "Deprecated: Use 'gimp-drawable-levels' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-levels");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("low-input",
+                                                      "low input",
+                                                      "Intensity of lowest input",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("high-input",
+                                                      "high input",
+                                                      "Intensity of highest input",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gamma",
+                                                    "gamma",
+                                                    "Gamma adjustment factor",
+                                                    0.1, 10, 0.1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("low-output",
+                                                      "low output",
+                                                      "Intensity of lowest output",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("high-output",
+                                                      "high output",
+                                                      "Intensity of highest output",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-levels-auto
+   */
+  procedure = gimp_procedure_new (levels_auto_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-levels-auto");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-levels-auto",
+                                     "Deprecated: Use 'gimp-drawable-levels-stretch' instead.",
+                                     "Deprecated: Use 'gimp-drawable-levels-stretch' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-levels-stretch");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-levels-stretch
+   */
+  procedure = gimp_procedure_new (levels_stretch_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-levels-stretch");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-levels-stretch",
+                                     "Deprecated: Use 'gimp-drawable-levels-stretch' instead.",
+                                     "Deprecated: Use 'gimp-drawable-levels-stretch' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-levels-stretch");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-posterize
+   */
+  procedure = gimp_procedure_new (posterize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-posterize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-posterize",
+                                     "Deprecated: Use 'gimp-drawable-posterize' instead.",
+                                     "Deprecated: Use 'gimp-drawable-posterize' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-posterize");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("levels",
+                                                      "levels",
+                                                      "Levels of posterization",
+                                                      2, 255, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-desaturate
+   */
+  procedure = gimp_procedure_new (desaturate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-desaturate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-desaturate",
+                                     "Deprecated: Use 'gimp-drawable-desaturate' instead.",
+                                     "Deprecated: Use 'gimp-drawable-desaturate' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-desaturate");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-desaturate-full
+   */
+  procedure = gimp_procedure_new (desaturate_full_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-desaturate-full");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-desaturate-full",
+                                     "Deprecated: Use 'gimp-drawable-desaturate' instead.",
+                                     "Deprecated: Use 'gimp-drawable-desaturate' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-desaturate");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("desaturate-mode",
+                                                  "desaturate mode",
+                                                  "The formula to use to desaturate",
+                                                  GIMP_TYPE_DESATURATE_MODE,
+                                                  GIMP_DESATURATE_LIGHTNESS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-equalize
+   */
+  procedure = gimp_procedure_new (equalize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-equalize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-equalize",
+                                     "Deprecated: Use 'gimp-drawable-equalize' instead.",
+                                     "Deprecated: Use 'gimp-drawable-equalize' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-equalize");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("mask-only",
+                                                     "mask only",
+                                                     "Equalization option",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-invert
+   */
+  procedure = gimp_procedure_new (invert_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-invert");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-invert",
+                                     "Deprecated: Use 'gimp-drawable-invert' instead.",
+                                     "Deprecated: Use 'gimp-drawable-invert' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-invert");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-curves-spline
+   */
+  procedure = gimp_procedure_new (curves_spline_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-curves-spline");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-curves-spline",
+                                     "Deprecated: Use 'gimp-drawable-curves-spline' instead.",
+                                     "Deprecated: Use 'gimp-drawable-curves-spline' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-curves-spline");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-points",
+                                                      "num points",
+                                                      "The number of values in the control point array",
+                                                      4, 34, 4,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("control-pts",
+                                                           "control pts",
+                                                           "The spline control points: { cp1.x, cp1.y, cp2.x, cp2.y, ... }",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-curves-explicit
+   */
+  procedure = gimp_procedure_new (curves_explicit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-curves-explicit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-curves-explicit",
+                                     "Deprecated: Use 'gimp-drawable-curves-explicit' instead.",
+                                     "Deprecated: Use 'gimp-drawable-curves-explicit' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-curves-explicit");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-bytes",
+                                                      "num bytes",
+                                                      "The number of bytes in the new curve (always 256)",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("curve",
+                                                           "curve",
+                                                           "The explicit curve",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-color-balance
+   */
+  procedure = gimp_procedure_new (color_balance_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-color-balance");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-color-balance",
+                                     "Modify the color balance of the specified drawable.",
+                                     "Modify the color balance of the specified drawable. There are three axis which can be modified: cyan-red, magenta-green, and yellow-blue. Negative values increase the amount of the former, positive values increase the amount of the latter. Color balance can be controlled with the 'transfer_mode' setting, which allows shadows, mid-tones, and highlights in an image to be affected differently. The 'preserve-lum' parameter, if TRUE, ensures that the luminosity of each pixel remains fixed.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-color-color-balance' instead.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     "gimp-drawable-color-color-balance");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transfer-mode",
+                                                  "transfer mode",
+                                                  "Transfer mode",
+                                                  GIMP_TYPE_TRANSFER_MODE,
+                                                  GIMP_TRANSFER_SHADOWS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("preserve-lum",
+                                                     "preserve lum",
+                                                     "Preserve luminosity values at each pixel",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("cyan-red",
+                                                    "cyan red",
+                                                    "Cyan-Red color balance",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("magenta-green",
+                                                    "magenta green",
+                                                    "Magenta-Green color balance",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("yellow-blue",
+                                                    "yellow blue",
+                                                    "Yellow-Blue color balance",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-colorize
+   */
+  procedure = gimp_procedure_new (colorize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-colorize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-colorize",
+                                     "Deprecated: Use 'gimp-drawable-colorize-hsl' instead.",
+                                     "Deprecated: Use 'gimp-drawable-colorize-hsl' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-colorize-hsl");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("hue",
+                                                    "hue",
+                                                    "Hue in degrees",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("saturation",
+                                                    "saturation",
+                                                    "Saturation in percent",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lightness",
+                                                    "lightness",
+                                                    "Lightness in percent",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-histogram
+   */
+  procedure = gimp_procedure_new (histogram_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-histogram");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-histogram",
+                                     "Deprecated: Use 'gimp-drawable-histogram' instead.",
+                                     "Deprecated: Use 'gimp-drawable-histogram' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-histogram");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-range",
+                                                      "start range",
+                                                      "Start of the intensity measurement range",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-range",
+                                                      "end range",
+                                                      "End of the intensity measurement range",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("mean",
+                                                        "mean",
+                                                        "Mean intensity value",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("std-dev",
+                                                        "std dev",
+                                                        "Standard deviation of intensity values",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("median",
+                                                        "median",
+                                                        "Median intensity value",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("pixels",
+                                                        "pixels",
+                                                        "Alpha-weighted pixel count for entire image",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("count",
+                                                        "count",
+                                                        "Alpha-weighted pixel count for range",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("percentile",
+                                                        "percentile",
+                                                        "Percentile that range falls under",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-hue-saturation
+   */
+  procedure = gimp_procedure_new (hue_saturation_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-hue-saturation");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-hue-saturation",
+                                     "Deprecated: Use 'gimp-drawable-hue-saturation' instead.",
+                                     "Deprecated: Use 'gimp-drawable-hue-saturation' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-hue-saturation");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("hue-range",
+                                                  "hue range",
+                                                  "Range of affected hues",
+                                                  GIMP_TYPE_HUE_RANGE,
+                                                  GIMP_HUE_RANGE_ALL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("hue-offset",
+                                                    "hue offset",
+                                                    "Hue offset in degrees",
+                                                    -180, 180, -180,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lightness",
+                                                    "lightness",
+                                                    "Lightness modification",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("saturation",
+                                                    "saturation",
+                                                    "Saturation modification",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-threshold
+   */
+  procedure = gimp_procedure_new (threshold_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-threshold");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-threshold",
+                                     "Deprecated: Use 'gimp-drawable-threshold' instead.",
+                                     "Deprecated: Use 'gimp-drawable-threshold' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-threshold");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("low-threshold",
+                                                      "low threshold",
+                                                      "The low threshold value",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("high-threshold",
+                                                      "high threshold",
+                                                      "The high threshold value",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
new file mode 100644
index 0000000..1d36703
--- /dev/null
+++ b/app/pdb/context-cmds.c
@@ -0,0 +1,5752 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp-gradients.h"
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdashpattern.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpstrokeoptions.h"
+#include "paint/gimppaintoptions.h"
+#include "plug-in/gimpplugin-context.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+context_push_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in && plug_in->open)
+    success = gimp_plug_in_context_push (plug_in);
+  else
+    success = FALSE;
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_pop_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in && plug_in->open)
+    success = gimp_plug_in_context_pop (plug_in);
+  else
+    success = FALSE;
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_set_defaults_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+    gimp_config_reset (GIMP_CONFIG (context));
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_list_paint_methods_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 num_paint_methods = 0;
+  gchar **paint_methods = NULL;
+
+  paint_methods = gimp_container_get_name_array (gimp->paint_info_list,
+                                                 &num_paint_methods);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_paint_methods);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), paint_methods, num_paint_methods);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_get_paint_method_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpPaintInfo *paint_info = gimp_context_get_paint_info (context);
+
+  if (paint_info)
+    name = g_strdup (gimp_object_get_name (paint_info));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_paint_method_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintInfo *paint_info = gimp_pdb_get_paint_info (gimp, name, error);
+
+      if (paint_info)
+        gimp_context_set_paint_info (context, paint_info);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_stroke_method_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 stroke_method = 0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "method", &stroke_method,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), stroke_method);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_stroke_method_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 stroke_method;
+
+  stroke_method = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "method", stroke_method,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_foreground_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpRGB foreground = { 0.0, 0.0, 0.0, 1.0 };
+
+  gimp_context_get_foreground (context, &foreground);
+  gimp_rgb_set_alpha (&foreground, 1.0);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &foreground);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_foreground_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpRGB foreground;
+
+  gimp_value_get_rgb (gimp_value_array_index (args, 0), &foreground);
+
+  if (success)
+    {
+      gimp_rgb_set_alpha (&foreground, 1.0);
+      gimp_context_set_foreground (context, &foreground);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_background_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpRGB background = { 0.0, 0.0, 0.0, 1.0 };
+
+  gimp_context_get_background (context, &background);
+  gimp_rgb_set_alpha (&background, 1.0);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &background);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_background_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpRGB background;
+
+  gimp_value_get_rgb (gimp_value_array_index (args, 0), &background);
+
+  if (success)
+    {
+      gimp_rgb_set_alpha (&background, 1.0);
+      gimp_context_set_background (context, &background);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_set_default_colors_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gimp_context_set_default_colors (context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_swap_colors_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gimp_context_swap_colors (context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_get_opacity_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble opacity = 0.0;
+
+  opacity = gimp_context_get_opacity (context) * 100.0;
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_double (gimp_value_array_index (return_vals, 1), opacity);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_opacity_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble opacity;
+
+  opacity = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gimp_context_set_opacity (context, opacity / 100.0);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_paint_mode_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 paint_mode = 0;
+
+  paint_mode = gimp_context_get_paint_mode (context);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), paint_mode);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_paint_mode_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 paint_mode;
+
+  paint_mode = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+      gimp_context_set_paint_mode (context, paint_mode);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_width_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble line_width = 0.0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "width", &line_width,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_double (gimp_value_array_index (return_vals, 1), line_width);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_width_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble line_width;
+
+  line_width = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "width", line_width,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_width_unit_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpUnit line_width_unit = 0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "unit", &line_width_unit,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), line_width_unit);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_width_unit_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpUnit line_width_unit;
+
+  line_width_unit = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "unit", line_width_unit,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_cap_style_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 cap_style = 0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "cap-style", &cap_style,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), cap_style);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_cap_style_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 cap_style;
+
+  cap_style = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "cap-style", cap_style,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_join_style_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 join_style = 0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "join-style", &join_style,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), join_style);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_join_style_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 join_style;
+
+  join_style = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "join-style", join_style,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_miter_limit_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble miter_limit = 0.0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "miter-limit", &miter_limit,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_double (gimp_value_array_index (return_vals, 1), miter_limit);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_miter_limit_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble miter_limit;
+
+  miter_limit = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "miter-limit", miter_limit,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_dash_offset_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble dash_offset = 0.0;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  g_object_get (options,
+                "dash-offset", &dash_offset,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_double (gimp_value_array_index (return_vals, 1), dash_offset);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_dash_offset_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble dash_offset;
+
+  dash_offset = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      g_object_set (options,
+                    "dash-offset", dash_offset,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_line_dash_pattern_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 num_dashes = 0;
+  gdouble *dashes = NULL;
+
+  GimpStrokeOptions *options =
+    gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+  GArray *pattern = gimp_stroke_options_get_dash_info (options);
+
+  dashes = gimp_dash_pattern_to_double_array (pattern, &num_dashes);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_dashes);
+  gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), dashes, num_dashes);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_line_dash_pattern_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 num_dashes;
+  const gdouble *dashes;
+
+  num_dashes = g_value_get_int (gimp_value_array_index (args, 0));
+  dashes = gimp_value_get_floatarray (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpStrokeOptions *options =
+        gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+      GArray *pattern = NULL;
+
+      if (num_dashes > 0)
+        {
+          pattern = gimp_dash_pattern_from_double_array (num_dashes, dashes);
+
+          if (! pattern)
+            success = FALSE;
+        }
+
+      if (success)
+        gimp_stroke_options_take_dash_pattern (options, GIMP_DASH_CUSTOM, pattern);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpBrush *brush = gimp_context_get_brush (context);
+
+  if (brush)
+    name = g_strdup (gimp_object_get_name (brush));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBrush *brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
+
+      if (brush)
+        gimp_context_set_brush (context, brush);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_size_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble size = 0.0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "brush-size", &size,
+                   NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), size);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_size_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble size;
+
+  size = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "brush-size", (gdouble) size,
+                       NULL);
+
+      g_list_free (options);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_set_brush_default_size_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpBrush *brush = gimp_context_get_brush (context);
+
+  if (brush)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        gimp_paint_options_set_default_brush_size (list->data, brush);
+
+      g_list_free (options);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_aspect_ratio_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble aspect = 0.0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "brush-aspect-ratio", &aspect,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), aspect);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_aspect_ratio_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble aspect;
+
+  aspect = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "brush-aspect-ratio", (gdouble) aspect,
+                       NULL);
+
+      g_list_free (options);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_angle_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble angle = 0.0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "brush-angle", &angle,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), angle);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_angle_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble angle;
+
+  angle = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "brush-angle", (gdouble) angle,
+                       NULL);
+
+      g_list_free (options);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_spacing_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble spacing = 0.0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "brush-spacing", &spacing,
+                   NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), spacing);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_spacing_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble spacing;
+
+  spacing = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "brush-spacing", (gdouble) spacing,
+                       NULL);
+
+      g_list_free (options);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_set_brush_default_spacing_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpBrush *brush = gimp_context_get_brush (context);
+
+  if (brush)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        gimp_paint_options_set_default_brush_spacing (list->data, brush);
+
+      g_list_free (options);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_hardness_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble hardness = 0.0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "brush-hardness", &hardness,
+                   NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), hardness);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_hardness_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble hardness;
+
+  hardness = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "brush-hardness", (gdouble) hardness,
+                       NULL);
+
+      g_list_free (options);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_set_brush_default_hardness_invoker (GimpProcedure         *procedure,
+                                            Gimp                  *gimp,
+                                            GimpContext           *context,
+                                            GimpProgress          *progress,
+                                            const GimpValueArray  *args,
+                                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpBrush *brush = gimp_context_get_brush (context);
+
+  if (brush)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        gimp_paint_options_set_default_brush_hardness (list->data, brush);
+
+      g_list_free (options);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_brush_force_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble force = 0.0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "brush-force", &force,
+                   NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), force);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_brush_force_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble force;
+
+  force = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GList *options;
+      GList *list;
+
+      options = gimp_pdb_context_get_brush_options (GIMP_PDB_CONTEXT (context));
+
+      for (list = options; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "brush-force", (gdouble) force,
+                       NULL);
+
+      g_list_free (options);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_dynamics_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpDynamics *dynamics = gimp_context_get_dynamics (context);
+
+  if (dynamics)
+    name = g_strdup (gimp_object_get_name (dynamics));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_dynamics_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpDynamics *dynamics = gimp_pdb_get_dynamics (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (dynamics)
+        gimp_context_set_dynamics (context, dynamics);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_mypaint_brush_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpMybrush *brush = gimp_context_get_mybrush (context);
+
+  if (brush)
+    name = g_strdup (gimp_object_get_name (brush));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_mypaint_brush_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpMybrush *brush = gimp_pdb_get_mybrush (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (brush)
+        gimp_context_set_mybrush (context, brush);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_pattern_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpPattern *pattern = gimp_context_get_pattern (context);
+
+  if (pattern)
+    name = g_strdup (gimp_object_get_name (pattern));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_pattern_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPattern *pattern = gimp_pdb_get_pattern (gimp, name, error);
+
+      if (pattern)
+        gimp_context_set_pattern (context, pattern);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_gradient_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpGradient *gradient = gimp_context_get_gradient (context);
+
+  if (gradient)
+    name = g_strdup (gimp_object_get_name (gradient));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_gradient_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, FALSE, error);
+
+      if (gradient)
+        gimp_context_set_gradient (context, gradient);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_set_gradient_fg_bg_rgb_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gimp_context_set_gradient (context,
+                             gimp_gradients_get_fg_bg_rgb (gimp));
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_set_gradient_fg_bg_hsv_cw_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gimp_context_set_gradient (context,
+                             gimp_gradients_get_fg_bg_hsv_cw (gimp));
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_set_gradient_fg_bg_hsv_ccw_invoker (GimpProcedure         *procedure,
+                                            Gimp                  *gimp,
+                                            GimpContext           *context,
+                                            GimpProgress          *progress,
+                                            const GimpValueArray  *args,
+                                            GError               **error)
+{
+  gimp_context_set_gradient (context,
+                             gimp_gradients_get_fg_bg_hsv_ccw (gimp));
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_set_gradient_fg_transparent_invoker (GimpProcedure         *procedure,
+                                             Gimp                  *gimp,
+                                             GimpContext           *context,
+                                             GimpProgress          *progress,
+                                             const GimpValueArray  *args,
+                                             GError               **error)
+{
+  gimp_context_set_gradient (context,
+                             gimp_gradients_get_fg_transparent (gimp));
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+context_get_gradient_blend_color_space_invoker (GimpProcedure         *procedure,
+                                                Gimp                  *gimp,
+                                                GimpContext           *context,
+                                                GimpProgress          *progress,
+                                                const GimpValueArray  *args,
+                                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 blend_color_space = 0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "gradient-blend-color-space", &blend_color_space,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), blend_color_space);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_gradient_blend_color_space_invoker (GimpProcedure         *procedure,
+                                                Gimp                  *gimp,
+                                                GimpContext           *context,
+                                                GimpProgress          *progress,
+                                                const GimpValueArray  *args,
+                                                GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 blend_color_space;
+
+  blend_color_space = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpContainer *options;
+      GList         *list;
+
+      options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context));
+
+      for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "gradient-blend-color-space", blend_color_space,
+                       NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_gradient_repeat_mode_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 repeat_mode = 0;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "gradient-repeat", &repeat_mode,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), repeat_mode);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_gradient_repeat_mode_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 repeat_mode;
+
+  repeat_mode = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpContainer *options;
+      GList         *list;
+
+      options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context));
+
+      for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "gradient-repeat", repeat_mode,
+                       NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_gradient_reverse_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gboolean reverse = FALSE;
+
+  /* all options should have the same value, so pick a random one */
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-paintbrush");
+
+  if (options)
+    g_object_get (options,
+                  "gradient-reverse", &reverse,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), reverse);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_gradient_reverse_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean reverse;
+
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpContainer *options;
+      GList         *list;
+
+      options = gimp_pdb_context_get_paint_options_list (GIMP_PDB_CONTEXT (context));
+
+      for (list = GIMP_LIST (options)->queue->head; list; list = g_list_next (list))
+        g_object_set (list->data,
+                      "gradient-reverse", reverse,
+                       NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_palette_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpPalette *palette = gimp_context_get_palette (context);
+
+  if (palette)
+    name = g_strdup (gimp_object_get_name (palette));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_palette_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, FALSE, error);
+
+      if (palette)
+        gimp_context_set_palette (context, palette);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_font_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+
+  GimpFont *font = gimp_context_get_font (context);
+
+  if (font)
+    name = g_strdup (gimp_object_get_name (font));
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_font_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpFont *font = gimp_pdb_get_font (gimp, name, error);
+
+      if (font)
+        gimp_context_set_font (context, font);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_antialias_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  GimpValueArray *return_vals;
+  gboolean antialias = FALSE;
+
+  g_object_get (context,
+                "antialias", &antialias,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), antialias);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_antialias_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean antialias;
+
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "antialias", antialias,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_feather_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  GimpValueArray *return_vals;
+  gboolean feather = FALSE;
+
+  g_object_get (context,
+                "feather", &feather,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), feather);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_feather_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean feather;
+
+  feather = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "feather", feather,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_feather_radius_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble feather_radius_x = 0.0;
+  gdouble feather_radius_y = 0.0;
+
+  g_object_get (context,
+                "feather-radius-x", &feather_radius_x,
+                "feather-radius-y", &feather_radius_y,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_double (gimp_value_array_index (return_vals, 1), feather_radius_x);
+  g_value_set_double (gimp_value_array_index (return_vals, 2), feather_radius_y);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_feather_radius_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble feather_radius_x;
+  gdouble feather_radius_y;
+
+  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 0));
+  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "feather-radius-x", feather_radius_x,
+                    "feather-radius-y", feather_radius_y,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_sample_merged_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  GimpValueArray *return_vals;
+  gboolean sample_merged = FALSE;
+
+  g_object_get (context,
+                "sample-merged", &sample_merged,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), sample_merged);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_sample_merged_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean sample_merged;
+
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "sample-merged", sample_merged,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_sample_criterion_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 sample_criterion = 0;
+
+  g_object_get (context,
+                "sample-criterion", &sample_criterion,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), sample_criterion);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_sample_criterion_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 sample_criterion;
+
+  sample_criterion = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "sample-criterion", sample_criterion,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_sample_threshold_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble sample_threshold = 0.0;
+
+  g_object_get (context,
+                "sample-threshold", &sample_threshold,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_double (gimp_value_array_index (return_vals, 1), sample_threshold);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_sample_threshold_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble sample_threshold;
+
+  sample_threshold = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "sample-threshold", sample_threshold,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_sample_threshold_int_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 sample_threshold = 0;
+
+  gdouble threshold;
+
+  g_object_get (context,
+                "sample-threshold", &threshold,
+                NULL);
+
+  sample_threshold = (gint) (threshold * 255.99);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), sample_threshold);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_sample_threshold_int_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 sample_threshold;
+
+  sample_threshold = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "sample-threshold", (gdouble) sample_threshold / 255.0,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_sample_transparent_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  GimpValueArray *return_vals;
+  gboolean sample_transparent = FALSE;
+
+  g_object_get (context,
+                "sample-transparent", &sample_transparent,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), sample_transparent);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_sample_transparent_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean sample_transparent;
+
+  sample_transparent = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "sample-transparent", sample_transparent,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_diagonal_neighbors_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  GimpValueArray *return_vals;
+  gboolean diagonal_neighbors = FALSE;
+
+  g_object_get (context,
+                "diagonal-neighbors", &diagonal_neighbors,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), diagonal_neighbors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_diagonal_neighbors_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean diagonal_neighbors;
+
+  diagonal_neighbors = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "diagonal-neighbors", diagonal_neighbors,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_distance_metric_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 metric = 0;
+
+  g_object_get (context,
+                "distance-metric", &metric,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), metric);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_distance_metric_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 metric;
+
+  metric = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "distance-metric", metric,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_interpolation_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 interpolation = 0;
+
+  g_object_get (context,
+                "interpolation", &interpolation,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), interpolation);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_interpolation_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 interpolation;
+
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "interpolation", interpolation,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_transform_direction_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 transform_direction = 0;
+
+  g_object_get (context,
+                "transform-direction", &transform_direction,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), transform_direction);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_transform_direction_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 transform_direction;
+
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "transform-direction", transform_direction,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_transform_resize_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 transform_resize = 0;
+
+  g_object_get (context,
+                "transform-resize", &transform_resize,
+                NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), transform_resize);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_transform_resize_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 transform_resize;
+
+  transform_resize = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      g_object_set (context,
+                    "transform-resize", transform_resize,
+                    NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_transform_recursion_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 transform_recursion = 0;
+
+  transform_recursion = 3;
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), transform_recursion);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_transform_recursion_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  if (success)
+    {
+    }
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_size_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble size = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "size", &size,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), size);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_size_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble size;
+
+  size = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "size", size,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_angle_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble angle = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "tilt-angle", &angle,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), angle);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_angle_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble angle;
+
+  angle = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "tilt-angle", angle,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_size_sensitivity_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble size = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "size-sensitivity", &size,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), size);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_size_sensitivity_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble size;
+
+  size = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "size-sensitivity", size,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_tilt_sensitivity_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble tilt = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "tilt-sensitivity", &tilt,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), tilt);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_tilt_sensitivity_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble tilt;
+
+  tilt = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "tilt-sensitivity", tilt,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_speed_sensitivity_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble speed = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "vel-sensitivity", &speed,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), speed);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_speed_sensitivity_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble speed;
+
+  speed = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "vel-sensitivity", speed,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_blob_type_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 type = 0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "blob-type", &type,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), type);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_blob_type_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 type;
+
+  type = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "blob-type", type,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_blob_aspect_ratio_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble aspect = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    g_object_get (options,
+                  "blob-aspect", &aspect,
+                  NULL);
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), aspect);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_blob_aspect_ratio_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble aspect;
+
+  aspect = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "blob-aspect", aspect,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+context_get_ink_blob_angle_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble angle = 0.0;
+
+  GimpPaintOptions *options =
+    gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                        "gimp-ink");
+
+  if (options)
+    {
+      g_object_get (options,
+                    "blob-angle", &angle,
+                    NULL);
+      angle *= (180-0 / G_PI);
+    }
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), angle);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+context_set_ink_blob_angle_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble angle;
+
+  angle = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-ink");
+
+      if (options)
+        g_object_set (options,
+                      "blob-angle", (gdouble) angle * G_PI / 180.0,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_context_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-context-push
+   */
+  procedure = gimp_procedure_new (context_push_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-push");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-push",
+                                     "Pushes a context to the top of the plug-in's context stack.",
+                                     "This procedure creates a new context by copying the current context. This copy becomes the new current context for the calling plug-in until it is popped again using 'gimp-context-pop'.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-pop
+   */
+  procedure = gimp_procedure_new (context_pop_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-pop");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-pop",
+                                     "Pops the topmost context from the plug-in's context stack.",
+                                     "This procedure removes the topmost context from the plug-in's context stack. The context that was active before the corresponding call to 'gimp-context-push' becomes the new current context of the plug-in.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-defaults
+   */
+  procedure = gimp_procedure_new (context_set_defaults_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-defaults");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-defaults",
+                                     "Reset context settings to their default values.",
+                                     "This procedure resets context settings used by various procedures to their default value. This procedure will usually be called after a context push so that a script which calls procedures affected by context settings will not be affected by changes in the global context.",
+                                     "Kevin Cozens <kcozens@svn.gnome.org>",
+                                     "Kevin Cozens",
+                                     "2011",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-list-paint-methods
+   */
+  procedure = gimp_procedure_new (context_list_paint_methods_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-list-paint-methods");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-list-paint-methods",
+                                     "Lists the available paint methods.",
+                                     "This procedure lists the names of the available paint methods. Any of the results can be used for 'gimp-context-set-paint-method'.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-paint-methods",
+                                                          "num paint methods",
+                                                          "The number of the available paint methods",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("paint-methods",
+                                                                 "paint methods",
+                                                                 "The names of the available paint methods",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-paint-method
+   */
+  procedure = gimp_procedure_new (context_get_paint_method_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-paint-method");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-paint-method",
+                                     "Retrieve the currently active paint method.",
+                                     "This procedure returns the name of the currently active paint method.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active paint method",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-paint-method
+   */
+  procedure = gimp_procedure_new (context_set_paint_method_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-paint-method");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-paint-method",
+                                     "Set the specified paint method as the active paint method.",
+                                     "This procedure allows the active paint method to be set by specifying its name. The name is simply a string which corresponds to one of the names of the available paint methods. If there is no matching method found, this procedure will return an error. Otherwise, the specified method becomes active and will be used in all subsequent paint operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the paint method",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-stroke-method
+   */
+  procedure = gimp_procedure_new (context_get_stroke_method_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-stroke-method");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-stroke-method",
+                                     "Retrieve the currently active stroke method.",
+                                     "This procedure returns the currently active stroke method.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("stroke-method",
+                                                      "stroke method",
+                                                      "The active stroke method",
+                                                      GIMP_TYPE_STROKE_METHOD,
+                                                      GIMP_STROKE_LINE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-stroke-method
+   */
+  procedure = gimp_procedure_new (context_set_stroke_method_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-stroke-method");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-stroke-method",
+                                     "Set the specified stroke method as the active stroke method.",
+                                     "This procedure set the specified stroke method as the active stroke method. The new method will be used in all subsequent stroke operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("stroke-method",
+                                                  "stroke method",
+                                                  "The new stroke method",
+                                                  GIMP_TYPE_STROKE_METHOD,
+                                                  GIMP_STROKE_LINE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-foreground
+   */
+  procedure = gimp_procedure_new (context_get_foreground_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-foreground");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-foreground",
+                                     "Get the current GIMP foreground color.",
+                                     "This procedure returns the current GIMP foreground color. The foreground color is used in a variety of tools such as paint tools, blending, and bucket fill.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("foreground",
+                                                        "foreground",
+                                                        "The foreground color",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-foreground
+   */
+  procedure = gimp_procedure_new (context_set_foreground_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-foreground");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-foreground",
+                                     "Set the current GIMP foreground color.",
+                                     "This procedure sets the current GIMP foreground color. After this is set, operations which use foreground such as paint tools, blending, and bucket fill will use the new value.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("foreground",
+                                                    "foreground",
+                                                    "The foreground color",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-background
+   */
+  procedure = gimp_procedure_new (context_get_background_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-background");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-background",
+                                     "Get the current GIMP background color.",
+                                     "This procedure returns the current GIMP background color. The background color is used in a variety of tools such as blending, erasing (with non-alpha images), and image filling.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("background",
+                                                        "background",
+                                                        "The background color",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-background
+   */
+  procedure = gimp_procedure_new (context_set_background_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-background");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-background",
+                                     "Set the current GIMP background color.",
+                                     "This procedure sets the current GIMP background color. After this is set, operations which use background such as blending, filling images, clearing, and erasing (in non-alpha images) will use the new value.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("background",
+                                                    "background",
+                                                    "The background color",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-default-colors
+   */
+  procedure = gimp_procedure_new (context_set_default_colors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-default-colors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-default-colors",
+                                     "Set the current GIMP foreground and background colors to black and white.",
+                                     "This procedure sets the current GIMP foreground and background colors to their initial default values, black and white.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-swap-colors
+   */
+  procedure = gimp_procedure_new (context_swap_colors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-swap-colors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-swap-colors",
+                                     "Swap the current GIMP foreground and background colors.",
+                                     "This procedure swaps the current GIMP foreground and background colors, so that the new foreground color becomes the old background color and vice versa.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-opacity
+   */
+  procedure = gimp_procedure_new (context_get_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-opacity",
+                                     "Get the opacity.",
+                                     "This procedure returns the opacity setting. The return value is a floating point number between 0 and 100.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("opacity",
+                                                        "opacity",
+                                                        "The opacity",
+                                                        0, 100, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-opacity
+   */
+  procedure = gimp_procedure_new (context_set_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-opacity",
+                                     "Set the opacity.",
+                                     "This procedure modifies the opacity setting. The value should be a floating point number between 0 and 100.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The opacity",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-paint-mode
+   */
+  procedure = gimp_procedure_new (context_get_paint_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-paint-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-paint-mode",
+                                     "Get the paint mode.",
+                                     "This procedure returns the paint-mode setting. The return value is an integer which corresponds to the values listed in the argument description.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("paint-mode",
+                                                      "paint mode",
+                                                      "The paint mode",
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-paint-mode
+   */
+  procedure = gimp_procedure_new (context_set_paint_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-paint-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-paint-mode",
+                                     "Set the paint mode.",
+                                     "This procedure modifies the paint_mode setting.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("paint-mode",
+                                                  "paint mode",
+                                                  "The paint mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-width
+   */
+  procedure = gimp_procedure_new (context_get_line_width_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-width");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-width",
+                                     "Get the line width setting.",
+                                     "This procedure returns the line width setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("line-width",
+                                                        "line width",
+                                                        "The line width setting",
+                                                        0.0, 2000.0, 0.0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-width
+   */
+  procedure = gimp_procedure_new (context_set_line_width_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-width");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-width",
+                                     "Set the line width setting.",
+                                     "This procedure modifies the line width setting for stroking lines.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("line-width",
+                                                    "line width",
+                                                    "The line width setting",
+                                                    0.0, 2000.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-width-unit
+   */
+  procedure = gimp_procedure_new (context_get_line_width_unit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-width-unit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-width-unit",
+                                     "Get the line width unit setting.",
+                                     "This procedure returns the line width unit setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_unit ("line-width-unit",
+                                                         "line width unit",
+                                                         "The line width unit setting",
+                                                         TRUE,
+                                                         FALSE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-width-unit
+   */
+  procedure = gimp_procedure_new (context_set_line_width_unit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-width-unit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-width-unit",
+                                     "Set the line width unit setting.",
+                                     "This procedure modifies the line width unit setting for stroking lines.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("line-width-unit",
+                                                     "line width unit",
+                                                     "The line width setting unit",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-cap-style
+   */
+  procedure = gimp_procedure_new (context_get_line_cap_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-cap-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-cap-style",
+                                     "Get the line cap style setting.",
+                                     "This procedure returns the line cap style setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("cap-style",
+                                                      "cap style",
+                                                      "The line cap style setting",
+                                                      GIMP_TYPE_CAP_STYLE,
+                                                      GIMP_CAP_BUTT,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-cap-style
+   */
+  procedure = gimp_procedure_new (context_set_line_cap_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-cap-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-cap-style",
+                                     "Set the line cap style setting.",
+                                     "This procedure modifies the line cap style setting for stroking lines.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("cap-style",
+                                                  "cap style",
+                                                  "The line cap style setting",
+                                                  GIMP_TYPE_CAP_STYLE,
+                                                  GIMP_CAP_BUTT,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-join-style
+   */
+  procedure = gimp_procedure_new (context_get_line_join_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-join-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-join-style",
+                                     "Get the line join style setting.",
+                                     "This procedure returns the line join style setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("join-style",
+                                                      "join style",
+                                                      "The line join style setting",
+                                                      GIMP_TYPE_JOIN_STYLE,
+                                                      GIMP_JOIN_MITER,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-join-style
+   */
+  procedure = gimp_procedure_new (context_set_line_join_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-join-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-join-style",
+                                     "Set the line join style setting.",
+                                     "This procedure modifies the line join style setting for stroking lines.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("join-style",
+                                                  "join style",
+                                                  "The line join style setting",
+                                                  GIMP_TYPE_JOIN_STYLE,
+                                                  GIMP_JOIN_MITER,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-miter-limit
+   */
+  procedure = gimp_procedure_new (context_get_line_miter_limit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-miter-limit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-miter-limit",
+                                     "Get the line miter limit setting.",
+                                     "This procedure returns the line miter limit setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("miter-limit",
+                                                        "miter limit",
+                                                        "The line miter limit setting",
+                                                        0.0, 100.0, 0.0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-miter-limit
+   */
+  procedure = gimp_procedure_new (context_set_line_miter_limit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-miter-limit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-miter-limit",
+                                     "Set the line miter limit setting.",
+                                     "This procedure modifies the line miter limit setting for stroking lines.\n"
+                                     "A mitered join is converted to a bevelled join if the miter would extend to a distance of more than (miter-limit * line-width) from the actual join point.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("miter-limit",
+                                                    "miter limit",
+                                                    "The line miter limit setting",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-dash-offset
+   */
+  procedure = gimp_procedure_new (context_get_line_dash_offset_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-dash-offset");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-dash-offset",
+                                     "Get the line dash offset setting.",
+                                     "This procedure returns the line dash offset setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("dash-offset",
+                                                        "dash offset",
+                                                        "The line dash offset setting",
+                                                        0.0, 2000.0, 0.0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-dash-offset
+   */
+  procedure = gimp_procedure_new (context_set_line_dash_offset_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-dash-offset");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-dash-offset",
+                                     "Set the line dash offset setting.",
+                                     "This procedure modifies the line dash offset setting for stroking lines.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dash-offset",
+                                                    "dash offset",
+                                                    "The line dash offset setting",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-line-dash-pattern
+   */
+  procedure = gimp_procedure_new (context_get_line_dash_pattern_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-line-dash-pattern");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-line-dash-pattern",
+                                     "Get the line dash pattern setting.",
+                                     "This procedure returns the line dash pattern setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-dashes",
+                                                          "num dashes",
+                                                          "The number of dashes in the dash_pattern array",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("dashes",
+                                                                "dashes",
+                                                                "The line dash pattern setting",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-line-dash-pattern
+   */
+  procedure = gimp_procedure_new (context_set_line_dash_pattern_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-line-dash-pattern");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-line-dash-pattern",
+                                     "Set the line dash pattern setting.",
+                                     "This procedure modifies the line dash pattern setting for stroking lines.\n"
+                                     "\n"
+                                     "The unit of the dash pattern segments is the actual line width used for the stroke operation, in other words a segment length of 1.0 results in a square segment shape (or gap shape).\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-stroke-selection-', 'gimp-drawable-edit-stroke-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-dashes",
+                                                      "num dashes",
+                                                      "The number of dashes in the dash_pattern array",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("dashes",
+                                                            "dashes",
+                                                            "The line dash pattern setting",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush
+   */
+  procedure = gimp_procedure_new (context_get_brush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush",
+                                     "Retrieve the currently active brush.",
+                                     "This procedure returns the name of the currently active brush. All paint operations and stroke operations use this brush to control the application of paint to the image.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active brush",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush
+   */
+  procedure = gimp_procedure_new (context_set_brush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush",
+                                     "Set the specified brush as the active brush.",
+                                     "This procedure allows the active brush to be set by specifying its name. The name is simply a string which corresponds to one of the names of the installed brushes. If there is no matching brush found, this procedure will return an error. Otherwise, the specified brush becomes active and will be used in all subsequent paint operations.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the brush",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush-size
+   */
+  procedure = gimp_procedure_new (context_get_brush_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush-size",
+                                     "Get brush size in pixels.",
+                                     "Get the brush size in pixels for brush based paint tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("size",
+                                                        "size",
+                                                        "Brush size in pixels",
+                                                        0, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-size
+   */
+  procedure = gimp_procedure_new (context_set_brush_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-size",
+                                     "Set brush size in pixels.",
+                                     "Set the brush size in pixels for brush based paint tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "Brush size in pixels",
+                                                    1, 10000, 1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-default-size
+   */
+  procedure = gimp_procedure_new (context_set_brush_default_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-default-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-default-size",
+                                     "Set brush size to its default.",
+                                     "Set the brush size to the default (max of width and height) for paintbrush, airbrush, or pencil tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush-aspect-ratio
+   */
+  procedure = gimp_procedure_new (context_get_brush_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush-aspect-ratio");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush-aspect-ratio",
+                                     "Get brush aspect ratio.",
+                                     "Set the aspect ratio for brush based paint tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("aspect",
+                                                        "aspect",
+                                                        "Aspect ratio",
+                                                        -20, 20, -20,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-aspect-ratio
+   */
+  procedure = gimp_procedure_new (context_set_brush_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-aspect-ratio");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-aspect-ratio",
+                                     "Set brush aspect ratio.",
+                                     "Set the aspect ratio for brush based paint tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("aspect",
+                                                    "aspect",
+                                                    "Aspect ratio",
+                                                    -20, 20, -20,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush-angle
+   */
+  procedure = gimp_procedure_new (context_get_brush_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush-angle",
+                                     "Get brush angle in degrees.",
+                                     "Set the angle in degrees for brush based paint tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("angle",
+                                                        "angle",
+                                                        "Angle in degrees",
+                                                        -180, 180, -180,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-angle
+   */
+  procedure = gimp_procedure_new (context_set_brush_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-angle",
+                                     "Set brush angle in degrees.",
+                                     "Set the angle in degrees for brush based paint tools.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "Angle in degrees",
+                                                    -180, 180, -180,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush-spacing
+   */
+  procedure = gimp_procedure_new (context_get_brush_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush-spacing",
+                                     "Get brush spacing as percent of size.",
+                                     "Get the brush spacing as percent of size for brush based paint tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("spacing",
+                                                        "spacing",
+                                                        "Brush spacing as fraction of size",
+                                                        0.01, 50.0, 0.01,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-spacing
+   */
+  procedure = gimp_procedure_new (context_set_brush_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-spacing",
+                                     "Set brush spacing as percent of size.",
+                                     "Set the brush spacing as percent of size for brush based paint tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("spacing",
+                                                    "spacing",
+                                                    "Brush spacing as fraction of size",
+                                                    0.01, 50.0, 0.01,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-default-spacing
+   */
+  procedure = gimp_procedure_new (context_set_brush_default_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-default-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-default-spacing",
+                                     "Set brush spacing to its default.",
+                                     "Set the brush spacing to the default for paintbrush, airbrush, or pencil tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush-hardness
+   */
+  procedure = gimp_procedure_new (context_get_brush_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush-hardness");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush-hardness",
+                                     "Get brush hardness in paint options.",
+                                     "Get the brush hardness for brush based paint tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("hardness",
+                                                        "hardness",
+                                                        "Brush hardness",
+                                                        0.0, 1.0, 0.0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-hardness
+   */
+  procedure = gimp_procedure_new (context_set_brush_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-hardness");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-hardness",
+                                     "Set brush hardness.",
+                                     "Set the brush hardness for brush based paint tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("hardness",
+                                                    "hardness",
+                                                    "Brush hardness",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-default-hardness
+   */
+  procedure = gimp_procedure_new (context_set_brush_default_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-default-hardness");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-default-hardness",
+                                     "Set brush spacing to its default.",
+                                     "Set the brush spacing to the default for paintbrush, airbrush, or pencil tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-brush-force
+   */
+  procedure = gimp_procedure_new (context_get_brush_force_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-brush-force");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-brush-force",
+                                     "Get brush force in paint options.",
+                                     "Get the brush application force for brush based paint tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("force",
+                                                        "force",
+                                                        "Brush application force",
+                                                        0.0, 1.0, 0.0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-brush-force
+   */
+  procedure = gimp_procedure_new (context_set_brush_force_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-brush-force");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-brush-force",
+                                     "Set brush application force.",
+                                     "Set the brush application force for brush based paint tools.",
+                                     "Alexia Death",
+                                     "Alexia Death",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("force",
+                                                    "force",
+                                                    "Brush application force",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-dynamics
+   */
+  procedure = gimp_procedure_new (context_get_dynamics_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-dynamics");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-dynamics",
+                                     "Retrieve the currently active paint dynamics.",
+                                     "This procedure returns the name of the currently active paint dynamics. All paint operations and stroke operations use this paint dynamics to control the application of paint to the image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active paint dynamics",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-dynamics
+   */
+  procedure = gimp_procedure_new (context_set_dynamics_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-dynamics");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-dynamics",
+                                     "Set the specified paint dynamics as the active paint dynamics.",
+                                     "This procedure allows the active paint dynamics to be set by specifying its name. The name is simply a string which corresponds to one of the names of the installed paint dynamics. If there is no matching paint dynamics found, this procedure will return an error. Otherwise, the specified paint dynamics becomes active and will be used in all subsequent paint operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the paint dynamics",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-mypaint-brush
+   */
+  procedure = gimp_procedure_new (context_get_mypaint_brush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-mypaint-brush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-mypaint-brush",
+                                     "Retrieve the currently active MyPaint brush.",
+                                     "This procedure returns the name of the currently active MyPaint brush.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active MyPaint brush",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-mypaint-brush
+   */
+  procedure = gimp_procedure_new (context_set_mypaint_brush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-mypaint-brush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-mypaint-brush",
+                                     "Set the specified MyPaint brush as the active MyPaint brush.",
+                                     "This procedure allows the active MyPaint brush to be set by specifying its name. The name is simply a string which corresponds to one of the names of the installed MyPaint brushes. If there is no matching MyPaint brush found, this procedure will return an error. Otherwise, the specified MyPaint brush becomes active and will be used in all subsequent MyPaint paint operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the MyPaint brush",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-pattern
+   */
+  procedure = gimp_procedure_new (context_get_pattern_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-pattern");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-pattern",
+                                     "Retrieve the currently active pattern.",
+                                     "This procedure returns name of the the currently active pattern. All clone and bucket-fill operations with patterns will use this pattern to control the application of paint to the image.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active pattern",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-pattern
+   */
+  procedure = gimp_procedure_new (context_set_pattern_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-pattern");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-pattern",
+                                     "Set the specified pattern as the active pattern.",
+                                     "This procedure allows the active pattern to be set by specifying its name. The name is simply a string which corresponds to one of the names of the installed patterns. If there is no matching pattern found, this procedure will return an error. Otherwise, the specified pattern becomes active and will be used in all subsequent paint operations.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the pattern",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-gradient
+   */
+  procedure = gimp_procedure_new (context_get_gradient_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-gradient");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-gradient",
+                                     "Retrieve the currently active gradient.",
+                                     "This procedure returns the name of the currently active gradient.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active gradient",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient
+   */
+  procedure = gimp_procedure_new (context_set_gradient_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient",
+                                     "Sets the specified gradient as the active gradient.",
+                                     "This procedure lets you set the specified gradient as the active or \"current\" one. The name is simply a string which corresponds to one of the loaded gradients. If no matching gradient is found, this procedure will return an error. Otherwise, the specified gradient will become active and will be used for subsequent custom gradient operations.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the gradient",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-fg-bg-rgb
+   */
+  procedure = gimp_procedure_new (context_set_gradient_fg_bg_rgb_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-fg-bg-rgb");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-fg-bg-rgb",
+                                     "Sets the built-in FG-BG RGB gradient as the active gradient.",
+                                     "This procedure sets the built-in FG-BG RGB gradient as the active gradient. The gradient will be used for subsequent gradient operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-fg-bg-hsv-cw
+   */
+  procedure = gimp_procedure_new (context_set_gradient_fg_bg_hsv_cw_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-fg-bg-hsv-cw");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-fg-bg-hsv-cw",
+                                     "Sets the built-in FG-BG HSV (cw) gradient as the active gradient.",
+                                     "This procedure sets the built-in FG-BG HSV (cw) gradient as the active gradient. The gradient will be used for subsequent gradient operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-fg-bg-hsv-ccw
+   */
+  procedure = gimp_procedure_new (context_set_gradient_fg_bg_hsv_ccw_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-fg-bg-hsv-ccw");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-fg-bg-hsv-ccw",
+                                     "Sets the built-in FG-BG HSV (ccw) gradient as the active gradient.",
+                                     "This procedure sets the built-in FG-BG HSV (ccw) gradient as the active gradient. The gradient will be used for subsequent gradient operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-fg-transparent
+   */
+  procedure = gimp_procedure_new (context_set_gradient_fg_transparent_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-fg-transparent");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-fg-transparent",
+                                     "Sets the built-in FG-Transparent gradient as the active gradient.",
+                                     "This procedure sets the built-in FG-Transparent gradient as the active gradient. The gradient will be used for subsequent gradient operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-gradient-blend-color-space
+   */
+  procedure = gimp_procedure_new (context_get_gradient_blend_color_space_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-gradient-blend-color-space");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-gradient-blend-color-space",
+                                     "Get the gradient blend color space.",
+                                     "Get the gradient blend color space for paint tools and the gradient tool.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("blend-color-space",
+                                                      "blend color space",
+                                                      "Color blend space",
+                                                      GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE,
+                                                      GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-blend-color-space
+   */
+  procedure = gimp_procedure_new (context_set_gradient_blend_color_space_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-blend-color-space");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-blend-color-space",
+                                     "Set the gradient blend color space.",
+                                     "Set the gradient blend color space for paint tools and the gradient tool.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("blend-color-space",
+                                                  "blend color space",
+                                                  "Blend color space",
+                                                  GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE,
+                                                  GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-gradient-repeat-mode
+   */
+  procedure = gimp_procedure_new (context_get_gradient_repeat_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-gradient-repeat-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-gradient-repeat-mode",
+                                     "Get the gradient repeat mode.",
+                                     "Get the gradient repeat mode for paint tools and the gradient tool.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("repeat-mode",
+                                                      "repeat mode",
+                                                      "Repeat mode",
+                                                      GIMP_TYPE_REPEAT_MODE,
+                                                      GIMP_REPEAT_NONE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-repeat-mode
+   */
+  procedure = gimp_procedure_new (context_set_gradient_repeat_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-repeat-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-repeat-mode",
+                                     "Set the gradient repeat mode.",
+                                     "Set the gradient repeat mode for paint tools and the gradient tool.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("repeat-mode",
+                                                  "repeat mode",
+                                                  "Repeat mode",
+                                                  GIMP_TYPE_REPEAT_MODE,
+                                                  GIMP_REPEAT_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-gradient-reverse
+   */
+  procedure = gimp_procedure_new (context_get_gradient_reverse_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-gradient-reverse");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-gradient-reverse",
+                                     "Get the gradient reverse setting.",
+                                     "Get the gradient reverse setting for paint tools and the gradient tool.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("reverse",
+                                                         "reverse",
+                                                         "Reverse",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-gradient-reverse
+   */
+  procedure = gimp_procedure_new (context_set_gradient_reverse_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-gradient-reverse");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-gradient-reverse",
+                                     "Set the gradient reverse setting.",
+                                     "Set the gradient reverse setting for paint tools and the gradient tool.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Reverse",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-palette
+   */
+  procedure = gimp_procedure_new (context_get_palette_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-palette");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-palette",
+                                     "Retrieve the currently active palette.",
+                                     "This procedure returns the name of the the currently active palette.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active palette",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-palette
+   */
+  procedure = gimp_procedure_new (context_set_palette_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-palette");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-palette",
+                                     "Set the specified palette as the active palette.",
+                                     "This procedure allows the active palette to be set by specifying its name. The name is simply a string which corresponds to one of the names of the installed palettes. If no matching palette is found, this procedure will return an error. Otherwise, the specified palette becomes active and will be used in all subsequent palette operations.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the palette",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-font
+   */
+  procedure = gimp_procedure_new (context_get_font_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-font");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-font",
+                                     "Retrieve the currently active font.",
+                                     "This procedure returns the name of the currently active font.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the active font",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-font
+   */
+  procedure = gimp_procedure_new (context_set_font_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-font");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-font",
+                                     "Set the specified font as the active font.",
+                                     "This procedure allows the active font to be set by specifying its name. The name is simply a string which corresponds to one of the names of the installed fonts. If no matching font is found, this procedure will return an error. Otherwise, the specified font becomes active and will be used in all subsequent font operations.",
+                                     "Michael Natterer <mitch@gimp.org> & Sven Neumann <sven@gimp.org>",
+                                     "Michael Natterer & Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the font",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-antialias
+   */
+  procedure = gimp_procedure_new (context_get_antialias_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-antialias");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-antialias",
+                                     "Get the antialias setting.",
+                                     "This procedure returns the antialias setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("antialias",
+                                                         "antialias",
+                                                         "The antialias setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-antialias
+   */
+  procedure = gimp_procedure_new (context_set_antialias_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-antialias");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-antialias",
+                                     "Set the antialias setting.",
+                                     "This procedure modifies the antialias setting. If antialiasing is turned on, the edges of selected region will contain intermediate values which give the appearance of a sharper, less pixelized edge. This should be set as TRUE most of the time unless a binary-only selection is wanted.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-image-select-round-rectangle', 'gimp-image-select-ellipse', 'gimp-image-select-polygon', 'gimp-image-select-item', 'gimp-drawable-edit-bucket-fill', 'gimp-drawable-edit-stroke-item', 'gimp-drawable-edit-stroke-selection'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "The antialias setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-feather
+   */
+  procedure = gimp_procedure_new (context_get_feather_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-feather");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-feather",
+                                     "Get the feather setting.",
+                                     "This procedure returns the feather setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("feather",
+                                                         "feather",
+                                                         "The feather setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-feather
+   */
+  procedure = gimp_procedure_new (context_set_feather_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-feather");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-feather",
+                                     "Set the feather setting.",
+                                     "This procedure modifies the feather setting. If the feather option is enabled, selections will be blurred before combining. The blur is a gaussian blur; its radii can be controlled using 'gimp-context-set-feather-radius'.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-image-select-rectangle', 'gimp-image-select-round-rectangle', 'gimp-image-select-ellipse', 'gimp-image-select-polygon', 'gimp-image-select-item'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "The feather setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-feather-radius
+   */
+  procedure = gimp_procedure_new (context_get_feather_radius_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-feather-radius");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-feather-radius",
+                                     "Get the feather radius setting.",
+                                     "This procedure returns the feather radius setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("feather-radius-x",
+                                                        "feather radius x",
+                                                        "The horizontal feather radius",
+                                                        0, 1000, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("feather-radius-y",
+                                                        "feather radius y",
+                                                        "The vertical feather radius",
+                                                        0, 1000, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-feather-radius
+   */
+  procedure = gimp_procedure_new (context_set_feather_radius_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-feather-radius");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-feather-radius",
+                                     "Set the feather radius setting.",
+                                     "This procedure modifies the feather radius setting.\n"
+                                     "\n"
+                                     "This setting affects all procedures that are affected by 'gimp-context-set-feather'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-x",
+                                                    "feather radius x",
+                                                    "The horizontal feather radius",
+                                                    0, 1000, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-y",
+                                                    "feather radius y",
+                                                    "The vertical feather radius",
+                                                    0, 1000, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-sample-merged
+   */
+  procedure = gimp_procedure_new (context_get_sample_merged_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-sample-merged");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-sample-merged",
+                                     "Get the sample merged setting.",
+                                     "This procedure returns the sample merged setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("sample-merged",
+                                                         "sample merged",
+                                                         "The sample merged setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-sample-merged
+   */
+  procedure = gimp_procedure_new (context_set_sample_merged_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-sample-merged");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-sample-merged",
+                                     "Set the sample merged setting.",
+                                     "This procedure modifies the sample merged setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls whether the pixel data from the specified drawable is used ('sample-merged' is FALSE), or the pixel data from the composite image ('sample-merged' is TRUE. This is equivalent to sampling for colors after merging all visible layers).\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "The sample merged setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-sample-criterion
+   */
+  procedure = gimp_procedure_new (context_get_sample_criterion_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-sample-criterion");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-sample-criterion",
+                                     "Get the sample criterion setting.",
+                                     "This procedure returns the sample criterion setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("sample-criterion",
+                                                      "sample criterion",
+                                                      "The sample criterion setting",
+                                                      GIMP_TYPE_SELECT_CRITERION,
+                                                      GIMP_SELECT_CRITERION_COMPOSITE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-sample-criterion
+   */
+  procedure = gimp_procedure_new (context_set_sample_criterion_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-sample-criterion");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-sample-criterion",
+                                     "Set the sample criterion setting.",
+                                     "This procedure modifies the sample criterion setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls how color similarity is determined. SELECT_CRITERION_COMPOSITE is the default value.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("sample-criterion",
+                                                  "sample criterion",
+                                                  "The sample criterion setting",
+                                                  GIMP_TYPE_SELECT_CRITERION,
+                                                  GIMP_SELECT_CRITERION_COMPOSITE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-sample-threshold
+   */
+  procedure = gimp_procedure_new (context_get_sample_threshold_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-sample-threshold");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-sample-threshold",
+                                     "Get the sample threshold setting.",
+                                     "This procedure returns the sample threshold setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("sample-threshold",
+                                                        "sample threshold",
+                                                        "The sample threshold setting",
+                                                        0.0, 1.0, 0.0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-sample-threshold
+   */
+  procedure = gimp_procedure_new (context_set_sample_threshold_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-sample-threshold");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-sample-threshold",
+                                     "Set the sample threshold setting.",
+                                     "This procedure modifies the sample threshold setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls what is \"sufficiently close\" to be considered a similar color. If the sample threshold has not been set explicitly, the default threshold set in gimprc will be used.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("sample-threshold",
+                                                    "sample threshold",
+                                                    "The sample threshold setting",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-sample-threshold-int
+   */
+  procedure = gimp_procedure_new (context_get_sample_threshold_int_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-sample-threshold-int");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-sample-threshold-int",
+                                     "Get the sample threshold setting as an integer value.",
+                                     "This procedure returns the sample threshold setting as an integer value. See 'gimp-context-get-sample-threshold'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("sample-threshold",
+                                                          "sample threshold",
+                                                          "The sample threshold setting",
+                                                          0, 255, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-sample-threshold-int
+   */
+  procedure = gimp_procedure_new (context_set_sample_threshold_int_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-sample-threshold-int");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-sample-threshold-int",
+                                     "Set the sample threshold setting as an integer value.",
+                                     "This procedure modifies the sample threshold setting as an integer value. See 'gimp-context-set-sample-threshold'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("sample-threshold",
+                                                      "sample threshold",
+                                                      "The sample threshold setting",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-sample-transparent
+   */
+  procedure = gimp_procedure_new (context_get_sample_transparent_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-sample-transparent");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-sample-transparent",
+                                     "Get the sample transparent setting.",
+                                     "This procedure returns the sample transparent setting.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("sample-transparent",
+                                                         "sample transparent",
+                                                         "The sample transparent setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-sample-transparent
+   */
+  procedure = gimp_procedure_new (context_set_sample_transparent_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-sample-transparent");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-sample-transparent",
+                                     "Set the sample transparent setting.",
+                                     "This procedure modifies the sample transparent setting. If an operation depends on the colors of the pixels present in a drawable, like when doing a seed fill, this setting controls whether transparency is considered to be a unique selectable color. When this setting is TRUE, transparent areas can be selected or filled.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-color', 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-transparent",
+                                                     "sample transparent",
+                                                     "The sample transparent setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-diagonal-neighbors
+   */
+  procedure = gimp_procedure_new (context_get_diagonal_neighbors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-diagonal-neighbors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-diagonal-neighbors",
+                                     "Get the diagonal neighbors setting.",
+                                     "This procedure returns the diagonal neighbors setting.",
+                                     "Ell",
+                                     "Ell",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("diagonal-neighbors",
+                                                         "diagonal neighbors",
+                                                         "The diagonal neighbors setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-diagonal-neighbors
+   */
+  procedure = gimp_procedure_new (context_set_diagonal_neighbors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-diagonal-neighbors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-diagonal-neighbors",
+                                     "Set the diagonal neighbors setting.",
+                                     "This procedure modifies the diagonal neighbors setting. If the affected region of an operation is based on a seed point, like when doing a seed fill, then, when this setting is TRUE, all eight neighbors of each pixel are considered when calculating the affected region; in contrast, when this setting is FALSE, only the four orthogonal neighbors of each pixel are considered.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-image-select-contiguous-color', 'gimp-drawable-edit-bucket-fill'.",
+                                     "Ell",
+                                     "Ell",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("diagonal-neighbors",
+                                                     "diagonal neighbors",
+                                                     "The diagonal neighbors setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-distance-metric
+   */
+  procedure = gimp_procedure_new (context_get_distance_metric_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-distance-metric");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-distance-metric",
+                                     "Get the distance metric used in some computations.",
+                                     "This procedure returns the distance metric in the current context. See 'gimp-context-set-distance-metric' to know more about its usage.",
+                                     "Jehan",
+                                     "Jehan",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("metric",
+                                                      "metric",
+                                                      "The distance metric",
+                                                      GEGL_TYPE_DISTANCE_METRIC,
+                                                      GEGL_DISTANCE_METRIC_EUCLIDEAN,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-distance-metric
+   */
+  procedure = gimp_procedure_new (context_set_distance_metric_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-distance-metric");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-distance-metric",
+                                     "Set the distance metric used in some computations.",
+                                     "This procedure modifies the distance metric used in some computations, such as 'gimp-drawable-edit-gradient-fill'. In particular, it does not change the metric used in generic distance computation on canvas, as in the Measure tool.\n"
+                                     "\n"
+                                     "This setting affects the following procedures: 'gimp-drawable-edit-gradient-fill'.",
+                                     "Jehan",
+                                     "Jehan",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("metric",
+                                                  "metric",
+                                                  "The distance metric",
+                                                  GEGL_TYPE_DISTANCE_METRIC,
+                                                  GEGL_DISTANCE_METRIC_EUCLIDEAN,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-interpolation
+   */
+  procedure = gimp_procedure_new (context_get_interpolation_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-interpolation");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-interpolation",
+                                     "Get the interpolation type.",
+                                     "This procedure returns the interpolation setting. The return value is an integer which corresponds to the values listed in the argument description. If the interpolation has not been set explicitly by 'gimp-context-set-interpolation', the default interpolation set in gimprc will be used.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("interpolation",
+                                                      "interpolation",
+                                                      "The interpolation type",
+                                                      GIMP_TYPE_INTERPOLATION_TYPE,
+                                                      GIMP_INTERPOLATION_NONE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-interpolation
+   */
+  procedure = gimp_procedure_new (context_set_interpolation_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-interpolation");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-interpolation",
+                                     "Set the interpolation type.",
+                                     "This procedure modifies the interpolation setting.\n"
+                                     "\n"
+                                     "This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix', 'gimp-image-scale', 'gimp-layer-scale'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "The interpolation type",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-transform-direction
+   */
+  procedure = gimp_procedure_new (context_get_transform_direction_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-transform-direction");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-transform-direction",
+                                     "Get the transform direction.",
+                                     "This procedure returns the transform direction. The return value is an integer which corresponds to the values listed in the argument description.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("transform-direction",
+                                                      "transform direction",
+                                                      "The transform direction",
+                                                      GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                      GIMP_TRANSFORM_FORWARD,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-transform-direction
+   */
+  procedure = gimp_procedure_new (context_set_transform_direction_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-transform-direction");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-transform-direction",
+                                     "Set the transform direction.",
+                                     "This procedure modifies the transform direction setting.\n"
+                                     "\n"
+                                     "This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "The transform direction",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-transform-resize
+   */
+  procedure = gimp_procedure_new (context_get_transform_resize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-transform-resize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-transform-resize",
+                                     "Get the transform resize type.",
+                                     "This procedure returns the transform resize setting. The return value is an integer which corresponds to the values listed in the argument description.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("transform-resize",
+                                                      "transform resize",
+                                                      "The transform resize type",
+                                                      GIMP_TYPE_TRANSFORM_RESIZE,
+                                                      GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-transform-resize
+   */
+  procedure = gimp_procedure_new (context_set_transform_resize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-transform-resize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-transform-resize",
+                                     "Set the transform resize type.",
+                                     "This procedure modifies the transform resize setting. When transforming pixels, if the result of a transform operation has a different size than the original area, this setting determines how the resulting area is sized.\n"
+                                     "\n"
+                                     "This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-flip-simple', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-rotate-simple', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-resize",
+                                                  "transform resize",
+                                                  "The transform resize type",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-transform-recursion
+   */
+  procedure = gimp_procedure_new (context_get_transform_recursion_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-transform-recursion");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-transform-recursion",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "",
+                                     "",
+                                     "",
+                                     "NONE");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("transform-recursion",
+                                                          "transform recursion",
+                                                          "This returns always 3 and is meaningless",
+                                                          1, G_MAXINT32, 1,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-transform-recursion
+   */
+  procedure = gimp_procedure_new (context_set_transform_recursion_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-transform-recursion");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-transform-recursion",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "",
+                                     "",
+                                     "",
+                                     "NONE");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("transform-recursion",
+                                                      "transform recursion",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-size
+   */
+  procedure = gimp_procedure_new (context_get_ink_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-size",
+                                     "Get ink blob size in pixels.",
+                                     "Get the ink blob size in pixels for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("size",
+                                                        "size",
+                                                        "ink blob size in pixels",
+                                                        0, 200, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-size
+   */
+  procedure = gimp_procedure_new (context_set_ink_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-size",
+                                     "Set ink blob size in pixels.",
+                                     "Set the ink blob size in pixels for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "ink blob size in pixels",
+                                                    0, 200, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-angle
+   */
+  procedure = gimp_procedure_new (context_get_ink_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-angle",
+                                     "Get ink angle in degrees.",
+                                     "Get the ink angle in degrees for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("angle",
+                                                        "angle",
+                                                        "ink angle in degrees",
+                                                        -90, 90, -90,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-angle
+   */
+  procedure = gimp_procedure_new (context_set_ink_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-angle",
+                                     "Set ink angle in degrees.",
+                                     "Set the ink angle in degrees for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "ink angle in degrees",
+                                                    -90, 90, -90,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-size-sensitivity
+   */
+  procedure = gimp_procedure_new (context_get_ink_size_sensitivity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-size-sensitivity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-size-sensitivity",
+                                     "Get ink size sensitivity.",
+                                     "Get the ink size sensitivity for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("size",
+                                                        "size",
+                                                        "ink size sensitivity",
+                                                        0, 1, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-size-sensitivity
+   */
+  procedure = gimp_procedure_new (context_set_ink_size_sensitivity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-size-sensitivity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-size-sensitivity",
+                                     "Set ink size sensitivity.",
+                                     "Set the ink size sensitivity for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "ink size sensitivity",
+                                                    0, 1, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-tilt-sensitivity
+   */
+  procedure = gimp_procedure_new (context_get_ink_tilt_sensitivity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-tilt-sensitivity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-tilt-sensitivity",
+                                     "Get ink tilt sensitivity.",
+                                     "Get the ink tilt sensitivity for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("tilt",
+                                                        "tilt",
+                                                        "ink tilt sensitivity",
+                                                        0, 1, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-tilt-sensitivity
+   */
+  procedure = gimp_procedure_new (context_set_ink_tilt_sensitivity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-tilt-sensitivity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-tilt-sensitivity",
+                                     "Set ink tilt sensitivity.",
+                                     "Set the ink tilt sensitivity for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tilt",
+                                                    "tilt",
+                                                    "ink tilt sensitivity",
+                                                    0, 1, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-speed-sensitivity
+   */
+  procedure = gimp_procedure_new (context_get_ink_speed_sensitivity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-speed-sensitivity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-speed-sensitivity",
+                                     "Get ink speed sensitivity.",
+                                     "Get the ink speed sensitivity for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("speed",
+                                                        "speed",
+                                                        "ink speed sensitivity",
+                                                        0, 1, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-speed-sensitivity
+   */
+  procedure = gimp_procedure_new (context_set_ink_speed_sensitivity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-speed-sensitivity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-speed-sensitivity",
+                                     "Set ink speed sensitivity.",
+                                     "Set the ink speed sensitivity for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("speed",
+                                                    "speed",
+                                                    "ink speed sensitivity",
+                                                    0, 1, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-blob-type
+   */
+  procedure = gimp_procedure_new (context_get_ink_blob_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-blob-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-blob-type",
+                                     "Get ink blob type.",
+                                     "Get the ink blob type for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("type",
+                                                      "type",
+                                                      "Ink blob type",
+                                                      GIMP_TYPE_INK_BLOB_TYPE,
+                                                      GIMP_INK_BLOB_TYPE_CIRCLE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-blob-type
+   */
+  procedure = gimp_procedure_new (context_set_ink_blob_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-blob-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-blob-type",
+                                     "Set ink blob type.",
+                                     "Set the ink blob type for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("type",
+                                                  "type",
+                                                  "Ink blob type",
+                                                  GIMP_TYPE_INK_BLOB_TYPE,
+                                                  GIMP_INK_BLOB_TYPE_CIRCLE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-blob-aspect-ratio
+   */
+  procedure = gimp_procedure_new (context_get_ink_blob_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-blob-aspect-ratio");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-blob-aspect-ratio",
+                                     "Get ink blob aspect ratio.",
+                                     "Get the ink blob aspect ratio for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("aspect",
+                                                        "aspect",
+                                                        "ink blob aspect ratio",
+                                                        1, 10, 1,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-blob-aspect-ratio
+   */
+  procedure = gimp_procedure_new (context_set_ink_blob_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-blob-aspect-ratio");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-blob-aspect-ratio",
+                                     "Set ink blob aspect ratio.",
+                                     "Set the ink blob aspect ratio for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("aspect",
+                                                    "aspect",
+                                                    "ink blob aspect ratio",
+                                                    1, 10, 1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-get-ink-blob-angle
+   */
+  procedure = gimp_procedure_new (context_get_ink_blob_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-get-ink-blob-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-get-ink-blob-angle",
+                                     "Get ink blob angle in degrees.",
+                                     "Get the ink blob angle in degrees for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("angle",
+                                                        "angle",
+                                                        "ink blob angle in degrees",
+                                                        -180, 180, -180,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-context-set-ink-blob-angle
+   */
+  procedure = gimp_procedure_new (context_set_ink_blob_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-context-set-ink-blob-angle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-set-ink-blob-angle",
+                                     "Set ink blob angle in degrees.",
+                                     "Set the ink blob angle in degrees for ink tool.",
+                                     "Ed Swartz",
+                                     "Ed Swartz",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "ink blob angle in degrees",
+                                                    -180, 180, -180,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/debug-cmds.c b/app/pdb/debug-cmds.c
new file mode 100644
index 0000000..bf72795
--- /dev/null
+++ b/app/pdb/debug-cmds.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GTimer *gimp_debug_timer         = NULL;
+static gint    gimp_debug_timer_counter = 0;
+
+static GimpValueArray *
+debug_timer_start_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  if (gimp_debug_timer_counter++ == 0)
+    gimp_debug_timer = g_timer_new ();
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+debug_timer_end_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gdouble elapsed = 0.0;
+
+  elapsed = 0.0;
+
+  if (gimp_debug_timer_counter == 0)
+    success = FALSE;
+  else if (--gimp_debug_timer_counter == 0)
+    {
+      elapsed = g_timer_elapsed (gimp_debug_timer, NULL);
+
+      g_printerr ("GIMP debug timer: %g seconds\n", elapsed);
+
+      g_timer_destroy (gimp_debug_timer);
+
+      gimp_debug_timer = NULL;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), elapsed);
+
+  return return_vals;
+}
+
+void
+register_debug_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-debug-timer-start
+   */
+  procedure = gimp_procedure_new (debug_timer_start_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-debug-timer-start");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-debug-timer-start",
+                                     "Starts measuring elapsed time.",
+                                     "This procedure starts a timer, measuring the elapsed time since the call. Each call to this procedure should be matched by a call to 'gimp-debug-timer-end', which returns the elapsed time.\n"
+                                     "If there is already an active timer, it is not affected by the call, however, a matching 'gimp-debug-timer-end' call is still required.\n"
+                                     "\n"
+                                     "This is a debug utility procedure. It is subject to change at any point, and should not be used in production.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-debug-timer-end
+   */
+  procedure = gimp_procedure_new (debug_timer_end_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-debug-timer-end");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-debug-timer-end",
+                                     "Finishes measuring elapsed time.",
+                                     "This procedure stops the timer started by a previous 'gimp-debug-timer-start' call, and prints and returns the elapsed time.\n"
+                                     "If there was already an active timer at the time of corresponding call to 'gimp-debug-timer-start', a dummy value is returned.\n"
+                                     "\n"
+                                     "This is a debug utility procedure. It is subject to change at any point, and should not be used in production.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("elapsed",
+                                                        "elapsed",
+                                                        "The elapsed time, in seconds",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/display-cmds.c b/app/pdb/display-cmds.c
new file mode 100644
index 0000000..57ab41c
--- /dev/null
+++ b/app/pdb/display-cmds.c
@@ -0,0 +1,363 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+display_is_valid_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpObject *display;
+  gboolean valid = FALSE;
+
+  display = gimp_value_get_display (gimp_value_array_index (args, 0), gimp);
+
+  valid = (display != NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), valid);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+display_new_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpObject *display = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_image_flush (image);
+
+      display = gimp_create_display (gimp, image, GIMP_UNIT_PIXEL, 1.0, NULL, 0);
+
+      if (display)
+        {
+          /* the first display takes ownership of the image */
+          if (gimp_image_get_display_count (image) == 1)
+            g_object_unref (image);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_display (gimp_value_array_index (return_vals, 1), display);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+display_delete_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpObject *display;
+
+  display = gimp_value_get_display (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_delete_display (gimp, display);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+display_get_window_handle_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpObject *display;
+  gint32 window = 0;
+
+  display = gimp_value_get_display (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      window = (gint32) gimp_get_display_window_id (gimp, display);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), window);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+displays_flush_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gimp_container_foreach (gimp->images, (GFunc) gimp_image_flush, NULL);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+displays_reconnect_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *old_image;
+  GimpImage *new_image;
+
+  old_image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  new_image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      success = (old_image != new_image    &&
+                 gimp_image_get_display_count (old_image) > 0 &&
+                 gimp_image_get_display_count (new_image) == 0);
+
+      if (success)
+        {
+          gimp_reconnect_displays (gimp, old_image, new_image);
+
+          /* take ownership of the image */
+          if (gimp_image_get_display_count (new_image) > 0)
+            g_object_unref (new_image);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_display_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-display-is-valid
+   */
+  procedure = gimp_procedure_new (display_is_valid_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-display-is-valid");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-display-is-valid",
+                                     "Returns TRUE if the display is valid.",
+                                     "This procedure checks if the given display ID is valid and refers to an existing display.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_display_id ("display",
+                                                           "display",
+                                                           "The display to check",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("valid",
+                                                         "valid",
+                                                         "Whether the display ID is valid",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-display-new
+   */
+  procedure = gimp_procedure_new (display_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-display-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-display-new",
+                                     "Create a new display for the specified image.",
+                                     "Creates a new display for the specified image. If the image already has a display, another is added. Multiple displays are handled transparently by GIMP. The newly created display is returned and can be subsequently destroyed with a call to 'gimp-display-delete'. This procedure only makes sense for use with the GIMP UI, and will result in an execution error if called when GIMP has no UI.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_display_id ("display",
+                                                               "display",
+                                                               "The new display",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-display-delete
+   */
+  procedure = gimp_procedure_new (display_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-display-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-display-delete",
+                                     "Delete the specified display.",
+                                     "This procedure removes the specified display. If this is the last remaining display for the underlying image, then the image is deleted also. Note that the display is closed no matter if the image is dirty or not. Better save the image before calling this procedure.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_display_id ("display",
+                                                           "display",
+                                                           "The display to delete",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-display-get-window-handle
+   */
+  procedure = gimp_procedure_new (display_get_window_handle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-display-get-window-handle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-display-get-window-handle",
+                                     "Get a handle to the native window for an image display.",
+                                     "This procedure returns a handle to the native window for a given image display. For example in the X backend of GDK, a native window handle is an Xlib XID. A value of 0 is returned for an invalid display or if this function is unimplemented for the windowing system that is being used.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_display_id ("display",
+                                                           "display",
+                                                           "The display to get the window handle from",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("window",
+                                                          "window",
+                                                          "The native window handle or 0",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-displays-flush
+   */
+  procedure = gimp_procedure_new (displays_flush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-displays-flush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-displays-flush",
+                                     "Flush all internal changes to the user interface",
+                                     "This procedure takes no arguments and returns nothing except a success status. Its purpose is to flush all pending updates of image manipulations to the user interface. It should be called whenever appropriate.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-displays-reconnect
+   */
+  procedure = gimp_procedure_new (displays_reconnect_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-displays-reconnect");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-displays-reconnect",
+                                     "Reconnect displays from one image to another image.",
+                                     "This procedure connects all displays of the old_image to the new_image. If the old_image has no display or new_image already has a display the reconnect is not performed and the procedure returns without success. You should rarely need to use this function.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("old-image",
+                                                         "old image",
+                                                         "The old image (must have at least one display)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("new-image",
+                                                         "new image",
+                                                         "The new image (must not have a display)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/drawable-cmds.c b/app/pdb/drawable-cmds.c
new file mode 100644
index 0000000..9a25f3d
--- /dev/null
+++ b/app/pdb/drawable-cmds.c
@@ -0,0 +1,1976 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "config/gimpcoreconfig.h"
+#include "core/gimp.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpdrawable-fill.h"
+#include "core/gimpdrawable-foreground-extract.h"
+#include "core/gimpdrawable-offset.h"
+#include "core/gimpdrawable-preview.h"
+#include "core/gimpdrawable-shadow.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
+#include "gegl/gimp-babl-compat.h"
+#include "gegl/gimp-babl.h"
+#include "plug-in/gimpplugin-cleanup.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+drawable_get_format_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gchar *format = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp->plug_in_manager->current_plug_in)
+        gimp_plug_in_enable_precision (gimp->plug_in_manager->current_plug_in);
+
+      format = g_strdup (babl_get_name (gimp_drawable_get_format (drawable)));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), format);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_get_thumbnail_format_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gchar *format = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      format = g_strdup (babl_format_get_encoding (gimp_drawable_get_preview_format (drawable)));
+
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), format);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_type_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 type = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      type = gimp_babl_format_get_image_type (gimp_drawable_get_format (drawable));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), type);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_type_with_alpha_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 type_with_alpha = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      const Babl *format = gimp_drawable_get_format_with_alpha (drawable);
+
+      type_with_alpha = gimp_babl_format_get_image_type (format);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), type_with_alpha);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_has_alpha_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean has_alpha = FALSE;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      has_alpha = gimp_drawable_has_alpha (drawable);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), has_alpha);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_is_rgb_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean is_rgb = FALSE;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      is_rgb = gimp_drawable_is_rgb (drawable);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), is_rgb);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_is_gray_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean is_gray = FALSE;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      is_gray = gimp_drawable_is_gray (drawable);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), is_gray);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_is_indexed_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean is_indexed = FALSE;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      is_indexed = gimp_drawable_is_indexed (drawable);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), is_indexed);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_bpp_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 bpp = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      const Babl *format = gimp_drawable_get_format (drawable);
+
+      if (! gimp->plug_in_manager->current_plug_in ||
+          ! gimp_plug_in_precision_enabled (gimp->plug_in_manager->current_plug_in))
+        {
+          format = gimp_babl_compat_u8_format (format);
+        }
+
+      bpp = babl_format_get_bytes_per_pixel (format);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), bpp);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_width_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 width = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      width = gimp_item_get_width (GIMP_ITEM (drawable));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_height_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 height = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      height = gimp_item_get_height (GIMP_ITEM (drawable));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), height);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_offsets_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 offset_x = 0;
+  gint32 offset_y = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), offset_x);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), offset_y);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_set_image_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpImage *image;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (image != gimp_item_get_image (GIMP_ITEM (drawable)))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_mask_bounds_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean non_empty = FALSE;
+  gint32 x1 = 0;
+  gint32 y1 = 0;
+  gint32 x2 = 0;
+  gint32 y2 = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error))
+        non_empty = gimp_item_mask_bounds (GIMP_ITEM (drawable), &x1, &y1, &x2, &y2);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_boolean (gimp_value_array_index (return_vals, 1), non_empty);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), x1);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), y1);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), x2);
+      g_value_set_int (gimp_value_array_index (return_vals, 5), y2);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_mask_intersect_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean non_empty = FALSE;
+  gint32 x = 0;
+  gint32 y = 0;
+  gint32 width = 0;
+  gint32 height = 0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error))
+        non_empty = gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                              &x, &y, &width, &height);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_boolean (gimp_value_array_index (return_vals, 1), non_empty);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), x);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), y);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 5), height);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_merge_shadow_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean undo;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  undo = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          const gchar *undo_desc = _("Plug-in");
+
+          if (gimp->plug_in_manager->current_plug_in)
+            undo_desc = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in);
+
+          gimp_drawable_merge_shadow_buffer (drawable, undo, undo_desc);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_free_shadow_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp->plug_in_manager->current_plug_in)
+        gimp_plug_in_cleanup_remove_shadow (gimp->plug_in_manager->current_plug_in,
+                                            drawable);
+
+      gimp_drawable_free_shadow_buffer (drawable);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_update_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 x;
+  gint32 y;
+  gint32 width;
+  gint32 height;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_int (gimp_value_array_index (args, 1));
+  y = g_value_get_int (gimp_value_array_index (args, 2));
+  width = g_value_get_int (gimp_value_array_index (args, 3));
+  height = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gimp_drawable_update (drawable, x, y, width, height);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_get_pixel_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 x_coord;
+  gint32 y_coord;
+  gint32 num_channels = 0;
+  guint8 *pixel = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x_coord = g_value_get_int (gimp_value_array_index (args, 1));
+  y_coord = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      const Babl *format = gimp_drawable_get_format (drawable);
+
+      if (! gimp->plug_in_manager->current_plug_in ||
+          ! gimp_plug_in_precision_enabled (gimp->plug_in_manager->current_plug_in))
+        {
+          format = gimp_babl_compat_u8_format (format);
+        }
+
+      if (x_coord < gimp_item_get_width  (GIMP_ITEM (drawable)) &&
+          y_coord < gimp_item_get_height (GIMP_ITEM (drawable)))
+        {
+          num_channels = babl_format_get_bytes_per_pixel (format);
+          pixel = g_new0 (guint8, num_channels);
+
+          gegl_buffer_sample (gimp_drawable_get_buffer (drawable),
+                              x_coord, y_coord, NULL, pixel, format,
+                              GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_channels);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 2), pixel, num_channels);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_set_pixel_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 x_coord;
+  gint32 y_coord;
+  gint32 num_channels;
+  const guint8 *pixel;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x_coord = g_value_get_int (gimp_value_array_index (args, 1));
+  y_coord = g_value_get_int (gimp_value_array_index (args, 2));
+  num_channels = g_value_get_int (gimp_value_array_index (args, 3));
+  pixel = gimp_value_get_int8array (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      const Babl *format = gimp_drawable_get_format (drawable);
+
+      if (! gimp->plug_in_manager->current_plug_in ||
+          ! gimp_plug_in_precision_enabled (gimp->plug_in_manager->current_plug_in))
+        {
+          format = gimp_babl_compat_u8_format (format);
+        }
+
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (drawable),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          x_coord < gimp_item_get_width  (GIMP_ITEM (drawable)) &&
+          y_coord < gimp_item_get_height (GIMP_ITEM (drawable)) &&
+          num_channels == babl_format_get_bytes_per_pixel (format))
+        {
+          gegl_buffer_set (gimp_drawable_get_buffer (drawable),
+                           GEGL_RECTANGLE (x_coord, y_coord, 1, 1),
+                           0, format, pixel, GEGL_AUTO_ROWSTRIDE);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_fill_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 fill_type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fill_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (drawable),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_fill (drawable, context, (GimpFillType) fill_type);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_offset_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean wrap_around;
+  gint32 fill_type;
+  gint32 offset_x;
+  gint32 offset_y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  wrap_around = g_value_get_boolean (gimp_value_array_index (args, 1));
+  fill_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  offset_x = g_value_get_int (gimp_value_array_index (args, 3));
+  offset_y = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        gimp_drawable_offset (drawable, context, wrap_around, fill_type,
+                              offset_x, offset_y);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_thumbnail_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 width;
+  gint32 height;
+  gint32 actual_width = 0;
+  gint32 actual_height = 0;
+  gint32 bpp = 0;
+  gint32 thumbnail_data_count = 0;
+  guint8 *thumbnail_data = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  width = g_value_get_int (gimp_value_array_index (args, 1));
+  height = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+      GimpTempBuf *buf;
+      gint         dwidth, dheight;
+
+      gimp_assert (GIMP_VIEWABLE_MAX_PREVIEW_SIZE >= 1024);
+
+      /* Adjust the width/height ratio */
+      dwidth  = gimp_item_get_width  (GIMP_ITEM (drawable));
+      dheight = gimp_item_get_height (GIMP_ITEM (drawable));
+
+      if (dwidth > dheight)
+        height = MAX (1, (width * dheight) / dwidth);
+      else
+        width  = MAX (1, (height * dwidth) / dheight);
+
+      if (image->gimp->config->layer_previews)
+        buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (drawable), context,
+                                             width, height);
+      else
+        buf = gimp_viewable_get_dummy_preview (GIMP_VIEWABLE (drawable),
+                                               width, height,
+                                               gimp_drawable_get_preview_format (drawable));
+
+      if (buf)
+        {
+          actual_width         = gimp_temp_buf_get_width  (buf);
+          actual_height        = gimp_temp_buf_get_height (buf);
+          bpp                  = babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (buf));
+          thumbnail_data_count = gimp_temp_buf_get_data_size (buf);
+          thumbnail_data       = g_memdup (gimp_temp_buf_get_data (buf),
+                                           thumbnail_data_count);
+
+          gimp_temp_buf_unref (buf);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), actual_width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), actual_height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), thumbnail_data_count);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 5), thumbnail_data, thumbnail_data_count);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_sub_thumbnail_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 src_x;
+  gint32 src_y;
+  gint32 src_width;
+  gint32 src_height;
+  gint32 dest_width;
+  gint32 dest_height;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 bpp = 0;
+  gint32 thumbnail_data_count = 0;
+  guint8 *thumbnail_data = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  src_x = g_value_get_int (gimp_value_array_index (args, 1));
+  src_y = g_value_get_int (gimp_value_array_index (args, 2));
+  src_width = g_value_get_int (gimp_value_array_index (args, 3));
+  src_height = g_value_get_int (gimp_value_array_index (args, 4));
+  dest_width = g_value_get_int (gimp_value_array_index (args, 5));
+  dest_height = g_value_get_int (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if ((src_x + src_width)  <= gimp_item_get_width  (GIMP_ITEM (drawable)) &&
+          (src_y + src_height) <= gimp_item_get_height (GIMP_ITEM (drawable)))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpTempBuf *buf;
+
+          if (image->gimp->config->layer_previews)
+            buf = gimp_drawable_get_sub_preview (drawable,
+                                                 src_x, src_y,
+                                                 src_width, src_height,
+                                                 dest_width, dest_height);
+          else
+            buf = gimp_viewable_get_dummy_preview (GIMP_VIEWABLE (drawable),
+                                                   dest_width, dest_height,
+                                                   gimp_drawable_get_preview_format (drawable));
+
+          if (buf)
+            {
+              width                = gimp_temp_buf_get_width  (buf);
+              height               = gimp_temp_buf_get_height (buf);
+              bpp                  = babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (buf));
+              thumbnail_data_count = gimp_temp_buf_get_data_size (buf);
+              thumbnail_data       = g_memdup (gimp_temp_buf_get_data (buf),
+                                               thumbnail_data_count);
+
+              gimp_temp_buf_unref (buf);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), thumbnail_data_count);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 5), thumbnail_data, thumbnail_data_count);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_foreground_extract_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 mode;
+  GimpDrawable *mask;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  mode = g_value_get_enum (gimp_value_array_index (args, 1));
+  mask = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (mode == GIMP_FOREGROUND_EXTRACT_MATTING &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (GIMP_ITEM (drawable));
+          GeglBuffer     *buffer;
+
+          buffer = gimp_drawable_foreground_extract (drawable,
+                                                     GIMP_MATTING_ENGINE_GLOBAL,
+                                                     2,
+                                                     2,
+                                                     2,
+                                                     gimp_drawable_get_buffer (mask),
+                                                     progress);
+
+          gimp_channel_select_buffer (gimp_image_get_mask (image),
+                                      C_("command", "Foreground Select"),
+                                      buffer,
+                                      0, /* x offset */
+                                      0, /* y offset */
+                                      GIMP_CHANNEL_OP_REPLACE,
+                                      pdb_context->feather,
+                                      pdb_context->feather_radius_x,
+                                      pdb_context->feather_radius_y);
+
+          g_object_unref (buffer);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_drawable_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-drawable-get-format
+   */
+  procedure = gimp_procedure_new (drawable_get_format_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-get-format");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-get-format",
+                                     "Returns the drawable's Babl format",
+                                     "This procedure returns the drawable's Babl format.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("format",
+                                                           "format",
+                                                           "The drawable's Babl format",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-get-thumbnail-format
+   */
+  procedure = gimp_procedure_new (drawable_get_thumbnail_format_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-get-thumbnail-format");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-get-thumbnail-format",
+                                     "Returns the drawable's thumbnail Babl format",
+                                     "This procedure returns the drawable's thumbnail Babl format.\n"
+                                     "Thumbnails are always 8-bit images, see 'gimp-drawable-thumbnail' and 'gimp-drawable-sub-thmbnail'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("format",
+                                                           "format",
+                                                           "The drawable's thumbnail Babl format",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-type
+   */
+  procedure = gimp_procedure_new (drawable_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-type",
+                                     "Returns the drawable's type.",
+                                     "This procedure returns the drawable's type.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("type",
+                                                      "type",
+                                                      "The drawable's type",
+                                                      GIMP_TYPE_IMAGE_TYPE,
+                                                      GIMP_RGB_IMAGE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-type-with-alpha
+   */
+  procedure = gimp_procedure_new (drawable_type_with_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-type-with-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-type-with-alpha",
+                                     "Returns the drawable's type with alpha.",
+                                     "This procedure returns the drawable's type as if had an alpha channel. If the type is currently Gray, for instance, the returned type would be GrayA. If the drawable already has an alpha channel, the drawable's type is simply returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_enum ("type-with-alpha",
+                                                         "type with alpha",
+                                                         "The drawable's type with alpha",
+                                                         GIMP_TYPE_IMAGE_TYPE,
+                                                         GIMP_RGB_IMAGE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->values[0]),
+                                      GIMP_RGB_IMAGE);
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->values[0]),
+                                      GIMP_GRAY_IMAGE);
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->values[0]),
+                                      GIMP_INDEXED_IMAGE);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-has-alpha
+   */
+  procedure = gimp_procedure_new (drawable_has_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-has-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-has-alpha",
+                                     "Returns TRUE if the drawable has an alpha channel.",
+                                     "This procedure returns whether the specified drawable has an alpha channel. This can only be true for layers, and the associated type will be one of: { RGBA , GRAYA, INDEXEDA }.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("has-alpha",
+                                                         "has alpha",
+                                                         "Does the drawable have an alpha channel?",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-is-rgb
+   */
+  procedure = gimp_procedure_new (drawable_is_rgb_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-is-rgb");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-is-rgb",
+                                     "Returns whether the drawable is an RGB type.",
+                                     "This procedure returns TRUE if the specified drawable is of type { RGB, RGBA }.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("is-rgb",
+                                                         "is rgb",
+                                                         "TRUE if the drawable is an RGB type",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-is-gray
+   */
+  procedure = gimp_procedure_new (drawable_is_gray_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-is-gray");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-is-gray",
+                                     "Returns whether the drawable is a grayscale type.",
+                                     "This procedure returns TRUE if the specified drawable is of type { Gray, GrayA }.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("is-gray",
+                                                         "is gray",
+                                                         "TRUE if the drawable is a grayscale type",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-is-indexed
+   */
+  procedure = gimp_procedure_new (drawable_is_indexed_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-is-indexed");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-is-indexed",
+                                     "Returns whether the drawable is an indexed type.",
+                                     "This procedure returns TRUE if the specified drawable is of type { Indexed, IndexedA }.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("is-indexed",
+                                                         "is indexed",
+                                                         "TRUE if the drawable is an indexed type",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-bpp
+   */
+  procedure = gimp_procedure_new (drawable_bpp_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-bpp");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-bpp",
+                                     "Returns the bytes per pixel.",
+                                     "This procedure returns the number of bytes per pixel, which corresponds to the number of components unless 'gimp-plugin-enable-precision' was called.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bpp",
+                                                          "bpp",
+                                                          "Bytes per pixel",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-width
+   */
+  procedure = gimp_procedure_new (drawable_width_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-width");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-width",
+                                     "Returns the width of the drawable.",
+                                     "This procedure returns the specified drawable's width in pixels.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "Width of drawable",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-height
+   */
+  procedure = gimp_procedure_new (drawable_height_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-height");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-height",
+                                     "Returns the height of the drawable.",
+                                     "This procedure returns the specified drawable's height in pixels.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "Height of drawable",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-offsets
+   */
+  procedure = gimp_procedure_new (drawable_offsets_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-offsets");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-offsets",
+                                     "Returns the offsets for the drawable.",
+                                     "This procedure returns the specified drawable's offsets. This only makes sense if the drawable is a layer since channels are anchored. The offsets of a channel will be returned as 0.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("offset-x",
+                                                          "offset x",
+                                                          "x offset of drawable",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("offset-y",
+                                                          "offset y",
+                                                          "y offset of drawable",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-set-image
+   */
+  procedure = gimp_procedure_new (drawable_set_image_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-set-image");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-set-image",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "",
+                                     "",
+                                     "",
+                                     "NONE");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-mask-bounds
+   */
+  procedure = gimp_procedure_new (drawable_mask_bounds_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-mask-bounds");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-mask-bounds",
+                                     "Find the bounding box of the current selection in relation to the specified drawable.",
+                                     "This procedure returns whether there is a selection. If there is one, the upper left and lower right-hand corners of its bounding box are returned. These coordinates are specified relative to the drawable's origin, and bounded by the drawable's extents. Please note that the pixel specified by the lower right-hand coordinate of the bounding box is not part of the selection. The selection ends at the upper left corner of this pixel. This means the width of the selection can be calculated as (x2 - x1), its height as (y2 - y1).\n"
+                                     "Note that the returned boolean does NOT correspond with the returned region being empty or not, it always returns whether the selection is non_empty. See 'gimp-drawable-mask-intersect' for a boolean return value which is more useful in most cases.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("non-empty",
+                                                         "non empty",
+                                                         "TRUE if there is a selection",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("x1",
+                                                          "x1",
+                                                          "x coordinate of the upper left corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("y1",
+                                                          "y1",
+                                                          "y coordinate of the upper left corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("x2",
+                                                          "x2",
+                                                          "x coordinate of the lower right corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("y2",
+                                                          "y2",
+                                                          "y coordinate of the lower right corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-mask-intersect
+   */
+  procedure = gimp_procedure_new (drawable_mask_intersect_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-mask-intersect");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-mask-intersect",
+                                     "Find the bounding box of the current selection in relation to the specified drawable.",
+                                     "This procedure returns whether there is an intersection between the drawable and the selection. Unlike 'gimp-drawable-mask-bounds', the intersection's bounds are returned as x, y, width, height.\n"
+                                     "If there is no selection this function returns TRUE and the returned bounds are the extents of the whole drawable.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("non-empty",
+                                                         "non empty",
+                                                         "TRUE if the returned area is not empty",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("x",
+                                                          "x",
+                                                          "x coordinate of the upper left corner of the intersection",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("y",
+                                                          "y",
+                                                          "y coordinate of the upper left corner of the intersection",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "width of the intersection",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "height of the intersection",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-merge-shadow
+   */
+  procedure = gimp_procedure_new (drawable_merge_shadow_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-merge-shadow");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-merge-shadow",
+                                     "Merge the shadow buffer with the specified drawable.",
+                                     "This procedure combines the contents of the drawable's shadow buffer (for temporary processing) with the specified drawable. The 'undo' parameter specifies whether to add an undo step for the operation. Requesting no undo is useful for such applications as 'auto-apply'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("undo",
+                                                     "undo",
+                                                     "Push merge to undo stack?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-free-shadow
+   */
+  procedure = gimp_procedure_new (drawable_free_shadow_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-free-shadow");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-free-shadow",
+                                     "Free the specified drawable's shadow data (if it exists).",
+                                     "This procedure is intended as a memory saving device. If any shadow memory has been allocated, it will be freed automatically when the drawable is removed from the image, or when the plug-in procedure which allocated it returns.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-update
+   */
+  procedure = gimp_procedure_new (drawable_update_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-update");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-update",
+                                     "Update the specified region of the drawable.",
+                                     "This procedure updates the specified region of the drawable. The (x, y) coordinate pair is relative to the drawable's origin, not to the image origin. Therefore, the entire drawable can be updated using (0, 0, width, height).",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("x",
+                                                      "x",
+                                                      "x coordinate of upper left corner of update region",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("y",
+                                                      "y",
+                                                      "y coordinate of upper left corner of update region",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "Width of update region",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "Height of update region",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-get-pixel
+   */
+  procedure = gimp_procedure_new (drawable_get_pixel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-get-pixel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-get-pixel",
+                                     "Gets the value of the pixel at the specified coordinates.",
+                                     "This procedure gets the pixel value at the specified coordinates. The 'num_channels' argument must always be equal to the bytes-per-pixel value for the specified drawable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("x-coord",
+                                                      "x coord",
+                                                      "The x coordinate",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("y-coord",
+                                                      "y coord",
+                                                      "The y coordinate",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-channels",
+                                                          "num channels",
+                                                          "The number of channels for the pixel",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("pixel",
+                                                               "pixel",
+                                                               "The pixel value",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-set-pixel
+   */
+  procedure = gimp_procedure_new (drawable_set_pixel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-set-pixel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-set-pixel",
+                                     "Sets the value of the pixel at the specified coordinates.",
+                                     "This procedure sets the pixel value at the specified coordinates. The 'num_channels' argument must always be equal to the bytes-per-pixel value for the specified drawable. Note that this function is not undoable, you should use it only on drawables you just created yourself.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("x-coord",
+                                                      "x coord",
+                                                      "The x coordinate",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("y-coord",
+                                                      "y coord",
+                                                      "The y coordinate",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-channels",
+                                                      "num channels",
+                                                      "The number of channels for the pixel",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("pixel",
+                                                           "pixel",
+                                                           "The pixel value",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-fill
+   */
+  procedure = gimp_procedure_new (drawable_fill_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-fill");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-fill",
+                                     "Fill the drawable with the specified fill mode.",
+                                     "This procedure fills the drawable. If the fill mode is foreground the current foreground color is used. If the fill mode is background, the current background color is used. If the fill type is white, then white is used. Transparent fill only affects layers with an alpha channel, in which case the alpha channel is set to transparent. If the drawable has no alpha channel, it is filled to white. No fill leaves the drawable's contents undefined.\n"
+                                     "This procedure is unlike 'gimp-edit-fill' or the bucket fill tool because it fills regardless of a selection. Its main purpose is to fill a newly created drawable before adding it to the image. This operation cannot be undone.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-type",
+                                                  "fill type",
+                                                  "The type of fill",
+                                                  GIMP_TYPE_FILL_TYPE,
+                                                  GIMP_FILL_FOREGROUND,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-offset
+   */
+  procedure = gimp_procedure_new (drawable_offset_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-offset");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-offset",
+                                     "Offset the drawable by the specified amounts in the X and Y directions",
+                                     "This procedure offsets the specified drawable by the amounts specified by 'offset_x' and 'offset_y'. If 'wrap_around' is set to TRUE, then portions of the drawable which are offset out of bounds are wrapped around. Alternatively, the undefined regions of the drawable can be filled with transparency or the background color, as specified by the 'fill-type' parameter.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to offset",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("wrap-around",
+                                                     "wrap around",
+                                                     "wrap image around or fill vacated regions",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-type",
+                                                  "fill type",
+                                                  "fill vacated regions of drawable with background or transparent",
+                                                  GIMP_TYPE_OFFSET_TYPE,
+                                                  GIMP_OFFSET_BACKGROUND,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offset-x",
+                                                      "offset x",
+                                                      "offset by this amount in X direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offset-y",
+                                                      "offset y",
+                                                      "offset by this amount in Y direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-thumbnail
+   */
+  procedure = gimp_procedure_new (drawable_thumbnail_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-thumbnail");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-thumbnail",
+                                     "Get a thumbnail of a drawable.",
+                                     "This function gets data from which a thumbnail of a drawable preview can be created. Maximum x or y dimension is 1024 pixels. The pixels are returned in RGB[A] or GRAY[A] format. The bpp return value gives the number of bytes in the image.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "The requested thumbnail width",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "The requested thumbnail height",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("actual-width",
+                                                          "actual width",
+                                                          "The previews width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("actual-height",
+                                                          "actual height",
+                                                          "The previews height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bpp",
+                                                          "bpp",
+                                                          "The previews bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("thumbnail-data-count",
+                                                          "thumbnail data count",
+                                                          "The number of bytes in thumbnail data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("thumbnail-data",
+                                                               "thumbnail data",
+                                                               "The thumbnail data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-sub-thumbnail
+   */
+  procedure = gimp_procedure_new (drawable_sub_thumbnail_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-sub-thumbnail");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-sub-thumbnail",
+                                     "Get a thumbnail of a sub-area of a drawable drawable.",
+                                     "This function gets data from which a thumbnail of a drawable preview can be created. Maximum x or y dimension is 1024 pixels. The pixels are returned in RGB[A] or GRAY[A] format. The bpp return value gives the number of bytes in the image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("src-x",
+                                                      "src x",
+                                                      "The x coordinate of the area",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("src-y",
+                                                      "src y",
+                                                      "The y coordinate of the area",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("src-width",
+                                                      "src width",
+                                                      "The width of the area",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("src-height",
+                                                      "src height",
+                                                      "The height of the area",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dest-width",
+                                                      "dest width",
+                                                      "The thumbnail width",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dest-height",
+                                                      "dest height",
+                                                      "The thumbnail height",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The previews width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The previews height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bpp",
+                                                          "bpp",
+                                                          "The previews bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("thumbnail-data-count",
+                                                          "thumbnail data count",
+                                                          "The number of bytes in thumbnail data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("thumbnail-data",
+                                                               "thumbnail data",
+                                                               "The thumbnail data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-foreground-extract
+   */
+  procedure = gimp_procedure_new (drawable_foreground_extract_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-foreground-extract");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-foreground-extract",
+                                     "Extract the foreground of a drawable using a given trimap.",
+                                     "Image Segmentation by Uniform Color Clustering, see https://www.inf.fu-berlin.de/inst/pubs/tr-b-05-07.pdf",
+                                     "Gerald Friedland <fland@inf.fu-berlin.de>, Kristian Jantz <jantz@inf.fu-berlin.de>, Sven Neumann <sven@gimp.org>",
+                                     "Gerald Friedland",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("mode",
+                                                  "mode",
+                                                  "The algorithm to use",
+                                                  GIMP_TYPE_FOREGROUND_EXTRACT_MODE,
+                                                  GIMP_FOREGROUND_EXTRACT_SIOX,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("mask",
+                                                            "mask",
+                                                            "Tri-Map",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/drawable-color-cmds.c b/app/pdb/drawable-color-cmds.c
new file mode 100644
index 0000000..3f6010f
--- /dev/null
+++ b/app/pdb/drawable-color-cmds.c
@@ -0,0 +1,1551 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable-equalize.h"
+#include "core/gimpdrawable-histogram.h"
+#include "core/gimpdrawable-levels.h"
+#include "core/gimpdrawable-operation.h"
+#include "core/gimpdrawable.h"
+#include "core/gimphistogram.h"
+#include "core/gimpparamspecs.h"
+#include "operations/gimpbrightnesscontrastconfig.h"
+#include "operations/gimpcolorbalanceconfig.h"
+#include "operations/gimpcurvesconfig.h"
+#include "operations/gimphuesaturationconfig.h"
+#include "operations/gimplevelsconfig.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+drawable_brightness_contrast_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble brightness;
+  gdouble contrast;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  brightness = g_value_get_double (gimp_value_array_index (args, 1));
+  contrast = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG,
+                                          "brightness", brightness,
+                                          "contrast",   contrast,
+                                          NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Brightness-Contrast"),
+                                                 "gimp:brightness-contrast",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_color_balance_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 transfer_mode;
+  gboolean preserve_lum;
+  gdouble cyan_red;
+  gdouble magenta_green;
+  gdouble yellow_blue;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  transfer_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+  preserve_lum = g_value_get_boolean (gimp_value_array_index (args, 2));
+  cyan_red = g_value_get_double (gimp_value_array_index (args, 3));
+  magenta_green = g_value_get_double (gimp_value_array_index (args, 4));
+  yellow_blue = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error)  &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_COLOR_BALANCE_CONFIG,
+                                          "range",               transfer_mode,
+                                          "preserve-luminosity", preserve_lum,
+                                          NULL);
+
+          g_object_set (config,
+                        "cyan-red",      cyan_red      / 100.0,
+                        "magenta-green", magenta_green / 100.0,
+                        "yellow-blue",   yellow_blue   / 100.0,
+                        NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Color Balance"),
+                                                 "gimp:color-balance",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_colorize_hsl_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble hue;
+  gdouble saturation;
+  gdouble lightness;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  hue = g_value_get_double (gimp_value_array_index (args, 1));
+  saturation = g_value_get_double (gimp_value_array_index (args, 2));
+  lightness = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          ! gimp_drawable_is_gray (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:colorize",
+                                 "hue",        hue        / 360.0,
+                                 "saturation", saturation / 100.0,
+                                 "lightness",  lightness  / 100.0,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Colorize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_curves_explicit_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gint32 num_values;
+  const gdouble *values;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  num_values = g_value_get_int (gimp_value_array_index (args, 2));
+  values = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          (num_values >= 256) &&
+          (num_values <= 4096) &&
+          (gimp_drawable_has_alpha (drawable) || channel != GIMP_HISTOGRAM_ALPHA) &&
+          (! gimp_drawable_is_gray (drawable) ||
+           channel == GIMP_HISTOGRAM_VALUE || channel == GIMP_HISTOGRAM_ALPHA) &&
+          channel != GIMP_HISTOGRAM_LUMINANCE)
+        {
+          GObject *config = gimp_curves_config_new_explicit (channel,
+                                                             values,
+                                                             num_values);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Curves"),
+                                                 "gimp:curves",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_curves_spline_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gint32 num_points;
+  const gdouble *points;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  num_points = g_value_get_int (gimp_value_array_index (args, 2));
+  points = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          ! (num_points & 1) &&
+          (gimp_drawable_has_alpha (drawable) || channel != GIMP_HISTOGRAM_ALPHA) &&
+          (! gimp_drawable_is_gray (drawable) ||
+           channel == GIMP_HISTOGRAM_VALUE || channel == GIMP_HISTOGRAM_ALPHA) &&
+          channel != GIMP_HISTOGRAM_LUMINANCE)
+        {
+          GObject *config = gimp_curves_config_new_spline (channel,
+                                                           points,
+                                                           num_points / 2);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Curves"),
+                                                 "gimp:curves",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_extract_component_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  guint8 component;
+  gboolean invert;
+  gboolean linear;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  component = g_value_get_uint (gimp_value_array_index (args, 1));
+  invert = g_value_get_boolean (gimp_value_array_index (args, 2));
+  linear = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_drawable_is_rgb (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:component-extract",
+                                 "component", component,
+                                 "invert",    invert,
+                                 "linear",    linear,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Extract Component"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_desaturate_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 desaturate_mode;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  desaturate_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_drawable_is_rgb (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:desaturate",
+                                 "mode",      desaturate_mode,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Desaturate"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_equalize_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean mask_only;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  mask_only = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                       GIMP_PDB_ITEM_CONTENT, error) ||
+          ! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        success = FALSE;
+
+      if (success)
+        gimp_drawable_equalize (drawable, mask_only);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_histogram_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gdouble start_range;
+  gdouble end_range;
+  gdouble mean = 0.0;
+  gdouble std_dev = 0.0;
+  gdouble median = 0.0;
+  gdouble pixels = 0.0;
+  gdouble count = 0.0;
+  gdouble percentile = 0.0;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  start_range = g_value_get_double (gimp_value_array_index (args, 2));
+  end_range = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error) ||
+          (! gimp_drawable_has_alpha (drawable) &&
+           channel == GIMP_HISTOGRAM_ALPHA) ||
+          (gimp_drawable_is_gray (drawable) &&
+           channel != GIMP_HISTOGRAM_VALUE && channel != GIMP_HISTOGRAM_ALPHA))
+        success = FALSE;
+
+      if (success)
+        {
+          GimpHistogram *histogram;
+          gint           n_bins;
+          gint           start;
+          gboolean       precision_enabled;
+          gboolean       linear;
+          gint           end;
+
+          precision_enabled =
+            gimp->plug_in_manager->current_plug_in &&
+            gimp_plug_in_precision_enabled (gimp->plug_in_manager->current_plug_in);
+
+          if (precision_enabled)
+            linear = gimp_drawable_get_linear (drawable);
+          else
+            linear = FALSE;
+
+          histogram = gimp_histogram_new (linear);
+          gimp_drawable_calculate_histogram (drawable, histogram, FALSE);
+
+          n_bins = gimp_histogram_n_bins (histogram);
+
+          start = ROUND (start_range * (n_bins - 1));
+          end   = ROUND (end_range   * (n_bins - 1));
+
+          mean       = gimp_histogram_get_mean (histogram, channel,
+                                                 start, end);
+          std_dev    = gimp_histogram_get_std_dev (histogram, channel,
+                                                   start, end);
+          median     = gimp_histogram_get_median (histogram, channel,
+                                                  start, end);
+          pixels     = gimp_histogram_get_count (histogram, channel, 0, n_bins - 1);
+          count      = gimp_histogram_get_count (histogram, channel,
+                                                 start, end);
+          percentile = count / pixels;
+
+          g_object_unref (histogram);
+
+          if (n_bins == 256 || ! precision_enabled)
+            {
+              mean    *= 255;
+              std_dev *= 255;
+              median  *= 255;
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), mean);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), std_dev);
+      g_value_set_double (gimp_value_array_index (return_vals, 3), median);
+      g_value_set_double (gimp_value_array_index (return_vals, 4), pixels);
+      g_value_set_double (gimp_value_array_index (return_vals, 5), count);
+      g_value_set_double (gimp_value_array_index (return_vals, 6), percentile);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_hue_saturation_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 hue_range;
+  gdouble hue_offset;
+  gdouble lightness;
+  gdouble saturation;
+  gdouble overlap;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  hue_range = g_value_get_enum (gimp_value_array_index (args, 1));
+  hue_offset = g_value_get_double (gimp_value_array_index (args, 2));
+  lightness = g_value_get_double (gimp_value_array_index (args, 3));
+  saturation = g_value_get_double (gimp_value_array_index (args, 4));
+  overlap = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GObject *config = g_object_new (GIMP_TYPE_HUE_SATURATION_CONFIG,
+                                          "range", hue_range,
+                                          NULL);
+
+           g_object_set (config,
+                         "hue",        hue_offset / 180.0,
+                         "saturation", saturation / 100.0,
+                         "lightness",  lightness  / 100.0,
+                         "overlap",    overlap / 100.0,
+                         NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Hue-Saturation"),
+                                                 "gimp:hue-saturation",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_invert_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean linear;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  linear = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Invert"),
+                                                 linear ?
+                                                 "gegl:invert-linear" :
+                                                 "gegl:invert-gamma",
+                                                 NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_levels_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gdouble low_input;
+  gdouble high_input;
+  gboolean clamp_input;
+  gdouble gamma;
+  gdouble low_output;
+  gdouble high_output;
+  gboolean clamp_output;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  low_input = g_value_get_double (gimp_value_array_index (args, 2));
+  high_input = g_value_get_double (gimp_value_array_index (args, 3));
+  clamp_input = g_value_get_boolean (gimp_value_array_index (args, 4));
+  gamma = g_value_get_double (gimp_value_array_index (args, 5));
+  low_output = g_value_get_double (gimp_value_array_index (args, 6));
+  high_output = g_value_get_double (gimp_value_array_index (args, 7));
+  clamp_output = g_value_get_boolean (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          (gimp_drawable_has_alpha (drawable) || channel != GIMP_HISTOGRAM_ALPHA) &&
+          (! gimp_drawable_is_gray (drawable) ||
+           channel == GIMP_HISTOGRAM_VALUE || channel == GIMP_HISTOGRAM_ALPHA) &&
+          channel != GIMP_HISTOGRAM_LUMINANCE)
+        {
+          GObject *config = g_object_new (GIMP_TYPE_LEVELS_CONFIG,
+                                          "channel", channel,
+                                          NULL);
+
+          g_object_set (config,
+                        "low-input",    low_input,
+                        "high-input",   high_input,
+                        "clamp-input",  clamp_input,
+                        "gamma",        gamma,
+                        "low-output",   low_output,
+                        "high-output",  high_output,
+                        "clamp-output", clamp_output,
+                        NULL);
+
+          gimp_drawable_apply_operation_by_name (drawable, progress,
+                                                 C_("undo-type", "Levels"),
+                                                 "gimp:levels",
+                                                 config);
+          g_object_unref (config);
+        }
+      else
+        success = TRUE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_levels_stretch_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_levels_stretch (drawable, progress);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_shadows_highlights_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble shadows;
+  gdouble highlights;
+  gdouble whitepoint;
+  gdouble radius;
+  gdouble compress;
+  gdouble shadows_ccorrect;
+  gdouble highlights_ccorrect;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  shadows = g_value_get_double (gimp_value_array_index (args, 1));
+  highlights = g_value_get_double (gimp_value_array_index (args, 2));
+  whitepoint = g_value_get_double (gimp_value_array_index (args, 3));
+  radius = g_value_get_double (gimp_value_array_index (args, 4));
+  compress = g_value_get_double (gimp_value_array_index (args, 5));
+  shadows_ccorrect = g_value_get_double (gimp_value_array_index (args, 6));
+  highlights_ccorrect = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+          node = gegl_node_new_child (NULL,
+                                      "operation",           "gegl:shadows-highlights",
+                                      "shadows",             shadows,
+                                      "highlights",          highlights,
+                                      "whitepoint",          whitepoint,
+                                      "radius",              radius,
+                                      "compress",            compress,
+                                      "shadows-ccorrect",    shadows_ccorrect,
+                                      "highlights-ccorrect", highlights_ccorrect,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Shadows-Highlights"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_posterize_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 levels;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  levels = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:posterize",
+                                 "levels",    levels,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Posterize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_threshold_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 channel;
+  gdouble low_threshold;
+  gdouble high_threshold;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  channel = g_value_get_enum (gimp_value_array_index (args, 1));
+  low_threshold = g_value_get_double (gimp_value_array_index (args, 2));
+  high_threshold = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:threshold",
+                                 "channel",   channel,
+                                 "low",       low_threshold,
+                                 "high",      high_threshold,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Threshold"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_drawable_color_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-drawable-brightness-contrast
+   */
+  procedure = gimp_procedure_new (drawable_brightness_contrast_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-brightness-contrast");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-brightness-contrast",
+                                     "Modify brightness/contrast in the specified drawable.",
+                                     "This procedures allows the brightness and contrast of the specified drawable to be modified. Both 'brightness' and 'contrast' parameters are defined between -1.0 and 1.0.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("brightness",
+                                                    "brightness",
+                                                    "Brightness adjustment",
+                                                    -1.0, 1.0, -1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("contrast",
+                                                    "contrast",
+                                                    "Contrast adjustment",
+                                                    -1.0, 1.0, -1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-color-balance
+   */
+  procedure = gimp_procedure_new (drawable_color_balance_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-color-balance");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-color-balance",
+                                     "Modify the color balance of the specified drawable.",
+                                     "Modify the color balance of the specified drawable. There are three axis which can be modified: cyan-red, magenta-green, and yellow-blue. Negative values increase the amount of the former, positive values increase the amount of the latter. Color balance can be controlled with the 'transfer_mode' setting, which allows shadows, mid-tones, and highlights in an image to be affected differently. The 'preserve-lum' parameter, if TRUE, ensures that the luminosity of each pixel remains fixed.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transfer-mode",
+                                                  "transfer mode",
+                                                  "Transfer mode",
+                                                  GIMP_TYPE_TRANSFER_MODE,
+                                                  GIMP_TRANSFER_SHADOWS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("preserve-lum",
+                                                     "preserve lum",
+                                                     "Preserve luminosity values at each pixel",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("cyan-red",
+                                                    "cyan red",
+                                                    "Cyan-Red color balance",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("magenta-green",
+                                                    "magenta green",
+                                                    "Magenta-Green color balance",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("yellow-blue",
+                                                    "yellow blue",
+                                                    "Yellow-Blue color balance",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-colorize-hsl
+   */
+  procedure = gimp_procedure_new (drawable_colorize_hsl_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-colorize-hsl");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-colorize-hsl",
+                                     "Render the drawable as a grayscale image seen through a colored glass.",
+                                     "Desaturates the drawable, then tints it with the specified color. This tool is only valid on RGB color images. It will not operate on grayscale drawables.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("hue",
+                                                    "hue",
+                                                    "Hue in degrees",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("saturation",
+                                                    "saturation",
+                                                    "Saturation in percent",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lightness",
+                                                    "lightness",
+                                                    "Lightness in percent",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-curves-explicit
+   */
+  procedure = gimp_procedure_new (drawable_curves_explicit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-curves-explicit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-curves-explicit",
+                                     "Modifies the intensity curve(s) for specified drawable.",
+                                     "Modifies the intensity mapping for one channel in the specified drawable. The channel can be either an intensity component, or the value. The 'values' parameter is an array of doubles which explicitly defines how each pixel value in the drawable will be modified. Use the 'gimp-curves-spline' function to modify intensity levels with Catmull Rom splines.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-values",
+                                                      "num values",
+                                                      "The number of values in the new curve",
+                                                      256, 2096, 256,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("values",
+                                                            "values",
+                                                            "The explicit curve",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-curves-spline
+   */
+  procedure = gimp_procedure_new (drawable_curves_spline_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-curves-spline");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-curves-spline",
+                                     "Modifies the intensity curve(s) for specified drawable.",
+                                     "Modifies the intensity mapping for one channel in the specified drawable. The channel can be either an intensity component, or the value. The 'points' parameter is an array of doubles which define a set of control points which describe a Catmull Rom spline which yields the final intensity curve. Use the 'gimp-curves-explicit' function to explicitly modify intensity levels.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-points",
+                                                      "num points",
+                                                      "The number of values in the control point array",
+                                                      4, 2048, 4,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("points",
+                                                            "points",
+                                                            "The spline control points: { cp1.x, cp1.y, cp2.x, cp2.y, ... }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-extract-component
+   */
+  procedure = gimp_procedure_new (drawable_extract_component_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-extract-component");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-extract-component",
+                                     "Extract a color model component.",
+                                     "Extract a color model component.",
+                                     "Compatibility procedure. Please see 'gegl:component-extract' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:component-extract' for credits.",
+                                     "2021",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("component",
+                                                     "component",
+                                                     "Component (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5), HSL Saturation (6), HSL Lightness (7), CMYK Cyan (8), CMYK Magenta (9), CMYK Yellow (10), CMYK Key (11), Y'CbCr Y' (12), Y'CbCr Cb (13), Y'CbCr Cr (14), LAB L (15), LAB A (16), LAB B (17), LCH C(ab) (18), LCH H(ab) (19), Alpha (20))",
+                                                     0, 20, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("invert",
+                                                     "invert",
+                                                     "Invert the extracted component",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("linear",
+                                                     "linear",
+                                                     "Use linear output instead of gamma corrected",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-desaturate
+   */
+  procedure = gimp_procedure_new (drawable_desaturate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-desaturate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-desaturate",
+                                     "Desaturate the contents of the specified drawable, with the specified formula.",
+                                     "This procedure desaturates the contents of the specified drawable, with the specified formula. This procedure only works on drawables of type RGB color.",
+                                     "Karine Delvare",
+                                     "Karine Delvare",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("desaturate-mode",
+                                                  "desaturate mode",
+                                                  "The formula to use to desaturate",
+                                                  GIMP_TYPE_DESATURATE_MODE,
+                                                  GIMP_DESATURATE_LIGHTNESS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-equalize
+   */
+  procedure = gimp_procedure_new (drawable_equalize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-equalize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-equalize",
+                                     "Equalize the contents of the specified drawable.",
+                                     "This procedure equalizes the contents of the specified drawable. Each intensity channel is equalized independently. The equalized intensity is given as inten' = (255 - inten). The 'mask_only' option specifies whether to adjust only the area of the image within the selection bounds, or the entire image based on the histogram of the selected area. If there is no selection, the entire image is adjusted based on the histogram for the entire image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("mask-only",
+                                                     "mask only",
+                                                     "Equalization option",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-histogram
+   */
+  procedure = gimp_procedure_new (drawable_histogram_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-histogram");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-histogram",
+                                     "Returns information on the intensity histogram for the specified drawable.",
+                                     "This tool makes it possible to gather information about the intensity histogram of a drawable. A channel to examine is first specified. This can be either value, red, green, or blue, depending on whether the drawable is of type color or grayscale. Second, a range of intensities are specified. The 'gimp-drawable-histogram' function returns statistics based on the pixels in the drawable that fall under this range of values. Mean, standard deviation, median, number of pixels, and percentile are all returned. Additionally, the total count of pixels in the image is returned. Counts of pixels are weighted by any associated alpha values and by the current selection mask. That is, pixels that lie outside an active selection mask will not be counted. Similarly, pixels with transparent alpha values will not be counted. The returned mean, std_dev and median are in the range (0..255) for 8-bit images or if the plug-in is not precision-aware, and in the range (0.0..1.0) otherwise.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to query",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("start-range",
+                                                    "start range",
+                                                    "Start of the intensity measurement range",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("end-range",
+                                                    "end range",
+                                                    "End of the intensity measurement range",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("mean",
+                                                        "mean",
+                                                        "Mean intensity value",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("std-dev",
+                                                        "std dev",
+                                                        "Standard deviation of intensity values",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("median",
+                                                        "median",
+                                                        "Median intensity value",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("pixels",
+                                                        "pixels",
+                                                        "Alpha-weighted pixel count for entire image",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("count",
+                                                        "count",
+                                                        "Alpha-weighted pixel count for range",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("percentile",
+                                                        "percentile",
+                                                        "Percentile that range falls under",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-hue-saturation
+   */
+  procedure = gimp_procedure_new (drawable_hue_saturation_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-hue-saturation");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-hue-saturation",
+                                     "Modify hue, lightness, and saturation in the specified drawable.",
+                                     "This procedure allows the hue, lightness, and saturation in the specified drawable to be modified. The 'hue-range' parameter provides the capability to limit range of affected hues. The 'overlap' parameter provides blending into neighboring hue channels when rendering.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("hue-range",
+                                                  "hue range",
+                                                  "Range of affected hues",
+                                                  GIMP_TYPE_HUE_RANGE,
+                                                  GIMP_HUE_RANGE_ALL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("hue-offset",
+                                                    "hue offset",
+                                                    "Hue offset in degrees",
+                                                    -180, 180, -180,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lightness",
+                                                    "lightness",
+                                                    "Lightness modification",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("saturation",
+                                                    "saturation",
+                                                    "Saturation modification",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("overlap",
+                                                    "overlap",
+                                                    "Overlap other hue channels",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-invert
+   */
+  procedure = gimp_procedure_new (drawable_invert_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-invert");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-invert",
+                                     "Invert the contents of the specified drawable.",
+                                     "This procedure inverts the contents of the specified drawable. Each intensity channel is inverted independently. The inverted intensity is given as inten' = (255 - inten). If 'linear' is TRUE, the drawable is inverted in linear space.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("linear",
+                                                     "linear",
+                                                     "Whether to invert in linear space",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-levels
+   */
+  procedure = gimp_procedure_new (drawable_levels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-levels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-levels",
+                                     "Modifies intensity levels in the specified drawable.",
+                                     "This tool allows intensity levels in the specified drawable to be remapped according to a set of parameters. The low/high input levels specify an initial mapping from the source intensities. The gamma value determines how intensities between the low and high input intensities are interpolated. A gamma value of 1.0 results in a linear interpolation. Higher gamma values result in more high-level intensities. Lower gamma values result in more low-level intensities. The low/high output levels constrain the final intensity mapping--that is, no final intensity will be lower than the low output level and no final intensity will be higher than the high output level. This tool is only valid on RGB color and grayscale images.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to modify",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("low-input",
+                                                    "low input",
+                                                    "Intensity of lowest input",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("high-input",
+                                                    "high input",
+                                                    "Intensity of highest input",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("clamp-input",
+                                                     "clamp input",
+                                                     "Clamp input values before applying output levels",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gamma",
+                                                    "gamma",
+                                                    "Gamma adjustment factor",
+                                                    0.1, 10, 0.1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("low-output",
+                                                    "low output",
+                                                    "Intensity of lowest output",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("high-output",
+                                                    "high output",
+                                                    "Intensity of highest output",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("clamp-output",
+                                                     "clamp output",
+                                                     "Clamp final output values",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-levels-stretch
+   */
+  procedure = gimp_procedure_new (drawable_levels_stretch_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-levels-stretch");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-levels-stretch",
+                                     "Automatically modifies intensity levels in the specified drawable.",
+                                     "This procedure allows intensity levels in the specified drawable to be remapped according to a set of guessed parameters. It is equivalent to clicking the \"Auto\" button in the Levels tool.",
+                                     "Joao S.O. Bueno, Shawn Willden",
+                                     "Joao S.O. Bueno, Shawn Willden",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-shadows-highlights
+   */
+  procedure = gimp_procedure_new (drawable_shadows_highlights_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-shadows-highlights");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-shadows-highlights",
+                                     "Perform shadows and highlights correction.",
+                                     "This filter allows adjusting shadows and highlights in the image separately. The implementation closely follow its counterpart in the Darktable photography software.",
+                                     "Compatibility procedure. Please see 'gegl:shadows-highlights' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:shadows-highlights' for credits.",
+                                     "2021",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("shadows",
+                                                    "shadows",
+                                                    "Adjust exposure of shadows",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("highlights",
+                                                    "highlights",
+                                                    "Adjust exposure of highlights",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("whitepoint",
+                                                    "whitepoint",
+                                                    "Shift white point",
+                                                    -10, 10, -10,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Spatial extent",
+                                                    0.1, 1500, 0.1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("compress",
+                                                    "compress",
+                                                    "Compress the effect on shadows/highlights and preserve midtones",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("shadows-ccorrect",
+                                                    "shadows ccorrect",
+                                                    "Adjust saturation of shadows",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("highlights-ccorrect",
+                                                    "highlights ccorrect",
+                                                    "Adjust saturation of highlights",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-posterize
+   */
+  procedure = gimp_procedure_new (drawable_posterize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-posterize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-posterize",
+                                     "Posterize the specified drawable.",
+                                     "This procedures reduces the number of shades allows in each intensity channel to the specified 'levels' parameter.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("levels",
+                                                      "levels",
+                                                      "Levels of posterization",
+                                                      2, 255, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-threshold
+   */
+  procedure = gimp_procedure_new (drawable_threshold_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-threshold");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-threshold",
+                                     "Threshold the specified drawable.",
+                                     "This procedures generates a threshold map of the specified drawable. All pixels between the values of 'low_threshold' and 'high_threshold', on the scale of 'channel' are replaced with white, and all other pixels with black.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("channel",
+                                                  "channel",
+                                                  "The channel to base the threshold on",
+                                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                  GIMP_HISTOGRAM_VALUE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("low-threshold",
+                                                    "low threshold",
+                                                    "The low threshold value",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("high-threshold",
+                                                    "high threshold",
+                                                    "The high threshold value",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/drawable-edit-cmds.c b/app/pdb/drawable-edit-cmds.c
new file mode 100644
index 0000000..43a0a4d
--- /dev/null
+++ b/app/pdb/drawable-edit-cmds.c
@@ -0,0 +1,620 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp-gradients.h"
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpdrawable-bucket-fill.h"
+#include "core/gimpdrawable-edit.h"
+#include "core/gimpdrawable-gradient.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+#include "core/gimpstrokeoptions.h"
+#include "paint/gimppaintoptions.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+drawable_edit_clear_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_edit_clear (drawable, context);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_edit_fill_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 fill_type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fill_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
+
+          gimp_context_set_opacity (GIMP_CONTEXT (options),
+                                    gimp_context_get_opacity (context));
+          gimp_context_set_paint_mode (GIMP_CONTEXT (options),
+                                       gimp_context_get_paint_mode (context));
+
+          if (gimp_fill_options_set_by_fill_type (options, context,
+                                                  fill_type, error))
+            {
+              gimp_drawable_edit_fill (drawable, options, NULL);
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_edit_bucket_fill_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 fill_type;
+  gdouble x;
+  gdouble y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fill_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
+
+          gimp_context_set_opacity (GIMP_CONTEXT (options),
+                                    gimp_context_get_opacity (context));
+          gimp_context_set_paint_mode (GIMP_CONTEXT (options),
+                                       gimp_context_get_paint_mode (context));
+
+          gimp_fill_options_set_antialias (options,
+                                           GIMP_PDB_CONTEXT (context)->antialias);
+
+          if (gimp_fill_options_set_by_fill_type (options, context,
+                                                  fill_type, error))
+            {
+              gimp_drawable_bucket_fill (drawable, options,
+                                         GIMP_PDB_CONTEXT (context)->sample_transparent,
+                                         GIMP_PDB_CONTEXT (context)->sample_criterion,
+                                         GIMP_PDB_CONTEXT (context)->sample_threshold,
+                                         GIMP_PDB_CONTEXT (context)->sample_merged,
+                                         GIMP_PDB_CONTEXT (context)->diagonal_neighbors,
+                                         x, y);
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_edit_gradient_fill_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 gradient_type;
+  gdouble offset;
+  gboolean supersample;
+  gint32 supersample_max_depth;
+  gdouble supersample_threshold;
+  gboolean dither;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  gradient_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  offset = g_value_get_double (gimp_value_array_index (args, 2));
+  supersample = g_value_get_boolean (gimp_value_array_index (args, 3));
+  supersample_max_depth = g_value_get_int (gimp_value_array_index (args, 4));
+  supersample_threshold = g_value_get_double (gimp_value_array_index (args, 5));
+  dither = g_value_get_boolean (gimp_value_array_index (args, 6));
+  x1 = g_value_get_double (gimp_value_array_index (args, 7));
+  y1 = g_value_get_double (gimp_value_array_index (args, 8));
+  x2 = g_value_get_double (gimp_value_array_index (args, 9));
+  y2 = g_value_get_double (gimp_value_array_index (args, 10));
+
+  if (success)
+    {
+      success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                            GIMP_PDB_ITEM_CONTENT, error) &&
+                 gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error));
+
+      if (success)
+        {
+          if (supersample)
+            {
+              if (supersample_max_depth < 1 || supersample_max_depth > 9)
+                success = FALSE;
+
+              if (supersample_threshold < 0.0 || supersample_threshold > 4.0)
+                success = FALSE;
+            }
+          else
+            {
+              supersample_max_depth = CLAMP (supersample_max_depth, 1, 9);
+              supersample_threshold = CLAMP (supersample_threshold, 0.0, 4.0);
+            }
+       }
+
+      if (success)
+        {
+          /* all options should have the same value, so pick a random one */
+          GimpPaintOptions *options =
+            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                                "gimp-paintbrush");
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Gradient"));
+
+          gimp_drawable_gradient (drawable,
+                                  context,
+                                  gimp_context_get_gradient (context),
+                                  GIMP_PDB_CONTEXT (context)->distance_metric,
+                                  gimp_context_get_paint_mode (context),
+                                  gradient_type,
+                                  gimp_context_get_opacity (context),
+                                  offset,
+                                  options->gradient_options->gradient_repeat,
+                                  options->gradient_options->gradient_reverse,
+                                  options->gradient_options->gradient_blend_color_space,
+                                  supersample,
+                                  supersample_max_depth,
+                                  supersample_threshold,
+                                  dither,
+                                  x1, y1, x2, y2,
+                                  progress);
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_edit_stroke_selection_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage         *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpStrokeOptions *options;
+          GimpPaintOptions  *paint_options;
+
+          options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+          paint_options =
+            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
+          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
+
+          success = gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)),
+                                      drawable, context, options, paint_options,
+                                      TRUE, progress, error);
+
+          g_object_unref (paint_options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+drawable_edit_stroke_item_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpItem *item;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_pdb_item_is_attached (item,
+                                     gimp_item_get_image (GIMP_ITEM (drawable)),
+                                     0, error))
+        {
+          GimpStrokeOptions *options;
+          GimpPaintOptions  *paint_options;
+
+          options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+          paint_options =
+            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
+          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
+
+          success = gimp_item_stroke (item, drawable,
+                                      context, options, paint_options,
+                                      TRUE, progress, error);
+
+          g_object_unref (paint_options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_drawable_edit_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-drawable-edit-clear
+   */
+  procedure = gimp_procedure_new (drawable_edit_clear_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-edit-clear");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-edit-clear",
+                                     "Clear selected area of drawable.",
+                                     "This procedure clears the specified drawable. If the drawable has an alpha channel, the cleared pixels will become transparent. If the drawable does not have an alpha channel, cleared pixels will be set to the background color. This procedure only affects regions within a selection if there is a selection active.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-background'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to clear from",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-edit-fill
+   */
+  procedure = gimp_procedure_new (drawable_edit_fill_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-edit-fill");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-edit-fill",
+                                     "Fill selected area of drawable.",
+                                     "This procedure fills the specified drawable according to fill mode. This procedure only affects regions within a selection if there is a selection active. If you want to fill the whole drawable, regardless of the selection, use 'gimp-drawable-fill'.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-foreground', 'gimp-context-set-background', 'gimp-context-set-pattern'.",
+                                     "Spencer Kimball & Peter Mattis & Raphael Quinet",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-2000",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to fill to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-type",
+                                                  "fill type",
+                                                  "The type of fill",
+                                                  GIMP_TYPE_FILL_TYPE,
+                                                  GIMP_FILL_FOREGROUND,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-edit-bucket-fill
+   */
+  procedure = gimp_procedure_new (drawable_edit_bucket_fill_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-edit-bucket-fill");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-edit-bucket-fill",
+                                     "Fill the area by a seed fill starting at the specified coordinates.",
+                                     "This procedure does a seed fill at the specified coordinates, using various parameters from the current context.\n"
+                                     "In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-foreground', 'gimp-context-set-background', 'gimp-context-set-pattern', 'gimp-context-set-sample-threshold', 'gimp-context-set-sample-merged', 'gimp-context-set-sample-criterion', 'gimp-context-set-diagonal-neighbors', 'gimp-context-set-antialias'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-type",
+                                                  "fill type",
+                                                  "The type of fill",
+                                                  GIMP_TYPE_FILL_TYPE,
+                                                  GIMP_FILL_FOREGROUND,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "The x coordinate of this bucket fill's application.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "The y coordinate of this bucket fill's application.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-edit-gradient-fill
+   */
+  procedure = gimp_procedure_new (drawable_edit_gradient_fill_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-edit-gradient-fill");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-edit-gradient-fill",
+                                     "Draw a gradient between the starting and ending coordinates with the specified gradient type.",
+                                     "This tool requires information on the gradient type. It creates the specified variety of gradient using the starting and ending coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric is also relevant and can be updated with 'gimp-context-set-distance-metric'.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-foreground', 'gimp-context-set-background', 'gimp-context-set-gradient' and all gradient property settings, 'gimp-context-set-distance-metric'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("gradient-type",
+                                                  "gradient type",
+                                                  "The type of gradient",
+                                                  GIMP_TYPE_GRADIENT_TYPE,
+                                                  GIMP_GRADIENT_LINEAR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("offset",
+                                                    "offset",
+                                                    "Offset relates to the starting and ending coordinates specified for the blend. This parameter is mode dependent.",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "Do adaptive supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("supersample-max-depth",
+                                                      "supersample max depth",
+                                                      "Maximum recursion levels for supersampling",
+                                                      1, 9, 1,
+                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("supersample-threshold",
+                                                    "supersample threshold",
+                                                    "Supersampling threshold",
+                                                    0, 4, 0,
+                                                    GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("dither",
+                                                     "dither",
+                                                     "Use dithering to reduce banding",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The x coordinate of this gradient's starting point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The y coordinate of this gradient's starting point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The x coordinate of this gradient's ending point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The y coordinate of this gradient's ending point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-edit-stroke-selection
+   */
+  procedure = gimp_procedure_new (drawable_edit_stroke_selection_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-edit-stroke-selection");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-edit-stroke-selection",
+                                     "Stroke the current selection",
+                                     "This procedure strokes the current selection, painting along the selection boundary with the active paint method and brush, or using a plain line with configurable properties. The paint is applied to the specified drawable regardless of the active selection.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-paint-method', 'gimp-context-set-stroke-method', 'gimp-context-set-foreground', 'gimp-context-set-brush' and all brush property settings, 'gimp-context-set-gradient' and all gradient property settings, 'gimp-context-set-line-width' and all line property settings, 'gimp-context-set-antialias'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to stroke to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-edit-stroke-item
+   */
+  procedure = gimp_procedure_new (drawable_edit_stroke_item_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-edit-stroke-item");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-edit-stroke-item",
+                                     "Stroke the specified item",
+                                     "This procedure strokes the specified item, painting along its outline (e.g. along a path, or along a channel's boundary), with the active paint method and brush, or using a plain line with configurable properties.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-opacity', 'gimp-context-set-paint-mode', 'gimp-context-set-paint-method', 'gimp-context-set-stroke-method', 'gimp-context-set-foreground', 'gimp-context-set-brush' and all brush property settings, 'gimp-context-set-gradient' and all gradient property settings, 'gimp-context-set-line-width' and all line property settings, 'gimp-context-set-antialias'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to stroke to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to stroke",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/drawable-transform-cmds.c b/app/pdb/drawable-transform-cmds.c
new file mode 100644
index 0000000..60e0919
--- /dev/null
+++ b/app/pdb/drawable-transform-cmds.c
@@ -0,0 +1,2894 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "config/gimpcoreconfig.h"
+#include "core/gimp-transform-utils.h"
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable-transform.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+drawable_transform_flip_simple_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 flip_type;
+  gboolean auto_center;
+  gdouble axis;
+  gboolean clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  flip_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  axis = g_value_get_double (gimp_value_array_index (args, 3));
+  clip_result = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+
+          gimp_transform_get_flip_axis (x, y, width, height,
+                                        flip_type, auto_center, &axis);
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_flip (drawable, context,
+                                                  flip_type, axis, clip_result))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_flip (GIMP_ITEM (drawable), context,
+                              flip_type, axis, clip_result);
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_flip_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gboolean clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 5));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 6));
+  clip_result = g_value_get_boolean (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_flip_free (&matrix,
+                                           x0, y0, x1, y1);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Flipping"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_flip_default_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gboolean interpolate;
+  gboolean clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 5));
+  clip_result = g_value_get_boolean (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_flip_free (&matrix,
+                                           x0, y0, x1, y1);
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Flipping"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_perspective_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+  gdouble x3;
+  gdouble y3;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  x2 = g_value_get_double (gimp_value_array_index (args, 5));
+  y2 = g_value_get_double (gimp_value_array_index (args, 6));
+  x3 = g_value_get_double (gimp_value_array_index (args, 7));
+  y3 = g_value_get_double (gimp_value_array_index (args, 8));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 9));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 10));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 13));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_perspective (&matrix,
+                                             x, y, width, height,
+                                             x0, y0, x1, y1,
+                                             x2, y2, x3, y3);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Perspective"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_perspective_default_invoker (GimpProcedure         *procedure,
+                                                Gimp                  *gimp,
+                                                GimpContext           *context,
+                                                GimpProgress          *progress,
+                                                const GimpValueArray  *args,
+                                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+  gdouble x3;
+  gdouble y3;
+  gboolean interpolate;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  x2 = g_value_get_double (gimp_value_array_index (args, 5));
+  y2 = g_value_get_double (gimp_value_array_index (args, 6));
+  x3 = g_value_get_double (gimp_value_array_index (args, 7));
+  y3 = g_value_get_double (gimp_value_array_index (args, 8));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 9));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 10));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_perspective (&matrix,
+                                             x, y, width, height,
+                                             x0, y0, x1, y1,
+                                             x2, y2, x3, y3);
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Perspective"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_rotate_simple_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 rotate_type;
+  gboolean auto_center;
+  gint32 center_x;
+  gint32 center_y;
+  gboolean clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  rotate_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  center_x = g_value_get_int (gimp_value_array_index (args, 3));
+  center_y = g_value_get_int (gimp_value_array_index (args, 4));
+  clip_result = g_value_get_boolean (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          gdouble      cx    = center_x;
+          gdouble      cy    = center_y;
+
+          gimp_transform_get_rotate_center (x, y, width, height,
+                                            auto_center, &cx, &cy);
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_rotate (drawable, context,
+                                                    rotate_type, cx, cy,
+                                                    clip_result))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_rotate (GIMP_ITEM (drawable), context,
+                                rotate_type, cx, cy,
+                                clip_result);
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_rotate_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble angle;
+  gboolean auto_center;
+  gint32 center_x;
+  gint32 center_y;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  angle = g_value_get_double (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  center_x = g_value_get_int (gimp_value_array_index (args, 3));
+  center_y = g_value_get_int (gimp_value_array_index (args, 4));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 5));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 6));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          if (auto_center)
+            gimp_transform_matrix_rotate_rect (&matrix,
+                                               x, y, width, height, angle);
+          else
+            gimp_transform_matrix_rotate_center (&matrix,
+                                                 center_x, center_y, angle);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Rotating"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_rotate_default_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble angle;
+  gboolean auto_center;
+  gint32 center_x;
+  gint32 center_y;
+  gboolean interpolate;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  angle = g_value_get_double (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  center_x = g_value_get_int (gimp_value_array_index (args, 3));
+  center_y = g_value_get_int (gimp_value_array_index (args, 4));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 5));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          if (auto_center)
+            gimp_transform_matrix_rotate_rect (&matrix,
+                                               x, y, width, height, angle);
+          else
+            gimp_transform_matrix_rotate_center (&matrix,
+                                                 center_x, center_y, angle);
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Rotating"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_scale_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 5));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 6));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                          GIMP_PDB_ITEM_CONTENT |
+                                                          GIMP_PDB_ITEM_POSITION, error) && x0 < x1 && y0 < y1);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_scale (&matrix,
+                                       x, y, width, height,
+                                       x0, y0, x1 - x0, y1 - y0);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Scaling"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_scale_default_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gboolean interpolate;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 5));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                          GIMP_PDB_ITEM_CONTENT |
+                                                          GIMP_PDB_ITEM_POSITION, error) && x0 < x1 && y0 < y1);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_scale (&matrix,
+                                       x, y, width, height,
+                                       x0, y0, x1 - x0, y1 - y0);
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Scaling"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_shear_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 shear_type;
+  gdouble magnitude;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  shear_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  magnitude = g_value_get_double (gimp_value_array_index (args, 2));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 3));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 4));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_shear (&matrix,
+                                       x, y, width, height,
+                                       shear_type, magnitude);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Shearing"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_shear_default_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 shear_type;
+  gdouble magnitude;
+  gboolean interpolate;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  shear_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  magnitude = g_value_get_double (gimp_value_array_index (args, 2));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 3));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_shear (&matrix,
+                                       x, y, width, height,
+                                       shear_type, magnitude);
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Shearing"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_2d_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble source_x;
+  gdouble source_y;
+  gdouble scale_x;
+  gdouble scale_y;
+  gdouble angle;
+  gdouble dest_x;
+  gdouble dest_y;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  source_x = g_value_get_double (gimp_value_array_index (args, 1));
+  source_y = g_value_get_double (gimp_value_array_index (args, 2));
+  scale_x = g_value_get_double (gimp_value_array_index (args, 3));
+  scale_y = g_value_get_double (gimp_value_array_index (args, 4));
+  angle = g_value_get_double (gimp_value_array_index (args, 5));
+  dest_x = g_value_get_double (gimp_value_array_index (args, 6));
+  dest_y = g_value_get_double (gimp_value_array_index (args, 7));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 8));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 9));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 12));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity  (&matrix);
+          gimp_matrix3_translate (&matrix, -source_x, -source_y);
+          gimp_matrix3_scale     (&matrix, scale_x, scale_y);
+          gimp_matrix3_rotate    (&matrix, angle);
+          gimp_matrix3_translate (&matrix, dest_x, dest_y);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transform"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_2d_default_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble source_x;
+  gdouble source_y;
+  gdouble scale_x;
+  gdouble scale_y;
+  gdouble angle;
+  gdouble dest_x;
+  gdouble dest_y;
+  gboolean interpolate;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  source_x = g_value_get_double (gimp_value_array_index (args, 1));
+  source_y = g_value_get_double (gimp_value_array_index (args, 2));
+  scale_x = g_value_get_double (gimp_value_array_index (args, 3));
+  scale_y = g_value_get_double (gimp_value_array_index (args, 4));
+  angle = g_value_get_double (gimp_value_array_index (args, 5));
+  dest_x = g_value_get_double (gimp_value_array_index (args, 6));
+  dest_y = g_value_get_double (gimp_value_array_index (args, 7));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 8));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity  (&matrix);
+          gimp_matrix3_translate (&matrix, -source_x, -source_y);
+          gimp_matrix3_scale     (&matrix, scale_x, scale_y);
+          gimp_matrix3_rotate    (&matrix, angle);
+          gimp_matrix3_translate (&matrix, dest_x, dest_y);
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transforming"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_matrix_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble coeff_0_0;
+  gdouble coeff_0_1;
+  gdouble coeff_0_2;
+  gdouble coeff_1_0;
+  gdouble coeff_1_1;
+  gdouble coeff_1_2;
+  gdouble coeff_2_0;
+  gdouble coeff_2_1;
+  gdouble coeff_2_2;
+  gint32 transform_direction;
+  gint32 interpolation;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  coeff_0_0 = g_value_get_double (gimp_value_array_index (args, 1));
+  coeff_0_1 = g_value_get_double (gimp_value_array_index (args, 2));
+  coeff_0_2 = g_value_get_double (gimp_value_array_index (args, 3));
+  coeff_1_0 = g_value_get_double (gimp_value_array_index (args, 4));
+  coeff_1_1 = g_value_get_double (gimp_value_array_index (args, 5));
+  coeff_1_2 = g_value_get_double (gimp_value_array_index (args, 6));
+  coeff_2_0 = g_value_get_double (gimp_value_array_index (args, 7));
+  coeff_2_1 = g_value_get_double (gimp_value_array_index (args, 8));
+  coeff_2_2 = g_value_get_double (gimp_value_array_index (args, 9));
+  transform_direction = g_value_get_enum (gimp_value_array_index (args, 10));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 11));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 14));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          GimpMatrix3  matrix;
+          gint         off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          matrix.coeff[0][0] = coeff_0_0;
+          matrix.coeff[0][1] = coeff_0_1;
+          matrix.coeff[0][2] = coeff_0_2;
+          matrix.coeff[1][0] = coeff_1_0;
+          matrix.coeff[1][1] = coeff_1_1;
+          matrix.coeff[1][2] = coeff_1_2;
+          matrix.coeff[2][0] = coeff_2_0;
+          matrix.coeff[2][1] = coeff_2_1;
+          matrix.coeff[2][2] = coeff_2_2;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transforming"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, transform_direction,
+                                                    interpolation,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   transform_direction,
+                                   interpolation,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+drawable_transform_matrix_default_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gdouble coeff_0_0;
+  gdouble coeff_0_1;
+  gdouble coeff_0_2;
+  gdouble coeff_1_0;
+  gdouble coeff_1_1;
+  gdouble coeff_1_2;
+  gdouble coeff_2_0;
+  gdouble coeff_2_1;
+  gdouble coeff_2_2;
+  gboolean interpolate;
+  gint32 clip_result;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  coeff_0_0 = g_value_get_double (gimp_value_array_index (args, 1));
+  coeff_0_1 = g_value_get_double (gimp_value_array_index (args, 2));
+  coeff_0_2 = g_value_get_double (gimp_value_array_index (args, 3));
+  coeff_1_0 = g_value_get_double (gimp_value_array_index (args, 4));
+  coeff_1_1 = g_value_get_double (gimp_value_array_index (args, 5));
+  coeff_1_2 = g_value_get_double (gimp_value_array_index (args, 6));
+  coeff_2_0 = g_value_get_double (gimp_value_array_index (args, 7));
+  coeff_2_1 = g_value_get_double (gimp_value_array_index (args, 8));
+  coeff_2_2 = g_value_get_double (gimp_value_array_index (args, 9));
+  interpolate = g_value_get_boolean (gimp_value_array_index (args, 10));
+  clip_result = g_value_get_enum (gimp_value_array_index (args, 11));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          matrix.coeff[0][0] = coeff_0_0;
+          matrix.coeff[0][1] = coeff_0_1;
+          matrix.coeff[0][2] = coeff_0_2;
+          matrix.coeff[1][0] = coeff_1_0;
+          matrix.coeff[1][1] = coeff_1_1;
+          matrix.coeff[1][2] = coeff_1_2;
+          matrix.coeff[2][0] = coeff_2_0;
+          matrix.coeff[2][1] = coeff_2_1;
+          matrix.coeff[2][2] = coeff_2_2;
+
+          if (interpolate)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transforming"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    clip_result, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              clip_result = gimp_item_get_clip (GIMP_ITEM (drawable), clip_result);
+
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation_type,
+                                   clip_result, progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+void
+register_drawable_transform_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-drawable-transform-flip-simple
+   */
+  procedure = gimp_procedure_new (drawable_transform_flip_simple_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-flip-simple");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-flip-simple",
+                                     "Deprecated: Use 'gimp-item-transform-flip-simple' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-flip-simple' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-flip-simple");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("flip-type",
+                                                     "flip type",
+                                                     "Type of flip",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically position the axis in the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("axis",
+                                                    "axis",
+                                                    "coord. of flip axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("clip-result",
+                                                     "clip result",
+                                                     "Whether to clip results",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The flipped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-flip
+   */
+  procedure = gimp_procedure_new (drawable_transform_flip_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-flip");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-flip",
+                                     "Deprecated: Use 'gimp-item-transform-flip' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-flip' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-flip");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "horz. coord. of one end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "vert. coord. of one end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "horz. coord. of other end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "vert. coord. of other end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("clip-result",
+                                                     "clip result",
+                                                     "Whether to clip results",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The flipped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-flip-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_flip_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-flip-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-flip-default",
+                                     "Deprecated: Use 'gimp-item-transform-flip' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-flip' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-flip");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "horz. coord. of one end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "vert. coord. of one end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "horz. coord. of other end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "vert. coord. of other end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("clip-result",
+                                                     "clip result",
+                                                     "Whether to clip results",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The flipped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-perspective
+   */
+  procedure = gimp_procedure_new (drawable_transform_perspective_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-perspective");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-perspective",
+                                     "Deprecated: Use 'gimp-item-transform-perspective' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-perspective' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-perspective");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The new x coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The new y coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x3",
+                                                    "x3",
+                                                    "The new x coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y3",
+                                                    "y3",
+                                                    "The new y coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The newly mapped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-perspective-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_perspective_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-perspective-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-perspective-default",
+                                     "Deprecated: Use 'gimp-item-transform-perspective' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-perspective' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-perspective");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The new x coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The new y coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x3",
+                                                    "x3",
+                                                    "The new x coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y3",
+                                                    "y3",
+                                                    "The new y coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The newly mapped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-rotate-simple
+   */
+  procedure = gimp_procedure_new (drawable_transform_rotate_simple_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-rotate-simple");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-rotate-simple",
+                                     "Deprecated: Use 'gimp-item-transform-rotate-simple' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-rotate-simple' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-rotate-simple");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("rotate-type",
+                                                  "rotate type",
+                                                  "Type of rotation",
+                                                  GIMP_TYPE_ROTATION_TYPE,
+                                                  GIMP_ROTATE_90,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically rotate around the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("center-x",
+                                                      "center x",
+                                                      "The hor. coordinate of the center of rotation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("center-y",
+                                                      "center y",
+                                                      "The vert. coordinate of the center of rotation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("clip-result",
+                                                     "clip result",
+                                                     "Whether to clip results",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The rotated drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-rotate
+   */
+  procedure = gimp_procedure_new (drawable_transform_rotate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-rotate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-rotate",
+                                     "Deprecated: Use 'gimp-item-transform-rotate' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-rotate' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-rotate");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically rotate around the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("center-x",
+                                                      "center x",
+                                                      "The hor. coordinate of the center of rotation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("center-y",
+                                                      "center y",
+                                                      "The vert. coordinate of the center of rotation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The rotated drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-rotate-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_rotate_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-rotate-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-rotate-default",
+                                     "Deprecated: Use 'gimp-item-transform-rotate' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-rotate' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-rotate");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically rotate around the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("center-x",
+                                                      "center x",
+                                                      "The hor. coordinate of the center of rotation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("center-y",
+                                                      "center y",
+                                                      "The vert. coordinate of the center of rotation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The rotated drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-scale
+   */
+  procedure = gimp_procedure_new (drawable_transform_scale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-scale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-scale",
+                                     "Deprecated: Use 'gimp-item-transform-scale' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-scale' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-scale");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The scaled drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-scale-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_scale_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-scale-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-scale-default",
+                                     "Deprecated: Use 'gimp-item-transform-scale' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-scale' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-scale");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The scaled drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-shear
+   */
+  procedure = gimp_procedure_new (drawable_transform_shear_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-shear");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-shear",
+                                     "Deprecated: Use 'gimp-item-transform-shear' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-shear' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-shear");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("shear-type",
+                                                     "shear type",
+                                                     "Type of shear",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("magnitude",
+                                                    "magnitude",
+                                                    "The magnitude of the shear",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The sheared drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-shear-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_shear_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-shear-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-shear-default",
+                                     "Deprecated: Use 'gimp-item-transform-shear' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-shear' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-shear");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("shear-type",
+                                                     "shear type",
+                                                     "Type of shear",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("magnitude",
+                                                    "magnitude",
+                                                    "The magnitude of the shear",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The sheared drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-2d
+   */
+  procedure = gimp_procedure_new (drawable_transform_2d_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-2d");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-2d",
+                                     "Deprecated: Use 'gimp-item-transform-2d' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-2d' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-2d");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-x",
+                                                    "source x",
+                                                    "X coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-y",
+                                                    "source y",
+                                                    "Y coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-x",
+                                                    "scale x",
+                                                    "Amount to scale in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-y",
+                                                    "scale y",
+                                                    "Amount to scale in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-x",
+                                                    "dest x",
+                                                    "X coordinate of where the center goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-y",
+                                                    "dest y",
+                                                    "Y coordinate of where the center goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The transformed drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-2d-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_2d_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-2d-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-2d-default",
+                                     "Deprecated: Use 'gimp-item-transform-2d' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-2d' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-2d");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-x",
+                                                    "source x",
+                                                    "X coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-y",
+                                                    "source y",
+                                                    "Y coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-x",
+                                                    "scale x",
+                                                    "Amount to scale in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-y",
+                                                    "scale y",
+                                                    "Amount to scale in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-x",
+                                                    "dest x",
+                                                    "X coordinate of where the center goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-y",
+                                                    "dest y",
+                                                    "Y coordinate of where the center goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The transformed drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-matrix
+   */
+  procedure = gimp_procedure_new (drawable_transform_matrix_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-matrix");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-matrix",
+                                     "Deprecated: Use 'gimp-item-transform-matrix' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-matrix' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-matrix");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-0",
+                                                    "coeff 0 0",
+                                                    "coefficient (0,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-1",
+                                                    "coeff 0 1",
+                                                    "coefficient (0,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-2",
+                                                    "coeff 0 2",
+                                                    "coefficient (0,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-0",
+                                                    "coeff 1 0",
+                                                    "coefficient (1,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-1",
+                                                    "coeff 1 1",
+                                                    "coefficient (1,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-2",
+                                                    "coeff 1 2",
+                                                    "coefficient (1,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-0",
+                                                    "coeff 2 0",
+                                                    "coefficient (2,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-1",
+                                                    "coeff 2 1",
+                                                    "coefficient (2,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-2",
+                                                    "coeff 2 2",
+                                                    "coefficient (2,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("transform-direction",
+                                                  "transform direction",
+                                                  "Direction of transformation",
+                                                  GIMP_TYPE_TRANSFORM_DIRECTION,
+                                                  GIMP_TRANSFORM_FORWARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "This parameter is ignored",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("recursion-level",
+                                                      "recursion level",
+                                                      "This parameter is ignored",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The transformed drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-drawable-transform-matrix-default
+   */
+  procedure = gimp_procedure_new (drawable_transform_matrix_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-drawable-transform-matrix-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-drawable-transform-matrix-default",
+                                     "Deprecated: Use 'gimp-item-transform-matrix' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-matrix' instead.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2004",
+                                     "gimp-item-transform-matrix");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-0",
+                                                    "coeff 0 0",
+                                                    "coefficient (0,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-1",
+                                                    "coeff 0 1",
+                                                    "coefficient (0,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-2",
+                                                    "coeff 0 2",
+                                                    "coefficient (0,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-0",
+                                                    "coeff 1 0",
+                                                    "coefficient (1,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-1",
+                                                    "coeff 1 1",
+                                                    "coefficient (1,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-2",
+                                                    "coeff 1 2",
+                                                    "coefficient (1,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-0",
+                                                    "coeff 2 0",
+                                                    "coefficient (2,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-1",
+                                                    "coeff 2 1",
+                                                    "coefficient (2,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-2",
+                                                    "coeff 2 2",
+                                                    "coefficient (2,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolate",
+                                                     "interpolate",
+                                                     "Whether to use interpolation and supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clip-result",
+                                                  "clip result",
+                                                  "How to clip results",
+                                                  GIMP_TYPE_TRANSFORM_RESIZE,
+                                                  GIMP_TRANSFORM_RESIZE_ADJUST,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The transformed drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/dynamics-cmds.c b/app/pdb/dynamics-cmds.c
new file mode 100644
index 0000000..e071afa
--- /dev/null
+++ b/app/pdb/dynamics-cmds.c
@@ -0,0 +1,144 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+dynamics_refresh_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gimp_data_factory_data_refresh (gimp->dynamics_factory, context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+dynamics_get_list_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_dynamics = 0;
+  gchar **dynamics_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      dynamics_list = gimp_container_get_filtered_name_array (gimp_data_factory_get_container (gimp->dynamics_factory),
+                                                              filter, &num_dynamics);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_dynamics);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), dynamics_list, num_dynamics);
+    }
+
+  return return_vals;
+}
+
+void
+register_dynamics_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-dynamics-refresh
+   */
+  procedure = gimp_procedure_new (dynamics_refresh_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-dynamics-refresh");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-dynamics-refresh",
+                                     "Refresh current paint dynamics. This function always succeeds.",
+                                     "This procedure retrieves all paint dynamics currently in the user's paint dynamics path and updates the paint dynamics dialogs accordingly.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-dynamics-get-list
+   */
+  procedure = gimp_procedure_new (dynamics_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-dynamics-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-dynamics-get-list",
+                                     "Retrieve the list of loaded paint dynamics.",
+                                     "This procedure returns a list of the paint dynamics that are currently available.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-dynamics",
+                                                          "num dynamics",
+                                                          "The number of available paint dynamics",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("dynamics-list",
+                                                                 "dynamics list",
+                                                                 "The list of paint dynamics names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
new file mode 100644
index 0000000..04468b0
--- /dev/null
+++ b/app/pdb/edit-cmds.c
@@ -0,0 +1,1653 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp-edit.h"
+#include "core/gimp-gradients.h"
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable-bucket-fill.h"
+#include "core/gimpdrawable-edit.h"
+#include "core/gimpdrawable-gradient.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+#include "core/gimpstrokeoptions.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+edit_cut_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean non_empty = FALSE;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage *image    = gimp_item_get_image (GIMP_ITEM (drawable));
+          GError    *my_error = NULL;
+
+          non_empty = gimp_edit_cut (image, drawable, context, &my_error) != NULL;
+
+          if (! non_empty)
+            {
+              gimp_message_literal (gimp,
+                                    G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                                    my_error->message);
+              g_clear_error (&my_error);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), non_empty);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_copy_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean non_empty = FALSE;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error))
+        {
+          GimpImage *image    = gimp_item_get_image (GIMP_ITEM (drawable));
+          GError    *my_error = NULL;
+
+          non_empty = gimp_edit_copy (image, drawable, context, &my_error) != NULL;
+
+          if (! non_empty)
+            {
+              gimp_message_literal (gimp,
+                                    G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                                    my_error->message);
+              g_clear_error (&my_error);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), non_empty);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_copy_visible_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean non_empty = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GError *my_error = NULL;
+
+      non_empty = gimp_edit_copy_visible (image, context, &my_error) != NULL;
+
+      if (! non_empty)
+        {
+          gimp_message_literal (gimp,
+                                G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                                my_error->message);
+          g_clear_error (&my_error);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), non_empty);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_paste_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean paste_into;
+  GimpLayer *floating_sel = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  paste_into = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpObject *paste = gimp_get_clipboard_object (gimp);
+
+      if (paste &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          floating_sel = gimp_edit_paste (gimp_item_get_image (GIMP_ITEM (drawable)),
+                                          drawable, paste,
+                                          paste_into ?
+                                          GIMP_PASTE_TYPE_FLOATING_INTO :
+                                          GIMP_PASTE_TYPE_FLOATING,
+                                          -1, -1, -1, -1);
+
+          if (! floating_sel)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), floating_sel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_paste_as_new_image_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image = NULL;
+
+  GimpObject *paste = gimp_get_clipboard_object (gimp);
+
+  if (paste)
+    {
+      image = gimp_edit_paste_as_new_image (gimp, paste);
+
+      if (! image)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_named_cut_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  const gchar *buffer_name;
+  gchar *real_name = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage *image    = gimp_item_get_image (GIMP_ITEM (drawable));
+          GError    *my_error = NULL;
+
+          real_name = (gchar *) gimp_edit_named_cut (image, buffer_name,
+                                                     drawable, context, &my_error);
+
+          if (real_name)
+            {
+              real_name = g_strdup (real_name);
+            }
+          else
+            {
+              gimp_message_literal (gimp,
+                                    G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                                    my_error->message);
+              g_clear_error (&my_error);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), real_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_named_copy_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  const gchar *buffer_name;
+  gchar *real_name = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, 0, error))
+        {
+          GimpImage *image    = gimp_item_get_image (GIMP_ITEM (drawable));
+          GError    *my_error = NULL;
+
+          real_name = (gchar *) gimp_edit_named_copy (image, buffer_name,
+                                                      drawable, context, &my_error);
+
+          if (real_name)
+            {
+              real_name = g_strdup (real_name);
+            }
+          else
+            {
+              gimp_message_literal (gimp,
+                                    G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                                    my_error->message);
+              g_clear_error (&my_error);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), real_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_named_copy_visible_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *buffer_name;
+  gchar *real_name = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GError *my_error = NULL;
+
+      real_name = (gchar *) gimp_edit_named_copy_visible (image, buffer_name,
+                                                          context, &my_error);
+
+      if (real_name)
+        {
+          real_name = g_strdup (real_name);
+        }
+      else
+        {
+          gimp_message_literal (gimp,
+                                G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                                my_error->message);
+          g_clear_error (&my_error);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), real_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_named_paste_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  const gchar *buffer_name;
+  gboolean paste_into;
+  GimpLayer *floating_sel = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 1));
+  paste_into = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          floating_sel = gimp_edit_paste (gimp_item_get_image (GIMP_ITEM (drawable)),
+                                          drawable, GIMP_OBJECT (buffer),
+                                          paste_into ?
+                                          GIMP_PASTE_TYPE_FLOATING_INTO :
+                                          GIMP_PASTE_TYPE_FLOATING,
+                                          -1, -1, -1, -1);
+          if (! floating_sel)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), floating_sel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_named_paste_as_new_image_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *buffer_name;
+  GimpImage *image = NULL;
+
+  buffer_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
+
+      if (buffer)
+        {
+          image = gimp_edit_paste_as_new_image (gimp, GIMP_OBJECT (buffer));
+
+          if (! image)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+edit_clear_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          gimp_drawable_edit_clear (drawable, context);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+edit_fill_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 fill_type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fill_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
+
+          if (gimp_fill_options_set_by_fill_type (options, context,
+                                                  fill_type, error))
+            {
+              gimp_drawable_edit_fill (drawable, options, NULL);
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+edit_bucket_fill_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 fill_mode;
+  gint32 paint_mode;
+  gdouble opacity;
+  gdouble threshold;
+  gboolean sample_merged;
+  gdouble x;
+  gdouble y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fill_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+  paint_mode = g_value_get_enum (gimp_value_array_index (args, 2));
+  opacity = g_value_get_double (gimp_value_array_index (args, 3));
+  threshold = g_value_get_double (gimp_value_array_index (args, 4));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 5));
+  x = g_value_get_double (gimp_value_array_index (args, 6));
+  y = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
+
+          if (gimp_fill_options_set_by_fill_mode (options, context,
+                                                  fill_mode, error))
+            {
+              if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+                paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+              gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
+              gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
+
+              if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+                {
+                  gimp_drawable_edit_fill (drawable, options, NULL);
+                }
+              else
+                {
+                  gimp_drawable_bucket_fill (drawable, options,
+                                             FALSE /* don't fill transparent */,
+                                             GIMP_SELECT_CRITERION_COMPOSITE,
+                                             threshold / 255.0,
+                                             sample_merged,
+                                             FALSE /* no diagonal neighbors */,
+                                             x, y);
+               }
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+edit_bucket_fill_full_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 fill_mode;
+  gint32 paint_mode;
+  gdouble opacity;
+  gdouble threshold;
+  gboolean sample_merged;
+  gboolean fill_transparent;
+  gint32 select_criterion;
+  gdouble x;
+  gdouble y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fill_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+  paint_mode = g_value_get_enum (gimp_value_array_index (args, 2));
+  opacity = g_value_get_double (gimp_value_array_index (args, 3));
+  threshold = g_value_get_double (gimp_value_array_index (args, 4));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 5));
+  fill_transparent = g_value_get_boolean (gimp_value_array_index (args, 6));
+  select_criterion = g_value_get_enum (gimp_value_array_index (args, 7));
+  x = g_value_get_double (gimp_value_array_index (args, 8));
+  y = g_value_get_double (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
+
+          if (gimp_fill_options_set_by_fill_mode (options, context,
+                                                  fill_mode, error))
+            {
+              if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+                paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+              gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
+              gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
+
+              if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+                {
+                  gimp_drawable_edit_fill (drawable, options, NULL);
+                }
+              else
+                {
+                  gimp_drawable_bucket_fill (drawable, options,
+                                             fill_transparent,
+                                             select_criterion,
+                                             threshold / 255.0,
+                                             sample_merged,
+                                             FALSE /* no diagonal neighbors */,
+                                             x, y);
+               }
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+edit_blend_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 blend_mode;
+  gint32 paint_mode;
+  gint32 gradient_type;
+  gdouble opacity;
+  gdouble offset;
+  gint32 repeat;
+  gboolean reverse;
+  gboolean supersample;
+  gint32 max_depth;
+  gdouble threshold;
+  gboolean dither;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  blend_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+  paint_mode = g_value_get_enum (gimp_value_array_index (args, 2));
+  gradient_type = g_value_get_enum (gimp_value_array_index (args, 3));
+  opacity = g_value_get_double (gimp_value_array_index (args, 4));
+  offset = g_value_get_double (gimp_value_array_index (args, 5));
+  repeat = g_value_get_enum (gimp_value_array_index (args, 6));
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 7));
+  supersample = g_value_get_boolean (gimp_value_array_index (args, 8));
+  max_depth = g_value_get_int (gimp_value_array_index (args, 9));
+  threshold = g_value_get_double (gimp_value_array_index (args, 10));
+  dither = g_value_get_boolean (gimp_value_array_index (args, 11));
+  x1 = g_value_get_double (gimp_value_array_index (args, 12));
+  y1 = g_value_get_double (gimp_value_array_index (args, 13));
+  x2 = g_value_get_double (gimp_value_array_index (args, 14));
+  y2 = g_value_get_double (gimp_value_array_index (args, 15));
+
+  if (success)
+    {
+      success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                            GIMP_PDB_ITEM_CONTENT, error) &&
+                 gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error));
+
+      if (success)
+        {
+          if (supersample)
+            {
+              if (max_depth < 1 || max_depth > 9)
+                success = FALSE;
+
+              if (threshold < 0.0 || threshold > 4.0)
+                success = FALSE;
+            }
+          else
+            {
+              max_depth = CLAMP (max_depth, 1, 9);
+              threshold = CLAMP (threshold, 0.0, 4.0);
+            }
+        }
+
+      if (success)
+        {
+          GimpGradient *gradient;
+
+          if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+            paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Gradient"));
+
+          switch (blend_mode)
+            {
+            case GIMP_BLEND_FG_BG_RGB:
+              gradient = gimp_gradients_get_fg_bg_rgb (context->gimp);
+              break;
+
+            case GIMP_BLEND_FG_BG_HSV:
+              gradient = gimp_gradients_get_fg_bg_hsv_cw (context->gimp);
+              break;
+
+            case GIMP_BLEND_FG_TRANSPARENT:
+              gradient = gimp_gradients_get_fg_transparent (context->gimp);
+              break;
+
+            case GIMP_BLEND_CUSTOM:
+            default:
+              gradient = gimp_context_get_gradient (context);
+              break;
+            }
+
+          gimp_drawable_gradient (drawable,
+                                  context,
+                                  gradient,
+                                  GIMP_PDB_CONTEXT (context)->distance_metric,
+                                  paint_mode,
+                                  gradient_type,
+                                  opacity / 100.0,
+                                  offset, repeat, reverse,
+                                  GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                  supersample, max_depth,
+                                  threshold, dither,
+                                  x1, y1, x2, y2,
+                                  progress);
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+edit_stroke_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage         *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpStrokeOptions *options;
+          GimpPaintOptions  *paint_options;
+
+          options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+          paint_options =
+            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
+          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
+
+          success = gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)),
+                                      drawable, context, options, paint_options,
+                                      TRUE, progress, error);
+
+          g_object_unref (paint_options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+edit_stroke_vectors_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpVectors *vectors;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (vectors),
+                                     gimp_item_get_image (GIMP_ITEM (drawable)),
+                                     0, error))
+        {
+          GimpStrokeOptions *options;
+          GimpPaintOptions  *paint_options;
+
+          options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
+
+          paint_options =
+            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
+          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
+
+          success = gimp_item_stroke (GIMP_ITEM (vectors),
+                                      drawable, context, options, paint_options,
+                                      TRUE, progress, error);
+
+          g_object_unref (paint_options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_edit_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-edit-cut
+   */
+  procedure = gimp_procedure_new (edit_cut_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-cut");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-cut",
+                                     "Cut from the specified drawable.",
+                                     "If there is a selection in the image, then the area specified by the selection is cut from the specified drawable and placed in an internal GIMP edit buffer. It can subsequently be retrieved using the 'gimp-edit-paste' command. If there is no selection, then the specified drawable will be removed and its contents stored in the internal GIMP edit buffer. This procedure will fail if the selected area lies completely outside the bounds of the current drawable and there is nothing to copy from.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to cut from",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("non-empty",
+                                                         "non empty",
+                                                         "TRUE if the cut was successful, FALSE if there was nothing to copy from",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-copy
+   */
+  procedure = gimp_procedure_new (edit_copy_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-copy");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-copy",
+                                     "Copy from the specified drawable.",
+                                     "If there is a selection in the image, then the area specified by the selection is copied from the specified drawable and placed in an internal GIMP edit buffer. It can subsequently be retrieved using the 'gimp-edit-paste' command. If there is no selection, then the specified drawable's contents will be stored in the internal GIMP edit buffer. This procedure will fail if the selected area lies completely outside the bounds of the current drawable and there is nothing to copy from.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to copy from",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("non-empty",
+                                                         "non empty",
+                                                         "TRUE if the cut was successful, FALSE if there was nothing to copy from",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-copy-visible
+   */
+  procedure = gimp_procedure_new (edit_copy_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-copy-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-copy-visible",
+                                     "Copy from the projection.",
+                                     "If there is a selection in the image, then the area specified by the selection is copied from the projection and placed in an internal GIMP edit buffer. It can subsequently be retrieved using the 'gimp-edit-paste' command. If there is no selection, then the projection's contents will be stored in the internal GIMP edit buffer.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to copy from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("non-empty",
+                                                         "non empty",
+                                                         "TRUE if the copy was successful",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-paste
+   */
+  procedure = gimp_procedure_new (edit_paste_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-paste");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-paste",
+                                     "Paste buffer to the specified drawable.",
+                                     "This procedure pastes a copy of the internal GIMP edit buffer to the specified drawable. The GIMP edit buffer will be empty unless a call was previously made to either 'gimp-edit-cut' or 'gimp-edit-copy'. The \"paste_into\" option specifies whether to clear the current image selection, or to paste the buffer \"behind\" the selection. This allows the selection to act as a mask for the pasted buffer. Anywhere that the selection mask is non-zero, the pasted buffer will show through. The pasted buffer will be a new layer in the image which is designated as the image floating selection. If the image has a floating selection at the time of pasting, the old floating selection will be anchored to its drawable before the new floating selection is added. This procedure returns the new floating layer. The resulting floating selection will already be attached to the specified drawable, and a subsequent call to floating_sel_attach is not needed.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to paste to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("paste-into",
+                                                     "paste into",
+                                                     "Clear selection, or paste behind it?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("floating-sel",
+                                                             "floating sel",
+                                                             "The new floating selection",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-paste-as-new-image
+   */
+  procedure = gimp_procedure_new (edit_paste_as_new_image_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-paste-as-new-image");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-paste-as-new-image",
+                                     "Paste buffer to a new image.",
+                                     "This procedure pastes a copy of the internal GIMP edit buffer to a new image. The GIMP edit buffer will be empty unless a call was previously made to either 'gimp-edit-cut' or 'gimp-edit-copy'. This procedure returns the new image or -1 if the edit buffer was empty.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "image",
+                                                             "The new image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-named-cut
+   */
+  procedure = gimp_procedure_new (edit_named_cut_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-named-cut");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-named-cut",
+                                     "Cut into a named buffer.",
+                                     "This procedure works like 'gimp-edit-cut', but additionally stores the cut buffer into a named buffer that will stay available for later pasting, regardless of any intermediate copy or cut operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to cut from",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The name of the buffer to create",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("real-name",
+                                                           "real name",
+                                                           "The real name given to the buffer, or NULL if the cut failed",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-named-copy
+   */
+  procedure = gimp_procedure_new (edit_named_copy_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-named-copy");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-named-copy",
+                                     "Copy into a named buffer.",
+                                     "This procedure works like 'gimp-edit-copy', but additionally stores the copied buffer into a named buffer that will stay available for later pasting, regardless of any intermediate copy or cut operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to copy from",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The name of the buffer to create",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("real-name",
+                                                           "real name",
+                                                           "The real name given to the buffer, or NULL if the copy failed",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-named-copy-visible
+   */
+  procedure = gimp_procedure_new (edit_named_copy_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-named-copy-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-named-copy-visible",
+                                     "Copy from the projection into a named buffer.",
+                                     "This procedure works like 'gimp-edit-copy-visible', but additionally stores the copied buffer into a named buffer that will stay available for later pasting, regardless of any intermediate copy or cut operations.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to copy from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The name of the buffer to create",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("real-name",
+                                                           "real name",
+                                                           "The real name given to the buffer, or NULL if the copy failed",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-named-paste
+   */
+  procedure = gimp_procedure_new (edit_named_paste_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-named-paste");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-named-paste",
+                                     "Paste named buffer to the specified drawable.",
+                                     "This procedure works like 'gimp-edit-paste' but pastes a named buffer instead of the global buffer.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to paste to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The name of the buffer to paste",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("paste-into",
+                                                     "paste into",
+                                                     "Clear selection, or paste behind it?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("floating-sel",
+                                                             "floating sel",
+                                                             "The new floating selection",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-named-paste-as-new-image
+   */
+  procedure = gimp_procedure_new (edit_named_paste_as_new_image_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-named-paste-as-new-image");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-named-paste-as-new-image",
+                                     "Paste named buffer to a new image.",
+                                     "This procedure works like 'gimp-edit-paste-as-new-image' but pastes a named buffer instead of the global buffer.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("buffer-name",
+                                                       "buffer name",
+                                                       "The name of the buffer to paste",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "image",
+                                                             "The new image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-clear
+   */
+  procedure = gimp_procedure_new (edit_clear_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-clear");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-clear",
+                                     "Clear selected area of drawable.",
+                                     "This procedure clears the specified drawable. If the drawable has an alpha channel, the cleared pixels will become transparent. If the drawable does not have an alpha channel, cleared pixels will be set to the background color. This procedure only affects regions within a selection if there is a selection active.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-clear' instead.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     "gimp-drawable-edit-clear");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to clear from",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-fill
+   */
+  procedure = gimp_procedure_new (edit_fill_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-fill");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-fill",
+                                     "Fill selected area of drawable.",
+                                     "This procedure fills the specified drawable with the fill mode. If the fill mode is foreground, the current foreground color is used. If the fill mode is background, the current background color is used. Other fill modes should not be used. This procedure only affects regions within a selection if there is a selection active. If you want to fill the whole drawable, regardless of the selection, use 'gimp-drawable-fill'.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-fill' instead.",
+                                     "Spencer Kimball & Peter Mattis & Raphael Quinet",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-2000",
+                                     "gimp-drawable-edit-fill");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to fill to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-type",
+                                                  "fill type",
+                                                  "The type of fill",
+                                                  GIMP_TYPE_FILL_TYPE,
+                                                  GIMP_FILL_FOREGROUND,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-bucket-fill
+   */
+  procedure = gimp_procedure_new (edit_bucket_fill_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-bucket-fill");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-bucket-fill",
+                                     "Fill the area specified either by the current selection if there is one, or by a seed fill starting at the specified coordinates.",
+                                     "This tool requires information on the paint application mode, and the fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-bucket-fill' instead.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     "gimp-drawable-edit-bucket-fill");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-mode",
+                                                  "fill mode",
+                                                  "The type of fill",
+                                                  GIMP_TYPE_BUCKET_FILL_MODE,
+                                                  GIMP_BUCKET_FILL_FG,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("paint-mode",
+                                                  "paint mode",
+                                                  "The paint application mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The opacity of the final bucket fill",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("threshold",
+                                                    "threshold",
+                                                    "The threshold determines how extensive the seed fill will be. It's value is specified in terms of intensity levels. This parameter is only valid when there is no selection in the specified image.",
+                                                    0, 255, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "The x coordinate of this bucket fill's application. This parameter is only valid when there is no selection in the specified image.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "The y coordinate of this bucket fill's application. This parameter is only valid when there is no selection in the specified image.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-bucket-fill-full
+   */
+  procedure = gimp_procedure_new (edit_bucket_fill_full_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-bucket-fill-full");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-bucket-fill-full",
+                                     "Fill the area specified either by the current selection if there is one, or by a seed fill starting at the specified coordinates.",
+                                     "This tool requires information on the paint application mode, and the fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; otherwise, they are relative to the drawable's origin.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-bucket-fill' instead.",
+                                     "David Gowers",
+                                     "David Gowers",
+                                     "2006",
+                                     "gimp-drawable-edit-bucket-fill");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("fill-mode",
+                                                  "fill mode",
+                                                  "The type of fill",
+                                                  GIMP_TYPE_BUCKET_FILL_MODE,
+                                                  GIMP_BUCKET_FILL_FG,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("paint-mode",
+                                                  "paint mode",
+                                                  "The paint application mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The opacity of the final bucket fill",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("threshold",
+                                                    "threshold",
+                                                    "The threshold determines how extensive the seed fill will be. It's value is specified in terms of intensity levels. This parameter is only valid when there is no selection in the specified image.",
+                                                    0, 255, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("fill-transparent",
+                                                     "fill transparent",
+                                                     "Whether to consider transparent pixels for filling. If TRUE, transparency is considered as a unique fillable color.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("select-criterion",
+                                                  "select criterion",
+                                                  "The criterion used to determine color similarity. SELECT_CRITERION_COMPOSITE is the standard choice.",
+                                                  GIMP_TYPE_SELECT_CRITERION,
+                                                  GIMP_SELECT_CRITERION_COMPOSITE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "The x coordinate of this bucket fill's application. This parameter is only valid when there is no selection in the specified image.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "The y coordinate of this bucket fill's application. This parameter is only valid when there is no selection in the specified image.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-blend
+   */
+  procedure = gimp_procedure_new (edit_blend_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-blend");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-blend",
+                                     "Blend between the starting and ending coordinates with the specified blend mode and gradient type.",
+                                     "This tool requires information on the paint application mode, the blend mode, and the gradient type. It creates the specified variety of blend using the starting and ending coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric is also relevant and can be updated with 'gimp-context-set-distance-metric'.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-gradient-fill' instead.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     "gimp-drawable-edit-gradient-fill");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("blend-mode",
+                                                  "blend mode",
+                                                  "The type of blend",
+                                                  GIMP_TYPE_BLEND_MODE,
+                                                  GIMP_BLEND_FG_BG_RGB,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("paint-mode",
+                                                  "paint mode",
+                                                  "The paint application mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("gradient-type",
+                                                  "gradient type",
+                                                  "The type of gradient",
+                                                  GIMP_TYPE_GRADIENT_TYPE,
+                                                  GIMP_GRADIENT_LINEAR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The opacity of the final blend",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("offset",
+                                                    "offset",
+                                                    "Offset relates to the starting and ending coordinates specified for the blend. This parameter is mode dependent.",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("repeat",
+                                                  "repeat",
+                                                  "Repeat mode",
+                                                  GIMP_TYPE_REPEAT_MODE,
+                                                  GIMP_REPEAT_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Use the reverse gradient",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("supersample",
+                                                     "supersample",
+                                                     "Do adaptive supersampling",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("max-depth",
+                                                      "max depth",
+                                                      "Maximum recursion levels for supersampling",
+                                                      1, 9, 1,
+                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("threshold",
+                                                    "threshold",
+                                                    "Supersampling threshold",
+                                                    0, 4, 0,
+                                                    GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("dither",
+                                                     "dither",
+                                                     "Use dithering to reduce banding",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The x coordinate of this blend's starting point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The y coordinate of this blend's starting point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The x coordinate of this blend's ending point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The y coordinate of this blend's ending point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-stroke
+   */
+  procedure = gimp_procedure_new (edit_stroke_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-stroke");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-stroke",
+                                     "Stroke the current selection",
+                                     "This procedure strokes the current selection, painting along the selection boundary with the active brush and foreground color. The paint is applied to the specified drawable regardless of the active selection.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-stroke-selection' instead.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     "gimp-drawable-edit-stroke-selection");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to stroke to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-edit-stroke-vectors
+   */
+  procedure = gimp_procedure_new (edit_stroke_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-edit-stroke-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-edit-stroke-vectors",
+                                     "Stroke the specified vectors object",
+                                     "This procedure strokes the specified vectors object, painting along the path with the active brush and foreground color.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-drawable-edit-stroke-item' instead.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2006",
+                                     "gimp-drawable-edit-stroke-item");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to stroke to",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/fileops-cmds.c b/app/pdb/fileops-cmds.c
new file mode 100644
index 0000000..f50d345
--- /dev/null
+++ b/app/pdb/fileops-cmds.c
@@ -0,0 +1,1184 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "file/file-open.h"
+#include "file/file-save.h"
+#include "file/file-utils.h"
+#include "plug-in/gimppluginmanager-file.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+file_load_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  GimpValueArray      *new_args;
+  GimpValueArray      *return_vals;
+  GimpPlugInProcedure *file_proc;
+  GimpProcedure       *proc;
+  GFile               *file;
+  gint                 i;
+
+  file = file_utils_filename_to_file (gimp,
+                                      g_value_get_string (gimp_value_array_index (args, 1)),
+                                      error);
+
+  if (! file)
+    return gimp_procedure_get_return_values (procedure, FALSE,
+                                             error ? *error : NULL);
+
+  file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                        GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                        file, error);
+
+  if (! file_proc)
+    {
+      g_object_unref (file);
+
+      return gimp_procedure_get_return_values (procedure, FALSE,
+                                               error ? *error : NULL);
+    }
+
+  proc = GIMP_PROCEDURE (file_proc);
+
+  new_args = gimp_procedure_get_arguments (proc);
+
+  g_value_transform (gimp_value_array_index (args, 0),
+                     gimp_value_array_index (new_args, 0));
+
+  if (file_proc->handles_uri)
+    g_value_take_string (gimp_value_array_index (new_args, 1),
+                         g_file_get_uri (file));
+  else
+    g_value_transform (gimp_value_array_index (args, 1),
+                       gimp_value_array_index (new_args, 1));
+
+  g_value_transform (gimp_value_array_index (args, 2),
+                     gimp_value_array_index (new_args, 2));
+
+  for (i = 3; i < proc->num_args; i++)
+    if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
+      g_value_set_static_string (gimp_value_array_index (new_args, i), "");
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name_args (gimp->pdb,
+                                             context, progress, error,
+                                             gimp_object_get_name (proc),
+                                             new_args);
+
+  gimp_value_array_unref (new_args);
+
+  if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) ==
+      GIMP_PDB_SUCCESS)
+    {
+      if (gimp_value_array_length (return_vals) > 1 &&
+          GIMP_VALUE_HOLDS_IMAGE_ID (gimp_value_array_index (return_vals, 1)))
+        {
+          GimpImage *image =
+            gimp_value_get_image (gimp_value_array_index (return_vals, 1),
+                                  gimp);
+          gimp_image_set_load_proc (image, file_proc);
+        }
+    }
+
+  g_object_unref (file);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+file_load_layer_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 run_mode;
+  GimpImage *image;
+  const gchar *filename;
+  GimpLayer *layer = NULL;
+
+  run_mode = g_value_get_enum (gimp_value_array_index (args, 0));
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GFile *file = file_utils_filename_to_file (gimp, filename, error);
+
+      if (file)
+        {
+          GList             *layers;
+          GimpPDBStatusType  status;
+
+          layers = file_open_layers (gimp, context, progress,
+                                     image, FALSE,
+                                     file, run_mode, NULL, &status, error);
+
+          g_object_unref (file);
+
+          if (layers)
+            {
+              layer = layers->data;
+              g_list_free (layers);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+file_load_layers_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 run_mode;
+  GimpImage *image;
+  const gchar *filename;
+  gint32 num_layers = 0;
+  gint32 *layer_ids = NULL;
+
+  run_mode = g_value_get_enum (gimp_value_array_index (args, 0));
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GFile *file = file_utils_filename_to_file (gimp, filename, error);
+
+      if (file)
+        {
+          GList             *layers;
+          GimpPDBStatusType  status;
+
+          layers = file_open_layers (gimp, context, progress,
+                                     image, FALSE,
+                                     file, run_mode, NULL, &status, error);
+
+          g_object_unref (file);
+
+          if (layers)
+            {
+              GList *list;
+              gint i;
+
+              num_layers = g_list_length (layers);
+
+              layer_ids = g_new (gint32, num_layers);
+
+              for (i = 0, list = layers;
+                   i < num_layers;
+                   i++, list = g_list_next (list))
+                layer_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+
+              g_list_free (layers);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_layers);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), layer_ids, num_layers);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+file_save_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  GimpValueArray      *new_args;
+  GimpValueArray      *return_vals;
+  GimpPlugInProcedure *file_proc;
+  GimpProcedure       *proc;
+  GFile               *file;
+  gint                 i;
+
+  file = file_utils_filename_to_file (gimp,
+                                      g_value_get_string (gimp_value_array_index (args, 3)),
+                                      error);
+
+  if (! file)
+    return gimp_procedure_get_return_values (procedure, FALSE,
+                                             error ? *error : NULL);
+
+  file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                        GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                                                        file, NULL);
+
+  if (! file_proc)
+    file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                          GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                                                          file, error);
+
+  if (! file_proc)
+    {
+      g_object_unref (file);
+
+      return gimp_procedure_get_return_values (procedure, FALSE,
+                                               error ? *error : NULL);
+    }
+
+  proc = GIMP_PROCEDURE (file_proc);
+
+  new_args = gimp_procedure_get_arguments (proc);
+
+  g_value_transform (gimp_value_array_index (args, 0),
+                     gimp_value_array_index (new_args, 0));
+  g_value_transform (gimp_value_array_index (args, 1),
+                     gimp_value_array_index (new_args, 1));
+  g_value_transform (gimp_value_array_index (args, 2),
+                     gimp_value_array_index (new_args, 2));
+
+  if (file_proc->handles_uri)
+    g_value_take_string (gimp_value_array_index (new_args, 3),
+                         g_file_get_uri (file));
+  else
+    g_value_transform (gimp_value_array_index (args, 3),
+                       gimp_value_array_index (new_args, 3));
+
+  g_value_transform (gimp_value_array_index (args, 4),
+                     gimp_value_array_index (new_args, 4));
+
+  for (i = 5; i < proc->num_args; i++)
+    if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
+      g_value_set_static_string (gimp_value_array_index (new_args, i), "");
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name_args (gimp->pdb,
+                                             context, progress, error,
+                                             gimp_object_get_name (proc),
+                                             new_args);
+
+  gimp_value_array_unref (new_args);
+
+  g_object_unref (file);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+file_load_thumbnail_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filename;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 thumb_data_count = 0;
+  guint8 *thumb_data = NULL;
+
+  filename = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GdkPixbuf *pixbuf = file_utils_load_thumbnail (filename);
+
+      if (pixbuf)
+        {
+          width            = gdk_pixbuf_get_width (pixbuf);
+          height           = gdk_pixbuf_get_height (pixbuf);
+          thumb_data_count = 3 * width * height;
+          thumb_data       = g_memdup (gdk_pixbuf_get_pixels (pixbuf),
+                                       thumb_data_count);
+
+          g_object_unref (pixbuf);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), thumb_data_count);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 4), thumb_data, thumb_data_count);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+file_save_thumbnail_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *filename;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      success = file_utils_save_thumbnail (image, filename);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_magic_load_handler_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  const gchar *extensions;
+  const gchar *prefixes;
+  const gchar *magics;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  extensions = g_value_get_string (gimp_value_array_index (args, 1));
+  prefixes = g_value_get_string (gimp_value_array_index (args, 2));
+  magics = g_value_get_string (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_load_handler (gimp->plug_in_manager,
+                                                            canonical,
+                                                            extensions, prefixes, magics);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_load_handler_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  const gchar *extensions;
+  const gchar *prefixes;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  extensions = g_value_get_string (gimp_value_array_index (args, 1));
+  prefixes = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_load_handler (gimp->plug_in_manager,
+                                                            canonical,
+                                                            extensions, prefixes, NULL);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_save_handler_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  const gchar *extensions;
+  const gchar *prefixes;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  extensions = g_value_get_string (gimp_value_array_index (args, 1));
+  prefixes = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_save_handler (gimp->plug_in_manager,
+                                                            canonical,
+                                                            extensions, prefixes);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_file_handler_priority_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  gint32 priority;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  priority = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_priority (gimp->plug_in_manager,
+                                                        canonical, priority);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_file_handler_mime_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  const gchar *mime_types;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  mime_types = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_mime_types (gimp->plug_in_manager,
+                                                          canonical, mime_types);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_file_handler_uri_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_handles_uri (gimp->plug_in_manager,
+                                                           canonical);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_file_handler_raw_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_plug_in_manager_register_handles_raw (gimp->plug_in_manager,
+                                                           canonical);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+register_thumbnail_loader_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *load_proc;
+  const gchar *thumb_proc;
+
+  load_proc = g_value_get_string (gimp_value_array_index (args, 0));
+  thumb_proc = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gchar *canonical   = gimp_canonicalize_identifier (load_proc);
+      gchar *canon_thumb = gimp_canonicalize_identifier (thumb_proc);
+
+      success = gimp_plug_in_manager_register_thumb_loader (gimp->plug_in_manager,
+                                                            canonical, canon_thumb);
+
+      g_free (canonical);
+      g_free (canon_thumb);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_fileops_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-file-load
+   */
+  procedure = gimp_procedure_new (file_load_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-file-load");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-file-load",
+                                     "Loads an image file by invoking the right load handler.",
+                                     "This procedure invokes the correct file load handler using magic if possible, and falling back on the file's extension and/or prefix if not. The name of the file to load is typically a full pathname, and the name entered is what the user actually typed before prepending a directory path. The reason for this is that if the user types https://www.gimp.org/foo.png he wants to fetch a URL, and the full pathname will not look like a URL.",
+                                     "Josh MacDonald",
+                                     "Josh MacDonald",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("run-mode",
+                                                     "run mode",
+                                                     "The run mode",
+                                                     GIMP_TYPE_RUN_MODE,
+                                                     GIMP_RUN_INTERACTIVE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[0]),
+                                      GIMP_RUN_WITH_LAST_VALS);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the file to load",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-filename",
+                                                       "raw filename",
+                                                       "The name as entered by the user",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "image",
+                                                             "The output image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-file-load-layer
+   */
+  procedure = gimp_procedure_new (file_load_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-file-load-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-file-load-layer",
+                                     "Loads an image file as a layer for an existing image.",
+                                     "This procedure behaves like the file-load procedure but opens the specified image as a layer for an existing image. The returned layer needs to be added to the existing image with 'gimp-image-insert-layer'.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("run-mode",
+                                                     "run mode",
+                                                     "The run mode",
+                                                     GIMP_TYPE_RUN_MODE,
+                                                     GIMP_RUN_INTERACTIVE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[0]),
+                                      GIMP_RUN_WITH_LAST_VALS);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Destination image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the file to load",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The layer created when loading the image file",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-file-load-layers
+   */
+  procedure = gimp_procedure_new (file_load_layers_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-file-load-layers");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-file-load-layers",
+                                     "Loads an image file as layers for an existing image.",
+                                     "This procedure behaves like the file-load procedure but opens the specified image as layers for an existing image. The returned layers needs to be added to the existing image with 'gimp-image-insert-layer'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("run-mode",
+                                                     "run mode",
+                                                     "The run mode",
+                                                     GIMP_TYPE_RUN_MODE,
+                                                     GIMP_RUN_INTERACTIVE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[0]),
+                                      GIMP_RUN_WITH_LAST_VALS);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Destination image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the file to load",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-layers",
+                                                          "num layers",
+                                                          "The number of loaded layers",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("layer-ids",
+                                                                "layer ids",
+                                                                "The list of loaded layers",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-file-save
+   */
+  procedure = gimp_procedure_new (file_save_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-file-save");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-file-save",
+                                     "Saves a file by extension.",
+                                     "This procedure invokes the correct file save handler according to the file's extension and/or prefix. The name of the file to save is typically a full pathname, and the name entered is what the user actually typed before prepending a directory path. The reason for this is that if the user types https://www.gimp.org/foo.png she wants to fetch a URL, and the full pathname will not look like a URL.",
+                                     "Josh MacDonald",
+                                     "Josh MacDonald",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Drawable to save",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the file to save the image in",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-filename",
+                                                       "raw filename",
+                                                       "The name as entered by the user",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-file-load-thumbnail
+   */
+  procedure = gimp_procedure_new (file_load_thumbnail_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-file-load-thumbnail");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-file-load-thumbnail",
+                                     "Loads the thumbnail for a file.",
+                                     "This procedure tries to load a thumbnail that belongs to the file with the given filename. This name is a full pathname. The returned data is an array of colordepth 3 (RGB), regardless of the image type. Width and height of the thumbnail are also returned. Don't use this function if you need a thumbnail of an already opened image, use 'gimp-image-thumbnail' instead.",
+                                     "Adam D. Moss, Sven Neumann",
+                                     "Adam D. Moss, Sven Neumann",
+                                     "1999-2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the file that owns the thumbnail to load",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The width of the thumbnail",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The height of the thumbnail",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("thumb-data-count",
+                                                          "thumb data count",
+                                                          "The number of bytes in thumbnail data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("thumb-data",
+                                                               "thumb data",
+                                                               "The thumbnail data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-file-save-thumbnail
+   */
+  procedure = gimp_procedure_new (file_save_thumbnail_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-file-save-thumbnail");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-file-save-thumbnail",
+                                     "Saves a thumbnail for the given image",
+                                     "This procedure saves a thumbnail for the given image according to the Free Desktop Thumbnail Managing Standard. The thumbnail is saved so that it belongs to the file with the given filename. This means you have to save the image under this name first, otherwise this procedure will fail. This procedure may become useful if you want to explicitly save a thumbnail with a file.",
+                                     "Josh MacDonald",
+                                     "Josh MacDonald",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the file the thumbnail belongs to",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-magic-load-handler
+   */
+  procedure = gimp_procedure_new (register_magic_load_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-magic-load-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-magic-load-handler",
+                                     "Registers a file load handler procedure.",
+                                     "Registers a procedural database procedure to be called to load files of a particular file format using magic file information.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to be used for loading",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("extensions",
+                                                       "extensions",
+                                                       "comma separated list of extensions this handler can load (i.e. \"jpg,jpeg\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("prefixes",
+                                                       "prefixes",
+                                                       "comma separated list of prefixes this handler can load (i.e. \"http:,ftp:\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("magics",
+                                                       "magics",
+                                                       "comma separated list of magic file information this handler can load (i.e. \"0,string,GIF\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-load-handler
+   */
+  procedure = gimp_procedure_new (register_load_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-load-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-load-handler",
+                                     "Registers a file load handler procedure.",
+                                     "Registers a procedural database procedure to be called to load files of a particular file format.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to be used for loading",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("extensions",
+                                                       "extensions",
+                                                       "comma separated list of extensions this handler can load (i.e. \"jpg,jpeg\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("prefixes",
+                                                       "prefixes",
+                                                       "comma separated list of prefixes this handler can load (i.e. \"http:,ftp:\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-save-handler
+   */
+  procedure = gimp_procedure_new (register_save_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-save-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-save-handler",
+                                     "Registers a file save handler procedure.",
+                                     "Registers a procedural database procedure to be called to save files in a particular file format.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to be used for saving",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("extensions",
+                                                       "extensions",
+                                                       "comma separated list of extensions this handler can save (i.e. \"jpg,jpeg\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("prefixes",
+                                                       "prefixes",
+                                                       "comma separated list of prefixes this handler can save (i.e. \"http:,ftp:\")",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-file-handler-priority
+   */
+  procedure = gimp_procedure_new (register_file_handler_priority_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-file-handler-priority");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-file-handler-priority",
+                                     "Sets the priority of a file handler procedure.",
+                                     "Sets the priority of a file handler procedure. When more than one procedure matches a given file, the procedure with the lowest priority is used; if more than one procedure has the lowest priority, it is unspecified which one of them is used. The default priority for file handler procedures is 0.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to set the priority of.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("priority",
+                                                      "priority",
+                                                      "The procedure priority.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-file-handler-mime
+   */
+  procedure = gimp_procedure_new (register_file_handler_mime_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-file-handler-mime");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-file-handler-mime",
+                                     "Associates MIME types with a file handler procedure.",
+                                     "Registers MIME types for a file handler procedure. This allows GIMP to determine the MIME type of the file opened or saved using this procedure. It is recommended that only one MIME type is registered per file procedure; when registering more than one MIME type, GIMP will associate the first one with files opened or saved with this procedure.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to associate a MIME type with.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("mime-types",
+                                                       "mime types",
+                                                       "A comma-separated list of MIME types, such as \"image/jpeg\".",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-file-handler-uri
+   */
+  procedure = gimp_procedure_new (register_file_handler_uri_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-file-handler-uri");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-file-handler-uri",
+                                     "Registers a file handler procedure as capable of handling URIs.",
+                                     "Registers a file handler procedure as capable of handling URIs. This allows GIMP to call the procedure directly for all kinds of URIs, and the 'filename' traditionally passed to file procedures turns into an URI.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to enable URIs for.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-file-handler-raw
+   */
+  procedure = gimp_procedure_new (register_file_handler_raw_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-file-handler-raw");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-file-handler-raw",
+                                     "Registers a file handler procedure as capable of handling raw camera files.",
+                                     "Registers a file handler procedure as capable of handling raw digital camera files. Use this procedure only to register raw load handlers, calling it on a save handler will generate an error.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The name of the procedure to enable raw handling for.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-register-thumbnail-loader
+   */
+  procedure = gimp_procedure_new (register_thumbnail_loader_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-register-thumbnail-loader");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-register-thumbnail-loader",
+                                     "Associates a thumbnail loader with a file load procedure.",
+                                     "Some file formats allow for embedded thumbnails, other file formats contain a scalable image or provide the image data in different resolutions. A file plug-in for such a format may register a special procedure that allows GIMP to load a thumbnail preview of the image. This procedure is then associated with the standard load procedure using this function.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("load-proc",
+                                                       "load proc",
+                                                       "The name of the procedure the thumbnail loader with.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("thumb-proc",
+                                                       "thumb proc",
+                                                       "The name of the thumbnail load procedure.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/floating-sel-cmds.c b/app/pdb/floating-sel-cmds.c
new file mode 100644
index 0000000..6d282e9
--- /dev/null
+++ b/app/pdb/floating-sel-cmds.c
@@ -0,0 +1,366 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+floating_sel_remove_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *floating_sel;
+
+  floating_sel = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_layer_is_floating_sel (floating_sel))
+        {
+          gimp_image_remove_layer (gimp_item_get_image (GIMP_ITEM (floating_sel)),
+                                   floating_sel, TRUE, NULL);
+        }
+      else
+        {
+          g_set_error_literal (error, GIMP_PDB_ERROR,
+                               GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                               _("Cannot remove this layer because "
+                                 "it is not a floating selection."));
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+floating_sel_anchor_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *floating_sel;
+
+  floating_sel = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_layer_is_floating_sel (floating_sel))
+        {
+          floating_sel_anchor (floating_sel);
+        }
+      else
+        {
+          g_set_error_literal (error, GIMP_PDB_ERROR,
+                               GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                               _("Cannot anchor this layer because "
+                                 "it is not a floating selection."));
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+floating_sel_to_layer_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *floating_sel;
+
+  floating_sel = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_layer_is_floating_sel (floating_sel))
+        {
+          success = floating_sel_to_layer (floating_sel, error);
+        }
+      else
+        {
+          g_set_error_literal (error, GIMP_PDB_ERROR,
+                               GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                               _("Cannot convert this layer to a normal layer "
+                                 "because it is not a floating selection."));
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+floating_sel_attach_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  GimpDrawable *drawable;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        floating_sel_attach (layer, drawable);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+floating_sel_rigor_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  if (success)
+    {
+    }
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+floating_sel_relax_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  if (success)
+    {
+    }
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_floating_sel_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-floating-sel-remove
+   */
+  procedure = gimp_procedure_new (floating_sel_remove_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-floating-sel-remove");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-floating-sel-remove",
+                                     "Remove the specified floating selection from its associated drawable.",
+                                     "This procedure removes the floating selection completely, without any side effects. The associated drawable is then set to active.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("floating-sel",
+                                                         "floating sel",
+                                                         "The floating selection",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-floating-sel-anchor
+   */
+  procedure = gimp_procedure_new (floating_sel_anchor_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-floating-sel-anchor");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-floating-sel-anchor",
+                                     "Anchor the specified floating selection to its associated drawable.",
+                                     "This procedure anchors the floating selection to its associated drawable. This is similar to merging with a merge type of ClipToBottomLayer. The floating selection layer is no longer valid after this operation.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("floating-sel",
+                                                         "floating sel",
+                                                         "The floating selection",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-floating-sel-to-layer
+   */
+  procedure = gimp_procedure_new (floating_sel_to_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-floating-sel-to-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-floating-sel-to-layer",
+                                     "Transforms the specified floating selection into a layer.",
+                                     "This procedure transforms the specified floating selection into a layer with the same offsets and extents. The composited image will look precisely the same, but the floating selection layer will no longer be clipped to the extents of the drawable it was attached to. The floating selection will become the active layer. This procedure will not work if the floating selection has a different base type from the underlying image. This might be the case if the floating selection is above an auxiliary channel or a layer mask.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("floating-sel",
+                                                         "floating sel",
+                                                         "The floating selection",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-floating-sel-attach
+   */
+  procedure = gimp_procedure_new (floating_sel_attach_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-floating-sel-attach");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-floating-sel-attach",
+                                     "Attach the specified layer as floating to the specified drawable.",
+                                     "This procedure attaches the layer as floating selection to the drawable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer (is attached as floating selection)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable (where to attach the floating selection)",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-floating-sel-rigor
+   */
+  procedure = gimp_procedure_new (floating_sel_rigor_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-floating-sel-rigor");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-floating-sel-rigor",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "",
+                                     "",
+                                     "",
+                                     "NONE");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("floating-sel",
+                                                         "floating sel",
+                                                         "The floating selection",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("undo",
+                                                     "undo",
+                                                     "",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-floating-sel-relax
+   */
+  procedure = gimp_procedure_new (floating_sel_relax_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-floating-sel-relax");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-floating-sel-relax",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "",
+                                     "",
+                                     "",
+                                     "NONE");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("floating-sel",
+                                                         "floating sel",
+                                                         "The floating selection",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("undo",
+                                                     "undo",
+                                                     "",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/font-select-cmds.c b/app/pdb/font-select-cmds.c
new file mode 100644
index 0000000..dc04469
--- /dev/null
+++ b/app/pdb/font-select-cmds.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+fonts_popup_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *font_callback;
+  const gchar *popup_title;
+  const gchar *initial_font;
+
+  font_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  popup_title = g_value_get_string (gimp_value_array_index (args, 1));
+  initial_font = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
+          ! gimp_data_factory_data_wait (gimp->font_factory)     ||
+          ! gimp_pdb_dialog_new (gimp, context, progress,
+                                 gimp_data_factory_get_container (gimp->font_factory),
+                                 popup_title, font_callback, initial_font,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+fonts_close_popup_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *font_callback;
+
+  font_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
+          ! gimp_pdb_dialog_close (gimp,
+                                   gimp_data_factory_get_container (gimp->font_factory),
+                                   font_callback))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+fonts_set_popup_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *font_callback;
+  const gchar *font_name;
+
+  font_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  font_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
+          ! gimp_data_factory_data_wait (gimp->font_factory)     ||
+          ! gimp_pdb_dialog_set (gimp,
+                                 gimp_data_factory_get_container (gimp->font_factory),
+                                 font_callback, font_name,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_font_select_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-fonts-popup
+   */
+  procedure = gimp_procedure_new (fonts_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fonts-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fonts-popup",
+                                     "Invokes the Gimp font selection.",
+                                     "This procedure opens the font selection dialog.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("font-callback",
+                                                       "font callback",
+                                                       "The callback PDB proc to call when font selection is made",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("popup-title",
+                                                       "popup title",
+                                                       "Title of the font selection dialog",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("initial-font",
+                                                       "initial font",
+                                                       "The name of the font to set as the first selected",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-fonts-close-popup
+   */
+  procedure = gimp_procedure_new (fonts_close_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fonts-close-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fonts-close-popup",
+                                     "Close the font selection dialog.",
+                                     "This procedure closes an opened font selection dialog.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("font-callback",
+                                                       "font callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-fonts-set-popup
+   */
+  procedure = gimp_procedure_new (fonts_set_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fonts-set-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fonts-set-popup",
+                                     "Sets the current font in a font selection dialog.",
+                                     "Sets the current font in a font selection dialog.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("font-callback",
+                                                       "font callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("font-name",
+                                                       "font name",
+                                                       "The name of the font to set as selected",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/fonts-cmds.c b/app/pdb/fonts-cmds.c
new file mode 100644
index 0000000..09d25d0
--- /dev/null
+++ b/app/pdb/fonts-cmds.c
@@ -0,0 +1,151 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+fonts_refresh_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gimp_data_factory_data_refresh (gimp->font_factory, context);
+  gimp_data_factory_data_wait (gimp->font_factory);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+fonts_get_list_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_fonts = 0;
+  gchar **font_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (! gimp_data_factory_data_wait (gimp->font_factory))
+        success = FALSE;
+
+      if (success)
+        {
+          font_list = gimp_container_get_filtered_name_array (gimp_data_factory_get_container (gimp->font_factory),
+                                                              filter, &num_fonts);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_fonts);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), font_list, num_fonts);
+    }
+
+  return return_vals;
+}
+
+void
+register_fonts_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-fonts-refresh
+   */
+  procedure = gimp_procedure_new (fonts_refresh_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fonts-refresh");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fonts-refresh",
+                                     "Refresh current fonts. This function always succeeds.",
+                                     "This procedure retrieves all fonts currently in the user's font path and updates the font dialogs accordingly. Depending on the amount of fonts on the system, this can take considerable time.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2003",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-fonts-get-list
+   */
+  procedure = gimp_procedure_new (fonts_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fonts-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fonts-get-list",
+                                     "Retrieve the list of loaded fonts.",
+                                     "This procedure returns a list of the fonts that are currently available.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-fonts",
+                                                          "num fonts",
+                                                          "The number of available fonts",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("font-list",
+                                                                 "font list",
+                                                                 "The list of font names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/gimp-cmds.c b/app/pdb/gimp-cmds.c
new file mode 100644
index 0000000..a05be45
--- /dev/null
+++ b/app/pdb/gimp-cmds.c
@@ -0,0 +1,444 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp-parasites.h"
+#include "core/gimp-utils.h"
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+version_invoker (GimpProcedure         *procedure,
+                 Gimp                  *gimp,
+                 GimpContext           *context,
+                 GimpProgress          *progress,
+                 const GimpValueArray  *args,
+                 GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *version = NULL;
+
+  version = g_strdup (GIMP_VERSION);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), version);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+getpid_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 pid = 0;
+
+  pid = gimp_get_pid ();
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), pid);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+quit_invoker (GimpProcedure         *procedure,
+              Gimp                  *gimp,
+              GimpContext           *context,
+              GimpProgress          *progress,
+              const GimpValueArray  *args,
+              GError               **error)
+{
+  gboolean success = TRUE;
+  gboolean force;
+
+  force = g_value_get_boolean (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gimp_exit (gimp, force);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+attach_parasite_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  const GimpParasite *parasite;
+
+  parasite = g_value_get_boxed (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (gimp_parasite_validate (gimp, parasite, error))
+        gimp_parasite_attach (gimp, parasite);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+detach_parasite_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gimp_parasite_detach (gimp, name);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+get_parasite_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  GimpParasite *parasite = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      parasite = gimp_parasite_copy (gimp_parasite_find (gimp, name));
+
+      if (! parasite)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_boxed (gimp_value_array_index (return_vals, 1), parasite);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_parasite_list_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 num_parasites = 0;
+  gchar **parasites = NULL;
+
+  parasites = gimp_parasite_list (gimp, &num_parasites);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_parasites);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), parasites, num_parasites);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+temp_name_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *extension;
+  gchar *name = NULL;
+
+  extension = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GFile *file = gimp_get_temp_file (gimp, extension);
+
+      name = g_file_get_path (file);
+
+      g_object_unref (file);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+void
+register_gimp_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-version
+   */
+  procedure = gimp_procedure_new (version_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-version");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-version",
+                                     "Returns the host GIMP version.",
+                                     "This procedure returns the version number of the currently running GIMP.",
+                                     "Manish Singh",
+                                     "Manish Singh",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("version",
+                                                           "version",
+                                                           "GIMP version number",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-getpid
+   */
+  procedure = gimp_procedure_new (getpid_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-getpid");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-getpid",
+                                     "Returns the PID of the host GIMP process.",
+                                     "This procedure returns the process ID of the currently running GIMP.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("pid",
+                                                          "pid",
+                                                          "The PID",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-quit
+   */
+  procedure = gimp_procedure_new (quit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-quit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-quit",
+                                     "Causes GIMP to exit gracefully.",
+                                     "If there are unsaved images in an interactive GIMP session, the user will be asked for confirmation. If force is TRUE, the application is quit without querying the user to save any dirty images.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("force",
+                                                     "force",
+                                                     "Force GIMP to quit without asking",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-attach-parasite
+   */
+  procedure = gimp_procedure_new (attach_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-attach-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-attach-parasite",
+                                     "Add a global parasite.",
+                                     "This procedure attaches a global parasite. It has no return values.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_parasite ("parasite",
+                                                         "parasite",
+                                                         "The parasite to attach",
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-detach-parasite
+   */
+  procedure = gimp_procedure_new (detach_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-detach-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-detach-parasite",
+                                     "Removes a global parasite.",
+                                     "This procedure detaches a global parasite from. It has no return values.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the parasite to detach.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-parasite
+   */
+  procedure = gimp_procedure_new (get_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-parasite",
+                                     "Look up a global parasite.",
+                                     "Finds and returns the global parasite that was previously attached.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the parasite to find",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_parasite ("parasite",
+                                                             "parasite",
+                                                             "The found parasite",
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-parasite-list
+   */
+  procedure = gimp_procedure_new (get_parasite_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-parasite-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-parasite-list",
+                                     "List all parasites.",
+                                     "Returns a list of all currently attached global parasites.",
+                                     "Marc Lehmann",
+                                     "Marc Lehmann",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-parasites",
+                                                          "num parasites",
+                                                          "The number of attached parasites",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("parasites",
+                                                                 "parasites",
+                                                                 "The names of currently attached parasites",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-temp-name
+   */
+  procedure = gimp_procedure_new (temp_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-temp-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-temp-name",
+                                     "Generates a unique filename.",
+                                     "Generates a unique filename using the temp path supplied in the user's gimprc.",
+                                     "Josh MacDonald",
+                                     "Josh MacDonald",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("extension",
+                                                       "extension",
+                                                       "The extension the file will have",
+                                                       TRUE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The new temp filename",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/gimp-pdb-compat.c b/app/pdb/gimp-pdb-compat.c
new file mode 100644
index 0000000..b669dfe
--- /dev/null
+++ b/app/pdb/gimp-pdb-compat.c
@@ -0,0 +1,562 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimp-pdb-compat.h"
+
+
+/*  local function prototypes  */
+
+static gchar * gimp_pdb_compat_fix_param_name (const gchar *name);
+
+
+/*  public functions  */
+
+GParamSpec *
+gimp_pdb_compat_param_spec (Gimp           *gimp,
+                            GimpPDBArgType  arg_type,
+                            const gchar    *name,
+                            const gchar    *desc,
+                            gboolean       *name_valid)
+{
+  GParamSpec *pspec = NULL;
+  gchar      *real_name;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  real_name = gimp_pdb_compat_fix_param_name (name);
+
+  if (name_valid) *name_valid = ! strcmp (name, real_name);
+
+  switch (arg_type)
+    {
+    case GIMP_PDB_INT32:
+      pspec = gimp_param_spec_int32 (real_name, real_name, desc,
+                                     G_MININT32, G_MAXINT32, 0,
+                                     G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_INT16:
+      pspec = gimp_param_spec_int16 (real_name, real_name, desc,
+                                     G_MININT16, G_MAXINT16, 0,
+                                     G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_INT8:
+      pspec = gimp_param_spec_int8 (real_name, real_name, desc,
+                                    0, G_MAXUINT8, 0,
+                                    G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_FLOAT:
+      pspec = g_param_spec_double (real_name, real_name, desc,
+                                   -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+                                   G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_STRING:
+      pspec = gimp_param_spec_string (real_name, real_name, desc,
+                                      TRUE, TRUE, FALSE,
+                                      NULL,
+                                      G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_INT32ARRAY:
+      pspec = gimp_param_spec_int32_array (real_name, real_name, desc,
+                                           G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_INT16ARRAY:
+      pspec = gimp_param_spec_int16_array (real_name, real_name, desc,
+                                           G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_INT8ARRAY:
+      pspec = gimp_param_spec_int8_array (real_name, real_name, desc,
+                                          G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_FLOATARRAY:
+      pspec = gimp_param_spec_float_array (real_name, real_name, desc,
+                                           G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_STRINGARRAY:
+      pspec = gimp_param_spec_string_array (real_name, real_name, desc,
+                                            G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_COLOR:
+      pspec = gimp_param_spec_rgb (real_name, real_name, desc,
+                                   TRUE, NULL,
+                                   G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_ITEM:
+      pspec = gimp_param_spec_item_id (real_name, real_name, desc,
+                                       gimp, TRUE,
+                                       G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_DISPLAY:
+      pspec = gimp_param_spec_display_id (real_name, real_name, desc,
+                                          gimp, TRUE,
+                                          G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_IMAGE:
+      pspec = gimp_param_spec_image_id (real_name, real_name, desc,
+                                        gimp, TRUE,
+                                        G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_LAYER:
+      pspec = gimp_param_spec_layer_id (real_name, real_name, desc,
+                                        gimp, TRUE,
+                                        G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_CHANNEL:
+      pspec = gimp_param_spec_channel_id (real_name, real_name, desc,
+                                          gimp, TRUE,
+                                          G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_DRAWABLE:
+      pspec = gimp_param_spec_drawable_id (real_name, real_name, desc,
+                                           gimp, TRUE,
+                                           G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_SELECTION:
+      pspec = gimp_param_spec_selection_id (real_name, real_name, desc,
+                                            gimp, TRUE,
+                                            G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_COLORARRAY:
+      pspec = gimp_param_spec_color_array (real_name, real_name, desc,
+                                           G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_VECTORS:
+      pspec = gimp_param_spec_vectors_id (real_name, real_name, desc,
+                                          gimp, TRUE,
+                                          G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_PARASITE:
+      pspec = gimp_param_spec_parasite (real_name, real_name, desc,
+                                        G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_STATUS:
+      pspec = g_param_spec_enum (real_name, real_name, desc,
+                                 GIMP_TYPE_PDB_STATUS_TYPE,
+                                 GIMP_PDB_EXECUTION_ERROR,
+                                 G_PARAM_READWRITE);
+      break;
+
+    case GIMP_PDB_END:
+      break;
+    }
+
+  if (! pspec)
+    {
+      g_warning ("%s: returning NULL for %s (%s)",
+                 G_STRFUNC,
+                 real_name,
+                 gimp_pdb_compat_arg_type_to_string (arg_type));
+    }
+
+  g_free (real_name);
+
+  return pspec;
+}
+
+GType
+gimp_pdb_compat_arg_type_to_gtype (GimpPDBArgType  type)
+{
+
+  switch (type)
+    {
+    case GIMP_PDB_INT32:
+      return GIMP_TYPE_INT32;
+
+    case GIMP_PDB_INT16:
+      return GIMP_TYPE_INT16;
+
+    case GIMP_PDB_INT8:
+      return GIMP_TYPE_INT8;
+
+    case GIMP_PDB_FLOAT:
+      return G_TYPE_DOUBLE;
+
+    case GIMP_PDB_STRING:
+      return G_TYPE_STRING;
+
+    case GIMP_PDB_INT32ARRAY:
+      return GIMP_TYPE_INT32_ARRAY;
+
+    case GIMP_PDB_INT16ARRAY:
+      return GIMP_TYPE_INT16_ARRAY;
+
+    case GIMP_PDB_INT8ARRAY:
+      return GIMP_TYPE_INT8_ARRAY;
+
+    case GIMP_PDB_FLOATARRAY:
+      return GIMP_TYPE_FLOAT_ARRAY;
+
+    case GIMP_PDB_STRINGARRAY:
+      return GIMP_TYPE_STRING_ARRAY;
+
+    case GIMP_PDB_COLOR:
+      return GIMP_TYPE_RGB;
+
+    case GIMP_PDB_ITEM:
+      return GIMP_TYPE_ITEM_ID;
+
+    case GIMP_PDB_DISPLAY:
+      return GIMP_TYPE_DISPLAY_ID;
+
+    case GIMP_PDB_IMAGE:
+      return GIMP_TYPE_IMAGE_ID;
+
+    case GIMP_PDB_LAYER:
+      return GIMP_TYPE_LAYER_ID;
+
+    case GIMP_PDB_CHANNEL:
+      return GIMP_TYPE_CHANNEL_ID;
+
+    case GIMP_PDB_DRAWABLE:
+      return GIMP_TYPE_DRAWABLE_ID;
+
+    case GIMP_PDB_SELECTION:
+      return GIMP_TYPE_SELECTION_ID;
+
+    case GIMP_PDB_COLORARRAY:
+      return GIMP_TYPE_COLOR_ARRAY;
+
+    case GIMP_PDB_VECTORS:
+      return GIMP_TYPE_VECTORS_ID;
+
+    case GIMP_PDB_PARASITE:
+      return GIMP_TYPE_PARASITE;
+
+    case GIMP_PDB_STATUS:
+      return GIMP_TYPE_PDB_STATUS_TYPE;
+
+    case GIMP_PDB_END:
+      break;
+    }
+
+  g_warning ("%s: returning G_TYPE_NONE for %d (%s)",
+             G_STRFUNC, type, gimp_pdb_compat_arg_type_to_string (type));
+
+  return G_TYPE_NONE;
+}
+
+GimpPDBArgType
+gimp_pdb_compat_arg_type_from_gtype (GType type)
+{
+  static GQuark  pdb_type_quark = 0;
+  GimpPDBArgType pdb_type;
+
+  if (! pdb_type_quark)
+    {
+      struct
+      {
+        GType          g_type;
+        GimpPDBArgType pdb_type;
+      }
+      type_mapping[] =
+      {
+        { GIMP_TYPE_INT32,           GIMP_PDB_INT32       },
+        { G_TYPE_INT,                GIMP_PDB_INT32       },
+        { G_TYPE_UINT,               GIMP_PDB_INT32       },
+        { G_TYPE_ENUM,               GIMP_PDB_INT32       },
+        { G_TYPE_BOOLEAN,            GIMP_PDB_INT32       },
+
+        { GIMP_TYPE_INT16,           GIMP_PDB_INT16       },
+        { GIMP_TYPE_INT8,            GIMP_PDB_INT8        },
+        { G_TYPE_DOUBLE,             GIMP_PDB_FLOAT       },
+
+        { G_TYPE_STRING,             GIMP_PDB_STRING      },
+
+        { GIMP_TYPE_RGB,             GIMP_PDB_COLOR       },
+
+        { GIMP_TYPE_INT32_ARRAY,     GIMP_PDB_INT32ARRAY  },
+        { GIMP_TYPE_INT16_ARRAY,     GIMP_PDB_INT16ARRAY  },
+        { GIMP_TYPE_INT8_ARRAY,      GIMP_PDB_INT8ARRAY   },
+        { GIMP_TYPE_FLOAT_ARRAY,     GIMP_PDB_FLOATARRAY  },
+        { GIMP_TYPE_STRING_ARRAY,    GIMP_PDB_STRINGARRAY },
+        { GIMP_TYPE_COLOR_ARRAY,     GIMP_PDB_COLORARRAY  },
+
+        { GIMP_TYPE_ITEM_ID,         GIMP_PDB_ITEM        },
+        { GIMP_TYPE_DISPLAY_ID,      GIMP_PDB_DISPLAY     },
+        { GIMP_TYPE_IMAGE_ID,        GIMP_PDB_IMAGE       },
+        { GIMP_TYPE_LAYER_ID,        GIMP_PDB_LAYER       },
+        { GIMP_TYPE_CHANNEL_ID,      GIMP_PDB_CHANNEL     },
+        { GIMP_TYPE_DRAWABLE_ID,     GIMP_PDB_DRAWABLE    },
+        { GIMP_TYPE_SELECTION_ID,    GIMP_PDB_SELECTION   },
+        { GIMP_TYPE_LAYER_MASK_ID,   GIMP_PDB_CHANNEL     },
+        { GIMP_TYPE_VECTORS_ID,      GIMP_PDB_VECTORS     },
+
+        { GIMP_TYPE_PARASITE,        GIMP_PDB_PARASITE    },
+
+        { GIMP_TYPE_PDB_STATUS_TYPE, GIMP_PDB_STATUS      }
+      };
+
+      gint i;
+
+      pdb_type_quark = g_quark_from_static_string ("gimp-pdb-type");
+
+      for (i = 0; i < G_N_ELEMENTS (type_mapping); i++)
+        g_type_set_qdata (type_mapping[i].g_type, pdb_type_quark,
+                          GINT_TO_POINTER (type_mapping[i].pdb_type));
+    }
+
+  pdb_type = GPOINTER_TO_INT (g_type_get_qdata (type, pdb_type_quark));
+
+#if 0
+  g_printerr ("%s: arg_type = %p (%s)  ->  %d (%s)\n",
+              G_STRFUNC,
+              (gpointer) type, g_type_name (type),
+              pdb_type, gimp_pdb_arg_type_to_string (pdb_type));
+#endif
+
+  return pdb_type;
+}
+
+gchar *
+gimp_pdb_compat_arg_type_to_string (GimpPDBArgType type)
+{
+  const gchar *name;
+
+  if (! gimp_enum_get_value (GIMP_TYPE_PDB_ARG_TYPE, type,
+                             &name, NULL, NULL, NULL))
+    {
+      return  g_strdup_printf ("(PDB type %d unknown)", type);
+    }
+
+  return g_strdup (name);
+}
+
+void
+gimp_pdb_compat_procs_register (GimpPDB           *pdb,
+                                GimpPDBCompatMode  compat_mode)
+{
+  static const struct
+  {
+    const gchar *old_name;
+    const gchar *new_name;
+  }
+  compat_procs[] =
+  {
+    { "gimp-blend",                         "gimp-edit-blend"                 },
+    { "gimp-brushes-list",                  "gimp-brushes-get-list"           },
+    { "gimp-bucket-fill",                   "gimp-edit-bucket-fill"           },
+    { "gimp-channel-delete",                "gimp-item-delete"                },
+    { "gimp-channel-get-name",              "gimp-item-get-name"              },
+    { "gimp-channel-get-tattoo",            "gimp-item-get-tattoo"            },
+    { "gimp-channel-get-visible",           "gimp-item-get-visible"           },
+    { "gimp-channel-set-name",              "gimp-item-set-name"              },
+    { "gimp-channel-set-tattoo",            "gimp-item-set-tattoo"            },
+    { "gimp-channel-set-visible",           "gimp-item-set-visible"           },
+    { "gimp-color-picker",                  "gimp-image-pick-color"           },
+    { "gimp-convert-grayscale",             "gimp-image-convert-grayscale"    },
+    { "gimp-convert-indexed",               "gimp-image-convert-indexed"      },
+    { "gimp-convert-rgb",                   "gimp-image-convert-rgb"          },
+    { "gimp-crop",                          "gimp-image-crop"                 },
+    { "gimp-drawable-bytes",                "gimp-drawable-bpp"               },
+    { "gimp-drawable-image",                "gimp-drawable-get-image"         },
+    { "gimp-image-active-drawable",         "gimp-image-get-active-drawable"  },
+    { "gimp-image-floating-selection",      "gimp-image-get-floating-sel"     },
+    { "gimp-layer-delete",                  "gimp-item-delete"                },
+    { "gimp-layer-get-linked",              "gimp-item-get-linked"            },
+    { "gimp-layer-get-name",                "gimp-item-get-name"              },
+    { "gimp-layer-get-tattoo",              "gimp-item-get-tattoo"            },
+    { "gimp-layer-get-visible",             "gimp-item-get-visible"           },
+    { "gimp-layer-mask",                    "gimp-layer-get-mask"             },
+    { "gimp-layer-set-linked",              "gimp-item-set-linked"            },
+    { "gimp-layer-set-name",                "gimp-item-set-name"              },
+    { "gimp-layer-set-tattoo",              "gimp-item-set-tattoo"            },
+    { "gimp-layer-set-visible",             "gimp-item-set-visible"           },
+    { "gimp-palette-refresh",               "gimp-palettes-refresh"           },
+    { "gimp-patterns-list",                 "gimp-patterns-get-list"          },
+    { "gimp-temp-PDB-name",                 "gimp-procedural-db-temp-name"    },
+    { "gimp-undo-push-group-end",           "gimp-image-undo-group-end"       },
+    { "gimp-undo-push-group-start",         "gimp-image-undo-group-start"     },
+
+    /*  deprecations since 2.0  */
+    { "gimp-brushes-get-opacity",           "gimp-context-get-opacity"        },
+    { "gimp-brushes-get-paint-mode",        "gimp-context-get-paint-mode"     },
+    { "gimp-brushes-set-brush",             "gimp-context-set-brush"          },
+    { "gimp-brushes-set-opacity",           "gimp-context-set-opacity"        },
+    { "gimp-brushes-set-paint-mode",        "gimp-context-set-paint-mode"     },
+    { "gimp-channel-ops-duplicate",         "gimp-image-duplicate"            },
+    { "gimp-channel-ops-offset",            "gimp-drawable-offset"            },
+    { "gimp-gradients-get-active",          "gimp-context-get-gradient"       },
+    { "gimp-gradients-get-gradient",        "gimp-context-get-gradient"       },
+    { "gimp-gradients-set-active",          "gimp-context-set-gradient"       },
+    { "gimp-gradients-set-gradient",        "gimp-context-set-gradient"       },
+    { "gimp-image-get-cmap",                "gimp-image-get-colormap"         },
+    { "gimp-image-set-cmap",                "gimp-image-set-colormap"         },
+    { "gimp-palette-get-background",        "gimp-context-get-background"     },
+    { "gimp-palette-get-foreground",        "gimp-context-get-foreground"     },
+    { "gimp-palette-set-background",        "gimp-context-set-background"     },
+    { "gimp-palette-set-default-colors",    "gimp-context-set-default-colors" },
+    { "gimp-palette-set-foreground",        "gimp-context-set-foreground"     },
+    { "gimp-palette-swap-colors",           "gimp-context-swap-colors"        },
+    { "gimp-palettes-set-palette",          "gimp-context-set-palette"        },
+    { "gimp-patterns-set-pattern",          "gimp-context-set-pattern"        },
+    { "gimp-selection-clear",               "gimp-selection-none"             },
+
+    /*  deprecations since 2.2  */
+    { "gimp-layer-get-preserve-trans",      "gimp-layer-get-lock-alpha"       },
+    { "gimp-layer-set-preserve-trans",      "gimp-layer-set-lock-alpha"       },
+
+    /*  deprecations since 2.6  */
+    { "gimp-drawable-is-valid",             "gimp-item-is-valid"              },
+    { "gimp-drawable-is-layer",             "gimp-item-is-layer"              },
+    { "gimp-drawable-is-text-layer",        "gimp-item-is-text-layer"         },
+    { "gimp-drawable-is-layer-mask",        "gimp-item-is-layer-mask"         },
+    { "gimp-drawable-is-channel",           "gimp-item-is-channel"            },
+    { "gimp-drawable-delete",               "gimp-item-delete"                },
+    { "gimp-drawable-get-image",            "gimp-item-get-image"             },
+    { "gimp-drawable-get-name",             "gimp-item-get-name"              },
+    { "gimp-drawable-set-name",             "gimp-item-set-name"              },
+    { "gimp-drawable-get-visible",          "gimp-item-get-visible"           },
+    { "gimp-drawable-set-visible",          "gimp-item-set-visible"           },
+    { "gimp-drawable-get-linked",           "gimp-item-get-linked"            },
+    { "gimp-drawable-set-linked",           "gimp-item-set-linked"            },
+    { "gimp-drawable-get-tattoo",           "gimp-item-get-tattoo"            },
+    { "gimp-drawable-set-tattoo",           "gimp-item-set-tattoo"            },
+    { "gimp-drawable-parasite-find",        "gimp-item-get-parasite"          },
+    { "gimp-drawable-parasite-attach",      "gimp-item-attach-parasite"       },
+    { "gimp-drawable-parasite-detach",      "gimp-item-detach-parasite"       },
+    { "gimp-drawable-parasite-list",        "gimp-item-get-parasite-list"     },
+    { "gimp-image-get-layer-position",      "gimp-image-get-item-position"    },
+    { "gimp-image-raise-layer",             "gimp-image-raise-item"           },
+    { "gimp-image-lower-layer",             "gimp-image-lower-item"           },
+    { "gimp-image-raise-layer-to-top",      "gimp-image-raise-item-to-top"    },
+    { "gimp-image-lower-layer-to-bottom",   "gimp-image-lower-item-to-bottom" },
+    { "gimp-image-get-channel-position",    "gimp-image-get-item-position"    },
+    { "gimp-image-raise-channel",           "gimp-image-raise-item"           },
+    { "gimp-image-lower-channel",           "gimp-image-lower-item"           },
+    { "gimp-image-get-vectors-position",    "gimp-image-get-item-position"    },
+    { "gimp-image-raise-vectors",           "gimp-image-raise-item"           },
+    { "gimp-image-lower-vectors",           "gimp-image-lower-item"           },
+    { "gimp-image-raise-vectors-to-top",    "gimp-image-raise-item-to-top"    },
+    { "gimp-image-lower-vectors-to-bottom", "gimp-image-lower-item-to-bottom" },
+    { "gimp-vectors-is-valid",              "gimp-item-is-valid"              },
+    { "gimp-vectors-get-image",             "gimp-item-get-image"             },
+    { "gimp-vectors-get-name",              "gimp-item-get-name"              },
+    { "gimp-vectors-set-name",              "gimp-item-set-name"              },
+    { "gimp-vectors-get-visible",           "gimp-item-get-visible"           },
+    { "gimp-vectors-set-visible",           "gimp-item-set-visible"           },
+    { "gimp-vectors-get-linked",            "gimp-item-get-linked"            },
+    { "gimp-vectors-set-linked",            "gimp-item-set-linked"            },
+    { "gimp-vectors-get-tattoo",            "gimp-item-get-tattoo"            },
+    { "gimp-vectors-set-tattoo",            "gimp-item-set-tattoo"            },
+    { "gimp-vectors-parasite-find",         "gimp-item-get-parasite"          },
+    { "gimp-vectors-parasite-attach",       "gimp-item-attach-parasite"       },
+    { "gimp-vectors-parasite-detach",       "gimp-item-detach-parasite"       },
+    { "gimp-vectors-parasite-list",         "gimp-item-get-parasite-list"     },
+    { "gimp-image-parasite-find",           "gimp-image-get-parasite"         },
+    { "gimp-image-parasite-attach",         "gimp-image-attach-parasite"      },
+    { "gimp-image-parasite-detach",         "gimp-image-detach-parasite"      },
+    { "gimp-image-parasite-list",           "gimp-image-get-parasite-list"    },
+    { "gimp-parasite-find",                 "gimp-get-parasite"               },
+    { "gimp-parasite-attach",               "gimp-attach-parasite"            },
+    { "gimp-parasite-detach",               "gimp-detach-parasite"            },
+    { "gimp-parasite-list",                 "gimp-get-parasite-list"          },
+
+    /*  deprecations since 2.8  */
+    { "gimp-edit-paste-as-new",             "gimp-edit-paste-as-new-image"    },
+    { "gimp-edit-named-paste-as-new", "gimp-edit-named-paste-as-new-image"    }
+ };
+
+  g_return_if_fail (GIMP_IS_PDB (pdb));
+
+  if (compat_mode != GIMP_PDB_COMPAT_OFF)
+    {
+      gint i;
+
+      for (i = 0; i < G_N_ELEMENTS (compat_procs); i++)
+        gimp_pdb_register_compat_proc_name (pdb,
+                                            compat_procs[i].old_name,
+                                            compat_procs[i].new_name);
+    }
+}
+
+
+/*  private functions  */
+
+/* Since GLib 2.63.3, invalid param-spec names are rejected upon creation.
+ * This impacts procedure parameters and return-values, which are stored as
+ * param-specs internally.  Since this requirement wasn't previously enforced,
+ * keep supporting arbitrary parameter names in gimp-2.
+ *
+ * See issues #4392 and #4641.
+ */
+static gchar *
+gimp_pdb_compat_fix_param_name (const gchar *name)
+{
+  GString *new_name;
+
+  new_name = g_string_new (NULL);
+
+  /* First character must be a letter. */
+  if ((name[0] < 'A' || name[0] > 'Z') &&
+      (name[0] < 'a' || name[0] > 'z'))
+    {
+      g_string_append (new_name, "param-");
+    }
+
+  for (; *name; name++)
+    {
+      gchar c = *name;
+
+      if ((c < 'A' || c > 'Z') &&
+          (c < 'a' || c > 'z') &&
+          (c < '0' || c > '9') &&
+          c != '-' && c != '_')
+        {
+          c = '-';
+        }
+
+      g_string_append_c (new_name, c);
+    }
+
+  return g_string_free (new_name, FALSE);
+}
diff --git a/app/pdb/gimp-pdb-compat.h b/app/pdb/gimp-pdb-compat.h
new file mode 100644
index 0000000..7f12fdf
--- /dev/null
+++ b/app/pdb/gimp-pdb-compat.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_COMPAT_H__
+#define __GIMP_PDB_COMPAT_H__
+
+
+GParamSpec     * gimp_pdb_compat_param_spec          (Gimp           *gimp,
+                                                      GimpPDBArgType  arg_type,
+                                                      const gchar    *name,
+                                                      const gchar    *desc,
+                                                      gboolean       *name_valid);
+
+GType            gimp_pdb_compat_arg_type_to_gtype   (GimpPDBArgType  type);
+GimpPDBArgType   gimp_pdb_compat_arg_type_from_gtype (GType           type);
+gchar          * gimp_pdb_compat_arg_type_to_string  (GimpPDBArgType  type);
+
+void             gimp_pdb_compat_procs_register (GimpPDB           *pdb,
+                                                 GimpPDBCompatMode  compat_mode);
+
+
+#endif  /*  __GIMP_PDB_COMPAT_H__  */
diff --git a/app/pdb/gimppdb-query.c b/app/pdb/gimppdb-query.c
new file mode 100644
index 0000000..00689fa
--- /dev/null
+++ b/app/pdb/gimppdb-query.c
@@ -0,0 +1,649 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpparamspecs-desc.h"
+
+#include "gimppdb.h"
+#include "gimppdb-query.h"
+#include "gimppdberror.h"
+#include "gimp-pdb-compat.h"
+#include "gimpprocedure.h"
+
+#include "gimp-intl.h"
+
+
+#define PDB_REGEX_FLAGS    (G_REGEX_CASELESS | G_REGEX_OPTIMIZE)
+
+#define COMPAT_BLURB       "This procedure is deprecated! Use '%s' instead."
+
+
+typedef struct _PDBDump PDBDump;
+
+struct _PDBDump
+{
+  GimpPDB       *pdb;
+  GOutputStream *output;
+  GError        *error;
+
+  gboolean       dumping_compat;
+};
+
+typedef struct _PDBQuery PDBQuery;
+
+struct _PDBQuery
+{
+  GimpPDB  *pdb;
+
+  GRegex   *name_regex;
+  GRegex   *blurb_regex;
+  GRegex   *help_regex;
+  GRegex   *author_regex;
+  GRegex   *copyright_regex;
+  GRegex   *date_regex;
+  GRegex   *proc_type_regex;
+
+  gchar   **list_of_procs;
+  gint      num_procs;
+  gboolean  querying_compat;
+};
+
+typedef struct _PDBStrings PDBStrings;
+
+struct _PDBStrings
+{
+  gboolean  compat;
+
+  gchar    *blurb;
+  gchar    *help;
+  gchar    *author;
+  gchar    *copyright;
+  gchar    *date;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_pdb_query_entry  (gpointer       key,
+                                     gpointer       value,
+                                     gpointer       user_data);
+static void   gimp_pdb_print_entry  (gpointer       key,
+                                     gpointer       value,
+                                     gpointer       user_data);
+static void   gimp_pdb_get_strings  (PDBStrings    *strings,
+                                     GimpProcedure *procedure,
+                                     gboolean       compat);
+static void   gimp_pdb_free_strings (PDBStrings    *strings);
+
+
+/*  public functions  */
+
+gboolean
+gimp_pdb_dump (GimpPDB  *pdb,
+               GFile    *file,
+               GError  **error)
+{
+  PDBDump pdb_dump = { 0, };
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  pdb_dump.pdb    = pdb;
+  pdb_dump.output = G_OUTPUT_STREAM (g_file_replace (file,
+                                                     NULL, FALSE,
+                                                     G_FILE_CREATE_NONE,
+                                                     NULL, error));
+  if (! pdb_dump.output)
+    return FALSE;
+
+  pdb_dump.dumping_compat = FALSE;
+
+  g_hash_table_foreach (pdb->procedures,
+                        gimp_pdb_print_entry,
+                        &pdb_dump);
+
+  pdb_dump.dumping_compat = TRUE;
+
+  g_hash_table_foreach (pdb->compat_proc_names,
+                        gimp_pdb_print_entry,
+                        &pdb_dump);
+
+  if (pdb_dump.error)
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      g_set_error (error, pdb_dump.error->domain, pdb_dump.error->code,
+                   _("Writing PDB file '%s' failed: %s"),
+                   gimp_file_get_utf8_name (file), pdb_dump.error->message);
+      g_clear_error (&pdb_dump.error);
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (pdb_dump.output, cancellable, NULL);
+      g_object_unref (cancellable);
+      g_object_unref (pdb_dump.output);
+
+      return FALSE;
+    }
+
+  g_object_unref (pdb_dump.output);
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_query (GimpPDB       *pdb,
+                const gchar   *name,
+                const gchar   *blurb,
+                const gchar   *help,
+                const gchar   *author,
+                const gchar   *copyright,
+                const gchar   *date,
+                const gchar   *proc_type,
+                gint          *num_procs,
+                gchar       ***procs,
+                GError       **error)
+{
+  PDBQuery pdb_query = { 0, };
+  gboolean success   = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+  g_return_val_if_fail (blurb != NULL, FALSE);
+  g_return_val_if_fail (help != NULL, FALSE);
+  g_return_val_if_fail (author != NULL, FALSE);
+  g_return_val_if_fail (copyright != NULL, FALSE);
+  g_return_val_if_fail (date != NULL, FALSE);
+  g_return_val_if_fail (proc_type != NULL, FALSE);
+  g_return_val_if_fail (num_procs != NULL, FALSE);
+  g_return_val_if_fail (procs != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  *num_procs = 0;
+  *procs     = NULL;
+
+  pdb_query.name_regex = g_regex_new (name, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.name_regex)
+    goto cleanup;
+
+  pdb_query.blurb_regex = g_regex_new (blurb, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.blurb_regex)
+    goto cleanup;
+
+  pdb_query.help_regex = g_regex_new (help, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.help_regex)
+    goto cleanup;
+
+  pdb_query.author_regex = g_regex_new (author, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.author_regex)
+    goto cleanup;
+
+  pdb_query.copyright_regex = g_regex_new (copyright, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.copyright_regex)
+    goto cleanup;
+
+  pdb_query.date_regex = g_regex_new (date, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.date_regex)
+    goto cleanup;
+
+  pdb_query.proc_type_regex = g_regex_new (proc_type, PDB_REGEX_FLAGS, 0, error);
+  if (! pdb_query.proc_type_regex)
+    goto cleanup;
+
+  success = TRUE;
+
+  pdb_query.pdb             = pdb;
+  pdb_query.list_of_procs   = NULL;
+  pdb_query.num_procs       = 0;
+  pdb_query.querying_compat = FALSE;
+
+  g_hash_table_foreach (pdb->procedures,
+                        gimp_pdb_query_entry, &pdb_query);
+
+  pdb_query.querying_compat = TRUE;
+
+  g_hash_table_foreach (pdb->compat_proc_names,
+                        gimp_pdb_query_entry, &pdb_query);
+
+ cleanup:
+
+  if (pdb_query.proc_type_regex)
+    g_regex_unref (pdb_query.proc_type_regex);
+
+  if (pdb_query.date_regex)
+    g_regex_unref (pdb_query.date_regex);
+
+  if (pdb_query.copyright_regex)
+    g_regex_unref (pdb_query.copyright_regex);
+
+  if (pdb_query.author_regex)
+    g_regex_unref (pdb_query.author_regex);
+
+  if (pdb_query.help_regex)
+    g_regex_unref (pdb_query.help_regex);
+
+  if (pdb_query.blurb_regex)
+    g_regex_unref (pdb_query.blurb_regex);
+
+  if (pdb_query.name_regex)
+    g_regex_unref (pdb_query.name_regex);
+
+  if (success)
+    {
+      *num_procs = pdb_query.num_procs;
+      *procs     = pdb_query.list_of_procs;
+    }
+
+  return success;
+}
+
+gboolean
+gimp_pdb_proc_info (GimpPDB          *pdb,
+                    const gchar      *proc_name,
+                    gchar           **blurb,
+                    gchar           **help,
+                    gchar           **author,
+                    gchar           **copyright,
+                    gchar           **date,
+                    GimpPDBProcType  *proc_type,
+                    gint             *num_args,
+                    gint             *num_values,
+                    GError          **error)
+{
+  GimpProcedure *procedure;
+  PDBStrings     strings;
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), FALSE);
+  g_return_val_if_fail (proc_name != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  procedure = gimp_pdb_lookup_procedure (pdb, proc_name);
+
+  if (procedure)
+    {
+      gimp_pdb_get_strings (&strings, procedure, FALSE);
+    }
+  else
+    {
+      const gchar *compat_name;
+
+      compat_name = gimp_pdb_lookup_compat_proc_name (pdb, proc_name);
+
+      if (compat_name)
+        {
+          procedure = gimp_pdb_lookup_procedure (pdb, compat_name);
+
+          if (procedure)
+            gimp_pdb_get_strings (&strings, procedure, TRUE);
+        }
+    }
+
+  if (procedure)
+    {
+      *blurb      = strings.compat ? strings.blurb : g_strdup (strings.blurb);
+      *help       = strings.compat ? strings.help : g_strdup (strings.help);
+      *author     = strings.compat ? strings.author : g_strdup (strings.author);
+      *copyright  = strings.compat ? strings.copyright : g_strdup (strings.copyright);
+      *date       = strings.compat ? strings.date : g_strdup (strings.date);
+      *proc_type  = procedure->proc_type;
+      *num_args   = procedure->num_args;
+      *num_values = procedure->num_values;
+
+      return TRUE;
+    }
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_PROCEDURE_NOT_FOUND,
+               _("Procedure '%s' not found"), proc_name);
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static gboolean
+match_string (GRegex      *regex,
+              const gchar *string)
+{
+  if (! string)
+    string = "";
+
+  return g_regex_match (regex, string, 0, NULL);
+}
+
+static void
+gimp_pdb_query_entry (gpointer key,
+                      gpointer value,
+                      gpointer user_data)
+{
+  PDBQuery      *pdb_query = user_data;
+  GList         *list;
+  GimpProcedure *procedure;
+  const gchar   *proc_name;
+  PDBStrings     strings;
+  GEnumClass    *enum_class;
+  GimpEnumDesc  *type_desc;
+
+  proc_name = key;
+
+  if (pdb_query->querying_compat)
+    list = g_hash_table_lookup (pdb_query->pdb->procedures, value);
+  else
+    list = value;
+
+  if (! list)
+    return;
+
+  procedure = list->data;
+
+  gimp_pdb_get_strings (&strings, procedure, pdb_query->querying_compat);
+
+  enum_class = g_type_class_ref (GIMP_TYPE_PDB_PROC_TYPE);
+  type_desc = gimp_enum_get_desc (enum_class, procedure->proc_type);
+  g_type_class_unref  (enum_class);
+
+  if (match_string (pdb_query->name_regex,      proc_name)         &&
+      match_string (pdb_query->blurb_regex,     strings.blurb)     &&
+      match_string (pdb_query->help_regex,      strings.help)      &&
+      match_string (pdb_query->author_regex,    strings.author)    &&
+      match_string (pdb_query->copyright_regex, strings.copyright) &&
+      match_string (pdb_query->date_regex,      strings.date)      &&
+      match_string (pdb_query->proc_type_regex, type_desc->value_desc))
+    {
+      pdb_query->num_procs++;
+      pdb_query->list_of_procs = g_renew (gchar *, pdb_query->list_of_procs,
+                                          pdb_query->num_procs);
+      pdb_query->list_of_procs[pdb_query->num_procs - 1] = g_strdup (proc_name);
+    }
+
+  gimp_pdb_free_strings (&strings);
+}
+
+/* #define DEBUG_OUTPUT 1 */
+
+static void
+output_string (GString     *dest,
+               const gchar *string)
+{
+#ifndef DEBUG_OUTPUT
+  g_string_append_printf (dest, "\"");
+#endif
+
+  if (string)
+    while (*string)
+      {
+        switch (*string)
+          {
+          case '\\' : g_string_append_printf (dest, "\\\\"); break;
+          case '\"' : g_string_append_printf (dest, "\\\""); break;
+          case '{'  : g_string_append_printf (dest, "@{");   break;
+          case '@'  : g_string_append_printf (dest, "@@");   break;
+          case '}'  : g_string_append_printf (dest, "@}");   break;
+
+          default:
+            g_string_append_printf (dest, "%c", *string);
+          }
+        string++;
+      }
+
+#ifndef DEBUG_OUTPUT
+  g_string_append_printf (dest, "\"\n");
+#endif
+}
+
+static void
+gimp_pdb_print_entry (gpointer key,
+                      gpointer value,
+                      gpointer user_data)
+{
+  PDBDump       *pdb_dump = user_data;
+  GOutputStream *output   = pdb_dump->output;
+  const gchar   *proc_name;
+  GList         *list;
+  GEnumClass    *arg_class;
+  GEnumClass    *proc_class;
+  GString       *buf;
+  GString       *string;
+  gint           num = 0;
+
+  if (pdb_dump->error)
+    return;
+
+  proc_name = key;
+
+  if (pdb_dump->dumping_compat)
+    list = g_hash_table_lookup (pdb_dump->pdb->procedures, value);
+  else
+    list = value;
+
+  arg_class  = g_type_class_ref (GIMP_TYPE_PDB_ARG_TYPE);
+  proc_class = g_type_class_ref (GIMP_TYPE_PDB_PROC_TYPE);
+
+  buf    = g_string_new (NULL);
+  string = g_string_new (NULL);
+
+  for (; list; list = list->next)
+    {
+      GimpProcedure *procedure = list->data;
+      PDBStrings     strings;
+      GEnumValue    *arg_value;
+      GimpEnumDesc  *type_desc;
+      gint           i;
+
+      num++;
+
+      gimp_pdb_get_strings (&strings, procedure, pdb_dump->dumping_compat);
+
+#ifdef DEBUG_OUTPUT
+      g_string_append_printf (string, "(");
+#else
+      g_string_append_printf (string, "(register-procedure ");
+#endif
+
+      if (num != 1)
+        {
+          g_string_printf (buf, "%s <%d>", proc_name, num);
+          output_string (string, buf->str);
+        }
+      else
+        {
+          output_string (string, proc_name);
+        }
+
+      type_desc = gimp_enum_get_desc (proc_class, procedure->proc_type);
+
+#ifdef DEBUG_OUTPUT
+
+      g_string_append_printf (string, " (");
+
+      for (i = 0; i < procedure->num_args; i++)
+        {
+          GParamSpec     *pspec = procedure->args[i];
+          GimpPDBArgType  arg_type;
+
+          arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
+
+          arg_value = g_enum_get_value (arg_class, arg_type);
+
+          if (i > 0)
+            g_string_append_printf (string, " ");
+
+          output_string (string, arg_value->value_name);
+        }
+
+      g_string_append_printf (string, ") (");
+
+      for (i = 0; i < procedure->num_values; i++)
+        {
+          GParamSpec     *pspec = procedure->values[i];
+          GimpPDBArgType  arg_type;
+
+          arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
+
+          arg_value = g_enum_get_value (arg_class, arg_type);
+
+          if (i > 0)
+            g_string_append_printf (string, " ");
+
+          output_string (string, arg_value->value_name);
+        }
+
+      g_string_append_printf (string, "))\n");
+
+#else /* ! DEBUG_OUTPUT */
+
+      g_string_append_printf (string, "  ");
+      output_string (string, strings.blurb);
+
+      g_string_append_printf (string, "  ");
+      output_string (string, strings.help);
+
+      g_string_append_printf (string, "  ");
+      output_string (string, strings.author);
+
+      g_string_append_printf (string, "  ");
+      output_string (string, strings.copyright);
+
+      g_string_append_printf (string, "  ");
+      output_string (string, strings.date);
+
+      g_string_append_printf (string, "  ");
+      output_string (string, type_desc->value_desc);
+
+      g_string_append_printf (string, "  (");
+
+      for (i = 0; i < procedure->num_args; i++)
+        {
+          GParamSpec     *pspec = procedure->args[i];
+          GimpPDBArgType  arg_type;
+          gchar          *desc  = gimp_param_spec_get_desc (pspec);
+
+          g_string_append_printf (string, "\n    (\n");
+
+          arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
+
+          arg_value = g_enum_get_value (arg_class, arg_type);
+
+          g_string_append_printf (string, "      ");
+          output_string (string, g_param_spec_get_name (pspec));
+
+          g_string_append_printf (string, "      ");
+          output_string (string, arg_value->value_name);
+
+          g_string_append_printf (string, "      ");
+          output_string (string, desc);
+
+          g_free (desc);
+
+          g_string_append_printf (string, "    )");
+        }
+
+      g_string_append_printf (string, "\n  )\n");
+
+      g_string_append_printf (string, "  (");
+
+      for (i = 0; i < procedure->num_values; i++)
+        {
+          GParamSpec     *pspec = procedure->values[i];
+          GimpPDBArgType  arg_type;
+          gchar          *desc  = gimp_param_spec_get_desc (pspec);
+
+          g_string_append_printf (string, "\n    (\n");
+
+          arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
+
+          arg_value = g_enum_get_value (arg_class, arg_type);
+
+          g_string_append_printf (string, "      ");
+          output_string (string, g_param_spec_get_name (pspec));
+
+          g_string_append_printf (string, "      ");
+          output_string (string, arg_value->value_name);
+
+          g_string_append_printf (string, "      ");
+          output_string (string, desc);
+
+          g_free (desc);
+
+          g_string_append_printf (string, "    )");
+        }
+
+      g_string_append_printf (string, "\n  )");
+      g_string_append_printf (string, "\n)\n");
+
+#endif /* DEBUG_OUTPUT */
+
+      gimp_pdb_free_strings (&strings);
+    }
+
+  g_output_stream_write_all (output, string->str, string->len,
+                             NULL, NULL, &pdb_dump->error);
+
+  g_string_free (string, TRUE);
+  g_string_free (buf, TRUE);
+
+  g_type_class_unref (arg_class);
+  g_type_class_unref (proc_class);
+}
+
+static void
+gimp_pdb_get_strings (PDBStrings    *strings,
+                      GimpProcedure *procedure,
+                      gboolean       compat)
+{
+  strings->compat = compat;
+
+  if (compat)
+    {
+      strings->blurb     = g_strdup_printf (COMPAT_BLURB,
+                                            gimp_object_get_name (procedure));
+      strings->help      = g_strdup (strings->blurb);
+      strings->author    = NULL;
+      strings->copyright = NULL;
+      strings->date      = NULL;
+    }
+  else
+    {
+      strings->blurb     = procedure->blurb;
+      strings->help      = procedure->help;
+      strings->author    = procedure->author;
+      strings->copyright = procedure->copyright;
+      strings->date      = procedure->date;
+    }
+}
+
+static void
+gimp_pdb_free_strings (PDBStrings *strings)
+{
+  if (strings->compat)
+    {
+      g_free (strings->blurb);
+      g_free (strings->help);
+    }
+}
diff --git a/app/pdb/gimppdb-query.h b/app/pdb/gimppdb-query.h
new file mode 100644
index 0000000..4b8c320
--- /dev/null
+++ b/app/pdb/gimppdb-query.h
@@ -0,0 +1,49 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_QUERY_H__
+#define __GIMP_PDB_QUERY_H__
+
+
+gboolean   gimp_pdb_dump      (GimpPDB          *pdb,
+                               GFile            *file,
+                               GError          **error);
+gboolean   gimp_pdb_query     (GimpPDB          *pdb,
+                               const gchar      *name,
+                               const gchar      *blurb,
+                               const gchar      *help,
+                               const gchar      *author,
+                               const gchar      *copyright,
+                               const gchar      *date,
+                               const gchar      *proc_type,
+                               gint             *num_procs,
+                               gchar          ***procs,
+                               GError          **error);
+gboolean   gimp_pdb_proc_info (GimpPDB          *pdb,
+                               const gchar      *proc_name,
+                               gchar           **blurb,
+                               gchar           **help,
+                               gchar           **author,
+                               gchar           **copyright,
+                               gchar           **date,
+                               GimpPDBProcType  *proc_type,
+                               gint             *num_args,
+                               gint             *num_values,
+                               GError          **error);
+
+
+#endif /* __GIMP_PDB_QUERY_H__ */
diff --git a/app/pdb/gimppdb-utils.c b/app/pdb/gimppdb-utils.c
new file mode 100644
index 0000000..b5d2eda
--- /dev/null
+++ b/app/pdb/gimppdb-utils.c
@@ -0,0 +1,846 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpitem.h"
+
+#include "text/gimptextlayer.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimppdb-utils.h"
+#include "gimppdberror.h"
+
+#include "gimp-intl.h"
+
+
+static GimpObject *
+gimp_pdb_get_data_factory_item (GimpDataFactory *factory,
+                                const gchar     *name)
+{
+  GimpObject *object;
+
+  object = gimp_container_get_child_by_name (gimp_data_factory_get_container (factory), name);
+
+  if (! object)
+    object = gimp_container_get_child_by_name (gimp_data_factory_get_container_obsolete (factory), name);
+
+  if (! object && ! strcmp (name, "Standard"))
+    {
+      Gimp *gimp = gimp_data_factory_get_gimp (factory);
+
+      object = (GimpObject *)
+        gimp_data_factory_data_get_standard (factory,
+                                             gimp_get_user_context (gimp));
+    }
+
+  return object;
+}
+
+
+GimpBrush *
+gimp_pdb_get_brush (Gimp               *gimp,
+                    const gchar        *name,
+                    GimpPDBDataAccess   access,
+                    GError            **error)
+{
+  GimpBrush *brush;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty brush name"));
+      return NULL;
+    }
+
+  brush = (GimpBrush *) gimp_pdb_get_data_factory_item (gimp->brush_factory, name);
+
+  if (! brush)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Brush '%s' not found"), name);
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_WRITE) &&
+           ! gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Brush '%s' is not editable"), name);
+      return NULL;
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_RENAME) &&
+           ! gimp_viewable_is_name_editable (GIMP_VIEWABLE (brush)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Brush '%s' is not renamable"), name);
+      return NULL;
+    }
+
+  return brush;
+}
+
+GimpBrush *
+gimp_pdb_get_generated_brush (Gimp               *gimp,
+                              const gchar        *name,
+                              GimpPDBDataAccess   access,
+                              GError            **error)
+{
+  GimpBrush *brush;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  brush = gimp_pdb_get_brush (gimp, name, access, error);
+
+  if (! brush)
+    return NULL;
+
+  if (! GIMP_IS_BRUSH_GENERATED (brush))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Brush '%s' is not a generated brush"), name);
+      return NULL;
+    }
+
+  return brush;
+}
+
+GimpDynamics *
+gimp_pdb_get_dynamics (Gimp               *gimp,
+                       const gchar        *name,
+                       GimpPDBDataAccess   access,
+                       GError            **error)
+{
+  GimpDynamics *dynamics;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty paint dynamics name"));
+      return NULL;
+    }
+
+  dynamics = (GimpDynamics *) gimp_pdb_get_data_factory_item (gimp->dynamics_factory, name);
+
+  if (! dynamics)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Paint dynamics '%s' not found"), name);
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_WRITE) &&
+           ! gimp_data_is_writable (GIMP_DATA (dynamics)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Paint dynamics '%s' is not editable"), name);
+      return NULL;
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_RENAME) &&
+           ! gimp_viewable_is_name_editable (GIMP_VIEWABLE (dynamics)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Paint dynamics '%s' is not renamable"), name);
+      return NULL;
+    }
+
+  return dynamics;
+}
+
+GimpMybrush *
+gimp_pdb_get_mybrush (Gimp               *gimp,
+                      const gchar        *name,
+                      GimpPDBDataAccess   access,
+                      GError            **error)
+{
+  GimpMybrush *brush;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty MyPaint brush name"));
+      return NULL;
+    }
+
+  brush = (GimpMybrush *) gimp_pdb_get_data_factory_item (gimp->mybrush_factory, name);
+
+  if (! brush)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("MyPaint brush '%s' not found"), name);
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_WRITE) &&
+           ! gimp_data_is_writable (GIMP_DATA (brush)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("MyPaint brush '%s' is not editable"), name);
+      return NULL;
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_RENAME) &&
+           ! gimp_viewable_is_name_editable (GIMP_VIEWABLE (brush)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("MyPaint brush '%s' is not renamable"), name);
+      return NULL;
+    }
+
+  return brush;
+}
+
+GimpPattern *
+gimp_pdb_get_pattern (Gimp         *gimp,
+                      const gchar  *name,
+                      GError      **error)
+{
+  GimpPattern *pattern;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty pattern name"));
+      return NULL;
+    }
+
+  pattern = (GimpPattern *) gimp_pdb_get_data_factory_item (gimp->pattern_factory, name);
+
+  if (! pattern)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Pattern '%s' not found"), name);
+    }
+
+  return pattern;
+}
+
+GimpGradient *
+gimp_pdb_get_gradient (Gimp               *gimp,
+                       const gchar        *name,
+                       GimpPDBDataAccess   access,
+                       GError            **error)
+{
+  GimpGradient *gradient;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty gradient name"));
+      return NULL;
+    }
+
+  gradient = (GimpGradient *) gimp_pdb_get_data_factory_item (gimp->gradient_factory, name);
+
+  if (! gradient)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Gradient '%s' not found"), name);
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_WRITE) &&
+           ! gimp_data_is_writable (GIMP_DATA (gradient)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Gradient '%s' is not editable"), name);
+      return NULL;
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_RENAME) &&
+           ! gimp_viewable_is_name_editable (GIMP_VIEWABLE (gradient)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Gradient '%s' is not renamable"), name);
+      return NULL;
+    }
+
+  return gradient;
+}
+
+GimpPalette *
+gimp_pdb_get_palette (Gimp               *gimp,
+                      const gchar        *name,
+                      GimpPDBDataAccess   access,
+                      GError            **error)
+{
+  GimpPalette *palette;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty palette name"));
+      return NULL;
+    }
+
+  palette = (GimpPalette *) gimp_pdb_get_data_factory_item (gimp->palette_factory, name);
+
+  if (! palette)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Palette '%s' not found"), name);
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_WRITE) &&
+           ! gimp_data_is_writable (GIMP_DATA (palette)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Palette '%s' is not editable"), name);
+      return NULL;
+    }
+  else if ((access & GIMP_PDB_DATA_ACCESS_RENAME) &&
+           ! gimp_viewable_is_name_editable (GIMP_VIEWABLE (palette)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Palette '%s' is not renamable"), name);
+      return NULL;
+    }
+
+  return palette;
+}
+
+GimpFont *
+gimp_pdb_get_font (Gimp         *gimp,
+                   const gchar  *name,
+                   GError      **error)
+{
+  GimpFont *font;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty font name"));
+      return NULL;
+    }
+
+  font = (GimpFont *) gimp_pdb_get_data_factory_item (gimp->font_factory, name);
+
+  if (! font)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Font '%s' not found"), name);
+    }
+
+  return font;
+}
+
+GimpBuffer *
+gimp_pdb_get_buffer (Gimp         *gimp,
+                     const gchar  *name,
+                     GError      **error)
+{
+  GimpBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty buffer name"));
+      return NULL;
+    }
+
+  buffer = (GimpBuffer *)
+    gimp_container_get_child_by_name (gimp->named_buffers, name);
+
+  if (! buffer)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Named buffer '%s' not found"), name);
+    }
+
+  return buffer;
+}
+
+GimpPaintInfo *
+gimp_pdb_get_paint_info (Gimp         *gimp,
+                         const gchar  *name,
+                         GError      **error)
+{
+  GimpPaintInfo *paint_info;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! name || ! strlen (name))
+    {
+      g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Invalid empty paint method name"));
+      return NULL;
+    }
+
+  paint_info = (GimpPaintInfo *)
+    gimp_container_get_child_by_name (gimp->paint_info_list, name);
+
+  if (! paint_info)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Paint method '%s' does not exist"), name);
+    }
+
+  return paint_info;
+}
+
+gboolean
+gimp_pdb_item_is_attached (GimpItem           *item,
+                           GimpImage          *image,
+                           GimpPDBItemModify   modify,
+                           GError            **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_item_is_attached (item))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be used because it has not "
+                     "been added to an image"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  if (image && image != gimp_item_get_image (item))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be used because it is "
+                     "attached to another image"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  return gimp_pdb_item_is_modifiable (item, modify, error);
+}
+
+gboolean
+gimp_pdb_item_is_in_tree (GimpItem           *item,
+                          GimpImage          *image,
+                          GimpPDBItemModify   modify,
+                          GError            **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_pdb_item_is_attached (item, image, modify, error))
+    return FALSE;
+
+  if (! gimp_item_get_tree (item))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be used because it is not "
+                     "a direct child of an item tree"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_item_is_in_same_tree (GimpItem   *item,
+                               GimpItem   *item2,
+                               GimpImage  *image,
+                               GError    **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (item2), FALSE);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_pdb_item_is_in_tree (item, image, FALSE, error) ||
+      ! gimp_pdb_item_is_in_tree (item2, image, FALSE, error))
+    return FALSE;
+
+  if (gimp_item_get_tree (item) != gimp_item_get_tree (item2))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Items '%s' (%d) and '%s' (%d) cannot be used "
+                     "because they are not part of the same item tree"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item),
+                   gimp_object_get_name (item2),
+                   gimp_item_get_ID (item2));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_item_is_not_ancestor (GimpItem  *item,
+                               GimpItem  *not_descendant,
+                               GError   **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_ITEM (not_descendant), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_viewable_is_ancestor (GIMP_VIEWABLE (item),
+                                 GIMP_VIEWABLE (not_descendant)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) must not be an ancestor of "
+                     "'%s' (%d)"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item),
+                   gimp_object_get_name (not_descendant),
+                   gimp_item_get_ID (not_descendant));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_item_is_floating (GimpItem  *item,
+                           GimpImage *dest_image,
+                           GError   **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! g_object_is_floating (item))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) has already been added to an image"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+  else if (gimp_item_get_image (item) != dest_image)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Trying to add item '%s' (%d) to wrong image"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_item_is_modifiable (GimpItem           *item,
+                             GimpPDBItemModify   modify,
+                             GError            **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /*  When a channel is position-locked, it is also implicitly
+   *  content-locked because we translate channels by modifying their
+   *  pixels.
+   */
+  if ((modify & GIMP_PDB_ITEM_POSITION) && GIMP_IS_CHANNEL (item))
+    modify |= GIMP_PDB_ITEM_CONTENT;
+
+  if ((modify & GIMP_PDB_ITEM_CONTENT) && gimp_item_is_content_locked (item))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be modified because its "
+                     "contents are locked"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  if ((modify & GIMP_PDB_ITEM_POSITION) && gimp_item_is_position_locked (item))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be modified because its "
+                     "position and size are locked"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_item_is_group (GimpItem  *item,
+                        GError   **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_viewable_get_children (GIMP_VIEWABLE (item)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be used because it is "
+                     "not a group item"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_item_is_not_group (GimpItem  *item,
+                            GError   **error)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM (item), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (item)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Item '%s' (%d) cannot be modified because it "
+                     "is a group item"),
+                   gimp_object_get_name (item),
+                   gimp_item_get_ID (item));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_pdb_layer_is_text_layer (GimpLayer          *layer,
+                              GimpPDBItemModify   modify,
+                              GError            **error)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (! gimp_item_is_text_layer (GIMP_ITEM (layer)))
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                   _("Layer '%s' (%d) cannot be used because it is not "
+                     "a text layer"),
+                   gimp_object_get_name (layer),
+                   gimp_item_get_ID (GIMP_ITEM (layer)));
+
+      return FALSE;
+    }
+
+  return gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, modify, error);
+}
+
+static const gchar *
+gimp_pdb_enum_value_get_nick (GType enum_type,
+                              gint  value)
+{
+  GEnumClass  *enum_class;
+  GEnumValue  *enum_value;
+  const gchar *nick;
+
+  enum_class = g_type_class_ref (enum_type);
+  enum_value = g_enum_get_value (enum_class, value);
+
+  nick = enum_value->value_nick;
+
+  g_type_class_unref (enum_class);
+
+  return nick;
+}
+
+gboolean
+gimp_pdb_image_is_base_type (GimpImage          *image,
+                             GimpImageBaseType   type,
+                             GError            **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_image_get_base_type (image) == type)
+    return TRUE;
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+               _("Image '%s' (%d) is of type '%s', "
+                 "but an image of type '%s' is expected"),
+               gimp_image_get_display_name (image),
+               gimp_image_get_ID (image),
+               gimp_pdb_enum_value_get_nick (GIMP_TYPE_IMAGE_BASE_TYPE,
+                                             gimp_image_get_base_type (image)),
+               gimp_pdb_enum_value_get_nick (GIMP_TYPE_IMAGE_BASE_TYPE, type));
+
+  return FALSE;
+}
+
+gboolean
+gimp_pdb_image_is_not_base_type (GimpImage          *image,
+                                 GimpImageBaseType   type,
+                                 GError            **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_image_get_base_type (image) != type)
+    return TRUE;
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+               _("Image '%s' (%d) must not be of type '%s'"),
+               gimp_image_get_display_name (image),
+               gimp_image_get_ID (image),
+               gimp_pdb_enum_value_get_nick (GIMP_TYPE_IMAGE_BASE_TYPE, type));
+
+  return FALSE;
+}
+
+gboolean
+gimp_pdb_image_is_precision (GimpImage      *image,
+                             GimpPrecision   precision,
+                             GError        **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_image_get_precision (image) == precision)
+    return TRUE;
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+               _("Image '%s' (%d) has precision '%s', "
+                 "but an image of precision '%s' is expected"),
+               gimp_image_get_display_name (image),
+               gimp_image_get_ID (image),
+               gimp_pdb_enum_value_get_nick (GIMP_TYPE_PRECISION,
+                                             gimp_image_get_precision (image)),
+               gimp_pdb_enum_value_get_nick (GIMP_TYPE_PRECISION, precision));
+
+  return FALSE;
+}
+
+gboolean
+gimp_pdb_image_is_not_precision (GimpImage      *image,
+                                 GimpPrecision   precision,
+                                 GError        **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (gimp_image_get_precision (image) != precision)
+    return TRUE;
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+               _("Image '%s' (%d) must not be of precision '%s'"),
+               gimp_image_get_display_name (image),
+               gimp_image_get_ID (image),
+               gimp_pdb_enum_value_get_nick (GIMP_TYPE_PRECISION, precision));
+
+  return FALSE;
+}
+
+GimpGuide *
+gimp_pdb_image_get_guide (GimpImage  *image,
+                          gint        guide_ID,
+                          GError    **error)
+{
+  GimpGuide *guide;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  guide = gimp_image_get_guide (image, guide_ID);
+
+  if (guide)
+    return guide;
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+               _("Image '%s' (%d) does not contain guide with ID %d"),
+               gimp_image_get_display_name (image),
+               gimp_image_get_ID (image),
+               guide_ID);
+  return NULL;
+}
+
+GimpSamplePoint *
+gimp_pdb_image_get_sample_point (GimpImage  *image,
+                                 gint        sample_point_ID,
+                                 GError    **error)
+{
+  GimpSamplePoint *sample_point;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  sample_point = gimp_image_get_sample_point (image, sample_point_ID);
+
+  if (sample_point)
+    return sample_point;
+
+  g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+               _("Image '%s' (%d) does not contain sample point with ID %d"),
+               gimp_image_get_display_name (image),
+               gimp_image_get_ID (image),
+               sample_point_ID);
+  return NULL;
+}
+
+GimpStroke *
+gimp_pdb_get_vectors_stroke (GimpVectors        *vectors,
+                             gint                stroke_ID,
+                             GimpPDBItemModify   modify,
+                             GError            **error)
+{
+  GimpStroke *stroke = NULL;
+
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! gimp_pdb_item_is_not_group (GIMP_ITEM (vectors), error))
+    return NULL;
+
+  if (! modify || gimp_pdb_item_is_modifiable (GIMP_ITEM (vectors),
+                                               modify, error))
+    {
+      stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_ID);
+
+      if (! stroke)
+        g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                     _("Vectors object %d does not contain stroke with ID %d"),
+                     gimp_item_get_ID (GIMP_ITEM (vectors)), stroke_ID);
+    }
+
+  return stroke;
+}
diff --git a/app/pdb/gimppdb-utils.h b/app/pdb/gimppdb-utils.h
new file mode 100644
index 0000000..83b51c0
--- /dev/null
+++ b/app/pdb/gimppdb-utils.h
@@ -0,0 +1,117 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_UTILS_H__
+#define __GIMP_PDB_UTILS_H__
+
+
+GimpBrush     * gimp_pdb_get_brush              (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+GimpBrush     * gimp_pdb_get_generated_brush    (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+GimpDynamics  * gimp_pdb_get_dynamics           (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+GimpMybrush   * gimp_pdb_get_mybrush            (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+GimpPattern   * gimp_pdb_get_pattern            (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GError            **error);
+GimpGradient  * gimp_pdb_get_gradient           (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+GimpPalette   * gimp_pdb_get_palette            (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+GimpFont      * gimp_pdb_get_font               (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GError            **error);
+GimpBuffer    * gimp_pdb_get_buffer             (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GError            **error);
+GimpPaintInfo * gimp_pdb_get_paint_info         (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GError            **error);
+
+gboolean        gimp_pdb_item_is_attached       (GimpItem           *item,
+                                                 GimpImage          *image,
+                                                 GimpPDBItemModify   modify,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_in_tree        (GimpItem           *item,
+                                                 GimpImage          *image,
+                                                 GimpPDBItemModify   modify,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_in_same_tree   (GimpItem           *item,
+                                                 GimpItem           *item2,
+                                                 GimpImage          *image,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_not_ancestor   (GimpItem           *item,
+                                                 GimpItem           *not_descendant,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_floating       (GimpItem           *item,
+                                                 GimpImage          *dest_image,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_modifiable     (GimpItem           *item,
+                                                 GimpPDBItemModify   modify,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_group          (GimpItem           *item,
+                                                 GError            **error);
+gboolean        gimp_pdb_item_is_not_group      (GimpItem           *item,
+                                                 GError            **error);
+
+gboolean        gimp_pdb_layer_is_text_layer    (GimpLayer          *layer,
+                                                 GimpPDBItemModify   modify,
+                                                 GError            **error);
+
+gboolean        gimp_pdb_image_is_base_type     (GimpImage          *image,
+                                                 GimpImageBaseType   type,
+                                                 GError            **error);
+gboolean        gimp_pdb_image_is_not_base_type (GimpImage          *image,
+                                                 GimpImageBaseType   type,
+                                                 GError            **error);
+
+gboolean        gimp_pdb_image_is_precision     (GimpImage          *image,
+                                                 GimpPrecision       precision,
+                                                 GError            **error);
+gboolean        gimp_pdb_image_is_not_precision (GimpImage          *image,
+                                                 GimpPrecision       precision,
+                                                 GError            **error);
+
+GimpGuide     * gimp_pdb_image_get_guide        (GimpImage          *image,
+                                                 gint                guide_ID,
+                                                 GError            **error);
+GimpSamplePoint *
+                gimp_pdb_image_get_sample_point (GimpImage          *image,
+                                                 gint                sample_point_ID,
+                                                 GError            **error);
+
+GimpStroke    * gimp_pdb_get_vectors_stroke     (GimpVectors        *vectors,
+                                                 gint                stroke_ID,
+                                                 GimpPDBItemModify   modify,
+                                                 GError            **error);
+
+
+#endif /* __GIMP_PDB_UTILS_H__ */
diff --git a/app/pdb/gimppdb.c b/app/pdb/gimppdb.c
new file mode 100644
index 0000000..cff9051
--- /dev/null
+++ b/app/pdb/gimppdb.c
@@ -0,0 +1,518 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <gobject/gvaluecollector.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-memsize.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpprogress.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimpprocedure.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  REGISTER_PROCEDURE,
+  UNREGISTER_PROCEDURE,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_pdb_finalize                  (GObject       *object);
+static gint64   gimp_pdb_get_memsize               (GimpObject    *object,
+                                                    gint64        *gui_size);
+static void     gimp_pdb_real_register_procedure   (GimpPDB       *pdb,
+                                                    GimpProcedure *procedure);
+static void     gimp_pdb_real_unregister_procedure (GimpPDB       *pdb,
+                                                    GimpProcedure *procedure);
+static void     gimp_pdb_entry_free                (gpointer       key,
+                                                    gpointer       value,
+                                                    gpointer       user_data);
+static gint64   gimp_pdb_entry_get_memsize         (GList         *procedures,
+                                                    gint64        *gui_size);
+
+
+G_DEFINE_TYPE (GimpPDB, gimp_pdb, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_pdb_parent_class
+
+static guint gimp_pdb_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_pdb_class_init (GimpPDBClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  gimp_pdb_signals[REGISTER_PROCEDURE] =
+    g_signal_new ("register-procedure",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPDBClass, register_procedure),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PROCEDURE);
+
+  gimp_pdb_signals[UNREGISTER_PROCEDURE] =
+    g_signal_new ("unregister-procedure",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPDBClass, unregister_procedure),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PROCEDURE);
+
+  object_class->finalize         = gimp_pdb_finalize;
+
+  gimp_object_class->get_memsize = gimp_pdb_get_memsize;
+
+  klass->register_procedure      = gimp_pdb_real_register_procedure;
+  klass->unregister_procedure    = gimp_pdb_real_unregister_procedure;
+}
+
+static void
+gimp_pdb_init (GimpPDB *pdb)
+{
+  pdb->procedures        = g_hash_table_new (g_str_hash, g_str_equal);
+  pdb->compat_proc_names = g_hash_table_new (g_str_hash, g_str_equal);
+}
+
+static void
+gimp_pdb_finalize (GObject *object)
+{
+  GimpPDB *pdb = GIMP_PDB (object);
+
+  if (pdb->procedures)
+    {
+      g_hash_table_foreach (pdb->procedures, gimp_pdb_entry_free, NULL);
+      g_hash_table_destroy (pdb->procedures);
+      pdb->procedures = NULL;
+    }
+
+  if (pdb->compat_proc_names)
+    {
+      g_hash_table_destroy (pdb->compat_proc_names);
+      pdb->compat_proc_names = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_pdb_get_memsize (GimpObject *object,
+                      gint64     *gui_size)
+{
+  GimpPDB *pdb     = GIMP_PDB (object);
+  gint64   memsize = 0;
+
+  memsize += gimp_g_hash_table_get_memsize_foreach (pdb->procedures,
+                                                    (GimpMemsizeFunc)
+                                                    gimp_pdb_entry_get_memsize,
+                                                    gui_size);
+  memsize += gimp_g_hash_table_get_memsize (pdb->compat_proc_names, 0);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_pdb_real_register_procedure (GimpPDB       *pdb,
+                                  GimpProcedure *procedure)
+{
+  const gchar *name;
+  GList       *list;
+
+  name = gimp_object_get_name (procedure);
+
+  list = g_hash_table_lookup (pdb->procedures, name);
+
+  g_hash_table_replace (pdb->procedures, (gpointer) name,
+                        g_list_prepend (list, g_object_ref (procedure)));
+}
+
+static void
+gimp_pdb_real_unregister_procedure (GimpPDB       *pdb,
+                                    GimpProcedure *procedure)
+{
+  const gchar *name;
+  GList       *list;
+
+  name = gimp_object_get_name (procedure);
+
+  list = g_hash_table_lookup (pdb->procedures, name);
+
+  if (list)
+    {
+      list = g_list_remove (list, procedure);
+
+      if (list)
+        {
+          name = gimp_object_get_name (list->data);
+          g_hash_table_replace (pdb->procedures, (gpointer) name, list);
+        }
+      else
+        {
+          g_hash_table_remove (pdb->procedures, name);
+        }
+
+      g_object_unref (procedure);
+    }
+}
+
+
+/*  public functions  */
+
+GimpPDB *
+gimp_pdb_new (Gimp *gimp)
+{
+  GimpPDB *pdb;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  pdb = g_object_new (GIMP_TYPE_PDB,
+                      "name", "pdb",
+                      NULL);
+
+  pdb->gimp = gimp;
+
+  return pdb;
+}
+
+void
+gimp_pdb_register_procedure (GimpPDB       *pdb,
+                             GimpProcedure *procedure)
+{
+  g_return_if_fail (GIMP_IS_PDB (pdb));
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  if (! procedure->deprecated ||
+      pdb->gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF)
+    {
+      g_signal_emit (pdb, gimp_pdb_signals[REGISTER_PROCEDURE], 0,
+                     procedure);
+    }
+}
+
+void
+gimp_pdb_unregister_procedure (GimpPDB       *pdb,
+                               GimpProcedure *procedure)
+{
+  g_return_if_fail (GIMP_IS_PDB (pdb));
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  g_signal_emit (pdb, gimp_pdb_signals[UNREGISTER_PROCEDURE], 0,
+                 procedure);
+}
+
+GimpProcedure *
+gimp_pdb_lookup_procedure (GimpPDB     *pdb,
+                           const gchar *name)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  list = g_hash_table_lookup (pdb->procedures, name);
+
+  if (list)
+    return list->data;
+
+  return NULL;
+}
+
+void
+gimp_pdb_register_compat_proc_name (GimpPDB     *pdb,
+                                    const gchar *old_name,
+                                    const gchar *new_name)
+{
+  g_return_if_fail (GIMP_IS_PDB (pdb));
+  g_return_if_fail (old_name != NULL);
+  g_return_if_fail (new_name != NULL);
+
+  g_hash_table_insert (pdb->compat_proc_names,
+                       (gpointer) old_name,
+                       (gpointer) new_name);
+}
+
+const gchar *
+gimp_pdb_lookup_compat_proc_name (GimpPDB     *pdb,
+                                  const gchar *old_name)
+{
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
+  g_return_val_if_fail (old_name != NULL, NULL);
+
+  return g_hash_table_lookup (pdb->compat_proc_names, old_name);
+}
+
+GimpValueArray *
+gimp_pdb_execute_procedure_by_name_args (GimpPDB         *pdb,
+                                         GimpContext     *context,
+                                         GimpProgress    *progress,
+                                         GError         **error,
+                                         const gchar     *name,
+                                         GimpValueArray  *args)
+{
+  GimpValueArray *return_vals = NULL;
+  GList          *list;
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  list = g_hash_table_lookup (pdb->procedures, name);
+
+  if (list == NULL)
+    {
+      GError *pdb_error = g_error_new (GIMP_PDB_ERROR,
+                                       GIMP_PDB_ERROR_PROCEDURE_NOT_FOUND,
+                                       _("Procedure '%s' not found"), name);
+
+      return_vals = gimp_procedure_get_return_values (NULL, FALSE, pdb_error);
+      g_propagate_error (error, pdb_error);
+
+      return return_vals;
+    }
+
+  g_return_val_if_fail (args != NULL, NULL);
+
+  for (; list; list = g_list_next (list))
+    {
+      GimpProcedure *procedure = list->data;
+
+      g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+      return_vals = gimp_procedure_execute (procedure,
+                                            pdb->gimp, context, progress,
+                                            args, error);
+
+      if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) ==
+          GIMP_PDB_PASS_THROUGH)
+        {
+          /*  If the return value is GIMP_PDB_PASS_THROUGH and there is
+           *  a next procedure in the list, destroy the return values
+           *  and run the next procedure.
+           */
+          if (g_list_next (list))
+            {
+              gimp_value_array_unref (return_vals);
+              g_clear_error (error);
+            }
+        }
+      else
+        {
+          /*  No GIMP_PDB_PASS_THROUGH, break out of the list of
+           *  procedures and return the current return values.
+           */
+          break;
+        }
+    }
+
+  return return_vals;
+}
+
+GimpValueArray *
+gimp_pdb_execute_procedure_by_name (GimpPDB       *pdb,
+                                    GimpContext   *context,
+                                    GimpProgress  *progress,
+                                    GError       **error,
+                                    const gchar   *name,
+                                    ...)
+{
+  GimpProcedure  *procedure;
+  GimpValueArray *args;
+  GimpValueArray *return_vals;
+  va_list         va_args;
+  gint            i;
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  procedure = gimp_pdb_lookup_procedure (pdb, name);
+
+  if (! procedure)
+    {
+      GError *pdb_error = g_error_new (GIMP_PDB_ERROR,
+                                       GIMP_PDB_ERROR_PROCEDURE_NOT_FOUND,
+                                       _("Procedure '%s' not found"), name);
+
+      return_vals = gimp_procedure_get_return_values (NULL, FALSE, pdb_error);
+      g_propagate_error (error, pdb_error);
+
+      return return_vals;
+    }
+
+  args = gimp_procedure_get_arguments (procedure);
+
+  va_start (va_args, name);
+
+  for (i = 0; i < procedure->num_args; i++)
+    {
+      GValue *value;
+      GType   arg_type;
+      gchar  *error_msg = NULL;
+
+      arg_type = va_arg (va_args, GType);
+
+      if (arg_type == G_TYPE_NONE)
+        break;
+
+      value = gimp_value_array_index (args, i);
+
+      if (arg_type != G_VALUE_TYPE (value))
+        {
+          GError      *pdb_error;
+          const gchar *expected = g_type_name (G_VALUE_TYPE (value));
+          const gchar *got      = g_type_name (arg_type);
+
+          gimp_value_array_unref (args);
+
+          pdb_error = g_error_new (GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                                   _("Procedure '%s' has been called with a "
+                                     "wrong type for argument #%d. "
+                                     "Expected %s, got %s."),
+                                   gimp_object_get_name (procedure),
+                                   i + 1, expected, got);
+
+          return_vals = gimp_procedure_get_return_values (procedure,
+                                                          FALSE, pdb_error);
+          g_propagate_error (error, pdb_error);
+
+          va_end (va_args);
+
+          return return_vals;
+        }
+
+      G_VALUE_COLLECT (value, va_args, G_VALUE_NOCOPY_CONTENTS, &error_msg);
+
+      if (error_msg)
+        {
+          GError *pdb_error = g_error_new_literal (GIMP_PDB_ERROR,
+                                                   GIMP_PDB_ERROR_INTERNAL_ERROR,
+                                                   error_msg);
+          g_warning ("%s: %s", G_STRFUNC, error_msg);
+          g_free (error_msg);
+
+          gimp_value_array_unref (args);
+
+          return_vals = gimp_procedure_get_return_values (procedure,
+                                                          FALSE, pdb_error);
+          g_propagate_error (error, pdb_error);
+
+          va_end (va_args);
+
+          return return_vals;
+        }
+    }
+
+  va_end (va_args);
+
+  return_vals = gimp_pdb_execute_procedure_by_name_args (pdb, context,
+                                                         progress, error,
+                                                         name, args);
+
+  gimp_value_array_unref (args);
+
+  return return_vals;
+}
+
+/**
+ * gimp_pdb_get_deprecated_procedures:
+ * @pdb:
+ *
+ * Returns: A new #GList with the deprecated procedures. Free with
+ *          g_list_free().
+ **/
+GList *
+gimp_pdb_get_deprecated_procedures (GimpPDB *pdb)
+{
+  GList *result = NULL;
+  GList *procs;
+  GList *iter;
+
+  g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
+
+  procs = g_hash_table_get_values (pdb->procedures);
+
+  for (iter = procs;
+       iter;
+       iter = g_list_next (iter))
+    {
+      GList *proc_list = iter->data;
+
+      /* Only care about the first procedure in the list */
+      GimpProcedure *procedure = GIMP_PROCEDURE (proc_list->data);
+
+      if (procedure->deprecated)
+        result = g_list_prepend (result, procedure);
+    }
+
+  result = g_list_sort (result, (GCompareFunc) gimp_procedure_name_compare);
+
+  g_list_free (procs);
+
+  return result;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_pdb_entry_free (gpointer key,
+                     gpointer value,
+                     gpointer user_data)
+{
+  if (value)
+    g_list_free_full (value, (GDestroyNotify) g_object_unref);
+}
+
+static gint64
+gimp_pdb_entry_get_memsize (GList  *procedures,
+                            gint64 *gui_size)
+{
+  return gimp_g_list_get_memsize_foreach (procedures,
+                                          (GimpMemsizeFunc)
+                                          gimp_object_get_memsize,
+                                          gui_size);
+}
diff --git a/app/pdb/gimppdb.h b/app/pdb/gimppdb.h
new file mode 100644
index 0000000..26fc416
--- /dev/null
+++ b/app/pdb/gimppdb.h
@@ -0,0 +1,90 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_H__
+#define __GIMP_PDB_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_PDB            (gimp_pdb_get_type ())
+#define GIMP_PDB(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PDB, GimpPDB))
+#define GIMP_PDB_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PDB, GimpPDBClass))
+#define GIMP_IS_PDB(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PDB))
+#define GIMP_IS_PDB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PDB))
+#define GIMP_PDB_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PDB, GimpPDBClass))
+
+
+typedef struct _GimpPDBClass GimpPDBClass;
+
+struct _GimpPDB
+{
+  GimpObject  parent_instance;
+
+  Gimp       *gimp;
+
+  GHashTable *procedures;
+  GHashTable *compat_proc_names;
+};
+
+struct _GimpPDBClass
+{
+  GimpObjectClass parent_class;
+
+  void (* register_procedure)   (GimpPDB       *pdb,
+                                 GimpProcedure *procedure);
+  void (* unregister_procedure) (GimpPDB       *pdb,
+                                 GimpProcedure *procedure);
+};
+
+
+GType            gimp_pdb_get_type                       (void) G_GNUC_CONST;
+
+GimpPDB        * gimp_pdb_new                            (Gimp           *gimp);
+
+void             gimp_pdb_register_procedure             (GimpPDB        *pdb,
+                                                          GimpProcedure  *procedure);
+void             gimp_pdb_unregister_procedure           (GimpPDB        *pdb,
+                                                          GimpProcedure  *procedure);
+
+GimpProcedure  * gimp_pdb_lookup_procedure               (GimpPDB        *pdb,
+                                                          const gchar    *name);
+
+void             gimp_pdb_register_compat_proc_name      (GimpPDB        *pdb,
+                                                          const gchar    *old_name,
+                                                          const gchar    *new_name);
+const gchar    * gimp_pdb_lookup_compat_proc_name        (GimpPDB        *pdb,
+                                                          const gchar    *old_name);
+
+GimpValueArray * gimp_pdb_execute_procedure_by_name_args (GimpPDB        *pdb,
+                                                          GimpContext    *context,
+                                                          GimpProgress   *progress,
+                                                          GError        **error,
+                                                          const gchar    *name,
+                                                          GimpValueArray *args);
+GimpValueArray * gimp_pdb_execute_procedure_by_name      (GimpPDB        *pdb,
+                                                          GimpContext    *context,
+                                                          GimpProgress   *progress,
+                                                          GError        **error,
+                                                          const gchar    *name,
+                                                          ...);
+
+GList          * gimp_pdb_get_deprecated_procedures      (GimpPDB        *pdb);
+
+
+#endif  /*  __GIMP_PDB_H__  */
diff --git a/app/pdb/gimppdbcontext.c b/app/pdb/gimppdbcontext.c
new file mode 100644
index 0000000..ca49599
--- /dev/null
+++ b/app/pdb/gimppdbcontext.c
@@ -0,0 +1,554 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimppdbcontext.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "pdb-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimplist.h"
+#include "core/gimppaintinfo.h"
+#include "core/gimpstrokeoptions.h"
+
+#include "paint/gimpbrushcore.h"
+#include "paint/gimppaintoptions.h"
+
+#include "gimppdbcontext.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ANTIALIAS,
+  PROP_FEATHER,
+  PROP_FEATHER_RADIUS_X,
+  PROP_FEATHER_RADIUS_Y,
+  PROP_SAMPLE_MERGED,
+  PROP_SAMPLE_CRITERION,
+  PROP_SAMPLE_THRESHOLD,
+  PROP_SAMPLE_TRANSPARENT,
+  PROP_DIAGONAL_NEIGHBORS,
+  PROP_INTERPOLATION,
+  PROP_TRANSFORM_DIRECTION,
+  PROP_TRANSFORM_RESIZE,
+  PROP_DISTANCE_METRIC
+};
+
+
+static void   gimp_pdb_context_iface_init   (GimpConfigInterface *iface);
+
+static void   gimp_pdb_context_constructed  (GObject      *object);
+static void   gimp_pdb_context_finalize     (GObject      *object);
+static void   gimp_pdb_context_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void   gimp_pdb_context_get_property (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+static void   gimp_pdb_context_reset        (GimpConfig   *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpPDBContext, gimp_pdb_context, GIMP_TYPE_CONTEXT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_pdb_context_iface_init))
+
+#define parent_class gimp_pdb_context_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_pdb_context_class_init (GimpPDBContextClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_pdb_context_constructed;
+  object_class->finalize     = gimp_pdb_context_finalize;
+  object_class->set_property = gimp_pdb_context_set_property;
+  object_class->get_property = gimp_pdb_context_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            _("Smooth edges"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FEATHER,
+                            "feather",
+                            _("Feather"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS_X,
+                           "feather-radius-x",
+                           _("Feather radius X"),
+                           NULL,
+                           0.0, 1000.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS_Y,
+                           "feather-radius-y",
+                           _("Feather radius Y"),
+                           NULL,
+                           0.0, 1000.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_SAMPLE_CRITERION,
+                         "sample-criterion",
+                         _("Sample criterion"),
+                         NULL,
+                         GIMP_TYPE_SELECT_CRITERION,
+                         GIMP_SELECT_CRITERION_COMPOSITE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SAMPLE_THRESHOLD,
+                           "sample-threshold",
+                           _("Sample threshold"),
+                           NULL,
+                           0.0, 1.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_TRANSPARENT,
+                            "sample-transparent",
+                            _("Sample transparent"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DIAGONAL_NEIGHBORS,
+                            "diagonal-neighbors",
+                            _("Diagonal neighbors"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_INTERPOLATION,
+                         "interpolation",
+                         _("Interpolation"),
+                         NULL,
+                         GIMP_TYPE_INTERPOLATION_TYPE,
+                         GIMP_INTERPOLATION_CUBIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TRANSFORM_DIRECTION,
+                         "transform-direction",
+                         _("Transform direction"),
+                         NULL,
+                         GIMP_TYPE_TRANSFORM_DIRECTION,
+                         GIMP_TRANSFORM_FORWARD,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TRANSFORM_RESIZE,
+                         "transform-resize",
+                         _("Transform resize"),
+                         NULL,
+                         GIMP_TYPE_TRANSFORM_RESIZE,
+                         GIMP_TRANSFORM_RESIZE_ADJUST,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  /* Legacy blend used "manhattan" metric to compute distance.
+   * API needs to stay compatible, hence the default value for this
+   * property.
+   * Nevertheless Euclidean distance since to render better; for GIMP 3
+   * API, we might therefore want to change the defaults to
+   * GEGL_DISTANCE_METRIC_EUCLIDEAN. FIXME.
+   */
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DISTANCE_METRIC,
+                         "distance-metric",
+                         _("Distance metric"),
+                         NULL,
+                         GEGL_TYPE_DISTANCE_METRIC,
+                         GEGL_DISTANCE_METRIC_MANHATTAN,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+}
+
+static void
+gimp_pdb_context_iface_init (GimpConfigInterface *iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_config_iface)
+    parent_config_iface = g_type_default_interface_peek (GIMP_TYPE_CONFIG);
+
+  iface->reset = gimp_pdb_context_reset;
+}
+
+static void
+gimp_pdb_context_init (GimpPDBContext *context)
+{
+  context->paint_options_list = gimp_list_new (GIMP_TYPE_PAINT_OPTIONS,
+                                               FALSE);
+}
+
+static void
+gimp_pdb_context_constructed (GObject *object)
+{
+  GimpPDBContext        *context = GIMP_PDB_CONTEXT (object);
+  GimpInterpolationType  interpolation;
+  gint                   threshold;
+  GParamSpec            *pspec;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  context->stroke_options = gimp_stroke_options_new (GIMP_CONTEXT (context)->gimp,
+                                                     GIMP_CONTEXT (context),
+                                                     TRUE);
+
+  /* keep the stroke options in sync with the context */
+  gimp_context_define_properties (GIMP_CONTEXT (context->stroke_options),
+                                  GIMP_CONTEXT_PROP_MASK_ALL, FALSE);
+  gimp_context_set_parent (GIMP_CONTEXT (context->stroke_options),
+                           GIMP_CONTEXT (context));
+
+  /* preserve the traditional PDB default */
+  g_object_set (context->stroke_options,
+                "method", GIMP_STROKE_PAINT_METHOD,
+                NULL);
+
+  g_object_bind_property (G_OBJECT (context),                 "antialias",
+                          G_OBJECT (context->stroke_options), "antialias",
+                          G_BINDING_SYNC_CREATE);
+
+  /* get default interpolation from gimprc */
+
+  interpolation = GIMP_CONTEXT (object)->gimp->config->interpolation_type;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object),
+                                        "interpolation");
+
+  if (pspec)
+    G_PARAM_SPEC_ENUM (pspec)->default_value = interpolation;
+
+  g_object_set (object, "interpolation", interpolation, NULL);
+
+  /* get default threshold from gimprc */
+
+  threshold = GIMP_CONTEXT (object)->gimp->config->default_threshold;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object),
+                                        "sample-threshold");
+
+  if (pspec)
+    G_PARAM_SPEC_DOUBLE (pspec)->default_value = threshold / 255.0;
+
+  g_object_set (object, "sample-threshold", threshold / 255.0, NULL);
+}
+
+static void
+gimp_pdb_context_finalize (GObject *object)
+{
+  GimpPDBContext *context = GIMP_PDB_CONTEXT (object);
+
+  g_clear_object (&context->paint_options_list);
+  g_clear_object (&context->stroke_options);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_pdb_context_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpPDBContext *options = GIMP_PDB_CONTEXT (object);
+
+  switch (property_id)
+    {
+    case PROP_ANTIALIAS:
+      options->antialias = g_value_get_boolean (value);
+      break;
+
+    case PROP_FEATHER:
+      options->feather = g_value_get_boolean (value);
+      break;
+
+    case PROP_FEATHER_RADIUS_X:
+      options->feather_radius_x = g_value_get_double (value);
+      break;
+
+    case PROP_FEATHER_RADIUS_Y:
+      options->feather_radius_y = g_value_get_double (value);
+      break;
+
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+
+    case PROP_SAMPLE_CRITERION:
+      options->sample_criterion = g_value_get_enum (value);
+      break;
+
+    case PROP_SAMPLE_THRESHOLD:
+      options->sample_threshold = g_value_get_double (value);
+      break;
+
+    case PROP_SAMPLE_TRANSPARENT:
+      options->sample_transparent = g_value_get_boolean (value);
+      break;
+
+    case PROP_DIAGONAL_NEIGHBORS:
+      options->diagonal_neighbors = g_value_get_boolean (value);
+      break;
+
+    case PROP_INTERPOLATION:
+      options->interpolation = g_value_get_enum (value);
+      break;
+
+    case PROP_TRANSFORM_DIRECTION:
+      options->transform_direction = g_value_get_enum (value);
+      break;
+
+    case PROP_TRANSFORM_RESIZE:
+      options->transform_resize = g_value_get_enum (value);
+      break;
+
+    case PROP_DISTANCE_METRIC:
+      options->distance_metric = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pdb_context_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpPDBContext *options = GIMP_PDB_CONTEXT (object);
+
+  switch (property_id)
+    {
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, options->antialias);
+      break;
+
+    case PROP_FEATHER:
+      g_value_set_boolean (value, options->feather);
+      break;
+
+    case PROP_FEATHER_RADIUS_X:
+      g_value_set_double (value, options->feather_radius_x);
+      break;
+
+    case PROP_FEATHER_RADIUS_Y:
+      g_value_set_double (value, options->feather_radius_y);
+      break;
+
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+
+    case PROP_SAMPLE_CRITERION:
+      g_value_set_enum (value, options->sample_criterion);
+      break;
+
+    case PROP_SAMPLE_THRESHOLD:
+      g_value_set_double (value, options->sample_threshold);
+      break;
+
+    case PROP_SAMPLE_TRANSPARENT:
+      g_value_set_boolean (value, options->sample_transparent);
+      break;
+
+    case PROP_DIAGONAL_NEIGHBORS:
+      g_value_set_boolean (value, options->diagonal_neighbors);
+      break;
+
+    case PROP_INTERPOLATION:
+      g_value_set_enum (value, options->interpolation);
+      break;
+
+    case PROP_TRANSFORM_DIRECTION:
+      g_value_set_enum (value, options->transform_direction);
+      break;
+
+    case PROP_TRANSFORM_RESIZE:
+      g_value_set_enum (value, options->transform_resize);
+      break;
+
+    case PROP_DISTANCE_METRIC:
+      g_value_set_enum (value, options->distance_metric);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pdb_context_reset (GimpConfig *config)
+{
+  GimpPDBContext *context = GIMP_PDB_CONTEXT (config);
+  GList          *list;
+
+  for (list = GIMP_LIST (context->paint_options_list)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      gimp_config_reset (list->data);
+    }
+
+  gimp_config_reset (GIMP_CONFIG (context->stroke_options));
+
+  /* preserve the traditional PDB default */
+  g_object_set (context->stroke_options,
+                "method", GIMP_STROKE_PAINT_METHOD,
+                NULL);
+
+  parent_config_iface->reset (config);
+
+  g_object_notify (G_OBJECT (context), "antialias");
+}
+
+GimpContext *
+gimp_pdb_context_new (Gimp        *gimp,
+                      GimpContext *parent,
+                      gboolean     set_parent)
+{
+  GimpPDBContext *context;
+  GList          *list;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (parent), NULL);
+
+  context = g_object_new (GIMP_TYPE_PDB_CONTEXT,
+                          "gimp", gimp,
+                          "name", "PDB Context",
+                          NULL);
+
+  if (set_parent)
+    {
+      gimp_context_define_properties (GIMP_CONTEXT (context),
+                                      GIMP_CONTEXT_PROP_MASK_ALL, FALSE);
+      gimp_context_set_parent (GIMP_CONTEXT (context), parent);
+
+      for (list = gimp_get_paint_info_iter (gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpPaintInfo *info = list->data;
+
+          gimp_container_add (context->paint_options_list,
+                              GIMP_OBJECT (info->paint_options));
+        }
+    }
+  else
+    {
+      for (list = GIMP_LIST (GIMP_PDB_CONTEXT (parent)->paint_options_list)->queue->head;
+           list;
+           list = g_list_next (list))
+        {
+          GimpPaintOptions *options = gimp_config_duplicate (list->data);
+
+          gimp_container_add (context->paint_options_list,
+                              GIMP_OBJECT (options));
+          g_object_unref (options);
+        }
+
+      gimp_config_copy (GIMP_CONFIG (GIMP_PDB_CONTEXT (parent)->stroke_options),
+                        GIMP_CONFIG (context->stroke_options),
+                        0);
+    }
+
+  /*  copy the context properties last, they might have been
+   *  overwritten by the above copying of stroke options, which have
+   *  the pdb context as parent
+   */
+  gimp_config_sync (G_OBJECT (parent), G_OBJECT (context), 0);
+
+  return GIMP_CONTEXT (context);
+}
+
+GimpContainer *
+gimp_pdb_context_get_paint_options_list (GimpPDBContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+
+  return context->paint_options_list;
+}
+
+GimpPaintOptions *
+gimp_pdb_context_get_paint_options (GimpPDBContext *context,
+                                    const gchar    *name)
+{
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+
+  if (! name)
+    name = gimp_object_get_name (gimp_context_get_paint_info (GIMP_CONTEXT (context)));
+
+  return (GimpPaintOptions *)
+    gimp_container_get_child_by_name (context->paint_options_list, name);
+}
+
+GList *
+gimp_pdb_context_get_brush_options (GimpPDBContext *context)
+{
+  GList *brush_options = NULL;
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+
+  for (list = GIMP_LIST (context->paint_options_list)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpPaintOptions *options = list->data;
+
+      if (g_type_is_a (options->paint_info->paint_type, GIMP_TYPE_BRUSH_CORE))
+        brush_options = g_list_prepend (brush_options, options);
+    }
+
+  return g_list_reverse (brush_options);
+}
+
+GimpStrokeOptions *
+gimp_pdb_context_get_stroke_options (GimpPDBContext *context)
+{
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+
+  return context->stroke_options;
+}
diff --git a/app/pdb/gimppdbcontext.h b/app/pdb/gimppdbcontext.h
new file mode 100644
index 0000000..ce2cdb3
--- /dev/null
+++ b/app/pdb/gimppdbcontext.h
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimppdbcontext.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_CONTEXT_H__
+#define __GIMP_PDB_CONTEXT_H__
+
+
+#include "core/gimpcontext.h"
+
+
+#define GIMP_TYPE_PDB_CONTEXT            (gimp_pdb_context_get_type ())
+#define GIMP_PDB_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PDB_CONTEXT, GimpPDBContext))
+#define GIMP_PDB_CONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PDB_CONTEXT, GimpPDBContextClass))
+#define GIMP_IS_PDB_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PDB_CONTEXT))
+#define GIMP_IS_PDB_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PDB_CONTEXT))
+#define GIMP_PDB_CONTEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PDB_CONTEXT, GimpPDBContextClass))
+
+
+typedef struct _GimpPDBContext      GimpPDBContext;
+typedef struct _GimpPDBContextClass GimpPDBContextClass;
+
+struct _GimpPDBContext
+{
+  GimpContext             parent_instance;
+
+  gboolean                antialias;
+  gboolean                feather;
+  gdouble                 feather_radius_x;
+  gdouble                 feather_radius_y;
+  gboolean                sample_merged;
+  GimpSelectCriterion     sample_criterion;
+  gdouble                 sample_threshold;
+  gboolean                sample_transparent;
+  gboolean                diagonal_neighbors;
+
+  GimpInterpolationType   interpolation;
+  GimpTransformDirection  transform_direction;
+  GimpTransformResize     transform_resize;
+
+  GimpContainer          *paint_options_list;
+  GimpStrokeOptions      *stroke_options;
+
+  GeglDistanceMetric      distance_metric;
+};
+
+struct _GimpPDBContextClass
+{
+  GimpContextClass  parent_class;
+};
+
+
+GType               gimp_pdb_context_get_type           (void) G_GNUC_CONST;
+
+GimpContext       * gimp_pdb_context_new                (Gimp           *gimp,
+                                                         GimpContext    *parent,
+                                                         gboolean        set_parent);
+
+GimpContainer     * gimp_pdb_context_get_paint_options_list
+                                                        (GimpPDBContext *context);
+GimpPaintOptions  * gimp_pdb_context_get_paint_options  (GimpPDBContext *context,
+                                                         const gchar    *name);
+GList             * gimp_pdb_context_get_brush_options  (GimpPDBContext *context);
+
+GimpStrokeOptions * gimp_pdb_context_get_stroke_options (GimpPDBContext *context);
+
+
+#endif  /*  __GIMP_PDB_CONTEXT_H__  */
diff --git a/app/pdb/gimppdberror.c b/app/pdb/gimppdberror.c
new file mode 100644
index 0000000..a554ca0
--- /dev/null
+++ b/app/pdb/gimppdberror.c
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "gimppdberror.h"
+
+
+/**
+ * gimp_pdb_error_quark:
+ *
+ * This function is never called directly. Use GIMP_PDB_ERROR() instead.
+ *
+ * Return value: the #GQuark that defines the GimpPlugIn error domain.
+ **/
+GQuark
+gimp_pdb_error_quark (void)
+{
+  return g_quark_from_static_string ("gimp-pdb-error-quark");
+}
diff --git a/app/pdb/gimppdberror.h b/app/pdb/gimppdberror.h
new file mode 100644
index 0000000..11caa48
--- /dev/null
+++ b/app/pdb/gimppdberror.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_ERROR_H__
+#define __GIMP_PDB_ERROR_H__
+
+
+typedef enum
+{
+  GIMP_PDB_ERROR_FAILED,  /* generic error condition */
+  GIMP_PDB_ERROR_CANCELLED,
+  GIMP_PDB_ERROR_PROCEDURE_NOT_FOUND,
+  GIMP_PDB_ERROR_INVALID_ARGUMENT,
+  GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+  GIMP_PDB_ERROR_INTERNAL_ERROR
+} GimpPdbErrorCode;
+
+
+#define GIMP_PDB_ERROR (gimp_pdb_error_quark ())
+
+GQuark  gimp_pdb_error_quark (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_PDB_ERROR_H__ */
diff --git a/app/pdb/gimpprocedure.c b/app/pdb/gimpprocedure.c
new file mode 100644
index 0000000..a12dab9
--- /dev/null
+++ b/app/pdb/gimpprocedure.c
@@ -0,0 +1,897 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <sys/types.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-memsize.h"
+#include "core/gimpchannel.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimppdbcontext.h"
+#include "gimppdberror.h"
+#include "gimpprocedure.h"
+
+#include "gimp-intl.h"
+
+
+static void          gimp_procedure_finalize            (GObject         *object);
+
+static gint64        gimp_procedure_get_memsize         (GimpObject      *object,
+                                                         gint64          *gui_size);
+
+static const gchar * gimp_procedure_real_get_label      (GimpProcedure   *procedure);
+static const gchar * gimp_procedure_real_get_menu_label (GimpProcedure   *procedure);
+static const gchar * gimp_procedure_real_get_blurb      (GimpProcedure   *procedure);
+static const gchar * gimp_procedure_real_get_help_id    (GimpProcedure   *procedure);
+static gboolean      gimp_procedure_real_get_sensitive  (GimpProcedure   *procedure,
+                                                         GimpObject      *object,
+                                                         const gchar    **tooltip);
+static GimpValueArray * gimp_procedure_real_execute     (GimpProcedure   *procedure,
+                                                         Gimp            *gimp,
+                                                         GimpContext     *context,
+                                                         GimpProgress    *progress,
+                                                         GimpValueArray  *args,
+                                                         GError         **error);
+static void        gimp_procedure_real_execute_async    (GimpProcedure   *procedure,
+                                                         Gimp            *gimp,
+                                                         GimpContext     *context,
+                                                         GimpProgress    *progress,
+                                                         GimpValueArray  *args,
+                                                         GimpObject      *display);
+
+static void          gimp_procedure_free_strings        (GimpProcedure   *procedure);
+static gboolean      gimp_procedure_validate_args       (GimpProcedure   *procedure,
+                                                         GParamSpec     **param_specs,
+                                                         gint             n_param_specs,
+                                                         GimpValueArray  *args,
+                                                         gboolean         return_vals,
+                                                         GError         **error);
+
+
+G_DEFINE_TYPE (GimpProcedure, gimp_procedure, GIMP_TYPE_VIEWABLE)
+
+#define parent_class gimp_procedure_parent_class
+
+
+static void
+gimp_procedure_class_init (GimpProcedureClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->finalize         = gimp_procedure_finalize;
+
+  gimp_object_class->get_memsize = gimp_procedure_get_memsize;
+
+  klass->get_label               = gimp_procedure_real_get_label;
+  klass->get_menu_label          = gimp_procedure_real_get_menu_label;
+  klass->get_blurb               = gimp_procedure_real_get_blurb;
+  klass->get_help_id             = gimp_procedure_real_get_help_id;
+  klass->get_sensitive           = gimp_procedure_real_get_sensitive;
+  klass->execute                 = gimp_procedure_real_execute;
+  klass->execute_async           = gimp_procedure_real_execute_async;
+}
+
+static void
+gimp_procedure_init (GimpProcedure *procedure)
+{
+  procedure->proc_type = GIMP_INTERNAL;
+}
+
+static void
+gimp_procedure_finalize (GObject *object)
+{
+  GimpProcedure *procedure = GIMP_PROCEDURE (object);
+  gint           i;
+
+  gimp_procedure_free_strings (procedure);
+
+  if (procedure->args)
+    {
+      for (i = 0; i < procedure->num_args; i++)
+        g_param_spec_unref (procedure->args[i]);
+
+      g_clear_pointer (&procedure->args, g_free);
+    }
+
+  if (procedure->values)
+    {
+      for (i = 0; i < procedure->num_values; i++)
+        g_param_spec_unref (procedure->values[i]);
+
+      g_clear_pointer (&procedure->values, g_free);
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_procedure_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpProcedure *procedure = GIMP_PROCEDURE (object);
+  gint64         memsize   = 0;
+  gint           i;
+
+  if (! procedure->static_strings)
+    {
+      memsize += gimp_string_get_memsize (procedure->original_name);
+      memsize += gimp_string_get_memsize (procedure->blurb);
+      memsize += gimp_string_get_memsize (procedure->help);
+      memsize += gimp_string_get_memsize (procedure->author);
+      memsize += gimp_string_get_memsize (procedure->copyright);
+      memsize += gimp_string_get_memsize (procedure->date);
+      memsize += gimp_string_get_memsize (procedure->deprecated);
+    }
+
+  memsize += procedure->num_args * sizeof (GParamSpec *);
+
+  for (i = 0; i < procedure->num_args; i++)
+    memsize += gimp_g_param_spec_get_memsize (procedure->args[i]);
+
+  memsize += procedure->num_values * sizeof (GParamSpec *);
+
+  for (i = 0; i < procedure->num_values; i++)
+    memsize += gimp_g_param_spec_get_memsize (procedure->values[i]);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static const gchar *
+gimp_procedure_real_get_label (GimpProcedure *procedure)
+{
+  return gimp_object_get_name (procedure); /* lame fallback */
+}
+
+static const gchar *
+gimp_procedure_real_get_menu_label (GimpProcedure *procedure)
+{
+  return gimp_procedure_get_label (procedure);
+}
+
+static const gchar *
+gimp_procedure_real_get_blurb (GimpProcedure *procedure)
+{
+  return procedure->blurb;
+}
+
+static const gchar *
+gimp_procedure_real_get_help_id (GimpProcedure *procedure)
+{
+  return NULL;
+}
+
+static gboolean
+gimp_procedure_real_get_sensitive (GimpProcedure  *procedure,
+                                   GimpObject     *object,
+                                   const gchar   **tooltip)
+{
+  return TRUE /* random fallback */;
+}
+
+static GimpValueArray *
+gimp_procedure_real_execute (GimpProcedure   *procedure,
+                             Gimp            *gimp,
+                             GimpContext     *context,
+                             GimpProgress    *progress,
+                             GimpValueArray  *args,
+                             GError         **error)
+{
+  g_return_val_if_fail (gimp_value_array_length (args) >=
+                        procedure->num_args, NULL);
+
+  return procedure->marshal_func (procedure, gimp,
+                                  context, progress,
+                                  args, error);
+}
+
+static void
+gimp_procedure_real_execute_async (GimpProcedure  *procedure,
+                                   Gimp           *gimp,
+                                   GimpContext    *context,
+                                   GimpProgress   *progress,
+                                   GimpValueArray *args,
+                                   GimpObject     *display)
+{
+  GimpValueArray *return_vals;
+  GError         *error = NULL;
+
+  g_return_if_fail (gimp_value_array_length (args) >= procedure->num_args);
+
+  return_vals = GIMP_PROCEDURE_GET_CLASS (procedure)->execute (procedure,
+                                                               gimp,
+                                                               context,
+                                                               progress,
+                                                               args,
+                                                               &error);
+
+  gimp_value_array_unref (return_vals);
+
+  if (error)
+    {
+      gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_error_free (error);
+    }
+}
+
+
+/*  public functions  */
+
+GimpProcedure  *
+gimp_procedure_new (GimpMarshalFunc marshal_func)
+{
+  GimpProcedure *procedure;
+
+  g_return_val_if_fail (marshal_func != NULL, NULL);
+
+  procedure = g_object_new (GIMP_TYPE_PROCEDURE, NULL);
+
+  procedure->marshal_func = marshal_func;
+
+  return procedure;
+}
+
+void
+gimp_procedure_set_strings (GimpProcedure *procedure,
+                            const gchar   *original_name,
+                            const gchar   *blurb,
+                            const gchar   *help,
+                            const gchar   *author,
+                            const gchar   *copyright,
+                            const gchar   *date,
+                            const gchar   *deprecated)
+{
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  gimp_procedure_free_strings (procedure);
+
+  procedure->original_name = g_strdup (original_name);
+  procedure->blurb         = g_strdup (blurb);
+  procedure->help          = g_strdup (help);
+  procedure->author        = g_strdup (author);
+  procedure->copyright     = g_strdup (copyright);
+  procedure->date          = g_strdup (date);
+  procedure->deprecated    = g_strdup (deprecated);
+
+  procedure->static_strings = FALSE;
+}
+
+void
+gimp_procedure_set_static_strings (GimpProcedure *procedure,
+                                   const gchar   *original_name,
+                                   const gchar   *blurb,
+                                   const gchar   *help,
+                                   const gchar   *author,
+                                   const gchar   *copyright,
+                                   const gchar   *date,
+                                   const gchar   *deprecated)
+{
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  gimp_procedure_free_strings (procedure);
+
+  procedure->original_name = (gchar *) original_name;
+  procedure->blurb         = (gchar *) blurb;
+  procedure->help          = (gchar *) help;
+  procedure->author        = (gchar *) author;
+  procedure->copyright     = (gchar *) copyright;
+  procedure->date          = (gchar *) date;
+  procedure->deprecated    = (gchar *) deprecated;
+
+  procedure->static_strings = TRUE;
+}
+
+void
+gimp_procedure_take_strings (GimpProcedure *procedure,
+                             gchar         *original_name,
+                             gchar         *blurb,
+                             gchar         *help,
+                             gchar         *author,
+                             gchar         *copyright,
+                             gchar         *date,
+                             gchar         *deprecated)
+{
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+
+  gimp_procedure_free_strings (procedure);
+
+  procedure->original_name = original_name;
+  procedure->blurb         = blurb;
+  procedure->help          = help;
+  procedure->author        = author;
+  procedure->copyright     = copyright;
+  procedure->date          = date;
+  procedure->deprecated    = deprecated;
+
+  procedure->static_strings = FALSE;
+}
+
+const gchar *
+gimp_procedure_get_label (GimpProcedure *procedure)
+{
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+  return GIMP_PROCEDURE_GET_CLASS (procedure)->get_label (procedure);
+}
+
+const gchar *
+gimp_procedure_get_menu_label (GimpProcedure *procedure)
+{
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+  return GIMP_PROCEDURE_GET_CLASS (procedure)->get_menu_label (procedure);
+}
+
+const gchar *
+gimp_procedure_get_blurb (GimpProcedure *procedure)
+{
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+  return GIMP_PROCEDURE_GET_CLASS (procedure)->get_blurb (procedure);
+}
+
+const gchar *
+gimp_procedure_get_help_id (GimpProcedure *procedure)
+{
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+  return GIMP_PROCEDURE_GET_CLASS (procedure)->get_help_id (procedure);
+}
+
+gboolean
+gimp_procedure_get_sensitive (GimpProcedure  *procedure,
+                              GimpObject     *object,
+                              const gchar   **tooltip)
+{
+  const gchar *my_tooltip = NULL;
+  gboolean     sensitive;
+
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), FALSE);
+  g_return_val_if_fail (object == NULL || GIMP_IS_OBJECT (object), FALSE);
+
+  sensitive = GIMP_PROCEDURE_GET_CLASS (procedure)->get_sensitive (procedure,
+                                                                   object,
+                                                                   &my_tooltip);
+
+  if (tooltip)
+    *tooltip = my_tooltip;
+
+  return sensitive;
+}
+
+GimpValueArray *
+gimp_procedure_execute (GimpProcedure   *procedure,
+                        Gimp            *gimp,
+                        GimpContext     *context,
+                        GimpProgress    *progress,
+                        GimpValueArray  *args,
+                        GError         **error)
+{
+  GimpValueArray *return_vals;
+  GError         *pdb_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (args != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (! gimp_procedure_validate_args (procedure,
+                                      procedure->args, procedure->num_args,
+                                      args, FALSE, &pdb_error))
+    {
+      return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+                                                      pdb_error);
+      g_propagate_error (error, pdb_error);
+
+      return return_vals;
+    }
+
+  if (GIMP_IS_PDB_CONTEXT (context))
+    context = g_object_ref (context);
+  else
+    context = gimp_pdb_context_new (gimp, context, TRUE);
+
+  if (progress)
+    g_object_ref (progress);
+
+  /*  call the procedure  */
+  return_vals = GIMP_PROCEDURE_GET_CLASS (procedure)->execute (procedure,
+                                                               gimp,
+                                                               context,
+                                                               progress,
+                                                               args,
+                                                               error);
+
+  if (progress)
+    g_object_unref (progress);
+
+  g_object_unref (context);
+
+  if (return_vals)
+    {
+      switch (g_value_get_enum (gimp_value_array_index (return_vals, 0)))
+        {
+        case GIMP_PDB_CALLING_ERROR:
+        case GIMP_PDB_EXECUTION_ERROR:
+          /*  If the error has not already been set, construct one
+           *  from the error message that is optionally passed with
+           *  the return values.
+           */
+          if (error && *error == NULL &&
+              gimp_value_array_length (return_vals) > 1 &&
+              G_VALUE_HOLDS_STRING (gimp_value_array_index (return_vals, 1)))
+            {
+              GValue      *value   = gimp_value_array_index (return_vals, 1);
+              const gchar *message = g_value_get_string (value);
+
+              if (message)
+                g_set_error_literal (error, GIMP_PDB_ERROR,
+                                     GIMP_PDB_ERROR_FAILED,
+                                     message);
+            }
+          break;
+
+        default:
+          break;
+        }
+    }
+  else
+    {
+      g_warning ("%s: no return values, shouldn't happen", G_STRFUNC);
+
+      pdb_error = g_error_new (GIMP_PDB_ERROR,
+                               GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+                               _("Procedure '%s' returned no return values"),
+                               gimp_object_get_name (procedure));
+
+      return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+                                                      pdb_error);
+      if (error && *error == NULL)
+        g_propagate_error (error, pdb_error);
+      else
+        g_error_free (pdb_error);
+
+    }
+
+  return return_vals;
+}
+
+void
+gimp_procedure_execute_async (GimpProcedure  *procedure,
+                              Gimp           *gimp,
+                              GimpContext    *context,
+                              GimpProgress   *progress,
+                              GimpValueArray *args,
+                              GimpObject     *display,
+                              GError        **error)
+{
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (args != NULL);
+  g_return_if_fail (display == NULL || GIMP_IS_OBJECT (display));
+  g_return_if_fail (error == NULL || *error == NULL);
+
+  if (gimp_procedure_validate_args (procedure,
+                                    procedure->args, procedure->num_args,
+                                    args, FALSE, error))
+    {
+      if (GIMP_IS_PDB_CONTEXT (context))
+        context = g_object_ref (context);
+      else
+        context = gimp_pdb_context_new (gimp, context, TRUE);
+
+      if (progress)
+        g_object_ref (progress);
+
+      GIMP_PROCEDURE_GET_CLASS (procedure)->execute_async (procedure, gimp,
+                                                           context, progress,
+                                                           args, display);
+
+      if (progress)
+        g_object_unref (progress);
+
+      g_object_unref (context);
+    }
+}
+
+GimpValueArray *
+gimp_procedure_get_arguments (GimpProcedure *procedure)
+{
+  GimpValueArray *args;
+  GValue          value = G_VALUE_INIT;
+  gint            i;
+
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
+
+  args = gimp_value_array_new (procedure->num_args);
+
+  for (i = 0; i < procedure->num_args; i++)
+    {
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (procedure->args[i]));
+      gimp_value_array_append (args, &value);
+      g_value_unset (&value);
+    }
+
+  return args;
+}
+
+GimpValueArray *
+gimp_procedure_get_return_values (GimpProcedure *procedure,
+                                  gboolean       success,
+                                  const GError  *error)
+{
+  GimpValueArray *args;
+  GValue          value = G_VALUE_INIT;
+  gint            i;
+
+  g_return_val_if_fail (success == FALSE || GIMP_IS_PROCEDURE (procedure),
+                        NULL);
+
+  if (success)
+    {
+      args = gimp_value_array_new (procedure->num_values + 1);
+
+      g_value_init (&value, GIMP_TYPE_PDB_STATUS_TYPE);
+      g_value_set_enum (&value, GIMP_PDB_SUCCESS);
+      gimp_value_array_append (args, &value);
+      g_value_unset (&value);
+
+      for (i = 0; i < procedure->num_values; i++)
+        {
+          g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (procedure->values[i]));
+          gimp_value_array_append (args, &value);
+          g_value_unset (&value);
+        }
+    }
+  else
+    {
+      args = gimp_value_array_new ((error && error->message) ? 2 : 1);
+
+      g_value_init (&value, GIMP_TYPE_PDB_STATUS_TYPE);
+
+      /*  errors in the GIMP_PDB_ERROR domain are calling errors  */
+      if (error && error->domain == GIMP_PDB_ERROR)
+        {
+          switch ((GimpPdbErrorCode) error->code)
+            {
+            case GIMP_PDB_ERROR_FAILED:
+            case GIMP_PDB_ERROR_PROCEDURE_NOT_FOUND:
+            case GIMP_PDB_ERROR_INVALID_ARGUMENT:
+            case GIMP_PDB_ERROR_INVALID_RETURN_VALUE:
+            case GIMP_PDB_ERROR_INTERNAL_ERROR:
+              g_value_set_enum (&value, GIMP_PDB_CALLING_ERROR);
+              break;
+
+            case GIMP_PDB_ERROR_CANCELLED:
+              g_value_set_enum (&value, GIMP_PDB_CANCEL);
+              break;
+
+            default:
+              gimp_assert_not_reached ();
+            }
+        }
+      else
+        {
+          g_value_set_enum (&value, GIMP_PDB_EXECUTION_ERROR);
+        }
+
+      gimp_value_array_append (args, &value);
+      g_value_unset (&value);
+
+      if (error && error->message)
+        {
+          g_value_init (&value, G_TYPE_STRING);
+          g_value_set_string (&value, error->message);
+          gimp_value_array_append (args, &value);
+          g_value_unset (&value);
+        }
+    }
+
+  return args;
+}
+
+void
+gimp_procedure_add_argument (GimpProcedure *procedure,
+                             GParamSpec    *pspec)
+{
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+  g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+
+  procedure->args = g_renew (GParamSpec *, procedure->args,
+                             procedure->num_args + 1);
+
+  procedure->args[procedure->num_args] = pspec;
+
+  g_param_spec_ref_sink (pspec);
+
+  procedure->num_args++;
+}
+
+void
+gimp_procedure_add_return_value (GimpProcedure *procedure,
+                                 GParamSpec    *pspec)
+{
+  g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
+  g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+
+  procedure->values = g_renew (GParamSpec *, procedure->values,
+                               procedure->num_values + 1);
+
+  procedure->values[procedure->num_values] = pspec;
+
+  g_param_spec_ref_sink (pspec);
+
+  procedure->num_values++;
+}
+
+/**
+ * gimp_procedure_create_override:
+ * @procedure:
+ * @new_marshal_func:
+ *
+ * Creates a new GimpProcedure that can be used to override the
+ * existing @procedure.
+ *
+ * Returns: The new #GimpProcedure.
+ **/
+GimpProcedure *
+gimp_procedure_create_override (GimpProcedure   *procedure,
+                                GimpMarshalFunc  new_marshal_func)
+{
+  GimpProcedure *new_procedure = NULL;
+  const gchar   *name          = NULL;
+  int            i             = 0;
+
+  new_procedure = gimp_procedure_new (new_marshal_func);
+  name          = gimp_object_get_name (procedure);
+
+  gimp_object_set_static_name (GIMP_OBJECT (new_procedure), name);
+
+  for (i = 0; i < procedure->num_args; i++)
+    gimp_procedure_add_argument (new_procedure, procedure->args[i]);
+
+  for (i = 0; i < procedure->num_values; i++)
+    gimp_procedure_add_return_value (new_procedure, procedure->values[i]);
+
+  return new_procedure;
+}
+
+gint
+gimp_procedure_name_compare (GimpProcedure *proc1,
+                             GimpProcedure *proc2)
+{
+  /* Assume there always is a name, don't bother with NULL checks */
+  return strcmp (proc1->original_name,
+                 proc2->original_name);
+}
+
+/*  private functions  */
+
+static void
+gimp_procedure_free_strings (GimpProcedure *procedure)
+{
+  if (! procedure->static_strings)
+    {
+      g_free (procedure->original_name);
+      g_free (procedure->blurb);
+      g_free (procedure->help);
+      g_free (procedure->author);
+      g_free (procedure->copyright);
+      g_free (procedure->date);
+      g_free (procedure->deprecated);
+    }
+
+  procedure->original_name = NULL;
+  procedure->blurb         = NULL;
+  procedure->help          = NULL;
+  procedure->author        = NULL;
+  procedure->copyright     = NULL;
+  procedure->date          = NULL;
+  procedure->deprecated    = NULL;
+
+  procedure->static_strings = FALSE;
+}
+
+static gboolean
+gimp_procedure_validate_args (GimpProcedure  *procedure,
+                              GParamSpec    **param_specs,
+                              gint            n_param_specs,
+                              GimpValueArray *args,
+                              gboolean        return_vals,
+                              GError        **error)
+{
+  gint i;
+
+  for (i = 0; i < MIN (gimp_value_array_length (args), n_param_specs); i++)
+    {
+      GValue     *arg       = gimp_value_array_index (args, i);
+      GParamSpec *pspec     = param_specs[i];
+      GType       arg_type  = G_VALUE_TYPE (arg);
+      GType       spec_type = G_PARAM_SPEC_VALUE_TYPE (pspec);
+
+      if (arg_type != spec_type)
+        {
+          if (return_vals)
+            {
+              g_set_error (error,
+                           GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+                           _("Procedure '%s' returned a wrong value type "
+                             "for return value '%s' (#%d). "
+                             "Expected %s, got %s."),
+                           gimp_object_get_name (procedure),
+                           g_param_spec_get_name (pspec),
+                           i + 1, g_type_name (spec_type),
+                           g_type_name (arg_type));
+            }
+          else
+            {
+              g_set_error (error,
+                           GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                           _("Procedure '%s' has been called with a "
+                             "wrong value type for argument '%s' (#%d). "
+                             "Expected %s, got %s."),
+                           gimp_object_get_name (procedure),
+                           g_param_spec_get_name (pspec),
+                           i + 1, g_type_name (spec_type),
+                           g_type_name (arg_type));
+            }
+
+          return FALSE;
+        }
+      else if (! (pspec->flags & GIMP_PARAM_NO_VALIDATE))
+        {
+          GValue string_value = G_VALUE_INIT;
+
+          g_value_init (&string_value, G_TYPE_STRING);
+
+          if (g_value_type_transformable (arg_type, G_TYPE_STRING))
+            g_value_transform (arg, &string_value);
+          else
+            g_value_set_static_string (&string_value,
+                                       "<not transformable to string>");
+
+          if (g_param_value_validate (pspec, arg))
+            {
+              if (GIMP_IS_PARAM_SPEC_DRAWABLE_ID (pspec) &&
+                  g_value_get_int (arg) == -1)
+                {
+                  if (return_vals)
+                    {
+                      g_set_error (error,
+                                   GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+                                   _("Procedure '%s' returned an "
+                                     "invalid ID for argument '%s'. "
+                                     "Most likely a plug-in is trying "
+                                     "to work on a layer that doesn't "
+                                     "exist any longer."),
+                                   gimp_object_get_name (procedure),
+                                   g_param_spec_get_name (pspec));
+                    }
+                  else
+                    {
+                      g_set_error (error,
+                                   GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                                   _("Procedure '%s' has been called with an "
+                                     "invalid ID for argument '%s'. "
+                                     "Most likely a plug-in is trying "
+                                     "to work on a layer that doesn't "
+                                     "exist any longer."),
+                                   gimp_object_get_name (procedure),
+                                   g_param_spec_get_name (pspec));
+                    }
+                }
+              else if (GIMP_IS_PARAM_SPEC_IMAGE_ID (pspec) &&
+                       g_value_get_int (arg) == -1)
+                {
+                  if (return_vals)
+                    {
+                      g_set_error (error,
+                                   GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+                                   _("Procedure '%s' returned an "
+                                     "invalid ID for argument '%s'. "
+                                     "Most likely a plug-in is trying "
+                                     "to work on an image that doesn't "
+                                     "exist any longer."),
+                                   gimp_object_get_name (procedure),
+                                   g_param_spec_get_name (pspec));
+                    }
+                  else
+                    {
+                      g_set_error (error,
+                                   GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                                   _("Procedure '%s' has been called with an "
+                                     "invalid ID for argument '%s'. "
+                                     "Most likely a plug-in is trying "
+                                     "to work on an image that doesn't "
+                                     "exist any longer."),
+                                   gimp_object_get_name (procedure),
+                                   g_param_spec_get_name (pspec));
+                    }
+                }
+              else
+                {
+                  const gchar *value = g_value_get_string (&string_value);
+
+                  if (value == NULL)
+                    value = "(null)";
+
+                  if (return_vals)
+                    {
+                      g_set_error (error,
+                                   GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+                                   _("Procedure '%s' returned "
+                                     "'%s' as return value '%s' "
+                                     "(#%d, type %s). "
+                                     "This value is out of range."),
+                                   gimp_object_get_name (procedure),
+                                   value,
+                                   g_param_spec_get_name (pspec),
+                                   i + 1, g_type_name (spec_type));
+                    }
+                  else
+                    {
+                      g_set_error (error,
+                                   GIMP_PDB_ERROR,
+                                   GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                                   _("Procedure '%s' has been called with "
+                                     "value '%s' for argument '%s' "
+                                     "(#%d, type %s). "
+                                     "This value is out of range."),
+                                   gimp_object_get_name (procedure),
+                                   value,
+                                   g_param_spec_get_name (pspec),
+                                   i + 1, g_type_name (spec_type));
+                    }
+                }
+
+              g_value_unset (&string_value);
+
+              return FALSE;
+            }
+
+          g_value_unset (&string_value);
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/pdb/gimpprocedure.h b/app/pdb/gimpprocedure.h
new file mode 100644
index 0000000..7e9f2dc
--- /dev/null
+++ b/app/pdb/gimpprocedure.h
@@ -0,0 +1,164 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROCEDURE_H__
+#define __GIMP_PROCEDURE_H__
+
+
+#include "core/gimpviewable.h"
+
+
+typedef GimpValueArray * (* GimpMarshalFunc) (GimpProcedure         *procedure,
+                                              Gimp                  *gimp,
+                                              GimpContext           *context,
+                                              GimpProgress          *progress,
+                                              const GimpValueArray  *args,
+                                              GError               **error);
+
+
+#define GIMP_TYPE_PROCEDURE            (gimp_procedure_get_type ())
+#define GIMP_PROCEDURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROCEDURE, GimpProcedure))
+#define GIMP_PROCEDURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PROCEDURE, GimpProcedureClass))
+#define GIMP_IS_PROCEDURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROCEDURE))
+#define GIMP_IS_PROCEDURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PROCEDURE))
+#define GIMP_PROCEDURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PROCEDURE, GimpProcedureClass))
+
+
+typedef struct _GimpProcedureClass GimpProcedureClass;
+
+struct _GimpProcedure
+{
+  GimpViewable      parent_instance;
+
+  GimpPDBProcType   proc_type;      /* Type of procedure              */
+
+  gboolean          static_strings; /* Are the strings allocated?     */
+
+  gchar            *original_name;  /* Uncanonicalized procedure name */
+  gchar            *blurb;          /* Short procedure description    */
+  gchar            *help;           /* Detailed help instructions     */
+  gchar            *author;         /* Author field                   */
+  gchar            *copyright;      /* Copyright field                */
+  gchar            *date;           /* Date field                     */
+  gchar            *deprecated;     /* Replacement if deprecated      */
+
+  gint32            num_args;       /* Number of procedure arguments  */
+  GParamSpec      **args;           /* Array of procedure arguments   */
+
+  gint32            num_values;     /* Number of return values        */
+  GParamSpec      **values;         /* Array of return values         */
+
+  GimpMarshalFunc   marshal_func;   /* Marshaller for internal procs  */
+};
+
+struct _GimpProcedureClass
+{
+  GimpViewableClass parent_class;
+
+  const gchar    * (* get_label)      (GimpProcedure   *procedure);
+  const gchar    * (* get_menu_label) (GimpProcedure   *procedure);
+  const gchar    * (* get_blurb)      (GimpProcedure   *procedure);
+  const gchar    * (* get_help_id)    (GimpProcedure   *procedure);
+  gboolean         (* get_sensitive)  (GimpProcedure   *procedure,
+                                       GimpObject      *object,
+                                       const gchar    **tooltip);
+
+  GimpValueArray * (* execute)        (GimpProcedure   *procedure,
+                                       Gimp            *gimp,
+                                       GimpContext     *context,
+                                       GimpProgress    *progress,
+                                       GimpValueArray  *args,
+                                       GError         **error);
+  void             (* execute_async)  (GimpProcedure   *procedure,
+                                       Gimp            *gimp,
+                                       GimpContext     *context,
+                                       GimpProgress    *progress,
+                                       GimpValueArray  *args,
+                                       GimpObject      *display);
+};
+
+
+GType            gimp_procedure_get_type           (void) G_GNUC_CONST;
+
+GimpProcedure  * gimp_procedure_new                (GimpMarshalFunc   marshal_func);
+
+void             gimp_procedure_set_strings        (GimpProcedure    *procedure,
+                                                    const gchar      *original_name,
+                                                    const gchar      *blurb,
+                                                    const gchar      *help,
+                                                    const gchar      *author,
+                                                    const gchar      *copyright,
+                                                    const gchar      *date,
+                                                    const gchar      *deprecated);
+void             gimp_procedure_set_static_strings (GimpProcedure    *procedure,
+                                                    const gchar      *original_name,
+                                                    const gchar      *blurb,
+                                                    const gchar      *help,
+                                                    const gchar      *author,
+                                                    const gchar      *copyright,
+                                                    const gchar      *date,
+                                                    const gchar      *deprecated);
+void             gimp_procedure_take_strings       (GimpProcedure    *procedure,
+                                                    gchar            *original_name,
+                                                    gchar            *blurb,
+                                                    gchar            *help,
+                                                    gchar            *author,
+                                                    gchar            *copyright,
+                                                    gchar            *date,
+                                                    gchar            *deprecated);
+
+const gchar    * gimp_procedure_get_label          (GimpProcedure    *procedure);
+const gchar    * gimp_procedure_get_menu_label     (GimpProcedure    *procedure);
+const gchar    * gimp_procedure_get_blurb          (GimpProcedure    *procedure);
+const gchar    * gimp_procedure_get_help_id        (GimpProcedure    *procedure);
+gboolean         gimp_procedure_get_sensitive      (GimpProcedure    *procedure,
+                                                    GimpObject       *object,
+                                                    const gchar     **tooltip);
+
+void             gimp_procedure_add_argument       (GimpProcedure    *procedure,
+                                                    GParamSpec       *pspec);
+void             gimp_procedure_add_return_value   (GimpProcedure    *procedure,
+                                                    GParamSpec       *pspec);
+
+GimpValueArray * gimp_procedure_get_arguments      (GimpProcedure    *procedure);
+GimpValueArray * gimp_procedure_get_return_values  (GimpProcedure    *procedure,
+                                                    gboolean          success,
+                                                    const GError     *error);
+
+GimpProcedure  * gimp_procedure_create_override    (GimpProcedure    *procedure,
+                                                    GimpMarshalFunc   new_marshal_func);
+
+GimpValueArray * gimp_procedure_execute            (GimpProcedure    *procedure,
+                                                    Gimp             *gimp,
+                                                    GimpContext      *context,
+                                                    GimpProgress     *progress,
+                                                    GimpValueArray   *args,
+                                                    GError          **error);
+void             gimp_procedure_execute_async      (GimpProcedure    *procedure,
+                                                    Gimp             *gimp,
+                                                    GimpContext      *context,
+                                                    GimpProgress     *progress,
+                                                    GimpValueArray   *args,
+                                                    GimpObject       *display,
+                                                    GError          **error);
+
+gint             gimp_procedure_name_compare       (GimpProcedure    *proc1,
+                                                    GimpProcedure    *proc2);
+
+
+
+#endif  /*  __GIMP_PROCEDURE_H__  */
diff --git a/app/pdb/gimprc-cmds.c b/app/pdb/gimprc-cmds.c
new file mode 100644
index 0000000..9f81868
--- /dev/null
+++ b/app/pdb/gimprc-cmds.c
@@ -0,0 +1,502 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmodule/gimpmodule.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "config/gimprc.h"
+#include "core/gimp-utils.h"
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptemplate.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+gimprc_query_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *token;
+  gchar *value = NULL;
+
+  token = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (strlen (token))
+        {
+          /*  use edit_config because unknown tokens are set there  */
+          value = gimp_rc_query (GIMP_RC (gimp->edit_config), token);
+
+          if (! value)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), value);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gimprc_set_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *token;
+  const gchar *value;
+
+  token = g_value_get_string (gimp_value_array_index (args, 0));
+  value = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (strlen (token))
+        {
+          /*  use edit_config because that's the one that gets saved  */
+          gimp_rc_set_unknown_token (GIMP_RC (gimp->edit_config), token, value);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+get_default_comment_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *comment = NULL;
+
+  comment = g_strdup (gimp_template_get_comment (gimp->config->default_image));
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), comment);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_default_unit_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpUnit unit_id = 0;
+
+  unit_id = gimp_get_default_unit ();
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), unit_id);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_monitor_resolution_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  GimpValueArray *return_vals;
+  gdouble xres = 0.0;
+  gdouble yres = 0.0;
+
+  xres = GIMP_DISPLAY_CONFIG (gimp->config)->monitor_xres;
+  yres = GIMP_DISPLAY_CONFIG (gimp->config)->monitor_yres;
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_double (gimp_value_array_index (return_vals, 1), xres);
+  g_value_set_double (gimp_value_array_index (return_vals, 2), yres);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_theme_dir_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *theme_dir = NULL;
+
+  GFile *file = gimp_get_theme_dir (gimp);
+
+  if (file)
+    theme_dir = g_file_get_path (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), theme_dir);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_icon_theme_dir_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *icon_theme_dir = NULL;
+
+  GFile *file = gimp_get_icon_theme_dir (gimp);
+
+  if (file)
+    icon_theme_dir = g_file_get_path (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), icon_theme_dir);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_color_configuration_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *config = NULL;
+
+  config = gimp_config_serialize_to_string (GIMP_CONFIG (gimp->config->color_management), NULL);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), config);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+get_module_load_inhibit_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *load_inhibit = NULL;
+
+  load_inhibit = g_strdup (gimp_module_db_get_load_inhibit (gimp->module_db));
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), load_inhibit);
+
+  return return_vals;
+}
+
+void
+register_gimprc_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-gimprc-query
+   */
+  procedure = gimp_procedure_new (gimprc_query_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gimprc-query");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gimprc-query",
+                                     "Queries the gimprc file parser for information on a specified token.",
+                                     "This procedure is used to locate additional information contained in the gimprc file considered extraneous to the operation of GIMP. Plug-ins that need configuration information can expect it will be stored in the user gimprc file and can use this procedure to retrieve it. This query procedure will return the value associated with the specified token. This corresponds _only_ to entries with the format: (<token> <value>). The value must be a string. Entries not corresponding to this format will cause warnings to be issued on gimprc parsing and will not be queryable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("token",
+                                                       "token",
+                                                       "The token to query for",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("value",
+                                                           "value",
+                                                           "The value associated with the queried token",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gimprc-set
+   */
+  procedure = gimp_procedure_new (gimprc_set_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gimprc-set");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gimprc-set",
+                                     "Sets a gimprc token to a value and saves it in the gimprc.",
+                                     "This procedure is used to add or change additional information in the gimprc file that is considered extraneous to the operation of GIMP. Plug-ins that need configuration information can use this function to store it, and 'gimp-gimprc-query' to retrieve it. This will accept _only_ string values in UTF-8 encoding.",
+                                     "Seth Burgess",
+                                     "Seth Burgess",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("token",
+                                                       "token",
+                                                       "The token to add or modify",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("value",
+                                                       "value",
+                                                       "The value to set the token to",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-default-comment
+   */
+  procedure = gimp_procedure_new (get_default_comment_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-default-comment");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-default-comment",
+                                     "Get the default image comment as specified in the Preferences.",
+                                     "Returns a copy of the default image comment.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("comment",
+                                                           "comment",
+                                                           "Default image comment",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-default-unit
+   */
+  procedure = gimp_procedure_new (get_default_unit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-default-unit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-default-unit",
+                                     "Get the default unit (taken from the user's locale).",
+                                     "Returns the default unit's integer ID.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_unit ("unit-id",
+                                                         "unit id",
+                                                         "Default unit",
+                                                         TRUE,
+                                                         FALSE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-monitor-resolution
+   */
+  procedure = gimp_procedure_new (get_monitor_resolution_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-monitor-resolution");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-monitor-resolution",
+                                     "Get the monitor resolution as specified in the Preferences.",
+                                     "Returns the resolution of the monitor in pixels/inch. This value is taken from the Preferences (or the windowing system if this is set in the Preferences) and there's no guarantee for the value to be reasonable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("xres",
+                                                        "xres",
+                                                        "X resolution",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("yres",
+                                                        "yres",
+                                                        "Y resolution",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-theme-dir
+   */
+  procedure = gimp_procedure_new (get_theme_dir_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-theme-dir");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-theme-dir",
+                                     "Get the directory of the current GUI theme.",
+                                     "Returns a copy of the current GUI theme dir.\n"
+                                     "\n"
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     "NONE");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("theme-dir",
+                                                           "theme dir",
+                                                           "The GUI theme dir",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-icon-theme-dir
+   */
+  procedure = gimp_procedure_new (get_icon_theme_dir_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-icon-theme-dir");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-icon-theme-dir",
+                                     "Get the directory of the current icon theme.",
+                                     "Returns a copy of the current icon theme dir.\n"
+                                     "\n"
+                                     "Deprecated: There is no replacement for this procedure.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     "NONE");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("icon-theme-dir",
+                                                           "icon theme dir",
+                                                           "The icon theme dir",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-color-configuration
+   */
+  procedure = gimp_procedure_new (get_color_configuration_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-color-configuration");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-color-configuration",
+                                     "Get a serialized version of the color management configuration.",
+                                     "Returns a string that can be deserialized into a GimpColorConfig object representing the current color management configuration.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("config",
+                                                           "config",
+                                                           "Serialized color management configuration",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-module-load-inhibit
+   */
+  procedure = gimp_procedure_new (get_module_load_inhibit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-module-load-inhibit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-module-load-inhibit",
+                                     "Get the list of modules which should not be loaded.",
+                                     "Returns a copy of the list of modules which should not be loaded.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("load-inhibit",
+                                                           "load inhibit",
+                                                           "The list of modules",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/gradient-cmds.c b/app/pdb/gradient-cmds.c
new file mode 100644
index 0000000..27434b3
--- /dev/null
+++ b/app/pdb/gradient-cmds.c
@@ -0,0 +1,2658 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpGradient *
+gradient_get (Gimp                 *gimp,
+              const gchar          *name,
+              GimpPDBDataAccess     access,
+              gint                  segment,
+              GimpGradientSegment **seg,
+              GError              **error)
+{
+  GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, access, error);
+
+  *seg = NULL;
+
+  if (gradient)
+    *seg = gimp_gradient_segment_get_nth (gradient->segments, segment);
+
+  return gradient;
+}
+
+static GimpGradient *
+gradient_get_range (Gimp                 *gimp,
+                    const gchar          *name,
+                    gint                  start_segment,
+                    gint                  end_segment,
+                    GimpGradientSegment **start_seg,
+                    GimpGradientSegment **end_seg,
+                    GError              **error)
+{
+  GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+  *start_seg = NULL;
+  *end_seg   = NULL;
+
+  if (end_segment >= 0 && end_segment < start_segment)
+    return NULL;
+
+  if (gradient)
+    {
+      *start_seg = gimp_gradient_segment_get_nth (gradient->segments,
+                                                  start_segment);
+
+      if (*start_seg && end_segment >= 0)
+        *end_seg = gimp_gradient_segment_get_nth (*start_seg,
+                                                  end_segment -
+                                                  start_segment);
+    }
+
+  return gradient;
+}
+
+static GimpValueArray *
+gradient_new_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *actual_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpData *data = gimp_data_factory_data_new (gimp->gradient_factory,
+                                                   context, name);
+
+      if (data)
+        actual_name = g_strdup (gimp_object_get_name (data));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_duplicate_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *copy_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (gradient)
+        {
+          GimpGradient *gradient_copy = (GimpGradient *)
+            gimp_data_factory_data_duplicate (gimp->gradient_factory,
+                                              GIMP_DATA (gradient));
+
+          if (gradient_copy)
+            copy_name = g_strdup (gimp_object_get_name (gradient_copy));
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), copy_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_is_editable_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gboolean editable = FALSE;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (gradient)
+        editable = gimp_data_is_writable (GIMP_DATA (gradient));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), editable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_rename_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  const gchar *new_name;
+  gchar *actual_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  new_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_RENAME, error);
+
+      if (gradient)
+        {
+          gimp_object_set_name (GIMP_OBJECT (gradient), new_name);
+          actual_name = g_strdup (gimp_object_get_name (gradient));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_delete_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (gradient && gimp_data_is_deletable (GIMP_DATA (gradient)))
+        success = gimp_data_factory_data_delete (gimp->gradient_factory,
+                                                 GIMP_DATA (gradient),
+                                                 TRUE, error);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_get_number_of_segments_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 num_segments = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gimp_pdb_get_gradient (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (gradient)
+        {
+          for (seg = gradient->segments; seg; seg = seg->next)
+            num_segments++;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), num_segments);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_get_uniform_samples_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 num_samples;
+  gboolean reverse;
+  gint32 num_color_samples = 0;
+  gdouble *color_samples = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  num_samples = g_value_get_int (gimp_value_array_index (args, 1));
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name,
+                                                      GIMP_PDB_DATA_ACCESS_READ,
+                                                      error);
+
+      if (gradient)
+        {
+          GimpGradientSegment *seg   = NULL;
+          gdouble              pos   = 0.0;
+          gdouble              delta = 1.0 / (num_samples - 1);
+          gdouble             *sample;
+
+          num_color_samples = num_samples * 4;
+
+          sample = color_samples = g_new (gdouble, num_color_samples);
+
+          while (num_samples--)
+            {
+              GimpRGB color;
+
+              seg = gimp_gradient_get_color_at (gradient, context, seg,
+                                                pos, reverse,
+                                                GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                &color);
+
+              *sample++ = color.r;
+              *sample++ = color.g;
+              *sample++ = color.b;
+              *sample++ = color.a;
+
+              pos += delta;
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_color_samples);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), color_samples, num_color_samples);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_get_custom_samples_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 num_samples;
+  const gdouble *positions;
+  gboolean reverse;
+  gint32 num_color_samples = 0;
+  gdouble *color_samples = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  num_samples = g_value_get_int (gimp_value_array_index (args, 1));
+  positions = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient *gradient = gimp_pdb_get_gradient (gimp, name,
+                                                      GIMP_PDB_DATA_ACCESS_READ,
+                                                      error);
+
+      if (gradient)
+        {
+          GimpGradientSegment *seg = NULL;
+          gdouble             *sample;
+
+          num_color_samples = num_samples * 4;
+
+          sample = color_samples = g_new (gdouble, num_color_samples);
+
+          while (num_samples--)
+            {
+              GimpRGB color;
+
+              seg = gimp_gradient_get_color_at (gradient, context,
+                                                seg, *positions,
+                                                reverse,
+                                                GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                &color);
+
+              *sample++ = color.r;
+              *sample++ = color.g;
+              *sample++ = color.b;
+              *sample++ = color.a;
+
+              positions++;
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_color_samples);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), color_samples, num_color_samples);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_get_left_color_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+  gdouble opacity = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          gimp_gradient_segment_get_left_color (gradient, seg, &color);
+          opacity = color.a * 100.0;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &color);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), opacity);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_set_left_color_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 segment;
+  GimpRGB color;
+  gdouble opacity;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+  gimp_value_get_rgb (gimp_value_array_index (args, 2), &color);
+  opacity = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          color.a = opacity / 100.0;
+          gimp_gradient_segment_set_left_color (gradient, seg, &color);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_get_right_color_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+  gdouble opacity = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          gimp_gradient_segment_get_right_color (gradient, seg, &color);
+          opacity = color.a * 100.0;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &color);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), opacity);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_set_right_color_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 segment;
+  GimpRGB color;
+  gdouble opacity;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+  gimp_value_get_rgb (gimp_value_array_index (args, 2), &color);
+  opacity = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          color.a = opacity / 100.0;
+          gimp_gradient_segment_set_right_color (gradient, seg, &color);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_get_left_pos_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gdouble pos = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          pos = gimp_gradient_segment_get_left_pos (gradient, seg);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), pos);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_set_left_pos_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gdouble pos;
+  gdouble final_pos = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+  pos = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          final_pos = gimp_gradient_segment_set_left_pos (gradient, seg, pos);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), final_pos);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_get_middle_pos_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gdouble pos = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          pos = gimp_gradient_segment_get_middle_pos (gradient, seg);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), pos);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_set_middle_pos_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gdouble pos;
+  gdouble final_pos = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+  pos = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          final_pos =
+            gimp_gradient_segment_set_middle_pos (gradient, seg, pos);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), final_pos);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_get_right_pos_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gdouble pos = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          pos = gimp_gradient_segment_get_right_pos (gradient, seg);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), pos);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_set_right_pos_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gdouble pos;
+  gdouble final_pos = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+  pos = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          final_pos =
+            gimp_gradient_segment_set_right_pos (gradient, seg, pos);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), final_pos);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_get_blending_function_invoker (GimpProcedure         *procedure,
+                                                Gimp                  *gimp,
+                                                GimpContext           *context,
+                                                GimpProgress          *progress,
+                                                const GimpValueArray  *args,
+                                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gint32 blend_func = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          blend_func = gimp_gradient_segment_get_blending_function (gradient, seg);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), blend_func);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_get_coloring_type_invoker (GimpProcedure         *procedure,
+                                            Gimp                  *gimp,
+                                            GimpContext           *context,
+                                            GimpProgress          *progress,
+                                            const GimpValueArray  *args,
+                                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 segment;
+  gint32 coloring_type = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  segment = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg;
+
+      gradient = gradient_get (gimp, name, GIMP_PDB_DATA_ACCESS_READ, segment,
+                               &seg, error);
+
+      if (seg)
+        {
+          coloring_type = gimp_gradient_segment_get_coloring_type (gradient, seg);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), coloring_type);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradient_segment_range_set_blending_function_invoker (GimpProcedure         *procedure,
+                                                      Gimp                  *gimp,
+                                                      GimpContext           *context,
+                                                      GimpProgress          *progress,
+                                                      const GimpValueArray  *args,
+                                                      GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+  gint32 blending_function;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+  blending_function = g_value_get_enum (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_set_blending_function (gradient,
+                                                             start_seg, end_seg,
+                                                             blending_function);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_set_coloring_type_invoker (GimpProcedure         *procedure,
+                                                  Gimp                  *gimp,
+                                                  GimpContext           *context,
+                                                  GimpProgress          *progress,
+                                                  const GimpValueArray  *args,
+                                                  GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+  gint32 coloring_type;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+  coloring_type = g_value_get_enum (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_set_coloring_type (gradient,
+                                                         start_seg, end_seg,
+                                                         coloring_type);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_flip_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_flip (gradient,
+                                            start_seg, end_seg,
+                                            NULL, NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_replicate_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+  gint32 replicate_times;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+  replicate_times = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg && gimp_data_is_writable (GIMP_DATA (gradient)))
+        {
+          gimp_gradient_segment_range_replicate (gradient,
+                                                 start_seg, end_seg,
+                                                 replicate_times,
+                                                 NULL, NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_split_midpoint_invoker (GimpProcedure         *procedure,
+                                               Gimp                  *gimp,
+                                               GimpContext           *context,
+                                               GimpProgress          *progress,
+                                               const GimpValueArray  *args,
+                                               GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_split_midpoint (gradient, context,
+                                                      start_seg, end_seg,
+                                                      GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                      NULL, NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_split_uniform_invoker (GimpProcedure         *procedure,
+                                              Gimp                  *gimp,
+                                              GimpContext           *context,
+                                              GimpProgress          *progress,
+                                              const GimpValueArray  *args,
+                                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+  gint32 split_parts;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+  split_parts = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_split_uniform (gradient, context,
+                                                     start_seg, end_seg,
+                                                     split_parts,
+                                                     GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                     NULL, NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_delete_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_delete (gradient,
+                                              start_seg, end_seg,
+                                              NULL, NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_redistribute_handles_invoker (GimpProcedure         *procedure,
+                                                     Gimp                  *gimp,
+                                                     GimpContext           *context,
+                                                     GimpProgress          *progress,
+                                                     const GimpValueArray  *args,
+                                                     GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          gimp_gradient_segment_range_redistribute_handles (gradient,
+                                                            start_seg, end_seg);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_blend_colors_invoker (GimpProcedure         *procedure,
+                                             Gimp                  *gimp,
+                                             GimpContext           *context,
+                                             GimpProgress          *progress,
+                                             const GimpValueArray  *args,
+                                             GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          if (!end_seg)
+            end_seg = gimp_gradient_segment_get_last (start_seg);
+
+          gimp_gradient_segment_range_blend (gradient,
+                                             start_seg, end_seg,
+                                             &start_seg->left_color,
+                                             &end_seg->right_color,
+                                             TRUE, FALSE);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_blend_opacity_invoker (GimpProcedure         *procedure,
+                                              Gimp                  *gimp,
+                                              GimpContext           *context,
+                                              GimpProgress          *progress,
+                                              const GimpValueArray  *args,
+                                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          if (!end_seg)
+            end_seg = gimp_gradient_segment_get_last (start_seg);
+
+          gimp_gradient_segment_range_blend (gradient,
+                                             start_seg, end_seg,
+                                             &start_seg->left_color,
+                                             &end_seg->right_color,
+                                             FALSE, TRUE);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradient_segment_range_move_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 start_segment;
+  gint32 end_segment;
+  gdouble delta;
+  gboolean control_compress;
+  gdouble final_delta = 0.0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  start_segment = g_value_get_int (gimp_value_array_index (args, 1));
+  end_segment = g_value_get_int (gimp_value_array_index (args, 2));
+  delta = g_value_get_double (gimp_value_array_index (args, 3));
+  control_compress = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *start_seg;
+      GimpGradientSegment *end_seg;
+
+      gradient = gradient_get_range (gimp, name, start_segment, end_segment,
+                                     &start_seg, &end_seg, error);
+
+      if (start_seg)
+        {
+          final_delta = gimp_gradient_segment_range_move (gradient,
+                                                          start_seg, end_seg,
+                                                          delta,
+                                                          control_compress);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), final_delta);
+
+  return return_vals;
+}
+
+void
+register_gradient_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-gradient-new
+   */
+  procedure = gimp_procedure_new (gradient_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-new",
+                                     "Creates a new gradient",
+                                     "This procedure creates a new, uninitialized gradient",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The requested name of the new gradient",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The actual new gradient name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-duplicate
+   */
+  procedure = gimp_procedure_new (gradient_duplicate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-duplicate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-duplicate",
+                                     "Duplicates a gradient",
+                                     "This procedure creates an identical gradient by a different name",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("copy-name",
+                                                           "copy name",
+                                                           "The name of the gradient's copy",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-is-editable
+   */
+  procedure = gimp_procedure_new (gradient_is_editable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-is-editable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-is-editable",
+                                     "Tests if gradient can be edited",
+                                     "Returns TRUE if you have permission to change the gradient",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("editable",
+                                                         "editable",
+                                                         "TRUE if the gradient can be edited",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-rename
+   */
+  procedure = gimp_procedure_new (gradient_rename_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-rename");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-rename",
+                                     "Rename a gradient",
+                                     "This procedure renames a gradient",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("new-name",
+                                                       "new name",
+                                                       "The new name of the gradient",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The actual new name of the gradient",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-delete
+   */
+  procedure = gimp_procedure_new (gradient_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-delete",
+                                     "Deletes a gradient",
+                                     "This procedure deletes a gradient",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-get-number-of-segments
+   */
+  procedure = gimp_procedure_new (gradient_get_number_of_segments_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-get-number-of-segments");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-get-number-of-segments",
+                                     "Returns the number of segments of the specified gradient",
+                                     "This procedure returns the number of segments of the specified gradient.",
+                                     "Lars-Peter Clausen <lars@metafoo.de>",
+                                     "Lars-Peter Clausen",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-segments",
+                                                          "num segments",
+                                                          "Number of segments",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-get-uniform-samples
+   */
+  procedure = gimp_procedure_new (gradient_get_uniform_samples_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-get-uniform-samples");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-get-uniform-samples",
+                                     "Sample the specified in uniform parts.",
+                                     "This procedure samples the active gradient in the specified number of uniform parts. It returns a list of floating-point values which correspond to the RGBA values for each sample. The minimum number of samples to take is 2, in which case the returned colors will correspond to the { 0.0, 1.0 } positions in the gradient. For example, if the number of samples is 3, the procedure will return the colors at positions { 0.0, 0.5, 1.0 }.",
+                                     "Federico Mena Quintero",
+                                     "Federico Mena Quintero",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-samples",
+                                                      "num samples",
+                                                      "The number of samples to take",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Use the reverse gradient",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-color-samples",
+                                                          "num color samples",
+                                                          "Length of the color_samples array (4 * num_samples)",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("color-samples",
+                                                                "color samples",
+                                                                "Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-get-custom-samples
+   */
+  procedure = gimp_procedure_new (gradient_get_custom_samples_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-get-custom-samples");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-get-custom-samples",
+                                     "Sample the specified gradient in custom positions.",
+                                     "This procedure samples the active gradient in the specified number of points. The procedure will sample the gradient in the specified positions from the list. The left endpoint of the gradient corresponds to position 0.0, and the right endpoint corresponds to 1.0. The procedure returns a list of floating-point values which correspond to the RGBA values for each sample.",
+                                     "Federico Mena Quintero",
+                                     "Federico Mena Quintero",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-samples",
+                                                      "num samples",
+                                                      "The number of samples to take",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("positions",
+                                                            "positions",
+                                                            "The list of positions to sample along the gradient",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Use the reverse gradient",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-color-samples",
+                                                          "num color samples",
+                                                          "Length of the color_samples array (4 * num_samples)",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("color-samples",
+                                                                "color samples",
+                                                                "Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-left-color
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_left_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-left-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-left-color",
+                                     "Retrieves the left endpoint color of the specified segment",
+                                     "This procedure retrieves the left endpoint color of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The return color",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("opacity",
+                                                        "opacity",
+                                                        "The opacity of the endpoint",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-set-left-color
+   */
+  procedure = gimp_procedure_new (gradient_segment_set_left_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-set-left-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-set-left-color",
+                                     "Sets the left endpoint color of the specified segment",
+                                     "This procedure sets the left endpoint color of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The color to set",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The opacity to set for the endpoint",
+                                                    0, 100.0, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-right-color
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_right_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-right-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-right-color",
+                                     "Retrieves the right endpoint color of the specified segment",
+                                     "This procedure retrieves the right endpoint color of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The return color",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("opacity",
+                                                        "opacity",
+                                                        "The opacity of the endpoint",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-set-right-color
+   */
+  procedure = gimp_procedure_new (gradient_segment_set_right_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-set-right-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-set-right-color",
+                                     "Sets the right endpoint color of the specified segment",
+                                     "This procedure sets the right endpoint color of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The color to set",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The opacity to set for the endpoint",
+                                                    0, 100.0, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-left-pos
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_left_pos_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-left-pos");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-left-pos",
+                                     "Retrieves the left endpoint position of the specified segment",
+                                     "This procedure retrieves the left endpoint position of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("pos",
+                                                        "pos",
+                                                        "The return position",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-set-left-pos
+   */
+  procedure = gimp_procedure_new (gradient_segment_set_left_pos_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-set-left-pos");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-set-left-pos",
+                                     "Sets the left endpoint position of the specified segment",
+                                     "This procedure sets the left endpoint position of the specified segment of the specified gradient. The final position will be between the position of the middle point to the left to the middle point of the current segment.\n"
+                                     "This procedure returns the final position.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pos",
+                                                    "pos",
+                                                    "The position to set the guidepoint to",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("final-pos",
+                                                        "final pos",
+                                                        "The return position",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-middle-pos
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_middle_pos_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-middle-pos");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-middle-pos",
+                                     "Retrieves the middle point position of the specified segment",
+                                     "This procedure retrieves the middle point position of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("pos",
+                                                        "pos",
+                                                        "The return position",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-set-middle-pos
+   */
+  procedure = gimp_procedure_new (gradient_segment_set_middle_pos_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-set-middle-pos");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-set-middle-pos",
+                                     "Sets the middle point position of the specified segment",
+                                     "This procedure sets the middle point position of the specified segment of the specified gradient. The final position will be between the two endpoints of the segment.\n"
+                                     "This procedure returns the final position.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pos",
+                                                    "pos",
+                                                    "The position to set the guidepoint to",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("final-pos",
+                                                        "final pos",
+                                                        "The return position",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-right-pos
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_right_pos_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-right-pos");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-right-pos",
+                                     "Retrieves the right endpoint position of the specified segment",
+                                     "This procedure retrieves the right endpoint position of the specified segment of the specified gradient.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("pos",
+                                                        "pos",
+                                                        "The return position",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-set-right-pos
+   */
+  procedure = gimp_procedure_new (gradient_segment_set_right_pos_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-set-right-pos");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-set-right-pos",
+                                     "Sets the right endpoint position of the specified segment",
+                                     "This procedure sets the right endpoint position of the specified segment of the specified gradient. The final position will be between the position of the middle point of the current segment and the middle point of the segment to the right.\n"
+                                     "This procedure returns the final position.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pos",
+                                                    "pos",
+                                                    "The position to set the guidepoint to",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("final-pos",
+                                                        "final pos",
+                                                        "The return position",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-blending-function
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_blending_function_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-blending-function");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-blending-function",
+                                     "Retrieves the gradient segment's blending function",
+                                     "This procedure retrieves the blending function of the segment at the specified gradient name and segment index.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("blend-func",
+                                                      "blend func",
+                                                      "The blending function of the segment",
+                                                      GIMP_TYPE_GRADIENT_SEGMENT_TYPE,
+                                                      GIMP_GRADIENT_SEGMENT_LINEAR,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-get-coloring-type
+   */
+  procedure = gimp_procedure_new (gradient_segment_get_coloring_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-get-coloring-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-get-coloring-type",
+                                     "Retrieves the gradient segment's coloring type",
+                                     "This procedure retrieves the coloring type of the segment at the specified gradient name and segment index.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("segment",
+                                                      "segment",
+                                                      "The index of the segment within the gradient",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("coloring-type",
+                                                      "coloring type",
+                                                      "The coloring type of the segment",
+                                                      GIMP_TYPE_GRADIENT_SEGMENT_COLOR,
+                                                      GIMP_GRADIENT_SEGMENT_RGB,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-set-blending-function
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_set_blending_function_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-set-blending-function");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-set-blending-function",
+                                     "Change the blending function of a segments range",
+                                     "This function changes the blending function of a segment range to the specified blending function.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("blending-function",
+                                                  "blending function",
+                                                  "The blending function",
+                                                  GIMP_TYPE_GRADIENT_SEGMENT_TYPE,
+                                                  GIMP_GRADIENT_SEGMENT_LINEAR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-set-coloring-type
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_set_coloring_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-set-coloring-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-set-coloring-type",
+                                     "Change the coloring type of a segments range",
+                                     "This function changes the coloring type of a segment range to the specified coloring type.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("coloring-type",
+                                                  "coloring type",
+                                                  "The coloring type",
+                                                  GIMP_TYPE_GRADIENT_SEGMENT_COLOR,
+                                                  GIMP_GRADIENT_SEGMENT_RGB,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-flip
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_flip_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-flip");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-flip",
+                                     "Flip the segment range",
+                                     "This function flips a segment range.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-replicate
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_replicate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-replicate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-replicate",
+                                     "Replicate the segment range",
+                                     "This function replicates a segment range a given number of times. Instead of the original segment range, several smaller scaled copies of it will appear in equal widths.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("replicate-times",
+                                                      "replicate times",
+                                                      "The number of times to replicate",
+                                                      2, 20, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-split-midpoint
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_split_midpoint_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-split-midpoint");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-split-midpoint",
+                                     "Splits each segment in the segment range at midpoint",
+                                     "This function splits each segment in the segment range at its midpoint.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-split-uniform
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_split_uniform_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-split-uniform");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-split-uniform",
+                                     "Splits each segment in the segment range uniformly",
+                                     "This function splits each segment in the segment range uniformly according to the number of times specified by the parameter.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("split-parts",
+                                                      "split parts",
+                                                      "The number of uniform divisions to split each segment to",
+                                                      2, 1024, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-delete
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-delete",
+                                     "Delete the segment range",
+                                     "This function deletes a segment range.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-redistribute-handles
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_redistribute_handles_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-redistribute-handles");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-redistribute-handles",
+                                     "Uniformly redistribute the segment range's handles",
+                                     "This function redistributes the handles of the specified segment range of the specified gradient, so they'll be evenly spaced.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-blend-colors
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_blend_colors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-blend-colors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-blend-colors",
+                                     "Blend the colors of the segment range.",
+                                     "This function blends the colors (but not the opacity) of the segments' range of the gradient. Using it, the colors' transition will be uniform across the range.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-blend-opacity
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_blend_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-blend-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-blend-opacity",
+                                     "Blend the opacity of the segment range.",
+                                     "This function blends the opacity (but not the colors) of the segments' range of the gradient. Using it, the opacity's transition will be uniform across the range.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradient-segment-range-move
+   */
+  procedure = gimp_procedure_new (gradient_segment_range_move_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradient-segment-range-move");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradient-segment-range-move",
+                                     "Move the position of an entire segment range by a delta.",
+                                     "This function moves the position of an entire segment range by a delta. The actual delta (which is returned) will be limited by the control points of the neighboring segments.",
+                                     "Shlomi Fish <shlomif@iglu.org.il>",
+                                     "Shlomi Fish",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("start-segment",
+                                                      "start segment",
+                                                      "The index of the first segment to operate on",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("end-segment",
+                                                      "end segment",
+                                                      "The index of the last segment to operate on. If negative, the selection will extend to the end of the string.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("delta",
+                                                    "delta",
+                                                    "The delta to move the segment range",
+                                                    -1.0, 1.0, -1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("control-compress",
+                                                     "control compress",
+                                                     "Whether or not to compress the neighboring segments",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("final-delta",
+                                                        "final delta",
+                                                        "The final delta by which the range moved",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/gradient-select-cmds.c b/app/pdb/gradient-select-cmds.c
new file mode 100644
index 0000000..2539447
--- /dev/null
+++ b/app/pdb/gradient-select-cmds.c
@@ -0,0 +1,236 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+gradients_popup_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *gradient_callback;
+  const gchar *popup_title;
+  const gchar *initial_gradient;
+  gint32 sample_size;
+
+  gradient_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  popup_title = g_value_get_string (gimp_value_array_index (args, 1));
+  initial_gradient = g_value_get_string (gimp_value_array_index (args, 2));
+  sample_size = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (sample_size < 1 || sample_size > 10000)
+        sample_size = GIMP_GRADIENT_DEFAULT_SAMPLE_SIZE;
+
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
+          ! gimp_pdb_dialog_new (gimp, context, progress,
+                                 gimp_data_factory_get_container (gimp->gradient_factory),
+                                 popup_title, gradient_callback, initial_gradient,
+                                 "sample-size", sample_size,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradients_close_popup_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *gradient_callback;
+
+  gradient_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
+          ! gimp_pdb_dialog_close (gimp, gimp_data_factory_get_container (gimp->gradient_factory),
+                                   gradient_callback))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+gradients_set_popup_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *gradient_callback;
+  const gchar *gradient_name;
+
+  gradient_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  gradient_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
+          ! gimp_pdb_dialog_set (gimp, gimp_data_factory_get_container (gimp->gradient_factory),
+                                 gradient_callback, gradient_name,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_gradient_select_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-gradients-popup
+   */
+  procedure = gimp_procedure_new (gradients_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-popup",
+                                     "Invokes the Gimp gradients selection.",
+                                     "This procedure opens the gradient selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("gradient-callback",
+                                                       "gradient callback",
+                                                       "The callback PDB proc to call when gradient selection is made",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("popup-title",
+                                                       "popup title",
+                                                       "Title of the gradient selection dialog",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("initial-gradient",
+                                                       "initial gradient",
+                                                       "The name of the gradient to set as the first selected",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("sample-size",
+                                                      "sample size",
+                                                      "Size of the sample to return when the gradient is changed",
+                                                      1, 10000, 1,
+                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradients-close-popup
+   */
+  procedure = gimp_procedure_new (gradients_close_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-close-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-close-popup",
+                                     "Close the gradient selection dialog.",
+                                     "This procedure closes an opened gradient selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("gradient-callback",
+                                                       "gradient callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradients-set-popup
+   */
+  procedure = gimp_procedure_new (gradients_set_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-set-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-set-popup",
+                                     "Sets the current gradient in a gradient selection dialog.",
+                                     "Sets the current gradient in a gradient selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("gradient-callback",
+                                                       "gradient callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("gradient-name",
+                                                       "gradient name",
+                                                       "The name of the gradient to set as selected",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/gradients-cmds.c b/app/pdb/gradients-cmds.c
new file mode 100644
index 0000000..954c473
--- /dev/null
+++ b/app/pdb/gradients-cmds.c
@@ -0,0 +1,492 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+gradients_refresh_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gimp_data_factory_data_refresh (gimp->gradient_factory, context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+gradients_get_list_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_gradients = 0;
+  gchar **gradient_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gradient_list = gimp_container_get_filtered_name_array (gimp_data_factory_get_container (gimp->gradient_factory),
+                                                              filter, &num_gradients);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_gradients);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), gradient_list, num_gradients);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradients_sample_uniform_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 num_samples;
+  gboolean reverse;
+  gint32 array_length = 0;
+  gdouble *color_samples = NULL;
+
+  num_samples = g_value_get_int (gimp_value_array_index (args, 0));
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg = NULL;
+      gdouble              pos, delta;
+      GimpRGB              color;
+      gdouble             *pv;
+
+      pos   = 0.0;
+      delta = 1.0 / (num_samples - 1);
+
+      array_length = num_samples * 4;
+
+      pv = color_samples = g_new (gdouble, array_length);
+
+      gradient = gimp_context_get_gradient (context);
+
+      while (num_samples--)
+        {
+          seg = gimp_gradient_get_color_at (gradient, context, seg,
+                                            pos, reverse,
+                                            GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                            &color);
+
+          *pv++ = color.r;
+          *pv++ = color.g;
+          *pv++ = color.b;
+          *pv++ = color.a;
+
+          pos += delta;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), array_length);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), color_samples, array_length);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradients_sample_custom_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 num_samples;
+  const gdouble *positions;
+  gboolean reverse;
+  gint32 array_length = 0;
+  gdouble *color_samples = NULL;
+
+  num_samples = g_value_get_int (gimp_value_array_index (args, 0));
+  positions = gimp_value_get_floatarray (gimp_value_array_index (args, 1));
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient        *gradient;
+      GimpGradientSegment *seg = NULL;
+      GimpRGB              color;
+      gdouble             *pv;
+
+      array_length = num_samples * 4;
+
+      pv = color_samples = g_new (gdouble, array_length);
+
+      gradient = gimp_context_get_gradient (context);
+
+      while (num_samples--)
+        {
+          seg = gimp_gradient_get_color_at (gradient, context, seg,
+                                            *positions, reverse,
+                                            GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                            &color);
+
+          *pv++ = color.r;
+          *pv++ = color.g;
+          *pv++ = color.b;
+          *pv++ = color.a;
+
+          positions++;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), array_length);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), color_samples, array_length);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+gradients_get_gradient_data_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 sample_size;
+  gboolean reverse;
+  gchar *actual_name = NULL;
+  gint32 width = 0;
+  gdouble *grad_data = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  sample_size = g_value_get_int (gimp_value_array_index (args, 1));
+  reverse = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGradient *gradient;
+
+      if (sample_size < 1 || sample_size > 10000)
+        sample_size = GIMP_GRADIENT_DEFAULT_SAMPLE_SIZE;
+
+      if (name && strlen (name))
+        gradient = gimp_pdb_get_gradient (gimp, name, FALSE, error);
+      else
+        gradient = gimp_context_get_gradient (context);
+
+      if (gradient)
+        {
+          GimpGradientSegment *seg = NULL;
+          gdouble             *pv;
+          gdouble              pos, delta;
+          GimpRGB              color;
+
+          pos   = 0.0;
+          delta = 1.0 / (sample_size - 1);
+
+          actual_name = g_strdup (gimp_object_get_name (gradient));
+          grad_data   = g_new (gdouble, sample_size * 4);
+          width       = sample_size * 4;
+
+          pv = grad_data;
+
+          while (sample_size--)
+            {
+              seg = gimp_gradient_get_color_at (gradient, context, seg,
+                                                pos, reverse,
+                                                GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                                &color);
+
+              *pv++ = color.r;
+              *pv++ = color.g;
+              *pv++ = color.b;
+              *pv++ = color.a;
+
+              pos += delta;
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 3), grad_data, width);
+    }
+
+  return return_vals;
+}
+
+void
+register_gradients_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-gradients-refresh
+   */
+  procedure = gimp_procedure_new (gradients_refresh_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-refresh");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-refresh",
+                                     "Refresh current gradients. This function always succeeds.",
+                                     "This procedure retrieves all gradients currently in the user's gradient path and updates the gradient dialogs accordingly.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2002",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradients-get-list
+   */
+  procedure = gimp_procedure_new (gradients_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-get-list",
+                                     "Retrieve the list of loaded gradients.",
+                                     "This procedure returns a list of the gradients that are currently loaded. You can later use the 'gimp-context-set-gradient' function to set the active gradient.",
+                                     "Federico Mena Quintero",
+                                     "Federico Mena Quintero",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-gradients",
+                                                          "num gradients",
+                                                          "The number of loaded gradients",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("gradient-list",
+                                                                 "gradient list",
+                                                                 "The list of gradient names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradients-sample-uniform
+   */
+  procedure = gimp_procedure_new (gradients_sample_uniform_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-sample-uniform");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-sample-uniform",
+                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
+                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-gradient-get-uniform-samples");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-samples",
+                                                      "num samples",
+                                                      "The number of samples to take",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Use the reverse gradient",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("array-length",
+                                                          "array length",
+                                                          "Length of the color_samples array (4 * num_samples)",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("color-samples",
+                                                                "color samples",
+                                                                "Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradients-sample-custom
+   */
+  procedure = gimp_procedure_new (gradients_sample_custom_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-sample-custom");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-sample-custom",
+                                     "Deprecated: Use 'gimp-gradient-get-custom-samples' instead.",
+                                     "Deprecated: Use 'gimp-gradient-get-custom-samples' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-gradient-get-custom-samples");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-samples",
+                                                      "num samples",
+                                                      "The number of samples to take",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("positions",
+                                                            "positions",
+                                                            "The list of positions to sample along the gradient",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Use the reverse gradient",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("array-length",
+                                                          "array length",
+                                                          "Length of the color_samples array (4 * num_samples)",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("color-samples",
+                                                                "color samples",
+                                                                "Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-gradients-get-gradient-data
+   */
+  procedure = gimp_procedure_new (gradients_get_gradient_data_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-gradients-get-gradient-data");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-gradients-get-gradient-data",
+                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
+                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-gradient-get-uniform-samples");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The gradient name (\"\" means current active gradient)",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("sample-size",
+                                                      "sample size",
+                                                      "Size of the sample to return when the gradient is changed",
+                                                      1, 10000, 1,
+                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reverse",
+                                                     "reverse",
+                                                     "Use the reverse gradient",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The gradient name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The gradient sample width (r,g,b,a)",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("grad-data",
+                                                                "grad data",
+                                                                "The gradient sample data",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/help-cmds.c b/app/pdb/help-cmds.c
new file mode 100644
index 0000000..66aa825
--- /dev/null
+++ b/app/pdb/help-cmds.c
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager-help-domain.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+help_invoker (GimpProcedure         *procedure,
+              Gimp                  *gimp,
+              GimpContext           *context,
+              GimpProgress          *progress,
+              const GimpValueArray  *args,
+              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *help_domain;
+  const gchar *help_id;
+
+  help_domain = g_value_get_string (gimp_value_array_index (args, 0));
+  help_id = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPlugInManager *manager = gimp->plug_in_manager;
+
+      if (! help_domain && manager->current_plug_in)
+        help_domain = (gchar *)
+          gimp_plug_in_manager_get_help_domain (manager,
+                                                manager->current_plug_in->file,
+                                                NULL);
+
+      gimp_help (gimp, progress, help_domain, help_id);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_help_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-help
+   */
+  procedure = gimp_procedure_new (help_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-help");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-help",
+                                     "Load a help page.",
+                                     "This procedure loads the specified help page into the helpbrowser or what ever is configured as help viewer. The help page is identified by its domain and ID: if help_domain is NULL, we use the help_domain which was registered using the 'gimp-plugin-help-register' procedure. If help_domain is NULL and no help domain was registered, the help domain of the main GIMP installation is used.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2000",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("help-domain",
+                                                       "help domain",
+                                                       "The help domain in which help_id is registered",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("help-id",
+                                                       "help id",
+                                                       "The help page's ID",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
new file mode 100644
index 0000000..56806dd
--- /dev/null
+++ b/app/pdb/image-cmds.c
@@ -0,0 +1,5894 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpimage-colormap.h"
+#include "core/gimpimage-duplicate.h"
+#include "core/gimpimage-merge.h"
+#include "core/gimpimage-metadata.h"
+#include "core/gimpimage-pick-color.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppickable.h"
+#include "core/gimpprogress.h"
+#include "core/gimpselection.h"
+#include "core/gimptempbuf.h"
+#include "file/file-utils.h"
+#include "gegl/gimp-babl.h"
+#include "plug-in/gimpplugin-cleanup.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+#if defined (HAVE_ISFINITE)
+#define FINITE(x) isfinite(x)
+#elif defined (HAVE_FINITE)
+#define FINITE(x) finite(x)
+#elif defined (G_OS_WIN32)
+#define FINITE(x) _finite(x)
+#else
+#error "no FINITE() implementation available?!"
+#endif
+
+static GimpValueArray *
+image_is_valid_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean valid = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  valid = GIMP_IS_IMAGE (image);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), valid);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_list_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 num_images = 0;
+  gint32 *image_ids = NULL;
+
+  GList *list = gimp_get_image_iter (gimp);
+
+  num_images = g_list_length (list);
+
+  if (num_images)
+    {
+      gint i;
+
+      image_ids = g_new (gint32, num_images);
+
+      for (i = 0; i < num_images; i++, list = g_list_next (list))
+        image_ids[i] = gimp_image_get_ID (GIMP_IMAGE (list->data));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_images);
+  gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), image_ids, num_images);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_new_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 width;
+  gint32 height;
+  gint32 type;
+  GimpImage *image = NULL;
+
+  width = g_value_get_int (gimp_value_array_index (args, 0));
+  height = g_value_get_int (gimp_value_array_index (args, 1));
+  type = g_value_get_enum (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      image = gimp_create_image (gimp, width, height, type,
+                                 GIMP_PRECISION_U8_GAMMA, FALSE);
+
+      if (! image)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_new_with_precision_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 width;
+  gint32 height;
+  gint32 type;
+  gint32 precision;
+  GimpImage *image = NULL;
+
+  width = g_value_get_int (gimp_value_array_index (args, 0));
+  height = g_value_get_int (gimp_value_array_index (args, 1));
+  type = g_value_get_enum (gimp_value_array_index (args, 2));
+  precision = g_value_get_enum (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp->plug_in_manager->current_plug_in)
+        gimp_plug_in_enable_precision (gimp->plug_in_manager->current_plug_in);
+
+      if (gimp_babl_is_valid (type, precision))
+        {
+          image = gimp_create_image (gimp, width, height, type,
+                                     precision, FALSE);
+          if (! image)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_duplicate_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpImage *new_image = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      new_image = gimp_image_duplicate (image);
+
+      if (! new_image)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), new_image);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_delete_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_image_get_display_count (image) == 0)
+        g_object_unref (image);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_base_type_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 base_type = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      base_type = gimp_image_get_base_type (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), base_type);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_precision_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 precision = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp->plug_in_manager->current_plug_in)
+        gimp_plug_in_enable_precision (gimp->plug_in_manager->current_plug_in);
+
+      precision = gimp_image_get_precision (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), precision);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_default_new_layer_mode_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 mode = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      mode = gimp_image_get_default_new_layer_mode (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), mode);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_width_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 width = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      width = gimp_image_get_width (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_height_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 height = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      height = gimp_image_get_height (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), height);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_free_shadow_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  if (success)
+    {
+    }
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_layers_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_layers = 0;
+  gint32 *layer_ids = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GList *list = gimp_image_get_layer_iter (image);
+
+      num_layers = g_list_length (list);
+
+      if (num_layers)
+        {
+          gint i;
+
+          layer_ids = g_new (gint32, num_layers);
+
+          for (i = 0; i < num_layers; i++, list = g_list_next (list))
+            layer_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_layers);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), layer_ids, num_layers);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_channels_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_channels = 0;
+  gint32 *channel_ids = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GList *list = gimp_image_get_channel_iter (image);
+
+      num_channels = g_list_length (list);
+
+      if (num_channels)
+        {
+          gint i;
+
+          channel_ids = g_new (gint32, num_channels);
+
+          for (i = 0; i < num_channels; i++, list = g_list_next (list))
+            channel_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_channels);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), channel_ids, num_channels);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_vectors_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_vectors = 0;
+  gint32 *vector_ids = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GList *list = gimp_image_get_vectors_iter (image);
+
+      num_vectors = g_list_length (list);
+
+      if (num_vectors)
+        {
+          gint i;
+
+          vector_ids = g_new (gint32, num_vectors);
+
+          for (i = 0; i < num_vectors; i++, list = g_list_next (list))
+            vector_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_vectors);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), vector_ids, num_vectors);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_active_drawable_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpDrawable *drawable = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      drawable = gimp_image_get_active_drawable (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_unset_active_channel_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_image_unset_active_channel (image);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_floating_sel_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *floating_sel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      floating_sel = gimp_image_get_floating_selection (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), floating_sel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_floating_sel_attached_to_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpDrawable *drawable = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
+
+      if (floating_sel)
+        drawable = gimp_layer_get_floating_sel_drawable (floating_sel);
+      else
+        drawable = NULL;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_pick_color_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpDrawable *drawable;
+  gdouble x;
+  gdouble y;
+  gboolean sample_merged;
+  gboolean sample_average;
+  gdouble average_radius;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 4));
+  sample_average = g_value_get_boolean (gimp_value_array_index (args, 5));
+  average_radius = g_value_get_double (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (!sample_merged)
+        if (!drawable || (gimp_item_get_image (GIMP_ITEM (drawable)) != image))
+          success = FALSE;
+
+      if (success && sample_average)
+        {
+          if (average_radius <= 0.0)
+            success = FALSE;
+        }
+
+      if (success)
+        {
+          if (sample_merged)
+            gimp_pickable_flush (GIMP_PICKABLE (image));
+          else
+            gimp_pickable_flush (GIMP_PICKABLE (drawable));
+
+          success = gimp_image_pick_color (image,
+                                           drawable,
+                                           (gint) x, (gint) y,
+                                           FALSE,
+                                           sample_merged,
+                                           sample_average,
+                                           average_radius,
+                                           NULL,
+                                           NULL,
+                                           &color);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &color);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_pick_correlate_layer_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 x;
+  gint32 y;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_int (gimp_value_array_index (args, 1));
+  y = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      layer = gimp_image_pick_layer (image, x, y, NULL);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_add_layer_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpLayer *layer;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (layer), image, error) &&
+          gimp_pdb_image_is_base_type (image,
+                                       gimp_drawable_get_base_type (GIMP_DRAWABLE (layer)),
+                                       error))
+        {
+          success = gimp_image_add_layer (image, layer,
+                                          NULL, MAX (position, -1), TRUE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_insert_layer_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpLayer *layer;
+  GimpLayer *parent;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+  parent = gimp_value_get_layer (gimp_value_array_index (args, 2), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (layer), image, error) &&
+          gimp_pdb_image_is_base_type (image,
+                                       gimp_drawable_get_base_type (GIMP_DRAWABLE (layer)),
+                                       error) &&
+          (parent == NULL ||
+           (gimp_pdb_item_is_in_tree (GIMP_ITEM (parent), image, 0, error) &&
+            gimp_pdb_item_is_group (GIMP_ITEM (parent), error))))
+        {
+          if (position == -1 && parent == NULL)
+            parent = GIMP_IMAGE_ACTIVE_PARENT;
+
+          success = gimp_image_add_layer (image, layer,
+                                          parent, MAX (position, -1), TRUE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_remove_layer_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpLayer *layer;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, 0, error))
+        gimp_image_remove_layer (image, layer, TRUE, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_freeze_layers_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn    *plug_in   = gimp->plug_in_manager->current_plug_in;
+      GimpContainer *container = gimp_image_get_layers (image);
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_layers_freeze (plug_in, image);
+
+      if (success)
+        gimp_container_freeze (container);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_thaw_layers_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn    *plug_in   = gimp->plug_in_manager->current_plug_in;
+      GimpContainer *container = gimp_image_get_layers (image);
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_layers_thaw (plug_in, image);
+
+      if (success)
+        success = gimp_container_frozen (container);
+
+      if (success)
+        gimp_container_thaw (container);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_add_channel_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpChannel *channel;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 1), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (channel), image, error))
+        {
+          success = gimp_image_add_channel (image, channel,
+                                            NULL, MAX (position, -1), TRUE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_insert_channel_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpChannel *channel;
+  GimpChannel *parent;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 1), gimp);
+  parent = gimp_value_get_channel (gimp_value_array_index (args, 2), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (channel), image, error) &&
+          (parent == NULL ||
+           (gimp_pdb_item_is_in_tree (GIMP_ITEM (parent), image, 0, error) &&
+            gimp_pdb_item_is_group (GIMP_ITEM (parent), error))))
+        {
+          if (position == -1 && parent == NULL)
+            parent = GIMP_IMAGE_ACTIVE_PARENT;
+
+          success = gimp_image_add_channel (image, channel,
+                                            parent, MAX (position, -1), TRUE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_remove_channel_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpChannel *channel;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, 0, error))
+        gimp_image_remove_channel (image, channel, TRUE, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_freeze_channels_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn    *plug_in   = gimp->plug_in_manager->current_plug_in;
+      GimpContainer *container = gimp_image_get_channels (image);
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_channels_freeze (plug_in, image);
+
+      if (success)
+        gimp_container_freeze (container);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_thaw_channels_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn    *plug_in   = gimp->plug_in_manager->current_plug_in;
+      GimpContainer *container = gimp_image_get_channels (image);
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_channels_thaw (plug_in, image);
+
+      if (success)
+        success = gimp_container_frozen (container);
+
+      if (success)
+        gimp_container_thaw (container);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_add_vectors_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpVectors *vectors;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (vectors), image, error))
+        {
+          success = gimp_image_add_vectors (image, vectors,
+                                            NULL, MAX (position, -1), TRUE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_insert_vectors_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpVectors *vectors;
+  GimpVectors *parent;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
+  parent = gimp_value_get_vectors (gimp_value_array_index (args, 2), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (vectors), image, error) &&
+          (parent == NULL ||
+           (gimp_pdb_item_is_in_tree (GIMP_ITEM (parent), image, 0, error) &&
+            gimp_pdb_item_is_group (GIMP_ITEM (parent), error))))
+        {
+          if (position == -1 && parent == NULL)
+            parent = GIMP_IMAGE_ACTIVE_PARENT;
+
+          success = gimp_image_add_vectors (image, vectors,
+                                            parent, MAX (position, -1), TRUE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_remove_vectors_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpVectors *vectors;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, 0, error))
+        gimp_image_remove_vectors (image, vectors, TRUE, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_freeze_vectors_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn    *plug_in   = gimp->plug_in_manager->current_plug_in;
+      GimpContainer *container = gimp_image_get_vectors (image);
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_vectors_freeze (plug_in, image);
+
+      if (success)
+        gimp_container_freeze (container);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_thaw_vectors_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn    *plug_in   = gimp->plug_in_manager->current_plug_in;
+      GimpContainer *container = gimp_image_get_vectors (image);
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_vectors_thaw (plug_in, image);
+
+      if (success)
+        success = gimp_container_frozen (container);
+
+      if (success)
+        gimp_container_thaw (container);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_item_position_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpItem *item;
+  gint32 position = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_in_tree (item, image, 0, error))
+        position = gimp_item_get_index (item);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), position);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_raise_item_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpItem *item;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_in_tree (item, image, 0, error))
+        success = gimp_image_raise_item (image, item, error);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_lower_item_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpItem *item;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_in_tree (item, image, 0, error))
+        success = gimp_image_lower_item (image, item, error);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_raise_item_to_top_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpItem *item;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_in_tree (item, image, 0, error))
+        success = gimp_image_raise_item_to_top (image, item);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_lower_item_to_bottom_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpItem *item;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_in_tree (item, image, 0, error))
+        success = gimp_image_lower_item_to_bottom (image, item);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_reorder_item_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpItem *item;
+  GimpItem *parent;
+  gint32 position;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  item = gimp_value_get_item (gimp_value_array_index (args, 1), gimp);
+  parent = gimp_value_get_item (gimp_value_array_index (args, 2), gimp);
+  position = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_in_tree (item, image, 0, error) &&
+          (parent == NULL ||
+           (gimp_pdb_item_is_in_same_tree (item, parent, image, error) &&
+            gimp_pdb_item_is_group (parent, error) &&
+            gimp_pdb_item_is_not_ancestor (item, parent, error))))
+        {
+          success = gimp_image_reorder_item (image, item, parent, position,
+                                             TRUE, NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_flatten_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      layer = gimp_image_flatten (image, context,
+                                  progress, error);
+
+      if (! layer)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_merge_visible_layers_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 merge_type;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  merge_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      layer = gimp_image_merge_visible_layers (image, context, merge_type,
+                                               FALSE, FALSE,
+                                               progress);
+
+      if (! layer)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_merge_down_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *merge_layer;
+  gint32 merge_type;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  merge_layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+  merge_type = g_value_get_enum (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (merge_layer), image, 0, error))
+        {
+          layer = gimp_image_merge_down (image, merge_layer, context, merge_type,
+                                         progress, error);
+
+          if (! layer)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_merge_layer_group_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *layer_group;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer_group = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer_group), image, 0, error) &&
+          gimp_pdb_item_is_group (GIMP_ITEM (layer_group), error))
+        {
+          layer = gimp_image_merge_group_layer (image,
+                                                GIMP_GROUP_LAYER (layer_group));
+
+          if (! layer)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_add_layer_mask_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpLayer *layer;
+  GimpLayerMask *mask;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+  mask = gimp_value_get_layer_mask (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (mask), image, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
+        success = (gimp_layer_add_mask (layer, mask, TRUE, error) == mask);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_remove_layer_mask_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpLayer *layer;
+  gint32 mode;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+  mode = g_value_get_enum (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPDBItemModify modify = 0;
+
+      if (mode == GIMP_MASK_APPLY)
+        modify |= GIMP_PDB_ITEM_CONTENT;
+
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, modify, error) &&
+          gimp_layer_get_mask (layer))
+        gimp_layer_apply_mask (layer, mode, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_colormap_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_bytes = 0;
+  guint8 *colormap = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      num_bytes = 3 * gimp_image_get_colormap_size (image);
+      colormap = g_memdup (gimp_image_get_colormap (image), num_bytes);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 2), colormap, num_bytes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_colormap_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 num_bytes;
+  const guint8 *colormap;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  num_bytes = g_value_get_int (gimp_value_array_index (args, 1));
+  colormap = gimp_value_get_int8array (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gimp_image_set_colormap (image, colormap, num_bytes / 3, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_metadata_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *metadata_string = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpMetadata *metadata = gimp_image_get_metadata (image);
+
+      if (metadata)
+        metadata_string = gimp_metadata_serialize (metadata);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), metadata_string);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_metadata_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *metadata_string;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  metadata_string = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpMetadata *metadata = gimp_metadata_deserialize (metadata_string);
+
+      gimp_image_set_metadata (image, metadata, TRUE);
+
+      if (metadata)
+        g_object_unref (metadata);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_clean_all_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_image_clean_all (image);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_is_dirty_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean dirty = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      dirty = gimp_image_is_dirty (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), dirty);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_thumbnail_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 width;
+  gint32 height;
+  gint32 actual_width = 0;
+  gint32 actual_height = 0;
+  gint32 bpp = 0;
+  gint32 thumbnail_data_count = 0;
+  guint8 *thumbnail_data = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  width = g_value_get_int (gimp_value_array_index (args, 1));
+  height = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpTempBuf *buf;
+      gint         dwidth, dheight;
+
+      gimp_assert (GIMP_VIEWABLE_MAX_PREVIEW_SIZE >= 1024);
+
+      /* Adjust the width/height ratio */
+      dwidth  = gimp_image_get_width  (image);
+      dheight = gimp_image_get_height (image);
+
+      if (dwidth > dheight)
+        height = MAX (1, (width * dheight) / dwidth);
+      else
+        width  = MAX (1, (height * dwidth) / dheight);
+
+      gimp_pickable_flush (GIMP_PICKABLE (image));
+
+      buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (image), context,
+                                           width, height);
+
+      if (buf)
+        {
+          actual_width         = gimp_temp_buf_get_width  (buf);
+          actual_height        = gimp_temp_buf_get_height (buf);
+          bpp                  = babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (buf));
+          thumbnail_data_count = gimp_temp_buf_get_data_size (buf);
+          thumbnail_data       = g_memdup (gimp_temp_buf_get_data (buf),
+                                           thumbnail_data_count);
+
+          gimp_temp_buf_unref (buf);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), actual_width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), actual_height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), thumbnail_data_count);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 5), thumbnail_data, thumbnail_data_count);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_active_layer_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *active_layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      active_layer = gimp_image_get_active_layer (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), active_layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_active_layer_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpLayer *active_layer;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  active_layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_image_set_active_layer (image, active_layer) != active_layer)
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_active_channel_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpChannel *active_channel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      active_channel = gimp_image_get_active_channel (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), active_channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_active_channel_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpChannel *active_channel;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  active_channel = gimp_value_get_channel (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_image_set_active_channel (image, active_channel) != active_channel)
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_active_vectors_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpVectors *active_vectors = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      active_vectors = gimp_image_get_active_vectors (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_vectors (gimp_value_array_index (return_vals, 1), active_vectors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_active_vectors_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpVectors *active_vectors;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  active_vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_image_set_active_vectors (image, active_vectors) != active_vectors)
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_selection_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpSelection *selection = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      selection = GIMP_SELECTION (gimp_image_get_mask (image));
+
+      if (! selection)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_selection (gimp_value_array_index (return_vals, 1), selection);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_component_active_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 component;
+  gboolean active = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  component = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (component == GIMP_CHANNEL_GRAY)
+        success = gimp_pdb_image_is_base_type (image, GIMP_GRAY, error);
+      else if (component == GIMP_CHANNEL_INDEXED)
+        success = gimp_pdb_image_is_base_type (image, GIMP_INDEXED, error);
+      else
+        success = gimp_pdb_image_is_base_type (image, GIMP_RGB, error);
+
+      if (success)
+        active = gimp_image_get_component_active (image, component);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), active);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_component_active_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 component;
+  gboolean active;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  component = g_value_get_enum (gimp_value_array_index (args, 1));
+  active = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (component == GIMP_CHANNEL_GRAY)
+        success = gimp_pdb_image_is_base_type (image, GIMP_GRAY, error);
+      else if (component == GIMP_CHANNEL_INDEXED)
+        success = gimp_pdb_image_is_base_type (image, GIMP_INDEXED, error);
+      else
+        success = gimp_pdb_image_is_base_type (image, GIMP_RGB, error);
+
+      if (success)
+        gimp_image_set_component_active (image, component, active);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_component_visible_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 component;
+  gboolean visible = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  component = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (component == GIMP_CHANNEL_GRAY)
+        success = gimp_pdb_image_is_base_type (image, GIMP_GRAY, error);
+      else if (component == GIMP_CHANNEL_INDEXED)
+        success = gimp_pdb_image_is_base_type (image, GIMP_INDEXED, error);
+      else
+        success = gimp_pdb_image_is_base_type (image, GIMP_RGB, error);
+
+      if (success)
+        visible = gimp_image_get_component_visible (image, component);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), visible);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_component_visible_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 component;
+  gboolean visible;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  component = g_value_get_enum (gimp_value_array_index (args, 1));
+  visible = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (component == GIMP_CHANNEL_GRAY)
+        success = gimp_pdb_image_is_base_type (image, GIMP_GRAY, error);
+      else if (component == GIMP_CHANNEL_INDEXED)
+        success = gimp_pdb_image_is_base_type (image, GIMP_INDEXED, error);
+      else
+        success = gimp_pdb_image_is_base_type (image, GIMP_RGB, error);
+
+      if (success)
+        gimp_image_set_component_visible (image, component, visible);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_filename_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *filename = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GFile *file = gimp_image_get_any_file (image);
+      if (file)
+        filename = g_file_get_path (file);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), filename);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_filename_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *filename;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      /*  verify that the filename can be converted to UTF-8 and back  */
+      gchar *utf8 = g_filename_to_utf8 (filename, -1, NULL, NULL, error);
+
+      if (utf8)
+        {
+          gchar *tmp = g_filename_from_utf8 (utf8, -1, NULL, NULL, error);
+
+          if (tmp)
+            g_free (tmp);
+          else
+            success = FALSE;
+
+          g_free (utf8);
+        }
+      else
+        success = FALSE;
+
+      if (success)
+        {
+          GFile *file = NULL;
+
+          if (filename && strlen (filename))
+            file = file_utils_filename_to_file (image->gimp, filename, NULL);
+
+          gimp_image_set_file (image, file);
+
+          if (file)
+            g_object_unref (file);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_uri_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *uri = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GFile *file = gimp_image_get_any_file (image);
+      if (file)
+        uri = g_file_get_uri (file);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), uri);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_xcf_uri_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *uri = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GFile *file = gimp_image_get_file (image);
+      if (file)
+        uri = g_file_get_uri (file);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), uri);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_imported_uri_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *uri = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GFile *file = gimp_image_get_imported_file (image);
+      if (file)
+        uri = g_file_get_uri (file);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), uri);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_exported_uri_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *uri = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GFile *file = gimp_image_get_exported_file (image);
+      if (file)
+        uri = g_file_get_uri (file);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), uri);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_name_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *name = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      name = g_strdup (gimp_image_get_display_name (image));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_resolution_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gdouble xresolution = 0.0;
+  gdouble yresolution = 0.0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_image_get_resolution (image, &xresolution, &yresolution);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), xresolution);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), yresolution);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_resolution_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble xresolution;
+  gdouble yresolution;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  xresolution = g_value_get_double (gimp_value_array_index (args, 1));
+  yresolution = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (! FINITE (xresolution) ||
+          xresolution < GIMP_MIN_RESOLUTION || xresolution > GIMP_MAX_RESOLUTION ||
+          ! FINITE (yresolution) ||
+          yresolution < GIMP_MIN_RESOLUTION || yresolution > GIMP_MAX_RESOLUTION)
+        {
+          g_set_error_literal (error, GIMP_PDB_ERROR,
+                               GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                               _("Image resolution is out of bounds, "
+                                 "using the default resolution instead."));
+          success = FALSE;
+        }
+      else
+        {
+          gimp_image_set_resolution (image, xresolution, yresolution);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_unit_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpUnit unit = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      unit = gimp_image_get_unit (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), unit);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_unit_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpUnit unit;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  unit = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_image_set_unit (image, unit);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_tattoo_state_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 tattoo_state = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      tattoo_state = gimp_image_get_tattoo_state (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), tattoo_state);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_tattoo_state_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 tattoo_state;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  tattoo_state = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_image_set_tattoo_state (image, tattoo_state);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_layer_by_tattoo_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 tattoo;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  tattoo = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      layer = gimp_image_get_layer_by_tattoo (image, tattoo);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_channel_by_tattoo_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 tattoo;
+  GimpChannel *channel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  tattoo = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      channel = gimp_image_get_channel_by_tattoo (image, tattoo);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_vectors_by_tattoo_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 tattoo;
+  GimpVectors *vectors = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  tattoo = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      vectors = gimp_image_get_vectors_by_tattoo (image, tattoo);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_vectors (gimp_value_array_index (return_vals, 1), vectors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_layer_by_name_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      layer = gimp_image_get_layer_by_name (image, name);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_channel_by_name_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  GimpChannel *channel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      channel = gimp_image_get_channel_by_name (image, name);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_vectors_by_name_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  GimpVectors *vectors = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      vectors = gimp_image_get_vectors_by_name (image, name);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_vectors (gimp_value_array_index (return_vals, 1), vectors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_attach_parasite_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const GimpParasite *parasite;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  parasite = g_value_get_boxed (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_image_parasite_validate (image, parasite, error))
+        gimp_image_parasite_attach (image, parasite, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_detach_parasite_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_image_parasite_detach (image, name, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_get_parasite_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  GimpParasite *parasite = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      parasite = gimp_parasite_copy (gimp_image_parasite_find (image, name));
+
+      if (! parasite)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_boxed (gimp_value_array_index (return_vals, 1), parasite);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_parasite_list_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_parasites = 0;
+  gchar **parasites = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      parasites = gimp_image_parasite_list (image, &num_parasites);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_parasites);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), parasites, num_parasites);
+    }
+
+  return return_vals;
+}
+
+void
+register_image_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-is-valid
+   */
+  procedure = gimp_procedure_new (image_is_valid_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-is-valid");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-is-valid",
+                                     "Returns TRUE if the image is valid.",
+                                     "This procedure checks if the given image ID is valid and refers to an existing image.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to check",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("valid",
+                                                         "valid",
+                                                         "Whether the image ID is valid",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-list
+   */
+  procedure = gimp_procedure_new (image_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-list",
+                                     "Returns the list of images currently open.",
+                                     "This procedure returns the list of images currently open in GIMP.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-images",
+                                                          "num images",
+                                                          "The number of images currently open",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("image-ids",
+                                                                "image ids",
+                                                                "The list of images currently open. The returned value must be freed with g_free()",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-new
+   */
+  procedure = gimp_procedure_new (image_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-new",
+                                     "Creates a new image with the specified width, height, and type.",
+                                     "Creates a new image, undisplayed, with the specified extents and type. A layer should be created and added before this image is displayed, or subsequent calls to 'gimp-display-new' with this image as an argument will fail. Layers can be created using the 'gimp-layer-new' commands. They can be added to an image using the 'gimp-image-insert-layer' command.\n"
+                                     "\n"
+                                     "If your image's type if INDEXED, a colormap must also be added with 'gimp-image-set-colormap'. An indexed image without a colormap will output unexpected colors.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "The width of the image",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "The height of the image",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("type",
+                                                  "type",
+                                                  "The type of image",
+                                                  GIMP_TYPE_IMAGE_BASE_TYPE,
+                                                  GIMP_RGB,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "image",
+                                                             "The ID of the newly created image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-new-with-precision
+   */
+  procedure = gimp_procedure_new (image_new_with_precision_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-new-with-precision");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-new-with-precision",
+                                     "Creates a new image with the specified width, height, type and precision.",
+                                     "Creates a new image, undisplayed with the specified extents, type and precision. Indexed images can only be created at GIMP_PRECISION_U8_GAMMA precision. See 'gimp-image-new' for further details.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "The width of the image",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "The height of the image",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("type",
+                                                  "type",
+                                                  "The type of image",
+                                                  GIMP_TYPE_IMAGE_BASE_TYPE,
+                                                  GIMP_RGB,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("precision",
+                                                  "precision",
+                                                  "The precision",
+                                                  GIMP_TYPE_PRECISION,
+                                                  GIMP_PRECISION_U8_LINEAR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "image",
+                                                             "The ID of the newly created image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-duplicate
+   */
+  procedure = gimp_procedure_new (image_duplicate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-duplicate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-duplicate",
+                                     "Duplicate the specified image",
+                                     "This procedure duplicates the specified image, copying all layers, channels, and image information.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("new-image",
+                                                             "new image",
+                                                             "The new, duplicated image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-delete
+   */
+  procedure = gimp_procedure_new (image_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-delete",
+                                     "Delete the specified image.",
+                                     "If there are no displays associated with this image it will be deleted. This means that you can not delete an image through the PDB that was created by the user. If the associated display was however created through the PDB and you know the display ID, you may delete the display. Removal of the last associated display will then delete the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-base-type
+   */
+  procedure = gimp_procedure_new (image_base_type_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-base-type");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-base-type",
+                                     "Get the base type of the image.",
+                                     "This procedure returns the image's base type. Layers in the image must be of this subtype, but can have an optional alpha channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("base-type",
+                                                      "base type",
+                                                      "The image's base type",
+                                                      GIMP_TYPE_IMAGE_BASE_TYPE,
+                                                      GIMP_RGB,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-precision
+   */
+  procedure = gimp_procedure_new (image_get_precision_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-precision");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-precision",
+                                     "Get the precision of the image.",
+                                     "This procedure returns the image's precision.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("precision",
+                                                      "precision",
+                                                      "The image's precision",
+                                                      GIMP_TYPE_PRECISION,
+                                                      GIMP_PRECISION_U8_LINEAR,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-default-new-layer-mode
+   */
+  procedure = gimp_procedure_new (image_get_default_new_layer_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-default-new-layer-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-default-new-layer-mode",
+                                     "Get the default mode for newly created layers of this image.",
+                                     "Returns the default mode for newly created layers of this image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("mode",
+                                                      "mode",
+                                                      "The layer mode",
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-width
+   */
+  procedure = gimp_procedure_new (image_width_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-width");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-width",
+                                     "Return the width of the image",
+                                     "This procedure returns the image's width. This value is independent of any of the layers in this image. This is the \"canvas\" width.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The image's width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-height
+   */
+  procedure = gimp_procedure_new (image_height_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-height");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-height",
+                                     "Return the height of the image",
+                                     "This procedure returns the image's height. This value is independent of any of the layers in this image. This is the \"canvas\" height.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The image's height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-free-shadow
+   */
+  procedure = gimp_procedure_new (image_free_shadow_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-free-shadow");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-free-shadow",
+                                     "Deprecated: Use 'gimp-drawable-free-shadow' instead.",
+                                     "Deprecated: Use 'gimp-drawable-free-shadow' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-drawable-free-shadow");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-layers
+   */
+  procedure = gimp_procedure_new (image_get_layers_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-layers");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-layers",
+                                     "Returns the list of layers contained in the specified image.",
+                                     "This procedure returns the list of layers contained in the specified image. The order of layers is from topmost to bottommost.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-layers",
+                                                          "num layers",
+                                                          "The number of layers contained in the image",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("layer-ids",
+                                                                "layer ids",
+                                                                "The list of layers contained in the image. The returned value must be freed with g_free()",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-channels
+   */
+  procedure = gimp_procedure_new (image_get_channels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-channels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-channels",
+                                     "Returns the list of channels contained in the specified image.",
+                                     "This procedure returns the list of channels contained in the specified image. This does not include the selection mask, or layer masks. The order is from topmost to bottommost. Note that \"channels\" are custom channels and do not include the image's color components.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-channels",
+                                                          "num channels",
+                                                          "The number of channels contained in the image",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("channel-ids",
+                                                                "channel ids",
+                                                                "The list of channels contained in the image. The returned value must be freed with g_free()",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-vectors
+   */
+  procedure = gimp_procedure_new (image_get_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-vectors",
+                                     "Returns the list of vectors contained in the specified image.",
+                                     "This procedure returns the list of vectors contained in the specified image.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-vectors",
+                                                          "num vectors",
+                                                          "The number of vectors contained in the image",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("vector-ids",
+                                                                "vector ids",
+                                                                "The list of vectors contained in the image. The returned value must be freed with g_free()",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-active-drawable
+   */
+  procedure = gimp_procedure_new (image_get_active_drawable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-active-drawable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-active-drawable",
+                                     "Get the image's active drawable",
+                                     "This procedure returns the ID of the image's active drawable. This can be either a layer, a channel, or a layer mask. The active drawable is specified by the active image channel. If that is -1, then by the active image layer. If the active image layer has a layer mask and the layer mask is in edit mode, then the layer mask is the active drawable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The active drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-unset-active-channel
+   */
+  procedure = gimp_procedure_new (image_unset_active_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-unset-active-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-unset-active-channel",
+                                     "Unsets the active channel in the specified image.",
+                                     "If an active channel exists, it is unset. There then exists no active channel, and if desired, one can be set through a call to 'Set Active Channel'. No error is returned in the case of no existing active channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-floating-sel
+   */
+  procedure = gimp_procedure_new (image_get_floating_sel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-floating-sel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-floating-sel",
+                                     "Return the floating selection of the image.",
+                                     "This procedure returns the image's floating selection, if it exists. If it doesn't exist, -1 is returned as the layer ID.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("floating-sel",
+                                                             "floating sel",
+                                                             "The image's floating selection",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-floating-sel-attached-to
+   */
+  procedure = gimp_procedure_new (image_floating_sel_attached_to_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-floating-sel-attached-to");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-floating-sel-attached-to",
+                                     "Return the drawable the floating selection is attached to.",
+                                     "This procedure returns the drawable the image's floating selection is attached to, if it exists. If it doesn't exist, -1 is returned as the drawable ID.",
+                                     "Wolfgang Hofer",
+                                     "Wolfgang Hofer",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The drawable the floating selection is attached to",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-pick-color
+   */
+  procedure = gimp_procedure_new (image_pick_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-pick-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-pick-color",
+                                     "Determine the color at the given drawable coordinates",
+                                     "This tool determines the color at the specified coordinates. The returned color is an RGB triplet even for grayscale and indexed drawables. If the coordinates lie outside of the extents of the specified drawable, then an error is returned. If the drawable has an alpha channel, the algorithm examines the alpha value of the drawable at the coordinates. If the alpha value is completely transparent (0), then an error is returned. If the sample_merged parameter is TRUE, the data of the composite image will be used instead of that for the specified drawable. This is equivalent to sampling for colors after merging all visible layers. In the case of a merged sampling, the supplied drawable is ignored.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable to pick from",
+                                                            pdb->gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-average",
+                                                     "sample average",
+                                                     "Average the color of all the pixels in a specified radius",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("average-radius",
+                                                    "average radius",
+                                                    "The radius of pixels to average",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The return color",
+                                                        TRUE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-pick-correlate-layer
+   */
+  procedure = gimp_procedure_new (image_pick_correlate_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-pick-correlate-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-pick-correlate-layer",
+                                     "Find the layer visible at the specified coordinates.",
+                                     "This procedure finds the layer which is visible at the specified coordinates. Layers which do not qualify are those whose extents do not pass within the specified coordinates, or which are transparent at the specified coordinates. This procedure will return -1 if no layer is found.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("x",
+                                                      "x",
+                                                      "The x coordinate for the pick",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("y",
+                                                      "y",
+                                                      "The y coordinate for the pick",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The layer found at the specified coordinates",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-add-layer
+   */
+  procedure = gimp_procedure_new (image_add_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-layer",
+                                     "Deprecated: Use 'gimp-image-insert-layer' instead.",
+                                     "Deprecated: Use 'gimp-image-insert-layer' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-insert-layer");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The layer position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-insert-layer
+   */
+  procedure = gimp_procedure_new (image_insert_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-insert-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-insert-layer",
+                                     "Add the specified layer to the image.",
+                                     "This procedure adds the specified layer to the image at the given position. If the specified parent is a valid layer group (See 'gimp-item-is-group' and 'gimp-layer-group-new') then the layer is added inside the group. If the parent is 0, the layer is added inside the main stack, outside of any group. The position argument specifies the location of the layer inside the stack (or the group, if a valid parent was supplied), starting from the top (0) and increasing. If the position is specified as -1 and the parent is specified as 0, then the layer is inserted above the active layer, or inside the group if the active layer is a layer group. The layer type must be compatible with the image base type.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("parent",
+                                                         "parent",
+                                                         "The parent layer",
+                                                         pdb->gimp, TRUE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The layer position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-remove-layer
+   */
+  procedure = gimp_procedure_new (image_remove_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-remove-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-remove-layer",
+                                     "Remove the specified layer from the image.",
+                                     "This procedure removes the specified layer from the image. If the layer doesn't exist, an error is returned. If there are no layers left in the image, this call will fail. If this layer is the last layer remaining, the image will become empty and have no active layer.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-freeze-layers
+   */
+  procedure = gimp_procedure_new (image_freeze_layers_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-freeze-layers");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-freeze-layers",
+                                     "Freeze the image's layer list.",
+                                     "This procedure freezes the layer list of the image, suppressing any updates to the Layers dialog in response to changes to the image's layers. This can significantly improve performance while applying changes affecting the layer list.\n"
+                                     "\n"
+                                     "Each call to 'gimp-image-freeze-layers' should be matched by a corresponding call to 'gimp-image-thaw-layers', undoing its effects.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-thaw-layers
+   */
+  procedure = gimp_procedure_new (image_thaw_layers_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-thaw-layers");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-thaw-layers",
+                                     "Thaw the image's layer list.",
+                                     "This procedure thaws the layer list of the image, re-enabling updates to the Layers dialog.\n"
+                                     "\n"
+                                     "This procedure should match a corresponding call to 'gimp-image-freeze-layers'.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-add-channel
+   */
+  procedure = gimp_procedure_new (image_add_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-channel",
+                                     "Deprecated: Use 'gimp-image-insert-channel' instead.",
+                                     "Deprecated: Use 'gimp-image-insert-channel' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-insert-channel");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The channel position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-insert-channel
+   */
+  procedure = gimp_procedure_new (image_insert_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-insert-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-insert-channel",
+                                     "Add the specified channel to the image.",
+                                     "This procedure adds the specified channel to the image at the given position. Since channel groups are not currently supported, the parent argument must always be 0. The position argument specifies the location of the channel inside the stack, starting from the top (0) and increasing. If the position is specified as -1, then the channel is inserted above the active channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("parent",
+                                                           "parent",
+                                                           "The parent channel",
+                                                           pdb->gimp, TRUE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The channel position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-remove-channel
+   */
+  procedure = gimp_procedure_new (image_remove_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-remove-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-remove-channel",
+                                     "Remove the specified channel from the image.",
+                                     "This procedure removes the specified channel from the image. If the channel doesn't exist, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-freeze-channels
+   */
+  procedure = gimp_procedure_new (image_freeze_channels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-freeze-channels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-freeze-channels",
+                                     "Freeze the image's channel list.",
+                                     "This procedure freezes the channel list of the image, suppressing any updates to the Channels dialog in response to changes to the image's channels. This can significantly improve performance while applying changes affecting the channel list.\n"
+                                     "\n"
+                                     "Each call to 'gimp-image-freeze-channels' should be matched by a corresponding call to 'gimp-image-thaw-channels', undoing its effects.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-thaw-channels
+   */
+  procedure = gimp_procedure_new (image_thaw_channels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-thaw-channels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-thaw-channels",
+                                     "Thaw the image's channel list.",
+                                     "This procedure thaws the channel list of the image, re-enabling updates to the Channels dialog.\n"
+                                     "\n"
+                                     "This procedure should match a corresponding call to 'gimp-image-freeze-channels'.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-add-vectors
+   */
+  procedure = gimp_procedure_new (image_add_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-vectors",
+                                     "Deprecated: Use 'gimp-image-insert-vectors' instead.",
+                                     "Deprecated: Use 'gimp-image-insert-vectors' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-insert-vectors");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The vectors objects position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-insert-vectors
+   */
+  procedure = gimp_procedure_new (image_insert_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-insert-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-insert-vectors",
+                                     "Add the specified vectors to the image.",
+                                     "This procedure adds the specified vectors to the image at the given position. Since vectors groups are not currently supported, the parent argument must always be 0. The position argument specifies the location of the vectors inside the stack, starting from the top (0) and increasing. If the position is specified as -1, then the vectors is inserted above the active vectors.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("parent",
+                                                           "parent",
+                                                           "The parent vectors",
+                                                           pdb->gimp, TRUE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The vectors position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-remove-vectors
+   */
+  procedure = gimp_procedure_new (image_remove_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-remove-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-remove-vectors",
+                                     "Remove the specified path from the image.",
+                                     "This procedure removes the specified path from the image. If the path doesn't exist, an error is returned.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-freeze-vectors
+   */
+  procedure = gimp_procedure_new (image_freeze_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-freeze-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-freeze-vectors",
+                                     "Freeze the image's vectors list.",
+                                     "This procedure freezes the vectors list of the image, suppressing any updates to the Paths dialog in response to changes to the image's vectors. This can significantly improve performance while applying changes affecting the vectors list.\n"
+                                     "\n"
+                                     "Each call to 'gimp-image-freeze-vectors' should be matched by a corresponding call to 'gimp-image-thaw-vectors', undoing its effects.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-thaw-vectors
+   */
+  procedure = gimp_procedure_new (image_thaw_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-thaw-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-thaw-vectors",
+                                     "Thaw the image's vectors list.",
+                                     "This procedure thaws the vectors list of the image, re-enabling updates to the Paths dialog.\n"
+                                     "\n"
+                                     "This procedure should match a corresponding call to 'gimp-image-freeze-vectors'.",
+                                     "Ell",
+                                     "Ell",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-item-position
+   */
+  procedure = gimp_procedure_new (image_get_item_position_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-item-position");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-item-position",
+                                     "Returns the position of the item in its level of its item tree.",
+                                     "This procedure determines the position of the specified item in its level in its item tree in the image. If the item doesn't exist in the image, or the item is not part of an item tree, an error is returned.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("position",
+                                                          "position",
+                                                          "The position of the item in its level in the item tree",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-raise-item
+   */
+  procedure = gimp_procedure_new (image_raise_item_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-raise-item");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-raise-item",
+                                     "Raise the specified item in its level in its item tree",
+                                     "This procedure raises the specified item one step in the item tree. The procedure call will fail if there is no item above it.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to raise",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-lower-item
+   */
+  procedure = gimp_procedure_new (image_lower_item_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-lower-item");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-lower-item",
+                                     "Lower the specified item in its level in its item tree",
+                                     "This procedure lowers the specified item one step in the item tree. The procedure call will fail if there is no item below it.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to lower",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-raise-item-to-top
+   */
+  procedure = gimp_procedure_new (image_raise_item_to_top_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-raise-item-to-top");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-raise-item-to-top",
+                                     "Raise the specified item to the top of its level in its item tree",
+                                     "This procedure raises the specified item to top of its level in the item tree. It will not move the item if there is no item above it.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to raise to top",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-lower-item-to-bottom
+   */
+  procedure = gimp_procedure_new (image_lower_item_to_bottom_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-lower-item-to-bottom");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-lower-item-to-bottom",
+                                     "Lower the specified item to the bottom of its level in its item tree",
+                                     "This procedure lowers the specified item to bottom of its level in the item tree. It will not move the layer if there is no layer below it.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to lower to bottom",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-reorder-item
+   */
+  procedure = gimp_procedure_new (image_reorder_item_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-reorder-item");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-reorder-item",
+                                     "Reorder the specified item within its item tree",
+                                     "This procedure reorders the specified item within its item tree.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to reorder",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("parent",
+                                                        "parent",
+                                                        "The new parent item",
+                                                        pdb->gimp, TRUE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position",
+                                                      "position",
+                                                      "The new position of the item",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-flatten
+   */
+  procedure = gimp_procedure_new (image_flatten_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-flatten");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-flatten",
+                                     "Flatten all visible layers into a single layer. Discard all invisible layers.",
+                                     "This procedure combines the visible layers in a manner analogous to merging with the CLIP_TO_IMAGE merge type. Non-visible layers are discarded, and the resulting image is stripped of its alpha channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The resulting layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-merge-visible-layers
+   */
+  procedure = gimp_procedure_new (image_merge_visible_layers_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-merge-visible-layers");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-merge-visible-layers",
+                                     "Merge the visible image layers into one.",
+                                     "This procedure combines the visible layers into a single layer using the specified merge type. A merge type of EXPAND_AS_NECESSARY expands the final layer to encompass the areas of the visible layers. A merge type of CLIP_TO_IMAGE clips the final layer to the extents of the image. A merge type of CLIP_TO_BOTTOM_LAYER clips the final layer to the size of the bottommost layer.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("merge-type",
+                                                     "merge type",
+                                                     "The type of merge",
+                                                     GIMP_TYPE_MERGE_TYPE,
+                                                     GIMP_EXPAND_AS_NECESSARY,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_FLATTEN_IMAGE);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The resulting layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-merge-down
+   */
+  procedure = gimp_procedure_new (image_merge_down_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-merge-down");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-merge-down",
+                                     "Merge the layer passed and the first visible layer below.",
+                                     "This procedure combines the passed layer and the first visible layer below it using the specified merge type. A merge type of EXPAND_AS_NECESSARY expands the final layer to encompass the areas of the visible layers. A merge type of CLIP_TO_IMAGE clips the final layer to the extents of the image. A merge type of CLIP_TO_BOTTOM_LAYER clips the final layer to the size of the bottommost layer.",
+                                     "Larry Ewing",
+                                     "Larry Ewing",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("merge-layer",
+                                                         "merge layer",
+                                                         "The layer to merge down from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("merge-type",
+                                                     "merge type",
+                                                     "The type of merge",
+                                                     GIMP_TYPE_MERGE_TYPE,
+                                                     GIMP_EXPAND_AS_NECESSARY,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[2]),
+                                      GIMP_FLATTEN_IMAGE);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The resulting layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-merge-layer-group
+   */
+  procedure = gimp_procedure_new (image_merge_layer_group_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-merge-layer-group");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-merge-layer-group",
+                                     "Merge the passed layer group's layers into one normal layer.",
+                                     "This procedure combines the layers of the passed layer group into a single normal layer, replacing the group.",
+                                     "Ell",
+                                     "Ell",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer-group",
+                                                         "layer group",
+                                                         "The layer group to merge",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The resulting layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-add-layer-mask
+   */
+  procedure = gimp_procedure_new (image_add_layer_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-layer-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-layer-mask",
+                                     "Deprecated: Use 'gimp-layer-add-mask' instead.",
+                                     "Deprecated: Use 'gimp-layer-add-mask' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-layer-add-mask");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer to receive the mask",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_mask_id ("mask",
+                                                              "mask",
+                                                              "The mask to add to the layer",
+                                                              pdb->gimp, FALSE,
+                                                              GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-remove-layer-mask
+   */
+  procedure = gimp_procedure_new (image_remove_layer_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-remove-layer-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-remove-layer-mask",
+                                     "Deprecated: Use 'gimp-layer-remove-mask' instead.",
+                                     "Deprecated: Use 'gimp-layer-remove-mask' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-layer-remove-mask");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer from which to remove mask",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("mode",
+                                                  "mode",
+                                                  "Removal mode",
+                                                  GIMP_TYPE_MASK_APPLY_MODE,
+                                                  GIMP_MASK_APPLY,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-colormap
+   */
+  procedure = gimp_procedure_new (image_get_colormap_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-colormap");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-colormap",
+                                     "Returns the image's colormap",
+                                     "This procedure returns an actual pointer to the image's colormap, as well as the number of bytes contained in the colormap. The actual number of colors in the transmitted colormap will be 'num-bytes' / 3. If the image is not in Indexed color mode, no colormap is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-bytes",
+                                                          "num bytes",
+                                                          "Number of bytes in the colormap array",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("colormap",
+                                                               "colormap",
+                                                               "The image's colormap. The returned value must be freed with g_free()",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-colormap
+   */
+  procedure = gimp_procedure_new (image_set_colormap_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-colormap");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-colormap",
+                                     "Sets the entries in the image's colormap.",
+                                     "This procedure sets the entries in the specified image's colormap. The number of entries is specified by the 'num-bytes' parameter and corresponds to the number of INT8 triples that must be contained in the 'colormap' array. The actual number of colors in the transmitted colormap is 'num-bytes' / 3.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-bytes",
+                                                      "num bytes",
+                                                      "Number of bytes in the colormap array",
+                                                      0, 768, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("colormap",
+                                                           "colormap",
+                                                           "The new colormap values",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-metadata
+   */
+  procedure = gimp_procedure_new (image_get_metadata_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-metadata");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-metadata",
+                                     "Returns the image's metadata.",
+                                     "Returns exif/iptc/xmp metadata from the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("metadata-string",
+                                                           "metadata string",
+                                                           "The exif/ptc/xmp metadata as a string",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-metadata
+   */
+  procedure = gimp_procedure_new (image_set_metadata_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-metadata");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-metadata",
+                                     "Set the image's metadata.",
+                                     "Sets exif/iptc/xmp metadata on the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("metadata-string",
+                                                       "metadata string",
+                                                       "The exif/ptc/xmp metadata as a string",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-clean-all
+   */
+  procedure = gimp_procedure_new (image_clean_all_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-clean-all");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-clean-all",
+                                     "Set the image dirty count to 0.",
+                                     "This procedure sets the specified image's dirty count to 0, allowing operations to occur without having a 'dirtied' image. This is especially useful for creating and loading images which should not initially be considered dirty, even though layers must be created, filled, and installed in the image. Note that save plug-ins must NOT call this function themselves after saving the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-is-dirty
+   */
+  procedure = gimp_procedure_new (image_is_dirty_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-is-dirty");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-is-dirty",
+                                     "Checks if the image has unsaved changes.",
+                                     "This procedure checks the specified image's dirty count to see if it needs to be saved. Note that saving the image does not automatically set the dirty count to 0, you need to call 'gimp-image-clean-all' after calling a save procedure to make the image clean.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("dirty",
+                                                         "dirty",
+                                                         "TRUE if the image has unsaved changes.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-thumbnail
+   */
+  procedure = gimp_procedure_new (image_thumbnail_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-thumbnail");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-thumbnail",
+                                     "Get a thumbnail of an image.",
+                                     "This function gets data from which a thumbnail of an image preview can be created. Maximum x or y dimension is 1024 pixels. The pixels are returned in RGB[A] or GRAY[A] format. The bpp return value gives the number of bits per pixel in the image.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "The requested thumbnail width",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "The requested thumbnail height",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("actual-width",
+                                                          "actual width",
+                                                          "The previews width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("actual-height",
+                                                          "actual height",
+                                                          "The previews height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bpp",
+                                                          "bpp",
+                                                          "The previews bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("thumbnail-data-count",
+                                                          "thumbnail data count",
+                                                          "The number of bytes in thumbnail data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("thumbnail-data",
+                                                               "thumbnail data",
+                                                               "The thumbnail data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-active-layer
+   */
+  procedure = gimp_procedure_new (image_get_active_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-active-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-active-layer",
+                                     "Returns the specified image's active layer.",
+                                     "If there is an active layer, its ID will be returned, otherwise, -1. If a channel is currently active, then no layer will be. If a layer mask is active, then this will return the associated layer.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("active-layer",
+                                                             "active layer",
+                                                             "The active layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-active-layer
+   */
+  procedure = gimp_procedure_new (image_set_active_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-active-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-active-layer",
+                                     "Sets the specified image's active layer.",
+                                     "If the layer exists, it is set as the active layer in the image. Any previous active layer or channel is set to inactive. An exception is a previously existing floating selection, in which case this procedure will return an execution error.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("active-layer",
+                                                         "active layer",
+                                                         "The new image active layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-active-channel
+   */
+  procedure = gimp_procedure_new (image_get_active_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-active-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-active-channel",
+                                     "Returns the specified image's active channel.",
+                                     "If there is an active channel, this will return the channel ID, otherwise, -1.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("active-channel",
+                                                               "active channel",
+                                                               "The active channel",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-active-channel
+   */
+  procedure = gimp_procedure_new (image_set_active_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-active-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-active-channel",
+                                     "Sets the specified image's active channel.",
+                                     "If the channel exists, it is set as the active channel in the image. Any previous active channel or layer is set to inactive. An exception is a previously existing floating selection, in which case this procedure will return an execution error.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("active-channel",
+                                                           "active channel",
+                                                           "The new image active channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-active-vectors
+   */
+  procedure = gimp_procedure_new (image_get_active_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-active-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-active-vectors",
+                                     "Returns the specified image's active vectors.",
+                                     "If there is an active path, its ID will be returned, otherwise, -1.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_vectors_id ("active-vectors",
+                                                               "active vectors",
+                                                               "The active vectors",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-active-vectors
+   */
+  procedure = gimp_procedure_new (image_set_active_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-active-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-active-vectors",
+                                     "Sets the specified image's active vectors.",
+                                     "If the path exists, it is set as the active path in the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("active-vectors",
+                                                           "active vectors",
+                                                           "The new image active vectors",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-selection
+   */
+  procedure = gimp_procedure_new (image_get_selection_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-selection");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-selection",
+                                     "Returns the specified image's selection.",
+                                     "This will always return a valid ID for a selection -- which is represented as a channel internally.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_selection_id ("selection",
+                                                                 "selection",
+                                                                 "The selection channel",
+                                                                 pdb->gimp, FALSE,
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-component-active
+   */
+  procedure = gimp_procedure_new (image_get_component_active_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-component-active");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-component-active",
+                                     "Returns if the specified image's image component is active.",
+                                     "This procedure returns if the specified image's image component (i.e. Red, Green, Blue intensity channels in an RGB image) is active or inactive -- whether or not it can be modified. If the specified component is not valid for the image type, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("component",
+                                                  "component",
+                                                  "The image component",
+                                                  GIMP_TYPE_CHANNEL_TYPE,
+                                                  GIMP_CHANNEL_RED,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("active",
+                                                         "active",
+                                                         "Component is active",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-component-active
+   */
+  procedure = gimp_procedure_new (image_set_component_active_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-component-active");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-component-active",
+                                     "Sets if the specified image's image component is active.",
+                                     "This procedure sets if the specified image's image component (i.e. Red, Green, Blue intensity channels in an RGB image) is active or inactive -- whether or not it can be modified. If the specified component is not valid for the image type, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("component",
+                                                  "component",
+                                                  "The image component",
+                                                  GIMP_TYPE_CHANNEL_TYPE,
+                                                  GIMP_CHANNEL_RED,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("active",
+                                                     "active",
+                                                     "Component is active",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-component-visible
+   */
+  procedure = gimp_procedure_new (image_get_component_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-component-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-component-visible",
+                                     "Returns if the specified image's image component is visible.",
+                                     "This procedure returns if the specified image's image component (i.e. Red, Green, Blue intensity channels in an RGB image) is visible or invisible -- whether or not it can be seen. If the specified component is not valid for the image type, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("component",
+                                                  "component",
+                                                  "The image component",
+                                                  GIMP_TYPE_CHANNEL_TYPE,
+                                                  GIMP_CHANNEL_RED,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("visible",
+                                                         "visible",
+                                                         "Component is visible",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-component-visible
+   */
+  procedure = gimp_procedure_new (image_set_component_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-component-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-component-visible",
+                                     "Sets if the specified image's image component is visible.",
+                                     "This procedure sets if the specified image's image component (i.e. Red, Green, Blue intensity channels in an RGB image) is visible or invisible -- whether or not it can be seen. If the specified component is not valid for the image type, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("component",
+                                                  "component",
+                                                  "The image component",
+                                                  GIMP_TYPE_CHANNEL_TYPE,
+                                                  GIMP_CHANNEL_RED,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("visible",
+                                                     "visible",
+                                                     "Component is visible",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-filename
+   */
+  procedure = gimp_procedure_new (image_get_filename_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-filename");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-filename",
+                                     "Returns the specified image's filename.",
+                                     "This procedure returns the specified image's filename in the filesystem encoding. The image has a filename only if it was loaded or imported from a file or has since been saved or exported. Otherwise, this function returns %NULL. See also 'gimp-image-get-uri'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("filename",
+                                                           "filename",
+                                                           "The filename. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-filename
+   */
+  procedure = gimp_procedure_new (image_set_filename_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-filename");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-filename",
+                                     "Sets the specified image's filename.",
+                                     "This procedure sets the specified image's filename. The filename should be in the filesystem encoding.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The new image filename",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-uri
+   */
+  procedure = gimp_procedure_new (image_get_uri_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-uri");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-uri",
+                                     "Returns the URI for the specified image.",
+                                     "This procedure returns the URI associated with the specified image. The image has an URI only if it was loaded or imported from a file or has since been saved or exported. Otherwise, this function returns %NULL. See also gimp-image-get-imported-uri to get the URI of the current file if it was imported from a non-GIMP file format and not yet saved, or gimp-image-get-exported-uri if the image has been exported to a non-GIMP file format.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2009",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("uri",
+                                                           "uri",
+                                                           "The URI. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-xcf-uri
+   */
+  procedure = gimp_procedure_new (image_get_xcf_uri_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-xcf-uri");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-xcf-uri",
+                                     "Returns the XCF URI for the specified image.",
+                                     "This procedure returns the XCF URI associated with the image. If there is no such URI, this procedure returns %NULL.",
+                                     "Eric Grivel <gimp@lumenssolutions.com>",
+                                     "Eric Grivel",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("uri",
+                                                           "uri",
+                                                           "The imported URI. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-imported-uri
+   */
+  procedure = gimp_procedure_new (image_get_imported_uri_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-imported-uri");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-imported-uri",
+                                     "Returns the imported URI for the specified image.",
+                                     "This procedure returns the URI associated with the specified image if the image was imported from a non-native Gimp format. If the image was not imported, or has since been saved in the native Gimp format, this procedure returns %NULL.",
+                                     "Eric Grivel <gimp@lumenssolutions.com>",
+                                     "Eric Grivel",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("uri",
+                                                           "uri",
+                                                           "The imported URI. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-exported-uri
+   */
+  procedure = gimp_procedure_new (image_get_exported_uri_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-exported-uri");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-exported-uri",
+                                     "Returns the exported URI for the specified image.",
+                                     "This procedure returns the URI associated with the specified image if the image was exported a non-native GIMP format. If the image was not exported, this procedure returns %NULL.",
+                                     "Eric Grivel <gimp@lumenssolutions.com>",
+                                     "Eric Grivel",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("uri",
+                                                           "uri",
+                                                           "The exported URI. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-name
+   */
+  procedure = gimp_procedure_new (image_get_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-name",
+                                     "Returns the specified image's name.",
+                                     "This procedure returns the image's name. If the image has a filename or an URI, then the returned name contains the filename's or URI's base name (the last component of the path). Otherwise it is the translated string \"Untitled\". The returned name is formatted like the image name in the image window title, it may contain '[]', '(imported)' etc. and should only be used to label user interface elements. Never use it to construct filenames.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name. The returned value must be freed with g_free()",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-resolution
+   */
+  procedure = gimp_procedure_new (image_get_resolution_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-resolution");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-resolution",
+                                     "Returns the specified image's resolution.",
+                                     "This procedure returns the specified image's resolution in dots per inch. This value is independent of any of the layers in this image.",
+                                     "Austin Donnelly",
+                                     "Austin Donnelly",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("xresolution",
+                                                        "xresolution",
+                                                        "The resolution in the x-axis, in dots per inch",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("yresolution",
+                                                        "yresolution",
+                                                        "The resolution in the y-axis, in dots per inch",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-resolution
+   */
+  procedure = gimp_procedure_new (image_set_resolution_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-resolution");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-resolution",
+                                     "Sets the specified image's resolution.",
+                                     "This procedure sets the specified image's resolution in dots per inch. This value is independent of any of the layers in this image. No scaling or resizing is performed.",
+                                     "Austin Donnelly",
+                                     "Austin Donnelly",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("xresolution",
+                                                    "xresolution",
+                                                    "The new image resolution in the x-axis, in dots per inch",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("yresolution",
+                                                    "yresolution",
+                                                    "The new image resolution in the y-axis, in dots per inch",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-unit
+   */
+  procedure = gimp_procedure_new (image_get_unit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-unit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-unit",
+                                     "Returns the specified image's unit.",
+                                     "This procedure returns the specified image's unit. This value is independent of any of the layers in this image. See the gimp_unit_*() procedure definitions for the valid range of unit IDs and a description of the unit system.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_unit ("unit",
+                                                         "unit",
+                                                         "The unit",
+                                                         TRUE,
+                                                         FALSE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-unit
+   */
+  procedure = gimp_procedure_new (image_set_unit_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-unit");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-unit",
+                                     "Sets the specified image's unit.",
+                                     "This procedure sets the specified image's unit. No scaling or resizing is performed. This value is independent of any of the layers in this image. See the gimp_unit_*() procedure definitions for the valid range of unit IDs and a description of the unit system.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit",
+                                                     "unit",
+                                                     "The new image unit",
+                                                     FALSE,
+                                                     FALSE,
+                                                     GIMP_UNIT_INCH,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-tattoo-state
+   */
+  procedure = gimp_procedure_new (image_get_tattoo_state_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-tattoo-state");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-tattoo-state",
+                                     "Returns the tattoo state associated with the image.",
+                                     "This procedure returns the tattoo state of the image. Use only by save/load plug-ins that wish to preserve an images tattoo state. Using this function at other times will produce unexpected results.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "2000",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("tattoo-state",
+                                                      "tattoo state",
+                                                      "The tattoo state",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-tattoo-state
+   */
+  procedure = gimp_procedure_new (image_set_tattoo_state_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-tattoo-state");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-tattoo-state",
+                                     "Set the tattoo state associated with the image.",
+                                     "This procedure sets the tattoo state of the image. Use only by save/load plug-ins that wish to preserve an images tattoo state. Using this function at other times will produce unexpected results. A full check of uniqueness of states in layers, channels and paths will be performed by this procedure and a execution failure will be returned if this fails. A failure will also be returned if the new tattoo state value is less than the maximum tattoo value from all of the tattoos from the paths, layers and channels. After the image data has been loaded and all the tattoos have been set then this is the last procedure that should be called. If effectively does a status check on the tattoo values that have been set to make sure that all is OK.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "2000",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("tattoo-state",
+                                                  "tattoo state",
+                                                  "The new image tattoo state",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-layer-by-tattoo
+   */
+  procedure = gimp_procedure_new (image_get_layer_by_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-layer-by-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-layer-by-tattoo",
+                                     "Find a layer with a given tattoo in an image.",
+                                     "This procedure returns the layer with the given tattoo in the specified image.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("tattoo",
+                                                  "tattoo",
+                                                  "The tattoo of the layer to find",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The layer with the specified tattoo",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-channel-by-tattoo
+   */
+  procedure = gimp_procedure_new (image_get_channel_by_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-channel-by-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-channel-by-tattoo",
+                                     "Find a channel with a given tattoo in an image.",
+                                     "This procedure returns the channel with the given tattoo in the specified image.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("tattoo",
+                                                  "tattoo",
+                                                  "The tattoo of the channel to find",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("channel",
+                                                               "channel",
+                                                               "The channel with the specified tattoo",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-vectors-by-tattoo
+   */
+  procedure = gimp_procedure_new (image_get_vectors_by_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-vectors-by-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-vectors-by-tattoo",
+                                     "Find a vectors with a given tattoo in an image.",
+                                     "This procedure returns the vectors with the given tattoo in the specified image.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("tattoo",
+                                                  "tattoo",
+                                                  "The tattoo of the vectors to find",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_vectors_id ("vectors",
+                                                               "vectors",
+                                                               "The vectors with the specified tattoo",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-layer-by-name
+   */
+  procedure = gimp_procedure_new (image_get_layer_by_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-layer-by-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-layer-by-name",
+                                     "Find a layer with a given name in an image.",
+                                     "This procedure returns the layer with the given name in the specified image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the layer to find",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The layer with the specified name",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-channel-by-name
+   */
+  procedure = gimp_procedure_new (image_get_channel_by_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-channel-by-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-channel-by-name",
+                                     "Find a channel with a given name in an image.",
+                                     "This procedure returns the channel with the given name in the specified image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the channel to find",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("channel",
+                                                               "channel",
+                                                               "The channel with the specified name",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-vectors-by-name
+   */
+  procedure = gimp_procedure_new (image_get_vectors_by_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-vectors-by-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-vectors-by-name",
+                                     "Find a vectors with a given name in an image.",
+                                     "This procedure returns the vectors with the given name in the specified image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2011",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the vectors to find",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_vectors_id ("vectors",
+                                                               "vectors",
+                                                               "The vectors with the specified name",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-attach-parasite
+   */
+  procedure = gimp_procedure_new (image_attach_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-attach-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-attach-parasite",
+                                     "Add a parasite to an image.",
+                                     "This procedure attaches a parasite to an image. It has no return values.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_parasite ("parasite",
+                                                         "parasite",
+                                                         "The parasite to attach to an image",
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-detach-parasite
+   */
+  procedure = gimp_procedure_new (image_detach_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-detach-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-detach-parasite",
+                                     "Removes a parasite from an image.",
+                                     "This procedure detaches a parasite from an image. It has no return values.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the parasite to detach from an image.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-parasite
+   */
+  procedure = gimp_procedure_new (image_get_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-parasite",
+                                     "Look up a parasite in an image",
+                                     "Finds and returns the parasite that was previously attached to an image.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the parasite to find",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_parasite ("parasite",
+                                                             "parasite",
+                                                             "The found parasite",
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-parasite-list
+   */
+  procedure = gimp_procedure_new (image_get_parasite_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-parasite-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-parasite-list",
+                                     "List all parasites.",
+                                     "Returns a list of all currently attached parasites.",
+                                     "Marc Lehmann",
+                                     "Marc Lehmann",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-parasites",
+                                                          "num parasites",
+                                                          "The number of attached parasites",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("parasites",
+                                                                 "parasites",
+                                                                 "The names of currently attached parasites",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-color-profile-cmds.c b/app/pdb/image-color-profile-cmds.c
new file mode 100644
index 0000000..30e515c
--- /dev/null
+++ b/app/pdb/image-color-profile-cmds.c
@@ -0,0 +1,549 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+image_get_color_profile_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_bytes = 0;
+  guint8 *profile_data = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpColorProfile *profile;
+
+      profile = gimp_image_get_color_profile (image);
+
+      if (profile)
+        {
+          const guint8 *data;
+          gsize         length;
+
+          data = gimp_color_profile_get_icc_profile (profile, &length);
+
+          profile_data = g_memdup (data, length);
+          num_bytes = length;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 2), profile_data, num_bytes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_effective_color_profile_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_bytes = 0;
+  guint8 *profile_data = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpColorProfile *profile;
+
+      profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+      if (profile)
+        {
+          const guint8 *data;
+          gsize         length;
+
+          data = gimp_color_profile_get_icc_profile (profile, &length);
+
+          profile_data = g_memdup (data, length);
+          num_bytes = length;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 2), profile_data, num_bytes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_set_color_profile_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 num_bytes;
+  const guint8 *color_profile;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  num_bytes = g_value_get_int (gimp_value_array_index (args, 1));
+  color_profile = gimp_value_get_int8array (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (color_profile)
+        {
+          GimpColorProfile *profile;
+
+          profile = gimp_color_profile_new_from_icc_profile (color_profile,
+                                                             num_bytes,
+                                                             error);
+
+          if (profile)
+            {
+              success = gimp_image_set_color_profile (image, profile, error);
+              g_object_unref (profile);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        {
+          success = gimp_image_set_color_profile (image, NULL, error);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_set_color_profile_from_file_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *uri;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  uri = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (uri)
+        {
+          GFile            *file = g_file_new_for_uri (uri);
+          GimpColorProfile *profile;
+
+          profile = gimp_color_profile_new_from_file (file, error);
+
+          if (profile)
+            {
+              success = gimp_image_set_color_profile (image, profile, error);
+              g_object_unref (profile);
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (file);
+        }
+      else
+        {
+          success = gimp_image_set_color_profile (image, NULL, error);
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_convert_color_profile_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 num_bytes;
+  const guint8 *color_profile;
+  gint32 intent;
+  gboolean bpc;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  num_bytes = g_value_get_int (gimp_value_array_index (args, 1));
+  color_profile = gimp_value_get_int8array (gimp_value_array_index (args, 2));
+  intent = g_value_get_enum (gimp_value_array_index (args, 3));
+  bpc = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (color_profile)
+        {
+          GimpColorProfile *profile;
+
+          profile = gimp_color_profile_new_from_icc_profile (color_profile,
+                                                             num_bytes,
+                                                             error);
+
+          if (profile)
+            {
+              success = gimp_image_convert_color_profile (image, profile,
+                                                          intent, bpc,
+                                                          progress, error);
+              g_object_unref (profile);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_convert_color_profile_from_file_invoker (GimpProcedure         *procedure,
+                                               Gimp                  *gimp,
+                                               GimpContext           *context,
+                                               GimpProgress          *progress,
+                                               const GimpValueArray  *args,
+                                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *uri;
+  gint32 intent;
+  gboolean bpc;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  uri = g_value_get_string (gimp_value_array_index (args, 1));
+  intent = g_value_get_enum (gimp_value_array_index (args, 2));
+  bpc = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (uri)
+        {
+          GFile            *file = g_file_new_for_uri (uri);
+          GimpColorProfile *profile;
+
+          profile = gimp_color_profile_new_from_file (file, error);
+
+          if (profile)
+            {
+              success = gimp_image_convert_color_profile (image, profile,
+                                                          intent, bpc,
+                                                          progress, error);
+              g_object_unref (profile);
+            }
+          else
+            success = FALSE;
+
+          g_object_unref (file);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_image_color_profile_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-get-color-profile
+   */
+  procedure = gimp_procedure_new (image_get_color_profile_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-color-profile");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-color-profile",
+                                     "Returns the image's color profile",
+                                     "This procedure returns the image's color profile, or NULL if the image has no color profile assigned.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-bytes",
+                                                          "num bytes",
+                                                          "Number of bytes in the color_profile array",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("profile-data",
+                                                               "profile data",
+                                                               "The image's serialized color profile. The returned value must be freed with g_free()",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-effective-color-profile
+   */
+  procedure = gimp_procedure_new (image_get_effective_color_profile_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-effective-color-profile");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-effective-color-profile",
+                                     "Returns the color profile that is used for the image",
+                                     "This procedure returns the color profile that is actually used for this image, which is the profile returned by 'gimp-image-get-color-profile' if the image has a profile assigned, or a generated default RGB or grayscale profile, according to the image's type.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-bytes",
+                                                          "num bytes",
+                                                          "Number of bytes in the color_profile array",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("profile-data",
+                                                               "profile data",
+                                                               "The image's serialized color profile. The returned value must be freed with g_free()",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-color-profile
+   */
+  procedure = gimp_procedure_new (image_set_color_profile_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-color-profile");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-color-profile",
+                                     "Sets the image's color profile",
+                                     "This procedure sets the image's color profile, or unsets it if NULL is passed as 'color_profile'. This procedure does no color conversion.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-bytes",
+                                                      "num bytes",
+                                                      "Number of bytes in the color_profile array",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("color-profile",
+                                                           "color profile",
+                                                           "The new serialized color profile",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-set-color-profile-from-file
+   */
+  procedure = gimp_procedure_new (image_set_color_profile_from_file_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-set-color-profile-from-file");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-set-color-profile-from-file",
+                                     "Sets the image's color profile from an ICC file",
+                                     "This procedure sets the image's color profile from a file containing an ICC profile, or unsets it if NULL is passed as 'uri'. This procedure does no color conversion.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "uri",
+                                                       "The URI of the file containing the new color profile",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-convert-color-profile
+   */
+  procedure = gimp_procedure_new (image_convert_color_profile_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-color-profile");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-color-profile",
+                                     "Convert the image's layers to a color profile",
+                                     "This procedure converts from the image's color profile (or the default RGB or grayscale profile if none is set) to the given color profile. Only RGB and grayscale color profiles are accepted, according to the image's type.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-bytes",
+                                                      "num bytes",
+                                                      "Number of bytes in the color_profile array",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("color-profile",
+                                                           "color profile",
+                                                           "The serialized color profile",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("intent",
+                                                  "intent",
+                                                  "Rendering intent",
+                                                  GIMP_TYPE_COLOR_RENDERING_INTENT,
+                                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("bpc",
+                                                     "bpc",
+                                                     "Black point compensation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-convert-color-profile-from-file
+   */
+  procedure = gimp_procedure_new (image_convert_color_profile_from_file_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-color-profile-from-file");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-color-profile-from-file",
+                                     "Convert the image's layers to a color profile",
+                                     "This procedure converts from the image's color profile (or the default RGB or grayscale profile if none is set) to an ICC profile specified by 'uri'. Only RGB and grayscale color profiles are accepted, according to the image's type.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("uri",
+                                                       "uri",
+                                                       "The URI of the file containing the new color profile",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("intent",
+                                                  "intent",
+                                                  "Rendering intent",
+                                                  GIMP_TYPE_COLOR_RENDERING_INTENT,
+                                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("bpc",
+                                                     "bpc",
+                                                     "Black point compensation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-convert-cmds.c b/app/pdb/image-convert-cmds.c
new file mode 100644
index 0000000..a17cb36
--- /dev/null
+++ b/app/pdb/image-convert-cmds.c
@@ -0,0 +1,450 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage-convert-indexed.h"
+#include "core/gimpimage-convert-precision.h"
+#include "core/gimpimage-convert-type.h"
+#include "core/gimpimage.h"
+#include "core/gimpitemstack.h"
+#include "core/gimppalette.h"
+#include "core/gimpparamspecs.h"
+#include "gegl/gimp-babl.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+image_convert_rgb_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_RGB, error) &&
+          gimp_babl_is_valid (GIMP_RGB, gimp_image_get_precision (image)))
+        {
+          success = gimp_image_convert_type (image, GIMP_RGB, NULL, NULL, error);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_convert_grayscale_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_GRAY, error) &&
+          gimp_babl_is_valid (GIMP_GRAY, gimp_image_get_precision (image)))
+        {
+          success = gimp_image_convert_type (image, GIMP_GRAY, NULL, NULL, error);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_convert_indexed_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 dither_type;
+  gint32 palette_type;
+  gint32 num_cols;
+  gboolean alpha_dither;
+  gboolean remove_unused;
+  const gchar *palette;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  dither_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  palette_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  num_cols = g_value_get_int (gimp_value_array_index (args, 3));
+  alpha_dither = g_value_get_boolean (gimp_value_array_index (args, 4));
+  remove_unused = g_value_get_boolean (gimp_value_array_index (args, 5));
+  palette = g_value_get_string (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      GimpPalette *pal = NULL;
+
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_INDEXED, error)        &&
+          gimp_pdb_image_is_precision (image, GIMP_PRECISION_U8_GAMMA, error) &&
+          gimp_babl_is_valid (GIMP_INDEXED, gimp_image_get_precision (image)) &&
+          gimp_item_stack_is_flat (GIMP_ITEM_STACK (gimp_image_get_layers (image))))
+        {
+          switch (palette_type)
+            {
+            case GIMP_CONVERT_PALETTE_GENERATE:
+              if (num_cols < 1 || num_cols > MAXNUMCOLORS)
+                success = FALSE;
+              break;
+
+            case GIMP_CONVERT_PALETTE_CUSTOM:
+              pal = gimp_pdb_get_palette (gimp, palette, FALSE, error);
+              if (! pal)
+                {
+                  success = FALSE;
+                }
+              else if (pal->n_colors > MAXNUMCOLORS)
+                {
+                  g_set_error_literal (error,
+                                       GIMP_PDB_ERROR,
+                                       GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                                       _("Cannot convert to a palette "
+                                         "with more than 256 colors."));
+                  success = FALSE;
+                }
+              break;
+
+            default:
+              break;
+            }
+        }
+      else
+        {
+          success = FALSE;
+        }
+
+      if (success)
+        success = gimp_image_convert_indexed (image,
+                                              palette_type, num_cols, remove_unused,
+                                              dither_type, alpha_dither, FALSE,
+                                              pal,
+                                              NULL, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_convert_set_dither_matrix_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 width;
+  gint32 height;
+  gint32 matrix_length;
+  const guint8 *matrix;
+
+  width = g_value_get_int (gimp_value_array_index (args, 0));
+  height = g_value_get_int (gimp_value_array_index (args, 1));
+  matrix_length = g_value_get_int (gimp_value_array_index (args, 2));
+  matrix = gimp_value_get_int8array (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (width == 0 || height == 0 || matrix_length == width * height)
+        {
+          gimp_image_convert_indexed_set_dither_matrix (matrix, width, height);
+        }
+      else
+        {
+          g_set_error_literal (error, GIMP_PDB_ERROR,
+                               GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                               "Dither matrix length must be width * height");
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_convert_precision_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 precision;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  precision = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp->plug_in_manager->current_plug_in)
+        gimp_plug_in_enable_precision (gimp->plug_in_manager->current_plug_in);
+
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_INDEXED, error) &&
+          gimp_pdb_image_is_not_precision (image, precision, error)    &&
+          gimp_babl_is_valid (gimp_image_get_base_type (image), precision))
+        {
+          gimp_image_convert_precision (image, precision,
+                                        GEGL_DITHER_NONE,
+                                        GEGL_DITHER_NONE,
+                                        GEGL_DITHER_NONE,
+                                        progress);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_image_convert_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-convert-rgb
+   */
+  procedure = gimp_procedure_new (image_convert_rgb_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-rgb");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-rgb",
+                                     "Convert specified image to RGB color",
+                                     "This procedure converts the specified image to RGB color. This process requires an image in Grayscale or Indexed color mode. No image content is lost in this process aside from the colormap for an indexed image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-convert-grayscale
+   */
+  procedure = gimp_procedure_new (image_convert_grayscale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-grayscale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-grayscale",
+                                     "Convert specified image to grayscale",
+                                     "This procedure converts the specified image to grayscale. This process requires an image in RGB or Indexed color mode.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-convert-indexed
+   */
+  procedure = gimp_procedure_new (image_convert_indexed_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-indexed");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-indexed",
+                                     "Convert specified image to and Indexed image",
+                                     "This procedure converts the specified image to 'indexed' color. This process requires an image in RGB or Grayscale mode. The 'palette_type' specifies what kind of palette to use, A type of '0' means to use an optimal palette of 'num_cols' generated from the colors in the image. A type of '1' means to re-use the previous palette (not currently implemented). A type of '2' means to use the so-called WWW-optimized palette. Type '3' means to use only black and white colors. A type of '4' means to use a palette from the gimp palettes directories. The 'dither type' specifies what kind of dithering to use. '0' means no dithering, '1' means standard Floyd-Steinberg error diffusion, '2' means Floyd-Steinberg error diffusion with reduced bleeding, '3' means dithering based on pixel location ('Fixed' dithering).",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("dither-type",
+                                                  "dither type",
+                                                  "The dither type to use",
+                                                  GIMP_TYPE_CONVERT_DITHER_TYPE,
+                                                  GIMP_CONVERT_DITHER_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("palette-type",
+                                                  "palette type",
+                                                  "The type of palette to use",
+                                                  GIMP_TYPE_CONVERT_PALETTE_TYPE,
+                                                  GIMP_CONVERT_PALETTE_GENERATE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-cols",
+                                                      "num cols",
+                                                      "The number of colors to quantize to, ignored unless (palette_type == GIMP_CONVERT_PALETTE_GENERATE)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("alpha-dither",
+                                                     "alpha dither",
+                                                     "Dither transparency to fake partial opacity",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("remove-unused",
+                                                     "remove unused",
+                                                     "Remove unused or duplicate color entries from final palette, ignored if (palette_type == GIMP_CONVERT_PALETTE_GENERATE)",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("palette",
+                                                       "palette",
+                                                       "The name of the custom palette to use, ignored unless (palette_type == GIMP_CONVERT_PALETTE_CUSTOM)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-convert-set-dither-matrix
+   */
+  procedure = gimp_procedure_new (image_convert_set_dither_matrix_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-set-dither-matrix");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-set-dither-matrix",
+                                     "Set dither matrix for conversion to indexed",
+                                     "This procedure sets the dither matrix used when converting images to INDEXED mode with positional dithering.",
+                                     "David Gowers",
+                                     "David Gowers",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "Width of the matrix (0 to reset to default matrix)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "Height of the matrix (0 to reset to default matrix)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("matrix-length",
+                                                      "matrix length",
+                                                      "The length of 'matrix'",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("matrix",
+                                                           "matrix",
+                                                           "The matrix -- all values must be >= 1",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-convert-precision
+   */
+  procedure = gimp_procedure_new (image_convert_precision_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-convert-precision");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-convert-precision",
+                                     "Convert the image to the specified precision",
+                                     "This procedure converts the image to the specified precision. Note that indexed images cannot be converted and are always in GIMP_PRECISION_U8.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("precision",
+                                                  "precision",
+                                                  "The new precision",
+                                                  GIMP_TYPE_PRECISION,
+                                                  GIMP_PRECISION_U8_LINEAR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-grid-cmds.c b/app/pdb/image-grid-cmds.c
new file mode 100644
index 0000000..f74309b
--- /dev/null
+++ b/app/pdb/image-grid-cmds.c
@@ -0,0 +1,708 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbaseenums.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpgrid.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+image_grid_get_spacing_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gdouble xspacing = 0.0;
+  gdouble yspacing = 0.0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_get (grid,
+                      "xspacing", &xspacing,
+                      "yspacing", &yspacing,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), xspacing);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), yspacing);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_grid_set_spacing_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble xspacing;
+  gdouble yspacing;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  xspacing = g_value_get_double (gimp_value_array_index (args, 1));
+  yspacing = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_set (grid,
+                      "xspacing", xspacing,
+                      "yspacing", yspacing,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_grid_get_offset_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gdouble xoffset = 0.0;
+  gdouble yoffset = 0.0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_get (grid,
+                      "xoffset", &xoffset,
+                      "yoffset", &yoffset,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), xoffset);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), yoffset);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_grid_set_offset_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble xoffset;
+  gdouble yoffset;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  xoffset = g_value_get_double (gimp_value_array_index (args, 1));
+  yoffset = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_set (grid,
+                      "xoffset", xoffset,
+                      "yoffset", yoffset,
+                      NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_grid_get_foreground_color_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpRGB fgcolor = { 0.0, 0.0, 0.0, 1.0 };
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        fgcolor = grid->fgcolor;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &fgcolor);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_grid_set_foreground_color_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpRGB fgcolor;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 1), &fgcolor);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_set (grid, "fgcolor", &fgcolor, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_grid_get_background_color_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpRGB bgcolor = { 0.0, 0.0, 0.0, 1.0 };
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        bgcolor = grid->bgcolor;
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &bgcolor);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_grid_set_background_color_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpRGB bgcolor;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 1), &bgcolor);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_set (grid, "bgcolor", &bgcolor, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_grid_get_style_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 style = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_get (grid, "style", &style, NULL);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), style);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_grid_set_style_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 style;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  style = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      if (grid)
+        g_object_set (grid, "style", style, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_image_grid_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-grid-get-spacing
+   */
+  procedure = gimp_procedure_new (image_grid_get_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-get-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-get-spacing",
+                                     "Gets the spacing of an image's grid.",
+                                     "This procedure retrieves the horizontal and vertical spacing of an image's grid. It takes the image as parameter.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("xspacing",
+                                                        "xspacing",
+                                                        "The image's grid horizontal spacing",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("yspacing",
+                                                        "yspacing",
+                                                        "The image's grid vertical spacing",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-set-spacing
+   */
+  procedure = gimp_procedure_new (image_grid_set_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-set-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-set-spacing",
+                                     "Sets the spacing of an image's grid.",
+                                     "This procedure sets the horizontal and vertical spacing of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("xspacing",
+                                                    "xspacing",
+                                                    "The image's grid horizontal spacing",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("yspacing",
+                                                    "yspacing",
+                                                    "The image's grid vertical spacing",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-get-offset
+   */
+  procedure = gimp_procedure_new (image_grid_get_offset_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-get-offset");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-get-offset",
+                                     "Gets the offset of an image's grid.",
+                                     "This procedure retrieves the horizontal and vertical offset of an image's grid. It takes the image as parameter.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("xoffset",
+                                                        "xoffset",
+                                                        "The image's grid horizontal offset",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("yoffset",
+                                                        "yoffset",
+                                                        "The image's grid vertical offset",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-set-offset
+   */
+  procedure = gimp_procedure_new (image_grid_set_offset_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-set-offset");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-set-offset",
+                                     "Sets the offset of an image's grid.",
+                                     "This procedure sets the horizontal and vertical offset of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("xoffset",
+                                                    "xoffset",
+                                                    "The image's grid horizontal offset",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("yoffset",
+                                                    "yoffset",
+                                                    "The image's grid vertical offset",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-get-foreground-color
+   */
+  procedure = gimp_procedure_new (image_grid_get_foreground_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-get-foreground-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-get-foreground-color",
+                                     "Sets the foreground color of an image's grid.",
+                                     "This procedure gets the foreground color of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("fgcolor",
+                                                        "fgcolor",
+                                                        "The image's grid foreground color",
+                                                        TRUE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-set-foreground-color
+   */
+  procedure = gimp_procedure_new (image_grid_set_foreground_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-set-foreground-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-set-foreground-color",
+                                     "Gets the foreground color of an image's grid.",
+                                     "This procedure sets the foreground color of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("fgcolor",
+                                                    "fgcolor",
+                                                    "The new foreground color",
+                                                    TRUE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-get-background-color
+   */
+  procedure = gimp_procedure_new (image_grid_get_background_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-get-background-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-get-background-color",
+                                     "Sets the background color of an image's grid.",
+                                     "This procedure gets the background color of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("bgcolor",
+                                                        "bgcolor",
+                                                        "The image's grid background color",
+                                                        TRUE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-set-background-color
+   */
+  procedure = gimp_procedure_new (image_grid_set_background_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-set-background-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-set-background-color",
+                                     "Gets the background color of an image's grid.",
+                                     "This procedure sets the background color of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("bgcolor",
+                                                    "bgcolor",
+                                                    "The new background color",
+                                                    TRUE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-get-style
+   */
+  procedure = gimp_procedure_new (image_grid_get_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-get-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-get-style",
+                                     "Gets the style of an image's grid.",
+                                     "This procedure retrieves the style of an image's grid.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("style",
+                                                      "style",
+                                                      "The image's grid style",
+                                                      GIMP_TYPE_GRID_STYLE,
+                                                      GIMP_GRID_DOTS,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-grid-set-style
+   */
+  procedure = gimp_procedure_new (image_grid_set_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-grid-set-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-grid-set-style",
+                                     "Sets the style unit of an image's grid.",
+                                     "This procedure sets the style of an image's grid. It takes the image and the new style as parameters.",
+                                     "Sylvain Foret",
+                                     "Sylvain Foret",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("style",
+                                                  "style",
+                                                  "The image's grid style",
+                                                  GIMP_TYPE_GRID_STYLE,
+                                                  GIMP_GRID_DOTS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-guides-cmds.c b/app/pdb/image-guides-cmds.c
new file mode 100644
index 0000000..21d36ce
--- /dev/null
+++ b/app/pdb/image-guides-cmds.c
@@ -0,0 +1,477 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "cairo.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+image_add_hguide_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 yposition;
+  gint32 guide = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  yposition = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (yposition <= gimp_image_get_height (image))
+        {
+          GimpGuide *g;
+
+          g = gimp_image_add_hguide (image, yposition, TRUE);
+          guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), guide);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_add_vguide_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 xposition;
+  gint32 guide = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  xposition = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (xposition <= gimp_image_get_width (image))
+        {
+          GimpGuide *g;
+
+          g = gimp_image_add_vguide (image, xposition, TRUE);
+          guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), guide);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_delete_guide_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 guide;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  guide = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGuide *g = gimp_pdb_image_get_guide (image, guide, error);
+
+      if (g)
+        gimp_image_remove_guide (image, g, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_find_next_guide_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 guide;
+  gint32 next_guide = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  guide = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGuide *g = gimp_image_get_next_guide (image, guide, &success);
+
+      if (g)
+        next_guide = gimp_aux_item_get_ID (GIMP_AUX_ITEM (g));
+
+      if (! success)
+        g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                     _("Image '%s' (%d) does not contain guide with ID %d"),
+                     gimp_image_get_display_name (image),
+                     gimp_image_get_ID (image),
+                     guide);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), next_guide);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_guide_orientation_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 guide;
+  gint32 orientation = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  guide = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGuide *g = gimp_pdb_image_get_guide (image, guide, error);
+
+      if (g)
+        orientation = gimp_guide_get_orientation (g);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), orientation);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_guide_position_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 guide;
+  gint32 position = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  guide = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpGuide *g = gimp_pdb_image_get_guide (image, guide, error);
+
+      if (g)
+        position = gimp_guide_get_position (g);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), position);
+
+  return return_vals;
+}
+
+void
+register_image_guides_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-add-hguide
+   */
+  procedure = gimp_procedure_new (image_add_hguide_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-hguide");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-hguide",
+                                     "Add a horizontal guide to an image.",
+                                     "This procedure adds a horizontal guide to an image. It takes the input image and the y-position of the new guide as parameters. It returns the guide ID of the new guide.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("yposition",
+                                                      "yposition",
+                                                      "The guide's y-offset from top of image",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("guide",
+                                                      "guide",
+                                                      "The new guide",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-add-vguide
+   */
+  procedure = gimp_procedure_new (image_add_vguide_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-vguide");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-vguide",
+                                     "Add a vertical guide to an image.",
+                                     "This procedure adds a vertical guide to an image. It takes the input image and the x-position of the new guide as parameters. It returns the guide ID of the new guide.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("xposition",
+                                                      "xposition",
+                                                      "The guide's x-offset from left of image",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("guide",
+                                                      "guide",
+                                                      "The new guide",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-delete-guide
+   */
+  procedure = gimp_procedure_new (image_delete_guide_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-delete-guide");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-delete-guide",
+                                     "Deletes a guide from an image.",
+                                     "This procedure takes an image and a guide ID as input and removes the specified guide from the specified image.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("guide",
+                                                  "guide",
+                                                  "The ID of the guide to be removed",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-find-next-guide
+   */
+  procedure = gimp_procedure_new (image_find_next_guide_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-find-next-guide");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-find-next-guide",
+                                     "Find next guide on an image.",
+                                     "This procedure takes an image and a guide ID as input and finds the guide ID of the successor of the given guide ID in the image's guide list. If the supplied guide ID is 0, the procedure will return the first Guide. The procedure will return 0 if given the final guide ID as an argument or the image has no guides.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("guide",
+                                                  "guide",
+                                                  "The ID of the current guide (0 if first invocation)",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("next-guide",
+                                                      "next guide",
+                                                      "The next guide's ID",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-guide-orientation
+   */
+  procedure = gimp_procedure_new (image_get_guide_orientation_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-guide-orientation");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-guide-orientation",
+                                     "Get orientation of a guide on an image.",
+                                     "This procedure takes an image and a guide ID as input and returns the orientations of the guide.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("guide",
+                                                  "guide",
+                                                  "The guide",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_enum ("orientation",
+                                                         "orientation",
+                                                         "The guide's orientation",
+                                                         GIMP_TYPE_ORIENTATION_TYPE,
+                                                         GIMP_ORIENTATION_HORIZONTAL,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->values[0]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-guide-position
+   */
+  procedure = gimp_procedure_new (image_get_guide_position_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-guide-position");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-guide-position",
+                                     "Get position of a guide on an image.",
+                                     "This procedure takes an image and a guide ID as input and returns the position of the guide relative to the top or left of the image.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("guide",
+                                                  "guide",
+                                                  "The guide",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("position",
+                                                          "position",
+                                                          "The guide's position relative to top or left of image",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-sample-points-cmds.c b/app/pdb/image-sample-points-cmds.c
new file mode 100644
index 0000000..a8a1965
--- /dev/null
+++ b/app/pdb/image-sample-points-cmds.c
@@ -0,0 +1,350 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpsamplepoint.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+image_add_sample_point_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 position_x;
+  gint32 position_y;
+  gint32 sample_point = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  position_x = g_value_get_int (gimp_value_array_index (args, 1));
+  position_y = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (position_x <= gimp_image_get_width  (image) &&
+          position_y <= gimp_image_get_height (image))
+        {
+          GimpSamplePoint *sp;
+
+          sp = gimp_image_add_sample_point_at_pos (image, position_x, position_y,
+                                                   TRUE);
+          sample_point = gimp_aux_item_get_ID (GIMP_AUX_ITEM (sp));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), sample_point);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_delete_sample_point_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 sample_point;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  sample_point = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpSamplePoint *sp = gimp_pdb_image_get_sample_point (image, sample_point,
+                                                             error);
+
+      if (sp)
+        gimp_image_remove_sample_point (image, sp, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_find_next_sample_point_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 sample_point;
+  gint32 next_sample_point = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  sample_point = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpSamplePoint *sp = gimp_image_get_next_sample_point (image, sample_point,
+                                                              &success);
+
+      if (sp)
+        next_sample_point = gimp_aux_item_get_ID (GIMP_AUX_ITEM (sp));
+
+      if (! success)
+        g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                     _("Image '%s' (%d) does not contain sample point with ID %d"),
+                     gimp_image_get_display_name (image),
+                     gimp_image_get_ID (image),
+                     sample_point);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), next_sample_point);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_get_sample_point_position_invoker (GimpProcedure         *procedure,
+                                         Gimp                  *gimp,
+                                         GimpContext           *context,
+                                         GimpProgress          *progress,
+                                         const GimpValueArray  *args,
+                                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 sample_point;
+  gint32 position_x = 0;
+  gint32 position_y = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  sample_point = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpSamplePoint *sp = gimp_pdb_image_get_sample_point (image, sample_point,
+                                                             error);
+
+      if (sp)
+        gimp_sample_point_get_position (sp, &position_x, &position_y);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), position_x);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), position_y);
+    }
+
+  return return_vals;
+}
+
+void
+register_image_sample_points_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-add-sample-point
+   */
+  procedure = gimp_procedure_new (image_add_sample_point_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-add-sample-point");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-add-sample-point",
+                                     "Add a sample point to an image.",
+                                     "This procedure adds a sample point to an image. It takes the input image and the position of the new sample points as parameters. It returns the sample point ID of the new sample point.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position-x",
+                                                      "position x",
+                                                      "The guide'sample points x-offset from left of image",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("position-y",
+                                                      "position y",
+                                                      "The guide'sample points y-offset from top of image",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("sample-point",
+                                                      "sample point",
+                                                      "The new sample point",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-delete-sample-point
+   */
+  procedure = gimp_procedure_new (image_delete_sample_point_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-delete-sample-point");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-delete-sample-point",
+                                     "Deletes a sample point from an image.",
+                                     "This procedure takes an image and a sample point ID as input and removes the specified sample point from the specified image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("sample-point",
+                                                  "sample point",
+                                                  "The ID of the sample point to be removed",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-find-next-sample-point
+   */
+  procedure = gimp_procedure_new (image_find_next_sample_point_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-find-next-sample-point");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-find-next-sample-point",
+                                     "Find next sample point on an image.",
+                                     "This procedure takes an image and a sample point ID as input and finds the sample point ID of the successor of the given sample point ID in the image's sample point list. If the supplied sample point ID is 0, the procedure will return the first sample point. The procedure will return 0 if given the final sample point ID as an argument or the image has no sample points.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("sample-point",
+                                                  "sample point",
+                                                  "The ID of the current sample point (0 if first invocation)",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("next-sample-point",
+                                                      "next sample point",
+                                                      "The next sample point's ID",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-get-sample-point-position
+   */
+  procedure = gimp_procedure_new (image_get_sample_point_position_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-get-sample-point-position");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-get-sample-point-position",
+                                     "Get position of a sample point on an image.",
+                                     "This procedure takes an image and a sample point ID as input and returns the position of the sample point relative to the top and left of the image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("sample-point",
+                                                  "sample point",
+                                                  "The guide",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("position-x",
+                                                          "position x",
+                                                          "The sample points's position relative to top of image",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("position-y",
+                                                          "position y",
+                                                          "The sample points's position relative to top of image",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-select-cmds.c b/app/pdb/image-select-cmds.c
new file mode 100644
index 0000000..3980aea
--- /dev/null
+++ b/app/pdb/image-select-cmds.c
@@ -0,0 +1,718 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpchannel-select.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+image_select_color_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  GimpDrawable *drawable;
+  GimpRGB color;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 3), &color);
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      if (pdb_context->sample_merged ||
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), image, 0, error))
+        {
+          gimp_channel_select_by_color (gimp_image_get_mask (image), drawable,
+                                        pdb_context->sample_merged,
+                                        &color,
+                                        pdb_context->sample_threshold,
+                                        pdb_context->sample_transparent,
+                                        pdb_context->sample_criterion,
+                                        operation,
+                                        pdb_context->antialias,
+                                        pdb_context->feather,
+                                        pdb_context->feather_radius_x,
+                                        pdb_context->feather_radius_y);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_select_contiguous_color_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  GimpDrawable *drawable;
+  gdouble x;
+  gdouble y;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 3));
+  y = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      if (pdb_context->sample_merged ||
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), image, 0, error))
+        {
+
+          gimp_channel_select_fuzzy (gimp_image_get_mask (image),
+                                     drawable,
+                                     pdb_context->sample_merged,
+                                     x, y,
+                                     pdb_context->sample_threshold,
+                                     pdb_context->sample_transparent,
+                                     pdb_context->sample_criterion,
+                                     pdb_context->diagonal_neighbors,
+                                     operation,
+                                     pdb_context->antialias,
+                                     pdb_context->feather,
+                                     pdb_context->feather_radius_x,
+                                     pdb_context->feather_radius_y);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_select_rectangle_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+  width = g_value_get_double (gimp_value_array_index (args, 4));
+  height = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      gimp_channel_select_rectangle (gimp_image_get_mask (image),
+                                     (gint) x, (gint) y,
+                                     (gint) width, (gint) height,
+                                     operation,
+                                     pdb_context->feather,
+                                     pdb_context->feather_radius_x,
+                                     pdb_context->feather_radius_y,
+                                     TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_select_round_rectangle_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+  gdouble corner_radius_x;
+  gdouble corner_radius_y;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+  width = g_value_get_double (gimp_value_array_index (args, 4));
+  height = g_value_get_double (gimp_value_array_index (args, 5));
+  corner_radius_x = g_value_get_double (gimp_value_array_index (args, 6));
+  corner_radius_y = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      gimp_channel_select_round_rect (gimp_image_get_mask (image),
+                                      (gint) x, (gint) y,
+                                      (gint) width, (gint) height,
+                                      corner_radius_x,
+                                      corner_radius_y,
+                                      operation,
+                                      pdb_context->antialias,
+                                      pdb_context->feather,
+                                      pdb_context->feather_radius_x,
+                                      pdb_context->feather_radius_y,
+                                      TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_select_ellipse_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+  width = g_value_get_double (gimp_value_array_index (args, 4));
+  height = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      gimp_channel_select_ellipse (gimp_image_get_mask (image),
+                                   (gint) x, (gint) y,
+                                   (gint) width, (gint) height,
+                                   operation,
+                                   pdb_context->antialias,
+                                   pdb_context->feather,
+                                   pdb_context->feather_radius_x,
+                                   pdb_context->feather_radius_y,
+                                   TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_select_polygon_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  gint32 num_segs;
+  const gdouble *segs;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  num_segs = g_value_get_int (gimp_value_array_index (args, 2));
+  segs = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      gimp_channel_select_polygon (gimp_image_get_mask (image),
+                                   _("Free Select"),
+                                   num_segs / 2,
+                                   (GimpVector2 *) segs,
+                                   operation,
+                                   pdb_context->antialias,
+                                   pdb_context->feather,
+                                   pdb_context->feather_radius_x,
+                                   pdb_context->feather_radius_y,
+                                   TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_select_item_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 operation;
+  GimpItem *item;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  item = gimp_value_get_item (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (item, image, 0, error))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+          gimp_item_to_selection (item, operation,
+                                  pdb_context->antialias,
+                                  pdb_context->feather,
+                                  pdb_context->feather_radius_x,
+                                  pdb_context->feather_radius_y);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_image_select_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-select-color
+   */
+  procedure = gimp_procedure_new (image_select_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-color",
+                                     "Create a selection by selecting all pixels (in the specified drawable) with the same (or similar) color to that specified.",
+                                     "This tool creates a selection over the specified image. A by-color selection is determined by the supplied color under the constraints of the current context settings. Essentially, all pixels (in the drawable) that have color sufficiently close to the specified color (as determined by the threshold and criterion context values) are included in the selection. To select transparent regions, the color specified must also have minimum alpha.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius', 'gimp-context-set-sample-merged', 'gimp-context-set-sample-criterion', 'gimp-context-set-sample-threshold', 'gimp-context-set-sample-transparent'.\n"
+                                     "\n"
+                                     "In the case of a merged sampling, the supplied drawable is ignored.",
+                                     "David Gowers",
+                                     "David Gowers",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The affected image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The color to select",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-select-contiguous-color
+   */
+  procedure = gimp_procedure_new (image_select_contiguous_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-contiguous-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-contiguous-color",
+                                     "Create a selection by selecting all pixels around specified coordinates with the same (or similar) color to that at the coordinates.",
+                                     "This tool creates a contiguous selection over the specified image. A contiguous color selection is determined by a seed fill under the constraints of the current context settings. Essentially, the color at the specified coordinates (in the drawable) is measured and the selection expands outwards from that point to any adjacent pixels which are not significantly different (as determined by the threshold and criterion context settings). This process continues until no more expansion is possible. If antialiasing is turned on, the final selection mask will contain intermediate values based on close misses to the threshold bar at pixels along the seed fill boundary.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius', 'gimp-context-set-sample-merged', 'gimp-context-set-sample-criterion', 'gimp-context-set-sample-threshold', 'gimp-context-set-sample-transparent', 'gimp-context-set-diagonal-neighbors'.\n"
+                                     "\n"
+                                     "In the case of a merged sampling, the supplied drawable is ignored. If the sample is merged, the specified coordinates are relative to the image origin; otherwise, they are relative to the drawable's origin.",
+                                     "David Gowers",
+                                     "David Gowers",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The affected image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of initial seed fill point: (image coordinates)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of initial seed fill point: (image coordinates)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-select-rectangle
+   */
+  procedure = gimp_procedure_new (image_select_rectangle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-rectangle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-rectangle",
+                                     "Create a rectangular selection over the specified image;",
+                                     "This tool creates a rectangular selection over the specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection mask.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The width of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The height of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-select-round-rectangle
+   */
+  procedure = gimp_procedure_new (image_select_round_rectangle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-round-rectangle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-round-rectangle",
+                                     "Create a rectangular selection with round corners over the specified image;",
+                                     "This tool creates a rectangular selection with round corners over the specified image. The rectangular region can be either added to, subtracted from, or replace the contents of the previous selection mask.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.",
+                                     "Martin Nordholts",
+                                     "Martin Nordholts",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The width of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The height of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("corner-radius-x",
+                                                    "corner radius x",
+                                                    "The corner radius in X direction",
+                                                    0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("corner-radius-y",
+                                                    "corner radius y",
+                                                    "The corner radius in Y direction",
+                                                    0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-select-ellipse
+   */
+  procedure = gimp_procedure_new (image_select_ellipse_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-ellipse");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-ellipse",
+                                     "Create an elliptical selection over the specified image.",
+                                     "This tool creates an elliptical selection over the specified image. The elliptical region can be either added to, subtracted from, or replace the contents of the previous selection mask.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of ellipse bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of ellipse bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The width of the ellipse",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The height of the ellipse",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-select-polygon
+   */
+  procedure = gimp_procedure_new (image_select_polygon_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-polygon");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-polygon",
+                                     "Create a polygonal selection over the specified image.",
+                                     "This tool creates a polygonal selection over the specified image. The polygonal region can be either added to, subtracted from, or replace the contents of the previous selection mask. The polygon is specified through an array of floating point numbers and its length. The length of array must be 2n, where n is the number of points. Each point is defined by 2 floating point values which correspond to the x and y coordinates. If the final point does not connect to the starting point, a connecting segment is automatically added.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-segs",
+                                                      "num segs",
+                                                      "Number of points (count 1 coordinate as two points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("segs",
+                                                            "segs",
+                                                            "Array of points: { p1.x, p1.y, p2.x, p2.y, ..., pn.x, pn.y}",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-select-item
+   */
+  procedure = gimp_procedure_new (image_select_item_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-select-item");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-select-item",
+                                     "Transforms the specified item into a selection",
+                                     "This procedure renders the item's outline into the current selection of the image the item belongs to. What exactly the item's outline is depends on the item type: for layers, it's the layer's alpha channel, for vectors the vector's shape.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-antialias', 'gimp-context-set-feather', 'gimp-context-set-feather-radius'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The desired operation with current selection",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to render to the selection",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-transform-cmds.c b/app/pdb/image-transform-cmds.c
new file mode 100644
index 0000000..074bd38
--- /dev/null
+++ b/app/pdb/image-transform-cmds.c
@@ -0,0 +1,522 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpimage-crop.h"
+#include "core/gimpimage-flip.h"
+#include "core/gimpimage-resize.h"
+#include "core/gimpimage-rotate.h"
+#include "core/gimpimage-scale.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "gimppdb.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+image_resize_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 new_width;
+  gint32 new_height;
+  gint32 offx;
+  gint32 offy;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+  offx = g_value_get_int (gimp_value_array_index (args, 3));
+  offy = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gimp_image_resize (image, context,
+                         new_width, new_height, offx, offy, NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_resize_to_layers_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_image_resize_to_layers (image, context, NULL, NULL, NULL, NULL, NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_scale_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 new_width;
+  gint32 new_height;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+      if (progress)
+        gimp_progress_start (progress, FALSE, _("Scaling"));
+
+      gimp_image_scale (image, new_width, new_height,
+                        pdb_context->interpolation,
+                        progress);
+
+      if (progress)
+        gimp_progress_end (progress);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_scale_full_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 new_width;
+  gint32 new_height;
+  gint32 interpolation;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (progress)
+        gimp_progress_start (progress, FALSE, _("Scaling"));
+
+      gimp_image_scale (image, new_width, new_height, interpolation, progress);
+
+      if (progress)
+        gimp_progress_end (progress);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_crop_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 new_width;
+  gint32 new_height;
+  gint32 offx;
+  gint32 offy;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+  offx = g_value_get_int (gimp_value_array_index (args, 3));
+  offy = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (new_width  >  gimp_image_get_width  (image)              ||
+          new_height >  gimp_image_get_height (image)              ||
+          offx       > (gimp_image_get_width  (image) - new_width) ||
+          offy       > (gimp_image_get_height (image) - new_height))
+        success = FALSE;
+      else
+        gimp_image_crop (image, context, GIMP_FILL_TRANSPARENT,
+                         offx, offy, new_width, new_height,
+                         TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_flip_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 flip_type;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  flip_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_image_flip (image, context, flip_type, NULL);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_rotate_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 rotate_type;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  rotate_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (progress)
+        gimp_progress_start (progress, FALSE, _("Rotating"));
+
+      gimp_image_rotate (image, context, rotate_type, progress);
+
+      if (progress)
+        gimp_progress_end (progress);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_image_transform_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-resize
+   */
+  procedure = gimp_procedure_new (image_resize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-resize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-resize",
+                                     "Resize the image to the specified extents.",
+                                     "This procedure resizes the image so that it's new width and height are equal to the supplied parameters. Offsets are also provided which describe the position of the previous image's content. All channels within the image are resized according to the specified parameters; this includes the image selection mask. All layers within the image are repositioned according to the specified offsets.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New image width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New image height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "x offset between upper left corner of old and new images: (new - old)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "y offset between upper left corner of old and new images: (new - old)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-resize-to-layers
+   */
+  procedure = gimp_procedure_new (image_resize_to_layers_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-resize-to-layers");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-resize-to-layers",
+                                     "Resize the image to fit all layers.",
+                                     "This procedure resizes the image to the bounding box of all layers of the image. All channels within the image are resized to the new size; this includes the image selection mask. All layers within the image are repositioned to the new image area.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-scale
+   */
+  procedure = gimp_procedure_new (image_scale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-scale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-scale",
+                                     "Scale the image using the default interpolation method.",
+                                     "This procedure scales the image so that its new width and height are equal to the supplied parameters. All layers and channels within the image are scaled according to the specified parameters; this includes the image selection mask. The interpolation method used can be set with 'gimp-context-set-interpolation'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New image width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New image height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-scale-full
+   */
+  procedure = gimp_procedure_new (image_scale_full_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-scale-full");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-scale-full",
+                                     "Deprecated: Use 'gimp-image-scale' instead.",
+                                     "Deprecated: Use 'gimp-image-scale' instead.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     "gimp-image-scale");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New image width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New image height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-crop
+   */
+  procedure = gimp_procedure_new (image_crop_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-crop");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-crop",
+                                     "Crop the image to the specified extents.",
+                                     "This procedure crops the image so that it's new width and height are equal to the supplied parameters. Offsets are also provided which describe the position of the previous image's content. All channels and layers within the image are cropped to the new image extents; this includes the image selection mask. If any parameters are out of range, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New image width: (0 < new_width <= width)",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New image height: (0 < new_height <= height)",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "X offset: (0 <= offx <= (width - new_width))",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "Y offset: (0 <= offy <= (height - new_height))",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-flip
+   */
+  procedure = gimp_procedure_new (image_flip_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-flip");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-flip",
+                                     "Flips the image horizontally or vertically.",
+                                     "This procedure flips (mirrors) the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("flip-type",
+                                                     "flip type",
+                                                     "Type of flip",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-rotate
+   */
+  procedure = gimp_procedure_new (image_rotate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-rotate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-rotate",
+                                     "Rotates the image by the specified degrees.",
+                                     "This procedure rotates the image.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("rotate-type",
+                                                  "rotate type",
+                                                  "Angle of rotation",
+                                                  GIMP_TYPE_ROTATION_TYPE,
+                                                  GIMP_ROTATE_90,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/image-undo-cmds.c b/app/pdb/image-undo-cmds.c
new file mode 100644
index 0000000..1a5dfe5
--- /dev/null
+++ b/app/pdb/image-undo-cmds.c
@@ -0,0 +1,477 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "plug-in/gimpplugin-cleanup.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+image_undo_group_start_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn  *plug_in   = gimp->plug_in_manager->current_plug_in;
+      const gchar *undo_desc = NULL;
+
+      if (plug_in)
+        {
+          success = gimp_plug_in_cleanup_undo_group_start (plug_in, image);
+
+          if (success)
+            undo_desc = gimp_plug_in_get_undo_desc (plug_in);
+        }
+
+      if (success)
+        gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_MISC, undo_desc);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_undo_group_end_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_undo_group_end (plug_in, image);
+
+      if (success)
+        gimp_image_undo_group_end (image);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+image_undo_is_enabled_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean enabled = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      enabled = gimp_image_undo_is_enabled (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), enabled);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_undo_disable_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean disabled = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+    #if 0
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_undo_disable (plug_in, image);
+    #endif
+
+      if (success)
+        disabled = gimp_image_undo_disable (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), disabled);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_undo_enable_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean enabled = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+    #if 0
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_undo_enable (plug_in, image);
+    #endif
+
+      if (success)
+        enabled = gimp_image_undo_enable (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), enabled);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_undo_freeze_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean frozen = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+    #if 0
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_undo_freeze (plug_in, image);
+    #endif
+
+      if (success)
+        frozen = gimp_image_undo_freeze (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), frozen);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+image_undo_thaw_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean thawed = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+    #if 0
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        success = gimp_plug_in_cleanup_undo_thaw (plug_in, image);
+    #endif
+
+      if (success)
+        thawed = gimp_image_undo_thaw (image);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), thawed);
+
+  return return_vals;
+}
+
+void
+register_image_undo_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-image-undo-group-start
+   */
+  procedure = gimp_procedure_new (image_undo_group_start_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-group-start");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-group-start",
+                                     "Starts a group undo.",
+                                     "This function is used to start a group undo--necessary for logically combining two or more undo operations into a single operation. This call must be used in conjunction with a 'gimp-image-undo-group-end' call.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The ID of the image in which to open an undo group",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-undo-group-end
+   */
+  procedure = gimp_procedure_new (image_undo_group_end_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-group-end");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-group-end",
+                                     "Finish a group undo.",
+                                     "This function must be called once for each 'gimp-image-undo-group-start' call that is made.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The ID of the image in which to close an undo group",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-undo-is-enabled
+   */
+  procedure = gimp_procedure_new (image_undo_is_enabled_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-is-enabled");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-is-enabled",
+                                     "Check if the image's undo stack is enabled.",
+                                     "This procedure checks if the image's undo stack is currently enabled or disabled. This is useful when several plug-ins or scripts call each other and want to check if their caller has already used 'gimp-image-undo-disable' or 'gimp-image-undo-freeze'.",
+                                     "Rapha\xc3\xabl Quinet <raphael@gimp.org>",
+                                     "Rapha\xc3\xabl Quinet",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("enabled",
+                                                         "enabled",
+                                                         "TRUE if undo is enabled for this image",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-undo-disable
+   */
+  procedure = gimp_procedure_new (image_undo_disable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-disable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-disable",
+                                     "Disable the image's undo stack.",
+                                     "This procedure disables the image's undo stack, allowing subsequent operations to ignore their undo steps. This is generally called in conjunction with 'gimp-image-undo-enable' to temporarily disable an image undo stack. This is advantageous because saving undo steps can be time and memory intensive.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("disabled",
+                                                         "disabled",
+                                                         "TRUE if the image undo has been disabled",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-undo-enable
+   */
+  procedure = gimp_procedure_new (image_undo_enable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-enable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-enable",
+                                     "Enable the image's undo stack.",
+                                     "This procedure enables the image's undo stack, allowing subsequent operations to store their undo steps. This is generally called in conjunction with 'gimp-image-undo-disable' to temporarily disable an image undo stack.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("enabled",
+                                                         "enabled",
+                                                         "TRUE if the image undo has been enabled",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-undo-freeze
+   */
+  procedure = gimp_procedure_new (image_undo_freeze_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-freeze");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-freeze",
+                                     "Freeze the image's undo stack.",
+                                     "This procedure freezes the image's undo stack, allowing subsequent operations to ignore their undo steps. This is generally called in conjunction with 'gimp-image-undo-thaw' to temporarily disable an image undo stack. This is advantageous because saving undo steps can be time and memory intensive. 'gimp-image-undo-freeze' / 'gimp-image-undo-thaw' and 'gimp-image-undo-disable' / 'gimp-image-undo-enable' differ in that the former does not free up all undo steps when undo is thawed, so is more suited to interactive in-situ previews. It is important in this case that the image is back to the same state it was frozen in before thawing, else 'undo' behaviour is undefined.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("frozen",
+                                                         "frozen",
+                                                         "TRUE if the image undo has been frozen",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-image-undo-thaw
+   */
+  procedure = gimp_procedure_new (image_undo_thaw_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-image-undo-thaw");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-image-undo-thaw",
+                                     "Thaw the image's undo stack.",
+                                     "This procedure thaws the image's undo stack, allowing subsequent operations to store their undo steps. This is generally called in conjunction with 'gimp-image-undo-freeze' to temporarily freeze an image undo stack. 'gimp-image-undo-thaw' does NOT free the undo stack as 'gimp-image-undo-enable' does, so is suited for situations where one wishes to leave the undo stack in the same state in which one found it despite non-destructively playing with the image in the meantime. An example would be in-situ plug-in previews. Balancing freezes and thaws and ensuring image consistency is the responsibility of the caller.",
+                                     "Adam D. Moss",
+                                     "Adam D. Moss",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("thawed",
+                                                         "thawed",
+                                                         "TRUE if the image undo has been thawed",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c
new file mode 100644
index 0000000..9a90f78
--- /dev/null
+++ b/app/pdb/internal-procs.c
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "pdb-types.h"
+
+#include "gimppdb.h"
+
+#include "internal-procs.h"
+
+
+/* 852 procedures registered total */
+
+void
+internal_procs_init (GimpPDB *pdb)
+{
+  g_return_if_fail (GIMP_IS_PDB (pdb));
+
+  register_brush_procs (pdb);
+  register_brush_select_procs (pdb);
+  register_brushes_procs (pdb);
+  register_buffer_procs (pdb);
+  register_channel_procs (pdb);
+  register_color_procs (pdb);
+  register_context_procs (pdb);
+  register_debug_procs (pdb);
+  register_display_procs (pdb);
+  register_drawable_procs (pdb);
+  register_drawable_color_procs (pdb);
+  register_drawable_edit_procs (pdb);
+  register_drawable_transform_procs (pdb);
+  register_dynamics_procs (pdb);
+  register_edit_procs (pdb);
+  register_fileops_procs (pdb);
+  register_floating_sel_procs (pdb);
+  register_font_select_procs (pdb);
+  register_fonts_procs (pdb);
+  register_gimp_procs (pdb);
+  register_gimprc_procs (pdb);
+  register_gradient_procs (pdb);
+  register_gradient_select_procs (pdb);
+  register_gradients_procs (pdb);
+  register_help_procs (pdb);
+  register_image_procs (pdb);
+  register_image_color_profile_procs (pdb);
+  register_image_convert_procs (pdb);
+  register_image_grid_procs (pdb);
+  register_image_guides_procs (pdb);
+  register_image_sample_points_procs (pdb);
+  register_image_select_procs (pdb);
+  register_image_transform_procs (pdb);
+  register_image_undo_procs (pdb);
+  register_item_procs (pdb);
+  register_item_transform_procs (pdb);
+  register_layer_procs (pdb);
+  register_message_procs (pdb);
+  register_paint_tools_procs (pdb);
+  register_palette_procs (pdb);
+  register_palette_select_procs (pdb);
+  register_palettes_procs (pdb);
+  register_paths_procs (pdb);
+  register_pattern_procs (pdb);
+  register_pattern_select_procs (pdb);
+  register_patterns_procs (pdb);
+  register_plug_in_procs (pdb);
+  register_plug_in_compat_procs (pdb);
+  register_procedural_db_procs (pdb);
+  register_progress_procs (pdb);
+  register_selection_procs (pdb);
+  register_selection_tools_procs (pdb);
+  register_text_layer_procs (pdb);
+  register_text_tool_procs (pdb);
+  register_transform_tools_procs (pdb);
+  register_unit_procs (pdb);
+  register_vectors_procs (pdb);
+}
diff --git a/app/pdb/internal-procs.h b/app/pdb/internal-procs.h
new file mode 100644
index 0000000..def0554
--- /dev/null
+++ b/app/pdb/internal-procs.h
@@ -0,0 +1,85 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#ifndef __INTERNAL_PROCS_H__
+#define __INTERNAL_PROCS_H__
+
+void   internal_procs_init                (GimpPDB *pdb);
+
+/* Forward declarations for registering PDB procs */
+
+void   register_brush_procs               (GimpPDB *pdb);
+void   register_brush_select_procs        (GimpPDB *pdb);
+void   register_brushes_procs             (GimpPDB *pdb);
+void   register_buffer_procs              (GimpPDB *pdb);
+void   register_channel_procs             (GimpPDB *pdb);
+void   register_color_procs               (GimpPDB *pdb);
+void   register_context_procs             (GimpPDB *pdb);
+void   register_debug_procs               (GimpPDB *pdb);
+void   register_display_procs             (GimpPDB *pdb);
+void   register_drawable_procs            (GimpPDB *pdb);
+void   register_drawable_color_procs      (GimpPDB *pdb);
+void   register_drawable_edit_procs       (GimpPDB *pdb);
+void   register_drawable_transform_procs  (GimpPDB *pdb);
+void   register_dynamics_procs            (GimpPDB *pdb);
+void   register_edit_procs                (GimpPDB *pdb);
+void   register_fileops_procs             (GimpPDB *pdb);
+void   register_floating_sel_procs        (GimpPDB *pdb);
+void   register_font_select_procs         (GimpPDB *pdb);
+void   register_fonts_procs               (GimpPDB *pdb);
+void   register_gimp_procs                (GimpPDB *pdb);
+void   register_gimprc_procs              (GimpPDB *pdb);
+void   register_gradient_procs            (GimpPDB *pdb);
+void   register_gradient_select_procs     (GimpPDB *pdb);
+void   register_gradients_procs           (GimpPDB *pdb);
+void   register_help_procs                (GimpPDB *pdb);
+void   register_image_procs               (GimpPDB *pdb);
+void   register_image_color_profile_procs (GimpPDB *pdb);
+void   register_image_convert_procs       (GimpPDB *pdb);
+void   register_image_grid_procs          (GimpPDB *pdb);
+void   register_image_guides_procs        (GimpPDB *pdb);
+void   register_image_sample_points_procs (GimpPDB *pdb);
+void   register_image_select_procs        (GimpPDB *pdb);
+void   register_image_transform_procs     (GimpPDB *pdb);
+void   register_image_undo_procs          (GimpPDB *pdb);
+void   register_item_procs                (GimpPDB *pdb);
+void   register_item_transform_procs      (GimpPDB *pdb);
+void   register_layer_procs               (GimpPDB *pdb);
+void   register_message_procs             (GimpPDB *pdb);
+void   register_paint_tools_procs         (GimpPDB *pdb);
+void   register_palette_procs             (GimpPDB *pdb);
+void   register_palette_select_procs      (GimpPDB *pdb);
+void   register_palettes_procs            (GimpPDB *pdb);
+void   register_paths_procs               (GimpPDB *pdb);
+void   register_pattern_procs             (GimpPDB *pdb);
+void   register_pattern_select_procs      (GimpPDB *pdb);
+void   register_patterns_procs            (GimpPDB *pdb);
+void   register_plug_in_procs             (GimpPDB *pdb);
+void   register_plug_in_compat_procs      (GimpPDB *pdb);
+void   register_procedural_db_procs       (GimpPDB *pdb);
+void   register_progress_procs            (GimpPDB *pdb);
+void   register_selection_procs           (GimpPDB *pdb);
+void   register_selection_tools_procs     (GimpPDB *pdb);
+void   register_text_layer_procs          (GimpPDB *pdb);
+void   register_text_tool_procs           (GimpPDB *pdb);
+void   register_transform_tools_procs     (GimpPDB *pdb);
+void   register_unit_procs                (GimpPDB *pdb);
+void   register_vectors_procs             (GimpPDB *pdb);
+
+#endif /* __INTERNAL_PROCS_H__ */
diff --git a/app/pdb/item-cmds.c b/app/pdb/item-cmds.c
new file mode 100644
index 0000000..894e596
--- /dev/null
+++ b/app/pdb/item-cmds.c
@@ -0,0 +1,1970 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimplayermask.h"
+#include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpselection.h"
+#include "text/gimptextlayer.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+item_is_valid_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean valid = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  valid = (GIMP_IS_ITEM (item) &&
+           ! gimp_item_is_removed (GIMP_ITEM (item)));
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_boolean (gimp_value_array_index (return_vals, 1), valid);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_get_image_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  GimpImage *image = NULL;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      image = gimp_item_get_image (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_delete_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (g_object_is_floating (item))
+        {
+          g_object_ref_sink (item);
+          g_object_unref (item);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_is_drawable_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean drawable = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      drawable = GIMP_IS_DRAWABLE (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_layer_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean layer = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      layer = GIMP_IS_LAYER (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_text_layer_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean text_layer = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      text_layer = gimp_item_is_text_layer (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), text_layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_channel_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean channel = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      channel = GIMP_IS_CHANNEL (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_layer_mask_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean layer_mask = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      layer_mask = GIMP_IS_LAYER_MASK (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), layer_mask);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_selection_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean selection = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      selection = GIMP_IS_SELECTION (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), selection);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_vectors_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean vectors = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      vectors = GIMP_IS_VECTORS (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), vectors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_is_group_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean group = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      group = (gimp_viewable_get_children (GIMP_VIEWABLE (item)) != NULL);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), group);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_get_parent_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  GimpItem *parent = NULL;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      parent = gimp_item_get_parent (item);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), parent);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_get_children_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 num_children = 0;
+  gint32 *child_ids = NULL;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpContainer *children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+      if (children)
+        {
+          num_children = gimp_container_get_n_children (children);
+
+          if (num_children)
+            {
+              GList *list;
+              gint   i;
+
+              child_ids = g_new (gint32, num_children);
+
+              for (list = GIMP_LIST (children)->queue->head, i = 0;
+                   list;
+                   list = g_list_next (list), i++)
+                {
+                  child_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+                }
+            }
+        }
+      else
+        success = FALSE;
+
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_children);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), child_ids, num_children);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_get_expanded_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean expanded = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      expanded = gimp_viewable_get_expanded (GIMP_VIEWABLE (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), expanded);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_expanded_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gboolean expanded;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  expanded = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_viewable_set_expanded (GIMP_VIEWABLE (item), expanded);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_name_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gchar *name = NULL;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      name = g_strdup (gimp_object_get_name (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_name_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  const gchar *name;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      success = gimp_item_rename (GIMP_ITEM (item), name, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_visible_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean visible = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      visible = gimp_item_get_visible (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), visible);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_visible_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gboolean visible;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  visible = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_item_set_visible (GIMP_ITEM (item), visible, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_linked_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean linked = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      linked = gimp_item_get_linked (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), linked);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_linked_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gboolean linked;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  linked = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_item_set_linked (GIMP_ITEM (item), linked, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_lock_content_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean lock_content = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      lock_content = gimp_item_get_lock_content (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), lock_content);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_lock_content_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gboolean lock_content;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  lock_content = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_item_can_lock_content (GIMP_ITEM (item)))
+        gimp_item_set_lock_content (GIMP_ITEM (item), lock_content, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_lock_position_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gboolean lock_position = FALSE;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      lock_position = gimp_item_get_lock_position (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), lock_position);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_lock_position_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gboolean lock_position;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  lock_position = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_item_can_lock_position (GIMP_ITEM (item)))
+        gimp_item_set_lock_position (GIMP_ITEM (item), lock_position, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_color_tag_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 color_tag = 0;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      color_tag = gimp_item_get_color_tag (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), color_tag);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_color_tag_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gint32 color_tag;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  color_tag = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_item_set_color_tag (GIMP_ITEM (item), color_tag, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_tattoo_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 tattoo = 0;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      tattoo = gimp_item_get_tattoo (GIMP_ITEM (item));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_uint (gimp_value_array_index (return_vals, 1), tattoo);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_set_tattoo_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  gint32 tattoo;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  tattoo = g_value_get_uint (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_item_set_tattoo (GIMP_ITEM (item), tattoo);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_attach_parasite_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  const GimpParasite *parasite;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  parasite = g_value_get_boxed (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_item_parasite_validate (item, parasite, error))
+        gimp_item_parasite_attach (item, parasite, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_detach_parasite_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpItem *item;
+  const gchar *name;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_item_parasite_detach (item, name, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+item_get_parasite_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  const gchar *name;
+  GimpParasite *parasite = NULL;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      parasite = gimp_parasite_copy (gimp_item_parasite_find (item, name));
+
+      if (! parasite)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_boxed (gimp_value_array_index (return_vals, 1), parasite);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_get_parasite_list_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 num_parasites = 0;
+  gchar **parasites = NULL;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      parasites = gimp_item_parasite_list (item, &num_parasites);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_parasites);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), parasites, num_parasites);
+    }
+
+  return return_vals;
+}
+
+void
+register_item_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-item-is-valid
+   */
+  procedure = gimp_procedure_new (item_is_valid_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-valid");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-valid",
+                                     "Returns TRUE if the item is valid.",
+                                     "This procedure checks if the given item ID is valid and refers to an existing item.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to check",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("valid",
+                                                         "valid",
+                                                         "Whether the item ID is valid",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-image
+   */
+  procedure = gimp_procedure_new (item_get_image_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-image");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-image",
+                                     "Returns the item's image.",
+                                     "This procedure returns the item's image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "image",
+                                                             "The item's image",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-delete
+   */
+  procedure = gimp_procedure_new (item_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-delete",
+                                     "Delete a item.",
+                                     "This procedure deletes the specified item. This must not be done if the image containing this item was already deleted or if the item was already removed from the image. The only case in which this procedure is useful is if you want to get rid of a item which has not yet been added to an image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item to delete",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-drawable
+   */
+  procedure = gimp_procedure_new (item_is_drawable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-drawable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-drawable",
+                                     "Returns whether the item is a drawable.",
+                                     "This procedure returns TRUE if the specified item is a drawable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("drawable",
+                                                         "drawable",
+                                                         "TRUE if the item is a drawable, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-layer
+   */
+  procedure = gimp_procedure_new (item_is_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-layer",
+                                     "Returns whether the item is a layer.",
+                                     "This procedure returns TRUE if the specified item is a layer.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("layer",
+                                                         "layer",
+                                                         "TRUE if the item is a layer, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-text-layer
+   */
+  procedure = gimp_procedure_new (item_is_text_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-text-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-text-layer",
+                                     "Returns whether the item is a text layer.",
+                                     "This procedure returns TRUE if the specified item is a text layer.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("text-layer",
+                                                         "text layer",
+                                                         "TRUE if the item is a text layer, FALSE otherwise.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-channel
+   */
+  procedure = gimp_procedure_new (item_is_channel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-channel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-channel",
+                                     "Returns whether the item is a channel.",
+                                     "This procedure returns TRUE if the specified item is a channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("channel",
+                                                         "channel",
+                                                         "TRUE if the item is a channel, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-layer-mask
+   */
+  procedure = gimp_procedure_new (item_is_layer_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-layer-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-layer-mask",
+                                     "Returns whether the item is a layer mask.",
+                                     "This procedure returns TRUE if the specified item is a layer mask.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("layer-mask",
+                                                         "layer mask",
+                                                         "TRUE if the item is a layer mask, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-selection
+   */
+  procedure = gimp_procedure_new (item_is_selection_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-selection");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-selection",
+                                     "Returns whether the item is a selection.",
+                                     "This procedure returns TRUE if the specified item is a selection.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("selection",
+                                                         "selection",
+                                                         "TRUE if the item is a selection, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-vectors
+   */
+  procedure = gimp_procedure_new (item_is_vectors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-vectors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-vectors",
+                                     "Returns whether the item is a vectors.",
+                                     "This procedure returns TRUE if the specified item is a vectors.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("vectors",
+                                                         "vectors",
+                                                         "TRUE if the item is a vectors, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-is-group
+   */
+  procedure = gimp_procedure_new (item_is_group_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-is-group");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-is-group",
+                                     "Returns whether the item is a group item.",
+                                     "This procedure returns TRUE if the specified item is a group item which can have children.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("group",
+                                                         "group",
+                                                         "TRUE if the item is a group, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-parent
+   */
+  procedure = gimp_procedure_new (item_get_parent_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-parent");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-parent",
+                                     "Returns the item's parent item.",
+                                     "This procedure returns the item's parent item, if any.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("parent",
+                                                            "parent",
+                                                            "The item's parent item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-children
+   */
+  procedure = gimp_procedure_new (item_get_children_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-children");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-children",
+                                     "Returns the item's list of children.",
+                                     "This procedure returns the list of items which are children of the specified item. The order is topmost to bottommost.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-children",
+                                                          "num children",
+                                                          "The item's number of children",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("child-ids",
+                                                                "child ids",
+                                                                "The item's list of children",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-expanded
+   */
+  procedure = gimp_procedure_new (item_get_expanded_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-expanded");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-expanded",
+                                     "Returns whether the item is expanded.",
+                                     "This procedure returns TRUE if the specified item is expanded.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("expanded",
+                                                         "expanded",
+                                                         "TRUE if the item is expanded, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-expanded
+   */
+  procedure = gimp_procedure_new (item_set_expanded_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-expanded");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-expanded",
+                                     "Sets the expanded state of the item.",
+                                     "This procedure expands or collapses the item.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("expanded",
+                                                     "expanded",
+                                                     "TRUE to expand the item, FALSE to collapse the item",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-name
+   */
+  procedure = gimp_procedure_new (item_get_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-name",
+                                     "Get the name of the specified item.",
+                                     "This procedure returns the specified item's name.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The item name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-name
+   */
+  procedure = gimp_procedure_new (item_set_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-name",
+                                     "Set the name of the specified item.",
+                                     "This procedure sets the specified item's name.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The new item name",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-visible
+   */
+  procedure = gimp_procedure_new (item_get_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-visible",
+                                     "Get the visibility of the specified item.",
+                                     "This procedure returns the specified item's visibility.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("visible",
+                                                         "visible",
+                                                         "The item visibility",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-visible
+   */
+  procedure = gimp_procedure_new (item_set_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-visible",
+                                     "Set the visibility of the specified item.",
+                                     "This procedure sets the specified item's visibility.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("visible",
+                                                     "visible",
+                                                     "The new item visibility",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-linked
+   */
+  procedure = gimp_procedure_new (item_get_linked_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-linked");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-linked",
+                                     "Get the linked state of the specified item.",
+                                     "This procedure returns the specified item's linked state.",
+                                     "Wolfgang Hofer",
+                                     "Wolfgang Hofer",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("linked",
+                                                         "linked",
+                                                         "The item linked state (for moves)",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-linked
+   */
+  procedure = gimp_procedure_new (item_set_linked_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-linked");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-linked",
+                                     "Set the linked state of the specified item.",
+                                     "This procedure sets the specified item's linked state.",
+                                     "Wolfgang Hofer",
+                                     "Wolfgang Hofer",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("linked",
+                                                     "linked",
+                                                     "The new item linked state",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-lock-content
+   */
+  procedure = gimp_procedure_new (item_get_lock_content_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-lock-content");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-lock-content",
+                                     "Get the 'lock content' state of the specified item.",
+                                     "This procedure returns the specified item's lock content state.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2009",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("lock-content",
+                                                         "lock content",
+                                                         "Whether the item's contents are locked",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-lock-content
+   */
+  procedure = gimp_procedure_new (item_set_lock_content_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-lock-content");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-lock-content",
+                                     "Set the 'lock content' state of the specified item.",
+                                     "This procedure sets the specified item's lock content state.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2009",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("lock-content",
+                                                     "lock content",
+                                                     "The new item 'lock content' state",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-lock-position
+   */
+  procedure = gimp_procedure_new (item_get_lock_position_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-lock-position");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-lock-position",
+                                     "Get the 'lock position' state of the specified item.",
+                                     "This procedure returns the specified item's lock position state.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("lock-position",
+                                                         "lock position",
+                                                         "Whether the item's position is locked",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-lock-position
+   */
+  procedure = gimp_procedure_new (item_set_lock_position_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-lock-position");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-lock-position",
+                                     "Set the 'lock position' state of the specified item.",
+                                     "This procedure sets the specified item's lock position state.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2009",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("lock-position",
+                                                     "lock position",
+                                                     "The new item 'lock position' state",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-color-tag
+   */
+  procedure = gimp_procedure_new (item_get_color_tag_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-color-tag");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-color-tag",
+                                     "Get the color tag of the specified item.",
+                                     "This procedure returns the specified item's color tag.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("color-tag",
+                                                      "color tag",
+                                                      "The item's color tag",
+                                                      GIMP_TYPE_COLOR_TAG,
+                                                      GIMP_COLOR_TAG_NONE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-color-tag
+   */
+  procedure = gimp_procedure_new (item_set_color_tag_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-color-tag");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-color-tag",
+                                     "Set the color tag of the specified item.",
+                                     "This procedure sets the specified item's color tag.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("color-tag",
+                                                  "color tag",
+                                                  "The new item color tag",
+                                                  GIMP_TYPE_COLOR_TAG,
+                                                  GIMP_COLOR_TAG_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-tattoo
+   */
+  procedure = gimp_procedure_new (item_get_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-tattoo",
+                                     "Get the tattoo of the specified item.",
+                                     "This procedure returns the specified item's tattoo. A tattoo is a unique and permanent identifier attached to a item that can be used to uniquely identify a item within an image even between sessions.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_uint ("tattoo",
+                                                      "tattoo",
+                                                      "The item tattoo",
+                                                      1, G_MAXUINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-set-tattoo
+   */
+  procedure = gimp_procedure_new (item_set_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-set-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-set-tattoo",
+                                     "Set the tattoo of the specified item.",
+                                     "This procedure sets the specified item's tattoo. A tattoo is a unique and permanent identifier attached to a item that can be used to uniquely identify a item within an image even between sessions.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_uint ("tattoo",
+                                                  "tattoo",
+                                                  "The new item tattoo",
+                                                  1, G_MAXUINT32, 1,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-attach-parasite
+   */
+  procedure = gimp_procedure_new (item_attach_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-attach-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-attach-parasite",
+                                     "Add a parasite to an item.",
+                                     "This procedure attaches a parasite to an item. It has no return values.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_parasite ("parasite",
+                                                         "parasite",
+                                                         "The parasite to attach to the item",
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-detach-parasite
+   */
+  procedure = gimp_procedure_new (item_detach_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-detach-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-detach-parasite",
+                                     "Removes a parasite from an item.",
+                                     "This procedure detaches a parasite from an item. It has no return values.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the parasite to detach from the item.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-parasite
+   */
+  procedure = gimp_procedure_new (item_get_parasite_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-parasite");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-parasite",
+                                     "Look up a parasite in an item",
+                                     "Finds and returns the parasite that is attached to an item.",
+                                     "Jay Cox",
+                                     "Jay Cox",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the parasite to find",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_parasite ("parasite",
+                                                             "parasite",
+                                                             "The found parasite",
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-get-parasite-list
+   */
+  procedure = gimp_procedure_new (item_get_parasite_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-get-parasite-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-get-parasite-list",
+                                     "List all parasites.",
+                                     "Returns a list of all parasites currently attached the an item.",
+                                     "Marc Lehmann",
+                                     "Marc Lehmann",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-parasites",
+                                                          "num parasites",
+                                                          "The number of attached parasites",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("parasites",
+                                                                 "parasites",
+                                                                 "The names of currently attached parasites",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/item-transform-cmds.c b/app/pdb/item-transform-cmds.c
new file mode 100644
index 0000000..bcf210e
--- /dev/null
+++ b/app/pdb/item-transform-cmds.c
@@ -0,0 +1,1669 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable-transform.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem-linked.h"
+#include "core/gimpitem.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+item_transform_translate_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble off_x;
+  gdouble off_y;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  off_x = g_value_get_double (gimp_value_array_index (args, 1));
+  off_y = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (item,
+                                       GIMP_PDB_ITEM_POSITION, error))
+        {
+          if (gimp_item_get_linked (item) && gimp_item_is_attached (item))
+            {
+              gimp_item_linked_translate (item, off_x, off_y, TRUE);
+            }
+          else
+            {
+              gimp_item_translate (item, off_x, off_y, TRUE);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_flip_simple_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 flip_type;
+  gboolean auto_center;
+  gdouble axis;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  flip_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  axis = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          gimp_transform_get_flip_axis (x, y, width, height,
+                                        flip_type, auto_center, &axis);
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_flip (GIMP_DRAWABLE (item), context,
+                                                       flip_type, axis,
+                                                       pdb_context->transform_resize);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_flip (item, context,
+                                     flip_type, axis,
+                                     pdb_context->transform_resize);
+            }
+          else
+            {
+              gimp_item_flip (item, context,
+                              flip_type, axis,
+                              gimp_item_get_clip (
+                                item, pdb_context->transform_resize));
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_flip_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_flip_free (&matrix, x0, y0, x1, y1);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Flipping"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_perspective_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+  gdouble x3;
+  gdouble y3;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+  x2 = g_value_get_double (gimp_value_array_index (args, 5));
+  y2 = g_value_get_double (gimp_value_array_index (args, 6));
+  x3 = g_value_get_double (gimp_value_array_index (args, 7));
+  y3 = g_value_get_double (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_perspective (&matrix,
+                                             x, y, width, height,
+                                             x0, y0, x1, y1,
+                                             x2, y2, x3, y3);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Perspective"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_rotate_simple_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 rotate_type;
+  gboolean auto_center;
+  gdouble center_x;
+  gdouble center_y;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  rotate_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  center_x = g_value_get_double (gimp_value_array_index (args, 3));
+  center_y = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          gimp_transform_get_rotate_center (x, y, width, height,
+                                            auto_center, &center_x, &center_y);
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_rotate (GIMP_DRAWABLE (item),
+                                                         context,
+                                                         rotate_type,
+                                                         center_x, center_y,
+                                                         pdb_context->transform_resize);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_rotate (item, context,
+                                       rotate_type,
+                                       center_x, center_y,
+                                       pdb_context->transform_resize);
+            }
+          else
+            {
+              gimp_item_rotate (item, context,
+                                rotate_type,
+                                center_x, center_y,
+                                gimp_item_get_clip (
+                                  item, pdb_context->transform_resize));
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_rotate_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble angle;
+  gboolean auto_center;
+  gdouble center_x;
+  gdouble center_y;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  angle = g_value_get_double (gimp_value_array_index (args, 1));
+  auto_center = g_value_get_boolean (gimp_value_array_index (args, 2));
+  center_x = g_value_get_double (gimp_value_array_index (args, 3));
+  center_y = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          if (auto_center)
+            gimp_transform_matrix_rotate_rect (&matrix,
+                                               x, y, width, height, angle);
+          else
+            gimp_transform_matrix_rotate_center (&matrix,
+                                                 center_x, center_y, angle);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Rotating"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_scale_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  x1 = g_value_get_double (gimp_value_array_index (args, 3));
+  y1 = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = (gimp_pdb_item_is_attached (item, NULL,
+                                            GIMP_PDB_ITEM_CONTENT |
+                                            GIMP_PDB_ITEM_POSITION, error) &&
+                 x0 < x1 && y0 < y1);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_scale (&matrix,
+                                       x, y, width, height,
+                                       x0, y0, x1 - x0, y1 - y0);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Scaling"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_shear_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gint32 shear_type;
+  gdouble magnitude;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  shear_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  magnitude = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_shear (&matrix,
+                                       x, y, width, height,
+                                       shear_type, magnitude);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Shearing"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_2d_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble source_x;
+  gdouble source_y;
+  gdouble scale_x;
+  gdouble scale_y;
+  gdouble angle;
+  gdouble dest_x;
+  gdouble dest_y;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  source_x = g_value_get_double (gimp_value_array_index (args, 1));
+  source_y = g_value_get_double (gimp_value_array_index (args, 2));
+  scale_x = g_value_get_double (gimp_value_array_index (args, 3));
+  scale_y = g_value_get_double (gimp_value_array_index (args, 4));
+  angle = g_value_get_double (gimp_value_array_index (args, 5));
+  dest_x = g_value_get_double (gimp_value_array_index (args, 6));
+  dest_y = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity  (&matrix);
+          gimp_matrix3_translate (&matrix, -source_x, -source_y);
+          gimp_matrix3_scale     (&matrix, scale_x, scale_y);
+          gimp_matrix3_rotate    (&matrix, angle);
+          gimp_matrix3_translate (&matrix, dest_x, dest_y);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transform"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+item_transform_matrix_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpItem *item;
+  gdouble coeff_0_0;
+  gdouble coeff_0_1;
+  gdouble coeff_0_2;
+  gdouble coeff_1_0;
+  gdouble coeff_1_1;
+  gdouble coeff_1_2;
+  gdouble coeff_2_0;
+  gdouble coeff_2_1;
+  gdouble coeff_2_2;
+
+  item = gimp_value_get_item (gimp_value_array_index (args, 0), gimp);
+  coeff_0_0 = g_value_get_double (gimp_value_array_index (args, 1));
+  coeff_0_1 = g_value_get_double (gimp_value_array_index (args, 2));
+  coeff_0_2 = g_value_get_double (gimp_value_array_index (args, 3));
+  coeff_1_0 = g_value_get_double (gimp_value_array_index (args, 4));
+  coeff_1_1 = g_value_get_double (gimp_value_array_index (args, 5));
+  coeff_1_2 = g_value_get_double (gimp_value_array_index (args, 6));
+  coeff_2_0 = g_value_get_double (gimp_value_array_index (args, 7));
+  coeff_2_1 = g_value_get_double (gimp_value_array_index (args, 8));
+  coeff_2_2 = g_value_get_double (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (item, NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (item, &x, &y, &width, &height))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+          GimpImage      *image       = gimp_item_get_image (item);
+          GimpChannel    *mask        = gimp_image_get_mask (image);
+          GimpMatrix3     matrix;
+          gint            off_x, off_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          matrix.coeff[0][0] = coeff_0_0;
+          matrix.coeff[0][1] = coeff_0_1;
+          matrix.coeff[0][2] = coeff_0_2;
+          matrix.coeff[1][0] = coeff_1_0;
+          matrix.coeff[1][1] = coeff_1_1;
+          matrix.coeff[1][2] = coeff_1_2;
+          matrix.coeff[2][0] = coeff_2_0;
+          matrix.coeff[2][1] = coeff_2_1;
+          matrix.coeff[2][2] = coeff_2_2;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transforming"));
+
+          if (GIMP_IS_DRAWABLE (item)                             &&
+              item != GIMP_ITEM (mask)                            &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (item)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              GimpDrawable *drawable;
+
+              drawable = gimp_drawable_transform_affine (GIMP_DRAWABLE (item),
+                                                         context, &matrix,
+                                                         pdb_context->transform_direction,
+                                                         pdb_context->interpolation,
+                                                         pdb_context->transform_resize,
+                                                         progress);
+
+              if (drawable)
+                item = GIMP_ITEM (drawable);
+              else
+                success = FALSE;
+            }
+          else if (gimp_item_get_linked (item))
+            {
+              gimp_item_linked_transform (item, context, &matrix,
+                                          pdb_context->transform_direction,
+                                          pdb_context->interpolation,
+                                          pdb_context->transform_resize,
+                                          progress);
+            }
+          else
+            {
+              gimp_item_transform (item, context, &matrix,
+                                   pdb_context->transform_direction,
+                                   pdb_context->interpolation,
+                                   gimp_item_get_clip (
+                                     item, pdb_context->transform_resize),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_item (gimp_value_array_index (return_vals, 1), item);
+
+  return return_vals;
+}
+
+void
+register_item_transform_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-item-transform-translate
+   */
+  procedure = gimp_procedure_new (item_transform_translate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-translate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-translate",
+                                     "Translate the item by the specified offsets.",
+                                     "This procedure translates the item by the amounts specified in the off_x and off_y arguments. These can be negative, and are considered offsets from the current position. The offsets will be rounded to the nearest pixel unless the item is a path.\n"
+                                     "\n"
+                                     "If the item is attached to an image and has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be translated by the specified offsets.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("off-x",
+                                                    "off x",
+                                                    "Offset in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("off-y",
+                                                    "off y",
+                                                    "Offset in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The translated item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-flip-simple
+   */
+  procedure = gimp_procedure_new (item_transform_flip_simple_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-flip-simple");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-flip-simple",
+                                     "Flip the specified item either vertically or horizontally.",
+                                     "This procedure flips the specified item.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then flipped. If auto_center is set to TRUE, the flip is around the selection's center. Otherwise, the coordinate of the axis needs to be specified. The return value is the ID of the flipped floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be flipped around its center if auto_center is set to TRUE, otherwise the coordinate of the axis needs to be specified. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be flipped around the same axis. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("flip-type",
+                                                     "flip type",
+                                                     "Type of flip",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically position the axis in the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("axis",
+                                                    "axis",
+                                                    "coord. of flip axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The flipped item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-flip
+   */
+  procedure = gimp_procedure_new (item_transform_flip_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-flip");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-flip",
+                                     "Flip the specified item around a given line.",
+                                     "This procedure flips the specified item.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then flipped. The axis to flip around is specified by specifying two points from that line. The return value is the ID of the flipped floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be flipped around the specified axis. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be flipped around the same axis. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "horz. coord. of one end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "vert. coord. of one end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "horz. coord. of other end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "vert. coord. of other end of axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The flipped item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-perspective
+   */
+  procedure = gimp_procedure_new (item_transform_perspective_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-perspective");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-perspective",
+                                     "Perform a possibly non-affine transformation on the specified item.",
+                                     "This procedure performs a possibly non-affine transformation on the specified item by allowing the corners of the original bounding box to be arbitrarily remapped to any values.\n"
+                                     "\n"
+                                     "The 4 coordinates specify the new locations of each corner of the original bounding box. By specifying these values, any affine transformation (rotation, scaling, translation) can be affected. Additionally, these values can be specified such that the resulting transformed item will appear to have been projected via a perspective transform.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then transformed as specified. The return value is the ID of the transformed floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be transformed according to the specified mapping. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be transformed the same way. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The new x coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The new y coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x3",
+                                                    "x3",
+                                                    "The new x coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y3",
+                                                    "y3",
+                                                    "The new y coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The transformed item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-rotate-simple
+   */
+  procedure = gimp_procedure_new (item_transform_rotate_simple_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-rotate-simple");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-rotate-simple",
+                                     "Rotate the specified item about given coordinates through the specified angle.",
+                                     "This function rotates the specified item.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then rotated by the specified amount. If auto_center is set to TRUE, the rotation is around the selection's center. Otherwise, the coordinate of the center point needs to be specified. The return value is the ID of the rotated floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be rotated around its center if auto_center is set to TRUE, otherwise the coordinate of the center point needs to be specified. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be rotated around the same center point. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("rotate-type",
+                                                  "rotate type",
+                                                  "Type of rotation",
+                                                  GIMP_TYPE_ROTATION_TYPE,
+                                                  GIMP_ROTATE_90,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically rotate around the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-x",
+                                                    "center x",
+                                                    "The hor. coordinate of the center of rotation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-y",
+                                                    "center y",
+                                                    "The vert. coordinate of the center of rotation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The rotated item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-rotate
+   */
+  procedure = gimp_procedure_new (item_transform_rotate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-rotate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-rotate",
+                                     "Rotate the specified item about given coordinates through the specified angle.",
+                                     "This function rotates the specified item.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then rotated by the specified amount. If auto_center is set to TRUE, the rotation is around the selection's center. Otherwise, the coordinate of the center point needs to be specified. The return value is the ID of the rotated floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be rotated around its center if auto_center is set to TRUE, otherwise the coordinate of the center point needs to be specified. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be rotated around the same center point. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("auto-center",
+                                                     "auto center",
+                                                     "Whether to automatically rotate around the selection center",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-x",
+                                                    "center x",
+                                                    "The hor. coordinate of the center of rotation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-y",
+                                                    "center y",
+                                                    "The vert. coordinate of the center of rotation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The rotated item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-scale
+   */
+  procedure = gimp_procedure_new (item_transform_scale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-scale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-scale",
+                                     "Scale the specified item.",
+                                     "This procedure scales the specified item.\n"
+                                     "\n"
+                                     "The 2 coordinates specify the new locations of the top-left and bottom-roght corners of the original bounding box.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then scaled as specified. The return value is the ID of the scaled floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be scaled according to the specified coordinates. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be scaled the same way. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The scaled item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-shear
+   */
+  procedure = gimp_procedure_new (item_transform_shear_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-shear");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-shear",
+                                     "Shear the specified item about its center by the specified magnitude.",
+                                     "This procedure shears the specified item.\n"
+                                     "\n"
+                                     "The shear type parameter indicates whether the shear will be applied horizontally or vertically. The magnitude can be either positive or negative and indicates the extent (in pixels) to shear by.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then sheared as specified. The return value is the ID of the sheared floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be sheared according to the specified parameters. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be sheared the same way. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("shear-type",
+                                                     "shear type",
+                                                     "Type of shear",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("magnitude",
+                                                    "magnitude",
+                                                    "The magnitude of the shear",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The sheared item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-2d
+   */
+  procedure = gimp_procedure_new (item_transform_2d_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-2d");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-2d",
+                                     "Transform the specified item in 2d.",
+                                     "This procedure transforms the specified item.\n"
+                                     "\n"
+                                     "The transformation is done by scaling by the x and y scale factors about the point (source_x, source_y), then rotating around the same point, then translating that point to the new position (dest_x, dest_y).\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then transformed as specified. The return value is the ID of the transformed floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be transformed according to the specified parameters. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be transformed the same way. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-x",
+                                                    "source x",
+                                                    "X coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-y",
+                                                    "source y",
+                                                    "Y coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-x",
+                                                    "scale x",
+                                                    "Amount to scale in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-y",
+                                                    "scale y",
+                                                    "Amount to scale in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-x",
+                                                    "dest x",
+                                                    "X coordinate of where the center goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-y",
+                                                    "dest y",
+                                                    "Y coordinate of where the center goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The transformed item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-item-transform-matrix
+   */
+  procedure = gimp_procedure_new (item_transform_matrix_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-item-transform-matrix");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-item-transform-matrix",
+                                     "Transform the specified item in 2d.",
+                                     "This procedure transforms the specified item.\n"
+                                     "\n"
+                                     "The transformation is done by assembling a 3x3 matrix from the coefficients passed.\n"
+                                     "\n"
+                                     "If a selection exists and the item is a drawable, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then transformed as specified. The return value is the ID of the transformed floating selection.\n"
+                                     "\n"
+                                     "If there is no selection or the item is not a drawable, the entire item will be transformed according to the specified matrix. Additionally, if the item has its linked flag set to TRUE, all additional items contained in the image which have the linked flag set to TRUE will also be transformed the same way. The return value will be equal to the item ID supplied as input.\n"
+                                     "\n"
+                                     "This procedure is affected by the following context setters: 'gimp-context-set-interpolation', 'gimp-context-set-transform-direction', 'gimp-context-set-transform-resize'.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_item_id ("item",
+                                                        "item",
+                                                        "The affected item",
+                                                        pdb->gimp, FALSE,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-0",
+                                                    "coeff 0 0",
+                                                    "coefficient (0,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-1",
+                                                    "coeff 0 1",
+                                                    "coefficient (0,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-0-2",
+                                                    "coeff 0 2",
+                                                    "coefficient (0,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-0",
+                                                    "coeff 1 0",
+                                                    "coefficient (1,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-1",
+                                                    "coeff 1 1",
+                                                    "coefficient (1,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-1-2",
+                                                    "coeff 1 2",
+                                                    "coefficient (1,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-0",
+                                                    "coeff 2 0",
+                                                    "coefficient (2,0) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-1",
+                                                    "coeff 2 1",
+                                                    "coefficient (2,1) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("coeff-2-2",
+                                                    "coeff 2 2",
+                                                    "coefficient (2,2) of the transformation matrix",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_item_id ("item",
+                                                            "item",
+                                                            "The transformed item",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
new file mode 100644
index 0000000..7292bd2
--- /dev/null
+++ b/app/pdb/layer-cmds.c
@@ -0,0 +1,2540 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem-linked.h"
+#include "core/gimplayer-new.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppickable.h"
+#include "core/gimpprogress.h"
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+layer_new_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 width;
+  gint32 height;
+  gint32 type;
+  const gchar *name;
+  gdouble opacity;
+  gint32 mode;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  width = g_value_get_int (gimp_value_array_index (args, 1));
+  height = g_value_get_int (gimp_value_array_index (args, 2));
+  type = g_value_get_enum (gimp_value_array_index (args, 3));
+  name = g_value_get_string (gimp_value_array_index (args, 4));
+  opacity = g_value_get_double (gimp_value_array_index (args, 5));
+  mode = g_value_get_enum (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      GimpImageBaseType  base_type = GIMP_RGB;
+      gboolean           has_alpha = FALSE;
+      const Babl        *format;
+
+      if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+      switch (type)
+        {
+        case GIMP_RGB_IMAGE:
+          base_type = GIMP_RGB;
+          has_alpha = FALSE;
+          break;
+
+        case GIMP_RGBA_IMAGE:
+          base_type = GIMP_RGB;
+          has_alpha = TRUE;
+          break;
+
+        case GIMP_GRAY_IMAGE:
+          base_type = GIMP_GRAY;
+          has_alpha = FALSE;
+          break;
+
+        case GIMP_GRAYA_IMAGE:
+          base_type = GIMP_GRAY;
+          has_alpha = TRUE;
+          break;
+
+        case GIMP_INDEXED_IMAGE:
+          base_type = GIMP_INDEXED;
+          has_alpha = FALSE;
+          break;
+
+        case GIMP_INDEXEDA_IMAGE:
+          base_type = GIMP_INDEXED;
+          has_alpha = TRUE;
+          break;
+        }
+
+      /* do not use gimp_image_get_layer_format() because it might
+       * be the floating selection of a channel or mask
+       */
+      format = gimp_image_get_format (image, base_type,
+                                      gimp_image_get_precision (image),
+                                      has_alpha);
+
+      layer = gimp_layer_new (image, width, height,
+                              format, name, opacity / 100.0, mode);
+
+      if (! layer)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_new_from_visible_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpImage *dest_image;
+  const gchar *name;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  dest_image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPickable     *pickable = GIMP_PICKABLE (image);
+      GimpColorProfile *profile;
+
+      gimp_pickable_flush (pickable);
+
+      profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+      layer = gimp_layer_new_from_gegl_buffer (gimp_pickable_get_buffer (pickable),
+                                               dest_image,
+                                               gimp_image_get_layer_format (dest_image,
+                                                                            TRUE),
+                                               name,
+                                               GIMP_OPACITY_OPAQUE,
+                                               gimp_image_get_default_new_layer_mode (dest_image),
+                                               profile);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_new_from_drawable_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  GimpImage *dest_image;
+  GimpLayer *layer_copy = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  dest_image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      GType     new_type;
+      GimpItem *new_item;
+
+      if (GIMP_IS_LAYER (drawable))
+        new_type = G_TYPE_FROM_INSTANCE (drawable);
+      else
+        new_type = GIMP_TYPE_LAYER;
+
+      new_item = gimp_item_convert (GIMP_ITEM (drawable), dest_image, new_type);
+
+      if (new_item)
+        layer_copy = GIMP_LAYER (new_item);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer_copy);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_group_new_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *layer_group = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      layer_group = gimp_group_layer_new (image);
+
+      if (! layer_group)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer_group);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_copy_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean add_alpha;
+  GimpLayer *layer_copy = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  add_alpha = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      layer_copy = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (layer),
+                                                    G_TYPE_FROM_INSTANCE (layer)));
+      if (layer_copy)
+        {
+          if (add_alpha)
+            gimp_layer_add_alpha (layer_copy);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer_copy);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_add_alpha_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (layer),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
+        {
+          gimp_layer_add_alpha (layer);
+        }
+      else
+       success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_flatten_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (layer),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
+        {
+          gimp_layer_remove_alpha (layer, context);
+        }
+      else
+       success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_scale_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 new_width;
+  gint32 new_height;
+  gboolean local_origin;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+  local_origin = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL,
+                                     GIMP_PDB_ITEM_CONTENT | GIMP_PDB_ITEM_POSITION,
+                                     error))
+        {
+          GimpPDBContext *pdb_context = GIMP_PDB_CONTEXT (context);
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Scaling"));
+
+          gimp_item_scale_by_origin (GIMP_ITEM (layer), new_width, new_height,
+                                     pdb_context->interpolation, progress,
+                                     local_origin);
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_scale_full_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 new_width;
+  gint32 new_height;
+  gboolean local_origin;
+  gint32 interpolation;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+  local_origin = g_value_get_boolean (gimp_value_array_index (args, 3));
+  interpolation = g_value_get_enum (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL,
+                                     GIMP_PDB_ITEM_CONTENT | GIMP_PDB_ITEM_POSITION,
+                                     error))
+        {
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Scaling"));
+
+          gimp_item_scale_by_origin (GIMP_ITEM (layer), new_width, new_height,
+                                     interpolation, progress,
+                                     local_origin);
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_resize_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 new_width;
+  gint32 new_height;
+  gint32 offx;
+  gint32 offy;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  new_width = g_value_get_int (gimp_value_array_index (args, 1));
+  new_height = g_value_get_int (gimp_value_array_index (args, 2));
+  offx = g_value_get_int (gimp_value_array_index (args, 3));
+  offy = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL,
+                                     GIMP_PDB_ITEM_CONTENT | GIMP_PDB_ITEM_POSITION,
+                                     error))
+        gimp_item_resize (GIMP_ITEM (layer), context, GIMP_FILL_TRANSPARENT,
+                          new_width, new_height, offx, offy);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_resize_to_image_size_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL,
+                                     GIMP_PDB_ITEM_CONTENT | GIMP_PDB_ITEM_POSITION,
+                                     error))
+        gimp_layer_resize_to_image (layer, context, GIMP_FILL_TRANSPARENT);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_translate_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 offx;
+  gint32 offy;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  offx = g_value_get_int (gimp_value_array_index (args, 1));
+  offy = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (layer),
+                                       GIMP_PDB_ITEM_POSITION, error))
+        {
+          if (gimp_item_get_linked (GIMP_ITEM (layer)))
+            {
+              gimp_item_linked_translate (GIMP_ITEM (layer), offx, offy, TRUE);
+            }
+          else
+            {
+              gimp_item_translate (GIMP_ITEM (layer), offx, offy, TRUE);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_set_offsets_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 offx;
+  gint32 offy;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  offx = g_value_get_int (gimp_value_array_index (args, 1));
+  offy = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (layer),
+                                       GIMP_PDB_ITEM_POSITION, error))
+        {
+          gint offset_x;
+          gint offset_y;
+
+          gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+          offx -= offset_x;
+          offy -= offset_y;
+
+          if (gimp_item_get_linked (GIMP_ITEM (layer)))
+            {
+              gimp_item_linked_translate (GIMP_ITEM (layer), offx, offy, TRUE);
+            }
+          else
+            {
+              gimp_item_translate (GIMP_ITEM (layer), offx, offy, TRUE);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_create_mask_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 mask_type;
+  GimpLayerMask *mask = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  mask_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpChannel *channel = NULL;
+
+      if (mask_type == GIMP_ADD_MASK_CHANNEL)
+        {
+          channel = gimp_image_get_active_channel (gimp_item_get_image (GIMP_ITEM (layer)));
+
+          if (! channel)
+            success = FALSE;
+        }
+
+      if (success)
+        {
+          mask = gimp_layer_create_mask (layer, mask_type, channel);
+
+          if (! mask)
+            success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer_mask (gimp_value_array_index (return_vals, 1), mask);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_get_mask_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  GimpLayerMask *mask = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      mask = gimp_layer_get_mask (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer_mask (gimp_value_array_index (return_vals, 1), mask);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_from_mask_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayerMask *mask;
+  GimpLayer *layer = NULL;
+
+  mask = gimp_value_get_layer_mask (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      layer = gimp_layer_mask_get_layer (mask);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_add_mask_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  GimpLayerMask *mask;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  mask = gimp_value_get_layer_mask (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_floating (GIMP_ITEM (mask),
+                                     gimp_item_get_image (GIMP_ITEM (layer)),
+                                     error))
+        success = (gimp_layer_add_mask (layer, mask, TRUE, error) == mask);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_remove_mask_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 mode;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  mode = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPDBItemModify modify = 0;
+
+      if (mode == GIMP_MASK_APPLY)
+        modify |= GIMP_PDB_ITEM_CONTENT;
+
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, modify, error) &&
+          gimp_layer_get_mask (layer) &&
+          (mode == GIMP_MASK_DISCARD ||
+           gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error)))
+        gimp_layer_apply_mask (layer, mode, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_is_floating_sel_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean is_floating_sel = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      is_floating_sel = gimp_layer_is_floating_sel (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), is_floating_sel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_get_lock_alpha_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean lock_alpha = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      lock_alpha = gimp_layer_get_lock_alpha (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), lock_alpha);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_lock_alpha_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean lock_alpha;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  lock_alpha = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_layer_can_lock_alpha (layer))
+        gimp_layer_set_lock_alpha (layer, lock_alpha, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_apply_mask_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean apply_mask = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (layer->mask)
+        apply_mask = gimp_layer_get_apply_mask (layer);
+      else
+        apply_mask = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), apply_mask);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_apply_mask_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean apply_mask;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  apply_mask = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (layer->mask)
+        gimp_layer_set_apply_mask (layer, apply_mask, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_show_mask_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean show_mask = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (layer->mask)
+        show_mask = gimp_layer_get_show_mask (layer);
+      else
+        show_mask = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), show_mask);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_show_mask_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean show_mask;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  show_mask = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (layer->mask)
+        gimp_layer_set_show_mask (layer, show_mask, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_edit_mask_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean edit_mask = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (layer->mask)
+        edit_mask = gimp_layer_get_edit_mask (layer);
+      else
+        edit_mask = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), edit_mask);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_edit_mask_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean edit_mask;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  edit_mask = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (layer->mask)
+        gimp_layer_set_edit_mask (layer, edit_mask);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_opacity_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gdouble opacity = 0.0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      opacity = gimp_layer_get_opacity (layer) * 100.0;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), opacity);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_opacity_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gdouble opacity;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  opacity = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_layer_set_opacity (layer, opacity / 100.0, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_mode_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 mode = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      mode = gimp_layer_get_mode (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), mode);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_mode_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 mode;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  mode = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+        mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)) == NULL)
+        {
+          if (! (gimp_layer_mode_get_context (mode) & GIMP_LAYER_MODE_CONTEXT_LAYER))
+            success = FALSE;
+        }
+      else
+        {
+          if (! (gimp_layer_mode_get_context (mode) & GIMP_LAYER_MODE_CONTEXT_GROUP))
+            success = FALSE;
+        }
+
+      if (success)
+        gimp_layer_set_mode (layer, mode, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_blend_space_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 blend_space = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      blend_space = gimp_layer_get_blend_space (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), blend_space);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_blend_space_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 blend_space;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  blend_space = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_layer_set_blend_space (layer, blend_space, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_composite_space_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 composite_space = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      composite_space = gimp_layer_get_composite_space (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), composite_space);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_composite_space_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 composite_space;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  composite_space = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_layer_set_composite_space (layer, composite_space, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+layer_get_composite_mode_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 composite_mode = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      composite_mode = gimp_layer_get_composite_mode (layer);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), composite_mode);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+layer_set_composite_mode_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 composite_mode;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  composite_mode = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_layer_set_composite_mode (layer, composite_mode, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_layer_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-layer-new
+   */
+  procedure = gimp_procedure_new (layer_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-new",
+                                     "Create a new layer.",
+                                     "This procedure creates a new layer with the specified width, height, and type. Name, opacity, and mode are also supplied parameters. The new layer still needs to be added to the image, as this is not automatic. Add the new layer with the 'gimp-image-insert-layer' command. Other attributes such as layer mask modes, and offsets should be set with explicit procedure calls.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to which to add the layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("width",
+                                                      "width",
+                                                      "The layer width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "The layer height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("type",
+                                                  "type",
+                                                  "The layer type",
+                                                  GIMP_TYPE_IMAGE_TYPE,
+                                                  GIMP_RGB_IMAGE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The layer name",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The layer opacity",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("mode",
+                                                  "mode",
+                                                  "The layer combination mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The newly created layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-new-from-visible
+   */
+  procedure = gimp_procedure_new (layer_new_from_visible_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-new-from-visible");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-new-from-visible",
+                                     "Create a new layer from what is visible in an image.",
+                                     "This procedure creates a new layer from what is visible in the given image. The new layer still needs to be added to the destination image, as this is not automatic. Add the new layer with the 'gimp-image-insert-layer' command. Other attributes such as layer mask modes, and offsets should be set with explicit procedure calls.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The source image from where the content is copied",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("dest-image",
+                                                         "dest image",
+                                                         "The destination image to which to add the layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The layer name",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The newly created layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-new-from-drawable
+   */
+  procedure = gimp_procedure_new (layer_new_from_drawable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-new-from-drawable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-new-from-drawable",
+                                     "Create a new layer by copying an existing drawable.",
+                                     "This procedure creates a new layer as a copy of the specified drawable. The new layer still needs to be added to the image, as this is not automatic. Add the new layer with the 'gimp-image-insert-layer' command. Other attributes such as layer mask modes, and offsets should be set with explicit procedure calls.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The source drawable from where the new layer is copied",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("dest-image",
+                                                         "dest image",
+                                                         "The destination image to which to add the layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer-copy",
+                                                             "layer copy",
+                                                             "The newly copied layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-group-new
+   */
+  procedure = gimp_procedure_new (layer_group_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-group-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-group-new",
+                                     "Create a new layer group.",
+                                     "This procedure creates a new layer group. Attributes such as layer mode and opacity should be set with explicit procedure calls. Add the new layer group (which is a kind of layer) with the 'gimp-image-insert-layer' command.\n"
+                                     "Other procedures useful with layer groups: 'gimp-image-reorder-item', 'gimp-item-get-parent', 'gimp-item-get-children', 'gimp-item-is-group'.",
+                                     "Barak Itkin <lightningismyname@gmail.com>",
+                                     "Barak Itkin",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to which to add the layer group",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer-group",
+                                                             "layer group",
+                                                             "The newly created layer group",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-copy
+   */
+  procedure = gimp_procedure_new (layer_copy_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-copy");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-copy",
+                                     "Copy a layer.",
+                                     "This procedure copies the specified layer and returns the copy. The newly copied layer is for use within the original layer's image. It should not be subsequently added to any other image. The copied layer can optionally have an added alpha channel. This is useful if the background layer in an image is being copied and added to the same image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer to copy",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("add-alpha",
+                                                     "add alpha",
+                                                     "Add an alpha channel to the copied layer",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer-copy",
+                                                             "layer copy",
+                                                             "The newly copied layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-add-alpha
+   */
+  procedure = gimp_procedure_new (layer_add_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-add-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-add-alpha",
+                                     "Add an alpha channel to the layer if it doesn't already have one.",
+                                     "This procedure adds an additional component to the specified layer if it does not already possess an alpha channel. An alpha channel makes it possible to clear and erase to transparency, instead of the background color. This transforms layers of type RGB to RGBA, GRAY to GRAYA, and INDEXED to INDEXEDA.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-flatten
+   */
+  procedure = gimp_procedure_new (layer_flatten_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-flatten");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-flatten",
+                                     "Remove the alpha channel from the layer if it has one.",
+                                     "This procedure removes the alpha channel from a layer, blending all (partially) transparent pixels in the layer against the background color. This transforms layers of type RGBA to RGB, GRAYA to GRAY, and INDEXEDA to INDEXED.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-scale
+   */
+  procedure = gimp_procedure_new (layer_scale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-scale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-scale",
+                                     "Scale the layer using the default interpolation method.",
+                                     "This procedure scales the layer so that its new width and height are equal to the supplied parameters. The 'local-origin' parameter specifies whether to scale from the center of the layer, or from the image origin. This operation only works if the layer has been added to an image. The interpolation method used can be set with 'gimp-context-set-interpolation'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New layer width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New layer height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("local-origin",
+                                                     "local origin",
+                                                     "Use a local origin (as opposed to the image origin)",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-scale-full
+   */
+  procedure = gimp_procedure_new (layer_scale_full_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-scale-full");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-scale-full",
+                                     "Deprecated: Use 'gimp-layer-scale' instead.",
+                                     "Deprecated: Use 'gimp-layer-scale' instead.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     "gimp-layer-scale");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New layer width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New layer height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("local-origin",
+                                                     "local origin",
+                                                     "Use a local origin (as opposed to the image origin)",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("interpolation",
+                                                  "interpolation",
+                                                  "Type of interpolation",
+                                                  GIMP_TYPE_INTERPOLATION_TYPE,
+                                                  GIMP_INTERPOLATION_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-resize
+   */
+  procedure = gimp_procedure_new (layer_resize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-resize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-resize",
+                                     "Resize the layer to the specified extents.",
+                                     "This procedure resizes the layer so that its new width and height are equal to the supplied parameters. Offsets are also provided which describe the position of the previous layer's content. This operation only works if the layer has been added to an image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-width",
+                                                      "new width",
+                                                      "New layer width",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("new-height",
+                                                      "new height",
+                                                      "New layer height",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "x offset between upper left corner of old and new layers: (old - new)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "y offset between upper left corner of old and new layers: (old - new)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-resize-to-image-size
+   */
+  procedure = gimp_procedure_new (layer_resize_to_image_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-resize-to-image-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-resize-to-image-size",
+                                     "Resize a layer to the image size.",
+                                     "This procedure resizes the layer so that it's new width and height are equal to the width and height of its image container.",
+                                     "Manish Singh",
+                                     "Manish Singh",
+                                     "2003",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer to resize",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-translate
+   */
+  procedure = gimp_procedure_new (layer_translate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-translate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-translate",
+                                     "Translate the layer by the specified offsets.",
+                                     "This procedure translates the layer by the amounts specified in the x and y arguments. These can be negative, and are considered offsets from the current position. This command only works if the layer has been added to an image. All additional layers contained in the image which have the linked flag set to TRUE w ill also be translated by the specified offsets.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-item-transform-translate' instead.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     "gimp-item-transform-translate");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "Offset in x direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "Offset in y direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-offsets
+   */
+  procedure = gimp_procedure_new (layer_set_offsets_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-offsets");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-offsets",
+                                     "Set the layer offsets.",
+                                     "This procedure sets the offsets for the specified layer. The offsets are relative to the image origin and can be any values. This operation is valid only on layers which have been added to an image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "Offset in x direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "Offset in y direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-create-mask
+   */
+  procedure = gimp_procedure_new (layer_create_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-create-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-create-mask",
+                                     "Create a layer mask for the specified layer.",
+                                     "This procedure creates a layer mask for the specified layer.\n"
+                                     "Layer masks serve as an additional alpha channel for a layer. Different types of masks are allowed for initialisation:\n"
+                                     "- white mask (leaves the layer fully visible);\n"
+                                     "- black mask (gives the layer complete transparency);\n"
+                                     "- the layer's alpha channel (either a copy, or a transfer, which leaves the layer fully visible, but which may be more useful than a white mask);\n"
+                                     "- the current selection;\n"
+                                     "- a grayscale copy of the layer;\n"
+                                     "- or a copy of the active channel.\n"
+                                     "\n"
+                                     "The layer mask still needs to be added to the layer. This can be done with a call to 'gimp-layer-add-mask'.\n"
+                                     "\n"
+                                     "'gimp-layer-create-mask' will fail if there are no active channels on the image, when called with 'ADD-CHANNEL-MASK'. It will return a black mask when called with 'ADD-ALPHA-MASK' or 'ADD-ALPHA-TRANSFER-MASK' on a layer with no alpha channels, or with 'ADD-SELECTION-MASK' when there is no selection on the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer to which to add the mask",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("mask-type",
+                                                  "mask type",
+                                                  "The type of mask",
+                                                  GIMP_TYPE_ADD_MASK_TYPE,
+                                                  GIMP_ADD_MASK_WHITE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_mask_id ("mask",
+                                                                  "mask",
+                                                                  "The newly created mask",
+                                                                  pdb->gimp, FALSE,
+                                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-mask
+   */
+  procedure = gimp_procedure_new (layer_get_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-mask",
+                                     "Get the specified layer's mask if it exists.",
+                                     "This procedure returns the specified layer's mask, or -1 if none exists.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_mask_id ("mask",
+                                                                  "mask",
+                                                                  "The layer mask",
+                                                                  pdb->gimp, FALSE,
+                                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-from-mask
+   */
+  procedure = gimp_procedure_new (layer_from_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-from-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-from-mask",
+                                     "Get the specified mask's layer.",
+                                     "This procedure returns the specified mask's layer , or -1 if none exists.",
+                                     "Geert Jordaens",
+                                     "Geert Jordaens",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_mask_id ("mask",
+                                                              "mask",
+                                                              "Mask for which to return the layer",
+                                                              pdb->gimp, FALSE,
+                                                              GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The mask's layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-add-mask
+   */
+  procedure = gimp_procedure_new (layer_add_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-add-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-add-mask",
+                                     "Add a layer mask to the specified layer.",
+                                     "This procedure adds a layer mask to the specified layer. Layer masks serve as an additional alpha channel for a layer. This procedure will fail if a number of prerequisites aren't met. The layer cannot already have a layer mask. The specified mask must exist and have the same dimensions as the layer. The layer must have been created for use with the specified image and the mask must have been created with the procedure 'gimp-layer-create-mask'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer to receive the mask",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_mask_id ("mask",
+                                                              "mask",
+                                                              "The mask to add to the layer",
+                                                              pdb->gimp, FALSE,
+                                                              GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-remove-mask
+   */
+  procedure = gimp_procedure_new (layer_remove_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-remove-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-remove-mask",
+                                     "Remove the specified layer mask from the layer.",
+                                     "This procedure removes the specified layer mask from the layer. If the mask doesn't exist, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer from which to remove mask",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("mode",
+                                                  "mode",
+                                                  "Removal mode",
+                                                  GIMP_TYPE_MASK_APPLY_MODE,
+                                                  GIMP_MASK_APPLY,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-is-floating-sel
+   */
+  procedure = gimp_procedure_new (layer_is_floating_sel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-is-floating-sel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-is-floating-sel",
+                                     "Is the specified layer a floating selection?",
+                                     "This procedure returns whether the layer is a floating selection. Floating selections are special cases of layers which are attached to a specific drawable.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("is-floating-sel",
+                                                         "is floating sel",
+                                                         "TRUE if the layer is a floating selection",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-lock-alpha
+   */
+  procedure = gimp_procedure_new (layer_get_lock_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-lock-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-lock-alpha",
+                                     "Get the lock alpha channel setting of the specified layer.",
+                                     "This procedure returns the specified layer's lock alpha channel setting.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("lock-alpha",
+                                                         "lock alpha",
+                                                         "The layer's lock alpha channel setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-lock-alpha
+   */
+  procedure = gimp_procedure_new (layer_set_lock_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-lock-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-lock-alpha",
+                                     "Set the lock alpha channel setting of the specified layer.",
+                                     "This procedure sets the specified layer's lock alpha channel setting.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("lock-alpha",
+                                                     "lock alpha",
+                                                     "The new layer's lock alpha channel setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-apply-mask
+   */
+  procedure = gimp_procedure_new (layer_get_apply_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-apply-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-apply-mask",
+                                     "Get the apply mask setting of the specified layer.",
+                                     "This procedure returns the specified layer's apply mask setting. If the value is TRUE, then the layer mask for this layer is currently being composited with the layer's alpha channel.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("apply-mask",
+                                                         "apply mask",
+                                                         "The layer's apply mask setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-apply-mask
+   */
+  procedure = gimp_procedure_new (layer_set_apply_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-apply-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-apply-mask",
+                                     "Set the apply mask setting of the specified layer.",
+                                     "This procedure sets the specified layer's apply mask setting. This controls whether the layer's mask is currently affecting the alpha channel. If there is no layer mask, this function will return an error.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("apply-mask",
+                                                     "apply mask",
+                                                     "The new layer's apply mask setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-show-mask
+   */
+  procedure = gimp_procedure_new (layer_get_show_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-show-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-show-mask",
+                                     "Get the show mask setting of the specified layer.",
+                                     "This procedure returns the specified layer's show mask setting. This controls whether the layer or its mask is visible. TRUE indicates that the mask should be visible. If the layer has no mask, then this function returns an error.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("show-mask",
+                                                         "show mask",
+                                                         "The layer's show mask setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-show-mask
+   */
+  procedure = gimp_procedure_new (layer_set_show_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-show-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-show-mask",
+                                     "Set the show mask setting of the specified layer.",
+                                     "This procedure sets the specified layer's show mask setting. This controls whether the layer or its mask is visible. TRUE indicates that the mask should be visible. If there is no layer mask, this function will return an error.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("show-mask",
+                                                     "show mask",
+                                                     "The new layer's show mask setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-edit-mask
+   */
+  procedure = gimp_procedure_new (layer_get_edit_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-edit-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-edit-mask",
+                                     "Get the edit mask setting of the specified layer.",
+                                     "This procedure returns the specified layer's edit mask setting. If the value is TRUE, then the layer mask for this layer is currently active, and not the layer.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("edit-mask",
+                                                         "edit mask",
+                                                         "The layer's edit mask setting",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-edit-mask
+   */
+  procedure = gimp_procedure_new (layer_set_edit_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-edit-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-edit-mask",
+                                     "Set the edit mask setting of the specified layer.",
+                                     "This procedure sets the specified layer's edit mask setting. This controls whether the layer or it's mask is currently active for editing. If the specified layer has no layer mask, then this procedure will return an error.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("edit-mask",
+                                                     "edit mask",
+                                                     "The new layer's edit mask setting",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-opacity
+   */
+  procedure = gimp_procedure_new (layer_get_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-opacity",
+                                     "Get the opacity of the specified layer.",
+                                     "This procedure returns the specified layer's opacity.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("opacity",
+                                                        "opacity",
+                                                        "The layer opacity",
+                                                        0, 100, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-opacity
+   */
+  procedure = gimp_procedure_new (layer_set_opacity_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-opacity");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-opacity",
+                                     "Set the opacity of the specified layer.",
+                                     "This procedure sets the specified layer's opacity.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("opacity",
+                                                    "opacity",
+                                                    "The new layer opacity",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-mode
+   */
+  procedure = gimp_procedure_new (layer_get_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-mode",
+                                     "Get the combination mode of the specified layer.",
+                                     "This procedure returns the specified layer's combination mode.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("mode",
+                                                      "mode",
+                                                      "The layer combination mode",
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-mode
+   */
+  procedure = gimp_procedure_new (layer_set_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-mode",
+                                     "Set the combination mode of the specified layer.",
+                                     "This procedure sets the specified layer's combination mode.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("mode",
+                                                  "mode",
+                                                  "The new layer combination mode",
+                                                  GIMP_TYPE_LAYER_MODE,
+                                                  GIMP_LAYER_MODE_NORMAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-blend-space
+   */
+  procedure = gimp_procedure_new (layer_get_blend_space_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-blend-space");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-blend-space",
+                                     "Get the blend space of the specified layer.",
+                                     "This procedure returns the specified layer's blend space.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("blend-space",
+                                                      "blend space",
+                                                      "The layer blend space",
+                                                      GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                      GIMP_LAYER_COLOR_SPACE_AUTO,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-blend-space
+   */
+  procedure = gimp_procedure_new (layer_set_blend_space_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-blend-space");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-blend-space",
+                                     "Set the blend space of the specified layer.",
+                                     "This procedure sets the specified layer's blend space.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("blend-space",
+                                                  "blend space",
+                                                  "The new layer blend space",
+                                                  GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-composite-space
+   */
+  procedure = gimp_procedure_new (layer_get_composite_space_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-composite-space");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-composite-space",
+                                     "Get the composite space of the specified layer.",
+                                     "This procedure returns the specified layer's composite space.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("composite-space",
+                                                      "composite space",
+                                                      "The layer composite space",
+                                                      GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                      GIMP_LAYER_COLOR_SPACE_AUTO,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-composite-space
+   */
+  procedure = gimp_procedure_new (layer_set_composite_space_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-composite-space");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-composite-space",
+                                     "Set the composite space of the specified layer.",
+                                     "This procedure sets the specified layer's composite space.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("composite-space",
+                                                  "composite space",
+                                                  "The new layer composite space",
+                                                  GIMP_TYPE_LAYER_COLOR_SPACE,
+                                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-get-composite-mode
+   */
+  procedure = gimp_procedure_new (layer_get_composite_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-get-composite-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-get-composite-mode",
+                                     "Get the composite mode of the specified layer.",
+                                     "This procedure returns the specified layer's composite mode.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("composite-mode",
+                                                      "composite mode",
+                                                      "The layer composite mode",
+                                                      GIMP_TYPE_LAYER_COMPOSITE_MODE,
+                                                      GIMP_LAYER_COMPOSITE_AUTO,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-layer-set-composite-mode
+   */
+  procedure = gimp_procedure_new (layer_set_composite_mode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-layer-set-composite-mode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-layer-set-composite-mode",
+                                     "Set the composite mode of the specified layer.",
+                                     "This procedure sets the specified layer's composite mode.",
+                                     "Ell",
+                                     "Ell",
+                                     "2017",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("composite-mode",
+                                                  "composite mode",
+                                                  "The new layer composite mode",
+                                                  GIMP_TYPE_LAYER_COMPOSITE_MODE,
+                                                  GIMP_LAYER_COMPOSITE_AUTO,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/message-cmds.c b/app/pdb/message-cmds.c
new file mode 100644
index 0000000..63e07cf
--- /dev/null
+++ b/app/pdb/message-cmds.c
@@ -0,0 +1,188 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+message_invoker (GimpProcedure         *procedure,
+                 Gimp                  *gimp,
+                 GimpContext           *context,
+                 GimpProgress          *progress,
+                 const GimpValueArray  *args,
+                 GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *message;
+
+  message = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      const gchar *domain = NULL;
+
+      if (gimp->plug_in_manager->current_plug_in)
+        domain = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in);
+      gimp_show_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+                         domain, message);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+message_get_handler_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 handler = 0;
+
+  handler = gimp->message_handler;
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_enum (gimp_value_array_index (return_vals, 1), handler);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+message_set_handler_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 handler;
+
+  handler = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gimp->message_handler = handler;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_message_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-message
+   */
+  procedure = gimp_procedure_new (message_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-message");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-message",
+                                     "Displays a dialog box with a message.",
+                                     "Displays a dialog box with a message. Useful for status or error reporting. The message must be in UTF-8 encoding.",
+                                     "Manish Singh",
+                                     "Manish Singh",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("message",
+                                                       "message",
+                                                       "Message to display in the dialog",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-message-get-handler
+   */
+  procedure = gimp_procedure_new (message_get_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-message-get-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-message-get-handler",
+                                     "Returns the current state of where warning messages are displayed.",
+                                     "This procedure returns the way g_message warnings are displayed. They can be shown in a dialog box or printed on the console where gimp was started.",
+                                     "Manish Singh",
+                                     "Manish Singh",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("handler",
+                                                      "handler",
+                                                      "The current handler type",
+                                                      GIMP_TYPE_MESSAGE_HANDLER_TYPE,
+                                                      GIMP_MESSAGE_BOX,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-message-set-handler
+   */
+  procedure = gimp_procedure_new (message_set_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-message-set-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-message-set-handler",
+                                     "Controls where warning messages are displayed.",
+                                     "This procedure controls how g_message warnings are displayed. They can be shown in a dialog box or printed on the console where gimp was started.",
+                                     "Manish Singh",
+                                     "Manish Singh",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("handler",
+                                                  "handler",
+                                                  "The new handler type",
+                                                  GIMP_TYPE_MESSAGE_HANDLER_TYPE,
+                                                  GIMP_MESSAGE_BOX,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/paint-tools-cmds.c b/app/pdb/paint-tools-cmds.c
new file mode 100644
index 0000000..b4a0b0f
--- /dev/null
+++ b/app/pdb/paint-tools-cmds.c
@@ -0,0 +1,1645 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpdynamics.h"
+#include "core/gimppaintinfo.h"
+#include "core/gimpparamspecs.h"
+#include "paint/gimppaintcore-stroke.h"
+#include "paint/gimppaintcore.h"
+#include "paint/gimppaintoptions.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static const GimpCoords default_coords = GIMP_COORDS_DEFAULT_VALUES;
+
+static gboolean
+paint_tools_stroke (Gimp              *gimp,
+                    GimpContext       *context,
+                    GimpPaintOptions  *options,
+                    GimpDrawable      *drawable,
+                    gint               n_strokes,
+                    const gdouble     *strokes,
+                    GError           **error,
+                    const gchar       *first_property_name,
+                    ...)
+{
+  GimpPaintCore *core;
+  GimpCoords    *coords;
+  gboolean       retval;
+  gint           i;
+  va_list        args;
+
+  n_strokes /= 2;  /* #doubles -> #points */
+
+  /*  undefine the paint-relevant context properties and get them
+   *  from the current context
+   */
+  gimp_context_define_properties (GIMP_CONTEXT (options),
+                                  GIMP_CONTEXT_PROP_MASK_PAINT,
+                                  FALSE);
+  gimp_context_set_parent (GIMP_CONTEXT (options), context);
+
+  va_start (args, first_property_name);
+  core = GIMP_PAINT_CORE (g_object_new_valist (options->paint_info->paint_type,
+                                               first_property_name, args));
+  va_end (args);
+
+  coords = g_new (GimpCoords, n_strokes);
+
+  for (i = 0; i < n_strokes; i++)
+    {
+      coords[i]   = default_coords;
+      coords[i].x = strokes[2 * i];
+      coords[i].y = strokes[2 * i + 1];
+    }
+
+  retval = gimp_paint_core_stroke (core, drawable, options,
+                                   coords, n_strokes, TRUE,
+                                   error);
+
+  g_free (coords);
+
+  g_object_unref (core);
+  g_object_unref (options);
+
+  return retval;
+}
+
+static GimpValueArray *
+airbrush_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble pressure;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  pressure = g_value_get_double (gimp_value_array_index (args, 1));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 2));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-airbrush");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "pressure", pressure,
+                        NULL);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+airbrush_default_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-airbrush");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+clone_invoker (GimpProcedure         *procedure,
+               Gimp                  *gimp,
+               GimpContext           *context,
+               GimpProgress          *progress,
+               const GimpValueArray  *args,
+               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpDrawable *src_drawable;
+  gint32 clone_type;
+  gdouble src_x;
+  gdouble src_y;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  src_drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
+  clone_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  src_x = g_value_get_double (gimp_value_array_index (args, 3));
+  src_y = g_value_get_double (gimp_value_array_index (args, 4));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 5));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-clone");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "clone-type", clone_type,
+                        NULL);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc",    options->paint_info->blurb,
+                                        "src-drawable", src_drawable,
+                                        "src-x",        (gint) floor (src_x),
+                                        "src-y",        (gint) floor (src_y),
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+clone_default_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-clone");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+convolve_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble pressure;
+  gint32 convolve_type;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  pressure = g_value_get_double (gimp_value_array_index (args, 1));
+  convolve_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 3));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-convolve");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "type", convolve_type,
+                        "rate", pressure,
+                        NULL);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+convolve_default_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-convolve");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+dodgeburn_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble exposure;
+  gint32 dodgeburn_type;
+  gint32 dodgeburn_mode;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  exposure = g_value_get_double (gimp_value_array_index (args, 1));
+  dodgeburn_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  dodgeburn_mode = g_value_get_enum (gimp_value_array_index (args, 3));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 4));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-dodge-burn");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "type",     dodgeburn_type,
+                        "mode",     dodgeburn_mode,
+                        "exposure", exposure,
+                        NULL);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+dodgeburn_default_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-dodge-burn");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+eraser_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+  gint32 hardness;
+  gint32 method;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+  hardness = g_value_get_enum (gimp_value_array_index (args, 3));
+  method = g_value_get_enum (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-eraser");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "application-mode", method,
+                        "hard",             hardness,
+                        NULL);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+eraser_default_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-eraser");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+heal_invoker (GimpProcedure         *procedure,
+              Gimp                  *gimp,
+              GimpContext           *context,
+              GimpProgress          *progress,
+              const GimpValueArray  *args,
+              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpDrawable *src_drawable;
+  gdouble src_x;
+  gdouble src_y;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  src_drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
+  src_x = g_value_get_double (gimp_value_array_index (args, 2));
+  src_y = g_value_get_double (gimp_value_array_index (args, 3));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 4));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-heal");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc",    options->paint_info->blurb,
+                                        "src-drawable", src_drawable,
+                                        "src-x",        (gint) floor (src_x),
+                                        "src-y",        (gint) floor (src_y),
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+heal_default_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-heal");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+paintbrush_invoker (GimpProcedure         *procedure,
+                    Gimp                  *gimp,
+                    GimpContext           *context,
+                    GimpProgress          *progress,
+                    const GimpValueArray  *args,
+                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble fade_out;
+  gint32 num_strokes;
+  const gdouble *strokes;
+  gint32 method;
+  gdouble gradient_length;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  fade_out = g_value_get_double (gimp_value_array_index (args, 1));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 2));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+  method = g_value_get_enum (gimp_value_array_index (args, 4));
+  gradient_length = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-paintbrush");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpDynamics *pdb_dynamics  = GIMP_DYNAMICS (gimp_dynamics_new (context, "pdb"));
+          GimpDynamics *user_dynamics = gimp_context_get_dynamics (context);
+
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "application-mode", method,
+                        "fade-length",      MAX (fade_out, gradient_length),
+                        NULL);
+
+          if (fade_out > 0)
+            {
+               GimpDynamicsOutput *opacity_output =
+                 gimp_dynamics_get_output (pdb_dynamics,
+                                           GIMP_DYNAMICS_OUTPUT_OPACITY);
+
+               g_object_set (opacity_output,
+                             "use-fade", TRUE,
+                             NULL);
+            }
+
+          if (gradient_length > 0)
+            {
+              GimpDynamicsOutput *color_output =
+                gimp_dynamics_get_output (pdb_dynamics,
+                                          GIMP_DYNAMICS_OUTPUT_COLOR);
+
+              g_object_set (color_output,
+                            "use-fade", TRUE,
+                            NULL);
+            }
+
+          gimp_context_set_dynamics (context, pdb_dynamics);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+
+          gimp_context_set_dynamics (context, user_dynamics);
+
+          g_object_unref (pdb_dynamics);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+paintbrush_default_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-paintbrush");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+pencil_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-pencil");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+smudge_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble pressure;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  pressure = g_value_get_double (gimp_value_array_index (args, 1));
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 2));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-smudge");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          g_object_set (options,
+                        "rate", pressure,
+                        NULL);
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+smudge_default_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 num_strokes;
+  const gdouble *strokes;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  num_strokes = g_value_get_int (gimp_value_array_index (args, 1));
+  strokes = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPaintOptions *options =
+        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context),
+                                            "gimp-smudge");
+
+      if (options &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          options = gimp_config_duplicate (GIMP_CONFIG (options));
+
+          success = paint_tools_stroke (gimp, context, options, drawable,
+                                        num_strokes, strokes, error,
+                                        "undo-desc", options->paint_info->blurb,
+                                        NULL);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_paint_tools_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-airbrush
+   */
+  procedure = gimp_procedure_new (airbrush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-airbrush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-airbrush",
+                                     "Paint in the current brush with varying pressure. Paint application is time-dependent.",
+                                     "This tool simulates the use of an airbrush. Paint pressure represents the relative intensity of the paint application. High pressure results in a thicker layer of paint while low pressure results in a thinner layer.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pressure",
+                                                    "pressure",
+                                                    "The pressure of the airbrush strokes",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-airbrush-default
+   */
+  procedure = gimp_procedure_new (airbrush_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-airbrush-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-airbrush-default",
+                                     "Paint in the current brush with varying pressure. Paint application is time-dependent.",
+                                     "This tool simulates the use of an airbrush. It is similar to 'gimp-airbrush' except that the pressure is derived from the airbrush tools options box. It the option has not been set the default for the option will be used.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-clone
+   */
+  procedure = gimp_procedure_new (clone_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-clone");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-clone",
+                                     "Clone from the source to the dest drawable using the current brush",
+                                     "This tool clones (copies) from the source drawable starting at the specified source coordinates to the dest drawable. If the \"clone_type\" argument is set to PATTERN-CLONE, then the current pattern is used as the source and the \"src_drawable\" argument is ignored. Pattern cloning assumes a tileable pattern and mods the sum of the src coordinates and subsequent stroke offsets with the width and height of the pattern. For image cloning, if the sum of the src coordinates and subsequent stroke offsets exceeds the extents of the src drawable, then no paint is transferred. The clone tool is capable of transforming between any image types including RGB->Indexed--although converting from any type to indexed is significantly slower.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("src-drawable",
+                                                            "src drawable",
+                                                            "The source drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("clone-type",
+                                                  "clone type",
+                                                  "The type of clone",
+                                                  GIMP_TYPE_CLONE_TYPE,
+                                                  GIMP_CLONE_IMAGE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("src-x",
+                                                    "src x",
+                                                    "The x coordinate in the source image",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("src-y",
+                                                    "src y",
+                                                    "The y coordinate in the source image",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-clone-default
+   */
+  procedure = gimp_procedure_new (clone_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-clone-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-clone-default",
+                                     "Clone from the source to the dest drawable using the current brush",
+                                     "This tool clones (copies) from the source drawable starting at the specified source coordinates to the dest drawable. This function performs exactly the same as the 'gimp-clone' function except that the tools arguments are obtained from the clones option dialog. It this dialog has not been activated then the dialogs default values will be used.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-convolve
+   */
+  procedure = gimp_procedure_new (convolve_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-convolve");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-convolve",
+                                     "Convolve (Blur, Sharpen) using the current brush.",
+                                     "This tool convolves the specified drawable with either a sharpening or blurring kernel. The pressure parameter controls the magnitude of the operation. Like the paintbrush, this tool linearly interpolates between the specified stroke coordinates.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pressure",
+                                                    "pressure",
+                                                    "The pressure",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("convolve-type",
+                                                  "convolve type",
+                                                  "Convolve type",
+                                                  GIMP_TYPE_CONVOLVE_TYPE,
+                                                  GIMP_CONVOLVE_BLUR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-convolve-default
+   */
+  procedure = gimp_procedure_new (convolve_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-convolve-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-convolve-default",
+                                     "Convolve (Blur, Sharpen) using the current brush.",
+                                     "This tool convolves the specified drawable with either a sharpening or blurring kernel. This function performs exactly the same as the 'gimp-convolve' function except that the tools arguments are obtained from the convolve option dialog. It this dialog has not been activated then the dialogs default values will be used.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-dodgeburn
+   */
+  procedure = gimp_procedure_new (dodgeburn_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-dodgeburn");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-dodgeburn",
+                                     "Dodgeburn image with varying exposure.",
+                                     "Dodgeburn. More details here later.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("exposure",
+                                                    "exposure",
+                                                    "The exposure of the strokes",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("dodgeburn-type",
+                                                  "dodgeburn type",
+                                                  "The type either dodge or burn",
+                                                  GIMP_TYPE_DODGE_BURN_TYPE,
+                                                  GIMP_DODGE_BURN_TYPE_DODGE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("dodgeburn-mode",
+                                                  "dodgeburn mode",
+                                                  "The mode",
+                                                  GIMP_TYPE_TRANSFER_MODE,
+                                                  GIMP_TRANSFER_SHADOWS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-dodgeburn-default
+   */
+  procedure = gimp_procedure_new (dodgeburn_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-dodgeburn-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-dodgeburn-default",
+                                     "Dodgeburn image with varying exposure. This is the same as the gimp_dodgeburn() function except that the exposure, type and mode are taken from the tools option dialog. If the dialog has not been activated then the defaults as used by the dialog will be used.",
+                                     "Dodgeburn. More details here later.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-eraser
+   */
+  procedure = gimp_procedure_new (eraser_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-eraser");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-eraser",
+                                     "Erase using the current brush.",
+                                     "This tool erases using the current brush mask. If the specified drawable contains an alpha channel, then the erased pixels will become transparent. Otherwise, the eraser tool replaces the contents of the drawable with the background color. Like paintbrush, this tool linearly interpolates between the specified stroke coordinates.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("hardness",
+                                                  "hardness",
+                                                  "How to apply the brush",
+                                                  GIMP_TYPE_BRUSH_APPLICATION_MODE,
+                                                  GIMP_BRUSH_HARD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("method",
+                                                  "method",
+                                                  "The paint method to use",
+                                                  GIMP_TYPE_PAINT_APPLICATION_MODE,
+                                                  GIMP_PAINT_CONSTANT,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-eraser-default
+   */
+  procedure = gimp_procedure_new (eraser_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-eraser-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-eraser-default",
+                                     "Erase using the current brush.",
+                                     "This tool erases using the current brush mask. This function performs exactly the same as the 'gimp-eraser' function except that the tools arguments are obtained from the eraser option dialog. It this dialog has not been activated then the dialogs default values will be used.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-heal
+   */
+  procedure = gimp_procedure_new (heal_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-heal");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-heal",
+                                     "Heal from the source to the dest drawable using the current brush",
+                                     "This tool heals the source drawable starting at the specified source coordinates to the dest drawable. For image healing, if the sum of the src coordinates and subsequent stroke offsets exceeds the extents of the src drawable, then no paint is transferred. The healing tool is capable of transforming between any image types except RGB->Indexed.",
+                                     "Kevin Sookocheff",
+                                     "Kevin Sookocheff",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("src-drawable",
+                                                            "src drawable",
+                                                            "The source drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("src-x",
+                                                    "src x",
+                                                    "The x coordinate in the source image",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("src-y",
+                                                    "src y",
+                                                    "The y coordinate in the source image",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-heal-default
+   */
+  procedure = gimp_procedure_new (heal_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-heal-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-heal-default",
+                                     "Heal from the source to the dest drawable using the current brush",
+                                     "This tool heals from the source drawable starting at the specified source coordinates to the dest drawable. This function performs exactly the same as the 'gimp-heal' function except that the tools arguments are obtained from the healing option dialog. It this dialog has not been activated then the dialogs default values will be used.",
+                                     "Kevin Sookocheff",
+                                     "Kevin Sookocheff",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-paintbrush
+   */
+  procedure = gimp_procedure_new (paintbrush_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-paintbrush");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-paintbrush",
+                                     "Paint in the current brush with optional fade out parameter and pull colors from a gradient.",
+                                     "This tool is the standard paintbrush. It draws linearly interpolated lines through the specified stroke coordinates. It operates on the specified drawable in the foreground color with the active brush. The 'fade-out' parameter is measured in pixels and allows the brush stroke to linearly fall off. The pressure is set to the maximum at the beginning of the stroke. As the distance of the stroke nears the fade-out value, the pressure will approach zero. The gradient-length is the distance to spread the gradient over. It is measured in pixels. If the gradient-length is 0, no gradient is used.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("fade-out",
+                                                    "fade out",
+                                                    "Fade out parameter",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("method",
+                                                  "method",
+                                                  "The paint method to use",
+                                                  GIMP_TYPE_PAINT_APPLICATION_MODE,
+                                                  GIMP_PAINT_CONSTANT,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gradient-length",
+                                                    "gradient length",
+                                                    "Length of gradient to draw",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-paintbrush-default
+   */
+  procedure = gimp_procedure_new (paintbrush_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-paintbrush-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-paintbrush-default",
+                                     "Paint in the current brush. The fade out parameter and pull colors from a gradient parameter are set from the paintbrush options dialog. If this dialog has not been activated then the dialog defaults will be used.",
+                                     "This tool is similar to the standard paintbrush. It draws linearly interpolated lines through the specified stroke coordinates. It operates on the specified drawable in the foreground color with the active brush. The 'fade-out' parameter is measured in pixels and allows the brush stroke to linearly fall off (value obtained from the option dialog). The pressure is set to the maximum at the beginning of the stroke. As the distance of the stroke nears the fade-out value, the pressure will approach zero. The gradient-length (value obtained from the option dialog) is the distance to spread the gradient over. It is measured in pixels. If the gradient-length is 0, no gradient is used.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-pencil
+   */
+  procedure = gimp_procedure_new (pencil_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-pencil");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-pencil",
+                                     "Paint in the current brush without sub-pixel sampling.",
+                                     "This tool is the standard pencil. It draws linearly interpolated lines through the specified stroke coordinates. It operates on the specified drawable in the foreground color with the active brush. The brush mask is treated as though it contains only black and white values. Any value below half is treated as black; any above half, as white.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-smudge
+   */
+  procedure = gimp_procedure_new (smudge_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-smudge");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-smudge",
+                                     "Smudge image with varying pressure.",
+                                     "This tool simulates a smudge using the current brush. High pressure results in a greater smudge of paint while low pressure results in a lesser smudge.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pressure",
+                                                    "pressure",
+                                                    "The pressure of the smudge strokes",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-smudge-default
+   */
+  procedure = gimp_procedure_new (smudge_default_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-smudge-default");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-smudge-default",
+                                     "Smudge image with varying pressure.",
+                                     "This tool simulates a smudge using the current brush. It behaves exactly the same as 'gimp-smudge' except that the pressure value is taken from the smudge tool options or the options default if the tools option dialog has not been activated.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-strokes",
+                                                      "num strokes",
+                                                      "Number of stroke control points (count each coordinate as 2 points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("strokes",
+                                                            "strokes",
+                                                            "Array of stroke coordinates: { s1.x, s1.y, s2.x, s2.y, ..., sn.x, sn.y }",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/palette-cmds.c b/app/pdb/palette-cmds.c
new file mode 100644
index 0000000..df78136
--- /dev/null
+++ b/app/pdb/palette-cmds.c
@@ -0,0 +1,1107 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimppalette.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+palette_new_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *actual_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpData *data = gimp_data_factory_data_new (gimp->palette_factory,
+                                                   context, name);
+
+      if (data)
+        actual_name = g_strdup (gimp_object_get_name (data));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_duplicate_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *copy_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        {
+          GimpPalette *palette_copy = (GimpPalette *)
+            gimp_data_factory_data_duplicate (gimp->palette_factory,
+                                              GIMP_DATA (palette));
+
+          if (palette_copy)
+            copy_name = g_strdup (gimp_object_get_name (palette_copy));
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), copy_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_rename_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  const gchar *new_name;
+  gchar *actual_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  new_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_RENAME, error);
+
+      if (palette)
+        {
+          gimp_object_set_name (GIMP_OBJECT (palette), new_name);
+          actual_name = g_strdup (gimp_object_get_name (palette));
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_delete_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette && gimp_data_is_deletable (GIMP_DATA (palette)))
+        success = gimp_data_factory_data_delete (gimp->palette_factory,
+                                                 GIMP_DATA (palette),
+                                                 TRUE, error);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+palette_is_editable_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gboolean editable = FALSE;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        editable = gimp_data_is_writable (GIMP_DATA (palette));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), editable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_get_info_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 num_colors = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        num_colors = gimp_palette_get_n_colors (palette);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), num_colors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_get_colors_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 num_colors = 0;
+  GimpRGB *colors = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        {
+          GList *list = gimp_palette_get_colors (palette);
+          gint   i;
+
+          num_colors = gimp_palette_get_n_colors (palette);
+          colors     = g_new (GimpRGB, num_colors);
+
+          for (i = 0; i < num_colors; i++, list = g_list_next (list))
+            {
+              GimpPaletteEntry *entry = list->data;
+
+              colors[i] = entry->color;
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_colors);
+      gimp_value_take_colorarray (gimp_value_array_index (return_vals, 2), colors, num_colors);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_get_columns_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 num_columns = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        num_columns = gimp_palette_get_columns (palette);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), num_columns);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_set_columns_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 columns;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  columns = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (palette)
+        gimp_palette_set_columns (palette, columns);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+palette_add_entry_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  const gchar *entry_name;
+  GimpRGB color;
+  gint32 entry_num = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_name = g_value_get_string (gimp_value_array_index (args, 1));
+  gimp_value_get_rgb (gimp_value_array_index (args, 2), &color);
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (palette)
+        {
+          GimpPaletteEntry *entry =
+            gimp_palette_add_entry (palette, -1, entry_name, &color);
+
+          entry_num = entry->position;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), entry_num);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_delete_entry_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 entry_num;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (palette)
+        {
+          GimpPaletteEntry *entry = gimp_palette_get_entry (palette, entry_num);
+
+          if (entry)
+            gimp_palette_delete_entry (palette, entry);
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+palette_entry_get_color_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 entry_num;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        {
+          GimpPaletteEntry *entry = gimp_palette_get_entry (palette, entry_num);
+
+          if (entry)
+            color = entry->color;
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &color);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_entry_set_color_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 entry_num;
+  GimpRGB color;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
+  gimp_value_get_rgb (gimp_value_array_index (args, 2), &color);
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (palette)
+        success = gimp_palette_set_entry_color (palette, entry_num, &color);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+palette_entry_get_name_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 entry_num;
+  gchar *entry_name = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_READ, error);
+
+      if (palette)
+        {
+          GimpPaletteEntry *entry = gimp_palette_get_entry (palette, entry_num);
+
+          if (entry)
+            entry_name = g_strdup (entry->name);
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), entry_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palette_entry_set_name_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *name;
+  gint32 entry_num;
+  const gchar *entry_name;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
+  entry_name = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpPalette *palette = gimp_pdb_get_palette (gimp, name, GIMP_PDB_DATA_ACCESS_WRITE, error);
+
+      if (palette)
+        success = gimp_palette_set_entry_name (palette, entry_num, entry_name);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_palette_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-palette-new
+   */
+  procedure = gimp_procedure_new (palette_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-new",
+                                     "Creates a new palette",
+                                     "This procedure creates a new, uninitialized palette",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The requested name of the new palette",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The actual new palette name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-duplicate
+   */
+  procedure = gimp_procedure_new (palette_duplicate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-duplicate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-duplicate",
+                                     "Duplicates a palette",
+                                     "This procedure creates an identical palette by a different name",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("copy-name",
+                                                           "copy name",
+                                                           "The name of the palette's copy",
+                                                           FALSE, FALSE, TRUE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-rename
+   */
+  procedure = gimp_procedure_new (palette_rename_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-rename");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-rename",
+                                     "Rename a palette",
+                                     "This procedure renames a palette",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("new-name",
+                                                       "new name",
+                                                       "The new name of the palette",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The actual new name of the palette",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-delete
+   */
+  procedure = gimp_procedure_new (palette_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-delete",
+                                     "Deletes a palette",
+                                     "This procedure deletes a palette",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-is-editable
+   */
+  procedure = gimp_procedure_new (palette_is_editable_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-is-editable");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-is-editable",
+                                     "Tests if palette can be edited",
+                                     "Returns TRUE if you have permission to change the palette",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("editable",
+                                                         "editable",
+                                                         "TRUE if the palette can be edited",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-get-info
+   */
+  procedure = gimp_procedure_new (palette_get_info_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-get-info");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-get-info",
+                                     "Retrieve information about the specified palette.",
+                                     "This procedure retrieves information about the specified palette. This includes the name, and the number of colors.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-colors",
+                                                          "num colors",
+                                                          "The number of colors in the palette",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-get-colors
+   */
+  procedure = gimp_procedure_new (palette_get_colors_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-get-colors");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-get-colors",
+                                     "Gets all colors from the specified palette.",
+                                     "This procedure retrieves all color entries of the specified palette.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-colors",
+                                                          "num colors",
+                                                          "Length of the colors array",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_color_array ("colors",
+                                                                "colors",
+                                                                "The colors in the palette",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-get-columns
+   */
+  procedure = gimp_procedure_new (palette_get_columns_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-get-columns");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-get-columns",
+                                     "Retrieves the number of columns to use to display this palette",
+                                     "This procedures retrieves the preferred number of columns to use when the palette is being displayed.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-columns",
+                                                          "num columns",
+                                                          "The number of columns used to display this palette",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-set-columns
+   */
+  procedure = gimp_procedure_new (palette_set_columns_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-set-columns");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-set-columns",
+                                     "Sets the number of columns to use when displaying the palette",
+                                     "This procedures controls how many colors are shown per row when the palette is being displayed. This value can only be changed if the palette is writable. The maximum allowed value is 64.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("columns",
+                                                      "columns",
+                                                      "The new number of columns",
+                                                      0, 64, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-add-entry
+   */
+  procedure = gimp_procedure_new (palette_add_entry_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-add-entry");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-add-entry",
+                                     "Adds a palette entry to the specified palette.",
+                                     "This procedure adds an entry to the specified palette. It returns an error if the entry palette does not exist.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("entry-name",
+                                                       "entry name",
+                                                       "The name of the entry",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The new entry's color color",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("entry-num",
+                                                          "entry num",
+                                                          "The index of the added entry",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-delete-entry
+   */
+  procedure = gimp_procedure_new (palette_delete_entry_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-delete-entry");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-delete-entry",
+                                     "Deletes a palette entry from the specified palette.",
+                                     "This procedure deletes an entry from the specified palette. It returns an error if the entry palette does not exist.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("entry-num",
+                                                      "entry num",
+                                                      "The index of the added entry",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-entry-get-color
+   */
+  procedure = gimp_procedure_new (palette_entry_get_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-entry-get-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-entry-get-color",
+                                     "Gets the specified palette entry from the specified palette.",
+                                     "This procedure retrieves the color of the zero-based entry specified for the specified palette. It returns an error if the entry does not exist.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("entry-num",
+                                                      "entry num",
+                                                      "The entry to retrieve",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The color requested",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-entry-set-color
+   */
+  procedure = gimp_procedure_new (palette_entry_set_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-entry-set-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-entry-set-color",
+                                     "Sets the specified palette entry in the specified palette.",
+                                     "This procedure sets the color of the zero-based entry specified for the specified palette. It returns an error if the entry does not exist.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("entry-num",
+                                                      "entry num",
+                                                      "The entry to retrieve",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The new color",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-entry-get-name
+   */
+  procedure = gimp_procedure_new (palette_entry_get_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-entry-get-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-entry-get-name",
+                                     "Gets the specified palette entry from the specified palette.",
+                                     "This procedure retrieves the name of the zero-based entry specified for the specified palette. It returns an error if the entry does not exist.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("entry-num",
+                                                      "entry num",
+                                                      "The entry to retrieve",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("entry-name",
+                                                           "entry name",
+                                                           "The name requested",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palette-entry-set-name
+   */
+  procedure = gimp_procedure_new (palette_entry_set_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palette-entry-set-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palette-entry-set-name",
+                                     "Sets the specified palette entry in the specified palette.",
+                                     "This procedure sets the name of the zero-based entry specified for the specified palette. It returns an error if the entry does not exist.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("entry-num",
+                                                      "entry num",
+                                                      "The entry to retrieve",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("entry-name",
+                                                       "entry name",
+                                                       "The new name",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/palette-select-cmds.c b/app/pdb/palette-select-cmds.c
new file mode 100644
index 0000000..e99e9df
--- /dev/null
+++ b/app/pdb/palette-select-cmds.c
@@ -0,0 +1,223 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+palettes_popup_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *palette_callback;
+  const gchar *popup_title;
+  const gchar *initial_palette;
+
+  palette_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  popup_title = g_value_get_string (gimp_value_array_index (args, 1));
+  initial_palette = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
+          ! gimp_pdb_dialog_new (gimp, context, progress,
+                                 gimp_data_factory_get_container (gimp->palette_factory),
+                                 popup_title, palette_callback, initial_palette,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+palettes_close_popup_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *palette_callback;
+
+  palette_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
+          ! gimp_pdb_dialog_close (gimp, gimp_data_factory_get_container (gimp->palette_factory),
+                                   palette_callback))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+palettes_set_popup_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *palette_callback;
+  const gchar *palette_name;
+
+  palette_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  palette_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
+          ! gimp_pdb_dialog_set (gimp, gimp_data_factory_get_container (gimp->palette_factory),
+                                 palette_callback, palette_name,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_palette_select_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-palettes-popup
+   */
+  procedure = gimp_procedure_new (palettes_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-popup",
+                                     "Invokes the Gimp palette selection.",
+                                     "This procedure opens the palette selection dialog.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2002",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("palette-callback",
+                                                       "palette callback",
+                                                       "The callback PDB proc to call when palette selection is made",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("popup-title",
+                                                       "popup title",
+                                                       "Title of the palette selection dialog",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("initial-palette",
+                                                       "initial palette",
+                                                       "The name of the palette to set as the first selected",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palettes-close-popup
+   */
+  procedure = gimp_procedure_new (palettes_close_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-close-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-close-popup",
+                                     "Close the palette selection dialog.",
+                                     "This procedure closes an opened palette selection dialog.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2002",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("palette-callback",
+                                                       "palette callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palettes-set-popup
+   */
+  procedure = gimp_procedure_new (palettes_set_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-set-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-set-popup",
+                                     "Sets the current palette in a palette selection dialog.",
+                                     "Sets the current palette in a palette selection dialog.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2002",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("palette-callback",
+                                                       "palette callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("palette-name",
+                                                       "palette name",
+                                                       "The name of the palette to set as selected",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/palettes-cmds.c b/app/pdb/palettes-cmds.c
new file mode 100644
index 0000000..c3612f4
--- /dev/null
+++ b/app/pdb/palettes-cmds.c
@@ -0,0 +1,324 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimppalette.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+palettes_refresh_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gimp_data_factory_data_refresh (gimp->palette_factory, context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+palettes_get_list_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_palettes = 0;
+  gchar **palette_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      palette_list = gimp_container_get_filtered_name_array (gimp_data_factory_get_container (gimp->palette_factory),
+                                                             filter, &num_palettes);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_palettes);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), palette_list, num_palettes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palettes_get_palette_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+  gint32 num_colors = 0;
+
+  GimpPalette *palette = gimp_context_get_palette (context);
+
+  if (palette)
+    {
+      name       = g_strdup (gimp_object_get_name (palette));
+      num_colors = gimp_palette_get_n_colors (palette);
+    }
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), num_colors);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+palettes_get_palette_entry_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 entry_num;
+  gchar *actual_name = NULL;
+  gint32 num_colors = 0;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPalette *palette;
+
+      if (name && strlen (name))
+        palette = gimp_pdb_get_palette (gimp, name, FALSE, error);
+      else
+        palette = gimp_context_get_palette (context);
+
+      if (palette)
+        {
+          GimpPaletteEntry *entry = gimp_palette_get_entry (palette, entry_num);
+
+          if (entry)
+            {
+              actual_name = g_strdup (gimp_object_get_name (palette));
+              num_colors  = gimp_palette_get_n_colors (palette);
+              color       = entry->color;
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), num_colors);
+      gimp_value_set_rgb (gimp_value_array_index (return_vals, 3), &color);
+    }
+
+  return return_vals;
+}
+
+void
+register_palettes_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-palettes-refresh
+   */
+  procedure = gimp_procedure_new (palettes_refresh_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-refresh");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-refresh",
+                                     "Refreshes current palettes. This function always succeeds.",
+                                     "This procedure retrieves all palettes currently in the user's palette path and updates the palette dialogs accordingly.",
+                                     "Adrian Likins <adrian@gimp.org>",
+                                     "Adrian Likins",
+                                     "1998",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palettes-get-list
+   */
+  procedure = gimp_procedure_new (palettes_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-get-list",
+                                     "Retrieves a list of all of the available palettes",
+                                     "This procedure returns a complete listing of available palettes. Each name returned can be used as input to the command 'gimp-context-set-palette'.",
+                                     "Nathan Summers <rock@gimp.org>",
+                                     "Nathan Summers",
+                                     "2001",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-palettes",
+                                                          "num palettes",
+                                                          "The number of palettes in the list",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("palette-list",
+                                                                 "palette list",
+                                                                 "The list of palette names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palettes-get-palette
+   */
+  procedure = gimp_procedure_new (palettes_get_palette_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-get-palette");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-get-palette",
+                                     "Deprecated: Use 'gimp-context-get-palette' instead.",
+                                     "Deprecated: Use 'gimp-context-get-palette' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-context-get-palette");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The palette name",
+                                                           FALSE, TRUE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-colors",
+                                                          "num colors",
+                                                          "The palette num_colors",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-palettes-get-palette-entry
+   */
+  procedure = gimp_procedure_new (palettes_get_palette_entry_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-palettes-get-palette-entry");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-palettes-get-palette-entry",
+                                     "Deprecated: Use 'gimp-palette-entry-get-color' instead.",
+                                     "Deprecated: Use 'gimp-palette-entry-get-color' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-palette-entry-get-color");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The palette name (\"\" means currently active palette)",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("entry-num",
+                                                      "entry num",
+                                                      "The entry to retrieve",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The palette name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-colors",
+                                                          "num colors",
+                                                          "The palette num_colors",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The color requested",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/paths-cmds.c b/app/pdb/paths-cmds.c
new file mode 100644
index 0000000..5d7248f
--- /dev/null
+++ b/app/pdb/paths-cmds.c
@@ -0,0 +1,1283 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpstrokeoptions.h"
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors-compat.h"
+#include "vectors/gimpvectors-import.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimppdbcontext.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+path_list_invoker (GimpProcedure         *procedure,
+                   Gimp                  *gimp,
+                   GimpContext           *context,
+                   GimpProgress          *progress,
+                   const GimpValueArray  *args,
+                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 num_paths = 0;
+  gchar **path_list = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      path_list = gimp_container_get_name_array (gimp_image_get_vectors (image),
+                                                 &num_paths);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_paths);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), path_list, num_paths);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_get_current_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *name = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_active_vectors (image);
+
+      if (vectors)
+        name = g_strdup (gimp_object_get_name (vectors));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_set_current_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        gimp_image_set_active_vectors (image, vectors);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+path_delete_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        gimp_image_remove_vectors (image, vectors, TRUE, NULL);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+path_get_points_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  gint32 path_type = 0;
+  gint32 path_closed = 0;
+  gint32 num_path_point_details = 0;
+  gdouble *points_pairs = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        {
+          GimpVectorsCompatPoint *points;
+          gint num_points;
+
+          path_type = 1; /* BEZIER (1.2 compat) */
+
+          points = gimp_vectors_compat_get_points (vectors, &num_points,
+                                                   &path_closed);
+
+          num_path_point_details = num_points * 3;
+
+          if (points)
+            {
+              gdouble *curr_point;
+              gint     i;
+
+              points_pairs = g_new0 (gdouble, num_path_point_details);
+
+              for (i = 0, curr_point = points_pairs;
+                   i < num_points;
+                   i++, curr_point += 3)
+                {
+                  curr_point[0] = points[i].x;
+                  curr_point[1] = points[i].y;
+                  curr_point[2] = points[i].type;
+                }
+
+              g_free (points);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), path_type);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), path_closed);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), num_path_point_details);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 4), points_pairs, num_path_point_details);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_set_points_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+  gint32 num_path_points;
+  const gdouble *points_pairs;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+  num_path_points = g_value_get_int (gimp_value_array_index (args, 3));
+  points_pairs = gimp_value_get_floatarray (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gboolean closed = FALSE;
+
+      if ((num_path_points / 3) % 3 == 0)
+        closed = TRUE;
+      else if ((num_path_points / 3) % 3 != 2)
+        success = FALSE;
+
+      if (success)
+        {
+          GimpVectors            *vectors;
+          const gdouble          *curr_point_pair;
+          GimpVectorsCompatPoint *points;
+          gint                    n_points;
+          gint                    i;
+
+          n_points = num_path_points / 3;
+
+          points = g_new0 (GimpVectorsCompatPoint, n_points);
+
+          for (i = 0, curr_point_pair = points_pairs;
+               i < n_points;
+               i++, curr_point_pair += 3)
+            {
+              points[i].x    = curr_point_pair[0];
+              points[i].y    = curr_point_pair[1];
+              points[i].type = curr_point_pair[2];
+            }
+
+          vectors = gimp_vectors_compat_new (image, name, points, n_points,
+                                             closed);
+
+          g_free (points);
+
+          if (vectors)
+            success = gimp_image_add_vectors (image, vectors, NULL, 0, TRUE);
+          else
+            success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+path_stroke_current_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpVectors  *vectors  = gimp_image_get_active_vectors (image);
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+      if (vectors && drawable &&
+          gimp_pdb_item_is_modifiable (GIMP_ITEM (drawable),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpStrokeOptions *options;
+          GimpPaintOptions  *paint_options;
+
+          options = gimp_stroke_options_new (gimp, context, TRUE);
+          g_object_set (options,
+                        "method", GIMP_STROKE_PAINT_METHOD,
+                        NULL);
+
+          paint_options =
+            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
+          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
+
+          success = gimp_item_stroke (GIMP_ITEM (vectors),
+                                      drawable, context, options, paint_options,
+                                      TRUE, progress, error);
+
+          g_object_unref (options);
+          g_object_unref (paint_options);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+path_get_point_at_dist_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gdouble distance;
+  gint32 x_point = 0;
+  gint32 y_point = 0;
+  gdouble slope = 0.0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  distance = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors;
+      GimpStroke  *stroke;
+      gdouble      distance_along;
+      gdouble      stroke_length;
+      gdouble      stroke_distance;
+      GimpCoords   position;
+
+      vectors = gimp_image_get_active_vectors (image);
+
+      if (vectors)
+        {
+          distance_along = 0.0;
+          stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+
+          while (stroke != NULL )
+            {
+              stroke_length = gimp_stroke_get_length (stroke, 0.5);
+
+              if (distance_along + stroke_length < distance)
+                {
+                  distance_along += stroke_length;
+                }
+              else
+                {
+                  stroke_distance = distance - distance_along;
+                  stroke_distance = stroke_distance < 0 ? 0: stroke_distance;
+
+                  if (!gimp_stroke_get_point_at_dist (stroke, stroke_distance, 0.5,
+                                                      &position, &slope))
+                    {
+                      success = FALSE;
+                      break;
+                    }
+                  else
+                    {
+                      success = TRUE;
+                      x_point = ROUND (position.x);
+                      y_point = ROUND (position.y);
+                      break;
+                    }
+                }
+
+              stroke = gimp_vectors_stroke_get_next (vectors, stroke);
+            }
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), x_point);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), y_point);
+      g_value_set_double (gimp_value_array_index (return_vals, 3), slope);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_get_tattoo_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  gint32 tattoo = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        tattoo = gimp_item_get_tattoo (GIMP_ITEM (vectors));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), tattoo);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_set_tattoo_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+  gint32 tattovalue;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+  tattovalue = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        gimp_item_set_tattoo (GIMP_ITEM (vectors), tattovalue);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+get_path_by_tattoo_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 tattoo;
+  gchar *name = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  tattoo = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_tattoo (image, tattoo);
+
+      if (vectors)
+        name = g_strdup (gimp_object_get_name (vectors));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_get_locked_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  gboolean locked = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        locked = gimp_item_get_linked (GIMP_ITEM (vectors));
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), locked);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+path_set_locked_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+  gboolean locked;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+  locked = g_value_get_boolean (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        gimp_item_set_linked (GIMP_ITEM (vectors), locked, TRUE);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+path_to_selection_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *name;
+  gint32 op;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius_x;
+  gdouble feather_radius_y;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+  op = g_value_get_enum (gimp_value_array_index (args, 2));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 3));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 4));
+  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 5));
+  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      GimpVectors *vectors = gimp_image_get_vectors_by_name (image, name);
+
+      if (vectors)
+        gimp_item_to_selection (GIMP_ITEM (vectors),
+                                op,
+                                antialias,
+                                feather,
+                                feather_radius_x,
+                                feather_radius_y);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+path_import_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *filename;
+  gboolean merge;
+  gboolean scale;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 1));
+  merge = g_value_get_boolean (gimp_value_array_index (args, 2));
+  scale = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GFile *file = g_file_new_for_path (filename);
+
+      success = gimp_vectors_import_file (image, file,
+                                          merge, scale, NULL, -1, NULL, NULL);
+
+      g_object_unref (file);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_paths_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-path-list
+   */
+  procedure = gimp_procedure_new (path_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-list",
+                                     "Deprecated: Use 'gimp-image-get-vectors' instead.",
+                                     "Deprecated: Use 'gimp-image-get-vectors' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-get-vectors");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to list the paths from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-paths",
+                                                          "num paths",
+                                                          "The number of paths returned.",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("path-list",
+                                                                 "path list",
+                                                                 "List of the paths belonging to this image",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-get-current
+   */
+  procedure = gimp_procedure_new (path_get_current_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-get-current");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-get-current",
+                                     "Deprecated: Use 'gimp-image-get-active-vectors' instead.",
+                                     "Deprecated: Use 'gimp-image-get-active-vectors' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-get-active-vectors");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to get the current path from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the current path.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-set-current
+   */
+  procedure = gimp_procedure_new (path_set_current_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-set-current");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-set-current",
+                                     "Deprecated: Use 'gimp-image-set-active-vectors' instead.",
+                                     "Deprecated: Use 'gimp-image-set-active-vectors' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-set-active-vectors");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image in which a path will become current",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path to make current.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-delete
+   */
+  procedure = gimp_procedure_new (path_delete_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-delete");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-delete",
+                                     "Deprecated: Use 'gimp-image-remove-vectors' instead.",
+                                     "Deprecated: Use 'gimp-image-remove-vectors' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-remove-vectors");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to delete the path from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path to delete.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-get-points
+   */
+  procedure = gimp_procedure_new (path_get_points_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-get-points");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-get-points",
+                                     "Deprecated: Use 'gimp-vectors-stroke-get-points' instead.",
+                                     "Deprecated: Use 'gimp-vectors-stroke-get-points' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-stroke-get-points");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to list the paths from",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path whose points should be listed.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("path-type",
+                                                          "path type",
+                                                          "The type of the path. Currently only one type (1 = Bezier) is supported",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("path-closed",
+                                                          "path closed",
+                                                          "Return if the path is closed. (0 = path open, 1 = path closed)",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-path-point-details",
+                                                          "num path point details",
+                                                          "The number of points returned. Each point is made up of (x, y, pnt_type) of floats.",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("points-pairs",
+                                                                "points pairs",
+                                                                "The points in the path represented as 3 floats. The first is the x pos, next is the y pos, last is the type of the pnt. The type field is dependent on the path type. For beziers (type 1 paths) the type can either be (1.0 = BEZIER_ANCHOR, 2.0 = BEZIER_CONTROL, 3.0 = BEZIER_MOVE). Note all points are returned in pixel resolution.",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-set-points
+   */
+  procedure = gimp_procedure_new (path_set_points_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-set-points");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-set-points",
+                                     "Deprecated: Use 'gimp-vectors-stroke-new-from-points' instead.",
+                                     "Deprecated: Use 'gimp-vectors-stroke-new-from-points' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-stroke-new-from-points");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image to set the paths in",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path to create. If it exists then a unique name will be created - query the list of paths if you want to make sure that the name of the path you create is unique. This will be set as the current path.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("ptype",
+                                                      "ptype",
+                                                      "The type of the path. Currently only one type (1 = Bezier) is supported.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-path-points",
+                                                      "num path points",
+                                                      "The number of elements in the array, i.e. the number of points in the path * 3. Each point is made up of (x, y, type) of floats. Currently only the creation of bezier curves is allowed. The type parameter must be set to (1) to indicate a BEZIER type curve. Note that for BEZIER curves, points must be given in the following order: ACCACCAC... If the path is not closed the last control point is missed off. Points consist of three control points (control/anchor/control) so for a curve that is not closed there must be at least two points passed (2 x,y pairs). If (num_path_points/3) % 3 = 0 then the path is assumed to be closed and the points are ACCACCACCACC.",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("points-pairs",
+                                                            "points pairs",
+                                                            "The points in the path represented as 3 floats. The first is the x pos, next is the y pos, last is the type of the pnt. The type field is dependent on the path type. For beziers (type 1 paths) the type can either be (1.0 = BEZIER_ANCHOR, 2.0 = BEZIER_CONTROL, 3.0= BEZIER_MOVE). Note all points are returned in pixel resolution.",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-stroke-current
+   */
+  procedure = gimp_procedure_new (path_stroke_current_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-stroke-current");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-stroke-current",
+                                     "Deprecated: Use 'gimp-edit-stroke-vectors' instead.",
+                                     "Deprecated: Use 'gimp-edit-stroke-vectors' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-edit-stroke-vectors");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image which contains the path to stroke",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-get-point-at-dist
+   */
+  procedure = gimp_procedure_new (path_get_point_at_dist_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-get-point-at-dist");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-get-point-at-dist",
+                                     "Deprecated: Use 'gimp-vectors-stroke-get-point-at-dist' instead.",
+                                     "Deprecated: Use 'gimp-vectors-stroke-get-point-at-dist' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-stroke-get-point-at-dist");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image the paths belongs to",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("distance",
+                                                    "distance",
+                                                    "The distance along the path.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("x-point",
+                                                          "x point",
+                                                          "The x position of the point.",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("y-point",
+                                                          "y point",
+                                                          "The y position of the point.",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("slope",
+                                                        "slope",
+                                                        "The slope (dy / dx) at the specified point.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-get-tattoo
+   */
+  procedure = gimp_procedure_new (path_get_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-get-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-get-tattoo",
+                                     "Deprecated: Use 'gimp-vectors-get-tattoo' instead.",
+                                     "Deprecated: Use 'gimp-vectors-get-tattoo' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-get-tattoo");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path whose tattoo should be obtained.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("tattoo",
+                                                          "tattoo",
+                                                          "The tattoo associated with the named path.",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-set-tattoo
+   */
+  procedure = gimp_procedure_new (path_set_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-set-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-set-tattoo",
+                                     "Deprecated: Use 'gimp-vectors-set-tattoo' instead.",
+                                     "Deprecated: Use 'gimp-vectors-set-tattoo' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-set-tattoo");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "the name of the path whose tattoo should be set",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tattovalue",
+                                                      "tattovalue",
+                                                      "The tattoo associated with the name path. Only values returned from 'path_get_tattoo' should be used here",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-get-path-by-tattoo
+   */
+  procedure = gimp_procedure_new (get_path_by_tattoo_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-get-path-by-tattoo");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-get-path-by-tattoo",
+                                     "Deprecated: Use 'gimp-image-get-vectors-by-tattoo' instead.",
+                                     "Deprecated: Use 'gimp-image-get-vectors-by-tattoo' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-get-vectors-by-tattoo");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tattoo",
+                                                      "tattoo",
+                                                      "The tattoo of the required path.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The name of the path with the specified tattoo.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-get-locked
+   */
+  procedure = gimp_procedure_new (path_get_locked_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-get-locked");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-get-locked",
+                                     "Deprecated: Use 'gimp-vectors-get-linked' instead.",
+                                     "Deprecated: Use 'gimp-vectors-get-linked' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-get-linked");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path whose locked status should be obtained.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("locked",
+                                                         "locked",
+                                                         "TRUE if the path is locked, FALSE otherwise",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-set-locked
+   */
+  procedure = gimp_procedure_new (path_set_locked_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-set-locked");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-set-locked",
+                                     "Deprecated: Use 'gimp-vectors-set-linked' instead.",
+                                     "Deprecated: Use 'gimp-vectors-set-linked' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-set-linked");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "the name of the path whose locked status should be set",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("locked",
+                                                     "locked",
+                                                     "Whether the path is locked",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-to-selection
+   */
+  procedure = gimp_procedure_new (path_to_selection_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-to-selection");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-to-selection",
+                                     "Deprecated: Use 'gimp-vectors-to-selection' instead.",
+                                     "Deprecated: Use 'gimp-vectors-to-selection' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-to-selection");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The name of the path which should be made into selection.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("op",
+                                                  "op",
+                                                  "The desired operation with current selection",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialias selection.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather selection.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-x",
+                                                    "feather radius x",
+                                                    "Feather radius x.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-y",
+                                                    "feather radius y",
+                                                    "Feather radius y.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-path-import
+   */
+  procedure = gimp_procedure_new (path_import_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-path-import");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-path-import",
+                                     "Deprecated: Use 'gimp-vectors-import-from-file' instead.",
+                                     "Deprecated: Use 'gimp-vectors-import-from-file' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-vectors-import-from-file");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the SVG file to import.",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("merge",
+                                                     "merge",
+                                                     "Merge paths into a single vectors object.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("scale",
+                                                     "scale",
+                                                     "Scale the SVG to image dimensions.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/pattern-cmds.c b/app/pdb/pattern-cmds.c
new file mode 100644
index 0000000..e9a67d9
--- /dev/null
+++ b/app/pdb/pattern-cmds.c
@@ -0,0 +1,252 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
+#include "gegl/gimp-babl-compat.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+pattern_get_info_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 bpp = 0;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPattern *pattern = gimp_pdb_get_pattern (gimp, name, error);
+
+      if (pattern)
+        {
+          const Babl *format;
+
+          format = gimp_babl_compat_u8_format (
+            gimp_temp_buf_get_format (pattern->mask));
+
+          width  = gimp_temp_buf_get_width  (pattern->mask);
+          height = gimp_temp_buf_get_height (pattern->mask);
+          bpp    = babl_format_get_bytes_per_pixel (format);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), bpp);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+pattern_get_pixels_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 bpp = 0;
+  gint32 num_color_bytes = 0;
+  guint8 *color_bytes = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPattern *pattern = gimp_pdb_get_pattern (gimp, name, error);
+
+      if (pattern)
+        {
+          const Babl *format;
+          gpointer    data;
+
+          format = gimp_babl_compat_u8_format (
+            gimp_temp_buf_get_format (pattern->mask));
+          data   = gimp_temp_buf_lock (pattern->mask, format, GEGL_ACCESS_READ);
+
+          width           = gimp_temp_buf_get_width  (pattern->mask);
+          height          = gimp_temp_buf_get_height (pattern->mask);
+          bpp             = babl_format_get_bytes_per_pixel (format);
+          num_color_bytes = gimp_temp_buf_get_data_size (pattern->mask);
+          color_bytes     = g_memdup (data, num_color_bytes);
+
+          gimp_temp_buf_unlock (pattern->mask, data);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), num_color_bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 5), color_bytes, num_color_bytes);
+    }
+
+  return return_vals;
+}
+
+void
+register_pattern_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-pattern-get-info
+   */
+  procedure = gimp_procedure_new (pattern_get_info_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-pattern-get-info");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-pattern-get-info",
+                                     "Retrieve information about the specified pattern.",
+                                     "This procedure retrieves information about the specified pattern. This includes the pattern extents (width and height).",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The pattern name.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The pattern width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The pattern height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bpp",
+                                                          "bpp",
+                                                          "The pattern bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-pattern-get-pixels
+   */
+  procedure = gimp_procedure_new (pattern_get_pixels_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-pattern-get-pixels");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-pattern-get-pixels",
+                                     "Retrieve information about the specified pattern (including pixels).",
+                                     "This procedure retrieves information about the specified. This includes the pattern extents (width and height), its bpp and its pixel data.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The pattern name.",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The pattern width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The pattern height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bpp",
+                                                          "bpp",
+                                                          "The pattern bpp",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-color-bytes",
+                                                          "num color bytes",
+                                                          "Number of pattern bytes",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("color-bytes",
+                                                               "color bytes",
+                                                               "The pattern data.",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/pattern-select-cmds.c b/app/pdb/pattern-select-cmds.c
new file mode 100644
index 0000000..657dea6
--- /dev/null
+++ b/app/pdb/pattern-select-cmds.c
@@ -0,0 +1,223 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+patterns_popup_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *pattern_callback;
+  const gchar *popup_title;
+  const gchar *initial_pattern;
+
+  pattern_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  popup_title = g_value_get_string (gimp_value_array_index (args, 1));
+  initial_pattern = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
+          ! gimp_pdb_dialog_new (gimp, context, progress,
+                                 gimp_data_factory_get_container (gimp->pattern_factory),
+                                 popup_title, pattern_callback, initial_pattern,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+patterns_close_popup_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *pattern_callback;
+
+  pattern_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
+          ! gimp_pdb_dialog_close (gimp, gimp_data_factory_get_container (gimp->pattern_factory),
+                                   pattern_callback))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+patterns_set_popup_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *pattern_callback;
+  const gchar *pattern_name;
+
+  pattern_callback = g_value_get_string (gimp_value_array_index (args, 0));
+  pattern_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp->no_interface ||
+          ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
+          ! gimp_pdb_dialog_set (gimp, gimp_data_factory_get_container (gimp->pattern_factory),
+                                 pattern_callback, pattern_name,
+                                 NULL))
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_pattern_select_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-patterns-popup
+   */
+  procedure = gimp_procedure_new (patterns_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-popup",
+                                     "Invokes the Gimp pattern selection.",
+                                     "This procedure opens the pattern selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("pattern-callback",
+                                                       "pattern callback",
+                                                       "The callback PDB proc to call when pattern selection is made",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("popup-title",
+                                                       "popup title",
+                                                       "Title of the pattern selection dialog",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("initial-pattern",
+                                                       "initial pattern",
+                                                       "The name of the pattern to set as the first selected",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-patterns-close-popup
+   */
+  procedure = gimp_procedure_new (patterns_close_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-close-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-close-popup",
+                                     "Close the pattern selection dialog.",
+                                     "This procedure closes an opened pattern selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("pattern-callback",
+                                                       "pattern callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-patterns-set-popup
+   */
+  procedure = gimp_procedure_new (patterns_set_popup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-set-popup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-set-popup",
+                                     "Sets the current pattern in a pattern selection dialog.",
+                                     "Sets the current pattern in a pattern selection dialog.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("pattern-callback",
+                                                       "pattern callback",
+                                                       "The name of the callback registered for this pop-up",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("pattern-name",
+                                                       "pattern name",
+                                                       "The name of the pattern to set as selected",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/patterns-cmds.c b/app/pdb/patterns-cmds.c
new file mode 100644
index 0000000..9b81b01
--- /dev/null
+++ b/app/pdb/patterns-cmds.c
@@ -0,0 +1,341 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer-filter.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+patterns_refresh_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gimp_data_factory_data_refresh (gimp->pattern_factory, context);
+
+  return gimp_procedure_get_return_values (procedure, TRUE, NULL);
+}
+
+static GimpValueArray *
+patterns_get_list_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *filter;
+  gint32 num_patterns = 0;
+  gchar **pattern_list = NULL;
+
+  filter = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      pattern_list = gimp_container_get_filtered_name_array (gimp_data_factory_get_container (gimp->pattern_factory),
+                                                             filter, &num_patterns);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_patterns);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), pattern_list, num_patterns);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+patterns_get_pattern_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gchar *name = NULL;
+  gint32 width = 0;
+  gint32 height = 0;
+
+  GimpPattern *pattern = gimp_context_get_pattern (context);
+
+  if (pattern)
+    {
+      name   = g_strdup (gimp_object_get_name (pattern));
+      width  = gimp_temp_buf_get_width  (pattern->mask);
+      height = gimp_temp_buf_get_height (pattern->mask);
+    }
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), name);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), height);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+patterns_get_pattern_data_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  gchar *actual_name = NULL;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 mask_bpp = 0;
+  gint32 length = 0;
+  guint8 *mask_data = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPattern *pattern;
+
+      if (name && strlen (name))
+        pattern = gimp_pdb_get_pattern (gimp, name, error);
+      else
+        pattern = gimp_context_get_pattern (context);
+
+      if (pattern)
+        {
+          actual_name = g_strdup (gimp_object_get_name (pattern));
+          width       = gimp_temp_buf_get_width  (pattern->mask);
+          height      = gimp_temp_buf_get_height (pattern->mask);
+          mask_bpp    = babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (pattern->mask));
+          length      = gimp_temp_buf_get_data_size (pattern->mask);
+          mask_data   = g_memdup (gimp_temp_buf_get_data (pattern->mask), length);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), mask_bpp);
+      g_value_set_int (gimp_value_array_index (return_vals, 5), length);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 6), mask_data, length);
+    }
+
+  return return_vals;
+}
+
+void
+register_patterns_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-patterns-refresh
+   */
+  procedure = gimp_procedure_new (patterns_refresh_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-refresh");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-refresh",
+                                     "Refresh current patterns. This function always succeeds.",
+                                     "This procedure retrieves all patterns currently in the user's pattern path and updates all pattern dialogs accordingly.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2002",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-patterns-get-list
+   */
+  procedure = gimp_procedure_new (patterns_get_list_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-get-list");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-get-list",
+                                     "Retrieve a complete listing of the available patterns.",
+                                     "This procedure returns a complete listing of available GIMP patterns. Each name returned can be used as input to the 'gimp-context-set-pattern'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filter",
+                                                       "filter",
+                                                       "An optional regular expression used to filter the list",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-patterns",
+                                                          "num patterns",
+                                                          "The number of patterns in the pattern list",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("pattern-list",
+                                                                 "pattern list",
+                                                                 "The list of pattern names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-patterns-get-pattern
+   */
+  procedure = gimp_procedure_new (patterns_get_pattern_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-get-pattern");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-get-pattern",
+                                     "Deprecated: Use 'gimp-context-get-pattern' instead.",
+                                     "Deprecated: Use 'gimp-context-get-pattern' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-context-get-pattern");
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("name",
+                                                           "name",
+                                                           "The pattern name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The pattern width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The pattern height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-patterns-get-pattern-data
+   */
+  procedure = gimp_procedure_new (patterns_get_pattern_data_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-patterns-get-pattern-data");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-patterns-get-pattern-data",
+                                     "Deprecated: Use 'gimp-pattern-get-pixels' instead.",
+                                     "Deprecated: Use 'gimp-pattern-get-pixels' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-pattern-get-pixels");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The pattern name (\"\" means currently active pattern)",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("actual-name",
+                                                           "actual name",
+                                                           "The pattern name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The pattern width",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The pattern height",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("mask-bpp",
+                                                          "mask bpp",
+                                                          "Pattern bytes per pixel",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("length",
+                                                          "length",
+                                                          "Length of pattern mask data",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("mask-data",
+                                                               "mask data",
+                                                               "The pattern mask data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/pdb-types.h b/app/pdb/pdb-types.h
new file mode 100644
index 0000000..301c7ee
--- /dev/null
+++ b/app/pdb/pdb-types.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PDB_TYPES_H__
+#define __PDB_TYPES_H__
+
+
+#include "core/core-types.h"
+
+
+typedef struct _GimpPDB                GimpPDB;
+typedef struct _GimpProcedure          GimpProcedure;
+typedef struct _GimpPlugInProcedure    GimpPlugInProcedure;
+typedef struct _GimpTemporaryProcedure GimpTemporaryProcedure;
+
+
+typedef enum
+{
+  GIMP_PDB_COMPAT_OFF,
+  GIMP_PDB_COMPAT_ON,
+  GIMP_PDB_COMPAT_WARN
+} GimpPDBCompatMode;
+
+
+typedef enum
+{
+  GIMP_PDB_ITEM_CONTENT  = 1 << 0,
+  GIMP_PDB_ITEM_POSITION = 1 << 1
+} GimpPDBItemModify;
+
+
+typedef enum
+{
+  GIMP_PDB_DATA_ACCESS_READ   = 0,
+  GIMP_PDB_DATA_ACCESS_WRITE  = 1 << 0,
+  GIMP_PDB_DATA_ACCESS_RENAME = 1 << 1
+} GimpPDBDataAccess;
+
+
+#endif /* __PDB_TYPES_H__ */
diff --git a/app/pdb/plug-in-cmds.c b/app/pdb/plug-in-cmds.c
new file mode 100644
index 0000000..5013617
--- /dev/null
+++ b/app/pdb/plug-in-cmds.c
@@ -0,0 +1,751 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimpplugindef.h"
+#include "plug-in/gimppluginmanager-menu-branch.h"
+#include "plug-in/gimppluginmanager-query.h"
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+plugins_query_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  GimpValueArray *return_vals;
+  const gchar *search_string;
+  gint32 num_plugins = 0;
+  gchar **menu_path = NULL;
+  gchar **plugin_accelerator = NULL;
+  gchar **plugin_location = NULL;
+  gchar **plugin_image_type = NULL;
+  gint32 *plugin_install_time = NULL;
+  gchar **plugin_real_name = NULL;
+
+  search_string = g_value_get_string (gimp_value_array_index (args, 0));
+
+  num_plugins = gimp_plug_in_manager_query (gimp->plug_in_manager,
+                                            search_string,
+                                            &menu_path,
+                                            &plugin_accelerator,
+                                            &plugin_location,
+                                            &plugin_image_type,
+                                            &plugin_real_name,
+                                            &plugin_install_time);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_plugins);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), menu_path, num_plugins);
+  g_value_set_int (gimp_value_array_index (return_vals, 3), num_plugins);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 4), plugin_accelerator, num_plugins);
+  g_value_set_int (gimp_value_array_index (return_vals, 5), num_plugins);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 6), plugin_location, num_plugins);
+  g_value_set_int (gimp_value_array_index (return_vals, 7), num_plugins);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 8), plugin_image_type, num_plugins);
+  g_value_set_int (gimp_value_array_index (return_vals, 9), num_plugins);
+  gimp_value_take_int32array (gimp_value_array_index (return_vals, 10), plugin_install_time, num_plugins);
+  g_value_set_int (gimp_value_array_index (return_vals, 11), num_plugins);
+  gimp_value_take_stringarray (gimp_value_array_index (return_vals, 12), plugin_real_name, num_plugins);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+plugin_domain_register_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *domain_name;
+  const gchar *domain_path;
+
+  domain_name = g_value_get_string (gimp_value_array_index (args, 0));
+  domain_path = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
+        {
+          gimp_plug_in_def_set_locale_domain (plug_in->plug_in_def,
+                                              domain_name, domain_path);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_help_register_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *domain_name;
+  const gchar *domain_uri;
+
+  domain_name = g_value_get_string (gimp_value_array_index (args, 0));
+  domain_uri = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
+        {
+          gimp_plug_in_def_set_help_domain (plug_in->plug_in_def,
+                                            domain_name, domain_uri);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_menu_register_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  const gchar *menu_path;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  menu_path = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        {
+          gchar *canonical = gimp_canonicalize_identifier (procedure_name);
+          success = gimp_plug_in_menu_register (plug_in, canonical, menu_path);
+          g_free (canonical);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_menu_branch_register_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *menu_path;
+  const gchar *menu_name;
+
+  menu_path = g_value_get_string (gimp_value_array_index (args, 0));
+  menu_name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        {
+          gimp_plug_in_manager_add_menu_branch (gimp->plug_in_manager,
+                                                plug_in->file, menu_path, menu_name);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_icon_register_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *procedure_name;
+  gint32 icon_type;
+  gint32 icon_data_length;
+  const guint8 *icon_data;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  icon_type = g_value_get_enum (gimp_value_array_index (args, 1));
+  icon_data_length = g_value_get_int (gimp_value_array_index (args, 2));
+  icon_data = gimp_value_get_int8array (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
+        {
+          GimpPlugInProcedure *proc;
+          gchar               *canonical;
+
+          canonical = gimp_canonicalize_identifier (procedure_name);
+
+          proc = gimp_plug_in_procedure_find (plug_in->plug_in_def->procedures,
+                                              canonical);
+
+          g_free (canonical);
+
+          if (proc)
+            gimp_plug_in_procedure_set_icon (proc, icon_type,
+                                             icon_data, icon_data_length);
+          else
+            success = FALSE;
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_set_pdb_error_handler_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  gint32 handler;
+
+  handler = g_value_get_enum (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in)
+        {
+          gimp_plug_in_set_error_handler (plug_in, handler);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_get_pdb_error_handler_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 handler = 0;
+
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in)
+    {
+      handler = gimp_plug_in_get_error_handler (plug_in);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), handler);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+plugin_enable_precision_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in)
+    {
+      gimp_plug_in_enable_precision (plug_in);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plugin_precision_enabled_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gboolean enabled = FALSE;
+
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in)
+    {
+      enabled = gimp_plug_in_precision_enabled (plug_in);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), enabled);
+
+  return return_vals;
+}
+
+void
+register_plug_in_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-plugins-query
+   */
+  procedure = gimp_procedure_new (plugins_query_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugins-query");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugins-query",
+                                     "Queries the plug-in database for its contents.",
+                                     "This procedure queries the contents of the plug-in database.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("search-string",
+                                                       "search string",
+                                                       "If not an empty string then use this as a search pattern",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-plugins",
+                                                          "num plugins",
+                                                          "The number of plug-ins",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("menu-path",
+                                                                 "menu path",
+                                                                 "The menu path of the plug-in",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-plugins",
+                                                          "num plugins",
+                                                          "The number of plug-ins",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("plugin-accelerator",
+                                                                 "plugin accelerator",
+                                                                 "String representing keyboard accelerator (could be empty string)",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-plugins",
+                                                          "num plugins",
+                                                          "The number of plug-ins",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("plugin-location",
+                                                                 "plugin location",
+                                                                 "Location of the plug-in program",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-plugins",
+                                                          "num plugins",
+                                                          "The number of plug-ins",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("plugin-image-type",
+                                                                 "plugin image type",
+                                                                 "Type of image that this plug-in will work on",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-plugins",
+                                                          "num plugins",
+                                                          "The number of plug-ins",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("plugin-install-time",
+                                                                "plugin install time",
+                                                                "Time that the plug-in was installed",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-plugins",
+                                                          "num plugins",
+                                                          "The number of plug-ins",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("plugin-real-name",
+                                                                 "plugin real name",
+                                                                 "The internal name of the plug-in",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-domain-register
+   */
+  procedure = gimp_procedure_new (plugin_domain_register_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-domain-register");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-domain-register",
+                                     "Registers a textdomain for localisation.",
+                                     "This procedure adds a textdomain to the list of domains Gimp searches for strings when translating its menu entries. There is no need to call this function for plug-ins that have their strings included in the 'gimp-std-plugins' domain as that is used by default. If the compiled message catalog is not in the standard location, you may specify an absolute path to another location. This procedure can only be called in the query function of a plug-in and it has to be called before any procedure is installed.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2000",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("domain-name",
+                                                       "domain name",
+                                                       "The name of the textdomain (must be unique)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("domain-path",
+                                                       "domain path",
+                                                       "The absolute path to the compiled message catalog (may be NULL)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-help-register
+   */
+  procedure = gimp_procedure_new (plugin_help_register_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-help-register");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-help-register",
+                                     "Register a help path for a plug-in.",
+                                     "This procedure registers user documentation for the calling plug-in with the GIMP help system. The domain_uri parameter points to the root directory where the plug-in help is installed. For each supported language there should be a file called 'gimp-help.xml' that maps the help IDs to the actual help files.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2000",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("domain-name",
+                                                       "domain name",
+                                                       "The XML namespace of the plug-in's help pages",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("domain-uri",
+                                                       "domain uri",
+                                                       "The root URI of the plug-in's help pages",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-menu-register
+   */
+  procedure = gimp_procedure_new (plugin_menu_register_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-menu-register");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-menu-register",
+                                     "Register an additional menu path for a plug-in procedure.",
+                                     "This procedure installs an additional menu entry for the given procedure.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The procedure for which to install the menu path",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("menu-path",
+                                                       "menu path",
+                                                       "The procedure's additional menu path",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-menu-branch-register
+   */
+  procedure = gimp_procedure_new (plugin_menu_branch_register_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-menu-branch-register");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-menu-branch-register",
+                                     "Register a sub-menu.",
+                                     "This procedure installs a sub-menu which does not belong to any procedure. The menu-name should be the untranslated menu label. GIMP will look up the translation in the textdomain registered for the plug-in.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("menu-path",
+                                                       "menu path",
+                                                       "The sub-menu's menu path",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("menu-name",
+                                                       "menu name",
+                                                       "The name of the sub-menu",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-icon-register
+   */
+  procedure = gimp_procedure_new (plugin_icon_register_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-icon-register");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-icon-register",
+                                     "Register an icon for a plug-in procedure.",
+                                     "This procedure installs an icon for the given procedure.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The procedure for which to install the icon",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("icon-type",
+                                                  "icon type",
+                                                  "The type of the icon",
+                                                  GIMP_TYPE_ICON_TYPE,
+                                                  GIMP_ICON_TYPE_ICON_NAME,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("icon-data-length",
+                                                      "icon data length",
+                                                      "The length of 'icon-data'",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("icon-data",
+                                                           "icon data",
+                                                           "The procedure's icon. The format depends on the 'icon_type' parameter",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-set-pdb-error-handler
+   */
+  procedure = gimp_procedure_new (plugin_set_pdb_error_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-set-pdb-error-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-set-pdb-error-handler",
+                                     "Sets an error handler for procedure calls.",
+                                     "This procedure changes the way that errors in procedure calls are handled. By default GIMP will raise an error dialog if a procedure call made by a plug-in fails. Using this procedure the plug-in can change this behavior. If the error handler is set to %GIMP_PDB_ERROR_HANDLER_PLUGIN, then the plug-in is responsible for calling 'gimp-get-pdb-error' and handling the error whenever one if its procedure calls fails. It can do this by displaying the error message or by forwarding it in its own return values.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("handler",
+                                                  "handler",
+                                                  "Who is responsible for handling procedure call errors",
+                                                  GIMP_TYPE_PDB_ERROR_HANDLER,
+                                                  GIMP_PDB_ERROR_HANDLER_INTERNAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-get-pdb-error-handler
+   */
+  procedure = gimp_procedure_new (plugin_get_pdb_error_handler_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-get-pdb-error-handler");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-get-pdb-error-handler",
+                                     "Retrieves the active error handler for procedure calls.",
+                                     "This procedure retrieves the currently active error handler for procedure calls made by the calling plug-in. See 'gimp-plugin-set-pdb-error-handler' for details.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("handler",
+                                                      "handler",
+                                                      "Who is responsible for handling procedure call errors",
+                                                      GIMP_TYPE_PDB_ERROR_HANDLER,
+                                                      GIMP_PDB_ERROR_HANDLER_INTERNAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-enable-precision
+   */
+  procedure = gimp_procedure_new (plugin_enable_precision_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-enable-precision");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-enable-precision",
+                                     "Switches this plug-in to using the real bit depth of drawables.",
+                                     "Switches this plug-in to using the real bit depth of drawables. This setting can only be enabled, and not disabled again during the lifetime of the plug-in. Using 'gimp-drawable-get-buffer', 'gimp-drawable-get-shadow-buffer' or 'gimp-drawable-get-format' will automatically call this function.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plugin-precision-enabled
+   */
+  procedure = gimp_procedure_new (plugin_precision_enabled_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-plugin-precision-enabled");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-plugin-precision-enabled",
+                                     "Whether this plug-in is using the real bit depth of drawables.",
+                                     "Returns whether this plug-in is using the real bit depth of drawables, which can be more than 8 bits per channel.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2012",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("enabled",
+                                                         "enabled",
+                                                         "Whether precision is enabled",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/plug-in-compat-cmds.c b/app/pdb/plug-in-compat-cmds.c
new file mode 100644
index 0000000..6e02cdd
--- /dev/null
+++ b/app/pdb/plug-in-compat-cmds.c
@@ -0,0 +1,9622 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "config/gimpcoreconfig.h"
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable-operation.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpimage-crop.h"
+#include "core/gimpimage-resize.h"
+#include "core/gimpimage-rotate.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppickable-auto-shrink.h"
+#include "core/gimppickable.h"
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GeglNode *
+wrap_in_graph (GeglNode *node)
+{
+  GeglNode *new_node;
+  GeglNode *input;
+  GeglNode *output;
+
+  new_node = gegl_node_new ();
+
+  gegl_node_add_child (new_node, node);
+  g_object_unref (node);
+
+  gimp_gegl_node_set_underlying_operation (new_node, node);
+
+  input  = gegl_node_get_input_proxy  (new_node, "input");
+  output = gegl_node_get_output_proxy (new_node, "output");
+
+  gegl_node_link_many (input,
+                       node,
+                       output,
+                       NULL);
+
+  return new_node;
+}
+
+static GeglNode *
+wrap_in_selection_bounds (GeglNode     *node,
+                          GimpDrawable *drawable)
+{
+  gint x, y;
+  gint width, height;
+
+  if (gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                &x, &y, &width, &height))
+    {
+      GeglNode *new_node;
+      GeglNode *input;
+      GeglNode *output;
+      GeglNode *translate_before;
+      GeglNode *crop;
+      GeglNode *translate_after;
+
+      new_node = gegl_node_new ();
+
+      gegl_node_add_child (new_node, node);
+      g_object_unref (node);
+
+      gimp_gegl_node_set_underlying_operation (new_node, node);
+
+      input  = gegl_node_get_input_proxy  (new_node, "input");
+      output = gegl_node_get_output_proxy (new_node, "output");
+
+      translate_before = gegl_node_new_child (new_node,
+                                              "operation", "gegl:translate",
+                                              "x",         (gdouble) -x,
+                                              "y",         (gdouble) -y,
+                                              NULL);
+      crop = gegl_node_new_child (new_node,
+                                  "operation", "gegl:crop",
+                                  "width",     (gdouble) width,
+                                  "height",    (gdouble) height,
+                                  NULL);
+      translate_after = gegl_node_new_child (new_node,
+                                             "operation", "gegl:translate",
+                                             "x",         (gdouble) x,
+                                             "y",         (gdouble) y,
+                                             NULL);
+
+      gegl_node_link_many (input,
+                           translate_before,
+                           crop,
+                           node,
+                           translate_after,
+                           output,
+                           NULL);
+
+      return new_node;
+    }
+  else
+    {
+      return node;
+    }
+}
+
+static GeglNode *
+wrap_in_gamma_cast (GeglNode     *node,
+                    GimpDrawable *drawable)
+{
+  if (! gimp_drawable_get_linear (drawable))
+    {
+      const Babl *drawable_format;
+      const Babl *cast_format;
+      GeglNode   *new_node;
+      GeglNode   *input;
+      GeglNode   *output;
+      GeglNode   *cast_before;
+      GeglNode   *cast_after;
+
+      drawable_format = gimp_drawable_get_format (drawable);
+
+      cast_format =
+        gimp_babl_format (gimp_babl_format_get_base_type (drawable_format),
+                          gimp_babl_precision (gimp_babl_format_get_component_type (drawable_format),
+                                               TRUE),
+                          babl_format_has_alpha (drawable_format));
+
+      new_node = gegl_node_new ();
+
+      gegl_node_add_child (new_node, node);
+      g_object_unref (node);
+
+      gimp_gegl_node_set_underlying_operation (new_node, node);
+
+      input  = gegl_node_get_input_proxy  (new_node, "input");
+      output = gegl_node_get_output_proxy (new_node, "output");
+
+      cast_before = gegl_node_new_child (new_node,
+                                         "operation",     "gegl:cast-format",
+                                         "input-format",  drawable_format,
+                                         "output-format", cast_format,
+                                         NULL);
+      cast_after  = gegl_node_new_child (new_node,
+                                         "operation",     "gegl:cast-format",
+                                         "input-format",  cast_format,
+                                         "output-format", drawable_format,
+                                         NULL);
+
+      gegl_node_link_many (input,
+                           cast_before,
+                           node,
+                           cast_after,
+                           output,
+                           NULL);
+
+      return new_node;
+    }
+  else
+    {
+      return node;
+    }
+}
+
+static GeglNode *
+create_buffer_source_node (GeglNode     *parent,
+                           GimpDrawable *drawable)
+{
+  GeglNode   *new_node;
+  GeglBuffer *buffer;
+
+  buffer = gimp_drawable_get_buffer (drawable);
+  g_object_ref (buffer);
+  new_node = gegl_node_new_child (parent,
+                                  "operation", "gegl:buffer-source",
+                                  "buffer", buffer,
+                                  NULL);
+  g_object_unref (buffer);
+  return new_node;
+}
+
+static gboolean
+bump_map (GimpDrawable *drawable,
+          GimpDrawable *bump_map,
+          gdouble       azimuth,
+          gdouble       elevation,
+          gint          depth,
+          gint          offset_x,
+          gint          offset_y,
+          gdouble       waterlevel,
+          gdouble       ambient,
+          gboolean      compensate,
+          gboolean      invert,
+          gint          type,
+          gboolean      tiled,
+          GimpProgress  *progress,
+          GError       **error)
+{
+  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                 GIMP_PDB_ITEM_CONTENT, error) &&
+      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+    {
+      GeglNode *graph;
+      GeglNode *node;
+      GeglNode *src_node;
+
+      node = gegl_node_new_child (NULL,
+                                  "operation", "gegl:bump-map",
+                                  "tiled",      tiled,
+                                  "type",       type,
+                                  "compensate", compensate,
+                                  "invert",     invert,
+                                  "azimuth",    azimuth,
+                                  "elevation",  elevation,
+                                  "depth",      depth,
+                                  "offset_x",   offset_x,
+                                  "offset_y",   offset_y,
+                                  "waterlevel", waterlevel,
+                                  "ambient",    ambient,
+                                  NULL);
+
+      graph = wrap_in_graph (node);
+
+      src_node = create_buffer_source_node (graph, bump_map);
+
+      gegl_node_connect_to (src_node, "output", node, "aux");
+
+      gimp_drawable_apply_operation (drawable, progress,
+                                     C_("undo-type", "Bump Map"),
+                                     graph);
+      g_object_unref (graph);
+
+      return TRUE;
+    }
+    else
+      return FALSE;
+}
+
+static gboolean
+displace (GimpDrawable  *drawable,
+          gdouble        amount_x,
+          gdouble        amount_y,
+          gboolean       do_x,
+          gboolean       do_y,
+          GimpDrawable  *displace_map_x,
+          GimpDrawable  *displace_map_y,
+          gint           displace_type,
+          gint           displace_mode,
+          GimpProgress  *progress,
+          GError       **error)
+{
+  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                 GIMP_PDB_ITEM_CONTENT, error) &&
+      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+    {
+      if (do_x || do_y)
+        {
+          GeglNode *graph;
+          GeglNode *node;
+          GeglAbyssPolicy abyss_policy = GEGL_ABYSS_NONE;
+
+          switch (displace_type)
+            {
+              case 1:
+                abyss_policy = GEGL_ABYSS_LOOP;
+                break;
+              case 2:
+                abyss_policy = GEGL_ABYSS_CLAMP;
+                break;
+              case 3:
+                abyss_policy = GEGL_ABYSS_BLACK;
+                break;
+            }
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",     "gegl:displace",
+                                      "displace_mode", displace_mode,
+                                      "sampler_type",  GEGL_SAMPLER_CUBIC,
+                                      "abyss_policy",  abyss_policy,
+                                      "amount_x",      amount_x,
+                                      "amount_y",      amount_y,
+                                      NULL);
+
+          graph = wrap_in_graph (node);
+
+          if (do_x)
+            {
+              GeglNode *src_node;
+              src_node = create_buffer_source_node (graph, displace_map_x);
+              gegl_node_connect_to (src_node, "output", node, "aux");
+            }
+
+          if (do_y)
+            {
+              GeglNode *src_node;
+              src_node = create_buffer_source_node (graph, displace_map_y);
+              gegl_node_connect_to (src_node, "output", node, "aux2");
+            }
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Displace"),
+                                         graph);
+          g_object_unref (graph);
+        }
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+gaussian_blur (GimpDrawable  *drawable,
+               gdouble        horizontal,
+               gdouble        vertical,
+               GimpProgress  *progress,
+               GError       **error)
+{
+  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                 GIMP_PDB_ITEM_CONTENT, error) &&
+      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+    {
+      GeglNode *node;
+
+      node = gegl_node_new_child (NULL,
+                                  "operation",    "gegl:gaussian-blur",
+                                  "std-dev-x",    horizontal * 0.32,
+                                  "std-dev-y",    vertical   * 0.32,
+                                  "abyss-policy", 1,
+                                  NULL);
+
+      node = wrap_in_gamma_cast (node, drawable);
+
+      gimp_drawable_apply_operation (drawable, progress,
+                                     C_("undo-type", "Gaussian Blur"),
+                                     node);
+      g_object_unref (node);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gint
+newsprint_color_model (gint colorspace)
+{
+  switch (colorspace)
+    {
+    case 0: return 1; /* black on white */
+    case 1: return 2; /* rgb */
+    case 2: return 3; /* cmyk */
+    case 3: return 1; /* black on white */
+    }
+
+  return 2;
+}
+
+static gint
+newsprint_pattern (gint spotfn)
+{
+  switch (spotfn)
+    {
+    case 0: return 1; /* circle */
+    case 1: return 0; /* line */
+    case 2: return 2; /* diamond */
+    case 3: return 4; /* ps circle */
+    case 4: return 2; /* FIXME postscript diamond */
+    }
+
+  return 1;
+}
+
+static gdouble
+newsprint_angle (gdouble angle)
+{
+  while (angle > 180.0)
+    angle -= 360.0;
+
+  while (angle < -180.0)
+    angle += 360.0;
+
+  return angle;
+}
+
+static GimpValueArray *
+plug_in_alienmap2_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble redfrequency;
+  gdouble redangle;
+  gdouble greenfrequency;
+  gdouble greenangle;
+  gdouble bluefrequency;
+  gdouble blueangle;
+  guint8 colormodel;
+  guint8 redmode;
+  guint8 greenmode;
+  guint8 bluemode;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  redfrequency = g_value_get_double (gimp_value_array_index (args, 3));
+  redangle = g_value_get_double (gimp_value_array_index (args, 4));
+  greenfrequency = g_value_get_double (gimp_value_array_index (args, 5));
+  greenangle = g_value_get_double (gimp_value_array_index (args, 6));
+  bluefrequency = g_value_get_double (gimp_value_array_index (args, 7));
+  blueangle = g_value_get_double (gimp_value_array_index (args, 8));
+  colormodel = g_value_get_uint (gimp_value_array_index (args, 9));
+  redmode = g_value_get_uint (gimp_value_array_index (args, 10));
+  greenmode = g_value_get_uint (gimp_value_array_index (args, 11));
+  bluemode = g_value_get_uint (gimp_value_array_index (args, 12));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:alien-map",
+                                 "color-model",      (gint)     colormodel,
+                                 "cpn-1-frequency",  (gdouble)  redfrequency,
+                                 "cpn-2-frequency",  (gdouble)  greenfrequency,
+                                 "cpn-3-frequency",  (gdouble)  bluefrequency,
+                                 "cpn-1-phaseshift", (gdouble)  redangle,
+                                 "cpn-2-phaseshift", (gdouble)  greenangle,
+                                 "cpn-3-phaseshift", (gdouble)  blueangle,
+                                 "cpn-1-keep",       (gboolean) !redmode,
+                                 "cpn-2-keep",       (gboolean) !greenmode,
+                                 "cpn-3-keep",       (gboolean) !bluemode,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Alien Map"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_antialias_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:antialias",
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Antialias"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_apply_canvas_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 direction;
+  gint32 depth;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  direction = g_value_get_int (gimp_value_array_index (args, 3));
+  depth = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:texturize-canvas",
+                                 "direction", direction,
+                                 "depth",     depth,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Apply Canvas"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_applylens_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble refraction;
+  gboolean keep_surroundings;
+  gboolean set_background;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  refraction = g_value_get_double (gimp_value_array_index (args, 3));
+  keep_surroundings = g_value_get_boolean (gimp_value_array_index (args, 4));
+  set_background = g_value_get_boolean (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpRGB    color;
+          GeglColor *gegl_color;
+          GeglNode  *node;
+
+          if (set_background)
+            gimp_context_get_background (context, &color);
+          else
+            gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);
+
+          gegl_color = gimp_gegl_color_new (&color);
+
+          node = gegl_node_new_child (NULL,
+                                     "operation",         "gegl:apply-lens",
+                                     "refraction-index",  refraction,
+                                     "keep-surroundings", keep_surroundings,
+                                     "background-color",  gegl_color,
+                                     NULL);
+
+          g_object_unref (gegl_color);
+
+          node = wrap_in_selection_bounds (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Apply Lens"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_autocrop_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpDrawable *drawable;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gint x, y, width, height;
+          gint off_x, off_y;
+
+          gimp_pickable_auto_shrink (GIMP_PICKABLE (drawable),
+                                     0, 0,
+                                     gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                     gimp_item_get_height (GIMP_ITEM (drawable)),
+                                     &x, &y, &width, &height);
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
+                                       _("Autocrop image"));
+
+          if (x          < 0                             ||
+              y          < 0                             ||
+              x + width  > gimp_image_get_width  (image) ||
+              y + height > gimp_image_get_height (image))
+            {
+              /*
+               * partially outside the image area, we need to
+               * resize the image to be able to crop properly.
+               */
+              gimp_image_resize (image, context, width, height, -x, -y, NULL);
+
+              x = y = 0;
+            }
+
+          gimp_image_crop (image, context, GIMP_FILL_TRANSPARENT,
+                           x, y, width, height, TRUE);
+
+          gimp_image_undo_group_end (image);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_autocrop_layer_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpDrawable *drawable;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error))
+        {
+          GimpLayer *layer = gimp_image_get_active_layer (image);
+          gint       x, y, width, height;
+
+          if (layer)
+            {
+              switch (gimp_pickable_auto_shrink (GIMP_PICKABLE (drawable),
+                                                 0, 0,
+                                                 gimp_item_get_width  (GIMP_ITEM (drawable)),
+                                                 gimp_item_get_height (GIMP_ITEM (drawable)),
+                                                 &x, &y, &width, &height))
+                {
+                case GIMP_AUTO_SHRINK_SHRINK:
+                  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
+                                               _("Autocrop layer"));
+
+                  gimp_item_resize (GIMP_ITEM (layer),
+                                    context, GIMP_FILL_TRANSPARENT,
+                                    width, height, -x, -y);
+
+                  gimp_image_undo_group_end (image);
+                  break;
+
+                default:
+                  break;
+                }
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_autostretch_hsv_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation",   "gegl:stretch-contrast-hsv",
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Stretch Contrast HSV"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_bump_map_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpDrawable *bumpmap;
+  gdouble azimuth;
+  gdouble elevation;
+  gint32 depth;
+  gint32 xofs;
+  gint32 yofs;
+  gdouble waterlevel;
+  gdouble ambient;
+  gboolean compensate;
+  gboolean invert;
+  gint32 type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  bumpmap = gimp_value_get_drawable (gimp_value_array_index (args, 3), gimp);
+  azimuth = g_value_get_double (gimp_value_array_index (args, 4));
+  elevation = g_value_get_double (gimp_value_array_index (args, 5));
+  depth = g_value_get_int (gimp_value_array_index (args, 6));
+  xofs = g_value_get_int (gimp_value_array_index (args, 7));
+  yofs = g_value_get_int (gimp_value_array_index (args, 8));
+  waterlevel = g_value_get_double (gimp_value_array_index (args, 9));
+  ambient = g_value_get_double (gimp_value_array_index (args, 10));
+  compensate = g_value_get_boolean (gimp_value_array_index (args, 11));
+  invert = g_value_get_boolean (gimp_value_array_index (args, 12));
+  type = g_value_get_int (gimp_value_array_index (args, 13));
+
+  if (success)
+    {
+      success = bump_map (drawable,
+                          bumpmap,
+                          azimuth,
+                          elevation,
+                          depth,
+                          xofs,
+                          yofs,
+                          waterlevel,
+                          ambient,
+                          compensate,
+                          invert,
+                          type,
+                          FALSE,
+                          progress,
+                          error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_bump_map_tiled_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpDrawable *bumpmap;
+  gdouble azimuth;
+  gdouble elevation;
+  gint32 depth;
+  gint32 xofs;
+  gint32 yofs;
+  gdouble waterlevel;
+  gdouble ambient;
+  gboolean compensate;
+  gboolean invert;
+  gint32 type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  bumpmap = gimp_value_get_drawable (gimp_value_array_index (args, 3), gimp);
+  azimuth = g_value_get_double (gimp_value_array_index (args, 4));
+  elevation = g_value_get_double (gimp_value_array_index (args, 5));
+  depth = g_value_get_int (gimp_value_array_index (args, 6));
+  xofs = g_value_get_int (gimp_value_array_index (args, 7));
+  yofs = g_value_get_int (gimp_value_array_index (args, 8));
+  waterlevel = g_value_get_double (gimp_value_array_index (args, 9));
+  ambient = g_value_get_double (gimp_value_array_index (args, 10));
+  compensate = g_value_get_boolean (gimp_value_array_index (args, 11));
+  invert = g_value_get_boolean (gimp_value_array_index (args, 12));
+  type = g_value_get_int (gimp_value_array_index (args, 13));
+
+  if (success)
+    {
+      success = bump_map (drawable,
+                          bumpmap,
+                          azimuth,
+                          elevation,
+                          depth,
+                          xofs,
+                          yofs,
+                          waterlevel,
+                          ambient,
+                          compensate,
+                          invert,
+                          type,
+                          TRUE,
+                          progress,
+                          error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_c_astretch_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation",   "gegl:stretch-contrast",
+                                 "keep-colors", (gboolean) FALSE,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Stretch Contrast"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_colors_channel_mixer_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 monochrome;
+  gdouble rr_gain;
+  gdouble rg_gain;
+  gdouble rb_gain;
+  gdouble gr_gain;
+  gdouble gg_gain;
+  gdouble gb_gain;
+  gdouble br_gain;
+  gdouble bg_gain;
+  gdouble bb_gain;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  monochrome = g_value_get_int (gimp_value_array_index (args, 3));
+  rr_gain = g_value_get_double (gimp_value_array_index (args, 4));
+  rg_gain = g_value_get_double (gimp_value_array_index (args, 5));
+  rb_gain = g_value_get_double (gimp_value_array_index (args, 6));
+  gr_gain = g_value_get_double (gimp_value_array_index (args, 7));
+  gg_gain = g_value_get_double (gimp_value_array_index (args, 8));
+  gb_gain = g_value_get_double (gimp_value_array_index (args, 9));
+  br_gain = g_value_get_double (gimp_value_array_index (args, 10));
+  bg_gain = g_value_get_double (gimp_value_array_index (args, 11));
+  bb_gain = g_value_get_double (gimp_value_array_index (args, 12));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node = NULL;
+
+          if (monochrome)
+            {
+              node = gegl_node_new_child (NULL,
+                                          "operation", "gegl:mono-mixer",
+                                          "red",       rr_gain,
+                                          "green",     rg_gain,
+                                          "blue",      rb_gain,
+                                          NULL);
+             }
+           else
+             {
+               node = gegl_node_new_child (NULL,
+                                           "operation", "gegl:channel-mixer",
+                                           "rr-gain",   rr_gain,
+                                           "rg-gain",   rg_gain,
+                                           "rb-gain",   rb_gain,
+                                           "gr-gain",   gr_gain,
+                                           "gg-gain",   gg_gain,
+                                           "gb-gain",   gb_gain,
+                                           "br-gain",   br_gain,
+                                           "bg-gain",   bg_gain,
+                                           "bb-gain",   bb_gain,
+                                            NULL);
+             }
+
+           gimp_drawable_apply_operation (drawable, progress,
+                                          C_("undo-type", "Channel Mixer"),
+                                          node);
+           g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_colortoalpha_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpRGB color;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 3), &color);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglColor *gegl_color = gimp_gegl_color_new (&color);
+          GeglNode  *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:color-to-alpha",
+                                 "color",     gegl_color,
+                                 NULL);
+          g_object_unref (gegl_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Color to Alpha"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_convmatrix_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 argc_matrix;
+  const gdouble *matrix;
+  gboolean alpha_alg;
+  gdouble divisor;
+  gdouble offset;
+  gint32 argc_channels;
+  const gint32 *channels;
+  gint32 bmode;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  argc_matrix = g_value_get_int (gimp_value_array_index (args, 3));
+  matrix = gimp_value_get_floatarray (gimp_value_array_index (args, 4));
+  alpha_alg = g_value_get_boolean (gimp_value_array_index (args, 5));
+  divisor = g_value_get_double (gimp_value_array_index (args, 6));
+  offset = g_value_get_double (gimp_value_array_index (args, 7));
+  argc_channels = g_value_get_int (gimp_value_array_index (args, 8));
+  channels = gimp_value_get_int32array (gimp_value_array_index (args, 9));
+  bmode = g_value_get_int (gimp_value_array_index (args, 10));
+
+  if (success)
+    {
+      if (argc_matrix != 25)
+        {
+          g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                       _("Array 'matrix' has only %d members, must have 25"),
+                       argc_matrix);
+          success = FALSE;
+        }
+
+      if (success && argc_channels != 5)
+        {
+          g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                       _("Array 'channels' has only %d members, must have 5"),
+                       argc_channels);
+          success = FALSE;
+        }
+
+      if (success &&
+          gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode        *node;
+          GeglAbyssPolicy  border = GEGL_ABYSS_CLAMP;
+          gboolean         r      = channels[1];
+          gboolean         g      = channels[2];
+          gboolean         b      = channels[3];
+          gboolean         a      = channels[4];
+
+          if (gimp_drawable_is_gray (drawable))
+            {
+              r = channels[0];
+              g = channels[0];
+              b = channels[0];
+            }
+
+          switch (bmode)
+            {
+            case 0: border = GEGL_ABYSS_CLAMP; break;
+            case 1: border = GEGL_ABYSS_LOOP; break;
+            case 2: border = GEGL_ABYSS_NONE; break;
+            }
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",    "gegl:convolution-matrix",
+                                      "a1",           matrix[0],
+                                      "a2",           matrix[1],
+                                      "a3",           matrix[2],
+                                      "a4",           matrix[3],
+                                      "a5",           matrix[4],
+                                      "b1",           matrix[5],
+                                      "b2",           matrix[6],
+                                      "b3",           matrix[7],
+                                      "b4",           matrix[8],
+                                      "b5",           matrix[9],
+                                      "c1",           matrix[10],
+                                      "c2",           matrix[11],
+                                      "c3",           matrix[12],
+                                      "c4",           matrix[13],
+                                      "c5",           matrix[14],
+                                      "d1",           matrix[15],
+                                      "d2",           matrix[16],
+                                      "d3",           matrix[17],
+                                      "d4",           matrix[18],
+                                      "d5",           matrix[19],
+                                      "e1",           matrix[20],
+                                      "e2",           matrix[21],
+                                      "e3",           matrix[22],
+                                      "e4",           matrix[23],
+                                      "e5",           matrix[24],
+                                      "divisor",      divisor,
+                                      "offset",       offset,
+                                      "red",          r,
+                                      "green",        g,
+                                      "blue",         b,
+                                      "alpha",        a,
+                                      "normalize",    FALSE,
+                                      "alpha-weight", alpha_alg,
+                                      "border",       border,
+                                      NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Convolution Matrix"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_cubism_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble tile_size;
+  gdouble tile_saturation;
+  gint32 bg_color;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  tile_size = g_value_get_double (gimp_value_array_index (args, 3));
+  tile_saturation = g_value_get_double (gimp_value_array_index (args, 4));
+  bg_color = g_value_get_int (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpRGB    color;
+          GeglColor *gegl_color;
+          GeglNode  *node;
+
+          if (bg_color)
+            {
+              gimp_context_get_background (context, &color);
+              gimp_rgb_set_alpha (&color, 0.0);
+            }
+          else
+            {
+              gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);
+            }
+
+          gegl_color = gimp_gegl_color_new (&color);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",       "gegl:cubism",
+                                      "tile-size",       tile_size,
+                                      "tile-saturation", tile_saturation,
+                                      "bg-color",        gegl_color,
+                                      NULL);
+          g_object_unref (gegl_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Cubism"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_deinterlace_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 evenodd;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  evenodd = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:deinterlace",
+                                      "keep",        evenodd ? 0 : 1,
+                                      "orientation", 0, /* HORIZONTAL */
+                                      "size",        1,
+                                      NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Deinterlace"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_diffraction_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble lam_r;
+  gdouble lam_g;
+  gdouble lam_b;
+  gdouble contour_r;
+  gdouble contour_g;
+  gdouble contour_b;
+  gdouble edges_r;
+  gdouble edges_g;
+  gdouble edges_b;
+  gdouble brightness;
+  gdouble scattering;
+  gdouble polarization;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  lam_r = g_value_get_double (gimp_value_array_index (args, 3));
+  lam_g = g_value_get_double (gimp_value_array_index (args, 4));
+  lam_b = g_value_get_double (gimp_value_array_index (args, 5));
+  contour_r = g_value_get_double (gimp_value_array_index (args, 6));
+  contour_g = g_value_get_double (gimp_value_array_index (args, 7));
+  contour_b = g_value_get_double (gimp_value_array_index (args, 8));
+  edges_r = g_value_get_double (gimp_value_array_index (args, 9));
+  edges_g = g_value_get_double (gimp_value_array_index (args, 10));
+  edges_b = g_value_get_double (gimp_value_array_index (args, 11));
+  brightness = g_value_get_double (gimp_value_array_index (args, 12));
+  scattering = g_value_get_double (gimp_value_array_index (args, 13));
+  polarization = g_value_get_double (gimp_value_array_index (args, 14));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gint      x, y, width, height;
+
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",       "gegl:diffraction-patterns",
+                                      "red-frequency",   lam_r,
+                                      "green-frequency", lam_g,
+                                      "blue-frequency",  lam_b,
+                                      "red-contours",    contour_r,
+                                      "green-contours",  contour_g,
+                                      "blue-contours",   contour_b,
+                                      "red-sedges",      edges_r,
+                                      "green-sedges",    edges_g,
+                                      "blue-sedges",     edges_b,
+                                      "brightness",      brightness,
+                                      "scattering",      scattering,
+                                      "polarization",    polarization,
+                                      "width",           width,
+                                      "height",          height,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Diffraction Patterns"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_displace_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble amount_x;
+  gdouble amount_y;
+  gboolean do_x;
+  gboolean do_y;
+  GimpDrawable *displace_map_x;
+  GimpDrawable *displace_map_y;
+  gint32 displace_type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  amount_x = g_value_get_double (gimp_value_array_index (args, 3));
+  amount_y = g_value_get_double (gimp_value_array_index (args, 4));
+  do_x = g_value_get_boolean (gimp_value_array_index (args, 5));
+  do_y = g_value_get_boolean (gimp_value_array_index (args, 6));
+  displace_map_x = gimp_value_get_drawable (gimp_value_array_index (args, 7), gimp);
+  displace_map_y = gimp_value_get_drawable (gimp_value_array_index (args, 8), gimp);
+  displace_type = g_value_get_int (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      success = displace (drawable,
+                          amount_x,
+                          amount_y,
+                          do_x,
+                          do_y,
+                          displace_map_x,
+                          displace_map_y,
+                          displace_type,
+                          0,
+                          progress,
+                          error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_displace_polar_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble amount_x;
+  gdouble amount_y;
+  gboolean do_x;
+  gboolean do_y;
+  GimpDrawable *displace_map_x;
+  GimpDrawable *displace_map_y;
+  gint32 displace_type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  amount_x = g_value_get_double (gimp_value_array_index (args, 3));
+  amount_y = g_value_get_double (gimp_value_array_index (args, 4));
+  do_x = g_value_get_boolean (gimp_value_array_index (args, 5));
+  do_y = g_value_get_boolean (gimp_value_array_index (args, 6));
+  displace_map_x = gimp_value_get_drawable (gimp_value_array_index (args, 7), gimp);
+  displace_map_y = gimp_value_get_drawable (gimp_value_array_index (args, 8), gimp);
+  displace_type = g_value_get_int (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      success = displace (drawable,
+                          amount_x,
+                          amount_y,
+                          do_x,
+                          do_y,
+                          displace_map_x,
+                          displace_map_y,
+                          displace_type,
+                          1,
+                          progress,
+                          error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_edge_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble amount;
+  gint32 warpmode;
+  gint32 edgemode;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  amount = g_value_get_double (gimp_value_array_index (args, 3));
+  warpmode = g_value_get_int (gimp_value_array_index (args, 4));
+  edgemode = g_value_get_int (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode        *node;
+          GeglAbyssPolicy  border_behavior = GEGL_ABYSS_NONE;
+
+          switch (warpmode)
+            {
+            case 0:
+              border_behavior = GEGL_ABYSS_NONE;
+              break;
+
+            case 1:
+              border_behavior = GEGL_ABYSS_LOOP;
+              break;
+
+            case 2:
+              border_behavior = GEGL_ABYSS_CLAMP;
+              break;
+
+            case 3:
+              border_behavior = GEGL_ABYSS_BLACK;
+              break;
+            }
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",       "gegl:edge",
+                                      "algorithm",       edgemode,
+                                      "amount",          amount,
+                                      "border-behavior", border_behavior,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Edge"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_engrave_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 height;
+  gboolean limit;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  height = g_value_get_int (gimp_value_array_index (args, 3));
+  limit = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:engrave",
+                                      "row-height",  height,
+                                      "limit",       limit,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Engrave"),
+                                         node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_exchange_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  guint8 from_red;
+  guint8 from_green;
+  guint8 from_blue;
+  guint8 to_red;
+  guint8 to_green;
+  guint8 to_blue;
+  guint8 red_threshold;
+  guint8 green_threshold;
+  guint8 blue_threshold;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  from_red = g_value_get_uint (gimp_value_array_index (args, 3));
+  from_green = g_value_get_uint (gimp_value_array_index (args, 4));
+  from_blue = g_value_get_uint (gimp_value_array_index (args, 5));
+  to_red = g_value_get_uint (gimp_value_array_index (args, 6));
+  to_green = g_value_get_uint (gimp_value_array_index (args, 7));
+  to_blue = g_value_get_uint (gimp_value_array_index (args, 8));
+  red_threshold = g_value_get_uint (gimp_value_array_index (args, 9));
+  green_threshold = g_value_get_uint (gimp_value_array_index (args, 10));
+  blue_threshold = g_value_get_uint (gimp_value_array_index (args, 11));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpRGB    from;
+          GimpRGB    to;
+          GeglColor *gegl_from;
+          GeglColor *gegl_to;
+          GeglNode  *node;
+
+          gimp_rgb_set_uchar (&from, from_red, from_green, from_blue);
+          gimp_rgb_set_uchar (&to,   to_red,   to_green,   to_blue);
+
+          gegl_from = gimp_gegl_color_new (&from);
+          gegl_to   = gimp_gegl_color_new (&to);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",       "gegl:color-exchange",
+                                      "from-color",      gegl_from,
+                                      "to-color",        gegl_to,
+                                      "red-threshold",   red_threshold   / 255.0,
+                                      "green-threshold", green_threshold / 255.0,
+                                      "blue-threshold",  blue_threshold  / 255.0,
+                                      NULL);
+
+          g_object_unref (gegl_from);
+          g_object_unref (gegl_to);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Color Exchange"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_flarefx_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 pos_x;
+  gint32 pos_y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  pos_x = g_value_get_int (gimp_value_array_index (args, 3));
+  pos_y = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gint      width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+          gint      height = gimp_item_get_height (GIMP_ITEM (drawable));
+          gdouble   x      = (gdouble) pos_x / (gdouble) width;
+          gdouble   y      = (gdouble) pos_y / (gdouble) height;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation", "gegl:lens-flare",
+                                      "pos-x",     x,
+                                      "pos-y",     y,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Lens Flare"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_gauss_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble horizontal;
+  gdouble vertical;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  horizontal = g_value_get_double (gimp_value_array_index (args, 3));
+  vertical = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      success = gaussian_blur (drawable, horizontal, vertical, progress, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_gauss_iir_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble radius;
+  gboolean horizontal;
+  gboolean vertical;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  radius = g_value_get_double (gimp_value_array_index (args, 3));
+  horizontal = g_value_get_boolean (gimp_value_array_index (args, 4));
+  vertical = g_value_get_boolean (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      success = gaussian_blur (drawable,
+                               horizontal ? radius : 0.0,
+                               vertical   ? radius : 0.0,
+                               progress, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_gauss_iir2_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble horizontal;
+  gdouble vertical;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  horizontal = g_value_get_double (gimp_value_array_index (args, 3));
+  vertical = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      success = gaussian_blur (drawable, horizontal, vertical, progress, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_gauss_rle_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble radius;
+  gboolean horizontal;
+  gboolean vertical;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  radius = g_value_get_double (gimp_value_array_index (args, 3));
+  horizontal = g_value_get_boolean (gimp_value_array_index (args, 4));
+  vertical = g_value_get_boolean (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      success = gaussian_blur (drawable,
+                               horizontal ? radius : 0.0,
+                               vertical   ? radius : 0.0,
+                               progress, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_gauss_rle2_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble horizontal;
+  gdouble vertical;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  horizontal = g_value_get_double (gimp_value_array_index (args, 3));
+  vertical = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      success = gaussian_blur (drawable, horizontal, vertical, progress, error);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_glasstile_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 tilex;
+  gint32 tiley;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  tilex = g_value_get_int (gimp_value_array_index (args, 3));
+  tiley = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:tile-glass",
+                                      "tile-width",  tilex,
+                                      "tile-height", tiley,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Glass Tile"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_hsv_noise_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 holdness;
+  gint32 hue_distance;
+  gint32 saturation_distance;
+  gint32 value_distance;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  holdness = g_value_get_int (gimp_value_array_index (args, 3));
+  hue_distance = g_value_get_int (gimp_value_array_index (args, 4));
+  saturation_distance = g_value_get_int (gimp_value_array_index (args, 5));
+  value_distance = g_value_get_int (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+
+          gdouble saturation = saturation_distance / 255.0;
+          gdouble value = value_distance / 255.0;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",           "gegl:noise-hsv",
+                                      "holdness",            (gint)    holdness,
+                                      "hue-distance",        (gdouble) hue_distance,
+                                      "saturation-distance", (gdouble) saturation,
+                                      "value-distance",      (gdouble) value,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Noise HSV"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_icc_profile_info_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gchar *profile_name = NULL;
+  gchar *profile_desc = NULL;
+  gchar *profile_info = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      GimpColorProfile *profile;
+
+      profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+
+      if (profile)
+        {
+          profile_name = g_strdup (gimp_color_profile_get_model (profile));
+          profile_desc = g_strdup (gimp_color_profile_get_description (profile));
+          profile_info = g_strdup (gimp_color_profile_get_summary (profile));
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), profile_name);
+      g_value_take_string (gimp_value_array_index (return_vals, 2), profile_desc);
+      g_value_take_string (gimp_value_array_index (return_vals, 3), profile_info);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+plug_in_icc_profile_file_info_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *profile;
+  gchar *profile_name = NULL;
+  gchar *profile_desc = NULL;
+  gchar *profile_info = NULL;
+
+  profile = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GFile *file = g_file_new_for_path (profile);
+
+      if (file)
+        {
+          GimpColorProfile *p;
+
+          p = gimp_color_profile_new_from_file (file, error);
+          g_object_unref (file);
+
+          if (p)
+            {
+              profile_name = g_strdup (gimp_color_profile_get_model (p));
+              profile_desc = g_strdup (gimp_color_profile_get_description (p));
+              profile_info = g_strdup (gimp_color_profile_get_summary (p));
+
+              g_object_unref (p);
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), profile_name);
+      g_value_take_string (gimp_value_array_index (return_vals, 2), profile_desc);
+      g_value_take_string (gimp_value_array_index (return_vals, 3), profile_info);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+plug_in_icc_profile_apply_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *profile;
+  gint32 intent;
+  gboolean bpc;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  profile = g_value_get_string (gimp_value_array_index (args, 2));
+  intent = g_value_get_enum (gimp_value_array_index (args, 3));
+  bpc = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_GRAY, error))
+        {
+          GimpColorProfile *p = NULL;
+
+          if (profile)
+            {
+              GFile *file = g_file_new_for_path (profile);
+
+              if (file)
+                {
+                  p = gimp_color_profile_new_from_file (file, error);
+
+                  if (! p)
+                    success = FALSE;
+
+                  g_object_unref (file);
+                }
+              else
+                {
+                  success = FALSE;
+                }
+            }
+          else if (image->gimp->config->color_management->rgb_profile)
+            {
+              p = gimp_color_config_get_rgb_color_profile (image->gimp->config->color_management,
+                                                           error);
+
+              if (! p)
+                success = FALSE;
+            }
+
+          if (success)
+            {
+              if (! p)
+                p = gimp_image_get_builtin_color_profile (image);
+
+              success = gimp_image_convert_color_profile (image, p, intent, bpc,
+                                                          progress, error);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_icc_profile_apply_rgb_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 intent;
+  gboolean bpc;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  intent = g_value_get_enum (gimp_value_array_index (args, 2));
+  bpc = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_GRAY, error))
+        {
+          GimpColorProfile *p = NULL;
+
+          if (image->gimp->config->color_management->rgb_profile)
+            {
+              p = gimp_color_config_get_rgb_color_profile (image->gimp->config->color_management,
+                                                           error);
+
+              if (! p)
+                success = FALSE;
+            }
+
+          if (success)
+            {
+              if (! p)
+                p = gimp_image_get_builtin_color_profile (image);
+
+              success = gimp_image_convert_color_profile (image, p, intent, bpc,
+                                                          progress, error);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_icc_profile_set_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *profile;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  profile = g_value_get_string (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_GRAY, error))
+        {
+          GimpColorProfile *p = NULL;
+
+          if (profile)
+            {
+              GFile *file = g_file_new_for_path (profile);
+
+              if (file)
+                {
+                  p = gimp_color_profile_new_from_file (file, error);
+
+                  if (! p)
+                    success = FALSE;
+
+                  g_object_unref (file);
+                }
+              else
+                success = FALSE;
+            }
+          else if (image->gimp->config->color_management->rgb_profile)
+            {
+              p = gimp_color_config_get_rgb_color_profile (image->gimp->config->color_management,
+                                                           error);
+
+              if (! p)
+                success = FALSE;
+            }
+
+          if (success)
+            {
+              gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_MISC,
+                                           _("Set color profile"));
+
+              if (gimp_image_set_color_profile (image, p, error))
+                gimp_image_parasite_detach (image, "icc-profile-name", TRUE);
+              else
+                success = FALSE;
+
+              gimp_image_undo_group_end (image);
+
+              if (! success)
+                gimp_image_undo (image);
+
+              if (p)
+                g_object_unref (p);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_icc_profile_set_rgb_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_image_is_not_base_type (image, GIMP_GRAY, error))
+        {
+          GimpColorProfile *p = NULL;
+
+          if (image->gimp->config->color_management->rgb_profile)
+            {
+              p = gimp_color_config_get_rgb_color_profile (image->gimp->config->color_management,
+                                                           error);
+
+              if (! p)
+                success = FALSE;
+            }
+
+          if (success)
+            {
+              gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_MISC,
+                                           _("Set color profile"));
+
+              if (gimp_image_set_color_profile (image, p, error))
+                gimp_image_parasite_detach (image, "icc-profile-name", TRUE);
+              else
+                success = FALSE;
+
+              gimp_image_undo_group_end (image);
+
+              if (! success)
+                gimp_image_undo (image);
+
+              if (p)
+                g_object_unref (p);
+            }
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_illusion_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 division;
+  gint32 type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  division = g_value_get_int (gimp_value_array_index (args, 3));
+  type = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation",     "gegl:illusion",
+                                 "division",      (gint) division,
+                                 "illusion-type", (gint) type,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Illusion"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_laplace_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:edge-laplace",
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Laplace"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_lens_distortion_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble offset_x;
+  gdouble offset_y;
+  gdouble main_adjust;
+  gdouble edge_adjust;
+  gdouble rescale;
+  gdouble brighten;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  offset_x = g_value_get_double (gimp_value_array_index (args, 3));
+  offset_y = g_value_get_double (gimp_value_array_index (args, 4));
+  main_adjust = g_value_get_double (gimp_value_array_index (args, 5));
+  edge_adjust = g_value_get_double (gimp_value_array_index (args, 6));
+  rescale = g_value_get_double (gimp_value_array_index (args, 7));
+  brighten = g_value_get_double (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node = NULL;
+          GimpRGB    color;
+          GeglColor *gegl_color;
+
+          gimp_context_get_background (context, &color);
+
+          if (gimp_drawable_has_alpha (drawable))
+            {
+              gimp_rgb_set_alpha (&color, 0.0);
+            }
+          else
+            {
+              gimp_rgb_set_alpha (&color, 1.0);
+            }
+
+          gegl_color = gimp_gegl_color_new (&color);
+
+          node =  gegl_node_new_child (NULL,
+                                       "operation", "gegl:lens-distortion",
+                                       "main",       (gdouble) main_adjust,
+                                       "edge",       (gdouble) edge_adjust,
+                                       "zoom",       (gdouble) rescale,
+                                       "x-shift",    (gdouble) offset_x,
+                                       "y-shift",    (gdouble) offset_y,
+                                       "brighten",   (gdouble) brighten,
+                                       "background", gegl_color,
+                                       NULL);
+
+          g_object_unref (gegl_color);
+
+          node = wrap_in_selection_bounds (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                        C_("undo-type", "Lens Distortion"),
+                                        node);
+          g_object_unref (node);
+
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_make_seamless_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:tile-seamless",
+                                 NULL);
+
+          node = wrap_in_selection_bounds (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Tile Seamless"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_maze_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint16 width;
+  gint16 height;
+  guint8 tileable;
+  guint8 algorithm;
+  gint32 seed;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  width = g_value_get_int (gimp_value_array_index (args, 3));
+  height = g_value_get_int (gimp_value_array_index (args, 4));
+  tileable = g_value_get_uint (gimp_value_array_index (args, 5));
+  algorithm = g_value_get_uint (gimp_value_array_index (args, 6));
+  seed = g_value_get_int (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+          GeglColor *fg_color;
+          GeglColor *bg_color;
+          GimpRGB    color;
+
+          gimp_context_get_foreground (context, &color);
+          fg_color = gimp_gegl_color_new (&color);
+
+          gimp_context_get_background (context, &color);
+          bg_color = gimp_gegl_color_new (&color);
+
+          node =  gegl_node_new_child (NULL,
+                                       "operation",      "gegl:maze",
+                                       "x",              width,
+                                       "y",              height,
+                                       "algorithm-type", algorithm,
+                                       "tileable",       tileable,
+                                       "seed",           seed,
+                                       "fg-color",       fg_color,
+                                       "bg-color",       bg_color,
+                                       NULL);
+
+          g_object_unref (fg_color);
+          g_object_unref (bg_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Maze"),
+                                        node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_mblur_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 type;
+  gdouble length;
+  gdouble angle;
+  gdouble center_x;
+  gdouble center_y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  type = g_value_get_int (gimp_value_array_index (args, 3));
+  length = g_value_get_double (gimp_value_array_index (args, 4));
+  angle = g_value_get_double (gimp_value_array_index (args, 5));
+  center_x = g_value_get_double (gimp_value_array_index (args, 6));
+  center_y = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node   = NULL;
+          gint      width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+          gint      height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+          center_x /= (gdouble) width;
+          center_y /= (gdouble) height;
+
+          if (angle > 180.0)
+            angle -= 360.0;
+
+          if (type == 0)
+            {
+              node =  gegl_node_new_child (NULL,
+                                           "operation", "gegl:motion-blur-linear",
+                                           "length",    length,
+                                           "angle",     angle,
+                                            NULL);
+            }
+          else if (type == 1)
+            {
+              node =  gegl_node_new_child (NULL,
+                                           "operation", "gegl:motion-blur-circular",
+                                           "center-x",  center_x,
+                                           "center-y",  center_y,
+                                           "angle",     angle,
+                                            NULL);
+            }
+          else if (type == 2)
+            {
+              gdouble factor = CLAMP (length / 256.0, 0.0, 1.0);
+
+              node =  gegl_node_new_child (NULL,
+                                           "operation", "gegl:motion-blur-zoom",
+                                           "center-x",  center_x,
+                                           "center-y",  center_y,
+                                           "factor",    factor,
+                                            NULL);
+            }
+
+          if (node != NULL)
+            {
+              gimp_drawable_apply_operation (drawable, progress,
+                                             C_("undo-type", "Motion Blur"),
+                                             node);
+              g_object_unref (node);
+            }
+          else
+            success = FALSE;
+
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_mblur_inward_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 type;
+  gdouble length;
+  gdouble angle;
+  gdouble center_x;
+  gdouble center_y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  type = g_value_get_int (gimp_value_array_index (args, 3));
+  length = g_value_get_double (gimp_value_array_index (args, 4));
+  angle = g_value_get_double (gimp_value_array_index (args, 5));
+  center_x = g_value_get_double (gimp_value_array_index (args, 6));
+  center_y = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node   = NULL;
+          gint      width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+          gint      height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+          center_x /= (gdouble) width;
+          center_y /= (gdouble) height;
+
+          if (type == 0)
+            {
+              node =  gegl_node_new_child (NULL,
+                                           "operation", "gegl:motion-blur-linear",
+                                           "length",    length,
+                                           "angle",     angle,
+                                            NULL);
+            }
+          else if (type == 1)
+            {
+              node =  gegl_node_new_child (NULL,
+                                           "operation", "gegl:motion-blur-circular",
+                                           "center-x",  center_x,
+                                           "center-y",  center_y,
+                                           "angle",     angle,
+                                            NULL);
+            }
+          else if (type == 2)
+            {
+              gdouble factor = CLAMP (-length / (256.0 - length), -10.0, 0.0);
+
+              node =  gegl_node_new_child (NULL,
+                                           "operation", "gegl:motion-blur-zoom",
+                                           "center-x",  center_x,
+                                           "center-y",  center_y,
+                                           "factor",    factor,
+                                            NULL);
+            }
+
+          if (node != NULL)
+            {
+              gimp_drawable_apply_operation (drawable, progress,
+                                             C_("undo-type", "Motion Blur"),
+                                             node);
+              g_object_unref (node);
+            }
+          else
+            success = FALSE;
+
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_median_blur_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 radius;
+  gdouble percentile;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  radius = g_value_get_int (gimp_value_array_index (args, 3));
+  percentile = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:median-blur",
+                                 "radius",     radius,
+                                 "percentile", percentile,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Median Blur"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_mosaic_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble tile_size;
+  gdouble tile_height;
+  gdouble tile_spacing;
+  gdouble tile_neatness;
+  gint32 tile_allow_split;
+  gdouble light_dir;
+  gdouble color_variation;
+  gint32 antialiasing;
+  gint32 color_averaging;
+  gint32 tile_type;
+  gint32 tile_surface;
+  gint32 grout_color;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  tile_size = g_value_get_double (gimp_value_array_index (args, 3));
+  tile_height = g_value_get_double (gimp_value_array_index (args, 4));
+  tile_spacing = g_value_get_double (gimp_value_array_index (args, 5));
+  tile_neatness = g_value_get_double (gimp_value_array_index (args, 6));
+  tile_allow_split = g_value_get_int (gimp_value_array_index (args, 7));
+  light_dir = g_value_get_double (gimp_value_array_index (args, 8));
+  color_variation = g_value_get_double (gimp_value_array_index (args, 9));
+  antialiasing = g_value_get_int (gimp_value_array_index (args, 10));
+  color_averaging = g_value_get_int (gimp_value_array_index (args, 11));
+  tile_type = g_value_get_int (gimp_value_array_index (args, 12));
+  tile_surface = g_value_get_int (gimp_value_array_index (args, 13));
+  grout_color = g_value_get_int (gimp_value_array_index (args, 14));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglColor *fg_color;
+          GeglColor *bg_color;
+          GeglNode  *node;
+
+          if (grout_color)
+            {
+              GimpRGB fgcolor, bgcolor;
+
+              gimp_context_get_background (context, &bgcolor);
+              bg_color = gimp_gegl_color_new (&bgcolor);
+
+              gimp_context_get_foreground (context, &fgcolor);
+              fg_color = gimp_gegl_color_new (&fgcolor);
+            }
+          else
+            {
+              /* sic */
+              fg_color = gegl_color_new ("white");
+              bg_color = gegl_color_new ("black");
+            }
+
+          node = gegl_node_new_child (NULL,
+                     "operation",        "gegl:mosaic",
+                     "tile-size",        (gdouble)  tile_size,
+                     "tile-height",      (gdouble)  tile_height,
+                     "tile-spacing",     (gdouble)  tile_spacing,
+                     "tile-neatness",    (gdouble)  tile_neatness,
+                     "tile-allow-split", (gboolean) tile_allow_split,
+                     "light-dir",        (gdouble)  light_dir,
+                     "color-variation",  (gfloat)   color_variation,
+                     "antialiasing",     (gboolean) antialiasing,
+                     "color-averaging",  (gboolean) color_averaging,
+                     "tile-type",        (gint)     tile_type,
+                     "tile-surface",     (gboolean) tile_surface,
+                     "light-color",      fg_color,
+                     "joints-color",     bg_color,
+                     NULL);
+
+          g_object_unref (fg_color);
+          g_object_unref (bg_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Mosaic"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_neon_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble radius;
+  gdouble amount;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  radius = g_value_get_double (gimp_value_array_index (args, 3));
+  amount = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation", "gegl:edge-neon",
+                                      "radius",    radius,
+                                      "amount",    amount,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Neon"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_newsprint_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 cell_width;
+  gint32 colorspace;
+  gint32 k_pullout;
+  gdouble gry_ang;
+  gint32 gry_spotfn;
+  gdouble red_ang;
+  gint32 red_spotfn;
+  gdouble grn_ang;
+  gint32 grn_spotfn;
+  gdouble blu_ang;
+  gint32 blu_spotfn;
+  gint32 oversample;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  cell_width = g_value_get_int (gimp_value_array_index (args, 3));
+  colorspace = g_value_get_int (gimp_value_array_index (args, 4));
+  k_pullout = g_value_get_int (gimp_value_array_index (args, 5));
+  gry_ang = g_value_get_double (gimp_value_array_index (args, 6));
+  gry_spotfn = g_value_get_int (gimp_value_array_index (args, 7));
+  red_ang = g_value_get_double (gimp_value_array_index (args, 8));
+  red_spotfn = g_value_get_int (gimp_value_array_index (args, 9));
+  grn_ang = g_value_get_double (gimp_value_array_index (args, 10));
+  grn_spotfn = g_value_get_int (gimp_value_array_index (args, 11));
+  blu_ang = g_value_get_double (gimp_value_array_index (args, 12));
+  blu_spotfn = g_value_get_int (gimp_value_array_index (args, 13));
+  oversample = g_value_get_int (gimp_value_array_index (args, 14));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gint      color_model = newsprint_color_model (colorspace);
+          gint      pattern     = newsprint_pattern (gry_spotfn);
+          gint      pattern2    = newsprint_pattern (red_spotfn);
+          gint      pattern3    = newsprint_pattern (grn_spotfn);
+          gint      pattern4    = newsprint_pattern (blu_spotfn);
+          gdouble   angle       = newsprint_angle (gry_ang);
+          gdouble   angle2      = newsprint_angle (red_ang);
+          gdouble   angle3      = newsprint_angle (grn_ang);
+          gdouble   angle4      = newsprint_angle (blu_ang);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",     "gegl:newsprint",
+                                      "color-model",   color_model,
+                                      "black-pullout", (gdouble) k_pullout / 100.0,
+                                      "period",        (gdouble) cell_width,
+                                      "angle",         angle,
+                                      "pattern",       pattern,
+                                      "period2",       (gdouble) cell_width,
+                                      "angle2",        angle2,
+                                      "pattern2",      pattern2,
+                                      "period3",       (gdouble) cell_width,
+                                      "angle3",        angle3,
+                                      "pattern3",      pattern3,
+                                      "period4",       (gdouble) cell_width,
+                                      "angle4",        angle4,
+                                      "pattern4",      pattern4,
+                                      "aa-samples",    oversample,
+                                      NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Newsprint"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_normalize_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:stretch-contrast",
+                                      "keep-colors", TRUE,
+                                      "perceptual",  TRUE,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Normalize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_nova_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 xcenter;
+  gint32 ycenter;
+  GimpRGB color;
+  gint32 radius;
+  gint32 nspoke;
+  gint32 randomhue;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  xcenter = g_value_get_int (gimp_value_array_index (args, 3));
+  ycenter = g_value_get_int (gimp_value_array_index (args, 4));
+  gimp_value_get_rgb (gimp_value_array_index (args, 5), &color);
+  radius = g_value_get_int (gimp_value_array_index (args, 6));
+  nspoke = g_value_get_int (gimp_value_array_index (args, 7));
+  randomhue = g_value_get_int (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+          GeglColor *gegl_color = gimp_gegl_color_new (&color);
+          gdouble    center_x   = (gdouble) xcenter / (gdouble) gimp_item_get_width (GIMP_ITEM (drawable));
+          gdouble    center_y   = (gdouble) ycenter / (gdouble) gimp_item_get_height (GIMP_ITEM (drawable));
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",    "gegl:supernova",
+                                      "center-x",     center_x,
+                                      "center-y",     center_y,
+                                      "radius",       radius,
+                                      "spokes-count", nspoke,
+                                      "random-hue",   randomhue,
+                                      "color",        gegl_color,
+                                      "seed",         g_random_int (),
+                                      NULL);
+
+          g_object_unref (gegl_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Supernova"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_oilify_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 mask_size;
+  gint32 mode;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  mask_size = g_value_get_int (gimp_value_array_index (args, 3));
+  mode = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",       "gegl:oilify",
+                                      "mask-radius",     MAX (1, mask_size / 2),
+                                      "use-inten",       mode ? TRUE : FALSE,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Oilify"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_oilify_enhanced_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 mode;
+  gint32 mask_size;
+  GimpDrawable *mask_size_map;
+  gint32 exponent;
+  GimpDrawable *exponent_map;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  mode = g_value_get_int (gimp_value_array_index (args, 3));
+  mask_size = g_value_get_int (gimp_value_array_index (args, 4));
+  mask_size_map = gimp_value_get_drawable (gimp_value_array_index (args, 5), gimp);
+  exponent = g_value_get_int (gimp_value_array_index (args, 6));
+  exponent_map = gimp_value_get_drawable (gimp_value_array_index (args, 7), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *graph;
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:oilify",
+                                      "mask-radius", MAX (1, mask_size / 2),
+                                      "use-inten",   mode ? TRUE : FALSE,
+                                      "exponent",    exponent,
+                                      NULL);
+
+          graph = wrap_in_graph (node);
+
+          if (mask_size_map)
+            {
+              GeglNode *src_node;
+              src_node = create_buffer_source_node (graph, mask_size_map);
+              gegl_node_connect_to (src_node, "output", node, "aux");
+            }
+
+          if (exponent_map)
+            {
+              GeglNode *src_node;
+              src_node = create_buffer_source_node (graph, exponent_map);
+              gegl_node_connect_to (src_node, "output", node, "aux2");
+            }
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Oilify"),
+                                         graph);
+          g_object_unref (graph);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_papertile_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 tile_size;
+  gdouble move_max;
+  gint32 fractional_type;
+  gboolean wrap_around;
+  gboolean centering;
+  gint32 background_type;
+  GimpRGB background_color;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  tile_size = g_value_get_int (gimp_value_array_index (args, 3));
+  move_max = g_value_get_double (gimp_value_array_index (args, 4));
+  fractional_type = g_value_get_int (gimp_value_array_index (args, 5));
+  wrap_around = g_value_get_boolean (gimp_value_array_index (args, 6));
+  centering = g_value_get_boolean (gimp_value_array_index (args, 7));
+  background_type = g_value_get_int (gimp_value_array_index (args, 8));
+  gimp_value_get_rgb (gimp_value_array_index (args, 9), &background_color);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+          GimpRGB    color;
+          GeglColor *gegl_color;
+          gint       bg_type;
+
+          switch (background_type)
+            {
+            default:
+              bg_type = background_type;
+              gimp_rgba_set (&color, 0.0, 0.0, 1.0, 1.0);
+              break;
+
+            case 3:
+              bg_type = 3;
+              gimp_context_get_foreground (context, &color);
+              break;
+
+            case 4:
+              bg_type = 3;
+              gimp_context_get_background (context, &color);
+              break;
+
+            case 5:
+              bg_type = 3;
+              color = background_color;
+              break;
+            }
+
+          gegl_color = gimp_gegl_color_new (&color);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",       "gegl:tile-paper",
+                                      "tile-width",      tile_size,
+                                      "tile-height",     tile_size,
+                                      "move-rate",       move_max,
+                                      "bg-color",        gegl_color,
+                                      "centering",       centering,
+                                      "wrap-around",     wrap_around,
+                                      "background-type", bg_type,
+                                      "fractional-type", fractional_type,
+                                      NULL);
+
+          g_object_unref (gegl_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Paper Tile"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_pixelize_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 pixel_width;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  pixel_width = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:pixelize",
+                                 "size-x",    pixel_width,
+                                 "size-y",    pixel_width,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Pixelize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_pixelize2_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 pixel_width;
+  gint32 pixel_height;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  pixel_width = g_value_get_int (gimp_value_array_index (args, 3));
+  pixel_height = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:pixelize",
+                                 "size-x",    pixel_width,
+                                 "size-y",    pixel_height,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Pixelize"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_plasma_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 seed;
+  gdouble turbulence;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  seed = g_value_get_int (gimp_value_array_index (args, 3));
+  turbulence = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gint      x, y, width, height;
+
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",  "gegl:plasma",
+                                      "seed",       seed,
+                                      "turbulence", turbulence,
+                                      "x",          x,
+                                      "y",          y,
+                                      "width",      width,
+                                      "height",     height,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Plasma"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_polar_coords_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble circle;
+  gdouble angle;
+  gboolean backwards;
+  gboolean inverse;
+  gboolean polrec;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  circle = g_value_get_double (gimp_value_array_index (args, 3));
+  angle = g_value_get_double (gimp_value_array_index (args, 4));
+  backwards = g_value_get_boolean (gimp_value_array_index (args, 5));
+  inverse = g_value_get_boolean (gimp_value_array_index (args, 6));
+  polrec = g_value_get_boolean (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:polar-coordinates",
+                                 "depth",     circle,
+                                 "angle",     angle,
+                                 "bw",        backwards, /* XXX name */
+                                 "top",       inverse,
+                                 "polar",     polrec,
+                                 NULL);
+
+          node = wrap_in_selection_bounds (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Polar Coordinates"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_red_eye_removal_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 threshold;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  threshold = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:red-eye-removal",
+                                 "threshold", (gdouble) (threshold - 50) / 50.0 * 0.2 + 0.4,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Red Eye Removal"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_randomize_hurl_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble rndm_pct;
+  gdouble rndm_rcount;
+  gboolean randomize;
+  gint32 seed;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  rndm_pct = g_value_get_double (gimp_value_array_index (args, 3));
+  rndm_rcount = g_value_get_double (gimp_value_array_index (args, 4));
+  randomize = g_value_get_boolean (gimp_value_array_index (args, 5));
+  seed = g_value_get_int (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          if (randomize)
+            seed = (gint32) g_random_int ();
+
+          node =
+            gegl_node_new_child (NULL,
+                                 "operation",  "gegl:noise-hurl",
+                                 "seed",       seed,
+                                 "pct-random", rndm_pct,
+                                 "repeat",     (gint) rndm_rcount,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Random Hurl"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_randomize_pick_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble rndm_pct;
+  gdouble rndm_rcount;
+  gboolean randomize;
+  gint32 seed;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  rndm_pct = g_value_get_double (gimp_value_array_index (args, 3));
+  rndm_rcount = g_value_get_double (gimp_value_array_index (args, 4));
+  randomize = g_value_get_boolean (gimp_value_array_index (args, 5));
+  seed = g_value_get_int (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          if (randomize)
+            seed = (gint32) g_random_int ();
+
+          node =
+            gegl_node_new_child (NULL,
+                                 "operation",  "gegl:noise-pick",
+                                 "seed",       seed,
+                                 "pct-random", rndm_pct,
+                                 "repeat",     (gint) rndm_rcount,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Random Pick"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_randomize_slur_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble rndm_pct;
+  gdouble rndm_rcount;
+  gboolean randomize;
+  gint32 seed;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  rndm_pct = g_value_get_double (gimp_value_array_index (args, 3));
+  rndm_rcount = g_value_get_double (gimp_value_array_index (args, 4));
+  randomize = g_value_get_boolean (gimp_value_array_index (args, 5));
+  seed = g_value_get_int (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          if (randomize)
+            seed = (gint32) g_random_int ();
+
+          node =
+            gegl_node_new_child (NULL,
+                                 "operation",  "gegl:noise-slur",
+                                 "seed",       seed,
+                                 "pct-random", rndm_pct,
+                                 "repeat",     (gint) rndm_rcount,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Random Slur"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_rgb_noise_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean independent;
+  gboolean correlated;
+  gdouble noise_1;
+  gdouble noise_2;
+  gdouble noise_3;
+  gdouble noise_4;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  independent = g_value_get_boolean (gimp_value_array_index (args, 3));
+  correlated = g_value_get_boolean (gimp_value_array_index (args, 4));
+  noise_1 = g_value_get_double (gimp_value_array_index (args, 5));
+  noise_2 = g_value_get_double (gimp_value_array_index (args, 6));
+  noise_3 = g_value_get_double (gimp_value_array_index (args, 7));
+  noise_4 = g_value_get_double (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gdouble   r, g, b, a;
+
+          if (gimp_drawable_is_gray (drawable))
+            {
+              r = noise_1;
+              g = noise_1;
+              b = noise_1;
+              a = noise_2;
+            }
+          else
+            {
+              r = noise_1;
+              g = noise_2;
+              b = noise_3;
+              a = noise_4;
+            }
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:noise-rgb",
+                                      "correlated",  correlated,
+                                      "independent", independent,
+                                      "red",         r,
+                                      "green",       g,
+                                      "blue",        b,
+                                      "alpha",       a,
+                                      "seed",        g_random_int (),
+                                      NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "RGB Noise"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_ripple_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 period;
+  gint32 amplitude;
+  gint32 orientation;
+  gint32 edges;
+  gint32 waveform;
+  gboolean antialias;
+  gboolean tile;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  period = g_value_get_int (gimp_value_array_index (args, 3));
+  amplitude = g_value_get_int (gimp_value_array_index (args, 4));
+  orientation = g_value_get_int (gimp_value_array_index (args, 5));
+  edges = g_value_get_int (gimp_value_array_index (args, 6));
+  waveform = g_value_get_int (gimp_value_array_index (args, 7));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 8));
+  tile = g_value_get_boolean (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gdouble angle, phi;
+
+          angle = orientation ? 0.0 : 90.0;
+          phi = waveform ? 0.0 : 0.75;
+          if (orientation == 0 && waveform == 1)
+            phi = 0.5;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",    "gegl:ripple",
+                                      "amplitude",    (gdouble) amplitude,
+                                      "period",       (gdouble) period,
+                                      "phi",          phi,
+                                      "angle",        angle,
+                                      "sampler_type", antialias ? GEGL_SAMPLER_CUBIC : GEGL_SAMPLER_NEAREST,
+                                      "wave_type",    waveform ? 0 : 1,
+                                      "abyss_policy", edges == 0 ? GEGL_ABYSS_CLAMP :
+                                                      edges == 1 ? GEGL_ABYSS_LOOP :
+                                                      GEGL_ABYSS_NONE,
+                                      "tileable",     tile ? TRUE : FALSE,
+                                      NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Ripple"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_rotate_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  GimpDrawable *drawable;
+  gint32 angle;
+  gboolean everything;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  angle = g_value_get_int (gimp_value_array_index (args, 3));
+  everything = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpRotationType rotate_type = angle - 1;
+
+      if (everything)
+        {
+          gimp_image_rotate (image, context, rotate_type, progress);
+        }
+      else if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                          GIMP_PDB_ITEM_CONTENT, error))
+        {
+          GimpItem *item = GIMP_ITEM (drawable);
+          gint      off_x, off_y;
+          gdouble   center_x, center_y;
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+
+          center_x = ((gdouble) off_x + (gdouble) gimp_item_get_width  (item) / 2.0);
+          center_y = ((gdouble) off_y + (gdouble) gimp_item_get_height (item) / 2.0);
+
+          gimp_item_rotate (item, context, rotate_type, center_x, center_y,
+                            GIMP_IS_CHANNEL (drawable));
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_noisify_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean independent;
+  gdouble noise_1;
+  gdouble noise_2;
+  gdouble noise_3;
+  gdouble noise_4;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  independent = g_value_get_boolean (gimp_value_array_index (args, 3));
+  noise_1 = g_value_get_double (gimp_value_array_index (args, 4));
+  noise_2 = g_value_get_double (gimp_value_array_index (args, 5));
+  noise_3 = g_value_get_double (gimp_value_array_index (args, 6));
+  noise_4 = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gdouble   r, g, b, a;
+
+          if (gimp_drawable_is_gray (drawable))
+            {
+              r = noise_1;
+              g = noise_1;
+              b = noise_1;
+              a = noise_2;
+            }
+          else
+            {
+              r = noise_1;
+              g = noise_2;
+              b = noise_3;
+              a = noise_4;
+            }
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:noise-rgb",
+                                      "correlated",  FALSE,
+                                      "independent", independent,
+                                      "red",         r,
+                                      "green",       g,
+                                      "blue",        b,
+                                      "alpha",       a,
+                                      "seed",        g_random_int (),
+                                      NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Noisify"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_sel_gauss_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble radius;
+  gint32 max_delta;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  radius = g_value_get_double (gimp_value_array_index (args, 3));
+  max_delta = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",   "gegl:gaussian-blur-selective",
+                                      "blur-radius", radius,
+                                      "max-delta",   (gdouble) max_delta / 255.0,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Selective Gaussian Blur"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_semiflatten_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_drawable_has_alpha (drawable))
+        {
+          GeglNode *node;
+          GimpRGB   color;
+
+          gimp_context_get_background (context, &color);
+
+          node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:semi-flatten",
+                                 "color",     &color,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Semi-Flatten"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_shift_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 shift_amount;
+  gint32 orientation;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  shift_amount = g_value_get_int (gimp_value_array_index (args, 3));
+  orientation = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:shift",
+                                 "shift",     shift_amount / 2,
+                                 "direction", orientation ? 0 : 1,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Shift"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_sinus_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble xscale;
+  gdouble yscale;
+  gdouble complex;
+  gint32 seed;
+  gboolean tiling;
+  gboolean perturb;
+  gint32 colors;
+  GimpRGB col1;
+  GimpRGB col2;
+  gdouble alpha1;
+  gdouble alpha2;
+  gint32 blend;
+  gdouble blend_power;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  xscale = g_value_get_double (gimp_value_array_index (args, 3));
+  yscale = g_value_get_double (gimp_value_array_index (args, 4));
+  complex = g_value_get_double (gimp_value_array_index (args, 5));
+  seed = g_value_get_int (gimp_value_array_index (args, 6));
+  tiling = g_value_get_boolean (gimp_value_array_index (args, 7));
+  perturb = g_value_get_boolean (gimp_value_array_index (args, 8));
+  colors = g_value_get_int (gimp_value_array_index (args, 9));
+  gimp_value_get_rgb (gimp_value_array_index (args, 10), &col1);
+  gimp_value_get_rgb (gimp_value_array_index (args, 11), &col2);
+  alpha1 = g_value_get_double (gimp_value_array_index (args, 12));
+  alpha2 = g_value_get_double (gimp_value_array_index (args, 13));
+  blend = g_value_get_int (gimp_value_array_index (args, 14));
+  blend_power = g_value_get_double (gimp_value_array_index (args, 15));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+          GeglColor *gegl_color1;
+          GeglColor *gegl_color2;
+          gint      x, y, width, height;
+
+          switch (colors)
+            {
+            case 0:
+              gimp_rgb_set (&col1, 0.0, 0.0, 0.0);
+              gimp_rgb_set (&col2, 1.0, 1.0, 1.0);
+              break;
+
+            case 1:
+              gimp_context_get_foreground (context, &col1);
+              gimp_context_get_background (context, &col2);
+              break;
+            }
+
+          gimp_rgb_set_alpha (&col1, alpha1);
+          gimp_rgb_set_alpha (&col2, alpha2);
+
+          gegl_color1 = gimp_gegl_color_new (&col1);
+          gegl_color2 = gimp_gegl_color_new (&col2);
+
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation",    "gegl:sinus",
+                                      "x_scale",      xscale,
+                                      "y-scale",      yscale,
+                                      "complexity",   complex,
+                                      "seed",         seed,
+                                      "tiling",       tiling,
+                                      "perturbation", perturb,
+                                      "color1",       gegl_color1,
+                                      "color2",       gegl_color2,
+                                      "blend-mode",   blend,
+                                      "blend-power",  blend_power,
+                                      "width",        width,
+                                      "height",       height,
+                                      NULL);
+
+          g_object_unref (gegl_color1);
+          g_object_unref (gegl_color2);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Sinus"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_sobel_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean horizontal;
+  gboolean vertical;
+  gboolean keep_sign;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  horizontal = g_value_get_boolean (gimp_value_array_index (args, 3));
+  vertical = g_value_get_boolean (gimp_value_array_index (args, 4));
+  keep_sign = g_value_get_boolean (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation",  "gegl:edge-sobel",
+                                 "horizontal", horizontal,
+                                 "vertical",   vertical,
+                                 "keep-sign",  keep_sign,
+                                 NULL);
+
+          node = wrap_in_gamma_cast (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Sobel"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_solid_noise_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gboolean tileable;
+  gboolean turbulent;
+  gint32 seed;
+  gint32 detail;
+  gdouble xsize;
+  gdouble ysize;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  tileable = g_value_get_boolean (gimp_value_array_index (args, 3));
+  turbulent = g_value_get_boolean (gimp_value_array_index (args, 4));
+  seed = g_value_get_int (gimp_value_array_index (args, 5));
+  detail = g_value_get_int (gimp_value_array_index (args, 6));
+  xsize = g_value_get_double (gimp_value_array_index (args, 7));
+  ysize = g_value_get_double (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gint      x, y, width, height;
+
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
+
+          node = gegl_node_new_child (NULL,
+                                      "operation", "gegl:noise-solid",
+                                      "x-size",    xsize,
+                                      "y-size",    ysize,
+                                      "detail",    detail,
+                                      "tileable",  tileable,
+                                      "turbulent", turbulent,
+                                      "seed",      seed,
+                                      "width",     width,
+                                      "height",    height,
+                                      NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Solid Noise"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_spread_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble spread_amount_x;
+  gdouble spread_amount_y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  spread_amount_x = g_value_get_double (gimp_value_array_index (args, 3));
+  spread_amount_y = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:noise-spread",
+                                 "amount-x",  (gint) spread_amount_x,
+                                 "amount-y",  (gint) spread_amount_y,
+                                 "seed",      g_random_int (),
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Spread"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_threshold_alpha_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 threshold;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  threshold = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
+          gimp_drawable_has_alpha (drawable))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gimp:threshold-alpha",
+                                 "value",     threshold / 255.0,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Threshold Alpha"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_unsharp_mask_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble radius;
+  gdouble amount;
+  gint32 threshold;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  radius = g_value_get_double (gimp_value_array_index (args, 3));
+  amount = g_value_get_double (gimp_value_array_index (args, 4));
+  threshold = g_value_get_int (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:unsharp-mask",
+                                 "std-dev",   radius,
+                                 "scale",     amount,
+                                 "threshold", threshold / 255.0,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Sharpen (Unsharp Mask)"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_video_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 pattern_number;
+  gboolean additive;
+  gboolean rotated;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  pattern_number = g_value_get_int (gimp_value_array_index (args, 3));
+  additive = g_value_get_boolean (gimp_value_array_index (args, 4));
+  rotated = g_value_get_boolean (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:video-degradation",
+                                 "pattern",   pattern_number,
+                                 "additive",  additive,
+                                 "rotated",   rotated,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Video"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_vinvert_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:value-invert",
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Value Invert"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_vpropagate_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 propagate_mode;
+  gint32 propagating_channel;
+  gdouble propagating_rate;
+  gint32 direction_mask;
+  gint32 lower_limit;
+  gint32 upper_limit;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  propagate_mode = g_value_get_int (gimp_value_array_index (args, 3));
+  propagating_channel = g_value_get_int (gimp_value_array_index (args, 4));
+  propagating_rate = g_value_get_double (gimp_value_array_index (args, 5));
+  direction_mask = g_value_get_int (gimp_value_array_index (args, 6));
+  lower_limit = g_value_get_int (gimp_value_array_index (args, 7));
+  upper_limit = g_value_get_int (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode  *node;
+          GimpRGB    color;
+          GeglColor *gegl_color = NULL;
+          gint       gegl_mode  = 0;
+          gboolean   to_left    = (direction_mask & (0x1 << 0)) != 0;
+          gboolean   to_top     = (direction_mask & (0x1 << 1)) != 0;
+          gboolean   to_right   = (direction_mask & (0x1 << 2)) != 0;
+          gboolean   to_bottom  = (direction_mask & (0x1 << 3)) != 0;
+          gboolean   value      = (propagating_channel & (0x1 << 0)) != 0;
+          gboolean   alpha      = (propagating_channel & (0x1 << 1)) != 0;
+
+          switch (propagate_mode)
+            {
+            case 0:
+            case 1:
+            case 2:
+              gegl_mode = propagate_mode;
+              break;
+
+            case 3:
+            case 4:
+            case 5:
+              if (propagate_mode == 3 || propagate_mode == 4)
+                {
+                  gegl_mode = propagate_mode;
+
+                  gimp_context_get_foreground (context, &color);
+                }
+              else
+                {
+                  gegl_mode = 4;
+
+                  gimp_context_get_background (context, &color);
+                }
+
+              gegl_color = gimp_gegl_color_new (&color);
+              break;
+
+            case 6:
+            case 7:
+              gegl_mode = propagate_mode - 1;
+              break;
+            }
+
+          node =
+            gegl_node_new_child (NULL,
+                                 "operation",        "gegl:value-propagate",
+                                 "mode",             gegl_mode,
+                                 "lower-threshold",  (gdouble) lower_limit / 255.0,
+                                 "upper-threshold",  (gdouble) upper_limit / 255.0,
+                                 "rate",             propagating_rate,
+                                 "color",            gegl_color,
+                                 "top",              to_top,
+                                 "left",             to_left,
+                                 "right",            to_right,
+                                 "bottom",           to_bottom,
+                                 "value",            value,
+                                 "alpha",            alpha,
+                                 NULL);
+
+          if (gegl_color)
+            g_object_unref (gegl_color);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Value Propagate"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_dilate_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation",       "gegl:value-propagate",
+                                 "mode",            0, /* GEGL_VALUE_PROPAGATE_MODE_WHITE */
+                                 "lower-threshold", 0.0,
+                                 "upper-threshold", 1.0,
+                                 "rate",            1.0,
+                                 "top",             TRUE,
+                                 "left",            TRUE,
+                                 "right",           TRUE,
+                                 "bottom",          TRUE,
+                                 "value",           TRUE,
+                                 "alpha",           FALSE,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Dilate"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_erode_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation",       "gegl:value-propagate",
+                                 "mode",            1, /* GEGL_VALUE_PROPAGATE_MODE_BLACK */
+                                 "lower-threshold", 0.0,
+                                 "upper-threshold", 1.0,
+                                 "rate",            1.0,
+                                 "top",             TRUE,
+                                 "left",            TRUE,
+                                 "right",           TRUE,
+                                 "bottom",          TRUE,
+                                 "value",           TRUE,
+                                 "alpha",           FALSE,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Erode"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_waves_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble amplitude;
+  gdouble phase;
+  gdouble wavelength;
+  gboolean type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  amplitude = g_value_get_double (gimp_value_array_index (args, 3));
+  phase = g_value_get_double (gimp_value_array_index (args, 4));
+  wavelength = g_value_get_double (gimp_value_array_index (args, 5));
+  type = g_value_get_boolean (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node;
+          gdouble   width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+          gdouble   height = gimp_item_get_height (GIMP_ITEM (drawable));
+          gdouble   aspect;
+
+          while (phase < 0)
+            phase += 360.0;
+
+          phase = fmod (phase, 360.0);
+
+          aspect = CLAMP (width / height, 0.1, 10.0);
+
+          node = gegl_node_new_child (NULL,
+                                     "operation", "gegl:waves",
+                                     "x",         0.5,
+                                     "y",         0.5,
+                                     "amplitude", amplitude,
+                                     "phi",       (phase - 180.0) / 180.0,
+                                     "period",    wavelength * 2.0,
+                                     "aspect",    aspect,
+                                     "clamp",     ! type,
+                                     NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Waves"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_whirl_pinch_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble whirl;
+  gdouble pinch;
+  gdouble radius;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  whirl = g_value_get_double (gimp_value_array_index (args, 3));
+  pinch = g_value_get_double (gimp_value_array_index (args, 4));
+  radius = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:whirl-pinch",
+                                 "whirl",     whirl,
+                                 "pinch",     pinch,
+                                 "radius",    radius,
+                                 NULL);
+
+          node = wrap_in_selection_bounds (node, drawable);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Whirl and Pinch"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+plug_in_wind_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gint32 threshold;
+  gint32 direction;
+  gint32 strength;
+  gint32 algorithm;
+  gint32 edge;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+  threshold = g_value_get_int (gimp_value_array_index (args, 3));
+  direction = g_value_get_int (gimp_value_array_index (args, 4));
+  strength = g_value_get_int (gimp_value_array_index (args, 5));
+  algorithm = g_value_get_int (gimp_value_array_index (args, 6));
+  edge = g_value_get_int (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GeglNode *node =
+            gegl_node_new_child (NULL,
+                                 "operation", "gegl:wind",
+                                 "threshold", threshold,
+                                 "direction", direction,
+                                 "strength",  strength,
+                                 "style",     algorithm,
+                                 "edge",      edge,
+                                 NULL);
+
+          gimp_drawable_apply_operation (drawable, progress,
+                                         C_("undo-type", "Wind"),
+                                         node);
+          g_object_unref (node);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_plug_in_compat_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-plug-in-alienmap2
+   */
+  procedure = gimp_procedure_new (plug_in_alienmap2_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-alienmap2");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-alienmap2",
+                                     "Alter colors in various psychedelic ways",
+                                     "No help yet. Just try it and you'll see!",
+                                     "Compatibility procedure. Please see 'gegl:alien-map' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:alien-map' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("redfrequency",
+                                                    "redfrequency",
+                                                    "Red/hue component frequency factor",
+                                                    0, 20, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("redangle",
+                                                    "redangle",
+                                                    "Red/hue component angle factor (0-360)",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("greenfrequency",
+                                                    "greenfrequency",
+                                                    "Green/saturation component frequency factor",
+                                                    0, 20, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("greenangle",
+                                                    "greenangle",
+                                                    "Green/saturation component angle factor (0-360)",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("bluefrequency",
+                                                    "bluefrequency",
+                                                    "Blue/luminance component frequency factor",
+                                                    0, 20, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("blueangle",
+                                                    "blueangle",
+                                                    "Blue/luminance component angle factor (0-360)",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("colormodel",
+                                                     "colormodel",
+                                                     "Color model { RGB-MODEL (0), HSL-MODEL (1) }",
+                                                     0, 1, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("redmode",
+                                                     "redmode",
+                                                     "Red/hue application mode { TRUE, FALSE }",
+                                                     0, 1, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("greenmode",
+                                                     "greenmode",
+                                                     "Green/saturation application mode { TRUE, FALSE }",
+                                                     0, 1, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("bluemode",
+                                                     "bluemode",
+                                                     "Blue/luminance application mode { TRUE, FALSE }",
+                                                     0, 1, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-antialias
+   */
+  procedure = gimp_procedure_new (plug_in_antialias_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-antialias");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-antialias",
+                                     "Antialias using the Scale3X edge-extrapolation algorithm",
+                                     "No more help.",
+                                     "Compatibility procedure. Please see 'gegl:antialias' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:antialias' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-apply-canvas
+   */
+  procedure = gimp_procedure_new (plug_in_apply_canvas_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-apply-canvas");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-apply-canvas",
+                                     "Add a canvas texture to the image",
+                                     "This function applies a canvas texture map to the drawable.",
+                                     "Compatibility procedure. Please see 'gegl:texturize-canvas' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:texturize-canvas' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("direction",
+                                                      "direction",
+                                                      "Light direction (0 - 3)",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("depth",
+                                                      "depth",
+                                                      "Texture depth (1 - 50)",
+                                                      1, 50, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-applylens
+   */
+  procedure = gimp_procedure_new (plug_in_applylens_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-applylens");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-applylens",
+                                     "Simulate an elliptical lens over the image",
+                                     "This plug-in uses Snell's law to draw an ellipsoid lens over the image.",
+                                     "Compatibility procedure. Please see 'gegl:apply-lens' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:apply-lens' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("refraction",
+                                                    "refraction",
+                                                    "Lens refraction index",
+                                                    1.0, 100.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("keep-surroundings",
+                                                     "keep surroundings",
+                                                     "Keep lens surroundings",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("set-background",
+                                                     "set background",
+                                                     "Set lens surroundings to BG value",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("set-transparent",
+                                                     "set transparent",
+                                                     "Set lens surroundings transparent",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-autocrop
+   */
+  procedure = gimp_procedure_new (plug_in_autocrop_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-autocrop");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-autocrop",
+                                     "Remove empty borders from the image",
+                                     "Remove empty borders from the image.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-autocrop-layer
+   */
+  procedure = gimp_procedure_new (plug_in_autocrop_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-autocrop-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-autocrop-layer",
+                                     "Crop the active layer based on empty borders of the input drawable",
+                                     "Crop the active layer of the input \"image\" based on empty borders of the input \"drawable\". \n\nThe input drawable serves as a base for detecting cropping extents (transparency or background color), and is not necessarily the cropped layer (the current active layer).",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-autostretch-hsv
+   */
+  procedure = gimp_procedure_new (plug_in_autostretch_hsv_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-autostretch-hsv");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-autostretch-hsv",
+                                     "Stretch contrast to cover the maximum possible range",
+                                     "This simple plug-in does an automatic contrast stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full contrast range. For some images it may do just what you want; for others it may be total crap :). This version differs from Contrast Autostretch in that it works in HSV space, and preserves hue.",
+                                     "Compatibility procedure. Please see 'gegl:stretch-contrast-hsv' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:stretch-contrast-hsv' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-bump-map
+   */
+  procedure = gimp_procedure_new (plug_in_bump_map_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-bump-map");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-bump-map",
+                                     "Create an embossing effect using a bump map",
+                                     "This plug-in uses the algorithm described by John Schlag, \"Fast Embossing Effects on Raster Image Data\" in Graphics GEMS IV (ISBN 0-12-336155-9). It takes a drawable to be applied as a bump map to another image and produces a nice embossing effect.",
+                                     "Compatibility procedure. Please see 'gegl:bump-map' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:bump-map' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("bumpmap",
+                                                            "bumpmap",
+                                                            "Bump map drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("azimuth",
+                                                    "azimuth",
+                                                    "Azimuth",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("elevation",
+                                                    "elevation",
+                                                    "Elevation",
+                                                    0.5, 90.0, 0.5,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("depth",
+                                                      "depth",
+                                                      "Depth",
+                                                      1, 65, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("xofs",
+                                                      "xofs",
+                                                      "X offset",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("yofs",
+                                                      "yofs",
+                                                      "Y offset",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("waterlevel",
+                                                    "waterlevel",
+                                                    "Level that full transparency should represent",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("ambient",
+                                                    "ambient",
+                                                    "Ambient lighting factor",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("compensate",
+                                                     "compensate",
+                                                     "Compensate for darkening",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("invert",
+                                                     "invert",
+                                                     "Invert bumpmap",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("type",
+                                                      "type",
+                                                      "Type of map { LINEAR (0), SPHERICAL (1), SINUSOIDAL (2) }",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-bump-map-tiled
+   */
+  procedure = gimp_procedure_new (plug_in_bump_map_tiled_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-bump-map-tiled");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-bump-map-tiled",
+                                     "Create an embossing effect using a tiled image as a bump map",
+                                     "This plug-in uses the algorithm described by John Schlag, \"Fast Embossing Effects on Raster Image Data\" in Graphics GEMS IV (ISBN 0-12-336155-9). It takes a drawable to be tiled and applied as a bump map to another image and produces a nice embossing effect.",
+                                     "Compatibility procedure. Please see 'gegl:bump-map' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:bump-map' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("bumpmap",
+                                                            "bumpmap",
+                                                            "Bump map drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("azimuth",
+                                                    "azimuth",
+                                                    "Azimuth",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("elevation",
+                                                    "elevation",
+                                                    "Elevation",
+                                                    0.5, 90.0, 0.5,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("depth",
+                                                      "depth",
+                                                      "Depth",
+                                                      1, 65, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("xofs",
+                                                      "xofs",
+                                                      "X offset",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("yofs",
+                                                      "yofs",
+                                                      "Y offset",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("waterlevel",
+                                                    "waterlevel",
+                                                    "Level that full transparency should represent",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("ambient",
+                                                    "ambient",
+                                                    "Ambient lighting factor",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("compensate",
+                                                     "compensate",
+                                                     "Compensate for darkening",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("invert",
+                                                     "invert",
+                                                     "Invert bumpmap",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("type",
+                                                      "type",
+                                                      "Type of map { LINEAR (0), SPHERICAL (1), SINUSOIDAL (2) }",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-c-astretch
+   */
+  procedure = gimp_procedure_new (plug_in_c_astretch_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-c-astretch");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-c-astretch",
+                                     "Stretch contrast to cover the maximum possible range",
+                                     "This simple plug-in does an automatic contrast stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full contrast range. For some images it may do just what you want; for others it may not work that well.",
+                                     "Compatibility procedure. Please see 'gegl:stretch-contrast' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:stretch-contrast' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-colors-channel-mixer
+   */
+  procedure = gimp_procedure_new (plug_in_colors_channel_mixer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-colors-channel-mixer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-colors-channel-mixer",
+                                     "Alter colors by mixing RGB Channels",
+                                     "This plug-in mixes the RGB channels.",
+                                     "Compatibility procedure. Please see 'gegl:channel-mixer' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:channel-mixer' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("monochrome",
+                                                      "monochrome",
+                                                      "Monochrome { TRUE, FALSE }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rr-gain",
+                                                    "rr gain",
+                                                    "Set the red gain for the red channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rg-gain",
+                                                    "rg gain",
+                                                    "Set the green gain for the red channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rb-gain",
+                                                    "rb gain",
+                                                    "Set the blue gain for the red channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gr-gain",
+                                                    "gr gain",
+                                                    "Set the red gain for the green channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gg-gain",
+                                                    "gg gain",
+                                                    "Set the green gain for the green channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gb-gain",
+                                                    "gb gain",
+                                                    "Set the blue gain for the green channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("br-gain",
+                                                    "br gain",
+                                                    "Set the red gain for the blue channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("bg-gain",
+                                                    "bg gain",
+                                                    "Set the green gain for the blue channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("bb-gain",
+                                                    "bb gain",
+                                                    "Set the blue gain for the blue channel",
+                                                    -2, 2, -2,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-colortoalpha
+   */
+  procedure = gimp_procedure_new (plug_in_colortoalpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-colortoalpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-colortoalpha",
+                                     "Convert a specified color to transparency",
+                                     "This replaces as much of a given color as possible in each pixel with a corresponding amount of alpha, then readjusts the color accordingly.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "Color to remove",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-convmatrix
+   */
+  procedure = gimp_procedure_new (plug_in_convmatrix_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-convmatrix");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-convmatrix",
+                                     "Apply a generic 5x5 convolution matrix",
+                                     "Apply a generic 5x5 convolution matrix.",
+                                     "Compatibility procedure. Please see 'gegl:convolution-matrix' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:convolution-matrix' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("argc-matrix",
+                                                      "argc matrix",
+                                                      "The number of elements in the following array, must always be 25",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("matrix",
+                                                            "matrix",
+                                                            "The 5x5 convolution matrix",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("alpha-alg",
+                                                     "alpha alg",
+                                                     "Enable weighting by alpha channel",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("divisor",
+                                                    "divisor",
+                                                    "Divisor",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("offset",
+                                                    "offset",
+                                                    "Offset",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("argc-channels",
+                                                      "argc channels",
+                                                      "The number of elements in following array, must always be 5",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32_array ("channels",
+                                                            "channels",
+                                                            "Mask of the channels to be filtered",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("bmode",
+                                                      "bmode",
+                                                      "Mode for treating image borders { EXTEND (0), WRAP (1), CLEAR (2) }",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-cubism
+   */
+  procedure = gimp_procedure_new (plug_in_cubism_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-cubism");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-cubism",
+                                     "Convert the image into randomly rotated square blobs",
+                                     "Convert the image into randomly rotated square blobs.",
+                                     "Compatibility procedure. Please see 'gegl:cubism' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:cubism' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tile-size",
+                                                    "tile size",
+                                                    "Average diameter of each tile (in pixels)",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tile-saturation",
+                                                    "tile saturation",
+                                                    "Expand tiles by this amount",
+                                                    0.0, 10.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("bg-color",
+                                                      "bg color",
+                                                      "Background color { BLACK (0), BG (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-deinterlace
+   */
+  procedure = gimp_procedure_new (plug_in_deinterlace_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-deinterlace");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-deinterlace",
+                                     "Fix images where every other row is missing",
+                                     "Deinterlace is useful for processing images from video capture cards. When only the odd or even fields get captured, deinterlace can be used to interpolate between the existing fields to correct this.",
+                                     "Compatibility procedure. Please see 'gegl:deinterlace' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:deinterlace' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("evenodd",
+                                                      "evenodd",
+                                                      "Which lines to keep { KEEP-ODD (0), KEEP-EVEN (1)",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-diffraction
+   */
+  procedure = gimp_procedure_new (plug_in_diffraction_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-diffraction");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-diffraction",
+                                     "Generate diffraction patterns",
+                                     "Help? What help?",
+                                     "Compatibility procedure. Please see 'gegl:diffraction-patterns' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:diffraction-patterns' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lam-r",
+                                                    "lam r",
+                                                    "Light frequency (red)",
+                                                    0.0, 20.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lam-g",
+                                                    "lam g",
+                                                    "Light frequency (green)",
+                                                    0.0, 20.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("lam-b",
+                                                    "lam b",
+                                                    "Light frequency (blue)",
+                                                    0.0, 20.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("contour-r",
+                                                    "contour r",
+                                                    "Number of contours (red)",
+                                                    0.0, 10.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("contour-g",
+                                                    "contour g",
+                                                    "Number of contours (green)",
+                                                    0.0, 10.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("contour-b",
+                                                    "contour b",
+                                                    "Number of contours (blue)",
+                                                    0.0, 10.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("edges-r",
+                                                    "edges r",
+                                                    "Number of sharp edges (red)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("edges-g",
+                                                    "edges g",
+                                                    "Number of sharp edges (green)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("edges-b",
+                                                    "edges b",
+                                                    "Number of sharp edges (blue)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("brightness",
+                                                    "brightness",
+                                                    "Brightness and shifting/fattening of contours",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scattering",
+                                                    "scattering",
+                                                    "Scattering (Speed vs. quality)",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("polarization",
+                                                    "polarization",
+                                                    "Polarization",
+                                                    -1.0, 1.0, -1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-displace
+   */
+  procedure = gimp_procedure_new (plug_in_displace_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-displace");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-displace",
+                                     "Displace pixels as indicated by displacement maps",
+                                     "Displaces the contents of the specified drawable by the amounts specified by 'amount-x' and 'amount-y' multiplied by the luminance of corresponding pixels in the 'displace-map' drawables.",
+                                     "Compatibility procedure. Please see 'gegl:displace' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:displace' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount-x",
+                                                    "amount x",
+                                                    "Displace multiplier for x direction",
+                                                    -500.0, 500.0, -500.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount-y",
+                                                    "amount y",
+                                                    "Displace multiplier for y direction",
+                                                    -500.0, 500.0, -500.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("do-x",
+                                                     "do x",
+                                                     "Displace in x direction ?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("do-y",
+                                                     "do y",
+                                                     "Displace in y direction ?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("displace-map-x",
+                                                            "displace map x",
+                                                            "Displacement map for x direction",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("displace-map-y",
+                                                            "displace map y",
+                                                            "Displacement map for y direction",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("displace-type",
+                                                      "displace type",
+                                                      "Edge behavior { WRAP (1), SMEAR (2), BLACK (3) }",
+                                                      1, 3, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-displace-polar
+   */
+  procedure = gimp_procedure_new (plug_in_displace_polar_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-displace-polar");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-displace-polar",
+                                     "Displace pixels as indicated by displacement maps",
+                                     "Just like plug-in-displace but working in polar coordinates. The drawable is whirled and pinched according to the map.",
+                                     "Compatibility procedure. Please see 'gegl:displace' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:displace' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount-x",
+                                                    "amount x",
+                                                    "Displace multiplier for radial direction",
+                                                    -500.0, 500.0, -500.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount-y",
+                                                    "amount y",
+                                                    "Displace multiplier for tangent direction",
+                                                    -500.0, 500.0, -500.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("do-x",
+                                                     "do x",
+                                                     "Displace in radial direction ?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("do-y",
+                                                     "do y",
+                                                     "Displace in tangent direction ?",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("displace-map-x",
+                                                            "displace map x",
+                                                            "Displacement map for radial direction",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("displace-map-y",
+                                                            "displace map y",
+                                                            "Displacement map for tangent direction",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("displace-type",
+                                                      "displace type",
+                                                      "Edge behavior { WRAP (1), SMEAR (2), BLACK (3) }",
+                                                      1, 3, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-edge
+   */
+  procedure = gimp_procedure_new (plug_in_edge_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-edge");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-edge",
+                                     "Several simple methods for detecting edges",
+                                     "Perform edge detection on the contents of the specified drawable. AMOUNT is an arbitrary constant, WRAPMODE is like displace plug-in (useful for tileable image). EDGEMODE sets the kind of matrix transform applied to the pixels, SOBEL was the method used in older versions.",
+                                     "Compatibility procedure. Please see 'gegl:edge' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:edge' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount",
+                                                    "amount",
+                                                    "Edge detection amount",
+                                                    1.0, 10.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("warpmode",
+                                                      "warpmode",
+                                                      "Edge detection behavior { NONE (0), WRAP (1), SMEAR (2), BLACK (3) }",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("edgemode",
+                                                      "edgemode",
+                                                      "Edge detection algorithm { SOBEL (0), PREWITT (1), GRADIENT (2), ROBERTS (3), DIFFERENTIAL (4), LAPLACE (5) }",
+                                                      0, 5, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-engrave
+   */
+  procedure = gimp_procedure_new (plug_in_engrave_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-engrave");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-engrave",
+                                     "Simulate an antique engraving",
+                                     "Creates a black-and-white 'engraved' version of an image as seen in old illustrations.",
+                                     "Compatibility procedure. Please see 'gegl:engrave' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:engrave' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("height",
+                                                      "height",
+                                                      "Resolution in pixels",
+                                                      2, 16, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("limit",
+                                                     "limit",
+                                                     "Limit line width",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-exchange
+   */
+  procedure = gimp_procedure_new (plug_in_exchange_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-exchange");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-exchange",
+                                     "Swap one color with another",
+                                     "Exchange one color with another, optionally setting a threshold to convert from one shade to another.",
+                                     "Compatibility procedure. Please see 'gegl:color-exchange' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:color-exchange' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("from-red",
+                                                     "from red",
+                                                     "Red value (from)",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("from-green",
+                                                     "from green",
+                                                     "Green value (from)",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("from-blue",
+                                                     "from blue",
+                                                     "Blue value (from)",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("to-red",
+                                                     "to red",
+                                                     "Red value (to)",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("to-green",
+                                                     "to green",
+                                                     "Green value (to)",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("to-blue",
+                                                     "to blue",
+                                                     "Blue value (to)",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("red-threshold",
+                                                     "red threshold",
+                                                     "Red threshold",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("green-threshold",
+                                                     "green threshold",
+                                                     "Green threshold",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("blue-threshold",
+                                                     "blue threshold",
+                                                     "Blue threshold",
+                                                     0, G_MAXUINT8, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-flarefx
+   */
+  procedure = gimp_procedure_new (plug_in_flarefx_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-flarefx");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-flarefx",
+                                     "Add a lens flare effect",
+                                     "Adds a lens flare effects. Makes your image look like it was snapped with a cheap camera with a lot of lens :)",
+                                     "Compatibility procedure. Please see 'gegl:lens-flare' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:lens-flare' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("pos-x",
+                                                      "pos x",
+                                                      "X-Position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("pos-y",
+                                                      "pos y",
+                                                      "Y-Position",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-gauss
+   */
+  procedure = gimp_procedure_new (plug_in_gauss_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-gauss");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-gauss",
+                                     "Simplest, most commonly used way of blurring",
+                                     "Applies a gaussian blur to the drawable, with specified radius of affect. The standard deviation of the normal distribution used to modify pixel values is calculated based on the supplied radius. Horizontal and vertical blurring can be independently invoked by specifying only one to run. The 'method' parameter is ignored.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("horizontal",
+                                                    "horizontal",
+                                                    "Horizontal radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("vertical",
+                                                    "vertical",
+                                                    "Vertical radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("method",
+                                                      "method",
+                                                      "Blur method { IIR (0), RLE (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-gauss-iir
+   */
+  procedure = gimp_procedure_new (plug_in_gauss_iir_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-gauss-iir");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-gauss-iir",
+                                     "Apply a gaussian blur",
+                                     "Applies a gaussian blur to the drawable, with specified radius of affect. The standard deviation of the normal distribution used to modify pixel values is calculated based on the supplied radius. Horizontal and vertical blurring can be independently invoked by specifying only one to run.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("horizontal",
+                                                     "horizontal",
+                                                     "Blur in horizontal direction",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("vertical",
+                                                     "vertical",
+                                                     "Blur in vertical direction",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-gauss-iir2
+   */
+  procedure = gimp_procedure_new (plug_in_gauss_iir2_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-gauss-iir2");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-gauss-iir2",
+                                     "Apply a gaussian blur",
+                                     "Applies a gaussian blur to the drawable, with specified radius of affect. The standard deviation of the normal distribution used to modify pixel values is calculated based on the supplied radius. Horizontal and vertical blurring can be independently invoked by specifying only one to run.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("horizontal",
+                                                    "horizontal",
+                                                    "Horizontal radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("vertical",
+                                                    "vertical",
+                                                    "Vertical radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-gauss-rle
+   */
+  procedure = gimp_procedure_new (plug_in_gauss_rle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-gauss-rle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-gauss-rle",
+                                     "Apply a gaussian blur",
+                                     "Applies a gaussian blur to the drawable, with specified radius of affect. The standard deviation of the normal distribution used to modify pixel values is calculated based on the supplied radius. Horizontal and vertical blurring can be independently invoked by specifying only one to run.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("horizontal",
+                                                     "horizontal",
+                                                     "Blur in horizontal direction",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("vertical",
+                                                     "vertical",
+                                                     "Blur in vertical direction",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-gauss-rle2
+   */
+  procedure = gimp_procedure_new (plug_in_gauss_rle2_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-gauss-rle2");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-gauss-rle2",
+                                     "Apply a gaussian blur",
+                                     "Applies a gaussian blur to the drawable, with specified radius of affect. The standard deviation of the normal distribution used to modify pixel values is calculated based on the supplied radius. Horizontal and vertical blurring can be independently invoked by specifying only one to run.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("horizontal",
+                                                    "horizontal",
+                                                    "Horizontal radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("vertical",
+                                                    "vertical",
+                                                    "Vertical radius of gaussian blur (in pixels",
+                                                    0.0, 500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-glasstile
+   */
+  procedure = gimp_procedure_new (plug_in_glasstile_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-glasstile");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-glasstile",
+                                     "Simulate distortion caused by square glass tiles",
+                                     "Divide the image into square glassblocks in which the image is refracted.",
+                                     "Compatibility procedure. Please see 'gegl:tile-glass' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:tile-glass' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tilex",
+                                                      "tilex",
+                                                      "Tile width",
+                                                      10, 500, 10,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tiley",
+                                                      "tiley",
+                                                      "Tile height",
+                                                      10, 500, 10,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-hsv-noise
+   */
+  procedure = gimp_procedure_new (plug_in_hsv_noise_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-hsv-noise");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-hsv-noise",
+                                     "Randomize hue, saturation and value independently",
+                                     "Scattering pixel values in HSV space",
+                                     "Compatibility procedure. Please see 'gegl:noise-hsv' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-hsv' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("holdness",
+                                                      "holdness",
+                                                      "Convolution strength",
+                                                      1, 8, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("hue-distance",
+                                                      "hue distance",
+                                                      "Scattering of hue angle",
+                                                      0, 180, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("saturation-distance",
+                                                      "saturation distance",
+                                                      "Distribution distance on saturation axis",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("value-distance",
+                                                      "value distance",
+                                                      "Distribution distance on value axis",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-icc-profile-info
+   */
+  procedure = gimp_procedure_new (plug_in_icc_profile_info_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-icc-profile-info");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-icc-profile-info",
+                                     "Retrieve information about an image's color profile",
+                                     "This procedure returns information about the RGB color profile attached to an image. If no RGB color profile is attached, sRGB is assumed.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("profile-name",
+                                                           "profile name",
+                                                           "Name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("profile-desc",
+                                                           "profile desc",
+                                                           "Description",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("profile-info",
+                                                           "profile info",
+                                                           "Info",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-icc-profile-file-info
+   */
+  procedure = gimp_procedure_new (plug_in_icc_profile_file_info_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-icc-profile-file-info");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-icc-profile-file-info",
+                                     "Retrieve information about a color profile",
+                                     "This procedure returns information about an ICC color profile on disk.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("profile",
+                                                       "profile",
+                                                       "Filename of an ICC color profile",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("profile-name",
+                                                           "profile name",
+                                                           "Name",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("profile-desc",
+                                                           "profile desc",
+                                                           "Description",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("profile-info",
+                                                           "profile info",
+                                                           "Info",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-icc-profile-apply
+   */
+  procedure = gimp_procedure_new (plug_in_icc_profile_apply_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-icc-profile-apply");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-icc-profile-apply",
+                                     "Apply a color profile on the image",
+                                     "This procedure transform from the image's color profile (or the default RGB profile if none is set) to the given ICC color profile. Only RGB color profiles are accepted. The profile is then set on the image using the 'icc-profile' \"parasite.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("profile",
+                                                       "profile",
+                                                       "Filename of an ICC color profile",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("intent",
+                                                  "intent",
+                                                  "Rendering intent",
+                                                  GIMP_TYPE_COLOR_RENDERING_INTENT,
+                                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("bpc",
+                                                     "bpc",
+                                                     "Black point compensation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-icc-profile-apply-rgb
+   */
+  procedure = gimp_procedure_new (plug_in_icc_profile_apply_rgb_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-icc-profile-apply-rgb");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-icc-profile-apply-rgb",
+                                     "Apply default RGB color profile on the image",
+                                     "This procedure transform from the image's color profile (or the default RGB profile if none is set) to the configured default RGB color profile. The profile is then set on the image using the 'icc-profile' parasite. If no RGB color profile is configured, sRGB is assumed and the parasite is unset.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("intent",
+                                                  "intent",
+                                                  "Rendering intent",
+                                                  GIMP_TYPE_COLOR_RENDERING_INTENT,
+                                                  GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("bpc",
+                                                     "bpc",
+                                                     "Black point compensation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-icc-profile-set
+   */
+  procedure = gimp_procedure_new (plug_in_icc_profile_set_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-icc-profile-set");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-icc-profile-set",
+                                     "Set a color profile on the image",
+                                     "This procedure sets the user-configured RGB profile on an image using the 'icc-profile' parasite. This procedure does not do any color conversion.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("profile",
+                                                       "profile",
+                                                       "Filename of an ICC color profile",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-icc-profile-set-rgb
+   */
+  procedure = gimp_procedure_new (plug_in_icc_profile_set_rgb_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-icc-profile-set-rgb");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-icc-profile-set-rgb",
+                                     "Set the default RGB color profile on the image",
+                                     "This procedure sets the user-configured RGB profile on an image using the 'icc-profile' parasite. If no RGB profile is configured, sRGB is assumed and the parasite is unset. This procedure does not do any color conversion.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-illusion
+   */
+  procedure = gimp_procedure_new (plug_in_illusion_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-illusion");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-illusion",
+                                     "Superimpose many altered copies of the image",
+                                     "Produce illusion.",
+                                     "Compatibility procedure. Please see 'gegl:illusion' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:illusion' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("division",
+                                                      "division",
+                                                      "The number of divisions",
+                                                      0, 64, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("type",
+                                                      "type",
+                                                      "Illusion type { TYPE1 (0), TYPE2 (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-laplace
+   */
+  procedure = gimp_procedure_new (plug_in_laplace_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-laplace");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-laplace",
+                                     "High-resolution edge detection",
+                                     "This plug-in creates one-pixel wide edges from the image, with the value proportional to the gradient. It uses the Laplace operator (a 3x3 kernel with -8 in the middle). The image has to be laplacered to get useful results, a gauss_iir with 1.5 - 5.0 depending on the noise in the image is best.",
+                                     "Compatibility procedure. Please see 'gegl:edge-laplace' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:edge-laplace' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-lens-distortion
+   */
+  procedure = gimp_procedure_new (plug_in_lens_distortion_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-lens-distortion");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-lens-distortion",
+                                     "Corrects lens distortion",
+                                     "Corrects barrel or pincushion lens distortion.",
+                                     "Compatibility procedure. Please see 'gegl:lens-distortion' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:lens-distortion' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("offset-x",
+                                                    "offset x",
+                                                    "Effect centre offset in X",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("offset-y",
+                                                    "offset y",
+                                                    "Effect centre offset in Y",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("main-adjust",
+                                                    "main adjust",
+                                                    "Amount of second-order distortion",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("edge-adjust",
+                                                    "edge adjust",
+                                                    "Amount of fourth-order distortion",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rescale",
+                                                    "rescale",
+                                                    "Rescale overall image size",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("brighten",
+                                                    "brighten",
+                                                    "Adjust brightness in corners",
+                                                    -100, 100, -100,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-make-seamless
+   */
+  procedure = gimp_procedure_new (plug_in_make_seamless_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-make-seamless");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-make-seamless",
+                                     "Alters edges to make the image seamlessly tileable",
+                                     "This plug-in creates a seamless tileable from the input drawable.",
+                                     "Compatibility procedure. Please see 'gegl:tile-seamless' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:tile-seamless' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-maze
+   */
+  procedure = gimp_procedure_new (plug_in_maze_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-maze");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-maze",
+                                     "Draw a labyrinth",
+                                     "Generates a maze using either the depth-first search method or Prim's algorithm. Can make tileable mazes too.",
+                                     "Compatibility procedure. Please see 'gegl:maze' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:maze' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int16 ("width",
+                                                      "width",
+                                                      "Width of the passages",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int16 ("height",
+                                                      "height",
+                                                      "Height of the passages",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("tileable",
+                                                     "tileable",
+                                                     "Tileable maze? (TRUE or FALSE)",
+                                                     0, 1, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8 ("algorithm",
+                                                     "algorithm",
+                                                     "Generation algorithm (0 = DEPTH FIRST, 1 = PRIM'S ALGORITHM)",
+                                                     0, 1, 0,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Random Seed",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int16 ("multiple",
+                                                      "multiple",
+                                                      "Multiple (use 57)",
+                                                      G_MININT16, G_MAXINT16, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int16 ("offset",
+                                                      "offset",
+                                                      "Offset (use 1)",
+                                                      G_MININT16, G_MAXINT16, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-mblur
+   */
+  procedure = gimp_procedure_new (plug_in_mblur_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-mblur");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-mblur",
+                                     "Simulate movement using directional blur",
+                                     "This plug-in simulates the effect seen when photographing a moving object at a slow shutter speed. Done by adding multiple displaced copies.",
+                                     "Compatibility procedure. Please see 'gegl:motion-blur-linear, -zoom, -cirular' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:motion-blur-linear, -zoom, -cirular' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("type",
+                                                      "type",
+                                                      "Type of motion blur { LINEAR (0), RADIAL (1), ZOOM (2) }",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("length",
+                                                    "length",
+                                                    "Length",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "Angle",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-x",
+                                                    "center x",
+                                                    "Center X",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-y",
+                                                    "center y",
+                                                    "Center Y",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-mblur-inward
+   */
+  procedure = gimp_procedure_new (plug_in_mblur_inward_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-mblur-inward");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-mblur-inward",
+                                     "Simulate movement using directional blur",
+                                     "This procedure is equivalent to plug-in-mblur but performs the zoom blur inward instead of outward.",
+                                     "Compatibility procedure. Please see 'gegl:motion-blur-linear, -zoom, -cirular' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:motion-blur-linear, -zoom, -cirular' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("type",
+                                                      "type",
+                                                      "Type of motion blur { LINEAR (0), RADIAL (1), ZOOM (2) }",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("length",
+                                                    "length",
+                                                    "Length",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "Angle",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-x",
+                                                    "center x",
+                                                    "Center X",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-y",
+                                                    "center y",
+                                                    "Center Y",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-median-blur
+   */
+  procedure = gimp_procedure_new (plug_in_median_blur_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-median-blur");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-median-blur",
+                                     "Blur using the median color near each pixel",
+                                     "Blur resulting from computing the median color in the neighborhood of each pixel",
+                                     "Compatibility procedure. Please see 'gegl:median-blur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:median-blur' for credits.",
+                                     "2021",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("radius",
+                                                      "radius",
+                                                      "Neighborhood radius, a negative value will calculate with inverted percentiles",
+                                                      -400, 400, -400,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("percentile",
+                                                    "percentile",
+                                                    "Neighborhood color percentile",
+                                                    0, 100, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-mosaic
+   */
+  procedure = gimp_procedure_new (plug_in_mosaic_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-mosaic");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-mosaic",
+                                     "Convert the image into irregular tiles",
+                                     "Mosaic is a filter which transforms an image into what appears to be a mosaic, composed of small primitives, each of constant color and of an approximate size.",
+                                     "Compatibility procedure. Please see 'gegl:mosaic' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:mosaic' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tile-size",
+                                                    "tile size",
+                                                    "Average diameter of each tile (in pixels)",
+                                                    1, 1000, 1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tile-height",
+                                                    "tile height",
+                                                    "Apparent height of each tile (in pixels)",
+                                                    1, 1000, 1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tile-spacing",
+                                                    "tile spacing",
+                                                    "Inter_tile spacing (in pixels)",
+                                                    0.1, 1000, 0.1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("tile-neatness",
+                                                    "tile neatness",
+                                                    "Deviation from perfectly formed tiles",
+                                                    0, 1.0, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tile-allow-split",
+                                                      "tile allow split",
+                                                      "Allows splitting tiles at hard edges",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("light-dir",
+                                                    "light dir",
+                                                    "Direction of light_source (in degrees)",
+                                                    0, 360, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("color-variation",
+                                                    "color variation",
+                                                    "Magnitude of random color variations",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("antialiasing",
+                                                      "antialiasing",
+                                                      "Enables smoother tile output at the cost of speed",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("color-averaging",
+                                                      "color averaging",
+                                                      "Tile color based on average of subsumed pixels",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tile-type",
+                                                      "tile type",
+                                                      "Tile geometry { SQUARES (0), HEXAGONS (1), OCTAGONS (2), TRIANGLES (3) }",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tile-surface",
+                                                      "tile surface",
+                                                      "Surface characteristics { SMOOTH (0), ROUGH (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("grout-color",
+                                                      "grout color",
+                                                      "Grout color (black/white or fore/background) { BW (0), FG-BG (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-neon
+   */
+  procedure = gimp_procedure_new (plug_in_neon_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-neon");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-neon",
+                                     "Simulate the glowing boundary of a neon light",
+                                     "This filter works in a manner similar to the edge plug-in, but uses the first derivative of the gaussian operator to achieve resolution independence. The IIR method of calculating the effect is utilized to keep the processing time constant between large and small standard deviations.",
+                                     "Compatibility procedure. Please see 'gegl:edge-neon' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:edge-neon' for credits.",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius of neon effect (in pixels)",
+                                                    0.0, 1500.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount",
+                                                    "amount",
+                                                    "Effect enhancement variable",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-newsprint
+   */
+  procedure = gimp_procedure_new (plug_in_newsprint_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-newsprint");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-newsprint",
+                                     "Halftone the image to give newspaper-like effect",
+                                     "Halftone the image to give newspaper-like effect",
+                                     "Compatibility procedure. Please see 'gegl:newsprint' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:newsprint' for credits.",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("cell-width",
+                                                      "cell width",
+                                                      "Screen cell width in pixels",
+                                                      0, 1500, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("colorspace",
+                                                      "colorspace",
+                                                      "Separate to { GRAYSCALE (0), RGB (1), CMYK (2), LUMINANCE (3) }",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("k-pullout",
+                                                      "k pullout",
+                                                      "Percentage of black to pullout (CMYK only)",
+                                                      0, 100, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("gry-ang",
+                                                    "gry ang",
+                                                    "Grey/black screen angle (degrees)",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("gry-spotfn",
+                                                      "gry spotfn",
+                                                      "Grey/black spot function { DOTS (0), LINES (1), DIAMONDS (2), EUCLIDIAN-DOT (3), PS-DIAMONDS (4) }",
+                                                      0, 4, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("red-ang",
+                                                    "red ang",
+                                                    "Red/cyan screen angle (degrees)",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("red-spotfn",
+                                                      "red spotfn",
+                                                      "Red/cyan spot function { DOTS (0), LINES (1), DIAMONDS (2), EUCLIDIAN-DOT (3), PS-DIAMONDS (4) }",
+                                                      0, 4, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("grn-ang",
+                                                    "grn ang",
+                                                    "Green/magenta screen angle (degrees)",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("grn-spotfn",
+                                                      "grn spotfn",
+                                                      "Green/magenta spot function { DOTS (0), LINES (1), DIAMONDS (2), EUCLIDIAN-DOT (3), PS-DIAMONDS (4) }",
+                                                      0, 4, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("blu-ang",
+                                                    "blu ang",
+                                                    "Blue/yellow screen angle (degrees)",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("blu-spotfn",
+                                                      "blu spotfn",
+                                                      "Blue/yellow spot function { DOTS (0), LINES (1), DIAMONDS (2), EUCLIDIAN-DOT (3), PS-DIAMONDS (4) }",
+                                                      0, 4, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("oversample",
+                                                      "oversample",
+                                                      "how many times to oversample spot fn",
+                                                      0, 128, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-normalize
+   */
+  procedure = gimp_procedure_new (plug_in_normalize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-normalize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-normalize",
+                                     "Stretch brightness values to cover the full range",
+                                     "This plug-in performs almost the same operation as the 'contrast autostretch' plug-in, except that it won't allow the color channels to normalize independently. This is actually what most people probably want instead of contrast-autostretch; use c-a only if you wish to remove an undesirable color-tint from a source image which is supposed to contain pure-white and pure-black.",
+                                     "Compatibility procedure. Please see 'gegl:stretch-contrast' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:stretch-contrast' for credits.",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-nova
+   */
+  procedure = gimp_procedure_new (plug_in_nova_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-nova");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-nova",
+                                     "Add a starburst to the image",
+                                     "This plug-in produces an effect like a supernova burst. The amount of the light effect is approximately in proportion to 1/r, where r is the distance from the center of the star.",
+                                     "Compatibility procedure. Please see 'gegl:supernova' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:supernova' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("xcenter",
+                                                      "xcenter",
+                                                      "X coordinates of the center of supernova",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("ycenter",
+                                                      "ycenter",
+                                                      "Y coordinates of the center of supernova",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "Color of supernova",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("radius",
+                                                      "radius",
+                                                      "Radius of supernova",
+                                                      1, 3000, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("nspoke",
+                                                      "nspoke",
+                                                      "Number of spokes",
+                                                      1, 1024, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("randomhue",
+                                                      "randomhue",
+                                                      "Random hue",
+                                                      0, 360, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-oilify
+   */
+  procedure = gimp_procedure_new (plug_in_oilify_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-oilify");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-oilify",
+                                     "Smear colors to simulate an oil painting",
+                                     "This function performs the well-known oil-paint effect on the specified drawable.",
+                                     "Compatibility procedure. Please see 'gegl:oilify' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:oilify' for credits.",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("mask-size",
+                                                      "mask size",
+                                                      "Oil paint mask size",
+                                                      1, 200, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("mode",
+                                                      "mode",
+                                                      "Algorithm { RGB (0), INTENSITY (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-oilify-enhanced
+   */
+  procedure = gimp_procedure_new (plug_in_oilify_enhanced_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-oilify-enhanced");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-oilify-enhanced",
+                                     "Smear colors to simulate an oil painting",
+                                     "This function performs the well-known oil-paint effect on the specified drawable.",
+                                     "Compatibility procedure. Please see 'gegl:oilify' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:oilify' for credits.",
+                                     "2019",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("mode",
+                                                      "mode",
+                                                      "Algorithm { RGB (0), INTENSITY (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("mask-size",
+                                                      "mask size",
+                                                      "Oil paint mask size",
+                                                      1, 200, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("mask-size-map",
+                                                            "mask size map",
+                                                            "Mask size control map",
+                                                            pdb->gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("exponent",
+                                                      "exponent",
+                                                      "Oil paint exponent",
+                                                      1, 20, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("exponent-map",
+                                                            "exponent map",
+                                                            "Exponent control map",
+                                                            pdb->gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-papertile
+   */
+  procedure = gimp_procedure_new (plug_in_papertile_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-papertile");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-papertile",
+                                     "Cut image into paper tiles, and slide them",
+                                     "This plug-in cuts an image into paper tiles and slides each paper tile.",
+                                     "Compatibility procedure. Please see 'gegl:tile-paper' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:tile-paper' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("tile-size",
+                                                      "tile size",
+                                                      "Tile size (pixels)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("move-max",
+                                                    "move max",
+                                                    "Max move rate (%)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("fractional-type",
+                                                      "fractional type",
+                                                      "Fractional type { BACKGROUND (0), IGNORE (1), FORCE (2) }",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("wrap-around",
+                                                     "wrap around",
+                                                     "Wrap around",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("centering",
+                                                     "centering",
+                                                     "Centering",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("background-type",
+                                                      "background type",
+                                                      "Background type { TRANSPARENT (0), INVERTED (1), IMAGE (2), FG (3), BG (4), COLOR (5) }",
+                                                      0, 5, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("background-color",
+                                                    "background color",
+                                                    "Background color (for background-type == 5)",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("background-alpha",
+                                                      "background alpha",
+                                                      "Background alpha (unused)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-pixelize
+   */
+  procedure = gimp_procedure_new (plug_in_pixelize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-pixelize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-pixelize",
+                                     "Simplify image into an array of solid-colored squares",
+                                     "Pixelize the contents of the specified drawable with specified pixelizing width.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("pixel-width",
+                                                      "pixel width",
+                                                      "Pixel width (the decrease in resolution)",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-pixelize2
+   */
+  procedure = gimp_procedure_new (plug_in_pixelize2_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-pixelize2");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-pixelize2",
+                                     "Simplify image into an array of solid-colored rectangles",
+                                     "Pixelize the contents of the specified drawable with specified pixelizing width and height.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("pixel-width",
+                                                      "pixel width",
+                                                      "Pixel width (the decrease in horizontal resolution)",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("pixel-height",
+                                                      "pixel height",
+                                                      "Pixel height (the decrease in vertical resolution)",
+                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-plasma
+   */
+  procedure = gimp_procedure_new (plug_in_plasma_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-plasma");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-plasma",
+                                     "Create a random plasma texture",
+                                     "This plug-in produces plasma fractal images.",
+                                     "Compatibility procedure. Please see 'gegl:plasma' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:plasma' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Random seed",
+                                                      -1, G_MAXINT, -1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("turbulence",
+                                                    "turbulence",
+                                                    "The value of the turbulence",
+                                                    0.0, 7.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-polar-coords
+   */
+  procedure = gimp_procedure_new (plug_in_polar_coords_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-polar-coords");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-polar-coords",
+                                     "Convert image to or from polar coordinates",
+                                     "Remaps and image from rectangular coordinates to polar coordinates or vice versa.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("circle",
+                                                    "circle",
+                                                    "Circle depth in %",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "Offset angle",
+                                                    0.0, 360.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("backwards",
+                                                     "backwards",
+                                                     "Map backwards",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("inverse",
+                                                     "inverse",
+                                                     "Map from top",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("polrec",
+                                                     "polrec",
+                                                     "Polar to rectangular",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-red-eye-removal
+   */
+  procedure = gimp_procedure_new (plug_in_red_eye_removal_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-red-eye-removal");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-red-eye-removal",
+                                     "Remove the red eye effect caused by camera flashes",
+                                     "This procedure removes the red eye effect caused by camera flashes by using a percentage based red color threshold. Make a selection containing the eyes, and apply the filter while adjusting the threshold to accurately remove the red eyes.",
+                                     "Compatibility procedure. Please see 'gegl:red-eye-removal' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:red-eye-removal' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Red eye threshold in percent",
+                                                      0, 100, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-randomize-hurl
+   */
+  procedure = gimp_procedure_new (plug_in_randomize_hurl_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-randomize-hurl");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-randomize-hurl",
+                                     "Completely randomize a fraction of pixels",
+                                     "This plug-in \"hurls\" randomly-valued pixels onto the selection or image. You may select the percentage of pixels to modify and the number of times to repeat the process.",
+                                     "Compatibility procedure. Please see 'gegl:noise-hurl' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-hurl' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rndm-pct",
+                                                    "rndm pct",
+                                                    "Randomization percentage",
+                                                    0.0, 100.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rndm-rcount",
+                                                    "rndm rcount",
+                                                    "Repeat count",
+                                                    1.0, 100.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("randomize",
+                                                     "randomize",
+                                                     "Use random seed",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Seed value (used only if randomize is FALSE)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-randomize-pick
+   */
+  procedure = gimp_procedure_new (plug_in_randomize_pick_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-randomize-pick");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-randomize-pick",
+                                     "Randomly interchange some pixels with neighbors",
+                                     "This plug-in replaces a pixel with a random adjacent pixel. You may select the percentage of pixels to modify and the number of times to repeat the process.",
+                                     "Compatibility procedure. Please see 'gegl:noise-pick' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-pick' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rndm-pct",
+                                                    "rndm pct",
+                                                    "Randomization percentage",
+                                                    1.0, 100.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rndm-rcount",
+                                                    "rndm rcount",
+                                                    "Repeat count",
+                                                    1.0, 100.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("randomize",
+                                                     "randomize",
+                                                     "Use random seed",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Seed value (used only if randomize is FALSE)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-randomize-slur
+   */
+  procedure = gimp_procedure_new (plug_in_randomize_slur_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-randomize-slur");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-randomize-slur",
+                                     "Randomly slide some pixels downward (similar to melting",
+                                     "This plug-in \"slurs\" (melts like a bunch of icicles) an image. You may select the percentage of pixels to modify and the number of times to repeat the process.",
+                                     "Compatibility procedure. Please see 'gegl:noise-slur' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-slur' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rndm-pct",
+                                                    "rndm pct",
+                                                    "Randomization percentage",
+                                                    1.0, 100.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("rndm-rcount",
+                                                    "rndm rcount",
+                                                    "Repeat count",
+                                                    1.0, 100.0, 1.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("randomize",
+                                                     "randomize",
+                                                     "Use random seed",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Seed value (used only if randomize is FALSE)",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-rgb-noise
+   */
+  procedure = gimp_procedure_new (plug_in_rgb_noise_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-rgb-noise");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-rgb-noise",
+                                     "Distort colors by random amounts",
+                                     "Add normally distributed (zero mean) random values to image channels. Noise may be additive (uncorrelated) or multiplicative (correlated - also known as speckle noise). For color images color channels may be treated together or independently.",
+                                     "Compatibility procedure. Please see 'gegl:noise-rgb' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-rgb' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("independent",
+                                                     "independent",
+                                                     "Noise in channels independent",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("correlated",
+                                                     "correlated",
+                                                     "Noise correlated (i.e. multiplicative not additive)",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-1",
+                                                    "noise 1",
+                                                    "Noise in the first channel (red, gray)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-2",
+                                                    "noise 2",
+                                                    "Noise in the second channel (green, gray_alpha)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-3",
+                                                    "noise 3",
+                                                    "Noise in the third channel (blue)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-4",
+                                                    "noise 4",
+                                                    "Noise in the fourth channel (alpha)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-ripple
+   */
+  procedure = gimp_procedure_new (plug_in_ripple_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-ripple");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-ripple",
+                                     "Displace pixels in a ripple pattern",
+                                     "Ripples the pixels of the specified drawable. Each row or column will be displaced a certain number of pixels coinciding with the given wave form.",
+                                     "Compatibility procedure. Please see 'gegl:ripple' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:ripple' for credits.",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("period",
+                                                      "period",
+                                                      "Period: number of pixels for one wave to complete",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("amplitude",
+                                                      "amplitude",
+                                                      "Amplitude: maximum displacement of wave",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("orientation",
+                                                      "orientation",
+                                                      "Orientation { ORIENTATION-HORIZONTAL (0), ORIENTATION-VERTICAL (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("edges",
+                                                      "edges",
+                                                      "Edges { SMEAR (0), WRAP (1), BLANK (2) }",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("waveform",
+                                                      "waveform",
+                                                      "Waveform { SAWTOOTH (0), SINE (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialias { TRUE, FALSE }",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("tile",
+                                                     "tile",
+                                                     "Tileable { TRUE, FALSE }",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-rotate
+   */
+  procedure = gimp_procedure_new (plug_in_rotate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-rotate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-rotate",
+                                     "Rotates a layer or the whole image by 90, 180 or 270 degrees",
+                                     "This plug-in does rotate the active layer or the whole image clockwise by multiples of 90 degrees. When the whole image is chosen, the image is resized if necessary.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("angle",
+                                                      "angle",
+                                                      "Angle { 90 (1), 180 (2), 270 (3) } degrees",
+                                                      1, 3, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("everything",
+                                                     "everything",
+                                                     "Rotate the whole image",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-noisify
+   */
+  procedure = gimp_procedure_new (plug_in_noisify_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-noisify");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-noisify",
+                                     "Adds random noise to image channels",
+                                     "Add normally distributed random values to image channels. For color images each color channel may be treated together or independently.",
+                                     "Compatibility procedure. Please see 'gegl:noise-rgb' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-rgb' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("independent",
+                                                     "independent",
+                                                     "Noise in channels independent",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-1",
+                                                    "noise 1",
+                                                    "Noise in the first channel (red, gray)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-2",
+                                                    "noise 2",
+                                                    "Noise in the second channel (green, gray_alpha)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-3",
+                                                    "noise 3",
+                                                    "Noise in the third channel (blue)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("noise-4",
+                                                    "noise 4",
+                                                    "Noise in the fourth channel (alpha)",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-sel-gauss
+   */
+  procedure = gimp_procedure_new (plug_in_sel_gauss_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-sel-gauss");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-sel-gauss",
+                                     "Blur neighboring pixels, but only in low-contrast areas",
+                                     "This filter functions similar to the regular gaussian blur filter except that neighbouring pixels that differ more than the given maxdelta parameter will not be blended with. This way with the correct parameters, an image can be smoothed out without losing details. However, this filter can be rather slow.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur-selective' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:gaussian-blur-selective' for credits.",
+                                     "2099",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius of gaussian blur (in pixels)",
+                                                    0.0, G_MAXDOUBLE, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("max-delta",
+                                                      "max delta",
+                                                      "Maximum delta",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-semiflatten
+   */
+  procedure = gimp_procedure_new (plug_in_semiflatten_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-semiflatten");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-semiflatten",
+                                     "Replace partial transparency with the current background color",
+                                     "This plug-in flattens pixels in an RGBA image that aren't completely transparent against the current GIMP background color.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-shift
+   */
+  procedure = gimp_procedure_new (plug_in_shift_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-shift");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-shift",
+                                     "Shift each row or column of pixels by a random amount",
+                                     "Shifts the pixels of the specified drawable. Each row or column will be displaced a random value of pixels.",
+                                     "Compatibility procedure. Please see 'gegl:shift' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:shift' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("shift-amount",
+                                                      "shift amount",
+                                                      "Shift amount",
+                                                      0, 200, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("orientation",
+                                                      "orientation",
+                                                      "Orientation { ORIENTATION-VERTICAL (0), ORIENTATION-HORIZONTAL (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-sinus
+   */
+  procedure = gimp_procedure_new (plug_in_sinus_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-sinus");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-sinus",
+                                     "Generate complex sinusoidal textures",
+                                     "FIXME: sinus help",
+                                     "Compatibility procedure. Please see 'gegl:sinus' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:sinus' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("xscale",
+                                                    "xscale",
+                                                    "Scale value for x axis",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("yscale",
+                                                    "yscale",
+                                                    "Scale value for y axis",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("complex",
+                                                    "complex",
+                                                    "Complexity factor",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Seed value for random number generator",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("tiling",
+                                                     "tiling",
+                                                     "If set, the pattern generated will tile",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("perturb",
+                                                     "perturb",
+                                                     "If set, the pattern is a little more distorted...",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("colors",
+                                                      "colors",
+                                                      "where to take the colors (0=B&W, 1=fg/bg, 2=col1/col2)",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("col1",
+                                                    "col1",
+                                                    "fist color (sometimes unused)",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("col2",
+                                                    "col2",
+                                                    "second color (sometimes unused)",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("alpha1",
+                                                    "alpha1",
+                                                    "alpha for the first color (used if the drawable has an alpha channel)",
+                                                    0, 1, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("alpha2",
+                                                    "alpha2",
+                                                    "alpha for the second color (used if the drawable has an alpha channel)",
+                                                    0, 1, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("blend",
+                                                      "blend",
+                                                      "0=linear, 1=bilinear, 2=sinusoidal",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("blend-power",
+                                                    "blend power",
+                                                    "Power used to stretch the blend",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-sobel
+   */
+  procedure = gimp_procedure_new (plug_in_sobel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-sobel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-sobel",
+                                     "Specialized direction-dependent edge detection",
+                                     "This plug-in calculates the gradient with a sobel operator. The user can specify which direction to use. When both directions are used, the result is the RMS of the two gradients; if only one direction is used, the result either the absolute value of the gradient, or 127 + gradient (if the 'keep sign' switch is on). This way, information about the direction of the gradient is preserved. Resulting images are not autoscaled.\"",
+                                     "Compatibility procedure. Please see 'gegl:edge-sobel' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:edge-sobel' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("horizontal",
+                                                     "horizontal",
+                                                     "Sobel in horizontal direction",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("vertical",
+                                                     "vertical",
+                                                     "Sobel in vertical direction",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("keep-sign",
+                                                     "keep sign",
+                                                     "Keep sign of result (one direction only)",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-solid-noise
+   */
+  procedure = gimp_procedure_new (plug_in_solid_noise_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-solid-noise");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-solid-noise",
+                                     "Create a random cloud-like texture",
+                                     "Generates 2D textures using Perlin's classic solid noise function.",
+                                     "Compatibility procedure. Please see 'gegl:noise-solid' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-solid' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("tileable",
+                                                     "tileable",
+                                                     "Create a tileable output",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("turbulent",
+                                                     "turbulent",
+                                                     "Make a turbulent noise",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("seed",
+                                                      "seed",
+                                                      "Random seed",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("detail",
+                                                      "detail",
+                                                      "Detail level",
+                                                      0, 15, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("xsize",
+                                                    "xsize",
+                                                    "Horizontal texture size",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("ysize",
+                                                    "ysize",
+                                                    "Vertical texture size",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-spread
+   */
+  procedure = gimp_procedure_new (plug_in_spread_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-spread");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-spread",
+                                     "Move pixels around randomly",
+                                     "Spreads the pixels of the specified drawable. Pixels are randomly moved to another location whose distance varies from the original by the horizontal and vertical spread amounts.",
+                                     "Compatibility procedure. Please see 'gegl:noise-spread' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:noise-spread' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("spread-amount-x",
+                                                    "spread amount x",
+                                                    "Horizontal spread amount",
+                                                    0, 200, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("spread-amount-y",
+                                                    "spread amount y",
+                                                    "Vertical spread amount",
+                                                    0, 200, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-threshold-alpha
+   */
+  procedure = gimp_procedure_new (plug_in_threshold_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-threshold-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-threshold-alpha",
+                                     "Make transparency all-or-nothing",
+                                     "Make transparency all-or-nothing.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Threshold",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-unsharp-mask
+   */
+  procedure = gimp_procedure_new (plug_in_unsharp_mask_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-unsharp-mask");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-unsharp-mask",
+                                     "The most widely useful method for sharpening an image",
+                                     "The unsharp mask is a sharpening filter that works by comparing using the difference of the image and a blurred version of the image. It is commonly used on photographic images, and is provides a much more pleasing result than the standard sharpen filter.",
+                                     "Compatibility procedure. Please see 'gegl:unsharp-mask' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:unsharp-mask' for credits.",
+                                     "2018",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius of gaussian blur",
+                                                    0.0, 300.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amount",
+                                                    "amount",
+                                                    "Strength of effect",
+                                                    0.0, 300.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Threshold",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-video
+   */
+  procedure = gimp_procedure_new (plug_in_video_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-video");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-video",
+                                     "Simulate distortion produced by a fuzzy or low-res monitor",
+                                     "This function simulates the degradation of being on an old low-dotpitch RGB video monitor to the specified drawable.",
+                                     "Compatibility procedure. Please see 'gegl:video-degradation' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:video-degradation' for credits.",
+                                     "2014",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("pattern-number",
+                                                      "pattern number",
+                                                      "Type of RGB pattern to use",
+                                                      0, 8, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("additive",
+                                                     "additive",
+                                                     "Whether the function adds the result to the original image",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("rotated",
+                                                     "rotated",
+                                                     "Whether to rotate the RGB pattern by ninety degrees",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-vinvert
+   */
+  procedure = gimp_procedure_new (plug_in_vinvert_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-vinvert");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-vinvert",
+                                     "Invert the brightness of each pixel",
+                                     "This function takes an indexed/RGB image and inverts its 'value' in HSV space. The upshot of this is that the color and saturation at any given point remains the same, but its brightness is effectively inverted. Quite strange. Sometimes produces unpleasant color artifacts on images from lossy sources (ie. JPEG).",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-vpropagate
+   */
+  procedure = gimp_procedure_new (plug_in_vpropagate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-vpropagate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-vpropagate",
+                                     "Propagate certain colors to neighboring pixels",
+                                     "Propagate values of the layer.",
+                                     "Compatibility procedure. Please see 'gegl:value-propagate' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:value-propagate' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("propagate-mode",
+                                                      "propagate mode",
+                                                      "Propagate mode { 0:white, 1:black, 2:middle value 3:foreground to peak, 4:foreground, 5:background, 6:opaque, 7:transparent }",
+                                                      0, 7, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("propagating-channel",
+                                                      "propagating channel",
+                                                      "Channels which values are propagated",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("propagating-rate",
+                                                    "propagating rate",
+                                                    "Propagating rate",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("direction-mask",
+                                                      "direction mask",
+                                                      "Direction mask",
+                                                      0, 15, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("lower-limit",
+                                                      "lower limit",
+                                                      "Lower limit",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("upper-limit",
+                                                      "upper limit",
+                                                      "Upper limit",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-dilate
+   */
+  procedure = gimp_procedure_new (plug_in_dilate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-dilate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-dilate",
+                                     "Grow lighter areas of the image",
+                                     "Dilate image.",
+                                     "Compatibility procedure. Please see 'gegl:value-propagate' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:value-propagate' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("propagate-mode",
+                                                      "propagate mode",
+                                                      "Propagate mode { 0:white, 1:black, 2:middle value 3:foreground to peak, 4:foreground, 5:background, 6:opaque, 7:transparent }",
+                                                      0, 7, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("propagating-channel",
+                                                      "propagating channel",
+                                                      "Channels which values are propagated",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("propagating-rate",
+                                                    "propagating rate",
+                                                    "Propagating rate",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("direction-mask",
+                                                      "direction mask",
+                                                      "Direction mask",
+                                                      0, 15, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("lower-limit",
+                                                      "lower limit",
+                                                      "Lower limit",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("upper-limit",
+                                                      "upper limit",
+                                                      "Upper limit",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-erode
+   */
+  procedure = gimp_procedure_new (plug_in_erode_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-erode");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-erode",
+                                     "Shrink lighter areas of the image",
+                                     "Erode image.",
+                                     "Compatibility procedure. Please see 'gegl:value-propagate' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:value-propagate' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("propagate-mode",
+                                                      "propagate mode",
+                                                      "Propagate mode { 0:white, 1:black, 2:middle value 3:foreground to peak, 4:foreground, 5:background, 6:opaque, 7:transparent }",
+                                                      0, 7, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("propagating-channel",
+                                                      "propagating channel",
+                                                      "Channels which values are propagated",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("propagating-rate",
+                                                    "propagating rate",
+                                                    "Propagating rate",
+                                                    0.0, 1.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("direction-mask",
+                                                      "direction mask",
+                                                      "Direction mask",
+                                                      0, 15, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("lower-limit",
+                                                      "lower limit",
+                                                      "Lower limit",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("upper-limit",
+                                                      "upper limit",
+                                                      "Upper limit",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-waves
+   */
+  procedure = gimp_procedure_new (plug_in_waves_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-waves");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-waves",
+                                     "Distort the image with waves",
+                                     "Distort the image with waves.",
+                                     "Compatibility procedure. Please see 'gegl:waves' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:waves' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("amplitude",
+                                                    "amplitude",
+                                                    "The Amplitude of the Waves",
+                                                    0, 101, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("phase",
+                                                    "phase",
+                                                    "The Phase of the Waves",
+                                                    -360, 360, -360,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("wavelength",
+                                                    "wavelength",
+                                                    "The Wavelength of the Waves",
+                                                    0.1, 50, 0.1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("type",
+                                                     "type",
+                                                     "Type of waves: { 0 = smeared, 1 = black }",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("reflective",
+                                                     "reflective",
+                                                     "Use Reflection (not implemented)",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-whirl-pinch
+   */
+  procedure = gimp_procedure_new (plug_in_whirl_pinch_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-whirl-pinch");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-whirl-pinch",
+                                     "Distort an image by whirling and pinching",
+                                     "Distorts the image by whirling and pinching, which are two common center-based, circular distortions. Whirling is like projecting the image onto the surface of water in a toilet and flushing. Pinching is similar to projecting the image onto an elastic surface and pressing or pulling on the center of the surface.",
+                                     "Compatibility procedure. Please see 'gegl:whirl-pinch' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:whirl-pinch' for credits.",
+                                     "2013",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("whirl",
+                                                    "whirl",
+                                                    "Whirl angle (degrees)",
+                                                    -720, 720, -720,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("pinch",
+                                                    "pinch",
+                                                    "Pinch amount",
+                                                    -1, 1, -1,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius (1.0 is the largest circle that fits in the image, and 2.0 goes all the way to the corners)",
+                                                    0, 2, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-plug-in-wind
+   */
+  procedure = gimp_procedure_new (plug_in_wind_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "plug-in-wind");
+  gimp_procedure_set_static_strings (procedure,
+                                     "plug-in-wind",
+                                     "Smear image to give windblown effect",
+                                     "Renders a wind effect.",
+                                     "Compatibility procedure. Please see 'gegl:wind' for credits.",
+                                     "Compatibility procedure. Please see 'gegl:wind' for credits.",
+                                     "2015",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("run-mode",
+                                                  "run mode",
+                                                  "The run mode",
+                                                  GIMP_TYPE_RUN_MODE,
+                                                  GIMP_RUN_INTERACTIVE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "Input image (unused)",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "Input drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Controls where blending will be done",
+                                                      0, 50, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("direction",
+                                                      "direction",
+                                                      "Wind direction { 0:left, 1:right, 2:top, 3:bottom }",
+                                                      0, 3, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("strength",
+                                                      "strength",
+                                                      "Controls the extent of the blending",
+                                                      1, 100, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("algorithm",
+                                                      "algorithm",
+                                                      "Algorithm { WIND (0), BLAST (1) }",
+                                                      0, 1, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("edge",
+                                                      "edge",
+                                                      "Affected edge { BOTH (0), LEADING (1), TRAILING (2) }",
+                                                      0, 2, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/procedural-db-cmds.c b/app/pdb/procedural-db-cmds.c
new file mode 100644
index 0000000..bb8896e
--- /dev/null
+++ b/app/pdb/procedural-db-cmds.c
@@ -0,0 +1,926 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs-desc.h"
+#include "core/gimpparamspecs.h"
+#include "gimp-pdb-compat.h"
+#include "gimppdb-query.h"
+#include "plug-in/gimppluginmanager-data.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+procedural_db_temp_name_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  GimpValueArray *return_vals;
+  gchar *temp_name = NULL;
+
+  static gint proc_number = 0;
+
+  temp_name = g_strdup_printf ("temp-procedure-number-%d", proc_number++);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_take_string (gimp_value_array_index (return_vals, 1), temp_name);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_dump_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *filename;
+
+  filename = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GFile *file = g_file_new_for_path (filename);
+
+      success = gimp_pdb_dump (gimp->pdb, file, error);
+
+      g_object_unref (file);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+procedural_db_query_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *name;
+  const gchar *blurb;
+  const gchar *help;
+  const gchar *author;
+  const gchar *copyright;
+  const gchar *date;
+  const gchar *proc_type;
+  gint32 num_matches = 0;
+  gchar **procedure_names = NULL;
+
+  name = g_value_get_string (gimp_value_array_index (args, 0));
+  blurb = g_value_get_string (gimp_value_array_index (args, 1));
+  help = g_value_get_string (gimp_value_array_index (args, 2));
+  author = g_value_get_string (gimp_value_array_index (args, 3));
+  copyright = g_value_get_string (gimp_value_array_index (args, 4));
+  date = g_value_get_string (gimp_value_array_index (args, 5));
+  proc_type = g_value_get_string (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      success = gimp_pdb_query (gimp->pdb,
+                                name, blurb, help, author,
+                                copyright, date, proc_type,
+                                &num_matches, &procedure_names,
+                                error);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_matches);
+      gimp_value_take_stringarray (gimp_value_array_index (return_vals, 2), procedure_names, num_matches);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_proc_exists_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *procedure_name;
+  gboolean exists = FALSE;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpProcedure *procedure;
+      gchar         *canonical;
+
+      canonical = gimp_canonicalize_identifier (procedure_name);
+
+      procedure = gimp_pdb_lookup_procedure (gimp->pdb, canonical);
+
+      if (! procedure)
+        {
+          procedure_name = gimp_pdb_lookup_compat_proc_name (gimp->pdb, canonical);
+
+          if (procedure_name)
+            procedure = gimp_pdb_lookup_procedure (gimp->pdb, procedure_name);
+        }
+
+      g_free (canonical);
+
+      exists = (procedure != NULL);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), exists);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_proc_info_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *procedure_name;
+  gchar *blurb = NULL;
+  gchar *help = NULL;
+  gchar *author = NULL;
+  gchar *copyright = NULL;
+  gchar *date = NULL;
+  gint32 proc_type = 0;
+  gint32 num_args = 0;
+  gint32 num_values = 0;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPDBProcType  ptype;
+      gchar           *canonical;
+
+      canonical = gimp_canonicalize_identifier (procedure_name);
+
+      success = gimp_pdb_proc_info (gimp->pdb, canonical,
+                                    &blurb, &help, &author,
+                                    &copyright, &date, &ptype,
+                                    &num_args, &num_values,
+                                    error);
+      proc_type = ptype;
+
+      g_free (canonical);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_take_string (gimp_value_array_index (return_vals, 1), blurb);
+      g_value_take_string (gimp_value_array_index (return_vals, 2), help);
+      g_value_take_string (gimp_value_array_index (return_vals, 3), author);
+      g_value_take_string (gimp_value_array_index (return_vals, 4), copyright);
+      g_value_take_string (gimp_value_array_index (return_vals, 5), date);
+      g_value_set_enum (gimp_value_array_index (return_vals, 6), proc_type);
+      g_value_set_int (gimp_value_array_index (return_vals, 7), num_args);
+      g_value_set_int (gimp_value_array_index (return_vals, 8), num_values);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_proc_arg_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *procedure_name;
+  gint32 arg_num;
+  gint32 arg_type = 0;
+  gchar *arg_name = NULL;
+  gchar *arg_desc = NULL;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  arg_num = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpProcedure *proc;
+      gchar         *canonical;
+
+      canonical = gimp_canonicalize_identifier (procedure_name);
+
+      proc = gimp_pdb_lookup_procedure (gimp->pdb, canonical);
+
+      if (! proc)
+        {
+          const gchar *compat_name;
+
+          compat_name = gimp_pdb_lookup_compat_proc_name (gimp->pdb, canonical);
+
+          if (compat_name)
+            proc = gimp_pdb_lookup_procedure (gimp->pdb, compat_name);
+        }
+
+      g_free (canonical);
+
+      if (proc && (arg_num >= 0 && arg_num < proc->num_args))
+        {
+          GParamSpec *pspec = proc->args[arg_num];
+
+          arg_type = gimp_pdb_compat_arg_type_from_gtype (G_PARAM_SPEC_VALUE_TYPE (pspec));
+          arg_name = g_strdup (g_param_spec_get_name (pspec));
+          arg_desc = gimp_param_spec_get_desc (pspec);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_enum (gimp_value_array_index (return_vals, 1), arg_type);
+      g_value_take_string (gimp_value_array_index (return_vals, 2), arg_name);
+      g_value_take_string (gimp_value_array_index (return_vals, 3), arg_desc);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_proc_val_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *procedure_name;
+  gint32 val_num;
+  gint32 val_type = 0;
+  gchar *val_name = NULL;
+  gchar *val_desc = NULL;
+
+  procedure_name = g_value_get_string (gimp_value_array_index (args, 0));
+  val_num = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpProcedure *proc;
+      gchar         *canonical;
+
+      canonical = gimp_canonicalize_identifier (procedure_name);
+
+      proc = gimp_pdb_lookup_procedure (gimp->pdb, canonical);
+
+      if (! proc)
+        {
+          const gchar *compat_name;
+
+          compat_name = gimp_pdb_lookup_compat_proc_name (gimp->pdb, canonical);
+
+          if (compat_name)
+            proc = gimp_pdb_lookup_procedure (gimp->pdb, compat_name);
+        }
+
+      g_free (canonical);
+
+      if (proc && (val_num >= 0 && val_num < proc->num_values))
+        {
+          GParamSpec *pspec = proc->values[val_num];
+
+          val_type = gimp_pdb_compat_arg_type_from_gtype (G_PARAM_SPEC_VALUE_TYPE (pspec));
+          val_name = g_strdup (g_param_spec_get_name (pspec));
+          val_desc = gimp_param_spec_get_desc (pspec);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_enum (gimp_value_array_index (return_vals, 1), val_type);
+      g_value_take_string (gimp_value_array_index (return_vals, 2), val_name);
+      g_value_take_string (gimp_value_array_index (return_vals, 3), val_desc);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_get_data_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *identifier;
+  gint32 bytes = 0;
+  guint8 *data = NULL;
+
+  identifier = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gchar        *canonical = gimp_canonicalize_identifier (identifier);
+      const guint8 *orig_data;
+
+      orig_data = gimp_plug_in_manager_get_data (gimp->plug_in_manager,
+                                                 canonical, &bytes);
+
+      g_free (canonical);
+
+      if (orig_data)
+        data = g_memdup (orig_data, bytes);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), bytes);
+      gimp_value_take_int8array (gimp_value_array_index (return_vals, 2), data, bytes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_get_data_size_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *identifier;
+  gint32 bytes = 0;
+
+  identifier = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (identifier);
+
+      if (! gimp_plug_in_manager_get_data (gimp->plug_in_manager,
+                                           canonical, &bytes))
+        success = FALSE;
+
+      g_free (canonical);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), bytes);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+procedural_db_set_data_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *identifier;
+  gint32 bytes;
+  const guint8 *data;
+
+  identifier = g_value_get_string (gimp_value_array_index (args, 0));
+  bytes = g_value_get_int (gimp_value_array_index (args, 1));
+  data = gimp_value_get_int8array (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gchar *canonical = gimp_canonicalize_identifier (identifier);
+
+      gimp_plug_in_manager_set_data (gimp->plug_in_manager,
+                                     canonical, bytes, data);
+
+      g_free (canonical);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_procedural_db_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-procedural-db-temp-name
+   */
+  procedure = gimp_procedure_new (procedural_db_temp_name_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-temp-name");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-temp-name",
+                                     "Generates a unique temporary PDB name.",
+                                     "This procedure generates a temporary PDB entry name that is guaranteed to be unique.",
+                                     "Andy Thomas",
+                                     "Andy Thomas",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("temp-name",
+                                                           "temp name",
+                                                           "A unique temporary name for a temporary PDB entry",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-dump
+   */
+  procedure = gimp_procedure_new (procedural_db_dump_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-dump");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-dump",
+                                     "Dumps the current contents of the procedural database",
+                                     "This procedure dumps the contents of the procedural database to the specified file. The file will contain all of the information provided for each registered procedure.",
+                                     "Spencer Kimball & Josh MacDonald",
+                                     "Spencer Kimball & Josh MacDonald & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The dump filename",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-query
+   */
+  procedure = gimp_procedure_new (procedural_db_query_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-query");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-query",
+                                     "Queries the procedural database for its contents using regular expression matching.",
+                                     "This procedure queries the contents of the procedural database. It is supplied with seven arguments matching procedures on { name, blurb, help, author, copyright, date, procedure type}. This is accomplished using regular expression matching. For instance, to find all procedures with \"jpeg\" listed in the blurb, all seven arguments can be supplied as \".*\", except for the second, which can be supplied as \".*jpeg.*\". There are two return arguments for this procedure. The first is the number of procedures matching the query. The second is a concatenated list of procedure names corresponding to those matching the query. If no matching entries are found, then the returned string is NULL and the number of entries is 0.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "The regex for procedure name",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("blurb",
+                                                       "blurb",
+                                                       "The regex for procedure blurb",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("help",
+                                                       "help",
+                                                       "The regex for procedure help",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("author",
+                                                       "author",
+                                                       "The regex for procedure author",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("copyright",
+                                                       "copyright",
+                                                       "The regex for procedure copyright",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("date",
+                                                       "date",
+                                                       "The regex for procedure date",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("proc-type",
+                                                       "proc type",
+                                                       "The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-in', 'GIMP Extension', 'Temporary Procedure' }",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-matches",
+                                                          "num matches",
+                                                          "The number of matching procedures",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("procedure-names",
+                                                                 "procedure names",
+                                                                 "The list of procedure names",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-proc-exists
+   */
+  procedure = gimp_procedure_new (procedural_db_proc_exists_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-proc-exists");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-proc-exists",
+                                     "Checks if the specified procedure exists in the procedural database",
+                                     "This procedure checks if the specified procedure is registered in the procedural database.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The procedure name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("exists",
+                                                         "exists",
+                                                         "Whether a procedure of that name is registered",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-proc-info
+   */
+  procedure = gimp_procedure_new (procedural_db_proc_info_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-proc-info");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-proc-info",
+                                     "Queries the procedural database for information on the specified procedure.",
+                                     "This procedure returns information on the specified procedure. A short blurb, detailed help, author(s), copyright information, procedure type, number of input, and number of return values are returned. For specific information on each input argument and return value, use the 'gimp-procedural-db-proc-arg' and 'gimp-procedural-db-proc-val' procedures.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The procedure name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("blurb",
+                                                           "blurb",
+                                                           "A short blurb",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("help",
+                                                           "help",
+                                                           "Detailed procedure help",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("author",
+                                                           "author",
+                                                           "Author(s) of the procedure",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("copyright",
+                                                           "copyright",
+                                                           "The copyright",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("date",
+                                                           "date",
+                                                           "Copyright date",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("proc-type",
+                                                      "proc type",
+                                                      "The procedure type",
+                                                      GIMP_TYPE_PDB_PROC_TYPE,
+                                                      GIMP_INTERNAL,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-args",
+                                                          "num args",
+                                                          "The number of input arguments",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-values",
+                                                          "num values",
+                                                          "The number of return values",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-proc-arg
+   */
+  procedure = gimp_procedure_new (procedural_db_proc_arg_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-proc-arg");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-proc-arg",
+                                     "Queries the procedural database for information on the specified procedure's argument.",
+                                     "This procedure returns information on the specified procedure's argument. The argument type, name, and a description are retrieved.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The procedure name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("arg-num",
+                                                      "arg num",
+                                                      "The argument number",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_enum ("arg-type",
+                                                         "arg type",
+                                                         "The type of argument",
+                                                         GIMP_TYPE_PDB_ARG_TYPE,
+                                                         GIMP_PDB_INT32,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->values[0]),
+                                      GIMP_PDB_END);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("arg-name",
+                                                           "arg name",
+                                                           "The name of the argument",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("arg-desc",
+                                                           "arg desc",
+                                                           "A description of the argument",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-proc-val
+   */
+  procedure = gimp_procedure_new (procedural_db_proc_val_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-proc-val");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-proc-val",
+                                     "Queries the procedural database for information on the specified procedure's return value.",
+                                     "This procedure returns information on the specified procedure's return value. The return value type, name, and a description are retrieved.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("procedure-name",
+                                                       "procedure name",
+                                                       "The procedure name",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("val-num",
+                                                      "val num",
+                                                      "The return value number",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_enum ("val-type",
+                                                         "val type",
+                                                         "The type of return value",
+                                                         GIMP_TYPE_PDB_ARG_TYPE,
+                                                         GIMP_PDB_INT32,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->values[0]),
+                                      GIMP_PDB_END);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("val-name",
+                                                           "val name",
+                                                           "The name of the return value",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("val-desc",
+                                                           "val desc",
+                                                           "A description of the return value",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-get-data
+   */
+  procedure = gimp_procedure_new (procedural_db_get_data_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-get-data");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-get-data",
+                                     "Returns data associated with the specified identifier.",
+                                     "This procedure returns any data which may have been associated with the specified identifier. The data is a variable length array of bytes. If no data has been associated with the identifier, an error is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("identifier",
+                                                       "identifier",
+                                                       "The identifier associated with data",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bytes",
+                                                          "bytes",
+                                                          "The number of bytes in the data",
+                                                          1, G_MAXINT32, 1,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int8_array ("data",
+                                                               "data",
+                                                               "A byte array containing data",
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-get-data-size
+   */
+  procedure = gimp_procedure_new (procedural_db_get_data_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-get-data-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-get-data-size",
+                                     "Returns size of data associated with the specified identifier.",
+                                     "This procedure returns the size of any data which may have been associated with the specified identifier. If no data has been associated with the identifier, an error is returned.",
+                                     "Nick Lamb",
+                                     "Nick Lamb",
+                                     "1998",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("identifier",
+                                                       "identifier",
+                                                       "The identifier associated with data",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("bytes",
+                                                          "bytes",
+                                                          "The number of bytes in the data",
+                                                          1, G_MAXINT32, 1,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-procedural-db-set-data
+   */
+  procedure = gimp_procedure_new (procedural_db_set_data_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-procedural-db-set-data");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-procedural-db-set-data",
+                                     "Associates the specified identifier with the supplied data.",
+                                     "This procedure associates the supplied data with the provided identifier. The data may be subsequently retrieved by a call to 'procedural-db-get-data'.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1997",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("identifier",
+                                                       "identifier",
+                                                       "The identifier associated with data",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("bytes",
+                                                      "bytes",
+                                                      "The number of bytes in the data",
+                                                      1, G_MAXINT32, 1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int8_array ("data",
+                                                           "data",
+                                                           "A byte array containing data",
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/progress-cmds.c b/app/pdb/progress-cmds.c
new file mode 100644
index 0000000..74b843e
--- /dev/null
+++ b/app/pdb/progress-cmds.c
@@ -0,0 +1,502 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "plug-in/gimpplugin-progress.h"
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+progress_init_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *message;
+  GimpObject *gdisplay;
+
+  message = g_value_get_string (gimp_value_array_index (args, 0));
+  gdisplay = gimp_value_get_display (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->open)
+        {
+          if (! gimp->no_interface)
+            gimp_plug_in_progress_start (plug_in, message, gdisplay);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_update_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  gdouble percentage;
+
+  percentage = g_value_get_double (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->open)
+        {
+          if (! gimp->no_interface)
+            gimp_plug_in_progress_set_value (plug_in, percentage);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_pulse_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in && plug_in->open)
+    {
+      if (! gimp->no_interface)
+        gimp_plug_in_progress_pulse (plug_in);
+    }
+  else
+    success = FALSE;
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_set_text_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *message;
+
+  message = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->open)
+        {
+          if (! gimp->no_interface)
+            gimp_plug_in_progress_set_text (plug_in, message);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_end_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in && plug_in->open)
+    {
+      GimpPlugInProcFrame *proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+      gimp_plug_in_progress_end (plug_in, proc_frame);
+    }
+  else
+    success = FALSE;
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_get_window_handle_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  gint32 window = 0;
+
+  GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+  if (plug_in && plug_in->open)
+    {
+      if (! gimp->no_interface)
+        window = gimp_plug_in_progress_get_window_id (plug_in);
+    }
+  else
+    success = FALSE;
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), window);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+progress_install_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *progress_callback;
+
+  progress_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->open)
+        success = gimp_plug_in_progress_install (plug_in, progress_callback);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_uninstall_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *progress_callback;
+
+  progress_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->open)
+        success = gimp_plug_in_progress_uninstall (plug_in, progress_callback);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+progress_cancel_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  const gchar *progress_callback;
+
+  progress_callback = g_value_get_string (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      GimpPlugIn *plug_in = gimp->plug_in_manager->current_plug_in;
+
+      if (plug_in && plug_in->open)
+        success = gimp_plug_in_progress_cancel (plug_in, progress_callback);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_progress_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-progress-init
+   */
+  procedure = gimp_procedure_new (progress_init_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-init");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-init",
+                                     "Initializes the progress bar for the current plug-in.",
+                                     "Initializes the progress bar for the current plug-in. It is only valid to call this procedure from a plug-in.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("message",
+                                                       "message",
+                                                       "Message to use in the progress dialog",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_display_id ("gdisplay",
+                                                           "gdisplay",
+                                                           "GimpDisplay to update progressbar in, or -1 for a separate window",
+                                                           pdb->gimp, TRUE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-update
+   */
+  procedure = gimp_procedure_new (progress_update_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-update");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-update",
+                                     "Updates the progress bar for the current plug-in.",
+                                     "Updates the progress bar for the current plug-in. It is only valid to call this procedure from a plug-in.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("percentage",
+                                                    "percentage",
+                                                    "Percentage of progress completed which must be between 0.0 and 1.0",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-pulse
+   */
+  procedure = gimp_procedure_new (progress_pulse_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-pulse");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-pulse",
+                                     "Pulses the progress bar for the current plug-in.",
+                                     "Updates the progress bar for the current plug-in. It is only valid to call this procedure from a plug-in. Use this function instead of 'gimp-progress-update' if you cannot tell how much progress has been made. This usually causes the the progress bar to enter \"activity mode\", where a block bounces back and forth.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-set-text
+   */
+  procedure = gimp_procedure_new (progress_set_text_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-set-text");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-set-text",
+                                     "Changes the text in the progress bar for the current plug-in.",
+                                     "This function changes the text in the progress bar for the current plug-in. Unlike 'gimp-progress-init' it does not change the displayed value.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("message",
+                                                       "message",
+                                                       "Message to use in the progress dialog",
+                                                       FALSE, TRUE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-end
+   */
+  procedure = gimp_procedure_new (progress_end_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-end");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-end",
+                                     "Ends the progress bar for the current plug-in.",
+                                     "Ends the progress display for the current plug-in. Most plug-ins don't need to call this, they just exit when the work is done. It is only valid to call this procedure from a plug-in.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2007",
+                                     NULL);
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-get-window-handle
+   */
+  procedure = gimp_procedure_new (progress_get_window_handle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-get-window-handle");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-get-window-handle",
+                                     "Returns the native window ID of the toplevel window this plug-in's progress is displayed in.",
+                                     "This function returns the native window ID of the toplevel window this plug-in\'s progress is displayed in.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("window",
+                                                          "window",
+                                                          "The progress bar's toplevel window",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-install
+   */
+  procedure = gimp_procedure_new (progress_install_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-install");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-install",
+                                     "Installs a progress callback for the current plug-in.",
+                                     "This function installs a temporary PDB procedure which will handle all progress calls made by this plug-in and any procedure it calls. Calling this function multiple times simply replaces the old progress callbacks.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("progress-callback",
+                                                       "progress callback",
+                                                       "The callback PDB proc to call",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-uninstall
+   */
+  procedure = gimp_procedure_new (progress_uninstall_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-uninstall");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-uninstall",
+                                     "Uninstalls the progress callback for the current plug-in.",
+                                     "This function uninstalls any progress callback installed with 'gimp-progress-install' before.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("progress-callback",
+                                                       "progress callback",
+                                                       "The name of the callback registered for this progress",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-progress-cancel
+   */
+  procedure = gimp_procedure_new (progress_cancel_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-progress-cancel");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-progress-cancel",
+                                     "Cancels a running progress.",
+                                     "This function cancels the currently running progress.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "2004",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("progress-callback",
+                                                       "progress callback",
+                                                       "The name of the callback registered for this progress",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/selection-cmds.c b/app/pdb/selection-cmds.c
new file mode 100644
index 0000000..fd24003
--- /dev/null
+++ b/app/pdb/selection-cmds.c
@@ -0,0 +1,1112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppickable.h"
+#include "core/gimpselection.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+selection_bounds_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean non_empty = FALSE;
+  gint32 x1 = 0;
+  gint32 y1 = 0;
+  gint32 x2 = 0;
+  gint32 y2 = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gint x, y, w, h;
+
+      non_empty = gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                                    &x, &y, &w, &h);
+
+      x1 = x;
+      y1 = y;
+      x2 = x + w;
+      y2 = y + h;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_boolean (gimp_value_array_index (return_vals, 1), non_empty);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), x1);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), y1);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), x2);
+      g_value_set_int (gimp_value_array_index (return_vals, 5), y2);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+selection_value_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gint32 x;
+  gint32 y;
+  gint32 value = 0;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_int (gimp_value_array_index (args, 1));
+  y = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gdouble val;
+
+      val= gimp_pickable_get_opacity_at (GIMP_PICKABLE (gimp_image_get_mask (image)),
+                                         x, y);
+
+      value = ROUND (CLAMP (val, 0.0, 1.0) * 255.0);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), value);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+selection_is_empty_invoker (GimpProcedure         *procedure,
+                            Gimp                  *gimp,
+                            GimpContext           *context,
+                            GimpProgress          *progress,
+                            const GimpValueArray  *args,
+                            GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  gboolean is_empty = FALSE;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      is_empty = gimp_channel_is_empty (gimp_image_get_mask (image));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), is_empty);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+selection_translate_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 offx;
+  gint32 offy;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  offx = g_value_get_int (gimp_value_array_index (args, 1));
+  offy = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gimp_item_translate (GIMP_ITEM (gimp_image_get_mask (image)),
+                           offx, offy, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_float_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 offx;
+  gint32 offy;
+  GimpLayer *layer = NULL;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  offx = g_value_get_int (gimp_value_array_index (args, 1));
+  offy = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                     GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+          layer = gimp_selection_float (GIMP_SELECTION (gimp_image_get_mask (image)),
+                                        drawable, context, TRUE, offx, offy,
+                                        error);
+          if (! layer)
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+selection_invert_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_channel_invert (gimp_image_get_mask (image), TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_sharpen_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_channel_sharpen (gimp_image_get_mask (image), TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_all_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_channel_all (gimp_image_get_mask (image), TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_none_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_feather_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble radius;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  radius = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      /* FIXME: "edge-lock" hardcoded to  TRUE */
+      gimp_channel_feather (gimp_image_get_mask (image),
+                            radius, radius, TRUE, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_border_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 radius;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  radius = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      /* FIXME: "style" and "edge-lock" hardcoded to SMOOTH and TRUE, respectively. */
+      gimp_channel_border (gimp_image_get_mask (image),
+                           radius, radius,
+                           GIMP_CHANNEL_BORDER_STYLE_SMOOTH,
+                           TRUE, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_grow_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 steps;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  steps = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_channel_grow (gimp_image_get_mask (image),
+                         steps, steps, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_shrink_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 steps;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  steps = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gimp_channel_shrink (gimp_image_get_mask (image),
+                           steps, steps, FALSE, TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_flood_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      gimp_channel_flood (gimp_image_get_mask (image), TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_layer_alpha_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, 0, error))
+        gimp_item_to_selection (GIMP_ITEM (layer),
+                                GIMP_CHANNEL_OP_REPLACE,
+                                TRUE, FALSE, 0.0, 0.0);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_load_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpChannel *channel;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), NULL, 0, error))
+        gimp_item_to_selection (GIMP_ITEM (channel),
+                                GIMP_CHANNEL_OP_REPLACE,
+                                TRUE, FALSE, 0.0, 0.0);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+selection_save_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpChannel *channel = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (gimp_image_get_mask (image)),
+                                                   GIMP_TYPE_CHANNEL));
+
+      if (channel)
+        {
+          /*  saved selections are not visible by default  */
+          gimp_item_set_visible (GIMP_ITEM (channel), FALSE, FALSE);
+
+          gimp_image_add_channel (image, channel,
+                                  GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_channel (gimp_value_array_index (return_vals, 1), channel);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+selection_combine_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpChannel *channel;
+  gint32 operation;
+
+  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), NULL, 0, error))
+        gimp_item_to_selection (GIMP_ITEM (channel),
+                                operation,
+                                TRUE, FALSE, 0.0, 0.0);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_selection_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-selection-bounds
+   */
+  procedure = gimp_procedure_new (selection_bounds_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-bounds");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-bounds",
+                                     "Find the bounding box of the current selection.",
+                                     "This procedure returns whether there is a selection for the specified image. If there is one, the upper left and lower right corners of the bounding box are returned. These coordinates are relative to the image. Please note that the pixel specified by the lower right coordinate of the bounding box is not part of the selection. The selection ends at the upper left corner of this pixel. This means the width of the selection can be calculated as (x2 - x1), its height as (y2 - y1).",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("non-empty",
+                                                         "non empty",
+                                                         "TRUE if there is a selection",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("x1",
+                                                          "x1",
+                                                          "x coordinate of upper left corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("y1",
+                                                          "y1",
+                                                          "y coordinate of upper left corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("x2",
+                                                          "x2",
+                                                          "x coordinate of lower right corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("y2",
+                                                          "y2",
+                                                          "y coordinate of lower right corner of selection bounds",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-value
+   */
+  procedure = gimp_procedure_new (selection_value_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-value");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-value",
+                                     "Find the value of the selection at the specified coordinates.",
+                                     "This procedure returns the value of the selection at the specified coordinates. If the coordinates lie out of bounds, 0 is returned.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("x",
+                                                      "x",
+                                                      "x coordinate of value",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("y",
+                                                      "y",
+                                                      "y coordinate of value",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("value",
+                                                          "value",
+                                                          "Value of the selection",
+                                                          0, 255, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-is-empty
+   */
+  procedure = gimp_procedure_new (selection_is_empty_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-is-empty");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-is-empty",
+                                     "Determine whether the selection is empty.",
+                                     "This procedure returns TRUE if the selection for the specified image is empty.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("is-empty",
+                                                         "is empty",
+                                                         "Is the selection empty?",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-translate
+   */
+  procedure = gimp_procedure_new (selection_translate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-translate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-translate",
+                                     "Translate the selection by the specified offsets.",
+                                     "This procedure actually translates the selection for the specified image by the specified offsets. Regions that are translated from beyond the bounds of the image are set to empty. Valid regions of the selection which are translated beyond the bounds of the image because of this call are lost.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "x offset for translation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "y offset for translation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-float
+   */
+  procedure = gimp_procedure_new (selection_float_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-float");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-float",
+                                     "Float the selection from the specified drawable with initial offsets as specified.",
+                                     "This procedure determines the region of the specified drawable that lies beneath the current selection. The region is then cut from the drawable and the resulting data is made into a new layer which is instantiated as a floating selection. The offsets allow initial positioning of the new floating selection.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The drawable from which to float selection",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offx",
+                                                      "offx",
+                                                      "x offset for translation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("offy",
+                                                      "offy",
+                                                      "y offset for translation",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The floated layer",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-invert
+   */
+  procedure = gimp_procedure_new (selection_invert_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-invert");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-invert",
+                                     "Invert the selection mask.",
+                                     "This procedure inverts the selection mask. For every pixel in the selection channel, its new value is calculated as (255 - old-value).",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-sharpen
+   */
+  procedure = gimp_procedure_new (selection_sharpen_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-sharpen");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-sharpen",
+                                     "Sharpen the selection mask.",
+                                     "This procedure sharpens the selection mask. For every pixel in the selection channel, if the value is > 127, the new pixel is assigned a value of 255. This removes any \"anti-aliasing\" that might exist in the selection mask's boundary.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-all
+   */
+  procedure = gimp_procedure_new (selection_all_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-all");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-all",
+                                     "Select all of the image.",
+                                     "This procedure sets the selection mask to completely encompass the image. Every pixel in the selection channel is set to 255.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-none
+   */
+  procedure = gimp_procedure_new (selection_none_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-none");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-none",
+                                     "Deselect the entire image.",
+                                     "This procedure deselects the entire image. Every pixel in the selection channel is set to 0.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-feather
+   */
+  procedure = gimp_procedure_new (selection_feather_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-feather");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-feather",
+                                     "Feather the image's selection",
+                                     "This procedure feathers the selection. Feathering is implemented using a gaussian blur.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius",
+                                                    "radius",
+                                                    "Radius of feather (in pixels)",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-border
+   */
+  procedure = gimp_procedure_new (selection_border_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-border");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-border",
+                                     "Border the image's selection",
+                                     "This procedure borders the selection. Bordering creates a new selection which is defined along the boundary of the previous selection at every point within the specified radius.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("radius",
+                                                      "radius",
+                                                      "Radius of border (in pixels)",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-grow
+   */
+  procedure = gimp_procedure_new (selection_grow_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-grow");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-grow",
+                                     "Grow the image's selection",
+                                     "This procedure grows the selection. Growing involves expanding the boundary in all directions by the specified pixel amount.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("steps",
+                                                      "steps",
+                                                      "Steps of grow (in pixels)",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-shrink
+   */
+  procedure = gimp_procedure_new (selection_shrink_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-shrink");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-shrink",
+                                     "Shrink the image's selection",
+                                     "This procedure shrinks the selection. Shrinking involves trimming the existing selection boundary on all sides by the specified number of pixels.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("steps",
+                                                      "steps",
+                                                      "Steps of shrink (in pixels)",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-flood
+   */
+  procedure = gimp_procedure_new (selection_flood_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-flood");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-flood",
+                                     "Remove holes from the image's selection",
+                                     "This procedure removes holes from the selection, that can come from selecting a patchy area with the Fuzzy Select Tool. In technical terms this procedure floods the selection. See the Algorithms page in the developer wiki for details.",
+                                     "Ell",
+                                     "Ell",
+                                     "2016",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-layer-alpha
+   */
+  procedure = gimp_procedure_new (selection_layer_alpha_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-layer-alpha");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-layer-alpha",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-item");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "Layer with alpha",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-load
+   */
+  procedure = gimp_procedure_new (selection_load_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-load");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-load",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-item");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-save
+   */
+  procedure = gimp_procedure_new (selection_save_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-save");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-save",
+                                     "Copy the selection mask to a new channel.",
+                                     "This procedure copies the selection mask and stores the content in a new channel. The new channel is automatically inserted into the image's list of channels.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_channel_id ("channel",
+                                                               "channel",
+                                                               "The new channel",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-selection-combine
+   */
+  procedure = gimp_procedure_new (selection_combine_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-selection-combine");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-selection-combine",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-item");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_channel_id ("channel",
+                                                           "channel",
+                                                           "The channel",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/selection-tools-cmds.c b/app/pdb/selection-tools-cmds.c
new file mode 100644
index 0000000..9ca50b5
--- /dev/null
+++ b/app/pdb/selection-tools-cmds.c
@@ -0,0 +1,1052 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpchannel-select.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+by_color_select_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpRGB color;
+  gint32 threshold;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius;
+  gboolean sample_merged;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 1), &color);
+  threshold = g_value_get_int (gimp_value_array_index (args, 2));
+  operation = g_value_get_enum (gimp_value_array_index (args, 3));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 4));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 5));
+  feather_radius = g_value_get_double (gimp_value_array_index (args, 6));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+      gimp_channel_select_by_color (gimp_image_get_mask (image), drawable,
+                                    sample_merged,
+                                    &color,
+                                    threshold / 255.0,
+                                    FALSE /* don't select transparent */,
+                                    GIMP_SELECT_CRITERION_COMPOSITE,
+                                    operation,
+                                    antialias,
+                                    feather,
+                                    feather_radius,
+                                    feather_radius);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+by_color_select_full_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  GimpRGB color;
+  gint32 threshold;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius_x;
+  gdouble feather_radius_y;
+  gboolean sample_merged;
+  gboolean select_transparent;
+  gint32 select_criterion;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 1), &color);
+  threshold = g_value_get_int (gimp_value_array_index (args, 2));
+  operation = g_value_get_enum (gimp_value_array_index (args, 3));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 4));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 5));
+  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 6));
+  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 7));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 8));
+  select_transparent = g_value_get_boolean (gimp_value_array_index (args, 9));
+  select_criterion = g_value_get_enum (gimp_value_array_index (args, 10));
+
+  if (success)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+      gimp_channel_select_by_color (gimp_image_get_mask (image), drawable,
+                                    sample_merged,
+                                    &color,
+                                    threshold / 255.0,
+                                    select_transparent,
+                                    select_criterion,
+                                    operation,
+                                    antialias,
+                                    feather,
+                                    feather_radius_x,
+                                    feather_radius_y);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+ellipse_select_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 1));
+  y = g_value_get_double (gimp_value_array_index (args, 2));
+  width = g_value_get_double (gimp_value_array_index (args, 3));
+  height = g_value_get_double (gimp_value_array_index (args, 4));
+  operation = g_value_get_enum (gimp_value_array_index (args, 5));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 6));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 7));
+  feather_radius = g_value_get_double (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      gimp_channel_select_ellipse (gimp_image_get_mask (image),
+                                   (gint) x, (gint) y,
+                                   (gint) width, (gint) height,
+                                   operation,
+                                   antialias,
+                                   feather,
+                                   feather_radius,
+                                   feather_radius,
+                                   TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+free_select_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gint32 num_segs;
+  const gdouble *segs;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  num_segs = g_value_get_int (gimp_value_array_index (args, 1));
+  segs = gimp_value_get_floatarray (gimp_value_array_index (args, 2));
+  operation = g_value_get_enum (gimp_value_array_index (args, 3));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 4));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 5));
+  feather_radius = g_value_get_double (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      gimp_channel_select_polygon (gimp_image_get_mask (image),
+                                   _("Free Select"),
+                                   num_segs / 2,
+                                   (GimpVector2 *) segs,
+                                   operation,
+                                   antialias,
+                                   feather,
+                                   feather_radius,
+                                   feather_radius,
+                                   TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+fuzzy_select_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble x;
+  gdouble y;
+  gint32 threshold;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius;
+  gboolean sample_merged;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 1));
+  y = g_value_get_double (gimp_value_array_index (args, 2));
+  threshold = g_value_get_int (gimp_value_array_index (args, 3));
+  operation = g_value_get_enum (gimp_value_array_index (args, 4));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 5));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 6));
+  feather_radius = g_value_get_double (gimp_value_array_index (args, 7));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+      gimp_channel_select_fuzzy (gimp_image_get_mask (image),
+                                 drawable,
+                                 sample_merged,
+                                 x, y,
+                                 threshold / 255.0,
+                                 FALSE /* don't select transparent */,
+                                 GIMP_SELECT_CRITERION_COMPOSITE,
+                                 FALSE /* no diagonal neighbors */,
+                                 operation,
+                                 antialias,
+                                 feather,
+                                 feather_radius,
+                                 feather_radius);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+fuzzy_select_full_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpDrawable *drawable;
+  gdouble x;
+  gdouble y;
+  gint32 threshold;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius_x;
+  gdouble feather_radius_y;
+  gboolean sample_merged;
+  gboolean select_transparent;
+  gint32 select_criterion;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 1));
+  y = g_value_get_double (gimp_value_array_index (args, 2));
+  threshold = g_value_get_int (gimp_value_array_index (args, 3));
+  operation = g_value_get_enum (gimp_value_array_index (args, 4));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 5));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 6));
+  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 7));
+  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 8));
+  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 9));
+  select_transparent = g_value_get_boolean (gimp_value_array_index (args, 10));
+  select_criterion = g_value_get_enum (gimp_value_array_index (args, 11));
+
+  if (success)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+      gimp_channel_select_fuzzy (gimp_image_get_mask (image),
+                                 drawable,
+                                 sample_merged,
+                                 x, y,
+                                 threshold / 255.0,
+                                 select_transparent,
+                                 select_criterion,
+                                 FALSE /* no diagonal neighbors */,
+                                 operation,
+                                 antialias,
+                                 feather,
+                                 feather_radius_x,
+                                 feather_radius_y);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+rect_select_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+  gint32 operation;
+  gboolean feather;
+  gdouble feather_radius;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 1));
+  y = g_value_get_double (gimp_value_array_index (args, 2));
+  width = g_value_get_double (gimp_value_array_index (args, 3));
+  height = g_value_get_double (gimp_value_array_index (args, 4));
+  operation = g_value_get_enum (gimp_value_array_index (args, 5));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 6));
+  feather_radius = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      gimp_channel_select_rectangle (gimp_image_get_mask (image),
+                                     (gint) x, (gint) y,
+                                     (gint) width, (gint) height,
+                                     operation,
+                                     feather,
+                                     feather_radius,
+                                     feather_radius,
+                                     TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+round_rect_select_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  gdouble x;
+  gdouble y;
+  gdouble width;
+  gdouble height;
+  gdouble corner_radius_x;
+  gdouble corner_radius_y;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius_x;
+  gdouble feather_radius_y;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 1));
+  y = g_value_get_double (gimp_value_array_index (args, 2));
+  width = g_value_get_double (gimp_value_array_index (args, 3));
+  height = g_value_get_double (gimp_value_array_index (args, 4));
+  corner_radius_x = g_value_get_double (gimp_value_array_index (args, 5));
+  corner_radius_y = g_value_get_double (gimp_value_array_index (args, 6));
+  operation = g_value_get_enum (gimp_value_array_index (args, 7));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 8));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 9));
+  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 10));
+  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 11));
+
+  if (success)
+    {
+      gimp_channel_select_round_rect (gimp_image_get_mask (image),
+                                      (gint) x, (gint) y,
+                                      (gint) width, (gint) height,
+                                      corner_radius_x,
+                                      corner_radius_y,
+                                      operation,
+                                      antialias,
+                                      feather,
+                                      feather_radius_x,
+                                      feather_radius_y,
+                                      TRUE);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_selection_tools_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-by-color-select
+   */
+  procedure = gimp_procedure_new (by_color_select_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-by-color-select");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-by-color-select",
+                                     "Deprecated: Use 'gimp-image-select-color' instead.",
+                                     "Deprecated: Use 'gimp-image-select-color' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-color");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The color to select",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Threshold in intensity levels",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius",
+                                                    "feather radius",
+                                                    "Radius for feather operation",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-by-color-select-full
+   */
+  procedure = gimp_procedure_new (by_color_select_full_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-by-color-select-full");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-by-color-select-full",
+                                     "Deprecated: Use 'gimp-image-select-color' instead.",
+                                     "Deprecated: Use 'gimp-image-select-color' instead.",
+                                     "David Gowers",
+                                     "David Gowers",
+                                     "2006",
+                                     "gimp-image-select-color");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The color to select",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Threshold in intensity levels",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-x",
+                                                    "feather radius x",
+                                                    "Radius for feather operation in X direction",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-y",
+                                                    "feather radius y",
+                                                    "Radius for feather operation in Y direction",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("select-transparent",
+                                                     "select transparent",
+                                                     "Whether to consider transparent pixels for selection. If TRUE, transparency is considered as a unique selectable color.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("select-criterion",
+                                                  "select criterion",
+                                                  "The criterion used to determine color similarity. SELECT_CRITERION_COMPOSITE is the standard choice.",
+                                                  GIMP_TYPE_SELECT_CRITERION,
+                                                  GIMP_SELECT_CRITERION_COMPOSITE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-ellipse-select
+   */
+  procedure = gimp_procedure_new (ellipse_select_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-ellipse-select");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-ellipse-select",
+                                     "Deprecated: Use 'gimp-image-select-ellipse' instead.",
+                                     "Deprecated: Use 'gimp-image-select-ellipse' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-ellipse");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of ellipse bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of ellipse bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The width of the ellipse",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The height of the ellipse",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius",
+                                                    "feather radius",
+                                                    "Radius for feather operation",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-free-select
+   */
+  procedure = gimp_procedure_new (free_select_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-free-select");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-free-select",
+                                     "Deprecated: Use 'gimp-image-select-polygon' instead.",
+                                     "Deprecated: Use 'gimp-image-select-polygon' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-polygon");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-segs",
+                                                      "num segs",
+                                                      "Number of points (count 1 coordinate as two points)",
+                                                      2, G_MAXINT32, 2,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("segs",
+                                                            "segs",
+                                                            "Array of points: { p1.x, p1.y, p2.x, p2.y, ..., pn.x, pn.y}",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius",
+                                                    "feather radius",
+                                                    "Radius for feather operation",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-fuzzy-select
+   */
+  procedure = gimp_procedure_new (fuzzy_select_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fuzzy-select");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fuzzy-select",
+                                     "Deprecated: Use 'gimp-image-select-contiguous-color' instead.",
+                                     "Deprecated: Use 'gimp-image-select-contiguous-color' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-contiguous-color");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of initial seed fill point: (image coordinates)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of initial seed fill point: (image coordinates)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Threshold in intensity levels",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius",
+                                                    "feather radius",
+                                                    "Radius for feather operation",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-fuzzy-select-full
+   */
+  procedure = gimp_procedure_new (fuzzy_select_full_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-fuzzy-select-full");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-fuzzy-select-full",
+                                     "Deprecated: Use 'gimp-image-select-contiguous-color' instead.",
+                                     "Deprecated: Use 'gimp-image-select-contiguous-color' instead.",
+                                     "David Gowers",
+                                     "David Gowers",
+                                     "2006",
+                                     "gimp-image-select-contiguous-color");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of initial seed fill point: (image coordinates)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of initial seed fill point: (image coordinates)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("threshold",
+                                                      "threshold",
+                                                      "Threshold in intensity levels",
+                                                      0, 255, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-x",
+                                                    "feather radius x",
+                                                    "Radius for feather operation in X direction",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-y",
+                                                    "feather radius y",
+                                                    "Radius for feather operation in Y direction",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("sample-merged",
+                                                     "sample merged",
+                                                     "Use the composite image, not the drawable",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("select-transparent",
+                                                     "select transparent",
+                                                     "Whether to consider transparent pixels for selection. If TRUE, transparency is considered as a unique selectable color.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("select-criterion",
+                                                  "select criterion",
+                                                  "The criterion used to determine color similarity. SELECT_CRITERION_COMPOSITE is the standard choice.",
+                                                  GIMP_TYPE_SELECT_CRITERION,
+                                                  GIMP_SELECT_CRITERION_COMPOSITE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-rect-select
+   */
+  procedure = gimp_procedure_new (rect_select_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-rect-select");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-rect-select",
+                                     "Deprecated: Use 'gimp-image-select-rectangle' instead.",
+                                     "Deprecated: Use 'gimp-image-select-rectangle' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-image-select-rectangle");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The width of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The height of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius",
+                                                    "feather radius",
+                                                    "Radius for feather operation",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-round-rect-select
+   */
+  procedure = gimp_procedure_new (round_rect_select_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-round-rect-select");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-round-rect-select",
+                                     "Deprecated: Use 'gimp-image-select-round-rectangle' instead.",
+                                     "Deprecated: Use 'gimp-image-select-round-rectangle' instead.",
+                                     "Martin Nordholts",
+                                     "Martin Nordholts",
+                                     "2006",
+                                     "gimp-image-select-round-rectangle");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "x coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "y coordinate of upper-left corner of rectangle",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The width of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The height of the rectangle",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("corner-radius-x",
+                                                    "corner radius x",
+                                                    "The corner radius in X direction",
+                                                    0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("corner-radius-y",
+                                                    "corner radius y",
+                                                    "The corner radius in Y direction",
+                                                    0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The selection operation",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather option for selections",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-x",
+                                                    "feather radius x",
+                                                    "Radius for feather operation in X direction",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-y",
+                                                    "feather radius y",
+                                                    "Radius for feather operation in Y direction",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/text-layer-cmds.c b/app/pdb/text-layer-cmds.c
new file mode 100644
index 0000000..5e7d91d
--- /dev/null
+++ b/app/pdb/text-layer-cmds.c
@@ -0,0 +1,2196 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <cairo.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "text/gimptext.h"
+#include "text/gimptextlayer.h"
+
+#include "gimppdb.h"
+#include "gimppdberror.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+text_layer_new_invoker (GimpProcedure         *procedure,
+                        Gimp                  *gimp,
+                        GimpContext           *context,
+                        GimpProgress          *progress,
+                        const GimpValueArray  *args,
+                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *text;
+  const gchar *fontname;
+  gdouble size;
+  GimpUnit unit;
+  GimpLayer *layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  text = g_value_get_string (gimp_value_array_index (args, 1));
+  fontname = g_value_get_string (gimp_value_array_index (args, 2));
+  size = g_value_get_double (gimp_value_array_index (args, 3));
+  unit = g_value_get_int (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpText *gimp_text;
+      GimpRGB   color;
+
+      gimp_context_get_foreground (context, &color);
+
+      gimp_text = g_object_new (GIMP_TYPE_TEXT,
+                                "text",           text,
+                                "font",           fontname,
+                                "font-size",      size,
+                                "font-size-unit", unit,
+                                "color",          &color,
+                                NULL);
+
+      layer = gimp_text_layer_new (image, gimp_text);
+      g_object_unref (gimp_text);
+
+      if (! layer)
+        {
+          g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+                       _("Failed to create text layer"));
+
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_get_text_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gchar *text = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "text", &text,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), text);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_text_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  const gchar *text;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  text = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "text", text,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_markup_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gchar *markup = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "markup", &markup,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), markup);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_get_font_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gchar *font = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "font", &font,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), font);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_font_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  const gchar *font;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  font = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "font", font,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_font_size_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gdouble font_size = 0.0;
+  GimpUnit unit = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "font-size",      &font_size,
+                        "font-size-unit", &unit,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), font_size);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), unit);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_font_size_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gdouble font_size;
+  GimpUnit unit;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  font_size = g_value_get_double (gimp_value_array_index (args, 1));
+  unit = g_value_get_int (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "font-size-unit", unit,
+                               "font-size",      font_size,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_antialias_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean antialias = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "antialias", &antialias,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), antialias);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_antialias_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean antialias;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "antialias", antialias,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_hint_style_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 style = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "hint-style", &style,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), style);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_hint_style_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 style;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  style = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "hint-style", style,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_kerning_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean kerning = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "kerning", &kerning,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), kerning);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_kerning_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean kerning;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  kerning = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "kerning", kerning,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_language_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gchar *language = NULL;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "language", &language,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), language);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_language_invoker (GimpProcedure         *procedure,
+                                 Gimp                  *gimp,
+                                 GimpContext           *context,
+                                 GimpProgress          *progress,
+                                 const GimpValueArray  *args,
+                                 GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  const gchar *language;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  language = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "language", language,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_base_direction_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 direction = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "base-direction", &direction,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), direction);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_base_direction_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 direction;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  direction = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "base-direction", direction,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_justification_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gint32 justify = 0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "justify", &justify,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_enum (gimp_value_array_index (return_vals, 1), justify);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_justification_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gint32 justify;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  justify = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "justify", justify,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_color_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          color = gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer))->color;
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_rgb (gimp_value_array_index (return_vals, 1), &color);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_color_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  GimpRGB color;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  gimp_value_get_rgb (gimp_value_array_index (args, 1), &color);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "color", &color,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_indent_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gdouble indent = 0.0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "indent", &indent,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), indent);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_indent_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gdouble indent;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  indent = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "indent", indent,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_line_spacing_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gdouble line_spacing = 0.0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "line-spacing", &line_spacing,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), line_spacing);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_line_spacing_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gdouble line_spacing;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  line_spacing = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "line-spacing", line_spacing,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_letter_spacing_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gdouble letter_spacing = 0.0;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "letter-spacing", &letter_spacing,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), letter_spacing);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_letter_spacing_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gdouble letter_spacing;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  letter_spacing = g_value_get_double (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "letter-spacing", letter_spacing,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_resize_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gdouble width;
+  gdouble height;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  width = g_value_get_double (gimp_value_array_index (args, 1));
+  height = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          GimpText *text = gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer));
+          gdouble   xres, yres;
+
+          gimp_image_get_resolution (gimp_item_get_image (GIMP_ITEM (layer)),
+                                     &xres, &yres);
+
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "box-mode",   GIMP_TEXT_BOX_FIXED,
+                               "box-width",  gimp_pixels_to_units (width,
+                                                                   text->box_unit,
+                                                                   xres),
+                               "box-height", gimp_pixels_to_units (height,
+                                                                   text->box_unit,
+                                                                   yres),
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+text_layer_get_hinting_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpLayer *layer;
+  gboolean hinting = FALSE;
+  gboolean autohint = FALSE;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
+                        "hinting", &hinting,
+                        NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_boolean (gimp_value_array_index (return_vals, 1), hinting);
+      g_value_set_boolean (gimp_value_array_index (return_vals, 2), autohint);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_layer_set_hinting_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpLayer *layer;
+  gboolean hinting;
+
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
+  hinting = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
+        {
+          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
+                               _("Set text layer attribute"),
+                               "hinting", hinting,
+                               NULL);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+void
+register_text_layer_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-text-layer-new
+   */
+  procedure = gimp_procedure_new (text_layer_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-new",
+                                     "Creates a new text layer.",
+                                     "This procedure creates a new text layer. The arguments are kept as simple as necessary for the normal case. All text attributes, however, can be modified with the appropriate gimp_text_layer_set_*() procedures. The new layer still needs to be added to the image, as this is not automatic. Add the new layer using 'gimp-image-insert-layer'.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("text",
+                                                       "text",
+                                                       "The text to generate (in UTF-8 encoding)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("fontname",
+                                                       "fontname",
+                                                       "The name of the font",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "The size of text in either pixels or points",
+                                                    0.0, 8192.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit",
+                                                     "unit",
+                                                     "The units of specified size",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("layer",
+                                                             "layer",
+                                                             "The new text layer.",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-text
+   */
+  procedure = gimp_procedure_new (text_layer_get_text_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-text");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-text",
+                                     "Get the text from a text layer as string.",
+                                     "This procedure returns the text from a text layer as a string.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("text",
+                                                           "text",
+                                                           "The text from the specified text layer.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-text
+   */
+  procedure = gimp_procedure_new (text_layer_set_text_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-text");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-text",
+                                     "Set the text of a text layer.",
+                                     "This procedure changes the text of a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("text",
+                                                       "text",
+                                                       "The new text to set",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-markup
+   */
+  procedure = gimp_procedure_new (text_layer_get_markup_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-markup");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-markup",
+                                     "Get the markup from a text layer as string.",
+                                     "This procedure returns the markup of the styles from a text layer. The markup will be in the form of Pango's markup - See https://www.pango.org/ for more information about Pango and its markup. Note: Setting the markup of a text layer using Pango's markup is not supported for now.",
+                                     "Barak Itkin <lightningismyname@gmail.com>",
+                                     "Barak Itkin",
+                                     "2010",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("markup",
+                                                           "markup",
+                                                           "The markup which represents the style of the specified text layer.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-font
+   */
+  procedure = gimp_procedure_new (text_layer_get_font_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-font");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-font",
+                                     "Get the font from a text layer as string.",
+                                     "This procedure returns the name of the font from a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("font",
+                                                           "font",
+                                                           "The font which is used in the specified text layer.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-font
+   */
+  procedure = gimp_procedure_new (text_layer_set_font_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-font");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-font",
+                                     "Set the font of a text layer.",
+                                     "This procedure modifies the font used in the specified text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("font",
+                                                       "font",
+                                                       "The new font to use",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-font-size
+   */
+  procedure = gimp_procedure_new (text_layer_get_font_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-font-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-font-size",
+                                     "Get the font size from a text layer.",
+                                     "This procedure returns the size of the font which is used in a text layer. You will receive the size as a float 'font-size' in 'unit' units.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("font-size",
+                                                        "font size",
+                                                        "The font size",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_unit ("unit",
+                                                         "unit",
+                                                         "The unit used for the font size",
+                                                         TRUE,
+                                                         FALSE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-font-size
+   */
+  procedure = gimp_procedure_new (text_layer_set_font_size_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-font-size");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-font-size",
+                                     "Set the font size.",
+                                     "This procedure changes the font size of a text layer. The size of your font will be a double 'font-size' of 'unit' units.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("font-size",
+                                                    "font size",
+                                                    "The font size",
+                                                    0.0, 8192.0, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit",
+                                                     "unit",
+                                                     "The unit to use for the font size",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-antialias
+   */
+  procedure = gimp_procedure_new (text_layer_get_antialias_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-antialias");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-antialias",
+                                     "Check if antialiasing is used in the text layer.",
+                                     "This procedure checks if antialiasing is enabled in the specified text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("antialias",
+                                                         "antialias",
+                                                         "A flag which is true if antialiasing is used for rendering the font in the text layer.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-antialias
+   */
+  procedure = gimp_procedure_new (text_layer_set_antialias_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-antialias");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-antialias",
+                                     "Enable/disable anti-aliasing in a text layer.",
+                                     "This procedure enables or disables anti-aliasing of the text in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Enable/disable antialiasing of the text",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-hint-style
+   */
+  procedure = gimp_procedure_new (text_layer_get_hint_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-hint-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-hint-style",
+                                     "Get information about hinting in the specified text layer.",
+                                     "This procedure provides information about the hinting that is being used in a text layer. Hinting can be optimized for fidelity or contrast or it can be turned entirely off.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("style",
+                                                      "style",
+                                                      "The hint style used for font outlines",
+                                                      GIMP_TYPE_TEXT_HINT_STYLE,
+                                                      GIMP_TEXT_HINT_STYLE_NONE,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-hint-style
+   */
+  procedure = gimp_procedure_new (text_layer_set_hint_style_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-hint-style");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-hint-style",
+                                     "Control how font outlines are hinted in a text layer.",
+                                     "This procedure sets the hint style for font outlines in a text layer. This controls whether to fit font outlines to the pixel grid, and if so, whether to optimize for fidelity or contrast.",
+                                     "Sven Neumann <sven@gimp.org>",
+                                     "Sven Neumann",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("style",
+                                                  "style",
+                                                  "The new hint style",
+                                                  GIMP_TYPE_TEXT_HINT_STYLE,
+                                                  GIMP_TEXT_HINT_STYLE_NONE,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-kerning
+   */
+  procedure = gimp_procedure_new (text_layer_get_kerning_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-kerning");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-kerning",
+                                     "Check if kerning is used in the text layer.",
+                                     "This procedure checks if kerning is enabled in the specified text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("kerning",
+                                                         "kerning",
+                                                         "A flag which is true if kerning is used in the text layer.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-kerning
+   */
+  procedure = gimp_procedure_new (text_layer_set_kerning_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-kerning");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-kerning",
+                                     "Enable/disable kerning in a text layer.",
+                                     "This procedure enables or disables kerning in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("kerning",
+                                                     "kerning",
+                                                     "Enable/disable kerning in the text",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-language
+   */
+  procedure = gimp_procedure_new (text_layer_get_language_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-language");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-language",
+                                     "Get the language used in the text layer.",
+                                     "This procedure returns the language string which is set for the text in the text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("language",
+                                                           "language",
+                                                           "The language used in the text layer.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-language
+   */
+  procedure = gimp_procedure_new (text_layer_set_language_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-language");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-language",
+                                     "Set the language of the text layer.",
+                                     "This procedure sets the language of the text in text layer. For some scripts the language has an influence of how the text is rendered.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("language",
+                                                       "language",
+                                                       "The new language to use for the text layer",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-base-direction
+   */
+  procedure = gimp_procedure_new (text_layer_get_base_direction_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-base-direction");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-base-direction",
+                                     "Get the base direction used for rendering the text layer.",
+                                     "This procedure returns the base direction used for rendering the text in the text layer",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("direction",
+                                                      "direction",
+                                                      "The based direction used for the text layer.",
+                                                      GIMP_TYPE_TEXT_DIRECTION,
+                                                      GIMP_TEXT_DIRECTION_LTR,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-base-direction
+   */
+  procedure = gimp_procedure_new (text_layer_set_base_direction_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-base-direction");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-base-direction",
+                                     "Set the base direction in the text layer.",
+                                     "This procedure sets the base direction used in applying the Unicode bidirectional algorithm when rendering the text.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("direction",
+                                                  "direction",
+                                                  "The base direction of the text.",
+                                                  GIMP_TYPE_TEXT_DIRECTION,
+                                                  GIMP_TEXT_DIRECTION_LTR,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-justification
+   */
+  procedure = gimp_procedure_new (text_layer_get_justification_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-justification");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-justification",
+                                     "Get the text justification information of the text layer.",
+                                     "This procedure returns the alignment of the lines in the text layer relative to each other.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("justify",
+                                                      "justify",
+                                                      "The justification used in the text layer.",
+                                                      GIMP_TYPE_TEXT_JUSTIFICATION,
+                                                      GIMP_TEXT_JUSTIFY_LEFT,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-justification
+   */
+  procedure = gimp_procedure_new (text_layer_set_justification_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-justification");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-justification",
+                                     "Set the justification of the text in a text layer.",
+                                     "This procedure sets the alignment of the lines in the text layer relative to each other.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("justify",
+                                                  "justify",
+                                                  "The justification for your text.",
+                                                  GIMP_TYPE_TEXT_JUSTIFICATION,
+                                                  GIMP_TEXT_JUSTIFY_LEFT,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-color
+   */
+  procedure = gimp_procedure_new (text_layer_get_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-color",
+                                     "Get the color of the text in a text layer.",
+                                     "This procedure returns the color of the text in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_rgb ("color",
+                                                        "color",
+                                                        "The color of the text.",
+                                                        FALSE,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-color
+   */
+  procedure = gimp_procedure_new (text_layer_set_color_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-color");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-color",
+                                     "Set the color of the text in the text layer.",
+                                     "This procedure sets the text color in the text layer 'layer'.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_rgb ("color",
+                                                    "color",
+                                                    "The color to use for the text",
+                                                    FALSE,
+                                                    NULL,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-indent
+   */
+  procedure = gimp_procedure_new (text_layer_get_indent_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-indent");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-indent",
+                                     "Get the line indentation of text layer.",
+                                     "This procedure returns the indentation of the first line in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("indent",
+                                                        "indent",
+                                                        "The indentation value of the first line.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-indent
+   */
+  procedure = gimp_procedure_new (text_layer_set_indent_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-indent");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-indent",
+                                     "Set the indentation of the first line in a text layer.",
+                                     "This procedure sets the indentation of the first line in the text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("indent",
+                                                    "indent",
+                                                    "The indentation for the first line.",
+                                                    -8192.0, 8192.0, -8192.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-line-spacing
+   */
+  procedure = gimp_procedure_new (text_layer_get_line_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-line-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-line-spacing",
+                                     "Get the spacing between lines of text.",
+                                     "This procedure returns the line-spacing between lines of text in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("line-spacing",
+                                                        "line spacing",
+                                                        "The line-spacing value.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-line-spacing
+   */
+  procedure = gimp_procedure_new (text_layer_set_line_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-line-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-line-spacing",
+                                     "Adjust the line spacing in a text layer.",
+                                     "This procedure sets the additional spacing used between lines a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("line-spacing",
+                                                    "line spacing",
+                                                    "The additional line spacing to use.",
+                                                    -8192.0, 8192.0, -8192.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-letter-spacing
+   */
+  procedure = gimp_procedure_new (text_layer_get_letter_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-letter-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-letter-spacing",
+                                     "Get the letter spacing used in a text layer.",
+                                     "This procedure returns the additional spacing between the single glyphs in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("letter-spacing",
+                                                        "letter spacing",
+                                                        "The letter-spacing value.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-letter-spacing
+   */
+  procedure = gimp_procedure_new (text_layer_set_letter_spacing_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-letter-spacing");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-letter-spacing",
+                                     "Adjust the letter spacing in a text layer.",
+                                     "This procedure sets the additional spacing between the single glyphs in a text layer.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("letter-spacing",
+                                                    "letter spacing",
+                                                    "The additional letter spacing to use.",
+                                                    -8192.0, 8192.0, -8192.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-resize
+   */
+  procedure = gimp_procedure_new (text_layer_resize_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-resize");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-resize",
+                                     "Resize the box of a text layer.",
+                                     "This procedure changes the width and height of a text layer while keeping it as a text layer and not converting it to a bitmap like 'gimp-layer-resize' would do.",
+                                     "Barak Itkin <lightningismyname@gmail.com>",
+                                     "Barak Itkin",
+                                     "2009",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("width",
+                                                    "width",
+                                                    "The new box width in pixels",
+                                                    0.0, GIMP_MAX_IMAGE_SIZE, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("height",
+                                                    "height",
+                                                    "The new box height in pixels",
+                                                    0.0, GIMP_MAX_IMAGE_SIZE, 0.0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-get-hinting
+   */
+  procedure = gimp_procedure_new (text_layer_get_hinting_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-get-hinting");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-get-hinting",
+                                     "Deprecated: Use 'gimp-text-layer-get-hint-style' instead.",
+                                     "Deprecated: Use 'gimp-text-layer-get-hint-style' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-text-layer-get-hint-style");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("hinting",
+                                                         "hinting",
+                                                         "A flag which is true if hinting is used on the font.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("autohint",
+                                                         "autohint",
+                                                         "A flag which is true if the text layer is forced to use the autohinter from FreeType.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-layer-set-hinting
+   */
+  procedure = gimp_procedure_new (text_layer_set_hinting_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-layer-set-hinting");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-layer-set-hinting",
+                                     "Enable/disable the use of hinting in a text layer.",
+                                     "This procedure enables or disables hinting on the text of a text layer. If you enable 'auto-hint', FreeType\'s automatic hinter will be used and hinting information from the font will be ignored.\n"
+                                     "\n"
+                                     "Deprecated: Use 'gimp-text-layer-set-hint-style' instead.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     "gimp-text-layer-set-hint-style");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("hinting",
+                                                     "hinting",
+                                                     "Enable/disable the use of hinting on the text",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("autohint",
+                                                     "autohint",
+                                                     "Force the use of the autohinter provided through FreeType",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/text-tool-cmds.c b/app/pdb/text-tool-cmds.c
new file mode 100644
index 0000000..e3c5210
--- /dev/null
+++ b/app/pdb/text-tool-cmds.c
@@ -0,0 +1,670 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
+#include "text/gimptext-compat.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+text_fontname_invoker (GimpProcedure         *procedure,
+                       Gimp                  *gimp,
+                       GimpContext           *context,
+                       GimpProgress          *progress,
+                       const GimpValueArray  *args,
+                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpDrawable *drawable;
+  gdouble x;
+  gdouble y;
+  const gchar *text;
+  gint32 border;
+  gboolean antialias;
+  gdouble size;
+  const gchar *fontname;
+  GimpLayer *text_layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+  text = g_value_get_string (gimp_value_array_index (args, 4));
+  border = g_value_get_int (gimp_value_array_index (args, 5));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 6));
+  size = g_value_get_double (gimp_value_array_index (args, 7));
+  fontname = g_value_get_string (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      if (drawable &&
+          (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), image,
+                                        GIMP_PDB_ITEM_CONTENT, error) ||
+           ! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)))
+        success = FALSE;
+
+      if (success)
+        {
+          gchar *real_fontname = g_strdup_printf ("%s %d", fontname, (gint) size);
+
+          text_layer = text_render (image, drawable, context,
+                                    x, y, real_fontname, text,
+                                    border, antialias);
+
+          g_free (real_fontname);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), text_layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_get_extents_fontname_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *text;
+  gdouble size;
+  const gchar *fontname;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 ascent = 0;
+  gint32 descent = 0;
+
+  text = g_value_get_string (gimp_value_array_index (args, 0));
+  size = g_value_get_double (gimp_value_array_index (args, 1));
+  fontname = g_value_get_string (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      gchar *real_fontname = g_strdup_printf ("%s %d", fontname, (gint) size);
+
+      success = text_get_extents (gimp,
+                                  real_fontname, text,
+                                  &width, &height,
+                                  &ascent, &descent);
+
+      g_free (real_fontname);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), ascent);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), descent);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_invoker (GimpProcedure         *procedure,
+              Gimp                  *gimp,
+              GimpContext           *context,
+              GimpProgress          *progress,
+              const GimpValueArray  *args,
+              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpDrawable *drawable;
+  gdouble x;
+  gdouble y;
+  const gchar *text;
+  gint32 border;
+  gboolean antialias;
+  gdouble size;
+  const gchar *family;
+  GimpLayer *text_layer = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
+  x = g_value_get_double (gimp_value_array_index (args, 2));
+  y = g_value_get_double (gimp_value_array_index (args, 3));
+  text = g_value_get_string (gimp_value_array_index (args, 4));
+  border = g_value_get_int (gimp_value_array_index (args, 5));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 6));
+  size = g_value_get_double (gimp_value_array_index (args, 7));
+  family = g_value_get_string (gimp_value_array_index (args, 10));
+
+  if (success)
+    {
+      if (drawable &&
+          (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), image,
+                                        GIMP_PDB_ITEM_CONTENT, error) ||
+           ! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)))
+        success = FALSE;
+
+      if (success)
+        {
+          gchar *real_fontname = g_strdup_printf ("%s %d", family, (gint) size);
+
+          text_layer = text_render (image, drawable, context,
+                                    x, y, real_fontname, text,
+                                    border, antialias);
+
+          g_free (real_fontname);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), text_layer);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+text_get_extents_invoker (GimpProcedure         *procedure,
+                          Gimp                  *gimp,
+                          GimpContext           *context,
+                          GimpProgress          *progress,
+                          const GimpValueArray  *args,
+                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *text;
+  gdouble size;
+  const gchar *family;
+  gint32 width = 0;
+  gint32 height = 0;
+  gint32 ascent = 0;
+  gint32 descent = 0;
+
+  text = g_value_get_string (gimp_value_array_index (args, 0));
+  size = g_value_get_double (gimp_value_array_index (args, 1));
+  family = g_value_get_string (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      gchar *real_fontname = g_strdup_printf ("%s %d", family, (gint) size);
+
+      success = text_get_extents (gimp,
+                                  real_fontname, text,
+                                  &width, &height,
+                                  &ascent, &descent);
+
+      g_free (real_fontname);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
+      g_value_set_int (gimp_value_array_index (return_vals, 3), ascent);
+      g_value_set_int (gimp_value_array_index (return_vals, 4), descent);
+    }
+
+  return return_vals;
+}
+
+void
+register_text_tool_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-text-fontname
+   */
+  procedure = gimp_procedure_new (text_fontname_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-fontname");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-fontname",
+                                     "Add text at the specified location as a floating selection or a new layer.",
+                                     "This tool requires a fontname matching an installed PangoFT2 font. You can specify the fontsize in units of pixels or points, and the appropriate metric is specified using the size_type argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the specified drawable parameter is valid, the text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixels. Parameter size-type is not used and is currently ignored. If you need to display a font in points, divide the size in points by 72.0 and multiply it by the image's vertical resolution.",
+                                     "Martin Edlman & Sven Neumann",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1998- 2001",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable: (-1 for a new text layer)",
+                                                            pdb->gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "The x coordinate for the left of the text bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "The y coordinate for the top of the text bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("text",
+                                                       "text",
+                                                       "The text to generate (in UTF-8 encoding)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("border",
+                                                      "border",
+                                                      "The size of the border",
+                                                      -1, G_MAXINT32, -1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "The size of text in either pixels or points",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("size-type",
+                                                  "size type",
+                                                  "The units of specified size",
+                                                  GIMP_TYPE_SIZE_TYPE,
+                                                  GIMP_PIXELS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("fontname",
+                                                       "fontname",
+                                                       "The name of the font",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("text-layer",
+                                                             "text layer",
+                                                             "The new text layer or -1 if no layer was created.",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-get-extents-fontname
+   */
+  procedure = gimp_procedure_new (text_get_extents_fontname_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-get-extents-fontname");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-get-extents-fontname",
+                                     "Get extents of the bounding box for the specified text.",
+                                     "This tool returns the width and height of a bounding box for the specified text string with the specified font information. Ascent and descent for the specified font are returned as well. Parameter size-type is not used and is currently ignored. If you need to display a font in points, divide the size in points by 72.0 and multiply it by the vertical resolution of the image you are taking into account.",
+                                     "Martin Edlman & Sven Neumann",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1998- 2001",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("text",
+                                                       "text",
+                                                       "The text to generate (in UTF-8 encoding)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "The size of text in either pixels or points",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("size-type",
+                                                  "size type",
+                                                  "The units of specified size",
+                                                  GIMP_TYPE_SIZE_TYPE,
+                                                  GIMP_PIXELS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("fontname",
+                                                       "fontname",
+                                                       "The name of the font",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The width of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The height of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("ascent",
+                                                          "ascent",
+                                                          "The ascent of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("descent",
+                                                          "descent",
+                                                          "The descent of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text
+   */
+  procedure = gimp_procedure_new (text_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text",
+                                     "Deprecated: Use 'gimp-text-fontname' instead.",
+                                     "Deprecated: Use 'gimp-text-fontname' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-text-fontname");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable: (-1 for a new text layer)",
+                                                            pdb->gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x",
+                                                    "x",
+                                                    "The x coordinate for the left of the text bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y",
+                                                    "y",
+                                                    "The y coordinate for the top of the text bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("text",
+                                                       "text",
+                                                       "The text to generate (in UTF-8 encoding)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("border",
+                                                      "border",
+                                                      "The size of the border",
+                                                      -1, G_MAXINT32, -1,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialiasing",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "The size of text in either pixels or points",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("size-type",
+                                                  "size type",
+                                                  "The units of specified size",
+                                                  GIMP_TYPE_SIZE_TYPE,
+                                                  GIMP_PIXELS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("foundry",
+                                                       "foundry",
+                                                       "The font foundry",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("family",
+                                                       "family",
+                                                       "The font family",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("weight",
+                                                       "weight",
+                                                       "The font weight",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("slant",
+                                                       "slant",
+                                                       "The font slant",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("set-width",
+                                                       "set width",
+                                                       "The font set-width",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("spacing",
+                                                       "spacing",
+                                                       "The font spacing",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("registry",
+                                                       "registry",
+                                                       "The font registry",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("encoding",
+                                                       "encoding",
+                                                       "The font encoding",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_layer_id ("text-layer",
+                                                             "text layer",
+                                                             "The new text layer or -1 if no layer was created.",
+                                                             pdb->gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-text-get-extents
+   */
+  procedure = gimp_procedure_new (text_get_extents_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-text-get-extents");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-text-get-extents",
+                                     "Deprecated: Use 'gimp-text-get-extents-fontname' instead.",
+                                     "Deprecated: Use 'gimp-text-get-extents-fontname' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-text-get-extents-fontname");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("text",
+                                                       "text",
+                                                       "The text to generate (in UTF-8 encoding)",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("size",
+                                                    "size",
+                                                    "The size of text in either pixels or points",
+                                                    0, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("size-type",
+                                                  "size type",
+                                                  "The units of specified size",
+                                                  GIMP_TYPE_SIZE_TYPE,
+                                                  GIMP_PIXELS,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("foundry",
+                                                       "foundry",
+                                                       "The font foundry",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("family",
+                                                       "family",
+                                                       "The font family",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("weight",
+                                                       "weight",
+                                                       "The font weight",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("slant",
+                                                       "slant",
+                                                       "The font slant",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("set-width",
+                                                       "set width",
+                                                       "The font set-width",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("spacing",
+                                                       "spacing",
+                                                       "The font spacing",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("registry",
+                                                       "registry",
+                                                       "The font registry",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("encoding",
+                                                       "encoding",
+                                                       "The font encoding",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("width",
+                                                          "width",
+                                                          "The width of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("height",
+                                                          "height",
+                                                          "The height of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("ascent",
+                                                          "ascent",
+                                                          "The ascent of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("descent",
+                                                          "descent",
+                                                          "The descent of the specified font",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/transform-tools-cmds.c b/app/pdb/transform-tools-cmds.c
new file mode 100644
index 0000000..793b10a
--- /dev/null
+++ b/app/pdb/transform-tools-cmds.c
@@ -0,0 +1,934 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "config/gimpcoreconfig.h"
+#include "core/gimp-transform-utils.h"
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable-transform.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+flip_invoker (GimpProcedure         *procedure,
+              Gimp                  *gimp,
+              GimpContext           *context,
+              GimpProgress          *progress,
+              const GimpValueArray  *args,
+              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gint32 flip_type;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  flip_type = g_value_get_enum (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage   *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel *mask  = gimp_image_get_mask (image);
+          gdouble      axis;
+
+          gimp_transform_get_flip_axis (x, y, width, height,
+                                        flip_type, TRUE, &axis);
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_flip (drawable, context,
+                                                  flip_type, axis, FALSE))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              gimp_item_flip (GIMP_ITEM (drawable), context,
+                              flip_type, axis,
+                              gimp_item_get_clip (GIMP_ITEM (drawable), FALSE));
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+perspective_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean interpolation;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+  gdouble x3;
+  gdouble y3;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  interpolation = g_value_get_boolean (gimp_value_array_index (args, 1));
+  x0 = g_value_get_double (gimp_value_array_index (args, 2));
+  y0 = g_value_get_double (gimp_value_array_index (args, 3));
+  x1 = g_value_get_double (gimp_value_array_index (args, 4));
+  y1 = g_value_get_double (gimp_value_array_index (args, 5));
+  x2 = g_value_get_double (gimp_value_array_index (args, 6));
+  y2 = g_value_get_double (gimp_value_array_index (args, 7));
+  x3 = g_value_get_double (gimp_value_array_index (args, 8));
+  y3 = g_value_get_double (gimp_value_array_index (args, 9));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_perspective (&matrix,
+                                             x, y, width, height,
+                                             x0, y0, x1, y1,
+                                             x2, y2, x3, y3);
+
+          if (interpolation)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Perspective"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix,
+                                                    GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    FALSE, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation,
+                                   gimp_item_get_clip (GIMP_ITEM (drawable), FALSE),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+rotate_invoker (GimpProcedure         *procedure,
+                Gimp                  *gimp,
+                GimpContext           *context,
+                GimpProgress          *progress,
+                const GimpValueArray  *args,
+                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean interpolation;
+  gdouble angle;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  interpolation = g_value_get_boolean (gimp_value_array_index (args, 1));
+  angle = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_rotate_rect (&matrix,
+                                             x, y, width, height,
+                                             angle);
+
+          if (interpolation)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Rotating"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix,
+                                                    GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    FALSE, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation,
+                                   gimp_item_get_clip (GIMP_ITEM (drawable), FALSE),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+scale_invoker (GimpProcedure         *procedure,
+               Gimp                  *gimp,
+               GimpContext           *context,
+               GimpProgress          *progress,
+               const GimpValueArray  *args,
+               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean interpolation;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  interpolation = g_value_get_boolean (gimp_value_array_index (args, 1));
+  x0 = g_value_get_double (gimp_value_array_index (args, 2));
+  y0 = g_value_get_double (gimp_value_array_index (args, 3));
+  x1 = g_value_get_double (gimp_value_array_index (args, 4));
+  y1 = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                            GIMP_PDB_ITEM_CONTENT |
+                                            GIMP_PDB_ITEM_POSITION, error) &&
+                 x0 < x1 && y0 < y1);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_scale (&matrix,
+                                       x, y, width, height,
+                                       x0, y0, x1 - x0, y1 - y0);
+
+          if (interpolation)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Scaling"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix,
+                                                    GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    FALSE, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation,
+                                   gimp_item_get_clip (GIMP_ITEM (drawable), FALSE),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+shear_invoker (GimpProcedure         *procedure,
+               Gimp                  *gimp,
+               GimpContext           *context,
+               GimpProgress          *progress,
+               const GimpValueArray  *args,
+               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean interpolation;
+  gint32 shear_type;
+  gdouble magnitude;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  interpolation = g_value_get_boolean (gimp_value_array_index (args, 1));
+  shear_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  magnitude = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+          gint                   off_x, off_y;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+          x += off_x;
+          y += off_y;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity (&matrix);
+          gimp_transform_matrix_shear (&matrix,
+                                       x, y, width, height,
+                                       shear_type, magnitude);
+
+          if (interpolation)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("Shearing"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix,
+                                                    GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    FALSE, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation,
+                                   gimp_item_get_clip (GIMP_ITEM (drawable), FALSE),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+transform_2d_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpDrawable *drawable;
+  gboolean interpolation;
+  gdouble source_x;
+  gdouble source_y;
+  gdouble scale_x;
+  gdouble scale_y;
+  gdouble angle;
+  gdouble dest_x;
+  gdouble dest_y;
+
+  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
+  interpolation = g_value_get_boolean (gimp_value_array_index (args, 1));
+  source_x = g_value_get_double (gimp_value_array_index (args, 2));
+  source_y = g_value_get_double (gimp_value_array_index (args, 3));
+  scale_x = g_value_get_double (gimp_value_array_index (args, 4));
+  scale_y = g_value_get_double (gimp_value_array_index (args, 5));
+  angle = g_value_get_double (gimp_value_array_index (args, 6));
+  dest_x = g_value_get_double (gimp_value_array_index (args, 7));
+  dest_y = g_value_get_double (gimp_value_array_index (args, 8));
+
+  if (success)
+    {
+      gint x, y, width, height;
+
+      success = gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+                                           GIMP_PDB_ITEM_CONTENT |
+                                           GIMP_PDB_ITEM_POSITION, error);
+
+      if (success &&
+          gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
+        {
+          GimpImage             *image = gimp_item_get_image (GIMP_ITEM (drawable));
+          GimpChannel           *mask  = gimp_image_get_mask (image);
+          GimpMatrix3            matrix;
+          GimpInterpolationType  interpolation_type = GIMP_INTERPOLATION_NONE;
+
+          /* Assemble the transformation matrix */
+          gimp_matrix3_identity  (&matrix);
+          gimp_matrix3_translate (&matrix, -source_x, -source_y);
+          gimp_matrix3_scale     (&matrix, scale_x, scale_y);
+          gimp_matrix3_rotate    (&matrix, angle);
+          gimp_matrix3_translate (&matrix, dest_x, dest_y);
+
+          if (interpolation)
+            interpolation_type = gimp->config->interpolation_type;
+
+          if (progress)
+            gimp_progress_start (progress, FALSE, _("2D Transform"));
+
+          if (drawable != GIMP_DRAWABLE (mask)                        &&
+              ! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+              ! gimp_channel_is_empty (mask))
+            {
+              if (! gimp_drawable_transform_affine (drawable, context,
+                                                    &matrix, GIMP_TRANSFORM_FORWARD,
+                                                    interpolation_type,
+                                                    FALSE, progress))
+                {
+                  success = FALSE;
+                }
+            }
+          else
+            {
+              gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
+                                   GIMP_TRANSFORM_FORWARD,
+                                   interpolation,
+                                   gimp_item_get_clip (GIMP_ITEM (drawable), FALSE),
+                                   progress);
+            }
+
+          if (progress)
+            gimp_progress_end (progress);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_drawable (gimp_value_array_index (return_vals, 1), drawable);
+
+  return return_vals;
+}
+
+void
+register_transform_tools_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-flip
+   */
+  procedure = gimp_procedure_new (flip_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-flip");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-flip",
+                                     "Deprecated: Use 'gimp-item-transform-flip-simple' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-flip-simple' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-item-transform-flip-simple");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("flip-type",
+                                                     "flip type",
+                                                     "Type of flip",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[1]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The flipped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-perspective
+   */
+  procedure = gimp_procedure_new (perspective_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-perspective");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-perspective",
+                                     "Deprecated: Use 'gimp-item-transform-perspective' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-perspective' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-item-transform-perspective");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolation",
+                                                     "interpolation",
+                                                     "Whether to use interpolation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of upper-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of upper-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The new x coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The new y coordinate of lower-left corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x3",
+                                                    "x3",
+                                                    "The new x coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y3",
+                                                    "y3",
+                                                    "The new y coordinate of lower-right corner of original bounding box",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The newly mapped drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-rotate
+   */
+  procedure = gimp_procedure_new (rotate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-rotate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-rotate",
+                                     "Deprecated: Use 'gimp-item-transform-rotate' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-rotate' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-item-transform-rotate");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolation",
+                                                     "interpolation",
+                                                     "Whether to use interpolation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The rotated drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-scale
+   */
+  procedure = gimp_procedure_new (scale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-scale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-scale",
+                                     "Deprecated: Use 'gimp-item-transform-scale' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-scale' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-item-transform-scale");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolation",
+                                                     "interpolation",
+                                                     "Whether to use interpolation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The new x coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The new y coordinate of the upper-left corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The new x coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The new y coordinate of the lower-right corner of the scaled region",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The scaled drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-shear
+   */
+  procedure = gimp_procedure_new (shear_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-shear");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-shear",
+                                     "Deprecated: Use 'gimp-item-transform-shear' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-shear' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-item-transform-shear");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolation",
+                                                     "interpolation",
+                                                     "Whether to use interpolation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("shear-type",
+                                                     "shear type",
+                                                     "Type of shear",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[2]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("magnitude",
+                                                    "magnitude",
+                                                    "The magnitude of the shear",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The sheared drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-transform-2d
+   */
+  procedure = gimp_procedure_new (transform_2d_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-transform-2d");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-transform-2d",
+                                     "Deprecated: Use 'gimp-item-transform-2d' instead.",
+                                     "Deprecated: Use 'gimp-item-transform-2d' instead.",
+                                     "",
+                                     "",
+                                     "",
+                                     "gimp-item-transform-2d");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "drawable",
+                                                            "The affected drawable",
+                                                            pdb->gimp, FALSE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("interpolation",
+                                                     "interpolation",
+                                                     "Whether to use interpolation",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-x",
+                                                    "source x",
+                                                    "X coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("source-y",
+                                                    "source y",
+                                                    "Y coordinate of the transformation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-x",
+                                                    "scale x",
+                                                    "Amount to scale in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-y",
+                                                    "scale y",
+                                                    "Amount to scale in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle of rotation (radians)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-x",
+                                                    "dest x",
+                                                    "X coordinate of where the centre goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dest-y",
+                                                    "dest y",
+                                                    "Y coordinate of where the centre goes",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_drawable_id ("drawable",
+                                                                "drawable",
+                                                                "The transformed drawable",
+                                                                pdb->gimp, FALSE,
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/unit-cmds.c b/app/pdb/unit-cmds.c
new file mode 100644
index 0000000..590de72
--- /dev/null
+++ b/app/pdb/unit-cmds.c
@@ -0,0 +1,782 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpparamspecs.h"
+#include "core/gimpunit.h"
+
+#include "gimppdb.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+
+static GimpValueArray *
+unit_get_number_of_units_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 num_units = 0;
+
+  num_units = _gimp_unit_get_number_of_units (gimp);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_units);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_number_of_built_in_units_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  GimpValueArray *return_vals;
+  gint32 num_units = 0;
+
+  num_units = _gimp_unit_get_number_of_built_in_units (gimp);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+  g_value_set_int (gimp_value_array_index (return_vals, 1), num_units);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_new_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  const gchar *identifier;
+  gdouble factor;
+  gint32 digits;
+  const gchar *symbol;
+  const gchar *abbreviation;
+  const gchar *singular;
+  const gchar *plural;
+  GimpUnit unit_id = 0;
+
+  identifier = g_value_get_string (gimp_value_array_index (args, 0));
+  factor = g_value_get_double (gimp_value_array_index (args, 1));
+  digits = g_value_get_int (gimp_value_array_index (args, 2));
+  symbol = g_value_get_string (gimp_value_array_index (args, 3));
+  abbreviation = g_value_get_string (gimp_value_array_index (args, 4));
+  singular = g_value_get_string (gimp_value_array_index (args, 5));
+  plural = g_value_get_string (gimp_value_array_index (args, 6));
+
+  if (success)
+    {
+      unit_id = _gimp_unit_new (gimp, identifier, factor, digits,
+                                symbol, abbreviation, singular, plural);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), unit_id);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_deletion_flag_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gboolean deletion_flag = FALSE;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      deletion_flag = _gimp_unit_get_deletion_flag (gimp, unit_id);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_boolean (gimp_value_array_index (return_vals, 1), deletion_flag);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_set_deletion_flag_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpUnit unit_id;
+  gboolean deletion_flag;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+  deletion_flag = g_value_get_boolean (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      _gimp_unit_set_deletion_flag (gimp, unit_id, deletion_flag);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+unit_get_identifier_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gchar *identifier = NULL;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      identifier = g_strdup (_gimp_unit_get_identifier (gimp, unit_id));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), identifier);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_factor_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gdouble factor = 0.0;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      factor = _gimp_unit_get_factor (gimp, unit_id);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), factor);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_digits_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gint32 digits = 0;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      digits = _gimp_unit_get_digits (gimp, unit_id);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), digits);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_symbol_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gchar *symbol = NULL;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      symbol = g_strdup (_gimp_unit_get_symbol (gimp, unit_id));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), symbol);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_abbreviation_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gchar *abbreviation = NULL;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      abbreviation = g_strdup (_gimp_unit_get_abbreviation (gimp, unit_id));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), abbreviation);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_singular_invoker (GimpProcedure         *procedure,
+                           Gimp                  *gimp,
+                           GimpContext           *context,
+                           GimpProgress          *progress,
+                           const GimpValueArray  *args,
+                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gchar *singular = NULL;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      singular = g_strdup (_gimp_unit_get_singular (gimp, unit_id));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), singular);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+unit_get_plural_invoker (GimpProcedure         *procedure,
+                         Gimp                  *gimp,
+                         GimpContext           *context,
+                         GimpProgress          *progress,
+                         const GimpValueArray  *args,
+                         GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpUnit unit_id;
+  gchar *plural = NULL;
+
+  unit_id = g_value_get_int (gimp_value_array_index (args, 0));
+
+  if (success)
+    {
+      plural = g_strdup (_gimp_unit_get_plural (gimp, unit_id));
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), plural);
+
+  return return_vals;
+}
+
+void
+register_unit_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-unit-get-number-of-units
+   */
+  procedure = gimp_procedure_new (unit_get_number_of_units_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-number-of-units");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-number-of-units",
+                                     "Returns the number of units.",
+                                     "This procedure returns the number of defined units.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-units",
+                                                          "num units",
+                                                          "The number of units",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-number-of-built-in-units
+   */
+  procedure = gimp_procedure_new (unit_get_number_of_built_in_units_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-number-of-built-in-units");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-number-of-built-in-units",
+                                     "Returns the number of built-in units.",
+                                     "This procedure returns the number of defined units built-in to GIMP.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-units",
+                                                          "num units",
+                                                          "The number of built-in units",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-new
+   */
+  procedure = gimp_procedure_new (unit_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-new",
+                                     "Creates a new unit and returns it's integer ID.",
+                                     "This procedure creates a new unit and returns it's integer ID. Note that the new unit will have it's deletion flag set to TRUE, so you will have to set it to FALSE with 'gimp-unit-set-deletion-flag' to make it persistent.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("identifier",
+                                                       "identifier",
+                                                       "The new unit's identifier",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("factor",
+                                                    "factor",
+                                                    "The new unit's factor",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("digits",
+                                                      "digits",
+                                                      "The new unit's digits",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("symbol",
+                                                       "symbol",
+                                                       "The new unit's symbol",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("abbreviation",
+                                                       "abbreviation",
+                                                       "The new unit's abbreviation",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("singular",
+                                                       "singular",
+                                                       "The new unit's singular form",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("plural",
+                                                       "plural",
+                                                       "The new unit's plural form",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_unit ("unit-id",
+                                                         "unit id",
+                                                         "The new unit's ID",
+                                                         TRUE,
+                                                         FALSE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-deletion-flag
+   */
+  procedure = gimp_procedure_new (unit_get_deletion_flag_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-deletion-flag");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-deletion-flag",
+                                     "Returns the deletion flag of the unit.",
+                                     "This procedure returns the deletion flag of the unit. If this value is TRUE the unit's definition will not be saved in the user's unitrc file on gimp exit.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("deletion-flag",
+                                                         "deletion flag",
+                                                         "The unit's deletion flag",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-set-deletion-flag
+   */
+  procedure = gimp_procedure_new (unit_set_deletion_flag_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-set-deletion-flag");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-set-deletion-flag",
+                                     "Sets the deletion flag of a unit.",
+                                     "This procedure sets the unit's deletion flag. If the deletion flag of a unit is TRUE on gimp exit, this unit's definition will not be saved in the user's unitrc.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("deletion-flag",
+                                                     "deletion flag",
+                                                     "The new deletion flag of the unit",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-identifier
+   */
+  procedure = gimp_procedure_new (unit_get_identifier_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-identifier");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-identifier",
+                                     "Returns the textual identifier of the unit.",
+                                     "This procedure returns the textual identifier of the unit. For built-in units it will be the english singular form of the unit's name. For user-defined units this should equal to the singular form.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("identifier",
+                                                           "identifier",
+                                                           "The unit's textual identifier",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-factor
+   */
+  procedure = gimp_procedure_new (unit_get_factor_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-factor");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-factor",
+                                     "Returns the factor of the unit.",
+                                     "This procedure returns the unit's factor which indicates how many units make up an inch. Note that asking for the factor of \"pixels\" will produce an error.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("factor",
+                                                        "factor",
+                                                        "The unit's factor",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-digits
+   */
+  procedure = gimp_procedure_new (unit_get_digits_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-digits");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-digits",
+                                     "Returns the number of digits of the unit.",
+                                     "This procedure returns the number of digits you should provide in input or output functions to get approximately the same accuracy as with two digits and inches. Note that asking for the digits of \"pixels\" will produce an error.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("digits",
+                                                          "digits",
+                                                          "The unit's number of digits",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-symbol
+   */
+  procedure = gimp_procedure_new (unit_get_symbol_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-symbol");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-symbol",
+                                     "Returns the symbol of the unit.",
+                                     "This procedure returns the symbol of the unit (\"''\" for inches).",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("symbol",
+                                                           "symbol",
+                                                           "The unit's symbol",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-abbreviation
+   */
+  procedure = gimp_procedure_new (unit_get_abbreviation_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-abbreviation");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-abbreviation",
+                                     "Returns the abbreviation of the unit.",
+                                     "This procedure returns the abbreviation of the unit (\"in\" for inches).",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("abbreviation",
+                                                           "abbreviation",
+                                                           "The unit's abbreviation",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-singular
+   */
+  procedure = gimp_procedure_new (unit_get_singular_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-singular");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-singular",
+                                     "Returns the singular form of the unit.",
+                                     "This procedure returns the singular form of the unit.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("singular",
+                                                           "singular",
+                                                           "The unit's singular form",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-unit-get-plural
+   */
+  procedure = gimp_procedure_new (unit_get_plural_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-unit-get-plural");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-unit-get-plural",
+                                     "Returns the plural form of the unit.",
+                                     "This procedure returns the plural form of the unit.",
+                                     "Michael Natterer <mitch@gimp.org>",
+                                     "Michael Natterer",
+                                     "1999",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_unit ("unit-id",
+                                                     "unit id",
+                                                     "The unit's integer ID",
+                                                     TRUE,
+                                                     FALSE,
+                                                     GIMP_UNIT_PIXEL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("plural",
+                                                           "plural",
+                                                           "The unit's plural form",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/pdb/vectors-cmds.c b/app/pdb/vectors-cmds.c
new file mode 100644
index 0000000..92afaeb
--- /dev/null
+++ b/app/pdb/vectors-cmds.c
@@ -0,0 +1,2518 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* NOTE: This file is auto-generated by pdbgen.pl. */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "pdb-types.h"
+
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
+#include "text/gimptext-vectors.h"
+#include "text/gimptextlayer.h"
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpstroke-new.h"
+#include "vectors/gimpvectors-export.h"
+#include "vectors/gimpvectors-import.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
+#include "internal-procs.h"
+
+#include "gimp-intl.h"
+
+
+static GimpValueArray *
+vectors_new_invoker (GimpProcedure         *procedure,
+                     Gimp                  *gimp,
+                     GimpContext           *context,
+                     GimpProgress          *progress,
+                     const GimpValueArray  *args,
+                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *name;
+  GimpVectors *vectors = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  name = g_value_get_string (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      vectors = gimp_vectors_new (image, name);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_vectors (gimp_value_array_index (return_vals, 1), vectors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_new_from_text_layer_invoker (GimpProcedure         *procedure,
+                                     Gimp                  *gimp,
+                                     GimpContext           *context,
+                                     GimpProgress          *progress,
+                                     const GimpValueArray  *args,
+                                     GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpLayer *layer;
+  GimpVectors *vectors = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
+        {
+          gint x, y;
+
+          vectors = gimp_text_vectors_new (image,
+                                           gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)));
+
+          gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
+          gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
+        }
+      else
+        {
+          success = FALSE;
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_vectors (gimp_value_array_index (return_vals, 1), vectors);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_copy_invoker (GimpProcedure         *procedure,
+                      Gimp                  *gimp,
+                      GimpContext           *context,
+                      GimpProgress          *progress,
+                      const GimpValueArray  *args,
+                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  GimpVectors *vectors_copy = NULL;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      vectors_copy = GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
+                                   G_TYPE_FROM_INSTANCE (vectors)));
+
+      if (! vectors_copy)
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    gimp_value_set_vectors (gimp_value_array_index (return_vals, 1), vectors_copy);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_get_strokes_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gint32 num_strokes = 0;
+  gint32 *stroke_ids = NULL;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+
+  if (success)
+    {
+      num_strokes = gimp_vectors_get_n_strokes (vectors);
+
+      if (num_strokes)
+        {
+          GimpStroke *cur_stroke;
+          gint        i = 0;
+
+          stroke_ids = g_new (gint32, num_strokes);
+
+          for (cur_stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+               cur_stroke;
+               cur_stroke = gimp_vectors_stroke_get_next (vectors, cur_stroke))
+            {
+              stroke_ids[i] = gimp_stroke_get_ID (cur_stroke);
+              i++;
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_strokes);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), stroke_ids, num_strokes);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_stroke_get_length_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble precision;
+  gdouble length = 0.0;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  precision = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, 0, error);
+
+      if (stroke)
+        length = gimp_stroke_get_length (stroke, precision);
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_double (gimp_value_array_index (return_vals, 1), length);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_stroke_get_point_at_dist_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble dist;
+  gdouble precision;
+  gdouble x_point = 0.0;
+  gdouble y_point = 0.0;
+  gdouble slope = 0.0;
+  gboolean valid = FALSE;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  dist = g_value_get_double (gimp_value_array_index (args, 2));
+  precision = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, 0, error);
+
+      if (stroke)
+        {
+          GimpCoords coord;
+
+          valid = gimp_stroke_get_point_at_dist (stroke, dist, precision,
+                                                 &coord, &slope);
+          x_point = valid ? coord.x : 0;
+          y_point = valid ? coord.y : 0;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_double (gimp_value_array_index (return_vals, 1), x_point);
+      g_value_set_double (gimp_value_array_index (return_vals, 2), y_point);
+      g_value_set_double (gimp_value_array_index (return_vals, 3), slope);
+      g_value_set_boolean (gimp_value_array_index (return_vals, 4), valid);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_remove_stroke_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT, error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Remove path stroke"),
+                                              vectors);
+
+          gimp_vectors_stroke_remove (vectors, stroke);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_close_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT, error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Close path stroke"),
+                                              vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_stroke_close (stroke);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_translate_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gint32 off_x;
+  gint32 off_y;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  off_x = g_value_get_int (gimp_value_array_index (args, 2));
+  off_y = g_value_get_int (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Translate path stroke"),
+                                              vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_stroke_translate (stroke, off_x, off_y);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_scale_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble scale_x;
+  gdouble scale_y;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  scale_x = g_value_get_double (gimp_value_array_index (args, 2));
+  scale_y = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Scale path stroke"),
+                                              vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_stroke_scale (stroke, scale_x, scale_y);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_rotate_invoker (GimpProcedure         *procedure,
+                               Gimp                  *gimp,
+                               GimpContext           *context,
+                               GimpProgress          *progress,
+                               const GimpValueArray  *args,
+                               GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble center_x;
+  gdouble center_y;
+  gdouble angle;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  center_x = g_value_get_double (gimp_value_array_index (args, 2));
+  center_y = g_value_get_double (gimp_value_array_index (args, 3));
+  angle = g_value_get_double (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Rotate path stroke"),
+                                              vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_stroke_rotate (stroke, center_x, center_y, angle);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_flip_invoker (GimpProcedure         *procedure,
+                             Gimp                  *gimp,
+                             GimpContext           *context,
+                             GimpProgress          *progress,
+                             const GimpValueArray  *args,
+                             GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gint32 flip_type;
+  gdouble axis;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  flip_type = g_value_get_enum (gimp_value_array_index (args, 2));
+  axis = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Flip path stroke"),
+                                              vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_stroke_flip (stroke, flip_type, axis);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_flip_free_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  x1 = g_value_get_double (gimp_value_array_index (args, 2));
+  y1 = g_value_get_double (gimp_value_array_index (args, 3));
+  x2 = g_value_get_double (gimp_value_array_index (args, 4));
+  y2 = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT |
+                                                        GIMP_PDB_ITEM_POSITION,
+                                                        error);
+
+      if (stroke)
+        {
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Flip path stroke"),
+                                              vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_stroke_flip_free (stroke, x1, y1, x2, y2);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_stroke_get_points_invoker (GimpProcedure         *procedure,
+                                   Gimp                  *gimp,
+                                   GimpContext           *context,
+                                   GimpProgress          *progress,
+                                   const GimpValueArray  *args,
+                                   GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gint32 type = 0;
+  gint32 num_points = 0;
+  gdouble *controlpoints = NULL;
+  gboolean closed = FALSE;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, 0, error);
+
+      if (GIMP_IS_BEZIER_STROKE (stroke))
+        {
+          GArray *points_array;
+          gint    i;
+
+          points_array = gimp_stroke_control_points_get (stroke, &closed);
+
+          if (points_array)
+            {
+              num_points = points_array->len;
+              controlpoints = g_new (gdouble, num_points * 2);
+
+              type = GIMP_VECTORS_STROKE_TYPE_BEZIER;
+              for (i = 0; i < num_points; i++)
+                {
+                  controlpoints[2*i]   = g_array_index (points_array,
+                                                        GimpAnchor, i).position.x;
+                  controlpoints[2*i+1] = g_array_index (points_array,
+                                                        GimpAnchor, i).position.y;
+                }
+              g_array_free (points_array, TRUE);
+              num_points *= 2;
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_enum (gimp_value_array_index (return_vals, 1), type);
+      g_value_set_int (gimp_value_array_index (return_vals, 2), num_points);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 3), controlpoints, num_points);
+      g_value_set_boolean (gimp_value_array_index (return_vals, 4), closed);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_stroke_new_from_points_invoker (GimpProcedure         *procedure,
+                                        Gimp                  *gimp,
+                                        GimpContext           *context,
+                                        GimpProgress          *progress,
+                                        const GimpValueArray  *args,
+                                        GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gint32 type;
+  gint32 num_points;
+  const gdouble *controlpoints;
+  gboolean closed;
+  gint32 stroke_id = 0;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  type = g_value_get_enum (gimp_value_array_index (args, 1));
+  num_points = g_value_get_int (gimp_value_array_index (args, 2));
+  controlpoints = gimp_value_get_floatarray (gimp_value_array_index (args, 3));
+  closed = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GimpStroke *stroke;
+      GimpCoords *coords;
+      GimpCoords  default_coords = GIMP_COORDS_DEFAULT_VALUES;
+      gint i;
+
+      success = FALSE;
+
+      if (type == GIMP_VECTORS_STROKE_TYPE_BEZIER &&
+          num_points % 6 == 0)
+        {
+          coords = g_new (GimpCoords, num_points/2);
+          for (i = 0; i < num_points/2; i++)
+            {
+              coords[i] = default_coords;
+              coords[i].x = controlpoints[i*2];
+              coords[i].y = controlpoints[i*2+1];
+            }
+
+          stroke = gimp_stroke_new_from_coords (type, coords, num_points/2, closed);
+          if (stroke)
+            {
+              if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+                gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                                  _("Add path stroke"),
+                                                  vectors);
+
+              gimp_vectors_stroke_add (vectors, stroke);
+              g_object_unref (stroke);
+
+              stroke_id = gimp_stroke_get_ID (stroke);
+
+              success = TRUE;
+            }
+
+          g_free (coords);
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), stroke_id);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_stroke_interpolate_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble precision;
+  gint32 num_coords = 0;
+  gdouble *coords = NULL;
+  gboolean closed = FALSE;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  precision = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, 0, error);
+
+      if (stroke)
+        {
+          GArray *coords_array;
+          gint    i;
+
+          coords_array = gimp_stroke_interpolate (stroke, precision, &closed);
+
+          if (coords_array)
+            {
+              num_coords = coords_array->len;
+              coords = g_new (gdouble, num_coords * 2);
+
+              for (i = 0; i < num_coords; i++)
+                {
+                  coords[2*i]   = g_array_index (coords_array, GimpCoords, i).x;
+                  coords[2*i+1] = g_array_index (coords_array, GimpCoords, i).y;
+                }
+              g_array_free (coords_array, TRUE);
+              num_coords *= 2;
+            }
+          else
+            success = FALSE;
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_coords);
+      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), coords, num_coords);
+      g_value_set_boolean (gimp_value_array_index (return_vals, 3), closed);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_bezier_stroke_new_moveto_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gdouble x0;
+  gdouble y0;
+  gint32 stroke_id = 0;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (vectors),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (vectors), error))
+        {
+          GimpStroke *stroke;
+          GimpCoords  coord0 = GIMP_COORDS_DEFAULT_VALUES;
+
+          coord0.x = x0;
+          coord0.y = y0;
+
+          stroke = gimp_bezier_stroke_new_moveto (&coord0);
+
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Add path stroke"),
+                                              vectors);
+
+          gimp_vectors_stroke_add (vectors, stroke);
+          g_object_unref (stroke);
+
+          stroke_id = gimp_stroke_get_ID (stroke);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), stroke_id);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_bezier_stroke_lineto_invoker (GimpProcedure         *procedure,
+                                      Gimp                  *gimp,
+                                      GimpContext           *context,
+                                      GimpProgress          *progress,
+                                      const GimpValueArray  *args,
+                                      GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble x0;
+  gdouble y0;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  x0 = g_value_get_double (gimp_value_array_index (args, 2));
+  y0 = g_value_get_double (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT, error);
+
+      if (stroke)
+        {
+          GimpCoords coord0 = GIMP_COORDS_DEFAULT_VALUES;
+
+          coord0.x = x0;
+          coord0.y = y0;
+
+         if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+           gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                             _("Extend path stroke"),
+                                             vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_bezier_stroke_lineto (stroke, &coord0);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_bezier_stroke_conicto_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  x0 = g_value_get_double (gimp_value_array_index (args, 2));
+  y0 = g_value_get_double (gimp_value_array_index (args, 3));
+  x1 = g_value_get_double (gimp_value_array_index (args, 4));
+  y1 = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT, error);
+
+      if (stroke)
+        {
+          GimpCoords coord0 = GIMP_COORDS_DEFAULT_VALUES;
+          GimpCoords coord1 = GIMP_COORDS_DEFAULT_VALUES;
+
+          coord0.x = x0;
+          coord0.y = y0;
+
+          coord1.x = x1;
+          coord1.y = y1;
+
+         if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+           gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                             _("Extend path stroke"),
+                                             vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_bezier_stroke_conicto (stroke, &coord0, &coord1);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_bezier_stroke_cubicto_invoker (GimpProcedure         *procedure,
+                                       Gimp                  *gimp,
+                                       GimpContext           *context,
+                                       GimpProgress          *progress,
+                                       const GimpValueArray  *args,
+                                       GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 stroke_id;
+  gdouble x0;
+  gdouble y0;
+  gdouble x1;
+  gdouble y1;
+  gdouble x2;
+  gdouble y2;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  stroke_id = g_value_get_int (gimp_value_array_index (args, 1));
+  x0 = g_value_get_double (gimp_value_array_index (args, 2));
+  y0 = g_value_get_double (gimp_value_array_index (args, 3));
+  x1 = g_value_get_double (gimp_value_array_index (args, 4));
+  y1 = g_value_get_double (gimp_value_array_index (args, 5));
+  x2 = g_value_get_double (gimp_value_array_index (args, 6));
+  y2 = g_value_get_double (gimp_value_array_index (args, 7));
+
+  if (success)
+    {
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id,
+                                                        GIMP_PDB_ITEM_CONTENT, error);
+
+      if (stroke)
+        {
+          GimpCoords coord0 = GIMP_COORDS_DEFAULT_VALUES;
+          GimpCoords coord1 = GIMP_COORDS_DEFAULT_VALUES;
+          GimpCoords coord2 = GIMP_COORDS_DEFAULT_VALUES;
+
+          coord0.x = x0;
+          coord0.y = y0;
+
+          coord1.x = x1;
+          coord1.y = y1;
+
+          coord2.x = x2;
+          coord2.y = y2;
+
+         if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+           gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                             _("Extend path stroke"),
+                                             vectors);
+
+          gimp_vectors_freeze (vectors);
+          gimp_bezier_stroke_cubicto (stroke, &coord0, &coord1, &coord2);
+          gimp_vectors_thaw (vectors);
+        }
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_bezier_stroke_new_ellipse_invoker (GimpProcedure         *procedure,
+                                           Gimp                  *gimp,
+                                           GimpContext           *context,
+                                           GimpProgress          *progress,
+                                           const GimpValueArray  *args,
+                                           GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpVectors *vectors;
+  gdouble x0;
+  gdouble y0;
+  gdouble radius_x;
+  gdouble radius_y;
+  gdouble angle;
+  gint32 stroke_id = 0;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  x0 = g_value_get_double (gimp_value_array_index (args, 1));
+  y0 = g_value_get_double (gimp_value_array_index (args, 2));
+  radius_x = g_value_get_double (gimp_value_array_index (args, 3));
+  radius_y = g_value_get_double (gimp_value_array_index (args, 4));
+  angle = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (vectors),
+                                       GIMP_PDB_ITEM_CONTENT, error) &&
+          gimp_pdb_item_is_not_group (GIMP_ITEM (vectors), error))
+        {
+          GimpStroke *stroke;
+          GimpCoords  coord0 = GIMP_COORDS_DEFAULT_VALUES;
+
+          coord0.x = x0;
+          coord0.y = y0;
+
+          stroke = gimp_bezier_stroke_new_ellipse (&coord0, radius_x, radius_y, angle);
+
+          if (gimp_item_is_attached (GIMP_ITEM (vectors)))
+            gimp_image_undo_push_vectors_mod (gimp_item_get_image (GIMP_ITEM (vectors)),
+                                              _("Add path stroke"),
+                                              vectors);
+
+          gimp_vectors_stroke_add (vectors, stroke);
+          g_object_unref (stroke);
+
+          stroke_id = gimp_stroke_get_ID (stroke);
+        }
+      else
+        success = FALSE;
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_set_int (gimp_value_array_index (return_vals, 1), stroke_id);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_to_selection_invoker (GimpProcedure         *procedure,
+                              Gimp                  *gimp,
+                              GimpContext           *context,
+                              GimpProgress          *progress,
+                              const GimpValueArray  *args,
+                              GError               **error)
+{
+  gboolean success = TRUE;
+  GimpVectors *vectors;
+  gint32 operation;
+  gboolean antialias;
+  gboolean feather;
+  gdouble feather_radius_x;
+  gdouble feather_radius_y;
+
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
+  operation = g_value_get_enum (gimp_value_array_index (args, 1));
+  antialias = g_value_get_boolean (gimp_value_array_index (args, 2));
+  feather = g_value_get_boolean (gimp_value_array_index (args, 3));
+  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 4));
+  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 5));
+
+  if (success)
+    {
+      if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), NULL, 0, error))
+        gimp_item_to_selection (GIMP_ITEM (vectors),
+                                operation,
+                                antialias,
+                                feather,
+                                feather_radius_x,
+                                feather_radius_y);
+      else
+        success = FALSE;
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_import_from_file_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *filename;
+  gboolean merge;
+  gboolean scale;
+  gint32 num_vectors = 0;
+  gint32 *vectors_ids = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 1));
+  merge = g_value_get_boolean (gimp_value_array_index (args, 2));
+  scale = g_value_get_boolean (gimp_value_array_index (args, 3));
+
+  if (success)
+    {
+      GFile *file         = g_file_new_for_path (filename);
+      GList *vectors_list = NULL;
+
+      /* FIXME tree */
+      success = gimp_vectors_import_file (image, file,
+                                          merge, scale, NULL, -1,
+                                          &vectors_list, error);
+
+      g_object_unref (file);
+
+      if (success)
+        {
+          num_vectors = g_list_length (vectors_list);
+
+          if (num_vectors)
+            {
+              GList *list;
+              gint   i;
+
+              vectors_ids = g_new (gint32, num_vectors);
+
+              list = vectors_list;
+              for (i = 0; i < num_vectors; i++, list = g_list_next (list))
+                vectors_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+
+              g_list_free (vectors_list);
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_vectors);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), vectors_ids, num_vectors);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_import_from_string_invoker (GimpProcedure         *procedure,
+                                    Gimp                  *gimp,
+                                    GimpContext           *context,
+                                    GimpProgress          *progress,
+                                    const GimpValueArray  *args,
+                                    GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  const gchar *string;
+  gint32 length;
+  gboolean merge;
+  gboolean scale;
+  gint32 num_vectors = 0;
+  gint32 *vectors_ids = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  string = g_value_get_string (gimp_value_array_index (args, 1));
+  length = g_value_get_int (gimp_value_array_index (args, 2));
+  merge = g_value_get_boolean (gimp_value_array_index (args, 3));
+  scale = g_value_get_boolean (gimp_value_array_index (args, 4));
+
+  if (success)
+    {
+      GList *list, *vectors_list = NULL;
+
+      /* FIXME tree */
+      success = gimp_vectors_import_buffer (image, string, length,
+                                            merge, scale, NULL, -1,
+                                            &vectors_list, error);
+
+      if (success)
+        {
+          num_vectors = g_list_length (vectors_list);
+
+          if (num_vectors)
+            {
+              gint i;
+
+              vectors_ids = g_new (gint32, num_vectors);
+
+              list = vectors_list;
+              for (i = 0; i < num_vectors; i++, list = g_list_next (list))
+                vectors_ids[i] = gimp_item_get_ID (GIMP_ITEM (list->data));
+
+              g_list_free (vectors_list);
+            }
+        }
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    {
+      g_value_set_int (gimp_value_array_index (return_vals, 1), num_vectors);
+      gimp_value_take_int32array (gimp_value_array_index (return_vals, 2), vectors_ids, num_vectors);
+    }
+
+  return return_vals;
+}
+
+static GimpValueArray *
+vectors_export_to_file_invoker (GimpProcedure         *procedure,
+                                Gimp                  *gimp,
+                                GimpContext           *context,
+                                GimpProgress          *progress,
+                                const GimpValueArray  *args,
+                                GError               **error)
+{
+  gboolean success = TRUE;
+  GimpImage *image;
+  const gchar *filename;
+  GimpVectors *vectors;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  filename = g_value_get_string (gimp_value_array_index (args, 1));
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 2), gimp);
+
+  if (success)
+    {
+      GFile *file = g_file_new_for_path (filename);
+
+      success = gimp_vectors_export_file (image, vectors, file, error);
+
+      g_object_unref (file);
+    }
+
+  return gimp_procedure_get_return_values (procedure, success,
+                                           error ? *error : NULL);
+}
+
+static GimpValueArray *
+vectors_export_to_string_invoker (GimpProcedure         *procedure,
+                                  Gimp                  *gimp,
+                                  GimpContext           *context,
+                                  GimpProgress          *progress,
+                                  const GimpValueArray  *args,
+                                  GError               **error)
+{
+  gboolean success = TRUE;
+  GimpValueArray *return_vals;
+  GimpImage *image;
+  GimpVectors *vectors;
+  gchar *string = NULL;
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
+  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
+
+  if (success)
+    {
+      string = gimp_vectors_export_string (image, vectors);
+
+      success = (string != NULL);
+    }
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  if (success)
+    g_value_take_string (gimp_value_array_index (return_vals, 1), string);
+
+  return return_vals;
+}
+
+void
+register_vectors_procs (GimpPDB *pdb)
+{
+  GimpProcedure *procedure;
+
+  /*
+   * gimp-vectors-new
+   */
+  procedure = gimp_procedure_new (vectors_new_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-new");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-new",
+                                     "Creates a new empty vectors object.",
+                                     "Creates a new empty vectors object. The vectors object needs to be added to the image using 'gimp-image-insert-vectors'.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("name",
+                                                       "name",
+                                                       "the name of the new vector object.",
+                                                       FALSE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_vectors_id ("vectors",
+                                                               "vectors",
+                                                               "the current vector object, 0 if no vector exists in the image.",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-new-from-text-layer
+   */
+  procedure = gimp_procedure_new (vectors_new_from_text_layer_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-new-from-text-layer");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-new-from-text-layer",
+                                     "Creates a new vectors object from a text layer.",
+                                     "Creates a new vectors object from a text layer. The vectors object needs to be added to the image using 'gimp-image-insert-vectors'.",
+                                     "Marcus Heese <heese@cip.ifi.lmu.de>",
+                                     "Marcus Heese",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_layer_id ("layer",
+                                                         "layer",
+                                                         "The text layer.",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_vectors_id ("vectors",
+                                                               "vectors",
+                                                               "The vectors of the text layer.",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-copy
+   */
+  procedure = gimp_procedure_new (vectors_copy_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-copy");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-copy",
+                                     "Copy a vectors object.",
+                                     "This procedure copies the specified vectors object and returns the copy.",
+                                     "Barak Itkin <lightningismyname@gmail.com>",
+                                     "Barak Itkin",
+                                     "2008",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object to copy",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_vectors_id ("vectors-copy",
+                                                               "vectors copy",
+                                                               "The newly copied vectors object",
+                                                               pdb->gimp, FALSE,
+                                                               GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-get-strokes
+   */
+  procedure = gimp_procedure_new (vectors_get_strokes_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-get-strokes");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-get-strokes",
+                                     "List the strokes associated with the passed path.",
+                                     "Returns an Array with the stroke-IDs associated with the passed path.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-strokes",
+                                                          "num strokes",
+                                                          "The number of strokes returned.",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("stroke-ids",
+                                                                "stroke ids",
+                                                                "List of the strokes belonging to the path.",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-get-length
+   */
+  procedure = gimp_procedure_new (vectors_stroke_get_length_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-get-length");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-get-length",
+                                     "Measure the length of the given stroke.",
+                                     "Measure the length of the given stroke.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("precision",
+                                                    "precision",
+                                                    "The precision used for the approximation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("length",
+                                                        "length",
+                                                        "The length (in pixels) of the given stroke.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-get-point-at-dist
+   */
+  procedure = gimp_procedure_new (vectors_stroke_get_point_at_dist_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-get-point-at-dist");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-get-point-at-dist",
+                                     "Get point at a specified distance along the stroke.",
+                                     "This will return the x,y position of a point at a given distance along the stroke. The distance will be obtained by first digitizing the curve internally and then walking along the curve. For a closed stroke the start of the path is the first point on the path that was created. This might not be obvious. If the stroke is not long enough, a \"valid\" flag will be FALSE.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("dist",
+                                                    "dist",
+                                                    "The given distance.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("precision",
+                                                    "precision",
+                                                    "The precision used for the approximation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("x-point",
+                                                        "x point",
+                                                        "The x position of the point.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("y-point",
+                                                        "y point",
+                                                        "The y position of the point.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_double ("slope",
+                                                        "slope",
+                                                        "The slope (dy / dx) at the specified point.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("valid",
+                                                         "valid",
+                                                         "Indicator for the validity of the returned data.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-remove-stroke
+   */
+  procedure = gimp_procedure_new (vectors_remove_stroke_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-remove-stroke");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-remove-stroke",
+                                     "remove the stroke from a vectors object.",
+                                     "Remove the stroke from a vectors object.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-close
+   */
+  procedure = gimp_procedure_new (vectors_stroke_close_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-close");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-close",
+                                     "closes the specified stroke.",
+                                     "Closes the specified stroke.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-translate
+   */
+  procedure = gimp_procedure_new (vectors_stroke_translate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-translate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-translate",
+                                     "translate the given stroke.",
+                                     "Translate the given stroke.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("off-x",
+                                                      "off x",
+                                                      "Offset in x direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("off-y",
+                                                      "off y",
+                                                      "Offset in y direction",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-scale
+   */
+  procedure = gimp_procedure_new (vectors_stroke_scale_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-scale");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-scale",
+                                     "scales the given stroke.",
+                                     "Scale the given stroke.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-x",
+                                                    "scale x",
+                                                    "Scale factor in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("scale-y",
+                                                    "scale y",
+                                                    "Scale factor in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-rotate
+   */
+  procedure = gimp_procedure_new (vectors_stroke_rotate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-rotate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-rotate",
+                                     "rotates the given stroke.",
+                                     "Rotates the given stroke around given center by angle (in degrees).",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-x",
+                                                    "center x",
+                                                    "X coordinate of the rotation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("center-y",
+                                                    "center y",
+                                                    "Y coordinate of the rotation center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "angle to rotate about",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-flip
+   */
+  procedure = gimp_procedure_new (vectors_stroke_flip_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-flip");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-flip",
+                                     "flips the given stroke.",
+                                     "Rotates the given stroke around given center by angle (in degrees).",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_enum ("flip-type",
+                                                     "flip type",
+                                                     "Flip orientation, either vertical or horizontal",
+                                                     GIMP_TYPE_ORIENTATION_TYPE,
+                                                     GIMP_ORIENTATION_HORIZONTAL,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_param_spec_enum_exclude_value (GIMP_PARAM_SPEC_ENUM (procedure->args[2]),
+                                      GIMP_ORIENTATION_UNKNOWN);
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("axis",
+                                                    "axis",
+                                                    "axis coordinate about which to flip, in pixels",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-flip-free
+   */
+  procedure = gimp_procedure_new (vectors_stroke_flip_free_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-flip-free");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-flip-free",
+                                     "flips the given stroke about an arbitrary axis.",
+                                     "Flips the given stroke about an arbitrary axis. Axis is defined by two coordinates in the image (in pixels), through which the flipping axis passes.",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "Jo\xc3\xa3o S. O. Bueno",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "X coordinate of the first point of the flipping axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "Y coordinate of the first point of the flipping axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "X coordinate of the second point of the flipping axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "Y coordinate of the second point of the flipping axis",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-get-points
+   */
+  procedure = gimp_procedure_new (vectors_stroke_get_points_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-get-points");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-get-points",
+                                     "returns the control points of a stroke.",
+                                     "returns the control points of a stroke. The interpretation of the coordinates returned depends on the type of the stroke. For Gimp 2.4 this is always a bezier stroke, where the coordinates are the control points.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_enum ("type",
+                                                      "type",
+                                                      "type of the stroke (always GIMP_VECTORS_STROKE_TYPE_BEZIER for now).",
+                                                      GIMP_TYPE_VECTORS_STROKE_TYPE,
+                                                      GIMP_VECTORS_STROKE_TYPE_BEZIER,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-points",
+                                                          "num points",
+                                                          "The number of floats returned.",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("controlpoints",
+                                                                "controlpoints",
+                                                                "List of the control points for the stroke (x0, y0, x1, y1, ...).",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("closed",
+                                                         "closed",
+                                                         "Whether the stroke is closed or not.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-new-from-points
+   */
+  procedure = gimp_procedure_new (vectors_stroke_new_from_points_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-new-from-points");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-new-from-points",
+                                     "Adds a stroke of a given type to the vectors object.",
+                                     "Adds a stroke of a given type to the vectors object. The coordinates of the control points can be specified. For now only strokes of the type GIMP_VECTORS_STROKE_TYPE_BEZIER are supported. The control points are specified as a pair of float values for the x- and y-coordinate. The Bezier stroke type needs a multiple of three control points. Each Bezier segment endpoint (anchor, A) has two additional control points (C) associated. They are specified in the order CACCACCAC...",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("type",
+                                                  "type",
+                                                  "type of the stroke (always GIMP_VECTORS_STROKE_TYPE_BEZIER for now).",
+                                                  GIMP_TYPE_VECTORS_STROKE_TYPE,
+                                                  GIMP_VECTORS_STROKE_TYPE_BEZIER,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("num-points",
+                                                      "num points",
+                                                      "The number of elements in the array, i.e. the number of controlpoints in the stroke * 2 (x- and y-coordinate).",
+                                                      0, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_float_array ("controlpoints",
+                                                            "controlpoints",
+                                                            "List of the x- and y-coordinates of the control points.",
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("closed",
+                                                     "closed",
+                                                     "Whether the stroke is to be closed or not.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("stroke-id",
+                                                          "stroke id",
+                                                          "The stroke ID of the newly created stroke.",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-stroke-interpolate
+   */
+  procedure = gimp_procedure_new (vectors_stroke_interpolate_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-stroke-interpolate");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-stroke-interpolate",
+                                     "returns polygonal approximation of the stroke.",
+                                     "returns polygonal approximation of the stroke.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("precision",
+                                                    "precision",
+                                                    "The precision used for the approximation",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-coords",
+                                                          "num coords",
+                                                          "The number of floats returned.",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_float_array ("coords",
+                                                                "coords",
+                                                                "List of the coords along the path (x0, y0, x1, y1, ...).",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   g_param_spec_boolean ("closed",
+                                                         "closed",
+                                                         "Whether the stroke is closed or not.",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-bezier-stroke-new-moveto
+   */
+  procedure = gimp_procedure_new (vectors_bezier_stroke_new_moveto_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-bezier-stroke-new-moveto");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-bezier-stroke-new-moveto",
+                                     "Adds a bezier stroke with a single moveto to the vectors object.",
+                                     "Adds a bezier stroke with a single moveto to the vectors object.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The x-coordinate of the moveto",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The y-coordinate of the moveto",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("stroke-id",
+                                                          "stroke id",
+                                                          "The resulting stroke",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-bezier-stroke-lineto
+   */
+  procedure = gimp_procedure_new (vectors_bezier_stroke_lineto_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-bezier-stroke-lineto");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-bezier-stroke-lineto",
+                                     "Extends a bezier stroke with a lineto.",
+                                     "Extends a bezier stroke with a lineto.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The x-coordinate of the lineto",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The y-coordinate of the lineto",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-bezier-stroke-conicto
+   */
+  procedure = gimp_procedure_new (vectors_bezier_stroke_conicto_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-bezier-stroke-conicto");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-bezier-stroke-conicto",
+                                     "Extends a bezier stroke with a conic bezier spline.",
+                                     "Extends a bezier stroke with a conic bezier spline. Actually a cubic bezier spline gets added that realizes the shape of a conic bezier spline.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The x-coordinate of the control point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The y-coordinate of the control point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The x-coordinate of the end point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The y-coordinate of the end point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-bezier-stroke-cubicto
+   */
+  procedure = gimp_procedure_new (vectors_bezier_stroke_cubicto_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-bezier-stroke-cubicto");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-bezier-stroke-cubicto",
+                                     "Extends a bezier stroke with a cubic bezier spline.",
+                                     "Extends a bezier stroke with a cubic bezier spline.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("stroke-id",
+                                                      "stroke id",
+                                                      "The stroke ID",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The x-coordinate of the first control point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The y-coordinate of the first control point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x1",
+                                                    "x1",
+                                                    "The x-coordinate of the second control point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y1",
+                                                    "y1",
+                                                    "The y-coordinate of the second control point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x2",
+                                                    "x2",
+                                                    "The x-coordinate of the end point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y2",
+                                                    "y2",
+                                                    "The y-coordinate of the end point",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-bezier-stroke-new-ellipse
+   */
+  procedure = gimp_procedure_new (vectors_bezier_stroke_new_ellipse_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-bezier-stroke-new-ellipse");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-bezier-stroke-new-ellipse",
+                                     "Adds a bezier stroke describing an ellipse the vectors object.",
+                                     "Adds a bezier stroke describing an ellipse the vectors object.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2005",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("x0",
+                                                    "x0",
+                                                    "The x-coordinate of the center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("y0",
+                                                    "y0",
+                                                    "The y-coordinate of the center",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius-x",
+                                                    "radius x",
+                                                    "The radius in x direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius-y",
+                                                    "radius y",
+                                                    "The radius in y direction",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("angle",
+                                                    "angle",
+                                                    "The angle the x-axis of the ellipse (radians, counterclockwise)",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("stroke-id",
+                                                          "stroke id",
+                                                          "The resulting stroke",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-to-selection
+   */
+  procedure = gimp_procedure_new (vectors_to_selection_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-to-selection");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-to-selection",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "Deprecated: Use 'gimp-image-select-item' instead.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2006",
+                                     "gimp-image-select-item");
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object to render to the selection",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("operation",
+                                                  "operation",
+                                                  "The desired operation with current selection",
+                                                  GIMP_TYPE_CHANNEL_OPS,
+                                                  GIMP_CHANNEL_OP_ADD,
+                                                  GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("antialias",
+                                                     "antialias",
+                                                     "Antialias selection.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("feather",
+                                                     "feather",
+                                                     "Feather selection.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-x",
+                                                    "feather radius x",
+                                                    "Feather radius x.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("feather-radius-y",
+                                                    "feather radius y",
+                                                    "Feather radius y.",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-import-from-file
+   */
+  procedure = gimp_procedure_new (vectors_import_from_file_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-import-from-file");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-import-from-file",
+                                     "Import paths from an SVG file.",
+                                     "This procedure imports paths from an SVG file. SVG elements other than paths and basic shapes are ignored.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the SVG file to import.",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("merge",
+                                                     "merge",
+                                                     "Merge paths into a single vectors object.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("scale",
+                                                     "scale",
+                                                     "Scale the SVG to image dimensions.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-vectors",
+                                                          "num vectors",
+                                                          "The number of newly created vectors",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("vectors-ids",
+                                                                "vectors ids",
+                                                                "The list of newly created vectors",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-import-from-string
+   */
+  procedure = gimp_procedure_new (vectors_import_from_string_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-import-from-string");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-import-from-string",
+                                     "Import paths from an SVG string.",
+                                     "This procedure works like 'gimp-vectors-import-from-file' but takes a string rather than reading the SVG from a file. This allows you to write scripts that generate SVG and feed it to GIMP.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2006",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("string",
+                                                       "string",
+                                                       "A string that must be a complete and valid SVG document.",
+                                                       TRUE, FALSE, FALSE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("length",
+                                                      "length",
+                                                      "Number of bytes in string or -1 if the string is NULL terminated.",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("merge",
+                                                     "merge",
+                                                     "Merge paths into a single vectors object.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_boolean ("scale",
+                                                     "scale",
+                                                     "Scale the SVG to image dimensions.",
+                                                     FALSE,
+                                                     GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-vectors",
+                                                          "num vectors",
+                                                          "The number of newly created vectors",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32_array ("vectors-ids",
+                                                                "vectors ids",
+                                                                "The list of newly created vectors",
+                                                                GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-export-to-file
+   */
+  procedure = gimp_procedure_new (vectors_export_to_file_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-export-to-file");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-export-to-file",
+                                     "save a path as an SVG file.",
+                                     "This procedure creates an SVG file to save a Vectors object, that is, a path. The resulting file can be edited using a vector graphics application, or later reloaded into GIMP. If you pass 0 as the 'vectors' argument, then all paths in the image will be exported.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "filename",
+                                                       "The name of the SVG file to create.",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object to be saved, or 0 for all in the image",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
+   * gimp-vectors-export-to-string
+   */
+  procedure = gimp_procedure_new (vectors_export_to_string_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure),
+                               "gimp-vectors-export-to-string");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-vectors-export-to-string",
+                                     "Save a path as an SVG string.",
+                                     "This procedure works like 'gimp-vectors-export-to-file' but creates a string rather than a file. The contents are a NUL-terminated string that holds a complete XML document. If you pass 0 as the 'vectors' argument, then all paths in the image will be exported.",
+                                     "Bill Skaggs <weskaggs@primate.ucdavis.edu>",
+                                     "Bill Skaggs",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "image",
+                                                         "The image",
+                                                         pdb->gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_vectors_id ("vectors",
+                                                           "vectors",
+                                                           "The vectors object to save, or 0 for all in the image",
+                                                           pdb->gimp, FALSE,
+                                                           GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string ("string",
+                                                           "string",
+                                                           "A string whose contents are a complete SVG document.",
+                                                           FALSE, FALSE, FALSE,
+                                                           NULL,
+                                                           GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+}
diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am
new file mode 100644
index 0000000..852fdbb
--- /dev/null
+++ b/app/plug-in/Makefile.am
@@ -0,0 +1,106 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Plug-In\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappplug-in.a
+
+libappplug_in_a_SOURCES = \
+	plug-in-enums.c 			\
+	plug-in-enums.h 			\
+	plug-in-types.h 			\
+	\
+	gimpenvirontable.c			\
+	gimpenvirontable.h			\
+	gimpinterpreterdb.c			\
+	gimpinterpreterdb.h			\
+	gimpplugindebug.c			\
+	gimpplugindebug.h			\
+	gimpplugin.c				\
+	gimpplugin.h				\
+	gimpplugin-cleanup.c			\
+	gimpplugin-cleanup.h			\
+	gimpplugin-context.c			\
+	gimpplugin-context.h			\
+	gimpplugin-message.c			\
+	gimpplugin-message.h			\
+	gimpplugin-progress.c			\
+	gimpplugin-progress.h			\
+	gimpplugindef.c				\
+	gimpplugindef.h				\
+	gimppluginerror.c 			\
+	gimppluginerror.h 			\
+	gimppluginmanager.c			\
+	gimppluginmanager.h			\
+	gimppluginmanager-call.c		\
+	gimppluginmanager-call.h		\
+	gimppluginmanager-data.c		\
+	gimppluginmanager-data.h		\
+	gimppluginmanager-file.c		\
+	gimppluginmanager-file.h		\
+	gimppluginmanager-file-procedure.c	\
+	gimppluginmanager-file-procedure.h	\
+	gimppluginmanager-help-domain.c		\
+	gimppluginmanager-help-domain.h		\
+	gimppluginmanager-locale-domain.c	\
+	gimppluginmanager-locale-domain.h	\
+	gimppluginmanager-menu-branch.c		\
+	gimppluginmanager-menu-branch.h		\
+	gimppluginmanager-query.c		\
+	gimppluginmanager-query.h		\
+	gimppluginmanager-restore.c		\
+	gimppluginmanager-restore.h		\
+	gimppluginprocedure.c			\
+	gimppluginprocedure.h			\
+	gimppluginprocframe.c			\
+	gimppluginprocframe.h			\
+	gimppluginshm.c				\
+	gimppluginshm.h				\
+	gimptemporaryprocedure.c		\
+	gimptemporaryprocedure.h		\
+	\
+	plug-in-menu-path.c			\
+	plug-in-menu-path.h			\
+	plug-in-params.c			\
+	plug-in-params.h			\
+	plug-in-rc.c				\
+	plug-in-rc.h
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-pec
+CLEANFILES = $(EXTRA_PROGRAMS) $(gen_sources)
+
+xgen-pec: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"plug-in-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/plug-in-enums.c: xgen-pec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/plug-in/Makefile.in b/app/plug-in/Makefile.in
new file mode 100644
index 0000000..85dd1c2
--- /dev/null
+++ b/app/plug-in/Makefile.in
@@ -0,0 +1,1126 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/plug-in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappplug_in_a_AR = $(AR) $(ARFLAGS)
+libappplug_in_a_LIBADD =
+am_libappplug_in_a_OBJECTS = plug-in-enums.$(OBJEXT) \
+	gimpenvirontable.$(OBJEXT) gimpinterpreterdb.$(OBJEXT) \
+	gimpplugindebug.$(OBJEXT) gimpplugin.$(OBJEXT) \
+	gimpplugin-cleanup.$(OBJEXT) gimpplugin-context.$(OBJEXT) \
+	gimpplugin-message.$(OBJEXT) gimpplugin-progress.$(OBJEXT) \
+	gimpplugindef.$(OBJEXT) gimppluginerror.$(OBJEXT) \
+	gimppluginmanager.$(OBJEXT) gimppluginmanager-call.$(OBJEXT) \
+	gimppluginmanager-data.$(OBJEXT) \
+	gimppluginmanager-file.$(OBJEXT) \
+	gimppluginmanager-file-procedure.$(OBJEXT) \
+	gimppluginmanager-help-domain.$(OBJEXT) \
+	gimppluginmanager-locale-domain.$(OBJEXT) \
+	gimppluginmanager-menu-branch.$(OBJEXT) \
+	gimppluginmanager-query.$(OBJEXT) \
+	gimppluginmanager-restore.$(OBJEXT) \
+	gimppluginprocedure.$(OBJEXT) gimppluginprocframe.$(OBJEXT) \
+	gimppluginshm.$(OBJEXT) gimptemporaryprocedure.$(OBJEXT) \
+	plug-in-menu-path.$(OBJEXT) plug-in-params.$(OBJEXT) \
+	plug-in-rc.$(OBJEXT)
+libappplug_in_a_OBJECTS = $(am_libappplug_in_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimpenvirontable.Po \
+	./$(DEPDIR)/gimpinterpreterdb.Po \
+	./$(DEPDIR)/gimpplugin-cleanup.Po \
+	./$(DEPDIR)/gimpplugin-context.Po \
+	./$(DEPDIR)/gimpplugin-message.Po \
+	./$(DEPDIR)/gimpplugin-progress.Po ./$(DEPDIR)/gimpplugin.Po \
+	./$(DEPDIR)/gimpplugindebug.Po ./$(DEPDIR)/gimpplugindef.Po \
+	./$(DEPDIR)/gimppluginerror.Po \
+	./$(DEPDIR)/gimppluginmanager-call.Po \
+	./$(DEPDIR)/gimppluginmanager-data.Po \
+	./$(DEPDIR)/gimppluginmanager-file-procedure.Po \
+	./$(DEPDIR)/gimppluginmanager-file.Po \
+	./$(DEPDIR)/gimppluginmanager-help-domain.Po \
+	./$(DEPDIR)/gimppluginmanager-locale-domain.Po \
+	./$(DEPDIR)/gimppluginmanager-menu-branch.Po \
+	./$(DEPDIR)/gimppluginmanager-query.Po \
+	./$(DEPDIR)/gimppluginmanager-restore.Po \
+	./$(DEPDIR)/gimppluginmanager.Po \
+	./$(DEPDIR)/gimppluginprocedure.Po \
+	./$(DEPDIR)/gimppluginprocframe.Po \
+	./$(DEPDIR)/gimppluginshm.Po \
+	./$(DEPDIR)/gimptemporaryprocedure.Po \
+	./$(DEPDIR)/plug-in-enums.Po ./$(DEPDIR)/plug-in-menu-path.Po \
+	./$(DEPDIR)/plug-in-params.Po ./$(DEPDIR)/plug-in-rc.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappplug_in_a_SOURCES)
+DIST_SOURCES = $(libappplug_in_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Plug-In\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappplug-in.a
+libappplug_in_a_SOURCES = \
+	plug-in-enums.c 			\
+	plug-in-enums.h 			\
+	plug-in-types.h 			\
+	\
+	gimpenvirontable.c			\
+	gimpenvirontable.h			\
+	gimpinterpreterdb.c			\
+	gimpinterpreterdb.h			\
+	gimpplugindebug.c			\
+	gimpplugindebug.h			\
+	gimpplugin.c				\
+	gimpplugin.h				\
+	gimpplugin-cleanup.c			\
+	gimpplugin-cleanup.h			\
+	gimpplugin-context.c			\
+	gimpplugin-context.h			\
+	gimpplugin-message.c			\
+	gimpplugin-message.h			\
+	gimpplugin-progress.c			\
+	gimpplugin-progress.h			\
+	gimpplugindef.c				\
+	gimpplugindef.h				\
+	gimppluginerror.c 			\
+	gimppluginerror.h 			\
+	gimppluginmanager.c			\
+	gimppluginmanager.h			\
+	gimppluginmanager-call.c		\
+	gimppluginmanager-call.h		\
+	gimppluginmanager-data.c		\
+	gimppluginmanager-data.h		\
+	gimppluginmanager-file.c		\
+	gimppluginmanager-file.h		\
+	gimppluginmanager-file-procedure.c	\
+	gimppluginmanager-file-procedure.h	\
+	gimppluginmanager-help-domain.c		\
+	gimppluginmanager-help-domain.h		\
+	gimppluginmanager-locale-domain.c	\
+	gimppluginmanager-locale-domain.h	\
+	gimppluginmanager-menu-branch.c		\
+	gimppluginmanager-menu-branch.h		\
+	gimppluginmanager-query.c		\
+	gimppluginmanager-query.h		\
+	gimppluginmanager-restore.c		\
+	gimppluginmanager-restore.h		\
+	gimppluginprocedure.c			\
+	gimppluginprocedure.h			\
+	gimppluginprocframe.c			\
+	gimppluginprocframe.h			\
+	gimppluginshm.c				\
+	gimppluginshm.h				\
+	gimptemporaryprocedure.c		\
+	gimptemporaryprocedure.h		\
+	\
+	plug-in-menu-path.c			\
+	plug-in-menu-path.h			\
+	plug-in-params.c			\
+	plug-in-params.h			\
+	plug-in-rc.c				\
+	plug-in-rc.h
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-pec
+CLEANFILES = $(EXTRA_PROGRAMS) $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/plug-in/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/plug-in/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappplug-in.a: $(libappplug_in_a_OBJECTS) $(libappplug_in_a_DEPENDENCIES) $(EXTRA_libappplug_in_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappplug-in.a
+	$(AM_V_AR)$(libappplug_in_a_AR) libappplug-in.a $(libappplug_in_a_OBJECTS) $(libappplug_in_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappplug-in.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpenvirontable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpinterpreterdb.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugin-cleanup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugin-context.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugin-message.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugin-progress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugin.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugindebug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpplugindef.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginerror.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-call.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-data.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-file-procedure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-file.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-help-domain.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-locale-domain.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-menu-branch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-query.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager-restore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginmanager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginprocedure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginprocframe.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginshm.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptemporaryprocedure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-enums.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-menu-path.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-params.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-rc.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimpenvirontable.Po
+	-rm -f ./$(DEPDIR)/gimpinterpreterdb.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-cleanup.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-context.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-message.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-progress.Po
+	-rm -f ./$(DEPDIR)/gimpplugin.Po
+	-rm -f ./$(DEPDIR)/gimpplugindebug.Po
+	-rm -f ./$(DEPDIR)/gimpplugindef.Po
+	-rm -f ./$(DEPDIR)/gimppluginerror.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-call.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-data.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-file-procedure.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-file.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-help-domain.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-locale-domain.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-menu-branch.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-query.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-restore.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager.Po
+	-rm -f ./$(DEPDIR)/gimppluginprocedure.Po
+	-rm -f ./$(DEPDIR)/gimppluginprocframe.Po
+	-rm -f ./$(DEPDIR)/gimppluginshm.Po
+	-rm -f ./$(DEPDIR)/gimptemporaryprocedure.Po
+	-rm -f ./$(DEPDIR)/plug-in-enums.Po
+	-rm -f ./$(DEPDIR)/plug-in-menu-path.Po
+	-rm -f ./$(DEPDIR)/plug-in-params.Po
+	-rm -f ./$(DEPDIR)/plug-in-rc.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimpenvirontable.Po
+	-rm -f ./$(DEPDIR)/gimpinterpreterdb.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-cleanup.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-context.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-message.Po
+	-rm -f ./$(DEPDIR)/gimpplugin-progress.Po
+	-rm -f ./$(DEPDIR)/gimpplugin.Po
+	-rm -f ./$(DEPDIR)/gimpplugindebug.Po
+	-rm -f ./$(DEPDIR)/gimpplugindef.Po
+	-rm -f ./$(DEPDIR)/gimppluginerror.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-call.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-data.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-file-procedure.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-file.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-help-domain.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-locale-domain.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-menu-branch.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-query.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager-restore.Po
+	-rm -f ./$(DEPDIR)/gimppluginmanager.Po
+	-rm -f ./$(DEPDIR)/gimppluginprocedure.Po
+	-rm -f ./$(DEPDIR)/gimppluginprocframe.Po
+	-rm -f ./$(DEPDIR)/gimppluginshm.Po
+	-rm -f ./$(DEPDIR)/gimptemporaryprocedure.Po
+	-rm -f ./$(DEPDIR)/plug-in-enums.Po
+	-rm -f ./$(DEPDIR)/plug-in-menu-path.Po
+	-rm -f ./$(DEPDIR)/plug-in-params.Po
+	-rm -f ./$(DEPDIR)/plug-in-rc.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-pec: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"plug-in-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/plug-in-enums.c: xgen-pec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/plug-in/gimpenvirontable.c b/app/plug-in/gimpenvirontable.c
new file mode 100644
index 0000000..82f2840
--- /dev/null
+++ b/app/plug-in/gimpenvirontable.c
@@ -0,0 +1,518 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpenvirontable.c
+ * (C) 2002 Manish Singh <yosh@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "plug-in-types.h"
+
+#include "gimpenvirontable.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _GimpEnvironValue GimpEnvironValue;
+
+struct _GimpEnvironValue
+{
+  gchar *value;
+  gchar *separator;
+};
+
+
+static void     gimp_environ_table_finalize       (GObject               *object);
+
+static void     gimp_environ_table_load_env_file  (GimpEnvironTable      *environ_table,
+                                                   GFile                 *file);
+static gboolean gimp_environ_table_legal_name     (gchar                 *name);
+
+static void     gimp_environ_table_populate       (GimpEnvironTable      *environ_table);
+static void     gimp_environ_table_populate_one   (const gchar           *name,
+                                                   GimpEnvironValue      *val,
+                                                   GPtrArray             *env_array);
+static gboolean gimp_environ_table_pass_through   (GimpEnvironTable      *environ_table,
+                                                   const gchar           *name);
+
+static void     gimp_environ_table_clear_vars     (GimpEnvironTable      *environ_table);
+static void     gimp_environ_table_clear_internal (GimpEnvironTable      *environ_table);
+static void     gimp_environ_table_clear_envp     (GimpEnvironTable      *environ_table);
+
+static void     gimp_environ_table_free_value     (GimpEnvironValue      *val);
+
+
+G_DEFINE_TYPE (GimpEnvironTable, gimp_environ_table, G_TYPE_OBJECT)
+
+#define parent_class gimp_environ_table_parent_class
+
+
+static void
+gimp_environ_table_class_init (GimpEnvironTableClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = gimp_environ_table_finalize;
+}
+
+static void
+gimp_environ_table_init (GimpEnvironTable *environ_table)
+{
+}
+
+static void
+gimp_environ_table_finalize (GObject *object)
+{
+  GimpEnvironTable *environ_table = GIMP_ENVIRON_TABLE (object);
+
+  gimp_environ_table_clear_all (environ_table);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GimpEnvironTable *
+gimp_environ_table_new (gboolean verbose)
+{
+  GimpEnvironTable *table = g_object_new (GIMP_TYPE_ENVIRON_TABLE, NULL);
+
+  table->verbose = verbose;
+
+  return table;
+}
+
+static guint
+gimp_environ_table_str_hash (gconstpointer v)
+{
+#ifdef G_OS_WIN32
+  gchar *p      = g_ascii_strup ((const gchar *) v, -1);
+  guint  retval = g_str_hash (p);
+
+  g_free (p);
+
+  return retval;
+#else
+  return g_str_hash (v);
+#endif
+}
+
+static gboolean
+gimp_environ_table_str_equal (gconstpointer v1,
+                              gconstpointer v2)
+{
+#ifdef G_OS_WIN32
+  gchar    *string1 = g_ascii_strup ((const gchar *) v1, -1);
+  gchar    *string2 = g_ascii_strup ((const gchar *) v2, -1);
+  gboolean  retval  = g_str_equal (string1, string2);
+
+  g_free (string1);
+  g_free (string2);
+
+  return retval;
+#else
+  return g_str_equal (v1, v2);
+#endif
+}
+
+void
+gimp_environ_table_load (GimpEnvironTable *environ_table,
+                         GList            *path)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_ENVIRON_TABLE (environ_table));
+
+  gimp_environ_table_clear (environ_table);
+
+  environ_table->vars =
+    g_hash_table_new_full (gimp_environ_table_str_hash,
+                           gimp_environ_table_str_equal,
+                           g_free,
+                           (GDestroyNotify) gimp_environ_table_free_value);
+
+  for (list = path; list; list = g_list_next (list))
+    {
+      GFile           *dir = list->data;
+      GFileEnumerator *enumerator;
+
+      enumerator =
+        g_file_enumerate_children (dir,
+                                   G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                   G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                   G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                   G_FILE_QUERY_INFO_NONE,
+                                   NULL, NULL);
+
+      if (enumerator)
+        {
+          GFileInfo *info;
+
+          while ((info = g_file_enumerator_next_file (enumerator,
+                                                      NULL, NULL)))
+            {
+              if (! g_file_info_get_is_hidden (info) &&
+                  g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR)
+                {
+                  GFile *file = g_file_enumerator_get_child (enumerator, info);
+
+                  gimp_environ_table_load_env_file (environ_table, file);
+
+                  g_object_unref (file);
+                }
+
+              g_object_unref (info);
+            }
+
+          g_object_unref (enumerator);
+        }
+    }
+}
+
+void
+gimp_environ_table_add (GimpEnvironTable *environ_table,
+                        const gchar      *name,
+                        const gchar      *value,
+                        const gchar      *separator)
+{
+  GimpEnvironValue *val;
+
+  g_return_if_fail (GIMP_IS_ENVIRON_TABLE (environ_table));
+
+  gimp_environ_table_clear_envp (environ_table);
+
+  if (! environ_table->internal)
+    environ_table->internal =
+      g_hash_table_new_full (g_str_hash, g_str_equal,
+                             g_free,
+                             (GDestroyNotify) gimp_environ_table_free_value);
+
+  val = g_slice_new (GimpEnvironValue);
+
+  val->value     = g_strdup (value);
+  val->separator = g_strdup (separator);
+
+  g_hash_table_insert (environ_table->internal, g_strdup (name), val);
+}
+
+void
+gimp_environ_table_remove (GimpEnvironTable *environ_table,
+                           const gchar      *name)
+{
+  g_return_if_fail (GIMP_IS_ENVIRON_TABLE (environ_table));
+
+  if (! environ_table->internal)
+    return;
+
+  gimp_environ_table_clear_envp (environ_table);
+
+  g_hash_table_remove (environ_table->internal, name);
+
+  if (g_hash_table_size (environ_table->internal) == 0)
+    gimp_environ_table_clear_internal (environ_table);
+}
+
+void
+gimp_environ_table_clear (GimpEnvironTable *environ_table)
+{
+  g_return_if_fail (GIMP_IS_ENVIRON_TABLE (environ_table));
+
+  gimp_environ_table_clear_envp (environ_table);
+
+  gimp_environ_table_clear_vars (environ_table);
+}
+
+void
+gimp_environ_table_clear_all (GimpEnvironTable *environ_table)
+{
+  g_return_if_fail (GIMP_IS_ENVIRON_TABLE (environ_table));
+
+  gimp_environ_table_clear_envp (environ_table);
+
+  gimp_environ_table_clear_vars (environ_table);
+  gimp_environ_table_clear_internal (environ_table);
+}
+
+gchar **
+gimp_environ_table_get_envp (GimpEnvironTable *environ_table)
+{
+  g_return_val_if_fail (GIMP_IS_ENVIRON_TABLE (environ_table), NULL);
+
+  /* Hmm.. should we return a copy here in the future? Not thread safe atm,
+   * but the rest of it isn't either.
+   */
+
+  if (! environ_table->envp)
+    gimp_environ_table_populate (environ_table);
+
+  return environ_table->envp;
+}
+
+
+/* private */
+
+static void
+gimp_environ_table_load_env_file (GimpEnvironTable *environ_table,
+                                  GFile            *file)
+{
+  GInputStream     *input;
+  GDataInputStream *data_input;
+  gchar            *buffer;
+  gsize             buffer_len;
+  GError           *error = NULL;
+
+  if (environ_table->verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+  if (! input)
+    {
+      g_message (_("Could not open '%s' for reading: %s"),
+                 gimp_file_get_utf8_name (file),
+                 error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  data_input = g_data_input_stream_new (input);
+  g_object_unref (input);
+
+  while ((buffer = g_data_input_stream_read_line (data_input, &buffer_len,
+                                                  NULL, &error)))
+    {
+      gchar *name;
+      gchar *value;
+      gchar *separator;
+      gchar *p;
+      gchar *q;
+
+      /* Skip comments */
+      if (buffer[0] == '#')
+        {
+          g_free (buffer);
+          continue;
+        }
+
+      p = strchr (buffer, '=');
+      if (! p)
+        {
+          g_free (buffer);
+          continue;
+        }
+
+      *p = '\0';
+
+      name = buffer;
+      value = p + 1;
+
+      if (name[0] == '\0')
+        {
+          g_message (_("Empty variable name in environment file %s"),
+                     gimp_file_get_utf8_name (file));
+          g_free (buffer);
+          continue;
+        }
+
+      separator = NULL;
+
+      q = strchr (name, ' ');
+      if (q)
+        {
+          *q = '\0';
+
+          separator = name;
+          name = q + 1;
+        }
+
+      if (! gimp_environ_table_legal_name (name))
+        {
+          g_message (_("Illegal variable name in environment file %s: %s"),
+                     gimp_file_get_utf8_name (file), name);
+          g_free (buffer);
+          continue;
+        }
+
+      if (! g_hash_table_lookup (environ_table->vars, name))
+        {
+          GimpEnvironValue *val = g_slice_new (GimpEnvironValue);
+
+          val->value     = gimp_config_path_expand (value, FALSE, NULL);
+          val->separator = g_strdup (separator);
+
+          g_hash_table_insert (environ_table->vars, g_strdup (name), val);
+        }
+
+      g_free (buffer);
+    }
+
+  if (error)
+    {
+      g_message (_("Error reading '%s': %s"),
+                 gimp_file_get_utf8_name (file),
+                 error->message);
+      g_clear_error (&error);
+    }
+
+  g_object_unref (data_input);
+}
+
+static gboolean
+gimp_environ_table_legal_name (gchar *name)
+{
+  gchar *s;
+
+  if (! g_ascii_isalpha (*name) && (*name != '_'))
+    return FALSE;
+
+  for (s = name + 1; *s; s++)
+    if (! g_ascii_isalnum (*s) && (*s != '_'))
+      return FALSE;
+
+  return TRUE;
+}
+
+static void
+gimp_environ_table_populate (GimpEnvironTable *environ_table)
+{
+  gchar     **env = g_listenv ();
+  gchar     **var;
+  GPtrArray  *env_array;
+
+  var = env;
+  env_array = g_ptr_array_new ();
+
+  while (*var)
+    {
+      /* g_listenv() only returns the names of environment variables
+       * that are correctly specified (name=value) in the environ
+       * array (Unix) or the process environment string table (Win32).
+       */
+
+      if (gimp_environ_table_pass_through (environ_table, *var))
+        g_ptr_array_add (env_array, g_strconcat (*var, "=", g_getenv (*var), NULL));
+
+      var++;
+    }
+
+  g_strfreev (env);
+
+  if (environ_table->vars)
+    g_hash_table_foreach (environ_table->vars,
+                          (GHFunc) gimp_environ_table_populate_one,
+                          env_array);
+
+  if (environ_table->internal)
+    g_hash_table_foreach (environ_table->internal,
+                          (GHFunc) gimp_environ_table_populate_one,
+                          env_array);
+
+  g_ptr_array_add (env_array, NULL);
+
+  environ_table->envp = (gchar **) g_ptr_array_free (env_array, FALSE);
+
+#ifdef ENVP_DEBUG
+  var = environ_table->envp;
+
+  g_print ("GimpEnvironTable:\n");
+  while (*var)
+    {
+      g_print ("%s\n", *var);
+      var++;
+    }
+#endif /* ENVP_DEBUG */
+}
+
+static void
+gimp_environ_table_populate_one (const gchar      *name,
+                                 GimpEnvironValue *val,
+                                 GPtrArray        *env_array)
+{
+  const gchar *old;
+  gchar *var = NULL;
+
+  if (val->separator)
+    {
+      old = g_getenv (name);
+
+      if (old)
+        var = g_strconcat (name, "=", val->value, val->separator, old, NULL);
+    }
+
+  if (! var)
+    var = g_strconcat (name, "=", val->value, NULL);
+
+  g_ptr_array_add (env_array, var);
+}
+
+static gboolean
+gimp_environ_table_pass_through (GimpEnvironTable *environ_table,
+                                 const gchar      *name)
+{
+  gboolean vars, internal;
+
+  vars = environ_table->vars &&
+         g_hash_table_lookup (environ_table->vars, name);
+
+  internal = environ_table->internal &&
+             g_hash_table_lookup (environ_table->internal, name);
+
+  return (!vars && !internal);
+}
+
+static void
+gimp_environ_table_clear_vars (GimpEnvironTable *environ_table)
+{
+  if (environ_table->vars)
+    {
+      g_hash_table_destroy (environ_table->vars);
+      environ_table->vars = NULL;
+    }
+}
+
+static void
+gimp_environ_table_clear_internal (GimpEnvironTable *environ_table)
+{
+  if (environ_table->internal)
+    {
+      g_hash_table_destroy (environ_table->internal);
+      environ_table->internal = NULL;
+    }
+}
+
+static void
+gimp_environ_table_clear_envp (GimpEnvironTable *environ_table)
+{
+  if (environ_table->envp)
+    {
+      g_strfreev (environ_table->envp);
+      environ_table->envp = NULL;
+    }
+}
+
+static void
+gimp_environ_table_free_value (GimpEnvironValue *val)
+{
+  g_free (val->value);
+  g_free (val->separator);
+
+  g_slice_free (GimpEnvironValue, val);
+}
diff --git a/app/plug-in/gimpenvirontable.h b/app/plug-in/gimpenvirontable.h
new file mode 100644
index 0000000..c77710d
--- /dev/null
+++ b/app/plug-in/gimpenvirontable.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpenvirontable.h
+ * (C) 2002 Manish Singh <yosh@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ENVIRON_TABLE_H__
+#define __GIMP_ENVIRON_TABLE_H__
+
+
+#define GIMP_TYPE_ENVIRON_TABLE            (gimp_environ_table_get_type ())
+#define GIMP_ENVIRON_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ENVIRON_TABLE, GimpEnvironTable))
+#define GIMP_ENVIRON_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ENVIRON_TABLE, GimpEnvironTableClass))
+#define GIMP_IS_ENVIRON_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ENVIRON_TABLE))
+#define GIMP_IS_ENVIRON_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ENVIRON_TABLE))
+#define GIMP_ENVIRON_TABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ENVIRON_TABLE, GimpEnvironTableClass))
+
+
+typedef struct _GimpEnvironTableClass GimpEnvironTableClass;
+
+struct _GimpEnvironTable
+{
+  GObject      parent_instance;
+
+  gboolean     verbose;
+
+  GHashTable  *vars;
+  GHashTable  *internal;
+
+  gchar      **envp;
+};
+
+struct _GimpEnvironTableClass
+{
+  GObjectClass  parent_class;
+};
+
+
+GType               gimp_environ_table_get_type  (void) G_GNUC_CONST;
+GimpEnvironTable  * gimp_environ_table_new       (gboolean          verbose);
+
+void                gimp_environ_table_load      (GimpEnvironTable *environ_table,
+                                                  GList            *path);
+
+void                gimp_environ_table_add       (GimpEnvironTable *environ_table,
+                                                  const gchar      *name,
+                                                  const gchar      *value,
+                                                  const gchar      *separator);
+void                gimp_environ_table_remove    (GimpEnvironTable *environ_table,
+                                                  const gchar      *name);
+
+void                gimp_environ_table_clear     (GimpEnvironTable *environ_table);
+void                gimp_environ_table_clear_all (GimpEnvironTable *environ_table);
+
+gchar            ** gimp_environ_table_get_envp  (GimpEnvironTable *environ_table);
+
+
+#endif /* __GIMP_ENVIRON_TABLE_H__ */
diff --git a/app/plug-in/gimpinterpreterdb.c b/app/plug-in/gimpinterpreterdb.c
new file mode 100644
index 0000000..2eb8f78
--- /dev/null
+++ b/app/plug-in/gimpinterpreterdb.c
@@ -0,0 +1,875 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpinterpreterdb.c
+ * (C) 2005 Manish Singh <yosh@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * The binfmt_misc bits are derived from linux/fs/binfmt_misc.c
+ * Copyright (C) 1997 Richard Günther
+ */
+
+/*
+ * The sh-bang code is derived from linux/fs/binfmt_script.c
+ * Copyright (C) 1996  Martin von Löwis
+ * original #!-checking implemented by tytso.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "gimpinterpreterdb.h"
+
+#include "gimp-intl.h"
+
+
+#define BUFSIZE 4096
+
+
+typedef struct _GimpInterpreterMagic GimpInterpreterMagic;
+
+struct _GimpInterpreterMagic
+{
+  gulong    offset;
+  gchar    *magic;
+  gchar    *mask;
+  guint     size;
+  gchar    *program;
+};
+
+
+static void     gimp_interpreter_db_finalize         (GObject            *object);
+
+static void     gimp_interpreter_db_load_interp_file (GimpInterpreterDB  *db,
+                                                      GFile              *file);
+
+static void     gimp_interpreter_db_add_program      (GimpInterpreterDB  *db,
+                                                      GFile              *file,
+                                                      gchar              *buffer);
+static void     gimp_interpreter_db_add_binfmt_misc  (GimpInterpreterDB  *db,
+                                                      GFile              *file,
+                                                      gchar              *buffer);
+
+static gboolean gimp_interpreter_db_add_extension    (GFile              *file,
+                                                      GimpInterpreterDB  *db,
+                                                      gchar             **tokens);
+static gboolean gimp_interpreter_db_add_magic        (GimpInterpreterDB  *db,
+                                                      gchar             **tokens);
+
+static void     gimp_interpreter_db_clear_magics     (GimpInterpreterDB  *db);
+
+static void     gimp_interpreter_db_resolve_programs (GimpInterpreterDB  *db);
+
+
+G_DEFINE_TYPE (GimpInterpreterDB, gimp_interpreter_db, G_TYPE_OBJECT)
+
+#define parent_class gimp_interpreter_db_parent_class
+
+
+static void
+gimp_interpreter_db_class_init (GimpInterpreterDBClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = gimp_interpreter_db_finalize;
+}
+
+static void
+gimp_interpreter_db_init (GimpInterpreterDB *db)
+{
+}
+
+static void
+gimp_interpreter_db_finalize (GObject *object)
+{
+  GimpInterpreterDB *db = GIMP_INTERPRETER_DB (object);
+
+  gimp_interpreter_db_clear (db);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GimpInterpreterDB *
+gimp_interpreter_db_new (gboolean verbose)
+{
+  GimpInterpreterDB *db = g_object_new (GIMP_TYPE_INTERPRETER_DB, NULL);
+
+  db->verbose = verbose;
+
+  return db;
+}
+
+void
+gimp_interpreter_db_load (GimpInterpreterDB *db,
+                          GList             *path)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_INTERPRETER_DB (db));
+
+  gimp_interpreter_db_clear (db);
+
+  db->programs = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                        g_free, g_free);
+
+  db->extensions = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                          g_free, g_free);
+
+  db->magic_names = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                           g_free, NULL);
+
+  db->extension_names = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                               g_free, NULL);
+
+  for (list = path; list; list = g_list_next (list))
+    {
+      GFile           *dir = list->data;
+      GFileEnumerator *enumerator;
+
+      enumerator =
+        g_file_enumerate_children (dir,
+                                   G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                   G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                   G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                   G_FILE_QUERY_INFO_NONE,
+                                   NULL, NULL);
+
+      if (enumerator)
+        {
+          GFileInfo *info;
+
+          while ((info = g_file_enumerator_next_file (enumerator,
+                                                      NULL, NULL)))
+            {
+              if (! g_file_info_get_is_hidden (info) &&
+                  g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR)
+                {
+                  GFile *file = g_file_enumerator_get_child (enumerator, info);
+
+                  gimp_interpreter_db_load_interp_file (db, file);
+
+                  g_object_unref (file);
+                }
+
+              g_object_unref (info);
+            }
+
+          g_object_unref (enumerator);
+        }
+    }
+
+  gimp_interpreter_db_resolve_programs (db);
+}
+
+void
+gimp_interpreter_db_clear (GimpInterpreterDB *db)
+{
+  g_return_if_fail (GIMP_IS_INTERPRETER_DB (db));
+
+  if (db->magic_names)
+    {
+      g_hash_table_destroy (db->magic_names);
+      db->magic_names = NULL;
+    }
+
+  if (db->extension_names)
+    {
+      g_hash_table_destroy (db->extension_names);
+      db->extension_names = NULL;
+    }
+
+  if (db->programs)
+    {
+      g_hash_table_destroy (db->programs);
+      db->programs = NULL;
+    }
+
+  if (db->extensions)
+    {
+      g_hash_table_destroy (db->extensions);
+      db->extensions = NULL;
+    }
+
+  gimp_interpreter_db_clear_magics (db);
+}
+
+static void
+gimp_interpreter_db_load_interp_file (GimpInterpreterDB *db,
+                                      GFile             *file)
+{
+  GInputStream     *input;
+  GDataInputStream *data_input;
+  gchar            *buffer;
+  gsize             buffer_len;
+  GError           *error = NULL;
+
+  if (db->verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+  if (! input)
+    {
+      g_message (_("Could not open '%s' for reading: %s"),
+                 gimp_file_get_utf8_name (file),
+                 error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  data_input = g_data_input_stream_new (input);
+  g_object_unref (input);
+
+  while ((buffer = g_data_input_stream_read_line (data_input, &buffer_len,
+                                                  NULL, &error)))
+    {
+      /* Skip comments */
+      if (buffer[0] == '#')
+        {
+          g_free (buffer);
+          continue;
+        }
+
+      if (g_ascii_isalnum (buffer[0]) || (buffer[0] == '/'))
+        {
+          gimp_interpreter_db_add_program (db, file, buffer);
+        }
+      else if (! g_ascii_isspace (buffer[0]) && (buffer[0] != '\0'))
+        {
+          gimp_interpreter_db_add_binfmt_misc (db, file, buffer);
+        }
+
+      g_free (buffer);
+    }
+
+  if (error)
+    {
+      g_message (_("Error reading '%s': %s"),
+                 gimp_file_get_utf8_name (file),
+                 error->message);
+      g_clear_error (&error);
+    }
+
+  g_object_unref (data_input);
+}
+
+static void
+gimp_interpreter_db_add_program (GimpInterpreterDB  *db,
+                                 GFile              *file,
+                                 gchar              *buffer)
+{
+  gchar *name;
+  gchar *program;
+  gchar *p;
+
+  p = strchr (buffer, '=');
+  if (! p)
+    return;
+
+  *p = '\0';
+
+  name = buffer;
+  program = p + 1;
+  g_strchomp (program);
+
+  if (! g_file_test (program, G_FILE_TEST_IS_EXECUTABLE))
+    {
+      gchar *prog;
+
+      prog = g_find_program_in_path (program);
+      if (! prog || ! g_file_test (prog, G_FILE_TEST_IS_EXECUTABLE))
+        {
+          g_message (_("Bad interpreter referenced in interpreter file %s: %s"),
+                     gimp_file_get_utf8_name (file),
+                     gimp_filename_to_utf8 (program));
+          if (prog)
+            g_free (prog);
+          return;
+        }
+      program = prog;
+    }
+  else
+    program = g_strdup (program);
+
+  if (! g_hash_table_lookup (db->programs, name))
+    g_hash_table_insert (db->programs, g_strdup (name), program);
+}
+
+static void
+gimp_interpreter_db_add_binfmt_misc (GimpInterpreterDB *db,
+                                     GFile             *file,
+                                     gchar             *buffer)
+{
+  gchar **tokens = NULL;
+  gchar  *name, *type, *program;
+  gsize   count;
+  gchar   del[2];
+
+  count = strlen (buffer);
+
+  if ((count < 10) || (count > 255))
+    goto bail;
+
+  buffer = g_strndup (buffer, count + 9);
+
+  del[0] = *buffer;
+  del[1] = '\0';
+
+  memset (buffer + count, del[0], 8);
+
+  tokens = g_strsplit (buffer + 1, del, -1);
+
+  g_free (buffer);
+
+  name    = tokens[0];
+  type    = tokens[1];
+  program = tokens[5];
+
+  if ((name[0] == '\0') || (program[0] == '\0') ||
+      (type[0] == '\0') || (type[1] != '\0'))
+    goto bail;
+
+  switch (type[0])
+    {
+    case 'E':
+      if (! gimp_interpreter_db_add_extension (file, db, tokens))
+        goto bail;
+      break;
+
+    case 'M':
+      if (! gimp_interpreter_db_add_magic (db, tokens))
+        goto bail;
+      break;
+
+    default:
+      goto bail;
+    }
+
+  goto out;
+
+bail:
+  g_message (_("Bad binary format string in interpreter file %s"),
+             gimp_file_get_utf8_name (file));
+
+out:
+  g_strfreev (tokens);
+}
+
+static gboolean
+gimp_interpreter_db_add_extension (GFile              *file,
+                                   GimpInterpreterDB  *db,
+                                   gchar             **tokens)
+{
+  const gchar *name      = tokens[0];
+  const gchar *extension = tokens[3];
+  const gchar *program   = tokens[5];
+
+  if (! g_hash_table_lookup (db->extension_names, name))
+    {
+      gchar *prog;
+
+      if (extension[0] == '\0' || extension[0] == '/')
+        return FALSE;
+
+      if (! g_file_test (program, G_FILE_TEST_IS_EXECUTABLE))
+        {
+          prog = g_find_program_in_path (program);
+          if (! prog || ! g_file_test (prog, G_FILE_TEST_IS_EXECUTABLE))
+            {
+              g_message (_("Bad interpreter referenced in interpreter file %s: %s"),
+                         gimp_file_get_utf8_name (file),
+                         gimp_filename_to_utf8 (program));
+              if (prog)
+                g_free (prog);
+              return FALSE;
+            }
+        }
+      else
+        prog = g_strdup (program);
+
+      g_hash_table_insert (db->extensions, g_strdup (extension), prog);
+      g_hash_table_insert (db->extension_names, g_strdup (name), prog);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+scanarg (const gchar *s)
+{
+  gchar c;
+
+  while ((c = *s++) != '\0')
+    {
+      if (c == '\\' && *s == 'x')
+        {
+          s++;
+
+          if (! g_ascii_isxdigit (*s++))
+            return FALSE;
+
+          if (! g_ascii_isxdigit (*s++))
+            return FALSE;
+        }
+   }
+
+  return TRUE;
+}
+
+static guint
+unquote (gchar *from)
+{
+  gchar *s = from;
+  gchar *p = from;
+  gchar  c;
+
+  while ((c = *s++) != '\0')
+    {
+      if (c == '\\' && *s == 'x')
+        {
+          s++;
+          *p = g_ascii_xdigit_value (*s++) << 4;
+          *p++ |= g_ascii_xdigit_value (*s++);
+          continue;
+        }
+
+      *p++ = c;
+    }
+
+  return p - from;
+}
+
+static gboolean
+gimp_interpreter_db_add_magic (GimpInterpreterDB  *db,
+                               gchar             **tokens)
+{
+  GimpInterpreterMagic *interp_magic;
+  gchar                *name, *num, *magic, *mask, *program;
+  gulong                offset;
+  guint                 size;
+
+  name    = tokens[0];
+  num     = tokens[2];
+  magic   = tokens[3];
+  mask    = tokens[4];
+  program = tokens[5];
+
+  if (! g_hash_table_lookup (db->magic_names, name))
+    {
+      if (num[0] != '\0')
+        {
+          offset = strtoul (num, &num, 10);
+
+          if (num[0] != '\0')
+            return FALSE;
+
+          if (offset > (BUFSIZE / 4))
+            return FALSE;
+        }
+      else
+        {
+          offset = 0;
+        }
+
+      if (! scanarg (magic))
+        return FALSE;
+
+      if (! scanarg (mask))
+        return FALSE;
+
+      size = unquote (magic);
+
+      if ((size + offset) > (BUFSIZE / 2))
+        return FALSE;
+
+      if (mask[0] == '\0')
+        mask = NULL;
+      else if (unquote (mask) != size)
+        return FALSE;
+
+      interp_magic = g_slice_new (GimpInterpreterMagic);
+
+      interp_magic->offset  = offset;
+      interp_magic->magic   = g_memdup (magic, size);
+      interp_magic->mask    = g_memdup (mask, size);
+      interp_magic->size    = size;
+      interp_magic->program = g_strdup (program);
+
+      db->magics = g_slist_append (db->magics, interp_magic);
+
+      g_hash_table_insert (db->magic_names, g_strdup (name), interp_magic);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_interpreter_db_clear_magics (GimpInterpreterDB *db)
+{
+  GimpInterpreterMagic *magic;
+  GSList               *list, *last;
+
+  list = db->magics;
+  db->magics = NULL;
+
+  while (list)
+    {
+      magic = list->data;
+
+      g_free (magic->magic);
+      g_free (magic->mask);
+      g_free (magic->program);
+
+      g_slice_free (GimpInterpreterMagic, magic);
+
+      last = list;
+      list = list->next;
+
+      g_slist_free_1 (last);
+    }
+}
+
+#ifdef INTERP_DEBUG
+static void
+print_kv (gpointer key,
+          gpointer value,
+          gpointer user_data)
+{
+  g_print ("%s: %s\n", (gchar *) key, (gchar *) value);
+}
+
+static gchar *
+quote (gchar *s,
+       guint  size)
+{
+  GString *d;
+  guint    i;
+
+  if (s == NULL)
+    return "(null)";
+
+  d = g_string_sized_new (size * 4);
+
+  for (i = 0; i < size; i++)
+    g_string_append_printf (d, "\\x%02x", ((guint) s[i]) & 0xff);
+
+  return g_string_free (d, FALSE);
+}
+#endif
+
+static gboolean
+resolve_program (gpointer key,
+                 gpointer value,
+                 gpointer user_data)
+{
+  GimpInterpreterDB *db = user_data;
+  gchar             *program;
+
+  program = g_hash_table_lookup (db->programs, value);
+
+  if (program != NULL)
+    {
+      g_free (value);
+      value = g_strdup (program);
+    }
+
+  g_hash_table_insert (db->extensions, key, value);
+
+  return TRUE;
+}
+
+static void
+gimp_interpreter_db_resolve_programs (GimpInterpreterDB *db)
+{
+  GSList     *list;
+  GHashTable *extensions;
+
+  for (list = db->magics; list; list = list->next)
+    {
+      GimpInterpreterMagic *magic = list->data;
+      const gchar          *program;
+
+      program = g_hash_table_lookup (db->programs, magic->program);
+
+      if (program != NULL)
+        {
+          g_free (magic->program);
+          magic->program = g_strdup (program);
+        }
+    }
+
+  extensions = db->extensions;
+  db->extensions = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                          g_free, g_free);
+
+  g_hash_table_foreach_steal (extensions, resolve_program, db);
+
+  g_hash_table_destroy (extensions);
+
+#ifdef INTERP_DEBUG
+  g_print ("Programs:\n");
+  g_hash_table_foreach (db->programs, print_kv, NULL);
+
+  g_print ("\nExtensions:\n");
+  g_hash_table_foreach (db->extensions, print_kv, NULL);
+
+  g_print ("\nMagics:\n");
+
+  list = db->magics;
+
+  while (list)
+    {
+      GimpInterpreterMagic *magic;
+
+      magic = list->data;
+      g_print ("program: %s, offset: %lu, magic: %s, mask: %s\n",
+               magic->program, magic->offset,
+               quote (magic->magic, magic->size),
+               quote (magic->mask, magic->size));
+
+      list = list->next;
+    }
+
+  g_print ("\n");
+#endif
+}
+
+static gchar *
+resolve_extension (GimpInterpreterDB *db,
+                   const gchar       *program_path)
+{
+  gchar       *filename;
+  gchar       *p;
+  const gchar *program;
+
+  filename = g_path_get_basename (program_path);
+
+  p = strrchr (filename, '.');
+  if (! p)
+    {
+      g_free (filename);
+      return NULL;
+    }
+
+  program = g_hash_table_lookup (db->extensions, p + 1);
+
+  g_free (filename);
+
+  return g_strdup (program);
+}
+
+static gchar *
+resolve_sh_bang (GimpInterpreterDB  *db,
+                 const gchar        *program_path,
+                 gchar              *buffer,
+                 gssize              len,
+                 gchar             **interp_arg)
+{
+  gchar *cp;
+  gchar *name;
+  gchar *program;
+
+  cp = strchr (buffer, '\n');
+  if (! cp)
+    cp = buffer + len - 1;
+
+  *cp = '\0';
+
+  while (cp > buffer)
+    {
+      cp--;
+      if ((*cp == ' ') || (*cp == '\t') || (*cp == '\r'))
+        *cp = '\0';
+      else
+        break;
+    }
+
+  for (cp = buffer + 2; (*cp == ' ') || (*cp == '\t'); cp++);
+
+  if (*cp == '\0')
+    return NULL;
+
+  name = cp;
+
+  for ( ; *cp && (*cp != ' ') && (*cp != '\t'); cp++)
+    /* nothing */ ;
+
+  while ((*cp == ' ') || (*cp == '\t'))
+    *cp++ = '\0';
+
+  if (*cp)
+    {
+      if (strcmp ("/usr/bin/env", name) == 0)
+        {
+          program = g_hash_table_lookup (db->programs, cp);
+
+          if (program)
+            {
+              /* Shift program name and arguments to the right, if and
+               * only if we recorded a specific interpreter for such
+               * script. Otherwise let `env` tool do its job.
+               */
+              name = cp;
+
+              for ( ; *cp && (*cp != ' ') && (*cp != '\t'); cp++)
+                ;
+
+              while ((*cp == ' ') || (*cp == '\t'))
+                *cp++ = '\0';
+            }
+        }
+
+      if (*cp)
+        *interp_arg = g_strdup (cp);
+    }
+
+  program = g_hash_table_lookup (db->programs, name);
+  if (! program)
+    program = name;
+
+  return g_strdup (program);
+}
+
+static gchar *
+resolve_magic (GimpInterpreterDB *db,
+               const gchar       *program_path,
+               gchar             *buffer)
+{
+  GSList                *list;
+  GimpInterpreterMagic  *magic;
+  gchar                 *s;
+  guint                  i;
+
+  list = db->magics;
+
+  while (list)
+    {
+      magic = list->data;
+
+      s = buffer + magic->offset;
+
+      if (magic->mask)
+        {
+          for (i = 0; i < magic->size; i++)
+            if ((*s++ ^ magic->magic[i]) & magic->mask[i])
+              break;
+        }
+      else
+        {
+          for (i = 0; i < magic->size; i++)
+            if ((*s++ ^ magic->magic[i]))
+              break;
+        }
+
+      if (i == magic->size)
+        return g_strdup (magic->program);
+
+      list = list->next;
+    }
+
+  return NULL;
+}
+
+gchar *
+gimp_interpreter_db_resolve (GimpInterpreterDB  *db,
+                             const gchar        *program_path,
+                             gchar             **interp_arg)
+{
+  GFile        *file;
+  GInputStream *input;
+  gchar        *program = NULL;
+
+  g_return_val_if_fail (GIMP_IS_INTERPRETER_DB (db), NULL);
+  g_return_val_if_fail (program_path != NULL, NULL);
+  g_return_val_if_fail (interp_arg != NULL, NULL);
+
+  *interp_arg = NULL;
+
+  file = g_file_new_for_path (program_path);
+  input = G_INPUT_STREAM (g_file_read (file, NULL, NULL));
+  g_object_unref (file);
+
+  if (input)
+    {
+      gsize bytes_read;
+      gchar buffer[BUFSIZE];
+
+      memset (buffer, 0, sizeof (buffer));
+      g_input_stream_read_all (input, buffer,
+                               sizeof (buffer) - 1, /* leave one nul at the end */
+                               &bytes_read, NULL, NULL);
+      g_object_unref (input);
+
+      if (bytes_read)
+        {
+          if (bytes_read > 3 && buffer[0] == '#' && buffer[1] == '!')
+            program = resolve_sh_bang (db, program_path, buffer, bytes_read, interp_arg);
+
+          if (! program)
+            program = resolve_magic (db, program_path, buffer);
+        }
+    }
+
+  if (! program)
+    program = resolve_extension (db, program_path);
+
+  return program;
+}
+
+static void
+collect_extensions (const gchar *ext,
+                    const gchar *program G_GNUC_UNUSED,
+                    GString     *str)
+{
+  if (str->len)
+    g_string_append_c (str, G_SEARCHPATH_SEPARATOR);
+
+  g_string_append_c (str, '.');
+  g_string_append (str, ext);
+}
+
+/**
+ * gimp_interpreter_db_get_extensions:
+ * @db:
+ *
+ * Return value: a newly allocated string with all registered file
+ *               extensions separated by %G_SEARCHPATH_SEPARATOR;
+ *               or %NULL if no extensions are registered
+ **/
+gchar *
+gimp_interpreter_db_get_extensions (GimpInterpreterDB *db)
+{
+  GString *str;
+
+  g_return_val_if_fail (GIMP_IS_INTERPRETER_DB (db), NULL);
+
+  if (g_hash_table_size (db->extensions) == 0)
+    return NULL;
+
+  str = g_string_new (NULL);
+
+  g_hash_table_foreach (db->extensions, (GHFunc) collect_extensions, str);
+
+  return g_string_free (str, FALSE);
+}
diff --git a/app/plug-in/gimpinterpreterdb.h b/app/plug-in/gimpinterpreterdb.h
new file mode 100644
index 0000000..4c77acc
--- /dev/null
+++ b/app/plug-in/gimpinterpreterdb.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpinterpreterdb.h
+ * (C) 2005 Manish Singh <yosh@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_INTERPRETER_DB_H__
+#define __GIMP_INTERPRETER_DB_H__
+
+
+#define GIMP_TYPE_INTERPRETER_DB            (gimp_interpreter_db_get_type ())
+#define GIMP_INTERPRETER_DB(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_INTERPRETER_DB, GimpInterpreterDB))
+#define GIMP_INTERPRETER_DB_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_INTERPRETER_DB, GimpInterpreterDBClass))
+#define GIMP_IS_INTERPRETER_DB(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_INTERPRETER_DB))
+#define GIMP_IS_INTERPRETER_DB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_INTERPRETER_DB))
+#define GIMP_INTERPRETER_DB_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INTERPRETER_DB, GimpInterpreterDBClass))
+
+
+typedef struct _GimpInterpreterDBClass GimpInterpreterDBClass;
+
+struct _GimpInterpreterDB
+{
+  GObject     parent_instance;
+
+  gboolean    verbose;
+
+  GHashTable *programs;
+
+  GSList     *magics;
+  GHashTable *magic_names;
+
+  GHashTable *extensions;
+  GHashTable *extension_names;
+};
+
+struct _GimpInterpreterDBClass
+{
+  GObjectClass  parent_class;
+};
+
+
+GType               gimp_interpreter_db_get_type (void) G_GNUC_CONST;
+GimpInterpreterDB * gimp_interpreter_db_new      (gboolean            verbose);
+
+void                gimp_interpreter_db_load     (GimpInterpreterDB  *db,
+                                                  GList              *path);
+
+void                gimp_interpreter_db_clear    (GimpInterpreterDB  *db);
+
+gchar             * gimp_interpreter_db_resolve  (GimpInterpreterDB  *db,
+                                                  const gchar        *program_path,
+                                                  gchar             **interp_arg);
+gchar       * gimp_interpreter_db_get_extensions (GimpInterpreterDB  *db);
+
+
+#endif /* __GIMP_INTERPRETER_DB_H__ */
diff --git a/app/plug-in/gimpplugin-cleanup.c b/app/plug-in/gimpplugin-cleanup.c
new file mode 100644
index 0000000..96c81d8
--- /dev/null
+++ b/app/plug-in/gimpplugin-cleanup.c
@@ -0,0 +1,578 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-cleanup.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-shadow.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpundostack.h"
+
+#include "gimpplugin.h"
+#include "gimpplugin-cleanup.h"
+#include "gimppluginmanager.h"
+#include "gimppluginprocedure.h"
+
+#include "gimp-log.h"
+
+
+typedef struct _GimpPlugInCleanupImage GimpPlugInCleanupImage;
+
+struct _GimpPlugInCleanupImage
+{
+  GimpImage *image;
+  gint       image_ID;
+
+  gint       undo_group_count;
+  gint       layers_freeze_count;
+  gint       channels_freeze_count;
+  gint       vectors_freeze_count;
+};
+
+
+typedef struct _GimpPlugInCleanupItem GimpPlugInCleanupItem;
+
+struct _GimpPlugInCleanupItem
+{
+  GimpItem *item;
+  gint      item_ID;
+
+  gboolean  shadow_buffer;
+};
+
+
+/*  local function prototypes  */
+
+static GimpPlugInCleanupImage *
+              gimp_plug_in_cleanup_image_new      (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpImage              *image);
+static void   gimp_plug_in_cleanup_image_free     (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpPlugInCleanupImage *cleanup);
+static gboolean
+              gimp_plug_in_cleanup_image_is_clean (GimpPlugInCleanupImage *cleanup);
+static GimpPlugInCleanupImage *
+              gimp_plug_in_cleanup_image_get      (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpImage              *image);
+static void   gimp_plug_in_cleanup_image          (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpPlugInCleanupImage *cleanup);
+
+static GimpPlugInCleanupItem *
+              gimp_plug_in_cleanup_item_new       (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpItem               *item);
+static void   gimp_plug_in_cleanup_item_free      (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpPlugInCleanupItem  *cleanup);
+static gboolean
+              gimp_plug_in_cleanup_item_is_clean  (GimpPlugInCleanupItem  *cleanup);
+static GimpPlugInCleanupItem *
+              gimp_plug_in_cleanup_item_get       (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpItem               *item);
+static void   gimp_plug_in_cleanup_item           (GimpPlugInProcFrame    *proc_frame,
+                                                   GimpPlugInCleanupItem  *cleanup);
+
+
+/*  public functions  */
+
+gboolean
+gimp_plug_in_cleanup_undo_group_start (GimpPlugIn *plug_in,
+                                       GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    cleanup = gimp_plug_in_cleanup_image_new (proc_frame, image);
+
+  cleanup->undo_group_count++;
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_cleanup_undo_group_end (GimpPlugIn *plug_in,
+                                     GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    return FALSE;
+
+  if (cleanup->undo_group_count > 0)
+    {
+      cleanup->undo_group_count--;
+
+      if (gimp_plug_in_cleanup_image_is_clean (cleanup))
+        gimp_plug_in_cleanup_image_free (proc_frame, cleanup);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_plug_in_cleanup_layers_freeze (GimpPlugIn *plug_in,
+                                    GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    cleanup = gimp_plug_in_cleanup_image_new (proc_frame, image);
+
+  cleanup->layers_freeze_count++;
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_cleanup_layers_thaw (GimpPlugIn *plug_in,
+                                  GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    return FALSE;
+
+  if (cleanup->layers_freeze_count > 0)
+    {
+      cleanup->layers_freeze_count--;
+
+      if (gimp_plug_in_cleanup_image_is_clean (cleanup))
+        gimp_plug_in_cleanup_image_free (proc_frame, cleanup);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_plug_in_cleanup_channels_freeze (GimpPlugIn *plug_in,
+                                      GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    cleanup = gimp_plug_in_cleanup_image_new (proc_frame, image);
+
+  cleanup->channels_freeze_count++;
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_cleanup_channels_thaw (GimpPlugIn *plug_in,
+                                    GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    return FALSE;
+
+  if (cleanup->channels_freeze_count > 0)
+    {
+      cleanup->channels_freeze_count--;
+
+      if (gimp_plug_in_cleanup_image_is_clean (cleanup))
+        gimp_plug_in_cleanup_image_free (proc_frame, cleanup);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_plug_in_cleanup_vectors_freeze (GimpPlugIn *plug_in,
+                                     GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    cleanup = gimp_plug_in_cleanup_image_new (proc_frame, image);
+
+  cleanup->vectors_freeze_count++;
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_cleanup_vectors_thaw (GimpPlugIn *plug_in,
+                                   GimpImage  *image)
+{
+  GimpPlugInProcFrame    *proc_frame;
+  GimpPlugInCleanupImage *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_image_get (proc_frame, image);
+
+  if (! cleanup)
+    return FALSE;
+
+  if (cleanup->vectors_freeze_count > 0)
+    {
+      cleanup->vectors_freeze_count--;
+
+      if (gimp_plug_in_cleanup_image_is_clean (cleanup))
+        gimp_plug_in_cleanup_image_free (proc_frame, cleanup);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_plug_in_cleanup_add_shadow (GimpPlugIn   *plug_in,
+                                 GimpDrawable *drawable)
+{
+  GimpPlugInProcFrame   *proc_frame;
+  GimpPlugInCleanupItem *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_item_get (proc_frame, GIMP_ITEM (drawable));
+
+  if (! cleanup)
+    cleanup = gimp_plug_in_cleanup_item_new (proc_frame, GIMP_ITEM (drawable));
+
+  cleanup->shadow_buffer = TRUE;
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_cleanup_remove_shadow (GimpPlugIn   *plug_in,
+                                    GimpDrawable *drawable)
+{
+  GimpPlugInProcFrame   *proc_frame;
+  GimpPlugInCleanupItem *cleanup;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+  cleanup    = gimp_plug_in_cleanup_item_get (proc_frame, GIMP_ITEM (drawable));
+
+  if (! cleanup)
+    return FALSE;
+
+  if (cleanup->shadow_buffer)
+    {
+      cleanup->shadow_buffer = FALSE;
+
+      if (gimp_plug_in_cleanup_item_is_clean (cleanup))
+        gimp_plug_in_cleanup_item_free (proc_frame, cleanup);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_plug_in_cleanup (GimpPlugIn          *plug_in,
+                      GimpPlugInProcFrame *proc_frame)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (proc_frame != NULL);
+
+  while (proc_frame->image_cleanups)
+    {
+      GimpPlugInCleanupImage *cleanup = proc_frame->image_cleanups->data;
+
+      if (gimp_image_get_by_ID (plug_in->manager->gimp,
+                                cleanup->image_ID) == cleanup->image)
+        {
+          gimp_plug_in_cleanup_image (proc_frame, cleanup);
+        }
+
+      gimp_plug_in_cleanup_image_free (proc_frame, cleanup);
+    }
+
+  while (proc_frame->item_cleanups)
+    {
+      GimpPlugInCleanupItem *cleanup = proc_frame->item_cleanups->data;
+
+      if (gimp_item_get_by_ID (plug_in->manager->gimp,
+                               cleanup->item_ID) == cleanup->item)
+        {
+          gimp_plug_in_cleanup_item (proc_frame, cleanup);
+        }
+
+      gimp_plug_in_cleanup_item_free (proc_frame, cleanup);
+    }
+}
+
+
+/*  private functions  */
+
+static GimpPlugInCleanupImage *
+gimp_plug_in_cleanup_image_new (GimpPlugInProcFrame *proc_frame,
+                                GimpImage           *image)
+{
+  GimpPlugInCleanupImage *cleanup = g_slice_new0 (GimpPlugInCleanupImage);
+
+  cleanup->image    = image;
+  cleanup->image_ID = gimp_image_get_ID (image);
+
+  proc_frame->image_cleanups = g_list_prepend (proc_frame->image_cleanups,
+                                               cleanup);
+
+  return cleanup;
+}
+
+static void
+gimp_plug_in_cleanup_image_free (GimpPlugInProcFrame    *proc_frame,
+                                 GimpPlugInCleanupImage *cleanup)
+{
+  proc_frame->image_cleanups = g_list_remove (proc_frame->image_cleanups,
+                                              cleanup);
+
+  g_slice_free (GimpPlugInCleanupImage, cleanup);
+}
+
+static gboolean
+gimp_plug_in_cleanup_image_is_clean (GimpPlugInCleanupImage *cleanup)
+{
+  if (cleanup->undo_group_count > 0)
+    return FALSE;
+
+  if (cleanup->layers_freeze_count > 0)
+    return FALSE;
+
+  if (cleanup->channels_freeze_count > 0)
+    return FALSE;
+
+  if (cleanup->vectors_freeze_count > 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static GimpPlugInCleanupImage *
+gimp_plug_in_cleanup_image_get (GimpPlugInProcFrame *proc_frame,
+                                GimpImage           *image)
+{
+  GList *list;
+
+  for (list = proc_frame->image_cleanups; list; list = g_list_next (list))
+    {
+      GimpPlugInCleanupImage *cleanup = list->data;
+
+      if (cleanup->image == image)
+        return cleanup;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_plug_in_cleanup_image (GimpPlugInProcFrame    *proc_frame,
+                            GimpPlugInCleanupImage *cleanup)
+{
+  GimpImage     *image = cleanup->image;
+  GimpContainer *container;
+
+  if (cleanup->undo_group_count > 0)
+    {
+      g_message ("Plug-in '%s' left image undo in inconsistent state, "
+                 "closing open undo groups.",
+                 gimp_procedure_get_label (proc_frame->procedure));
+
+      while (cleanup->undo_group_count--)
+        if (! gimp_image_undo_group_end (image))
+          break;
+    }
+
+  container = gimp_image_get_layers (image);
+
+  if (cleanup->layers_freeze_count > 0)
+    {
+      g_message ("Plug-in '%s' left image's layers frozen, "
+                 "thawing layers.",
+                 gimp_procedure_get_label (proc_frame->procedure));
+
+      while (cleanup->layers_freeze_count-- > 0 &&
+             gimp_container_frozen (container))
+        {
+          gimp_container_thaw (container);
+        }
+    }
+
+  container = gimp_image_get_channels (image);
+
+  if (cleanup->channels_freeze_count > 0)
+    {
+      g_message ("Plug-in '%s' left image's channels frozen, "
+                 "thawing channels.",
+                 gimp_procedure_get_label (proc_frame->procedure));
+
+      while (cleanup->channels_freeze_count-- > 0 &&
+             gimp_container_frozen (container))
+        {
+          gimp_container_thaw (container);
+        }
+    }
+
+  container = gimp_image_get_vectors (image);
+
+  if (cleanup->vectors_freeze_count > 0)
+    {
+      g_message ("Plug-in '%s' left image's vectors frozen, "
+                 "thawing vectors.",
+                 gimp_procedure_get_label (proc_frame->procedure));
+
+      while (cleanup->vectors_freeze_count > 0 &&
+             gimp_container_frozen (container))
+        {
+          gimp_container_thaw (container);
+        }
+    }
+}
+
+static GimpPlugInCleanupItem *
+gimp_plug_in_cleanup_item_new (GimpPlugInProcFrame *proc_frame,
+                               GimpItem            *item)
+{
+  GimpPlugInCleanupItem *cleanup = g_slice_new0 (GimpPlugInCleanupItem);
+
+  cleanup->item    = item;
+  cleanup->item_ID = gimp_item_get_ID (item);
+
+  proc_frame->item_cleanups = g_list_prepend (proc_frame->item_cleanups,
+                                              cleanup);
+
+  return cleanup;
+}
+
+static void
+gimp_plug_in_cleanup_item_free (GimpPlugInProcFrame   *proc_frame,
+                                GimpPlugInCleanupItem *cleanup)
+{
+  proc_frame->item_cleanups = g_list_remove (proc_frame->item_cleanups,
+                                             cleanup);
+
+  g_slice_free (GimpPlugInCleanupItem, cleanup);
+}
+
+static gboolean
+gimp_plug_in_cleanup_item_is_clean (GimpPlugInCleanupItem *cleanup)
+{
+  if (cleanup->shadow_buffer)
+    return FALSE;
+
+  return TRUE;
+}
+
+static GimpPlugInCleanupItem *
+gimp_plug_in_cleanup_item_get (GimpPlugInProcFrame *proc_frame,
+                               GimpItem            *item)
+{
+  GList *list;
+
+  for (list = proc_frame->item_cleanups; list; list = g_list_next (list))
+    {
+      GimpPlugInCleanupItem *cleanup = list->data;
+
+      if (cleanup->item == item)
+        return cleanup;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_plug_in_cleanup_item (GimpPlugInProcFrame   *proc_frame,
+                           GimpPlugInCleanupItem *cleanup)
+{
+  GimpItem *item = cleanup->item;
+
+  if (cleanup->shadow_buffer)
+    {
+      GIMP_LOG (SHADOW_TILES,
+                "Freeing shadow buffer of drawable '%s' on behalf of '%s'.",
+                gimp_object_get_name (item),
+                gimp_procedure_get_label (proc_frame->procedure));
+
+      gimp_drawable_free_shadow_buffer (GIMP_DRAWABLE (item));
+
+      cleanup->shadow_buffer = FALSE;
+    }
+}
diff --git a/app/plug-in/gimpplugin-cleanup.h b/app/plug-in/gimpplugin-cleanup.h
new file mode 100644
index 0000000..cb3b22d
--- /dev/null
+++ b/app/plug-in/gimpplugin-cleanup.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-cleanup.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_CLEANUP_H__
+#define __GIMP_PLUG_IN_CLEANUP_H__
+
+
+gboolean   gimp_plug_in_cleanup_undo_group_start (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+gboolean   gimp_plug_in_cleanup_undo_group_end   (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+
+gboolean   gimp_plug_in_cleanup_layers_freeze    (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+gboolean   gimp_plug_in_cleanup_layers_thaw      (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+
+gboolean   gimp_plug_in_cleanup_channels_freeze  (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+gboolean   gimp_plug_in_cleanup_channels_thaw    (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+
+gboolean   gimp_plug_in_cleanup_vectors_freeze   (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+gboolean   gimp_plug_in_cleanup_vectors_thaw     (GimpPlugIn          *plug_in,
+                                                  GimpImage           *image);
+
+gboolean   gimp_plug_in_cleanup_add_shadow       (GimpPlugIn          *plug_in,
+                                                  GimpDrawable        *drawable);
+gboolean   gimp_plug_in_cleanup_remove_shadow    (GimpPlugIn          *plug_in,
+                                                  GimpDrawable        *drawable);
+
+void       gimp_plug_in_cleanup                  (GimpPlugIn          *plug_in,
+                                                  GimpPlugInProcFrame *proc_frame);
+
+
+#endif /* __GIMP_PLUG_IN_CLEANUP_H__ */
diff --git a/app/plug-in/gimpplugin-context.c b/app/plug-in/gimpplugin-context.c
new file mode 100644
index 0000000..6817695
--- /dev/null
+++ b/app/plug-in/gimpplugin-context.c
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-context.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+
+#include "pdb/gimppdbcontext.h"
+
+#include "gimpplugin.h"
+#include "gimpplugin-context.h"
+#include "gimppluginmanager.h"
+
+
+gboolean
+gimp_plug_in_context_push (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+  GimpContext         *parent;
+  GimpContext         *context;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame->context_stack)
+    parent = proc_frame->context_stack->data;
+  else
+    parent = proc_frame->main_context;
+
+  context = gimp_pdb_context_new (plug_in->manager->gimp, parent, FALSE);
+
+  proc_frame->context_stack = g_list_prepend (proc_frame->context_stack,
+                                              context);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_context_pop (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame->context_stack)
+    {
+      GimpContext *context = proc_frame->context_stack->data;
+
+      proc_frame->context_stack = g_list_remove (proc_frame->context_stack,
+                                                 context);
+      g_object_unref (context);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/plug-in/gimpplugin-context.h b/app/plug-in/gimpplugin-context.h
new file mode 100644
index 0000000..8e46a20
--- /dev/null
+++ b/app/plug-in/gimpplugin-context.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-context.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_CONTEXT_H__
+#define __GIMP_PLUG_IN_CONTEXT_H__
+
+
+gboolean  gimp_plug_in_context_push (GimpPlugIn *plug_in);
+gboolean  gimp_plug_in_context_pop  (GimpPlugIn *plug_in);
+
+
+#endif /* __GIMP_PLUG_IN_CONTEXT_H__ */
diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c
new file mode 100644
index 0000000..b27035e
--- /dev/null
+++ b/app/plug-in/gimpplugin-message.c
@@ -0,0 +1,1063 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-message.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpprotocol.h"
+#include "libgimpbase/gimpwire.h"
+
+#include "plug-in-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-babl-compat.h"
+#include "gegl/gimp-gegl-tile-compat.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-shadow.h"
+
+#include "pdb/gimp-pdb-compat.h"
+#include "pdb/gimppdb.h"
+#include "pdb/gimppdberror.h"
+
+#include "gimpplugin.h"
+#include "gimpplugin-cleanup.h"
+#include "gimpplugin-message.h"
+#include "gimppluginmanager.h"
+#include "gimpplugindef.h"
+#include "gimppluginshm.h"
+#include "gimptemporaryprocedure.h"
+#include "plug-in-params.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void gimp_plug_in_handle_quit             (GimpPlugIn      *plug_in);
+static void gimp_plug_in_handle_tile_request     (GimpPlugIn      *plug_in,
+                                                  GPTileReq       *request);
+static void gimp_plug_in_handle_tile_put         (GimpPlugIn      *plug_in,
+                                                  GPTileReq       *request);
+static void gimp_plug_in_handle_tile_get         (GimpPlugIn      *plug_in,
+                                                  GPTileReq       *request);
+static void gimp_plug_in_handle_proc_run         (GimpPlugIn      *plug_in,
+                                                  GPProcRun       *proc_run);
+static void gimp_plug_in_handle_proc_return      (GimpPlugIn      *plug_in,
+                                                  GPProcReturn    *proc_return);
+static void gimp_plug_in_handle_temp_proc_return (GimpPlugIn      *plug_in,
+                                                  GPProcReturn    *proc_return);
+static void gimp_plug_in_handle_proc_install     (GimpPlugIn      *plug_in,
+                                                  GPProcInstall   *proc_install);
+static void gimp_plug_in_handle_proc_uninstall   (GimpPlugIn      *plug_in,
+                                                  GPProcUninstall *proc_uninstall);
+static void gimp_plug_in_handle_extension_ack    (GimpPlugIn      *plug_in);
+static void gimp_plug_in_handle_has_init         (GimpPlugIn      *plug_in);
+
+
+/*  public functions  */
+
+void
+gimp_plug_in_handle_message (GimpPlugIn      *plug_in,
+                             GimpWireMessage *msg)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (plug_in->open == TRUE);
+  g_return_if_fail (msg != NULL);
+
+  switch (msg->type)
+    {
+    case GP_QUIT:
+      gimp_plug_in_handle_quit (plug_in);
+      break;
+
+    case GP_CONFIG:
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent a CONFIG message.  This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+      break;
+
+    case GP_TILE_REQ:
+      gimp_plug_in_handle_tile_request (plug_in, msg->data);
+      break;
+
+    case GP_TILE_ACK:
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent a TILE_ACK message.  This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+      break;
+
+    case GP_TILE_DATA:
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent a TILE_DATA message.  This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+      break;
+
+    case GP_PROC_RUN:
+      gimp_plug_in_handle_proc_run (plug_in, msg->data);
+      break;
+
+    case GP_PROC_RETURN:
+      gimp_plug_in_handle_proc_return (plug_in, msg->data);
+      break;
+
+    case GP_TEMP_PROC_RUN:
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent a TEMP_PROC_RUN message.  This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+      break;
+
+    case GP_TEMP_PROC_RETURN:
+      gimp_plug_in_handle_temp_proc_return (plug_in, msg->data);
+      break;
+
+    case GP_PROC_INSTALL:
+      gimp_plug_in_handle_proc_install (plug_in, msg->data);
+      break;
+
+    case GP_PROC_UNINSTALL:
+      gimp_plug_in_handle_proc_uninstall (plug_in, msg->data);
+      break;
+
+    case GP_EXTENSION_ACK:
+      gimp_plug_in_handle_extension_ack (plug_in);
+      break;
+
+    case GP_HAS_INIT:
+      gimp_plug_in_handle_has_init (plug_in);
+      break;
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_plug_in_handle_quit (GimpPlugIn *plug_in)
+{
+  gimp_plug_in_close (plug_in, FALSE);
+}
+
+static void
+gimp_plug_in_handle_tile_request (GimpPlugIn *plug_in,
+                                  GPTileReq  *request)
+{
+  g_return_if_fail (request != NULL);
+
+  if (request->drawable_ID == -1)
+    gimp_plug_in_handle_tile_put (plug_in, request);
+  else
+    gimp_plug_in_handle_tile_get (plug_in, request);
+}
+
+static void
+gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
+                              GPTileReq  *request)
+{
+  GPTileData       tile_data;
+  GPTileData      *tile_info;
+  GimpWireMessage  msg;
+  GimpDrawable    *drawable;
+  GeglBuffer      *buffer;
+  const Babl      *format;
+  GeglRectangle    tile_rect;
+
+  tile_data.drawable_ID = -1;
+  tile_data.tile_num    = 0;
+  tile_data.shadow      = 0;
+  tile_data.bpp         = 0;
+  tile_data.width       = 0;
+  tile_data.height      = 0;
+  tile_data.use_shm     = (plug_in->manager->shm != NULL);
+  tile_data.data        = NULL;
+
+  if (! gp_tile_data_write (plug_in->my_write, &tile_data, plug_in))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "%s: ERROR", G_STRFUNC);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  if (! gimp_wire_read_msg (plug_in->my_read, &msg, plug_in))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "%s: ERROR", G_STRFUNC);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  if (msg.type != GP_TILE_DATA)
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "expected tile data and received: %d", msg.type);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  tile_info = msg.data;
+
+  drawable = (GimpDrawable *) gimp_item_get_by_ID (plug_in->manager->gimp,
+                                                   tile_info->drawable_ID);
+
+  if (! GIMP_IS_DRAWABLE (drawable))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "tried writing to invalid drawable %d (killing)",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    tile_info->drawable_ID);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+  else if (gimp_item_is_removed (GIMP_ITEM (drawable)))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "tried writing to drawable %d which was removed "
+                    "from the image (killing)",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    tile_info->drawable_ID);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  if (tile_info->shadow)
+    {
+
+      /*  don't check whether the drawable is a group or locked here,
+       *  the plugin will get a proper error message when it tries to
+       *  merge the shadow tiles, which is much better than just
+       *  killing it.
+       */
+      buffer = gimp_drawable_get_shadow_buffer (drawable);
+
+      gimp_plug_in_cleanup_add_shadow (plug_in, drawable);
+    }
+  else
+    {
+      if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+        {
+          gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        "Plug-in \"%s\"\n(%s)\n\n"
+                        "tried writing to a locked drawable %d (killing)",
+                        gimp_object_get_name (plug_in),
+                        gimp_file_get_utf8_name (plug_in->file),
+                        tile_info->drawable_ID);
+          gimp_plug_in_close (plug_in, TRUE);
+          return;
+        }
+      else if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+        {
+          gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        "Plug-in \"%s\"\n(%s)\n\n"
+                        "tried writing to a group layer %d (killing)",
+                        gimp_object_get_name (plug_in),
+                        gimp_file_get_utf8_name (plug_in->file),
+                        tile_info->drawable_ID);
+          gimp_plug_in_close (plug_in, TRUE);
+          return;
+        }
+
+      buffer = gimp_drawable_get_buffer (drawable);
+    }
+
+  if (! gimp_gegl_buffer_get_tile_rect (buffer,
+                                        GIMP_PLUG_IN_TILE_WIDTH,
+                                        GIMP_PLUG_IN_TILE_HEIGHT,
+                                        tile_info->tile_num,
+                                        &tile_rect))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "requested invalid tile (killing)",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  format = gegl_buffer_get_format (buffer);
+
+  if (! gimp_plug_in_precision_enabled (plug_in))
+    {
+      format = gimp_babl_compat_u8_format (format);
+    }
+
+  if (tile_data.use_shm)
+    {
+      gegl_buffer_set (buffer, &tile_rect, 0, format,
+                       gimp_plug_in_shm_get_addr (plug_in->manager->shm),
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+  else
+    {
+      gegl_buffer_set (buffer, &tile_rect, 0, format,
+                       tile_info->data,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  gimp_wire_destroy (&msg);
+
+  if (! gp_tile_ack_write (plug_in->my_write, plug_in))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "%s: ERROR", G_STRFUNC);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+}
+
+static void
+gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
+                              GPTileReq  *request)
+{
+  GPTileData       tile_data;
+  GimpWireMessage  msg;
+  GimpDrawable    *drawable;
+  GeglBuffer      *buffer;
+  const Babl      *format;
+  GeglRectangle    tile_rect;
+  gint             tile_size;
+
+  drawable = (GimpDrawable *) gimp_item_get_by_ID (plug_in->manager->gimp,
+                                                   request->drawable_ID);
+
+  if (! GIMP_IS_DRAWABLE (drawable))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "tried reading from invalid drawable %d (killing)",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    request->drawable_ID);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+  else if (gimp_item_is_removed (GIMP_ITEM (drawable)))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "tried reading from drawable %d which was removed "
+                    "from the image (killing)",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    request->drawable_ID);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  if (request->shadow)
+    {
+      buffer = gimp_drawable_get_shadow_buffer (drawable);
+
+      gimp_plug_in_cleanup_add_shadow (plug_in, drawable);
+    }
+  else
+    {
+      buffer = gimp_drawable_get_buffer (drawable);
+    }
+
+  if (! gimp_gegl_buffer_get_tile_rect (buffer,
+                                        GIMP_PLUG_IN_TILE_WIDTH,
+                                        GIMP_PLUG_IN_TILE_HEIGHT,
+                                        request->tile_num,
+                                        &tile_rect))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "requested invalid tile (killing)",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  format = gegl_buffer_get_format (buffer);
+
+  if (! gimp_plug_in_precision_enabled (plug_in))
+    {
+      format = gimp_babl_compat_u8_format (format);
+    }
+
+  tile_size = (babl_format_get_bytes_per_pixel (format) *
+               tile_rect.width * tile_rect.height);
+
+  tile_data.drawable_ID = request->drawable_ID;
+  tile_data.tile_num    = request->tile_num;
+  tile_data.shadow      = request->shadow;
+  tile_data.bpp         = babl_format_get_bytes_per_pixel (format);
+  tile_data.width       = tile_rect.width;
+  tile_data.height      = tile_rect.height;
+  tile_data.use_shm     = (plug_in->manager->shm != NULL);
+
+  if (tile_data.use_shm)
+    {
+      gegl_buffer_get (buffer, &tile_rect, 1.0, format,
+                       gimp_plug_in_shm_get_addr (plug_in->manager->shm),
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+    }
+  else
+    {
+      tile_data.data = g_malloc (tile_size);
+
+      gegl_buffer_get (buffer, &tile_rect, 1.0, format,
+                       tile_data.data,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+    }
+
+  if (! gp_tile_data_write (plug_in->my_write, &tile_data, plug_in))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "%s: ERROR", G_STRFUNC);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  if (! gimp_wire_read_msg (plug_in->my_read, &msg, plug_in))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "%s: ERROR", G_STRFUNC);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  if (msg.type != GP_TILE_ACK)
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "expected tile ack and received: %d", msg.type);
+      gimp_plug_in_close (plug_in, TRUE);
+      return;
+    }
+
+  gimp_wire_destroy (&msg);
+}
+
+static void
+gimp_plug_in_handle_proc_error (GimpPlugIn          *plug_in,
+                                GimpPlugInProcFrame *proc_frame,
+                                const gchar         *name,
+                                const GError        *error)
+{
+  switch (proc_frame->error_handler)
+    {
+    case GIMP_PDB_ERROR_HANDLER_INTERNAL:
+      if (error->domain == GIMP_PDB_ERROR)
+        {
+          gimp_message (plug_in->manager->gimp,
+                        G_OBJECT (proc_frame->progress),
+                        GIMP_MESSAGE_ERROR,
+                        _("Calling error for procedure '%s':\n"
+                          "%s"),
+                        name, error->message);
+        }
+      else
+        {
+          gimp_message (plug_in->manager->gimp,
+                        G_OBJECT (proc_frame->progress),
+                        GIMP_MESSAGE_ERROR,
+                        _("Execution error for procedure '%s':\n"
+                          "%s"),
+                        name, error->message);
+        }
+      break;
+
+    case GIMP_PDB_ERROR_HANDLER_PLUGIN:
+      /*  the plug-in is responsible for handling this error  */
+      break;
+    }
+}
+
+static void
+gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
+                              GPProcRun  *proc_run)
+{
+  GimpPlugInProcFrame *proc_frame;
+  gchar               *canonical;
+  const gchar         *proc_name   = NULL;
+  GimpProcedure       *procedure;
+  GimpValueArray      *args        = NULL;
+  GimpValueArray      *return_vals = NULL;
+  GError              *error       = NULL;
+
+  g_return_if_fail (proc_run != NULL);
+  g_return_if_fail (proc_run->name != NULL);
+
+  canonical = gimp_canonicalize_identifier (proc_run->name);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  procedure = gimp_pdb_lookup_procedure (plug_in->manager->gimp->pdb,
+                                         canonical);
+
+  if (! procedure)
+    {
+      proc_name = gimp_pdb_lookup_compat_proc_name (plug_in->manager->gimp->pdb,
+                                                    canonical);
+
+      if (proc_name)
+        {
+          procedure = gimp_pdb_lookup_procedure (plug_in->manager->gimp->pdb,
+                                                 proc_name);
+
+          if (plug_in->manager->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_WARN)
+            {
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            "Plug-in \"%s\"\n(%s)\n"
+                            "called deprecated procedure '%s'.\n"
+                            "It should call '%s' instead!",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            canonical, proc_name);
+            }
+        }
+    }
+  else if (procedure->deprecated)
+    {
+      if (plug_in->manager->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_WARN)
+        {
+          if (! strcmp (procedure->deprecated, "NONE"))
+            {
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            "Plug-in \"%s\"\n(%s)\n"
+                            "called deprecated procedure '%s'.",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            canonical);
+            }
+          else
+            {
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            "WARNING: Plug-in \"%s\"\n(%s)\n"
+                            "called deprecated procedure '%s'.\n"
+                            "It should call '%s' instead!",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            canonical, procedure->deprecated);
+            }
+        }
+    }
+
+  if (! proc_name)
+    proc_name = canonical;
+
+  args = plug_in_params_to_args (procedure ? procedure->args     : NULL,
+                                 procedure ? procedure->num_args : 0,
+                                 proc_run->params, proc_run->nparams,
+                                 FALSE, FALSE);
+
+  /*  Execute the procedure even if gimp_pdb_lookup_procedure()
+   *  returned NULL, gimp_pdb_execute_procedure_by_name_args() will
+   *  return appropriate error return_vals.
+   */
+  gimp_plug_in_manager_plug_in_push (plug_in->manager, plug_in);
+  return_vals = gimp_pdb_execute_procedure_by_name_args (plug_in->manager->gimp->pdb,
+                                                         proc_frame->context_stack ?
+                                                         proc_frame->context_stack->data :
+                                                         proc_frame->main_context,
+                                                         proc_frame->progress,
+                                                         &error,
+                                                         proc_name,
+                                                         args);
+  gimp_plug_in_manager_plug_in_pop (plug_in->manager);
+
+  gimp_value_array_unref (args);
+
+  if (error)
+    {
+      gimp_plug_in_handle_proc_error (plug_in, proc_frame,
+                                      canonical, error);
+      g_error_free (error);
+    }
+
+  g_free (canonical);
+
+  /*  Don't bother to send the return value if executing the procedure
+   *  closed the plug-in (e.g. if the procedure is gimp-quit)
+   */
+  if (plug_in->open)
+    {
+      GPProcReturn proc_return;
+
+      /*  Return the name we got called with, *not* proc_name or canonical,
+       *  since proc_name may have been remapped by gimp->procedural_compat_ht
+       *  and canonical may be different too.
+       */
+      proc_return.name    = proc_run->name;
+      proc_return.nparams = gimp_value_array_length (return_vals);
+      proc_return.params  = plug_in_args_to_params (return_vals, FALSE);
+
+      if (! gp_proc_return_write (plug_in->my_write, &proc_return, plug_in))
+        {
+          gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        "%s: ERROR", G_STRFUNC);
+          gimp_plug_in_close (plug_in, TRUE);
+        }
+
+      g_free (proc_return.params);
+    }
+
+  gimp_value_array_unref (return_vals);
+}
+
+static void
+gimp_plug_in_handle_proc_return (GimpPlugIn   *plug_in,
+                                 GPProcReturn *proc_return)
+{
+  GimpPlugInProcFrame *proc_frame = &plug_in->main_proc_frame;
+
+  g_return_if_fail (proc_return != NULL);
+
+  proc_frame->return_vals =
+    plug_in_params_to_args (proc_frame->procedure->values,
+                            proc_frame->procedure->num_values,
+                            proc_return->params,
+                            proc_return->nparams,
+                            TRUE, TRUE);
+
+  if (proc_frame->main_loop)
+    {
+      g_main_loop_quit (proc_frame->main_loop);
+    }
+  else
+    {
+      /*  the plug-in is run asynchronously, so display its error
+       *  messages here because nobody else will do it
+       */
+      gimp_plug_in_procedure_handle_return_values (GIMP_PLUG_IN_PROCEDURE (proc_frame->procedure),
+                                                   plug_in->manager->gimp,
+                                                   proc_frame->progress,
+                                                   proc_frame->return_vals);
+    }
+
+  gimp_plug_in_close (plug_in, FALSE);
+}
+
+static void
+gimp_plug_in_handle_temp_proc_return (GimpPlugIn   *plug_in,
+                                      GPProcReturn *proc_return)
+{
+  g_return_if_fail (proc_return != NULL);
+
+  if (plug_in->temp_proc_frames)
+    {
+      GimpPlugInProcFrame *proc_frame = plug_in->temp_proc_frames->data;
+
+      proc_frame->return_vals =
+        plug_in_params_to_args (proc_frame->procedure->values,
+                                proc_frame->procedure->num_values,
+                                proc_return->params,
+                                proc_return->nparams,
+                                TRUE, TRUE);
+
+      gimp_plug_in_main_loop_quit (plug_in);
+      gimp_plug_in_proc_frame_pop (plug_in);
+    }
+  else
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent a TEMP_PROC_RETURN message while not running "
+                    "a temporary procedure.  This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+    }
+}
+
+static void
+gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
+                                  GPProcInstall *proc_install)
+{
+  GimpPlugInProcedure *proc       = NULL;
+  GimpProcedure       *procedure  = NULL;
+  gchar               *canonical;
+  gboolean             null_name  = FALSE;
+  gboolean             valid_utf8 = FALSE;
+  gint                 i;
+
+  g_return_if_fail (proc_install != NULL);
+  g_return_if_fail (proc_install->name != NULL);
+
+  canonical = gimp_canonicalize_identifier (proc_install->name);
+
+  /*  Sanity check for array arguments  */
+
+  for (i = 1; i < proc_install->nparams; i++)
+    {
+      if ((proc_install->params[i].type == GIMP_PDB_INT32ARRAY ||
+           proc_install->params[i].type == GIMP_PDB_INT8ARRAY  ||
+           proc_install->params[i].type == GIMP_PDB_FLOATARRAY ||
+           proc_install->params[i].type == GIMP_PDB_STRINGARRAY ||
+           proc_install->params[i].type == GIMP_PDB_COLORARRAY)
+          &&
+          proc_install->params[i - 1].type != GIMP_PDB_INT32)
+        {
+          gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        "Plug-in \"%s\"\n(%s)\n\n"
+                        "attempted to install procedure \"%s\" "
+                        "which fails to comply with the array parameter "
+                        "passing standard.  Argument %d is noncompliant.",
+                        gimp_object_get_name (plug_in),
+                        gimp_file_get_utf8_name (plug_in->file),
+                        canonical, i);
+          g_free (canonical);
+          return;
+        }
+    }
+
+  /*  Sanity check strings for UTF-8 validity  */
+
+#define VALIDATE(str)         (g_utf8_validate ((str), -1, NULL))
+#define VALIDATE_OR_NULL(str) ((str) == NULL || g_utf8_validate ((str), -1, NULL))
+
+  if (VALIDATE_OR_NULL (proc_install->menu_path) &&
+      VALIDATE         (canonical)               &&
+      VALIDATE_OR_NULL (proc_install->blurb)     &&
+      VALIDATE_OR_NULL (proc_install->help)      &&
+      VALIDATE_OR_NULL (proc_install->author)    &&
+      VALIDATE_OR_NULL (proc_install->copyright) &&
+      VALIDATE_OR_NULL (proc_install->date))
+    {
+      null_name  = FALSE;
+      valid_utf8 = TRUE;
+
+      for (i = 0; i < proc_install->nparams && valid_utf8 && !null_name; i++)
+        {
+          if (! proc_install->params[i].name)
+            {
+              null_name = TRUE;
+            }
+          else if (! (VALIDATE         (proc_install->params[i].name) &&
+                      VALIDATE_OR_NULL (proc_install->params[i].description)))
+            {
+              valid_utf8 = FALSE;
+            }
+        }
+
+      for (i = 0; i < proc_install->nreturn_vals && valid_utf8 && !null_name; i++)
+        {
+          if (! proc_install->return_vals[i].name)
+            {
+              null_name = TRUE;
+            }
+          else if (! (VALIDATE         (proc_install->return_vals[i].name) &&
+                      VALIDATE_OR_NULL (proc_install->return_vals[i].description)))
+            {
+              valid_utf8 = FALSE;
+            }
+        }
+    }
+
+#undef VALIDATE
+#undef VALIDATE_OR_NULL
+
+  if (null_name)
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "attempted to install procedure \"%s\" with a "
+                    "NULL parameter name.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    canonical);
+      g_free (canonical);
+      return;
+    }
+
+  if (! valid_utf8)
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "attempted to install procedure \"%s\" with "
+                    "invalid UTF-8 strings.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    canonical);
+      g_free (canonical);
+      return;
+    }
+
+  if (proc_install->menu_path && strlen (proc_install->menu_path) &&
+      proc_install->menu_path[0] == '<')
+    {
+      g_printerr ("Plug-in \"%s\"\n(%s) "
+                  "is installing procedure \"%s\" with a full "
+                  "menu path \"%s\" as menu label, this deprecated and will "
+                  "be an error in GIMP 3.0\n",
+                  gimp_object_get_name (plug_in),
+                  gimp_file_get_utf8_name (plug_in->file),
+                  canonical,
+                  proc_install->menu_path);
+    }
+
+  /*  Create the procedure object  */
+
+  switch (proc_install->type)
+    {
+    case GIMP_PLUGIN:
+    case GIMP_EXTENSION:
+      procedure = gimp_plug_in_procedure_new (proc_install->type,
+                                              plug_in->file);
+      break;
+
+    case GIMP_TEMPORARY:
+      procedure = gimp_temporary_procedure_new (plug_in);
+      break;
+    }
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+  proc->mtime                 = time (NULL);
+  proc->installed_during_init = (plug_in->call_mode == GIMP_PLUG_IN_CALL_INIT);
+
+  gimp_object_take_name (GIMP_OBJECT (procedure), canonical);
+  gimp_procedure_set_strings (procedure,
+                              proc_install->name,
+                              proc_install->blurb,
+                              proc_install->help,
+                              proc_install->author,
+                              proc_install->copyright,
+                              proc_install->date,
+                              NULL);
+
+  gimp_plug_in_procedure_set_image_types (proc, proc_install->image_types);
+
+  for (i = 0; i < proc_install->nparams; i++)
+    {
+      GParamSpec *pspec;
+      gboolean    name_valid;
+
+      pspec = gimp_pdb_compat_param_spec (plug_in->manager->gimp,
+                                          proc_install->params[i].type,
+                                          proc_install->params[i].name,
+                                          proc_install->params[i].description,
+                                          &name_valid);
+
+      gimp_procedure_add_argument (procedure, pspec);
+
+      if (pspec && ! name_valid)
+        {
+          switch (plug_in->manager->gimp->pdb_compat_mode)
+            {
+            case GIMP_PDB_COMPAT_ON:
+              break;
+
+            case GIMP_PDB_COMPAT_WARN:
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            "Plug-in \"%s\"\n(%s)\n"
+                            "attempted to install procedure \"%s\" "
+                            "with invalid parameter name \"%s\".\n"
+                            "This is deprecated.\n"
+                            "The parameter name was changed to \"%s\".",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            gimp_object_get_name (proc),
+                            proc_install->params[i].name,
+                            pspec->name);
+              break;
+
+            case GIMP_PDB_COMPAT_OFF:
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            "Plug-in \"%s\"\n(%s)\n"
+                            "attempted to install procedure \"%s\" "
+                            "with invalid parameter name \"%s\".\n"
+                            "This is not allowed.",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            gimp_object_get_name (proc),
+                            proc_install->params[i].name);
+
+              g_object_unref (proc);
+
+              return;
+            }
+        }
+    }
+
+  for (i = 0; i < proc_install->nreturn_vals; i++)
+    {
+      GParamSpec *pspec;
+      gboolean    name_valid;
+
+      pspec = gimp_pdb_compat_param_spec (plug_in->manager->gimp,
+                                          proc_install->return_vals[i].type,
+                                          proc_install->return_vals[i].name,
+                                          proc_install->return_vals[i].description,
+                                          &name_valid);
+
+      gimp_procedure_add_return_value (procedure, pspec);
+
+      if (pspec && ! name_valid)
+        {
+          switch (plug_in->manager->gimp->pdb_compat_mode)
+            {
+            case GIMP_PDB_COMPAT_ON:
+              break;
+
+            case GIMP_PDB_COMPAT_WARN:
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
+                            "Plug-in \"%s\"\n(%s)\n"
+                            "attempted to install procedure \"%s\" "
+                            "with invalid return-value name \"%s\".\n"
+                            "This is deprecated.\n"
+                            "The return-value name was changed to \"%s\".",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            gimp_object_get_name (proc),
+                            proc_install->return_vals[i].name,
+                            pspec->name);
+              break;
+
+            case GIMP_PDB_COMPAT_OFF:
+              gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            "Plug-in \"%s\"\n(%s)\n"
+                            "attempted to install procedure \"%s\" "
+                            "with invalid return-value name \"%s\".\n"
+                            "This is not allowed.",
+                            gimp_object_get_name (plug_in),
+                            gimp_file_get_utf8_name (plug_in->file),
+                            gimp_object_get_name (proc),
+                            proc_install->return_vals[i].name);
+
+              g_object_unref (proc);
+
+              return;
+            }
+        }
+    }
+
+  /*  Sanity check menu path  */
+
+  if (proc_install->menu_path && strlen (proc_install->menu_path))
+    {
+      if (proc_install->menu_path[0] == '<')
+        {
+          GError *error = NULL;
+
+          if (! gimp_plug_in_procedure_add_menu_path (proc,
+                                                      proc_install->menu_path,
+                                                      &error))
+            {
+              gimp_message_literal (plug_in->manager->gimp,
+                                    NULL, GIMP_MESSAGE_WARNING,
+                                    error->message);
+              g_clear_error (&error);
+            }
+        }
+      else
+        {
+          proc->menu_label = g_strdup (proc_install->menu_path);
+        }
+    }
+
+  /*  Install the procedure  */
+
+  switch (proc_install->type)
+    {
+    case GIMP_PLUGIN:
+    case GIMP_EXTENSION:
+      gimp_plug_in_def_add_procedure (plug_in->plug_in_def, proc);
+      break;
+
+    case GIMP_TEMPORARY:
+      gimp_plug_in_add_temp_proc (plug_in, GIMP_TEMPORARY_PROCEDURE (proc));
+      break;
+    }
+
+  g_object_unref (proc);
+}
+
+static void
+gimp_plug_in_handle_proc_uninstall (GimpPlugIn      *plug_in,
+                                    GPProcUninstall *proc_uninstall)
+{
+  GimpPlugInProcedure *proc;
+  gchar               *canonical;
+
+  g_return_if_fail (proc_uninstall != NULL);
+  g_return_if_fail (proc_uninstall->name != NULL);
+
+  canonical = gimp_canonicalize_identifier (proc_uninstall->name);
+
+  proc = gimp_plug_in_procedure_find (plug_in->temp_procedures, canonical);
+
+  if (proc)
+    gimp_plug_in_remove_temp_proc (plug_in, GIMP_TEMPORARY_PROCEDURE (proc));
+
+  g_free (canonical);
+}
+
+static void
+gimp_plug_in_handle_extension_ack (GimpPlugIn *plug_in)
+{
+  if (plug_in->ext_main_loop)
+    {
+      g_main_loop_quit (plug_in->ext_main_loop);
+    }
+  else
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent an EXTENSION_ACK message while not being started "
+                    "as an extension.  This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+    }
+}
+
+static void
+gimp_plug_in_handle_has_init (GimpPlugIn *plug_in)
+{
+  if (plug_in->call_mode == GIMP_PLUG_IN_CALL_QUERY)
+    {
+      gimp_plug_in_def_set_has_init (plug_in->plug_in_def, TRUE);
+    }
+  else
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n\n"
+                    "sent an HAS_INIT message while not in query().  "
+                    "This should not happen.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+      gimp_plug_in_close (plug_in, TRUE);
+    }
+}
diff --git a/app/plug-in/gimpplugin-message.h b/app/plug-in/gimpplugin-message.h
new file mode 100644
index 0000000..1dd301f
--- /dev/null
+++ b/app/plug-in/gimpplugin-message.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-message.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MESSAGE_H__
+#define __GIMP_PLUG_IN_MESSAGE_H__
+
+
+void   gimp_plug_in_handle_message (GimpPlugIn      *plug_in,
+                                    GimpWireMessage *msg);
+
+
+#endif /* __GIMP_PLUG_IN_MESSAGE_H__ */
diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c
new file mode 100644
index 0000000..ddf2ef5
--- /dev/null
+++ b/app/plug-in/gimpplugin-progress.c
@@ -0,0 +1,366 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-progress.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppdbprogress.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimppdberror.h"
+
+#include "gimpplugin.h"
+#include "gimpplugin-progress.h"
+#include "gimppluginmanager.h"
+#include "gimptemporaryprocedure.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_plug_in_progress_cancel_callback (GimpProgress *progress,
+                                                     GimpPlugIn   *plug_in);
+
+
+/*  public functions  */
+
+gint
+gimp_plug_in_progress_attach (GimpProgress *progress)
+{
+  gint attach_count;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), 0);
+
+  attach_count =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (progress),
+                                        "plug-in-progress-attach-count"));
+
+  attach_count++;
+
+  g_object_set_data (G_OBJECT (progress), "plug-in-progress-attach-count",
+                     GINT_TO_POINTER (attach_count));
+
+  return attach_count;
+}
+
+gint
+gimp_plug_in_progress_detach (GimpProgress *progress)
+{
+  gint attach_count;
+
+  g_return_val_if_fail (GIMP_IS_PROGRESS (progress), 0);
+
+  attach_count =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (progress),
+                                        "plug-in-progress-attach-count"));
+
+  attach_count--;
+
+  g_object_set_data (G_OBJECT (progress), "plug-in-progress-attach-count",
+                     GINT_TO_POINTER (attach_count));
+
+  return attach_count;
+}
+
+void
+gimp_plug_in_progress_start (GimpPlugIn  *plug_in,
+                             const gchar *message,
+                             GimpObject  *display)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (display == NULL || GIMP_IS_OBJECT (display));
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (! proc_frame->progress)
+    {
+      proc_frame->progress = gimp_new_progress (plug_in->manager->gimp,
+                                                display);
+
+      if (proc_frame->progress)
+        {
+          proc_frame->progress_created = TRUE;
+
+          g_object_ref (proc_frame->progress);
+
+          gimp_plug_in_progress_attach (proc_frame->progress);
+        }
+    }
+
+  if (proc_frame->progress)
+    {
+      if (! proc_frame->progress_cancel_id)
+        {
+          g_object_add_weak_pointer (G_OBJECT (proc_frame->progress),
+                                     (gpointer) &proc_frame->progress);
+
+          proc_frame->progress_cancel_id =
+            g_signal_connect (proc_frame->progress, "cancel",
+                              G_CALLBACK (gimp_plug_in_progress_cancel_callback),
+                              plug_in);
+        }
+
+      if (gimp_progress_is_active (proc_frame->progress))
+        {
+          if (message)
+            gimp_progress_set_text_literal (proc_frame->progress, message);
+
+          if (gimp_progress_get_value (proc_frame->progress) > 0.0)
+            gimp_progress_set_value (proc_frame->progress, 0.0);
+        }
+      else
+        {
+          gimp_progress_start (proc_frame->progress, TRUE,
+                               "%s", message ? message : "");
+        }
+    }
+}
+
+void
+gimp_plug_in_progress_end (GimpPlugIn          *plug_in,
+                           GimpPlugInProcFrame *proc_frame)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (proc_frame != NULL);
+
+  if (proc_frame->progress)
+    {
+      if (proc_frame->progress_cancel_id)
+        {
+          g_signal_handler_disconnect (proc_frame->progress,
+                                       proc_frame->progress_cancel_id);
+          proc_frame->progress_cancel_id = 0;
+
+          g_object_remove_weak_pointer (G_OBJECT (proc_frame->progress),
+                                        (gpointer) &proc_frame->progress);
+        }
+
+      if (gimp_plug_in_progress_detach (proc_frame->progress) < 1 &&
+          gimp_progress_is_active (proc_frame->progress))
+        {
+          gimp_progress_end (proc_frame->progress);
+        }
+
+      if (proc_frame->progress_created)
+        {
+          gimp_free_progress (plug_in->manager->gimp, proc_frame->progress);
+          g_clear_object (&proc_frame->progress);
+        }
+    }
+}
+
+void
+gimp_plug_in_progress_set_text (GimpPlugIn  *plug_in,
+                                const gchar *message)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame->progress)
+    gimp_progress_set_text_literal (proc_frame->progress, message);
+}
+
+void
+gimp_plug_in_progress_set_value (GimpPlugIn *plug_in,
+                                 gdouble     percentage)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (! proc_frame->progress                           ||
+      ! gimp_progress_is_active (proc_frame->progress) ||
+      ! proc_frame->progress_cancel_id)
+    {
+      gimp_plug_in_progress_start (plug_in, NULL, NULL);
+    }
+
+  if (proc_frame->progress && gimp_progress_is_active (proc_frame->progress))
+    gimp_progress_set_value (proc_frame->progress, percentage);
+}
+
+void
+gimp_plug_in_progress_pulse (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (! proc_frame->progress                           ||
+      ! gimp_progress_is_active (proc_frame->progress) ||
+      ! proc_frame->progress_cancel_id)
+    {
+      gimp_plug_in_progress_start (plug_in, NULL, NULL);
+    }
+
+  if (proc_frame->progress && gimp_progress_is_active (proc_frame->progress))
+    gimp_progress_pulse (proc_frame->progress);
+}
+
+guint32
+gimp_plug_in_progress_get_window_id (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), 0);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame->progress)
+    return gimp_progress_get_window_id (proc_frame->progress);
+
+  return 0;
+}
+
+gboolean
+gimp_plug_in_progress_install (GimpPlugIn  *plug_in,
+                               const gchar *progress_callback)
+{
+  GimpPlugInProcFrame *proc_frame;
+  GimpProcedure       *procedure;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (progress_callback != NULL, FALSE);
+
+  procedure = gimp_pdb_lookup_procedure (plug_in->manager->gimp->pdb,
+                                         progress_callback);
+
+  if (! GIMP_IS_TEMPORARY_PROCEDURE (procedure)                ||
+      GIMP_TEMPORARY_PROCEDURE (procedure)->plug_in != plug_in ||
+      procedure->num_args                           != 3       ||
+      ! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0])          ||
+      ! G_IS_PARAM_SPEC_STRING   (procedure->args[1])          ||
+      ! G_IS_PARAM_SPEC_DOUBLE   (procedure->args[2]))
+    {
+      return FALSE;
+    }
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame->progress)
+    {
+      gimp_plug_in_progress_end (plug_in, proc_frame);
+
+      g_clear_object (&proc_frame->progress);
+    }
+
+  proc_frame->progress = g_object_new (GIMP_TYPE_PDB_PROGRESS,
+                                       "pdb",           plug_in->manager->gimp->pdb,
+                                       "context",       proc_frame->main_context,
+                                       "callback-name", progress_callback,
+                                       NULL);
+
+  gimp_plug_in_progress_attach (proc_frame->progress);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_progress_uninstall (GimpPlugIn  *plug_in,
+                                 const gchar *progress_callback)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (progress_callback != NULL, FALSE);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (GIMP_IS_PDB_PROGRESS (proc_frame->progress))
+    {
+      gimp_plug_in_progress_end (plug_in, proc_frame);
+
+      g_clear_object (&proc_frame->progress);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_plug_in_progress_cancel (GimpPlugIn  *plug_in,
+                              const gchar *progress_callback)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (progress_callback != NULL, FALSE);
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static GimpValueArray *
+get_cancel_return_values (GimpProcedure *procedure)
+{
+  GimpValueArray *return_vals;
+  GError         *error;
+
+  error = g_error_new_literal (GIMP_PDB_ERROR, GIMP_PDB_ERROR_CANCELLED,
+                               _("Cancelled"));
+  return_vals = gimp_procedure_get_return_values (procedure, FALSE, error);
+  g_error_free (error);
+
+  return return_vals;
+}
+
+static void
+gimp_plug_in_progress_cancel_callback (GimpProgress *progress,
+                                       GimpPlugIn   *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame = &plug_in->main_proc_frame;
+  GList               *list;
+
+  if (proc_frame->main_loop)
+    {
+      proc_frame->return_vals =
+        get_cancel_return_values (proc_frame->procedure);
+    }
+
+  for (list = plug_in->temp_proc_frames; list; list = g_list_next (list))
+    {
+      proc_frame = list->data;
+
+      if (proc_frame->main_loop)
+        {
+          proc_frame->return_vals =
+            get_cancel_return_values (proc_frame->procedure);
+        }
+    }
+
+  gimp_plug_in_close (plug_in, TRUE);
+}
diff --git a/app/plug-in/gimpplugin-progress.h b/app/plug-in/gimpplugin-progress.h
new file mode 100644
index 0000000..56e5285
--- /dev/null
+++ b/app/plug-in/gimpplugin-progress.h
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin-progress.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_PROGRESS_H__
+#define __GIMP_PLUG_IN_PROGRESS_H__
+
+
+gint       gimp_plug_in_progress_attach        (GimpProgress        *progress);
+gint       gimp_plug_in_progress_detach        (GimpProgress        *progress);
+
+void       gimp_plug_in_progress_start         (GimpPlugIn          *plug_in,
+                                                const gchar         *message,
+                                                GimpObject          *display);
+void       gimp_plug_in_progress_end           (GimpPlugIn          *plug_in,
+                                                GimpPlugInProcFrame *proc_frame);
+void       gimp_plug_in_progress_set_text      (GimpPlugIn          *plug_in,
+                                                const gchar         *message);
+void       gimp_plug_in_progress_set_value     (GimpPlugIn          *plug_in,
+                                                gdouble              percentage);
+void       gimp_plug_in_progress_pulse         (GimpPlugIn          *plug_in);
+guint32    gimp_plug_in_progress_get_window_id (GimpPlugIn          *plug_in);
+
+gboolean   gimp_plug_in_progress_install       (GimpPlugIn          *plug_in,
+                                                const gchar         *progress_callback);
+gboolean   gimp_plug_in_progress_uninstall     (GimpPlugIn          *plug_in,
+                                                const gchar         *progress_callback);
+gboolean   gimp_plug_in_progress_cancel        (GimpPlugIn          *plug_in,
+                                                const gchar         *progress_callback);
+
+
+#endif /* __GIMP_PLUG_IN_PROGRESS_H__ */
diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c
new file mode 100644
index 0000000..fc18486
--- /dev/null
+++ b/app/plug-in/gimpplugin.c
@@ -0,0 +1,1060 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#ifndef _WIN32
+#define _GNU_SOURCE
+#endif
+
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
+
+#define STRICT
+#include <windows.h>
+#include <process.h>
+
+#ifdef G_OS_WIN32
+#include <fcntl.h>
+#include <io.h>
+
+#ifndef pipe
+#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
+#endif
+
+#endif
+
+#ifdef G_WITH_CYGWIN
+#define O_TEXT    0x0100  /* text file   */
+#define _O_TEXT   0x0100  /* text file   */
+#define O_BINARY  0x0200  /* binary file */
+#define _O_BINARY 0x0200  /* binary file */
+#endif
+
+#endif /* G_OS_WIN32 || G_WITH_CYGWIN */
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpprotocol.h"
+#include "libgimpbase/gimpwire.h"
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-spawn.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimppdbcontext.h"
+
+#include "gimpenvirontable.h"
+#include "gimpinterpreterdb.h"
+#include "gimpplugin.h"
+#include "gimpplugin-message.h"
+#include "gimpplugin-progress.h"
+#include "gimpplugindebug.h"
+#include "gimpplugindef.h"
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-help-domain.h"
+#include "gimppluginmanager-locale-domain.h"
+#include "gimptemporaryprocedure.h"
+#include "plug-in-params.h"
+
+#include "gimp-intl.h"
+
+
+static void       gimp_plug_in_finalize      (GObject      *object);
+
+static gboolean   gimp_plug_in_recv_message  (GIOChannel   *channel,
+                                              GIOCondition  cond,
+                                              gpointer      data);
+static gboolean   gimp_plug_in_write         (GIOChannel   *channel,
+                                              const guint8 *buf,
+                                              gulong        count,
+                                              gpointer      data);
+static gboolean   gimp_plug_in_flush         (GIOChannel   *channel,
+                                              gpointer      data);
+
+#if defined G_OS_WIN32 && defined WIN32_32BIT_DLL_FOLDER
+static void       gimp_plug_in_set_dll_directory (const gchar *path);
+#endif
+
+
+
+G_DEFINE_TYPE (GimpPlugIn, gimp_plug_in, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_plug_in_parent_class
+
+
+static void
+gimp_plug_in_class_init (GimpPlugInClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_plug_in_finalize;
+
+  /* initialize the gimp protocol library and set the read and
+   *  write handlers.
+   */
+  gp_init ();
+  gimp_wire_set_writer (gimp_plug_in_write);
+  gimp_wire_set_flusher (gimp_plug_in_flush);
+}
+
+static void
+gimp_plug_in_init (GimpPlugIn *plug_in)
+{
+  plug_in->manager            = NULL;
+  plug_in->file               = NULL;
+
+  plug_in->call_mode          = GIMP_PLUG_IN_CALL_NONE;
+  plug_in->open               = FALSE;
+  plug_in->hup                = FALSE;
+  plug_in->pid                = 0;
+
+  plug_in->my_read            = NULL;
+  plug_in->my_write           = NULL;
+  plug_in->his_read           = NULL;
+  plug_in->his_write          = NULL;
+
+  plug_in->input_id           = 0;
+  plug_in->write_buffer_index = 0;
+
+  plug_in->temp_procedures    = NULL;
+
+  plug_in->ext_main_loop      = NULL;
+
+  plug_in->temp_proc_frames   = NULL;
+
+  plug_in->plug_in_def        = NULL;
+}
+
+static void
+gimp_plug_in_finalize (GObject *object)
+{
+  GimpPlugIn *plug_in = GIMP_PLUG_IN (object);
+
+  g_clear_object (&plug_in->file);
+
+  gimp_plug_in_proc_frame_dispose (&plug_in->main_proc_frame, plug_in);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_plug_in_recv_message (GIOChannel   *channel,
+                           GIOCondition  cond,
+                           gpointer      data)
+{
+  GimpPlugIn *plug_in     = data;
+  gboolean    got_message = FALSE;
+
+#ifdef G_OS_WIN32
+  /* Workaround for GLib bug #137968: sometimes we are called for no
+   * reason...
+   */
+  if (cond == 0)
+    return TRUE;
+#endif
+
+  if (plug_in->my_read == NULL)
+    return TRUE;
+
+  g_object_ref (plug_in);
+
+  if (cond & (G_IO_IN | G_IO_PRI))
+    {
+      GimpWireMessage msg;
+
+      memset (&msg, 0, sizeof (GimpWireMessage));
+
+      if (! gimp_wire_read_msg (plug_in->my_read, &msg, plug_in))
+        {
+          gimp_plug_in_close (plug_in, TRUE);
+        }
+      else
+        {
+          gimp_plug_in_handle_message (plug_in, &msg);
+          gimp_wire_destroy (&msg);
+          got_message = TRUE;
+        }
+    }
+
+  if (cond & (G_IO_ERR | G_IO_HUP))
+    {
+      if (cond & G_IO_HUP)
+        plug_in->hup = TRUE;
+
+      if (plug_in->open)
+        gimp_plug_in_close (plug_in, TRUE);
+    }
+
+  if (! got_message)
+    {
+      GimpPlugInProcFrame *frame    = gimp_plug_in_get_proc_frame (plug_in);
+      GimpProgress        *progress = frame ? frame->progress : NULL;
+
+      gimp_message (plug_in->manager->gimp, G_OBJECT (progress),
+                    GIMP_MESSAGE_ERROR,
+                    _("Plug-in crashed: \"%s\"\n(%s)\n\n"
+                      "The dying plug-in may have messed up GIMP's internal "
+                      "state. You may want to save your images and restart "
+                      "GIMP to be on the safe side."),
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file));
+    }
+
+  g_object_unref (plug_in);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_plug_in_write (GIOChannel   *channel,
+                    const guint8 *buf,
+                    gulong        count,
+                    gpointer      data)
+{
+  GimpPlugIn *plug_in = data;
+  gulong      bytes;
+
+  while (count > 0)
+    {
+      if ((plug_in->write_buffer_index + count) >= WRITE_BUFFER_SIZE)
+        {
+          bytes = WRITE_BUFFER_SIZE - plug_in->write_buffer_index;
+          memcpy (&plug_in->write_buffer[plug_in->write_buffer_index],
+                  buf, bytes);
+          plug_in->write_buffer_index += bytes;
+          if (! gimp_wire_flush (channel, plug_in))
+            return FALSE;
+        }
+      else
+        {
+          bytes = count;
+          memcpy (&plug_in->write_buffer[plug_in->write_buffer_index],
+                  buf, bytes);
+          plug_in->write_buffer_index += bytes;
+        }
+
+      buf += bytes;
+      count -= bytes;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_plug_in_flush (GIOChannel *channel,
+                    gpointer    data)
+{
+  GimpPlugIn *plug_in = data;
+
+  if (plug_in->write_buffer_index > 0)
+    {
+      GIOStatus  status;
+      GError    *error = NULL;
+      gint       count;
+      gsize      bytes;
+
+      count = 0;
+      while (count != plug_in->write_buffer_index)
+        {
+          do
+            {
+              bytes = 0;
+              status = g_io_channel_write_chars (channel,
+                                                 &plug_in->write_buffer[count],
+                                                 (plug_in->write_buffer_index - count),
+                                                 &bytes,
+                                                 &error);
+            }
+          while (status == G_IO_STATUS_AGAIN);
+
+          if (status != G_IO_STATUS_NORMAL)
+            {
+              if (error)
+                {
+                  g_warning ("%s: plug_in_flush(): error: %s",
+                             gimp_filename_to_utf8 (g_get_prgname ()),
+                             error->message);
+                  g_error_free (error);
+                }
+              else
+                {
+                  g_warning ("%s: plug_in_flush(): error",
+                             gimp_filename_to_utf8 (g_get_prgname ()));
+                }
+
+              return FALSE;
+            }
+
+          count += bytes;
+        }
+
+      plug_in->write_buffer_index = 0;
+    }
+
+  return TRUE;
+}
+
+#if defined G_OS_WIN32 && defined WIN32_32BIT_DLL_FOLDER
+static void
+gimp_plug_in_set_dll_directory (const gchar *path)
+{
+  const gchar *install_dir;
+  gchar       *bin_dir;
+  LPWSTR       w_bin_dir;
+  DWORD        BinaryType;
+  int          n;
+
+  w_bin_dir = NULL;
+  install_dir = gimp_installation_directory ();
+  if (path                               &&
+      GetBinaryTypeA (path, &BinaryType) &&
+      BinaryType == SCS_32BIT_BINARY)
+    bin_dir = g_build_filename (install_dir, WIN32_32BIT_DLL_FOLDER, NULL);
+  else
+    bin_dir = g_build_filename (install_dir, "bin", NULL);
+
+  n = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS,
+                           bin_dir, -1, NULL, 0);
+  if (n == 0)
+    goto out;
+
+  w_bin_dir = g_malloc_n (n + 1, sizeof (wchar_t));
+  n = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS,
+                           bin_dir, -1,
+                           w_bin_dir, (n + 1) * sizeof (wchar_t));
+  if (n == 0)
+    goto out;
+
+  SetDllDirectoryW (w_bin_dir);
+
+out:
+  if (w_bin_dir)
+    g_free ((void*) w_bin_dir);
+  g_free (bin_dir);
+}
+#endif
+
+
+/*  public functions  */
+
+GimpPlugIn *
+gimp_plug_in_new (GimpPlugInManager   *manager,
+                  GimpContext         *context,
+                  GimpProgress        *progress,
+                  GimpPlugInProcedure *procedure,
+                  GFile               *file)
+{
+  GimpPlugIn *plug_in;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (procedure == NULL ||
+                        GIMP_IS_PLUG_IN_PROCEDURE (procedure), NULL);
+  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
+  g_return_val_if_fail ((procedure != NULL || file != NULL) &&
+                        ! (procedure != NULL && file != NULL), NULL);
+
+  plug_in = g_object_new (GIMP_TYPE_PLUG_IN, NULL);
+
+  if (! file)
+    file = gimp_plug_in_procedure_get_file (procedure);
+
+  gimp_object_take_name (GIMP_OBJECT (plug_in),
+                         g_path_get_basename (gimp_file_get_utf8_name (file)));
+
+  plug_in->manager = manager;
+  plug_in->file    = g_object_ref (file);
+
+  gimp_plug_in_proc_frame_init (&plug_in->main_proc_frame,
+                                context, progress, procedure);
+
+  return plug_in;
+}
+
+gboolean
+gimp_plug_in_open (GimpPlugIn         *plug_in,
+                   GimpPlugInCallMode  call_mode,
+                   gboolean            synchronous)
+{
+  gchar        *progname;
+  gint          my_read[2];
+  gint          my_write[2];
+  gchar       **envp;
+  const gchar  *args[9];
+  gchar       **argv;
+  gint          argc;
+  gchar        *interp, *interp_arg;
+  gchar        *his_read_fd, *his_write_fd;
+  const gchar  *mode;
+  gchar        *stm;
+  GError       *error = NULL;
+  gboolean      debug;
+  guint         debug_flag;
+  guint         spawn_flags;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (plug_in->call_mode == GIMP_PLUG_IN_CALL_NONE, FALSE);
+
+  /* Open two pipes. (Bidirectional communication).
+   */
+  if ((pipe (my_read) == -1) || (pipe (my_write) == -1))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Unable to run plug-in \"%s\"\n(%s)\n\npipe() failed: %s",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    g_strerror (errno));
+      return FALSE;
+    }
+
+#if defined(G_WITH_CYGWIN)
+  /* Set to binary mode */
+  setmode (my_read[0], _O_BINARY);
+  setmode (my_write[0], _O_BINARY);
+  setmode (my_read[1], _O_BINARY);
+  setmode (my_write[1], _O_BINARY);
+#endif
+
+  /* Prevent the plug-in from inheriting our end of the pipes */
+  gimp_spawn_set_cloexec (my_read[0]);
+  gimp_spawn_set_cloexec (my_write[1]);
+
+#ifdef G_OS_WIN32
+  plug_in->my_read   = g_io_channel_win32_new_fd (my_read[0]);
+  plug_in->my_write  = g_io_channel_win32_new_fd (my_write[1]);
+  plug_in->his_read  = g_io_channel_win32_new_fd (my_write[0]);
+  plug_in->his_write = g_io_channel_win32_new_fd (my_read[1]);
+#else
+  plug_in->my_read   = g_io_channel_unix_new (my_read[0]);
+  plug_in->my_write  = g_io_channel_unix_new (my_write[1]);
+  plug_in->his_read  = g_io_channel_unix_new (my_write[0]);
+  plug_in->his_write = g_io_channel_unix_new (my_read[1]);
+#endif
+
+  g_io_channel_set_encoding (plug_in->my_read, NULL, NULL);
+  g_io_channel_set_encoding (plug_in->my_write, NULL, NULL);
+  g_io_channel_set_encoding (plug_in->his_read, NULL, NULL);
+  g_io_channel_set_encoding (plug_in->his_write, NULL, NULL);
+
+  g_io_channel_set_buffered (plug_in->my_read, FALSE);
+  g_io_channel_set_buffered (plug_in->my_write, FALSE);
+  g_io_channel_set_buffered (plug_in->his_read, FALSE);
+  g_io_channel_set_buffered (plug_in->his_write, FALSE);
+
+  g_io_channel_set_close_on_unref (plug_in->my_read, TRUE);
+  g_io_channel_set_close_on_unref (plug_in->my_write, TRUE);
+  g_io_channel_set_close_on_unref (plug_in->his_read, TRUE);
+  g_io_channel_set_close_on_unref (plug_in->his_write, TRUE);
+
+  /* Remember the file descriptors for the pipes.
+   */
+  his_read_fd  = g_strdup_printf ("%d",
+                                  g_io_channel_unix_get_fd (plug_in->his_read));
+  his_write_fd = g_strdup_printf ("%d",
+                                  g_io_channel_unix_get_fd (plug_in->his_write));
+
+  switch (call_mode)
+    {
+    case GIMP_PLUG_IN_CALL_QUERY:
+      mode = "-query";
+      debug_flag = GIMP_DEBUG_WRAP_QUERY;
+      break;
+
+    case GIMP_PLUG_IN_CALL_INIT:
+      mode = "-init";
+      debug_flag = GIMP_DEBUG_WRAP_INIT;
+      break;
+
+    case GIMP_PLUG_IN_CALL_RUN:
+      mode = "-run";
+      debug_flag = GIMP_DEBUG_WRAP_RUN;
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+
+  stm = g_strdup_printf ("%d", plug_in->manager->gimp->stack_trace_mode);
+
+  progname = g_file_get_path (plug_in->file);
+
+  interp = gimp_interpreter_db_resolve (plug_in->manager->interpreter_db,
+                                        progname, &interp_arg);
+
+  argc = 0;
+
+  if (interp)
+    args[argc++] = interp;
+
+  if (interp_arg)
+    args[argc++] = interp_arg;
+
+  args[argc++] = progname;
+  args[argc++] = "-gimp";
+  args[argc++] = his_read_fd;
+  args[argc++] = his_write_fd;
+  args[argc++] = mode;
+  args[argc++] = stm;
+  args[argc++] = NULL;
+
+  argv = (gchar **) args;
+  envp = gimp_environ_table_get_envp (plug_in->manager->environ_table);
+  spawn_flags = (G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
+                 G_SPAWN_DO_NOT_REAP_CHILD      |
+                 G_SPAWN_CHILD_INHERITS_STDIN);
+
+  debug = FALSE;
+
+  if (plug_in->manager->debug)
+    {
+      gchar **debug_argv = gimp_plug_in_debug_argv (plug_in->manager->debug,
+                                                    progname,
+                                                    debug_flag, args);
+
+      if (debug_argv)
+        {
+          debug = TRUE;
+          argv = debug_argv;
+          spawn_flags |= G_SPAWN_SEARCH_PATH;
+        }
+    }
+
+  /* Fork another process. We'll remember the process id so that we
+   * can later use it to kill the filter if necessary.
+   */
+#if defined G_OS_WIN32 && defined WIN32_32BIT_DLL_FOLDER
+  gimp_plug_in_set_dll_directory (argv[0]);
+#endif
+  if (! gimp_spawn_async (argv, envp, spawn_flags, &plug_in->pid, &error))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Unable to run plug-in \"%s\"\n(%s)\n\n%s",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    error->message);
+      g_clear_error (&error);
+      goto cleanup;
+    }
+
+  g_clear_pointer (&plug_in->his_read,  g_io_channel_unref);
+  g_clear_pointer (&plug_in->his_write, g_io_channel_unref);
+
+  if (! synchronous)
+    {
+      GSource *source;
+
+      source = g_io_create_watch (plug_in->my_read,
+                                  G_IO_IN  | G_IO_PRI | G_IO_ERR | G_IO_HUP);
+
+      g_source_set_callback (source,
+                             (GSourceFunc) gimp_plug_in_recv_message, plug_in,
+                             NULL);
+
+      g_source_set_can_recurse (source, TRUE);
+
+      plug_in->input_id = g_source_attach (source, NULL);
+      g_source_unref (source);
+    }
+
+  plug_in->open      = TRUE;
+  plug_in->call_mode = call_mode;
+
+  gimp_plug_in_manager_add_open_plug_in (plug_in->manager, plug_in);
+
+ cleanup:
+
+#if defined G_OS_WIN32 && defined WIN32_32BIT_DLL_FOLDER
+  gimp_plug_in_set_dll_directory (NULL);
+#endif
+
+  if (debug)
+    g_free (argv);
+
+  g_free (his_read_fd);
+  g_free (his_write_fd);
+  g_free (stm);
+  g_free (interp);
+  g_free (interp_arg);
+  g_free (progname);
+
+  return plug_in->open;
+}
+
+void
+gimp_plug_in_close (GimpPlugIn *plug_in,
+                    gboolean    kill_it)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (plug_in->open);
+
+  plug_in->open = FALSE;
+
+  if (plug_in->pid)
+    {
+#ifndef G_OS_WIN32
+      gint status;
+#endif
+
+      /*  Ask the filter to exit gracefully,
+          but not if it is closed because of a broken pipe.  */
+      if (kill_it && ! plug_in->hup)
+        {
+          gp_quit_write (plug_in->my_write, plug_in);
+
+          /*  give the plug-in some time (10 ms)  */
+          g_usleep (10000);
+        }
+
+      /* If necessary, kill the filter. */
+
+#ifndef G_OS_WIN32
+
+      if (kill_it)
+        {
+          if (plug_in->manager->gimp->be_verbose)
+            g_print ("Terminating plug-in: '%s'\n",
+                     gimp_file_get_utf8_name (plug_in->file));
+
+          /*  If the plug-in opened a process group, kill the group instead
+           *  of only the plug-in, so we kill the plug-in's children too
+           */
+          if (getpgid (0) != getpgid (plug_in->pid))
+            status = kill (- plug_in->pid, SIGKILL);
+          else
+            status = kill (plug_in->pid, SIGKILL);
+        }
+
+      /* Wait for the process to exit. This will happen
+       * immediately if it was just killed.
+       */
+      waitpid (plug_in->pid, &status, 0);
+
+#else /* G_OS_WIN32 */
+
+      if (kill_it)
+        {
+          /* Trying to avoid TerminateProcess (does mostly work).
+           * Otherwise some of our needed DLLs may get into an
+           * unstable state (see Win32 API docs).
+           */
+          DWORD dwExitCode = STILL_ACTIVE;
+          DWORD dwTries    = 10;
+
+          while (dwExitCode == STILL_ACTIVE &&
+                 GetExitCodeProcess ((HANDLE) plug_in->pid, &dwExitCode) &&
+                 (dwTries > 0))
+            {
+              Sleep (10);
+              dwTries--;
+            }
+
+          if (dwExitCode == STILL_ACTIVE)
+            {
+              if (plug_in->manager->gimp->be_verbose)
+                g_print ("Terminating plug-in: '%s'\n",
+                         gimp_file_get_utf8_name (plug_in->file));
+
+              TerminateProcess ((HANDLE) plug_in->pid, 0);
+            }
+        }
+
+#endif /* G_OS_WIN32 */
+
+      g_spawn_close_pid (plug_in->pid);
+      plug_in->pid = 0;
+    }
+
+  /* Remove the input handler. */
+  if (plug_in->input_id)
+    {
+      g_source_remove (plug_in->input_id);
+      plug_in->input_id = 0;
+    }
+
+  /* Close the pipes. */
+  g_clear_pointer (&plug_in->my_read,   g_io_channel_unref);
+  g_clear_pointer (&plug_in->my_write,  g_io_channel_unref);
+  g_clear_pointer (&plug_in->his_read,  g_io_channel_unref);
+  g_clear_pointer (&plug_in->his_write, g_io_channel_unref);
+
+  gimp_wire_clear_error ();
+
+  while (plug_in->temp_proc_frames)
+    {
+      GimpPlugInProcFrame *proc_frame = plug_in->temp_proc_frames->data;
+
+#ifdef GIMP_UNSTABLE
+      g_printerr ("plug-in '%s' aborted before sending its "
+                  "temporary procedure return values\n",
+                  gimp_object_get_name (plug_in));
+#endif
+
+      if (proc_frame->main_loop &&
+          g_main_loop_is_running (proc_frame->main_loop))
+        {
+          g_main_loop_quit (proc_frame->main_loop);
+        }
+
+      /* pop the frame here, because normally this only happens in
+       * gimp_plug_in_handle_temp_proc_return(), which can't
+       * be called after plug_in_close()
+       */
+      gimp_plug_in_proc_frame_pop (plug_in);
+    }
+
+  if (plug_in->main_proc_frame.main_loop &&
+      g_main_loop_is_running (plug_in->main_proc_frame.main_loop))
+    {
+#ifdef GIMP_UNSTABLE
+      g_printerr ("plug-in '%s' aborted before sending its "
+                  "procedure return values\n",
+                  gimp_object_get_name (plug_in));
+#endif
+
+      g_main_loop_quit (plug_in->main_proc_frame.main_loop);
+    }
+
+  if (plug_in->ext_main_loop &&
+      g_main_loop_is_running (plug_in->ext_main_loop))
+    {
+#ifdef GIMP_UNSTABLE
+      g_printerr ("extension '%s' aborted before sending its "
+                  "extension_ack message\n",
+                  gimp_object_get_name (plug_in));
+#endif
+
+      g_main_loop_quit (plug_in->ext_main_loop);
+    }
+
+  /* Unregister any temporary procedures. */
+  while (plug_in->temp_procedures)
+    gimp_plug_in_remove_temp_proc (plug_in, plug_in->temp_procedures->data);
+
+  gimp_plug_in_manager_remove_open_plug_in (plug_in->manager, plug_in);
+}
+
+GimpPlugInProcFrame *
+gimp_plug_in_get_proc_frame (GimpPlugIn *plug_in)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
+
+  if (plug_in->temp_proc_frames)
+    return plug_in->temp_proc_frames->data;
+  else
+    return &plug_in->main_proc_frame;
+}
+
+GimpPlugInProcFrame *
+gimp_plug_in_proc_frame_push (GimpPlugIn             *plug_in,
+                              GimpContext            *context,
+                              GimpProgress           *progress,
+                              GimpTemporaryProcedure *procedure)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (GIMP_IS_TEMPORARY_PROCEDURE (procedure), NULL);
+
+  proc_frame = gimp_plug_in_proc_frame_new (context, progress,
+                                            GIMP_PLUG_IN_PROCEDURE (procedure));
+
+  plug_in->temp_proc_frames = g_list_prepend (plug_in->temp_proc_frames,
+                                              proc_frame);
+
+  return proc_frame;
+}
+
+void
+gimp_plug_in_proc_frame_pop (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (plug_in->temp_proc_frames != NULL);
+
+  proc_frame = (GimpPlugInProcFrame *) plug_in->temp_proc_frames->data;
+
+  gimp_plug_in_proc_frame_unref (proc_frame, plug_in);
+
+  plug_in->temp_proc_frames = g_list_remove (plug_in->temp_proc_frames,
+                                             proc_frame);
+}
+
+void
+gimp_plug_in_main_loop (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (plug_in->temp_proc_frames != NULL);
+
+  proc_frame = (GimpPlugInProcFrame *) plug_in->temp_proc_frames->data;
+
+  g_return_if_fail (proc_frame->main_loop == NULL);
+
+  proc_frame->main_loop = g_main_loop_new (NULL, FALSE);
+
+  gimp_threads_leave (plug_in->manager->gimp);
+  g_main_loop_run (proc_frame->main_loop);
+  gimp_threads_enter (plug_in->manager->gimp);
+
+  g_clear_pointer (&proc_frame->main_loop, g_main_loop_unref);
+}
+
+void
+gimp_plug_in_main_loop_quit (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (plug_in->temp_proc_frames != NULL);
+
+  proc_frame = (GimpPlugInProcFrame *) plug_in->temp_proc_frames->data;
+
+  g_return_if_fail (proc_frame->main_loop != NULL);
+
+  g_main_loop_quit (proc_frame->main_loop);
+}
+
+const gchar *
+gimp_plug_in_get_undo_desc (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+  const gchar         *undo_desc = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame && proc_frame->procedure)
+    undo_desc = gimp_procedure_get_label (proc_frame->procedure);
+
+  return undo_desc ? undo_desc : gimp_object_get_name (plug_in);
+}
+
+/*  called from the PDB (gimp_plugin_menu_register)  */
+gboolean
+gimp_plug_in_menu_register (GimpPlugIn  *plug_in,
+                            const gchar *proc_name,
+                            const gchar *menu_path)
+{
+  GimpPlugInProcedure *proc  = NULL;
+  GError              *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+  g_return_val_if_fail (proc_name != NULL, FALSE);
+  g_return_val_if_fail (menu_path != NULL, FALSE);
+
+  if (plug_in->plug_in_def)
+    proc = gimp_plug_in_procedure_find (plug_in->plug_in_def->procedures,
+                                        proc_name);
+
+  if (! proc)
+    proc = gimp_plug_in_procedure_find (plug_in->temp_procedures, proc_name);
+
+  if (! proc)
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n"
+                    "attempted to register the menu item \"%s\" "
+                    "for the procedure \"%s\".\n"
+                    "It has however not installed that procedure.  This "
+                    "is not allowed.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    menu_path, proc_name);
+
+      return FALSE;
+    }
+
+  switch (GIMP_PROCEDURE (proc)->proc_type)
+    {
+    case GIMP_INTERNAL:
+      return FALSE;
+
+    case GIMP_PLUGIN:
+    case GIMP_EXTENSION:
+      if (plug_in->call_mode != GIMP_PLUG_IN_CALL_QUERY &&
+          plug_in->call_mode != GIMP_PLUG_IN_CALL_INIT)
+        return FALSE;
+
+    case GIMP_TEMPORARY:
+      break;
+    }
+
+  if (! proc->menu_label)
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n"
+                    "attempted to register the menu item \"%s\" "
+                    "for procedure \"%s\".\n"
+                    "The menu label given in gimp_install_procedure() "
+                    "already contained a path.  To make this work, "
+                    "pass just the menu's label to "
+                    "gimp_install_procedure().",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    menu_path, proc_name);
+
+      return FALSE;
+    }
+
+  if (! strlen (proc->menu_label))
+    {
+      gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "Plug-in \"%s\"\n(%s)\n"
+                    "attempted to register the procedure \"%s\" "
+                    "in the menu \"%s\", but the procedure has no label.  "
+                    "This is not allowed.",
+                    gimp_object_get_name (plug_in),
+                    gimp_file_get_utf8_name (plug_in->file),
+                    proc_name, menu_path);
+
+      return FALSE;
+    }
+
+  if (! gimp_plug_in_procedure_add_menu_path (proc, menu_path, &error))
+    {
+      gimp_message_literal (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+void
+gimp_plug_in_add_temp_proc (GimpPlugIn             *plug_in,
+                            GimpTemporaryProcedure *proc)
+{
+  GimpPlugInProcedure *overridden;
+  const gchar         *locale_domain;
+  const gchar         *help_domain;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (GIMP_IS_TEMPORARY_PROCEDURE (proc));
+
+  overridden = gimp_plug_in_procedure_find (plug_in->temp_procedures,
+                                            gimp_object_get_name (proc));
+
+  if (overridden)
+    gimp_plug_in_remove_temp_proc (plug_in,
+                                   GIMP_TEMPORARY_PROCEDURE (overridden));
+
+  locale_domain = gimp_plug_in_manager_get_locale_domain (plug_in->manager,
+                                                          plug_in->file,
+                                                          NULL);
+  help_domain = gimp_plug_in_manager_get_help_domain (plug_in->manager,
+                                                      plug_in->file,
+                                                      NULL);
+
+  gimp_plug_in_procedure_set_locale_domain (GIMP_PLUG_IN_PROCEDURE (proc),
+                                            locale_domain);
+  gimp_plug_in_procedure_set_help_domain (GIMP_PLUG_IN_PROCEDURE (proc),
+                                          help_domain);
+
+  plug_in->temp_procedures = g_slist_prepend (plug_in->temp_procedures,
+                                              g_object_ref (proc));
+  gimp_plug_in_manager_add_temp_proc (plug_in->manager, proc);
+}
+
+void
+gimp_plug_in_remove_temp_proc (GimpPlugIn             *plug_in,
+                               GimpTemporaryProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+  g_return_if_fail (GIMP_IS_TEMPORARY_PROCEDURE (proc));
+
+  plug_in->temp_procedures = g_slist_remove (plug_in->temp_procedures, proc);
+
+  gimp_plug_in_manager_remove_temp_proc (plug_in->manager, proc);
+  g_object_unref (proc);
+}
+
+void
+gimp_plug_in_set_error_handler (GimpPlugIn          *plug_in,
+                                GimpPDBErrorHandler  handler)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame)
+    proc_frame->error_handler = handler;
+}
+
+GimpPDBErrorHandler
+gimp_plug_in_get_error_handler (GimpPlugIn *plug_in)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in),
+                        GIMP_PDB_ERROR_HANDLER_INTERNAL);
+
+  proc_frame = gimp_plug_in_get_proc_frame (plug_in);
+
+  if (proc_frame)
+    return proc_frame->error_handler;
+
+  return GIMP_PDB_ERROR_HANDLER_INTERNAL;
+}
+
+void
+gimp_plug_in_enable_precision (GimpPlugIn *plug_in)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  plug_in->precision = TRUE;
+}
+
+gboolean
+gimp_plug_in_precision_enabled (GimpPlugIn *plug_in)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
+
+  return plug_in->precision;
+}
diff --git a/app/plug-in/gimpplugin.h b/app/plug-in/gimpplugin.h
new file mode 100644
index 0000000..15326a0
--- /dev/null
+++ b/app/plug-in/gimpplugin.h
@@ -0,0 +1,127 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugin.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_H__
+#define __GIMP_PLUG_IN_H__
+
+
+#include "core/gimpobject.h"
+#include "gimppluginprocframe.h"
+
+
+#define WRITE_BUFFER_SIZE  512
+
+
+#define GIMP_TYPE_PLUG_IN            (gimp_plug_in_get_type ())
+#define GIMP_PLUG_IN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUG_IN, GimpPlugIn))
+#define GIMP_PLUG_IN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUG_IN, GimpPlugInClass))
+#define GIMP_IS_PLUG_IN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUG_IN))
+#define GIMP_IS_PLUG_IN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUG_IN))
+
+
+typedef struct _GimpPlugInClass GimpPlugInClass;
+
+struct _GimpPlugIn
+{
+  GimpObject           parent_instance;
+
+  GimpPlugInManager   *manager;
+  GFile               *file;            /*  Plug-in's full path name          */
+
+  GimpPlugInCallMode   call_mode;       /*  QUERY, INIT or RUN                */
+  guint                open : 1;        /*  Is the plug-in open?              */
+  guint                hup : 1;         /*  Did we receive a G_IO_HUP         */
+  guint                precision : 1;   /*  True drawable precision enabled   */
+  GPid                 pid;             /*  Plug-in's process id              */
+
+  GIOChannel          *my_read;         /*  App's read and write channels     */
+  GIOChannel          *my_write;
+  GIOChannel          *his_read;        /*  Plug-in's read and write channels */
+  GIOChannel          *his_write;
+
+  guint                input_id;        /*  Id of input proc                  */
+
+  gchar                write_buffer[WRITE_BUFFER_SIZE]; /* Buffer for writing */
+  gint                 write_buffer_index;              /* Buffer index       */
+
+  GSList              *temp_procedures; /*  Temporary procedures              */
+
+  GMainLoop           *ext_main_loop;   /*  for waiting for extension_ack     */
+
+  GimpPlugInProcFrame  main_proc_frame;
+
+  GList               *temp_proc_frames;
+
+  GimpPlugInDef       *plug_in_def;     /*  Valid during query() and init()   */
+};
+
+struct _GimpPlugInClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType         gimp_plug_in_get_type          (void) G_GNUC_CONST;
+
+GimpPlugIn  * gimp_plug_in_new               (GimpPlugInManager      *manager,
+                                              GimpContext            *context,
+                                              GimpProgress           *progress,
+                                              GimpPlugInProcedure    *procedure,
+                                              GFile                  *file);
+
+gboolean      gimp_plug_in_open              (GimpPlugIn             *plug_in,
+                                              GimpPlugInCallMode      call_mode,
+                                              gboolean                synchronous);
+void          gimp_plug_in_close             (GimpPlugIn             *plug_in,
+                                              gboolean                kill_it);
+
+GimpPlugInProcFrame *
+              gimp_plug_in_get_proc_frame    (GimpPlugIn             *plug_in);
+
+GimpPlugInProcFrame *
+              gimp_plug_in_proc_frame_push   (GimpPlugIn             *plug_in,
+                                              GimpContext            *context,
+                                              GimpProgress           *progress,
+                                              GimpTemporaryProcedure *procedure);
+void          gimp_plug_in_proc_frame_pop    (GimpPlugIn             *plug_in);
+
+void          gimp_plug_in_main_loop         (GimpPlugIn             *plug_in);
+void          gimp_plug_in_main_loop_quit    (GimpPlugIn             *plug_in);
+
+const gchar * gimp_plug_in_get_undo_desc     (GimpPlugIn             *plug_in);
+
+gboolean      gimp_plug_in_menu_register     (GimpPlugIn             *plug_in,
+                                              const gchar            *proc_name,
+                                              const gchar            *menu_path);
+
+void          gimp_plug_in_add_temp_proc     (GimpPlugIn             *plug_in,
+                                              GimpTemporaryProcedure *procedure);
+void          gimp_plug_in_remove_temp_proc  (GimpPlugIn             *plug_in,
+                                              GimpTemporaryProcedure *procedure);
+
+void          gimp_plug_in_set_error_handler (GimpPlugIn             *plug_in,
+                                              GimpPDBErrorHandler     handler);
+GimpPDBErrorHandler
+              gimp_plug_in_get_error_handler (GimpPlugIn             *plug_in);
+
+void          gimp_plug_in_enable_precision  (GimpPlugIn             *plug_in);
+gboolean      gimp_plug_in_precision_enabled (GimpPlugIn             *plug_in);
+
+
+#endif /* __GIMP_PLUG_IN_H__ */
diff --git a/app/plug-in/gimpplugindebug.c b/app/plug-in/gimpplugindebug.c
new file mode 100644
index 0000000..81c1060
--- /dev/null
+++ b/app/plug-in/gimpplugindebug.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugindebug.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <glib-object.h>
+
+#include "plug-in-types.h"
+
+#include "gimpplugindebug.h"
+
+
+struct _GimpPlugInDebug
+{
+  gchar  *name;
+  guint   flags;
+  gchar **args;
+};
+
+
+static const GDebugKey gimp_debug_wrap_keys[] =
+{
+  { "query", GIMP_DEBUG_WRAP_QUERY   },
+  { "init",  GIMP_DEBUG_WRAP_INIT    },
+  { "run",   GIMP_DEBUG_WRAP_RUN     },
+  { "on",    GIMP_DEBUG_WRAP_DEFAULT }
+};
+
+
+GimpPlugInDebug *
+gimp_plug_in_debug_new (void)
+{
+  GimpPlugInDebug  *debug;
+  const gchar      *wrap, *wrapper;
+  gchar            *debug_string;
+  gchar           **args;
+  GError           *error = NULL;
+
+  wrap = g_getenv ("GIMP_PLUGIN_DEBUG_WRAP");
+  wrapper = g_getenv ("GIMP_PLUGIN_DEBUG_WRAPPER");
+
+  if (!(wrap && wrapper))
+    return NULL;
+
+  if (!g_shell_parse_argv (wrapper, NULL, &args, &error))
+    {
+      g_warning ("Unable to parse debug wrapper: \"%s\"\n%s",
+                 wrapper, error->message);
+      g_error_free (error);
+      return NULL;
+    }
+
+  debug = g_slice_new (GimpPlugInDebug);
+
+  debug->args  = args;
+
+  debug_string = strchr (wrap, ',');
+
+  if (debug_string)
+    {
+      debug->name = g_strndup (wrap, debug_string - wrap);
+      debug->flags = g_parse_debug_string (debug_string + 1,
+                                           gimp_debug_wrap_keys,
+                                           G_N_ELEMENTS (gimp_debug_wrap_keys));
+    }
+  else
+    {
+      debug->name = g_strdup (wrap);
+      debug->flags = GIMP_DEBUG_WRAP_DEFAULT;
+    }
+
+  return debug;
+}
+
+void
+gimp_plug_in_debug_free (GimpPlugInDebug *debug)
+{
+  g_return_if_fail (debug != NULL);
+
+  if (debug->name)
+    g_free (debug->name);
+
+  if (debug->args)
+    g_strfreev (debug->args);
+
+  g_slice_free (GimpPlugInDebug, debug);
+}
+
+gchar **
+gimp_plug_in_debug_argv (GimpPlugInDebug    *debug,
+                         const gchar        *name,
+                         GimpDebugWrapFlag   flag,
+                         const gchar       **args)
+{
+  GPtrArray  *argv;
+  gchar     **arg;
+  gchar      *basename;
+
+  g_return_val_if_fail (debug != NULL, NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (args != NULL, NULL);
+
+  basename = g_path_get_basename (name);
+
+  if (!(debug->flags & flag) || (strcmp (debug->name, basename) != 0))
+    {
+      g_free (basename);
+      return NULL;
+    }
+
+  g_free (basename);
+
+  argv = g_ptr_array_sized_new (8);
+
+  for (arg = debug->args; *arg != NULL; arg++)
+    g_ptr_array_add (argv, *arg);
+
+  for (arg = (gchar **) args; *arg != NULL; arg++)
+    g_ptr_array_add (argv, *arg);
+
+  g_ptr_array_add (argv, NULL);
+
+  return (gchar **) g_ptr_array_free (argv, FALSE);
+}
diff --git a/app/plug-in/gimpplugindebug.h b/app/plug-in/gimpplugindebug.h
new file mode 100644
index 0000000..ec5bc33
--- /dev/null
+++ b/app/plug-in/gimpplugindebug.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugindebug.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_DEBUG_H__
+#define __GIMP_PLUG_IN_DEBUG_H__
+
+
+typedef enum
+{
+  GIMP_DEBUG_WRAP_QUERY = 1 << 0,
+  GIMP_DEBUG_WRAP_INIT  = 1 << 1,
+  GIMP_DEBUG_WRAP_RUN   = 1 << 2,
+
+  GIMP_DEBUG_WRAP_DEFAULT = GIMP_DEBUG_WRAP_RUN
+} GimpDebugWrapFlag;
+
+
+GimpPlugInDebug  * gimp_plug_in_debug_new  (void);
+void               gimp_plug_in_debug_free (GimpPlugInDebug    *debug);
+
+gchar           ** gimp_plug_in_debug_argv (GimpPlugInDebug    *debug,
+                                            const gchar        *name,
+                                            GimpDebugWrapFlag   flag,
+                                            const gchar       **args);
+
+
+#endif /* __GIMP_PLUG_IN_DEBUG_H__ */
diff --git a/app/plug-in/gimpplugindef.c b/app/plug-in/gimpplugindef.c
new file mode 100644
index 0000000..83f6378
--- /dev/null
+++ b/app/plug-in/gimpplugindef.c
@@ -0,0 +1,235 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugindef.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "plug-in-types.h"
+
+#include "core/gimp-memsize.h"
+
+#include "gimpplugindef.h"
+#include "gimppluginprocedure.h"
+
+
+static void     gimp_plug_in_def_finalize    (GObject    *object);
+
+static gint64   gimp_plug_in_def_get_memsize (GimpObject *object,
+                                              gint64     *gui_size);
+
+
+G_DEFINE_TYPE (GimpPlugInDef, gimp_plug_in_def, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_plug_in_def_parent_class
+
+
+static void
+gimp_plug_in_def_class_init (GimpPlugInDefClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->finalize         = gimp_plug_in_def_finalize;
+
+  gimp_object_class->get_memsize = gimp_plug_in_def_get_memsize;
+}
+
+static void
+gimp_plug_in_def_init (GimpPlugInDef *def)
+{
+}
+
+static void
+gimp_plug_in_def_finalize (GObject *object)
+{
+  GimpPlugInDef *plug_in_def = GIMP_PLUG_IN_DEF (object);
+
+  g_object_unref (plug_in_def->file);
+  g_free (plug_in_def->locale_domain_name);
+  g_free (plug_in_def->locale_domain_path);
+  g_free (plug_in_def->help_domain_name);
+  g_free (plug_in_def->help_domain_uri);
+
+  g_slist_free_full (plug_in_def->procedures, (GDestroyNotify) g_object_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_plug_in_def_get_memsize (GimpObject *object,
+                              gint64     *gui_size)
+{
+  GimpPlugInDef *plug_in_def = GIMP_PLUG_IN_DEF (object);
+  gint64         memsize     = 0;
+
+  memsize += gimp_g_object_get_memsize (G_OBJECT (plug_in_def->file));
+  memsize += gimp_string_get_memsize (plug_in_def->locale_domain_name);
+  memsize += gimp_string_get_memsize (plug_in_def->locale_domain_path);
+  memsize += gimp_string_get_memsize (plug_in_def->help_domain_name);
+  memsize += gimp_string_get_memsize (plug_in_def->help_domain_uri);
+
+  memsize += gimp_g_slist_get_memsize (plug_in_def->procedures, 0);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+
+/*  public functions  */
+
+GimpPlugInDef *
+gimp_plug_in_def_new (GFile *file)
+{
+  GimpPlugInDef *plug_in_def;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  plug_in_def = g_object_new (GIMP_TYPE_PLUG_IN_DEF, NULL);
+
+  plug_in_def->file = g_object_ref (file);
+
+  return plug_in_def;
+}
+
+void
+gimp_plug_in_def_add_procedure (GimpPlugInDef       *plug_in_def,
+                                GimpPlugInProcedure *proc)
+{
+  GimpPlugInProcedure *overridden;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  overridden = gimp_plug_in_procedure_find (plug_in_def->procedures,
+                                            gimp_object_get_name (proc));
+
+  if (overridden)
+    gimp_plug_in_def_remove_procedure (plug_in_def, overridden);
+
+  proc->mtime = plug_in_def->mtime;
+
+  gimp_plug_in_procedure_set_locale_domain (proc,
+                                            plug_in_def->locale_domain_name);
+  gimp_plug_in_procedure_set_help_domain (proc,
+                                          plug_in_def->help_domain_name);
+
+  plug_in_def->procedures = g_slist_append (plug_in_def->procedures,
+                                            g_object_ref (proc));
+}
+
+void
+gimp_plug_in_def_remove_procedure (GimpPlugInDef       *plug_in_def,
+                                   GimpPlugInProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  plug_in_def->procedures = g_slist_remove (plug_in_def->procedures, proc);
+  g_object_unref (proc);
+}
+
+void
+gimp_plug_in_def_set_locale_domain (GimpPlugInDef *plug_in_def,
+                                    const gchar   *domain_name,
+                                    const gchar   *domain_path)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  if (plug_in_def->locale_domain_name)
+    g_free (plug_in_def->locale_domain_name);
+  plug_in_def->locale_domain_name = g_strdup (domain_name);
+
+  if (plug_in_def->locale_domain_path)
+    g_free (plug_in_def->locale_domain_path);
+  plug_in_def->locale_domain_path = g_strdup (domain_path);
+
+  for (list = plug_in_def->procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *procedure = list->data;
+
+      gimp_plug_in_procedure_set_locale_domain (procedure,
+                                                plug_in_def->locale_domain_name);
+    }
+}
+
+void
+gimp_plug_in_def_set_help_domain (GimpPlugInDef *plug_in_def,
+                                  const gchar   *domain_name,
+                                  const gchar   *domain_uri)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  if (plug_in_def->help_domain_name)
+    g_free (plug_in_def->help_domain_name);
+  plug_in_def->help_domain_name = g_strdup (domain_name);
+
+  if (plug_in_def->help_domain_uri)
+    g_free (plug_in_def->help_domain_uri);
+  plug_in_def->help_domain_uri = g_strdup (domain_uri);
+
+  for (list = plug_in_def->procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *procedure = list->data;
+
+      gimp_plug_in_procedure_set_help_domain (procedure,
+                                              plug_in_def->help_domain_name);
+    }
+}
+
+void
+gimp_plug_in_def_set_mtime (GimpPlugInDef *plug_in_def,
+                            gint64         mtime)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  plug_in_def->mtime = mtime;
+
+  for (list = plug_in_def->procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+
+      proc->mtime = plug_in_def->mtime;
+    }
+}
+
+void
+gimp_plug_in_def_set_needs_query (GimpPlugInDef *plug_in_def,
+                                  gboolean       needs_query)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  plug_in_def->needs_query = needs_query ? TRUE : FALSE;
+}
+
+void
+gimp_plug_in_def_set_has_init (GimpPlugInDef *plug_in_def,
+                               gboolean       has_init)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  plug_in_def->has_init = has_init ? TRUE : FALSE;
+}
diff --git a/app/plug-in/gimpplugindef.h b/app/plug-in/gimpplugindef.h
new file mode 100644
index 0000000..d819e1a
--- /dev/null
+++ b/app/plug-in/gimpplugindef.h
@@ -0,0 +1,82 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpplugindef.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_DEF_H__
+#define __GIMP_PLUG_IN_DEF_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_PLUG_IN_DEF            (gimp_plug_in_def_get_type ())
+#define GIMP_PLUG_IN_DEF(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUG_IN_DEF, GimpPlugInDef))
+#define GIMP_PLUG_IN_DEF_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUG_IN_DEF, GimpPlugInDefClass))
+#define GIMP_IS_PLUG_IN_DEF(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUG_IN_DEF))
+#define GIMP_IS_PLUG_IN_DEF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUG_IN_DEF))
+
+
+typedef struct _GimpPlugInDefClass GimpPlugInDefClass;
+
+struct _GimpPlugInDef
+{
+  GimpObject  parent_instance;
+
+  GFile      *file;
+  GSList     *procedures;
+  gchar      *locale_domain_name;
+  gchar      *locale_domain_path;
+  gchar      *help_domain_name;
+  gchar      *help_domain_uri;
+  gint64      mtime;
+  gboolean    needs_query;  /* Does the plug-in need to be queried ?     */
+  gboolean    has_init;     /* Does the plug-in need to be initialized ? */
+};
+
+struct _GimpPlugInDefClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType           gimp_plug_in_def_get_type (void) G_GNUC_CONST;
+
+GimpPlugInDef * gimp_plug_in_def_new      (GFile               *file);
+
+void   gimp_plug_in_def_add_procedure     (GimpPlugInDef       *plug_in_def,
+                                           GimpPlugInProcedure *proc);
+void   gimp_plug_in_def_remove_procedure  (GimpPlugInDef       *plug_in_def,
+                                           GimpPlugInProcedure *proc);
+
+void   gimp_plug_in_def_set_locale_domain (GimpPlugInDef       *plug_in_def,
+                                           const gchar         *domain_name,
+                                           const gchar         *domain_path);
+
+void   gimp_plug_in_def_set_help_domain   (GimpPlugInDef       *plug_in_def,
+                                           const gchar         *domain_name,
+                                           const gchar         *domain_uri);
+
+void   gimp_plug_in_def_set_mtime         (GimpPlugInDef       *plug_in_def,
+                                           gint64               mtime);
+void   gimp_plug_in_def_set_needs_query   (GimpPlugInDef       *plug_in_def,
+                                           gboolean             needs_query);
+void   gimp_plug_in_def_set_has_init      (GimpPlugInDef       *plug_in_def,
+                                           gboolean             has_init);
+
+
+#endif /* __GIMP_PLUG_IN_DEF_H__ */
diff --git a/app/plug-in/gimppluginerror.c b/app/plug-in/gimppluginerror.c
new file mode 100644
index 0000000..e73e1e5
--- /dev/null
+++ b/app/plug-in/gimppluginerror.c
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "gimppluginerror.h"
+
+
+/**
+ * gimp_plug_in_error_quark:
+ *
+ * This function is never called directly. Use GIMP_PLUG_IN_ERROR() instead.
+ *
+ * Return value: the #GQuark that defines the GimpPlugIn error domain.
+ **/
+GQuark
+gimp_plug_in_error_quark (void)
+{
+  return g_quark_from_static_string ("gimp-plug-in-error-quark");
+}
diff --git a/app/plug-in/gimppluginerror.h b/app/plug-in/gimppluginerror.h
new file mode 100644
index 0000000..7cf7eb2
--- /dev/null
+++ b/app/plug-in/gimppluginerror.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_ERROR_H__
+#define __GIMP_PLUG_IN_ERROR_H__
+
+
+typedef enum
+{
+  GIMP_PLUG_IN_FAILED,  /* generic error condition */
+  GIMP_PLUG_IN_EXECUTION_FAILED,
+  GIMP_PLUG_IN_NOT_FOUND
+} GimpPlugInErrorCode;
+
+
+#define GIMP_PLUG_IN_ERROR (gimp_plug_in_error_quark ())
+
+GQuark  gimp_plug_in_error_quark (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_PLUG_IN_ERROR_H__ */
diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c
new file mode 100644
index 0000000..47791e6
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-call.c
@@ -0,0 +1,375 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-call.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpprotocol.h"
+#include "libgimpbase/gimpwire.h"
+
+#include "plug-in-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpprogress.h"
+
+#include "pdb/gimppdbcontext.h"
+
+#include "gimpplugin.h"
+#include "gimpplugin-message.h"
+#include "gimpplugindef.h"
+#include "gimppluginerror.h"
+#include "gimppluginmanager.h"
+#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
+#include "gimppluginmanager-call.h"
+#include "gimppluginshm.h"
+#include "gimptemporaryprocedure.h"
+#include "plug-in-params.h"
+
+#include "gimp-intl.h"
+
+
+static void
+gimp_allow_set_foreground_window (GimpPlugIn *plug_in)
+{
+#ifdef G_OS_WIN32
+  AllowSetForegroundWindow (GetProcessId (plug_in->pid));
+#endif
+}
+
+/*  public functions  */
+
+void
+gimp_plug_in_manager_call_query (GimpPlugInManager *manager,
+                                 GimpContext       *context,
+                                 GimpPlugInDef     *plug_in_def)
+{
+  GimpPlugIn *plug_in;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_PDB_CONTEXT (context));
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  plug_in = gimp_plug_in_new (manager, context, NULL,
+                              NULL, plug_in_def->file);
+
+  if (plug_in)
+    {
+      plug_in->plug_in_def = plug_in_def;
+
+      if (gimp_plug_in_open (plug_in, GIMP_PLUG_IN_CALL_QUERY, TRUE))
+        {
+          while (plug_in->open)
+            {
+              GimpWireMessage msg;
+
+              if (! gimp_wire_read_msg (plug_in->my_read, &msg, plug_in))
+                {
+                  gimp_plug_in_close (plug_in, TRUE);
+                }
+              else
+                {
+                  gimp_plug_in_handle_message (plug_in, &msg);
+                  gimp_wire_destroy (&msg);
+                }
+            }
+        }
+
+      g_object_unref (plug_in);
+    }
+}
+
+void
+gimp_plug_in_manager_call_init (GimpPlugInManager *manager,
+                                GimpContext       *context,
+                                GimpPlugInDef     *plug_in_def)
+{
+  GimpPlugIn *plug_in;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_PDB_CONTEXT (context));
+  g_return_if_fail (GIMP_IS_PLUG_IN_DEF (plug_in_def));
+
+  plug_in = gimp_plug_in_new (manager, context, NULL,
+                              NULL, plug_in_def->file);
+
+  if (plug_in)
+    {
+      plug_in->plug_in_def = plug_in_def;
+
+      if (gimp_plug_in_open (plug_in, GIMP_PLUG_IN_CALL_INIT, TRUE))
+        {
+          while (plug_in->open)
+            {
+              GimpWireMessage msg;
+
+              if (! gimp_wire_read_msg (plug_in->my_read, &msg, plug_in))
+                {
+                  gimp_plug_in_close (plug_in, TRUE);
+                }
+              else
+                {
+                  gimp_plug_in_handle_message (plug_in, &msg);
+                  gimp_wire_destroy (&msg);
+                }
+            }
+        }
+
+      g_object_unref (plug_in);
+    }
+}
+
+GimpValueArray *
+gimp_plug_in_manager_call_run (GimpPlugInManager   *manager,
+                               GimpContext         *context,
+                               GimpProgress        *progress,
+                               GimpPlugInProcedure *procedure,
+                               GimpValueArray      *args,
+                               gboolean             synchronous,
+                               GimpObject          *display)
+{
+  GimpValueArray *return_vals = NULL;
+  GimpPlugIn     *plug_in;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (procedure), NULL);
+  g_return_val_if_fail (args != NULL, NULL);
+  g_return_val_if_fail (display == NULL || GIMP_IS_OBJECT (display), NULL);
+
+  plug_in = gimp_plug_in_new (manager, context, progress, procedure, NULL);
+
+  if (plug_in)
+    {
+      GimpCoreConfig    *core_config    = manager->gimp->config;
+      GimpGeglConfig    *gegl_config    = GIMP_GEGL_CONFIG (core_config);
+      GimpDisplayConfig *display_config = GIMP_DISPLAY_CONFIG (core_config);
+      GimpGuiConfig     *gui_config     = GIMP_GUI_CONFIG (core_config);
+      GPConfig           config;
+      GPProcRun          proc_run;
+      gint               display_ID;
+      GObject           *screen;
+      gint               monitor;
+      GFile             *icon_theme_dir;
+
+      if (! gimp_plug_in_open (plug_in, GIMP_PLUG_IN_CALL_RUN, FALSE))
+        {
+          const gchar *name  = gimp_object_get_name (plug_in);
+          GError      *error = g_error_new (GIMP_PLUG_IN_ERROR,
+                                            GIMP_PLUG_IN_EXECUTION_FAILED,
+                                            _("Failed to run plug-in \"%s\""),
+                                            name);
+
+          g_object_unref (plug_in);
+
+          return_vals = gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+                                                          FALSE, error);
+          g_error_free (error);
+
+          return return_vals;
+        }
+
+      display_ID = display ? gimp_get_display_ID (manager->gimp, display) : -1;
+
+      icon_theme_dir = gimp_get_icon_theme_dir (manager->gimp);
+
+      config.version          = GIMP_PROTOCOL_VERSION;
+      config.tile_width       = GIMP_PLUG_IN_TILE_WIDTH;
+      config.tile_height      = GIMP_PLUG_IN_TILE_HEIGHT;
+      config.shm_ID           = (manager->shm ?
+                                 gimp_plug_in_shm_get_ID (manager->shm) : -1);
+      config.check_size       = display_config->transparency_size;
+      config.check_type       = display_config->transparency_type;
+      config.show_help_button = (gui_config->use_help &&
+                                 gui_config->show_help_button);
+      config.use_cpu_accel    = manager->gimp->use_cpu_accel;
+      config.use_opencl       = gegl_config->use_opencl;
+      config.export_profile   = core_config->export_color_profile;
+      config.export_exif      = core_config->export_metadata_exif;
+      config.export_xmp       = core_config->export_metadata_xmp;
+      config.export_iptc      = core_config->export_metadata_iptc;
+      config.show_tooltips    = gui_config->show_tooltips;
+      config.min_colors       = 144;
+      config.gdisp_ID         = display_ID;
+      config.app_name         = (gchar *) g_get_application_name ();
+      config.wm_class         = (gchar *) gimp_get_program_class (manager->gimp);
+      config.display_name     = gimp_get_display_name (manager->gimp,
+                                                       display_ID,
+                                                       &screen, &monitor);
+      config.monitor_number   = monitor;
+      config.timestamp        = gimp_get_user_time (manager->gimp);
+      config.icon_theme_dir   = icon_theme_dir ?
+                                  g_file_get_path (icon_theme_dir) :
+                                  NULL;
+      config.tile_cache_size  = gegl_config->tile_cache_size;
+      config.swap_path        = gegl_config->swap_path;
+      config.num_processors   = gegl_config->num_processors;
+      config.swap_compression = gegl_config->swap_compression;
+
+      proc_run.name    = GIMP_PROCEDURE (procedure)->original_name;
+      proc_run.nparams = gimp_value_array_length (args);
+      proc_run.params  = plug_in_args_to_params (args, FALSE);
+
+      if (! gp_config_write (plug_in->my_write, &config, plug_in)     ||
+          ! gp_proc_run_write (plug_in->my_write, &proc_run, plug_in) ||
+          ! gimp_wire_flush (plug_in->my_write, plug_in))
+        {
+          const gchar *name  = gimp_object_get_name (plug_in);
+          GError      *error = g_error_new (GIMP_PLUG_IN_ERROR,
+                                            GIMP_PLUG_IN_EXECUTION_FAILED,
+                                            _("Failed to run plug-in \"%s\""),
+                                            name);
+
+          g_free (config.display_name);
+          g_free (config.icon_theme_dir);
+          g_free (proc_run.params);
+
+          g_object_unref (plug_in);
+
+          return_vals = gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+                                                          FALSE, error);
+          g_error_free (error);
+
+          return return_vals;
+        }
+
+      g_free (config.display_name);
+      g_free (config.icon_theme_dir);
+      g_free (proc_run.params);
+
+      /* If this is an extension,
+       * wait for an installation-confirmation message
+       */
+      if (GIMP_PROCEDURE (procedure)->proc_type == GIMP_EXTENSION)
+        {
+          plug_in->ext_main_loop = g_main_loop_new (NULL, FALSE);
+
+          gimp_threads_leave (manager->gimp);
+          g_main_loop_run (plug_in->ext_main_loop);
+          gimp_threads_enter (manager->gimp);
+
+          /*  main_loop is quit in gimp_plug_in_handle_extension_ack()  */
+
+          g_clear_pointer (&plug_in->ext_main_loop, g_main_loop_unref);
+        }
+
+      /* If this plug-in is requested to run synchronously,
+       * wait for its return values
+       */
+      if (synchronous)
+        {
+          GimpPlugInProcFrame *proc_frame = &plug_in->main_proc_frame;
+
+          proc_frame->main_loop = g_main_loop_new (NULL, FALSE);
+
+          gimp_threads_leave (manager->gimp);
+          g_main_loop_run (proc_frame->main_loop);
+          gimp_threads_enter (manager->gimp);
+
+          /*  main_loop is quit in gimp_plug_in_handle_proc_return()  */
+
+          g_clear_pointer (&proc_frame->main_loop, g_main_loop_unref);
+
+          return_vals = gimp_plug_in_proc_frame_get_return_values (proc_frame);
+        }
+
+      g_object_unref (plug_in);
+    }
+
+  return return_vals;
+}
+
+GimpValueArray *
+gimp_plug_in_manager_call_run_temp (GimpPlugInManager      *manager,
+                                    GimpContext            *context,
+                                    GimpProgress           *progress,
+                                    GimpTemporaryProcedure *procedure,
+                                    GimpValueArray         *args)
+{
+  GimpValueArray *return_vals = NULL;
+  GimpPlugIn     *plug_in;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (GIMP_IS_TEMPORARY_PROCEDURE (procedure), NULL);
+  g_return_val_if_fail (args != NULL, NULL);
+
+  plug_in = procedure->plug_in;
+
+  if (plug_in)
+    {
+      GimpPlugInProcFrame *proc_frame;
+      GPProcRun            proc_run;
+
+      proc_frame = gimp_plug_in_proc_frame_push (plug_in, context, progress,
+                                                 procedure);
+
+      proc_run.name    = GIMP_PROCEDURE (procedure)->original_name;
+      proc_run.nparams = gimp_value_array_length (args);
+      proc_run.params  = plug_in_args_to_params (args, FALSE);
+
+      if (! gp_temp_proc_run_write (plug_in->my_write, &proc_run, plug_in) ||
+          ! gimp_wire_flush (plug_in->my_write, plug_in))
+        {
+          const gchar *name  = gimp_object_get_name (plug_in);
+          GError      *error = g_error_new (GIMP_PLUG_IN_ERROR,
+                                            GIMP_PLUG_IN_EXECUTION_FAILED,
+                                            _("Failed to run plug-in \"%s\""),
+                                            name);
+
+          g_free (proc_run.params);
+          gimp_plug_in_proc_frame_pop (plug_in);
+
+          return_vals = gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+                                                          FALSE, error);
+          g_error_free (error);
+
+          return return_vals;
+        }
+      gimp_allow_set_foreground_window (plug_in);
+
+      g_free (proc_run.params);
+
+      g_object_ref (plug_in);
+      gimp_plug_in_proc_frame_ref (proc_frame);
+
+      gimp_plug_in_main_loop (plug_in);
+
+      /*  main_loop is quit and proc_frame is popped in
+       *  gimp_plug_in_handle_temp_proc_return()
+       */
+
+      return_vals = gimp_plug_in_proc_frame_get_return_values (proc_frame);
+
+      gimp_plug_in_proc_frame_unref (proc_frame, plug_in);
+      g_object_unref (plug_in);
+    }
+
+  return return_vals;
+}
diff --git a/app/plug-in/gimppluginmanager-call.h b/app/plug-in/gimppluginmanager-call.h
new file mode 100644
index 0000000..c456ab3
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-call.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-call.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_CALL_H__
+#define __GIMP_PLUG_IN_MANAGER_CALL_H__
+
+#ifndef __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
+#error Do not use gimp_plug_in_manager_call_run*(), use gimp_procedure_execute*() instead.
+#endif
+
+
+/*  Call the plug-in's query() function
+ */
+void             gimp_plug_in_manager_call_query    (GimpPlugInManager      *manager,
+                                                     GimpContext            *context,
+                                                     GimpPlugInDef          *plug_in_def);
+
+/*  Call the plug-in's init() function
+ */
+void             gimp_plug_in_manager_call_init     (GimpPlugInManager      *manager,
+                                                     GimpContext            *context,
+                                                     GimpPlugInDef          *plug_in_def);
+
+/*  Run a plug-in as if it were a procedure database procedure
+ */
+GimpValueArray * gimp_plug_in_manager_call_run      (GimpPlugInManager      *manager,
+                                                     GimpContext            *context,
+                                                     GimpProgress           *progress,
+                                                     GimpPlugInProcedure    *procedure,
+                                                     GimpValueArray         *args,
+                                                     gboolean                synchronous,
+                                                     GimpObject             *display);
+
+/*  Run a temp plug-in proc as if it were a procedure database procedure
+ */
+GimpValueArray * gimp_plug_in_manager_call_run_temp (GimpPlugInManager      *manager,
+                                                     GimpContext            *context,
+                                                     GimpProgress           *progress,
+                                                     GimpTemporaryProcedure *procedure,
+                                                     GimpValueArray         *args);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_CALL_H__ */
diff --git a/app/plug-in/gimppluginmanager-data.c b/app/plug-in/gimppluginmanager-data.c
new file mode 100644
index 0000000..08047b1
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-data.c
@@ -0,0 +1,133 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-data.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "plug-in-types.h"
+
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-data.h"
+
+
+typedef struct _GimpPlugInData GimpPlugInData;
+
+struct _GimpPlugInData
+{
+  gchar  *identifier;
+  gint32  bytes;
+  guint8 *data;
+};
+
+
+/*  public functions  */
+
+void
+gimp_plug_in_manager_data_free (GimpPlugInManager *manager)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+
+  if (manager->data_list)
+    {
+      GList *list;
+
+      for (list = manager->data_list;
+           list;
+           list = g_list_next (list))
+        {
+          GimpPlugInData *data = list->data;
+
+          g_free (data->identifier);
+          g_free (data->data);
+          g_slice_free (GimpPlugInData, data);
+        }
+
+      g_list_free (manager->data_list);
+      manager->data_list = NULL;
+    }
+}
+
+void
+gimp_plug_in_manager_set_data (GimpPlugInManager *manager,
+                               const gchar       *identifier,
+                               gint32             bytes,
+                               const guint8      *data)
+{
+  GimpPlugInData *plug_in_data;
+  GList          *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (identifier != NULL);
+  g_return_if_fail (bytes > 0);
+  g_return_if_fail (data != NULL);
+
+  for (list = manager->data_list; list; list = g_list_next (list))
+    {
+      plug_in_data = list->data;
+
+      if (! strcmp (plug_in_data->identifier, identifier))
+        break;
+    }
+
+  /* If there isn't already data with the specified identifier, create one */
+  if (list == NULL)
+    {
+      plug_in_data = g_slice_new0 (GimpPlugInData);
+      plug_in_data->identifier = g_strdup (identifier);
+
+      manager->data_list = g_list_prepend (manager->data_list, plug_in_data);
+    }
+  else
+    {
+      g_free (plug_in_data->data);
+    }
+
+  plug_in_data->bytes = bytes;
+  plug_in_data->data  = g_memdup (data, bytes);
+}
+
+const guint8 *
+gimp_plug_in_manager_get_data (GimpPlugInManager *manager,
+                               const gchar       *identifier,
+                               gint32            *bytes)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+  g_return_val_if_fail (bytes != NULL, NULL);
+
+  *bytes = 0;
+
+  for (list = manager->data_list; list; list = g_list_next (list))
+    {
+      GimpPlugInData *plug_in_data = list->data;
+
+      if (! strcmp (plug_in_data->identifier, identifier))
+        {
+          *bytes = plug_in_data->bytes;
+          return plug_in_data->data;
+        }
+    }
+
+  return NULL;
+}
diff --git a/app/plug-in/gimppluginmanager-data.h b/app/plug-in/gimppluginmanager-data.h
new file mode 100644
index 0000000..1a88f32
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-data.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-data.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_DATA_H__
+#define __GIMP_PLUG_IN_MANAGER_DATA_H__
+
+
+void           gimp_plug_in_manager_data_free (GimpPlugInManager *manager);
+
+void           gimp_plug_in_manager_set_data  (GimpPlugInManager *manager,
+                                               const gchar       *identifier,
+                                               gint32             bytes,
+                                               const guint8      *data);
+const guint8 * gimp_plug_in_manager_get_data  (GimpPlugInManager *manager,
+                                               const gchar       *identifier,
+                                               gint32            *bytes);
+
+
+#endif  /*  __GIMP_PLUG_IN_MANAGER_DATA_H__  */
diff --git a/app/plug-in/gimppluginmanager-file-procedure.c b/app/plug-in/gimppluginmanager-file-procedure.c
new file mode 100644
index 0000000..ec11ef6
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-file-procedure.c
@@ -0,0 +1,716 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
+ * Copyright (C) 1997 Josh MacDonald
+ *
+ * gimppluginmanager-file-procedure.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "core/gimp-utils.h"
+
+#include "gimppluginmanager-file-procedure.h"
+#include "gimppluginprocedure.h"
+
+#include "gimp-log.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  /*  positive values indicate the length of a matching magic  */
+
+  FILE_MATCH_NONE = 0,
+  FILE_MATCH_SIZE = -1
+} FileMatchType;
+
+
+/*  local function prototypes  */
+
+static GimpPlugInProcedure * file_proc_find_by_prefix    (GSList       *procs,
+                                                          GFile        *file,
+                                                          gboolean      skip_magic);
+static GimpPlugInProcedure * file_proc_find_by_extension (GSList       *procs,
+                                                          GFile        *file,
+                                                          gboolean      skip_magic);
+static GimpPlugInProcedure * file_proc_find_by_name      (GSList       *procs,
+                                                          GFile        *file,
+                                                          gboolean      skip_magic);
+
+static void                  file_convert_string         (const gchar  *instr,
+                                                          gchar        *outmem,
+                                                          gint          maxmem,
+                                                          gint         *nmem);
+static FileMatchType         file_check_single_magic     (const gchar  *offset,
+                                                          const gchar  *type,
+                                                          const gchar  *value,
+                                                          const guchar *file_head,
+                                                          gint          headsize,
+                                                          GFile        *file,
+                                                          GInputStream *input);
+static FileMatchType         file_check_magic_list       (GSList       *magics_list,
+                                                          const guchar *head,
+                                                          gint          headsize,
+                                                          GFile        *file,
+                                                          GInputStream *input);
+
+
+/*  public functions  */
+
+GimpPlugInProcedure *
+file_procedure_find (GSList  *procs,
+                     GFile   *file,
+                     GError **error)
+{
+  GimpPlugInProcedure *file_proc;
+  GimpPlugInProcedure *size_matched_proc = NULL;
+  gint                 size_match_count  = 0;
+
+  g_return_val_if_fail (procs != NULL, NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /* First, check magicless prefixes/suffixes */
+  file_proc = file_proc_find_by_name (procs, file, TRUE);
+
+  if (file_proc)
+    return file_proc;
+
+  /* Then look for magics, but not on remote files */
+  if (g_file_is_native (file))
+    {
+      GSList              *list;
+      GInputStream        *input     = NULL;
+      gboolean             opened    = FALSE;
+      gsize                head_size = 0;
+      guchar               head[256];
+      FileMatchType        best_match_val = FILE_MATCH_NONE;
+      GimpPlugInProcedure *best_file_proc = NULL;
+
+      for (list = procs; list; list = g_slist_next (list))
+        {
+          file_proc = list->data;
+
+          if (file_proc->magics_list)
+            {
+              if (G_UNLIKELY (! opened))
+                {
+                  input = G_INPUT_STREAM (g_file_read (file, NULL, error));
+
+                  if (input)
+                    {
+                      g_input_stream_read_all (input,
+                                               head, sizeof (head),
+                                               &head_size, NULL, error);
+
+                      if (head_size < 4)
+                        {
+                          g_object_unref (input);
+                          input = NULL;
+                        }
+                      else
+                        {
+                          GDataInputStream *data_input;
+
+                          data_input = g_data_input_stream_new (input);
+                          g_object_unref (input);
+                          input = G_INPUT_STREAM (data_input);
+                        }
+                    }
+
+                  opened = TRUE;
+                }
+
+              if (head_size >= 4)
+                {
+                  FileMatchType match_val;
+
+                  match_val = file_check_magic_list (file_proc->magics_list,
+                                                     head, head_size,
+                                                     file, input);
+
+                  if (match_val == FILE_MATCH_SIZE)
+                    {
+                      /* Use it only if no other magic matches */
+                      size_match_count++;
+                      size_matched_proc = file_proc;
+                    }
+                  else if (match_val != FILE_MATCH_NONE)
+                    {
+                      GIMP_LOG (MAGIC_MATCH,
+                                "magic match %d on %s\n",
+                                match_val,
+                                gimp_object_get_name (file_proc));
+
+                      if (match_val > best_match_val)
+                        {
+                          best_match_val = match_val;
+                          best_file_proc = file_proc;
+                        }
+                    }
+                }
+            }
+        }
+
+      if (input)
+        g_object_unref (input);
+
+      if (best_file_proc)
+        {
+          GIMP_LOG (MAGIC_MATCH,
+                    "best magic match on %s\n",
+                    gimp_object_get_name (best_file_proc));
+
+          return best_file_proc;
+        }
+    }
+
+  if (size_match_count == 1)
+    return size_matched_proc;
+
+  /* As a last resort, try matching by name, not skipping magic procs */
+  file_proc = file_proc_find_by_name (procs, file, FALSE);
+
+  if (file_proc)
+    {
+      /* we found a procedure, clear error that might have been set */
+      g_clear_error (error);
+    }
+  else
+    {
+      /* set an error message unless one was already set */
+      if (error && *error == NULL)
+        g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                             _("Unknown file type"));
+    }
+
+  return file_proc;
+}
+
+GimpPlugInProcedure *
+file_procedure_find_by_prefix (GSList *procs,
+                               GFile  *file)
+{
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  return file_proc_find_by_prefix (procs, file, FALSE);
+}
+
+GimpPlugInProcedure *
+file_procedure_find_by_extension (GSList *procs,
+                                  GFile  *file)
+{
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  return file_proc_find_by_extension (procs, file, FALSE);
+}
+
+GimpPlugInProcedure *
+file_procedure_find_by_mime_type (GSList      *procs,
+                                  const gchar *mime_type)
+{
+  GSList *list;
+
+  g_return_val_if_fail (mime_type != NULL, NULL);
+
+  for (list = procs; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+      GSList              *mime;
+
+      for (mime = proc->mime_types_list; mime; mime = g_slist_next (mime))
+        {
+          if (! strcmp (mime_type, mime->data))
+            return proc;
+        }
+    }
+
+  return NULL;
+}
+
+
+/*  private functions  */
+
+static GimpPlugInProcedure *
+file_proc_find_by_prefix (GSList   *procs,
+                          GFile    *file,
+                          gboolean  skip_magic)
+{
+  gchar  *uri = g_file_get_uri (file);
+  GSList *p;
+
+  for (p = procs; p; p = g_slist_next (p))
+    {
+      GimpPlugInProcedure *proc = p->data;
+      GSList              *prefixes;
+
+      if (skip_magic && proc->magics_list)
+        continue;
+
+      for (prefixes = proc->prefixes_list;
+           prefixes;
+           prefixes = g_slist_next (prefixes))
+        {
+          if (g_str_has_prefix (uri, prefixes->data))
+            {
+              g_free (uri);
+              return proc;
+            }
+        }
+     }
+
+  g_free (uri);
+
+  return NULL;
+}
+
+static GimpPlugInProcedure *
+file_proc_find_by_extension (GSList   *procs,
+                             GFile    *file,
+                             gboolean  skip_magic)
+{
+  gchar *ext = gimp_file_get_extension (file);
+
+  if (ext)
+    {
+      GSList *p;
+
+      for (p = procs; p; p = g_slist_next (p))
+        {
+          GimpPlugInProcedure *proc = p->data;
+
+          if (skip_magic && proc->magics_list)
+            continue;
+
+          if (g_slist_find_custom (proc->extensions_list,
+                                   ext + 1,
+                                   (GCompareFunc) g_ascii_strcasecmp))
+            {
+              g_free (ext);
+
+              return proc;
+            }
+        }
+
+      g_free (ext);
+    }
+
+  return NULL;
+}
+
+static GimpPlugInProcedure *
+file_proc_find_by_name (GSList   *procs,
+                        GFile    *file,
+                        gboolean  skip_magic)
+{
+  GimpPlugInProcedure *proc;
+
+  proc = file_proc_find_by_prefix (procs, file, skip_magic);
+
+  if (! proc)
+    proc = file_proc_find_by_extension (procs, file, skip_magic);
+
+  return proc;
+}
+
+static void
+file_convert_string (const gchar *instr,
+                     gchar       *outmem,
+                     gint         maxmem,
+                     gint        *nmem)
+{
+  /* Convert a string in C-notation to array of char */
+  const guchar *uin  = (const guchar *) instr;
+  guchar       *uout = (guchar *) outmem;
+  guchar        tmp[5], *tmpptr;
+  guint         k;
+
+  while ((*uin != '\0') && ((((gchar *) uout) - outmem) < maxmem))
+    {
+      if (*uin != '\\')   /* Not an escaped character ? */
+        {
+          *(uout++) = *(uin++);
+          continue;
+        }
+
+      if (*(++uin) == '\0')
+        {
+          *(uout++) = '\\';
+          break;
+        }
+
+      switch (*uin)
+        {
+          case '0':  case '1':  case '2':  case '3': /* octal */
+            for (tmpptr = tmp; (tmpptr - tmp) <= 3;)
+              {
+                *(tmpptr++) = *(uin++);
+                if (   (*uin == '\0') || (!g_ascii_isdigit (*uin))
+                    || (*uin == '8') || (*uin == '9'))
+                  break;
+              }
+
+            *tmpptr = '\0';
+            sscanf ((gchar *) tmp, "%o", &k);
+            *(uout++) = k;
+            break;
+
+          case 'a': *(uout++) = '\a'; uin++; break;
+          case 'b': *(uout++) = '\b'; uin++; break;
+          case 't': *(uout++) = '\t'; uin++; break;
+          case 'n': *(uout++) = '\n'; uin++; break;
+          case 'v': *(uout++) = '\v'; uin++; break;
+          case 'f': *(uout++) = '\f'; uin++; break;
+          case 'r': *(uout++) = '\r'; uin++; break;
+
+          default : *(uout++) = *(uin++); break;
+        }
+    }
+
+  *nmem = ((gchar *) uout) - outmem;
+}
+
+static FileMatchType
+file_check_single_magic (const gchar  *offset,
+                         const gchar  *type,
+                         const gchar  *value,
+                         const guchar *file_head,
+                         gint          headsize,
+                         GFile        *file,
+                         GInputStream *input)
+
+{
+  FileMatchType found = FILE_MATCH_NONE;
+  glong         offs;
+  gulong        num_testval;
+  gulong        num_operator_val;
+  gint          numbytes, k;
+  const gchar  *num_operator_ptr;
+  gchar         num_operator;
+
+  /* Check offset */
+  if (sscanf (offset, "%ld", &offs) != 1)
+    return FILE_MATCH_NONE;
+
+  /* Check type of test */
+  num_operator_ptr = NULL;
+  num_operator     = '\0';
+
+  if (g_str_has_prefix (type, "byte"))
+    {
+      numbytes = 1;
+      num_operator_ptr = type + strlen ("byte");
+    }
+  else if (g_str_has_prefix (type, "short"))
+    {
+      numbytes = 2;
+      num_operator_ptr = type + strlen ("short");
+    }
+  else if (g_str_has_prefix (type, "long"))
+    {
+      numbytes = 4;
+      num_operator_ptr = type + strlen ("long");
+    }
+  else if (g_str_has_prefix (type, "size"))
+    {
+      numbytes = 5;
+    }
+  else if (strcmp (type, "string") == 0)
+    {
+      numbytes = 0;
+    }
+  else
+    {
+      return FILE_MATCH_NONE;
+    }
+
+  /* Check numerical operator value if present */
+  if (num_operator_ptr && (*num_operator_ptr == '&'))
+    {
+      if (g_ascii_isdigit (num_operator_ptr[1]))
+        {
+          if (num_operator_ptr[1] != '0')      /* decimal */
+            sscanf (num_operator_ptr+1, "%lu", &num_operator_val);
+          else if (num_operator_ptr[2] == 'x') /* hexadecimal */
+            sscanf (num_operator_ptr+3, "%lx", &num_operator_val);
+          else                                 /* octal */
+            sscanf (num_operator_ptr+2, "%lo", &num_operator_val);
+
+          num_operator = *num_operator_ptr;
+        }
+    }
+
+  if (numbytes > 0)
+    {
+      /* Numerical test */
+
+      gchar   num_test = '=';
+      gulong  fileval  = 0;
+
+      /* Check test value */
+      if ((value[0] == '>') || (value[0] == '<'))
+        {
+          num_test = value[0];
+          value++;
+        }
+
+      errno = 0;
+      num_testval = strtol (value, NULL, 0);
+
+      if (errno != 0)
+        return FILE_MATCH_NONE;
+
+      if (numbytes == 5)
+        {
+          /* Check for file size */
+
+          GFileInfo *info = g_file_query_info (file,
+                                               G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                               G_FILE_QUERY_INFO_NONE,
+                                               NULL, NULL);
+          if (! info)
+            return FILE_MATCH_NONE;
+
+          fileval = g_file_info_get_size (info);
+          g_object_unref (info);
+        }
+      else if (offs >= 0 &&
+               (offs + numbytes <= headsize))
+        {
+           /* We have it in memory */
+
+          for (k = 0; k < numbytes; k++)
+            fileval = (fileval << 8) | (glong) file_head[offs + k];
+        }
+      else
+        {
+          /* Read it from file */
+
+          if (! g_seekable_seek (G_SEEKABLE (input), offs,
+                                 (offs >= 0) ? G_SEEK_SET : G_SEEK_END,
+                                 NULL, NULL))
+            return FILE_MATCH_NONE;
+
+          for (k = 0; k < numbytes; k++)
+            {
+              guchar  byte;
+              GError *error = NULL;
+
+              byte = g_data_input_stream_read_byte (G_DATA_INPUT_STREAM (input),
+                                                    NULL, &error);
+              if (error)
+                {
+                  g_clear_error (&error);
+                  return FILE_MATCH_NONE;
+                }
+
+              fileval = (fileval << 8) | byte;
+            }
+        }
+
+      if (num_operator == '&')
+        fileval &= num_operator_val;
+
+      if (num_test == '<')
+        {
+          if (fileval < num_testval)
+            found = numbytes;
+        }
+      else if (num_test == '>')
+        {
+          if (fileval > num_testval)
+            found = numbytes;
+        }
+      else
+        {
+          if (fileval == num_testval)
+            found = numbytes;
+        }
+
+      if (found && (numbytes == 5))
+        found = FILE_MATCH_SIZE;
+    }
+  else if (numbytes == 0)
+    {
+       /* String test */
+
+      gchar mem_testval[256];
+
+      file_convert_string (value,
+                           mem_testval, sizeof (mem_testval),
+                           &numbytes);
+
+      if (numbytes <= 0)
+        return FILE_MATCH_NONE;
+
+      if (offs >= 0 &&
+          (offs + numbytes <= headsize))
+        {
+          /* We have it in memory */
+
+          if (memcmp (mem_testval, file_head + offs, numbytes) == 0)
+            found = numbytes;
+        }
+      else
+        {
+          /* Read it from file */
+
+          if (! g_seekable_seek (G_SEEKABLE (input), offs,
+                                 (offs >= 0) ? G_SEEK_SET : G_SEEK_END,
+                                 NULL, NULL))
+            return FILE_MATCH_NONE;
+
+          for (k = 0; k < numbytes; k++)
+            {
+              guchar  byte;
+              GError *error = NULL;
+
+              byte = g_data_input_stream_read_byte (G_DATA_INPUT_STREAM (input),
+                                                    NULL, &error);
+              if (error)
+                {
+                  g_clear_error (&error);
+
+                  return FILE_MATCH_NONE;
+                }
+
+              if (byte != mem_testval[k])
+                return FILE_MATCH_NONE;
+            }
+
+          found = numbytes;
+        }
+    }
+
+  return found;
+}
+
+static FileMatchType
+file_check_magic_list (GSList       *magics_list,
+                       const guchar *head,
+                       gint          headsize,
+                       GFile        *file,
+                       GInputStream *input)
+
+{
+  gboolean      and            = FALSE;
+  gboolean      found          = FALSE;
+  FileMatchType best_match_val = FILE_MATCH_NONE;
+  FileMatchType match_val      = FILE_MATCH_NONE;
+
+  for (; magics_list; magics_list = magics_list->next)
+    {
+      const gchar   *offset;
+      const gchar   *type;
+      const gchar   *value;
+      FileMatchType  single_match_val = FILE_MATCH_NONE;
+
+      if ((offset      = magics_list->data) == NULL) return FILE_MATCH_NONE;
+      if ((magics_list = magics_list->next) == NULL) return FILE_MATCH_NONE;
+      if ((type        = magics_list->data) == NULL) return FILE_MATCH_NONE;
+      if ((magics_list = magics_list->next) == NULL) return FILE_MATCH_NONE;
+      if ((value       = magics_list->data) == NULL) return FILE_MATCH_NONE;
+
+      single_match_val = file_check_single_magic (offset, type, value,
+                                                  head, headsize,
+                                                  file, input);
+
+      if (and)
+        found = found && (single_match_val != FILE_MATCH_NONE);
+      else
+        found = (single_match_val != FILE_MATCH_NONE);
+
+      if (found)
+        {
+          if (match_val == FILE_MATCH_NONE)
+            {
+              /* if we have no match yet, this is it in any case */
+
+              match_val = single_match_val;
+            }
+          else if (single_match_val != FILE_MATCH_NONE)
+            {
+              /* else if we have a match on this one, combine it with the
+               * existing return value
+               */
+
+              if (single_match_val == FILE_MATCH_SIZE)
+                {
+                  /* if we already have a magic match, simply increase
+                   * that by one to indicate "better match", not perfect
+                   * but better than losing the additional size match
+                   * entirely
+                   */
+                  if (match_val != FILE_MATCH_SIZE)
+                    match_val += 1;
+                }
+              else
+                {
+                  /* if we already have a magic match, simply add to its
+                   * length; otherwise if we already have a size match,
+                   * combine it with this match, see comment above
+                   */
+                  if (match_val != FILE_MATCH_SIZE)
+                    match_val += single_match_val;
+                  else
+                    match_val = single_match_val + 1;
+                }
+            }
+        }
+      else
+        {
+          match_val = FILE_MATCH_NONE;
+        }
+
+      and = (strchr (offset, '&') != NULL);
+
+      if (! and)
+        {
+          /* when done with this 'and' list, update best_match_val */
+
+          if (best_match_val == FILE_MATCH_NONE)
+            {
+              /* if we have no best match yet, this is it */
+
+              best_match_val = match_val;
+            }
+          else if (match_val != FILE_MATCH_NONE)
+            {
+              /* otherwise if this was a match, update the best match, note
+               * that by using MAX we will not overwrite a magic match
+               * with a size match
+               */
+
+              best_match_val = MAX (best_match_val, match_val);
+            }
+
+          match_val = FILE_MATCH_NONE;
+        }
+    }
+
+  return best_match_val;
+}
diff --git a/app/plug-in/gimppluginmanager-file-procedure.h b/app/plug-in/gimppluginmanager-file-procedure.h
new file mode 100644
index 0000000..3508551
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-file-procedure.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-file-procedure.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_FILE_PROCEDURE_H__
+#define __GIMP_PLUG_IN_MANAGER_FILE_PROCEDURE_H__
+
+
+
+GimpPlugInProcedure *file_procedure_find              (GSList      *procs,
+                                                       GFile       *file,
+                                                       GError     **error);
+GimpPlugInProcedure *file_procedure_find_by_prefix    (GSList      *procs,
+                                                       GFile       *file);
+GimpPlugInProcedure *file_procedure_find_by_extension (GSList      *procs,
+                                                       GFile       *file);
+
+GimpPlugInProcedure *file_procedure_find_by_mime_type (GSList      *procs,
+                                                       const gchar *mime_type);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_FILE_PROCEDURE_H__ */
diff --git a/app/plug-in/gimppluginmanager-file.c b/app/plug-in/gimppluginmanager-file.c
new file mode 100644
index 0000000..4da5e55
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-file.c
@@ -0,0 +1,451 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-file.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+
+#include "gimpplugin.h"
+#include "gimpplugindef.h"
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-file.h"
+#include "gimppluginmanager-file-procedure.h"
+#include "gimppluginprocedure.h"
+
+
+static gboolean   file_procedure_in_group (GimpPlugInProcedure    *file_proc,
+                                           GimpFileProcedureGroup  group);
+
+
+/*  public functions  */
+
+gboolean
+gimp_plug_in_manager_register_load_handler (GimpPlugInManager *manager,
+                                            const gchar       *name,
+                                            const gchar       *extensions,
+                                            const gchar       *prefixes,
+                                            const gchar       *magics)
+{
+  GimpPlugInProcedure *file_proc;
+  GimpProcedure       *procedure;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, name);
+
+  if (! file_proc)
+    {
+      gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "attempt to register nonexistent load handler \"%s\"",
+                    name);
+      return FALSE;
+    }
+
+  procedure = GIMP_PROCEDURE (file_proc);
+
+  if ((procedure->num_args   < 3)                        ||
+      (procedure->num_values < 1)                        ||
+      ! GIMP_IS_PARAM_SPEC_INT32    (procedure->args[0]) ||
+      ! G_IS_PARAM_SPEC_STRING      (procedure->args[1]) ||
+      ! G_IS_PARAM_SPEC_STRING      (procedure->args[2]) ||
+      ! GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->values[0]))
+    {
+      gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "load handler \"%s\" does not take the standard "
+                    "load handler args", name);
+      return FALSE;
+    }
+
+  gimp_plug_in_procedure_set_file_proc (file_proc,
+                                        extensions, prefixes, magics);
+
+  if (! g_slist_find (manager->load_procs, file_proc))
+    manager->load_procs = g_slist_prepend (manager->load_procs, file_proc);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_manager_register_save_handler (GimpPlugInManager *manager,
+                                            const gchar       *name,
+                                            const gchar       *extensions,
+                                            const gchar       *prefixes)
+{
+  GimpPlugInProcedure *file_proc;
+  GimpProcedure       *procedure;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, name);
+
+  if (! file_proc)
+    {
+      gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "attempt to register nonexistent save handler \"%s\"",
+                    name);
+      return FALSE;
+    }
+
+  procedure = GIMP_PROCEDURE (file_proc);
+
+  if ((procedure->num_args < 5)                             ||
+      ! GIMP_IS_PARAM_SPEC_INT32       (procedure->args[0]) ||
+      ! GIMP_IS_PARAM_SPEC_IMAGE_ID    (procedure->args[1]) ||
+      ! GIMP_IS_PARAM_SPEC_DRAWABLE_ID (procedure->args[2]) ||
+      ! G_IS_PARAM_SPEC_STRING         (procedure->args[3]) ||
+      ! G_IS_PARAM_SPEC_STRING         (procedure->args[4]))
+    {
+      gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                    "save handler \"%s\" does not take the standard "
+                    "save handler args", name);
+      return FALSE;
+    }
+
+  gimp_plug_in_procedure_set_file_proc (file_proc,
+                                        extensions, prefixes, NULL);
+
+  if (file_procedure_in_group (file_proc, GIMP_FILE_PROCEDURE_GROUP_SAVE))
+    {
+      if (! g_slist_find (manager->save_procs, file_proc))
+        manager->save_procs = g_slist_prepend (manager->save_procs, file_proc);
+    }
+
+  if (file_procedure_in_group (file_proc, GIMP_FILE_PROCEDURE_GROUP_EXPORT))
+    {
+      if (! g_slist_find (manager->export_procs, file_proc))
+        manager->export_procs = g_slist_prepend (manager->export_procs, file_proc);
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_manager_register_priority (GimpPlugInManager *manager,
+                                        const gchar       *name,
+                                        gint               priority)
+{
+  GimpPlugInProcedure *file_proc;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, name);
+
+  if (! file_proc)
+    return FALSE;
+
+  gimp_plug_in_procedure_set_priority (file_proc, priority);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_manager_register_mime_types (GimpPlugInManager *manager,
+                                          const gchar       *name,
+                                          const gchar       *mime_types)
+{
+  GimpPlugInProcedure *file_proc;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+  g_return_val_if_fail (mime_types != NULL, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, name);
+
+  if (! file_proc)
+    return FALSE;
+
+  gimp_plug_in_procedure_set_mime_types (file_proc, mime_types);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_manager_register_handles_uri (GimpPlugInManager *manager,
+                                           const gchar       *name)
+{
+  GimpPlugInProcedure *file_proc;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, name);
+
+  if (! file_proc)
+    return FALSE;
+
+  gimp_plug_in_procedure_set_handles_uri (file_proc);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_manager_register_handles_raw (GimpPlugInManager *manager,
+                                           const gchar       *name)
+{
+  GimpPlugInProcedure *file_proc;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (name != NULL, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, name);
+
+  if (! file_proc)
+    return FALSE;
+
+  gimp_plug_in_procedure_set_handles_raw (file_proc);
+
+  return TRUE;
+}
+
+gboolean
+gimp_plug_in_manager_register_thumb_loader (GimpPlugInManager *manager,
+                                            const gchar       *load_proc,
+                                            const gchar       *thumb_proc)
+{
+  GimpPlugInProcedure *file_proc;
+  GSList              *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), FALSE);
+  g_return_val_if_fail (load_proc, FALSE);
+  g_return_val_if_fail (thumb_proc, FALSE);
+
+  if (manager->current_plug_in && manager->current_plug_in->plug_in_def)
+    list = manager->current_plug_in->plug_in_def->procedures;
+  else
+    list = manager->plug_in_procedures;
+
+  file_proc = gimp_plug_in_procedure_find (list, load_proc);
+
+  if (! file_proc)
+    return FALSE;
+
+  gimp_plug_in_procedure_set_thumb_loader (file_proc, thumb_proc);
+
+  return TRUE;
+}
+
+GSList *
+gimp_plug_in_manager_get_file_procedures (GimpPlugInManager      *manager,
+                                          GimpFileProcedureGroup  group)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+
+  switch (group)
+    {
+    case GIMP_FILE_PROCEDURE_GROUP_NONE:
+      return NULL;
+
+    case GIMP_FILE_PROCEDURE_GROUP_OPEN:
+      return manager->display_load_procs;
+
+    case GIMP_FILE_PROCEDURE_GROUP_SAVE:
+      return manager->display_save_procs;
+
+    case GIMP_FILE_PROCEDURE_GROUP_EXPORT:
+      return manager->display_export_procs;
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+}
+
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find (GimpPlugInManager      *manager,
+                                          GimpFileProcedureGroup  group,
+                                          GFile                  *file,
+                                          GError                **error)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  switch (group)
+    {
+    case GIMP_FILE_PROCEDURE_GROUP_OPEN:
+      return file_procedure_find (manager->load_procs, file, error);
+
+    case GIMP_FILE_PROCEDURE_GROUP_SAVE:
+      return file_procedure_find (manager->save_procs, file, error);
+
+    case GIMP_FILE_PROCEDURE_GROUP_EXPORT:
+      return file_procedure_find (manager->export_procs, file, error);
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+}
+
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find_by_prefix (GimpPlugInManager      *manager,
+                                                    GimpFileProcedureGroup  group,
+                                                    GFile                  *file)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  switch (group)
+    {
+    case GIMP_FILE_PROCEDURE_GROUP_OPEN:
+      return file_procedure_find_by_prefix (manager->load_procs, file);
+
+    case GIMP_FILE_PROCEDURE_GROUP_SAVE:
+      return file_procedure_find_by_prefix (manager->save_procs, file);
+
+    case GIMP_FILE_PROCEDURE_GROUP_EXPORT:
+      return file_procedure_find_by_prefix (manager->export_procs, file);
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+}
+
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find_by_extension (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group,
+                                                       GFile                  *file)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  switch (group)
+    {
+    case GIMP_FILE_PROCEDURE_GROUP_OPEN:
+      return file_procedure_find_by_extension (manager->load_procs, file);
+
+    case GIMP_FILE_PROCEDURE_GROUP_SAVE:
+      return file_procedure_find_by_extension (manager->save_procs, file);
+
+    case GIMP_FILE_PROCEDURE_GROUP_EXPORT:
+      return file_procedure_find_by_extension (manager->export_procs, file);
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+}
+
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find_by_mime_type (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group,
+                                                       const gchar            *mime_type)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (mime_type != NULL, NULL);
+
+  switch (group)
+    {
+    case GIMP_FILE_PROCEDURE_GROUP_OPEN:
+      return file_procedure_find_by_mime_type (manager->load_procs, mime_type);
+
+    case GIMP_FILE_PROCEDURE_GROUP_SAVE:
+      return file_procedure_find_by_mime_type (manager->save_procs, mime_type);
+
+    case GIMP_FILE_PROCEDURE_GROUP_EXPORT:
+      return file_procedure_find_by_mime_type (manager->export_procs, mime_type);
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+}
+
+
+/*  private functions  */
+
+static gboolean
+file_procedure_in_group (GimpPlugInProcedure    *file_proc,
+                         GimpFileProcedureGroup  group)
+{
+  const gchar *name        = gimp_object_get_name (file_proc);
+  gboolean     is_xcf_save = FALSE;
+  gboolean     is_filter   = FALSE;
+
+  is_xcf_save = (strcmp (name, "gimp-xcf-save") == 0);
+
+  is_filter   = (strcmp (name, "file-gz-save")  == 0 ||
+                 strcmp (name, "file-bz2-save") == 0 ||
+                 strcmp (name, "file-xz-save")  == 0);
+
+  switch (group)
+    {
+    case GIMP_FILE_PROCEDURE_GROUP_NONE:
+      return FALSE;
+
+    case GIMP_FILE_PROCEDURE_GROUP_SAVE:
+      /* Only .xcf shall pass */
+      return is_xcf_save || is_filter;
+
+    case GIMP_FILE_PROCEDURE_GROUP_EXPORT:
+      /* Anything but .xcf shall pass */
+      return ! is_xcf_save;
+
+    case GIMP_FILE_PROCEDURE_GROUP_OPEN:
+      /* No filter applied for Open */
+      return TRUE;
+
+    default:
+    case GIMP_FILE_PROCEDURE_GROUP_ANY:
+      return TRUE;
+    }
+}
diff --git a/app/plug-in/gimppluginmanager-file.h b/app/plug-in/gimppluginmanager-file.h
new file mode 100644
index 0000000..8408218
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-file.h
@@ -0,0 +1,75 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-file.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_FILE_H__
+#define __GIMP_PLUG_IN_MANAGER_FILE_H__
+
+
+gboolean   gimp_plug_in_manager_register_load_handler (GimpPlugInManager *manager,
+                                                       const gchar       *name,
+                                                       const gchar       *extensions,
+                                                       const gchar       *prefixes,
+                                                       const gchar       *magics);
+gboolean   gimp_plug_in_manager_register_save_handler (GimpPlugInManager *manager,
+                                                       const gchar       *name,
+                                                       const gchar       *extensions,
+                                                       const gchar       *prefixes);
+
+gboolean   gimp_plug_in_manager_register_priority     (GimpPlugInManager *manager,
+                                                       const gchar       *name,
+                                                       gint               priority);
+
+
+gboolean   gimp_plug_in_manager_register_mime_types   (GimpPlugInManager *manager,
+                                                       const gchar       *name,
+                                                       const gchar       *mime_types);
+
+gboolean   gimp_plug_in_manager_register_handles_uri  (GimpPlugInManager *manager,
+                                                       const gchar       *name);
+
+gboolean   gimp_plug_in_manager_register_handles_raw  (GimpPlugInManager *manager,
+                                                       const gchar       *name);
+
+gboolean   gimp_plug_in_manager_register_thumb_loader (GimpPlugInManager *manager,
+                                                       const gchar       *load_proc,
+                                                       const gchar       *thumb_proc);
+
+GSList   * gimp_plug_in_manager_get_file_procedures   (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group);
+
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find              (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group,
+                                                       GFile                  *file,
+                                                       GError                **error);
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find_by_prefix    (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group,
+                                                       GFile                  *file);
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find_by_extension (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group,
+                                                       GFile                  *file);
+GimpPlugInProcedure *
+gimp_plug_in_manager_file_procedure_find_by_mime_type (GimpPlugInManager      *manager,
+                                                       GimpFileProcedureGroup  group,
+                                                       const gchar            *mime_type);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_FILE_H__ */
diff --git a/app/plug-in/gimppluginmanager-help-domain.c b/app/plug-in/gimppluginmanager-help-domain.c
new file mode 100644
index 0000000..96ea41b
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-help-domain.c
@@ -0,0 +1,160 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-help-domain.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "plug-in-types.h"
+
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-help-domain.h"
+
+
+typedef struct _GimpPlugInHelpDomain GimpPlugInHelpDomain;
+
+struct _GimpPlugInHelpDomain
+{
+  GFile *file;
+  gchar *domain_name;
+  gchar *domain_uri;
+};
+
+
+void
+gimp_plug_in_manager_help_domain_exit (GimpPlugInManager *manager)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+
+  for (list = manager->help_domains; list; list = list->next)
+    {
+      GimpPlugInHelpDomain *domain = list->data;
+
+      g_object_unref (domain->file);
+      g_free (domain->domain_name);
+      g_free (domain->domain_uri);
+      g_slice_free (GimpPlugInHelpDomain, domain);
+    }
+
+  g_slist_free (manager->help_domains);
+  manager->help_domains = NULL;
+}
+
+void
+gimp_plug_in_manager_add_help_domain (GimpPlugInManager *manager,
+                                      GFile             *file,
+                                      const gchar       *domain_name,
+                                      const gchar       *domain_uri)
+{
+  GimpPlugInHelpDomain *domain;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (domain_name != NULL);
+
+  domain = g_slice_new (GimpPlugInHelpDomain);
+
+  domain->file        = g_object_ref (file);
+  domain->domain_name = g_strdup (domain_name);
+  domain->domain_uri  = g_strdup (domain_uri);
+
+  manager->help_domains = g_slist_prepend (manager->help_domains, domain);
+
+#ifdef VERBOSE
+  g_print ("added help domain \"%s\" for base uri \"%s\"\n",
+           domain->domain_name ? domain->domain_name : "(null)",
+           domain->domain_uri  ? domain->domain_uri  : "(null)");
+#endif
+}
+
+const gchar *
+gimp_plug_in_manager_get_help_domain (GimpPlugInManager  *manager,
+                                      GFile              *file,
+                                      const gchar       **domain_uri)
+{
+  GSList *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
+
+  if (domain_uri)
+    *domain_uri = NULL;
+
+  /*  A NULL prog_name is GIMP itself, return the default domain  */
+  if (! file)
+    return NULL;
+
+  for (list = manager->help_domains; list; list = list->next)
+    {
+      GimpPlugInHelpDomain *domain = list->data;
+
+      if (domain && domain->file &&
+          g_file_equal (domain->file, file))
+        {
+          if (domain_uri && domain->domain_uri)
+            *domain_uri = domain->domain_uri;
+
+          return domain->domain_name;
+        }
+    }
+
+  return NULL;
+}
+
+gint
+gimp_plug_in_manager_get_help_domains (GimpPlugInManager   *manager,
+                                       gchar             ***help_domains,
+                                       gchar             ***help_uris)
+{
+  gint n_domains;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), 0);
+  g_return_val_if_fail (help_domains != NULL, 0);
+  g_return_val_if_fail (help_uris != NULL, 0);
+
+  n_domains = g_slist_length (manager->help_domains);
+
+  if (n_domains > 0)
+    {
+      GSList *list;
+      gint    i;
+
+      *help_domains = g_new0 (gchar *, n_domains + 1);
+      *help_uris    = g_new0 (gchar *, n_domains + 1);
+
+      for (list = manager->help_domains, i = 0; list; list = list->next, i++)
+        {
+          GimpPlugInHelpDomain *domain = list->data;
+
+          (*help_domains)[i] = g_strdup (domain->domain_name);
+          (*help_uris)[i]    = g_strdup (domain->domain_uri);
+        }
+    }
+  else
+    {
+      *help_domains = NULL;
+      *help_uris    = NULL;
+    }
+
+  return n_domains;
+}
diff --git a/app/plug-in/gimppluginmanager-help-domain.h b/app/plug-in/gimppluginmanager-help-domain.h
new file mode 100644
index 0000000..e4f8972
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-help-domain.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-help-domain.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_HELP_DOMAIN_H__
+#define __GIMP_PLUG_IN_MANAGER_HELP_DOMAIN_H__
+
+
+void          gimp_plug_in_manager_help_domain_exit (GimpPlugInManager   *manager);
+
+/* Add a help domain */
+void          gimp_plug_in_manager_add_help_domain  (GimpPlugInManager   *manager,
+                                                     GFile               *file,
+                                                     const gchar         *domain_name,
+                                                     const gchar         *domain_uri);
+
+/* Retrieve a plug-ins help domain */
+const gchar * gimp_plug_in_manager_get_help_domain  (GimpPlugInManager   *manager,
+                                                     GFile               *file,
+                                                     const gchar        **help_uri);
+
+/* Retrieve all help domains */
+gint          gimp_plug_in_manager_get_help_domains (GimpPlugInManager   *manager,
+                                                     gchar             ***help_domains,
+                                                     gchar             ***help_uris);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_HELP_DOMAIN_H__ */
diff --git a/app/plug-in/gimppluginmanager-locale-domain.c b/app/plug-in/gimppluginmanager-locale-domain.c
new file mode 100644
index 0000000..ae0433b
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-locale-domain.c
@@ -0,0 +1,180 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-locale-domain.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-locale-domain.h"
+
+
+#define STD_PLUG_INS_LOCALE_DOMAIN GETTEXT_PACKAGE "-std-plug-ins"
+
+
+typedef struct _GimpPlugInLocaleDomain GimpPlugInLocaleDomain;
+
+struct _GimpPlugInLocaleDomain
+{
+  GFile *file;
+  gchar *domain_name;
+  gchar *domain_path;
+};
+
+
+void
+gimp_plug_in_manager_locale_domain_exit (GimpPlugInManager *manager)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+
+  for (list = manager->locale_domains; list; list = list->next)
+    {
+      GimpPlugInLocaleDomain *domain = list->data;
+
+      g_object_unref (domain->file);
+      g_free (domain->domain_name);
+      g_free (domain->domain_path);
+      g_slice_free (GimpPlugInLocaleDomain, domain);
+    }
+
+  g_slist_free (manager->locale_domains);
+  manager->locale_domains = NULL;
+}
+
+void
+gimp_plug_in_manager_add_locale_domain (GimpPlugInManager *manager,
+                                        GFile             *file,
+                                        const gchar       *domain_name,
+                                        const gchar       *domain_path)
+{
+  GimpPlugInLocaleDomain *domain;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (domain_name != NULL);
+
+  domain = g_slice_new (GimpPlugInLocaleDomain);
+
+  domain->file        = g_object_ref (file);
+  domain->domain_name = g_strdup (domain_name);
+  domain->domain_path = g_strdup (domain_path);
+
+  manager->locale_domains = g_slist_prepend (manager->locale_domains, domain);
+
+#ifdef VERBOSE
+  g_print ("added locale domain \"%s\" for path \"%s\"\n",
+           domain->domain_name ? domain->domain_name : "(null)",
+           domain->domain_path ?
+           gimp_filename_to_utf8 (domain->domain_path) : "(null)");
+#endif
+}
+
+const gchar *
+gimp_plug_in_manager_get_locale_domain (GimpPlugInManager  *manager,
+                                        GFile              *file,
+                                        const gchar       **domain_path)
+{
+  GSList *list;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
+
+  if (domain_path)
+    *domain_path = gimp_locale_directory ();
+
+  /*  A NULL prog_name is GIMP itself, return the default domain  */
+  if (! file)
+    return NULL;
+
+  for (list = manager->locale_domains; list; list = list->next)
+    {
+      GimpPlugInLocaleDomain *domain = list->data;
+
+      if (domain && domain->file &&
+          g_file_equal (domain->file, file))
+        {
+          if (domain_path && domain->domain_path)
+            *domain_path = domain->domain_path;
+
+          return domain->domain_name;
+        }
+    }
+
+  return STD_PLUG_INS_LOCALE_DOMAIN;
+}
+
+gint
+gimp_plug_in_manager_get_locale_domains (GimpPlugInManager   *manager,
+                                         gchar             ***locale_domains,
+                                         gchar             ***locale_paths)
+{
+  GSList *list;
+  GSList *unique = NULL;
+  gint    n_domains;
+  gint    i;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), 0);
+  g_return_val_if_fail (locale_domains != NULL, 0);
+  g_return_val_if_fail (locale_paths != NULL, 0);
+
+  for (list = manager->locale_domains; list; list = list->next)
+    {
+      GimpPlugInLocaleDomain *domain = list->data;
+      GSList                 *tmp;
+
+      for (tmp = unique; tmp; tmp = tmp->next)
+        if (! strcmp (domain->domain_name, (const gchar *) tmp->data))
+          break;
+
+      if (! tmp)
+        unique = g_slist_prepend (unique, domain);
+    }
+
+  unique = g_slist_reverse (unique);
+
+  n_domains = g_slist_length (unique) + 1;
+
+  *locale_domains = g_new0 (gchar *, n_domains + 1);
+  *locale_paths   = g_new0 (gchar *, n_domains + 1);
+
+  (*locale_domains)[0] = g_strdup (STD_PLUG_INS_LOCALE_DOMAIN);
+  (*locale_paths)[0]   = g_strdup (gimp_locale_directory ());
+
+  for (list = unique, i = 1; list; list = list->next, i++)
+    {
+      GimpPlugInLocaleDomain *domain = list->data;
+
+      (*locale_domains)[i] = g_strdup (domain->domain_name);
+      (*locale_paths)[i]   = (domain->domain_path ?
+                              g_strdup (domain->domain_path) :
+                              g_strdup (gimp_locale_directory ()));
+    }
+
+  g_slist_free (unique);
+
+  return n_domains;
+}
diff --git a/app/plug-in/gimppluginmanager-locale-domain.h b/app/plug-in/gimppluginmanager-locale-domain.h
new file mode 100644
index 0000000..2061ebe
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-locale-domain.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-locale-domain.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_LOCALE_DOMAIN_H__
+#define __GIMP_PLUG_IN_MANAGER_LOCALE_DOMAIN_H__
+
+
+void          gimp_plug_in_manager_locale_domain_exit (GimpPlugInManager   *manager);
+
+/* Add a locale domain */
+void          gimp_plug_in_manager_add_locale_domain  (GimpPlugInManager   *manager,
+                                                       GFile               *file,
+                                                       const gchar         *domain_name,
+                                                       const gchar         *domain_path);
+
+/* Retrieve a plug-ins locale domain */
+const gchar * gimp_plug_in_manager_get_locale_domain  (GimpPlugInManager   *manager,
+                                                       GFile               *file,
+                                                       const gchar        **locale_path);
+
+/* Retrieve all locale domains */
+gint          gimp_plug_in_manager_get_locale_domains (GimpPlugInManager   *manager,
+                                                       gchar             ***locale_domains,
+                                                       gchar             ***locale_paths);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_LOCALE_DOMAIN_H__ */
diff --git a/app/plug-in/gimppluginmanager-menu-branch.c b/app/plug-in/gimppluginmanager-menu-branch.c
new file mode 100644
index 0000000..c15d374
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-menu-branch.c
@@ -0,0 +1,92 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-menu-branch.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "plug-in-types.h"
+
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-menu-branch.h"
+#include "plug-in-menu-path.h"
+
+
+/*  public functions  */
+
+void
+gimp_plug_in_manager_menu_branch_exit (GimpPlugInManager *manager)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+
+  for (list = manager->menu_branches; list; list = list->next)
+    {
+      GimpPlugInMenuBranch *branch = list->data;
+
+      g_object_unref (branch->file);
+      g_free (branch->menu_path);
+      g_free (branch->menu_label);
+      g_slice_free (GimpPlugInMenuBranch, branch);
+    }
+
+  g_slist_free (manager->menu_branches);
+  manager->menu_branches = NULL;
+}
+
+void
+gimp_plug_in_manager_add_menu_branch (GimpPlugInManager *manager,
+                                      GFile             *file,
+                                      const gchar       *menu_path,
+                                      const gchar       *menu_label)
+{
+  GimpPlugInMenuBranch *branch;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (menu_path != NULL);
+  g_return_if_fail (menu_label != NULL);
+
+  branch = g_slice_new (GimpPlugInMenuBranch);
+
+  branch->file       = g_object_ref (file);
+  branch->menu_path  = plug_in_menu_path_map (menu_path, menu_label);
+  branch->menu_label = g_strdup (menu_label);
+
+  manager->menu_branches = g_slist_append (manager->menu_branches, branch);
+
+  g_signal_emit_by_name (manager, "menu-branch-added",
+                         branch->file,
+                         branch->menu_path,
+                         branch->menu_label);
+
+#ifdef VERBOSE
+  g_print ("added menu branch \"%s\" at path \"%s\"\n",
+           branch->menu_label, branch->menu_path);
+#endif
+}
+
+GSList *
+gimp_plug_in_manager_get_menu_branches (GimpPlugInManager *manager)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
+
+  return manager->menu_branches;
+}
diff --git a/app/plug-in/gimppluginmanager-menu-branch.h b/app/plug-in/gimppluginmanager-menu-branch.h
new file mode 100644
index 0000000..e092d01
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-menu-branch.h
@@ -0,0 +1,42 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-menu-branch.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_MENU_BRANCH_H__
+#define __GIMP_PLUG_IN_MANAGER_MENU_BRANCH_H__
+
+
+struct _GimpPlugInMenuBranch
+{
+  GFile *file;
+  gchar *menu_path;
+  gchar *menu_label;
+};
+
+
+void     gimp_plug_in_manager_menu_branch_exit  (GimpPlugInManager *manager);
+
+/* Add a menu branch */
+void     gimp_plug_in_manager_add_menu_branch   (GimpPlugInManager *manager,
+                                                 GFile             *file,
+                                                 const gchar       *menu_path,
+                                                 const gchar       *menu_label);
+GSList * gimp_plug_in_manager_get_menu_branches (GimpPlugInManager *manager);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_MENU_BRANCH_H__ */
diff --git a/app/plug-in/gimppluginmanager-query.c b/app/plug-in/gimppluginmanager-query.c
new file mode 100644
index 0000000..861a89a
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-query.c
@@ -0,0 +1,162 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
+ *
+ * plug-ins-query.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-query.h"
+#include "gimppluginprocedure.h"
+
+
+static gboolean
+match_string (GRegex *regex,
+              gchar  *string)
+{
+  return g_regex_match (regex, string, 0, NULL);
+}
+
+gint
+gimp_plug_in_manager_query (GimpPlugInManager   *manager,
+                            const gchar         *search_str,
+                            gchar             ***menu_strs,
+                            gchar             ***accel_strs,
+                            gchar             ***prog_strs,
+                            gchar             ***types_strs,
+                            gchar             ***realname_strs,
+                            gint32             **time_ints)
+{
+  gint32   num_plugins = 0;
+  GSList  *list;
+  GSList  *matched     = NULL;
+  gint     i           = 0;
+  GRegex  *sregex      = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), 0);
+  g_return_val_if_fail (menu_strs != NULL, 0);
+  g_return_val_if_fail (accel_strs != NULL, 0);
+  g_return_val_if_fail (prog_strs != NULL, 0);
+  g_return_val_if_fail (types_strs != NULL, 0);
+  g_return_val_if_fail (realname_strs != NULL, 0);
+  g_return_val_if_fail (time_ints != NULL, 0);
+
+  *menu_strs     = NULL;
+  *accel_strs    = NULL;
+  *prog_strs     = NULL;
+  *types_strs    = NULL;
+  *realname_strs = NULL;
+  *time_ints     = NULL;
+
+  if (search_str && ! strlen (search_str))
+    search_str = NULL;
+
+  if (search_str)
+    {
+      sregex = g_regex_new (search_str, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0,
+                            NULL);
+      if (! sregex)
+        return 0;
+    }
+
+  /* count number of plugin entries, then allocate arrays of correct size
+   * where we can store the strings.
+   */
+
+  for (list = manager->plug_in_procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+
+      if (proc->file && proc->menu_paths)
+        {
+          gchar *name;
+
+          if (proc->menu_label)
+            {
+              name = proc->menu_label;
+            }
+          else
+            {
+              name = strrchr (proc->menu_paths->data, '/');
+
+              if (name)
+                name = name + 1;
+              else
+                name = proc->menu_paths->data;
+            }
+
+          name = gimp_strip_uline (name);
+
+          if (! search_str || match_string (sregex, name))
+            {
+              num_plugins++;
+              matched = g_slist_prepend (matched, proc);
+            }
+
+          g_free (name);
+        }
+    }
+
+  *menu_strs     = g_new (gchar *, num_plugins);
+  *accel_strs    = g_new (gchar *, num_plugins);
+  *prog_strs     = g_new (gchar *, num_plugins);
+  *types_strs    = g_new (gchar *, num_plugins);
+  *realname_strs = g_new (gchar *, num_plugins);
+  *time_ints     = g_new (gint,    num_plugins);
+
+  matched = g_slist_reverse (matched);
+
+  for (list = matched; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+      gchar               *name;
+
+      if (proc->menu_label)
+        name = g_strdup_printf ("%s/%s",
+                                (gchar *) proc->menu_paths->data,
+                                proc->menu_label);
+      else
+        name = g_strdup (proc->menu_paths->data);
+
+      (*menu_strs)[i]     = gimp_strip_uline (name);
+      (*accel_strs)[i]    = NULL;
+      (*prog_strs)[i]     = g_file_get_path (proc->file);
+      (*types_strs)[i]    = g_strdup (proc->image_types);
+      (*realname_strs)[i] = g_strdup (gimp_object_get_name (proc));
+      (*time_ints)[i]     = proc->mtime;
+
+      g_free (name);
+
+      i++;
+    }
+
+  g_slist_free (matched);
+
+  if (sregex)
+    g_regex_unref (sregex);
+
+  return num_plugins;
+}
diff --git a/app/plug-in/gimppluginmanager-query.h b/app/plug-in/gimppluginmanager-query.h
new file mode 100644
index 0000000..94b78c8
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-query.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-query.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_QUERY_H__
+#define __GIMP_PLUG_IN_MANAGER_QUERY_H__
+
+
+gint   gimp_plug_in_manager_query (GimpPlugInManager   *manager,
+                                   const gchar         *search_str,
+                                   gchar             ***menu_strs,
+                                   gchar             ***accel_strs,
+                                   gchar             ***prog_strs,
+                                   gchar             ***types_strs,
+                                   gchar             ***realname_strs,
+                                   gint32             **time_ints);
+
+
+#endif /* __GIMP_PLUG_IN_MANAGER_QUERY_H__ */
diff --git a/app/plug-in/gimppluginmanager-restore.c b/app/plug-in/gimppluginmanager-restore.c
new file mode 100644
index 0000000..a1f37ec
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-restore.c
@@ -0,0 +1,1065 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimppluginmanager-restore.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "plug-in-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimppdbcontext.h"
+
+#include "gimpinterpreterdb.h"
+#include "gimpplugindef.h"
+#include "gimppluginmanager.h"
+#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
+#include "gimppluginmanager-call.h"
+#include "gimppluginmanager-help-domain.h"
+#include "gimppluginmanager-locale-domain.h"
+#include "gimppluginmanager-restore.h"
+#include "gimppluginprocedure.h"
+#include "plug-in-rc.h"
+
+#include "gimp-intl.h"
+
+
+static void    gimp_plug_in_manager_search            (GimpPlugInManager    *manager,
+                                                       GimpInitStatusFunc    status_callback);
+static void    gimp_plug_in_manager_search_directory  (GimpPlugInManager    *manager,
+                                                       GFile                *directory);
+static GFile * gimp_plug_in_manager_get_pluginrc      (GimpPlugInManager    *manager);
+static void    gimp_plug_in_manager_read_pluginrc     (GimpPlugInManager    *manager,
+                                                       GFile                *file,
+                                                       GimpInitStatusFunc    status_callback);
+static void    gimp_plug_in_manager_query_new         (GimpPlugInManager    *manager,
+                                                       GimpContext          *context,
+                                                       GimpInitStatusFunc    status_callback);
+static void    gimp_plug_in_manager_init_plug_ins     (GimpPlugInManager    *manager,
+                                                       GimpContext          *context,
+                                                       GimpInitStatusFunc    status_callback);
+static void    gimp_plug_in_manager_run_extensions    (GimpPlugInManager    *manager,
+                                                       GimpContext          *context,
+                                                       GimpInitStatusFunc    status_callback);
+static void    gimp_plug_in_manager_bind_text_domains (GimpPlugInManager    *manager);
+static void    gimp_plug_in_manager_add_from_file     (GimpPlugInManager    *manager,
+                                                       GFile                *file,
+                                                       guint64               mtime);
+static void    gimp_plug_in_manager_add_from_rc       (GimpPlugInManager    *manager,
+                                                       GimpPlugInDef        *plug_in_def);
+static void    gimp_plug_in_manager_add_to_db         (GimpPlugInManager    *manager,
+                                                       GimpContext          *context,
+                                                       GimpPlugInProcedure  *proc);
+static void    gimp_plug_in_manager_sort_file_procs   (GimpPlugInManager    *manager);
+static gint    gimp_plug_in_manager_file_proc_compare (gconstpointer         a,
+                                                       gconstpointer         b,
+                                                       gpointer              data);
+
+
+
+void
+gimp_plug_in_manager_restore (GimpPlugInManager  *manager,
+                              GimpContext        *context,
+                              GimpInitStatusFunc  status_callback)
+{
+  Gimp   *gimp;
+  GFile  *pluginrc;
+  GSList *list;
+  GError *error = NULL;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_CONTEXT (context));
+  g_return_if_fail (status_callback != NULL);
+
+  gimp = manager->gimp;
+
+  /* need a GimpPDBContext for calling gimp_plug_in_manager_run_foo() */
+  context = gimp_pdb_context_new (gimp, context, TRUE);
+
+  /* search for binaries in the plug-in directory path */
+  gimp_plug_in_manager_search (manager, status_callback);
+
+  /* read the pluginrc file for cached data */
+  pluginrc = gimp_plug_in_manager_get_pluginrc (manager);
+
+  gimp_plug_in_manager_read_pluginrc (manager, pluginrc, status_callback);
+
+  /* query any plug-ins that changed since we last wrote out pluginrc */
+  gimp_plug_in_manager_query_new (manager, context, status_callback);
+
+  /* initialize the plug-ins */
+  gimp_plug_in_manager_init_plug_ins (manager, context, status_callback);
+
+  /* add the procedures to manager->plug_in_procedures */
+  for (list = manager->plug_in_defs; list; list = list->next)
+    {
+      GimpPlugInDef *plug_in_def = list->data;
+      GSList        *list2;
+
+      for (list2 = plug_in_def->procedures; list2; list2 = list2->next)
+        {
+          gimp_plug_in_manager_add_procedure (manager, list2->data);
+        }
+    }
+
+  /* write the pluginrc file if necessary */
+  if (manager->write_pluginrc)
+    {
+      if (gimp->be_verbose)
+        g_print ("Writing '%s'\n", gimp_file_get_utf8_name (pluginrc));
+
+      if (! plug_in_rc_write (manager->plug_in_defs, pluginrc, &error))
+        {
+          gimp_message_literal (gimp,
+                                NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_clear_error (&error);
+        }
+
+      manager->write_pluginrc = FALSE;
+    }
+
+  g_object_unref (pluginrc);
+
+  /* create locale and help domain lists */
+  for (list = manager->plug_in_defs; list; list = list->next)
+    {
+      GimpPlugInDef *plug_in_def = list->data;
+
+      if (plug_in_def->locale_domain_name)
+        gimp_plug_in_manager_add_locale_domain (manager,
+                                                plug_in_def->file,
+                                                plug_in_def->locale_domain_name,
+                                                plug_in_def->locale_domain_path);
+      else
+        /* set the default plug-in locale domain */
+        gimp_plug_in_def_set_locale_domain (plug_in_def,
+                                            gimp_plug_in_manager_get_locale_domain (manager,
+                                                                                    plug_in_def->file,
+                                                                                    NULL),
+                                            NULL);
+
+      if (plug_in_def->help_domain_name)
+        gimp_plug_in_manager_add_help_domain (manager,
+                                              plug_in_def->file,
+                                              plug_in_def->help_domain_name,
+                                              plug_in_def->help_domain_uri);
+    }
+
+  /* we're done with the plug-in-defs */
+  g_slist_free_full (manager->plug_in_defs, (GDestroyNotify) g_object_unref);
+  manager->plug_in_defs = NULL;
+
+  /* bind plug-in text domains  */
+  gimp_plug_in_manager_bind_text_domains (manager);
+
+  /* add the plug-in procs to the procedure database */
+  for (list = manager->plug_in_procedures; list; list = list->next)
+    {
+      gimp_plug_in_manager_add_to_db (manager, context, list->data);
+    }
+
+  /* sort the load, save and export procedures, make the raw handler list */
+  gimp_plug_in_manager_sort_file_procs (manager);
+
+  gimp_plug_in_manager_run_extensions (manager, context, status_callback);
+
+  g_object_unref (context);
+}
+
+
+/* search for binaries in the plug-in directory path */
+static void
+gimp_plug_in_manager_search (GimpPlugInManager  *manager,
+                             GimpInitStatusFunc  status_callback)
+{
+  const gchar *path_str;
+  GList       *path;
+  GList       *list;
+
+#ifdef G_OS_WIN32
+  const gchar *pathext = g_getenv ("PATHEXT");
+
+  /*  On Windows, we need to add the known file extensions in PATHEXT. */
+  if (pathext)
+    {
+      gchar *exts;
+
+      exts = gimp_interpreter_db_get_extensions (manager->interpreter_db);
+
+      if (exts)
+        {
+          gchar *value;
+
+          value = g_strconcat (pathext, G_SEARCHPATH_SEPARATOR_S, exts, NULL);
+
+          g_setenv ("PATHEXT", value, TRUE);
+
+          g_free (value);
+          g_free (exts);
+        }
+    }
+#endif /* G_OS_WIN32 */
+
+  status_callback (_("Searching plug-ins"), "", 0.0);
+
+  /* Give automatic tests a chance to use plug-ins from the build
+   * dir
+   */
+  path_str = g_getenv ("GIMP_TESTING_PLUGINDIRS");
+  if (! path_str)
+    path_str = manager->gimp->config->plug_in_path;
+
+  path = gimp_config_path_expand_to_files (path_str, NULL);
+
+  for (list = path; list; list = g_list_next (list))
+    {
+      gimp_plug_in_manager_search_directory (manager, list->data);
+    }
+
+  g_list_free_full (path, (GDestroyNotify) g_object_unref);
+}
+
+static void
+gimp_plug_in_manager_search_directory (GimpPlugInManager *manager,
+                                       GFile             *directory)
+{
+  GFileEnumerator *enumerator;
+
+  enumerator = g_file_enumerate_children (directory,
+                                          G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                          G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                          G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                          G_FILE_QUERY_INFO_NONE,
+                                          NULL, NULL);
+  if (enumerator)
+    {
+      GFileInfo *info;
+
+      while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
+        {
+          GFile *child;
+
+          if (g_file_info_get_is_hidden (info))
+            {
+              g_object_unref (info);
+              continue;
+            }
+
+          child = g_file_enumerator_get_child (enumerator, info);
+
+          if (gimp_file_is_executable (child))
+            {
+              guint64 mtime;
+
+              mtime = g_file_info_get_attribute_uint64 (info,
+                                                        G_FILE_ATTRIBUTE_TIME_MODIFIED);
+
+              gimp_plug_in_manager_add_from_file (manager, child, mtime);
+            }
+          else if (g_file_query_file_type (child,
+                                           G_FILE_QUERY_INFO_NONE,
+                                           NULL) == G_FILE_TYPE_DIRECTORY)
+            {
+              /* Search in subdirectory the first executable file with
+               * the same name as the directory (except extension).
+               * We don't search recursively, but only at a single
+               * level and assume that there can be only 1 plugin
+               * inside a directory.
+               */
+              GFileEnumerator *enumerator2;
+
+              enumerator2 = g_file_enumerate_children (child,
+                                                       G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                                       G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                                       G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                                       G_FILE_QUERY_INFO_NONE,
+                                                       NULL, NULL);
+              if (enumerator2)
+                {
+                  GFileInfo *info2;
+
+                  while ((info2 = g_file_enumerator_next_file (enumerator2, NULL, NULL)))
+                    {
+                      GFile *child2;
+                      gchar *file_name;
+                      char  *ext;
+
+                      if (g_file_info_get_is_hidden (info2))
+                        {
+                          g_object_unref (info2);
+                          continue;
+                        }
+
+                      child2 = g_file_enumerator_get_child (enumerator2, info2);
+                      file_name = g_strdup (g_file_info_get_name (info2));
+
+                      ext = strrchr (file_name, '.');
+                      if (ext)
+                        *ext = '\0';
+
+                      if (g_strcmp0 (file_name, g_file_info_get_name (info)) == 0 &&
+                          gimp_file_is_executable (child2))
+                        {
+                          guint64 mtime;
+
+                          mtime = g_file_info_get_attribute_uint64 (info2,
+                                                                    G_FILE_ATTRIBUTE_TIME_MODIFIED);
+
+                          gimp_plug_in_manager_add_from_file (manager, child2, mtime);
+
+                          g_free (file_name);
+                          g_object_unref (child2);
+                          g_object_unref (info2);
+                          break;
+                        }
+
+                      g_free (file_name);
+                      g_object_unref (child2);
+                      g_object_unref (info2);
+                    }
+
+                  g_object_unref (enumerator2);
+                }
+            }
+
+          g_object_unref (child);
+          g_object_unref (info);
+        }
+
+      g_object_unref (enumerator);
+    }
+}
+
+static GFile *
+gimp_plug_in_manager_get_pluginrc (GimpPlugInManager *manager)
+{
+  Gimp  *gimp = manager->gimp;
+  GFile *pluginrc;
+
+  if (gimp->config->plug_in_rc_path)
+    {
+      gchar *path = gimp_config_path_expand (gimp->config->plug_in_rc_path,
+                                             TRUE, NULL);
+
+      if (g_path_is_absolute (path))
+        pluginrc = g_file_new_for_path (path);
+      else
+        pluginrc = gimp_directory_file (path, NULL);
+
+      g_free (path);
+    }
+  else
+    {
+      pluginrc = gimp_directory_file ("pluginrc", NULL);
+    }
+
+  return pluginrc;
+}
+
+/* read the pluginrc file for cached data */
+static void
+gimp_plug_in_manager_read_pluginrc (GimpPlugInManager  *manager,
+                                    GFile              *pluginrc,
+                                    GimpInitStatusFunc  status_callback)
+{
+  GSList *rc_defs;
+  GError *error = NULL;
+
+  status_callback (_("Resource configuration"),
+                   gimp_file_get_utf8_name (pluginrc), 0.0);
+
+  if (manager->gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (pluginrc));
+
+  rc_defs = plug_in_rc_parse (manager->gimp, pluginrc, &error);
+
+  if (rc_defs)
+    {
+      GSList *list;
+
+      for (list = rc_defs; list; list = g_slist_next (list))
+        gimp_plug_in_manager_add_from_rc (manager, list->data); /* consumes list->data */
+
+      g_slist_free (rc_defs);
+    }
+  else if (error)
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                              error->message);
+
+      g_clear_error (&error);
+    }
+}
+
+/* query any plug-ins that changed since we last wrote out pluginrc */
+static void
+gimp_plug_in_manager_query_new (GimpPlugInManager  *manager,
+                                GimpContext        *context,
+                                GimpInitStatusFunc  status_callback)
+{
+  GSList *list;
+  gint    n_plugins;
+
+  status_callback (_("Querying new Plug-ins"), "", 0.0);
+
+  for (list = manager->plug_in_defs, n_plugins = 0; list; list = list->next)
+    {
+      GimpPlugInDef *plug_in_def = list->data;
+
+      if (plug_in_def->needs_query)
+        n_plugins++;
+    }
+
+  if (n_plugins)
+    {
+      gint nth;
+
+      manager->write_pluginrc = TRUE;
+
+      for (list = manager->plug_in_defs, nth = 0; list; list = list->next)
+        {
+          GimpPlugInDef *plug_in_def = list->data;
+
+          if (plug_in_def->needs_query)
+            {
+              gchar *basename;
+
+              basename =
+                g_path_get_basename (gimp_file_get_utf8_name (plug_in_def->file));
+              status_callback (NULL, basename,
+                               (gdouble) nth++ / (gdouble) n_plugins);
+              g_free (basename);
+
+              if (manager->gimp->be_verbose)
+                g_print ("Querying plug-in: '%s'\n",
+                         gimp_file_get_utf8_name (plug_in_def->file));
+
+              gimp_plug_in_manager_call_query (manager, context, plug_in_def);
+            }
+        }
+    }
+
+  status_callback (NULL, "", 1.0);
+}
+
+/* initialize the plug-ins */
+static void
+gimp_plug_in_manager_init_plug_ins (GimpPlugInManager  *manager,
+                                    GimpContext        *context,
+                                    GimpInitStatusFunc  status_callback)
+{
+  GSList *list;
+  gint    n_plugins;
+
+  status_callback (_("Initializing Plug-ins"), "", 0.0);
+
+  for (list = manager->plug_in_defs, n_plugins = 0; list; list = list->next)
+    {
+      GimpPlugInDef *plug_in_def = list->data;
+
+      if (plug_in_def->has_init)
+        n_plugins++;
+    }
+
+  if (n_plugins)
+    {
+      gint nth;
+
+      for (list = manager->plug_in_defs, nth = 0; list; list = list->next)
+        {
+          GimpPlugInDef *plug_in_def = list->data;
+
+          if (plug_in_def->has_init)
+            {
+              gchar *basename;
+
+              basename =
+                g_path_get_basename (gimp_file_get_utf8_name (plug_in_def->file));
+              status_callback (NULL, basename,
+                               (gdouble) nth++ / (gdouble) n_plugins);
+              g_free (basename);
+
+              if (manager->gimp->be_verbose)
+                g_print ("Initializing plug-in: '%s'\n",
+                         gimp_file_get_utf8_name (plug_in_def->file));
+
+              gimp_plug_in_manager_call_init (manager, context, plug_in_def);
+            }
+        }
+    }
+
+  status_callback (NULL, "", 1.0);
+}
+
+/* run automatically started extensions */
+static void
+gimp_plug_in_manager_run_extensions (GimpPlugInManager  *manager,
+                                     GimpContext        *context,
+                                     GimpInitStatusFunc  status_callback)
+{
+  Gimp   *gimp = manager->gimp;
+  GSList *list;
+  GList  *extensions = NULL;
+  gint    n_extensions;
+
+  /* build list of automatically started extensions */
+  for (list = manager->plug_in_procedures; list; list = list->next)
+    {
+      GimpPlugInProcedure *proc = list->data;
+
+      if (proc->file                                         &&
+          GIMP_PROCEDURE (proc)->proc_type == GIMP_EXTENSION &&
+          GIMP_PROCEDURE (proc)->num_args  == 0)
+        {
+          extensions = g_list_prepend (extensions, proc);
+        }
+    }
+
+  extensions   = g_list_reverse (extensions);
+  n_extensions = g_list_length (extensions);
+
+  /* run the available extensions */
+  if (extensions)
+    {
+      GList *list;
+      gint   nth;
+
+      status_callback (_("Starting Extensions"), "", 0.0);
+
+      for (list = extensions, nth = 0; list; list = g_list_next (list), nth++)
+        {
+          GimpPlugInProcedure *proc = list->data;
+          GimpValueArray      *args;
+          GError              *error = NULL;
+
+          if (gimp->be_verbose)
+            g_print ("Starting extension: '%s'\n", gimp_object_get_name (proc));
+
+          status_callback (NULL, gimp_object_get_name (proc),
+                           (gdouble) nth / (gdouble) n_extensions);
+
+          args = gimp_value_array_new (0);
+
+          gimp_procedure_execute_async (GIMP_PROCEDURE (proc),
+                                        gimp, context, NULL,
+                                        args, NULL, &error);
+
+          gimp_value_array_unref (args);
+
+          if (error)
+            {
+              gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+                                    error->message);
+              g_clear_error (&error);
+            }
+        }
+
+      g_list_free (extensions);
+
+      status_callback (NULL, "", 1.0);
+    }
+}
+
+static void
+gimp_plug_in_manager_bind_text_domains (GimpPlugInManager *manager)
+{
+  gchar **locale_domains;
+  gchar **locale_paths;
+  gint    n_domains;
+  gint    i;
+
+  n_domains = gimp_plug_in_manager_get_locale_domains (manager,
+                                                       &locale_domains,
+                                                       &locale_paths);
+
+  for (i = 0; i < n_domains; i++)
+    {
+      bindtextdomain (locale_domains[i], locale_paths[i]);
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+      bind_textdomain_codeset (locale_domains[i], "UTF-8");
+#endif
+    }
+
+  g_strfreev (locale_domains);
+  g_strfreev (locale_paths);
+}
+
+/**
+ * gimp_plug_in_manager_ignore_plugin_basename:
+ * @basename: Basename to test with
+ *
+ * Checks the environment variable
+ * GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES for file basenames.
+ *
+ * Returns: %TRUE if @basename was in GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES
+ **/
+static gboolean
+gimp_plug_in_manager_ignore_plugin_basename (const gchar *plugin_basename)
+{
+  const gchar *ignore_basenames_string;
+  GList       *ignore_basenames;
+  GList       *iter;
+  gboolean     ignore = FALSE;
+
+  ignore_basenames_string = g_getenv ("GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES");
+  ignore_basenames        = gimp_path_parse (ignore_basenames_string,
+                                             256 /*max_paths*/,
+                                             FALSE /*check*/,
+                                             NULL /*check_failed*/);
+
+  for (iter = ignore_basenames; iter; iter = g_list_next (iter))
+    {
+      const gchar *ignore_basename = iter->data;
+
+      if (g_ascii_strcasecmp (ignore_basename, plugin_basename) == 0)
+        {
+          ignore = TRUE;
+          break;
+        }
+    }
+
+  gimp_path_free (ignore_basenames);
+
+  return ignore;
+}
+
+static void
+gimp_plug_in_manager_add_from_file (GimpPlugInManager *manager,
+                                    GFile             *file,
+                                    guint64            mtime)
+{
+  GimpPlugInDef *plug_in_def;
+  GSList        *list;
+  gchar         *filename;
+  gchar         *basename;
+
+  filename = g_file_get_path (file);
+  basename = g_path_get_basename (filename);
+  g_free (filename);
+
+  /* When we scan build dirs for plug-ins, there will be some
+   * executable files that are not plug-ins that we want to ignore,
+   * for example plug-ins/common/mkgen.pl if
+   * GIMP_TESTING_PLUGINDIRS=plug-ins/common
+   */
+  if (gimp_plug_in_manager_ignore_plugin_basename (basename))
+    {
+      g_free (basename);
+      return;
+    }
+
+  for (list = manager->plug_in_defs; list; list = list->next)
+    {
+      gchar *path;
+      gchar *plug_in_name;
+
+      plug_in_def = list->data;
+
+      path = g_file_get_path (plug_in_def->file);
+      plug_in_name = g_path_get_basename (path);
+      g_free (path);
+
+      if (g_ascii_strcasecmp (basename, plug_in_name) == 0)
+        {
+          g_printerr ("Skipping duplicate plug-in: '%s'\n",
+                      gimp_file_get_utf8_name (file));
+
+          g_free (plug_in_name);
+          g_free (basename);
+
+          return;
+        }
+
+      g_free (plug_in_name);
+    }
+
+  g_free (basename);
+
+  plug_in_def = gimp_plug_in_def_new (file);
+
+  gimp_plug_in_def_set_mtime (plug_in_def, mtime);
+  gimp_plug_in_def_set_needs_query (plug_in_def, TRUE);
+
+  manager->plug_in_defs = g_slist_prepend (manager->plug_in_defs, plug_in_def);
+}
+
+static void
+gimp_plug_in_manager_add_from_rc (GimpPlugInManager *manager,
+                                  GimpPlugInDef     *plug_in_def)
+{
+  GSList *list;
+  gchar  *path1;
+  gchar  *basename1;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (plug_in_def != NULL);
+  g_return_if_fail (plug_in_def->file != NULL);
+
+  path1 = g_file_get_path (plug_in_def->file);
+
+  if (! g_path_is_absolute (path1))
+    {
+      g_warning ("plug_ins_def_add_from_rc: filename not absolute (skipping)");
+      g_object_unref (plug_in_def);
+      g_free (path1);
+      return;
+    }
+
+  basename1 = g_path_get_basename (path1);
+
+  /*  If this is a file load or save plugin, make sure we have
+   *  something for one of the extensions, prefixes, or magic number.
+   *  Other bits of code rely on detecting file plugins by the
+   *  presence of one of these things, but the raw plug-in needs to be
+   *  able to register no extensions, prefixes or magics.
+   */
+  for (list = plug_in_def->procedures; list; list = list->next)
+    {
+      GimpPlugInProcedure *proc = list->data;
+
+      if (! proc->extensions &&
+          ! proc->prefixes   &&
+          ! proc->magics     &&
+          proc->menu_paths   &&
+          (g_str_has_prefix (proc->menu_paths->data, "<Load>") ||
+           g_str_has_prefix (proc->menu_paths->data, "<Save>")))
+        {
+          proc->extensions = g_strdup ("");
+        }
+    }
+
+  /*  Check if the entry mentioned in pluginrc matches an executable
+   *  found in the plug_in_path.
+   */
+  for (list = manager->plug_in_defs; list; list = list->next)
+    {
+      GimpPlugInDef *ondisk_plug_in_def = list->data;
+      gchar         *path2;
+      gchar         *basename2;
+
+      path2 = g_file_get_path (ondisk_plug_in_def->file);
+
+      basename2 = g_path_get_basename (path2);
+
+      g_free (path2);
+
+      if (! strcmp (basename1, basename2))
+        {
+          if (g_file_equal (plug_in_def->file,
+                            ondisk_plug_in_def->file) &&
+              (plug_in_def->mtime == ondisk_plug_in_def->mtime))
+            {
+              /* Use pluginrc entry, deleting on-disk entry */
+              list->data = plug_in_def;
+              g_object_unref (ondisk_plug_in_def);
+            }
+          else
+            {
+              /* Use on-disk entry, deleting pluginrc entry */
+              g_object_unref (plug_in_def);
+            }
+
+          g_free (basename2);
+          g_free (basename1);
+          g_free (path1);
+
+          return;
+        }
+
+      g_free (basename2);
+    }
+
+  g_free (basename1);
+  g_free (path1);
+
+  manager->write_pluginrc = TRUE;
+
+  if (manager->gimp->be_verbose)
+    {
+      g_printerr ("pluginrc lists '%s', but it wasn't found\n",
+                  gimp_file_get_utf8_name (plug_in_def->file));
+    }
+
+  g_object_unref (plug_in_def);
+}
+
+
+static void
+gimp_plug_in_manager_add_to_db (GimpPlugInManager   *manager,
+                                GimpContext         *context,
+                                GimpPlugInProcedure *proc)
+{
+  gimp_pdb_register_procedure (manager->gimp->pdb, GIMP_PROCEDURE (proc));
+
+  if (proc->file_proc)
+    {
+      GimpValueArray *return_vals;
+      GError         *error = NULL;
+
+      if (proc->image_types)
+        {
+          return_vals =
+            gimp_pdb_execute_procedure_by_name (manager->gimp->pdb,
+                                                context, NULL, &error,
+                                                "gimp-register-save-handler",
+                                                G_TYPE_STRING, gimp_object_get_name (proc),
+                                                G_TYPE_STRING, proc->extensions,
+                                                G_TYPE_STRING, proc->prefixes,
+                                                G_TYPE_NONE);
+        }
+      else
+        {
+          return_vals =
+            gimp_pdb_execute_procedure_by_name (manager->gimp->pdb,
+                                                context, NULL, &error,
+                                                "gimp-register-magic-load-handler",
+                                                G_TYPE_STRING, gimp_object_get_name (proc),
+                                                G_TYPE_STRING, proc->extensions,
+                                                G_TYPE_STRING, proc->prefixes,
+                                                G_TYPE_STRING, proc->magics,
+                                                G_TYPE_NONE);
+        }
+
+      gimp_value_array_unref (return_vals);
+
+      if (error)
+        {
+          gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                                error->message);
+          g_error_free (error);
+        }
+    }
+}
+
+static void
+gimp_plug_in_manager_sort_file_procs (GimpPlugInManager *manager)
+{
+  GimpCoreConfig *config         = manager->gimp->config;
+  GFile          *config_plug_in = NULL;
+  GFile          *raw_plug_in    = NULL;
+  GSList         *list;
+
+  manager->load_procs =
+    g_slist_sort_with_data (manager->load_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (FALSE));
+  manager->save_procs =
+    g_slist_sort_with_data (manager->save_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (FALSE));
+  manager->export_procs =
+    g_slist_sort_with_data (manager->export_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (FALSE));
+
+  g_clear_pointer (&manager->display_load_procs,   g_slist_free);
+  g_clear_pointer (&manager->display_save_procs,   g_slist_free);
+  g_clear_pointer (&manager->display_export_procs, g_slist_free);
+
+  manager->display_load_procs   = g_slist_copy (manager->load_procs);
+  manager->display_save_procs   = g_slist_copy (manager->save_procs);
+  manager->display_export_procs = g_slist_copy (manager->export_procs);
+
+  manager->display_load_procs =
+    g_slist_sort_with_data (manager->display_load_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (TRUE));
+  manager->display_save_procs =
+    g_slist_sort_with_data (manager->display_save_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (TRUE));
+  manager->display_export_procs =
+    g_slist_sort_with_data (manager->display_export_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (TRUE));
+
+  g_clear_pointer (&manager->raw_load_procs,         g_slist_free);
+  g_clear_pointer (&manager->display_raw_load_procs, g_slist_free);
+
+  if (config->import_raw_plug_in)
+    {
+      /* remember the configured raw loader, unless it's the placeholder */
+      if (! strstr (config->import_raw_plug_in, "file-raw-placeholder"))
+        config_plug_in =
+          gimp_file_new_for_config_path (config->import_raw_plug_in,
+                                         NULL);
+    }
+
+  /* make the list of raw loaders, and remember the one configured in
+   * config if found
+   */
+  for (list = manager->load_procs; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *file_proc = list->data;
+
+      if (file_proc->handles_raw)
+        {
+          GFile *file;
+
+          manager->raw_load_procs = g_slist_prepend (manager->raw_load_procs,
+                                                     file_proc);
+
+          file = gimp_plug_in_procedure_get_file (file_proc);
+
+          if (! raw_plug_in  &&
+              config_plug_in &&
+              g_file_equal (config_plug_in, file))
+            {
+              raw_plug_in = file;
+            }
+        }
+    }
+
+  manager->raw_load_procs         = g_slist_reverse (manager->raw_load_procs);
+  manager->display_raw_load_procs = g_slist_copy (manager->raw_load_procs);
+  manager->display_raw_load_procs =
+    g_slist_sort_with_data (manager->display_raw_load_procs,
+                            gimp_plug_in_manager_file_proc_compare,
+                            GINT_TO_POINTER (TRUE));
+
+  if (config_plug_in)
+    g_object_unref (config_plug_in);
+
+  /* if no raw loader was configured, or the configured raw loader
+   * wasn't found, default to the first loader that is not the
+   * placeholder, if any
+   */
+  if (! raw_plug_in && manager->raw_load_procs)
+    {
+      gchar *path;
+
+      for (list = manager->raw_load_procs; list; list = g_slist_next (list))
+        {
+          GimpPlugInProcedure *file_proc = list->data;
+
+          raw_plug_in = gimp_plug_in_procedure_get_file (file_proc);
+
+          path = gimp_file_get_config_path (raw_plug_in, NULL);
+
+          if (! strstr (path, "file-raw-placeholder"))
+            break;
+
+          g_free (path);
+          path = NULL;
+
+          raw_plug_in = NULL;
+        }
+
+      if (! raw_plug_in)
+        {
+          raw_plug_in =
+            gimp_plug_in_procedure_get_file (manager->raw_load_procs->data);
+
+          path = gimp_file_get_config_path (raw_plug_in, NULL);
+        }
+
+      g_object_set (config,
+                    "import-raw-plug-in", path,
+                    NULL);
+
+      g_free (path);
+    }
+
+  /* finally, remove all raw loaders except the configured one from
+   * the list of load_procs
+   */
+  list = manager->load_procs;
+  while (list)
+    {
+      GimpPlugInProcedure *file_proc = list->data;
+
+      list = g_slist_next (list);
+
+      if (file_proc->handles_raw &&
+          ! g_file_equal (gimp_plug_in_procedure_get_file (file_proc),
+                          raw_plug_in))
+        {
+          manager->load_procs =
+            g_slist_remove (manager->load_procs, file_proc);
+          manager->display_load_procs =
+            g_slist_remove (manager->display_load_procs, file_proc);
+        }
+    }
+}
+
+static gint
+gimp_plug_in_manager_file_proc_compare (gconstpointer a,
+                                        gconstpointer b,
+                                        gpointer      data)
+{
+  GimpPlugInProcedure *proc_a  = GIMP_PLUG_IN_PROCEDURE (a);
+  GimpPlugInProcedure *proc_b  = GIMP_PLUG_IN_PROCEDURE (b);
+  gboolean             display = GPOINTER_TO_INT (data);
+  const gchar         *label_a;
+  const gchar         *label_b;
+
+  if (g_str_has_prefix (gimp_file_get_utf8_name (proc_a->file),
+                                                 "gimp-xcf"))
+    {
+      if (! g_str_has_prefix (gimp_file_get_utf8_name (proc_b->file),
+                              "gimp-xcf"))
+        {
+          return -1;
+        }
+    }
+  else if (g_str_has_prefix (gimp_file_get_utf8_name (proc_b->file),
+                             "gimp-xcf"))
+    {
+      return 1;
+    }
+
+  if (! display && proc_a->priority != proc_b->priority)
+    return proc_a->priority - proc_b->priority;
+
+  label_a = gimp_procedure_get_label (GIMP_PROCEDURE (proc_a));
+  label_b = gimp_procedure_get_label (GIMP_PROCEDURE (proc_b));
+
+  if (label_a)
+    {
+      if (label_b)
+        {
+          gint comp = g_utf8_collate (label_a, label_b);
+
+          if (comp)
+            return comp;
+        }
+      else
+        {
+          return -1;
+        }
+    }
+  else if (label_b)
+    {
+      return 1;
+    }
+
+  return strcmp (gimp_object_get_name (proc_a), gimp_object_get_name (proc_b));
+}
diff --git a/app/plug-in/gimppluginmanager-restore.h b/app/plug-in/gimppluginmanager-restore.h
new file mode 100644
index 0000000..0389dcf
--- /dev/null
+++ b/app/plug-in/gimppluginmanager-restore.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager-restore.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_RESTORE_H__
+#define __GIMP_PLUG_IN_MANAGER_RESTORE_H__
+
+
+void    gimp_plug_in_manager_restore (GimpPlugInManager  *manager,
+                                      GimpContext        *context,
+                                      GimpInitStatusFunc  status_callback);
+
+
+#endif  /* __GIMP_PLUG_IN_MANAGER_RESTORE_H__ */
diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c
new file mode 100644
index 0000000..659dd28
--- /dev/null
+++ b/app/plug-in/gimppluginmanager.c
@@ -0,0 +1,426 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * gimppluginmanager.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "plug-in-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-filter-history.h"
+#include "core/gimp-memsize.h"
+#include "core/gimpmarshal.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpenvirontable.h"
+#include "gimpinterpreterdb.h"
+#include "gimpplugin.h"
+#include "gimpplugindebug.h"
+#include "gimpplugindef.h"
+#include "gimppluginmanager.h"
+#include "gimppluginmanager-data.h"
+#include "gimppluginmanager-help-domain.h"
+#include "gimppluginmanager-locale-domain.h"
+#include "gimppluginmanager-menu-branch.h"
+#include "gimppluginshm.h"
+#include "gimptemporaryprocedure.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PLUG_IN_OPENED,
+  PLUG_IN_CLOSED,
+  MENU_BRANCH_ADDED,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_plug_in_manager_finalize    (GObject    *object);
+
+static gint64   gimp_plug_in_manager_get_memsize (GimpObject *object,
+                                                  gint64     *gui_size);
+
+
+G_DEFINE_TYPE (GimpPlugInManager, gimp_plug_in_manager, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_plug_in_manager_parent_class
+
+static guint manager_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_plug_in_manager_class_init (GimpPlugInManagerClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  manager_signals[PLUG_IN_OPENED] =
+    g_signal_new ("plug-in-opened",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpPlugInManagerClass,
+                                   plug_in_opened),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PLUG_IN);
+
+  manager_signals[PLUG_IN_CLOSED] =
+    g_signal_new ("plug-in-closed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpPlugInManagerClass,
+                                   plug_in_closed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_PLUG_IN);
+
+  manager_signals[MENU_BRANCH_ADDED] =
+    g_signal_new ("menu-branch-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpPlugInManagerClass,
+                                   menu_branch_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_STRING_STRING,
+                  G_TYPE_NONE, 3,
+                  G_TYPE_FILE,
+                  G_TYPE_STRING,
+                  G_TYPE_STRING);
+
+  object_class->finalize         = gimp_plug_in_manager_finalize;
+
+  gimp_object_class->get_memsize = gimp_plug_in_manager_get_memsize;
+}
+
+static void
+gimp_plug_in_manager_init (GimpPlugInManager *manager)
+{
+}
+
+static void
+gimp_plug_in_manager_finalize (GObject *object)
+{
+  GimpPlugInManager *manager = GIMP_PLUG_IN_MANAGER (object);
+
+  g_clear_pointer (&manager->load_procs,     g_slist_free);
+  g_clear_pointer (&manager->save_procs,     g_slist_free);
+  g_clear_pointer (&manager->export_procs,   g_slist_free);
+  g_clear_pointer (&manager->raw_load_procs, g_slist_free);
+
+  g_clear_pointer (&manager->display_load_procs,     g_slist_free);
+  g_clear_pointer (&manager->display_save_procs,     g_slist_free);
+  g_clear_pointer (&manager->display_export_procs,   g_slist_free);
+  g_clear_pointer (&manager->display_raw_load_procs, g_slist_free);
+
+  if (manager->plug_in_procedures)
+    {
+      g_slist_free_full (manager->plug_in_procedures,
+                         (GDestroyNotify) g_object_unref);
+      manager->plug_in_procedures = NULL;
+    }
+
+  if (manager->plug_in_defs)
+    {
+      g_slist_free_full (manager->plug_in_defs,
+                         (GDestroyNotify) g_object_unref);
+      manager->plug_in_defs = NULL;
+    }
+
+  g_clear_object (&manager->environ_table);
+  g_clear_object (&manager->interpreter_db);
+
+  g_clear_pointer (&manager->debug, gimp_plug_in_debug_free);
+
+  gimp_plug_in_manager_menu_branch_exit (manager);
+  gimp_plug_in_manager_locale_domain_exit (manager);
+  gimp_plug_in_manager_help_domain_exit (manager);
+  gimp_plug_in_manager_data_free (manager);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_plug_in_manager_get_memsize (GimpObject *object,
+                                  gint64     *gui_size)
+{
+  GimpPlugInManager *manager = GIMP_PLUG_IN_MANAGER (object);
+  gint64             memsize = 0;
+
+  memsize += gimp_g_slist_get_memsize_foreach (manager->plug_in_defs,
+                                               (GimpMemsizeFunc)
+                                               gimp_object_get_memsize,
+                                               gui_size);
+
+  memsize += gimp_g_slist_get_memsize (manager->plug_in_procedures, 0);
+  memsize += gimp_g_slist_get_memsize (manager->load_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->save_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->export_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->raw_load_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->display_load_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->display_save_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->display_export_procs, 0);
+  memsize += gimp_g_slist_get_memsize (manager->display_raw_load_procs, 0);
+
+  memsize += gimp_g_slist_get_memsize (manager->menu_branches,  0 /* FIXME */);
+  memsize += gimp_g_slist_get_memsize (manager->locale_domains, 0 /* FIXME */);
+  memsize += gimp_g_slist_get_memsize (manager->help_domains,   0 /* FIXME */);
+
+  memsize += gimp_g_slist_get_memsize_foreach (manager->open_plug_ins,
+                                               (GimpMemsizeFunc)
+                                               gimp_object_get_memsize,
+                                               gui_size);
+  memsize += gimp_g_slist_get_memsize (manager->plug_in_stack, 0);
+
+  memsize += 0; /* FIXME manager->shm */
+  memsize += /* FIXME */ gimp_g_object_get_memsize (G_OBJECT (manager->interpreter_db));
+  memsize += /* FIXME */ gimp_g_object_get_memsize (G_OBJECT (manager->environ_table));
+  memsize += 0; /* FIXME manager->plug_in_debug */
+  memsize += gimp_g_list_get_memsize (manager->data_list, 0 /* FIXME */);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+GimpPlugInManager *
+gimp_plug_in_manager_new (Gimp *gimp)
+{
+  GimpPlugInManager *manager;
+
+  manager = g_object_new (GIMP_TYPE_PLUG_IN_MANAGER, NULL);
+
+  manager->gimp           = gimp;
+  manager->interpreter_db = gimp_interpreter_db_new (gimp->be_verbose);
+  manager->environ_table  = gimp_environ_table_new (gimp->be_verbose);
+
+  return manager;
+}
+
+void
+gimp_plug_in_manager_initialize (GimpPlugInManager  *manager,
+                                 GimpInitStatusFunc  status_callback)
+{
+  GimpCoreConfig *config;
+  GList          *path;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (status_callback != NULL);
+
+  config = manager->gimp->config;
+
+  status_callback (NULL, _("Plug-in Interpreters"), 0.8);
+
+  path = gimp_config_path_expand_to_files (config->interpreter_path, NULL);
+  gimp_interpreter_db_load (manager->interpreter_db, path);
+  g_list_free_full (path, (GDestroyNotify) g_object_unref);
+
+  status_callback (NULL, _("Plug-in Environment"), 0.9);
+
+  path = gimp_config_path_expand_to_files (config->environ_path, NULL);
+  gimp_environ_table_load (manager->environ_table, path);
+  g_list_free_full (path, (GDestroyNotify) g_object_unref);
+
+  /*  allocate a piece of shared memory for use in transporting tiles
+   *  to plug-ins. if we can't allocate a piece of shared memory then
+   *  we'll fall back on sending the data over the pipe.
+   */
+  if (manager->gimp->use_shm)
+    manager->shm = gimp_plug_in_shm_new ();
+
+  manager->debug = gimp_plug_in_debug_new ();
+}
+
+void
+gimp_plug_in_manager_exit (GimpPlugInManager *manager)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+
+  while (manager->open_plug_ins)
+    gimp_plug_in_close (manager->open_plug_ins->data, TRUE);
+
+  /*  need to detach from shared memory, we can't rely on exit()
+   *  cleaning up behind us (see bug #609026)
+   */
+  if (manager->shm)
+    {
+      gimp_plug_in_shm_free (manager->shm);
+      manager->shm = NULL;
+    }
+}
+
+void
+gimp_plug_in_manager_add_procedure (GimpPlugInManager   *manager,
+                                    GimpPlugInProcedure *procedure)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (procedure));
+
+  for (list = manager->plug_in_procedures; list; list = list->next)
+    {
+      GimpPlugInProcedure *tmp_proc = list->data;
+
+      if (strcmp (gimp_object_get_name (procedure),
+                  gimp_object_get_name (tmp_proc)) == 0)
+        {
+          GSList *list2;
+
+          list->data = g_object_ref (procedure);
+
+          g_printerr ("Removing duplicate PDB procedure '%s' "
+                      "registered by '%s'\n",
+                      gimp_object_get_name (tmp_proc),
+                      gimp_file_get_utf8_name (tmp_proc->file));
+
+          /* search the plugin list to see if any plugins had references to
+           * the tmp_proc.
+           */
+          for (list2 = manager->plug_in_defs; list2; list2 = list2->next)
+            {
+              GimpPlugInDef *plug_in_def = list2->data;
+
+              if (g_slist_find (plug_in_def->procedures, tmp_proc))
+                gimp_plug_in_def_remove_procedure (plug_in_def, tmp_proc);
+            }
+
+          /* also remove it from the lists of load, save and export procs */
+          manager->load_procs             = g_slist_remove (manager->load_procs,             tmp_proc);
+          manager->save_procs             = g_slist_remove (manager->save_procs,             tmp_proc);
+          manager->export_procs           = g_slist_remove (manager->export_procs,           tmp_proc);
+          manager->raw_load_procs         = g_slist_remove (manager->raw_load_procs,         tmp_proc);
+          manager->display_load_procs     = g_slist_remove (manager->display_load_procs,     tmp_proc);
+          manager->display_save_procs     = g_slist_remove (manager->display_save_procs,     tmp_proc);
+          manager->display_export_procs   = g_slist_remove (manager->display_export_procs,   tmp_proc);
+          manager->display_raw_load_procs = g_slist_remove (manager->display_raw_load_procs, tmp_proc);
+
+          /* and from the history */
+          gimp_filter_history_remove (manager->gimp, GIMP_PROCEDURE (tmp_proc));
+
+          g_object_unref (tmp_proc);
+
+          return;
+        }
+    }
+
+  manager->plug_in_procedures = g_slist_prepend (manager->plug_in_procedures,
+                                                 g_object_ref (procedure));
+}
+
+void
+gimp_plug_in_manager_add_temp_proc (GimpPlugInManager      *manager,
+                                    GimpTemporaryProcedure *procedure)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_TEMPORARY_PROCEDURE (procedure));
+
+  gimp_pdb_register_procedure (manager->gimp->pdb, GIMP_PROCEDURE (procedure));
+
+  manager->plug_in_procedures = g_slist_prepend (manager->plug_in_procedures,
+                                                 g_object_ref (procedure));
+}
+
+void
+gimp_plug_in_manager_remove_temp_proc (GimpPlugInManager      *manager,
+                                       GimpTemporaryProcedure *procedure)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_TEMPORARY_PROCEDURE (procedure));
+
+  manager->plug_in_procedures = g_slist_remove (manager->plug_in_procedures,
+                                                procedure);
+
+  gimp_filter_history_remove (manager->gimp,
+                              GIMP_PROCEDURE (procedure));
+
+  gimp_pdb_unregister_procedure (manager->gimp->pdb,
+                                 GIMP_PROCEDURE (procedure));
+
+  g_object_unref (procedure);
+}
+
+void
+gimp_plug_in_manager_add_open_plug_in (GimpPlugInManager *manager,
+                                       GimpPlugIn        *plug_in)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  manager->open_plug_ins = g_slist_prepend (manager->open_plug_ins,
+                                            g_object_ref (plug_in));
+
+  g_signal_emit (manager, manager_signals[PLUG_IN_OPENED], 0,
+                 plug_in);
+}
+
+void
+gimp_plug_in_manager_remove_open_plug_in (GimpPlugInManager *manager,
+                                          GimpPlugIn        *plug_in)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  manager->open_plug_ins = g_slist_remove (manager->open_plug_ins, plug_in);
+
+  g_signal_emit (manager, manager_signals[PLUG_IN_CLOSED], 0,
+                 plug_in);
+
+  g_object_unref (plug_in);
+}
+
+void
+gimp_plug_in_manager_plug_in_push (GimpPlugInManager *manager,
+                                   GimpPlugIn        *plug_in)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  manager->current_plug_in = plug_in;
+
+  manager->plug_in_stack = g_slist_prepend (manager->plug_in_stack,
+                                            manager->current_plug_in);
+}
+
+void
+gimp_plug_in_manager_plug_in_pop (GimpPlugInManager *manager)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager));
+
+  if (manager->current_plug_in)
+    manager->plug_in_stack = g_slist_remove (manager->plug_in_stack,
+                                             manager->plug_in_stack->data);
+
+  if (manager->plug_in_stack)
+    manager->current_plug_in = manager->plug_in_stack->data;
+  else
+    manager->current_plug_in = NULL;
+}
diff --git a/app/plug-in/gimppluginmanager.h b/app/plug-in/gimppluginmanager.h
new file mode 100644
index 0000000..11f80b1
--- /dev/null
+++ b/app/plug-in/gimppluginmanager.h
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginmanager.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_MANAGER_H__
+#define __GIMP_PLUG_IN_MANAGER_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_PLUG_IN_MANAGER            (gimp_plug_in_manager_get_type ())
+#define GIMP_PLUG_IN_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUG_IN_MANAGER, GimpPlugInManager))
+#define GIMP_PLUG_IN_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUG_IN_MANAGER, GimpPlugInManagerClass))
+#define GIMP_IS_PLUG_IN_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUG_IN_MANAGER))
+#define GIMP_IS_PLUG_IN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUG_IN_MANAGER))
+
+
+typedef struct _GimpPlugInManagerClass GimpPlugInManagerClass;
+
+struct _GimpPlugInManager
+{
+  GimpObject         parent_instance;
+
+  Gimp              *gimp;
+
+  GSList            *plug_in_defs;
+  gboolean           write_pluginrc;
+
+  GSList            *plug_in_procedures;
+
+  GSList            *load_procs;
+  GSList            *save_procs;
+  GSList            *export_procs;
+  GSList            *raw_load_procs;
+
+  GSList            *display_load_procs;
+  GSList            *display_save_procs;
+  GSList            *display_export_procs;
+  GSList            *display_raw_load_procs;
+
+  GSList            *menu_branches;
+  GSList            *locale_domains;
+  GSList            *help_domains;
+
+  GimpPlugIn        *current_plug_in;
+  GSList            *open_plug_ins;
+  GSList            *plug_in_stack;
+
+  GimpPlugInShm     *shm;
+  GimpInterpreterDB *interpreter_db;
+  GimpEnvironTable  *environ_table;
+  GimpPlugInDebug   *debug;
+  GList             *data_list;
+};
+
+struct _GimpPlugInManagerClass
+{
+  GimpObjectClass  parent_class;
+
+  void (* plug_in_opened)    (GimpPlugInManager *manager,
+                              GimpPlugIn        *plug_in);
+  void (* plug_in_closed)    (GimpPlugInManager *manager,
+                              GimpPlugIn        *plug_in);
+
+  void (* menu_branch_added) (GimpPlugInManager *manager,
+                              GFile             *file,
+                              const gchar       *menu_path,
+                              const gchar       *menu_label);
+};
+
+
+GType               gimp_plug_in_manager_get_type (void) G_GNUC_CONST;
+
+GimpPlugInManager * gimp_plug_in_manager_new      (Gimp                *gimp);
+
+void    gimp_plug_in_manager_initialize           (GimpPlugInManager   *manager,
+                                                   GimpInitStatusFunc   status_callback);
+void    gimp_plug_in_manager_exit                 (GimpPlugInManager   *manager);
+
+/* Register a plug-in. This function is public for file load-save
+ * handlers, which are organized around the plug-in data structure.
+ * This could all be done a little better, but oh well.  -josh
+ */
+void    gimp_plug_in_manager_add_procedure        (GimpPlugInManager   *manager,
+                                                   GimpPlugInProcedure *procedure);
+
+void    gimp_plug_in_manager_add_temp_proc        (GimpPlugInManager      *manager,
+                                                   GimpTemporaryProcedure *procedure);
+void    gimp_plug_in_manager_remove_temp_proc     (GimpPlugInManager      *manager,
+                                                   GimpTemporaryProcedure *procedure);
+
+void    gimp_plug_in_manager_add_open_plug_in     (GimpPlugInManager   *manager,
+                                                   GimpPlugIn          *plug_in);
+void    gimp_plug_in_manager_remove_open_plug_in  (GimpPlugInManager   *manager,
+                                                   GimpPlugIn          *plug_in);
+
+void    gimp_plug_in_manager_plug_in_push         (GimpPlugInManager   *manager,
+                                                   GimpPlugIn          *plug_in);
+void    gimp_plug_in_manager_plug_in_pop          (GimpPlugInManager   *manager);
+
+
+#endif  /* __GIMP_PLUG_IN_MANAGER_H__ */
diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c
new file mode 100644
index 0000000..db7d240
--- /dev/null
+++ b/app/plug-in/gimppluginprocedure.c
@@ -0,0 +1,1293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginprocedure.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "gegl/gimp-babl-compat.h"
+
+#include "core/gimp.h"
+#include "core/gimp-memsize.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpparamspecs.h"
+
+#include "file/file-utils.h"
+
+#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
+#include "gimppluginmanager-call.h"
+
+#include "gimppluginerror.h"
+#include "gimppluginprocedure.h"
+#include "plug-in-menu-path.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  MENU_PATH_ADDED,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_plug_in_procedure_finalize        (GObject        *object);
+
+static gint64   gimp_plug_in_procedure_get_memsize     (GimpObject     *object,
+                                                        gint64         *gui_size);
+
+static gchar  * gimp_plug_in_procedure_get_description (GimpViewable   *viewable,
+                                                        gchar         **tooltip);
+
+static const gchar * gimp_plug_in_procedure_get_label  (GimpProcedure  *procedure);
+static const gchar * gimp_plug_in_procedure_get_menu_label
+                                                       (GimpProcedure  *procedure);
+static const gchar * gimp_plug_in_procedure_get_blurb  (GimpProcedure  *procedure);
+static const gchar * gimp_plug_in_procedure_get_help_id(GimpProcedure  *procedure);
+static gboolean   gimp_plug_in_procedure_get_sensitive (GimpProcedure  *procedure,
+                                                        GimpObject     *object,
+                                                        const gchar  **tooltip);
+static GimpValueArray * gimp_plug_in_procedure_execute (GimpProcedure  *procedure,
+                                                        Gimp           *gimp,
+                                                        GimpContext    *context,
+                                                        GimpProgress   *progress,
+                                                        GimpValueArray *args,
+                                                        GError        **error);
+static void     gimp_plug_in_procedure_execute_async   (GimpProcedure  *procedure,
+                                                        Gimp           *gimp,
+                                                        GimpContext    *context,
+                                                        GimpProgress   *progress,
+                                                        GimpValueArray *args,
+                                                        GimpObject     *display);
+
+static GFile  * gimp_plug_in_procedure_real_get_file   (GimpPlugInProcedure *procedure);
+
+static gboolean gimp_plug_in_procedure_validate_args   (GimpPlugInProcedure *proc,
+                                                        Gimp                *gimp,
+                                                        GimpValueArray      *args,
+                                                        GError             **error);
+
+
+G_DEFINE_TYPE (GimpPlugInProcedure, gimp_plug_in_procedure,
+               GIMP_TYPE_PROCEDURE)
+
+#define parent_class gimp_plug_in_procedure_parent_class
+
+static guint gimp_plug_in_procedure_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_plug_in_procedure_class_init (GimpPlugInProcedureClass *klass)
+{
+  GObjectClass       *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass    *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass  *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpProcedureClass *proc_class        = GIMP_PROCEDURE_CLASS (klass);
+
+  gimp_plug_in_procedure_signals[MENU_PATH_ADDED] =
+    g_signal_new ("menu-path-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPlugInProcedureClass, menu_path_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  object_class->finalize            = gimp_plug_in_procedure_finalize;
+
+  gimp_object_class->get_memsize    = gimp_plug_in_procedure_get_memsize;
+
+  viewable_class->default_icon_name = "system-run";
+  viewable_class->get_description   = gimp_plug_in_procedure_get_description;
+
+  proc_class->get_label             = gimp_plug_in_procedure_get_label;
+  proc_class->get_menu_label        = gimp_plug_in_procedure_get_menu_label;
+  proc_class->get_blurb             = gimp_plug_in_procedure_get_blurb;
+  proc_class->get_help_id           = gimp_plug_in_procedure_get_help_id;
+  proc_class->get_sensitive         = gimp_plug_in_procedure_get_sensitive;
+  proc_class->execute               = gimp_plug_in_procedure_execute;
+  proc_class->execute_async         = gimp_plug_in_procedure_execute_async;
+
+  klass->get_file                   = gimp_plug_in_procedure_real_get_file;
+  klass->menu_path_added            = NULL;
+}
+
+static void
+gimp_plug_in_procedure_init (GimpPlugInProcedure *proc)
+{
+  GIMP_PROCEDURE (proc)->proc_type = GIMP_PLUGIN;
+
+  proc->icon_data_length = -1;
+}
+
+static void
+gimp_plug_in_procedure_finalize (GObject *object)
+{
+  GimpPlugInProcedure *proc = GIMP_PLUG_IN_PROCEDURE (object);
+
+  g_object_unref (proc->file);
+  g_free (proc->menu_label);
+
+  g_list_free_full (proc->menu_paths, (GDestroyNotify) g_free);
+
+  g_free (proc->label);
+  g_free (proc->help_id);
+
+  g_free (proc->icon_data);
+  g_free (proc->image_types);
+  g_free (proc->image_types_tooltip);
+
+  g_free (proc->extensions);
+  g_free (proc->prefixes);
+  g_free (proc->magics);
+  g_free (proc->mime_types);
+
+  g_slist_free_full (proc->extensions_list, (GDestroyNotify) g_free);
+  g_slist_free_full (proc->prefixes_list, (GDestroyNotify) g_free);
+  g_slist_free_full (proc->magics_list, (GDestroyNotify) g_free);
+  g_slist_free_full (proc->mime_types_list, (GDestroyNotify) g_free);
+
+  g_free (proc->thumb_loader);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_plug_in_procedure_get_memsize (GimpObject *object,
+                                    gint64     *gui_size)
+{
+  GimpPlugInProcedure *proc    = GIMP_PLUG_IN_PROCEDURE (object);
+  gint64               memsize = 0;
+  GList               *list;
+  GSList              *slist;
+
+  memsize += gimp_g_object_get_memsize (G_OBJECT (proc->file));
+  memsize += gimp_string_get_memsize (proc->menu_label);
+
+  for (list = proc->menu_paths; list; list = g_list_next (list))
+    memsize += sizeof (GList) + gimp_string_get_memsize (list->data);
+
+  switch (proc->icon_type)
+    {
+    case GIMP_ICON_TYPE_ICON_NAME:
+    case GIMP_ICON_TYPE_IMAGE_FILE:
+      memsize += gimp_string_get_memsize ((const gchar *) proc->icon_data);
+      break;
+
+    case GIMP_ICON_TYPE_INLINE_PIXBUF:
+      memsize += proc->icon_data_length;
+      break;
+    }
+
+  memsize += gimp_string_get_memsize (proc->extensions);
+  memsize += gimp_string_get_memsize (proc->prefixes);
+  memsize += gimp_string_get_memsize (proc->magics);
+  memsize += gimp_string_get_memsize (proc->mime_types);
+  memsize += gimp_string_get_memsize (proc->thumb_loader);
+
+  for (slist = proc->extensions_list; slist; slist = g_slist_next (slist))
+    memsize += sizeof (GSList) + gimp_string_get_memsize (slist->data);
+
+  for (slist = proc->prefixes_list; slist; slist = g_slist_next (slist))
+    memsize += sizeof (GSList) + gimp_string_get_memsize (slist->data);
+
+  for (slist = proc->magics_list; slist; slist = g_slist_next (slist))
+    memsize += sizeof (GSList) + gimp_string_get_memsize (slist->data);
+
+  for (slist = proc->mime_types_list; slist; slist = g_slist_next (slist))
+    memsize += sizeof (GSList) + gimp_string_get_memsize (slist->data);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gchar *
+gimp_plug_in_procedure_get_description (GimpViewable  *viewable,
+                                        gchar        **tooltip)
+{
+  GimpProcedure *procedure = GIMP_PROCEDURE (viewable);
+
+  if (tooltip)
+    *tooltip = g_strdup (gimp_procedure_get_blurb (procedure));
+
+  return g_strdup (gimp_procedure_get_label (procedure));
+}
+
+static const gchar *
+gimp_plug_in_procedure_get_label (GimpProcedure *procedure)
+{
+  GimpPlugInProcedure *proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  const gchar         *path;
+  gchar               *stripped;
+  gchar               *ellipsis;
+  gchar               *label;
+
+  if (proc->label)
+    return proc->label;
+
+  if (proc->menu_label)
+    path = dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
+                     proc->menu_label);
+  else if (proc->menu_paths)
+    path = dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
+                     proc->menu_paths->data);
+  else
+    return NULL;
+
+  stripped = gimp_strip_uline (path);
+
+  if (proc->menu_label)
+    label = g_strdup (stripped);
+  else
+    label = g_path_get_basename (stripped);
+
+  g_free (stripped);
+
+  ellipsis = strstr (label, "...");
+
+  if (! ellipsis)
+    ellipsis = strstr (label, "\342\200\246" /* U+2026 HORIZONTAL ELLIPSIS */);
+
+  if (ellipsis && ellipsis == (label + strlen (label) - 3))
+    *ellipsis = '\0';
+
+  proc->label = label;
+
+  return proc->label;
+}
+
+static const gchar *
+gimp_plug_in_procedure_get_menu_label (GimpProcedure *procedure)
+{
+  GimpPlugInProcedure *proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+  if (proc->menu_label)
+    {
+      return dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
+                       proc->menu_label);
+    }
+  else if (proc->menu_paths)
+    {
+      const gchar *translated;
+
+      translated = dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
+                             proc->menu_paths->data);
+
+      translated = strrchr (translated, '/');
+
+      if (translated)
+        return translated + 1;
+    }
+
+  return GIMP_PROCEDURE_CLASS (parent_class)->get_menu_label (procedure);
+}
+
+static const gchar *
+gimp_plug_in_procedure_get_blurb (GimpProcedure *procedure)
+{
+  GimpPlugInProcedure *proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+  /*  do not to pass the empty string to gettext()  */
+  if (procedure->blurb && strlen (procedure->blurb))
+    return dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
+                     procedure->blurb);
+
+  return NULL;
+}
+
+static const gchar *
+gimp_plug_in_procedure_get_help_id (GimpProcedure *procedure)
+{
+  GimpPlugInProcedure *proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  const gchar         *domain;
+
+  if (proc->help_id)
+    return proc->help_id;
+
+  domain = gimp_plug_in_procedure_get_help_domain (proc);
+
+  if (domain)
+    proc->help_id = g_strconcat (domain, "?", gimp_object_get_name (proc), NULL);
+  else
+    proc->help_id = g_strdup (gimp_object_get_name (proc));
+
+  return proc->help_id;
+}
+
+static gboolean
+gimp_plug_in_procedure_get_sensitive (GimpProcedure  *procedure,
+                                      GimpObject     *object,
+                                      const gchar   **tooltip)
+{
+  GimpPlugInProcedure *proc       = GIMP_PLUG_IN_PROCEDURE (procedure);
+  GimpDrawable        *drawable;
+  GimpImageType        image_type = -1;
+  gboolean             sensitive  = FALSE;
+
+  g_return_val_if_fail (object == NULL || GIMP_IS_DRAWABLE (object), FALSE);
+
+  drawable = GIMP_DRAWABLE (object);
+
+  if (drawable)
+    {
+      const Babl *format = gimp_drawable_get_format (drawable);
+
+      image_type = gimp_babl_format_get_image_type (format);
+    }
+
+  switch (image_type)
+    {
+    case GIMP_RGB_IMAGE:
+      sensitive = proc->image_types_val & GIMP_PLUG_IN_RGB_IMAGE;
+      break;
+    case GIMP_RGBA_IMAGE:
+      sensitive = proc->image_types_val & GIMP_PLUG_IN_RGBA_IMAGE;
+      break;
+    case GIMP_GRAY_IMAGE:
+      sensitive = proc->image_types_val & GIMP_PLUG_IN_GRAY_IMAGE;
+      break;
+    case GIMP_GRAYA_IMAGE:
+      sensitive = proc->image_types_val & GIMP_PLUG_IN_GRAYA_IMAGE;
+      break;
+    case GIMP_INDEXED_IMAGE:
+      sensitive = proc->image_types_val & GIMP_PLUG_IN_INDEXED_IMAGE;
+      break;
+    case GIMP_INDEXEDA_IMAGE:
+      sensitive = proc->image_types_val & GIMP_PLUG_IN_INDEXEDA_IMAGE;
+      break;
+    default:
+      break;
+    }
+
+  if (! sensitive)
+    *tooltip = proc->image_types_tooltip;
+
+  return sensitive ? TRUE : FALSE;
+}
+
+static GimpValueArray *
+gimp_plug_in_procedure_execute (GimpProcedure  *procedure,
+                                Gimp           *gimp,
+                                GimpContext    *context,
+                                GimpProgress   *progress,
+                                GimpValueArray *args,
+                                GError        **error)
+{
+  GimpPlugInProcedure *plug_in_procedure = GIMP_PLUG_IN_PROCEDURE (procedure);
+  GError              *pdb_error         = NULL;
+
+  if (! gimp_plug_in_procedure_validate_args (plug_in_procedure, gimp,
+                                              args, &pdb_error))
+    {
+      GimpValueArray *return_vals;
+
+      return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+                                                      pdb_error);
+      g_propagate_error (error, pdb_error);
+
+      return return_vals;
+    }
+
+  if (procedure->proc_type == GIMP_INTERNAL)
+    return GIMP_PROCEDURE_CLASS (parent_class)->execute (procedure, gimp,
+                                                         context, progress,
+                                                         args, error);
+
+  return gimp_plug_in_manager_call_run (gimp->plug_in_manager,
+                                        context, progress,
+                                        GIMP_PLUG_IN_PROCEDURE (procedure),
+                                        args, TRUE, NULL);
+}
+
+static void
+gimp_plug_in_procedure_execute_async (GimpProcedure  *procedure,
+                                      Gimp           *gimp,
+                                      GimpContext    *context,
+                                      GimpProgress   *progress,
+                                      GimpValueArray *args,
+                                      GimpObject     *display)
+{
+  GimpPlugInProcedure *plug_in_procedure = GIMP_PLUG_IN_PROCEDURE (procedure);
+  GError              *error             = NULL;
+
+  if (gimp_plug_in_procedure_validate_args (plug_in_procedure, gimp,
+                                            args, &error))
+    {
+      GimpValueArray *return_vals;
+
+      return_vals = gimp_plug_in_manager_call_run (gimp->plug_in_manager,
+                                                   context, progress,
+                                                   plug_in_procedure,
+                                                   args, FALSE, display);
+
+      if (return_vals)
+        {
+          gimp_plug_in_procedure_handle_return_values (plug_in_procedure,
+                                                       gimp, progress,
+                                                       return_vals);
+          gimp_value_array_unref (return_vals);
+        }
+    }
+  else
+    {
+      gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_error_free (error);
+    }
+}
+
+static GFile *
+gimp_plug_in_procedure_real_get_file (GimpPlugInProcedure *procedure)
+{
+  return procedure->file;
+}
+
+static gboolean
+gimp_plug_in_procedure_validate_args (GimpPlugInProcedure *proc,
+                                      Gimp                *gimp,
+                                      GimpValueArray      *args,
+                                      GError             **error)
+{
+  if (proc->file_proc && proc->handles_uri)
+    {
+      /*  for file procedures that handle URIs, make sure that the
+       *  passed string actually is an URI, not just a file path
+       *  (bug 758685)
+       */
+      GimpProcedure *procedure = GIMP_PROCEDURE (proc);
+      GValue        *uri_value = NULL;
+
+      if ((procedure->num_args   >= 3)                     &&
+          (procedure->num_values >= 1)                     &&
+          GIMP_IS_PARAM_SPEC_INT32    (procedure->args[0]) &&
+          G_IS_PARAM_SPEC_STRING      (procedure->args[1]) &&
+          G_IS_PARAM_SPEC_STRING      (procedure->args[2]) &&
+          GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->values[0]))
+        {
+          uri_value = gimp_value_array_index (args, 1);
+        }
+      else if ((procedure->num_args >= 5)                          &&
+               GIMP_IS_PARAM_SPEC_INT32       (procedure->args[0]) &&
+               GIMP_IS_PARAM_SPEC_IMAGE_ID    (procedure->args[1]) &&
+               GIMP_IS_PARAM_SPEC_DRAWABLE_ID (procedure->args[2]) &&
+               G_IS_PARAM_SPEC_STRING         (procedure->args[3]) &&
+               G_IS_PARAM_SPEC_STRING         (procedure->args[4]))
+        {
+          uri_value = gimp_value_array_index (args, 3);
+        }
+
+      if (uri_value)
+        {
+          GFile *file;
+
+          file = file_utils_filename_to_file (gimp,
+                                              g_value_get_string (uri_value),
+                                              error);
+
+          if (! file)
+            return FALSE;
+
+          g_value_take_string (uri_value, g_file_get_uri (file));
+          g_object_unref (file);
+        }
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GimpProcedure *
+gimp_plug_in_procedure_new (GimpPDBProcType  proc_type,
+                            GFile           *file)
+{
+  GimpPlugInProcedure *proc;
+
+  g_return_val_if_fail (proc_type == GIMP_PLUGIN ||
+                        proc_type == GIMP_EXTENSION, NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  proc = g_object_new (GIMP_TYPE_PLUG_IN_PROCEDURE, NULL);
+
+  proc->file = g_object_ref (file);
+
+  GIMP_PROCEDURE (proc)->proc_type = proc_type;
+
+  return GIMP_PROCEDURE (proc);
+}
+
+GimpPlugInProcedure *
+gimp_plug_in_procedure_find (GSList      *list,
+                             const gchar *proc_name)
+{
+  GSList *l;
+
+  for (l = list; l; l = g_slist_next (l))
+    {
+      GimpObject *object = l->data;
+
+      if (! strcmp (proc_name, gimp_object_get_name (object)))
+        return GIMP_PLUG_IN_PROCEDURE (object);
+    }
+
+  return NULL;
+}
+
+GFile *
+gimp_plug_in_procedure_get_file (GimpPlugInProcedure *proc)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc), NULL);
+
+  return GIMP_PLUG_IN_PROCEDURE_GET_CLASS (proc)->get_file (proc);
+}
+
+void
+gimp_plug_in_procedure_set_locale_domain (GimpPlugInProcedure *proc,
+                                          const gchar         *locale_domain)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  proc->locale_domain = locale_domain ? g_quark_from_string (locale_domain) : 0;
+}
+
+const gchar *
+gimp_plug_in_procedure_get_locale_domain (GimpPlugInProcedure *proc)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc), NULL);
+
+  return g_quark_to_string (proc->locale_domain);
+}
+
+void
+gimp_plug_in_procedure_set_help_domain (GimpPlugInProcedure *proc,
+                                        const gchar         *help_domain)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  proc->help_domain = help_domain ? g_quark_from_string (help_domain) : 0;
+}
+
+const gchar *
+gimp_plug_in_procedure_get_help_domain (GimpPlugInProcedure *proc)
+{
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc), NULL);
+
+  return g_quark_to_string (proc->help_domain);
+}
+
+gboolean
+gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure  *proc,
+                                      const gchar          *menu_path,
+                                      GError              **error)
+{
+  GimpProcedure *procedure;
+  gchar         *basename = NULL;
+  const gchar   *required = NULL;
+  gchar         *p;
+  gchar         *mapped_path;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc), FALSE);
+  g_return_val_if_fail (menu_path != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  procedure = GIMP_PROCEDURE (proc);
+
+  p = strchr (menu_path, '>');
+  if (p == NULL || (*(++p) && *p != '/'))
+    {
+      basename = g_path_get_basename (gimp_file_get_utf8_name (proc->file));
+
+      g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
+                   "Plug-in \"%s\"\n(%s)\n"
+                   "attempted to install procedure \"%s\"\n"
+                   "in the invalid menu location \"%s\".\n"
+                   "The menu path must look like either \"<Prefix>\" "
+                   "or \"<Prefix>/path/to/item\".",
+                   basename, gimp_file_get_utf8_name (proc->file),
+                   gimp_object_get_name (proc),
+                   menu_path);
+      goto failure;
+    }
+
+  if (g_str_has_prefix (menu_path, "<Toolbox>") ||
+      g_str_has_prefix (menu_path, "<Image>"))
+    {
+      if ((procedure->num_args < 1) ||
+          ! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]))
+        {
+          required = "INT32";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Layers>"))
+    {
+      if ((procedure->num_args < 3)                             ||
+          ! GIMP_IS_PARAM_SPEC_INT32       (procedure->args[0]) ||
+          ! GIMP_IS_PARAM_SPEC_IMAGE_ID    (procedure->args[1]) ||
+          ! (G_TYPE_FROM_INSTANCE (procedure->args[2])
+                               == GIMP_TYPE_PARAM_LAYER_ID ||
+             G_TYPE_FROM_INSTANCE (procedure->args[2])
+                               == GIMP_TYPE_PARAM_DRAWABLE_ID))
+        {
+          required = "INT32, IMAGE, (LAYER | DRAWABLE)";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Channels>"))
+    {
+      if ((procedure->num_args < 3)                             ||
+          ! GIMP_IS_PARAM_SPEC_INT32       (procedure->args[0]) ||
+          ! GIMP_IS_PARAM_SPEC_IMAGE_ID    (procedure->args[1]) ||
+          ! (G_TYPE_FROM_INSTANCE (procedure->args[2])
+                               == GIMP_TYPE_PARAM_CHANNEL_ID ||
+             G_TYPE_FROM_INSTANCE (procedure->args[2])
+                               == GIMP_TYPE_PARAM_DRAWABLE_ID))
+        {
+          required = "INT32, IMAGE, (CHANNEL | DRAWABLE)";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Vectors>"))
+    {
+      if ((procedure->num_args < 3)                            ||
+          ! GIMP_IS_PARAM_SPEC_INT32      (procedure->args[0]) ||
+          ! GIMP_IS_PARAM_SPEC_IMAGE_ID   (procedure->args[1]) ||
+          ! GIMP_IS_PARAM_SPEC_VECTORS_ID (procedure->args[2]))
+        {
+          required = "INT32, IMAGE, VECTORS";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Colormap>"))
+    {
+      if ((procedure->num_args < 2)                            ||
+          ! GIMP_IS_PARAM_SPEC_INT32      (procedure->args[0]) ||
+          ! GIMP_IS_PARAM_SPEC_IMAGE_ID   (procedure->args[1]))
+        {
+          required = "INT32, IMAGE";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Load>"))
+    {
+      if ((procedure->num_args < 3)                       ||
+          ! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]) ||
+          ! G_IS_PARAM_SPEC_STRING   (procedure->args[1]) ||
+          ! G_IS_PARAM_SPEC_STRING   (procedure->args[2]))
+        {
+          required = "INT32, STRING, STRING";
+          goto failure;
+        }
+
+      if ((procedure->num_values < 1) ||
+          ! GIMP_IS_PARAM_SPEC_IMAGE_ID (procedure->values[0]))
+        {
+          required = "IMAGE";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Save>"))
+    {
+      if ((procedure->num_args < 5)                             ||
+          ! GIMP_IS_PARAM_SPEC_INT32       (procedure->args[0]) ||
+          ! GIMP_IS_PARAM_SPEC_IMAGE_ID    (procedure->args[1]) ||
+          ! GIMP_IS_PARAM_SPEC_DRAWABLE_ID (procedure->args[2]) ||
+          ! G_IS_PARAM_SPEC_STRING         (procedure->args[3]) ||
+          ! G_IS_PARAM_SPEC_STRING         (procedure->args[4]))
+        {
+          required = "INT32, IMAGE, DRAWABLE, STRING, STRING";
+          goto failure;
+        }
+    }
+  else if (g_str_has_prefix (menu_path, "<Brushes>")        ||
+           g_str_has_prefix (menu_path, "<Dynamics>")       ||
+           g_str_has_prefix (menu_path, "<MyPaintBrushes>") ||
+           g_str_has_prefix (menu_path, "<Gradients>")      ||
+           g_str_has_prefix (menu_path, "<Palettes>")       ||
+           g_str_has_prefix (menu_path, "<Patterns>")       ||
+           g_str_has_prefix (menu_path, "<ToolPresets>")    ||
+           g_str_has_prefix (menu_path, "<Fonts>")          ||
+           g_str_has_prefix (menu_path, "<Buffers>"))
+    {
+      if ((procedure->num_args < 1) ||
+          ! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]))
+        {
+          required = "INT32";
+          goto failure;
+        }
+    }
+  else
+    {
+      basename = g_path_get_basename (gimp_file_get_utf8_name (proc->file));
+
+      g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
+                   "Plug-in \"%s\"\n(%s)\n"
+                   "attempted to install procedure \"%s\" "
+                   "in the invalid menu location \"%s\".\n"
+                   "Use either \"<Image>\", "
+                   "\"<Layers>\", \"<Channels>\", \"<Vectors>\", "
+                   "\"<Colormap>\", \"<Brushes>\", \"<Dynamics>\", "
+                   "\"<MyPaintBrushes>\", \"<Gradients>\", \"<Palettes>\", "
+                   "\"<Patterns>\", \"<ToolPresets>\", \"<Fonts>\" "
+                   "or \"<Buffers>\".",
+                   basename, gimp_file_get_utf8_name (proc->file),
+                   gimp_object_get_name (proc),
+                   menu_path);
+      goto failure;
+    }
+
+  g_free (basename);
+
+  mapped_path = plug_in_menu_path_map (menu_path, NULL);
+
+  proc->menu_paths = g_list_append (proc->menu_paths, mapped_path);
+
+  g_signal_emit (proc, gimp_plug_in_procedure_signals[MENU_PATH_ADDED], 0,
+                 mapped_path);
+
+  return TRUE;
+
+ failure:
+  if (required)
+    {
+      gchar *prefix = g_strdup (menu_path);
+
+      p = strchr (prefix, '>') + 1;
+      *p = '\0';
+
+      basename = g_path_get_basename (gimp_file_get_utf8_name (proc->file));
+
+      g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
+                   "Plug-in \"%s\"\n(%s)\n\n"
+                   "attempted to install %s procedure \"%s\" "
+                   "which does not take the standard %s plug-in's "
+                   "arguments: (%s).",
+                   basename, gimp_file_get_utf8_name (proc->file),
+                   prefix, gimp_object_get_name (proc), prefix,
+                   required);
+
+      g_free (prefix);
+    }
+
+  g_free (basename);
+
+  return FALSE;
+}
+
+void
+gimp_plug_in_procedure_set_icon (GimpPlugInProcedure *proc,
+                                 GimpIconType         icon_type,
+                                 const guint8        *icon_data,
+                                 gint                 icon_data_length)
+{
+  guint8 *data_copy = NULL;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  switch (icon_type)
+    {
+    case GIMP_ICON_TYPE_ICON_NAME:
+      data_copy = (guint8 *) g_strdup ((gchar *) icon_data);
+      break;
+
+    case GIMP_ICON_TYPE_INLINE_PIXBUF:
+      data_copy = g_memdup (icon_data, icon_data_length);
+      break;
+
+    case GIMP_ICON_TYPE_IMAGE_FILE:
+      data_copy = (guint8 *) g_strdup ((gchar *) icon_data);
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  gimp_plug_in_procedure_take_icon (proc, icon_type,
+                                    data_copy, icon_data_length);
+}
+
+void
+gimp_plug_in_procedure_take_icon (GimpPlugInProcedure *proc,
+                                  GimpIconType         icon_type,
+                                  guint8              *icon_data,
+                                  gint                 icon_data_length)
+{
+  const gchar *icon_name   = NULL;
+  GdkPixbuf   *icon_pixbuf = NULL;
+  GError      *error       = NULL;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  if (proc->icon_data)
+    {
+      g_free (proc->icon_data);
+      proc->icon_data_length = -1;
+      proc->icon_data        = NULL;
+    }
+
+  proc->icon_type = icon_type;
+
+  switch (proc->icon_type)
+    {
+    case GIMP_ICON_TYPE_ICON_NAME:
+      proc->icon_data_length = -1;
+      proc->icon_data        = icon_data;
+
+      icon_name = (const gchar *) proc->icon_data;
+      break;
+
+    case GIMP_ICON_TYPE_INLINE_PIXBUF:
+      proc->icon_data_length = icon_data_length;
+      proc->icon_data        = icon_data;
+
+      icon_pixbuf = gdk_pixbuf_new_from_inline (proc->icon_data_length,
+                                                proc->icon_data, TRUE, &error);
+      break;
+
+    case GIMP_ICON_TYPE_IMAGE_FILE:
+      proc->icon_data_length = -1;
+      proc->icon_data        = icon_data;
+
+      icon_pixbuf = gdk_pixbuf_new_from_file ((gchar *) proc->icon_data,
+                                              &error);
+      break;
+    }
+
+  if (! icon_pixbuf && error)
+    {
+      g_printerr ("gimp_plug_in_procedure_take_icon: %s\n", error->message);
+      g_clear_error (&error);
+    }
+
+  gimp_viewable_set_icon_name (GIMP_VIEWABLE (proc), icon_name);
+  g_object_set (proc, "icon-pixbuf", icon_pixbuf, NULL);
+
+  if (icon_pixbuf)
+    g_object_unref (icon_pixbuf);
+}
+
+static GimpPlugInImageType
+image_types_parse (const gchar *name,
+                   const gchar *image_types)
+{
+  const gchar         *type_spec = image_types;
+  GimpPlugInImageType  types     = 0;
+
+  /*  If the plug_in registers with image_type == NULL or "", return 0
+   *  By doing so it won't be touched by plug_in_set_menu_sensitivity()
+   */
+  if (! image_types)
+    return types;
+
+  while (*image_types)
+    {
+      while (*image_types &&
+             ((*image_types == ' ') ||
+              (*image_types == '\t') ||
+              (*image_types == ',')))
+        image_types++;
+
+      if (*image_types)
+        {
+          if (g_str_has_prefix (image_types, "RGBA"))
+            {
+              types |= GIMP_PLUG_IN_RGBA_IMAGE;
+              image_types += strlen ("RGBA");
+            }
+          else if (g_str_has_prefix (image_types, "RGB*"))
+            {
+              types |= GIMP_PLUG_IN_RGB_IMAGE | GIMP_PLUG_IN_RGBA_IMAGE;
+              image_types += strlen ("RGB*");
+            }
+          else if (g_str_has_prefix (image_types, "RGB"))
+            {
+              types |= GIMP_PLUG_IN_RGB_IMAGE;
+              image_types += strlen ("RGB");
+            }
+          else if (g_str_has_prefix (image_types, "GRAYA"))
+            {
+              types |= GIMP_PLUG_IN_GRAYA_IMAGE;
+              image_types += strlen ("GRAYA");
+            }
+          else if (g_str_has_prefix (image_types, "GRAY*"))
+            {
+              types |= GIMP_PLUG_IN_GRAY_IMAGE | GIMP_PLUG_IN_GRAYA_IMAGE;
+              image_types += strlen ("GRAY*");
+            }
+          else if (g_str_has_prefix (image_types, "GRAY"))
+            {
+              types |= GIMP_PLUG_IN_GRAY_IMAGE;
+              image_types += strlen ("GRAY");
+            }
+          else if (g_str_has_prefix (image_types, "INDEXEDA"))
+            {
+              types |= GIMP_PLUG_IN_INDEXEDA_IMAGE;
+              image_types += strlen ("INDEXEDA");
+            }
+          else if (g_str_has_prefix (image_types, "INDEXED*"))
+            {
+              types |= GIMP_PLUG_IN_INDEXED_IMAGE | GIMP_PLUG_IN_INDEXEDA_IMAGE;
+              image_types += strlen ("INDEXED*");
+            }
+          else if (g_str_has_prefix (image_types, "INDEXED"))
+            {
+              types |= GIMP_PLUG_IN_INDEXED_IMAGE;
+              image_types += strlen ("INDEXED");
+            }
+          else if (g_str_has_prefix (image_types, "*"))
+            {
+              types |= (GIMP_PLUG_IN_RGB_IMAGE     | GIMP_PLUG_IN_RGBA_IMAGE  |
+                        GIMP_PLUG_IN_GRAY_IMAGE    | GIMP_PLUG_IN_GRAYA_IMAGE |
+                        GIMP_PLUG_IN_INDEXED_IMAGE | GIMP_PLUG_IN_INDEXEDA_IMAGE);
+              image_types += strlen ("*");
+            }
+          else
+            {
+              g_printerr ("%s: image-type contains unrecognizable parts:"
+                          "'%s'\n", name, type_spec);
+
+              /* skip to next token */
+              while (*image_types &&
+                     *image_types != ' '  &&
+                     *image_types != '\t' &&
+                     *image_types != ',')
+                {
+                  image_types++;
+                }
+            }
+        }
+    }
+
+  return types;
+}
+
+void
+gimp_plug_in_procedure_set_image_types (GimpPlugInProcedure *proc,
+                                        const gchar         *image_types)
+{
+  GList *types = NULL;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  if (proc->image_types)
+    g_free (proc->image_types);
+
+  proc->image_types     = g_strdup (image_types);
+  proc->image_types_val = image_types_parse (gimp_object_get_name (proc),
+                                             proc->image_types);
+
+  g_clear_pointer (&proc->image_types_tooltip, g_free);
+
+  if (proc->image_types_val &
+      (GIMP_PLUG_IN_RGB_IMAGE | GIMP_PLUG_IN_RGBA_IMAGE))
+    {
+      if ((proc->image_types_val & GIMP_PLUG_IN_RGB_IMAGE) &&
+          (proc->image_types_val & GIMP_PLUG_IN_RGBA_IMAGE))
+        {
+          types = g_list_prepend (types, _("RGB"));
+        }
+      else if (proc->image_types_val & GIMP_PLUG_IN_RGB_IMAGE)
+        {
+          types = g_list_prepend (types, _("RGB without alpha"));
+        }
+      else
+        {
+          types = g_list_prepend (types, _("RGB with alpha"));
+        }
+    }
+
+  if (proc->image_types_val &
+      (GIMP_PLUG_IN_GRAY_IMAGE | GIMP_PLUG_IN_GRAYA_IMAGE))
+    {
+      if ((proc->image_types_val & GIMP_PLUG_IN_GRAY_IMAGE) &&
+          (proc->image_types_val & GIMP_PLUG_IN_GRAYA_IMAGE))
+        {
+          types = g_list_prepend (types, _("Grayscale"));
+        }
+      else if (proc->image_types_val & GIMP_PLUG_IN_GRAY_IMAGE)
+        {
+          types = g_list_prepend (types, _("Grayscale without alpha"));
+        }
+      else
+        {
+          types = g_list_prepend (types, _("Grayscale with alpha"));
+        }
+    }
+
+  if (proc->image_types_val &
+      (GIMP_PLUG_IN_INDEXED_IMAGE | GIMP_PLUG_IN_INDEXEDA_IMAGE))
+    {
+      if ((proc->image_types_val & GIMP_PLUG_IN_INDEXED_IMAGE) &&
+          (proc->image_types_val & GIMP_PLUG_IN_INDEXEDA_IMAGE))
+        {
+          types = g_list_prepend (types, _("Indexed"));
+        }
+      else if (proc->image_types_val & GIMP_PLUG_IN_INDEXED_IMAGE)
+        {
+          types = g_list_prepend (types, _("Indexed without alpha"));
+        }
+      else
+        {
+          types = g_list_prepend (types, _("Indexed with alpha"));
+        }
+    }
+
+  if (types)
+    {
+      GString *string;
+      GList   *list;
+
+      types = g_list_reverse (types);
+
+      string = g_string_new (gimp_procedure_get_blurb (GIMP_PROCEDURE (proc)));
+
+      g_string_append (string, "\n\n");
+      g_string_append (string, _("This plug-in only works on the "
+                                 "following layer types:"));
+      g_string_append (string, "\n");
+
+      for (list = types; list; list = g_list_next (list))
+        {
+          g_string_append (string, list->data);
+
+          if (list->next)
+            g_string_append (string, ", ");
+          else
+            g_string_append (string, ".");
+        }
+
+      g_list_free (types);
+
+      proc->image_types_tooltip = g_string_free (string, FALSE);
+    }
+}
+
+static GSList *
+extensions_parse (gchar *extensions)
+{
+  GSList *list = NULL;
+
+  /*  extensions can be NULL.  Avoid calling strtok if it is.  */
+  if (extensions)
+    {
+      gchar *extension;
+      gchar *next_token;
+
+      /*  work on a copy  */
+      extensions = g_strdup (extensions);
+
+      next_token = extensions;
+      extension = strtok (next_token, " \t,");
+
+      while (extension)
+        {
+          list = g_slist_prepend (list, g_strdup (extension));
+          extension = strtok (NULL, " \t,");
+        }
+
+      g_free (extensions);
+    }
+
+  return g_slist_reverse (list);
+}
+
+void
+gimp_plug_in_procedure_set_file_proc (GimpPlugInProcedure *proc,
+                                      const gchar         *extensions,
+                                      const gchar         *prefixes,
+                                      const gchar         *magics)
+{
+  GSList *list;
+
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  proc->file_proc = TRUE;
+
+  /*  extensions  */
+
+  if (proc->extensions != extensions)
+    {
+      if (proc->extensions)
+        g_free (proc->extensions);
+
+      proc->extensions = g_strdup (extensions);
+    }
+
+  if (proc->extensions_list)
+    g_slist_free_full (proc->extensions_list, (GDestroyNotify) g_free);
+
+  proc->extensions_list = extensions_parse (proc->extensions);
+
+  /*  prefixes  */
+
+  if (proc->prefixes != prefixes)
+    {
+      if (proc->prefixes)
+        g_free (proc->prefixes);
+
+      proc->prefixes = g_strdup (prefixes);
+    }
+
+  if (proc->prefixes_list)
+    g_slist_free_full (proc->prefixes_list, (GDestroyNotify) g_free);
+
+  proc->prefixes_list = extensions_parse (proc->prefixes);
+
+  /* don't allow "file:" to be registered as prefix */
+  for (list = proc->prefixes_list; list; list = g_slist_next (list))
+    {
+      const gchar *prefix = list->data;
+
+      if (prefix && strcmp (prefix, "file:") == 0)
+        {
+          g_free (list->data);
+          proc->prefixes_list = g_slist_delete_link (proc->prefixes_list, list);
+          break;
+        }
+    }
+
+  /*  magics  */
+
+  if (proc->magics != magics)
+    {
+      if (proc->magics)
+        g_free (proc->magics);
+
+      proc->magics = g_strdup (magics);
+    }
+
+  if (proc->magics_list)
+    g_slist_free_full (proc->magics_list, (GDestroyNotify) g_free);
+
+  proc->magics_list = extensions_parse (proc->magics);
+}
+
+void
+gimp_plug_in_procedure_set_priority (GimpPlugInProcedure *proc,
+                                     gint                 priority)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  proc->priority = priority;
+}
+
+void
+gimp_plug_in_procedure_set_mime_types (GimpPlugInProcedure *proc,
+                                       const gchar         *mime_types)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  if (proc->mime_types != mime_types)
+    {
+      if (proc->mime_types)
+        g_free (proc->mime_types);
+
+      proc->mime_types = g_strdup (mime_types);
+    }
+
+  if (proc->mime_types_list)
+    g_slist_free_full (proc->mime_types_list, (GDestroyNotify) g_free);
+
+  proc->mime_types_list = extensions_parse (proc->mime_types);
+}
+
+void
+gimp_plug_in_procedure_set_handles_uri (GimpPlugInProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  proc->handles_uri = TRUE;
+}
+
+void
+gimp_plug_in_procedure_set_handles_raw (GimpPlugInProcedure *proc)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  proc->handles_raw = TRUE;
+}
+
+void
+gimp_plug_in_procedure_set_thumb_loader (GimpPlugInProcedure *proc,
+                                         const gchar         *thumb_loader)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+
+  if (proc->thumb_loader)
+    g_free (proc->thumb_loader);
+
+  proc->thumb_loader = g_strdup (thumb_loader);
+}
+
+void
+gimp_plug_in_procedure_handle_return_values (GimpPlugInProcedure *proc,
+                                             Gimp                *gimp,
+                                             GimpProgress        *progress,
+                                             GimpValueArray      *return_vals)
+{
+  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
+  g_return_if_fail (return_vals != NULL);
+
+  if (gimp_value_array_length (return_vals) == 0 ||
+      G_VALUE_TYPE (gimp_value_array_index (return_vals, 0)) !=
+      GIMP_TYPE_PDB_STATUS_TYPE)
+    {
+      return;
+    }
+
+  switch (g_value_get_enum (gimp_value_array_index (return_vals, 0)))
+    {
+    case GIMP_PDB_SUCCESS:
+      break;
+
+    case GIMP_PDB_CALLING_ERROR:
+      if (gimp_value_array_length (return_vals) > 1 &&
+          G_VALUE_HOLDS_STRING (gimp_value_array_index (return_vals, 1)))
+        {
+          gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                        _("Calling error for '%s':\n"
+                          "%s"),
+                        gimp_procedure_get_label (GIMP_PROCEDURE (proc)),
+                        g_value_get_string (gimp_value_array_index (return_vals, 1)));
+        }
+      break;
+
+    case GIMP_PDB_EXECUTION_ERROR:
+      if (gimp_value_array_length (return_vals) > 1 &&
+          G_VALUE_HOLDS_STRING (gimp_value_array_index (return_vals, 1)))
+        {
+          gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                        _("Execution error for '%s':\n"
+                          "%s"),
+                        gimp_procedure_get_label (GIMP_PROCEDURE (proc)),
+                        g_value_get_string (gimp_value_array_index (return_vals, 1)));
+        }
+      break;
+    }
+}
diff --git a/app/plug-in/gimppluginprocedure.h b/app/plug-in/gimppluginprocedure.h
new file mode 100644
index 0000000..e462040
--- /dev/null
+++ b/app/plug-in/gimppluginprocedure.h
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginprocedure.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_PROCEDURE_H__
+#define __GIMP_PLUG_IN_PROCEDURE_H__
+
+
+#include "pdb/gimpprocedure.h"
+
+
+#define GIMP_TYPE_PLUG_IN_PROCEDURE            (gimp_plug_in_procedure_get_type ())
+#define GIMP_PLUG_IN_PROCEDURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUG_IN_PROCEDURE, GimpPlugInProcedure))
+#define GIMP_PLUG_IN_PROCEDURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUG_IN_PROCEDURE, GimpPlugInProcedureClass))
+#define GIMP_IS_PLUG_IN_PROCEDURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUG_IN_PROCEDURE))
+#define GIMP_IS_PLUG_IN_PROCEDURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUG_IN_PROCEDURE))
+#define GIMP_PLUG_IN_PROCEDURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PLUG_IN_PROCEDURE, GimpPlugInProcedureClass))
+
+
+typedef struct _GimpPlugInProcedureClass GimpPlugInProcedureClass;
+
+struct _GimpPlugInProcedure
+{
+  GimpProcedure        parent_instance;
+
+  /*  common members  */
+  GFile               *file;
+  GQuark               locale_domain;
+  GQuark               help_domain;
+  gchar               *menu_label;
+  GList               *menu_paths;
+  gchar               *label;
+  gchar               *help_id;
+  GimpIconType         icon_type;
+  gint                 icon_data_length;
+  guint8              *icon_data;
+  gchar               *image_types;
+  GimpPlugInImageType  image_types_val;
+  gchar               *image_types_tooltip;
+  gint64               mtime;
+  gboolean             installed_during_init;
+
+  /*  file proc specific members  */
+  gboolean             file_proc;
+  gchar               *extensions;
+  gchar               *prefixes;
+  gchar               *magics;
+  gint                 priority;
+  gchar               *mime_types;
+  gboolean             handles_uri;
+  gboolean             handles_raw;
+  GSList              *extensions_list;
+  GSList              *prefixes_list;
+  GSList              *magics_list;
+  GSList              *mime_types_list;
+  gchar               *thumb_loader;
+};
+
+struct _GimpPlugInProcedureClass
+{
+  GimpProcedureClass parent_class;
+
+  /*  virtual functions  */
+  GFile * (* get_file)        (GimpPlugInProcedure *procedure);
+
+  /*  signals  */
+  void    (* menu_path_added) (GimpPlugInProcedure *procedure,
+                               const gchar         *menu_path);
+};
+
+
+GType           gimp_plug_in_procedure_get_type        (void) G_GNUC_CONST;
+
+GimpProcedure * gimp_plug_in_procedure_new             (GimpPDBProcType      proc_type,
+                                                        GFile               *file);
+
+GimpPlugInProcedure * gimp_plug_in_procedure_find      (GSList              *list,
+                                                        const gchar         *proc_name);
+
+GFile       * gimp_plug_in_procedure_get_file          (GimpPlugInProcedure *proc);
+
+void          gimp_plug_in_procedure_set_locale_domain (GimpPlugInProcedure *proc,
+                                                        const gchar         *locale_domain);
+const gchar * gimp_plug_in_procedure_get_locale_domain (GimpPlugInProcedure *proc);
+
+void          gimp_plug_in_procedure_set_help_domain   (GimpPlugInProcedure *proc,
+                                                        const gchar         *help_domain);
+const gchar * gimp_plug_in_procedure_get_help_domain   (GimpPlugInProcedure *proc);
+
+gboolean      gimp_plug_in_procedure_add_menu_path     (GimpPlugInProcedure *proc,
+                                                        const gchar         *menu_path,
+                                                        GError             **error);
+
+void          gimp_plug_in_procedure_set_icon          (GimpPlugInProcedure *proc,
+                                                        GimpIconType         type,
+                                                        const guint8        *data,
+                                                        gint                 data_length);
+void          gimp_plug_in_procedure_take_icon         (GimpPlugInProcedure *proc,
+                                                        GimpIconType         type,
+                                                        guint8              *data,
+                                                        gint                 data_length);
+
+void          gimp_plug_in_procedure_set_image_types   (GimpPlugInProcedure *proc,
+                                                        const gchar         *image_types);
+void          gimp_plug_in_procedure_set_file_proc     (GimpPlugInProcedure *proc,
+                                                        const gchar         *extensions,
+                                                        const gchar         *prefixes,
+                                                        const gchar         *magics);
+void          gimp_plug_in_procedure_set_priority      (GimpPlugInProcedure *proc,
+                                                        gint                 priority);
+void          gimp_plug_in_procedure_set_mime_types    (GimpPlugInProcedure *proc,
+                                                        const gchar         *mime_ypes);
+void          gimp_plug_in_procedure_set_handles_uri   (GimpPlugInProcedure *proc);
+void          gimp_plug_in_procedure_set_handles_raw   (GimpPlugInProcedure *proc);
+void          gimp_plug_in_procedure_set_thumb_loader  (GimpPlugInProcedure *proc,
+                                                        const gchar         *thumbnailer);
+
+void       gimp_plug_in_procedure_handle_return_values (GimpPlugInProcedure *proc,
+                                                        Gimp                *gimp,
+                                                        GimpProgress        *progress,
+
+                                                        GimpValueArray      *return_vals);
+
+
+#endif /* __GIMP_PLUG_IN_PROCEDURE_H__ */
diff --git a/app/plug-in/gimppluginprocframe.c b/app/plug-in/gimppluginprocframe.c
new file mode 100644
index 0000000..10445ef
--- /dev/null
+++ b/app/plug-in/gimppluginprocframe.c
@@ -0,0 +1,200 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginprocframe.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "pdb/gimppdbcontext.h"
+#include "pdb/gimppdberror.h"
+
+#include "gimpplugin.h"
+#include "gimpplugin-cleanup.h"
+#include "gimpplugin-progress.h"
+#include "gimppluginprocedure.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GimpPlugInProcFrame *
+gimp_plug_in_proc_frame_new (GimpContext         *context,
+                             GimpProgress        *progress,
+                             GimpPlugInProcedure *procedure)
+{
+  GimpPlugInProcFrame *proc_frame;
+
+  g_return_val_if_fail (GIMP_IS_PDB_CONTEXT (context), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (procedure), NULL);
+
+  proc_frame = g_slice_new0 (GimpPlugInProcFrame);
+
+  proc_frame->ref_count = 1;
+
+  gimp_plug_in_proc_frame_init (proc_frame, context, progress, procedure);
+
+  return proc_frame;
+}
+
+void
+gimp_plug_in_proc_frame_init (GimpPlugInProcFrame *proc_frame,
+                              GimpContext         *context,
+                              GimpProgress        *progress,
+                              GimpPlugInProcedure *procedure)
+{
+  g_return_if_fail (proc_frame != NULL);
+  g_return_if_fail (GIMP_IS_PDB_CONTEXT (context));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+  g_return_if_fail (procedure == NULL ||
+                    GIMP_IS_PLUG_IN_PROCEDURE (procedure));
+
+  proc_frame->main_context       = g_object_ref (context);
+  proc_frame->context_stack      = NULL;
+  proc_frame->procedure          = procedure ? g_object_ref (GIMP_PROCEDURE (procedure)) : NULL;
+  proc_frame->main_loop          = NULL;
+  proc_frame->return_vals        = NULL;
+  proc_frame->progress           = progress ? g_object_ref (progress) : NULL;
+  proc_frame->progress_created   = FALSE;
+  proc_frame->progress_cancel_id = 0;
+  proc_frame->error_handler      = GIMP_PDB_ERROR_HANDLER_INTERNAL;
+
+  if (progress)
+    gimp_plug_in_progress_attach (progress);
+}
+
+void
+gimp_plug_in_proc_frame_dispose (GimpPlugInProcFrame *proc_frame,
+                                 GimpPlugIn          *plug_in)
+{
+  g_return_if_fail (proc_frame != NULL);
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  if (proc_frame->progress)
+    {
+      gimp_plug_in_progress_end (plug_in, proc_frame);
+
+      g_clear_object (&proc_frame->progress);
+    }
+
+  if (proc_frame->context_stack)
+    {
+      g_list_free_full (proc_frame->context_stack,
+                        (GDestroyNotify) g_object_unref);
+      proc_frame->context_stack = NULL;
+    }
+
+  g_clear_object (&proc_frame->main_context);
+  g_clear_pointer (&proc_frame->return_vals, gimp_value_array_unref);
+  g_clear_pointer (&proc_frame->main_loop, g_main_loop_unref);
+
+  if (proc_frame->image_cleanups || proc_frame->item_cleanups)
+    gimp_plug_in_cleanup (plug_in, proc_frame);
+
+  g_clear_object (&proc_frame->procedure);
+}
+
+GimpPlugInProcFrame *
+gimp_plug_in_proc_frame_ref (GimpPlugInProcFrame *proc_frame)
+{
+  g_return_val_if_fail (proc_frame != NULL, NULL);
+
+  proc_frame->ref_count++;
+
+  return proc_frame;
+}
+
+void
+gimp_plug_in_proc_frame_unref (GimpPlugInProcFrame *proc_frame,
+                               GimpPlugIn          *plug_in)
+{
+  g_return_if_fail (proc_frame != NULL);
+  g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
+
+  proc_frame->ref_count--;
+
+  if (proc_frame->ref_count < 1)
+    {
+      gimp_plug_in_proc_frame_dispose (proc_frame, plug_in);
+      g_slice_free (GimpPlugInProcFrame, proc_frame);
+    }
+}
+
+GimpValueArray *
+gimp_plug_in_proc_frame_get_return_values (GimpPlugInProcFrame *proc_frame)
+{
+  GimpValueArray *return_vals;
+
+  g_return_val_if_fail (proc_frame != NULL, NULL);
+
+  if (proc_frame->return_vals)
+    {
+      if (gimp_value_array_length (proc_frame->return_vals) >=
+          proc_frame->procedure->num_values + 1)
+        {
+          return_vals = proc_frame->return_vals;
+        }
+      else
+        {
+          /* Allocate new return values of the correct size. */
+          return_vals = gimp_procedure_get_return_values (proc_frame->procedure,
+                                                          TRUE, NULL);
+
+          /* Copy all of the arguments we can. */
+          memcpy (gimp_value_array_index (return_vals, 0),
+                  gimp_value_array_index (proc_frame->return_vals, 0),
+                  sizeof (GValue) *
+                  gimp_value_array_length (proc_frame->return_vals));
+
+          /* Free the old arguments. */
+          memset (gimp_value_array_index (proc_frame->return_vals, 0), 0,
+                  sizeof (GValue) *
+                  gimp_value_array_length (proc_frame->return_vals));
+          gimp_value_array_unref (proc_frame->return_vals);
+        }
+
+      /* We have consumed any saved values, so clear them. */
+      proc_frame->return_vals = NULL;
+    }
+  else
+    {
+      GimpProcedure *procedure = proc_frame->procedure;
+      GError        *error;
+
+      error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_RETURN_VALUE,
+                           _("Procedure '%s' returned no return values"),
+                           gimp_object_get_name (procedure));
+
+      return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+                                                      error);
+      g_error_free (error);
+    }
+
+  return return_vals;
+}
diff --git a/app/plug-in/gimppluginprocframe.h b/app/plug-in/gimppluginprocframe.h
new file mode 100644
index 0000000..1f21b8e
--- /dev/null
+++ b/app/plug-in/gimppluginprocframe.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginprocframe.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_PROC_FRAME_H__
+#define __GIMP_PLUG_IN_PROC_FRAME_H__
+
+
+struct _GimpPlugInProcFrame
+{
+  gint                 ref_count;
+
+  GimpContext         *main_context;
+  GList               *context_stack;
+
+  GimpProcedure       *procedure;
+  GMainLoop           *main_loop;
+
+  GimpValueArray      *return_vals;
+
+  GimpProgress        *progress;
+  gboolean             progress_created;
+  gulong               progress_cancel_id;
+
+  GimpPDBErrorHandler  error_handler;
+
+  /*  lists of things to clean up on dispose  */
+  GList               *image_cleanups;
+  GList               *item_cleanups;
+};
+
+
+GimpPlugInProcFrame * gimp_plug_in_proc_frame_new     (GimpContext         *context,
+                                                       GimpProgress        *progress,
+                                                       GimpPlugInProcedure *procedure);
+void                  gimp_plug_in_proc_frame_init    (GimpPlugInProcFrame *proc_frame,
+                                                       GimpContext         *context,
+                                                       GimpProgress        *progress,
+                                                       GimpPlugInProcedure *procedure);
+
+void                  gimp_plug_in_proc_frame_dispose (GimpPlugInProcFrame *proc_frame,
+                                                       GimpPlugIn          *plug_in);
+
+GimpPlugInProcFrame * gimp_plug_in_proc_frame_ref     (GimpPlugInProcFrame *proc_frame);
+void                  gimp_plug_in_proc_frame_unref   (GimpPlugInProcFrame *proc_frame,
+                                                       GimpPlugIn          *plug_in);
+
+GimpValueArray      * gimp_plug_in_proc_frame_get_return_values
+                                                      (GimpPlugInProcFrame *proc_frame);
+
+
+#endif /* __GIMP_PLUG_IN_PROC_FRAME_H__ */
diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c
new file mode 100644
index 0000000..5e1e29c
--- /dev/null
+++ b/app/plug-in/gimppluginshm.c
@@ -0,0 +1,301 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginhsm.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+
+#include <errno.h>
+
+#if defined(USE_SYSV_SHM)
+
+#ifdef HAVE_IPC_H
+#include <sys/ipc.h>
+#endif
+
+#ifdef HAVE_SHM_H
+#include <sys/shm.h>
+#endif
+
+#elif defined(USE_POSIX_SHM)
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#endif /* USE_POSIX_SHM */
+
+#include <gio/gio.h>
+#include <gegl.h>
+
+#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
+
+#define STRICT
+#include <windows.h>
+#include <process.h>
+
+#ifdef G_OS_WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
+
+#define USE_WIN32_SHM 1
+
+#endif /* G_OS_WIN32 || G_WITH_CYGWIN */
+
+#include "plug-in-types.h"
+
+#include "core/gimp-utils.h"
+
+#include "gimppluginshm.h"
+
+#include "gimp-log.h"
+
+
+#define TILE_MAP_SIZE (GIMP_PLUG_IN_TILE_WIDTH * GIMP_PLUG_IN_TILE_HEIGHT * 32)
+
+#define ERRMSG_SHM_DISABLE "Disabling shared memory tile transport"
+
+
+struct _GimpPlugInShm
+{
+  gint    shm_ID;
+  guchar *shm_addr;
+
+#if defined(USE_WIN32_SHM)
+  HANDLE  shm_handle;
+#endif
+};
+
+
+GimpPlugInShm *
+gimp_plug_in_shm_new (void)
+{
+  /* allocate a piece of shared memory for use in transporting tiles
+   *  to plug-ins. if we can't allocate a piece of shared memory then
+   *  we'll fall back on sending the data over the pipe.
+   */
+
+  GimpPlugInShm *shm = g_slice_new0 (GimpPlugInShm);
+
+  shm->shm_ID = -1;
+
+#if defined(USE_SYSV_SHM)
+
+  /* Use SysV shared memory mechanisms for transferring tile data. */
+  {
+    shm->shm_ID = shmget (IPC_PRIVATE, TILE_MAP_SIZE, IPC_CREAT | 0600);
+
+    if (shm->shm_ID != -1)
+      {
+        shm->shm_addr = (guchar *) shmat (shm->shm_ID, NULL, 0);
+
+        if (shm->shm_addr == (guchar *) -1)
+          {
+            g_printerr ("shmat() failed: %s\n" ERRMSG_SHM_DISABLE,
+                        g_strerror (errno));
+            shmctl (shm->shm_ID, IPC_RMID, NULL);
+            shm->shm_ID = -1;
+          }
+
+#ifdef IPC_RMID_DEFERRED_RELEASE
+        if (shm->shm_addr != (guchar *) -1)
+          shmctl (shm->shm_ID, IPC_RMID, NULL);
+#endif
+      }
+    else
+      {
+        g_printerr ("shmget() failed: %s\n" ERRMSG_SHM_DISABLE,
+                    g_strerror (errno));
+      }
+  }
+
+#elif defined(USE_WIN32_SHM)
+
+  /* Use Win32 shared memory mechanisms for transferring tile data. */
+  {
+    gint  pid;
+    gchar fileMapName[MAX_PATH];
+
+    /* Our shared memory id will be our process ID */
+    pid = GetCurrentProcessId ();
+
+    /* From the id, derive the file map name */
+    g_snprintf (fileMapName, sizeof (fileMapName), "GIMP%d.SHM", pid);
+
+    /* Create the file mapping into paging space */
+    shm->shm_handle = CreateFileMapping (INVALID_HANDLE_VALUE, NULL,
+                                         PAGE_READWRITE, 0,
+                                         TILE_MAP_SIZE,
+                                         fileMapName);
+
+    if (shm->shm_handle)
+      {
+        /* Map the shared memory into our address space for use */
+        shm->shm_addr = (guchar *) MapViewOfFile (shm->shm_handle,
+                                                  FILE_MAP_ALL_ACCESS,
+                                                  0, 0, TILE_MAP_SIZE);
+
+        /* Verify that we mapped our view */
+        if (shm->shm_addr)
+          {
+            shm->shm_ID = pid;
+          }
+        else
+          {
+            g_printerr ("MapViewOfFile error: %u... " ERRMSG_SHM_DISABLE,
+                        (unsigned) GetLastError ());
+          }
+      }
+    else
+      {
+        g_printerr ("CreateFileMapping error: %u... " ERRMSG_SHM_DISABLE,
+                    (unsigned) GetLastError ());
+      }
+  }
+
+#elif defined(USE_POSIX_SHM)
+
+  /* Use POSIX shared memory mechanisms for transferring tile data. */
+  {
+    gint  pid;
+    gchar shm_handle[32];
+    gint  shm_fd;
+
+    /* Our shared memory id will be our process ID */
+    pid = gimp_get_pid ();
+
+    /* From the id, derive the file map name */
+    g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d", pid);
+
+    /* Create the file mapping into paging space */
+    shm_fd = shm_open (shm_handle, O_RDWR | O_CREAT, 0600);
+
+    if (shm_fd != -1)
+      {
+        if (ftruncate (shm_fd, TILE_MAP_SIZE) != -1)
+          {
+            /* Map the shared memory into our address space for use */
+            shm->shm_addr = (guchar *) mmap (NULL, TILE_MAP_SIZE,
+                                             PROT_READ | PROT_WRITE, MAP_SHARED,
+                                             shm_fd, 0);
+
+            /* Verify that we mapped our view */
+            if (shm->shm_addr != MAP_FAILED)
+              {
+                shm->shm_ID = pid;
+              }
+            else
+              {
+                g_printerr ("mmap() failed: %s\n" ERRMSG_SHM_DISABLE,
+                            g_strerror (errno));
+
+                shm_unlink (shm_handle);
+              }
+          }
+        else
+          {
+            g_printerr ("ftruncate() failed: %s\n" ERRMSG_SHM_DISABLE,
+                        g_strerror (errno));
+
+            shm_unlink (shm_handle);
+          }
+
+        close (shm_fd);
+      }
+    else
+      {
+        g_printerr ("shm_open() failed: %s\n" ERRMSG_SHM_DISABLE,
+                    g_strerror (errno));
+      }
+  }
+
+#endif
+
+  if (shm->shm_ID == -1)
+    {
+      g_slice_free (GimpPlugInShm, shm);
+      shm = NULL;
+    }
+  else
+    {
+      GIMP_LOG (SHM, "attached shared memory segment ID = %d", shm->shm_ID);
+    }
+
+  return shm;
+}
+
+void
+gimp_plug_in_shm_free (GimpPlugInShm *shm)
+{
+  g_return_if_fail (shm != NULL);
+
+  if (shm->shm_ID != -1)
+    {
+
+#if defined (USE_SYSV_SHM)
+
+      shmdt (shm->shm_addr);
+
+#ifndef IPC_RMID_DEFERRED_RELEASE
+      shmctl (shm->shm_ID, IPC_RMID, NULL);
+#endif
+
+#elif defined(USE_WIN32_SHM)
+
+      if (shm->shm_handle)
+        CloseHandle (shm->shm_handle);
+
+#elif defined(USE_POSIX_SHM)
+
+      gchar shm_handle[32];
+
+      munmap (shm->shm_addr, TILE_MAP_SIZE);
+
+      g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d",
+                  shm->shm_ID);
+
+      shm_unlink (shm_handle);
+
+#endif
+
+      GIMP_LOG (SHM, "detached shared memory segment ID = %d", shm->shm_ID);
+    }
+
+  g_slice_free (GimpPlugInShm, shm);
+}
+
+gint
+gimp_plug_in_shm_get_ID (GimpPlugInShm *shm)
+{
+  g_return_val_if_fail (shm != NULL, -1);
+
+  return shm->shm_ID;
+}
+
+guchar *
+gimp_plug_in_shm_get_addr (GimpPlugInShm *shm)
+{
+  g_return_val_if_fail (shm != NULL, NULL);
+
+  return shm->shm_addr;
+}
diff --git a/app/plug-in/gimppluginshm.h b/app/plug-in/gimppluginshm.h
new file mode 100644
index 0000000..ee89918
--- /dev/null
+++ b/app/plug-in/gimppluginshm.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginshm.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_SHM_H__
+#define __GIMP_PLUG_IN_SHM_H__
+
+
+GimpPlugInShm * gimp_plug_in_shm_new      (void);
+void            gimp_plug_in_shm_free     (GimpPlugInShm *shm);
+
+gint            gimp_plug_in_shm_get_ID   (GimpPlugInShm *shm);
+guchar        * gimp_plug_in_shm_get_addr (GimpPlugInShm *shm);
+
+
+#endif /* __GIMP_PLUG_IN_SHM_H__ */
diff --git a/app/plug-in/gimptemporaryprocedure.c b/app/plug-in/gimptemporaryprocedure.c
new file mode 100644
index 0000000..5b03d05
--- /dev/null
+++ b/app/plug-in/gimptemporaryprocedure.c
@@ -0,0 +1,156 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptemporaryprocedure.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+
+#include "gimpplugin.h"
+#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
+#include "gimppluginmanager-call.h"
+#include "gimptemporaryprocedure.h"
+
+#include "gimp-intl.h"
+
+
+static void             gimp_temporary_procedure_finalize (GObject        *object);
+
+static GimpValueArray * gimp_temporary_procedure_execute  (GimpProcedure  *procedure,
+                                                           Gimp           *gimp,
+                                                           GimpContext    *context,
+                                                           GimpProgress   *progress,
+                                                           GimpValueArray *args,
+                                                           GError        **error);
+static void        gimp_temporary_procedure_execute_async (GimpProcedure  *procedure,
+                                                           Gimp           *gimp,
+                                                           GimpContext    *context,
+                                                           GimpProgress   *progress,
+                                                           GimpValueArray *args,
+                                                           GimpObject     *display);
+
+static GFile     * gimp_temporary_procedure_get_file      (GimpPlugInProcedure *procedure);
+
+
+G_DEFINE_TYPE (GimpTemporaryProcedure, gimp_temporary_procedure,
+               GIMP_TYPE_PLUG_IN_PROCEDURE)
+
+#define parent_class gimp_temporary_procedure_parent_class
+
+
+static void
+gimp_temporary_procedure_class_init (GimpTemporaryProcedureClass *klass)
+{
+  GObjectClass             *object_class = G_OBJECT_CLASS (klass);
+  GimpProcedureClass       *proc_class   = GIMP_PROCEDURE_CLASS (klass);
+  GimpPlugInProcedureClass *plug_class   = GIMP_PLUG_IN_PROCEDURE_CLASS (klass);
+
+  object_class->finalize    = gimp_temporary_procedure_finalize;
+
+  proc_class->execute       = gimp_temporary_procedure_execute;
+  proc_class->execute_async = gimp_temporary_procedure_execute_async;
+
+  plug_class->get_file      = gimp_temporary_procedure_get_file;
+}
+
+static void
+gimp_temporary_procedure_init (GimpTemporaryProcedure *proc)
+{
+  GIMP_PROCEDURE (proc)->proc_type = GIMP_TEMPORARY;
+}
+
+static void
+gimp_temporary_procedure_finalize (GObject *object)
+{
+  /* GimpTemporaryProcedure *proc = GIMP_TEMPORARY_PROCEDURE (object); */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static GimpValueArray *
+gimp_temporary_procedure_execute (GimpProcedure   *procedure,
+                                  Gimp            *gimp,
+                                  GimpContext     *context,
+                                  GimpProgress    *progress,
+                                  GimpValueArray  *args,
+                                  GError         **error)
+{
+  return gimp_plug_in_manager_call_run_temp (gimp->plug_in_manager,
+                                             context, progress,
+                                             GIMP_TEMPORARY_PROCEDURE (procedure),
+                                             args);
+}
+
+static void
+gimp_temporary_procedure_execute_async (GimpProcedure  *procedure,
+                                        Gimp           *gimp,
+                                        GimpContext    *context,
+                                        GimpProgress   *progress,
+                                        GimpValueArray *args,
+                                        GimpObject     *display)
+{
+  GimpTemporaryProcedure *temp_procedure = GIMP_TEMPORARY_PROCEDURE (procedure);
+  GimpValueArray         *return_vals;
+
+  return_vals = gimp_plug_in_manager_call_run_temp (gimp->plug_in_manager,
+                                                    context, progress,
+                                                    temp_procedure,
+                                                    args);
+
+  if (return_vals)
+    {
+      GimpPlugInProcedure *proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+      gimp_plug_in_procedure_handle_return_values (proc,
+                                                   gimp, progress,
+                                                   return_vals);
+      gimp_value_array_unref (return_vals);
+    }
+}
+
+static GFile *
+gimp_temporary_procedure_get_file (GimpPlugInProcedure *procedure)
+{
+  return GIMP_TEMPORARY_PROCEDURE (procedure)->plug_in->file;
+}
+
+
+/*  public functions  */
+
+GimpProcedure *
+gimp_temporary_procedure_new (GimpPlugIn *plug_in)
+{
+  GimpTemporaryProcedure *proc;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
+
+  proc = g_object_new (GIMP_TYPE_TEMPORARY_PROCEDURE, NULL);
+
+  proc->plug_in = plug_in;
+
+  GIMP_PLUG_IN_PROCEDURE (proc)->file = g_file_new_for_path ("none");
+
+  return GIMP_PROCEDURE (proc);
+}
diff --git a/app/plug-in/gimptemporaryprocedure.h b/app/plug-in/gimptemporaryprocedure.h
new file mode 100644
index 0000000..3df53c8
--- /dev/null
+++ b/app/plug-in/gimptemporaryprocedure.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptemporaryprocedure.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEMPORARY_PROCEDURE_H__
+#define __GIMP_TEMPORARY_PROCEDURE_H__
+
+
+#include "gimppluginprocedure.h"
+
+
+#define GIMP_TYPE_TEMPORARY_PROCEDURE            (gimp_temporary_procedure_get_type ())
+#define GIMP_TEMPORARY_PROCEDURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPORARY_PROCEDURE, GimpTemporaryProcedure))
+#define GIMP_TEMPORARY_PROCEDURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPORARY_PROCEDURE, GimpTemporaryProcedureClass))
+#define GIMP_IS_TEMPORARY_PROCEDURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEMPORARY_PROCEDURE))
+#define GIMP_IS_TEMPORARY_PROCEDURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEMPORARY_PROCEDURE))
+#define GIMP_TEMPORARY_PROCEDURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEMPORARY_PROCEDURE, GimpTemporaryProcedureClass))
+
+
+typedef struct _GimpTemporaryProcedureClass GimpTemporaryProcedureClass;
+
+struct _GimpTemporaryProcedure
+{
+  GimpPlugInProcedure  parent_instance;
+
+  GimpPlugIn          *plug_in;
+};
+
+struct _GimpTemporaryProcedureClass
+{
+  GimpPlugInProcedureClass parent_class;
+};
+
+
+GType           gimp_temporary_procedure_get_type (void) G_GNUC_CONST;
+
+GimpProcedure * gimp_temporary_procedure_new      (GimpPlugIn *plug_in);
+
+
+#endif /* __GIMP_TEMPORARY_PROCEDURE_H__ */
diff --git a/app/plug-in/plug-in-enums.c b/app/plug-in/plug-in-enums.c
new file mode 100644
index 0000000..4f062bb
--- /dev/null
+++ b/app/plug-in/plug-in-enums.c
@@ -0,0 +1,118 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "plug-in-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "plug-in-enums.h" */
+GType
+gimp_plug_in_image_type_get_type (void)
+{
+  static const GFlagsValue values[] =
+  {
+    { GIMP_PLUG_IN_RGB_IMAGE, "GIMP_PLUG_IN_RGB_IMAGE", "rgb-image" },
+    { GIMP_PLUG_IN_GRAY_IMAGE, "GIMP_PLUG_IN_GRAY_IMAGE", "gray-image" },
+    { GIMP_PLUG_IN_INDEXED_IMAGE, "GIMP_PLUG_IN_INDEXED_IMAGE", "indexed-image" },
+    { GIMP_PLUG_IN_RGBA_IMAGE, "GIMP_PLUG_IN_RGBA_IMAGE", "rgba-image" },
+    { GIMP_PLUG_IN_GRAYA_IMAGE, "GIMP_PLUG_IN_GRAYA_IMAGE", "graya-image" },
+    { GIMP_PLUG_IN_INDEXEDA_IMAGE, "GIMP_PLUG_IN_INDEXEDA_IMAGE", "indexeda-image" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpFlagsDesc descs[] =
+  {
+    { GIMP_PLUG_IN_RGB_IMAGE, "GIMP_PLUG_IN_RGB_IMAGE", NULL },
+    { GIMP_PLUG_IN_GRAY_IMAGE, "GIMP_PLUG_IN_GRAY_IMAGE", NULL },
+    { GIMP_PLUG_IN_INDEXED_IMAGE, "GIMP_PLUG_IN_INDEXED_IMAGE", NULL },
+    { GIMP_PLUG_IN_RGBA_IMAGE, "GIMP_PLUG_IN_RGBA_IMAGE", NULL },
+    { GIMP_PLUG_IN_GRAYA_IMAGE, "GIMP_PLUG_IN_GRAYA_IMAGE", NULL },
+    { GIMP_PLUG_IN_INDEXEDA_IMAGE, "GIMP_PLUG_IN_INDEXEDA_IMAGE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_flags_register_static ("GimpPlugInImageType", values);
+      gimp_type_set_translation_context (type, "plug-in-image-type");
+      gimp_flags_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_plug_in_call_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_PLUG_IN_CALL_NONE, "GIMP_PLUG_IN_CALL_NONE", "none" },
+    { GIMP_PLUG_IN_CALL_RUN, "GIMP_PLUG_IN_CALL_RUN", "run" },
+    { GIMP_PLUG_IN_CALL_QUERY, "GIMP_PLUG_IN_CALL_QUERY", "query" },
+    { GIMP_PLUG_IN_CALL_INIT, "GIMP_PLUG_IN_CALL_INIT", "init" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_PLUG_IN_CALL_NONE, "GIMP_PLUG_IN_CALL_NONE", NULL },
+    { GIMP_PLUG_IN_CALL_RUN, "GIMP_PLUG_IN_CALL_RUN", NULL },
+    { GIMP_PLUG_IN_CALL_QUERY, "GIMP_PLUG_IN_CALL_QUERY", NULL },
+    { GIMP_PLUG_IN_CALL_INIT, "GIMP_PLUG_IN_CALL_INIT", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpPlugInCallMode", values);
+      gimp_type_set_translation_context (type, "plug-in-call-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_file_procedure_group_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_FILE_PROCEDURE_GROUP_NONE, "GIMP_FILE_PROCEDURE_GROUP_NONE", "none" },
+    { GIMP_FILE_PROCEDURE_GROUP_ANY, "GIMP_FILE_PROCEDURE_GROUP_ANY", "any" },
+    { GIMP_FILE_PROCEDURE_GROUP_OPEN, "GIMP_FILE_PROCEDURE_GROUP_OPEN", "open" },
+    { GIMP_FILE_PROCEDURE_GROUP_SAVE, "GIMP_FILE_PROCEDURE_GROUP_SAVE", "save" },
+    { GIMP_FILE_PROCEDURE_GROUP_EXPORT, "GIMP_FILE_PROCEDURE_GROUP_EXPORT", "export" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_FILE_PROCEDURE_GROUP_NONE, "GIMP_FILE_PROCEDURE_GROUP_NONE", NULL },
+    { GIMP_FILE_PROCEDURE_GROUP_ANY, "GIMP_FILE_PROCEDURE_GROUP_ANY", NULL },
+    { GIMP_FILE_PROCEDURE_GROUP_OPEN, "GIMP_FILE_PROCEDURE_GROUP_OPEN", NULL },
+    { GIMP_FILE_PROCEDURE_GROUP_SAVE, "GIMP_FILE_PROCEDURE_GROUP_SAVE", NULL },
+    { GIMP_FILE_PROCEDURE_GROUP_EXPORT, "GIMP_FILE_PROCEDURE_GROUP_EXPORT", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpFileProcedureGroup", values);
+      gimp_type_set_translation_context (type, "file-procedure-group");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/plug-in/plug-in-enums.h b/app/plug-in/plug-in-enums.h
new file mode 100644
index 0000000..c5b6775
--- /dev/null
+++ b/app/plug-in/plug-in-enums.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_ENUMS_H__
+#define __PLUG_IN_ENUMS_H__
+
+
+#define GIMP_TYPE_PLUG_IN_IMAGE_TYPE (gimp_plug_in_image_type_get_type ())
+
+GType gimp_plug_in_image_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_PLUG_IN_RGB_IMAGE      = 1 << 0,
+  GIMP_PLUG_IN_GRAY_IMAGE     = 1 << 1,
+  GIMP_PLUG_IN_INDEXED_IMAGE  = 1 << 2,
+  GIMP_PLUG_IN_RGBA_IMAGE     = 1 << 3,
+  GIMP_PLUG_IN_GRAYA_IMAGE    = 1 << 4,
+  GIMP_PLUG_IN_INDEXEDA_IMAGE = 1 << 5
+} GimpPlugInImageType;
+
+
+#define GIMP_TYPE_PLUG_CALL_MODE (gimp_plug_in_call_mode_get_type ())
+
+GType gimp_plug_in_call_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_PLUG_IN_CALL_NONE,
+  GIMP_PLUG_IN_CALL_RUN,
+  GIMP_PLUG_IN_CALL_QUERY,
+  GIMP_PLUG_IN_CALL_INIT
+} GimpPlugInCallMode;
+
+
+#define GIMP_TYPE_FILE_PROCEDURE_GROUP (gimp_file_procedure_group_get_type ())
+
+GType gimp_file_procedure_group_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_FILE_PROCEDURE_GROUP_NONE,
+  GIMP_FILE_PROCEDURE_GROUP_ANY,
+  GIMP_FILE_PROCEDURE_GROUP_OPEN,
+  GIMP_FILE_PROCEDURE_GROUP_SAVE,
+  GIMP_FILE_PROCEDURE_GROUP_EXPORT
+} GimpFileProcedureGroup;
+
+
+#endif /* __PLUG_IN_ENUMS_H__ */
diff --git a/app/plug-in/plug-in-menu-path.c b/app/plug-in/plug-in-menu-path.c
new file mode 100644
index 0000000..fa6fa16
--- /dev/null
+++ b/app/plug-in/plug-in-menu-path.c
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * plug-in-menu-path.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "plug-in-types.h"
+
+#include "plug-in-menu-path.h"
+
+
+typedef struct _MenuPathMapping MenuPathMapping;
+
+struct _MenuPathMapping
+{
+  const gchar *orig_path;
+  const gchar *label;
+  const gchar *mapped_path;
+};
+
+
+static const MenuPathMapping menu_path_mappings[] =
+{
+  { "<Toolbox>/Xtns/Languages",       NULL, "<Image>/Filters/Languages"           },
+  { "<Toolbox>/Xtns/Extensions",      NULL, "<Image>/Filters/Extensions"          },
+
+  { "<Toolbox>/Xtns/Buttons",         NULL, "<Image>/File/Create/Buttons"         },
+  { "<Toolbox>/Xtns/Logos",           NULL, "<Image>/File/Create/Logos"           },
+  { "<Toolbox>/Xtns/Misc",            NULL, "<Image>/File/Create/Misc"            },
+  { "<Toolbox>/Xtns/Patterns",        NULL, "<Image>/File/Create/Patterns"        },
+  { "<Toolbox>/Xtns/Web Page Themes", NULL, "<Image>/File/Create/Web Page Themes" },
+
+  { "<Toolbox>/Xtns", "Buttons",            "<Image>/File/Create"                 },
+  { "<Toolbox>/Xtns", "Logos",              "<Image>/File/Create"                 },
+  { "<Toolbox>/Xtns", "Misc",               "<Image>/File/Create"                 },
+  { "<Toolbox>/Xtns", "Patterns",           "<Image>/File/Create"                 },
+  { "<Toolbox>/Xtns", "Web Page Themes",    "<Image>/File/Create"                 },
+
+  { "<Toolbox>/Xtns",                 NULL, "<Image>/Filters/Extensions"          },
+  { "<Toolbox>/Help",                 NULL, "<Image>/Help"                        },
+
+  { "<Toolbox>/File/Acquire",           NULL, "<Image>/File/Create/Acquire"       },
+  { "<Toolbox>",                        NULL, "<Image>"                           },
+  { "<Image>/File/Acquire",             NULL, "<Image>/File/Create/Acquire"       },
+  { "<Image>/File/New",                 NULL, "<Image>/File/Create"               },
+  { "<Image>/Image/Mode/Color Profile", NULL, "<Image>/Image/Color Management"    },
+  { NULL, NULL, NULL }
+};
+
+
+gchar *
+plug_in_menu_path_map (const gchar *menu_path,
+                       const gchar *menu_label)
+{
+  const MenuPathMapping *mapping;
+  gchar                 *stripped_label = NULL;
+
+  g_return_val_if_fail (menu_path != NULL, NULL);
+
+  if (menu_label)
+    stripped_label = gimp_strip_uline (menu_label);
+
+  for (mapping = menu_path_mappings; mapping->orig_path; mapping++)
+    {
+      if (g_str_has_prefix (menu_path, mapping->orig_path))
+        {
+          gint   orig_len = strlen (mapping->orig_path);
+          gchar *mapped_path;
+
+          /*  if the mapping has a label, only map if the passed label
+           *  is identical and the paths' lengths match exactly.
+           */
+          if (mapping->label &&
+              (! stripped_label               ||
+               strlen (menu_path) != orig_len ||
+               strcmp (mapping->label, stripped_label)))
+            {
+              continue;
+            }
+
+          if (strlen (menu_path) > orig_len)
+            mapped_path = g_strconcat (mapping->mapped_path,
+                                       menu_path + orig_len,
+                                       NULL);
+          else
+            mapped_path = g_strdup (mapping->mapped_path);
+
+#if GIMP_UNSTABLE
+          {
+            gchar *orig;
+            gchar *mapped;
+
+            if (menu_label)
+              {
+                orig   = g_strdup_printf ("%s/%s", menu_path,   stripped_label);
+                mapped = g_strdup_printf ("%s/%s", mapped_path, stripped_label);
+              }
+            else
+              {
+                orig   = g_strdup (menu_path);
+                mapped = g_strdup (mapped_path);
+              }
+
+            g_printerr (" mapped '%s' to '%s'\n", orig, mapped);
+
+            g_free (orig);
+            g_free (mapped);
+          }
+#endif
+
+          g_free (stripped_label);
+
+          return mapped_path;
+        }
+    }
+
+  g_free (stripped_label);
+
+  return g_strdup (menu_path);
+}
diff --git a/app/plug-in/plug-in-menu-path.h b/app/plug-in/plug-in-menu-path.h
new file mode 100644
index 0000000..b222c06
--- /dev/null
+++ b/app/plug-in/plug-in-menu-path.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * plug-in-menu-path.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_MENU_PATH_H__
+#define __PLUG_IN_MENU_PATH_H__
+
+
+gchar * plug_in_menu_path_map (const gchar *menu_path,
+                               const gchar *menu_label);
+
+
+#endif /* __PLUG_IN_MENU_PATH_H__ */
diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c
new file mode 100644
index 0000000..3f781b2
--- /dev/null
+++ b/app/plug-in/plug-in-params.c
@@ -0,0 +1,442 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpprotocol.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "plug-in-types.h"
+
+#include "core/gimpparamspecs.h"
+
+#include "pdb/gimp-pdb-compat.h"
+
+#include "plug-in-params.h"
+
+
+GimpValueArray *
+plug_in_params_to_args (GParamSpec **pspecs,
+                        gint         n_pspecs,
+                        GPParam     *params,
+                        gint         n_params,
+                        gboolean     return_values,
+                        gboolean     full_copy)
+{
+  GimpValueArray *args;
+  gint            i;
+
+  g_return_val_if_fail ((pspecs != NULL && n_pspecs  > 0) ||
+                        (pspecs == NULL && n_pspecs == 0), NULL);
+  g_return_val_if_fail ((params != NULL && n_params  > 0) ||
+                        (params == NULL && n_params == 0), NULL);
+
+  args = gimp_value_array_new (n_params);
+
+  for (i = 0; i < n_params; i++)
+    {
+      GValue value = G_VALUE_INIT;
+      GType  type;
+      gint   count;
+
+      /*  first get the fallback compat GType that matches the pdb type  */
+      type = gimp_pdb_compat_arg_type_to_gtype (params[i].type);
+
+      /*  then try to try to be more specific by looking at the param
+       *  spec (return values have one additional value (the status),
+       *  skip that, it's not in the array of param specs)
+       */
+      if (i > 0 || ! return_values)
+        {
+          gint pspec_index = i;
+
+          if (return_values)
+            pspec_index--;
+
+          /*  are there param specs left?  */
+          if (pspec_index < n_pspecs)
+            {
+              GType          pspec_gtype;
+              GimpPDBArgType pspec_arg_type;
+
+              pspec_gtype    = G_PARAM_SPEC_VALUE_TYPE (pspecs[pspec_index]);
+              pspec_arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec_gtype);
+
+              /*  if the param spec's GType, mapped to a pdb type, matches
+               *  the passed pdb type, use the param spec's GType
+               */
+              if (pspec_arg_type == params[i].type)
+                type = pspec_gtype;
+            }
+        }
+
+      g_value_init (&value, type);
+
+      switch (gimp_pdb_compat_arg_type_from_gtype (type))
+        {
+        case GIMP_PDB_INT32:
+          if (G_VALUE_HOLDS_INT (&value))
+            g_value_set_int (&value, params[i].data.d_int32);
+          else if (G_VALUE_HOLDS_UINT (&value))
+            g_value_set_uint (&value, params[i].data.d_int32);
+          else if (G_VALUE_HOLDS_ENUM (&value))
+            g_value_set_enum (&value, params[i].data.d_int32);
+          else if (G_VALUE_HOLDS_BOOLEAN (&value))
+            g_value_set_boolean (&value, params[i].data.d_int32 ? TRUE : FALSE);
+          else
+            {
+              g_printerr ("%s: unhandled GIMP_PDB_INT32 type: %s\n",
+                          G_STRFUNC, g_type_name (G_VALUE_TYPE (&value)));
+              g_return_val_if_reached (args);
+            }
+          break;
+
+        case GIMP_PDB_INT16:
+          g_value_set_int (&value, params[i].data.d_int16);
+          break;
+
+        case GIMP_PDB_INT8:
+          g_value_set_uint (&value, params[i].data.d_int8);
+          break;
+
+        case GIMP_PDB_FLOAT:
+          g_value_set_double (&value, params[i].data.d_float);
+          break;
+
+        case GIMP_PDB_STRING:
+          if (full_copy)
+            g_value_set_string (&value, params[i].data.d_string);
+          else
+            g_value_set_static_string (&value, params[i].data.d_string);
+          break;
+
+        case GIMP_PDB_INT32ARRAY:
+          count = g_value_get_int (gimp_value_array_index (args, i - 1));
+          if (full_copy)
+            gimp_value_set_int32array (&value,
+                                       params[i].data.d_int32array,
+                                       count);
+          else
+            gimp_value_set_static_int32array (&value,
+                                              params[i].data.d_int32array,
+                                              count);
+          break;
+
+        case GIMP_PDB_INT16ARRAY:
+          count = g_value_get_int (gimp_value_array_index (args, i - 1));
+          if (full_copy)
+            gimp_value_set_int16array (&value,
+                                       params[i].data.d_int16array,
+                                       count);
+          else
+            gimp_value_set_static_int16array (&value,
+                                              params[i].data.d_int16array,
+                                              count);
+          break;
+
+        case GIMP_PDB_INT8ARRAY:
+          count = g_value_get_int (gimp_value_array_index (args, i - 1));
+          if (full_copy)
+            gimp_value_set_int8array (&value,
+                                      params[i].data.d_int8array,
+                                      count);
+          else
+            gimp_value_set_static_int8array (&value,
+                                             params[i].data.d_int8array,
+                                             count);
+          break;
+
+        case GIMP_PDB_FLOATARRAY:
+          count = g_value_get_int (gimp_value_array_index (args, i - 1));
+          if (full_copy)
+            gimp_value_set_floatarray (&value,
+                                       params[i].data.d_floatarray,
+                                       count);
+          else
+            gimp_value_set_static_floatarray (&value,
+                                              params[i].data.d_floatarray,
+                                              count);
+          break;
+
+        case GIMP_PDB_STRINGARRAY:
+          count = g_value_get_int (gimp_value_array_index (args, i - 1));
+          if (full_copy)
+            gimp_value_set_stringarray (&value,
+                                        (const gchar **) params[i].data.d_stringarray,
+                                        count);
+          else
+            gimp_value_set_static_stringarray (&value,
+                                               (const gchar **) params[i].data.d_stringarray,
+                                               count);
+          break;
+
+        case GIMP_PDB_COLOR:
+          gimp_value_set_rgb (&value, &params[i].data.d_color);
+          break;
+
+        case GIMP_PDB_ITEM:
+          g_value_set_int (&value, params[i].data.d_item);
+          break;
+
+        case GIMP_PDB_DISPLAY:
+          g_value_set_int (&value, params[i].data.d_display);
+          break;
+
+        case GIMP_PDB_IMAGE:
+          g_value_set_int (&value, params[i].data.d_image);
+          break;
+
+        case GIMP_PDB_LAYER:
+          g_value_set_int (&value, params[i].data.d_layer);
+          break;
+
+        case GIMP_PDB_CHANNEL:
+          g_value_set_int (&value, params[i].data.d_channel);
+          break;
+
+        case GIMP_PDB_DRAWABLE:
+          g_value_set_int (&value, params[i].data.d_drawable);
+          break;
+
+        case GIMP_PDB_SELECTION:
+          g_value_set_int (&value, params[i].data.d_selection);
+          break;
+
+        case GIMP_PDB_COLORARRAY:
+          count = g_value_get_int (gimp_value_array_index (args, i - 1));
+          if (full_copy)
+            gimp_value_set_colorarray (&value,
+                                      params[i].data.d_colorarray,
+                                      count);
+          else
+            gimp_value_set_static_colorarray (&value,
+                                             params[i].data.d_colorarray,
+                                             count);
+          break;
+
+        case GIMP_PDB_VECTORS:
+          g_value_set_int (&value, params[i].data.d_vectors);
+          break;
+
+        case GIMP_PDB_PARASITE:
+          if (full_copy)
+            g_value_set_boxed (&value, &params[i].data.d_parasite);
+          else
+            g_value_set_static_boxed (&value, &params[i].data.d_parasite);
+          break;
+
+        case GIMP_PDB_STATUS:
+          g_value_set_enum (&value, params[i].data.d_status);
+          break;
+
+        case GIMP_PDB_END:
+          break;
+        }
+
+      gimp_value_array_append (args, &value);
+      g_value_unset (&value);
+    }
+
+  return args;
+}
+
+GPParam *
+plug_in_args_to_params (GimpValueArray *args,
+                        gboolean        full_copy)
+{
+  GPParam *params;
+  gint     length;
+  gint     i;
+
+  g_return_val_if_fail (args != NULL, NULL);
+
+  params = g_new0 (GPParam, gimp_value_array_length (args));
+
+  length = gimp_value_array_length (args);
+
+  for (i = 0; i < length; i++)
+    {
+      GValue *value = gimp_value_array_index (args, i);
+
+      params[i].type =
+        gimp_pdb_compat_arg_type_from_gtype (G_VALUE_TYPE (value));
+
+      switch (params[i].type)
+        {
+        case GIMP_PDB_INT32:
+          if (G_VALUE_HOLDS_INT (value))
+            params[i].data.d_int32 = g_value_get_int (value);
+          else if (G_VALUE_HOLDS_UINT (value))
+            params[i].data.d_int32 = g_value_get_uint (value);
+          else if (G_VALUE_HOLDS_ENUM (value))
+            params[i].data.d_int32 = g_value_get_enum (value);
+          else if (G_VALUE_HOLDS_BOOLEAN (value))
+            params[i].data.d_int32 = g_value_get_boolean (value);
+          else
+            {
+              g_printerr ("%s: unhandled GIMP_PDB_INT32 type: %s\n",
+                          G_STRFUNC, g_type_name (G_VALUE_TYPE (value)));
+              g_return_val_if_reached (params);
+            }
+          break;
+
+        case GIMP_PDB_INT16:
+          params[i].data.d_int16 = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_INT8:
+          params[i].data.d_int8 = g_value_get_uint (value);
+          break;
+
+        case GIMP_PDB_FLOAT:
+          params[i].data.d_float = g_value_get_double (value);
+          break;
+
+        case GIMP_PDB_STRING:
+          if (full_copy)
+            params[i].data.d_string = g_value_dup_string (value);
+          else
+            params[i].data.d_string = (gchar *) g_value_get_string (value);
+          break;
+
+        case GIMP_PDB_INT32ARRAY:
+          if (full_copy)
+            params[i].data.d_int32array = gimp_value_dup_int32array (value);
+          else
+            params[i].data.d_int32array = (gint32 *) gimp_value_get_int32array (value);
+          break;
+
+        case GIMP_PDB_INT16ARRAY:
+          if (full_copy)
+            params[i].data.d_int16array = gimp_value_dup_int16array (value);
+          else
+            params[i].data.d_int16array = (gint16 *) gimp_value_get_int16array (value);
+          break;
+
+        case GIMP_PDB_INT8ARRAY:
+          if (full_copy)
+            params[i].data.d_int8array = gimp_value_dup_int8array (value);
+          else
+            params[i].data.d_int8array = (guint8 *) gimp_value_get_int8array (value);
+          break;
+
+        case GIMP_PDB_FLOATARRAY:
+          if (full_copy)
+            params[i].data.d_floatarray = gimp_value_dup_floatarray (value);
+          else
+            params[i].data.d_floatarray = (gdouble *) gimp_value_get_floatarray (value);
+          break;
+
+        case GIMP_PDB_STRINGARRAY:
+          if (full_copy)
+            params[i].data.d_stringarray = gimp_value_dup_stringarray (value);
+          else
+            params[i].data.d_stringarray = (gchar **) gimp_value_get_stringarray (value);
+          break;
+
+        case GIMP_PDB_COLOR:
+          gimp_value_get_rgb (value, &params[i].data.d_color);
+          break;
+
+        case GIMP_PDB_ITEM:
+          params[i].data.d_item = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_DISPLAY:
+          params[i].data.d_display = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_IMAGE:
+          params[i].data.d_image = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_LAYER:
+          params[i].data.d_layer = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_CHANNEL:
+          params[i].data.d_channel = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_DRAWABLE:
+          params[i].data.d_drawable = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_SELECTION:
+          params[i].data.d_selection = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_COLORARRAY:
+          if (full_copy)
+            params[i].data.d_colorarray = gimp_value_dup_colorarray (value);
+          else
+            params[i].data.d_colorarray = (GimpRGB *) gimp_value_get_colorarray (value);
+          break;
+
+        case GIMP_PDB_VECTORS:
+          params[i].data.d_vectors = g_value_get_int (value);
+          break;
+
+        case GIMP_PDB_PARASITE:
+          {
+            GimpParasite *parasite = (full_copy ?
+                                      g_value_dup_boxed (value) :
+                                      g_value_get_boxed (value));
+
+            if (parasite)
+              {
+                params[i].data.d_parasite.name  = parasite->name;
+                params[i].data.d_parasite.flags = parasite->flags;
+                params[i].data.d_parasite.size  = parasite->size;
+                params[i].data.d_parasite.data  = parasite->data;
+
+                if (full_copy)
+                  {
+                    parasite->name  = NULL;
+                    parasite->flags = 0;
+                    parasite->size  = 0;
+                    parasite->data  = NULL;
+
+                    gimp_parasite_free (parasite);
+                  }
+              }
+            else
+              {
+                params[i].data.d_parasite.name  = NULL;
+                params[i].data.d_parasite.flags = 0;
+                params[i].data.d_parasite.size  = 0;
+                params[i].data.d_parasite.data  = NULL;
+              }
+          }
+          break;
+
+        case GIMP_PDB_STATUS:
+          params[i].data.d_status = g_value_get_enum (value);
+          break;
+
+        case GIMP_PDB_END:
+          break;
+        }
+    }
+
+  return params;
+}
diff --git a/app/plug-in/plug-in-params.h b/app/plug-in/plug-in-params.h
new file mode 100644
index 0000000..0b8df27
--- /dev/null
+++ b/app/plug-in/plug-in-params.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_PARAMS_H__
+#define __PLUG_IN_PARAMS_H__
+
+
+GimpValueArray * plug_in_params_to_args (GParamSpec     **pspecs,
+                                         gint             n_pspecs,
+                                         GPParam         *params,
+                                         gint             n_params,
+                                         gboolean         return_values,
+                                         gboolean         full_copy);
+GPParam     * plug_in_args_to_params    (GimpValueArray  *args,
+                                         gboolean         full_copy);
+
+
+#endif /* __PLUG_IN_PARAMS_H__ */
diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c
new file mode 100644
index 0000000..42cfe3d
--- /dev/null
+++ b/app/plug-in/plug-in-rc.c
@@ -0,0 +1,1137 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * plug-in-rc.c
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpbase/gimpprotocol.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "plug-in-types.h"
+
+#include "core/gimp.h"
+
+#include "pdb/gimp-pdb-compat.h"
+
+#include "gimpplugindef.h"
+#include "gimppluginprocedure.h"
+#include "plug-in-rc.h"
+
+#include "gimp-intl.h"
+
+
+#define PLUG_IN_RC_FILE_VERSION 5
+
+
+/*
+ *  All deserialize functions return G_TOKEN_LEFT_PAREN on success,
+ *  or the GTokenType they would have expected but didn't get,
+ *  or G_TOKEN_ERROR if the function already set an error itself.
+ */
+
+static GTokenType plug_in_def_deserialize        (Gimp                 *gimp,
+                                                  GScanner             *scanner,
+                                                  GSList              **plug_in_defs);
+static GTokenType plug_in_procedure_deserialize  (GScanner             *scanner,
+                                                  Gimp                 *gimp,
+                                                  GFile                *file,
+                                                  GimpPlugInProcedure **proc);
+static GTokenType plug_in_menu_path_deserialize  (GScanner             *scanner,
+                                                  GimpPlugInProcedure  *proc);
+static GTokenType plug_in_icon_deserialize       (GScanner             *scanner,
+                                                  GimpPlugInProcedure  *proc);
+static GTokenType plug_in_file_proc_deserialize  (GScanner             *scanner,
+                                                  GimpPlugInProcedure  *proc);
+static GTokenType plug_in_proc_arg_deserialize   (GScanner             *scanner,
+                                                  Gimp                 *gimp,
+                                                  GimpProcedure        *procedure,
+                                                  gboolean              return_value);
+static GTokenType plug_in_locale_def_deserialize (GScanner             *scanner,
+                                                  GimpPlugInDef        *plug_in_def);
+static GTokenType plug_in_help_def_deserialize   (GScanner             *scanner,
+                                                  GimpPlugInDef        *plug_in_def);
+static GTokenType plug_in_has_init_deserialize   (GScanner             *scanner,
+                                                  GimpPlugInDef        *plug_in_def);
+
+
+enum
+{
+  PROTOCOL_VERSION = 1,
+  FILE_VERSION,
+  PLUG_IN_DEF,
+  PROC_DEF,
+  LOCALE_DEF,
+  HELP_DEF,
+  HAS_INIT,
+  PROC_ARG,
+  MENU_PATH,
+  ICON,
+  LOAD_PROC,
+  SAVE_PROC,
+  EXTENSIONS,
+  PREFIXES,
+  MAGICS,
+  PRIORITY,
+  MIME_TYPES,
+  HANDLES_URI,
+  HANDLES_RAW,
+  THUMB_LOADER
+};
+
+
+GSList *
+plug_in_rc_parse (Gimp    *gimp,
+                  GFile   *file,
+                  GError **error)
+{
+  GScanner   *scanner;
+  GEnumClass *enum_class;
+  GSList     *plug_in_defs     = NULL;
+  gint        protocol_version = GIMP_PROTOCOL_VERSION;
+  gint        file_version     = PLUG_IN_RC_FILE_VERSION;
+  GTokenType  token;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  scanner = gimp_scanner_new_gfile (file, error);
+
+  if (! scanner)
+    return NULL;
+
+  enum_class = g_type_class_ref (GIMP_TYPE_ICON_TYPE);
+
+  g_scanner_scope_add_symbol (scanner, 0,
+                              "protocol-version",
+                              GINT_TO_POINTER (PROTOCOL_VERSION));
+  g_scanner_scope_add_symbol (scanner, 0,
+                              "file-version",
+                              GINT_TO_POINTER (FILE_VERSION));
+  g_scanner_scope_add_symbol (scanner, 0,
+                              "plug-in-def", GINT_TO_POINTER (PLUG_IN_DEF));
+
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "proc-def", GINT_TO_POINTER (PROC_DEF));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "locale-def", GINT_TO_POINTER (LOCALE_DEF));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "help-def", GINT_TO_POINTER (HELP_DEF));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "has-init", GINT_TO_POINTER (HAS_INIT));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "proc-arg", GINT_TO_POINTER (PROC_ARG));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "menu-path", GINT_TO_POINTER (MENU_PATH));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "icon", GINT_TO_POINTER (ICON));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "load-proc", GINT_TO_POINTER (LOAD_PROC));
+  g_scanner_scope_add_symbol (scanner, PLUG_IN_DEF,
+                              "save-proc", GINT_TO_POINTER (SAVE_PROC));
+
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "extensions", GINT_TO_POINTER (EXTENSIONS));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "prefixes", GINT_TO_POINTER (PREFIXES));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "magics", GINT_TO_POINTER (MAGICS));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "priority", GINT_TO_POINTER (PRIORITY));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "mime-types", GINT_TO_POINTER (MIME_TYPES));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "handles-uri", GINT_TO_POINTER (HANDLES_URI));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "handles-raw", GINT_TO_POINTER (HANDLES_RAW));
+  g_scanner_scope_add_symbol (scanner, LOAD_PROC,
+                              "thumb-loader", GINT_TO_POINTER (THUMB_LOADER));
+
+  g_scanner_scope_add_symbol (scanner, SAVE_PROC,
+                              "extensions", GINT_TO_POINTER (EXTENSIONS));
+  g_scanner_scope_add_symbol (scanner, SAVE_PROC,
+                              "prefixes", GINT_TO_POINTER (PREFIXES));
+  g_scanner_scope_add_symbol (scanner, SAVE_PROC,
+                              "priority", GINT_TO_POINTER (PRIORITY));
+  g_scanner_scope_add_symbol (scanner, SAVE_PROC,
+                              "mime-types", GINT_TO_POINTER (MIME_TYPES));
+  g_scanner_scope_add_symbol (scanner, SAVE_PROC,
+                              "handles-uri", GINT_TO_POINTER (HANDLES_URI));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (protocol_version == GIMP_PROTOCOL_VERSION   &&
+         file_version     == PLUG_IN_RC_FILE_VERSION &&
+         g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+            case PROTOCOL_VERSION:
+              token = G_TOKEN_INT;
+              if (gimp_scanner_parse_int (scanner, &protocol_version))
+                token = G_TOKEN_RIGHT_PAREN;
+              break;
+
+            case FILE_VERSION:
+              token = G_TOKEN_INT;
+              if (gimp_scanner_parse_int (scanner, &file_version))
+                token = G_TOKEN_RIGHT_PAREN;
+              break;
+
+            case PLUG_IN_DEF:
+              g_scanner_set_scope (scanner, PLUG_IN_DEF);
+              token = plug_in_def_deserialize (gimp, scanner, &plug_in_defs);
+              g_scanner_set_scope (scanner, 0);
+              break;
+            default:
+              break;
+            }
+              break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+  if (protocol_version != GIMP_PROTOCOL_VERSION   ||
+      file_version     != PLUG_IN_RC_FILE_VERSION ||
+      token            != G_TOKEN_LEFT_PAREN)
+    {
+      if (protocol_version != GIMP_PROTOCOL_VERSION)
+        {
+          g_set_error (error,
+                       GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_VERSION,
+                       _("Skipping '%s': wrong GIMP protocol version."),
+                       gimp_file_get_utf8_name (file));
+        }
+      else if (file_version != PLUG_IN_RC_FILE_VERSION)
+        {
+          g_set_error (error,
+                       GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_VERSION,
+                       _("Skipping '%s': wrong pluginrc file format version."),
+                       gimp_file_get_utf8_name (file));
+        }
+      else if (token != G_TOKEN_ERROR)
+        {
+          g_scanner_get_next_token (scanner);
+          g_scanner_unexp_token (scanner, token, NULL, NULL, NULL,
+                                 _("fatal parse error"), TRUE);
+        }
+
+      g_slist_free_full (plug_in_defs, (GDestroyNotify) g_object_unref);
+      plug_in_defs = NULL;
+    }
+
+  g_type_class_unref (enum_class);
+
+  gimp_scanner_destroy (scanner);
+
+  return g_slist_reverse (plug_in_defs);
+}
+
+static GTokenType
+plug_in_def_deserialize (Gimp      *gimp,
+                         GScanner  *scanner,
+                         GSList   **plug_in_defs)
+{
+  GimpPlugInDef       *plug_in_def;
+  GimpPlugInProcedure *proc = NULL;
+  gchar               *path;
+  GFile               *file;
+  gint64               mtime;
+  GTokenType           token;
+  GError              *error = NULL;
+
+  if (! gimp_scanner_parse_string (scanner, &path))
+    return G_TOKEN_STRING;
+
+  if (! (path && *path))
+    {
+      g_scanner_error (scanner, "plug-in filename is empty");
+      return G_TOKEN_ERROR;
+    }
+
+  file = gimp_file_new_for_config_path (path, &error);
+  g_free (path);
+
+  if (! file)
+    {
+      g_scanner_error (scanner,
+                       "unable to parse plug-in filename: %s",
+                       error->message);
+      g_clear_error (&error);
+      return G_TOKEN_ERROR;
+    }
+
+  plug_in_def = gimp_plug_in_def_new (file);
+  g_object_unref (file);
+
+  if (! gimp_scanner_parse_int64 (scanner, &mtime))
+    {
+      g_object_unref (plug_in_def);
+      return G_TOKEN_INT;
+    }
+
+  plug_in_def->mtime = mtime;
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+            case PROC_DEF:
+              token = plug_in_procedure_deserialize (scanner, gimp,
+                                                     plug_in_def->file,
+                                                     &proc);
+
+              if (token == G_TOKEN_LEFT_PAREN)
+                gimp_plug_in_def_add_procedure (plug_in_def, proc);
+
+              if (proc)
+                g_object_unref (proc);
+              break;
+
+            case LOCALE_DEF:
+              token = plug_in_locale_def_deserialize (scanner, plug_in_def);
+              break;
+
+            case HELP_DEF:
+              token = plug_in_help_def_deserialize (scanner, plug_in_def);
+              break;
+
+            case HAS_INIT:
+              token = plug_in_has_init_deserialize (scanner, plug_in_def);
+              break;
+
+            default:
+              break;
+            }
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (token == G_TOKEN_LEFT_PAREN)
+    {
+      token = G_TOKEN_RIGHT_PAREN;
+
+      if (gimp_scanner_parse_token (scanner, token))
+        {
+          *plug_in_defs = g_slist_prepend (*plug_in_defs, plug_in_def);
+          return G_TOKEN_LEFT_PAREN;
+        }
+    }
+
+  g_object_unref (plug_in_def);
+
+  return token;
+}
+
+static GTokenType
+plug_in_procedure_deserialize (GScanner             *scanner,
+                               Gimp                 *gimp,
+                               GFile                *file,
+                               GimpPlugInProcedure **proc)
+{
+  GimpProcedure   *procedure;
+  GTokenType       token;
+  gchar           *str;
+  gint             proc_type;
+  gint             n_args;
+  gint             n_return_vals;
+  gint             n_menu_paths;
+  gint             i;
+
+  if (! gimp_scanner_parse_string (scanner, &str))
+    return G_TOKEN_STRING;
+
+  if (! (str && *str))
+    {
+      g_scanner_error (scanner, "procedure name is empty");
+      return G_TOKEN_ERROR;
+    }
+
+  if (! gimp_scanner_parse_int (scanner, &proc_type))
+    {
+      g_free (str);
+      return G_TOKEN_INT;
+    }
+
+  if (proc_type != GIMP_PLUGIN &&
+      proc_type != GIMP_EXTENSION)
+    {
+      g_free (str);
+      g_scanner_error (scanner, "procedure type %d is out of range",
+                       proc_type);
+      return G_TOKEN_ERROR;
+    }
+
+  procedure = gimp_plug_in_procedure_new (proc_type, file);
+
+  *proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+
+  gimp_object_take_name (GIMP_OBJECT (procedure),
+                         gimp_canonicalize_identifier (str));
+
+  procedure->original_name = str;
+
+  if (! gimp_scanner_parse_string (scanner, &procedure->blurb))
+    return G_TOKEN_STRING;
+  if (! gimp_scanner_parse_string (scanner, &procedure->help))
+    return G_TOKEN_STRING;
+  if (! gimp_scanner_parse_string (scanner, &procedure->author))
+    return G_TOKEN_STRING;
+  if (! gimp_scanner_parse_string (scanner, &procedure->copyright))
+    return G_TOKEN_STRING;
+  if (! gimp_scanner_parse_string (scanner, &procedure->date))
+    return G_TOKEN_STRING;
+  if (! gimp_scanner_parse_string (scanner, &(*proc)->menu_label))
+    return G_TOKEN_STRING;
+
+  if (! gimp_scanner_parse_int (scanner, &n_menu_paths))
+    return G_TOKEN_INT;
+
+  for (i = 0; i < n_menu_paths; i++)
+    {
+      token = plug_in_menu_path_deserialize (scanner, *proc);
+      if (token != G_TOKEN_LEFT_PAREN)
+        return token;
+    }
+
+  token = plug_in_icon_deserialize (scanner, *proc);
+  if (token != G_TOKEN_LEFT_PAREN)
+    return token;
+
+  token = plug_in_file_proc_deserialize (scanner, *proc);
+  if (token != G_TOKEN_LEFT_PAREN)
+    return token;
+
+  if (! gimp_scanner_parse_string (scanner, &str))
+    return G_TOKEN_STRING;
+
+  gimp_plug_in_procedure_set_image_types (*proc, str);
+  g_free (str);
+
+  if (! gimp_scanner_parse_int (scanner, (gint *) &n_args))
+    return G_TOKEN_INT;
+  if (! gimp_scanner_parse_int (scanner, (gint *) &n_return_vals))
+    return G_TOKEN_INT;
+
+  for (i = 0; i < n_args; i++)
+    {
+      token = plug_in_proc_arg_deserialize (scanner, gimp, procedure, FALSE);
+      if (token != G_TOKEN_LEFT_PAREN)
+        return token;
+    }
+
+  for (i = 0; i < n_return_vals; i++)
+    {
+      token = plug_in_proc_arg_deserialize (scanner, gimp, procedure, TRUE);
+      if (token != G_TOKEN_LEFT_PAREN)
+        return token;
+    }
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+static GTokenType
+plug_in_menu_path_deserialize (GScanner            *scanner,
+                               GimpPlugInProcedure *proc)
+{
+  gchar *menu_path;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_LEFT_PAREN))
+    return G_TOKEN_LEFT_PAREN;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_SYMBOL) ||
+      GPOINTER_TO_INT (scanner->value.v_symbol) != MENU_PATH)
+    return G_TOKEN_SYMBOL;
+
+  if (! gimp_scanner_parse_string (scanner, &menu_path))
+    return G_TOKEN_STRING;
+
+  proc->menu_paths = g_list_append (proc->menu_paths, menu_path);
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+static GTokenType
+plug_in_icon_deserialize (GScanner            *scanner,
+                          GimpPlugInProcedure *proc)
+{
+  GEnumClass   *enum_class;
+  GEnumValue   *enum_value;
+  GimpIconType  icon_type;
+  gint          icon_data_length;
+  gchar        *icon_name;
+  guint8       *icon_data;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_LEFT_PAREN))
+    return G_TOKEN_LEFT_PAREN;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_SYMBOL) ||
+      GPOINTER_TO_INT (scanner->value.v_symbol) != ICON)
+    return G_TOKEN_SYMBOL;
+
+  enum_class = g_type_class_peek (GIMP_TYPE_ICON_TYPE);
+
+  switch (g_scanner_peek_next_token (scanner))
+    {
+    case G_TOKEN_IDENTIFIER:
+      g_scanner_get_next_token (scanner);
+
+      enum_value = g_enum_get_value_by_nick (G_ENUM_CLASS (enum_class),
+                                             scanner->value.v_identifier);
+      if (!enum_value)
+        enum_value = g_enum_get_value_by_name (G_ENUM_CLASS (enum_class),
+                                               scanner->value.v_identifier);
+
+      if (!enum_value)
+        {
+          g_scanner_error (scanner,
+                           _("invalid value '%s' for icon type"),
+                           scanner->value.v_identifier);
+          return G_TOKEN_NONE;
+        }
+      break;
+
+    case G_TOKEN_INT:
+      g_scanner_get_next_token (scanner);
+
+      enum_value = g_enum_get_value (enum_class,
+                                     (gint) scanner->value.v_int64);
+
+      if (!enum_value)
+        {
+          g_scanner_error (scanner,
+                           _("invalid value '%ld' for icon type"),
+                           (glong) scanner->value.v_int64);
+          return G_TOKEN_NONE;
+        }
+      break;
+
+    default:
+      return G_TOKEN_IDENTIFIER;
+    }
+
+  icon_type = enum_value->value;
+
+  if (! gimp_scanner_parse_int (scanner, &icon_data_length))
+    return G_TOKEN_INT;
+
+  switch (icon_type)
+    {
+    case GIMP_ICON_TYPE_ICON_NAME:
+    case GIMP_ICON_TYPE_IMAGE_FILE:
+      icon_data_length = -1;
+
+      if (! gimp_scanner_parse_string_no_validate (scanner, &icon_name))
+        return G_TOKEN_STRING;
+
+      icon_data = (guint8 *) icon_name;
+      break;
+
+    case GIMP_ICON_TYPE_INLINE_PIXBUF:
+      if (icon_data_length < 0)
+        return G_TOKEN_STRING;
+
+      if (! gimp_scanner_parse_data (scanner, icon_data_length, &icon_data))
+        return G_TOKEN_STRING;
+      break;
+    }
+
+  gimp_plug_in_procedure_take_icon (proc, icon_type,
+                                    icon_data, icon_data_length);
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+static GTokenType
+plug_in_file_proc_deserialize (GScanner            *scanner,
+                               GimpPlugInProcedure *proc)
+{
+  GTokenType token;
+  gint       symbol;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_LEFT_PAREN))
+    return G_TOKEN_LEFT_PAREN;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_SYMBOL))
+    return G_TOKEN_SYMBOL;
+
+  symbol = GPOINTER_TO_INT (scanner->value.v_symbol);
+  if (symbol != LOAD_PROC && symbol != SAVE_PROC)
+    return G_TOKEN_SYMBOL;
+
+  proc->file_proc = TRUE;
+
+  g_scanner_set_scope (scanner, symbol);
+
+  while (g_scanner_peek_next_token (scanner) == G_TOKEN_LEFT_PAREN)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      if (token != G_TOKEN_LEFT_PAREN)
+        return token;
+
+      if (! gimp_scanner_parse_token (scanner, G_TOKEN_SYMBOL))
+        return G_TOKEN_SYMBOL;
+
+      symbol = GPOINTER_TO_INT (scanner->value.v_symbol);
+
+      switch (symbol)
+        {
+        case EXTENSIONS:
+          {
+            gchar *extensions;
+
+            if (! gimp_scanner_parse_string (scanner, &extensions))
+              return G_TOKEN_STRING;
+
+            g_free (proc->extensions);
+            proc->extensions = extensions;
+          }
+          break;
+
+        case PREFIXES:
+          {
+            gchar *prefixes;
+
+            if (! gimp_scanner_parse_string (scanner, &prefixes))
+              return G_TOKEN_STRING;
+
+            g_free (proc->prefixes);
+            proc->prefixes = prefixes;
+          }
+          break;
+
+        case MAGICS:
+          {
+            gchar *magics;
+
+            if (! gimp_scanner_parse_string_no_validate (scanner, &magics))
+              return G_TOKEN_STRING;
+
+            g_free (proc->magics);
+            proc->magics = magics;
+          }
+          break;
+
+        case PRIORITY:
+          {
+            gint priority;
+
+            if (! gimp_scanner_parse_int (scanner, &priority))
+              return G_TOKEN_INT;
+
+            gimp_plug_in_procedure_set_priority (proc, priority);
+          }
+          break;
+
+        case MIME_TYPES:
+          {
+            gchar *mime_types;
+
+            if (! gimp_scanner_parse_string (scanner, &mime_types))
+              return G_TOKEN_STRING;
+
+            gimp_plug_in_procedure_set_mime_types (proc, mime_types);
+
+            g_free (mime_types);
+          }
+          break;
+
+        case HANDLES_URI:
+          gimp_plug_in_procedure_set_handles_uri (proc);
+          break;
+
+        case HANDLES_RAW:
+          gimp_plug_in_procedure_set_handles_raw (proc);
+          break;
+
+        case THUMB_LOADER:
+          {
+            gchar *thumb_loader;
+
+            if (! gimp_scanner_parse_string (scanner, &thumb_loader))
+              return G_TOKEN_STRING;
+
+            gimp_plug_in_procedure_set_thumb_loader (proc, thumb_loader);
+
+            g_free (thumb_loader);
+          }
+          break;
+
+        default:
+           return G_TOKEN_SYMBOL;
+        }
+      if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+        return G_TOKEN_RIGHT_PAREN;
+    }
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  g_scanner_set_scope (scanner, PLUG_IN_DEF);
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+static GTokenType
+plug_in_proc_arg_deserialize (GScanner      *scanner,
+                              Gimp          *gimp,
+                              GimpProcedure *procedure,
+                              gboolean       return_value)
+{
+  GTokenType  token;
+  gint        arg_type;
+  gchar      *name = NULL;
+  gchar      *desc = NULL;
+  GParamSpec *pspec;
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_LEFT_PAREN))
+    {
+      token = G_TOKEN_LEFT_PAREN;
+      goto error;
+    }
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_SYMBOL) ||
+      GPOINTER_TO_INT (scanner->value.v_symbol) != PROC_ARG)
+    {
+      token = G_TOKEN_SYMBOL;
+      goto error;
+    }
+
+  if (! gimp_scanner_parse_int (scanner, (gint *) &arg_type))
+    {
+      token = G_TOKEN_INT;
+      goto error;
+    }
+  if (! gimp_scanner_parse_string (scanner, &name))
+    {
+      token = G_TOKEN_STRING;
+      goto error;
+    }
+  if (! gimp_scanner_parse_string (scanner, &desc))
+    {
+      token = G_TOKEN_STRING;
+      goto error;
+    }
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    {
+      token = G_TOKEN_RIGHT_PAREN;
+      goto error;
+    }
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  pspec = gimp_pdb_compat_param_spec (gimp, arg_type, name, desc, NULL);
+
+  if (return_value)
+    gimp_procedure_add_return_value (procedure, pspec);
+  else
+    gimp_procedure_add_argument (procedure, pspec);
+
+ error:
+
+  g_free (name);
+  g_free (desc);
+
+  return token;
+}
+
+static GTokenType
+plug_in_locale_def_deserialize (GScanner      *scanner,
+                                GimpPlugInDef *plug_in_def)
+{
+  gchar *domain_name;
+  gchar *domain_path   = NULL;
+  gchar *expanded_path = NULL;
+
+  if (! gimp_scanner_parse_string (scanner, &domain_name))
+    return G_TOKEN_STRING;
+
+  if (gimp_scanner_parse_string (scanner, &domain_path))
+    expanded_path = gimp_config_path_expand (domain_path, TRUE, NULL);
+
+  gimp_plug_in_def_set_locale_domain (plug_in_def, domain_name, expanded_path);
+
+  g_free (domain_name);
+  g_free (domain_path);
+  g_free (expanded_path);
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+static GTokenType
+plug_in_help_def_deserialize (GScanner      *scanner,
+                              GimpPlugInDef *plug_in_def)
+{
+  gchar *domain_name;
+  gchar *domain_uri;
+
+  if (! gimp_scanner_parse_string (scanner, &domain_name))
+    return G_TOKEN_STRING;
+
+  if (! gimp_scanner_parse_string (scanner, &domain_uri))
+    domain_uri = NULL;
+
+  gimp_plug_in_def_set_help_domain (plug_in_def, domain_name, domain_uri);
+
+  g_free (domain_name);
+  g_free (domain_uri);
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+static GTokenType
+plug_in_has_init_deserialize (GScanner      *scanner,
+                              GimpPlugInDef *plug_in_def)
+{
+  gimp_plug_in_def_set_has_init (plug_in_def, TRUE);
+
+  if (! gimp_scanner_parse_token (scanner, G_TOKEN_RIGHT_PAREN))
+    return G_TOKEN_RIGHT_PAREN;
+
+  return G_TOKEN_LEFT_PAREN;
+}
+
+
+/* serialize functions */
+
+gboolean
+plug_in_rc_write (GSList  *plug_in_defs,
+                  GFile   *file,
+                  GError **error)
+{
+  GimpConfigWriter *writer;
+  GEnumClass       *enum_class;
+  GSList           *list;
+
+  writer = gimp_config_writer_new_gfile (file,
+                                         FALSE,
+                                         "GIMP pluginrc\n\n"
+                                         "This file can safely be removed and "
+                                         "will be automatically regenerated by "
+                                         "querying the installed plug-ins.",
+                                         error);
+  if (!writer)
+    return FALSE;
+
+  enum_class = g_type_class_ref (GIMP_TYPE_ICON_TYPE);
+
+  gimp_config_writer_open (writer, "protocol-version");
+  gimp_config_writer_printf (writer, "%d", GIMP_PROTOCOL_VERSION);
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_open (writer, "file-version");
+  gimp_config_writer_printf (writer, "%d", PLUG_IN_RC_FILE_VERSION);
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_linefeed (writer);
+
+  for (list = plug_in_defs; list; list = list->next)
+    {
+      GimpPlugInDef *plug_in_def = list->data;
+
+      if (plug_in_def->procedures)
+        {
+          GSList *list2;
+          gchar  *path;
+
+          path = gimp_file_get_config_path (plug_in_def->file, NULL);
+          if (! path)
+            continue;
+
+          gimp_config_writer_open (writer, "plug-in-def");
+          gimp_config_writer_string (writer, path);
+          gimp_config_writer_printf (writer, "%"G_GINT64_FORMAT,
+                                     plug_in_def->mtime);
+
+          g_free (path);
+
+          for (list2 = plug_in_def->procedures; list2; list2 = list2->next)
+            {
+              GimpPlugInProcedure *proc      = list2->data;
+              GimpProcedure       *procedure = GIMP_PROCEDURE (proc);
+              GEnumValue          *enum_value;
+              GList               *list3;
+              gint                 i;
+
+              if (proc->installed_during_init)
+                continue;
+
+              gimp_config_writer_open (writer, "proc-def");
+              gimp_config_writer_printf (writer, "\"%s\" %d",
+                                         procedure->original_name,
+                                         procedure->proc_type);
+              gimp_config_writer_linefeed (writer);
+              gimp_config_writer_string (writer, procedure->blurb);
+              gimp_config_writer_linefeed (writer);
+              gimp_config_writer_string (writer, procedure->help);
+              gimp_config_writer_linefeed (writer);
+              gimp_config_writer_string (writer, procedure->author);
+              gimp_config_writer_linefeed (writer);
+              gimp_config_writer_string (writer, procedure->copyright);
+              gimp_config_writer_linefeed (writer);
+              gimp_config_writer_string (writer, procedure->date);
+              gimp_config_writer_linefeed (writer);
+              gimp_config_writer_string (writer, proc->menu_label);
+              gimp_config_writer_linefeed (writer);
+
+              gimp_config_writer_printf (writer, "%d",
+                                         g_list_length (proc->menu_paths));
+              for (list3 = proc->menu_paths; list3; list3 = list3->next)
+                {
+                  gimp_config_writer_open (writer, "menu-path");
+                  gimp_config_writer_string (writer, list3->data);
+                  gimp_config_writer_close (writer);
+                }
+
+              gimp_config_writer_open (writer, "icon");
+              enum_value = g_enum_get_value (enum_class, proc->icon_type);
+              gimp_config_writer_identifier (writer, enum_value->value_nick);
+              gimp_config_writer_printf (writer, "%d",
+                                         proc->icon_data_length);
+
+              switch (proc->icon_type)
+                {
+                case GIMP_ICON_TYPE_ICON_NAME:
+                case GIMP_ICON_TYPE_IMAGE_FILE:
+                  gimp_config_writer_string (writer, (gchar *) proc->icon_data);
+                  break;
+
+                case GIMP_ICON_TYPE_INLINE_PIXBUF:
+                  gimp_config_writer_data (writer, proc->icon_data_length,
+                                           proc->icon_data);
+                  break;
+                }
+
+              gimp_config_writer_close (writer);
+
+              if (proc->file_proc)
+                {
+                  gimp_config_writer_open (writer,
+                                           proc->image_types ?
+                                           "save-proc" : "load-proc");
+
+                  if (proc->extensions && *proc->extensions)
+                    {
+                      gimp_config_writer_open (writer, "extensions");
+                      gimp_config_writer_string (writer, proc->extensions);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->prefixes && *proc->prefixes)
+                    {
+                      gimp_config_writer_open (writer, "prefixes");
+                      gimp_config_writer_string (writer, proc->prefixes);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->magics && *proc->magics)
+                    {
+                      gimp_config_writer_open (writer, "magics");
+                      gimp_config_writer_string (writer, proc->magics);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->priority)
+                    {
+                      gimp_config_writer_open (writer, "priority");
+                      gimp_config_writer_printf (writer, "%d", proc->priority);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->mime_types && *proc->mime_types)
+                    {
+                      gimp_config_writer_open (writer, "mime-types");
+                      gimp_config_writer_string (writer, proc->mime_types);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->priority)
+                    {
+                      gimp_config_writer_open (writer, "priority");
+                      gimp_config_writer_printf (writer, "%d", proc->priority);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->handles_uri)
+                    {
+                      gimp_config_writer_open (writer, "handles-uri");
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->handles_raw && ! proc->image_types)
+                    {
+                      gimp_config_writer_open (writer, "handles-raw");
+                      gimp_config_writer_close (writer);
+                    }
+
+                  if (proc->thumb_loader)
+                    {
+                      gimp_config_writer_open (writer, "thumb-loader");
+                      gimp_config_writer_string (writer, proc->thumb_loader);
+                      gimp_config_writer_close (writer);
+                    }
+
+                  gimp_config_writer_close (writer);
+                }
+
+              gimp_config_writer_linefeed (writer);
+
+              gimp_config_writer_string (writer, proc->image_types);
+              gimp_config_writer_linefeed (writer);
+
+              gimp_config_writer_printf (writer, "%d %d",
+                                         procedure->num_args,
+                                         procedure->num_values);
+
+              for (i = 0; i < procedure->num_args; i++)
+                {
+                  GParamSpec *pspec = procedure->args[i];
+
+                  gimp_config_writer_open (writer, "proc-arg");
+                  gimp_config_writer_printf (writer, "%d",
+                                             gimp_pdb_compat_arg_type_from_gtype (G_PARAM_SPEC_VALUE_TYPE (pspec)));
+
+                  gimp_config_writer_string (writer,
+                                             g_param_spec_get_name (pspec));
+                  gimp_config_writer_string (writer,
+                                             g_param_spec_get_blurb (pspec));
+
+                  gimp_config_writer_close (writer);
+                }
+
+              for (i = 0; i < procedure->num_values; i++)
+                {
+                  GParamSpec *pspec = procedure->values[i];
+
+                  gimp_config_writer_open (writer, "proc-arg");
+                  gimp_config_writer_printf (writer, "%d",
+                                             gimp_pdb_compat_arg_type_from_gtype (G_PARAM_SPEC_VALUE_TYPE (pspec)));
+
+                  gimp_config_writer_string (writer,
+                                             g_param_spec_get_name (pspec));
+                  gimp_config_writer_string (writer,
+                                             g_param_spec_get_blurb (pspec));
+
+                  gimp_config_writer_close (writer);
+                }
+
+              gimp_config_writer_close (writer);
+            }
+
+          if (plug_in_def->locale_domain_name)
+            {
+              gimp_config_writer_open (writer, "locale-def");
+              gimp_config_writer_string (writer,
+                                         plug_in_def->locale_domain_name);
+
+              if (plug_in_def->locale_domain_path)
+                {
+                  path = gimp_config_path_unexpand (plug_in_def->locale_domain_path,
+                                                    TRUE, NULL);
+                  if (path)
+                    {
+                      gimp_config_writer_string (writer, path);
+                      g_free (path);
+                    }
+                }
+
+              gimp_config_writer_close (writer);
+            }
+
+          if (plug_in_def->help_domain_name)
+            {
+              gimp_config_writer_open (writer, "help-def");
+              gimp_config_writer_string (writer,
+                                         plug_in_def->help_domain_name);
+
+              if (plug_in_def->help_domain_uri)
+                gimp_config_writer_string (writer,
+                                           plug_in_def->help_domain_uri);
+
+             gimp_config_writer_close (writer);
+            }
+
+          if (plug_in_def->has_init)
+            {
+              gimp_config_writer_open (writer, "has-init");
+              gimp_config_writer_close (writer);
+            }
+
+          gimp_config_writer_close (writer);
+        }
+    }
+
+  g_type_class_unref (enum_class);
+
+  return gimp_config_writer_finish (writer, "end of pluginrc", error);
+}
diff --git a/app/plug-in/plug-in-rc.h b/app/plug-in/plug-in-rc.h
new file mode 100644
index 0000000..5a54b0b
--- /dev/null
+++ b/app/plug-in/plug-in-rc.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * plug-in-rc.h
+ * Copyright (C) 2001  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_RC_H__
+#define __PLUG_IN_RC_H__
+
+
+GSList   * plug_in_rc_parse (Gimp    *gimp,
+                             GFile   *file,
+                             GError **error);
+gboolean   plug_in_rc_write (GSList  *plug_in_defs,
+                             GFile   *file,
+                             GError **error);
+
+
+#endif /* __PLUG_IN_RC_H__ */
diff --git a/app/plug-in/plug-in-types.h b/app/plug-in/plug-in-types.h
new file mode 100644
index 0000000..70d7ca0
--- /dev/null
+++ b/app/plug-in/plug-in-types.h
@@ -0,0 +1,40 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PLUG_IN_TYPES_H__
+#define __PLUG_IN_TYPES_H__
+
+
+#include "core/core-types.h"
+
+#include "plug-in/plug-in-enums.h"
+
+
+#define GIMP_PLUG_IN_TILE_WIDTH  128
+#define GIMP_PLUG_IN_TILE_HEIGHT 128
+
+
+typedef struct _GimpPlugIn           GimpPlugIn;
+typedef struct _GimpPlugInDebug      GimpPlugInDebug;
+typedef struct _GimpPlugInDef        GimpPlugInDef;
+typedef struct _GimpPlugInManager    GimpPlugInManager;
+typedef struct _GimpPlugInMenuBranch GimpPlugInMenuBranch;
+typedef struct _GimpPlugInProcFrame  GimpPlugInProcFrame;
+typedef struct _GimpPlugInShm        GimpPlugInShm;
+
+
+#endif /* __PLUG_IN_TYPES_H__ */
diff --git a/app/propgui/Makefile.am b/app/propgui/Makefile.am
new file mode 100644
index 0000000..0f64ee7
--- /dev/null
+++ b/app/propgui/Makefile.am
@@ -0,0 +1,63 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+        -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\"		\
+        -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\"	\
+	-DG_LOG_DOMAIN=\"Gimp-PropGUI\"				\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GEGL_CFLAGS)						\
+	$(GTK_CFLAGS)						\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapppropgui.a
+
+libapppropgui_a_SOURCES = \
+	propgui-types.h				\
+	\
+	gimppropgui.c				\
+	gimppropgui.h				\
+	gimppropgui-channel-mixer.c		\
+	gimppropgui-channel-mixer.h		\
+	gimppropgui-color-balance.c		\
+	gimppropgui-color-balance.h		\
+	gimppropgui-color-rotate.c		\
+	gimppropgui-color-rotate.h		\
+	gimppropgui-color-to-alpha.c		\
+	gimppropgui-color-to-alpha.h		\
+	gimppropgui-convolution-matrix.c	\
+	gimppropgui-convolution-matrix.h	\
+	gimppropgui-diffraction-patterns.c	\
+	gimppropgui-diffraction-patterns.h	\
+	gimppropgui-eval.c			\
+	gimppropgui-eval.h			\
+	gimppropgui-focus-blur.c		\
+	gimppropgui-focus-blur.h		\
+	gimppropgui-generic.c			\
+	gimppropgui-generic.h			\
+	gimppropgui-hue-saturation.c		\
+	gimppropgui-hue-saturation.h		\
+	gimppropgui-motion-blur-circular.c	\
+	gimppropgui-motion-blur-circular.h	\
+	gimppropgui-motion-blur-linear.c	\
+	gimppropgui-motion-blur-linear.h	\
+	gimppropgui-motion-blur-zoom.c		\
+	gimppropgui-motion-blur-zoom.h		\
+	gimppropgui-newsprint.c			\
+	gimppropgui-newsprint.h			\
+	gimppropgui-panorama-projection.c	\
+	gimppropgui-panorama-projection.h	\
+	gimppropgui-recursive-transform.c	\
+	gimppropgui-recursive-transform.h	\
+	gimppropgui-shadows-highlights.c	\
+	gimppropgui-shadows-highlights.h	\
+	gimppropgui-spiral.c			\
+	gimppropgui-spiral.h			\
+	gimppropgui-supernova.c			\
+	gimppropgui-supernova.h			\
+	gimppropgui-utils.c			\
+	gimppropgui-utils.h			\
+	gimppropgui-vignette.c			\
+	gimppropgui-vignette.h
diff --git a/app/propgui/Makefile.in b/app/propgui/Makefile.in
new file mode 100644
index 0000000..04ce120
--- /dev/null
+++ b/app/propgui/Makefile.in
@@ -0,0 +1,1061 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/propgui
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapppropgui_a_AR = $(AR) $(ARFLAGS)
+libapppropgui_a_LIBADD =
+am_libapppropgui_a_OBJECTS = gimppropgui.$(OBJEXT) \
+	gimppropgui-channel-mixer.$(OBJEXT) \
+	gimppropgui-color-balance.$(OBJEXT) \
+	gimppropgui-color-rotate.$(OBJEXT) \
+	gimppropgui-color-to-alpha.$(OBJEXT) \
+	gimppropgui-convolution-matrix.$(OBJEXT) \
+	gimppropgui-diffraction-patterns.$(OBJEXT) \
+	gimppropgui-eval.$(OBJEXT) gimppropgui-focus-blur.$(OBJEXT) \
+	gimppropgui-generic.$(OBJEXT) \
+	gimppropgui-hue-saturation.$(OBJEXT) \
+	gimppropgui-motion-blur-circular.$(OBJEXT) \
+	gimppropgui-motion-blur-linear.$(OBJEXT) \
+	gimppropgui-motion-blur-zoom.$(OBJEXT) \
+	gimppropgui-newsprint.$(OBJEXT) \
+	gimppropgui-panorama-projection.$(OBJEXT) \
+	gimppropgui-recursive-transform.$(OBJEXT) \
+	gimppropgui-shadows-highlights.$(OBJEXT) \
+	gimppropgui-spiral.$(OBJEXT) gimppropgui-supernova.$(OBJEXT) \
+	gimppropgui-utils.$(OBJEXT) gimppropgui-vignette.$(OBJEXT)
+libapppropgui_a_OBJECTS = $(am_libapppropgui_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimppropgui-channel-mixer.Po \
+	./$(DEPDIR)/gimppropgui-color-balance.Po \
+	./$(DEPDIR)/gimppropgui-color-rotate.Po \
+	./$(DEPDIR)/gimppropgui-color-to-alpha.Po \
+	./$(DEPDIR)/gimppropgui-convolution-matrix.Po \
+	./$(DEPDIR)/gimppropgui-diffraction-patterns.Po \
+	./$(DEPDIR)/gimppropgui-eval.Po \
+	./$(DEPDIR)/gimppropgui-focus-blur.Po \
+	./$(DEPDIR)/gimppropgui-generic.Po \
+	./$(DEPDIR)/gimppropgui-hue-saturation.Po \
+	./$(DEPDIR)/gimppropgui-motion-blur-circular.Po \
+	./$(DEPDIR)/gimppropgui-motion-blur-linear.Po \
+	./$(DEPDIR)/gimppropgui-motion-blur-zoom.Po \
+	./$(DEPDIR)/gimppropgui-newsprint.Po \
+	./$(DEPDIR)/gimppropgui-panorama-projection.Po \
+	./$(DEPDIR)/gimppropgui-recursive-transform.Po \
+	./$(DEPDIR)/gimppropgui-shadows-highlights.Po \
+	./$(DEPDIR)/gimppropgui-spiral.Po \
+	./$(DEPDIR)/gimppropgui-supernova.Po \
+	./$(DEPDIR)/gimppropgui-utils.Po \
+	./$(DEPDIR)/gimppropgui-vignette.Po ./$(DEPDIR)/gimppropgui.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapppropgui_a_SOURCES)
+DIST_SOURCES = $(libapppropgui_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+        -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\"		\
+        -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\"	\
+	-DG_LOG_DOMAIN=\"Gimp-PropGUI\"				\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GEGL_CFLAGS)						\
+	$(GTK_CFLAGS)						\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapppropgui.a
+libapppropgui_a_SOURCES = \
+	propgui-types.h				\
+	\
+	gimppropgui.c				\
+	gimppropgui.h				\
+	gimppropgui-channel-mixer.c		\
+	gimppropgui-channel-mixer.h		\
+	gimppropgui-color-balance.c		\
+	gimppropgui-color-balance.h		\
+	gimppropgui-color-rotate.c		\
+	gimppropgui-color-rotate.h		\
+	gimppropgui-color-to-alpha.c		\
+	gimppropgui-color-to-alpha.h		\
+	gimppropgui-convolution-matrix.c	\
+	gimppropgui-convolution-matrix.h	\
+	gimppropgui-diffraction-patterns.c	\
+	gimppropgui-diffraction-patterns.h	\
+	gimppropgui-eval.c			\
+	gimppropgui-eval.h			\
+	gimppropgui-focus-blur.c		\
+	gimppropgui-focus-blur.h		\
+	gimppropgui-generic.c			\
+	gimppropgui-generic.h			\
+	gimppropgui-hue-saturation.c		\
+	gimppropgui-hue-saturation.h		\
+	gimppropgui-motion-blur-circular.c	\
+	gimppropgui-motion-blur-circular.h	\
+	gimppropgui-motion-blur-linear.c	\
+	gimppropgui-motion-blur-linear.h	\
+	gimppropgui-motion-blur-zoom.c		\
+	gimppropgui-motion-blur-zoom.h		\
+	gimppropgui-newsprint.c			\
+	gimppropgui-newsprint.h			\
+	gimppropgui-panorama-projection.c	\
+	gimppropgui-panorama-projection.h	\
+	gimppropgui-recursive-transform.c	\
+	gimppropgui-recursive-transform.h	\
+	gimppropgui-shadows-highlights.c	\
+	gimppropgui-shadows-highlights.h	\
+	gimppropgui-spiral.c			\
+	gimppropgui-spiral.h			\
+	gimppropgui-supernova.c			\
+	gimppropgui-supernova.h			\
+	gimppropgui-utils.c			\
+	gimppropgui-utils.h			\
+	gimppropgui-vignette.c			\
+	gimppropgui-vignette.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/propgui/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/propgui/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapppropgui.a: $(libapppropgui_a_OBJECTS) $(libapppropgui_a_DEPENDENCIES) $(EXTRA_libapppropgui_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapppropgui.a
+	$(AM_V_AR)$(libapppropgui_a_AR) libapppropgui.a $(libapppropgui_a_OBJECTS) $(libapppropgui_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapppropgui.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-channel-mixer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-color-balance.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-color-rotate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-color-to-alpha.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-convolution-matrix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-diffraction-patterns.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-eval.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-focus-blur.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-generic.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-hue-saturation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-motion-blur-circular.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-motion-blur-linear.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-motion-blur-zoom.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-newsprint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-panorama-projection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-recursive-transform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-shadows-highlights.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-spiral.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-supernova.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui-vignette.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropgui.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimppropgui-channel-mixer.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-color-balance.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-color-rotate.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-color-to-alpha.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-convolution-matrix.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-diffraction-patterns.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-eval.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-focus-blur.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-generic.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-hue-saturation.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-motion-blur-circular.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-motion-blur-linear.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-motion-blur-zoom.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-newsprint.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-panorama-projection.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-recursive-transform.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-shadows-highlights.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-spiral.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-supernova.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-utils.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-vignette.Po
+	-rm -f ./$(DEPDIR)/gimppropgui.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimppropgui-channel-mixer.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-color-balance.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-color-rotate.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-color-to-alpha.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-convolution-matrix.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-diffraction-patterns.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-eval.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-focus-blur.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-generic.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-hue-saturation.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-motion-blur-circular.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-motion-blur-linear.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-motion-blur-zoom.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-newsprint.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-panorama-projection.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-recursive-transform.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-shadows-highlights.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-spiral.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-supernova.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-utils.Po
+	-rm -f ./$(DEPDIR)/gimppropgui-vignette.Po
+	-rm -f ./$(DEPDIR)/gimppropgui.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/propgui/gimppropgui-channel-mixer.c b/app/propgui/gimppropgui-channel-mixer.c
new file mode 100644
index 0000000..df48d7c
--- /dev/null
+++ b/app/propgui/gimppropgui-channel-mixer.c
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-channel-mixer.c
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-channel-mixer.h"
+
+#include "gimp-intl.h"
+
+
+GtkWidget *
+_gimp_prop_gui_new_channel_mixer (GObject                  *config,
+                                  GParamSpec              **param_specs,
+                                  guint                     n_param_specs,
+                                  GeglRectangle            *area,
+                                  GimpContext              *context,
+                                  GimpCreatePickerFunc      create_picker_func,
+                                  GimpCreateControllerFunc  create_controller_func,
+                                  gpointer                  creator)
+{
+  GtkWidget   *main_vbox;
+  GtkWidget   *frame;
+  GtkWidget   *vbox;
+  GtkWidget   *checkbox;
+  GtkWidget   *scale;
+  const gchar *label;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  frame = gimp_frame_new (_("Red channel"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_widget_new (config, "rr-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "rg-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "rb-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+
+  frame = gimp_frame_new (_("Green channel"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_widget_new (config, "gr-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "gg-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "gb-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+
+  frame = gimp_frame_new (_("Blue channel"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_widget_new (config, "br-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "bg-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "bb-gain",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+
+  checkbox = gimp_prop_widget_new (config, "preserve-luminosity",
+                                   area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (main_vbox), checkbox, FALSE, FALSE, 0);
+  gtk_widget_show (checkbox);
+
+  return main_vbox;
+}
diff --git a/app/propgui/gimppropgui-channel-mixer.h b/app/propgui/gimppropgui-channel-mixer.h
new file mode 100644
index 0000000..a44f99b
--- /dev/null
+++ b/app/propgui/gimppropgui-channel-mixer.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-channel-mixer.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_CHANNEL_MIXER_H__
+#define __GIMP_PROP_GUI_CHANNEL_MIXER_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_channel_mixer (GObject                  *config,
+                                  GParamSpec              **param_specs,
+                                  guint                     n_param_specs,
+                                  GeglRectangle            *area,
+                                  GimpContext              *context,
+                                  GimpCreatePickerFunc      create_picker_func,
+                                  GimpCreateControllerFunc  create_controller_func,
+                                  gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_CHANNEL_MIXER_H__ */
diff --git a/app/propgui/gimppropgui-color-balance.c b/app/propgui/gimppropgui-color-balance.c
new file mode 100644
index 0000000..18127ae
--- /dev/null
+++ b/app/propgui/gimppropgui-color-balance.c
@@ -0,0 +1,149 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-color-balance.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "operations/gimpcolorbalanceconfig.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-color-balance.h"
+
+#include "gimp-intl.h"
+
+
+static void
+create_levels_scale (GObject     *config,
+                     const gchar *property_name,
+                     const gchar *left,
+                     const gchar *right,
+                     GtkWidget   *table,
+                     gint         col)
+{
+  GtkWidget *label;
+  GtkWidget *scale;
+
+  label = gtk_label_new (left);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, col, col + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  scale = gimp_prop_spin_scale_new (config, property_name,
+                                    NULL, 0.01, 0.1, 0);
+  gimp_spin_scale_set_label (GIMP_SPIN_SCALE (scale), NULL);
+  gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), scale, 1, 2, col, col + 1);
+  gtk_widget_show (scale);
+
+  label = gtk_label_new (right);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 2, 3, col, col + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_color_balance (GObject                  *config,
+                                  GParamSpec              **param_specs,
+                                  guint                     n_param_specs,
+                                  GeglRectangle            *area,
+                                  GimpContext              *context,
+                                  GimpCreatePickerFunc      create_picker_func,
+                                  GimpCreateControllerFunc  create_controller_func,
+                                  gpointer                  creator)
+{
+  GtkWidget *main_vbox;
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *table;
+  GtkWidget *button;
+  GtkWidget *frame;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  frame = gimp_prop_enum_radio_frame_new (config, "range",
+                                          _("Select Range to Adjust"),
+                                          0, 0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  frame = gimp_frame_new (_("Adjust Color Levels"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  /*  The table containing sliders  */
+  table = gtk_table_new (3, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  create_levels_scale (config, "cyan-red",
+                       _("Cyan"), _("Red"),
+                       table, 0);
+
+  create_levels_scale (config, "magenta-green",
+                       _("Magenta"), _("Green"),
+                       table, 1);
+
+  create_levels_scale (config, "yellow-blue",
+                       _("Yellow"), _("Blue"),
+                       table, 2);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gtk_button_new_with_mnemonic (_("R_eset Range"));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect_swapped (button, "clicked",
+                            G_CALLBACK (gimp_color_balance_config_reset_range),
+                            config);
+
+  button = gimp_prop_check_button_new (config,
+                                       "preserve-luminosity",
+                                       _("Preserve _luminosity"));
+  gtk_box_pack_end (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return main_vbox;
+}
diff --git a/app/propgui/gimppropgui-color-balance.h b/app/propgui/gimppropgui-color-balance.h
new file mode 100644
index 0000000..ecbee73
--- /dev/null
+++ b/app/propgui/gimppropgui-color-balance.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-color-balance.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_COLOR_BALANCE_H__
+#define __GIMP_PROP_GUI_COLOR_BALANCE_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_color_balance (GObject                  *config,
+                                  GParamSpec              **param_specs,
+                                  guint                     n_param_specs,
+                                  GeglRectangle            *area,
+                                  GimpContext              *context,
+                                  GimpCreatePickerFunc      create_picker_func,
+                                  GimpCreateControllerFunc  create_controller_func,
+                                  gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_COLOR_BALANCE_H__ */
diff --git a/app/propgui/gimppropgui-color-rotate.c b/app/propgui/gimppropgui-color-rotate.c
new file mode 100644
index 0000000..1461084
--- /dev/null
+++ b/app/propgui/gimppropgui-color-rotate.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-color-rotate.c
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimppropwidgets.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-color-rotate.h"
+#include "gimppropgui-generic.h"
+
+#include "gimp-intl.h"
+
+
+static void
+invert_segment_clicked (GtkWidget *button,
+                        GtkWidget *dial)
+{
+  gdouble  alpha, beta;
+  gboolean clockwise;
+
+  g_object_get (dial,
+                "alpha",           &alpha,
+                "beta",            &beta,
+                "clockwise-delta", &clockwise,
+                NULL);
+
+  g_object_set (dial,
+                "alpha",           beta,
+                "beta",            alpha,
+                "clockwise-delta", ! clockwise,
+                NULL);
+}
+
+static void
+select_all_clicked (GtkWidget *button,
+                    GtkWidget *dial)
+{
+  gdouble  alpha, beta;
+  gboolean clockwise;
+
+  g_object_get (dial,
+                "alpha",           &alpha,
+                "clockwise-delta", &clockwise,
+                NULL);
+
+  beta = alpha - (clockwise ? -1 : 1) * 0.00001;
+
+  if (beta < 0)
+    beta += 2 * G_PI;
+
+  if (beta > 2 * G_PI)
+    beta -= 2 * G_PI;
+
+  g_object_set (dial,
+                "beta", beta,
+                NULL);
+}
+
+static GtkWidget *
+gimp_prop_angle_range_box_new (GObject     *config,
+                               const gchar *alpha_property_name,
+                               const gchar *beta_property_name,
+                               const gchar *clockwise_property_name)
+{
+  GtkWidget *main_hbox;
+  GtkWidget *vbox;
+  GtkWidget *scale;
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkWidget *invert_button;
+  GtkWidget *all_button;
+  GtkWidget *dial;
+
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_spin_scale_new (config, alpha_property_name, NULL,
+                                    1.0, 15.0, 2);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, beta_property_name, NULL,
+                                    1.0, 15.0, 2);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gimp_prop_check_button_new (config, clockwise_property_name,
+                                       _("Clockwise"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  invert_button = gtk_button_new_with_label (_("Invert Range"));
+  gtk_box_pack_start (GTK_BOX (hbox), invert_button, TRUE, TRUE, 0);
+  gtk_widget_show (invert_button);
+
+  all_button = gtk_button_new_with_label (_("Select All"));
+  gtk_box_pack_start (GTK_BOX (hbox), all_button, TRUE, TRUE, 0);
+  gtk_widget_show (all_button);
+
+  dial = gimp_prop_angle_range_dial_new (config,
+                                         alpha_property_name,
+                                         beta_property_name,
+                                         clockwise_property_name);
+  gtk_box_pack_start (GTK_BOX (main_hbox), dial, FALSE, FALSE, 0);
+  gtk_widget_show (dial);
+
+  g_signal_connect (invert_button, "clicked",
+                    G_CALLBACK (invert_segment_clicked),
+                    dial);
+
+  g_signal_connect (all_button, "clicked",
+                    G_CALLBACK (select_all_clicked),
+                    dial);
+
+  return main_hbox;
+}
+
+static GtkWidget *
+gimp_prop_polar_box_new (GObject     *config,
+                         const gchar *angle_property_name,
+                         const gchar *radius_property_name)
+{
+  GtkWidget *main_hbox;
+  GtkWidget *vbox;
+  GtkWidget *scale;
+  GtkWidget *polar;
+
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_spin_scale_new (config, angle_property_name, NULL,
+                                    1.0, 15.0, 2);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, radius_property_name, NULL,
+                                    1.0, 15.0, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  polar = gimp_prop_polar_new (config,
+                               angle_property_name,
+                               radius_property_name);
+  gtk_box_pack_start (GTK_BOX (main_hbox), polar, FALSE, FALSE, 0);
+  gtk_widget_show (polar);
+
+  return main_hbox;
+}
+
+GtkWidget *
+_gimp_prop_gui_new_color_rotate (GObject                  *config,
+                                 GParamSpec              **param_specs,
+                                 guint                     n_param_specs,
+                                 GeglRectangle            *area,
+                                 GimpContext              *context,
+                                 GimpCreatePickerFunc      create_picker_func,
+                                 GimpCreateControllerFunc  create_controller_func,
+                                 gpointer                  creator)
+{
+  GtkWidget *main_vbox;
+  GtkWidget *frame;
+  GtkWidget *vbox;
+  GtkWidget *box;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  frame = gimp_frame_new (_("Source Range"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  box = gimp_prop_angle_range_box_new (config,
+                                       param_specs[1]->name,
+                                       param_specs[2]->name,
+                                       param_specs[0]->name);
+  gtk_container_add (GTK_CONTAINER (frame), box);
+  gtk_widget_show (box);
+
+  frame = gimp_frame_new (_("Destination Range"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  box = gimp_prop_angle_range_box_new (config,
+                                       param_specs[4]->name,
+                                       param_specs[5]->name,
+                                       param_specs[3]->name);
+  gtk_container_add (GTK_CONTAINER (frame), box);
+  gtk_widget_show (box);
+
+  frame = gimp_frame_new (_("Gray Handling"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  box = _gimp_prop_gui_new_generic (config,
+                                    param_specs + 6, 2,
+                                    area, context,
+                                    create_picker_func,
+                                    create_controller_func,
+                                    creator);
+  gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  box = gimp_prop_polar_box_new (config,
+                                 param_specs[8]->name,
+                                 param_specs[9]->name);
+  gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  return main_vbox;
+}
diff --git a/app/propgui/gimppropgui-color-rotate.h b/app/propgui/gimppropgui-color-rotate.h
new file mode 100644
index 0000000..a69770d
--- /dev/null
+++ b/app/propgui/gimppropgui-color-rotate.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-color-rotate.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_COLOR_ROTATE_H__
+#define __GIMP_PROP_GUI_COLOR_ROTATE_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_color_rotate (GObject                  *config,
+                                 GParamSpec              **param_specs,
+                                 guint                     n_param_specs,
+                                 GeglRectangle            *area,
+                                 GimpContext              *context,
+                                 GimpCreatePickerFunc      create_picker_func,
+                                 GimpCreateControllerFunc  create_controller_func,
+                                 gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_COLOR_ROTATE_H__ */
diff --git a/app/propgui/gimppropgui-color-to-alpha.c b/app/propgui/gimppropgui-color-to-alpha.c
new file mode 100644
index 0000000..0918bf9
--- /dev/null
+++ b/app/propgui/gimppropgui-color-to-alpha.c
@@ -0,0 +1,140 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-color-to-alpha.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-color-to-alpha.h"
+#include "gimppropgui-generic.h"
+
+#include "gimp-intl.h"
+
+
+static void
+threshold_picked (GObject       *config,
+                  gpointer       identifier,
+                  gdouble        x,
+                  gdouble        y,
+                  const Babl    *sample_format,
+                  const GimpRGB *picked_color)
+{
+  GimpRGB *color;
+  gdouble  threshold = 0.0;
+
+  g_object_get (config,
+                "color", &color,
+                NULL);
+
+  threshold = MAX (threshold, fabs (picked_color->r - color->r));
+  threshold = MAX (threshold, fabs (picked_color->g - color->g));
+  threshold = MAX (threshold, fabs (picked_color->b - color->b));
+
+  g_object_set (config,
+                identifier, threshold,
+                NULL);
+
+  g_free (color);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_color_to_alpha (GObject                  *config,
+                                   GParamSpec              **param_specs,
+                                   guint                     n_param_specs,
+                                   GeglRectangle            *area,
+                                   GimpContext              *context,
+                                   GimpCreatePickerFunc      create_picker_func,
+                                   GimpCreateControllerFunc  create_controller_func,
+                                   gpointer                  creator)
+{
+  GtkWidget   *vbox;
+  GtkWidget   *button;
+  GtkWidget   *hbox;
+  GtkWidget   *scale;
+  const gchar *label;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  button = _gimp_prop_gui_new_generic (config, param_specs, 1,
+                                       area, context, create_picker_func, NULL,
+                                       creator);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  scale = gimp_prop_widget_new (config, "transparency-threshold",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  if (create_picker_func)
+    {
+      button = create_picker_func (creator,
+                                   "transparency-threshold",
+                                   GIMP_ICON_COLOR_PICKER_GRAY,
+                                   _("Pick farthest full-transparency color"),
+                                   /* pick_abyss = */ FALSE,
+                                   (GimpPickerCallback) threshold_picked,
+                                   config);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  scale = gimp_prop_widget_new (config, "opacity-threshold",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  if (create_picker_func)
+    {
+      button = create_picker_func (creator,
+                                   "opacity-threshold",
+                                   GIMP_ICON_COLOR_PICKER_GRAY,
+                                   _("Pick nearest full-opacity color"),
+                                   /* pick_abyss = */ FALSE,
+                                   (GimpPickerCallback) threshold_picked,
+                                   config);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-color-to-alpha.h b/app/propgui/gimppropgui-color-to-alpha.h
new file mode 100644
index 0000000..af5a325
--- /dev/null
+++ b/app/propgui/gimppropgui-color-to-alpha.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-color-to-alpha.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_COLOR_TO_ALPHA_H__
+#define __GIMP_PROP_GUI_COLOR_TO_ALPHA_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_color_to_alpha (GObject                  *config,
+                                   GParamSpec              **param_specs,
+                                   guint                     n_param_specs,
+                                   GeglRectangle            *area,
+                                   GimpContext              *context,
+                                   GimpCreatePickerFunc      create_picker_func,
+                                   GimpCreateControllerFunc  create_controller_func,
+                                   gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_COLOR_TO_ALPHA_H__ */
diff --git a/app/propgui/gimppropgui-convolution-matrix.c b/app/propgui/gimppropgui-convolution-matrix.c
new file mode 100644
index 0000000..7a5635e
--- /dev/null
+++ b/app/propgui/gimppropgui-convolution-matrix.c
@@ -0,0 +1,309 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-convolution-matrix.c
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-convolution-matrix.h"
+#include "gimppropgui-generic.h"
+
+#include "gimp-intl.h"
+
+
+static const gchar *
+convolution_matrix_prop_name (gint x,
+                              gint y)
+{
+  static const gchar * const prop_names[5][5] = {
+    {"a1", "a2", "a3", "a4", "a5"},
+    {"b1", "b2", "b3", "b4", "b5"},
+    {"c1", "c2", "c3", "c4", "c5"},
+    {"d1", "d2", "d3", "d4", "d5"},
+    {"e1", "e2", "e3", "e4", "e5"}};
+
+  return prop_names[x][y];
+}
+
+static void
+convolution_matrix_rotate_flip (GtkWidget *button,
+                                GObject   *config)
+{
+  gint rotate = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+                                                    "convolution-matrix-rotate"));
+  gint flip   = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+                                                    "convolution-matrix-flip"));
+  gint x, y;
+
+  while (rotate--)
+    {
+      for (y = 0; y < 2; y++)
+        {
+          for (x = y; x < 4 - y; x++)
+            {
+              gint    i;
+              gdouble temp;
+
+              g_object_get (config,
+                            convolution_matrix_prop_name (x, y), &temp,
+                            NULL);
+
+              for (i = 0; i < 4; i++)
+                {
+                  gint    next_x, next_y;
+                  gdouble val;
+
+                  next_x = 4 - y;
+                  next_y = x;
+
+                  if  (i < 3)
+                    {
+                      g_object_get (config,
+                                    convolution_matrix_prop_name (next_x, next_y), &val,
+                                    NULL);
+                    }
+                  else
+                    {
+                      val = temp;
+                    }
+
+                  g_object_set (config,
+                                convolution_matrix_prop_name (x, y), val,
+                                NULL);
+
+                  x = next_x;
+                  y = next_y;
+                }
+            }
+        }
+    }
+
+  while (flip--)
+    {
+      for (y = 0; y < 5; y++)
+        {
+          for (x = 0; x < 2; x++)
+            {
+              gdouble val1, val2;
+
+              g_object_get (config,
+                            convolution_matrix_prop_name (x, y), &val1,
+                            NULL);
+              g_object_get (config,
+                            convolution_matrix_prop_name (4 - x, y), &val2,
+                            NULL);
+
+              g_object_set (config,
+                            convolution_matrix_prop_name (x, y), val2,
+                            NULL);
+              g_object_set (config,
+                            convolution_matrix_prop_name (4 - x, y), val1,
+                            NULL);
+            }
+        }
+    }
+}
+
+GtkWidget *
+_gimp_prop_gui_new_convolution_matrix (GObject                  *config,
+                                       GParamSpec              **param_specs,
+                                       guint                     n_param_specs,
+                                       GeglRectangle            *area,
+                                       GimpContext              *context,
+                                       GimpCreatePickerFunc      create_picker_func,
+                                       GimpCreateControllerFunc  create_controller_func,
+                                       gpointer                  creator)
+{
+  GtkWidget   *main_vbox;
+  GtkWidget   *vbox;
+  GtkWidget   *table;
+  GtkWidget   *hbox;
+  GtkWidget   *scale;
+  GtkWidget   *vbox2;
+  const gchar *label;
+  gint         x, y;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  /* matrix */
+
+  table = gtk_table_new (5, 5, TRUE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  for (y = 0; y < 5; y++)
+    {
+      for (x = 0; x < 5; x++)
+        {
+          GtkWidget *spin;
+
+          spin = gimp_prop_spin_button_new (config,
+                                            convolution_matrix_prop_name (x, y),
+                                            1.0, 10.0, 2);
+          gtk_entry_set_width_chars (GTK_ENTRY (spin), 8);
+          gtk_table_attach (GTK_TABLE (table), spin,
+                            x, x + 1, y, y + 1,
+                            GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+                            0, 0);
+          gtk_widget_show (spin);
+        }
+    }
+
+  /* rotate / flip buttons */
+  {
+    typedef struct
+    {
+      const gchar *tooltip;
+      const gchar *icon_name;
+      gint         rotate;
+      gint         flip;
+    } ButtonInfo;
+
+    gint             i;
+    const ButtonInfo buttons[] = {
+      {
+        .tooltip   = _("Rotate matrix 90° counter-clockwise"),
+        .icon_name = GIMP_ICON_OBJECT_ROTATE_270,
+        .rotate    = 1,
+        .flip      = 0
+      },
+      {
+        .tooltip   = _("Rotate matrix 90° clockwise"),
+        .icon_name = GIMP_ICON_OBJECT_ROTATE_90,
+        .rotate    = 3,
+        .flip      = 0
+      },
+      {
+        .tooltip   = _("Flip matrix horizontally"),
+        .icon_name = GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
+        .rotate    = 0,
+        .flip      = 1
+      },
+      {
+        .tooltip   = _("Flip matrix vertically"),
+        .icon_name = GIMP_ICON_OBJECT_FLIP_VERTICAL,
+        .rotate    = 2,
+        .flip      = 1
+      }};
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    for (i = 0; i < G_N_ELEMENTS (buttons); i++)
+      {
+        const ButtonInfo *info = &buttons[i];
+        GtkWidget        *button;
+        GtkWidget        *image;
+
+        button = gtk_button_new ();
+        gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+        gtk_widget_set_tooltip_text (button, info->tooltip);
+        gtk_widget_set_can_focus (button, FALSE);
+        gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+        gtk_widget_show (button);
+
+        image = gtk_image_new_from_icon_name (info->icon_name,
+                                              GTK_ICON_SIZE_BUTTON);
+        gtk_container_add (GTK_CONTAINER (button), image);
+        gtk_widget_show (image);
+
+        g_object_set_data (G_OBJECT (button),
+                           "convolution-matrix-rotate",
+                           GINT_TO_POINTER (info->rotate));
+        g_object_set_data (G_OBJECT (button),
+                           "convolution-matrix-flip",
+                           GINT_TO_POINTER (info->flip));
+
+        g_signal_connect (button, "clicked",
+                          G_CALLBACK (convolution_matrix_rotate_flip),
+                          config);
+      }
+  }
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  /* divisor / offset spin scales */
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  scale = gimp_prop_widget_new (config, "divisor",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "offset",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  /* rest of the properties */
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  vbox2 = _gimp_prop_gui_new_generic (config,
+                                      param_specs + 27, 4,
+                                      area, context,
+                                      create_picker_func,
+                                      create_controller_func,
+                                      creator);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
+  gtk_widget_show (vbox2);
+
+  vbox2 = _gimp_prop_gui_new_generic (config,
+                                      param_specs + 31,
+                                      n_param_specs - 31,
+                                      area, context,
+                                      create_picker_func,
+                                      create_controller_func,
+                                      creator);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
+  gtk_widget_show (vbox2);
+
+  return main_vbox;
+}
diff --git a/app/propgui/gimppropgui-convolution-matrix.h b/app/propgui/gimppropgui-convolution-matrix.h
new file mode 100644
index 0000000..21278c5
--- /dev/null
+++ b/app/propgui/gimppropgui-convolution-matrix.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-convolution-matrix.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_CONVOLUTION_MATRIX_H__
+#define __GIMP_PROP_GUI_CONVOLUTION_MATRIX_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_convolution_matrix (GObject                  *config,
+                                       GParamSpec              **param_specs,
+                                       guint                     n_param_specs,
+                                       GeglRectangle            *area,
+                                       GimpContext              *context,
+                                       GimpCreatePickerFunc      create_picker_func,
+                                       GimpCreateControllerFunc  create_controller_func,
+                                       gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_CONVOLUTION_MATRIX_H__ */
diff --git a/app/propgui/gimppropgui-diffraction-patterns.c b/app/propgui/gimppropgui-diffraction-patterns.c
new file mode 100644
index 0000000..ce4dc87
--- /dev/null
+++ b/app/propgui/gimppropgui-diffraction-patterns.c
@@ -0,0 +1,105 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-diffraction-patterns.c
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-diffraction-patterns.h"
+#include "gimppropgui-generic.h"
+
+#include "gimp-intl.h"
+
+
+GtkWidget *
+_gimp_prop_gui_new_diffraction_patterns (GObject                  *config,
+                                         GParamSpec              **param_specs,
+                                         guint                     n_param_specs,
+                                         GeglRectangle            *area,
+                                         GimpContext              *context,
+                                         GimpCreatePickerFunc      create_picker_func,
+                                         GimpCreateControllerFunc  create_controller_func,
+                                         gpointer                  creator)
+{
+  GtkWidget *notebook;
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  notebook = gtk_notebook_new ();
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs + 0, 3,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
+                            gtk_label_new (_("Frequencies")));
+  gtk_widget_show (vbox);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs + 3, 3,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
+                            gtk_label_new (_("Contours")));
+  gtk_widget_show (vbox);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs + 6, 3,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
+                            gtk_label_new (_("Sharp Edges")));
+  gtk_widget_show (vbox);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs + 9, 3,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
+                            gtk_label_new (_("Other Options")));
+  gtk_widget_show (vbox);
+
+  return notebook;
+}
diff --git a/app/propgui/gimppropgui-diffraction-patterns.h b/app/propgui/gimppropgui-diffraction-patterns.h
new file mode 100644
index 0000000..dd6bbc5
--- /dev/null
+++ b/app/propgui/gimppropgui-diffraction-patterns.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-diffraction-patterns.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_DIFFRACTION_PATTERNS_H__
+#define __GIMP_PROP_GUI_DIFFRACTION_PATTERNS_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_diffraction_patterns (GObject                  *config,
+                                         GParamSpec              **param_specs,
+                                         guint                     n_param_specs,
+                                         GeglRectangle            *area,
+                                         GimpContext              *context,
+                                         GimpCreatePickerFunc      create_picker_func,
+                                         GimpCreateControllerFunc  create_controller_func,
+                                         gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_DIFFRACTION_PATTERNS_H__ */
diff --git a/app/propgui/gimppropgui-eval.c b/app/propgui/gimppropgui-eval.c
new file mode 100644
index 0000000..719e500
--- /dev/null
+++ b/app/propgui/gimppropgui-eval.c
@@ -0,0 +1,1039 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-eval.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Less General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This is a simple interpreter for the GUM language (the GEGL UI Meta
+ * language), used in certain property keys of GEGL operations.  What follows
+ * is a hand-wavy summary of the syntax and semantics (no BNF for you!)
+ *
+ * There are currently two types of expressions:
+ *
+ * Boolean expressions
+ * -------------------
+ *
+ * There are three types of simple boolean expressions:
+ *
+ *   - Literal:  Either `0` or `1`, evaluating to FALSE and TRUE, respectively.
+ *
+ *   - Reference:  Has the form `$key` or `$property.key`.  Evaluates to the
+ *     value of key `key`, which should itself be a boolean expression.  In
+ *     the first form, `key` refers to a key of the same property to which the
+ *     currently-evaluated key belongs.  In the second form, `key` refers to a
+ *     key of `property`.
+ *
+ *   - Dependency:  Dependencies begin with the name of a property, on which
+ *     the result depends.  Currently supported property types are:
+ *
+ *       - Boolean:  The expression consists of the property name alone, and
+ *         its value is the value of the property.
+ *
+ *       - Enum:  The property name shall be followed by a brace-enclosed,
+ *         comma-separated list of enum values, given as nicks.  The expression
+ *         evaluates to TRUE iff the property matches any of the values.
+ *
+ * Complex boolean expressions can be formed using `!` (negation), `&`
+ * (conjunction), `|` (disjunction), and parentheses (grouping), following the
+ * usual precedence rules.
+ *
+ * String expressions
+ * ------------------
+ *
+ * There are three types of simple string expressions:
+ *
+ *   - Literal:  A string literal, surrounded by single quotes (`'`).  Special
+ *     characters (in particular, single quotes) can be escaped using a
+ *     backslash (`\`).
+ *
+ *   - Reference:  Same as a boolean reference, but should refer to a key
+ *     containing a string expression.
+ *
+ *   - Deferred literal:  Names a key, in the same fashion as a reference, but
+ *     without the leading `$`.  The value of this key is taken literally as
+ *     the value of the expression.  Deferred literals should usually be
+ *     favored over inline string literals, because they can be translated
+ *     independently of the expression.
+ *
+ * Currently, the only complex string expression is string selection:  It has
+ * the form of a bracket-enclosed, comma-separated list of expressions of the
+ * form `<condition> : <value>`, where `<condition>` is a boolean expression,
+ * and `<value>` is a string expression.  The result of the expression is the
+ * associated value of the first condition that evaluates to TRUE.  If no
+ * condition is met, the result is NULL.
+ *
+ *
+ * Whitespace separating subexpressions is insignificant.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gegl-paramspecs.h>
+#include <gtk/gtk.h>
+
+#include "propgui-types.h"
+
+#include "gimppropgui-eval.h"
+
+
+typedef enum
+{
+  GIMP_PROP_EVAL_FAILED  /* generic error condition */
+} GimpPropEvalErrorCode;
+
+
+static gboolean   gimp_prop_eval_boolean_impl     (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar    *key,
+                                                   gint            default_value,
+                                                   GError        **error,
+                                                   gint            depth);
+static gboolean   gimp_prop_eval_boolean_or       (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+static gboolean   gimp_prop_eval_boolean_and      (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+static gboolean   gimp_prop_eval_boolean_not      (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+static gboolean   gimp_prop_eval_boolean_group    (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+static gboolean   gimp_prop_eval_boolean_simple   (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+
+static gchar    * gimp_prop_eval_string_impl      (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar    *key,
+                                                   const gchar    *default_value,
+                                                   GError        **error,
+                                                   gint            depth);
+static gchar    * gimp_prop_eval_string_selection (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+static gchar    * gimp_prop_eval_string_simple    (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   gint            depth);
+
+static gboolean   gimp_prop_eval_parse_reference  (GObject        *config,
+                                                   GParamSpec     *pspec,
+                                                   const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error,
+                                                   GParamSpec    **ref_pspec,
+                                                   gchar         **ref_key);
+
+static gboolean   gimp_prop_eval_depth_test       (gint            depth,
+                                                   GError        **error);
+
+static gchar    * gimp_prop_eval_read_token       (const gchar   **expr,
+                                                   gchar         **t,
+                                                   GError        **error);
+static gboolean   gimp_prop_eval_is_name          (const gchar    *token);
+
+#define GIMP_PROP_EVAL_ERROR (gimp_prop_eval_error_quark ())
+
+static GQuark     gimp_prop_eval_error_quark      (void);
+
+
+/*  public functions  */
+
+gboolean
+gimp_prop_eval_boolean (GObject     *config,
+                        GParamSpec  *pspec,
+                        const gchar *key,
+                        gboolean     default_value)
+{
+  GError   *error = NULL;
+  gboolean  result;
+
+  result = gimp_prop_eval_boolean_impl (config, pspec,
+                                        key, default_value, &error, 0);
+
+  if (error)
+    {
+      g_warning ("in object of type '%s': %s",
+                 G_OBJECT_TYPE_NAME (config),
+                 error->message);
+
+      g_error_free (error);
+
+      return default_value;
+    }
+
+  return result;
+}
+
+gchar *
+gimp_prop_eval_string (GObject     *config,
+                       GParamSpec  *pspec,
+                       const gchar *key,
+                       const gchar *default_value)
+{
+  GError *error = NULL;
+  gchar  *result;
+
+  result = gimp_prop_eval_string_impl (config, pspec,
+                                       key, default_value, &error, 0);
+
+  if (error)
+    {
+      g_warning ("in object of type '%s': %s",
+                 G_OBJECT_TYPE_NAME (config),
+                 error->message);
+
+      g_error_free (error);
+
+      return g_strdup (default_value);
+    }
+
+  return result;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_prop_eval_boolean_impl (GObject      *config,
+                             GParamSpec   *pspec,
+                             const gchar  *key,
+                             gint          default_value,
+                             GError      **error,
+                             gint          depth)
+{
+  const gchar *expr;
+  gchar       *t      = NULL;
+  gboolean     result = FALSE;
+
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return FALSE;
+
+  expr = gegl_param_spec_get_property_key (pspec, key);
+
+  if (! expr)
+    {
+      /* we use `default_value < 0` to specify that the key must exist */
+      if (default_value < 0)
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "key '%s' of property '%s' not found",
+                       key,
+                       g_param_spec_get_name (pspec));
+
+          return FALSE;
+        }
+
+      return default_value;
+    }
+
+  gimp_prop_eval_read_token (&expr, &t, error);
+
+  if (! *error)
+    {
+      result = gimp_prop_eval_boolean_or (config, pspec,
+                                          &expr, &t, error, depth);
+    }
+
+  /* check for trailing tokens at the end of the expression */
+  if (! *error && t)
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "invalid expression");
+    }
+
+  g_free (t);
+
+  if (*error)
+    {
+      g_prefix_error (error,
+                      "in key '%s' of property '%s': ",
+                      key,
+                      g_param_spec_get_name (pspec));
+
+      return FALSE;
+    }
+
+  return result;
+}
+
+static gboolean
+gimp_prop_eval_boolean_or (GObject      *config,
+                           GParamSpec   *pspec,
+                           const gchar **expr,
+                           gchar       **t,
+                           GError      **error,
+                           gint          depth)
+{
+  gboolean result;
+
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return FALSE;
+
+  result = gimp_prop_eval_boolean_and (config, pspec,
+                                       expr, t, error, depth);
+
+  while (! *error && ! g_strcmp0 (*t, "|"))
+    {
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        return FALSE;
+
+      /* keep evaluating even if `result` is TRUE, because we still need to
+       * parse the rest of the subexpression.
+       */
+      result |= gimp_prop_eval_boolean_and (config, pspec,
+                                            expr, t, error, depth);
+    }
+
+  return result;
+}
+
+static gboolean
+gimp_prop_eval_boolean_and (GObject      *config,
+                            GParamSpec   *pspec,
+                            const gchar **expr,
+                            gchar       **t,
+                            GError      **error,
+                            gint          depth)
+{
+  gboolean result;
+
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return FALSE;
+
+  result = gimp_prop_eval_boolean_not (config, pspec,
+                                       expr, t, error, depth);
+
+  while (! *error && ! g_strcmp0 (*t, "&"))
+    {
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        return FALSE;
+
+      /* keep evaluating even if `result` is FALSE, because we still need to
+       * parse the rest of the subexpression.
+       */
+      result &= gimp_prop_eval_boolean_not (config, pspec,
+                                            expr, t, error, depth);
+    }
+
+  return result;
+}
+
+static gboolean
+gimp_prop_eval_boolean_not (GObject      *config,
+                            GParamSpec   *pspec,
+                            const gchar **expr,
+                            gchar       **t,
+                            GError      **error,
+                            gint          depth)
+{
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return FALSE;
+
+  if (! g_strcmp0 (*t, "!"))
+    {
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        return FALSE;
+
+      return ! gimp_prop_eval_boolean_not (config, pspec,
+                                           expr, t, error, depth + 1);
+    }
+
+  return gimp_prop_eval_boolean_group (config, pspec,
+                                       expr, t, error, depth);
+}
+
+static gboolean
+gimp_prop_eval_boolean_group (GObject      *config,
+                              GParamSpec   *pspec,
+                              const gchar **expr,
+                              gchar       **t,
+                              GError      **error,
+                              gint          depth)
+{
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return FALSE;
+
+  if (! g_strcmp0 (*t, "("))
+    {
+      gboolean result;
+
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        return FALSE;
+
+      result = gimp_prop_eval_boolean_or (config, pspec,
+                                          expr, t, error, depth + 1);
+
+      if (*error)
+        return FALSE;
+
+      if (g_strcmp0 (*t, ")"))
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "unterminated group");
+
+          return FALSE;
+        }
+
+      gimp_prop_eval_read_token (expr, t, error);
+
+      return result;
+    }
+
+  return gimp_prop_eval_boolean_simple (config, pspec,
+                                        expr, t, error, depth);
+}
+
+static gboolean
+gimp_prop_eval_boolean_simple (GObject      *config,
+                               GParamSpec   *pspec,
+                               const gchar **expr,
+                               gchar       **t,
+                               GError      **error,
+                               gint          depth)
+{
+  gboolean result;
+
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return FALSE;
+
+  if (! *t)
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "invalid expression");
+
+      return FALSE;
+    }
+
+  /* literal */
+  if (! strcmp (*t, "0"))
+    {
+      result = FALSE;
+
+      gimp_prop_eval_read_token (expr, t, error);
+    }
+  else if (! strcmp (*t, "1"))
+    {
+      result = TRUE;
+
+      gimp_prop_eval_read_token (expr, t, error);
+    }
+  /* reference */
+  else if (! strcmp (*t, "$"))
+    {
+      gchar *key;
+
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        return FALSE;
+
+      if (! gimp_prop_eval_parse_reference (config, pspec,
+                                            expr, t, error, &pspec, &key))
+        return FALSE;
+
+      result = gimp_prop_eval_boolean_impl (config, pspec,
+                                            key, -1, error, depth + 1);
+
+      g_free (key);
+    }
+  /* dependency */
+  else if (gimp_prop_eval_is_name (*t))
+    {
+      const gchar *property_name;
+      GParamSpec  *pspec;
+      GType        type;
+
+      property_name = *t;
+
+      pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                            property_name);
+
+      if (! pspec)
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "property '%s' not found",
+                       property_name);
+
+          return TRUE;
+        }
+
+      property_name = g_param_spec_get_name (pspec);
+      type          = G_PARAM_SPEC_VALUE_TYPE (pspec);
+
+      if (g_type_is_a (type, G_TYPE_BOOLEAN))
+        {
+          g_object_get (config, property_name, &result, NULL);
+        }
+      else if (g_type_is_a (type, G_TYPE_ENUM))
+        {
+          GEnumClass *enum_class;
+          gint        value;
+
+          gimp_prop_eval_read_token (expr, t, error);
+
+          if (*error)
+            return FALSE;
+
+          if (g_strcmp0 (*t , "{"))
+            {
+              g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                           "missing enum value set "
+                           "for property '%s'",
+                           property_name);
+
+              return FALSE;
+            }
+
+          enum_class = g_type_class_peek (type);
+
+          g_object_get (config, property_name, &value, NULL);
+
+          result = FALSE;
+
+          while (gimp_prop_eval_read_token (expr, t, error) &&
+                 gimp_prop_eval_is_name (*t))
+            {
+              const gchar *nick;
+              GEnumValue  *enum_value;
+
+              nick       = *t;
+              enum_value = g_enum_get_value_by_nick (enum_class, nick);
+
+              if (! enum_value)
+                {
+                  g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                               "invalid enum value '%s' "
+                               "for property '%s'",
+                               nick,
+                               property_name);
+
+                  return FALSE;
+                }
+
+              if (value == enum_value->value)
+                result = TRUE;
+
+              gimp_prop_eval_read_token (expr, t, error);
+
+              if (*error)
+                return FALSE;
+
+              if (! g_strcmp0 (*t, ","))
+                {
+                  continue;
+                }
+              else if (! g_strcmp0 (*t, "}"))
+                {
+                  break;
+                }
+              else
+                {
+                  g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                               "invalid enum value set "
+                               "for property '%s'",
+                               property_name);
+
+                  return FALSE;
+                }
+            }
+
+          if (*error)
+            return FALSE;
+
+          if (g_strcmp0 (*t, "}"))
+            {
+              g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                           "unterminated enum value set "
+                           "for property '%s'",
+                           property_name);
+
+              return FALSE;
+            }
+        }
+      else
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "invalid type "
+                       "for property '%s'",
+                       property_name);
+
+          return FALSE;
+        }
+
+      gimp_prop_eval_read_token (expr, t, error);
+    }
+  else
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "invalid expression");
+
+      return FALSE;
+    }
+
+  return result;
+}
+
+static gchar *
+gimp_prop_eval_string_impl (GObject      *config,
+                            GParamSpec   *pspec,
+                            const gchar  *key,
+                            const gchar  *default_value,
+                            GError      **error,
+                            gint          depth)
+{
+  const gchar *expr;
+  gchar       *t      = NULL;
+  gchar       *result = NULL;
+
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return NULL;
+
+  expr = gegl_param_spec_get_property_key (pspec, key);
+
+  if (! expr)
+    return g_strdup (default_value);
+
+  gimp_prop_eval_read_token (&expr, &t, error);
+
+  if (! *error)
+    {
+      result = gimp_prop_eval_string_selection (config, pspec,
+                                                &expr, &t, error, depth);
+    }
+
+  /* check for trailing tokens at the end of the expression */
+  if (! *error && t)
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "invalid expression");
+
+      g_free (result);
+    }
+
+  g_free (t);
+
+  if (*error)
+    {
+      g_prefix_error (error,
+                      "in key '%s' of property '%s': ",
+                      key,
+                      g_param_spec_get_name (pspec));
+
+      return NULL;
+    }
+
+  if (result)
+    return result;
+  else
+    return g_strdup (default_value);
+}
+
+static gchar *
+gimp_prop_eval_string_selection (GObject      *config,
+                                 GParamSpec   *pspec,
+                                 const gchar **expr,
+                                 gchar       **t,
+                                 GError      **error,
+                                 gint          depth)
+{
+  if (! gimp_prop_eval_depth_test (depth, error) || ! t)
+    return NULL;
+
+  if (! g_strcmp0 (*t, "["))
+    {
+      gboolean  match  = FALSE;
+      gchar    *result = NULL;
+
+      if (! g_strcmp0 (gimp_prop_eval_read_token (expr, t, error), "]"))
+        return NULL;
+
+      while (! *error)
+        {
+          gboolean  cond;
+          gchar    *value;
+
+          cond = gimp_prop_eval_boolean_or (config, pspec,
+                                            expr, t, error, depth + 1);
+
+          if (*error)
+            break;
+
+          if (g_strcmp0 (*t, ":"))
+            {
+              g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                           "missing string selection value");
+
+              break;
+            }
+
+          gimp_prop_eval_read_token (expr, t, error);
+
+          if (*error)
+            break;
+
+          value = gimp_prop_eval_string_selection (config, pspec,
+                                                   expr, t, error, depth + 1);
+
+          if (*error)
+            break;
+
+          if (! match && cond)
+            {
+              match  = TRUE;
+              result = value;
+            }
+
+          if (! g_strcmp0 (*t, ","))
+            {
+              gimp_prop_eval_read_token (expr, t, error);
+
+              continue;
+            }
+          else if (! g_strcmp0 (*t, "]"))
+            {
+              gimp_prop_eval_read_token (expr, t, error);
+
+              break;
+            }
+          else
+            {
+              if (*t)
+                {
+                  g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                               "invalid string selection");
+                }
+              else
+                {
+                  g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                               "unterminated string selection");
+                }
+
+              break;
+            }
+        }
+
+      if (*error)
+        {
+          g_free (result);
+
+          return NULL;
+        }
+
+      return result;
+    }
+
+  return gimp_prop_eval_string_simple (config,
+                                       pspec, expr, t, error, depth);
+}
+
+static gchar *
+gimp_prop_eval_string_simple (GObject      *config,
+                              GParamSpec   *pspec,
+                              const gchar **expr,
+                              gchar       **t,
+                              GError      **error,
+                              gint          depth)
+{
+  gchar *result = NULL;
+
+  if (! gimp_prop_eval_depth_test (depth, error))
+    return NULL;
+
+  /* literal */
+  if (*t && **t == '\'')
+    {
+      gchar *escaped;
+
+      escaped = g_strndup (*t + 1, strlen (*t + 1) - 1);
+
+      result = g_strcompress (escaped);
+
+      g_free (escaped);
+
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        {
+          g_free (result);
+
+          return NULL;
+        }
+    }
+  /* reference */
+  else if (! g_strcmp0 (*t, "$"))
+    {
+      gchar *key;
+
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        return NULL;
+
+      if (! gimp_prop_eval_parse_reference (config, pspec,
+                                            expr, t, error, &pspec, &key))
+        return NULL;
+
+      result = gimp_prop_eval_string_impl (config, pspec,
+                                           key, NULL, error, depth + 1);
+
+      g_free (key);
+    }
+  /* deferred literal */
+  else if (gimp_prop_eval_is_name (*t))
+    {
+      GParamSpec  *str_pspec;
+      gchar       *str_key;
+      const gchar *str;
+
+      if (! gimp_prop_eval_parse_reference (config, pspec,
+                                            expr, t, error,
+                                            &str_pspec, &str_key))
+        return NULL;
+
+      str = gegl_param_spec_get_property_key (str_pspec, str_key);
+
+      if (! str)
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "key '%s' of property '%s' not found",
+                       str_key,
+                       g_param_spec_get_name (str_pspec));
+
+          g_free (str_key);
+
+          return NULL;
+        }
+
+      g_free (str_key);
+
+      result = g_strdup (str);
+    }
+  else
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "invalid expression");
+
+      return NULL;
+    }
+
+  return result;
+}
+
+static gboolean
+gimp_prop_eval_parse_reference (GObject      *config,
+                                GParamSpec   *pspec,
+                                const gchar **expr,
+                                gchar       **t,
+                                GError      **error,
+                                GParamSpec  **ref_pspec,
+                                gchar       **ref_key)
+{
+  if (! gimp_prop_eval_is_name (*t))
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "invalid reference");
+
+      return FALSE;
+    }
+
+  *ref_pspec = pspec;
+  *ref_key   = g_strdup (*t);
+
+  gimp_prop_eval_read_token (expr, t, error);
+
+  if (*error)
+    {
+      g_free (*ref_key);
+
+      return FALSE;
+    }
+
+  if (! g_strcmp0 (*t, "."))
+    {
+      gchar *property_name;
+
+      property_name = *ref_key;
+
+      if (! gimp_prop_eval_read_token (expr, t, error) ||
+          ! gimp_prop_eval_is_name (*t))
+        {
+          if (! *error)
+            {
+              g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                           "invalid reference");
+            }
+
+          g_free (property_name);
+
+          return FALSE;
+        }
+
+      *ref_pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                                 property_name);
+
+      if (! *ref_pspec)
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "property '%s' not found",
+                       property_name);
+
+          g_free (property_name);
+
+          return FALSE;
+        }
+
+      g_free (property_name);
+
+      *ref_key = g_strdup (*t);
+
+      gimp_prop_eval_read_token (expr, t, error);
+
+      if (*error)
+        {
+          g_free (*ref_key);
+
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_prop_eval_depth_test (gint     depth,
+                           GError **error)
+{
+  /* make sure we don't recurse too deep.  in particular, guard against
+   * circular references.
+   */
+  if (depth == 100)
+    {
+      g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                   "maximal nesting level exceeded");
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gchar *
+gimp_prop_eval_read_token (const gchar **expr,
+                           gchar       **t,
+                           GError      **error)
+{
+  const gchar *token;
+
+  g_free (*t);
+  *t = NULL;
+
+  /* skip whitespace */
+  while (g_ascii_isspace (**expr))
+    ++*expr;
+
+  token = *expr;
+
+  if (*token == '\0')
+    return NULL;
+
+  /* name */
+  if (gimp_prop_eval_is_name (token))
+    {
+      do { ++*expr; } while (g_ascii_isalnum (**expr) ||
+                             **expr == '_'            ||
+                             **expr == '-');
+    }
+  /* string literal */
+  else if (token[0] == '\'')
+    {
+      for (++*expr; **expr != '\0' && **expr != '\''; ++*expr)
+        {
+          if (**expr == '\\')
+            {
+              ++*expr;
+
+              if (**expr == '\0')
+                break;
+            }
+        }
+
+      if (**expr == '\0')
+        {
+          g_set_error (error, GIMP_PROP_EVAL_ERROR, GIMP_PROP_EVAL_FAILED,
+                       "unterminated string literal");
+
+          return NULL;
+        }
+
+      ++*expr;
+    }
+  /* punctuation or boolean literal */
+  else
+    {
+      ++*expr;
+    }
+
+  *t = g_strndup (token, *expr - token);
+
+  return *t;
+}
+
+static gboolean
+gimp_prop_eval_is_name (const gchar *token)
+{
+  return token && (g_ascii_isalpha (*token) || *token == '_');
+}
+
+static GQuark
+gimp_prop_eval_error_quark (void)
+{
+  return g_quark_from_static_string ("gimp-prop-eval-error-quark");
+}
diff --git a/app/propgui/gimppropgui-eval.h b/app/propgui/gimppropgui-eval.h
new file mode 100644
index 0000000..e2b8708
--- /dev/null
+++ b/app/propgui/gimppropgui-eval.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui.h
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_EVAL_H__
+#define __GIMP_PROP_GUI_EVAL_H__
+
+
+gboolean   gimp_prop_eval_boolean (GObject     *config,
+                                   GParamSpec  *pspec,
+                                   const gchar *key,
+                                   gboolean     default_value);
+
+gchar    * gimp_prop_eval_string  (GObject     *config,
+                                   GParamSpec  *pspec,
+                                   const gchar *key,
+                                   const gchar *default_value);
+
+
+#endif /* __GIMP_PROP_GUI_EVAL_H__ */
diff --git a/app/propgui/gimppropgui-focus-blur.c b/app/propgui/gimppropgui-focus-blur.c
new file mode 100644
index 0000000..ecee097
--- /dev/null
+++ b/app/propgui/gimppropgui-focus-blur.c
@@ -0,0 +1,246 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-focus-blur.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-focus-blur.h"
+
+#include "gimp-intl.h"
+
+
+static gint
+find_param (GParamSpec  **param_specs,
+            guint         n_param_specs,
+            const gchar  *name)
+{
+  gint i;
+
+  for (i = 0; i < n_param_specs; i++)
+    {
+      if (! strcmp (param_specs[i]->name, name))
+        break;
+    }
+
+  return i;
+}
+
+static void
+focus_callback (GObject       *config,
+                GeglRectangle *area,
+                GimpLimitType  type,
+                gdouble        x,
+                gdouble        y,
+                gdouble        radius,
+                gdouble        aspect_ratio,
+                gdouble        angle,
+                gdouble        inner_limit,
+                gdouble        midpoint)
+{
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  g_object_set (config,
+                "shape",        type,
+                "x",            x / area->width,
+                "y",            y / area->height,
+                "radius",       2.0 * radius / area->width,
+                "focus",        inner_limit,
+                "midpoint",     midpoint,
+                "aspect-ratio", aspect_ratio,
+                "rotation",     fmod (
+                                  fmod (angle * 180.0 / G_PI + 180.0, 360.0) +
+                                  360.0,
+                                  360.0) - 180.0,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerFocusCallback  set_func;
+  GeglRectangle               *area;
+  GimpLimitType                shape;
+  gdouble                      radius;
+  gdouble                      focus;
+  gdouble                      midpoint;
+  gdouble                      x, y;
+  gdouble                      aspect_ratio;
+  gdouble                      rotation;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "shape",        &shape,
+                "radius",       &radius,
+                "focus",        &focus,
+                "midpoint",     &midpoint,
+                "x",            &x,
+                "y",            &y,
+                "aspect-ratio", &aspect_ratio,
+                "rotation",     &rotation,
+                NULL);
+
+  set_func (set_data, area,
+            shape,
+            x * area->width,
+            y * area->height,
+            radius * area->width / 2.0,
+            aspect_ratio,
+            rotation / 180.0 * G_PI,
+            focus,
+            midpoint);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_focus_blur (GObject                  *config,
+                               GParamSpec              **param_specs,
+                               guint                     n_param_specs,
+                               GeglRectangle            *area,
+                               GimpContext              *context,
+                               GimpCreatePickerFunc      create_picker_func,
+                               GimpCreateControllerFunc  create_controller_func,
+                               gpointer                  creator)
+{
+  GtkWidget *vbox;
+  gint       first_geometry_param;
+  gint       last_geometry_param;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  first_geometry_param = find_param (param_specs, n_param_specs,
+                                     "shape") + 1;
+  last_geometry_param  = find_param (param_specs, n_param_specs,
+                                     "high-quality");
+
+  if (last_geometry_param <= first_geometry_param)
+    {
+      vbox = _gimp_prop_gui_new_generic (config,
+                                         param_specs, n_param_specs,
+                                         area, context,
+                                         create_picker_func,
+                                         create_controller_func,
+                                         creator);
+    }
+  else
+    {
+      GtkWidget   *widget;
+      GtkWidget   *expander;
+      GtkWidget   *frame;
+      const gchar *label;
+
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+      widget = gimp_prop_widget_new (config,
+                                     "shape",
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator,
+                                     &label);
+      gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+      gtk_widget_show (widget);
+
+      widget = _gimp_prop_gui_new_generic (config,
+                                           param_specs,
+                                           first_geometry_param - 1,
+                                           area, context,
+                                           create_picker_func,
+                                           create_controller_func,
+                                           creator);
+      gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+      gtk_widget_show (widget);
+
+      widget = _gimp_prop_gui_new_generic (config,
+                                           param_specs + last_geometry_param,
+                                           n_param_specs - last_geometry_param,
+                                           area, context,
+                                           create_picker_func,
+                                           create_controller_func,
+                                           creator);
+      gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+      gtk_widget_show (widget);
+
+      expander = gtk_expander_new (_("Geometry Options"));
+      gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+      gtk_widget_show (expander);
+
+      frame = gimp_frame_new (NULL);
+      gtk_container_add (GTK_CONTAINER (expander), frame);
+      gtk_widget_show (frame);
+
+      widget = _gimp_prop_gui_new_generic (config,
+                                           param_specs + first_geometry_param,
+                                           last_geometry_param -
+                                           first_geometry_param,
+                                           area, context,
+                                           create_picker_func,
+                                           create_controller_func,
+                                           creator);
+      gtk_container_add (GTK_CONTAINER (frame), widget);
+      gtk_widget_show (widget);
+    }
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_FOCUS,
+                                         _("Focus Blur: "),
+                                         (GCallback) focus_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
+
diff --git a/app/propgui/gimppropgui-focus-blur.h b/app/propgui/gimppropgui-focus-blur.h
new file mode 100644
index 0000000..1c0c0c7
--- /dev/null
+++ b/app/propgui/gimppropgui-focus-blur.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-focus-blur.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_FOCUS_BLUR_H__
+#define __GIMP_PROP_GUI_FOCUS_BLUR_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_focus_blur (GObject                  *config,
+                               GParamSpec              **param_specs,
+                               guint                     n_param_specs,
+                               GeglRectangle            *area,
+                               GimpContext              *context,
+                               GimpCreatePickerFunc      create_picker_func,
+                               GimpCreateControllerFunc  create_controller_func,
+                               gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_FOCUS_BLUR_H__ */
diff --git a/app/propgui/gimppropgui-generic.c b/app/propgui/gimppropgui-generic.c
new file mode 100644
index 0000000..a7c7e89
--- /dev/null
+++ b/app/propgui/gimppropgui-generic.c
@@ -0,0 +1,377 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-generic.c
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gegl-paramspecs.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+
+#include "gimp-intl.h"
+
+
+#define HAS_KEY(p,k,v) gimp_gegl_param_spec_has_key (p, k, v)
+
+
+static void   gimp_prop_gui_chain_toggled (GimpChainButton *chain,
+                                           GtkAdjustment   *x_adj);
+
+
+/*  public functions  */
+
+GtkWidget *
+_gimp_prop_gui_new_generic (GObject                  *config,
+                            GParamSpec              **param_specs,
+                            guint                     n_param_specs,
+                            GeglRectangle            *area,
+                            GimpContext              *context,
+                            GimpCreatePickerFunc      create_picker_func,
+                            GimpCreateControllerFunc  create_controller_func,
+                            gpointer                  creator)
+{
+  GtkWidget    *main_vbox;
+  GtkSizeGroup *label_group;
+  GList        *chains = NULL;
+  gint          i;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+  label_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  for (i = 0; i < n_param_specs; i++)
+    {
+      GParamSpec  *pspec      = param_specs[i];
+      GParamSpec  *next_pspec = NULL;
+
+      if (i < n_param_specs - 1)
+        next_pspec = param_specs[i + 1];
+
+      if (next_pspec                        &&
+          HAS_KEY (pspec,      "axis", "x") &&
+          HAS_KEY (next_pspec, "axis", "y"))
+        {
+          GtkWidget     *widget_x;
+          GtkWidget     *widget_y;
+          const gchar   *label_x;
+          const gchar   *label_y;
+          GtkAdjustment *adj_x;
+          GtkAdjustment *adj_y;
+          GtkWidget     *hbox;
+          GtkWidget     *vbox;
+          GtkWidget     *chain;
+
+          i++;
+
+          widget_x = gimp_prop_widget_new_from_pspec (config, pspec,
+                                                      area, context,
+                                                      create_picker_func,
+                                                      create_controller_func,
+                                                      creator,
+                                                      &label_x);
+          widget_y = gimp_prop_widget_new_from_pspec (config, next_pspec,
+                                                      area, context,
+                                                      create_picker_func,
+                                                      create_controller_func,
+                                                      creator,
+                                                      &label_y);
+
+          adj_x = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget_x));
+          adj_y = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget_y));
+
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+          gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+          gtk_widget_show (hbox);
+
+          gimp_prop_gui_bind_container (widget_x, hbox);
+
+          vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+          gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+          gtk_widget_show (vbox);
+
+          gtk_box_pack_start (GTK_BOX (vbox), widget_x, FALSE, FALSE, 0);
+          gtk_widget_show (widget_x);
+
+          gtk_box_pack_start (GTK_BOX (vbox), widget_y, FALSE, FALSE, 0);
+          gtk_widget_show (widget_y);
+
+          chain = gimp_chain_button_new (GIMP_CHAIN_RIGHT);
+          gtk_box_pack_end (GTK_BOX (hbox), chain, FALSE, FALSE, 0);
+          gtk_widget_show (chain);
+
+          if (! HAS_KEY (pspec, "unit", "pixel-coordinate")    &&
+              ! HAS_KEY (pspec, "unit", "relative-coordinate") &&
+              gtk_adjustment_get_value (adj_x) ==
+              gtk_adjustment_get_value (adj_y))
+            {
+              GBinding *binding;
+
+              gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (chain), TRUE);
+
+              binding = g_object_bind_property (adj_x, "value",
+                                                adj_y, "value",
+                                                G_BINDING_BIDIRECTIONAL);
+
+              g_object_set_data (G_OBJECT (chain), "binding", binding);
+            }
+
+          g_object_set_data_full (G_OBJECT (chain), "x-property",
+                                  g_strdup (pspec->name), g_free);
+          g_object_set_data_full (G_OBJECT (chain), "y-property",
+                                  g_strdup (next_pspec->name), g_free);
+
+          chains = g_list_prepend (chains, chain);
+
+          g_signal_connect (chain, "toggled",
+                            G_CALLBACK (gimp_prop_gui_chain_toggled),
+                            adj_x);
+
+          g_object_set_data (G_OBJECT (adj_x), "y-adjustment", adj_y);
+
+          if (create_picker_func &&
+              (HAS_KEY (pspec, "unit", "pixel-coordinate") ||
+               HAS_KEY (pspec, "unit", "relative-coordinate")))
+            {
+              GtkWidget *button;
+              gchar     *pspec_name;
+
+              pspec_name = g_strconcat (pspec->name, ":",
+                                        next_pspec->name, NULL);
+
+              button = create_picker_func (creator,
+                                           pspec_name,
+                                           GIMP_ICON_CURSOR,
+                                           _("Pick coordinates from the image"),
+                                           /* pick_abyss = */ TRUE,
+                                           NULL, NULL);
+              gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+              gtk_widget_show (button);
+
+              g_object_weak_ref (G_OBJECT (button),
+                                 (GWeakNotify) g_free, pspec_name);
+            }
+        }
+      else if (next_pspec                                  &&
+               HAS_KEY (pspec,      "role", "range-start") &&
+               HAS_KEY (next_pspec, "role", "range-end")   &&
+               HAS_KEY (pspec,      "unit", "luminance"))
+        {
+          GtkWidget   *vbox;
+          GtkWidget   *spin_scale;
+          GtkWidget   *label;
+          GtkWidget   *frame;
+          GtkWidget   *range;
+          const gchar *label_str;
+          const gchar *range_label_str;
+          gdouble      step_increment;
+          gdouble      page_increment;
+          gdouble      ui_lower;
+          gdouble      ui_upper;
+
+          i++;
+
+          vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+          gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+
+          spin_scale = gimp_prop_widget_new_from_pspec (
+            config, pspec,
+            area, context,
+            create_picker_func,
+            create_controller_func,
+            creator,
+            &label_str);
+          gtk_widget_show (spin_scale);
+
+          g_object_set_data_full (G_OBJECT (vbox),
+                                  "gimp-underlying-widget",
+                                  g_object_ref_sink (spin_scale),
+                                  g_object_unref);
+
+          range_label_str = gegl_param_spec_get_property_key (pspec,
+                                                              "range-label");
+
+          if (range_label_str)
+            label_str = range_label_str;
+
+          gtk_spin_button_get_increments (GTK_SPIN_BUTTON (spin_scale),
+                                          &step_increment, &page_increment);
+
+          gimp_spin_scale_get_scale_limits (GIMP_SPIN_SCALE (spin_scale),
+                                            &ui_lower, &ui_upper);
+
+          label = gtk_label_new_with_mnemonic (label_str);
+          gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+          gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+          gtk_widget_show (label);
+
+          if (! range_label_str)
+            {
+              g_object_bind_property (spin_scale, "label",
+                                      label,      "label",
+                                      G_BINDING_SYNC_CREATE);
+            }
+
+          frame = gimp_frame_new (NULL);
+          gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+          gtk_widget_show (frame);
+
+          range = gimp_prop_range_new (config,
+                                       pspec->name, next_pspec->name,
+                                       step_increment, page_increment,
+                                       gtk_spin_button_get_digits (
+                                         GTK_SPIN_BUTTON (spin_scale)),
+                                       ! HAS_KEY (pspec,
+                                                  "range-sorted", "false"));
+          gimp_prop_range_set_ui_limits (range, ui_lower, ui_upper);
+          gtk_container_add (GTK_CONTAINER (frame), range);
+          gtk_widget_show (range);
+
+          gimp_prop_gui_bind_container (spin_scale, vbox);
+          gimp_prop_gui_bind_tooltip   (spin_scale, vbox);
+        }
+      else
+        {
+          GtkWidget   *widget;
+          const gchar *label;
+          gboolean     expand = FALSE;
+
+          widget = gimp_prop_widget_new_from_pspec (config, pspec,
+                                                    area, context,
+                                                    create_picker_func,
+                                                    create_controller_func,
+                                                    creator,
+                                                    &label);
+
+          if (GTK_IS_SCROLLED_WINDOW (widget))
+            expand = TRUE;
+
+          if (widget && label)
+            {
+              GtkWidget *l;
+
+              l = gtk_label_new_with_mnemonic (label);
+              gtk_label_set_xalign (GTK_LABEL (l), 0.0);
+              gtk_widget_show (l);
+
+              gimp_prop_gui_bind_label (widget, l);
+
+              if (GTK_IS_SCROLLED_WINDOW (widget))
+                {
+                  GtkWidget *frame;
+
+                  /* don't set as frame title, it should not be bold */
+                  gtk_box_pack_start (GTK_BOX (main_vbox), l, FALSE, FALSE, 0);
+
+                  frame = gimp_frame_new (NULL);
+                  gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
+                  gtk_widget_show (frame);
+
+                  gtk_container_add (GTK_CONTAINER (frame), widget);
+                  gtk_widget_show (widget);
+
+                  gimp_prop_gui_bind_container (widget, frame);
+                }
+              else
+                {
+                  GtkWidget *hbox;
+
+                  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+                  gtk_box_pack_start (GTK_BOX (main_vbox), hbox,
+                                      expand, expand, 0);
+                  gtk_widget_show (hbox);
+
+                  gtk_size_group_add_widget (label_group, l);
+                  gtk_box_pack_start (GTK_BOX (hbox), l, FALSE, FALSE, 0);
+
+                  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+                  gtk_widget_show (widget);
+
+                  gimp_prop_gui_bind_container (widget, hbox);
+                }
+            }
+          else if (widget)
+            {
+              gtk_box_pack_start (GTK_BOX (main_vbox), widget,
+                                  expand, expand, 0);
+              gtk_widget_show (widget);
+            }
+        }
+    }
+
+  g_object_unref (label_group);
+
+  g_object_set_data_full (G_OBJECT (main_vbox), "chains", chains,
+                          (GDestroyNotify) g_list_free);
+
+  return main_vbox;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_prop_gui_chain_toggled (GimpChainButton *chain,
+                             GtkAdjustment   *x_adj)
+{
+  GBinding      *binding;
+  GtkAdjustment *y_adj;
+
+  binding = g_object_get_data (G_OBJECT (chain), "binding");
+  y_adj   = g_object_get_data (G_OBJECT (x_adj), "y-adjustment");
+
+  if (gimp_chain_button_get_active (chain))
+    {
+      if (! binding)
+        binding = g_object_bind_property (x_adj, "value",
+                                          y_adj, "value",
+                                          G_BINDING_BIDIRECTIONAL);
+    }
+  else
+    {
+      g_clear_object (&binding);
+    }
+  g_object_set_data (G_OBJECT (chain), "binding", binding);
+}
diff --git a/app/propgui/gimppropgui-generic.h b/app/propgui/gimppropgui-generic.h
new file mode 100644
index 0000000..40e5269
--- /dev/null
+++ b/app/propgui/gimppropgui-generic.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-generic.h
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_GENERIC_H__
+#define __GIMP_PROP_GUI_GENERIC_H__
+
+
+GtkWidget * _gimp_prop_gui_new_generic (GObject                  *config,
+                                        GParamSpec              **param_specs,
+                                        guint                     n_param_specs,
+                                        GeglRectangle            *area,
+                                        GimpContext              *context,
+                                        GimpCreatePickerFunc      create_picker_func,
+                                        GimpCreateControllerFunc  create_controller_func,
+                                        gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_GENERIC_H__ */
diff --git a/app/propgui/gimppropgui-hue-saturation.c b/app/propgui/gimppropgui-hue-saturation.c
new file mode 100644
index 0000000..df96202
--- /dev/null
+++ b/app/propgui/gimppropgui-hue-saturation.c
@@ -0,0 +1,288 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-hue-saturation.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "operations/gimphuesaturationconfig.h"
+#include "operations/gimpoperationhuesaturation.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimppropwidgets.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-hue-saturation.h"
+
+#include "gimp-intl.h"
+
+
+#define COLOR_WIDTH  40
+#define COLOR_HEIGHT 20
+
+
+static void
+hue_saturation_config_notify (GObject          *object,
+                              const GParamSpec *pspec,
+                              GtkWidget        *color_area)
+{
+  GimpHueSaturationConfig *config = GIMP_HUE_SATURATION_CONFIG (object);
+  GimpHueRange             range;
+  GimpRGB                  color;
+
+  static const GimpRGB default_colors[7] =
+  {
+    {   0,   0,   0, },
+    { 1.0,   0,   0, },
+    { 1.0, 1.0,   0, },
+    {   0, 1.0,   0, },
+    {   0, 1.0, 1.0, },
+    {   0,   0, 1.0, },
+    { 1.0,   0, 1.0, }
+  };
+
+  range = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (color_area),
+                                              "hue-range"));
+  color = default_colors[range];
+
+  gimp_operation_hue_saturation_map (config, &color, range, &color);
+
+  gimp_color_area_set_color (GIMP_COLOR_AREA (color_area), &color);
+}
+
+static void
+hue_saturation_range_callback (GtkWidget *widget,
+                               GObject   *config)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GimpHueRange range;
+
+      gimp_radio_button_update (widget, &range);
+      g_object_set (config,
+                    "range", range,
+                    NULL);
+    }
+}
+
+static void
+hue_saturation_range_notify (GObject          *object,
+                             const GParamSpec *pspec,
+                             GtkWidget        *range_radio)
+{
+  GimpHueSaturationConfig *config = GIMP_HUE_SATURATION_CONFIG (object);
+
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (range_radio),
+                                   config->range);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_hue_saturation (GObject                  *config,
+                                   GParamSpec              **param_specs,
+                                   guint                     n_param_specs,
+                                   GeglRectangle            *area,
+                                   GimpContext              *context,
+                                   GimpCreatePickerFunc      create_picker_func,
+                                   GimpCreateControllerFunc  create_controller_func,
+                                   gpointer                  creator)
+{
+  GtkWidget *main_vbox;
+  GtkWidget *frame;
+  GtkWidget *vbox;
+  GtkWidget *abox;
+  GtkWidget *table;
+  GtkWidget *scale;
+  GtkWidget *button;
+  GtkWidget *hbox;
+  GtkWidget *range_radio;
+  GSList    *group = NULL;
+  gint       i;
+
+  const struct
+  {
+    const gchar *label;
+    const gchar *tooltip;
+    gint         label_col;
+    gint         label_row;
+    gint         frame_col;
+    gint         frame_row;
+  }
+  hue_range_table[] =
+  {
+    { N_("M_aster"), N_("Adjust all colors"), 2, 3, 0, 0 },
+    { N_("_R"),      N_("Red"),               2, 1, 2, 0 },
+    { N_("_Y"),      N_("Yellow"),            1, 2, 0, 2 },
+    { N_("_G"),      N_("Green"),             1, 4, 0, 4 },
+    { N_("_C"),      N_("Cyan"),              2, 5, 2, 6 },
+    { N_("_B"),      N_("Blue"),              3, 4, 4, 4 },
+    { N_("_M"),      N_("Magenta"),           3, 2, 4, 2 }
+  };
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  frame = gimp_frame_new (_("Select Primary Color to Adjust"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), abox, TRUE, TRUE, 0);
+  gtk_widget_show (abox);
+
+  /*  The table containing hue ranges  */
+  table = gtk_table_new (7, 5, FALSE);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 3, 4);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 5, 2);
+  gtk_container_add (GTK_CONTAINER (abox), table);
+
+  /*  the radio buttons for hue ranges  */
+  for (i = 0; i < G_N_ELEMENTS (hue_range_table); i++)
+    {
+      button = gtk_radio_button_new_with_mnemonic (group,
+                                                   gettext (hue_range_table[i].label));
+      group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+      g_object_set_data (G_OBJECT (button), "gimp-item-data",
+                         GINT_TO_POINTER (i));
+
+      gimp_help_set_help_data (button,
+                               gettext (hue_range_table[i].tooltip),
+                               NULL);
+
+      if (i == 0)
+        {
+          gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
+
+          range_radio = button;
+        }
+
+      gtk_table_attach (GTK_TABLE (table), button,
+                        hue_range_table[i].label_col,
+                        hue_range_table[i].label_col + 1,
+                        hue_range_table[i].label_row,
+                        hue_range_table[i].label_row + 1,
+                        GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+
+      if (i > 0)
+        {
+          GtkWidget *color_area;
+          GimpRGB    color = { 0, };
+
+          frame = gtk_frame_new (NULL);
+          gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+          gtk_table_attach (GTK_TABLE (table), frame,
+                            hue_range_table[i].frame_col,
+                            hue_range_table[i].frame_col + 1,
+                            hue_range_table[i].frame_row,
+                            hue_range_table[i].frame_row + 1,
+                            GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+          gtk_widget_show (frame);
+
+          color_area = gimp_color_area_new (&color, GIMP_COLOR_AREA_FLAT, 0);
+          gtk_widget_set_size_request (color_area, COLOR_WIDTH, COLOR_HEIGHT);
+          gtk_container_add (GTK_CONTAINER (frame), color_area);
+          gtk_widget_show (color_area);
+
+          g_object_set_data (G_OBJECT (color_area), "hue-range",
+                             GINT_TO_POINTER (i));
+          g_signal_connect_object (config, "notify",
+                                   G_CALLBACK (hue_saturation_config_notify),
+                                   color_area, 0);
+          hue_saturation_config_notify (config, NULL, color_area);
+        }
+
+      g_signal_connect (button, "toggled",
+                        G_CALLBACK (hue_saturation_range_callback),
+                        config);
+
+      gtk_widget_show (button);
+    }
+
+  gtk_widget_show (table);
+
+  /* Create the 'Overlap' option slider */
+  scale = gimp_prop_spin_scale_new (config, "overlap",
+                                    _("_Overlap"), 0.01, 0.1, 0);
+  gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  frame = gimp_frame_new (_("Adjust Selected Color"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  /*  Create the hue scale widget  */
+  scale = gimp_prop_spin_scale_new (config, "hue",
+                                    _("_Hue"), 1.0 / 180.0, 15.0 / 180.0, 0);
+  gimp_prop_widget_set_factor (scale, 180.0, 0.0, 0.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  Create the lightness scale widget  */
+  scale = gimp_prop_spin_scale_new (config, "lightness",
+                                    _("_Lightness"), 0.01, 0.1, 0);
+  gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  Create the saturation scale widget  */
+  scale = gimp_prop_spin_scale_new (config, "saturation",
+                                    _("_Saturation"), 0.01, 0.1, 0);
+  gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gtk_button_new_with_mnemonic (_("R_eset Color"));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect_swapped (button, "clicked",
+                            G_CALLBACK (gimp_hue_saturation_config_reset_range),
+                            config);
+
+  g_signal_connect_object (config, "notify::range",
+                           G_CALLBACK (hue_saturation_range_notify),
+                           range_radio, 0);
+  hue_saturation_range_notify (config, NULL, range_radio);
+
+  return main_vbox;
+}
diff --git a/app/propgui/gimppropgui-hue-saturation.h b/app/propgui/gimppropgui-hue-saturation.h
new file mode 100644
index 0000000..efeca87
--- /dev/null
+++ b/app/propgui/gimppropgui-hue-saturation.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-hue-saturation.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_HUE_SATURATION_H__
+#define __GIMP_PROP_GUI_HUE_SATURATION_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_hue_saturation (GObject                  *config,
+                                   GParamSpec              **param_specs,
+                                   guint                     n_param_specs,
+                                   GeglRectangle            *area,
+                                   GimpContext              *context,
+                                   GimpCreatePickerFunc      create_picker_func,
+                                   GimpCreateControllerFunc  create_controller_func,
+                                   gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_HUE_SATURATION_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-circular.c b/app/propgui/gimppropgui-motion-blur-circular.c
new file mode 100644
index 0000000..a008ef1
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-circular.c
@@ -0,0 +1,151 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-circular.c
+ * Copyright (C) 2019  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui-generic.h"
+#include "gimppropgui-motion-blur-circular.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject       *config,
+               GeglRectangle *area,
+               gdouble        x1,
+               gdouble        y1,
+               gdouble        x2,
+               gdouble        y2)
+{
+  gdouble x, y;
+  gdouble angle;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  x     = x1 / area->width;
+  y     = y1 / area->height;
+  angle = atan2 (-(y2 - y1), x2 - x1);
+
+  angle = angle * 180.0 / G_PI;
+
+  if (angle < 0)
+    angle += 360.0;
+
+  g_object_set (config,
+                "center-x", x,
+                "center-y", y,
+                "angle",    angle,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerLineCallback  set_func;
+  GeglRectangle              *area;
+  gdouble                     x, y;
+  gdouble                     angle;
+  gdouble                     x1, y1, x2, y2;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "center-x", &x,
+                "center-y", &y,
+                "angle",    &angle,
+                NULL);
+
+  angle = angle / 180.0 * G_PI;
+
+  x1 = x * area->width;
+  y1 = y * area->height;
+  x2 = x1 + cos (angle) * 100;
+  y2 = y1 - sin (angle) * 100;
+
+  set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_circular (GObject                  *config,
+                                         GParamSpec              **param_specs,
+                                         guint                     n_param_specs,
+                                         GeglRectangle            *area,
+                                         GimpContext              *context,
+                                         GimpCreatePickerFunc      create_picker_func,
+                                         GimpCreateControllerFunc  create_controller_func,
+                                         gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_LINE,
+                                         _("Circular Motion Blur: "),
+                                         (GCallback) line_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-motion-blur-circular.h b/app/propgui/gimppropgui-motion-blur-circular.h
new file mode 100644
index 0000000..3bb851e
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-circular.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-circular.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__
+#define __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_circular (GObject                  *config,
+                                         GParamSpec              **param_specs,
+                                         guint                     n_param_specs,
+                                         GeglRectangle            *area,
+                                         GimpContext              *context,
+                                         GimpCreatePickerFunc      create_picker_func,
+                                         GimpCreateControllerFunc  create_controller_func,
+                                         gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-linear.c b/app/propgui/gimppropgui-motion-blur-linear.c
new file mode 100644
index 0000000..ed917aa
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-linear.c
@@ -0,0 +1,145 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-linear.c
+ * Copyright (C) 2019  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui-generic.h"
+#include "gimppropgui-motion-blur-linear.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject       *config,
+               GeglRectangle *area,
+               gdouble        x1,
+               gdouble        y1,
+               gdouble        x2,
+               gdouble        y2)
+{
+  gdouble length;
+  gdouble angle;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  length = sqrt (SQR (x2 - x1) + SQR (y2 - y1));
+  angle  = atan2 (y2 - y1, x2 - x1);
+
+  angle = angle / G_PI * 180.0;
+
+  g_object_set (config,
+                "length", length,
+                "angle",  angle,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerLineCallback  set_func;
+  GeglRectangle              *area;
+  gdouble                     length;
+  gdouble                     angle;
+  gdouble                     x1, y1, x2, y2;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "length", &length,
+                "angle",  &angle,
+                NULL);
+
+  angle = angle / 180.0 * G_PI;
+
+  x1 = area->x + area->width  / 2.0;
+  y1 = area->x + area->height / 2.0;
+  x2 = x1 + cos (angle) * length;
+  y2 = y1 + sin (angle) * length;
+
+  set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_linear (GObject                  *config,
+                                       GParamSpec              **param_specs,
+                                       guint                     n_param_specs,
+                                       GeglRectangle            *area,
+                                       GimpContext              *context,
+                                       GimpCreatePickerFunc      create_picker_func,
+                                       GimpCreateControllerFunc  create_controller_func,
+                                       gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_LINE,
+                                         _("Linear Motion Blur: "),
+                                         (GCallback) line_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-motion-blur-linear.h b/app/propgui/gimppropgui-motion-blur-linear.h
new file mode 100644
index 0000000..aacb528
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-linear.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-linear.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__
+#define __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_linear (GObject                  *config,
+                                       GParamSpec              **param_specs,
+                                       guint                     n_param_specs,
+                                       GeglRectangle            *area,
+                                       GimpContext              *context,
+                                       GimpCreatePickerFunc      create_picker_func,
+                                       GimpCreateControllerFunc  create_controller_func,
+                                       gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-zoom.c b/app/propgui/gimppropgui-motion-blur-zoom.c
new file mode 100644
index 0000000..e8e359b
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-zoom.c
@@ -0,0 +1,146 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-zoom.c
+ * Copyright (C) 2019  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui-generic.h"
+#include "gimppropgui-motion-blur-zoom.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject       *config,
+               GeglRectangle *area,
+               gdouble        x1,
+               gdouble        y1,
+               gdouble        x2,
+               gdouble        y2)
+{
+  gdouble x, y;
+  gdouble radius;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  x      = x1 / area->width;
+  y      = y1 / area->height;
+  radius = x2 - x1;
+
+  radius = CLAMP (radius / 100.0, -0.5, 1.0);
+
+  g_object_set (config,
+                "center-x", x,
+                "center-y", y,
+                "factor",   radius,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerLineCallback  set_func;
+  GeglRectangle              *area;
+  gdouble                     x, y;
+  gdouble                     radius;
+  gdouble                     x1, y1, x2, y2;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "center-x", &x,
+                "center-y", &y,
+                "factor",   &radius,
+                NULL);
+
+  x1 = x * area->width;
+  y1 = y * area->height;
+  x2 = x1 + radius * 100.0;
+  y2 = y1;
+
+  set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_zoom (GObject                  *config,
+                                     GParamSpec              **param_specs,
+                                     guint                     n_param_specs,
+                                     GeglRectangle            *area,
+                                     GimpContext              *context,
+                                     GimpCreatePickerFunc      create_picker_func,
+                                     GimpCreateControllerFunc  create_controller_func,
+                                     gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_LINE,
+                                         _("Zoom Motion Blur: "),
+                                         (GCallback) line_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-motion-blur-zoom.h b/app/propgui/gimppropgui-motion-blur-zoom.h
new file mode 100644
index 0000000..ab38304
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-zoom.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-zoom.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__
+#define __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_zoom (GObject                  *config,
+                                     GParamSpec              **param_specs,
+                                     guint                     n_param_specs,
+                                     GeglRectangle            *area,
+                                     GimpContext              *context,
+                                     GimpCreatePickerFunc      create_picker_func,
+                                     GimpCreateControllerFunc  create_controller_func,
+                                     gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__ */
diff --git a/app/propgui/gimppropgui-newsprint.c b/app/propgui/gimppropgui-newsprint.c
new file mode 100644
index 0000000..214c534
--- /dev/null
+++ b/app/propgui/gimppropgui-newsprint.c
@@ -0,0 +1,444 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-newsprint.c
+ * Copyright (C) 2019  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-newsprint.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  COLOR_MODEL_WHITE_ON_BLACK,
+  COLOR_MODEL_BLACK_ON_WHITE,
+  COLOR_MODEL_RGB,
+  COLOR_MODEL_CMYK,
+
+  N_COLOR_MODELS
+} ColorModel;
+
+typedef enum
+{
+  PATTERN_LINE,
+  PATTERN_CIRCLE,
+  PATTERN_DIAMOND,
+  PATTERN_PSCIRCLE,
+  PATTERN_CROSS,
+
+  N_PATTERNS
+} Pattern;
+
+
+typedef struct _Newsprint Newsprint;
+
+struct _Newsprint
+{
+  GObject   *config;
+  GtkWidget *notebook;
+  GtkWidget *pattern_check;
+  GtkWidget *period_check;
+  GtkWidget *angle_check;
+};
+
+
+/*  local function prototypes  */
+
+static void   newsprint_color_model_notify    (GObject          *config,
+                                               const GParamSpec *pspec,
+                                               GtkWidget        *label);
+static void   newsprint_model_prop_notify     (GObject          *config,
+                                               const GParamSpec *pspec,
+                                               Newsprint        *np);
+static void   newsprint_lock_patterns_toggled (GtkWidget        *widget,
+                                               Newsprint        *np);
+static void   newsprint_lock_periods_toggled  (GtkWidget        *widget,
+                                               Newsprint        *np);
+static void   newsprint_lock_angles_toggled   (GtkWidget        *widget,
+                                               Newsprint        *np);
+
+
+static const gchar *label_strings[N_COLOR_MODELS][4] =
+{
+  { NULL,       NULL,          NULL,         N_("White") },
+  { NULL,       NULL,          NULL,         N_("Black") },
+  { N_("Red"),  N_("Green"),   N_("Blue"),   NULL        },
+  { N_("Cyan"), N_("Magenta"), N_("Yellow"), N_("Black") }
+};
+
+static const gchar *pattern_props[] =
+{
+  "pattern2",
+  "pattern3",
+  "pattern4",
+  "pattern"
+};
+
+static const gchar *period_props[] =
+{
+  "period2",
+  "period3",
+  "period4",
+  "period"
+};
+
+static const gchar *angle_props[] =
+{
+  "angle2",
+  "angle3",
+  "angle4",
+  "angle"
+};
+
+
+/*  public functions  */
+
+GtkWidget *
+_gimp_prop_gui_new_newsprint (GObject                  *config,
+                              GParamSpec              **param_specs,
+                              guint                     n_param_specs,
+                              GeglRectangle            *area,
+                              GimpContext              *context,
+                              GimpCreatePickerFunc      create_picker_func,
+                              GimpCreateControllerFunc  create_controller_func,
+                              gpointer                  creator)
+{
+  Newsprint *np;
+  GtkWidget *main_vbox;
+  GtkWidget *frame;
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *combo;
+  GtkWidget *labels[4];
+  GtkWidget *pages[4];
+  GtkWidget *check;
+  gint       i;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  np = g_new0 (Newsprint, 1);
+
+  np->config = config;
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  g_object_set_data_full (G_OBJECT (main_vbox), "newsprint", np,
+                          (GDestroyNotify) g_free);
+
+  frame = gimp_frame_new (_("Channels"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  combo = _gimp_prop_gui_new_generic (config,
+                                      param_specs + 0, 1,
+                                      area,
+                                      context,
+                                      create_picker_func,
+                                      create_controller_func,
+                                      creator);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  np->notebook = gtk_notebook_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), np->notebook, FALSE, FALSE, 0);
+  gtk_widget_show (np->notebook);
+
+  for (i = 0; i < 4; i++)
+    {
+      GtkWidget   *widget;
+      const gchar *unused;
+      gint         remaining;
+
+      labels[i] = gtk_label_new (NULL);
+      pages[i]  = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+      g_object_set_data (G_OBJECT (labels[i]), "channel", GINT_TO_POINTER (i));
+
+      g_signal_connect_object (config, "notify::color-model",
+                               G_CALLBACK (newsprint_color_model_notify),
+                               G_OBJECT (labels[i]), 0);
+
+      newsprint_color_model_notify (config, NULL, labels[i]);
+
+      gtk_container_set_border_width (GTK_CONTAINER (pages[i]), 6);
+      gtk_notebook_append_page (GTK_NOTEBOOK (np->notebook),
+                                pages[i], labels[i]);
+
+      widget = gimp_prop_widget_new_from_pspec (config,
+                                                param_specs[1 + 3 * i],
+                                                area, context,
+                                                create_picker_func,
+                                                create_controller_func,
+                                                creator, &unused);
+      gtk_box_pack_start (GTK_BOX (pages[i]), widget, FALSE, FALSE, 0);
+      gtk_widget_show (widget);
+
+      g_object_bind_property (G_OBJECT (widget),   "visible",
+                              G_OBJECT (pages[i]), "visible",
+                              G_BINDING_SYNC_CREATE);
+
+      if (i == 3)
+        remaining = 3;
+      else
+        remaining = 2;
+
+      widget = _gimp_prop_gui_new_generic (config,
+                                           param_specs + 2 + 3 * i, remaining,
+                                           area, context,
+                                           create_picker_func,
+                                           create_controller_func,
+                                           creator);
+      gtk_box_pack_start (GTK_BOX (pages[i]), widget, FALSE, FALSE, 0);
+      gtk_widget_show (widget);
+    }
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  np->pattern_check = check =
+    gtk_check_button_new_with_mnemonic (_("_Lock patterns"));
+  gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, FALSE, 0);
+  gtk_widget_show (check);
+
+  g_signal_connect (check, "toggled",
+                    G_CALLBACK (newsprint_lock_patterns_toggled),
+                    np);
+
+  np->period_check = check =
+    gtk_check_button_new_with_mnemonic (_("Loc_k periods"));
+  gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, FALSE, 0);
+  gtk_widget_show (check);
+
+  g_signal_connect (check, "toggled",
+                    G_CALLBACK (newsprint_lock_periods_toggled),
+                    np);
+
+  np->angle_check = check =
+    gtk_check_button_new_with_mnemonic (_("Lock a_ngles"));
+  gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, FALSE, 0);
+  gtk_widget_show (check);
+
+  g_signal_connect (check, "toggled",
+                    G_CALLBACK (newsprint_lock_angles_toggled),
+                    np);
+
+  frame = gimp_frame_new (_("Quality"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs + 14, 1,
+                                     area,
+                                     context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  frame = gimp_frame_new (_("Effects"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs + 15, 3,
+                                     area,
+                                     context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  g_signal_connect (config, "notify",
+                    G_CALLBACK (newsprint_model_prop_notify),
+                    np);
+
+  return main_vbox;
+}
+
+
+/*  private functions  */
+
+static void
+newsprint_color_model_notify (GObject          *config,
+                              const GParamSpec *pspec,
+                              GtkWidget        *label)
+{
+  ColorModel  model;
+  gint        channel;
+
+  g_object_get (config,
+                "color-model", &model,
+                NULL);
+
+  channel =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label), "channel"));
+
+  if (label_strings[model][channel])
+    gtk_label_set_text (GTK_LABEL (label),
+                        gettext (label_strings[model][channel]));
+}
+
+static gboolean
+newsprint_sync_model_props (Newsprint         *np,
+                            const GParamSpec  *pspec,
+                            const gchar      **props,
+                            gint               n_props)
+{
+  gint i;
+
+  for (i = 0; i < n_props; i++)
+    {
+      if (! strcmp (pspec->name, props[i]))
+        {
+          GValue value = G_VALUE_INIT;
+          gint   j;
+
+          g_value_init (&value, pspec->value_type);
+
+          g_object_get_property (np->config, pspec->name, &value);
+
+          for (j = 0; j < n_props; j++)
+            {
+              if (i != j)
+                {
+                  g_signal_handlers_block_by_func (np->config,
+                                                   newsprint_model_prop_notify,
+                                                   np);
+
+                  g_object_set_property (np->config, props[j], &value);
+
+                  g_signal_handlers_unblock_by_func (np->config,
+                                                     newsprint_model_prop_notify,
+                                                     np);
+                }
+            }
+
+          g_value_unset (&value);
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+newsprint_model_prop_notify (GObject          *config,
+                             const GParamSpec *pspec,
+                             Newsprint        *np)
+{
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (np->pattern_check)) &&
+      newsprint_sync_model_props (np, pspec,
+                                  pattern_props, G_N_ELEMENTS (pattern_props)))
+    return;
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (np->period_check)) &&
+      newsprint_sync_model_props (np, pspec,
+                                  period_props, G_N_ELEMENTS (period_props)))
+    return;
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (np->angle_check)) &&
+      newsprint_sync_model_props (np, pspec,
+                                  angle_props, G_N_ELEMENTS (angle_props)))
+    return;
+}
+
+static void
+newsprint_lock_patterns_toggled (GtkWidget *widget,
+                                 Newsprint *np)
+
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GParamSpec *pspec;
+      gint        channel;
+
+      channel = gtk_notebook_get_current_page (GTK_NOTEBOOK (np->notebook));
+
+      pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (np->config),
+                                            pattern_props[channel]);
+
+      newsprint_sync_model_props (np, pspec,
+                                  pattern_props, G_N_ELEMENTS (pattern_props));
+    }
+}
+
+static void
+newsprint_lock_periods_toggled (GtkWidget *widget,
+                                Newsprint *np)
+
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GParamSpec *pspec;
+      gint        channel;
+
+      channel = gtk_notebook_get_current_page (GTK_NOTEBOOK (np->notebook));
+
+      pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (np->config),
+                                            period_props[channel]);
+
+      newsprint_sync_model_props (np, pspec,
+                                  period_props, G_N_ELEMENTS (period_props));
+    }
+}
+
+static void
+newsprint_lock_angles_toggled (GtkWidget *widget,
+                               Newsprint *np)
+
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GParamSpec *pspec;
+      gint        channel;
+
+      channel = gtk_notebook_get_current_page (GTK_NOTEBOOK (np->notebook));
+
+      pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (np->config),
+                                            angle_props[channel]);
+
+      newsprint_sync_model_props (np, pspec,
+                                  angle_props, G_N_ELEMENTS (angle_props));
+    }
+}
diff --git a/app/propgui/gimppropgui-newsprint.h b/app/propgui/gimppropgui-newsprint.h
new file mode 100644
index 0000000..90df485
--- /dev/null
+++ b/app/propgui/gimppropgui-newsprint.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-newsprint.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_NEWSPRINT_H__
+#define __GIMP_PROP_GUI_NEWSPRINT_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_newsprint (GObject                  *config,
+                              GParamSpec              **param_specs,
+                              guint                     n_param_specs,
+                              GeglRectangle            *area,
+                              GimpContext              *context,
+                              GimpCreatePickerFunc      create_picker_func,
+                              GimpCreateControllerFunc  create_controller_func,
+                              gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_NEWSPRINT_H__ */
diff --git a/app/propgui/gimppropgui-panorama-projection.c b/app/propgui/gimppropgui-panorama-projection.c
new file mode 100644
index 0000000..e5aed5b
--- /dev/null
+++ b/app/propgui/gimppropgui-panorama-projection.c
@@ -0,0 +1,144 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-panorama-projection.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-panorama-projection.h"
+
+#include "gimp-intl.h"
+
+
+static void
+gyroscope_callback (GObject       *config,
+                    GeglRectangle *area,
+                    gdouble        yaw,
+                    gdouble        pitch,
+                    gdouble        roll,
+                    gdouble        zoom,
+                    gboolean       invert)
+{
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  g_object_set (config,
+                "pan",     -yaw,
+                "tilt",    -pitch,
+                "spin",    -roll,
+                "zoom",    CLAMP (100.0 * zoom, 0.01, 1000.0),
+                "inverse", invert,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerGyroscopeCallback  set_func;
+  GeglRectangle                   *area;
+  gdouble                          pan;
+  gdouble                          tilt;
+  gdouble                          spin;
+  gdouble                          zoom;
+  gboolean                         inverse;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "pan",     &pan,
+                "tilt",    &tilt,
+                "spin",    &spin,
+                "zoom",    &zoom,
+                "inverse", &inverse,
+                NULL);
+
+  set_func (set_data,
+            area,
+            -pan, -tilt, -spin,
+            zoom / 100.0,
+            inverse);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_panorama_projection (GObject                   *config,
+                                        GParamSpec               **param_specs,
+                                        guint                      n_param_specs,
+                                        GeglRectangle             *area,
+                                        GimpContext               *context,
+                                        GimpCreatePickerFunc       create_picker_func,
+                                        GimpCreateControllerFunc   create_controller_func,
+                                        gpointer                   creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_GYROSCOPE,
+                                         _("Panorama Projection: "),
+                                         (GCallback) gyroscope_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-panorama-projection.h b/app/propgui/gimppropgui-panorama-projection.h
new file mode 100644
index 0000000..11c7b3a
--- /dev/null
+++ b/app/propgui/gimppropgui-panorama-projection.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-panorama-projection.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__
+#define __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_panorama_projection (GObject                   *config,
+                                        GParamSpec               **param_specs,
+                                        guint                      n_param_specs,
+                                        GeglRectangle             *area,
+                                        GimpContext               *context,
+                                        GimpCreatePickerFunc       create_picker_func,
+                                        GimpCreateControllerFunc   create_controller_func,
+                                        gpointer                   creator);
+
+
+#endif /* __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__ */
diff --git a/app/propgui/gimppropgui-recursive-transform.c b/app/propgui/gimppropgui-recursive-transform.c
new file mode 100644
index 0000000..a247723
--- /dev/null
+++ b/app/propgui/gimppropgui-recursive-transform.c
@@ -0,0 +1,334 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-recursive-transform.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-recursive-transform.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_N_TRANSFORMS 10
+
+
+static void
+add_transform (GtkButton *button,
+               GObject   *config)
+{
+  gchar *transform;
+  gchar *new_transform;
+
+  g_object_get (config,
+                "transform", &transform,
+                NULL);
+
+  new_transform = g_strdup_printf ("%s;matrix (1, 0, 0, 0, 1, 0, 0, 0, 1)",
+                                   transform);
+
+  g_object_set (config,
+                "transform", new_transform,
+                NULL);
+
+  g_free (transform);
+  g_free (new_transform);
+}
+
+static void
+duplicate_transform (GtkButton *button,
+                     GObject   *config)
+{
+  gchar *transform;
+  gchar *new_transform;
+  gchar *delim;
+
+  g_object_get (config,
+                "transform", &transform,
+                NULL);
+
+  delim = strrchr (transform, ';');
+
+  if (! delim)
+    delim = transform;
+  else
+    delim++;
+
+  new_transform = g_strdup_printf ("%s;%s", transform, delim);
+
+  g_object_set (config,
+                "transform", new_transform,
+                NULL);
+
+  g_free (transform);
+  g_free (new_transform);
+}
+
+static void
+remove_transform (GtkButton *button,
+                  GObject   *config)
+{
+  gchar *transform;
+  gchar *delim;
+
+  g_object_get (config,
+                "transform", &transform,
+                NULL);
+
+  delim = strrchr (transform, ';');
+
+  if (delim)
+    {
+      *delim = '\0';
+
+      g_object_set (config,
+                    "transform", transform,
+                    NULL);
+    }
+
+  g_free (transform);
+}
+
+static void
+transform_grids_callback (GObject                    *config,
+                          GeglRectangle              *area,
+                          const GimpMatrix3          *transforms,
+                          gint                        n_transforms)
+{
+  GString *transforms_str = g_string_new (NULL);
+  gchar   *transform_str;
+  gint     i;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  for (i = 0; i < n_transforms; i++)
+    {
+      if (i > 0)
+        g_string_append (transforms_str, ";");
+
+      transform_str = gegl_matrix3_to_string ((GeglMatrix3 *) &transforms[i]);
+
+      g_string_append (transforms_str, transform_str);
+
+      g_free (transform_str);
+    }
+
+  transform_str = g_string_free (transforms_str, FALSE);
+
+  g_object_set (config,
+                "transform", transform_str,
+                NULL);
+
+  g_free (transform_str);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GtkWidget                             *add_button;
+  GtkWidget                             *duplicate_button;
+  GtkWidget                             *remove_button;
+  GimpControllerTransformGridsCallback   set_func;
+  GeglRectangle                         *area;
+  gchar                                 *transform_str;
+  gchar                                **transform_strs;
+  GimpMatrix3                           *transforms;
+  gint                                   n_transforms;
+  gint                                   i;
+
+  add_button       = g_object_get_data (G_OBJECT (config), "add-transform-button");
+  duplicate_button = g_object_get_data (G_OBJECT (config), "duplicate-transform-button");
+  remove_button    = g_object_get_data (G_OBJECT (config), "remove-transform-button");
+  set_func         = g_object_get_data (G_OBJECT (config), "set-func");
+  area             = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "transform", &transform_str,
+                NULL);
+
+  transform_strs = g_strsplit (transform_str, ";", -1);
+
+  g_free (transform_str);
+
+  for (n_transforms = 0; transform_strs[n_transforms]; n_transforms++);
+
+  transforms = g_new (GimpMatrix3, n_transforms);
+
+  for (i = 0; i < n_transforms; i++)
+    {
+      gegl_matrix3_parse_string ((GeglMatrix3 *) &transforms[i],
+                                 transform_strs[i]);
+    }
+
+  set_func (set_data, area, transforms, n_transforms);
+
+  g_strfreev (transform_strs);
+  g_free (transforms);
+
+  gtk_widget_set_sensitive (add_button,       n_transforms < MAX_N_TRANSFORMS);
+  gtk_widget_set_sensitive (duplicate_button, n_transforms < MAX_N_TRANSFORMS);
+  gtk_widget_set_sensitive (remove_button,    n_transforms > 1);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_recursive_transform (GObject                  *config,
+                                        GParamSpec              **param_specs,
+                                        guint                     n_param_specs,
+                                        GeglRectangle            *area,
+                                        GimpContext              *context,
+                                        GimpCreatePickerFunc      create_picker_func,
+                                        GimpCreateControllerFunc  create_controller_func,
+                                        gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  /* skip the "transform" property, which is controlled by a transform-grid
+   * controller.
+   */
+  if (create_controller_func)
+    {
+      param_specs++;
+      n_param_specs--;
+    }
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+  if (create_controller_func)
+    {
+      GtkWidget *outer_vbox;
+      GtkWidget *hbox;
+      GtkWidget *button;
+      GtkWidget *image;
+      GCallback  set_func;
+      gpointer   set_data;
+
+      outer_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL,
+                                gtk_box_get_spacing (GTK_BOX (vbox)));
+
+      gtk_box_pack_start (GTK_BOX (outer_vbox), vbox, FALSE, FALSE, 0);
+      gtk_widget_show (vbox);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+      gtk_box_pack_start (GTK_BOX (outer_vbox), hbox, FALSE, FALSE, 2);
+      gtk_widget_show (hbox);
+
+      button = gtk_button_new ();
+      gimp_help_set_help_data (button,
+                               _("Add transform"),
+                               NULL);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_LIST_ADD,
+                                            GTK_ICON_SIZE_MENU);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (add_transform),
+                        config);
+
+      g_object_set_data (config, "add-transform-button", button);
+
+      button = gtk_button_new ();
+      gimp_help_set_help_data (button,
+                               _("Duplicate transform"),
+                               NULL);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_OBJECT_DUPLICATE,
+                                            GTK_ICON_SIZE_MENU);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (duplicate_transform),
+                        config);
+
+      g_object_set_data (config, "duplicate-transform-button", button);
+
+      button = gtk_button_new ();
+      gimp_help_set_help_data (button,
+                               _("Remove transform"),
+                               NULL);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_LIST_REMOVE,
+                                            GTK_ICON_SIZE_MENU);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (remove_transform),
+                        config);
+
+      g_object_set_data (config, "remove-transform-button", button);
+
+      vbox = outer_vbox;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_TRANSFORM_GRIDS,
+                                         _("Recursive Transform: "),
+                                         (GCallback) transform_grids_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-recursive-transform.h b/app/propgui/gimppropgui-recursive-transform.h
new file mode 100644
index 0000000..ac75545
--- /dev/null
+++ b/app/propgui/gimppropgui-recursive-transform.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-recursive-transform.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_RECURSIVE_TRANSFORM_H__
+#define __GIMP_PROP_GUI_RECURSIVE_TRANSFORM_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_recursive_transform (GObject                  *config,
+                                        GParamSpec              **param_specs,
+                                        guint                     n_param_specs,
+                                        GeglRectangle            *area,
+                                        GimpContext              *context,
+                                        GimpCreatePickerFunc      create_picker_func,
+                                        GimpCreateControllerFunc  create_controller_func,
+                                        gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_RECURSIVE_TRANSFORM_H__ */
diff --git a/app/propgui/gimppropgui-shadows-highlights.c b/app/propgui/gimppropgui-shadows-highlights.c
new file mode 100644
index 0000000..a5601a0
--- /dev/null
+++ b/app/propgui/gimppropgui-shadows-highlights.c
@@ -0,0 +1,122 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-shadows-highlights.c
+ * Copyright (C) 2002-2014  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-shadows-highlights.h"
+
+#include "gimp-intl.h"
+
+
+GtkWidget *
+_gimp_prop_gui_new_shadows_highlights (GObject                  *config,
+                                       GParamSpec              **param_specs,
+                                       guint                     n_param_specs,
+                                       GeglRectangle            *area,
+                                       GimpContext              *context,
+                                       GimpCreatePickerFunc      create_picker_func,
+                                       GimpCreateControllerFunc  create_controller_func,
+                                       gpointer                  creator)
+{
+  GtkWidget   *main_vbox;
+  GtkWidget   *frame;
+  GtkWidget   *vbox;
+  GtkWidget   *scale;
+  const gchar *label;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  frame = gimp_frame_new (_("Shadows"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_widget_new (config, "shadows",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "shadows-ccorrect",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  frame = gimp_frame_new (_("Highlights"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_widget_new (config, "highlights",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "highlights-ccorrect",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  frame = gimp_frame_new (_("Common"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  scale = gimp_prop_widget_new (config, "whitepoint",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "radius",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_widget_new (config, "compress",
+                                area, context, NULL, NULL, NULL, &label);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return main_vbox;
+}
diff --git a/app/propgui/gimppropgui-shadows-highlights.h b/app/propgui/gimppropgui-shadows-highlights.h
new file mode 100644
index 0000000..fee9b52
--- /dev/null
+++ b/app/propgui/gimppropgui-shadows-highlights.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-shadows-highlights.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_SHADOWS_HIGHLIGHTS_H__
+#define __GIMP_PROP_GUI_SHADOWS_HIGHLIGHTS_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_shadows_highlights (GObject                  *config,
+                                       GParamSpec              **param_specs,
+                                       guint                     n_param_specs,
+                                       GeglRectangle            *area,
+                                       GimpContext              *context,
+                                       GimpCreatePickerFunc      create_picker_func,
+                                       GimpCreateControllerFunc  create_controller_func,
+                                       gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_SHADOWS_HIGHLIGHTS_H__ */
diff --git a/app/propgui/gimppropgui-spiral.c b/app/propgui/gimppropgui-spiral.c
new file mode 100644
index 0000000..9aaded2
--- /dev/null
+++ b/app/propgui/gimppropgui-spiral.c
@@ -0,0 +1,239 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-spiral.c
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-spiral.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  GEGL_SPIRAL_TYPE_LINEAR,
+  GEGL_SPIRAL_TYPE_LOGARITHMIC
+} GeglSpiralType;
+
+
+static void
+slider_line_callback (GObject                    *config,
+                      GeglRectangle              *area,
+                      gdouble                     x1,
+                      gdouble                     y1,
+                      gdouble                     x2,
+                      gdouble                     y2,
+                      const GimpControllerSlider *sliders,
+                      gint                        n_sliders)
+{
+  GeglSpiralType type;
+  gdouble        x, y;
+  gdouble        radius;
+  gdouble        rotation;
+  gdouble        base;
+  gdouble        balance;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  g_object_get (config,
+                "type",    &type,
+                "base",    &base,
+                "balance", &balance,
+                NULL);
+
+  x        = x1 / area->width;
+  y        = y1 / area->height;
+  radius   = sqrt (SQR (x2 - x1) + SQR (y2 - y1));
+  rotation = atan2 (-(y2 - y1), x2 - x1) * 180 / G_PI;
+
+  if (rotation < 0)
+    rotation += 360.0;
+
+  switch (type)
+    {
+    case GEGL_SPIRAL_TYPE_LINEAR:
+      balance = 3.0 - 4.0 * sliders[0].value;
+
+      break;
+
+    case GEGL_SPIRAL_TYPE_LOGARITHMIC:
+      {
+        gdouble old_base = base;
+
+        base = 1.0 / sliders[1].value;
+        base = MIN (base, 1000000.0);
+
+        /* keep "balance" fixed when changing "base", or when "base" is 1, in
+         * which case there's no inverse mapping for the slider value, and we
+         * can get NaN.
+         */
+        if (base == old_base && base > 1.0)
+          {
+            balance = -4.0 * log (sliders[0].value) / log (base) - 1.0;
+            balance = CLAMP (balance, -1.0, 1.0);
+          }
+      }
+      break;
+    }
+
+  g_object_set (config,
+                "x",        x,
+                "y",        y,
+                "radius",   radius,
+                "base",     base,
+                "rotation", rotation,
+                "balance",  balance,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerSliderLineCallback  set_func;
+  GeglRectangle                    *area;
+  GeglSpiralType                    type;
+  gdouble                           x, y;
+  gdouble                           radius;
+  gdouble                           rotation;
+  gdouble                           base;
+  gdouble                           balance;
+  gdouble                           x1, y1, x2, y2;
+  GimpControllerSlider              sliders[2];
+  gint                              n_sliders = 0;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "type",     &type,
+                "x",        &x,
+                "y",        &y,
+                "radius",   &radius,
+                "rotation", &rotation,
+                "base",     &base,
+                "balance",  &balance,
+                NULL);
+
+  x1 = x * area->width;
+  y1 = y * area->height;
+  x2 = x1 + cos (rotation * (G_PI / 180.0)) * radius;
+  y2 = y1 - sin (rotation * (G_PI / 180.0)) * radius;
+
+  switch (type)
+  {
+  case GEGL_SPIRAL_TYPE_LINEAR:
+    n_sliders = 1;
+
+    /* balance */
+    sliders[0]       = GIMP_CONTROLLER_SLIDER_DEFAULT;
+    sliders[0].min   = 0.5;
+    sliders[0].max   = 1.0;
+    sliders[0].value = 0.5 + (1.0 - balance) / 4.0;
+
+    break;
+
+  case GEGL_SPIRAL_TYPE_LOGARITHMIC:
+    n_sliders = 2;
+
+    /* balance */
+    sliders[0]       = GIMP_CONTROLLER_SLIDER_DEFAULT;
+    sliders[0].min   = 1.0 / sqrt (base);
+    sliders[0].max   = 1.0;
+    sliders[0].value = pow (base, -(balance + 1.0) / 4.0);
+
+    /* base */
+    sliders[1]       = GIMP_CONTROLLER_SLIDER_DEFAULT;
+    sliders[1].min   = 0.0;
+    sliders[1].max   = 1.0;
+    sliders[1].value = 1.0 / base;
+
+    break;
+  }
+
+  set_func (set_data, area, x1, y1, x2, y2, sliders, n_sliders);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_spiral (GObject                  *config,
+                           GParamSpec              **param_specs,
+                           guint                     n_param_specs,
+                           GeglRectangle            *area,
+                           GimpContext              *context,
+                           GimpCreatePickerFunc      create_picker_func,
+                           GimpCreateControllerFunc  create_controller_func,
+                           gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_SLIDER_LINE,
+                                         _("Spiral: "),
+                                         (GCallback) slider_line_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-spiral.h b/app/propgui/gimppropgui-spiral.h
new file mode 100644
index 0000000..1ed47df
--- /dev/null
+++ b/app/propgui/gimppropgui-spiral.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-spiral.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_SPIRAL_H__
+#define __GIMP_PROP_GUI_SPIRAL_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_spiral (GObject                  *config,
+                           GParamSpec              **param_specs,
+                           guint                     n_param_specs,
+                           GeglRectangle            *area,
+                           GimpContext              *context,
+                           GimpCreatePickerFunc      create_picker_func,
+                           GimpCreateControllerFunc  create_controller_func,
+                           gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_SPIRAL_H__ */
diff --git a/app/propgui/gimppropgui-supernova.c b/app/propgui/gimppropgui-supernova.c
new file mode 100644
index 0000000..8cc0855
--- /dev/null
+++ b/app/propgui/gimppropgui-supernova.c
@@ -0,0 +1,144 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-supernova.c
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui-generic.h"
+#include "gimppropgui-supernova.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject       *config,
+               GeglRectangle *area,
+               gdouble        x1,
+               gdouble        y1,
+               gdouble        x2,
+               gdouble        y2)
+{
+  gdouble x, y;
+  gint    radius;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  x      = x1 / area->width;
+  y      = y1 / area->height;
+  radius = sqrt (SQR (x2 - x1) + SQR (y2 - y1));
+
+  g_object_set (config,
+                "center-x", x,
+                "center-y", y,
+                "radius",   radius,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerLineCallback  set_func;
+  GeglRectangle              *area;
+  gdouble                     x, y;
+  gint                        radius;
+  gdouble                     x1, y1, x2, y2;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "center-x", &x,
+                "center-y", &y,
+                "radius",   &radius,
+                NULL);
+
+  x1 = x * area->width;
+  y1 = y * area->height;
+  x2 = x1 + radius;
+  y2 = y1;
+
+  set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_supernova (GObject                  *config,
+                              GParamSpec              **param_specs,
+                              guint                     n_param_specs,
+                              GeglRectangle            *area,
+                              GimpContext              *context,
+                              GimpCreatePickerFunc      create_picker_func,
+                              GimpCreateControllerFunc  create_controller_func,
+                              gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_LINE,
+                                         _("Supernova: "),
+                                         (GCallback) line_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-supernova.h b/app/propgui/gimppropgui-supernova.h
new file mode 100644
index 0000000..7cf3a42
--- /dev/null
+++ b/app/propgui/gimppropgui-supernova.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-supernova.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_SUPERNOVA_H__
+#define __GIMP_PROP_GUI_SUPERNOVA_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_supernova (GObject                  *config,
+                              GParamSpec              **param_specs,
+                              guint                     n_param_specs,
+                              GeglRectangle            *area,
+                              GimpContext              *context,
+                              GimpCreatePickerFunc      create_picker_func,
+                              GimpCreateControllerFunc  create_controller_func,
+                              gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_SUPERNOVA_H__ */
diff --git a/app/propgui/gimppropgui-utils.c b/app/propgui/gimppropgui-utils.c
new file mode 100644
index 0000000..2721ba5
--- /dev/null
+++ b/app/propgui/gimppropgui-utils.c
@@ -0,0 +1,221 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-utils.c
+ * Copyright (C) 2002-2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimppropgui-utils.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void      gimp_prop_kelvin_presets_menu_position (GtkMenu        *menu,
+                                                         gint           *x,
+                                                         gint           *y,
+                                                         gboolean       *push_in,
+                                                         gpointer        user_data);
+static gboolean  gimp_prop_kelvin_presets_button_press  (GtkWidget      *widget,
+                                                         GdkEventButton *bevent,
+                                                         GtkMenu        *menu);
+static void      gimp_prop_kelvin_presets_activate      (GtkWidget      *widget,
+                                                         GObject        *config);
+static void      gimp_prop_random_seed_new_clicked      (GtkButton      *button,
+                                                         GtkAdjustment  *adj);
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_prop_kelvin_presets_new (GObject     *config,
+                              const gchar *property_name)
+{
+  GtkWidget *button;
+  GtkWidget *menu;
+  gint       i;
+
+  const struct
+  {
+    gdouble      kelvin;
+    const gchar *label;
+  }
+  kelvin_presets[] =
+  {
+    { 1700, N_("1,700 K – Match flame") },
+    { 1850, N_("1,850 K – Candle flame, sunset/sunrise") },
+    { 2700, N_("2,700 K - Soft (or warm) LED lamps") },
+    { 3000, N_("3,000 K – Soft (or warm) white compact fluorescent lamps") },
+    { 3200, N_("3,200 K – Studio lamps, photofloods, etc.") },
+    { 3300, N_("3,300 K – Incandescent lamps") },
+    { 3350, N_("3,350 K – Studio \"CP\" light") },
+    { 4000, N_("4,000 K - Cold (daylight) LED lamps") },
+    { 4100, N_("4,100 K – Moonlight") },
+    { 5000, N_("5,000 K – D50") },
+    { 5000, N_("5,000 K – Cool white/daylight compact fluorescent lamps") },
+    { 5000, N_("5,000 K – Horizon daylight") },
+    { 5500, N_("5,500 K – D55") },
+    { 5500, N_("5,500 K – Vertical daylight, electronic flash") },
+    { 6200, N_("6,200 K – Xenon short-arc lamp") },
+    { 6500, N_("6,500 K – D65") },
+    { 6500, N_("6,500 K – Daylight, overcast") },
+    { 7500, N_("7,500 K – D75") },
+    { 9300, N_("9,300 K") }
+  };
+
+  button = gtk_button_new ();
+  gtk_widget_set_can_focus (button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+
+  gtk_button_set_image (GTK_BUTTON (button),
+                        gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
+                                                      GTK_ICON_SIZE_MENU));
+
+  menu = gtk_menu_new ();
+  gtk_menu_attach_to_widget (GTK_MENU (menu), button, NULL);
+
+  gimp_help_set_help_data (button,
+                           _("Choose from a list of common "
+                             "color temperatures"), NULL);
+
+  g_signal_connect (button, "button-press-event",
+                    G_CALLBACK (gimp_prop_kelvin_presets_button_press),
+                    menu);
+
+  for (i = 0; i < G_N_ELEMENTS (kelvin_presets); i++)
+    {
+      GtkWidget *item;
+      gdouble   *kelvin;
+
+      item = gtk_menu_item_new_with_label (gettext (kelvin_presets[i].label));
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+
+      g_object_set_data_full (G_OBJECT (item), "property-name",
+                              g_strdup (property_name),
+                              (GDestroyNotify) g_free);
+
+      kelvin = g_new (gdouble, 1);
+      *kelvin = kelvin_presets[i].kelvin;
+
+      g_object_set_data_full (G_OBJECT (item), "kelvin",
+                              kelvin, (GDestroyNotify) g_free);
+
+      g_signal_connect (item, "activate",
+                        G_CALLBACK (gimp_prop_kelvin_presets_activate),
+                        config);
+
+    }
+
+  return button;
+}
+
+GtkWidget *
+gimp_prop_random_seed_new (GObject     *config,
+                           const gchar *property_name)
+{
+  GtkAdjustment *adj;
+  GtkWidget     *hbox;
+  GtkWidget     *spin;
+  GtkWidget     *button;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+
+  spin = gimp_prop_spin_button_new (config, property_name,
+                                    1.0, 10.0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+  gtk_widget_show (spin);
+
+  button = gtk_button_new_with_label (_("New Seed"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin));
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_prop_random_seed_new_clicked),
+                    adj);
+
+  return hbox;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_prop_kelvin_presets_menu_position (GtkMenu  *menu,
+                                        gint     *x,
+                                        gint     *y,
+                                        gboolean *push_in,
+                                        gpointer  user_data)
+{
+  gimp_button_menu_position (user_data, menu, GTK_POS_LEFT, x, y);
+}
+
+static gboolean
+gimp_prop_kelvin_presets_button_press (GtkWidget      *widget,
+                                       GdkEventButton *bevent,
+                                       GtkMenu        *menu)
+{
+  if (bevent->type == GDK_BUTTON_PRESS)
+    {
+      gtk_menu_popup (menu,
+                      NULL, NULL,
+                      gimp_prop_kelvin_presets_menu_position, widget,
+                      bevent->button, bevent->time);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_prop_kelvin_presets_activate (GtkWidget *widget,
+                                   GObject   *config)
+{
+  const gchar *property_name;
+  gdouble     *kelvin;
+
+  property_name = g_object_get_data (G_OBJECT (widget), "property-name");
+  kelvin        = g_object_get_data (G_OBJECT (widget), "kelvin");
+
+  if (property_name && kelvin)
+    g_object_set (config, property_name, *kelvin, NULL);
+}
+
+static void
+gimp_prop_random_seed_new_clicked (GtkButton     *button,
+                                   GtkAdjustment *adj)
+{
+  guint32 value;
+
+  value = floor (g_random_double_range (gtk_adjustment_get_lower (adj),
+                                        gtk_adjustment_get_upper (adj) + 1.0));
+
+  gtk_adjustment_set_value (adj, value);
+}
diff --git a/app/propgui/gimppropgui-utils.h b/app/propgui/gimppropgui-utils.h
new file mode 100644
index 0000000..f618ecf
--- /dev/null
+++ b/app/propgui/gimppropgui-utils.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-utils.h
+ * Copyright (C) 2002-2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_UTILS_H__
+#define __GIMP_PROP_GUI_UTILS_H__
+
+
+GtkWidget * gimp_prop_kelvin_presets_new (GObject     *config,
+                                          const gchar *property_name);
+
+GtkWidget * gimp_prop_random_seed_new    (GObject     *config,
+                                          const gchar *property_name);
+
+
+#endif /* __GIMP_PROP_GUI_UTILS_H__ */
diff --git a/app/propgui/gimppropgui-vignette.c b/app/propgui/gimppropgui-vignette.c
new file mode 100644
index 0000000..5d8ef81
--- /dev/null
+++ b/app/propgui/gimppropgui-vignette.c
@@ -0,0 +1,202 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-vignette.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-vignette.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_GAMMA 1000.0
+
+
+static void
+focus_callback (GObject       *config,
+                GeglRectangle *area,
+                GimpLimitType  type,
+                gdouble        x,
+                gdouble        y,
+                gdouble        radius,
+                gdouble        aspect_ratio,
+                gdouble        angle,
+                gdouble        inner_limit,
+                gdouble        midpoint)
+{
+  gdouble proportion;
+  gdouble squeeze;
+  gdouble scale;
+
+  g_object_set_data_full (G_OBJECT (config), "area",
+                          g_memdup (area, sizeof (GeglRectangle)),
+                          (GDestroyNotify) g_free);
+
+  g_object_get (config,
+                "proportion", &proportion,
+                NULL);
+
+  if (aspect_ratio >= 0.0)
+    scale = 1.0 - aspect_ratio;
+  else
+    scale = 1.0 / (1.0 + aspect_ratio);
+
+  scale /= 1.0 + proportion * ((gdouble) area->height / area->width - 1.0);
+
+  if (scale <= 1.0)
+    squeeze = +2.0 * atan (1.0 / scale - 1.0) / G_PI;
+  else
+    squeeze = -2.0 * atan (scale - 1.0) / G_PI;
+
+  g_object_set (config,
+                "shape",      type,
+                "x",          x / area->width,
+                "y",          y / area->height,
+                "radius",     2.0 * radius / area->width,
+                "proportion", proportion,
+                "squeeze",    squeeze,
+                "rotation",   fmod (fmod (angle * 180.0 / G_PI, 360.0) + 360.0,
+                                    360.0),
+                "softness",   1.0 - inner_limit,
+                "gamma",      midpoint < 1.0 ?
+                                MIN (log (0.5) / log (midpoint), MAX_GAMMA) :
+                                MAX_GAMMA,
+                NULL);
+}
+
+static void
+config_notify (GObject          *config,
+               const GParamSpec *pspec,
+               gpointer          set_data)
+{
+  GimpControllerFocusCallback  set_func;
+  GeglRectangle               *area;
+  GimpLimitType                shape;
+  gdouble                      x, y;
+  gdouble                      radius;
+  gdouble                      proportion;
+  gdouble                      squeeze;
+  gdouble                      rotation;
+  gdouble                      softness;
+  gdouble                      gamma;
+  gdouble                      aspect_ratio;
+
+  set_func = g_object_get_data (G_OBJECT (config), "set-func");
+  area     = g_object_get_data (G_OBJECT (config), "area");
+
+  g_object_get (config,
+                "shape",      &shape,
+                "x",          &x,
+                "y",          &y,
+                "radius",     &radius,
+                "proportion", &proportion,
+                "squeeze",    &squeeze,
+                "rotation",   &rotation,
+                "softness",   &softness,
+                "gamma",      &gamma,
+                NULL);
+
+  aspect_ratio = 1.0 + ((gdouble) area->height / area->width - 1.0) *
+                       proportion;
+
+  if (squeeze >= 0.0)
+    aspect_ratio /= tan (+squeeze * G_PI / 2.0) + 1.0;
+  else
+    aspect_ratio *= tan (-squeeze * G_PI / 2.0) + 1.0;
+
+  if (aspect_ratio <= 1.0)
+    aspect_ratio = 1.0 - aspect_ratio;
+  else
+    aspect_ratio = 1.0 / aspect_ratio - 1.0;
+
+  set_func (set_data, area,
+            shape,
+            x * area->width,
+            y * area->height,
+            radius * area->width / 2.0,
+            aspect_ratio,
+            rotation / 180.0 * G_PI,
+            1.0 - softness,
+            pow (0.5, 1.0 / gamma));
+}
+
+GtkWidget *
+_gimp_prop_gui_new_vignette (GObject                  *config,
+                             GParamSpec              **param_specs,
+                             guint                     n_param_specs,
+                             GeglRectangle            *area,
+                             GimpContext              *context,
+                             GimpCreatePickerFunc      create_picker_func,
+                             GimpCreateControllerFunc  create_controller_func,
+                             gpointer                  creator)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (param_specs != NULL, NULL);
+  g_return_val_if_fail (n_param_specs > 0, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  vbox = _gimp_prop_gui_new_generic (config,
+                                     param_specs, n_param_specs,
+                                     area, context,
+                                     create_picker_func,
+                                     create_controller_func,
+                                     creator);
+
+
+  if (create_controller_func)
+    {
+      GCallback set_func;
+      gpointer  set_data;
+
+      set_func = create_controller_func (creator,
+                                         GIMP_CONTROLLER_TYPE_FOCUS,
+                                         _("Vignette: "),
+                                         (GCallback) focus_callback,
+                                         config,
+                                         &set_data);
+
+      g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+      g_object_set_data_full (G_OBJECT (config), "area",
+                              g_memdup (area, sizeof (GeglRectangle)),
+                              (GDestroyNotify) g_free);
+
+      config_notify (config, NULL, set_data);
+
+      g_signal_connect (config, "notify",
+                        G_CALLBACK (config_notify),
+                        set_data);
+    }
+
+  return vbox;
+}
diff --git a/app/propgui/gimppropgui-vignette.h b/app/propgui/gimppropgui-vignette.h
new file mode 100644
index 0000000..4db7ea4
--- /dev/null
+++ b/app/propgui/gimppropgui-vignette.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-vignette.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_VIGNETTE_H__
+#define __GIMP_PROP_GUI_VIGNETTE_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_vignette (GObject                  *config,
+                             GParamSpec              **param_specs,
+                             guint                     n_param_specs,
+                             GeglRectangle            *area,
+                             GimpContext              *context,
+                             GimpCreatePickerFunc      create_picker_func,
+                             GimpCreateControllerFunc  create_controller_func,
+                             gpointer                  creator);
+
+
+#endif /* __GIMP_PROP_GUI_VIGNETTE_H__ */
diff --git a/app/propgui/gimppropgui.c b/app/propgui/gimppropgui.c
new file mode 100644
index 0000000..fcc9a7e
--- /dev/null
+++ b/app/propgui/gimppropgui.c
@@ -0,0 +1,702 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui.c
+ * Copyright (C) 2002-2017  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gegl-paramspecs.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/gimp-operation-config.h"
+
+#include "core/gimpcontext.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimppropwidgets.h"
+
+#include "gimppropgui.h"
+#include "gimppropgui-channel-mixer.h"
+#include "gimppropgui-color-balance.h"
+#include "gimppropgui-color-rotate.h"
+#include "gimppropgui-color-to-alpha.h"
+#include "gimppropgui-convolution-matrix.h"
+#include "gimppropgui-diffraction-patterns.h"
+#include "gimppropgui-eval.h"
+#include "gimppropgui-focus-blur.h"
+#include "gimppropgui-generic.h"
+#include "gimppropgui-hue-saturation.h"
+#include "gimppropgui-motion-blur-circular.h"
+#include "gimppropgui-motion-blur-linear.h"
+#include "gimppropgui-motion-blur-zoom.h"
+#include "gimppropgui-newsprint.h"
+#include "gimppropgui-panorama-projection.h"
+#include "gimppropgui-recursive-transform.h"
+#include "gimppropgui-shadows-highlights.h"
+#include "gimppropgui-spiral.h"
+#include "gimppropgui-supernova.h"
+#include "gimppropgui-utils.h"
+#include "gimppropgui-vignette.h"
+
+#include "gimp-intl.h"
+
+
+#define HAS_KEY(p,k,v) gimp_gegl_param_spec_has_key (p, k, v)
+
+
+static gboolean      gimp_prop_string_to_boolean       (GBinding       *binding,
+                                                        const GValue   *from_value,
+                                                        GValue         *to_value,
+                                                        gpointer        user_data);
+static void          gimp_prop_config_notify           (GObject        *config,
+                                                        GParamSpec     *pspec,
+                                                        GtkWidget      *widget);
+static void          gimp_prop_widget_show             (GtkWidget      *widget,
+                                                        GObject        *config);
+static void          gimp_prop_free_label_ref          (GWeakRef       *label_ref);
+
+/*  public functions  */
+
+GtkWidget *
+gimp_prop_widget_new (GObject                  *config,
+                      const gchar              *property_name,
+                      GeglRectangle            *area,
+                      GimpContext              *context,
+                      GimpCreatePickerFunc      create_picker_func,
+                      GimpCreateControllerFunc  create_controller_func,
+                      gpointer                  creator,
+                      const gchar             **label)
+{
+  GParamSpec *pspec;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        property_name);
+
+  return gimp_prop_widget_new_from_pspec (config, pspec, area, context,
+                                          create_picker_func,
+                                          create_controller_func,
+                                          creator,
+                                          label);
+}
+
+GtkWidget *
+gimp_prop_widget_new_from_pspec (GObject                  *config,
+                                 GParamSpec               *pspec,
+                                 GeglRectangle            *area,
+                                 GimpContext              *context,
+                                 GimpCreatePickerFunc      create_picker_func,
+                                 GimpCreateControllerFunc  create_controller_func,
+                                 gpointer                  creator,
+                                 const gchar             **label)
+{
+  GtkWidget *widget = NULL;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (pspec != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (label != NULL, NULL);
+
+  *label = NULL;
+
+  if (GEGL_IS_PARAM_SPEC_SEED (pspec))
+    {
+      widget = gimp_prop_random_seed_new (config, pspec->name);
+
+      *label = g_param_spec_get_nick (pspec);
+    }
+  else if (G_IS_PARAM_SPEC_INT (pspec)   ||
+           G_IS_PARAM_SPEC_UINT (pspec)  ||
+           G_IS_PARAM_SPEC_FLOAT (pspec) ||
+           G_IS_PARAM_SPEC_DOUBLE (pspec))
+    {
+      gdouble lower;
+      gdouble upper;
+      gdouble step;
+      gdouble page;
+      gint    digits;
+
+      if (GEGL_IS_PARAM_SPEC_DOUBLE (pspec))
+        {
+          GeglParamSpecDouble *gspec = GEGL_PARAM_SPEC_DOUBLE (pspec);
+
+          lower  = gspec->ui_minimum;
+          upper  = gspec->ui_maximum;
+          step   = gspec->ui_step_small;
+          page   = gspec->ui_step_big;
+          digits = gspec->ui_digits;
+        }
+      else if (GEGL_IS_PARAM_SPEC_INT (pspec))
+        {
+          GeglParamSpecInt *gspec = GEGL_PARAM_SPEC_INT (pspec);
+
+          lower  = gspec->ui_minimum;
+          upper  = gspec->ui_maximum;
+          step   = gspec->ui_step_small;
+          page   = gspec->ui_step_big;
+          digits = 0;
+        }
+      else
+        {
+          gdouble value;
+
+          /* Get the min and max for the given property. */
+          _gimp_prop_widgets_get_numeric_values (config, pspec,
+                                                 &value, &lower, &upper,
+                                                 G_STRFUNC);
+
+          if ((upper - lower <= 1.0) &&
+              (G_IS_PARAM_SPEC_FLOAT (pspec) ||
+               G_IS_PARAM_SPEC_DOUBLE (pspec)))
+            {
+              step   = 0.01;
+              page   = 0.1;
+              digits = 4;
+            }
+          else if ((upper - lower <= 10.0) &&
+                   (G_IS_PARAM_SPEC_FLOAT (pspec) ||
+                    G_IS_PARAM_SPEC_DOUBLE (pspec)))
+            {
+              step   = 0.1;
+              page   = 1.0;
+              digits = 3;
+            }
+          else
+            {
+              step   = 1.0;
+              page   = 10.0;
+              digits = (G_IS_PARAM_SPEC_FLOAT (pspec) ||
+                        G_IS_PARAM_SPEC_DOUBLE (pspec)) ? 2 : 0;
+            }
+        }
+
+      widget = gimp_prop_spin_scale_new (config, pspec->name, NULL,
+                                         step, page, digits);
+
+      if (HAS_KEY (pspec, "unit", "degree") &&
+          (upper - lower) == 360.0)
+        {
+          GtkWidget *hbox;
+          GtkWidget *dial;
+
+          gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (widget), TRUE);
+
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+
+          gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+          gtk_widget_show (widget);
+
+          dial = gimp_prop_angle_dial_new (config, pspec->name);
+          g_object_set (dial,
+                        "clockwise-angles", HAS_KEY (pspec, "direction", "cw"),
+                        NULL);
+          gtk_box_pack_start (GTK_BOX (hbox), dial, FALSE, FALSE, 0);
+          gtk_widget_show (dial);
+
+          gimp_help_set_help_data (hbox, g_param_spec_get_blurb (pspec), NULL);
+          gimp_prop_gui_bind_label (hbox, widget);
+
+          widget = hbox;
+        }
+      else if (HAS_KEY (pspec, "unit", "kelvin"))
+        {
+          GtkWidget *hbox;
+          GtkWidget *button;
+
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+
+          gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+          gtk_widget_show (widget);
+
+          button = gimp_prop_kelvin_presets_new (config, pspec->name);
+          gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+          gtk_widget_show (button);
+
+          gimp_help_set_help_data (hbox, g_param_spec_get_blurb (pspec), NULL);
+          gimp_prop_gui_bind_label (hbox, widget);
+
+          widget = hbox;
+        }
+      else
+        {
+          gimp_prop_gui_bind_label (widget, widget);
+
+          if (area &&
+              (HAS_KEY (pspec, "unit", "pixel-coordinate") ||
+               HAS_KEY (pspec, "unit", "pixel-distance")) &&
+              (HAS_KEY (pspec, "axis", "x") ||
+               HAS_KEY (pspec, "axis", "y")))
+            {
+              gdouble min = lower;
+              gdouble max = upper;
+
+              if (HAS_KEY (pspec, "unit", "pixel-coordinate"))
+                {
+                  /* limit pixel coordinate scales to the actual area */
+
+                  gint off_x = area->x;
+                  gint off_y = area->y;
+
+                  if (HAS_KEY (pspec, "axis", "x"))
+                    {
+                      min = MAX (lower, off_x);
+                      max = MIN (upper, off_x + area->width);
+                    }
+                  else if (HAS_KEY (pspec, "axis","y"))
+                    {
+                      min = MAX (lower, off_y);
+                      max = MIN (upper, off_y + area->height);
+                    }
+                }
+              else if (HAS_KEY (pspec, "unit", "pixel-distance"))
+                {
+                  /* limit pixel distance scales to the same value on the
+                   * x and y axes, so linked values have the same range,
+                   * we use MAX (width, height), see issue #2540
+                   */
+
+                  max = MIN (upper, MAX (area->width, area->height));
+                }
+
+              gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget),
+                                                min, max);
+            }
+        }
+    }
+  else if (G_IS_PARAM_SPEC_STRING (pspec))
+    {
+      *label = g_param_spec_get_nick (pspec);
+
+      if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
+        {
+          widget =
+            gimp_prop_file_chooser_button_new (config, pspec->name,
+                                               g_param_spec_get_nick (pspec),
+                                               GTK_FILE_CHOOSER_ACTION_OPEN);
+        }
+      else if (HAS_KEY (pspec, "multiline", "true"))
+        {
+          GtkTextBuffer *buffer;
+          GtkWidget     *view;
+
+          buffer = gimp_prop_text_buffer_new (config, pspec->name, -1);
+          view = gtk_text_view_new_with_buffer (buffer);
+          g_object_unref (buffer);
+
+          widget = gtk_scrolled_window_new (NULL, NULL);
+          gtk_widget_set_size_request (widget, -1, 150);
+          gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget),
+                                               GTK_SHADOW_IN);
+          gtk_container_add (GTK_CONTAINER (widget), view);
+          gtk_widget_show (view);
+        }
+      else if (HAS_KEY (pspec, "error", "true"))
+        {
+          GtkWidget *l;
+
+          widget = gimp_message_box_new (GIMP_ICON_WILBER_EEK);
+          gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (widget), "%s",
+                                             *label);
+          gimp_message_box_set_text (GIMP_MESSAGE_BOX (widget), "%s", "");
+
+          l = GIMP_MESSAGE_BOX (widget)->label[1];
+
+          g_object_bind_property (config, pspec->name,
+                                  l,  "label",
+                                  G_BINDING_SYNC_CREATE);
+          g_object_bind_property_full (config, pspec->name,
+                                       widget, "visible",
+                                       G_BINDING_SYNC_CREATE,
+                                       gimp_prop_string_to_boolean,
+                                       NULL,
+                                       NULL, NULL);
+          *label = NULL;
+        }
+      else
+        {
+          widget = gimp_prop_entry_new (config, pspec->name, -1);
+        }
+
+    }
+  else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
+    {
+      widget = gimp_prop_check_button_new (config, pspec->name,
+                                           g_param_spec_get_nick (pspec));
+
+      gimp_prop_gui_bind_label (widget, widget);
+    }
+  else if (G_IS_PARAM_SPEC_ENUM (pspec))
+    {
+      widget = gimp_prop_enum_combo_box_new (config, pspec->name, 0, 0);
+      gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (widget),
+                                    g_param_spec_get_nick (pspec));
+
+      gimp_prop_gui_bind_label (widget, widget);
+    }
+  else if (GIMP_IS_PARAM_SPEC_RGB (pspec))
+    {
+      gboolean   has_alpha;
+      GtkWidget *button;
+
+      has_alpha = gimp_param_spec_rgb_has_alpha (pspec);
+
+      widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+
+      button = gimp_prop_color_button_new (config, pspec->name,
+                                           g_param_spec_get_nick (pspec),
+                                           128, 24,
+                                           has_alpha ?
+                                             GIMP_COLOR_AREA_SMALL_CHECKS :
+                                             GIMP_COLOR_AREA_FLAT);
+      gimp_color_button_set_update (GIMP_COLOR_BUTTON (button), TRUE);
+      gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), context);
+      gtk_box_pack_start (GTK_BOX (widget), button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
+      gimp_prop_gui_bind_tooltip (button, widget);
+
+      if (create_picker_func)
+        {
+          button = create_picker_func (creator,
+                                       pspec->name,
+                                       GIMP_ICON_COLOR_PICKER_GRAY,
+                                       _("Pick color from the image"),
+                                       /* pick_abyss = */ FALSE,
+                                       NULL, NULL);
+          gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
+          gtk_widget_show (button);
+        }
+
+      *label = g_param_spec_get_nick (pspec);
+    }
+  else
+    {
+      g_warning ("%s: not supported: %s (%s)\n", G_STRFUNC,
+                 g_type_name (G_TYPE_FROM_INSTANCE (pspec)), pspec->name);
+    }
+
+  /* if we have any keys for dynamic properties, listen to config's notify
+   * signal, and update the properties accordingly.
+   */
+  if (gegl_param_spec_get_property_key (pspec, "sensitive") ||
+      gegl_param_spec_get_property_key (pspec, "visible")   ||
+      gegl_param_spec_get_property_key (pspec, "label")     ||
+      gegl_param_spec_get_property_key (pspec, "description"))
+    {
+      g_object_set_data (G_OBJECT (widget), "gimp-prop-pspec", pspec);
+
+      g_signal_connect_object (config, "notify",
+                               G_CALLBACK (gimp_prop_config_notify),
+                               widget, 0);
+
+      if (gegl_param_spec_get_property_key (pspec, "visible"))
+        {
+          /* a bit of a hack: if we have a dynamic "visible" property key,
+           * connect to the widget's "show" signal, so that we can intercept
+           * our caller's gtk_widget_show() call, and keep the widget hidden if
+           * necessary.
+           */
+          g_signal_connect (widget, "show",
+                            G_CALLBACK (gimp_prop_widget_show),
+                            config);
+        }
+
+      /* update all the properties now */
+      gimp_prop_config_notify (config, NULL, widget);
+    }
+
+  return widget;
+}
+
+
+typedef GtkWidget * (* GimpPropGuiNewFunc) (GObject                  *config,
+                                            GParamSpec              **param_specs,
+                                            guint                     n_param_specs,
+                                            GeglRectangle            *area,
+                                            GimpContext              *context,
+                                            GimpCreatePickerFunc      create_picker_func,
+                                            GimpCreateControllerFunc  create_controller_func,
+                                            gpointer                  creator);
+
+static const struct
+{
+  const gchar        *config_type;
+  GimpPropGuiNewFunc  gui_new_func;
+}
+gui_new_funcs[] =
+{
+  { "GimpColorBalanceConfig",
+    _gimp_prop_gui_new_color_balance },
+  { "GimpHueSaturationConfig",
+    _gimp_prop_gui_new_hue_saturation },
+  { "GimpGegl-gegl-color-rotate-config",
+    _gimp_prop_gui_new_color_rotate },
+  { "GimpGegl-gegl-color-to-alpha-config",
+    _gimp_prop_gui_new_color_to_alpha },
+  { "GimpGegl-gegl-convolution-matrix-config",
+    _gimp_prop_gui_new_convolution_matrix },
+  { "GimpGegl-gegl-channel-mixer-config",
+    _gimp_prop_gui_new_channel_mixer },
+  { "GimpGegl-gegl-diffraction-patterns-config",
+    _gimp_prop_gui_new_diffraction_patterns },
+  { "GimpGegl-gegl-focus-blur-config",
+    _gimp_prop_gui_new_focus_blur },
+  { "GimpGegl-gegl-motion-blur-circular-config",
+    _gimp_prop_gui_new_motion_blur_circular },
+  { "GimpGegl-gegl-motion-blur-linear-config",
+    _gimp_prop_gui_new_motion_blur_linear },
+  { "GimpGegl-gegl-motion-blur-zoom-config",
+    _gimp_prop_gui_new_motion_blur_zoom },
+  { "GimpGegl-gegl-newsprint-config",
+    _gimp_prop_gui_new_newsprint },
+  { "GimpGegl-gegl-panorama-projection-config",
+    _gimp_prop_gui_new_panorama_projection },
+  { "GimpGegl-gegl-recursive-transform-config",
+    _gimp_prop_gui_new_recursive_transform },
+  { "GimpGegl-gegl-shadows-highlights-config",
+    _gimp_prop_gui_new_shadows_highlights },
+  { "GimpGegl-gegl-spiral-config",
+    _gimp_prop_gui_new_spiral },
+  { "GimpGegl-gegl-supernova-config",
+    _gimp_prop_gui_new_supernova },
+  { "GimpGegl-gegl-vignette-config",
+    _gimp_prop_gui_new_vignette },
+  { NULL,
+    _gimp_prop_gui_new_generic }
+};
+
+
+GtkWidget *
+gimp_prop_gui_new (GObject                  *config,
+                   GType                     owner_type,
+                   GParamFlags               flags,
+                   GeglRectangle            *area,
+                   GimpContext              *context,
+                   GimpCreatePickerFunc      create_picker_func,
+                   GimpCreateControllerFunc  create_controller_func,
+                   gpointer                  creator)
+{
+  GtkWidget    *gui = NULL;
+  GParamSpec  **param_specs;
+  guint         n_param_specs;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  param_specs = gimp_operation_config_list_properties (config,
+                                                       owner_type, flags,
+                                                       &n_param_specs);
+
+  if (param_specs)
+    {
+      const gchar *config_type_name = G_OBJECT_TYPE_NAME (config);
+      gint         i;
+
+      for (i = 0; i < G_N_ELEMENTS (gui_new_funcs); i++)
+        {
+          if (! gui_new_funcs[i].config_type ||
+              ! strcmp (gui_new_funcs[i].config_type, config_type_name))
+            {
+              g_printerr ("GUI new func match: %s\n",
+                          gui_new_funcs[i].config_type ?
+                          gui_new_funcs[i].config_type : "generic fallback");
+
+              gui = gui_new_funcs[i].gui_new_func (config,
+                                                   param_specs, n_param_specs,
+                                                   area,
+                                                   context,
+                                                   create_picker_func,
+                                                   create_controller_func,
+                                                   creator);
+              break;
+            }
+        }
+
+      g_free (param_specs);
+    }
+  else
+    {
+      gui = gtk_label_new (_("This operation has no editable properties"));
+      gimp_label_set_attributes (GTK_LABEL (gui),
+                                 PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                                 -1);
+      gtk_misc_set_padding (GTK_MISC (gui), 0, 4);
+    }
+
+  return gui;
+}
+
+void
+gimp_prop_gui_bind_container (GtkWidget *source,
+                              GtkWidget *target)
+{
+  g_object_bind_property (source, "sensitive",
+                          target, "sensitive",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (source, "visible",
+                          target, "visible",
+                          G_BINDING_SYNC_CREATE);
+}
+
+void
+gimp_prop_gui_bind_label (GtkWidget *source,
+                          GtkWidget *target)
+{
+  GWeakRef    *label_ref;
+  const gchar *label;
+
+  /* we want to update "target"'s "label" property whenever the label
+   * expression associated with "source" is reevaluated, however, "source"
+   * might not itself have a "label" property we can bind to.  just keep around
+   * a reference to "target", and update its label manually.
+   */
+  g_return_if_fail (g_object_get_data (G_OBJECT (source),
+                                       "gimp-prop-label-ref") == NULL);
+
+  label_ref = g_slice_new (GWeakRef);
+
+  g_weak_ref_init (label_ref, target);
+
+  g_object_set_data_full (G_OBJECT (source),
+                          "gimp-prop-label-ref", label_ref,
+                          (GDestroyNotify) gimp_prop_free_label_ref);
+
+  label = g_object_get_data (G_OBJECT (source), "gimp-prop-label");
+
+  if (label)
+    g_object_set (target, "label", label, NULL);
+
+  /* note that "source" might be its own label widget, in which case there's no
+   * need to bind the rest of the properties.
+   */
+  if (source != target)
+    gimp_prop_gui_bind_tooltip (source, target);
+}
+
+void
+gimp_prop_gui_bind_tooltip (GtkWidget *source,
+                            GtkWidget *target)
+{
+  g_object_bind_property (source, "tooltip-text",
+                          target, "tooltip-text",
+                          G_BINDING_SYNC_CREATE);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_prop_string_to_boolean (GBinding     *binding,
+                             const GValue *from_value,
+                             GValue       *to_value,
+                             gpointer      user_data)
+{
+  const gchar *string = g_value_get_string (from_value);
+
+  g_value_set_boolean (to_value, string && *string);
+
+  return TRUE;
+}
+
+static void
+gimp_prop_config_notify (GObject    *config,
+                         GParamSpec *pspec,
+                         GtkWidget  *widget)
+{
+  GParamSpec *widget_pspec;
+  GWeakRef   *label_ref;
+  GtkWidget  *label_widget;
+  gboolean    sensitive;
+  gboolean    visible;
+  gchar      *label;
+  gchar      *description;
+
+  widget_pspec = g_object_get_data (G_OBJECT (widget), "gimp-prop-pspec");
+  label_ref    = g_object_get_data (G_OBJECT (widget), "gimp-prop-label-ref");
+
+  if (label_ref)
+    label_widget = g_weak_ref_get (label_ref);
+  else
+    label_widget = NULL;
+
+  sensitive   = gimp_prop_eval_boolean (config, widget_pspec, "sensitive", TRUE);
+  visible     = gimp_prop_eval_boolean (config, widget_pspec, "visible", TRUE);
+  label       = gimp_prop_eval_string (config, widget_pspec, "label",
+                                       g_param_spec_get_nick (widget_pspec));
+  description = gimp_prop_eval_string (config, widget_pspec, "description",
+                                       g_param_spec_get_blurb (widget_pspec));
+
+  /* we store the label in (and pass ownership over it to) the widget's
+   * "gimp-prop-label" key, so that we can use it to initialize the label
+   * widget's label in gimp_prop_gui_bind_label() upon binding.
+   */
+  g_object_set_data_full (G_OBJECT (widget), "gimp-prop-label", label, g_free);
+
+  g_signal_handlers_block_by_func (widget,
+                                   gimp_prop_widget_show, config);
+
+  gtk_widget_set_sensitive (widget, sensitive);
+  gtk_widget_set_visible (widget, visible);
+  if (label_widget) g_object_set (label_widget, "label", label, NULL);
+  gimp_help_set_help_data (widget, description, NULL);
+
+  g_signal_handlers_unblock_by_func (widget,
+                                     gimp_prop_widget_show, config);
+
+  g_free (description);
+
+  if (label_widget)
+    g_object_unref (label_widget);
+}
+
+static void
+gimp_prop_widget_show (GtkWidget *widget,
+                       GObject   *config)
+{
+  GParamSpec *widget_pspec;
+  gboolean    visible;
+
+  widget_pspec = g_object_get_data (G_OBJECT (widget), "gimp-prop-pspec");
+
+  visible = gimp_prop_eval_boolean (config, widget_pspec, "visible", TRUE);
+
+  gtk_widget_set_visible (widget, visible);
+}
+
+static void
+gimp_prop_free_label_ref (GWeakRef *label_ref)
+{
+  g_weak_ref_clear (label_ref);
+
+  g_slice_free (GWeakRef, label_ref);
+}
diff --git a/app/propgui/gimppropgui.h b/app/propgui/gimppropgui.h
new file mode 100644
index 0000000..d5d6bac
--- /dev/null
+++ b/app/propgui/gimppropgui.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui.h
+ * Copyright (C) 2002-2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_H__
+#define __GIMP_PROP_GUI_H__
+
+
+/*  A view on all of an object's properties  */
+
+GtkWidget * gimp_prop_widget_new            (GObject                 *config,
+                                             const gchar             *property_name,
+                                             GeglRectangle           *area,
+                                             GimpContext             *context,
+                                             GimpCreatePickerFunc     create_picker,
+                                             GimpCreateControllerFunc create_controller,
+                                             gpointer                 creator,
+                                             const gchar            **label);
+GtkWidget * gimp_prop_widget_new_from_pspec (GObject                 *config,
+                                             GParamSpec              *pspec,
+                                             GeglRectangle           *area,
+                                             GimpContext             *context,
+                                             GimpCreatePickerFunc     create_picker,
+                                             GimpCreateControllerFunc create_controller,
+                                             gpointer                 creator,
+                                             const gchar            **label);
+GtkWidget * gimp_prop_gui_new               (GObject                 *config,
+                                             GType                    owner_type,
+                                             GParamFlags              flags,
+                                             GeglRectangle           *area,
+                                             GimpContext             *context,
+                                             GimpCreatePickerFunc     create_picker,
+                                             GimpCreateControllerFunc create_controller,
+                                             gpointer                 creator);
+
+void        gimp_prop_gui_bind_container    (GtkWidget               *source,
+                                             GtkWidget               *target);
+void        gimp_prop_gui_bind_label        (GtkWidget               *source,
+                                             GtkWidget               *target);
+void        gimp_prop_gui_bind_tooltip      (GtkWidget               *source,
+                                             GtkWidget               *target);
+
+
+#endif /* __GIMP_PROP_GUI_H__ */
diff --git a/app/propgui/propgui-types.h b/app/propgui/propgui-types.h
new file mode 100644
index 0000000..11bbc06
--- /dev/null
+++ b/app/propgui/propgui-types.h
@@ -0,0 +1,145 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __PROPGUI_TYPES_H__
+#define __PROPGUI_TYPES_H__
+
+
+#include "display/display-enums.h"
+
+#include "widgets/widgets-types.h"
+
+
+/*  enums, move to propgui-enums.h if we get more  */
+
+typedef enum
+{
+  GIMP_CONTROLLER_TYPE_LINE,
+  GIMP_CONTROLLER_TYPE_SLIDER_LINE,
+  GIMP_CONTROLLER_TYPE_TRANSFORM_GRID,
+  GIMP_CONTROLLER_TYPE_TRANSFORM_GRIDS,
+  GIMP_CONTROLLER_TYPE_GYROSCOPE,
+  GIMP_CONTROLLER_TYPE_FOCUS
+} GimpControllerType;
+
+
+/*  structs  */
+
+typedef struct
+{
+  gdouble        value;           /*  slider value                           */
+  gdouble        min;             /*  minimal allowable slider value         */
+  gdouble        max;             /*  maximal allowable slider value         */
+
+  gboolean       visible    : 1;  /*  slider is visible                      */
+  gboolean       selectable : 1;  /*  slider is selectable                   */
+  gboolean       movable    : 1;  /*  slider movable                         */
+  gboolean       removable  : 1;  /*  slider is removable                    */
+
+  gboolean       autohide   : 1;  /*  whether to autohide the slider         */
+  GimpHandleType type;            /*  slider handle type                     */
+  gdouble        size;            /*  slider handle size, as a fraction of   *
+                                   *  the default size                       */
+
+  gpointer       data;            /*  user data                              */
+} GimpControllerSlider;
+
+#define GIMP_CONTROLLER_SLIDER_DEFAULT                                         \
+  ((const GimpControllerSlider) {                                              \
+    .value      = 0.0,                                                         \
+    .min        = 0.0,                                                         \
+    .max        = 1.0,                                                         \
+                                                                               \
+    .visible    = TRUE,                                                        \
+    .selectable = TRUE,                                                        \
+    .movable    = TRUE,                                                        \
+    .removable  = FALSE,                                                       \
+                                                                               \
+    .autohide   = FALSE,                                                       \
+    .type       = GIMP_HANDLE_FILLED_DIAMOND,                                  \
+    .size       = 1.0,                                                         \
+                                                                               \
+    .data       = NULL                                                         \
+  })
+
+
+/*  function types  */
+
+typedef void (* GimpPickerCallback)                   (gpointer                    data,
+                                                       gpointer                    identifier,
+                                                       gdouble                     x,
+                                                       gdouble                     y,
+                                                       const Babl                 *sample_format,
+                                                       const GimpRGB              *color);
+
+typedef void (* GimpControllerLineCallback)           (gpointer                    data,
+                                                       GeglRectangle              *area,
+                                                       gdouble                     x1,
+                                                       gdouble                     y1,
+                                                       gdouble                     x2,
+                                                       gdouble                     y2);
+typedef void (* GimpControllerSliderLineCallback)     (gpointer                    data,
+                                                       GeglRectangle              *area,
+                                                       gdouble                     x1,
+                                                       gdouble                     y1,
+                                                       gdouble                     x2,
+                                                       gdouble                     y2,
+                                                       const GimpControllerSlider *sliders,
+                                                       gint                        n_sliders);
+typedef void (* GimpControllerTransformGridCallback)  (gpointer                    data,
+                                                       GeglRectangle              *area,
+                                                       const GimpMatrix3          *transform);
+typedef void (* GimpControllerTransformGridsCallback) (gpointer                    data,
+                                                       GeglRectangle              *area,
+                                                       const GimpMatrix3          *transforms,
+                                                       gint                        n_transforms);
+typedef void (* GimpControllerGyroscopeCallback)      (gpointer                    data,
+                                                       GeglRectangle              *area,
+                                                       gdouble                     yaw,
+                                                       gdouble                     pitch,
+                                                       gdouble                     roll,
+                                                       gdouble                     zoom,
+                                                       gboolean                    invert);
+typedef void (* GimpControllerFocusCallback)          (gpointer                    data,
+                                                       GeglRectangle              *area,
+                                                       GimpLimitType               type,
+                                                       gdouble                     x,
+                                                       gdouble                     y,
+                                                       gdouble                     radius,
+                                                       gdouble                     aspect_ratio,
+                                                       gdouble                     angle,
+                                                       gdouble                     inner_limit,
+                                                       gdouble                     midpoint);
+
+
+typedef GtkWidget * (* GimpCreatePickerFunc)          (gpointer                    creator,
+                                                       const gchar                *property_name,
+                                                       const gchar                *icon_name,
+                                                       const gchar                *tooltip,
+                                                       gboolean                    pick_abyss,
+                                                       GimpPickerCallback          callback,
+                                                       gpointer                    callback_data);
+
+typedef GCallback   (* GimpCreateControllerFunc)      (gpointer                    creator,
+                                                       GimpControllerType          controller_type,
+                                                       const gchar                *status_title,
+                                                       GCallback                   callback,
+                                                       gpointer                    callback_data,
+                                                       gpointer                   *set_func_data);
+
+
+#endif /* __PROPGUI_TYPES_H__ */
diff --git a/app/sanity.c b/app/sanity.c
new file mode 100644
index 0000000..727482c
--- /dev/null
+++ b/app/sanity.c
@@ -0,0 +1,738 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <fontconfig/fontconfig.h>
+#include <pango/pango.h>
+#include <pango/pangoft2.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <lcms2.h>
+#include <gexiv2/gexiv2.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "sanity.h"
+
+#include "gimp-intl.h"
+
+
+/*  early-stage tests  */
+static gchar * sanity_check_gimp              (void);
+static gchar * sanity_check_glib              (void);
+static gchar * sanity_check_cairo             (void);
+static gchar * sanity_check_pango             (void);
+static gchar * sanity_check_fontconfig        (void);
+static gchar * sanity_check_freetype          (void);
+static gchar * sanity_check_gdk_pixbuf        (void);
+static gchar * sanity_check_lcms              (void);
+static gchar * sanity_check_gexiv2            (void);
+static gchar * sanity_check_babl              (void);
+static gchar * sanity_check_gegl              (void);
+static gchar * sanity_check_filename_encoding (void);
+
+/*  late-stage tests  */
+static gchar * sanity_check_gegl_ops          (void);
+
+
+/*  public functions  */
+
+/* early-stage sanity check, performed before the call to app_run(). */
+const gchar *
+sanity_check_early (void)
+{
+  gchar *abort_message = NULL;
+
+  if (! abort_message)
+    abort_message = sanity_check_gimp ();
+
+  if (! abort_message)
+    abort_message = sanity_check_glib ();
+
+  if (! abort_message)
+    abort_message = sanity_check_cairo ();
+
+  if (! abort_message)
+    abort_message = sanity_check_pango ();
+
+  if (! abort_message)
+    abort_message = sanity_check_fontconfig ();
+
+  if (! abort_message)
+    abort_message = sanity_check_freetype ();
+
+  if (! abort_message)
+    abort_message = sanity_check_gdk_pixbuf ();
+
+  if (! abort_message)
+    abort_message = sanity_check_lcms ();
+
+  if (! abort_message)
+    abort_message = sanity_check_gexiv2 ();
+
+  if (! abort_message)
+    abort_message = sanity_check_babl ();
+
+  if (! abort_message)
+    abort_message = sanity_check_gegl ();
+
+  if (! abort_message)
+    abort_message = sanity_check_filename_encoding ();
+
+  return abort_message;
+}
+
+/* late-stage sanity check, performed during app_run(), after the user
+ * configuration has been loaded.
+ */
+const gchar *
+sanity_check_late (void)
+{
+  gchar *abort_message = NULL;
+
+  /* the gegl ops test initializes all gegl ops; in particular, it initializes
+   * all the strings used by their properties, which appear in the ui.  it
+   * must be run after we've called language_init(), potentially overriding
+   * LANGUAGE according to the user config, or else all affected strings would
+   * use the translation corresponding to the system locale, regardless.
+   */
+  if (! abort_message)
+    abort_message = sanity_check_gegl_ops ();
+
+  return abort_message;
+}
+
+
+/*  private functions  */
+
+
+/*  early-stage tests  */
+
+static gboolean
+sanity_check_version (guint major_version, guint required_major,
+                      guint minor_version, guint required_minor,
+                      guint micro_version, guint required_micro)
+{
+  if (major_version > required_major)
+    return TRUE;
+
+  if (major_version < required_major)
+    return FALSE;
+
+  if (minor_version > required_minor)
+    return TRUE;
+
+  if (minor_version < required_minor)
+    return FALSE;
+
+  if (micro_version >= required_micro)
+    return TRUE;
+
+  return FALSE;
+}
+
+static gchar *
+sanity_check_gimp (void)
+{
+  if (GIMP_MAJOR_VERSION != gimp_major_version ||
+      GIMP_MINOR_VERSION != gimp_minor_version ||
+      GIMP_MICRO_VERSION != gimp_micro_version)
+    {
+      return g_strdup_printf
+        ("Libgimp version mismatch!\n\n"
+         "The GIMP binary cannot run with a libgimp version\n"
+         "other than its own. This is GIMP %d.%d.%d, but the\n"
+         "libgimp version is %d.%d.%d.\n\n"
+         "Maybe you have GIMP versions in both /usr and /usr/local ?",
+         GIMP_MAJOR_VERSION, GIMP_MINOR_VERSION, GIMP_MICRO_VERSION,
+         gimp_major_version, gimp_minor_version, gimp_micro_version);
+    }
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_glib (void)
+{
+#define GLIB_REQUIRED_MAJOR 2
+#define GLIB_REQUIRED_MINOR 56
+#define GLIB_REQUIRED_MICRO 2
+
+  const gchar *mismatch = glib_check_version (GLIB_REQUIRED_MAJOR,
+                                              GLIB_REQUIRED_MINOR,
+                                              GLIB_REQUIRED_MICRO);
+
+  if (mismatch)
+    {
+      return g_strdup_printf
+        ("%s\n\n"
+         "GIMP requires GLib version %d.%d.%d or later.\n"
+         "Installed GLib version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older GLib version.\n\n"
+         "Please upgrade to GLib version %d.%d.%d or later.",
+         mismatch,
+         GLIB_REQUIRED_MAJOR, GLIB_REQUIRED_MINOR, GLIB_REQUIRED_MICRO,
+         glib_major_version, glib_minor_version, glib_micro_version,
+         GLIB_REQUIRED_MAJOR, GLIB_REQUIRED_MINOR, GLIB_REQUIRED_MICRO);
+    }
+
+#undef GLIB_REQUIRED_MAJOR
+#undef GLIB_REQUIRED_MINOR
+#undef GLIB_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_cairo (void)
+{
+#define CAIRO_REQUIRED_MAJOR 1
+#define CAIRO_REQUIRED_MINOR 12
+#define CAIRO_REQUIRED_MICRO 2
+
+  if (cairo_version () < CAIRO_VERSION_ENCODE (CAIRO_REQUIRED_MAJOR,
+                                               CAIRO_REQUIRED_MINOR,
+                                               CAIRO_REQUIRED_MICRO))
+    {
+      return g_strdup_printf
+        ("The Cairo version being used is too old!\n\n"
+         "GIMP requires Cairo version %d.%d.%d or later.\n"
+         "Installed Cairo version is %s.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older Cairo version.\n\n"
+         "Please upgrade to Cairo version %d.%d.%d or later.",
+         CAIRO_REQUIRED_MAJOR, CAIRO_REQUIRED_MINOR, CAIRO_REQUIRED_MICRO,
+         cairo_version_string (),
+         CAIRO_REQUIRED_MAJOR, CAIRO_REQUIRED_MINOR, CAIRO_REQUIRED_MICRO);
+    }
+
+#undef CAIRO_REQUIRED_MAJOR
+#undef CAIRO_REQUIRED_MINOR
+#undef CAIRO_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_pango (void)
+{
+#define PANGO_REQUIRED_MAJOR 1
+#define PANGO_REQUIRED_MINOR 29
+#define PANGO_REQUIRED_MICRO 4
+
+  const gchar *mismatch = pango_version_check (PANGO_REQUIRED_MAJOR,
+                                               PANGO_REQUIRED_MINOR,
+                                               PANGO_REQUIRED_MICRO);
+
+  if (mismatch)
+    {
+      const gint pango_major_version = pango_version () / 100 / 100;
+      const gint pango_minor_version = pango_version () / 100 % 100;
+      const gint pango_micro_version = pango_version () % 100;
+
+      return g_strdup_printf
+        ("%s\n\n"
+         "GIMP requires Pango version %d.%d.%d or later.\n"
+         "Installed Pango version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older Pango version.\n\n"
+         "Please upgrade to Pango version %d.%d.%d or later.",
+         mismatch,
+         PANGO_REQUIRED_MAJOR, PANGO_REQUIRED_MINOR, PANGO_REQUIRED_MICRO,
+         pango_major_version, pango_minor_version, pango_micro_version,
+         PANGO_REQUIRED_MAJOR, PANGO_REQUIRED_MINOR, PANGO_REQUIRED_MICRO);
+    }
+
+#undef PANGO_REQUIRED_MAJOR
+#undef PANGO_REQUIRED_MINOR
+#undef PANGO_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_fontconfig (void)
+{
+  const gint fc_version = FcGetVersion ();
+
+#define FC_REQUIRED_MAJOR 2
+#define FC_REQUIRED_MINOR 2
+#define FC_REQUIRED_MICRO 0
+
+  if (fc_version < ((FC_REQUIRED_MAJOR * 10000) +
+                    (FC_REQUIRED_MINOR *   100) +
+                    (FC_REQUIRED_MICRO *     1)))
+    {
+      const gint fc_major_version = fc_version / 100 / 100;
+      const gint fc_minor_version = fc_version / 100 % 100;
+      const gint fc_micro_version = fc_version % 100;
+
+      return g_strdup_printf
+        ("The Fontconfig version being used is too old!\n\n"
+         "GIMP requires Fontconfig version %d.%d.%d or later.\n"
+         "The Fontconfig version loaded by GIMP is %d.%d.%d.\n\n"
+         "This may be caused by another instance of libfontconfig.so.1\n"
+         "being installed in the system, probably in /usr/X11R6/lib.\n"
+         "Please correct the situation or report it to someone who can.",
+         FC_REQUIRED_MAJOR, FC_REQUIRED_MINOR, FC_REQUIRED_MICRO,
+         fc_major_version, fc_minor_version, fc_micro_version);
+    }
+
+#undef FC_REQUIRED_MAJOR
+#undef FC_REQUIRED_MINOR
+#undef FC_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_freetype (void)
+{
+  FT_Library ft_library;
+  FT_Int     ft_major_version;
+  FT_Int     ft_minor_version;
+  FT_Int     ft_micro_version;
+  FT_Int     ft_version;
+
+#define FT_REQUIRED_MAJOR 2
+#define FT_REQUIRED_MINOR 1
+#define FT_REQUIRED_MICRO 7
+
+  if (FT_Init_FreeType (&ft_library) != 0)
+    g_error ("FT_Init_FreeType() failed");
+
+  FT_Library_Version (ft_library,
+                      &ft_major_version,
+                      &ft_minor_version,
+                      &ft_micro_version);
+
+  if (FT_Done_FreeType (ft_library) != 0)
+    g_error ("FT_Done_FreeType() failed");
+
+  ft_version = (ft_major_version * 10000 +
+                ft_minor_version *   100 +
+                ft_micro_version *     1);
+
+  if (ft_version < ((FT_REQUIRED_MAJOR * 10000) +
+                    (FT_REQUIRED_MINOR *   100) +
+                    (FT_REQUIRED_MICRO *     1)))
+    {
+      return g_strdup_printf
+        ("FreeType version too old!\n\n"
+         "GIMP requires FreeType version %d.%d.%d or later.\n"
+         "Installed FreeType version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older FreeType version.\n\n"
+         "Please upgrade to FreeType version %d.%d.%d or later.",
+         FT_REQUIRED_MAJOR, FT_REQUIRED_MINOR, FT_REQUIRED_MICRO,
+         ft_major_version, ft_minor_version, ft_micro_version,
+         FT_REQUIRED_MAJOR, FT_REQUIRED_MINOR, FT_REQUIRED_MICRO);
+    }
+
+#undef FT_REQUIRED_MAJOR
+#undef FT_REQUIRED_MINOR
+#undef FT_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_gdk_pixbuf (void)
+{
+#define GDK_PIXBUF_REQUIRED_MAJOR 2
+#define GDK_PIXBUF_REQUIRED_MINOR 30
+#define GDK_PIXBUF_REQUIRED_MICRO 8
+
+  if (! sanity_check_version (gdk_pixbuf_major_version, GDK_PIXBUF_REQUIRED_MAJOR,
+                              gdk_pixbuf_minor_version, GDK_PIXBUF_REQUIRED_MINOR,
+                              gdk_pixbuf_micro_version, GDK_PIXBUF_REQUIRED_MICRO))
+    {
+      return g_strdup_printf
+        ("GdkPixbuf version too old!\n\n"
+         "GIMP requires GdkPixbuf version %d.%d.%d or later.\n"
+         "Installed GdkPixbuf version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older GdkPixbuf version.\n\n"
+         "Please upgrade to GdkPixbuf version %d.%d.%d or later.",
+         GDK_PIXBUF_REQUIRED_MAJOR, GDK_PIXBUF_REQUIRED_MINOR, GDK_PIXBUF_REQUIRED_MICRO,
+         gdk_pixbuf_major_version, gdk_pixbuf_minor_version, gdk_pixbuf_micro_version,
+         GDK_PIXBUF_REQUIRED_MAJOR, GDK_PIXBUF_REQUIRED_MINOR, GDK_PIXBUF_REQUIRED_MICRO);
+    }
+
+#undef GDK_PIXBUF_REQUIRED_MAJOR
+#undef GDK_PIXBUF_REQUIRED_MINOR
+#undef GDK_PIXBUF_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_lcms (void)
+{
+#define LCMS_REQUIRED_MAJOR 2
+#define LCMS_REQUIRED_MINOR 8
+
+  gint lcms_version = cmsGetEncodedCMMversion ();
+
+  if (lcms_version < (LCMS_REQUIRED_MAJOR * 1000 +
+                      LCMS_REQUIRED_MINOR * 10))
+    {
+      const gint lcms_major_version = lcms_version / 1000;
+      const gint lcms_minor_version = lcms_version % 1000 / 10;
+
+      return g_strdup_printf
+        ("Liblcms2 version too old!\n\n"
+         "GIMP requires LittleCMS version %d.%d or later.\n"
+         "Installed LittleCMS version is %d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older LittleCMS version.\n\n"
+         "Please upgrade to LittleCMS version %d.%d or later.",
+         LCMS_REQUIRED_MAJOR, LCMS_REQUIRED_MINOR,
+         lcms_major_version, lcms_minor_version,
+         LCMS_REQUIRED_MAJOR, LCMS_REQUIRED_MINOR);
+    }
+
+#undef LCMS_REQUIRED_MAJOR
+#undef LCMS_REQUIRED_MINOR
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_gexiv2 (void)
+{
+#ifdef GEXIV2_MAJOR_VERSION
+
+#define GEXIV2_REQUIRED_MAJOR 0
+#define GEXIV2_REQUIRED_MINOR 10
+#define GEXIV2_REQUIRED_MICRO 6
+
+  gint gexiv2_version = gexiv2_get_version ();
+
+  if (gexiv2_version < (GEXIV2_REQUIRED_MAJOR * 100 * 100 +
+                        GEXIV2_REQUIRED_MINOR * 100 +
+                        GEXIV2_REQUIRED_MICRO))
+    {
+      const gint gexiv2_major_version = gexiv2_version / 100 / 100;
+      const gint gexiv2_minor_version = gexiv2_version / 100 % 100;
+      const gint gexiv2_micro_version = gexiv2_version % 100;
+
+      return g_strdup_printf
+        ("gexiv2 version too old!\n\n"
+         "GIMP requires gexiv2 version %d.%d.%d or later.\n"
+         "Installed gexiv2 version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older gexiv2 version.\n\n"
+         "Please upgrade to gexiv2 version %d.%d.%d or later.",
+         GEXIV2_REQUIRED_MAJOR, GEXIV2_REQUIRED_MINOR, GEXIV2_REQUIRED_MICRO,
+         gexiv2_major_version, gexiv2_minor_version, gexiv2_micro_version,
+         GEXIV2_REQUIRED_MAJOR, GEXIV2_REQUIRED_MINOR, GEXIV2_REQUIRED_MICRO);
+    }
+
+#undef GEXIV2_REQUIRED_MAJOR
+#undef GEXIV2_REQUIRED_MINOR
+#undef GEXIV2_REQUIRED_MICRO
+
+#endif
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_babl (void)
+{
+  gint babl_major_version;
+  gint babl_minor_version;
+  gint babl_micro_version;
+
+#define BABL_REQUIRED_MAJOR 0
+#define BABL_REQUIRED_MINOR 1
+#define BABL_REQUIRED_MICRO 78
+
+  babl_get_version (&babl_major_version,
+                    &babl_minor_version,
+                    &babl_micro_version);
+
+  if (! sanity_check_version (babl_major_version, BABL_REQUIRED_MAJOR,
+                              babl_minor_version, BABL_REQUIRED_MINOR,
+                              babl_micro_version, BABL_REQUIRED_MICRO))
+    {
+      return g_strdup_printf
+        ("BABL version too old!\n\n"
+         "GIMP requires BABL version %d.%d.%d or later.\n"
+         "Installed BABL version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older BABL version.\n\n"
+         "Please upgrade to BABL version %d.%d.%d or later.",
+         BABL_REQUIRED_MAJOR, BABL_REQUIRED_MINOR, BABL_REQUIRED_MICRO,
+         babl_major_version, babl_minor_version, babl_micro_version,
+         BABL_REQUIRED_MAJOR, BABL_REQUIRED_MINOR, BABL_REQUIRED_MICRO);
+    }
+
+#undef BABL_REQUIRED_MAJOR
+#undef BABL_REQUIRED_MINOR
+#undef BABL_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_gegl (void)
+{
+  gint gegl_major_version;
+  gint gegl_minor_version;
+  gint gegl_micro_version;
+
+#define GEGL_REQUIRED_MAJOR 0
+#define GEGL_REQUIRED_MINOR 4
+#define GEGL_REQUIRED_MICRO 38
+
+  gegl_get_version (&gegl_major_version,
+                    &gegl_minor_version,
+                    &gegl_micro_version);
+
+  if (! sanity_check_version (gegl_major_version, GEGL_REQUIRED_MAJOR,
+                              gegl_minor_version, GEGL_REQUIRED_MINOR,
+                              gegl_micro_version, GEGL_REQUIRED_MICRO))
+    {
+      return g_strdup_printf
+        ("GEGL version too old!\n\n"
+         "GIMP requires GEGL version %d.%d.%d or later.\n"
+         "Installed GEGL version is %d.%d.%d.\n\n"
+         "Somehow you or your software packager managed\n"
+         "to install GIMP with an older GEGL version.\n\n"
+         "Please upgrade to GEGL version %d.%d.%d or later.",
+         GEGL_REQUIRED_MAJOR, GEGL_REQUIRED_MINOR, GEGL_REQUIRED_MICRO,
+         gegl_major_version, gegl_minor_version, gegl_micro_version,
+         GEGL_REQUIRED_MAJOR, GEGL_REQUIRED_MINOR, GEGL_REQUIRED_MICRO);
+    }
+
+#undef GEGL_REQUIRED_MAJOR
+#undef GEGL_REQUIRED_MINOR
+#undef GEGL_REQUIRED_MICRO
+
+  return NULL;
+}
+
+static gchar *
+sanity_check_filename_encoding (void)
+{
+  gchar  *result;
+  GError *error = NULL;
+
+  result = g_filename_to_utf8 ("", -1, NULL, NULL, &error);
+
+  if (! result)
+    {
+      gchar *msg =
+        g_strdup_printf
+        (_("The configured filename encoding cannot be converted to UTF-8: "
+           "%s\n\n"
+           "Please check the value of the environment variable "
+           "G_FILENAME_ENCODING."),
+         error->message);
+
+      g_error_free (error);
+
+      return msg;
+    }
+
+  g_free (result);
+
+  result = g_filename_to_utf8 (gimp_directory (), -1, NULL, NULL, &error);
+
+  if (! result)
+    {
+      gchar *msg =
+        g_strdup_printf
+        (_("The name of the directory holding the GIMP user configuration "
+           "cannot be converted to UTF-8: "
+           "%s\n\n"
+           "Your filesystem probably stores files in an encoding "
+           "other than UTF-8 and you didn't tell GLib about this. "
+           "Please set the environment variable G_FILENAME_ENCODING."),
+         error->message);
+
+      g_error_free (error);
+
+      return msg;
+    }
+
+  g_free (result);
+
+  return NULL;
+}
+
+
+/*  late-stage tests  */
+
+static gchar *
+sanity_check_gegl_ops (void)
+{
+  static const gchar *required_ops[] =
+  {
+    "gegl:alien-map",
+    "gegl:bayer-matrix",
+    "gegl:bloom",
+    "gegl:buffer-sink",
+    "gegl:buffer-source",
+    "gegl:c2g",
+    "gegl:cache",
+    "gegl:cartoon",
+    "gegl:cell-noise",
+    "gegl:checkerboard",
+    "gegl:color",
+    "gegl:color-enhance",
+    "gegl:color-exchange",
+    "gegl:color-rotate",
+    "gegl:color-temperature",
+    "gegl:color-to-alpha",
+    "gegl:component-extract",
+    "gegl:convolution-matrix",
+    "gegl:copy-buffer",
+    "gegl:crop",
+    "gegl:cubism",
+    "gegl:deinterlace",
+    "gegl:difference-of-gaussians",
+    "gegl:diffraction-patterns",
+    "gegl:displace",
+    "gegl:distance-transform",
+    "gegl:dither",
+    "gegl:dropshadow",
+    "gegl:edge",
+    "gegl:edge-laplace",
+    "gegl:edge-neon",
+    "gegl:edge-sobel",
+    "gegl:emboss",
+    "gegl:engrave",
+    "gegl:exposure",
+    "gegl:fattal02",
+    "gegl:focus-blur",
+    "gegl:fractal-trace",
+    "gegl:gaussian-blur",
+    "gegl:gaussian-blur-selective",
+    "gegl:gegl",
+    "gegl:grid",
+    "gegl:high-pass",
+    "gegl:hue-chroma",
+    "gegl:illusion",
+    "gegl:image-gradient",
+    "gegl:invert-gamma",
+    "gegl:invert-linear",
+    "gegl:lens-blur",
+    "gegl:lens-distortion",
+    "gegl:lens-flare",
+    "gegl:linear-sinusoid",
+    "gegl:long-shadow",
+    "gegl:mantiuk06",
+    "gegl:map-absolute",
+    "gegl:map-relative",
+    "gegl:matting-global",
+    "gegl:maze",
+    "gegl:mean-curvature-blur",
+    "gegl:median-blur",
+    "gegl:mirrors",
+    "gegl:mono-mixer",
+    "gegl:mosaic",
+    "gegl:motion-blur-circular",
+    "gegl:motion-blur-linear",
+    "gegl:motion-blur-zoom",
+    "gegl:newsprint",
+    "gegl:noise-cie-lch",
+    "gegl:noise-hsv",
+    "gegl:noise-hurl",
+    "gegl:noise-pick",
+    "gegl:noise-rgb",
+    "gegl:noise-slur",
+    "gegl:noise-solid",
+    "gegl:noise-spread",
+    "gegl:normal-map",
+    "gegl:npd",
+    "gegl:oilify",
+    "gegl:opacity",
+    "gegl:over",
+    "gegl:panorama-projection",
+    "gegl:perlin-noise",
+    "gegl:photocopy",
+    "gegl:pixelize",
+    "gegl:polar-coordinates",
+    "gegl:recursive-transform",
+    "gegl:red-eye-removal",
+    "gegl:reinhard05",
+    "gegl:rgb-clip",
+    "gegl:ripple",
+    "gegl:saturation",
+    "gegl:scale-ratio",
+    "gegl:seamless-clone",
+    "gegl:sepia",
+    "gegl:shadows-highlights",
+    "gegl:shift",
+    "gegl:simplex-noise",
+    "gegl:shift",
+    "gegl:sinus",
+    "gegl:slic",
+    "gegl:snn-mean",
+    "gegl:softglow",
+    "gegl:spherize",
+    "gegl:spiral",
+    "gegl:stereographic-projection",
+    "gegl:stretch-contrast",
+    "gegl:stretch-contrast-hsv",
+    "gegl:stress",
+    "gegl:supernova",
+    "gegl:threshold",
+    "gegl:tile",
+    "gegl:tile-paper",
+    "gegl:tile-glass",
+    "gegl:tile-seamless",
+    "gegl:transform",
+    "gegl:translate",
+    "gegl:unsharp-mask",
+    "gegl:value-invert",
+    "gegl:value-propagate",
+    "gegl:variable-blur",
+    "gegl:video-degradation",
+    "gegl:vignette",
+    "gegl:warp",
+    "gegl:waterpixels",
+    "gegl:wavelet-blur",
+    "gegl:waves",
+    "gegl:whirl-pinch",
+    "gegl:write-buffer"
+  };
+
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (required_ops); i++)
+    {
+      if (! gegl_has_operation (required_ops[i]))
+        {
+          return g_strdup_printf
+            ("GEGL operation missing!\n\n"
+             "GIMP requires the GEGL operation \"%s\".\n"
+             "This operation cannot be found. Check your\n"
+             "GEGL install and ensure it has been compiled\n"
+             "with any dependencies required for GIMP.",
+             required_ops [i]);
+        }
+    }
+
+  return NULL;
+}
diff --git a/app/sanity.h b/app/sanity.h
new file mode 100644
index 0000000..8d30e83
--- /dev/null
+++ b/app/sanity.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SANITY_H__
+#define __SANITY_H__
+
+#ifndef GIMP_APP_GLUE_COMPILATION
+#error You must not #include "sanity.h" from an app/ subdir
+#endif
+
+
+const gchar * sanity_check_early (void);
+const gchar * sanity_check_late  (void);
+
+
+#endif /* __SANITY_H__ */
diff --git a/app/signals.c b/app/signals.c
new file mode 100644
index 0000000..92fd266
--- /dev/null
+++ b/app/signals.c
@@ -0,0 +1,186 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <signal.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+
+#include "errors.h"
+#include "signals.h"
+
+#ifdef G_OS_WIN32
+#ifdef HAVE_EXCHNDL
+#include <windows.h>
+#include <time.h>
+#include <exchndl.h>
+
+static LPTOP_LEVEL_EXCEPTION_FILTER g_prevExceptionFilter = NULL;
+
+static LONG WINAPI  gimp_sigfatal_handler (PEXCEPTION_POINTERS pExceptionInfo);
+#endif
+
+#else
+
+static void         gimp_sigfatal_handler (gint sig_num) G_GNUC_NORETURN;
+
+#endif
+
+
+void
+gimp_init_signal_handlers (gchar **backtrace_file)
+{
+  time_t  t;
+  gchar  *filename;
+  gchar  *dir;
+
+#ifdef G_OS_WIN32
+  /* This has to be the non-roaming directory (i.e., the local
+     directory) as backtraces correspond to the binaries on this
+     system. */
+  dir = g_build_filename (g_get_user_data_dir (),
+                          GIMPDIR, GIMP_USER_VERSION, "CrashLog",
+                          NULL);
+#else
+  dir = g_build_filename (gimp_directory (), "CrashLog", NULL);
+#endif
+
+  time (&t);
+  filename = g_strdup_printf ("%s-crash-%" G_GUINT64_FORMAT ".txt",
+                              PACKAGE_NAME, (guint64) t);
+  *backtrace_file = g_build_filename (dir, filename, NULL);
+  g_free (filename);
+  g_free (dir);
+
+#ifdef G_OS_WIN32
+  /* Use Dr. Mingw (dumps backtrace on crash) if it is available. Do
+   * nothing otherwise on Win32.
+   * The user won't get any stack trace from glib anyhow.
+   * Without Dr. MinGW, It's better to let Windows inform about the
+   * program error, and offer debugging (if the user has installed MSVC
+   * or some other compiler that knows how to install itself as a
+   * handler for program errors).
+   */
+
+#ifdef HAVE_EXCHNDL
+  /* Order is very important here. We need to add our signal handler
+   * first, then run ExcHndlInit() which will add its own handler, so
+   * that ExcHnl's handler runs first since that's in FILO order.
+   */
+  if (! g_prevExceptionFilter)
+    g_prevExceptionFilter = SetUnhandledExceptionFilter (gimp_sigfatal_handler);
+
+  ExcHndlInit ();
+  ExcHndlSetLogFileNameA (*backtrace_file);
+
+#endif /* HAVE_EXCHNDL */
+
+#else
+
+  /* Handle fatal signals */
+
+  /* these are handled by gimp_terminate() */
+  gimp_signal_private (SIGHUP,  gimp_sigfatal_handler, 0);
+  gimp_signal_private (SIGINT,  gimp_sigfatal_handler, 0);
+  gimp_signal_private (SIGQUIT, gimp_sigfatal_handler, 0);
+  gimp_signal_private (SIGTERM, gimp_sigfatal_handler, 0);
+
+  /* these are handled by gimp_fatal_error() */
+  gimp_signal_private (SIGABRT, gimp_sigfatal_handler, 0);
+  gimp_signal_private (SIGBUS,  gimp_sigfatal_handler, 0);
+  gimp_signal_private (SIGSEGV, gimp_sigfatal_handler, 0);
+  gimp_signal_private (SIGFPE,  gimp_sigfatal_handler, 0);
+
+  /* Ignore SIGPIPE because plug_in.c handles broken pipes */
+  gimp_signal_private (SIGPIPE, SIG_IGN, 0);
+
+  /* Restart syscalls on SIGCHLD */
+  gimp_signal_private (SIGCHLD, SIG_DFL, SA_RESTART);
+
+#endif /* G_OS_WIN32 */
+}
+
+
+#ifdef G_OS_WIN32
+
+#ifdef HAVE_EXCHNDL
+static LONG WINAPI
+gimp_sigfatal_handler (PEXCEPTION_POINTERS pExceptionInfo)
+{
+  EXCEPTION_RECORD *er;
+  int               fatal;
+
+  if (pExceptionInfo == NULL ||
+      pExceptionInfo->ExceptionRecord == NULL)
+    return EXCEPTION_CONTINUE_SEARCH;
+
+  er = pExceptionInfo->ExceptionRecord;
+  fatal = I_RpcExceptionFilter (er->ExceptionCode);
+
+  /* IREF() returns EXCEPTION_CONTINUE_SEARCH for fatal exceptions */
+  if (fatal == EXCEPTION_CONTINUE_SEARCH)
+    {
+      /* Just in case, so that we don't loop or anything similar, just
+       * re-establish previous handler.
+       */
+      SetUnhandledExceptionFilter (g_prevExceptionFilter);
+
+      /* Now process the exception. */
+      gimp_fatal_error ("unhandled exception");
+    }
+
+  if (g_prevExceptionFilter && g_prevExceptionFilter != gimp_sigfatal_handler)
+    return g_prevExceptionFilter (pExceptionInfo);
+  else
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+#endif
+
+#else
+
+/* gimp core signal handler for fatal signals */
+
+static void
+gimp_sigfatal_handler (gint sig_num)
+{
+  switch (sig_num)
+    {
+    case SIGHUP:
+    case SIGINT:
+    case SIGQUIT:
+    case SIGTERM:
+      gimp_terminate (g_strsignal (sig_num));
+      break;
+
+    case SIGABRT:
+    case SIGBUS:
+    case SIGSEGV:
+    case SIGFPE:
+    default:
+      gimp_fatal_error (g_strsignal (sig_num));
+      break;
+    }
+}
+
+#endif /* G_OS_WIN32 */
diff --git a/app/signals.h b/app/signals.h
new file mode 100644
index 0000000..5eeae57
--- /dev/null
+++ b/app/signals.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SIGNALS_H__
+#define __SIGNALS_H__
+
+#ifndef GIMP_APP_GLUE_COMPILATION
+#signal You must not #include "signals.h" from an app/ subdir
+#endif
+
+
+void   gimp_init_signal_handlers (gchar **backtrace_file);
+
+
+#endif /* __SIGNALS_H__ */
diff --git a/app/tests.c b/app/tests.c
new file mode 100644
index 0000000..e71bcbe
--- /dev/null
+++ b/app/tests.c
@@ -0,0 +1,250 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "gui/gui-types.h"
+
+#include "gui/gui.h"
+
+#include "actions/actions.h"
+
+#include "menus/menus.h"
+
+#include "widgets/gimpsessioninfo.h"
+
+#include "config/gimpgeglconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-contexts.h"
+
+#include "gegl/gimp-gegl.h"
+
+#include "gimp-log.h"
+#include "tests.h"
+
+#ifdef GDK_WINDOWING_QUARTZ
+#include <Cocoa/Cocoa.h>
+#endif
+
+
+static void
+gimp_status_func_dummy (const gchar *text1,
+                        const gchar *text2,
+                        gdouble      percentage)
+{
+}
+
+/**
+ * gimp_init_for_testing:
+ *
+ * Initialize the GIMP object system for unit testing. This is a
+ * selected subset of the initialization happening in app_run().
+ **/
+Gimp *
+gimp_init_for_testing (void)
+{
+  Gimp *gimp;
+
+  gimp_log_init ();
+  gegl_init (NULL, NULL);
+
+  gimp = gimp_new ("Unit Tested GIMP", NULL, NULL, FALSE, TRUE, TRUE, TRUE,
+                   FALSE, FALSE, TRUE, FALSE, FALSE,
+                   GIMP_STACK_TRACE_QUERY, GIMP_PDB_COMPAT_OFF);
+
+  gimp_load_config (gimp, NULL, NULL);
+
+  gimp_gegl_init (gimp);
+  gimp_initialize (gimp, gimp_status_func_dummy);
+  gimp_restore (gimp, gimp_status_func_dummy, NULL);
+
+  return gimp;
+}
+
+
+#ifndef GIMP_CONSOLE_COMPILATION
+
+static void
+gimp_init_icon_theme_for_testing (void)
+{
+  gchar       *icon_root;
+
+  icon_root = g_test_build_filename (G_TEST_BUILT, "gimp-test-icon-theme", NULL);
+  gtk_icon_theme_prepend_search_path (gtk_icon_theme_get_default (),
+                                      icon_root);
+  g_free (icon_root);
+  return;
+}
+
+#ifdef GDK_WINDOWING_QUARTZ
+static gboolean
+gimp_osx_focus_window (gpointer user_data)
+{
+  [NSApp activateIgnoringOtherApps:YES];
+  return FALSE;
+}
+#endif
+
+static Gimp *
+gimp_init_for_gui_testing_internal (gboolean  show_gui,
+                                    GFile    *gimprc)
+{
+  Gimp *gimp;
+
+#if defined (G_OS_WIN32)
+  /* g_test_init() sets warnings always fatal, which is a usually a good
+     testing default. Nevertheless the Windows platform may have a few
+     quirks generating warnings, yet we want to finish tests. So we
+     allow some relaxed rules on this platform. */
+
+  GLogLevelFlags fatal_mask;
+
+  fatal_mask = (GLogLevelFlags) (G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
+  g_log_set_always_fatal (fatal_mask);
+#endif
+
+  /* from main() */
+  gimp_log_init ();
+  gegl_init (NULL, NULL);
+
+  /* Introduce an error margin for positions written to sessionrc */
+  gimp_session_info_set_position_accuracy (5);
+
+  /* from app_run() */
+  gimp = gimp_new ("Unit Tested GIMP", NULL, NULL, FALSE, TRUE, TRUE, !show_gui,
+                   FALSE, FALSE, TRUE, FALSE, FALSE,
+                   GIMP_STACK_TRACE_QUERY, GIMP_PDB_COMPAT_OFF);
+
+  gimp_set_show_gui (gimp, show_gui);
+  gimp_load_config (gimp, gimprc, NULL);
+  gimp_gegl_init (gimp);
+  gui_init (gimp, TRUE);
+  gimp_init_icon_theme_for_testing ();
+  gimp_initialize (gimp, gimp_status_func_dummy);
+  gimp_restore (gimp, gimp_status_func_dummy, NULL);
+#ifdef GDK_WINDOWING_QUARTZ
+  g_idle_add (gimp_osx_focus_window, NULL);
+#endif
+
+  return gimp;
+}
+
+/**
+ * gimp_init_for_gui_testing:
+ * @show_gui:
+ *
+ * Initializes a #Gimp instance for use in test cases that rely on GUI
+ * code to be initialized.
+ *
+ * Returns: The #Gimp instance.
+ **/
+Gimp *
+gimp_init_for_gui_testing (gboolean show_gui)
+{
+  return gimp_init_for_gui_testing_internal (show_gui, NULL);
+}
+
+/**
+ * gimp_init_for_gui_testing:
+ * @show_gui:
+ * @gimprc:
+ *
+ * Like gimp_init_for_gui_testing(), but also allows a custom gimprc
+ * filename to be specified.
+ *
+ * Returns: The #Gimp instance.
+ **/
+Gimp *
+gimp_init_for_gui_testing_with_rc (gboolean  show_gui,
+                                   GFile    *gimprc)
+{
+  return gimp_init_for_gui_testing_internal (show_gui, gimprc);
+}
+
+#endif /* GIMP_CONSOLE_COMPILATION */
+
+static gboolean
+gimp_tests_quit_mainloop (GMainLoop *loop)
+{
+  g_main_loop_quit (loop);
+
+  return FALSE;
+}
+
+/**
+ * gimp_test_run_temp_mainloop:
+ * @running_time: The time to run the main loop.
+ *
+ * Helper function for tests that wants to run a main loop for a
+ * while. Useful when you want GIMP's state to settle before doing
+ * tests.
+ **/
+void
+gimp_test_run_temp_mainloop (guint32 running_time)
+{
+  GMainLoop *loop;
+  loop = g_main_loop_new (NULL, FALSE);
+
+  g_timeout_add (running_time,
+                 (GSourceFunc) gimp_tests_quit_mainloop,
+                 loop);
+
+  g_main_loop_run (loop);
+
+  g_main_loop_unref (loop);
+}
+
+/**
+ * gimp_test_run_mainloop_until_idle:
+ *
+ * Creates and runs a main loop until it is idle, i.e. has no more
+ * work to do.
+ **/
+void
+gimp_test_run_mainloop_until_idle (void)
+{
+  GMainLoop *loop = g_main_loop_new (NULL, FALSE);
+
+  g_idle_add ((GSourceFunc) gimp_tests_quit_mainloop, loop);
+
+  g_main_loop_run (loop);
+
+  g_main_loop_unref (loop);
+}
+
+/**
+ * gimp_test_bail_if_no_display:
+ * @void:
+ *
+ * If no DISPLAY is set, call exit(EXIT_SUCCESS). There is no use in
+ * having UI tests failing in DISPLAY-less environments.
+ **/
+void
+gimp_test_bail_if_no_display (void)
+{
+  if (! g_getenv ("DISPLAY"))
+    {
+      g_message ("No DISPLAY set, not running UI tests\n");
+      exit (EXIT_SUCCESS);
+    }
+}
diff --git a/app/tests.h b/app/tests.h
new file mode 100644
index 0000000..536b17b
--- /dev/null
+++ b/app/tests.h
@@ -0,0 +1,41 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TESTS_H__
+#define __TESTS_H__
+
+/* Automake doc says:
+   "When no test protocol is in use, an exit status of 0 from a test
+   script will denote a success, an exit status of 77 a skipped test,
+   an exit status of 99 an hard error, and any other exit status will
+   denote a failure."
+
+   Unfortunately glib returns a SUCCESS when you skip tests, which is
+   not a reliable test feedback. So we hard-code the SKIPPED return
+   value. */
+#define GIMP_EXIT_TEST_SKIPPED 77
+
+Gimp * gimp_init_for_testing             (void);
+Gimp * gimp_init_for_gui_testing         (gboolean  show_gui);
+Gimp * gimp_init_for_gui_testing_with_rc (gboolean  show_gui,
+                                          GFile    *gimprc);
+void   gimp_test_run_temp_mainloop       (guint32   running_time);
+void   gimp_test_run_mainloop_until_idle (void);
+void   gimp_test_bail_if_no_display      (void);
+
+
+#endif /* __TESTS_H__ */
diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
new file mode 100644
index 0000000..668e018
--- /dev/null
+++ b/app/tests/Makefile.am
@@ -0,0 +1,169 @@
+# Prevent parallel builds for the tests, as e.g. done by make -j check
+# The tests must not be run in parallel or in a different order as specified
+.NOTPARALLEL: check
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+xobjective_cxx = "-xobjective-c++"
+xnone = "-xnone"
+endif
+
+SUBDIRS = \
+	files		\
+	gimpdir		\
+	gimpdir-empty
+
+# Don't mess with user's gimpdir. Pass in the abs top srcdir to the
+# tests through an environment variable so they can set the gimpdir
+# they want to use
+TESTS_ENVIRONMENT = \
+	GIMP_TESTING_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
+	GIMP_TESTING_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
+	GIMP_TESTING_PLUGINDIRS=@abs_top_builddir@/plug-ins/common \
+	GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES=mkgen.pl
+
+# Run tests with xvfb-run if available
+if HAVE_XVFB_RUN
+TESTS_ENVIRONMENT += $(XVFB_RUN) --auto-servernum --server-args="-screen 0 1280x1024x24"
+endif
+
+
+TESTS = \
+	test-core					\
+	test-gimpidtable				\
+	test-save-and-export				\
+	test-session-2-8-compatibility-multi-window	\
+	test-session-2-8-compatibility-single-window	\
+	test-single-window-mode				\
+	test-tools					\
+	test-ui						\
+	test-xcf
+
+EXTRA_PROGRAMS = $(TESTS)
+CLEANFILES = $(EXTRA_PROGRAMS)
+
+$(TESTS): gimpdir-output gimp-test-icon-theme
+
+noinst_LIBRARIES = libgimpapptestutils.a
+libgimpapptestutils_a_SOURCES = \
+	gimp-app-test-utils.c		\
+	gimp-app-test-utils.h		\
+	gimp-test-session-utils.c	\
+	gimp-test-session-utils.h
+
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+
+if PLATFORM_LINUX
+libdl = -ldl
+endif
+
+if OS_WIN32
+else
+libm = -lm
+endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/app	\
+	$(PANGOCAIRO_CFLAGS)	\
+	$(GTK_CFLAGS)		\
+	$(GEGL_CFLAGS)		\
+	$(xobjective_c)		\
+	-I$(includedir)
+
+# We need this due to circular dependencies
+AM_LDFLAGS = \
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_param_spec_duplicate		\
+	-Wl,-u,$(SYMPREFIX)gimp_operations_init			\
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
+	-Wl,-u,$(SYMPREFIX)gui_init				\
+	-Wl,-u,$(SYMPREFIX)gimp_lebl_dialog
+
+# Note that we have some duplicate entries here too to work around
+# circular dependencies and systems on the same architectural layer as
+# an alternative to LDFLAGS above
+LDADD = \
+	../gui/libappgui.a						\
+	../tools/libapptools.a						\
+	../dialogs/libappdialogs.a					\
+	../menus/libappmenus.a						\
+	../actions/libappactions.a					\
+	../dialogs/libappdialogs.a					\
+	../display/libappdisplay.a					\
+	../propgui/libapppropgui.a					\
+	../widgets/libappwidgets.a					\
+	../xcf/libappxcf.a						\
+	../pdb/libappinternal-procs.a					\
+	../pdb/libapppdb.a						\
+	../plug-in/libappplug-in.a					\
+	../vectors/libappvectors.a					\
+	../core/libappcore.a						\
+	../file/libappfile.a						\
+	../file-data/libappfile-data.a					\
+	../text/libapptext.a						\
+	../paint/libapppaint.a						\
+	../config/libappconfig.a					\
+	../libapp.a							\
+	../gegl/libappgegl.a						\
+	../operations/libappoperations.a				\
+	../operations/layer-modes/libapplayermodes.a			\
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a	\
+	libgimpapptestutils.a						\
+	$(libgimpwidgets)						\
+	$(libgimpconfig)						\
+	$(libgimpmath)							\
+	$(libgimpthumb)							\
+	$(libgimpcolor)							\
+	$(libgimpmodule)						\
+	$(libgimpbase)							\
+	$(GIMPICONRC)							\
+	$(GTK_LIBS)							\
+	$(GTK_MAC_INTEGRATION_LIBS)					\
+	$(GDK_PIXBUF_LIBS)						\
+	$(FREETYPE_LIBS)						\
+	$(FONTCONFIG_LIBS)						\
+	$(PANGOCAIRO_LIBS)						\
+	$(HARFBUZZ_LIBS)						\
+	$(CAIRO_LIBS)							\
+	$(GEGL_LIBS)							\
+	$(GIO_LIBS)							\
+	$(GEXIV2_LIBS)							\
+	$(Z_LIBS)							\
+	$(JSON_C_LIBS)							\
+	$(LIBMYPAINT_LIBS)						\
+	$(LIBBACKTRACE_LIBS)						\
+	$(LIBUNWIND_LIBS)						\
+	$(INTLLIBS)							\
+	$(RT_LIBS)							\
+	$(libm)								\
+	$(libdl)
+
+gimpdir-output:
+	mkdir -p gimpdir-output
+	mkdir -p gimpdir-output/brushes
+	mkdir -p gimpdir-output/patterns
+	mkdir -p gimpdir-output/gradients
+
+gimp-test-icon-theme:
+	mkdir -p $$(echo $$(find $(top_srcdir)/icons/Color -name [0-9][0-9] -type d | sed 's@.*/\([0-9][0-9]\)$$@gimp-test-icon-theme/hicolor/\1x\1@'))
+	for dir in $$(echo $$(find $(top_srcdir)/icons/Color/ -name [0-9][0-9] -type d | sed 's@.*/\([0-9][0-9]\)$$@\1@')); do \
+		(cd gimp-test-icon-theme/hicolor/$${dir}x$${dir}/ && \
+		$(LN_S) $(abs_top_srcdir)/icons/Color/$${dir} apps); \
+	done
+	(cd gimp-test-icon-theme/hicolor && $(LN_S) $(abs_top_srcdir)/icons/Color/index.theme index.theme)
+
+clean-local:
+	rm -rf gimpdir-output
+	rm -fr gimp-test-icon-theme
diff --git a/app/tests/Makefile.in b/app/tests/Makefile.in
new file mode 100644
index 0000000..cc2ee2b
--- /dev/null
+++ b/app/tests/Makefile.in
@@ -0,0 +1,1947 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+
+# Run tests with xvfb-run if available
+@HAVE_XVFB_RUN_TRUE@am__append_1 = $(XVFB_RUN) --auto-servernum --server-args="-screen 0 1280x1024x24"
+TESTS = test-core$(EXEEXT) test-gimpidtable$(EXEEXT) \
+	test-save-and-export$(EXEEXT) \
+	test-session-2-8-compatibility-multi-window$(EXEEXT) \
+	test-session-2-8-compatibility-single-window$(EXEEXT) \
+	test-single-window-mode$(EXEEXT) test-tools$(EXEEXT) \
+	test-ui$(EXEEXT) test-xcf$(EXEEXT)
+EXTRA_PROGRAMS = $(am__EXEEXT_1)
+subdir = app/tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = test-core$(EXEEXT) test-gimpidtable$(EXEEXT) \
+	test-save-and-export$(EXEEXT) \
+	test-session-2-8-compatibility-multi-window$(EXEEXT) \
+	test-session-2-8-compatibility-single-window$(EXEEXT) \
+	test-single-window-mode$(EXEEXT) test-tools$(EXEEXT) \
+	test-ui$(EXEEXT) test-xcf$(EXEEXT)
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libgimpapptestutils_a_AR = $(AR) $(ARFLAGS)
+libgimpapptestutils_a_LIBADD =
+am_libgimpapptestutils_a_OBJECTS = gimp-app-test-utils.$(OBJEXT) \
+	gimp-test-session-utils.$(OBJEXT)
+libgimpapptestutils_a_OBJECTS = $(am_libgimpapptestutils_a_OBJECTS)
+test_core_SOURCES = test-core.c
+test_core_OBJECTS = test-core.$(OBJEXT)
+test_core_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+test_core_DEPENDENCIES = ../gui/libappgui.a ../tools/libapptools.a \
+	../dialogs/libappdialogs.a ../menus/libappmenus.a \
+	../actions/libappactions.a ../dialogs/libappdialogs.a \
+	../display/libappdisplay.a ../propgui/libapppropgui.a \
+	../widgets/libappwidgets.a ../xcf/libappxcf.a \
+	../pdb/libappinternal-procs.a ../pdb/libapppdb.a \
+	../plug-in/libappplug-in.a ../vectors/libappvectors.a \
+	../core/libappcore.a ../file/libappfile.a \
+	../file-data/libappfile-data.a ../text/libapptext.a \
+	../paint/libapppaint.a ../config/libappconfig.a ../libapp.a \
+	../gegl/libappgegl.a ../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+test_gimpidtable_SOURCES = test-gimpidtable.c
+test_gimpidtable_OBJECTS = test-gimpidtable.$(OBJEXT)
+test_gimpidtable_LDADD = $(LDADD)
+test_gimpidtable_DEPENDENCIES = ../gui/libappgui.a \
+	../tools/libapptools.a ../dialogs/libappdialogs.a \
+	../menus/libappmenus.a ../actions/libappactions.a \
+	../dialogs/libappdialogs.a ../display/libappdisplay.a \
+	../propgui/libapppropgui.a ../widgets/libappwidgets.a \
+	../xcf/libappxcf.a ../pdb/libappinternal-procs.a \
+	../pdb/libapppdb.a ../plug-in/libappplug-in.a \
+	../vectors/libappvectors.a ../core/libappcore.a \
+	../file/libappfile.a ../file-data/libappfile-data.a \
+	../text/libapptext.a ../paint/libapppaint.a \
+	../config/libappconfig.a ../libapp.a ../gegl/libappgegl.a \
+	../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_save_and_export_SOURCES = test-save-and-export.c
+test_save_and_export_OBJECTS = test-save-and-export.$(OBJEXT)
+test_save_and_export_LDADD = $(LDADD)
+test_save_and_export_DEPENDENCIES = ../gui/libappgui.a \
+	../tools/libapptools.a ../dialogs/libappdialogs.a \
+	../menus/libappmenus.a ../actions/libappactions.a \
+	../dialogs/libappdialogs.a ../display/libappdisplay.a \
+	../propgui/libapppropgui.a ../widgets/libappwidgets.a \
+	../xcf/libappxcf.a ../pdb/libappinternal-procs.a \
+	../pdb/libapppdb.a ../plug-in/libappplug-in.a \
+	../vectors/libappvectors.a ../core/libappcore.a \
+	../file/libappfile.a ../file-data/libappfile-data.a \
+	../text/libapptext.a ../paint/libapppaint.a \
+	../config/libappconfig.a ../libapp.a ../gegl/libappgegl.a \
+	../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_session_2_8_compatibility_multi_window_SOURCES =  \
+	test-session-2-8-compatibility-multi-window.c
+test_session_2_8_compatibility_multi_window_OBJECTS =  \
+	test-session-2-8-compatibility-multi-window.$(OBJEXT)
+test_session_2_8_compatibility_multi_window_LDADD = $(LDADD)
+test_session_2_8_compatibility_multi_window_DEPENDENCIES =  \
+	../gui/libappgui.a ../tools/libapptools.a \
+	../dialogs/libappdialogs.a ../menus/libappmenus.a \
+	../actions/libappactions.a ../dialogs/libappdialogs.a \
+	../display/libappdisplay.a ../propgui/libapppropgui.a \
+	../widgets/libappwidgets.a ../xcf/libappxcf.a \
+	../pdb/libappinternal-procs.a ../pdb/libapppdb.a \
+	../plug-in/libappplug-in.a ../vectors/libappvectors.a \
+	../core/libappcore.a ../file/libappfile.a \
+	../file-data/libappfile-data.a ../text/libapptext.a \
+	../paint/libapppaint.a ../config/libappconfig.a ../libapp.a \
+	../gegl/libappgegl.a ../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_session_2_8_compatibility_single_window_SOURCES =  \
+	test-session-2-8-compatibility-single-window.c
+test_session_2_8_compatibility_single_window_OBJECTS =  \
+	test-session-2-8-compatibility-single-window.$(OBJEXT)
+test_session_2_8_compatibility_single_window_LDADD = $(LDADD)
+test_session_2_8_compatibility_single_window_DEPENDENCIES =  \
+	../gui/libappgui.a ../tools/libapptools.a \
+	../dialogs/libappdialogs.a ../menus/libappmenus.a \
+	../actions/libappactions.a ../dialogs/libappdialogs.a \
+	../display/libappdisplay.a ../propgui/libapppropgui.a \
+	../widgets/libappwidgets.a ../xcf/libappxcf.a \
+	../pdb/libappinternal-procs.a ../pdb/libapppdb.a \
+	../plug-in/libappplug-in.a ../vectors/libappvectors.a \
+	../core/libappcore.a ../file/libappfile.a \
+	../file-data/libappfile-data.a ../text/libapptext.a \
+	../paint/libapppaint.a ../config/libappconfig.a ../libapp.a \
+	../gegl/libappgegl.a ../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_single_window_mode_SOURCES = test-single-window-mode.c
+test_single_window_mode_OBJECTS = test-single-window-mode.$(OBJEXT)
+test_single_window_mode_LDADD = $(LDADD)
+test_single_window_mode_DEPENDENCIES = ../gui/libappgui.a \
+	../tools/libapptools.a ../dialogs/libappdialogs.a \
+	../menus/libappmenus.a ../actions/libappactions.a \
+	../dialogs/libappdialogs.a ../display/libappdisplay.a \
+	../propgui/libapppropgui.a ../widgets/libappwidgets.a \
+	../xcf/libappxcf.a ../pdb/libappinternal-procs.a \
+	../pdb/libapppdb.a ../plug-in/libappplug-in.a \
+	../vectors/libappvectors.a ../core/libappcore.a \
+	../file/libappfile.a ../file-data/libappfile-data.a \
+	../text/libapptext.a ../paint/libapppaint.a \
+	../config/libappconfig.a ../libapp.a ../gegl/libappgegl.a \
+	../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_tools_SOURCES = test-tools.c
+test_tools_OBJECTS = test-tools.$(OBJEXT)
+test_tools_LDADD = $(LDADD)
+test_tools_DEPENDENCIES = ../gui/libappgui.a ../tools/libapptools.a \
+	../dialogs/libappdialogs.a ../menus/libappmenus.a \
+	../actions/libappactions.a ../dialogs/libappdialogs.a \
+	../display/libappdisplay.a ../propgui/libapppropgui.a \
+	../widgets/libappwidgets.a ../xcf/libappxcf.a \
+	../pdb/libappinternal-procs.a ../pdb/libapppdb.a \
+	../plug-in/libappplug-in.a ../vectors/libappvectors.a \
+	../core/libappcore.a ../file/libappfile.a \
+	../file-data/libappfile-data.a ../text/libapptext.a \
+	../paint/libapppaint.a ../config/libappconfig.a ../libapp.a \
+	../gegl/libappgegl.a ../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_ui_SOURCES = test-ui.c
+test_ui_OBJECTS = test-ui.$(OBJEXT)
+test_ui_LDADD = $(LDADD)
+test_ui_DEPENDENCIES = ../gui/libappgui.a ../tools/libapptools.a \
+	../dialogs/libappdialogs.a ../menus/libappmenus.a \
+	../actions/libappactions.a ../dialogs/libappdialogs.a \
+	../display/libappdisplay.a ../propgui/libapppropgui.a \
+	../widgets/libappwidgets.a ../xcf/libappxcf.a \
+	../pdb/libappinternal-procs.a ../pdb/libapppdb.a \
+	../plug-in/libappplug-in.a ../vectors/libappvectors.a \
+	../core/libappcore.a ../file/libappfile.a \
+	../file-data/libappfile-data.a ../text/libapptext.a \
+	../paint/libapppaint.a ../config/libappconfig.a ../libapp.a \
+	../gegl/libappgegl.a ../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+test_xcf_SOURCES = test-xcf.c
+test_xcf_OBJECTS = test-xcf.$(OBJEXT)
+test_xcf_LDADD = $(LDADD)
+test_xcf_DEPENDENCIES = ../gui/libappgui.a ../tools/libapptools.a \
+	../dialogs/libappdialogs.a ../menus/libappmenus.a \
+	../actions/libappactions.a ../dialogs/libappdialogs.a \
+	../display/libappdisplay.a ../propgui/libapppropgui.a \
+	../widgets/libappwidgets.a ../xcf/libappxcf.a \
+	../pdb/libappinternal-procs.a ../pdb/libapppdb.a \
+	../plug-in/libappplug-in.a ../vectors/libappvectors.a \
+	../core/libappcore.a ../file/libappfile.a \
+	../file-data/libappfile-data.a ../text/libapptext.a \
+	../paint/libapppaint.a ../config/libappconfig.a ../libapp.a \
+	../gegl/libappgegl.a ../operations/libappoperations.a \
+	../operations/layer-modes/libapplayermodes.a \
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a \
+	libgimpapptestutils.a $(libgimpwidgets) $(libgimpconfig) \
+	$(libgimpmath) $(libgimpthumb) $(libgimpcolor) \
+	$(libgimpmodule) $(libgimpbase) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp-app-test-utils.Po \
+	./$(DEPDIR)/gimp-test-session-utils.Po \
+	./$(DEPDIR)/test-core.Po ./$(DEPDIR)/test-gimpidtable.Po \
+	./$(DEPDIR)/test-save-and-export.Po \
+	./$(DEPDIR)/test-session-2-8-compatibility-multi-window.Po \
+	./$(DEPDIR)/test-session-2-8-compatibility-single-window.Po \
+	./$(DEPDIR)/test-single-window-mode.Po \
+	./$(DEPDIR)/test-tools.Po ./$(DEPDIR)/test-ui.Po \
+	./$(DEPDIR)/test-xcf.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libgimpapptestutils_a_SOURCES) test-core.c \
+	test-gimpidtable.c test-save-and-export.c \
+	test-session-2-8-compatibility-multi-window.c \
+	test-session-2-8-compatibility-single-window.c \
+	test-single-window-mode.c test-tools.c test-ui.c test-xcf.c
+DIST_SOURCES = $(libgimpapptestutils_a_SOURCES) test-core.c \
+	test-gimpidtable.c test-save-and-export.c \
+	test-session-2-8-compatibility-multi-window.c \
+	test-session-2-8-compatibility-single-window.c \
+	test-single-window-mode.c test-tools.c test-ui.c test-xcf.c
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	check recheck distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	$(top_srcdir)/test-driver
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
+@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
+@PLATFORM_OSX_TRUE@xnone = "-xnone"
+SUBDIRS = \
+	files		\
+	gimpdir		\
+	gimpdir-empty
+
+
+# Don't mess with user's gimpdir. Pass in the abs top srcdir to the
+# tests through an environment variable so they can set the gimpdir
+# they want to use
+TESTS_ENVIRONMENT = GIMP_TESTING_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
+	GIMP_TESTING_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
+	GIMP_TESTING_PLUGINDIRS=@abs_top_builddir@/plug-ins/common \
+	GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES=mkgen.pl \
+	$(am__append_1)
+CLEANFILES = $(EXTRA_PROGRAMS)
+noinst_LIBRARIES = libgimpapptestutils.a
+libgimpapptestutils_a_SOURCES = \
+	gimp-app-test-utils.c		\
+	gimp-app-test-utils.h		\
+	gimp-test-session-utils.c	\
+	gimp-test-session-utils.h
+
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+@PLATFORM_LINUX_TRUE@libdl = -ldl
+@OS_WIN32_FALSE@libm = -lm
+AM_CPPFLAGS = \
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/app	\
+	$(PANGOCAIRO_CFLAGS)	\
+	$(GTK_CFLAGS)		\
+	$(GEGL_CFLAGS)		\
+	$(xobjective_c)		\
+	-I$(includedir)
+
+
+# We need this due to circular dependencies
+AM_LDFLAGS = \
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type		\
+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+	-Wl,-u,$(SYMPREFIX)gimp_param_spec_duplicate		\
+	-Wl,-u,$(SYMPREFIX)gimp_operations_init			\
+	-Wl,-u,$(SYMPREFIX)xcf_init				\
+	-Wl,-u,$(SYMPREFIX)internal_procs_init			\
+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore		\
+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
+	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
+	-Wl,-u,$(SYMPREFIX)gui_init				\
+	-Wl,-u,$(SYMPREFIX)gimp_lebl_dialog
+
+
+# Note that we have some duplicate entries here too to work around
+# circular dependencies and systems on the same architectural layer as
+# an alternative to LDFLAGS above
+LDADD = \
+	../gui/libappgui.a						\
+	../tools/libapptools.a						\
+	../dialogs/libappdialogs.a					\
+	../menus/libappmenus.a						\
+	../actions/libappactions.a					\
+	../dialogs/libappdialogs.a					\
+	../display/libappdisplay.a					\
+	../propgui/libapppropgui.a					\
+	../widgets/libappwidgets.a					\
+	../xcf/libappxcf.a						\
+	../pdb/libappinternal-procs.a					\
+	../pdb/libapppdb.a						\
+	../plug-in/libappplug-in.a					\
+	../vectors/libappvectors.a					\
+	../core/libappcore.a						\
+	../file/libappfile.a						\
+	../file-data/libappfile-data.a					\
+	../text/libapptext.a						\
+	../paint/libapppaint.a						\
+	../config/libappconfig.a					\
+	../libapp.a							\
+	../gegl/libappgegl.a						\
+	../operations/libappoperations.a				\
+	../operations/layer-modes/libapplayermodes.a			\
+	../operations/layer-modes-legacy/libapplayermodeslegacy.a	\
+	libgimpapptestutils.a						\
+	$(libgimpwidgets)						\
+	$(libgimpconfig)						\
+	$(libgimpmath)							\
+	$(libgimpthumb)							\
+	$(libgimpcolor)							\
+	$(libgimpmodule)						\
+	$(libgimpbase)							\
+	$(GIMPICONRC)							\
+	$(GTK_LIBS)							\
+	$(GTK_MAC_INTEGRATION_LIBS)					\
+	$(GDK_PIXBUF_LIBS)						\
+	$(FREETYPE_LIBS)						\
+	$(FONTCONFIG_LIBS)						\
+	$(PANGOCAIRO_LIBS)						\
+	$(HARFBUZZ_LIBS)						\
+	$(CAIRO_LIBS)							\
+	$(GEGL_LIBS)							\
+	$(GIO_LIBS)							\
+	$(GEXIV2_LIBS)							\
+	$(Z_LIBS)							\
+	$(JSON_C_LIBS)							\
+	$(LIBMYPAINT_LIBS)						\
+	$(LIBBACKTRACE_LIBS)						\
+	$(LIBUNWIND_LIBS)						\
+	$(INTLLIBS)							\
+	$(RT_LIBS)							\
+	$(libm)								\
+	$(libdl)
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libgimpapptestutils.a: $(libgimpapptestutils_a_OBJECTS) $(libgimpapptestutils_a_DEPENDENCIES) $(EXTRA_libgimpapptestutils_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libgimpapptestutils.a
+	$(AM_V_AR)$(libgimpapptestutils_a_AR) libgimpapptestutils.a $(libgimpapptestutils_a_OBJECTS) $(libgimpapptestutils_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libgimpapptestutils.a
+
+test-core$(EXEEXT): $(test_core_OBJECTS) $(test_core_DEPENDENCIES) $(EXTRA_test_core_DEPENDENCIES) 
+	@rm -f test-core$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_core_OBJECTS) $(test_core_LDADD) $(LIBS)
+
+test-gimpidtable$(EXEEXT): $(test_gimpidtable_OBJECTS) $(test_gimpidtable_DEPENDENCIES) $(EXTRA_test_gimpidtable_DEPENDENCIES) 
+	@rm -f test-gimpidtable$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_gimpidtable_OBJECTS) $(test_gimpidtable_LDADD) $(LIBS)
+
+test-save-and-export$(EXEEXT): $(test_save_and_export_OBJECTS) $(test_save_and_export_DEPENDENCIES) $(EXTRA_test_save_and_export_DEPENDENCIES) 
+	@rm -f test-save-and-export$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_save_and_export_OBJECTS) $(test_save_and_export_LDADD) $(LIBS)
+
+test-session-2-8-compatibility-multi-window$(EXEEXT): $(test_session_2_8_compatibility_multi_window_OBJECTS) $(test_session_2_8_compatibility_multi_window_DEPENDENCIES) $(EXTRA_test_session_2_8_compatibility_multi_window_DEPENDENCIES) 
+	@rm -f test-session-2-8-compatibility-multi-window$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_session_2_8_compatibility_multi_window_OBJECTS) $(test_session_2_8_compatibility_multi_window_LDADD) $(LIBS)
+
+test-session-2-8-compatibility-single-window$(EXEEXT): $(test_session_2_8_compatibility_single_window_OBJECTS) $(test_session_2_8_compatibility_single_window_DEPENDENCIES) $(EXTRA_test_session_2_8_compatibility_single_window_DEPENDENCIES) 
+	@rm -f test-session-2-8-compatibility-single-window$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_session_2_8_compatibility_single_window_OBJECTS) $(test_session_2_8_compatibility_single_window_LDADD) $(LIBS)
+
+test-single-window-mode$(EXEEXT): $(test_single_window_mode_OBJECTS) $(test_single_window_mode_DEPENDENCIES) $(EXTRA_test_single_window_mode_DEPENDENCIES) 
+	@rm -f test-single-window-mode$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_single_window_mode_OBJECTS) $(test_single_window_mode_LDADD) $(LIBS)
+
+test-tools$(EXEEXT): $(test_tools_OBJECTS) $(test_tools_DEPENDENCIES) $(EXTRA_test_tools_DEPENDENCIES) 
+	@rm -f test-tools$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_tools_OBJECTS) $(test_tools_LDADD) $(LIBS)
+
+test-ui$(EXEEXT): $(test_ui_OBJECTS) $(test_ui_DEPENDENCIES) $(EXTRA_test_ui_DEPENDENCIES) 
+	@rm -f test-ui$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_ui_OBJECTS) $(test_ui_LDADD) $(LIBS)
+
+test-xcf$(EXEEXT): $(test_xcf_OBJECTS) $(test_xcf_DEPENDENCIES) $(EXTRA_test_xcf_DEPENDENCIES) 
+	@rm -f test-xcf$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_xcf_OBJECTS) $(test_xcf_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-app-test-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-test-session-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-core.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gimpidtable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-save-and-export.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-session-2-8-compatibility-multi-window.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-session-2-8-compatibility-single-window.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-single-window-mode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tools.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xcf.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS: 
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-core.log: test-core$(EXEEXT)
+	@p='test-core$(EXEEXT)'; \
+	b='test-core'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-gimpidtable.log: test-gimpidtable$(EXEEXT)
+	@p='test-gimpidtable$(EXEEXT)'; \
+	b='test-gimpidtable'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-save-and-export.log: test-save-and-export$(EXEEXT)
+	@p='test-save-and-export$(EXEEXT)'; \
+	b='test-save-and-export'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-session-2-8-compatibility-multi-window.log: test-session-2-8-compatibility-multi-window$(EXEEXT)
+	@p='test-session-2-8-compatibility-multi-window$(EXEEXT)'; \
+	b='test-session-2-8-compatibility-multi-window'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-session-2-8-compatibility-single-window.log: test-session-2-8-compatibility-single-window$(EXEEXT)
+	@p='test-session-2-8-compatibility-single-window$(EXEEXT)'; \
+	b='test-session-2-8-compatibility-single-window'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-single-window-mode.log: test-single-window-mode$(EXEEXT)
+	@p='test-single-window-mode$(EXEEXT)'; \
+	b='test-single-window-mode'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-tools.log: test-tools$(EXEEXT)
+	@p='test-tools$(EXEEXT)'; \
+	b='test-tools'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ui.log: test-ui$(EXEEXT)
+	@p='test-ui$(EXEEXT)'; \
+	b='test-ui'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-xcf.log: test-xcf$(EXEEXT)
+	@p='test-xcf$(EXEEXT)'; \
+	b='test-xcf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-recursive
+all-am: Makefile $(LIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-local \
+	clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+		-rm -f ./$(DEPDIR)/gimp-app-test-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-test-session-utils.Po
+	-rm -f ./$(DEPDIR)/test-core.Po
+	-rm -f ./$(DEPDIR)/test-gimpidtable.Po
+	-rm -f ./$(DEPDIR)/test-save-and-export.Po
+	-rm -f ./$(DEPDIR)/test-session-2-8-compatibility-multi-window.Po
+	-rm -f ./$(DEPDIR)/test-session-2-8-compatibility-single-window.Po
+	-rm -f ./$(DEPDIR)/test-single-window-mode.Po
+	-rm -f ./$(DEPDIR)/test-tools.Po
+	-rm -f ./$(DEPDIR)/test-ui.Po
+	-rm -f ./$(DEPDIR)/test-xcf.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+		-rm -f ./$(DEPDIR)/gimp-app-test-utils.Po
+	-rm -f ./$(DEPDIR)/gimp-test-session-utils.Po
+	-rm -f ./$(DEPDIR)/test-core.Po
+	-rm -f ./$(DEPDIR)/test-gimpidtable.Po
+	-rm -f ./$(DEPDIR)/test-save-and-export.Po
+	-rm -f ./$(DEPDIR)/test-session-2-8-compatibility-multi-window.Po
+	-rm -f ./$(DEPDIR)/test-session-2-8-compatibility-single-window.Po
+	-rm -f ./$(DEPDIR)/test-single-window-mode.Po
+	-rm -f ./$(DEPDIR)/test-tools.Po
+	-rm -f ./$(DEPDIR)/test-ui.Po
+	-rm -f ./$(DEPDIR)/test-xcf.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-TESTS check-am clean clean-generic \
+	clean-libtool clean-local clean-noinstLIBRARIES cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Prevent parallel builds for the tests, as e.g. done by make -j check
+# The tests must not be run in parallel or in a different order as specified
+.NOTPARALLEL: check
+
+$(TESTS): gimpdir-output gimp-test-icon-theme
+
+gimpdir-output:
+	mkdir -p gimpdir-output
+	mkdir -p gimpdir-output/brushes
+	mkdir -p gimpdir-output/patterns
+	mkdir -p gimpdir-output/gradients
+
+gimp-test-icon-theme:
+	mkdir -p $$(echo $$(find $(top_srcdir)/icons/Color -name [0-9][0-9] -type d | sed 's@.*/\([0-9][0-9]\)$$@gimp-test-icon-theme/hicolor/\1x\1@'))
+	for dir in $$(echo $$(find $(top_srcdir)/icons/Color/ -name [0-9][0-9] -type d | sed 's@.*/\([0-9][0-9]\)$$@\1@')); do \
+		(cd gimp-test-icon-theme/hicolor/$${dir}x$${dir}/ && \
+		$(LN_S) $(abs_top_srcdir)/icons/Color/$${dir} apps); \
+	done
+	(cd gimp-test-icon-theme/hicolor && $(LN_S) $(abs_top_srcdir)/icons/Color/index.theme index.theme)
+
+clean-local:
+	rm -rf gimpdir-output
+	rm -fr gimp-test-icon-theme
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/files/Makefile.am b/app/tests/files/Makefile.am
new file mode 100644
index 0000000..7ab51e1
--- /dev/null
+++ b/app/tests/files/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	gimp-2-6-file.xcf
diff --git a/app/tests/files/Makefile.in b/app/tests/files/Makefile.in
new file mode 100644
index 0000000..2c64c7c
--- /dev/null
+++ b/app/tests/files/Makefile.in
@@ -0,0 +1,749 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/files
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = \
+	gimp-2-6-file.xcf
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/files/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/files/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/files/gimp-2-6-file.xcf b/app/tests/files/gimp-2-6-file.xcf
new file mode 100644
index 0000000..3ab958f
--- /dev/null
+++ b/app/tests/files/gimp-2-6-file.xcf
diff --git a/app/tests/gimp-app-test-utils.c b/app/tests/gimp-app-test-utils.c
new file mode 100644
index 0000000..33b8bdd
--- /dev/null
+++ b/app/tests/gimp-app-test-utils.c
@@ -0,0 +1,460 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "display/display-types.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
+
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpdialogfactory.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-new.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+#ifdef G_OS_WIN32
+/* SendInput() requirement is Windows 2000 pro or over.
+ * We may need to set WINVER to make sure the compiler does not try to
+ * compile for on older version of win32, thus breaking the build.
+ * See
+ * http://msdn.microsoft.com/en-us/library/aa383745%28v=vs.85%29.aspx#setting_winver_or__win32_winnt
+ */
+#define WINVER 0x0500
+#include <windows.h>
+#endif /* G_OS_WIN32 */
+
+#ifdef GDK_WINDOWING_QUARTZ
+// only to get keycode definitions from HIToolbox/Events.h
+#include <Carbon/Carbon.h>
+#include <Cocoa/Cocoa.h>
+#endif /* GDK_WINDOWING_QUARTZ */
+
+void
+gimp_test_utils_set_env_to_subdir (const gchar *root_env_var,
+                                   const gchar *subdir,
+                                   const gchar *target_env_var)
+{
+  const gchar *root_dir   = NULL;
+  gchar       *target_dir = NULL;
+
+  /* Get root dir */
+  root_dir = g_getenv (root_env_var);
+  if (! root_dir)
+    g_printerr ("*\n"
+                "*  The env var %s is not set, you are probably running\n"
+                "*  in a debugger. Set it manually, e.g.:\n"
+                "*\n"
+                "*    set env %s=%s/source/gimp\n"
+                "*\n",
+                root_env_var,
+                root_env_var, g_get_home_dir ());
+
+  /* Construct path and setup target env var */
+  target_dir = g_build_filename (root_dir, subdir, NULL);
+  g_setenv (target_env_var, target_dir, TRUE);
+  g_free (target_dir);
+}
+
+void
+gimp_test_utils_set_env_to_subpath (const gchar *root_env_var1,
+                                    const gchar *root_env_var2,
+                                    const gchar *subdir,
+                                    const gchar *target_env_var)
+{
+  const gchar *root_dir1   = NULL;
+  const gchar *root_dir2   = NULL;
+  gchar       *target_dir1 = NULL;
+  gchar       *target_dir2 = NULL;
+  gchar       *target_path = NULL;
+
+  /* Get root dir */
+  root_dir1 = g_getenv (root_env_var1);
+  if (! root_dir1)
+    g_printerr ("*\n"
+                "*  The env var %s is not set, you are probably running\n"
+                "*  in a debugger. Set it manually, e.g.:\n"
+                "*\n"
+                "*    set env %s=%s/source/gimp\n"
+                "*\n",
+                root_env_var1,
+                root_env_var1, g_get_home_dir ());
+
+  root_dir2 = g_getenv (root_env_var2);
+  if (! root_dir2)
+    g_printerr ("*\n"
+                "*  The env var %s is not set, you are probably running\n"
+                "*  in a debugger. Set it manually, e.g.:\n"
+                "*\n"
+                "*    set env %s=%s/source/gimp\n"
+                "*\n",
+                root_env_var2,
+                root_env_var2, g_get_home_dir ());
+
+  /* Construct path and setup target env var */
+  target_dir1 = g_build_filename (root_dir1, subdir, NULL);
+  target_dir2 = g_build_filename (root_dir2, subdir, NULL);
+
+  target_path = g_strconcat (target_dir1, G_SEARCHPATH_SEPARATOR_S,
+                             target_dir2, NULL);
+
+  g_free (target_dir1);
+  g_free (target_dir2);
+
+  g_setenv (target_env_var, target_path, TRUE);
+  g_free (target_path);
+}
+
+
+/**
+ * gimp_test_utils_set_gimp2_directory:
+ * @root_env_var: Either "GIMP_TESTING_ABS_TOP_SRCDIR" or
+ *                "GIMP_TESTING_ABS_TOP_BUILDDIR"
+ * @subdir:       Subdir, may be %NULL
+ *
+ * Sets GIMP2_DIRECTORY to the source dir @root_env_var/@subdir. The
+ * environment variables is set up by the test runner, see Makefile.am
+ **/
+void
+gimp_test_utils_set_gimp2_directory (const gchar *root_env_var,
+                                     const gchar *subdir)
+{
+  gimp_test_utils_set_env_to_subdir (root_env_var,
+                                     subdir,
+                                     "GIMP2_DIRECTORY" /*target_env_var*/);
+}
+
+/**
+ * gimp_test_utils_setup_menus_path:
+ *
+ * Sets GIMP_TESTING_MENUS_PATH to "$top_srcdir/menus:$top_builddir/menus".
+ **/
+void
+gimp_test_utils_setup_menus_path (void)
+{
+  /* GIMP_TESTING_ABS_TOP_SRCDIR is set by the automake test runner,
+   * see Makefile.am
+   */
+  gimp_test_utils_set_env_to_subpath ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                      "GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                      "menus",
+                                      "GIMP_TESTING_MENUS_PATH");
+}
+
+/**
+ * gimp_test_utils_create_image:
+ * @gimp:   A #Gimp instance.
+ * @width:  Width of image (and layer)
+ * @height: Height of image (and layer)
+ *
+ * Creates a new image of a given size with one layer of same size and
+ * a display.
+ *
+ * Returns: The new #GimpImage.
+ **/
+void
+gimp_test_utils_create_image (Gimp *gimp,
+                              gint  width,
+                              gint  height)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+
+  image = gimp_image_new (gimp, width, height,
+                          GIMP_RGB, GIMP_PRECISION_U8_GAMMA);
+
+  layer = gimp_layer_new (image,
+                          width,
+                          height,
+                          gimp_image_get_layer_format (image, TRUE),
+                          "layer1",
+                          1.0,
+                          GIMP_LAYER_MODE_NORMAL);
+
+  gimp_image_add_layer (image,
+                        layer,
+                        NULL /*parent*/,
+                        0 /*position*/,
+                        FALSE /*push_undo*/);
+
+  gimp_create_display (gimp,
+                       image,
+                       GIMP_UNIT_PIXEL,
+                       1.0 /*scale*/,
+                       NULL, 0);
+}
+
+/**
+ * gimp_test_utils_synthesize_key_event:
+ * @widget: Widget to target.
+ * @keyval: Keyval, e.g. GDK_Return
+ *
+ * Simulates a keypress and release with gdk_test_simulate_key().
+ **/
+void
+gimp_test_utils_synthesize_key_event (GtkWidget *widget,
+                                      guint      keyval)
+{
+#if defined G_OS_WIN32 && ! GTK_CHECK_VERSION (2, 24, 25)
+  /* gdk_test_simulate_key() has no implementation for win32 until
+   * GTK+ 2.24.25.
+   * TODO: remove the below hack when our GTK+ requirement is over 2.24.25. */
+  GdkKeymapKey *keys   = NULL;
+  gint          n_keys = 0;
+  INPUT         ip;
+  gint          i;
+
+  ip.type = INPUT_KEYBOARD;
+  ip.ki.wScan = 0;
+  ip.ki.time = 0;
+  ip.ki.dwExtraInfo = 0;
+  if (gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default (), keyval, &keys, &n_keys))
+    {
+      for (i = 0; i < n_keys; i++)
+        {
+          ip.ki.dwFlags = 0;
+          /* AltGr press. */
+          if (keys[i].group)
+            {
+              /* According to some virtualbox code I found, AltGr is
+               * simulated on win32 with LCtrl+RAlt */
+              ip.ki.wVk = VK_CONTROL;
+              SendInput(1, &ip, sizeof(INPUT));
+              ip.ki.wVk = VK_MENU;
+              SendInput(1, &ip, sizeof(INPUT));
+            }
+          /* Shift press. */
+          if (keys[i].level)
+            {
+              ip.ki.wVk = VK_SHIFT;
+              SendInput(1, &ip, sizeof(INPUT));
+            }
+          /* Key pressed. */
+          ip.ki.wVk = keys[i].keycode;
+          SendInput(1, &ip, sizeof(INPUT));
+
+          ip.ki.dwFlags = KEYEVENTF_KEYUP;
+          /* Key released. */
+          SendInput(1, &ip, sizeof(INPUT));
+          /* Shift release. */
+          if (keys[i].level)
+            {
+              ip.ki.wVk = VK_SHIFT;
+              SendInput(1, &ip, sizeof(INPUT));
+            }
+          /* AltrGr release. */
+          if (keys[i].group)
+            {
+              ip.ki.wVk = VK_MENU;
+              SendInput(1, &ip, sizeof(INPUT));
+              ip.ki.wVk = VK_CONTROL;
+              SendInput(1, &ip, sizeof(INPUT));
+            }
+          /* No need to loop for alternative keycodes. We want only one
+           * key generated. */
+          break;
+        }
+      g_free (keys);
+    }
+  else
+    {
+      g_warning ("%s: no win32 key mapping found for keyval %d.", G_STRFUNC, keyval);
+    }
+#elif defined(GDK_WINDOWING_QUARTZ)
+
+GdkKeymapKey *keys   = NULL;
+gint          n_keys = 0;
+gint          i;
+CGEventRef    keyUp, keyDown;
+
+if (gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_display_get_default ()), keyval, &keys, &n_keys))
+  {
+    /* XXX not in use yet */
+    CGEventRef commandDown	=	CGEventCreateKeyboardEvent (NULL, (CGKeyCode)kVK_Command, true);
+    CGEventRef commandUp	=	CGEventCreateKeyboardEvent (NULL, (CGKeyCode)kVK_Command, false);
+
+    CGEventRef shiftDown	=	CGEventCreateKeyboardEvent (NULL, (CGKeyCode)kVK_Shift, true);
+    CGEventRef shiftUp		=	CGEventCreateKeyboardEvent (NULL, (CGKeyCode)kVK_Shift, false);
+
+    CGEventRef optionDown	=	CGEventCreateKeyboardEvent (NULL, (CGKeyCode)kVK_Option, true);
+    CGEventRef optionUp		=	CGEventCreateKeyboardEvent (NULL, (CGKeyCode)kVK_Option, false);
+
+    for (i = 0; i < n_keys; i++)
+      {
+        /* Option press. */
+        if (keys[i].group)
+          {
+            CGEventPost (kCGHIDEventTap, optionDown);
+          }
+        /* Shift press. */
+        if (keys[i].level)
+          {
+            CGEventPost(kCGHIDEventTap, shiftDown);
+          }
+        keyDown = CGEventCreateKeyboardEvent (NULL, (CGKeyCode)keys[i].keycode, true);
+        keyUp = CGEventCreateKeyboardEvent (NULL, (CGKeyCode)keys[i].keycode, false);
+        /* Key pressed. */
+        CGEventPost (kCGHIDEventTap, keyDown);
+        CFRelease (keyDown);
+        usleep (100);
+        /* key released */
+        CGEventPost (kCGHIDEventTap, keyUp);
+        CFRelease (keyUp);
+
+        /* Shift release. */
+        if (keys[i].level)
+          {
+            CGEventPost (kCGHIDEventTap, shiftDown);
+          }
+
+        /* Option release. */
+        if (keys[i].group)
+          {
+            CGEventPost (kCGHIDEventTap, optionUp);
+          }
+        /* No need to loop for alternative keycodes. We want only one
+         * key generated. */
+        break;
+      }
+    CFRelease (commandDown);
+    CFRelease (commandUp);
+    CFRelease (shiftDown);
+    CFRelease (shiftUp);
+    CFRelease (optionDown);
+    CFRelease (optionUp);
+    g_free (keys);
+  }
+else
+  {
+    g_warning ("%s: no macOS key mapping found for keyval %d.", G_STRFUNC, keyval);
+  }
+
+#else /* G_OS_WIN32  && ! GTK_CHECK_VERSION (2, 24, 25) && ! GDK_WINDOWING_QUARTZ */
+  gdk_test_simulate_key (gtk_widget_get_window (widget),
+                         -1, -1, /*x, y*/
+                         keyval,
+                         0 /*modifiers*/,
+                         GDK_KEY_PRESS);
+  gdk_test_simulate_key (gtk_widget_get_window (widget),
+                         -1, -1, /*x, y*/
+                         keyval,
+                         0 /*modifiers*/,
+                         GDK_KEY_RELEASE);
+#endif /* G_OS_WIN32  && ! GTK_CHECK_VERSION (2, 24, 25) */
+}
+
+/**
+ * gimp_test_utils_get_ui_manager:
+ * @gimp: The #Gimp instance.
+ *
+ * Returns the "best" #GimpUIManager to use when performing
+ * actions. It gives the ui manager of the empty display if it exists,
+ * otherwise it gives it the ui manager of the first display.
+ *
+ * Returns: The #GimpUIManager.
+ **/
+GimpUIManager *
+gimp_test_utils_get_ui_manager (Gimp *gimp)
+{
+  GimpDisplay       *display      = NULL;
+  GimpDisplayShell  *shell        = NULL;
+  GtkWidget         *toplevel     = NULL;
+  GimpImageWindow   *image_window = NULL;
+  GimpUIManager     *ui_manager   = NULL;
+
+  display = GIMP_DISPLAY (gimp_get_empty_display (gimp));
+
+  /* If there were not empty display, assume that there is at least
+   * one image display and use that
+   */
+  if (! display)
+    display = GIMP_DISPLAY (gimp_get_display_iter (gimp)->data);
+
+  shell            = gimp_display_get_shell (display);
+  toplevel         = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+  image_window     = GIMP_IMAGE_WINDOW (toplevel);
+  ui_manager       = gimp_image_window_get_ui_manager (image_window);
+
+  return ui_manager;
+}
+
+/**
+ * gimp_test_utils_create_image_from_dalog:
+ * @gimp:
+ *
+ * Creates a new image using the "New image" dialog, and then returns
+ * the #GimpImage created.
+ *
+ * Returns: The created #GimpImage.
+ **/
+GimpImage *
+gimp_test_utils_create_image_from_dialog (Gimp *gimp)
+{
+  GimpImage     *image            = NULL;
+  GtkWidget     *new_image_dialog = NULL;
+  guint          n_initial_images = g_list_length (gimp_get_image_iter (gimp));
+  guint          n_images         = -1;
+  gint           tries_left       = 100;
+  GimpUIManager *ui_manager       = gimp_test_utils_get_ui_manager (gimp);
+
+  /* Bring up the new image dialog */
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "image",
+                                   "image-new");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Get the GtkWindow of the dialog */
+  new_image_dialog =
+    gimp_dialog_factory_dialog_raise (gimp_dialog_factory_get_singleton (),
+                                      gdk_screen_get_default (), 0,
+                                      "gimp-image-new-dialog",
+                                      -1 /*view_size*/);
+
+  /* Press the focused widget, it should be the Ok button. It will
+   * take a while for the image to be created so loop for a while
+   */
+  gtk_widget_activate (gtk_window_get_focus (GTK_WINDOW (new_image_dialog)));
+  do
+    {
+      g_usleep (20 * 1000);
+      gimp_test_run_mainloop_until_idle ();
+      n_images = g_list_length (gimp_get_image_iter (gimp));
+    }
+  while (tries_left-- &&
+         n_images != n_initial_images + 1);
+
+  /* Make sure there now is one image more than initially */
+  g_assert_cmpint (n_images,
+                   ==,
+                   n_initial_images + 1);
+
+  image = GIMP_IMAGE (gimp_get_image_iter (gimp)->data);
+
+  return image;
+}
+
diff --git a/app/tests/gimp-app-test-utils.h b/app/tests/gimp-app-test-utils.h
new file mode 100644
index 0000000..e4871ef
--- /dev/null
+++ b/app/tests/gimp-app-test-utils.h
@@ -0,0 +1,42 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_APP_TEST_UTILS_H__
+#define  __GIMP_APP_TEST_UTILS_H__
+
+
+void            gimp_test_utils_set_env_to_subdir    (const gchar *root_env_var,
+                                                      const gchar *subdir,
+                                                      const gchar *target_env_var);
+void            gimp_test_utils_set_env_to_subpath   (const gchar *root_env_var1,
+                                                      const gchar *root_env_var2,
+                                                      const gchar *subdir,
+                                                      const gchar *target_env_var);
+void            gimp_test_utils_set_gimp2_directory  (const gchar *root_env_var,
+                                                      const gchar *subdir);
+void            gimp_test_utils_setup_menus_path     (void);
+void            gimp_test_utils_create_image         (Gimp        *gimp,
+                                                      gint         width,
+                                                      gint         height);
+void            gimp_test_utils_synthesize_key_event (GtkWidget   *widget,
+                                                      guint        keyval);
+GimpUIManager * gimp_test_utils_get_ui_manager       (Gimp        *gimp);
+GimpImage     * gimp_test_utils_create_image_from_dialog
+                                                     (Gimp        *gimp);
+
+
+#endif /* __GIMP_APP_TEST_UTILS_H__ */
diff --git a/app/tests/gimp-test-session-utils.c b/app/tests/gimp-test-session-utils.c
new file mode 100644
index 0000000..8d16fe3
--- /dev/null
+++ b/app/tests/gimp-test-session-utils.c
@@ -0,0 +1,244 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+#include <utime.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "dialogs/dialogs-types.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpsessioninfo.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+#include "gimp-test-session-utils.h"
+
+
+typedef struct
+{
+  gchar   *filename;
+  gchar   *md5;
+  guint64  modtime;
+} GimpTestFileState;
+
+
+static gboolean
+gimp_test_get_file_state_verbose (const gchar       *filename,
+                                  GimpTestFileState *filestate)
+{
+  gboolean success = TRUE;
+
+  filestate->filename = g_strdup (filename);
+
+  /* Get checksum */
+  if (success)
+    {
+      gchar *contents = NULL;
+      gsize  length   = 0;
+
+      success = g_file_get_contents (filename,
+                                     &contents,
+                                     &length,
+                                     NULL);
+      if (success)
+        {
+          filestate->md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5,
+                                                          contents,
+                                                          length);
+        }
+
+      g_free (contents);
+    }
+
+  /* Get modification time */
+  if (success)
+    {
+      GFile     *file = g_file_new_for_path (filename);
+      GFileInfo *info = g_file_query_info (file,
+                                           G_FILE_ATTRIBUTE_TIME_MODIFIED, 0,
+                                           NULL, NULL);
+      if (info)
+        {
+          filestate->modtime = g_file_info_get_attribute_uint64 (
+            info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+          success = TRUE;
+          g_object_unref (info);
+        }
+      else
+        {
+          success = FALSE;
+        }
+
+      g_object_unref (file);
+    }
+
+  if (! success)
+    g_printerr ("Failed to get initial file info for '%s'\n", filename);
+
+  return success;
+}
+
+static gboolean
+gimp_test_file_state_changes (const gchar       *filename,
+                              GimpTestFileState *state1,
+                              GimpTestFileState *state2)
+{
+  if (state1->modtime == state2->modtime)
+    {
+      g_printerr ("A new '%s' was not created\n", filename);
+      return FALSE;
+    }
+
+  if (strcmp (state1->md5, state2->md5) != 0)
+    {
+      char *diff_argv[5] = {
+        "diff",
+        "-u",
+        state1->filename,
+        state2->filename,
+        NULL
+      };
+
+      g_printerr ("'%s' was changed but should not have been. Reason, using "
+                  "`diff -u $expected $actual`\n", filename);
+
+      g_spawn_sync (NULL /*working_directory*/,
+                    diff_argv,
+                    NULL /*envp*/,
+                    G_SPAWN_SEARCH_PATH,
+                    NULL /*child_setup*/,
+                    NULL /*user_data*/,
+                    NULL /*standard_output*/,
+                    NULL /*standard_error*/,
+                    NULL /*exist_status*/,
+                    NULL /*error*/);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/**
+ * gimp_test_session_load_and_write_session_files:
+ * @loaded_sessionrc:   The name of the file of the sessionrc file to
+ *                      load
+ * @loaded_dockrc:      The name of the file of the dockrc file to load
+ * @expected_sessionrc: The name of the file with the expected
+ *                      sessionrc file content
+ * @expected_dockrc:    The name of the file with the expected dockrc
+ *                      file content
+ *
+ * Utility function for the various session management tests. We can't
+ * easily have all those tests in a single program several Gimp
+ * instance can't easily be initialized in the same process.
+ **/
+void
+gimp_test_session_load_and_write_session_files (const gchar *loaded_sessionrc,
+                                                const gchar *loaded_dockrc,
+                                                const gchar *expected_sessionrc,
+                                                const gchar *expected_dockrc,
+                                                gboolean     single_window_mode)
+{
+  Gimp              *gimp;
+  GimpTestFileState  initial_sessionrc_state = { NULL, NULL, 0 };
+  GimpTestFileState  initial_dockrc_state    = { NULL, NULL, 0 };
+  GimpTestFileState  final_sessionrc_state   = { NULL, NULL, 0 };
+  GimpTestFileState  final_dockrc_state      = { NULL, NULL, 0 };
+  gchar             *sessionrc_filename      = NULL;
+  gchar             *dockrc_filename         = NULL;
+
+  /* Make sure to run this before we use any GIMP functions */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+  gimp_test_utils_setup_menus_path ();
+
+  /* Note that we expect the resulting sessionrc to be different from
+   * the read file, which is why we check the MD5 of the -expected
+   * variant
+   */
+  sessionrc_filename = gimp_personal_rc_file (expected_sessionrc);
+  dockrc_filename    = gimp_personal_rc_file (expected_dockrc);
+
+  /* Remember the modtimes and MD5s */
+  g_assert (gimp_test_get_file_state_verbose (sessionrc_filename,
+                                              &initial_sessionrc_state));
+  g_assert (gimp_test_get_file_state_verbose (dockrc_filename,
+                                              &initial_dockrc_state));
+
+  /* Use specific input files when restoring the session */
+  g_setenv ("GIMP_TESTING_SESSIONRC_NAME", loaded_sessionrc, TRUE /*overwrite*/);
+  g_setenv ("GIMP_TESTING_DOCKRC_NAME", loaded_dockrc, TRUE /*overwrite*/);
+
+  /* Start up GIMP */
+  gimp = gimp_init_for_gui_testing (TRUE /*show_gui*/);
+
+  /* Let the main loop run until idle to let things stabilize. This
+   * includes parsing sessionrc and dockrc
+   */
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Change the gimp dir to the output dir so files are written there,
+   * we don't want to (can't always) write to files in the source
+   * dir. There is a hook in Makefile.am that makes sure the output
+   * dir exists
+   */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+  /* Use normal output names */
+  g_unsetenv ("GIMP_TESTING_SESSIONRC_NAME");
+  g_unsetenv ("GIMP_TESTING_DOCKRC_NAME");
+
+  g_free (sessionrc_filename);
+  g_free (dockrc_filename);
+  sessionrc_filename = gimp_personal_rc_file ("sessionrc");
+  dockrc_filename    = gimp_personal_rc_file ("dockrc");
+
+  /* Exit. This includes writing sessionrc and dockrc*/
+  gimp_exit (gimp, TRUE);
+
+  /* Now get the new modtimes and MD5s */
+  g_assert (gimp_test_get_file_state_verbose (sessionrc_filename,
+                                              &final_sessionrc_state));
+  g_assert (gimp_test_get_file_state_verbose (dockrc_filename,
+                                              &final_dockrc_state));
+
+  /* If things have gone our way, GIMP will have deserialized
+   * sessionrc and dockrc, shown the GUI, and then serialized the new
+   * files. To make sure we have new files we check the modtime, and
+   * to make sure that their content remains the same we compare their
+   * MD5
+   */
+  g_assert (gimp_test_file_state_changes ("sessionrc",
+                                          &initial_sessionrc_state,
+                                          &final_sessionrc_state));
+  g_assert (gimp_test_file_state_changes ("dockrc",
+                                          &initial_dockrc_state,
+                                          &final_dockrc_state));
+}
diff --git a/app/tests/gimp-test-session-utils.h b/app/tests/gimp-test-session-utils.h
new file mode 100644
index 0000000..1eeb4cb
--- /dev/null
+++ b/app/tests/gimp-test-session-utils.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEST_SESSION_UTILS_H__
+#define __GIMP_TEST_SESSION_UTILS_H__
+
+
+void gimp_test_session_load_and_write_session_files (const gchar *loaded_sessionrc,
+                                                     const gchar *loaded_dockrc,
+                                                     const gchar *expected_sessionrc,
+                                                     const gchar *expected_dockrc,
+                                                     gboolean     single_window_mode);
+
+
+#endif /* __GIMP_TEST_SESSION_UTILS_H__ */
diff --git a/app/tests/gimpdir-empty/Makefile.am b/app/tests/gimpdir-empty/Makefile.am
new file mode 100644
index 0000000..f3f9ed6
--- /dev/null
+++ b/app/tests/gimpdir-empty/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = \
+	brushes		\
+	gradients	\
+	patterns
+
+EXTRA_DIST = \
+	tags.xml
diff --git a/app/tests/gimpdir-empty/Makefile.in b/app/tests/gimpdir-empty/Makefile.in
new file mode 100644
index 0000000..9a3a25d
--- /dev/null
+++ b/app/tests/gimpdir-empty/Makefile.in
@@ -0,0 +1,934 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir-empty
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = \
+	brushes		\
+	gradients	\
+	patterns
+
+EXTRA_DIST = \
+	tags.xml
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir-empty/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir-empty/brushes/Makefile.am b/app/tests/gimpdir-empty/brushes/Makefile.am
new file mode 100644
index 0000000..8fbc147
--- /dev/null
+++ b/app/tests/gimpdir-empty/brushes/Makefile.am
@@ -0,0 +1 @@
+# We only need the dir itself
diff --git a/app/tests/gimpdir-empty/brushes/Makefile.in b/app/tests/gimpdir-empty/brushes/Makefile.in
new file mode 100644
index 0000000..6308261
--- /dev/null
+++ b/app/tests/gimpdir-empty/brushes/Makefile.in
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir-empty/brushes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/brushes/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir-empty/brushes/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# We only need the dir itself
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir-empty/gradients/Makefile.am b/app/tests/gimpdir-empty/gradients/Makefile.am
new file mode 100644
index 0000000..8fbc147
--- /dev/null
+++ b/app/tests/gimpdir-empty/gradients/Makefile.am
@@ -0,0 +1 @@
+# We only need the dir itself
diff --git a/app/tests/gimpdir-empty/gradients/Makefile.in b/app/tests/gimpdir-empty/gradients/Makefile.in
new file mode 100644
index 0000000..b5ac4ea
--- /dev/null
+++ b/app/tests/gimpdir-empty/gradients/Makefile.in
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir-empty/gradients
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/gradients/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir-empty/gradients/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# We only need the dir itself
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir-empty/patterns/Makefile.am b/app/tests/gimpdir-empty/patterns/Makefile.am
new file mode 100644
index 0000000..8fbc147
--- /dev/null
+++ b/app/tests/gimpdir-empty/patterns/Makefile.am
@@ -0,0 +1 @@
+# We only need the dir itself
diff --git a/app/tests/gimpdir-empty/patterns/Makefile.in b/app/tests/gimpdir-empty/patterns/Makefile.in
new file mode 100644
index 0000000..465eafb
--- /dev/null
+++ b/app/tests/gimpdir-empty/patterns/Makefile.in
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir-empty/patterns
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/patterns/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir-empty/patterns/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# We only need the dir itself
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir-empty/tags.xml b/app/tests/gimpdir-empty/tags.xml
new file mode 100644
index 0000000..3570c4d
--- /dev/null
+++ b/app/tests/gimpdir-empty/tags.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<tags>
+
+  <resource identifier="gimp-brush-clipboard" checksum="157dcef48665ab465439cfaf10d6feeb">
+  </resource>
+
+  <resource identifier="gimp-pattern-clipboard" checksum="eff9598f9f61c1dc78d842f1798c2ab8">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-rgb" checksum="12ad9439c57e897e50fb0399439e5b2b">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-hsv-cw" checksum="86589f70c8a7777c6e2d1d14b99e3759">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-hsv-ccw" checksum="65aacbbd72d99ff20ca1bd310f0a21a5">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-rgb" checksum="4a878c6cfae0b0e03c0834723daadf92">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-transparent" checksum="1491f74caf057a39c8193470da2d2a29">
+  </resource>
+</tags>
diff --git a/app/tests/gimpdir/Makefile.am b/app/tests/gimpdir/Makefile.am
new file mode 100644
index 0000000..5a86a73
--- /dev/null
+++ b/app/tests/gimpdir/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = \
+	brushes		\
+	gradients	\
+	patterns
+
+EXTRA_DIST = \
+	dockrc					\
+	dockrc-2-8				\
+	dockrc-expected				\
+	sessionrc				\
+	sessionrc-2-8-multi-window		\
+	sessionrc-2-8-single-window		\
+	sessionrc-expected-multi-window		\
+	sessionrc-expected-single-window	\
+	tags.xml
diff --git a/app/tests/gimpdir/Makefile.in b/app/tests/gimpdir/Makefile.in
new file mode 100644
index 0000000..49c9eac
--- /dev/null
+++ b/app/tests/gimpdir/Makefile.in
@@ -0,0 +1,942 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = \
+	brushes		\
+	gradients	\
+	patterns
+
+EXTRA_DIST = \
+	dockrc					\
+	dockrc-2-8				\
+	dockrc-expected				\
+	sessionrc				\
+	sessionrc-2-8-multi-window		\
+	sessionrc-2-8-single-window		\
+	sessionrc-expected-multi-window		\
+	sessionrc-expected-single-window	\
+	tags.xml
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir/brushes/Makefile.am b/app/tests/gimpdir/brushes/Makefile.am
new file mode 100644
index 0000000..8fbc147
--- /dev/null
+++ b/app/tests/gimpdir/brushes/Makefile.am
@@ -0,0 +1 @@
+# We only need the dir itself
diff --git a/app/tests/gimpdir/brushes/Makefile.in b/app/tests/gimpdir/brushes/Makefile.in
new file mode 100644
index 0000000..9a1d39d
--- /dev/null
+++ b/app/tests/gimpdir/brushes/Makefile.in
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir/brushes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/brushes/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir/brushes/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# We only need the dir itself
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir/dockrc b/app/tests/gimpdir/dockrc
new file mode 100644
index 0000000..fc7b255
--- /dev/null
+++ b/app/tests/gimpdir/dockrc
@@ -0,0 +1,44 @@
+# recently closed docks
+
+(GimpSessionInfo "Palettes - FG/BG - Images"
+    (factory-entry "gimp-dock-window")
+    (position 585 115)
+    (size 200 575)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-palette-list"
+                (tab-style preview)))
+        (book
+            (position 140)
+            (current-page 0)
+            (dockable "gimp-color-editor"
+                (tab-style preview)
+                (aux-info
+                    (current-page "GimpColorSelect"))))
+        (book
+            (position 415)
+            (current-page 0)
+            (dockable "gimp-image-list"
+                (tab-style preview)))))
+(GimpSessionInfo "Selection, Fonts"
+    (factory-entry "gimp-dock-window")
+    (position 200 180)
+    (size 200 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-selection-editor"
+                (tab-style icon))
+            (dockable "gimp-font-list"
+                (tab-style preview)))))
+
+# end of recently closed docks
diff --git a/app/tests/gimpdir/dockrc-2-8 b/app/tests/gimpdir/dockrc-2-8
new file mode 100644
index 0000000..fc7b255
--- /dev/null
+++ b/app/tests/gimpdir/dockrc-2-8
@@ -0,0 +1,44 @@
+# recently closed docks
+
+(GimpSessionInfo "Palettes - FG/BG - Images"
+    (factory-entry "gimp-dock-window")
+    (position 585 115)
+    (size 200 575)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-palette-list"
+                (tab-style preview)))
+        (book
+            (position 140)
+            (current-page 0)
+            (dockable "gimp-color-editor"
+                (tab-style preview)
+                (aux-info
+                    (current-page "GimpColorSelect"))))
+        (book
+            (position 415)
+            (current-page 0)
+            (dockable "gimp-image-list"
+                (tab-style preview)))))
+(GimpSessionInfo "Selection, Fonts"
+    (factory-entry "gimp-dock-window")
+    (position 200 180)
+    (size 200 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-selection-editor"
+                (tab-style icon))
+            (dockable "gimp-font-list"
+                (tab-style preview)))))
+
+# end of recently closed docks
diff --git a/app/tests/gimpdir/dockrc-expected b/app/tests/gimpdir/dockrc-expected
new file mode 100644
index 0000000..fc7b255
--- /dev/null
+++ b/app/tests/gimpdir/dockrc-expected
@@ -0,0 +1,44 @@
+# recently closed docks
+
+(GimpSessionInfo "Palettes - FG/BG - Images"
+    (factory-entry "gimp-dock-window")
+    (position 585 115)
+    (size 200 575)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-palette-list"
+                (tab-style preview)))
+        (book
+            (position 140)
+            (current-page 0)
+            (dockable "gimp-color-editor"
+                (tab-style preview)
+                (aux-info
+                    (current-page "GimpColorSelect"))))
+        (book
+            (position 415)
+            (current-page 0)
+            (dockable "gimp-image-list"
+                (tab-style preview)))))
+(GimpSessionInfo "Selection, Fonts"
+    (factory-entry "gimp-dock-window")
+    (position 200 180)
+    (size 200 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-selection-editor"
+                (tab-style icon))
+            (dockable "gimp-font-list"
+                (tab-style preview)))))
+
+# end of recently closed docks
diff --git a/app/tests/gimpdir/gradients/Makefile.am b/app/tests/gimpdir/gradients/Makefile.am
new file mode 100644
index 0000000..8fbc147
--- /dev/null
+++ b/app/tests/gimpdir/gradients/Makefile.am
@@ -0,0 +1 @@
+# We only need the dir itself
diff --git a/app/tests/gimpdir/gradients/Makefile.in b/app/tests/gimpdir/gradients/Makefile.in
new file mode 100644
index 0000000..a51580e
--- /dev/null
+++ b/app/tests/gimpdir/gradients/Makefile.in
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir/gradients
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/gradients/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir/gradients/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# We only need the dir itself
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir/patterns/Makefile.am b/app/tests/gimpdir/patterns/Makefile.am
new file mode 100644
index 0000000..8fbc147
--- /dev/null
+++ b/app/tests/gimpdir/patterns/Makefile.am
@@ -0,0 +1 @@
+# We only need the dir itself
diff --git a/app/tests/gimpdir/patterns/Makefile.in b/app/tests/gimpdir/patterns/Makefile.in
new file mode 100644
index 0000000..9d75c24
--- /dev/null
+++ b/app/tests/gimpdir/patterns/Makefile.in
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tests/gimpdir/patterns
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/patterns/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tests/gimpdir/patterns/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# We only need the dir itself
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tests/gimpdir/sessionrc b/app/tests/gimpdir/sessionrc
new file mode 100644
index 0000000..e23b5e9
--- /dev/null
+++ b/app/tests/gimpdir/sessionrc
@@ -0,0 +1,117 @@
+# GIMP sessionrc
+# 
+# This file takes session-specific info (that is info, you want to keep
+# between two GIMP sessions).  You are not supposed to edit it manually, but
+# of course you can do.  The sessionrc will be entirely rewritten every time
+# you quit GIMP.  If this file isn't found, defaults are used.
+
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 565 170)
+    (size 210 535)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-layer-list"
+                (tab-style icon)
+                (preview-size 32)
+                (aux-info
+                    (show-button-bar "true"))))
+        (book
+            (position 290)
+            (current-page 0)
+            (dockable "gimp-brush-grid"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 140 290)
+    (size 445 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-tool-options"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true")))))
+    (gimp-dock
+        (position 230)
+        (book
+            (current-page 0)
+            (dockable "gimp-device-status"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 795 45)
+    (size 200 265)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-pattern-grid"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true")))
+            (dockable "gimp-gradient-list"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 805 345)
+    (size 200 450)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-channel-list"
+                (tab-style automatic)
+                (preview-size 32)
+                (aux-info
+                    (show-button-bar "true"))))
+        (book
+            (position 200)
+            (current-page 0)
+            (dockable "gimp-palette-editor"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true")
+                    (edit-active "true")
+                    (current-data "Color History")
+                    (zoom-factor "2.80"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-file-open-dialog")
+    (position 390 140)
+    (size 900 815))
+(session-info "toplevel"
+    (factory-entry "gimp-image-new-dialog")
+    (position 100 100))
+(session-info "toplevel"
+    (factory-entry "gimp-empty-image-window")
+    (position 140 30)
+    (size 610 190))
+(session-info "toplevel"
+    (factory-entry "gimp-single-image-window")
+    (position 10 40)
+    (size 900 600))
+
+(last-tip-shown 0)
+
+# end of sessionrc
diff --git a/app/tests/gimpdir/sessionrc-2-8-multi-window b/app/tests/gimpdir/sessionrc-2-8-multi-window
new file mode 100644
index 0000000..4afc5bf
--- /dev/null
+++ b/app/tests/gimpdir/sessionrc-2-8-multi-window
@@ -0,0 +1,105 @@
+# GIMP sessionrc
+# 
+# This file takes session-specific info (that is info, you want to keep
+# between two GIMP sessions).  You are not supposed to edit it manually, but
+# of course you can do.  The sessionrc will be entirely rewritten every time
+# you quit GIMP.  If this file isn't found, defaults are used.
+
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 565 170)
+    (size 210 535)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-layer-list"
+                (tab-style icon)
+                (preview-size 32)))
+        (book
+            (position 290)
+            (current-page 0)
+            (dockable "gimp-brush-grid"
+                (tab-style preview)))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 140 290)
+    (size 445 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-tool-options"
+                (tab-style icon))))
+    (gimp-dock
+        (position 230)
+        (book
+            (current-page 0)
+            (dockable "gimp-device-status"
+                (tab-style icon)))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 795 45)
+    (size 200 265)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-pattern-grid"
+                (tab-style preview))
+            (dockable "gimp-gradient-list"
+                (tab-style preview)))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 805 345)
+    (size 200 450)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-channel-list"
+                (tab-style automatic)
+                (preview-size 32)))
+        (book
+            (position 200)
+            (current-page 0)
+            (dockable "gimp-palette-editor"
+                (tab-style icon)
+                (aux-info
+                    (edit-active "true")
+                    (current-data "Color History")
+                    (zoom-factor "2.80"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-file-open-dialog")
+    (position 390 140)
+    (size 900 815))
+(session-info "toplevel"
+    (factory-entry "gimp-image-new-dialog")
+    (position 100 100))
+(session-info "toplevel"
+    (factory-entry "gimp-empty-image-window")
+    (position 140 30)
+    (size 610 190)
+    (open-on-exit))
+(session-info "toplevel"
+    (factory-entry "gimp-single-image-window")
+    (position 10 40)
+    (size 900 600))
+
+(hide-docks no)
+(single-window-mode no)
+(last-tip-shown 0)
+
+# end of sessionrc
diff --git a/app/tests/gimpdir/sessionrc-2-8-single-window b/app/tests/gimpdir/sessionrc-2-8-single-window
new file mode 100644
index 0000000..8c603ab
--- /dev/null
+++ b/app/tests/gimpdir/sessionrc-2-8-single-window
@@ -0,0 +1,63 @@
+# GIMP sessionrc
+# 
+# This file takes session-specific info (that is info, you want to keep
+# between two GIMP sessions).  You are not supposed to edit it manually, but
+# of course you can do.  The sessionrc will be entirely rewritten every time
+# you quit GIMP.  If this file isn't found, defaults are used.
+
+(session-info "toplevel"
+    (factory-entry "gimp-file-open-dialog")
+    (position 390 140)
+    (size 900 815))
+(session-info "toplevel"
+    (factory-entry "gimp-image-new-dialog")
+    (position 100 100))
+(session-info "toplevel"
+    (factory-entry "gimp-empty-image-window")
+    (position 140 30)
+    (size 1285 750))
+(session-info "toplevel"
+    (factory-entry "gimp-single-image-window")
+    (position 140 30)
+    (size 1050 770)
+    (open-on-exit)
+    (aux-info
+        (left-docks-width "80")
+        (right-docks-width "400")
+        (maximized "no"))
+    (gimp-toolbox
+        (side left))
+    (gimp-dock
+        (side right)
+        (book
+            (current-page 0)
+            (dockable "gimp-layer-list"
+                (tab-style icon)
+                (preview-size 32)))
+        (book
+            (position 380)
+            (current-page 0)
+            (dockable "gimp-brush-grid"
+                (tab-style preview))))
+    (gimp-dock
+        (side right)
+        (position 200)
+        (book
+            (current-page 0)
+            (dockable "gimp-tool-options"
+                (tab-style icon))))
+    (gimp-dock
+        (side right)
+        (position 550)
+        (book
+            (current-page 1)
+            (dockable "gimp-pattern-grid"
+                (tab-style preview))
+            (dockable "gimp-gradient-list"
+                (tab-style preview)))))
+
+(hide-docks no)
+(single-window-mode yes)
+(last-tip-shown 0)
+
+# end of sessionrc
diff --git a/app/tests/gimpdir/sessionrc-expected-multi-window b/app/tests/gimpdir/sessionrc-expected-multi-window
new file mode 100644
index 0000000..5417995
--- /dev/null
+++ b/app/tests/gimpdir/sessionrc-expected-multi-window
@@ -0,0 +1,122 @@
+# GIMP sessionrc
+# 
+# This file takes session-specific info (that is info, you want to keep
+# between two GIMP sessions).  You are not supposed to edit it manually, but
+# of course you can do.  The sessionrc will be entirely rewritten every time
+# you quit GIMP.  If this file isn't found, defaults are used.
+
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 565 170)
+    (size 210 535)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-layer-list"
+                (tab-style icon)
+                (preview-size 32)
+                (aux-info
+                    (show-button-bar "true"))))
+        (book
+            (position 290)
+            (current-page 0)
+            (dockable "gimp-brush-grid"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 140 290)
+    (size 445 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-tool-options"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true")))))
+    (gimp-dock
+        (position 230)
+        (book
+            (current-page 0)
+            (dockable "gimp-device-status"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 795 45)
+    (size 200 265)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-pattern-grid"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true")))
+            (dockable "gimp-gradient-list"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 805 345)
+    (size 200 450)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-channel-list"
+                (tab-style automatic)
+                (preview-size 32)
+                (aux-info
+                    (show-button-bar "true"))))
+        (book
+            (position 200)
+            (current-page 0)
+            (dockable "gimp-palette-editor"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true")
+                    (edit-active "true")
+                    (current-data "Color History")
+                    (zoom-factor "2.80"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-file-open-dialog")
+    (position 390 140)
+    (size 900 815))
+(session-info "toplevel"
+    (factory-entry "gimp-image-new-dialog")
+    (position 100 100))
+(session-info "toplevel"
+    (factory-entry "gimp-empty-image-window")
+    (position 140 30)
+    (size 610 190)
+    (open-on-exit))
+(session-info "toplevel"
+    (factory-entry "gimp-single-image-window")
+    (position 10 40)
+    (size 900 600))
+
+(hide-docks no)
+(single-window-mode no)
+(show-tabs yes)
+(tabs-position 0)
+(last-tip-shown 0)
+
+# end of sessionrc
diff --git a/app/tests/gimpdir/sessionrc-expected-single-window b/app/tests/gimpdir/sessionrc-expected-single-window
new file mode 100644
index 0000000..f91b224
--- /dev/null
+++ b/app/tests/gimpdir/sessionrc-expected-single-window
@@ -0,0 +1,75 @@
+# GIMP sessionrc
+# 
+# This file takes session-specific info (that is info, you want to keep
+# between two GIMP sessions).  You are not supposed to edit it manually, but
+# of course you can do.  The sessionrc will be entirely rewritten every time
+# you quit GIMP.  If this file isn't found, defaults are used.
+
+(session-info "toplevel"
+    (factory-entry "gimp-file-open-dialog")
+    (position 390 140)
+    (size 900 815))
+(session-info "toplevel"
+    (factory-entry "gimp-image-new-dialog")
+    (position 100 100))
+(session-info "toplevel"
+    (factory-entry "gimp-empty-image-window")
+    (position 140 30)
+    (size 1285 750))
+(session-info "toplevel"
+    (factory-entry "gimp-single-image-window")
+    (position 140 30)
+    (size 1050 770)
+    (open-on-exit)
+    (aux-info
+        (left-docks-width "80")
+        (right-docks-width "400")
+        (maximized "no"))
+    (gimp-toolbox
+        (side left))
+    (gimp-dock
+        (side right)
+        (book
+            (current-page 0)
+            (dockable "gimp-layer-list"
+                (tab-style icon)
+                (preview-size 32)
+                (aux-info
+                    (show-button-bar "true"))))
+        (book
+            (position 380)
+            (current-page 0)
+            (dockable "gimp-brush-grid"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true")))))
+    (gimp-dock
+        (side right)
+        (position 200)
+        (book
+            (current-page 0)
+            (dockable "gimp-tool-options"
+                (tab-style icon)
+                (aux-info
+                    (show-button-bar "true")))))
+    (gimp-dock
+        (side right)
+        (position 550)
+        (book
+            (current-page 1)
+            (dockable "gimp-pattern-grid"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true")))
+            (dockable "gimp-gradient-list"
+                (tab-style preview)
+                (aux-info
+                    (show-button-bar "true"))))))
+
+(hide-docks no)
+(single-window-mode yes)
+(show-tabs yes)
+(tabs-position 0)
+(last-tip-shown 0)
+
+# end of sessionrc
diff --git a/app/tests/gimpdir/tags.xml b/app/tests/gimpdir/tags.xml
new file mode 100644
index 0000000..229bb58
--- /dev/null
+++ b/app/tests/gimpdir/tags.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<tags>
+
+  <resource identifier="gimp-brush-clipboard" checksum="157dcef48665ab465439cfaf10d6feeb">
+  </resource>
+
+  <resource identifier="gimp-pattern-clipboard" checksum="eff9598f9f61c1dc78d842f1798c2ab8">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-hsv-cw" checksum="86589f70c8a7777c6e2d1d14b99e3759">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-hsv-ccw" checksum="65aacbbd72d99ff20ca1bd310f0a21a5">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-rgb" checksum="12ad9439c57e897e50fb0399439e5b2b">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-bg-rgb" checksum="4a878c6cfae0b0e03c0834723daadf92">
+  </resource>
+
+  <resource identifier="gimp-gradient-fg-transparent" checksum="1491f74caf057a39c8193470da2d2a29">
+  </resource>
+</tags>
diff --git a/app/tests/test-core.c b/app/tests/test-core.c
new file mode 100644
index 0000000..afa4a46
--- /dev/null
+++ b/app/tests/test-core.c
@@ -0,0 +1,293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets/widgets-types.h"
+
+#include "widgets/gimpuimanager.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-new.h"
+
+#include "operations/gimplevelsconfig.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+
+#define GIMP_TEST_IMAGE_SIZE 100
+
+#define ADD_IMAGE_TEST(function) \
+  g_test_add ("/gimp-core/" #function, \
+              GimpTestFixture, \
+              gimp, \
+              gimp_test_image_setup, \
+              function, \
+              gimp_test_image_teardown);
+
+#define ADD_TEST(function) \
+  g_test_add ("/gimp-core/" #function, \
+              GimpTestFixture, \
+              gimp, \
+              NULL, \
+              function, \
+              NULL);
+
+
+typedef struct
+{
+  GimpImage *image;
+} GimpTestFixture;
+
+
+static void gimp_test_image_setup    (GimpTestFixture *fixture,
+                                      gconstpointer    data);
+static void gimp_test_image_teardown (GimpTestFixture *fixture,
+                                      gconstpointer    data);
+
+
+/**
+ * gimp_test_image_setup:
+ * @fixture:
+ * @data:
+ *
+ * Test fixture setup for a single image.
+ **/
+static void
+gimp_test_image_setup (GimpTestFixture *fixture,
+                       gconstpointer    data)
+{
+  Gimp *gimp = GIMP (data);
+
+  fixture->image = gimp_image_new (gimp,
+                                   GIMP_TEST_IMAGE_SIZE,
+                                   GIMP_TEST_IMAGE_SIZE,
+                                   GIMP_RGB,
+                                   GIMP_PRECISION_FLOAT_LINEAR);
+}
+
+/**
+ * gimp_test_image_teardown:
+ * @fixture:
+ * @data:
+ *
+ * Test fixture teardown for a single image.
+ **/
+static void
+gimp_test_image_teardown (GimpTestFixture *fixture,
+                          gconstpointer    data)
+{
+  g_object_unref (fixture->image);
+}
+
+/**
+ * rotate_non_overlapping:
+ * @fixture:
+ * @data:
+ *
+ * Super basic test that makes sure we can add a layer
+ * and call gimp_item_rotate with center at (0, -10)
+ * without triggering a failed assertion .
+ **/
+static void
+rotate_non_overlapping (GimpTestFixture *fixture,
+                        gconstpointer    data)
+{
+  Gimp        *gimp    = GIMP (data);
+  GimpImage   *image   = fixture->image;
+  GimpLayer   *layer;
+  GimpContext *context = gimp_context_new (gimp, "Test", NULL /*template*/);
+  gboolean     result;
+
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 0);
+
+  layer = gimp_layer_new (image,
+                          GIMP_TEST_IMAGE_SIZE,
+                          GIMP_TEST_IMAGE_SIZE,
+                          babl_format ("R'G'B'A u8"),
+                          "Test Layer",
+                          GIMP_OPACITY_OPAQUE,
+                          GIMP_LAYER_MODE_NORMAL);
+
+  g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE);
+
+  result = gimp_image_add_layer (image,
+                                 layer,
+                                 GIMP_IMAGE_ACTIVE_PARENT,
+                                 0,
+                                 FALSE);
+
+  gimp_item_rotate (GIMP_ITEM (layer), context, GIMP_ROTATE_90, 0., -10., TRUE);
+
+  g_assert_cmpint (result, ==, TRUE);
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 1);
+  g_object_unref (context);
+}
+
+/**
+ * add_layer:
+ * @fixture:
+ * @data:
+ *
+ * Super basic test that makes sure we can add a layer.
+ **/
+static void
+add_layer (GimpTestFixture *fixture,
+           gconstpointer    data)
+{
+  GimpImage *image = fixture->image;
+  GimpLayer *layer;
+  gboolean   result;
+
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 0);
+
+  layer = gimp_layer_new (image,
+                          GIMP_TEST_IMAGE_SIZE,
+                          GIMP_TEST_IMAGE_SIZE,
+                          babl_format ("R'G'B'A u8"),
+                          "Test Layer",
+                          GIMP_OPACITY_OPAQUE,
+                          GIMP_LAYER_MODE_NORMAL);
+
+  g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE);
+
+  result = gimp_image_add_layer (image,
+                                 layer,
+                                 GIMP_IMAGE_ACTIVE_PARENT,
+                                 0,
+                                 FALSE);
+
+  g_assert_cmpint (result, ==, TRUE);
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 1);
+}
+
+/**
+ * remove_layer:
+ * @fixture:
+ * @data:
+ *
+ * Super basic test that makes sure we can remove a layer.
+ **/
+static void
+remove_layer (GimpTestFixture *fixture,
+              gconstpointer    data)
+{
+  GimpImage *image = fixture->image;
+  GimpLayer *layer;
+  gboolean   result;
+
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 0);
+
+  layer = gimp_layer_new (image,
+                          GIMP_TEST_IMAGE_SIZE,
+                          GIMP_TEST_IMAGE_SIZE,
+                          babl_format ("R'G'B'A u8"),
+                          "Test Layer",
+                          GIMP_OPACITY_OPAQUE,
+                          GIMP_LAYER_MODE_NORMAL);
+
+  g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE);
+
+  result = gimp_image_add_layer (image,
+                                 layer,
+                                 GIMP_IMAGE_ACTIVE_PARENT,
+                                 0,
+                                 FALSE);
+
+  g_assert_cmpint (result, ==, TRUE);
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 1);
+
+  gimp_image_remove_layer (image,
+                           layer,
+                           FALSE,
+                           NULL);
+
+  g_assert_cmpint (gimp_image_get_n_layers (image), ==, 0);
+}
+
+/**
+ * white_graypoint_in_red_levels:
+ * @fixture:
+ * @data:
+ *
+ * Makes sure the levels algorithm can handle when the graypoint is
+ * white. It's easy to get a divide by zero problem when trying to
+ * calculate what gamma will give a white graypoint.
+ **/
+static void
+white_graypoint_in_red_levels (GimpTestFixture *fixture,
+                               gconstpointer    data)
+{
+  GimpRGB              black   = { 0, 0, 0, 0 };
+  GimpRGB              gray    = { 1, 1, 1, 1 };
+  GimpRGB              white   = { 1, 1, 1, 1 };
+  GimpHistogramChannel channel = GIMP_HISTOGRAM_RED;
+  GimpLevelsConfig    *config;
+
+  config = g_object_new (GIMP_TYPE_LEVELS_CONFIG, NULL);
+
+  gimp_levels_config_adjust_by_colors (config,
+                                       channel,
+                                       &black,
+                                       &gray,
+                                       &white);
+
+  /* Make sure we didn't end up with an invalid gamma value */
+  g_object_set (config,
+                "gamma", config->gamma[channel],
+                NULL);
+}
+
+int
+main (int    argc,
+      char **argv)
+{
+  Gimp *gimp;
+  int   result;
+
+  g_test_init (&argc, &argv, NULL);
+
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+
+  /* We share the same application instance across all tests */
+  gimp = gimp_init_for_testing ();
+
+  /* Add tests */
+  ADD_IMAGE_TEST (add_layer);
+  ADD_IMAGE_TEST (remove_layer);
+  ADD_IMAGE_TEST (rotate_non_overlapping);
+  ADD_TEST (white_graypoint_in_red_levels);
+
+  /* Run the tests */
+  result = g_test_run ();
+
+  /* Don't write files to the source dir */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+
+  /* Exit so we don't break script-fu plug-in wire */
+  gimp_exit (gimp, TRUE);
+
+  return result;
+}
diff --git a/app/tests/test-gimpidtable.c b/app/tests/test-gimpidtable.c
new file mode 100644
index 0000000..8de2130
--- /dev/null
+++ b/app/tests/test-gimpidtable.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "core/core-types.h"
+
+#include "core/gimpidtable.h"
+
+
+#define ADD_TEST(function) \
+  g_test_add ("/gimpidtable/" #function, \
+              GimpTestFixture, \
+              NULL, \
+              gimp_test_id_table_setup, \
+              gimp_test_id_table_ ## function, \
+              gimp_test_id_table_teardown);
+
+
+typedef struct
+{
+  GimpIdTable *id_table;
+} GimpTestFixture;
+
+
+static gpointer data1 = (gpointer) 0x00000001;
+static gpointer data2 = (gpointer) 0x00000002;
+
+
+static void
+gimp_test_id_table_setup (GimpTestFixture *fixture,
+                          gconstpointer    data)
+{
+  fixture->id_table = gimp_id_table_new ();
+}
+
+static void
+gimp_test_id_table_teardown (GimpTestFixture *fixture,
+                             gconstpointer    data)
+{
+  g_object_unref (fixture->id_table);
+  fixture->id_table = NULL;
+}
+
+/**
+ * gimp_test_id_table_insert_and_lookup:
+ *
+ * Test that insert and lookup works.
+ **/
+static void
+gimp_test_id_table_insert_and_lookup (GimpTestFixture *f,
+                                      gconstpointer    data)
+{
+  gint     ret_id   = gimp_id_table_insert (f->id_table, data1);
+  gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
+
+  g_assert (ret_data == data1);
+}
+
+/**
+ * gimp_test_id_table_insert_twice:
+ *
+ * Test that two consecutive inserts generates different IDs.
+ **/
+static void
+gimp_test_id_table_insert_twice (GimpTestFixture *f,
+                                 gconstpointer    data)
+{
+  gint     ret_id    = gimp_id_table_insert (f->id_table, data1);
+  gpointer ret_data  = gimp_id_table_lookup (f->id_table, ret_id);
+  gint     ret_id2   = gimp_id_table_insert (f->id_table, data2);
+  gpointer ret_data2 = gimp_id_table_lookup (f->id_table, ret_id2);
+
+  g_assert (ret_id    != ret_id2);
+  g_assert (ret_data  == data1);
+  g_assert (ret_data2 == data2);
+}
+
+/**
+ * gimp_test_id_table_insert_with_id:
+ *
+ * Test that it is possible to insert data with a specific ID.
+ **/
+static void
+gimp_test_id_table_insert_with_id (GimpTestFixture *f,
+                                   gconstpointer    data)
+{
+  const int id = 10;
+
+  int      ret_id   = gimp_id_table_insert_with_id (f->id_table, id, data1);
+  gpointer ret_data = gimp_id_table_lookup (f->id_table, id);
+
+  g_assert (ret_id   == id);
+  g_assert (ret_data == data1);
+}
+
+/**
+ * gimp_test_id_table_insert_with_id_existing:
+ *
+ * Test that it is not possible to insert data with a specific ID if
+ * that ID already is inserted.
+ **/
+static void
+gimp_test_id_table_insert_with_id_existing (GimpTestFixture *f,
+                                            gconstpointer    data)
+{
+  const int id = 10;
+
+  int      ret_id    = gimp_id_table_insert_with_id (f->id_table, id, data1);
+  gpointer ret_data  = gimp_id_table_lookup (f->id_table, ret_id);
+  int      ret_id2   = gimp_id_table_insert_with_id (f->id_table, id, data2);
+  gpointer ret_data2 = gimp_id_table_lookup (f->id_table, ret_id2);
+
+  g_assert (id        == ret_id);
+  g_assert (ret_id2   == -1);
+  g_assert (ret_data  == data1);
+  g_assert (ret_data2 == NULL);
+}
+
+/**
+ * gimp_test_id_table_replace:
+ *
+ * Test that it is possible to replace data with a given ID with
+ * different data.
+ **/
+static void
+gimp_test_id_table_replace (GimpTestFixture *f,
+                            gconstpointer    data)
+{
+  int ret_id = gimp_id_table_insert (f->id_table, data1);
+  gpointer ret_data;
+
+  gimp_id_table_replace (f->id_table, ret_id, data2);
+  ret_data = gimp_id_table_lookup (f->id_table, ret_id);
+
+  g_assert (ret_data  == data2);
+}
+
+/**
+ * gimp_test_id_table_replace_as_insert:
+ *
+ * Test that replace works like insert when there is no data to
+ * replace.
+ **/
+static void
+gimp_test_id_table_replace_as_insert (GimpTestFixture *f,
+                                      gconstpointer    data)
+{
+  const int id = 10;
+
+  gpointer ret_data;
+
+  gimp_id_table_replace (f->id_table, id, data1);
+  ret_data = gimp_id_table_lookup (f->id_table, id);
+
+  g_assert (ret_data  == data1);
+}
+
+/**
+ * gimp_test_id_table_remove:
+ *
+ * Test that it is possible to remove data identified by the ID:
+ **/
+static void
+gimp_test_id_table_remove (GimpTestFixture *f,
+                           gconstpointer    data)
+{
+  gint     ret_id            = gimp_id_table_insert (f->id_table, data1);
+  void    *ret_data          = gimp_id_table_lookup (f->id_table, ret_id);
+  gboolean remove_successful = gimp_id_table_remove (f->id_table, ret_id);
+  void    *ret_data2         = gimp_id_table_lookup (f->id_table, ret_id);
+
+  g_assert (remove_successful);
+  g_assert (ret_data == data1);
+  g_assert (ret_data2 == NULL);
+}
+
+/**
+ * gimp_test_id_table_remove_non_existing:
+ *
+ * Tests that things work properly when trying to remove data with an
+ * ID that doesn't exist.
+ **/
+static void
+gimp_test_id_table_remove_non_existing (GimpTestFixture *f,
+                                        gconstpointer    data)
+{
+  const int id = 10;
+
+  gboolean remove_successful = gimp_id_table_remove (f->id_table, id);
+  void    *ret_data          = gimp_id_table_lookup (f->id_table, id);
+
+  g_assert (! remove_successful);
+  g_assert (ret_data == NULL);
+}
+
+int main(int argc, char **argv)
+{
+  g_test_init (&argc, &argv, NULL);
+
+  ADD_TEST (insert_and_lookup);
+  ADD_TEST (insert_twice);
+  ADD_TEST (insert_with_id);
+  ADD_TEST (insert_with_id_existing);
+  ADD_TEST (replace);
+  ADD_TEST (replace_as_insert);
+  ADD_TEST (remove);
+  ADD_TEST (remove_non_existing);
+
+  return g_test_run ();
+}
diff --git a/app/tests/test-save-and-export.c b/app/tests/test-save-and-export.c
new file mode 100644
index 0000000..180f61b
--- /dev/null
+++ b/app/tests/test-save-and-export.c
@@ -0,0 +1,395 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs/dialogs-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "file/file-open.h"
+#include "file/file-save.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimptooloptionseditor.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-scale.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimpimagewindow.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+
+#define ADD_TEST(function) \
+  g_test_add_data_func ("/gimp-save-and-export/" #function, gimp, function);
+
+
+typedef gboolean (*GimpUiTestFunc) (GObject *object);
+
+
+/**
+ * new_file_has_no_files:
+ * @data:
+ *
+ * Tests that the URIs are correct for a newly created image.
+ **/
+static void
+new_file_has_no_files (gconstpointer    data)
+{
+  Gimp      *gimp  = GIMP (data);
+  GimpImage *image = gimp_test_utils_create_image_from_dialog (gimp);
+
+  g_assert (gimp_image_get_file (image) == NULL);
+  g_assert (gimp_image_get_imported_file (image) == NULL);
+  g_assert (gimp_image_get_exported_file (image) == NULL);
+}
+
+/**
+ * opened_xcf_file_files:
+ * @data:
+ *
+ * Tests that GimpImage URIs are correct for an XCF file that has just
+ * been opened.
+ **/
+static void
+opened_xcf_file_files (gconstpointer data)
+{
+  Gimp              *gimp = GIMP (data);
+  GimpImage         *image;
+  GFile             *file;
+  gchar             *filename;
+  GimpPDBStatusType  status;
+
+  filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"),
+                               "app/tests/files/gimp-2-6-file.xcf",
+                               NULL);
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+
+  image = file_open_image (gimp,
+                           gimp_get_user_context (gimp),
+                           NULL /*progress*/,
+                           file,
+                           file,
+                           FALSE /*as_new*/,
+                           NULL /*file_proc*/,
+                           GIMP_RUN_NONINTERACTIVE,
+                           &status,
+                           NULL /*mime_type*/,
+                           NULL /*error*/);
+
+  g_assert (g_file_equal (gimp_image_get_file (image), file));
+  g_assert (gimp_image_get_imported_file (image) == NULL);
+  g_assert (gimp_image_get_exported_file (image) == NULL);
+
+  g_object_unref (file);
+}
+
+/**
+ * imported_file_files:
+ * @data:
+ *
+ * Tests that URIs are correct for an imported image.
+ **/
+static void
+imported_file_files (gconstpointer data)
+{
+  Gimp              *gimp = GIMP (data);
+  GimpImage         *image;
+  GFile             *file;
+  gchar             *filename;
+  GimpPDBStatusType  status;
+
+  filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"),
+                               "desktop/64x64/gimp.png",
+                               NULL);
+  g_assert (g_file_test (filename, G_FILE_TEST_EXISTS));
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+
+  image = file_open_image (gimp,
+                           gimp_get_user_context (gimp),
+                           NULL /*progress*/,
+                           file,
+                           file,
+                           FALSE /*as_new*/,
+                           NULL /*file_proc*/,
+                           GIMP_RUN_NONINTERACTIVE,
+                           &status,
+                           NULL /*mime_type*/,
+                           NULL /*error*/);
+
+  g_assert (gimp_image_get_file (image) == NULL);
+  g_assert (g_file_equal (gimp_image_get_imported_file (image), file));
+  g_assert (gimp_image_get_exported_file (image) == NULL);
+
+  g_object_unref (file);
+}
+
+/**
+ * saved_imported_file_files:
+ * @data:
+ *
+ * Tests that the URIs are correct for an image that has been imported
+ * and then saved.
+ **/
+static void
+saved_imported_file_files (gconstpointer data)
+{
+  Gimp                *gimp = GIMP (data);
+  GimpImage           *image;
+  GFile               *import_file;
+  gchar               *import_filename;
+  GFile               *save_file;
+  gchar               *save_filename;
+  GimpPDBStatusType    status;
+  GimpPlugInProcedure *proc;
+
+  import_filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"),
+                                      "desktop/64x64/gimp.png",
+                                      NULL);
+  import_file = g_file_new_for_path (import_filename);
+  g_free (import_filename);
+
+  save_filename = g_build_filename (g_get_tmp_dir (), "gimp-test.xcf", NULL);
+  save_file = g_file_new_for_path (save_filename);
+  g_free (save_filename);
+
+  /* Import */
+  image = file_open_image (gimp,
+                           gimp_get_user_context (gimp),
+                           NULL /*progress*/,
+                           import_file,
+                           import_file,
+                           FALSE /*as_new*/,
+                           NULL /*file_proc*/,
+                           GIMP_RUN_NONINTERACTIVE,
+                           &status,
+                           NULL /*mime_type*/,
+                           NULL /*error*/);
+
+  g_object_unref (import_file);
+
+  /* Save */
+  proc = gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                   GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                                                   save_file,
+                                                   NULL /*error*/);
+  file_save (gimp,
+             image,
+             NULL /*progress*/,
+             save_file,
+             proc,
+             GIMP_RUN_NONINTERACTIVE,
+             TRUE /*change_saved_state*/,
+             FALSE /*export_backward*/,
+             FALSE /*export_forward*/,
+             NULL /*error*/);
+
+  /* Assert */
+  g_assert (g_file_equal (gimp_image_get_file (image), save_file));
+  g_assert (gimp_image_get_imported_file (image) == NULL);
+  g_assert (gimp_image_get_exported_file (image) == NULL);
+
+  g_file_delete (save_file, NULL, NULL);
+  g_object_unref (save_file);
+}
+
+/**
+ * exported_file_files:
+ * @data:
+ *
+ * Tests that the URIs for an exported, newly created file are
+ * correct.
+ **/
+static void
+exported_file_files (gconstpointer data)
+{
+  GFile               *save_file;
+  gchar               *save_filename;
+  GimpPlugInProcedure *proc;
+  Gimp                *gimp  = GIMP (data);
+  GimpImage           *image = gimp_test_utils_create_image_from_dialog (gimp);
+
+  save_filename = g_build_filename (g_get_tmp_dir (), "gimp-test.png", NULL);
+  save_file = g_file_new_for_path (save_filename);
+  g_free (save_filename);
+
+  proc = gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                   GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                                                   save_file,
+                                                   NULL /*error*/);
+  file_save (gimp,
+             image,
+             NULL /*progress*/,
+             save_file,
+             proc,
+             GIMP_RUN_NONINTERACTIVE,
+             FALSE /*change_saved_state*/,
+             FALSE /*export_backward*/,
+             TRUE /*export_forward*/,
+             NULL /*error*/);
+
+  g_assert (gimp_image_get_file (image) == NULL);
+  g_assert (gimp_image_get_imported_file (image) == NULL);
+  g_assert (g_file_equal (gimp_image_get_exported_file (image), save_file));
+
+  g_file_delete (save_file, NULL, NULL);
+  g_object_unref (save_file);
+}
+
+/**
+ * clear_import_file_after_export:
+ * @data:
+ *
+ * Tests that after a XCF file that was imported has been exported,
+ * the import URI is cleared. An image can not be considered both
+ * imported and exported at the same time.
+ **/
+static void
+clear_import_file_after_export (gconstpointer data)
+{
+  Gimp                *gimp = GIMP (data);
+  GimpImage           *image;
+  GFile               *file;
+  gchar               *filename;
+  GFile               *save_file;
+  gchar               *save_filename;
+  GimpPlugInProcedure *proc;
+  GimpPDBStatusType    status;
+
+  filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"),
+                               "desktop/64x64/gimp.png",
+                               NULL);
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+
+  image = file_open_image (gimp,
+                           gimp_get_user_context (gimp),
+                           NULL /*progress*/,
+                           file,
+                           file,
+                           FALSE /*as_new*/,
+                           NULL /*file_proc*/,
+                           GIMP_RUN_NONINTERACTIVE,
+                           &status,
+                           NULL /*mime_type*/,
+                           NULL /*error*/);
+
+  g_assert (gimp_image_get_file (image) == NULL);
+  g_assert (g_file_equal (gimp_image_get_imported_file (image), file));
+  g_assert (gimp_image_get_exported_file (image) == NULL);
+
+  g_object_unref (file);
+
+  save_filename = g_build_filename (g_get_tmp_dir (), "gimp-test.png", NULL);
+  save_file = g_file_new_for_path (save_filename);
+  g_free (save_filename);
+
+  proc = gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                   GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                                                   save_file,
+                                                   NULL /*error*/);
+  file_save (gimp,
+             image,
+             NULL /*progress*/,
+             save_file,
+             proc,
+             GIMP_RUN_NONINTERACTIVE,
+             FALSE /*change_saved_state*/,
+             FALSE /*export_backward*/,
+             TRUE /*export_forward*/,
+             NULL /*error*/);
+
+  g_assert (gimp_image_get_file (image) == NULL);
+  g_assert (gimp_image_get_imported_file (image) == NULL);
+  g_assert (g_file_equal (gimp_image_get_exported_file (image), save_file));
+
+  g_file_delete (save_file, NULL, NULL);
+  g_object_unref (save_file);
+}
+
+int
+main(int    argc,
+     char **argv)
+{
+  Gimp *gimp   = NULL;
+  gint  result = -1;
+
+  gimp_test_bail_if_no_display ();
+  gtk_test_init (&argc, &argv, NULL);
+
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+  gimp_test_utils_setup_menus_path ();
+
+  /* Start up GIMP */
+  gimp = gimp_init_for_gui_testing (TRUE /*show_gui*/);
+  gimp_test_run_mainloop_until_idle ();
+
+  ADD_TEST (new_file_has_no_files);
+  ADD_TEST (opened_xcf_file_files);
+  ADD_TEST (imported_file_files);
+  ADD_TEST (saved_imported_file_files);
+  ADD_TEST (exported_file_files);
+  ADD_TEST (clear_import_file_after_export);
+
+  /* Run the tests and return status */
+  result = g_test_run ();
+
+  /* Don't write files to the source dir */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+
+  /* Exit properly so we don't break script-fu plug-in wire */
+  gimp_exit (gimp, TRUE);
+
+  return result;
+}
diff --git a/app/tests/test-session-2-8-compatibility-multi-window.c b/app/tests/test-session-2-8-compatibility-multi-window.c
new file mode 100644
index 0000000..6b7cf92
--- /dev/null
+++ b/app/tests/test-session-2-8-compatibility-multi-window.c
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2011 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "dialogs/dialogs-types.h"
+
+#include "tests.h"
+
+#include "gimp-test-session-utils.h"
+#include "gimp-app-test-utils.h"
+
+
+#define ADD_TEST(function) \
+  g_test_add_func ("/gimp-session-2-8-compatibility-multi-window/" #function, \
+                   function);
+
+#define SKIP_TEST(function) \
+  g_test_add_func ("/gimp-session-2-8-compatibility-multi-window/subprocess/" #function, \
+                   function);
+
+
+/**
+ * Tests that a single-window sessionrc in GIMP 2.8 format is loaded
+ * and written (thus also interpreted) like we expect.
+ **/
+static void
+read_and_write_session_files (void)
+{
+  gimp_test_session_load_and_write_session_files ("sessionrc-2-8-multi-window",
+                                                  "dockrc-2-8",
+                                                  "sessionrc-expected-multi-window",
+                                                  "dockrc-expected",
+                                                  FALSE /*single_window_mode*/);
+}
+
+int main(int argc, char **argv)
+{
+  gimp_test_bail_if_no_display ();
+  gtk_test_init (&argc, &argv, NULL);
+
+#ifdef HAVE_XVFB_RUN
+  ADD_TEST (read_and_write_session_files);
+#else
+  SKIP_TEST (read_and_write_session_files);
+#endif
+
+  /* Don't bother freeing stuff, the process is short-lived */
+#ifdef HAVE_XVFB_RUN
+  return g_test_run ();
+#else
+  return GIMP_EXIT_TEST_SKIPPED;
+#endif
+}
diff --git a/app/tests/test-session-2-8-compatibility-single-window.c b/app/tests/test-session-2-8-compatibility-single-window.c
new file mode 100644
index 0000000..c4b61b0
--- /dev/null
+++ b/app/tests/test-session-2-8-compatibility-single-window.c
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2011 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "dialogs/dialogs-types.h"
+
+#include "tests.h"
+
+#include "gimp-test-session-utils.h"
+#include "gimp-app-test-utils.h"
+
+
+#define ADD_TEST(function) \
+  g_test_add_func ("/gimp-session-2-8-compatibility-single-window/" #function, \
+                   function);
+
+#define SKIP_TEST(function) \
+  g_test_add_func ("/gimp-session-2-8-compatibility-single-window/subprocess/" #function, \
+                   function);
+
+/**
+ * Tests that a multi-window sessionrc in GIMP 2.8 format is loaded
+ * and written (thus also interpreted) like we expect.
+ **/
+static void
+read_and_write_session_files (void)
+{
+  gimp_test_session_load_and_write_session_files ("sessionrc-2-8-single-window",
+                                                  "dockrc-2-8",
+                                                  "sessionrc-expected-single-window",
+                                                  "dockrc-expected",
+                                                  TRUE /*single_window_mode*/);
+}
+
+int main(int argc, char **argv)
+{
+  gimp_test_bail_if_no_display ();
+  gtk_test_init (&argc, &argv, NULL);
+
+#ifdef HAVE_XVFB_RUN
+  ADD_TEST (read_and_write_session_files);
+#else
+  SKIP_TEST (read_and_write_session_files);
+#endif
+
+  /* Don't bother freeing stuff, the process is short-lived */
+#ifdef HAVE_XVFB_RUN
+  return g_test_run ();
+#else
+  return GIMP_EXIT_TEST_SKIPPED;
+#endif
+}
diff --git a/app/tests/test-single-window-mode.c b/app/tests/test-single-window-mode.c
new file mode 100644
index 0000000..e366974
--- /dev/null
+++ b/app/tests/test-single-window-mode.c
@@ -0,0 +1,158 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * test-single-window-mode.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs/dialogs-types.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-scale.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimpimagewindow.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimptooloptionseditor.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+
+#define ADD_TEST(function) \
+  g_test_add_data_func ("/gimp-single-window-mode/" #function, gimp, function);
+
+
+/* Put this in the code below when you want the test to pause so you
+ * can do measurements of widgets on the screen for example
+ */
+#define GIMP_PAUSE (g_usleep (20 * 1000 * 1000))
+
+
+/**
+ * new_dockable_not_in_new_window:
+ * @data:
+ *
+ * Test that in single-window mode, new dockables are not put in new
+ * windows (they should end up in the single image window).
+ **/
+static void
+new_dockable_not_in_new_window (gconstpointer data)
+{
+  Gimp              *gimp             = GIMP (data);
+  GimpDialogFactory *factory          = gimp_dialog_factory_get_singleton ();
+  gint               dialogs_before   = 0;
+  gint               toplevels_before = 0;
+  gint               dialogs_after    = 0;
+  gint               toplevels_after  = 0;
+  GList             *dialogs;
+  GList             *iter;
+
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Count dialogs before we create the dockable */
+  dialogs        = gimp_dialog_factory_get_open_dialogs (factory);
+  dialogs_before = g_list_length (dialogs);
+  for (iter = dialogs; iter; iter = g_list_next (iter))
+    {
+      if (gtk_widget_is_toplevel (iter->data))
+        toplevels_before++;
+    }
+
+  /* Create a dockable */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "dialogs",
+                                   "dialogs-undo-history");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Count dialogs after we created the dockable */
+  dialogs        = gimp_dialog_factory_get_open_dialogs (factory);
+  dialogs_after = g_list_length (dialogs);
+  for (iter = dialogs; iter; iter = g_list_next (iter))
+    {
+      if (gtk_widget_is_toplevel (iter->data))
+        toplevels_after++;
+    }
+
+  /* We got one more session managed dialog ... */
+  g_assert_cmpint (dialogs_before + 1, ==, dialogs_after);
+  /* ... but no new toplevels */
+  g_assert_cmpint (toplevels_before, ==, toplevels_after);
+}
+
+int main(int argc, char **argv)
+{
+  Gimp  *gimp   = NULL;
+  gint   result = -1;
+
+  gimp_test_bail_if_no_display ();
+  gtk_test_init (&argc, &argv, NULL);
+
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+  gimp_test_utils_setup_menus_path ();
+
+  /* Launch GIMP in single-window mode */
+  g_setenv ("GIMP_TESTING_SESSIONRC_NAME", "sessionrc-2-8-single-window", TRUE /*overwrite*/);
+  gimp = gimp_init_for_gui_testing (TRUE /*show_gui*/);
+  gimp_test_run_mainloop_until_idle ();
+
+  ADD_TEST (new_dockable_not_in_new_window);
+
+  /* Run the tests and return status */
+  result = g_test_run ();
+
+  /* Don't write files to the source dir */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+
+  /* Exit properly so we don't break script-fu plug-in wire */
+  gimp_exit (gimp, TRUE);
+
+  return result;
+}
diff --git a/app/tests/test-tools.c b/app/tests/test-tools.c
new file mode 100644
index 0000000..8ac2b12
--- /dev/null
+++ b/app/tests/test-tools.c
@@ -0,0 +1,492 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools/tools-types.h"
+
+#include "tools/gimprectangleoptions.h"
+#include "tools/tool_manager.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-callbacks.h"
+#include "display/gimpdisplayshell-scale.h"
+#include "display/gimpdisplayshell-tool-events.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimpimagewindow.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimptooloptionseditor.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+
+#define GIMP_TEST_IMAGE_WIDTH            150
+#define GIMP_TEST_IMAGE_HEIGHT           267
+
+/* Put this in the code below when you want the test to pause so you
+ * can do measurements of widgets on the screen for example
+ */
+#define GIMP_PAUSE (g_usleep (2 * 1000 * 1000))
+
+#define ADD_TEST(function) \
+  g_test_add ("/gimp-tools/" #function, \
+              GimpTestFixture, \
+              gimp, \
+              gimp_tools_setup_image, \
+              function, \
+              gimp_tools_teardown_image);
+
+
+typedef struct
+{
+  int avoid_sizeof_zero;
+} GimpTestFixture;
+
+
+static void               gimp_tools_setup_image                         (GimpTestFixture  *fixture,
+                                                                          gconstpointer     data);
+static void               gimp_tools_teardown_image                      (GimpTestFixture  *fixture,
+                                                                          gconstpointer     data);
+static void               gimp_tools_synthesize_image_click_drag_release (GimpDisplayShell *shell,
+                                                                          gdouble           start_image_x,
+                                                                          gdouble           start_image_y,
+                                                                          gdouble           end_image_x,
+                                                                          gdouble           end_image_y,
+                                                                          gint              button,
+                                                                          GdkModifierType   modifiers);
+static GimpDisplay      * gimp_test_get_only_display                     (Gimp             *gimp);
+static GimpImage        * gimp_test_get_only_image                       (Gimp             *gimp);
+static GimpDisplayShell * gimp_test_get_only_display_shell               (Gimp             *gimp);
+
+
+static void
+gimp_tools_setup_image (GimpTestFixture *fixture,
+                        gconstpointer    data)
+{
+  Gimp *gimp = GIMP (data);
+
+  gimp_test_utils_create_image (gimp,
+                                GIMP_TEST_IMAGE_WIDTH,
+                                GIMP_TEST_IMAGE_HEIGHT);
+  gimp_test_run_mainloop_until_idle ();
+}
+
+static void
+gimp_tools_teardown_image (GimpTestFixture *fixture,
+                           gconstpointer    data)
+{
+  Gimp *gimp = GIMP (data);
+
+  g_object_unref (gimp_test_get_only_image (gimp));
+  gimp_display_close (gimp_test_get_only_display (gimp));
+  gimp_test_run_mainloop_until_idle ();
+}
+
+/**
+ * gimp_tools_set_tool:
+ * @gimp:
+ * @tool_id:
+ * @display:
+ *
+ * Makes sure the given tool is the active tool and that the passed
+ * display is the focused tool display.
+ **/
+static void
+gimp_tools_set_tool (Gimp        *gimp,
+                     const gchar *tool_id,
+                     GimpDisplay *display)
+{
+  /* Activate tool and setup active display for the new tool */
+  gimp_context_set_tool (gimp_get_user_context (gimp),
+                         gimp_get_tool_info (gimp, tool_id));
+  tool_manager_focus_display_active (gimp, display);
+}
+
+/**
+ * gimp_test_get_only_display:
+ * @gimp:
+ *
+ * Asserts that there only is one image and display and then
+ * returns the display.
+ *
+ * Returns: The #GimpDisplay.
+ **/
+static GimpDisplay *
+gimp_test_get_only_display (Gimp *gimp)
+{
+  g_assert (g_list_length (gimp_get_image_iter (gimp)) == 1);
+  g_assert (g_list_length (gimp_get_display_iter (gimp)) == 1);
+
+  return GIMP_DISPLAY (gimp_get_display_iter (gimp)->data);
+}
+
+/**
+ * gimp_test_get_only_display_shell:
+ * @gimp:
+ *
+ * Asserts that there only is one image and display shell and then
+ * returns the display shell.
+ *
+ * Returns: The #GimpDisplayShell.
+ **/
+static GimpDisplayShell *
+gimp_test_get_only_display_shell (Gimp *gimp)
+{
+  return gimp_display_get_shell (gimp_test_get_only_display (gimp));
+}
+
+/**
+ * gimp_test_get_only_image:
+ * @gimp:
+ *
+ * Asserts that there is only one image and returns that.
+ *
+ * Returns: The #GimpImage.
+ **/
+static GimpImage *
+gimp_test_get_only_image (Gimp *gimp)
+{
+  g_assert (g_list_length (gimp_get_image_iter (gimp)) == 1);
+  g_assert (g_list_length (gimp_get_display_iter (gimp)) == 1);
+
+  return GIMP_IMAGE (gimp_get_image_iter (gimp)->data);
+}
+
+static void
+gimp_test_synthesize_tool_button_event (GimpDisplayShell *shell,
+                                       gint              x,
+                                       gint              y,
+                                       gint              button,
+                                       gint              modifiers,
+                                       GdkEventType      button_event_type)
+{
+  GdkEvent   *event   = gdk_event_new (button_event_type);
+  GdkWindow  *window  = gtk_widget_get_window (GTK_WIDGET (shell->canvas));
+  GdkDisplay *display = gdk_window_get_display (window);
+
+  g_assert (button_event_type == GDK_BUTTON_PRESS ||
+            button_event_type == GDK_BUTTON_RELEASE);
+
+  event->button.window     = g_object_ref (window);
+  event->button.send_event = TRUE;
+  event->button.time       = gtk_get_current_event_time ();
+  event->button.x          = x;
+  event->button.y          = y;
+  event->button.axes       = NULL;
+  event->button.state      = 0;
+  event->button.button     = button;
+  event->button.device     = gdk_display_get_core_pointer (display);
+  event->button.x_root     = -1;
+  event->button.y_root     = -1;
+
+  gimp_display_shell_canvas_tool_events (shell->canvas,
+                                         event,
+                                         shell);
+  gdk_event_free (event);
+}
+
+static void
+gimp_test_synthesize_tool_motion_event (GimpDisplayShell *shell,
+                                        gint              x,
+                                        gint              y,
+                                        gint              modifiers)
+{
+  GdkEvent   *event   = gdk_event_new (GDK_MOTION_NOTIFY);
+  GdkWindow  *window  = gtk_widget_get_window (GTK_WIDGET (shell->canvas));
+  GdkDisplay *display = gdk_window_get_display (window);
+
+  event->motion.window     = g_object_ref (window);
+  event->motion.send_event = TRUE;
+  event->motion.time       = gtk_get_current_event_time ();
+  event->motion.x          = x;
+  event->motion.y          = y;
+  event->motion.axes       = NULL;
+  event->motion.state      = GDK_BUTTON1_MASK | modifiers;
+  event->motion.is_hint    = FALSE;
+  event->motion.device     = gdk_display_get_core_pointer (display);
+  event->motion.x_root     = -1;
+  event->motion.y_root     = -1;
+
+  gimp_display_shell_canvas_tool_events (shell->canvas,
+                                         event,
+                                         shell);
+  gdk_event_free (event);
+}
+
+static void
+gimp_test_synthesize_tool_crossing_event (GimpDisplayShell *shell,
+                                          gint              x,
+                                          gint              y,
+                                          gint              modifiers,
+                                          GdkEventType      crossing_event_type)
+{
+  GdkEvent   *event   = gdk_event_new (crossing_event_type);
+  GdkWindow  *window  = gtk_widget_get_window (GTK_WIDGET (shell->canvas));
+
+  g_assert (crossing_event_type == GDK_ENTER_NOTIFY ||
+            crossing_event_type == GDK_LEAVE_NOTIFY);
+
+  event->crossing.window     = g_object_ref (window);
+  event->crossing.send_event = TRUE;
+  event->crossing.subwindow  = NULL;
+  event->crossing.time       = gtk_get_current_event_time ();
+  event->crossing.x          = x;
+  event->crossing.y          = y;
+  event->crossing.x_root     = -1;
+  event->crossing.y_root     = -1;
+  event->crossing.mode       = GDK_CROSSING_NORMAL;
+  event->crossing.detail     = GDK_NOTIFY_UNKNOWN;
+  event->crossing.focus      = TRUE;
+  event->crossing.state      = modifiers;
+
+  gimp_display_shell_canvas_tool_events (shell->canvas,
+                                         event,
+                                         shell);
+  gdk_event_free (event);
+}
+
+static void
+gimp_tools_synthesize_image_click_drag_release (GimpDisplayShell *shell,
+                                                gdouble           start_image_x,
+                                                gdouble           start_image_y,
+                                                gdouble           end_image_x,
+                                                gdouble           end_image_y,
+                                                gint              button /*1..3*/,
+                                                GdkModifierType   modifiers)
+{
+  gdouble start_canvas_x  = -1.0;
+  gdouble start_canvas_y  = -1.0;
+  gdouble middle_canvas_x = -1.0;
+  gdouble middle_canvas_y = -1.0;
+  gdouble end_canvas_x    = -1.0;
+  gdouble end_canvas_y    = -1.0;
+
+  /* Transform coordinates */
+  gimp_display_shell_transform_xy_f (shell,
+                                     start_image_x,
+                                     start_image_y,
+                                     &start_canvas_x,
+                                     &start_canvas_y);
+  gimp_display_shell_transform_xy_f (shell,
+                                     end_image_x,
+                                     end_image_y,
+                                     &end_canvas_x,
+                                     &end_canvas_y);
+  middle_canvas_x = (start_canvas_x + end_canvas_x) / 2;
+  middle_canvas_y = (start_canvas_y + end_canvas_y) / 2;
+
+  /* Enter notify */
+  gimp_test_synthesize_tool_crossing_event (shell,
+                                            (int)start_canvas_x,
+                                            (int)start_canvas_y,
+                                            modifiers,
+                                            GDK_ENTER_NOTIFY);
+
+  /* Button press */
+  gimp_test_synthesize_tool_button_event (shell,
+                                          (int)start_canvas_x,
+                                          (int)start_canvas_y,
+                                          button,
+                                          modifiers,
+                                          GDK_BUTTON_PRESS);
+
+  /* Move events */
+  gimp_test_synthesize_tool_motion_event (shell,
+                                          (int)start_canvas_x,
+                                          (int)start_canvas_y,
+                                          modifiers);
+  gimp_test_synthesize_tool_motion_event (shell,
+                                          (int)middle_canvas_x,
+                                          (int)middle_canvas_y,
+                                          modifiers);
+  gimp_test_synthesize_tool_motion_event (shell,
+                                          (int)end_canvas_x,
+                                          (int)end_canvas_y,
+                                          modifiers);
+
+  /* Button release */
+  gimp_test_synthesize_tool_button_event (shell,
+                                          (int)end_canvas_x,
+                                          (int)end_canvas_y,
+                                          button,
+                                          modifiers,
+                                          GDK_BUTTON_RELEASE);
+
+  /* Leave notify */
+  gimp_test_synthesize_tool_crossing_event (shell,
+                                            (int)start_canvas_x,
+                                            (int)start_canvas_y,
+                                            modifiers,
+                                            GDK_LEAVE_NOTIFY);
+
+  /* Process them */
+  gimp_test_run_mainloop_until_idle ();
+}
+
+/**
+ * crop_tool_can_crop:
+ * @fixture:
+ * @data:
+ *
+ * Make sure it's possible to crop at all. Regression test for
+ * "Bug 315255 - SIGSEGV, while doing a crop".
+ **/
+static void
+crop_tool_can_crop (GimpTestFixture *fixture,
+                    gconstpointer    data)
+{
+  Gimp             *gimp  = GIMP (data);
+  GimpImage        *image = gimp_test_get_only_image (gimp);
+  GimpDisplayShell *shell = gimp_test_get_only_display_shell (gimp);
+
+  gint cropped_x = 10;
+  gint cropped_y = 10;
+  gint cropped_w = 20;
+  gint cropped_h = 30;
+
+  /* Fit display and pause and let it stabalize (two idlings seems to
+   * always be enough)
+   */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "view",
+                                   "view-shrink-wrap");
+  gimp_test_run_mainloop_until_idle ();
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Activate crop tool */
+  gimp_tools_set_tool (gimp, "gimp-crop-tool", shell->display);
+
+  /* Do the crop rect */
+  gimp_tools_synthesize_image_click_drag_release (shell,
+                                                  cropped_x,
+                                                  cropped_y,
+                                                  cropped_x + cropped_w,
+                                                  cropped_y + cropped_h,
+                                                  1 /*button*/,
+                                                  0 /*modifiers*/);
+
+  /* Crop */
+  gimp_test_utils_synthesize_key_event (GTK_WIDGET (shell), GDK_KEY_Return);
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Make sure the new image has the expected size */
+  g_assert_cmpint (cropped_w, ==, gimp_image_get_width (image));
+  g_assert_cmpint (cropped_h, ==, gimp_image_get_height (image));
+}
+
+/**
+ * crop_tool_can_crop:
+ * @fixture:
+ * @data:
+ *
+ * Make sure it's possible to change width of crop rect in tool
+ * options without there being a pending rectangle. Regression test
+ * for "Bug 322396 - Crop dimension entering causes crash".
+ **/
+static void
+crop_set_width_without_pending_rect (GimpTestFixture *fixture,
+                                     gconstpointer    data)
+{
+  Gimp                 *gimp    = GIMP (data);
+  GimpDisplay          *display = gimp_test_get_only_display (gimp);
+  GimpToolInfo         *tool_info;
+  GimpRectangleOptions *rectangle_options;
+  GtkWidget            *tool_options_gui;
+  GtkWidget            *size_entry;
+
+  /* Activate crop tool */
+  gimp_tools_set_tool (gimp, "gimp-crop-tool", display);
+
+  /* Get tool options */
+  tool_info         = gimp_get_tool_info (gimp, "gimp-crop-tool");
+  tool_options_gui  = gimp_tools_get_tool_options_gui (tool_info->tool_options);
+  rectangle_options = GIMP_RECTANGLE_OPTIONS (tool_info->tool_options);
+
+  /* Find 'Width' or 'Height' GtkTextEntry in tool options */
+  size_entry = gimp_rectangle_options_get_size_entry (rectangle_options);
+
+  /* Set arbitrary non-0 value */
+  gimp_size_entry_set_value (GIMP_SIZE_ENTRY (size_entry),
+                             0 /*field*/,
+                             42.0 /*lower*/);
+
+  /* If we don't crash, everything s fine */
+}
+
+int main(int argc, char **argv)
+{
+  Gimp *gimp   = NULL;
+  gint  result = -1;
+
+  gimp_test_bail_if_no_display ();
+  gtk_test_init (&argc, &argv, NULL);
+
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+  gimp_test_utils_setup_menus_path ();
+
+  /* Start up GIMP */
+  gimp = gimp_init_for_gui_testing (TRUE /*show_gui*/);
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Add tests */
+  ADD_TEST (crop_tool_can_crop);
+  ADD_TEST (crop_set_width_without_pending_rect);
+
+  /* Run the tests and return status */
+  result = g_test_run ();
+
+  /* Don't write files to the source dir */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+
+  /* Exit properly so we don't break script-fu plug-in wire */
+  gimp_exit (gimp, TRUE);
+
+  return result;
+}
diff --git a/app/tests/test-ui.c b/app/tests/test-ui.c
new file mode 100644
index 0000000..f67dbc2
--- /dev/null
+++ b/app/tests/test-ui.c
@@ -0,0 +1,980 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "dialogs/dialogs-types.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-scale.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimpimagewindow.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdock.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockbook.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpdockwindow.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpsessioninfo-aux.h"
+#include "widgets/gimpsessionmanaged.h"
+#include "widgets/gimptoolbox.h"
+#include "widgets/gimptooloptionseditor.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-new.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+
+#define GIMP_UI_WINDOW_POSITION_EPSILON 30
+#define GIMP_UI_POSITION_EPSILON        1
+#define GIMP_UI_ZOOM_EPSILON            0.01
+
+#define ADD_TEST(function) \
+  g_test_add_data_func ("/gimp-ui/" #function, gimp, function);
+
+
+/* Put this in the code below when you want the test to pause so you
+ * can do measurements of widgets on the screen for example
+ */
+#define GIMP_PAUSE (g_usleep (20 * 1000 * 1000))
+
+
+typedef gboolean (*GimpUiTestFunc) (GObject *object);
+
+
+static void            gimp_ui_synthesize_delete_event          (GtkWidget         *widget);
+static gboolean        gimp_ui_synthesize_click                 (GtkWidget         *widget,
+                                                                 gint               x,
+                                                                 gint               y,
+                                                                 gint               button,
+                                                                 GdkModifierType    modifiers);
+static GtkWidget     * gimp_ui_find_window                      (GimpDialogFactory *dialog_factory,
+                                                                 GimpUiTestFunc     predicate);
+static gboolean        gimp_ui_not_toolbox_window               (GObject           *object);
+static gboolean        gimp_ui_multicolumn_not_toolbox_window   (GObject           *object);
+static gboolean        gimp_ui_is_gimp_layer_list               (GObject           *object);
+static int             gimp_ui_aux_data_eqiuvalent              (gconstpointer      _a,
+                                                                 gconstpointer      _b);
+static void            gimp_ui_switch_window_mode               (Gimp              *gimp);
+
+
+/**
+ * tool_options_editor_updates:
+ * @data:
+ *
+ * Makes sure that the tool options editor is updated when the tool
+ * changes.
+ **/
+static void
+tool_options_editor_updates (gconstpointer data)
+{
+  Gimp                  *gimp         = GIMP (data);
+  GimpDisplay           *display      = GIMP_DISPLAY (gimp_get_empty_display (gimp));
+  GimpDisplayShell      *shell        = gimp_display_get_shell (display);
+  GtkWidget             *toplevel     = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+  GimpImageWindow       *image_window = GIMP_IMAGE_WINDOW (toplevel);
+  GimpUIManager         *ui_manager   = gimp_image_window_get_ui_manager (image_window);
+  GtkWidget             *dockable     = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
+                                                                        gtk_widget_get_screen (toplevel),
+                                                                        gimp_widget_get_monitor (toplevel),
+                                                                        NULL /*ui_manager*/,
+                                                                        "gimp-tool-options",
+                                                                        -1 /*view_size*/,
+                                                                        FALSE /*present*/);
+  GimpToolOptionsEditor *editor       = GIMP_TOOL_OPTIONS_EDITOR (gtk_bin_get_child (GTK_BIN (dockable)));
+
+  /* First select the rect select tool */
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "tools",
+                                   "tools-rect-select");
+  g_assert_cmpstr (GIMP_HELP_TOOL_RECT_SELECT,
+                   ==,
+                   gimp_tool_options_editor_get_tool_options (editor)->
+                   tool_info->help_id);
+
+  /* Change tool and make sure the change is taken into account by the
+   * tool options editor
+   */
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "tools",
+                                   "tools-ellipse-select");
+  g_assert_cmpstr (GIMP_HELP_TOOL_ELLIPSE_SELECT,
+                   ==,
+                   gimp_tool_options_editor_get_tool_options (editor)->
+                   tool_info->help_id);
+}
+
+static GtkWidget *
+gimp_ui_get_dialog (const gchar *identifier)
+{
+  GtkWidget *result = NULL;
+  GList     *iter;
+
+  for (iter = gimp_dialog_factory_get_open_dialogs (gimp_dialog_factory_get_singleton ());
+       iter;
+       iter = g_list_next (iter))
+    {
+      GtkWidget *dialog = GTK_WIDGET (iter->data);
+      GimpDialogFactoryEntry *entry = NULL;
+
+      gimp_dialog_factory_from_widget (dialog, &entry);
+
+      if (strcmp (entry->identifier, identifier) == 0)
+        {
+          result = dialog;
+          break;
+        }
+    }
+
+  return result;
+}
+
+static void
+automatic_tab_style (gconstpointer data)
+{
+  GtkWidget    *channel_dockable = gimp_ui_get_dialog ("gimp-channel-list");
+  GimpDockable *dockable;
+  GimpUIManager *ui_manager;
+  g_assert (channel_dockable != NULL);
+
+  dockable = GIMP_DOCKABLE (channel_dockable);
+
+  gimp_test_run_mainloop_until_idle ();
+
+  /* The channel dockable is the only dockable, it has enough space
+   * for the icon-blurb
+   */
+  g_assert_cmpint (GIMP_TAB_STYLE_ICON_BLURB,
+                   ==,
+                   gimp_dockable_get_actual_tab_style (dockable));
+
+  /* Add some dockables to the channel dockable dockbook */
+  ui_manager =
+    gimp_dockbook_get_ui_manager (gimp_dockable_get_dockbook (dockable));
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "dockable",
+                                   "dialogs-sample-points");
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "dockable",
+                                   "dialogs-vectors");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Now there is not enough space to have icon-blurb for channel
+   * dockable, make sure it's just an icon now
+   */
+  g_assert_cmpint (GIMP_TAB_STYLE_ICON,
+                   ==,
+                   gimp_dockable_get_actual_tab_style (dockable));
+
+  /* Close the two dockables we added */
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "dockable",
+                                   "dockable-close-tab");
+  gimp_ui_manager_activate_action (ui_manager,
+                                   "dockable",
+                                   "dockable-close-tab");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* We should now be back on icon-blurb */
+  g_assert_cmpint (GIMP_TAB_STYLE_ICON_BLURB,
+                   ==,
+                   gimp_dockable_get_actual_tab_style (dockable));
+}
+
+static void
+create_new_image_via_dialog (gconstpointer data)
+{
+  Gimp      *gimp = GIMP (data);
+  GimpImage *image;
+  GimpLayer *layer;
+
+  image = gimp_test_utils_create_image_from_dialog (gimp);
+
+  /* Add a layer to the image to make it more useful in later tests */
+  layer = gimp_layer_new (image,
+                          gimp_image_get_width (image),
+                          gimp_image_get_height (image),
+                          gimp_image_get_layer_format (image, TRUE),
+                          "Layer for testing",
+                          GIMP_OPACITY_OPAQUE,
+                          GIMP_LAYER_MODE_NORMAL);
+
+  gimp_image_add_layer (image, layer,
+                        GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+  gimp_test_run_mainloop_until_idle ();
+}
+
+static void
+keyboard_zoom_focus (gconstpointer data)
+{
+  Gimp              *gimp    = GIMP (data);
+  GimpDisplay       *display = GIMP_DISPLAY (gimp_get_display_iter (gimp)->data);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (display);
+  GimpImageWindow   *window  = gimp_display_shell_get_window (shell);
+  gint               image_x;
+  gint               image_y;
+  gint               shell_x_before_zoom;
+  gint               shell_y_before_zoom;
+  gdouble            factor_before_zoom;
+  gint               shell_x_after_zoom;
+  gint               shell_y_after_zoom;
+  gdouble            factor_after_zoom;
+
+  /* We need to use a point that is within the visible (exposed) part
+   * of the canvas
+   */
+  image_x = 400;
+  image_y = 50;
+
+  /* Setup zoom focus on the bottom right part of the image. We avoid
+   * 0,0 because that's essentially a particularly easy special case.
+   */
+  gimp_display_shell_transform_xy (shell,
+                                   image_x,
+                                   image_y,
+                                   &shell_x_before_zoom,
+                                   &shell_y_before_zoom);
+  gimp_display_shell_push_zoom_focus_pointer_pos (shell,
+                                                  shell_x_before_zoom,
+                                                  shell_y_before_zoom);
+  factor_before_zoom = gimp_zoom_model_get_factor (shell->zoom);
+
+  /* Do the zoom */
+  gimp_test_utils_synthesize_key_event (GTK_WIDGET (window), GDK_KEY_plus);
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Make sure the zoom focus point remained fixed */
+  gimp_display_shell_transform_xy (shell,
+                                   image_x,
+                                   image_y,
+                                   &shell_x_after_zoom,
+                                   &shell_y_after_zoom);
+  factor_after_zoom = gimp_zoom_model_get_factor (shell->zoom);
+
+  /* First of all make sure a zoom happened at all. If this assert
+   * fails, it means that the zoom didn't happen. Possible causes:
+   *
+   *  * gdk_test_simulate_key() failed to map 'GDK_KEY_plus' to the proper
+   *    'plus' X keysym, probably because it is mapped to a keycode
+   *    with modifiers like 'shift'. Run "xmodmap -pk | grep plus" to
+   *    find out. Make sure 'plus' is the first keysym for the given
+   *    keycode. If not, use "xmodmap <keycode> = plus" to correct it.
+   */
+  g_assert_cmpfloat (fabs (factor_before_zoom - factor_after_zoom),
+                     >=,
+                     GIMP_UI_ZOOM_EPSILON);
+
+#ifdef __GNUC__
+#warning disabled zoom test, it fails randomly, no clue how to fix it
+#endif
+#if 0
+  g_assert_cmpint (ABS (shell_x_after_zoom - shell_x_before_zoom),
+                   <=,
+                   GIMP_UI_POSITION_EPSILON);
+  g_assert_cmpint (ABS (shell_y_after_zoom - shell_y_before_zoom),
+                   <=,
+                   GIMP_UI_POSITION_EPSILON);
+#endif
+}
+
+/**
+ * alt_click_is_layer_to_selection:
+ * @data:
+ *
+ * Makes sure that we can alt-click on a layer to do
+ * layer-to-selection. Also makes sure that the layer clicked on is
+ * not set as the active layer.
+ **/
+static void
+alt_click_is_layer_to_selection (gconstpointer data)
+{
+#if __GNUC__
+#warning FIXME: please fix alt_click_is_layer_to_selection test
+#endif
+#if 0
+  Gimp        *gimp      = GIMP (data);
+  GimpImage   *image     = GIMP_IMAGE (gimp_get_image_iter (gimp)->data);
+  GimpChannel *selection = gimp_image_get_mask (image);
+  GimpLayer   *active_layer;
+  GtkWidget   *dockable;
+  GtkWidget   *gtk_tree_view;
+  gint         assumed_layer_x;
+  gint         assumed_empty_layer_y;
+  gint         assumed_background_layer_y;
+
+  /* Hardcode assumptions of where the layers are in the
+   * GtkTreeView. Doesn't feel worth adding proper API for this. One
+   * can just use GIMP_PAUSE and re-measure new coordinates if we
+   * start to layout layers in the GtkTreeView differently
+   */
+  assumed_layer_x            = 96;
+  assumed_empty_layer_y      = 16;
+  assumed_background_layer_y = 42;
+
+  /* Store the active layer, it shall not change during the execution
+   * of this test
+   */
+  active_layer = gimp_image_get_active_layer (image);
+
+  /* Find the layer tree view to click in. Note that there is a
+   * potential problem with gtk_test_find_widget and GtkNotebook: it
+   * will return e.g. a GtkTreeView from another page if that page is
+   * "on top" of the reference label.
+   */
+  dockable = gimp_ui_find_window (gimp_dialog_factory_get_singleton (),
+                                  gimp_ui_is_gimp_layer_list);
+  gtk_tree_view = gtk_test_find_widget (dockable,
+                                        "Lock:",
+                                        GTK_TYPE_TREE_VIEW);
+
+  /* First make sure there is no selection */
+  g_assert (gimp_channel_is_empty (selection));
+
+  /* Now simulate alt-click on the background layer */
+  g_assert (gimp_ui_synthesize_click (gtk_tree_view,
+                                      assumed_layer_x,
+                                      assumed_background_layer_y,
+                                      1 /*button*/,
+                                      GDK_MOD1_MASK));
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Make sure we got a selection and that the active layer didn't
+   * change
+   */
+  g_assert (! gimp_channel_is_empty (selection));
+  g_assert (gimp_image_get_active_layer (image) == active_layer);
+
+  /* Now simulate alt-click on the empty layer */
+  g_assert (gimp_ui_synthesize_click (gtk_tree_view,
+                                      assumed_layer_x,
+                                      assumed_empty_layer_y,
+                                      1 /*button*/,
+                                      GDK_MOD1_MASK));
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Make sure that emptied the selection and that the active layer
+   * still didn't change
+   */
+  g_assert (gimp_channel_is_empty (selection));
+  g_assert (gimp_image_get_active_layer (image) == active_layer);
+#endif
+}
+
+static void
+restore_recently_closed_multi_column_dock (gconstpointer data)
+{
+  Gimp      *gimp                          = GIMP (data);
+  GtkWidget *dock_window                   = NULL;
+  gint       n_session_infos_before_close  = -1;
+  gint       n_session_infos_after_close   = -1;
+  gint       n_session_infos_after_restore = -1;
+  GList     *session_infos                 = NULL;
+
+  /* Find a non-toolbox dock window */
+  dock_window = gimp_ui_find_window (gimp_dialog_factory_get_singleton (),
+                                     gimp_ui_multicolumn_not_toolbox_window);
+  g_assert (dock_window != NULL);
+
+  /* Count number of docks */
+  session_infos = gimp_dialog_factory_get_session_infos (gimp_dialog_factory_get_singleton ());
+  n_session_infos_before_close = g_list_length (session_infos);
+
+  /* Close one of the dock windows */
+  gimp_ui_synthesize_delete_event (GTK_WIDGET (dock_window));
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Make sure the number of session infos went down */
+  session_infos = gimp_dialog_factory_get_session_infos (gimp_dialog_factory_get_singleton ());
+  n_session_infos_after_close = g_list_length (session_infos);
+  g_assert_cmpint (n_session_infos_before_close,
+                   >,
+                   n_session_infos_after_close);
+
+#ifdef __GNUC__
+#warning FIXME test disabled until we depend on GTK+ >= 2.24.11
+#endif
+#if 0
+  /* Restore the (only available) closed dock and make sure the session
+   * infos in the global dock factory are increased again
+   */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "windows",
+                                   /* FIXME: This is severely hardcoded */
+                                   "windows-recent-0003");
+  gimp_test_run_mainloop_until_idle ();
+  session_infos = gimp_dialog_factory_get_session_infos (gimp_dialog_factory_get_singleton ());
+  n_session_infos_after_restore = g_list_length (session_infos);
+  g_assert_cmpint (n_session_infos_after_close,
+                   <,
+                   n_session_infos_after_restore);
+#endif
+}
+
+/**
+ * tab_toggle_dont_change_dock_window_position:
+ * @data:
+ *
+ * Makes sure that when dock windows are hidden with Tab and shown
+ * again, their positions and sizes are not changed. We don't really
+ * use Tab though, we only simulate its effect.
+ **/
+static void
+tab_toggle_dont_change_dock_window_position (gconstpointer data)
+{
+  Gimp      *gimp          = GIMP (data);
+  GtkWidget *dock_window   = NULL;
+  gint       x_before_hide = -1;
+  gint       y_before_hide = -1;
+  gint       w_before_hide = -1;
+  gint       h_before_hide = -1;
+  gint       x_after_show  = -1;
+  gint       y_after_show  = -1;
+  gint       w_after_show  = -1;
+  gint       h_after_show  = -1;
+
+  /* Find a non-toolbox dock window */
+  dock_window = gimp_ui_find_window (gimp_dialog_factory_get_singleton (),
+                                     gimp_ui_not_toolbox_window);
+  g_assert (dock_window != NULL);
+  g_assert (gtk_widget_get_visible (dock_window));
+
+  /* Get the position and size */
+  gimp_test_run_mainloop_until_idle ();
+  gtk_window_get_position (GTK_WINDOW (dock_window),
+                           &x_before_hide,
+                           &y_before_hide);
+  gtk_window_get_size (GTK_WINDOW (dock_window),
+                       &w_before_hide,
+                       &h_before_hide);
+
+  /* Hide all dock windows */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "windows",
+                                   "windows-hide-docks");
+  gimp_test_run_mainloop_until_idle ();
+  g_assert (! gtk_widget_get_visible (dock_window));
+
+  /* Show them again */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "windows",
+                                   "windows-hide-docks");
+  gimp_test_run_mainloop_until_idle ();
+  g_assert (gtk_widget_get_visible (dock_window));
+
+  /* Get the position and size again and make sure it's the same as
+   * before
+   */
+  gtk_window_get_position (GTK_WINDOW (dock_window),
+                           &x_after_show,
+                           &y_after_show);
+  gtk_window_get_size (GTK_WINDOW (dock_window),
+                       &w_after_show,
+                       &h_after_show);
+  g_assert_cmpint ((int)abs (x_before_hide - x_after_show), <=, GIMP_UI_WINDOW_POSITION_EPSILON);
+  g_assert_cmpint ((int)abs (y_before_hide - y_after_show), <=, GIMP_UI_WINDOW_POSITION_EPSILON);
+  g_assert_cmpint ((int)abs (w_before_hide - w_after_show), <=, GIMP_UI_WINDOW_POSITION_EPSILON);
+  g_assert_cmpint ((int)abs (h_before_hide - h_after_show), <=, GIMP_UI_WINDOW_POSITION_EPSILON);
+}
+
+static void
+switch_to_single_window_mode (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+
+  /* Switch to single-window mode. We consider this test as passed if
+   * we don't get any GLib warnings/errors
+   */
+  gimp_ui_switch_window_mode (gimp);
+}
+
+static void
+gimp_ui_toggle_docks_in_single_window_mode (Gimp *gimp)
+{
+  GimpDisplay      *display       = GIMP_DISPLAY (gimp_get_display_iter (gimp)->data);
+  GimpDisplayShell *shell         = gimp_display_get_shell (display);
+  GtkWidget        *toplevel      = GTK_WIDGET (gimp_display_shell_get_window (shell));
+  gint              x_temp        = -1;
+  gint              y_temp        = -1;
+  gint              x_before_hide = -1;
+  gint              y_before_hide = -1;
+  gint              x_after_hide  = -1;
+  gint              y_after_hide  = -1;
+  g_assert (shell);
+  g_assert (toplevel);
+
+  /* Get toplevel coordinate of image origin */
+  gimp_test_run_mainloop_until_idle ();
+  gimp_display_shell_transform_xy (shell,
+                                   0.0, 0.0,
+                                   &x_temp, &y_temp);
+  gtk_widget_translate_coordinates (GTK_WIDGET (shell),
+                                    toplevel,
+                                    x_temp, y_temp,
+                                    &x_before_hide, &y_before_hide);
+
+  /* Hide all dock windows */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "windows",
+                                   "windows-hide-docks");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Get toplevel coordinate of image origin */
+  gimp_test_run_mainloop_until_idle ();
+  gimp_display_shell_transform_xy (shell,
+                                   0.0, 0.0,
+                                   &x_temp, &y_temp);
+  gtk_widget_translate_coordinates (GTK_WIDGET (shell),
+                                    toplevel,
+                                    x_temp, y_temp,
+                                    &x_after_hide, &y_after_hide);
+
+  g_assert_cmpint ((int)abs (x_after_hide - x_before_hide), <=, GIMP_UI_POSITION_EPSILON);
+  g_assert_cmpint ((int)abs (y_after_hide - y_before_hide), <=, GIMP_UI_POSITION_EPSILON);
+}
+
+static void
+hide_docks_in_single_window_mode (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+  gimp_ui_toggle_docks_in_single_window_mode (gimp);
+}
+
+static void
+show_docks_in_single_window_mode (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+  gimp_ui_toggle_docks_in_single_window_mode (gimp);
+}
+
+static void
+maximize_state_in_aux_data (gconstpointer data)
+{
+  Gimp               *gimp    = GIMP (data);
+  GimpDisplay        *display = GIMP_DISPLAY (gimp_get_display_iter (gimp)->data);
+  GimpDisplayShell   *shell   = gimp_display_get_shell (display);
+  GimpImageWindow    *window  = gimp_display_shell_get_window (shell);
+  gint                i;
+
+  for (i = 0; i < 2; i++)
+    {
+      GList              *aux_info = NULL;
+      GimpSessionInfoAux *target_info;
+      gboolean            target_max_state;
+
+      if (i == 0)
+        {
+          target_info = gimp_session_info_aux_new ("maximized" , "yes");
+          target_max_state = TRUE;
+        }
+      else
+        {
+          target_info = gimp_session_info_aux_new ("maximized", "no");
+          target_max_state = FALSE;
+        }
+
+      /* Set the aux info to out target data */
+      aux_info = g_list_append (aux_info, target_info);
+      gimp_session_managed_set_aux_info (GIMP_SESSION_MANAGED (window), aux_info);
+      g_list_free (aux_info);
+
+      /* Give the WM a chance to maximize/unmaximize us */
+      gimp_test_run_mainloop_until_idle ();
+      g_usleep (500 * 1000);
+      gimp_test_run_mainloop_until_idle ();
+
+      /* Make sure the maximize/unmaximize happened */
+      g_assert (gimp_image_window_is_maximized (window) == target_max_state);
+
+      /* Make sure we can read out the window state again */
+      aux_info = gimp_session_managed_get_aux_info (GIMP_SESSION_MANAGED (window));
+      g_assert (g_list_find_custom (aux_info, target_info, gimp_ui_aux_data_eqiuvalent));
+      g_list_free_full (aux_info,
+                        (GDestroyNotify) gimp_session_info_aux_free);
+
+      gimp_session_info_aux_free (target_info);
+    }
+}
+
+static void
+switch_back_to_multi_window_mode (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+
+  /* Switch back to multi-window mode. We consider this test as passed
+   * if we don't get any GLib warnings/errors
+   */
+  gimp_ui_switch_window_mode (gimp);
+}
+
+static void
+close_image (gconstpointer data)
+{
+  Gimp *gimp       = GIMP (data);
+  int   undo_count = 4;
+
+  /* Undo all changes so we don't need to find the 'Do you want to
+   * save?'-dialog and its 'No' button
+   */
+  while (undo_count--)
+    {
+      gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                       "edit",
+                                       "edit-undo");
+      gimp_test_run_mainloop_until_idle ();
+    }
+
+  /* Close the image */
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "view",
+                                   "view-close");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Did it really disappear? */
+  g_assert_cmpint (g_list_length (gimp_get_image_iter (gimp)), ==, 0);
+}
+
+/**
+ * repeatedly_switch_window_mode:
+ * @data:
+ *
+ * Makes sure that the size of the image window is properly handled
+ * when repeatedly switching between window modes.
+ **/
+static void
+repeatedly_switch_window_mode (gconstpointer data)
+{
+#ifdef __GNUC__
+#warning FIXME: plesase fix repeatedly_switch_window_mode test
+#endif
+#if 0
+  Gimp             *gimp     = GIMP (data);
+  GimpDisplay      *display  = GIMP_DISPLAY (gimp_get_empty_display (gimp));
+  GimpDisplayShell *shell    = gimp_display_get_shell (display);
+  GtkWidget        *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+  gint expected_initial_height;
+  gint expected_initial_width;
+  gint expected_second_height;
+  gint expected_second_width;
+  gint initial_width;
+  gint initial_height;
+  gint second_width;
+  gint second_height;
+
+  /* We need this for some reason */
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Remember the multi-window mode size */
+  gtk_window_get_size (GTK_WINDOW (toplevel),
+                       &expected_initial_width,
+                       &expected_initial_height);
+
+  /* Switch to single-window mode */
+  gimp_ui_switch_window_mode (gimp);
+
+  /* Remember the single-window mode size */
+  gtk_window_get_size (GTK_WINDOW (toplevel),
+                       &expected_second_width,
+                       &expected_second_height);
+
+  /* Make sure they differ, otherwise the test is pointless */
+  g_assert_cmpint (expected_initial_width,  !=, expected_second_width);
+  g_assert_cmpint (expected_initial_height, !=, expected_second_height);
+
+  /* Switch back to multi-window mode */
+  gimp_ui_switch_window_mode (gimp);
+
+  /* Make sure the size is the same as before */
+  gtk_window_get_size (GTK_WINDOW (toplevel), &initial_width, &initial_height);
+  g_assert_cmpint (expected_initial_width,  ==, initial_width);
+  g_assert_cmpint (expected_initial_height, ==, initial_height);
+
+  /* Switch to single-window mode again... */
+  gimp_ui_switch_window_mode (gimp);
+
+  /* Make sure the size is the same as before */
+  gtk_window_get_size (GTK_WINDOW (toplevel), &second_width, &second_height);
+  g_assert_cmpint (expected_second_width,  ==, second_width);
+  g_assert_cmpint (expected_second_height, ==, second_height);
+
+  /* Finally switch back to multi-window mode since that was the mode
+   * when we started
+   */
+  gimp_ui_switch_window_mode (gimp);
+#endif
+}
+
+/**
+ * window_roles:
+ * @data:
+ *
+ * Makes sure that different windows have the right roles specified.
+ **/
+static void
+window_roles (gconstpointer data)
+{
+  GtkWidget      *dock           = NULL;
+  GtkWidget      *toolbox        = NULL;
+  GimpDockWindow *dock_window    = NULL;
+  GimpDockWindow *toolbox_window = NULL;
+
+  dock           = gimp_dock_with_window_new (gimp_dialog_factory_get_singleton (),
+                                              gdk_screen_get_default (),
+                                              0,
+                                              FALSE /*toolbox*/);
+  toolbox        = gimp_dock_with_window_new (gimp_dialog_factory_get_singleton (),
+                                              gdk_screen_get_default (),
+                                              0,
+                                              TRUE /*toolbox*/);
+  dock_window    = gimp_dock_window_from_dock (GIMP_DOCK (dock));
+  toolbox_window = gimp_dock_window_from_dock (GIMP_DOCK (toolbox));
+
+  g_assert_cmpint (g_str_has_prefix (gtk_window_get_role (GTK_WINDOW (dock_window)), "gimp-dock-"), ==,
+                   TRUE);
+  g_assert_cmpint (g_str_has_prefix (gtk_window_get_role (GTK_WINDOW (toolbox_window)), "gimp-toolbox-"), ==,
+                   TRUE);
+
+  /* When we get here we have a ref count of one, but the signals we
+   * emit cause the reference count to become less than zero for some
+   * reason. So we're lazy and simply ignore to unref these
+  g_object_unref (toolbox);
+  g_object_unref (dock);
+   */
+}
+
+static void
+paintbrush_is_standard_tool (gconstpointer data)
+{
+  Gimp         *gimp         = GIMP (data);
+  GimpContext  *user_context = gimp_get_user_context (gimp);
+  GimpToolInfo *tool_info    = gimp_context_get_tool (user_context);
+
+  g_assert_cmpstr (tool_info->help_id,
+                   ==,
+                   "gimp-tool-paintbrush");
+}
+
+/**
+ * gimp_ui_synthesize_delete_event:
+ * @widget:
+ *
+ * Synthesize a delete event to @widget.
+ **/
+static void
+gimp_ui_synthesize_delete_event (GtkWidget *widget)
+{
+  GdkWindow *window = NULL;
+  GdkEvent *event = NULL;
+
+  window = gtk_widget_get_window (widget);
+  g_assert (window);
+
+  event = gdk_event_new (GDK_DELETE);
+  event->any.window     = g_object_ref (window);
+  event->any.send_event = TRUE;
+  gtk_main_do_event (event);
+  gdk_event_free (event);
+}
+
+static gboolean
+gimp_ui_synthesize_click (GtkWidget       *widget,
+                          gint             x,
+                          gint             y,
+                          gint             button, /*1..3*/
+                          GdkModifierType  modifiers)
+{
+  return (gdk_test_simulate_button (gtk_widget_get_window (widget),
+                                    x, y,
+                                    button,
+                                    modifiers,
+                                    GDK_BUTTON_PRESS) &&
+          gdk_test_simulate_button (gtk_widget_get_window (widget),
+                                    x, y,
+                                    button,
+                                    modifiers,
+                                    GDK_BUTTON_RELEASE));
+}
+
+static GtkWidget *
+gimp_ui_find_window (GimpDialogFactory *dialog_factory,
+                     GimpUiTestFunc     predicate)
+{
+  GList     *iter        = NULL;
+  GtkWidget *dock_window = NULL;
+
+  g_return_val_if_fail (predicate != NULL, NULL);
+
+  for (iter = gimp_dialog_factory_get_session_infos (dialog_factory);
+       iter;
+       iter = g_list_next (iter))
+    {
+      GtkWidget *widget = gimp_session_info_get_widget (iter->data);
+
+      if (predicate (G_OBJECT (widget)))
+        {
+          dock_window = widget;
+          break;
+        }
+    }
+
+  return dock_window;
+}
+
+static gboolean
+gimp_ui_not_toolbox_window (GObject *object)
+{
+  return (GIMP_IS_DOCK_WINDOW (object) &&
+          ! gimp_dock_window_has_toolbox (GIMP_DOCK_WINDOW (object)));
+}
+
+static gboolean
+gimp_ui_multicolumn_not_toolbox_window (GObject *object)
+{
+  gboolean           not_toolbox_window;
+  GimpDockWindow    *dock_window;
+  GimpDockContainer *dock_container;
+  GList             *docks;
+
+  if (! GIMP_IS_DOCK_WINDOW (object))
+    return FALSE;
+
+  dock_window    = GIMP_DOCK_WINDOW (object);
+  dock_container = GIMP_DOCK_CONTAINER (object);
+  docks          = gimp_dock_container_get_docks (dock_container);
+
+  not_toolbox_window = (! gimp_dock_window_has_toolbox (dock_window) &&
+                        g_list_length (docks) > 1);
+
+  g_list_free (docks);
+
+  return not_toolbox_window;
+}
+
+static gboolean
+gimp_ui_is_gimp_layer_list (GObject *object)
+{
+  GimpDialogFactoryEntry *entry = NULL;
+
+  if (! GTK_IS_WIDGET (object))
+    return FALSE;
+
+  gimp_dialog_factory_from_widget (GTK_WIDGET (object), &entry);
+
+  return strcmp (entry->identifier, "gimp-layer-list") == 0;
+}
+
+static int
+gimp_ui_aux_data_eqiuvalent (gconstpointer _a, gconstpointer _b)
+{
+  GimpSessionInfoAux *a = (GimpSessionInfoAux*) _a;
+  GimpSessionInfoAux *b = (GimpSessionInfoAux*) _b;
+  return (strcmp (a->name, b->name) || strcmp (a->value, b->value));
+}
+
+static void
+gimp_ui_switch_window_mode (Gimp *gimp)
+{
+  gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp),
+                                   "windows",
+                                   "windows-use-single-window-mode");
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Add a small sleep to let things stabilize */
+  g_usleep (500 * 1000);
+  gimp_test_run_mainloop_until_idle ();
+}
+
+int main(int argc, char **argv)
+{
+  Gimp *gimp   = NULL;
+  gint  result = -1;
+
+  gimp_test_bail_if_no_display ();
+  gtk_test_init (&argc, &argv, NULL);
+
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+  gimp_test_utils_setup_menus_path ();
+
+  /* Start up GIMP */
+  gimp = gimp_init_for_gui_testing (TRUE /*show_gui*/);
+  gimp_test_run_mainloop_until_idle ();
+
+  /* Add tests. Note that the order matters. For example,
+   * 'paintbrush_is_standard_tool' can't be after
+   * 'tool_options_editor_updates'
+   */
+  ADD_TEST (paintbrush_is_standard_tool);
+  ADD_TEST (tool_options_editor_updates);
+  ADD_TEST (automatic_tab_style);
+  ADD_TEST (create_new_image_via_dialog);
+  ADD_TEST (keyboard_zoom_focus);
+  ADD_TEST (alt_click_is_layer_to_selection);
+  ADD_TEST (restore_recently_closed_multi_column_dock);
+  ADD_TEST (tab_toggle_dont_change_dock_window_position);
+  ADD_TEST (switch_to_single_window_mode);
+#warning FIXME: hide/show docks doesn't work when running make check
+#if 0
+  ADD_TEST (hide_docks_in_single_window_mode);
+  ADD_TEST (show_docks_in_single_window_mode);
+#endif
+#warning FIXME: maximize_state_in_aux_data doesn't work without WM
+#if 0
+  ADD_TEST (maximize_state_in_aux_data);
+#endif
+  ADD_TEST (switch_back_to_multi_window_mode);
+  ADD_TEST (close_image);
+  ADD_TEST (repeatedly_switch_window_mode);
+  ADD_TEST (window_roles);
+
+  /* Run the tests and return status */
+  result = g_test_run ();
+
+  /* Don't write files to the source dir */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+
+  /* Exit properly so we don't break script-fu plug-in wire */
+  gimp_exit (gimp, TRUE);
+
+  return result;
+}
diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c
new file mode 100644
index 0000000..1ce7b08
--- /dev/null
+++ b/app/tests/test-xcf.c
@@ -0,0 +1,1016 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 2009 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "widgets/widgets-types.h"
+
+#include "widgets/gimpuimanager.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpgrid.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-new.h"
+#include "core/gimpsamplepoint.h"
+#include "core/gimpselection.h"
+
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "file/file-open.h"
+#include "file/file-save.h"
+
+#include "tests.h"
+
+#include "gimp-app-test-utils.h"
+
+
+/* we continue to use LEGACY layers for testing, so we can use the
+ * same test image for all tests, including loading
+ * files/gimp-2-6-file.xcf which can't have any non-LEGACY modes
+ */
+
+#define GIMP_MAINIMAGE_WIDTH            100
+#define GIMP_MAINIMAGE_HEIGHT           90
+#define GIMP_MAINIMAGE_TYPE             GIMP_RGB
+#define GIMP_MAINIMAGE_PRECISION        GIMP_PRECISION_U8_GAMMA
+
+#define GIMP_MAINIMAGE_LAYER1_NAME      "layer1"
+#define GIMP_MAINIMAGE_LAYER1_WIDTH     50
+#define GIMP_MAINIMAGE_LAYER1_HEIGHT    51
+#define GIMP_MAINIMAGE_LAYER1_FORMAT    babl_format ("R'G'B'A u8")
+#define GIMP_MAINIMAGE_LAYER1_OPACITY   GIMP_OPACITY_OPAQUE
+#define GIMP_MAINIMAGE_LAYER1_MODE      GIMP_LAYER_MODE_NORMAL_LEGACY
+
+#define GIMP_MAINIMAGE_LAYER2_NAME      "layer2"
+#define GIMP_MAINIMAGE_LAYER2_WIDTH     25
+#define GIMP_MAINIMAGE_LAYER2_HEIGHT    251
+#define GIMP_MAINIMAGE_LAYER2_FORMAT    babl_format ("R'G'B' u8")
+#define GIMP_MAINIMAGE_LAYER2_OPACITY   GIMP_OPACITY_TRANSPARENT
+#define GIMP_MAINIMAGE_LAYER2_MODE      GIMP_LAYER_MODE_MULTIPLY_LEGACY
+
+#define GIMP_MAINIMAGE_GROUP1_NAME      "group1"
+
+#define GIMP_MAINIMAGE_LAYER3_NAME      "layer3"
+
+#define GIMP_MAINIMAGE_LAYER4_NAME      "layer4"
+
+#define GIMP_MAINIMAGE_GROUP2_NAME      "group2"
+
+#define GIMP_MAINIMAGE_LAYER5_NAME      "layer5"
+
+#define GIMP_MAINIMAGE_VGUIDE1_POS      42
+#define GIMP_MAINIMAGE_VGUIDE2_POS      82
+#define GIMP_MAINIMAGE_HGUIDE1_POS      3
+#define GIMP_MAINIMAGE_HGUIDE2_POS      4
+
+#define GIMP_MAINIMAGE_SAMPLEPOINT1_X   10
+#define GIMP_MAINIMAGE_SAMPLEPOINT1_Y   12
+#define GIMP_MAINIMAGE_SAMPLEPOINT2_X   41
+#define GIMP_MAINIMAGE_SAMPLEPOINT2_Y   49
+
+#define GIMP_MAINIMAGE_RESOLUTIONX      400
+#define GIMP_MAINIMAGE_RESOLUTIONY      410
+
+#define GIMP_MAINIMAGE_PARASITE_NAME    "test-parasite"
+#define GIMP_MAINIMAGE_PARASITE_DATA    "foo"
+#define GIMP_MAINIMAGE_PARASITE_SIZE    4                /* 'f' 'o' 'o' '\0' */
+
+#define GIMP_MAINIMAGE_COMMENT          "Created with code from "\
+                                        "app/tests/test-xcf.c in the GIMP "\
+                                        "source tree, i.e. it was not created "\
+                                        "manually and may thus look weird if "\
+                                        "opened and inspected in GIMP."
+
+#define GIMP_MAINIMAGE_UNIT             GIMP_UNIT_PICA
+
+#define GIMP_MAINIMAGE_GRIDXSPACING     25.0
+#define GIMP_MAINIMAGE_GRIDYSPACING     27.0
+
+#define GIMP_MAINIMAGE_CHANNEL1_NAME    "channel1"
+#define GIMP_MAINIMAGE_CHANNEL1_WIDTH   GIMP_MAINIMAGE_WIDTH
+#define GIMP_MAINIMAGE_CHANNEL1_HEIGHT  GIMP_MAINIMAGE_HEIGHT
+#define GIMP_MAINIMAGE_CHANNEL1_COLOR   { 1.0, 0.0, 1.0, 1.0 }
+
+#define GIMP_MAINIMAGE_SELECTION_X      5
+#define GIMP_MAINIMAGE_SELECTION_Y      6
+#define GIMP_MAINIMAGE_SELECTION_W      7
+#define GIMP_MAINIMAGE_SELECTION_H      8
+
+#define GIMP_MAINIMAGE_VECTORS1_NAME    "vectors1"
+#define GIMP_MAINIMAGE_VECTORS1_COORDS  { { 11.0, 12.0, /* pad zeroes */ },\
+                                          { 21.0, 22.0, /* pad zeroes */ },\
+                                          { 31.0, 32.0, /* pad zeroes */ }, }
+
+#define GIMP_MAINIMAGE_VECTORS2_NAME    "vectors2"
+#define GIMP_MAINIMAGE_VECTORS2_COORDS  { { 911.0, 912.0, /* pad zeroes */ },\
+                                          { 921.0, 922.0, /* pad zeroes */ },\
+                                          { 931.0, 932.0, /* pad zeroes */ }, }
+
+#define ADD_TEST(function) \
+  g_test_add_data_func ("/gimp-xcf/" #function, gimp, function);
+
+
+GimpImage        * gimp_test_load_image                        (Gimp            *gimp,
+                                                                GFile           *file);
+static void        gimp_write_and_read_file                    (Gimp            *gimp,
+                                                                gboolean         with_unusual_stuff,
+                                                                gboolean         compat_paths,
+                                                                gboolean         use_gimp_2_8_features);
+static GimpImage * gimp_create_mainimage                       (Gimp            *gimp,
+                                                                gboolean         with_unusual_stuff,
+                                                                gboolean         compat_paths,
+                                                                gboolean         use_gimp_2_8_features);
+static void        gimp_assert_mainimage                       (GimpImage       *image,
+                                                                gboolean         with_unusual_stuff,
+                                                                gboolean         compat_paths,
+                                                                gboolean         use_gimp_2_8_features);
+
+
+/**
+ * write_and_read_gimp_2_6_format:
+ * @data:
+ *
+ * Do a write and read test on a file that could as well be
+ * constructed with GIMP 2.6.
+ **/
+static void
+write_and_read_gimp_2_6_format (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+
+  gimp_write_and_read_file (gimp,
+                            FALSE /*with_unusual_stuff*/,
+                            FALSE /*compat_paths*/,
+                            FALSE /*use_gimp_2_8_features*/);
+}
+
+/**
+ * write_and_read_gimp_2_6_format_unusual:
+ * @data:
+ *
+ * Do a write and read test on a file that could as well be
+ * constructed with GIMP 2.6, and make it unusual, like compatible
+ * vectors and with a floating selection.
+ **/
+static void
+write_and_read_gimp_2_6_format_unusual (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+
+  gimp_write_and_read_file (gimp,
+                            TRUE /*with_unusual_stuff*/,
+                            TRUE /*compat_paths*/,
+                            FALSE /*use_gimp_2_8_features*/);
+}
+
+/**
+ * load_gimp_2_6_file:
+ * @data:
+ *
+ * Loads a file created with GIMP 2.6 and makes sure it loaded as
+ * expected.
+ **/
+static void
+load_gimp_2_6_file (gconstpointer data)
+{
+  Gimp      *gimp = GIMP (data);
+  GimpImage *image;
+  gchar     *filename;
+  GFile     *file;
+
+  filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"),
+                               "app/tests/files/gimp-2-6-file.xcf",
+                               NULL);
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+
+  image = gimp_test_load_image (gimp, file);
+
+  /* The image file was constructed by running
+   * gimp_write_and_read_file (FALSE, FALSE) in GIMP 2.6 by
+   * copy-pasting the code to GIMP 2.6 and adapting it to changes in
+   * the core API, so we can use gimp_assert_mainimage() to make sure
+   * the file was loaded successfully.
+   */
+  gimp_assert_mainimage (image,
+                         FALSE /*with_unusual_stuff*/,
+                         FALSE /*compat_paths*/,
+                         FALSE /*use_gimp_2_8_features*/);
+}
+
+/**
+ * write_and_read_gimp_2_8_format:
+ * @data:
+ *
+ * Writes an XCF file that uses GIMP 2.8 features such as layer
+ * groups, then reads the file and make sure no relevant information
+ * was lost.
+ **/
+static void
+write_and_read_gimp_2_8_format (gconstpointer data)
+{
+  Gimp *gimp = GIMP (data);
+
+  gimp_write_and_read_file (gimp,
+                            FALSE /*with_unusual_stuff*/,
+                            FALSE /*compat_paths*/,
+                            TRUE /*use_gimp_2_8_features*/);
+}
+
+GimpImage *
+gimp_test_load_image (Gimp  *gimp,
+                      GFile *file)
+{
+  GimpPlugInProcedure *proc;
+  GimpImage           *image;
+  GimpPDBStatusType    unused;
+
+  proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
+                                                   GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                   file,
+                                                   NULL /*error*/);
+  image = file_open_image (gimp,
+                           gimp_get_user_context (gimp),
+                           NULL /*progress*/,
+                           file,
+                           file,
+                           FALSE /*as_new*/,
+                           proc,
+                           GIMP_RUN_NONINTERACTIVE,
+                           &unused /*status*/,
+                           NULL /*mime_type*/,
+                           NULL /*error*/);
+
+  return image;
+}
+
+/**
+ * gimp_write_and_read_file:
+ *
+ * Constructs the main test image and asserts its state, writes it to
+ * a file, reads the image from the file, and asserts the state of the
+ * loaded file. The function takes various parameters so the same
+ * function can be used for different formats.
+ **/
+static void
+gimp_write_and_read_file (Gimp     *gimp,
+                          gboolean  with_unusual_stuff,
+                          gboolean  compat_paths,
+                          gboolean  use_gimp_2_8_features)
+{
+  GimpImage           *image;
+  GimpImage           *loaded_image;
+  GimpPlugInProcedure *proc;
+  gchar               *filename;
+  GFile               *file;
+
+  /* Create the image */
+  image = gimp_create_mainimage (gimp,
+                                 with_unusual_stuff,
+                                 compat_paths,
+                                 use_gimp_2_8_features);
+
+  /* Assert valid state */
+  gimp_assert_mainimage (image,
+                         with_unusual_stuff,
+                         compat_paths,
+                         use_gimp_2_8_features);
+
+  /* Write to file */
+  filename = g_build_filename (g_get_tmp_dir (), "gimp-test.xcf", NULL);
+  file = g_file_new_for_path (filename);
+  g_free (filename);
+
+  proc = gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                   GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                                                   file,
+                                                   NULL /*error*/);
+  file_save (gimp,
+             image,
+             NULL /*progress*/,
+             file,
+             proc,
+             GIMP_RUN_NONINTERACTIVE,
+             FALSE /*change_saved_state*/,
+             FALSE /*export_backward*/,
+             FALSE /*export_forward*/,
+             NULL /*error*/);
+
+  /* Load from file */
+  loaded_image = gimp_test_load_image (image->gimp, file);
+
+  /* Assert on the loaded file. If success, it means that there is no
+   * significant information loss when we wrote the image to a file
+   * and loaded it again
+   */
+  gimp_assert_mainimage (loaded_image,
+                         with_unusual_stuff,
+                         compat_paths,
+                         use_gimp_2_8_features);
+
+  g_file_delete (file, NULL, NULL);
+  g_object_unref (file);
+}
+
+/**
+ * gimp_create_mainimage:
+ *
+ * Creates the main test image, i.e. the image that we use for most of
+ * our XCF testing purposes.
+ *
+ * Returns: The #GimpImage
+ **/
+static GimpImage *
+gimp_create_mainimage (Gimp     *gimp,
+                       gboolean  with_unusual_stuff,
+                       gboolean  compat_paths,
+                       gboolean  use_gimp_2_8_features)
+{
+  GimpImage     *image             = NULL;
+  GimpLayer     *layer             = NULL;
+  GimpParasite  *parasite          = NULL;
+  GimpGrid      *grid              = NULL;
+  GimpChannel   *channel           = NULL;
+  GimpRGB        channel_color     = GIMP_MAINIMAGE_CHANNEL1_COLOR;
+  GimpChannel   *selection         = NULL;
+  GimpVectors   *vectors           = NULL;
+  GimpCoords     vectors1_coords[] = GIMP_MAINIMAGE_VECTORS1_COORDS;
+  GimpCoords     vectors2_coords[] = GIMP_MAINIMAGE_VECTORS2_COORDS;
+  GimpStroke    *stroke            = NULL;
+  GimpLayerMask *layer_mask        = NULL;
+
+  /* Image size and type */
+  image = gimp_image_new (gimp,
+                          GIMP_MAINIMAGE_WIDTH,
+                          GIMP_MAINIMAGE_HEIGHT,
+                          GIMP_MAINIMAGE_TYPE,
+                          GIMP_MAINIMAGE_PRECISION);
+
+  /* Layers */
+  layer = gimp_layer_new (image,
+                          GIMP_MAINIMAGE_LAYER1_WIDTH,
+                          GIMP_MAINIMAGE_LAYER1_HEIGHT,
+                          GIMP_MAINIMAGE_LAYER1_FORMAT,
+                          GIMP_MAINIMAGE_LAYER1_NAME,
+                          GIMP_MAINIMAGE_LAYER1_OPACITY,
+                          GIMP_MAINIMAGE_LAYER1_MODE);
+  gimp_image_add_layer (image,
+                        layer,
+                        NULL,
+                        0,
+                        FALSE/*push_undo*/);
+  layer = gimp_layer_new (image,
+                          GIMP_MAINIMAGE_LAYER2_WIDTH,
+                          GIMP_MAINIMAGE_LAYER2_HEIGHT,
+                          GIMP_MAINIMAGE_LAYER2_FORMAT,
+                          GIMP_MAINIMAGE_LAYER2_NAME,
+                          GIMP_MAINIMAGE_LAYER2_OPACITY,
+                          GIMP_MAINIMAGE_LAYER2_MODE);
+  gimp_image_add_layer (image,
+                        layer,
+                        NULL,
+                        0,
+                        FALSE /*push_undo*/);
+
+  /* Layer mask */
+  layer_mask = gimp_layer_create_mask (layer,
+                                       GIMP_ADD_MASK_BLACK,
+                                       NULL /*channel*/);
+  gimp_layer_add_mask (layer,
+                       layer_mask,
+                       FALSE /*push_undo*/,
+                       NULL /*error*/);
+
+  /* Image compression type
+   *
+   * We don't do any explicit test, only implicit when we read tile
+   * data in other tests
+   */
+
+  /* Guides, note we add them in reversed order */
+  gimp_image_add_hguide (image,
+                         GIMP_MAINIMAGE_HGUIDE2_POS,
+                         FALSE /*push_undo*/);
+  gimp_image_add_hguide (image,
+                         GIMP_MAINIMAGE_HGUIDE1_POS,
+                         FALSE /*push_undo*/);
+  gimp_image_add_vguide (image,
+                         GIMP_MAINIMAGE_VGUIDE2_POS,
+                         FALSE /*push_undo*/);
+  gimp_image_add_vguide (image,
+                         GIMP_MAINIMAGE_VGUIDE1_POS,
+                         FALSE /*push_undo*/);
+
+
+  /* Sample points */
+  gimp_image_add_sample_point_at_pos (image,
+                                      GIMP_MAINIMAGE_SAMPLEPOINT1_X,
+                                      GIMP_MAINIMAGE_SAMPLEPOINT1_Y,
+                                      FALSE /*push_undo*/);
+  gimp_image_add_sample_point_at_pos (image,
+                                      GIMP_MAINIMAGE_SAMPLEPOINT2_X,
+                                      GIMP_MAINIMAGE_SAMPLEPOINT2_Y,
+                                      FALSE /*push_undo*/);
+
+  /* Tattoo
+   * We don't bother testing this, not yet at least
+   */
+
+  /* Resolution */
+  gimp_image_set_resolution (image,
+                             GIMP_MAINIMAGE_RESOLUTIONX,
+                             GIMP_MAINIMAGE_RESOLUTIONY);
+
+
+  /* Parasites */
+  parasite = gimp_parasite_new (GIMP_MAINIMAGE_PARASITE_NAME,
+                                GIMP_PARASITE_PERSISTENT,
+                                GIMP_MAINIMAGE_PARASITE_SIZE,
+                                GIMP_MAINIMAGE_PARASITE_DATA);
+  gimp_image_parasite_attach (image,
+                              parasite, TRUE);
+  gimp_parasite_free (parasite);
+  parasite = gimp_parasite_new ("gimp-comment",
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (GIMP_MAINIMAGE_COMMENT) + 1,
+                                GIMP_MAINIMAGE_COMMENT);
+  gimp_image_parasite_attach (image, parasite, TRUE);
+  gimp_parasite_free (parasite);
+
+
+  /* Unit */
+  gimp_image_set_unit (image,
+                       GIMP_MAINIMAGE_UNIT);
+
+  /* Grid */
+  grid = g_object_new (GIMP_TYPE_GRID,
+                       "xspacing", GIMP_MAINIMAGE_GRIDXSPACING,
+                       "yspacing", GIMP_MAINIMAGE_GRIDYSPACING,
+                       NULL);
+  gimp_image_set_grid (image,
+                       grid,
+                       FALSE /*push_undo*/);
+  g_object_unref (grid);
+
+  /* Channel */
+  channel = gimp_channel_new (image,
+                              GIMP_MAINIMAGE_CHANNEL1_WIDTH,
+                              GIMP_MAINIMAGE_CHANNEL1_HEIGHT,
+                              GIMP_MAINIMAGE_CHANNEL1_NAME,
+                              &channel_color);
+  gimp_image_add_channel (image,
+                          channel,
+                          NULL,
+                          -1,
+                          FALSE /*push_undo*/);
+
+  /* Selection */
+  selection = gimp_image_get_mask (image);
+  gimp_channel_select_rectangle (selection,
+                                 GIMP_MAINIMAGE_SELECTION_X,
+                                 GIMP_MAINIMAGE_SELECTION_Y,
+                                 GIMP_MAINIMAGE_SELECTION_W,
+                                 GIMP_MAINIMAGE_SELECTION_H,
+                                 GIMP_CHANNEL_OP_REPLACE,
+                                 FALSE /*feather*/,
+                                 0.0 /*feather_radius_x*/,
+                                 0.0 /*feather_radius_y*/,
+                                 FALSE /*push_undo*/);
+
+  /* Vectors 1 */
+  vectors = gimp_vectors_new (image,
+                              GIMP_MAINIMAGE_VECTORS1_NAME);
+  /* The XCF file can save vectors in two kind of ways, one old way
+   * and a new way. Parameterize the way so we can test both variants,
+   * i.e. gimp_vectors_compat_is_compatible() must return both TRUE
+   * and FALSE.
+   */
+  if (! compat_paths)
+    {
+      gimp_item_set_visible (GIMP_ITEM (vectors),
+                             TRUE,
+                             FALSE /*push_undo*/);
+    }
+  /* TODO: Add test for non-closed stroke. The order of the anchor
+   * points changes for open strokes, so it's boring to test
+   */
+  stroke = gimp_bezier_stroke_new_from_coords (vectors1_coords,
+                                               G_N_ELEMENTS (vectors1_coords),
+                                               TRUE /*closed*/);
+  gimp_vectors_stroke_add (vectors, stroke);
+  gimp_image_add_vectors (image,
+                          vectors,
+                          NULL /*parent*/,
+                          -1 /*position*/,
+                          FALSE /*push_undo*/);
+
+  /* Vectors 2 */
+  vectors = gimp_vectors_new (image,
+                              GIMP_MAINIMAGE_VECTORS2_NAME);
+
+  stroke = gimp_bezier_stroke_new_from_coords (vectors2_coords,
+                                               G_N_ELEMENTS (vectors2_coords),
+                                               TRUE /*closed*/);
+  gimp_vectors_stroke_add (vectors, stroke);
+  gimp_image_add_vectors (image,
+                          vectors,
+                          NULL /*parent*/,
+                          -1 /*position*/,
+                          FALSE /*push_undo*/);
+
+  /* Some of these things are pretty unusual, parameterize the
+   * inclusion of this in the written file so we can do our test both
+   * with and without
+   */
+  if (with_unusual_stuff)
+    {
+      /* Floating selection */
+      gimp_selection_float (GIMP_SELECTION (gimp_image_get_mask (image)),
+                            gimp_image_get_active_drawable (image),
+                            gimp_get_user_context (gimp),
+                            TRUE /*cut_image*/,
+                            0 /*off_x*/,
+                            0 /*off_y*/,
+                            NULL /*error*/);
+    }
+
+  /* Adds stuff like layer groups */
+  if (use_gimp_2_8_features)
+    {
+      GimpLayer *parent;
+
+      /* Add a layer group and some layers:
+       *
+       *  group1
+       *    layer3
+       *    layer4
+       *    group2
+       *      layer5
+       */
+
+      /* group1 */
+      layer = gimp_group_layer_new (image);
+      gimp_object_set_name (GIMP_OBJECT (layer), GIMP_MAINIMAGE_GROUP1_NAME);
+      gimp_image_add_layer (image,
+                            layer,
+                            NULL /*parent*/,
+                            -1 /*position*/,
+                            FALSE /*push_undo*/);
+      parent = layer;
+
+      /* layer3 */
+      layer = gimp_layer_new (image,
+                              GIMP_MAINIMAGE_LAYER1_WIDTH,
+                              GIMP_MAINIMAGE_LAYER1_HEIGHT,
+                              GIMP_MAINIMAGE_LAYER1_FORMAT,
+                              GIMP_MAINIMAGE_LAYER3_NAME,
+                              GIMP_MAINIMAGE_LAYER1_OPACITY,
+                              GIMP_MAINIMAGE_LAYER1_MODE);
+      gimp_image_add_layer (image,
+                            layer,
+                            parent,
+                            -1 /*position*/,
+                            FALSE /*push_undo*/);
+
+      /* layer4 */
+      layer = gimp_layer_new (image,
+                              GIMP_MAINIMAGE_LAYER1_WIDTH,
+                              GIMP_MAINIMAGE_LAYER1_HEIGHT,
+                              GIMP_MAINIMAGE_LAYER1_FORMAT,
+                              GIMP_MAINIMAGE_LAYER4_NAME,
+                              GIMP_MAINIMAGE_LAYER1_OPACITY,
+                              GIMP_MAINIMAGE_LAYER1_MODE);
+      gimp_image_add_layer (image,
+                            layer,
+                            parent,
+                            -1 /*position*/,
+                            FALSE /*push_undo*/);
+
+      /* group2 */
+      layer = gimp_group_layer_new (image);
+      gimp_object_set_name (GIMP_OBJECT (layer), GIMP_MAINIMAGE_GROUP2_NAME);
+      gimp_image_add_layer (image,
+                            layer,
+                            parent,
+                            -1 /*position*/,
+                            FALSE /*push_undo*/);
+      parent = layer;
+
+      /* layer5 */
+      layer = gimp_layer_new (image,
+                              GIMP_MAINIMAGE_LAYER1_WIDTH,
+                              GIMP_MAINIMAGE_LAYER1_HEIGHT,
+                              GIMP_MAINIMAGE_LAYER1_FORMAT,
+                              GIMP_MAINIMAGE_LAYER5_NAME,
+                              GIMP_MAINIMAGE_LAYER1_OPACITY,
+                              GIMP_MAINIMAGE_LAYER1_MODE);
+      gimp_image_add_layer (image,
+                            layer,
+                            parent,
+                            -1 /*position*/,
+                            FALSE /*push_undo*/);
+    }
+
+  /* Todo, should be tested somehow:
+   *
+   * - Color maps
+   * - Custom user units
+   * - Text layers
+   * - Layer parasites
+   * - Channel parasites
+   * - Different tile compression methods
+   */
+
+  return image;
+}
+
+static void
+gimp_assert_vectors (GimpImage   *image,
+                     const gchar *name,
+                     GimpCoords   coords[],
+                     gsize        coords_size,
+                     gboolean     visible)
+{
+  GimpVectors *vectors        = NULL;
+  GimpStroke  *stroke         = NULL;
+  GArray      *control_points = NULL;
+  gboolean     closed         = FALSE;
+  gint         i              = 0;
+
+  vectors = gimp_image_get_vectors_by_name (image, name);
+  stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+  g_assert (stroke != NULL);
+  control_points = gimp_stroke_control_points_get (stroke,
+                                                   &closed);
+  g_assert (closed);
+  g_assert_cmpint (control_points->len,
+                   ==,
+                   coords_size);
+  for (i = 0; i < control_points->len; i++)
+    {
+      g_assert_cmpint (coords[i].x,
+                       ==,
+                       g_array_index (control_points,
+                                      GimpAnchor,
+                                      i).position.x);
+      g_assert_cmpint (coords[i].y,
+                       ==,
+                       g_array_index (control_points,
+                                      GimpAnchor,
+                                      i).position.y);
+    }
+
+  g_assert (gimp_item_get_visible (GIMP_ITEM (vectors)) ? TRUE : FALSE ==
+            visible ? TRUE : FALSE);
+}
+
+/**
+ * gimp_assert_mainimage:
+ * @image:
+ *
+ * Verifies that the passed #GimpImage contains all the information
+ * that was put in it by gimp_create_mainimage().
+ **/
+static void
+gimp_assert_mainimage (GimpImage *image,
+                       gboolean   with_unusual_stuff,
+                       gboolean   compat_paths,
+                       gboolean   use_gimp_2_8_features)
+{
+  const GimpParasite *parasite               = NULL;
+  GimpLayer          *layer                  = NULL;
+  GList              *iter                   = NULL;
+  GimpGuide          *guide                  = NULL;
+  GimpSamplePoint    *sample_point           = NULL;
+  gint                sample_point_x         = 0;
+  gint                sample_point_y         = 0;
+  gdouble             xres                   = 0.0;
+  gdouble             yres                   = 0.0;
+  GimpGrid           *grid                   = NULL;
+  gdouble             xspacing               = 0.0;
+  gdouble             yspacing               = 0.0;
+  GimpChannel        *channel                = NULL;
+  GimpRGB             expected_channel_color = GIMP_MAINIMAGE_CHANNEL1_COLOR;
+  GimpRGB             actual_channel_color   = { 0, };
+  GimpChannel        *selection              = NULL;
+  gint                x                      = -1;
+  gint                y                      = -1;
+  gint                w                      = -1;
+  gint                h                      = -1;
+  GimpCoords          vectors1_coords[]      = GIMP_MAINIMAGE_VECTORS1_COORDS;
+  GimpCoords          vectors2_coords[]      = GIMP_MAINIMAGE_VECTORS2_COORDS;
+
+  /* Image size and type */
+  g_assert_cmpint (gimp_image_get_width (image),
+                   ==,
+                   GIMP_MAINIMAGE_WIDTH);
+  g_assert_cmpint (gimp_image_get_height (image),
+                   ==,
+                   GIMP_MAINIMAGE_HEIGHT);
+  g_assert_cmpint (gimp_image_get_base_type (image),
+                   ==,
+                   GIMP_MAINIMAGE_TYPE);
+
+  /* Layers */
+  layer = gimp_image_get_layer_by_name (image,
+                                        GIMP_MAINIMAGE_LAYER1_NAME);
+  g_assert_cmpint (gimp_item_get_width (GIMP_ITEM (layer)),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER1_WIDTH);
+  g_assert_cmpint (gimp_item_get_height (GIMP_ITEM (layer)),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER1_HEIGHT);
+  g_assert_cmpstr (babl_get_name (gimp_drawable_get_format (GIMP_DRAWABLE (layer))),
+                   ==,
+                   babl_get_name (GIMP_MAINIMAGE_LAYER1_FORMAT));
+  g_assert_cmpstr (gimp_object_get_name (GIMP_DRAWABLE (layer)),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER1_NAME);
+  g_assert_cmpfloat (gimp_layer_get_opacity (layer),
+                     ==,
+                     GIMP_MAINIMAGE_LAYER1_OPACITY);
+  g_assert_cmpint (gimp_layer_get_mode (layer),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER1_MODE);
+  layer = gimp_image_get_layer_by_name (image,
+                                        GIMP_MAINIMAGE_LAYER2_NAME);
+  g_assert_cmpint (gimp_item_get_width (GIMP_ITEM (layer)),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER2_WIDTH);
+  g_assert_cmpint (gimp_item_get_height (GIMP_ITEM (layer)),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER2_HEIGHT);
+  g_assert_cmpstr (babl_get_name (gimp_drawable_get_format (GIMP_DRAWABLE (layer))),
+                   ==,
+                   babl_get_name (GIMP_MAINIMAGE_LAYER2_FORMAT));
+  g_assert_cmpstr (gimp_object_get_name (GIMP_DRAWABLE (layer)),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER2_NAME);
+  g_assert_cmpfloat (gimp_layer_get_opacity (layer),
+                     ==,
+                     GIMP_MAINIMAGE_LAYER2_OPACITY);
+  g_assert_cmpint (gimp_layer_get_mode (layer),
+                   ==,
+                   GIMP_MAINIMAGE_LAYER2_MODE);
+
+  /* Guides, note that we rely on internal ordering */
+  iter = gimp_image_get_guides (image);
+  g_assert (iter != NULL);
+  guide = iter->data;
+  g_assert_cmpint (gimp_guide_get_position (guide),
+                   ==,
+                   GIMP_MAINIMAGE_VGUIDE1_POS);
+  iter = g_list_next (iter);
+  g_assert (iter != NULL);
+  guide = iter->data;
+  g_assert_cmpint (gimp_guide_get_position (guide),
+                   ==,
+                   GIMP_MAINIMAGE_VGUIDE2_POS);
+  iter = g_list_next (iter);
+  g_assert (iter != NULL);
+  guide = iter->data;
+  g_assert_cmpint (gimp_guide_get_position (guide),
+                   ==,
+                   GIMP_MAINIMAGE_HGUIDE1_POS);
+  iter = g_list_next (iter);
+  g_assert (iter != NULL);
+  guide = iter->data;
+  g_assert_cmpint (gimp_guide_get_position (guide),
+                   ==,
+                   GIMP_MAINIMAGE_HGUIDE2_POS);
+  iter = g_list_next (iter);
+  g_assert (iter == NULL);
+
+  /* Sample points, we rely on the same ordering as when we added
+   * them, although this ordering is not a necessity
+   */
+  iter = gimp_image_get_sample_points (image);
+  g_assert (iter != NULL);
+  sample_point = iter->data;
+  gimp_sample_point_get_position (sample_point,
+                                  &sample_point_x, &sample_point_y);
+  g_assert_cmpint (sample_point_x,
+                   ==,
+                   GIMP_MAINIMAGE_SAMPLEPOINT1_X);
+  g_assert_cmpint (sample_point_y,
+                   ==,
+                   GIMP_MAINIMAGE_SAMPLEPOINT1_Y);
+  iter = g_list_next (iter);
+  g_assert (iter != NULL);
+  sample_point = iter->data;
+  gimp_sample_point_get_position (sample_point,
+                                  &sample_point_x, &sample_point_y);
+  g_assert_cmpint (sample_point_x,
+                   ==,
+                   GIMP_MAINIMAGE_SAMPLEPOINT2_X);
+  g_assert_cmpint (sample_point_y,
+                   ==,
+                   GIMP_MAINIMAGE_SAMPLEPOINT2_Y);
+  iter = g_list_next (iter);
+  g_assert (iter == NULL);
+
+  /* Resolution */
+  gimp_image_get_resolution (image, &xres, &yres);
+  g_assert_cmpint (xres,
+                   ==,
+                   GIMP_MAINIMAGE_RESOLUTIONX);
+  g_assert_cmpint (yres,
+                   ==,
+                   GIMP_MAINIMAGE_RESOLUTIONY);
+
+  /* Parasites */
+  parasite = gimp_image_parasite_find (image,
+                                       GIMP_MAINIMAGE_PARASITE_NAME);
+  g_assert_cmpint (gimp_parasite_data_size (parasite),
+                   ==,
+                   GIMP_MAINIMAGE_PARASITE_SIZE);
+  g_assert_cmpstr (gimp_parasite_data (parasite),
+                   ==,
+                   GIMP_MAINIMAGE_PARASITE_DATA);
+  parasite = gimp_image_parasite_find (image,
+                                       "gimp-comment");
+  g_assert_cmpint (gimp_parasite_data_size (parasite),
+                   ==,
+                   strlen (GIMP_MAINIMAGE_COMMENT) + 1);
+  g_assert_cmpstr (gimp_parasite_data (parasite),
+                   ==,
+                   GIMP_MAINIMAGE_COMMENT);
+
+  /* Unit */
+  g_assert_cmpint (gimp_image_get_unit (image),
+                   ==,
+                   GIMP_MAINIMAGE_UNIT);
+
+  /* Grid */
+  grid = gimp_image_get_grid (image);
+  g_object_get (grid,
+                "xspacing", &xspacing,
+                "yspacing", &yspacing,
+                NULL);
+  g_assert_cmpint (xspacing,
+                   ==,
+                   GIMP_MAINIMAGE_GRIDXSPACING);
+  g_assert_cmpint (yspacing,
+                   ==,
+                   GIMP_MAINIMAGE_GRIDYSPACING);
+
+
+  /* Channel */
+  channel = gimp_image_get_channel_by_name (image,
+                                            GIMP_MAINIMAGE_CHANNEL1_NAME);
+  gimp_channel_get_color (channel, &actual_channel_color);
+  g_assert_cmpint (gimp_item_get_width (GIMP_ITEM (channel)),
+                   ==,
+                   GIMP_MAINIMAGE_CHANNEL1_WIDTH);
+  g_assert_cmpint (gimp_item_get_height (GIMP_ITEM (channel)),
+                   ==,
+                   GIMP_MAINIMAGE_CHANNEL1_HEIGHT);
+  g_assert (memcmp (&expected_channel_color,
+                    &actual_channel_color,
+                    sizeof (GimpRGB)) == 0);
+
+  /* Selection, if the image contains unusual stuff it contains a
+   * floating select, and when floating a selection, the selection
+   * mask is cleared, so don't test for the presence of the selection
+   * mask in that case
+   */
+  if (! with_unusual_stuff)
+    {
+      selection = gimp_image_get_mask (image);
+      gimp_item_bounds (GIMP_ITEM (selection), &x, &y, &w, &h);
+      g_assert_cmpint (x,
+                       ==,
+                       GIMP_MAINIMAGE_SELECTION_X);
+      g_assert_cmpint (y,
+                       ==,
+                       GIMP_MAINIMAGE_SELECTION_Y);
+      g_assert_cmpint (w,
+                       ==,
+                       GIMP_MAINIMAGE_SELECTION_W);
+      g_assert_cmpint (h,
+                       ==,
+                       GIMP_MAINIMAGE_SELECTION_H);
+    }
+
+  /* Vectors 1 */
+  gimp_assert_vectors (image,
+                       GIMP_MAINIMAGE_VECTORS1_NAME,
+                       vectors1_coords,
+                       G_N_ELEMENTS (vectors1_coords),
+                       ! compat_paths /*visible*/);
+
+  /* Vectors 2 (always visible FALSE) */
+  gimp_assert_vectors (image,
+                       GIMP_MAINIMAGE_VECTORS2_NAME,
+                       vectors2_coords,
+                       G_N_ELEMENTS (vectors2_coords),
+                       FALSE /*visible*/);
+
+  if (with_unusual_stuff)
+    g_assert (gimp_image_get_floating_selection (image) != NULL);
+  else /* if (! with_unusual_stuff) */
+    g_assert (gimp_image_get_floating_selection (image) == NULL);
+
+  if (use_gimp_2_8_features)
+    {
+      /* Only verify the parent relationships, the layer attributes
+       * are tested above
+       */
+      GimpItem *group1 = GIMP_ITEM (gimp_image_get_layer_by_name (image, GIMP_MAINIMAGE_GROUP1_NAME));
+      GimpItem *layer3 = GIMP_ITEM (gimp_image_get_layer_by_name (image, GIMP_MAINIMAGE_LAYER3_NAME));
+      GimpItem *layer4 = GIMP_ITEM (gimp_image_get_layer_by_name (image, GIMP_MAINIMAGE_LAYER4_NAME));
+      GimpItem *group2 = GIMP_ITEM (gimp_image_get_layer_by_name (image, GIMP_MAINIMAGE_GROUP2_NAME));
+      GimpItem *layer5 = GIMP_ITEM (gimp_image_get_layer_by_name (image, GIMP_MAINIMAGE_LAYER5_NAME));
+
+      g_assert (gimp_item_get_parent (group1) == NULL);
+      g_assert (gimp_item_get_parent (layer3) == group1);
+      g_assert (gimp_item_get_parent (layer4) == group1);
+      g_assert (gimp_item_get_parent (group2) == group1);
+      g_assert (gimp_item_get_parent (layer5) == group2);
+    }
+}
+
+
+/**
+ * main:
+ * @argc:
+ * @argv:
+ *
+ * These tests intend to
+ *
+ *  - Make sure that we are backwards compatible with files created by
+ *    older version of GIMP, i.e. that we can load files from earlier
+ *    version of GIMP
+ *
+ *  - Make sure that the information put into a #GimpImage is not lost
+ *    when the #GimpImage is written to a file and then read again
+ **/
+int
+main (int    argc,
+      char **argv)
+{
+  Gimp *gimp;
+  int   result;
+
+  g_test_init (&argc, &argv, NULL);
+
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",
+                                       "app/tests/gimpdir");
+
+  /* We share the same application instance across all tests. We need
+   * the GUI variant for the file procs
+   */
+  gimp = gimp_init_for_testing ();
+
+  /* Add tests */
+  ADD_TEST (write_and_read_gimp_2_6_format);
+  ADD_TEST (write_and_read_gimp_2_6_format_unusual);
+  ADD_TEST (load_gimp_2_6_file);
+  ADD_TEST (write_and_read_gimp_2_8_format);
+
+  /* Don't write files to the source dir */
+  gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_BUILDDIR",
+                                       "app/tests/gimpdir-output");
+
+  /* Run the tests */
+  result = g_test_run ();
+
+  /* Exit so we don't break script-fu plug-in wire */
+  gimp_exit (gimp, TRUE);
+
+  return result;
+}
diff --git a/app/text/Makefile.am b/app/text/Makefile.am
new file mode 100644
index 0000000..de7616e
--- /dev/null
+++ b/app/text/Makefile.am
@@ -0,0 +1,80 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Text\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(PANGOCAIRO_CFLAGS)		\
+	$(HARFBUZZ_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapptext.a
+
+libapptext_a_sources = \
+	text-types.h			\
+	text-enums.h			\
+	gimpfont.c			\
+	gimpfont.h			\
+	gimpfontfactory.c		\
+	gimpfontfactory.h		\
+	gimptext.c			\
+	gimptext.h			\
+	gimptext-compat.c		\
+	gimptext-compat.h		\
+	gimptext-parasite.c		\
+	gimptext-parasite.h		\
+	gimptext-vectors.c		\
+	gimptext-vectors.h		\
+	gimptext-xlfd.c			\
+	gimptext-xlfd.h			\
+	gimptextlayer.c			\
+	gimptextlayer.h			\
+	gimptextlayer-transform.c	\
+	gimptextlayer-transform.h	\
+	gimptextlayer-xcf.c		\
+	gimptextlayer-xcf.h		\
+	gimptextlayout.c		\
+	gimptextlayout.h		\
+	gimptextlayout-render.c		\
+	gimptextlayout-render.h		\
+	gimptextundo.c			\
+	gimptextundo.h
+
+libapptext_a_built_sources = text-enums.c
+
+libapptext_a_SOURCES = $(libapptext_a_built_sources) $(libapptext_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-tec
+CLEANFILES = $(gen_sources)
+
+xgen-tec: $(srcdir)/text-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"text-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/text-enums.c: xgen-tec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/text/Makefile.in b/app/text/Makefile.in
new file mode 100644
index 0000000..7541048
--- /dev/null
+++ b/app/text/Makefile.in
@@ -0,0 +1,1031 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/text
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapptext_a_AR = $(AR) $(ARFLAGS)
+libapptext_a_LIBADD =
+am__objects_1 = text-enums.$(OBJEXT)
+am__objects_2 = gimpfont.$(OBJEXT) gimpfontfactory.$(OBJEXT) \
+	gimptext.$(OBJEXT) gimptext-compat.$(OBJEXT) \
+	gimptext-parasite.$(OBJEXT) gimptext-vectors.$(OBJEXT) \
+	gimptext-xlfd.$(OBJEXT) gimptextlayer.$(OBJEXT) \
+	gimptextlayer-transform.$(OBJEXT) gimptextlayer-xcf.$(OBJEXT) \
+	gimptextlayout.$(OBJEXT) gimptextlayout-render.$(OBJEXT) \
+	gimptextundo.$(OBJEXT)
+am_libapptext_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libapptext_a_OBJECTS = $(am_libapptext_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimpfont.Po \
+	./$(DEPDIR)/gimpfontfactory.Po ./$(DEPDIR)/gimptext-compat.Po \
+	./$(DEPDIR)/gimptext-parasite.Po \
+	./$(DEPDIR)/gimptext-vectors.Po ./$(DEPDIR)/gimptext-xlfd.Po \
+	./$(DEPDIR)/gimptext.Po ./$(DEPDIR)/gimptextlayer-transform.Po \
+	./$(DEPDIR)/gimptextlayer-xcf.Po ./$(DEPDIR)/gimptextlayer.Po \
+	./$(DEPDIR)/gimptextlayout-render.Po \
+	./$(DEPDIR)/gimptextlayout.Po ./$(DEPDIR)/gimptextundo.Po \
+	./$(DEPDIR)/text-enums.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapptext_a_SOURCES)
+DIST_SOURCES = $(libapptext_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Text\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(PANGOCAIRO_CFLAGS)		\
+	$(HARFBUZZ_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapptext.a
+libapptext_a_sources = \
+	text-types.h			\
+	text-enums.h			\
+	gimpfont.c			\
+	gimpfont.h			\
+	gimpfontfactory.c		\
+	gimpfontfactory.h		\
+	gimptext.c			\
+	gimptext.h			\
+	gimptext-compat.c		\
+	gimptext-compat.h		\
+	gimptext-parasite.c		\
+	gimptext-parasite.h		\
+	gimptext-vectors.c		\
+	gimptext-vectors.h		\
+	gimptext-xlfd.c			\
+	gimptext-xlfd.h			\
+	gimptextlayer.c			\
+	gimptextlayer.h			\
+	gimptextlayer-transform.c	\
+	gimptextlayer-transform.h	\
+	gimptextlayer-xcf.c		\
+	gimptextlayer-xcf.h		\
+	gimptextlayout.c		\
+	gimptextlayout.h		\
+	gimptextlayout-render.c		\
+	gimptextlayout-render.h		\
+	gimptextundo.c			\
+	gimptextundo.h
+
+libapptext_a_built_sources = text-enums.c
+libapptext_a_SOURCES = $(libapptext_a_built_sources) $(libapptext_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-tec
+CLEANFILES = $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/text/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/text/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapptext.a: $(libapptext_a_OBJECTS) $(libapptext_a_DEPENDENCIES) $(EXTRA_libapptext_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapptext.a
+	$(AM_V_AR)$(libapptext_a_AR) libapptext.a $(libapptext_a_OBJECTS) $(libapptext_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapptext.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfont.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfontfactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptext-compat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptext-parasite.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptext-vectors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptext-xlfd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptext.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextlayer-transform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextlayer-xcf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextlayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextlayout-render.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextlayout.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-enums.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimpfont.Po
+	-rm -f ./$(DEPDIR)/gimpfontfactory.Po
+	-rm -f ./$(DEPDIR)/gimptext-compat.Po
+	-rm -f ./$(DEPDIR)/gimptext-parasite.Po
+	-rm -f ./$(DEPDIR)/gimptext-vectors.Po
+	-rm -f ./$(DEPDIR)/gimptext-xlfd.Po
+	-rm -f ./$(DEPDIR)/gimptext.Po
+	-rm -f ./$(DEPDIR)/gimptextlayer-transform.Po
+	-rm -f ./$(DEPDIR)/gimptextlayer-xcf.Po
+	-rm -f ./$(DEPDIR)/gimptextlayer.Po
+	-rm -f ./$(DEPDIR)/gimptextlayout-render.Po
+	-rm -f ./$(DEPDIR)/gimptextlayout.Po
+	-rm -f ./$(DEPDIR)/gimptextundo.Po
+	-rm -f ./$(DEPDIR)/text-enums.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimpfont.Po
+	-rm -f ./$(DEPDIR)/gimpfontfactory.Po
+	-rm -f ./$(DEPDIR)/gimptext-compat.Po
+	-rm -f ./$(DEPDIR)/gimptext-parasite.Po
+	-rm -f ./$(DEPDIR)/gimptext-vectors.Po
+	-rm -f ./$(DEPDIR)/gimptext-xlfd.Po
+	-rm -f ./$(DEPDIR)/gimptext.Po
+	-rm -f ./$(DEPDIR)/gimptextlayer-transform.Po
+	-rm -f ./$(DEPDIR)/gimptextlayer-xcf.Po
+	-rm -f ./$(DEPDIR)/gimptextlayer.Po
+	-rm -f ./$(DEPDIR)/gimptextlayout-render.Po
+	-rm -f ./$(DEPDIR)/gimptextlayout.Po
+	-rm -f ./$(DEPDIR)/gimptextundo.Po
+	-rm -f ./$(DEPDIR)/text-enums.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-tec: $(srcdir)/text-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"text-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/text-enums.c: xgen-tec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
new file mode 100644
index 0000000..23d3a60
--- /dev/null
+++ b/app/text/gimpfont.c
@@ -0,0 +1,820 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfont.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *                    Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include <pango/pangocairo.h>
+
+#include <hb.h>
+#include <hb-ot.h>
+#include <hb-ft.h>
+
+#define PANGO_ENABLE_ENGINE  1   /* Argh */
+#include <pango/pango-ot.h>
+
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+
+#include "text-types.h"
+
+#include "core/gimptempbuf.h"
+
+#include "gimpfont.h"
+
+#include "gimp-intl.h"
+
+
+/* This is a so-called pangram; it's supposed to
+   contain all characters found in the alphabet. */
+#define GIMP_TEXT_PANGRAM     N_("Pack my box with\nfive dozen liquor jugs.")
+
+#define GIMP_FONT_POPUP_SIZE  (PANGO_SCALE * 30)
+
+#define DEBUGPRINT(x) /* g_print x */
+
+enum
+{
+  PROP_0,
+  PROP_PANGO_CONTEXT
+};
+
+
+struct _GimpFont
+{
+  GimpData      parent_instance;
+
+  PangoContext *pango_context;
+
+  PangoLayout  *popup_layout;
+  gint          popup_width;
+  gint          popup_height;
+};
+
+struct _GimpFontClass
+{
+  GimpDataClass   parent_class;
+};
+
+
+static void          gimp_font_constructed      (GObject       *object);
+static void          gimp_font_finalize         (GObject       *object);
+static void          gimp_font_set_property     (GObject       *object,
+                                                 guint          property_id,
+                                                 const GValue  *value,
+                                                 GParamSpec    *pspec);
+
+static void          gimp_font_get_preview_size (GimpViewable  *viewable,
+                                                 gint           size,
+                                                 gboolean       popup,
+                                                 gboolean       dot_for_dot,
+                                                 gint          *width,
+                                                 gint          *height);
+static gboolean      gimp_font_get_popup_size   (GimpViewable  *viewable,
+                                                 gint           width,
+                                                 gint           height,
+                                                 gboolean       dot_for_dot,
+                                                 gint          *popup_width,
+                                                 gint          *popup_height);
+static GimpTempBuf * gimp_font_get_new_preview  (GimpViewable  *viewable,
+                                                 GimpContext   *context,
+                                                 gint           width,
+                                                 gint           height);
+
+static const gchar * gimp_font_get_sample_string (PangoContext         *context,
+                                                  PangoFontDescription *font_desc);
+
+
+G_DEFINE_TYPE (GimpFont, gimp_font, GIMP_TYPE_DATA)
+
+#define parent_class gimp_font_parent_class
+
+
+static void
+gimp_font_class_init (GimpFontClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->constructed         = gimp_font_constructed;
+  object_class->finalize            = gimp_font_finalize;
+  object_class->set_property        = gimp_font_set_property;
+
+  viewable_class->get_preview_size  = gimp_font_get_preview_size;
+  viewable_class->get_popup_size    = gimp_font_get_popup_size;
+  viewable_class->get_new_preview   = gimp_font_get_new_preview;
+
+  viewable_class->default_icon_name = "gtk-select-font";
+
+  g_object_class_install_property (object_class, PROP_PANGO_CONTEXT,
+                                   g_param_spec_object ("pango-context",
+                                                        NULL, NULL,
+                                                        PANGO_TYPE_CONTEXT,
+                                                        GIMP_PARAM_WRITABLE));
+}
+
+static void
+gimp_font_init (GimpFont *font)
+{
+}
+
+static void
+gimp_font_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_data_make_internal (GIMP_DATA (object),
+                           gimp_object_get_name (object));
+}
+
+static void
+gimp_font_finalize (GObject *object)
+{
+  GimpFont *font = GIMP_FONT (object);
+
+  g_clear_object (&font->pango_context);
+  g_clear_object (&font->popup_layout);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_font_set_property (GObject       *object,
+                        guint          property_id,
+                        const GValue  *value,
+                        GParamSpec    *pspec)
+{
+  GimpFont *font = GIMP_FONT (object);
+
+  switch (property_id)
+    {
+    case PROP_PANGO_CONTEXT:
+      if (font->pango_context)
+        g_object_unref (font->pango_context);
+      font->pango_context = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_font_get_preview_size (GimpViewable *viewable,
+                            gint          size,
+                            gboolean      popup,
+                            gboolean      dot_for_dot,
+                            gint         *width,
+                            gint         *height)
+{
+  *width  = size;
+  *height = size;
+}
+
+static gboolean
+gimp_font_get_popup_size (GimpViewable *viewable,
+                          gint          width,
+                          gint          height,
+                          gboolean      dot_for_dot,
+                          gint         *popup_width,
+                          gint         *popup_height)
+{
+  GimpFont             *font = GIMP_FONT (viewable);
+  PangoFontDescription *font_desc;
+  PangoRectangle        ink;
+  PangoRectangle        logical;
+  const gchar          *name;
+
+  if (! font->pango_context)
+    return FALSE;
+
+  name = gimp_object_get_name (font);
+
+  font_desc = pango_font_description_from_string (name);
+  g_return_val_if_fail (font_desc != NULL, FALSE);
+
+  pango_font_description_set_size (font_desc, GIMP_FONT_POPUP_SIZE);
+
+  if (font->popup_layout)
+    g_object_unref (font->popup_layout);
+
+  font->popup_layout = pango_layout_new (font->pango_context);
+  pango_layout_set_font_description (font->popup_layout, font_desc);
+  pango_font_description_free (font_desc);
+
+  pango_layout_set_text (font->popup_layout, gettext (GIMP_TEXT_PANGRAM), -1);
+  pango_layout_get_pixel_extents (font->popup_layout, &ink, &logical);
+
+  *popup_width  = MAX (ink.width,  logical.width)  + 6;
+  *popup_height = MAX (ink.height, logical.height) + 6;
+
+  *popup_width = cairo_format_stride_for_width (CAIRO_FORMAT_A8, *popup_width);
+
+  font->popup_width  = *popup_width;
+  font->popup_height = *popup_height;
+
+  return TRUE;
+}
+
+static GimpTempBuf *
+gimp_font_get_new_preview (GimpViewable *viewable,
+                           GimpContext  *context,
+                           gint          width,
+                           gint          height)
+{
+  GimpFont        *font = GIMP_FONT (viewable);
+  PangoLayout     *layout;
+  PangoRectangle   ink;
+  PangoRectangle   logical;
+  gint             layout_width;
+  gint             layout_height;
+  gint             layout_x;
+  gint             layout_y;
+  GimpTempBuf     *temp_buf;
+  cairo_t         *cr;
+  cairo_surface_t *surface;
+
+  if (! font->pango_context)
+    return NULL;
+
+  if (! font->popup_layout ||
+      font->popup_width != width || font->popup_height != height)
+    {
+      PangoFontDescription *font_desc;
+      const gchar          *name;
+
+      name = gimp_object_get_name (font);
+
+      DEBUGPRINT (("%s: ", name));
+
+      font_desc = pango_font_description_from_string (name);
+      g_return_val_if_fail (font_desc != NULL, NULL);
+
+      pango_font_description_set_size (font_desc,
+                                       PANGO_SCALE * height * 2.0 / 3.0);
+
+      layout = pango_layout_new (font->pango_context);
+
+      pango_layout_set_font_description (layout, font_desc);
+      pango_layout_set_text (layout,
+                             gimp_font_get_sample_string (font->pango_context,
+                                                          font_desc),
+                             -1);
+
+      pango_font_description_free (font_desc);
+    }
+  else
+    {
+      layout = g_object_ref (font->popup_layout);
+    }
+
+  width = cairo_format_stride_for_width (CAIRO_FORMAT_A8, width);
+
+  temp_buf = gimp_temp_buf_new (width, height, babl_format ("Y' u8"));
+  memset (gimp_temp_buf_get_data (temp_buf), 255, width * height);
+
+  surface = cairo_image_surface_create_for_data (gimp_temp_buf_get_data (temp_buf),
+                                                 CAIRO_FORMAT_A8,
+                                                 width, height, width);
+
+  pango_layout_get_pixel_extents (layout, &ink, &logical);
+
+  layout_width  = MAX (ink.width,  logical.width);
+  layout_height = MAX (ink.height, logical.height);
+
+  layout_x = (width - layout_width)  / 2;
+  layout_y = (height - layout_height) / 2;
+
+  if (ink.x < logical.x)
+    layout_x += logical.x - ink.x;
+
+  if (ink.y < logical.y)
+    layout_y += logical.y - ink.y;
+
+  cr = cairo_create (surface);
+
+  cairo_translate (cr, layout_x, layout_y);
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+  pango_cairo_show_layout (cr, layout);
+
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+
+  g_object_unref (layout);
+
+  return temp_buf;
+}
+
+GimpData *
+gimp_font_get_standard (void)
+{
+  static GimpData *standard_font = NULL;
+
+  if (! standard_font)
+    {
+      standard_font = g_object_new (GIMP_TYPE_FONT,
+                                    "name", "Standard",
+                                    NULL);
+
+      gimp_data_clean (standard_font);
+      gimp_data_make_internal (standard_font, "gimp-font-standard");
+
+      g_object_add_weak_pointer (G_OBJECT (standard_font),
+                                 (gpointer *) &standard_font);
+    }
+
+  return standard_font;
+}
+
+
+static inline gboolean
+gimp_font_covers_string (PangoFcFont *font,
+                         const gchar *sample)
+{
+  const gchar *p;
+
+  for (p = sample; *p; p = g_utf8_next_char (p))
+    {
+      if (! pango_fc_font_has_char (font, g_utf8_get_char (p)))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* This function was picked up from Pango's pango-ot-info.c. Until there
+ * is a better way to get the tag, we use this.
+ */
+static hb_tag_t
+get_hb_table_type (PangoOTTableType table_type)
+{
+  switch (table_type)
+    {
+    case PANGO_OT_TABLE_GSUB:
+      return HB_OT_TAG_GSUB;
+    case PANGO_OT_TABLE_GPOS:
+      return HB_OT_TAG_GPOS;
+    default:
+      return HB_TAG_NONE;
+    }
+}
+
+/* Guess a suitable short sample string for the font. */
+static const gchar *
+gimp_font_get_sample_string (PangoContext         *context,
+                             PangoFontDescription *font_desc)
+{
+  PangoFont        *font;
+  hb_face_t        *hb_face;
+  FT_Face           face;
+  TT_OS2           *os2;
+  PangoOTTableType  tt;
+  gint              i;
+
+  /* This is a table of scripts and corresponding short sample strings
+   * to be used instead of the Latin sample string Aa. The script
+   * codes are as in ISO15924 (see
+   * https://www.unicode.org/iso15924/iso15924-codes.html), but in
+   * lower case. The Unicode subrange bit numbers, as used in TrueType
+   * so-called OS/2 tables, are from
+   * https://www.microsoft.com/typography/otspec/os2.htm#ur .
+   *
+   * The table is mostly ordered by Unicode order. But as there are
+   * fonts that support several of these scripts, the ordering is
+   * be modified so that the script which such a font is more likely
+   * to be actually designed for comes first and matches.
+   *
+   * These sample strings are mostly just guesswork as for their
+   * usefulness. Usually they contain what I assume is the first
+   * letter in the corresponding alphabet, or two first letters if the
+   * first one happens to look too "trivial" to be recognizable by
+   * itself.
+   *
+   * This table is used to determine the primary script a font has
+   * been designed for.
+   *
+   * Very useful link: https://www.wazu.jp/index.html
+   */
+  static const struct
+  {
+    const gchar  script[4];
+    gint         bit;
+    const gchar *sample;
+  } scripts[] = {
+    /* Han is first because fonts that support it presumably are primarily
+     * designed for it.
+     */
+    {
+      "hani",                   /* Han Ideographic */
+      59,
+      "\346\260\270"            /* U+6C38 "forever". Ed Trager says
+                                 * this is a "pan-stroke" often used
+                                 * in teaching Chinese calligraphy. It
+                                 * contains the eight basic Chinese
+                                 * stroke forms.
+                                 */
+    },
+    {
+      "copt",                   /* Coptic */
+      7,
+      "\316\221\316\261"        /* U+0410 GREEK CAPITAL LETTER ALPHA
+                                   U+0430 GREEK SMALL LETTER ALPHA
+                                 */
+    },
+    {
+      "grek",                   /* Greek */
+      7,
+      "\316\221\316\261"        /* U+0410 GREEK CAPITAL LETTER ALPHA
+                                   U+0430 GREEK SMALL LETTER ALPHA
+                                 */
+    },
+    {
+      "cyrl",                   /* Cyrillic */
+      9,
+      "\320\220\325\260"        /* U+0410 CYRILLIC CAPITAL LETTER A
+                                   U+0430 CYRILLIC SMALL LETTER A
+                                 */
+    },
+    {
+      "armn",                   /* Armenian */
+      10,
+      "\324\261\325\241"        /* U+0531 ARMENIAN CAPITAL LETTER AYB
+                                   U+0561 ARMENIAN SMALL LETTER AYB
+                                 */
+    },
+    {
+      "hebr",                   /* Hebrew */
+      11,
+      "\327\220"                /* U+05D0 HEBREW LETTER ALEF */
+    },
+    {
+      "arab",                   /* Arabic */
+      13,
+      "\330\247\330\250"        /* U+0627 ARABIC LETTER ALEF
+                                 * U+0628 ARABIC LETTER BEH
+                                 */
+    },
+    {
+      "syrc",                   /* Syriac */
+      71,
+      "\334\220\334\222"        /* U+0710 SYRIAC LETTER ALAPH
+                                 * U+0712 SYRIAC LETTER BETH
+                                 */
+    },
+    {
+      "thaa",                   /* Thaana */
+      72,
+      "\336\200\336\201"        /* U+0780 THAANA LETTER HAA
+                                 * U+0781 THAANA LETTER SHAVIYANI
+                                 */
+    },
+    /* Should really use some better sample strings for the complex
+     * scripts. Something that shows how well the font handles the
+     * complex processing for each script.
+     */
+    {
+      "deva",                   /* Devanagari */
+      15,
+      "\340\244\205"            /* U+0905 DEVANAGARI LETTER A*/
+    },
+    {
+      "beng",                   /* Bengali */
+      16,
+      "\340\246\205"            /* U+0985 BENGALI LETTER A */
+    },
+    {
+      "guru",                   /* Gurmukhi */
+      17,
+      "\340\250\205"            /* U+0A05 GURMUKHI LETTER A */
+    },
+    {
+      "gujr",                   /* Gujarati */
+      18,
+      "\340\252\205"            /* U+0A85 GUJARATI LETTER A */
+    },
+    {
+      "orya",                   /* Oriya */
+      19,
+      "\340\254\205"            /* U+0B05 ORIYA LETTER A */
+    },
+    {
+      "taml",                   /* Tamil */
+      20,
+      "\340\256\205"            /* U+0B85 TAMIL LETTER A */
+    },
+    {
+      "telu",                   /* Telugu */
+      21,
+      "\340\260\205"            /* U+0C05 TELUGU LETTER A */
+    },
+    {
+      "knda",                   /* Kannada */
+      22,
+      "\340\262\205"            /* U+0C85 KANNADA LETTER A */
+    },
+    {
+      "mylm",                   /* Malayalam */
+      23,
+      "\340\264\205"            /* U+0D05 MALAYALAM LETTER A */
+    },
+    {
+      "sinh",                   /* Sinhala */
+      73,
+      "\340\266\205"            /* U+0D85 SINHALA LETTER AYANNA */
+    },
+    {
+      "thai",                   /* Thai */
+      24,
+      "\340\270\201\340\270\264"/* U+0E01 THAI CHARACTER KO KAI
+                                 * U+0E34 THAI CHARACTER SARA I
+                                 */
+    },
+    {
+      "laoo",                   /* Lao */
+      25,
+      "\340\272\201\340\272\264"/* U+0E81 LAO LETTER KO
+                                 * U+0EB4 LAO VOWEL SIGN I
+                                 */
+    },
+    {
+      "tibt",                   /* Tibetan */
+      70,
+      "\340\274\200"            /* U+0F00 TIBETAN SYLLABLE OM */
+    },
+    {
+      "mymr",                   /* Myanmar */
+      74,
+      "\341\200\200"            /* U+1000 MYANMAR LETTER KA */
+    },
+    {
+      "geor",                   /* Georgian */
+      26,
+      "\341\202\240\341\203\200" /* U+10A0 GEORGIAN CAPITAL LETTER AN
+                                  * U+10D0 GEORGIAN LETTER AN
+                                  */
+    },
+    {
+      "hang",                   /* Hangul */
+      28,
+      "\341\204\200\341\204\201"/* U+1100 HANGUL CHOSEONG KIYEOK
+                                 * U+1101 HANGUL CHOSEONG SSANGKIYEOK
+                                 */
+    },
+    {
+      "ethi",                   /* Ethiopic */
+      75,
+      "\341\210\200"            /* U+1200 ETHIOPIC SYLLABLE HA */
+    },
+    {
+      "cher",                   /* Cherokee */
+      76,
+      "\341\216\243"            /* U+13A3 CHEROKEE LETTER O */
+    },
+    {
+      "cans",                   /* Unified Canadian Aboriginal Syllabics */
+      77,
+      "\341\220\201"            /* U+1401 CANADIAN SYLLABICS E */
+    },
+    {
+      "ogam",                   /* Ogham */
+      78,
+      "\341\232\201"            /* U+1681 OGHAM LETTER BEITH */
+    },
+    {
+      "runr",                   /* Runic */
+      79,
+      "\341\232\240"            /* U+16A0 RUNIC LETTER FEHU FEOH FE F */
+    },
+    {
+      "tglg",                   /* Tagalog */
+      84,
+      "\341\234\200"            /* U+1700 TAGALOG LETTER A */
+    },
+    {
+      "hano",                   /* Hanunoo */
+      -1,
+      "\341\234\240"            /* U+1720 HANUNOO LETTER A */
+    },
+    {
+      "buhd",                   /* Buhid */
+      -1,
+      "\341\235\200"            /* U+1740 BUHID LETTER A */
+    },
+    {
+      "tagb",                   /* Tagbanwa */
+      -1,
+      "\341\235\240"            /* U+1760 TAGBANWA LETTER A */
+    },
+    {
+      "khmr",                   /* Khmer */
+      80,
+      "\341\236\201\341\237\222\341\236\211\341\236\273\341\237\206"
+                                /* U+1781 KHMER LETTER KHA
+                                 * U+17D2 KHMER LETTER SIGN COENG
+                                 * U+1789 KHMER LETTER NYO
+                                 * U+17BB KHMER VOWEL SIGN U
+                                 * U+17C6 KHMER SIGN NIKAHIT
+                                 * A common word meaning "I" that contains
+                                 * lots of complex processing.
+                                 */
+    },
+    {
+      "mong",                   /* Mongolian */
+      81,
+      "\341\240\240"            /* U+1820 MONGOLIAN LETTER A */
+    },
+    {
+      "limb",                   /* Limbu */
+      -1,
+      "\341\244\201"            /* U+1901 LIMBU LETTER KA */
+    },
+    {
+      "tale",                   /* Tai Le */
+      -1,
+      "\341\245\220"            /* U+1950 TAI LE LETTER KA */
+    },
+    {
+      "latn",                   /* Latin */
+      0,
+      "Aa"
+    }
+  };
+
+  gint ot_alts[4];
+  gint n_ot_alts = 0;
+  gint sr_alts[20];
+  gint n_sr_alts = 0;
+
+  font = pango_context_load_font (context, font_desc);
+
+  g_return_val_if_fail (PANGO_IS_FC_FONT (font), "Aa");
+
+  face = pango_fc_font_lock_face (PANGO_FC_FONT (font));
+  g_return_val_if_fail (face != NULL, "Aa");
+  hb_face = hb_ft_face_create (face, NULL);
+
+  /* First check what script(s), if any, the font has GSUB or GPOS
+   * OpenType layout tables for.
+   */
+  for (tt = PANGO_OT_TABLE_GSUB;
+       n_ot_alts < G_N_ELEMENTS (ot_alts) && tt <= PANGO_OT_TABLE_GPOS;
+       tt++)
+    {
+      hb_tag_t tag;
+      unsigned int count;
+      PangoOTTag *slist;
+
+      tag = get_hb_table_type (tt);
+      count = hb_ot_layout_table_get_script_tags (hb_face, tag, 0, NULL, NULL);
+      slist = g_new (PangoOTTag, count + 1);
+      hb_ot_layout_table_get_script_tags (hb_face, tag, 0, &count, slist);
+      slist[count] = 0;
+
+      for (i = 0;
+           n_ot_alts < G_N_ELEMENTS (ot_alts) && i < G_N_ELEMENTS (scripts);
+           i++)
+        {
+          gint j, k;
+
+          for (k = 0; k < n_ot_alts; k++)
+            if (ot_alts[k] == i)
+              break;
+
+          if (k == n_ot_alts)
+            {
+              for (j = 0;
+                   n_ot_alts < G_N_ELEMENTS (ot_alts) && slist[j];
+                   j++)
+                {
+#define TAG(s) FT_MAKE_TAG (s[0], s[1], s[2], s[3])
+
+                  if (slist[j] == TAG (scripts[i].script) &&
+                      gimp_font_covers_string (PANGO_FC_FONT (font),
+                                               scripts[i].sample))
+                    {
+                      ot_alts[n_ot_alts++] = i;
+                      DEBUGPRINT (("%.4s ", scripts[i].script));
+                    }
+#undef TAG
+                }
+            }
+        }
+
+      g_free (slist);
+    }
+
+  hb_face_destroy (hb_face);
+
+  DEBUGPRINT (("; OS/2: "));
+
+  /* Next check the OS/2 table for Unicode ranges the font claims
+   * to cover.
+   */
+
+  os2 = FT_Get_Sfnt_Table (face, ft_sfnt_os2);
+
+  if (os2)
+    {
+      for (i = 0;
+           n_sr_alts < G_N_ELEMENTS (sr_alts) && i < G_N_ELEMENTS (scripts);
+           i++)
+        {
+          if (scripts[i].bit >= 0 &&
+              (&os2->ulUnicodeRange1)[scripts[i].bit/32] & (1 << (scripts[i].bit % 32)) &&
+              gimp_font_covers_string (PANGO_FC_FONT (font),
+                                       scripts[i].sample))
+            {
+              sr_alts[n_sr_alts++] = i;
+              DEBUGPRINT (("%.4s ", scripts[i].script));
+            }
+        }
+    }
+
+  pango_fc_font_unlock_face (PANGO_FC_FONT (font));
+
+  g_object_unref (font);
+
+  if (n_ot_alts > 2)
+    {
+      /* The font has OpenType tables for several scripts. If it
+       * support Basic Latin as well, use Aa.
+       */
+      gint i;
+
+      for (i = 0; i < n_sr_alts; i++)
+        if (scripts[sr_alts[i]].bit == 0)
+          {
+            DEBUGPRINT (("=> several OT, also latin, use Aa\n"));
+            return "Aa";
+          }
+    }
+
+  if (n_ot_alts > 0 && n_sr_alts >= n_ot_alts + 3)
+    {
+      /* At least one script with an OpenType table, but many more
+       * subranges than such scripts. If it supports Basic Latin,
+       * use Aa, else the highest priority subrange.
+       */
+      gint i;
+
+      for (i = 0; i < n_sr_alts; i++)
+        if (scripts[sr_alts[i]].bit == 0)
+          {
+            DEBUGPRINT (("=> several SR, also latin, use Aa\n"));
+            return "Aa";
+          }
+
+      DEBUGPRINT (("=> several SR, use %.4s\n", scripts[sr_alts[0]].script));
+      return scripts[sr_alts[0]].sample;
+    }
+
+  if (n_ot_alts > 0)
+    {
+      /* OpenType tables for at least one script, use the
+       * highest priority one
+       */
+      DEBUGPRINT (("=> at least one OT, use %.4s\n",
+                   scripts[sr_alts[0]].script));
+      return scripts[ot_alts[0]].sample;
+    }
+
+  if (n_sr_alts > 0)
+    {
+      /* Use the highest priority subrange.  This means that a
+       * font that supports Greek, Cyrillic and Latin (quite
+       * common), will get the Greek sample string. That is
+       * capital and lowercase alpha, which looks like capital A
+       * and lowercase alpha, so it's actually quite nice, and
+       * doesn't give a too strong impression that the font would
+       * be for Greek only.
+       */
+      DEBUGPRINT (("=> at least one SR, use %.4s\n",
+                   scripts[sr_alts[0]].script));
+     return scripts[sr_alts[0]].sample;
+    }
+
+  /* Final fallback */
+  DEBUGPRINT (("=> fallback, use Aa\n"));
+  return "Aa";
+}
diff --git a/app/text/gimpfont.h b/app/text/gimpfont.h
new file mode 100644
index 0000000..1b6a632
--- /dev/null
+++ b/app/text/gimpfont.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfont.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *                    Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FONT_H__
+#define __GIMP_FONT_H__
+
+
+#include "core/gimpdata.h"
+
+
+#define GIMP_TYPE_FONT            (gimp_font_get_type ())
+#define GIMP_FONT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FONT, GimpFont))
+#define GIMP_FONT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FONT, GimpFontClass))
+#define GIMP_IS_FONT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FONT))
+#define GIMP_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FONT))
+#define GIMP_FONT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FONT, GimpFontClass))
+
+
+typedef struct _GimpFontClass GimpFontClass;
+
+
+GType      gimp_font_get_type     (void) G_GNUC_CONST;
+
+GimpData * gimp_font_get_standard (void);
+
+
+#endif /* __GIMP_FONT_H__ */
diff --git a/app/text/gimpfontfactory.c b/app/text/gimpfontfactory.c
new file mode 100644
index 0000000..ead75d5
--- /dev/null
+++ b/app/text/gimpfontfactory.c
@@ -0,0 +1,677 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfontfactory.c
+ * Copyright (C) 2003-2018 Michael Natterer <mitch@gimp.org>
+ *
+ * Partly based on code Copyright (C) Sven Neumann <sven@gimp.org>
+ *                                    Manish Singh <yosh@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <pango/pangocairo.h>
+#include <pango/pangofc-fontmap.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "text-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-parallel.h"
+#include "core/gimpasync.h"
+#include "core/gimpasyncset.h"
+#include "core/gimpcancelable.h"
+#include "core/gimpcontainer.h"
+
+#include "gimpfont.h"
+#include "gimpfontfactory.h"
+
+#include "gimp-intl.h"
+
+
+/* Use fontconfig directly for speed. We can use the pango stuff when/if
+ * fontconfig/pango get more efficient.
+ */
+#define USE_FONTCONFIG_DIRECTLY
+
+#ifdef USE_FONTCONFIG_DIRECTLY
+#include <fontconfig/fontconfig.h>
+#endif
+
+#define CONF_FNAME "fonts.conf"
+
+
+struct _GimpFontFactoryPrivate
+{
+  gpointer foo; /* can't have an empty struct */
+};
+
+#define GET_PRIVATE(obj) (((GimpFontFactory *) (obj))->priv)
+
+
+static void       gimp_font_factory_data_init       (GimpDataFactory *factory,
+                                                     GimpContext     *context);
+static void       gimp_font_factory_data_refresh    (GimpDataFactory *factory,
+                                                     GimpContext     *context);
+static void       gimp_font_factory_data_save       (GimpDataFactory *factory);
+static void       gimp_font_factory_data_cancel     (GimpDataFactory *factory);
+static GimpData * gimp_font_factory_data_duplicate  (GimpDataFactory *factory,
+                                                     GimpData        *data);
+static gboolean   gimp_font_factory_data_delete     (GimpDataFactory *factory,
+                                                     GimpData        *data,
+                                                     gboolean         delete_from_disk,
+                                                     GError         **error);
+
+static void       gimp_font_factory_load            (GimpFontFactory *factory,
+                                                     GError         **error);
+static gboolean   gimp_font_factory_load_fonts_conf (FcConfig        *config,
+                                                     GFile           *fonts_conf);
+static void       gimp_font_factory_add_directories (FcConfig        *config,
+                                                     GList           *path,
+                                                     GError         **error);
+static void       gimp_font_factory_recursive_add_fontdir
+                                                    (FcConfig        *config,
+                                                     GFile           *file,
+                                                     GError         **error);
+static void       gimp_font_factory_load_names      (GimpContainer   *container,
+                                                     PangoFontMap    *fontmap,
+                                                     PangoContext    *context);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpFontFactory, gimp_font_factory,
+                            GIMP_TYPE_DATA_FACTORY)
+
+#define parent_class gimp_font_factory_parent_class
+
+
+static void
+gimp_font_factory_class_init (GimpFontFactoryClass *klass)
+{
+  GimpDataFactoryClass *factory_class = GIMP_DATA_FACTORY_CLASS (klass);
+
+  factory_class->data_init      = gimp_font_factory_data_init;
+  factory_class->data_refresh   = gimp_font_factory_data_refresh;
+  factory_class->data_save      = gimp_font_factory_data_save;
+  factory_class->data_cancel    = gimp_font_factory_data_cancel;
+  factory_class->data_duplicate = gimp_font_factory_data_duplicate;
+  factory_class->data_delete    = gimp_font_factory_data_delete;
+}
+
+static void
+gimp_font_factory_init (GimpFontFactory *factory)
+{
+  factory->priv = gimp_font_factory_get_instance_private (factory);
+}
+
+static void
+gimp_font_factory_data_init (GimpDataFactory *factory,
+                             GimpContext     *context)
+{
+  GError *error = NULL;
+
+  gimp_font_factory_load (GIMP_FONT_FACTORY (factory), &error);
+
+  if (error)
+    {
+      gimp_message_literal (gimp_data_factory_get_gimp (factory), NULL,
+                            GIMP_MESSAGE_INFO,
+                            error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+gimp_font_factory_data_refresh (GimpDataFactory *factory,
+                                GimpContext     *context)
+{
+  GError *error = NULL;
+
+  gimp_font_factory_load (GIMP_FONT_FACTORY (factory), &error);
+
+  if (error)
+    {
+      gimp_message_literal (gimp_data_factory_get_gimp (factory), NULL,
+                            GIMP_MESSAGE_INFO,
+                            error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+gimp_font_factory_data_save (GimpDataFactory *factory)
+{
+  /*  this is not "saving" but this functions is called at the right
+   *  time at exit to reset the config
+   */
+
+  /* if font loading is in progress in another thread, do nothing.  calling
+   * FcInitReinitialize() while loading takes place is unsafe.
+   */
+  if (! gimp_async_set_is_empty (gimp_data_factory_get_async_set (factory)))
+    return;
+
+  /* Reinit the library with defaults. */
+  FcInitReinitialize ();
+}
+
+static void
+gimp_font_factory_data_cancel (GimpDataFactory *factory)
+{
+  GimpAsyncSet *async_set = gimp_data_factory_get_async_set (factory);
+
+  /* we can't really cancel font loading, so we just clear the async set and
+   * return without waiting for loading to finish.  we also cancel the async
+   * set beforehand, as a way to signal to
+   * gimp_font_factory_load_async_callback() that loading was canceled and the
+   * factory might be dead, and that it should just do nothing.
+   */
+  gimp_cancelable_cancel (GIMP_CANCELABLE (async_set));
+  gimp_async_set_clear (async_set);
+}
+
+static GimpData *
+gimp_font_factory_data_duplicate (GimpDataFactory *factory,
+                                  GimpData        *data)
+{
+  return NULL;
+}
+
+static gboolean
+gimp_font_factory_data_delete (GimpDataFactory  *factory,
+                               GimpData         *data,
+                               gboolean          delete_from_disk,
+                               GError          **error)
+{
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GimpDataFactory *
+gimp_font_factory_new (Gimp        *gimp,
+                       const gchar *path_property_name)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (path_property_name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_FONT_FACTORY,
+                       "gimp",               gimp,
+                       "data-type",          GIMP_TYPE_FONT,
+                       "path-property-name", path_property_name,
+                       "get-standard-func",  gimp_font_get_standard,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_font_factory_load_async (GimpAsync *async,
+                              FcConfig  *config)
+{
+  if (FcConfigBuildFonts (config))
+    {
+      gimp_async_finish (async, config);
+    }
+  else
+    {
+      FcConfigDestroy (config);
+
+      gimp_async_abort (async);
+    }
+}
+
+static void
+gimp_font_factory_load_async_callback (GimpAsync       *async,
+                                       GimpFontFactory *factory)
+{
+  GimpContainer *container;
+
+  /* the operation was canceled and the factory might be dead (see
+   * gimp_font_factory_data_cancel()).  bail.
+   */
+  if (gimp_async_is_canceled (async))
+    return;
+
+  container = gimp_data_factory_get_container (GIMP_DATA_FACTORY (factory));
+
+  if (gimp_async_is_finished (async))
+    {
+      FcConfig     *config = gimp_async_get_result (async);
+      PangoFontMap *fontmap;
+      PangoContext *context;
+
+      FcConfigSetCurrent (config);
+
+      fontmap = pango_cairo_font_map_new_for_font_type (CAIRO_FONT_TYPE_FT);
+      if (! fontmap)
+        g_error ("You are using a Pango that has been built against a cairo "
+                 "that lacks the Freetype font backend");
+
+      pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (fontmap),
+                                           72.0 /* FIXME */);
+      context = pango_font_map_create_context (fontmap);
+      g_object_unref (fontmap);
+
+      gimp_font_factory_load_names (container, PANGO_FONT_MAP (fontmap), context);
+      g_object_unref (context);
+      FcConfigDestroy (config);
+    }
+
+  gimp_container_thaw (container);
+}
+
+static void
+gimp_font_factory_load (GimpFontFactory  *factory,
+                        GError          **error)
+{
+  GimpContainer *container;
+  Gimp          *gimp;
+  GimpAsyncSet  *async_set;
+  FcConfig      *config;
+  GFile         *fonts_conf;
+  GList         *path;
+  GimpAsync     *async;
+
+  async_set = gimp_data_factory_get_async_set (GIMP_DATA_FACTORY (factory));
+
+  if (! gimp_async_set_is_empty (async_set))
+    {
+      /* font loading is already in progress */
+      return;
+    }
+
+  container = gimp_data_factory_get_container (GIMP_DATA_FACTORY (factory));
+
+  gimp = gimp_data_factory_get_gimp (GIMP_DATA_FACTORY (factory));
+
+  if (gimp->be_verbose)
+    g_print ("Loading fonts\n");
+
+  config = FcInitLoadConfig ();
+
+  if (! config)
+    return;
+
+  fonts_conf = gimp_directory_file (CONF_FNAME, NULL);
+  if (! gimp_font_factory_load_fonts_conf (config, fonts_conf))
+    g_printerr ("%s: failed to read '%s'.\n",
+                G_STRFUNC, g_file_peek_path (fonts_conf));
+  g_object_unref (fonts_conf);
+
+  fonts_conf = gimp_sysconf_directory_file (CONF_FNAME, NULL);
+  if (! gimp_font_factory_load_fonts_conf (config, fonts_conf))
+    g_printerr ("%s: failed to read '%s'.\n",
+                G_STRFUNC, g_file_peek_path (fonts_conf));
+  g_object_unref (fonts_conf);
+
+  path = gimp_data_factory_get_data_path (GIMP_DATA_FACTORY (factory));
+  if (! path)
+    return;
+
+  gimp_container_freeze (container);
+  gimp_container_clear (container);
+
+  gimp_font_factory_add_directories (config, path, error);
+  g_list_free_full (path, (GDestroyNotify) g_object_unref);
+
+  /* We perform font cache initialization in a separate thread, so
+   * in the case a cache rebuild is to be done it will not block
+   * the UI.
+   */
+  async = gimp_parallel_run_async_independent_full (
+    +10,
+    (GimpRunAsyncFunc) gimp_font_factory_load_async,
+    config);
+
+  gimp_async_add_callback_for_object (
+    async,
+    (GimpAsyncCallback) gimp_font_factory_load_async_callback,
+    factory,
+    factory);
+
+  gimp_async_set_add (async_set, async);
+
+  g_object_unref (async);
+}
+
+static gboolean
+gimp_font_factory_load_fonts_conf (FcConfig *config,
+                                   GFile    *fonts_conf)
+{
+  gchar    *path = g_file_get_path (fonts_conf);
+  gboolean  ret  = TRUE;
+
+  if (! FcConfigParseAndLoad (config, (const guchar *) path, FcFalse))
+    ret = FALSE;
+
+  g_free (path);
+
+  return ret;
+}
+
+static void
+gimp_font_factory_add_directories (FcConfig  *config,
+                                   GList     *path,
+                                   GError   **error)
+{
+  GList *list;
+
+  for (list = path; list; list = list->next)
+    {
+      /* The configured directories must exist or be created. */
+      g_file_make_directory_with_parents (list->data, NULL, NULL);
+
+      /* Do not use FcConfigAppFontAddDir(). Instead use
+       * FcConfigAppFontAddFile() with our own recursive loop.
+       * Otherwise, when some fonts fail to load (e.g. permission
+       * issues), we end up in weird situations where the fonts are in
+       * the list, but are unusable and output many errors.
+       * See bug 748553.
+       */
+      gimp_font_factory_recursive_add_fontdir (config, list->data, error);
+    }
+
+  if (error && *error)
+    {
+      gchar *font_list = g_strdup ((*error)->message);
+
+      g_clear_error (error);
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("Some fonts failed to load:\n%s"), font_list);
+      g_free (font_list);
+    }
+}
+
+static void
+gimp_font_factory_recursive_add_fontdir (FcConfig  *config,
+                                         GFile     *file,
+                                         GError   **error)
+{
+  GFileEnumerator *enumerator;
+
+  g_return_if_fail (config != NULL);
+
+  enumerator = g_file_enumerate_children (file,
+                                          G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                          G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+                                          G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                          G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                          G_FILE_QUERY_INFO_NONE,
+                                          NULL, NULL);
+  if (enumerator)
+    {
+      GFileInfo *info;
+
+      while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
+        {
+          GFileType  file_type;
+          GFile     *child;
+
+          if (g_file_info_get_is_hidden (info))
+            {
+              g_object_unref (info);
+              continue;
+            }
+
+          file_type = g_file_info_get_file_type (info);
+          child     = g_file_enumerator_get_child (enumerator, info);
+
+          if (file_type == G_FILE_TYPE_DIRECTORY)
+            {
+              gimp_font_factory_recursive_add_fontdir (config, child, error);
+            }
+          else if (file_type == G_FILE_TYPE_REGULAR)
+            {
+              gchar *path = g_file_get_path (child);
+#ifdef G_OS_WIN32
+              gchar *tmp = g_win32_locale_filename_from_utf8 (path);
+
+              g_free (path);
+              /* XXX: g_win32_locale_filename_from_utf8() may return
+               * NULL. So we need to check that path is not NULL before
+               * trying to load with fontconfig.
+               */
+              path = tmp;
+#endif
+
+              if (! path ||
+                  FcFalse == FcConfigAppFontAddFile (config, (const FcChar8 *) path))
+                {
+                  g_printerr ("%s: adding font file '%s' failed.\n",
+                              G_STRFUNC, path);
+                  if (error)
+                    {
+                      if (*error)
+                        {
+                          gchar *current_message = g_strdup ((*error)->message);
+
+                          g_clear_error (error);
+                          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                                       "%s\n- %s", current_message, path);
+                          g_free (current_message);
+                        }
+                      else
+                        {
+                          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                                       "- %s", path);
+                        }
+                    }
+                }
+
+              g_free (path);
+            }
+
+          g_object_unref (child);
+          g_object_unref (info);
+        }
+
+      g_object_unref (enumerator);
+    }
+  else
+    {
+      if (error)
+        {
+          gchar *path = g_file_get_path (file);
+
+          if (*error)
+            {
+              gchar *current_message = g_strdup ((*error)->message);
+
+              g_clear_error (error);
+              g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                           "%s\n- %s%s", current_message, path,
+                           G_DIR_SEPARATOR_S);
+              g_free (current_message);
+            }
+          else
+            {
+              g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                           "- %s%s", path, G_DIR_SEPARATOR_S);
+            }
+
+          g_free (path);
+        }
+    }
+}
+
+static void
+gimp_font_factory_add_font (GimpContainer        *container,
+                            PangoContext         *context,
+                            PangoFontDescription *desc)
+{
+  gchar *name;
+
+  if (! desc)
+    return;
+
+  name = pango_font_description_to_string (desc);
+
+  /* It doesn't look like pango_font_description_to_string() could ever
+   * return NULL. But just to be double sure and avoid a segfault, I
+   * check before validating the string.
+   */
+  if (name && strlen (name) > 0 &&
+      g_utf8_validate (name, -1, NULL))
+    {
+      GimpFont *font;
+
+      font = g_object_new (GIMP_TYPE_FONT,
+                           "name",          name,
+                           "pango-context", context,
+                           NULL);
+
+      gimp_container_add (container, GIMP_OBJECT (font));
+      g_object_unref (font);
+    }
+
+  g_free (name);
+}
+
+#ifdef USE_FONTCONFIG_DIRECTLY
+/* We're really chummy here with the implementation. Oh well. */
+
+/* This is copied straight from make_alias_description in pango, plus
+ * the gimp_font_list_add_font bits.
+ */
+static void
+gimp_font_factory_make_alias (GimpContainer *container,
+                              PangoContext  *context,
+                              const gchar   *family,
+                              gboolean       bold,
+                              gboolean       italic)
+{
+  PangoFontDescription *desc = pango_font_description_new ();
+
+  pango_font_description_set_family (desc, family);
+  pango_font_description_set_style (desc,
+                                    italic ?
+                                    PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
+  pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL);
+  pango_font_description_set_weight (desc,
+                                     bold ?
+                                     PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL);
+  pango_font_description_set_stretch (desc, PANGO_STRETCH_NORMAL);
+
+  gimp_font_factory_add_font (container, context, desc);
+
+  pango_font_description_free (desc);
+}
+
+static void
+gimp_font_factory_load_aliases (GimpContainer *container,
+                                PangoContext  *context)
+{
+  const gchar *families[] = { "Sans-serif", "Serif", "Monospace" };
+  gint         i;
+
+  for (i = 0; i < 3; i++)
+    {
+      gimp_font_factory_make_alias (container, context, families[i],
+                                    FALSE, FALSE);
+      gimp_font_factory_make_alias (container, context, families[i],
+                                    TRUE,  FALSE);
+      gimp_font_factory_make_alias (container, context, families[i],
+                                    FALSE, TRUE);
+      gimp_font_factory_make_alias (container, context, families[i],
+                                    TRUE,  TRUE);
+    }
+}
+
+static void
+gimp_font_factory_load_names (GimpContainer *container,
+                              PangoFontMap  *fontmap,
+                              PangoContext  *context)
+{
+  FcObjectSet *os;
+  FcPattern   *pat;
+  FcFontSet   *fontset;
+  gint         i;
+
+  os = FcObjectSetBuild (FC_FAMILY, FC_STYLE,
+                         FC_SLANT, FC_WEIGHT, FC_WIDTH,
+                         NULL);
+  g_return_if_fail (os);
+
+  pat = FcPatternCreate ();
+  if (! pat)
+    {
+      FcObjectSetDestroy (os);
+      g_critical ("%s: FcPatternCreate() returned NULL.", G_STRFUNC);
+      return;
+    }
+
+  fontset = FcFontList (NULL, pat, os);
+
+  FcPatternDestroy (pat);
+  FcObjectSetDestroy (os);
+
+  g_return_if_fail (fontset);
+
+  for (i = 0; i < fontset->nfont; i++)
+    {
+      PangoFontDescription *desc;
+
+      desc = pango_fc_font_description_from_pattern (fontset->fonts[i], FALSE);
+      gimp_font_factory_add_font (container, context, desc);
+      pango_font_description_free (desc);
+    }
+
+  /*  only create aliases if there is at least one font available  */
+  if (fontset->nfont > 0)
+    gimp_font_factory_load_aliases (container, context);
+
+  FcFontSetDestroy (fontset);
+}
+
+#else  /* ! USE_FONTCONFIG_DIRECTLY */
+
+static void
+gimp_font_factory_load_names (GimpContainer *container,
+                              PangoFontMap  *fontmap,
+                              PangoContext  *context)
+{
+  PangoFontFamily **families;
+  PangoFontFace   **faces;
+  gint              n_families;
+  gint              n_faces;
+  gint              i, j;
+
+  pango_font_map_list_families (fontmap, &families, &n_families);
+
+  for (i = 0; i < n_families; i++)
+    {
+      pango_font_family_list_faces (families[i], &faces, &n_faces);
+
+      for (j = 0; j < n_faces; j++)
+        {
+          PangoFontDescription *desc;
+
+          desc = pango_font_face_describe (faces[j]);
+          gimp_font_factory_add_font (container, context, desc);
+          pango_font_description_free (desc);
+        }
+    }
+
+  g_free (families);
+}
+
+#endif /* USE_FONTCONFIG_DIRECTLY */
diff --git a/app/text/gimpfontfactory.h b/app/text/gimpfontfactory.h
new file mode 100644
index 0000000..4c52041
--- /dev/null
+++ b/app/text/gimpfontfactory.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfontfactory.h
+ * Copyright (C) 2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FONT_FACTORY_H__
+#define __GIMP_FONT_FACTORY_H__
+
+
+#include "core/gimpdatafactory.h"
+
+
+#define GIMP_TYPE_FONT_FACTORY            (gimp_font_factory_get_type ())
+#define GIMP_FONT_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FONT_FACTORY, GimpFontFactory))
+#define GIMP_FONT_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FONT_FACTORY, GimpFontFactoryClass))
+#define GIMP_IS_FONT_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FONT_FACTORY))
+#define GIMP_IS_FONT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FONT_FACTORY))
+#define GIMP_FONT_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FONT_FACTORY, GimpFontFactoryClass))
+
+
+typedef struct _GimpFontFactoryPrivate GimpFontFactoryPrivate;
+typedef struct _GimpFontFactoryClass   GimpFontFactoryClass;
+
+struct _GimpFontFactory
+{
+  GimpDataFactory         parent_instance;
+
+  GimpFontFactoryPrivate *priv;
+};
+
+struct _GimpFontFactoryClass
+{
+  GimpDataFactoryClass  parent_class;
+};
+
+
+GType             gimp_font_factory_get_type (void) G_GNUC_CONST;
+
+GimpDataFactory * gimp_font_factory_new      (Gimp        *gimp,
+                                              const gchar *path_property_name);
+
+
+#endif  /*  __GIMP_FONT_FACTORY_H__  */
diff --git a/app/text/gimptext-compat.c b/app/text/gimptext-compat.c
new file mode 100644
index 0000000..cb71f3e
--- /dev/null
+++ b/app/text/gimptext-compat.c
@@ -0,0 +1,207 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <pango/pangocairo.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "text-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpimage.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer-floating-selection.h"
+
+#include "gimptext.h"
+#include "gimptext-compat.h"
+#include "gimptextlayer.h"
+
+#include "gimp-intl.h"
+
+
+GimpLayer *
+text_render (GimpImage    *image,
+             GimpDrawable *drawable,
+             GimpContext  *context,
+             gint          text_x,
+             gint          text_y,
+             const gchar  *fontname,
+             const gchar  *text,
+             gint          border,
+             gboolean      antialias)
+{
+  PangoFontDescription *desc;
+  GimpText             *gtext;
+  GimpLayer            *layer;
+  GimpRGB               color;
+  gchar                *font;
+  gdouble               size;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (drawable == NULL || GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (drawable == NULL ||
+                        gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (fontname != NULL, NULL);
+  g_return_val_if_fail (text != NULL, NULL);
+
+  if (! gimp_data_factory_data_wait (image->gimp->font_factory))
+    return NULL;
+
+  if (border < 0)
+    border = 0;
+
+  desc = pango_font_description_from_string (fontname);
+  size = PANGO_PIXELS (pango_font_description_get_size (desc));
+
+  pango_font_description_unset_fields (desc, PANGO_FONT_MASK_SIZE);
+  font = pango_font_description_to_string (desc);
+
+  pango_font_description_free (desc);
+
+  gimp_context_get_foreground (context, &color);
+
+  gtext = g_object_new (GIMP_TYPE_TEXT,
+                        "text",      text,
+                        "font",      font,
+                        "font-size", size,
+                        "antialias", antialias,
+                        "border",    border,
+                        "color",     &color,
+                        NULL);
+
+  g_free (font);
+
+  layer = gimp_text_layer_new (image, gtext);
+
+  g_object_unref (gtext);
+
+  if (!layer)
+    return NULL;
+
+  /*  Start a group undo  */
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TEXT,
+                               _("Add Text Layer"));
+
+  /*  Set the layer offsets  */
+  gimp_item_set_offset (GIMP_ITEM (layer), text_x, text_y);
+
+  /*  If there is a selection mask clear it--
+   *  this might not always be desired, but in general,
+   *  it seems like the correct behavior.
+   */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
+
+  if (drawable == NULL)
+    {
+      /*  If the drawable is NULL, create a new layer  */
+      gimp_image_add_layer (image, layer, NULL, -1, TRUE);
+    }
+  else
+    {
+      /*  Otherwise, instantiate the text as the new floating selection */
+      floating_sel_attach (layer, drawable);
+    }
+
+  /*  end the group undo  */
+  gimp_image_undo_group_end (image);
+
+  return layer;
+}
+
+gboolean
+text_get_extents (Gimp        *gimp,
+                  const gchar *fontname,
+                  const gchar *text,
+                  gint        *width,
+                  gint        *height,
+                  gint        *ascent,
+                  gint        *descent)
+{
+  PangoFontDescription *font_desc;
+  PangoContext         *context;
+  PangoLayout          *layout;
+  PangoFontMap         *fontmap;
+  PangoRectangle        rect;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (fontname != NULL, FALSE);
+  g_return_val_if_fail (text != NULL, FALSE);
+
+  if (! gimp_data_factory_data_wait (gimp->font_factory))
+    return FALSE;
+
+  fontmap = pango_cairo_font_map_new_for_font_type (CAIRO_FONT_TYPE_FT);
+  if (! fontmap)
+    g_error ("You are using a Pango that has been built against a cairo "
+             "that lacks the Freetype font backend");
+
+  pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (fontmap),
+                                       72.0); /* FIXME: resolution */
+  context = pango_font_map_create_context (fontmap);
+  g_object_unref (fontmap);
+
+  layout = pango_layout_new (context);
+  g_object_unref (context);
+
+  font_desc = pango_font_description_from_string (fontname);
+  pango_layout_set_font_description (layout, font_desc);
+  pango_font_description_free (font_desc);
+
+  pango_layout_set_text (layout, text, -1);
+
+  pango_layout_get_pixel_extents (layout, NULL, &rect);
+
+  if (width)
+    *width = rect.width;
+  if (height)
+    *height = rect.height;
+
+  if (ascent || descent)
+    {
+      PangoLayoutIter *iter;
+      PangoLayoutLine *line;
+
+      iter = pango_layout_get_iter (layout);
+      line = pango_layout_iter_get_line_readonly (iter);
+      pango_layout_iter_free (iter);
+
+      pango_layout_line_get_pixel_extents (line, NULL, &rect);
+
+      if (ascent)
+        *ascent = PANGO_ASCENT (rect);
+      if (descent)
+        *descent = - PANGO_DESCENT (rect);
+    }
+
+  g_object_unref (layout);
+
+  return TRUE;
+}
diff --git a/app/text/gimptext-compat.h b/app/text/gimptext-compat.h
new file mode 100644
index 0000000..2e178f0
--- /dev/null
+++ b/app/text/gimptext-compat.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_COMPAT_H__
+#define __GIMP_TEXT_COMPAT_H__
+
+
+/* convenience functions that provide the 1.2 API, only used by the PDB */
+
+GimpLayer * text_render      (GimpImage    *image,
+                              GimpDrawable *drawable,
+                              GimpContext  *context,
+                              gint          text_x,
+                              gint          text_y,
+                              const gchar  *fontname,
+                              const gchar  *text,
+                              gint          border,
+                              gboolean      antialias);
+gboolean    text_get_extents (Gimp         *gimp,
+                              const gchar  *fontname,
+                              const gchar  *text,
+                              gint         *width,
+                              gint         *height,
+                              gint         *ascent,
+                              gint         *descent);
+
+
+#endif /* __GIMP_TEXT_COMPAT_H__ */
diff --git a/app/text/gimptext-parasite.c b/app/text/gimptext-parasite.c
new file mode 100644
index 0000000..790a5b1
--- /dev/null
+++ b/app/text/gimptext-parasite.c
@@ -0,0 +1,204 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "text-types.h"
+
+#include "core/gimperror.h"
+
+#include "gimptext.h"
+#include "gimptext-parasite.h"
+#include "gimptext-xlfd.h"
+
+#include "gimp-intl.h"
+
+
+/****************************************/
+/*  The native GimpTextLayer parasite.  */
+/****************************************/
+
+const gchar *
+gimp_text_parasite_name (void)
+{
+  return "gimp-text-layer";
+}
+
+GimpParasite *
+gimp_text_to_parasite (const GimpText *text)
+{
+  GimpParasite *parasite;
+  gchar        *str;
+
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+
+  str = gimp_config_serialize_to_string (GIMP_CONFIG (text), NULL);
+  g_return_val_if_fail (str != NULL, NULL);
+
+  parasite = gimp_parasite_new (gimp_text_parasite_name (),
+                                GIMP_PARASITE_PERSISTENT,
+                                strlen (str) + 1, str);
+  g_free (str);
+
+  return parasite;
+}
+
+GimpText *
+gimp_text_from_parasite (const GimpParasite  *parasite,
+                         GError             **error)
+{
+  GimpText    *text;
+  const gchar *str;
+
+  g_return_val_if_fail (parasite != NULL, NULL);
+  g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
+                                gimp_text_parasite_name ()) == 0, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  str = gimp_parasite_data (parasite);
+
+  text = g_object_new (GIMP_TYPE_TEXT, NULL);
+
+  if (str != NULL)
+    {
+      gimp_config_deserialize_string (GIMP_CONFIG (text),
+                                      str,
+                                      gimp_parasite_data_size (parasite),
+                                      NULL,
+                                      error);
+    }
+  else
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Empty text parasite"));
+    }
+
+  return text;
+}
+
+
+/****************************************************************/
+/*  Compatibility to plug-in GDynText 1.4.4 and later versions  */
+/*  GDynText was written by Marco Lamberto <lm@geocities.com>   */
+/****************************************************************/
+
+const gchar *
+gimp_text_gdyntext_parasite_name (void)
+{
+  return "plug_in_gdyntext/data";
+}
+
+enum
+{
+  TEXT            = 0,
+  ANTIALIAS       = 1,
+  ALIGNMENT       = 2,
+  ROTATION        = 3,
+  LINE_SPACING    = 4,
+  COLOR           = 5,
+  LAYER_ALIGNMENT = 6,
+  XLFD            = 7,
+  NUM_PARAMS
+};
+
+GimpText *
+gimp_text_from_gdyntext_parasite (const GimpParasite *parasite)
+{
+  GimpText               *retval = NULL;
+  GimpTextJustification   justify;
+  const gchar            *str;
+  gchar                  *text = NULL;
+  gchar                 **params;
+  gboolean                antialias;
+  gdouble                 spacing;
+  GimpRGB                 rgb;
+  glong                   color;
+  gint                    i;
+
+  g_return_val_if_fail (parasite != NULL, NULL);
+  g_return_val_if_fail (strcmp (gimp_parasite_name (parasite),
+                                gimp_text_gdyntext_parasite_name ()) == 0,
+                        NULL);
+
+  str = gimp_parasite_data (parasite);
+  g_return_val_if_fail (str != NULL, NULL);
+
+  if (! g_str_has_prefix (str, "GDT10{"))  /*  magic value  */
+    return NULL;
+
+  params = g_strsplit (str + strlen ("GDT10{"), "}{", -1);
+
+  /*  first check that we have the required number of parameters  */
+  for (i = 0; i < NUM_PARAMS; i++)
+    if (!params[i])
+      goto cleanup;
+
+  text = g_strcompress (params[TEXT]);
+
+  if (! g_utf8_validate (text, -1, NULL))
+    {
+      gchar *tmp = gimp_any_to_utf8 (text, -1, NULL);
+
+      g_free (text);
+      text = tmp;
+    }
+
+  antialias = atoi (params[ANTIALIAS]) ? TRUE : FALSE;
+
+  switch (atoi (params[ALIGNMENT]))
+    {
+    default:
+    case 0:  justify = GIMP_TEXT_JUSTIFY_LEFT;   break;
+    case 1:  justify = GIMP_TEXT_JUSTIFY_CENTER; break;
+    case 2:  justify = GIMP_TEXT_JUSTIFY_RIGHT;  break;
+    }
+
+  spacing = g_strtod (params[LINE_SPACING], NULL);
+
+  color = strtol (params[COLOR], NULL, 16);
+  gimp_rgba_set_uchar (&rgb, color >> 16, color >> 8, color, 255);
+
+  retval = g_object_new (GIMP_TYPE_TEXT,
+                         "text",         text,
+                         "antialias",    antialias,
+                         "justify",      justify,
+                         "line-spacing", spacing,
+                         "color",        &rgb,
+                         NULL);
+
+  gimp_text_set_font_from_xlfd (GIMP_TEXT (retval), params[XLFD]);
+
+ cleanup:
+  g_free (text);
+  g_strfreev (params);
+
+  return retval;
+}
diff --git a/app/text/gimptext-parasite.h b/app/text/gimptext-parasite.h
new file mode 100644
index 0000000..d834309
--- /dev/null
+++ b/app/text/gimptext-parasite.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_PARASITE_H__
+#define __GIMP_TEXT_PARASITE_H__
+
+
+const gchar  * gimp_text_parasite_name          (void) G_GNUC_CONST;
+GimpParasite * gimp_text_to_parasite            (const GimpText      *text);
+GimpText     * gimp_text_from_parasite          (const GimpParasite  *parasite,
+                                                 GError             **error);
+
+const gchar  * gimp_text_gdyntext_parasite_name (void) G_GNUC_CONST;
+GimpText     * gimp_text_from_gdyntext_parasite (const GimpParasite  *parasite);
+
+
+#endif /* __GIMP_TEXT_PARASITE_H__ */
diff --git a/app/text/gimptext-vectors.c b/app/text/gimptext-vectors.c
new file mode 100644
index 0000000..3a6901e
--- /dev/null
+++ b/app/text/gimptext-vectors.c
@@ -0,0 +1,255 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText-vectors
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <pango/pangocairo.h>
+#include <gegl.h>
+
+#include "text-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpanchor.h"
+
+#include "gimptext.h"
+#include "gimptext-vectors.h"
+#include "gimptextlayout.h"
+#include "gimptextlayout-render.h"
+
+
+typedef struct
+{
+  GimpVectors *vectors;
+  GimpStroke  *stroke;
+  GimpAnchor  *anchor;
+} RenderContext;
+
+
+static void  gimp_text_render_vectors (cairo_t       *cr,
+                                       RenderContext *context);
+
+
+GimpVectors *
+gimp_text_vectors_new (GimpImage *image,
+                       GimpText  *text)
+{
+  GimpVectors   *vectors;
+  RenderContext  context = { NULL, };
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+
+  vectors = gimp_vectors_new (image, NULL);
+
+  if (text->text || text->markup)
+    {
+      GimpTextLayout  *layout;
+      cairo_surface_t *surface;
+      cairo_t         *cr;
+      gdouble          xres;
+      gdouble          yres;
+      GError          *error = NULL;
+
+      if (text->text)
+        gimp_object_set_name_safe (GIMP_OBJECT (vectors), text->text);
+
+      context.vectors = vectors;
+
+      surface = cairo_recording_surface_create (CAIRO_CONTENT_ALPHA, NULL);
+      cr = cairo_create (surface);
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      layout = gimp_text_layout_new (text, xres, yres, &error);
+      if (error)
+        {
+          gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_error_free (error);
+        }
+      gimp_text_layout_render (layout, cr, text->base_dir, TRUE);
+      g_object_unref (layout);
+
+      gimp_text_render_vectors (cr, &context);
+
+      cairo_destroy (cr);
+      cairo_surface_destroy (surface);
+
+      if (context.stroke)
+        gimp_stroke_close (context.stroke);
+    }
+
+  return vectors;
+}
+
+
+static inline void
+gimp_text_vector_coords (const double  x,
+                         const double  y,
+                         GimpCoords   *coords)
+{
+  const GimpCoords default_values = GIMP_COORDS_DEFAULT_VALUES;
+
+  *coords = default_values;
+
+  coords->x = x;
+  coords->y = y;
+}
+
+static gint
+moveto (RenderContext *context,
+        const double   x,
+        const double   y)
+{
+  GimpCoords     start;
+
+#if GIMP_TEXT_DEBUG
+  g_printerr ("moveto  %f, %f\n", x, y);
+#endif
+
+  gimp_text_vector_coords (x, y, &start);
+
+  if (context->stroke)
+    gimp_stroke_close (context->stroke);
+
+  context->stroke = gimp_bezier_stroke_new_moveto (&start);
+
+  gimp_vectors_stroke_add (context->vectors, context->stroke);
+  g_object_unref (context->stroke);
+
+  return 0;
+}
+
+static gint
+lineto (RenderContext *context,
+        const double   x,
+        const double   y)
+{
+  GimpCoords     end;
+
+#if GIMP_TEXT_DEBUG
+  g_printerr ("lineto  %f, %f\n", x, y);
+#endif
+
+  if (! context->stroke)
+    return 0;
+
+  gimp_text_vector_coords (x, y, &end);
+
+  gimp_bezier_stroke_lineto (context->stroke, &end);
+
+  return 0;
+}
+
+static gint
+cubicto (RenderContext *context,
+         const double   x1,
+         const double   y1,
+         const double   x2,
+         const double   y2,
+         const double   x3,
+         const double   y3)
+{
+  GimpCoords     control1;
+  GimpCoords     control2;
+  GimpCoords     end;
+
+#if GIMP_TEXT_DEBUG
+  g_printerr ("cubicto %f, %f\n", x3, y3);
+#endif
+
+  if (! context->stroke)
+    return 0;
+
+  gimp_text_vector_coords (x1, y1, &control1);
+  gimp_text_vector_coords (x2, y2, &control2);
+  gimp_text_vector_coords (x3, y3, &end);
+
+  gimp_bezier_stroke_cubicto (context->stroke, &control1, &control2, &end);
+
+  return 0;
+}
+
+static gint
+closepath (RenderContext *context)
+{
+#if GIMP_TEXT_DEBUG
+  g_printerr ("moveto\n");
+#endif
+
+  if (! context->stroke)
+    return 0;
+
+  gimp_stroke_close (context->stroke);
+
+  context->stroke = NULL;
+
+  return 0;
+}
+
+static void
+gimp_text_render_vectors (cairo_t       *cr,
+                          RenderContext *context)
+{
+  cairo_path_t *path;
+  gint          i;
+
+  path = cairo_copy_path (cr);
+
+  for (i = 0; i < path->num_data; i += path->data[i].header.length)
+    {
+      cairo_path_data_t *data = &path->data[i];
+
+      /* if the drawing operation is the final moveto of the glyph,
+       * break to avoid creating an empty point. This is because cairo
+       * always adds a moveto after each closepath.
+       */
+      if (i + data->header.length >= path->num_data)
+        break;
+
+      switch (data->header.type)
+        {
+        case CAIRO_PATH_MOVE_TO:
+          moveto (context, data[1].point.x, data[1].point.y);
+          break;
+
+        case CAIRO_PATH_LINE_TO:
+          lineto (context, data[1].point.x, data[1].point.y);
+          break;
+
+        case CAIRO_PATH_CURVE_TO:
+          cubicto (context,
+                   data[1].point.x, data[1].point.y,
+                   data[2].point.x, data[2].point.y,
+                   data[3].point.x, data[3].point.y);
+          break;
+
+        case CAIRO_PATH_CLOSE_PATH:
+          closepath (context);
+          break;
+        }
+    }
+
+  cairo_path_destroy (path);
+}
diff --git a/app/text/gimptext-vectors.h b/app/text/gimptext-vectors.h
new file mode 100644
index 0000000..df01aae
--- /dev/null
+++ b/app/text/gimptext-vectors.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText-vectors
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_VECTORS_H__
+#define __GIMP_TEXT_VECTORS_H__
+
+
+GimpVectors * gimp_text_vectors_new    (GimpImage *image,
+                                        GimpText  *text);
+
+
+#endif /* __GIMP_TEXT_VECTORS_H__ */
diff --git a/app/text/gimptext-xlfd.c b/app/text/gimptext-xlfd.c
new file mode 100644
index 0000000..16245b5
--- /dev/null
+++ b/app/text/gimptext-xlfd.c
@@ -0,0 +1,301 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2004  Sven Neumann <sven@gimp.org>
+ *
+ * Some of this code was copied from Pango (pangox-fontmap.c)
+ * and was originally written by Owen Taylor <otaylor@redhat.com>.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "text-types.h"
+
+#include "gimptext.h"
+#include "gimptext-xlfd.h"
+
+
+#define XLFD_MAX_FIELD_LEN 64
+
+/* These are the field numbers in the X Logical Font Description fontnames,
+   e.g. -adobe-courier-bold-o-normal--25-180-100-100-m-150-iso8859-1 */
+enum
+{
+  XLFD_FOUNDRY       = 0,
+  XLFD_FAMILY        = 1,
+  XLFD_WEIGHT        = 2,
+  XLFD_SLANT         = 3,
+  XLFD_SET_WIDTH     = 4,
+  XLFD_ADD_STYLE     = 5,
+  XLFD_PIXELS        = 6,
+  XLFD_POINTS        = 7,
+  XLFD_RESOLUTION_X  = 8,
+  XLFD_RESOLUTION_Y  = 9,
+  XLFD_SPACING       = 10,
+  XLFD_AVERAGE_WIDTH = 11,
+  XLFD_CHARSET       = 12,
+  XLFD_NUM_FIELDS
+};
+
+static gchar * gimp_text_get_xlfd_field (const gchar *fontname,
+                                         gint         field_num,
+                                         gchar       *buffer);
+static gchar * launder_font_name        (gchar       *name);
+
+
+/**
+ * gimp_text_font_name_from_xlfd:
+ * @xlfd: X Logical Font Description
+ *
+ * Attempts to extract a meaningful font name from the "family",
+ * "weight", "slant" and "stretch" fields of an X Logical Font
+ * Description.
+ *
+ * Return value: a newly allocated string.
+ **/
+gchar *
+gimp_text_font_name_from_xlfd (const gchar *xlfd)
+{
+  gchar *fields[4];
+  gchar  buffers[4][XLFD_MAX_FIELD_LEN];
+  gint   i = 0;
+
+  /*  family  */
+  fields[i] = gimp_text_get_xlfd_field (xlfd, XLFD_FAMILY, buffers[i]);
+  if (fields[i])
+    i++;
+
+  /*  weight  */
+  fields[i] = gimp_text_get_xlfd_field (xlfd, XLFD_WEIGHT, buffers[i]);
+  if (fields[i] && strcmp (fields[i], "medium"))
+    i++;
+
+  /*  slant  */
+  fields[i] = gimp_text_get_xlfd_field (xlfd, XLFD_SLANT, buffers[i]);
+  if (fields[i])
+    {
+      switch (*fields[i])
+        {
+        case 'i':
+          strcpy (buffers[i], "italic");
+          i++;
+          break;
+        case 'o':
+          strcpy (buffers[i], "oblique");
+          i++;
+          break;
+        case 'r':
+          break;
+        }
+    }
+
+  /*  stretch  */
+  fields[i] = gimp_text_get_xlfd_field (xlfd, XLFD_SET_WIDTH, buffers[i]);
+  if (fields[i] && strcmp (fields[i], "normal"))
+    i++;
+
+  if (i < 4)
+    fields[i] = NULL;
+
+  return launder_font_name (g_strconcat (fields[0], " ",
+                                         fields[1], " ",
+                                         fields[2], " ",
+                                         fields[3], NULL));
+}
+
+/**
+ * gimp_text_font_size_from_xlfd:
+ * @xlfd: X Logical Font Description
+ * @size: return location for the font size
+ * @size_unit: return location for the font size unit
+ *
+ * Attempts to extract the font size from an X Logical Font
+ * Description.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ **/
+gboolean
+gimp_text_font_size_from_xlfd (const gchar *xlfd,
+                               gdouble     *size,
+                               GimpUnit    *size_unit)
+{
+  gchar  buffer[XLFD_MAX_FIELD_LEN];
+  gchar *field;
+
+  if (!xlfd)
+    return FALSE;
+
+  field = gimp_text_get_xlfd_field (xlfd, XLFD_PIXELS, buffer);
+  if (field)
+    {
+      *size      = atoi (field);
+      *size_unit = GIMP_UNIT_PIXEL;
+      return TRUE;
+    }
+
+  field = gimp_text_get_xlfd_field (xlfd, XLFD_POINTS, buffer);
+  if (field)
+    {
+      *size      = atoi (field) / 10.0;
+      *size_unit = GIMP_UNIT_POINT;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_text_set_font_from_xlfd:
+ * @text: a #GimpText object
+ * @xlfd: X Logical Font Description
+ *
+ * Attempts to extract font name and font size from @xlfd and sets
+ * them on the #GimpText object.
+ **/
+void
+gimp_text_set_font_from_xlfd (GimpText    *text,
+                              const gchar *xlfd)
+{
+  gchar    *font;
+  gdouble   size;
+  GimpUnit  size_unit;
+
+  g_return_if_fail (GIMP_IS_TEXT (text));
+
+  if (!xlfd)
+    return;
+
+  font = gimp_text_font_name_from_xlfd (xlfd);
+
+#if GIMP_TEXT_DEBUG
+  g_printerr ("XLFD: %s  font: %s\n", xlfd, font ? font : "(null)");
+#endif
+
+  if (gimp_text_font_size_from_xlfd (xlfd, &size, &size_unit))
+    {
+      g_object_set (text,
+                    "font-size",          size,
+                    "font-size-unit",     size_unit,
+                    font ? "font" : NULL, font,
+                    NULL);
+    }
+  else if (font)
+    {
+      g_object_set (text,
+                    "font", font,
+                    NULL);
+    }
+
+  g_free (font);
+}
+
+/**
+ * gimp_text_get_xlfd_field:
+ * @fontname: an XLFD fontname
+ * @field_num: field index
+ * @buffer: buffer of at least XLFD_MAX_FIELD_LEN chars
+ *
+ * Fills the buffer with the specified field from the X Logical Font
+ * Description name, and returns it. Note: For the charset field, we
+ * also return the encoding, e.g. 'iso8859-1'.
+ *
+ * This function is basically copied from pangox-fontmap.c.
+ *
+ * Returns: a pointer to the filled buffer or %NULL if fontname is
+ * %NULL, the field is longer than XFLD_MAX_FIELD_LEN or it contains
+ * just an asterisk.
+ **/
+static gchar *
+gimp_text_get_xlfd_field (const gchar *fontname,
+                          gint         field_num,
+                          gchar       *buffer)
+{
+  const gchar *t1, *t2;
+  gchar       *p;
+  gint         countdown, num_dashes;
+  gsize        len;
+
+  if (!fontname)
+    return NULL;
+
+  /* we assume this is a valid fontname...that is, it has 14 fields */
+
+  for (t1 = fontname, countdown = field_num; *t1 && (countdown >= 0); t1++)
+    if (*t1 == '-')
+      countdown--;
+
+  num_dashes = (field_num == XLFD_CHARSET) ? 2 : 1;
+
+  for (t2 = t1; *t2; t2++)
+    {
+      if (*t2 == '-' && --num_dashes == 0)
+        break;
+    }
+
+  if (t2 > t1)
+    {
+      /* Check we don't overflow the buffer */
+      len = (gsize) t2 - (gsize) t1;
+      if (len > XLFD_MAX_FIELD_LEN - 1)
+        return NULL;
+
+      if (*t1 == '*')
+        return NULL;
+
+      strncpy (buffer, t1, len);
+      buffer[len] = 0;
+
+      /* Convert to lower case. */
+      for (p = buffer; *p; p++)
+        *p = g_ascii_tolower (*p);
+    }
+  else
+    {
+      return NULL;
+    }
+
+  return buffer;
+}
+
+/* Guard against font names that end in numbers being interpreted as a
+ * font size in pango font descriptions
+ */
+static gchar *
+launder_font_name (gchar *name)
+{
+  gchar *laundered_name;
+  gchar  last_char;
+
+  last_char = name[strlen (name) - 1];
+
+  if (g_ascii_isdigit (last_char) || last_char == '.')
+    {
+      laundered_name = g_strconcat (name, ",", NULL);
+      g_free (name);
+
+      return laundered_name;
+    }
+  else
+    return name;
+}
diff --git a/app/text/gimptext-xlfd.h b/app/text/gimptext-xlfd.h
new file mode 100644
index 0000000..3a9c509
--- /dev/null
+++ b/app/text/gimptext-xlfd.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_XLFD_H__
+#define __GIMP_TEXT_XLFD_H__
+
+
+/*  handle X Logical Font Descriptions for compat  */
+
+gchar    * gimp_text_font_name_from_xlfd (const gchar *xlfd);
+gboolean   gimp_text_font_size_from_xlfd (const gchar *xlfd,
+                                          gdouble     *size,
+                                          GimpUnit    *size_unit);
+
+void       gimp_text_set_font_from_xlfd  (GimpText    *text,
+                                          const gchar *xlfd);
+
+
+#endif /* __GIMP_TEXT_COMPAT_H__ */
diff --git a/app/text/gimptext.c b/app/text/gimptext.c
new file mode 100644
index 0000000..fe671a4
--- /dev/null
+++ b/app/text/gimptext.c
@@ -0,0 +1,596 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <pango/pango.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "text-types.h"
+
+#include "core/gimp-memsize.h"
+#include "core/gimp-utils.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpstrokeoptions.h"
+
+#include "gimptext.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TEXT,
+  PROP_MARKUP,
+  PROP_FONT,
+  PROP_FONT_SIZE,
+  PROP_UNIT,
+  PROP_ANTIALIAS,
+  PROP_HINT_STYLE,
+  PROP_KERNING,
+  PROP_LANGUAGE,
+  PROP_BASE_DIR,
+  PROP_COLOR,
+  PROP_OUTLINE,
+  PROP_JUSTIFICATION,
+  PROP_INDENTATION,
+  PROP_LINE_SPACING,
+  PROP_LETTER_SPACING,
+  PROP_BOX_MODE,
+  PROP_BOX_WIDTH,
+  PROP_BOX_HEIGHT,
+  PROP_BOX_UNIT,
+  PROP_TRANSFORMATION,
+  PROP_OFFSET_X,
+  PROP_OFFSET_Y,
+  PROP_BORDER,
+  /* for backward compatibility */
+  PROP_HINTING
+};
+
+enum
+{
+  CHANGED,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_text_finalize                    (GObject      *object);
+static void     gimp_text_get_property                (GObject      *object,
+                                                       guint         property_id,
+                                                       GValue       *value,
+                                                       GParamSpec   *pspec);
+static void     gimp_text_set_property                (GObject      *object,
+                                                       guint         property_id,
+                                                       const GValue *value,
+                                                       GParamSpec   *pspec);
+static void     gimp_text_dispatch_properties_changed (GObject      *object,
+                                                       guint         n_pspecs,
+                                                       GParamSpec  **pspecs);
+static gint64   gimp_text_get_memsize                 (GimpObject   *object,
+                                                       gint64       *gui_size);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpText, gimp_text, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
+
+#define parent_class gimp_text_parent_class
+
+static guint text_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_text_class_init (GimpTextClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpRGB          black;
+  GimpMatrix2      identity;
+  gchar           *language;
+
+  text_signals[CHANGED] =
+    g_signal_new ("changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpTextClass, changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize                    = gimp_text_finalize;
+  object_class->get_property                = gimp_text_get_property;
+  object_class->set_property                = gimp_text_set_property;
+  object_class->dispatch_properties_changed = gimp_text_dispatch_properties_changed;
+
+  gimp_object_class->get_memsize            = gimp_text_get_memsize;
+
+  gimp_rgba_set (&black, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_matrix2_identity (&identity);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_TEXT,
+                           "text",
+                           NULL, NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_MARKUP,
+                           "markup",
+                           NULL, NULL,
+                           NULL,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_FONT,
+                           "font",
+                           NULL, NULL,
+                           "Sans-serif",
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FONT_SIZE,
+                           "font-size",
+                           NULL, NULL,
+                           0.0, 8192.0, 24.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  /*  We use the name "font-size-unit" for backward compatibility.
+   *  The unit is also used for other sizes in the text object.
+   */
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_UNIT,
+                         "font-size-unit",
+                         NULL, NULL,
+                         TRUE, FALSE, GIMP_UNIT_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_HINT_STYLE,
+                         "hint-style",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_HINT_STYLE,
+                         GIMP_TEXT_HINT_STYLE_MEDIUM,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_KERNING,
+                            "kerning",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_DEFAULTS);
+
+  language = gimp_get_default_language (NULL);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LANGUAGE,
+                           "language",
+                           NULL, NULL,
+                           language,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  g_free (language);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BASE_DIR,
+                         "base-direction",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_DIRECTION,
+                         GIMP_TEXT_DIRECTION_LTR,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB (object_class, PROP_COLOR,
+                        "color",
+                        NULL, NULL,
+                        FALSE, &black,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_OUTLINE,
+                         "outline",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_OUTLINE,
+                         GIMP_TEXT_OUTLINE_NONE,
+                         GIMP_PARAM_STATIC_STRINGS |
+                         GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_JUSTIFICATION,
+                         "justify",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_JUSTIFICATION,
+                         GIMP_TEXT_JUSTIFY_LEFT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_INDENTATION,
+                           "indent",
+                           NULL, NULL,
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LINE_SPACING,
+                           "line-spacing",
+                           NULL, NULL,
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LETTER_SPACING,
+                           "letter-spacing",
+                           NULL, NULL,
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BOX_MODE,
+                         "box-mode",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_BOX_MODE,
+                         GIMP_TEXT_BOX_DYNAMIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BOX_WIDTH,
+                           "box-width",
+                           NULL, NULL,
+                           0.0, GIMP_MAX_IMAGE_SIZE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_BOX_HEIGHT,
+                           "box-height",
+                           NULL, NULL,
+                           0.0, GIMP_MAX_IMAGE_SIZE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_BOX_UNIT,
+                         "box-unit",
+                         NULL, NULL,
+                         TRUE, FALSE, GIMP_UNIT_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_MATRIX2 (object_class, PROP_TRANSFORMATION,
+                            "transformation",
+                            NULL, NULL,
+                            &identity,
+                            GIMP_PARAM_STATIC_STRINGS |
+                            GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OFFSET_X,
+                           "offset-x",
+                           NULL, NULL,
+                           -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OFFSET_Y,
+                           "offset-y",
+                           NULL, NULL,
+                           -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  /*  border does only exist to implement the old text API  */
+  g_object_class_install_property (object_class, PROP_BORDER,
+                                   g_param_spec_int ("border", NULL, NULL,
+                                                     0, GIMP_MAX_IMAGE_SIZE, 0,
+                                                     G_PARAM_CONSTRUCT |
+                                                     GIMP_PARAM_WRITABLE));
+
+  /*  the old hinting options have been replaced by 'hint-style'  */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_HINTING,
+                            "hinting",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_text_init (GimpText *text)
+{
+}
+
+static void
+gimp_text_finalize (GObject *object)
+{
+  GimpText *text = GIMP_TEXT (object);
+
+  g_clear_pointer (&text->text,     g_free);
+  g_clear_pointer (&text->markup,   g_free);
+  g_clear_pointer (&text->font,     g_free);
+  g_clear_pointer (&text->language, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_get_property (GObject      *object,
+                        guint         property_id,
+                        GValue       *value,
+                        GParamSpec   *pspec)
+{
+  GimpText *text = GIMP_TEXT (object);
+
+  switch (property_id)
+    {
+    case PROP_TEXT:
+      g_value_set_string (value, text->text);
+      break;
+    case PROP_MARKUP:
+      g_value_set_string (value, text->markup);
+      break;
+    case PROP_FONT:
+      g_value_set_string (value, text->font);
+      break;
+    case PROP_FONT_SIZE:
+      g_value_set_double (value, text->font_size);
+      break;
+    case PROP_UNIT:
+      g_value_set_int (value, text->unit);
+      break;
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, text->antialias);
+      break;
+    case PROP_HINT_STYLE:
+      g_value_set_enum (value, text->hint_style);
+      break;
+    case PROP_KERNING:
+      g_value_set_boolean (value, text->kerning);
+      break;
+    case PROP_BASE_DIR:
+      g_value_set_enum (value, text->base_dir);
+      break;
+    case PROP_LANGUAGE:
+      g_value_set_string (value, text->language);
+      break;
+    case PROP_COLOR:
+      g_value_set_boxed (value, &text->color);
+      break;
+    case PROP_OUTLINE:
+      g_value_set_enum (value, text->outline);
+      break;
+    case PROP_JUSTIFICATION:
+      g_value_set_enum (value, text->justify);
+      break;
+    case PROP_INDENTATION:
+      g_value_set_double (value, text->indent);
+      break;
+    case PROP_LINE_SPACING:
+      g_value_set_double (value, text->line_spacing);
+      break;
+    case PROP_LETTER_SPACING:
+      g_value_set_double (value, text->letter_spacing);
+      break;
+    case PROP_BOX_MODE:
+      g_value_set_enum (value, text->box_mode);
+      break;
+    case PROP_BOX_WIDTH:
+      g_value_set_double (value, text->box_width);
+      break;
+    case PROP_BOX_HEIGHT:
+      g_value_set_double (value, text->box_height);
+      break;
+    case PROP_BOX_UNIT:
+      g_value_set_int (value, text->box_unit);
+      break;
+    case PROP_TRANSFORMATION:
+      g_value_set_boxed (value, &text->transformation);
+      break;
+    case PROP_OFFSET_X:
+      g_value_set_double (value, text->offset_x);
+      break;
+    case PROP_OFFSET_Y:
+      g_value_set_double (value, text->offset_y);
+      break;
+    case PROP_HINTING:
+      g_value_set_boolean (value,
+                           text->hint_style != GIMP_TEXT_HINT_STYLE_NONE);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpText    *text = GIMP_TEXT (object);
+  GimpRGB     *color;
+  GimpMatrix2 *matrix;
+
+  switch (property_id)
+    {
+    case PROP_TEXT:
+      g_free (text->text);
+      text->text = g_value_dup_string (value);
+      if (text->text && text->markup)
+        {
+          g_clear_pointer (&text->markup, g_free);
+          g_object_notify (object, "markup");
+        }
+      break;
+    case PROP_MARKUP:
+      g_free (text->markup);
+      text->markup = g_value_dup_string (value);
+      if (text->markup && text->text)
+        {
+          g_clear_pointer (&text->text, g_free);
+          g_object_notify (object, "text");
+        }
+      break;
+    case PROP_FONT:
+      {
+        const gchar *font = g_value_get_string (value);
+
+        g_free (text->font);
+
+        if (font)
+          {
+            gsize len = strlen (font);
+
+            if (g_str_has_suffix (font, " Not-Rotated"))
+              len -= strlen ( " Not-Rotated");
+
+            text->font = g_strndup (font, len);
+          }
+        else
+          {
+            text->font = NULL;
+          }
+      }
+      break;
+    case PROP_FONT_SIZE:
+      text->font_size = g_value_get_double (value);
+      break;
+    case PROP_UNIT:
+      text->unit = g_value_get_int (value);
+      break;
+    case PROP_ANTIALIAS:
+      text->antialias = g_value_get_boolean (value);
+      break;
+    case PROP_HINT_STYLE:
+      text->hint_style = g_value_get_enum (value);
+      break;
+    case PROP_KERNING:
+      text->kerning = g_value_get_boolean (value);
+      break;
+    case PROP_LANGUAGE:
+      g_free (text->language);
+      text->language = g_value_dup_string (value);
+      break;
+    case PROP_BASE_DIR:
+      text->base_dir = g_value_get_enum (value);
+      break;
+    case PROP_COLOR:
+      color = g_value_get_boxed (value);
+      text->color = *color;
+      break;
+    case PROP_OUTLINE:
+      text->outline = g_value_get_enum (value);
+      break;
+    case PROP_JUSTIFICATION:
+      text->justify = g_value_get_enum (value);
+      break;
+    case PROP_INDENTATION:
+      text->indent = g_value_get_double (value);
+      break;
+    case PROP_LINE_SPACING:
+      text->line_spacing = g_value_get_double (value);
+      break;
+    case PROP_LETTER_SPACING:
+      text->letter_spacing = g_value_get_double (value);
+      break;
+    case PROP_BOX_MODE:
+      text->box_mode = g_value_get_enum (value);
+      break;
+    case PROP_BOX_WIDTH:
+      text->box_width = g_value_get_double (value);
+      break;
+    case PROP_BOX_HEIGHT:
+      text->box_height = g_value_get_double (value);
+      break;
+    case PROP_BOX_UNIT:
+      text->box_unit = g_value_get_int (value);
+      break;
+    case PROP_TRANSFORMATION:
+      matrix = g_value_get_boxed (value);
+      text->transformation = *matrix;
+      break;
+    case PROP_OFFSET_X:
+      text->offset_x = g_value_get_double (value);
+      break;
+    case PROP_OFFSET_Y:
+      text->offset_y = g_value_get_double (value);
+      break;
+    case PROP_BORDER:
+      text->border = g_value_get_int (value);
+      break;
+    case PROP_HINTING:
+      /* interpret "hinting" only if "hint-style" has its default
+       * value, so we don't overwrite a serialized new hint-style with
+       * a compat "hinting" that is only there for old GIMP versions
+       */
+      if (text->hint_style == GIMP_TEXT_HINT_STYLE_MEDIUM)
+        text->hint_style = (g_value_get_boolean (value) ?
+                            GIMP_TEXT_HINT_STYLE_MEDIUM :
+                            GIMP_TEXT_HINT_STYLE_NONE);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_dispatch_properties_changed (GObject     *object,
+                                       guint        n_pspecs,
+                                       GParamSpec **pspecs)
+{
+  G_OBJECT_CLASS (parent_class)->dispatch_properties_changed (object,
+                                                              n_pspecs, pspecs);
+
+  g_signal_emit (object, text_signals[CHANGED], 0);
+}
+
+static gint64
+gimp_text_get_memsize (GimpObject *object,
+                       gint64     *gui_size)
+{
+  GimpText *text    = GIMP_TEXT (object);
+  gint64    memsize = 0;
+
+  memsize += gimp_string_get_memsize (text->text);
+  memsize += gimp_string_get_memsize (text->markup);
+  memsize += gimp_string_get_memsize (text->font);
+  memsize += gimp_string_get_memsize (text->language);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+void
+gimp_text_get_transformation (GimpText    *text,
+                              GimpMatrix3 *matrix)
+{
+  g_return_if_fail (GIMP_IS_TEXT (text));
+  g_return_if_fail (matrix != NULL);
+
+  matrix->coeff[0][0] = text->transformation.coeff[0][0];
+  matrix->coeff[0][1] = text->transformation.coeff[0][1];
+  matrix->coeff[0][2] = text->offset_x;
+
+  matrix->coeff[1][0] = text->transformation.coeff[1][0];
+  matrix->coeff[1][1] = text->transformation.coeff[1][1];
+  matrix->coeff[1][2] = text->offset_y;
+
+  matrix->coeff[2][0] = 0.0;
+  matrix->coeff[2][1] = 0.0;
+  matrix->coeff[2][2] = 1.0;
+}
diff --git a/app/text/gimptext.h b/app/text/gimptext.h
new file mode 100644
index 0000000..8a292be
--- /dev/null
+++ b/app/text/gimptext.h
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_H__
+#define __GIMP_TEXT_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_TEXT            (gimp_text_get_type ())
+#define GIMP_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT, GimpText))
+#define GIMP_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT, GimpTextClass))
+#define GIMP_IS_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT))
+#define GIMP_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT))
+#define GIMP_TEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEXT, GimpTextClass))
+
+
+typedef struct _GimpTextClass  GimpTextClass;
+
+struct _GimpText
+{
+  GimpObject             parent_instance;
+
+  gchar                 *text;
+  gchar                 *markup;
+  gchar                 *font;
+  GimpUnit               unit;
+  gdouble                font_size;
+  gboolean               antialias;
+  GimpTextHintStyle      hint_style;
+  gboolean               kerning;
+  gchar                 *language;
+  GimpTextDirection      base_dir;
+  GimpRGB                color;
+  GimpTextOutline        outline;
+  GimpTextJustification  justify;
+  gdouble                indent;
+  gdouble                line_spacing;
+  gdouble                letter_spacing;
+  GimpTextBoxMode        box_mode;
+  gdouble                box_width;
+  gdouble                box_height;
+  GimpUnit               box_unit;
+  GimpMatrix2            transformation;
+  gdouble                offset_x;
+  gdouble                offset_y;
+
+  gdouble                border;
+};
+
+struct _GimpTextClass
+{
+  GimpObjectClass        parent_class;
+
+  void (* changed) (GimpText *text);
+};
+
+
+GType  gimp_text_get_type           (void) G_GNUC_CONST;
+
+void   gimp_text_get_transformation (GimpText    *text,
+                                     GimpMatrix3 *matrix);
+
+
+#endif /* __GIMP_TEXT_H__ */
diff --git a/app/text/gimptextlayer-transform.c b/app/text/gimptextlayer-transform.c
new file mode 100644
index 0000000..20e6720
--- /dev/null
+++ b/app/text/gimptextlayer-transform.c
@@ -0,0 +1,201 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextLayer
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "text-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpimage-undo.h"
+
+#include "gimptext.h"
+#include "gimptextlayer.h"
+#include "gimptextlayer-transform.h"
+
+
+static GimpItemClass * gimp_text_layer_parent_class (void) G_GNUC_CONST;
+
+static gboolean  gimp_text_layer_get_transformation  (GimpTextLayer *layer,
+                                                      GimpMatrix3   *matrix);
+static gboolean  gimp_text_layer_set_transformation  (GimpTextLayer *layer,
+                                                      GimpMatrix3   *matrix);
+
+
+void
+gimp_text_layer_scale (GimpItem               *item,
+                       gint                    new_width,
+                       gint                    new_height,
+                       gint                    new_offset_x,
+                       gint                    new_offset_y,
+                       GimpInterpolationType   interpolation_type,
+                       GimpProgress           *progress)
+{
+  /*  TODO  */
+}
+
+static gboolean
+gimp_text_layer_transform_flip (GimpTextLayer       *layer,
+                                GimpOrientationType  flip_type,
+                                gdouble              axis)
+{
+  GimpMatrix3  matrix;
+
+  if (! gimp_text_layer_get_transformation (layer, &matrix))
+    return FALSE;
+
+  gimp_transform_matrix_flip (&matrix, flip_type, axis);
+
+  return gimp_text_layer_set_transformation (layer, &matrix);
+}
+
+void
+gimp_text_layer_flip (GimpItem            *item,
+                      GimpContext         *context,
+                      GimpOrientationType  flip_type,
+                      gdouble              axis,
+                      gboolean             clip_result)
+{
+  GimpTextLayer *layer = GIMP_TEXT_LAYER (item);
+
+  if (gimp_text_layer_transform_flip (layer, flip_type, axis))
+    {
+      GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (layer));
+
+      if (mask)
+        gimp_item_flip (GIMP_ITEM (mask), context,
+                        flip_type, axis, clip_result);
+    }
+  else
+    {
+      gimp_text_layer_parent_class ()->flip (item, context,
+                                             flip_type, axis, clip_result);
+    }
+}
+
+static gboolean
+gimp_text_layer_transform_rotate (GimpTextLayer    *layer,
+                                  GimpRotationType  rotate_type,
+                                  gdouble           center_x,
+                                  gdouble           center_y)
+{
+  GimpMatrix3  matrix;
+
+  if (! gimp_text_layer_get_transformation (layer, &matrix))
+    return FALSE;
+
+  gimp_transform_matrix_rotate (&matrix, rotate_type, center_x, center_y);
+
+  return gimp_text_layer_set_transformation (layer, &matrix);
+}
+
+void
+gimp_text_layer_rotate (GimpItem         *item,
+                        GimpContext      *context,
+                        GimpRotationType  rotate_type,
+                        gdouble           center_x,
+                        gdouble           center_y,
+                        gboolean          clip_result)
+{
+  GimpTextLayer *layer = GIMP_TEXT_LAYER (item);
+
+  if (! gimp_text_layer_transform_rotate (layer,
+                                          rotate_type, center_x, center_y))
+    {
+      GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (layer));
+
+      if (mask)
+        gimp_item_rotate (GIMP_ITEM (mask), context,
+                          rotate_type, center_x, center_y, clip_result);
+    }
+  else
+    {
+      gimp_text_layer_parent_class ()->rotate (item, context,
+                                               rotate_type, center_x, center_y,
+                                               clip_result);
+    }
+}
+
+void
+gimp_text_layer_transform (GimpItem               *item,
+                           GimpContext            *context,
+                           const GimpMatrix3      *matrix,
+                           GimpTransformDirection  direction,
+                           GimpInterpolationType   interpolation_type,
+                           gboolean                supersample,
+                           GimpTransformResize     clip_result,
+                           GimpProgress           *progress)
+{
+  /*  TODO  */
+}
+
+static GimpItemClass *
+gimp_text_layer_parent_class (void)
+{
+  static GimpItemClass *parent_class = NULL;
+
+  if (! parent_class)
+    {
+      gpointer klass = g_type_class_peek (GIMP_TYPE_TEXT_LAYER);
+
+      parent_class = g_type_class_peek_parent (klass);
+    }
+
+  return parent_class;
+}
+
+static gboolean
+gimp_text_layer_get_transformation (GimpTextLayer *layer,
+                                    GimpMatrix3   *matrix)
+{
+  if (! layer->text || layer->modified)
+    return FALSE;
+
+  gimp_text_get_transformation (layer->text, matrix);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_text_layer_set_transformation (GimpTextLayer *layer,
+                                    GimpMatrix3   *matrix)
+{
+  GimpMatrix2  trafo;
+
+  if (! gimp_matrix3_is_affine (matrix))
+    return FALSE;
+
+  trafo.coeff[0][0] = matrix->coeff[0][0];
+  trafo.coeff[0][1] = matrix->coeff[0][1];
+  trafo.coeff[1][0] = matrix->coeff[1][0];
+  trafo.coeff[1][1] = matrix->coeff[1][1];
+
+  gimp_text_layer_set (GIMP_TEXT_LAYER (layer), NULL,
+                       "transformation", &trafo,
+                       "offset-x",       matrix->coeff[0][2],
+                       "offset-y",       matrix->coeff[1][2],
+                       NULL);
+
+  return TRUE;
+}
diff --git a/app/text/gimptextlayer-transform.h b/app/text/gimptextlayer-transform.h
new file mode 100644
index 0000000..bf17a86
--- /dev/null
+++ b/app/text/gimptextlayer-transform.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextLayer
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_LAYER_TRANSFORM_H__
+#define __GIMP_TEXT_LAYER_TRANSFORM_H__
+
+
+void  gimp_text_layer_scale     (GimpItem               *item,
+                                 gint                    new_width,
+                                 gint                    new_height,
+                                 gint                    new_offset_x,
+                                 gint                    new_offset_y,
+                                 GimpInterpolationType   interpolation_type,
+                                 GimpProgress           *progress);
+void  gimp_text_layer_flip      (GimpItem               *item,
+                                 GimpContext            *context,
+                                 GimpOrientationType     flip_type,
+                                 gdouble                 axis,
+                                 gboolean                clip_result);
+void  gimp_text_layer_rotate    (GimpItem               *item,
+                                 GimpContext            *context,
+                                 GimpRotationType        rotate_type,
+                                 gdouble                 center_x,
+                                 gdouble                 center_y,
+                                 gboolean                clip_result);
+void  gimp_text_layer_transform (GimpItem               *item,
+                                 GimpContext            *context,
+                                 const GimpMatrix3      *matrix,
+                                 GimpTransformDirection  direction,
+                                 GimpInterpolationType   interpolation_type,
+                                 gboolean                supersample,
+                                 GimpTransformResize     clip_result,
+                                 GimpProgress           *progress);
+
+
+#endif /* __GIMP_TEXT_LAYER_TRANSFORM_H__ */
diff --git a/app/text/gimptextlayer-xcf.c b/app/text/gimptextlayer-xcf.c
new file mode 100644
index 0000000..33452a1
--- /dev/null
+++ b/app/text/gimptextlayer-xcf.c
@@ -0,0 +1,220 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+#include <cairo.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "text-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable-private.h" /* eek */
+#include "core/gimpimage.h"
+#include "core/gimpparasitelist.h"
+
+#include "gimptext.h"
+#include "gimptext-parasite.h"
+#include "gimptextlayer.h"
+#include "gimptextlayer-xcf.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  TEXT_LAYER_XCF_NONE              = 0,
+  TEXT_LAYER_XCF_DONT_AUTO_RENAME  = 1 << 0,
+  TEXT_LAYER_XCF_MODIFIED          = 1 << 1
+};
+
+
+static GimpLayer * gimp_text_layer_from_layer (GimpLayer *layer,
+                                               GimpText  *text);
+
+
+gboolean
+gimp_text_layer_xcf_load_hack (GimpLayer **layer)
+{
+  const gchar        *name;
+  GimpText           *text = NULL;
+  const GimpParasite *parasite;
+
+  g_return_val_if_fail (layer != NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_LAYER (*layer), FALSE);
+
+  name = gimp_text_parasite_name ();
+  parasite = gimp_item_parasite_find (GIMP_ITEM (*layer), name);
+
+  if (parasite)
+    {
+      GError *error = NULL;
+
+      text = gimp_text_from_parasite (parasite, &error);
+
+      if (error)
+        {
+          gimp_message (gimp_item_get_image (GIMP_ITEM (*layer))->gimp, NULL,
+                        GIMP_MESSAGE_ERROR,
+                        _("Problems parsing the text parasite for layer '%s':\n"
+                          "%s\n\n"
+                          "Some text properties may be wrong. "
+                          "Unless you want to edit the text layer, "
+                          "you don't need to worry about this."),
+                        gimp_object_get_name (*layer),
+                        error->message);
+          g_clear_error (&error);
+        }
+    }
+  else
+    {
+      name = gimp_text_gdyntext_parasite_name ();
+
+      parasite = gimp_item_parasite_find (GIMP_ITEM (*layer), name);
+
+      if (parasite)
+        text = gimp_text_from_gdyntext_parasite (parasite);
+    }
+
+  if (text)
+    {
+      *layer = gimp_text_layer_from_layer (*layer, text);
+
+      /*  let the text layer knows what parasite was used to create it  */
+      GIMP_TEXT_LAYER (*layer)->text_parasite = name;
+    }
+
+  return (text != NULL);
+}
+
+void
+gimp_text_layer_xcf_save_prepare (GimpTextLayer *layer)
+{
+  GimpText *text;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYER (layer));
+
+  /*  If the layer has a text parasite already, it wasn't changed and we
+   *  can simply save the original parasite back which is still attached.
+   */
+  if (layer->text_parasite)
+    return;
+
+  text = gimp_text_layer_get_text (layer);
+  if (text)
+    {
+      GimpParasite *parasite = gimp_text_to_parasite (text);
+
+      /*  Don't push an undo because the parasite only exists temporarily
+       *  while the text layer is saved to XCF.
+       */
+      gimp_item_parasite_attach (GIMP_ITEM (layer), parasite, FALSE);
+
+      gimp_parasite_free (parasite);
+    }
+}
+
+guint32
+gimp_text_layer_get_xcf_flags (GimpTextLayer *text_layer)
+{
+  guint flags = 0;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYER (text_layer), 0);
+
+  if (! text_layer->auto_rename)
+    flags |= TEXT_LAYER_XCF_DONT_AUTO_RENAME;
+
+  if (text_layer->modified)
+    flags |= TEXT_LAYER_XCF_MODIFIED;
+
+  return flags;
+}
+
+void
+gimp_text_layer_set_xcf_flags (GimpTextLayer *text_layer,
+                               guint32        flags)
+{
+  g_return_if_fail (GIMP_IS_TEXT_LAYER (text_layer));
+
+  g_object_set (text_layer,
+                "auto-rename", (flags & TEXT_LAYER_XCF_DONT_AUTO_RENAME) == 0,
+                "modified",    (flags & TEXT_LAYER_XCF_MODIFIED)         != 0,
+                NULL);
+}
+
+
+/**
+ * gimp_text_layer_from_layer:
+ * @layer: a #GimpLayer object
+ * @text: a #GimpText object
+ *
+ * Converts a standard #GimpLayer and a #GimpText object into a
+ * #GimpTextLayer. The new text layer takes ownership of the @text and
+ * @layer objects.  The @layer object is rendered unusable by this
+ * function. Don't even try to use if afterwards!
+ *
+ * This is a gross hack that is needed in order to load text layers
+ * from XCF files in a backwards-compatible way. Please don't use it
+ * for anything else!
+ *
+ * Return value: a newly allocated #GimpTextLayer object
+ **/
+static GimpLayer *
+gimp_text_layer_from_layer (GimpLayer *layer,
+                            GimpText  *text)
+{
+  GimpTextLayer *text_layer;
+  GimpDrawable  *drawable;
+
+  g_return_val_if_fail (GIMP_IS_LAYER (layer), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+
+  text_layer = g_object_new (GIMP_TYPE_TEXT_LAYER,
+                             "image", gimp_item_get_image (GIMP_ITEM (layer)),
+                             NULL);
+
+  gimp_item_replace_item (GIMP_ITEM (text_layer), GIMP_ITEM (layer));
+
+  drawable = GIMP_DRAWABLE (text_layer);
+
+  gimp_drawable_steal_buffer (drawable, GIMP_DRAWABLE (layer));
+
+  gimp_layer_set_opacity         (GIMP_LAYER (text_layer),
+                                  gimp_layer_get_opacity (layer), FALSE);
+  gimp_layer_set_mode            (GIMP_LAYER (text_layer),
+                                  gimp_layer_get_mode (layer), FALSE);
+  gimp_layer_set_blend_space     (GIMP_LAYER (text_layer),
+                                  gimp_layer_get_blend_space (layer), FALSE);
+  gimp_layer_set_composite_space (GIMP_LAYER (text_layer),
+                                  gimp_layer_get_composite_space (layer), FALSE);
+  gimp_layer_set_composite_mode  (GIMP_LAYER (text_layer),
+                                  gimp_layer_get_composite_mode (layer), FALSE);
+  gimp_layer_set_lock_alpha      (GIMP_LAYER (text_layer),
+                                  gimp_layer_get_lock_alpha (layer), FALSE);
+
+  gimp_text_layer_set_text (text_layer, text);
+
+  g_object_unref (text);
+  g_object_unref (layer);
+
+  return GIMP_LAYER (text_layer);
+}
diff --git a/app/text/gimptextlayer-xcf.h b/app/text/gimptextlayer-xcf.h
new file mode 100644
index 0000000..3d08dfa
--- /dev/null
+++ b/app/text/gimptextlayer-xcf.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_LAYER_XCF_H__
+#define __GIMP_TEXT_LAYER_XCF_H__
+
+
+gboolean  gimp_text_layer_xcf_load_hack    (GimpLayer     **layer);
+
+void      gimp_text_layer_xcf_save_prepare (GimpTextLayer  *text_layer);
+
+guint32   gimp_text_layer_get_xcf_flags    (GimpTextLayer  *text_layer);
+void      gimp_text_layer_set_xcf_flags    (GimpTextLayer  *text_layer,
+                                            guint32         flags);
+
+
+#endif /* __GIMP_TEXT_LAYER_XCF_H__ */
diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c
new file mode 100644
index 0000000..fb4146a
--- /dev/null
+++ b/app/text/gimptextlayer.c
@@ -0,0 +1,861 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextLayer
+ * Copyright (C) 2002-2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <pango/pangocairo.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "text-types.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpcontext.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpitemtree.h"
+#include "core/gimpparasitelist.h"
+
+#include "gimptext.h"
+#include "gimptextlayer.h"
+#include "gimptextlayer-transform.h"
+#include "gimptextlayout.h"
+#include "gimptextlayout-render.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TEXT,
+  PROP_AUTO_RENAME,
+  PROP_MODIFIED
+};
+
+struct _GimpTextLayerPrivate
+{
+  GimpTextDirection base_dir;
+};
+
+static void       gimp_text_layer_finalize       (GObject           *object);
+static void       gimp_text_layer_get_property   (GObject           *object,
+                                                  guint              property_id,
+                                                  GValue            *value,
+                                                  GParamSpec        *pspec);
+static void       gimp_text_layer_set_property   (GObject           *object,
+                                                  guint              property_id,
+                                                  const GValue      *value,
+                                                  GParamSpec        *pspec);
+
+static gint64     gimp_text_layer_get_memsize    (GimpObject        *object,
+                                                  gint64            *gui_size);
+
+static GimpItem * gimp_text_layer_duplicate      (GimpItem          *item,
+                                                  GType              new_type);
+static gboolean   gimp_text_layer_rename         (GimpItem          *item,
+                                                  const gchar       *new_name,
+                                                  const gchar       *undo_desc,
+                                                  GError           **error);
+
+static void       gimp_text_layer_set_buffer     (GimpDrawable      *drawable,
+                                                  gboolean           push_undo,
+                                                  const gchar       *undo_desc,
+                                                  GeglBuffer        *buffer,
+                                                  const GeglRectangle *bounds);
+static void       gimp_text_layer_push_undo      (GimpDrawable      *drawable,
+                                                  const gchar       *undo_desc,
+                                                  GeglBuffer        *buffer,
+                                                  gint               x,
+                                                  gint               y,
+                                                  gint               width,
+                                                  gint               height);
+
+static void       gimp_text_layer_convert_type   (GimpLayer         *layer,
+                                                  GimpImage         *dest_image,
+                                                  const Babl        *new_format,
+                                                  GimpColorProfile  *dest_profile,
+                                                  GeglDitherMethod   layer_dither_type,
+                                                  GeglDitherMethod   mask_dither_type,
+                                                  gboolean           push_undo,
+                                                  GimpProgress      *progress);
+
+static void       gimp_text_layer_text_changed   (GimpTextLayer     *layer);
+static gboolean   gimp_text_layer_render         (GimpTextLayer     *layer);
+static void       gimp_text_layer_render_layout  (GimpTextLayer     *layer,
+                                                  GimpTextLayout    *layout);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpTextLayer, gimp_text_layer, GIMP_TYPE_LAYER)
+
+#define parent_class gimp_text_layer_parent_class
+
+
+static void
+gimp_text_layer_class_init (GimpTextLayerClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpItemClass     *item_class        = GIMP_ITEM_CLASS (klass);
+  GimpDrawableClass *drawable_class    = GIMP_DRAWABLE_CLASS (klass);
+  GimpLayerClass    *layer_class       = GIMP_LAYER_CLASS (klass);
+
+  object_class->finalize            = gimp_text_layer_finalize;
+  object_class->get_property        = gimp_text_layer_get_property;
+  object_class->set_property        = gimp_text_layer_set_property;
+
+  gimp_object_class->get_memsize    = gimp_text_layer_get_memsize;
+
+  viewable_class->default_icon_name = "gimp-text-layer";
+
+  item_class->duplicate             = gimp_text_layer_duplicate;
+  item_class->rename                = gimp_text_layer_rename;
+
+#if 0
+  item_class->scale                 = gimp_text_layer_scale;
+  item_class->flip                  = gimp_text_layer_flip;
+  item_class->rotate                = gimp_text_layer_rotate;
+  item_class->transform             = gimp_text_layer_transform;
+#endif
+
+  item_class->default_name          = _("Text Layer");
+  item_class->rename_desc           = _("Rename Text Layer");
+  item_class->translate_desc        = _("Move Text Layer");
+  item_class->scale_desc            = _("Scale Text Layer");
+  item_class->resize_desc           = _("Resize Text Layer");
+  item_class->flip_desc             = _("Flip Text Layer");
+  item_class->rotate_desc           = _("Rotate Text Layer");
+  item_class->transform_desc        = _("Transform Text Layer");
+
+  drawable_class->set_buffer        = gimp_text_layer_set_buffer;
+  drawable_class->push_undo         = gimp_text_layer_push_undo;
+
+  layer_class->convert_type         = gimp_text_layer_convert_type;
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_TEXT,
+                           "text",
+                           NULL, NULL,
+                           GIMP_TYPE_TEXT,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_AUTO_RENAME,
+                            "auto-rename",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MODIFIED,
+                            "modified",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_text_layer_init (GimpTextLayer *layer)
+{
+  layer->text          = NULL;
+  layer->text_parasite = NULL;
+  layer->private       = gimp_text_layer_get_instance_private (layer);
+}
+
+static void
+gimp_text_layer_finalize (GObject *object)
+{
+  GimpTextLayer *layer = GIMP_TEXT_LAYER (object);
+
+  g_clear_object (&layer->text);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_layer_get_property (GObject      *object,
+                              guint         property_id,
+                              GValue       *value,
+                              GParamSpec   *pspec)
+{
+  GimpTextLayer *text_layer = GIMP_TEXT_LAYER (object);
+
+  switch (property_id)
+    {
+    case PROP_TEXT:
+      g_value_set_object (value, text_layer->text);
+      break;
+    case PROP_AUTO_RENAME:
+      g_value_set_boolean (value, text_layer->auto_rename);
+      break;
+    case PROP_MODIFIED:
+      g_value_set_boolean (value, text_layer->modified);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_layer_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpTextLayer *text_layer = GIMP_TEXT_LAYER (object);
+
+  switch (property_id)
+    {
+    case PROP_TEXT:
+      gimp_text_layer_set_text (text_layer, g_value_get_object (value));
+      break;
+    case PROP_AUTO_RENAME:
+      text_layer->auto_rename = g_value_get_boolean (value);
+      break;
+    case PROP_MODIFIED:
+      text_layer->modified = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_text_layer_get_memsize (GimpObject *object,
+                             gint64     *gui_size)
+{
+  GimpTextLayer *text_layer = GIMP_TEXT_LAYER (object);
+  gint64         memsize    = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (text_layer->text),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static GimpItem *
+gimp_text_layer_duplicate (GimpItem *item,
+                           GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_DRAWABLE), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  if (GIMP_IS_TEXT_LAYER (new_item))
+    {
+      GimpTextLayer *layer     = GIMP_TEXT_LAYER (item);
+      GimpTextLayer *new_layer = GIMP_TEXT_LAYER (new_item);
+
+      gimp_config_sync (G_OBJECT (layer), G_OBJECT (new_layer), 0);
+
+      if (layer->text)
+        {
+          GimpText *text = gimp_config_duplicate (GIMP_CONFIG (layer->text));
+
+          gimp_text_layer_set_text (new_layer, text);
+
+          g_object_unref (text);
+        }
+
+      /*  this is just the parasite name, not a pointer to the parasite  */
+      if (layer->text_parasite)
+        new_layer->text_parasite = layer->text_parasite;
+
+      new_layer->private->base_dir = layer->private->base_dir;
+    }
+
+  return new_item;
+}
+
+static gboolean
+gimp_text_layer_rename (GimpItem     *item,
+                        const gchar  *new_name,
+                        const gchar  *undo_desc,
+                        GError      **error)
+{
+  if (GIMP_ITEM_CLASS (parent_class)->rename (item, new_name, undo_desc, error))
+    {
+      g_object_set (item, "auto-rename", FALSE, NULL);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_text_layer_set_buffer (GimpDrawable        *drawable,
+                            gboolean             push_undo,
+                            const gchar         *undo_desc,
+                            GeglBuffer          *buffer,
+                            const GeglRectangle *bounds)
+{
+  GimpTextLayer *layer = GIMP_TEXT_LAYER (drawable);
+  GimpImage     *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  if (push_undo && ! layer->modified)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_DRAWABLE_MOD,
+                                 undo_desc);
+
+  GIMP_DRAWABLE_CLASS (parent_class)->set_buffer (drawable,
+                                                  push_undo, undo_desc,
+                                                  buffer, bounds);
+
+  if (push_undo && ! layer->modified)
+    {
+      gimp_image_undo_push_text_layer_modified (image, NULL, layer);
+
+      g_object_set (drawable, "modified", TRUE, NULL);
+
+      gimp_image_undo_group_end (image);
+    }
+}
+
+static void
+gimp_text_layer_push_undo (GimpDrawable *drawable,
+                           const gchar  *undo_desc,
+                           GeglBuffer   *buffer,
+                           gint          x,
+                           gint          y,
+                           gint          width,
+                           gint          height)
+{
+  GimpTextLayer *layer = GIMP_TEXT_LAYER (drawable);
+  GimpImage     *image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  if (! layer->modified)
+    gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_DRAWABLE, undo_desc);
+
+  GIMP_DRAWABLE_CLASS (parent_class)->push_undo (drawable, undo_desc,
+                                                 buffer,
+                                                 x, y, width, height);
+
+  if (! layer->modified)
+    {
+      gimp_image_undo_push_text_layer_modified (image, NULL, layer);
+
+      g_object_set (drawable, "modified", TRUE, NULL);
+
+      gimp_image_undo_group_end (image);
+    }
+}
+
+static void
+gimp_text_layer_convert_type (GimpLayer         *layer,
+                              GimpImage         *dest_image,
+                              const Babl        *new_format,
+                              GimpColorProfile  *dest_profile,
+                              GeglDitherMethod   layer_dither_type,
+                              GeglDitherMethod   mask_dither_type,
+                              gboolean           push_undo,
+                              GimpProgress      *progress)
+{
+  GimpTextLayer *text_layer = GIMP_TEXT_LAYER (layer);
+  GimpImage     *image      = gimp_item_get_image (GIMP_ITEM (text_layer));
+
+  if (! text_layer->text   ||
+      text_layer->modified ||
+      layer_dither_type != GEGL_DITHER_NONE)
+    {
+      GIMP_LAYER_CLASS (parent_class)->convert_type (layer, dest_image,
+                                                     new_format,
+                                                     dest_profile,
+                                                     layer_dither_type,
+                                                     mask_dither_type,
+                                                     push_undo,
+                                                     progress);
+    }
+  else
+    {
+      if (push_undo)
+        gimp_image_undo_push_text_layer_convert (image, NULL, text_layer);
+
+      text_layer->convert_format = new_format;
+
+      gimp_text_layer_render (text_layer);
+
+      text_layer->convert_format = NULL;
+    }
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_text_layer_new:
+ * @image: the #GimpImage the layer should belong to
+ * @text: a #GimpText object
+ *
+ * Creates a new text layer.
+ *
+ * Return value: a new #GimpTextLayer or %NULL in case of a problem
+ **/
+GimpLayer *
+gimp_text_layer_new (GimpImage *image,
+                     GimpText  *text)
+{
+  GimpTextLayer *layer;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+
+  if (! text->text && ! text->markup)
+    return NULL;
+
+  layer =
+    GIMP_TEXT_LAYER (gimp_drawable_new (GIMP_TYPE_TEXT_LAYER,
+                                        image, NULL,
+                                        0, 0, 1, 1,
+                                        gimp_image_get_layer_format (image,
+                                                                     TRUE)));
+
+  gimp_layer_set_mode (GIMP_LAYER (layer),
+                       gimp_image_get_default_new_layer_mode (image),
+                       FALSE);
+
+  gimp_text_layer_set_text (layer, text);
+
+  if (! gimp_text_layer_render (layer))
+    {
+      g_object_unref (layer);
+      return NULL;
+    }
+
+  return GIMP_LAYER (layer);
+}
+
+void
+gimp_text_layer_set_text (GimpTextLayer *layer,
+                          GimpText      *text)
+{
+  g_return_if_fail (GIMP_IS_TEXT_LAYER (layer));
+  g_return_if_fail (text == NULL || GIMP_IS_TEXT (text));
+
+  if (layer->text == text)
+    return;
+
+  if (layer->text)
+    {
+      g_signal_handlers_disconnect_by_func (layer->text,
+                                            G_CALLBACK (gimp_text_layer_text_changed),
+                                            layer);
+
+      g_clear_object (&layer->text);
+    }
+
+  if (text)
+    {
+      layer->text = g_object_ref (text);
+      layer->private->base_dir = layer->text->base_dir;
+
+      g_signal_connect_object (text, "changed",
+                               G_CALLBACK (gimp_text_layer_text_changed),
+                               layer, G_CONNECT_SWAPPED);
+    }
+
+  g_object_notify (G_OBJECT (layer), "text");
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (layer));
+}
+
+GimpText *
+gimp_text_layer_get_text (GimpTextLayer *layer)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYER (layer), NULL);
+
+  return layer->text;
+}
+
+void
+gimp_text_layer_set (GimpTextLayer *layer,
+                     const gchar   *undo_desc,
+                     const gchar   *first_property_name,
+                     ...)
+{
+  GimpImage *image;
+  GimpText  *text;
+  va_list    var_args;
+
+  g_return_if_fail (gimp_item_is_text_layer (GIMP_ITEM (layer)));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)));
+
+  text = gimp_text_layer_get_text (layer);
+  if (! text)
+    return;
+
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TEXT, undo_desc);
+
+  g_object_freeze_notify (G_OBJECT (layer));
+
+  if (layer->modified)
+    {
+      gimp_image_undo_push_text_layer_modified (image, NULL, layer);
+
+      /*  pass copy_tiles = TRUE so we not only ref the tiles; after
+       *  being a text layer again, undo doesn't care about the
+       *  layer's pixels any longer because they are generated, so
+       *  changing the text would happily overwrite the layer's
+       *  pixels, changing the pixels on the undo stack too without
+       *  any chance to ever undo again.
+       */
+      gimp_image_undo_push_drawable_mod (image, NULL,
+                                         GIMP_DRAWABLE (layer), TRUE);
+    }
+
+  gimp_image_undo_push_text_layer (image, undo_desc, layer, NULL);
+
+  va_start (var_args, first_property_name);
+
+  g_object_set_valist (G_OBJECT (text), first_property_name, var_args);
+
+  va_end (var_args);
+
+  g_object_set (layer, "modified", FALSE, NULL);
+
+  g_object_thaw_notify (G_OBJECT (layer));
+
+  gimp_image_undo_group_end (image);
+}
+
+/**
+ * gimp_text_layer_discard:
+ * @layer: a #GimpTextLayer
+ *
+ * Discards the text information. This makes @layer behave like a
+ * normal layer.
+ */
+void
+gimp_text_layer_discard (GimpTextLayer *layer)
+{
+  g_return_if_fail (GIMP_IS_TEXT_LAYER (layer));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)));
+
+  if (! layer->text)
+    return;
+
+  gimp_image_undo_push_text_layer (gimp_item_get_image (GIMP_ITEM (layer)),
+                                   _("Discard Text Information"),
+                                   layer, NULL);
+
+  gimp_text_layer_set_text (layer, NULL);
+}
+
+gboolean
+gimp_item_is_text_layer (GimpItem *item)
+{
+  return (GIMP_IS_TEXT_LAYER (item)    &&
+          GIMP_TEXT_LAYER (item)->text &&
+          GIMP_TEXT_LAYER (item)->modified == FALSE);
+}
+
+
+/*  private functions  */
+
+static const Babl *
+gimp_text_layer_get_format (GimpTextLayer *layer)
+{
+  if (layer->convert_format)
+    return layer->convert_format;
+
+  return gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+}
+
+static void
+gimp_text_layer_text_changed (GimpTextLayer *layer)
+{
+  /*  If the text layer was created from a parasite, it's time to
+   *  remove that parasite now.
+   */
+  if (layer->text_parasite)
+    {
+      /*  Don't push an undo because the parasite only exists temporarily
+       *  while the text layer is loaded from XCF.
+       */
+      gimp_item_parasite_detach (GIMP_ITEM (layer), layer->text_parasite,
+                                 FALSE);
+      layer->text_parasite = NULL;
+    }
+
+  if (layer->text->box_mode == GIMP_TEXT_BOX_DYNAMIC)
+    {
+      gint                old_width;
+      gint                new_width;
+      GimpItem           *item         = GIMP_ITEM (layer);
+      GimpTextDirection   old_base_dir = layer->private->base_dir;
+      GimpTextDirection   new_base_dir = layer->text->base_dir;
+
+      old_width = gimp_item_get_width (item);
+      gimp_text_layer_render (layer);
+      new_width = gimp_item_get_width (item);
+
+      if (old_base_dir != new_base_dir)
+        {
+          switch (old_base_dir)
+            {
+            case GIMP_TEXT_DIRECTION_LTR:
+            case GIMP_TEXT_DIRECTION_RTL:
+            case GIMP_TEXT_DIRECTION_TTB_LTR:
+            case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+              switch (new_base_dir)
+                {
+                case GIMP_TEXT_DIRECTION_TTB_RTL:
+                case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+                  gimp_item_translate (item, -new_width, 0, FALSE);
+                  break;
+
+                case GIMP_TEXT_DIRECTION_LTR:
+                case GIMP_TEXT_DIRECTION_RTL:
+                case GIMP_TEXT_DIRECTION_TTB_LTR:
+                case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+                  break;
+                }
+              break;
+
+            case GIMP_TEXT_DIRECTION_TTB_RTL:
+            case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+              switch (new_base_dir)
+                {
+                case GIMP_TEXT_DIRECTION_LTR:
+                case GIMP_TEXT_DIRECTION_RTL:
+                case GIMP_TEXT_DIRECTION_TTB_LTR:
+                case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+                  gimp_item_translate (item, old_width, 0, FALSE);
+                  break;
+
+                case GIMP_TEXT_DIRECTION_TTB_RTL:
+                case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+                  break;
+                }
+              break;
+            }
+        }
+      else if ((new_base_dir == GIMP_TEXT_DIRECTION_TTB_RTL ||
+              new_base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT))
+        {
+          if (old_width != new_width)
+            gimp_item_translate (item, old_width - new_width, 0, FALSE);
+        }
+    }
+  else
+    gimp_text_layer_render (layer);
+
+  layer->private->base_dir = layer->text->base_dir;
+}
+
+static gboolean
+gimp_text_layer_render (GimpTextLayer *layer)
+{
+  GimpDrawable   *drawable;
+  GimpItem       *item;
+  GimpImage      *image;
+  GimpContainer  *container;
+  GimpTextLayout *layout;
+  gdouble         xres;
+  gdouble         yres;
+  gint            width;
+  gint            height;
+  GError         *error = NULL;
+
+  if (! layer->text)
+    return FALSE;
+
+  drawable  = GIMP_DRAWABLE (layer);
+  item      = GIMP_ITEM (layer);
+  image     = gimp_item_get_image (item);
+  container = gimp_data_factory_get_container (image->gimp->font_factory);
+
+  gimp_data_factory_data_wait (image->gimp->font_factory);
+
+  if (gimp_container_is_empty (container))
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            _("Due to lack of any fonts, "
+                              "text functionality is not available."));
+      return FALSE;
+    }
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  layout = gimp_text_layout_new (layer->text, xres, yres, &error);
+  if (error)
+    {
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_error_free (error);
+    }
+
+  g_object_freeze_notify (G_OBJECT (drawable));
+
+  if (gimp_text_layout_get_size (layout, &width, &height) &&
+      (width  != gimp_item_get_width  (item) ||
+       height != gimp_item_get_height (item) ||
+       gimp_text_layer_get_format (layer) !=
+       gimp_drawable_get_format (drawable)))
+    {
+      GeglBuffer *new_buffer;
+
+      new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
+                                    gimp_text_layer_get_format (layer));
+      gimp_drawable_set_buffer (drawable, FALSE, NULL, new_buffer);
+      g_object_unref (new_buffer);
+
+      if (gimp_layer_get_mask (GIMP_LAYER (layer)))
+        {
+          GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (layer));
+
+          static GimpContext *unused_eek = NULL;
+
+          if (! unused_eek)
+            unused_eek = gimp_context_new (image->gimp, "eek", NULL);
+
+          gimp_item_resize (GIMP_ITEM (mask),
+                            unused_eek, GIMP_FILL_TRANSPARENT,
+                            width, height, 0, 0);
+        }
+    }
+
+  if (layer->auto_rename)
+    {
+      GimpItem *item = GIMP_ITEM (layer);
+      gchar    *name = NULL;
+
+      if (layer->text->text)
+        {
+          name = gimp_utf8_strtrim (layer->text->text, 30);
+        }
+      else if (layer->text->markup)
+        {
+          gchar *tmp = gimp_markup_extract_text (layer->text->markup);
+          name = gimp_utf8_strtrim (tmp, 30);
+          g_free (tmp);
+        }
+
+      if (! name || ! name[0])
+        {
+          g_free (name);
+          name = g_strdup (_("Empty Text Layer"));
+        }
+
+      if (gimp_item_is_attached (item))
+        {
+          gimp_item_tree_rename_item (gimp_item_get_tree (item), item,
+                                      name, FALSE, NULL);
+          g_free (name);
+        }
+      else
+        {
+          gimp_object_take_name (GIMP_OBJECT (layer), name);
+        }
+    }
+
+  if (width > 0 && height > 0)
+    gimp_text_layer_render_layout (layer, layout);
+
+  g_object_unref (layout);
+
+  g_object_thaw_notify (G_OBJECT (drawable));
+
+  return (width > 0 && height > 0);
+}
+
+static void
+gimp_text_layer_render_layout (GimpTextLayer  *layer,
+                               GimpTextLayout *layout)
+{
+  GimpDrawable       *drawable = GIMP_DRAWABLE (layer);
+  GimpItem           *item     = GIMP_ITEM (layer);
+  GimpImage          *image    = gimp_item_get_image (item);
+  GeglBuffer         *buffer;
+  GimpColorTransform *transform;
+  cairo_t            *cr;
+  cairo_surface_t    *surface;
+  gint                width;
+  gint                height;
+  cairo_status_t      status;
+
+  g_return_if_fail (gimp_drawable_has_alpha (drawable));
+
+  width  = gimp_item_get_width  (item);
+  height = gimp_item_get_height (item);
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+  status = cairo_surface_status (surface);
+
+  if (status != CAIRO_STATUS_SUCCESS)
+    {
+      GimpImage *image = gimp_item_get_image (item);
+
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            _("Your text cannot be rendered. It is likely too big. "
+                              "Please make it shorter or use a smaller font."));
+      cairo_surface_destroy (surface);
+      return;
+    }
+
+  cr = cairo_create (surface);
+  gimp_text_layout_render (layout, cr, layer->text->base_dir, FALSE);
+  cairo_destroy (cr);
+
+  cairo_surface_flush (surface);
+
+  buffer = gimp_cairo_surface_create_buffer (surface);
+
+  transform = gimp_image_get_color_transform_from_srgb_u8 (image);
+
+  if (transform)
+    {
+      gimp_color_transform_process_buffer (transform,
+                                           buffer,
+                                           NULL,
+                                           gimp_drawable_get_buffer (drawable),
+                                           NULL);
+    }
+  else
+    {
+      gimp_gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE,
+                             gimp_drawable_get_buffer (drawable), NULL);
+    }
+
+  g_object_unref (buffer);
+  cairo_surface_destroy (surface);
+
+  gimp_drawable_update (drawable, 0, 0, width, height);
+}
diff --git a/app/text/gimptextlayer.h b/app/text/gimptextlayer.h
new file mode 100644
index 0000000..87c61a7
--- /dev/null
+++ b/app/text/gimptextlayer.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextLayer
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_LAYER_H__
+#define __GIMP_TEXT_LAYER_H__
+
+
+#include "core/gimplayer.h"
+
+
+#define GIMP_TYPE_TEXT_LAYER            (gimp_text_layer_get_type ())
+#define GIMP_TEXT_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_LAYER, GimpTextLayer))
+#define GIMP_TEXT_LAYER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_LAYER, GimpTextLayerClass))
+#define GIMP_IS_TEXT_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_LAYER))
+#define GIMP_IS_TEXT_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_LAYER))
+#define GIMP_TEXT_LAYER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEXT_LAYER, GimpTextLayerClass))
+
+
+typedef struct _GimpTextLayerClass   GimpTextLayerClass;
+typedef struct _GimpTextLayerPrivate GimpTextLayerPrivate;
+
+struct _GimpTextLayer
+{
+  GimpLayer     layer;
+
+  GimpText     *text;
+  const gchar  *text_parasite;  /*  parasite name that this text was set from,
+                                 *  and that should be removed when the text
+                                 *  is changed.
+                                 */
+  gboolean      auto_rename;
+  gboolean      modified;
+
+  const Babl   *convert_format;
+
+  GimpTextLayerPrivate *private;
+};
+
+struct _GimpTextLayerClass
+{
+  GimpLayerClass  parent_class;
+};
+
+
+GType       gimp_text_layer_get_type    (void) G_GNUC_CONST;
+
+GimpLayer * gimp_text_layer_new         (GimpImage     *image,
+                                         GimpText      *text);
+GimpText  * gimp_text_layer_get_text    (GimpTextLayer *layer);
+void        gimp_text_layer_set_text    (GimpTextLayer *layer,
+                                         GimpText      *text);
+void        gimp_text_layer_discard     (GimpTextLayer *layer);
+void        gimp_text_layer_set         (GimpTextLayer *layer,
+                                         const gchar   *undo_desc,
+                                         const gchar   *first_property_name,
+                                         ...) G_GNUC_NULL_TERMINATED;
+
+gboolean    gimp_item_is_text_layer     (GimpItem      *item);
+
+
+#endif /* __GIMP_TEXT_LAYER_H__ */
diff --git a/app/text/gimptextlayout-render.c b/app/text/gimptextlayout-render.c
new file mode 100644
index 0000000..f3605e3
--- /dev/null
+++ b/app/text/gimptextlayout-render.c
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <pango/pangocairo.h>
+
+#include "text-types.h"
+
+#include "gimptextlayout.h"
+#include "gimptextlayout-render.h"
+
+
+void
+gimp_text_layout_render (GimpTextLayout    *layout,
+                         cairo_t           *cr,
+                         GimpTextDirection  base_dir,
+                         gboolean           path)
+{
+  PangoLayout    *pango_layout;
+  cairo_matrix_t  trafo;
+  gint            x, y;
+  gint            width, height;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+  g_return_if_fail (cr != NULL);
+
+  cairo_save (cr);
+
+  gimp_text_layout_get_offsets (layout, &x, &y);
+  cairo_translate (cr, x, y);
+
+  gimp_text_layout_get_transform (layout, &trafo);
+  cairo_transform (cr, &trafo);
+
+  if (base_dir == GIMP_TEXT_DIRECTION_TTB_RTL ||
+      base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT)
+    {
+      gimp_text_layout_get_size (layout, &width, &height);
+      cairo_translate (cr, width, 0);
+      cairo_rotate (cr, G_PI_2);
+    }
+
+  if (base_dir == GIMP_TEXT_DIRECTION_TTB_LTR ||
+      base_dir == GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT)
+    {
+      gimp_text_layout_get_size (layout, &width, &height);
+      cairo_translate (cr, 0, height);
+      cairo_rotate (cr, -G_PI_2);
+    }
+
+  pango_layout = gimp_text_layout_get_pango_layout (layout);
+
+  if (path)
+    pango_cairo_layout_path (cr, pango_layout);
+  else
+    pango_cairo_show_layout (cr, pango_layout);
+
+  cairo_restore (cr);
+}
diff --git a/app/text/gimptextlayout-render.h b/app/text/gimptextlayout-render.h
new file mode 100644
index 0000000..456480a
--- /dev/null
+++ b/app/text/gimptextlayout-render.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_LAYOUT_RENDER_H__
+#define __GIMP_TEXT_LAYOUT_RENDER_H__
+
+
+void  gimp_text_layout_render (GimpTextLayout    *layout,
+                               cairo_t           *cr,
+                               GimpTextDirection  base_dir,
+                               gboolean           path);
+
+
+#endif /* __GIMP_TEXT_LAYOUT_RENDER_H__ */
diff --git a/app/text/gimptextlayout.c b/app/text/gimptextlayout.c
new file mode 100644
index 0000000..3d77c3d
--- /dev/null
+++ b/app/text/gimptextlayout.c
@@ -0,0 +1,805 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <pango/pangocairo.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "text-types.h"
+
+#include "core/gimperror.h"
+
+#include "gimptext.h"
+#include "gimptextlayout.h"
+
+#include "gimp-intl.h"
+
+struct _GimpTextLayout
+{
+  GObject         object;
+
+  GimpText       *text;
+  gdouble         xres;
+  gdouble         yres;
+  PangoLayout    *layout;
+  PangoRectangle  extents;
+};
+
+
+static void           gimp_text_layout_finalize   (GObject        *object);
+
+static void           gimp_text_layout_position   (GimpTextLayout *layout);
+static void           gimp_text_layout_set_markup (GimpTextLayout *layout,
+                                                   GError        **error);
+
+static PangoContext * gimp_text_get_pango_context (GimpText       *text,
+                                                   gdouble         xres,
+                                                   gdouble         yres);
+
+
+G_DEFINE_TYPE (GimpTextLayout, gimp_text_layout, G_TYPE_OBJECT)
+
+#define parent_class gimp_text_layout_parent_class
+
+
+static void
+gimp_text_layout_class_init (GimpTextLayoutClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_text_layout_finalize;
+}
+
+static void
+gimp_text_layout_init (GimpTextLayout *layout)
+{
+  layout->text   = NULL;
+  layout->layout = NULL;
+}
+
+static void
+gimp_text_layout_finalize (GObject *object)
+{
+  GimpTextLayout *layout = GIMP_TEXT_LAYOUT (object);
+
+  if (layout->text)
+    {
+      g_object_unref (layout->text);
+      layout->text = NULL;
+    }
+  if (layout->layout)
+    {
+      g_object_unref (layout->layout);
+      layout->layout = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+GimpTextLayout *
+gimp_text_layout_new (GimpText  *text,
+                      gdouble    xres,
+                      gdouble    yres,
+                      GError   **error)
+{
+  GimpTextLayout       *layout;
+  PangoContext         *context;
+  PangoFontDescription *font_desc;
+  PangoAlignment        alignment = PANGO_ALIGN_LEFT;
+  gint                  size;
+
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+
+  font_desc = pango_font_description_from_string (text->font);
+  g_return_val_if_fail (font_desc != NULL, NULL);
+
+  size = pango_units_from_double (gimp_units_to_points (text->font_size,
+                                                        text->unit,
+                                                        yres));
+
+  pango_font_description_set_size (font_desc, MAX (1, size));
+
+  context = gimp_text_get_pango_context (text, xres, yres);
+
+  layout = g_object_new (GIMP_TYPE_TEXT_LAYOUT, NULL);
+
+  layout->text   = g_object_ref (text);
+  layout->layout = pango_layout_new (context);
+  layout->xres   = xres;
+  layout->yres   = yres;
+
+  pango_layout_set_wrap (layout->layout, PANGO_WRAP_WORD_CHAR);
+
+  pango_layout_set_font_description (layout->layout, font_desc);
+  pango_font_description_free (font_desc);
+
+  gimp_text_layout_set_markup (layout, error);
+
+  switch (text->justify)
+    {
+    case GIMP_TEXT_JUSTIFY_LEFT:
+      alignment = PANGO_ALIGN_LEFT;
+      break;
+    case GIMP_TEXT_JUSTIFY_RIGHT:
+      alignment = PANGO_ALIGN_RIGHT;
+      break;
+    case GIMP_TEXT_JUSTIFY_CENTER:
+      alignment = PANGO_ALIGN_CENTER;
+      break;
+    case GIMP_TEXT_JUSTIFY_FILL:
+      alignment = PANGO_ALIGN_LEFT;
+      pango_layout_set_justify (layout->layout, TRUE);
+      break;
+    }
+
+  pango_layout_set_alignment (layout->layout, alignment);
+
+  switch (text->box_mode)
+    {
+    case GIMP_TEXT_BOX_DYNAMIC:
+      break;
+    case GIMP_TEXT_BOX_FIXED:
+      if (! PANGO_GRAVITY_IS_VERTICAL (pango_context_get_base_gravity (context)))
+        pango_layout_set_width (layout->layout,
+                                pango_units_from_double
+                                (gimp_units_to_pixels (text->box_width,
+                                                       text->box_unit,
+                                                       xres)));
+      else
+        pango_layout_set_width (layout->layout,
+                                pango_units_from_double
+                                (gimp_units_to_pixels (text->box_height,
+                                                       text->box_unit,
+                                                       yres)));
+      break;
+    }
+
+  pango_layout_set_indent (layout->layout,
+                           pango_units_from_double
+                           (gimp_units_to_pixels (text->indent,
+                                                  text->unit,
+                                                  xres)));
+  pango_layout_set_spacing (layout->layout,
+                            pango_units_from_double
+                            (gimp_units_to_pixels (text->line_spacing,
+                                                   text->unit,
+                                                   yres)));
+
+  gimp_text_layout_position (layout);
+
+  switch (text->box_mode)
+    {
+    case GIMP_TEXT_BOX_DYNAMIC:
+      break;
+    case GIMP_TEXT_BOX_FIXED:
+      layout->extents.width  = ceil (gimp_units_to_pixels (text->box_width,
+                                                           text->box_unit,
+                                                           xres));
+      layout->extents.height = ceil (gimp_units_to_pixels (text->box_height,
+                                                           text->box_unit,
+                                                           yres));
+
+/* #define VERBOSE */
+
+#ifdef VERBOSE
+      g_printerr ("extents set to %d x %d\n",
+                  layout->extents.width, layout->extents.height);
+#endif
+      break;
+    }
+
+  g_object_unref (context);
+
+  return layout;
+}
+
+gboolean
+gimp_text_layout_get_size (GimpTextLayout *layout,
+                           gint           *width,
+                           gint           *height)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYOUT (layout), FALSE);
+
+  if (width)
+    *width = layout->extents.width;
+
+  if (height)
+    *height = layout->extents.height;
+
+  return (layout->extents.width > 0 && layout->extents.height > 0);
+}
+
+void
+gimp_text_layout_get_offsets (GimpTextLayout *layout,
+                              gint           *x,
+                              gint           *y)
+{
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+
+  if (x)
+    *x = layout->extents.x;
+
+  if (y)
+    *y = layout->extents.y;
+}
+
+void
+gimp_text_layout_get_resolution (GimpTextLayout *layout,
+                                 gdouble        *xres,
+                                 gdouble        *yres)
+{
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+
+  if (xres)
+    *xres = layout->xres;
+
+  if (yres)
+    *yres = layout->yres;
+}
+
+GimpText *
+gimp_text_layout_get_text (GimpTextLayout *layout)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYOUT (layout), NULL);
+
+  return layout->text;
+}
+
+PangoLayout *
+gimp_text_layout_get_pango_layout (GimpTextLayout *layout)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_LAYOUT (layout), NULL);
+
+  return layout->layout;
+}
+
+void
+gimp_text_layout_get_transform (GimpTextLayout *layout,
+                                cairo_matrix_t *matrix)
+{
+  GimpText *text;
+  gdouble   xres;
+  gdouble   yres;
+  gdouble   norm;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+  g_return_if_fail (matrix != NULL);
+
+  text = gimp_text_layout_get_text (layout);
+
+  gimp_text_layout_get_resolution (layout, &xres, &yres);
+
+  norm = 1.0 / yres * xres;
+
+  matrix->xx = text->transformation.coeff[0][0] * norm;
+  matrix->xy = text->transformation.coeff[0][1] * 1.0;
+  matrix->yx = text->transformation.coeff[1][0] * norm;
+  matrix->yy = text->transformation.coeff[1][1] * 1.0;
+  matrix->x0 = 0;
+  matrix->y0 = 0;
+}
+
+void
+gimp_text_layout_transform_rect (GimpTextLayout *layout,
+                                 PangoRectangle *rect)
+{
+  cairo_matrix_t matrix;
+  gdouble        x, y;
+  gdouble        width, height;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+  g_return_if_fail (rect != NULL);
+
+  x      = rect->x;
+  y      = rect->y;
+  width  = rect->width;
+  height = rect->height;
+
+  gimp_text_layout_get_transform (layout, &matrix);
+
+  cairo_matrix_transform_point (&matrix, &x, &y);
+  cairo_matrix_transform_distance (&matrix, &width, &height);
+
+  rect->x      = ROUND (x);
+  rect->y      = ROUND (y);
+  rect->width  = ROUND (width);
+  rect->height = ROUND (height);
+}
+
+void
+gimp_text_layout_transform_point (GimpTextLayout *layout,
+                                  gdouble        *x,
+                                  gdouble        *y)
+{
+  cairo_matrix_t matrix;
+  gdouble        _x = 0.0;
+  gdouble        _y = 0.0;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+
+  if (x) _x = *x;
+  if (y) _y = *y;
+
+  gimp_text_layout_get_transform (layout, &matrix);
+
+  cairo_matrix_transform_point (&matrix, &_x, &_y);
+
+  if (x) *x = _x;
+  if (y) *y = _y;
+}
+
+void
+gimp_text_layout_transform_distance (GimpTextLayout *layout,
+                                     gdouble        *x,
+                                     gdouble        *y)
+{
+  cairo_matrix_t matrix;
+  gdouble        _x = 0.0;
+  gdouble        _y = 0.0;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+
+  if (x) _x = *x;
+  if (y) _y = *y;
+
+  gimp_text_layout_get_transform (layout, &matrix);
+
+  cairo_matrix_transform_distance (&matrix, &_x, &_y);
+
+  if (x) *x = _x;
+  if (y) *y = _y;
+}
+
+void
+gimp_text_layout_untransform_rect (GimpTextLayout *layout,
+                                   PangoRectangle *rect)
+{
+  cairo_matrix_t matrix;
+  gdouble        x, y;
+  gdouble        width, height;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+  g_return_if_fail (rect != NULL);
+
+  x      = rect->x;
+  y      = rect->y;
+  width  = rect->width;
+  height = rect->height;
+
+  gimp_text_layout_get_transform (layout, &matrix);
+
+  if (cairo_matrix_invert (&matrix) == CAIRO_STATUS_SUCCESS)
+    {
+      cairo_matrix_transform_point (&matrix, &x, &y);
+      cairo_matrix_transform_distance (&matrix, &width, &height);
+
+      rect->x      = ROUND (x);
+      rect->y      = ROUND (y);
+      rect->width  = ROUND (width);
+      rect->height = ROUND (height);
+    }
+}
+
+void
+gimp_text_layout_untransform_point (GimpTextLayout *layout,
+                                    gdouble        *x,
+                                    gdouble        *y)
+{
+  cairo_matrix_t matrix;
+  gdouble        _x = 0.0;
+  gdouble        _y = 0.0;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+
+  if (x) _x = *x;
+  if (y) _y = *y;
+
+  gimp_text_layout_get_transform (layout, &matrix);
+
+  if (cairo_matrix_invert (&matrix) == CAIRO_STATUS_SUCCESS)
+    {
+      cairo_matrix_transform_point (&matrix, &_x, &_y);
+
+      if (x) *x = _x;
+      if (y) *y = _y;
+    }
+}
+
+void
+gimp_text_layout_untransform_distance (GimpTextLayout *layout,
+                                       gdouble        *x,
+                                       gdouble        *y)
+{
+  cairo_matrix_t matrix;
+  gdouble        _x = 0.0;
+  gdouble        _y = 0.0;
+
+  g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
+
+  if (x) _x = *x;
+  if (y) _y = *y;
+
+  gimp_text_layout_get_transform (layout, &matrix);
+
+  if (cairo_matrix_invert (&matrix) == CAIRO_STATUS_SUCCESS)
+    {
+      cairo_matrix_transform_distance (&matrix, &_x, &_y);
+
+      if (x) *x = _x;
+      if (y) *y = _y;
+    }
+}
+
+static gboolean
+gimp_text_layout_split_markup (const gchar  *markup,
+                               gchar       **open_tag,
+                               gchar       **content,
+                               gchar       **close_tag)
+{
+  gchar *p_open;
+  gchar *p_close;
+
+  p_open = strstr (markup, "<markup>");
+  if (! p_open)
+    return FALSE;
+
+  *open_tag = g_strndup (markup, p_open - markup + strlen ("<markup>"));
+
+  p_close = g_strrstr (markup, "</markup>");
+  if (! p_close)
+    {
+      g_free (*open_tag);
+      return FALSE;
+    }
+
+  *close_tag = g_strdup (p_close);
+
+  if (p_open + strlen ("<markup>") < p_close)
+    {
+      *content = g_strndup (p_open + strlen ("<markup>"),
+                            p_close - p_open - strlen ("<markup>"));
+    }
+  else
+    {
+      *content = g_strdup ("");
+    }
+
+  return TRUE;
+}
+
+static gchar *
+gimp_text_layout_apply_tags (GimpTextLayout *layout,
+                             const gchar    *markup)
+{
+  GimpText *text = layout->text;
+  gchar    *result;
+
+  {
+    guchar r, g, b;
+
+    gimp_rgb_get_uchar (&text->color, &r, &g, &b);
+
+    result = g_strdup_printf ("<span color=\"#%02x%02x%02x\">%s</span>",
+                              r, g, b, markup);
+  }
+  /* Updating font 'locl' (if supported) with 'lang' feature tag */
+  if (text->language)
+    {
+      gchar *tmp = g_strdup_printf ("<span lang=\"%s\">%s</span>",
+                                    text->language,
+                                    result);
+      g_free (result);
+      result = tmp;
+    }
+
+  if (fabs (text->letter_spacing) > 0.1)
+    {
+      gchar *tmp = g_strdup_printf ("<span letter_spacing=\"%d\">%s</span>",
+                                    (gint) (text->letter_spacing * PANGO_SCALE),
+                                    result);
+      g_free (result);
+      result = tmp;
+    }
+
+  return result;
+}
+
+static void
+gimp_text_layout_set_markup (GimpTextLayout  *layout,
+                             GError         **error)
+{
+  GimpText *text      = layout->text;
+  gchar    *open_tag  = NULL;
+  gchar    *content   = NULL;
+  gchar    *close_tag = NULL;
+  gchar    *tagged;
+  gchar    *markup;
+
+  if (text->markup)
+    {
+      if (! gimp_text_layout_split_markup (text->markup,
+                                           &open_tag, &content, &close_tag))
+        {
+          open_tag  = g_strdup ("<markup>");
+          content   = g_strdup ("");
+          close_tag = g_strdup ("</markup>");
+        }
+    }
+  else
+    {
+      open_tag  = g_strdup ("<markup>");
+      close_tag = g_strdup ("</markup>");
+
+      if (text->text)
+        content = g_markup_escape_text (text->text, -1);
+      else
+        content = g_strdup ("");
+    }
+
+  tagged = gimp_text_layout_apply_tags (layout, content);
+
+  g_free (content);
+
+  markup = g_strconcat (open_tag, tagged, close_tag, NULL);
+
+  g_free (open_tag);
+  g_free (tagged);
+  g_free (close_tag);
+
+  if (pango_parse_markup (markup, -1, 0, NULL, NULL, NULL, error) == FALSE)
+    {
+      if (error && *error                       &&
+          (*error)->domain == G_MARKUP_ERROR    &&
+          (*error)->code == G_MARKUP_ERROR_INVALID_CONTENT)
+        {
+          /* Errors from pango lib are not accurate enough.
+           * Other possible error codes are: G_MARKUP_ERROR_UNKNOWN_ELEMENT
+           * and G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, which likely indicate a bug
+           * in GIMP code or a pango library version issue.
+           * G_MARKUP_ERROR_INVALID_CONTENT on the other hand likely indicates
+           * size/color/style/weight/variant/etc. value issue. Font size is the
+           * only free text in GIMP GUI so we assume that must be it.
+           * Also we output a custom message because pango's error->message is
+           * too technical (telling of <span> tags, not using user's font size
+           * unit, and such). */
+          g_error_free (*error);
+          *error = NULL;
+          g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                               _("The new text layout cannot be generated. "
+                                 "Most likely the font size is too big."));
+        }
+    }
+  else
+    pango_layout_set_markup (layout->layout, markup, -1);
+
+  g_free (markup);
+}
+
+static void
+gimp_text_layout_position (GimpTextLayout *layout)
+{
+  PangoRectangle  ink;
+  PangoRectangle  logical;
+  PangoContext   *context;
+  gint            x1, y1;
+  gint            x2, y2;
+
+  layout->extents.x      = 0;
+  layout->extents.y      = 0;
+  layout->extents.width  = 0;
+  layout->extents.height = 0;
+
+  pango_layout_get_pixel_extents (layout->layout, &ink, &logical);
+
+  ink.width = ceil ((gdouble) ink.width * layout->xres / layout->yres);
+  logical.width = ceil ((gdouble) logical.width * layout->xres / layout->yres);
+  context = pango_layout_get_context (layout->layout);
+
+#ifdef VERBOSE
+  g_printerr ("ink rect: %d x %d @ %d, %d\n",
+              ink.width, ink.height, ink.x, ink.y);
+  g_printerr ("logical rect: %d x %d @ %d, %d\n",
+              logical.width, logical.height, logical.x, logical.y);
+#endif
+
+  if (ink.width < 1 || ink.height < 1)
+    {
+      layout->extents.width  = 1;
+      layout->extents.height = logical.height;
+      return;
+    }
+
+  x1 = MIN (ink.x, logical.x);
+  y1 = MIN (ink.y, logical.y);
+  x2 = MAX (ink.x + ink.width,  logical.x + logical.width);
+  y2 = MAX (ink.y + ink.height, logical.y + logical.height);
+
+  layout->extents.x      = - x1;
+  layout->extents.y      = - y1;
+  layout->extents.width  = x2 - x1;
+  layout->extents.height = y2 - y1;
+
+  /* If the width of the layout is > 0, then the text-box is FIXED and
+   * the layout position should be offset if the alignment is centered
+   * or right-aligned, also adjust for RTL text direction.
+   */
+  if (pango_layout_get_width (layout->layout) > 0)
+    {
+      PangoAlignment    align    = pango_layout_get_alignment (layout->layout);
+      GimpTextDirection base_dir = layout->text->base_dir;
+      gint              width;
+
+      pango_layout_get_pixel_size (layout->layout, &width, NULL);
+
+      if ((base_dir == GIMP_TEXT_DIRECTION_LTR && align == PANGO_ALIGN_RIGHT) ||
+          (base_dir == GIMP_TEXT_DIRECTION_RTL && align == PANGO_ALIGN_LEFT) ||
+          (base_dir == GIMP_TEXT_DIRECTION_TTB_RTL && align == PANGO_ALIGN_RIGHT) ||
+          (base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT && align == PANGO_ALIGN_RIGHT) ||
+          (base_dir == GIMP_TEXT_DIRECTION_TTB_LTR && align == PANGO_ALIGN_LEFT) ||
+          (base_dir == GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT && align == PANGO_ALIGN_LEFT))
+        {
+          layout->extents.x +=
+            PANGO_PIXELS (pango_layout_get_width (layout->layout)) - width;
+        }
+      else if (align == PANGO_ALIGN_CENTER)
+        {
+          layout->extents.x +=
+            (PANGO_PIXELS (pango_layout_get_width (layout->layout)) - width) / 2;
+       }
+    }
+
+  if (layout->text->border > 0)
+    {
+      gint border = layout->text->border;
+
+      layout->extents.x      += border;
+      layout->extents.y      += border;
+      layout->extents.width  += 2 * border;
+      layout->extents.height += 2 * border;
+    }
+
+  if (PANGO_GRAVITY_IS_VERTICAL (pango_context_get_base_gravity (context)))
+    {
+      gint temp;
+
+      temp = layout->extents.y;
+      layout->extents.y = layout->extents.x;
+      layout->extents.x = temp;
+
+      temp = layout->extents.height;
+      layout->extents.height = layout->extents.width;
+      layout->extents.width = temp;
+    }
+
+#ifdef VERBOSE
+  g_printerr ("layout extents: %d x %d @ %d, %d\n",
+              layout->extents.width, layout->extents.height,
+              layout->extents.x, layout->extents.y);
+#endif
+}
+
+static cairo_font_options_t *
+gimp_text_get_font_options (GimpText *text)
+{
+  cairo_font_options_t *options = cairo_font_options_create ();
+
+  cairo_font_options_set_antialias (options, (text->antialias ?
+                                              CAIRO_ANTIALIAS_GRAY :
+                                              CAIRO_ANTIALIAS_NONE));
+
+  switch (text->hint_style)
+    {
+    case GIMP_TEXT_HINT_STYLE_NONE:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE);
+      break;
+
+    case GIMP_TEXT_HINT_STYLE_SLIGHT:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_SLIGHT);
+      break;
+
+    case GIMP_TEXT_HINT_STYLE_MEDIUM:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_MEDIUM);
+      break;
+
+    case GIMP_TEXT_HINT_STYLE_FULL:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_FULL);
+      break;
+    }
+
+  return options;
+}
+
+static PangoContext *
+gimp_text_get_pango_context (GimpText *text,
+                             gdouble   xres,
+                             gdouble   yres)
+{
+  PangoContext         *context;
+  PangoFontMap         *fontmap;
+  cairo_font_options_t *options;
+
+  fontmap = pango_cairo_font_map_new_for_font_type (CAIRO_FONT_TYPE_FT);
+  if (! fontmap)
+    g_error ("You are using a Pango that has been built against a cairo "
+             "that lacks the Freetype font backend");
+
+  pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (fontmap), yres);
+
+  context = pango_font_map_create_context (fontmap);
+  g_object_unref (fontmap);
+
+  options = gimp_text_get_font_options (text);
+  pango_cairo_context_set_font_options (context, options);
+  cairo_font_options_destroy (options);
+
+  if (text->language)
+    pango_context_set_language (context,
+                                pango_language_from_string (text->language));
+
+  switch (text->base_dir)
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+      pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);
+      pango_context_set_gravity_hint (context, PANGO_GRAVITY_HINT_NATURAL);
+      pango_context_set_base_gravity (context, PANGO_GRAVITY_SOUTH);
+      break;
+
+    case GIMP_TEXT_DIRECTION_RTL:
+      pango_context_set_base_dir (context, PANGO_DIRECTION_RTL);
+      pango_context_set_gravity_hint (context, PANGO_GRAVITY_HINT_NATURAL);
+      pango_context_set_base_gravity (context, PANGO_GRAVITY_SOUTH);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+      pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);
+      pango_context_set_gravity_hint (context, PANGO_GRAVITY_HINT_LINE);
+      pango_context_set_base_gravity (context, PANGO_GRAVITY_EAST);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+      pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);
+      pango_context_set_gravity_hint (context, PANGO_GRAVITY_HINT_STRONG);
+      pango_context_set_base_gravity (context, PANGO_GRAVITY_EAST);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+      pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);
+      pango_context_set_gravity_hint (context, PANGO_GRAVITY_HINT_LINE);
+      pango_context_set_base_gravity (context, PANGO_GRAVITY_WEST);
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);
+      pango_context_set_gravity_hint (context, PANGO_GRAVITY_HINT_STRONG);
+      pango_context_set_base_gravity (context, PANGO_GRAVITY_WEST);
+      break;
+    }
+
+  return context;
+}
diff --git a/app/text/gimptextlayout.h b/app/text/gimptextlayout.h
new file mode 100644
index 0000000..042751b
--- /dev/null
+++ b/app/text/gimptextlayout.h
@@ -0,0 +1,79 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_LAYOUT_H__
+#define __GIMP_TEXT_LAYOUT_H__
+
+
+#define GIMP_TYPE_TEXT_LAYOUT    (gimp_text_layout_get_type ())
+#define GIMP_TEXT_LAYOUT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_LAYOUT, GimpTextLayout))
+#define GIMP_IS_TEXT_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_LAYOUT))
+
+
+typedef struct _GimpTextLayoutClass GimpTextLayoutClass;
+
+struct _GimpTextLayoutClass
+{
+  GObjectClass   parent_class;
+};
+
+
+GType            gimp_text_layout_get_type             (void) G_GNUC_CONST;
+
+GimpTextLayout * gimp_text_layout_new                  (GimpText       *text,
+                                                        gdouble         xres,
+                                                        gdouble         yres,
+                                                        GError        **error);
+gboolean         gimp_text_layout_get_size             (GimpTextLayout *layout,
+                                                        gint           *width,
+                                                        gint           *height);
+void             gimp_text_layout_get_offsets          (GimpTextLayout *layout,
+                                                        gint           *x,
+                                                        gint           *y);
+void             gimp_text_layout_get_resolution       (GimpTextLayout *layout,
+                                                        gdouble        *xres,
+                                                        gdouble        *yres);
+
+GimpText       * gimp_text_layout_get_text             (GimpTextLayout *layout);
+PangoLayout    * gimp_text_layout_get_pango_layout     (GimpTextLayout *layout);
+
+void             gimp_text_layout_get_transform        (GimpTextLayout *layout,
+                                                        cairo_matrix_t *matrix);
+
+void             gimp_text_layout_transform_rect       (GimpTextLayout *layout,
+                                                        PangoRectangle *rect);
+void             gimp_text_layout_transform_point      (GimpTextLayout *layout,
+                                                        gdouble        *x,
+                                                        gdouble        *y);
+void             gimp_text_layout_transform_distance   (GimpTextLayout *layout,
+                                                        gdouble        *x,
+                                                        gdouble        *y);
+
+void             gimp_text_layout_untransform_rect     (GimpTextLayout *layout,
+                                                        PangoRectangle *rect);
+void             gimp_text_layout_untransform_point    (GimpTextLayout *layout,
+                                                        gdouble        *x,
+                                                        gdouble        *y);
+void             gimp_text_layout_untransform_distance (GimpTextLayout *layout,
+                                                        gdouble        *x,
+                                                        gdouble        *y);
+
+
+#endif /* __GIMP_TEXT_LAYOUT_H__ */
diff --git a/app/text/gimptextundo.c b/app/text/gimptextundo.c
new file mode 100644
index 0000000..8d1a74b
--- /dev/null
+++ b/app/text/gimptextundo.c
@@ -0,0 +1,307 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "text-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimp-memsize.h"
+#include "core/gimpitem.h"
+#include "core/gimpitemundo.h"
+
+#include "gimptext.h"
+#include "gimptextlayer.h"
+#include "gimptextundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PARAM
+};
+
+
+static void     gimp_text_undo_constructed  (GObject             *object);
+static void     gimp_text_undo_set_property (GObject             *object,
+                                             guint                property_id,
+                                             const GValue        *value,
+                                             GParamSpec          *pspec);
+static void     gimp_text_undo_get_property (GObject             *object,
+                                             guint                property_id,
+                                             GValue              *value,
+                                             GParamSpec          *pspec);
+
+static gint64   gimp_text_undo_get_memsize  (GimpObject          *object,
+                                             gint64              *gui_size);
+
+static void     gimp_text_undo_pop          (GimpUndo            *undo,
+                                             GimpUndoMode         undo_mode,
+                                             GimpUndoAccumulator *accum);
+static void     gimp_text_undo_free         (GimpUndo            *undo,
+                                             GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpTextUndo, gimp_text_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_text_undo_parent_class
+
+
+static void
+gimp_text_undo_class_init (GimpTextUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_text_undo_constructed;
+  object_class->set_property     = gimp_text_undo_set_property;
+  object_class->get_property     = gimp_text_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_text_undo_get_memsize;
+
+  undo_class->pop                = gimp_text_undo_pop;
+  undo_class->free               = gimp_text_undo_free;
+
+  g_object_class_install_property (object_class, PROP_PARAM,
+                                   g_param_spec_param ("param", NULL, NULL,
+                                                       G_TYPE_PARAM,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_text_undo_init (GimpTextUndo *undo)
+{
+}
+
+static void
+gimp_text_undo_constructed (GObject *object)
+{
+  GimpTextUndo  *text_undo = GIMP_TEXT_UNDO (object);
+  GimpTextLayer *layer;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_TEXT_LAYER (GIMP_ITEM_UNDO (text_undo)->item));
+
+  layer = GIMP_TEXT_LAYER (GIMP_ITEM_UNDO (text_undo)->item);
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    case GIMP_UNDO_TEXT_LAYER:
+      if (text_undo->pspec)
+        {
+          gimp_assert (text_undo->pspec->owner_type == GIMP_TYPE_TEXT);
+
+          text_undo->value = g_slice_new0 (GValue);
+
+          g_value_init (text_undo->value, text_undo->pspec->value_type);
+          g_object_get_property (G_OBJECT (layer->text),
+                                 text_undo->pspec->name, text_undo->value);
+        }
+      else if (layer->text)
+        {
+          text_undo->text = gimp_config_duplicate (GIMP_CONFIG (layer->text));
+        }
+      break;
+
+    case GIMP_UNDO_TEXT_LAYER_MODIFIED:
+      text_undo->modified = layer->modified;
+      break;
+
+    case GIMP_UNDO_TEXT_LAYER_CONVERT:
+      text_undo->format = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+}
+
+static void
+gimp_text_undo_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpTextUndo *text_undo = GIMP_TEXT_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PARAM:
+      text_undo->pspec = g_value_get_param (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_undo_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpTextUndo *text_undo = GIMP_TEXT_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PARAM:
+      g_value_set_param (value, (GParamSpec *) text_undo->pspec);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_text_undo_get_memsize (GimpObject *object,
+                            gint64     *gui_size)
+{
+  GimpTextUndo *undo    = GIMP_TEXT_UNDO (object);
+  gint64        memsize = 0;
+
+  memsize += gimp_g_value_get_memsize (undo->value);
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (undo->text), NULL);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_text_undo_pop (GimpUndo            *undo,
+                    GimpUndoMode         undo_mode,
+                    GimpUndoAccumulator *accum)
+{
+  GimpTextUndo  *text_undo = GIMP_TEXT_UNDO (undo);
+  GimpTextLayer *layer     = GIMP_TEXT_LAYER (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    case GIMP_UNDO_TEXT_LAYER:
+      if (text_undo->pspec)
+        {
+          GValue *value;
+
+          g_return_if_fail (layer->text != NULL);
+
+          value = g_slice_new0 (GValue);
+          g_value_init (value, text_undo->pspec->value_type);
+
+          g_object_get_property (G_OBJECT (layer->text),
+                                 text_undo->pspec->name, value);
+
+          g_object_set_property (G_OBJECT (layer->text),
+                                 text_undo->pspec->name, text_undo->value);
+
+          g_value_unset (text_undo->value);
+          g_slice_free (GValue, text_undo->value);
+
+          text_undo->value = value;
+        }
+      else
+        {
+          GimpText *text;
+
+          text = (layer->text ?
+                  gimp_config_duplicate (GIMP_CONFIG (layer->text)) : NULL);
+
+          if (layer->text && text_undo->text)
+            gimp_config_sync (G_OBJECT (text_undo->text),
+                              G_OBJECT (layer->text), 0);
+          else
+            gimp_text_layer_set_text (layer, text_undo->text);
+
+          if (text_undo->text)
+            g_object_unref (text_undo->text);
+
+          text_undo->text = text;
+        }
+      break;
+
+    case GIMP_UNDO_TEXT_LAYER_MODIFIED:
+      {
+        gboolean modified;
+
+#if 0
+        g_print ("setting layer->modified from %s to %s\n",
+                 layer->modified ? "TRUE" : "FALSE",
+                 text_undo->modified ? "TRUE" : "FALSE");
+#endif
+
+        modified = layer->modified;
+        g_object_set (layer, "modified", text_undo->modified, NULL);
+        text_undo->modified = modified;
+
+        gimp_viewable_invalidate_preview (GIMP_VIEWABLE (layer));
+      }
+      break;
+
+    case GIMP_UNDO_TEXT_LAYER_CONVERT:
+      {
+        const Babl *format;
+
+        format = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
+        gimp_drawable_convert_type (GIMP_DRAWABLE (layer),
+                                    gimp_item_get_image (GIMP_ITEM (layer)),
+                                    gimp_babl_format_get_base_type (text_undo->format),
+                                    gimp_babl_format_get_precision (text_undo->format),
+                                    babl_format_has_alpha (text_undo->format),
+                                    NULL,
+                                    GEGL_DITHER_NONE, GEGL_DITHER_NONE,
+                                    FALSE, NULL);
+        text_undo->format = format;
+      }
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+}
+
+static void
+gimp_text_undo_free (GimpUndo     *undo,
+                     GimpUndoMode  undo_mode)
+{
+  GimpTextUndo *text_undo = GIMP_TEXT_UNDO (undo);
+
+  g_clear_object (&text_undo->text);
+
+  if (text_undo->pspec)
+    {
+      g_value_unset (text_undo->value);
+      g_slice_free (GValue, text_undo->value);
+
+      text_undo->value = NULL;
+      text_undo->pspec = NULL;
+    }
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/text/gimptextundo.h b/app/text/gimptextundo.h
new file mode 100644
index 0000000..913aeb9
--- /dev/null
+++ b/app/text/gimptextundo.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_UNDO_H__
+#define __GIMP_TEXT_UNDO_H__
+
+
+#include "core/gimpitemundo.h"
+
+
+#define GIMP_TYPE_TEXT_UNDO            (gimp_text_undo_get_type ())
+#define GIMP_TEXT_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_UNDO, GimpTextUndo))
+#define GIMP_TEXT_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_UNDO, GimpTextUndoClass))
+#define GIMP_IS_TEXT_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_UNDO))
+#define GIMP_IS_TEXT_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_UNDO))
+#define GIMP_TEXT_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEXT_UNDO, GimpTextUndoClass))
+
+
+typedef struct _GimpTextUndoClass GimpTextUndoClass;
+
+struct _GimpTextUndo
+{
+  GimpItemUndo      parent_instance;
+
+  GimpText         *text;
+  const GParamSpec *pspec;
+  GValue           *value;
+  gboolean          modified;
+  const Babl       *format;
+};
+
+struct _GimpTextUndoClass
+{
+  GimpItemClass  parent_class;
+};
+
+
+GType      gimp_text_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_TEXT_UNDO_H__ */
diff --git a/app/text/text-enums.c b/app/text/text-enums.c
new file mode 100644
index 0000000..cc18ec9
--- /dev/null
+++ b/app/text/text-enums.c
@@ -0,0 +1,73 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "text-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "text-enums.h" */
+GType
+gimp_text_box_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TEXT_BOX_DYNAMIC, "GIMP_TEXT_BOX_DYNAMIC", "dynamic" },
+    { GIMP_TEXT_BOX_FIXED, "GIMP_TEXT_BOX_FIXED", "fixed" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TEXT_BOX_DYNAMIC, NC_("text-box-mode", "Dynamic"), NULL },
+    { GIMP_TEXT_BOX_FIXED, NC_("text-box-mode", "Fixed"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTextBoxMode", values);
+      gimp_type_set_translation_context (type, "text-box-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_text_outline_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TEXT_OUTLINE_NONE, "GIMP_TEXT_OUTLINE_NONE", "none" },
+    { GIMP_TEXT_OUTLINE_STROKE_ONLY, "GIMP_TEXT_OUTLINE_STROKE_ONLY", "stroke-only" },
+    { GIMP_TEXT_OUTLINE_STROKE_FILL, "GIMP_TEXT_OUTLINE_STROKE_FILL", "stroke-fill" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TEXT_OUTLINE_NONE, "GIMP_TEXT_OUTLINE_NONE", NULL },
+    { GIMP_TEXT_OUTLINE_STROKE_ONLY, "GIMP_TEXT_OUTLINE_STROKE_ONLY", NULL },
+    { GIMP_TEXT_OUTLINE_STROKE_FILL, "GIMP_TEXT_OUTLINE_STROKE_FILL", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTextOutline", values);
+      gimp_type_set_translation_context (type, "text-outline");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/text/text-enums.h b/app/text/text-enums.h
new file mode 100644
index 0000000..20bd327
--- /dev/null
+++ b/app/text/text-enums.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEXT_ENUMS_H__
+#define __TEXT_ENUMS_H__
+
+
+#define GIMP_TYPE_TEXT_BOX_MODE (gimp_text_box_mode_get_type ())
+
+GType gimp_text_box_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TEXT_BOX_DYNAMIC, /*< desc="Dynamic" >*/
+  GIMP_TEXT_BOX_FIXED    /*< desc="Fixed"   >*/
+} GimpTextBoxMode;
+
+
+#define GIMP_TYPE_TEXT_OUTLINE (gimp_text_outline_get_type ())
+
+GType gimp_text_outline_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TEXT_OUTLINE_NONE,
+  GIMP_TEXT_OUTLINE_STROKE_ONLY,
+  GIMP_TEXT_OUTLINE_STROKE_FILL
+} GimpTextOutline;
+
+
+#endif /* __TEXT_ENUMS_H__ */
diff --git a/app/text/text-types.h b/app/text/text-types.h
new file mode 100644
index 0000000..83b6190
--- /dev/null
+++ b/app/text/text-types.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpText
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TEXT_TYPES_H__
+#define __TEXT_TYPES_H__
+
+#include "core/core-types.h"
+
+#include "text/text-enums.h"
+
+
+typedef struct _GimpFont        GimpFont;
+typedef struct _GimpFontFactory GimpFontFactory;
+typedef struct _GimpFontList    GimpFontList;
+typedef struct _GimpText        GimpText;
+typedef struct _GimpTextLayer   GimpTextLayer;
+typedef struct _GimpTextLayout  GimpTextLayout;
+typedef struct _GimpTextUndo    GimpTextUndo;
+
+
+#endif /* __TEXT_TYPES_H__ */
diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
new file mode 100644
index 0000000..bbe4584
--- /dev/null
+++ b/app/tools/Makefile.am
@@ -0,0 +1,275 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Tools\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapptools.a
+
+libapptools_a_sources = \
+	tools-enums.h			\
+	tools-types.h			\
+	gimp-tool-options-manager.c	\
+	gimp-tool-options-manager.h	\
+	gimp-tools.c			\
+	gimp-tools.h			\
+	tool_manager.c			\
+	tool_manager.h			\
+	\
+	gimpairbrushtool.c		\
+	gimpairbrushtool.h		\
+	gimpalignoptions.c		\
+	gimpalignoptions.h		\
+	gimpaligntool.c			\
+	gimpaligntool.h			\
+	gimpbrightnesscontrasttool.c	\
+	gimpbrightnesscontrasttool.h	\
+	gimpbrushtool.c			\
+	gimpbrushtool.h			\
+	gimpbucketfilloptions.c		\
+	gimpbucketfilloptions.h		\
+	gimpbucketfilltool.c		\
+	gimpbucketfilltool.h		\
+	gimpbycolorselecttool.c		\
+	gimpbycolorselecttool.h		\
+	gimpcageoptions.c		\
+	gimpcageoptions.h		\
+	gimpcagetool.c			\
+	gimpcagetool.h			\
+	gimpcloneoptions-gui.c		\
+	gimpcloneoptions-gui.h		\
+	gimpclonetool.c			\
+	gimpclonetool.h			\
+	gimpcoloroptions.c		\
+	gimpcoloroptions.h		\
+	gimpcolortool.c			\
+	gimpcolortool.h			\
+	gimpcolorpickeroptions.c	\
+	gimpcolorpickeroptions.h	\
+	gimpcolorpickertool.c		\
+	gimpcolorpickertool.h		\
+	gimpconvolvetool.c		\
+	gimpconvolvetool.h		\
+	gimpcropoptions.c		\
+	gimpcropoptions.h		\
+	gimpcroptool.c			\
+	gimpcroptool.h			\
+	gimpcurvestool.c		\
+	gimpcurvestool.h		\
+	gimpdodgeburntool.c		\
+	gimpdodgeburntool.h		\
+	gimpdrawtool.c			\
+	gimpdrawtool.h			\
+	gimpeditselectiontool.c		\
+	gimpeditselectiontool.h		\
+	gimpellipseselecttool.c		\
+	gimpellipseselecttool.h		\
+	gimperasertool.c		\
+	gimperasertool.h		\
+	gimpfilteroptions.c		\
+	gimpfilteroptions.h		\
+	gimpfiltertool.c		\
+	gimpfiltertool.h		\
+	gimpfiltertool-settings.c	\
+	gimpfiltertool-settings.h	\
+	gimpfiltertool-widgets.c	\
+	gimpfiltertool-widgets.h	\
+	gimpflipoptions.c		\
+	gimpflipoptions.h		\
+	gimpfliptool.c			\
+	gimpfliptool.h			\
+	gimpforegroundselectoptions.c	\
+	gimpforegroundselectoptions.h	\
+	gimpforegroundselecttool.c	\
+	gimpforegroundselecttool.h	\
+	gimpforegroundselecttoolundo.c	\
+	gimpforegroundselecttoolundo.h	\
+	gimpfreeselecttool.c		\
+	gimpfreeselecttool.h		\
+	gimpfuzzyselecttool.c		\
+	gimpfuzzyselecttool.h		\
+	gimpgegltool.c			\
+	gimpgegltool.h			\
+	gimpgenerictransformtool.c	\
+	gimpgenerictransformtool.h	\
+	gimpgradientoptions.c		\
+	gimpgradientoptions.h		\
+	gimpgradienttool.c		\
+	gimpgradienttool.h		\
+	gimpgradienttool-editor.c	\
+	gimpgradienttool-editor.h	\
+	gimpguidetool.c			\
+	gimpguidetool.h			\
+	gimphandletransformoptions.c	\
+	gimphandletransformoptions.h	\
+	gimphandletransformtool.c	\
+	gimphandletransformtool.h	\
+	gimphealtool.c			\
+	gimphealtool.h			\
+	gimphistogramoptions.c		\
+	gimphistogramoptions.h		\
+	gimpinkoptions-gui.c		\
+	gimpinkoptions-gui.h		\
+	gimpinktool.c			\
+	gimpinktool.h			\
+	gimpiscissorsoptions.c		\
+	gimpiscissorsoptions.h		\
+	gimpiscissorstool.c		\
+	gimpiscissorstool.h		\
+	gimplevelstool.c		\
+	gimplevelstool.h		\
+	gimpoffsettool.c		\
+	gimpoffsettool.h		\
+	gimpoperationtool.c		\
+	gimpoperationtool.h		\
+	gimpmagnifyoptions.c		\
+	gimpmagnifyoptions.h		\
+	gimpmagnifytool.c		\
+	gimpmagnifytool.h		\
+	gimpmeasureoptions.c		\
+	gimpmeasureoptions.h		\
+	gimpmeasuretool.c		\
+	gimpmeasuretool.h		\
+	gimpmoveoptions.c		\
+	gimpmoveoptions.h		\
+	gimpmovetool.c			\
+	gimpmovetool.h			\
+	gimpmybrushoptions-gui.c	\
+	gimpmybrushoptions-gui.h	\
+	gimpmybrushtool.c		\
+	gimpmybrushtool.h		\
+	gimpnpointdeformationoptions.c	\
+	gimpnpointdeformationoptions.h	\
+	gimpnpointdeformationtool.c	\
+	gimpnpointdeformationtool.h	\
+	gimppaintbrushtool.c		\
+	gimppaintbrushtool.h		\
+	gimppaintoptions-gui.c		\
+	gimppaintoptions-gui.h		\
+	gimppainttool.c			\
+	gimppainttool.h			\
+	gimppainttool-paint.c		\
+	gimppainttool-paint.h		\
+	gimppenciltool.c		\
+	gimppenciltool.h		\
+	gimpperspectiveclonetool.c	\
+	gimpperspectiveclonetool.h	\
+	gimpperspectivetool.c		\
+	gimpperspectivetool.h		\
+	gimppolygonselecttool.c		\
+	gimppolygonselecttool.h		\
+	gimprectangleselecttool.c	\
+	gimprectangleselecttool.h	\
+	gimprectangleselectoptions.c	\
+	gimprectangleselectoptions.h	\
+	gimprectangleoptions.c		\
+	gimprectangleoptions.h		\
+	gimpregionselectoptions.c	\
+	gimpregionselectoptions.h	\
+	gimpregionselecttool.c		\
+	gimpregionselecttool.h		\
+	gimprotatetool.c		\
+	gimprotatetool.h		\
+	gimpsamplepointtool.c		\
+	gimpsamplepointtool.h		\
+	gimpscaletool.c			\
+	gimpscaletool.h			\
+	gimpseamlesscloneoptions.c	\
+	gimpseamlesscloneoptions.h	\
+	gimpseamlessclonetool.c		\
+	gimpseamlessclonetool.h		\
+	gimpselectionoptions.c		\
+	gimpselectionoptions.h		\
+	gimpselectiontool.c		\
+	gimpselectiontool.h		\
+	gimpsheartool.c			\
+	gimpsheartool.h			\
+	gimpsmudgetool.c		\
+	gimpsmudgetool.h		\
+	gimpsourcetool.c		\
+	gimpsourcetool.h		\
+	gimptextoptions.c		\
+	gimptextoptions.h		\
+	gimptexttool.c			\
+	gimptexttool.h			\
+	gimptexttool-editor.c		\
+	gimptexttool-editor.h		\
+	gimpthresholdtool.c		\
+	gimpthresholdtool.h		\
+	gimptilehandleriscissors.c	\
+	gimptilehandleriscissors.h	\
+	gimptool.c			\
+	gimptool.h			\
+	gimptool-progress.c		\
+	gimptool-progress.h		\
+	gimptoolcontrol.c		\
+	gimptoolcontrol.h		\
+	gimptooloptions-gui.c		\
+	gimptooloptions-gui.h		\
+	gimptools-utils.c		\
+	gimptools-utils.h		\
+	gimptransform3doptions.c	\
+	gimptransform3doptions.h	\
+	gimptransform3dtool.c		\
+	gimptransform3dtool.h		\
+	gimptransformgridoptions.c     	\
+	gimptransformgridoptions.h     	\
+	gimptransformgridtool.c     	\
+	gimptransformgridtool.h     	\
+	gimptransformgridtoolundo.c	\
+	gimptransformgridtoolundo.h	\
+	gimptransformoptions.c     	\
+	gimptransformoptions.h     	\
+	gimptransformtool.c		\
+	gimptransformtool.h		\
+	gimpunifiedtransformtool.c	\
+	gimpunifiedtransformtool.h	\
+	gimpvectoroptions.c		\
+	gimpvectoroptions.h		\
+	gimpvectortool.c		\
+	gimpvectortool.h		\
+	gimpwarpoptions.c		\
+	gimpwarpoptions.h		\
+	gimpwarptool.c			\
+	gimpwarptool.h
+
+libapptools_a_built_sources = tools-enums.c
+
+libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-tec
+CLEANFILES = $(gen_sources)
+
+xgen-tec: $(srcdir)/tools-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"tools-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/tools-enums.c: xgen-tec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/tools/Makefile.in b/app/tools/Makefile.in
new file mode 100644
index 0000000..f5e70a1
--- /dev/null
+++ b/app/tools/Makefile.in
@@ -0,0 +1,1657 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/tools
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libapptools_a_AR = $(AR) $(ARFLAGS)
+libapptools_a_LIBADD =
+am__objects_1 = tools-enums.$(OBJEXT)
+am__objects_2 = gimp-tool-options-manager.$(OBJEXT) \
+	gimp-tools.$(OBJEXT) tool_manager.$(OBJEXT) \
+	gimpairbrushtool.$(OBJEXT) gimpalignoptions.$(OBJEXT) \
+	gimpaligntool.$(OBJEXT) gimpbrightnesscontrasttool.$(OBJEXT) \
+	gimpbrushtool.$(OBJEXT) gimpbucketfilloptions.$(OBJEXT) \
+	gimpbucketfilltool.$(OBJEXT) gimpbycolorselecttool.$(OBJEXT) \
+	gimpcageoptions.$(OBJEXT) gimpcagetool.$(OBJEXT) \
+	gimpcloneoptions-gui.$(OBJEXT) gimpclonetool.$(OBJEXT) \
+	gimpcoloroptions.$(OBJEXT) gimpcolortool.$(OBJEXT) \
+	gimpcolorpickeroptions.$(OBJEXT) gimpcolorpickertool.$(OBJEXT) \
+	gimpconvolvetool.$(OBJEXT) gimpcropoptions.$(OBJEXT) \
+	gimpcroptool.$(OBJEXT) gimpcurvestool.$(OBJEXT) \
+	gimpdodgeburntool.$(OBJEXT) gimpdrawtool.$(OBJEXT) \
+	gimpeditselectiontool.$(OBJEXT) \
+	gimpellipseselecttool.$(OBJEXT) gimperasertool.$(OBJEXT) \
+	gimpfilteroptions.$(OBJEXT) gimpfiltertool.$(OBJEXT) \
+	gimpfiltertool-settings.$(OBJEXT) \
+	gimpfiltertool-widgets.$(OBJEXT) gimpflipoptions.$(OBJEXT) \
+	gimpfliptool.$(OBJEXT) gimpforegroundselectoptions.$(OBJEXT) \
+	gimpforegroundselecttool.$(OBJEXT) \
+	gimpforegroundselecttoolundo.$(OBJEXT) \
+	gimpfreeselecttool.$(OBJEXT) gimpfuzzyselecttool.$(OBJEXT) \
+	gimpgegltool.$(OBJEXT) gimpgenerictransformtool.$(OBJEXT) \
+	gimpgradientoptions.$(OBJEXT) gimpgradienttool.$(OBJEXT) \
+	gimpgradienttool-editor.$(OBJEXT) gimpguidetool.$(OBJEXT) \
+	gimphandletransformoptions.$(OBJEXT) \
+	gimphandletransformtool.$(OBJEXT) gimphealtool.$(OBJEXT) \
+	gimphistogramoptions.$(OBJEXT) gimpinkoptions-gui.$(OBJEXT) \
+	gimpinktool.$(OBJEXT) gimpiscissorsoptions.$(OBJEXT) \
+	gimpiscissorstool.$(OBJEXT) gimplevelstool.$(OBJEXT) \
+	gimpoffsettool.$(OBJEXT) gimpoperationtool.$(OBJEXT) \
+	gimpmagnifyoptions.$(OBJEXT) gimpmagnifytool.$(OBJEXT) \
+	gimpmeasureoptions.$(OBJEXT) gimpmeasuretool.$(OBJEXT) \
+	gimpmoveoptions.$(OBJEXT) gimpmovetool.$(OBJEXT) \
+	gimpmybrushoptions-gui.$(OBJEXT) gimpmybrushtool.$(OBJEXT) \
+	gimpnpointdeformationoptions.$(OBJEXT) \
+	gimpnpointdeformationtool.$(OBJEXT) \
+	gimppaintbrushtool.$(OBJEXT) gimppaintoptions-gui.$(OBJEXT) \
+	gimppainttool.$(OBJEXT) gimppainttool-paint.$(OBJEXT) \
+	gimppenciltool.$(OBJEXT) gimpperspectiveclonetool.$(OBJEXT) \
+	gimpperspectivetool.$(OBJEXT) gimppolygonselecttool.$(OBJEXT) \
+	gimprectangleselecttool.$(OBJEXT) \
+	gimprectangleselectoptions.$(OBJEXT) \
+	gimprectangleoptions.$(OBJEXT) \
+	gimpregionselectoptions.$(OBJEXT) \
+	gimpregionselecttool.$(OBJEXT) gimprotatetool.$(OBJEXT) \
+	gimpsamplepointtool.$(OBJEXT) gimpscaletool.$(OBJEXT) \
+	gimpseamlesscloneoptions.$(OBJEXT) \
+	gimpseamlessclonetool.$(OBJEXT) gimpselectionoptions.$(OBJEXT) \
+	gimpselectiontool.$(OBJEXT) gimpsheartool.$(OBJEXT) \
+	gimpsmudgetool.$(OBJEXT) gimpsourcetool.$(OBJEXT) \
+	gimptextoptions.$(OBJEXT) gimptexttool.$(OBJEXT) \
+	gimptexttool-editor.$(OBJEXT) gimpthresholdtool.$(OBJEXT) \
+	gimptilehandleriscissors.$(OBJEXT) gimptool.$(OBJEXT) \
+	gimptool-progress.$(OBJEXT) gimptoolcontrol.$(OBJEXT) \
+	gimptooloptions-gui.$(OBJEXT) gimptools-utils.$(OBJEXT) \
+	gimptransform3doptions.$(OBJEXT) gimptransform3dtool.$(OBJEXT) \
+	gimptransformgridoptions.$(OBJEXT) \
+	gimptransformgridtool.$(OBJEXT) \
+	gimptransformgridtoolundo.$(OBJEXT) \
+	gimptransformoptions.$(OBJEXT) gimptransformtool.$(OBJEXT) \
+	gimpunifiedtransformtool.$(OBJEXT) gimpvectoroptions.$(OBJEXT) \
+	gimpvectortool.$(OBJEXT) gimpwarpoptions.$(OBJEXT) \
+	gimpwarptool.$(OBJEXT)
+am_libapptools_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libapptools_a_OBJECTS = $(am_libapptools_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp-tool-options-manager.Po \
+	./$(DEPDIR)/gimp-tools.Po ./$(DEPDIR)/gimpairbrushtool.Po \
+	./$(DEPDIR)/gimpalignoptions.Po ./$(DEPDIR)/gimpaligntool.Po \
+	./$(DEPDIR)/gimpbrightnesscontrasttool.Po \
+	./$(DEPDIR)/gimpbrushtool.Po \
+	./$(DEPDIR)/gimpbucketfilloptions.Po \
+	./$(DEPDIR)/gimpbucketfilltool.Po \
+	./$(DEPDIR)/gimpbycolorselecttool.Po \
+	./$(DEPDIR)/gimpcageoptions.Po ./$(DEPDIR)/gimpcagetool.Po \
+	./$(DEPDIR)/gimpcloneoptions-gui.Po \
+	./$(DEPDIR)/gimpclonetool.Po ./$(DEPDIR)/gimpcoloroptions.Po \
+	./$(DEPDIR)/gimpcolorpickeroptions.Po \
+	./$(DEPDIR)/gimpcolorpickertool.Po \
+	./$(DEPDIR)/gimpcolortool.Po ./$(DEPDIR)/gimpconvolvetool.Po \
+	./$(DEPDIR)/gimpcropoptions.Po ./$(DEPDIR)/gimpcroptool.Po \
+	./$(DEPDIR)/gimpcurvestool.Po ./$(DEPDIR)/gimpdodgeburntool.Po \
+	./$(DEPDIR)/gimpdrawtool.Po \
+	./$(DEPDIR)/gimpeditselectiontool.Po \
+	./$(DEPDIR)/gimpellipseselecttool.Po \
+	./$(DEPDIR)/gimperasertool.Po ./$(DEPDIR)/gimpfilteroptions.Po \
+	./$(DEPDIR)/gimpfiltertool-settings.Po \
+	./$(DEPDIR)/gimpfiltertool-widgets.Po \
+	./$(DEPDIR)/gimpfiltertool.Po ./$(DEPDIR)/gimpflipoptions.Po \
+	./$(DEPDIR)/gimpfliptool.Po \
+	./$(DEPDIR)/gimpforegroundselectoptions.Po \
+	./$(DEPDIR)/gimpforegroundselecttool.Po \
+	./$(DEPDIR)/gimpforegroundselecttoolundo.Po \
+	./$(DEPDIR)/gimpfreeselecttool.Po \
+	./$(DEPDIR)/gimpfuzzyselecttool.Po ./$(DEPDIR)/gimpgegltool.Po \
+	./$(DEPDIR)/gimpgenerictransformtool.Po \
+	./$(DEPDIR)/gimpgradientoptions.Po \
+	./$(DEPDIR)/gimpgradienttool-editor.Po \
+	./$(DEPDIR)/gimpgradienttool.Po ./$(DEPDIR)/gimpguidetool.Po \
+	./$(DEPDIR)/gimphandletransformoptions.Po \
+	./$(DEPDIR)/gimphandletransformtool.Po \
+	./$(DEPDIR)/gimphealtool.Po \
+	./$(DEPDIR)/gimphistogramoptions.Po \
+	./$(DEPDIR)/gimpinkoptions-gui.Po ./$(DEPDIR)/gimpinktool.Po \
+	./$(DEPDIR)/gimpiscissorsoptions.Po \
+	./$(DEPDIR)/gimpiscissorstool.Po ./$(DEPDIR)/gimplevelstool.Po \
+	./$(DEPDIR)/gimpmagnifyoptions.Po \
+	./$(DEPDIR)/gimpmagnifytool.Po \
+	./$(DEPDIR)/gimpmeasureoptions.Po \
+	./$(DEPDIR)/gimpmeasuretool.Po ./$(DEPDIR)/gimpmoveoptions.Po \
+	./$(DEPDIR)/gimpmovetool.Po \
+	./$(DEPDIR)/gimpmybrushoptions-gui.Po \
+	./$(DEPDIR)/gimpmybrushtool.Po \
+	./$(DEPDIR)/gimpnpointdeformationoptions.Po \
+	./$(DEPDIR)/gimpnpointdeformationtool.Po \
+	./$(DEPDIR)/gimpoffsettool.Po ./$(DEPDIR)/gimpoperationtool.Po \
+	./$(DEPDIR)/gimppaintbrushtool.Po \
+	./$(DEPDIR)/gimppaintoptions-gui.Po \
+	./$(DEPDIR)/gimppainttool-paint.Po \
+	./$(DEPDIR)/gimppainttool.Po ./$(DEPDIR)/gimppenciltool.Po \
+	./$(DEPDIR)/gimpperspectiveclonetool.Po \
+	./$(DEPDIR)/gimpperspectivetool.Po \
+	./$(DEPDIR)/gimppolygonselecttool.Po \
+	./$(DEPDIR)/gimprectangleoptions.Po \
+	./$(DEPDIR)/gimprectangleselectoptions.Po \
+	./$(DEPDIR)/gimprectangleselecttool.Po \
+	./$(DEPDIR)/gimpregionselectoptions.Po \
+	./$(DEPDIR)/gimpregionselecttool.Po \
+	./$(DEPDIR)/gimprotatetool.Po \
+	./$(DEPDIR)/gimpsamplepointtool.Po \
+	./$(DEPDIR)/gimpscaletool.Po \
+	./$(DEPDIR)/gimpseamlesscloneoptions.Po \
+	./$(DEPDIR)/gimpseamlessclonetool.Po \
+	./$(DEPDIR)/gimpselectionoptions.Po \
+	./$(DEPDIR)/gimpselectiontool.Po ./$(DEPDIR)/gimpsheartool.Po \
+	./$(DEPDIR)/gimpsmudgetool.Po ./$(DEPDIR)/gimpsourcetool.Po \
+	./$(DEPDIR)/gimptextoptions.Po \
+	./$(DEPDIR)/gimptexttool-editor.Po ./$(DEPDIR)/gimptexttool.Po \
+	./$(DEPDIR)/gimpthresholdtool.Po \
+	./$(DEPDIR)/gimptilehandleriscissors.Po \
+	./$(DEPDIR)/gimptool-progress.Po ./$(DEPDIR)/gimptool.Po \
+	./$(DEPDIR)/gimptoolcontrol.Po \
+	./$(DEPDIR)/gimptooloptions-gui.Po \
+	./$(DEPDIR)/gimptools-utils.Po \
+	./$(DEPDIR)/gimptransform3doptions.Po \
+	./$(DEPDIR)/gimptransform3dtool.Po \
+	./$(DEPDIR)/gimptransformgridoptions.Po \
+	./$(DEPDIR)/gimptransformgridtool.Po \
+	./$(DEPDIR)/gimptransformgridtoolundo.Po \
+	./$(DEPDIR)/gimptransformoptions.Po \
+	./$(DEPDIR)/gimptransformtool.Po \
+	./$(DEPDIR)/gimpunifiedtransformtool.Po \
+	./$(DEPDIR)/gimpvectoroptions.Po ./$(DEPDIR)/gimpvectortool.Po \
+	./$(DEPDIR)/gimpwarpoptions.Po ./$(DEPDIR)/gimpwarptool.Po \
+	./$(DEPDIR)/tool_manager.Po ./$(DEPDIR)/tools-enums.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapptools_a_SOURCES)
+DIST_SOURCES = $(libapptools_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Tools\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libapptools.a
+libapptools_a_sources = \
+	tools-enums.h			\
+	tools-types.h			\
+	gimp-tool-options-manager.c	\
+	gimp-tool-options-manager.h	\
+	gimp-tools.c			\
+	gimp-tools.h			\
+	tool_manager.c			\
+	tool_manager.h			\
+	\
+	gimpairbrushtool.c		\
+	gimpairbrushtool.h		\
+	gimpalignoptions.c		\
+	gimpalignoptions.h		\
+	gimpaligntool.c			\
+	gimpaligntool.h			\
+	gimpbrightnesscontrasttool.c	\
+	gimpbrightnesscontrasttool.h	\
+	gimpbrushtool.c			\
+	gimpbrushtool.h			\
+	gimpbucketfilloptions.c		\
+	gimpbucketfilloptions.h		\
+	gimpbucketfilltool.c		\
+	gimpbucketfilltool.h		\
+	gimpbycolorselecttool.c		\
+	gimpbycolorselecttool.h		\
+	gimpcageoptions.c		\
+	gimpcageoptions.h		\
+	gimpcagetool.c			\
+	gimpcagetool.h			\
+	gimpcloneoptions-gui.c		\
+	gimpcloneoptions-gui.h		\
+	gimpclonetool.c			\
+	gimpclonetool.h			\
+	gimpcoloroptions.c		\
+	gimpcoloroptions.h		\
+	gimpcolortool.c			\
+	gimpcolortool.h			\
+	gimpcolorpickeroptions.c	\
+	gimpcolorpickeroptions.h	\
+	gimpcolorpickertool.c		\
+	gimpcolorpickertool.h		\
+	gimpconvolvetool.c		\
+	gimpconvolvetool.h		\
+	gimpcropoptions.c		\
+	gimpcropoptions.h		\
+	gimpcroptool.c			\
+	gimpcroptool.h			\
+	gimpcurvestool.c		\
+	gimpcurvestool.h		\
+	gimpdodgeburntool.c		\
+	gimpdodgeburntool.h		\
+	gimpdrawtool.c			\
+	gimpdrawtool.h			\
+	gimpeditselectiontool.c		\
+	gimpeditselectiontool.h		\
+	gimpellipseselecttool.c		\
+	gimpellipseselecttool.h		\
+	gimperasertool.c		\
+	gimperasertool.h		\
+	gimpfilteroptions.c		\
+	gimpfilteroptions.h		\
+	gimpfiltertool.c		\
+	gimpfiltertool.h		\
+	gimpfiltertool-settings.c	\
+	gimpfiltertool-settings.h	\
+	gimpfiltertool-widgets.c	\
+	gimpfiltertool-widgets.h	\
+	gimpflipoptions.c		\
+	gimpflipoptions.h		\
+	gimpfliptool.c			\
+	gimpfliptool.h			\
+	gimpforegroundselectoptions.c	\
+	gimpforegroundselectoptions.h	\
+	gimpforegroundselecttool.c	\
+	gimpforegroundselecttool.h	\
+	gimpforegroundselecttoolundo.c	\
+	gimpforegroundselecttoolundo.h	\
+	gimpfreeselecttool.c		\
+	gimpfreeselecttool.h		\
+	gimpfuzzyselecttool.c		\
+	gimpfuzzyselecttool.h		\
+	gimpgegltool.c			\
+	gimpgegltool.h			\
+	gimpgenerictransformtool.c	\
+	gimpgenerictransformtool.h	\
+	gimpgradientoptions.c		\
+	gimpgradientoptions.h		\
+	gimpgradienttool.c		\
+	gimpgradienttool.h		\
+	gimpgradienttool-editor.c	\
+	gimpgradienttool-editor.h	\
+	gimpguidetool.c			\
+	gimpguidetool.h			\
+	gimphandletransformoptions.c	\
+	gimphandletransformoptions.h	\
+	gimphandletransformtool.c	\
+	gimphandletransformtool.h	\
+	gimphealtool.c			\
+	gimphealtool.h			\
+	gimphistogramoptions.c		\
+	gimphistogramoptions.h		\
+	gimpinkoptions-gui.c		\
+	gimpinkoptions-gui.h		\
+	gimpinktool.c			\
+	gimpinktool.h			\
+	gimpiscissorsoptions.c		\
+	gimpiscissorsoptions.h		\
+	gimpiscissorstool.c		\
+	gimpiscissorstool.h		\
+	gimplevelstool.c		\
+	gimplevelstool.h		\
+	gimpoffsettool.c		\
+	gimpoffsettool.h		\
+	gimpoperationtool.c		\
+	gimpoperationtool.h		\
+	gimpmagnifyoptions.c		\
+	gimpmagnifyoptions.h		\
+	gimpmagnifytool.c		\
+	gimpmagnifytool.h		\
+	gimpmeasureoptions.c		\
+	gimpmeasureoptions.h		\
+	gimpmeasuretool.c		\
+	gimpmeasuretool.h		\
+	gimpmoveoptions.c		\
+	gimpmoveoptions.h		\
+	gimpmovetool.c			\
+	gimpmovetool.h			\
+	gimpmybrushoptions-gui.c	\
+	gimpmybrushoptions-gui.h	\
+	gimpmybrushtool.c		\
+	gimpmybrushtool.h		\
+	gimpnpointdeformationoptions.c	\
+	gimpnpointdeformationoptions.h	\
+	gimpnpointdeformationtool.c	\
+	gimpnpointdeformationtool.h	\
+	gimppaintbrushtool.c		\
+	gimppaintbrushtool.h		\
+	gimppaintoptions-gui.c		\
+	gimppaintoptions-gui.h		\
+	gimppainttool.c			\
+	gimppainttool.h			\
+	gimppainttool-paint.c		\
+	gimppainttool-paint.h		\
+	gimppenciltool.c		\
+	gimppenciltool.h		\
+	gimpperspectiveclonetool.c	\
+	gimpperspectiveclonetool.h	\
+	gimpperspectivetool.c		\
+	gimpperspectivetool.h		\
+	gimppolygonselecttool.c		\
+	gimppolygonselecttool.h		\
+	gimprectangleselecttool.c	\
+	gimprectangleselecttool.h	\
+	gimprectangleselectoptions.c	\
+	gimprectangleselectoptions.h	\
+	gimprectangleoptions.c		\
+	gimprectangleoptions.h		\
+	gimpregionselectoptions.c	\
+	gimpregionselectoptions.h	\
+	gimpregionselecttool.c		\
+	gimpregionselecttool.h		\
+	gimprotatetool.c		\
+	gimprotatetool.h		\
+	gimpsamplepointtool.c		\
+	gimpsamplepointtool.h		\
+	gimpscaletool.c			\
+	gimpscaletool.h			\
+	gimpseamlesscloneoptions.c	\
+	gimpseamlesscloneoptions.h	\
+	gimpseamlessclonetool.c		\
+	gimpseamlessclonetool.h		\
+	gimpselectionoptions.c		\
+	gimpselectionoptions.h		\
+	gimpselectiontool.c		\
+	gimpselectiontool.h		\
+	gimpsheartool.c			\
+	gimpsheartool.h			\
+	gimpsmudgetool.c		\
+	gimpsmudgetool.h		\
+	gimpsourcetool.c		\
+	gimpsourcetool.h		\
+	gimptextoptions.c		\
+	gimptextoptions.h		\
+	gimptexttool.c			\
+	gimptexttool.h			\
+	gimptexttool-editor.c		\
+	gimptexttool-editor.h		\
+	gimpthresholdtool.c		\
+	gimpthresholdtool.h		\
+	gimptilehandleriscissors.c	\
+	gimptilehandleriscissors.h	\
+	gimptool.c			\
+	gimptool.h			\
+	gimptool-progress.c		\
+	gimptool-progress.h		\
+	gimptoolcontrol.c		\
+	gimptoolcontrol.h		\
+	gimptooloptions-gui.c		\
+	gimptooloptions-gui.h		\
+	gimptools-utils.c		\
+	gimptools-utils.h		\
+	gimptransform3doptions.c	\
+	gimptransform3doptions.h	\
+	gimptransform3dtool.c		\
+	gimptransform3dtool.h		\
+	gimptransformgridoptions.c     	\
+	gimptransformgridoptions.h     	\
+	gimptransformgridtool.c     	\
+	gimptransformgridtool.h     	\
+	gimptransformgridtoolundo.c	\
+	gimptransformgridtoolundo.h	\
+	gimptransformoptions.c     	\
+	gimptransformoptions.h     	\
+	gimptransformtool.c		\
+	gimptransformtool.h		\
+	gimpunifiedtransformtool.c	\
+	gimpunifiedtransformtool.h	\
+	gimpvectoroptions.c		\
+	gimpvectoroptions.h		\
+	gimpvectortool.c		\
+	gimpvectortool.h		\
+	gimpwarpoptions.c		\
+	gimpwarpoptions.h		\
+	gimpwarptool.c			\
+	gimpwarptool.h
+
+libapptools_a_built_sources = tools-enums.c
+libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources)
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-tec
+CLEANFILES = $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/tools/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapptools.a: $(libapptools_a_OBJECTS) $(libapptools_a_DEPENDENCIES) $(EXTRA_libapptools_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapptools.a
+	$(AM_V_AR)$(libapptools_a_AR) libapptools.a $(libapptools_a_OBJECTS) $(libapptools_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapptools.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-tool-options-manager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-tools.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpairbrushtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpalignoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpaligntool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrightnesscontrasttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbucketfilloptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbucketfilltool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbycolorselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcageoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcagetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcloneoptions-gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpclonetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcoloroptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorpickeroptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorpickertool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolortool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpconvolvetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcropoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcroptool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurvestool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdodgeburntool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpeditselectiontool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpellipseselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimperasertool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfilteroptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfiltertool-settings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfiltertool-widgets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfiltertool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpflipoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfliptool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpforegroundselectoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpforegroundselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpforegroundselecttoolundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfreeselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfuzzyselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgegltool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgenerictransformtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradientoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradienttool-editor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradienttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpguidetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphandletransformoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphandletransformtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphealtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphistogramoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpinkoptions-gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpinktool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpiscissorsoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpiscissorstool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplevelstool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmagnifyoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmagnifytool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmeasureoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmeasuretool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmoveoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmovetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrushoptions-gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmybrushtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpnpointdeformationoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpnpointdeformationtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoffsettool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoperationtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintbrushtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaintoptions-gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppainttool-paint.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppainttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppenciltool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpperspectiveclonetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpperspectivetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppolygonselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprectangleoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprectangleselectoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprectangleselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpregionselectoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpregionselecttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprotatetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsamplepointtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpscaletool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpseamlesscloneoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpseamlessclonetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpselectionoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpselectiontool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsheartool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsmudgetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsourcetool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptexttool-editor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptexttool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpthresholdtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptilehandleriscissors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptool-progress.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolcontrol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooloptions-gui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptools-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransform3doptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransform3dtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransformgridoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransformgridtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransformgridtoolundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransformoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptransformtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpunifiedtransformtool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectoroptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectortool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwarpoptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwarptool.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool_manager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-enums.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimp-tool-options-manager.Po
+	-rm -f ./$(DEPDIR)/gimp-tools.Po
+	-rm -f ./$(DEPDIR)/gimpairbrushtool.Po
+	-rm -f ./$(DEPDIR)/gimpalignoptions.Po
+	-rm -f ./$(DEPDIR)/gimpaligntool.Po
+	-rm -f ./$(DEPDIR)/gimpbrightnesscontrasttool.Po
+	-rm -f ./$(DEPDIR)/gimpbrushtool.Po
+	-rm -f ./$(DEPDIR)/gimpbucketfilloptions.Po
+	-rm -f ./$(DEPDIR)/gimpbucketfilltool.Po
+	-rm -f ./$(DEPDIR)/gimpbycolorselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpcageoptions.Po
+	-rm -f ./$(DEPDIR)/gimpcagetool.Po
+	-rm -f ./$(DEPDIR)/gimpcloneoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimpclonetool.Po
+	-rm -f ./$(DEPDIR)/gimpcoloroptions.Po
+	-rm -f ./$(DEPDIR)/gimpcolorpickeroptions.Po
+	-rm -f ./$(DEPDIR)/gimpcolorpickertool.Po
+	-rm -f ./$(DEPDIR)/gimpcolortool.Po
+	-rm -f ./$(DEPDIR)/gimpconvolvetool.Po
+	-rm -f ./$(DEPDIR)/gimpcropoptions.Po
+	-rm -f ./$(DEPDIR)/gimpcroptool.Po
+	-rm -f ./$(DEPDIR)/gimpcurvestool.Po
+	-rm -f ./$(DEPDIR)/gimpdodgeburntool.Po
+	-rm -f ./$(DEPDIR)/gimpdrawtool.Po
+	-rm -f ./$(DEPDIR)/gimpeditselectiontool.Po
+	-rm -f ./$(DEPDIR)/gimpellipseselecttool.Po
+	-rm -f ./$(DEPDIR)/gimperasertool.Po
+	-rm -f ./$(DEPDIR)/gimpfilteroptions.Po
+	-rm -f ./$(DEPDIR)/gimpfiltertool-settings.Po
+	-rm -f ./$(DEPDIR)/gimpfiltertool-widgets.Po
+	-rm -f ./$(DEPDIR)/gimpfiltertool.Po
+	-rm -f ./$(DEPDIR)/gimpflipoptions.Po
+	-rm -f ./$(DEPDIR)/gimpfliptool.Po
+	-rm -f ./$(DEPDIR)/gimpforegroundselectoptions.Po
+	-rm -f ./$(DEPDIR)/gimpforegroundselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpforegroundselecttoolundo.Po
+	-rm -f ./$(DEPDIR)/gimpfreeselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpfuzzyselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpgegltool.Po
+	-rm -f ./$(DEPDIR)/gimpgenerictransformtool.Po
+	-rm -f ./$(DEPDIR)/gimpgradientoptions.Po
+	-rm -f ./$(DEPDIR)/gimpgradienttool-editor.Po
+	-rm -f ./$(DEPDIR)/gimpgradienttool.Po
+	-rm -f ./$(DEPDIR)/gimpguidetool.Po
+	-rm -f ./$(DEPDIR)/gimphandletransformoptions.Po
+	-rm -f ./$(DEPDIR)/gimphandletransformtool.Po
+	-rm -f ./$(DEPDIR)/gimphealtool.Po
+	-rm -f ./$(DEPDIR)/gimphistogramoptions.Po
+	-rm -f ./$(DEPDIR)/gimpinkoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimpinktool.Po
+	-rm -f ./$(DEPDIR)/gimpiscissorsoptions.Po
+	-rm -f ./$(DEPDIR)/gimpiscissorstool.Po
+	-rm -f ./$(DEPDIR)/gimplevelstool.Po
+	-rm -f ./$(DEPDIR)/gimpmagnifyoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmagnifytool.Po
+	-rm -f ./$(DEPDIR)/gimpmeasureoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmeasuretool.Po
+	-rm -f ./$(DEPDIR)/gimpmoveoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmovetool.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushtool.Po
+	-rm -f ./$(DEPDIR)/gimpnpointdeformationoptions.Po
+	-rm -f ./$(DEPDIR)/gimpnpointdeformationtool.Po
+	-rm -f ./$(DEPDIR)/gimpoffsettool.Po
+	-rm -f ./$(DEPDIR)/gimpoperationtool.Po
+	-rm -f ./$(DEPDIR)/gimppaintbrushtool.Po
+	-rm -f ./$(DEPDIR)/gimppaintoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimppainttool-paint.Po
+	-rm -f ./$(DEPDIR)/gimppainttool.Po
+	-rm -f ./$(DEPDIR)/gimppenciltool.Po
+	-rm -f ./$(DEPDIR)/gimpperspectiveclonetool.Po
+	-rm -f ./$(DEPDIR)/gimpperspectivetool.Po
+	-rm -f ./$(DEPDIR)/gimppolygonselecttool.Po
+	-rm -f ./$(DEPDIR)/gimprectangleoptions.Po
+	-rm -f ./$(DEPDIR)/gimprectangleselectoptions.Po
+	-rm -f ./$(DEPDIR)/gimprectangleselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpregionselectoptions.Po
+	-rm -f ./$(DEPDIR)/gimpregionselecttool.Po
+	-rm -f ./$(DEPDIR)/gimprotatetool.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepointtool.Po
+	-rm -f ./$(DEPDIR)/gimpscaletool.Po
+	-rm -f ./$(DEPDIR)/gimpseamlesscloneoptions.Po
+	-rm -f ./$(DEPDIR)/gimpseamlessclonetool.Po
+	-rm -f ./$(DEPDIR)/gimpselectionoptions.Po
+	-rm -f ./$(DEPDIR)/gimpselectiontool.Po
+	-rm -f ./$(DEPDIR)/gimpsheartool.Po
+	-rm -f ./$(DEPDIR)/gimpsmudgetool.Po
+	-rm -f ./$(DEPDIR)/gimpsourcetool.Po
+	-rm -f ./$(DEPDIR)/gimptextoptions.Po
+	-rm -f ./$(DEPDIR)/gimptexttool-editor.Po
+	-rm -f ./$(DEPDIR)/gimptexttool.Po
+	-rm -f ./$(DEPDIR)/gimpthresholdtool.Po
+	-rm -f ./$(DEPDIR)/gimptilehandleriscissors.Po
+	-rm -f ./$(DEPDIR)/gimptool-progress.Po
+	-rm -f ./$(DEPDIR)/gimptool.Po
+	-rm -f ./$(DEPDIR)/gimptoolcontrol.Po
+	-rm -f ./$(DEPDIR)/gimptooloptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimptools-utils.Po
+	-rm -f ./$(DEPDIR)/gimptransform3doptions.Po
+	-rm -f ./$(DEPDIR)/gimptransform3dtool.Po
+	-rm -f ./$(DEPDIR)/gimptransformgridoptions.Po
+	-rm -f ./$(DEPDIR)/gimptransformgridtool.Po
+	-rm -f ./$(DEPDIR)/gimptransformgridtoolundo.Po
+	-rm -f ./$(DEPDIR)/gimptransformoptions.Po
+	-rm -f ./$(DEPDIR)/gimptransformtool.Po
+	-rm -f ./$(DEPDIR)/gimpunifiedtransformtool.Po
+	-rm -f ./$(DEPDIR)/gimpvectoroptions.Po
+	-rm -f ./$(DEPDIR)/gimpvectortool.Po
+	-rm -f ./$(DEPDIR)/gimpwarpoptions.Po
+	-rm -f ./$(DEPDIR)/gimpwarptool.Po
+	-rm -f ./$(DEPDIR)/tool_manager.Po
+	-rm -f ./$(DEPDIR)/tools-enums.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimp-tool-options-manager.Po
+	-rm -f ./$(DEPDIR)/gimp-tools.Po
+	-rm -f ./$(DEPDIR)/gimpairbrushtool.Po
+	-rm -f ./$(DEPDIR)/gimpalignoptions.Po
+	-rm -f ./$(DEPDIR)/gimpaligntool.Po
+	-rm -f ./$(DEPDIR)/gimpbrightnesscontrasttool.Po
+	-rm -f ./$(DEPDIR)/gimpbrushtool.Po
+	-rm -f ./$(DEPDIR)/gimpbucketfilloptions.Po
+	-rm -f ./$(DEPDIR)/gimpbucketfilltool.Po
+	-rm -f ./$(DEPDIR)/gimpbycolorselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpcageoptions.Po
+	-rm -f ./$(DEPDIR)/gimpcagetool.Po
+	-rm -f ./$(DEPDIR)/gimpcloneoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimpclonetool.Po
+	-rm -f ./$(DEPDIR)/gimpcoloroptions.Po
+	-rm -f ./$(DEPDIR)/gimpcolorpickeroptions.Po
+	-rm -f ./$(DEPDIR)/gimpcolorpickertool.Po
+	-rm -f ./$(DEPDIR)/gimpcolortool.Po
+	-rm -f ./$(DEPDIR)/gimpconvolvetool.Po
+	-rm -f ./$(DEPDIR)/gimpcropoptions.Po
+	-rm -f ./$(DEPDIR)/gimpcroptool.Po
+	-rm -f ./$(DEPDIR)/gimpcurvestool.Po
+	-rm -f ./$(DEPDIR)/gimpdodgeburntool.Po
+	-rm -f ./$(DEPDIR)/gimpdrawtool.Po
+	-rm -f ./$(DEPDIR)/gimpeditselectiontool.Po
+	-rm -f ./$(DEPDIR)/gimpellipseselecttool.Po
+	-rm -f ./$(DEPDIR)/gimperasertool.Po
+	-rm -f ./$(DEPDIR)/gimpfilteroptions.Po
+	-rm -f ./$(DEPDIR)/gimpfiltertool-settings.Po
+	-rm -f ./$(DEPDIR)/gimpfiltertool-widgets.Po
+	-rm -f ./$(DEPDIR)/gimpfiltertool.Po
+	-rm -f ./$(DEPDIR)/gimpflipoptions.Po
+	-rm -f ./$(DEPDIR)/gimpfliptool.Po
+	-rm -f ./$(DEPDIR)/gimpforegroundselectoptions.Po
+	-rm -f ./$(DEPDIR)/gimpforegroundselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpforegroundselecttoolundo.Po
+	-rm -f ./$(DEPDIR)/gimpfreeselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpfuzzyselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpgegltool.Po
+	-rm -f ./$(DEPDIR)/gimpgenerictransformtool.Po
+	-rm -f ./$(DEPDIR)/gimpgradientoptions.Po
+	-rm -f ./$(DEPDIR)/gimpgradienttool-editor.Po
+	-rm -f ./$(DEPDIR)/gimpgradienttool.Po
+	-rm -f ./$(DEPDIR)/gimpguidetool.Po
+	-rm -f ./$(DEPDIR)/gimphandletransformoptions.Po
+	-rm -f ./$(DEPDIR)/gimphandletransformtool.Po
+	-rm -f ./$(DEPDIR)/gimphealtool.Po
+	-rm -f ./$(DEPDIR)/gimphistogramoptions.Po
+	-rm -f ./$(DEPDIR)/gimpinkoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimpinktool.Po
+	-rm -f ./$(DEPDIR)/gimpiscissorsoptions.Po
+	-rm -f ./$(DEPDIR)/gimpiscissorstool.Po
+	-rm -f ./$(DEPDIR)/gimplevelstool.Po
+	-rm -f ./$(DEPDIR)/gimpmagnifyoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmagnifytool.Po
+	-rm -f ./$(DEPDIR)/gimpmeasureoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmeasuretool.Po
+	-rm -f ./$(DEPDIR)/gimpmoveoptions.Po
+	-rm -f ./$(DEPDIR)/gimpmovetool.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimpmybrushtool.Po
+	-rm -f ./$(DEPDIR)/gimpnpointdeformationoptions.Po
+	-rm -f ./$(DEPDIR)/gimpnpointdeformationtool.Po
+	-rm -f ./$(DEPDIR)/gimpoffsettool.Po
+	-rm -f ./$(DEPDIR)/gimpoperationtool.Po
+	-rm -f ./$(DEPDIR)/gimppaintbrushtool.Po
+	-rm -f ./$(DEPDIR)/gimppaintoptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimppainttool-paint.Po
+	-rm -f ./$(DEPDIR)/gimppainttool.Po
+	-rm -f ./$(DEPDIR)/gimppenciltool.Po
+	-rm -f ./$(DEPDIR)/gimpperspectiveclonetool.Po
+	-rm -f ./$(DEPDIR)/gimpperspectivetool.Po
+	-rm -f ./$(DEPDIR)/gimppolygonselecttool.Po
+	-rm -f ./$(DEPDIR)/gimprectangleoptions.Po
+	-rm -f ./$(DEPDIR)/gimprectangleselectoptions.Po
+	-rm -f ./$(DEPDIR)/gimprectangleselecttool.Po
+	-rm -f ./$(DEPDIR)/gimpregionselectoptions.Po
+	-rm -f ./$(DEPDIR)/gimpregionselecttool.Po
+	-rm -f ./$(DEPDIR)/gimprotatetool.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepointtool.Po
+	-rm -f ./$(DEPDIR)/gimpscaletool.Po
+	-rm -f ./$(DEPDIR)/gimpseamlesscloneoptions.Po
+	-rm -f ./$(DEPDIR)/gimpseamlessclonetool.Po
+	-rm -f ./$(DEPDIR)/gimpselectionoptions.Po
+	-rm -f ./$(DEPDIR)/gimpselectiontool.Po
+	-rm -f ./$(DEPDIR)/gimpsheartool.Po
+	-rm -f ./$(DEPDIR)/gimpsmudgetool.Po
+	-rm -f ./$(DEPDIR)/gimpsourcetool.Po
+	-rm -f ./$(DEPDIR)/gimptextoptions.Po
+	-rm -f ./$(DEPDIR)/gimptexttool-editor.Po
+	-rm -f ./$(DEPDIR)/gimptexttool.Po
+	-rm -f ./$(DEPDIR)/gimpthresholdtool.Po
+	-rm -f ./$(DEPDIR)/gimptilehandleriscissors.Po
+	-rm -f ./$(DEPDIR)/gimptool-progress.Po
+	-rm -f ./$(DEPDIR)/gimptool.Po
+	-rm -f ./$(DEPDIR)/gimptoolcontrol.Po
+	-rm -f ./$(DEPDIR)/gimptooloptions-gui.Po
+	-rm -f ./$(DEPDIR)/gimptools-utils.Po
+	-rm -f ./$(DEPDIR)/gimptransform3doptions.Po
+	-rm -f ./$(DEPDIR)/gimptransform3dtool.Po
+	-rm -f ./$(DEPDIR)/gimptransformgridoptions.Po
+	-rm -f ./$(DEPDIR)/gimptransformgridtool.Po
+	-rm -f ./$(DEPDIR)/gimptransformgridtoolundo.Po
+	-rm -f ./$(DEPDIR)/gimptransformoptions.Po
+	-rm -f ./$(DEPDIR)/gimptransformtool.Po
+	-rm -f ./$(DEPDIR)/gimpunifiedtransformtool.Po
+	-rm -f ./$(DEPDIR)/gimpvectoroptions.Po
+	-rm -f ./$(DEPDIR)/gimpvectortool.Po
+	-rm -f ./$(DEPDIR)/gimpwarpoptions.Po
+	-rm -f ./$(DEPDIR)/gimpwarptool.Po
+	-rm -f ./$(DEPDIR)/tool_manager.Po
+	-rm -f ./$(DEPDIR)/tools-enums.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-tec: $(srcdir)/tools-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"tools-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/tools-enums.c: xgen-tec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/tools/gimp-tool-options-manager.c b/app/tools/gimp-tool-options-manager.c
new file mode 100644
index 0000000..a466d65
--- /dev/null
+++ b/app/tools/gimp-tool-options-manager.c
@@ -0,0 +1,462 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-tool-options-manager.c
+ * Copyright (C) 2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolinfo.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimp-tool-options-manager.h"
+
+
+typedef struct _GimpToolOptionsManager GimpToolOptionsManager;
+
+struct _GimpToolOptionsManager
+{
+  Gimp                *gimp;
+  GimpPaintOptions    *global_paint_options;
+  GimpContextPropMask  global_props;
+
+  GimpToolInfo        *active_tool;
+};
+
+
+static GQuark manager_quark = 0;
+
+
+/*  local function prototypes  */
+
+static GimpContextPropMask
+              tool_options_manager_get_global_props
+                                                 (GimpCoreConfig         *config);
+
+static void   tool_options_manager_global_notify (GimpCoreConfig         *config,
+                                                  const GParamSpec       *pspec,
+                                                  GimpToolOptionsManager *manager);
+static void   tool_options_manager_paint_options_notify
+                                                 (GimpPaintOptions       *src,
+                                                  const GParamSpec       *pspec,
+                                                  GimpPaintOptions       *dest);
+
+static void   tool_options_manager_copy_paint_props
+                                                 (GimpPaintOptions       *src,
+                                                  GimpPaintOptions       *dest,
+                                                  GimpContextPropMask     prop_mask);
+
+static void   tool_options_manager_tool_changed  (GimpContext            *user_context,
+                                                  GimpToolInfo           *tool_info,
+                                                  GimpToolOptionsManager *manager);
+
+
+/*  public functions  */
+
+void
+gimp_tool_options_manager_init (Gimp *gimp)
+{
+  GimpToolOptionsManager *manager;
+  GimpContext            *user_context;
+  GimpCoreConfig         *config;
+  GList                  *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (manager_quark == 0);
+
+  manager_quark = g_quark_from_static_string ("gimp-tool-options-manager");
+
+  config = gimp->config;
+
+  manager = g_slice_new0 (GimpToolOptionsManager);
+
+  manager->gimp = gimp;
+
+  manager->global_paint_options =
+    g_object_new (GIMP_TYPE_PAINT_OPTIONS,
+                  "gimp", gimp,
+                  "name", "tool-options-manager-global-paint-options",
+                  NULL);
+
+  manager->global_props = tool_options_manager_get_global_props (config);
+
+  g_object_set_qdata (G_OBJECT (gimp), manager_quark, manager);
+
+  user_context = gimp_get_user_context (gimp);
+
+  for (list = gimp_get_tool_info_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = list->data;
+
+      /*  the global props that are actually used by the tool are
+       *  always shared with the user context by undefining them...
+       */
+      gimp_context_define_properties (GIMP_CONTEXT (tool_info->tool_options),
+                                      manager->global_props &
+                                      tool_info->context_props,
+                                      FALSE);
+
+      /*  ...and setting the user context as parent
+       */
+      gimp_context_set_parent (GIMP_CONTEXT (tool_info->tool_options),
+                               user_context);
+
+      /*  make sure paint tools also share their brush, dynamics,
+       *  gradient properties if the resp. context properties are
+       *  global
+       */
+      if (GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+        {
+          g_signal_connect (tool_info->tool_options, "notify",
+                            G_CALLBACK (tool_options_manager_paint_options_notify),
+                            manager->global_paint_options);
+
+          g_signal_connect (manager->global_paint_options, "notify",
+                            G_CALLBACK (tool_options_manager_paint_options_notify),
+                            tool_info->tool_options);
+
+          tool_options_manager_copy_paint_props (manager->global_paint_options,
+                                                 GIMP_PAINT_OPTIONS (tool_info->tool_options),
+                                                 tool_info->context_props &
+                                                 manager->global_props);
+        }
+    }
+
+  g_signal_connect (gimp->config, "notify::global-brush",
+                    G_CALLBACK (tool_options_manager_global_notify),
+                    manager);
+  g_signal_connect (gimp->config, "notify::global-dynamics",
+                    G_CALLBACK (tool_options_manager_global_notify),
+                    manager);
+  g_signal_connect (gimp->config, "notify::global-pattern",
+                    G_CALLBACK (tool_options_manager_global_notify),
+                    manager);
+  g_signal_connect (gimp->config, "notify::global-palette",
+                    G_CALLBACK (tool_options_manager_global_notify),
+                    manager);
+  g_signal_connect (gimp->config, "notify::global-gradient",
+                    G_CALLBACK (tool_options_manager_global_notify),
+                    manager);
+  g_signal_connect (gimp->config, "notify::global-font",
+                    G_CALLBACK (tool_options_manager_global_notify),
+                    manager);
+
+  g_signal_connect (user_context, "tool-changed",
+                    G_CALLBACK (tool_options_manager_tool_changed),
+                    manager);
+
+  tool_options_manager_tool_changed (user_context,
+                                     gimp_context_get_tool (user_context),
+                                     manager);
+}
+
+void
+gimp_tool_options_manager_exit (Gimp *gimp)
+{
+  GimpToolOptionsManager *manager;
+  GimpContext            *user_context;
+  GList                  *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  manager = g_object_get_qdata (G_OBJECT (gimp), manager_quark);
+
+  g_return_if_fail (manager != NULL);
+
+  user_context = gimp_get_user_context (gimp);
+
+  g_signal_handlers_disconnect_by_func (user_context,
+                                        tool_options_manager_tool_changed,
+                                        manager);
+
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        tool_options_manager_global_notify,
+                                        manager);
+
+  for (list = gimp_get_tool_info_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = list->data;
+
+      gimp_context_set_parent (GIMP_CONTEXT (tool_info->tool_options), NULL);
+
+      if (GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+        {
+          g_signal_handlers_disconnect_by_func (tool_info->tool_options,
+                                                tool_options_manager_paint_options_notify,
+                                                manager->global_paint_options);
+
+          g_signal_handlers_disconnect_by_func (manager->global_paint_options,
+                                                tool_options_manager_paint_options_notify,
+                                                tool_info->tool_options);
+        }
+    }
+
+  g_clear_object (&manager->global_paint_options);
+
+  g_slice_free (GimpToolOptionsManager, manager);
+
+  g_object_set_qdata (G_OBJECT (gimp), manager_quark, NULL);
+}
+
+
+/*  private functions  */
+
+static GimpContextPropMask
+tool_options_manager_get_global_props (GimpCoreConfig *config)
+{
+  GimpContextPropMask global_props = 0;
+
+  /*  FG and BG are always shared between all tools  */
+  global_props |= GIMP_CONTEXT_PROP_MASK_FOREGROUND;
+  global_props |= GIMP_CONTEXT_PROP_MASK_BACKGROUND;
+
+  if (config->global_brush)
+    global_props |= GIMP_CONTEXT_PROP_MASK_BRUSH;
+  if (config->global_dynamics)
+    global_props |= GIMP_CONTEXT_PROP_MASK_DYNAMICS;
+  if (config->global_pattern)
+    global_props |= GIMP_CONTEXT_PROP_MASK_PATTERN;
+  if (config->global_palette)
+    global_props |= GIMP_CONTEXT_PROP_MASK_PALETTE;
+  if (config->global_gradient)
+    global_props |= GIMP_CONTEXT_PROP_MASK_GRADIENT;
+  if (config->global_font)
+    global_props |= GIMP_CONTEXT_PROP_MASK_FONT;
+
+  return global_props;
+}
+
+static void
+tool_options_manager_global_notify (GimpCoreConfig         *config,
+                                    const GParamSpec       *pspec,
+                                    GimpToolOptionsManager *manager)
+{
+  GimpContextPropMask  global_props;
+  GimpContextPropMask  enabled_global_props;
+  GimpContextPropMask  disabled_global_props;
+  GList               *list;
+
+  global_props = tool_options_manager_get_global_props (config);
+
+  enabled_global_props  = global_props & ~manager->global_props;
+  disabled_global_props = manager->global_props & ~global_props;
+
+  /*  copy the newly enabled global props to all tool options, and
+   *  disconnect the newly disabled ones from the user context
+   */
+  for (list = gimp_get_tool_info_iter (manager->gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = list->data;
+
+      /*  don't change the active tool, it is always fully connected
+       *  to the user_context anyway because we set its
+       *  defined/undefined context props in tool_changed()
+       */
+      if (tool_info == manager->active_tool)
+        continue;
+
+      /*  defining the newly disabled ones disconnects them from the
+       *  parent user context
+       */
+      gimp_context_define_properties (GIMP_CONTEXT (tool_info->tool_options),
+                                      tool_info->context_props &
+                                      disabled_global_props,
+                                      TRUE);
+
+      /*  undefining the newly enabled ones copies the value from the
+       *  parent user context
+       */
+      gimp_context_define_properties (GIMP_CONTEXT (tool_info->tool_options),
+                                      tool_info->context_props &
+                                      enabled_global_props,
+                                      FALSE);
+
+      if (GIMP_IS_PAINT_OPTIONS (tool_info->tool_options))
+        tool_options_manager_copy_paint_props (manager->global_paint_options,
+                                               GIMP_PAINT_OPTIONS (tool_info->tool_options),
+                                               tool_info->context_props &
+                                               enabled_global_props);
+    }
+
+  manager->global_props = global_props;
+}
+
+static void
+tool_options_manager_paint_options_notify (GimpPaintOptions *src,
+                                           const GParamSpec *pspec,
+                                           GimpPaintOptions *dest)
+{
+  Gimp                   *gimp   = GIMP_CONTEXT (src)->gimp;
+  GimpCoreConfig         *config = gimp->config;
+  GimpToolOptionsManager *manager;
+  GimpToolInfo           *tool_info;
+  GimpContextPropMask     prop_mask = 0;
+  gboolean                active    = FALSE;
+
+  manager = g_object_get_qdata (G_OBJECT (gimp), manager_quark);
+
+  /*  one of the options is the global one, the other is the tool's,
+   *  get the tool_info from the tool's options
+   */
+  if (manager->global_paint_options == src)
+    tool_info = gimp_context_get_tool (GIMP_CONTEXT (dest));
+  else
+    tool_info = gimp_context_get_tool (GIMP_CONTEXT (src));
+
+  if (tool_info == manager->active_tool)
+    active = TRUE;
+
+  if ((active || config->global_brush) &&
+      tool_info->context_props & GIMP_CONTEXT_PROP_MASK_BRUSH)
+    {
+      prop_mask |= GIMP_CONTEXT_PROP_MASK_BRUSH;
+    }
+
+  if ((active || config->global_dynamics) &&
+      tool_info->context_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS)
+    {
+      prop_mask |= GIMP_CONTEXT_PROP_MASK_DYNAMICS;
+    }
+
+  if ((active || config->global_gradient) &&
+      tool_info->context_props & GIMP_CONTEXT_PROP_MASK_GRADIENT)
+    {
+      prop_mask |= GIMP_CONTEXT_PROP_MASK_GRADIENT;
+    }
+
+  if (gimp_paint_options_is_prop (pspec->name, prop_mask))
+    {
+      GValue value = G_VALUE_INIT;
+
+      g_value_init (&value, pspec->value_type);
+
+      g_object_get_property (G_OBJECT (src), pspec->name, &value);
+
+      g_signal_handlers_block_by_func (dest,
+                                       tool_options_manager_paint_options_notify,
+                                       src);
+
+      g_object_set_property (G_OBJECT (dest), pspec->name, &value);
+
+      g_signal_handlers_unblock_by_func (dest,
+                                         tool_options_manager_paint_options_notify,
+                                         src);
+
+      g_value_unset (&value);
+    }
+}
+
+static void
+tool_options_manager_copy_paint_props (GimpPaintOptions    *src,
+                                       GimpPaintOptions    *dest,
+                                       GimpContextPropMask  prop_mask)
+{
+  g_signal_handlers_block_by_func (dest,
+                                   tool_options_manager_paint_options_notify,
+                                   src);
+
+  gimp_paint_options_copy_props (src, dest, prop_mask);
+
+  g_signal_handlers_unblock_by_func (dest,
+                                     tool_options_manager_paint_options_notify,
+                                     src);
+}
+
+static void
+tool_options_manager_tool_changed (GimpContext            *user_context,
+                                   GimpToolInfo           *tool_info,
+                                   GimpToolOptionsManager *manager)
+{
+  if (tool_info == manager->active_tool)
+    return;
+
+  /*  FIXME: gimp_busy HACK
+   *  the tool manager will stop the emission, so simply return
+   */
+  if (user_context->gimp->busy)
+    return;
+
+  if (manager->active_tool)
+    {
+      GimpToolInfo *active = manager->active_tool;
+
+      /*  disconnect the old active tool from all context properties
+       *  it uses, but are not currently global
+       */
+      gimp_context_define_properties (GIMP_CONTEXT (active->tool_options),
+                                      active->context_props &
+                                      ~manager->global_props,
+                                      TRUE);
+    }
+
+  manager->active_tool = tool_info;
+
+  if (manager->active_tool)
+    {
+      GimpToolInfo *active = manager->active_tool;
+
+      /*  make sure the tool options GUI always exists, this call
+       *  creates it if needed, so tools always have their option GUI
+       *  available even if the tool options dockable is not open, see
+       *  for example issue #3435
+       */
+      gimp_tools_get_tool_options_gui (active->tool_options);
+
+      /*  copy the new tool's context properties that are not
+       *  currently global to the user context, so they get used by
+       *  everything
+       */
+      gimp_context_copy_properties (GIMP_CONTEXT (active->tool_options),
+                                    gimp_get_user_context (manager->gimp),
+                                    active->context_props &
+                                    ~manager->global_props);
+
+      if (GIMP_IS_PAINT_OPTIONS (active->tool_options))
+        tool_options_manager_copy_paint_props (GIMP_PAINT_OPTIONS (active->tool_options),
+                                               manager->global_paint_options,
+                                               active->context_props &
+                                               ~manager->global_props);
+
+      /*  then, undefine these properties so the tool syncs with the
+       *  user context automatically
+       */
+      gimp_context_define_properties (GIMP_CONTEXT (active->tool_options),
+                                      active->context_props &
+                                      ~manager->global_props,
+                                      FALSE);
+    }
+}
diff --git a/app/tools/gimp-tool-options-manager.h b/app/tools/gimp-tool-options-manager.h
new file mode 100644
index 0000000..ea6f6ff
--- /dev/null
+++ b/app/tools/gimp-tool-options-manager.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-tool-options-manager.h
+ * Copyright (C) 2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_OPTIONS_MANAGER_H__
+#define __GIMP_TOOL_OPTIONS_MANAGER_H__
+
+
+void   gimp_tool_options_manager_init (Gimp *gimp);
+void   gimp_tool_options_manager_exit (Gimp *gimp);
+
+
+#endif  /*  __GIMP_TOOL_OPTIONS_MANAGER_H__  */
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
new file mode 100644
index 0000000..7c35be9
--- /dev/null
+++ b/app/tools/gimp-tools.c
@@ -0,0 +1,831 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-contexts.h"
+#include "core/gimp-internal-data.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimptoolgroup.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+
+#include "gimp-tool-options-manager.h"
+#include "gimp-tools.h"
+#include "gimptooloptions-gui.h"
+#include "tool_manager.h"
+
+#include "gimpairbrushtool.h"
+#include "gimpaligntool.h"
+#include "gimpbrightnesscontrasttool.h"
+#include "gimpbucketfilltool.h"
+#include "gimpbycolorselecttool.h"
+#include "gimpcagetool.h"
+#include "gimpclonetool.h"
+#include "gimpcolorpickertool.h"
+#include "gimpconvolvetool.h"
+#include "gimpcroptool.h"
+#include "gimpcurvestool.h"
+#include "gimpdodgeburntool.h"
+#include "gimpellipseselecttool.h"
+#include "gimperasertool.h"
+#include "gimpfliptool.h"
+#include "gimpfreeselecttool.h"
+#include "gimpforegroundselecttool.h"
+#include "gimpfuzzyselecttool.h"
+#include "gimpgegltool.h"
+#include "gimpgradienttool.h"
+#include "gimphandletransformtool.h"
+#include "gimphealtool.h"
+#include "gimpinktool.h"
+#include "gimpiscissorstool.h"
+#include "gimplevelstool.h"
+#include "gimpoperationtool.h"
+#include "gimpmagnifytool.h"
+#include "gimpmeasuretool.h"
+#include "gimpmovetool.h"
+#include "gimpmybrushtool.h"
+#include "gimpnpointdeformationtool.h"
+#include "gimpoffsettool.h"
+#include "gimppaintbrushtool.h"
+#include "gimppenciltool.h"
+#include "gimpperspectiveclonetool.h"
+#include "gimpperspectivetool.h"
+#include "gimpthresholdtool.h"
+#include "gimprectangleselecttool.h"
+#include "gimprotatetool.h"
+#include "gimpseamlessclonetool.h"
+#include "gimpscaletool.h"
+#include "gimpsheartool.h"
+#include "gimpsmudgetool.h"
+#include "gimptexttool.h"
+#include "gimptransform3dtool.h"
+#include "gimpunifiedtransformtool.h"
+#include "gimpvectortool.h"
+#include "gimpwarptool.h"
+
+#include "gimp-intl.h"
+
+
+#define TOOL_RC_FILE_VERSION 1
+
+
+/*  local function prototypes  */
+
+static void   gimp_tools_register       (GType                   tool_type,
+                                         GType                   tool_options_type,
+                                         GimpToolOptionsGUIFunc  options_gui_func,
+                                         GimpContextPropMask     context_props,
+                                         const gchar            *identifier,
+                                         const gchar            *label,
+                                         const gchar            *tooltip,
+                                         const gchar            *menu_label,
+                                         const gchar            *menu_accel,
+                                         const gchar            *help_domain,
+                                         const gchar            *help_data,
+                                         const gchar            *icon_name,
+                                         gpointer                data);
+
+static void   gimp_tools_copy_structure (Gimp                   *gimp,
+                                         GimpContainer          *src_container,
+                                         GimpContainer          *dest_container,
+                                         GHashTable             *tools);
+
+/*  private variables  */
+
+static GBinding *toolbox_groups_binding = NULL;
+static gboolean  tool_options_deleted   = FALSE;
+
+
+/*  public functions  */
+
+void
+gimp_tools_init (Gimp *gimp)
+{
+  GimpToolRegisterFunc register_funcs[] =
+  {
+    /*  selection tools */
+
+    gimp_rectangle_select_tool_register,
+    gimp_ellipse_select_tool_register,
+    gimp_free_select_tool_register,
+    gimp_fuzzy_select_tool_register,
+    gimp_by_color_select_tool_register,
+    gimp_iscissors_tool_register,
+    gimp_foreground_select_tool_register,
+
+    /*  path tool */
+
+    gimp_vector_tool_register,
+
+    /*  non-modifying tools  */
+
+    gimp_color_picker_tool_register,
+    gimp_magnify_tool_register,
+    gimp_measure_tool_register,
+
+    /*  transform tools  */
+
+    gimp_move_tool_register,
+    gimp_align_tool_register,
+    gimp_crop_tool_register,
+    gimp_unified_transform_tool_register,
+    gimp_rotate_tool_register,
+    gimp_scale_tool_register,
+    gimp_shear_tool_register,
+    gimp_handle_transform_tool_register,
+    gimp_perspective_tool_register,
+    gimp_transform_3d_tool_register,
+    gimp_flip_tool_register,
+    gimp_cage_tool_register,
+    gimp_warp_tool_register,
+    gimp_n_point_deformation_tool_register,
+
+    /*  paint tools  */
+
+    gimp_seamless_clone_tool_register,
+    gimp_text_tool_register,
+    gimp_bucket_fill_tool_register,
+    gimp_gradient_tool_register,
+    gimp_pencil_tool_register,
+    gimp_paintbrush_tool_register,
+    gimp_eraser_tool_register,
+    gimp_airbrush_tool_register,
+    gimp_ink_tool_register,
+    gimp_mybrush_tool_register,
+    gimp_clone_tool_register,
+    gimp_heal_tool_register,
+    gimp_perspective_clone_tool_register,
+    gimp_convolve_tool_register,
+    gimp_smudge_tool_register,
+    gimp_dodge_burn_tool_register,
+
+    /*  filter tools  */
+
+    gimp_brightness_contrast_tool_register,
+    gimp_threshold_tool_register,
+    gimp_levels_tool_register,
+    gimp_curves_tool_register,
+    gimp_offset_tool_register,
+    gimp_gegl_tool_register,
+    gimp_operation_tool_register
+  };
+
+  gint i;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_tool_options_create_folder ();
+
+  gimp_container_freeze (gimp->tool_info_list);
+
+  for (i = 0; i < G_N_ELEMENTS (register_funcs); i++)
+    {
+      register_funcs[i] (gimp_tools_register, gimp);
+    }
+
+  gimp_container_thaw (gimp->tool_info_list);
+
+  gimp_tool_options_manager_init (gimp);
+
+  tool_manager_init (gimp);
+
+  toolbox_groups_binding = g_object_bind_property (
+    gimp->config,            "toolbox-groups",
+    gimp->tool_item_ui_list, "flat",
+    G_BINDING_INVERT_BOOLEAN |
+    G_BINDING_SYNC_CREATE);
+}
+
+void
+gimp_tools_exit (Gimp *gimp)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_clear_object (&toolbox_groups_binding);
+
+  tool_manager_exit (gimp);
+
+  gimp_tool_options_manager_exit (gimp);
+
+  for (list = gimp_get_tool_info_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = list->data;
+
+      gimp_tools_set_tool_options_gui (tool_info->tool_options, NULL);
+    }
+}
+
+void
+gimp_tools_restore (Gimp *gimp)
+{
+  GimpObject *object;
+  GList      *list;
+  GError     *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /* restore tool order */
+  gimp_tools_reset (gimp, gimp->tool_item_list, TRUE);
+
+  /* make the generic operation tool invisible by default */
+  object = gimp_container_get_child_by_name (gimp->tool_info_list,
+                                             "gimp-operation-tool");
+  if (object)
+    g_object_set (object, "visible", FALSE, NULL);
+
+  for (list = gimp_get_tool_info_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = GIMP_TOOL_INFO (list->data);
+
+      /*  get default values from prefs (see bug #120832)  */
+      gimp_config_reset (GIMP_CONFIG (tool_info->tool_options));
+    }
+
+  if (! gimp_contexts_load (gimp, &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING, error->message);
+      g_clear_error (&error);
+    }
+
+  if (! gimp_internal_data_load (gimp, &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING, error->message);
+      g_clear_error (&error);
+    }
+
+  /*  make sure there is always a tool active, so broken config files
+   *  can't leave us with no initial tool
+   */
+  if (! gimp_context_get_tool (gimp_get_user_context (gimp)))
+    {
+      gimp_context_set_tool (gimp_get_user_context (gimp),
+                             gimp_get_tool_info_iter (gimp)->data);
+    }
+
+  for (list = gimp_get_tool_info_iter (gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolInfo           *tool_info = GIMP_TOOL_INFO (list->data);
+      GimpToolOptionsGUIFunc  options_gui_func;
+
+      /*  copy all context properties except those the tool actually
+       *  uses, because the subsequent deserialize() on the tool
+       *  options will only set the properties that were set to
+       *  non-default values at the time of saving, and we want to
+       *  keep these default values as if they have been saved.
+       * (see bug #541586).
+       */
+      gimp_context_copy_properties (gimp_get_user_context (gimp),
+                                    GIMP_CONTEXT (tool_info->tool_options),
+                                    GIMP_CONTEXT_PROP_MASK_ALL &~
+                                    (tool_info->context_props    |
+                                     GIMP_CONTEXT_PROP_MASK_TOOL |
+                                     GIMP_CONTEXT_PROP_MASK_PAINT_INFO));
+
+      gimp_tool_options_deserialize (tool_info->tool_options, NULL);
+
+      options_gui_func = g_object_get_data (G_OBJECT (tool_info),
+                                            "gimp-tool-options-gui-func");
+
+      if (! options_gui_func)
+        options_gui_func = gimp_tool_options_empty_gui;
+
+      gimp_tools_set_tool_options_gui_func (tool_info->tool_options,
+                                            options_gui_func);
+    }
+}
+
+void
+gimp_tools_save (Gimp     *gimp,
+                 gboolean  save_tool_options,
+                 gboolean  always_save)
+{
+  GimpConfigWriter *writer;
+  GFile            *file;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  if (save_tool_options && (! tool_options_deleted || always_save))
+    {
+      GList  *list;
+      GError *error = NULL;
+
+      if (! gimp_contexts_save (gimp, &error))
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
+                                error->message);
+          g_clear_error (&error);
+        }
+
+      if (! gimp_internal_data_save (gimp, &error))
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
+                                error->message);
+          g_clear_error (&error);
+        }
+
+      gimp_tool_options_create_folder ();
+
+      for (list = gimp_get_tool_info_iter (gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpToolInfo *tool_info = GIMP_TOOL_INFO (list->data);
+
+          gimp_tool_options_serialize (tool_info->tool_options, NULL);
+        }
+    }
+
+  file = gimp_directory_file ("toolrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  writer = gimp_config_writer_new_gfile (file, TRUE, "GIMP toolrc", NULL);
+
+  if (writer)
+    {
+      gimp_tools_serialize (gimp, gimp->tool_item_list, writer);
+
+      gimp_config_writer_finish (writer, "end of toolrc", NULL);
+    }
+
+  g_object_unref (file);
+}
+
+gboolean
+gimp_tools_clear (Gimp    *gimp,
+                  GError **error)
+{
+  GList    *list;
+  gboolean  success = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  for (list = gimp_get_tool_info_iter (gimp);
+       list && success;
+       list = g_list_next (list))
+    {
+      GimpToolInfo *tool_info = GIMP_TOOL_INFO (list->data);
+
+      success = gimp_tool_options_delete (tool_info->tool_options, NULL);
+    }
+
+  if (success)
+    success = gimp_contexts_clear (gimp, error);
+
+  if (success)
+    success = gimp_internal_data_clear (gimp, error);
+
+  if (success)
+    tool_options_deleted = TRUE;
+
+  return success;
+}
+
+gboolean
+gimp_tools_serialize (Gimp             *gimp,
+                      GimpContainer    *container,
+                      GimpConfigWriter *writer)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), FALSE);
+
+  gimp_config_writer_open (writer, "file-version");
+  gimp_config_writer_printf (writer, "%d", TOOL_RC_FILE_VERSION);
+  gimp_config_writer_close (writer);
+
+  gimp_config_writer_linefeed (writer);
+
+  return gimp_config_serialize (GIMP_CONFIG (container), writer, NULL);
+}
+
+gboolean
+gimp_tools_deserialize (Gimp          *gimp,
+                        GimpContainer *container,
+                        GScanner      *scanner)
+{
+  enum
+  {
+    FILE_VERSION = 1
+  };
+
+  GimpContainer *src_container;
+  GTokenType     token;
+  guint          scope_id;
+  guint          old_scope_id;
+  gint           file_version = 0;
+  gboolean       result       = FALSE;
+
+  scope_id     = g_type_qname (GIMP_TYPE_TOOL_GROUP);
+  old_scope_id = g_scanner_set_scope (scanner, scope_id);
+
+  g_scanner_scope_add_symbol (scanner, scope_id,
+                              "file-version",
+                              GINT_TO_POINTER (FILE_VERSION));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token &&
+         (token != G_TOKEN_LEFT_PAREN                 ||
+          ! file_version))
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+            case FILE_VERSION:
+              token = G_TOKEN_INT;
+              if (gimp_scanner_parse_int (scanner, &file_version))
+                token = G_TOKEN_RIGHT_PAREN;
+              break;
+            }
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  g_scanner_set_scope (scanner, old_scope_id);
+
+  if (token != G_TOKEN_LEFT_PAREN)
+    {
+      g_scanner_get_next_token (scanner);
+      g_scanner_unexp_token (scanner, token, NULL, NULL, NULL,
+                             _("fatal parse error"), TRUE);
+
+      return FALSE;
+    }
+  else if (file_version != TOOL_RC_FILE_VERSION)
+    {
+      g_scanner_error (scanner, "wrong toolrc file format version");
+
+      return FALSE;
+    }
+
+  gimp_container_freeze (container);
+
+  /* make sure the various GimpToolItem types are registered */
+  g_type_class_unref (g_type_class_ref (GIMP_TYPE_TOOL_GROUP));
+  g_type_class_unref (g_type_class_ref (GIMP_TYPE_TOOL_INFO));
+
+  gimp_container_clear (container);
+
+  src_container = g_object_new (GIMP_TYPE_LIST,
+                                "children-type", GIMP_TYPE_TOOL_ITEM,
+                                "append",        TRUE,
+                                NULL);
+
+  if (gimp_config_deserialize (GIMP_CONFIG (src_container),
+                               scanner, 0, NULL))
+    {
+      GHashTable *tools;
+      GList      *list;
+
+      result = TRUE;
+
+      tools = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+      gimp_tools_copy_structure (gimp, src_container, container, tools);
+
+      for (list = gimp_get_tool_info_iter (gimp);
+           list;
+           list = g_list_next (list))
+        {
+          GimpToolInfo *tool_info = list->data;
+
+          if (! tool_info->hidden && ! g_hash_table_contains (tools, tool_info))
+            {
+              if (tool_info->experimental)
+                {
+                  /* if an experimental tool is not in the file, just add it to
+                   * the tool-item list.
+                   */
+                  gimp_container_add (container, GIMP_OBJECT (tool_info));
+                }
+              else
+                {
+                  /* otherwise, it means we added a new stable tool.  this must
+                   * be the user toolrc file; rejct it, so that we fall back to
+                   * the default toolrc file, which should contain the missing
+                   * tool.
+                   */
+                  g_scanner_error (scanner, "missing tools in toolrc file");
+
+                  result = FALSE;
+
+                  break;
+                }
+            }
+        }
+
+      g_hash_table_unref (tools);
+    }
+
+  g_object_unref (src_container);
+
+  gimp_container_thaw (container);
+
+  return result;
+}
+
+void
+gimp_tools_reset (Gimp          *gimp,
+                  GimpContainer *container,
+                  gboolean       user_toolrc)
+{
+  GList *files = NULL;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_CONTAINER (container));
+
+  if (user_toolrc)
+    files = g_list_prepend (files, gimp_directory_file       ("toolrc", NULL));
+  files = g_list_prepend (files, gimp_sysconf_directory_file ("toolrc", NULL));
+
+  files = g_list_reverse (files);
+
+  gimp_container_freeze (container);
+
+  gimp_container_clear (container);
+
+  for (list = files; list; list = g_list_next (list))
+    {
+      GScanner *scanner;
+      GFile    *file  = list->data;
+      GError   *error = NULL;
+
+      if (gimp->be_verbose)
+        g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+      scanner = gimp_scanner_new_gfile (file, &error);
+
+      if (scanner && gimp_tools_deserialize (gimp, container, scanner))
+        {
+          gimp_scanner_destroy (scanner);
+
+          break;
+        }
+      else
+        {
+          if (error->code != G_IO_ERROR_NOT_FOUND)
+            {
+              gimp_message_literal (gimp, NULL,
+                                    GIMP_MESSAGE_WARNING, error->message);
+            }
+
+          g_clear_error (&error);
+
+          gimp_container_clear (container);
+        }
+
+      g_clear_pointer (&scanner, gimp_scanner_destroy);
+    }
+
+  g_list_free_full (files, g_object_unref);
+
+  if (gimp_container_is_empty (container))
+    {
+      if (gimp->be_verbose)
+        g_print ("Using default tool order\n");
+
+      gimp_tools_copy_structure (gimp, gimp->tool_info_list, container, NULL);
+    }
+
+  gimp_container_thaw (container);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tools_register (GType                   tool_type,
+                     GType                   tool_options_type,
+                     GimpToolOptionsGUIFunc  options_gui_func,
+                     GimpContextPropMask     context_props,
+                     const gchar            *identifier,
+                     const gchar            *label,
+                     const gchar            *tooltip,
+                     const gchar            *menu_label,
+                     const gchar            *menu_accel,
+                     const gchar            *help_domain,
+                     const gchar            *help_data,
+                     const gchar            *icon_name,
+                     gpointer                data)
+{
+  Gimp         *gimp = (Gimp *) data;
+  GimpToolInfo *tool_info;
+  const gchar  *paint_core_name;
+  gboolean      visible;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (g_type_is_a (tool_type, GIMP_TYPE_TOOL));
+  g_return_if_fail (tool_options_type == G_TYPE_NONE ||
+                    g_type_is_a (tool_options_type, GIMP_TYPE_TOOL_OPTIONS));
+
+  if (tool_options_type == G_TYPE_NONE)
+    tool_options_type = GIMP_TYPE_TOOL_OPTIONS;
+
+  if (tool_type == GIMP_TYPE_PENCIL_TOOL)
+    {
+      paint_core_name = "gimp-pencil";
+    }
+  else if (tool_type == GIMP_TYPE_PAINTBRUSH_TOOL)
+    {
+      paint_core_name = "gimp-paintbrush";
+    }
+  else if (tool_type == GIMP_TYPE_ERASER_TOOL)
+    {
+      paint_core_name = "gimp-eraser";
+    }
+  else if (tool_type == GIMP_TYPE_AIRBRUSH_TOOL)
+    {
+      paint_core_name = "gimp-airbrush";
+    }
+  else if (tool_type == GIMP_TYPE_CLONE_TOOL)
+    {
+      paint_core_name = "gimp-clone";
+    }
+  else if (tool_type == GIMP_TYPE_HEAL_TOOL)
+    {
+      paint_core_name = "gimp-heal";
+    }
+  else if (tool_type == GIMP_TYPE_PERSPECTIVE_CLONE_TOOL)
+    {
+      paint_core_name = "gimp-perspective-clone";
+    }
+  else if (tool_type == GIMP_TYPE_CONVOLVE_TOOL)
+    {
+      paint_core_name = "gimp-convolve";
+    }
+  else if (tool_type == GIMP_TYPE_SMUDGE_TOOL)
+    {
+      paint_core_name = "gimp-smudge";
+    }
+  else if (tool_type == GIMP_TYPE_DODGE_BURN_TOOL)
+    {
+      paint_core_name = "gimp-dodge-burn";
+    }
+  else if (tool_type == GIMP_TYPE_INK_TOOL)
+    {
+      paint_core_name = "gimp-ink";
+    }
+  else if (tool_type == GIMP_TYPE_MYBRUSH_TOOL)
+    {
+      paint_core_name = "gimp-mybrush";
+    }
+  else
+    {
+      paint_core_name = "gimp-paintbrush";
+    }
+
+  tool_info = gimp_tool_info_new (gimp,
+                                  tool_type,
+                                  tool_options_type,
+                                  context_props,
+                                  identifier,
+                                  label,
+                                  tooltip,
+                                  menu_label,
+                                  menu_accel,
+                                  help_domain,
+                                  help_data,
+                                  paint_core_name,
+                                  icon_name);
+
+  visible = (! g_type_is_a (tool_type, GIMP_TYPE_FILTER_TOOL));
+
+  gimp_tool_item_set_visible (GIMP_TOOL_ITEM (tool_info), visible);
+
+  /* hack to hide the operation tool entirely */
+  if (tool_type == GIMP_TYPE_OPERATION_TOOL)
+    tool_info->hidden = TRUE;
+
+  /* hack to not require experimental tools to be present in toolrc */
+  if (tool_type == GIMP_TYPE_N_POINT_DEFORMATION_TOOL ||
+      tool_type == GIMP_TYPE_SEAMLESS_CLONE_TOOL)
+    {
+      tool_info->experimental = TRUE;
+    }
+
+  g_object_set_data (G_OBJECT (tool_info), "gimp-tool-options-gui-func",
+                     options_gui_func);
+
+  gimp_container_add (gimp->tool_info_list, GIMP_OBJECT (tool_info));
+  g_object_unref (tool_info);
+
+  if (tool_type == GIMP_TYPE_PAINTBRUSH_TOOL)
+    gimp_tool_info_set_standard (gimp, tool_info);
+}
+
+static void
+gimp_tools_copy_structure (Gimp          *gimp,
+                           GimpContainer *src_container,
+                           GimpContainer *dest_container,
+                           GHashTable    *tools)
+{
+  GList *list;
+
+  for (list = GIMP_LIST (src_container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolItem *src_tool_item  = list->data;
+      GimpToolItem *dest_tool_item = NULL;
+
+      if (GIMP_IS_TOOL_GROUP (src_tool_item))
+        {
+          dest_tool_item = GIMP_TOOL_ITEM (gimp_tool_group_new ());
+
+          gimp_tools_copy_structure (
+            gimp,
+            gimp_viewable_get_children (GIMP_VIEWABLE (src_tool_item)),
+            gimp_viewable_get_children (GIMP_VIEWABLE (dest_tool_item)),
+            tools);
+
+          gimp_tool_group_set_active_tool (
+            GIMP_TOOL_GROUP (dest_tool_item),
+            gimp_tool_group_get_active_tool (GIMP_TOOL_GROUP (src_tool_item)));
+        }
+      else
+        {
+          dest_tool_item = GIMP_TOOL_ITEM (
+            gimp_get_tool_info (gimp, gimp_object_get_name (src_tool_item)));
+
+          if (dest_tool_item)
+            {
+              if (! GIMP_TOOL_INFO (dest_tool_item)->hidden)
+                {
+                  g_object_ref (dest_tool_item);
+
+                  if (tools)
+                    g_hash_table_add (tools, dest_tool_item);
+                }
+              else
+                {
+                  dest_tool_item = NULL;
+                }
+            }
+        }
+
+      if (dest_tool_item)
+        {
+          gimp_tool_item_set_visible (
+            dest_tool_item,
+            gimp_tool_item_get_visible (src_tool_item));
+
+          gimp_container_add (dest_container,
+                              GIMP_OBJECT (dest_tool_item));
+
+          g_object_unref (dest_tool_item);
+        }
+    }
+}
diff --git a/app/tools/gimp-tools.h b/app/tools/gimp-tools.h
new file mode 100644
index 0000000..5be61c3
--- /dev/null
+++ b/app/tools/gimp-tools.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLS_H__
+#define __GIMP_TOOLS_H__
+
+
+void       gimp_tools_init        (Gimp              *gimp);
+void       gimp_tools_exit        (Gimp              *gimp);
+
+void       gimp_tools_restore     (Gimp              *gimp);
+void       gimp_tools_save        (Gimp              *gimp,
+                                   gboolean           save_tool_options,
+                                   gboolean           always_save);
+
+gboolean   gimp_tools_clear       (Gimp              *gimp,
+                                   GError           **error);
+
+gboolean   gimp_tools_serialize   (Gimp              *gimp,
+                                   GimpContainer     *container,
+                                   GimpConfigWriter  *writer);
+gboolean   gimp_tools_deserialize (Gimp              *gimp,
+                                   GimpContainer     *container,
+                                   GScanner          *scanner);
+
+void       gimp_tools_reset       (Gimp              *gimp,
+                                   GimpContainer     *container,
+                                   gboolean           user_toolrc);
+
+
+#endif  /* __GIMP_TOOLS_H__ */
diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c
new file mode 100644
index 0000000..111c897
--- /dev/null
+++ b/app/tools/gimpairbrushtool.c
@@ -0,0 +1,150 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpairbrush.h"
+#include "paint/gimpairbrushoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+
+#include "gimpairbrushtool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimppainttool-paint.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void        gimp_airbrush_tool_constructed    (GObject          *object);
+
+static void        gimp_airbrush_tool_airbrush_stamp (GimpAirbrush     *airbrush,
+                                                      GimpAirbrushTool *airbrush_tool);
+
+static void        gimp_airbrush_tool_stamp          (GimpAirbrushTool *airbrush_tool,
+                                                      gpointer          data);
+
+static GtkWidget * gimp_airbrush_options_gui         (GimpToolOptions  *tool_options);
+
+
+G_DEFINE_TYPE (GimpAirbrushTool, gimp_airbrush_tool, GIMP_TYPE_PAINTBRUSH_TOOL)
+
+#define parent_class gimp_airbrush_tool_parent_class
+
+
+void
+gimp_airbrush_tool_register (GimpToolRegisterCallback  callback,
+                             gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_AIRBRUSH_TOOL,
+                GIMP_TYPE_AIRBRUSH_OPTIONS,
+                gimp_airbrush_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_GRADIENT,
+                "gimp-airbrush-tool",
+                _("Airbrush"),
+                _("Airbrush Tool: Paint using a brush, with variable pressure"),
+                N_("_Airbrush"), "A",
+                NULL, GIMP_HELP_TOOL_AIRBRUSH,
+                GIMP_ICON_TOOL_AIRBRUSH,
+                data);
+}
+
+static void
+gimp_airbrush_tool_class_init (GimpAirbrushToolClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = gimp_airbrush_tool_constructed;
+}
+
+static void
+gimp_airbrush_tool_init (GimpAirbrushTool *airbrush)
+{
+  GimpTool *tool = GIMP_TOOL (airbrush);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_AIRBRUSH);
+}
+
+static void
+gimp_airbrush_tool_constructed (GObject *object)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_signal_connect_object (paint_tool->core, "stamp",
+                           G_CALLBACK (gimp_airbrush_tool_airbrush_stamp),
+                           object, 0);
+}
+
+static void
+gimp_airbrush_tool_airbrush_stamp (GimpAirbrush     *airbrush,
+                                   GimpAirbrushTool *airbrush_tool)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (airbrush_tool);
+
+  gimp_paint_tool_paint_push (
+    paint_tool,
+    (GimpPaintToolPaintFunc) gimp_airbrush_tool_stamp,
+    NULL);
+}
+
+static void
+gimp_airbrush_tool_stamp (GimpAirbrushTool *airbrush_tool,
+                          gpointer          data)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (airbrush_tool);
+
+  gimp_airbrush_stamp (GIMP_AIRBRUSH (paint_tool->core));
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_airbrush_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget *button;
+  GtkWidget *scale;
+
+  button = gimp_prop_check_button_new (config, "motion-only", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  scale = gimp_prop_spin_scale_new (config, "rate", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, "flow", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return vbox;
+}
diff --git a/app/tools/gimpairbrushtool.h b/app/tools/gimpairbrushtool.h
new file mode 100644
index 0000000..a23321b
--- /dev/null
+++ b/app/tools/gimpairbrushtool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_AIRBRUSH_TOOL_H__
+#define __GIMP_AIRBRUSH_TOOL_H__
+
+
+#include "gimppaintbrushtool.h"
+
+
+#define GIMP_TYPE_AIRBRUSH_TOOL            (gimp_airbrush_tool_get_type ())
+#define GIMP_AIRBRUSH_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_AIRBRUSH_TOOL, GimpAirbrushTool))
+#define GIMP_AIRBRUSH_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_AIRBRUSH_TOOL, GimpAirbrushToolClass))
+#define GIMP_IS_AIRBRUSH_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_AIRBRUSH_TOOL))
+#define GIMP_IS_AIRBRUSH_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_AIRBRUSH_TOOL))
+#define GIMP_AIRBRUSH_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH_TOOL, GimpAirbrushToolClass))
+
+
+typedef struct _GimpAirbrushTool      GimpAirbrushTool;
+typedef struct _GimpAirbrushToolClass GimpAirbrushToolClass;
+
+struct _GimpAirbrushTool
+{
+  GimpPaintbrushTool parent_instance;
+};
+
+struct _GimpAirbrushToolClass
+{
+  GimpPaintbrushToolClass parent_class;
+};
+
+
+void       gimp_airbrush_tool_register (GimpToolRegisterCallback  callback,
+                                        gpointer                  data);
+
+GType      gimp_airbrush_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_AIRBRUSH_TOOL_H__  */
diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
new file mode 100644
index 0000000..2564a2a
--- /dev/null
+++ b/app/tools/gimpalignoptions.c
@@ -0,0 +1,403 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpalignoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  ALIGN_BUTTON_CLICKED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_ALIGN_REFERENCE,
+  PROP_OFFSET_X,
+  PROP_OFFSET_Y
+};
+
+
+static void   gimp_align_options_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void   gimp_align_options_get_property (GObject      *object,
+                                               guint         property_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpAlignOptions, gimp_align_options, GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_selection_options_parent_class
+
+static guint align_options_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_align_options_class_init (GimpAlignOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property  = gimp_align_options_set_property;
+  object_class->get_property  = gimp_align_options_get_property;
+
+  klass->align_button_clicked = NULL;
+
+  align_options_signals[ALIGN_BUTTON_CLICKED] =
+    g_signal_new ("align-button-clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpAlignOptionsClass,
+                                   align_button_clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_ALIGNMENT_TYPE);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ALIGN_REFERENCE,
+                         "align-reference",
+                         _("Relative to"),
+                         _("Reference image object a layer will be aligned on"),
+                         GIMP_TYPE_ALIGN_REFERENCE_TYPE,
+                         GIMP_ALIGN_REFERENCE_FIRST,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OFFSET_X,
+                           "offset-x",
+                           _("Offset"),
+                           _("Horizontal offset for distribution"),
+                           -GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OFFSET_Y,
+                           "offset-y",
+                           _("Offset"),
+                           _("Vertical offset for distribution"),
+                           -GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 0,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_align_options_init (GimpAlignOptions *options)
+{
+}
+
+static void
+gimp_align_options_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpAlignOptions *options = GIMP_ALIGN_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ALIGN_REFERENCE:
+      options->align_reference = g_value_get_enum (value);
+      break;
+
+    case PROP_OFFSET_X:
+      options->offset_x = g_value_get_double (value);
+      break;
+
+    case PROP_OFFSET_Y:
+      options->offset_y = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_align_options_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpAlignOptions *options = GIMP_ALIGN_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ALIGN_REFERENCE:
+      g_value_set_enum (value, options->align_reference);
+      break;
+
+    case PROP_OFFSET_X:
+      g_value_set_double (value, options->offset_x);
+      break;
+
+    case PROP_OFFSET_Y:
+      g_value_set_double (value, options->offset_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_align_options_button_clicked (GtkButton        *button,
+                                   GimpAlignOptions *options)
+{
+  GimpAlignmentType action;
+
+  action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+                                               "align-action"));
+
+  g_signal_emit (options, align_options_signals[ALIGN_BUTTON_CLICKED], 0,
+                 action);
+}
+
+static GtkWidget *
+gimp_align_options_button_new (GimpAlignOptions  *options,
+                               GimpAlignmentType  action,
+                               GtkWidget         *parent,
+                               const gchar       *tooltip)
+{
+  GtkWidget   *button;
+  GtkWidget   *image;
+  const gchar *icon_name = NULL;
+
+  switch (action)
+    {
+    case GIMP_ALIGN_LEFT:
+      icon_name = GIMP_ICON_GRAVITY_WEST;
+      break;
+    case GIMP_ALIGN_HCENTER:
+      icon_name = GIMP_ICON_CENTER_HORIZONTAL;
+      break;
+    case GIMP_ALIGN_RIGHT:
+      icon_name = GIMP_ICON_GRAVITY_EAST;
+      break;
+    case GIMP_ALIGN_TOP:
+      icon_name = GIMP_ICON_GRAVITY_NORTH;
+      break;
+    case GIMP_ALIGN_VCENTER:
+      icon_name = GIMP_ICON_CENTER_VERTICAL;
+      break;
+    case GIMP_ALIGN_BOTTOM:
+      icon_name = GIMP_ICON_GRAVITY_SOUTH;
+      break;
+    case GIMP_ARRANGE_LEFT:
+      icon_name = GIMP_ICON_GRAVITY_WEST;
+      break;
+    case GIMP_ARRANGE_HCENTER:
+      icon_name = GIMP_ICON_CENTER_HORIZONTAL;
+      break;
+    case GIMP_ARRANGE_RIGHT:
+      icon_name = GIMP_ICON_GRAVITY_EAST;
+      break;
+    case GIMP_ARRANGE_TOP:
+      icon_name = GIMP_ICON_GRAVITY_NORTH;
+      break;
+    case GIMP_ARRANGE_VCENTER:
+      icon_name = GIMP_ICON_CENTER_VERTICAL;
+      break;
+    case GIMP_ARRANGE_BOTTOM:
+      icon_name = GIMP_ICON_GRAVITY_SOUTH;
+      break;
+    case GIMP_ARRANGE_HFILL:
+        icon_name = GIMP_ICON_FILL_HORIZONTAL;
+        break;
+    case GIMP_ARRANGE_VFILL:
+        icon_name = GIMP_ICON_FILL_VERTICAL;
+        break;
+    default:
+      g_return_val_if_reached (NULL);
+      break;
+    }
+
+  button = gtk_button_new ();
+  gtk_widget_set_sensitive (button, FALSE);
+  gtk_widget_show (button);
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  gtk_box_pack_start (GTK_BOX (parent), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  gimp_help_set_help_data (button, tooltip, NULL);
+
+  g_object_set_data (G_OBJECT (button), "align-action",
+                     GINT_TO_POINTER (action));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_align_options_button_clicked),
+                    options);
+
+  return button;
+}
+
+GtkWidget *
+gimp_align_options_gui (GimpToolOptions *tool_options)
+{
+  GObject          *config  = G_OBJECT (tool_options);
+  GimpAlignOptions *options = GIMP_ALIGN_OPTIONS (tool_options);
+  GtkWidget        *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget        *align_vbox;
+  GtkWidget        *hbox;
+  GtkWidget        *frame;
+  GtkWidget        *label;
+  GtkWidget        *spinbutton;
+  GtkWidget        *combo;
+  gint              n = 0;
+
+  frame = gimp_frame_new (_("Align"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  align_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), align_vbox);
+  gtk_widget_show (align_vbox);
+
+  combo = gimp_prop_enum_combo_box_new (config, "align-reference", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Relative to"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (align_vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ALIGN_LEFT, hbox,
+                                   _("Align left edge of target"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ALIGN_HCENTER, hbox,
+                                   _("Align center of target"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ALIGN_RIGHT, hbox,
+                                   _("Align right edge of target"));
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ALIGN_TOP, hbox,
+                                   _("Align top edge of target"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ALIGN_VCENTER, hbox,
+                                   _("Align middle of target"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ALIGN_BOTTOM, hbox,
+                                   _("Align bottom of target"));
+
+  frame = gimp_frame_new (_("Distribute"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  align_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), align_vbox);
+  gtk_widget_show (align_vbox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_LEFT, hbox,
+                                   _("Distribute left edges of targets"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_HCENTER, hbox,
+                                   _("Distribute horizontal centers of targets"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_RIGHT, hbox,
+                                   _("Distribute right edges of targets"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_HFILL, hbox,
+                                   _("Distribute targets evenly in the horizontal"));
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_TOP, hbox,
+                                   _("Distribute top edges of targets"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_VCENTER, hbox,
+                                   _("Distribute vertical centers of targets"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_BOTTOM, hbox,
+                                   _("Distribute bottoms of targets"));
+
+  options->button[n++] =
+    gimp_align_options_button_new (options, GIMP_ARRANGE_VFILL, hbox,
+                                   _("Distribute targets evenly in the vertical"));
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Offset X:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  spinbutton = gimp_prop_spin_button_new (config, "offset-x",
+                                          1, 20, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Offset Y:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  spinbutton = gimp_prop_spin_button_new (config, "offset-y",
+                                          1, 20, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  return vbox;
+}
diff --git a/app/tools/gimpalignoptions.h b/app/tools/gimpalignoptions.h
new file mode 100644
index 0000000..5d4fe04
--- /dev/null
+++ b/app/tools/gimpalignoptions.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ALIGN_OPTIONS_H__
+#define __GIMP_ALIGN_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define ALIGN_OPTIONS_N_BUTTONS 14
+
+
+#define GIMP_TYPE_ALIGN_OPTIONS            (gimp_align_options_get_type ())
+#define GIMP_ALIGN_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ALIGN_OPTIONS, GimpAlignOptions))
+#define GIMP_ALIGN_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ALIGN_OPTIONS, GimpAlignOptionsClass))
+#define GIMP_IS_ALIGN_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ALIGN_OPTIONS))
+#define GIMP_IS_ALIGN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ALIGN_OPTIONS))
+#define GIMP_ALIGN_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ALIGN_OPTIONS, GimpAlignOptionsClass))
+
+
+typedef struct _GimpAlignOptions      GimpAlignOptions;
+typedef struct _GimpAlignOptionsClass GimpAlignOptionsClass;
+
+struct _GimpAlignOptions
+{
+  GimpToolOptions         parent_instance;
+
+  GimpAlignReferenceType  align_reference;
+  gdouble                 offset_x;
+  gdouble                 offset_y;
+
+  GtkWidget              *button[ALIGN_OPTIONS_N_BUTTONS];
+};
+
+struct _GimpAlignOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+
+  void (* align_button_clicked) (GimpAlignOptions  *options,
+                                 GimpAlignmentType  align_type);
+};
+
+
+GType       gimp_align_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_align_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_ALIGN_OPTIONS_H__ */
diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c
new file mode 100644
index 0000000..4698993
--- /dev/null
+++ b/app/tools/gimpaligntool.c
@@ -0,0 +1,824 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-arrange.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+
+#include "gimpalignoptions.h"
+#include "gimpaligntool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON  3   /* move distance after which we do a box-select */
+
+
+/*  local function prototypes  */
+
+static void     gimp_align_tool_constructed    (GObject               *object);
+
+static void     gimp_align_tool_control        (GimpTool              *tool,
+                                                GimpToolAction         action,
+                                                GimpDisplay           *display);
+static void     gimp_align_tool_button_press   (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonPressType    press_type,
+                                                GimpDisplay           *display);
+static void     gimp_align_tool_button_release (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonReleaseType  release_type,
+                                                GimpDisplay           *display);
+static void     gimp_align_tool_motion         (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpDisplay           *display);
+static gboolean gimp_align_tool_key_press      (GimpTool              *tool,
+                                                GdkEventKey           *kevent,
+                                                GimpDisplay           *display);
+static void     gimp_align_tool_oper_update    (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                gboolean               proximity,
+                                                GimpDisplay           *display);
+static void     gimp_align_tool_status_update  (GimpTool              *tool,
+                                                GimpDisplay           *display,
+                                                GdkModifierType        state,
+                                                gboolean               proximity);
+static void     gimp_align_tool_cursor_update  (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                GimpDisplay           *display);
+
+static void     gimp_align_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void     gimp_align_tool_align          (GimpAlignTool         *align_tool,
+                                                GimpAlignmentType      align_type);
+
+static void     gimp_align_tool_object_removed (GObject               *object,
+                                                GimpAlignTool         *align_tool);
+static void     gimp_align_tool_clear_selected (GimpAlignTool         *align_tool);
+
+
+G_DEFINE_TYPE (GimpAlignTool, gimp_align_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_align_tool_parent_class
+
+
+void
+gimp_align_tool_register (GimpToolRegisterCallback  callback,
+                          gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_ALIGN_TOOL,
+                GIMP_TYPE_ALIGN_OPTIONS,
+                gimp_align_options_gui,
+                0,
+                "gimp-align-tool",
+                _("Alignment"),
+                _("Alignment Tool: Align or arrange layers and other objects"),
+                N_("_Align"), "Q",
+                NULL, GIMP_HELP_TOOL_ALIGN,
+                GIMP_ICON_TOOL_ALIGN,
+                data);
+}
+
+static void
+gimp_align_tool_class_init (GimpAlignToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->constructed  = gimp_align_tool_constructed;
+
+  tool_class->control        = gimp_align_tool_control;
+  tool_class->button_press   = gimp_align_tool_button_press;
+  tool_class->button_release = gimp_align_tool_button_release;
+  tool_class->motion         = gimp_align_tool_motion;
+  tool_class->key_press      = gimp_align_tool_key_press;
+  tool_class->oper_update    = gimp_align_tool_oper_update;
+  tool_class->cursor_update  = gimp_align_tool_cursor_update;
+
+  draw_tool_class->draw      = gimp_align_tool_draw;
+}
+
+static void
+gimp_align_tool_init (GimpAlignTool *align_tool)
+{
+  GimpTool *tool = GIMP_TOOL (align_tool);
+
+  gimp_tool_control_set_snap_to     (tool->control, FALSE);
+  gimp_tool_control_set_precision   (tool->control,
+                                     GIMP_CURSOR_PRECISION_PIXEL_BORDER);
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_MOVE);
+
+  align_tool->function = ALIGN_TOOL_IDLE;
+}
+
+static void
+gimp_align_tool_constructed (GObject *object)
+{
+  GimpAlignTool    *align_tool = GIMP_ALIGN_TOOL (object);
+  GimpAlignOptions *options;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  options = GIMP_ALIGN_TOOL_GET_OPTIONS (align_tool);
+
+  g_signal_connect_object (options, "align-button-clicked",
+                           G_CALLBACK (gimp_align_tool_align),
+                           align_tool, G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_align_tool_control (GimpTool       *tool,
+                         GimpToolAction  action,
+                         GimpDisplay    *display)
+{
+  GimpAlignTool *align_tool = GIMP_ALIGN_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_align_tool_clear_selected (align_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_align_tool_button_press (GimpTool            *tool,
+                              const GimpCoords    *coords,
+                              guint32              time,
+                              GdkModifierType      state,
+                              GimpButtonPressType  press_type,
+                              GimpDisplay         *display)
+{
+  GimpAlignTool *align_tool  = GIMP_ALIGN_TOOL (tool);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  /*  If the tool was being used in another image... reset it  */
+  if (display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+  tool->display = display;
+
+  gimp_tool_control_activate (tool->control);
+
+  align_tool->x2 = align_tool->x1 = coords->x;
+  align_tool->y2 = align_tool->y1 = coords->y;
+
+  if (! gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+/* some rather complex logic here.  If the user clicks without modifiers,
+ * then we start a new list, and use the first object in it as reference.
+ * If the user clicks using Shift, or draws a rubber-band box, then
+ * we add objects to the list, but do not specify which one should
+ * be used as reference.
+ */
+static void
+gimp_align_tool_button_release (GimpTool              *tool,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonReleaseType  release_type,
+                                GimpDisplay           *display)
+{
+  GimpAlignTool    *align_tool = GIMP_ALIGN_TOOL (tool);
+  GimpAlignOptions *options    = GIMP_ALIGN_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell *shell      = gimp_display_get_shell (display);
+  GObject          *object     = NULL;
+  GimpImage        *image      = gimp_display_get_image (display);
+  GdkModifierType   extend_mask;
+  gint              i;
+
+  extend_mask = gimp_get_extend_selection_mask ();
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  gimp_tool_control_halt (tool->control);
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      align_tool->x2 = align_tool->x1;
+      align_tool->y2 = align_tool->y1;
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+      return;
+    }
+
+  if (! (state & extend_mask)) /* start a new list */
+    {
+      gimp_align_tool_clear_selected (align_tool);
+      align_tool->set_reference = FALSE;
+    }
+
+  /* if mouse has moved less than EPSILON pixels since button press,
+   * select the nearest thing, otherwise make a rubber-band rectangle
+   */
+  if (hypot (coords->x - align_tool->x1,
+             coords->y - align_tool->y1) < EPSILON)
+    {
+      GimpVectors *vectors;
+      GimpGuide   *guide;
+      GimpLayer   *layer;
+      gint         snap_distance = display->config->snap_distance;
+
+      if ((vectors = gimp_image_pick_vectors (image,
+                                              coords->x, coords->y,
+                                              FUNSCALEX (shell, snap_distance),
+                                              FUNSCALEY (shell, snap_distance))))
+        {
+          object = G_OBJECT (vectors);
+        }
+      else if (gimp_display_shell_get_show_guides (shell) &&
+               (guide = gimp_image_pick_guide (image,
+                                               coords->x, coords->y,
+                                               FUNSCALEX (shell, snap_distance),
+                                               FUNSCALEY (shell, snap_distance))))
+        {
+          object = G_OBJECT (guide);
+        }
+      else if ((layer = gimp_image_pick_layer_by_bounds (image,
+                                                         coords->x, coords->y)))
+        {
+          object = G_OBJECT (layer);
+        }
+
+      if (object)
+        {
+          if (! g_list_find (align_tool->selected_objects, object))
+            {
+              align_tool->selected_objects =
+                g_list_append (align_tool->selected_objects, object);
+
+              g_signal_connect (object, "removed",
+                                G_CALLBACK (gimp_align_tool_object_removed),
+                                align_tool);
+
+              /* if an object has been selected using unmodified click,
+               * it should be used as the reference
+               */
+              if (! (state & extend_mask))
+                align_tool->set_reference = TRUE;
+            }
+        }
+    }
+  else  /* FIXME: look for vectors too */
+    {
+      gint   X0 = MIN (coords->x, align_tool->x1);
+      gint   X1 = MAX (coords->x, align_tool->x1);
+      gint   Y0 = MIN (coords->y, align_tool->y1);
+      gint   Y1 = MAX (coords->y, align_tool->y1);
+      GList *all_layers;
+      GList *list;
+
+      all_layers = gimp_image_get_layer_list (image);
+
+      for (list = all_layers; list; list = g_list_next (list))
+        {
+          GimpLayer *layer = list->data;
+          gint       x0, y0, x1, y1;
+
+          if (! gimp_item_get_visible (GIMP_ITEM (layer)))
+            continue;
+
+          gimp_item_get_offset (GIMP_ITEM (layer), &x0, &y0);
+          x1 = x0 + gimp_item_get_width  (GIMP_ITEM (layer));
+          y1 = y0 + gimp_item_get_height (GIMP_ITEM (layer));
+
+          if (x0 < X0 || y0 < Y0 || x1 > X1 || y1 > Y1)
+            continue;
+
+          if (g_list_find (align_tool->selected_objects, layer))
+            continue;
+
+          align_tool->selected_objects =
+            g_list_append (align_tool->selected_objects, layer);
+
+          g_signal_connect (layer, "removed",
+                            G_CALLBACK (gimp_align_tool_object_removed),
+                            align_tool);
+        }
+
+      g_list_free (all_layers);
+    }
+
+  for (i = 0; i < ALIGN_OPTIONS_N_BUTTONS; i++)
+    {
+      if (options->button[i])
+        gtk_widget_set_sensitive (options->button[i],
+                                  align_tool->selected_objects != NULL);
+    }
+
+  align_tool->x2 = align_tool->x1;
+  align_tool->y2 = align_tool->y1;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_align_tool_motion (GimpTool         *tool,
+                        const GimpCoords *coords,
+                        guint32           time,
+                        GdkModifierType   state,
+                        GimpDisplay      *display)
+{
+  GimpAlignTool *align_tool = GIMP_ALIGN_TOOL (tool);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  align_tool->x2 = coords->x;
+  align_tool->y2 = coords->y;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static gboolean
+gimp_align_tool_key_press (GimpTool    *tool,
+                           GdkEventKey *kevent,
+                           GimpDisplay *display)
+{
+  if (display == tool->display)
+    {
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Escape:
+          gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+          return TRUE;
+
+        default:
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_align_tool_oper_update (GimpTool         *tool,
+                             const GimpCoords *coords,
+                             GdkModifierType   state,
+                             gboolean          proximity,
+                             GimpDisplay      *display)
+{
+  GimpAlignTool    *align_tool    = GIMP_ALIGN_TOOL (tool);
+  GimpDisplayShell *shell         = gimp_display_get_shell (display);
+  GimpImage        *image         = gimp_display_get_image (display);
+  gint              snap_distance = display->config->snap_distance;
+  gboolean          add;
+
+  add = ((state & gimp_get_extend_selection_mask ()) &&
+         align_tool->selected_objects);
+
+  if (gimp_image_pick_vectors (image,
+                               coords->x, coords->y,
+                               FUNSCALEX (shell, snap_distance),
+                               FUNSCALEY (shell, snap_distance)))
+    {
+      if (add)
+        align_tool->function = ALIGN_TOOL_ADD_PATH;
+      else
+        align_tool->function = ALIGN_TOOL_PICK_PATH;
+    }
+  else if (gimp_display_shell_get_show_guides (shell) &&
+           gimp_image_pick_guide (image,
+                                  coords->x, coords->y,
+                                  FUNSCALEX (shell, snap_distance),
+                                  FUNSCALEY (shell, snap_distance)))
+    {
+      if (add)
+        align_tool->function = ALIGN_TOOL_ADD_GUIDE;
+      else
+        align_tool->function = ALIGN_TOOL_PICK_GUIDE;
+    }
+  else if (gimp_image_pick_layer_by_bounds (image, coords->x, coords->y))
+    {
+      if (add)
+        align_tool->function = ALIGN_TOOL_ADD_LAYER;
+      else
+        align_tool->function = ALIGN_TOOL_PICK_LAYER;
+    }
+  else
+    {
+      align_tool->function = ALIGN_TOOL_IDLE;
+    }
+
+  gimp_align_tool_status_update (tool, display, state, proximity);
+}
+
+static void
+gimp_align_tool_cursor_update (GimpTool         *tool,
+                               const GimpCoords *coords,
+                               GdkModifierType   state,
+                               GimpDisplay      *display)
+{
+  GimpAlignTool      *align_tool  = GIMP_ALIGN_TOOL (tool);
+  GimpToolCursorType  tool_cursor = GIMP_TOOL_CURSOR_NONE;
+  GimpCursorModifier  modifier    = GIMP_CURSOR_MODIFIER_NONE;
+
+  /* always add '+' when Shift is pressed, even if nothing is selected */
+  if (state & gimp_get_extend_selection_mask ())
+    modifier = GIMP_CURSOR_MODIFIER_PLUS;
+
+  switch (align_tool->function)
+    {
+    case ALIGN_TOOL_IDLE:
+      tool_cursor = GIMP_TOOL_CURSOR_RECT_SELECT;
+      break;
+
+    case ALIGN_TOOL_PICK_LAYER:
+    case ALIGN_TOOL_ADD_LAYER:
+      tool_cursor = GIMP_TOOL_CURSOR_HAND;
+      break;
+
+    case ALIGN_TOOL_PICK_GUIDE:
+    case ALIGN_TOOL_ADD_GUIDE:
+      tool_cursor = GIMP_TOOL_CURSOR_MOVE;
+      break;
+
+    case ALIGN_TOOL_PICK_PATH:
+    case ALIGN_TOOL_ADD_PATH:
+      tool_cursor = GIMP_TOOL_CURSOR_PATHS;
+      break;
+
+    case ALIGN_TOOL_DRAG_BOX:
+      break;
+    }
+
+  gimp_tool_control_set_cursor          (tool->control, GIMP_CURSOR_MOUSE);
+  gimp_tool_control_set_tool_cursor     (tool->control, tool_cursor);
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_align_tool_status_update (GimpTool        *tool,
+                               GimpDisplay     *display,
+                               GdkModifierType  state,
+                               gboolean         proximity)
+{
+  GimpAlignTool   *align_tool = GIMP_ALIGN_TOOL (tool);
+  GdkModifierType  extend_mask;
+
+  extend_mask = gimp_get_extend_selection_mask ();
+
+  gimp_tool_pop_status (tool, display);
+
+  if (proximity)
+    {
+      gchar *status = NULL;
+
+      if (! align_tool->selected_objects)
+        {
+          /* no need to suggest Shift if nothing is selected */
+          state |= extend_mask;
+        }
+
+      switch (align_tool->function)
+        {
+        case ALIGN_TOOL_IDLE:
+          status = gimp_suggest_modifiers (_("Click on a layer, path or guide, "
+                                             "or Click-Drag to pick several "
+                                             "layers"),
+                                           extend_mask & ~state,
+                                           NULL, NULL, NULL);
+          break;
+
+        case ALIGN_TOOL_PICK_LAYER:
+          status = gimp_suggest_modifiers (_("Click to pick this layer as "
+                                             "first item"),
+                                           extend_mask & ~state,
+                                           NULL, NULL, NULL);
+          break;
+
+        case ALIGN_TOOL_ADD_LAYER:
+          status = g_strdup (_("Click to add this layer to the list"));
+          break;
+
+        case ALIGN_TOOL_PICK_GUIDE:
+          status = gimp_suggest_modifiers (_("Click to pick this guide as "
+                                             "first item"),
+                                           extend_mask & ~state,
+                                           NULL, NULL, NULL);
+          break;
+
+        case ALIGN_TOOL_ADD_GUIDE:
+          status = g_strdup (_("Click to add this guide to the list"));
+          break;
+
+        case ALIGN_TOOL_PICK_PATH:
+          status = gimp_suggest_modifiers (_("Click to pick this path as "
+                                             "first item"),
+                                           extend_mask & ~state,
+                                           NULL, NULL, NULL);
+          break;
+
+        case ALIGN_TOOL_ADD_PATH:
+          status = g_strdup (_("Click to add this path to the list"));
+          break;
+
+        case ALIGN_TOOL_DRAG_BOX:
+          break;
+        }
+
+      if (status)
+        {
+          gimp_tool_push_status (tool, display, "%s", status);
+          g_free (status);
+        }
+    }
+}
+
+static void
+gimp_align_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpAlignTool *align_tool = GIMP_ALIGN_TOOL (draw_tool);
+  GList         *list;
+  gint           x, y, w, h;
+
+  /* draw rubber-band rectangle */
+  x = MIN (align_tool->x2, align_tool->x1);
+  y = MIN (align_tool->y2, align_tool->y1);
+  w = MAX (align_tool->x2, align_tool->x1) - x;
+  h = MAX (align_tool->y2, align_tool->y1) - y;
+
+  gimp_draw_tool_add_rectangle (draw_tool, FALSE, x, y, w, h);
+
+  for (list = align_tool->selected_objects;
+       list;
+       list = g_list_next (list))
+    {
+      if (GIMP_IS_ITEM (list->data))
+        {
+          GimpItem *item = list->data;
+          gint      off_x, off_y;
+
+          gimp_item_bounds (item, &x, &y, &w, &h);
+
+          gimp_item_get_offset (item, &off_x, &off_y);
+          x += off_x;
+          y += off_y;
+
+          gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                     x, y,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_HANDLE_ANCHOR_NORTH_WEST);
+          gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                     x + w, y,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_HANDLE_ANCHOR_NORTH_EAST);
+          gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                     x, y + h,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_HANDLE_ANCHOR_SOUTH_WEST);
+          gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                     x + w, y + h,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                     GIMP_HANDLE_ANCHOR_SOUTH_EAST);
+        }
+      else if (GIMP_IS_GUIDE (list->data))
+        {
+          GimpGuide *guide = list->data;
+          GimpImage *image = gimp_display_get_image (GIMP_TOOL (draw_tool)->display);
+          gint       x, y;
+          gint       w, h;
+
+          switch (gimp_guide_get_orientation (guide))
+            {
+            case GIMP_ORIENTATION_VERTICAL:
+              x = gimp_guide_get_position (guide);
+              h = gimp_image_get_height (image);
+              gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                         x, h,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_HANDLE_ANCHOR_SOUTH);
+              gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                         x, 0,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_HANDLE_ANCHOR_NORTH);
+              break;
+
+            case GIMP_ORIENTATION_HORIZONTAL:
+              y = gimp_guide_get_position (guide);
+              w = gimp_image_get_width (image);
+              gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                         w, y,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_HANDLE_ANCHOR_EAST);
+              gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
+                                         0, y,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_TOOL_HANDLE_SIZE_SMALL,
+                                         GIMP_HANDLE_ANCHOR_WEST);
+              break;
+
+            default:
+              break;
+            }
+        }
+    }
+}
+
+static void
+gimp_align_tool_align (GimpAlignTool     *align_tool,
+                       GimpAlignmentType  align_type)
+{
+  GimpAlignOptions *options = GIMP_ALIGN_TOOL_GET_OPTIONS (align_tool);
+  GimpImage        *image;
+  GObject          *reference_object = NULL;
+  GList            *list;
+  gint              offset = 0;
+
+  /* if nothing is selected, just return */
+  if (! align_tool->selected_objects)
+    return;
+
+  image  = gimp_display_get_image (GIMP_TOOL (align_tool)->display);
+
+  switch (align_type)
+    {
+    case GIMP_ALIGN_LEFT:
+    case GIMP_ALIGN_HCENTER:
+    case GIMP_ALIGN_RIGHT:
+    case GIMP_ALIGN_TOP:
+    case GIMP_ALIGN_VCENTER:
+    case GIMP_ALIGN_BOTTOM:
+      offset = 0;
+      break;
+
+    case GIMP_ARRANGE_LEFT:
+    case GIMP_ARRANGE_HCENTER:
+    case GIMP_ARRANGE_RIGHT:
+    case GIMP_ARRANGE_HFILL:
+      offset = options->offset_x;
+      break;
+
+    case GIMP_ARRANGE_TOP:
+    case GIMP_ARRANGE_VCENTER:
+    case GIMP_ARRANGE_BOTTOM:
+    case GIMP_ARRANGE_VFILL:
+      offset = options->offset_y;
+      break;
+    }
+
+  /* if only one object is selected, use the image as reference
+   * if multiple objects are selected, use the first one as reference if
+   * "set_reference" is TRUE, otherwise use NULL.
+   */
+
+  list = align_tool->selected_objects;
+
+  switch (options->align_reference)
+    {
+    case GIMP_ALIGN_REFERENCE_IMAGE:
+      reference_object = G_OBJECT (image);
+      break;
+
+    case GIMP_ALIGN_REFERENCE_FIRST:
+      if (g_list_length (list) == 1)
+        {
+          reference_object = G_OBJECT (image);
+        }
+      else
+        {
+          if (align_tool->set_reference)
+            {
+              reference_object = G_OBJECT (list->data);
+              list = g_list_next (list);
+            }
+          else
+            {
+              reference_object = NULL;
+            }
+        }
+      break;
+
+    case GIMP_ALIGN_REFERENCE_SELECTION:
+      reference_object = G_OBJECT (gimp_image_get_mask (image));
+      break;
+
+    case GIMP_ALIGN_REFERENCE_ACTIVE_LAYER:
+      reference_object = G_OBJECT (gimp_image_get_active_layer (image));
+      break;
+
+    case GIMP_ALIGN_REFERENCE_ACTIVE_CHANNEL:
+      reference_object = G_OBJECT (gimp_image_get_active_channel (image));
+      break;
+
+    case GIMP_ALIGN_REFERENCE_ACTIVE_PATH:
+      reference_object = G_OBJECT (gimp_image_get_active_vectors (image));
+      break;
+    }
+
+  if (! reference_object)
+    return;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (align_tool));
+
+  gimp_image_arrange_objects (image, list,
+                              align_type,
+                              reference_object,
+                              align_type,
+                              offset);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (align_tool));
+
+  gimp_image_flush (image);
+}
+
+static void
+gimp_align_tool_object_removed (GObject       *object,
+                                GimpAlignTool *align_tool)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (align_tool));
+
+  if (align_tool->selected_objects)
+    g_signal_handlers_disconnect_by_func (object,
+                                          gimp_align_tool_object_removed,
+                                          align_tool);
+
+  align_tool->selected_objects = g_list_remove (align_tool->selected_objects,
+                                                object);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (align_tool));
+}
+
+static void
+gimp_align_tool_clear_selected (GimpAlignTool *align_tool)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (align_tool));
+
+  while (align_tool->selected_objects)
+    gimp_align_tool_object_removed (align_tool->selected_objects->data,
+                                    align_tool);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (align_tool));
+}
diff --git a/app/tools/gimpaligntool.h b/app/tools/gimpaligntool.h
new file mode 100644
index 0000000..e84a9cb
--- /dev/null
+++ b/app/tools/gimpaligntool.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ALIGN_TOOL_H__
+#define __GIMP_ALIGN_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+/*  tool function/operation/state/mode  */
+typedef enum
+{
+  ALIGN_TOOL_IDLE,
+  ALIGN_TOOL_PICK_LAYER,
+  ALIGN_TOOL_ADD_LAYER,
+  ALIGN_TOOL_PICK_GUIDE,
+  ALIGN_TOOL_ADD_GUIDE,
+  ALIGN_TOOL_PICK_PATH,
+  ALIGN_TOOL_ADD_PATH,
+  ALIGN_TOOL_DRAG_BOX
+} GimpAlignToolFunction;
+
+
+#define GIMP_TYPE_ALIGN_TOOL            (gimp_align_tool_get_type ())
+#define GIMP_ALIGN_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ALIGN_TOOL, GimpAlignTool))
+#define GIMP_ALIGN_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ALIGN_TOOL, GimpAlignToolClass))
+#define GIMP_IS_ALIGN_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ALIGN_TOOL))
+#define GIMP_IS_ALIGN_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ALIGN_TOOL))
+#define GIMP_ALIGN_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ALIGN_TOOL, GimpAlignToolClass))
+
+#define GIMP_ALIGN_TOOL_GET_OPTIONS(t)  (GIMP_ALIGN_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpAlignTool      GimpAlignTool;
+typedef struct _GimpAlignToolClass GimpAlignToolClass;
+
+struct _GimpAlignTool
+{
+  GimpDrawTool           parent_instance;
+
+  GimpAlignToolFunction  function;
+  GList                 *selected_objects;
+
+  gint                   x1, y1, x2, y2;   /* rubber-band rectangle */
+
+  gboolean               set_reference;
+};
+
+struct _GimpAlignToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+
+void    gimp_align_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_align_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ALIGN_TOOL_H__  */
diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c
new file mode 100644
index 0000000..26229a7
--- /dev/null
+++ b/app/tools/gimpbrightnesscontrasttool.c
@@ -0,0 +1,314 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "operations/gimpbrightnesscontrastconfig.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpwidgets-constructors.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpbrightnesscontrasttool.h"
+#include "gimpfilteroptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+#define SLIDER_WIDTH 200
+
+
+static gboolean   gimp_brightness_contrast_tool_initialize (GimpTool              *tool,
+                                                            GimpDisplay           *display,
+                                                            GError               **error);
+static void   gimp_brightness_contrast_tool_button_press   (GimpTool              *tool,
+                                                            const GimpCoords      *coords,
+                                                            guint32                time,
+                                                            GdkModifierType        state,
+                                                            GimpButtonPressType    press_type,
+                                                            GimpDisplay           *display);
+static void   gimp_brightness_contrast_tool_button_release (GimpTool              *tool,
+                                                            const GimpCoords      *coords,
+                                                            guint32                time,
+                                                            GdkModifierType        state,
+                                                            GimpButtonReleaseType  release_type,
+                                                            GimpDisplay           *display);
+static void   gimp_brightness_contrast_tool_motion         (GimpTool              *tool,
+                                                            const GimpCoords      *coords,
+                                                            guint32                time,
+                                                            GdkModifierType        state,
+                                                            GimpDisplay           *display);
+
+static gchar *
+              gimp_brightness_contrast_tool_get_operation  (GimpFilterTool        *filter_tool,
+                                                            gchar                **description);
+static void   gimp_brightness_contrast_tool_dialog         (GimpFilterTool        *filter_tool);
+
+static void   brightness_contrast_to_levels_callback       (GtkWidget             *widget,
+                                                            GimpFilterTool        *filter_tool);
+
+
+G_DEFINE_TYPE (GimpBrightnessContrastTool, gimp_brightness_contrast_tool,
+               GIMP_TYPE_FILTER_TOOL)
+
+#define parent_class gimp_brightness_contrast_tool_parent_class
+
+
+void
+gimp_brightness_contrast_tool_register (GimpToolRegisterCallback  callback,
+                                        gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL,
+                GIMP_TYPE_FILTER_OPTIONS, NULL,
+                0,
+                "gimp-brightness-contrast-tool",
+                _("Brightness-Contrast"),
+                _("Adjust brightness and contrast"),
+                N_("B_rightness-Contrast..."), NULL,
+                NULL, GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST,
+                GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST,
+                data);
+}
+
+static void
+gimp_brightness_contrast_tool_class_init (GimpBrightnessContrastToolClass *klass)
+{
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  tool_class->initialize           = gimp_brightness_contrast_tool_initialize;
+  tool_class->button_press         = gimp_brightness_contrast_tool_button_press;
+  tool_class->button_release       = gimp_brightness_contrast_tool_button_release;
+  tool_class->motion               = gimp_brightness_contrast_tool_motion;
+
+  filter_tool_class->get_operation = gimp_brightness_contrast_tool_get_operation;
+  filter_tool_class->dialog        = gimp_brightness_contrast_tool_dialog;
+}
+
+static void
+gimp_brightness_contrast_tool_init (GimpBrightnessContrastTool *bc_tool)
+{
+}
+
+static gboolean
+gimp_brightness_contrast_tool_initialize (GimpTool     *tool,
+                                          GimpDisplay  *display,
+                                          GError      **error)
+{
+  GimpBrightnessContrastTool *bc_tool  = GIMP_BRIGHTNESS_CONTRAST_TOOL (tool);
+  GimpImage                  *image    = gimp_display_get_image (display);
+  GimpDrawable               *drawable = gimp_image_get_active_drawable (image);
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      return FALSE;
+    }
+
+  if (gimp_drawable_get_component_type (drawable) == GIMP_COMPONENT_TYPE_U8)
+    {
+      gimp_prop_widget_set_factor (bc_tool->brightness_scale,
+                                   127.0, 1.0, 8.0, 0);
+      gimp_prop_widget_set_factor (bc_tool->contrast_scale,
+                                   127.0, 1.0, 8.0, 0);
+    }
+  else
+    {
+      gimp_prop_widget_set_factor (bc_tool->brightness_scale,
+                                   0.5, 0.01, 0.1, 3);
+      gimp_prop_widget_set_factor (bc_tool->contrast_scale,
+                                   0.5, 0.01, 0.1, 3);
+    }
+
+  return TRUE;
+}
+
+static gchar *
+gimp_brightness_contrast_tool_get_operation (GimpFilterTool  *filter_tool,
+                                             gchar          **description)
+{
+  *description = g_strdup (_("Adjust Brightness and Contrast"));
+
+  return g_strdup ("gimp:brightness-contrast");
+}
+
+static void
+gimp_brightness_contrast_tool_button_press (GimpTool            *tool,
+                                            const GimpCoords    *coords,
+                                            guint32              time,
+                                            GdkModifierType      state,
+                                            GimpButtonPressType  press_type,
+                                            GimpDisplay         *display)
+{
+  GimpBrightnessContrastTool *bc_tool = GIMP_BRIGHTNESS_CONTRAST_TOOL (tool);
+
+  bc_tool->dragging = ! gimp_filter_tool_on_guide (GIMP_FILTER_TOOL (tool),
+                                                   coords, display);
+
+  if (! bc_tool->dragging)
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+    }
+  else
+    {
+      gdouble brightness;
+      gdouble contrast;
+
+      g_object_get (GIMP_FILTER_TOOL (tool)->config,
+                    "brightness", &brightness,
+                    "contrast",   &contrast,
+                    NULL);
+
+      bc_tool->x  = coords->x - contrast   * 127.0;
+      bc_tool->y  = coords->y + brightness * 127.0;
+      bc_tool->dx =   contrast   * 127.0;
+      bc_tool->dy = - brightness * 127.0;
+
+      tool->display = display;
+
+      gimp_tool_control_activate (tool->control);
+    }
+}
+
+static void
+gimp_brightness_contrast_tool_button_release (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonReleaseType  release_type,
+                                              GimpDisplay           *display)
+{
+  GimpBrightnessContrastTool *bc_tool = GIMP_BRIGHTNESS_CONTRAST_TOOL (tool);
+
+  if (! bc_tool->dragging)
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                      release_type, display);
+    }
+  else
+    {
+      gimp_tool_control_halt (tool->control);
+
+      bc_tool->dragging = FALSE;
+
+      if (bc_tool->dx == 0 && bc_tool->dy == 0)
+        return;
+
+      if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+        gimp_config_reset (GIMP_CONFIG (GIMP_FILTER_TOOL (tool)->config));
+    }
+}
+
+static void
+gimp_brightness_contrast_tool_motion (GimpTool         *tool,
+                                      const GimpCoords *coords,
+                                      guint32           time,
+                                      GdkModifierType   state,
+                                      GimpDisplay      *display)
+{
+  GimpBrightnessContrastTool *bc_tool = GIMP_BRIGHTNESS_CONTRAST_TOOL (tool);
+
+  if (! bc_tool->dragging)
+    {
+      GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
+                                              display);
+    }
+  else
+    {
+      bc_tool->dx =   (coords->x - bc_tool->x);
+      bc_tool->dy = - (coords->y - bc_tool->y);
+
+      g_object_set (GIMP_FILTER_TOOL (tool)->config,
+                    "brightness", CLAMP (bc_tool->dy, -127.0, 127.0) / 127.0,
+                    "contrast",   CLAMP (bc_tool->dx, -127.0, 127.0) / 127.0,
+                    NULL);
+    }
+}
+
+
+/********************************/
+/*  Brightness Contrast dialog  */
+/********************************/
+
+static void
+gimp_brightness_contrast_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpBrightnessContrastTool *bc_tool = GIMP_BRIGHTNESS_CONTRAST_TOOL (filter_tool);
+  GtkWidget                  *main_vbox;
+  GtkWidget                  *scale;
+  GtkWidget                  *button;
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  /*  Create the brightness scale widget  */
+  scale = gimp_prop_spin_scale_new (filter_tool->config, "brightness",
+                                    _("_Brightness"), 0.01, 0.1, 3);
+  gtk_box_pack_start (GTK_BOX (main_vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  bc_tool->brightness_scale = scale;
+
+  /*  Create the contrast scale widget  */
+  scale = gimp_prop_spin_scale_new (filter_tool->config, "contrast",
+                                    _("_Contrast"), 0.01, 0.1, 3);
+  gtk_box_pack_start (GTK_BOX (main_vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  bc_tool->contrast_scale = scale;
+
+  button = gimp_icon_button_new (GIMP_ICON_TOOL_LEVELS,
+                                 _("Edit these Settings as Levels"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (brightness_contrast_to_levels_callback),
+                    filter_tool);
+}
+
+static void
+brightness_contrast_to_levels_callback (GtkWidget      *widget,
+                                        GimpFilterTool *filter_tool)
+{
+  GimpLevelsConfig *levels;
+
+  levels = gimp_brightness_contrast_config_to_levels_config (GIMP_BRIGHTNESS_CONTRAST_CONFIG (filter_tool->config));
+
+  gimp_filter_tool_edit_as (filter_tool,
+                            "gimp-levels-tool",
+                            GIMP_CONFIG (levels));
+
+  g_object_unref (levels);
+}
diff --git a/app/tools/gimpbrightnesscontrasttool.h b/app/tools/gimpbrightnesscontrasttool.h
new file mode 100644
index 0000000..64ce278
--- /dev/null
+++ b/app/tools/gimpbrightnesscontrasttool.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRIGHTNESS_CONTRAST_TOOL_H__
+#define __GIMP_BRIGHTNESS_CONTRAST_TOOL_H__
+
+
+#include "gimpfiltertool.h"
+
+
+#define GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL            (gimp_brightness_contrast_tool_get_type ())
+#define GIMP_BRIGHTNESS_CONTRAST_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL, GimpBrightnessContrastTool))
+#define GIMP_BRIGHTNESS_CONTRAST_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL, GimpBrightnessContrastToolClass))
+#define GIMP_IS_BRIGHTNESS_CONTRAST_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL))
+#define GIMP_IS_BRIGHTNESS_CONTRAST_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL))
+#define GIMP_BRIGHTNESS_CONTRAST_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL, GimpBrightnessContrastToolClass))
+
+
+typedef struct _GimpBrightnessContrastTool      GimpBrightnessContrastTool;
+typedef struct _GimpBrightnessContrastToolClass GimpBrightnessContrastToolClass;
+
+struct _GimpBrightnessContrastTool
+{
+  GimpFilterTool  parent_instance;
+
+  gboolean        dragging;
+  gdouble         x, y;
+  gdouble         dx, dy;
+
+  /* dialog */
+  GtkWidget      *brightness_scale;
+  GtkWidget      *contrast_scale;
+};
+
+struct _GimpBrightnessContrastToolClass
+{
+  GimpFilterToolClass  parent_class;
+};
+
+
+void    gimp_brightness_contrast_tool_register (GimpToolRegisterCallback  callback,
+                                                gpointer                  data);
+
+GType   gimp_brightness_contrast_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_BRIGHTNESS_CONTRAST_TOOL_H__  */
diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c
new file mode 100644
index 0000000..08c8ed9
--- /dev/null
+++ b/app/tools/gimpbrushtool.c
@@ -0,0 +1,451 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpbezierdesc.h"
+#include "core/gimpbrush.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolinfo.h"
+
+#include "paint/gimpbrushcore.h"
+#include "paint/gimppaintoptions.h"
+
+#include "display/gimpcanvashandle.h"
+#include "display/gimpcanvaspath.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "gimpbrushtool.h"
+#include "gimppainttool-paint.h"
+#include "gimptoolcontrol.h"
+
+
+static void   gimp_brush_tool_constructed     (GObject           *object);
+
+static void   gimp_brush_tool_oper_update     (GimpTool          *tool,
+                                               const GimpCoords  *coords,
+                                               GdkModifierType    state,
+                                               gboolean           proximity,
+                                               GimpDisplay       *display);
+static void   gimp_brush_tool_cursor_update   (GimpTool          *tool,
+                                               const GimpCoords  *coords,
+                                               GdkModifierType    state,
+                                               GimpDisplay       *display);
+static void   gimp_brush_tool_options_notify  (GimpTool          *tool,
+                                               GimpToolOptions   *options,
+                                               const GParamSpec  *pspec);
+
+static void   gimp_brush_tool_paint_start     (GimpPaintTool     *paint_tool);
+static void   gimp_brush_tool_paint_end       (GimpPaintTool     *paint_tool);
+static void   gimp_brush_tool_paint_flush     (GimpPaintTool     *paint_tool);
+static GimpCanvasItem *
+              gimp_brush_tool_get_outline     (GimpPaintTool     *paint_tool,
+                                               GimpDisplay       *display,
+                                               gdouble            x,
+                                               gdouble            y);
+
+static void   gimp_brush_tool_brush_changed   (GimpContext       *context,
+                                               GimpBrush         *brush,
+                                               GimpBrushTool     *brush_tool);
+static void   gimp_brush_tool_set_brush       (GimpBrushCore     *brush_core,
+                                               GimpBrush         *brush,
+                                               GimpBrushTool     *brush_tool);
+
+static const GimpBezierDesc *
+                 gimp_brush_tool_get_boundary (GimpBrushTool     *brush_tool,
+                                               gint              *width,
+                                               gint              *height);
+
+
+G_DEFINE_TYPE (GimpBrushTool, gimp_brush_tool, GIMP_TYPE_PAINT_TOOL)
+
+#define parent_class gimp_brush_tool_parent_class
+
+
+static void
+gimp_brush_tool_class_init (GimpBrushToolClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpToolClass      *tool_class       = GIMP_TOOL_CLASS (klass);
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  object_class->constructed     = gimp_brush_tool_constructed;
+
+  tool_class->oper_update       = gimp_brush_tool_oper_update;
+  tool_class->cursor_update     = gimp_brush_tool_cursor_update;
+  tool_class->options_notify    = gimp_brush_tool_options_notify;
+
+  paint_tool_class->paint_start = gimp_brush_tool_paint_start;
+  paint_tool_class->paint_end   = gimp_brush_tool_paint_end;
+  paint_tool_class->paint_flush = gimp_brush_tool_paint_flush;
+  paint_tool_class->get_outline = gimp_brush_tool_get_outline;
+}
+
+static void
+gimp_brush_tool_init (GimpBrushTool *brush_tool)
+{
+  GimpTool *tool = GIMP_TOOL (brush_tool);
+
+  gimp_tool_control_set_action_size     (tool->control,
+                                         "tools/tools-paintbrush-size-set");
+  gimp_tool_control_set_action_aspect   (tool->control,
+                                         "tools/tools-paintbrush-aspect-ratio-set");
+  gimp_tool_control_set_action_angle    (tool->control,
+                                         "tools/tools-paintbrush-angle-set");
+  gimp_tool_control_set_action_spacing  (tool->control,
+                                         "tools/tools-paintbrush-spacing-set");
+  gimp_tool_control_set_action_hardness (tool->control,
+                                         "tools/tools-paintbrush-hardness-set");
+  gimp_tool_control_set_action_force    (tool->control,
+                                         "tools/tools-paintbrush-force-set");
+  gimp_tool_control_set_action_object_1 (tool->control,
+                                         "context/context-brush-select-set");
+}
+
+static void
+gimp_brush_tool_constructed (GObject *object)
+{
+  GimpTool      *tool       = GIMP_TOOL (object);
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_BRUSH_CORE (paint_tool->core));
+
+  g_signal_connect_object (gimp_tool_get_options (tool), "brush-changed",
+                           G_CALLBACK (gimp_brush_tool_brush_changed),
+                           paint_tool, 0);
+
+  g_signal_connect_object (paint_tool->core, "set-brush",
+                           G_CALLBACK (gimp_brush_tool_set_brush),
+                           paint_tool, 0);
+}
+
+static void
+gimp_brush_tool_oper_update (GimpTool         *tool,
+                             const GimpCoords *coords,
+                             GdkModifierType   state,
+                             gboolean          proximity,
+                             GimpDisplay      *display)
+{
+  GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (tool);
+  GimpDrawable     *drawable;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                               proximity, display);
+
+  drawable = gimp_image_get_active_drawable (gimp_display_get_image (display));
+
+  if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)) &&
+      drawable && proximity)
+    {
+      GimpContext   *context    = GIMP_CONTEXT (paint_options);
+      GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+      GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+
+      gimp_brush_core_set_brush (brush_core,
+                                 gimp_context_get_brush (context));
+
+      gimp_brush_core_set_dynamics (brush_core,
+                                    gimp_context_get_dynamics (context));
+
+      if (GIMP_BRUSH_CORE_GET_CLASS (brush_core)->handles_transforming_brush)
+        {
+          gimp_brush_core_eval_transform_dynamics (brush_core,
+                                                   drawable,
+                                                   paint_options,
+                                                   coords);
+        }
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_brush_tool_cursor_update (GimpTool         *tool,
+                               const GimpCoords *coords,
+                               GdkModifierType   state,
+                               GimpDisplay      *display)
+{
+  GimpBrushTool *brush_tool = GIMP_BRUSH_TOOL (tool);
+  GimpBrushCore *brush_core = GIMP_BRUSH_CORE (GIMP_PAINT_TOOL (brush_tool)->core);
+
+  if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      if (! brush_core->main_brush || ! brush_core->dynamics)
+        {
+          gimp_tool_set_cursor (tool, display,
+                                gimp_tool_control_get_cursor (tool->control),
+                                gimp_tool_control_get_tool_cursor (tool->control),
+                                GIMP_CURSOR_MODIFIER_BAD);
+          return;
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool,  coords, state, display);
+}
+
+static void
+gimp_brush_tool_options_notify (GimpTool         *tool,
+                                GimpToolOptions  *options,
+                                const GParamSpec *pspec)
+{
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! strcmp (pspec->name, "brush-size")  ||
+      ! strcmp (pspec->name, "brush-angle") ||
+      ! strcmp (pspec->name, "brush-aspect-ratio"))
+    {
+      GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+      GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+
+      g_signal_emit_by_name (brush_core, "set-brush",
+                             brush_core->main_brush);
+    }
+}
+
+static void
+gimp_brush_tool_paint_start (GimpPaintTool *paint_tool)
+{
+  GimpBrushTool        *brush_tool = GIMP_BRUSH_TOOL (paint_tool);
+  GimpBrushCore        *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+  const GimpBezierDesc *boundary;
+
+  if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_start)
+    GIMP_PAINT_TOOL_CLASS (parent_class)->paint_start (paint_tool);
+
+  boundary = gimp_brush_tool_get_boundary (brush_tool,
+                                           &brush_tool->boundary_width,
+                                           &brush_tool->boundary_height);
+
+  if (boundary)
+    brush_tool->boundary = gimp_bezier_desc_copy (boundary);
+
+  brush_tool->boundary_scale        = brush_core->scale;
+  brush_tool->boundary_aspect_ratio = brush_core->aspect_ratio;
+  brush_tool->boundary_angle        = brush_core->angle;
+  brush_tool->boundary_reflect      = brush_core->reflect;
+  brush_tool->boundary_hardness     = brush_core->hardness;
+}
+
+static void
+gimp_brush_tool_paint_end (GimpPaintTool *paint_tool)
+{
+  GimpBrushTool *brush_tool = GIMP_BRUSH_TOOL (paint_tool);
+
+  g_clear_pointer (&brush_tool->boundary, gimp_bezier_desc_free);
+
+  if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_end)
+    GIMP_PAINT_TOOL_CLASS (parent_class)->paint_end (paint_tool);
+}
+
+static void
+gimp_brush_tool_paint_flush (GimpPaintTool *paint_tool)
+{
+  GimpBrushTool        *brush_tool = GIMP_BRUSH_TOOL (paint_tool);
+  GimpBrushCore        *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+  const GimpBezierDesc *boundary;
+
+  if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_flush)
+    GIMP_PAINT_TOOL_CLASS (parent_class)->paint_flush (paint_tool);
+
+  if (brush_tool->boundary_scale        != brush_core->scale        ||
+      brush_tool->boundary_aspect_ratio != brush_core->aspect_ratio ||
+      brush_tool->boundary_angle        != brush_core->angle        ||
+      brush_tool->boundary_reflect      != brush_core->reflect      ||
+      brush_tool->boundary_hardness     != brush_core->hardness)
+    {
+      g_clear_pointer (&brush_tool->boundary, gimp_bezier_desc_free);
+
+      boundary = gimp_brush_tool_get_boundary (brush_tool,
+                                               &brush_tool->boundary_width,
+                                               &brush_tool->boundary_height);
+
+      if (boundary)
+        brush_tool->boundary = gimp_bezier_desc_copy (boundary);
+
+      brush_tool->boundary_scale        = brush_core->scale;
+      brush_tool->boundary_aspect_ratio = brush_core->aspect_ratio;
+      brush_tool->boundary_angle        = brush_core->angle;
+      brush_tool->boundary_reflect      = brush_core->reflect;
+      brush_tool->boundary_hardness     = brush_core->hardness;
+    }
+}
+
+static GimpCanvasItem *
+gimp_brush_tool_get_outline (GimpPaintTool *paint_tool,
+                             GimpDisplay   *display,
+                             gdouble        x,
+                             gdouble        y)
+{
+  GimpBrushTool  *brush_tool = GIMP_BRUSH_TOOL (paint_tool);
+  GimpCanvasItem *item;
+
+  item = gimp_brush_tool_create_outline (brush_tool, display, x, y);
+
+  if (! item)
+    {
+      GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+
+      if (brush_core->main_brush && brush_core->dynamics)
+        {
+          /*  if an outline was expected, but got scaled away by
+           *  transform/dynamics, draw a circle in the "normal" size.
+           */
+          GimpPaintOptions *options;
+
+          options = GIMP_PAINT_TOOL_GET_OPTIONS (brush_tool);
+
+          gimp_paint_tool_set_draw_fallback (paint_tool,
+                                             TRUE, options->brush_size);
+        }
+    }
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_brush_tool_create_outline (GimpBrushTool *brush_tool,
+                                GimpDisplay   *display,
+                                gdouble        x,
+                                gdouble        y)
+{
+  GimpTool             *tool;
+  GimpDisplayShell     *shell;
+  const GimpBezierDesc *boundary = NULL;
+  gint                  width    = 0;
+  gint                  height   = 0;
+
+  g_return_val_if_fail (GIMP_IS_BRUSH_TOOL (brush_tool), NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  if (gimp_paint_tool_paint_is_active (GIMP_PAINT_TOOL (brush_tool)))
+    {
+      boundary = brush_tool->boundary;
+      width    = brush_tool->boundary_width;
+      height   = brush_tool->boundary_height;
+    }
+  else
+    {
+      boundary = gimp_brush_tool_get_boundary (brush_tool, &width, &height);
+    }
+
+  if (! boundary)
+    return NULL;
+
+  tool  = GIMP_TOOL (brush_tool);
+  shell = gimp_display_get_shell (display);
+
+  /*  don't draw the boundary if it becomes too small  */
+  if (SCALEX (shell, width)  > 4 &&
+      SCALEY (shell, height) > 4)
+    {
+      x -= width  / 2.0;
+      y -= height / 2.0;
+
+      if (gimp_tool_control_get_precision (tool->control) ==
+          GIMP_CURSOR_PRECISION_PIXEL_CENTER)
+        {
+#define EPSILON 0.000001
+          /*  Add EPSILON before rounding since e.g.
+           *  (5.0 - 0.5) may end up at (4.499999999....)
+           *  due to floating point fnords
+           */
+          x = RINT (x + EPSILON);
+          y = RINT (y + EPSILON);
+#undef EPSILON
+        }
+
+      return gimp_canvas_path_new (shell, boundary, x, y, FALSE,
+                                   GIMP_PATH_STYLE_OUTLINE);
+    }
+
+  return NULL;
+}
+
+static void
+gimp_brush_tool_brush_changed (GimpContext   *context,
+                               GimpBrush     *brush,
+                               GimpBrushTool *brush_tool)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (brush_tool);
+  GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+
+  gimp_brush_core_set_brush (brush_core, brush);
+
+}
+
+static void
+gimp_brush_tool_set_brush (GimpBrushCore *brush_core,
+                           GimpBrush     *brush,
+                           GimpBrushTool *brush_tool)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (brush_tool));
+
+  if (GIMP_BRUSH_CORE_GET_CLASS (brush_core)->handles_transforming_brush)
+    {
+      GimpPaintCore *paint_core = GIMP_PAINT_CORE (brush_core);
+
+      gimp_brush_core_eval_transform_dynamics (brush_core,
+                                               NULL,
+                                               GIMP_PAINT_TOOL_GET_OPTIONS (brush_tool),
+                                               &paint_core->cur_coords);
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (brush_tool));
+}
+
+static const GimpBezierDesc *
+gimp_brush_tool_get_boundary (GimpBrushTool *brush_tool,
+                              gint          *width,
+                              gint          *height)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (brush_tool);
+  GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_tool->core);
+
+  if (paint_tool->draw_brush &&
+      brush_core->main_brush &&
+      brush_core->dynamics   &&
+      brush_core->scale > 0.0)
+    {
+      return gimp_brush_transform_boundary (brush_core->main_brush,
+                                            brush_core->scale,
+                                            brush_core->aspect_ratio,
+                                            brush_core->angle,
+                                            brush_core->reflect,
+                                            brush_core->hardness,
+                                            width,
+                                            height);
+    }
+
+  return NULL;
+}
diff --git a/app/tools/gimpbrushtool.h b/app/tools/gimpbrushtool.h
new file mode 100644
index 0000000..6ddddd7
--- /dev/null
+++ b/app/tools/gimpbrushtool.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_TOOL_H__
+#define __GIMP_BRUSH_TOOL_H__
+
+
+#include "gimppainttool.h"
+
+
+#define GIMP_TYPE_BRUSH_TOOL            (gimp_brush_tool_get_type ())
+#define GIMP_BRUSH_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_TOOL, GimpBrushTool))
+#define GIMP_BRUSH_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_TOOL, GimpBrushToolClass))
+#define GIMP_IS_BRUSH_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_TOOL))
+#define GIMP_IS_BRUSH_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_TOOL))
+#define GIMP_BRUSH_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_TOOL, GimpBrushToolClass))
+
+
+typedef struct _GimpBrushToolClass GimpBrushToolClass;
+
+struct _GimpBrushTool
+{
+  GimpPaintTool   parent_instance;
+
+  GimpBezierDesc *boundary;
+  gint            boundary_width;
+  gint            boundary_height;
+  gdouble         boundary_scale;
+  gdouble         boundary_aspect_ratio;
+  gdouble         boundary_angle;
+  gboolean        boundary_reflect;
+  gdouble         boundary_hardness;
+};
+
+struct _GimpBrushToolClass
+{
+  GimpPaintToolClass  parent_class;
+};
+
+
+GType            gimp_brush_tool_get_type       (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_brush_tool_create_outline (GimpBrushTool *brush_tool,
+                                                 GimpDisplay   *display,
+                                                 gdouble        x,
+                                                 gdouble        y);
+
+
+#endif  /*  __GIMP_BRUSH_TOOL_H__  */
diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
new file mode 100644
index 0000000..f5615c2
--- /dev/null
+++ b/app/tools/gimpbucketfilloptions.c
@@ -0,0 +1,544 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimptoolinfo.h"
+
+#include "display/gimpdisplay.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpbucketfilloptions.h"
+#include "gimppaintoptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FILL_MODE,
+  PROP_FILL_AREA,
+  PROP_FILL_TRANSPARENT,
+  PROP_SAMPLE_MERGED,
+  PROP_DIAGONAL_NEIGHBORS,
+  PROP_ANTIALIAS,
+  PROP_FEATHER,
+  PROP_FEATHER_RADIUS,
+  PROP_THRESHOLD,
+  PROP_LINE_ART_SOURCE,
+  PROP_LINE_ART_THRESHOLD,
+  PROP_LINE_ART_MAX_GROW,
+  PROP_LINE_ART_MAX_GAP_LENGTH,
+  PROP_FILL_CRITERION
+};
+
+struct _GimpBucketFillOptionsPrivate
+{
+  GtkWidget *diagonal_neighbors_checkbox;
+  GtkWidget *threshold_scale;
+
+  GtkWidget *similar_color_frame;
+  GtkWidget *line_art_frame;
+};
+
+static void   gimp_bucket_fill_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void   gimp_bucket_fill_options_set_property      (GObject               *object,
+                                                          guint                  property_id,
+                                                          const GValue          *value,
+                                                          GParamSpec            *pspec);
+static void   gimp_bucket_fill_options_get_property      (GObject               *object,
+                                                          guint                  property_id,
+                                                          GValue                *value,
+                                                          GParamSpec            *pspec);
+
+static void   gimp_bucket_fill_options_reset             (GimpConfig            *config);
+static void   gimp_bucket_fill_options_update_area       (GimpBucketFillOptions *options);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBucketFillOptions, gimp_bucket_fill_options,
+                         GIMP_TYPE_PAINT_OPTIONS,
+                         G_ADD_PRIVATE (GimpBucketFillOptions)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_bucket_fill_options_config_iface_init))
+
+#define parent_class gimp_bucket_fill_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_bucket_fill_options_class_init (GimpBucketFillOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_bucket_fill_options_set_property;
+  object_class->get_property = gimp_bucket_fill_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_MODE,
+                         "fill-mode",
+                         _("Fill type"),
+                         NULL,
+                         GIMP_TYPE_BUCKET_FILL_MODE,
+                         GIMP_BUCKET_FILL_FG,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_AREA,
+                         "fill-area",
+                         _("Fill selection"),
+                         _("Which area will be filled"),
+                         GIMP_TYPE_BUCKET_FILL_AREA,
+                         GIMP_BUCKET_FILL_SIMILAR_COLORS,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILL_TRANSPARENT,
+                            "fill-transparent",
+                            _("Fill transparent areas"),
+                            _("Allow completely transparent regions "
+                              "to be filled"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            _("Base filled area on all visible layers"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DIAGONAL_NEIGHBORS,
+                            "diagonal-neighbors",
+                            _("Diagonal neighbors"),
+                            _("Treat diagonally neighboring pixels as "
+                              "connected"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            _("Base fill opacity on color difference from "
+                              "the clicked pixel (see threshold) or on line "
+                              " art borders. Disable antialiasing to fill "
+                              "the entire area uniformly."),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FEATHER,
+                            "feather",
+                            _("Feather edges"),
+                            _("Enable feathering of fill edges"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS,
+                           "feather-radius",
+                           _("Radius"),
+                           _("Radius of feathering"),
+                           0.0, 100.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_THRESHOLD,
+                           "threshold",
+                           _("Threshold"),
+                           _("Maximum color difference"),
+                           0.0, 255.0, 15.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LINE_ART_SOURCE,
+                         "line-art-source",
+                         _("Source"),
+                         _("Source image for line art computation"),
+                         GIMP_TYPE_LINE_ART_SOURCE,
+                         GIMP_LINE_ART_SOURCE_SAMPLE_MERGED,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LINE_ART_THRESHOLD,
+                           "line-art-threshold",
+                           _("Line art detection threshold"),
+                           _("Threshold to detect contour (higher values will include more pixels)"),
+                           0.0, 1.0, 0.92,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LINE_ART_MAX_GROW,
+                        "line-art-max-grow",
+                        _("Maximum growing size"),
+                        _("Maximum number of pixels grown under the line art"),
+                        1, 100, 3,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LINE_ART_MAX_GAP_LENGTH,
+                        "line-art-max-gap-length",
+                        _("Maximum gap length"),
+                        _("Maximum gap (in pixels) in line art which can be closed"),
+                        0, 1000, 100,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_CRITERION,
+                         "fill-criterion",
+                         _("Fill by"),
+                         _("Criterion used for determining color similarity"),
+                         GIMP_TYPE_SELECT_CRITERION,
+                         GIMP_SELECT_CRITERION_COMPOSITE,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_bucket_fill_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_bucket_fill_options_reset;
+}
+
+static void
+gimp_bucket_fill_options_init (GimpBucketFillOptions *options)
+{
+  options->priv = gimp_bucket_fill_options_get_instance_private (options);
+}
+
+static void
+gimp_bucket_fill_options_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FILL_MODE:
+      options->fill_mode = g_value_get_enum (value);
+      break;
+    case PROP_FILL_AREA:
+      options->fill_area = g_value_get_enum (value);
+      gimp_bucket_fill_options_update_area (options);
+      break;
+    case PROP_FILL_TRANSPARENT:
+      options->fill_transparent = g_value_get_boolean (value);
+      break;
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+    case PROP_DIAGONAL_NEIGHBORS:
+      options->diagonal_neighbors = g_value_get_boolean (value);
+      break;
+    case PROP_ANTIALIAS:
+      options->antialias = g_value_get_boolean (value);
+      break;
+    case PROP_FEATHER:
+      options->feather = g_value_get_boolean (value);
+      break;
+    case PROP_FEATHER_RADIUS:
+      options->feather_radius = g_value_get_double (value);
+      break;
+    case PROP_THRESHOLD:
+      options->threshold = g_value_get_double (value);
+      break;
+    case PROP_LINE_ART_SOURCE:
+      options->line_art_source = g_value_get_enum (value);
+      break;
+    case PROP_LINE_ART_THRESHOLD:
+      options->line_art_threshold = g_value_get_double (value);
+      break;
+    case PROP_LINE_ART_MAX_GROW:
+      options->line_art_max_grow = g_value_get_int (value);
+      break;
+    case PROP_LINE_ART_MAX_GAP_LENGTH:
+      options->line_art_max_gap_length = g_value_get_int (value);
+      break;
+    case PROP_FILL_CRITERION:
+      options->fill_criterion = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_bucket_fill_options_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FILL_MODE:
+      g_value_set_enum (value, options->fill_mode);
+      break;
+    case PROP_FILL_AREA:
+      g_value_set_enum (value, options->fill_area);
+      break;
+    case PROP_FILL_TRANSPARENT:
+      g_value_set_boolean (value, options->fill_transparent);
+      break;
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+    case PROP_DIAGONAL_NEIGHBORS:
+      g_value_set_boolean (value, options->diagonal_neighbors);
+      break;
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, options->antialias);
+      break;
+    case PROP_FEATHER:
+      g_value_set_boolean (value, options->feather);
+      break;
+    case PROP_FEATHER_RADIUS:
+      g_value_set_double (value, options->feather_radius);
+      break;
+    case PROP_THRESHOLD:
+      g_value_set_double (value, options->threshold);
+      break;
+    case PROP_LINE_ART_SOURCE:
+      g_value_set_enum (value, options->line_art_source);
+      break;
+    case PROP_LINE_ART_THRESHOLD:
+      g_value_set_double (value, options->line_art_threshold);
+      break;
+    case PROP_LINE_ART_MAX_GROW:
+      g_value_set_int (value, options->line_art_max_grow);
+      break;
+    case PROP_LINE_ART_MAX_GAP_LENGTH:
+      g_value_set_int (value, options->line_art_max_gap_length);
+      break;
+    case PROP_FILL_CRITERION:
+      g_value_set_enum (value, options->fill_criterion);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_bucket_fill_options_reset (GimpConfig *config)
+{
+  GimpToolOptions *tool_options = GIMP_TOOL_OPTIONS (config);
+  GParamSpec      *pspec;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        "threshold");
+
+  if (pspec)
+    G_PARAM_SPEC_DOUBLE (pspec)->default_value =
+      tool_options->tool_info->gimp->config->default_threshold;
+
+  parent_config_iface->reset (config);
+}
+
+static void
+gimp_bucket_fill_options_update_area (GimpBucketFillOptions *options)
+{
+  /* GUI not created yet. */
+  if (! options->priv->threshold_scale)
+    return;
+
+  switch (options->fill_area)
+    {
+    case GIMP_BUCKET_FILL_LINE_ART:
+      gtk_widget_hide (options->priv->similar_color_frame);
+      gtk_widget_show (options->priv->line_art_frame);
+      break;
+    case GIMP_BUCKET_FILL_SIMILAR_COLORS:
+      gtk_widget_show (options->priv->similar_color_frame);
+      gtk_widget_hide (options->priv->line_art_frame);
+      break;
+    default:
+      gtk_widget_hide (options->priv->similar_color_frame);
+      gtk_widget_hide (options->priv->line_art_frame);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_OPTIONS (tool_options);
+  GObject               *config = G_OBJECT (tool_options);
+  GtkWidget             *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget             *box2;
+  GtkWidget             *frame;
+  GtkWidget             *hbox;
+  GtkWidget             *widget;
+  GtkWidget             *scale;
+  GtkWidget             *combo;
+  gchar                 *str;
+  gboolean               bold;
+  GdkModifierType        extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType        toggle_mask = GDK_MOD1_MASK;
+
+  /*  fill type  */
+  str = g_strdup_printf (_("Fill Type  (%s)"),
+                         gimp_get_mod_string (toggle_mask)),
+  frame = gimp_prop_enum_radio_frame_new (config, "fill-mode", str, 0, 0);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gimp_prop_pattern_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                    NULL, 2,
+                                    "pattern-view-type", "pattern-view-size");
+  gimp_enum_radio_frame_add (GTK_FRAME (frame), hbox,
+                             GIMP_BUCKET_FILL_PATTERN, TRUE);
+
+  /*  fill selection  */
+  str = g_strdup_printf (_("Affected Area  (%s)"),
+                         gimp_get_mod_string (extend_mask));
+  frame = gimp_prop_enum_radio_frame_new (config, "fill-area", str, 0, 0);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /* Similar color frame */
+  frame = gimp_frame_new (_("Finding Similar Colors"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  options->priv->similar_color_frame = frame;
+  gtk_widget_show (frame);
+
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box2);
+  gtk_widget_show (box2);
+
+  /*  the fill transparent areas toggle  */
+  widget = gimp_prop_check_button_new (config, "fill-transparent", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  the sample merged toggle  */
+  widget = gimp_prop_check_button_new (config, "sample-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  the diagonal neighbors toggle  */
+  widget = gimp_prop_check_button_new (config, "diagonal-neighbors", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  options->priv->diagonal_neighbors_checkbox = widget;
+  gtk_widget_show (widget);
+
+  /*  the antialias toggle  */
+  widget = gimp_prop_check_button_new (config, "antialias", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  the threshold scale  */
+  scale = gimp_prop_spin_scale_new (config, "threshold", NULL,
+                                    1.0, 16.0, 1);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  options->priv->threshold_scale = scale;
+  gtk_widget_show (scale);
+
+  /*  the fill criterion combo  */
+  combo = gimp_prop_enum_combo_box_new (config, "fill-criterion", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fill by"));
+  gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  /* Line art frame */
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  options->priv->line_art_frame = frame;
+  gtk_widget_show (frame);
+
+  /* Line art: label widget */
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), box2);
+  gtk_widget_show (box2);
+
+  widget = gtk_label_new (_("Line Art Detection"));
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_style_get (GTK_WIDGET (frame),
+                        "label-bold", &bold,
+                        NULL);
+  gimp_label_set_attributes (GTK_LABEL (widget),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_widget_show (widget);
+
+  options->line_art_busy_box = gimp_busy_box_new (_("(computing...)"));
+  gtk_box_pack_start (GTK_BOX (box2), options->line_art_busy_box,
+                      FALSE, FALSE, 0);
+
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box2);
+  gtk_widget_show (box2);
+
+  /*  Line Art: source combo (replace sample merged!) */
+  combo = gimp_prop_enum_combo_box_new (config, "line-art-source", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source"));
+  gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  /*  the fill transparent areas toggle  */
+  widget = gimp_prop_check_button_new (config, "fill-transparent", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  Line Art: feather radius scale  */
+  scale = gimp_prop_spin_scale_new (config, "feather-radius", NULL,
+                                    1.0, 10.0, 1);
+
+  frame = gimp_prop_expanding_frame_new (config, "feather", NULL,
+                                         scale, NULL);
+  gtk_box_pack_start (GTK_BOX (box2), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  Line Art: max growing size */
+  scale = gimp_prop_spin_scale_new (config, "line-art-max-grow", NULL,
+                                    1, 5, 0);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  Line Art: stroke threshold */
+  scale = gimp_prop_spin_scale_new (config, "line-art-threshold", NULL,
+                                    0.05, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  Line Art: max gap length */
+  scale = gimp_prop_spin_scale_new (config, "line-art-max-gap-length", NULL,
+                                    1, 5, 0);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  gimp_bucket_fill_options_update_area (options);
+
+  return vbox;
+}
diff --git a/app/tools/gimpbucketfilloptions.h b/app/tools/gimpbucketfilloptions.h
new file mode 100644
index 0000000..8c001fb
--- /dev/null
+++ b/app/tools/gimpbucketfilloptions.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_BUCKET_FILL_OPTIONS_H__
+#define  __GIMP_BUCKET_FILL_OPTIONS_H__
+
+
+#include "paint/gimppaintoptions.h"
+
+
+#define GIMP_TYPE_BUCKET_FILL_OPTIONS            (gimp_bucket_fill_options_get_type ())
+#define GIMP_BUCKET_FILL_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BUCKET_FILL_OPTIONS, GimpBucketFillOptions))
+#define GIMP_BUCKET_FILL_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUCKET_FILL_OPTIONS, GimpBucketFillOptionsClass))
+#define GIMP_IS_BUCKET_FILL_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BUCKET_FILL_OPTIONS))
+#define GIMP_IS_BUCKET_FILL_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUCKET_FILL_OPTIONS))
+#define GIMP_BUCKET_FILL_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BUCKET_FILL_OPTIONS, GimpBucketFillOptionsClass))
+
+
+typedef struct _GimpBucketFillOptions        GimpBucketFillOptions;
+typedef struct _GimpBucketFillOptionsPrivate GimpBucketFillOptionsPrivate;
+typedef struct _GimpPaintOptionsClass        GimpBucketFillOptionsClass;
+
+struct _GimpBucketFillOptions
+{
+  GimpPaintOptions              paint_options;
+
+  GimpBucketFillMode            fill_mode;
+  GimpBucketFillArea            fill_area;
+  gboolean                      fill_transparent;
+  gboolean                      sample_merged;
+  gboolean                      diagonal_neighbors;
+  gboolean                      antialias;
+  gboolean                      feather;
+  gdouble                       feather_radius;
+  gdouble                       threshold;
+
+  GtkWidget                    *line_art_busy_box;
+  GimpLineArtSource             line_art_source;
+  gdouble                       line_art_threshold;
+  gint                          line_art_max_grow;
+  gint                          line_art_max_gap_length;
+
+  GimpSelectCriterion           fill_criterion;
+
+  GimpBucketFillOptionsPrivate *priv;
+};
+
+
+GType       gimp_bucket_fill_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_bucket_fill_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_BUCKET_FILL_OPTIONS_H__  */
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
new file mode 100644
index 0000000..6197f87
--- /dev/null
+++ b/app/tools/gimpbucketfilltool.c
@@ -0,0 +1,1052 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpasync.h"
+#include "core/gimpcancelable.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawable-bucket-fill.h"
+#include "core/gimpdrawable-edit.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimperror.h"
+#include "core/gimpfilloptions.h"
+#include "core/gimpimage.h"
+#include "core/gimpimageproxy.h"
+#include "core/gimpitem.h"
+#include "core/gimplineart.h"
+#include "core/gimppickable.h"
+#include "core/gimppickable-contiguous-region.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpwaitable.h"
+
+#include "gegl/gimp-gegl-nodes.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "gimpbucketfilloptions.h"
+#include "gimpbucketfilltool.h"
+#include "gimpcoloroptions.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpBucketFillToolPrivate
+{
+  GimpLineArt        *line_art;
+  GimpImage          *line_art_image;
+  GimpDisplayShell   *line_art_shell;
+
+  /* For preview */
+  GeglNode           *graph;
+  GeglNode           *fill_node;
+  GeglNode           *offset_node;
+
+  GeglBuffer         *fill_mask;
+
+  GimpDrawableFilter *filter;
+
+  /* Temp property save */
+  GimpBucketFillMode  fill_mode;
+  GimpBucketFillArea  fill_area;
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_bucket_fill_tool_constructed      (GObject               *object);
+static void     gimp_bucket_fill_tool_finalize         (GObject               *object);
+
+static void     gimp_bucket_fill_tool_button_press     (GimpTool              *tool,
+                                                        const GimpCoords      *coords,
+                                                        guint32                time,
+                                                        GdkModifierType        state,
+                                                        GimpButtonPressType    press_type,
+                                                        GimpDisplay           *display);
+static void     gimp_bucket_fill_tool_motion           (GimpTool              *tool,
+                                                        const GimpCoords      *coords,
+                                                        guint32                time,
+                                                        GdkModifierType        state,
+                                                        GimpDisplay           *display);
+static void     gimp_bucket_fill_tool_button_release   (GimpTool              *tool,
+                                                        const GimpCoords      *coords,
+                                                        guint32                time,
+                                                        GdkModifierType        state,
+                                                        GimpButtonReleaseType  release_type,
+                                                        GimpDisplay           *display);
+static void     gimp_bucket_fill_tool_modifier_key     (GimpTool              *tool,
+                                                        GdkModifierType        key,
+                                                        gboolean               press,
+                                                        GdkModifierType        state,
+                                                        GimpDisplay           *display);
+static void     gimp_bucket_fill_tool_cursor_update    (GimpTool              *tool,
+                                                        const GimpCoords      *coords,
+                                                        GdkModifierType        state,
+                                                        GimpDisplay           *display);
+static void     gimp_bucket_fill_tool_options_notify   (GimpTool              *tool,
+                                                        GimpToolOptions       *options,
+                                                        const GParamSpec      *pspec);
+
+static void gimp_bucket_fill_tool_line_art_computing_start (GimpBucketFillTool *tool);
+static void gimp_bucket_fill_tool_line_art_computing_end   (GimpBucketFillTool *tool);
+
+static gboolean gimp_bucket_fill_tool_coords_in_active_pickable
+                                                       (GimpBucketFillTool    *tool,
+                                                        GimpDisplay           *display,
+                                                        const GimpCoords      *coords);
+
+static void     gimp_bucket_fill_tool_start            (GimpBucketFillTool    *tool,
+                                                        const GimpCoords      *coords,
+                                                        GimpDisplay           *display);
+static void     gimp_bucket_fill_tool_preview          (GimpBucketFillTool    *tool,
+                                                        const GimpCoords      *coords,
+                                                        GimpDisplay           *display,
+                                                        GimpFillOptions       *fill_options);
+static void     gimp_bucket_fill_tool_commit           (GimpBucketFillTool    *tool);
+static void     gimp_bucket_fill_tool_halt             (GimpBucketFillTool    *tool);
+static void     gimp_bucket_fill_tool_filter_flush     (GimpDrawableFilter    *filter,
+                                                        GimpTool              *tool);
+static void     gimp_bucket_fill_tool_create_graph     (GimpBucketFillTool    *tool);
+
+static void     gimp_bucket_fill_tool_reset_line_art   (GimpBucketFillTool    *tool);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpBucketFillTool, gimp_bucket_fill_tool,
+                            GIMP_TYPE_COLOR_TOOL)
+
+#define parent_class gimp_bucket_fill_tool_parent_class
+
+
+void
+gimp_bucket_fill_tool_register (GimpToolRegisterCallback  callback,
+                                gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_BUCKET_FILL_TOOL,
+                GIMP_TYPE_BUCKET_FILL_OPTIONS,
+                gimp_bucket_fill_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                GIMP_CONTEXT_PROP_MASK_OPACITY    |
+                GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
+                GIMP_CONTEXT_PROP_MASK_PATTERN,
+                "gimp-bucket-fill-tool",
+                _("Bucket Fill"),
+                _("Bucket Fill Tool: Fill selected area with a color or pattern"),
+                N_("_Bucket Fill"), "<shift>B",
+                NULL, GIMP_HELP_TOOL_BUCKET_FILL,
+                GIMP_ICON_TOOL_BUCKET_FILL,
+                data);
+}
+
+static void
+gimp_bucket_fill_tool_class_init (GimpBucketFillToolClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass *tool_class   = GIMP_TOOL_CLASS (klass);
+
+  object_class->constructed  = gimp_bucket_fill_tool_constructed;
+  object_class->finalize     = gimp_bucket_fill_tool_finalize;
+
+  tool_class->button_press   = gimp_bucket_fill_tool_button_press;
+  tool_class->motion         = gimp_bucket_fill_tool_motion;
+  tool_class->button_release = gimp_bucket_fill_tool_button_release;
+  tool_class->modifier_key   = gimp_bucket_fill_tool_modifier_key;
+  tool_class->cursor_update  = gimp_bucket_fill_tool_cursor_update;
+  tool_class->options_notify = gimp_bucket_fill_tool_options_notify;
+}
+
+static void
+gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
+{
+  GimpTool *tool = GIMP_TOOL (bucket_fill_tool);
+
+  gimp_tool_control_set_scroll_lock     (tool->control, TRUE);
+  gimp_tool_control_set_wants_click     (tool->control, TRUE);
+  gimp_tool_control_set_tool_cursor     (tool->control,
+                                         GIMP_TOOL_CURSOR_BUCKET_FILL);
+  gimp_tool_control_set_action_opacity  (tool->control,
+                                         "context/context-opacity-set");
+  gimp_tool_control_set_action_object_1 (tool->control,
+                                         "context/context-pattern-select-set");
+
+  bucket_fill_tool->priv =
+    gimp_bucket_fill_tool_get_instance_private (bucket_fill_tool);
+}
+
+static void
+gimp_bucket_fill_tool_constructed (GObject *object)
+{
+  GimpTool              *tool        = GIMP_TOOL (object);
+  GimpBucketFillTool    *bucket_tool = GIMP_BUCKET_FILL_TOOL (object);
+  GimpBucketFillOptions *options     = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  Gimp                  *gimp        = GIMP_CONTEXT (options)->gimp;
+  GimpContext           *context     = gimp_get_user_context (gimp);
+  GimpLineArt           *line_art;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_tool_control_set_motion_mode (tool->control,
+                                     options->fill_area == GIMP_BUCKET_FILL_LINE_ART ?
+                                     GIMP_MOTION_MODE_EXACT : GIMP_MOTION_MODE_COMPRESS);
+
+  line_art = gimp_line_art_new ();
+  g_object_bind_property (options,  "fill-transparent",
+                          line_art, "select-transparent",
+                          G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+  g_object_bind_property (options,  "line-art-threshold",
+                          line_art, "threshold",
+                          G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+  g_object_bind_property (options,  "line-art-max-grow",
+                          line_art, "max-grow",
+                          G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+  g_object_bind_property (options,  "line-art-max-gap-length",
+                          line_art, "spline-max-length",
+                          G_BINDING_SYNC_CREATE | G_BINDING_DEFAULT);
+  g_object_bind_property (options,  "line-art-max-gap-length",
+                          line_art, "segment-max-length",
+                          G_BINDING_SYNC_CREATE | G_BINDING_DEFAULT);
+  g_signal_connect_swapped (line_art, "computing-start",
+                            G_CALLBACK (gimp_bucket_fill_tool_line_art_computing_start),
+                            tool);
+  g_signal_connect_swapped (line_art, "computing-end",
+                            G_CALLBACK (gimp_bucket_fill_tool_line_art_computing_end),
+                            tool);
+  gimp_line_art_bind_gap_length (line_art, TRUE);
+  bucket_tool->priv->line_art = line_art;
+
+  gimp_bucket_fill_tool_reset_line_art (bucket_tool);
+
+  g_signal_connect_swapped (options, "notify::line-art-source",
+                            G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                            tool);
+  g_signal_connect_swapped (context, "display-changed",
+                            G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                            tool);
+
+  GIMP_COLOR_TOOL (tool)->pick_target =
+    (options->fill_mode == GIMP_BUCKET_FILL_BG) ?
+    GIMP_COLOR_PICK_TARGET_BACKGROUND : GIMP_COLOR_PICK_TARGET_FOREGROUND;
+}
+
+static void
+gimp_bucket_fill_tool_finalize (GObject *object)
+{
+  GimpBucketFillTool    *tool     = GIMP_BUCKET_FILL_TOOL (object);
+  GimpBucketFillOptions *options  = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  Gimp                  *gimp     = GIMP_CONTEXT (options)->gimp;
+  GimpContext           *context  = gimp_get_user_context (gimp);
+
+  if (tool->priv->line_art_image)
+    {
+      g_signal_handlers_disconnect_by_data (gimp_image_get_layers (tool->priv->line_art_image), tool);
+      g_signal_handlers_disconnect_by_data (tool->priv->line_art_image, tool);
+      tool->priv->line_art_image = NULL;
+    }
+  if (tool->priv->line_art_shell)
+    {
+      g_signal_handlers_disconnect_by_func (
+        tool->priv->line_art_shell,
+        gimp_bucket_fill_tool_reset_line_art,
+        tool);
+      tool->priv->line_art_shell = NULL;
+    }
+  g_clear_object (&tool->priv->line_art);
+
+  g_signal_handlers_disconnect_by_data (options, tool);
+  g_signal_handlers_disconnect_by_data (context, tool);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_bucket_fill_tool_coords_in_active_pickable (GimpBucketFillTool *tool,
+                                                 GimpDisplay        *display,
+                                                 const GimpCoords   *coords)
+{
+  GimpBucketFillOptions *options       = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell      *shell         = gimp_display_get_shell (display);
+  GimpImage             *image         = gimp_display_get_image (display);
+  gboolean               sample_merged = FALSE;
+
+  switch (options->fill_area)
+    {
+    case GIMP_BUCKET_FILL_SELECTION:
+      break;
+
+    case GIMP_BUCKET_FILL_SIMILAR_COLORS:
+      sample_merged = options->sample_merged;
+      break;
+
+    case GIMP_BUCKET_FILL_LINE_ART:
+      sample_merged = options->line_art_source ==
+                      GIMP_LINE_ART_SOURCE_SAMPLE_MERGED;
+      break;
+    }
+
+  return gimp_image_coords_in_active_pickable (image, coords,
+                                               shell->show_all, sample_merged,
+                                               TRUE);
+}
+
+static void
+gimp_bucket_fill_tool_start (GimpBucketFillTool *tool,
+                             const GimpCoords   *coords,
+                             GimpDisplay        *display)
+{
+  GimpBucketFillOptions *options  = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpContext           *context  = GIMP_CONTEXT (options);
+  GimpImage             *image    = gimp_display_get_image (display);
+  GimpDrawable          *drawable = gimp_image_get_active_drawable (image);
+
+  g_return_if_fail (! tool->priv->filter);
+
+  gimp_line_art_freeze (tool->priv->line_art);
+
+  GIMP_TOOL (tool)->display  = display;
+  GIMP_TOOL (tool)->drawable = drawable;
+
+  gimp_bucket_fill_tool_create_graph (tool);
+
+  tool->priv->filter = gimp_drawable_filter_new (drawable, _("Bucket fill"),
+                                                 tool->priv->graph,
+                                                 GIMP_ICON_TOOL_BUCKET_FILL);
+
+  gimp_drawable_filter_set_region (tool->priv->filter,
+                                   GIMP_FILTER_REGION_DRAWABLE);
+
+  /* We only set these here, and don't need to update it since we assume
+   * the settings can't change while the fill started.
+   */
+  gimp_drawable_filter_set_mode (tool->priv->filter,
+                                 gimp_context_get_paint_mode (context),
+                                 GIMP_LAYER_COLOR_SPACE_AUTO,
+                                 GIMP_LAYER_COLOR_SPACE_AUTO,
+                                 gimp_layer_mode_get_paint_composite_mode (gimp_context_get_paint_mode (context)));
+  gimp_drawable_filter_set_opacity (tool->priv->filter,
+                                    gimp_context_get_opacity (context));
+
+  g_signal_connect (tool->priv->filter, "flush",
+                    G_CALLBACK (gimp_bucket_fill_tool_filter_flush),
+                    tool);
+}
+
+static void
+gimp_bucket_fill_tool_preview (GimpBucketFillTool *tool,
+                               const GimpCoords   *coords,
+                               GimpDisplay        *display,
+                               GimpFillOptions    *fill_options)
+{
+  GimpBucketFillOptions *options  = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell      *shell    = gimp_display_get_shell (display);
+  GimpImage             *image    = gimp_display_get_image (display);
+  GimpDrawable          *drawable = gimp_image_get_active_drawable (image);
+
+  if (tool->priv->filter)
+    {
+      GeglBuffer *fill     = NULL;
+      gdouble     x        = coords->x;
+      gdouble     y        = coords->y;
+
+      if (options->fill_area == GIMP_BUCKET_FILL_SIMILAR_COLORS)
+        {
+          if (! options->sample_merged)
+            {
+              gint off_x, off_y;
+
+              gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+              x -= (gdouble) off_x;
+              y -= (gdouble) off_y;
+            }
+          fill = gimp_drawable_get_bucket_fill_buffer (drawable,
+                                                       fill_options,
+                                                       options->fill_transparent,
+                                                       options->fill_criterion,
+                                                       options->threshold / 255.0,
+                                                       shell->show_all,
+                                                       options->sample_merged,
+                                                       options->diagonal_neighbors,
+                                                       x, y,
+                                                       &tool->priv->fill_mask,
+                                                       &x, &y, NULL, NULL);
+        }
+      else
+        {
+          gint source_off_x = 0;
+          gint source_off_y = 0;
+
+          if (options->line_art_source != GIMP_LINE_ART_SOURCE_SAMPLE_MERGED)
+            {
+              GimpPickable *input;
+
+              input = gimp_line_art_get_input (tool->priv->line_art);
+              g_return_if_fail (GIMP_IS_ITEM (input));
+
+              gimp_item_get_offset (GIMP_ITEM (input), &source_off_x, &source_off_y);
+
+              x -= (gdouble) source_off_x;
+              y -= (gdouble) source_off_y;
+            }
+          fill = gimp_drawable_get_line_art_fill_buffer (drawable,
+                                                         tool->priv->line_art,
+                                                         fill_options,
+                                                         options->line_art_source ==
+                                                         GIMP_LINE_ART_SOURCE_SAMPLE_MERGED,
+                                                         x, y,
+                                                         &tool->priv->fill_mask,
+                                                         &x, &y, NULL, NULL);
+          if (options->line_art_source != GIMP_LINE_ART_SOURCE_SAMPLE_MERGED)
+            {
+              gint off_x, off_y;
+
+              gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+              x -= (gdouble) off_x - (gdouble) source_off_x;
+              y -= (gdouble) off_y - (gdouble) source_off_y;
+            }
+        }
+      if (fill)
+        {
+          gegl_node_set (tool->priv->fill_node,
+                         "buffer", fill,
+                         NULL);
+          gegl_node_set (tool->priv->offset_node,
+                         "x", x,
+                         "y", y,
+                         NULL);
+          gimp_drawable_filter_apply (tool->priv->filter, NULL);
+          g_object_unref (fill);
+        }
+    }
+}
+
+static void
+gimp_bucket_fill_tool_commit (GimpBucketFillTool *tool)
+{
+  if (tool->priv->filter)
+    {
+      gimp_drawable_filter_commit (tool->priv->filter,
+                                   GIMP_PROGRESS (tool), FALSE);
+      gimp_image_flush (gimp_display_get_image (GIMP_TOOL (tool)->display));
+    }
+}
+
+static void
+gimp_bucket_fill_tool_halt (GimpBucketFillTool *tool)
+{
+  if (tool->priv->graph)
+    {
+      g_clear_object (&tool->priv->graph);
+      tool->priv->fill_node   = NULL;
+      tool->priv->offset_node = NULL;
+    }
+
+  if (tool->priv->filter)
+    {
+      gimp_drawable_filter_abort (tool->priv->filter);
+      g_clear_object (&tool->priv->filter);
+    }
+
+  g_clear_object (&tool->priv->fill_mask);
+
+  if (gimp_line_art_is_frozen (tool->priv->line_art))
+    gimp_line_art_thaw (tool->priv->line_art);
+
+  GIMP_TOOL (tool)->display  = NULL;
+  GIMP_TOOL (tool)->drawable = NULL;
+}
+
+static void
+gimp_bucket_fill_tool_filter_flush (GimpDrawableFilter *filter,
+                                    GimpTool           *tool)
+{
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+static void
+gimp_bucket_fill_tool_create_graph (GimpBucketFillTool *tool)
+{
+  GeglNode *graph;
+  GeglNode *output;
+  GeglNode *fill_node;
+  GeglNode *offset_node;
+
+  g_return_if_fail (! tool->priv->graph     &&
+                    ! tool->priv->fill_node &&
+                    ! tool->priv->offset_node);
+
+  graph = gegl_node_new ();
+
+  fill_node = gegl_node_new_child (graph,
+                                   "operation", "gegl:buffer-source",
+                                   NULL);
+  offset_node = gegl_node_new_child (graph,
+                                     "operation", "gegl:translate",
+                                     NULL);
+  output = gegl_node_get_output_proxy (graph, "output");
+  gegl_node_link_many (fill_node, offset_node, output, NULL);
+
+  tool->priv->graph       = graph;
+  tool->priv->fill_node   = fill_node;
+  tool->priv->offset_node = offset_node;
+}
+
+static void
+gimp_bucket_fill_tool_button_press (GimpTool            *tool,
+                                    const GimpCoords    *coords,
+                                    guint32              time,
+                                    GdkModifierType      state,
+                                    GimpButtonPressType  press_type,
+                                    GimpDisplay         *display)
+{
+  GimpBucketFillTool    *bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
+  GimpBucketFillOptions *options     = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpGuiConfig         *config      = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage             *image       = gimp_display_get_image (display);
+  GimpDrawable          *drawable    = gimp_image_get_active_drawable (image);
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+      return;
+    }
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("Cannot modify the pixels of layer groups."));
+      return;
+    }
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("The active layer is not visible."));
+      return;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("The active layer's pixels are locked."));
+      gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+      return;
+    }
+
+  if (options->fill_area == GIMP_BUCKET_FILL_LINE_ART &&
+      ! gimp_line_art_get_input (bucket_tool->priv->line_art))
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("No valid line art source selected."));
+      return;
+    }
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL &&
+      gimp_bucket_fill_tool_coords_in_active_pickable (bucket_tool,
+                                                       display, coords))
+    {
+      GimpContext     *context  = GIMP_CONTEXT (options);
+      GimpFillOptions *fill_options;
+      GError          *error = NULL;
+
+      fill_options = gimp_fill_options_new (image->gimp, NULL, FALSE);
+
+      if (gimp_fill_options_set_by_fill_mode (fill_options, context,
+                                              options->fill_mode,
+                                              &error))
+        {
+          gimp_fill_options_set_antialias (fill_options, options->antialias);
+          gimp_fill_options_set_feather (fill_options, options->feather,
+                                         options->feather_radius);
+
+          gimp_context_set_opacity (GIMP_CONTEXT (fill_options),
+                                    gimp_context_get_opacity (context));
+          gimp_context_set_paint_mode (GIMP_CONTEXT (fill_options),
+                                       gimp_context_get_paint_mode (context));
+
+          if (options->fill_area == GIMP_BUCKET_FILL_SELECTION)
+            {
+              gimp_drawable_edit_fill (drawable, fill_options, NULL);
+              gimp_image_flush (image);
+            }
+          else /* GIMP_BUCKET_FILL_SIMILAR_COLORS || GIMP_BUCKET_FILL_LINE_ART */
+            {
+              gimp_bucket_fill_tool_start (bucket_tool, coords, display);
+              gimp_bucket_fill_tool_preview (bucket_tool, coords, display,
+                                             fill_options);
+            }
+        }
+      else
+        {
+          gimp_message_literal (display->gimp, G_OBJECT (display),
+                                GIMP_MESSAGE_WARNING, error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (fill_options);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                press_type, display);
+}
+
+static void
+gimp_bucket_fill_tool_motion (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              guint32           time,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpBucketFillTool    *bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
+  GimpBucketFillOptions *options     = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpImage             *image       = gimp_display_get_image (display);
+
+  GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, display);
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    return;
+
+  if (gimp_bucket_fill_tool_coords_in_active_pickable (bucket_tool,
+                                                       display, coords) &&
+      /* Fill selection only needs to happen once. */
+      options->fill_area != GIMP_BUCKET_FILL_SELECTION)
+    {
+      GimpContext     *context  = GIMP_CONTEXT (options);
+      GimpFillOptions *fill_options;
+      GError          *error = NULL;
+
+      fill_options = gimp_fill_options_new (image->gimp, NULL, FALSE);
+
+      if (gimp_fill_options_set_by_fill_mode (fill_options, context,
+                                              options->fill_mode,
+                                              &error))
+        {
+          gimp_fill_options_set_antialias (fill_options, options->antialias);
+          gimp_fill_options_set_feather (fill_options, options->feather,
+                                         options->feather_radius);
+
+          gimp_context_set_opacity (GIMP_CONTEXT (fill_options),
+                                    gimp_context_get_opacity (context));
+          gimp_context_set_paint_mode (GIMP_CONTEXT (fill_options),
+                                       gimp_context_get_paint_mode (context));
+
+          gimp_bucket_fill_tool_preview (bucket_tool, coords, display,
+                                         fill_options);
+        }
+      else
+        {
+          gimp_message_literal (display->gimp, G_OBJECT (display),
+                                GIMP_MESSAGE_WARNING, error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (fill_options);
+    }
+}
+
+static void
+gimp_bucket_fill_tool_button_release (GimpTool              *tool,
+                                      const GimpCoords      *coords,
+                                      guint32                time,
+                                      GdkModifierType        state,
+                                      GimpButtonReleaseType  release_type,
+                                      GimpDisplay           *display)
+{
+  GimpBucketFillTool    *bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time,
+                                                      state, release_type,
+                                                      display);
+      return;
+    }
+
+  if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
+    gimp_bucket_fill_tool_commit (bucket_tool);
+
+  if (options->fill_area != GIMP_BUCKET_FILL_SELECTION)
+    gimp_bucket_fill_tool_halt (bucket_tool);
+
+  GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                  release_type, display);
+}
+
+static void
+gimp_bucket_fill_tool_modifier_key (GimpTool        *tool,
+                                    GdkModifierType  key,
+                                    gboolean         press,
+                                    GdkModifierType  state,
+                                    GimpDisplay     *display)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+
+  if (key == GDK_MOD1_MASK)
+    {
+      if (press)
+        {
+          GIMP_BUCKET_FILL_TOOL (tool)->priv->fill_mode = options->fill_mode;
+
+          switch (options->fill_mode)
+            {
+            case GIMP_BUCKET_FILL_FG:
+              g_object_set (options, "fill-mode", GIMP_BUCKET_FILL_BG, NULL);
+              break;
+
+            default:
+              /* GIMP_BUCKET_FILL_BG || GIMP_BUCKET_FILL_PATTERN */
+              g_object_set (options, "fill-mode", GIMP_BUCKET_FILL_FG, NULL);
+              break;
+
+              break;
+            }
+        }
+      else /* release */
+        {
+          g_object_set (options, "fill-mode",
+                        GIMP_BUCKET_FILL_TOOL (tool)->priv->fill_mode,
+                        NULL);
+        }
+    }
+  else if (key == gimp_get_toggle_behavior_mask ())
+    {
+      GimpToolInfo *info = gimp_get_tool_info (display->gimp,
+                                               "gimp-color-picker-tool");
+
+      if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+        {
+          switch (GIMP_COLOR_TOOL (tool)->pick_target)
+            {
+            case GIMP_COLOR_PICK_TARGET_BACKGROUND:
+              gimp_tool_push_status (tool, display,
+                                     _("Click in any image to pick the "
+                                       "background color"));
+              break;
+
+            case GIMP_COLOR_PICK_TARGET_FOREGROUND:
+            default:
+              gimp_tool_push_status (tool, display,
+                                     _("Click in any image to pick the "
+                                       "foreground color"));
+              break;
+            }
+
+          GIMP_TOOL (tool)->display = display;
+          gimp_color_tool_enable (GIMP_COLOR_TOOL (tool),
+                                  GIMP_COLOR_OPTIONS (info->tool_options));
+        }
+      else
+        {
+          gimp_tool_pop_status (tool, display);
+          gimp_color_tool_disable (GIMP_COLOR_TOOL (tool));
+          GIMP_TOOL (tool)->display = NULL;
+        }
+    }
+  else if (key == gimp_get_extend_selection_mask ())
+    {
+      if (press)
+        {
+          GIMP_BUCKET_FILL_TOOL (tool)->priv->fill_area = options->fill_area;
+
+          switch (options->fill_area)
+            {
+            case GIMP_BUCKET_FILL_SIMILAR_COLORS:
+              g_object_set (options,
+                            "fill-area", GIMP_BUCKET_FILL_SELECTION,
+                            NULL);
+              break;
+
+            default:
+              /* GIMP_BUCKET_FILL_SELECTION || GIMP_BUCKET_FILL_LINE_ART */
+              g_object_set (options,
+                            "fill-area", GIMP_BUCKET_FILL_SIMILAR_COLORS,
+                            NULL);
+              break;
+            }
+        }
+      else /* release */
+        {
+          g_object_set (options, "fill-area",
+                        GIMP_BUCKET_FILL_TOOL (tool)->priv->fill_area,
+                        NULL);
+        }
+    }
+}
+
+static void
+gimp_bucket_fill_tool_cursor_update (GimpTool         *tool,
+                                     const GimpCoords *coords,
+                                     GdkModifierType   state,
+                                     GimpDisplay      *display)
+{
+  GimpBucketFillTool    *bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
+  GimpBucketFillOptions *options     = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpGuiConfig         *config      = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpCursorModifier     modifier    = GIMP_CURSOR_MODIFIER_BAD;
+  GimpImage             *image       = gimp_display_get_image (display);
+
+  if (gimp_bucket_fill_tool_coords_in_active_pickable (bucket_tool,
+                                                       display, coords))
+    {
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+      if (! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
+          ! gimp_item_is_content_locked (GIMP_ITEM (drawable))    &&
+          (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+           config->edit_non_visible))
+        {
+          switch (options->fill_mode)
+            {
+            case GIMP_BUCKET_FILL_FG:
+              modifier = GIMP_CURSOR_MODIFIER_FOREGROUND;
+              break;
+
+            case GIMP_BUCKET_FILL_BG:
+              modifier = GIMP_CURSOR_MODIFIER_BACKGROUND;
+              break;
+
+            case GIMP_BUCKET_FILL_PATTERN:
+              modifier = GIMP_CURSOR_MODIFIER_PATTERN;
+              break;
+            }
+        }
+    }
+
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_bucket_fill_tool_options_notify (GimpTool         *tool,
+                                      GimpToolOptions  *options,
+                                      const GParamSpec *pspec)
+{
+  GimpBucketFillTool    *bucket_tool    = GIMP_BUCKET_FILL_TOOL (tool);
+  GimpBucketFillOptions *bucket_options = GIMP_BUCKET_FILL_OPTIONS (options);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! strcmp (pspec->name, "fill-area"))
+    {
+      /* We want more motion events when the tool is used in a paint tool
+       * fashion. Unfortunately we only set exact mode in line art fill,
+       * because we can't as easily remove events from the similar color
+       * mode just because a point has already been selected  (unless
+       * threshold were 0, but that's an edge case).
+       */
+      gimp_tool_control_set_motion_mode (tool->control,
+                                         bucket_options->fill_area == GIMP_BUCKET_FILL_LINE_ART ?
+                                         GIMP_MOTION_MODE_EXACT : GIMP_MOTION_MODE_COMPRESS);
+
+      gimp_bucket_fill_tool_reset_line_art (bucket_tool);
+    }
+  else if (! strcmp (pspec->name, "fill-mode"))
+    {
+      if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+        gimp_tool_pop_status (tool, tool->display);
+
+      switch (bucket_options->fill_mode)
+        {
+        case GIMP_BUCKET_FILL_BG:
+          GIMP_COLOR_TOOL (tool)->pick_target = GIMP_COLOR_PICK_TARGET_BACKGROUND;
+          if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+            gimp_tool_push_status (tool, tool->display,
+                                   _("Click in any image to pick the "
+                                     "background color"));
+          break;
+
+        case GIMP_BUCKET_FILL_FG:
+        default:
+          GIMP_COLOR_TOOL (tool)->pick_target = GIMP_COLOR_PICK_TARGET_FOREGROUND;
+          if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+            gimp_tool_push_status (tool, tool->display,
+                                   _("Click in any image to pick the "
+                                     "foreground color"));
+          break;
+        }
+    }
+}
+
+static void
+gimp_bucket_fill_tool_line_art_computing_start (GimpBucketFillTool *tool)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+
+  gtk_widget_show (options->line_art_busy_box);
+}
+
+static void
+gimp_bucket_fill_tool_line_art_computing_end (GimpBucketFillTool *tool)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+
+  gtk_widget_hide (options->line_art_busy_box);
+}
+
+static void
+gimp_bucket_fill_tool_reset_line_art (GimpBucketFillTool *tool)
+{
+  GimpBucketFillOptions *options  = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
+  GimpLineArt           *line_art = tool->priv->line_art;
+  GimpDisplayShell      *shell    = NULL;
+  GimpImage             *image    = NULL;
+
+  if (options->fill_area == GIMP_BUCKET_FILL_LINE_ART)
+    {
+      GimpContext *context;
+      GimpDisplay *display;
+
+      context = gimp_get_user_context (GIMP_CONTEXT (options)->gimp);
+      display = gimp_context_get_display (context);
+
+      if (display)
+        {
+          shell = gimp_display_get_shell (display);
+          image = gimp_display_get_image (display);
+        }
+    }
+
+  if (image != tool->priv->line_art_image)
+    {
+      if (tool->priv->line_art_image)
+        {
+          g_signal_handlers_disconnect_by_data (gimp_image_get_layers (tool->priv->line_art_image), tool);
+          g_signal_handlers_disconnect_by_data (tool->priv->line_art_image, tool);
+        }
+
+      tool->priv->line_art_image = image;
+
+      if (image)
+        {
+          g_signal_connect_swapped (image, "active-layer-changed",
+                                    G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                                    tool);
+          g_signal_connect_swapped (image, "active-channel-changed",
+                                    G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                                    tool);
+
+          g_signal_connect_swapped (gimp_image_get_layers (image), "add",
+                                    G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                                    tool);
+          g_signal_connect_swapped (gimp_image_get_layers (image), "remove",
+                                    G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                                    tool);
+          g_signal_connect_swapped (gimp_image_get_layers (image), "reorder",
+                                    G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                                    tool);
+        }
+    }
+
+  if (shell != tool->priv->line_art_shell)
+    {
+      if (tool->priv->line_art_shell)
+        {
+          g_signal_handlers_disconnect_by_func (
+            tool->priv->line_art_shell,
+            gimp_bucket_fill_tool_reset_line_art,
+            tool);
+        }
+
+      tool->priv->line_art_shell = shell;
+
+      if (shell)
+        {
+          g_signal_connect_swapped (shell, "notify::show-all",
+                                    G_CALLBACK (gimp_bucket_fill_tool_reset_line_art),
+                                    tool);
+        }
+    }
+
+  if (image)
+    {
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+        drawable = NULL;
+
+      if (options->line_art_source == GIMP_LINE_ART_SOURCE_SAMPLE_MERGED)
+        {
+          GimpImageProxy *image_proxy = gimp_image_proxy_new (image);
+
+          gimp_image_proxy_set_show_all (image_proxy, shell->show_all);
+
+          gimp_line_art_set_input (line_art, GIMP_PICKABLE (image_proxy));
+
+          g_object_unref (image_proxy);
+        }
+      else if (drawable)
+        {
+          GimpItem      *parent;
+          GimpContainer *container;
+          GimpObject    *neighbour = NULL;
+          GimpPickable  *source    = NULL;
+          gint           index;
+
+          parent = gimp_item_get_parent (GIMP_ITEM (drawable));
+          if (parent)
+            container = gimp_viewable_get_children (GIMP_VIEWABLE (parent));
+          else
+            container = gimp_image_get_layers (image);
+
+          index = gimp_item_get_index (GIMP_ITEM (drawable));
+
+          if (options->line_art_source == GIMP_LINE_ART_SOURCE_ACTIVE_LAYER)
+            source = GIMP_PICKABLE (drawable);
+          else if (options->line_art_source == GIMP_LINE_ART_SOURCE_LOWER_LAYER)
+            neighbour = gimp_container_get_child_by_index (container, index + 1);
+          else if (options->line_art_source == GIMP_LINE_ART_SOURCE_UPPER_LAYER)
+            neighbour = gimp_container_get_child_by_index (container, index - 1);
+
+          source = neighbour ? GIMP_PICKABLE (neighbour) : source;
+          gimp_line_art_set_input (line_art, source);
+        }
+      else
+        {
+          gimp_line_art_set_input (line_art, NULL);
+        }
+    }
+  else
+    {
+      gimp_line_art_set_input (line_art, NULL);
+    }
+}
diff --git a/app/tools/gimpbucketfilltool.h b/app/tools/gimpbucketfilltool.h
new file mode 100644
index 0000000..37a1b96
--- /dev/null
+++ b/app/tools/gimpbucketfilltool.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_BUCKET_FILL_TOOL_H__
+#define  __GIMP_BUCKET_FILL_TOOL_H__
+
+
+#include "gimpcolortool.h"
+
+
+#define GIMP_TYPE_BUCKET_FILL_TOOL            (gimp_bucket_fill_tool_get_type ())
+#define GIMP_BUCKET_FILL_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillTool))
+#define GIMP_BUCKET_FILL_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillToolClass))
+#define GIMP_IS_BUCKET_FILL_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BUCKET_FILL_TOOL))
+#define GIMP_IS_BUCKET_FILL_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUCKET_FILL_TOOL))
+#define GIMP_BUCKET_FILL_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BUCKET_FILL_TOOL, GimpBucketFillToolClass))
+
+#define GIMP_BUCKET_FILL_TOOL_GET_OPTIONS(t)  (GIMP_BUCKET_FILL_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpBucketFillTool      GimpBucketFillTool;
+typedef struct _GimpBucketFillToolClass GimpBucketFillToolClass;
+typedef struct _GimpBucketFillToolPrivate GimpBucketFillToolPrivate;
+
+struct _GimpBucketFillTool
+{
+  GimpColorTool              parent_instance;
+
+  GimpBucketFillToolPrivate *priv;
+};
+
+struct _GimpBucketFillToolClass
+{
+  GimpColorToolClass  parent_class;
+};
+
+
+void    gimp_bucket_fill_tool_register (GimpToolRegisterCallback  callback,
+                                        gpointer                  data);
+
+GType   gimp_bucket_fill_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_BUCKET_FILL_TOOL_H__  */
diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c
new file mode 100644
index 0000000..4a54502
--- /dev/null
+++ b/app/tools/gimpbycolorselecttool.c
@@ -0,0 +1,143 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbycolorselecttool.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimppickable.h"
+#include "core/gimppickable-contiguous-region.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpbycolorselecttool.h"
+#include "gimpregionselectoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static GeglBuffer * gimp_by_color_select_tool_get_mask (GimpRegionSelectTool *region_select,
+                                                        GimpDisplay          *display);
+
+
+G_DEFINE_TYPE (GimpByColorSelectTool, gimp_by_color_select_tool,
+               GIMP_TYPE_REGION_SELECT_TOOL)
+
+#define parent_class gimp_by_color_select_tool_parent_class
+
+
+void
+gimp_by_color_select_tool_register (GimpToolRegisterCallback  callback,
+                                    gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_BY_COLOR_SELECT_TOOL,
+                GIMP_TYPE_REGION_SELECT_OPTIONS,
+                gimp_region_select_options_gui,
+                0,
+                "gimp-by-color-select-tool",
+                _("Select by Color"),
+                _("Select by Color Tool: Select regions with similar colors"),
+                N_("_By Color Select"), "<shift>O",
+                NULL, GIMP_HELP_TOOL_BY_COLOR_SELECT,
+                GIMP_ICON_TOOL_BY_COLOR_SELECT,
+                data);
+}
+
+static void
+gimp_by_color_select_tool_class_init (GimpByColorSelectToolClass *klass)
+{
+  GimpRegionSelectToolClass *region_class;
+
+  region_class = GIMP_REGION_SELECT_TOOL_CLASS (klass);
+
+  region_class->undo_desc = C_("command", "Select by Color");
+  region_class->get_mask  = gimp_by_color_select_tool_get_mask;
+}
+
+static void
+gimp_by_color_select_tool_init (GimpByColorSelectTool *by_color_select)
+{
+  GimpTool *tool = GIMP_TOOL (by_color_select);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_HAND);
+}
+
+static GeglBuffer *
+gimp_by_color_select_tool_get_mask (GimpRegionSelectTool *region_select,
+                                    GimpDisplay          *display)
+{
+  GimpTool                *tool        = GIMP_TOOL (region_select);
+  GimpSelectionOptions    *sel_options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpRegionSelectOptions *options     = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (tool);
+  GimpImage               *image       = gimp_display_get_image (display);
+  GimpDrawable            *drawable    = gimp_image_get_active_drawable (image);
+  GimpPickable            *pickable;
+  GimpRGB                  srgb;
+  gint                     x, y;
+
+  x = region_select->x;
+  y = region_select->y;
+
+  if (! options->sample_merged)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x -= off_x;
+      y -= off_y;
+
+      pickable = GIMP_PICKABLE (drawable);
+    }
+  else
+    {
+      pickable = GIMP_PICKABLE (image);
+    }
+
+  gimp_pickable_flush (pickable);
+
+  if (gimp_pickable_get_color_at (pickable, x, y, &srgb))
+    {
+      GimpRGB color;
+
+      gimp_pickable_srgb_to_image_color (pickable, &srgb, &color);
+
+      return gimp_pickable_contiguous_region_by_color (pickable,
+                                                       sel_options->antialias,
+                                                       options->threshold / 255.0,
+                                                       options->select_transparent,
+                                                       options->select_criterion,
+                                                       &color);
+    }
+
+  return NULL;
+}
diff --git a/app/tools/gimpbycolorselecttool.h b/app/tools/gimpbycolorselecttool.h
new file mode 100644
index 0000000..92768ff
--- /dev/null
+++ b/app/tools/gimpbycolorselecttool.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbycolorselectool.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BY_COLOR_SELECT_TOOL_H__
+#define __GIMP_BY_COLOR_SELECT_TOOL_H__
+
+
+#include "gimpregionselecttool.h"
+
+
+#define GIMP_TYPE_BY_COLOR_SELECT_TOOL            (gimp_by_color_select_tool_get_type ())
+#define GIMP_BY_COLOR_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BY_COLOR_SELECT_TOOL, GimpByColorSelectTool))
+#define GIMP_BY_COLOR_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BY_COLOR_SELECT_TOOL, GimpByColorSelectToolClass))
+#define GIMP_IS_BY_COLOR_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BY_COLOR_SELECT_TOOL))
+#define GIMP_IS_BY_COLOR_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BY_COLOR_SELECT_TOOL))
+#define GIMP_BY_COLOR_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BY_COLOR_SELECT_TOOL, GimpByColorSelectToolClass))
+
+
+typedef struct _GimpByColorSelectTool      GimpByColorSelectTool;
+typedef struct _GimpByColorSelectToolClass GimpByColorSelectToolClass;
+
+struct _GimpByColorSelectTool
+{
+  GimpRegionSelectTool  parent_instance;
+};
+
+struct _GimpByColorSelectToolClass
+{
+  GimpRegionSelectToolClass  parent_class;
+};
+
+
+void    gimp_by_color_select_tool_register (GimpToolRegisterCallback  callback,
+                                            gpointer                  data);
+
+GType   gimp_by_color_select_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_BY_COLOR_SELECT_TOOL_H__  */
diff --git a/app/tools/gimpcageoptions.c b/app/tools/gimpcageoptions.c
new file mode 100644
index 0000000..0b1aecc
--- /dev/null
+++ b/app/tools/gimpcageoptions.c
@@ -0,0 +1,152 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpcageoptions.c
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "gimpcageoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CAGE_MODE,
+  PROP_FILL_PLAIN_COLOR
+};
+
+
+static void   gimp_cage_options_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+static void   gimp_cage_options_get_property (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpCageOptions, gimp_cage_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_cage_options_parent_class
+
+
+static void
+gimp_cage_options_class_init (GimpCageOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_cage_options_set_property;
+  object_class->get_property = gimp_cage_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CAGE_MODE,
+                         "cage-mode",
+                         NULL, NULL,
+                         GIMP_TYPE_CAGE_MODE,
+                         GIMP_CAGE_MODE_CAGE_CHANGE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILL_PLAIN_COLOR,
+                            "fill-plain-color",
+                            _("Fill the original position\n"
+                              "of the cage with a color"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_cage_options_init (GimpCageOptions *options)
+{
+}
+
+static void
+gimp_cage_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpCageOptions *options = GIMP_CAGE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_CAGE_MODE:
+      options->cage_mode = g_value_get_enum (value);
+      break;
+    case PROP_FILL_PLAIN_COLOR:
+      options->fill_plain_color = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_cage_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpCageOptions *options = GIMP_CAGE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_CAGE_MODE:
+      g_value_set_enum (value, options->cage_mode);
+      break;
+    case PROP_FILL_PLAIN_COLOR:
+      g_value_set_boolean (value, options->fill_plain_color);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_cage_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget *mode;
+  GtkWidget *button;
+
+  mode = gimp_prop_enum_radio_box_new (config, "cage-mode", 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), mode, FALSE, FALSE, 0);
+  gtk_widget_show (mode);
+
+  button = gimp_prop_check_button_new (config, "fill-plain-color", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox),  button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return vbox;
+}
diff --git a/app/tools/gimpcageoptions.h b/app/tools/gimpcageoptions.h
new file mode 100644
index 0000000..b4e2fcd
--- /dev/null
+++ b/app/tools/gimpcageoptions.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpcageoptions.h
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CAGE_OPTIONS_H__
+#define __GIMP_CAGE_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_CAGE_OPTIONS            (gimp_cage_options_get_type ())
+#define GIMP_CAGE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CAGE_OPTIONS, GimpCageOptions))
+#define GIMP_CAGE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CAGE_OPTIONS, GimpCageOptionsClass))
+#define GIMP_IS_CAGE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CAGE_OPTIONS))
+#define GIMP_IS_CAGE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CAGE_OPTIONS))
+#define GIMP_CAGE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CAGE_OPTIONS, GimpCageOptionsClass))
+
+
+typedef struct _GimpCageOptions      GimpCageOptions;
+typedef struct _GimpCageOptionsClass GimpCageOptionsClass;
+
+struct _GimpCageOptions
+{
+  GimpToolOptions  parent_instance;
+
+  GimpCageMode     cage_mode;
+  gboolean         fill_plain_color;
+};
+
+struct _GimpCageOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+};
+
+
+GType       gimp_cage_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_cage_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_CAGE_OPTIONS_H__  */
diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c
new file mode 100644
index 0000000..37bb4c2
--- /dev/null
+++ b/app/tools/gimpcagetool.c
@@ -0,0 +1,1301 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpcagetool.c
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/gimpcageconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpdisplay.h"
+
+#include "gimpcagetool.h"
+#include "gimpcageoptions.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+/* XXX: if this state list is updated, in particular if for some reason,
+   a new CAGE_STATE_* was to be inserted after CAGE_STATE_CLOSING, check
+   if the function gimp_cage_tool_is_complete() has to be updated.
+   Current algorithm is that all DEFORM_* states are complete states,
+   and all CAGE_* states are incomplete states. */
+enum
+{
+  CAGE_STATE_INIT,
+  CAGE_STATE_WAIT,
+  CAGE_STATE_MOVE_HANDLE,
+  CAGE_STATE_SELECTING,
+  CAGE_STATE_CLOSING,
+  DEFORM_STATE_WAIT,
+  DEFORM_STATE_MOVE_HANDLE,
+  DEFORM_STATE_SELECTING
+};
+
+
+static gboolean   gimp_cage_tool_initialize         (GimpTool              *tool,
+                                                     GimpDisplay           *display,
+                                                     GError               **error);
+static void       gimp_cage_tool_control            (GimpTool              *tool,
+                                                     GimpToolAction         action,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_button_press       (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpButtonPressType    press_type,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_button_release     (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpButtonReleaseType  release_type,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_motion             (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpDisplay           *display);
+static gboolean   gimp_cage_tool_key_press          (GimpTool              *tool,
+                                                     GdkEventKey           *kevent,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_cursor_update      (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     GdkModifierType        state,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_oper_update        (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     GdkModifierType        state,
+                                                     gboolean               proximity,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_options_notify     (GimpTool              *tool,
+                                                     GimpToolOptions       *options,
+                                                     const GParamSpec      *pspec);
+
+static void       gimp_cage_tool_draw               (GimpDrawTool          *draw_tool);
+
+static void       gimp_cage_tool_start              (GimpCageTool          *ct,
+                                                     GimpDisplay           *display);
+static void       gimp_cage_tool_halt               (GimpCageTool          *ct);
+static void       gimp_cage_tool_commit             (GimpCageTool          *ct);
+
+static gint       gimp_cage_tool_is_on_handle       (GimpCageTool          *ct,
+                                                     GimpDrawTool          *draw_tool,
+                                                     GimpDisplay           *display,
+                                                     gdouble                x,
+                                                     gdouble                y,
+                                                     gint                   handle_size);
+static gint       gimp_cage_tool_is_on_edge         (GimpCageTool          *ct,
+                                                     gdouble                x,
+                                                     gdouble                y,
+                                                     gint                   handle_size);
+
+static gboolean   gimp_cage_tool_is_complete        (GimpCageTool          *ct);
+static void       gimp_cage_tool_remove_last_handle (GimpCageTool          *ct);
+static void       gimp_cage_tool_compute_coef       (GimpCageTool          *ct);
+static void       gimp_cage_tool_create_filter      (GimpCageTool          *ct);
+static void       gimp_cage_tool_filter_flush       (GimpDrawableFilter    *filter,
+                                                     GimpTool              *tool);
+static void       gimp_cage_tool_filter_update      (GimpCageTool          *ct);
+
+static void       gimp_cage_tool_create_render_node (GimpCageTool          *ct);
+static void       gimp_cage_tool_render_node_update (GimpCageTool          *ct);
+
+
+G_DEFINE_TYPE (GimpCageTool, gimp_cage_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_cage_tool_parent_class
+
+
+void
+gimp_cage_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_CAGE_TOOL,
+                GIMP_TYPE_CAGE_OPTIONS,
+                gimp_cage_options_gui,
+                0,
+                "gimp-cage-tool",
+                _("Cage Transform"),
+                _("Cage Transform: Deform a selection with a cage"),
+                N_("_Cage Transform"), "<shift>G",
+                NULL, GIMP_HELP_TOOL_CAGE,
+                GIMP_ICON_TOOL_CAGE,
+                data);
+}
+
+static void
+gimp_cage_tool_class_init (GimpCageToolClass *klass)
+{
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  tool_class->initialize     = gimp_cage_tool_initialize;
+  tool_class->control        = gimp_cage_tool_control;
+  tool_class->button_press   = gimp_cage_tool_button_press;
+  tool_class->button_release = gimp_cage_tool_button_release;
+  tool_class->key_press      = gimp_cage_tool_key_press;
+  tool_class->motion         = gimp_cage_tool_motion;
+  tool_class->cursor_update  = gimp_cage_tool_cursor_update;
+  tool_class->oper_update    = gimp_cage_tool_oper_update;
+  tool_class->options_notify = gimp_cage_tool_options_notify;
+
+  draw_tool_class->draw      = gimp_cage_tool_draw;
+}
+
+static void
+gimp_cage_tool_init (GimpCageTool *self)
+{
+  GimpTool *tool = GIMP_TOOL (self);
+
+  gimp_tool_control_set_preserve    (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask  (tool->control,
+                                     GIMP_DIRTY_IMAGE           |
+                                     GIMP_DIRTY_IMAGE_STRUCTURE |
+                                     GIMP_DIRTY_DRAWABLE        |
+                                     GIMP_DIRTY_SELECTION       |
+                                     GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_wants_click (tool->control, TRUE);
+  gimp_tool_control_set_precision   (tool->control,
+                                     GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_PERSPECTIVE);
+
+  self->config          = g_object_new (GIMP_TYPE_CAGE_CONFIG, NULL);
+  self->hovering_handle = -1;
+  self->tool_state      = CAGE_STATE_INIT;
+}
+
+static gboolean
+gimp_cage_tool_initialize (GimpTool     *tool,
+                           GimpDisplay  *display,
+                           GError      **error)
+{
+  GimpGuiConfig *config   = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage     *image    = gimp_display_get_image (display);
+  GimpDrawable  *drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    return FALSE;
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot modify the pixels of layer groups."));
+      return FALSE;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer's pixels are locked."));
+      if (error)
+        gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+      return FALSE;
+    }
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer is not visible."));
+      return FALSE;
+    }
+
+  gimp_cage_tool_start (GIMP_CAGE_TOOL (tool), display);
+
+  return TRUE;
+}
+
+static void
+gimp_cage_tool_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  GimpCageTool *ct = GIMP_CAGE_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_cage_tool_halt (ct);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_cage_tool_commit (ct);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_cage_tool_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  GimpCageTool *ct        = GIMP_CAGE_TOOL (tool);
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+  gint          handle    = -1;
+  gint          edge      = -1;
+
+  gimp_tool_control_activate (tool->control);
+
+  if (ct->config)
+    {
+      handle = gimp_cage_tool_is_on_handle (ct,
+                                            draw_tool,
+                                            display,
+                                            coords->x,
+                                            coords->y,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE);
+      edge = gimp_cage_tool_is_on_edge (ct,
+                                        coords->x,
+                                        coords->y,
+                                        GIMP_TOOL_HANDLE_SIZE_CIRCLE);
+    }
+
+  ct->movement_start_x = coords->x;
+  ct->movement_start_y = coords->y;
+
+  switch (ct->tool_state)
+    {
+    case CAGE_STATE_INIT:
+      /* No handle yet, we add the first one and switch the tool to
+       * moving handle state.
+       */
+      gimp_cage_config_add_cage_point (ct->config,
+                                       coords->x - ct->offset_x,
+                                       coords->y - ct->offset_y);
+      gimp_cage_config_select_point (ct->config, 0);
+      ct->tool_state = CAGE_STATE_MOVE_HANDLE;
+      break;
+
+    case CAGE_STATE_WAIT:
+      if (handle == -1 && edge <= 0)
+        {
+          /* User clicked on the background, we add a new handle
+           * and move it
+           */
+          gimp_cage_config_add_cage_point (ct->config,
+                                           coords->x - ct->offset_x,
+                                           coords->y - ct->offset_y);
+          gimp_cage_config_select_point (ct->config,
+                                         gimp_cage_config_get_n_points (ct->config) - 1);
+          ct->tool_state = CAGE_STATE_MOVE_HANDLE;
+        }
+      else if (handle == 0 && gimp_cage_config_get_n_points (ct->config) > 2)
+        {
+          /* User clicked on the first handle, we wait for
+           * release for closing the cage and switching to
+           * deform if possible
+           */
+          gimp_cage_config_select_point (ct->config, 0);
+          ct->tool_state = CAGE_STATE_CLOSING;
+        }
+      else if (handle >= 0)
+        {
+          /* User clicked on a handle, so we move it */
+
+          if (state & gimp_get_extend_selection_mask ())
+            {
+              /* Multiple selection */
+
+              gimp_cage_config_toggle_point_selection (ct->config, handle);
+            }
+          else
+            {
+              /* New selection */
+
+              if (! gimp_cage_config_point_is_selected (ct->config, handle))
+                {
+                  gimp_cage_config_select_point (ct->config, handle);
+                }
+            }
+
+          ct->tool_state = CAGE_STATE_MOVE_HANDLE;
+        }
+      else if (edge > 0)
+        {
+          /* User clicked on an edge, we add a new handle here and select it */
+
+          gimp_cage_config_insert_cage_point (ct->config, edge,
+                                              coords->x, coords->y);
+          gimp_cage_config_select_point (ct->config, edge);
+          ct->tool_state = CAGE_STATE_MOVE_HANDLE;
+        }
+      break;
+
+    case DEFORM_STATE_WAIT:
+      if (handle == -1)
+        {
+          /* User clicked on the background, we start a rubber band
+           * selection
+           */
+          ct->selection_start_x = coords->x;
+          ct->selection_start_y = coords->y;
+          ct->tool_state = DEFORM_STATE_SELECTING;
+        }
+
+      if (handle >= 0)
+        {
+          /* User clicked on a handle, so we move it */
+
+          if (state & gimp_get_extend_selection_mask ())
+            {
+              /* Multiple selection */
+
+              gimp_cage_config_toggle_point_selection (ct->config, handle);
+            }
+          else
+            {
+              /* New selection */
+
+              if (! gimp_cage_config_point_is_selected (ct->config, handle))
+                {
+                  gimp_cage_config_select_point (ct->config, handle);
+                }
+            }
+
+          ct->tool_state = DEFORM_STATE_MOVE_HANDLE;
+        }
+      break;
+    }
+}
+
+void
+gimp_cage_tool_button_release (GimpTool              *tool,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type,
+                               GimpDisplay           *display)
+{
+  GimpCageTool    *ct      = GIMP_CAGE_TOOL (tool);
+  GimpCageOptions *options = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (ct));
+
+  gimp_tool_control_halt (tool->control);
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      /* Cancelling */
+
+      switch (ct->tool_state)
+        {
+        case CAGE_STATE_CLOSING:
+          ct->tool_state = CAGE_STATE_WAIT;
+          break;
+
+        case CAGE_STATE_MOVE_HANDLE:
+          gimp_cage_config_remove_last_cage_point (ct->config);
+          ct->tool_state = CAGE_STATE_WAIT;
+          break;
+
+        case CAGE_STATE_SELECTING:
+          ct->tool_state = CAGE_STATE_WAIT;
+          break;
+
+        case DEFORM_STATE_MOVE_HANDLE:
+          gimp_cage_tool_filter_update (ct);
+          ct->tool_state = DEFORM_STATE_WAIT;
+          break;
+
+        case DEFORM_STATE_SELECTING:
+          ct->tool_state = DEFORM_STATE_WAIT;
+          break;
+        }
+
+      gimp_cage_config_reset_displacement (ct->config);
+    }
+  else
+    {
+      /* Normal release */
+
+      switch (ct->tool_state)
+        {
+        case CAGE_STATE_CLOSING:
+          ct->dirty_coef = TRUE;
+          gimp_cage_config_commit_displacement (ct->config);
+
+          if (release_type == GIMP_BUTTON_RELEASE_CLICK)
+            g_object_set (options, "cage-mode", GIMP_CAGE_MODE_DEFORM, NULL);
+          break;
+
+        case CAGE_STATE_MOVE_HANDLE:
+          ct->dirty_coef = TRUE;
+          ct->tool_state = CAGE_STATE_WAIT;
+          gimp_cage_config_commit_displacement (ct->config);
+          break;
+
+        case CAGE_STATE_SELECTING:
+          {
+            GeglRectangle area =
+              { MIN (ct->selection_start_x, coords->x) - ct->offset_x,
+                MIN (ct->selection_start_y, coords->y) - ct->offset_y,
+                ABS (ct->selection_start_x - coords->x),
+                ABS (ct->selection_start_y - coords->y) };
+
+            if (state & gimp_get_extend_selection_mask ())
+              {
+                gimp_cage_config_select_add_area (ct->config,
+                                                  GIMP_CAGE_MODE_CAGE_CHANGE,
+                                                  area);
+              }
+            else
+              {
+                gimp_cage_config_select_area (ct->config,
+                                              GIMP_CAGE_MODE_CAGE_CHANGE,
+                                              area);
+              }
+
+            ct->tool_state = CAGE_STATE_WAIT;
+          }
+          break;
+
+        case DEFORM_STATE_MOVE_HANDLE:
+          ct->tool_state = DEFORM_STATE_WAIT;
+          gimp_cage_config_commit_displacement (ct->config);
+          gegl_node_set (ct->cage_node,
+                         "config", ct->config,
+                         NULL);
+          gimp_cage_tool_filter_update (ct);
+          break;
+
+        case DEFORM_STATE_SELECTING:
+          {
+            GeglRectangle area =
+              { MIN (ct->selection_start_x, coords->x) - ct->offset_x,
+                MIN (ct->selection_start_y, coords->y) - ct->offset_y,
+                ABS (ct->selection_start_x - coords->x),
+                ABS (ct->selection_start_y - coords->y) };
+
+            if (state & gimp_get_extend_selection_mask ())
+              {
+                gimp_cage_config_select_add_area (ct->config,
+                                                  GIMP_CAGE_MODE_DEFORM, area);
+              }
+            else
+              {
+                gimp_cage_config_select_area (ct->config,
+                                              GIMP_CAGE_MODE_DEFORM, area);
+              }
+
+            ct->tool_state = DEFORM_STATE_WAIT;
+          }
+          break;
+        }
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_cage_tool_motion (GimpTool         *tool,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state,
+                       GimpDisplay      *display)
+{
+  GimpCageTool    *ct       = GIMP_CAGE_TOOL (tool);
+  GimpCageOptions *options  = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  ct->cursor_x = coords->x;
+  ct->cursor_y = coords->y;
+
+  switch (ct->tool_state)
+    {
+    case CAGE_STATE_MOVE_HANDLE:
+    case CAGE_STATE_CLOSING:
+    case DEFORM_STATE_MOVE_HANDLE:
+      gimp_cage_config_add_displacement (ct->config,
+                                         options->cage_mode,
+                                         ct->cursor_x - ct->movement_start_x,
+                                         ct->cursor_y - ct->movement_start_y);
+      break;
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static gboolean
+gimp_cage_tool_key_press (GimpTool    *tool,
+                          GdkEventKey *kevent,
+                          GimpDisplay *display)
+{
+  GimpCageTool *ct = GIMP_CAGE_TOOL (tool);
+
+  if (! ct->config)
+    return FALSE;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_BackSpace:
+      if (ct->tool_state == CAGE_STATE_WAIT)
+        {
+          if (gimp_cage_config_get_n_points (ct->config) != 0)
+            gimp_cage_tool_remove_last_handle (ct);
+        }
+      else if (ct->tool_state == DEFORM_STATE_WAIT)
+        {
+          gimp_cage_config_remove_selected_points (ct->config);
+
+          /* if the cage have less than 3 handles, we reopen it */
+          if (gimp_cage_config_get_n_points (ct->config) <= 2)
+            {
+              ct->tool_state = CAGE_STATE_WAIT;
+            }
+
+          gimp_cage_tool_compute_coef (ct);
+          gimp_cage_tool_render_node_update (ct);
+        }
+      return TRUE;
+
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      if (! gimp_cage_tool_is_complete (ct) &&
+          gimp_cage_config_get_n_points (ct->config) > 2)
+        {
+          g_object_set (gimp_tool_get_options (tool),
+                        "cage-mode", GIMP_CAGE_MODE_DEFORM,
+                        NULL);
+        }
+      else if (ct->tool_state == DEFORM_STATE_WAIT)
+        {
+          gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+        }
+      return TRUE;
+
+    case GDK_KEY_Escape:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_cage_tool_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+  GimpCageTool *ct        = GIMP_CAGE_TOOL (tool);
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (ct->config)
+    {
+      ct->hovering_handle = gimp_cage_tool_is_on_handle (ct,
+                                                         draw_tool,
+                                                         display,
+                                                         coords->x,
+                                                         coords->y,
+                                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE);
+
+      ct->hovering_edge = gimp_cage_tool_is_on_edge (ct,
+                                                     coords->x,
+                                                     coords->y,
+                                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE);
+    }
+
+  gimp_draw_tool_pause (draw_tool);
+
+  ct->cursor_x = coords->x;
+  ct->cursor_y = coords->y;
+
+  gimp_draw_tool_resume (draw_tool);
+}
+
+static void
+gimp_cage_tool_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpCageTool       *ct       = GIMP_CAGE_TOOL (tool);
+  GimpCageOptions    *options  = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+  GimpGuiConfig      *config   = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpCursorModifier  modifier = GIMP_CURSOR_MODIFIER_PLUS;
+
+  if (tool->display)
+    {
+      if (ct->hovering_handle != -1)
+        {
+          modifier = GIMP_CURSOR_MODIFIER_MOVE;
+        }
+      else if (ct->hovering_edge  != -1 &&
+               options->cage_mode == GIMP_CAGE_MODE_CAGE_CHANGE)
+        {
+          modifier = GIMP_CURSOR_MODIFIER_PLUS;
+        }
+      else
+        {
+          if (gimp_cage_tool_is_complete (ct))
+            modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+    }
+  else
+    {
+      GimpImage    *image    = gimp_display_get_image (display);
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) ||
+          gimp_item_is_content_locked (GIMP_ITEM (drawable))    ||
+          ! (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+             config->edit_non_visible))
+        {
+          modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+    }
+
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_cage_tool_options_notify (GimpTool         *tool,
+                               GimpToolOptions  *options,
+                               const GParamSpec *pspec)
+{
+  GimpCageTool *ct = GIMP_CAGE_TOOL (tool);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! tool->display)
+    return;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  if (strcmp (pspec->name, "cage-mode") == 0)
+    {
+      GimpCageMode mode;
+
+      g_object_get (options,
+                    "cage-mode", &mode,
+                    NULL);
+
+      if (mode == GIMP_CAGE_MODE_DEFORM)
+        {
+          /* switch to deform mode */
+
+          if (gimp_cage_config_get_n_points (ct->config) > 2)
+            {
+              gimp_cage_config_reset_displacement (ct->config);
+              gimp_cage_config_reverse_cage_if_needed (ct->config);
+              gimp_tool_push_status (tool, tool->display,
+                                     _("Press ENTER to commit the transform"));
+              ct->tool_state = DEFORM_STATE_WAIT;
+
+              if (! ct->render_node)
+                {
+                  gimp_cage_tool_create_render_node (ct);
+                }
+
+              if (ct->dirty_coef)
+                {
+                  gimp_cage_tool_compute_coef (ct);
+                  gimp_cage_tool_render_node_update (ct);
+                }
+
+              if (! ct->filter)
+                gimp_cage_tool_create_filter (ct);
+
+              gimp_cage_tool_filter_update (ct);
+            }
+          else
+            {
+              g_object_set (options,
+                            "cage-mode", GIMP_CAGE_MODE_CAGE_CHANGE,
+                            NULL);
+            }
+        }
+      else
+        {
+          /* switch to edit mode */
+          if (ct->filter)
+            {
+              gimp_drawable_filter_abort (ct->filter);
+
+              gimp_tool_pop_status (tool, tool->display);
+              ct->tool_state = CAGE_STATE_WAIT;
+            }
+        }
+    }
+  else if (strcmp  (pspec->name, "fill-plain-color") == 0)
+    {
+      if (ct->tool_state == DEFORM_STATE_WAIT)
+        {
+          gimp_cage_tool_render_node_update (ct);
+          gimp_cage_tool_filter_update (ct);
+        }
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_cage_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpCageTool    *ct        = GIMP_CAGE_TOOL (draw_tool);
+  GimpCageOptions *options   = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+  GimpCageConfig  *config    = ct->config;
+  GimpCanvasGroup *stroke_group;
+  gint             n_vertices;
+  gint             i;
+  GimpHandleType   handle;
+
+  n_vertices = gimp_cage_config_get_n_points (config);
+
+  if (n_vertices == 0)
+    return;
+
+  if (ct->tool_state == CAGE_STATE_INIT)
+    return;
+
+  stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
+
+  gimp_draw_tool_push_group (draw_tool, stroke_group);
+
+  /* If needed, draw line to the cursor. */
+  if (! gimp_cage_tool_is_complete (ct))
+    {
+      GimpVector2 last_point;
+
+      last_point = gimp_cage_config_get_point_coordinate (ct->config,
+                                                          options->cage_mode,
+                                                          n_vertices - 1);
+
+      gimp_draw_tool_add_line (draw_tool,
+                               last_point.x + ct->offset_x,
+                               last_point.y + ct->offset_y,
+                               ct->cursor_x,
+                               ct->cursor_y);
+    }
+
+  gimp_draw_tool_pop_group (draw_tool);
+
+  /* Draw the cage with handles. */
+  for (i = 0; i < n_vertices; i++)
+    {
+      GimpCanvasItem *item;
+      GimpVector2     point1, point2;
+
+      point1 = gimp_cage_config_get_point_coordinate (ct->config,
+                                                      options->cage_mode,
+                                                      i);
+      point1.x += ct->offset_x;
+      point1.y += ct->offset_y;
+
+      if (i > 0 || gimp_cage_tool_is_complete (ct))
+        {
+          gint index_point2;
+
+          if (i == 0)
+            index_point2 = n_vertices - 1;
+          else
+            index_point2 = i - 1;
+
+          point2 = gimp_cage_config_get_point_coordinate (ct->config,
+                                                          options->cage_mode,
+                                                          index_point2);
+          point2.x += ct->offset_x;
+          point2.y += ct->offset_y;
+
+          if (i != ct->hovering_edge ||
+              gimp_cage_tool_is_complete (ct))
+            {
+              gimp_draw_tool_push_group (draw_tool, stroke_group);
+            }
+
+          item = gimp_draw_tool_add_line (draw_tool,
+                                          point1.x,
+                                          point1.y,
+                                          point2.x,
+                                          point2.y);
+
+          if (i == ct->hovering_edge &&
+              ! gimp_cage_tool_is_complete (ct))
+            {
+              gimp_canvas_item_set_highlight (item, TRUE);
+            }
+          else
+            {
+              gimp_draw_tool_pop_group (draw_tool);
+            }
+        }
+
+      if (gimp_cage_config_point_is_selected (ct->config, i))
+        {
+          if (i == ct->hovering_handle)
+            handle = GIMP_HANDLE_FILLED_SQUARE;
+          else
+            handle = GIMP_HANDLE_SQUARE;
+        }
+      else
+        {
+          if (i == ct->hovering_handle)
+            handle = GIMP_HANDLE_FILLED_CIRCLE;
+          else
+            handle = GIMP_HANDLE_CIRCLE;
+        }
+
+      item = gimp_draw_tool_add_handle (draw_tool,
+                                        handle,
+                                        point1.x,
+                                        point1.y,
+                                        GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                        GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                        GIMP_HANDLE_ANCHOR_CENTER);
+
+      if (i == ct->hovering_handle)
+        gimp_canvas_item_set_highlight (item, TRUE);
+    }
+
+  if (ct->tool_state == DEFORM_STATE_SELECTING ||
+      ct->tool_state == CAGE_STATE_SELECTING)
+    {
+      gimp_draw_tool_add_rectangle (draw_tool,
+                                    FALSE,
+                                    MIN (ct->selection_start_x, ct->cursor_x),
+                                    MIN (ct->selection_start_y, ct->cursor_y),
+                                    ABS (ct->selection_start_x - ct->cursor_x),
+                                    ABS (ct->selection_start_y - ct->cursor_y));
+    }
+}
+
+static void
+gimp_cage_tool_start (GimpCageTool *ct,
+                      GimpDisplay  *display)
+{
+  GimpTool     *tool     = GIMP_TOOL (ct);
+  GimpImage    *image    = gimp_display_get_image (display);
+  GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+  tool->display  = display;
+  tool->drawable = drawable;
+
+  g_clear_object (&ct->config);
+
+  g_clear_object (&ct->coef);
+  ct->dirty_coef = TRUE;
+
+  if (ct->filter)
+    {
+      gimp_drawable_filter_abort (ct->filter);
+      g_clear_object (&ct->filter);
+    }
+
+  if (ct->render_node)
+    {
+      g_clear_object (&ct->render_node);
+      ct->coef_node = NULL;
+      ct->cage_node = NULL;
+    }
+
+  ct->config          = g_object_new (GIMP_TYPE_CAGE_CONFIG, NULL);
+  ct->hovering_handle = -1;
+  ct->hovering_edge   = -1;
+  ct->tool_state      = CAGE_STATE_INIT;
+
+  /* Setting up cage offset to convert the cage point coords to
+   * drawable coords
+   */
+  gimp_item_get_offset (GIMP_ITEM (tool->drawable),
+                        &ct->offset_x, &ct->offset_y);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (ct), display);
+}
+
+static void
+gimp_cage_tool_halt (GimpCageTool *ct)
+{
+  GimpTool *tool = GIMP_TOOL (ct);
+
+  g_clear_object (&ct->config);
+  g_clear_object (&ct->coef);
+  g_clear_object (&ct->render_node);
+  ct->coef_node = NULL;
+  ct->cage_node = NULL;
+
+  if (ct->filter)
+    {
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_drawable_filter_abort (ct->filter);
+      g_clear_object (&ct->filter);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+  ct->tool_state = CAGE_STATE_INIT;
+
+  g_object_set (gimp_tool_get_options (tool),
+                "cage-mode", GIMP_CAGE_MODE_CAGE_CHANGE,
+                NULL);
+}
+
+static void
+gimp_cage_tool_commit (GimpCageTool *ct)
+{
+  if (ct->filter)
+    {
+      GimpTool *tool = GIMP_TOOL (ct);
+
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_drawable_filter_commit (ct->filter, GIMP_PROGRESS (tool), FALSE);
+      g_clear_object (&ct->filter);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+}
+
+static gint
+gimp_cage_tool_is_on_handle (GimpCageTool *ct,
+                             GimpDrawTool *draw_tool,
+                             GimpDisplay  *display,
+                             gdouble       x,
+                             gdouble       y,
+                             gint          handle_size)
+{
+  GimpCageOptions *options = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+  GimpCageConfig  *config  = ct->config;
+  gdouble          dist    = G_MAXDOUBLE;
+  gint             i;
+  GimpVector2      cage_point;
+  guint            n_cage_vertices;
+
+  g_return_val_if_fail (GIMP_IS_CAGE_TOOL (ct), -1);
+
+  n_cage_vertices = gimp_cage_config_get_n_points (config);
+
+  if (n_cage_vertices == 0)
+    return -1;
+
+  for (i = 0; i < n_cage_vertices; i++)
+    {
+      cage_point = gimp_cage_config_get_point_coordinate (config,
+                                                          options->cage_mode,
+                                                          i);
+      cage_point.x += ct->offset_x;
+      cage_point.y += ct->offset_y;
+
+      dist = gimp_draw_tool_calc_distance_square (GIMP_DRAW_TOOL (draw_tool),
+                                                  display,
+                                                  x, y,
+                                                  cage_point.x,
+                                                  cage_point.y);
+
+      if (dist <= SQR (handle_size / 2))
+        return i;
+    }
+
+  return -1;
+}
+
+static gint
+gimp_cage_tool_is_on_edge (GimpCageTool *ct,
+                           gdouble       x,
+                           gdouble       y,
+                           gint          handle_size)
+{
+  GimpCageOptions *options = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+  GimpCageConfig  *config  = ct->config;
+  gint             i;
+  guint            n_cage_vertices;
+  GimpVector2      A, B, C, AB, BC, AC;
+  gdouble          lAB, lBC, lAC, lEB, lEC;
+
+  g_return_val_if_fail (GIMP_IS_CAGE_TOOL (ct), -1);
+
+  n_cage_vertices = gimp_cage_config_get_n_points (config);
+
+  if (n_cage_vertices < 2)
+    return -1;
+
+  A = gimp_cage_config_get_point_coordinate (config,
+                                             options->cage_mode,
+                                             n_cage_vertices-1);
+  B = gimp_cage_config_get_point_coordinate (config,
+                                             options->cage_mode,
+                                             0);
+  C.x = x;
+  C.y = y;
+
+  for (i = 0; i < n_cage_vertices; i++)
+    {
+      gimp_vector2_sub (&AB, &A, &B);
+      gimp_vector2_sub (&BC, &B, &C);
+      gimp_vector2_sub (&AC, &A, &C);
+
+      lAB = gimp_vector2_length (&AB);
+      lBC = gimp_vector2_length (&BC);
+      lAC = gimp_vector2_length (&AC);
+      lEB = lAB / 2 + (SQR (lBC) - SQR (lAC)) / (2 * lAB);
+      lEC = sqrt (SQR (lBC) - SQR (lEB));
+
+      if ((lEC < handle_size / 2) && (ABS (SQR (lBC) - SQR (lAC)) <= SQR (lAB)))
+        return i;
+
+      A = B;
+      B = gimp_cage_config_get_point_coordinate (config,
+                                                 options->cage_mode,
+                                                 (i+1) % n_cage_vertices);
+    }
+
+  return -1;
+}
+
+static gboolean
+gimp_cage_tool_is_complete (GimpCageTool *ct)
+{
+  return (ct->tool_state > CAGE_STATE_CLOSING);
+}
+
+static void
+gimp_cage_tool_remove_last_handle (GimpCageTool *ct)
+{
+  GimpCageConfig *config = ct->config;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (ct));
+
+  gimp_cage_config_remove_last_cage_point (config);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (ct));
+}
+
+static void
+gimp_cage_tool_compute_coef (GimpCageTool *ct)
+{
+  GimpCageConfig *config = ct->config;
+  GimpProgress   *progress;
+  const Babl     *format;
+  GeglNode       *gegl;
+  GeglNode       *input;
+  GeglNode       *output;
+  GeglProcessor  *processor;
+  GeglBuffer     *buffer;
+  gdouble         value;
+
+  progress = gimp_progress_start (GIMP_PROGRESS (ct), FALSE,
+                                  _("Computing Cage Coefficients"));
+
+  g_clear_object (&ct->coef);
+
+  format = babl_format_n (babl_type ("float"),
+                          gimp_cage_config_get_n_points (config) * 2);
+
+
+  gegl = gegl_node_new ();
+
+  input = gegl_node_new_child (gegl,
+                               "operation", "gimp:cage-coef-calc",
+                               "config",    ct->config,
+                               NULL);
+
+  output = gegl_node_new_child (gegl,
+                                "operation", "gegl:buffer-sink",
+                                "buffer",    &buffer,
+                                "format",    format,
+                                NULL);
+
+  gegl_node_connect_to (input, "output",
+                        output, "input");
+
+  processor = gegl_node_new_processor (output, NULL);
+
+  while (gegl_processor_work (processor, &value))
+    {
+      if (progress)
+        gimp_progress_set_value (progress, value);
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  g_object_unref (processor);
+
+  ct->coef = buffer;
+  g_object_unref (gegl);
+
+  ct->dirty_coef = FALSE;
+}
+
+static void
+gimp_cage_tool_create_render_node (GimpCageTool *ct)
+{
+  GimpCageOptions *options = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+  GeglNode        *render;
+  GeglNode        *input;
+  GeglNode        *output;
+
+  g_return_if_fail (ct->render_node == NULL);
+  /* render_node is not supposed to be recreated */
+
+  ct->render_node = gegl_node_new ();
+
+  input  = gegl_node_get_input_proxy  (ct->render_node, "input");
+  output = gegl_node_get_output_proxy (ct->render_node, "output");
+
+  ct->coef_node = gegl_node_new_child (ct->render_node,
+                                       "operation", "gegl:buffer-source",
+                                       "buffer",    ct->coef,
+                                       NULL);
+
+  ct->cage_node = gegl_node_new_child (ct->render_node,
+                                       "operation",        "gimp:cage-transform",
+                                       "config",           ct->config,
+                                       "fill-plain-color", options->fill_plain_color,
+                                       NULL);
+
+  render = gegl_node_new_child (ct->render_node,
+                                "operation", "gegl:map-absolute",
+                                NULL);
+
+  gegl_node_connect_to (input,         "output",
+                        ct->cage_node, "input");
+
+  gegl_node_connect_to (ct->coef_node, "output",
+                        ct->cage_node, "aux");
+
+  gegl_node_connect_to (input,  "output",
+                        render, "input");
+
+  gegl_node_connect_to (ct->cage_node, "output",
+                        render,        "aux");
+
+  gegl_node_connect_to (render, "output",
+                        output, "input");
+
+  gimp_gegl_progress_connect (ct->cage_node, GIMP_PROGRESS (ct),
+                              _("Cage Transform"));
+}
+
+static void
+gimp_cage_tool_render_node_update (GimpCageTool *ct)
+{
+  GimpCageOptions *options  = GIMP_CAGE_TOOL_GET_OPTIONS (ct);
+  gboolean         fill;
+  GeglBuffer      *buffer;
+
+  gegl_node_get (ct->cage_node,
+                 "fill-plain-color", &fill,
+                 NULL);
+
+  if (fill != options->fill_plain_color)
+    {
+      gegl_node_set (ct->cage_node,
+                     "fill-plain-color", options->fill_plain_color,
+                     NULL);
+    }
+
+  gegl_node_get (ct->coef_node,
+                 "buffer", &buffer,
+                 NULL);
+
+  if (buffer != ct->coef)
+    {
+      gegl_node_set (ct->coef_node,
+                     "buffer", ct->coef,
+                     NULL);
+    }
+
+  if (buffer)
+    g_object_unref (buffer);
+}
+
+static void
+gimp_cage_tool_create_filter (GimpCageTool *ct)
+{
+  if (! ct->render_node)
+    gimp_cage_tool_create_render_node (ct);
+
+  ct->filter = gimp_drawable_filter_new (GIMP_TOOL (ct)->drawable,
+                                         _("Cage transform"),
+                                         ct->render_node,
+                                         GIMP_ICON_TOOL_CAGE);
+  gimp_drawable_filter_set_region (ct->filter, GIMP_FILTER_REGION_DRAWABLE);
+
+  g_signal_connect (ct->filter, "flush",
+                    G_CALLBACK (gimp_cage_tool_filter_flush),
+                    ct);
+}
+
+static void
+gimp_cage_tool_filter_flush (GimpDrawableFilter *filter,
+                             GimpTool           *tool)
+{
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+static void
+gimp_cage_tool_filter_update (GimpCageTool *ct)
+{
+  gimp_drawable_filter_apply (ct->filter, NULL);
+}
diff --git a/app/tools/gimpcagetool.h b/app/tools/gimpcagetool.h
new file mode 100644
index 0000000..91daec0
--- /dev/null
+++ b/app/tools/gimpcagetool.h
@@ -0,0 +1,85 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpcagetool.h
+ * Copyright (C) 2010 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CAGE_TOOL_H__
+#define __GIMP_CAGE_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_CAGE_TOOL            (gimp_cage_tool_get_type ())
+#define GIMP_CAGE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CAGE_TOOL, GimpCageTool))
+#define GIMP_CAGE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CAGE_TOOL, GimpCageToolClass))
+#define GIMP_IS_CAGE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CAGE_TOOL))
+#define GIMP_IS_CAGE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CAGE_TOOL))
+#define GIMP_CAGE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CAGE_TOOL, GimpCageToolClass))
+
+#define GIMP_CAGE_TOOL_GET_OPTIONS(t)  (GIMP_CAGE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpCageTool      GimpCageTool;
+typedef struct _GimpCageToolClass GimpCageToolClass;
+
+struct _GimpCageTool
+{
+  GimpDrawTool    parent_instance;
+
+  GimpCageConfig *config;
+
+  gint            offset_x; /* used to convert the cage point coords */
+  gint            offset_y; /* to drawable coords */
+
+  gdouble         cursor_x; /* Hold the cursor x position */
+  gdouble         cursor_y; /* Hold the cursor y position */
+
+  gdouble         movement_start_x; /* Where the movement started */
+  gdouble         movement_start_y; /* Where the movement started */
+
+  gdouble         selection_start_x; /* Where the selection started */
+  gdouble         selection_start_y; /* Where the selection started */
+
+  gint            hovering_handle; /* Handle which the cursor is above */
+  gint            hovering_edge; /* Edge which the cursor is above */
+
+  GeglBuffer     *coef; /* Gegl buffer where the coefficient of the transformation are stored */
+  gboolean        dirty_coef; /* Indicate if the coef are still valid */
+
+  GeglNode       *render_node; /* Gegl node graph to render the transformation */
+  GeglNode       *cage_node; /* Gegl node that compute the cage transform */
+  GeglNode       *coef_node; /* Gegl node that read in the coef buffer */
+
+  gint            tool_state; /* Current state in statemachine */
+
+  GimpDrawableFilter *filter; /* For preview */
+};
+
+struct _GimpCageToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+
+void    gimp_cage_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_cage_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CAGE_TOOL_H__  */
diff --git a/app/tools/gimpcloneoptions-gui.c b/app/tools/gimpcloneoptions-gui.c
new file mode 100644
index 0000000..a676c1d
--- /dev/null
+++ b/app/tools/gimpcloneoptions-gui.c
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpcloneoptions.h"
+
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcloneoptions-gui.h"
+#include "gimppaintoptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean
+gimp_clone_options_sync_source (GBinding     *binding,
+                                const GValue *source_value,
+                                GValue       *target_value,
+                                gpointer      user_data)
+{
+  GimpCloneType type = g_value_get_enum (source_value);
+
+  g_value_set_boolean (target_value,
+                       type == GPOINTER_TO_INT (user_data));
+
+  return TRUE;
+}
+
+GtkWidget *
+gimp_clone_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget *frame;
+  GtkWidget *combo;
+  GtkWidget *source_vbox;
+  GtkWidget *button;
+  GtkWidget *hbox;
+
+  /*  the source frame  */
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the source type menu  */
+  combo = gimp_prop_enum_combo_box_new (config, "clone-type", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
+  gtk_widget_show (combo);
+
+  source_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), source_vbox);
+  gtk_widget_show (source_vbox);
+
+  button = gimp_prop_check_button_new (config, "sample-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (source_vbox), button, FALSE, FALSE, 0);
+
+  g_object_bind_property_full (config, "clone-type",
+                               button, "visible",
+                               G_BINDING_SYNC_CREATE,
+                               gimp_clone_options_sync_source,
+                               NULL,
+                               GINT_TO_POINTER (GIMP_CLONE_IMAGE), NULL);
+
+  hbox = gimp_prop_pattern_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                    NULL, 2,
+                                    "pattern-view-type", "pattern-view-size");
+  gtk_box_pack_start (GTK_BOX (source_vbox), hbox, FALSE, FALSE, 0);
+
+  g_object_bind_property_full (config, "clone-type",
+                               hbox,   "visible",
+                               G_BINDING_SYNC_CREATE,
+                               gimp_clone_options_sync_source,
+                               NULL,
+                               GINT_TO_POINTER (GIMP_CLONE_PATTERN), NULL);
+
+  combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  return vbox;
+}
diff --git a/app/tools/gimpcloneoptions-gui.h b/app/tools/gimpcloneoptions-gui.h
new file mode 100644
index 0000000..09a178d
--- /dev/null
+++ b/app/tools/gimpcloneoptions-gui.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CLONE_OPTIONS_GUI_H__
+#define __GIMP_CLONE_OPTIONS_GUI_H__
+
+
+GtkWidget * gimp_clone_options_gui (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_CLONE_OPTIONS_GUI_H__  */
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
new file mode 100644
index 0000000..32f8612
--- /dev/null
+++ b/app/tools/gimpclonetool.c
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "paint/gimpclone.h"
+#include "paint/gimpcloneoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpclonetool.h"
+#include "gimpcloneoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean   gimp_clone_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                                                 GimpDrawable  *drawable);
+
+
+G_DEFINE_TYPE (GimpCloneTool, gimp_clone_tool, GIMP_TYPE_SOURCE_TOOL)
+
+#define parent_class gimp_clone_tool_parent_class
+
+
+void
+gimp_clone_tool_register (GimpToolRegisterCallback  callback,
+                          gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_CLONE_TOOL,
+                GIMP_TYPE_CLONE_OPTIONS,
+                gimp_clone_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_PATTERN,
+                "gimp-clone-tool",
+                _("Clone"),
+                _("Clone Tool: Selectively copy from an image or pattern, using a brush"),
+                N_("_Clone"), "C",
+                NULL, GIMP_HELP_TOOL_CLONE,
+                GIMP_ICON_TOOL_CLONE,
+                data);
+}
+
+static void
+gimp_clone_tool_class_init (GimpCloneToolClass *klass)
+{
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  paint_tool_class->is_alpha_only = gimp_clone_tool_is_alpha_only;
+}
+
+static void
+gimp_clone_tool_init (GimpCloneTool *clone)
+{
+  GimpTool       *tool        = GIMP_TOOL (clone);
+  GimpPaintTool  *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+
+  gimp_tool_control_set_tool_cursor     (tool->control,
+                                         GIMP_TOOL_CURSOR_CLONE);
+  gimp_tool_control_set_action_object_2 (tool->control,
+                                         "context/context-pattern-select-set");
+
+  paint_tool->status      = _("Click to clone");
+  paint_tool->status_ctrl = _("%s to set a new clone source");
+
+  source_tool->status_paint           = _("Click to clone");
+  /* Translators: the translation of "Click" must be the first word */
+  source_tool->status_set_source      = _("Click to set a new clone source");
+  source_tool->status_set_source_ctrl = _("%s to set a new clone source");
+}
+
+static gboolean
+gimp_clone_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                               GimpDrawable  *drawable)
+{
+  GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  GimpContext      *context       = GIMP_CONTEXT (paint_options);
+  GimpLayerMode     paint_mode    = gimp_context_get_paint_mode (context);
+
+  return gimp_layer_mode_is_alpha_only (paint_mode);
+}
diff --git a/app/tools/gimpclonetool.h b/app/tools/gimpclonetool.h
new file mode 100644
index 0000000..9d74d5a
--- /dev/null
+++ b/app/tools/gimpclonetool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CLONE_TOOL_H__
+#define __GIMP_CLONE_TOOL_H__
+
+
+#include "gimpsourcetool.h"
+
+
+#define GIMP_TYPE_CLONE_TOOL            (gimp_clone_tool_get_type ())
+#define GIMP_CLONE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CLONE_TOOL, GimpCloneTool))
+#define GIMP_CLONE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CLONE_TOOL, GimpCloneToolClass))
+#define GIMP_IS_CLONE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CLONE_TOOL))
+#define GIMP_IS_CLONE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CLONE_TOOL))
+#define GIMP_CLONE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE_TOOL, GimpCloneToolClass))
+
+
+typedef struct _GimpCloneTool      GimpCloneTool;
+typedef struct _GimpCloneToolClass GimpCloneToolClass;
+
+struct _GimpCloneTool
+{
+  GimpSourceTool parent_instance;
+};
+
+struct _GimpCloneToolClass
+{
+  GimpSourceToolClass parent_class;
+};
+
+
+void    gimp_clone_tool_register (GimpToolRegisterCallback  callback,
+                                  gpointer                  data);
+
+GType   gimp_clone_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CLONE_TOOL_H__  */
diff --git a/app/tools/gimpcoloroptions.c b/app/tools/gimpcoloroptions.c
new file mode 100644
index 0000000..62a543a
--- /dev/null
+++ b/app/tools/gimpcoloroptions.c
@@ -0,0 +1,170 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+
+#include "gimpcoloroptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLE_MERGED,
+  PROP_SAMPLE_AVERAGE,
+  PROP_AVERAGE_RADIUS
+};
+
+
+static void   gimp_color_options_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void   gimp_color_options_get_property (GObject      *object,
+                                               guint         property_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpColorOptions, gimp_color_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+
+static void
+gimp_color_options_class_init (GimpColorOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_color_options_set_property;
+  object_class->get_property = gimp_color_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            _("Use merged color value from "
+                              "all composited visible layers"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_AVERAGE,
+                            "sample-average",
+                            _("Sample average"),
+                            _("Use averaged color value from "
+                              "nearby pixels"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_AVERAGE_RADIUS,
+                           "average-radius",
+                           _("Radius"),
+                           _("Color Picker Average Radius"),
+                           1.0, 300.0, 3.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_color_options_init (GimpColorOptions *options)
+{
+}
+
+static void
+gimp_color_options_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpColorOptions *options = GIMP_COLOR_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+    case PROP_SAMPLE_AVERAGE:
+      options->sample_average = g_value_get_boolean (value);
+      break;
+    case PROP_AVERAGE_RADIUS:
+      options->average_radius = g_value_get_double (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_options_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpColorOptions *options = GIMP_COLOR_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+    case PROP_SAMPLE_AVERAGE:
+      g_value_set_boolean (value, options->sample_average);
+      break;
+    case PROP_AVERAGE_RADIUS:
+      g_value_set_double (value, options->average_radius);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_color_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget *button;
+  GtkWidget *frame;
+  GtkWidget *scale;
+
+  /*  the sample average options  */
+  scale = gimp_prop_spin_scale_new (config, "average-radius", NULL,
+                                    1.0, 10.0, 0);
+
+  frame = gimp_prop_expanding_frame_new (config, "sample-average", NULL,
+                                         scale, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /* The Sample merged checkbox. */
+  button = gimp_prop_check_button_new (config, "sample-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return vbox;
+}
diff --git a/app/tools/gimpcoloroptions.h b/app/tools/gimpcoloroptions.h
new file mode 100644
index 0000000..1d69438
--- /dev/null
+++ b/app/tools/gimpcoloroptions.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_OPTIONS_H__
+#define __GIMP_COLOR_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_COLOR_OPTIONS            (gimp_color_options_get_type ())
+#define GIMP_COLOR_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_OPTIONS, GimpColorOptions))
+#define GIMP_COLOR_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_OPTIONS, GimpColorOptionsClass))
+#define GIMP_IS_COLOR_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_OPTIONS))
+#define GIMP_IS_COLOR_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_OPTIONS))
+#define GIMP_COLOR_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_OPTIONS, GimpColorOptionsClass))
+
+
+typedef struct _GimpColorOptionsClass GimpColorOptionsClass;
+
+struct _GimpColorOptions
+{
+  GimpToolOptions  parent_instance;
+
+  gboolean         sample_merged;
+  gboolean         sample_average;
+  gdouble          average_radius;
+};
+
+struct _GimpColorOptionsClass
+{
+  GimpToolOptionsClass  parent_instance;
+};
+
+
+GType       gimp_color_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_COLOR_OPTIONS_H__ */
diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
new file mode 100644
index 0000000..f2ba08b
--- /dev/null
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpcolorpickeroptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLE_AVERAGE, /* overrides a GimpColorOptions property */
+  PROP_PICK_TARGET,
+  PROP_USE_INFO_WINDOW,
+  PROP_FRAME1_MODE,
+  PROP_FRAME2_MODE
+};
+
+
+static void   gimp_color_picker_options_set_property (GObject      *object,
+                                                      guint         property_id,
+                                                      const GValue *value,
+                                                      GParamSpec   *pspec);
+static void   gimp_color_picker_options_get_property (GObject      *object,
+                                                      guint         property_id,
+                                                      GValue       *value,
+                                                      GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpColorPickerOptions, gimp_color_picker_options,
+               GIMP_TYPE_COLOR_OPTIONS)
+
+
+static void
+gimp_color_picker_options_class_init (GimpColorPickerOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_color_picker_options_set_property;
+  object_class->get_property = gimp_color_picker_options_get_property;
+
+  /* override a GimpColorOptions property to get a different default value */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_AVERAGE,
+                            "sample-average",
+                            _("Sample average"),
+                            _("Use averaged color value from "
+                              "nearby pixels"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PICK_TARGET,
+                         "pick-target",
+                         _("Pick Target"),
+                         _("Choose what the color picker will do"),
+                         GIMP_TYPE_COLOR_PICK_TARGET,
+                         GIMP_COLOR_PICK_TARGET_FOREGROUND,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_INFO_WINDOW,
+                            "use-info-window",
+                            _("Use info window"),
+                            _("Open a floating dialog to view picked "
+                              "color values in various color models"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FRAME1_MODE,
+                         "frame1-mode",
+                         "Frame 1 Mode", NULL,
+                         GIMP_TYPE_COLOR_PICK_MODE,
+                         GIMP_COLOR_PICK_MODE_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FRAME2_MODE,
+                         "frame2-mode",
+                         "Frame 2 Mode", NULL,
+                         GIMP_TYPE_COLOR_PICK_MODE,
+                         GIMP_COLOR_PICK_MODE_RGB_PERCENT,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_color_picker_options_init (GimpColorPickerOptions *options)
+{
+}
+
+static void
+gimp_color_picker_options_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpColorPickerOptions *options = GIMP_COLOR_PICKER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_AVERAGE:
+      GIMP_COLOR_OPTIONS (options)->sample_average = g_value_get_boolean (value);
+      break;
+    case PROP_PICK_TARGET:
+      options->pick_target = g_value_get_enum (value);
+      break;
+    case PROP_USE_INFO_WINDOW:
+      options->use_info_window = g_value_get_boolean (value);
+      break;
+    case PROP_FRAME1_MODE:
+      options->frame1_mode = g_value_get_enum (value);
+      break;
+    case PROP_FRAME2_MODE:
+      options->frame2_mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_picker_options_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpColorPickerOptions *options = GIMP_COLOR_PICKER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_AVERAGE:
+      g_value_set_boolean (value,
+                           GIMP_COLOR_OPTIONS (options)->sample_average);
+      break;
+    case PROP_PICK_TARGET:
+      g_value_set_enum (value, options->pick_target);
+      break;
+    case PROP_USE_INFO_WINDOW:
+      g_value_set_boolean (value, options->use_info_window);
+      break;
+    case PROP_FRAME1_MODE:
+      g_value_set_enum (value, options->frame1_mode);
+      break;
+    case PROP_FRAME2_MODE:
+      g_value_set_enum (value, options->frame2_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_color_picker_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config = G_OBJECT (tool_options);
+  GtkWidget       *vbox   = gimp_color_options_gui (tool_options);
+  GtkWidget       *button;
+  GtkWidget       *frame;
+  gchar           *str;
+  GdkModifierType  extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType  toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /*  the pick FG/BG frame  */
+  str = g_strdup_printf (_("Pick Target  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+  frame = gimp_prop_enum_radio_frame_new (config, "pick-target", str, -1, -1);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /*  the use_info_window toggle button  */
+  str = g_strdup_printf (_("Use info window  (%s)"),
+                         gimp_get_mod_string (extend_mask));
+  button = gimp_prop_check_button_new (config, "use-info-window", str);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return vbox;
+}
diff --git a/app/tools/gimpcolorpickeroptions.h b/app/tools/gimpcolorpickeroptions.h
new file mode 100644
index 0000000..8fc7024
--- /dev/null
+++ b/app/tools/gimpcolorpickeroptions.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_COLOR_PICKER_OPTIONS_H__
+#define  __GIMP_COLOR_PICKER_OPTIONS_H__
+
+
+#include "gimpcoloroptions.h"
+
+
+#define GIMP_TYPE_COLOR_PICKER_OPTIONS            (gimp_color_picker_options_get_type ())
+#define GIMP_COLOR_PICKER_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_PICKER_OPTIONS, GimpColorPickerOptions))
+#define GIMP_COLOR_PICKER_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_PICKER_OPTIONS, GimpColorPickerOptionsClass))
+#define GIMP_IS_COLOR_PICKER_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_PICKER_OPTIONS))
+#define GIMP_IS_COLOR_PICKER_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_PICKER_OPTIONS))
+#define GIMP_COLOR_PICKER_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_PICKER_OPTIONS, GimpColorPickerOptionsClass))
+
+
+typedef struct _GimpColorPickerOptions GimpColorPickerOptions;
+typedef struct _GimpToolOptionsClass   GimpColorPickerOptionsClass;
+
+struct _GimpColorPickerOptions
+{
+  GimpColorOptions     parent_instance;
+
+  GimpColorPickTarget  pick_target;
+  gboolean             use_info_window;
+  GimpColorPickMode    frame1_mode;
+  GimpColorPickMode    frame2_mode;
+};
+
+
+GType       gimp_color_picker_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_picker_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_COLOR_PICKER_OPTIONS_H__  */
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
new file mode 100644
index 0000000..7e9b117
--- /dev/null
+++ b/app/tools/gimpcolorpickertool.c
@@ -0,0 +1,455 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpcolorframe.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolgui.h"
+
+#include "gimpcolorpickeroptions.h"
+#include "gimpcolorpickertool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_color_picker_tool_constructed   (GObject             *object);
+static void   gimp_color_picker_tool_dispose       (GObject             *object);
+
+static void   gimp_color_picker_tool_control       (GimpTool            *tool,
+                                                    GimpToolAction       action,
+                                                    GimpDisplay         *display);
+static void   gimp_color_picker_tool_modifier_key  (GimpTool            *tool,
+                                                    GdkModifierType      key,
+                                                    gboolean             press,
+                                                    GdkModifierType      state,
+                                                    GimpDisplay         *display);
+static void   gimp_color_picker_tool_oper_update   (GimpTool            *tool,
+                                                    const GimpCoords    *coords,
+                                                    GdkModifierType      state,
+                                                    gboolean             proximity,
+                                                    GimpDisplay         *display);
+
+static void   gimp_color_picker_tool_picked        (GimpColorTool       *color_tool,
+                                                    const GimpCoords    *coords,
+                                                    GimpDisplay         *display,
+                                                    GimpColorPickState   pick_state,
+                                                    const Babl          *sample_format,
+                                                    gpointer             pixel,
+                                                    const GimpRGB       *color);
+
+static void   gimp_color_picker_tool_info_create   (GimpColorPickerTool *picker_tool,
+                                                    GimpDisplay         *display);
+static void   gimp_color_picker_tool_info_response (GimpToolGui         *gui,
+                                                    gint                 response_id,
+                                                    GimpColorPickerTool *picker_tool);
+static void   gimp_color_picker_tool_info_update   (GimpColorPickerTool *picker_tool,
+                                                    GimpDisplay         *display,
+                                                    gboolean             sample_average,
+                                                    const Babl          *sample_format,
+                                                    gpointer             pixel,
+                                                    const GimpRGB       *color,
+                                                    gint                 x,
+                                                    gint                 y);
+
+
+G_DEFINE_TYPE (GimpColorPickerTool, gimp_color_picker_tool,
+               GIMP_TYPE_COLOR_TOOL)
+
+#define parent_class gimp_color_picker_tool_parent_class
+
+
+void
+gimp_color_picker_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_COLOR_PICKER_TOOL,
+                GIMP_TYPE_COLOR_PICKER_OPTIONS,
+                gimp_color_picker_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-color-picker-tool",
+                _("Color Picker"),
+                _("Color Picker Tool: Set colors from image pixels"),
+                N_("C_olor Picker"), "O",
+                NULL, GIMP_HELP_TOOL_COLOR_PICKER,
+                GIMP_ICON_TOOL_COLOR_PICKER,
+                data);
+}
+
+static void
+gimp_color_picker_tool_class_init (GimpColorPickerToolClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpToolClass      *tool_class       = GIMP_TOOL_CLASS (klass);
+  GimpColorToolClass *color_tool_class = GIMP_COLOR_TOOL_CLASS (klass);
+
+  object_class->constructed = gimp_color_picker_tool_constructed;
+  object_class->dispose     = gimp_color_picker_tool_dispose;
+
+  tool_class->control       = gimp_color_picker_tool_control;
+  tool_class->modifier_key  = gimp_color_picker_tool_modifier_key;
+  tool_class->oper_update   = gimp_color_picker_tool_oper_update;
+
+  color_tool_class->picked  = gimp_color_picker_tool_picked;
+}
+
+static void
+gimp_color_picker_tool_init (GimpColorPickerTool *picker_tool)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (picker_tool);
+
+  color_tool->pick_target = GIMP_COLOR_PICK_TARGET_FOREGROUND;
+}
+
+static void
+gimp_color_picker_tool_constructed (GObject *object)
+{
+  GimpTool *tool = GIMP_TOOL (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_color_tool_enable (GIMP_COLOR_TOOL (object),
+                          GIMP_COLOR_TOOL_GET_OPTIONS (tool));
+}
+
+static void
+gimp_color_picker_tool_dispose (GObject *object)
+{
+  GimpColorPickerTool *picker_tool = GIMP_COLOR_PICKER_TOOL (object);
+
+  g_clear_object (&picker_tool->gui);
+  picker_tool->color_area   = NULL;
+  picker_tool->color_frame1 = NULL;
+  picker_tool->color_frame2 = NULL;
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_color_picker_tool_control (GimpTool       *tool,
+                                GimpToolAction  action,
+                                GimpDisplay    *display)
+{
+  GimpColorPickerTool *picker_tool = GIMP_COLOR_PICKER_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      if (picker_tool->gui)
+        gimp_tool_gui_hide (picker_tool->gui);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_color_picker_tool_modifier_key (GimpTool        *tool,
+                                     GdkModifierType  key,
+                                     gboolean         press,
+                                     GdkModifierType  state,
+                                     GimpDisplay     *display)
+{
+  GimpColorPickerOptions *options = GIMP_COLOR_PICKER_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_extend_selection_mask ())
+    {
+      g_object_set (options, "use-info-window", ! options->use_info_window,
+                    NULL);
+    }
+  else if (key == gimp_get_toggle_behavior_mask ())
+    {
+      switch (options->pick_target)
+        {
+        case GIMP_COLOR_PICK_TARGET_FOREGROUND:
+          g_object_set (options,
+                        "pick-target", GIMP_COLOR_PICK_TARGET_BACKGROUND,
+                        NULL);
+          break;
+
+        case GIMP_COLOR_PICK_TARGET_BACKGROUND:
+          g_object_set (options,
+                        "pick-target", GIMP_COLOR_PICK_TARGET_FOREGROUND,
+                        NULL);
+          break;
+
+        default:
+          break;
+        }
+
+    }
+}
+
+static void
+gimp_color_picker_tool_oper_update (GimpTool         *tool,
+                                    const GimpCoords *coords,
+                                    GdkModifierType   state,
+                                    gboolean          proximity,
+                                    GimpDisplay      *display)
+{
+  GimpColorPickerTool    *picker_tool = GIMP_COLOR_PICKER_TOOL (tool);
+  GimpColorPickerOptions *options = GIMP_COLOR_PICKER_TOOL_GET_OPTIONS (tool);
+
+  GIMP_COLOR_TOOL (tool)->pick_target = options->pick_target;
+
+  gimp_tool_pop_status (tool, display);
+
+  if (proximity)
+    {
+      gchar           *status_help = NULL;
+      GdkModifierType  extend_mask = 0;
+      GdkModifierType  toggle_mask;
+
+      if (! picker_tool->gui)
+        extend_mask = gimp_get_extend_selection_mask ();
+
+      toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      switch (options->pick_target)
+        {
+        case GIMP_COLOR_PICK_TARGET_NONE:
+          status_help = gimp_suggest_modifiers (_("Click in any image to view"
+                                                  " its color"),
+                                                extend_mask & ~state,
+                                                NULL, NULL, NULL);
+          break;
+
+        case GIMP_COLOR_PICK_TARGET_FOREGROUND:
+          status_help = gimp_suggest_modifiers (_("Click in any image to pick"
+                                                  " the foreground color"),
+                                                (extend_mask | toggle_mask) &
+                                                ~state,
+                                                NULL, NULL, NULL);
+          break;
+
+        case GIMP_COLOR_PICK_TARGET_BACKGROUND:
+          status_help = gimp_suggest_modifiers (_("Click in any image to pick"
+                                                  " the background color"),
+                                                (extend_mask | toggle_mask) &
+                                                ~state,
+                                                NULL, NULL, NULL);
+          break;
+
+        case GIMP_COLOR_PICK_TARGET_PALETTE:
+          status_help = gimp_suggest_modifiers (_("Click in any image to add"
+                                                  " the color to the palette"),
+                                                extend_mask & ~state,
+                                                NULL, NULL, NULL);
+          break;
+        }
+
+      if (status_help != NULL)
+        {
+          gimp_tool_push_status (tool, display, "%s", status_help);
+          g_free (status_help);
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+}
+
+static void
+gimp_color_picker_tool_picked (GimpColorTool      *color_tool,
+                               const GimpCoords   *coords,
+                               GimpDisplay        *display,
+                               GimpColorPickState  pick_state,
+                               const Babl         *sample_format,
+                               gpointer            pixel,
+                               const GimpRGB      *color)
+{
+  GimpColorPickerTool    *picker_tool = GIMP_COLOR_PICKER_TOOL (color_tool);
+  GimpColorPickerOptions *options;
+
+  options = GIMP_COLOR_PICKER_TOOL_GET_OPTIONS (color_tool);
+
+  if (options->use_info_window && ! picker_tool->gui)
+    gimp_color_picker_tool_info_create (picker_tool, display);
+
+  if (picker_tool->gui &&
+      (options->use_info_window ||
+       gimp_tool_gui_get_visible (picker_tool->gui)))
+    {
+      gimp_color_picker_tool_info_update (picker_tool, display,
+                                          GIMP_COLOR_OPTIONS (options)->sample_average,
+                                          sample_format, pixel, color,
+                                          (gint) floor (coords->x),
+                                          (gint) floor (coords->y));
+    }
+
+  GIMP_COLOR_TOOL_CLASS (parent_class)->picked (color_tool,
+                                                coords, display, pick_state,
+                                                sample_format, pixel, color);
+}
+
+static void
+gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool,
+                                    GimpDisplay         *display)
+{
+  GimpTool         *tool     = GIMP_TOOL (picker_tool);
+  GimpToolOptions  *options  = GIMP_TOOL_GET_OPTIONS (tool);
+  GimpContext      *context  = GIMP_CONTEXT (tool->tool_info->tool_options);
+  GimpDisplayShell *shell    = gimp_display_get_shell (display);
+  GimpImage        *image    = gimp_display_get_image (display);
+  GimpDrawable     *drawable = gimp_image_get_active_drawable (image);
+  GtkWidget        *hbox;
+  GtkWidget        *frame;
+  GimpRGB           color;
+
+  picker_tool->gui = gimp_tool_gui_new (tool->tool_info,
+                                        NULL,
+                                        _("Color Picker Information"),
+                                        NULL, NULL,
+                                        gtk_widget_get_screen (GTK_WIDGET (shell)),
+                                        gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                                        TRUE,
+
+                                        _("_Close"), GTK_RESPONSE_CLOSE,
+
+                                        NULL);
+
+  gimp_tool_gui_set_auto_overlay (picker_tool->gui, TRUE);
+  gimp_tool_gui_set_focus_on_map (picker_tool->gui, FALSE);
+  gimp_tool_gui_set_viewable (picker_tool->gui, GIMP_VIEWABLE (drawable));
+
+  g_signal_connect (picker_tool->gui, "response",
+                    G_CALLBACK (gimp_color_picker_tool_info_response),
+                    picker_tool);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (picker_tool->gui)),
+                      hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  picker_tool->color_frame1 = gimp_color_frame_new ();
+  gimp_color_frame_set_color_config (GIMP_COLOR_FRAME (picker_tool->color_frame1),
+                                     context->gimp->config->color_management);
+  gimp_color_frame_set_has_coords (GIMP_COLOR_FRAME (picker_tool->color_frame1),
+                                   TRUE);
+  g_object_bind_property (options,                   "frame1-mode",
+                          picker_tool->color_frame1, "mode",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+  gtk_box_pack_start (GTK_BOX (hbox), picker_tool->color_frame1,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (picker_tool->color_frame1);
+
+  picker_tool->color_frame2 = gimp_color_frame_new ();
+  gimp_color_frame_set_color_config (GIMP_COLOR_FRAME (picker_tool->color_frame2),
+                                     context->gimp->config->color_management);
+  g_object_bind_property (options,                   "frame2-mode",
+                          picker_tool->color_frame2, "mode",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+  gtk_box_pack_start (GTK_BOX (hbox), picker_tool->color_frame2,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (picker_tool->color_frame2);
+
+  frame = gtk_frame_new (NULL);
+  gimp_widget_set_fully_opaque (frame, TRUE);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);
+  picker_tool->color_area =
+    gimp_color_area_new (&color,
+                         gimp_drawable_has_alpha (drawable) ?
+                         GIMP_COLOR_AREA_LARGE_CHECKS :
+                         GIMP_COLOR_AREA_FLAT,
+                         GDK_BUTTON1_MASK | GDK_BUTTON2_MASK);
+  gimp_color_area_set_color_config (GIMP_COLOR_AREA (picker_tool->color_area),
+                                    context->gimp->config->color_management);
+  gtk_widget_set_size_request (picker_tool->color_area, 48, -1);
+  gtk_drag_dest_unset (picker_tool->color_area);
+  gtk_container_add (GTK_CONTAINER (frame), picker_tool->color_area);
+  gtk_widget_show (picker_tool->color_area);
+}
+
+static void
+gimp_color_picker_tool_info_response (GimpToolGui         *gui,
+                                      gint                 response_id,
+                                      GimpColorPickerTool *picker_tool)
+{
+  GimpTool *tool = GIMP_TOOL (picker_tool);
+
+  gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, NULL);
+}
+
+static void
+gimp_color_picker_tool_info_update (GimpColorPickerTool *picker_tool,
+                                    GimpDisplay         *display,
+                                    gboolean             sample_average,
+                                    const Babl          *sample_format,
+                                    gpointer             pixel,
+                                    const GimpRGB       *color,
+                                    gint                 x,
+                                    gint                 y)
+{
+  GimpTool     *tool     = GIMP_TOOL (picker_tool);
+  GimpImage    *image    = gimp_display_get_image (display);
+  GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+  tool->display = display;
+
+  gimp_tool_gui_set_shell (picker_tool->gui,
+                           gimp_display_get_shell (display));
+  gimp_tool_gui_set_viewable (picker_tool->gui,
+                              GIMP_VIEWABLE (drawable));
+
+  gimp_color_area_set_color (GIMP_COLOR_AREA (picker_tool->color_area),
+                             color);
+
+  gimp_color_frame_set_color (GIMP_COLOR_FRAME (picker_tool->color_frame1),
+                              sample_average, sample_format, pixel, color,
+                              x, y);
+  gimp_color_frame_set_color (GIMP_COLOR_FRAME (picker_tool->color_frame2),
+                              sample_average, sample_format, pixel, color,
+                              x, y);
+
+  gimp_tool_gui_show (picker_tool->gui);
+}
diff --git a/app/tools/gimpcolorpickertool.h b/app/tools/gimpcolorpickertool.h
new file mode 100644
index 0000000..4967a52
--- /dev/null
+++ b/app/tools/gimpcolorpickertool.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_COLOR_PICKER_TOOL_H__
+#define  __GIMP_COLOR_PICKER_TOOL_H__
+
+
+#include "gimpcolortool.h"
+
+
+#define GIMP_TYPE_COLOR_PICKER_TOOL            (gimp_color_picker_tool_get_type ())
+#define GIMP_COLOR_PICKER_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_PICKER_TOOL, GimpColorPickerTool))
+#define GIMP_COLOR_PICKER_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_PICKER_TOOL, GimpColorPickerToolClass))
+#define GIMP_IS_COLOR_PICKER_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_PICKER_TOOL))
+#define GIMP_IS_COLOR_PICKER_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_PICKER_TOOL))
+#define GIMP_COLOR_PICKER_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_PICKER_TOOL, GimpColorPickerToolClass))
+
+#define GIMP_COLOR_PICKER_TOOL_GET_OPTIONS(t)  (GIMP_COLOR_PICKER_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpColorPickerTool      GimpColorPickerTool;
+typedef struct _GimpColorPickerToolClass GimpColorPickerToolClass;
+
+struct _GimpColorPickerTool
+{
+  GimpColorTool  parent_instance;
+
+  GimpToolGui   *gui;
+  GtkWidget     *color_area;
+  GtkWidget     *color_frame1;
+  GtkWidget     *color_frame2;
+};
+
+struct _GimpColorPickerToolClass
+{
+  GimpColorToolClass  parent_class;
+};
+
+
+void    gimp_color_picker_tool_register (GimpToolRegisterCallback  callback,
+                                         gpointer                  data);
+
+GType   gimp_color_picker_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_COLOR_PICKER_TOOL_H__  */
diff --git a/app/tools/gimpcolortool.c b/app/tools/gimpcolortool.c
new file mode 100644
index 0000000..683a713
--- /dev/null
+++ b/app/tools/gimpcolortool.c
@@ -0,0 +1,702 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpdata.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-color.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpsamplepoint.h"
+
+#include "widgets/gimpcolormapeditor.h"
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockable.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimppaletteeditor.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+
+#include "gimpcoloroptions.h"
+#include "gimpcolortool.h"
+#include "gimpsamplepointtool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PICKED,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_color_tool_finalize       (GObject               *object);
+
+static void   gimp_color_tool_button_press   (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonPressType    press_type,
+                                              GimpDisplay           *display);
+static void   gimp_color_tool_button_release (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonReleaseType  release_type,
+                                              GimpDisplay           *display);
+static void   gimp_color_tool_motion         (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpDisplay           *display);
+static void   gimp_color_tool_oper_update    (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              GdkModifierType        state,
+                                              gboolean               proximity,
+                                              GimpDisplay           *display);
+static void   gimp_color_tool_cursor_update  (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              GdkModifierType        state,
+                                              GimpDisplay           *display);
+
+static void   gimp_color_tool_draw           (GimpDrawTool          *draw_tool);
+
+static gboolean
+              gimp_color_tool_real_can_pick  (GimpColorTool         *color_tool,
+                                              const GimpCoords      *coords,
+                                              GimpDisplay           *display);
+static gboolean   gimp_color_tool_real_pick  (GimpColorTool         *color_tool,
+                                              const GimpCoords      *coords,
+                                              GimpDisplay           *display,
+                                              const Babl           **sample_format,
+                                              gpointer               pixel,
+                                              GimpRGB               *color);
+static void   gimp_color_tool_real_picked    (GimpColorTool         *color_tool,
+                                              const GimpCoords      *coords,
+                                              GimpDisplay           *display,
+                                              GimpColorPickState     pick_state,
+                                              const Babl            *sample_format,
+                                              gpointer               pixel,
+                                              const GimpRGB         *color);
+
+static gboolean   gimp_color_tool_can_pick   (GimpColorTool         *tool,
+                                              const GimpCoords      *coords,
+                                              GimpDisplay           *display);
+static void   gimp_color_tool_pick           (GimpColorTool         *tool,
+                                              const GimpCoords      *coords,
+                                              GimpDisplay           *display,
+                                              GimpColorPickState     pick_state);
+
+
+G_DEFINE_TYPE (GimpColorTool, gimp_color_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_color_tool_parent_class
+
+static guint gimp_color_tool_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_color_tool_class_init (GimpColorToolClass *klass)
+{
+  GObjectClass      *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class   = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_class   = GIMP_DRAW_TOOL_CLASS (klass);
+
+  gimp_color_tool_signals[PICKED] =
+    g_signal_new ("picked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpColorToolClass, picked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER_OBJECT_ENUM_POINTER_POINTER_BOXED,
+                  G_TYPE_NONE, 6,
+                  G_TYPE_POINTER,
+                  GIMP_TYPE_DISPLAY,
+                  GIMP_TYPE_COLOR_PICK_STATE,
+                  G_TYPE_POINTER,
+                  G_TYPE_POINTER,
+                  GIMP_TYPE_RGB | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  object_class->finalize     = gimp_color_tool_finalize;
+
+  tool_class->button_press   = gimp_color_tool_button_press;
+  tool_class->button_release = gimp_color_tool_button_release;
+  tool_class->motion         = gimp_color_tool_motion;
+  tool_class->oper_update    = gimp_color_tool_oper_update;
+  tool_class->cursor_update  = gimp_color_tool_cursor_update;
+
+  draw_class->draw           = gimp_color_tool_draw;
+
+  klass->can_pick            = gimp_color_tool_real_can_pick;
+  klass->pick                = gimp_color_tool_real_pick;
+  klass->picked              = gimp_color_tool_real_picked;
+}
+
+static void
+gimp_color_tool_init (GimpColorTool *color_tool)
+{
+  GimpTool *tool = GIMP_TOOL (color_tool);
+
+  gimp_tool_control_set_action_size (tool->control,
+                                     "tools/tools-color-average-radius-set");
+}
+
+static void
+gimp_color_tool_finalize (GObject *object)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (object);
+
+  g_clear_object (&color_tool->options);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_color_tool_button_press (GimpTool            *tool,
+                              const GimpCoords    *coords,
+                              guint32              time,
+                              GdkModifierType      state,
+                              GimpButtonPressType  press_type,
+                              GimpDisplay         *display)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool);
+
+  if (color_tool->enabled)
+    {
+      if (color_tool->sample_point)
+        {
+          gimp_sample_point_tool_start_edit (tool, display,
+                                             color_tool->sample_point);
+        }
+      else if (gimp_color_tool_can_pick (color_tool, coords, display))
+        {
+          gimp_color_tool_pick (color_tool, coords, display,
+                                GIMP_COLOR_PICK_STATE_START);
+
+          gimp_tool_control_activate (tool->control);
+        }
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+    }
+}
+
+static void
+gimp_color_tool_button_release (GimpTool              *tool,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonReleaseType  release_type,
+                                GimpDisplay           *display)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool);
+
+  if (color_tool->enabled)
+    {
+      gimp_tool_control_halt (tool->control);
+
+      if (! color_tool->sample_point &&
+          gimp_color_tool_can_pick (color_tool, coords, display))
+        {
+          gimp_color_tool_pick (color_tool, coords, display,
+                                GIMP_COLOR_PICK_STATE_END);
+        }
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                      release_type, display);
+    }
+}
+
+static void
+gimp_color_tool_motion (GimpTool         *tool,
+                        const GimpCoords *coords,
+                        guint32           time,
+                        GdkModifierType   state,
+                        GimpDisplay      *display)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool);
+
+  if (color_tool->enabled)
+    {
+      if (! color_tool->sample_point)
+        {
+          gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+          color_tool->can_pick = gimp_color_tool_can_pick (color_tool,
+                                                           coords, display);
+          color_tool->center_x = coords->x;
+          color_tool->center_y = coords->y;
+
+          if (color_tool->can_pick)
+            {
+              gimp_color_tool_pick (color_tool, coords, display,
+                                    GIMP_COLOR_PICK_STATE_UPDATE);
+            }
+
+          gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+        }
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
+                                              display);
+    }
+}
+
+static void
+gimp_color_tool_oper_update (GimpTool         *tool,
+                             const GimpCoords *coords,
+                             GdkModifierType   state,
+                             gboolean          proximity,
+                             GimpDisplay      *display)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool);
+
+  if (color_tool->enabled)
+    {
+      GimpDrawTool     *draw_tool    = GIMP_DRAW_TOOL (tool);
+      GimpDisplayShell *shell        = gimp_display_get_shell (display);
+      GimpSamplePoint  *sample_point = NULL;
+
+      gimp_draw_tool_pause (draw_tool);
+
+      if (! draw_tool->widget &&
+
+          gimp_draw_tool_is_active (draw_tool) &&
+          (draw_tool->display != display ||
+           ! proximity))
+        {
+          gimp_draw_tool_stop (draw_tool);
+        }
+
+      if (gimp_display_shell_get_show_sample_points (shell) &&
+          proximity)
+        {
+          GimpImage *image         = gimp_display_get_image (display);
+          gint       snap_distance = display->config->snap_distance;
+
+          sample_point =
+            gimp_image_pick_sample_point (image,
+                                          coords->x, coords->y,
+                                          FUNSCALEX (shell, snap_distance),
+                                          FUNSCALEY (shell, snap_distance));
+        }
+
+      color_tool->sample_point = sample_point;
+
+      color_tool->can_pick = gimp_color_tool_can_pick (color_tool,
+                                                       coords, display);
+      color_tool->center_x = coords->x;
+      color_tool->center_y = coords->y;
+
+      if (! draw_tool->widget &&
+
+          ! gimp_draw_tool_is_active (draw_tool) &&
+          proximity)
+        {
+          gimp_draw_tool_start (draw_tool, display);
+        }
+
+      gimp_draw_tool_resume (draw_tool);
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                                   proximity, display);
+    }
+}
+
+static void
+gimp_color_tool_cursor_update (GimpTool         *tool,
+                               const GimpCoords *coords,
+                               GdkModifierType   state,
+                               GimpDisplay      *display)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool);
+
+  if (color_tool->enabled)
+    {
+      if (color_tool->sample_point)
+        {
+          gimp_tool_set_cursor (tool, display,
+                                GIMP_CURSOR_MOUSE,
+                                GIMP_TOOL_CURSOR_COLOR_PICKER,
+                                GIMP_CURSOR_MODIFIER_MOVE);
+        }
+      else
+        {
+          GimpCursorModifier modifier = GIMP_CURSOR_MODIFIER_BAD;
+
+          if (gimp_color_tool_can_pick (color_tool, coords, display))
+            {
+              switch (color_tool->pick_target)
+                {
+                case GIMP_COLOR_PICK_TARGET_NONE:
+                  modifier = GIMP_CURSOR_MODIFIER_NONE;
+                  break;
+                case GIMP_COLOR_PICK_TARGET_FOREGROUND:
+                  modifier = GIMP_CURSOR_MODIFIER_FOREGROUND;
+                  break;
+                case GIMP_COLOR_PICK_TARGET_BACKGROUND:
+                  modifier = GIMP_CURSOR_MODIFIER_BACKGROUND;
+                  break;
+                case GIMP_COLOR_PICK_TARGET_PALETTE:
+                  modifier = GIMP_CURSOR_MODIFIER_PLUS;
+                  break;
+                }
+            }
+
+          gimp_tool_set_cursor (tool, display,
+                                GIMP_CURSOR_COLOR_PICKER,
+                                GIMP_TOOL_CURSOR_COLOR_PICKER,
+                                modifier);
+        }
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                     display);
+    }
+}
+
+static void
+gimp_color_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpColorTool *color_tool = GIMP_COLOR_TOOL (draw_tool);
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+
+  if (color_tool->enabled)
+    {
+      if (color_tool->sample_point)
+        {
+          GimpImage      *image = gimp_display_get_image (draw_tool->display);
+          GimpCanvasItem *item;
+          gint            index;
+          gint            x;
+          gint            y;
+
+          gimp_sample_point_get_position (color_tool->sample_point, &x, &y);
+
+          index = g_list_index (gimp_image_get_sample_points (image),
+                                color_tool->sample_point) + 1;
+
+          item = gimp_draw_tool_add_sample_point (draw_tool, x, y, index);
+          gimp_canvas_item_set_highlight (item, TRUE);
+        }
+      else if (color_tool->can_pick && color_tool->options->sample_average)
+        {
+          gdouble radius = color_tool->options->average_radius;
+
+          gimp_draw_tool_add_rectangle (draw_tool,
+                                        FALSE,
+                                        color_tool->center_x - radius,
+                                        color_tool->center_y - radius,
+                                        2 * radius + 1,
+                                        2 * radius + 1);
+        }
+    }
+}
+
+static gboolean
+gimp_color_tool_real_can_pick (GimpColorTool    *color_tool,
+                               const GimpCoords *coords,
+                               GimpDisplay      *display)
+{
+  GimpDisplayShell *shell = gimp_display_get_shell (display);
+  GimpImage        *image = gimp_display_get_image (display);
+
+  return gimp_image_coords_in_active_pickable (image, coords,
+                                               shell->show_all,
+                                               color_tool->options->sample_merged,
+                                               FALSE);
+}
+
+static gboolean
+gimp_color_tool_real_pick (GimpColorTool     *color_tool,
+                           const GimpCoords  *coords,
+                           GimpDisplay       *display,
+                           const Babl       **sample_format,
+                           gpointer           pixel,
+                           GimpRGB           *color)
+{
+  GimpDisplayShell *shell    = gimp_display_get_shell (display);
+  GimpImage        *image    = gimp_display_get_image (display);
+  GimpDrawable     *drawable = gimp_image_get_active_drawable (image);
+
+  g_return_val_if_fail (drawable != NULL, FALSE);
+
+  return gimp_image_pick_color (image, drawable,
+                                coords->x, coords->y,
+                                shell->show_all,
+                                color_tool->options->sample_merged,
+                                color_tool->options->sample_average,
+                                color_tool->options->average_radius,
+                                sample_format,
+                                pixel,
+                                color);
+}
+
+static void
+gimp_color_tool_real_picked (GimpColorTool      *color_tool,
+                             const GimpCoords   *coords,
+                             GimpDisplay        *display,
+                             GimpColorPickState  pick_state,
+                             const Babl         *sample_format,
+                             gpointer            pixel,
+                             const GimpRGB      *color)
+{
+  GimpTool          *tool  = GIMP_TOOL (color_tool);
+  GimpDisplayShell  *shell = gimp_display_get_shell (display);
+  GimpImageWindow   *image_window;
+  GimpDialogFactory *dialog_factory;
+  GimpContext       *context;
+
+  image_window   = gimp_display_shell_get_window (shell);
+  dialog_factory = gimp_dock_container_get_dialog_factory (GIMP_DOCK_CONTAINER (image_window));
+
+  /*  use this tool's own options here (NOT color_tool->options)  */
+  context = GIMP_CONTEXT (gimp_tool_get_options (tool));
+
+  if (color_tool->pick_target == GIMP_COLOR_PICK_TARGET_FOREGROUND ||
+      color_tool->pick_target == GIMP_COLOR_PICK_TARGET_BACKGROUND)
+    {
+      GtkWidget *widget;
+
+      widget = gimp_dialog_factory_find_widget (dialog_factory,
+                                                "gimp-indexed-palette");
+      if (widget)
+        {
+          GtkWidget *editor = gtk_bin_get_child (GTK_BIN (widget));
+          GimpImage *image  = gimp_display_get_image (display);
+
+          if (babl_format_is_palette (sample_format))
+            {
+              guchar *index  = pixel;
+
+              gimp_colormap_editor_set_index (GIMP_COLORMAP_EDITOR (editor),
+                                              *index, NULL);
+            }
+          else if (gimp_image_get_base_type (image) == GIMP_INDEXED)
+            {
+              /* When Sample merged is set, we don't have the index
+               * information and it is possible to pick colors out of
+               * the colormap (with compositing). In such a case, the
+               * sample format will not be a palette format even though
+               * the image is indexed. Still search if the color exists
+               * in the colormap.
+               * Note that even if it does, we might still pick the
+               * wrong color, since several indexes may contain the same
+               * color and we can't know for sure which is the right
+               * one.
+               */
+              gint index = gimp_colormap_editor_get_index (GIMP_COLORMAP_EDITOR (editor),
+                                                           color);
+              if (index > -1)
+                gimp_colormap_editor_set_index (GIMP_COLORMAP_EDITOR (editor),
+                                                index, NULL);
+            }
+        }
+
+      widget = gimp_dialog_factory_find_widget (dialog_factory,
+                                                "gimp-palette-editor");
+      if (widget)
+        {
+          GtkWidget *editor = gtk_bin_get_child (GTK_BIN (widget));
+          gint       index;
+
+          index = gimp_palette_editor_get_index (GIMP_PALETTE_EDITOR (editor),
+                                                 color);
+          if (index != -1)
+            gimp_palette_editor_set_index (GIMP_PALETTE_EDITOR (editor),
+                                           index, NULL);
+        }
+    }
+
+  switch (color_tool->pick_target)
+    {
+    case GIMP_COLOR_PICK_TARGET_NONE:
+      break;
+
+    case GIMP_COLOR_PICK_TARGET_FOREGROUND:
+      gimp_context_set_foreground (context, color);
+      break;
+
+    case GIMP_COLOR_PICK_TARGET_BACKGROUND:
+      gimp_context_set_background (context, color);
+      break;
+
+    case GIMP_COLOR_PICK_TARGET_PALETTE:
+      {
+        GdkScreen *screen  = gtk_widget_get_screen (GTK_WIDGET (shell));
+        gint       monitor = gimp_widget_get_monitor (GTK_WIDGET (shell));
+        GtkWidget *dockable;
+
+        dockable =
+          gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (display->gimp)),
+                                                     display->gimp,
+                                                     dialog_factory,
+                                                     screen,
+                                                     monitor,
+                                                     "gimp-palette-editor");
+
+        if (dockable)
+          {
+            GtkWidget *palette_editor;
+            GimpData  *data;
+
+            /* don't blink like mad when updating */
+            if (pick_state != GIMP_COLOR_PICK_STATE_START)
+              gimp_widget_blink_cancel (dockable);
+
+            palette_editor = gtk_bin_get_child (GTK_BIN (dockable));
+
+            data = gimp_data_editor_get_data (GIMP_DATA_EDITOR (palette_editor));
+
+            if (! data)
+              {
+                data = GIMP_DATA (gimp_context_get_palette (context));
+
+                gimp_data_editor_set_data (GIMP_DATA_EDITOR (palette_editor),
+                                           data);
+              }
+
+            gimp_palette_editor_pick_color (GIMP_PALETTE_EDITOR (palette_editor),
+                                            color, pick_state);
+          }
+      }
+      break;
+    }
+}
+
+static gboolean
+gimp_color_tool_can_pick (GimpColorTool    *tool,
+                          const GimpCoords *coords,
+                          GimpDisplay      *display)
+{
+  GimpColorToolClass *klass;
+
+  klass = GIMP_COLOR_TOOL_GET_CLASS (tool);
+
+  return klass->can_pick && klass->can_pick (tool, coords, display);
+}
+
+static void
+gimp_color_tool_pick (GimpColorTool      *tool,
+                      const GimpCoords   *coords,
+                      GimpDisplay        *display,
+                      GimpColorPickState  pick_state)
+{
+  GimpColorToolClass *klass;
+  const Babl         *sample_format;
+  gdouble             pixel[4];
+  GimpRGB             color;
+
+  klass = GIMP_COLOR_TOOL_GET_CLASS (tool);
+
+  if (klass->pick &&
+      klass->pick (tool, coords, display, &sample_format, pixel, &color))
+    {
+      g_signal_emit (tool, gimp_color_tool_signals[PICKED], 0,
+                     coords, display, pick_state,
+                     sample_format, pixel, &color);
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_color_tool_enable (GimpColorTool    *color_tool,
+                        GimpColorOptions *options)
+{
+  GimpTool *tool;
+
+  g_return_if_fail (GIMP_IS_COLOR_TOOL (color_tool));
+  g_return_if_fail (GIMP_IS_COLOR_OPTIONS (options));
+
+  tool = GIMP_TOOL (color_tool);
+
+  if (gimp_tool_control_is_active (tool->control))
+    {
+      g_warning ("Trying to enable GimpColorTool while it is active.");
+      return;
+    }
+
+  g_set_object (&color_tool->options, options);
+
+  /*  color picking doesn't snap, see bug #768058  */
+  color_tool->saved_snap_to = gimp_tool_control_get_snap_to (tool->control);
+  gimp_tool_control_set_snap_to (tool->control, FALSE);
+
+  color_tool->enabled = TRUE;
+}
+
+void
+gimp_color_tool_disable (GimpColorTool *color_tool)
+{
+  GimpTool *tool;
+
+  g_return_if_fail (GIMP_IS_COLOR_TOOL (color_tool));
+
+  tool = GIMP_TOOL (color_tool);
+
+  if (gimp_tool_control_is_active (tool->control))
+    {
+      g_warning ("Trying to disable GimpColorTool while it is active.");
+      return;
+    }
+
+  g_clear_object (&color_tool->options);
+
+  gimp_tool_control_set_snap_to (tool->control, color_tool->saved_snap_to);
+  color_tool->saved_snap_to = FALSE;
+
+  color_tool->enabled = FALSE;
+}
+
+gboolean
+gimp_color_tool_is_enabled (GimpColorTool *color_tool)
+{
+  return color_tool->enabled;
+}
diff --git a/app/tools/gimpcolortool.h b/app/tools/gimpcolortool.h
new file mode 100644
index 0000000..f645590
--- /dev/null
+++ b/app/tools/gimpcolortool.h
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_COLOR_TOOL_H__
+#define  __GIMP_COLOR_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_COLOR_TOOL            (gimp_color_tool_get_type ())
+#define GIMP_COLOR_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_TOOL, GimpColorTool))
+#define GIMP_COLOR_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_TOOL, GimpColorToolClass))
+#define GIMP_IS_COLOR_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_TOOL))
+#define GIMP_IS_COLOR_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_TOOL))
+#define GIMP_COLOR_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_TOOL, GimpColorToolClass))
+
+#define GIMP_COLOR_TOOL_GET_OPTIONS(t)  (GIMP_COLOR_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpColorToolClass GimpColorToolClass;
+
+struct _GimpColorTool
+{
+  GimpDrawTool         parent_instance;
+
+  gboolean             enabled;
+  GimpColorOptions    *options;
+  gboolean             saved_snap_to;
+
+  GimpColorPickTarget  pick_target;
+
+  gboolean             can_pick;
+  gint                 center_x;
+  gint                 center_y;
+  GimpSamplePoint     *sample_point;
+};
+
+struct _GimpColorToolClass
+{
+  GimpDrawToolClass  parent_class;
+
+  /*  virtual functions  */
+  gboolean (* can_pick) (GimpColorTool      *tool,
+                         const GimpCoords   *coords,
+                         GimpDisplay        *display);
+  gboolean (* pick)     (GimpColorTool      *tool,
+                         const GimpCoords   *coords,
+                         GimpDisplay        *display,
+                         const Babl        **sample_format,
+                         gpointer            pixel,
+                         GimpRGB            *color);
+
+  /*  signals  */
+  void     (* picked)   (GimpColorTool      *tool,
+                         const GimpCoords   *coords,
+                         GimpDisplay        *display,
+                         GimpColorPickState  pick_state,
+                         const Babl         *sample_format,
+                         gpointer            pixel,
+                         const GimpRGB      *color);
+};
+
+
+GType      gimp_color_tool_get_type   (void) G_GNUC_CONST;
+
+void       gimp_color_tool_enable     (GimpColorTool    *color_tool,
+                                       GimpColorOptions *options);
+void       gimp_color_tool_disable    (GimpColorTool    *color_tool);
+gboolean   gimp_color_tool_is_enabled (GimpColorTool    *color_tool);
+
+
+#endif  /*  __GIMP_COLOR_TOOL_H__  */
diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c
new file mode 100644
index 0000000..57f888d
--- /dev/null
+++ b/app/tools/gimpconvolvetool.c
@@ -0,0 +1,230 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpconvolveoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpconvolvetool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_convolve_tool_modifier_key  (GimpTool         *tool,
+                                                GdkModifierType   key,
+                                                gboolean          press,
+                                                GdkModifierType   state,
+                                                GimpDisplay      *display);
+static void   gimp_convolve_tool_cursor_update (GimpTool         *tool,
+                                                const GimpCoords *coords,
+                                                GdkModifierType   state,
+                                                GimpDisplay      *display);
+static void   gimp_convolve_tool_oper_update   (GimpTool         *tool,
+                                                const GimpCoords *coords,
+                                                GdkModifierType   state,
+                                                gboolean          proximity,
+                                                GimpDisplay      *display);
+static void   gimp_convolve_tool_status_update (GimpTool         *tool,
+                                                GimpConvolveType  type);
+
+static GtkWidget * gimp_convolve_options_gui   (GimpToolOptions  *options);
+
+
+G_DEFINE_TYPE (GimpConvolveTool, gimp_convolve_tool, GIMP_TYPE_BRUSH_TOOL)
+
+#define parent_class gimp_convolve_tool_parent_class
+
+
+void
+gimp_convolve_tool_register (GimpToolRegisterCallback  callback,
+                             gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_CONVOLVE_TOOL,
+                GIMP_TYPE_CONVOLVE_OPTIONS,
+                gimp_convolve_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK,
+                "gimp-convolve-tool",
+                _("Blur / Sharpen"),
+                _("Blur / Sharpen Tool: Selective blurring or unblurring using a brush"),
+                N_("Bl_ur / Sharpen"), "<shift>U",
+                NULL, GIMP_HELP_TOOL_CONVOLVE,
+                GIMP_ICON_TOOL_BLUR,
+                data);
+}
+
+static void
+gimp_convolve_tool_class_init (GimpConvolveToolClass *klass)
+{
+  GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
+
+  tool_class->modifier_key  = gimp_convolve_tool_modifier_key;
+  tool_class->cursor_update = gimp_convolve_tool_cursor_update;
+  tool_class->oper_update   = gimp_convolve_tool_oper_update;
+}
+
+static void
+gimp_convolve_tool_init (GimpConvolveTool *convolve)
+{
+  GimpTool *tool = GIMP_TOOL (convolve);
+
+  gimp_tool_control_set_tool_cursor            (tool->control,
+                                                GIMP_TOOL_CURSOR_BLUR);
+  gimp_tool_control_set_toggle_cursor_modifier (tool->control,
+                                                GIMP_CURSOR_MODIFIER_MINUS);
+
+  gimp_convolve_tool_status_update (tool, GIMP_CONVOLVE_BLUR);
+}
+
+static void
+gimp_convolve_tool_modifier_key (GimpTool        *tool,
+                                 GdkModifierType  key,
+                                 gboolean         press,
+                                 GdkModifierType  state,
+                                 GimpDisplay     *display)
+{
+  GimpConvolveTool    *convolve    = GIMP_CONVOLVE_TOOL (tool);
+  GimpConvolveOptions *options     = GIMP_CONVOLVE_TOOL_GET_OPTIONS (tool);
+  GdkModifierType      line_mask   = GIMP_PAINT_TOOL_LINE_MASK;
+  GdkModifierType      toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  if (((key == toggle_mask)  &&
+       ! (state & line_mask) && /* leave stuff untouched in line draw mode */
+       press != convolve->toggled)
+
+      ||
+
+      (key == line_mask  && /* toggle back after keypresses CTRL(hold)->  */
+       ! press           && /* SHIFT(hold)->CTRL(release)->SHIFT(release) */
+       convolve->toggled &&
+       ! (state & toggle_mask)))
+    {
+      convolve->toggled = press;
+
+      switch (options->type)
+        {
+        case GIMP_CONVOLVE_BLUR:
+          g_object_set (options, "type", GIMP_CONVOLVE_SHARPEN, NULL);
+          break;
+
+        case GIMP_CONVOLVE_SHARPEN:
+          g_object_set (options, "type", GIMP_CONVOLVE_BLUR, NULL);
+          break;
+        }
+    }
+}
+
+static void
+gimp_convolve_tool_cursor_update (GimpTool         *tool,
+                                  const GimpCoords *coords,
+                                  GdkModifierType   state,
+                                  GimpDisplay      *display)
+{
+  GimpConvolveOptions *options = GIMP_CONVOLVE_TOOL_GET_OPTIONS (tool);
+
+  gimp_tool_control_set_toggled (tool->control,
+                                 options->type == GIMP_CONVOLVE_SHARPEN);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_convolve_tool_oper_update (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                gboolean          proximity,
+                                GimpDisplay      *display)
+{
+  GimpConvolveOptions *options = GIMP_CONVOLVE_TOOL_GET_OPTIONS (tool);
+
+  gimp_convolve_tool_status_update (tool, options->type);
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+}
+
+static void
+gimp_convolve_tool_status_update (GimpTool         *tool,
+                                  GimpConvolveType  type)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+
+  switch (type)
+    {
+    case GIMP_CONVOLVE_BLUR:
+      paint_tool->status      = _("Click to blur");
+      paint_tool->status_line = _("Click to blur the line");
+      paint_tool->status_ctrl = _("%s to sharpen");
+      break;
+
+    case GIMP_CONVOLVE_SHARPEN:
+      paint_tool->status      = _("Click to sharpen");
+      paint_tool->status_line = _("Click to sharpen the line");
+      paint_tool->status_ctrl = _("%s to blur");
+      break;
+
+    default:
+      break;
+    }
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_convolve_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config = G_OBJECT (tool_options);
+  GtkWidget       *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget       *frame;
+  GtkWidget       *scale;
+  gchar           *str;
+  GdkModifierType  toggle_mask;
+
+  toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /*  the type radio box  */
+  str = g_strdup_printf (_("Convolve Type  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+
+  frame = gimp_prop_enum_radio_frame_new (config, "type",
+                                          str, 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  g_free (str);
+
+  /*  the rate scale  */
+  scale = gimp_prop_spin_scale_new (config, "rate", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return vbox;
+}
diff --git a/app/tools/gimpconvolvetool.h b/app/tools/gimpconvolvetool.h
new file mode 100644
index 0000000..1abf6ff
--- /dev/null
+++ b/app/tools/gimpconvolvetool.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONVOLVE_TOOL_H__
+#define __GIMP_CONVOLVE_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+
+
+#define GIMP_TYPE_CONVOLVE_TOOL            (gimp_convolve_tool_get_type ())
+#define GIMP_CONVOLVE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONVOLVE_TOOL, GimpConvolveTool))
+#define GIMP_CONVOLVE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONVOLVE_TOOL, GimpConvolveToolClass))
+#define GIMP_IS_CONVOLVE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONVOLVE_TOOL))
+#define GIMP_IS_CONVOLVE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONVOLVE_TOOL))
+#define GIMP_CONVOLVE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE_TOOL, GimpConvolveToolClass))
+
+#define GIMP_CONVOLVE_TOOL_GET_OPTIONS(t)  (GIMP_CONVOLVE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpConvolveTool      GimpConvolveTool;
+typedef struct _GimpConvolveToolClass GimpConvolveToolClass;
+
+struct _GimpConvolveTool
+{
+  GimpBrushTool parent_instance;
+
+  gboolean      toggled;
+};
+
+struct _GimpConvolveToolClass
+{
+  GimpBrushToolClass parent_class;
+};
+
+
+void    gimp_convolve_tool_register (GimpToolRegisterCallback  callback,
+                                     gpointer                  data);
+
+GType   gimp_convolve_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CONVOLVE_TOOL_H__  */
diff --git a/app/tools/gimpcropoptions.c b/app/tools/gimpcropoptions.c
new file mode 100644
index 0000000..24c5dab
--- /dev/null
+++ b/app/tools/gimpcropoptions.c
@@ -0,0 +1,240 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimprectangleoptions.h"
+#include "gimpcropoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_LAYER_ONLY = GIMP_RECTANGLE_OPTIONS_PROP_LAST + 1,
+  PROP_ALLOW_GROWING,
+  PROP_FILL_TYPE,
+  PROP_DELETE_PIXELS
+};
+
+
+static void   gimp_crop_options_rectangle_options_iface_init (GimpRectangleOptionsInterface *iface);
+
+static void   gimp_crop_options_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+static void   gimp_crop_options_get_property (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpCropOptions, gimp_crop_options,
+                         GIMP_TYPE_TOOL_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_RECTANGLE_OPTIONS,
+                                                gimp_crop_options_rectangle_options_iface_init))
+
+
+static void
+gimp_crop_options_class_init (GimpCropOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_crop_options_set_property;
+  object_class->get_property = gimp_crop_options_get_property;
+
+  /* The 'highlight' property is defined here because we want different
+   * default values for the Crop and the Rectangle Select tools.
+   */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class,
+                            GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
+                            "highlight",
+                            _("Highlight"),
+                            _("Dim everything outside selection"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class,
+                           GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT_OPACITY,
+                           "highlight-opacity",
+                           _("Highlight opacity"),
+                           _("How much to dim everything outside selection"),
+                           0.0, 1.0, 0.5,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LAYER_ONLY,
+                            "layer-only",
+                            _("Current layer only"),
+                            _("Crop only currently selected layer"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DELETE_PIXELS,
+                            "delete-pixels",
+                            _("Delete cropped pixels"),
+                            _("Discard non-locked layer data that falls out of the crop region"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ALLOW_GROWING,
+                            "allow-growing",
+                            _("Allow growing"),
+                            _("Allow resizing canvas by dragging cropping frame "
+                              "beyond image boundary"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_TYPE,
+                         "fill-type",
+                         _("Fill with"),
+                         _("How to fill new areas created by 'Allow growing'"),
+                         GIMP_TYPE_FILL_TYPE,
+                         GIMP_FILL_TRANSPARENT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  gimp_rectangle_options_install_properties (object_class);
+}
+
+static void
+gimp_crop_options_init (GimpCropOptions *options)
+{
+}
+
+static void
+gimp_crop_options_rectangle_options_iface_init (GimpRectangleOptionsInterface *iface)
+{
+}
+
+static void
+gimp_crop_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpCropOptions *options = GIMP_CROP_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER_ONLY:
+      options->layer_only = g_value_get_boolean (value);
+      break;
+
+    case PROP_DELETE_PIXELS:
+      options->delete_pixels = g_value_get_boolean (value);
+      break;
+
+    case PROP_ALLOW_GROWING:
+      options->allow_growing = g_value_get_boolean (value);
+      break;
+
+    case PROP_FILL_TYPE:
+      options->fill_type = g_value_get_enum (value);
+      break;
+
+    default:
+      gimp_rectangle_options_set_property (object, property_id, value, pspec);
+      break;
+    }
+}
+
+static void
+gimp_crop_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpCropOptions *options = GIMP_CROP_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_LAYER_ONLY:
+      g_value_set_boolean (value, options->layer_only);
+      break;
+
+    case PROP_DELETE_PIXELS:
+      g_value_set_boolean (value, options->delete_pixels);
+      break;
+
+    case PROP_ALLOW_GROWING:
+      g_value_set_boolean (value, options->allow_growing);
+      break;
+
+    case PROP_FILL_TYPE:
+      g_value_set_enum (value, options->fill_type);
+      break;
+
+    default:
+      gimp_rectangle_options_get_property (object, property_id, value, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_crop_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget *vbox_rectangle;
+  GtkWidget *button;
+  GtkWidget *combo;
+  GtkWidget *frame;
+
+  /*  layer toggle  */
+  button = gimp_prop_check_button_new (config, "layer-only", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  delete pixels toggle  */
+  button = gimp_prop_check_button_new (config, "delete-pixels", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_object_bind_property (G_OBJECT (config),  "layer-only",
+                          G_OBJECT (button), "sensitive",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_INVERT_BOOLEAN);
+
+  /*  fill type combo  */
+  combo = gimp_prop_enum_combo_box_new (config, "fill-type", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fill with"));
+
+  /*  allow growing toggle/frame  */
+  frame = gimp_prop_expanding_frame_new (config, "allow-growing", NULL,
+                                         combo, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  rectangle options  */
+  vbox_rectangle = gimp_rectangle_options_gui (tool_options);
+  gtk_box_pack_start (GTK_BOX (vbox), vbox_rectangle, FALSE, FALSE, 0);
+  gtk_widget_show (vbox_rectangle);
+
+  return vbox;
+}
diff --git a/app/tools/gimpcropoptions.h b/app/tools/gimpcropoptions.h
new file mode 100644
index 0000000..e123dca
--- /dev/null
+++ b/app/tools/gimpcropoptions.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CROP_OPTIONS_H__
+#define __GIMP_CROP_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_CROP_OPTIONS            (gimp_crop_options_get_type ())
+#define GIMP_CROP_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CROP_OPTIONS, GimpCropOptions))
+#define GIMP_CROP_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CROP_OPTIONS, GimpCropOptionsClass))
+#define GIMP_IS_CROP_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CROP_OPTIONS))
+#define GIMP_IS_CROP_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CROP_OPTIONS))
+#define GIMP_CROP_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CROP_OPTIONS, GimpCropOptionsClass))
+
+
+typedef struct _GimpCropOptions      GimpCropOptions;
+typedef struct _GimpToolOptionsClass GimpCropOptionsClass;
+
+struct _GimpCropOptions
+{
+  GimpToolOptions  parent_instance;
+
+  /* Work on the current layer rather than the image. */
+  gboolean         layer_only;
+
+  /* Allow the crop rectangle to be larger than the image/layer. This
+   * will resize the image/layer.
+   */
+  gboolean         allow_growing;
+
+  /* How to fill new areas created by 'allow_growing. */
+  GimpFillType     fill_type;
+
+  /* Whether to discard layer data that falls out of the crop region */
+  gboolean         delete_pixels;
+};
+
+
+GType       gimp_crop_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_crop_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_CROP_OPTIONS_H__ */
diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c
new file mode 100644
index 0000000..1803d00
--- /dev/null
+++ b/app/tools/gimpcroptool.c
@@ -0,0 +1,723 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-crop.h"
+#include "core/gimpitem.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolrectangle.h"
+
+#include "gimpcropoptions.h"
+#include "gimpcroptool.h"
+#include "gimprectangleoptions.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void      gimp_crop_tool_constructed                (GObject              *object);
+static void      gimp_crop_tool_dispose                    (GObject              *object);
+
+static void      gimp_crop_tool_control                    (GimpTool             *tool,
+                                                            GimpToolAction        action,
+                                                            GimpDisplay          *display);
+static void      gimp_crop_tool_button_press               (GimpTool             *tool,
+                                                            const GimpCoords     *coords,
+                                                            guint32               time,
+                                                            GdkModifierType       state,
+                                                            GimpButtonPressType   press_type,
+                                                            GimpDisplay          *display);
+static void      gimp_crop_tool_button_release             (GimpTool             *tool,
+                                                            const GimpCoords     *coords,
+                                                            guint32               time,
+                                                            GdkModifierType       state,
+                                                            GimpButtonReleaseType release_type,
+                                                            GimpDisplay          *display);
+static void     gimp_crop_tool_motion                      (GimpTool             *tool,
+                                                            const GimpCoords     *coords,
+                                                            guint32               time,
+                                                            GdkModifierType       state,
+                                                            GimpDisplay          *display);
+static void      gimp_crop_tool_options_notify             (GimpTool             *tool,
+                                                            GimpToolOptions      *options,
+                                                            const GParamSpec     *pspec);
+
+static void      gimp_crop_tool_rectangle_changed          (GimpToolWidget       *rectangle,
+                                                            GimpCropTool         *crop_tool);
+static void      gimp_crop_tool_rectangle_response         (GimpToolWidget       *rectangle,
+                                                            gint                  response_id,
+                                                            GimpCropTool         *crop_tool);
+static void      gimp_crop_tool_rectangle_change_complete  (GimpToolRectangle    *rectangle,
+                                                            GimpCropTool         *crop_tool);
+
+static void      gimp_crop_tool_start                      (GimpCropTool         *crop_tool,
+                                                            GimpDisplay          *display);
+static void      gimp_crop_tool_commit                     (GimpCropTool         *crop_tool);
+static void      gimp_crop_tool_halt                       (GimpCropTool         *crop_tool);
+
+static void      gimp_crop_tool_update_option_defaults     (GimpCropTool         *crop_tool,
+                                                            gboolean              ignore_pending);
+static GimpRectangleConstraint
+                 gimp_crop_tool_get_constraint             (GimpCropTool         *crop_tool);
+
+static void      gimp_crop_tool_image_changed              (GimpCropTool         *crop_tool,
+                                                            GimpImage            *image,
+                                                            GimpContext          *context);
+static void      gimp_crop_tool_image_size_changed         (GimpCropTool         *crop_tool);
+static void      gimp_crop_tool_image_active_layer_changed (GimpCropTool         *crop_tool);
+static void      gimp_crop_tool_layer_size_changed         (GimpCropTool         *crop_tool);
+
+static void      gimp_crop_tool_auto_shrink                (GimpCropTool         *crop_tool);
+
+
+G_DEFINE_TYPE (GimpCropTool, gimp_crop_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_crop_tool_parent_class
+
+
+/*  public functions  */
+
+void
+gimp_crop_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_CROP_TOOL,
+                GIMP_TYPE_CROP_OPTIONS,
+                gimp_crop_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                GIMP_CONTEXT_PROP_MASK_PATTERN,
+                "gimp-crop-tool",
+                _("Crop"),
+                _("Crop Tool: Remove edge areas from image or layer"),
+                N_("_Crop"), "<shift>C",
+                NULL, GIMP_HELP_TOOL_CROP,
+                GIMP_ICON_TOOL_CROP,
+                data);
+}
+
+static void
+gimp_crop_tool_class_init (GimpCropToolClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass *tool_class   = GIMP_TOOL_CLASS (klass);
+
+  object_class->constructed  = gimp_crop_tool_constructed;
+  object_class->dispose      = gimp_crop_tool_dispose;
+
+  tool_class->control        = gimp_crop_tool_control;
+  tool_class->button_press   = gimp_crop_tool_button_press;
+  tool_class->button_release = gimp_crop_tool_button_release;
+  tool_class->motion         = gimp_crop_tool_motion;
+  tool_class->options_notify = gimp_crop_tool_options_notify;
+}
+
+static void
+gimp_crop_tool_init (GimpCropTool *crop_tool)
+{
+  GimpTool *tool = GIMP_TOOL (crop_tool);
+
+  gimp_tool_control_set_wants_click      (tool->control, TRUE);
+  gimp_tool_control_set_active_modifiers (tool->control,
+                                          GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+  gimp_tool_control_set_precision        (tool->control,
+                                          GIMP_CURSOR_PRECISION_PIXEL_BORDER);
+  gimp_tool_control_set_cursor           (tool->control,
+                                          GIMP_CURSOR_CROSSHAIR_SMALL);
+  gimp_tool_control_set_tool_cursor      (tool->control,
+                                          GIMP_TOOL_CURSOR_CROP);
+
+  gimp_draw_tool_set_default_status (GIMP_DRAW_TOOL (tool),
+                                     _("Click-Drag to draw a crop rectangle"));
+}
+
+static void
+gimp_crop_tool_constructed (GObject *object)
+{
+  GimpCropTool    *crop_tool = GIMP_CROP_TOOL (object);
+  GimpContext     *context;
+  GimpToolInfo    *tool_info;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  tool_info = GIMP_TOOL (crop_tool)->tool_info;
+
+  context = gimp_get_user_context (tool_info->gimp);
+
+  g_signal_connect_object (context, "image-changed",
+                           G_CALLBACK (gimp_crop_tool_image_changed),
+                           crop_tool,
+                           G_CONNECT_SWAPPED);
+
+  /* Make sure we are connected to "size-changed" for the initial
+   * image.
+   */
+  gimp_crop_tool_image_changed (crop_tool,
+                                gimp_context_get_image (context),
+                                context);
+}
+
+static void
+gimp_crop_tool_dispose (GObject *object)
+{
+  GimpCropTool *crop_tool = GIMP_CROP_TOOL (object);
+
+  /* Clean up current_image and current_layer. */
+  gimp_crop_tool_image_changed (crop_tool, NULL, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_crop_tool_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  GimpCropTool *crop_tool = GIMP_CROP_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_crop_tool_halt (crop_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_crop_tool_commit (crop_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_crop_tool_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  GimpCropTool *crop_tool = GIMP_CROP_TOOL (tool);
+
+  if (tool->display && display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  if (! tool->display)
+    {
+      gimp_crop_tool_start (crop_tool, display);
+
+      gimp_tool_widget_hover (crop_tool->widget, coords, state, TRUE);
+
+      /* HACK: force CREATING on a newly created rectangle; otherwise,
+       * property bindings would cause the rectangle to start with the
+       * size from tool options.
+       */
+      gimp_tool_rectangle_set_function (GIMP_TOOL_RECTANGLE (crop_tool->widget),
+                                        GIMP_TOOL_RECTANGLE_CREATING);
+    }
+
+  if (gimp_tool_widget_button_press (crop_tool->widget, coords, time, state,
+                                     press_type))
+    {
+      crop_tool->grab_widget = crop_tool->widget;
+    }
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_crop_tool_button_release (GimpTool              *tool,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type,
+                               GimpDisplay           *display)
+{
+  GimpCropTool *crop_tool = GIMP_CROP_TOOL (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  if (crop_tool->grab_widget)
+    {
+      gimp_tool_widget_button_release (crop_tool->grab_widget,
+                                       coords, time, state, release_type);
+      crop_tool->grab_widget = NULL;
+    }
+
+  gimp_tool_push_status (tool, display, _("Click or press Enter to crop"));
+}
+
+static void
+gimp_crop_tool_motion (GimpTool         *tool,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state,
+                       GimpDisplay      *display)
+{
+  GimpCropTool *crop_tool = GIMP_CROP_TOOL (tool);
+
+  if (crop_tool->grab_widget)
+    {
+      gimp_tool_widget_motion (crop_tool->grab_widget, coords, time, state);
+    }
+}
+
+static void
+gimp_crop_tool_options_notify (GimpTool         *tool,
+                               GimpToolOptions  *options,
+                               const GParamSpec *pspec)
+{
+  GimpCropTool *crop_tool = GIMP_CROP_TOOL (tool);
+
+  if (! strcmp (pspec->name, "layer-only") ||
+      ! strcmp (pspec->name, "allow-growing"))
+    {
+      if (crop_tool->widget)
+        {
+          gimp_tool_rectangle_set_constraint (GIMP_TOOL_RECTANGLE (crop_tool->widget),
+                                              gimp_crop_tool_get_constraint (crop_tool));
+        }
+      else
+        {
+          gimp_crop_tool_update_option_defaults (crop_tool, FALSE);
+        }
+    }
+}
+
+static void
+gimp_crop_tool_rectangle_changed (GimpToolWidget *rectangle,
+                                  GimpCropTool   *crop_tool)
+{
+}
+
+static void
+gimp_crop_tool_rectangle_response (GimpToolWidget *rectangle,
+                                   gint            response_id,
+                                   GimpCropTool   *crop_tool)
+{
+  GimpTool *tool = GIMP_TOOL (crop_tool);
+
+  switch (response_id)
+    {
+    case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+      break;
+
+    case GIMP_TOOL_WIDGET_RESPONSE_CANCEL:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      break;
+    }
+}
+
+static void
+gimp_crop_tool_rectangle_change_complete (GimpToolRectangle *rectangle,
+                                          GimpCropTool      *crop_tool)
+{
+  gimp_crop_tool_update_option_defaults (crop_tool, FALSE);
+}
+
+static void
+gimp_crop_tool_start (GimpCropTool *crop_tool,
+                      GimpDisplay  *display)
+{
+  static const gchar *properties[] =
+  {
+    "highlight",
+    "highlight-opacity",
+    "guide",
+    "x",
+    "y",
+    "width",
+    "height",
+    "fixed-rule-active",
+    "fixed-rule",
+    "desired-fixed-width",
+    "desired-fixed-height",
+    "desired-fixed-size-width",
+    "desired-fixed-size-height",
+    "aspect-numerator",
+    "aspect-denominator",
+    "fixed-center"
+  };
+
+  GimpTool         *tool    = GIMP_TOOL (crop_tool);
+  GimpDisplayShell *shell   = gimp_display_get_shell (display);
+  GimpCropOptions  *options = GIMP_CROP_TOOL_GET_OPTIONS (crop_tool);
+  GimpToolWidget   *widget;
+  gint              i;
+
+  tool->display = display;
+
+  crop_tool->widget = widget = gimp_tool_rectangle_new (shell);
+
+  g_object_set (widget,
+                "status-title", _("Crop to: "),
+                NULL);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), widget);
+
+  for (i = 0; i < G_N_ELEMENTS (properties); i++)
+    {
+      GBinding *binding =
+        g_object_bind_property (G_OBJECT (options), properties[i],
+                                G_OBJECT (widget),  properties[i],
+                                G_BINDING_SYNC_CREATE |
+                                G_BINDING_BIDIRECTIONAL);
+
+      crop_tool->bindings = g_list_prepend (crop_tool->bindings, binding);
+    }
+
+  gimp_rectangle_options_connect (GIMP_RECTANGLE_OPTIONS (options),
+                                  gimp_display_get_image (shell->display),
+                                  G_CALLBACK (gimp_crop_tool_auto_shrink),
+                                  crop_tool);
+
+  gimp_tool_rectangle_set_constraint (GIMP_TOOL_RECTANGLE (widget),
+                                      gimp_crop_tool_get_constraint (crop_tool));
+
+  g_signal_connect (widget, "changed",
+                    G_CALLBACK (gimp_crop_tool_rectangle_changed),
+                    crop_tool);
+  g_signal_connect (widget, "response",
+                    G_CALLBACK (gimp_crop_tool_rectangle_response),
+                    crop_tool);
+  g_signal_connect (widget, "change-complete",
+                    G_CALLBACK (gimp_crop_tool_rectangle_change_complete),
+                    crop_tool);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+}
+
+static void
+gimp_crop_tool_commit (GimpCropTool *crop_tool)
+{
+  GimpTool *tool = GIMP_TOOL (crop_tool);
+
+  if (tool->display)
+    {
+      GimpCropOptions *options = GIMP_CROP_TOOL_GET_OPTIONS (tool);
+      GimpImage       *image   = gimp_display_get_image (tool->display);
+      gdouble          x, y;
+      gdouble          x2, y2;
+      gint             w, h;
+
+      gimp_tool_rectangle_get_public_rect (GIMP_TOOL_RECTANGLE (crop_tool->widget),
+                                           &x, &y, &x2, &y2);
+      w = x2 - x;
+      h = y2 - y;
+
+      gimp_tool_pop_status (tool, tool->display);
+
+      /* if rectangle exists, crop it */
+      if (w > 0 && h > 0)
+        {
+          if (options->layer_only)
+            {
+              GimpLayer *layer = gimp_image_get_active_layer (image);
+              gint       off_x, off_y;
+
+              if (! layer)
+                {
+                  gimp_tool_message_literal (tool, tool->display,
+                                             _("There is no active layer to crop."));
+                  return;
+                }
+
+              if (gimp_item_is_content_locked (GIMP_ITEM (layer)))
+                {
+                  gimp_tool_message_literal (tool, tool->display,
+                                             _("The active layer's pixels are locked."));
+                  gimp_tools_blink_lock_box (tool->display->gimp,
+                                             GIMP_ITEM (layer));
+                  return;
+                }
+
+              gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
+
+              off_x -= x;
+              off_y -= y;
+
+              gimp_item_resize (GIMP_ITEM (layer),
+                                GIMP_CONTEXT (options), options->fill_type,
+                                w, h, off_x, off_y);
+            }
+          else
+            {
+              gimp_image_crop (image,
+                               GIMP_CONTEXT (options), GIMP_FILL_TRANSPARENT,
+                               x, y, w, h, options->delete_pixels);
+            }
+
+          gimp_image_flush (image);
+        }
+    }
+}
+
+static void
+gimp_crop_tool_halt (GimpCropTool *crop_tool)
+{
+  GimpTool         *tool    = GIMP_TOOL (crop_tool);
+  GimpCropOptions  *options = GIMP_CROP_TOOL_GET_OPTIONS (crop_tool);
+
+  if (tool->display)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+
+      gimp_display_shell_set_highlight (shell, NULL, 0.0);
+
+      gimp_rectangle_options_disconnect (GIMP_RECTANGLE_OPTIONS (options),
+                                         G_CALLBACK (gimp_crop_tool_auto_shrink),
+                                         crop_tool);
+    }
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  /*  disconnect bindings manually so they are really gone *now*, we
+   *  might be in the middle of a signal emission that keeps the
+   *  widget and its bindings alive.
+   */
+  g_list_free_full (crop_tool->bindings, (GDestroyNotify) g_object_unref);
+  crop_tool->bindings = NULL;
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL);
+  g_clear_object (&crop_tool->widget);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+
+  gimp_crop_tool_update_option_defaults (crop_tool, TRUE);
+}
+
+/**
+ * gimp_crop_tool_update_option_defaults:
+ * @crop_tool:
+ * @ignore_pending: %TRUE to ignore any pending crop rectangle.
+ *
+ * Sets the default Fixed: Aspect ratio and Fixed: Size option
+ * properties.
+ */
+static void
+gimp_crop_tool_update_option_defaults (GimpCropTool *crop_tool,
+                                       gboolean      ignore_pending)
+{
+  GimpTool             *tool      = GIMP_TOOL (crop_tool);
+  GimpToolRectangle    *rectangle = GIMP_TOOL_RECTANGLE (crop_tool->widget);
+  GimpRectangleOptions *options;
+
+  options = GIMP_RECTANGLE_OPTIONS (GIMP_TOOL_GET_OPTIONS (tool));
+
+  if (rectangle && ! ignore_pending)
+    {
+      /* There is a pending rectangle and we should not ignore it, so
+       * set default Fixed: Aspect ratio to the same as the current
+       * pending rectangle width/height.
+       */
+
+      gimp_tool_rectangle_pending_size_set (rectangle,
+                                            G_OBJECT (options),
+                                            "default-aspect-numerator",
+                                            "default-aspect-denominator");
+
+      g_object_set (G_OBJECT (options),
+                    "use-string-current", TRUE,
+                    NULL);
+    }
+  else
+    {
+      /* There is no pending rectangle, set default Fixed: Aspect
+       * ratio to that of the current image/layer.
+       */
+
+      if (! rectangle)
+        {
+          /* ugly hack: if we don't have a widget, construct a temporary one
+           * so that we can use it to call
+           * gimp_tool_rectangle_constraint_size_set().
+           */
+
+          GimpContext *context = gimp_get_user_context (tool->tool_info->gimp);
+          GimpDisplay *display = gimp_context_get_display (context);
+
+          if (display)
+            {
+              GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+              rectangle = GIMP_TOOL_RECTANGLE (gimp_tool_rectangle_new (shell));
+
+              gimp_tool_rectangle_set_constraint (
+                rectangle, gimp_crop_tool_get_constraint (crop_tool));
+            }
+        }
+
+      if (rectangle)
+        {
+          gimp_tool_rectangle_constraint_size_set (rectangle,
+                                                   G_OBJECT (options),
+                                                   "default-aspect-numerator",
+                                                   "default-aspect-denominator");
+
+          if (! crop_tool->widget)
+            g_object_unref (rectangle);
+        }
+
+      g_object_set (G_OBJECT (options),
+                    "use-string-current", FALSE,
+                    NULL);
+    }
+}
+
+static GimpRectangleConstraint
+gimp_crop_tool_get_constraint (GimpCropTool *crop_tool)
+{
+  GimpCropOptions *crop_options = GIMP_CROP_TOOL_GET_OPTIONS (crop_tool);
+
+  if (crop_options->allow_growing)
+    {
+      return GIMP_RECTANGLE_CONSTRAIN_NONE;
+    }
+  else
+    {
+      return crop_options->layer_only ? GIMP_RECTANGLE_CONSTRAIN_DRAWABLE :
+                                        GIMP_RECTANGLE_CONSTRAIN_IMAGE;
+    }
+}
+
+static void
+gimp_crop_tool_image_changed (GimpCropTool *crop_tool,
+                              GimpImage    *image,
+                              GimpContext  *context)
+{
+  if (crop_tool->current_image)
+    {
+      g_signal_handlers_disconnect_by_func (crop_tool->current_image,
+                                            gimp_crop_tool_image_size_changed,
+                                            NULL);
+      g_signal_handlers_disconnect_by_func (crop_tool->current_image,
+                                            gimp_crop_tool_image_active_layer_changed,
+                                            NULL);
+
+      g_object_remove_weak_pointer (G_OBJECT (crop_tool->current_image),
+                                    (gpointer) &crop_tool->current_image);
+    }
+
+  crop_tool->current_image = image;
+
+  if (crop_tool->current_image)
+    {
+      g_object_add_weak_pointer (G_OBJECT (crop_tool->current_image),
+                                 (gpointer) &crop_tool->current_image);
+
+      g_signal_connect_object (crop_tool->current_image, "size-changed",
+                               G_CALLBACK (gimp_crop_tool_image_size_changed),
+                               crop_tool,
+                               G_CONNECT_SWAPPED);
+      g_signal_connect_object (crop_tool->current_image, "active-layer-changed",
+                               G_CALLBACK (gimp_crop_tool_image_active_layer_changed),
+                               crop_tool,
+                               G_CONNECT_SWAPPED);
+    }
+
+  /* Make sure we are connected to "size-changed" for the initial
+   * layer.
+   */
+  gimp_crop_tool_image_active_layer_changed (crop_tool);
+
+  gimp_crop_tool_update_option_defaults (GIMP_CROP_TOOL (crop_tool), FALSE);
+}
+
+static void
+gimp_crop_tool_image_size_changed (GimpCropTool *crop_tool)
+{
+  gimp_crop_tool_update_option_defaults (crop_tool, FALSE);
+}
+
+static void
+gimp_crop_tool_image_active_layer_changed (GimpCropTool *crop_tool)
+{
+  if (crop_tool->current_layer)
+    {
+      g_signal_handlers_disconnect_by_func (crop_tool->current_layer,
+                                            gimp_crop_tool_layer_size_changed,
+                                            NULL);
+
+      g_object_remove_weak_pointer (G_OBJECT (crop_tool->current_layer),
+                                    (gpointer) &crop_tool->current_layer);
+    }
+
+  if (crop_tool->current_image)
+    {
+      crop_tool->current_layer =
+        gimp_image_get_active_layer (crop_tool->current_image);
+    }
+  else
+    {
+      crop_tool->current_layer = NULL;
+    }
+
+  if (crop_tool->current_layer)
+    {
+      g_object_add_weak_pointer (G_OBJECT (crop_tool->current_layer),
+                                 (gpointer) &crop_tool->current_layer);
+
+      g_signal_connect_object (crop_tool->current_layer, "size-changed",
+                               G_CALLBACK (gimp_crop_tool_layer_size_changed),
+                               crop_tool,
+                               G_CONNECT_SWAPPED);
+    }
+
+  gimp_crop_tool_update_option_defaults (crop_tool, FALSE);
+}
+
+static void
+gimp_crop_tool_layer_size_changed (GimpCropTool *crop_tool)
+{
+  gimp_crop_tool_update_option_defaults (crop_tool, FALSE);
+}
+
+static void
+gimp_crop_tool_auto_shrink (GimpCropTool *crop_tool)
+{
+  gboolean shrink_merged ;
+
+  g_object_get (gimp_tool_get_options (GIMP_TOOL (crop_tool)),
+                "shrink-merged", &shrink_merged,
+                NULL);
+
+  gimp_tool_rectangle_auto_shrink (GIMP_TOOL_RECTANGLE (crop_tool->widget),
+                                   shrink_merged);
+}
diff --git a/app/tools/gimpcroptool.h b/app/tools/gimpcroptool.h
new file mode 100644
index 0000000..3f20430
--- /dev/null
+++ b/app/tools/gimpcroptool.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_CROP_TOOL_H__
+#define  __GIMP_CROP_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_CROP_TOOL            (gimp_crop_tool_get_type ())
+#define GIMP_CROP_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CROP_TOOL, GimpCropTool))
+#define GIMP_CROP_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CROP_TOOL, GimpCropToolClass))
+#define GIMP_IS_CROP_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CROP_TOOL))
+#define GIMP_IS_CROP_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CROP_TOOL))
+#define GIMP_CROP_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CROP_TOOL, GimpCropToolClass))
+
+#define GIMP_CROP_TOOL_GET_OPTIONS(t)  (GIMP_CROP_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpCropTool      GimpCropTool;
+typedef struct _GimpCropToolClass GimpCropToolClass;
+
+struct _GimpCropTool
+{
+  GimpDrawTool    parent_instance;
+
+  GimpImage      *current_image;
+  GimpLayer      *current_layer;
+
+  GimpToolWidget *widget;
+  GimpToolWidget *grab_widget;
+  GList          *bindings;
+};
+
+struct _GimpCropToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+
+void    gimp_crop_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_crop_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CROP_TOOL_H__  */
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
new file mode 100644
index 0000000..d514323
--- /dev/null
+++ b/app/tools/gimpcurvestool.c
@@ -0,0 +1,1156 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+
+#include <glib/gstdio.h>
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "operations/gimpcurvesconfig.h"
+#include "operations/gimpoperationcurves.h"
+
+#include "core/gimp.h"
+#include "core/gimpcurve.h"
+#include "core/gimpcurve-map.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-histogram.h"
+#include "core/gimperror.h"
+#include "core/gimphistogram.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpcolorbar.h"
+#include "widgets/gimpcurveview.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpcurvestool.h"
+#include "gimphistogramoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define GRAPH_SIZE 256
+#define BAR_SIZE    12
+#define RADIUS       4
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_curves_tool_initialize      (GimpTool             *tool,
+                                                    GimpDisplay          *display,
+                                                    GError              **error);
+static void       gimp_curves_tool_button_release  (GimpTool             *tool,
+                                                    const GimpCoords     *coords,
+                                                    guint32               time,
+                                                    GdkModifierType       state,
+                                                    GimpButtonReleaseType release_type,
+                                                    GimpDisplay          *display);
+static gboolean   gimp_curves_tool_key_press       (GimpTool             *tool,
+                                                    GdkEventKey          *kevent,
+                                                    GimpDisplay          *display);
+static void       gimp_curves_tool_oper_update     (GimpTool             *tool,
+                                                    const GimpCoords     *coords,
+                                                    GdkModifierType       state,
+                                                    gboolean              proximity,
+                                                    GimpDisplay          *display);
+
+static gchar    * gimp_curves_tool_get_operation   (GimpFilterTool       *filter_tool,
+                                                    gchar               **description);
+static void       gimp_curves_tool_dialog          (GimpFilterTool       *filter_tool);
+static void       gimp_curves_tool_reset           (GimpFilterTool       *filter_tool);
+static void       gimp_curves_tool_config_notify   (GimpFilterTool       *filter_tool,
+                                                    GimpConfig           *config,
+                                                    const GParamSpec     *pspec);
+static gboolean   gimp_curves_tool_settings_import (GimpFilterTool       *filter_tool,
+                                                    GInputStream         *input,
+                                                    GError              **error);
+static gboolean   gimp_curves_tool_settings_export (GimpFilterTool       *filter_tool,
+                                                    GOutputStream        *output,
+                                                    GError              **error);
+static void       gimp_curves_tool_color_picked    (GimpFilterTool       *filter_tool,
+                                                    gpointer              identifier,
+                                                    gdouble               x,
+                                                    gdouble               y,
+                                                    const Babl           *sample_format,
+                                                    const GimpRGB        *color);
+
+static void       gimp_curves_tool_export_setup    (GimpSettingsBox      *settings_box,
+                                                    GtkFileChooserDialog *dialog,
+                                                    gboolean              export,
+                                                    GimpCurvesTool       *tool);
+static void       gimp_curves_tool_update_channel  (GimpCurvesTool       *tool);
+static void       gimp_curves_tool_update_point    (GimpCurvesTool       *tool);
+
+static void       curves_curve_dirty_callback      (GimpCurve            *curve,
+                                                    GimpCurvesTool       *tool);
+
+static void       curves_channel_callback          (GtkWidget            *widget,
+                                                    GimpCurvesTool       *tool);
+static void       curves_channel_reset_callback    (GtkWidget            *widget,
+                                                    GimpCurvesTool       *tool);
+
+static gboolean   curves_menu_sensitivity          (gint                  value,
+                                                    gpointer              data);
+
+static void       curves_graph_selection_callback  (GtkWidget            *widget,
+                                                    GimpCurvesTool       *tool);
+
+static void       curves_point_coords_callback     (GtkWidget            *widget,
+                                                    GimpCurvesTool       *tool);
+static void       curves_point_type_callback       (GtkWidget            *widget,
+                                                    GimpCurvesTool       *tool);
+
+static void       curves_curve_type_callback       (GtkWidget            *widget,
+                                                    GimpCurvesTool       *tool);
+
+static gboolean   curves_get_channel_color         (GtkWidget            *widget,
+                                                    GimpHistogramChannel  channel,
+                                                    GimpRGB              *color);
+
+
+G_DEFINE_TYPE (GimpCurvesTool, gimp_curves_tool, GIMP_TYPE_FILTER_TOOL)
+
+#define parent_class gimp_curves_tool_parent_class
+
+
+/*  public functions  */
+
+void
+gimp_curves_tool_register (GimpToolRegisterCallback  callback,
+                           gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_CURVES_TOOL,
+                GIMP_TYPE_HISTOGRAM_OPTIONS,
+                gimp_color_options_gui,
+                0,
+                "gimp-curves-tool",
+                _("Curves"),
+                _("Adjust color curves"),
+                N_("_Curves..."), NULL,
+                NULL, GIMP_HELP_TOOL_CURVES,
+                GIMP_ICON_TOOL_CURVES,
+                data);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_curves_tool_class_init (GimpCurvesToolClass *klass)
+{
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  tool_class->initialize             = gimp_curves_tool_initialize;
+  tool_class->button_release         = gimp_curves_tool_button_release;
+  tool_class->key_press              = gimp_curves_tool_key_press;
+  tool_class->oper_update            = gimp_curves_tool_oper_update;
+
+  filter_tool_class->get_operation   = gimp_curves_tool_get_operation;
+  filter_tool_class->dialog          = gimp_curves_tool_dialog;
+  filter_tool_class->reset           = gimp_curves_tool_reset;
+  filter_tool_class->config_notify   = gimp_curves_tool_config_notify;
+  filter_tool_class->settings_import = gimp_curves_tool_settings_import;
+  filter_tool_class->settings_export = gimp_curves_tool_settings_export;
+  filter_tool_class->color_picked    = gimp_curves_tool_color_picked;
+}
+
+static void
+gimp_curves_tool_init (GimpCurvesTool *tool)
+{
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (tool->picked_color); i++)
+    tool->picked_color[i] = -1.0;
+}
+
+static gboolean
+gimp_curves_tool_initialize (GimpTool     *tool,
+                             GimpDisplay  *display,
+                             GError      **error)
+{
+  GimpFilterTool       *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesTool       *c_tool      = GIMP_CURVES_TOOL (tool);
+  GimpImage            *image       = gimp_display_get_image (display);
+  GimpDrawable         *drawable    = gimp_image_get_active_drawable (image);
+  GimpCurvesConfig     *config;
+  GimpHistogram        *histogram;
+  GimpHistogramChannel  channel;
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      return FALSE;
+    }
+
+  config = GIMP_CURVES_CONFIG (filter_tool->config);
+
+  histogram = gimp_histogram_new (config->linear);
+  g_object_unref (gimp_drawable_calculate_histogram_async (
+    drawable, histogram, FALSE));
+  gimp_histogram_view_set_background (GIMP_HISTOGRAM_VIEW (c_tool->graph),
+                                      histogram);
+  g_object_unref (histogram);
+
+  if (gimp_drawable_get_component_type (drawable) == GIMP_COMPONENT_TYPE_U8)
+    {
+      c_tool->scale = 255.0;
+
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (c_tool->point_input),  0);
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (c_tool->point_output), 0);
+
+      gtk_entry_set_width_chars (GTK_ENTRY (c_tool->point_input),  3);
+      gtk_entry_set_width_chars (GTK_ENTRY (c_tool->point_output), 3);
+    }
+  else
+    {
+      c_tool->scale = 100.0;
+
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (c_tool->point_input),  2);
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (c_tool->point_output), 2);
+
+      gtk_entry_set_width_chars (GTK_ENTRY (c_tool->point_input),  6);
+      gtk_entry_set_width_chars (GTK_ENTRY (c_tool->point_output), 6);
+    }
+
+  gimp_curve_view_set_range_x (GIMP_CURVE_VIEW (c_tool->graph),
+                               0, c_tool->scale);
+  gimp_curve_view_set_range_y (GIMP_CURVE_VIEW (c_tool->graph),
+                               0, c_tool->scale);
+
+  gtk_spin_button_set_range (GTK_SPIN_BUTTON (c_tool->point_output),
+                             0, c_tool->scale);
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      g_signal_connect (config->curve[channel], "dirty",
+                        G_CALLBACK (curves_curve_dirty_callback),
+                        tool);
+    }
+
+  gimp_curves_tool_update_point (c_tool);
+
+  /*  always pick colors  */
+  gimp_filter_tool_enable_color_picking (filter_tool, NULL, FALSE);
+
+  return TRUE;
+}
+
+static void
+gimp_curves_tool_button_release (GimpTool              *tool,
+                                 const GimpCoords      *coords,
+                                 guint32                time,
+                                 GdkModifierType        state,
+                                 GimpButtonReleaseType  release_type,
+                                 GimpDisplay           *display)
+{
+  GimpCurvesTool   *c_tool      = GIMP_CURVES_TOOL (tool);
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+
+  if (state & gimp_get_extend_selection_mask ())
+    {
+      GimpCurve *curve = config->curve[config->channel];
+      gdouble    value = c_tool->picked_color[config->channel];
+      gint       point;
+
+      point = gimp_curve_get_point_at (curve, value);
+
+      if (point < 0)
+        {
+          GimpCurvePointType type = GIMP_CURVE_POINT_SMOOTH;
+
+          point = gimp_curve_view_get_selected (
+            GIMP_CURVE_VIEW (c_tool->graph));
+
+          if (point >= 0)
+            type = gimp_curve_get_point_type (curve, point);
+
+          point = gimp_curve_add_point (
+            curve,
+            value, gimp_curve_map_value (curve, value));
+
+          gimp_curve_set_point_type (curve, point, type);
+        }
+
+      gimp_curve_view_set_selected (GIMP_CURVE_VIEW (c_tool->graph), point);
+    }
+  else if (state & gimp_get_toggle_behavior_mask ())
+    {
+      GimpHistogramChannel channel;
+      GimpCurvePointType   type = GIMP_CURVE_POINT_SMOOTH;
+      gint                 point;
+
+      point = gimp_curve_view_get_selected (GIMP_CURVE_VIEW (c_tool->graph));
+
+      if (point >= 0)
+        {
+          type = gimp_curve_get_point_type (config->curve[config->channel],
+                                            point);
+        }
+
+      for (channel = GIMP_HISTOGRAM_VALUE;
+           channel <= GIMP_HISTOGRAM_ALPHA;
+           channel++)
+        {
+          GimpCurve *curve = config->curve[channel];
+          gdouble    value = c_tool->picked_color[channel];
+
+          if (value != -1)
+            {
+              point = gimp_curve_get_point_at (curve, value);
+
+              if (point < 0)
+                {
+                  point = gimp_curve_add_point (
+                    curve,
+                    value, gimp_curve_map_value (curve, value));
+
+                  gimp_curve_set_point_type (curve, point, type);
+                }
+
+              if (channel == config->channel)
+                {
+                  gimp_curve_view_set_selected (GIMP_CURVE_VIEW (c_tool->graph),
+                                                point);
+                }
+            }
+        }
+    }
+
+  /*  chain up to halt the tool */
+  GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                  release_type, display);
+}
+
+static gboolean
+gimp_curves_tool_key_press (GimpTool    *tool,
+                            GdkEventKey *kevent,
+                            GimpDisplay *display)
+{
+  GimpCurvesTool *c_tool = GIMP_CURVES_TOOL (tool);
+
+  if (tool->display && c_tool->graph)
+    {
+      if (gtk_widget_event (c_tool->graph, (GdkEvent *) kevent))
+        return TRUE;
+    }
+
+  return GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display);
+}
+
+static void
+gimp_curves_tool_oper_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              gboolean          proximity,
+                              GimpDisplay      *display)
+{
+  if (gimp_filter_tool_on_guide (GIMP_FILTER_TOOL (tool),
+                                 coords, display))
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                                   display);
+    }
+  else
+    {
+      GimpColorPickTarget  target;
+      gchar               *status      = NULL;
+      GdkModifierType      extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType      toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      gimp_tool_pop_status (tool, display);
+
+      if (state & extend_mask)
+        {
+          target = GIMP_COLOR_PICK_TARGET_PALETTE;
+          status = g_strdup (_("Click to add a control point"));
+        }
+      else if (state & toggle_mask)
+        {
+          target = GIMP_COLOR_PICK_TARGET_PALETTE;
+          status = g_strdup (_("Click to add control points to all channels"));
+        }
+      else
+        {
+          target = GIMP_COLOR_PICK_TARGET_NONE;
+          status = gimp_suggest_modifiers (_("Click to locate on curve"),
+                                           (extend_mask | toggle_mask) & ~state,
+                                           _("%s: add control point"),
+                                           _("%s: add control points to all channels"),
+                                           NULL);
+        }
+
+      GIMP_COLOR_TOOL (tool)->pick_target = target;
+
+      if (proximity)
+        gimp_tool_push_status (tool, display, "%s", status);
+
+      g_free (status);
+    }
+}
+
+static gchar *
+gimp_curves_tool_get_operation (GimpFilterTool  *filter_tool,
+                                gchar          **description)
+{
+  *description = g_strdup (_("Adjust Color Curves"));
+
+  return g_strdup ("gimp:curves");
+}
+
+
+/*******************/
+/*  Curves dialog  */
+/*******************/
+
+static void
+gimp_curves_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpCurvesTool   *tool         = GIMP_CURVES_TOOL (filter_tool);
+  GimpToolOptions  *tool_options = GIMP_TOOL_GET_OPTIONS (filter_tool);
+  GimpCurvesConfig *config       = GIMP_CURVES_CONFIG (filter_tool->config);
+  GtkListStore     *store;
+  GtkWidget        *main_vbox;
+  GtkWidget        *frame_vbox;
+  GtkWidget        *vbox;
+  GtkWidget        *hbox;
+  GtkWidget        *hbox2;
+  GtkWidget        *label;
+  GtkWidget        *main_frame;
+  GtkWidget        *frame;
+  GtkWidget        *table;
+  GtkWidget        *button;
+  GtkWidget        *bar;
+  GtkWidget        *combo;
+
+  g_signal_connect (filter_tool->settings_box, "file-dialog-setup",
+                    G_CALLBACK (gimp_curves_tool_export_setup),
+                    filter_tool);
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  /*  The combo box for selecting channels  */
+  main_frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (main_vbox), main_frame, TRUE, TRUE, 0);
+  gtk_widget_show (main_frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_frame_set_label_widget (GTK_FRAME (main_frame), hbox);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("Cha_nnel:"));
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  store = gimp_enum_store_new_with_range (GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                          GIMP_HISTOGRAM_VALUE,
+                                          GIMP_HISTOGRAM_ALPHA);
+  tool->channel_menu =
+    gimp_enum_combo_box_new_with_model (GIMP_ENUM_STORE (store));
+  g_object_unref (store);
+
+  g_object_add_weak_pointer (G_OBJECT (tool->channel_menu),
+                             (gpointer) &tool->channel_menu);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (tool->channel_menu),
+                                 config->channel);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (tool->channel_menu),
+                                       "gimp-channel");
+  gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (tool->channel_menu),
+                                      curves_menu_sensitivity, filter_tool, NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), tool->channel_menu, FALSE, FALSE, 0);
+  gtk_widget_show (tool->channel_menu);
+
+  g_signal_connect (tool->channel_menu, "changed",
+                    G_CALLBACK (curves_channel_callback),
+                    tool);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), tool->channel_menu);
+
+  button = gtk_button_new_with_mnemonic (_("R_eset Channel"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (curves_channel_reset_callback),
+                    tool);
+
+  /*  The histogram scale radio buttons  */
+  hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
+                                       "histogram-scale", "gimp-histogram",
+                                       0, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  /*  The linear/perceptual radio buttons  */
+  hbox2 = gimp_prop_boolean_icon_box_new (G_OBJECT (config),
+                                          "linear",
+                                          GIMP_ICON_COLOR_SPACE_LINEAR,
+                                          GIMP_ICON_COLOR_SPACE_PERCEPTUAL,
+                                          _("Adjust curves in linear light"),
+                                          _("Adjust curves perceptually"));
+  gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
+  gtk_widget_show (frame_vbox);
+
+  /*  The table for the color bars and the graph  */
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (frame_vbox), table, TRUE, TRUE, 0);
+
+  /*  The left color bar  */
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_table_attach (GTK_TABLE (table), vbox, 0, 1, 0, 1,
+                    GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+  gtk_widget_show (vbox);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, RADIUS);
+  gtk_widget_show (frame);
+
+  tool->yrange = gimp_color_bar_new (GTK_ORIENTATION_VERTICAL);
+  gtk_widget_set_size_request (tool->yrange, BAR_SIZE, -1);
+  gtk_container_add (GTK_CONTAINER (frame), tool->yrange);
+  gtk_widget_show (tool->yrange);
+
+  /*  The curves graph  */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1,
+                    GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+  gtk_widget_show (frame);
+
+  tool->graph = gimp_curve_view_new ();
+
+  g_object_add_weak_pointer (G_OBJECT (tool->graph),
+                             (gpointer) &tool->graph);
+
+  gimp_curve_view_set_range_x (GIMP_CURVE_VIEW (tool->graph), 0, 255);
+  gimp_curve_view_set_range_y (GIMP_CURVE_VIEW (tool->graph), 0, 255);
+  gtk_widget_set_size_request (tool->graph,
+                               GRAPH_SIZE + RADIUS * 2,
+                               GRAPH_SIZE + RADIUS * 2);
+  g_object_set (tool->graph,
+                "border-width", RADIUS,
+                "subdivisions", 1,
+                NULL);
+  gtk_container_add (GTK_CONTAINER (frame), tool->graph);
+  gtk_widget_show (tool->graph);
+
+  g_object_bind_property (G_OBJECT (tool_options), "histogram-scale",
+                          G_OBJECT (tool->graph),  "histogram-scale",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+
+  g_signal_connect (tool->graph, "selection-changed",
+                    G_CALLBACK (curves_graph_selection_callback),
+                    tool);
+
+  /*  The bottom color bar  */
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_table_attach (GTK_TABLE (table), hbox2, 1, 2, 1, 2,
+                    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (hbox2);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (hbox2), frame, TRUE, TRUE, RADIUS);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  tool->xrange = gimp_color_bar_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_widget_set_size_request (tool->xrange, -1, BAR_SIZE / 2);
+  gtk_box_pack_start (GTK_BOX (vbox), tool->xrange, TRUE, TRUE, 0);
+  gtk_widget_show (tool->xrange);
+
+  bar = gimp_color_bar_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_box_pack_start (GTK_BOX (vbox), bar, TRUE, TRUE, 0);
+  gtk_widget_show (bar);
+
+  gtk_widget_show (table);
+
+  /*  The point properties box  */
+  tool->point_box = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (frame_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (tool->point_box);
+
+  label = gtk_label_new_with_mnemonic (_("_Input:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  tool->point_input = gimp_spin_button_new_with_range (0.0, 0.0, 1.0);
+  gtk_box_pack_start (GTK_BOX (hbox), tool->point_input, FALSE, FALSE, 0);
+  gtk_widget_show (tool->point_input);
+
+  g_signal_connect (tool->point_input, "value-changed",
+                    G_CALLBACK (curves_point_coords_callback),
+                    tool);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), tool->point_input);
+
+  label = gtk_label_new_with_mnemonic (_("O_utput:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  tool->point_output = gimp_spin_button_new_with_range (0.0, 0.0, 1.0);
+  gtk_box_pack_start (GTK_BOX (hbox), tool->point_output, FALSE, FALSE, 0);
+  gtk_widget_show (tool->point_output);
+
+  g_signal_connect (tool->point_output, "value-changed",
+                    G_CALLBACK (curves_point_coords_callback),
+                    tool);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), tool->point_output);
+
+  label = gtk_label_new_with_mnemonic (_("T_ype:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  hbox2 = gimp_enum_icon_box_new (GIMP_TYPE_CURVE_POINT_TYPE,
+                                  "gimp-curve-point",
+                                  GTK_ICON_SIZE_MENU,
+                                  G_CALLBACK (curves_point_type_callback),
+                                  tool,
+                                  &tool->point_type);
+  gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (frame_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), tool->point_type);
+
+  label = gtk_label_new_with_mnemonic (_("Curve _type:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  /*  The curve-type combo  */
+  tool->curve_type = combo = gimp_enum_combo_box_new (GIMP_TYPE_CURVE_TYPE);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                       "gimp-curve");
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), 0,
+                              G_CALLBACK (curves_curve_type_callback),
+                              tool);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+  gimp_curves_tool_update_channel (tool);
+}
+
+static void
+gimp_curves_tool_reset (GimpFilterTool *filter_tool)
+{
+  GimpHistogramChannel channel;
+
+  g_object_get (filter_tool->config,
+                "channel", &channel,
+                NULL);
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->reset (filter_tool);
+
+  g_object_set (filter_tool->config,
+                "channel", channel,
+                NULL);
+}
+
+static void
+gimp_curves_tool_config_notify (GimpFilterTool   *filter_tool,
+                                GimpConfig       *config,
+                                const GParamSpec *pspec)
+{
+  GimpCurvesTool   *curves_tool   = GIMP_CURVES_TOOL (filter_tool);
+  GimpCurvesConfig *curves_config = GIMP_CURVES_CONFIG (config);
+  GimpCurve        *curve         = curves_config->curve[curves_config->channel];
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->config_notify (filter_tool,
+                                                        config, pspec);
+
+  if (! curves_tool->channel_menu ||
+      ! curves_tool->graph)
+    return;
+
+  if (! strcmp (pspec->name, "linear"))
+    {
+      GimpHistogram *histogram;
+
+      histogram = gimp_histogram_new (curves_config->linear);
+      g_object_unref (gimp_drawable_calculate_histogram_async (
+        GIMP_TOOL (filter_tool)->drawable, histogram, FALSE));
+      gimp_histogram_view_set_background (GIMP_HISTOGRAM_VIEW (curves_tool->graph),
+                                          histogram);
+      g_object_unref (histogram);
+    }
+  else if (! strcmp (pspec->name, "channel"))
+    {
+      gimp_curves_tool_update_channel (GIMP_CURVES_TOOL (filter_tool));
+    }
+  else if (! strcmp (pspec->name, "curve"))
+    {
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (curves_tool->curve_type),
+                                     curve->curve_type);
+    }
+}
+
+static gboolean
+gimp_curves_tool_settings_import (GimpFilterTool  *filter_tool,
+                                  GInputStream    *input,
+                                  GError         **error)
+{
+  GimpCurvesConfig *config = GIMP_CURVES_CONFIG (filter_tool->config);
+  gchar             header[64];
+  gsize             bytes_read;
+
+  if (! g_input_stream_read_all (input, header, sizeof (header),
+                                 &bytes_read, NULL, error) ||
+      bytes_read != sizeof (header))
+    {
+      g_prefix_error (error, _("Could not read header: "));
+      return FALSE;
+    }
+
+  g_seekable_seek (G_SEEKABLE (input), 0, G_SEEK_SET, NULL, NULL);
+
+  if (g_str_has_prefix (header, "# GIMP Curves File\n"))
+    return gimp_curves_config_load_cruft (config, input, error);
+
+  return GIMP_FILTER_TOOL_CLASS (parent_class)->settings_import (filter_tool,
+                                                                 input,
+                                                                 error);
+}
+
+static gboolean
+gimp_curves_tool_settings_export (GimpFilterTool  *filter_tool,
+                                  GOutputStream   *output,
+                                  GError         **error)
+{
+  GimpCurvesTool   *tool   = GIMP_CURVES_TOOL (filter_tool);
+  GimpCurvesConfig *config = GIMP_CURVES_CONFIG (filter_tool->config);
+
+  if (tool->export_old_format)
+    return gimp_curves_config_save_cruft (config, output, error);
+
+  return GIMP_FILTER_TOOL_CLASS (parent_class)->settings_export (filter_tool,
+                                                                 output,
+                                                                 error);
+}
+
+static void
+gimp_curves_tool_color_picked (GimpFilterTool *filter_tool,
+                               gpointer        identifier,
+                               gdouble         x,
+                               gdouble         y,
+                               const Babl     *sample_format,
+                               const GimpRGB  *color)
+{
+  GimpCurvesTool   *tool     = GIMP_CURVES_TOOL (filter_tool);
+  GimpCurvesConfig *config   = GIMP_CURVES_CONFIG (filter_tool->config);
+  GimpDrawable     *drawable = GIMP_TOOL (tool)->drawable;
+  GimpRGB           rgb      = *color;
+
+  if (config->linear)
+    babl_process (babl_fish (babl_format ("R'G'B'A double"),
+                             babl_format ("RGBA double")),
+                  &rgb, &rgb, 1);
+
+  tool->picked_color[GIMP_HISTOGRAM_RED]   = rgb.r;
+  tool->picked_color[GIMP_HISTOGRAM_GREEN] = rgb.g;
+  tool->picked_color[GIMP_HISTOGRAM_BLUE]  = rgb.b;
+
+  if (gimp_drawable_has_alpha (drawable))
+    tool->picked_color[GIMP_HISTOGRAM_ALPHA] = rgb.a;
+  else
+    tool->picked_color[GIMP_HISTOGRAM_ALPHA] = -1;
+
+  tool->picked_color[GIMP_HISTOGRAM_VALUE] = MAX (MAX (rgb.r, rgb.g), rgb.b);
+
+  gimp_curve_view_set_xpos (GIMP_CURVE_VIEW (tool->graph),
+                            tool->picked_color[config->channel]);
+}
+
+static void
+gimp_curves_tool_export_setup (GimpSettingsBox      *settings_box,
+                               GtkFileChooserDialog *dialog,
+                               gboolean              export,
+                               GimpCurvesTool       *tool)
+{
+  GtkWidget *button;
+
+  if (! export)
+    return;
+
+  button = gtk_check_button_new_with_mnemonic (_("Use _old curves file format"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                tool->export_old_format);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), button);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &tool->export_old_format);
+}
+
+static void
+gimp_curves_tool_update_channel (GimpCurvesTool *tool)
+{
+  GimpFilterTool       *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig     *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+  GimpCurve            *curve       = config->curve[config->channel];
+  GimpHistogramChannel  channel;
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (tool->channel_menu),
+                                 config->channel);
+
+  switch (config->channel)
+    {
+      guchar r[256];
+      guchar g[256];
+      guchar b[256];
+
+    case GIMP_HISTOGRAM_VALUE:
+    case GIMP_HISTOGRAM_ALPHA:
+    case GIMP_HISTOGRAM_RGB:
+    case GIMP_HISTOGRAM_LUMINANCE:
+      gimp_curve_get_uchar (curve, sizeof (r), r);
+
+      gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->xrange),
+                                  r, r, r);
+      break;
+
+    case GIMP_HISTOGRAM_RED:
+    case GIMP_HISTOGRAM_GREEN:
+    case GIMP_HISTOGRAM_BLUE:
+      gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_RED],
+                            sizeof (r), r);
+      gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_GREEN],
+                            sizeof (g), g);
+      gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_BLUE],
+                            sizeof (b), b);
+
+      gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->xrange),
+                                  r, g, b);
+      break;
+    }
+
+  gimp_histogram_view_set_channel (GIMP_HISTOGRAM_VIEW (tool->graph),
+                                   config->channel);
+  gimp_curve_view_set_xpos (GIMP_CURVE_VIEW (tool->graph),
+                            tool->picked_color[config->channel]);
+
+  gimp_color_bar_set_channel (GIMP_COLOR_BAR (tool->yrange),
+                              config->channel);
+
+  gimp_curve_view_remove_all_backgrounds (GIMP_CURVE_VIEW (tool->graph));
+
+  for (channel = GIMP_HISTOGRAM_VALUE;
+       channel <= GIMP_HISTOGRAM_ALPHA;
+       channel++)
+    {
+      GimpRGB  curve_color;
+      gboolean has_color;
+
+      has_color = curves_get_channel_color (tool->graph, channel, &curve_color);
+
+      if (channel == config->channel)
+        {
+          gimp_curve_view_set_curve (GIMP_CURVE_VIEW (tool->graph), curve,
+                                     has_color ? &curve_color : NULL);
+        }
+      else
+        {
+          gimp_curve_view_add_background (GIMP_CURVE_VIEW (tool->graph),
+                                          config->curve[channel],
+                                          has_color ? &curve_color : NULL);
+        }
+    }
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (tool->curve_type),
+                                 curve->curve_type);
+
+  gimp_curves_tool_update_point (tool);
+}
+
+static void
+gimp_curves_tool_update_point (GimpCurvesTool *tool)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+  GimpCurve        *curve       = config->curve[config->channel];
+  gint              point;
+
+  point = gimp_curve_view_get_selected (GIMP_CURVE_VIEW (tool->graph));
+
+  gtk_widget_set_sensitive (tool->point_box, point >= 0);
+
+  if (point >= 0)
+    {
+      gdouble min = 0.0;
+      gdouble max = 1.0;
+      gdouble x;
+      gdouble y;
+
+      if (point > 0)
+        gimp_curve_get_point (curve, point - 1, &min, NULL);
+
+      if (point < gimp_curve_get_n_points (curve) - 1)
+        gimp_curve_get_point (curve, point + 1, &max, NULL);
+
+      gimp_curve_get_point (curve, point, &x, &y);
+
+      x   *= tool->scale;
+      y   *= tool->scale;
+      min *= tool->scale;
+      max *= tool->scale;
+
+      g_signal_handlers_block_by_func (tool->point_input,
+                                       curves_point_coords_callback,
+                                       tool);
+      g_signal_handlers_block_by_func (tool->point_output,
+                                       curves_point_coords_callback,
+                                       tool);
+
+      gtk_spin_button_set_range (GTK_SPIN_BUTTON (tool->point_input), min, max);
+
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (tool->point_input),  x);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (tool->point_output), y);
+
+
+      g_signal_handlers_unblock_by_func (tool->point_input,
+                                         curves_point_coords_callback,
+                                         tool);
+      g_signal_handlers_unblock_by_func (tool->point_output,
+                                         curves_point_coords_callback,
+                                         tool);
+
+      g_signal_handlers_block_by_func (tool->point_type,
+                                       curves_point_type_callback,
+                                       tool);
+
+      gimp_int_radio_group_set_active (
+        GTK_RADIO_BUTTON (tool->point_type),
+        gimp_curve_get_point_type (curve, point));
+
+      g_signal_handlers_unblock_by_func (tool->point_type,
+                                         curves_point_type_callback,
+                                         tool);
+    }
+}
+
+static void
+curves_curve_dirty_callback (GimpCurve      *curve,
+                             GimpCurvesTool *tool)
+{
+  if (tool->graph &&
+      gimp_curve_view_get_curve (GIMP_CURVE_VIEW (tool->graph)) == curve)
+    {
+      gimp_curves_tool_update_point (tool);
+    }
+}
+
+static void
+curves_channel_callback (GtkWidget      *widget,
+                         GimpCurvesTool *tool)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+  gint              value;
+
+  if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value) &&
+      config->channel != value)
+    {
+      g_object_set (config,
+                    "channel", value,
+                    NULL);
+    }
+}
+
+static void
+curves_channel_reset_callback (GtkWidget      *widget,
+                               GimpCurvesTool *tool)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+
+  gimp_curve_reset (config->curve[config->channel], FALSE);
+}
+
+static gboolean
+curves_menu_sensitivity (gint      value,
+                         gpointer  data)
+{
+  GimpDrawable         *drawable = GIMP_TOOL (data)->drawable;
+  GimpHistogramChannel  channel  = value;
+
+  if (!drawable)
+    return FALSE;
+
+  switch (channel)
+    {
+    case GIMP_HISTOGRAM_VALUE:
+      return TRUE;
+
+    case GIMP_HISTOGRAM_RED:
+    case GIMP_HISTOGRAM_GREEN:
+    case GIMP_HISTOGRAM_BLUE:
+      return gimp_drawable_is_rgb (drawable);
+
+    case GIMP_HISTOGRAM_ALPHA:
+      return gimp_drawable_has_alpha (drawable);
+
+    case GIMP_HISTOGRAM_RGB:
+      return FALSE;
+
+    case GIMP_HISTOGRAM_LUMINANCE:
+      return FALSE;
+    }
+
+  return FALSE;
+}
+
+static void
+curves_graph_selection_callback (GtkWidget      *widget,
+                                 GimpCurvesTool *tool)
+{
+  gimp_curves_tool_update_point (tool);
+}
+
+static void
+curves_point_coords_callback (GtkWidget      *widget,
+                              GimpCurvesTool *tool)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+  GimpCurve        *curve       = config->curve[config->channel];
+  gint              point;
+
+  point = gimp_curve_view_get_selected (GIMP_CURVE_VIEW (tool->graph));
+
+  if (point >= 0)
+    {
+      gdouble x;
+      gdouble y;
+
+      x = gtk_spin_button_get_value (GTK_SPIN_BUTTON (tool->point_input));
+      y = gtk_spin_button_get_value (GTK_SPIN_BUTTON (tool->point_output));
+
+      x /= tool->scale;
+      y /= tool->scale;
+
+      gimp_curve_set_point (curve, point, x, y);
+    }
+}
+
+static void
+curves_point_type_callback (GtkWidget      *widget,
+                            GimpCurvesTool *tool)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+  GimpCurve        *curve       = config->curve[config->channel];
+  gint              point;
+
+  point = gimp_curve_view_get_selected (GIMP_CURVE_VIEW (tool->graph));
+
+  if (point >= 0 && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GimpCurvePointType type;
+
+      type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                 "gimp-item-data"));
+
+      gimp_curve_set_point_type (curve, point, type);
+    }
+}
+
+static void
+curves_curve_type_callback (GtkWidget      *widget,
+                            GimpCurvesTool *tool)
+{
+  gint value;
+
+  if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value))
+    {
+      GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+      GimpCurvesConfig *config      = GIMP_CURVES_CONFIG (filter_tool->config);
+      GimpCurveType     curve_type  = value;
+
+      if (config->curve[config->channel]->curve_type != curve_type)
+        gimp_curve_set_curve_type (config->curve[config->channel], curve_type);
+    }
+}
+
+static gboolean
+curves_get_channel_color (GtkWidget            *widget,
+                          GimpHistogramChannel  channel,
+                          GimpRGB              *color)
+{
+  static const GimpRGB channel_colors[GIMP_HISTOGRAM_RGB] =
+  {
+    { 0.0, 0.0, 0.0, 1.0 },
+    { 1.0, 0.0, 0.0, 1.0 },
+    { 0.0, 1.0, 0.0, 1.0 },
+    { 0.0, 0.0, 1.0, 1.0 },
+    { 0.5, 0.5, 0.5, 1.0 }
+  };
+
+  if (channel == GIMP_HISTOGRAM_VALUE)
+    return FALSE;
+
+  if (channel == GIMP_HISTOGRAM_ALPHA)
+    {
+      GtkStyle *style = gtk_widget_get_style (widget);
+
+      gimp_rgba_set (color,
+                     style->text_aa[GTK_STATE_NORMAL].red / 65535.0,
+                     style->text_aa[GTK_STATE_NORMAL].green / 65535.0,
+                     style->text_aa[GTK_STATE_NORMAL].blue / 65535.0,
+                     1.0);
+      return TRUE;
+    }
+
+  *color = channel_colors[channel];
+  return TRUE;
+}
diff --git a/app/tools/gimpcurvestool.h b/app/tools/gimpcurvestool.h
new file mode 100644
index 0000000..8d3ba8b
--- /dev/null
+++ b/app/tools/gimpcurvestool.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVES_TOOL_H__
+#define __GIMP_CURVES_TOOL_H__
+
+
+#include "gimpfiltertool.h"
+
+
+#define GIMP_TYPE_CURVES_TOOL            (gimp_curves_tool_get_type ())
+#define GIMP_CURVES_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CURVES_TOOL, GimpCurvesTool))
+#define GIMP_IS_CURVES_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CURVES_TOOL))
+#define GIMP_CURVES_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CURVES_TOOL, GimpCurvesToolClass))
+#define GIMP_IS_CURVES_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CURVES_TOOL))
+
+
+typedef struct _GimpCurvesTool      GimpCurvesTool;
+typedef struct _GimpCurvesToolClass GimpCurvesToolClass;
+
+struct _GimpCurvesTool
+{
+  GimpFilterTool  parent_instance;
+
+  /* dialog */
+  gdouble           scale;
+  gdouble           picked_color[5];
+
+  GtkWidget        *channel_menu;
+  GtkWidget        *xrange;
+  GtkWidget        *yrange;
+  GtkWidget        *graph;
+  GtkWidget        *point_box;
+  GtkWidget        *point_input;
+  GtkWidget        *point_output;
+  GtkWidget        *point_type;
+  GtkWidget        *curve_type;
+
+  /* export dialog */
+  gboolean          export_old_format;
+};
+
+struct _GimpCurvesToolClass
+{
+  GimpFilterToolClass  parent_class;
+};
+
+
+void    gimp_curves_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data);
+
+GType   gimp_curves_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CURVES_TOOL_H__  */
diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c
new file mode 100644
index 0000000..399eb5f
--- /dev/null
+++ b/app/tools/gimpdodgeburntool.c
@@ -0,0 +1,243 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpdodgeburnoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpdodgeburntool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_dodge_burn_tool_modifier_key  (GimpTool          *tool,
+                                                  GdkModifierType    key,
+                                                  gboolean           press,
+                                                  GdkModifierType    state,
+                                                  GimpDisplay       *display);
+static void   gimp_dodge_burn_tool_cursor_update (GimpTool          *tool,
+                                                  const GimpCoords  *coords,
+                                                  GdkModifierType    state,
+                                                  GimpDisplay       *display);
+static void   gimp_dodge_burn_tool_oper_update   (GimpTool          *tool,
+                                                  const GimpCoords  *coords,
+                                                  GdkModifierType    state,
+                                                  gboolean           proximity,
+                                                  GimpDisplay       *display);
+static void   gimp_dodge_burn_tool_status_update (GimpTool          *tool,
+                                                  GimpDodgeBurnType  type);
+
+static GtkWidget * gimp_dodge_burn_options_gui   (GimpToolOptions   *tool_options);
+
+
+G_DEFINE_TYPE (GimpDodgeBurnTool, gimp_dodge_burn_tool, GIMP_TYPE_BRUSH_TOOL)
+
+#define parent_class gimp_dodge_burn_tool_parent_class
+
+
+void
+gimp_dodge_burn_tool_register (GimpToolRegisterCallback  callback,
+                               gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_DODGE_BURN_TOOL,
+                GIMP_TYPE_DODGE_BURN_OPTIONS,
+                gimp_dodge_burn_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK,
+                "gimp-dodge-burn-tool",
+                _("Dodge / Burn"),
+                _("Dodge / Burn Tool: Selectively lighten or darken using a brush"),
+                N_("Dod_ge / Burn"), "<shift>D",
+                NULL, GIMP_HELP_TOOL_DODGE_BURN,
+                GIMP_ICON_TOOL_DODGE,
+                data);
+}
+
+static void
+gimp_dodge_burn_tool_class_init (GimpDodgeBurnToolClass *klass)
+{
+  GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
+
+  tool_class->modifier_key  = gimp_dodge_burn_tool_modifier_key;
+  tool_class->cursor_update = gimp_dodge_burn_tool_cursor_update;
+  tool_class->oper_update   = gimp_dodge_burn_tool_oper_update;
+}
+
+static void
+gimp_dodge_burn_tool_init (GimpDodgeBurnTool *dodgeburn)
+{
+  GimpTool *tool = GIMP_TOOL (dodgeburn);
+
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_DODGE);
+  gimp_tool_control_set_toggle_tool_cursor (tool->control,
+                                            GIMP_TOOL_CURSOR_BURN);
+
+  gimp_dodge_burn_tool_status_update (tool, GIMP_DODGE_BURN_TYPE_BURN);
+}
+
+static void
+gimp_dodge_burn_tool_modifier_key (GimpTool        *tool,
+                                   GdkModifierType  key,
+                                   gboolean         press,
+                                   GdkModifierType  state,
+                                   GimpDisplay     *display)
+{
+  GimpDodgeBurnTool    *dodgeburn   = GIMP_DODGE_BURN_TOOL (tool);
+  GimpDodgeBurnOptions *options     = GIMP_DODGE_BURN_TOOL_GET_OPTIONS (tool);
+  GdkModifierType       line_mask   = GIMP_PAINT_TOOL_LINE_MASK;
+  GdkModifierType       toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  if ((key == toggle_mask   &&
+      ! (state & line_mask) && /* leave stuff untouched in line draw mode */
+       press != dodgeburn->toggled)
+
+      ||
+
+      (key == line_mask   && /* toggle back after keypresses CTRL(hold)->  */
+       ! press            && /* SHIFT(hold)->CTRL(release)->SHIFT(release) */
+       dodgeburn->toggled &&
+       ! (state & toggle_mask)))
+    {
+      dodgeburn->toggled = press;
+
+      switch (options->type)
+        {
+        case GIMP_DODGE_BURN_TYPE_DODGE:
+          g_object_set (options, "type", GIMP_DODGE_BURN_TYPE_BURN, NULL);
+          break;
+
+        case GIMP_DODGE_BURN_TYPE_BURN:
+          g_object_set (options, "type", GIMP_DODGE_BURN_TYPE_DODGE, NULL);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                display);
+}
+
+static void
+gimp_dodge_burn_tool_cursor_update (GimpTool         *tool,
+                                    const GimpCoords *coords,
+                                    GdkModifierType   state,
+                                    GimpDisplay      *display)
+{
+  GimpDodgeBurnOptions *options = GIMP_DODGE_BURN_TOOL_GET_OPTIONS (tool);
+
+  gimp_tool_control_set_toggled (tool->control,
+                                 options->type == GIMP_DODGE_BURN_TYPE_BURN);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                 display);
+}
+
+static void
+gimp_dodge_burn_tool_oper_update (GimpTool         *tool,
+                                  const GimpCoords *coords,
+                                  GdkModifierType   state,
+                                  gboolean          proximity,
+                                  GimpDisplay      *display)
+{
+  GimpDodgeBurnOptions *options = GIMP_DODGE_BURN_TOOL_GET_OPTIONS (tool);
+
+  gimp_dodge_burn_tool_status_update (tool, options->type);
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+}
+
+static void
+gimp_dodge_burn_tool_status_update (GimpTool          *tool,
+                                    GimpDodgeBurnType  type)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+
+  switch (type)
+    {
+    case GIMP_DODGE_BURN_TYPE_DODGE:
+      paint_tool->status      = _("Click to dodge");
+      paint_tool->status_line = _("Click to dodge the line");
+      paint_tool->status_ctrl = _("%s to burn");
+      break;
+
+    case GIMP_DODGE_BURN_TYPE_BURN:
+      paint_tool->status      = _("Click to burn");
+      paint_tool->status_line = _("Click to burn the line");
+      paint_tool->status_ctrl = _("%s to dodge");
+      break;
+
+    default:
+      break;
+    }
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_dodge_burn_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config = G_OBJECT (tool_options);
+  GtkWidget       *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget       *frame;
+  GtkWidget       *scale;
+  gchar           *str;
+  GdkModifierType  toggle_mask;
+
+  toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /* the type (dodge or burn) */
+  str = g_strdup_printf (_("Type  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+
+  frame = gimp_prop_enum_radio_frame_new (config, "type",
+                                          str, 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  g_free (str);
+
+  /*  mode (highlights, midtones, or shadows)  */
+  frame = gimp_prop_enum_radio_frame_new (config, "mode", NULL,
+                                          0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the exposure scale  */
+  scale = gimp_prop_spin_scale_new (config, "exposure", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return vbox;
+}
diff --git a/app/tools/gimpdodgeburntool.h b/app/tools/gimpdodgeburntool.h
new file mode 100644
index 0000000..68687ea
--- /dev/null
+++ b/app/tools/gimpdodgeburntool.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DODGE_BURN_TOOL_H__
+#define __GIMP_DODGE_BURN_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+
+
+#define GIMP_TYPE_DODGE_BURN_TOOL            (gimp_dodge_burn_tool_get_type ())
+#define GIMP_DODGE_BURN_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DODGE_BURN_TOOL, GimpDodgeBurnTool))
+#define GIMP_IS_DODGE_BURN_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DODGE_BURN_TOOL))
+#define GIMP_DODGE_BURN_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DODGE_BURN_TOOL, GimpDodgeBurnToolClass))
+#define GIMP_IS_DODGE_BURN_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DODGE_BURN_TOOL))
+
+#define GIMP_DODGE_BURN_TOOL_GET_OPTIONS(t)  (GIMP_DODGE_BURN_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpDodgeBurnTool      GimpDodgeBurnTool;
+typedef struct _GimpDodgeBurnToolClass GimpDodgeBurnToolClass;
+
+struct _GimpDodgeBurnTool
+{
+  GimpBrushTool parent_instance;
+
+  gboolean      toggled;
+};
+
+struct _GimpDodgeBurnToolClass
+{
+  GimpBrushToolClass parent_class;
+};
+
+
+void    gimp_dodge_burn_tool_register (GimpToolRegisterCallback  callback,
+                                       gpointer                  data);
+
+GType   gimp_dodge_burn_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_DODGEBURN_TOOL_H__  */
diff --git a/app/tools/gimpdrawtool.c b/app/tools/gimpdrawtool.c
new file mode 100644
index 0000000..b97e30a
--- /dev/null
+++ b/app/tools/gimpdrawtool.c
@@ -0,0 +1,1281 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+
+#include "display/gimpcanvas.h"
+#include "display/gimpcanvasarc.h"
+#include "display/gimpcanvasboundary.h"
+#include "display/gimpcanvasgroup.h"
+#include "display/gimpcanvasguide.h"
+#include "display/gimpcanvashandle.h"
+#include "display/gimpcanvasitem-utils.h"
+#include "display/gimpcanvasline.h"
+#include "display/gimpcanvaspen.h"
+#include "display/gimpcanvaspolygon.h"
+#include "display/gimpcanvasrectangle.h"
+#include "display/gimpcanvassamplepoint.h"
+#include "display/gimpcanvastextcursor.h"
+#include "display/gimpcanvastransformpreview.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-items.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolwidget.h"
+
+#include "gimpdrawtool.h"
+#include "gimptoolcontrol.h"
+
+
+#define USE_TIMEOUT
+#define DRAW_FPS              120
+#define DRAW_TIMEOUT          (1000 /* milliseconds */ / (2 * DRAW_FPS))
+#define MINIMUM_DRAW_INTERVAL (G_TIME_SPAN_SECOND / DRAW_FPS)
+
+
+static void          gimp_draw_tool_dispose       (GObject          *object);
+
+static gboolean      gimp_draw_tool_has_display   (GimpTool         *tool,
+                                                   GimpDisplay      *display);
+static GimpDisplay * gimp_draw_tool_has_image     (GimpTool         *tool,
+                                                   GimpImage        *image);
+static void          gimp_draw_tool_control       (GimpTool         *tool,
+                                                   GimpToolAction    action,
+                                                   GimpDisplay      *display);
+static gboolean      gimp_draw_tool_key_press     (GimpTool         *tool,
+                                                   GdkEventKey      *kevent,
+                                                   GimpDisplay      *display);
+static gboolean      gimp_draw_tool_key_release   (GimpTool         *tool,
+                                                   GdkEventKey      *kevent,
+                                                   GimpDisplay      *display);
+static void          gimp_draw_tool_modifier_key  (GimpTool         *tool,
+                                                   GdkModifierType   key,
+                                                   gboolean          press,
+                                                   GdkModifierType   state,
+                                                   GimpDisplay      *display);
+static void          gimp_draw_tool_active_modifier_key
+                                                  (GimpTool         *tool,
+                                                   GdkModifierType   key,
+                                                   gboolean          press,
+                                                   GdkModifierType   state,
+                                                   GimpDisplay      *display);
+static void          gimp_draw_tool_oper_update   (GimpTool         *tool,
+                                                   const GimpCoords *coords,
+                                                   GdkModifierType   state,
+                                                   gboolean          proximity,
+                                                   GimpDisplay      *display);
+static void          gimp_draw_tool_cursor_update (GimpTool         *tool,
+                                                   const GimpCoords *coords,
+                                                   GdkModifierType   state,
+                                                   GimpDisplay      *display);
+
+static void          gimp_draw_tool_widget_status (GimpToolWidget   *widget,
+                                                   const gchar      *status,
+                                                   GimpTool         *tool);
+static void          gimp_draw_tool_widget_status_coords
+                                                  (GimpToolWidget   *widget,
+                                                   const gchar      *title,
+                                                   gdouble           x,
+                                                   const gchar      *separator,
+                                                   gdouble           y,
+                                                   const gchar      *help,
+                                                   GimpTool         *tool);
+static void          gimp_draw_tool_widget_message
+                                                  (GimpToolWidget   *widget,
+                                                   const gchar      *message,
+                                                   GimpTool         *tool);
+static void          gimp_draw_tool_widget_snap_offsets
+                                                  (GimpToolWidget   *widget,
+                                                   gint              offset_x,
+                                                   gint              offset_y,
+                                                   gint              width,
+                                                   gint              height,
+                                                   GimpTool         *tool);
+
+static void          gimp_draw_tool_draw          (GimpDrawTool     *draw_tool);
+static void          gimp_draw_tool_undraw        (GimpDrawTool     *draw_tool);
+static void          gimp_draw_tool_real_draw     (GimpDrawTool     *draw_tool);
+
+
+G_DEFINE_TYPE (GimpDrawTool, gimp_draw_tool, GIMP_TYPE_TOOL)
+
+#define parent_class gimp_draw_tool_parent_class
+
+
+static void
+gimp_draw_tool_class_init (GimpDrawToolClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass *tool_class   = GIMP_TOOL_CLASS (klass);
+
+  object_class->dispose           = gimp_draw_tool_dispose;
+
+  tool_class->has_display         = gimp_draw_tool_has_display;
+  tool_class->has_image           = gimp_draw_tool_has_image;
+  tool_class->control             = gimp_draw_tool_control;
+  tool_class->key_press           = gimp_draw_tool_key_press;
+  tool_class->key_release         = gimp_draw_tool_key_release;
+  tool_class->modifier_key        = gimp_draw_tool_modifier_key;
+  tool_class->active_modifier_key = gimp_draw_tool_active_modifier_key;
+  tool_class->oper_update         = gimp_draw_tool_oper_update;
+  tool_class->cursor_update       = gimp_draw_tool_cursor_update;
+
+  klass->draw                     = gimp_draw_tool_real_draw;
+}
+
+static void
+gimp_draw_tool_init (GimpDrawTool *draw_tool)
+{
+  draw_tool->display      = NULL;
+  draw_tool->paused_count = 0;
+  draw_tool->preview      = NULL;
+  draw_tool->item         = NULL;
+}
+
+static void
+gimp_draw_tool_dispose (GObject *object)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (object);
+
+  if (draw_tool->draw_timeout)
+    {
+      g_source_remove (draw_tool->draw_timeout);
+      draw_tool->draw_timeout = 0;
+    }
+
+  gimp_draw_tool_set_widget (draw_tool, NULL);
+  gimp_draw_tool_set_default_status (draw_tool, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static gboolean
+gimp_draw_tool_has_display (GimpTool    *tool,
+                            GimpDisplay *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  return (display == draw_tool->display ||
+          GIMP_TOOL_CLASS (parent_class)->has_display (tool, display));
+}
+
+static GimpDisplay *
+gimp_draw_tool_has_image (GimpTool  *tool,
+                          GimpImage *image)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+  GimpDisplay  *display;
+
+  display = GIMP_TOOL_CLASS (parent_class)->has_image (tool, image);
+
+  if (! display && draw_tool->display)
+    {
+      if (image && gimp_display_get_image (draw_tool->display) == image)
+        display = draw_tool->display;
+
+      /*  NULL image means any display  */
+      if (! image)
+        display = draw_tool->display;
+    }
+
+  return display;
+}
+
+static void
+gimp_draw_tool_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      if (gimp_draw_tool_is_active (draw_tool))
+        gimp_draw_tool_stop (draw_tool);
+      gimp_draw_tool_set_widget (draw_tool, NULL);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static gboolean
+gimp_draw_tool_key_press (GimpTool    *tool,
+                          GdkEventKey *kevent,
+                          GimpDisplay *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (draw_tool->widget && display == draw_tool->display)
+    {
+      return gimp_tool_widget_key_press (draw_tool->widget, kevent);
+    }
+
+  return GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display);
+}
+
+static gboolean
+gimp_draw_tool_key_release (GimpTool    *tool,
+                            GdkEventKey *kevent,
+                            GimpDisplay *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (draw_tool->widget && display == draw_tool->display)
+    {
+      return gimp_tool_widget_key_release (draw_tool->widget, kevent);
+    }
+
+  return GIMP_TOOL_CLASS (parent_class)->key_release (tool, kevent, display);
+}
+
+static void
+gimp_draw_tool_modifier_key (GimpTool        *tool,
+                             GdkModifierType  key,
+                             gboolean         press,
+                             GdkModifierType  state,
+                             GimpDisplay     *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (draw_tool->widget && display == draw_tool->display)
+    {
+      gimp_tool_widget_hover_modifier (draw_tool->widget, key, press, state);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                display);
+}
+
+static void
+gimp_draw_tool_active_modifier_key (GimpTool        *tool,
+                                    GdkModifierType  key,
+                                    gboolean         press,
+                                    GdkModifierType  state,
+                                    GimpDisplay     *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (draw_tool->widget && display == draw_tool->display)
+    {
+      gimp_tool_widget_motion_modifier (draw_tool->widget, key, press, state);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->active_modifier_key (tool, key, press, state,
+                                                       display);
+}
+
+static void
+gimp_draw_tool_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (draw_tool->widget && display == draw_tool->display)
+    {
+      gimp_tool_widget_hover (draw_tool->widget, coords, state, proximity);
+    }
+  else if (proximity && draw_tool->default_status)
+    {
+      gimp_tool_replace_status (tool, display, "%s", draw_tool->default_status);
+    }
+  else if (! proximity)
+    {
+      gimp_tool_pop_status (tool, display);
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                                   proximity, display);
+    }
+}
+
+static void
+gimp_draw_tool_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (draw_tool->widget && display == draw_tool->display)
+    {
+      GimpCursorType     cursor;
+      GimpToolCursorType tool_cursor;
+      GimpCursorModifier modifier;
+
+      cursor      = gimp_tool_control_get_cursor (tool->control);
+      tool_cursor = gimp_tool_control_get_tool_cursor (tool->control);
+      modifier    = gimp_tool_control_get_cursor_modifier (tool->control);
+
+      if (gimp_tool_widget_get_cursor (draw_tool->widget, coords, state,
+                                       &cursor, &tool_cursor, &modifier))
+        {
+          gimp_tool_set_cursor (tool, display,
+                                cursor, tool_cursor, modifier);
+          return;
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                 display);
+}
+
+static void
+gimp_draw_tool_widget_status (GimpToolWidget *widget,
+                              const gchar    *status,
+                              GimpTool       *tool)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (gimp_draw_tool_is_active (draw_tool))
+    {
+      if (status)
+        gimp_tool_replace_status (tool, draw_tool->display, "%s", status);
+      else
+        gimp_tool_pop_status (tool, draw_tool->display);
+    }
+}
+
+static void
+gimp_draw_tool_widget_status_coords (GimpToolWidget *widget,
+                                     const gchar    *title,
+                                     gdouble         x,
+                                     const gchar    *separator,
+                                     gdouble         y,
+                                     const gchar    *help,
+                                     GimpTool       *tool)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (gimp_draw_tool_is_active (draw_tool))
+    {
+      gimp_tool_pop_status (tool, draw_tool->display);
+      gimp_tool_push_status_coords (tool, draw_tool->display,
+                                    gimp_tool_control_get_precision (
+                                      tool->control),
+                                    title, x, separator, y, help);
+    }
+}
+
+static void
+gimp_draw_tool_widget_message (GimpToolWidget *widget,
+                               const gchar    *message,
+                               GimpTool       *tool)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (gimp_draw_tool_is_active (draw_tool))
+    gimp_tool_message_literal (tool, draw_tool->display, message);
+}
+
+static void
+gimp_draw_tool_widget_snap_offsets (GimpToolWidget   *widget,
+                                    gint              offset_x,
+                                    gint              offset_y,
+                                    gint              width,
+                                    gint              height,
+                                    GimpTool         *tool)
+{
+  gimp_tool_control_set_snap_offsets (tool->control,
+                                      offset_x, offset_y,
+                                      width, height);
+}
+
+#ifdef USE_TIMEOUT
+static gboolean
+gimp_draw_tool_draw_timeout (GimpDrawTool *draw_tool)
+{
+  guint64 now = g_get_monotonic_time ();
+
+  /* keep the timeout running if the last drawing just happened */
+  if ((now - draw_tool->last_draw_time) <= MINIMUM_DRAW_INTERVAL)
+    return TRUE;
+
+  draw_tool->draw_timeout = 0;
+
+  gimp_draw_tool_draw (draw_tool);
+
+  return FALSE;
+}
+#endif
+
+static void
+gimp_draw_tool_draw (GimpDrawTool *draw_tool)
+{
+  guint64 now = g_get_monotonic_time ();
+
+  if (draw_tool->display &&
+      draw_tool->paused_count == 0 &&
+      (! draw_tool->draw_timeout ||
+       (now - draw_tool->last_draw_time) > MINIMUM_DRAW_INTERVAL))
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (draw_tool->display);
+
+      if (draw_tool->draw_timeout)
+        {
+          g_source_remove (draw_tool->draw_timeout);
+          draw_tool->draw_timeout = 0;
+        }
+
+      gimp_draw_tool_undraw (draw_tool);
+
+      GIMP_DRAW_TOOL_GET_CLASS (draw_tool)->draw (draw_tool);
+
+      if (draw_tool->group_stack)
+        {
+          g_warning ("%s: draw_tool->group_stack not empty after calling "
+                     "GimpDrawTool::draw() of %s",
+                     G_STRFUNC,
+                     g_type_name (G_TYPE_FROM_INSTANCE (draw_tool)));
+
+          while (draw_tool->group_stack)
+            gimp_draw_tool_pop_group (draw_tool);
+        }
+
+      if (draw_tool->preview)
+        gimp_display_shell_add_preview_item (shell, draw_tool->preview);
+
+      if (draw_tool->item)
+        gimp_display_shell_add_tool_item (shell, draw_tool->item);
+
+#if 0
+      gimp_display_shell_flush (shell, TRUE);
+#endif
+
+      draw_tool->last_draw_time = g_get_monotonic_time ();
+
+#if 0
+      g_printerr ("drawing tool stuff took %f seconds\n",
+                  (draw_tool->last_draw_time - now) / 1000000.0);
+#endif
+    }
+}
+
+static void
+gimp_draw_tool_undraw (GimpDrawTool *draw_tool)
+{
+  if (draw_tool->display)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (draw_tool->display);
+
+      if (draw_tool->preview)
+        {
+          gimp_display_shell_remove_preview_item (shell, draw_tool->preview);
+          g_clear_object (&draw_tool->preview);
+        }
+
+      if (draw_tool->item)
+        {
+          gimp_display_shell_remove_tool_item (shell, draw_tool->item);
+          g_clear_object (&draw_tool->item);
+        }
+    }
+}
+
+static void
+gimp_draw_tool_real_draw (GimpDrawTool *draw_tool)
+{
+  if (draw_tool->widget)
+    {
+      GimpCanvasItem *item = gimp_tool_widget_get_item (draw_tool->widget);
+
+      gimp_draw_tool_add_item (draw_tool, item);
+    }
+}
+
+void
+gimp_draw_tool_start (GimpDrawTool *draw_tool,
+                      GimpDisplay  *display)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_draw_tool_is_active (draw_tool) == FALSE);
+
+  draw_tool->display = display;
+
+  gimp_draw_tool_draw (draw_tool);
+}
+
+void
+gimp_draw_tool_stop (GimpDrawTool *draw_tool)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (gimp_draw_tool_is_active (draw_tool) == TRUE);
+
+  gimp_draw_tool_undraw (draw_tool);
+
+  if (draw_tool->draw_timeout)
+    {
+      g_source_remove (draw_tool->draw_timeout);
+      draw_tool->draw_timeout = 0;
+    }
+
+  draw_tool->last_draw_time = 0;
+
+  draw_tool->display = NULL;
+}
+
+gboolean
+gimp_draw_tool_is_active (GimpDrawTool *draw_tool)
+{
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), FALSE);
+
+  return draw_tool->display != NULL;
+}
+
+void
+gimp_draw_tool_pause (GimpDrawTool *draw_tool)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+
+  draw_tool->paused_count++;
+
+  if (draw_tool->draw_timeout)
+    {
+      g_source_remove (draw_tool->draw_timeout);
+      draw_tool->draw_timeout = 0;
+    }
+}
+
+void
+gimp_draw_tool_resume (GimpDrawTool *draw_tool)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (draw_tool->paused_count > 0);
+
+  draw_tool->paused_count--;
+
+  if (draw_tool->paused_count == 0)
+    {
+#ifdef USE_TIMEOUT
+      /* Don't install the timeout if the draw tool isn't active, so
+       * suspend()/resume() can always be called, and have no side
+       * effect on an inactive tool. See bug #687851.
+       */
+      if (gimp_draw_tool_is_active (draw_tool) && ! draw_tool->draw_timeout)
+        {
+          draw_tool->draw_timeout =
+            gdk_threads_add_timeout_full (G_PRIORITY_HIGH_IDLE,
+                                          DRAW_TIMEOUT,
+                                          (GSourceFunc) gimp_draw_tool_draw_timeout,
+                                          draw_tool, NULL);
+        }
+#endif
+
+      /* call draw() anyway, it will do nothing if the timeout is
+       * running, but will additionally check the drawing times to
+       * ensure the minimum framerate
+       */
+      gimp_draw_tool_draw (draw_tool);
+    }
+}
+
+/**
+ * gimp_draw_tool_calc_distance:
+ * @draw_tool: a #GimpDrawTool
+ * @display:   a #GimpDisplay
+ * @x1:        start point X in image coordinates
+ * @y1:        start point Y in image coordinates
+ * @x2:        end point X in image coordinates
+ * @y2:        end point Y in image coordinates
+ *
+ * If you just need to compare distances, consider to use
+ * gimp_draw_tool_calc_distance_square() instead.
+ *
+ * Returns: the distance between the given points in display coordinates
+ **/
+gdouble
+gimp_draw_tool_calc_distance (GimpDrawTool *draw_tool,
+                              GimpDisplay  *display,
+                              gdouble       x1,
+                              gdouble       y1,
+                              gdouble       x2,
+                              gdouble       y2)
+{
+  return sqrt (gimp_draw_tool_calc_distance_square (draw_tool, display,
+                                                    x1, y1, x2, y2));
+}
+
+/**
+ * gimp_draw_tool_calc_distance_square:
+ * @draw_tool: a #GimpDrawTool
+ * @display:   a #GimpDisplay
+ * @x1:        start point X in image coordinates
+ * @y1:        start point Y in image coordinates
+ * @x2:        end point X in image coordinates
+ * @y2:        end point Y in image coordinates
+ *
+ * This function is more effective than gimp_draw_tool_calc_distance()
+ * as it doesn't perform a sqrt(). Use this if you just need to compare
+ * distances.
+ *
+ * Returns: the square of the distance between the given points in
+ *          display coordinates
+ **/
+gdouble
+gimp_draw_tool_calc_distance_square (GimpDrawTool *draw_tool,
+                                     GimpDisplay  *display,
+                                     gdouble       x1,
+                                     gdouble       y1,
+                                     gdouble       x2,
+                                     gdouble       y2)
+{
+  GimpDisplayShell *shell;
+  gdouble           tx1, ty1;
+  gdouble           tx2, ty2;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), 0.0);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), 0.0);
+
+  shell = gimp_display_get_shell (display);
+
+  gimp_display_shell_transform_xy_f (shell, x1, y1, &tx1, &ty1);
+  gimp_display_shell_transform_xy_f (shell, x2, y2, &tx2, &ty2);
+
+  return SQR (tx2 - tx1) + SQR (ty2 - ty1);
+}
+
+void
+gimp_draw_tool_set_widget (GimpDrawTool   *draw_tool,
+                           GimpToolWidget *widget)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (widget == NULL || GIMP_IS_TOOL_WIDGET (widget));
+
+  if (widget == draw_tool->widget)
+    return;
+
+  if (draw_tool->widget)
+    {
+      gimp_tool_widget_set_focus (draw_tool->widget, FALSE);
+
+      g_signal_handlers_disconnect_by_func (draw_tool->widget,
+                                            gimp_draw_tool_widget_status,
+                                            draw_tool);
+      g_signal_handlers_disconnect_by_func (draw_tool->widget,
+                                            gimp_draw_tool_widget_status_coords,
+                                            draw_tool);
+      g_signal_handlers_disconnect_by_func (draw_tool->widget,
+                                            gimp_draw_tool_widget_message,
+                                            draw_tool);
+      g_signal_handlers_disconnect_by_func (draw_tool->widget,
+                                            gimp_draw_tool_widget_snap_offsets,
+                                            draw_tool);
+
+      if (gimp_draw_tool_is_active (draw_tool))
+        {
+          GimpCanvasItem *item = gimp_tool_widget_get_item (draw_tool->widget);
+
+          gimp_draw_tool_remove_item (draw_tool, item);
+        }
+
+      g_object_unref (draw_tool->widget);
+    }
+
+  draw_tool->widget = widget;
+
+  if (draw_tool->widget)
+    {
+      g_object_ref (draw_tool->widget);
+
+      if (gimp_draw_tool_is_active (draw_tool))
+        {
+          GimpCanvasItem *item = gimp_tool_widget_get_item (draw_tool->widget);
+
+          gimp_draw_tool_add_item (draw_tool, item);
+        }
+
+      g_signal_connect (draw_tool->widget, "status",
+                        G_CALLBACK (gimp_draw_tool_widget_status),
+                        draw_tool);
+      g_signal_connect (draw_tool->widget, "status-coords",
+                        G_CALLBACK (gimp_draw_tool_widget_status_coords),
+                        draw_tool);
+      g_signal_connect (draw_tool->widget, "message",
+                        G_CALLBACK (gimp_draw_tool_widget_message),
+                        draw_tool);
+      g_signal_connect (draw_tool->widget, "snap-offsets",
+                        G_CALLBACK (gimp_draw_tool_widget_snap_offsets),
+                        draw_tool);
+
+      gimp_tool_widget_set_focus (draw_tool->widget, TRUE);
+    }
+}
+
+void
+gimp_draw_tool_set_default_status (GimpDrawTool *draw_tool,
+                                   const gchar  *status)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+
+  if (draw_tool->default_status)
+    g_free (draw_tool->default_status);
+
+  draw_tool->default_status = g_strdup (status);
+}
+
+void
+gimp_draw_tool_add_preview (GimpDrawTool   *draw_tool,
+                            GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  if (! draw_tool->preview)
+    draw_tool->preview =
+      gimp_canvas_group_new (gimp_display_get_shell (draw_tool->display));
+
+  gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (draw_tool->preview), item);
+}
+
+void
+gimp_draw_tool_remove_preview (GimpDrawTool   *draw_tool,
+                               GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+  g_return_if_fail (draw_tool->preview != NULL);
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (draw_tool->preview), item);
+}
+
+void
+gimp_draw_tool_add_item (GimpDrawTool   *draw_tool,
+                         GimpCanvasItem *item)
+{
+  GimpCanvasGroup *group;
+
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+
+  if (! draw_tool->item)
+    draw_tool->item =
+      gimp_canvas_group_new (gimp_display_get_shell (draw_tool->display));
+
+  group = GIMP_CANVAS_GROUP (draw_tool->item);
+
+  if (draw_tool->group_stack)
+    group = draw_tool->group_stack->data;
+
+  gimp_canvas_group_add_item (group, item);
+}
+
+void
+gimp_draw_tool_remove_item (GimpDrawTool   *draw_tool,
+                            GimpCanvasItem *item)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
+  g_return_if_fail (draw_tool->item != NULL);
+
+  gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (draw_tool->item), item);
+}
+
+GimpCanvasGroup *
+gimp_draw_tool_add_stroke_group (GimpDrawTool *draw_tool)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_group_new (gimp_display_get_shell (draw_tool->display));
+  gimp_canvas_group_set_group_stroking (GIMP_CANVAS_GROUP (item), TRUE);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return GIMP_CANVAS_GROUP (item);
+}
+
+GimpCanvasGroup *
+gimp_draw_tool_add_fill_group (GimpDrawTool *draw_tool)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_group_new (gimp_display_get_shell (draw_tool->display));
+  gimp_canvas_group_set_group_filling (GIMP_CANVAS_GROUP (item), TRUE);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return GIMP_CANVAS_GROUP (item);
+}
+
+void
+gimp_draw_tool_push_group (GimpDrawTool    *draw_tool,
+                           GimpCanvasGroup *group)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (GIMP_IS_CANVAS_GROUP (group));
+
+  draw_tool->group_stack = g_list_prepend (draw_tool->group_stack, group);
+}
+
+void
+gimp_draw_tool_pop_group (GimpDrawTool *draw_tool)
+{
+  g_return_if_fail (GIMP_IS_DRAW_TOOL (draw_tool));
+  g_return_if_fail (draw_tool->group_stack != NULL);
+
+  draw_tool->group_stack = g_list_remove (draw_tool->group_stack,
+                                          draw_tool->group_stack->data);
+}
+
+/**
+ * gimp_draw_tool_add_line:
+ * @draw_tool:   the #GimpDrawTool
+ * @x1:          start point X in image coordinates
+ * @y1:          start point Y in image coordinates
+ * @x2:          end point X in image coordinates
+ * @y2:          end point Y in image coordinates
+ *
+ * This function takes image space coordinates and transforms them to
+ * screen window coordinates, then draws a line between the resulting
+ * coordindates.
+ **/
+GimpCanvasItem *
+gimp_draw_tool_add_line (GimpDrawTool *draw_tool,
+                         gdouble       x1,
+                         gdouble       y1,
+                         gdouble       x2,
+                         gdouble       y2)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_line_new (gimp_display_get_shell (draw_tool->display),
+                               x1, y1, x2, y2);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+/**
+ * gimp_draw_tool_add_guide:
+ * @draw_tool:   the #GimpDrawTool
+ * @orientation: the orientation of the guide line
+ * @position:    the position of the guide line in image coordinates
+ *
+ * This function draws a guide line across the canvas.
+ **/
+GimpCanvasItem *
+gimp_draw_tool_add_guide (GimpDrawTool        *draw_tool,
+                          GimpOrientationType  orientation,
+                          gint                 position,
+                          GimpGuideStyle       style)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_guide_new (gimp_display_get_shell (draw_tool->display),
+                                orientation, position,
+                                style);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+/**
+ * gimp_draw_tool_add_crosshair:
+ * @draw_tool:  the #GimpDrawTool
+ * @position_x: the position of the vertical guide line in image coordinates
+ * @position_y: the position of the horizontal guide line in image coordinates
+ *
+ * This function draws two crossing guide lines across the canvas.
+ **/
+GimpCanvasItem *
+gimp_draw_tool_add_crosshair (GimpDrawTool *draw_tool,
+                              gint          position_x,
+                              gint          position_y)
+{
+  GimpCanvasGroup *group;
+
+  group = gimp_draw_tool_add_stroke_group (draw_tool);
+
+  gimp_draw_tool_push_group (draw_tool, group);
+  gimp_draw_tool_add_guide (draw_tool,
+                            GIMP_ORIENTATION_VERTICAL, position_x,
+                            GIMP_GUIDE_STYLE_NONE);
+  gimp_draw_tool_add_guide (draw_tool,
+                            GIMP_ORIENTATION_HORIZONTAL, position_y,
+                            GIMP_GUIDE_STYLE_NONE);
+  gimp_draw_tool_pop_group (draw_tool);
+
+  return GIMP_CANVAS_ITEM (group);
+}
+
+/**
+ * gimp_draw_tool_add_sample_point:
+ * @draw_tool: the #GimpDrawTool
+ * @x:         X position of the sample point
+ * @y:         Y position of the sample point
+ * @index:     Index of the sample point
+ *
+ * This function draws a sample point
+ **/
+GimpCanvasItem *
+gimp_draw_tool_add_sample_point (GimpDrawTool *draw_tool,
+                                 gint          x,
+                                 gint          y,
+                                 gint          index)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_sample_point_new (gimp_display_get_shell (draw_tool->display),
+                                       x, y, index, TRUE);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+/**
+ * gimp_draw_tool_add_rectangle:
+ * @draw_tool:   the #GimpDrawTool
+ * @filled:      whether to fill the rectangle
+ * @x:           horizontal image coordinate
+ * @y:           vertical image coordinate
+ * @width:       width in image coordinates
+ * @height:      height in image coordinates
+ *
+ * This function takes image space coordinates and transforms them to
+ * screen window coordinates, then draws the resulting rectangle.
+ **/
+GimpCanvasItem *
+gimp_draw_tool_add_rectangle (GimpDrawTool *draw_tool,
+                              gboolean      filled,
+                              gdouble       x,
+                              gdouble       y,
+                              gdouble       width,
+                              gdouble       height)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_rectangle_new (gimp_display_get_shell (draw_tool->display),
+                                    x, y, width, height, filled);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_arc (GimpDrawTool *draw_tool,
+                        gboolean      filled,
+                        gdouble       x,
+                        gdouble       y,
+                        gdouble       width,
+                        gdouble       height,
+                        gdouble       start_angle,
+                        gdouble       slice_angle)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_arc_new (gimp_display_get_shell (draw_tool->display),
+                              x + width  / 2.0,
+                              y + height / 2.0,
+                              width  / 2.0,
+                              height / 2.0,
+                              start_angle,
+                              slice_angle,
+                              filled);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_handle (GimpDrawTool     *draw_tool,
+                           GimpHandleType    type,
+                           gdouble           x,
+                           gdouble           y,
+                           gint              width,
+                           gint              height,
+                           GimpHandleAnchor  anchor)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_handle_new (gimp_display_get_shell (draw_tool->display),
+                                 type, anchor, x, y, width, height);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_lines (GimpDrawTool      *draw_tool,
+                          const GimpVector2 *points,
+                          gint               n_points,
+                          GimpMatrix3       *transform,
+                          gboolean           filled)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  if (points == NULL || n_points < 2)
+    return NULL;
+
+  item = gimp_canvas_polygon_new (gimp_display_get_shell (draw_tool->display),
+                                  points, n_points, transform, filled);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_strokes (GimpDrawTool     *draw_tool,
+                            const GimpCoords *points,
+                            gint              n_points,
+                            GimpMatrix3      *transform,
+                            gboolean          filled)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  if (points == NULL || n_points < 2)
+    return NULL;
+
+  item = gimp_canvas_polygon_new_from_coords (gimp_display_get_shell (draw_tool->display),
+                                              points, n_points, transform, filled);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_pen (GimpDrawTool      *draw_tool,
+                        const GimpVector2 *points,
+                        gint               n_points,
+                        GimpContext       *context,
+                        GimpActiveColor    color,
+                        gint               width)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  if (points == NULL || n_points < 2)
+    return NULL;
+
+  item = gimp_canvas_pen_new (gimp_display_get_shell (draw_tool->display),
+                              points, n_points, context, color, width);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+/**
+ * gimp_draw_tool_add_boundary:
+ * @draw_tool:    a #GimpDrawTool
+ * @bound_segs:   the sorted brush outline
+ * @n_bound_segs: the number of segments in @bound_segs
+ * @matrix:       transform matrix for the boundary
+ * @offset_x:     x offset
+ * @offset_y:     y offset
+ *
+ * Draw the boundary of the brush that @draw_tool uses. The boundary
+ * should be sorted with sort_boundary(), and @n_bound_segs should
+ * include the sentinel segments inserted by sort_boundary() that
+ * indicate the end of connected segment sequences (groups) .
+ */
+GimpCanvasItem *
+gimp_draw_tool_add_boundary (GimpDrawTool       *draw_tool,
+                             const GimpBoundSeg *bound_segs,
+                             gint                n_bound_segs,
+                             GimpMatrix3        *transform,
+                             gdouble             offset_x,
+                             gdouble             offset_y)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+  g_return_val_if_fail (n_bound_segs > 0, NULL);
+  g_return_val_if_fail (bound_segs != NULL, NULL);
+
+  item = gimp_canvas_boundary_new (gimp_display_get_shell (draw_tool->display),
+                                   bound_segs, n_bound_segs,
+                                   transform,
+                                   offset_x, offset_y);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_text_cursor (GimpDrawTool     *draw_tool,
+                                PangoRectangle   *cursor,
+                                gboolean          overwrite,
+                                GimpTextDirection direction)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+
+  item = gimp_canvas_text_cursor_new (gimp_display_get_shell (draw_tool->display),
+                                      cursor, overwrite, direction);
+
+  gimp_draw_tool_add_item (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_draw_tool_add_transform_preview (GimpDrawTool      *draw_tool,
+                                      GimpPickable      *pickable,
+                                      const GimpMatrix3 *transform,
+                                      gdouble            x1,
+                                      gdouble            y1,
+                                      gdouble            x2,
+                                      gdouble            y2)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), NULL);
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+  g_return_val_if_fail (transform != NULL, NULL);
+
+  item = gimp_canvas_transform_preview_new (gimp_display_get_shell (draw_tool->display),
+                                            pickable, transform,
+                                            x1, y1, x2, y2);
+
+  gimp_draw_tool_add_preview (draw_tool, item);
+  g_object_unref (item);
+
+  return item;
+}
+
+gboolean
+gimp_draw_tool_on_handle (GimpDrawTool     *draw_tool,
+                          GimpDisplay      *display,
+                          gdouble           x,
+                          gdouble           y,
+                          GimpHandleType    type,
+                          gdouble           handle_x,
+                          gdouble           handle_y,
+                          gint              width,
+                          gint              height,
+                          GimpHandleAnchor  anchor)
+{
+  GimpDisplayShell *shell;
+  gdouble           tx, ty;
+  gdouble           handle_tx, handle_ty;
+
+  g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  shell = gimp_display_get_shell (display);
+
+  gimp_display_shell_zoom_xy_f (shell,
+                                x, y,
+                                &tx, &ty);
+  gimp_display_shell_zoom_xy_f (shell,
+                                handle_x, handle_y,
+                                &handle_tx, &handle_ty);
+
+  switch (type)
+    {
+    case GIMP_HANDLE_SQUARE:
+    case GIMP_HANDLE_FILLED_SQUARE:
+    case GIMP_HANDLE_CROSS:
+    case GIMP_HANDLE_CROSSHAIR:
+      gimp_canvas_item_shift_to_north_west (anchor,
+                                            handle_tx, handle_ty,
+                                            width, height,
+                                            &handle_tx, &handle_ty);
+
+      return (tx == CLAMP (tx, handle_tx, handle_tx + width) &&
+              ty == CLAMP (ty, handle_ty, handle_ty + height));
+
+    case GIMP_HANDLE_CIRCLE:
+    case GIMP_HANDLE_FILLED_CIRCLE:
+      gimp_canvas_item_shift_to_center (anchor,
+                                        handle_tx, handle_ty,
+                                        width, height,
+                                        &handle_tx, &handle_ty);
+
+      /* FIXME */
+      if (width != height)
+        width = (width + height) / 2;
+
+      width /= 2;
+
+      return ((SQR (handle_tx - tx) + SQR (handle_ty - ty)) < SQR (width));
+
+    default:
+      g_warning ("%s: invalid handle type %d", G_STRFUNC, type);
+      break;
+    }
+
+  return FALSE;
+}
diff --git a/app/tools/gimpdrawtool.h b/app/tools/gimpdrawtool.h
new file mode 100644
index 0000000..68b72d5
--- /dev/null
+++ b/app/tools/gimpdrawtool.h
@@ -0,0 +1,206 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAW_TOOL_H__
+#define __GIMP_DRAW_TOOL_H__
+
+
+#include "gimptool.h"
+
+
+#define GIMP_TOOL_HANDLE_SIZE_CIRCLE    13
+#define GIMP_TOOL_HANDLE_SIZE_CROSS     15
+#define GIMP_TOOL_HANDLE_SIZE_CROSSHAIR 43
+#define GIMP_TOOL_HANDLE_SIZE_LARGE     25
+#define GIMP_TOOL_HANDLE_SIZE_SMALL     7
+
+
+#define GIMP_TYPE_DRAW_TOOL            (gimp_draw_tool_get_type ())
+#define GIMP_DRAW_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAW_TOOL, GimpDrawTool))
+#define GIMP_DRAW_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAW_TOOL, GimpDrawToolClass))
+#define GIMP_IS_DRAW_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAW_TOOL))
+#define GIMP_IS_DRAW_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAW_TOOL))
+#define GIMP_DRAW_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAW_TOOL, GimpDrawToolClass))
+
+
+typedef struct _GimpDrawToolClass GimpDrawToolClass;
+
+struct _GimpDrawTool
+{
+  GimpTool        parent_instance;
+
+  GimpDisplay    *display;        /*  The display we are drawing to (may be
+                                   *  a different one than tool->display)
+                                   */
+
+  gint            paused_count;   /*  count to keep track of multiple pauses  */
+  guint           draw_timeout;   /*  draw delay timeout ID                   */
+  guint64         last_draw_time; /*  time of last draw(), monotonically      */
+
+  GimpToolWidget *widget;
+  gchar          *default_status;
+  GimpCanvasItem *preview;
+  GimpCanvasItem *item;
+  GList          *group_stack;
+};
+
+struct _GimpDrawToolClass
+{
+  GimpToolClass   parent_class;
+
+  /*  virtual function  */
+
+  void (* draw) (GimpDrawTool *draw_tool);
+};
+
+
+GType            gimp_draw_tool_get_type             (void) G_GNUC_CONST;
+
+void             gimp_draw_tool_start                (GimpDrawTool     *draw_tool,
+                                                      GimpDisplay      *display);
+void             gimp_draw_tool_stop                 (GimpDrawTool     *draw_tool);
+
+gboolean         gimp_draw_tool_is_active            (GimpDrawTool     *draw_tool);
+
+void             gimp_draw_tool_pause                (GimpDrawTool     *draw_tool);
+void             gimp_draw_tool_resume               (GimpDrawTool     *draw_tool);
+
+gdouble          gimp_draw_tool_calc_distance        (GimpDrawTool     *draw_tool,
+                                                      GimpDisplay      *display,
+                                                      gdouble           x1,
+                                                      gdouble           y1,
+                                                      gdouble           x2,
+                                                      gdouble           y2);
+gdouble          gimp_draw_tool_calc_distance_square (GimpDrawTool     *draw_tool,
+                                                      GimpDisplay      *display,
+                                                      gdouble           x1,
+                                                      gdouble           y1,
+                                                      gdouble           x2,
+                                                      gdouble           y2);
+
+void             gimp_draw_tool_set_widget           (GimpDrawTool     *draw_tool,
+                                                      GimpToolWidget   *widget);
+void             gimp_draw_tool_set_default_status   (GimpDrawTool     *draw_tool,
+                                                      const gchar      *status);
+
+void             gimp_draw_tool_add_preview          (GimpDrawTool     *draw_tool,
+                                                      GimpCanvasItem   *item);
+void             gimp_draw_tool_remove_preview       (GimpDrawTool     *draw_tool,
+                                                      GimpCanvasItem   *item);
+
+void             gimp_draw_tool_add_item             (GimpDrawTool     *draw_tool,
+                                                      GimpCanvasItem   *item);
+void             gimp_draw_tool_remove_item          (GimpDrawTool     *draw_tool,
+                                                      GimpCanvasItem   *item);
+
+GimpCanvasGroup* gimp_draw_tool_add_stroke_group     (GimpDrawTool     *draw_tool);
+GimpCanvasGroup* gimp_draw_tool_add_fill_group       (GimpDrawTool     *draw_tool);
+
+void             gimp_draw_tool_push_group           (GimpDrawTool     *draw_tool,
+                                                      GimpCanvasGroup  *group);
+void             gimp_draw_tool_pop_group            (GimpDrawTool     *draw_tool);
+
+GimpCanvasItem * gimp_draw_tool_add_line             (GimpDrawTool     *draw_tool,
+                                                      gdouble           x1,
+                                                      gdouble           y1,
+                                                      gdouble           x2,
+                                                      gdouble           y2);
+GimpCanvasItem * gimp_draw_tool_add_guide            (GimpDrawTool     *draw_tool,
+                                                      GimpOrientationType  orientation,
+                                                      gint              position,
+                                                      GimpGuideStyle    style);
+GimpCanvasItem * gimp_draw_tool_add_crosshair        (GimpDrawTool     *draw_tool,
+                                                      gint              position_x,
+                                                      gint              position_y);
+GimpCanvasItem * gimp_draw_tool_add_sample_point     (GimpDrawTool     *draw_tool,
+                                                      gint              x,
+                                                      gint              y,
+                                                      gint              index);
+GimpCanvasItem * gimp_draw_tool_add_rectangle        (GimpDrawTool     *draw_tool,
+                                                      gboolean          filled,
+                                                      gdouble           x,
+                                                      gdouble           y,
+                                                      gdouble           width,
+                                                      gdouble           height);
+GimpCanvasItem * gimp_draw_tool_add_arc              (GimpDrawTool     *draw_tool,
+                                                      gboolean          filled,
+                                                      gdouble           x,
+                                                      gdouble           y,
+                                                      gdouble           width,
+                                                      gdouble           height,
+                                                      gdouble           start_angle,
+                                                      gdouble           slice_angle);
+GimpCanvasItem * gimp_draw_tool_add_transform_preview(GimpDrawTool     *draw_tool,
+                                                      GimpPickable     *pickable,
+                                                      const GimpMatrix3 *transform,
+                                                      gdouble           x1,
+                                                      gdouble           y1,
+                                                      gdouble           x2,
+                                                      gdouble           y2);
+
+GimpCanvasItem * gimp_draw_tool_add_handle           (GimpDrawTool     *draw_tool,
+                                                      GimpHandleType    type,
+                                                      gdouble           x,
+                                                      gdouble           y,
+                                                      gint              width,
+                                                      gint              height,
+                                                      GimpHandleAnchor  anchor);
+
+GimpCanvasItem * gimp_draw_tool_add_lines            (GimpDrawTool     *draw_tool,
+                                                      const GimpVector2 *points,
+                                                      gint              n_points,
+                                                      GimpMatrix3      *transform,
+                                                      gboolean          filled);
+
+GimpCanvasItem * gimp_draw_tool_add_strokes          (GimpDrawTool     *draw_tool,
+                                                      const GimpCoords *points,
+                                                      gint              n_points,
+                                                      GimpMatrix3      *transform,
+                                                      gboolean          filled);
+
+GimpCanvasItem * gimp_draw_tool_add_pen              (GimpDrawTool     *draw_tool,
+                                                      const GimpVector2 *points,
+                                                      gint              n_points,
+                                                      GimpContext      *context,
+                                                      GimpActiveColor   color,
+                                                      gint              width);
+
+GimpCanvasItem * gimp_draw_tool_add_boundary         (GimpDrawTool     *draw_tool,
+                                                      const GimpBoundSeg *bound_segs,
+                                                      gint              n_bound_segs,
+                                                      GimpMatrix3      *transform,
+                                                      gdouble           offset_x,
+                                                      gdouble           offset_y);
+
+GimpCanvasItem * gimp_draw_tool_add_text_cursor      (GimpDrawTool     *draw_tool,
+                                                      PangoRectangle   *cursor,
+                                                      gboolean          overwrite,
+                                                      GimpTextDirection direction);
+
+gboolean         gimp_draw_tool_on_handle            (GimpDrawTool     *draw_tool,
+                                                      GimpDisplay      *display,
+                                                      gdouble           x,
+                                                      gdouble           y,
+                                                      GimpHandleType    type,
+                                                      gdouble           handle_x,
+                                                      gdouble           handle_y,
+                                                      gint              width,
+                                                      gint              height,
+                                                      GimpHandleAnchor  anchor);
+
+
+#endif  /*  __GIMP_DRAW_TOOL_H__  */
diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c
new file mode 100644
index 0000000..8b261ef
--- /dev/null
+++ b/app/tools/gimpeditselectiontool.c
@@ -0,0 +1,1287 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpboundary.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-item-list.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpitem-linked.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimpprojection.h"
+#include "core/gimpselection.h"
+#include "core/gimpundostack.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimpdisplayshell-selection.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimpdrawtool.h"
+#include "gimpeditselectiontool.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+#include "tool_manager.h"
+
+#include "gimp-intl.h"
+
+
+#define ARROW_VELOCITY 25
+
+
+typedef struct _GimpEditSelectionTool      GimpEditSelectionTool;
+typedef struct _GimpEditSelectionToolClass GimpEditSelectionToolClass;
+
+struct _GimpEditSelectionTool
+{
+  GimpDrawTool        parent_instance;
+
+  gdouble             start_x;         /*  Coords where button was pressed   */
+  gdouble             start_y;
+
+  gint                last_x;          /*  Last x and y coords               */
+  gint                last_y;
+
+  gint                current_x;       /*  Current x and y coords            */
+  gint                current_y;
+
+  gint                cuml_x;          /*  Cumulative changes to x and y     */
+  gint                cuml_y;
+
+  gint                sel_x;           /*  Bounding box of selection mask    */
+  gint                sel_y;           /*  Bounding box of selection mask    */
+  gint                sel_width;
+  gint                sel_height;
+
+  gint                num_segs_in;     /*  Num seg in selection boundary     */
+  gint                num_segs_out;    /*  Num seg in selection boundary     */
+  GimpBoundSeg       *segs_in;         /*  Pointer to the channel sel. segs  */
+  GimpBoundSeg       *segs_out;        /*  Pointer to the channel sel. segs  */
+
+  gdouble             center_x;        /*  Where to draw the mark of center  */
+  gdouble             center_y;
+
+  GimpTranslateMode   edit_mode;       /*  Translate the mask or layer?      */
+
+  GList              *live_items;      /*  Items that are transformed live   */
+  GList              *delayed_items;   /*  Items that are transformed later  */
+
+  gboolean            first_move;      /*  Don't push undos after the first  */
+
+  gboolean            propagate_release;
+
+  gboolean            constrain;       /*  Constrain the movement            */
+
+  gdouble             last_motion_x;   /*  Previous coords sent to _motion   */
+  gdouble             last_motion_y;
+};
+
+struct _GimpEditSelectionToolClass
+{
+  GimpDrawToolClass   parent_class;
+};
+
+
+static void       gimp_edit_selection_tool_finalize            (GObject               *object);
+
+static void       gimp_edit_selection_tool_button_release      (GimpTool              *tool,
+                                                                const GimpCoords      *coords,
+                                                                guint32                time,
+                                                                GdkModifierType        state,
+                                                                GimpButtonReleaseType  release_type,
+                                                                GimpDisplay           *display);
+static void       gimp_edit_selection_tool_motion              (GimpTool              *tool,
+                                                                const GimpCoords      *coords,
+                                                                guint32                time,
+                                                                GdkModifierType        state,
+                                                                GimpDisplay           *display);
+static void       gimp_edit_selection_tool_active_modifier_key (GimpTool              *tool,
+                                                                GdkModifierType        key,
+                                                                gboolean               press,
+                                                                GdkModifierType        state,
+                                                                GimpDisplay           *display);
+static void       gimp_edit_selection_tool_draw                (GimpDrawTool          *tool);
+
+static GimpItem * gimp_edit_selection_tool_get_active_item     (GimpEditSelectionTool *edit_select,
+                                                                GimpImage             *image);
+static void       gimp_edit_selection_tool_calc_coords         (GimpEditSelectionTool *edit_select,
+                                                                GimpImage             *image,
+                                                                gdouble                x,
+                                                                gdouble                y);
+static void       gimp_edit_selection_tool_start_undo_group    (GimpEditSelectionTool *edit_select,
+                                                                GimpImage             *image);
+
+
+G_DEFINE_TYPE (GimpEditSelectionTool, gimp_edit_selection_tool,
+               GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_edit_selection_tool_parent_class
+
+
+static void
+gimp_edit_selection_tool_class_init (GimpEditSelectionToolClass *klass)
+{
+  GObjectClass      *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class   = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_class   = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->finalize          = gimp_edit_selection_tool_finalize;
+
+  tool_class->button_release      = gimp_edit_selection_tool_button_release;
+  tool_class->motion              = gimp_edit_selection_tool_motion;
+  tool_class->active_modifier_key = gimp_edit_selection_tool_active_modifier_key;
+
+  draw_class->draw                = gimp_edit_selection_tool_draw;
+}
+
+static void
+gimp_edit_selection_tool_init (GimpEditSelectionTool *edit_select)
+{
+  GimpTool *tool = GIMP_TOOL (edit_select);
+
+  edit_select->first_move = TRUE;
+
+  gimp_tool_control_set_active_modifiers (tool->control,
+                                          GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+}
+
+static void
+gimp_edit_selection_tool_finalize (GObject *object)
+{
+  GimpEditSelectionTool *edit_select = GIMP_EDIT_SELECTION_TOOL (object);
+
+  g_clear_pointer (&edit_select->segs_in, g_free);
+  edit_select->num_segs_in = 0;
+
+  g_clear_pointer (&edit_select->segs_out, g_free);
+  edit_select->num_segs_out = 0;
+
+  g_clear_pointer (&edit_select->live_items,    g_list_free);
+  g_clear_pointer (&edit_select->delayed_items, g_list_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+void
+gimp_edit_selection_tool_start (GimpTool          *parent_tool,
+                                GimpDisplay       *display,
+                                const GimpCoords  *coords,
+                                GimpTranslateMode  edit_mode,
+                                gboolean           propagate_release)
+{
+  GimpEditSelectionTool *edit_select;
+  GimpTool              *tool;
+  GimpDisplayShell      *shell;
+  GimpImage             *image;
+  GimpItem              *active_item;
+  GList                 *list;
+  gint                   off_x, off_y;
+
+  edit_select = g_object_new (GIMP_TYPE_EDIT_SELECTION_TOOL,
+                              "tool-info", parent_tool->tool_info,
+                              NULL);
+
+  edit_select->propagate_release = propagate_release;
+
+  tool = GIMP_TOOL (edit_select);
+
+  shell = gimp_display_get_shell (display);
+  image = gimp_display_get_image (display);
+
+  /*  Make a check to see if it should be a floating selection translation  */
+  if ((edit_mode == GIMP_TRANSLATE_MODE_MASK_TO_LAYER ||
+       edit_mode == GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER) &&
+      gimp_image_get_floating_selection (image))
+    {
+      edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
+    }
+
+  if (edit_mode == GIMP_TRANSLATE_MODE_LAYER)
+    {
+      GimpLayer *layer = gimp_image_get_active_layer (image);
+
+      if (gimp_layer_is_floating_sel (layer))
+        edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
+    }
+
+  edit_select->edit_mode = edit_mode;
+
+  gimp_edit_selection_tool_start_undo_group (edit_select, image);
+
+  /* Remember starting point for use in constrained movement */
+  edit_select->start_x = coords->x;
+  edit_select->start_y = coords->y;
+
+  active_item = gimp_edit_selection_tool_get_active_item (edit_select, image);
+
+  gimp_item_get_offset (active_item, &off_x, &off_y);
+
+  /* Manually set the last coords to the starting point */
+  edit_select->last_x = coords->x - off_x;
+  edit_select->last_y = coords->y - off_y;
+
+  edit_select->constrain = FALSE;
+
+  /* Find the active item's selection bounds */
+  {
+    GimpChannel        *channel;
+    const GimpBoundSeg *segs_in;
+    const GimpBoundSeg *segs_out;
+
+    if (GIMP_IS_CHANNEL (active_item))
+      channel = GIMP_CHANNEL (active_item);
+    else
+      channel = gimp_image_get_mask (image);
+
+    gimp_channel_boundary (channel,
+                           &segs_in, &segs_out,
+                           &edit_select->num_segs_in,
+                           &edit_select->num_segs_out,
+                           0, 0, 0, 0);
+
+    edit_select->segs_in = g_memdup (segs_in,
+                                     edit_select->num_segs_in *
+                                     sizeof (GimpBoundSeg));
+
+    edit_select->segs_out = g_memdup (segs_out,
+                                      edit_select->num_segs_out *
+                                      sizeof (GimpBoundSeg));
+
+    if (edit_select->edit_mode == GIMP_TRANSLATE_MODE_VECTORS)
+      {
+        edit_select->sel_x      = 0;
+        edit_select->sel_y      = 0;
+        edit_select->sel_width  = gimp_image_get_width  (image);
+        edit_select->sel_height = gimp_image_get_height (image);
+      }
+    else
+      {
+        /*  find the bounding box of the selection mask - this is used
+         *  for the case of a GIMP_TRANSLATE_MODE_MASK_TO_LAYER, where
+         *  the translation will result in floating the selection mask
+         *  and translating the resulting layer
+         */
+        gimp_item_mask_intersect (active_item,
+                                  &edit_select->sel_x,
+                                  &edit_select->sel_y,
+                                  &edit_select->sel_width,
+                                  &edit_select->sel_height);
+      }
+  }
+
+  gimp_edit_selection_tool_calc_coords (edit_select, image,
+                                        coords->x, coords->y);
+
+  {
+    gint x, y, w, h;
+
+    switch (edit_select->edit_mode)
+      {
+      case GIMP_TRANSLATE_MODE_CHANNEL:
+      case GIMP_TRANSLATE_MODE_MASK:
+      case GIMP_TRANSLATE_MODE_LAYER_MASK:
+        gimp_item_bounds (active_item, &x, &y, &w, &h);
+        x += off_x;
+        y += off_y;
+        break;
+
+      case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
+      case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
+        x = edit_select->sel_x + off_x;
+        y = edit_select->sel_y + off_y;
+        w = edit_select->sel_width;
+        h = edit_select->sel_height;
+        break;
+
+      case GIMP_TRANSLATE_MODE_LAYER:
+      case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+      case GIMP_TRANSLATE_MODE_VECTORS:
+        if (gimp_item_get_linked (active_item))
+          {
+            GList *linked;
+
+            linked = gimp_image_item_list_get_list (image,
+                                                    GIMP_IS_LAYER (active_item) ?
+                                                    GIMP_ITEM_TYPE_LAYERS :
+                                                    GIMP_ITEM_TYPE_VECTORS,
+                                                    GIMP_ITEM_SET_LINKED);
+            linked = gimp_image_item_list_filter (linked);
+
+            gimp_image_item_list_bounds (image, linked, &x, &y, &w, &h);
+
+            g_list_free (linked);
+          }
+        else
+          {
+            gimp_item_bounds (active_item, &x, &y, &w, &h);
+            x += off_x;
+            y += off_y;
+          }
+       break;
+      }
+
+    gimp_tool_control_set_snap_offsets (tool->control,
+                                        x - coords->x,
+                                        y - coords->y,
+                                        w, h);
+
+    /* Save where to draw the mark of the center */
+    edit_select->center_x = x + w / 2.0;
+    edit_select->center_y = y + h / 2.0;
+  }
+
+  if (gimp_item_get_linked (active_item))
+    {
+      switch (edit_select->edit_mode)
+        {
+        case GIMP_TRANSLATE_MODE_CHANNEL:
+        case GIMP_TRANSLATE_MODE_LAYER:
+        case GIMP_TRANSLATE_MODE_VECTORS:
+          edit_select->live_items =
+            gimp_image_item_list_get_list (image,
+                                           GIMP_ITEM_TYPE_LAYERS |
+                                           GIMP_ITEM_TYPE_VECTORS,
+                                           GIMP_ITEM_SET_LINKED);
+          edit_select->live_items =
+            gimp_image_item_list_filter (edit_select->live_items);
+
+          edit_select->delayed_items =
+            gimp_image_item_list_get_list (image,
+                                           GIMP_ITEM_TYPE_CHANNELS,
+                                           GIMP_ITEM_SET_LINKED);
+          edit_select->delayed_items =
+            gimp_image_item_list_filter (edit_select->delayed_items);
+          break;
+
+        default:
+          /* other stuff can't be linked so don't bother */
+          break;
+        }
+    }
+  else
+    {
+      switch (edit_select->edit_mode)
+        {
+        case GIMP_TRANSLATE_MODE_VECTORS:
+        case GIMP_TRANSLATE_MODE_LAYER:
+        case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+          edit_select->live_items = g_list_append (NULL, active_item);
+          break;
+
+        case GIMP_TRANSLATE_MODE_CHANNEL:
+        case GIMP_TRANSLATE_MODE_LAYER_MASK:
+        case GIMP_TRANSLATE_MODE_MASK:
+          edit_select->delayed_items = g_list_append (NULL, active_item);
+          break;
+
+        default:
+          /* MASK_TO_LAYER and MASK_COPY_TO_LAYER create a live_item later */
+          break;
+        }
+    }
+
+  for (list = edit_select->live_items; list; list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      gimp_viewable_preview_freeze (GIMP_VIEWABLE (item));
+
+      gimp_item_start_transform (item, TRUE);
+    }
+
+  tool_manager_push_tool (display->gimp, tool);
+
+  gimp_tool_control_activate (tool->control);
+  tool->display = display;
+
+  /*  pause the current selection  */
+  gimp_display_shell_selection_pause (shell);
+
+  /* initialize the statusbar display */
+  gimp_tool_push_status_coords (tool, display,
+                                gimp_tool_control_get_precision (tool->control),
+                                _("Move: "), 0, ", ", 0, NULL);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (edit_select), display);
+}
+
+
+static void
+gimp_edit_selection_tool_button_release (GimpTool              *tool,
+                                         const GimpCoords      *coords,
+                                         guint32                time,
+                                         GdkModifierType        state,
+                                         GimpButtonReleaseType  release_type,
+                                         GimpDisplay           *display)
+{
+  GimpEditSelectionTool *edit_select = GIMP_EDIT_SELECTION_TOOL (tool);
+  GimpDisplayShell      *shell       = gimp_display_get_shell (display);
+  GimpImage             *image       = gimp_display_get_image (display);
+  GList                 *list;
+
+  /*  resume the current selection  */
+  gimp_display_shell_selection_resume (shell);
+
+  gimp_tool_pop_status (tool, display);
+
+  gimp_tool_control_halt (tool->control);
+
+  /*  Stop and free the selection core  */
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (edit_select));
+
+  tool_manager_pop_tool (display->gimp);
+
+  /* move the items -- whether there has been movement or not!
+   * (to ensure that there's something on the undo stack)
+   */
+  gimp_image_item_list_translate (image,
+                                  edit_select->delayed_items,
+                                  edit_select->cuml_x,
+                                  edit_select->cuml_y,
+                                  TRUE);
+
+  for (list = edit_select->live_items; list; list = g_list_next (list))
+    {
+      GimpItem *item = list->data;
+
+      gimp_item_end_transform (item, TRUE);
+
+      gimp_viewable_preview_thaw (GIMP_VIEWABLE (item));
+    }
+
+  gimp_image_undo_group_end (image);
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      /* Operation cancelled - undo the undo-group! */
+      gimp_image_undo (image);
+    }
+
+  gimp_image_flush (image);
+
+  if (edit_select->propagate_release &&
+      tool_manager_get_active (display->gimp))
+    {
+      tool_manager_button_release_active (display->gimp,
+                                          coords, time, state,
+                                          display);
+    }
+
+  g_object_unref (edit_select);
+}
+
+static void
+gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select,
+                                        gdouble                new_x,
+                                        gdouble                new_y,
+                                        GimpDisplay           *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (edit_select);
+  GimpTool     *tool      = GIMP_TOOL (edit_select);
+  GimpImage    *image     = gimp_display_get_image (display);
+  gint          dx;
+  gint          dy;
+
+  gdk_flush ();
+
+  gimp_draw_tool_pause (draw_tool);
+
+  if (edit_select->constrain)
+    {
+      gimp_constrain_line (edit_select->start_x, edit_select->start_y,
+                           &new_x, &new_y,
+                           GIMP_CONSTRAIN_LINE_45_DEGREES, 0.0, 1.0, 1.0);
+    }
+
+  gimp_edit_selection_tool_calc_coords (edit_select, image,
+                                        new_x, new_y);
+
+  dx = edit_select->current_x - edit_select->last_x;
+  dy = edit_select->current_y - edit_select->last_y;
+
+  /*  if there has been movement, move  */
+  if (dx != 0 || dy != 0)
+    {
+      GimpItem *active_item;
+      GError   *error = NULL;
+
+      active_item = gimp_edit_selection_tool_get_active_item (edit_select,
+                                                              image);
+
+      edit_select->cuml_x += dx;
+      edit_select->cuml_y += dy;
+
+      switch (edit_select->edit_mode)
+        {
+        case GIMP_TRANSLATE_MODE_LAYER_MASK:
+        case GIMP_TRANSLATE_MODE_MASK:
+        case GIMP_TRANSLATE_MODE_VECTORS:
+        case GIMP_TRANSLATE_MODE_CHANNEL:
+          edit_select->last_x = edit_select->current_x;
+          edit_select->last_y = edit_select->current_y;
+
+          /*  fallthru  */
+
+        case GIMP_TRANSLATE_MODE_LAYER:
+          gimp_image_item_list_translate (image,
+                                          edit_select->live_items,
+                                          dx, dy,
+                                          edit_select->first_move);
+          break;
+
+        case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
+        case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
+          if (! gimp_selection_float (GIMP_SELECTION (gimp_image_get_mask (image)),
+                                      GIMP_DRAWABLE (active_item),
+                                      gimp_get_user_context (display->gimp),
+                                      edit_select->edit_mode ==
+                                      GIMP_TRANSLATE_MODE_MASK_TO_LAYER,
+                                      0, 0, &error))
+            {
+              /* no region to float, abort safely */
+              gimp_message_literal (display->gimp, G_OBJECT (display),
+                                    GIMP_MESSAGE_WARNING,
+                                    error->message);
+              g_clear_error (&error);
+              gimp_draw_tool_resume (draw_tool);
+
+              return;
+            }
+
+          edit_select->last_x -= edit_select->sel_x;
+          edit_select->last_y -= edit_select->sel_y;
+          edit_select->sel_x   = 0;
+          edit_select->sel_y   = 0;
+
+          edit_select->edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
+
+          active_item = gimp_edit_selection_tool_get_active_item (edit_select,
+                                                                  image);
+
+          edit_select->live_items = g_list_prepend (NULL, active_item);
+
+          gimp_viewable_preview_freeze (GIMP_VIEWABLE (active_item));
+
+          gimp_item_start_transform (active_item, TRUE);
+
+          /*  fallthru  */
+
+        case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+          gimp_image_item_list_translate (image,
+                                          edit_select->live_items,
+                                          dx, dy,
+                                          edit_select->first_move);
+          break;
+        }
+
+      edit_select->first_move = FALSE;
+    }
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+
+  gimp_tool_pop_status (tool, display);
+  gimp_tool_push_status_coords (tool, display,
+                                gimp_tool_control_get_precision (tool->control),
+                                _("Move: "),
+                                edit_select->cuml_x,
+                                ", ",
+                                edit_select->cuml_y,
+                                NULL);
+
+  gimp_draw_tool_resume (draw_tool);
+}
+
+
+static void
+gimp_edit_selection_tool_motion (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 guint32           time,
+                                 GdkModifierType   state,
+                                 GimpDisplay      *display)
+{
+  GimpEditSelectionTool *edit_select = GIMP_EDIT_SELECTION_TOOL (tool);
+
+  edit_select->last_motion_x = coords->x;
+  edit_select->last_motion_y = coords->y;
+
+  gimp_edit_selection_tool_update_motion (edit_select,
+                                          coords->x, coords->y,
+                                          display);
+}
+
+static void
+gimp_edit_selection_tool_active_modifier_key (GimpTool        *tool,
+                                              GdkModifierType  key,
+                                              gboolean         press,
+                                              GdkModifierType  state,
+                                              GimpDisplay     *display)
+{
+  GimpEditSelectionTool *edit_select = GIMP_EDIT_SELECTION_TOOL (tool);
+
+  edit_select->constrain = (state & gimp_get_constrain_behavior_mask () ?
+                            TRUE : FALSE);
+
+  /* If we didn't came here due to a mouse release, immediately update
+   * the position of the thing we move.
+   */
+  if (state & GDK_BUTTON1_MASK)
+    {
+      gimp_edit_selection_tool_update_motion (edit_select,
+                                              edit_select->last_motion_x,
+                                              edit_select->last_motion_y,
+                                              display);
+    }
+}
+
+static void
+gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpEditSelectionTool *edit_select = GIMP_EDIT_SELECTION_TOOL (draw_tool);
+  GimpDisplay           *display     = GIMP_TOOL (draw_tool)->display;
+  GimpImage             *image       = gimp_display_get_image (display);
+  GimpItem              *active_item;
+  gint                   off_x;
+  gint                   off_y;
+
+  active_item = gimp_edit_selection_tool_get_active_item (edit_select, image);
+
+  gimp_item_get_offset (active_item, &off_x, &off_y);
+
+  switch (edit_select->edit_mode)
+    {
+    case GIMP_TRANSLATE_MODE_CHANNEL:
+    case GIMP_TRANSLATE_MODE_LAYER_MASK:
+    case GIMP_TRANSLATE_MODE_MASK:
+      {
+        gboolean floating_sel = FALSE;
+
+        if (edit_select->edit_mode == GIMP_TRANSLATE_MODE_MASK)
+          {
+            GimpLayer *layer = gimp_image_get_active_layer (image);
+
+            if (layer)
+              floating_sel = gimp_layer_is_floating_sel (layer);
+          }
+
+        if (! floating_sel && edit_select->segs_in)
+          {
+            gimp_draw_tool_add_boundary (draw_tool,
+                                         edit_select->segs_in,
+                                         edit_select->num_segs_in,
+                                         NULL,
+                                         edit_select->cuml_x + off_x,
+                                         edit_select->cuml_y + off_y);
+          }
+
+        if (edit_select->segs_out)
+          {
+            gimp_draw_tool_add_boundary (draw_tool,
+                                         edit_select->segs_out,
+                                         edit_select->num_segs_out,
+                                         NULL,
+                                         edit_select->cuml_x + off_x,
+                                         edit_select->cuml_y + off_y);
+          }
+        else if (edit_select->edit_mode != GIMP_TRANSLATE_MODE_MASK)
+          {
+            gimp_draw_tool_add_rectangle (draw_tool,
+                                          FALSE,
+                                          edit_select->cuml_x + off_x,
+                                          edit_select->cuml_y + off_y,
+                                          gimp_item_get_width  (active_item),
+                                          gimp_item_get_height (active_item));
+          }
+      }
+      break;
+
+    case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
+    case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
+      gimp_draw_tool_add_rectangle (draw_tool,
+                                    FALSE,
+                                    edit_select->sel_x + off_x,
+                                    edit_select->sel_y + off_y,
+                                    edit_select->sel_width,
+                                    edit_select->sel_height);
+      break;
+
+    case GIMP_TRANSLATE_MODE_LAYER:
+    case GIMP_TRANSLATE_MODE_VECTORS:
+      {
+        gint x, y, w, h;
+
+        if (gimp_item_get_linked (active_item))
+          {
+            GList *linked;
+
+            linked = gimp_image_item_list_get_list (image,
+                                                    GIMP_IS_LAYER (active_item) ?
+                                                    GIMP_ITEM_TYPE_LAYERS :
+                                                    GIMP_ITEM_TYPE_VECTORS,
+                                                    GIMP_ITEM_SET_LINKED);
+            linked = gimp_image_item_list_filter (linked);
+
+            gimp_image_item_list_bounds (image, linked, &x, &y, &w, &h);
+
+            g_list_free (linked);
+          }
+        else
+          {
+            gimp_item_bounds (active_item, &x, &y, &w, &h);
+            x += off_x;
+            y += off_y;
+          }
+
+        gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                      x, y, w, h);
+      }
+      break;
+
+    case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+      if (edit_select->segs_in)
+        {
+          gimp_draw_tool_add_boundary (draw_tool,
+                                       edit_select->segs_in,
+                                       edit_select->num_segs_in,
+                                       NULL,
+                                       edit_select->cuml_x,
+                                       edit_select->cuml_y);
+        }
+      break;
+    }
+
+  /* Mark the center because we snap to it */
+  gimp_draw_tool_add_handle (draw_tool,
+                             GIMP_HANDLE_CROSS,
+                             edit_select->center_x + edit_select->cuml_x,
+                             edit_select->center_y + edit_select->cuml_y,
+                             GIMP_TOOL_HANDLE_SIZE_SMALL,
+                             GIMP_TOOL_HANDLE_SIZE_SMALL,
+                             GIMP_HANDLE_ANCHOR_CENTER);
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+}
+
+static GimpItem *
+gimp_edit_selection_tool_get_active_item (GimpEditSelectionTool *edit_select,
+                                          GimpImage             *image)
+{
+  GimpItem *active_item;
+
+  switch (edit_select->edit_mode)
+    {
+    case GIMP_TRANSLATE_MODE_VECTORS:
+      active_item = GIMP_ITEM (gimp_image_get_active_vectors (image));
+      break;
+
+    case GIMP_TRANSLATE_MODE_LAYER:
+      active_item = GIMP_ITEM (gimp_image_get_active_layer (image));
+      break;
+
+    case GIMP_TRANSLATE_MODE_MASK:
+      active_item = GIMP_ITEM (gimp_image_get_mask (image));
+      break;
+
+    default:
+      active_item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+      break;
+    }
+
+  return active_item;
+}
+
+static void
+gimp_edit_selection_tool_calc_coords (GimpEditSelectionTool *edit_select,
+                                      GimpImage             *image,
+                                      gdouble                x,
+                                      gdouble                y)
+{
+  GimpItem *active_item;
+  gint      off_x, off_y;
+  gdouble   x1, y1;
+  gdouble   dx, dy;
+
+  active_item = gimp_edit_selection_tool_get_active_item (edit_select, image);
+
+  gimp_item_get_offset (active_item, &off_x, &off_y);
+
+  dx = (x - off_x) - edit_select->last_x;
+  dy = (y - off_y) - edit_select->last_y;
+
+  x1 = edit_select->sel_x + dx;
+  y1 = edit_select->sel_y + dy;
+
+  edit_select->current_x = ((gint) floor (x1) -
+                            (edit_select->sel_x - edit_select->last_x));
+  edit_select->current_y = ((gint) floor (y1) -
+                            (edit_select->sel_y - edit_select->last_y));
+}
+
+static void
+gimp_edit_selection_tool_start_undo_group (GimpEditSelectionTool *edit_select,
+                                           GimpImage             *image)
+{
+  GimpItem    *active_item;
+  const gchar *undo_desc = NULL;
+
+  active_item = gimp_edit_selection_tool_get_active_item (edit_select, image);
+
+  switch (edit_select->edit_mode)
+    {
+    case GIMP_TRANSLATE_MODE_VECTORS:
+    case GIMP_TRANSLATE_MODE_CHANNEL:
+    case GIMP_TRANSLATE_MODE_LAYER_MASK:
+    case GIMP_TRANSLATE_MODE_MASK:
+    case GIMP_TRANSLATE_MODE_LAYER:
+      undo_desc = GIMP_ITEM_GET_CLASS (active_item)->translate_desc;
+      break;
+
+    case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
+    case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
+    case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+      undo_desc = _("Move Floating Selection");
+      break;
+
+    default:
+      g_return_if_reached ();
+    }
+
+  gimp_image_undo_group_start (image,
+                               edit_select->edit_mode ==
+                               GIMP_TRANSLATE_MODE_MASK ?
+                               GIMP_UNDO_GROUP_MASK :
+                               GIMP_UNDO_GROUP_ITEM_DISPLACE,
+                               undo_desc);
+}
+
+static gint
+process_event_queue_keys (GdkEventKey *kevent,
+                          ... /* GdkKeyType, GdkModifierType, value ... 0 */)
+{
+
+#define FILTER_MAX_KEYS 50
+
+  va_list          argp;
+  GdkEvent        *event;
+  GList           *event_list = NULL;
+  GList           *list;
+  guint            keys[FILTER_MAX_KEYS];
+  GdkModifierType  modifiers[FILTER_MAX_KEYS];
+  gint             values[FILTER_MAX_KEYS];
+  gint             i      = 0;
+  gint             n_keys = 0;
+  gint             value  = 0;
+  gboolean         done   = FALSE;
+  GtkWidget       *orig_widget;
+
+  va_start (argp, kevent);
+
+  while (n_keys < FILTER_MAX_KEYS &&
+         (keys[n_keys] = va_arg (argp, guint)) != 0)
+    {
+      modifiers[n_keys] = va_arg (argp, GdkModifierType);
+      values[n_keys]    = va_arg (argp, gint);
+      n_keys++;
+    }
+
+  va_end (argp);
+
+  for (i = 0; i < n_keys; i++)
+    if (kevent->keyval                 == keys[i] &&
+        (kevent->state & modifiers[i]) == modifiers[i])
+      value += values[i];
+
+  orig_widget = gtk_get_event_widget ((GdkEvent *) kevent);
+
+  while (gdk_events_pending () > 0 && ! done)
+    {
+      gboolean discard_event = FALSE;
+
+      event = gdk_event_get ();
+
+      if (! event || orig_widget != gtk_get_event_widget (event))
+        {
+          done = TRUE;
+        }
+      else
+        {
+          if (event->any.type == GDK_KEY_PRESS)
+            {
+              for (i = 0; i < n_keys; i++)
+                if (event->key.keyval                 == keys[i] &&
+                    (event->key.state & modifiers[i]) == modifiers[i])
+                  {
+                    discard_event = TRUE;
+                    value += values[i];
+                  }
+
+              if (! discard_event)
+                done = TRUE;
+            }
+          /* should there be more types here? */
+          else if (event->any.type != GDK_KEY_RELEASE &&
+                   event->any.type != GDK_MOTION_NOTIFY &&
+                   event->any.type != GDK_EXPOSE)
+            done = FALSE;
+        }
+
+      if (! event)
+        ; /* Do nothing */
+      else if (! discard_event)
+        event_list = g_list_prepend (event_list, event);
+      else
+        gdk_event_free (event);
+    }
+
+  event_list = g_list_reverse (event_list);
+
+  /* unget the unused events and free the list */
+  for (list = event_list; list; list = g_list_next (list))
+    {
+      gdk_event_put ((GdkEvent *) list->data);
+      gdk_event_free ((GdkEvent *) list->data);
+    }
+
+  g_list_free (event_list);
+
+  return value;
+
+#undef FILTER_MAX_KEYS
+}
+
+gboolean
+gimp_edit_selection_tool_key_press (GimpTool    *tool,
+                                    GdkEventKey *kevent,
+                                    GimpDisplay *display)
+{
+  GimpTransformType translate_type;
+
+  if (kevent->state & GDK_MOD1_MASK)
+    {
+      translate_type = GIMP_TRANSFORM_TYPE_SELECTION;
+    }
+  else if (kevent->state & gimp_get_toggle_behavior_mask ())
+    {
+      translate_type = GIMP_TRANSFORM_TYPE_PATH;
+    }
+  else
+    {
+      translate_type = GIMP_TRANSFORM_TYPE_LAYER;
+    }
+
+  return gimp_edit_selection_tool_translate (tool, kevent, translate_type,
+                                             display, NULL);
+}
+
+gboolean
+gimp_edit_selection_tool_translate (GimpTool          *tool,
+                                    GdkEventKey       *kevent,
+                                    GimpTransformType  translate_type,
+                                    GimpDisplay       *display,
+                                    GtkWidget         *type_box)
+{
+  gint               inc_x          = 0;
+  gint               inc_y          = 0;
+  GimpUndo          *undo;
+  gboolean           push_undo      = TRUE;
+  GimpImage         *image          = gimp_display_get_image (display);
+  GimpItem          *item           = NULL;
+  GimpTranslateMode  edit_mode      = GIMP_TRANSLATE_MODE_MASK;
+  GimpUndoType       undo_type      = GIMP_UNDO_GROUP_MASK;
+  const gchar       *undo_desc      = NULL;
+  GdkModifierType    extend_mask    = gimp_get_extend_selection_mask ();
+  const gchar       *null_message   = NULL;
+  const gchar       *locked_message = NULL;
+  gint               velocity;
+
+  /* bail out early if it is not an arrow key event */
+
+  if (kevent->keyval != GDK_KEY_Left &&
+      kevent->keyval != GDK_KEY_Right &&
+      kevent->keyval != GDK_KEY_Up &&
+      kevent->keyval != GDK_KEY_Down)
+    return FALSE;
+
+  /*  adapt arrow velocity to the zoom factor when holding <shift>  */
+  velocity = (ARROW_VELOCITY /
+              gimp_zoom_model_get_factor (gimp_display_get_shell (display)->zoom));
+  velocity = MAX (1.0, velocity);
+
+  /*  check the event queue for key events with the same modifier mask
+   *  as the current event, allowing only extend_mask to vary between
+   *  them.
+   */
+  inc_x = process_event_queue_keys (kevent,
+                                    GDK_KEY_Left,
+                                    kevent->state | extend_mask,
+                                    -1 * velocity,
+
+                                    GDK_KEY_Left,
+                                    kevent->state & ~extend_mask,
+                                    -1,
+
+                                    GDK_KEY_Right,
+                                    kevent->state | extend_mask,
+                                    1 * velocity,
+
+                                    GDK_KEY_Right,
+                                    kevent->state & ~extend_mask,
+                                    1,
+
+                                    0);
+
+  inc_y = process_event_queue_keys (kevent,
+                                    GDK_KEY_Up,
+                                    kevent->state | extend_mask,
+                                    -1 * velocity,
+
+                                    GDK_KEY_Up,
+                                    kevent->state & ~extend_mask,
+                                    -1,
+
+                                    GDK_KEY_Down,
+                                    kevent->state | extend_mask,
+                                    1 * velocity,
+
+                                    GDK_KEY_Down,
+                                    kevent->state & ~extend_mask,
+                                    1,
+
+                                    0);
+
+  switch (translate_type)
+    {
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+      item = GIMP_ITEM (gimp_image_get_mask (image));
+
+      if (gimp_channel_is_empty (GIMP_CHANNEL (item)))
+        item = NULL;
+
+      edit_mode = GIMP_TRANSLATE_MODE_MASK;
+      undo_type = GIMP_UNDO_GROUP_MASK;
+
+      if (! item)
+        {
+          /* cannot happen, don't translate this message */
+          null_message = "There is no selection to move.";
+        }
+      else if (gimp_item_is_position_locked (item))
+        {
+          /* cannot happen, don't translate this message */
+          locked_message = "The selection's position is locked.";
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_PATH:
+      item = GIMP_ITEM (gimp_image_get_active_vectors (image));
+
+      edit_mode = GIMP_TRANSLATE_MODE_VECTORS;
+      undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE;
+
+      if (! item)
+        {
+          null_message = _("There is no path to move.");
+        }
+      else if (gimp_item_is_position_locked (item))
+        {
+          locked_message = _("The active path's position is locked.");
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
+      undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE;
+
+      if (! item)
+        {
+          null_message = _("There is no layer to move.");
+        }
+      else if (GIMP_IS_LAYER_MASK (item))
+        {
+          edit_mode = GIMP_TRANSLATE_MODE_LAYER_MASK;
+
+          if (gimp_item_is_position_locked (item))
+            {
+              locked_message = _("The active layer's position is locked.");
+            }
+          else if (gimp_item_is_content_locked (item))
+            {
+              locked_message = _("The active layer's pixels are locked.");
+            }
+        }
+      else if (GIMP_IS_CHANNEL (item))
+        {
+          edit_mode = GIMP_TRANSLATE_MODE_CHANNEL;
+
+          if (gimp_item_is_position_locked (item))
+            {
+              locked_message = _("The active channel's position is locked.");
+            }
+          else if (gimp_item_is_content_locked (item))
+            {
+              locked_message = _("The active channel's pixels are locked.");
+            }
+        }
+      else if (gimp_layer_is_floating_sel (GIMP_LAYER (item)))
+        {
+          edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
+
+          if (gimp_item_is_position_locked (item))
+            {
+              locked_message = _("The active layer's position is locked.");
+            }
+        }
+      else
+        {
+          edit_mode = GIMP_TRANSLATE_MODE_LAYER;
+
+          if (gimp_item_is_position_locked (item))
+            {
+              locked_message = _("The active layer's position is locked.");
+            }
+        }
+
+      break;
+
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      g_return_val_if_reached (FALSE);
+    }
+
+  if (! item)
+    {
+      gimp_tool_message_literal (tool, display, null_message);
+      if (type_box)
+        gimp_widget_blink (type_box);
+      return TRUE;
+    }
+  else if (locked_message)
+    {
+      gimp_tool_message_literal (tool, display, locked_message);
+      gimp_tools_blink_lock_box (display->gimp, item);
+      return TRUE;
+    }
+
+  if (inc_x == 0 && inc_y == 0)
+    return TRUE;
+
+  switch (edit_mode)
+    {
+    case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+      undo_desc = _("Move Floating Selection");
+      break;
+
+    default:
+      undo_desc = GIMP_ITEM_GET_CLASS (item)->translate_desc;
+      break;
+    }
+
+  /* compress undo */
+  undo = gimp_image_undo_can_compress (image, GIMP_TYPE_UNDO_STACK, undo_type);
+
+  if (undo                                                         &&
+      g_object_get_data (G_OBJECT (undo),
+                         "edit-selection-tool") == (gpointer) tool &&
+      g_object_get_data (G_OBJECT (undo),
+                         "edit-selection-item") == (gpointer) item &&
+      g_object_get_data (G_OBJECT (undo),
+                         "edit-selection-type") == GINT_TO_POINTER (edit_mode))
+    {
+      push_undo = FALSE;
+    }
+
+  if (push_undo)
+    {
+      if (gimp_image_undo_group_start (image, undo_type, undo_desc))
+        {
+          undo = gimp_image_undo_can_compress (image,
+                                               GIMP_TYPE_UNDO_STACK,
+                                               undo_type);
+
+          if (undo)
+            {
+              g_object_set_data (G_OBJECT (undo), "edit-selection-tool",
+                                 tool);
+              g_object_set_data (G_OBJECT (undo), "edit-selection-item",
+                                 item);
+              g_object_set_data (G_OBJECT (undo), "edit-selection-type",
+                                 GINT_TO_POINTER (edit_mode));
+            }
+        }
+    }
+
+  switch (edit_mode)
+    {
+    case GIMP_TRANSLATE_MODE_LAYER_MASK:
+    case GIMP_TRANSLATE_MODE_MASK:
+      gimp_item_translate (item, inc_x, inc_y, push_undo);
+      break;
+
+    case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
+    case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
+      /*  this won't happen  */
+      break;
+
+    case GIMP_TRANSLATE_MODE_VECTORS:
+    case GIMP_TRANSLATE_MODE_CHANNEL:
+    case GIMP_TRANSLATE_MODE_LAYER:
+      if (gimp_item_get_linked (item))
+        {
+          gimp_item_linked_translate (item, inc_x, inc_y, push_undo);
+        }
+      else
+        {
+          gimp_item_translate (item, inc_x, inc_y, push_undo);
+        }
+      break;
+
+    case GIMP_TRANSLATE_MODE_FLOATING_SEL:
+      gimp_item_translate (item, inc_x, inc_y, push_undo);
+      break;
+    }
+
+  if (push_undo)
+    gimp_image_undo_group_end (image);
+  else
+    gimp_undo_refresh_preview (undo,
+                               gimp_get_user_context (display->gimp));
+
+  gimp_image_flush (image);
+
+  return TRUE;
+}
diff --git a/app/tools/gimpeditselectiontool.h b/app/tools/gimpeditselectiontool.h
new file mode 100644
index 0000000..b34055c
--- /dev/null
+++ b/app/tools/gimpeditselectiontool.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_EDIT_SELECTION_TOOL_H__
+#define __GIMP_EDIT_SELECTION_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_EDIT_SELECTION_TOOL            (gimp_edit_selection_tool_get_type ())
+#define GIMP_EDIT_SELECTION_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionTool))
+#define GIMP_EDIT_SELECTION_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionToolClass))
+#define GIMP_IS_EDIT_SELECTION_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL))
+#define GIMP_IS_EDIT_SELECTION_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL))
+
+
+GType      gimp_edit_selection_tool_get_type  (void) G_GNUC_CONST;
+
+void       gimp_edit_selection_tool_start     (GimpTool          *parent_tool,
+                                               GimpDisplay       *display,
+                                               const GimpCoords  *coords,
+                                               GimpTranslateMode  edit_mode,
+                                               gboolean           propagate_release);
+
+gboolean   gimp_edit_selection_tool_key_press (GimpTool          *tool,
+                                               GdkEventKey       *kevent,
+                                               GimpDisplay       *display);
+gboolean   gimp_edit_selection_tool_translate (GimpTool          *tool,
+                                               GdkEventKey       *kevent,
+                                               GimpTransformType  translate_type,
+                                               GimpDisplay       *display,
+                                               GtkWidget         *type_box);
+
+
+#endif  /*  __GIMP_EDIT_SELECTION_TOOL_H__  */
diff --git a/app/tools/gimpellipseselecttool.c b/app/tools/gimpellipseselecttool.c
new file mode 100644
index 0000000..5481d57
--- /dev/null
+++ b/app/tools/gimpellipseselecttool.c
@@ -0,0 +1,112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel-select.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpellipseselecttool.h"
+#include "gimprectangleselectoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_ellipse_select_tool_select (GimpRectangleSelectTool *rect_tool,
+                                               GimpChannelOps           operation,
+                                               gint                     x,
+                                               gint                     y,
+                                               gint                     w,
+                                               gint                     h);
+
+
+G_DEFINE_TYPE (GimpEllipseSelectTool, gimp_ellipse_select_tool,
+               GIMP_TYPE_RECTANGLE_SELECT_TOOL)
+
+#define parent_class gimp_ellipse_select_tool_parent_class
+
+
+void
+gimp_ellipse_select_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_ELLIPSE_SELECT_TOOL,
+                GIMP_TYPE_RECTANGLE_SELECT_OPTIONS,
+                gimp_rectangle_select_options_gui,
+                0,
+                "gimp-ellipse-select-tool",
+                _("Ellipse Select"),
+                _("Ellipse Select Tool: Select an elliptical region"),
+                N_("_Ellipse Select"), "E",
+                NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT,
+                GIMP_ICON_TOOL_ELLIPSE_SELECT,
+                data);
+}
+
+static void
+gimp_ellipse_select_tool_class_init (GimpEllipseSelectToolClass *klass)
+{
+  GimpRectangleSelectToolClass *rect_tool_class;
+
+  rect_tool_class = GIMP_RECTANGLE_SELECT_TOOL_CLASS (klass);
+
+  rect_tool_class->select       = gimp_ellipse_select_tool_select;
+  rect_tool_class->draw_ellipse = TRUE;
+}
+
+static void
+gimp_ellipse_select_tool_init (GimpEllipseSelectTool *ellipse_select)
+{
+  GimpTool *tool = GIMP_TOOL (ellipse_select);
+
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_ELLIPSE_SELECT);
+}
+
+static void
+gimp_ellipse_select_tool_select (GimpRectangleSelectTool *rect_tool,
+                                 GimpChannelOps           operation,
+                                 gint                     x,
+                                 gint                     y,
+                                 gint                     w,
+                                 gint                     h)
+{
+  GimpTool             *tool    = GIMP_TOOL (rect_tool);
+  GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (rect_tool);
+  GimpImage            *image   = gimp_display_get_image (tool->display);
+
+  gimp_channel_select_ellipse (gimp_image_get_mask (image),
+                               x, y, w, h,
+                               operation,
+                               options->antialias,
+                               options->feather,
+                               options->feather_radius,
+                               options->feather_radius,
+                               TRUE);
+}
diff --git a/app/tools/gimpellipseselecttool.h b/app/tools/gimpellipseselecttool.h
new file mode 100644
index 0000000..b3018c8
--- /dev/null
+++ b/app/tools/gimpellipseselecttool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ELLIPSE_SELECT_TOOL_H__
+#define __GIMP_ELLIPSE_SELECT_TOOL_H__
+
+
+#include "gimprectangleselecttool.h"
+
+
+#define GIMP_TYPE_ELLIPSE_SELECT_TOOL            (gimp_ellipse_select_tool_get_type ())
+#define GIMP_ELLIPSE_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ELLIPSE_SELECT_TOOL, GimpEllipseSelectTool))
+#define GIMP_ELLIPSE_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ELLIPSE_SELECT_TOOL, GimpEllipseSelectToolClass))
+#define GIMP_IS_ELLIPSE_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ELLIPSE_SELECT_TOOL))
+#define GIMP_IS_ELLIPSE_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ELLIPSE_SELECT_TOOL))
+#define GIMP_ELLIPSE_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ELLIPSE_SELECT_TOOL, GimpEllipseSelectToolClass))
+
+
+typedef struct _GimpEllipseSelectTool      GimpEllipseSelectTool;
+typedef struct _GimpEllipseSelectToolClass GimpEllipseSelectToolClass;
+
+struct _GimpEllipseSelectTool
+{
+  GimpRectangleSelectTool  parent_instance;
+};
+
+struct _GimpEllipseSelectToolClass
+{
+  GimpRectangleSelectToolClass  parent_class;
+};
+
+
+void    gimp_ellipse_select_tool_register (GimpToolRegisterCallback  callback,
+                                           gpointer                  data);
+
+GType   gimp_ellipse_select_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ELLIPSE_SELECT_TOOL_H__  */
diff --git a/app/tools/gimperasertool.c b/app/tools/gimperasertool.c
new file mode 100644
index 0000000..d6e2ac9
--- /dev/null
+++ b/app/tools/gimperasertool.c
@@ -0,0 +1,176 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpdrawable.h"
+
+#include "paint/gimperaseroptions.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimperasertool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void        gimp_eraser_tool_modifier_key  (GimpTool         *tool,
+                                                   GdkModifierType   key,
+                                                   gboolean          press,
+                                                   GdkModifierType   state,
+                                                   GimpDisplay      *display);
+static void        gimp_eraser_tool_cursor_update (GimpTool         *tool,
+                                                   const GimpCoords *coords,
+                                                   GdkModifierType   state,
+                                                   GimpDisplay      *display);
+
+static gboolean    gimp_eraser_tool_is_alpha_only (GimpPaintTool    *paint_tool,
+                                                   GimpDrawable     *drawable);
+
+static GtkWidget * gimp_eraser_options_gui        (GimpToolOptions  *tool_options);
+
+
+G_DEFINE_TYPE (GimpEraserTool, gimp_eraser_tool, GIMP_TYPE_BRUSH_TOOL)
+
+#define parent_class gimp_eraser_tool_parent_class
+
+
+void
+gimp_eraser_tool_register (GimpToolRegisterCallback  callback,
+                           gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_ERASER_TOOL,
+                GIMP_TYPE_ERASER_OPTIONS,
+                gimp_eraser_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK,
+                "gimp-eraser-tool",
+                _("Eraser"),
+                _("Eraser Tool: Erase to background or transparency using a brush"),
+                N_("_Eraser"), "<shift>E",
+                NULL, GIMP_HELP_TOOL_ERASER,
+                GIMP_ICON_TOOL_ERASER,
+                data);
+}
+
+static void
+gimp_eraser_tool_class_init (GimpEraserToolClass *klass)
+{
+  GimpToolClass      *tool_class       = GIMP_TOOL_CLASS (klass);
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  tool_class->modifier_key        = gimp_eraser_tool_modifier_key;
+  tool_class->cursor_update       = gimp_eraser_tool_cursor_update;
+
+  paint_tool_class->is_alpha_only = gimp_eraser_tool_is_alpha_only;
+}
+
+static void
+gimp_eraser_tool_init (GimpEraserTool *eraser)
+{
+  GimpTool      *tool       = GIMP_TOOL (eraser);
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (eraser);
+
+  gimp_tool_control_set_tool_cursor            (tool->control,
+                                                GIMP_TOOL_CURSOR_ERASER);
+  gimp_tool_control_set_toggle_cursor_modifier (tool->control,
+                                                GIMP_CURSOR_MODIFIER_MINUS);
+
+  gimp_paint_tool_enable_color_picker (paint_tool,
+                                       GIMP_COLOR_PICK_TARGET_BACKGROUND);
+
+  paint_tool->status      = _("Click to erase");
+  paint_tool->status_line = _("Click to erase the line");
+  paint_tool->status_ctrl = _("%s to pick a background color");
+}
+
+static void
+gimp_eraser_tool_modifier_key (GimpTool        *tool,
+                               GdkModifierType  key,
+                               gboolean         press,
+                               GdkModifierType  state,
+                               GimpDisplay     *display)
+{
+  if (key == GDK_MOD1_MASK)
+    {
+      GimpEraserOptions *options = GIMP_ERASER_TOOL_GET_OPTIONS (tool);
+
+      g_object_set (options,
+                    "anti-erase", ! options->anti_erase,
+                    NULL);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state, display);
+}
+
+static void
+gimp_eraser_tool_cursor_update (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                GimpDisplay      *display)
+{
+  GimpEraserOptions *options = GIMP_ERASER_TOOL_GET_OPTIONS (tool);
+
+  gimp_tool_control_set_toggled (tool->control, options->anti_erase);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static gboolean
+gimp_eraser_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                                GimpDrawable  *drawable)
+{
+  GimpEraserOptions *options = GIMP_ERASER_TOOL_GET_OPTIONS (paint_tool);
+
+  if (! options->anti_erase)
+    return gimp_drawable_has_alpha (drawable);
+  else
+    return TRUE;
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_eraser_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget *button;
+  gchar     *str;
+
+  /* the anti_erase toggle */
+  str = g_strdup_printf (_("Anti erase  (%s)"),
+                         gimp_get_mod_string (GDK_MOD1_MASK));
+
+  button = gimp_prop_check_button_new (config, "anti-erase", str);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_free (str);
+
+  return vbox;
+}
diff --git a/app/tools/gimperasertool.h b/app/tools/gimperasertool.h
new file mode 100644
index 0000000..706d43c
--- /dev/null
+++ b/app/tools/gimperasertool.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ERASER_TOOL_H__
+#define __GIMP_ERASER_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+
+
+#define GIMP_TYPE_ERASER_TOOL            (gimp_eraser_tool_get_type ())
+#define GIMP_ERASER_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ERASER_TOOL, GimpEraserTool))
+#define GIMP_ERASER_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ERASER_TOOL, GimpEraserToolClass))
+#define GIMP_IS_ERASER_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ERASER_TOOL))
+#define GIMP_IS_ERASER_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ERASER_TOOL))
+#define GIMP_ERASER_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER_TOOL, GimpEraserToolClass))
+
+#define GIMP_ERASER_TOOL_GET_OPTIONS(t)  (GIMP_ERASER_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpEraserTool      GimpEraserTool;
+typedef struct _GimpEraserToolClass GimpEraserToolClass;
+
+struct _GimpEraserTool
+{
+  GimpBrushTool parent_instance;
+};
+
+struct _GimpEraserToolClass
+{
+  GimpBrushToolClass parent_class;
+};
+
+
+void    gimp_eraser_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data);
+
+GType   gimp_eraser_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ERASER_TOOL_H__  */
diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c
new file mode 100644
index 0000000..9bded52
--- /dev/null
+++ b/app/tools/gimpfilteroptions.c
@@ -0,0 +1,269 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "tools-types.h"
+
+#include "gimpfilteroptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PREVIEW,
+  PROP_PREVIEW_SPLIT,
+  PROP_PREVIEW_SPLIT_ALIGNMENT,
+  PROP_PREVIEW_SPLIT_POSITION,
+  PROP_CONTROLLER,
+  PROP_BLENDING_OPTIONS_EXPANDED,
+  PROP_COLOR_OPTIONS_EXPANDED
+};
+
+
+static void   gimp_filter_options_set_property (GObject      *object,
+                                                guint         property_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec);
+static void   gimp_filter_options_get_property (GObject      *object,
+                                                guint         property_id,
+                                                GValue       *value,
+                                                GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpFilterOptions, gimp_filter_options,
+               GIMP_TYPE_COLOR_OPTIONS)
+
+#define parent_class gimp_filter_options_parent_class
+
+
+static void
+gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_filter_options_set_property;
+  object_class->get_property = gimp_filter_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PREVIEW,
+                            "preview",
+                            _("_Preview"),
+                            NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT,
+                                   g_param_spec_boolean ("preview-split",
+                                                         _("Split _view"),
+                                                         NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT_ALIGNMENT,
+                                   g_param_spec_enum ("preview-split-alignment",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_ALIGNMENT_TYPE,
+                                                      GIMP_ALIGN_LEFT,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PREVIEW_SPLIT_POSITION,
+                                   g_param_spec_int ("preview-split-position",
+                                                     NULL, NULL,
+                                                     G_MININT, G_MAXINT, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONTROLLER,
+                            "controller",
+                            _("On-canvas con_trols"),
+                            _("Show on-canvas filter controls"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BLENDING_OPTIONS_EXPANDED,
+                            "blending-options-expanded",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COLOR_OPTIONS_EXPANDED,
+                            "color-options-expanded",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_filter_options_init (GimpFilterOptions *options)
+{
+}
+
+static void
+gimp_filter_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpFilterOptions *options = GIMP_FILTER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_PREVIEW:
+      options->preview = g_value_get_boolean (value);
+      break;
+
+    case PROP_PREVIEW_SPLIT:
+      options->preview_split = g_value_get_boolean (value);
+      break;
+
+    case PROP_PREVIEW_SPLIT_ALIGNMENT:
+      options->preview_split_alignment = g_value_get_enum (value);
+      break;
+
+    case PROP_PREVIEW_SPLIT_POSITION:
+      options->preview_split_position = g_value_get_int (value);
+      break;
+
+    case PROP_CONTROLLER:
+      options->controller = g_value_get_boolean (value);
+      break;
+
+    case PROP_BLENDING_OPTIONS_EXPANDED:
+      options->blending_options_expanded = g_value_get_boolean (value);
+      break;
+
+    case PROP_COLOR_OPTIONS_EXPANDED:
+      options->color_options_expanded = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_filter_options_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpFilterOptions *options = GIMP_FILTER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_PREVIEW:
+      g_value_set_boolean (value, options->preview);
+      break;
+
+    case PROP_PREVIEW_SPLIT:
+      g_value_set_boolean (value, options->preview_split);
+      break;
+
+    case PROP_PREVIEW_SPLIT_ALIGNMENT:
+      g_value_set_enum (value, options->preview_split_alignment);
+      break;
+
+    case PROP_PREVIEW_SPLIT_POSITION:
+      g_value_set_int (value, options->preview_split_position);
+      break;
+
+    case PROP_CONTROLLER:
+      g_value_set_boolean (value, options->controller);
+      break;
+
+    case PROP_BLENDING_OPTIONS_EXPANDED:
+      g_value_set_boolean (value, options->blending_options_expanded);
+      break;
+
+    case PROP_COLOR_OPTIONS_EXPANDED:
+      g_value_set_boolean (value, options->color_options_expanded);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_filter_options_switch_preview_side (GimpFilterOptions *options)
+{
+  GimpAlignmentType alignment;
+
+  g_return_if_fail (GIMP_IS_FILTER_OPTIONS (options));
+
+  switch (options->preview_split_alignment)
+    {
+    case GIMP_ALIGN_LEFT:   alignment = GIMP_ALIGN_RIGHT;  break;
+    case GIMP_ALIGN_RIGHT:  alignment = GIMP_ALIGN_LEFT;   break;
+    case GIMP_ALIGN_TOP:    alignment = GIMP_ALIGN_BOTTOM; break;
+    case GIMP_ALIGN_BOTTOM: alignment = GIMP_ALIGN_TOP;    break;
+    default:
+      g_return_if_reached ();
+    }
+
+  g_object_set (options, "preview-split-alignment", alignment, NULL);
+}
+
+void
+gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options,
+                                                gint               position_x,
+                                                gint               position_y)
+{
+  GimpAlignmentType alignment;
+  gint              position;
+
+  g_return_if_fail (GIMP_IS_FILTER_OPTIONS (options));
+
+  switch (options->preview_split_alignment)
+    {
+    case GIMP_ALIGN_LEFT:   alignment = GIMP_ALIGN_TOP;    break;
+    case GIMP_ALIGN_RIGHT:  alignment = GIMP_ALIGN_BOTTOM; break;
+    case GIMP_ALIGN_TOP:    alignment = GIMP_ALIGN_LEFT;   break;
+    case GIMP_ALIGN_BOTTOM: alignment = GIMP_ALIGN_RIGHT;  break;
+    default:
+      g_return_if_reached ();
+    }
+
+  if (alignment == GIMP_ALIGN_LEFT ||
+      alignment == GIMP_ALIGN_RIGHT)
+    {
+      position = position_x;
+    }
+  else
+    {
+      position = position_y;
+    }
+
+  g_object_set (options,
+                "preview-split-alignment", alignment,
+                "preview-split-position",  position,
+                NULL);
+}
diff --git a/app/tools/gimpfilteroptions.h b/app/tools/gimpfilteroptions.h
new file mode 100644
index 0000000..7cd3b5f
--- /dev/null
+++ b/app/tools/gimpfilteroptions.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_OPTIONS_H__
+#define __GIMP_FILTER_OPTIONS_H__
+
+
+#include "gimpcoloroptions.h"
+
+
+#define GIMP_TYPE_FILTER_OPTIONS            (gimp_filter_options_get_type ())
+#define GIMP_FILTER_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILTER_OPTIONS, GimpFilterOptions))
+#define GIMP_FILTER_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILTER_OPTIONS, GimpFilterOptionsClass))
+#define GIMP_IS_FILTER_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILTER_OPTIONS))
+#define GIMP_IS_FILTER_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILTER_OPTIONS))
+#define GIMP_FILTER_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILTER_OPTIONS, GimpFilterOptionsClass))
+
+
+typedef struct _GimpFilterOptionsClass GimpFilterOptionsClass;
+
+struct _GimpFilterOptions
+{
+  GimpColorOptions   parent_instance;
+
+  gboolean           preview;
+  gboolean           preview_split;
+  GimpAlignmentType  preview_split_alignment;
+  gint               preview_split_position;
+  gboolean           controller;
+
+  gboolean           blending_options_expanded;
+  gboolean           color_options_expanded;
+};
+
+struct _GimpFilterOptionsClass
+{
+  GimpColorOptionsClass  parent_instance;
+};
+
+
+GType   gimp_filter_options_get_type                   (void) G_GNUC_CONST;
+
+void    gimp_filter_options_switch_preview_side        (GimpFilterOptions *options);
+void    gimp_filter_options_switch_preview_orientation (GimpFilterOptions *options,
+                                                        gint               position_x,
+                                                        gint               position_y);
+
+
+#endif /* __GIMP_FILTER_OPTIONS_H__ */
diff --git a/app/tools/gimpfiltertool-settings.c b/app/tools/gimpfiltertool-settings.c
new file mode 100644
index 0000000..c8364ff
--- /dev/null
+++ b/app/tools/gimpfiltertool-settings.c
@@ -0,0 +1,252 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfiltertool-settings.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpsettingsbox.h"
+
+#include "display/gimptoolgui.h"
+
+#include "gimpfiltertool.h"
+#include "gimpfiltertool-settings.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static gboolean gimp_filter_tool_settings_import (GimpSettingsBox *box,
+                                                  GFile           *file,
+                                                  GimpFilterTool  *filter_tool);
+static gboolean gimp_filter_tool_settings_export (GimpSettingsBox *box,
+                                                  GFile           *file,
+                                                  GimpFilterTool  *filter_tool);
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_filter_tool_get_settings_box (GimpFilterTool *filter_tool)
+{
+  GimpToolInfo *tool_info = GIMP_TOOL (filter_tool)->tool_info;
+  GQuark        quark     = g_quark_from_static_string ("settings-folder");
+  GType         type      = G_TYPE_FROM_INSTANCE (filter_tool->config);
+  GFile        *settings_folder;
+  GtkWidget    *box;
+  GtkWidget    *label;
+  GtkWidget    *combo;
+  gchar        *import_title;
+  gchar        *export_title;
+
+  settings_folder = g_type_get_qdata (type, quark);
+
+  import_title = g_strdup_printf (_("Import '%s' Settings"),
+                                  gimp_tool_get_label (GIMP_TOOL (filter_tool)));
+  export_title = g_strdup_printf (_("Export '%s' Settings"),
+                                  gimp_tool_get_label (GIMP_TOOL (filter_tool)));
+
+  box = gimp_settings_box_new (tool_info->gimp,
+                               filter_tool->config,
+                               filter_tool->settings,
+                               import_title,
+                               export_title,
+                               gimp_tool_get_help_id (GIMP_TOOL (filter_tool)),
+                               settings_folder,
+                               NULL);
+
+  g_free (import_title);
+  g_free (export_title);
+
+  g_signal_connect (box, "import",
+                    G_CALLBACK (gimp_filter_tool_settings_import),
+                    filter_tool);
+
+  g_signal_connect (box, "export",
+                    G_CALLBACK (gimp_filter_tool_settings_export),
+                    filter_tool);
+
+  g_signal_connect_swapped (box, "selected",
+                            G_CALLBACK (gimp_filter_tool_set_config),
+                            filter_tool);
+
+  label = gtk_label_new_with_mnemonic (_("Pre_sets:"));
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (box), label, 0);
+  gtk_widget_show (label);
+
+  combo = gimp_settings_box_get_combo (GIMP_SETTINGS_BOX (box));
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+  return box;
+}
+
+gboolean
+gimp_filter_tool_real_settings_import (GimpFilterTool  *filter_tool,
+                                       GInputStream    *input,
+                                       GError         **error)
+{
+  return gimp_config_deserialize_stream (GIMP_CONFIG (filter_tool->config),
+                                         input,
+                                         NULL, error);
+}
+
+gboolean
+gimp_filter_tool_real_settings_export (GimpFilterTool  *filter_tool,
+                                       GOutputStream   *output,
+                                       GError         **error)
+{
+  GimpTool *tool = GIMP_TOOL (filter_tool);
+  gchar    *header;
+  gchar    *footer;
+  gboolean  success;
+
+  header = g_strdup_printf ("GIMP '%s' settings",
+                            gimp_tool_get_label (tool));
+  footer = g_strdup_printf ("end of '%s' settings",
+                            gimp_tool_get_label (tool));
+
+  success = gimp_config_serialize_to_stream (GIMP_CONFIG (filter_tool->config),
+                                             output,
+                                             header, footer,
+                                             NULL, error);
+
+  g_free (header);
+  g_free (footer);
+
+  return success;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_filter_tool_settings_import (GimpSettingsBox *box,
+                                  GFile           *file,
+                                  GimpFilterTool  *filter_tool)
+{
+  GimpFilterToolClass *tool_class = GIMP_FILTER_TOOL_GET_CLASS (filter_tool);
+  GInputStream        *input;
+  GError              *error      = NULL;
+
+  g_return_val_if_fail (tool_class->settings_import != NULL, FALSE);
+
+  if (GIMP_TOOL (filter_tool)->tool_info->gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+  if (! input)
+    {
+      gimp_message (GIMP_TOOL (filter_tool)->tool_info->gimp,
+                    G_OBJECT (gimp_tool_gui_get_dialog (filter_tool->gui)),
+                    GIMP_MESSAGE_ERROR,
+                    _("Could not open '%s' for reading: %s"),
+                    gimp_file_get_utf8_name (file),
+                    error->message);
+      g_clear_error (&error);
+      return FALSE;
+    }
+
+  if (! tool_class->settings_import (filter_tool, input, &error))
+    {
+      gimp_message (GIMP_TOOL (filter_tool)->tool_info->gimp,
+                    G_OBJECT (gimp_tool_gui_get_dialog (filter_tool->gui)),
+                    GIMP_MESSAGE_ERROR,
+                    _("Error reading '%s': %s"),
+                    gimp_file_get_utf8_name (file),
+                    error->message);
+      g_clear_error (&error);
+      g_object_unref (input);
+      return FALSE;
+    }
+
+  g_object_unref (input);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_filter_tool_settings_export (GimpSettingsBox *box,
+                                  GFile           *file,
+                                  GimpFilterTool  *filter_tool)
+{
+  GimpFilterToolClass *tool_class = GIMP_FILTER_TOOL_GET_CLASS (filter_tool);
+  GOutputStream       *output;
+  GError              *error      = NULL;
+
+  g_return_val_if_fail (tool_class->settings_export != NULL, FALSE);
+
+  if (GIMP_TOOL (filter_tool)->tool_info->gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, &error));
+  if (! output)
+    {
+      gimp_message_literal (GIMP_TOOL (filter_tool)->tool_info->gimp,
+                            G_OBJECT (gimp_tool_gui_get_dialog (filter_tool->gui)),
+                            GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+      return FALSE;
+    }
+
+  if (! tool_class->settings_export (filter_tool, output, &error))
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      gimp_message (GIMP_TOOL (filter_tool)->tool_info->gimp,
+                    G_OBJECT (gimp_tool_gui_get_dialog (filter_tool->gui)),
+                    GIMP_MESSAGE_ERROR,
+                    _("Error writing '%s': %s"),
+                    gimp_file_get_utf8_name (file),
+                    error->message);
+      g_clear_error (&error);
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (output, cancellable, NULL);
+      g_object_unref (cancellable);
+      g_object_unref (output);
+
+      return FALSE;
+    }
+
+  g_object_unref (output);
+
+  gimp_message (GIMP_TOOL (filter_tool)->tool_info->gimp,
+                G_OBJECT (GIMP_TOOL (filter_tool)->display),
+                GIMP_MESSAGE_INFO,
+                _("Settings saved to '%s'"),
+                gimp_file_get_utf8_name (file));
+
+  return TRUE;
+}
diff --git a/app/tools/gimpfiltertool-settings.h b/app/tools/gimpfiltertool-settings.h
new file mode 100644
index 0000000..9367b1c
--- /dev/null
+++ b/app/tools/gimpfiltertool-settings.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfiltertool-settings.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_TOOL_SETTINGS_H__
+#define __GIMP_FILTER_TOOL_SETTINGS_H__
+
+
+GtkWidget * gimp_filter_tool_get_settings_box     (GimpFilterTool  *filter_tool);
+
+
+/*  virtual functions of GimpSettingsTool, don't call directly  */
+
+gboolean    gimp_filter_tool_real_settings_import (GimpFilterTool  *filter_tool,
+                                                   GInputStream    *input,
+                                                   GError         **error);
+gboolean    gimp_filter_tool_real_settings_export (GimpFilterTool  *filter_tool,
+                                                   GOutputStream   *output,
+                                                   GError         **error);
+
+
+#endif /* __GIMP_FILTER_TOOL_SETTINGS_H__ */
diff --git a/app/tools/gimpfiltertool-widgets.c b/app/tools/gimpfiltertool-widgets.c
new file mode 100644
index 0000000..d5cf6fe
--- /dev/null
+++ b/app/tools/gimpfiltertool-widgets.c
@@ -0,0 +1,964 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfiltertool-widgets.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpitem.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolfocus.h"
+#include "display/gimptoolgyroscope.h"
+#include "display/gimptoolline.h"
+#include "display/gimptooltransformgrid.h"
+#include "display/gimptoolwidgetgroup.h"
+
+#include "gimpfilteroptions.h"
+#include "gimpfiltertool.h"
+#include "gimpfiltertool-widgets.h"
+
+
+typedef struct _Controller Controller;
+
+struct _Controller
+{
+  GimpFilterTool     *filter_tool;
+  GimpControllerType  controller_type;
+  GimpToolWidget     *widget;
+  GCallback           creator_callback;
+  gpointer            creator_data;
+};
+
+
+/*  local function prototypes  */
+
+static Controller * gimp_filter_tool_controller_new          (void);
+static void         gimp_filter_tool_controller_free         (Controller                 *controller);
+
+static void         gimp_filter_tool_set_line                (Controller                 *controller,
+                                                              GeglRectangle              *area,
+                                                              gdouble                     x1,
+                                                              gdouble                     y1,
+                                                              gdouble                     x2,
+                                                              gdouble                     y2);
+static void         gimp_filter_tool_line_changed            (GimpToolWidget             *widget,
+                                                              Controller                 *controller);
+
+static void         gimp_filter_tool_set_slider_line         (Controller                 *controller,
+                                                              GeglRectangle              *area,
+                                                              gdouble                     x1,
+                                                              gdouble                     y1,
+                                                              gdouble                     x2,
+                                                              gdouble                     y2,
+                                                              const GimpControllerSlider *sliders,
+                                                              gint                        n_sliders);
+static void         gimp_filter_tool_slider_line_changed     (GimpToolWidget             *widget,
+                                                              Controller                 *controller);
+
+static void         gimp_filter_tool_set_transform_grid      (Controller                 *controller,
+                                                              GeglRectangle              *area,
+                                                              const GimpMatrix3          *transform);
+static void         gimp_filter_tool_transform_grid_changed  (GimpToolWidget             *widget,
+                                                              Controller                 *controller);
+
+static void         gimp_filter_tool_set_transform_grids     (Controller                 *controller,
+                                                              GeglRectangle              *area,
+                                                              const GimpMatrix3          *transforms,
+                                                              gint                        n_transforms);
+static void         gimp_filter_tool_transform_grids_changed (GimpToolWidget             *widget,
+                                                              Controller                 *controller);
+
+static void         gimp_filter_tool_set_gyroscope           (Controller                 *controller,
+                                                              GeglRectangle              *area,
+                                                              gdouble                     yaw,
+                                                              gdouble                     pitch,
+                                                              gdouble                     roll,
+                                                              gdouble                     zoom,
+                                                              gboolean                    invert);
+static void         gimp_filter_tool_gyroscope_changed       (GimpToolWidget             *widget,
+                                                              Controller                 *controller);
+
+static void         gimp_filter_tool_set_focus               (Controller                 *controller,
+                                                              GeglRectangle              *area,
+                                                              GimpLimitType               type,
+                                                              gdouble                     x,
+                                                              gdouble                     y,
+                                                              gdouble                     radius,
+                                                              gdouble                     aspect_ratio,
+                                                              gdouble                     angle,
+                                                              gdouble                     inner_limit,
+                                                              gdouble                     midpoint);
+static void         gimp_filter_tool_focus_changed           (GimpToolWidget             *widget,
+                                                              Controller                 *controller);
+
+
+/*  public functions  */
+
+GimpToolWidget *
+gimp_filter_tool_create_widget (GimpFilterTool     *filter_tool,
+                                GimpControllerType  controller_type,
+                                const gchar        *status_title,
+                                GCallback           callback,
+                                gpointer            callback_data,
+                                GCallback          *set_func,
+                                gpointer           *set_func_data)
+{
+  GimpTool         *tool;
+  GimpDisplayShell *shell;
+  Controller       *controller;
+
+  g_return_val_if_fail (GIMP_IS_FILTER_TOOL (filter_tool), NULL);
+  g_return_val_if_fail (filter_tool->config != NULL, NULL);
+
+  tool = GIMP_TOOL (filter_tool);
+
+  g_return_val_if_fail (tool->display != NULL, NULL);
+
+  shell = gimp_display_get_shell (tool->display);
+
+  controller = gimp_filter_tool_controller_new ();
+
+  controller->filter_tool      = filter_tool;
+  controller->controller_type  = controller_type;
+  controller->creator_callback = callback;
+  controller->creator_data     = callback_data;
+
+  switch (controller_type)
+    {
+    case GIMP_CONTROLLER_TYPE_LINE:
+      controller->widget = gimp_tool_line_new (shell, 100, 100, 500, 500);
+
+      g_object_set (controller->widget,
+                    "status-title", status_title,
+                    NULL);
+
+      g_signal_connect (controller->widget, "changed",
+                        G_CALLBACK (gimp_filter_tool_line_changed),
+                        controller);
+
+      *set_func      = (GCallback) gimp_filter_tool_set_line;
+      *set_func_data = controller;
+      break;
+
+    case GIMP_CONTROLLER_TYPE_SLIDER_LINE:
+      controller->widget = gimp_tool_line_new (shell, 100, 100, 500, 500);
+
+      g_object_set (controller->widget,
+                    "status-title", status_title,
+                    NULL);
+
+      g_signal_connect (controller->widget, "changed",
+                        G_CALLBACK (gimp_filter_tool_slider_line_changed),
+                        controller);
+
+      *set_func      = (GCallback) gimp_filter_tool_set_slider_line;
+      *set_func_data = controller;
+      break;
+
+    case GIMP_CONTROLLER_TYPE_TRANSFORM_GRID:
+      {
+        GimpMatrix3   transform;
+        gint          off_x, off_y;
+        GeglRectangle area;
+        gdouble       x1, y1;
+        gdouble       x2, y2;
+
+        gimp_matrix3_identity (&transform);
+
+        gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+        x1 = off_x + area.x;
+        y1 = off_y + area.y;
+        x2 = x1 + area.width;
+        y2 = y1 + area.height;
+
+        controller->widget = gimp_tool_transform_grid_new (shell, &transform,
+                                                           x1, y1, x2, y2);
+
+        g_object_set (controller->widget,
+                      "pivot-x",                 (x1 + x2) / 2.0,
+                      "pivot-y",                 (y1 + y2) / 2.0,
+                      "inside-function",         GIMP_TRANSFORM_FUNCTION_MOVE,
+                      "outside-function",        GIMP_TRANSFORM_FUNCTION_ROTATE,
+                      "use-corner-handles",      TRUE,
+                      "use-perspective-handles", TRUE,
+                      "use-side-handles",        TRUE,
+                      "use-shear-handles",       TRUE,
+                      "use-pivot-handle",        TRUE,
+                      NULL);
+
+        g_signal_connect (controller->widget, "changed",
+                          G_CALLBACK (gimp_filter_tool_transform_grid_changed),
+                          controller);
+
+        *set_func      = (GCallback) gimp_filter_tool_set_transform_grid;
+        *set_func_data = controller;
+      }
+      break;
+
+    case GIMP_CONTROLLER_TYPE_TRANSFORM_GRIDS:
+      {
+        controller->widget = gimp_tool_widget_group_new (shell);
+
+        gimp_tool_widget_group_set_auto_raise (
+          GIMP_TOOL_WIDGET_GROUP (controller->widget), TRUE);
+
+        g_signal_connect (controller->widget, "changed",
+                          G_CALLBACK (gimp_filter_tool_transform_grids_changed),
+                          controller);
+
+        *set_func      = (GCallback) gimp_filter_tool_set_transform_grids;
+        *set_func_data = controller;
+      }
+      break;
+
+    case GIMP_CONTROLLER_TYPE_GYROSCOPE:
+      {
+        GeglRectangle area;
+        gint          off_x, off_y;
+
+        gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+        controller->widget = gimp_tool_gyroscope_new (shell);
+
+        g_object_set (controller->widget,
+                      "speed",   1.0 / MAX (area.width, area.height),
+                      "pivot-x", off_x + area.x + area.width  / 2.0,
+                      "pivot-y", off_y + area.y + area.height / 2.0,
+                      NULL);
+
+        g_signal_connect (controller->widget, "changed",
+                          G_CALLBACK (gimp_filter_tool_gyroscope_changed),
+                          controller);
+
+        *set_func      = (GCallback) gimp_filter_tool_set_gyroscope;
+        *set_func_data = controller;
+      }
+      break;
+
+    case GIMP_CONTROLLER_TYPE_FOCUS:
+      controller->widget = gimp_tool_focus_new (shell);
+
+      g_signal_connect (controller->widget, "changed",
+                        G_CALLBACK (gimp_filter_tool_focus_changed),
+                        controller);
+
+      *set_func      = (GCallback) gimp_filter_tool_set_focus;
+      *set_func_data = controller;
+      break;
+    }
+
+  g_object_add_weak_pointer (G_OBJECT (controller->widget),
+                            (gpointer) &controller->widget);
+
+  g_object_set_data_full (filter_tool->config,
+                          "gimp-filter-tool-controller", controller,
+                          (GDestroyNotify) gimp_filter_tool_controller_free);
+
+  return controller->widget;
+}
+
+static void
+gimp_filter_tool_reset_transform_grid (GimpToolWidget *widget,
+                                       GimpFilterTool *filter_tool)
+{
+  GimpMatrix3   *transform;
+  gint           off_x, off_y;
+  GeglRectangle  area;
+  gdouble        x1, y1;
+  gdouble        x2, y2;
+  gdouble        pivot_x, pivot_y;
+
+  g_object_get (widget,
+                "transform", &transform,
+                NULL);
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  x1 = off_x + area.x;
+  y1 = off_y + area.y;
+  x2 = x1 + area.width;
+  y2 = y1 + area.height;
+
+  gimp_matrix3_transform_point (transform,
+                                (x1 + x2) / 2.0, (y1 + y2) / 2.0,
+                                &pivot_x, &pivot_y);
+
+  g_object_set (widget,
+                "pivot-x", pivot_x,
+                "pivot-y", pivot_y,
+                NULL);
+
+  g_free (transform);
+}
+
+void
+gimp_filter_tool_reset_widget (GimpFilterTool *filter_tool,
+                               GimpToolWidget *widget)
+{
+  Controller *controller;
+
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+  g_return_if_fail (GIMP_IS_TOOL_WIDGET (widget));
+  g_return_if_fail (filter_tool->config != NULL);
+
+  controller = g_object_get_data (filter_tool->config,
+                                  "gimp-filter-tool-controller");
+
+  g_return_if_fail (controller != NULL);
+
+  switch (controller->controller_type)
+    {
+    case GIMP_CONTROLLER_TYPE_TRANSFORM_GRID:
+      {
+        g_signal_handlers_block_by_func (controller->widget,
+                                         gimp_filter_tool_transform_grid_changed,
+                                         controller);
+
+        gimp_filter_tool_reset_transform_grid (controller->widget, filter_tool);
+
+        g_signal_handlers_unblock_by_func (controller->widget,
+                                           gimp_filter_tool_transform_grid_changed,
+                                           controller);
+      }
+      break;
+
+    case GIMP_CONTROLLER_TYPE_TRANSFORM_GRIDS:
+      {
+        g_signal_handlers_block_by_func (controller->widget,
+                                         gimp_filter_tool_transform_grids_changed,
+                                         controller);
+
+        gimp_container_foreach (
+          gimp_tool_widget_group_get_children (
+            GIMP_TOOL_WIDGET_GROUP (controller->widget)),
+          (GFunc) gimp_filter_tool_reset_transform_grid,
+          filter_tool);
+
+        g_signal_handlers_unblock_by_func (controller->widget,
+                                           gimp_filter_tool_transform_grids_changed,
+                                           controller);
+      }
+      break;
+
+    default:
+      break;
+    }
+}
+
+
+/*  private functions  */
+
+static Controller *
+gimp_filter_tool_controller_new (void)
+{
+  return g_slice_new0 (Controller);
+}
+
+static void
+gimp_filter_tool_controller_free (Controller *controller)
+{
+  if (controller->widget)
+    {
+      g_signal_handlers_disconnect_by_data (controller->widget, controller);
+
+      g_object_remove_weak_pointer (G_OBJECT (controller->widget),
+                                    (gpointer) &controller->widget);
+    }
+
+  g_slice_free (Controller, controller);
+}
+
+static void
+gimp_filter_tool_set_line (Controller    *controller,
+                           GeglRectangle *area,
+                           gdouble        x1,
+                           gdouble        y1,
+                           gdouble        x2,
+                           gdouble        y2)
+{
+  GimpTool     *tool;
+  GimpDrawable *drawable;
+
+  if (! controller->widget)
+    return;
+
+  tool     = GIMP_TOOL (controller->filter_tool);
+  drawable = tool->drawable;
+
+  if (drawable)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x1 += off_x + area->x;
+      y1 += off_y + area->y;
+      x2 += off_x + area->x;
+      y2 += off_y + area->y;
+    }
+
+  g_signal_handlers_block_by_func (controller->widget,
+                                   gimp_filter_tool_line_changed,
+                                   controller);
+
+  g_object_set (controller->widget,
+                "x1", x1,
+                "y1", y1,
+                "x2", x2,
+                "y2", y2,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (controller->widget,
+                                     gimp_filter_tool_line_changed,
+                                     controller);
+}
+
+static void
+gimp_filter_tool_line_changed (GimpToolWidget *widget,
+                               Controller     *controller)
+{
+  GimpFilterTool             *filter_tool = controller->filter_tool;
+  GimpControllerLineCallback  line_callback;
+  gdouble                     x1, y1, x2, y2;
+  gint                        off_x, off_y;
+  GeglRectangle               area;
+
+  line_callback = (GimpControllerLineCallback) controller->creator_callback;
+
+  g_object_get (widget,
+                "x1", &x1,
+                "y1", &y1,
+                "x2", &x2,
+                "y2", &y2,
+                NULL);
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  x1 -= off_x + area.x;
+  y1 -= off_y + area.y;
+  x2 -= off_x + area.x;
+  y2 -= off_y + area.y;
+
+  line_callback (controller->creator_data,
+                 &area, x1, y1, x2, y2);
+}
+
+static void
+gimp_filter_tool_set_slider_line (Controller                 *controller,
+                                  GeglRectangle              *area,
+                                  gdouble                     x1,
+                                  gdouble                     y1,
+                                  gdouble                     x2,
+                                  gdouble                     y2,
+                                  const GimpControllerSlider *sliders,
+                                  gint                        n_sliders)
+{
+  GimpTool     *tool;
+  GimpDrawable *drawable;
+
+  if (! controller->widget)
+    return;
+
+  tool     = GIMP_TOOL (controller->filter_tool);
+  drawable = tool->drawable;
+
+  if (drawable)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x1 += off_x + area->x;
+      y1 += off_y + area->y;
+      x2 += off_x + area->x;
+      y2 += off_y + area->y;
+    }
+
+  g_signal_handlers_block_by_func (controller->widget,
+                                   gimp_filter_tool_slider_line_changed,
+                                   controller);
+
+  g_object_set (controller->widget,
+                "x1", x1,
+                "y1", y1,
+                "x2", x2,
+                "y2", y2,
+                NULL);
+
+  gimp_tool_line_set_sliders (GIMP_TOOL_LINE (controller->widget),
+                              sliders, n_sliders);
+
+  g_signal_handlers_unblock_by_func (controller->widget,
+                                     gimp_filter_tool_slider_line_changed,
+                                     controller);
+}
+
+static void
+gimp_filter_tool_slider_line_changed (GimpToolWidget *widget,
+                                      Controller     *controller)
+{
+  GimpFilterTool                   *filter_tool = controller->filter_tool;
+  GimpControllerSliderLineCallback  slider_line_callback;
+  gdouble                           x1, y1, x2, y2;
+  const GimpControllerSlider       *sliders;
+  gint                              n_sliders;
+  gint                              off_x, off_y;
+  GeglRectangle                     area;
+
+  slider_line_callback =
+    (GimpControllerSliderLineCallback) controller->creator_callback;
+
+  g_object_get (widget,
+                "x1", &x1,
+                "y1", &y1,
+                "x2", &x2,
+                "y2", &y2,
+                NULL);
+
+  sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (controller->widget),
+                                        &n_sliders);
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  x1 -= off_x + area.x;
+  y1 -= off_y + area.y;
+  x2 -= off_x + area.x;
+  y2 -= off_y + area.y;
+
+  slider_line_callback (controller->creator_data,
+                        &area, x1, y1, x2, y2, sliders, n_sliders);
+}
+
+static void
+gimp_filter_tool_set_transform_grid (Controller        *controller,
+                                     GeglRectangle     *area,
+                                     const GimpMatrix3 *transform)
+{
+  GimpTool     *tool;
+  GimpDrawable *drawable;
+  gdouble       x1 = area->x;
+  gdouble       y1 = area->y;
+  gdouble       x2 = area->x + area->width;
+  gdouble       y2 = area->y + area->height;
+  GimpMatrix3   matrix;
+
+  if (! controller->widget)
+    return;
+
+  tool     = GIMP_TOOL (controller->filter_tool);
+  drawable = tool->drawable;
+
+  if (drawable)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x1 += off_x;
+      y1 += off_y;
+      x2 += off_x;
+      y2 += off_y;
+    }
+
+  gimp_matrix3_identity (&matrix);
+  gimp_matrix3_translate (&matrix, -x1, -y1);
+  gimp_matrix3_mult (transform, &matrix);
+  gimp_matrix3_translate (&matrix, +x1, +y1);
+
+  g_signal_handlers_block_by_func (controller->widget,
+                                   gimp_filter_tool_transform_grid_changed,
+                                   controller);
+
+  g_object_set (controller->widget,
+                "transform", &matrix,
+                "x1",        x1,
+                "y1",        y1,
+                "x2",        x2,
+                "y2",        y2,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (controller->widget,
+                                     gimp_filter_tool_transform_grid_changed,
+                                     controller);
+}
+
+static void
+gimp_filter_tool_transform_grid_changed (GimpToolWidget *widget,
+                                         Controller     *controller)
+{
+  GimpFilterTool                      *filter_tool = controller->filter_tool;
+  GimpControllerTransformGridCallback  transform_grid_callback;
+  gint                                 off_x, off_y;
+  GeglRectangle                        area;
+  GimpMatrix3                         *transform;
+  GimpMatrix3                          matrix;
+
+  transform_grid_callback =
+    (GimpControllerTransformGridCallback) controller->creator_callback;
+
+  g_object_get (widget,
+                "transform", &transform,
+                NULL);
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  gimp_matrix3_identity (&matrix);
+  gimp_matrix3_translate (&matrix, +(off_x + area.x), +(off_y + area.y));
+  gimp_matrix3_mult (transform, &matrix);
+  gimp_matrix3_translate (&matrix, -(off_x + area.x), -(off_y + area.y));
+
+  transform_grid_callback (controller->creator_data,
+                           &area, &matrix);
+
+  g_free (transform);
+}
+
+static void
+gimp_filter_tool_set_transform_grids (Controller        *controller,
+                                      GeglRectangle     *area,
+                                      const GimpMatrix3 *transforms,
+                                      gint               n_transforms)
+{
+  GimpTool         *tool;
+  GimpDisplayShell *shell;
+  GimpDrawable     *drawable;
+  GimpContainer    *grids;
+  GimpToolWidget   *grid = NULL;
+  gdouble           x1   = area->x;
+  gdouble           y1   = area->y;
+  gdouble           x2   = area->x + area->width;
+  gdouble           y2   = area->y + area->height;
+  GimpMatrix3       matrix;
+  gint              i;
+
+  if (! controller->widget)
+    return;
+
+  tool     = GIMP_TOOL (controller->filter_tool);
+  shell    = gimp_display_get_shell (tool->display);
+  drawable = tool->drawable;
+
+  g_signal_handlers_block_by_func (controller->widget,
+                                   gimp_filter_tool_transform_grids_changed,
+                                   controller);
+
+  if (drawable)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x1 += off_x;
+      y1 += off_y;
+      x2 += off_x;
+      y2 += off_y;
+    }
+
+  grids = gimp_tool_widget_group_get_children (
+    GIMP_TOOL_WIDGET_GROUP (controller->widget));
+
+  if (n_transforms > gimp_container_get_n_children (grids))
+    {
+      gimp_matrix3_identity (&matrix);
+
+      for (i = gimp_container_get_n_children (grids); i < n_transforms; i++)
+        {
+          gdouble pivot_x;
+          gdouble pivot_y;
+
+          grid = gimp_tool_transform_grid_new (shell, &matrix, x1, y1, x2, y2);
+
+          if (i > 0 && ! memcmp (&transforms[i], &transforms[i - 1],
+                                 sizeof (GimpMatrix3)))
+            {
+              g_object_get (gimp_container_get_last_child (grids),
+                            "pivot-x", &pivot_x,
+                            "pivot-y", &pivot_y,
+                            NULL);
+            }
+          else
+            {
+              pivot_x = (x1 + x2) / 2.0;
+              pivot_y = (y1 + y2) / 2.0;
+
+              gimp_matrix3_transform_point (&transforms[i],
+                                            pivot_x, pivot_y,
+                                            &pivot_x, &pivot_y);
+            }
+
+          g_object_set (grid,
+                        "pivot-x",                 pivot_x,
+                        "pivot-y",                 pivot_y,
+                        "inside-function",         GIMP_TRANSFORM_FUNCTION_MOVE,
+                        "outside-function",        GIMP_TRANSFORM_FUNCTION_ROTATE,
+                        "use-corner-handles",      TRUE,
+                        "use-perspective-handles", TRUE,
+                        "use-side-handles",        TRUE,
+                        "use-shear-handles",       TRUE,
+                        "use-pivot-handle",        TRUE,
+                        NULL);
+
+          gimp_container_add (grids, GIMP_OBJECT (grid));
+
+          g_object_unref (grid);
+        }
+
+      gimp_tool_widget_set_focus (grid, TRUE);
+    }
+  else
+    {
+      while (gimp_container_get_n_children (grids) > n_transforms)
+        gimp_container_remove (grids, gimp_container_get_last_child (grids));
+    }
+
+  for (i = 0; i < n_transforms; i++)
+    {
+      gimp_matrix3_identity (&matrix);
+      gimp_matrix3_translate (&matrix, -x1, -y1);
+      gimp_matrix3_mult (&transforms[i], &matrix);
+      gimp_matrix3_translate (&matrix, +x1, +y1);
+
+      g_object_set (gimp_container_get_child_by_index (grids, i),
+                    "transform", &matrix,
+                    "x1",        x1,
+                    "y1",        y1,
+                    "x2",        x2,
+                    "y2",        y2,
+                    NULL);
+    }
+
+  g_signal_handlers_unblock_by_func (controller->widget,
+                                     gimp_filter_tool_transform_grids_changed,
+                                     controller);
+}
+
+static void
+gimp_filter_tool_transform_grids_changed (GimpToolWidget *widget,
+                                          Controller     *controller)
+{
+  GimpFilterTool                       *filter_tool = controller->filter_tool;
+  GimpControllerTransformGridsCallback  transform_grids_callback;
+  GimpContainer                        *grids;
+  gint                                  off_x, off_y;
+  GeglRectangle                         area;
+  GimpMatrix3                          *transforms;
+  gint                                  n_transforms;
+  gint                                  i;
+
+  transform_grids_callback =
+    (GimpControllerTransformGridsCallback) controller->creator_callback;
+
+  grids = gimp_tool_widget_group_get_children (
+    GIMP_TOOL_WIDGET_GROUP (controller->widget));
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  n_transforms = gimp_container_get_n_children (grids);
+  transforms   = g_new (GimpMatrix3, n_transforms);
+
+  for (i = 0; i < n_transforms; i++)
+    {
+      GimpMatrix3 *transform;
+
+      g_object_get (gimp_container_get_child_by_index (grids, i),
+                    "transform", &transform,
+                    NULL);
+
+      gimp_matrix3_identity (&transforms[i]);
+      gimp_matrix3_translate (&transforms[i],
+                              +(off_x + area.x), +(off_y + area.y));
+      gimp_matrix3_mult (transform, &transforms[i]);
+      gimp_matrix3_translate (&transforms[i],
+                              -(off_x + area.x), -(off_y + area.y));
+
+      g_free (transform);
+    }
+
+  transform_grids_callback (controller->creator_data,
+                            &area, transforms, n_transforms);
+
+  g_free (transforms);
+}
+
+static void
+gimp_filter_tool_set_gyroscope (Controller    *controller,
+                                GeglRectangle *area,
+                                gdouble        yaw,
+                                gdouble        pitch,
+                                gdouble        roll,
+                                gdouble        zoom,
+                                gboolean       invert)
+{
+  if (! controller->widget)
+    return;
+
+  g_signal_handlers_block_by_func (controller->widget,
+                                   gimp_filter_tool_gyroscope_changed,
+                                   controller);
+
+  g_object_set (controller->widget,
+                "yaw",    yaw,
+                "pitch",  pitch,
+                "roll",   roll,
+                "zoom",   zoom,
+                "invert", invert,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (controller->widget,
+                                     gimp_filter_tool_gyroscope_changed,
+                                     controller);
+}
+
+static void
+gimp_filter_tool_gyroscope_changed (GimpToolWidget *widget,
+                                    Controller     *controller)
+{
+  GimpFilterTool                  *filter_tool = controller->filter_tool;
+  GimpControllerGyroscopeCallback  gyroscope_callback;
+  gint                             off_x, off_y;
+  GeglRectangle                    area;
+  gdouble                          yaw;
+  gdouble                          pitch;
+  gdouble                          roll;
+  gdouble                          zoom;
+  gboolean                         invert;
+
+  gyroscope_callback =
+    (GimpControllerGyroscopeCallback) controller->creator_callback;
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  g_object_get (widget,
+                "yaw",    &yaw,
+                "pitch",  &pitch,
+                "roll",   &roll,
+                "zoom",   &zoom,
+                "invert", &invert,
+                NULL);
+
+  gyroscope_callback (controller->creator_data,
+                      &area, yaw, pitch, roll, zoom, invert);
+}
+
+static void
+gimp_filter_tool_set_focus (Controller    *controller,
+                            GeglRectangle *area,
+                            GimpLimitType  type,
+                            gdouble        x,
+                            gdouble        y,
+                            gdouble        radius,
+                            gdouble        aspect_ratio,
+                            gdouble        angle,
+                            gdouble        inner_limit,
+                            gdouble        midpoint)
+{
+  GimpTool     *tool;
+  GimpDrawable *drawable;
+
+  if (! controller->widget)
+    return;
+
+  tool     = GIMP_TOOL (controller->filter_tool);
+  drawable = tool->drawable;
+
+  if (drawable)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x + area->x;
+      y += off_y + area->y;
+    }
+
+  g_signal_handlers_block_by_func (controller->widget,
+                                   gimp_filter_tool_focus_changed,
+                                   controller);
+
+  g_object_set (controller->widget,
+                "type",         type,
+                "x",            x,
+                "y",            y,
+                "radius",       radius,
+                "aspect-ratio", aspect_ratio,
+                "angle",        angle,
+                "inner-limit",  inner_limit,
+                "midpoint",     midpoint,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (controller->widget,
+                                     gimp_filter_tool_focus_changed,
+                                     controller);
+}
+
+static void
+gimp_filter_tool_focus_changed (GimpToolWidget *widget,
+                                Controller     *controller)
+{
+  GimpFilterTool              *filter_tool = controller->filter_tool;
+  GimpControllerFocusCallback  focus_callback;
+  GimpLimitType                type;
+  gdouble                      x,  y;
+  gdouble                      radius;
+  gdouble                      aspect_ratio;
+  gdouble                      angle;
+  gdouble                      inner_limit;
+  gdouble                      midpoint;
+  gint                         off_x, off_y;
+  GeglRectangle                area;
+
+  focus_callback = (GimpControllerFocusCallback) controller->creator_callback;
+
+  g_object_get (widget,
+                "type",         &type,
+                "x",            &x,
+                "y",            &y,
+                "radius",       &radius,
+                "aspect-ratio", &aspect_ratio,
+                "angle",        &angle,
+                "inner-limit",  &inner_limit,
+                "midpoint",     &midpoint,
+                NULL);
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  x -= off_x + area.x;
+  y -= off_y + area.y;
+
+  focus_callback (controller->creator_data,
+                  &area,
+                  type,
+                  x,
+                  y,
+                  radius,
+                  aspect_ratio,
+                  angle,
+                  inner_limit,
+                  midpoint);
+}
diff --git a/app/tools/gimpfiltertool-widgets.h b/app/tools/gimpfiltertool-widgets.h
new file mode 100644
index 0000000..1b47e8f
--- /dev/null
+++ b/app/tools/gimpfiltertool-widgets.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfiltertool-widgets.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_TOOL_WIDGETS_H__
+#define __GIMP_FILTER_TOOL_WIDGETS_H__
+
+
+GimpToolWidget * gimp_filter_tool_create_widget (GimpFilterTool     *filter_tool,
+                                                 GimpControllerType  controller_type,
+                                                 const gchar        *status_title,
+                                                 GCallback           callback,
+                                                 gpointer            callback_data,
+                                                 GCallback          *set_func,
+                                                 gpointer           *set_func_data);
+
+void             gimp_filter_tool_reset_widget  (GimpFilterTool     *filter_tool,
+                                                 GimpToolWidget     *widget);
+
+
+#endif /* __GIMP_FILTER_TOOL_WIDGETS_H__ */
diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c
new file mode 100644
index 0000000..2dbe0d6
--- /dev/null
+++ b/app/tools/gimpfiltertool.c
@@ -0,0 +1,2027 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This file contains a base class for tools that implement on canvas
+ * preview for non destructive editing. The processing of the pixels can
+ * be done either by a gegl op or by a C function (apply_func).
+ *
+ * For the core side of this, please see app/core/gimpdrawablefilter.c.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gegl-plugin.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "operations/gimp-operation-config.h"
+#include "operations/gimpoperationsettings.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimperror.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-pick-color.h"
+#include "core/gimplayer.h"
+#include "core/gimplist.h"
+#include "core/gimppickable.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+#include "core/gimpsettings.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimplayermodebox.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpsettingsbox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptoolwidget.h"
+
+#include "gimpfilteroptions.h"
+#include "gimpfiltertool.h"
+#include "gimpfiltertool-settings.h"
+#include "gimpfiltertool-widgets.h"
+#include "gimpguidetool.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+#include "tool_manager.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void      gimp_filter_tool_finalize       (GObject             *object);
+
+static gboolean  gimp_filter_tool_initialize     (GimpTool            *tool,
+                                                  GimpDisplay         *display,
+                                                  GError             **error);
+static void      gimp_filter_tool_control        (GimpTool            *tool,
+                                                  GimpToolAction       action,
+                                                  GimpDisplay         *display);
+static void      gimp_filter_tool_button_press   (GimpTool            *tool,
+                                                  const GimpCoords    *coords,
+                                                  guint32              time,
+                                                  GdkModifierType      state,
+                                                  GimpButtonPressType  press_type,
+                                                  GimpDisplay         *display);
+static void      gimp_filter_tool_button_release (GimpTool            *tool,
+                                                  const GimpCoords    *coords,
+                                                  guint32              time,
+                                                  GdkModifierType      state,
+                                                  GimpButtonReleaseType release_type,
+                                                  GimpDisplay         *display);
+static void      gimp_filter_tool_motion         (GimpTool            *tool,
+                                                  const GimpCoords    *coords,
+                                                  guint32              time,
+                                                  GdkModifierType      state,
+                                                  GimpDisplay         *display);
+static gboolean  gimp_filter_tool_key_press      (GimpTool            *tool,
+                                                  GdkEventKey         *kevent,
+                                                  GimpDisplay         *display);
+static void      gimp_filter_tool_oper_update    (GimpTool            *tool,
+                                                  const GimpCoords    *coords,
+                                                  GdkModifierType      state,
+                                                  gboolean             proximity,
+                                                  GimpDisplay         *display);
+static void      gimp_filter_tool_cursor_update  (GimpTool            *tool,
+                                                  const GimpCoords    *coords,
+                                                  GdkModifierType      state,
+                                                  GimpDisplay         *display);
+static void      gimp_filter_tool_options_notify (GimpTool            *tool,
+                                                  GimpToolOptions     *options,
+                                                  const GParamSpec    *pspec);
+
+static gboolean  gimp_filter_tool_can_pick_color (GimpColorTool       *color_tool,
+                                                  const GimpCoords    *coords,
+                                                  GimpDisplay         *display);
+static gboolean  gimp_filter_tool_pick_color     (GimpColorTool       *color_tool,
+                                                  const GimpCoords    *coords,
+                                                  GimpDisplay         *display,
+                                                  const Babl         **sample_format,
+                                                  gpointer             pixel,
+                                                  GimpRGB             *color);
+static void      gimp_filter_tool_color_picked   (GimpColorTool       *color_tool,
+                                                  const GimpCoords    *coords,
+                                                  GimpDisplay         *display,
+                                                  GimpColorPickState   pick_state,
+                                                  const Babl          *sample_format,
+                                                  gpointer             pixel,
+                                                  const GimpRGB       *color);
+
+static void      gimp_filter_tool_real_reset     (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_real_set_config(GimpFilterTool      *filter_tool,
+                                                  GimpConfig          *config);
+static void      gimp_filter_tool_real_config_notify
+                                                 (GimpFilterTool      *filter_tool,
+                                                  GimpConfig          *config,
+                                                  const GParamSpec    *pspec);
+
+static void      gimp_filter_tool_halt           (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_commit         (GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_dialog         (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_reset          (GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_create_filter  (GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_update_dialog  (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_update_dialog_operation_settings
+                                                 (GimpFilterTool      *filter_tool);
+
+
+static void      gimp_filter_tool_region_changed (GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_flush          (GimpDrawableFilter  *filter,
+                                                  GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_config_notify  (GObject             *object,
+                                                  const GParamSpec    *pspec,
+                                                  GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_unset_setting  (GObject             *object,
+                                                  const GParamSpec    *pspec,
+                                                  GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_lock_position_changed
+                                                 (GimpDrawable        *drawable,
+                                                  GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_mask_changed   (GimpImage           *image,
+                                                  GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_add_guide      (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_remove_guide   (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_move_guide     (GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_guide_removed  (GimpGuide           *guide,
+                                                  GimpFilterTool      *filter_tool);
+static void      gimp_filter_tool_guide_moved    (GimpGuide           *guide,
+                                                  const GParamSpec    *pspec,
+                                                  GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_response       (GimpToolGui         *gui,
+                                                  gint                 response_id,
+                                                  GimpFilterTool      *filter_tool);
+
+static void      gimp_filter_tool_update_filter  (GimpFilterTool      *filter_tool);
+
+static void    gimp_filter_tool_set_has_settings (GimpFilterTool      *filter_tool,
+                                                  gboolean             has_settings);
+
+
+G_DEFINE_TYPE (GimpFilterTool, gimp_filter_tool, GIMP_TYPE_COLOR_TOOL)
+
+#define parent_class gimp_filter_tool_parent_class
+
+
+static void
+gimp_filter_tool_class_init (GimpFilterToolClass *klass)
+{
+  GObjectClass       *object_class     = G_OBJECT_CLASS (klass);
+  GimpToolClass      *tool_class       = GIMP_TOOL_CLASS (klass);
+  GimpColorToolClass *color_tool_class = GIMP_COLOR_TOOL_CLASS (klass);
+
+  object_class->finalize     = gimp_filter_tool_finalize;
+
+  tool_class->initialize     = gimp_filter_tool_initialize;
+  tool_class->control        = gimp_filter_tool_control;
+  tool_class->button_press   = gimp_filter_tool_button_press;
+  tool_class->button_release = gimp_filter_tool_button_release;
+  tool_class->motion         = gimp_filter_tool_motion;
+  tool_class->key_press      = gimp_filter_tool_key_press;
+  tool_class->oper_update    = gimp_filter_tool_oper_update;
+  tool_class->cursor_update  = gimp_filter_tool_cursor_update;
+  tool_class->options_notify = gimp_filter_tool_options_notify;
+
+  color_tool_class->can_pick = gimp_filter_tool_can_pick_color;
+  color_tool_class->pick     = gimp_filter_tool_pick_color;
+  color_tool_class->picked   = gimp_filter_tool_color_picked;
+
+  klass->get_operation       = NULL;
+  klass->dialog              = NULL;
+  klass->reset               = gimp_filter_tool_real_reset;
+  klass->set_config          = gimp_filter_tool_real_set_config;
+  klass->config_notify       = gimp_filter_tool_real_config_notify;
+  klass->settings_import     = gimp_filter_tool_real_settings_import;
+  klass->settings_export     = gimp_filter_tool_real_settings_export;
+}
+
+static void
+gimp_filter_tool_init (GimpFilterTool *filter_tool)
+{
+  GimpTool *tool = GIMP_TOOL (filter_tool);
+
+  gimp_tool_control_set_scroll_lock      (tool->control, TRUE);
+  gimp_tool_control_set_preserve         (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask       (tool->control,
+                                          GIMP_DIRTY_IMAGE           |
+                                          GIMP_DIRTY_IMAGE_STRUCTURE |
+                                          GIMP_DIRTY_DRAWABLE        |
+                                          GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_active_modifiers (tool->control,
+                                          GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+}
+
+static void
+gimp_filter_tool_finalize (GObject *object)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (object);
+
+  g_clear_object (&filter_tool->operation);
+  g_clear_object (&filter_tool->config);
+  g_clear_object (&filter_tool->default_config);
+  g_clear_object (&filter_tool->settings);
+  g_clear_pointer (&filter_tool->description, g_free);
+  g_clear_object (&filter_tool->gui);
+  filter_tool->settings_box      = NULL;
+  filter_tool->controller_toggle = NULL;
+  filter_tool->clip_combo        = NULL;
+  filter_tool->region_combo      = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+#define RESPONSE_RESET 1
+
+static gboolean
+gimp_filter_tool_initialize (GimpTool     *tool,
+                             GimpDisplay  *display,
+                             GError      **error)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpToolInfo     *tool_info   = tool->tool_info;
+  GimpGuiConfig    *config      = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage        *image       = gimp_display_get_image (display);
+  GimpDrawable     *drawable    = gimp_image_get_active_drawable (image);
+  GimpDisplayShell *shell       = gimp_display_get_shell (display);
+
+  if (! drawable)
+    return FALSE;
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot modify the pixels of layer groups."));
+      return FALSE;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer's pixels are locked."));
+      if (error)
+        gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+      return FALSE;
+    }
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer is not visible."));
+      return FALSE;
+    }
+
+  gimp_filter_tool_get_operation (filter_tool);
+
+  gimp_filter_tool_disable_color_picking (filter_tool);
+
+  tool->display  = display;
+  tool->drawable = drawable;
+
+  if (filter_tool->config)
+    gimp_config_reset (GIMP_CONFIG (filter_tool->config));
+
+  if (! filter_tool->gui)
+    {
+      GtkWidget *vbox;
+      GtkWidget *hbox;
+      GtkWidget *toggle;
+
+      /*  disabled for at least GIMP 2.8  */
+      filter_tool->overlay = FALSE;
+
+      filter_tool->gui =
+        gimp_tool_gui_new (tool_info,
+                           gimp_tool_get_label (tool),
+                           filter_tool->description,
+                           gimp_tool_get_icon_name (tool),
+                           gimp_tool_get_help_id (tool),
+                           gtk_widget_get_screen (GTK_WIDGET (shell)),
+                           gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                           filter_tool->overlay,
+
+                           _("_Reset"),  RESPONSE_RESET,
+                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                           _("_OK"),     GTK_RESPONSE_OK,
+
+                           NULL);
+
+      gimp_tool_gui_set_default_response (filter_tool->gui, GTK_RESPONSE_OK);
+
+      gimp_tool_gui_set_alternative_button_order (filter_tool->gui,
+                                                  RESPONSE_RESET,
+                                                  GTK_RESPONSE_OK,
+                                                  GTK_RESPONSE_CANCEL,
+                                                  -1);
+
+      vbox = gimp_tool_gui_get_vbox (filter_tool->gui);
+
+      g_signal_connect_object (filter_tool->gui, "response",
+                               G_CALLBACK (gimp_filter_tool_response),
+                               G_OBJECT (filter_tool), 0);
+
+      if (filter_tool->config)
+        {
+          filter_tool->settings_box =
+            gimp_filter_tool_get_settings_box (filter_tool);
+          gtk_box_pack_start (GTK_BOX (vbox), filter_tool->settings_box,
+                              FALSE, FALSE, 0);
+
+          if (filter_tool->has_settings)
+            gtk_widget_show (filter_tool->settings_box);
+        }
+
+      /*  The preview and split view toggles  */
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      toggle = gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
+                                           "preview", NULL);
+      gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, TRUE, 0);
+      gtk_widget_show (toggle);
+
+      toggle = gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
+                                           "preview-split", NULL);
+      gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
+      gtk_widget_show (toggle);
+
+      g_object_bind_property (G_OBJECT (tool_info->tool_options), "preview",
+                              toggle,                             "sensitive",
+                              G_BINDING_SYNC_CREATE);
+
+      /*  The show-controller toggle  */
+      filter_tool->controller_toggle =
+        gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
+                                    "controller", NULL);
+      gtk_box_pack_end (GTK_BOX (vbox), filter_tool->controller_toggle,
+                        FALSE, FALSE, 0);
+      if (filter_tool->widget)
+        gtk_widget_show (filter_tool->controller_toggle);
+
+      /*  The operation-settings box  */
+      filter_tool->operation_settings_box = gtk_box_new (
+        GTK_ORIENTATION_VERTICAL, 2);
+      gtk_box_pack_end (GTK_BOX (vbox), filter_tool->operation_settings_box,
+                        FALSE, FALSE, 0);
+      gtk_widget_show (filter_tool->operation_settings_box);
+
+      gimp_filter_tool_update_dialog_operation_settings (filter_tool);
+
+      /*  Fill in subclass widgets  */
+      gimp_filter_tool_dialog (filter_tool);
+    }
+  else
+    {
+      gimp_tool_gui_set_title       (filter_tool->gui,
+                                     gimp_tool_get_label (tool));
+      gimp_tool_gui_set_description (filter_tool->gui, filter_tool->description);
+      gimp_tool_gui_set_icon_name   (filter_tool->gui,
+                                     gimp_tool_get_icon_name (tool));
+      gimp_tool_gui_set_help_id     (filter_tool->gui,
+                                     gimp_tool_get_help_id (tool));
+    }
+
+  gimp_tool_gui_set_shell (filter_tool->gui, shell);
+  gimp_tool_gui_set_viewable (filter_tool->gui, GIMP_VIEWABLE (drawable));
+
+  gimp_tool_gui_show (filter_tool->gui);
+
+  g_signal_connect_object (drawable, "lock-position-changed",
+                           G_CALLBACK (gimp_filter_tool_lock_position_changed),
+                           filter_tool, 0);
+
+  g_signal_connect_object (image, "mask-changed",
+                           G_CALLBACK (gimp_filter_tool_mask_changed),
+                           filter_tool, 0);
+
+  gimp_filter_tool_mask_changed (image, filter_tool);
+
+  gimp_filter_tool_create_filter (filter_tool);
+
+  return TRUE;
+}
+
+static void
+gimp_filter_tool_control (GimpTool       *tool,
+                          GimpToolAction  action,
+                          GimpDisplay    *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_filter_tool_halt (filter_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_filter_tool_commit (filter_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_filter_tool_button_press (GimpTool            *tool,
+                               const GimpCoords    *coords,
+                               guint32              time,
+                               GdkModifierType      state,
+                               GimpButtonPressType  press_type,
+                               GimpDisplay         *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  if (gimp_filter_tool_on_guide (filter_tool, coords, display))
+    {
+      GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (tool);
+
+      if (state & gimp_get_extend_selection_mask ())
+        {
+          gimp_filter_options_switch_preview_side (options);
+        }
+      else if (state & gimp_get_toggle_behavior_mask ())
+        {
+          GimpItem *item = GIMP_ITEM (tool->drawable);
+          gint      pos_x;
+          gint      pos_y;
+
+          pos_x = CLAMP (RINT (coords->x) - gimp_item_get_offset_x (item),
+                         0, gimp_item_get_width (item));
+          pos_y = CLAMP (RINT (coords->y) - gimp_item_get_offset_y (item),
+                         0, gimp_item_get_height (item));
+
+          gimp_filter_options_switch_preview_orientation (options,
+                                                          pos_x, pos_y);
+        }
+      else
+        {
+          gimp_guide_tool_start_edit (tool, display,
+                                      filter_tool->preview_guide);
+        }
+    }
+  else if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+    }
+  else if (filter_tool->widget)
+    {
+      if (gimp_tool_widget_button_press (filter_tool->widget, coords, time,
+                                         state, press_type))
+        {
+          filter_tool->grab_widget = filter_tool->widget;
+
+          gimp_tool_control_activate (tool->control);
+        }
+    }
+}
+
+static void
+gimp_filter_tool_button_release (GimpTool              *tool,
+                                 const GimpCoords      *coords,
+                                 guint32                time,
+                                 GdkModifierType        state,
+                                 GimpButtonReleaseType  release_type,
+                                 GimpDisplay           *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  if (filter_tool->grab_widget)
+    {
+      gimp_tool_control_halt (tool->control);
+
+      gimp_tool_widget_button_release (filter_tool->grab_widget,
+                                       coords, time, state, release_type);
+      filter_tool->grab_widget = NULL;
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                      release_type, display);
+    }
+}
+
+static void
+gimp_filter_tool_motion (GimpTool         *tool,
+                         const GimpCoords *coords,
+                         guint32           time,
+                         GdkModifierType   state,
+                         GimpDisplay      *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  if (filter_tool->grab_widget)
+    {
+      gimp_tool_widget_motion (filter_tool->grab_widget, coords, time, state);
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
+                                              display);
+    }
+}
+
+static gboolean
+gimp_filter_tool_key_press (GimpTool    *tool,
+                            GdkEventKey *kevent,
+                            GimpDisplay *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  if (filter_tool->gui && display == tool->display)
+    {
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Return:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_ISO_Enter:
+          gimp_filter_tool_response (filter_tool->gui,
+                                     GTK_RESPONSE_OK,
+                                     filter_tool);
+          return TRUE;
+
+        case GDK_KEY_BackSpace:
+          gimp_filter_tool_response (filter_tool->gui,
+                                     RESPONSE_RESET,
+                                     filter_tool);
+          return TRUE;
+
+        case GDK_KEY_Escape:
+          gimp_filter_tool_response (filter_tool->gui,
+                                     GTK_RESPONSE_CANCEL,
+                                     filter_tool);
+          return TRUE;
+        }
+    }
+
+  return GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display);
+}
+
+static void
+gimp_filter_tool_oper_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              gboolean          proximity,
+                              GimpDisplay      *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  gimp_tool_pop_status (tool, display);
+
+  if (gimp_filter_tool_on_guide (filter_tool, coords, display))
+    {
+      GdkModifierType  extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType  toggle_mask = gimp_get_toggle_behavior_mask ();
+      gchar           *status      = NULL;
+
+      if (state & extend_mask)
+        {
+          status = g_strdup (_("Click to switch the original and filtered sides"));
+        }
+      else if (state & toggle_mask)
+        {
+          status = g_strdup (_("Click to switch between vertical and horizontal"));
+        }
+      else
+        {
+          status = gimp_suggest_modifiers (_("Click to move the split guide"),
+                                           (extend_mask | toggle_mask) & ~state,
+                                           _("%s: switch original and filtered"),
+                                           _("%s: switch horizontal and vertical"),
+                                           NULL);
+        }
+
+      if (proximity)
+        gimp_tool_push_status (tool, display, "%s", status);
+
+      g_free (status);
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                                   proximity, display);
+    }
+}
+
+static void
+gimp_filter_tool_cursor_update (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                GimpDisplay      *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+
+  if (gimp_filter_tool_on_guide (filter_tool, coords, display))
+    {
+      gimp_tool_set_cursor (tool, display,
+                            GIMP_CURSOR_MOUSE,
+                            GIMP_TOOL_CURSOR_HAND,
+                            GIMP_CURSOR_MODIFIER_MOVE);
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                     display);
+    }
+}
+
+static void
+gimp_filter_tool_options_notify (GimpTool         *tool,
+                                 GimpToolOptions  *options,
+                                 const GParamSpec *pspec)
+{
+  GimpFilterTool    *filter_tool    = GIMP_FILTER_TOOL (tool);
+  GimpFilterOptions *filter_options = GIMP_FILTER_OPTIONS (options);
+
+  if (! strcmp (pspec->name, "preview") &&
+      filter_tool->filter)
+    {
+      gimp_filter_tool_update_filter (filter_tool);
+
+      if (filter_options->preview)
+        {
+          gimp_drawable_filter_apply (filter_tool->filter, NULL);
+
+          if (filter_options->preview_split)
+            gimp_filter_tool_add_guide (filter_tool);
+        }
+      else
+        {
+          if (filter_options->preview_split)
+            gimp_filter_tool_remove_guide (filter_tool);
+        }
+    }
+  else if (! strcmp (pspec->name, "preview-split") &&
+           filter_tool->filter)
+    {
+      if (filter_options->preview_split)
+        {
+          GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+          GimpItem         *item  = GIMP_ITEM (tool->drawable);
+          gint              x, y, width, height;
+          gint              position;
+
+          gimp_display_shell_untransform_viewport (shell, TRUE,
+                                                   &x, &y, &width, &height);
+
+          if (! gimp_rectangle_intersect (gimp_item_get_offset_x (item),
+                                          gimp_item_get_offset_y (item),
+                                          gimp_item_get_width  (item),
+                                          gimp_item_get_height (item),
+                                          x, y, width, height,
+                                          &x, &y, &width, &height))
+            {
+              x      = gimp_item_get_offset_x (item);
+              y      = gimp_item_get_offset_y (item);
+              width  = gimp_item_get_width    (item);
+              height = gimp_item_get_height   (item);
+            }
+
+          if (filter_options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+              filter_options->preview_split_alignment == GIMP_ALIGN_RIGHT)
+            {
+              position = (x + width  / 2) - gimp_item_get_offset_x (item);
+            }
+          else
+            {
+              position = (y + height / 2) - gimp_item_get_offset_y (item);
+            }
+
+          g_object_set (
+            options,
+            "preview-split-position", position,
+            NULL);
+        }
+
+      gimp_filter_tool_update_filter (filter_tool);
+
+      if (filter_options->preview_split)
+        gimp_filter_tool_add_guide (filter_tool);
+      else
+        gimp_filter_tool_remove_guide (filter_tool);
+    }
+  else if (! strcmp (pspec->name, "preview-split-alignment") ||
+           ! strcmp (pspec->name, "preview-split-position"))
+    {
+      gimp_filter_tool_update_filter (filter_tool);
+
+      if (filter_options->preview_split)
+        gimp_filter_tool_move_guide (filter_tool);
+    }
+  else if (! strcmp (pspec->name, "controller") &&
+           filter_tool->widget)
+    {
+      gimp_tool_widget_set_visible (filter_tool->widget,
+                                    filter_options->controller);
+    }
+}
+
+static gboolean
+gimp_filter_tool_can_pick_color (GimpColorTool    *color_tool,
+                                 const GimpCoords *coords,
+                                 GimpDisplay      *display)
+{
+  GimpTool       *tool        = GIMP_TOOL (color_tool);
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (color_tool);
+  GimpImage      *image       = gimp_display_get_image (display);
+
+  if (gimp_image_get_active_drawable (image) != tool->drawable)
+    return FALSE;
+
+  return filter_tool->pick_abyss ||
+         GIMP_COLOR_TOOL_CLASS (parent_class)->can_pick (color_tool,
+                                                         coords, display);
+}
+
+static gboolean
+gimp_filter_tool_pick_color (GimpColorTool     *color_tool,
+                             const GimpCoords  *coords,
+                             GimpDisplay       *display,
+                             const Babl       **sample_format,
+                             gpointer           pixel,
+                             GimpRGB           *color)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (color_tool);
+  gboolean        picked;
+
+  picked = GIMP_COLOR_TOOL_CLASS (parent_class)->pick (color_tool, coords,
+                                                       display, sample_format,
+                                                       pixel, color);
+
+  if (! picked && filter_tool->pick_abyss)
+    {
+      color->r = 0.0;
+      color->g = 0.0;
+      color->b = 0.0;
+      color->a = 0.0;
+
+      picked = TRUE;
+    }
+
+  return picked;
+}
+
+static void
+gimp_filter_tool_color_picked (GimpColorTool      *color_tool,
+                               const GimpCoords   *coords,
+                               GimpDisplay        *display,
+                               GimpColorPickState  pick_state,
+                               const Babl         *sample_format,
+                               gpointer            pixel,
+                               const GimpRGB      *color)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (color_tool);
+
+  if (filter_tool->active_picker)
+    {
+      GimpPickerCallback callback;
+      gpointer           callback_data;
+
+      callback      = g_object_get_data (G_OBJECT (filter_tool->active_picker),
+                                         "picker-callback");
+      callback_data = g_object_get_data (G_OBJECT (filter_tool->active_picker),
+                                         "picker-callback-data");
+
+      if (callback)
+        {
+          callback (callback_data,
+                    filter_tool->pick_identifier,
+                    coords->x,
+                    coords->y,
+                    sample_format, color);
+
+          return;
+        }
+    }
+
+  GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->color_picked (filter_tool,
+                                                          filter_tool->pick_identifier,
+                                                          coords->x,
+                                                          coords->y,
+                                                          sample_format, color);
+}
+
+static void
+gimp_filter_tool_real_reset (GimpFilterTool *filter_tool)
+{
+  if (filter_tool->config)
+    {
+      if (filter_tool->default_config)
+        {
+          gimp_config_copy (GIMP_CONFIG (filter_tool->default_config),
+                            GIMP_CONFIG (filter_tool->config),
+                            0);
+        }
+      else
+        {
+          gimp_config_reset (GIMP_CONFIG (filter_tool->config));
+        }
+    }
+}
+
+static void
+gimp_filter_tool_real_set_config (GimpFilterTool *filter_tool,
+                                  GimpConfig     *config)
+{
+  GimpFilterRegion region;
+
+  /* copy the "gimp-region" property first, to avoid incorrectly adjusting the
+   * copied operation properties in gimp_operation_tool_region_changed().
+   */
+  g_object_get (config,
+                "gimp-region", &region,
+                NULL);
+  g_object_set (filter_tool->config,
+                "gimp-region", region,
+                NULL);
+
+  gimp_config_copy (GIMP_CONFIG (config),
+                    GIMP_CONFIG (filter_tool->config), 0);
+
+  /*  reset the "time" property, otherwise explicitly storing the
+   *  config as setting will also copy the time, and the stored object
+   *  will be considered to be among the automatically stored recently
+   *  used settings
+   */
+  g_object_set (filter_tool->config,
+                "time", (gint64) 0,
+                NULL);
+}
+
+static void
+gimp_filter_tool_real_config_notify (GimpFilterTool   *filter_tool,
+                                     GimpConfig       *config,
+                                     const GParamSpec *pspec)
+{
+  GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+
+  if (filter_tool->filter)
+    {
+      /* note that we may be called with a NULL pspec.  see
+       * gimp_operation_tool_aux_input_notify().
+       */
+      if (pspec)
+        {
+          if (! strcmp (pspec->name, "gimp-clip")          ||
+              ! strcmp (pspec->name, "gimp-mode")          ||
+              ! strcmp (pspec->name, "gimp-opacity")       ||
+              ! strcmp (pspec->name, "gimp-color-managed") ||
+              ! strcmp (pspec->name, "gimp-gamma-hack"))
+            {
+              gimp_filter_tool_update_filter (filter_tool);
+            }
+          else if (! strcmp (pspec->name, "gimp-region"))
+            {
+              gimp_filter_tool_update_filter (filter_tool);
+
+              gimp_filter_tool_region_changed (filter_tool);
+            }
+        }
+
+      if (options->preview)
+        gimp_drawable_filter_apply (filter_tool->filter, NULL);
+    }
+}
+
+static void
+gimp_filter_tool_halt (GimpFilterTool *filter_tool)
+{
+  GimpTool *tool = GIMP_TOOL (filter_tool);
+
+  gimp_filter_tool_disable_color_picking (filter_tool);
+
+  if (tool->display)
+    {
+      GimpImage *image = gimp_display_get_image (tool->display);
+
+      g_signal_handlers_disconnect_by_func (tool->drawable,
+                                            gimp_filter_tool_lock_position_changed,
+                                            filter_tool);
+
+      g_signal_handlers_disconnect_by_func (image,
+                                            gimp_filter_tool_mask_changed,
+                                            filter_tool);
+    }
+
+  if (filter_tool->gui)
+    {
+      /* explicitly clear the dialog contents first, since we might be called
+       * during the dialog's delete event, in which case the dialog will be
+       * externally reffed, and will only die *after* gimp_filter_tool_halt()
+       * returns, and, in particular, after filter_tool->config has been
+       * cleared.  we want to make sure the gui is destroyed while
+       * filter_tool->config is still alive, since the gui's destruction may
+       * fire signals whose handlers rely on it.
+       */
+      gimp_gtk_container_clear (
+        GTK_CONTAINER (gimp_filter_tool_dialog_get_vbox (filter_tool)));
+
+      g_clear_object (&filter_tool->gui);
+      filter_tool->settings_box      = NULL;
+      filter_tool->controller_toggle = NULL;
+      filter_tool->clip_combo        = NULL;
+      filter_tool->region_combo      = NULL;
+    }
+
+  if (filter_tool->filter)
+    {
+      gimp_drawable_filter_abort (filter_tool->filter);
+      g_clear_object (&filter_tool->filter);
+
+      gimp_filter_tool_remove_guide (filter_tool);
+    }
+
+  g_clear_object (&filter_tool->operation);
+
+  if (filter_tool->config)
+    {
+      g_signal_handlers_disconnect_by_func (filter_tool->config,
+                                            gimp_filter_tool_config_notify,
+                                            filter_tool);
+      g_signal_handlers_disconnect_by_func (filter_tool->config,
+                                            gimp_filter_tool_unset_setting,
+                                            filter_tool);
+      g_clear_object (&filter_tool->config);
+    }
+
+  g_clear_object (&filter_tool->default_config);
+  g_clear_object (&filter_tool->settings);
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  gimp_filter_tool_set_widget (filter_tool, NULL);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+}
+
+static void
+gimp_filter_tool_commit (GimpFilterTool *filter_tool)
+{
+  GimpTool *tool = GIMP_TOOL (filter_tool);
+
+  if (filter_tool->gui)
+    gimp_tool_gui_hide (filter_tool->gui);
+
+  if (filter_tool->filter)
+    {
+      GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (tool);
+
+      if (! options->preview)
+        gimp_drawable_filter_apply (filter_tool->filter, NULL);
+
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_drawable_filter_commit (filter_tool->filter,
+                                   GIMP_PROGRESS (tool), TRUE);
+      g_clear_object (&filter_tool->filter);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_filter_tool_remove_guide (filter_tool);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+
+      if (filter_tool->config && filter_tool->has_settings)
+        {
+          GimpGuiConfig *config = GIMP_GUI_CONFIG (tool->tool_info->gimp->config);
+
+          gimp_settings_box_add_current (GIMP_SETTINGS_BOX (filter_tool->settings_box),
+                                         config->filter_tool_max_recent);
+        }
+    }
+}
+
+static void
+gimp_filter_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->dialog (filter_tool);
+}
+
+static void
+gimp_filter_tool_update_dialog_operation_settings (GimpFilterTool *filter_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (filter_tool);
+  GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+  GimpImage         *image   = gimp_display_get_image (tool->display);
+
+  if (filter_tool->operation_settings_box)
+    {
+      gimp_gtk_container_clear (
+        GTK_CONTAINER (filter_tool->operation_settings_box));
+
+      if (filter_tool->config)
+        {
+          GtkWidget *vbox;
+          GtkWidget *expander;
+          GtkWidget *frame;
+          GtkWidget *vbox2;
+          GtkWidget *combo;
+          GtkWidget *mode_box;
+          GtkWidget *scale;
+          GtkWidget *toggle;
+
+          vbox = filter_tool->operation_settings_box;
+
+          /*  The clipping combo  */
+          filter_tool->clip_combo =
+            gimp_prop_enum_combo_box_new (filter_tool->config,
+                                          "gimp-clip",
+                                          GIMP_TRANSFORM_RESIZE_ADJUST,
+                                          GIMP_TRANSFORM_RESIZE_CLIP);
+          gimp_int_combo_box_set_label (
+            GIMP_INT_COMBO_BOX (filter_tool->clip_combo), _("Clipping"));
+          gtk_box_pack_start (GTK_BOX (vbox), filter_tool->clip_combo,
+                              FALSE, FALSE, 0);
+
+          /*  The region combo  */
+          filter_tool->region_combo =
+            gimp_prop_enum_combo_box_new (filter_tool->config,
+                                          "gimp-region",
+                                          0, 0);
+          gtk_box_pack_start (GTK_BOX (vbox), filter_tool->region_combo,
+                              FALSE, FALSE, 0);
+
+          /*  The blending-options expander  */
+          expander = gtk_expander_new (_("Blending Options"));
+          gtk_box_pack_start (GTK_BOX (vbox), expander,
+                              FALSE, FALSE, 0);
+          gtk_widget_show (expander);
+
+          g_object_bind_property (options,  "blending-options-expanded",
+                                  expander, "expanded",
+                                  G_BINDING_SYNC_CREATE |
+                                  G_BINDING_BIDIRECTIONAL);
+
+          frame = gimp_frame_new (NULL);
+          gtk_container_add (GTK_CONTAINER (expander), frame);
+          gtk_widget_show (frame);
+
+          vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+          gtk_container_add (GTK_CONTAINER (frame), vbox2);
+          gtk_widget_show (vbox2);
+
+          /*  The mode box  */
+          mode_box = gimp_prop_layer_mode_box_new (
+            filter_tool->config, "gimp-mode",
+            GIMP_LAYER_MODE_CONTEXT_FILTER);
+          gimp_layer_mode_box_set_label (GIMP_LAYER_MODE_BOX (mode_box),
+                                         _("Mode"));
+          gtk_box_pack_start (GTK_BOX (vbox2), mode_box,
+                              FALSE, FALSE, 0);
+          gtk_widget_show (mode_box);
+
+          /*  The opacity scale  */
+          scale = gimp_prop_spin_scale_new (filter_tool->config,
+                                            "gimp-opacity",
+                                            NULL,
+                                            1.0, 10.0, 1);
+          gimp_prop_widget_set_factor (scale, 100.0, 1.0, 10.0, 1);
+          gtk_box_pack_start (GTK_BOX (vbox2), scale,
+                              FALSE, FALSE, 0);
+          gtk_widget_show (scale);
+
+          /*  The Color Options expander  */
+          expander = gtk_expander_new (_("Advanced Color Options"));
+          gtk_box_pack_start (GTK_BOX (vbox), expander,
+                              FALSE, FALSE, 0);
+
+          g_object_bind_property (image->gimp->config,
+                                  "filter-tool-show-color-options",
+                                  expander, "visible",
+                                  G_BINDING_SYNC_CREATE);
+          g_object_bind_property (options,  "color-options-expanded",
+                                  expander, "expanded",
+                                  G_BINDING_SYNC_CREATE |
+                                  G_BINDING_BIDIRECTIONAL);
+
+          frame = gimp_frame_new (NULL);
+          gtk_container_add (GTK_CONTAINER (expander), frame);
+          gtk_widget_show (frame);
+
+          vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+          gtk_container_add (GTK_CONTAINER (frame), vbox2);
+          gtk_widget_show (vbox2);
+
+          /*  The color managed combo  */
+          combo = gimp_prop_boolean_combo_box_new (
+            filter_tool->config, "gimp-color-managed",
+             _("Convert pixels to built-in sRGB to apply filter (slow)"),
+             _("Assume pixels are built-in sRGB (ignore actual image color space)"));
+          g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+          gtk_box_pack_start (GTK_BOX (vbox2), combo,
+                              FALSE, FALSE, 0);
+          gtk_widget_show (combo);
+
+          /*  The gamma hack toggle  */
+          toggle = gimp_prop_check_button_new (filter_tool->config,
+                                               "gimp-gamma-hack", NULL);
+          gtk_box_pack_start (GTK_BOX (vbox2), toggle,
+                              FALSE, FALSE, 0);
+          gtk_widget_show (toggle);
+        }
+    }
+}
+
+static void
+gimp_filter_tool_reset (GimpFilterTool *filter_tool)
+{
+  if (filter_tool->config)
+    g_object_freeze_notify (filter_tool->config);
+
+  GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->reset (filter_tool);
+
+  if (filter_tool->config)
+    g_object_thaw_notify (filter_tool->config);
+
+  if (filter_tool->widget)
+    gimp_filter_tool_reset_widget (filter_tool, filter_tool->widget);
+}
+
+static void
+gimp_filter_tool_create_filter (GimpFilterTool *filter_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (filter_tool);
+  GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+
+  if (filter_tool->filter)
+    {
+      gimp_drawable_filter_abort (filter_tool->filter);
+      g_object_unref (filter_tool->filter);
+    }
+
+  gimp_assert (filter_tool->operation);
+
+  filter_tool->filter = gimp_drawable_filter_new (tool->drawable,
+                                                  gimp_tool_get_undo_desc (tool),
+                                                  filter_tool->operation,
+                                                  gimp_tool_get_icon_name (tool));
+
+  gimp_filter_tool_update_filter (filter_tool);
+
+  g_signal_connect (filter_tool->filter, "flush",
+                    G_CALLBACK (gimp_filter_tool_flush),
+                    filter_tool);
+
+  gimp_gegl_progress_connect (filter_tool->operation,
+                              GIMP_PROGRESS (filter_tool),
+                              gimp_tool_get_undo_desc (tool));
+
+  if (options->preview)
+    gimp_drawable_filter_apply (filter_tool->filter, NULL);
+}
+
+static void
+gimp_filter_tool_update_dialog (GimpFilterTool *filter_tool)
+{
+  GimpTool *tool = GIMP_TOOL (filter_tool);
+
+  if (filter_tool->gui)
+    {
+      GimpImage   *image = gimp_display_get_image (tool->display);
+      GimpChannel *mask  = gimp_image_get_mask (image);
+      const Babl  *format;
+
+      if (filter_tool->filter)
+        format = gimp_drawable_filter_get_format (filter_tool->filter);
+      else
+        format = gimp_drawable_get_format (tool->drawable);
+
+      if (gimp_channel_is_empty (mask))
+        {
+          gtk_widget_set_visible (
+            filter_tool->clip_combo,
+            gimp_item_get_clip (GIMP_ITEM (tool->drawable), FALSE) == FALSE &&
+            ! gimp_gegl_node_is_point_operation (filter_tool->operation)    &&
+            babl_format_has_alpha (format));
+
+          gtk_widget_hide (filter_tool->region_combo);
+        }
+      else
+        {
+          gtk_widget_hide (filter_tool->clip_combo);
+
+          gtk_widget_set_visible (
+            filter_tool->region_combo,
+            ! gimp_gegl_node_is_point_operation (filter_tool->operation) ||
+            gimp_gegl_node_has_key (filter_tool->operation,
+                                    "position-dependent"));
+        }
+    }
+}
+
+static void
+gimp_filter_tool_region_changed (GimpFilterTool *filter_tool)
+{
+  if (filter_tool->filter &&
+      GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->region_changed)
+    {
+      GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->region_changed (filter_tool);
+    }
+}
+
+static void
+gimp_filter_tool_flush (GimpDrawableFilter *filter,
+                        GimpFilterTool     *filter_tool)
+{
+  GimpTool  *tool  = GIMP_TOOL (filter_tool);
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+static void
+gimp_filter_tool_config_notify (GObject          *object,
+                                const GParamSpec *pspec,
+                                GimpFilterTool   *filter_tool)
+{
+  GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->config_notify (filter_tool,
+                                                           GIMP_CONFIG (object),
+                                                           pspec);
+}
+
+static void
+gimp_filter_tool_unset_setting (GObject          *object,
+                                const GParamSpec *pspec,
+                                GimpFilterTool   *filter_tool)
+{
+  g_signal_handlers_disconnect_by_func (filter_tool->config,
+                                        gimp_filter_tool_unset_setting,
+                                        filter_tool);
+
+  gimp_settings_box_unset (GIMP_SETTINGS_BOX (filter_tool->settings_box));
+}
+
+static void
+gimp_filter_tool_lock_position_changed (GimpDrawable   *drawable,
+                                        GimpFilterTool *filter_tool)
+{
+  gimp_filter_tool_update_dialog (filter_tool);
+}
+
+static void
+gimp_filter_tool_mask_changed (GimpImage      *image,
+                               GimpFilterTool *filter_tool)
+{
+  GimpOperationSettings *settings;
+
+  settings = GIMP_OPERATION_SETTINGS (filter_tool->config);
+
+  gimp_filter_tool_update_dialog (filter_tool);
+
+  if (settings && settings->region == GIMP_FILTER_REGION_SELECTION)
+    gimp_filter_tool_region_changed (filter_tool);
+}
+
+static void
+gimp_filter_tool_add_guide (GimpFilterTool *filter_tool)
+{
+  GimpTool            *tool    = GIMP_TOOL (filter_tool);
+  GimpFilterOptions   *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+  GimpItem            *item;
+  GimpImage           *image;
+  GimpOrientationType  orientation;
+  gint                 position;
+
+  if (filter_tool->preview_guide)
+    return;
+
+  item  = GIMP_ITEM (tool->drawable);
+  image = gimp_item_get_image (item);
+
+  if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+      options->preview_split_alignment == GIMP_ALIGN_RIGHT)
+    {
+      orientation = GIMP_ORIENTATION_VERTICAL;
+      position    = gimp_item_get_offset_x (item) +
+                    options->preview_split_position;
+    }
+  else
+    {
+      orientation = GIMP_ORIENTATION_HORIZONTAL;
+      position    = gimp_item_get_offset_y (item) +
+                    options->preview_split_position;
+    }
+
+  filter_tool->preview_guide =
+    gimp_guide_custom_new (orientation,
+                           image->gimp->next_guide_ID++,
+                           GIMP_GUIDE_STYLE_SPLIT_VIEW);
+
+  gimp_image_add_guide (image, filter_tool->preview_guide, position);
+
+  g_signal_connect (filter_tool->preview_guide, "removed",
+                    G_CALLBACK (gimp_filter_tool_guide_removed),
+                    filter_tool);
+  g_signal_connect (filter_tool->preview_guide, "notify::position",
+                    G_CALLBACK (gimp_filter_tool_guide_moved),
+                    filter_tool);
+}
+
+static void
+gimp_filter_tool_remove_guide (GimpFilterTool *filter_tool)
+{
+  GimpTool  *tool = GIMP_TOOL (filter_tool);
+  GimpImage *image;
+
+  if (! filter_tool->preview_guide)
+    return;
+
+  image = gimp_item_get_image (GIMP_ITEM (tool->drawable));
+
+  gimp_image_remove_guide (image, filter_tool->preview_guide, FALSE);
+}
+
+static void
+gimp_filter_tool_move_guide (GimpFilterTool *filter_tool)
+{
+  GimpTool            *tool    = GIMP_TOOL (filter_tool);
+  GimpFilterOptions   *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+  GimpItem            *item;
+  GimpOrientationType  orientation;
+  gint                 position;
+
+  if (! filter_tool->preview_guide)
+    return;
+
+  item = GIMP_ITEM (tool->drawable);
+
+  if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+      options->preview_split_alignment == GIMP_ALIGN_RIGHT)
+    {
+      orientation = GIMP_ORIENTATION_VERTICAL;
+      position    = gimp_item_get_offset_x (item) +
+                    options->preview_split_position;
+    }
+  else
+    {
+      orientation = GIMP_ORIENTATION_HORIZONTAL;
+      position    = gimp_item_get_offset_x (item) +
+                    options->preview_split_position;
+    }
+
+  if (orientation != gimp_guide_get_orientation (filter_tool->preview_guide) ||
+      position    != gimp_guide_get_position (filter_tool->preview_guide))
+    {
+      gimp_guide_set_orientation (filter_tool->preview_guide, orientation);
+      gimp_image_move_guide (gimp_item_get_image (item),
+                             filter_tool->preview_guide, position, FALSE);
+    }
+}
+
+static void
+gimp_filter_tool_guide_removed (GimpGuide      *guide,
+                                GimpFilterTool *filter_tool)
+{
+  GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+
+  g_signal_handlers_disconnect_by_func (G_OBJECT (filter_tool->preview_guide),
+                                        gimp_filter_tool_guide_removed,
+                                        filter_tool);
+  g_signal_handlers_disconnect_by_func (G_OBJECT (filter_tool->preview_guide),
+                                        gimp_filter_tool_guide_moved,
+                                        filter_tool);
+
+  g_clear_object (&filter_tool->preview_guide);
+
+  g_object_set (options,
+                "preview-split", FALSE,
+                NULL);
+}
+
+static void
+gimp_filter_tool_guide_moved (GimpGuide        *guide,
+                              const GParamSpec *pspec,
+                              GimpFilterTool   *filter_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (filter_tool);
+  GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+  GimpItem          *item    = GIMP_ITEM (tool->drawable);
+  gint               position;
+
+  if (options->preview_split_alignment == GIMP_ALIGN_LEFT ||
+      options->preview_split_alignment == GIMP_ALIGN_RIGHT)
+    {
+      position = CLAMP (gimp_guide_get_position (guide) -
+                        gimp_item_get_offset_x (item),
+                        0, gimp_item_get_width (item));
+    }
+  else
+    {
+      position = CLAMP (gimp_guide_get_position (guide) -
+                        gimp_item_get_offset_y (item),
+                        0, gimp_item_get_height (item));
+    }
+
+  g_object_set (options,
+                "preview-split-position", position,
+                NULL);
+}
+
+static void
+gimp_filter_tool_response (GimpToolGui    *gui,
+                           gint            response_id,
+                           GimpFilterTool *filter_tool)
+{
+  GimpTool *tool = GIMP_TOOL (filter_tool);
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gimp_filter_tool_reset (filter_tool);
+      break;
+
+    case GTK_RESPONSE_OK:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+      break;
+
+    default:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      break;
+    }
+}
+
+static void
+gimp_filter_tool_update_filter (GimpFilterTool *filter_tool)
+{
+  GimpFilterOptions     *options  = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+  GimpOperationSettings *settings;
+
+  if (! filter_tool->filter)
+    return;
+
+  settings = GIMP_OPERATION_SETTINGS (filter_tool->config);
+
+  gimp_drawable_filter_set_preview       (filter_tool->filter,
+                                          options->preview);
+  gimp_drawable_filter_set_preview_split (filter_tool->filter,
+                                          options->preview_split,
+                                          options->preview_split_alignment,
+                                          options->preview_split_position);
+  gimp_drawable_filter_set_add_alpha     (filter_tool->filter,
+                                          gimp_gegl_node_has_key (
+                                            filter_tool->operation,
+                                            "needs-alpha"));
+
+  gimp_operation_settings_sync_drawable_filter (settings, filter_tool->filter);
+}
+
+static void
+gimp_filter_tool_set_has_settings (GimpFilterTool *filter_tool,
+                                   gboolean        has_settings)
+{
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+
+  filter_tool->has_settings = has_settings;
+
+  if (! filter_tool->settings_box)
+    return;
+
+  if (filter_tool->has_settings)
+    {
+      GimpTool *tool  = GIMP_TOOL (filter_tool);
+      GQuark    quark = g_quark_from_static_string ("settings-folder");
+      GType     type  = G_TYPE_FROM_INSTANCE (filter_tool->config);
+      GFile    *settings_folder;
+      gchar    *import_title;
+      gchar    *export_title;
+
+      settings_folder = g_type_get_qdata (type, quark);
+
+      import_title = g_strdup_printf (_("Import '%s' Settings"),
+                                      gimp_tool_get_label (tool));
+      export_title = g_strdup_printf (_("Export '%s' Settings"),
+                                      gimp_tool_get_label (tool));
+
+      g_object_set (filter_tool->settings_box,
+                    "visible",        TRUE,
+                    "config",         filter_tool->config,
+                    "container",      filter_tool->settings,
+                    "help-id",        gimp_tool_get_help_id (tool),
+                    "import-title",   import_title,
+                    "export-title",   export_title,
+                    "default-folder", settings_folder,
+                    "last-file",      NULL,
+                    NULL);
+
+      g_free (import_title);
+      g_free (export_title);
+    }
+  else
+    {
+      g_object_set (filter_tool->settings_box,
+                    "visible",        FALSE,
+                    "config",         NULL,
+                    "container",      NULL,
+                    "help-id",        NULL,
+                    "import-title",   NULL,
+                    "export-title",   NULL,
+                    "default-folder", NULL,
+                    "last-file",      NULL,
+                    NULL);
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_filter_tool_get_operation (GimpFilterTool *filter_tool)
+{
+  GimpTool             *tool;
+  GimpFilterToolClass  *klass;
+  gchar                *operation_name;
+  GParamSpec          **pspecs;
+
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+
+  tool  = GIMP_TOOL (filter_tool);
+  klass = GIMP_FILTER_TOOL_GET_CLASS (filter_tool);
+
+  if (filter_tool->filter)
+    {
+      gimp_drawable_filter_abort (filter_tool->filter);
+      g_clear_object (&filter_tool->filter);
+
+      gimp_filter_tool_remove_guide (filter_tool);
+    }
+
+  g_clear_object (&filter_tool->operation);
+
+  if (filter_tool->config)
+    {
+      g_signal_handlers_disconnect_by_func (filter_tool->config,
+                                            gimp_filter_tool_config_notify,
+                                            filter_tool);
+      g_signal_handlers_disconnect_by_func (filter_tool->config,
+                                            gimp_filter_tool_unset_setting,
+                                            filter_tool);
+      g_clear_object (&filter_tool->config);
+    }
+
+  g_clear_object (&filter_tool->default_config);
+  g_clear_object (&filter_tool->settings);
+  g_clear_pointer (&filter_tool->description, g_free);
+
+  operation_name = klass->get_operation (filter_tool,
+                                         &filter_tool->description);
+
+  if (! operation_name)
+    operation_name = g_strdup ("gegl:nop");
+
+  if (! filter_tool->description)
+    filter_tool->description = g_strdup (gimp_tool_get_label (tool));
+
+  filter_tool->operation = gegl_node_new_child (NULL,
+                                                "operation", operation_name,
+                                                NULL);
+
+  filter_tool->config =
+    g_object_new (gimp_operation_config_get_type (tool->tool_info->gimp,
+                                                  operation_name,
+                                                  gimp_tool_get_icon_name (tool),
+                                                  GIMP_TYPE_OPERATION_SETTINGS),
+                  NULL);
+
+  gimp_operation_config_sync_node (filter_tool->config,
+                                   filter_tool->operation);
+  gimp_operation_config_connect_node (filter_tool->config,
+                                      filter_tool->operation);
+
+  filter_tool->settings =
+    gimp_operation_config_get_container (tool->tool_info->gimp,
+                                         G_TYPE_FROM_INSTANCE (filter_tool->config),
+                                         (GCompareFunc) gimp_settings_compare);
+  g_object_ref (filter_tool->settings);
+
+  pspecs =
+    gimp_operation_config_list_properties (filter_tool->config,
+                                           G_TYPE_FROM_INSTANCE (filter_tool->config),
+                                           0, NULL);
+
+  gimp_filter_tool_set_has_settings (filter_tool, (pspecs != NULL));
+
+  g_free (pspecs);
+
+  if (filter_tool->gui)
+    {
+      gimp_tool_gui_set_title       (filter_tool->gui,
+                                     gimp_tool_get_label (tool));
+      gimp_tool_gui_set_description (filter_tool->gui, filter_tool->description);
+      gimp_tool_gui_set_icon_name   (filter_tool->gui,
+                                     gimp_tool_get_icon_name (tool));
+      gimp_tool_gui_set_help_id     (filter_tool->gui,
+                                     gimp_tool_get_help_id (tool));
+
+      gimp_filter_tool_update_dialog_operation_settings (filter_tool);
+    }
+
+  gimp_filter_tool_update_dialog (filter_tool);
+
+  g_free (operation_name);
+
+  g_object_set (GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool),
+                "preview-split", FALSE,
+                NULL);
+
+  g_signal_connect_object (filter_tool->config, "notify",
+                           G_CALLBACK (gimp_filter_tool_config_notify),
+                           G_OBJECT (filter_tool), 0);
+
+  if (tool->drawable)
+    gimp_filter_tool_create_filter (filter_tool);
+}
+
+void
+gimp_filter_tool_set_config (GimpFilterTool *filter_tool,
+                             GimpConfig     *config)
+{
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+  g_return_if_fail (GIMP_IS_OPERATION_SETTINGS (config));
+
+  /* if the user didn't change a setting since the last set_config(),
+   * this handler is still connected
+   */
+  g_signal_handlers_disconnect_by_func (filter_tool->config,
+                                        gimp_filter_tool_unset_setting,
+                                        filter_tool);
+
+  GIMP_FILTER_TOOL_GET_CLASS (filter_tool)->set_config (filter_tool, config);
+
+  if (filter_tool->widget)
+    gimp_filter_tool_reset_widget (filter_tool, filter_tool->widget);
+
+  if (filter_tool->settings_box)
+    g_signal_connect_object (filter_tool->config, "notify",
+                             G_CALLBACK (gimp_filter_tool_unset_setting),
+                             G_OBJECT (filter_tool), 0);
+}
+
+void
+gimp_filter_tool_edit_as (GimpFilterTool *filter_tool,
+                          const gchar    *new_tool_id,
+                          GimpConfig     *config)
+{
+  GimpDisplay  *display;
+  GimpContext  *user_context;
+  GimpToolInfo *tool_info;
+  GimpTool     *new_tool;
+
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+  g_return_if_fail (new_tool_id != NULL);
+  g_return_if_fail (GIMP_IS_CONFIG (config));
+
+  display = GIMP_TOOL (filter_tool)->display;
+
+  user_context = gimp_get_user_context (display->gimp);
+
+  tool_info = (GimpToolInfo *)
+    gimp_container_get_child_by_name (display->gimp->tool_info_list,
+                                      new_tool_id);
+
+  gimp_tool_control (GIMP_TOOL (filter_tool), GIMP_TOOL_ACTION_HALT, display);
+  gimp_context_set_tool (user_context, tool_info);
+  tool_manager_initialize_active (display->gimp, display);
+
+  new_tool = tool_manager_get_active (display->gimp);
+
+  GIMP_FILTER_TOOL (new_tool)->default_config = g_object_ref (G_OBJECT (config));
+
+  gimp_filter_tool_reset (GIMP_FILTER_TOOL (new_tool));
+}
+
+gboolean
+gimp_filter_tool_on_guide (GimpFilterTool   *filter_tool,
+                           const GimpCoords *coords,
+                           GimpDisplay      *display)
+{
+  GimpDisplayShell *shell;
+
+  g_return_val_if_fail (GIMP_IS_FILTER_TOOL (filter_tool), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  shell = gimp_display_get_shell (display);
+
+  if (filter_tool->filter        &&
+      filter_tool->preview_guide &&
+      gimp_display_shell_get_show_guides (shell))
+    {
+      const gint          snap_distance = display->config->snap_distance;
+      GimpOrientationType orientation;
+      gint                position;
+
+      orientation = gimp_guide_get_orientation (filter_tool->preview_guide);
+      position    = gimp_guide_get_position (filter_tool->preview_guide);
+
+      if (orientation == GIMP_ORIENTATION_HORIZONTAL)
+        {
+          if (fabs (coords->y - position) <= FUNSCALEY (shell, snap_distance))
+            return TRUE;
+        }
+      else
+        {
+          if (fabs (coords->x - position) <= FUNSCALEX (shell, snap_distance))
+            return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+GtkWidget *
+gimp_filter_tool_dialog_get_vbox (GimpFilterTool *filter_tool)
+{
+  g_return_val_if_fail (GIMP_IS_FILTER_TOOL (filter_tool), NULL);
+
+  return gimp_tool_gui_get_vbox (filter_tool->gui);
+}
+
+void
+gimp_filter_tool_enable_color_picking (GimpFilterTool *filter_tool,
+                                       gpointer        identifier,
+                                       gboolean        pick_abyss)
+{
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+
+  gimp_filter_tool_disable_color_picking (filter_tool);
+
+  /* note that ownership over 'identifier' is not transferred, and its
+   * lifetime should be managed by the caller.
+   */
+  filter_tool->pick_identifier = identifier;
+  filter_tool->pick_abyss      = pick_abyss;
+
+  gimp_color_tool_enable (GIMP_COLOR_TOOL (filter_tool),
+                          GIMP_COLOR_TOOL_GET_OPTIONS (filter_tool));
+}
+
+void
+gimp_filter_tool_disable_color_picking (GimpFilterTool *filter_tool)
+{
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+
+  if (filter_tool->active_picker)
+    {
+      GtkToggleButton *toggle = GTK_TOGGLE_BUTTON (filter_tool->active_picker);
+
+      filter_tool->active_picker = NULL;
+
+      gtk_toggle_button_set_active (toggle, FALSE);
+    }
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (filter_tool)))
+    gimp_color_tool_disable (GIMP_COLOR_TOOL (filter_tool));
+}
+
+static void
+gimp_filter_tool_color_picker_toggled (GtkWidget      *widget,
+                                       GimpFilterTool *filter_tool)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      gpointer identifier;
+      gboolean pick_abyss;
+
+      if (filter_tool->active_picker == widget)
+        return;
+
+      identifier =                  g_object_get_data (G_OBJECT (widget),
+                                                       "picker-identifier");
+      pick_abyss = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                       "picker-pick-abyss"));
+
+      gimp_filter_tool_enable_color_picking (filter_tool,
+                                             identifier, pick_abyss);
+
+      filter_tool->active_picker = widget;
+    }
+  else if (filter_tool->active_picker == widget)
+    {
+      gimp_filter_tool_disable_color_picking (filter_tool);
+    }
+}
+
+GtkWidget *
+gimp_filter_tool_add_color_picker (GimpFilterTool     *filter_tool,
+                                   gpointer            identifier,
+                                   const gchar        *icon_name,
+                                   const gchar        *tooltip,
+                                   gboolean            pick_abyss,
+                                   GimpPickerCallback  callback,
+                                   gpointer            callback_data)
+{
+  GtkWidget *button;
+  GtkWidget *image;
+
+  g_return_val_if_fail (GIMP_IS_FILTER_TOOL (filter_tool), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+
+  button = g_object_new (GTK_TYPE_TOGGLE_BUTTON,
+                         "draw-indicator", FALSE,
+                         NULL);
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+  gtk_misc_set_padding (GTK_MISC (image), 2, 2);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  if (tooltip)
+    gimp_help_set_help_data (button, tooltip, NULL);
+
+  g_object_set_data (G_OBJECT (button),
+                     "picker-identifier", identifier);
+  g_object_set_data (G_OBJECT (button),
+                     "picker-pick-abyss", GINT_TO_POINTER (pick_abyss));
+  g_object_set_data (G_OBJECT (button),
+                     "picker-callback", callback);
+  g_object_set_data (G_OBJECT (button),
+                     "picker-callback-data", callback_data);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_filter_tool_color_picker_toggled),
+                    filter_tool);
+
+  return button;
+}
+
+GCallback
+gimp_filter_tool_add_controller (GimpFilterTool     *filter_tool,
+                                 GimpControllerType  controller_type,
+                                 const gchar        *status_title,
+                                 GCallback           callback,
+                                 gpointer            callback_data,
+                                 gpointer           *set_func_data)
+{
+  GimpToolWidget *widget;
+  GCallback       set_func;
+
+  g_return_val_if_fail (GIMP_IS_FILTER_TOOL (filter_tool), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+  g_return_val_if_fail (callback_data != NULL, NULL);
+  g_return_val_if_fail (set_func_data != NULL, NULL);
+
+  widget = gimp_filter_tool_create_widget (filter_tool,
+                                           controller_type,
+                                           status_title,
+                                           callback,
+                                           callback_data,
+                                           &set_func,
+                                           set_func_data);
+  gimp_filter_tool_set_widget (filter_tool, widget);
+  g_object_unref (widget);
+
+  return set_func;
+}
+
+void
+gimp_filter_tool_set_widget (GimpFilterTool *filter_tool,
+                             GimpToolWidget *widget)
+{
+  g_return_if_fail (GIMP_IS_FILTER_TOOL (filter_tool));
+  g_return_if_fail (widget == NULL || GIMP_IS_TOOL_WIDGET (widget));
+
+  if (widget == filter_tool->widget)
+    return;
+
+  if (filter_tool->widget)
+    {
+      if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (filter_tool)))
+        gimp_draw_tool_stop (GIMP_DRAW_TOOL (filter_tool));
+
+      g_object_unref (filter_tool->widget);
+    }
+
+  filter_tool->widget = widget;
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (filter_tool), widget);
+
+  if (filter_tool->widget)
+    {
+      GimpFilterOptions *options = GIMP_FILTER_TOOL_GET_OPTIONS (filter_tool);
+
+      g_object_ref (filter_tool->widget);
+
+      gimp_tool_widget_set_visible (filter_tool->widget,
+                                    options->controller);
+
+      if (GIMP_TOOL (filter_tool)->display)
+        gimp_draw_tool_start (GIMP_DRAW_TOOL (filter_tool),
+                              GIMP_TOOL (filter_tool)->display);
+    }
+
+  if (filter_tool->controller_toggle)
+    {
+      gtk_widget_set_visible (filter_tool->controller_toggle,
+                              filter_tool->widget != NULL);
+    }
+}
+
+gboolean
+gimp_filter_tool_get_drawable_area (GimpFilterTool *filter_tool,
+                                    gint           *drawable_offset_x,
+                                    gint           *drawable_offset_y,
+                                    GeglRectangle  *drawable_area)
+{
+  GimpTool              *tool;
+  GimpOperationSettings *settings;
+  GimpDrawable          *drawable;
+
+  g_return_val_if_fail (GIMP_IS_FILTER_TOOL (filter_tool), FALSE);
+  g_return_val_if_fail (drawable_offset_x != NULL, FALSE);
+  g_return_val_if_fail (drawable_offset_y != NULL, FALSE);
+  g_return_val_if_fail (drawable_area != NULL, FALSE);
+
+  tool     = GIMP_TOOL (filter_tool);
+  settings = GIMP_OPERATION_SETTINGS (filter_tool->config);
+
+  *drawable_offset_x = 0;
+  *drawable_offset_y = 0;
+
+  drawable_area->x      = 0;
+  drawable_area->y      = 0;
+  drawable_area->width  = 1;
+  drawable_area->height = 1;
+
+  drawable = tool->drawable;
+
+  if (drawable && settings)
+    {
+      gimp_item_get_offset (GIMP_ITEM (drawable),
+                            drawable_offset_x, drawable_offset_y);
+
+      switch (settings->region)
+        {
+        case GIMP_FILTER_REGION_SELECTION:
+          if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                          &drawable_area->x,
+                                          &drawable_area->y,
+                                          &drawable_area->width,
+                                          &drawable_area->height))
+            {
+              drawable_area->x      = 0;
+              drawable_area->y      = 0;
+              drawable_area->width  = 1;
+              drawable_area->height = 1;
+            }
+          break;
+
+        case GIMP_FILTER_REGION_DRAWABLE:
+          drawable_area->width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+          drawable_area->height = gimp_item_get_height (GIMP_ITEM (drawable));
+          break;
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/tools/gimpfiltertool.h b/app/tools/gimpfiltertool.h
new file mode 100644
index 0000000..b1c91cb
--- /dev/null
+++ b/app/tools/gimpfiltertool.h
@@ -0,0 +1,149 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILTER_TOOL_H__
+#define __GIMP_FILTER_TOOL_H__
+
+
+#include "gimpcolortool.h"
+
+
+#define GIMP_TYPE_FILTER_TOOL            (gimp_filter_tool_get_type ())
+#define GIMP_FILTER_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILTER_TOOL, GimpFilterTool))
+#define GIMP_FILTER_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILTER_TOOL, GimpFilterToolClass))
+#define GIMP_IS_FILTER_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILTER_TOOL))
+#define GIMP_IS_FILTER_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILTER_TOOL))
+#define GIMP_FILTER_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILTER_TOOL, GimpFilterToolClass))
+
+#define GIMP_FILTER_TOOL_GET_OPTIONS(t)  (GIMP_FILTER_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpFilterToolClass GimpFilterToolClass;
+
+struct _GimpFilterTool
+{
+  GimpColorTool       parent_instance;
+
+  GeglNode           *operation;
+  GObject            *config;
+  GObject            *default_config;
+  GimpContainer      *settings;
+
+  gchar              *description;
+
+  gboolean            has_settings;
+
+  GimpDrawableFilter *filter;
+
+  GimpGuide          *preview_guide;
+
+  gpointer            pick_identifier;
+  gboolean            pick_abyss;
+
+  /* dialog */
+  gboolean            overlay;
+  GimpToolGui        *gui;
+  GtkWidget          *settings_box;
+  GtkWidget          *controller_toggle;
+  GtkWidget          *operation_settings_box;
+  GtkWidget          *clip_combo;
+  GtkWidget          *region_combo;
+  GtkWidget          *active_picker;
+
+  /* widget */
+  GimpToolWidget     *widget;
+  GimpToolWidget     *grab_widget;
+};
+
+struct _GimpFilterToolClass
+{
+  GimpColorToolClass  parent_class;
+
+  /* virtual functions */
+  gchar     * (* get_operation)   (GimpFilterTool    *filter_tool,
+                                   gchar            **description);
+  void        (* dialog)          (GimpFilterTool    *filter_tool);
+  void        (* reset)           (GimpFilterTool    *filter_tool);
+  void        (* set_config)      (GimpFilterTool    *filter_tool,
+                                   GimpConfig        *config);
+  void        (* config_notify)   (GimpFilterTool    *filter_tool,
+                                   GimpConfig        *config,
+                                   const GParamSpec  *pspec);
+
+  gboolean    (* settings_import) (GimpFilterTool    *filter_tool,
+                                   GInputStream      *input,
+                                   GError           **error);
+  gboolean    (* settings_export) (GimpFilterTool    *filter_tool,
+                                   GOutputStream     *output,
+                                   GError           **error);
+
+  void        (* region_changed)  (GimpFilterTool    *filter_tool);
+  void        (* color_picked)    (GimpFilterTool    *filter_tool,
+                                   gpointer           identifier,
+                                   gdouble            x,
+                                   gdouble            y,
+                                   const Babl        *sample_format,
+                                   const GimpRGB     *color);
+};
+
+
+GType       gimp_filter_tool_get_type              (void) G_GNUC_CONST;
+
+void        gimp_filter_tool_get_operation         (GimpFilterTool     *filter_tool);
+
+void        gimp_filter_tool_set_config            (GimpFilterTool     *filter_tool,
+                                                    GimpConfig         *config);
+
+void        gimp_filter_tool_edit_as               (GimpFilterTool     *filter_tool,
+                                                    const gchar        *new_tool_id,
+                                                    GimpConfig         *config);
+
+gboolean    gimp_filter_tool_on_guide              (GimpFilterTool     *filter_tool,
+                                                    const GimpCoords   *coords,
+                                                    GimpDisplay        *display);
+
+GtkWidget * gimp_filter_tool_dialog_get_vbox       (GimpFilterTool     *filter_tool);
+
+void        gimp_filter_tool_enable_color_picking  (GimpFilterTool     *filter_tool,
+                                                    gpointer            identifier,
+                                                    gboolean            pick_abyss);
+void        gimp_filter_tool_disable_color_picking (GimpFilterTool     *filter_tool);
+
+GtkWidget * gimp_filter_tool_add_color_picker      (GimpFilterTool     *filter_tool,
+                                                    gpointer            identifier,
+                                                    const gchar        *icon_name,
+                                                    const gchar        *tooltip,
+                                                    gboolean            pick_abyss,
+                                                    GimpPickerCallback  callback,
+                                                    gpointer            callback_data);
+GCallback   gimp_filter_tool_add_controller        (GimpFilterTool     *filter_tool,
+                                                    GimpControllerType  controller_type,
+                                                    const gchar        *status_title,
+                                                    GCallback           callback,
+                                                    gpointer            callback_data,
+                                                    gpointer           *set_func_data);
+
+void        gimp_filter_tool_set_widget            (GimpFilterTool     *filter_tool,
+                                                    GimpToolWidget     *widget);
+
+gboolean    gimp_filter_tool_get_drawable_area     (GimpFilterTool     *filter_tool,
+                                                    gint               *drawable_offset_x,
+                                                    gint               *drawable_offset_y,
+                                                    GeglRectangle      *drawable_area);
+
+
+#endif /* __GIMP_FILTER_TOOL_H__ */
diff --git a/app/tools/gimpflipoptions.c b/app/tools/gimpflipoptions.c
new file mode 100644
index 0000000..6b9eb2d
--- /dev/null
+++ b/app/tools/gimpflipoptions.c
@@ -0,0 +1,164 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpflipoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FLIP_TYPE
+};
+
+
+static void   gimp_flip_options_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+static void   gimp_flip_options_get_property (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpFlipOptions, gimp_flip_options,
+               GIMP_TYPE_TRANSFORM_OPTIONS)
+
+
+static void
+gimp_flip_options_class_init (GimpFlipOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_flip_options_set_property;
+  object_class->get_property = gimp_flip_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FLIP_TYPE,
+                         "flip-type",
+                         _("Flip Type"),
+                         _("Direction of flipping"),
+                         GIMP_TYPE_ORIENTATION_TYPE,
+                         GIMP_ORIENTATION_HORIZONTAL,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_flip_options_init (GimpFlipOptions *options)
+{
+}
+
+static void
+gimp_flip_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpFlipOptions *options = GIMP_FLIP_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FLIP_TYPE:
+      options->flip_type = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_flip_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpFlipOptions *options = GIMP_FLIP_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FLIP_TYPE:
+      g_value_set_enum (value, options->flip_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_flip_options_gui (GimpToolOptions *tool_options)
+{
+  GObject              *config     = G_OBJECT (tool_options);
+  GimpFlipOptions      *options    = GIMP_FLIP_OPTIONS (tool_options);
+  GimpTransformOptions *tr_options = GIMP_TRANSFORM_OPTIONS (tool_options);
+  GtkWidget            *vbox;
+  GtkWidget            *frame;
+  GtkWidget            *combo;
+  gchar                *str;
+  GtkListStore         *clip_model;
+  GdkModifierType       toggle_mask;
+
+  vbox = gimp_transform_options_gui (tool_options, FALSE, FALSE, FALSE);
+
+  toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /*  tool toggle  */
+  str = g_strdup_printf (_("Direction  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+
+  frame = gimp_prop_enum_radio_frame_new (config, "flip-type",
+                                          str,
+                                          GIMP_ORIENTATION_HORIZONTAL,
+                                          GIMP_ORIENTATION_VERTICAL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  g_free (str);
+
+  options->direction_frame = frame;
+
+  /*  the clipping menu  */
+  clip_model = gimp_enum_store_new_with_range (GIMP_TYPE_TRANSFORM_RESIZE,
+                                               GIMP_TRANSFORM_RESIZE_ADJUST,
+                                               GIMP_TRANSFORM_RESIZE_CLIP);
+
+  combo = gimp_prop_enum_combo_box_new (config, "clip", 0, 0);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (clip_model));
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), tr_options->clip);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Clipping"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  g_object_unref (clip_model);
+
+  return vbox;
+}
diff --git a/app/tools/gimpflipoptions.h b/app/tools/gimpflipoptions.h
new file mode 100644
index 0000000..1191054
--- /dev/null
+++ b/app/tools/gimpflipoptions.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FLIP_OPTIONS_H__
+#define __GIMP_FLIP_OPTIONS_H__
+
+
+#include "gimptransformoptions.h"
+
+
+#define GIMP_TYPE_FLIP_OPTIONS            (gimp_flip_options_get_type ())
+#define GIMP_FLIP_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FLIP_OPTIONS, GimpFlipOptions))
+#define GIMP_FLIP_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FLIP_OPTIONS, GimpFlipOptionsClass))
+#define GIMP_IS_FLIP_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FLIP_OPTIONS))
+#define GIMP_IS_FLIP_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FLIP_OPTIONS))
+#define GIMP_FLIP_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FLIP_OPTIONS, GimpFlipOptionsClass))
+
+
+typedef struct _GimpFlipOptions      GimpFlipOptions;
+typedef struct _GimpToolOptionsClass GimpFlipOptionsClass;
+
+struct _GimpFlipOptions
+{
+  GimpTransformOptions  parent_instance;
+
+  GimpOrientationType   flip_type;
+
+  /*  options gui  */
+  GtkWidget            *direction_frame;
+};
+
+
+GType       gimp_flip_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_flip_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_FLIP_OPTIONS_H__ */
diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c
new file mode 100644
index 0000000..8714b61
--- /dev/null
+++ b/app/tools/gimpfliptool.c
@@ -0,0 +1,460 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimpdrawable-transform.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-flip.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpitem-linked.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimppickable.h"
+#include "core/gimpprogress.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+
+#include "gimpflipoptions.h"
+#include "gimpfliptool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void         gimp_flip_tool_button_press  (GimpTool             *tool,
+                                                  const GimpCoords     *coords,
+                                                  guint32               time,
+                                                  GdkModifierType       state,
+                                                  GimpButtonPressType   press_type,
+                                                  GimpDisplay          *display);
+static void         gimp_flip_tool_modifier_key  (GimpTool             *tool,
+                                                  GdkModifierType       key,
+                                                  gboolean              press,
+                                                  GdkModifierType       state,
+                                                  GimpDisplay          *display);
+static void         gimp_flip_tool_oper_update   (GimpTool             *tool,
+                                                  const GimpCoords     *coords,
+                                                  GdkModifierType       state,
+                                                  gboolean              proximity,
+                                                  GimpDisplay          *display);
+static void         gimp_flip_tool_cursor_update (GimpTool             *tool,
+                                                  const GimpCoords     *coords,
+                                                  GdkModifierType       state,
+                                                  GimpDisplay          *display);
+
+static void         gimp_flip_tool_draw          (GimpDrawTool         *draw_tool);
+
+static gchar      * gimp_flip_tool_get_undo_desc (GimpTransformTool    *tr_tool);
+static GeglBuffer * gimp_flip_tool_transform     (GimpTransformTool    *tr_tool,
+                                                  GimpObject           *object,
+                                                  GeglBuffer           *orig_buffer,
+                                                  gint                  orig_offset_x,
+                                                  gint                  orig_offset_y,
+                                                  GimpColorProfile    **buffer_profile,
+                                                  gint                 *new_offset_x,
+                                                  gint                 *new_offset_y);
+
+static GimpOrientationType   gimp_flip_tool_get_flip_type  (GimpFlipTool      *flip);
+
+
+G_DEFINE_TYPE (GimpFlipTool, gimp_flip_tool, GIMP_TYPE_TRANSFORM_TOOL)
+
+#define parent_class gimp_flip_tool_parent_class
+
+
+void
+gimp_flip_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_FLIP_TOOL,
+                GIMP_TYPE_FLIP_OPTIONS,
+                gimp_flip_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-flip-tool",
+                _("Flip"),
+                _("Flip Tool: "
+                  "Reverse the layer, selection or path horizontally or vertically"),
+                N_("_Flip"), "<shift>F",
+                NULL, GIMP_HELP_TOOL_FLIP,
+                GIMP_ICON_TOOL_FLIP,
+                data);
+}
+
+static void
+gimp_flip_tool_class_init (GimpFlipToolClass *klass)
+{
+  GimpToolClass          *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass      *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+  GimpTransformToolClass *tr_class        = GIMP_TRANSFORM_TOOL_CLASS (klass);
+
+  tool_class->button_press  = gimp_flip_tool_button_press;
+  tool_class->modifier_key  = gimp_flip_tool_modifier_key;
+  tool_class->oper_update   = gimp_flip_tool_oper_update;
+  tool_class->cursor_update = gimp_flip_tool_cursor_update;
+
+  draw_tool_class->draw     = gimp_flip_tool_draw;
+
+  tr_class->get_undo_desc   = gimp_flip_tool_get_undo_desc;
+  tr_class->transform       = gimp_flip_tool_transform;
+
+  tr_class->undo_desc       = C_("undo-type", "Flip");
+  tr_class->progress_text   = _("Flipping");
+}
+
+static void
+gimp_flip_tool_init (GimpFlipTool *flip_tool)
+{
+  GimpTool *tool = GIMP_TOOL (flip_tool);
+
+  gimp_tool_control_set_snap_to            (tool->control, FALSE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+  gimp_tool_control_set_cursor             (tool->control, GIMP_CURSOR_MOUSE);
+  gimp_tool_control_set_toggle_cursor      (tool->control, GIMP_CURSOR_MOUSE);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_FLIP_HORIZONTAL);
+  gimp_tool_control_set_toggle_tool_cursor (tool->control,
+                                            GIMP_TOOL_CURSOR_FLIP_VERTICAL);
+
+  flip_tool->guide = NULL;
+}
+
+static void
+gimp_flip_tool_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
+
+  tool->display = display;
+
+  gimp_transform_tool_transform (tr_tool, display);
+
+  gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+}
+
+static void
+gimp_flip_tool_modifier_key (GimpTool        *tool,
+                             GdkModifierType  key,
+                             gboolean         press,
+                             GdkModifierType  state,
+                             GimpDisplay     *display)
+{
+  GimpFlipOptions *options = GIMP_FLIP_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_toggle_behavior_mask ())
+    {
+      switch (options->flip_type)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          g_object_set (options,
+                        "flip-type", GIMP_ORIENTATION_VERTICAL,
+                        NULL);
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          g_object_set (options,
+                        "flip-type", GIMP_ORIENTATION_HORIZONTAL,
+                        NULL);
+          break;
+
+        default:
+          break;
+        }
+    }
+}
+
+static void
+gimp_flip_tool_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+  GimpFlipTool     *flip      = GIMP_FLIP_TOOL (tool);
+  GimpDrawTool     *draw_tool = GIMP_DRAW_TOOL (tool);
+  GimpFlipOptions  *options   = GIMP_FLIP_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell *shell     = gimp_display_get_shell (display);
+  GimpImage        *image     = gimp_display_get_image (display);
+  GimpGuide        *guide     = NULL;
+
+  if (gimp_display_shell_get_show_guides (shell) &&
+      proximity)
+    {
+      gint snap_distance = display->config->snap_distance;
+
+      guide = gimp_image_pick_guide (image, coords->x, coords->y,
+                                     FUNSCALEX (shell, snap_distance),
+                                     FUNSCALEY (shell, snap_distance));
+    }
+
+  if (flip->guide != guide ||
+      (guide && ! gimp_draw_tool_is_active (draw_tool)))
+    {
+      gimp_draw_tool_pause (draw_tool);
+
+      if (gimp_draw_tool_is_active (draw_tool) &&
+          draw_tool->display != display)
+        gimp_draw_tool_stop (draw_tool);
+
+      flip->guide = guide;
+
+      if (! gimp_draw_tool_is_active (draw_tool))
+        gimp_draw_tool_start (draw_tool, display);
+
+      gimp_draw_tool_resume (draw_tool);
+    }
+
+  gtk_widget_set_sensitive (options->direction_frame, guide == NULL);
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool,
+                                               coords, state, proximity,
+                                               display);
+}
+
+static void
+gimp_flip_tool_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
+  GimpFlipTool      *flip    = GIMP_FLIP_TOOL (tool);
+
+  if (! gimp_transform_tool_check_active_object (tr_tool, display, NULL))
+    {
+      gimp_tool_set_cursor (tool, display,
+                            gimp_tool_control_get_cursor (tool->control),
+                            gimp_tool_control_get_tool_cursor (tool->control),
+                            GIMP_CURSOR_MODIFIER_BAD);
+      return;
+    }
+
+  gimp_tool_control_set_toggled (tool->control,
+                                 gimp_flip_tool_get_flip_type (flip) ==
+                                 GIMP_ORIENTATION_VERTICAL);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_flip_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpFlipTool *flip = GIMP_FLIP_TOOL (draw_tool);
+
+  if (flip->guide)
+    {
+      GimpCanvasItem *item;
+      GimpGuideStyle  style;
+
+      style = gimp_guide_get_style (flip->guide);
+
+      item = gimp_draw_tool_add_guide (draw_tool,
+                                       gimp_guide_get_orientation (flip->guide),
+                                       gimp_guide_get_position (flip->guide),
+                                       style);
+      gimp_canvas_item_set_highlight (item, TRUE);
+    }
+}
+
+static gchar *
+gimp_flip_tool_get_undo_desc (GimpTransformTool *tr_tool)
+{
+  GimpFlipTool *flip = GIMP_FLIP_TOOL (tr_tool);
+
+  switch (gimp_flip_tool_get_flip_type (flip))
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      return g_strdup (C_("undo-type", "Flip horizontally"));
+
+    case GIMP_ORIENTATION_VERTICAL:
+      return g_strdup (C_("undo-type", "Flip vertically"));
+
+    default:
+      /* probably this is not actually reached today, but
+       * could be if someone defined FLIP_DIAGONAL, say...
+       */
+      return GIMP_TRANSFORM_TOOL_CLASS (parent_class)->get_undo_desc (tr_tool);
+    }
+}
+
+static GeglBuffer *
+gimp_flip_tool_transform (GimpTransformTool *tr_tool,
+                          GimpObject        *object,
+                          GeglBuffer        *orig_buffer,
+                          gint               orig_offset_x,
+                          gint               orig_offset_y,
+                          GimpColorProfile **buffer_profile,
+                          gint              *new_offset_x,
+                          gint              *new_offset_y)
+{
+  GimpFlipTool         *flip        = GIMP_FLIP_TOOL (tr_tool);
+  GimpFlipOptions      *options     = GIMP_FLIP_TOOL_GET_OPTIONS (tr_tool);
+  GimpTransformOptions *tr_options  = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+  GimpContext          *context     = GIMP_CONTEXT (options);
+  GimpOrientationType   flip_type   = GIMP_ORIENTATION_UNKNOWN;
+  gdouble               axis        = 0.0;
+  gboolean              clip_result = FALSE;
+  GeglBuffer           *ret         = NULL;
+
+  flip_type = gimp_flip_tool_get_flip_type (flip);
+
+  if (flip->guide)
+    {
+      axis = gimp_guide_get_position (flip->guide);
+    }
+  else
+    {
+      switch (flip_type)
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          axis = ((gdouble) tr_tool->x1 +
+                  (gdouble) (tr_tool->x2 - tr_tool->x1) / 2.0);
+          break;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          axis = ((gdouble) tr_tool->y1 +
+                  (gdouble) (tr_tool->y2 - tr_tool->y1) / 2.0);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  switch (tr_options->clip)
+    {
+    case GIMP_TRANSFORM_RESIZE_ADJUST:
+      clip_result = FALSE;
+      break;
+
+    case GIMP_TRANSFORM_RESIZE_CLIP:
+      clip_result = TRUE;
+      break;
+
+    default:
+      g_return_val_if_reached (NULL);
+    }
+
+  if (orig_buffer)
+    {
+      /*  this happens when transforming a selection cut out of a
+       *  normal drawable
+       */
+
+      g_return_val_if_fail (GIMP_IS_DRAWABLE (object), NULL);
+
+      ret = gimp_drawable_transform_buffer_flip (GIMP_DRAWABLE (object),
+                                                 context,
+                                                 orig_buffer,
+                                                 orig_offset_x,
+                                                 orig_offset_y,
+                                                 flip_type, axis,
+                                                 clip_result,
+                                                 buffer_profile,
+                                                 new_offset_x,
+                                                 new_offset_y);
+    }
+  else if (GIMP_IS_ITEM (object))
+    {
+      /*  this happens for entire drawables, paths and layer groups  */
+
+      GimpItem *item = GIMP_ITEM (object);
+
+      if (gimp_item_get_linked (item))
+        {
+          gimp_item_linked_flip (item, context,
+                                 flip_type, axis, clip_result);
+        }
+      else
+        {
+          clip_result = gimp_item_get_clip (item, clip_result);
+
+          gimp_item_flip (item, context,
+                          flip_type, axis, clip_result);
+        }
+    }
+  else
+    {
+      /*  this happens for images  */
+      GimpTransformToolClass *tr_class = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool);
+      GimpProgress           *progress;
+
+      g_return_val_if_fail (GIMP_IS_IMAGE (object), NULL);
+
+      progress = gimp_progress_start (GIMP_PROGRESS (tr_tool), FALSE,
+                                      "%s", tr_class->progress_text);
+
+      gimp_image_flip_full (GIMP_IMAGE (object), context,
+                            flip_type, axis, clip_result,
+                            progress);
+
+      if (progress)
+        gimp_progress_end (progress);
+    }
+
+  return ret;
+}
+
+static GimpOrientationType
+gimp_flip_tool_get_flip_type (GimpFlipTool *flip)
+{
+  GimpFlipOptions *options = GIMP_FLIP_TOOL_GET_OPTIONS (flip);
+
+  if (flip->guide)
+    {
+      switch (gimp_guide_get_orientation (flip->guide))
+        {
+        case GIMP_ORIENTATION_HORIZONTAL:
+          return GIMP_ORIENTATION_VERTICAL;
+
+        case GIMP_ORIENTATION_VERTICAL:
+          return GIMP_ORIENTATION_HORIZONTAL;
+
+        default:
+          return gimp_guide_get_orientation (flip->guide);
+        }
+    }
+  else
+    {
+      return options->flip_type;
+    }
+}
diff --git a/app/tools/gimpfliptool.h b/app/tools/gimpfliptool.h
new file mode 100644
index 0000000..4415863
--- /dev/null
+++ b/app/tools/gimpfliptool.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FLIP_TOOL_H__
+#define __GIMP_FLIP_TOOL_H__
+
+
+#include "gimptransformtool.h"
+
+
+#define GIMP_TYPE_FLIP_TOOL            (gimp_flip_tool_get_type ())
+#define GIMP_FLIP_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FLIP_TOOL, GimpFlipTool))
+#define GIMP_FLIP_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FLIP_TOOL, GimpFlipToolClass))
+#define GIMP_IS_FLIP_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FLIP_TOOL))
+#define GIMP_IS_FLIP_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FLIP_TOOL))
+#define GIMP_FLIP_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FLIP_TOOL, GimpFlipToolClass))
+
+#define GIMP_FLIP_TOOL_GET_OPTIONS(t)  (GIMP_FLIP_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpFlipTool      GimpFlipTool;
+typedef struct _GimpFlipToolClass GimpFlipToolClass;
+
+struct _GimpFlipTool
+{
+  GimpTransformTool  parent_instance;
+
+  GimpGuide         *guide;
+};
+
+struct _GimpFlipToolClass
+{
+  GimpTransformToolClass  parent_class;
+};
+
+
+void    gimp_flip_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_flip_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_FLIP_TOOL_H__  */
diff --git a/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c
new file mode 100644
index 0000000..8dcf6eb
--- /dev/null
+++ b/app/tools/gimpforegroundselectoptions.c
@@ -0,0 +1,395 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpwidgets-constructors.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpforegroundselectoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+/*
+ * for matting-global: iterations int
+ * for matting-levin:  levels int, active levels int
+ */
+
+enum
+{
+  PROP_0,
+  PROP_DRAW_MODE,
+  PROP_PREVIEW_MODE,
+  PROP_STROKE_WIDTH,
+  PROP_MASK_COLOR,
+  PROP_ENGINE,
+  PROP_ITERATIONS,
+  PROP_LEVELS,
+  PROP_ACTIVE_LEVELS
+};
+
+
+static void   gimp_foreground_select_options_set_property (GObject      *object,
+                                                           guint         property_id,
+                                                           const GValue *value,
+                                                           GParamSpec   *pspec);
+static void   gimp_foreground_select_options_get_property (GObject      *object,
+                                                           guint         property_id,
+                                                           GValue       *value,
+                                                           GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpForegroundSelectOptions, gimp_foreground_select_options,
+               GIMP_TYPE_SELECTION_OPTIONS)
+
+
+static void
+gimp_foreground_select_options_class_init (GimpForegroundSelectOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GimpRGB blue = {0.0, 0.0, 1.0, 0.5};
+
+  object_class->set_property = gimp_foreground_select_options_set_property;
+  object_class->get_property = gimp_foreground_select_options_get_property;
+
+  /*  override the antialias default value from GimpSelectionOptions  */
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DRAW_MODE,
+                         "draw-mode",
+                         _("Draw Mode"),
+                         _("Paint over areas to mark color values for "
+                           "inclusion or exclusion from selection"),
+                         GIMP_TYPE_MATTING_DRAW_MODE,
+                         GIMP_MATTING_DRAW_MODE_FOREGROUND,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PREVIEW_MODE,
+                         "preview-mode",
+                         _("Preview Mode"),
+                         _("Preview Mode"),
+                         GIMP_TYPE_MATTING_PREVIEW_MODE,
+                         GIMP_MATTING_PREVIEW_MODE_ON_COLOR,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT  (object_class, PROP_STROKE_WIDTH,
+                         "stroke-width",
+                         _("Stroke width"),
+                         _("Size of the brush used for refinements"),
+                         1, 6000, 10,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_RGB  (object_class, PROP_MASK_COLOR,
+                         "mask-color",
+                         _("Preview color"),
+                         _("Color of selection preview mask"),
+                         GIMP_TYPE_RGB,
+                         &blue,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ENGINE,
+                         "engine",
+                         _("Engine"),
+                         _("Matting engine to use"),
+                         GIMP_TYPE_MATTING_ENGINE,
+                         GIMP_MATTING_ENGINE_LEVIN,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT  (object_class, PROP_LEVELS,
+                         "levels",
+                         _("Levels"),
+                         _("Number of downsampled levels to use"),
+                         1, 10, 2,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT  (object_class, PROP_ACTIVE_LEVELS,
+                         "active-levels",
+                         _("Active levels"),
+                         _("Number of levels to perform solving"),
+                         1, 10, 2,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT  (object_class, PROP_ITERATIONS,
+                         "iterations",
+                         _("Iterations"),
+                         _("Number of iterations to perform"),
+                         1, 10, 2,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_foreground_select_options_init (GimpForegroundSelectOptions *options)
+{
+}
+
+static void
+gimp_foreground_select_options_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec)
+{
+  GimpForegroundSelectOptions *options = GIMP_FOREGROUND_SELECT_OPTIONS (object);
+  GimpRGB *color;
+
+  switch (property_id)
+    {
+    case PROP_DRAW_MODE:
+      options->draw_mode = g_value_get_enum (value);
+      break;
+
+    case PROP_PREVIEW_MODE:
+      options->preview_mode = g_value_get_enum (value);
+      break;
+
+    case PROP_STROKE_WIDTH:
+      options->stroke_width = g_value_get_int (value);
+      break;
+
+    case PROP_MASK_COLOR:
+      color = g_value_get_boxed (value);
+      options->mask_color = *color;
+      break;
+
+    case PROP_ENGINE:
+      options->engine = g_value_get_enum (value);
+      if ((options->engine == GIMP_MATTING_ENGINE_LEVIN) &&
+          !(gegl_has_operation ("gegl:matting-levin")))
+        {
+          options->engine = GIMP_MATTING_ENGINE_GLOBAL;
+        }
+      break;
+
+    case PROP_LEVELS:
+      options->levels = g_value_get_int (value);
+      break;
+
+    case PROP_ACTIVE_LEVELS:
+      options->active_levels = g_value_get_int (value);
+      break;
+
+    case PROP_ITERATIONS:
+      options->iterations = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_foreground_select_options_get_property (GObject    *object,
+                                             guint       property_id,
+                                             GValue     *value,
+                                             GParamSpec *pspec)
+{
+  GimpForegroundSelectOptions *options = GIMP_FOREGROUND_SELECT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_DRAW_MODE:
+      g_value_set_enum (value, options->draw_mode);
+      break;
+
+    case PROP_PREVIEW_MODE:
+      g_value_set_enum (value, options->preview_mode);
+      break;
+
+    case PROP_STROKE_WIDTH:
+      g_value_set_int (value, options->stroke_width);
+      break;
+
+    case PROP_MASK_COLOR:
+      g_value_set_boxed (value, &options->mask_color);
+      break;
+
+    case PROP_ENGINE:
+      g_value_set_enum (value, options->engine);
+      break;
+
+     case PROP_LEVELS:
+      g_value_set_int (value, options->levels);
+      break;
+
+    case PROP_ACTIVE_LEVELS:
+      g_value_set_int (value, options->active_levels);
+      break;
+
+    case PROP_ITERATIONS:
+      g_value_set_int (value, options->iterations);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_foreground_select_options_reset_stroke_width (GtkWidget       *button,
+                                                   GimpToolOptions *tool_options)
+{
+  g_object_set (tool_options, "stroke-width", 10, NULL);
+}
+
+static gboolean
+gimp_foreground_select_options_sync_engine (GBinding     *binding,
+                                            const GValue *source_value,
+                                            GValue       *target_value,
+                                            gpointer      user_data)
+{
+  gint type = g_value_get_enum (source_value);
+
+  g_value_set_boolean (target_value,
+                       type == GPOINTER_TO_INT (user_data));
+
+  return TRUE;
+}
+
+GtkWidget *
+gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_selection_options_gui (tool_options);
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkWidget *frame;
+  GtkWidget *scale;
+  GtkWidget *combo;
+  GtkWidget *inner_vbox;
+  GtkWidget *antialias_toggle;
+
+  antialias_toggle = GIMP_SELECTION_OPTIONS (tool_options)->antialias_toggle;
+  gtk_widget_hide (antialias_toggle);
+
+  frame = gimp_prop_enum_radio_frame_new (config, "draw-mode", NULL,
+                                          0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /* stroke width */
+  scale = gimp_prop_spin_scale_new (config, "stroke-width", NULL,
+                                    1.0, 10.0, 2);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
+  gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), 1.7);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  button = gimp_icon_button_new (GIMP_ICON_RESET, NULL);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))),
+                                GIMP_ICON_RESET, GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_foreground_select_options_reset_stroke_width),
+                    tool_options);
+
+  gimp_help_set_help_data (button,
+                           _("Reset stroke width native size"), NULL);
+
+  /* preview mode */
+
+  frame = gimp_prop_enum_radio_frame_new (config, "preview-mode", NULL,
+                                          0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /*  mask color */
+  button = gimp_prop_color_button_new (config, "mask-color",
+                                       NULL,
+                                       128, 24,
+                                       GIMP_COLOR_AREA_SMALL_CHECKS);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), GIMP_CONTEXT (config));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /* engine */
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  combo = gimp_prop_enum_combo_box_new (config, "engine", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Engine"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
+
+  if (!gegl_has_operation ("gegl:matting-levin"))
+    gtk_widget_set_sensitive (combo, FALSE);
+  gtk_widget_show (combo);
+
+  inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), inner_vbox);
+  gtk_widget_show (inner_vbox);
+
+  /*  engine parameters  */
+  scale = gimp_prop_spin_scale_new (config, "levels", NULL,
+                                    1.0, 1.0, 0);
+  gtk_box_pack_start (GTK_BOX (inner_vbox), scale, FALSE, FALSE, 0);
+
+  g_object_bind_property_full (config, "engine",
+                               scale,  "visible",
+                               G_BINDING_SYNC_CREATE,
+                               gimp_foreground_select_options_sync_engine,
+                               NULL,
+                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_LEVIN),
+                               NULL);
+
+  scale = gimp_prop_spin_scale_new (config, "active-levels", NULL,
+                                    1.0, 1.0, 0);
+  gtk_box_pack_start (GTK_BOX (inner_vbox), scale, FALSE, FALSE, 0);
+
+  g_object_bind_property_full (config, "engine",
+                               scale,  "visible",
+                               G_BINDING_SYNC_CREATE,
+                               gimp_foreground_select_options_sync_engine,
+                               NULL,
+                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_LEVIN),
+                               NULL);
+
+  scale = gimp_prop_spin_scale_new (config, "iterations", NULL,
+                                    1.0, 1.0, 0);
+  gtk_box_pack_start (GTK_BOX (inner_vbox), scale, FALSE, FALSE, 0);
+
+  g_object_bind_property_full (config, "engine",
+                               scale,  "visible",
+                               G_BINDING_SYNC_CREATE,
+                               gimp_foreground_select_options_sync_engine,
+                               NULL,
+                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_GLOBAL),
+                               NULL);
+
+  return vbox;
+}
diff --git a/app/tools/gimpforegroundselectoptions.h b/app/tools/gimpforegroundselectoptions.h
new file mode 100644
index 0000000..e6cd1a9
--- /dev/null
+++ b/app/tools/gimpforegroundselectoptions.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef __GIMP_FOREGROUND_SELECT_OPTIONS_H__
+#define __GIMP_FOREGROUND_SELECT_OPTIONS_H__
+
+
+#include "gimpselectionoptions.h"
+
+
+#define GIMP_TYPE_FOREGROUND_SELECT_OPTIONS            (gimp_foreground_select_options_get_type ())
+#define GIMP_FOREGROUND_SELECT_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FOREGROUND_SELECT_OPTIONS, GimpForegroundSelectOptions))
+#define GIMP_FOREGROUND_SELECT_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FOREGROUND_SELECT_OPTIONS, GimpForegroundSelectOptionsClass))
+#define GIMP_IS_FOREGROUND_SELECT_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FOREGROUND_SELECT_OPTIONS))
+#define GIMP_IS_FOREGROUND_SELECT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FOREGROUND_SELECT_OPTIONS))
+#define GIMP_FOREGROUND_SELECT_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FOREGROUND_SELECT_OPTIONS, GimpForegroundSelectOptionsClass))
+
+
+typedef struct _GimpForegroundSelectOptions      GimpForegroundSelectOptions;
+typedef struct _GimpForegroundSelectOptionsClass GimpForegroundSelectOptionsClass;
+
+struct _GimpForegroundSelectOptions
+{
+  GimpSelectionOptions  parent_instance;
+
+  GimpMattingDrawMode    draw_mode;
+  GimpMattingPreviewMode preview_mode;
+  gint                   stroke_width;
+  GimpRGB                mask_color;
+  GimpMattingEngine      engine;
+  gint                   levels;
+  gint                   active_levels;
+  gint                   iterations;
+};
+
+struct _GimpForegroundSelectOptionsClass
+{
+  GimpSelectionOptionsClass  parent_class;
+};
+
+
+GType       gimp_foreground_select_options_get_type       (void) G_GNUC_CONST;
+
+GtkWidget * gimp_foreground_select_options_gui            (GimpToolOptions             *tool_options);
+
+
+
+#endif /* __GIMP_FOREGROUND_SELECT_OPTIONS_H__ */
+
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
new file mode 100644
index 0000000..480cff1
--- /dev/null
+++ b/app/tools/gimpforegroundselecttool.c
@@ -0,0 +1,1396 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpForegroundSelectTool
+ * Copyright (C) 2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-mask.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpdrawable-foreground-extract.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimpprogress.h"
+#include "core/gimpscanconvert.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpcanvasbufferpreview.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolgui.h"
+
+#include "gimpforegroundselecttool.h"
+#include "gimpforegroundselectoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+#define FAR_OUTSIDE -10000
+
+
+typedef struct _StrokeUndo StrokeUndo;
+
+struct _StrokeUndo
+{
+  GeglBuffer          *saved_trimap;
+  gint                 trimap_x;
+  gint                 trimap_y;
+  GimpMattingDrawMode  draw_mode;
+  gint                 stroke_width;
+};
+
+
+static void   gimp_foreground_select_tool_finalize       (GObject          *object);
+
+static gboolean  gimp_foreground_select_tool_initialize  (GimpTool         *tool,
+                                                          GimpDisplay      *display,
+                                                          GError          **error);
+static void   gimp_foreground_select_tool_control        (GimpTool         *tool,
+                                                          GimpToolAction    action,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_button_press   (GimpTool         *tool,
+                                                          const GimpCoords *coords,
+                                                          guint32           time,
+                                                          GdkModifierType   state,
+                                                          GimpButtonPressType press_type,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_button_release (GimpTool         *tool,
+                                                          const GimpCoords *coords,
+                                                          guint32           time,
+                                                          GdkModifierType   state,
+                                                          GimpButtonReleaseType release_type,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_motion         (GimpTool         *tool,
+                                                          const GimpCoords *coords,
+                                                          guint32           time,
+                                                          GdkModifierType   state,
+                                                          GimpDisplay      *display);
+static gboolean  gimp_foreground_select_tool_key_press   (GimpTool         *tool,
+                                                          GdkEventKey      *kevent,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_modifier_key   (GimpTool         *tool,
+                                                          GdkModifierType   key,
+                                                          gboolean          press,
+                                                          GdkModifierType   state,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_active_modifier_key
+                                                         (GimpTool         *tool,
+                                                          GdkModifierType   key,
+                                                          gboolean          press,
+                                                          GdkModifierType   state,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_oper_update    (GimpTool         *tool,
+                                                          const GimpCoords *coords,
+                                                          GdkModifierType   state,
+                                                          gboolean          proximity,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_cursor_update  (GimpTool         *tool,
+                                                          const GimpCoords *coords,
+                                                          GdkModifierType   state,
+                                                          GimpDisplay      *display);
+static const gchar * gimp_foreground_select_tool_can_undo
+                                                         (GimpTool         *tool,
+                                                          GimpDisplay      *display);
+static const gchar * gimp_foreground_select_tool_can_redo
+                                                         (GimpTool         *tool,
+                                                          GimpDisplay      *display);
+static gboolean   gimp_foreground_select_tool_undo       (GimpTool         *tool,
+                                                          GimpDisplay      *display);
+static gboolean   gimp_foreground_select_tool_redo       (GimpTool         *tool,
+                                                          GimpDisplay      *display);
+static void   gimp_foreground_select_tool_options_notify (GimpTool         *tool,
+                                                          GimpToolOptions  *options,
+                                                          const GParamSpec *pspec);
+
+static void   gimp_foreground_select_tool_draw           (GimpDrawTool     *draw_tool);
+
+static void   gimp_foreground_select_tool_confirm        (GimpPolygonSelectTool *poly_sel,
+                                                          GimpDisplay           *display);
+
+static void   gimp_foreground_select_tool_halt           (GimpForegroundSelectTool *fg_select);
+static void   gimp_foreground_select_tool_commit         (GimpForegroundSelectTool *fg_select);
+
+static void   gimp_foreground_select_tool_set_trimap     (GimpForegroundSelectTool *fg_select);
+static void   gimp_foreground_select_tool_set_preview    (GimpForegroundSelectTool *fg_select);
+static void   gimp_foreground_select_tool_preview        (GimpForegroundSelectTool *fg_select);
+
+static void   gimp_foreground_select_tool_stroke_paint   (GimpForegroundSelectTool *fg_select);
+static void   gimp_foreground_select_tool_cancel_paint   (GimpForegroundSelectTool *fg_select);
+
+static void   gimp_foreground_select_tool_response       (GimpToolGui              *gui,
+                                                          gint                      response_id,
+                                                          GimpForegroundSelectTool *fg_select);
+static void   gimp_foreground_select_tool_preview_toggled(GtkToggleButton          *button,
+                                                          GimpForegroundSelectTool *fg_select);
+
+static void   gimp_foreground_select_tool_update_gui     (GimpForegroundSelectTool *fg_select);
+
+static StrokeUndo * gimp_foreground_select_undo_new      (GeglBuffer               *trimap,
+                                                          GArray                   *stroke,
+                                                          GimpMattingDrawMode       draw_mode,
+                                                          gint                      stroke_width);
+static void         gimp_foreground_select_undo_pop      (StrokeUndo               *undo,
+                                                          GeglBuffer               *trimap);
+static void         gimp_foreground_select_undo_free     (StrokeUndo               *undo);
+
+
+G_DEFINE_TYPE (GimpForegroundSelectTool, gimp_foreground_select_tool,
+               GIMP_TYPE_POLYGON_SELECT_TOOL)
+
+#define parent_class gimp_foreground_select_tool_parent_class
+
+
+void
+gimp_foreground_select_tool_register (GimpToolRegisterCallback  callback,
+                                      gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_FOREGROUND_SELECT_TOOL,
+                GIMP_TYPE_FOREGROUND_SELECT_OPTIONS,
+                gimp_foreground_select_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-foreground-select-tool",
+                _("Foreground Select"),
+                _("Foreground Select Tool: Select a region containing foreground objects"),
+                N_("F_oreground Select"), NULL,
+                NULL, GIMP_HELP_TOOL_FOREGROUND_SELECT,
+                GIMP_ICON_TOOL_FOREGROUND_SELECT,
+                data);
+}
+
+static void
+gimp_foreground_select_tool_class_init (GimpForegroundSelectToolClass *klass)
+{
+  GObjectClass               *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass              *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass          *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+  GimpPolygonSelectToolClass *polygon_select_tool_class;
+
+  polygon_select_tool_class = GIMP_POLYGON_SELECT_TOOL_CLASS (klass);
+
+  object_class->finalize             = gimp_foreground_select_tool_finalize;
+
+  tool_class->initialize             = gimp_foreground_select_tool_initialize;
+  tool_class->control                = gimp_foreground_select_tool_control;
+  tool_class->button_press           = gimp_foreground_select_tool_button_press;
+  tool_class->button_release         = gimp_foreground_select_tool_button_release;
+  tool_class->motion                 = gimp_foreground_select_tool_motion;
+  tool_class->key_press              = gimp_foreground_select_tool_key_press;
+  tool_class->modifier_key           = gimp_foreground_select_tool_modifier_key;
+  tool_class->active_modifier_key    = gimp_foreground_select_tool_active_modifier_key;
+  tool_class->oper_update            = gimp_foreground_select_tool_oper_update;
+  tool_class->cursor_update          = gimp_foreground_select_tool_cursor_update;
+  tool_class->can_undo               = gimp_foreground_select_tool_can_undo;
+  tool_class->can_redo               = gimp_foreground_select_tool_can_redo;
+  tool_class->undo                   = gimp_foreground_select_tool_undo;
+  tool_class->redo                   = gimp_foreground_select_tool_redo;
+  tool_class->options_notify         = gimp_foreground_select_tool_options_notify;
+
+  draw_tool_class->draw              = gimp_foreground_select_tool_draw;
+
+  polygon_select_tool_class->confirm = gimp_foreground_select_tool_confirm;
+}
+
+static void
+gimp_foreground_select_tool_init (GimpForegroundSelectTool *fg_select)
+{
+  GimpTool *tool = GIMP_TOOL (fg_select);
+
+  gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
+  gimp_tool_control_set_scroll_lock (tool->control, FALSE);
+  gimp_tool_control_set_preserve    (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask  (tool->control,
+                                     GIMP_DIRTY_IMAGE_SIZE |
+                                     GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_precision   (tool->control,
+                                     GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_FREE_SELECT);
+
+  gimp_tool_control_set_action_size (tool->control,
+                                     "tools/tools-foreground-select-brush-size-set");
+
+  fg_select->state = MATTING_STATE_FREE_SELECT;
+  fg_select->grayscale_preview = NULL;
+}
+
+static void
+gimp_foreground_select_tool_finalize (GObject *object)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (object);
+
+  g_clear_object (&fg_select->gui);
+  fg_select->preview_toggle = NULL;
+
+  if (fg_select->stroke)
+    g_warning ("%s: stroke should be NULL at this point", G_STRLOC);
+
+  if (fg_select->mask)
+    g_warning ("%s: mask should be NULL at this point", G_STRLOC);
+
+  if (fg_select->trimap)
+    g_warning ("%s: mask should be NULL at this point", G_STRLOC);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_foreground_select_tool_initialize (GimpTool     *tool,
+                                        GimpDisplay  *display,
+                                        GError      **error)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  GimpGuiConfig            *config    = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage                *image     = gimp_display_get_image (display);
+  GimpDrawable             *drawable  = gimp_image_get_active_drawable (image);
+  GimpDisplayShell         *shell     = gimp_display_get_shell (display);
+
+  if (! drawable)
+    return FALSE;
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer is not visible."));
+      return FALSE;
+    }
+
+  tool->display = display;
+
+  /*  enable double click for the FreeSelectTool, because it may have been
+   *  disabled if the tool has switched to MATTING_STATE_PAINT_TRIMAP,
+   *  in gimp_foreground_select_tool_set_trimap().
+   */
+  gimp_tool_control_set_wants_double_click (tool->control, TRUE);
+
+  fg_select->state = MATTING_STATE_FREE_SELECT;
+
+  if (! fg_select->gui)
+    {
+      fg_select->gui =
+        gimp_tool_gui_new (tool->tool_info,
+                           NULL,
+                           _("Dialog for foreground select"),
+                           NULL, NULL,
+                           gtk_widget_get_screen (GTK_WIDGET (shell)),
+                           gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                           TRUE,
+
+                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                           _("_Select"), GTK_RESPONSE_APPLY,
+
+                           NULL);
+
+      gimp_tool_gui_set_auto_overlay (fg_select->gui, TRUE);
+
+      g_signal_connect (fg_select->gui, "response",
+                        G_CALLBACK (gimp_foreground_select_tool_response),
+                        fg_select);
+
+      fg_select->preview_toggle =
+        gtk_check_button_new_with_mnemonic (_("_Preview mask"));
+      gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (fg_select->gui)),
+                          fg_select->preview_toggle, FALSE, FALSE, 0);
+      gtk_widget_show (fg_select->preview_toggle);
+
+      g_signal_connect (fg_select->preview_toggle, "toggled",
+                        G_CALLBACK (gimp_foreground_select_tool_preview_toggled),
+                        fg_select);
+    }
+
+  gimp_tool_gui_set_description (fg_select->gui,
+                                 _("Select foreground pixels"));
+
+  gimp_tool_gui_set_response_sensitive (fg_select->gui, GTK_RESPONSE_APPLY,
+                                        FALSE);
+  gtk_widget_set_sensitive (fg_select->preview_toggle, FALSE);
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fg_select->preview_toggle),
+                                FALSE);
+
+  gimp_tool_gui_set_shell (fg_select->gui, shell);
+  gimp_tool_gui_set_viewable (fg_select->gui, GIMP_VIEWABLE (drawable));
+
+  gimp_tool_gui_show (fg_select->gui);
+
+  return TRUE;
+}
+
+static void
+gimp_foreground_select_tool_control (GimpTool       *tool,
+                                     GimpToolAction  action,
+                                     GimpDisplay    *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_foreground_select_tool_halt (fg_select);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_foreground_select_tool_commit (fg_select);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_foreground_select_tool_button_press (GimpTool            *tool,
+                                          const GimpCoords    *coords,
+                                          guint32              time,
+                                          GdkModifierType      state,
+                                          GimpButtonPressType  press_type,
+                                          GimpDisplay         *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  GimpDrawTool             *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+    }
+  else
+    {
+      GimpVector2 point = gimp_vector2_new (coords->x, coords->y);
+
+      gimp_draw_tool_pause (draw_tool);
+
+      if (gimp_draw_tool_is_active (draw_tool) && draw_tool->display != display)
+        gimp_draw_tool_stop (draw_tool);
+
+      gimp_tool_control_activate (tool->control);
+
+      fg_select->last_coords = *coords;
+
+      g_return_if_fail (fg_select->stroke == NULL);
+      fg_select->stroke = g_array_new (FALSE, FALSE, sizeof (GimpVector2));
+
+      g_array_append_val (fg_select->stroke, point);
+
+      if (! gimp_draw_tool_is_active (draw_tool))
+        gimp_draw_tool_start (draw_tool, display);
+
+      gimp_draw_tool_resume (draw_tool);
+    }
+}
+
+static void
+gimp_foreground_select_tool_button_release (GimpTool              *tool,
+                                            const GimpCoords      *coords,
+                                            guint32                time,
+                                            GdkModifierType        state,
+                                            GimpButtonReleaseType  release_type,
+                                            GimpDisplay           *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                      release_type, display);
+    }
+  else
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+      gimp_tool_control_halt (tool->control);
+
+      if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+        {
+          gimp_foreground_select_tool_cancel_paint (fg_select);
+        }
+      else
+        {
+          gimp_foreground_select_tool_stroke_paint (fg_select);
+
+          if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+            gimp_foreground_select_tool_preview (fg_select);
+          else
+            gimp_foreground_select_tool_set_trimap (fg_select);
+        }
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+}
+
+static void
+gimp_foreground_select_tool_motion (GimpTool         *tool,
+                                    const GimpCoords *coords,
+                                    guint32           time,
+                                    GdkModifierType   state,
+                                    GimpDisplay      *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
+                                              display);
+    }
+  else
+    {
+      GimpVector2 *last = &g_array_index (fg_select->stroke,
+                                          GimpVector2,
+                                          fg_select->stroke->len - 1);
+
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+      fg_select->last_coords = *coords;
+
+      if (last->x != (gint) coords->x || last->y != (gint) coords->y)
+        {
+          GimpVector2 point = gimp_vector2_new (coords->x, coords->y);
+
+          g_array_append_val (fg_select->stroke, point);
+        }
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+}
+
+static gboolean
+gimp_foreground_select_tool_key_press (GimpTool    *tool,
+                                       GdkEventKey *kevent,
+                                       GimpDisplay *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      return GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display);
+    }
+  else
+    {
+      if (display != tool->display)
+        return FALSE;
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Return:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_ISO_Enter:
+          if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+            gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fg_select->preview_toggle),
+                                          TRUE);
+          else
+            gimp_foreground_select_tool_response (fg_select->gui,
+                                                  GTK_RESPONSE_APPLY, fg_select);
+          return TRUE;
+
+        case GDK_KEY_Escape:
+          if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+            gimp_foreground_select_tool_response (fg_select->gui,
+                                                  GTK_RESPONSE_CANCEL, fg_select);
+          else
+            gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fg_select->preview_toggle),
+                                          FALSE);
+          return TRUE;
+
+        default:
+          return FALSE;
+        }
+    }
+}
+
+static void
+gimp_foreground_select_tool_modifier_key (GimpTool        *tool,
+                                          GdkModifierType  key,
+                                          gboolean         press,
+                                          GdkModifierType  state,
+                                          GimpDisplay     *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                    display);
+    }
+  else
+    {
+#if 0
+      if (key == gimp_get_toggle_behavior_mask ())
+        {
+          GimpForegroundSelectOptions *options;
+
+          options = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (tool);
+
+          g_object_set (options,
+                        "background", ! options->background,
+                        NULL);
+        }
+#endif
+    }
+}
+
+static void
+gimp_foreground_select_tool_active_modifier_key (GimpTool        *tool,
+                                                 GdkModifierType  key,
+                                                 gboolean         press,
+                                                 GdkModifierType  state,
+                                                 GimpDisplay     *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GIMP_TOOL_CLASS (parent_class)->active_modifier_key (tool, key, press,
+                                                           state, display);
+    }
+}
+
+static void
+gimp_foreground_select_tool_oper_update (GimpTool         *tool,
+                                         const GimpCoords *coords,
+                                         GdkModifierType   state,
+                                         gboolean          proximity,
+                                         GimpDisplay      *display)
+{
+  GimpForegroundSelectTool    *fg_select    = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  GimpForegroundSelectOptions *options;
+  const gchar                 *status_stage = NULL;
+  const gchar                 *status_mode  = NULL;
+
+  options = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (fg_select);
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      if (GIMP_SELECTION_TOOL (tool)->function == SELECTION_SELECT)
+        {
+          gint n_points;
+
+          gimp_polygon_select_tool_get_points (GIMP_POLYGON_SELECT_TOOL (tool),
+                                               NULL, &n_points);
+
+          if (n_points > 2)
+            {
+              status_mode = _("Roughly outline the object to extract");
+              status_stage = _("press Enter to refine.");
+            }
+          else
+            {
+              status_stage = _("Roughly outline the object to extract");
+            }
+        }
+    }
+  else
+    {
+      GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+      gimp_draw_tool_pause (draw_tool);
+
+      if (proximity)
+        {
+          fg_select->last_coords = *coords;
+        }
+      else
+        {
+          fg_select->last_coords.x = FAR_OUTSIDE;
+          fg_select->last_coords.y = FAR_OUTSIDE;
+        }
+
+      gimp_draw_tool_resume (draw_tool);
+
+      if (options->draw_mode == GIMP_MATTING_DRAW_MODE_FOREGROUND)
+        status_mode = _("Selecting foreground");
+      else if (options->draw_mode == GIMP_MATTING_DRAW_MODE_BACKGROUND)
+        status_mode = _("Selecting background");
+      else
+        status_mode = _("Selecting unknown");
+
+      if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+        status_stage = _("press Enter to preview.");
+      else
+        status_stage = _("press Escape to exit preview or Enter to apply.");
+    }
+
+  if (proximity && status_stage)
+    {
+      if (status_mode)
+        gimp_tool_replace_status (tool, display, "%s, %s", status_mode, status_stage);
+      else
+        gimp_tool_replace_status (tool, display, "%s", status_stage);
+    }
+}
+
+static void
+gimp_foreground_select_tool_cursor_update (GimpTool         *tool,
+                                           const GimpCoords *coords,
+                                           GdkModifierType   state,
+                                           GimpDisplay      *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+    {
+      switch (GIMP_SELECTION_TOOL (tool)->function)
+        {
+        case SELECTION_MOVE_MASK:
+        case SELECTION_MOVE:
+        case SELECTION_MOVE_COPY:
+        case SELECTION_ANCHOR:
+          return;
+        default:
+          break;
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static const gchar *
+gimp_foreground_select_tool_can_undo (GimpTool    *tool,
+                                      GimpDisplay *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->undo_stack)
+    {
+      StrokeUndo  *undo = fg_select->undo_stack->data;
+      const gchar *desc;
+
+      if (gimp_enum_get_value (GIMP_TYPE_MATTING_DRAW_MODE, undo->draw_mode,
+                               NULL, NULL, &desc, NULL))
+        {
+          return desc;
+        }
+    }
+
+  return NULL;
+}
+
+static const gchar *
+gimp_foreground_select_tool_can_redo (GimpTool    *tool,
+                                      GimpDisplay *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+
+  if (fg_select->redo_stack)
+    {
+      StrokeUndo  *undo = fg_select->redo_stack->data;
+      const gchar *desc;
+
+      if (gimp_enum_get_value (GIMP_TYPE_MATTING_DRAW_MODE, undo->draw_mode,
+                               NULL, NULL, &desc, NULL))
+        {
+          return desc;
+        }
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_foreground_select_tool_undo (GimpTool    *tool,
+                                  GimpDisplay *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  StrokeUndo               *undo      = fg_select->undo_stack->data;
+
+  gimp_foreground_select_undo_pop (undo, fg_select->trimap);
+
+  fg_select->undo_stack = g_list_remove (fg_select->undo_stack, undo);
+  fg_select->redo_stack = g_list_prepend (fg_select->redo_stack, undo);
+
+  if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+    gimp_foreground_select_tool_preview (fg_select);
+  else
+    gimp_foreground_select_tool_set_trimap (fg_select);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_foreground_select_tool_redo (GimpTool    *tool,
+                                  GimpDisplay *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  StrokeUndo               *undo      = fg_select->redo_stack->data;
+
+  gimp_foreground_select_undo_pop (undo, fg_select->trimap);
+
+  fg_select->redo_stack = g_list_remove (fg_select->redo_stack, undo);
+  fg_select->undo_stack = g_list_prepend (fg_select->undo_stack, undo);
+
+  if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+    gimp_foreground_select_tool_preview (fg_select);
+  else
+    gimp_foreground_select_tool_set_trimap (fg_select);
+
+  return TRUE;
+}
+
+static void
+gimp_foreground_select_tool_options_notify (GimpTool         *tool,
+                                            GimpToolOptions  *options,
+                                            const GParamSpec *pspec)
+{
+  GimpForegroundSelectTool    *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  GimpForegroundSelectOptions *fg_options;
+
+  fg_options = GIMP_FOREGROUND_SELECT_OPTIONS (options);
+
+  if (! tool->display)
+    return;
+
+  if (! strcmp (pspec->name, "mask-color") ||
+      ! strcmp (pspec->name, "preview-mode"))
+    {
+      if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+        {
+          gimp_foreground_select_tool_set_trimap (fg_select);
+        }
+      else if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+        {
+          gimp_foreground_select_tool_set_preview (fg_select);
+        }
+    }
+  else if (! strcmp (pspec->name, "engine"))
+    {
+      if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+        {
+          gimp_foreground_select_tool_preview (fg_select);
+        }
+    }
+  else if (! strcmp (pspec->name, "iterations"))
+    {
+      if (fg_options->engine == GIMP_MATTING_ENGINE_GLOBAL &&
+          fg_select->state   == MATTING_STATE_PREVIEW_MASK)
+        {
+          gimp_foreground_select_tool_preview (fg_select);
+        }
+    }
+  else if (! strcmp (pspec->name, "levels") ||
+           ! strcmp (pspec->name, "active-levels"))
+    {
+      if (fg_options->engine == GIMP_MATTING_ENGINE_LEVIN &&
+          fg_select->state   == MATTING_STATE_PREVIEW_MASK)
+        {
+          gimp_foreground_select_tool_preview (fg_select);
+        }
+    }
+}
+
+static void
+gimp_foreground_select_tool_get_area (GeglBuffer *mask,
+                                      gint       *x1,
+                                      gint       *y1,
+                                      gint       *x2,
+                                      gint       *y2)
+{
+  gint width;
+  gint height;
+
+  gimp_gegl_mask_bounds (mask, x1, y1, x2, y2);
+
+  width  = *x2 - *x1;
+  height = *y2 - *y1;
+
+  *x1 = MAX (*x1 - width  / 2, 0);
+  *y1 = MAX (*y1 - height / 2, 0);
+  *x2 = MIN (*x2 + width  / 2, gimp_item_get_width  (GIMP_ITEM (mask)));
+  *y2 = MIN (*y2 + height / 2, gimp_item_get_height (GIMP_ITEM (mask)));
+}
+
+static void
+gimp_foreground_select_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpTool                    *tool      = GIMP_TOOL (draw_tool);
+  GimpForegroundSelectTool    *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
+  GimpForegroundSelectOptions *options;
+
+  options = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (tool);
+
+  if (fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+      return;
+    }
+  else
+    {
+      gint    x      = fg_select->last_coords.x;
+      gint    y      = fg_select->last_coords.y;
+      gdouble radius = options->stroke_width / 2.0f;
+
+      if (fg_select->stroke)
+        {
+          GimpDisplayShell *shell = gimp_display_get_shell (draw_tool->display);
+
+          gimp_draw_tool_add_pen (draw_tool,
+                                  (const GimpVector2 *) fg_select->stroke->data,
+                                  fg_select->stroke->len,
+                                  GIMP_CONTEXT (options),
+                                  GIMP_ACTIVE_COLOR_FOREGROUND,
+                                  options->stroke_width * shell->scale_y);
+        }
+
+      /*  warn if the user is drawing outside of the working area  */
+      if (FALSE)
+        {
+          gint x1, y1;
+          gint x2, y2;
+
+          gimp_foreground_select_tool_get_area (fg_select->mask,
+                                                &x1, &y1, &x2, &y2);
+
+          if (x < x1 + radius || x > x2 - radius ||
+              y < y1 + radius || y > y2 - radius)
+            {
+              gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                            x1, y1,
+                                            x2 - x1, y2 - y1);
+            }
+        }
+
+      if (x > FAR_OUTSIDE && y > FAR_OUTSIDE)
+        gimp_draw_tool_add_arc (draw_tool, FALSE,
+                                x - radius, y - radius,
+                                2 * radius, 2 * radius,
+                                0.0, 2.0 * G_PI);
+
+      if (fg_select->grayscale_preview)
+        gimp_draw_tool_add_preview (draw_tool, fg_select->grayscale_preview);
+    }
+}
+
+static void
+gimp_foreground_select_tool_confirm (GimpPolygonSelectTool *poly_sel,
+                                     GimpDisplay           *display)
+{
+  GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (poly_sel);
+  GimpImage                *image     = gimp_display_get_image (display);
+  GimpDrawable             *drawable  = gimp_image_get_active_drawable (image);
+  GimpItem                 *item      = GIMP_ITEM (drawable);
+
+  if (drawable && fg_select->state == MATTING_STATE_FREE_SELECT)
+    {
+      GimpScanConvert   *scan_convert = gimp_scan_convert_new ();
+      const GimpVector2 *points;
+      gint               n_points;
+
+      gimp_polygon_select_tool_get_points (poly_sel, &points, &n_points);
+
+      gimp_scan_convert_add_polyline (scan_convert, n_points, points, TRUE);
+
+      fg_select->trimap =
+        gegl_buffer_new (GEGL_RECTANGLE (gimp_item_get_offset_x (item),
+                                         gimp_item_get_offset_y (item),
+                                         gimp_item_get_width    (item),
+                                         gimp_item_get_height   (item)),
+                         gimp_image_get_mask_format (image));
+
+      gimp_scan_convert_render_value (scan_convert, fg_select->trimap,
+                                      0, 0, 0.5);
+      gimp_scan_convert_free (scan_convert);
+
+      fg_select->grayscale_preview =
+          gimp_canvas_buffer_preview_new (gimp_display_get_shell (display),
+                                          fg_select->trimap);
+
+      gimp_foreground_select_tool_set_trimap (fg_select);
+    }
+}
+
+static void
+gimp_foreground_select_tool_halt (GimpForegroundSelectTool *fg_select)
+{
+  GimpTool     *tool = GIMP_TOOL (fg_select);
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (fg_select);
+
+  if (draw_tool->preview)
+    {
+      gimp_draw_tool_remove_preview (draw_tool, fg_select->grayscale_preview);
+    }
+
+  g_clear_object (&fg_select->grayscale_preview);
+  g_clear_object (&fg_select->trimap);
+  g_clear_object (&fg_select->mask);
+
+  if (fg_select->undo_stack)
+    {
+      g_list_free_full (fg_select->undo_stack,
+                        (GDestroyNotify) gimp_foreground_select_undo_free);
+      fg_select->undo_stack = NULL;
+    }
+
+  if (fg_select->redo_stack)
+    {
+      g_list_free_full (fg_select->redo_stack,
+                        (GDestroyNotify) gimp_foreground_select_undo_free);
+      fg_select->redo_stack = NULL;
+    }
+
+  if (tool->display)
+    gimp_display_shell_set_mask (gimp_display_get_shell (tool->display),
+                                 NULL, 0, 0, NULL, FALSE);
+
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_FREE_SELECT);
+  gimp_tool_control_set_toggle_tool_cursor (tool->control,
+                                            GIMP_TOOL_CURSOR_FREE_SELECT);
+
+  gimp_tool_control_set_toggled (tool->control, FALSE);
+
+  /*  set precision to SUBPIXEL, because it may have been changed to
+   *  PIXEL_CENTER if the tool has switched to MATTING_STATE_PAINT_TRIMAP,
+   *  in gimp_foreground_select_tool_set_trimap().
+   */
+  gimp_tool_control_set_precision (tool->control,
+                                   GIMP_CURSOR_PRECISION_SUBPIXEL);
+
+  fg_select->state = MATTING_STATE_FREE_SELECT;
+
+  /*  update the undo actions / menu items  */
+  if (tool->display)
+    gimp_image_flush (gimp_display_get_image (tool->display));
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+
+  if (fg_select->gui)
+    gimp_tool_gui_hide (fg_select->gui);
+}
+
+static void
+gimp_foreground_select_tool_commit (GimpForegroundSelectTool *fg_select)
+{
+  GimpTool             *tool    = GIMP_TOOL (fg_select);
+  GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (fg_select);
+
+  if (tool->display && fg_select->state != MATTING_STATE_FREE_SELECT)
+    {
+      GimpImage *image = gimp_display_get_image (tool->display);
+
+      if (fg_select->state != MATTING_STATE_PREVIEW_MASK)
+        gimp_foreground_select_tool_preview (fg_select);
+
+      gimp_channel_select_buffer (gimp_image_get_mask (image),
+                                  C_("command", "Foreground Select"),
+                                  fg_select->mask,
+                                  0, /* x offset */
+                                  0, /* y offset */
+                                  options->operation,
+                                  options->feather,
+                                  options->feather_radius,
+                                  options->feather_radius);
+
+      gimp_image_flush (image);
+    }
+}
+
+static void
+gimp_foreground_select_tool_set_trimap (GimpForegroundSelectTool *fg_select)
+{
+  GimpTool                    *tool = GIMP_TOOL (fg_select);
+  GimpForegroundSelectOptions *options;
+
+  g_return_if_fail (fg_select->trimap != NULL);
+
+  options = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (tool);
+
+  gimp_polygon_select_tool_halt (GIMP_POLYGON_SELECT_TOOL (fg_select));
+
+  if (options->preview_mode == GIMP_MATTING_PREVIEW_MODE_ON_COLOR)
+    {
+      if (fg_select->grayscale_preview)
+        gimp_canvas_item_set_visible (fg_select->grayscale_preview, FALSE);
+
+      gimp_display_shell_set_mask (gimp_display_get_shell (tool->display),
+                                   fg_select->trimap, 0, 0,
+                                   &options->mask_color, TRUE);
+    }
+  else
+    {
+      gimp_display_shell_set_mask (gimp_display_get_shell (tool->display),
+                                   NULL, 0, 0, NULL, FALSE);
+
+      if (fg_select->grayscale_preview)
+        {
+          g_object_set (fg_select->grayscale_preview, "buffer",
+                        fg_select->trimap, NULL);
+
+          gimp_canvas_item_set_visible (fg_select->grayscale_preview, TRUE);
+        }
+    }
+
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_PAINTBRUSH);
+  gimp_tool_control_set_toggle_tool_cursor (tool->control,
+                                            GIMP_TOOL_CURSOR_PAINTBRUSH);
+
+  gimp_tool_control_set_toggled (tool->control, FALSE);
+
+  /* disable double click in paint trimap state */
+  gimp_tool_control_set_wants_double_click (tool->control, FALSE);
+
+  /* set precision to PIXEL_CENTER in paint trimap state */
+  gimp_tool_control_set_precision (tool->control,
+                                   GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+
+  fg_select->state = MATTING_STATE_PAINT_TRIMAP;
+
+  gimp_foreground_select_tool_update_gui (fg_select);
+}
+
+static void
+gimp_foreground_select_tool_set_preview (GimpForegroundSelectTool *fg_select)
+{
+
+  GimpTool                    *tool = GIMP_TOOL (fg_select);
+  GimpForegroundSelectOptions *options;
+
+  g_return_if_fail (fg_select->mask != NULL);
+
+  options = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (tool);
+
+  if (options->preview_mode == GIMP_MATTING_PREVIEW_MODE_ON_COLOR)
+    {
+      if (fg_select->grayscale_preview)
+        gimp_canvas_item_set_visible (fg_select->grayscale_preview, FALSE);
+
+      gimp_display_shell_set_mask (gimp_display_get_shell (tool->display),
+                                   fg_select->mask, 0, 0,
+                                   &options->mask_color, TRUE);
+    }
+  else
+    {
+      gimp_display_shell_set_mask (gimp_display_get_shell (tool->display),
+                                   NULL, 0, 0, NULL, FALSE);
+
+      if (fg_select->grayscale_preview)
+        {
+          g_object_set (fg_select->grayscale_preview, "buffer",
+                    fg_select->mask, NULL);
+          gimp_canvas_item_set_visible (fg_select->grayscale_preview, TRUE);
+        }
+    }
+
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_PAINTBRUSH);
+  gimp_tool_control_set_toggle_tool_cursor (tool->control,
+                                            GIMP_TOOL_CURSOR_PAINTBRUSH);
+
+  gimp_tool_control_set_toggled (tool->control, FALSE);
+
+  fg_select->state = MATTING_STATE_PREVIEW_MASK;
+
+  gimp_foreground_select_tool_update_gui (fg_select);
+}
+
+static void
+gimp_foreground_select_tool_preview (GimpForegroundSelectTool *fg_select)
+{
+  GimpTool                    *tool     = GIMP_TOOL (fg_select);
+  GimpForegroundSelectOptions *options;
+  GimpImage                   *image    = gimp_display_get_image (tool->display);
+  GimpDrawable                *drawable = gimp_image_get_active_drawable (image);
+
+  options  = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (tool);
+
+  g_clear_object (&fg_select->mask);
+
+  fg_select->mask = gimp_drawable_foreground_extract (drawable,
+                                                      options->engine,
+                                                      options->iterations,
+                                                      options->levels,
+                                                      options->active_levels,
+                                                      fg_select->trimap,
+                                                      GIMP_PROGRESS (fg_select));
+
+  gimp_foreground_select_tool_set_preview (fg_select);
+}
+
+static void
+gimp_foreground_select_tool_stroke_paint (GimpForegroundSelectTool *fg_select)
+{
+  GimpForegroundSelectOptions *options;
+  GimpScanConvert             *scan_convert;
+  StrokeUndo                  *undo;
+  gint                         width;
+  gdouble                      opacity;
+
+  options = GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS (fg_select);
+
+  g_return_if_fail (fg_select->stroke != NULL);
+
+  width = ROUND ((gdouble) options->stroke_width);
+
+  if (fg_select->redo_stack)
+    {
+      g_list_free_full (fg_select->redo_stack,
+                        (GDestroyNotify) gimp_foreground_select_undo_free);
+      fg_select->redo_stack = NULL;
+    }
+
+  undo = gimp_foreground_select_undo_new (fg_select->trimap,
+                                          fg_select->stroke,
+                                          options->draw_mode, width);
+  if (! undo)
+    {
+      g_array_free (fg_select->stroke, TRUE);
+      fg_select->stroke = NULL;
+      return;
+    }
+
+  fg_select->undo_stack = g_list_prepend (fg_select->undo_stack, undo);
+
+  scan_convert = gimp_scan_convert_new ();
+
+  if (fg_select->stroke->len == 1)
+    {
+      GimpVector2 points[2];
+
+      points[0] = points[1] = ((GimpVector2 *) fg_select->stroke->data)[0];
+
+      points[1].x += 0.01;
+      points[1].y += 0.01;
+
+      gimp_scan_convert_add_polyline (scan_convert, 2, points, FALSE);
+    }
+  else
+    {
+      gimp_scan_convert_add_polyline (scan_convert,
+                                      fg_select->stroke->len,
+                                      (GimpVector2 *) fg_select->stroke->data,
+                                      FALSE);
+    }
+
+  gimp_scan_convert_stroke (scan_convert,
+                            width,
+                            GIMP_JOIN_ROUND, GIMP_CAP_ROUND, 10.0,
+                            0.0, NULL);
+
+  if (options->draw_mode == GIMP_MATTING_DRAW_MODE_FOREGROUND)
+    opacity = 1.0;
+  else if (options->draw_mode == GIMP_MATTING_DRAW_MODE_BACKGROUND)
+    opacity = 0.0;
+  else
+    opacity = 0.5;
+
+  gimp_scan_convert_compose_value (scan_convert, fg_select->trimap,
+                                   0, 0,
+                                   opacity);
+
+  gimp_scan_convert_free (scan_convert);
+
+  g_array_free (fg_select->stroke, TRUE);
+  fg_select->stroke = NULL;
+
+  /*  update the undo actions / menu items  */
+  gimp_image_flush (gimp_display_get_image (GIMP_TOOL (fg_select)->display));
+}
+
+static void
+gimp_foreground_select_tool_cancel_paint (GimpForegroundSelectTool *fg_select)
+{
+  g_return_if_fail (fg_select->stroke != NULL);
+
+  g_array_free (fg_select->stroke, TRUE);
+  fg_select->stroke = NULL;
+}
+
+static void
+gimp_foreground_select_tool_response (GimpToolGui              *gui,
+                                      gint                      response_id,
+                                      GimpForegroundSelectTool *fg_select)
+{
+  GimpTool *tool = GIMP_TOOL (fg_select);
+
+  switch (response_id)
+    {
+    case GTK_RESPONSE_APPLY:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+      break;
+
+    default:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      break;
+    }
+}
+
+static void
+gimp_foreground_select_tool_preview_toggled (GtkToggleButton          *button,
+                                             GimpForegroundSelectTool *fg_select)
+{
+  if (fg_select->state != MATTING_STATE_FREE_SELECT)
+    {
+      if (gtk_toggle_button_get_active (button))
+        {
+          if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+            gimp_foreground_select_tool_preview (fg_select);
+        }
+      else
+        {
+          if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+            gimp_foreground_select_tool_set_trimap (fg_select);
+        }
+    }
+}
+
+static void
+gimp_foreground_select_tool_update_gui (GimpForegroundSelectTool *fg_select)
+{
+  if (fg_select->state == MATTING_STATE_PAINT_TRIMAP)
+    {
+      gimp_tool_gui_set_description (fg_select->gui, _("Paint mask"));
+    }
+  else if (fg_select->state == MATTING_STATE_PREVIEW_MASK)
+    {
+      gimp_tool_gui_set_description (fg_select->gui, _("Preview"));
+    }
+
+  gimp_tool_gui_set_response_sensitive (fg_select->gui, GTK_RESPONSE_APPLY,
+                                        TRUE);
+  gtk_widget_set_sensitive (fg_select->preview_toggle, TRUE);
+}
+
+static StrokeUndo *
+gimp_foreground_select_undo_new (GeglBuffer          *trimap,
+                                 GArray              *stroke,
+                                 GimpMattingDrawMode draw_mode,
+                                 gint                stroke_width)
+
+{
+  StrokeUndo          *undo;
+  const GeglRectangle *extent;
+  gint                 x1, y1, x2, y2;
+  gint                 width, height;
+  gint                 i;
+
+  extent = gegl_buffer_get_extent (trimap);
+
+  x1 = G_MAXINT;
+  y1 = G_MAXINT;
+  x2 = G_MININT;
+  y2 = G_MININT;
+
+  for (i = 0; i < stroke->len; i++)
+    {
+      GimpVector2 *point = &g_array_index (stroke, GimpVector2, i);
+
+      x1 = MIN (x1, floor (point->x));
+      y1 = MIN (y1, floor (point->y));
+      x2 = MAX (x2, ceil (point->x));
+      y2 = MAX (y2, ceil (point->y));
+    }
+
+  x1 -= (stroke_width + 1) / 2;
+  y1 -= (stroke_width + 1) / 2;
+  x2 += (stroke_width + 1) / 2;
+  y2 += (stroke_width + 1) / 2;
+
+  x1 = MAX (x1, extent->x);
+  y1 = MAX (y1, extent->y);
+  x2 = MIN (x2, extent->x + extent->width);
+  y2 = MIN (y2, extent->x + extent->height);
+
+  width  = x2 - x1;
+  height = y2 - y1;
+
+  if (width <= 0 || height <= 0)
+    return NULL;
+
+  undo = g_slice_new0 (StrokeUndo);
+  undo->saved_trimap = gegl_buffer_new (GEGL_RECTANGLE (x1, y1, width, height),
+                                        gegl_buffer_get_format (trimap));
+
+  gimp_gegl_buffer_copy (
+    trimap,             GEGL_RECTANGLE (x1, y1, width, height),
+    GEGL_ABYSS_NONE,
+    undo->saved_trimap, NULL);
+
+  undo->trimap_x = x1;
+  undo->trimap_y = y1;
+
+  undo->draw_mode    = draw_mode;
+  undo->stroke_width = stroke_width;
+
+  return undo;
+}
+
+static void
+gimp_foreground_select_undo_pop (StrokeUndo *undo,
+                                 GeglBuffer *trimap)
+{
+  GeglBuffer *buffer;
+  gint        width, height;
+
+  buffer = gimp_gegl_buffer_dup (undo->saved_trimap);
+
+  width  = gegl_buffer_get_width  (buffer);
+  height = gegl_buffer_get_height (buffer);
+
+  gimp_gegl_buffer_copy (trimap,
+                         GEGL_RECTANGLE (undo->trimap_x, undo->trimap_y,
+                                         width, height),
+                         GEGL_ABYSS_NONE,
+                         undo->saved_trimap, NULL);
+
+  gimp_gegl_buffer_copy (buffer,
+                         GEGL_RECTANGLE (undo->trimap_x, undo->trimap_y,
+                                         width, height),
+                         GEGL_ABYSS_NONE,
+                         trimap, NULL);
+
+  g_object_unref (buffer);
+}
+
+static void
+gimp_foreground_select_undo_free (StrokeUndo *undo)
+{
+  g_clear_object (&undo->saved_trimap);
+
+  g_slice_free (StrokeUndo, undo);
+}
diff --git a/app/tools/gimpforegroundselecttool.h b/app/tools/gimpforegroundselecttool.h
new file mode 100644
index 0000000..648652c
--- /dev/null
+++ b/app/tools/gimpforegroundselecttool.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FOREGROUND_SELECT_TOOL_H__
+#define __GIMP_FOREGROUND_SELECT_TOOL_H__
+
+
+#include "gimppolygonselecttool.h"
+
+
+typedef enum
+{
+  MATTING_STATE_FREE_SELECT = 0,
+  MATTING_STATE_PAINT_TRIMAP,
+  MATTING_STATE_PREVIEW_MASK,
+} MattingState;
+
+
+#define GIMP_TYPE_FOREGROUND_SELECT_TOOL            (gimp_foreground_select_tool_get_type ())
+#define GIMP_FOREGROUND_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FOREGROUND_SELECT_TOOL, GimpForegroundSelectTool))
+#define GIMP_FOREGROUND_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FOREGROUND_SELECT_TOOL, GimpForegroundSelectToolClass))
+#define GIMP_IS_FOREGROUND_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FOREGROUND_SELECT_TOOL))
+#define GIMP_IS_FOREGROUND_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FOREGROUND_SELECT_TOOL))
+#define GIMP_FOREGROUND_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FOREGROUND_SELECT_TOOL, GimpForegroundSelectToolClass))
+
+#define GIMP_FOREGROUND_SELECT_TOOL_GET_OPTIONS(t)  (GIMP_FOREGROUND_SELECT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpForegroundSelectTool      GimpForegroundSelectTool;
+typedef struct _GimpForegroundSelectToolClass GimpForegroundSelectToolClass;
+
+struct _GimpForegroundSelectTool
+{
+  GimpPolygonSelectTool  parent_instance;
+
+  MattingState           state;
+
+  GimpCoords             last_coords;
+  GArray                *stroke;
+  GeglBuffer            *trimap;
+  GeglBuffer            *mask;
+
+  GList                 *undo_stack;
+  GList                 *redo_stack;
+
+  GimpToolGui           *gui;
+  GtkWidget             *preview_toggle;
+
+  GimpCanvasItem        *grayscale_preview;
+};
+
+struct _GimpForegroundSelectToolClass
+{
+  GimpPolygonSelectToolClass  parent_class;
+};
+
+
+void    gimp_foreground_select_tool_register (GimpToolRegisterCallback  callback,
+                                              gpointer                  data);
+
+GType   gimp_foreground_select_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_FOREGROUND_SELECT_TOOL_H__  */
diff --git a/app/tools/gimpforegroundselecttoolundo.c b/app/tools/gimpforegroundselecttoolundo.c
new file mode 100644
index 0000000..381dc0b
--- /dev/null
+++ b/app/tools/gimpforegroundselecttoolundo.c
@@ -0,0 +1,168 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#if 0
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "tools-types.h"
+
+#include "gimpforegroundselecttool.h"
+#include "gimpforegroundselecttoolundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FOREGROUND_SELECT_TOOL
+};
+
+
+static void   gimp_foreground_select_tool_undo_constructed  (GObject             *object);
+static void   gimp_foreground_select_tool_undo_set_property (GObject             *object,
+                                                             guint                property_id,
+                                                             const GValue        *value,
+                                                             GParamSpec          *pspec);
+static void   gimp_foreground_select_tool_undo_get_property (GObject             *object,
+                                                             guint                property_id,
+                                                             GValue              *value,
+                                                             GParamSpec          *pspec);
+
+static void   gimp_foreground_select_tool_undo_pop          (GimpUndo            *undo,
+                                                             GimpUndoMode         undo_mode,
+                                                             GimpUndoAccumulator *accum);
+static void   gimp_foreground_select_tool_undo_free         (GimpUndo            *undo,
+                                                             GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpForegroundSelectToolUndo, gimp_foreground_select_tool_undo,
+               GIMP_TYPE_UNDO)
+
+#define parent_class gimp_foreground_select_tool_undo_parent_class
+
+
+static void
+gimp_foreground_select_tool_undo_class_init (GimpForegroundSelectToolUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed  = gimp_foreground_select_tool_undo_constructed;
+  object_class->set_property = gimp_foreground_select_tool_undo_set_property;
+  object_class->get_property = gimp_foreground_select_tool_undo_get_property;
+
+  undo_class->pop            = gimp_foreground_select_tool_undo_pop;
+  undo_class->free           = gimp_foreground_select_tool_undo_free;
+
+  g_object_class_install_property (object_class, PROP_FOREGROUND_SELECT_TOOL,
+                                   g_param_spec_object ("foreground-select-tool",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_FOREGROUND_SELECT_TOOL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_foreground_select_tool_undo_init (GimpForegroundSelectToolUndo *undo)
+{
+}
+
+static void
+gimp_foreground_select_tool_undo_constructed (GObject *object)
+{
+  GimpForegroundSelectToolUndo *fg_select_tool_undo;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  fg_select_tool_undo = GIMP_FOREGROUND_SELECT_TOOL_UNDO (object);
+
+  gimp_assert (GIMP_IS_FOREGROUND_SELECT_TOOL (fg_select_tool_undo->foreground_select_tool));
+
+  g_object_add_weak_pointer (G_OBJECT (fg_select_tool_undo->foreground_select_tool),
+                             (gpointer) &fg_select_tool_undo->foreground_select_tool);
+}
+
+static void
+gimp_foreground_select_tool_undo_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec)
+{
+  GimpForegroundSelectToolUndo *fg_select_tool_undo =
+    GIMP_FOREGROUND_SELECT_TOOL_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_FOREGROUND_SELECT_TOOL:
+      fg_select_tool_undo->foreground_select_tool = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_foreground_select_tool_undo_get_property (GObject    *object,
+                                               guint       property_id,
+                                               GValue     *value,
+                                               GParamSpec *pspec)
+{
+  GimpForegroundSelectToolUndo *fg_select_tool_undo =
+    GIMP_FOREGROUND_SELECT_TOOL_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_FOREGROUND_SELECT_TOOL:
+      g_value_set_object (value, fg_select_tool_undo->foreground_select_tool);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_foreground_select_tool_undo_pop (GimpUndo              *undo,
+                                      GimpUndoMode           undo_mode,
+                                      GimpUndoAccumulator   *accum)
+{
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+}
+
+static void
+gimp_foreground_select_tool_undo_free (GimpUndo     *undo,
+                                       GimpUndoMode  undo_mode)
+{
+  GimpForegroundSelectToolUndo *fg_select_tool_undo = GIMP_FOREGROUND_SELECT_TOOL_UNDO (undo);
+
+  if (fg_select_tool_undo->foreground_select_tool)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (fg_select_tool_undo->foreground_select_tool),
+                                    (gpointer) &fg_select_tool_undo->foreground_select_tool);
+      fg_select_tool_undo->foreground_select_tool = NULL;
+    }
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
+
+#endif
diff --git a/app/tools/gimpforegroundselecttoolundo.h b/app/tools/gimpforegroundselecttoolundo.h
new file mode 100644
index 0000000..63477f8
--- /dev/null
+++ b/app/tools/gimpforegroundselecttoolundo.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#if 0
+
+#ifndef __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__
+#define __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__
+
+
+#include "core/gimpundo.h"
+
+
+#define GIMP_TYPE_FOREGROUND_SELECT_TOOL_UNDO            (gimp_foreground_select_tool_undo_get_type ())
+#define GIMP_FOREGROUND_SELECT_TOOL_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FOREGROUND_SELECT_TOOL_UNDO, GimpForegroundSelectToolUndo))
+#define GIMP_FOREGROUND_SELECT_TOOL_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FOREGROUND_SELECT_TOOL_UNDO, GimpForegroundSelectToolUndoClass))
+#define GIMP_IS_FOREGROUND_SELECT_TOOL_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FOREGROUND_SELECT_TOOL_UNDO))
+#define GIMP_IS_FOREGROUND_SELECT_TOOL_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FOREGROUND_SELECT_TOOL_UNDO))
+#define GIMP_FOREGROUND_SELECT_TOOL_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FOREGROUND_SELECT_TOOL_UNDO, GimpForegroundSelectToolUndoClass))
+
+
+typedef struct _GimpForegroundSelectToolUndo      GimpForegroundSelectToolUndo;
+typedef struct _GimpForegroundSelectToolUndoClass GimpForegroundSelectToolUndoClass;
+
+struct _GimpForegroundSelectToolUndo
+{
+  GimpUndo                  parent_instance;
+
+  GimpForegroundSelectTool *foreground_select_tool;
+};
+
+struct _GimpForegroundSelectToolUndoClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType   gimp_foreground_select_tool_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__ */
+
+#endif
diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c
new file mode 100644
index 0000000..c97096f
--- /dev/null
+++ b/app/tools/gimpfreeselecttool.c
@@ -0,0 +1,355 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Major improvement to support polygonal segments
+ * Copyright (C) 2008 Martin Nordholts
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-floating-selection.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolpolygon.h"
+
+#include "gimpfreeselecttool.h"
+#include "gimpselectionoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpFreeSelectToolPrivate
+{
+  gboolean        started;
+  gboolean        changed;
+
+  /* The selection operation active when the tool was started */
+  GimpChannelOps  operation_at_start;
+};
+
+
+static void       gimp_free_select_tool_control         (GimpTool              *tool,
+                                                         GimpToolAction         action,
+                                                         GimpDisplay           *display);
+static void       gimp_free_select_tool_button_press    (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpButtonPressType    press_type,
+                                                         GimpDisplay           *display);
+static void       gimp_free_select_tool_button_release  (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpButtonReleaseType  release_type,
+                                                         GimpDisplay           *display);
+static void       gimp_free_select_tool_options_notify  (GimpTool              *tool,
+                                                         GimpToolOptions       *options,
+                                                         const GParamSpec      *pspec);
+
+static gboolean   gimp_free_select_tool_have_selection  (GimpSelectionTool     *sel_tool,
+                                                         GimpDisplay           *display);
+
+static void       gimp_free_select_tool_change_complete (GimpPolygonSelectTool *poly_sel,
+                                                         GimpDisplay           *display);
+
+static void       gimp_free_select_tool_commit          (GimpFreeSelectTool    *free_sel,
+                                                         GimpDisplay           *display);
+static void       gimp_free_select_tool_halt            (GimpFreeSelectTool    *free_sel);
+
+static gboolean   gimp_free_select_tool_select          (GimpFreeSelectTool    *free_sel,
+                                                         GimpDisplay           *display);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpFreeSelectTool, gimp_free_select_tool,
+                            GIMP_TYPE_POLYGON_SELECT_TOOL)
+
+#define parent_class gimp_free_select_tool_parent_class
+
+
+void
+gimp_free_select_tool_register (GimpToolRegisterCallback  callback,
+                                gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_FREE_SELECT_TOOL,
+                GIMP_TYPE_SELECTION_OPTIONS,
+                gimp_selection_options_gui,
+                0,
+                "gimp-free-select-tool",
+                _("Free Select"),
+                _("Free Select Tool: Select a hand-drawn region with free "
+                  "and polygonal segments"),
+                N_("_Free Select"), "F",
+                NULL, GIMP_HELP_TOOL_FREE_SELECT,
+                GIMP_ICON_TOOL_FREE_SELECT,
+                data);
+}
+
+static void
+gimp_free_select_tool_class_init (GimpFreeSelectToolClass *klass)
+{
+  GimpToolClass              *tool_class     = GIMP_TOOL_CLASS (klass);
+  GimpSelectionToolClass     *sel_class      = GIMP_SELECTION_TOOL_CLASS (klass);
+  GimpPolygonSelectToolClass *poly_sel_class = GIMP_POLYGON_SELECT_TOOL_CLASS (klass);
+
+  tool_class->control             = gimp_free_select_tool_control;
+  tool_class->button_press        = gimp_free_select_tool_button_press;
+  tool_class->button_release      = gimp_free_select_tool_button_release;
+  tool_class->options_notify      = gimp_free_select_tool_options_notify;
+
+  sel_class->have_selection       = gimp_free_select_tool_have_selection;
+
+  poly_sel_class->change_complete = gimp_free_select_tool_change_complete;
+}
+
+static void
+gimp_free_select_tool_init (GimpFreeSelectTool *free_sel)
+{
+  GimpTool          *tool     = GIMP_TOOL (free_sel);
+  GimpSelectionTool *sel_tool = GIMP_SELECTION_TOOL (tool);
+
+  free_sel->priv = gimp_free_select_tool_get_instance_private (free_sel);
+
+  gimp_tool_control_set_preserve     (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask   (tool->control,
+                                      GIMP_DIRTY_SELECTION);
+  gimp_tool_control_set_dirty_action (tool->control,
+                                      GIMP_TOOL_ACTION_COMMIT);
+  gimp_tool_control_set_tool_cursor  (tool->control,
+                                      GIMP_TOOL_CURSOR_FREE_SELECT);
+
+  sel_tool->allow_move = TRUE;
+}
+
+static void
+gimp_free_select_tool_control (GimpTool       *tool,
+                               GimpToolAction  action,
+                               GimpDisplay    *display)
+{
+  GimpFreeSelectTool *free_sel = GIMP_FREE_SELECT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_free_select_tool_halt (free_sel);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_free_select_tool_commit (free_sel, display);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_free_select_tool_button_press (GimpTool            *tool,
+                                    const GimpCoords    *coords,
+                                    guint32              time,
+                                    GdkModifierType      state,
+                                    GimpButtonPressType  press_type,
+                                    GimpDisplay         *display)
+{
+  GimpSelectionOptions      *options  = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpFreeSelectTool        *free_sel = GIMP_FREE_SELECT_TOOL (tool);
+  GimpPolygonSelectTool     *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpFreeSelectToolPrivate *priv     = free_sel->priv;
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL &&
+      gimp_selection_tool_start_edit (GIMP_SELECTION_TOOL (poly_sel),
+                                      display, coords))
+    return;
+
+  GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                press_type, display);
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL &&
+      gimp_polygon_select_tool_is_grabbed (poly_sel))
+    {
+      if (! priv->started)
+        {
+          priv->started            = TRUE;
+          priv->operation_at_start = options->operation;
+        }
+
+      gimp_selection_tool_start_change (
+        GIMP_SELECTION_TOOL (tool),
+        ! gimp_polygon_select_tool_is_closed (poly_sel),
+        priv->operation_at_start);
+
+      priv->changed = FALSE;
+    }
+}
+
+static void
+gimp_free_select_tool_button_release (GimpTool              *tool,
+                                      const GimpCoords      *coords,
+                                      guint32                time,
+                                      GdkModifierType        state,
+                                      GimpButtonReleaseType  release_type,
+                                      GimpDisplay           *display)
+{
+  GimpFreeSelectTool        *free_sel = GIMP_FREE_SELECT_TOOL (tool);
+  GimpPolygonSelectTool     *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpFreeSelectToolPrivate *priv     = free_sel->priv;
+
+  if (gimp_polygon_select_tool_is_grabbed (poly_sel))
+    {
+      gimp_selection_tool_end_change (GIMP_SELECTION_TOOL (tool),
+                                      ! priv->changed);
+
+      priv->changed = FALSE;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                  release_type, display);
+}
+
+static void
+gimp_free_select_tool_options_notify (GimpTool         *tool,
+                                      GimpToolOptions  *options,
+                                      const GParamSpec *pspec)
+{
+  if (! strcmp (pspec->name, "antialias") ||
+      ! strcmp (pspec->name, "feather")   ||
+      ! strcmp (pspec->name, "feather-radius"))
+    {
+      if (tool->display)
+        {
+          gimp_free_select_tool_change_complete (
+            GIMP_POLYGON_SELECT_TOOL (tool), tool->display);
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+}
+
+static gboolean
+gimp_free_select_tool_have_selection (GimpSelectionTool *sel_tool,
+                                      GimpDisplay       *display)
+{
+  GimpPolygonSelectTool *poly_sel = GIMP_POLYGON_SELECT_TOOL (sel_tool);
+  GimpTool              *tool     = GIMP_TOOL (sel_tool);
+
+  if (display == tool->display)
+    {
+      gint n_points;
+
+      gimp_polygon_select_tool_get_points (poly_sel, NULL, &n_points);
+
+      if (n_points > 2)
+        return TRUE;
+    }
+
+  return GIMP_SELECTION_TOOL_CLASS (parent_class)->have_selection (sel_tool,
+                                                                   display);
+}
+
+static void
+gimp_free_select_tool_change_complete (GimpPolygonSelectTool *poly_sel,
+                                       GimpDisplay           *display)
+{
+  GimpFreeSelectTool        *free_sel = GIMP_FREE_SELECT_TOOL (poly_sel);
+  GimpFreeSelectToolPrivate *priv     = free_sel->priv;
+
+  priv->changed = TRUE;
+
+  gimp_selection_tool_start_change (GIMP_SELECTION_TOOL (free_sel),
+                                    FALSE,
+                                    priv->operation_at_start);
+
+  if (gimp_polygon_select_tool_is_closed (poly_sel))
+    gimp_free_select_tool_select (free_sel, display);
+
+  gimp_selection_tool_end_change (GIMP_SELECTION_TOOL (free_sel),
+                                  FALSE);
+}
+
+static void
+gimp_free_select_tool_halt (GimpFreeSelectTool *free_sel)
+{
+  GimpFreeSelectToolPrivate *priv = free_sel->priv;
+
+  priv->started = FALSE;
+}
+
+static void
+gimp_free_select_tool_commit (GimpFreeSelectTool *free_sel,
+                              GimpDisplay        *display)
+{
+  GimpPolygonSelectTool *poly_sel = GIMP_POLYGON_SELECT_TOOL (free_sel);
+
+  if (! gimp_polygon_select_tool_is_closed (poly_sel))
+    {
+      if (gimp_free_select_tool_select (free_sel, display))
+        gimp_image_flush (gimp_display_get_image (display));
+    }
+}
+
+static gboolean
+gimp_free_select_tool_select (GimpFreeSelectTool *free_sel,
+                              GimpDisplay        *display)
+{
+  GimpSelectionOptions      *options = GIMP_SELECTION_TOOL_GET_OPTIONS (free_sel);
+  GimpTool                  *tool    = GIMP_TOOL (free_sel);
+  GimpFreeSelectToolPrivate *priv    = free_sel->priv;
+  GimpImage                 *image   = gimp_display_get_image (display);
+  const GimpVector2         *points;
+  gint                       n_points;
+
+  gimp_polygon_select_tool_get_points (GIMP_POLYGON_SELECT_TOOL (free_sel),
+                                       &points, &n_points);
+
+  if (n_points > 2)
+    {
+      /* prevent this change from halting the tool */
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_channel_select_polygon (gimp_image_get_mask (image),
+                                   C_("command", "Free Select"),
+                                   n_points,
+                                   points,
+                                   priv->operation_at_start,
+                                   options->antialias,
+                                   options->feather,
+                                   options->feather_radius,
+                                   options->feather_radius,
+                                   TRUE);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/tools/gimpfreeselecttool.h b/app/tools/gimpfreeselecttool.h
new file mode 100644
index 0000000..0212040
--- /dev/null
+++ b/app/tools/gimpfreeselecttool.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FREE_SELECT_TOOL_H__
+#define __GIMP_FREE_SELECT_TOOL_H__
+
+
+#include "gimppolygonselecttool.h"
+
+
+#define GIMP_TYPE_FREE_SELECT_TOOL            (gimp_free_select_tool_get_type ())
+#define GIMP_FREE_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FREE_SELECT_TOOL, GimpFreeSelectTool))
+#define GIMP_FREE_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FREE_SELECT_TOOL, GimpFreeSelectToolClass))
+#define GIMP_IS_FREE_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FREE_SELECT_TOOL))
+#define GIMP_IS_FREE_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FREE_SELECT_TOOL))
+#define GIMP_FREE_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FREE_SELECT_TOOL, GimpFreeSelectToolClass))
+
+
+typedef struct _GimpFreeSelectTool        GimpFreeSelectTool;
+typedef struct _GimpFreeSelectToolPrivate GimpFreeSelectToolPrivate;
+typedef struct _GimpFreeSelectToolClass   GimpFreeSelectToolClass;
+
+struct _GimpFreeSelectTool
+{
+  GimpPolygonSelectTool      parent_instance;
+
+  GimpFreeSelectToolPrivate *priv;
+};
+
+struct _GimpFreeSelectToolClass
+{
+  GimpPolygonSelectToolClass  parent_class;
+};
+
+
+void    gimp_free_select_tool_register     (GimpToolRegisterCallback  callback,
+                                            gpointer                  data);
+
+GType   gimp_free_select_tool_get_type     (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_FREE_SELECT_TOOL_H__  */
diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c
new file mode 100644
index 0000000..785804a
--- /dev/null
+++ b/app/tools/gimpfuzzyselecttool.c
@@ -0,0 +1,132 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfuzzyselecttool.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimppickable.h"
+#include "core/gimppickable-contiguous-region.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpfuzzyselecttool.h"
+#include "gimpregionselectoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static GeglBuffer * gimp_fuzzy_select_tool_get_mask (GimpRegionSelectTool *region_select,
+                                                     GimpDisplay          *display);
+
+
+G_DEFINE_TYPE (GimpFuzzySelectTool, gimp_fuzzy_select_tool,
+               GIMP_TYPE_REGION_SELECT_TOOL)
+
+#define parent_class gimp_fuzzy_select_tool_parent_class
+
+
+void
+gimp_fuzzy_select_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_FUZZY_SELECT_TOOL,
+                GIMP_TYPE_REGION_SELECT_OPTIONS,
+                gimp_region_select_options_gui,
+                0,
+                "gimp-fuzzy-select-tool",
+                _("Fuzzy Select"),
+                _("Fuzzy Select Tool: Select a contiguous region on the basis of color"),
+                N_("Fu_zzy Select"), "U",
+                NULL, GIMP_HELP_TOOL_FUZZY_SELECT,
+                GIMP_ICON_TOOL_FUZZY_SELECT,
+                data);
+}
+
+static void
+gimp_fuzzy_select_tool_class_init (GimpFuzzySelectToolClass *klass)
+{
+  GimpRegionSelectToolClass *region_class;
+
+  region_class = GIMP_REGION_SELECT_TOOL_CLASS (klass);
+
+  region_class->undo_desc = C_("command", "Fuzzy Select");
+  region_class->get_mask  = gimp_fuzzy_select_tool_get_mask;
+}
+
+static void
+gimp_fuzzy_select_tool_init (GimpFuzzySelectTool *fuzzy_select)
+{
+  GimpTool *tool = GIMP_TOOL (fuzzy_select);
+
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_FUZZY_SELECT);
+}
+
+static GeglBuffer *
+gimp_fuzzy_select_tool_get_mask (GimpRegionSelectTool *region_select,
+                                 GimpDisplay          *display)
+{
+  GimpTool                *tool        = GIMP_TOOL (region_select);
+  GimpSelectionOptions    *sel_options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpRegionSelectOptions *options     = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (tool);
+  GimpImage               *image       = gimp_display_get_image (display);
+  GimpDrawable            *drawable    = gimp_image_get_active_drawable (image);
+  GimpPickable            *pickable;
+  gint                     x, y;
+
+  x = region_select->x;
+  y = region_select->y;
+
+  if (! options->sample_merged)
+    {
+      gint off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x -= off_x;
+      y -= off_y;
+
+      pickable = GIMP_PICKABLE (drawable);
+    }
+  else
+    {
+      pickable = GIMP_PICKABLE (image);
+    }
+
+  return gimp_pickable_contiguous_region_by_seed (pickable,
+                                                  sel_options->antialias,
+                                                  options->threshold / 255.0,
+                                                  options->select_transparent,
+                                                  options->select_criterion,
+                                                  options->diagonal_neighbors,
+                                                  x, y);
+}
diff --git a/app/tools/gimpfuzzyselecttool.h b/app/tools/gimpfuzzyselecttool.h
new file mode 100644
index 0000000..a1b2acf
--- /dev/null
+++ b/app/tools/gimpfuzzyselecttool.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfuzzyselecttool.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FUZZY_SELECT_TOOL_H__
+#define __GIMP_FUZZY_SELECT_TOOL_H__
+
+
+#include "gimpregionselecttool.h"
+
+
+#define GIMP_TYPE_FUZZY_SELECT_TOOL            (gimp_fuzzy_select_tool_get_type ())
+#define GIMP_FUZZY_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FUZZY_SELECT_TOOL, GimpFuzzySelectTool))
+#define GIMP_FUZZY_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FUZZY_SELECT_TOOL, GimpFuzzySelectToolClass))
+#define GIMP_IS_FUZZY_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FUZZY_SELECT_TOOL))
+#define GIMP_IS_FUZZY_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FUZZY_SELECT_TOOL))
+#define GIMP_FUZZY_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FUZZY_SELECT_TOOL, GimpFuzzySelectToolClass))
+
+
+typedef struct _GimpFuzzySelectTool      GimpFuzzySelectTool;
+typedef struct _GimpFuzzySelectToolClass GimpFuzzySelectToolClass;
+
+struct _GimpFuzzySelectTool
+{
+  GimpRegionSelectTool  parent_instance;
+};
+
+struct _GimpFuzzySelectToolClass
+{
+  GimpRegionSelectToolClass  parent_class;
+};
+
+
+void    gimp_fuzzy_select_tool_register (GimpToolRegisterCallback  callback,
+                                         gpointer                  data);
+
+GType   gimp_fuzzy_select_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /* __GIMP_FUZZY_SELECT_TOOL_H__ */
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
new file mode 100644
index 0000000..69a0eec
--- /dev/null
+++ b/app/tools/gimpgegltool.c
@@ -0,0 +1,559 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gegl-plugin.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+
+#include "gimpfilteroptions.h"
+#include "gimpgegltool.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLUMN_NAME,
+  COLUMN_LABEL,
+  COLUMN_ICON_NAME,
+  N_COLUMNS
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_gegl_tool_control           (GimpTool       *tool,
+                                                GimpToolAction  action,
+                                                GimpDisplay    *display);
+
+static void   gimp_gegl_tool_dialog            (GimpFilterTool *filter_tool);
+
+static void   gimp_gegl_tool_halt              (GimpGeglTool   *gegl_tool);
+
+static void   gimp_gegl_tool_operation_changed (GtkWidget      *widget,
+                                                GimpGeglTool   *gegl_tool);
+
+
+G_DEFINE_TYPE (GimpGeglTool, gimp_gegl_tool, GIMP_TYPE_OPERATION_TOOL)
+
+#define parent_class gimp_gegl_tool_parent_class
+
+
+void
+gimp_gegl_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_GEGL_TOOL,
+                GIMP_TYPE_FILTER_OPTIONS,
+                gimp_color_options_gui,
+                0,
+                "gimp-gegl-tool",
+                _("GEGL Operation"),
+                _("GEGL Tool: Use an arbitrary GEGL operation"),
+                N_("_GEGL Operation..."), NULL,
+                NULL, GIMP_HELP_TOOL_GEGL,
+                GIMP_ICON_GEGL,
+                data);
+}
+
+static void
+gimp_gegl_tool_class_init (GimpGeglToolClass *klass)
+{
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  tool_class->control       = gimp_gegl_tool_control;
+
+  filter_tool_class->dialog = gimp_gegl_tool_dialog;
+}
+
+static void
+gimp_gegl_tool_init (GimpGeglTool *tool)
+{
+}
+
+static void
+gimp_gegl_tool_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  GimpGeglTool *gegl_tool = GIMP_GEGL_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_gegl_tool_halt (gegl_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static gboolean
+gimp_gegl_tool_operation_blacklisted (const gchar *name,
+                                      const gchar *categories_str)
+{
+  static const gchar * const category_blacklist[] =
+  {
+    "compositors",
+    "core",
+    "debug",
+    "display",
+    "hidden",
+    "input",
+    "output",
+    "programming",
+    "transform",
+    "video"
+  };
+  static const gchar * const name_blacklist[] =
+  {
+    /* these ops are already added to the menus via
+     * filters-actions or drawable-actions
+     */
+    "gegl:alien-map",
+    "gegl:antialias",
+    "gegl:apply-lens",
+    "gegl:bayer-matrix",
+    "gegl:bloom",
+    "gegl:bump-map",
+    "gegl:c2g",
+    "gegl:cartoon",
+    "gegl:cell-noise",
+    "gegl:channel-mixer",
+    "gegl:checkerboard",
+    "gegl:color",
+    "gegl:color-enhance",
+    "gegl:color-exchange",
+    "gegl:color-rotate",
+    "gegl:color-temperature",
+    "gegl:color-to-alpha",
+    "gegl:component-extract",
+    "gegl:convolution-matrix",
+    "gegl:cubism",
+    "gegl:deinterlace",
+    "gegl:difference-of-gaussians",
+    "gegl:diffraction-patterns",
+    "gegl:displace",
+    "gegl:distance-transform",
+    "gegl:dither",
+    "gegl:dropshadow",
+    "gegl:edge",
+    "gegl:edge-laplace",
+    "gegl:edge-neon",
+    "gegl:edge-sobel",
+    "gegl:emboss",
+    "gegl:engrave",
+    "gegl:exposure",
+    "gegl:fattal02",
+    "gegl:focus-blur",
+    "gegl:fractal-trace",
+    "gegl:gaussian-blur",
+    "gegl:gaussian-blur-selective",
+    "gegl:gegl",
+    "gegl:grid",
+    "gegl:high-pass",
+    "gegl:hue-chroma",
+    "gegl:illusion",
+    "gegl:image-gradient",
+    "gegl:invert-linear",
+    "gegl:invert-gamma",
+    "gegl:lens-blur",
+    "gegl:lens-distortion",
+    "gegl:lens-flare",
+    "gegl:linear-sinusoid",
+    "gegl:long-shadow",
+    "gegl:mantiuk06",
+    "gegl:maze",
+    "gegl:mean-curvature-blur",
+    "gegl:median-blur",
+    "gegl:mirrors",
+    "gegl:mono-mixer",
+    "gegl:mosaic",
+    "gegl:motion-blur-circular",
+    "gegl:motion-blur-linear",
+    "gegl:motion-blur-zoom",
+    "gegl:newsprint",
+    "gegl:noise-cie-lch",
+    "gegl:noise-hsv",
+    "gegl:noise-hurl",
+    "gegl:noise-pick",
+    "gegl:noise-reduction",
+    "gegl:noise-rgb",
+    "gegl:noise-slur",
+    "gegl:noise-solid",
+    "gegl:noise-spread",
+    "gegl:normal-map",
+    "gegl:oilify",
+    "gegl:panorama-projection",
+    "gegl:perlin-noise",
+    "gegl:photocopy",
+    "gegl:pixelize",
+    "gegl:plasma",
+    "gegl:polar-coordinates",
+    "gegl:recursive-transform",
+    "gegl:red-eye-removal",
+    "gegl:reinhard05",
+    "gegl:rgb-clip",
+    "gegl:ripple",
+    "gegl:saturation",
+    "gegl:sepia",
+    "gegl:shadows-highlights",
+    "gegl:shift",
+    "gegl:simplex-noise",
+    "gegl:sinus",
+    "gegl:slic",
+    "gegl:snn-mean",
+    "gegl:softglow",
+    "gegl:spherize",
+    "gegl:spiral",
+    "gegl:stereographic-projection",
+    "gegl:stretch-contrast",
+    "gegl:stretch-contrast-hsv",
+    "gegl:stress",
+    "gegl:supernova",
+    "gegl:texturize-canvas",
+    "gegl:tile-glass",
+    "gegl:tile-paper",
+    "gegl:tile-seamless",
+    "gegl:unsharp-mask",
+    "gegl:value-invert",
+    "gegl:value-propagate",
+    "gegl:variable-blur",
+    "gegl:video-degradation",
+    "gegl:vignette",
+    "gegl:waterpixels",
+    "gegl:wavelet-blur",
+    "gegl:waves",
+    "gegl:whirl-pinch",
+    "gegl:wind",
+
+    /* these ops are blacklisted for other reasons */
+    "gegl:contrast-curve",
+    "gegl:convert-format", /* pointless */
+    "gegl:ditto", /* pointless */
+    "gegl:fill-path",
+    "gegl:gray", /* we use gimp's op */
+    "gegl:hstack", /* pointless */
+    "gegl:introspect", /* pointless */
+    "gegl:layer", /* we use gimp's ops */
+    "gegl:lcms-from-profile", /* not usable here */
+    "gegl:linear-gradient", /* we use the blend tool */
+    "gegl:map-absolute", /* pointless */
+    "gegl:map-relative", /* pointless */
+    "gegl:matting-global", /* used in the foreground select tool */
+    "gegl:matting-levin", /* used in the foreground select tool */
+    "gegl:opacity", /* poinless */
+    "gegl:path",
+    "gegl:posterize", /* we use gimp's op */
+    "gegl:radial-gradient", /* we use the blend tool */
+    "gegl:rectangle", /* pointless */
+    "gegl:seamless-clone", /* used in the seamless clone tool */
+    "gegl:text", /* we use gimp's text rendering */
+    "gegl:threshold", /* we use gimp's op */
+    "gegl:tile", /* pointless */
+    "gegl:unpremul", /* pointless */
+    "gegl:vector-stroke",
+  };
+
+  gchar **categories;
+  gint    i;
+
+  /* Operations with no name are abstract base classes */
+  if (! name)
+    return TRUE;
+
+  /* use this flag to include all ops for testing */
+  if (g_getenv ("GIMP_TESTING_NO_GEGL_BLACKLIST"))
+    return FALSE;
+
+  if (g_str_has_prefix (name, "gimp"))
+    return TRUE;
+
+  for (i = 0; i < G_N_ELEMENTS (name_blacklist); i++)
+    {
+      if (! strcmp (name, name_blacklist[i]))
+        return TRUE;
+    }
+
+  if (! categories_str)
+    return FALSE;
+
+  categories = g_strsplit (categories_str, ":", 0);
+
+  for (i = 0; i < G_N_ELEMENTS (category_blacklist); i++)
+    {
+      gint j;
+
+      for (j = 0; categories[j]; j++)
+        if (! strcmp (categories[j], category_blacklist[i]))
+          {
+            g_strfreev (categories);
+            return TRUE;
+          }
+    }
+
+  g_strfreev (categories);
+
+  return FALSE;
+}
+
+
+/* Builds a GList of the class structures of all subtypes of type.
+ */
+static GList *
+gimp_get_subtype_classes (GType  type,
+                          GList *classes)
+{
+  GeglOperationClass *klass;
+  GType              *ops;
+  const gchar        *categories;
+  guint               n_ops;
+  gint                i;
+
+  if (! type)
+    return classes;
+
+  klass = GEGL_OPERATION_CLASS (g_type_class_ref (type));
+  ops = g_type_children (type, &n_ops);
+
+  categories = gegl_operation_class_get_key (klass, "categories");
+
+  if (! gimp_gegl_tool_operation_blacklisted (klass->name, categories))
+    classes = g_list_prepend (classes, klass);
+
+  for (i = 0; i < n_ops; i++)
+    classes = gimp_get_subtype_classes (ops[i], classes);
+
+  if (ops)
+    g_free (ops);
+
+  return classes;
+}
+
+static gint
+gimp_gegl_tool_compare_operation_names (GeglOperationClass *a,
+                                        GeglOperationClass *b)
+{
+  const gchar *name_a = gegl_operation_class_get_key (a, "title");
+  const gchar *name_b = gegl_operation_class_get_key (b, "title");
+
+  if (! name_a) name_a = a->name;
+  if (! name_b) name_b = b->name;
+
+  return strcmp (name_a, name_b);
+}
+
+static GList *
+gimp_get_geglopclasses (void)
+{
+  GList *opclasses;
+
+  opclasses = gimp_get_subtype_classes (GEGL_TYPE_OPERATION, NULL);
+
+  opclasses = g_list_sort (opclasses,
+                           (GCompareFunc)
+                           gimp_gegl_tool_compare_operation_names);
+
+  return opclasses;
+}
+
+
+/*****************/
+/*  Gegl dialog  */
+/*****************/
+
+static void
+gimp_gegl_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpGeglTool      *tool   = GIMP_GEGL_TOOL (filter_tool);
+  GimpOperationTool *o_tool = GIMP_OPERATION_TOOL (filter_tool);
+  GtkListStore      *store;
+  GtkCellRenderer   *cell;
+  GtkWidget         *main_vbox;
+  GtkWidget         *hbox;
+  GtkWidget         *combo;
+  GtkWidget         *options_gui;
+  GtkWidget         *options_box;
+  GList             *opclasses;
+  GList             *iter;
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->dialog (filter_tool);
+
+  options_box = g_weak_ref_get (&o_tool->options_box_ref);
+  g_return_if_fail (options_box);
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  /*  The operation combo box  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (main_vbox), hbox, 0);
+  gtk_widget_show (hbox);
+
+  store = gtk_list_store_new (N_COLUMNS,
+                              G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+
+  opclasses = gimp_get_geglopclasses ();
+
+  for (iter = opclasses; iter; iter = iter->next)
+    {
+      GeglOperationClass *opclass   = GEGL_OPERATION_CLASS (iter->data);
+      const gchar        *icon_name = NULL;
+      const gchar        *op_name   = opclass->name;
+      const gchar        *title;
+      gchar              *label;
+
+      if (g_str_has_prefix (opclass->name, "gegl:"))
+        icon_name = GIMP_ICON_GEGL;
+
+      if (g_str_has_prefix (op_name, "gegl:"))
+        op_name += strlen ("gegl:");
+
+      title = gegl_operation_class_get_key (opclass, "title");
+
+      if (title)
+        label = g_strdup_printf ("%s (%s)", title, op_name);
+      else
+        label = g_strdup (op_name);
+
+      gtk_list_store_insert_with_values (store, NULL, -1,
+                                         COLUMN_NAME,      opclass->name,
+                                         COLUMN_LABEL,     label,
+                                         COLUMN_ICON_NAME, icon_name,
+                                         -1);
+
+      g_free (label);
+    }
+
+  g_list_free (opclasses);
+
+  combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
+  g_object_unref (store);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE);
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell,
+                                 "icon-name", COLUMN_ICON_NAME);
+
+  cell = gtk_cell_renderer_text_new ();
+  g_object_set (cell,
+                "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
+                NULL);
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell,
+                                 "text", COLUMN_LABEL);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_gegl_tool_operation_changed),
+                    tool);
+
+  tool->operation_combo = combo;
+
+  tool->description_label = gtk_label_new ("");
+  gtk_label_set_line_wrap (GTK_LABEL (tool->description_label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (tool->description_label), 0.0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), tool->description_label,
+                      FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (main_vbox), tool->description_label, 1);
+
+  /*  The options vbox  */
+  options_gui = gtk_label_new (_("Select an operation from the list above"));
+  gimp_label_set_attributes (GTK_LABEL (options_gui),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_misc_set_padding (GTK_MISC (options_gui), 0, 4);
+  gtk_container_add (GTK_CONTAINER (options_box), options_gui);
+  g_object_unref (options_box);
+  g_weak_ref_set (&o_tool->options_gui_ref, options_gui);
+  gtk_widget_show (options_gui);
+}
+
+static void
+gimp_gegl_tool_halt (GimpGeglTool *gegl_tool)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (gegl_tool);
+
+  gimp_operation_tool_set_operation (op_tool, NULL,
+                                     NULL, NULL, NULL, NULL, NULL);
+}
+
+static void
+gimp_gegl_tool_operation_changed (GtkWidget    *widget,
+                                  GimpGeglTool *tool)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gchar        *operation;
+
+  if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter))
+    return;
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
+
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_NAME, &operation,
+                      -1);
+
+  if (operation)
+    {
+      const gchar *description;
+
+      description = gegl_operation_get_key (operation, "description");
+
+      if (description)
+        {
+          gtk_label_set_text (GTK_LABEL (tool->description_label), description);
+          gtk_widget_show (tool->description_label);
+        }
+      else
+        {
+          gtk_widget_hide (tool->description_label);
+        }
+
+      gimp_operation_tool_set_operation (GIMP_OPERATION_TOOL (tool),
+                                         operation,
+                                         _("GEGL Operation"),
+                                         _("GEGL Operation"),
+                                         NULL,
+                                         GIMP_ICON_GEGL,
+                                         GIMP_HELP_TOOL_GEGL);
+      g_free (operation);
+    }
+}
diff --git a/app/tools/gimpgegltool.h b/app/tools/gimpgegltool.h
new file mode 100644
index 0000000..0a7a8f4
--- /dev/null
+++ b/app/tools/gimpgegltool.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GEGL_TOOL_H__
+#define __GIMP_GEGL_TOOL_H__
+
+
+#include "gimpoperationtool.h"
+
+
+#define GIMP_TYPE_GEGL_TOOL            (gimp_gegl_tool_get_type ())
+#define GIMP_GEGL_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GEGL_TOOL, GimpGeglTool))
+#define GIMP_GEGL_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GEGL_TOOL, GimpGeglToolClass))
+#define GIMP_IS_GEGL_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GEGL_TOOL))
+#define GIMP_IS_GEGL_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GEGL_TOOL))
+#define GIMP_GEGL_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GEGL_TOOL, GimpGeglToolClass))
+
+
+typedef struct _GimpGeglTool      GimpGeglTool;
+typedef struct _GimpGeglToolClass GimpGeglToolClass;
+
+struct _GimpGeglTool
+{
+  GimpOperationTool  parent_instance;
+
+  /* dialog */
+  GtkWidget         *operation_combo;
+  GtkWidget         *description_label;
+};
+
+struct _GimpGeglToolClass
+{
+  GimpOperationToolClass  parent_class;
+};
+
+
+void    gimp_gegl_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_gegl_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_GEGL_TOOL_H__  */
diff --git a/app/tools/gimpgenerictransformtool.c b/app/tools/gimpgenerictransformtool.c
new file mode 100644
index 0000000..9f20af6
--- /dev/null
+++ b/app/tools/gimpgenerictransformtool.c
@@ -0,0 +1,194 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-transform-utils.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolgui.h"
+
+#include "gimpgenerictransformtool.h"
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_generic_transform_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                                              GimpMatrix3           *transform);
+static void       gimp_generic_transform_tool_dialog         (GimpTransformGridTool *tg_tool);
+static void       gimp_generic_transform_tool_dialog_update  (GimpTransformGridTool *tg_tool);
+static void       gimp_generic_transform_tool_prepare        (GimpTransformGridTool *tg_tool);
+
+
+G_DEFINE_TYPE (GimpGenericTransformTool, gimp_generic_transform_tool,
+               GIMP_TYPE_TRANSFORM_GRID_TOOL)
+
+#define parent_class gimp_generic_transform_tool_parent_class
+
+
+static void
+gimp_generic_transform_tool_class_init (GimpGenericTransformToolClass *klass)
+{
+  GimpTransformGridToolClass *tg_class = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+
+  tg_class->info_to_matrix = gimp_generic_transform_tool_info_to_matrix;
+  tg_class->dialog         = gimp_generic_transform_tool_dialog;
+  tg_class->dialog_update  = gimp_generic_transform_tool_dialog_update;
+  tg_class->prepare        = gimp_generic_transform_tool_prepare;
+}
+
+static void
+gimp_generic_transform_tool_init (GimpGenericTransformTool *unified_tool)
+{
+}
+
+static gboolean
+gimp_generic_transform_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                            GimpMatrix3           *transform)
+{
+  GimpGenericTransformTool *generic = GIMP_GENERIC_TRANSFORM_TOOL (tg_tool);
+
+  if (GIMP_GENERIC_TRANSFORM_TOOL_GET_CLASS (generic)->info_to_points)
+    GIMP_GENERIC_TRANSFORM_TOOL_GET_CLASS (generic)->info_to_points (generic);
+
+  gimp_matrix3_identity (transform);
+
+  return gimp_transform_matrix_generic (transform,
+                                        generic->input_points,
+                                        generic->output_points);
+}
+
+static void
+gimp_generic_transform_tool_dialog (GimpTransformGridTool *tg_tool)
+{
+  GimpGenericTransformTool *generic = GIMP_GENERIC_TRANSFORM_TOOL (tg_tool);
+  GtkWidget                *frame;
+  GtkWidget                *vbox;
+  GtkWidget                *table;
+  GtkWidget                *label;
+  GtkSizeGroup             *size_group;
+  gint                      x, y;
+
+  frame = gimp_frame_new (_("Transform Matrix"));
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (tg_tool->gui)), frame,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
+
+  table = generic->matrix_table = gtk_table_new (3, 3, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
+  gtk_size_group_add_widget (size_group, table);
+  gtk_widget_show (table);
+
+  for (y = 0; y < 3; y++)
+    {
+      for (x = 0; x < 3; x++)
+        {
+          label = generic->matrix_labels[y][x] = gtk_label_new (" ");
+          gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+          gtk_label_set_width_chars (GTK_LABEL (label), 8);
+          gimp_label_set_attributes (GTK_LABEL (label),
+                                     PANGO_ATTR_SCALE, PANGO_SCALE_SMALL,
+                                     -1);
+          gtk_table_attach (GTK_TABLE (table), label,
+                            x, x + 1, y, y + 1, GTK_EXPAND, GTK_FILL, 0, 0);
+          gtk_widget_show (label);
+        }
+    }
+
+  label = generic->invalid_label = gtk_label_new (_("Invalid transform"));
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_size_group_add_widget (size_group, label);
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+
+  g_object_unref (size_group);
+}
+
+static void
+gimp_generic_transform_tool_dialog_update (GimpTransformGridTool *tg_tool)
+{
+  GimpGenericTransformTool *generic = GIMP_GENERIC_TRANSFORM_TOOL (tg_tool);
+  GimpMatrix3               transform;
+  gboolean                  transform_valid;
+
+  transform_valid = gimp_transform_grid_tool_info_to_matrix (tg_tool,
+                                                             &transform);
+
+  if (transform_valid)
+    {
+      gint x, y;
+
+      gtk_widget_show (generic->matrix_table);
+      gtk_widget_hide (generic->invalid_label);
+
+      for (y = 0; y < 3; y++)
+        {
+          for (x = 0; x < 3; x++)
+            {
+              gchar buf[32];
+
+              g_snprintf (buf, sizeof (buf), "%.4f", transform.coeff[y][x]);
+
+              gtk_label_set_text (GTK_LABEL (generic->matrix_labels[y][x]), buf);
+            }
+        }
+    }
+  else
+    {
+      gtk_widget_show (generic->invalid_label);
+      gtk_widget_hide (generic->matrix_table);
+    }
+}
+
+static void
+gimp_generic_transform_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool        *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpGenericTransformTool *generic = GIMP_GENERIC_TRANSFORM_TOOL (tg_tool);
+
+  generic->input_points[0] = (GimpVector2) {tr_tool->x1, tr_tool->y1};
+  generic->input_points[1] = (GimpVector2) {tr_tool->x2, tr_tool->y1};
+  generic->input_points[2] = (GimpVector2) {tr_tool->x1, tr_tool->y2};
+  generic->input_points[3] = (GimpVector2) {tr_tool->x2, tr_tool->y2};
+
+  memcpy (generic->output_points, generic->input_points,
+          sizeof (generic->input_points));
+}
diff --git a/app/tools/gimpgenerictransformtool.h b/app/tools/gimpgenerictransformtool.h
new file mode 100644
index 0000000..8de1fc9
--- /dev/null
+++ b/app/tools/gimpgenerictransformtool.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GENERIC_TRANSFORM_TOOL_H__
+#define __GIMP_GENERIC_TRANSFORM_TOOL_H__
+
+
+#include "gimptransformgridtool.h"
+
+
+#define GIMP_TYPE_GENERIC_TRANSFORM_TOOL            (gimp_generic_transform_tool_get_type ())
+#define GIMP_GENERIC_TRANSFORM_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GENERIC_TRANSFORM_TOOL, GimpGenericTransformTool))
+#define GIMP_GENERIC_TRANSFORM_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GENERIC_TRANSFORM_TOOL, GimpGenericTransformToolClass))
+#define GIMP_IS_GENERIC_TRANSFORM_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GENERIC_TRANSFORM_TOOL))
+#define GIMP_IS_GENERIC_TRANSFORM_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GENERIC_TRANSFORM_TOOL))
+#define GIMP_GENERIC_TRANSFORM_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GENERIC_TRANSFORM_TOOL, GimpGenericTransformToolClass))
+
+
+typedef struct _GimpGenericTransformToolClass GimpGenericTransformToolClass;
+
+struct _GimpGenericTransformTool
+{
+  GimpTransformGridTool  parent_instance;
+
+  GimpVector2            input_points[4];
+  GimpVector2            output_points[4];
+
+  GtkWidget             *matrix_table;
+  GtkWidget             *matrix_labels[3][3];
+  GtkWidget             *invalid_label;
+};
+
+struct _GimpGenericTransformToolClass
+{
+  GimpTransformGridToolClass  parent_class;
+
+  /*  virtual functions  */
+  void   (* info_to_points) (GimpGenericTransformTool *generic);
+};
+
+
+GType   gimp_generic_transform_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_GENERIC_TRANSFORM_TOOL_H__  */
diff --git a/app/tools/gimpgradientoptions.c b/app/tools/gimpgradientoptions.c
new file mode 100644
index 0000000..86fdd25
--- /dev/null
+++ b/app/tools/gimpgradientoptions.c
@@ -0,0 +1,414 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpdata.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimp-gradients.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpgradientoptions.h"
+#include "gimppaintoptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OFFSET,
+  PROP_GRADIENT_TYPE,
+  PROP_DISTANCE_METRIC,
+  PROP_SUPERSAMPLE,
+  PROP_SUPERSAMPLE_DEPTH,
+  PROP_SUPERSAMPLE_THRESHOLD,
+  PROP_DITHER,
+  PROP_INSTANT,
+  PROP_MODIFY_ACTIVE
+};
+
+
+static void   gimp_gradient_options_set_property           (GObject             *object,
+                                                            guint                property_id,
+                                                            const GValue        *value,
+                                                            GParamSpec          *pspec);
+static void   gimp_gradient_options_get_property           (GObject             *object,
+                                                            guint                property_id,
+                                                            GValue              *value,
+                                                            GParamSpec          *pspec);
+
+static void   gradient_options_repeat_gradient_type_notify (GimpGradientOptions *options,
+                                                            GParamSpec          *pspec,
+                                                            GtkWidget           *repeat_combo);
+static void   gradient_options_metric_gradient_type_notify (GimpGradientOptions *options,
+                                                            GParamSpec          *pspec,
+                                                            GtkWidget           *repeat_combo);
+
+
+G_DEFINE_TYPE (GimpGradientOptions, gimp_gradient_options,
+               GIMP_TYPE_PAINT_OPTIONS)
+
+
+static void
+gimp_gradient_options_class_init (GimpGradientOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_gradient_options_set_property;
+  object_class->get_property = gimp_gradient_options_get_property;
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_OFFSET,
+                           "offset",
+                           _("Offset"),
+                           NULL,
+                           0.0, 100.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRADIENT_TYPE,
+                         "gradient-type",
+                         _("Shape"),
+                         NULL,
+                         GIMP_TYPE_GRADIENT_TYPE,
+                         GIMP_GRADIENT_LINEAR,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DISTANCE_METRIC,
+                         "distance-metric",
+                         _("Metric"),
+                         _("Metric to use for the distance calculation"),
+                         GEGL_TYPE_DISTANCE_METRIC,
+                         GEGL_DISTANCE_METRIC_EUCLIDEAN,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SUPERSAMPLE,
+                            "supersample",
+                            _("Adaptive Supersampling"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_SUPERSAMPLE_DEPTH,
+                        "supersample-depth",
+                        _("Max depth"),
+                        NULL,
+                        1, 9, 3,
+                        GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_SUPERSAMPLE_THRESHOLD,
+                           "supersample-threshold",
+                           _("Threshold"),
+                           NULL,
+                           0.0, 4.0, 0.2,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DITHER,
+                            "dither",
+                            _("Dithering"),
+                            NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_INSTANT,
+                            "instant",
+                            _("Instant mode"),
+                            _("Commit gradient instantly"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MODIFY_ACTIVE,
+                            "modify-active",
+                            _("Modify active gradient"),
+                            _("Modify the active gradient in-place"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_gradient_options_init (GimpGradientOptions *options)
+{
+}
+
+static void
+gimp_gradient_options_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_OFFSET:
+      options->offset = g_value_get_double (value);
+      break;
+    case PROP_GRADIENT_TYPE:
+      options->gradient_type = g_value_get_enum (value);
+      break;
+    case PROP_DISTANCE_METRIC:
+      options->distance_metric = g_value_get_enum (value);
+      break;
+
+    case PROP_SUPERSAMPLE:
+      options->supersample = g_value_get_boolean (value);
+      break;
+    case PROP_SUPERSAMPLE_DEPTH:
+      options->supersample_depth = g_value_get_int (value);
+      break;
+    case PROP_SUPERSAMPLE_THRESHOLD:
+      options->supersample_threshold = g_value_get_double (value);
+      break;
+
+    case PROP_DITHER:
+      options->dither = g_value_get_boolean (value);
+      break;
+
+    case PROP_INSTANT:
+      options->instant = g_value_get_boolean (value);
+      break;
+    case PROP_MODIFY_ACTIVE:
+      options->modify_active = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_gradient_options_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_OFFSET:
+      g_value_set_double (value, options->offset);
+      break;
+    case PROP_GRADIENT_TYPE:
+      g_value_set_enum (value, options->gradient_type);
+      break;
+    case PROP_DISTANCE_METRIC:
+      g_value_set_enum (value, options->distance_metric);
+      break;
+
+    case PROP_SUPERSAMPLE:
+      g_value_set_boolean (value, options->supersample);
+      break;
+    case PROP_SUPERSAMPLE_DEPTH:
+      g_value_set_int (value, options->supersample_depth);
+      break;
+    case PROP_SUPERSAMPLE_THRESHOLD:
+      g_value_set_double (value, options->supersample_threshold);
+      break;
+
+    case PROP_DITHER:
+      g_value_set_boolean (value, options->dither);
+      break;
+
+    case PROP_INSTANT:
+      g_value_set_boolean (value, options->instant);
+      break;
+    case PROP_MODIFY_ACTIVE:
+      g_value_set_boolean (value, options->modify_active);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_gradient_options_gui (GimpToolOptions *tool_options)
+{
+  GObject             *config  = G_OBJECT (tool_options);
+  GimpContext         *context = GIMP_CONTEXT (tool_options);
+  GimpGradientOptions *options = GIMP_GRADIENT_OPTIONS (tool_options);
+  GtkWidget           *vbox    = gimp_paint_options_gui (tool_options);
+  GtkWidget           *vbox2;
+  GtkWidget           *frame;
+  GtkWidget           *scale;
+  GtkWidget           *combo;
+  GtkWidget           *button;
+  GtkWidget           *label;
+  gchar               *str;
+  GdkModifierType      extend_mask;
+  GimpGradient        *gradient;
+
+  extend_mask = gimp_get_extend_selection_mask ();
+
+  /*  the gradient  */
+  button = gimp_prop_gradient_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                       _("Gradient"), 2,
+                                       "gradient-view-type",
+                                       "gradient-view-size",
+                                       "gradient-reverse",
+                                       "gradient-blend-color-space",
+                                       "gimp-gradient-editor",
+                                       _("Edit this gradient"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  the blend color space  */
+  combo = gimp_prop_enum_combo_box_new (config, "gradient-blend-color-space",
+                                        0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo),
+                                _("Blend Color Space"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  /*  the gradient type menu  */
+  combo = gimp_prop_enum_combo_box_new (config, "gradient-type", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Shape"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                       "gimp-gradient");
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  /*  the distance metric menu  */
+  combo = gimp_prop_enum_combo_box_new (config, "distance-metric", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Metric"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  g_signal_connect (config, "notify::gradient-type",
+                    G_CALLBACK (gradient_options_metric_gradient_type_notify),
+                    combo);
+  gradient_options_metric_gradient_type_notify (options, NULL, combo);
+
+  /*  the repeat option  */
+  combo = gimp_prop_enum_combo_box_new (config, "gradient-repeat", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Repeat"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  g_signal_connect (config, "notify::gradient-type",
+                    G_CALLBACK (gradient_options_repeat_gradient_type_notify),
+                    combo);
+  gradient_options_repeat_gradient_type_notify (options, NULL, combo);
+
+  /*  the offset scale  */
+  scale = gimp_prop_spin_scale_new (config, "offset", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  the dither toggle  */
+  button = gimp_prop_check_button_new (config, "dither", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  supersampling options  */
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  frame = gimp_prop_expanding_frame_new (config, "supersample", NULL,
+                                         vbox2, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  max depth scale  */
+  scale = gimp_prop_spin_scale_new (config, "supersample-depth", NULL,
+                                    1.0, 1.0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  threshold scale  */
+  scale = gimp_prop_spin_scale_new (config, "supersample-threshold", NULL,
+                                    0.01, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* the instant toggle */
+  str = g_strdup_printf (_("Instant mode  (%s)"),
+                          gimp_get_mod_string (extend_mask));
+
+  button = gimp_prop_check_button_new (config, "instant", str);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_free (str);
+
+  options->instant_toggle = button;
+
+  /*  the modify active toggle  */
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  frame = gimp_prop_expanding_frame_new (config, "modify-active", NULL,
+                                         vbox2, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  options->modify_active_frame = frame;
+
+  label = gtk_label_new (_("The active gradient is non-writable "
+                           "and cannot be edited directly. "
+                           "Uncheck this option "
+                           "to edit a copy of it."));
+  gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE, TRUE, 0);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_width_chars (GTK_LABEL (label), 24);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+
+  options->modify_active_hint = label;
+
+  gradient = gimp_context_get_gradient (GIMP_CONTEXT (options));
+
+  gtk_widget_set_sensitive (options->modify_active_frame,
+                            gradient !=
+                            gimp_gradients_get_custom (context->gimp));
+  gtk_widget_set_visible (options->modify_active_hint,
+                          gradient &&
+                          ! gimp_data_is_writable (GIMP_DATA (gradient)));
+
+  return vbox;
+}
+
+static void
+gradient_options_repeat_gradient_type_notify (GimpGradientOptions *options,
+                                              GParamSpec       *pspec,
+                                              GtkWidget        *repeat_combo)
+{
+  gtk_widget_set_sensitive (repeat_combo,
+                            options->gradient_type < GIMP_GRADIENT_SHAPEBURST_ANGULAR);
+}
+
+static void
+gradient_options_metric_gradient_type_notify (GimpGradientOptions *options,
+                                              GParamSpec       *pspec,
+                                              GtkWidget        *repeat_combo)
+{
+  gtk_widget_set_sensitive (repeat_combo,
+                            options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR &&
+                            options->gradient_type <= GIMP_GRADIENT_SHAPEBURST_DIMPLED);
+}
diff --git a/app/tools/gimpgradientoptions.h b/app/tools/gimpgradientoptions.h
new file mode 100644
index 0000000..0c07c0f
--- /dev/null
+++ b/app/tools/gimpgradientoptions.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_GRADIENT_OPTIONS_H__
+#define  __GIMP_GRADIENT_OPTIONS_H__
+
+
+#include "paint/gimppaintoptions.h"
+
+
+#define GIMP_TYPE_GRADIENT_OPTIONS            (gimp_gradient_options_get_type ())
+#define GIMP_GRADIENT_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_OPTIONS, GimpGradientOptions))
+#define GIMP_GRADIENT_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT_OPTIONS, GimpGradientOptionsClass))
+#define GIMP_IS_GRADIENT_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT_OPTIONS))
+#define GIMP_IS_GRADIENT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT_OPTIONS))
+#define GIMP_GRADIENT_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT_OPTIONS, GimpGradientOptionsClass))
+
+
+typedef struct _GimpGradientOptions   GimpGradientOptions;
+typedef struct _GimpPaintOptionsClass GimpGradientOptionsClass;
+
+struct _GimpGradientOptions
+{
+  GimpPaintOptions   paint_options;
+
+  gdouble            offset;
+  GimpGradientType   gradient_type;
+  GeglDistanceMetric distance_metric;
+
+  gboolean           supersample;
+  gint               supersample_depth;
+  gdouble            supersample_threshold;
+
+  gboolean           dither;
+
+  gboolean           instant;
+  gboolean           modify_active;
+
+  /*  options gui  */
+  GtkWidget         *instant_toggle;
+  GtkWidget         *modify_active_frame;
+  GtkWidget         *modify_active_hint;
+};
+
+
+GType       gimp_gradient_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_gradient_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_GRADIENT_OPTIONS_H__  */
diff --git a/app/tools/gimpgradienttool-editor.c b/app/tools/gimpgradienttool-editor.c
new file mode 100644
index 0000000..093c00b
--- /dev/null
+++ b/app/tools/gimpgradienttool-editor.c
@@ -0,0 +1,2520 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "operations/gimp-operation-config.h"
+
+#include "core/gimpdata.h"
+#include "core/gimpgradient.h"
+#include "core/gimp-gradients.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpeditor.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptoolline.h"
+
+#include "gimpgradientoptions.h"
+#include "gimpgradienttool.h"
+#include "gimpgradienttool-editor.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON 2e-10
+
+
+typedef enum
+{
+  DIRECTION_NONE,
+  DIRECTION_LEFT,
+  DIRECTION_RIGHT
+} Direction;
+
+
+typedef struct
+{
+  /* line endpoints at the beginning of the operation */
+  gdouble       start_x;
+  gdouble       start_y;
+  gdouble       end_x;
+  gdouble       end_y;
+
+  /* copy of the gradient at the beginning of the operation, owned by the gradient
+   * info, or NULL, if the gradient isn't affected
+   */
+  GimpGradient *gradient;
+
+  /* handle added by the operation, or HANDLE_NONE */
+  gint          added_handle;
+  /* handle removed by the operation, or HANDLE_NONE */
+  gint          removed_handle;
+  /* selected handle at the end of the operation, or HANDLE_NONE */
+  gint          selected_handle;
+} GradientInfo;
+
+
+/*  local function prototypes  */
+
+static gboolean              gimp_gradient_tool_editor_line_can_add_slider           (GimpToolLine          *line,
+                                                                                      gdouble                value,
+                                                                                      GimpGradientTool      *gradient_tool);
+static gint                  gimp_gradient_tool_editor_line_add_slider               (GimpToolLine          *line,
+                                                                                      gdouble                value,
+                                                                                      GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_line_prepare_to_remove_slider (GimpToolLine          *line,
+                                                                                      gint                   slider,
+                                                                                      gboolean               remove,
+                                                                                      GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_line_remove_slider            (GimpToolLine          *line,
+                                                                                      gint                   slider,
+                                                                                      GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_line_selection_changed        (GimpToolLine          *line,
+                                                                                      GimpGradientTool      *gradient_tool);
+static gboolean              gimp_gradient_tool_editor_line_handle_clicked           (GimpToolLine          *line,
+                                                                                      gint                   handle,
+                                                                                      GdkModifierType        state,
+                                                                                      GimpButtonPressType    press_type,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_gui_response                  (GimpToolGui           *gui,
+                                                                                      gint                   response_id,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_color_entry_color_clicked     (GimpColorButton       *button,
+                                                                                      GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_color_entry_color_changed     (GimpColorButton       *button,
+                                                                                      GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_color_entry_color_response    (GimpColorButton       *button,
+                                                                                      GimpColorDialogState   state,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_color_entry_type_changed      (GtkComboBox           *combo,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_endpoint_se_value_changed     (GimpSizeEntry         *se,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_stop_se_value_changed         (GimpSizeEntry        *se,
+                                                                                      GimpGradientTool     *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_stop_delete_clicked           (GtkWidget             *button,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_midpoint_se_value_changed     (GimpSizeEntry        *se,
+                                                                                      GimpGradientTool     *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_midpoint_type_changed         (GtkComboBox           *combo,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_midpoint_color_changed        (GtkComboBox           *combo,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_midpoint_new_stop_clicked     (GtkWidget             *button,
+                                                                                      GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_midpoint_center_clicked       (GtkWidget             *button,
+                                                                                      GimpGradientTool      *gradient_tool);
+
+static gboolean              gimp_gradient_tool_editor_flush_idle                    (GimpGradientTool      *gradient_tool);
+
+static gboolean              gimp_gradient_tool_editor_is_gradient_editable          (GimpGradientTool      *gradient_tool);
+
+static gboolean              gimp_gradient_tool_editor_handle_is_endpoint            (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   handle);
+static gboolean              gimp_gradient_tool_editor_handle_is_stop                (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   handle);
+static gboolean              gimp_gradient_tool_editor_handle_is_midpoint            (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   handle);
+static GimpGradientSegment * gimp_gradient_tool_editor_handle_get_segment            (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   handle);
+
+static void                  gimp_gradient_tool_editor_block_handlers                (GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_unblock_handlers              (GimpGradientTool      *gradient_tool);
+static gboolean              gimp_gradient_tool_editor_are_handlers_blocked          (GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_freeze_gradient               (GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_thaw_gradient                 (GimpGradientTool      *gradient_tool);
+
+static gint                  gimp_gradient_tool_editor_add_stop                      (GimpGradientTool      *gradient_tool,
+                                                                                      gdouble                value);
+static void                  gimp_gradient_tool_editor_delete_stop                   (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   slider);
+static gint                  gimp_gradient_tool_editor_midpoint_to_stop              (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   slider);
+
+static void                  gimp_gradient_tool_editor_update_sliders                (GimpGradientTool      *gradient_tool);
+
+static void                  gimp_gradient_tool_editor_purge_gradient_history        (GSList               **stack);
+static void                  gimp_gradient_tool_editor_purge_gradient                (GimpGradientTool      *gradient_tool);
+
+static GtkWidget           * gimp_gradient_tool_editor_color_entry_new               (GimpGradientTool      *gradient_tool,
+                                                                                      const gchar           *title,
+                                                                                      Direction              direction,
+                                                                                      GtkWidget             *chain_button,
+                                                                                      GtkWidget            **color_panel,
+                                                                                      GtkWidget            **type_combo);
+static void                  gimp_gradient_tool_editor_init_endpoint_gui             (GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_init_stop_gui                 (GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_init_midpoint_gui             (GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_update_endpoint_gui           (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   selection);
+static void                  gimp_gradient_tool_editor_update_stop_gui               (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   selection);
+static void                  gimp_gradient_tool_editor_update_midpoint_gui           (GimpGradientTool      *gradient_tool,
+                                                                                      gint                   selection);
+static void                  gimp_gradient_tool_editor_update_gui                    (GimpGradientTool      *gradient_tool);
+
+static GradientInfo        * gimp_gradient_tool_editor_gradient_info_new             (GimpGradientTool      *gradient_tool);
+static void                  gimp_gradient_tool_editor_gradient_info_free            (GradientInfo          *info);
+static void                  gimp_gradient_tool_editor_gradient_info_apply           (GimpGradientTool      *gradient_tool,
+                                                                                      const GradientInfo    *info,
+                                                                                      gboolean               set_selection);
+static gboolean              gimp_gradient_tool_editor_gradient_info_is_trivial      (GimpGradientTool      *gradient_tool,
+                                                                                      const GradientInfo    *info);
+
+
+/*  private functions  */
+
+
+static gboolean
+gimp_gradient_tool_editor_line_can_add_slider (GimpToolLine  *line,
+                                               gdouble        value,
+                                               GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  gdouble              offset  = options->offset / 100.0;
+
+  return gimp_gradient_tool_editor_is_gradient_editable (gradient_tool) &&
+         value >= offset;
+}
+
+static gint
+gimp_gradient_tool_editor_line_add_slider (GimpToolLine     *line,
+                                           gdouble           value,
+                                           GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions    *paint_options = GIMP_PAINT_OPTIONS (options);
+  gdouble              offset        = options->offset / 100.0;
+
+  /* adjust slider value according to the offset */
+  value = (value - offset) / (1.0 - offset);
+
+  /* flip the slider value, if necessary */
+  if (paint_options->gradient_options->gradient_reverse)
+    value = 1.0 - value;
+
+  return gimp_gradient_tool_editor_add_stop (gradient_tool, value);
+}
+
+static void
+gimp_gradient_tool_editor_line_prepare_to_remove_slider (GimpToolLine     *line,
+                                                         gint              slider,
+                                                         gboolean          remove,
+                                                         GimpGradientTool *gradient_tool)
+{
+  if (remove)
+    {
+      GradientInfo *info;
+      GimpGradient *tentative_gradient;
+
+      /* show a tentative gradient, demonstrating the result of actually
+       * removing the slider
+       */
+
+      info = gradient_tool->undo_stack->data;
+
+      if (info->added_handle == slider)
+        {
+          /* see comment in gimp_gradient_tool_editor_delete_stop() */
+
+          gimp_assert (info->gradient != NULL);
+
+          tentative_gradient = g_object_ref (info->gradient);
+        }
+      else
+        {
+          GimpGradientSegment *seg;
+          gint                 i;
+
+          tentative_gradient =
+            GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient)));
+
+          seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, slider);
+
+          i = gimp_gradient_segment_range_get_n_segments (gradient_tool->gradient,
+                                                          gradient_tool->gradient->segments,
+                                                          seg) - 1;
+
+          seg = gimp_gradient_segment_get_nth (tentative_gradient->segments, i);
+
+          gimp_gradient_segment_range_merge (tentative_gradient,
+                                             seg, seg->next, NULL, NULL);
+        }
+
+      gimp_gradient_tool_set_tentative_gradient (gradient_tool, tentative_gradient);
+
+      g_object_unref (tentative_gradient);
+    }
+  else
+    {
+      gimp_gradient_tool_set_tentative_gradient (gradient_tool, NULL);
+    }
+}
+
+static void
+gimp_gradient_tool_editor_line_remove_slider (GimpToolLine     *line,
+                                              gint              slider,
+                                              GimpGradientTool *gradient_tool)
+{
+  gimp_gradient_tool_editor_delete_stop (gradient_tool, slider);
+  gimp_gradient_tool_set_tentative_gradient (gradient_tool, NULL);
+}
+
+static void
+gimp_gradient_tool_editor_line_selection_changed (GimpToolLine     *line,
+                                                  GimpGradientTool *gradient_tool)
+{
+  gint selection;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (gradient_tool->gui)
+    {
+      /* hide all color dialogs */
+      gimp_color_panel_dialog_response (
+        GIMP_COLOR_PANEL (gradient_tool->endpoint_color_panel),
+        GIMP_COLOR_DIALOG_OK);
+      gimp_color_panel_dialog_response (
+        GIMP_COLOR_PANEL (gradient_tool->stop_left_color_panel),
+        GIMP_COLOR_DIALOG_OK);
+      gimp_color_panel_dialog_response (
+        GIMP_COLOR_PANEL (gradient_tool->stop_right_color_panel),
+        GIMP_COLOR_DIALOG_OK);
+
+      /* reset the stop colors chain button */
+      if (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, selection))
+        {
+          const GimpGradientSegment *seg;
+          gboolean                   homogeneous;
+
+          seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool,
+                                                              selection);
+
+          homogeneous = seg->right_color.r    == seg->next->left_color.r &&
+                        seg->right_color.g    == seg->next->left_color.g &&
+                        seg->right_color.b    == seg->next->left_color.b &&
+                        seg->right_color.a    == seg->next->left_color.a &&
+                        seg->right_color_type == seg->next->left_color_type;
+
+          gimp_chain_button_set_active (
+            GIMP_CHAIN_BUTTON (gradient_tool->stop_chain_button), homogeneous);
+        }
+    }
+
+  gimp_gradient_tool_editor_update_gui (gradient_tool);
+}
+
+static gboolean
+gimp_gradient_tool_editor_line_handle_clicked (GimpToolLine        *line,
+                                               gint                 handle,
+                                               GdkModifierType      state,
+                                               GimpButtonPressType  press_type,
+                                               GimpGradientTool    *gradient_tool)
+{
+  if (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, handle))
+    {
+      if (press_type == GIMP_BUTTON_PRESS_DOUBLE &&
+          gimp_gradient_tool_editor_is_gradient_editable (gradient_tool))
+        {
+          gint stop;
+
+          stop = gimp_gradient_tool_editor_midpoint_to_stop (gradient_tool, handle);
+
+          gimp_tool_line_set_selection (line, stop);
+
+          /* return FALSE, so that the new slider can be dragged immediately */
+          return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
+
+static void
+gimp_gradient_tool_editor_gui_response (GimpToolGui      *gui,
+                                        gint              response_id,
+                                        GimpGradientTool *gradient_tool)
+{
+  switch (response_id)
+    {
+    default:
+      gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget),
+                                    GIMP_TOOL_LINE_HANDLE_NONE);
+      break;
+    }
+}
+
+static void
+gimp_gradient_tool_editor_color_entry_color_clicked (GimpColorButton  *button,
+                                                     GimpGradientTool *gradient_tool)
+{
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+}
+
+static void
+gimp_gradient_tool_editor_color_entry_color_changed (GimpColorButton  *button,
+                                                     GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions    *paint_options = GIMP_PAINT_OPTIONS (options);
+  gint                 selection;
+  GimpRGB              color;
+  Direction            direction;
+  GtkWidget           *chain_button;
+  GimpGradientSegment *seg;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  gimp_color_button_get_color (button, &color);
+
+  direction =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+                                        "gimp-gradient-tool-editor-direction"));
+  chain_button = g_object_get_data (G_OBJECT (button),
+                                    "gimp-gradient-tool-editor-chain-button");
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  /* swap the endpoint handles, if necessary */
+  if (paint_options->gradient_options->gradient_reverse)
+    {
+      switch (selection)
+        {
+        case GIMP_TOOL_LINE_HANDLE_START:
+          selection = GIMP_TOOL_LINE_HANDLE_END;
+          break;
+
+        case GIMP_TOOL_LINE_HANDLE_END:
+          selection = GIMP_TOOL_LINE_HANDLE_START;
+          break;
+        }
+    }
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  switch (selection)
+    {
+    case GIMP_TOOL_LINE_HANDLE_START:
+      seg->left_color      = color;
+      seg->left_color_type = GIMP_GRADIENT_COLOR_FIXED;
+      break;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      seg->right_color      = color;
+      seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED;
+      break;
+
+    default:
+      if (direction == DIRECTION_LEFT ||
+          (chain_button               &&
+           gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button))))
+        {
+          seg->right_color      = color;
+          seg->right_color_type = GIMP_GRADIENT_COLOR_FIXED;
+        }
+
+      if (direction == DIRECTION_RIGHT ||
+          (chain_button                &&
+           gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button))))
+        {
+          seg->next->left_color      = color;
+          seg->next->left_color_type = GIMP_GRADIENT_COLOR_FIXED;
+        }
+    }
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_color_entry_color_response (GimpColorButton      *button,
+                                                      GimpColorDialogState  state,
+                                                      GimpGradientTool     *gradient_tool)
+{
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_color_entry_type_changed (GtkComboBox      *combo,
+                                                    GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions    *paint_options = GIMP_PAINT_OPTIONS (options);
+  gint                 selection;
+  gint                 color_type;
+  Direction            direction;
+  GtkWidget           *chain_button;
+  GimpGradientSegment *seg;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &color_type))
+    return;
+
+  direction =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo),
+                                        "gimp-gradient-tool-editor-direction"));
+  chain_button = g_object_get_data (G_OBJECT (combo),
+                                    "gimp-gradient-tool-editor-chain-button");
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  /* swap the endpoint handles, if necessary */
+  if (paint_options->gradient_options->gradient_reverse)
+    {
+      switch (selection)
+        {
+        case GIMP_TOOL_LINE_HANDLE_START:
+          selection = GIMP_TOOL_LINE_HANDLE_END;
+          break;
+
+        case GIMP_TOOL_LINE_HANDLE_END:
+          selection = GIMP_TOOL_LINE_HANDLE_START;
+          break;
+        }
+    }
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  switch (selection)
+    {
+    case GIMP_TOOL_LINE_HANDLE_START:
+      seg->left_color_type = color_type;
+      break;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      seg->right_color_type = color_type;
+      break;
+
+    default:
+      if (direction == DIRECTION_LEFT ||
+          (chain_button               &&
+           gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button))))
+        {
+          seg->right_color_type = color_type;
+        }
+
+      if (direction == DIRECTION_RIGHT ||
+          (chain_button                &&
+           gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (chain_button))))
+        {
+          seg->next->left_color_type = color_type;
+        }
+    }
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_endpoint_se_value_changed (GimpSizeEntry    *se,
+                                                     GimpGradientTool *gradient_tool)
+{
+  gint    selection;
+  gdouble x;
+  gdouble y;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (selection == GIMP_TOOL_LINE_HANDLE_NONE)
+    return;
+
+  x = gimp_size_entry_get_refval (se, 0);
+  y = gimp_size_entry_get_refval (se, 1);
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_block_handlers (gradient_tool);
+
+  switch (selection)
+    {
+    case GIMP_TOOL_LINE_HANDLE_START:
+      g_object_set (gradient_tool->widget,
+                    "x1", x,
+                    "y1", y,
+                    NULL);
+      break;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      g_object_set (gradient_tool->widget,
+                    "x2", x,
+                    "y2", y,
+                    NULL);
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+
+  gimp_gradient_tool_editor_unblock_handlers (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_stop_se_value_changed (GimpSizeEntry    *se,
+                                                 GimpGradientTool *gradient_tool)
+{
+  gint                 selection;
+  gdouble              value;
+  GimpGradientSegment *seg;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (selection == GIMP_TOOL_LINE_HANDLE_NONE)
+    return;
+
+  value = gimp_size_entry_get_refval (se, 0) / 100.0;
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  gimp_gradient_segment_range_compress (gradient_tool->gradient,
+                                        seg, seg,
+                                        seg->left, value);
+  gimp_gradient_segment_range_compress (gradient_tool->gradient,
+                                        seg->next, seg->next,
+                                        value, seg->next->right);
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_stop_delete_clicked (GtkWidget        *button,
+                                               GimpGradientTool *gradient_tool)
+{
+  gint selection;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  gimp_gradient_tool_editor_delete_stop (gradient_tool, selection);
+}
+
+static void
+gimp_gradient_tool_editor_midpoint_se_value_changed (GimpSizeEntry    *se,
+                                                     GimpGradientTool *gradient_tool)
+{
+  gint                 selection;
+  gdouble              value;
+  GimpGradientSegment *seg;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (selection == GIMP_TOOL_LINE_HANDLE_NONE)
+    return;
+
+  value = gimp_size_entry_get_refval (se, 0) / 100.0;
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  seg->middle = value;
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_midpoint_type_changed (GtkComboBox      *combo,
+                                                 GimpGradientTool *gradient_tool)
+{
+  gint                 selection;
+  gint                 type;
+  GimpGradientSegment *seg;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &type))
+    return;
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  seg->type = type;
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_midpoint_color_changed (GtkComboBox      *combo,
+                                                  GimpGradientTool *gradient_tool)
+{
+  gint                 selection;
+  gint                 color;
+  GimpGradientSegment *seg;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &color))
+    return;
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  seg->color = color;
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static void
+gimp_gradient_tool_editor_midpoint_new_stop_clicked (GtkWidget        *button,
+                                                     GimpGradientTool *gradient_tool)
+{
+  gint selection;
+  gint stop;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  stop = gimp_gradient_tool_editor_midpoint_to_stop (gradient_tool, selection);
+
+  gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget), stop);
+}
+
+static void
+gimp_gradient_tool_editor_midpoint_center_clicked (GtkWidget        *button,
+                                                   GimpGradientTool *gradient_tool)
+{
+  gint                 selection;
+  GimpGradientSegment *seg;
+
+  selection =
+    gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  gimp_gradient_segment_range_recenter_handles (gradient_tool->gradient, seg, seg);
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static gboolean
+gimp_gradient_tool_editor_flush_idle (GimpGradientTool *gradient_tool)
+{
+  GimpDisplay *display = GIMP_TOOL (gradient_tool)->display;
+
+  gimp_image_flush (gimp_display_get_image (display));
+
+  gradient_tool->flush_idle_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
+static gboolean
+gimp_gradient_tool_editor_is_gradient_editable (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+
+  return ! options->modify_active ||
+         gimp_data_is_writable (GIMP_DATA (gradient_tool->gradient));
+}
+
+static gboolean
+gimp_gradient_tool_editor_handle_is_endpoint (GimpGradientTool *gradient_tool,
+                                              gint              handle)
+{
+  return handle == GIMP_TOOL_LINE_HANDLE_START ||
+         handle == GIMP_TOOL_LINE_HANDLE_END;
+}
+
+static gboolean
+gimp_gradient_tool_editor_handle_is_stop (GimpGradientTool *gradient_tool,
+                                          gint              handle)
+{
+  gint n_sliders;
+
+  gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), &n_sliders);
+
+  return handle >= 0 && handle < n_sliders / 2;
+}
+
+static gboolean
+gimp_gradient_tool_editor_handle_is_midpoint (GimpGradientTool *gradient_tool,
+                                              gint              handle)
+{
+  gint n_sliders;
+
+  gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget), &n_sliders);
+
+  return handle >= n_sliders / 2;
+}
+
+static GimpGradientSegment *
+gimp_gradient_tool_editor_handle_get_segment (GimpGradientTool *gradient_tool,
+                                              gint              handle)
+{
+  switch (handle)
+    {
+    case GIMP_TOOL_LINE_HANDLE_START:
+      return gradient_tool->gradient->segments;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      return gimp_gradient_segment_get_last (gradient_tool->gradient->segments);
+
+    default:
+      {
+        const GimpControllerSlider *sliders;
+        gint                        n_sliders;
+        gint                        seg_i;
+
+        sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                                              &n_sliders);
+
+        gimp_assert (handle >= 0 && handle < n_sliders);
+
+        seg_i = GPOINTER_TO_INT (sliders[handle].data);
+
+        return gimp_gradient_segment_get_nth (gradient_tool->gradient->segments,
+                                              seg_i);
+      }
+    }
+}
+
+static void
+gimp_gradient_tool_editor_block_handlers (GimpGradientTool *gradient_tool)
+{
+  gradient_tool->block_handlers_count++;
+}
+
+static void
+gimp_gradient_tool_editor_unblock_handlers (GimpGradientTool *gradient_tool)
+{
+  gimp_assert (gradient_tool->block_handlers_count > 0);
+
+  gradient_tool->block_handlers_count--;
+}
+
+static gboolean
+gimp_gradient_tool_editor_are_handlers_blocked (GimpGradientTool *gradient_tool)
+{
+  return gradient_tool->block_handlers_count > 0;
+}
+
+static void
+gimp_gradient_tool_editor_freeze_gradient (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpGradient        *custom;
+  GradientInfo           *info;
+
+  gimp_gradient_tool_editor_block_handlers (gradient_tool);
+
+  custom = gimp_gradients_get_custom (GIMP_CONTEXT (options)->gimp);
+
+  if (gradient_tool->gradient == custom || options->modify_active)
+    {
+      gimp_assert (gimp_gradient_tool_editor_is_gradient_editable (gradient_tool));
+
+      gimp_data_freeze (GIMP_DATA (gradient_tool->gradient));
+    }
+  else
+    {
+      /* copy the active gradient to the custom gradient, and make the custom
+       * gradient active.
+       */
+      gimp_data_freeze (GIMP_DATA (custom));
+
+      gimp_data_copy (GIMP_DATA (custom), GIMP_DATA (gradient_tool->gradient));
+
+      gimp_context_set_gradient (GIMP_CONTEXT (options), custom);
+
+      gimp_assert (gradient_tool->gradient == custom);
+      gimp_assert (gimp_gradient_tool_editor_is_gradient_editable (gradient_tool));
+    }
+
+  if (gradient_tool->edit_count > 0)
+    {
+      info = gradient_tool->undo_stack->data;
+
+      if (! info->gradient)
+        {
+          info->gradient =
+            GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient)));
+        }
+    }
+}
+
+static void
+gimp_gradient_tool_editor_thaw_gradient (GimpGradientTool *gradient_tool)
+{
+  gimp_data_thaw (GIMP_DATA (gradient_tool->gradient));
+
+  gimp_gradient_tool_editor_update_sliders (gradient_tool);
+  gimp_gradient_tool_editor_update_gui (gradient_tool);
+
+  gimp_gradient_tool_editor_unblock_handlers (gradient_tool);
+}
+
+static gint
+gimp_gradient_tool_editor_add_stop (GimpGradientTool *gradient_tool,
+                                    gdouble           value)
+{
+  GimpGradientOptions *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions    *paint_options = GIMP_PAINT_OPTIONS (options);
+  GimpGradientSegment *seg;
+  gint                 stop;
+  GradientInfo           *info;
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  gimp_gradient_split_at (gradient_tool->gradient,
+                          GIMP_CONTEXT (options), NULL, value,
+                          paint_options->gradient_options->gradient_blend_color_space,
+                          &seg, NULL);
+
+  stop =
+    gimp_gradient_segment_range_get_n_segments (gradient_tool->gradient,
+                                                gradient_tool->gradient->segments,
+                                                seg) - 1;
+
+  info               = gradient_tool->undo_stack->data;
+  info->added_handle = stop;
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+
+  return stop;
+}
+
+static void
+gimp_gradient_tool_editor_delete_stop (GimpGradientTool *gradient_tool,
+                                       gint              slider)
+{
+  GradientInfo *info;
+
+  gimp_assert (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, slider));
+
+  gimp_gradient_tool_editor_start_edit (gradient_tool);
+  gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+  info = gradient_tool->undo_stack->data;
+
+  if (info->added_handle == slider)
+    {
+      /* when removing a stop that was added as part of the current action,
+       * restore the original gradient at the beginning of the action, rather
+       * than deleting the stop from the current gradient, so that the affected
+       * midpoint returns to its state at the beginning of the action, instead
+       * of being reset.
+       *
+       * note that this assumes that the gradient hasn't changed in any other
+       * way during the action, which is ugly, but currently always true.
+       */
+
+      gimp_assert (info->gradient != NULL);
+
+      gimp_data_copy (GIMP_DATA (gradient_tool->gradient),
+                      GIMP_DATA (info->gradient));
+
+      g_clear_object (&info->gradient);
+
+      info->added_handle = GIMP_TOOL_LINE_HANDLE_NONE;
+    }
+  else
+    {
+      GimpGradientSegment *seg;
+
+      seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, slider);
+
+      gimp_gradient_segment_range_merge (gradient_tool->gradient,
+                                         seg, seg->next, NULL, NULL);
+
+      info->removed_handle = slider;
+    }
+
+  gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+  gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+}
+
+static gint
+gimp_gradient_tool_editor_midpoint_to_stop (GimpGradientTool *gradient_tool,
+                                            gint              slider)
+{
+  const GimpControllerSlider *sliders;
+
+  gimp_assert (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, slider));
+
+  sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                                        NULL);
+
+  if (sliders[slider].value > sliders[slider].min + EPSILON &&
+      sliders[slider].value < sliders[slider].max - EPSILON)
+    {
+      const GimpGradientSegment *seg;
+      gint                       stop;
+      GradientInfo                 *info;
+
+      seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, slider);
+
+      stop = gimp_gradient_tool_editor_add_stop (gradient_tool, seg->middle);
+
+      info                 = gradient_tool->undo_stack->data;
+      info->removed_handle = slider;
+
+      slider = stop;
+    }
+
+  return slider;
+}
+
+static void
+gimp_gradient_tool_editor_update_sliders (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions  *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions     *paint_options = GIMP_PAINT_OPTIONS (options);
+  gdouble               offset        = options->offset / 100.0;
+  gboolean              editable;
+  GimpControllerSlider *sliders;
+  gint                  n_sliders;
+  gint                  n_segments;
+  GimpGradientSegment  *seg;
+  GimpControllerSlider *slider;
+  gint                  i;
+
+  if (! gradient_tool->widget || options->instant)
+    return;
+
+  editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool);
+
+  n_segments = gimp_gradient_segment_range_get_n_segments (
+    gradient_tool->gradient, gradient_tool->gradient->segments, NULL);
+
+  n_sliders = (n_segments - 1) + /* gradient stops, between each adjacent
+                                  * pair of segments */
+              (n_segments);      /* midpoints, inside each segment */
+
+  sliders = g_new (GimpControllerSlider, n_sliders);
+
+  slider = sliders;
+
+  /* initialize the gradient-stop sliders */
+  for (seg = gradient_tool->gradient->segments, i = 0;
+       seg->next;
+       seg = seg->next, i++)
+    {
+      *slider = GIMP_CONTROLLER_SLIDER_DEFAULT;
+
+      slider->value     = seg->right;
+      slider->min       = seg->left;
+      slider->max       = seg->next->right;
+
+      slider->movable   = editable;
+      slider->removable = editable;
+
+      slider->data      = GINT_TO_POINTER (i);
+
+      slider++;
+    }
+
+  /* initialize the midpoint sliders */
+  for (seg = gradient_tool->gradient->segments, i = 0;
+       seg;
+       seg = seg->next, i++)
+    {
+      *slider = GIMP_CONTROLLER_SLIDER_DEFAULT;
+
+      slider->value    = seg->middle;
+      slider->min      = seg->left;
+      slider->max      = seg->right;
+
+      /* hide midpoints of zero-length segments, since they'd otherwise
+       * prevent the segment's endpoints from being selected
+       */
+      slider->visible  = fabs (slider->max - slider->min) > EPSILON;
+      slider->movable  = editable;
+
+      slider->autohide = TRUE;
+      slider->type     = GIMP_HANDLE_FILLED_CIRCLE;
+      slider->size     = 0.6;
+
+      slider->data     = GINT_TO_POINTER (i);
+
+      slider++;
+    }
+
+  /* flip the slider limits and values, if necessary */
+  if (paint_options->gradient_options->gradient_reverse)
+    {
+      for (i = 0; i < n_sliders; i++)
+        {
+          gdouble temp;
+
+          sliders[i].value = 1.0 - sliders[i].value;
+          temp             = sliders[i].min;
+          sliders[i].min   = 1.0 - sliders[i].max;
+          sliders[i].max   = 1.0 - temp;
+        }
+    }
+
+  /* adjust the sliders according to the offset */
+  for (i = 0; i < n_sliders; i++)
+    {
+      sliders[i].value = (1.0 - offset) * sliders[i].value + offset;
+      sliders[i].min   = (1.0 - offset) * sliders[i].min   + offset;
+      sliders[i].max   = (1.0 - offset) * sliders[i].max   + offset;
+    }
+
+  /* avoid updating the gradient in gimp_gradient_tool_editor_line_changed() */
+  gimp_gradient_tool_editor_block_handlers (gradient_tool);
+
+  gimp_tool_line_set_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                              sliders, n_sliders);
+
+  gimp_gradient_tool_editor_unblock_handlers (gradient_tool);
+
+  g_free (sliders);
+}
+
+static void
+gimp_gradient_tool_editor_purge_gradient_history (GSList **stack)
+{
+  GSList *link;
+
+  /* eliminate all history steps that modify the gradient */
+  while ((link = *stack))
+    {
+      GradientInfo *info = link->data;
+
+      if (info->gradient)
+        {
+          gimp_gradient_tool_editor_gradient_info_free (info);
+
+          *stack = g_slist_delete_link (*stack, link);
+        }
+      else
+        {
+          stack = &link->next;
+        }
+    }
+}
+
+static void
+gimp_gradient_tool_editor_purge_gradient (GimpGradientTool *gradient_tool)
+{
+  if (gradient_tool->widget)
+    {
+      gimp_gradient_tool_editor_update_sliders (gradient_tool);
+
+      gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget),
+                                    GIMP_TOOL_LINE_HANDLE_NONE);
+    }
+
+  gimp_gradient_tool_editor_purge_gradient_history (&gradient_tool->undo_stack);
+  gimp_gradient_tool_editor_purge_gradient_history (&gradient_tool->redo_stack);
+}
+
+static GtkWidget *
+gimp_gradient_tool_editor_color_entry_new (GimpGradientTool  *gradient_tool,
+                                           const gchar       *title,
+                                           Direction          direction,
+                                           GtkWidget         *chain_button,
+                                           GtkWidget        **color_panel,
+                                           GtkWidget        **type_combo)
+{
+  GimpContext *context = GIMP_CONTEXT (GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool));
+  GtkWidget   *hbox;
+  GtkWidget   *button;
+  GtkWidget   *combo;
+  GimpRGB      color   = {};
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+
+  /* the color panel */
+  *color_panel = button = gimp_color_panel_new (title, &color,
+                                                GIMP_COLOR_AREA_SMALL_CHECKS,
+                                                24, 24);
+  gimp_color_button_set_update (GIMP_COLOR_BUTTON (button), TRUE);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), context);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_object_set_data (G_OBJECT (button),
+                     "gimp-gradient-tool-editor-direction",
+                     GINT_TO_POINTER (direction));
+  g_object_set_data (G_OBJECT (button),
+                     "gimp-gradient-tool-editor-chain-button",
+                     chain_button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_gradient_tool_editor_color_entry_color_clicked),
+                    gradient_tool);
+  g_signal_connect (button, "color-changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_color_entry_color_changed),
+                    gradient_tool);
+  g_signal_connect (button, "response",
+                    G_CALLBACK (gimp_gradient_tool_editor_color_entry_color_response),
+                    gradient_tool);
+
+  /* the color type combo */
+  *type_combo = combo = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_COLOR);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  g_object_set_data (G_OBJECT (combo),
+                     "gimp-gradient-tool-editor-direction",
+                     GINT_TO_POINTER (direction));
+  g_object_set_data (G_OBJECT (combo),
+                     "gimp-gradient-tool-editor-chain-button",
+                     chain_button);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_color_entry_type_changed),
+                    gradient_tool);
+
+  return hbox;
+}
+
+static void
+gimp_gradient_tool_editor_init_endpoint_gui (GimpGradientTool *gradient_tool)
+{
+  GimpDisplay      *display = GIMP_TOOL (gradient_tool)->display;
+  GimpDisplayShell *shell   = gimp_display_get_shell (display);
+  GimpImage        *image   = gimp_display_get_image (display);
+  gdouble           xres;
+  gdouble           yres;
+  GtkWidget        *editor;
+  GtkWidget        *table;
+  GtkWidget        *label;
+  GtkWidget        *spinbutton;
+  GtkWidget        *se;
+  GtkWidget        *hbox;
+  gint              row     = 0;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  /* the endpoint editor */
+  gradient_tool->endpoint_editor =
+  editor                         = gimp_editor_new ();
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gradient_tool->gui)),
+                      editor, FALSE, TRUE, 0);
+
+  /* the main table */
+  table = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0);
+  gtk_widget_show (table);
+
+  /* the position labels */
+  label = gtk_label_new (_("X:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("Y:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the position size entry */
+  spinbutton = gimp_spin_button_new_with_range (0.0, 0.0, 1.0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6);
+
+  gradient_tool->endpoint_se =
+  se                         = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
+                                                    TRUE, TRUE, FALSE, 6,
+                                                    GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_row_spacings (GTK_TABLE (se), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (se), 2);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (se),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (se), spinbutton, 1, 2, 0, 1);
+  gtk_widget_show (spinbutton);
+
+  gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 2,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (se);
+
+  gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (se), shell->unit);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (se), 0, xres, FALSE);
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (se), 1, yres, FALSE);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 0,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 1,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (se), 0,
+                            0, gimp_image_get_width (image));
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (se), 1,
+                            0, gimp_image_get_height (image));
+
+  g_signal_connect (se, "value-changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_endpoint_se_value_changed),
+                    gradient_tool);
+
+  row += 2;
+
+  /* the color label */
+  label = gtk_label_new (_("Color:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the color entry */
+  hbox = gimp_gradient_tool_editor_color_entry_new (
+    gradient_tool, _("Change Endpoint Color"), DIRECTION_NONE, NULL,
+    &gradient_tool->endpoint_color_panel, &gradient_tool->endpoint_type_combo);
+  gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (hbox);
+
+  row++;
+}
+
+static void
+gimp_gradient_tool_editor_init_stop_gui (GimpGradientTool *gradient_tool)
+{
+  GtkWidget *editor;
+  GtkWidget *table;
+  GtkWidget *label;
+  GtkWidget *se;
+  GtkWidget *table2;
+  GtkWidget *button;
+  GtkWidget *hbox;
+  GtkWidget *separator;
+  gint       row = 0;
+
+  /* the stop editor */
+  gradient_tool->stop_editor =
+  editor                     = gimp_editor_new ();
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gradient_tool->gui)),
+                      editor, FALSE, TRUE, 0);
+
+  /* the main table */
+  table = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0);
+  gtk_widget_show (table);
+
+  /* the position label */
+  label = gtk_label_new (_("Position:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the position size entry */
+  gradient_tool->stop_se =
+  se                     = gimp_size_entry_new (1, GIMP_UNIT_PERCENT, "%a",
+                                                FALSE, TRUE, FALSE, 6,
+                                                GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (se), FALSE);
+  gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (se);
+
+  g_signal_connect (se, "value-changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_stop_se_value_changed),
+                    gradient_tool);
+
+  row++;
+
+  /* the color labels */
+  label = gtk_label_new (_("Left color:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("Right color:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row + 1, row + 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the color entries table */
+  table2 = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table2), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table2), 2);
+  gtk_table_attach (GTK_TABLE (table), table2, 1, 2, row, row + 2,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (table2);
+
+  /* the color entries chain button */
+  gradient_tool->stop_chain_button =
+  button                           = gimp_chain_button_new (GIMP_CHAIN_RIGHT);
+  gtk_table_attach (GTK_TABLE (table2), button, 1, 2, 0, 2,
+                    GTK_SHRINK | GTK_FILL,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    0, 0);
+  gtk_widget_show (button);
+
+  /* the color entries */
+  hbox = gimp_gradient_tool_editor_color_entry_new (
+    gradient_tool, _("Change Stop Color"), DIRECTION_LEFT, button,
+    &gradient_tool->stop_left_color_panel, &gradient_tool->stop_left_type_combo);
+  gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 0, 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (hbox);
+
+  hbox = gimp_gradient_tool_editor_color_entry_new (
+    gradient_tool, _("Change Stop Color"), DIRECTION_RIGHT, button,
+    &gradient_tool->stop_right_color_panel, &gradient_tool->stop_right_type_combo);
+  gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 1, 2,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (hbox);
+
+  row += 2;
+
+  /* the action buttons separator */
+  separator = gtk_hseparator_new ();
+  gtk_table_attach (GTK_TABLE (table), separator, 0, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (separator);
+
+  row++;
+
+  /* the delete button */
+  gimp_editor_add_button (GIMP_EDITOR (editor),
+                          GIMP_ICON_EDIT_DELETE, _("Delete stop"),
+                          NULL,
+                          G_CALLBACK (gimp_gradient_tool_editor_stop_delete_clicked),
+                          NULL, G_OBJECT (gradient_tool));
+}
+
+static void
+gimp_gradient_tool_editor_init_midpoint_gui (GimpGradientTool *gradient_tool)
+{
+  GtkWidget *editor;
+  GtkWidget *table;
+  GtkWidget *label;
+  GtkWidget *se;
+  GtkWidget *combo;
+  GtkWidget *separator;
+  gint       row = 0;
+
+  /* the stop editor */
+  gradient_tool->midpoint_editor =
+  editor                         = gimp_editor_new ();
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gradient_tool->gui)),
+                      editor, FALSE, TRUE, 0);
+
+  /* the main table */
+  table = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_box_pack_start (GTK_BOX (editor), table, FALSE, TRUE, 0);
+  gtk_widget_show (table);
+
+  /* the position label */
+  label = gtk_label_new (_("Position:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the position size entry */
+  gradient_tool->midpoint_se =
+  se                         = gimp_size_entry_new (1, GIMP_UNIT_PERCENT, "%a",
+                                                    FALSE, TRUE, FALSE, 6,
+                                                    GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (se), FALSE);
+  gtk_table_attach (GTK_TABLE (table), se, 1, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (se);
+
+  g_signal_connect (se, "value-changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_midpoint_se_value_changed),
+                    gradient_tool);
+
+  row++;
+
+  /* the type label */
+  label = gtk_label_new (_("Blending:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the type combo */
+  gradient_tool->midpoint_type_combo =
+  combo                              = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_SEGMENT_TYPE);
+  gtk_table_attach (GTK_TABLE (table), combo, 1, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (combo);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_midpoint_type_changed),
+                    gradient_tool);
+
+  row++;
+
+  /* the color label */
+  label = gtk_label_new (_("Coloring:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  /* the color combo */
+  gradient_tool->midpoint_color_combo =
+  combo                              = gimp_enum_combo_box_new (GIMP_TYPE_GRADIENT_SEGMENT_COLOR);
+  gtk_table_attach (GTK_TABLE (table), combo, 1, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (combo);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_midpoint_color_changed),
+                    gradient_tool);
+
+  row++;
+
+  /* the action buttons separator */
+  separator = gtk_hseparator_new ();
+  gtk_table_attach (GTK_TABLE (table), separator, 0, 2, row, row + 1,
+                    GTK_SHRINK | GTK_FILL | GTK_EXPAND,
+                    GTK_SHRINK | GTK_FILL,
+                    0, 0);
+  gtk_widget_show (separator);
+
+  row++;
+
+  /* the new stop button */
+  gradient_tool->midpoint_new_stop_button =
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_DOCUMENT_NEW, _("New stop at midpoint"),
+                            NULL,
+                            G_CALLBACK (gimp_gradient_tool_editor_midpoint_new_stop_clicked),
+                            NULL, G_OBJECT (gradient_tool));
+
+  /* the center button */
+  gradient_tool->midpoint_center_button =
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_CENTER_HORIZONTAL, _("Center midpoint"),
+                            NULL,
+                            G_CALLBACK (gimp_gradient_tool_editor_midpoint_center_clicked),
+                            NULL, G_OBJECT (gradient_tool));
+}
+
+static void
+gimp_gradient_tool_editor_update_endpoint_gui (GimpGradientTool *gradient_tool,
+                                               gint              selection)
+{
+  GimpGradientOptions *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions    *paint_options = GIMP_PAINT_OPTIONS (options);
+  GimpContext         *context       = GIMP_CONTEXT (options);
+  gboolean             editable;
+  GimpGradientSegment *seg;
+  const gchar         *title;
+  gdouble              x;
+  gdouble              y;
+  GimpRGB              color;
+  GimpGradientColor    color_type;
+
+  editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool);
+
+  switch (selection)
+    {
+    case GIMP_TOOL_LINE_HANDLE_START:
+      g_object_get (gradient_tool->widget,
+                    "x1", &x,
+                    "y1", &y,
+                    NULL);
+      break;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      g_object_get (gradient_tool->widget,
+                    "x2", &x,
+                    "y2", &y,
+                    NULL);
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+
+  /* swap the endpoint handles, if necessary */
+  if (paint_options->gradient_options->gradient_reverse)
+    {
+      switch (selection)
+        {
+        case GIMP_TOOL_LINE_HANDLE_START:
+          selection = GIMP_TOOL_LINE_HANDLE_END;
+          break;
+
+        case GIMP_TOOL_LINE_HANDLE_END:
+          selection = GIMP_TOOL_LINE_HANDLE_START;
+          break;
+        }
+    }
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  switch (selection)
+    {
+    case GIMP_TOOL_LINE_HANDLE_START:
+      title = _("Start Endpoint");
+
+      gimp_gradient_segment_get_left_flat_color (gradient_tool->gradient, context,
+                                                 seg, &color);
+      color_type = seg->left_color_type;
+      break;
+
+    case GIMP_TOOL_LINE_HANDLE_END:
+      title = _("End Endpoint");
+
+      gimp_gradient_segment_get_right_flat_color (gradient_tool->gradient, context,
+                                                  seg, &color);
+      color_type = seg->right_color_type;
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+
+  gimp_tool_gui_set_title (gradient_tool->gui, title);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->endpoint_se), 0, x);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->endpoint_se), 1, y);
+
+  gimp_color_button_set_color (
+    GIMP_COLOR_BUTTON (gradient_tool->endpoint_color_panel), &color);
+  gimp_int_combo_box_set_active (
+    GIMP_INT_COMBO_BOX (gradient_tool->endpoint_type_combo), color_type);
+
+  gtk_widget_set_sensitive (gradient_tool->endpoint_color_panel, editable);
+  gtk_widget_set_sensitive (gradient_tool->endpoint_type_combo,  editable);
+
+  gtk_widget_show (gradient_tool->endpoint_editor);
+}
+
+static void
+gimp_gradient_tool_editor_update_stop_gui (GimpGradientTool *gradient_tool,
+                                           gint              selection)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpContext         *context = GIMP_CONTEXT (options);
+  gboolean             editable;
+  GimpGradientSegment *seg;
+  gint                 index;
+  gchar               *title;
+  gdouble              min;
+  gdouble              max;
+  gdouble              value;
+  GimpRGB              left_color;
+  GimpGradientColor    left_color_type;
+  GimpRGB              right_color;
+  GimpGradientColor    right_color_type;
+
+  editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  index = GPOINTER_TO_INT (
+    gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                                NULL)[selection].data);
+
+  title = g_strdup_printf (_("Stop %d"), index + 1);
+
+  min   = seg->left;
+  max   = seg->next->right;
+  value = seg->right;
+
+  gimp_gradient_segment_get_right_flat_color (gradient_tool->gradient, context,
+                                              seg, &left_color);
+  left_color_type = seg->right_color_type;
+
+  gimp_gradient_segment_get_left_flat_color (gradient_tool->gradient, context,
+                                             seg->next, &right_color);
+  right_color_type = seg->next->left_color_type;
+
+  gimp_tool_gui_set_title (gradient_tool->gui, title);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (gradient_tool->stop_se),
+                                         0, 100.0 * min, 100.0 * max);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->stop_se),
+                              0, 100.0 * value);
+
+  gimp_color_button_set_color (
+    GIMP_COLOR_BUTTON (gradient_tool->stop_left_color_panel), &left_color);
+  gimp_int_combo_box_set_active (
+    GIMP_INT_COMBO_BOX (gradient_tool->stop_left_type_combo), left_color_type);
+
+  gimp_color_button_set_color (
+    GIMP_COLOR_BUTTON (gradient_tool->stop_right_color_panel), &right_color);
+  gimp_int_combo_box_set_active (
+    GIMP_INT_COMBO_BOX (gradient_tool->stop_right_type_combo), right_color_type);
+
+  gtk_widget_set_sensitive (gradient_tool->stop_se,                editable);
+  gtk_widget_set_sensitive (gradient_tool->stop_left_color_panel,  editable);
+  gtk_widget_set_sensitive (gradient_tool->stop_left_type_combo,   editable);
+  gtk_widget_set_sensitive (gradient_tool->stop_right_color_panel, editable);
+  gtk_widget_set_sensitive (gradient_tool->stop_right_type_combo,  editable);
+  gtk_widget_set_sensitive (gradient_tool->stop_chain_button,      editable);
+  gtk_widget_set_sensitive (
+    GTK_WIDGET (gimp_editor_get_button_box (GIMP_EDITOR (gradient_tool->stop_editor))),
+    editable);
+
+  g_free (title);
+
+  gtk_widget_show (gradient_tool->stop_editor);
+}
+
+static void
+gimp_gradient_tool_editor_update_midpoint_gui (GimpGradientTool *gradient_tool,
+                                               gint              selection)
+{
+  gboolean                    editable;
+  const GimpGradientSegment  *seg;
+  gint                        index;
+  gchar                      *title;
+  gdouble                     min;
+  gdouble                     max;
+  gdouble                     value;
+  GimpGradientSegmentType     type;
+  GimpGradientSegmentColor    color;
+
+  editable = gimp_gradient_tool_editor_is_gradient_editable (gradient_tool);
+
+  seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, selection);
+
+  index = GPOINTER_TO_INT (
+    gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                                NULL)[selection].data);
+
+  title = g_strdup_printf (_("Midpoint %d"), index + 1);
+
+  min   = seg->left;
+  max   = seg->right;
+  value = seg->middle;
+  type  = seg->type;
+  color = seg->color;
+
+  gimp_tool_gui_set_title (gradient_tool->gui, title);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (gradient_tool->midpoint_se),
+                                         0, 100.0 * min, 100.0 * max);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (gradient_tool->midpoint_se),
+                              0, 100.0 * value);
+
+  gimp_int_combo_box_set_active (
+    GIMP_INT_COMBO_BOX (gradient_tool->midpoint_type_combo), type);
+
+  gimp_int_combo_box_set_active (
+    GIMP_INT_COMBO_BOX (gradient_tool->midpoint_color_combo), color);
+
+  gtk_widget_set_sensitive (gradient_tool->midpoint_new_stop_button,
+                            value > min + EPSILON && value < max - EPSILON);
+  gtk_widget_set_sensitive (gradient_tool->midpoint_center_button,
+                            fabs (value - (min + max) / 2.0) > EPSILON);
+
+  gtk_widget_set_sensitive (gradient_tool->midpoint_se,          editable);
+  gtk_widget_set_sensitive (gradient_tool->midpoint_type_combo,  editable);
+  gtk_widget_set_sensitive (gradient_tool->midpoint_color_combo, editable);
+  gtk_widget_set_sensitive (
+    GTK_WIDGET (gimp_editor_get_button_box (GIMP_EDITOR (gradient_tool->midpoint_editor))),
+    editable);
+
+  g_free (title);
+
+  gtk_widget_show (gradient_tool->midpoint_editor);
+}
+
+static void
+gimp_gradient_tool_editor_update_gui (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+
+  if (gradient_tool->gradient && gradient_tool->widget && ! options->instant)
+    {
+      gint selection;
+
+      selection =
+        gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+      if (selection != GIMP_TOOL_LINE_HANDLE_NONE)
+        {
+          if (! gradient_tool->gui)
+            {
+              GimpDisplayShell *shell;
+
+              shell = gimp_tool_widget_get_shell (gradient_tool->widget);
+
+              gradient_tool->gui =
+                gimp_tool_gui_new (GIMP_TOOL (gradient_tool)->tool_info,
+                                   NULL, NULL, NULL, NULL,
+                                   gtk_widget_get_screen (GTK_WIDGET (shell)),
+                                   gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                                   TRUE,
+
+                                   _("_Close"), GTK_RESPONSE_CLOSE,
+
+                                   NULL);
+
+              gimp_tool_gui_set_shell (gradient_tool->gui, shell);
+              gimp_tool_gui_set_viewable (gradient_tool->gui,
+                                          GIMP_VIEWABLE (gradient_tool->gradient));
+              gimp_tool_gui_set_auto_overlay (gradient_tool->gui, TRUE);
+
+              g_signal_connect (gradient_tool->gui, "response",
+                                G_CALLBACK (gimp_gradient_tool_editor_gui_response),
+                                gradient_tool);
+
+              gimp_gradient_tool_editor_init_endpoint_gui (gradient_tool);
+              gimp_gradient_tool_editor_init_stop_gui     (gradient_tool);
+              gimp_gradient_tool_editor_init_midpoint_gui (gradient_tool);
+            }
+
+          gimp_gradient_tool_editor_block_handlers (gradient_tool);
+
+          if (gimp_gradient_tool_editor_handle_is_endpoint (gradient_tool, selection))
+            gimp_gradient_tool_editor_update_endpoint_gui (gradient_tool, selection);
+          else
+            gtk_widget_hide (gradient_tool->endpoint_editor);
+
+          if (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, selection))
+            gimp_gradient_tool_editor_update_stop_gui (gradient_tool, selection);
+          else
+            gtk_widget_hide (gradient_tool->stop_editor);
+
+          if (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, selection))
+            gimp_gradient_tool_editor_update_midpoint_gui (gradient_tool, selection);
+          else
+            gtk_widget_hide (gradient_tool->midpoint_editor);
+
+          gimp_gradient_tool_editor_unblock_handlers (gradient_tool);
+
+          gimp_tool_gui_show (gradient_tool->gui);
+
+          return;
+        }
+    }
+
+  if (gradient_tool->gui)
+    gimp_tool_gui_hide (gradient_tool->gui);
+}
+
+static GradientInfo *
+gimp_gradient_tool_editor_gradient_info_new (GimpGradientTool *gradient_tool)
+{
+  GradientInfo *info = g_slice_new (GradientInfo);
+
+  info->start_x         = gradient_tool->start_x;
+  info->start_y         = gradient_tool->start_y;
+  info->end_x           = gradient_tool->end_x;
+  info->end_y           = gradient_tool->end_y;
+
+  info->gradient        = NULL;
+
+  info->added_handle    = GIMP_TOOL_LINE_HANDLE_NONE;
+  info->removed_handle  = GIMP_TOOL_LINE_HANDLE_NONE;
+  info->selected_handle = GIMP_TOOL_LINE_HANDLE_NONE;
+
+  return info;
+}
+
+static void
+gimp_gradient_tool_editor_gradient_info_free (GradientInfo *info)
+{
+  if (info->gradient)
+    g_object_unref (info->gradient);
+
+  g_slice_free (GradientInfo, info);
+}
+
+static void
+gimp_gradient_tool_editor_gradient_info_apply (GimpGradientTool   *gradient_tool,
+                                               const GradientInfo *info,
+                                               gboolean            set_selection)
+{
+  gint selection;
+
+  gimp_assert (gradient_tool->widget   != NULL);
+  gimp_assert (gradient_tool->gradient != NULL);
+
+  /* pick the handle to select */
+  if (info->gradient)
+    {
+      if (info->removed_handle != GIMP_TOOL_LINE_HANDLE_NONE)
+        {
+          /* we're undoing a stop-deletion or midpoint-to-stop operation;
+           * select the removed handle
+           */
+          selection = info->removed_handle;
+        }
+      else if (info->added_handle != GIMP_TOOL_LINE_HANDLE_NONE)
+        {
+          /* we're undoing a stop addition operation */
+          gimp_assert (gimp_gradient_tool_editor_handle_is_stop (gradient_tool,
+                                                                 info->added_handle));
+
+          selection =
+            gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+          /* if the selected handle is a stop... */
+          if (gimp_gradient_tool_editor_handle_is_stop (gradient_tool, selection))
+            {
+              /* if the added handle is selected, clear the selection */
+              if (selection == info->added_handle)
+                selection = GIMP_TOOL_LINE_HANDLE_NONE;
+              /* otherwise, keep the currently selected stop, possibly
+               * adjusting its handle index
+               */
+              else if (selection > info->added_handle)
+                selection--;
+            }
+          /* otherwise, if the selected handle is a midpoint... */
+          else if (gimp_gradient_tool_editor_handle_is_midpoint (gradient_tool, selection))
+            {
+              const GimpControllerSlider *sliders;
+              gint                        seg_i;
+
+              sliders =
+                gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                                            NULL);
+
+              seg_i = GPOINTER_TO_INT (sliders[selection].data);
+
+              /* if the midpoint belongs to one of the two segments incident to
+               * the added stop, clear the selection
+               */
+              if (seg_i == info->added_handle ||
+                  seg_i == info->added_handle + 1)
+                {
+                  selection = GIMP_TOOL_LINE_HANDLE_NONE;
+                }
+              /* otherwise, keep the currently selected stop, adjusting its
+               * handle index
+               */
+              else
+                {
+                  /* midpoint handles follow stop handles; since we removed a
+                   * stop, we must decrement the handle index
+                   */
+                  selection--;
+
+                  if (seg_i > info->added_handle)
+                    selection--;
+                }
+            }
+          /* otherwise, don't change the selection */
+          else
+            {
+              set_selection = FALSE;
+            }
+        }
+      else if (info->selected_handle != GIMP_TOOL_LINE_HANDLE_NONE)
+        {
+          /* we're undoing a property change operation; select the handle
+           * corresponding to the affected object
+           */
+          selection = info->selected_handle;
+        }
+      else
+        {
+          /* something went wrong... */
+          g_warn_if_reached ();
+
+          set_selection = FALSE;
+        }
+    }
+  else if ((info->start_x != gradient_tool->start_x  ||
+            info->start_y != gradient_tool->start_y) &&
+           (info->end_x   == gradient_tool->end_x    &&
+            info->end_y   == gradient_tool->end_y))
+    {
+      /* we're undoing a start-endpoint move operation; select the start
+       * endpoint
+       */
+      selection = GIMP_TOOL_LINE_HANDLE_START;
+    }
+  else if ((info->end_x   != gradient_tool->end_x    ||
+            info->end_y   != gradient_tool->end_y)   &&
+           (info->start_x == gradient_tool->start_x  &&
+            info->start_y == gradient_tool->start_y))
+
+    {
+      /* we're undoing am end-endpoint move operation; select the end
+       * endpoint
+       */
+      selection = GIMP_TOOL_LINE_HANDLE_END;
+    }
+  else
+    {
+      /* we're undoing a line move operation; don't change the selection */
+      set_selection = FALSE;
+    }
+
+  gimp_gradient_tool_editor_block_handlers (gradient_tool);
+
+  g_object_set (gradient_tool->widget,
+                "x1", info->start_x,
+                "y1", info->start_y,
+                "x2", info->end_x,
+                "y2", info->end_y,
+                NULL);
+
+  if (info->gradient)
+    {
+      gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+      gimp_data_copy (GIMP_DATA (gradient_tool->gradient),
+                      GIMP_DATA (info->gradient));
+
+      gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+    }
+
+  if (set_selection)
+    {
+      gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget),
+                                    selection);
+    }
+
+  gimp_gradient_tool_editor_update_gui (gradient_tool);
+
+  gimp_gradient_tool_editor_unblock_handlers (gradient_tool);
+}
+
+static gboolean
+gimp_gradient_tool_editor_gradient_info_is_trivial (GimpGradientTool   *gradient_tool,
+                                                    const GradientInfo *info)
+{
+  const GimpGradientSegment *seg1;
+  const GimpGradientSegment *seg2;
+
+  if (info->start_x != gradient_tool->start_x ||
+      info->start_y != gradient_tool->start_y ||
+      info->end_x   != gradient_tool->end_x   ||
+      info->end_y   != gradient_tool->end_y)
+    {
+      return FALSE;
+    }
+
+  if (info->gradient)
+    {
+      for (seg1 = info->gradient->segments, seg2 = gradient_tool->gradient->segments;
+           seg1 && seg2;
+           seg1 = seg1->next, seg2 = seg2->next)
+        {
+          if (memcmp (seg1, seg2, G_STRUCT_OFFSET (GimpGradientSegment, prev)))
+            return FALSE;
+        }
+
+      if (seg1 || seg2)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_gradient_tool_editor_options_notify (GimpGradientTool *gradient_tool,
+                                          GimpToolOptions  *options,
+                                          const GParamSpec *pspec)
+{
+  if (! strcmp (pspec->name, "modify-active"))
+    {
+      gimp_gradient_tool_editor_update_sliders (gradient_tool);
+      gimp_gradient_tool_editor_update_gui (gradient_tool);
+    }
+  else if (! strcmp (pspec->name, "gradient-reverse"))
+    {
+      gimp_gradient_tool_editor_update_sliders (gradient_tool);
+
+      /* if an endpoint is selected, swap the selected endpoint */
+      if (gradient_tool->widget)
+        {
+          gint selection;
+
+          selection =
+            gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+          switch (selection)
+            {
+            case GIMP_TOOL_LINE_HANDLE_START:
+              gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget),
+                                            GIMP_TOOL_LINE_HANDLE_END);
+              break;
+
+            case GIMP_TOOL_LINE_HANDLE_END:
+              gimp_tool_line_set_selection (GIMP_TOOL_LINE (gradient_tool->widget),
+                                            GIMP_TOOL_LINE_HANDLE_START);
+              break;
+            }
+        }
+    }
+  else if (gradient_tool->render_node &&
+           gegl_node_find_property (gradient_tool->render_node, pspec->name))
+    {
+      gimp_gradient_tool_editor_update_sliders (gradient_tool);
+    }
+}
+
+void
+gimp_gradient_tool_editor_start (GimpGradientTool *gradient_tool)
+{
+  g_signal_connect (gradient_tool->widget, "can-add-slider",
+                    G_CALLBACK (gimp_gradient_tool_editor_line_can_add_slider),
+                    gradient_tool);
+  g_signal_connect (gradient_tool->widget, "add-slider",
+                    G_CALLBACK (gimp_gradient_tool_editor_line_add_slider),
+                    gradient_tool);
+  g_signal_connect (gradient_tool->widget, "prepare-to-remove-slider",
+                    G_CALLBACK (gimp_gradient_tool_editor_line_prepare_to_remove_slider),
+                    gradient_tool);
+  g_signal_connect (gradient_tool->widget, "remove-slider",
+                    G_CALLBACK (gimp_gradient_tool_editor_line_remove_slider),
+                    gradient_tool);
+  g_signal_connect (gradient_tool->widget, "selection-changed",
+                    G_CALLBACK (gimp_gradient_tool_editor_line_selection_changed),
+                    gradient_tool);
+  g_signal_connect (gradient_tool->widget, "handle-clicked",
+                    G_CALLBACK (gimp_gradient_tool_editor_line_handle_clicked),
+                    gradient_tool);
+}
+
+void
+gimp_gradient_tool_editor_halt (GimpGradientTool *gradient_tool)
+{
+  g_clear_object (&gradient_tool->gui);
+
+  gradient_tool->edit_count = 0;
+
+  if (gradient_tool->undo_stack)
+    {
+      g_slist_free_full (gradient_tool->undo_stack,
+                         (GDestroyNotify) gimp_gradient_tool_editor_gradient_info_free);
+      gradient_tool->undo_stack = NULL;
+    }
+
+  if (gradient_tool->redo_stack)
+    {
+      g_slist_free_full (gradient_tool->redo_stack,
+                         (GDestroyNotify) gimp_gradient_tool_editor_gradient_info_free);
+      gradient_tool->redo_stack = NULL;
+    }
+
+  if (gradient_tool->flush_idle_id)
+    {
+      g_source_remove (gradient_tool->flush_idle_id);
+      gradient_tool->flush_idle_id = 0;
+    }
+}
+
+gboolean
+gimp_gradient_tool_editor_line_changed (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions        *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpPaintOptions           *paint_options = GIMP_PAINT_OPTIONS (options);
+  gdouble                     offset        = options->offset / 100.0;
+  const GimpControllerSlider *sliders;
+  gint                        n_sliders;
+  gint                        i;
+  GimpGradientSegment        *seg;
+  gboolean                    changed       = FALSE;
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return FALSE;
+
+  if (! gradient_tool->gradient || offset == 1.0)
+    return FALSE;
+
+  sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (gradient_tool->widget),
+                                        &n_sliders);
+
+  if (n_sliders == 0)
+    return FALSE;
+
+  /* update the midpoints first, since moving the gradient stops may change the
+   * gradient's midpoints w.r.t. the sliders, but not the other way around.
+   */
+  for (seg = gradient_tool->gradient->segments, i = n_sliders / 2;
+       seg;
+       seg = seg->next, i++)
+    {
+      gdouble value;
+
+      value = sliders[i].value;
+
+      /* adjust slider value according to the offset */
+      value = (value - offset) / (1.0 - offset);
+
+      /* flip the slider value, if necessary */
+      if (paint_options->gradient_options->gradient_reverse)
+        value = 1.0 - value;
+
+      if (fabs (value - seg->middle) > EPSILON)
+        {
+          if (! changed)
+            {
+              gimp_gradient_tool_editor_start_edit (gradient_tool);
+              gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+              /* refetch the segment, since the gradient might have changed */
+              seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, i);
+
+              changed = TRUE;
+            }
+
+          seg->middle = value;
+        }
+    }
+
+  /* update the gradient stops */
+  for (seg = gradient_tool->gradient->segments, i = 0;
+       seg->next;
+       seg = seg->next, i++)
+    {
+      gdouble value;
+
+      value = sliders[i].value;
+
+      /* adjust slider value according to the offset */
+      value = (value - offset) / (1.0 - offset);
+
+      /* flip the slider value, if necessary */
+      if (paint_options->gradient_options->gradient_reverse)
+        value = 1.0 - value;
+
+      if (fabs (value - seg->right) > EPSILON)
+        {
+          if (! changed)
+            {
+              gimp_gradient_tool_editor_start_edit (gradient_tool);
+              gimp_gradient_tool_editor_freeze_gradient (gradient_tool);
+
+              /* refetch the segment, since the gradient might have changed */
+              seg = gimp_gradient_tool_editor_handle_get_segment (gradient_tool, i);
+
+              changed = TRUE;
+            }
+
+          gimp_gradient_segment_range_compress (gradient_tool->gradient,
+                                                seg, seg,
+                                                seg->left, value);
+          gimp_gradient_segment_range_compress (gradient_tool->gradient,
+                                                seg->next, seg->next,
+                                                value, seg->next->right);
+        }
+    }
+
+  if (changed)
+    {
+      gimp_gradient_tool_editor_thaw_gradient (gradient_tool);
+      gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+    }
+
+  gimp_gradient_tool_editor_update_gui (gradient_tool);
+
+  return changed;
+}
+
+void
+gimp_gradient_tool_editor_fg_bg_changed (GimpGradientTool *gradient_tool)
+{
+  gimp_gradient_tool_editor_update_gui (gradient_tool);
+}
+
+void
+gimp_gradient_tool_editor_gradient_dirty (GimpGradientTool *gradient_tool)
+{
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  gimp_gradient_tool_editor_purge_gradient (gradient_tool);
+}
+
+void
+gimp_gradient_tool_editor_gradient_changed (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpContext         *context = GIMP_CONTEXT (options);
+
+  if (options->modify_active_frame)
+    {
+      gtk_widget_set_sensitive (options->modify_active_frame,
+                                gradient_tool->gradient !=
+                                gimp_gradients_get_custom (context->gimp));
+    }
+
+  if (options->modify_active_hint)
+    {
+      gtk_widget_set_visible (options->modify_active_hint,
+                              gradient_tool->gradient &&
+                              ! gimp_data_is_writable (GIMP_DATA (gradient_tool->gradient)));
+    }
+
+  if (gimp_gradient_tool_editor_are_handlers_blocked (gradient_tool))
+    return;
+
+  gimp_gradient_tool_editor_purge_gradient (gradient_tool);
+}
+
+const gchar *
+gimp_gradient_tool_editor_can_undo (GimpGradientTool *gradient_tool)
+{
+  if (! gradient_tool->undo_stack || gradient_tool->edit_count > 0)
+    return NULL;
+
+  return _("Gradient Step");
+}
+
+const gchar *
+gimp_gradient_tool_editor_can_redo (GimpGradientTool *gradient_tool)
+{
+  if (! gradient_tool->redo_stack || gradient_tool->edit_count > 0)
+    return NULL;
+
+  return _("Gradient Step");
+}
+
+gboolean
+gimp_gradient_tool_editor_undo (GimpGradientTool *gradient_tool)
+{
+  GimpTool  *tool = GIMP_TOOL (gradient_tool);
+  GradientInfo *info;
+  GradientInfo *new_info;
+
+  gimp_assert (gradient_tool->undo_stack != NULL);
+  gimp_assert (gradient_tool->edit_count == 0);
+
+  info = gradient_tool->undo_stack->data;
+
+  new_info = gimp_gradient_tool_editor_gradient_info_new (gradient_tool);
+
+  if (info->gradient)
+    {
+      new_info->gradient =
+        GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient)));
+
+      /* swap the added and removed handles, so that gradient_info_apply() does
+       * the right thing on redo
+       */
+      new_info->added_handle    = info->removed_handle;
+      new_info->removed_handle  = info->added_handle;
+      new_info->selected_handle = info->selected_handle;
+    }
+
+  gradient_tool->undo_stack = g_slist_remove (gradient_tool->undo_stack, info);
+  gradient_tool->redo_stack = g_slist_prepend (gradient_tool->redo_stack, new_info);
+
+  gimp_gradient_tool_editor_gradient_info_apply (gradient_tool, info, TRUE);
+  gimp_gradient_tool_editor_gradient_info_free (info);
+
+  /* the initial state of the gradient tool is not useful; we might as well halt */
+  if (! gradient_tool->undo_stack)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  return TRUE;
+}
+
+gboolean
+gimp_gradient_tool_editor_redo (GimpGradientTool *gradient_tool)
+{
+  GradientInfo *info;
+  GradientInfo *new_info;
+
+  gimp_assert (gradient_tool->redo_stack != NULL);
+  gimp_assert (gradient_tool->edit_count == 0);
+
+  info = gradient_tool->redo_stack->data;
+
+  new_info = gimp_gradient_tool_editor_gradient_info_new (gradient_tool);
+
+  if (info->gradient)
+    {
+      new_info->gradient =
+        GIMP_GRADIENT (gimp_data_duplicate (GIMP_DATA (gradient_tool->gradient)));
+
+      /* swap the added and removed handles, so that gradient_info_apply() does
+       * the right thing on undo
+       */
+      new_info->added_handle    = info->removed_handle;
+      new_info->removed_handle  = info->added_handle;
+      new_info->selected_handle = info->selected_handle;
+    }
+
+  gradient_tool->redo_stack = g_slist_remove (gradient_tool->redo_stack, info);
+  gradient_tool->undo_stack = g_slist_prepend (gradient_tool->undo_stack, new_info);
+
+  gimp_gradient_tool_editor_gradient_info_apply (gradient_tool, info, TRUE);
+  gimp_gradient_tool_editor_gradient_info_free (info);
+
+  return TRUE;
+}
+
+void
+gimp_gradient_tool_editor_start_edit (GimpGradientTool *gradient_tool)
+{
+  if (gradient_tool->edit_count++ == 0)
+    {
+      GradientInfo *info;
+
+      info = gimp_gradient_tool_editor_gradient_info_new (gradient_tool);
+
+      gradient_tool->undo_stack = g_slist_prepend (gradient_tool->undo_stack, info);
+
+      /*  update the undo actions / menu items  */
+      if (! gradient_tool->flush_idle_id)
+        {
+          gradient_tool->flush_idle_id =
+            g_idle_add ((GSourceFunc) gimp_gradient_tool_editor_flush_idle,
+                        gradient_tool);
+        }
+    }
+}
+
+void
+gimp_gradient_tool_editor_end_edit (GimpGradientTool *gradient_tool,
+                                    gboolean          cancel)
+{
+  /* can happen when halting using esc */
+  if (gradient_tool->edit_count == 0)
+    return;
+
+  if (--gradient_tool->edit_count == 0)
+    {
+      GradientInfo *info = gradient_tool->undo_stack->data;
+
+      info->selected_handle =
+        gimp_tool_line_get_selection (GIMP_TOOL_LINE (gradient_tool->widget));
+
+      if (cancel ||
+          gimp_gradient_tool_editor_gradient_info_is_trivial (gradient_tool, info))
+        {
+          /* if the edit is canceled, or if nothing changed, undo the last
+           * step
+           */
+          gimp_gradient_tool_editor_gradient_info_apply (gradient_tool, info, FALSE);
+
+          gradient_tool->undo_stack = g_slist_remove (gradient_tool->undo_stack,
+                                                   info);
+          gimp_gradient_tool_editor_gradient_info_free (info);
+        }
+      else
+        {
+          /* otherwise, blow the redo stack */
+          g_slist_free_full (gradient_tool->redo_stack,
+                             (GDestroyNotify) gimp_gradient_tool_editor_gradient_info_free);
+          gradient_tool->redo_stack = NULL;
+        }
+
+      /*  update the undo actions / menu items  */
+      if (! gradient_tool->flush_idle_id)
+        {
+          gradient_tool->flush_idle_id =
+            g_idle_add ((GSourceFunc) gimp_gradient_tool_editor_flush_idle,
+                        gradient_tool);
+        }
+    }
+}
diff --git a/app/tools/gimpgradienttool-editor.h b/app/tools/gimpgradienttool-editor.h
new file mode 100644
index 0000000..db8fdab
--- /dev/null
+++ b/app/tools/gimpgradienttool-editor.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_GRADIENT_TOOL_EDITOR_H__
+#define  __GIMP_GRADIENT_TOOL_EDITOR_H__
+
+
+void          gimp_gradient_tool_editor_options_notify   (GimpGradientTool *gradient_tool,
+                                                          GimpToolOptions  *options,
+                                                          const GParamSpec *pspec);
+
+void          gimp_gradient_tool_editor_start            (GimpGradientTool *gradient_tool);
+void          gimp_gradient_tool_editor_halt             (GimpGradientTool *gradient_tool);
+
+gboolean      gimp_gradient_tool_editor_line_changed     (GimpGradientTool *gradient_tool);
+
+void          gimp_gradient_tool_editor_fg_bg_changed    (GimpGradientTool *gradient_tool);
+
+void          gimp_gradient_tool_editor_gradient_dirty   (GimpGradientTool *gradient_tool);
+
+void          gimp_gradient_tool_editor_gradient_changed (GimpGradientTool *gradient_tool);
+
+const gchar * gimp_gradient_tool_editor_can_undo         (GimpGradientTool *gradient_tool);
+const gchar * gimp_gradient_tool_editor_can_redo         (GimpGradientTool *gradient_tool);
+
+gboolean      gimp_gradient_tool_editor_undo             (GimpGradientTool *gradient_tool);
+gboolean      gimp_gradient_tool_editor_redo             (GimpGradientTool *gradient_tool);
+
+void          gimp_gradient_tool_editor_start_edit       (GimpGradientTool *gradient_tool);
+void          gimp_gradient_tool_editor_end_edit         (GimpGradientTool *gradient_tool,
+                                                          gboolean          cancel);
+
+
+#endif  /*  __GIMP_GRADIENT_TOOL_EDITOR_H__  */
diff --git a/app/tools/gimpgradienttool.c b/app/tools/gimpgradienttool.c
new file mode 100644
index 0000000..598f804
--- /dev/null
+++ b/app/tools/gimpgradienttool.c
@@ -0,0 +1,1106 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Major improvements for interactivity
+ * Copyright (C) 2014 Michael Henning <drawoc@darkrefraction.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/gimp-operation-config.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-gradient.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimperror.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolline.h"
+
+#include "gimpgradientoptions.h"
+#include "gimpgradienttool.h"
+#include "gimpgradienttool-editor.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_gradient_tool_dispose             (GObject               *object);
+
+static gboolean gimp_gradient_tool_initialize        (GimpTool              *tool,
+                                                      GimpDisplay           *display,
+                                                      GError               **error);
+static void   gimp_gradient_tool_control             (GimpTool              *tool,
+                                                      GimpToolAction         action,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_button_press        (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      guint32                time,
+                                                      GdkModifierType        state,
+                                                      GimpButtonPressType    press_type,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_button_release      (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      guint32                time,
+                                                      GdkModifierType        state,
+                                                      GimpButtonReleaseType  release_type,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_motion              (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      guint32                time,
+                                                      GdkModifierType        state,
+                                                      GimpDisplay           *display);
+static gboolean gimp_gradient_tool_key_press         (GimpTool              *tool,
+                                                      GdkEventKey           *kevent,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_modifier_key        (GimpTool              *tool,
+                                                      GdkModifierType        key,
+                                                      gboolean               press,
+                                                      GdkModifierType        state,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_cursor_update       (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      GdkModifierType        state,
+                                                      GimpDisplay           *display);
+static const gchar * gimp_gradient_tool_can_undo     (GimpTool              *tool,
+                                                      GimpDisplay           *display);
+static const gchar * gimp_gradient_tool_can_redo     (GimpTool              *tool,
+                                                      GimpDisplay           *display);
+static gboolean  gimp_gradient_tool_undo             (GimpTool              *tool,
+                                                      GimpDisplay           *display);
+static gboolean  gimp_gradient_tool_redo             (GimpTool              *tool,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_options_notify      (GimpTool              *tool,
+                                                      GimpToolOptions       *options,
+                                                      const GParamSpec      *pspec);
+
+static void   gimp_gradient_tool_start               (GimpGradientTool         *gradient_tool,
+                                                      const GimpCoords      *coords,
+                                                      GimpDisplay           *display);
+static void   gimp_gradient_tool_halt                (GimpGradientTool         *gradient_tool);
+static void   gimp_gradient_tool_commit              (GimpGradientTool         *gradient_tool);
+
+static void   gimp_gradient_tool_line_changed        (GimpToolWidget        *widget,
+                                                      GimpGradientTool         *gradient_tool);
+static void   gimp_gradient_tool_line_response       (GimpToolWidget        *widget,
+                                                      gint                   response_id,
+                                                      GimpGradientTool         *gradient_tool);
+
+static void   gimp_gradient_tool_precalc_shapeburst  (GimpGradientTool         *gradient_tool);
+
+static void   gimp_gradient_tool_create_graph        (GimpGradientTool         *gradient_tool);
+static void   gimp_gradient_tool_update_graph        (GimpGradientTool         *gradient_tool);
+
+static void   gimp_gradient_tool_fg_bg_changed       (GimpGradientTool         *gradient_tool);
+
+static void   gimp_gradient_tool_gradient_dirty      (GimpGradientTool         *gradient_tool);
+static void   gimp_gradient_tool_set_gradient        (GimpGradientTool         *gradient_tool,
+                                                      GimpGradient          *gradient);
+
+static gboolean gimp_gradient_tool_is_shapeburst     (GimpGradientTool         *gradient_tool);
+
+static void   gimp_gradient_tool_create_filter       (GimpGradientTool         *gradient_tool,
+                                                      GimpDrawable          *drawable);
+static void   gimp_gradient_tool_filter_flush        (GimpDrawableFilter    *filter,
+                                                      GimpTool              *tool);
+
+
+G_DEFINE_TYPE (GimpGradientTool, gimp_gradient_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_gradient_tool_parent_class
+
+
+void
+gimp_gradient_tool_register (GimpToolRegisterCallback  callback,
+                             gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_GRADIENT_TOOL,
+                GIMP_TYPE_GRADIENT_OPTIONS,
+                gimp_gradient_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                GIMP_CONTEXT_PROP_MASK_OPACITY    |
+                GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
+                GIMP_CONTEXT_PROP_MASK_GRADIENT,
+                "gimp-gradient-tool",
+                _("Gradient"),
+                _("Gradient Tool: Fill selected area with a color gradient"),
+                N_("Gra_dient"), "G",
+                NULL, GIMP_HELP_TOOL_GRADIENT,
+                GIMP_ICON_TOOL_GRADIENT,
+                data);
+}
+
+static void
+gimp_gradient_tool_class_init (GimpGradientToolClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass *tool_class   = GIMP_TOOL_CLASS (klass);
+
+  object_class->dispose      = gimp_gradient_tool_dispose;
+
+  tool_class->initialize     = gimp_gradient_tool_initialize;
+  tool_class->control        = gimp_gradient_tool_control;
+  tool_class->button_press   = gimp_gradient_tool_button_press;
+  tool_class->button_release = gimp_gradient_tool_button_release;
+  tool_class->motion         = gimp_gradient_tool_motion;
+  tool_class->key_press      = gimp_gradient_tool_key_press;
+  tool_class->modifier_key   = gimp_gradient_tool_modifier_key;
+  tool_class->cursor_update  = gimp_gradient_tool_cursor_update;
+  tool_class->can_undo       = gimp_gradient_tool_can_undo;
+  tool_class->can_redo       = gimp_gradient_tool_can_redo;
+  tool_class->undo           = gimp_gradient_tool_undo;
+  tool_class->redo           = gimp_gradient_tool_redo;
+  tool_class->options_notify = gimp_gradient_tool_options_notify;
+}
+
+static void
+gimp_gradient_tool_init (GimpGradientTool *gradient_tool)
+{
+  GimpTool *tool = GIMP_TOOL (gradient_tool);
+
+  gimp_tool_control_set_scroll_lock        (tool->control, TRUE);
+  gimp_tool_control_set_preserve           (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask         (tool->control,
+                                            GIMP_DIRTY_IMAGE           |
+                                            GIMP_DIRTY_IMAGE_STRUCTURE |
+                                            GIMP_DIRTY_DRAWABLE        |
+                                            GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_dirty_action       (tool->control,
+                                            GIMP_TOOL_ACTION_COMMIT);
+  gimp_tool_control_set_wants_click        (tool->control, TRUE);
+  gimp_tool_control_set_wants_double_click (tool->control, TRUE);
+  gimp_tool_control_set_active_modifiers   (tool->control,
+                                            GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_GRADIENT);
+  gimp_tool_control_set_action_opacity     (tool->control,
+                                            "context/context-opacity-set");
+  gimp_tool_control_set_action_object_1    (tool->control,
+                                            "context/context-gradient-select-set");
+
+  gimp_draw_tool_set_default_status (GIMP_DRAW_TOOL (tool),
+                                     _("Click-Drag to draw a gradient"));
+}
+
+static void
+gimp_gradient_tool_dispose (GObject *object)
+{
+  GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (object);
+
+  gimp_gradient_tool_set_gradient (gradient_tool, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static gboolean
+gimp_gradient_tool_initialize (GimpTool     *tool,
+                               GimpDisplay  *display,
+                               GError      **error)
+{
+  GimpImage           *image    = gimp_display_get_image (display);
+  GimpDrawable        *drawable = gimp_image_get_active_drawable (image);
+  GimpGradientOptions *options  = GIMP_GRADIENT_TOOL_GET_OPTIONS (tool);
+  GimpGuiConfig       *config   = GIMP_GUI_CONFIG (display->gimp->config);
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      return FALSE;
+    }
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot modify the pixels of layer groups."));
+      return FALSE;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer's pixels are locked."));
+      if (error)
+        gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+      return FALSE;
+    }
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("The active layer is not visible."));
+      return FALSE;
+    }
+
+  if (! gimp_context_get_gradient (GIMP_CONTEXT (options)))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("No gradient available for use with this tool."));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_gradient_tool_control (GimpTool       *tool,
+                            GimpToolAction  action,
+                            GimpDisplay    *display)
+{
+  GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_gradient_tool_halt (gradient_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_gradient_tool_commit (gradient_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_gradient_tool_button_press (GimpTool            *tool,
+                                 const GimpCoords    *coords,
+                                 guint32              time,
+                                 GdkModifierType      state,
+                                 GimpButtonPressType  press_type,
+                                 GimpDisplay         *display)
+{
+  GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool);
+
+  if (tool->display && display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  if (! gradient_tool->widget)
+    {
+      gimp_gradient_tool_start (gradient_tool, coords, display);
+
+      gimp_tool_widget_hover (gradient_tool->widget, coords, state, TRUE);
+    }
+
+  /* call start_edit() before widget_button_press(), because we need to record
+   * the undo state before widget_button_press() potentially changes it.  note
+   * that if widget_button_press() return FALSE, nothing changes and no undo
+   * step is created.
+   */
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    gimp_gradient_tool_editor_start_edit (gradient_tool);
+
+  if (gimp_tool_widget_button_press (gradient_tool->widget, coords, time, state,
+                                     press_type))
+    {
+      gradient_tool->grab_widget = gradient_tool->widget;
+    }
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_gradient_tool_button_release (GimpTool              *tool,
+                                   const GimpCoords      *coords,
+                                   guint32                time,
+                                   GdkModifierType        state,
+                                   GimpButtonReleaseType  release_type,
+                                   GimpDisplay           *display)
+{
+  GimpGradientTool    *gradient_tool = GIMP_GRADIENT_TOOL (tool);
+  GimpGradientOptions *options       = GIMP_GRADIENT_TOOL_GET_OPTIONS (tool);
+
+  gimp_tool_pop_status (tool, display);
+
+  gimp_tool_control_halt (tool->control);
+
+  if (gradient_tool->grab_widget)
+    {
+      gimp_tool_widget_button_release (gradient_tool->grab_widget,
+                                       coords, time, state, release_type);
+      gradient_tool->grab_widget = NULL;
+
+      if (options->instant)
+        {
+          if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+            gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+          else
+            gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+        }
+    }
+
+  if (! options->instant)
+    {
+      gimp_gradient_tool_editor_end_edit (gradient_tool,
+                                          release_type ==
+                                          GIMP_BUTTON_RELEASE_CANCEL);
+    }
+}
+
+static void
+gimp_gradient_tool_motion (GimpTool         *tool,
+                           const GimpCoords *coords,
+                           guint32           time,
+                           GdkModifierType   state,
+                           GimpDisplay      *display)
+{
+  GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool);
+
+  if (gradient_tool->grab_widget)
+    {
+      gimp_tool_widget_motion (gradient_tool->grab_widget, coords, time, state);
+    }
+}
+
+static gboolean
+gimp_gradient_tool_key_press (GimpTool    *tool,
+                              GdkEventKey *kevent,
+                              GimpDisplay *display)
+{
+  GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool);
+  GimpDrawTool     *draw_tool     = GIMP_DRAW_TOOL (tool);
+  gboolean          result;
+
+  /* call start_edit() before widget_key_press(), because we need to record the
+   * undo state before widget_key_press() potentially changes it.  note that if
+   * widget_key_press() return FALSE, nothing changes and no undo step is
+   * created.
+   */
+  if (display == draw_tool->display)
+    gimp_gradient_tool_editor_start_edit (gradient_tool);
+
+  result = GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display);
+
+  if (display == draw_tool->display)
+    gimp_gradient_tool_editor_end_edit (gradient_tool, FALSE);
+
+  return result;
+}
+
+static void
+gimp_gradient_tool_modifier_key (GimpTool        *tool,
+                                 GdkModifierType  key,
+                                 gboolean         press,
+                                 GdkModifierType  state,
+                                 GimpDisplay     *display)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_extend_selection_mask ())
+    {
+      if (options->instant_toggle &&
+          gtk_widget_get_sensitive (options->instant_toggle))
+        {
+          g_object_set (options,
+                        "instant", ! options->instant,
+                        NULL);
+        }
+    }
+}
+
+static void
+gimp_gradient_tool_cursor_update (GimpTool         *tool,
+                                  const GimpCoords *coords,
+                                  GdkModifierType   state,
+                                  GimpDisplay      *display)
+{
+  GimpGuiConfig *config   = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage     *image    = gimp_display_get_image (display);
+  GimpDrawable  *drawable = gimp_image_get_active_drawable (image);
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) ||
+      gimp_item_is_content_locked (GIMP_ITEM (drawable))    ||
+      ! (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+         config->edit_non_visible))
+    {
+      gimp_tool_set_cursor (tool, display,
+                            gimp_tool_control_get_cursor (tool->control),
+                            gimp_tool_control_get_tool_cursor (tool->control),
+                            GIMP_CURSOR_MODIFIER_BAD);
+      return;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static const gchar *
+gimp_gradient_tool_can_undo (GimpTool    *tool,
+                             GimpDisplay *display)
+{
+  return gimp_gradient_tool_editor_can_undo (GIMP_GRADIENT_TOOL (tool));
+}
+
+static const gchar *
+gimp_gradient_tool_can_redo (GimpTool    *tool,
+                             GimpDisplay *display)
+{
+  return gimp_gradient_tool_editor_can_redo (GIMP_GRADIENT_TOOL (tool));
+}
+
+static gboolean
+gimp_gradient_tool_undo (GimpTool    *tool,
+                         GimpDisplay *display)
+{
+  return gimp_gradient_tool_editor_undo (GIMP_GRADIENT_TOOL (tool));
+}
+
+static gboolean
+gimp_gradient_tool_redo (GimpTool    *tool,
+                         GimpDisplay *display)
+{
+  return gimp_gradient_tool_editor_redo (GIMP_GRADIENT_TOOL (tool));
+}
+
+static void
+gimp_gradient_tool_options_notify (GimpTool         *tool,
+                                   GimpToolOptions  *options,
+                                   const GParamSpec *pspec)
+{
+  GimpContext   *context    = GIMP_CONTEXT (options);
+  GimpGradientTool *gradient_tool = GIMP_GRADIENT_TOOL (tool);
+
+  if (! strcmp (pspec->name, "gradient"))
+    {
+      gimp_gradient_tool_set_gradient (gradient_tool, context->gradient);
+
+      if (gradient_tool->filter)
+        gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+    }
+  else if (gradient_tool->render_node &&
+           gegl_node_find_property (gradient_tool->render_node, pspec->name))
+    {
+      /* Sync any property changes on the config object that match the op */
+      GValue value = G_VALUE_INIT;
+
+      g_value_init (&value, pspec->value_type);
+
+      g_object_get_property (G_OBJECT (options), pspec->name, &value);
+      gegl_node_set_property (gradient_tool->render_node, pspec->name, &value);
+
+      g_value_unset (&value);
+
+      if (! strcmp (pspec->name, "gradient-type"))
+        {
+          GimpRepeatMode   gradient_repeat;
+          GimpRepeatMode   node_repeat;
+          GimpGradientType gradient_type;
+
+          gradient_repeat = GIMP_PAINT_OPTIONS (options)->gradient_options->gradient_repeat;
+          gradient_type   = GIMP_GRADIENT_OPTIONS (options)->gradient_type;
+          gegl_node_get (gradient_tool->render_node,
+                         "gradient-repeat", &node_repeat,
+                         NULL);
+
+          if (gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR)
+            {
+              /* These gradient types are only meant to work with repeat
+               * value of "none" so these are the only ones where we
+               * don't keep the render node and the gradient options in
+               * sync.
+               * We could instead reset the "gradient-repeat" value on
+               * GimpGradientOptions, but I assume one would want to revert
+               * back to the last set value if changing back the
+               * gradient type. So instead we just make the option
+               * insensitive (both in GUI and in render).
+               */
+              if (node_repeat != GIMP_REPEAT_NONE)
+                gegl_node_set (gradient_tool->render_node,
+                               "gradient-repeat", GIMP_REPEAT_NONE,
+                               NULL);
+            }
+          else if (node_repeat != gradient_repeat)
+            {
+              gegl_node_set (gradient_tool->render_node,
+                             "gradient-repeat", gradient_repeat,
+                             NULL);
+            }
+
+          if (gimp_gradient_tool_is_shapeburst (gradient_tool))
+            gimp_gradient_tool_precalc_shapeburst (gradient_tool);
+
+          gimp_gradient_tool_update_graph (gradient_tool);
+        }
+
+      gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+    }
+  else if (gradient_tool->render_node                    &&
+           gimp_gradient_tool_is_shapeburst (gradient_tool) &&
+           g_strcmp0 (pspec->name, "distance-metric") == 0)
+    {
+      g_clear_object (&gradient_tool->dist_buffer);
+      gimp_gradient_tool_precalc_shapeburst (gradient_tool);
+      gimp_gradient_tool_update_graph (gradient_tool);
+      gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+    }
+  else if (gradient_tool->filter &&
+           ! strcmp (pspec->name, "opacity"))
+    {
+      gimp_drawable_filter_set_opacity (gradient_tool->filter,
+                                        gimp_context_get_opacity (context));
+    }
+  else if (gradient_tool->filter &&
+           ! strcmp (pspec->name, "paint-mode"))
+    {
+      gimp_drawable_filter_set_mode (gradient_tool->filter,
+                                     gimp_context_get_paint_mode (context),
+                                     GIMP_LAYER_COLOR_SPACE_AUTO,
+                                     GIMP_LAYER_COLOR_SPACE_AUTO,
+                                     gimp_layer_mode_get_paint_composite_mode (
+                                       gimp_context_get_paint_mode (context)));
+    }
+
+  gimp_gradient_tool_editor_options_notify (gradient_tool, options, pspec);
+}
+
+static void
+gimp_gradient_tool_start (GimpGradientTool *gradient_tool,
+                          const GimpCoords *coords,
+                          GimpDisplay      *display)
+{
+  GimpTool            *tool     = GIMP_TOOL (gradient_tool);
+  GimpDisplayShell    *shell    = gimp_display_get_shell (display);
+  GimpImage           *image    = gimp_display_get_image (display);
+  GimpDrawable        *drawable = gimp_image_get_active_drawable (image);
+  GimpGradientOptions *options  = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpContext         *context  = GIMP_CONTEXT (options);
+
+  if (options->instant_toggle)
+    gtk_widget_set_sensitive (options->instant_toggle, FALSE);
+
+  tool->display  = display;
+  tool->drawable = drawable;
+
+  gradient_tool->start_x = coords->x;
+  gradient_tool->start_y = coords->y;
+  gradient_tool->end_x   = coords->x;
+  gradient_tool->end_y   = coords->y;
+
+  gradient_tool->widget = gimp_tool_line_new (shell,
+                                              gradient_tool->start_x,
+                                              gradient_tool->start_y,
+                                              gradient_tool->end_x,
+                                              gradient_tool->end_y);
+
+  g_object_set (gradient_tool->widget,
+                "status-title", _("Gradient: "),
+                NULL);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), gradient_tool->widget);
+
+  g_signal_connect (gradient_tool->widget, "changed",
+                    G_CALLBACK (gimp_gradient_tool_line_changed),
+                    gradient_tool);
+  g_signal_connect (gradient_tool->widget, "response",
+                    G_CALLBACK (gimp_gradient_tool_line_response),
+                    gradient_tool);
+
+  g_signal_connect_swapped (context, "background-changed",
+                            G_CALLBACK (gimp_gradient_tool_fg_bg_changed),
+                            gradient_tool);
+  g_signal_connect_swapped (context, "foreground-changed",
+                            G_CALLBACK (gimp_gradient_tool_fg_bg_changed),
+                            gradient_tool);
+
+  gimp_gradient_tool_create_filter (gradient_tool, drawable);
+
+  /* Initially sync all of the properties */
+  gimp_operation_config_sync_node (G_OBJECT (options),
+                                   gradient_tool->render_node);
+
+  /* We don't allow repeat values for some shapes. */
+  if (options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR)
+    gegl_node_set (gradient_tool->render_node,
+                   "gradient-repeat", GIMP_REPEAT_NONE,
+                   NULL);
+
+  /* Connect signal handlers for the gradient */
+  gimp_gradient_tool_set_gradient (gradient_tool, context->gradient);
+
+  if (gimp_gradient_tool_is_shapeburst (gradient_tool))
+    gimp_gradient_tool_precalc_shapeburst (gradient_tool);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (gradient_tool), display);
+
+  gimp_gradient_tool_editor_start (gradient_tool);
+}
+
+static void
+gimp_gradient_tool_halt (GimpGradientTool *gradient_tool)
+{
+  GimpTool            *tool    = GIMP_TOOL (gradient_tool);
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpContext         *context = GIMP_CONTEXT (options);
+
+  gimp_gradient_tool_editor_halt (gradient_tool);
+
+  if (gradient_tool->graph)
+    {
+      g_clear_object (&gradient_tool->graph);
+      gradient_tool->render_node    = NULL;
+#if 0
+      gradient_tool->subtract_node  = NULL;
+      gradient_tool->divide_node    = NULL;
+#endif
+      gradient_tool->dist_node      = NULL;
+    }
+
+  g_clear_object (&gradient_tool->dist_buffer);
+
+  if (gradient_tool->filter)
+    {
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_drawable_filter_abort (gradient_tool->filter);
+      g_object_unref (gradient_tool->filter);
+      gradient_tool->filter = NULL;
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+
+  gimp_gradient_tool_set_tentative_gradient (gradient_tool, NULL);
+
+  g_signal_handlers_disconnect_by_func (context,
+                                        G_CALLBACK (gimp_gradient_tool_fg_bg_changed),
+                                        gradient_tool);
+
+  if (tool->display)
+    gimp_tool_pop_status (tool, tool->display);
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (gradient_tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (gradient_tool));
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL);
+  g_clear_object (&gradient_tool->widget);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+
+  if (options->instant_toggle)
+    gtk_widget_set_sensitive (options->instant_toggle, TRUE);
+}
+
+static void
+gimp_gradient_tool_commit (GimpGradientTool *gradient_tool)
+{
+  GimpTool *tool = GIMP_TOOL (gradient_tool);
+
+  if (gradient_tool->filter)
+    {
+      /* halt the editor before committing the filter so that the image-flush
+       * idle source is removed, to avoid flushing the image, and hence
+       * restarting the projection rendering, while applying the filter.
+       */
+      gimp_gradient_tool_editor_halt (gradient_tool);
+
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_drawable_filter_commit (gradient_tool->filter,
+                                   GIMP_PROGRESS (tool), FALSE);
+      g_clear_object (&gradient_tool->filter);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+}
+
+static void
+gimp_gradient_tool_line_changed (GimpToolWidget   *widget,
+                                 GimpGradientTool *gradient_tool)
+{
+  gdouble  start_x;
+  gdouble  start_y;
+  gdouble  end_x;
+  gdouble  end_y;
+  gboolean update = FALSE;
+
+  g_object_get (widget,
+                "x1", &start_x,
+                "y1", &start_y,
+                "x2", &end_x,
+                "y2", &end_y,
+                NULL);
+
+  if (start_x != gradient_tool->start_x ||
+      start_y != gradient_tool->start_y ||
+      end_x   != gradient_tool->end_x   ||
+      end_y   != gradient_tool->end_y)
+    {
+      gradient_tool->start_x = start_x;
+      gradient_tool->start_y = start_y;
+      gradient_tool->end_x   = end_x;
+      gradient_tool->end_y   = end_y;
+
+      update = TRUE;
+    }
+
+  if (gimp_gradient_tool_editor_line_changed (gradient_tool))
+    update = TRUE;
+
+  if (update)
+    {
+      gimp_gradient_tool_update_graph (gradient_tool);
+      gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+    }
+}
+
+static void
+gimp_gradient_tool_line_response (GimpToolWidget *widget,
+                                  gint            response_id,
+                                  GimpGradientTool  *gradient_tool)
+{
+  GimpTool *tool = GIMP_TOOL (gradient_tool);
+
+  switch (response_id)
+    {
+    case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+      break;
+
+    case GIMP_TOOL_WIDGET_RESPONSE_CANCEL:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      break;
+    }
+}
+
+static void
+gimp_gradient_tool_precalc_shapeburst (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpTool            *tool    = GIMP_TOOL (gradient_tool);
+  gint                 x, y, width, height;
+
+  if (gradient_tool->dist_buffer || ! tool->drawable)
+    return;
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (tool->drawable),
+                                  &x, &y, &width, &height))
+    return;
+
+  gradient_tool->dist_buffer =
+    gimp_drawable_gradient_shapeburst_distmap (tool->drawable,
+                                               options->distance_metric,
+                                               GEGL_RECTANGLE (x, y, width, height),
+                                               GIMP_PROGRESS (gradient_tool));
+
+  if (gradient_tool->dist_node)
+    gegl_node_set (gradient_tool->dist_node,
+                   "buffer", gradient_tool->dist_buffer,
+                   NULL);
+
+  gimp_progress_end (GIMP_PROGRESS (gradient_tool));
+}
+
+
+/* gegl graph stuff */
+
+static void
+gimp_gradient_tool_create_graph (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpContext         *context = GIMP_CONTEXT (options);
+  GeglNode            *output;
+
+  /* render_node is not supposed to be recreated */
+  g_return_if_fail (gradient_tool->graph == NULL);
+
+  gradient_tool->graph = gegl_node_new ();
+
+  gradient_tool->dist_node =
+    gegl_node_new_child (gradient_tool->graph,
+                         "operation", "gegl:buffer-source",
+                         "buffer",    gradient_tool->dist_buffer,
+                         NULL);
+
+#if 0
+  gradient_tool->subtract_node =
+    gegl_node_new_child (gradient_tool->graph,
+                         "operation", "gegl:subtract",
+                         NULL);
+
+  gradient_tool->divide_node =
+    gegl_node_new_child (gradient_tool->graph,
+                         "operation", "gegl:divide",
+                         NULL);
+#endif
+
+  gradient_tool->render_node =
+    gegl_node_new_child (gradient_tool->graph,
+                         "operation", "gimp:gradient",
+                         "context", context,
+                         NULL);
+
+  output = gegl_node_get_output_proxy (gradient_tool->graph, "output");
+
+  gegl_node_link_many (gradient_tool->dist_node,
+#if 0
+                       gradient_tool->subtract_node,
+                       gradient_tool->divide_node,
+#endif
+                       gradient_tool->render_node,
+                       output,
+                       NULL);
+
+  gimp_gegl_node_set_underlying_operation (gradient_tool->graph,
+                                           gradient_tool->render_node);
+
+  gimp_gradient_tool_update_graph (gradient_tool);
+}
+
+static void
+gimp_gradient_tool_update_graph (GimpGradientTool *gradient_tool)
+{
+  GimpTool            *tool    = GIMP_TOOL (gradient_tool);
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  gint                 off_x, off_y;
+
+  gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
+
+#if 0
+  if (gimp_gradient_tool_is_shapeburst (gradient_tool))
+    {
+      gfloat start, end;
+
+      gegl_buffer_get (gradient_tool->dist_buffer,
+                       GEGL_RECTANGLE (gradient_tool->start_x - off_x,
+                                       gradient_tool->start_y - off_y,
+                                       1, 1),
+                       1.0, babl_format("Y float"), &start,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      gegl_buffer_get (gradient_tool->dist_buffer,
+                       GEGL_RECTANGLE (gradient_tool->end_x - off_x,
+                                       gradient_tool->end_y - off_y,
+                                       1, 1),
+                       1.0, babl_format("Y float"), &end,
+                       GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+      if (start != end)
+        {
+          gegl_node_set (gradient_tool->subtract_node,
+                         "value", (gdouble) start,
+                         NULL);
+          gegl_node_set (gradient_tool->divide_node,
+                         "value", (gdouble) (end - start),
+                         NULL);
+        }
+    }
+  else
+#endif
+    {
+      GeglRectangle roi;
+      gdouble       start_x, start_y;
+      gdouble       end_x,   end_y;
+
+      gimp_item_mask_intersect (GIMP_ITEM (tool->drawable),
+                                &roi.x, &roi.y, &roi.width, &roi.height);
+
+      start_x = gradient_tool->start_x - off_x;
+      start_y = gradient_tool->start_y - off_y;
+      end_x   = gradient_tool->end_x   - off_x;
+      end_y   = gradient_tool->end_y   - off_y;
+
+      gimp_drawable_gradient_adjust_coords (tool->drawable,
+                                            options->gradient_type,
+                                            &roi,
+                                            &start_x, &start_y, &end_x, &end_y);
+
+      gegl_node_set (gradient_tool->render_node,
+                     "start-x", start_x,
+                     "start-y", start_y,
+                     "end-x",   end_x,
+                     "end-y",   end_y,
+                     NULL);
+    }
+}
+
+static void
+gimp_gradient_tool_fg_bg_changed (GimpGradientTool *gradient_tool)
+{
+  if (! gradient_tool->filter || ! gradient_tool->gradient)
+    return;
+
+  if (gimp_gradient_has_fg_bg_segments (gradient_tool->gradient))
+    {
+      /* Set a property on the node. Otherwise it will cache and refuse to update */
+      gegl_node_set (gradient_tool->render_node,
+                     "gradient", gradient_tool->gradient,
+                     NULL);
+
+      /* Update the filter */
+      gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+
+      gimp_gradient_tool_editor_fg_bg_changed (gradient_tool);
+    }
+}
+
+static void
+gimp_gradient_tool_gradient_dirty (GimpGradientTool *gradient_tool)
+{
+  if (! gradient_tool->filter)
+    return;
+
+  if (! gradient_tool->tentative_gradient)
+    {
+      /* Set a property on the node. Otherwise it will cache and refuse to update */
+      gegl_node_set (gradient_tool->render_node,
+                     "gradient", gradient_tool->gradient,
+                     NULL);
+
+      /* Update the filter */
+      gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+    }
+
+  gimp_gradient_tool_editor_gradient_dirty (gradient_tool);
+}
+
+static void
+gimp_gradient_tool_set_gradient (GimpGradientTool *gradient_tool,
+                                 GimpGradient     *gradient)
+{
+  if (gradient_tool->gradient)
+    g_signal_handlers_disconnect_by_func (gradient_tool->gradient,
+                                          G_CALLBACK (gimp_gradient_tool_gradient_dirty),
+                                          gradient_tool);
+
+
+  g_set_object (&gradient_tool->gradient, gradient);
+
+  if (gradient_tool->gradient)
+    {
+      g_signal_connect_swapped (gradient_tool->gradient, "dirty",
+                                G_CALLBACK (gimp_gradient_tool_gradient_dirty),
+                                gradient_tool);
+
+      if (gradient_tool->render_node)
+        gegl_node_set (gradient_tool->render_node,
+                       "gradient", gradient_tool->gradient,
+                       NULL);
+    }
+
+  gimp_gradient_tool_editor_gradient_changed (gradient_tool);
+}
+
+static gboolean
+gimp_gradient_tool_is_shapeburst (GimpGradientTool *gradient_tool)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+
+  return options->gradient_type >= GIMP_GRADIENT_SHAPEBURST_ANGULAR &&
+         options->gradient_type <= GIMP_GRADIENT_SHAPEBURST_DIMPLED;
+}
+
+
+/* image map stuff */
+
+static void
+gimp_gradient_tool_create_filter (GimpGradientTool *gradient_tool,
+                                  GimpDrawable     *drawable)
+{
+  GimpGradientOptions *options = GIMP_GRADIENT_TOOL_GET_OPTIONS (gradient_tool);
+  GimpContext         *context = GIMP_CONTEXT (options);
+
+  if (! gradient_tool->graph)
+    gimp_gradient_tool_create_graph (gradient_tool);
+
+  gradient_tool->filter = gimp_drawable_filter_new (drawable,
+                                                 C_("undo-type", "Gradient"),
+                                                 gradient_tool->graph,
+                                                 GIMP_ICON_TOOL_GRADIENT);
+
+  gimp_drawable_filter_set_region (gradient_tool->filter,
+                                   GIMP_FILTER_REGION_DRAWABLE);
+  gimp_drawable_filter_set_opacity (gradient_tool->filter,
+                                    gimp_context_get_opacity (context));
+  gimp_drawable_filter_set_mode (gradient_tool->filter,
+                                 gimp_context_get_paint_mode (context),
+                                 GIMP_LAYER_COLOR_SPACE_AUTO,
+                                 GIMP_LAYER_COLOR_SPACE_AUTO,
+                                 gimp_layer_mode_get_paint_composite_mode (
+                                   gimp_context_get_paint_mode (context)));
+
+  g_signal_connect (gradient_tool->filter, "flush",
+                    G_CALLBACK (gimp_gradient_tool_filter_flush),
+                    gradient_tool);
+}
+
+static void
+gimp_gradient_tool_filter_flush (GimpDrawableFilter *filter,
+                                 GimpTool           *tool)
+{
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+
+/*  protected functions  */
+
+
+void
+gimp_gradient_tool_set_tentative_gradient (GimpGradientTool *gradient_tool,
+                                           GimpGradient     *gradient)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT_TOOL (gradient_tool));
+  g_return_if_fail (gradient == NULL || GIMP_IS_GRADIENT (gradient));
+
+  if (g_set_object (&gradient_tool->tentative_gradient, gradient))
+    {
+      if (gradient_tool->render_node)
+        {
+          gegl_node_set (gradient_tool->render_node,
+                         "gradient", gradient ? gradient : gradient_tool->gradient,
+                         NULL);
+
+          gimp_drawable_filter_apply (gradient_tool->filter, NULL);
+        }
+    }
+}
diff --git a/app/tools/gimpgradienttool.h b/app/tools/gimpgradienttool.h
new file mode 100644
index 0000000..a28cbf5
--- /dev/null
+++ b/app/tools/gimpgradienttool.h
@@ -0,0 +1,111 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_GRADIENT_TOOL_H__
+#define  __GIMP_GRADIENT_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_GRADIENT_TOOL            (gimp_gradient_tool_get_type ())
+#define GIMP_GRADIENT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_TOOL, GimpGradientTool))
+#define GIMP_GRADIENT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT_TOOL, GimpGradientToolClass))
+#define GIMP_IS_GRADIENT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT_TOOL))
+#define GIMP_IS_GRADIENT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT_TOOL))
+#define GIMP_GRADIENT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT_TOOL, GimpGradientToolClass))
+
+#define GIMP_GRADIENT_TOOL_GET_OPTIONS(t)  (GIMP_GRADIENT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpGradientTool      GimpGradientTool;
+typedef struct _GimpGradientToolClass GimpGradientToolClass;
+
+struct _GimpGradientTool
+{
+  GimpDrawTool        parent_instance;
+
+  GimpGradient       *gradient;
+  GimpGradient       *tentative_gradient;
+
+  gdouble             start_x;    /*  starting x coord  */
+  gdouble             start_y;    /*  starting y coord  */
+  gdouble             end_x;      /*  ending x coord    */
+  gdouble             end_y;      /*  ending y coord    */
+
+  GimpToolWidget     *widget;
+  GimpToolWidget     *grab_widget;
+
+  GeglNode           *graph;
+  GeglNode           *render_node;
+#if 0
+  GeglNode           *subtract_node;
+  GeglNode           *divide_node;
+#endif
+  GeglNode           *dist_node;
+  GeglBuffer         *dist_buffer;
+  GimpDrawableFilter *filter;
+
+  /*  editor  */
+
+  gint                block_handlers_count;
+
+  gint                edit_count;
+  GSList             *undo_stack;
+  GSList             *redo_stack;
+
+  guint               flush_idle_id;
+
+  GimpToolGui        *gui;
+  GtkWidget          *endpoint_editor;
+  GtkWidget          *endpoint_se;
+  GtkWidget          *endpoint_color_panel;
+  GtkWidget          *endpoint_type_combo;
+  GtkWidget          *stop_editor;
+  GtkWidget          *stop_se;
+  GtkWidget          *stop_left_color_panel;
+  GtkWidget          *stop_left_type_combo;
+  GtkWidget          *stop_right_color_panel;
+  GtkWidget          *stop_right_type_combo;
+  GtkWidget          *stop_chain_button;
+  GtkWidget          *midpoint_editor;
+  GtkWidget          *midpoint_se;
+  GtkWidget          *midpoint_type_combo;
+  GtkWidget          *midpoint_color_combo;
+  GtkWidget          *midpoint_new_stop_button;
+  GtkWidget          *midpoint_center_button;
+};
+
+struct _GimpGradientToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+void    gimp_gradient_tool_register               (GimpToolRegisterCallback  callback,
+                                                   gpointer                  data);
+
+GType   gimp_gradient_tool_get_type               (void) G_GNUC_CONST;
+
+
+/*  protected functions  */
+
+void    gimp_gradient_tool_set_tentative_gradient (GimpGradientTool         *gradient_tool,
+                                                   GimpGradient             *gradient);
+
+
+#endif  /*  __GIMP_GRADIENT_TOOL_H__  */
diff --git a/app/tools/gimpguidetool.c b/app/tools/gimpguidetool.c
new file mode 100644
index 0000000..55d5732
--- /dev/null
+++ b/app/tools/gimpguidetool.c
@@ -0,0 +1,546 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-undo.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-selection.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimpguidetool.h"
+#include "gimptoolcontrol.h"
+#include "tool_manager.h"
+
+#include "gimp-intl.h"
+
+
+#define SWAP_ORIENT(orient) ((orient) == GIMP_ORIENTATION_HORIZONTAL ? \
+                             GIMP_ORIENTATION_VERTICAL : \
+                             GIMP_ORIENTATION_HORIZONTAL)
+
+
+/*  local function prototypes  */
+
+static void   gimp_guide_tool_finalize       (GObject               *object);
+
+static void   gimp_guide_tool_button_release (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonReleaseType  release_type,
+                                              GimpDisplay           *display);
+static void   gimp_guide_tool_motion         (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpDisplay           *display);
+
+static void   gimp_guide_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void   gimp_guide_tool_start          (GimpTool              *parent_tool,
+                                              GimpDisplay           *display,
+                                              GList                 *guides,
+                                              GimpOrientationType    orientation);
+
+static void   gimp_guide_tool_push_status    (GimpGuideTool         *guide_tool,
+                                              GimpDisplay           *display,
+                                              gboolean               remove_guides);
+
+
+G_DEFINE_TYPE (GimpGuideTool, gimp_guide_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_guide_tool_parent_class
+
+
+static void
+gimp_guide_tool_class_init (GimpGuideToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->finalize     = gimp_guide_tool_finalize;
+
+  tool_class->button_release = gimp_guide_tool_button_release;
+  tool_class->motion         = gimp_guide_tool_motion;
+
+  draw_tool_class->draw      = gimp_guide_tool_draw;
+}
+
+static void
+gimp_guide_tool_init (GimpGuideTool *guide_tool)
+{
+  GimpTool *tool = GIMP_TOOL (guide_tool);
+
+  gimp_tool_control_set_snap_to            (tool->control, FALSE);
+  gimp_tool_control_set_handle_empty_image (tool->control, TRUE);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_MOVE);
+  gimp_tool_control_set_scroll_lock        (tool->control, TRUE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_PIXEL_BORDER);
+
+  guide_tool->guides   = NULL;
+  guide_tool->n_guides = 0;
+}
+
+static void
+gimp_guide_tool_finalize (GObject *object)
+{
+  GimpGuideTool *guide_tool = GIMP_GUIDE_TOOL (object);
+  gint           i;
+
+  for (i = 0; i < guide_tool->n_guides; i++)
+    g_clear_object (&guide_tool->guides[i].guide);
+
+  g_free (guide_tool->guides);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_guide_tool_button_release (GimpTool              *tool,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonReleaseType  release_type,
+                                GimpDisplay           *display)
+{
+  GimpGuideTool    *guide_tool = GIMP_GUIDE_TOOL (tool);
+  GimpDisplayShell *shell      = gimp_display_get_shell (display);
+  GimpImage        *image      = gimp_display_get_image (display);
+  gint              i;
+
+  gimp_tool_pop_status (tool, display);
+
+  gimp_tool_control_halt (tool->control);
+
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      for (i = 0; i < guide_tool->n_guides; i++)
+        {
+          GimpGuideToolGuide *guide = &guide_tool->guides[i];
+
+          /* custom guides are moved live */
+          if (guide->custom)
+            {
+              gimp_image_move_guide (image, guide->guide, guide->old_position,
+                                     TRUE);
+            }
+        }
+    }
+  else
+    {
+      gint     n_non_custom_guides = 0;
+      gboolean remove_guides       = FALSE;
+
+      for (i = 0; i < guide_tool->n_guides; i++)
+        {
+          GimpGuideToolGuide *guide = &guide_tool->guides[i];
+          gint                max_position;
+
+          if (guide->orientation == GIMP_ORIENTATION_HORIZONTAL)
+            max_position = gimp_image_get_height (image);
+          else
+            max_position = gimp_image_get_width (image);
+
+          n_non_custom_guides += ! guide->custom;
+
+          if (guide->position == GIMP_GUIDE_POSITION_UNDEFINED ||
+              guide->position <  0                             ||
+              guide->position > max_position)
+            {
+              remove_guides = TRUE;
+            }
+        }
+
+      if (n_non_custom_guides > 1)
+        {
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_GUIDE,
+                                       remove_guides ?
+                                         C_("undo-type", "Remove Guides") :
+                                         C_("undo-type", "Move Guides"));
+        }
+
+      for (i = 0; i < guide_tool->n_guides; i++)
+        {
+          GimpGuideToolGuide *guide = &guide_tool->guides[i];
+
+          if (remove_guides)
+            {
+              /* removing a guide can cause other guides to be removed as well
+               * (in particular, in case of symmetry guides).  these guides
+               * will be kept alive, since we hold a reference on them, but we
+               * need to make sure that they're still part of the image.
+               */
+              if (g_list_find (gimp_image_get_guides (image), guide->guide))
+                gimp_image_remove_guide (image, guide->guide, TRUE);
+            }
+          else
+            {
+              if (guide->guide)
+                {
+                  /* custom guides are moved live */
+                  if (! guide->custom)
+                    {
+                      gimp_image_move_guide (image, guide->guide,
+                                             guide->position, TRUE);
+                    }
+                }
+              else
+                {
+                  switch (guide->orientation)
+                    {
+                    case GIMP_ORIENTATION_HORIZONTAL:
+                      gimp_image_add_hguide (image,
+                                             guide->position,
+                                             TRUE);
+                      break;
+
+                    case GIMP_ORIENTATION_VERTICAL:
+                      gimp_image_add_vguide (image,
+                                             guide->position,
+                                             TRUE);
+                      break;
+
+                    default:
+                      gimp_assert_not_reached ();
+                    }
+                }
+            }
+        }
+
+      if (n_non_custom_guides > 1)
+        gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+
+  gimp_display_shell_selection_resume (shell);
+
+  tool_manager_pop_tool (display->gimp);
+  g_object_unref (guide_tool);
+
+  {
+    GimpTool *active_tool = tool_manager_get_active (display->gimp);
+
+    if (GIMP_IS_DRAW_TOOL (active_tool))
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (active_tool));
+
+    tool_manager_oper_update_active (display->gimp, coords, state,
+                                     TRUE, display);
+    tool_manager_cursor_update_active (display->gimp, coords, state,
+                                       display);
+
+    if (GIMP_IS_DRAW_TOOL (active_tool))
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (active_tool));
+  }
+}
+
+static void
+gimp_guide_tool_motion (GimpTool         *tool,
+                        const GimpCoords *coords,
+                        guint32           time,
+                        GdkModifierType   state,
+                        GimpDisplay      *display)
+
+{
+  GimpGuideTool    *guide_tool    = GIMP_GUIDE_TOOL (tool);
+  GimpDisplayShell *shell         = gimp_display_get_shell (display);
+  GimpImage        *image         = gimp_display_get_image (display);
+  gboolean          remove_guides = FALSE;
+  gint              tx, ty;
+  gint              i;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  gimp_display_shell_transform_xy (shell,
+                                   coords->x, coords->y,
+                                   &tx, &ty);
+
+  for (i = 0; i < guide_tool->n_guides; i++)
+    {
+      GimpGuideToolGuide *guide = &guide_tool->guides[i];
+      gint                max_position;
+      gint                position;
+
+      if (guide->orientation == GIMP_ORIENTATION_HORIZONTAL)
+        max_position = gimp_image_get_height (image);
+      else
+        max_position = gimp_image_get_width (image);
+
+      if (guide->orientation == GIMP_ORIENTATION_HORIZONTAL)
+        guide->position = RINT (coords->y);
+      else
+        guide->position = RINT (coords->x);
+
+      position = CLAMP (guide->position, 0, max_position);
+
+      if (tx < 0 || tx >= shell->disp_width ||
+          ty < 0 || ty >= shell->disp_height)
+        {
+          guide->position = GIMP_GUIDE_POSITION_UNDEFINED;
+
+          remove_guides = TRUE;
+        }
+      else
+        {
+          if (guide->position < 0 || guide->position > max_position)
+            remove_guides = TRUE;
+        }
+
+      /* custom guides are moved live */
+      if (guide->custom)
+        gimp_image_move_guide (image, guide->guide, position, TRUE);
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+  gimp_tool_pop_status (tool, display);
+
+  gimp_guide_tool_push_status (guide_tool, display, remove_guides);
+}
+
+static void
+gimp_guide_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpGuideTool *guide_tool = GIMP_GUIDE_TOOL (draw_tool);
+  gint           i;
+
+  for (i = 0; i < guide_tool->n_guides; i++)
+    {
+      GimpGuideToolGuide *guide = &guide_tool->guides[i];
+
+      if (guide->position != GIMP_GUIDE_POSITION_UNDEFINED)
+        {
+          /* custom guides are moved live */
+          if (! guide->custom)
+            {
+              gimp_draw_tool_add_guide (draw_tool,
+                                        guide->orientation,
+                                        guide->position,
+                                        GIMP_GUIDE_STYLE_NONE);
+            }
+        }
+    }
+}
+
+static void
+gimp_guide_tool_start (GimpTool            *parent_tool,
+                       GimpDisplay         *display,
+                       GList               *guides,
+                       GimpOrientationType  orientation)
+{
+  GimpGuideTool *guide_tool;
+  GimpTool      *tool;
+
+  guide_tool = g_object_new (GIMP_TYPE_GUIDE_TOOL,
+                             "tool-info", parent_tool->tool_info,
+                             NULL);
+
+  tool = GIMP_TOOL (guide_tool);
+
+  gimp_display_shell_selection_pause (gimp_display_get_shell (display));
+
+  if (guides)
+    {
+      gint i;
+
+      guide_tool->n_guides = g_list_length (guides);
+      guide_tool->guides   = g_new (GimpGuideToolGuide, guide_tool->n_guides);
+
+      for (i = 0; i < guide_tool->n_guides; i++)
+        {
+          GimpGuide *guide = guides->data;
+
+          guide_tool->guides[i].guide        = g_object_ref (guide);
+          guide_tool->guides[i].old_position = gimp_guide_get_position (guide);
+          guide_tool->guides[i].position     = gimp_guide_get_position (guide);
+          guide_tool->guides[i].orientation  = gimp_guide_get_orientation (guide);
+          guide_tool->guides[i].custom       = gimp_guide_is_custom (guide);
+
+          guides = g_list_next (guides);
+        }
+    }
+  else
+    {
+      guide_tool->n_guides = 1;
+      guide_tool->guides   = g_new (GimpGuideToolGuide, 1);
+
+      guide_tool->guides[0].guide        = NULL;
+      guide_tool->guides[0].old_position = 0;
+      guide_tool->guides[0].position     = GIMP_GUIDE_POSITION_UNDEFINED;
+      guide_tool->guides[0].orientation  = orientation;
+      guide_tool->guides[0].custom       = FALSE;
+    }
+
+  gimp_tool_set_cursor (tool, display,
+                        GIMP_CURSOR_MOUSE,
+                        GIMP_TOOL_CURSOR_HAND,
+                        GIMP_CURSOR_MODIFIER_MOVE);
+
+  tool_manager_push_tool (display->gimp, tool);
+
+  tool->display = display;
+  gimp_tool_control_activate (tool->control);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (guide_tool), display);
+
+  gimp_guide_tool_push_status (guide_tool, display, FALSE);
+}
+
+static void
+gimp_guide_tool_push_status (GimpGuideTool *guide_tool,
+                             GimpDisplay   *display,
+                             gboolean       remove_guides)
+{
+  GimpTool *tool = GIMP_TOOL (guide_tool);
+
+  if (remove_guides)
+    {
+      gimp_tool_push_status (tool, display,
+                             guide_tool->n_guides > 1    ? _("Remove Guides") :
+                             guide_tool->guides[0].guide ? _("Remove Guide")  :
+                                                           _("Cancel Guide"));
+    }
+  else
+    {
+      GimpGuideToolGuide *guides[2];
+      gint                n_guides = 0;
+      gint                i;
+
+      for (i = 0; i < guide_tool->n_guides; i++)
+        {
+          GimpGuideToolGuide *guide = &guide_tool->guides[i];
+
+          if (guide_tool->guides[i].guide)
+            {
+              if (n_guides == 0 || guide->orientation != guides[0]->orientation)
+                {
+                  guides[n_guides++] = guide;
+
+                  if (n_guides == 2)
+                    break;
+                }
+            }
+        }
+
+      if (n_guides == 2 &&
+          guides[0]->orientation == GIMP_ORIENTATION_HORIZONTAL)
+        {
+          GimpGuideToolGuide *temp;
+
+          temp      = guides[0];
+          guides[0] = guides[1];
+          guides[1] = temp;
+        }
+
+       if (n_guides == 1)
+        {
+          gimp_tool_push_status_length (tool, display,
+                                        _("Move Guide: "),
+                                        SWAP_ORIENT (guides[0]->orientation),
+                                        guides[0]->position -
+                                        guides[0]->old_position,
+                                        NULL);
+        }
+      else if (n_guides == 2)
+        {
+          gimp_tool_push_status_coords (tool, display,
+                                        GIMP_CURSOR_PRECISION_PIXEL_BORDER,
+                                        _("Move Guides: "),
+                                        guides[0]->position -
+                                        guides[0]->old_position,
+                                        ", ",
+                                        guides[1]->position -
+                                        guides[1]->old_position,
+                                        NULL);
+        }
+      else
+        {
+          gimp_tool_push_status_length (tool, display,
+                                        _("Add Guide: "),
+                                        SWAP_ORIENT (guide_tool->guides[0].orientation),
+                                        guide_tool->guides[0].position,
+                                        NULL);
+        }
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_guide_tool_start_new (GimpTool            *parent_tool,
+                           GimpDisplay         *display,
+                           GimpOrientationType  orientation)
+{
+  g_return_if_fail (GIMP_IS_TOOL (parent_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (orientation != GIMP_ORIENTATION_UNKNOWN);
+
+  gimp_guide_tool_start (parent_tool, display,
+                         NULL, orientation);
+}
+
+void
+gimp_guide_tool_start_edit (GimpTool    *parent_tool,
+                            GimpDisplay *display,
+                            GimpGuide   *guide)
+{
+  GList *guides = NULL;
+
+  g_return_if_fail (GIMP_IS_TOOL (parent_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (GIMP_IS_GUIDE (guide));
+
+  guides = g_list_append (guides, guide);
+
+  gimp_guide_tool_start (parent_tool, display,
+                         guides, GIMP_ORIENTATION_UNKNOWN);
+
+  g_list_free (guides);
+}
+
+void
+gimp_guide_tool_start_edit_many (GimpTool    *parent_tool,
+                                 GimpDisplay *display,
+                                 GList       *guides)
+{
+  g_return_if_fail (GIMP_IS_TOOL (parent_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (guides != NULL);
+
+  gimp_guide_tool_start (parent_tool, display,
+                         guides, GIMP_ORIENTATION_UNKNOWN);
+}
diff --git a/app/tools/gimpguidetool.h b/app/tools/gimpguidetool.h
new file mode 100644
index 0000000..fa83b36
--- /dev/null
+++ b/app/tools/gimpguidetool.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GUIDE_TOOL_H__
+#define __GIMP_GUIDE_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_GUIDE_TOOL            (gimp_guide_tool_get_type ())
+#define GIMP_GUIDE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GUIDE_TOOL, GimpGuideTool))
+#define GIMP_GUIDE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GUIDE_TOOL, GimpGuideToolClass))
+#define GIMP_IS_GUIDE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GUIDE_TOOL))
+#define GIMP_IS_GUIDE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GUIDE_TOOL))
+#define GIMP_GUIDE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GUIDE_TOOL, GimpGuideToolClass))
+
+
+typedef struct _GimpGuideToolGuide GimpGuideToolGuide;
+typedef struct _GimpGuideTool      GimpGuideTool;
+typedef struct _GimpGuideToolClass GimpGuideToolClass;
+
+struct _GimpGuideToolGuide
+{
+  GimpGuide           *guide;
+
+  gint                 old_position;
+  gint                 position;
+  GimpOrientationType  orientation;
+  gboolean             custom;
+};
+
+struct _GimpGuideTool
+{
+  GimpDrawTool        parent_instance;
+
+  GimpGuideToolGuide *guides;
+  gint                n_guides;
+};
+
+struct _GimpGuideToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+GType   gimp_guide_tool_get_type        (void) G_GNUC_CONST;
+
+void    gimp_guide_tool_start_new       (GimpTool            *parent_tool,
+                                         GimpDisplay         *display,
+                                         GimpOrientationType  orientation);
+void    gimp_guide_tool_start_edit      (GimpTool            *parent_tool,
+                                         GimpDisplay         *display,
+                                         GimpGuide           *guide);
+void    gimp_guide_tool_start_edit_many (GimpTool            *parent_tool,
+                                         GimpDisplay         *display,
+                                         GList               *guides);
+
+
+#endif  /*  __GIMP_GUIDE_TOOL_H__  */
diff --git a/app/tools/gimphandletransformoptions.c b/app/tools/gimphandletransformoptions.c
new file mode 100644
index 0000000..bf24419
--- /dev/null
+++ b/app/tools/gimphandletransformoptions.c
@@ -0,0 +1,202 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimphandletransformoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_HANDLE_MODE
+};
+
+
+static void   gimp_handle_transform_options_set_property (GObject         *object,
+                                                          guint            property_id,
+                                                          const GValue    *value,
+                                                          GParamSpec      *pspec);
+static void   gimp_handle_transform_options_get_property (GObject         *object,
+                                                          guint            property_id,
+                                                          GValue          *value,
+                                                          GParamSpec      *pspec);
+
+
+G_DEFINE_TYPE (GimpHandleTransformOptions, gimp_handle_transform_options,
+               GIMP_TYPE_TRANSFORM_GRID_OPTIONS)
+
+#define parent_class gimp_handle_transform_options_parent_class
+
+
+static void
+gimp_handle_transform_options_class_init (GimpHandleTransformOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_handle_transform_options_set_property;
+  object_class->get_property = gimp_handle_transform_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_HANDLE_MODE,
+                         "handle-mode",
+                         _("Handle mode"),
+                         _("Handle mode"),
+                         GIMP_TYPE_TRANSFORM_HANDLE_MODE,
+                         GIMP_HANDLE_MODE_ADD_TRANSFORM,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_handle_transform_options_init (GimpHandleTransformOptions *options)
+{
+}
+
+static void
+gimp_handle_transform_options_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpHandleTransformOptions *options = GIMP_HANDLE_TRANSFORM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_HANDLE_MODE:
+      options->handle_mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_handle_transform_options_get_property (GObject    *object,
+                                            guint       property_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpHandleTransformOptions *options = GIMP_HANDLE_TRANSFORM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_HANDLE_MODE:
+      g_value_set_enum (value, options->handle_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_handle_transform_options_gui:
+ * @tool_options: a #GimpToolOptions
+ *
+ * Build the Transform Tool Options.
+ *
+ * Return value: a container holding the transform tool options
+ **/
+GtkWidget *
+gimp_handle_transform_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_transform_grid_options_gui (tool_options);
+  GtkWidget *frame;
+  GtkWidget *button;
+  gint       i;
+
+  frame = gimp_prop_enum_radio_frame_new (config, "handle-mode", NULL,
+                                          0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /* add modifier to name, add tooltip */
+  button = g_object_get_data (G_OBJECT (frame), "radio-button");
+
+  if (GTK_IS_RADIO_BUTTON (button))
+    {
+      GSList *list = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+
+      for (i = g_slist_length (list) - 1 ; list; list = list->next, i--)
+        {
+          GdkModifierType  shift    = gimp_get_extend_selection_mask ();
+          GdkModifierType  ctrl     = gimp_get_constrain_behavior_mask ();
+          GdkModifierType  modifier = 0;
+          gchar           *tooltip  = "";
+          gchar           *tip;
+          gchar           *label;
+
+          switch (i)
+            {
+            case GIMP_HANDLE_MODE_ADD_TRANSFORM:
+              modifier = 0;
+              tooltip  = _("Add handles and transform the image");
+              break;
+
+            case GIMP_HANDLE_MODE_MOVE:
+              modifier = shift;
+              tooltip  = _("Move transform handles");
+              break;
+
+            case GIMP_HANDLE_MODE_REMOVE:
+              modifier = ctrl;
+              tooltip  = _("Remove transform handles");
+              break;
+            }
+
+          if (modifier)
+            {
+              label = g_strdup_printf ("%s (%s)",
+                                       gtk_button_get_label (GTK_BUTTON (list->data)),
+                                       gimp_get_mod_string (modifier));
+              gtk_button_set_label (GTK_BUTTON (list->data), label);
+              g_free (label);
+
+              tip = g_strdup_printf ("%s  (%s)",
+                                     tooltip, gimp_get_mod_string (modifier));
+              gimp_help_set_help_data (list->data, tip, NULL);
+              g_free (tip);
+            }
+          else
+            {
+              gimp_help_set_help_data (list->data, tooltip, NULL);
+            }
+        }
+    }
+
+  return vbox;
+}
diff --git a/app/tools/gimphandletransformoptions.h b/app/tools/gimphandletransformoptions.h
new file mode 100644
index 0000000..c0587cb
--- /dev/null
+++ b/app/tools/gimphandletransformoptions.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HANDLE_TRANSFORM_OPTIONS_H__
+#define __GIMP_HANDLE_TRANSFORM_OPTIONS_H__
+
+
+#include "gimptransformgridoptions.h"
+
+
+#define GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS            (gimp_handle_transform_options_get_type ())
+#define GIMP_HANDLE_TRANSFORM_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS, GimpHandleTransformOptions))
+#define GIMP_HANDLE_TRANSFORM_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS, GimpHandleTransformOptionsClass))
+#define GIMP_IS_HANDLE_TRANSFORM_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS))
+#define GIMP_IS_HANDLE_TRANSFORM_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS))
+#define GIMP_HANDLE_TRANSFORM_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS, GimpHandleTransformOptionsClass))
+
+
+typedef struct _GimpHandleTransformOptions      GimpHandleTransformOptions;
+typedef struct _GimpHandleTransformOptionsClass GimpHandleTransformOptionsClass;
+
+struct _GimpHandleTransformOptions
+{
+  GimpTransformGridOptions  parent_instance;
+
+  GimpTransformHandleMode   handle_mode;
+};
+
+struct _GimpHandleTransformOptionsClass
+{
+  GimpTransformGridOptionsClass  parent_class;
+};
+
+
+GType       gimp_handle_transform_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_handle_transform_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_HANDLE_TRANSFORM_OPTIONS_H__ */
diff --git a/app/tools/gimphandletransformtool.c b/app/tools/gimphandletransformtool.c
new file mode 100644
index 0000000..1a20e18
--- /dev/null
+++ b/app/tools/gimphandletransformtool.c
@@ -0,0 +1,384 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolhandlegrid.h"
+#include "display/gimptoolgui.h"
+
+#include "gimphandletransformoptions.h"
+#include "gimphandletransformtool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+/* the transformation is defined by 8 points:
+ *
+ * 4 points on the original image and 4 corresponding points on the
+ * transformed image. The first N_HANDLES points on the transformed
+ * image are visible as handles.
+ *
+ * For these handles, the constants TRANSFORM_HANDLE_N,
+ * TRANSFORM_HANDLE_S, TRANSFORM_HANDLE_E and TRANSFORM_HANDLE_W are
+ * used. Actually, it makes no sense to name the handles with north,
+ * south, east, and west.  But this way, we don't need to define even
+ * more enum constants.
+ */
+
+/*  index into trans_info array  */
+enum
+{
+  X0,
+  Y0,
+  X1,
+  Y1,
+  X2,
+  Y2,
+  X3,
+  Y3,
+  OX0,
+  OY0,
+  OX1,
+  OY1,
+  OX2,
+  OY2,
+  OX3,
+  OY3,
+  N_HANDLES
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_handle_transform_tool_modifier_key   (GimpTool                 *tool,
+                                                                   GdkModifierType           key,
+                                                                   gboolean                  press,
+                                                                   GdkModifierType           state,
+                                                                   GimpDisplay              *display);
+
+static void             gimp_handle_transform_tool_matrix_to_info (GimpTransformGridTool    *tg_tool,
+                                                                   const GimpMatrix3        *transform);
+static void             gimp_handle_transform_tool_prepare        (GimpTransformGridTool    *tg_tool);
+static GimpToolWidget * gimp_handle_transform_tool_get_widget     (GimpTransformGridTool    *tg_tool);
+static void             gimp_handle_transform_tool_update_widget  (GimpTransformGridTool    *tg_tool);
+static void             gimp_handle_transform_tool_widget_changed (GimpTransformGridTool    *tg_tool);
+
+static void             gimp_handle_transform_tool_info_to_points (GimpGenericTransformTool *generic);
+
+
+G_DEFINE_TYPE (GimpHandleTransformTool, gimp_handle_transform_tool,
+               GIMP_TYPE_GENERIC_TRANSFORM_TOOL)
+
+#define parent_class gimp_handle_transform_tool_parent_class
+
+
+void
+gimp_handle_transform_tool_register (GimpToolRegisterCallback  callback,
+                                     gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_HANDLE_TRANSFORM_TOOL,
+                GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS,
+                gimp_handle_transform_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-handle-transform-tool",
+                _("Handle Transform"),
+                _("Handle Transform Tool: "
+                  "Deform the layer, selection or path with handles"),
+                N_("_Handle Transform"), "<shift>L",
+                NULL, GIMP_HELP_TOOL_HANDLE_TRANSFORM,
+                GIMP_ICON_TOOL_HANDLE_TRANSFORM,
+                data);
+}
+
+static void
+gimp_handle_transform_tool_class_init (GimpHandleTransformToolClass *klass)
+{
+  GimpToolClass                 *tool_class    = GIMP_TOOL_CLASS (klass);
+  GimpTransformToolClass        *tr_class   = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass    *tg_class   = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+  GimpGenericTransformToolClass *generic_class = GIMP_GENERIC_TRANSFORM_TOOL_CLASS (klass);
+
+  tool_class->modifier_key      = gimp_handle_transform_tool_modifier_key;
+
+  tg_class->matrix_to_info      = gimp_handle_transform_tool_matrix_to_info;
+  tg_class->prepare             = gimp_handle_transform_tool_prepare;
+  tg_class->get_widget          = gimp_handle_transform_tool_get_widget;
+  tg_class->update_widget       = gimp_handle_transform_tool_update_widget;
+  tg_class->widget_changed      = gimp_handle_transform_tool_widget_changed;
+
+  generic_class->info_to_points = gimp_handle_transform_tool_info_to_points;
+
+  tr_class->undo_desc           = C_("undo-type", "Handle transform");
+  tr_class->progress_text       = _("Handle transformation");
+}
+
+static void
+gimp_handle_transform_tool_init (GimpHandleTransformTool *ht_tool)
+{
+  ht_tool->saved_handle_mode = GIMP_HANDLE_MODE_ADD_TRANSFORM;
+}
+
+static void
+gimp_handle_transform_tool_modifier_key (GimpTool        *tool,
+                                         GdkModifierType  key,
+                                         gboolean         press,
+                                         GdkModifierType  state,
+                                         GimpDisplay     *display)
+{
+  GimpHandleTransformTool    *ht_tool = GIMP_HANDLE_TRANSFORM_TOOL (tool);
+  GimpHandleTransformOptions *options;
+  GdkModifierType             shift   = gimp_get_extend_selection_mask ();
+  GdkModifierType             ctrl    = gimp_get_constrain_behavior_mask ();
+  GimpTransformHandleMode     handle_mode;
+
+  options = GIMP_HANDLE_TRANSFORM_TOOL_GET_OPTIONS (tool);
+
+  handle_mode = options->handle_mode;
+
+  if (press)
+    {
+      if (key == (state & (shift | ctrl)))
+        {
+          /*  first modifier pressed  */
+          ht_tool->saved_handle_mode = options->handle_mode;
+        }
+    }
+  else
+    {
+      if (! (state & (shift | ctrl)))
+        {
+          /*  last modifier released  */
+          handle_mode = ht_tool->saved_handle_mode;
+        }
+    }
+
+  if (state & shift)
+    {
+      handle_mode = GIMP_HANDLE_MODE_MOVE;
+    }
+  else if (state & ctrl)
+    {
+      handle_mode = GIMP_HANDLE_MODE_REMOVE;
+    }
+
+  if (handle_mode != options->handle_mode)
+    {
+      g_object_set (options,
+                    "handle-mode", handle_mode,
+                    NULL);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press,
+                                                state, display);
+}
+
+static void
+gimp_handle_transform_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                           const GimpMatrix3     *transform)
+{
+  gimp_matrix3_transform_point (transform,
+                                tg_tool->trans_info[OX0],
+                                tg_tool->trans_info[OY0],
+                                &tg_tool->trans_info[X0],
+                                &tg_tool->trans_info[Y0]);
+  gimp_matrix3_transform_point (transform,
+                                tg_tool->trans_info[OX1],
+                                tg_tool->trans_info[OY1],
+                                &tg_tool->trans_info[X1],
+                                &tg_tool->trans_info[Y1]);
+  gimp_matrix3_transform_point (transform,
+                                tg_tool->trans_info[OX2],
+                                tg_tool->trans_info[OY2],
+                                &tg_tool->trans_info[X2],
+                                &tg_tool->trans_info[Y2]);
+  gimp_matrix3_transform_point (transform,
+                                tg_tool->trans_info[OX3],
+                                tg_tool->trans_info[OY3],
+                                &tg_tool->trans_info[X3],
+                                &tg_tool->trans_info[Y3]);
+}
+
+static void
+gimp_handle_transform_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->prepare (tg_tool);
+
+  tg_tool->trans_info[X0]        = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y0]        = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X1]        = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y1]        = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X2]        = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y2]        = (gdouble) tr_tool->y2;
+  tg_tool->trans_info[X3]        = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y3]        = (gdouble) tr_tool->y2;
+  tg_tool->trans_info[OX0]       = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[OY0]       = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[OX1]       = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[OY1]       = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[OX2]       = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[OY2]       = (gdouble) tr_tool->y2;
+  tg_tool->trans_info[OX3]       = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[OY3]       = (gdouble) tr_tool->y2;
+  tg_tool->trans_info[N_HANDLES] = 0;
+}
+
+static GimpToolWidget *
+gimp_handle_transform_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool                   *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool          *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpHandleTransformOptions *options;
+  GimpDisplayShell           *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget             *widget;
+
+  options = GIMP_HANDLE_TRANSFORM_TOOL_GET_OPTIONS (tg_tool);
+
+  widget = gimp_tool_handle_grid_new (shell,
+                                      tr_tool->x1,
+                                      tr_tool->y1,
+                                      tr_tool->x2,
+                                      tr_tool->y2);
+
+  g_object_set (widget,
+                "n-handles", (gint) tg_tool->trans_info[N_HANDLES],
+                "orig-x1",   tg_tool->trans_info[OX0],
+                "orig-y1",   tg_tool->trans_info[OY0],
+                "orig-x2",   tg_tool->trans_info[OX1],
+                "orig-y2",   tg_tool->trans_info[OY1],
+                "orig-x3",   tg_tool->trans_info[OX2],
+                "orig-y3",   tg_tool->trans_info[OY2],
+                "orig-x4",   tg_tool->trans_info[OX3],
+                "orig-y4",   tg_tool->trans_info[OY3],
+                "trans-x1",  tg_tool->trans_info[X0],
+                "trans-y1",  tg_tool->trans_info[Y0],
+                "trans-x2",  tg_tool->trans_info[X1],
+                "trans-y2",  tg_tool->trans_info[Y1],
+                "trans-x3",  tg_tool->trans_info[X2],
+                "trans-y3",  tg_tool->trans_info[Y2],
+                "trans-x4",  tg_tool->trans_info[X3],
+                "trans-y4",  tg_tool->trans_info[Y3],
+                NULL);
+
+  g_object_bind_property (G_OBJECT (options), "handle-mode",
+                          G_OBJECT (widget),  "handle-mode",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+
+  return widget;
+}
+
+static void
+gimp_handle_transform_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpMatrix3 transform;
+  gboolean    transform_valid;
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  transform_valid = gimp_transform_grid_tool_info_to_matrix (tg_tool,
+                                                             &transform);
+
+  g_object_set (tg_tool->widget,
+                "show-guides", transform_valid,
+                "n-handles",   (gint) tg_tool->trans_info[N_HANDLES],
+                "orig-x1",     tg_tool->trans_info[OX0],
+                "orig-y1",     tg_tool->trans_info[OY0],
+                "orig-x2",     tg_tool->trans_info[OX1],
+                "orig-y2",     tg_tool->trans_info[OY1],
+                "orig-x3",     tg_tool->trans_info[OX2],
+                "orig-y3",     tg_tool->trans_info[OY2],
+                "orig-x4",     tg_tool->trans_info[OX3],
+                "orig-y4",     tg_tool->trans_info[OY3],
+                "trans-x1",    tg_tool->trans_info[X0],
+                "trans-y1",    tg_tool->trans_info[Y0],
+                "trans-x2",    tg_tool->trans_info[X1],
+                "trans-y2",    tg_tool->trans_info[Y1],
+                "trans-x3",    tg_tool->trans_info[X2],
+                "trans-y3",    tg_tool->trans_info[Y2],
+                "trans-x4",    tg_tool->trans_info[X3],
+                "trans-y4",    tg_tool->trans_info[Y3],
+                NULL);
+}
+
+static void
+gimp_handle_transform_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  gint n_handles;
+
+  g_object_get (tg_tool->widget,
+                "n-handles", &n_handles,
+                "orig-x1",   &tg_tool->trans_info[OX0],
+                "orig-y1",   &tg_tool->trans_info[OY0],
+                "orig-x2",   &tg_tool->trans_info[OX1],
+                "orig-y2",   &tg_tool->trans_info[OY1],
+                "orig-x3",   &tg_tool->trans_info[OX2],
+                "orig-y3",   &tg_tool->trans_info[OY2],
+                "orig-x4",   &tg_tool->trans_info[OX3],
+                "orig-y4",   &tg_tool->trans_info[OY3],
+                "trans-x1",  &tg_tool->trans_info[X0],
+                "trans-y1",  &tg_tool->trans_info[Y0],
+                "trans-x2",  &tg_tool->trans_info[X1],
+                "trans-y2",  &tg_tool->trans_info[Y1],
+                "trans-x3",  &tg_tool->trans_info[X2],
+                "trans-y3",  &tg_tool->trans_info[Y2],
+                "trans-x4",  &tg_tool->trans_info[X3],
+                "trans-y4",  &tg_tool->trans_info[Y3],
+                NULL);
+
+  tg_tool->trans_info[N_HANDLES] = n_handles;
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+gimp_handle_transform_tool_info_to_points (GimpGenericTransformTool *generic)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (generic);
+
+  generic->input_points[0]  = (GimpVector2) {tg_tool->trans_info[OX0],
+                                             tg_tool->trans_info[OY0]};
+  generic->input_points[1]  = (GimpVector2) {tg_tool->trans_info[OX1],
+                                             tg_tool->trans_info[OY1]};
+  generic->input_points[2]  = (GimpVector2) {tg_tool->trans_info[OX2],
+                                             tg_tool->trans_info[OY2]};
+  generic->input_points[3]  = (GimpVector2) {tg_tool->trans_info[OX3],
+                                             tg_tool->trans_info[OY3]};
+
+  generic->output_points[0] = (GimpVector2) {tg_tool->trans_info[X0],
+                                             tg_tool->trans_info[Y0]};
+  generic->output_points[1] = (GimpVector2) {tg_tool->trans_info[X1],
+                                             tg_tool->trans_info[Y1]};
+  generic->output_points[2] = (GimpVector2) {tg_tool->trans_info[X2],
+                                             tg_tool->trans_info[Y2]};
+  generic->output_points[3] = (GimpVector2) {tg_tool->trans_info[X3],
+                                             tg_tool->trans_info[Y3]};
+}
diff --git a/app/tools/gimphandletransformtool.h b/app/tools/gimphandletransformtool.h
new file mode 100644
index 0000000..064208b
--- /dev/null
+++ b/app/tools/gimphandletransformtool.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HANDLE_TRANSFORM_TOOL_H__
+#define __GIMP_HANDLE_TRANSFORM_TOOL_H__
+
+
+#include "gimpgenerictransformtool.h"
+
+
+#define GIMP_TYPE_HANDLE_TRANSFORM_TOOL            (gimp_handle_transform_tool_get_type ())
+#define GIMP_HANDLE_TRANSFORM_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HANDLE_TRANSFORM_TOOL, GimpHandleTransformTool))
+#define GIMP_HANDLE_TRANSFORM_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HANDLE_TRANSFORM_TOOL, GimpHandleTransformToolClass))
+#define GIMP_IS_HANDLE_TRANSFORM_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HANDLE_TRANSFORM_TOOL))
+#define GIMP_IS_HANDLE_TRANSFORM_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HANDLE_TRANSFORM_TOOL))
+#define GIMP_HANDLE_TRANSFORM_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HANDLE_TRANSFORM_TOOL, GimpHandleTransformToolClass))
+
+#define GIMP_HANDLE_TRANSFORM_TOOL_GET_OPTIONS(t)  (GIMP_HANDLE_TRANSFORM_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpHandleTransformTool      GimpHandleTransformTool;
+typedef struct _GimpHandleTransformToolClass GimpHandleTransformToolClass;
+
+struct _GimpHandleTransformTool
+{
+  GimpGenericTransformTool  parent_instance;
+
+  GimpTransformHandleMode   saved_handle_mode;
+};
+
+struct _GimpHandleTransformToolClass
+{
+  GimpGenericTransformToolClass  parent_class;
+};
+
+
+void    gimp_handle_transform_tool_register (GimpToolRegisterCallback  callback,
+                                             gpointer                  data);
+
+GType   gimp_handle_transform_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_HANDLE_TRANSFORM_TOOL_H__  */
diff --git a/app/tools/gimphealtool.c b/app/tools/gimphealtool.c
new file mode 100644
index 0000000..bb43459
--- /dev/null
+++ b/app/tools/gimphealtool.c
@@ -0,0 +1,111 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpsourceoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "gimphealtool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static GtkWidget * gimp_heal_options_gui (GimpToolOptions *tool_options);
+
+
+G_DEFINE_TYPE (GimpHealTool, gimp_heal_tool, GIMP_TYPE_SOURCE_TOOL)
+
+
+void
+gimp_heal_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_HEAL_TOOL,
+                GIMP_TYPE_SOURCE_OPTIONS,
+                gimp_heal_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK,
+                "gimp-heal-tool",
+                _("Healing"),
+                _("Healing Tool: Heal image irregularities"),
+                N_("_Heal"),
+                "H",
+                NULL,
+                GIMP_HELP_TOOL_HEAL,
+                GIMP_ICON_TOOL_HEAL,
+                data);
+}
+
+static void
+gimp_heal_tool_class_init (GimpHealToolClass *klass)
+{
+}
+
+static void
+gimp_heal_tool_init (GimpHealTool *heal)
+{
+  GimpTool       *tool        = GIMP_TOOL (heal);
+  GimpPaintTool  *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_HEAL);
+
+  paint_tool->status      = _("Click to heal");
+  paint_tool->status_ctrl = _("%s to set a new heal source");
+
+  source_tool->status_paint           = _("Click to heal");
+  /* Translators: the translation of "Click" must be the first word */
+  source_tool->status_set_source      = _("Click to set a new heal source");
+  source_tool->status_set_source_ctrl = _("%s to set a new heal source");
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_heal_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget *button;
+  GtkWidget *combo;
+
+  /* the sample merged checkbox */
+  button = gimp_prop_check_button_new (config, "sample-merged",
+                                       _("Sample merged"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /* the alignment combo */
+  combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  return vbox;
+}
diff --git a/app/tools/gimphealtool.h b/app/tools/gimphealtool.h
new file mode 100644
index 0000000..fdcecb1
--- /dev/null
+++ b/app/tools/gimphealtool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HEAL_TOOL_H__
+#define __GIMP_HEAL_TOOL_H__
+
+
+#include "gimpsourcetool.h"
+
+
+#define GIMP_TYPE_HEAL_TOOL            (gimp_heal_tool_get_type ())
+#define GIMP_HEAL_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HEAL_TOOL, GimpHealTool))
+#define GIMP_HEAL_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HEAL_TOOL, GimpHealToolClass))
+#define GIMP_IS_HEAL_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HEAL_TOOL))
+#define GIMP_IS_HEAL_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HEAL_TOOL))
+#define GIMP_HEAL_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HEAL_TOOL, GimpHealToolClass))
+
+
+typedef struct _GimpHealTool      GimpHealTool;
+typedef struct _GimpHealToolClass GimpHealToolClass;
+
+struct _GimpHealTool
+{
+  GimpSourceTool  parent_instance;
+};
+
+struct _GimpHealToolClass
+{
+  GimpSourceToolClass parent_class;
+};
+
+
+void    gimp_heal_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_heal_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_HEAL_TOOL_H__  */
diff --git a/app/tools/gimphistogramoptions.c b/app/tools/gimphistogramoptions.c
new file mode 100644
index 0000000..e70ca21
--- /dev/null
+++ b/app/tools/gimphistogramoptions.c
@@ -0,0 +1,113 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "tools-types.h"
+
+#include "gimphistogramoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SCALE
+};
+
+
+static void   gimp_histogram_options_set_property (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void   gimp_histogram_options_get_property (GObject      *object,
+                                                   guint         property_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpHistogramOptions, gimp_histogram_options,
+               GIMP_TYPE_FILTER_OPTIONS)
+
+
+static void
+gimp_histogram_options_class_init (GimpHistogramOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_histogram_options_set_property;
+  object_class->get_property = gimp_histogram_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_SCALE,
+                         "histogram-scale",
+                         _("Histogram Scale"),
+                         NULL,
+                         GIMP_TYPE_HISTOGRAM_SCALE,
+                         GIMP_HISTOGRAM_SCALE_LINEAR,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_histogram_options_init (GimpHistogramOptions *options)
+{
+}
+
+static void
+gimp_histogram_options_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpHistogramOptions *options = GIMP_HISTOGRAM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SCALE:
+      options->scale = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_histogram_options_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpHistogramOptions *options = GIMP_HISTOGRAM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SCALE:
+      g_value_set_enum (value, options->scale);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
diff --git a/app/tools/gimphistogramoptions.h b/app/tools/gimphistogramoptions.h
new file mode 100644
index 0000000..00606c7
--- /dev/null
+++ b/app/tools/gimphistogramoptions.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HISTOGRAM_OPTIONS_H__
+#define __GIMP_HISTOGRAM_OPTIONS_H__
+
+
+#include "gimpfilteroptions.h"
+
+
+#define GIMP_TYPE_HISTOGRAM_OPTIONS            (gimp_histogram_options_get_type ())
+#define GIMP_HISTOGRAM_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM_OPTIONS, GimpHistogramOptions))
+#define GIMP_HISTOGRAM_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM_OPTIONS, GimpHistogramOptionsClass))
+#define GIMP_IS_HISTOGRAM_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HISTOGRAM_OPTIONS))
+#define GIMP_IS_HISTOGRAM_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HISTOGRAM_OPTIONS))
+#define GIMP_HISTOGRAM_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HISTOGRAM_OPTIONS, GimpHistogramOptionsClass))
+
+
+typedef struct _GimpHistogramOptions      GimpHistogramOptions;
+typedef struct _GimpHistogramOptionsClass GimpHistogramOptionsClass;
+
+struct _GimpHistogramOptions
+{
+  GimpFilterOptions    parent_instance;
+
+  GimpHistogramScale  scale;
+};
+
+struct _GimpHistogramOptionsClass
+{
+  GimpFilterOptionsClass  parent_class;
+};
+
+
+GType   gimp_histogram_options_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_HISTOGRAM_OPTIONS_H__ */
diff --git a/app/tools/gimpinkoptions-gui.c b/app/tools/gimpinkoptions-gui.c
new file mode 100644
index 0000000..70f9e7a
--- /dev/null
+++ b/app/tools/gimpinkoptions-gui.c
@@ -0,0 +1,143 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpconfig-utils.h"
+
+#include "paint/gimpinkoptions.h"
+
+#include "widgets/gimpblobeditor.h"
+#include "widgets/gimppropwidgets.h"
+
+#include "gimpinkoptions-gui.h"
+#include "gimppaintoptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+GtkWidget *
+gimp_ink_options_gui (GimpToolOptions *tool_options)
+{
+  GObject        *config      = G_OBJECT (tool_options);
+  GimpInkOptions *ink_options = GIMP_INK_OPTIONS (tool_options);
+  GtkWidget      *vbox        = gimp_paint_options_gui (tool_options);
+  GtkWidget      *frame;
+  GtkWidget      *vbox2;
+  GtkWidget      *scale;
+  GtkWidget      *blob_box;
+  GtkWidget      *hbox;
+  GtkWidget      *editor;
+  GtkSizeGroup   *size_group;
+
+  /* adjust sliders */
+  frame = gimp_frame_new (_("Adjustment"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  /*  size slider  */
+  scale = gimp_prop_spin_scale_new (config, "size", NULL,
+                                    1.0, 2.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* angle adjust slider */
+  scale = gimp_prop_spin_scale_new (config, "tilt-angle", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* sens sliders */
+  frame = gimp_frame_new (_("Sensitivity"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  /* size sens slider */
+  scale = gimp_prop_spin_scale_new (config, "size-sensitivity", NULL,
+                                    0.01, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* tilt sens slider */
+  scale = gimp_prop_spin_scale_new (config, "tilt-sensitivity", NULL,
+                                    0.01, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* velocity sens slider */
+  scale = gimp_prop_spin_scale_new (config, "vel-sensitivity", NULL,
+                                    0.01, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* Blob shape widgets */
+  frame = gimp_frame_new (_("Shape"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+  gtk_widget_show (hbox);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+
+  /* Blob type radiobuttons */
+  blob_box = gimp_prop_enum_icon_box_new (config, "blob-type",
+                                          "gimp-shape", 0, 0);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (blob_box),
+                                  GTK_ORIENTATION_VERTICAL);
+  gtk_box_pack_start (GTK_BOX (hbox), blob_box, FALSE, FALSE, 0);
+  gtk_widget_show (blob_box);
+
+  gtk_size_group_add_widget (size_group, blob_box);
+  g_object_unref (size_group);
+
+  /* Blob editor */
+  frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  gtk_size_group_add_widget (size_group, frame);
+
+  editor = gimp_blob_editor_new (ink_options->blob_type,
+                                 ink_options->blob_aspect,
+                                 ink_options->blob_angle);
+  gtk_container_add (GTK_CONTAINER (frame), editor);
+  gtk_widget_show (editor);
+
+  gimp_config_connect (config, G_OBJECT (editor), "blob-type");
+  gimp_config_connect (config, G_OBJECT (editor), "blob-aspect");
+  gimp_config_connect (config, G_OBJECT (editor), "blob-angle");
+
+  return vbox;
+}
diff --git a/app/tools/gimpinkoptions-gui.h b/app/tools/gimpinkoptions-gui.h
new file mode 100644
index 0000000..b449d90
--- /dev/null
+++ b/app/tools/gimpinkoptions-gui.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_INK_OPTIONS_GUI_H__
+#define  __GIMP_INK_OPTIONS_GUI_H__
+
+
+GtkWidget * gimp_ink_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_INK_OPTIONS_GUI_H__  */
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
new file mode 100644
index 0000000..4935f7b
--- /dev/null
+++ b/app/tools/gimpinktool.c
@@ -0,0 +1,122 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "paint/gimpinkoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "gimpinkoptions-gui.h"
+#include "gimpinktool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static GimpCanvasItem * gimp_ink_tool_get_outline   (GimpPaintTool *paint_tool,
+                                                     GimpDisplay   *display,
+                                                     gdouble        x,
+                                                     gdouble        y);
+static gboolean         gimp_ink_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                                                     GimpDrawable  *drawable);
+
+
+G_DEFINE_TYPE (GimpInkTool, gimp_ink_tool, GIMP_TYPE_PAINT_TOOL)
+
+#define parent_class gimp_ink_tool_parent_class
+
+
+void
+gimp_ink_tool_register (GimpToolRegisterCallback  callback,
+                        gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_INK_TOOL,
+                GIMP_TYPE_INK_OPTIONS,
+                gimp_ink_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                GIMP_CONTEXT_PROP_MASK_OPACITY    |
+                GIMP_CONTEXT_PROP_MASK_PAINT_MODE,
+                "gimp-ink-tool",
+                _("Ink"),
+                _("Ink Tool: Calligraphy-style painting"),
+                N_("In_k"), "K",
+                NULL, GIMP_HELP_TOOL_INK,
+                GIMP_ICON_TOOL_INK,
+                data);
+}
+
+static void
+gimp_ink_tool_class_init (GimpInkToolClass *klass)
+{
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  paint_tool_class->get_outline   = gimp_ink_tool_get_outline;
+  paint_tool_class->is_alpha_only = gimp_ink_tool_is_alpha_only;
+}
+
+static void
+gimp_ink_tool_init (GimpInkTool *ink_tool)
+{
+  GimpTool *tool = GIMP_TOOL (ink_tool);
+
+  gimp_tool_control_set_tool_cursor   (tool->control, GIMP_TOOL_CURSOR_INK);
+  gimp_tool_control_set_action_size   (tool->control,
+                                       "tools/tools-ink-blob-size-set");
+  gimp_tool_control_set_action_aspect (tool->control,
+                                       "tools/tools-ink-blob-aspect-set");
+  gimp_tool_control_set_action_angle  (tool->control,
+                                       "tools/tools-ink-blob-angle-set");
+
+  gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (ink_tool),
+                                       GIMP_COLOR_PICK_TARGET_FOREGROUND);
+}
+
+static GimpCanvasItem *
+gimp_ink_tool_get_outline (GimpPaintTool *paint_tool,
+                           GimpDisplay   *display,
+                           gdouble        x,
+                           gdouble        y)
+{
+  GimpInkOptions *options = GIMP_INK_TOOL_GET_OPTIONS (paint_tool);
+
+  gimp_paint_tool_set_draw_circle (paint_tool, TRUE,
+                                   options->size);
+
+  return NULL;
+}
+
+static gboolean
+gimp_ink_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                             GimpDrawable  *drawable)
+{
+  GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  GimpContext      *context       = GIMP_CONTEXT (paint_options);
+  GimpLayerMode     paint_mode    = gimp_context_get_paint_mode (context);
+
+  return gimp_layer_mode_is_alpha_only (paint_mode);
+}
diff --git a/app/tools/gimpinktool.h b/app/tools/gimpinktool.h
new file mode 100644
index 0000000..e0076ad
--- /dev/null
+++ b/app/tools/gimpinktool.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_INK_TOOL_H__
+#define  __GIMP_INK_TOOL_H__
+
+
+#include "gimppainttool.h"
+
+
+#define GIMP_TYPE_INK_TOOL            (gimp_ink_tool_get_type ())
+#define GIMP_INK_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_INK_TOOL, GimpInkTool))
+#define GIMP_INK_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_INK_TOOL, GimpInkToolClass))
+#define GIMP_IS_INK_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_INK_TOOL))
+#define GIMP_IS_INK_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_INK_TOOL))
+#define GIMP_INK_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK_TOOL, GimpInkToolClass))
+
+#define GIMP_INK_TOOL_GET_OPTIONS(t)  (GIMP_INK_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpInkTool      GimpInkTool;
+typedef struct _GimpInkToolClass GimpInkToolClass;
+
+struct _GimpInkTool
+{
+  GimpPaintTool parent_instance;
+};
+
+struct _GimpInkToolClass
+{
+  GimpPaintToolClass parent_class;
+};
+
+
+void    gimp_ink_tool_register (GimpToolRegisterCallback  callback,
+                                gpointer                  data);
+
+GType   gimp_ink_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_INK_TOOL_H__  */
diff --git a/app/tools/gimpiscissorsoptions.c b/app/tools/gimpiscissorsoptions.c
new file mode 100644
index 0000000..bad0155
--- /dev/null
+++ b/app/tools/gimpiscissorsoptions.c
@@ -0,0 +1,133 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+
+#include "gimpiscissorstool.h"
+#include "gimpiscissorsoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_INTERACTIVE
+};
+
+
+static void   gimp_iscissors_options_set_property (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void   gimp_iscissors_options_get_property (GObject      *object,
+                                                   guint         property_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpIscissorsOptions, gimp_iscissors_options,
+               GIMP_TYPE_SELECTION_OPTIONS)
+
+#define parent_class gimp_iscissors_options_parent_class
+
+
+static void
+gimp_iscissors_options_class_init (GimpIscissorsOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_iscissors_options_set_property;
+  object_class->get_property = gimp_iscissors_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_INTERACTIVE,
+                            "interactive",
+                            _("Interactive boundary"),
+                            _("Display future selection segment "
+                              "as you drag a control node"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_iscissors_options_init (GimpIscissorsOptions *options)
+{
+}
+
+static void
+gimp_iscissors_options_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpIscissorsOptions *options = GIMP_ISCISSORS_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_INTERACTIVE:
+      options->interactive = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_iscissors_options_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpIscissorsOptions *options = GIMP_ISCISSORS_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_INTERACTIVE:
+      g_value_set_boolean (value, options->interactive);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_iscissors_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config  = G_OBJECT (tool_options);
+  GtkWidget *vbox    = gimp_selection_options_gui (tool_options);
+  GtkWidget *button;
+
+  button = gimp_prop_check_button_new (config, "interactive", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return vbox;
+}
diff --git a/app/tools/gimpiscissorsoptions.h b/app/tools/gimpiscissorsoptions.h
new file mode 100644
index 0000000..a60c251
--- /dev/null
+++ b/app/tools/gimpiscissorsoptions.h
@@ -0,0 +1,49 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ISCISSORS_OPTIONS_H__
+#define __GIMP_ISCISSORS_OPTIONS_H__
+
+
+#include "gimpselectionoptions.h"
+
+
+#define GIMP_TYPE_ISCISSORS_OPTIONS            (gimp_iscissors_options_get_type ())
+#define GIMP_ISCISSORS_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ISCISSORS_OPTIONS, GimpIscissorsOptions))
+#define GIMP_ISCISSORS_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ISCISSORS_OPTIONS, GimpIscissorsOptionsClass))
+#define GIMP_IS_ISCISSORS_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ISCISSORS_OPTIONS))
+#define GIMP_IS_ISCISSORS_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ISCISSORS_OPTIONS))
+#define GIMP_ISCISSORS_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ISCISSORS_OPTIONS, GimpIscissorsOptionsClass))
+
+
+typedef struct _GimpIscissorsOptions GimpIscissorsOptions;
+typedef struct _GimpToolOptionsClass GimpIscissorsOptionsClass;
+
+struct _GimpIscissorsOptions
+{
+  GimpSelectionOptions  parent_instance;
+
+  gboolean              interactive;
+};
+
+
+GType       gimp_iscissors_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_iscissors_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_ISCISSORS_OPTIONS_H__  */
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
new file mode 100644
index 0000000..9e1706c
--- /dev/null
+++ b/app/tools/gimpiscissorstool.c
@@ -0,0 +1,2188 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* This tool is based on a paper from SIGGRAPH '95:
+ *  "Intelligent Scissors for Image Composition", Eric N. Mortensen and
+ *   William A. Barrett, Brigham Young University.
+ *
+ * thanks to Professor D. Forsyth for prompting us to implement this tool. */
+
+/* Personal note: Dr. Barrett, one of the authors of the paper written above
+ * is not only one of the most brilliant people I have ever met, he is an
+ * incredible professor who genuinely cares about his students and wants them
+ * to learn as much as they can about the topic.
+ *
+ * I didn't even notice I was taking a class from the person who wrote the
+ * paper until halfway through the semester.
+ *                                                   -- Rockwalrus
+ */
+
+/* The history of this implementation is lonog and varied.  It was
+ * originally done by Spencer and Peter, and worked fine in the 0.54
+ * (motif only) release of GIMP.  Later revisions (0.99.something
+ * until about 1.1.4) completely changed the algorithm used, until it
+ * bore little resemblance to the one described in the paper above.
+ * The 0.54 version of the algorithm was then forwards ported to 1.1.4
+ * by Austin Donnelly.
+ */
+
+/* Livewire boundary implementation done by Laramie Leavitt */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpscanconvert.h"
+#include "core/gimptempbuf.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpdisplay.h"
+
+#include "gimpiscissorsoptions.h"
+#include "gimpiscissorstool.h"
+#include "gimptilehandleriscissors.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+/*  defines  */
+#define  GRADIENT_SEARCH   32  /* how far to look when snapping to an edge */
+#define  EXTEND_BY         0.2 /* proportion to expand cost map by */
+#define  FIXED             5   /* additional fixed size to expand cost map */
+
+#define  COST_WIDTH        2   /* number of bytes for each pixel in cost map  */
+
+/* weight to give between gradient (_G) and direction (_D) */
+#define  OMEGA_D           0.2
+#define  OMEGA_G           0.8
+
+/* sentinel to mark seed point in ?cost? map */
+#define  SEED_POINT        9
+
+/*  Functional defines  */
+#define  PIXEL_COST(x)     ((x) >> 8)
+#define  PIXEL_DIR(x)      ((x) & 0x000000ff)
+
+
+struct _ISegment
+{
+  gint       x1, y1;
+  gint       x2, y2;
+  GPtrArray *points;
+};
+
+struct _ICurve
+{
+  GQueue   *segments;
+  gboolean  first_point;
+  gboolean  closed;
+};
+
+
+/*  local function prototypes  */
+
+static void          gimp_iscissors_tool_finalize       (GObject               *object);
+
+static void          gimp_iscissors_tool_control        (GimpTool              *tool,
+                                                         GimpToolAction         action,
+                                                         GimpDisplay           *display);
+static void          gimp_iscissors_tool_button_press   (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpButtonPressType    press_type,
+                                                         GimpDisplay           *display);
+static void          gimp_iscissors_tool_button_release (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpButtonReleaseType  release_type,
+                                                         GimpDisplay           *display);
+static void          gimp_iscissors_tool_motion         (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         guint32                time,
+                                                         GdkModifierType        state,
+                                                         GimpDisplay           *display);
+static void          gimp_iscissors_tool_oper_update    (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         GdkModifierType        state,
+                                                         gboolean               proximity,
+                                                         GimpDisplay           *display);
+static void          gimp_iscissors_tool_cursor_update  (GimpTool              *tool,
+                                                         const GimpCoords      *coords,
+                                                         GdkModifierType        state,
+                                                         GimpDisplay           *display);
+static gboolean      gimp_iscissors_tool_key_press      (GimpTool              *tool,
+                                                         GdkEventKey           *kevent,
+                                                         GimpDisplay           *display);
+static const gchar * gimp_iscissors_tool_can_undo       (GimpTool              *tool,
+                                                         GimpDisplay           *display);
+static const gchar * gimp_iscissors_tool_can_redo       (GimpTool              *tool,
+                                                         GimpDisplay           *display);
+static gboolean      gimp_iscissors_tool_undo           (GimpTool              *tool,
+                                                         GimpDisplay           *display);
+static gboolean      gimp_iscissors_tool_redo           (GimpTool              *tool,
+                                                         GimpDisplay           *display);
+
+static void          gimp_iscissors_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void          gimp_iscissors_tool_push_undo      (GimpIscissorsTool     *iscissors);
+static void          gimp_iscissors_tool_pop_undo       (GimpIscissorsTool     *iscissors);
+static void          gimp_iscissors_tool_free_redo      (GimpIscissorsTool     *iscissors);
+
+static void          gimp_iscissors_tool_halt           (GimpIscissorsTool     *iscissors,
+                                                         GimpDisplay           *display);
+static void          gimp_iscissors_tool_commit         (GimpIscissorsTool     *iscissors,
+                                                         GimpDisplay           *display);
+
+static void          iscissors_convert         (GimpIscissorsTool *iscissors,
+                                                GimpDisplay       *display);
+static GeglBuffer  * gradient_map_new          (GimpPickable      *pickable);
+
+static void          find_optimal_path         (GeglBuffer        *gradient_map,
+                                                GimpTempBuf       *dp_buf,
+                                                gint               x1,
+                                                gint               y1,
+                                                gint               x2,
+                                                gint               y2,
+                                                gint               xs,
+                                                gint               ys);
+static void          find_max_gradient         (GimpIscissorsTool *iscissors,
+                                                GimpPickable      *pickable,
+                                                gint              *x,
+                                                gint              *y);
+static void          calculate_segment         (GimpIscissorsTool *iscissors,
+                                                ISegment          *segment);
+static GimpCanvasItem * iscissors_draw_segment (GimpDrawTool      *draw_tool,
+                                                ISegment          *segment);
+
+static gint          mouse_over_vertex         (GimpIscissorsTool *iscissors,
+                                                gdouble            x,
+                                                gdouble            y);
+static gboolean      clicked_on_vertex         (GimpIscissorsTool *iscissors,
+                                                gdouble            x,
+                                                gdouble            y);
+static GList       * mouse_over_segment        (GimpIscissorsTool *iscissors,
+                                                gdouble            x,
+                                                gdouble            y);
+static gboolean      clicked_on_segment        (GimpIscissorsTool *iscissors,
+                                                gdouble            x,
+                                                gdouble            y);
+
+static GPtrArray   * plot_pixels               (GimpTempBuf       *dp_buf,
+                                                gint               x1,
+                                                gint               y1,
+                                                gint               xs,
+                                                gint               ys,
+                                                gint               xe,
+                                                gint               ye);
+
+static ISegment    * isegment_new              (gint               x1,
+                                                gint               y1,
+                                                gint               x2,
+                                                gint               y2);
+static ISegment    * isegment_copy             (ISegment          *segment);
+static void          isegment_free             (ISegment          *segment);
+
+static ICurve      * icurve_new                (void);
+static ICurve      * icurve_copy               (ICurve            *curve);
+static void          icurve_clear              (ICurve            *curve);
+static void          icurve_free               (ICurve            *curve);
+
+static ISegment    * icurve_append_segment     (ICurve            *curve,
+                                                gint               x1,
+                                                gint               y1,
+                                                gint               x2,
+                                                gint               y2);
+static ISegment    * icurve_insert_segment     (ICurve            *curve,
+                                                GList             *sibling,
+                                                gint               x1,
+                                                gint               y1,
+                                                gint               x2,
+                                                gint               y2);
+static void          icurve_delete_segment     (ICurve            *curve,
+                                                ISegment          *segment);
+
+static void          icurve_close              (ICurve            *curve);
+
+static GimpScanConvert *
+                    icurve_create_scan_convert (ICurve            *curve);
+
+
+/*  static variables  */
+
+/*  where to move on a given link direction  */
+static const gint move[8][2] =
+{
+  {  1,  0 },
+  {  0,  1 },
+  { -1,  1 },
+  {  1,  1 },
+  { -1,  0 },
+  {  0, -1 },
+  {  1, -1 },
+  { -1, -1 },
+};
+
+/* IE:
+ * '---+---+---`
+ * | 7 | 5 | 6 |
+ * +---+---+---+
+ * | 4 |   | 0 |
+ * +---+---+---+
+ * | 2 | 1 | 3 |
+ * `---+---+---'
+ */
+
+static gfloat  distance_weights[GRADIENT_SEARCH * GRADIENT_SEARCH];
+
+static gint    diagonal_weight[256];
+static gint    direction_value[256][4];
+
+
+G_DEFINE_TYPE (GimpIscissorsTool, gimp_iscissors_tool,
+               GIMP_TYPE_SELECTION_TOOL)
+
+#define parent_class gimp_iscissors_tool_parent_class
+
+
+void
+gimp_iscissors_tool_register (GimpToolRegisterCallback  callback,
+                              gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_ISCISSORS_TOOL,
+                GIMP_TYPE_ISCISSORS_OPTIONS,
+                gimp_iscissors_options_gui,
+                0,
+                "gimp-iscissors-tool",
+                _("Scissors Select"),
+                _("Scissors Select Tool: Select shapes using intelligent edge-fitting"),
+                N_("Intelligent _Scissors"),
+                "I",
+                NULL, GIMP_HELP_TOOL_ISCISSORS,
+                GIMP_ICON_TOOL_ISCISSORS,
+                data);
+}
+
+static void
+gimp_iscissors_tool_class_init (GimpIscissorsToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+  gint               i, j;
+  gint               radius;
+
+  object_class->finalize     = gimp_iscissors_tool_finalize;
+
+  tool_class->control        = gimp_iscissors_tool_control;
+  tool_class->button_press   = gimp_iscissors_tool_button_press;
+  tool_class->button_release = gimp_iscissors_tool_button_release;
+  tool_class->motion         = gimp_iscissors_tool_motion;
+  tool_class->key_press      = gimp_iscissors_tool_key_press;
+  tool_class->oper_update    = gimp_iscissors_tool_oper_update;
+  tool_class->cursor_update  = gimp_iscissors_tool_cursor_update;
+  tool_class->can_undo       = gimp_iscissors_tool_can_undo;
+  tool_class->can_redo       = gimp_iscissors_tool_can_redo;
+  tool_class->undo           = gimp_iscissors_tool_undo;
+  tool_class->redo           = gimp_iscissors_tool_redo;
+
+  draw_tool_class->draw      = gimp_iscissors_tool_draw;
+
+  for (i = 0; i < 256; i++)
+    {
+      /*  The diagonal weight array  */
+      diagonal_weight[i] = (int) (i * G_SQRT2);
+
+      /*  The direction value array  */
+      direction_value[i][0] = (127 - abs (127 - i)) * 2;
+      direction_value[i][1] = abs (127 - i) * 2;
+      direction_value[i][2] = abs (191 - i) * 2;
+      direction_value[i][3] = abs (63 - i) * 2;
+    }
+
+  /*  set the 256th index of the direction_values to the highest cost  */
+  direction_value[255][0] = 255;
+  direction_value[255][1] = 255;
+  direction_value[255][2] = 255;
+  direction_value[255][3] = 255;
+
+  /*  compute the distance weights  */
+  radius = GRADIENT_SEARCH >> 1;
+
+  for (i = 0; i < GRADIENT_SEARCH; i++)
+    for (j = 0; j < GRADIENT_SEARCH; j++)
+      distance_weights[i * GRADIENT_SEARCH + j] =
+        1.0 / (1 + sqrt (SQR (i - radius) + SQR (j - radius)));
+}
+
+static void
+gimp_iscissors_tool_init (GimpIscissorsTool *iscissors)
+{
+  GimpTool *tool = GIMP_TOOL (iscissors);
+
+  gimp_tool_control_set_scroll_lock (tool->control, TRUE);
+  gimp_tool_control_set_snap_to     (tool->control, FALSE);
+  gimp_tool_control_set_preserve    (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask  (tool->control,
+                                     GIMP_DIRTY_IMAGE_SIZE |
+                                     GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_ISCISSORS);
+
+  iscissors->op    = ISCISSORS_OP_NONE;
+  iscissors->curve = icurve_new ();
+  iscissors->state = NO_ACTION;
+}
+
+static void
+gimp_iscissors_tool_finalize (GObject *object)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (object);
+
+  icurve_free (iscissors->curve);
+  iscissors->curve = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_iscissors_tool_control (GimpTool       *tool,
+                             GimpToolAction  action,
+                             GimpDisplay    *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_iscissors_tool_halt (iscissors, display);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_iscissors_tool_commit (iscissors, display);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_iscissors_tool_button_press (GimpTool            *tool,
+                                  const GimpCoords    *coords,
+                                  guint32              time,
+                                  GdkModifierType      state,
+                                  GimpButtonPressType  press_type,
+                                  GimpDisplay         *display)
+{
+  GimpIscissorsTool    *iscissors = GIMP_ISCISSORS_TOOL (tool);
+  GimpIscissorsOptions *options   = GIMP_ISCISSORS_TOOL_GET_OPTIONS (tool);
+  GimpImage            *image     = gimp_display_get_image (display);
+  ISegment             *segment;
+
+  iscissors->x = RINT (coords->x);
+  iscissors->y = RINT (coords->y);
+
+  /*  If the tool was being used in another image...reset it  */
+  if (display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+  gimp_tool_control_activate (tool->control);
+  tool->display = display;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  switch (iscissors->state)
+    {
+    case NO_ACTION:
+      iscissors->state = SEED_PLACEMENT;
+
+      if (! (state & gimp_get_extend_selection_mask ()))
+        find_max_gradient (iscissors, GIMP_PICKABLE (image),
+                           &iscissors->x, &iscissors->y);
+
+      iscissors->x = CLAMP (iscissors->x, 0, gimp_image_get_width  (image) - 1);
+      iscissors->y = CLAMP (iscissors->y, 0, gimp_image_get_height (image) - 1);
+
+      gimp_iscissors_tool_push_undo (iscissors);
+
+      segment = icurve_append_segment (iscissors->curve,
+                                       iscissors->x,
+                                       iscissors->y,
+                                       iscissors->x,
+                                       iscissors->y);
+
+      /*  Initialize the draw tool only on starting the tool  */
+      gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+      break;
+
+    default:
+      /*  Check if the mouse click occurred on a vertex or the curve itself  */
+      if (clicked_on_vertex (iscissors, coords->x, coords->y))
+        {
+          iscissors->state = SEED_ADJUSTMENT;
+
+          /*  recalculate both segments  */
+          if (iscissors->segment1)
+            {
+              iscissors->segment1->x1 = iscissors->x;
+              iscissors->segment1->y1 = iscissors->y;
+
+              if (options->interactive)
+                calculate_segment (iscissors, iscissors->segment1);
+            }
+
+          if (iscissors->segment2)
+            {
+              iscissors->segment2->x2 = iscissors->x;
+              iscissors->segment2->y2 = iscissors->y;
+
+              if (options->interactive)
+                calculate_segment (iscissors, iscissors->segment2);
+            }
+        }
+      /*  If the iscissors is closed, check if the click was inside  */
+      else if (iscissors->curve->closed && iscissors->mask &&
+               gimp_pickable_get_opacity_at (GIMP_PICKABLE (iscissors->mask),
+                                             iscissors->x,
+                                             iscissors->y))
+        {
+          gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+        }
+      else if (! iscissors->curve->closed)
+        {
+          /*  if we're not closed, we're adding a new point  */
+
+          ISegment *last = g_queue_peek_tail (iscissors->curve->segments);
+
+          iscissors->state = SEED_PLACEMENT;
+
+          gimp_iscissors_tool_push_undo (iscissors);
+
+          if (last->x1 == last->x2 &&
+              last->y1 == last->y2)
+            {
+              last->x2 = iscissors->x;
+              last->y2 = iscissors->y;
+
+              if (options->interactive)
+                calculate_segment (iscissors, last);
+            }
+          else
+            {
+              segment = icurve_append_segment (iscissors->curve,
+                                               last->x2,
+                                               last->y2,
+                                               iscissors->x,
+                                               iscissors->y);
+
+              if (options->interactive)
+                calculate_segment (iscissors, segment);
+            }
+        }
+      break;
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+iscissors_convert (GimpIscissorsTool *iscissors,
+                   GimpDisplay       *display)
+{
+  GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (iscissors);
+  GimpImage            *image   = gimp_display_get_image (display);
+  GimpScanConvert      *sc;
+
+  sc = icurve_create_scan_convert (iscissors->curve);
+
+  if (iscissors->mask)
+    g_object_unref (iscissors->mask);
+
+  iscissors->mask = gimp_channel_new_mask (image,
+                                           gimp_image_get_width  (image),
+                                           gimp_image_get_height (image));
+  gimp_scan_convert_render (sc,
+                            gimp_drawable_get_buffer (GIMP_DRAWABLE (iscissors->mask)),
+                            0, 0, options->antialias);
+
+  gimp_scan_convert_free (sc);
+}
+
+static void
+gimp_iscissors_tool_button_release (GimpTool              *tool,
+                                    const GimpCoords      *coords,
+                                    guint32                time,
+                                    GdkModifierType        state,
+                                    GimpButtonReleaseType  release_type,
+                                    GimpDisplay           *display)
+{
+  GimpIscissorsTool    *iscissors = GIMP_ISCISSORS_TOOL (tool);
+  GimpIscissorsOptions *options   = GIMP_ISCISSORS_TOOL_GET_OPTIONS (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  /* Make sure X didn't skip the button release event -- as it's known
+   * to do
+   */
+  if (iscissors->state == WAITING)
+    return;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      /*  Progress to the next stage of intelligent selection  */
+      switch (iscissors->state)
+        {
+        case SEED_PLACEMENT:
+          /*  Add a new segment  */
+          if (! iscissors->curve->first_point)
+            {
+              /*  Determine if we're connecting to the first point  */
+
+              ISegment *segment = g_queue_peek_head (iscissors->curve->segments);
+
+              if (gimp_draw_tool_on_handle (GIMP_DRAW_TOOL (tool), display,
+                                            iscissors->x, iscissors->y,
+                                            GIMP_HANDLE_CIRCLE,
+                                            segment->x1, segment->y1,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_HANDLE_ANCHOR_CENTER))
+                {
+                  iscissors->x = segment->x1;
+                  iscissors->y = segment->y1;
+
+                  icurve_close (iscissors->curve);
+
+                  if (! options->interactive)
+                    {
+                      segment = g_queue_peek_tail (iscissors->curve->segments);
+                      calculate_segment (iscissors, segment);
+                    }
+
+                  gimp_iscissors_tool_free_redo (iscissors);
+                }
+              else
+                {
+                  segment = g_queue_peek_tail (iscissors->curve->segments);
+
+                  if (segment->x1 != segment->x2 ||
+                      segment->y1 != segment->y2)
+                    {
+                      if (! options->interactive)
+                        calculate_segment (iscissors, segment);
+
+                      gimp_iscissors_tool_free_redo (iscissors);
+                    }
+                  else
+                    {
+                      gimp_iscissors_tool_pop_undo (iscissors);
+                    }
+                }
+            }
+          else /* this was our first point */
+            {
+              iscissors->curve->first_point = FALSE;
+
+              gimp_iscissors_tool_free_redo (iscissors);
+            }
+          break;
+
+        case SEED_ADJUSTMENT:
+          if (state & gimp_get_modify_selection_mask ())
+            {
+              if (iscissors->segment1 && iscissors->segment2)
+                {
+                  icurve_delete_segment (iscissors->curve,
+                                         iscissors->segment2);
+
+                  calculate_segment (iscissors, iscissors->segment1);
+                }
+            }
+          else
+            {
+              /*  recalculate both segments  */
+
+              if (iscissors->segment1)
+                {
+                  if (! options->interactive)
+                    calculate_segment (iscissors, iscissors->segment1);
+                }
+
+              if (iscissors->segment2)
+                {
+                  if (! options->interactive)
+                    calculate_segment (iscissors, iscissors->segment2);
+                }
+            }
+
+          gimp_iscissors_tool_free_redo (iscissors);
+          break;
+
+        default:
+          break;
+        }
+    }
+  else
+    {
+      switch (iscissors->state)
+        {
+        case SEED_PLACEMENT:
+        case SEED_ADJUSTMENT:
+          gimp_iscissors_tool_pop_undo (iscissors);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (iscissors->curve->first_point)
+    iscissors->state = NO_ACTION;
+  else
+    iscissors->state = WAITING;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+  /*  convert the curves into a region  */
+  if (iscissors->curve->closed)
+    iscissors_convert (iscissors, display);
+}
+
+static void
+gimp_iscissors_tool_motion (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            guint32           time,
+                            GdkModifierType   state,
+                            GimpDisplay      *display)
+{
+  GimpIscissorsTool    *iscissors = GIMP_ISCISSORS_TOOL (tool);
+  GimpIscissorsOptions *options   = GIMP_ISCISSORS_TOOL_GET_OPTIONS (tool);
+  GimpImage            *image     = gimp_display_get_image (display);
+  ISegment             *segment;
+
+  if (iscissors->state == NO_ACTION)
+    return;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  iscissors->x = RINT (coords->x);
+  iscissors->y = RINT (coords->y);
+
+  /*  Hold the shift key down to disable the auto-edge snap feature  */
+  if (! (state & gimp_get_extend_selection_mask ()))
+    find_max_gradient (iscissors, GIMP_PICKABLE (image),
+                       &iscissors->x, &iscissors->y);
+
+  iscissors->x = CLAMP (iscissors->x, 0, gimp_image_get_width  (image) - 1);
+  iscissors->y = CLAMP (iscissors->y, 0, gimp_image_get_height (image) - 1);
+
+  switch (iscissors->state)
+    {
+    case SEED_PLACEMENT:
+      segment = g_queue_peek_tail (iscissors->curve->segments);
+
+      segment->x2 = iscissors->x;
+      segment->y2 = iscissors->y;
+
+      if (iscissors->curve->first_point)
+        {
+          segment->x1 = segment->x2;
+          segment->y1 = segment->y2;
+        }
+      else
+        {
+          if (options->interactive)
+            calculate_segment (iscissors, segment);
+        }
+      break;
+
+    case SEED_ADJUSTMENT:
+      if (iscissors->segment1)
+        {
+          iscissors->segment1->x1 = iscissors->x;
+          iscissors->segment1->y1 = iscissors->y;
+
+          if (options->interactive)
+            calculate_segment (iscissors, iscissors->segment1);
+        }
+
+      if (iscissors->segment2)
+        {
+          iscissors->segment2->x2 = iscissors->x;
+          iscissors->segment2->y2 = iscissors->y;
+
+          if (options->interactive)
+            calculate_segment (iscissors, iscissors->segment2);
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpIscissorsTool    *iscissors = GIMP_ISCISSORS_TOOL (draw_tool);
+  GimpIscissorsOptions *options   = GIMP_ISCISSORS_TOOL_GET_OPTIONS (draw_tool);
+  GimpCanvasItem       *item;
+  GList                *list;
+
+  /*  First, render all segments and lines  */
+  if (! iscissors->curve->first_point)
+    {
+      for (list = g_queue_peek_head_link (iscissors->curve->segments);
+           list;
+           list = g_list_next (list))
+        {
+          ISegment *segment = list->data;
+
+          /*  plot the segment  */
+          item = iscissors_draw_segment (draw_tool, segment);
+
+          /*  if this segment is currently being added or adjusted  */
+          if ((iscissors->state == SEED_PLACEMENT  &&
+               ! list->next)
+              ||
+              (iscissors->state == SEED_ADJUSTMENT &&
+               (segment == iscissors->segment1 ||
+                segment == iscissors->segment2)))
+            {
+              if (! options->interactive)
+                item = gimp_draw_tool_add_line (draw_tool,
+                                                segment->x1, segment->y1,
+                                                segment->x2, segment->y2);
+
+              if (item)
+                gimp_canvas_item_set_highlight (item, TRUE);
+            }
+        }
+    }
+
+  /*  Then, render the handles on top of the segments  */
+  for (list = g_queue_peek_head_link (iscissors->curve->segments);
+       list;
+       list = g_list_next (list))
+    {
+      ISegment *segment = list->data;
+
+      if (! iscissors->curve->first_point)
+        {
+          gboolean adjustment = (iscissors->state == SEED_ADJUSTMENT &&
+                                 segment == iscissors->segment1);
+
+          item = gimp_draw_tool_add_handle (draw_tool,
+                                            adjustment ?
+                                            GIMP_HANDLE_CROSS :
+                                            GIMP_HANDLE_FILLED_CIRCLE,
+                                            segment->x1,
+                                            segment->y1,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_HANDLE_ANCHOR_CENTER);
+
+          if (adjustment)
+            gimp_canvas_item_set_highlight (item, TRUE);
+        }
+
+      /*  Draw the last point if the curve is not closed  */
+      if (! list->next && ! iscissors->curve->closed)
+        {
+          gboolean placement = (iscissors->state == SEED_PLACEMENT);
+
+          item = gimp_draw_tool_add_handle (draw_tool,
+                                            placement ?
+                                            GIMP_HANDLE_CROSS :
+                                            GIMP_HANDLE_FILLED_CIRCLE,
+                                            segment->x2,
+                                            segment->y2,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_HANDLE_ANCHOR_CENTER);
+
+          if (placement)
+            gimp_canvas_item_set_highlight (item, TRUE);
+        }
+    }
+}
+
+static GimpCanvasItem *
+iscissors_draw_segment (GimpDrawTool *draw_tool,
+                        ISegment     *segment)
+{
+  GimpCanvasItem *item;
+  GimpVector2    *points;
+  gpointer       *point;
+  gint            i, len;
+
+  if (! segment->points)
+    return NULL;
+
+  len = segment->points->len;
+
+  points = g_new (GimpVector2, len);
+
+  for (i = 0, point = segment->points->pdata; i < len; i++, point++)
+    {
+      guint32 coords = GPOINTER_TO_INT (*point);
+
+      points[i].x = (coords & 0x0000ffff);
+      points[i].y = (coords >> 16);
+    }
+
+  item = gimp_draw_tool_add_lines (draw_tool, points, len, NULL, FALSE);
+
+  g_free (points);
+
+  return item;
+}
+
+static void
+gimp_iscissors_tool_oper_update (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 GdkModifierType   state,
+                                 gboolean          proximity,
+                                 GimpDisplay      *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+  /* parent sets a message in the status bar, but it will be replaced here */
+
+  if (mouse_over_vertex (iscissors, coords->x, coords->y) > 1)
+    {
+      GdkModifierType snap_mask   = gimp_get_extend_selection_mask ();
+      GdkModifierType remove_mask = gimp_get_modify_selection_mask ();
+
+      if (state & remove_mask)
+        {
+          gimp_tool_replace_status (tool, display,
+                                    _("Click to remove this point"));
+          iscissors->op = ISCISSORS_OP_REMOVE_POINT;
+        }
+      else
+        {
+          gchar *status =
+            gimp_suggest_modifiers (_("Click-Drag to move this point"),
+                                    (snap_mask | remove_mask) & ~state,
+                                    _("%s: disable auto-snap"),
+                                    _("%s: remove this point"),
+                                    NULL);
+          gimp_tool_replace_status (tool, display, "%s", status);
+          g_free (status);
+          iscissors->op = ISCISSORS_OP_MOVE_POINT;
+        }
+    }
+  else if (mouse_over_segment (iscissors, coords->x, coords->y))
+    {
+      ISegment *segment = g_queue_peek_head (iscissors->curve->segments);
+
+      if (gimp_draw_tool_on_handle (GIMP_DRAW_TOOL (tool), display,
+                                    RINT (coords->x), RINT (coords->y),
+                                    GIMP_HANDLE_CIRCLE,
+                                    segment->x1, segment->y1,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                    GIMP_HANDLE_ANCHOR_CENTER))
+        {
+          gimp_tool_replace_status (tool, display,
+                                    _("Click to close the curve"));
+          iscissors->op = ISCISSORS_OP_CONNECT;
+        }
+      else
+        {
+          gimp_tool_replace_status (tool, display,
+                                    _("Click to add a point on this segment"));
+          iscissors->op = ISCISSORS_OP_ADD_POINT;
+        }
+    }
+  else if (iscissors->curve->closed && iscissors->mask)
+    {
+      if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (iscissors->mask),
+                                        RINT (coords->x),
+                                        RINT (coords->y)))
+        {
+          if (proximity)
+            {
+              gimp_tool_replace_status (tool, display,
+                                        _("Click or press Enter to convert to"
+                                          " a selection"));
+            }
+          iscissors->op = ISCISSORS_OP_SELECT;
+        }
+      else
+        {
+          if (proximity)
+            {
+              gimp_tool_replace_status (tool, display,
+                                        _("Press Enter to convert to a"
+                                          " selection"));
+            }
+          iscissors->op = ISCISSORS_OP_IMPOSSIBLE;
+        }
+    }
+  else
+    {
+      switch (iscissors->state)
+        {
+        case WAITING:
+          if (proximity)
+            {
+              GdkModifierType  snap_mask = gimp_get_extend_selection_mask ();
+              gchar           *status;
+
+              status = gimp_suggest_modifiers (_("Click or Click-Drag to add a"
+                                                 " point"),
+                                               snap_mask & ~state,
+                                               _("%s: disable auto-snap"),
+                                               NULL, NULL);
+              gimp_tool_replace_status (tool, display, "%s", status);
+              g_free (status);
+            }
+          iscissors->op = ISCISSORS_OP_ADD_POINT;
+          break;
+
+        default:
+          /* if NO_ACTION, keep parent's status bar message (selection tool) */
+          iscissors->op = ISCISSORS_OP_NONE;
+          break;
+        }
+    }
+}
+
+static void
+gimp_iscissors_tool_cursor_update (GimpTool         *tool,
+                                   const GimpCoords *coords,
+                                   GdkModifierType   state,
+                                   GimpDisplay      *display)
+{
+  GimpIscissorsTool  *iscissors = GIMP_ISCISSORS_TOOL (tool);
+  GimpCursorModifier  modifier  = GIMP_CURSOR_MODIFIER_NONE;
+
+  switch (iscissors->op)
+    {
+    case ISCISSORS_OP_SELECT:
+      {
+        GimpSelectionOptions *options;
+
+        options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+
+        /* Do not overwrite the modifiers for add, subtract, intersect */
+        if (options->operation == GIMP_CHANNEL_OP_REPLACE)
+          {
+            modifier = GIMP_CURSOR_MODIFIER_SELECT;
+          }
+      }
+      break;
+
+    case ISCISSORS_OP_MOVE_POINT:
+      modifier = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case ISCISSORS_OP_ADD_POINT:
+      modifier = GIMP_CURSOR_MODIFIER_PLUS;
+      break;
+
+    case ISCISSORS_OP_REMOVE_POINT:
+      modifier = GIMP_CURSOR_MODIFIER_MINUS;
+      break;
+
+    case ISCISSORS_OP_CONNECT:
+      modifier = GIMP_CURSOR_MODIFIER_JOIN;
+      break;
+
+    case ISCISSORS_OP_IMPOSSIBLE:
+      modifier = GIMP_CURSOR_MODIFIER_BAD;
+      break;
+
+    default:
+      break;
+    }
+
+  if (modifier != GIMP_CURSOR_MODIFIER_NONE)
+    {
+      gimp_tool_set_cursor (tool, display,
+                            GIMP_CURSOR_MOUSE,
+                            GIMP_TOOL_CURSOR_ISCISSORS,
+                            modifier);
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords,
+                                                     state, display);
+    }
+}
+
+static gboolean
+gimp_iscissors_tool_key_press (GimpTool    *tool,
+                               GdkEventKey *kevent,
+                               GimpDisplay *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  if (display != tool->display)
+    return FALSE;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_BackSpace:
+      if (! iscissors->curve->closed &&
+          g_queue_peek_tail (iscissors->curve->segments))
+        {
+          ISegment *segment = g_queue_peek_tail (iscissors->curve->segments);
+
+          if (g_queue_get_length (iscissors->curve->segments) > 1)
+            {
+              gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+              gimp_iscissors_tool_push_undo (iscissors);
+              icurve_delete_segment (iscissors->curve, segment);
+              gimp_iscissors_tool_free_redo (iscissors);
+
+              gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+            }
+          else if (segment->x2 != segment->x1 || segment->y2 != segment->y1)
+            {
+              gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+              gimp_iscissors_tool_push_undo (iscissors);
+              segment->x2 = segment->x1;
+              segment->y2 = segment->y1;
+              g_ptr_array_remove_range (segment->points,
+                                        0, segment->points->len);
+              gimp_iscissors_tool_free_redo (iscissors);
+
+              gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+            }
+          else
+            {
+              gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+            }
+          return TRUE;
+        }
+      return FALSE;
+
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      if (iscissors->curve->closed && iscissors->mask)
+        {
+          gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+          return TRUE;
+        }
+      return FALSE;
+
+    case GDK_KEY_Escape:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+static const gchar *
+gimp_iscissors_tool_can_undo (GimpTool    *tool,
+                              GimpDisplay *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  if (! iscissors->undo_stack)
+    return NULL;
+
+  return _("Modify Scissors Curve");
+}
+
+static const gchar *
+gimp_iscissors_tool_can_redo (GimpTool    *tool,
+                              GimpDisplay *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  if (! iscissors->redo_stack)
+    return NULL;
+
+  return _("Modify Scissors Curve");
+}
+
+static gboolean
+gimp_iscissors_tool_undo (GimpTool    *tool,
+                          GimpDisplay *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  iscissors->redo_stack = g_list_prepend (iscissors->redo_stack,
+                                          iscissors->curve);
+
+  iscissors->curve = iscissors->undo_stack->data;
+
+  iscissors->undo_stack = g_list_remove (iscissors->undo_stack,
+                                         iscissors->curve);
+
+  if (! iscissors->undo_stack)
+    {
+      iscissors->state = NO_ACTION;
+
+      gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+  return TRUE;
+}
+
+static gboolean
+gimp_iscissors_tool_redo (GimpTool    *tool,
+                          GimpDisplay *display)
+{
+  GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  if (! iscissors->undo_stack)
+    {
+      iscissors->state = WAITING;
+
+      gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+    }
+
+  iscissors->undo_stack = g_list_prepend (iscissors->undo_stack,
+                                          iscissors->curve);
+
+  iscissors->curve = iscissors->redo_stack->data;
+
+  iscissors->redo_stack = g_list_remove (iscissors->redo_stack,
+                                         iscissors->curve);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+  return TRUE;
+}
+
+static void
+gimp_iscissors_tool_push_undo (GimpIscissorsTool *iscissors)
+{
+  iscissors->undo_stack = g_list_prepend (iscissors->undo_stack,
+                                          icurve_copy (iscissors->curve));
+}
+
+static void
+gimp_iscissors_tool_pop_undo (GimpIscissorsTool *iscissors)
+{
+  icurve_free (iscissors->curve);
+  iscissors->curve = iscissors->undo_stack->data;
+
+  iscissors->undo_stack = g_list_remove (iscissors->undo_stack,
+                                         iscissors->curve);
+
+  if (! iscissors->undo_stack)
+    {
+      iscissors->state = NO_ACTION;
+
+      gimp_draw_tool_stop (GIMP_DRAW_TOOL (iscissors));
+    }
+}
+
+static void
+gimp_iscissors_tool_free_redo (GimpIscissorsTool *iscissors)
+{
+  g_list_free_full (iscissors->redo_stack,
+                    (GDestroyNotify) icurve_free);
+  iscissors->redo_stack = NULL;
+
+  /*  update the undo actions / menu items  */
+  gimp_image_flush (gimp_display_get_image (GIMP_TOOL (iscissors)->display));
+}
+
+static void
+gimp_iscissors_tool_halt (GimpIscissorsTool *iscissors,
+                          GimpDisplay       *display)
+{
+  icurve_clear (iscissors->curve);
+
+  iscissors->segment1 = NULL;
+  iscissors->segment2 = NULL;
+  iscissors->state    = NO_ACTION;
+
+  if (iscissors->undo_stack)
+    {
+      g_list_free_full (iscissors->undo_stack, (GDestroyNotify) icurve_free);
+      iscissors->undo_stack = NULL;
+    }
+
+  if (iscissors->redo_stack)
+    {
+      g_list_free_full (iscissors->redo_stack, (GDestroyNotify) icurve_free);
+      iscissors->redo_stack = NULL;
+    }
+
+  g_clear_object (&iscissors->gradient_map);
+  g_clear_object (&iscissors->mask);
+}
+
+static void
+gimp_iscissors_tool_commit (GimpIscissorsTool *iscissors,
+                            GimpDisplay       *display)
+{
+  GimpTool             *tool    = GIMP_TOOL (iscissors);
+  GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpImage            *image   = gimp_display_get_image (display);
+
+  if (! iscissors->curve->closed)
+    {
+      ISegment *first = g_queue_peek_head (iscissors->curve->segments);
+      ISegment *last  = g_queue_peek_tail (iscissors->curve->segments);
+
+      if (first && last && first != last)
+        {
+          ISegment *segment;
+
+          segment = icurve_append_segment (iscissors->curve,
+                                           last->x2,
+                                           last->y2,
+                                           first->x1,
+                                           first->y1);
+          icurve_close (iscissors->curve);
+          calculate_segment (iscissors, segment);
+
+          iscissors_convert (iscissors, display);
+        }
+    }
+
+  if (iscissors->curve->closed && iscissors->mask)
+    {
+      gimp_channel_select_channel (gimp_image_get_mask (image),
+                                   gimp_tool_get_undo_desc (tool),
+                                   iscissors->mask,
+                                   0, 0,
+                                   options->operation,
+                                   options->feather,
+                                   options->feather_radius,
+                                   options->feather_radius);
+
+      gimp_image_flush (image);
+    }
+}
+
+
+/* XXX need some scan-conversion routines from somewhere.  maybe. ? */
+
+static gint
+mouse_over_vertex (GimpIscissorsTool *iscissors,
+                   gdouble            x,
+                   gdouble            y)
+{
+  GList *list;
+  gint   segments_found = 0;
+
+  /*  traverse through the list, returning non-zero if the current cursor
+   *  position is on an existing curve vertex.  Set the segment1 and segment2
+   *  variables to the two segments containing the vertex in question
+   */
+
+  iscissors->segment1 = iscissors->segment2 = NULL;
+
+  for (list = g_queue_peek_head_link (iscissors->curve->segments);
+       list;
+       list = g_list_next (list))
+    {
+      ISegment *segment = list->data;
+
+      if (gimp_draw_tool_on_handle (GIMP_DRAW_TOOL (iscissors),
+                                    GIMP_TOOL (iscissors)->display,
+                                    x, y,
+                                    GIMP_HANDLE_CIRCLE,
+                                    segment->x1, segment->y1,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                    GIMP_HANDLE_ANCHOR_CENTER))
+        {
+          iscissors->segment1 = segment;
+
+          if (segments_found++)
+            return segments_found;
+        }
+      else if (gimp_draw_tool_on_handle (GIMP_DRAW_TOOL (iscissors),
+                                         GIMP_TOOL (iscissors)->display,
+                                         x, y,
+                                         GIMP_HANDLE_CIRCLE,
+                                         segment->x2, segment->y2,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_HANDLE_ANCHOR_CENTER))
+        {
+          iscissors->segment2 = segment;
+
+          if (segments_found++)
+            return segments_found;
+        }
+    }
+
+  return segments_found;
+}
+
+static gboolean
+clicked_on_vertex (GimpIscissorsTool *iscissors,
+                   gdouble            x,
+                   gdouble            y)
+{
+  gint segments_found  = mouse_over_vertex (iscissors, x, y);
+
+  if (segments_found > 1)
+    {
+      gimp_iscissors_tool_push_undo (iscissors);
+
+      return TRUE;
+    }
+
+  /*  if only one segment was found, the segments are unconnected, and
+   *  the user only wants to move either the first or last point
+   *  disallow this for now.
+   */
+  if (segments_found == 1)
+    return FALSE;
+
+  return clicked_on_segment (iscissors, x, y);
+}
+
+
+static GList *
+mouse_over_segment (GimpIscissorsTool *iscissors,
+                    gdouble            x,
+                    gdouble            y)
+{
+  GList *list;
+
+  /*  traverse through the list, returning the curve segment's list element
+   *  if the current cursor position is on a curve...
+   */
+  for (list = g_queue_peek_head_link (iscissors->curve->segments);
+       list;
+       list = g_list_next (list))
+    {
+      ISegment *segment = list->data;
+      gpointer *pt;
+      gint      len;
+
+      if (! segment->points)
+        continue;
+
+      pt  = segment->points->pdata;
+      len = segment->points->len;
+
+      while (len--)
+        {
+          guint32 coords = GPOINTER_TO_INT (*pt);
+          gint    tx, ty;
+
+          pt++;
+          tx = coords & 0x0000ffff;
+          ty = coords >> 16;
+
+          /*  Is the specified point close enough to the segment?  */
+          if (gimp_draw_tool_calc_distance_square (GIMP_DRAW_TOOL (iscissors),
+                                                   GIMP_TOOL (iscissors)->display,
+                                                   tx, ty,
+                                                   x, y) < SQR (GIMP_TOOL_HANDLE_SIZE_CIRCLE / 2))
+            {
+              return list;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+static gboolean
+clicked_on_segment (GimpIscissorsTool *iscissors,
+                    gdouble            x,
+                    gdouble            y)
+{
+  GList *list = mouse_over_segment (iscissors, x, y);
+
+  /*  traverse through the list, getting back the curve segment's list
+   *  element if the current cursor position is on a segment...
+   *  If this occurs, replace the segment with two new segments,
+   *  separated by a new vertex.
+   */
+
+  if (list)
+    {
+      ISegment *segment = list->data;
+      ISegment *new_segment;
+
+      gimp_iscissors_tool_push_undo (iscissors);
+
+      new_segment = icurve_insert_segment (iscissors->curve,
+                                           list,
+                                           iscissors->x,
+                                           iscissors->y,
+                                           segment->x2,
+                                           segment->y2);
+
+      iscissors->segment1 = new_segment;
+      iscissors->segment2 = segment;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+static void
+calculate_segment (GimpIscissorsTool *iscissors,
+                   ISegment          *segment)
+{
+  GimpDisplay  *display  = GIMP_TOOL (iscissors)->display;
+  GimpPickable *pickable = GIMP_PICKABLE (gimp_display_get_image (display));
+  gint          width;
+  gint          height;
+  gint          xs, ys, xe, ye;
+  gint          x1, y1, x2, y2;
+  gint          ewidth, eheight;
+
+  /* Initialise the gradient map buffer for this pickable if we don't
+   * already have one.
+   */
+  if (! iscissors->gradient_map)
+    iscissors->gradient_map = gradient_map_new (pickable);
+
+  width  = gegl_buffer_get_width  (iscissors->gradient_map);
+  height = gegl_buffer_get_height (iscissors->gradient_map);
+
+  /*  Calculate the lowest cost path from one vertex to the next as specified
+   *  by the parameter "segment".
+   *    Here are the steps:
+   *      1)  Calculate the appropriate working area for this operation
+   *      2)  Allocate a temp buf for the dynamic programming array
+   *      3)  Run the dynamic programming algorithm to find the optimal path
+   *      4)  Translate the optimal path into pixels in the isegment data
+   *            structure.
+   */
+
+  /*  Get the bounding box  */
+  xs = CLAMP (segment->x1, 0, width  - 1);
+  ys = CLAMP (segment->y1, 0, height - 1);
+  xe = CLAMP (segment->x2, 0, width  - 1);
+  ye = CLAMP (segment->y2, 0, height - 1);
+  x1 = MIN (xs, xe);
+  y1 = MIN (ys, ye);
+  x2 = MAX (xs, xe) + 1;  /*  +1 because if xe = 199 & xs = 0, x2 - x1, width = 200  */
+  y2 = MAX (ys, ye) + 1;
+
+  /*  expand the boundaries past the ending points by
+   *  some percentage of width and height.  This serves the following purpose:
+   *  It gives the algorithm more area to search so better solutions
+   *  are found.  This is particularly helpful in finding "bumps" which
+   *  fall outside the bounding box represented by the start and end
+   *  coordinates of the "segment".
+   */
+  ewidth  = (x2 - x1) * EXTEND_BY + FIXED;
+  eheight = (y2 - y1) * EXTEND_BY + FIXED;
+
+  if (xe >= xs)
+    x2 += CLAMP (ewidth, 0, width - x2);
+  else
+    x1 -= CLAMP (ewidth, 0, x1);
+
+  if (ye >= ys)
+    y2 += CLAMP (eheight, 0, height - y2);
+  else
+    y1 -= CLAMP (eheight, 0, y1);
+
+  /* blow away any previous points list we might have */
+  if (segment->points)
+    {
+      g_ptr_array_free (segment->points, TRUE);
+      segment->points = NULL;
+    }
+
+  if ((x2 - x1) && (y2 - y1))
+    {
+      /*  If the bounding box has width and height...  */
+
+      GimpTempBuf *dp_buf; /*  dynamic programming buffer  */
+      gint         dp_width  = (x2 - x1);
+      gint         dp_height = (y2 - y1);
+
+      dp_buf = gimp_temp_buf_new (dp_width, dp_height,
+                                  babl_format ("Y u32"));
+
+      /*  find the optimal path of pixels from (x1, y1) to (x2, y2)  */
+      find_optimal_path (iscissors->gradient_map, dp_buf,
+                         x1, y1, x2, y2, xs, ys);
+
+      /*  get a list of the pixels in the optimal path  */
+      segment->points = plot_pixels (dp_buf, x1, y1, xs, ys, xe, ye);
+
+      gimp_temp_buf_unref (dp_buf);
+    }
+  else if ((x2 - x1) == 0)
+    {
+      /*  If the bounding box has no width  */
+
+      /*  plot a vertical line  */
+      gint y   = ys;
+      gint dir = (ys > ye) ? -1 : 1;
+
+      segment->points = g_ptr_array_new ();
+      while (y != ye)
+        {
+          g_ptr_array_add (segment->points, GINT_TO_POINTER ((y << 16) + xs));
+          y += dir;
+        }
+    }
+  else if ((y2 - y1) == 0)
+    {
+      /*  If the bounding box has no height  */
+
+      /*  plot a horizontal line  */
+      gint x   = xs;
+      gint dir = (xs > xe) ? -1 : 1;
+
+      segment->points = g_ptr_array_new ();
+      while (x != xe)
+        {
+          g_ptr_array_add (segment->points, GINT_TO_POINTER ((ys << 16) + x));
+          x += dir;
+        }
+    }
+}
+
+
+/* badly need to get a replacement - this is _way_ too expensive */
+static gboolean
+gradient_map_value (GeglSampler         *map_sampler,
+                    const GeglRectangle *map_extent,
+                    gint                 x,
+                    gint                 y,
+                    guint8              *grad,
+                    guint8              *dir)
+{
+  if (x >= map_extent->x     &&
+      y >= map_extent->y     &&
+      x <  map_extent->width &&
+      y <  map_extent->height)
+    {
+      guint8 sample[2];
+
+      gegl_sampler_get (map_sampler, x, y, NULL, sample, GEGL_ABYSS_NONE);
+
+      *grad = sample[0];
+      *dir  = sample[1];
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gint
+calculate_link (GeglSampler         *map_sampler,
+                const GeglRectangle *map_extent,
+                gint                 x,
+                gint                 y,
+                guint32              pixel,
+                gint                 link)
+{
+  gint   value = 0;
+  guint8 grad1, dir1, grad2, dir2;
+
+  if (! gradient_map_value (map_sampler, map_extent, x, y, &grad1, &dir1))
+    {
+      grad1 = 0;
+      dir1 = 255;
+    }
+
+  /* Convert the gradient into a cost: large gradients are good, and
+   * so have low cost. */
+  grad1 = 255 - grad1;
+
+  /*  calculate the contribution of the gradient magnitude  */
+  if (link > 1)
+    value += diagonal_weight[grad1] * OMEGA_G;
+  else
+    value += grad1 * OMEGA_G;
+
+  /*  calculate the contribution of the gradient direction  */
+  x += (gint8)(pixel & 0xff);
+  y += (gint8)((pixel & 0xff00) >> 8);
+
+  if (! gradient_map_value (map_sampler, map_extent, x, y, &grad2, &dir2))
+    {
+      grad2 = 0;
+      dir2 = 255;
+    }
+
+  value +=
+    (direction_value[dir1][link] + direction_value[dir2][link]) * OMEGA_D;
+
+  return value;
+}
+
+
+static GPtrArray *
+plot_pixels (GimpTempBuf *dp_buf,
+             gint         x1,
+             gint         y1,
+             gint         xs,
+             gint         ys,
+             gint         xe,
+             gint         ye)
+{
+  gint       x, y;
+  guint32    coords;
+  gint       link;
+  gint       width = gimp_temp_buf_get_width (dp_buf);
+  guint     *data;
+  GPtrArray *list;
+
+  /*  Start the data pointer at the correct location  */
+  data = (guint *) gimp_temp_buf_get_data (dp_buf) + (ye - y1) * width + (xe - x1);
+
+  x = xe;
+  y = ye;
+
+  list = g_ptr_array_new ();
+
+  while (TRUE)
+    {
+      coords = (y << 16) + x;
+      g_ptr_array_add (list, GINT_TO_POINTER (coords));
+
+      link = PIXEL_DIR (*data);
+      if (link == SEED_POINT)
+        return list;
+
+      x += move[link][0];
+      y += move[link][1];
+      data += move[link][1] * width + move[link][0];
+    }
+
+  /*  won't get here  */
+  return NULL;
+}
+
+
+#define PACK(x, y)    ((((y) & 0xff) << 8) | ((x) & 0xff))
+#define OFFSET(pixel) ((gint8)((pixel) & 0xff) + \
+                       ((gint8)(((pixel) & 0xff00) >> 8)) * \
+                       gimp_temp_buf_get_width (dp_buf))
+
+static void
+find_optimal_path (GeglBuffer  *gradient_map,
+                   GimpTempBuf *dp_buf,
+                   gint         x1,
+                   gint         y1,
+                   gint         x2,
+                   gint         y2,
+                   gint         xs,
+                   gint         ys)
+{
+  GeglSampler         *map_sampler;
+  const GeglRectangle *map_extent;
+  gint                 i, j, k;
+  gint                 x, y;
+  gint                 link;
+  gint                 linkdir;
+  gint                 dirx, diry;
+  gint                 min_cost;
+  gint                 new_cost;
+  gint                 offset;
+  gint                 cum_cost[8];
+  gint                 link_cost[8];
+  gint                 pixel_cost[8];
+  guint32              pixel[8];
+  guint32             *data;
+  guint32             *d;
+  gint                 dp_buf_width  = gimp_temp_buf_get_width  (dp_buf);
+  gint                 dp_buf_height = gimp_temp_buf_get_height (dp_buf);
+
+  /*  initialize the gradient map sampler and extent  */
+  map_sampler = gegl_buffer_sampler_new (gradient_map,
+                                         gegl_buffer_get_format (gradient_map),
+                                         GEGL_SAMPLER_NEAREST);
+  map_extent  = gegl_buffer_get_extent (gradient_map);
+
+  /*  initialize the dynamic programming buffer  */
+  data = (guint32 *) gimp_temp_buf_data_clear (dp_buf);
+
+  /*  what directions are we filling the array in according to?  */
+  dirx = (xs - x1 == 0) ? 1 : -1;
+  diry = (ys - y1 == 0) ? 1 : -1;
+  linkdir = (dirx * diry);
+
+  y = ys;
+
+  for (i = 0; i < dp_buf_height; i++)
+    {
+      x = xs;
+
+      d = data + (y-y1) * dp_buf_width + (x-x1);
+
+      for (j = 0; j < dp_buf_width; j++)
+        {
+          min_cost = G_MAXINT;
+
+          /* pixel[] array encodes how to get to a neighbour, if possible.
+           * 0 means no connection (eg edge).
+           * Rest packed as bottom two bytes: y offset then x offset.
+           * Initially, we assume we can't get anywhere.
+           */
+          for (k = 0; k < 8; k++)
+            pixel[k] = 0;
+
+          /*  Find the valid neighboring pixels  */
+          /*  the previous pixel  */
+          if (j)
+            pixel[((dirx == 1) ? 4 : 0)] = PACK (-dirx, 0);
+
+          /*  the previous row of pixels  */
+          if (i)
+            {
+              pixel[((diry == 1) ? 5 : 1)] = PACK (0, -diry);
+
+              link = (linkdir == 1) ? 3 : 2;
+              if (j)
+                pixel[((diry == 1) ? (link + 4) : link)] = PACK (-dirx, -diry);
+
+              link = (linkdir == 1) ? 2 : 3;
+              if (j != dp_buf_width - 1)
+                pixel[((diry == 1) ? (link + 4) : link)] = PACK (dirx, -diry);
+            }
+
+          /*  find the minimum cost of going through each neighbor to reach the
+           *  seed point...
+           */
+          link = -1;
+          for (k = 0; k < 8; k ++)
+            if (pixel[k])
+              {
+                link_cost[k] = calculate_link (map_sampler, map_extent,
+                                               xs + j*dirx, ys + i*diry,
+                                               pixel [k],
+                                               ((k > 3) ? k - 4 : k));
+                offset = OFFSET (pixel [k]);
+                pixel_cost[k] = PIXEL_COST (d[offset]);
+                cum_cost[k] = pixel_cost[k] + link_cost[k];
+                if (cum_cost[k] < min_cost)
+                  {
+                    min_cost = cum_cost[k];
+                    link = k;
+                  }
+              }
+
+          /*  If anything can be done...  */
+          if (link >= 0)
+            {
+              /*  set the cumulative cost of this pixel and the new direction
+               */
+              *d = (cum_cost[link] << 8) + link;
+
+              /*  possibly change the links from the other pixels to this pixel...
+               *  these changes occur if a neighboring pixel will receive a lower
+               *  cumulative cost by going through this pixel.
+               */
+              for (k = 0; k < 8; k ++)
+                if (pixel[k] && k != link)
+                  {
+                    /*  if the cumulative cost at the neighbor is greater than
+                     *  the cost through the link to the current pixel, change the
+                     *  neighbor's link to point to the current pixel.
+                     */
+                    new_cost = link_cost[k] + cum_cost[link];
+                    if (pixel_cost[k] > new_cost)
+                    {
+                      /*  reverse the link direction   /--------------------\ */
+                      offset = OFFSET (pixel[k]);
+                      d[offset] = (new_cost << 8) + ((k > 3) ? k - 4 : k + 4);
+                    }
+                  }
+            }
+          /*  Set the seed point  */
+          else if (!i && !j)
+            {
+              *d = SEED_POINT;
+            }
+
+          /*  increment the data pointer and the x counter  */
+          d += dirx;
+          x += dirx;
+        }
+
+      /*  increment the y counter  */
+      y += diry;
+    }
+
+  g_object_unref (map_sampler);
+}
+
+static GeglBuffer *
+gradient_map_new (GimpPickable *pickable)
+{
+  GeglBuffer      *buffer;
+  GeglTileHandler *handler;
+
+  buffer = gimp_pickable_get_buffer (pickable);
+
+  buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                            gegl_buffer_get_width  (buffer),
+                                            gegl_buffer_get_height (buffer)),
+                            babl_format_n (babl_type ("u8"), 2));
+
+  handler = gimp_tile_handler_iscissors_new (pickable);
+
+  gimp_tile_handler_validate_assign (GIMP_TILE_HANDLER_VALIDATE (handler),
+                                     buffer);
+
+  gimp_tile_handler_validate_invalidate (GIMP_TILE_HANDLER_VALIDATE (handler),
+                                         GEGL_RECTANGLE (0, 0,
+                                                         gegl_buffer_get_width  (buffer),
+                                                         gegl_buffer_get_height (buffer)));
+
+  g_object_unref (handler);
+
+  return buffer;
+}
+
+static void
+find_max_gradient (GimpIscissorsTool *iscissors,
+                   GimpPickable      *pickable,
+                   gint              *x,
+                   gint              *y)
+{
+  GeglBufferIterator *iter;
+  GeglRectangle      *roi;
+  gint                width;
+  gint                height;
+  gint                radius;
+  gint                cx, cy;
+  gint                x1, y1, x2, y2;
+  gfloat              max_gradient;
+
+  /* Initialise the gradient map buffer for this pickable if we don't
+   * already have one.
+   */
+  if (! iscissors->gradient_map)
+    iscissors->gradient_map = gradient_map_new (pickable);
+
+  width  = gegl_buffer_get_width  (iscissors->gradient_map);
+  height = gegl_buffer_get_height (iscissors->gradient_map);
+
+  radius = GRADIENT_SEARCH >> 1;
+
+  /*  calculate the extent of the search  */
+  cx = CLAMP (*x, 0, width);
+  cy = CLAMP (*y, 0, height);
+  x1 = CLAMP (cx - radius, 0, width);
+  y1 = CLAMP (cy - radius, 0, height);
+  x2 = CLAMP (cx + radius, 0, width);
+  y2 = CLAMP (cy + radius, 0, height);
+  /*  calculate the factor to multiply the distance from the cursor by  */
+
+  max_gradient = 0;
+  *x = cx;
+  *y = cy;
+
+  iter = gegl_buffer_iterator_new (iscissors->gradient_map,
+                                   GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1),
+                                   0, NULL,
+                                   GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+  roi = &iter->items[0].roi;
+
+  while (gegl_buffer_iterator_next (iter))
+    {
+      guint8 *data = iter->items[0].data;
+      gint    endx = roi->x + roi->width;
+      gint    endy = roi->y + roi->height;
+      gint    i, j;
+
+      for (i = roi->y; i < endy; i++)
+        {
+          const guint8 *gradient = data + 2 * roi->width * (i - roi->y);
+
+          for (j = roi->x; j < endx; j++)
+            {
+              gfloat g = *gradient;
+
+              gradient += COST_WIDTH;
+
+              g *= distance_weights [(i - y1) * GRADIENT_SEARCH + (j - x1)];
+
+              if (g > max_gradient)
+                {
+                  max_gradient = g;
+
+                  *x = j;
+                  *y = i;
+                }
+            }
+        }
+    }
+}
+
+static ISegment *
+isegment_new (gint x1,
+              gint y1,
+              gint x2,
+              gint y2)
+{
+  ISegment *segment = g_slice_new0 (ISegment);
+
+  segment->x1 = x1;
+  segment->y1 = y1;
+  segment->x2 = x2;
+  segment->y2 = y2;
+
+  return segment;
+}
+
+static ISegment *
+isegment_copy (ISegment *segment)
+{
+  ISegment *copy = isegment_new (segment->x1,
+                                 segment->y1,
+                                 segment->x2,
+                                 segment->y2);
+
+  if (segment->points)
+    {
+      gint i;
+
+      copy->points = g_ptr_array_sized_new (segment->points->len);
+
+      for (i = 0; i < segment->points->len; i++)
+        {
+          gpointer value = g_ptr_array_index (segment->points, i);
+
+          g_ptr_array_add (copy->points, value);
+        }
+    }
+
+  return copy;
+}
+
+static void
+isegment_free (ISegment *segment)
+{
+  if (segment->points)
+    g_ptr_array_free (segment->points, TRUE);
+
+  g_slice_free (ISegment, segment);
+}
+
+static ICurve *
+icurve_new (void)
+{
+  ICurve *curve = g_slice_new0 (ICurve);
+
+  curve->segments    = g_queue_new ();
+  curve->first_point = TRUE;
+
+  return curve;
+}
+
+static ICurve *
+icurve_copy (ICurve *curve)
+{
+  ICurve *copy = icurve_new ();
+  GList  *link;
+
+  for (link = g_queue_peek_head_link (curve->segments);
+       link;
+       link = g_list_next (link))
+    {
+      g_queue_push_tail (copy->segments, isegment_copy (link->data));
+    }
+
+  copy->first_point = curve->first_point;
+  copy->closed      = curve->closed;
+
+  return copy;
+}
+
+static void
+icurve_clear (ICurve *curve)
+{
+  while (! g_queue_is_empty (curve->segments))
+    isegment_free (g_queue_pop_head (curve->segments));
+
+  curve->first_point = TRUE;
+  curve->closed      = FALSE;
+}
+
+static void
+icurve_free (ICurve *curve)
+{
+  g_queue_free_full (curve->segments, (GDestroyNotify) isegment_free);
+
+  g_slice_free (ICurve, curve);
+}
+
+static ISegment *
+icurve_append_segment (ICurve *curve,
+                       gint    x1,
+                       gint    y1,
+                       gint    x2,
+                       gint    y2)
+{
+  ISegment *segment = isegment_new (x1, y1, x2, y2);
+
+  g_queue_push_tail (curve->segments, segment);
+
+  return segment;
+}
+
+static ISegment *
+icurve_insert_segment (ICurve *curve,
+                       GList  *sibling,
+                       gint    x1,
+                       gint    y1,
+                       gint    x2,
+                       gint    y2)
+{
+  ISegment *segment = sibling->data;
+  ISegment *new_segment;
+
+  new_segment = isegment_new (x1, y1, x2, y2);
+
+  segment->x2 = x1;
+  segment->y2 = y1;
+
+  g_queue_insert_after (curve->segments, sibling, new_segment);
+
+  return new_segment;
+}
+
+static void
+icurve_delete_segment (ICurve   *curve,
+                       ISegment *segment)
+{
+  GList    *link         = g_queue_find (curve->segments, segment);
+  ISegment *next_segment = NULL;
+
+  if (link->next)
+    next_segment = link->next->data;
+  else if (curve->closed)
+    next_segment = g_queue_peek_head (curve->segments);
+
+  if (next_segment)
+    {
+      next_segment->x1 = segment->x1;
+      next_segment->y1 = segment->y1;
+    }
+
+  g_queue_remove (curve->segments, segment);
+  isegment_free (segment);
+}
+
+static void
+icurve_close (ICurve *curve)
+{
+  ISegment *first = g_queue_peek_head (curve->segments);
+  ISegment *last  = g_queue_peek_tail (curve->segments);
+
+  last->x2 = first->x1;
+  last->y2 = first->y1;
+
+  curve->closed = TRUE;
+}
+
+static GimpScanConvert *
+icurve_create_scan_convert (ICurve *curve)
+{
+  GimpScanConvert *sc;
+  GList           *list;
+  GimpVector2     *points;
+  guint            n_total_points = 0;
+
+  sc = gimp_scan_convert_new ();
+
+  for (list = g_queue_peek_tail_link (curve->segments);
+       list;
+       list = g_list_previous (list))
+    {
+      ISegment *segment = list->data;
+
+      n_total_points += segment->points->len;
+    }
+
+  points = g_new (GimpVector2, n_total_points);
+  n_total_points = 0;
+
+  /* go over the segments in reverse order, adding the points we have */
+  for (list = g_queue_peek_tail_link (curve->segments);
+       list;
+       list = g_list_previous (list))
+    {
+      ISegment *segment = list->data;
+      guint     n_points;
+      gint      i;
+
+      n_points = segment->points->len;
+
+      for (i = 0; i < n_points; i++)
+        {
+          guint32 packed = GPOINTER_TO_INT (g_ptr_array_index (segment->points,
+                                                               i));
+
+          points[n_total_points + i].x = packed & 0x0000ffff;
+          points[n_total_points + i].y = packed >> 16;
+        }
+
+      n_total_points += n_points;
+    }
+
+  gimp_scan_convert_add_polyline (sc, n_total_points, points, TRUE);
+  g_free (points);
+
+  return sc;
+}
diff --git a/app/tools/gimpiscissorstool.h b/app/tools/gimpiscissorstool.h
new file mode 100644
index 0000000..3cd4c79
--- /dev/null
+++ b/app/tools/gimpiscissorstool.h
@@ -0,0 +1,97 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ISCISSORS_TOOL_H__
+#define __GIMP_ISCISSORS_TOOL_H__
+
+
+#include "gimpselectiontool.h"
+
+
+/*  The possible states...  */
+typedef enum
+{
+  NO_ACTION,
+  SEED_PLACEMENT,
+  SEED_ADJUSTMENT,
+  WAITING
+} IscissorsState;
+
+/*  For oper_update & cursor_update  */
+typedef enum
+{
+  ISCISSORS_OP_NONE,
+  ISCISSORS_OP_SELECT,
+  ISCISSORS_OP_MOVE_POINT,
+  ISCISSORS_OP_ADD_POINT,
+  ISCISSORS_OP_REMOVE_POINT,
+  ISCISSORS_OP_CONNECT,
+  ISCISSORS_OP_IMPOSSIBLE
+} IscissorsOps;
+
+typedef struct _ISegment ISegment;
+typedef struct _ICurve   ICurve;
+
+
+#define GIMP_TYPE_ISCISSORS_TOOL            (gimp_iscissors_tool_get_type ())
+#define GIMP_ISCISSORS_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ISCISSORS_TOOL, GimpIscissorsTool))
+#define GIMP_ISCISSORS_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ISCISSORS_TOOL, GimpIscissorsToolClass))
+#define GIMP_IS_ISCISSORS_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ISCISSORS_TOOL))
+#define GIMP_IS_ISCISSORS_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ISCISSORS_TOOL))
+#define GIMP_ISCISSORS_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ISCISSORS_TOOL, GimpIscissorsToolClass))
+
+#define GIMP_ISCISSORS_TOOL_GET_OPTIONS(t)  (GIMP_ISCISSORS_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpIscissorsTool      GimpIscissorsTool;
+typedef struct _GimpIscissorsToolClass GimpIscissorsToolClass;
+
+struct _GimpIscissorsTool
+{
+  GimpSelectionTool  parent_instance;
+
+  IscissorsOps    op;
+
+  gint            x, y;         /*  mouse coordinates                       */
+
+  ISegment       *segment1;     /*  1st segment connected to current point  */
+  ISegment       *segment2;     /*  2nd segment connected to current point  */
+
+  ICurve         *curve;        /*  the curve                               */
+
+  GList          *undo_stack;   /*  stack of ICurves for undo               */
+  GList          *redo_stack;   /*  stack of ICurves for redo               */
+
+  IscissorsState  state;        /*  state of iscissors                      */
+
+  GeglBuffer     *gradient_map; /*  lazily filled gradient map              */
+  GimpChannel    *mask;         /*  selection mask                          */
+};
+
+struct _GimpIscissorsToolClass
+{
+  GimpSelectionToolClass parent_class;
+};
+
+
+void    gimp_iscissors_tool_register (GimpToolRegisterCallback  callback,
+                                      gpointer                  data);
+
+GType   gimp_iscissors_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ISCISSORS_TOOL_H__  */
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
new file mode 100644
index 0000000..4e97f71
--- /dev/null
+++ b/app/tools/gimplevelstool.c
@@ -0,0 +1,1055 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "operations/gimplevelsconfig.h"
+#include "operations/gimpoperationlevels.h"
+
+#include "core/gimp-gui.h"
+#include "core/gimpasync.h"
+#include "core/gimpcancelable.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-histogram.h"
+#include "core/gimperror.h"
+#include "core/gimphistogram.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptriviallycancelablewaitable.h"
+#include "core/gimpwaitable.h"
+
+#include "widgets/gimpcolorbar.h"
+#include "widgets/gimphandlebar.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimphistogramview.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-constructors.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimphistogramoptions.h"
+#include "gimplevelstool.h"
+
+#include "gimp-intl.h"
+
+
+#define PICK_LOW_INPUT    (1 << 0)
+#define PICK_GAMMA        (1 << 1)
+#define PICK_HIGH_INPUT   (1 << 2)
+#define PICK_ALL_CHANNELS (1 << 8)
+
+#define HISTOGRAM_WIDTH    256
+#define GRADIENT_HEIGHT     12
+#define CONTROL_HEIGHT      10
+
+
+/*  local function prototypes  */
+
+static void       gimp_levels_tool_finalize       (GObject          *object);
+
+static gboolean   gimp_levels_tool_initialize     (GimpTool         *tool,
+                                                   GimpDisplay      *display,
+                                                   GError          **error);
+
+static gchar    * gimp_levels_tool_get_operation  (GimpFilterTool   *filter_tool,
+                                                   gchar           **description);
+static void       gimp_levels_tool_dialog         (GimpFilterTool   *filter_tool);
+static void       gimp_levels_tool_reset          (GimpFilterTool   *filter_tool);
+static void       gimp_levels_tool_config_notify  (GimpFilterTool   *filter_tool,
+                                                   GimpConfig       *config,
+                                                   const GParamSpec *pspec);
+static gboolean   gimp_levels_tool_settings_import(GimpFilterTool   *filter_tool,
+                                                   GInputStream     *input,
+                                                   GError          **error);
+static gboolean   gimp_levels_tool_settings_export(GimpFilterTool   *filter_tool,
+                                                   GOutputStream    *output,
+                                                   GError          **error);
+static void       gimp_levels_tool_color_picked   (GimpFilterTool   *filter_tool,
+                                                   gpointer          identifier,
+                                                   gdouble           x,
+                                                   gdouble           y,
+                                                   const Babl       *sample_format,
+                                                   const GimpRGB    *color);
+
+static void       gimp_levels_tool_export_setup   (GimpSettingsBox  *settings_box,
+                                                   GtkFileChooserDialog *dialog,
+                                                   gboolean          export,
+                                                   GimpLevelsTool   *tool);
+
+static void       levels_update_input_bar         (GimpLevelsTool   *tool);
+
+static void       levels_channel_callback         (GtkWidget        *widget,
+                                                   GimpFilterTool   *filter_tool);
+static void       levels_channel_reset_callback   (GtkWidget        *widget,
+                                                   GimpFilterTool   *filter_tool);
+
+static gboolean   levels_menu_sensitivity         (gint              value,
+                                                   gpointer          data);
+
+static void       levels_stretch_callback         (GtkWidget        *widget,
+                                                   GimpLevelsTool   *tool);
+static void       levels_linear_gamma_changed     (GtkAdjustment    *adjustment,
+                                                   GimpLevelsTool   *tool);
+
+static void       levels_to_curves_callback       (GtkWidget        *widget,
+                                                   GimpFilterTool   *filter_tool);
+
+
+G_DEFINE_TYPE (GimpLevelsTool, gimp_levels_tool, GIMP_TYPE_FILTER_TOOL)
+
+#define parent_class gimp_levels_tool_parent_class
+
+
+void
+gimp_levels_tool_register (GimpToolRegisterCallback  callback,
+                           gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_LEVELS_TOOL,
+                GIMP_TYPE_HISTOGRAM_OPTIONS,
+                gimp_color_options_gui,
+                0,
+                "gimp-levels-tool",
+                _("Levels"),
+                _("Adjust color levels"),
+                N_("_Levels..."), NULL,
+                NULL, GIMP_HELP_TOOL_LEVELS,
+                GIMP_ICON_TOOL_LEVELS,
+                data);
+}
+
+static void
+gimp_levels_tool_class_init (GimpLevelsToolClass *klass)
+{
+  GObjectClass        *object_class      = G_OBJECT_CLASS (klass);
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  object_class->finalize             = gimp_levels_tool_finalize;
+
+  tool_class->initialize             = gimp_levels_tool_initialize;
+
+  filter_tool_class->get_operation   = gimp_levels_tool_get_operation;
+  filter_tool_class->dialog          = gimp_levels_tool_dialog;
+  filter_tool_class->reset           = gimp_levels_tool_reset;
+  filter_tool_class->config_notify   = gimp_levels_tool_config_notify;
+  filter_tool_class->settings_import = gimp_levels_tool_settings_import;
+  filter_tool_class->settings_export = gimp_levels_tool_settings_export;
+  filter_tool_class->color_picked    = gimp_levels_tool_color_picked;
+}
+
+static void
+gimp_levels_tool_init (GimpLevelsTool *tool)
+{
+}
+
+static void
+gimp_levels_tool_finalize (GObject *object)
+{
+  GimpLevelsTool *tool = GIMP_LEVELS_TOOL (object);
+
+  g_clear_object (&tool->histogram);
+  g_clear_object (&tool->histogram_async);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_levels_tool_initialize (GimpTool     *tool,
+                             GimpDisplay  *display,
+                             GError      **error)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpLevelsTool   *l_tool      = GIMP_LEVELS_TOOL (tool);
+  GimpImage        *image       = gimp_display_get_image (display);
+  GimpDrawable     *drawable    = gimp_image_get_active_drawable (image);
+  GimpLevelsConfig *config;
+  gdouble           scale_factor;
+  gdouble           step_increment;
+  gdouble           page_increment;
+  gint              digits;
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      return FALSE;
+    }
+
+  config = GIMP_LEVELS_CONFIG (filter_tool->config);
+
+  g_clear_object (&l_tool->histogram);
+  g_clear_object (&l_tool->histogram_async);
+  l_tool->histogram = gimp_histogram_new (config->linear);
+
+  l_tool->histogram_async = gimp_drawable_calculate_histogram_async (
+    drawable, l_tool->histogram, FALSE);
+  gimp_histogram_view_set_histogram (GIMP_HISTOGRAM_VIEW (l_tool->histogram_view),
+                                     l_tool->histogram);
+
+  if (gimp_drawable_get_component_type (drawable) == GIMP_COMPONENT_TYPE_U8)
+    {
+      scale_factor   = 255.0;
+      step_increment = 1.0;
+      page_increment = 8.0;
+      digits         = 0;
+    }
+  else
+    {
+      scale_factor   = 100;
+      step_increment = 0.01;
+      page_increment = 1.0;
+      digits         = 2;
+    }
+
+  gimp_prop_widget_set_factor (l_tool->low_input_spinbutton,
+                               scale_factor, step_increment, page_increment,
+                               digits);
+  gimp_prop_widget_set_factor (l_tool->high_input_spinbutton,
+                               scale_factor, step_increment, page_increment,
+                               digits);
+  gimp_prop_widget_set_factor (l_tool->low_output_spinbutton,
+                               scale_factor, step_increment, page_increment,
+                               digits);
+  gimp_prop_widget_set_factor (l_tool->high_output_spinbutton,
+                               scale_factor, step_increment, page_increment,
+                               digits);
+
+  gtk_adjustment_configure (l_tool->gamma_linear,
+                            scale_factor / 2.0,
+                            0, scale_factor, 0.1, 1.0, 0);
+
+  return TRUE;
+}
+
+static gchar *
+gimp_levels_tool_get_operation (GimpFilterTool  *filter_tool,
+                                gchar          **description)
+{
+  *description = g_strdup (_("Adjust Color Levels"));
+
+  return g_strdup ("gimp:levels");
+}
+
+
+/*******************/
+/*  Levels dialog  */
+/*******************/
+
+static GtkWidget *
+gimp_levels_tool_color_picker_new (GimpLevelsTool *tool,
+                                   guint           value)
+{
+  const gchar *icon_name;
+  const gchar *help;
+  gboolean     all_channels = (value & PICK_ALL_CHANNELS) != 0;
+
+  switch (value & 0xF)
+    {
+    case PICK_LOW_INPUT:
+      icon_name = GIMP_ICON_COLOR_PICKER_BLACK;
+
+      if (all_channels)
+        help = _("Pick black point for all channels");
+      else
+        help = _("Pick black point for the selected channel");
+      break;
+
+    case PICK_GAMMA:
+      icon_name = GIMP_ICON_COLOR_PICKER_GRAY;
+
+      if (all_channels)
+        help = _("Pick gray point for all channels");
+      else
+        help = _("Pick gray point for the selected channel");
+      break;
+
+    case PICK_HIGH_INPUT:
+      icon_name = GIMP_ICON_COLOR_PICKER_WHITE;
+
+      if (all_channels)
+        help = _("Pick white point for all channels");
+      else
+        help = _("Pick white point for the selected channel");
+      break;
+
+    default:
+      return NULL;
+    }
+
+  return gimp_filter_tool_add_color_picker (GIMP_FILTER_TOOL (tool),
+                                            GUINT_TO_POINTER (value),
+                                            icon_name,
+                                            help,
+                                            /* pick_abyss = */ FALSE,
+                                            NULL, NULL);
+}
+
+static void
+gimp_levels_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpLevelsTool   *tool         = GIMP_LEVELS_TOOL (filter_tool);
+  GimpToolOptions  *tool_options = GIMP_TOOL_GET_OPTIONS (filter_tool);
+  GimpLevelsConfig *config       = GIMP_LEVELS_CONFIG (filter_tool->config);
+  GtkListStore     *store;
+  GtkWidget        *main_vbox;
+  GtkWidget        *frame_vbox;
+  GtkWidget        *vbox;
+  GtkWidget        *vbox2;
+  GtkWidget        *vbox3;
+  GtkWidget        *hbox;
+  GtkWidget        *hbox2;
+  GtkWidget        *label;
+  GtkWidget        *main_frame;
+  GtkWidget        *frame;
+  GtkWidget        *button;
+  GtkWidget        *spinbutton;
+  GtkAdjustment    *adjustment;
+  GtkWidget        *bar;
+  GtkWidget        *handle_bar;
+  gint              border;
+
+  g_signal_connect (filter_tool->settings_box, "file-dialog-setup",
+                    G_CALLBACK (gimp_levels_tool_export_setup),
+                    filter_tool);
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  /*  The combo box for selecting channels  */
+  main_frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (main_vbox), main_frame, TRUE, TRUE, 0);
+  gtk_widget_show (main_frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_frame_set_label_widget (GTK_FRAME (main_frame), hbox);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("Cha_nnel:"));
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  store = gimp_enum_store_new_with_range (GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                          GIMP_HISTOGRAM_VALUE,
+                                          GIMP_HISTOGRAM_ALPHA);
+  tool->channel_menu =
+    gimp_enum_combo_box_new_with_model (GIMP_ENUM_STORE (store));
+  g_object_unref (store);
+
+  g_object_add_weak_pointer (G_OBJECT (tool->channel_menu),
+                             (gpointer) &tool->channel_menu);
+
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (tool->channel_menu),
+                                       "gimp-channel");
+  gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (tool->channel_menu),
+                                      levels_menu_sensitivity, filter_tool, NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), tool->channel_menu, FALSE, FALSE, 0);
+  gtk_widget_show (tool->channel_menu);
+
+  g_signal_connect (tool->channel_menu, "changed",
+                    G_CALLBACK (levels_channel_callback),
+                    tool);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), tool->channel_menu);
+
+  button = gtk_button_new_with_mnemonic (_("R_eset Channel"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (levels_channel_reset_callback),
+                    tool);
+
+  /*  The histogram scale radio buttons  */
+  hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
+                                       "histogram-scale", "gimp-histogram",
+                                       0, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  /*  The linear/perceptual radio buttons  */
+  hbox2 = gimp_prop_boolean_icon_box_new (G_OBJECT (config),
+                                          "linear",
+                                          GIMP_ICON_COLOR_SPACE_LINEAR,
+                                          GIMP_ICON_COLOR_SPACE_PERCEPTUAL,
+                                          _("Adjust levels in linear light"),
+                                          _("Adjust levels perceptually"));
+  gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
+  gtk_widget_show (frame_vbox);
+
+  /*  Input levels frame  */
+  frame = gimp_frame_new (_("Input Levels"));
+  gtk_box_pack_start (GTK_BOX (frame_vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  tool->histogram_view = gimp_histogram_view_new (FALSE);
+
+  g_object_add_weak_pointer (G_OBJECT (tool->histogram_view),
+                             (gpointer) &tool->histogram_view);
+
+  gtk_box_pack_start (GTK_BOX (vbox2), tool->histogram_view, TRUE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (tool->histogram_view));
+
+  g_object_bind_property (G_OBJECT (tool_options),         "histogram-scale",
+                          G_OBJECT (tool->histogram_view), "histogram-scale",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+
+  g_object_get (tool->histogram_view, "border-width", &border, NULL);
+
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox3), border);
+  gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, FALSE, 0);
+  gtk_widget_show (vbox3);
+
+  tool->input_bar = g_object_new (GIMP_TYPE_COLOR_BAR, NULL);
+  gtk_widget_set_size_request (tool->input_bar, -1, GRADIENT_HEIGHT / 2);
+  gtk_box_pack_start (GTK_BOX (vbox3), tool->input_bar, FALSE, FALSE, 0);
+  gtk_widget_show (tool->input_bar);
+
+  bar = g_object_new (GIMP_TYPE_COLOR_BAR, NULL);
+  gtk_widget_set_size_request (bar, -1, GRADIENT_HEIGHT / 2);
+  gtk_box_pack_start (GTK_BOX (vbox3), bar, FALSE, FALSE, 0);
+  gtk_widget_show (bar);
+
+  handle_bar = g_object_new (GIMP_TYPE_HANDLE_BAR, NULL);
+  gtk_widget_set_size_request (handle_bar, -1, CONTROL_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox3), handle_bar, FALSE, FALSE, 0);
+  gtk_widget_show (handle_bar);
+
+  gimp_handle_bar_connect_events (GIMP_HANDLE_BAR (handle_bar),
+                                  tool->input_bar);
+  gimp_handle_bar_connect_events (GIMP_HANDLE_BAR (handle_bar),
+                                  bar);
+
+  /*  Horizontal box for input levels spinbuttons  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /*  low input spin  */
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  button = gimp_levels_tool_color_picker_new (tool, PICK_LOW_INPUT);
+  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  tool->low_input_spinbutton = spinbutton =
+    gimp_prop_spin_button_new (filter_tool->config, "low-input",
+                               0.01, 0.1, 1);
+  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  tool->low_input = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 0,
+                                  tool->low_input);
+
+  /*  clamp input toggle  */
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), hbox2, TRUE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  button = gimp_prop_check_button_new (filter_tool->config, "clamp-input",
+                                       _("Clamp _input"));
+  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  input gamma spin  */
+  spinbutton = gimp_prop_spin_button_new (filter_tool->config, "gamma",
+                                          0.01, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
+  gimp_help_set_help_data (spinbutton, _("Gamma"), NULL);
+  gtk_widget_show (spinbutton);
+
+  tool->gamma = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
+
+  tool->gamma_linear = GTK_ADJUSTMENT (gtk_adjustment_new (127, 0, 255,
+                                                           0.1, 1.0, 0.0));
+  g_signal_connect (tool->gamma_linear, "value-changed",
+                    G_CALLBACK (levels_linear_gamma_changed),
+                    tool);
+
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 1,
+                                  tool->gamma_linear);
+  g_object_unref (tool->gamma_linear);
+
+  /*  high input spin  */
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  button = gimp_levels_tool_color_picker_new (tool, PICK_HIGH_INPUT);
+  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  spinbutton = gimp_prop_spin_button_new (filter_tool->config, "high-input",
+                                          0.01, 0.1, 1);
+  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+  tool->high_input_spinbutton = spinbutton;
+
+  tool->high_input = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 2,
+                                  tool->high_input);
+
+  /*  Output levels frame  */
+  frame = gimp_frame_new (_("Output Levels"));
+  gtk_box_pack_start (GTK_BOX (frame_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox2), border);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  tool->output_bar = g_object_new (GIMP_TYPE_COLOR_BAR, NULL);
+  gtk_widget_set_size_request (tool->output_bar, -1, GRADIENT_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox2), tool->output_bar, FALSE, FALSE, 0);
+  gtk_widget_show (tool->output_bar);
+
+  handle_bar = g_object_new (GIMP_TYPE_HANDLE_BAR, NULL);
+  gtk_widget_set_size_request (handle_bar, -1, CONTROL_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox2), handle_bar, FALSE, FALSE, 0);
+  gtk_widget_show (handle_bar);
+
+  gimp_handle_bar_connect_events (GIMP_HANDLE_BAR (handle_bar),
+                                  tool->output_bar);
+
+  /*  Horizontal box for levels spin widgets  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /*  low output spin  */
+  tool->low_output_spinbutton = spinbutton =
+    gimp_prop_spin_button_new (filter_tool->config, "low-output",
+                               0.01, 0.1, 1);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 0, adjustment);
+
+  /*  clamp output toggle  */
+  button = gimp_prop_check_button_new (filter_tool->config, "clamp-output",
+                                       _("Clamp outpu_t"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  high output spin  */
+  tool->high_output_spinbutton = spinbutton =
+    gimp_prop_spin_button_new (filter_tool->config, "high-output",
+                               0.01, 0.1, 1);
+  gtk_box_pack_end (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinbutton));
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 2, adjustment);
+
+  /*  all channels frame  */
+  main_frame = gimp_frame_new (_("All Channels"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), main_frame, FALSE, FALSE, 0);
+  gtk_widget_show (main_frame);
+
+  frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
+  gtk_widget_show (frame_vbox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (frame_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gtk_button_new_with_mnemonic (_("_Auto Input Levels"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gimp_help_set_help_data (button,
+                           _("Adjust levels for all channels automatically"),
+                           NULL);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (levels_stretch_callback),
+                    tool);
+
+  button = gimp_levels_tool_color_picker_new (tool,
+                                              PICK_HIGH_INPUT |
+                                              PICK_ALL_CHANNELS);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_levels_tool_color_picker_new (tool,
+                                              PICK_GAMMA |
+                                              PICK_ALL_CHANNELS);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_levels_tool_color_picker_new (tool,
+                                              PICK_LOW_INPUT |
+                                              PICK_ALL_CHANNELS);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_icon_button_new (GIMP_ICON_TOOL_CURVES,
+                                 _("Edit these Settings as Curves"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (levels_to_curves_callback),
+                    tool);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (tool->channel_menu),
+                                 config->channel);
+}
+
+static void
+gimp_levels_tool_reset (GimpFilterTool *filter_tool)
+{
+  GimpHistogramChannel channel;
+
+  g_object_get (filter_tool->config,
+                "channel", &channel,
+                NULL);
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->reset (filter_tool);
+
+  g_object_set (filter_tool->config,
+                "channel", channel,
+                NULL);
+}
+
+static void
+gimp_levels_tool_config_notify (GimpFilterTool   *filter_tool,
+                                GimpConfig       *config,
+                                const GParamSpec *pspec)
+{
+  GimpLevelsTool   *levels_tool   = GIMP_LEVELS_TOOL (filter_tool);
+  GimpLevelsConfig *levels_config = GIMP_LEVELS_CONFIG (config);
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->config_notify (filter_tool,
+                                                        config, pspec);
+
+  if (! levels_tool->channel_menu ||
+      ! levels_tool->histogram_view)
+    return;
+
+  if (! strcmp (pspec->name, "linear"))
+    {
+      g_clear_object (&levels_tool->histogram);
+      g_clear_object (&levels_tool->histogram_async);
+      levels_tool->histogram = gimp_histogram_new (levels_config->linear);
+
+      levels_tool->histogram_async = gimp_drawable_calculate_histogram_async (
+        GIMP_TOOL (filter_tool)->drawable, levels_tool->histogram, FALSE);
+      gimp_histogram_view_set_histogram (GIMP_HISTOGRAM_VIEW (levels_tool->histogram_view),
+                                         levels_tool->histogram);
+    }
+  else if (! strcmp (pspec->name, "channel"))
+    {
+      gimp_histogram_view_set_channel (GIMP_HISTOGRAM_VIEW (levels_tool->histogram_view),
+                                       levels_config->channel);
+      gimp_color_bar_set_channel (GIMP_COLOR_BAR (levels_tool->output_bar),
+                                  levels_config->channel);
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (levels_tool->channel_menu),
+                                     levels_config->channel);
+    }
+  else if (! strcmp (pspec->name, "gamma")     ||
+           ! strcmp (pspec->name, "low-input") ||
+           ! strcmp (pspec->name, "high-input"))
+    {
+      gdouble low  = gtk_adjustment_get_value (levels_tool->low_input);
+      gdouble high = gtk_adjustment_get_value (levels_tool->high_input);
+      gdouble delta, mid, tmp, value;
+
+      gtk_adjustment_set_lower (levels_tool->high_input,   low);
+      gtk_adjustment_set_lower (levels_tool->gamma_linear, low);
+
+      gtk_adjustment_set_upper (levels_tool->low_input,    high);
+      gtk_adjustment_set_upper (levels_tool->gamma_linear, high);
+
+      levels_update_input_bar (levels_tool);
+
+      delta = (high - low) / 2.0;
+      mid   = low + delta;
+      tmp   = log10 (1.0 / levels_config->gamma[levels_config->channel]);
+      value = mid + delta * tmp;
+
+      gtk_adjustment_set_value (levels_tool->gamma_linear, value);
+    }
+}
+
+static gboolean
+gimp_levels_tool_settings_import (GimpFilterTool  *filter_tool,
+                                  GInputStream    *input,
+                                  GError         **error)
+{
+  GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (filter_tool->config);
+  gchar             header[64];
+  gsize             bytes_read;
+
+  if (! g_input_stream_read_all (input, header, sizeof (header),
+                                 &bytes_read, NULL, error) ||
+      bytes_read != sizeof (header))
+    {
+      g_prefix_error (error, _("Could not read header: "));
+      return FALSE;
+    }
+
+  g_seekable_seek (G_SEEKABLE (input), 0, G_SEEK_SET, NULL, NULL);
+
+  if (g_str_has_prefix (header, "# GIMP Levels File\n"))
+    return gimp_levels_config_load_cruft (config, input, error);
+
+  return GIMP_FILTER_TOOL_CLASS (parent_class)->settings_import (filter_tool,
+                                                                 input,
+                                                                 error);
+}
+
+static gboolean
+gimp_levels_tool_settings_export (GimpFilterTool  *filter_tool,
+                                  GOutputStream   *output,
+                                  GError         **error)
+{
+  GimpLevelsTool   *tool   = GIMP_LEVELS_TOOL (filter_tool);
+  GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (filter_tool->config);
+
+  if (tool->export_old_format)
+    return gimp_levels_config_save_cruft (config, output, error);
+
+  return GIMP_FILTER_TOOL_CLASS (parent_class)->settings_export (filter_tool,
+                                                                 output,
+                                                                 error);
+}
+
+static void
+levels_input_adjust_by_color (GimpLevelsConfig     *config,
+                              guint                 value,
+                              GimpHistogramChannel  channel,
+                              const GimpRGB        *color)
+{
+  switch (value & 0xF)
+    {
+    case PICK_LOW_INPUT:
+      gimp_levels_config_adjust_by_colors (config, channel, color, NULL, NULL);
+      break;
+    case PICK_GAMMA:
+      gimp_levels_config_adjust_by_colors (config, channel, NULL, color, NULL);
+      break;
+    case PICK_HIGH_INPUT:
+      gimp_levels_config_adjust_by_colors (config, channel, NULL, NULL, color);
+      break;
+    default:
+      break;
+    }
+}
+
+static void
+gimp_levels_tool_color_picked (GimpFilterTool *color_tool,
+                               gpointer        identifier,
+                               gdouble         x,
+                               gdouble         y,
+                               const Babl     *sample_format,
+                               const GimpRGB  *color)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (color_tool);
+  GimpLevelsConfig *config      = GIMP_LEVELS_CONFIG (filter_tool->config);
+  GimpRGB           rgb         = *color;
+  guint             value       = GPOINTER_TO_UINT (identifier);
+
+  if (config->linear)
+    babl_process (babl_fish (babl_format ("R'G'B'A double"),
+                             babl_format ("RGBA double")),
+                  &rgb, &rgb, 1);
+
+  if (value & PICK_ALL_CHANNELS &&
+      gimp_babl_format_get_base_type (sample_format) == GIMP_RGB)
+    {
+      GimpHistogramChannel  channel;
+
+      /*  first reset the value channel  */
+      switch (value & 0xF)
+        {
+        case PICK_LOW_INPUT:
+          config->low_input[GIMP_HISTOGRAM_VALUE] = 0.0;
+          break;
+        case PICK_GAMMA:
+          config->gamma[GIMP_HISTOGRAM_VALUE] = 1.0;
+          break;
+        case PICK_HIGH_INPUT:
+          config->high_input[GIMP_HISTOGRAM_VALUE] = 1.0;
+          break;
+        default:
+          break;
+        }
+
+      /*  then adjust all color channels  */
+      for (channel = GIMP_HISTOGRAM_RED;
+           channel <= GIMP_HISTOGRAM_BLUE;
+           channel++)
+        {
+          levels_input_adjust_by_color (config, value, channel, &rgb);
+        }
+    }
+  else
+    {
+      levels_input_adjust_by_color (config, value, config->channel, &rgb);
+    }
+}
+
+static void
+gimp_levels_tool_export_setup (GimpSettingsBox      *settings_box,
+                               GtkFileChooserDialog *dialog,
+                               gboolean              export,
+                               GimpLevelsTool       *tool)
+{
+  GtkWidget *button;
+
+  if (! export)
+    return;
+
+  button = gtk_check_button_new_with_mnemonic (_("Use _old levels file format"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                tool->export_old_format);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), button);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_toggle_button_update),
+                    &tool->export_old_format);
+}
+
+static void
+levels_update_input_bar (GimpLevelsTool *tool)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpLevelsConfig *config      = GIMP_LEVELS_CONFIG (filter_tool->config);
+
+  switch (config->channel)
+    {
+      gdouble value;
+
+    case GIMP_HISTOGRAM_VALUE:
+    case GIMP_HISTOGRAM_ALPHA:
+    case GIMP_HISTOGRAM_RGB:
+    case GIMP_HISTOGRAM_LUMINANCE:
+      {
+        guchar v[256];
+        gint   i;
+
+        for (i = 0; i < 256; i++)
+          {
+            value = gimp_operation_levels_map_input (config,
+                                                     config->channel,
+                                                     i / 255.0);
+            v[i] = CLAMP (value, 0.0, 1.0) * 255.999;
+          }
+
+        gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->input_bar),
+                                    v, v, v);
+      }
+      break;
+
+    case GIMP_HISTOGRAM_RED:
+    case GIMP_HISTOGRAM_GREEN:
+    case GIMP_HISTOGRAM_BLUE:
+      {
+        guchar r[256];
+        guchar g[256];
+        guchar b[256];
+        gint   i;
+
+        for (i = 0; i < 256; i++)
+          {
+            value = gimp_operation_levels_map_input (config,
+                                                     GIMP_HISTOGRAM_RED,
+                                                     i / 255.0);
+            r[i] = CLAMP (value, 0.0, 1.0) * 255.999;
+
+            value = gimp_operation_levels_map_input (config,
+                                                     GIMP_HISTOGRAM_GREEN,
+                                                     i / 255.0);
+            g[i] = CLAMP (value, 0.0, 1.0) * 255.999;
+
+            value = gimp_operation_levels_map_input (config,
+                                                     GIMP_HISTOGRAM_BLUE,
+                                                     i / 255.0);
+            b[i] = CLAMP (value, 0.0, 1.0) * 255.999;
+          }
+
+        gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->input_bar),
+                                    r, g, b);
+      }
+      break;
+    }
+}
+
+static void
+levels_channel_callback (GtkWidget      *widget,
+                         GimpFilterTool *filter_tool)
+{
+  GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (filter_tool->config);
+  gint              value;
+
+  if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value) &&
+      config->channel != value)
+    {
+      g_object_set (config,
+                    "channel", value,
+                    NULL);
+    }
+}
+
+static void
+levels_channel_reset_callback (GtkWidget      *widget,
+                               GimpFilterTool *filter_tool)
+{
+  gimp_levels_config_reset_channel (GIMP_LEVELS_CONFIG (filter_tool->config));
+}
+
+static gboolean
+levels_menu_sensitivity (gint      value,
+                         gpointer  data)
+{
+  GimpDrawable         *drawable = GIMP_TOOL (data)->drawable;
+  GimpHistogramChannel  channel  = value;
+
+  if (!drawable)
+    return FALSE;
+
+  switch (channel)
+    {
+    case GIMP_HISTOGRAM_VALUE:
+      return TRUE;
+
+    case GIMP_HISTOGRAM_RED:
+    case GIMP_HISTOGRAM_GREEN:
+    case GIMP_HISTOGRAM_BLUE:
+      return gimp_drawable_is_rgb (drawable);
+
+    case GIMP_HISTOGRAM_ALPHA:
+      return gimp_drawable_has_alpha (drawable);
+
+    case GIMP_HISTOGRAM_RGB:
+      return FALSE;
+
+    case GIMP_HISTOGRAM_LUMINANCE:
+      return FALSE;
+    }
+
+  return FALSE;
+}
+
+static void
+levels_stretch_callback (GtkWidget      *widget,
+                         GimpLevelsTool *levels_tool)
+{
+  GimpTool       *tool        = GIMP_TOOL (levels_tool);
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (levels_tool);
+  GimpWaitable   *waitable;
+
+  waitable = gimp_trivially_cancelable_waitable_new (
+    GIMP_WAITABLE (levels_tool->histogram_async));
+
+  gimp_wait (tool->tool_info->gimp, waitable, _("Calculating histogram..."));
+
+  g_object_unref (waitable);
+
+  if (gimp_async_is_synced   (levels_tool->histogram_async) &&
+      gimp_async_is_finished (levels_tool->histogram_async))
+    {
+      gimp_levels_config_stretch (GIMP_LEVELS_CONFIG (filter_tool->config),
+                                  levels_tool->histogram,
+                                  gimp_drawable_is_rgb (tool->drawable));
+    }
+}
+
+static void
+levels_linear_gamma_changed (GtkAdjustment  *adjustment,
+                             GimpLevelsTool *tool)
+{
+  gdouble low_input  = gtk_adjustment_get_value (tool->low_input);
+  gdouble high_input = gtk_adjustment_get_value (tool->high_input);
+  gdouble delta, mid, tmp, value;
+
+  delta = (high_input - low_input) / 2.0;
+
+  if (delta >= 0.5)
+    {
+      mid   = low_input + delta;
+      tmp   = (gtk_adjustment_get_value (adjustment) - mid) / delta;
+      value = 1.0 / pow (10, tmp);
+
+      /*  round the gamma value to the nearest 1/100th  */
+      value = floor (value * 100 + 0.5) / 100.0;
+
+      gtk_adjustment_set_value (tool->gamma, value);
+    }
+}
+
+static void
+levels_to_curves_callback (GtkWidget      *widget,
+                           GimpFilterTool *filter_tool)
+{
+  GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (filter_tool->config);
+  GimpCurvesConfig *curves;
+
+  curves = gimp_levels_config_to_curves_config (config);
+
+  gimp_filter_tool_edit_as (filter_tool,
+                            "gimp-curves-tool",
+                            GIMP_CONFIG (curves));
+
+  g_object_unref (curves);
+}
diff --git a/app/tools/gimplevelstool.h b/app/tools/gimplevelstool.h
new file mode 100644
index 0000000..b28b9c6
--- /dev/null
+++ b/app/tools/gimplevelstool.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LEVELS_TOOL_H__
+#define __GIMP_LEVELS_TOOL_H__
+
+
+#include "gimpfiltertool.h"
+
+
+#define GIMP_TYPE_LEVELS_TOOL            (gimp_levels_tool_get_type ())
+#define GIMP_LEVELS_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LEVELS_TOOL, GimpLevelsTool))
+#define GIMP_LEVELS_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LEVELS_TOOL, GimpLevelsToolClass))
+#define GIMP_IS_LEVELS_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LEVELS_TOOL))
+#define GIMP_IS_LEVELS_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LEVELS_TOOL))
+#define GIMP_LEVELS_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LEVELS_TOOL, GimpLevelsToolClass))
+
+
+typedef struct _GimpLevelsTool      GimpLevelsTool;
+typedef struct _GimpLevelsToolClass GimpLevelsToolClass;
+
+struct _GimpLevelsTool
+{
+  GimpFilterTool  parent_instance;
+
+  /* dialog */
+  GimpHistogram  *histogram;
+  GimpAsync      *histogram_async;
+
+  GtkWidget      *channel_menu;
+
+  GtkWidget      *histogram_view;
+
+  GtkWidget      *input_bar;
+  GtkWidget      *low_input_spinbutton;
+  GtkWidget      *high_input_spinbutton;
+  GtkWidget      *low_output_spinbutton;
+  GtkWidget      *high_output_spinbutton;
+  GtkAdjustment  *low_input;
+  GtkAdjustment  *gamma;
+  GtkAdjustment  *gamma_linear;
+  GtkAdjustment  *high_input;
+
+  GtkWidget      *output_bar;
+
+  /* export dialog */
+  gboolean        export_old_format;
+};
+
+struct _GimpLevelsToolClass
+{
+  GimpFilterToolClass  parent_class;
+};
+
+
+void    gimp_levels_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data);
+
+GType   gimp_levels_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_LEVELS_TOOL_H__  */
diff --git a/app/tools/gimpmagnifyoptions.c b/app/tools/gimpmagnifyoptions.c
new file mode 100644
index 0000000..0ec7074
--- /dev/null
+++ b/app/tools/gimpmagnifyoptions.c
@@ -0,0 +1,202 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpmagnifyoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_AUTO_RESIZE,
+  PROP_ZOOM_TYPE
+};
+
+
+static void   gimp_magnify_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void   gimp_magnify_options_set_property (GObject         *object,
+                                                 guint            property_id,
+                                                 const GValue    *value,
+                                                 GParamSpec      *pspec);
+static void   gimp_magnify_options_get_property (GObject         *object,
+                                                 guint            property_id,
+                                                 GValue          *value,
+                                                 GParamSpec      *pspec);
+
+static void   gimp_magnify_options_reset        (GimpConfig      *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpMagnifyOptions, gimp_magnify_options,
+                         GIMP_TYPE_TOOL_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_magnify_options_config_iface_init))
+
+#define parent_class gimp_magnify_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_magnify_options_class_init (GimpMagnifyOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_magnify_options_set_property;
+  object_class->get_property = gimp_magnify_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_AUTO_RESIZE,
+                            "auto-resize",
+                            _("Auto-resize window"),
+                            _("Resize image window to accommodate "
+                              "new zoom level"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ZOOM_TYPE,
+                         "zoom-type",
+                         _("Direction"),
+                         _("Direction of magnification"),
+                         GIMP_TYPE_ZOOM_TYPE,
+                         GIMP_ZOOM_IN,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_magnify_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_magnify_options_reset;
+}
+
+static void
+gimp_magnify_options_init (GimpMagnifyOptions *options)
+{
+}
+
+static void
+gimp_magnify_options_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpMagnifyOptions *options = GIMP_MAGNIFY_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_AUTO_RESIZE:
+      options->auto_resize = g_value_get_boolean (value);
+      break;
+    case PROP_ZOOM_TYPE:
+      options->zoom_type = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_magnify_options_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpMagnifyOptions *options = GIMP_MAGNIFY_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_AUTO_RESIZE:
+      g_value_set_boolean (value, options->auto_resize);
+      break;
+    case PROP_ZOOM_TYPE:
+      g_value_set_enum (value, options->zoom_type);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_magnify_options_reset (GimpConfig *config)
+{
+  GimpToolOptions *tool_options = GIMP_TOOL_OPTIONS (config);
+  GParamSpec      *pspec;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        "auto-resize");
+
+  if (pspec)
+    G_PARAM_SPEC_BOOLEAN (pspec)->default_value =
+      GIMP_DISPLAY_CONFIG (tool_options->tool_info->gimp->config)->resize_windows_on_zoom;
+
+  parent_config_iface->reset (config);
+}
+
+GtkWidget *
+gimp_magnify_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config = G_OBJECT (tool_options);
+  GtkWidget       *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget       *frame;
+  GtkWidget       *button;
+  gchar           *str;
+  GdkModifierType  toggle_mask;
+
+  toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /*  the auto_resize toggle button  */
+  button = gimp_prop_check_button_new (config, "auto-resize", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox),  button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  tool toggle  */
+  str = g_strdup_printf (_("Direction  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+
+  frame = gimp_prop_enum_radio_frame_new (config, "zoom-type",
+                                          str, 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  g_free (str);
+
+  return vbox;
+}
diff --git a/app/tools/gimpmagnifyoptions.h b/app/tools/gimpmagnifyoptions.h
new file mode 100644
index 0000000..8747e24
--- /dev/null
+++ b/app/tools/gimpmagnifyoptions.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MAGNIFY_OPTIONS_H__
+#define __GIMP_MAGNIFY_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_MAGNIFY_OPTIONS            (gimp_magnify_options_get_type ())
+#define GIMP_MAGNIFY_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MAGNIFY_OPTIONS, GimpMagnifyOptions))
+#define GIMP_MAGNIFY_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MAGNIFY_OPTIONS, GimpMagnifyOptionsClass))
+#define GIMP_IS_MAGNIFY_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MAGNIFY_OPTIONS))
+#define GIMP_IS_MAGNIFY_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MAGNIFY_OPTIONS))
+#define GIMP_MAGNIFY_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MAGNIFY_OPTIONS, GimpMagnifyOptionsClass))
+
+
+typedef struct _GimpMagnifyOptions   GimpMagnifyOptions;
+typedef struct _GimpToolOptionsClass GimpMagnifyOptionsClass;
+
+struct _GimpMagnifyOptions
+{
+  GimpToolOptions   parent_instance;
+
+  gboolean          auto_resize;
+  GimpZoomType      zoom_type;
+};
+
+
+GType       gimp_magnify_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_magnify_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_MAGNIFY_OPTIONS_H__  */
diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c
new file mode 100644
index 0000000..8c5f5d3
--- /dev/null
+++ b/app/tools/gimpmagnifytool.c
@@ -0,0 +1,293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasrectangle.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-scale.h"
+
+#include "gimpmagnifyoptions.h"
+#include "gimpmagnifytool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_magnify_tool_button_press   (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonPressType    press_type,
+                                                GimpDisplay           *display);
+static void   gimp_magnify_tool_button_release (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpButtonReleaseType  release_type,
+                                                GimpDisplay           *display);
+static void   gimp_magnify_tool_motion         (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                guint32                time,
+                                                GdkModifierType        state,
+                                                GimpDisplay           *display);
+static void   gimp_magnify_tool_modifier_key   (GimpTool              *tool,
+                                                GdkModifierType        key,
+                                                gboolean               press,
+                                                GdkModifierType        state,
+                                                GimpDisplay           *display);
+static void   gimp_magnify_tool_cursor_update  (GimpTool              *tool,
+                                                const GimpCoords      *coords,
+                                                GdkModifierType        state,
+                                                GimpDisplay           *display);
+
+static void   gimp_magnify_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void   gimp_magnify_tool_update_items   (GimpMagnifyTool       *magnify);
+
+
+G_DEFINE_TYPE (GimpMagnifyTool, gimp_magnify_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_magnify_tool_parent_class
+
+
+void
+gimp_magnify_tool_register (GimpToolRegisterCallback  callback,
+                            gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_MAGNIFY_TOOL,
+                GIMP_TYPE_MAGNIFY_OPTIONS,
+                gimp_magnify_options_gui,
+                0,
+                "gimp-zoom-tool",
+                _("Zoom"),
+                _("Zoom Tool: Adjust the zoom level"),
+                N_("_Zoom"), "Z",
+                NULL, GIMP_HELP_TOOL_ZOOM,
+                GIMP_ICON_TOOL_ZOOM,
+                data);
+}
+
+static void
+gimp_magnify_tool_class_init (GimpMagnifyToolClass *klass)
+{
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  tool_class->button_press   = gimp_magnify_tool_button_press;
+  tool_class->button_release = gimp_magnify_tool_button_release;
+  tool_class->motion         = gimp_magnify_tool_motion;
+  tool_class->modifier_key   = gimp_magnify_tool_modifier_key;
+  tool_class->cursor_update  = gimp_magnify_tool_cursor_update;
+
+  draw_tool_class->draw      = gimp_magnify_tool_draw;
+}
+
+static void
+gimp_magnify_tool_init (GimpMagnifyTool *magnify_tool)
+{
+  GimpTool *tool = GIMP_TOOL (magnify_tool);
+
+  gimp_tool_control_set_scroll_lock            (tool->control, TRUE);
+  gimp_tool_control_set_handle_empty_image     (tool->control, TRUE);
+  gimp_tool_control_set_wants_click            (tool->control, TRUE);
+  gimp_tool_control_set_snap_to                (tool->control, FALSE);
+
+  gimp_tool_control_set_tool_cursor            (tool->control,
+                                                GIMP_TOOL_CURSOR_ZOOM);
+  gimp_tool_control_set_cursor_modifier        (tool->control,
+                                                GIMP_CURSOR_MODIFIER_PLUS);
+  gimp_tool_control_set_toggle_cursor_modifier (tool->control,
+                                                GIMP_CURSOR_MODIFIER_MINUS);
+
+  magnify_tool->x = 0;
+  magnify_tool->y = 0;
+  magnify_tool->w = 0;
+  magnify_tool->h = 0;
+}
+
+static void
+gimp_magnify_tool_button_press (GimpTool            *tool,
+                                const GimpCoords    *coords,
+                                guint32              time,
+                                GdkModifierType      state,
+                                GimpButtonPressType  press_type,
+                                GimpDisplay         *display)
+{
+  GimpMagnifyTool *magnify = GIMP_MAGNIFY_TOOL (tool);
+
+  magnify->x = coords->x;
+  magnify->y = coords->y;
+  magnify->w = 0;
+  magnify->h = 0;
+
+  gimp_tool_control_activate (tool->control);
+  tool->display = display;
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+}
+
+static void
+gimp_magnify_tool_button_release (GimpTool              *tool,
+                                  const GimpCoords      *coords,
+                                  guint32                time,
+                                  GdkModifierType        state,
+                                  GimpButtonReleaseType  release_type,
+                                  GimpDisplay           *display)
+{
+  GimpMagnifyTool    *magnify = GIMP_MAGNIFY_TOOL (tool);
+  GimpMagnifyOptions *options = GIMP_MAGNIFY_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell   *shell   = gimp_display_get_shell (tool->display);
+
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  gimp_tool_control_halt (tool->control);
+
+  switch (release_type)
+    {
+    case GIMP_BUTTON_RELEASE_CLICK:
+    case GIMP_BUTTON_RELEASE_NO_MOTION:
+      gimp_display_shell_scale (shell,
+                                options->zoom_type,
+                                0.0,
+                                GIMP_ZOOM_FOCUS_POINTER);
+      break;
+
+    case GIMP_BUTTON_RELEASE_NORMAL:
+      {
+        gdouble  x, y;
+        gdouble  width, height;
+        gboolean resize_window;
+
+        x      = (magnify->w < 0) ?  magnify->x + magnify->w : magnify->x;
+        y      = (magnify->h < 0) ?  magnify->y + magnify->h : magnify->y;
+        width  = (magnify->w < 0) ? -magnify->w : magnify->w;
+        height = (magnify->h < 0) ? -magnify->h : magnify->h;
+
+        /* Resize windows only in multi-window mode */
+        resize_window = (options->auto_resize &&
+                         ! GIMP_GUI_CONFIG (display->config)->single_window_mode);
+
+        gimp_display_shell_scale_to_rectangle (shell,
+                                               options->zoom_type,
+                                               x, y, width, height,
+                                               resize_window);
+      }
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gimp_magnify_tool_motion (GimpTool         *tool,
+                          const GimpCoords *coords,
+                          guint32           time,
+                          GdkModifierType   state,
+                          GimpDisplay      *display)
+{
+  GimpMagnifyTool *magnify = GIMP_MAGNIFY_TOOL (tool);
+
+  magnify->w = coords->x - magnify->x;
+  magnify->h = coords->y - magnify->y;
+
+  gimp_magnify_tool_update_items (magnify);
+}
+
+static void
+gimp_magnify_tool_modifier_key (GimpTool        *tool,
+                                GdkModifierType  key,
+                                gboolean         press,
+                                GdkModifierType  state,
+                                GimpDisplay     *display)
+{
+  GimpMagnifyOptions *options = GIMP_MAGNIFY_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_toggle_behavior_mask ())
+    {
+      switch (options->zoom_type)
+        {
+        case GIMP_ZOOM_IN:
+          g_object_set (options, "zoom-type", GIMP_ZOOM_OUT, NULL);
+          break;
+
+        case GIMP_ZOOM_OUT:
+          g_object_set (options, "zoom-type", GIMP_ZOOM_IN, NULL);
+          break;
+
+        default:
+          break;
+        }
+    }
+}
+
+static void
+gimp_magnify_tool_cursor_update (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 GdkModifierType   state,
+                                 GimpDisplay      *display)
+{
+  GimpMagnifyOptions *options = GIMP_MAGNIFY_TOOL_GET_OPTIONS (tool);
+
+  gimp_tool_control_set_toggled (tool->control,
+                                 options->zoom_type == GIMP_ZOOM_OUT);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_magnify_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpMagnifyTool *magnify = GIMP_MAGNIFY_TOOL (draw_tool);
+
+  magnify->rectangle =
+    gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                  magnify->x,
+                                  magnify->y,
+                                  magnify->w,
+                                  magnify->h);
+}
+
+static void
+gimp_magnify_tool_update_items (GimpMagnifyTool *magnify)
+{
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (magnify)))
+    {
+      gimp_canvas_rectangle_set (magnify->rectangle,
+                                 magnify->x,
+                                 magnify->y,
+                                 magnify->w,
+                                 magnify->h);
+    }
+}
diff --git a/app/tools/gimpmagnifytool.h b/app/tools/gimpmagnifytool.h
new file mode 100644
index 0000000..505485a
--- /dev/null
+++ b/app/tools/gimpmagnifytool.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MAGNIFY_TOOL_H__
+#define __GIMP_MAGNIFY_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_MAGNIFY_TOOL            (gimp_magnify_tool_get_type ())
+#define GIMP_MAGNIFY_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MAGNIFY_TOOL, GimpMagnifyTool))
+#define GIMP_MAGNIFY_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MAGNIFY_TOOL, GimpMagnifyToolClass))
+#define GIMP_IS_MAGNIFY_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MAGNIFY_TOOL))
+#define GIMP_IS_MAGNIFY_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MAGNIFY_TOOL))
+#define GIMP_MAGNIFY_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MAGNIFY_TOOL, GimpMagnifyToolClass))
+
+#define GIMP_MAGNIFY_TOOL_GET_OPTIONS(t)  (GIMP_MAGNIFY_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpMagnifyTool      GimpMagnifyTool;
+typedef struct _GimpMagnifyToolClass GimpMagnifyToolClass;
+
+struct _GimpMagnifyTool
+{
+  GimpDrawTool    parent_instance;
+
+  gdouble         x, y;  /*  upper left hand coordinate  */
+  gdouble         w, h;  /*  width and height            */
+
+  GimpCanvasItem *rectangle;
+};
+
+struct _GimpMagnifyToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+void    gimp_magnify_tool_register (GimpToolRegisterCallback  callback,
+                                    gpointer                  data);
+
+GType   gimp_magnify_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MAGNIFY_TOOL_H__  */
diff --git a/app/tools/gimpmeasureoptions.c b/app/tools/gimpmeasureoptions.c
new file mode 100644
index 0000000..4e106a0
--- /dev/null
+++ b/app/tools/gimpmeasureoptions.c
@@ -0,0 +1,183 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmeasuretool.c
+ * Copyright (C) 1999 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpmeasureoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_USE_INFO_WINDOW
+};
+
+
+static void   gimp_measure_options_set_property (GObject      *object,
+                                                 guint         property_id,
+                                                 const GValue *value,
+                                                 GParamSpec   *pspec);
+static void   gimp_measure_options_get_property (GObject      *object,
+                                                 guint         property_id,
+                                                 GValue       *value,
+                                                 GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpMeasureOptions, gimp_measure_options,
+               GIMP_TYPE_TRANSFORM_OPTIONS)
+
+
+static void
+gimp_measure_options_class_init (GimpMeasureOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_measure_options_set_property;
+  object_class->get_property = gimp_measure_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ORIENTATION,
+                         "orientation",
+                         _("Orientation"),
+                         _("Orientation against which the angle is measured"),
+                         GIMP_TYPE_COMPASS_ORIENTATION,
+                         GIMP_COMPASS_ORIENTATION_AUTO,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_INFO_WINDOW,
+                            "use-info-window",
+                            _("Use info window"),
+                            _("Open a floating dialog to view details "
+                              "about measurements"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_measure_options_init (GimpMeasureOptions *options)
+{
+}
+
+static void
+gimp_measure_options_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpMeasureOptions *options = GIMP_MEASURE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      options->orientation = g_value_get_enum (value);
+      break;
+    case PROP_USE_INFO_WINDOW:
+      options->use_info_window = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_measure_options_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpMeasureOptions *options = GIMP_MEASURE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, options->orientation);
+      break;
+    case PROP_USE_INFO_WINDOW:
+      g_value_set_boolean (value, options->use_info_window);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_measure_options_gui (GimpToolOptions *tool_options)
+{
+  GObject            *config  = G_OBJECT (tool_options);
+  GimpMeasureOptions *options = GIMP_MEASURE_OPTIONS (tool_options);
+  GtkWidget          *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget          *frame;
+  GtkWidget          *button;
+  GtkWidget          *vbox2;
+  gchar              *str;
+  GdkModifierType     toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /*  the orientation frame  */
+  str = g_strdup_printf (_("Orientation  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+  frame = gimp_prop_enum_radio_frame_new (config, "orientation", str, -1, -1);
+  g_free (str);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /*  the use_info_window toggle button  */
+  button = gimp_prop_check_button_new (config, "use-info-window", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  the straighten frame  */
+  frame = gimp_frame_new (_("Straighten"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the transform options  */
+  vbox2 = gimp_transform_options_gui (tool_options, FALSE, TRUE, TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  /*  the straighten button  */
+  button = gtk_button_new_with_label (_("Straighten"));
+  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (button, FALSE);
+  gimp_help_set_help_data (button,
+                           _("Rotate the active layer, selection or path "
+                             "by the measured angle"),
+                           NULL);
+  gtk_widget_show (button);
+
+  options->straighten_button = button;
+
+  return vbox;
+}
diff --git a/app/tools/gimpmeasureoptions.h b/app/tools/gimpmeasureoptions.h
new file mode 100644
index 0000000..79f9f8f
--- /dev/null
+++ b/app/tools/gimpmeasureoptions.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MEASURE_OPTIONS_H__
+#define __GIMP_MEASURE_OPTIONS_H__
+
+
+#include "gimptransformoptions.h"
+
+
+#define GIMP_TYPE_MEASURE_OPTIONS            (gimp_measure_options_get_type ())
+#define GIMP_MEASURE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MEASURE_OPTIONS, GimpMeasureOptions))
+#define GIMP_MEASURE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MEASURE_OPTIONS, GimpMeasureOptionsClass))
+#define GIMP_IS_MEASURE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MEASURE_OPTIONS))
+#define GIMP_IS_MEASURE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MEASURE_OPTIONS))
+#define GIMP_MEASURE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MEASURE_OPTIONS, GimpMeasureOptionsClass))
+
+
+typedef struct _GimpMeasureOptions      GimpMeasureOptions;
+typedef struct _GimpMeasureOptionsClass GimpMeasureOptionsClass;
+
+struct _GimpMeasureOptions
+{
+  GimpTransformOptions    parent_instance;
+
+  GimpCompassOrientation  orientation;
+  gboolean                use_info_window;
+
+  /*  options gui  */
+  GtkWidget              *straighten_button;
+};
+
+struct _GimpMeasureOptionsClass
+{
+  GimpTransformOptionsClass  parent_class;
+};
+
+
+GType       gimp_measure_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_measure_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_MEASURE_OPTIONS_H__  */
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
new file mode 100644
index 0000000..ade4d8c
--- /dev/null
+++ b/app/tools/gimpmeasuretool.c
@@ -0,0 +1,890 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Measure tool
+ * Copyright (C) 1999-2003 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpprogress.h"
+#include "core/gimp-transform-utils.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimptoolcompass.h"
+#include "display/gimptoolgui.h"
+
+#include "gimpmeasureoptions.h"
+#include "gimpmeasuretool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void     gimp_measure_tool_control         (GimpTool              *tool,
+                                                   GimpToolAction         action,
+                                                   GimpDisplay           *display);
+static void     gimp_measure_tool_modifier_key    (GimpTool              *tool,
+                                                   GdkModifierType        key,
+                                                   gboolean               press,
+                                                   GdkModifierType        state,
+                                                   GimpDisplay           *display);
+static void     gimp_measure_tool_button_press    (GimpTool              *tool,
+                                                   const GimpCoords      *coords,
+                                                   guint32                time,
+                                                   GdkModifierType        state,
+                                                   GimpButtonPressType    press_type,
+                                                   GimpDisplay           *display);
+static void     gimp_measure_tool_button_release  (GimpTool              *tool,
+                                                   const GimpCoords      *coords,
+                                                   guint32                time,
+                                                   GdkModifierType        state,
+                                                   GimpButtonReleaseType  release_type,
+                                                   GimpDisplay           *display);
+static void     gimp_measure_tool_motion          (GimpTool              *tool,
+                                                   const GimpCoords      *coords,
+                                                   guint32                time,
+                                                   GdkModifierType        state,
+                                                   GimpDisplay           *display);
+
+static void     gimp_measure_tool_recalc_matrix   (GimpTransformTool     *tr_tool);
+static gchar  * gimp_measure_tool_get_undo_desc   (GimpTransformTool     *tr_tool);
+
+static void     gimp_measure_tool_compass_changed (GimpToolWidget        *widget,
+                                                   GimpMeasureTool       *measure);
+static void     gimp_measure_tool_compass_response(GimpToolWidget        *widget,
+                                                   gint                   response_id,
+                                                   GimpMeasureTool       *measure);
+static void     gimp_measure_tool_compass_status  (GimpToolWidget        *widget,
+                                                   const gchar           *status,
+                                                   GimpMeasureTool       *measure);
+static void     gimp_measure_tool_compass_create_guides
+                                                  (GimpToolWidget        *widget,
+                                                   gint                   x,
+                                                   gint                   y,
+                                                   gboolean               horizontal,
+                                                   gboolean               vertical,
+                                                   GimpMeasureTool       *measure);
+
+static void     gimp_measure_tool_start           (GimpMeasureTool       *measure,
+                                                   GimpDisplay           *display,
+                                                   const GimpCoords      *coords);
+static void     gimp_measure_tool_halt            (GimpMeasureTool       *measure);
+
+static GimpToolGui * gimp_measure_tool_dialog_new (GimpMeasureTool       *measure);
+static void     gimp_measure_tool_dialog_update   (GimpMeasureTool       *measure,
+                                                   GimpDisplay           *display);
+
+static void     gimp_measure_tool_straighten_button_clicked
+                                                  (GtkWidget             *button,
+                                                   GimpMeasureTool       *measure);
+
+G_DEFINE_TYPE (GimpMeasureTool, gimp_measure_tool, GIMP_TYPE_TRANSFORM_TOOL)
+
+#define parent_class gimp_measure_tool_parent_class
+
+
+void
+gimp_measure_tool_register (GimpToolRegisterCallback  callback,
+                            gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_MEASURE_TOOL,
+                GIMP_TYPE_MEASURE_OPTIONS,
+                gimp_measure_options_gui,
+                0,
+                "gimp-measure-tool",
+                _("Measure"),
+                _("Measure Tool: Measure distances and angles"),
+                N_("_Measure"), "<shift>M",
+                NULL, GIMP_HELP_TOOL_MEASURE,
+                GIMP_ICON_TOOL_MEASURE,
+                data);
+}
+
+static void
+gimp_measure_tool_class_init (GimpMeasureToolClass *klass)
+{
+  GimpToolClass          *tool_class = GIMP_TOOL_CLASS (klass);
+  GimpTransformToolClass *tr_class   = GIMP_TRANSFORM_TOOL_CLASS (klass);
+
+  tool_class->control        = gimp_measure_tool_control;
+  tool_class->modifier_key   = gimp_measure_tool_modifier_key;
+  tool_class->button_press   = gimp_measure_tool_button_press;
+  tool_class->button_release = gimp_measure_tool_button_release;
+  tool_class->motion         = gimp_measure_tool_motion;
+
+  tr_class->recalc_matrix    = gimp_measure_tool_recalc_matrix;
+  tr_class->get_undo_desc    = gimp_measure_tool_get_undo_desc;
+
+  tr_class->undo_desc        = C_("undo-type", "Straighten");
+  tr_class->progress_text    = _("Straightening");
+}
+
+static void
+gimp_measure_tool_init (GimpMeasureTool *measure)
+{
+  GimpTool *tool = GIMP_TOOL (measure);
+
+  gimp_tool_control_set_handle_empty_image (tool->control, TRUE);
+  gimp_tool_control_set_active_modifiers   (tool->control,
+                                            GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_PIXEL_BORDER);
+  gimp_tool_control_set_cursor             (tool->control,
+                                            GIMP_CURSOR_CROSSHAIR_SMALL);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_MEASURE);
+
+  gimp_draw_tool_set_default_status (GIMP_DRAW_TOOL (tool),
+                                     _("Click-Drag to create a line"));
+}
+
+static void
+gimp_measure_tool_control (GimpTool       *tool,
+                           GimpToolAction  action,
+                           GimpDisplay    *display)
+{
+  GimpMeasureTool *measure = GIMP_MEASURE_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_measure_tool_halt (measure);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_measure_tool_modifier_key (GimpTool        *tool,
+                                GdkModifierType  key,
+                                gboolean         press,
+                                GdkModifierType  state,
+                                GimpDisplay     *display)
+{
+  GimpMeasureOptions *options = GIMP_MEASURE_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_toggle_behavior_mask ())
+    {
+      switch (options->orientation)
+        {
+        case GIMP_COMPASS_ORIENTATION_HORIZONTAL:
+          g_object_set (options,
+                        "orientation", GIMP_COMPASS_ORIENTATION_VERTICAL,
+                        NULL);
+          break;
+
+        case GIMP_COMPASS_ORIENTATION_VERTICAL:
+          g_object_set (options,
+                        "orientation", GIMP_COMPASS_ORIENTATION_HORIZONTAL,
+                        NULL);
+          break;
+
+        default:
+          break;
+        }
+    }
+}
+
+static void
+gimp_measure_tool_button_press (GimpTool            *tool,
+                                const GimpCoords    *coords,
+                                guint32              time,
+                                GdkModifierType      state,
+                                GimpButtonPressType  press_type,
+                                GimpDisplay         *display)
+{
+  GimpMeasureTool    *measure = GIMP_MEASURE_TOOL (tool);
+  GimpMeasureOptions *options = GIMP_MEASURE_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell   *shell   = gimp_display_get_shell (display);
+  GimpImage          *image   = gimp_display_get_image (display);
+
+  if (tool->display && display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  if (! measure->widget)
+    {
+      measure->supress_guides = TRUE;
+
+      gimp_measure_tool_start (measure, display, coords);
+
+      gimp_tool_widget_hover (measure->widget, coords, state, TRUE);
+    }
+
+  if (gimp_tool_widget_button_press (measure->widget, coords, time, state,
+                                     press_type))
+    {
+      measure->grab_widget = measure->widget;
+    }
+
+  /*  create the info window if necessary  */
+  if (! measure->gui)
+    {
+      if (options->use_info_window ||
+          ! gimp_display_shell_get_show_statusbar (shell))
+        {
+          measure->gui = gimp_measure_tool_dialog_new (measure);
+          g_object_add_weak_pointer (G_OBJECT (measure->gui),
+                                     (gpointer) &measure->gui);
+        }
+    }
+
+  if (measure->gui)
+    {
+      gimp_tool_gui_set_shell (measure->gui, shell);
+      gimp_tool_gui_set_viewable (measure->gui, GIMP_VIEWABLE (image));
+
+      gimp_measure_tool_dialog_update (measure, display);
+    }
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_measure_tool_button_release (GimpTool              *tool,
+                                  const GimpCoords      *coords,
+                                  guint32                time,
+                                  GdkModifierType        state,
+                                  GimpButtonReleaseType  release_type,
+                                  GimpDisplay           *display)
+{
+  GimpMeasureTool *measure = GIMP_MEASURE_TOOL (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  if (measure->grab_widget)
+    {
+      gimp_tool_widget_button_release (measure->grab_widget,
+                                       coords, time, state, release_type);
+      measure->grab_widget = NULL;
+    }
+
+  measure->supress_guides = FALSE;
+}
+
+static void
+gimp_measure_tool_motion (GimpTool         *tool,
+                          const GimpCoords *coords,
+                          guint32           time,
+                          GdkModifierType   state,
+                          GimpDisplay      *display)
+{
+  GimpMeasureTool *measure = GIMP_MEASURE_TOOL (tool);
+
+  if (measure->grab_widget)
+    {
+      gimp_tool_widget_motion (measure->grab_widget, coords, time, state);
+    }
+}
+
+static void
+gimp_measure_tool_recalc_matrix (GimpTransformTool *tr_tool)
+{
+  GimpMeasureTool *measure = GIMP_MEASURE_TOOL (tr_tool);
+  gdouble          angle;
+
+  if (measure->n_points < 2)
+    {
+      tr_tool->transform_valid = FALSE;
+
+      return;
+    }
+
+  g_object_get (measure->widget,
+                "pixel-angle", &angle,
+                NULL);
+
+  gimp_matrix3_identity (&tr_tool->transform);
+  gimp_transform_matrix_rotate_center (&tr_tool->transform,
+                                       measure->x[0], measure->y[0],
+                                       angle);
+
+  tr_tool->transform_valid = TRUE;
+}
+
+static gchar *
+gimp_measure_tool_get_undo_desc (GimpTransformTool *tr_tool)
+{
+  GimpMeasureTool        *measure = GIMP_MEASURE_TOOL (tr_tool);
+  GimpCompassOrientation  orientation;
+  gdouble                 angle;
+
+  g_object_get (measure->widget,
+                "effective-orientation", &orientation,
+                "pixel-angle",           &angle,
+                NULL);
+
+  angle = gimp_rad_to_deg (fabs (angle));
+
+  switch (orientation)
+    {
+    case GIMP_COMPASS_ORIENTATION_AUTO:
+      return g_strdup_printf (C_("undo-type",
+                                 "Straighten by %-3.3g°"),
+                              angle);
+
+    case GIMP_COMPASS_ORIENTATION_HORIZONTAL:
+      return g_strdup_printf (C_("undo-type",
+                                 "Straighten Horizontally by %-3.3g°"),
+                              angle);
+
+    case GIMP_COMPASS_ORIENTATION_VERTICAL:
+      return g_strdup_printf (C_("undo-type",
+                                 "Straighten Vertically by %-3.3g°"),
+                              angle);
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+static void
+gimp_measure_tool_compass_changed (GimpToolWidget  *widget,
+                                   GimpMeasureTool *measure)
+{
+  GimpMeasureOptions *options = GIMP_MEASURE_TOOL_GET_OPTIONS (measure);
+
+  g_object_get (widget,
+                "n-points", &measure->n_points,
+                "x1",       &measure->x[0],
+                "y1",       &measure->y[0],
+                "x2",       &measure->x[1],
+                "y2",       &measure->y[1],
+                "x3",       &measure->x[2],
+                "y3",       &measure->y[2],
+                NULL);
+
+  gtk_widget_set_sensitive (options->straighten_button, measure->n_points >= 2);
+  gimp_measure_tool_dialog_update (measure, GIMP_TOOL (measure)->display);
+}
+
+static void
+gimp_measure_tool_compass_response (GimpToolWidget  *widget,
+                                    gint             response_id,
+                                    GimpMeasureTool *measure)
+{
+  GimpTool *tool = GIMP_TOOL (measure);
+
+  if (response_id == GIMP_TOOL_WIDGET_RESPONSE_CANCEL)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+}
+
+static void
+gimp_measure_tool_compass_status (GimpToolWidget  *widget,
+                                  const gchar     *status,
+                                  GimpMeasureTool *measure)
+{
+  GimpTool *tool = GIMP_TOOL (measure);
+
+  if (! status)
+    {
+      /* replace status bar hint by distance and angle */
+      gimp_measure_tool_dialog_update (measure, tool->display);
+    }
+}
+
+static void
+gimp_measure_tool_compass_create_guides (GimpToolWidget  *widget,
+                                         gint             x,
+                                         gint             y,
+                                         gboolean         horizontal,
+                                         gboolean         vertical,
+                                         GimpMeasureTool *measure)
+{
+  GimpDisplay *display = GIMP_TOOL (measure)->display;
+  GimpImage   *image   = gimp_display_get_image (display);
+
+  if (measure->supress_guides)
+    return;
+
+  if (x < 0 || x > gimp_image_get_width (image))
+    vertical = FALSE;
+
+  if (y < 0 || y > gimp_image_get_height (image))
+    horizontal = FALSE;
+
+  if (horizontal || vertical)
+    {
+      if (horizontal && vertical)
+        gimp_image_undo_group_start (image,
+                                     GIMP_UNDO_GROUP_GUIDE,
+                                     _("Add Guides"));
+
+      if (horizontal)
+        gimp_image_add_hguide (image, y, TRUE);
+
+      if (vertical)
+        gimp_image_add_vguide (image, x, TRUE);
+
+      if (horizontal && vertical)
+        gimp_image_undo_group_end (image);
+
+      gimp_image_flush (image);
+    }
+}
+
+static void
+gimp_measure_tool_start (GimpMeasureTool  *measure,
+                         GimpDisplay      *display,
+                         const GimpCoords *coords)
+{
+  GimpTool           *tool    = GIMP_TOOL (measure);
+  GimpDisplayShell   *shell   = gimp_display_get_shell (display);
+  GimpMeasureOptions *options = GIMP_MEASURE_TOOL_GET_OPTIONS (tool);
+
+  measure->n_points = 1;
+  measure->x[0]     = coords->x;
+  measure->y[0]     = coords->y;
+  measure->x[1]     = 0;
+  measure->y[1]     = 0;
+  measure->x[2]     = 0;
+  measure->y[2]     = 0;
+
+  measure->widget = gimp_tool_compass_new (shell,
+                                           options->orientation,
+                                           measure->n_points,
+                                           measure->x[0],
+                                           measure->y[0],
+                                           measure->x[1],
+                                           measure->y[1],
+                                           measure->x[2],
+                                           measure->y[2]);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), measure->widget);
+
+  g_object_bind_property (options,         "orientation",
+                          measure->widget, "orientation",
+                          G_BINDING_DEFAULT);
+
+  g_signal_connect (measure->widget, "changed",
+                    G_CALLBACK (gimp_measure_tool_compass_changed),
+                    measure);
+  g_signal_connect (measure->widget, "response",
+                    G_CALLBACK (gimp_measure_tool_compass_response),
+                    measure);
+  g_signal_connect (measure->widget, "status",
+                    G_CALLBACK (gimp_measure_tool_compass_status),
+                    measure);
+  g_signal_connect (measure->widget, "create-guides",
+                    G_CALLBACK (gimp_measure_tool_compass_create_guides),
+                    measure);
+  g_signal_connect (options->straighten_button, "clicked",
+                    G_CALLBACK (gimp_measure_tool_straighten_button_clicked),
+                    measure);
+
+  tool->display = display;
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (measure), display);
+}
+
+static void
+gimp_measure_tool_halt (GimpMeasureTool *measure)
+{
+  GimpMeasureOptions *options = GIMP_MEASURE_TOOL_GET_OPTIONS (measure);
+  GimpTool           *tool    = GIMP_TOOL (measure);
+
+  if (options->straighten_button)
+    {
+      gtk_widget_set_sensitive (options->straighten_button, FALSE);
+
+      g_signal_handlers_disconnect_by_func (
+        options->straighten_button,
+        G_CALLBACK (gimp_measure_tool_straighten_button_clicked),
+        measure);
+    }
+
+  if (tool->display)
+    gimp_tool_pop_status (tool, tool->display);
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (measure)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (measure));
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL);
+  g_clear_object (&measure->widget);
+
+  g_clear_object (&measure->gui);
+
+  tool->display = NULL;
+}
+
+static void
+gimp_measure_tool_dialog_update (GimpMeasureTool *measure,
+                                 GimpDisplay     *display)
+{
+  GimpDisplayShell *shell = gimp_display_get_shell (display);
+  GimpImage        *image = gimp_display_get_image (display);
+  gint              ax, ay;
+  gint              bx, by;
+  gint              pixel_width;
+  gint              pixel_height;
+  gdouble           unit_width;
+  gdouble           unit_height;
+  gdouble           pixel_distance;
+  gdouble           unit_distance;
+  gdouble           inch_distance;
+  gdouble           pixel_angle;
+  gdouble           unit_angle;
+  gdouble           xres;
+  gdouble           yres;
+  gchar             format[128];
+  gint              unit_distance_digits = 0;
+  gint              unit_width_digits;
+  gint              unit_height_digits;
+
+  /*  calculate distance and angle  */
+  ax = measure->x[1] - measure->x[0];
+  ay = measure->y[1] - measure->y[0];
+
+  if (measure->n_points == 3)
+    {
+      bx = measure->x[2] - measure->x[0];
+      by = measure->y[2] - measure->y[0];
+    }
+  else
+    {
+      bx = 0;
+      by = 0;
+    }
+
+  pixel_width  = ABS (ax - bx);
+  pixel_height = ABS (ay - by);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  unit_width  = gimp_pixels_to_units (pixel_width,  shell->unit, xres);
+  unit_height = gimp_pixels_to_units (pixel_height, shell->unit, yres);
+
+  pixel_distance = sqrt (SQR (ax - bx) + SQR (ay - by));
+  inch_distance = sqrt (SQR ((gdouble) (ax - bx) / xres) +
+                        SQR ((gdouble) (ay - by) / yres));
+  unit_distance  = gimp_unit_get_factor (shell->unit) * inch_distance;
+
+  g_object_get (measure->widget,
+                "pixel-angle", &pixel_angle,
+                "unit-angle",  &unit_angle,
+                NULL);
+
+  pixel_angle = fabs (pixel_angle * 180.0 / G_PI);
+  unit_angle  = fabs (unit_angle  * 180.0 / G_PI);
+
+  /* Compute minimum digits to display accurate values, so that
+   * every pixel shows a different value in unit.
+   */
+  if (inch_distance)
+    unit_distance_digits = gimp_unit_get_scaled_digits (shell->unit,
+                                                        pixel_distance /
+                                                        inch_distance);
+  unit_width_digits  = gimp_unit_get_scaled_digits (shell->unit, xres);
+  unit_height_digits = gimp_unit_get_scaled_digits (shell->unit, yres);
+
+  if (shell->unit == GIMP_UNIT_PIXEL)
+    {
+      gimp_tool_replace_status (GIMP_TOOL (measure), display,
+                                "%.1f %s, %.2f\302\260 (%d × %d)",
+                                pixel_distance, _("pixels"), pixel_angle,
+                                pixel_width, pixel_height);
+    }
+  else
+    {
+      g_snprintf (format, sizeof (format),
+                  "%%.%df %s, %%.2f\302\260 (%%.%df × %%.%df)",
+                  unit_distance_digits,
+                  gimp_unit_get_plural (shell->unit),
+                  unit_width_digits,
+                  unit_height_digits);
+
+      gimp_tool_replace_status (GIMP_TOOL (measure), display, format,
+                                unit_distance, unit_angle,
+                                unit_width, unit_height);
+    }
+
+  if (measure->gui)
+    {
+      gchar buf[128];
+
+      /* Distance */
+      g_snprintf (buf, sizeof (buf), "%.1f", pixel_distance);
+      gtk_label_set_text (GTK_LABEL (measure->distance_label[0]), buf);
+
+      if (shell->unit != GIMP_UNIT_PIXEL)
+        {
+          g_snprintf (format, sizeof (format), "%%.%df",
+                      unit_distance_digits);
+          g_snprintf (buf, sizeof (buf), format, unit_distance);
+          gtk_label_set_text (GTK_LABEL (measure->distance_label[1]), buf);
+
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[0]),
+                              gimp_unit_get_plural (shell->unit));
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (measure->distance_label[1]), NULL);
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[0]), NULL);
+        }
+
+      /* Angle */
+      g_snprintf (buf, sizeof (buf), "%.2f", pixel_angle);
+      gtk_label_set_text (GTK_LABEL (measure->angle_label[0]), buf);
+
+      if (fabs (unit_angle - pixel_angle) > 0.01)
+        {
+          g_snprintf (buf, sizeof (buf), "%.2f", unit_angle);
+          gtk_label_set_text (GTK_LABEL (measure->angle_label[1]), buf);
+
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[1]), "\302\260");
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (measure->angle_label[1]), NULL);
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[1]), NULL);
+        }
+
+      /* Width */
+      g_snprintf (buf, sizeof (buf), "%d", pixel_width);
+      gtk_label_set_text (GTK_LABEL (measure->width_label[0]), buf);
+
+      if (shell->unit != GIMP_UNIT_PIXEL)
+        {
+          g_snprintf (format, sizeof (format), "%%.%df",
+                      unit_width_digits);
+          g_snprintf (buf, sizeof (buf), format, unit_width);
+          gtk_label_set_text (GTK_LABEL (measure->width_label[1]), buf);
+
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[2]),
+                              gimp_unit_get_plural (shell->unit));
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (measure->width_label[1]), NULL);
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[2]), NULL);
+        }
+
+      g_snprintf (buf, sizeof (buf), "%d", pixel_height);
+      gtk_label_set_text (GTK_LABEL (measure->height_label[0]), buf);
+
+      /* Height */
+      if (shell->unit != GIMP_UNIT_PIXEL)
+        {
+          g_snprintf (format, sizeof (format), "%%.%df",
+                      unit_height_digits);
+          g_snprintf (buf, sizeof (buf), format, unit_height);
+          gtk_label_set_text (GTK_LABEL (measure->height_label[1]), buf);
+
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[3]),
+                              gimp_unit_get_plural (shell->unit));
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (measure->height_label[1]), NULL);
+          gtk_label_set_text (GTK_LABEL (measure->unit_label[3]), NULL);
+        }
+
+      gimp_tool_gui_show (measure->gui);
+    }
+}
+
+static GimpToolGui *
+gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
+{
+  GimpTool         *tool = GIMP_TOOL (measure);
+  GimpDisplayShell *shell;
+  GimpToolGui      *gui;
+  GtkWidget        *table;
+  GtkWidget        *label;
+
+  g_return_val_if_fail (tool->display != NULL, NULL);
+
+  shell = gimp_display_get_shell (tool->display);
+
+  gui = gimp_tool_gui_new (tool->tool_info,
+                           NULL,
+                           _("Measure Distances and Angles"),
+                           NULL, NULL,
+                           gtk_widget_get_screen (GTK_WIDGET (shell)),
+                           gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                           TRUE,
+
+                           _("_Close"), GTK_RESPONSE_CLOSE,
+
+                           NULL);
+
+  gimp_tool_gui_set_auto_overlay (gui, TRUE);
+  gimp_tool_gui_set_focus_on_map (gui, FALSE);
+
+  g_signal_connect (gui, "response",
+                    G_CALLBACK (g_object_unref),
+                    NULL);
+
+  table = gtk_table_new (4, 5, TRUE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gui)), table,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (table);
+
+
+  label = gtk_label_new (_("Distance:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+  gtk_widget_show (label);
+
+  measure->distance_label[0] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("pixels"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+  gtk_widget_show (label);
+
+  measure->distance_label[1] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 0, 1);
+  gtk_widget_show (label);
+
+  measure->unit_label[0] = label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
+  gtk_widget_show (label);
+
+
+  label = gtk_label_new (_("Angle:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+  gtk_widget_show (label);
+
+  measure->angle_label[0] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2);
+  gtk_widget_show (label);
+
+  label = gtk_label_new ("\302\260");
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2);
+  gtk_widget_show (label);
+
+  measure->angle_label[1] = label = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 1, 2);
+  gtk_widget_show (label);
+
+  measure->unit_label[1] = label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 1, 2);
+  gtk_widget_show (label);
+
+
+  label = gtk_label_new (_("Width:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+  gtk_widget_show (label);
+
+  measure->width_label[0] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("pixels"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
+  gtk_widget_show (label);
+
+  measure->width_label[1] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 2, 3);
+  gtk_widget_show (label);
+
+  measure->unit_label[2] = label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 2, 3);
+  gtk_widget_show (label);
+
+
+  label = gtk_label_new (_("Height:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+  gtk_widget_show (label);
+
+  measure->height_label[0] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 3, 4);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("pixels"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
+  gtk_widget_show (label);
+
+  measure->height_label[1] = label = gtk_label_new ("0.0");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
+  gtk_widget_show (label);
+
+  measure->unit_label[3] = label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 3, 4);
+  gtk_widget_show (label);
+
+  return gui;
+}
+
+static void
+gimp_measure_tool_straighten_button_clicked (GtkWidget       *button,
+                                             GimpMeasureTool *measure)
+{
+  GimpTool          *tool    = GIMP_TOOL (measure);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (measure);
+
+  if (gimp_transform_tool_transform (tr_tool, tool->display))
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+}
diff --git a/app/tools/gimpmeasuretool.h b/app/tools/gimpmeasuretool.h
new file mode 100644
index 0000000..ebd42fc
--- /dev/null
+++ b/app/tools/gimpmeasuretool.h
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MEASURE_TOOL_H__
+#define __GIMP_MEASURE_TOOL_H__
+
+
+#include "gimptransformtool.h"
+
+
+#define GIMP_TYPE_MEASURE_TOOL            (gimp_measure_tool_get_type ())
+#define GIMP_MEASURE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MEASURE_TOOL, GimpMeasureTool))
+#define GIMP_MEASURE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MEASURE_TOOL, GimpMeasureToolClass))
+#define GIMP_IS_MEASURE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MEASURE_TOOL))
+#define GIMP_IS_MEASURE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MEASURE_TOOL))
+#define GIMP_MEASURE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MEASURE_TOOL, GimpMeasureToolClass))
+
+#define GIMP_MEASURE_TOOL_GET_OPTIONS(t)  (GIMP_MEASURE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpMeasureTool      GimpMeasureTool;
+typedef struct _GimpMeasureToolClass GimpMeasureToolClass;
+
+struct _GimpMeasureTool
+{
+  GimpTransformTool  parent_instance;
+
+  GimpToolWidget    *widget;
+  GimpToolWidget    *grab_widget;
+
+  gboolean           supress_guides;
+
+  gint               n_points;
+  gint               x[3];
+  gint               y[3];
+
+  GimpToolGui       *gui;
+  GtkWidget         *distance_label[2];
+  GtkWidget         *angle_label[2];
+  GtkWidget         *width_label[2];
+  GtkWidget         *height_label[2];
+  GtkWidget         *unit_label[4];
+};
+
+struct _GimpMeasureToolClass
+{
+  GimpTransformToolClass  parent_class;
+};
+
+
+void    gimp_measure_tool_register (GimpToolRegisterCallback  callback,
+                                    gpointer                  data);
+
+GType   gimp_measure_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MEASURE_TOOL_H__  */
diff --git a/app/tools/gimpmoveoptions.c b/app/tools/gimpmoveoptions.c
new file mode 100644
index 0000000..86bd4d1
--- /dev/null
+++ b/app/tools/gimpmoveoptions.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpmoveoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_MOVE_TYPE,
+  PROP_MOVE_CURRENT
+};
+
+
+static void   gimp_move_options_set_property (GObject      *object,
+                                              guint         property_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec);
+static void   gimp_move_options_get_property (GObject      *object,
+                                              guint         property_id,
+                                              GValue       *value,
+                                              GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpMoveOptions, gimp_move_options, GIMP_TYPE_TOOL_OPTIONS)
+
+
+static void
+gimp_move_options_class_init (GimpMoveOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_move_options_set_property;
+  object_class->get_property = gimp_move_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_MOVE_TYPE,
+                         "move-type",
+                         NULL, NULL,
+                         GIMP_TYPE_TRANSFORM_TYPE,
+                         GIMP_TRANSFORM_TYPE_LAYER,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MOVE_CURRENT,
+                            "move-current",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_move_options_init (GimpMoveOptions *options)
+{
+}
+
+static void
+gimp_move_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpMoveOptions *options = GIMP_MOVE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_MOVE_TYPE:
+      options->move_type = g_value_get_enum (value);
+      break;
+    case PROP_MOVE_CURRENT:
+      options->move_current = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_move_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpMoveOptions *options = GIMP_MOVE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_MOVE_TYPE:
+      g_value_set_enum (value, options->move_type);
+      break;
+    case PROP_MOVE_CURRENT:
+      g_value_set_boolean (value, options->move_current);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_move_options_notify_type (GimpMoveOptions *move_options,
+                               GParamSpec      *pspec,
+                               GtkWidget       *frame)
+{
+  if (move_options->move_type == GIMP_TRANSFORM_TYPE_SELECTION)
+    {
+      gtk_widget_hide (gtk_bin_get_child (GTK_BIN (frame)));
+      gtk_frame_set_label (GTK_FRAME (frame), _("Move selection"));
+    }
+  else
+    {
+      const gchar *false_label = NULL;
+      const gchar *true_label  = NULL;
+      GtkWidget   *button;
+      GSList      *group;
+      gchar       *title;
+
+      title = g_strdup_printf (_("Tool Toggle  (%s)"),
+                               gimp_get_mod_string (gimp_get_extend_selection_mask ()));
+      gtk_frame_set_label (GTK_FRAME (frame), title);
+      g_free (title);
+
+      switch (move_options->move_type)
+        {
+        case GIMP_TRANSFORM_TYPE_LAYER:
+          false_label = _("Pick a layer or guide");
+          true_label  = _("Move the active layer");
+          break;
+
+        case GIMP_TRANSFORM_TYPE_PATH:
+          false_label = _("Pick a path");
+          true_label  = _("Move the active path");
+          break;
+
+        default: /* GIMP_TRANSFORM_TYPE_SELECTION */
+          g_return_if_reached ();
+        }
+
+      button = g_object_get_data (G_OBJECT (frame), "radio-button");
+
+      group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+      gtk_button_set_label (GTK_BUTTON (group->data), true_label);
+
+      group = g_slist_next (group);
+      gtk_button_set_label (GTK_BUTTON (group->data), false_label);
+
+      gtk_widget_show (gtk_bin_get_child (GTK_BIN (frame)));
+    }
+}
+
+GtkWidget *
+gimp_move_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config  = G_OBJECT (tool_options);
+  GimpMoveOptions *options = GIMP_MOVE_OPTIONS (tool_options);
+  GtkWidget       *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget       *hbox;
+  GtkWidget       *box;
+  GtkWidget       *label;
+  GtkWidget       *frame;
+  gchar           *title;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  options->type_box = hbox;
+
+  label = gtk_label_new (_("Move:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  box = gimp_prop_enum_icon_box_new (config, "move-type", "gimp",
+                                     GIMP_TRANSFORM_TYPE_LAYER,
+                                     GIMP_TRANSFORM_TYPE_PATH);
+  gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  /*  tool toggle  */
+  title =
+    g_strdup_printf (_("Tool Toggle  (%s)"),
+                     gimp_get_mod_string (gimp_get_extend_selection_mask ()));
+
+  frame = gimp_prop_boolean_radio_frame_new (config, "move-current",
+                                             title, "true", "false");
+
+  gimp_move_options_notify_type (GIMP_MOVE_OPTIONS (config), NULL, frame);
+
+  g_signal_connect_object (config, "notify::move-type",
+                           G_CALLBACK (gimp_move_options_notify_type),
+                           frame, 0);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  g_free (title);
+
+  return vbox;
+}
diff --git a/app/tools/gimpmoveoptions.h b/app/tools/gimpmoveoptions.h
new file mode 100644
index 0000000..bb28683
--- /dev/null
+++ b/app/tools/gimpmoveoptions.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MOVE_OPTIONS_H__
+#define __GIMP_MOVE_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_MOVE_OPTIONS            (gimp_move_options_get_type ())
+#define GIMP_MOVE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MOVE_OPTIONS, GimpMoveOptions))
+#define GIMP_MOVE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MOVE_OPTIONS, GimpMoveOptionsClass))
+#define GIMP_IS_MOVE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MOVE_OPTIONS))
+#define GIMP_IS_MOVE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MOVE_OPTIONS))
+#define GIMP_MOVE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MOVE_OPTIONS, GimpMoveOptionsClass))
+
+
+typedef struct _GimpMoveOptions      GimpMoveOptions;
+typedef struct _GimpToolOptionsClass GimpMoveOptionsClass;
+
+struct _GimpMoveOptions
+{
+  GimpToolOptions    parent_instance;
+
+  GimpTransformType  move_type;
+  gboolean           move_current;
+
+  /*  options gui  */
+  GtkWidget         *type_box;
+};
+
+
+GType       gimp_move_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_move_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_MOVE_OPTIONS_H__ */
diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c
new file mode 100644
index 0000000..8d1d617
--- /dev/null
+++ b/app/tools/gimpmovetool.c
@@ -0,0 +1,665 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-cairo.h"
+#include "core/gimp-utils.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimplayer.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayermask.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimpundostack.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-appearance.h"
+#include "display/gimpdisplayshell-selection.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimpeditselectiontool.h"
+#include "gimpguidetool.h"
+#include "gimpmoveoptions.h"
+#include "gimpmovetool.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_move_tool_finalize       (GObject               *object);
+
+static void   gimp_move_tool_button_press   (GimpTool              *tool,
+                                             const GimpCoords      *coords,
+                                             guint32                time,
+                                             GdkModifierType        state,
+                                             GimpButtonPressType    press_type,
+                                             GimpDisplay           *display);
+static void   gimp_move_tool_button_release (GimpTool              *tool,
+                                             const GimpCoords      *coords,
+                                             guint32                time,
+                                             GdkModifierType        state,
+                                             GimpButtonReleaseType  release_type,
+                                             GimpDisplay           *display);
+static gboolean gimp_move_tool_key_press    (GimpTool              *tool,
+                                             GdkEventKey           *kevent,
+                                             GimpDisplay           *display);
+static void   gimp_move_tool_modifier_key   (GimpTool              *tool,
+                                             GdkModifierType        key,
+                                             gboolean               press,
+                                             GdkModifierType        state,
+                                             GimpDisplay           *display);
+static void   gimp_move_tool_oper_update    (GimpTool              *tool,
+                                             const GimpCoords      *coords,
+                                             GdkModifierType        state,
+                                             gboolean               proximity,
+                                             GimpDisplay           *display);
+static void   gimp_move_tool_cursor_update  (GimpTool              *tool,
+                                             const GimpCoords      *coords,
+                                             GdkModifierType        state,
+                                             GimpDisplay           *display);
+
+static void   gimp_move_tool_draw           (GimpDrawTool          *draw_tool);
+
+
+G_DEFINE_TYPE (GimpMoveTool, gimp_move_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_move_tool_parent_class
+
+
+void
+gimp_move_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_MOVE_TOOL,
+                GIMP_TYPE_MOVE_OPTIONS,
+                gimp_move_options_gui,
+                0,
+                "gimp-move-tool",
+                C_("tool", "Move"),
+                _("Move Tool: Move layers, selections, and other objects"),
+                N_("_Move"), "M",
+                NULL, GIMP_HELP_TOOL_MOVE,
+                GIMP_ICON_TOOL_MOVE,
+                data);
+}
+
+static void
+gimp_move_tool_class_init (GimpMoveToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->finalize     = gimp_move_tool_finalize;
+
+  tool_class->button_press   = gimp_move_tool_button_press;
+  tool_class->button_release = gimp_move_tool_button_release;
+  tool_class->key_press      = gimp_move_tool_key_press;
+  tool_class->modifier_key   = gimp_move_tool_modifier_key;
+  tool_class->oper_update    = gimp_move_tool_oper_update;
+  tool_class->cursor_update  = gimp_move_tool_cursor_update;
+
+  draw_tool_class->draw      = gimp_move_tool_draw;
+}
+
+static void
+gimp_move_tool_init (GimpMoveTool *move_tool)
+{
+  GimpTool *tool = GIMP_TOOL (move_tool);
+
+  gimp_tool_control_set_snap_to            (tool->control, FALSE);
+  gimp_tool_control_set_handle_empty_image (tool->control, TRUE);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_MOVE);
+
+  move_tool->floating_layer     = NULL;
+  move_tool->guides             = NULL;
+
+  move_tool->saved_type         = GIMP_TRANSFORM_TYPE_LAYER;
+
+  move_tool->old_active_layer   = NULL;
+  move_tool->old_active_vectors = NULL;
+}
+
+static void
+gimp_move_tool_finalize (GObject *object)
+{
+  GimpMoveTool *move = GIMP_MOVE_TOOL (object);
+
+  g_clear_pointer (&move->guides, g_list_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_move_tool_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  GimpMoveTool      *move           = GIMP_MOVE_TOOL (tool);
+  GimpMoveOptions   *options        = GIMP_MOVE_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell  *shell          = gimp_display_get_shell (display);
+  GimpImage         *image          = gimp_display_get_image (display);
+  GimpItem          *active_item    = NULL;
+  GimpTranslateMode  translate_mode = GIMP_TRANSLATE_MODE_MASK;
+  const gchar       *null_message   = NULL;
+  const gchar       *locked_message = NULL;
+
+  tool->display = display;
+
+  move->floating_layer = NULL;
+
+  g_clear_pointer (&move->guides, g_list_free);
+
+  if (! options->move_current)
+    {
+      const gint snap_distance = display->config->snap_distance;
+
+      if (options->move_type == GIMP_TRANSFORM_TYPE_PATH)
+        {
+          GimpVectors *vectors;
+
+          vectors = gimp_image_pick_vectors (image,
+                                             coords->x, coords->y,
+                                             FUNSCALEX (shell, snap_distance),
+                                             FUNSCALEY (shell, snap_distance));
+          if (vectors)
+            {
+              move->old_active_vectors =
+                gimp_image_get_active_vectors (image);
+
+              gimp_image_set_active_vectors (image, vectors);
+            }
+          else
+            {
+              /*  no path picked  */
+              return;
+            }
+        }
+      else if (options->move_type == GIMP_TRANSFORM_TYPE_LAYER)
+        {
+          GList     *guides;
+          GimpLayer *layer;
+
+          if (gimp_display_shell_get_show_guides (shell) &&
+              (guides = gimp_image_pick_guides (image,
+                                                coords->x, coords->y,
+                                                FUNSCALEX (shell, snap_distance),
+                                                FUNSCALEY (shell, snap_distance))))
+            {
+              move->guides = guides;
+
+              gimp_guide_tool_start_edit_many (tool, display, guides);
+
+              return;
+            }
+          else if ((layer = gimp_image_pick_layer (image,
+                                                   coords->x,
+                                                   coords->y,
+                                                   NULL)))
+            {
+              if (gimp_image_get_floating_selection (image) &&
+                  ! gimp_layer_is_floating_sel (layer))
+                {
+                  /*  If there is a floating selection, and this aint it,
+                   *  use the move tool to anchor it.
+                   */
+                  move->floating_layer =
+                    gimp_image_get_floating_selection (image);
+
+                  gimp_tool_control_activate (tool->control);
+
+                  return;
+                }
+              else
+                {
+                  move->old_active_layer = gimp_image_get_active_layer (image);
+
+                  gimp_image_set_active_layer (image, layer);
+                }
+            }
+          else
+            {
+              /*  no guide and no layer picked  */
+
+              return;
+            }
+        }
+    }
+
+  switch (options->move_type)
+    {
+    case GIMP_TRANSFORM_TYPE_PATH:
+      {
+        active_item = GIMP_ITEM (gimp_image_get_active_vectors (image));
+
+        translate_mode = GIMP_TRANSLATE_MODE_VECTORS;
+
+        if (! active_item)
+          {
+            null_message = _("There is no path to move.");
+          }
+        else if (gimp_item_is_position_locked (active_item))
+          {
+            locked_message = _("The active path's position is locked.");
+          }
+      }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+      {
+        active_item = GIMP_ITEM (gimp_image_get_mask (image));
+
+        if (gimp_channel_is_empty (GIMP_CHANNEL (active_item)))
+          active_item = NULL;
+
+        translate_mode = GIMP_TRANSLATE_MODE_MASK;
+
+        if (! active_item)
+          {
+            /* cannot happen, don't translate this message */
+            null_message  = "There is no selection to move.";
+          }
+        else if (gimp_item_is_position_locked (active_item))
+          {
+            locked_message = "The selection's position is locked.";
+          }
+      }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      {
+        active_item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
+        if (! active_item)
+          {
+            null_message = _("There is no layer to move.");
+          }
+        else if (GIMP_IS_LAYER_MASK (active_item))
+          {
+            translate_mode = GIMP_TRANSLATE_MODE_LAYER_MASK;
+
+            if (gimp_item_is_position_locked (active_item))
+              locked_message = _("The active layer's position is locked.");
+            else if (gimp_item_is_content_locked (active_item))
+              locked_message = _("The active layer's pixels are locked.");
+          }
+        else if (GIMP_IS_CHANNEL (active_item))
+          {
+            translate_mode = GIMP_TRANSLATE_MODE_CHANNEL;
+
+            if (gimp_item_is_position_locked (active_item))
+              locked_message = _("The active channel's position is locked.");
+            else if (gimp_item_is_content_locked (active_item))
+              locked_message = _("The active channel's pixels are locked.");
+          }
+        else
+          {
+            translate_mode = GIMP_TRANSLATE_MODE_LAYER;
+
+            if (gimp_item_is_position_locked (active_item))
+              locked_message = _("The active layer's position is locked.");
+          }
+      }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      g_return_if_reached ();
+    }
+
+  if (! active_item)
+    {
+      gimp_tool_message_literal (tool, display, null_message);
+      gimp_widget_blink (options->type_box);
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      return;
+    }
+  else if (locked_message)
+    {
+      gimp_tool_message_literal (tool, display, locked_message);
+      gimp_tools_blink_lock_box (display->gimp, active_item);
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      return;
+    }
+
+  gimp_tool_control_activate (tool->control);
+
+  gimp_edit_selection_tool_start (tool, display, coords,
+                                  translate_mode,
+                                  TRUE);
+}
+
+static void
+gimp_move_tool_button_release (GimpTool              *tool,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type,
+                               GimpDisplay           *display)
+{
+  GimpMoveTool  *move   = GIMP_MOVE_TOOL (tool);
+  GimpGuiConfig *config = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage     *image  = gimp_display_get_image (display);
+  gboolean       flush  = FALSE;
+
+  gimp_tool_control_halt (tool->control);
+
+  if (! config->move_tool_changes_active ||
+      (release_type == GIMP_BUTTON_RELEASE_CANCEL))
+    {
+      if (move->old_active_layer)
+        {
+          gimp_image_set_active_layer (image, move->old_active_layer);
+          move->old_active_layer = NULL;
+
+          flush = TRUE;
+        }
+
+      if (move->old_active_vectors)
+        {
+          gimp_image_set_active_vectors (image, move->old_active_vectors);
+          move->old_active_vectors = NULL;
+
+          flush = TRUE;
+        }
+    }
+
+  if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      if (move->floating_layer)
+        {
+          floating_sel_anchor (move->floating_layer);
+
+          flush = TRUE;
+        }
+    }
+
+  if (flush)
+    gimp_image_flush (image);
+}
+
+static gboolean
+gimp_move_tool_key_press (GimpTool    *tool,
+                          GdkEventKey *kevent,
+                          GimpDisplay *display)
+{
+  GimpMoveOptions *options = GIMP_MOVE_TOOL_GET_OPTIONS (tool);
+
+  return gimp_edit_selection_tool_translate (tool, kevent,
+                                             options->move_type,
+                                             display,
+                                             options->type_box);
+}
+
+static void
+gimp_move_tool_modifier_key (GimpTool        *tool,
+                             GdkModifierType  key,
+                             gboolean         press,
+                             GdkModifierType  state,
+                             GimpDisplay     *display)
+{
+  GimpMoveTool    *move    = GIMP_MOVE_TOOL (tool);
+  GimpMoveOptions *options = GIMP_MOVE_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_extend_selection_mask ())
+    {
+      g_object_set (options, "move-current", ! options->move_current, NULL);
+    }
+  else if (key == GDK_MOD1_MASK ||
+           key == gimp_get_toggle_behavior_mask ())
+    {
+      GimpTransformType button_type;
+
+      button_type = options->move_type;
+
+      if (press)
+        {
+          if (key == (state & (GDK_MOD1_MASK |
+                               gimp_get_toggle_behavior_mask ())))
+            {
+              /*  first modifier pressed  */
+
+              move->saved_type = options->move_type;
+            }
+        }
+      else
+        {
+          if (! (state & (GDK_MOD1_MASK |
+                          gimp_get_toggle_behavior_mask ())))
+            {
+              /*  last modifier released  */
+
+              button_type = move->saved_type;
+            }
+        }
+
+      if (state & GDK_MOD1_MASK)
+        {
+          button_type = GIMP_TRANSFORM_TYPE_SELECTION;
+        }
+      else if (state & gimp_get_toggle_behavior_mask ())
+        {
+          button_type = GIMP_TRANSFORM_TYPE_PATH;
+        }
+
+      if (button_type != options->move_type)
+        {
+          g_object_set (options, "move-type", button_type, NULL);
+        }
+    }
+}
+
+static void
+gimp_move_tool_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+  GimpMoveTool     *move    = GIMP_MOVE_TOOL (tool);
+  GimpMoveOptions  *options = GIMP_MOVE_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell *shell   = gimp_display_get_shell (display);
+  GimpImage        *image   = gimp_display_get_image (display);
+  GList            *guides  = NULL;
+
+  if (options->move_type == GIMP_TRANSFORM_TYPE_LAYER &&
+      ! options->move_current                         &&
+      gimp_display_shell_get_show_guides (shell)      &&
+      proximity)
+    {
+      gint snap_distance = display->config->snap_distance;
+
+      guides = gimp_image_pick_guides (image, coords->x, coords->y,
+                                       FUNSCALEX (shell, snap_distance),
+                                       FUNSCALEY (shell, snap_distance));
+    }
+
+  if (gimp_g_list_compare (guides, move->guides))
+    {
+      GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+      gimp_draw_tool_pause (draw_tool);
+
+      if (gimp_draw_tool_is_active (draw_tool) &&
+          draw_tool->display != display)
+        gimp_draw_tool_stop (draw_tool);
+
+      g_clear_pointer (&move->guides, g_list_free);
+
+      move->guides = guides;
+
+      if (! gimp_draw_tool_is_active (draw_tool))
+        gimp_draw_tool_start (draw_tool, display);
+
+      gimp_draw_tool_resume (draw_tool);
+    }
+  else
+    {
+      g_list_free (guides);
+    }
+}
+
+static void
+gimp_move_tool_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpMoveOptions    *options       = GIMP_MOVE_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell   *shell         = gimp_display_get_shell (display);
+  GimpImage          *image         = gimp_display_get_image (display);
+  GimpCursorType      cursor        = GIMP_CURSOR_MOUSE;
+  GimpToolCursorType  tool_cursor   = GIMP_TOOL_CURSOR_MOVE;
+  GimpCursorModifier  modifier      = GIMP_CURSOR_MODIFIER_NONE;
+  gint                snap_distance = display->config->snap_distance;
+
+  if (options->move_type == GIMP_TRANSFORM_TYPE_PATH)
+    {
+      tool_cursor = GIMP_TOOL_CURSOR_PATHS;
+      modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+
+      if (options->move_current)
+        {
+          GimpItem *item = GIMP_ITEM (gimp_image_get_active_vectors (image));
+
+          if (! item || gimp_item_is_position_locked (item))
+            modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+      else
+        {
+          if (gimp_image_pick_vectors (image,
+                                       coords->x, coords->y,
+                                       FUNSCALEX (shell, snap_distance),
+                                       FUNSCALEY (shell, snap_distance)))
+            {
+              tool_cursor = GIMP_TOOL_CURSOR_HAND;
+            }
+          else
+            {
+              modifier = GIMP_CURSOR_MODIFIER_BAD;
+            }
+        }
+    }
+  else if (options->move_type == GIMP_TRANSFORM_TYPE_SELECTION)
+    {
+      tool_cursor = GIMP_TOOL_CURSOR_RECT_SELECT;
+      modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+
+      if (gimp_channel_is_empty (gimp_image_get_mask (image)))
+        modifier = GIMP_CURSOR_MODIFIER_BAD;
+    }
+  else if (options->move_current)
+    {
+      GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
+      if (! item || gimp_item_is_position_locked (item))
+        modifier = GIMP_CURSOR_MODIFIER_BAD;
+    }
+  else
+    {
+      GimpLayer  *layer;
+
+      if (gimp_display_shell_get_show_guides (shell) &&
+          gimp_image_pick_guide (image, coords->x, coords->y,
+                                 FUNSCALEX (shell, snap_distance),
+                                 FUNSCALEY (shell, snap_distance)))
+        {
+          tool_cursor = GIMP_TOOL_CURSOR_HAND;
+          modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+        }
+      else if ((layer = gimp_image_pick_layer (image,
+                                               coords->x, coords->y,
+                                               NULL)))
+        {
+          /*  if there is a floating selection, and this aint it...  */
+          if (gimp_image_get_floating_selection (image) &&
+              ! gimp_layer_is_floating_sel (layer))
+            {
+              tool_cursor = GIMP_TOOL_CURSOR_MOVE;
+              modifier    = GIMP_CURSOR_MODIFIER_ANCHOR;
+            }
+          else if (gimp_item_is_position_locked (GIMP_ITEM (layer)))
+            {
+              modifier = GIMP_CURSOR_MODIFIER_BAD;
+            }
+          else if (layer != gimp_image_get_active_layer (image))
+            {
+              tool_cursor = GIMP_TOOL_CURSOR_HAND;
+              modifier    = GIMP_CURSOR_MODIFIER_MOVE;
+            }
+        }
+      else
+        {
+          modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+    }
+
+  gimp_tool_control_set_cursor          (tool->control, cursor);
+  gimp_tool_control_set_tool_cursor     (tool->control, tool_cursor);
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_move_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpMoveTool *move = GIMP_MOVE_TOOL (draw_tool);
+  GList        *iter;
+
+  for (iter = move->guides; iter; iter = g_list_next (iter))
+    {
+      GimpGuide      *guide = iter->data;
+      GimpCanvasItem *item;
+      GimpGuideStyle  style;
+
+      style = gimp_guide_get_style (guide);
+
+      item = gimp_draw_tool_add_guide (draw_tool,
+                                       gimp_guide_get_orientation (guide),
+                                       gimp_guide_get_position (guide),
+                                       style);
+      gimp_canvas_item_set_highlight (item, TRUE);
+    }
+}
diff --git a/app/tools/gimpmovetool.h b/app/tools/gimpmovetool.h
new file mode 100644
index 0000000..a597e01
--- /dev/null
+++ b/app/tools/gimpmovetool.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MOVE_TOOL_H__
+#define __GIMP_MOVE_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_MOVE_TOOL            (gimp_move_tool_get_type ())
+#define GIMP_MOVE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MOVE_TOOL, GimpMoveTool))
+#define GIMP_MOVE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MOVE_TOOL, GimpMoveToolClass))
+#define GIMP_IS_MOVE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MOVE_TOOL))
+#define GIMP_IS_MOVE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MOVE_TOOL))
+#define GIMP_MOVE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MOVE_TOOL, GimpMoveToolClass))
+
+#define GIMP_MOVE_TOOL_GET_OPTIONS(t)  (GIMP_MOVE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpMoveTool      GimpMoveTool;
+typedef struct _GimpMoveToolClass GimpMoveToolClass;
+
+struct _GimpMoveTool
+{
+  GimpDrawTool         parent_instance;
+
+  GimpLayer           *floating_layer;
+  GList               *guides;
+
+  GimpTransformType    saved_type;
+
+  GimpLayer           *old_active_layer;
+  GimpVectors         *old_active_vectors;
+};
+
+struct _GimpMoveToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+void    gimp_move_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_move_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_MOVE_TOOL_H__  */
diff --git a/app/tools/gimpmybrushoptions-gui.c b/app/tools/gimpmybrushoptions-gui.c
new file mode 100644
index 0000000..bc26d07
--- /dev/null
+++ b/app/tools/gimpmybrushoptions-gui.c
@@ -0,0 +1,88 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+
+#include "paint/gimpmybrushoptions.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpviewablebox.h"
+
+#include "gimpmybrushoptions-gui.h"
+#include "gimppaintoptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+GtkWidget *
+gimp_mybrush_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget *button;
+  GtkWidget *scale;
+
+  /* the brush */
+  button = gimp_prop_mybrush_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                      _("Brush"), 2,
+                                      NULL, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /* erase mode */
+  scale = gimp_prop_check_button_new (config, "eraser", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* no erasing */
+  scale = gimp_prop_check_button_new (config, "no-erasing", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* radius */
+  scale = gimp_prop_spin_scale_new (config, "radius", NULL,
+                                    0.1, 1.0, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* opaque */
+  scale = gimp_prop_spin_scale_new (config, "opaque", NULL,
+                                    0.1, 1.0, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /* hardness */
+  scale = gimp_prop_spin_scale_new (config, "hardness", NULL,
+                                    0.1, 1.0, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return vbox;
+}
diff --git a/app/tools/gimpmybrushoptions-gui.h b/app/tools/gimpmybrushoptions-gui.h
new file mode 100644
index 0000000..f6b7195
--- /dev/null
+++ b/app/tools/gimpmybrushoptions-gui.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_MYBRUSH_OPTIONS_GUI_H__
+#define  __GIMP_MYBRUSH_OPTIONS_GUI_H__
+
+
+GtkWidget * gimp_mybrush_options_gui (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_MYBRUSH_OPTIONS_GUI_H__  */
diff --git a/app/tools/gimpmybrushtool.c b/app/tools/gimpmybrushtool.c
new file mode 100644
index 0000000..4576b89
--- /dev/null
+++ b/app/tools/gimpmybrushtool.c
@@ -0,0 +1,169 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpmybrushoptions.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpcanvasarc.h"
+
+#include "core/gimp.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "gimpmybrushoptions-gui.h"
+#include "gimpmybrushtool.h"
+#include "gimptoolcontrol.h"
+#include "core/gimpmybrush.h"
+
+#include "gimp-intl.h"
+
+G_DEFINE_TYPE (GimpMybrushTool, gimp_mybrush_tool, GIMP_TYPE_PAINT_TOOL)
+
+#define parent_class gimp_mybrush_tool_parent_class
+
+
+static void   gimp_mybrush_tool_options_notify        (GimpTool         *tool,
+                                                       GimpToolOptions  *options,
+                                                       const GParamSpec *pspec);
+
+static GimpCanvasItem * gimp_mybrush_tool_get_outline (GimpPaintTool *paint_tool,
+                                                       GimpDisplay   *display,
+                                                       gdouble        x,
+                                                       gdouble        y);
+
+
+void
+gimp_mybrush_tool_register (GimpToolRegisterCallback  callback,
+                            gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_MYBRUSH_TOOL,
+                GIMP_TYPE_MYBRUSH_OPTIONS,
+                gimp_mybrush_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                GIMP_CONTEXT_PROP_MASK_OPACITY    |
+                GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
+                GIMP_CONTEXT_PROP_MASK_MYBRUSH,
+                "gimp-mypaint-brush-tool",
+                _("MyPaint Brush"),
+                _("MyPaint Brush Tool: Use MyPaint brushes in GIMP"),
+                N_("M_yPaint Brush"), "Y",
+                NULL, GIMP_HELP_TOOL_MYPAINT_BRUSH,
+                GIMP_ICON_TOOL_MYPAINT_BRUSH,
+                data);
+}
+
+static void
+gimp_mybrush_tool_class_init (GimpMybrushToolClass *klass)
+{
+  GimpToolClass      *tool_class       = GIMP_TOOL_CLASS (klass);
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  tool_class->options_notify    = gimp_mybrush_tool_options_notify;
+
+  paint_tool_class->get_outline = gimp_mybrush_tool_get_outline;
+}
+
+static void
+gimp_mybrush_tool_init (GimpMybrushTool *mybrush_tool)
+{
+  GimpTool *tool = GIMP_TOOL (mybrush_tool);
+
+  gimp_tool_control_set_tool_cursor     (tool->control, GIMP_TOOL_CURSOR_INK);
+  gimp_tool_control_set_action_size     (tool->control,
+                                         "tools/tools-mypaint-brush-radius-set");
+  gimp_tool_control_set_action_hardness (tool->control,
+                                         "tools/tools-mypaint-brush-hardness-set");
+
+  gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (mybrush_tool),
+                                       GIMP_COLOR_PICK_TARGET_FOREGROUND);
+}
+
+static void
+gimp_mybrush_tool_options_notify (GimpTool         *tool,
+                                  GimpToolOptions  *options,
+                                  const GParamSpec *pspec)
+{
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! strcmp (pspec->name, "radius"))
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+}
+
+static GimpCanvasItem *
+gimp_mybrush_tool_get_outline (GimpPaintTool *paint_tool,
+                               GimpDisplay   *display,
+                               gdouble        x,
+                               gdouble        y)
+{
+  GimpMybrushOptions *options = GIMP_MYBRUSH_TOOL_GET_OPTIONS (paint_tool);
+  GimpMybrush        *brush   = gimp_context_get_mybrush (GIMP_CONTEXT (options));
+  GimpCanvasItem     *item    = NULL;
+  GimpDisplayShell   *shell   = gimp_display_get_shell (display);
+
+  gdouble radius = exp (options->radius) + 2 * options->radius * gimp_mybrush_get_offset_by_random (brush);
+  radius = MAX (MAX (4 / shell->scale_x, 4 / shell->scale_y), radius);
+
+  item = gimp_mybrush_tool_create_cursor (paint_tool, display, x, y, radius);
+
+  if (! item)
+    {
+      gimp_paint_tool_set_draw_fallback (paint_tool,
+                                         TRUE, radius);
+    }
+
+  return item;
+}
+
+GimpCanvasItem *
+gimp_mybrush_tool_create_cursor (GimpPaintTool *paint_tool,
+                                 GimpDisplay   *display,
+                                 gdouble        x,
+                                 gdouble        y,
+                                 gdouble        radius)
+{
+
+  GimpDisplayShell     *shell;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_TOOL (paint_tool), NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  shell = gimp_display_get_shell (display);
+
+  /*  don't draw the boundary if it becomes too small  */
+  if (SCALEX (shell, radius) > 4 &&
+      SCALEY (shell, radius) > 4)
+    {
+      return gimp_canvas_arc_new(shell, x, y, radius, radius, 0.0, 2 * G_PI, FALSE);
+    }
+
+  return NULL;
+}
diff --git a/app/tools/gimpmybrushtool.h b/app/tools/gimpmybrushtool.h
new file mode 100644
index 0000000..9b16024
--- /dev/null
+++ b/app/tools/gimpmybrushtool.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_MYBRUSH_TOOL_H__
+#define  __GIMP_MYBRUSH_TOOL_H__
+
+
+#include "gimppainttool.h"
+
+
+#define GIMP_TYPE_MYBRUSH_TOOL            (gimp_mybrush_tool_get_type ())
+#define GIMP_MYBRUSH_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MYBRUSH_TOOL, GimpMybrushTool))
+#define GIMP_MYBRUSH_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MYBRUSH_TOOL, GimpMybrushToolClass))
+#define GIMP_IS_MYBRUSH_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MYBRUSH_TOOL))
+#define GIMP_IS_MYBRUSH_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MYBRUSH_TOOL))
+#define GIMP_MYBRUSH_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MYBRUSH_TOOL, GimpMybrushToolClass))
+
+#define GIMP_MYBRUSH_TOOL_GET_OPTIONS(t)  (GIMP_MYBRUSH_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpMybrushTool      GimpMybrushTool;
+typedef struct _GimpMybrushToolClass GimpMybrushToolClass;
+
+struct _GimpMybrushTool
+{
+  GimpPaintTool parent_instance;
+};
+
+struct _GimpMybrushToolClass
+{
+  GimpPaintToolClass parent_class;
+};
+
+
+void    gimp_mybrush_tool_register (GimpToolRegisterCallback  callback,
+                                    gpointer                  data);
+
+GType   gimp_mybrush_tool_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_mybrush_tool_create_cursor (GimpPaintTool *paint_tool,
+                                                  GimpDisplay   *display,
+                                                  gdouble        x,
+                                                  gdouble        y,
+                                                  gdouble        radius);
+
+#endif  /*  __GIMP_MYBRUSH_TOOL_H__  */
diff --git a/app/tools/gimpnpointdeformationoptions.c b/app/tools/gimpnpointdeformationoptions.c
new file mode 100644
index 0000000..9098eb0
--- /dev/null
+++ b/app/tools/gimpnpointdeformationoptions.c
@@ -0,0 +1,264 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationoptions.c
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+
+#include "gimpnpointdeformationoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SQUARE_SIZE,
+  PROP_RIGIDITY,
+  PROP_ASAP_DEFORMATION,
+  PROP_MLS_WEIGHTS,
+  PROP_MLS_WEIGHTS_ALPHA,
+  PROP_MESH_VISIBLE
+};
+
+
+static void   gimp_n_point_deformation_options_set_property (GObject      *object,
+                                                             guint         property_id,
+                                                             const GValue *value,
+                                                             GParamSpec   *pspec);
+static void   gimp_n_point_deformation_options_get_property (GObject      *object,
+                                                             guint         property_id,
+                                                             GValue       *value,
+                                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpNPointDeformationOptions, gimp_n_point_deformation_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_n_point_deformation_options_parent_class
+
+
+static void
+gimp_n_point_deformation_options_class_init (GimpNPointDeformationOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_n_point_deformation_options_set_property;
+  object_class->get_property = gimp_n_point_deformation_options_get_property;
+
+  GIMP_CONFIG_PROP_DOUBLE  (object_class, PROP_SQUARE_SIZE,
+                            "square-size",
+                            _("Density"),
+                            _("Density"),
+                            5.0, 1000.0, 20.0,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE  (object_class, PROP_RIGIDITY,
+                            "rigidity",
+                            _("Rigidity"),
+                            _("Rigidity"),
+                            1.0, 10000.0, 100.0,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ASAP_DEFORMATION,
+                            "asap-deformation",
+                            _("Deformation mode"),
+                            _("Deformation mode"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MLS_WEIGHTS,
+                            "mls-weights",
+                            _("Use weights"),
+                            _("Use weights"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE  (object_class, PROP_MLS_WEIGHTS_ALPHA,
+                            "mls-weights-alpha",
+                            _("Control points influence"),
+                            _("Amount of control points' influence"),
+                            0.1, 2.0, 1.0,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MESH_VISIBLE,
+                            "mesh-visible",
+                            _("Show lattice"),
+                            _("Show lattice"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_n_point_deformation_options_init (GimpNPointDeformationOptions *options)
+{
+}
+
+static void
+gimp_n_point_deformation_options_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec)
+{
+  GimpNPointDeformationOptions *options;
+
+  options = GIMP_N_POINT_DEFORMATION_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SQUARE_SIZE:
+      options->square_size = g_value_get_double (value);
+      break;
+    case PROP_RIGIDITY:
+      options->rigidity = g_value_get_double (value);
+      break;
+    case PROP_ASAP_DEFORMATION:
+      options->asap_deformation = g_value_get_boolean (value);
+      break;
+    case PROP_MLS_WEIGHTS:
+      options->mls_weights = g_value_get_boolean (value);
+      break;
+    case PROP_MLS_WEIGHTS_ALPHA:
+      options->mls_weights_alpha = g_value_get_double (value);
+      break;
+    case PROP_MESH_VISIBLE:
+      options->mesh_visible = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_n_point_deformation_options_get_property (GObject    *object,
+                                               guint       property_id,
+                                               GValue     *value,
+                                               GParamSpec *pspec)
+{
+  GimpNPointDeformationOptions *options;
+
+  options = GIMP_N_POINT_DEFORMATION_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SQUARE_SIZE:
+      g_value_set_double (value, options->square_size);
+      break;
+    case PROP_RIGIDITY:
+      g_value_set_double (value, options->rigidity);
+      break;
+    case PROP_ASAP_DEFORMATION:
+      g_value_set_boolean (value, options->asap_deformation);
+      break;
+    case PROP_MLS_WEIGHTS:
+      g_value_set_boolean (value, options->mls_weights);
+      break;
+    case PROP_MLS_WEIGHTS_ALPHA:
+      g_value_set_double (value, options->mls_weights_alpha);
+      break;
+    case PROP_MESH_VISIBLE:
+      g_value_set_boolean (value, options->mesh_visible);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_n_point_deformation_options_gui (GimpToolOptions *tool_options)
+{
+  GimpNPointDeformationOptions *npd_options;
+  GObject                      *config = G_OBJECT (tool_options);
+  GtkWidget                    *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget                    *widget;
+
+  npd_options = GIMP_N_POINT_DEFORMATION_OPTIONS (tool_options);
+
+  widget = gimp_prop_check_button_new (config, "mesh-visible", NULL);
+  npd_options->check_mesh_visible = widget;
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+  gtk_widget_set_can_focus (widget, FALSE);
+  gtk_widget_show (widget);
+
+  widget = gimp_prop_spin_scale_new (config, "square-size", NULL,
+                                     1.0, 10.0, 0);
+  npd_options->scale_square_size = widget;
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 10.0, 100.0);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+  gtk_widget_set_can_focus (widget, FALSE);
+  gtk_widget_show (widget);
+
+  widget = gimp_prop_spin_scale_new (config, "rigidity", NULL,
+                                     1.0, 10.0, 0);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 1.0, 2000.0);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+  gtk_widget_set_can_focus (widget, FALSE);
+  gtk_widget_show (widget);
+
+  widget = gimp_prop_boolean_radio_frame_new (config, "asap-deformation",
+                                              NULL,
+                                              _("Scale"),
+                                              _("Rigid (Rubber)"));
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+  gtk_widget_set_can_focus (widget, FALSE);
+  gtk_widget_show (widget);
+
+  widget = gimp_prop_check_button_new (config, "mls-weights", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+  gtk_widget_set_can_focus (widget, FALSE);
+  gtk_widget_show (widget);
+
+  widget = gimp_prop_spin_scale_new (config, "mls-weights-alpha", NULL,
+                                     0.1, 0.1, 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 0.1, 2.0);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+  gtk_widget_set_can_focus (widget, FALSE);
+  gtk_widget_show (widget);
+
+  g_object_bind_property (config, "mls-weights",
+                          widget, "sensitive",
+                          G_BINDING_DEFAULT |
+                          G_BINDING_SYNC_CREATE);
+
+  gimp_n_point_deformation_options_set_sensitivity (npd_options, FALSE);
+
+  return vbox;
+}
+
+void
+gimp_n_point_deformation_options_set_sensitivity (GimpNPointDeformationOptions *npd_options,
+                                                  gboolean                      tool_active)
+{
+  gtk_widget_set_sensitive (npd_options->scale_square_size, ! tool_active);
+  gtk_widget_set_sensitive (npd_options->check_mesh_visible, tool_active);
+}
diff --git a/app/tools/gimpnpointdeformationoptions.h b/app/tools/gimpnpointdeformationoptions.h
new file mode 100644
index 0000000..8e559b0
--- /dev/null
+++ b/app/tools/gimpnpointdeformationoptions.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationoptions.h
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_N_POINT_DEFORMATION_OPTIONS_H__
+#define __GIMP_N_POINT_DEFORMATION_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS            (gimp_n_point_deformation_options_get_type ())
+#define GIMP_N_POINT_DEFORMATION_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS, GimpNPointDeformationOptions))
+#define GIMP_N_POINT_DEFORMATION_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS, GimpNPointDeformationOptionsClass))
+#define GIMP_IS_N_POINT_DEFORMATION_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS))
+#define GIMP_IS_N_POINT_DEFORMATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS))
+#define GIMP_N_POINT_DEFORMATION_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS, GimpNPointDeformationOptionsClass))
+
+
+typedef struct _GimpNPointDeformationOptions      GimpNPointDeformationOptions;
+typedef struct _GimpNPointDeformationOptionsClass GimpNPointDeformationOptionsClass;
+
+struct _GimpNPointDeformationOptions
+{
+  GimpToolOptions  parent_instance;
+
+  gdouble          square_size;
+  gdouble          rigidity;
+  gboolean         asap_deformation;
+  gboolean         mls_weights;
+  gdouble          mls_weights_alpha;
+  gboolean         mesh_visible;
+
+  GtkWidget       *scale_square_size;
+  GtkWidget       *check_mesh_visible;
+};
+
+struct _GimpNPointDeformationOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+};
+
+
+GType       gimp_n_point_deformation_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_n_point_deformation_options_gui      (GimpToolOptions *tool_options);
+
+void        gimp_n_point_deformation_options_set_sensitivity (GimpNPointDeformationOptions *npd_options,
+                                                              gboolean                      tool_active);
+
+
+#endif  /*  __GIMP_N_POINT_DEFORMATION_OPTIONS_H__  */
diff --git a/app/tools/gimpnpointdeformationtool.c b/app/tools/gimpnpointdeformationtool.c
new file mode 100644
index 0000000..0b653de
--- /dev/null
+++ b/app/tools/gimpnpointdeformationtool.c
@@ -0,0 +1,1020 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationtool.c
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gegl-plugin.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include <npd/npd_common.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h" /* playground */
+
+#include "gegl/gimp-gegl-utils.h"
+#include "gegl/gimp-gegl-apply-operation.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpcanvasbufferpreview.h"
+
+#include "gimpnpointdeformationtool.h"
+#include "gimpnpointdeformationoptions.h"
+#include "gimptoolcontrol.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+//#define GIMP_NPD_DEBUG
+#define GIMP_NPD_MAXIMUM_DEFORMATION_DELAY 100000 /* 100000 microseconds == 10 FPS */
+#define GIMP_NPD_DRAW_INTERVAL                 50 /*     50 milliseconds == 20 FPS */
+
+
+static void     gimp_n_point_deformation_tool_start                   (GimpNPointDeformationTool *npd_tool,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_halt                    (GimpNPointDeformationTool *npd_tool);
+static void     gimp_n_point_deformation_tool_commit                  (GimpNPointDeformationTool *npd_tool);
+static void     gimp_n_point_deformation_tool_set_options             (GimpNPointDeformationTool *npd_tool,
+                                                                       GimpNPointDeformationOptions *npd_options);
+static void     gimp_n_point_deformation_tool_options_notify          (GimpTool                  *tool,
+                                                                       GimpToolOptions           *options,
+                                                                       const GParamSpec          *pspec);
+static void     gimp_n_point_deformation_tool_button_press            (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       guint32                    time,
+                                                                       GdkModifierType            state,
+                                                                       GimpButtonPressType        press_type,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_button_release          (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       guint32                    time,
+                                                                       GdkModifierType            state,
+                                                                       GimpButtonReleaseType      release_type,
+                                                                       GimpDisplay               *display);
+static gboolean gimp_n_point_deformation_tool_key_press               (GimpTool                  *tool,
+                                                                       GdkEventKey               *kevent,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_modifier_key            (GimpTool                  *tool,
+                                                                       GdkModifierType            key,
+                                                                       gboolean                   press,
+                                                                       GdkModifierType            state,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_cursor_update           (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       GdkModifierType            state,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_draw                    (GimpDrawTool              *draw_tool);
+static void     gimp_n_point_deformation_tool_control                 (GimpTool                  *tool,
+                                                                       GimpToolAction             action,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_oper_update             (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       GdkModifierType            state,
+                                                                       gboolean                   proximity,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_motion                  (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       guint32                    time,
+                                                                       GdkModifierType            state,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_clear_selected_points_list
+                                                                      (GimpNPointDeformationTool *npd_tool);
+static gboolean gimp_n_point_deformation_tool_add_cp_to_selection     (GimpNPointDeformationTool *npd_tool,
+                                                                       NPDControlPoint           *cp);
+static gboolean gimp_n_point_deformation_tool_is_cp_in_area           (NPDControlPoint           *cp,
+                                                                       gfloat                     x0,
+                                                                       gfloat                     y0,
+                                                                       gfloat                     x1,
+                                                                       gfloat                     y1,
+                                                                       gfloat                     offset_x,
+                                                                       gfloat                     offset_y,
+                                                                       gfloat                     cp_radius);
+static void     gimp_n_point_deformation_tool_remove_cp_from_selection
+                                                                      (GimpNPointDeformationTool *npd_tool,
+                                                                       NPDControlPoint           *cp);
+static gpointer gimp_n_point_deformation_tool_deform_thread_func      (gpointer                   data);
+static gboolean gimp_n_point_deformation_tool_canvas_update_timeout   (GimpNPointDeformationTool *npd_tool);
+static void     gimp_n_point_deformation_tool_perform_deformation     (GimpNPointDeformationTool *npd_tool);
+static void     gimp_n_point_deformation_tool_halt_threads            (GimpNPointDeformationTool *npd_tool);
+static void     gimp_n_point_deformation_tool_apply_deformation       (GimpNPointDeformationTool *npd_tool);
+
+#ifdef GIMP_NPD_DEBUG
+#define gimp_npd_debug(x) g_printf x
+#else
+#define gimp_npd_debug(x)
+#endif
+
+G_DEFINE_TYPE (GimpNPointDeformationTool, gimp_n_point_deformation_tool,
+               GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_n_point_deformation_tool_parent_class
+
+
+void
+gimp_n_point_deformation_tool_register (GimpToolRegisterCallback  callback,
+                                        gpointer                  data)
+{
+  /* we should not know that "data" is a Gimp*, but what the heck this
+   * is experimental playground stuff
+   */
+  if (GIMP_GUI_CONFIG (GIMP (data)->config)->playground_npd_tool)
+    (* callback) (GIMP_TYPE_N_POINT_DEFORMATION_TOOL,
+                  GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS,
+                  gimp_n_point_deformation_options_gui,
+                  0,
+                  "gimp-n-point-deformation-tool",
+                  _("N-Point Deformation"),
+                  _("N-Point Deformation Tool: Rubber-like deformation of "
+                    "image using points"),
+                  N_("_N-Point Deformation"), "<shift>N",
+                  NULL, GIMP_HELP_TOOL_N_POINT_DEFORMATION,
+                  GIMP_ICON_TOOL_N_POINT_DEFORMATION,
+                  data);
+}
+
+static void
+gimp_n_point_deformation_tool_class_init (GimpNPointDeformationToolClass *klass)
+{
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  tool_class->options_notify = gimp_n_point_deformation_tool_options_notify;
+  tool_class->button_press   = gimp_n_point_deformation_tool_button_press;
+  tool_class->button_release = gimp_n_point_deformation_tool_button_release;
+  tool_class->key_press      = gimp_n_point_deformation_tool_key_press;
+  tool_class->modifier_key   = gimp_n_point_deformation_tool_modifier_key;
+  tool_class->control        = gimp_n_point_deformation_tool_control;
+  tool_class->motion         = gimp_n_point_deformation_tool_motion;
+  tool_class->oper_update    = gimp_n_point_deformation_tool_oper_update;
+  tool_class->cursor_update  = gimp_n_point_deformation_tool_cursor_update;
+
+  draw_tool_class->draw      = gimp_n_point_deformation_tool_draw;
+}
+
+static void
+gimp_n_point_deformation_tool_init (GimpNPointDeformationTool *npd_tool)
+{
+  GimpTool *tool = GIMP_TOOL (npd_tool);
+
+  gimp_tool_control_set_precision            (tool->control,
+                                              GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_tool_cursor          (tool->control,
+                                              GIMP_TOOL_CURSOR_PERSPECTIVE);
+  gimp_tool_control_set_preserve             (tool->control, FALSE);
+  gimp_tool_control_set_wants_click          (tool->control, TRUE);
+  gimp_tool_control_set_wants_all_key_events (tool->control, TRUE);
+  gimp_tool_control_set_handle_empty_image   (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask           (tool->control,
+                                              GIMP_DIRTY_IMAGE           |
+                                              GIMP_DIRTY_IMAGE_STRUCTURE |
+                                              GIMP_DIRTY_DRAWABLE        |
+                                              GIMP_DIRTY_SELECTION       |
+                                              GIMP_DIRTY_ACTIVE_DRAWABLE);
+}
+
+static void
+gimp_n_point_deformation_tool_control (GimpTool       *tool,
+                                       GimpToolAction  action,
+                                       GimpDisplay    *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_n_point_deformation_tool_halt (npd_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_n_point_deformation_tool_commit (npd_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_n_point_deformation_tool_start (GimpNPointDeformationTool *npd_tool,
+                                     GimpDisplay               *display)
+{
+  GimpTool                     *tool = GIMP_TOOL (npd_tool);
+  GimpNPointDeformationOptions *npd_options;
+  GimpImage                    *image;
+  GeglBuffer                   *source_buffer;
+  GeglBuffer                   *preview_buffer;
+  NPDModel                     *model;
+
+  npd_options = GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS (npd_tool);
+
+  gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+  image = gimp_display_get_image (display);
+
+  tool->display  = display;
+  tool->drawable = gimp_image_get_active_drawable (image);
+
+  npd_tool->active = TRUE;
+
+  /* create GEGL graph */
+  source_buffer  = gimp_drawable_get_buffer (tool->drawable);
+
+  preview_buffer = gegl_buffer_new (gegl_buffer_get_extent (source_buffer),
+                                    babl_format ("cairo-ARGB32"));
+
+  npd_tool->graph    = gegl_node_new ();
+
+  npd_tool->source   = gegl_node_new_child (npd_tool->graph,
+                                            "operation", "gegl:buffer-source",
+                                            "buffer",    source_buffer,
+                                            NULL);
+  npd_tool->npd_node = gegl_node_new_child (npd_tool->graph,
+                                            "operation", "gegl:npd",
+                                            NULL);
+  npd_tool->sink     = gegl_node_new_child (npd_tool->graph,
+                                            "operation", "gegl:write-buffer",
+                                            "buffer",    preview_buffer,
+                                            NULL);
+
+  gegl_node_link_many (npd_tool->source,
+                       npd_tool->npd_node,
+                       npd_tool->sink,
+                       NULL);
+
+  /* initialize some options */
+  g_object_set (G_OBJECT (npd_options), "mesh-visible", TRUE, NULL);
+  gimp_n_point_deformation_options_set_sensitivity (npd_options, TRUE);
+
+  /* compute and get model */
+  gegl_node_process (npd_tool->npd_node);
+  gegl_node_get (npd_tool->npd_node, "model", &model, NULL);
+
+  npd_tool->model          = model;
+  npd_tool->preview_buffer = preview_buffer;
+  npd_tool->selected_cp    = NULL;
+  npd_tool->hovering_cp    = NULL;
+  npd_tool->selected_cps   = NULL;
+  npd_tool->rubber_band    = FALSE;
+  npd_tool->lattice_points = g_new (GimpVector2,
+                                    5 * model->hidden_model->num_of_bones);
+
+  gimp_item_get_offset (GIMP_ITEM (tool->drawable),
+                        &npd_tool->offset_x, &npd_tool->offset_y);
+  gimp_npd_debug (("offset: %f %f\n", npd_tool->offset_x, npd_tool->offset_y));
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (npd_tool), display);
+
+  gimp_n_point_deformation_tool_perform_deformation (npd_tool);
+
+  /* hide original image */
+  gimp_item_set_visible (GIMP_ITEM (tool->drawable), FALSE, FALSE);
+  gimp_image_flush (image);
+
+  /* create and start a deformation thread */
+  npd_tool->deform_thread =
+    g_thread_new ("deform thread",
+                  (GThreadFunc) gimp_n_point_deformation_tool_deform_thread_func,
+                  npd_tool);
+
+  /* create and start canvas update timeout */
+  npd_tool->draw_timeout_id =
+    gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+                                  GIMP_NPD_DRAW_INTERVAL,
+                                  (GSourceFunc) gimp_n_point_deformation_tool_canvas_update_timeout,
+                                  npd_tool,
+                                  NULL);
+}
+
+static void
+gimp_n_point_deformation_tool_commit (GimpNPointDeformationTool *npd_tool)
+{
+  GimpTool *tool = GIMP_TOOL (npd_tool);
+
+  if (npd_tool->active)
+    {
+      gimp_n_point_deformation_tool_halt_threads (npd_tool);
+
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+      gimp_n_point_deformation_tool_apply_deformation (npd_tool);
+      gimp_tool_control_pop_preserve (tool->control);
+
+      /* show original/deformed image */
+      gimp_item_set_visible (GIMP_ITEM (tool->drawable), TRUE, FALSE);
+      gimp_image_flush (gimp_display_get_image (tool->display));
+
+      npd_tool->active = FALSE;
+    }
+}
+
+static void
+gimp_n_point_deformation_tool_halt (GimpNPointDeformationTool *npd_tool)
+{
+  GimpTool                     *tool      = GIMP_TOOL (npd_tool);
+  GimpDrawTool                 *draw_tool = GIMP_DRAW_TOOL (npd_tool);
+  GimpNPointDeformationOptions *npd_options;
+
+  npd_options = GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS (npd_tool);
+
+  if (npd_tool->active)
+    {
+      gimp_n_point_deformation_tool_halt_threads (npd_tool);
+
+      /* show original/deformed image */
+      gimp_item_set_visible (GIMP_ITEM (tool->drawable), TRUE, FALSE);
+      gimp_image_flush (gimp_display_get_image (tool->display));
+
+      /* disable some options */
+      gimp_n_point_deformation_options_set_sensitivity (npd_options, FALSE);
+
+      npd_tool->active = FALSE;
+    }
+
+  if (gimp_draw_tool_is_active (draw_tool))
+    gimp_draw_tool_stop (draw_tool);
+
+  gimp_n_point_deformation_tool_clear_selected_points_list (npd_tool);
+
+  g_clear_object (&npd_tool->graph);
+  npd_tool->source   = NULL;
+  npd_tool->npd_node = NULL;
+  npd_tool->sink     = NULL;
+
+  g_clear_object (&npd_tool->preview_buffer);
+  g_clear_pointer (&npd_tool->lattice_points, g_free);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+}
+
+static void
+gimp_n_point_deformation_tool_set_options (GimpNPointDeformationTool    *npd_tool,
+                                           GimpNPointDeformationOptions *npd_options)
+{
+  gegl_node_set (npd_tool->npd_node,
+                 "square-size",       (gint) npd_options->square_size,
+                 "rigidity",          (gint) npd_options->rigidity,
+                 "asap-deformation",  npd_options->asap_deformation,
+                 "mls-weights",       npd_options->mls_weights,
+                 "mls-weights-alpha", npd_options->mls_weights_alpha,
+                 NULL);
+}
+
+static void
+gimp_n_point_deformation_tool_options_notify (GimpTool         *tool,
+                                              GimpToolOptions  *options,
+                                              const GParamSpec *pspec)
+{
+  GimpNPointDeformationTool    *npd_tool    = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+  GimpNPointDeformationOptions *npd_options = GIMP_N_POINT_DEFORMATION_OPTIONS (options);
+  GimpDrawTool                 *draw_tool   = GIMP_DRAW_TOOL (tool);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! npd_tool->active)
+    return;
+
+  gimp_draw_tool_pause (draw_tool);
+
+  gimp_npd_debug (("npd options notify\n"));
+  gimp_n_point_deformation_tool_set_options (npd_tool, npd_options);
+
+  gimp_draw_tool_resume (draw_tool);
+}
+
+static gboolean
+gimp_n_point_deformation_tool_key_press (GimpTool    *tool,
+                                         GdkEventKey *kevent,
+                                         GimpDisplay *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_BackSpace:
+      /* if there is at least one control point, remove last added
+       *  control point
+       */
+      if (npd_tool->model                 &&
+          npd_tool->model->control_points &&
+          npd_tool->model->control_points->len > 0)
+        {
+          GArray          *cps = npd_tool->model->control_points;
+          NPDControlPoint *cp  = &g_array_index (cps, NPDControlPoint,
+                                                 cps->len - 1);
+
+          gimp_npd_debug (("removing last cp %p\n", cp));
+          gimp_n_point_deformation_tool_remove_cp_from_selection (npd_tool, cp);
+          npd_remove_control_point (npd_tool->model, cp);
+        }
+      break;
+
+    case GDK_KEY_Delete:
+      if (npd_tool->model &&
+          npd_tool->selected_cps)
+        {
+          /* if there is at least one selected control point, remove it */
+          npd_remove_control_points (npd_tool->model, npd_tool->selected_cps);
+          gimp_n_point_deformation_tool_clear_selected_points_list (npd_tool);
+        }
+      break;
+
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+      break;
+
+    case GDK_KEY_Escape:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      break;
+
+    default:
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+gimp_n_point_deformation_tool_modifier_key (GimpTool        *tool,
+                                            GdkModifierType  key,
+                                            gboolean         press,
+                                            GdkModifierType  state,
+                                            GimpDisplay     *display)
+{
+}
+
+static void
+gimp_n_point_deformation_tool_cursor_update (GimpTool         *tool,
+                                             const GimpCoords *coords,
+                                             GdkModifierType   state,
+                                             GimpDisplay      *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+  GimpCursorModifier         modifier = GIMP_CURSOR_MODIFIER_PLUS;
+
+  if (! npd_tool->active)
+    {
+      modifier = GIMP_CURSOR_MODIFIER_NONE;
+    }
+  else if (npd_tool->hovering_cp)
+    {
+      modifier = GIMP_CURSOR_MODIFIER_MOVE;
+    }
+
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_n_point_deformation_tool_clear_selected_points_list (GimpNPointDeformationTool *npd_tool)
+{
+  if (npd_tool->selected_cps)
+    {
+      g_list_free (npd_tool->selected_cps);
+      npd_tool->selected_cps = NULL;
+    }
+}
+
+static gboolean
+gimp_n_point_deformation_tool_add_cp_to_selection (GimpNPointDeformationTool *npd_tool,
+                                                   NPDControlPoint           *cp)
+{
+  if (! g_list_find (npd_tool->selected_cps, cp))
+    {
+      npd_tool->selected_cps = g_list_append (npd_tool->selected_cps, cp);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_n_point_deformation_tool_remove_cp_from_selection (GimpNPointDeformationTool *npd_tool,
+                                                        NPDControlPoint           *cp)
+{
+  npd_tool->selected_cps = g_list_remove (npd_tool->selected_cps, cp);
+}
+
+static void
+gimp_n_point_deformation_tool_button_press (GimpTool            *tool,
+                                            const GimpCoords    *coords,
+                                            guint32              time,
+                                            GdkModifierType      state,
+                                            GimpButtonPressType  press_type,
+                                            GimpDisplay         *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+
+  if (display != tool->display)
+    {
+      /* this is the first click on the drawable - just start the tool */
+      gimp_n_point_deformation_tool_start (npd_tool, display);
+    }
+
+  npd_tool->selected_cp = NULL;
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    {
+      NPDControlPoint *cp = npd_tool->hovering_cp;
+
+      if (cp)
+        {
+          /* there is a control point at cursor's position */
+          npd_tool->selected_cp = cp;
+
+          if (! g_list_find (npd_tool->selected_cps, cp))
+            {
+              /* control point isn't selected, so we can add it to the
+               * list of selected control points
+               */
+
+              if (! (state & gimp_get_extend_selection_mask ()))
+                {
+                  /* <SHIFT> isn't pressed, so this isn't a
+                   * multiselection - clear the list of selected
+                   * control points
+                   */
+                  gimp_n_point_deformation_tool_clear_selected_points_list (npd_tool);
+                }
+
+              gimp_n_point_deformation_tool_add_cp_to_selection (npd_tool, cp);
+            }
+          else if (state & gimp_get_extend_selection_mask ())
+            {
+              /* control point is selected and <SHIFT> is pressed -
+               * remove control point from selected points
+               */
+              gimp_n_point_deformation_tool_remove_cp_from_selection (npd_tool,
+                                                                      cp);
+            }
+        }
+
+      npd_tool->start_x = coords->x;
+      npd_tool->start_y = coords->y;
+
+      npd_tool->last_x = coords->x;
+      npd_tool->last_y = coords->y;
+    }
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static gboolean
+gimp_n_point_deformation_tool_is_cp_in_area (NPDControlPoint *cp,
+                                             gfloat           x0,
+                                             gfloat           y0,
+                                             gfloat           x1,
+                                             gfloat           y1,
+                                             gfloat           offset_x,
+                                             gfloat           offset_y,
+                                             gfloat           cp_radius)
+{
+  NPDPoint p = cp->point;
+
+  p.x += offset_x;
+  p.y += offset_y;
+
+  return p.x >= x0 - cp_radius && p.x <= x1 + cp_radius &&
+         p.y >= y0 - cp_radius && p.y <= y1 + cp_radius;
+}
+
+static void
+gimp_n_point_deformation_tool_button_release (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonReleaseType  release_type,
+                                              GimpDisplay           *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (npd_tool));
+
+  if (release_type == GIMP_BUTTON_RELEASE_CLICK)
+    {
+      if (! npd_tool->hovering_cp)
+        {
+          NPDPoint p;
+
+          gimp_npd_debug (("cp doesn't exist, adding\n"));
+          p.x = coords->x - npd_tool->offset_x;
+          p.y = coords->y - npd_tool->offset_y;
+
+          npd_add_control_point (npd_tool->model, &p);
+        }
+    }
+  else if (release_type == GIMP_BUTTON_RELEASE_NORMAL)
+    {
+      if (npd_tool->rubber_band)
+        {
+          GArray *cps = npd_tool->model->control_points;
+          gint    x0  = MIN (npd_tool->start_x, npd_tool->cursor_x);
+          gint    y0  = MIN (npd_tool->start_y, npd_tool->cursor_y);
+          gint    x1  = MAX (npd_tool->start_x, npd_tool->cursor_x);
+          gint    y1  = MAX (npd_tool->start_y, npd_tool->cursor_y);
+          gint    i;
+
+          if (! (state & gimp_get_extend_selection_mask ()))
+            {
+              /* <SHIFT> isn't pressed, so we want a clear selection */
+              gimp_n_point_deformation_tool_clear_selected_points_list (npd_tool);
+            }
+
+          for (i = 0; i < cps->len; i++)
+            {
+              NPDControlPoint *cp = &g_array_index (cps, NPDControlPoint, i);
+
+              if (gimp_n_point_deformation_tool_is_cp_in_area (cp,
+                                                               x0, y0,
+                                                               x1, y1,
+                                                               npd_tool->offset_x,
+                                                               npd_tool->offset_y,
+                                                               npd_tool->cp_scaled_radius))
+                {
+                  /* control point is situated in an area defined by
+                   * rubber band
+                  */
+                  gimp_n_point_deformation_tool_add_cp_to_selection (npd_tool,
+                                                                     cp);
+                  gimp_npd_debug (("%p selected\n", cp));
+                }
+            }
+        }
+    }
+  else if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      gimp_npd_debug (("gimp_button_release_cancel\n"));
+    }
+
+  npd_tool->rubber_band = FALSE;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (npd_tool));
+}
+
+static void
+gimp_n_point_deformation_tool_oper_update (GimpTool         *tool,
+                                           const GimpCoords *coords,
+                                           GdkModifierType   state,
+                                           gboolean          proximity,
+                                           GimpDisplay      *display)
+{
+  GimpNPointDeformationTool *npd_tool  = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+  GimpDrawTool              *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  gimp_draw_tool_pause (draw_tool);
+
+  if (npd_tool->active)
+    {
+      NPDModel         *model = npd_tool->model;
+      GimpDisplayShell *shell = gimp_display_get_shell (display);
+      NPDPoint          p;
+
+      npd_tool->cp_scaled_radius = model->control_point_radius / shell->scale_x;
+
+      p.x = coords->x - npd_tool->offset_x;
+      p.y = coords->y - npd_tool->offset_y;
+
+      npd_tool->hovering_cp =
+        npd_get_control_point_with_radius_at (model,
+                                              &p,
+                                              npd_tool->cp_scaled_radius);
+    }
+
+  npd_tool->cursor_x = coords->x;
+  npd_tool->cursor_y = coords->y;
+
+  gimp_draw_tool_resume (draw_tool);
+}
+
+static void
+gimp_n_point_deformation_tool_prepare_lattice (GimpNPointDeformationTool *npd_tool)
+{
+  NPDHiddenModel *hm     = npd_tool->model->hidden_model;
+  GimpVector2    *points = npd_tool->lattice_points;
+  gint            i, j;
+
+  for (i = 0; i < hm->num_of_bones; i++)
+    {
+      NPDBone *bone = &hm->current_bones[i];
+
+      for (j = 0; j < 4; j++)
+        gimp_vector2_set (&points[5 * i + j], bone->points[j].x, bone->points[j].y);
+      gimp_vector2_set (&points[5 * i + j], bone->points[0].x, bone->points[0].y);
+    }
+}
+
+static void
+gimp_n_point_deformation_tool_draw_lattice (GimpNPointDeformationTool *npd_tool)
+{
+  GimpVector2 *points    = npd_tool->lattice_points;
+  gint         n_squares = npd_tool->model->hidden_model->num_of_bones;
+  gint         i;
+
+  for (i = 0; i < n_squares; i++)
+    gimp_draw_tool_add_lines (GIMP_DRAW_TOOL (npd_tool),
+                              &points[5 * i], 5, NULL, FALSE);
+}
+
+static void
+gimp_n_point_deformation_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpNPointDeformationTool    *npd_tool;
+  GimpNPointDeformationOptions *npd_options;
+  NPDModel                     *model;
+  gint                          x0, y0, x1, y1;
+  gint                          i;
+
+  npd_tool    = GIMP_N_POINT_DEFORMATION_TOOL (draw_tool);
+  npd_options = GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS (npd_tool);
+
+  model = npd_tool->model;
+
+  g_return_if_fail (model != NULL);
+
+  /* draw lattice */
+  if (npd_options->mesh_visible)
+    gimp_n_point_deformation_tool_draw_lattice (npd_tool);
+
+  x0 = MIN (npd_tool->start_x, npd_tool->cursor_x);
+  y0 = MIN (npd_tool->start_y, npd_tool->cursor_y);
+  x1 = MAX (npd_tool->start_x, npd_tool->cursor_x);
+  y1 = MAX (npd_tool->start_y, npd_tool->cursor_y);
+
+  for (i = 0; i < model->control_points->len; i++)
+    {
+      NPDControlPoint *cp = &g_array_index (model->control_points,
+                                            NPDControlPoint, i);
+      NPDPoint         p  = cp->point;
+      GimpHandleType   handle_type;
+
+      p.x += npd_tool->offset_x;
+      p.y += npd_tool->offset_y;
+
+      handle_type = GIMP_HANDLE_CIRCLE;
+
+      /* check if cursor is hovering over a control point or if a
+       * control point is situated in an area defined by rubber band
+       */
+      if (cp == npd_tool->hovering_cp ||
+          (npd_tool->rubber_band &&
+           gimp_n_point_deformation_tool_is_cp_in_area (cp,
+                                                        x0, y0,
+                                                        x1, y1,
+                                                        npd_tool->offset_x,
+                                                        npd_tool->offset_y,
+                                                        npd_tool->cp_scaled_radius)))
+        {
+          handle_type = GIMP_HANDLE_FILLED_CIRCLE;
+        }
+
+      gimp_draw_tool_add_handle (draw_tool,
+                                 handle_type,
+                                 p.x, p.y,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+      if (g_list_find (npd_tool->selected_cps, cp))
+        {
+          gimp_draw_tool_add_handle (draw_tool,
+                                     GIMP_HANDLE_SQUARE,
+                                     p.x, p.y,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+        }
+    }
+
+  if (npd_tool->rubber_band)
+    {
+      /* draw a rubber band */
+      gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                    x0, y0, x1 - x0, y1 - y0);
+    }
+
+  if (npd_tool->preview_buffer)
+    {
+      GimpCanvasItem *item;
+
+      item = gimp_canvas_buffer_preview_new (gimp_display_get_shell (draw_tool->display),
+                                             npd_tool->preview_buffer);
+
+      gimp_draw_tool_add_preview (draw_tool, item);
+      g_object_unref (item);
+    }
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+}
+
+static void
+gimp_n_point_deformation_tool_motion (GimpTool         *tool,
+                                      const GimpCoords *coords,
+                                      guint32           time,
+                                      GdkModifierType   state,
+                                      GimpDisplay      *display)
+{
+  GimpNPointDeformationTool *npd_tool  = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+  GimpDrawTool              *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  gimp_draw_tool_pause (draw_tool);
+
+  if (npd_tool->selected_cp)
+    {
+      GList   *list;
+      gdouble  shift_x = coords->x - npd_tool->last_x;
+      gdouble  shift_y = coords->y - npd_tool->last_y;
+
+      for (list = npd_tool->selected_cps; list; list = g_list_next (list))
+        {
+          NPDControlPoint *cp = list->data;
+
+          cp->point.x += shift_x;
+          cp->point.y += shift_y;
+        }
+    }
+  else
+    {
+      /* activate a rubber band selection */
+      npd_tool->rubber_band = TRUE;
+    }
+
+  npd_tool->cursor_x = coords->x;
+  npd_tool->cursor_y = coords->y;
+
+  npd_tool->last_x = coords->x;
+  npd_tool->last_y = coords->y;
+
+  gimp_draw_tool_resume (draw_tool);
+}
+
+static gboolean
+gimp_n_point_deformation_tool_canvas_update_timeout (GimpNPointDeformationTool *npd_tool)
+{
+  if (! GIMP_TOOL (npd_tool)->drawable)
+    return FALSE;
+
+  gimp_npd_debug (("canvas update thread\n"));
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL(npd_tool));
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL(npd_tool));
+
+  gimp_npd_debug (("canvas update thread stop\n"));
+
+  return TRUE;
+}
+
+static gpointer
+gimp_n_point_deformation_tool_deform_thread_func (gpointer data)
+{
+  GimpNPointDeformationTool    *npd_tool = data;
+  GimpNPointDeformationOptions *npd_options;
+  guint64                       start, duration;
+
+  npd_options = GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS (npd_tool);
+
+  npd_tool->deformation_active = TRUE;
+
+  while (npd_tool->deformation_active)
+    {
+      start = g_get_monotonic_time ();
+
+      gimp_n_point_deformation_tool_perform_deformation (npd_tool);
+
+      if (npd_options->mesh_visible)
+        gimp_n_point_deformation_tool_prepare_lattice (npd_tool);
+
+      duration = g_get_monotonic_time () - start;
+      if (duration < GIMP_NPD_MAXIMUM_DEFORMATION_DELAY)
+        {
+          g_usleep (GIMP_NPD_MAXIMUM_DEFORMATION_DELAY - duration);
+        }
+    }
+
+  gimp_npd_debug (("deform thread exit\n"));
+
+  return NULL;
+}
+
+static void
+gimp_n_point_deformation_tool_perform_deformation (GimpNPointDeformationTool *npd_tool)
+{
+  GObject *operation;
+
+  g_object_get (npd_tool->npd_node,
+                "gegl-operation", &operation,
+                NULL);
+  gimp_npd_debug (("gegl_operation_invalidate\n"));
+  gegl_operation_invalidate (GEGL_OPERATION (operation), NULL, FALSE);
+  g_object_unref (operation);
+
+  gimp_npd_debug (("gegl_node_process\n"));
+  gegl_node_process (npd_tool->sink);
+}
+
+static void
+gimp_n_point_deformation_tool_halt_threads (GimpNPointDeformationTool *npd_tool)
+{
+  if (! npd_tool->deformation_active)
+    return;
+
+  gimp_npd_debug (("waiting for deform thread to finish\n"));
+  npd_tool->deformation_active = FALSE;
+
+  /* wait for deformation thread to finish its work */
+  if (npd_tool->deform_thread)
+    {
+      g_thread_join (npd_tool->deform_thread);
+      npd_tool->deform_thread = NULL;
+    }
+
+  /* remove canvas update timeout */
+  if (npd_tool->draw_timeout_id)
+    {
+      g_source_remove (npd_tool->draw_timeout_id);
+      npd_tool->draw_timeout_id = 0;
+    }
+
+  gimp_npd_debug (("finished\n"));
+}
+
+static void
+gimp_n_point_deformation_tool_apply_deformation (GimpNPointDeformationTool *npd_tool)
+{
+  GimpTool                     *tool = GIMP_TOOL (npd_tool);
+  GimpNPointDeformationOptions *npd_options;
+  GeglBuffer                   *buffer;
+  GimpImage                    *image;
+  gint                          width, height, prev;
+
+  npd_options = GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS (npd_tool);
+
+  image  = gimp_display_get_image (tool->display);
+  buffer = gimp_drawable_get_buffer (tool->drawable);
+
+  width  = gegl_buffer_get_width  (buffer);
+  height = gegl_buffer_get_height (buffer);
+
+  prev = npd_options->rigidity;
+  npd_options->rigidity = 0;
+  gimp_n_point_deformation_tool_set_options (npd_tool, npd_options);
+  npd_options->rigidity = prev;
+
+  gimp_drawable_push_undo (tool->drawable, _("N-Point Deformation"), NULL,
+                           0, 0, width, height);
+
+
+  gimp_gegl_apply_operation (NULL, NULL, _("N-Point Deformation"),
+                             npd_tool->npd_node,
+                             gimp_drawable_get_buffer (tool->drawable),
+                             NULL, FALSE);
+
+  gimp_drawable_update (tool->drawable,
+                        0, 0, width, height);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+#undef gimp_npd_debug
+#ifdef GIMP_NPD_DEBUG
+#undef GIMP_NPD_DEBUG
+#endif
diff --git a/app/tools/gimpnpointdeformationtool.h b/app/tools/gimpnpointdeformationtool.h
new file mode 100644
index 0000000..5f208ba
--- /dev/null
+++ b/app/tools/gimpnpointdeformationtool.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationtool.h
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_N_POINT_DEFORMATION_TOOL_H__
+#define __GIMP_N_POINT_DEFORMATION_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+#include "libgimpmath/gimpmath.h"
+#include <npd/npd_common.h>
+
+
+#define GIMP_TYPE_N_POINT_DEFORMATION_TOOL            (gimp_n_point_deformation_tool_get_type ())
+#define GIMP_N_POINT_DEFORMATION_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_N_POINT_DEFORMATION_TOOL, GimpNPointDeformationTool))
+#define GIMP_N_POINT_DEFORMATION_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_N_POINT_DEFORMATION_TOOL, GimpNPointDeformationToolClass))
+#define GIMP_IS_N_POINT_DEFORMATION_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_N_POINT_DEFORMATION_TOOL))
+#define GIMP_IS_N_POINT_DEFORMATION_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_N_POINT_DEFORMATION_TOOL))
+#define GIMP_N_POINT_DEFORMATION_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_N_POINT_DEFORMATION_TOOL, GimpNPointDeformationToolClass))
+
+#define GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS(t)  (GIMP_N_POINT_DEFORMATION_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpNPointDeformationTool      GimpNPointDeformationTool;
+typedef struct _GimpNPointDeformationToolClass GimpNPointDeformationToolClass;
+
+struct _GimpNPointDeformationTool
+{
+  GimpDrawTool      parent_instance;
+
+  guint             draw_timeout_id;
+  GThread          *deform_thread;
+
+  GeglNode         *graph;
+  GeglNode         *source;
+  GeglNode         *npd_node;
+  GeglNode         *sink;
+
+  GeglBuffer       *preview_buffer;
+
+  NPDModel         *model;
+  NPDControlPoint  *selected_cp;    /* last selected control point     */
+  GList            *selected_cps;   /* list of selected control points */
+  NPDControlPoint  *hovering_cp;
+
+  GimpVector2      *lattice_points;
+
+  gdouble           start_x;
+  gdouble           start_y;
+
+  gdouble           last_x;
+  gdouble           last_y;
+
+  gdouble           cursor_x;
+  gdouble           cursor_y;
+
+  gint              offset_x;
+  gint              offset_y;
+
+  gfloat            cp_scaled_radius;  /* radius of a control point scaled
+                                        * according to display shell's scale
+                                        */
+
+  gboolean          active;
+  volatile gboolean deformation_active;
+  gboolean          rubber_band;
+};
+
+struct _GimpNPointDeformationToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+void    gimp_n_point_deformation_tool_register (GimpToolRegisterCallback  callback,
+                                                gpointer                  data);
+
+GType   gimp_n_point_deformation_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_N_POINT_DEFORMATION_TOOL_H__  */
diff --git a/app/tools/gimpoffsettool.c b/app/tools/gimpoffsettool.c
new file mode 100644
index 0000000..8a17fd3
--- /dev/null
+++ b/app/tools/gimpoffsettool.c
@@ -0,0 +1,787 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolgui.h"
+
+#include "gimpoffsettool.h"
+#include "gimpfilteroptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean   gimp_offset_tool_initialize            (GimpTool              *tool,
+                                                          GimpDisplay           *display,
+                                                          GError               **error);
+static void       gimp_offset_tool_control               (GimpTool              *tool,
+                                                          GimpToolAction         action,
+                                                          GimpDisplay           *display);
+static void       gimp_offset_tool_button_press          (GimpTool              *tool,
+                                                          const GimpCoords      *coords,
+                                                          guint32                time,
+                                                          GdkModifierType        state,
+                                                          GimpButtonPressType    press_type,
+                                                          GimpDisplay           *display);
+static void       gimp_offset_tool_button_release        (GimpTool              *tool,
+                                                          const GimpCoords      *coords,
+                                                          guint32                time,
+                                                          GdkModifierType        state,
+                                                          GimpButtonReleaseType  release_type,
+                                                          GimpDisplay           *display);
+static void       gimp_offset_tool_motion                (GimpTool              *tool,
+                                                          const GimpCoords      *coords,
+                                                          guint32                time,
+                                                          GdkModifierType        state,
+                                                          GimpDisplay           *display);
+static void       gimp_offset_tool_oper_update           (GimpTool              *tool,
+                                                          const GimpCoords      *coords,
+                                                          GdkModifierType        state,
+                                                          gboolean               proximity,
+                                                          GimpDisplay           *display);
+static void       gimp_offset_tool_cursor_update         (GimpTool              *tool,
+                                                          const GimpCoords      *coords,
+                                                          GdkModifierType        state,
+                                                          GimpDisplay           *display);
+
+static gchar    * gimp_offset_tool_get_operation         (GimpFilterTool        *filter_tool,
+                                                          gchar                **description);
+static void       gimp_offset_tool_dialog                (GimpFilterTool        *filter_tool);
+static void       gimp_offset_tool_config_notify         (GimpFilterTool        *filter_tool,
+                                                          GimpConfig            *config,
+                                                          const GParamSpec      *pspec);
+static void       gimp_offset_tool_region_changed        (GimpFilterTool        *filter_tool);
+
+static void       gimp_offset_tool_offset_changed        (GimpSizeEntry         *se,
+                                                          GimpOffsetTool        *offset_tool);
+
+static void       gimp_offset_tool_half_xy_clicked       (GtkButton             *button,
+                                                          GimpOffsetTool        *offset_tool);
+static void       gimp_offset_tool_half_x_clicked        (GtkButton             *button,
+                                                          GimpOffsetTool        *offset_tool);
+static void       gimp_offset_tool_half_y_clicked        (GtkButton             *button,
+                                                          GimpOffsetTool        *offset_tool);
+
+static void       gimp_offset_tool_edge_behavior_toggled (GtkToggleButton       *toggle,
+                                                          GimpOffsetTool        *offset_tool);
+
+static void       gimp_offset_tool_background_changed    (GimpContext           *context,
+                                                          const GimpRGB         *color,
+                                                          GimpOffsetTool        *offset_tool);
+
+static gint       gimp_offset_tool_get_width             (GimpOffsetTool        *offset_tool);
+static gint       gimp_offset_tool_get_height            (GimpOffsetTool        *offset_tool);
+
+static void       gimp_offset_tool_update                (GimpOffsetTool        *offset_tool);
+
+static void       gimp_offset_tool_halt                  (GimpOffsetTool        *offset_tool);
+
+
+G_DEFINE_TYPE (GimpOffsetTool, gimp_offset_tool,
+               GIMP_TYPE_FILTER_TOOL)
+
+#define parent_class gimp_offset_tool_parent_class
+
+
+void
+gimp_offset_tool_register (GimpToolRegisterCallback callback,
+                           gpointer                 data)
+{
+  (* callback) (GIMP_TYPE_OFFSET_TOOL,
+                GIMP_TYPE_FILTER_OPTIONS, NULL,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-offset-tool",
+                _("Offset"),
+                _("Shift the pixels, optionally wrapping them at the borders"),
+                N_("_Offset..."), NULL,
+                NULL, GIMP_HELP_TOOL_OFFSET,
+                GIMP_ICON_TOOL_OFFSET,
+                data);
+}
+
+static void
+gimp_offset_tool_class_init (GimpOffsetToolClass *klass)
+{
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  tool_class->initialize            = gimp_offset_tool_initialize;
+  tool_class->control               = gimp_offset_tool_control;
+  tool_class->button_press          = gimp_offset_tool_button_press;
+  tool_class->button_release        = gimp_offset_tool_button_release;
+  tool_class->motion                = gimp_offset_tool_motion;
+  tool_class->oper_update           = gimp_offset_tool_oper_update;
+  tool_class->cursor_update         = gimp_offset_tool_cursor_update;
+
+  filter_tool_class->get_operation  = gimp_offset_tool_get_operation;
+  filter_tool_class->dialog         = gimp_offset_tool_dialog;
+  filter_tool_class->config_notify  = gimp_offset_tool_config_notify;
+  filter_tool_class->region_changed = gimp_offset_tool_region_changed;
+}
+
+static void
+gimp_offset_tool_init (GimpOffsetTool *offset_tool)
+{
+  GimpTool *tool = GIMP_TOOL (offset_tool);
+
+  gimp_tool_control_set_scroll_lock (tool->control, TRUE);
+  gimp_tool_control_set_precision   (tool->control,
+                                     GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+}
+
+static gboolean
+gimp_offset_tool_initialize (GimpTool     *tool,
+                             GimpDisplay  *display,
+                             GError      **error)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpOffsetTool *offset_tool = GIMP_OFFSET_TOOL (tool);
+  GimpContext    *context     = GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (tool));
+  GimpImage      *image;
+  gdouble         xres;
+  gdouble         yres;
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    return FALSE;
+
+  image = gimp_item_get_image (GIMP_ITEM (tool->drawable));
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  g_signal_handlers_block_by_func (offset_tool->offset_se,
+                                   gimp_offset_tool_offset_changed,
+                                   offset_tool);
+
+  gimp_size_entry_set_resolution (
+    GIMP_SIZE_ENTRY (offset_tool->offset_se), 0,
+    xres, FALSE);
+  gimp_size_entry_set_resolution (
+    GIMP_SIZE_ENTRY (offset_tool->offset_se), 1,
+    yres, FALSE);
+
+  if (GIMP_IS_LAYER (tool->drawable))
+    gimp_tool_gui_set_description (filter_tool->gui, _("Offset Layer"));
+  else if (GIMP_IS_LAYER_MASK (tool->drawable))
+    gimp_tool_gui_set_description (filter_tool->gui, _("Offset Layer Mask"));
+  else if (GIMP_IS_CHANNEL (tool->drawable))
+    gimp_tool_gui_set_description (filter_tool->gui, _("Offset Channel"));
+  else
+    g_warning ("%s: unexpected drawable type", G_STRFUNC);
+
+  gtk_widget_set_sensitive (offset_tool->transparent_radio,
+                            gimp_drawable_has_alpha (tool->drawable));
+
+  g_signal_handlers_unblock_by_func (offset_tool->offset_se,
+                                     gimp_offset_tool_offset_changed,
+                                     offset_tool);
+
+  gegl_node_set (
+    filter_tool->operation,
+    "context", context,
+    NULL);
+
+  g_signal_connect (context, "background-changed",
+                    G_CALLBACK (gimp_offset_tool_background_changed),
+                    offset_tool);
+
+  gimp_offset_tool_update (offset_tool);
+
+  return TRUE;
+}
+
+static void
+gimp_offset_tool_control (GimpTool       *tool,
+                          GimpToolAction  action,
+                          GimpDisplay    *display)
+{
+  GimpOffsetTool *offset_tool = GIMP_OFFSET_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_offset_tool_halt (offset_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static gchar *
+gimp_offset_tool_get_operation (GimpFilterTool  *filter_tool,
+                                gchar          **description)
+{
+  return g_strdup ("gimp:offset");
+}
+
+static void
+gimp_offset_tool_button_press (GimpTool            *tool,
+                               const GimpCoords    *coords,
+                               guint32              time,
+                               GdkModifierType      state,
+                               GimpButtonPressType  press_type,
+                               GimpDisplay         *display)
+{
+  GimpOffsetTool *offset_tool = GIMP_OFFSET_TOOL (tool);
+
+  offset_tool->dragging = ! gimp_filter_tool_on_guide (GIMP_FILTER_TOOL (tool),
+                                                       coords, display);
+
+  if (! offset_tool->dragging)
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+    }
+  else
+    {
+      offset_tool->x = coords->x;
+      offset_tool->y = coords->y;
+
+      g_object_get (GIMP_FILTER_TOOL (tool)->config,
+                    "x", &offset_tool->offset_x,
+                    "y", &offset_tool->offset_y,
+                    NULL);
+
+      tool->display = display;
+
+      gimp_tool_control_activate (tool->control);
+
+      gimp_tool_pop_status (tool, display);
+
+      gimp_tool_push_status_coords (tool, display,
+                                    GIMP_CURSOR_PRECISION_PIXEL_CENTER,
+                                    _("Offset: "),
+                                    0,
+                                    ", ",
+                                    0,
+                                    NULL);
+    }
+}
+
+static void
+gimp_offset_tool_button_release (GimpTool              *tool,
+                                 const GimpCoords      *coords,
+                                 guint32                time,
+                                 GdkModifierType        state,
+                                 GimpButtonReleaseType  release_type,
+                                 GimpDisplay           *display)
+{
+  GimpOffsetTool *offset_tool = GIMP_OFFSET_TOOL (tool);
+
+  if (! offset_tool->dragging)
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                      release_type, display);
+    }
+  else
+    {
+      gimp_tool_control_halt (tool->control);
+
+      offset_tool->dragging = FALSE;
+
+      if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+        {
+          g_object_set (GIMP_FILTER_TOOL (tool)->config,
+                        "x", offset_tool->offset_x,
+                        "y", offset_tool->offset_y,
+                        NULL);
+        }
+    }
+}
+
+static void
+gimp_offset_tool_motion (GimpTool         *tool,
+                         const GimpCoords *coords,
+                         guint32           time,
+                         GdkModifierType   state,
+                         GimpDisplay      *display)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpOffsetTool *offset_tool = GIMP_OFFSET_TOOL (tool);
+
+  if (! offset_tool->dragging)
+    {
+      GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
+                                              display);
+    }
+  else
+    {
+      GimpOffsetType type;
+      gint           offset_x;
+      gint           offset_y;
+      gint           x;
+      gint           y;
+      gint           width;
+      gint           height;
+
+      g_object_get (filter_tool->config,
+                    "type", &type,
+                    NULL);
+
+      offset_x = RINT (coords->x - offset_tool->x);
+      offset_y = RINT (coords->y - offset_tool->y);
+
+      x = offset_tool->offset_x + offset_x;
+      y = offset_tool->offset_y + offset_y;
+
+      width  = gimp_offset_tool_get_width  (offset_tool);
+      height = gimp_offset_tool_get_height (offset_tool);
+
+      if (type == GIMP_OFFSET_WRAP_AROUND)
+        {
+          x %= MAX (width,  1);
+          y %= MAX (height, 1);
+        }
+      else
+        {
+          x = CLAMP (x, -width,  +width);
+          y = CLAMP (y, -height, +height);
+        }
+
+      g_object_set (filter_tool->config,
+                    "x", x,
+                    "y", y,
+                    NULL);
+
+      gimp_tool_pop_status (tool, display);
+
+      gimp_tool_push_status_coords (tool, display,
+                                    GIMP_CURSOR_PRECISION_PIXEL_CENTER,
+                                    _("Offset: "),
+                                    offset_x,
+                                    ", ",
+                                    offset_y,
+                                    NULL);
+    }
+}
+
+static void
+gimp_offset_tool_oper_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              gboolean          proximity,
+                              GimpDisplay      *display)
+{
+  if (! tool->drawable ||
+      gimp_filter_tool_on_guide (GIMP_FILTER_TOOL (tool),
+                                 coords, display))
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                                   proximity, display);
+    }
+  else
+    {
+      gimp_tool_pop_status (tool, display);
+
+      gimp_tool_push_status (tool, display, "%s",
+                             _("Click-Drag to offset drawable"));
+    }
+}
+
+static void
+gimp_offset_tool_cursor_update (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                GimpDisplay      *display)
+{
+  if (! tool->drawable ||
+      gimp_filter_tool_on_guide (GIMP_FILTER_TOOL (tool),
+                                 coords, display))
+    {
+      GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                     display);
+    }
+  else
+    {
+      gimp_tool_set_cursor (tool, display,
+                            GIMP_CURSOR_MOUSE,
+                            GIMP_TOOL_CURSOR_MOVE,
+                            GIMP_CURSOR_MODIFIER_NONE);
+    }
+}
+
+static void
+gimp_offset_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpOffsetTool *offset_tool = GIMP_OFFSET_TOOL (filter_tool);
+  GtkWidget      *main_vbox;
+  GtkWidget      *vbox;
+  GtkWidget      *hbox;
+  GtkWidget      *button;
+  GtkWidget      *spinbutton;
+  GtkWidget      *frame;
+  GtkAdjustment  *adjustment;
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  /*  The offset frame  */
+  frame = gimp_frame_new (_("Offset"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  spinbutton = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10);
+
+  offset_tool->offset_se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
+                                                TRUE, TRUE, FALSE, 10,
+                                                GIMP_SIZE_ENTRY_UPDATE_SIZE);
+
+  gtk_table_set_col_spacing (GTK_TABLE (offset_tool->offset_se), 0, 4);
+  gtk_table_set_col_spacing (GTK_TABLE (offset_tool->offset_se), 1, 4);
+  gtk_table_set_row_spacing (GTK_TABLE (offset_tool->offset_se), 0, 2);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (offset_tool->offset_se),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (offset_tool->offset_se), spinbutton,
+                             1, 2, 0, 1);
+  gtk_widget_show (spinbutton);
+
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (offset_tool->offset_se),
+                                _("_X:"), 0, 0, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (offset_tool->offset_se),
+                                _("_Y:"), 1, 0, 0.0);
+
+  gtk_box_pack_start (GTK_BOX (vbox), offset_tool->offset_se, FALSE, FALSE, 0);
+  gtk_widget_show (offset_tool->offset_se);
+
+  gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (offset_tool->offset_se),
+                            GIMP_UNIT_PIXEL);
+
+  g_signal_connect (offset_tool->offset_se, "refval-changed",
+                    G_CALLBACK (gimp_offset_tool_offset_changed),
+                    offset_tool);
+  g_signal_connect (offset_tool->offset_se, "value-changed",
+                    G_CALLBACK (gimp_offset_tool_offset_changed),
+                    offset_tool);
+
+  button = gtk_button_new_with_mnemonic (_("By width/_2, height/2"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_offset_tool_half_xy_clicked),
+                    offset_tool);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gtk_button_new_with_mnemonic (_("By _width/2"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_offset_tool_half_x_clicked),
+                    offset_tool);
+
+  button = gtk_button_new_with_mnemonic (_("By _height/2"));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_offset_tool_half_y_clicked),
+                    offset_tool);
+
+  /*  The edge behavior frame  */
+  frame = gimp_int_radio_group_new (TRUE, _("Edge Behavior"),
+
+                                    G_CALLBACK (gimp_offset_tool_edge_behavior_toggled),
+                                    offset_tool,
+
+                                    GIMP_OFFSET_WRAP_AROUND,
+
+                                    _("W_rap around"),
+                                    GIMP_OFFSET_WRAP_AROUND, NULL,
+
+                                    _("Fill with _background color"),
+                                    GIMP_OFFSET_BACKGROUND, NULL,
+
+                                    _("Make _transparent"),
+                                    GIMP_OFFSET_TRANSPARENT,
+                                    &offset_tool->transparent_radio,
+                                    NULL);
+
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+}
+
+static void
+gimp_offset_tool_config_notify (GimpFilterTool   *filter_tool,
+                                GimpConfig       *config,
+                                const GParamSpec *pspec)
+{
+  gimp_offset_tool_update (GIMP_OFFSET_TOOL (filter_tool));
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->config_notify (filter_tool,
+                                                        config, pspec);
+}
+
+static void
+gimp_offset_tool_region_changed (GimpFilterTool *filter_tool)
+{
+  gimp_offset_tool_update (GIMP_OFFSET_TOOL (filter_tool));
+}
+
+static void
+gimp_offset_tool_offset_changed (GimpSizeEntry  *se,
+                                 GimpOffsetTool *offset_tool)
+{
+  g_object_set (GIMP_FILTER_TOOL (offset_tool)->config,
+                "x", (gint) gimp_size_entry_get_refval (se, 0),
+                "y", (gint) gimp_size_entry_get_refval (se, 1),
+                NULL);
+}
+
+static void
+gimp_offset_tool_half_xy_clicked (GtkButton      *button,
+                                  GimpOffsetTool *offset_tool)
+{
+  g_object_set (GIMP_FILTER_TOOL (offset_tool)->config,
+                "x", gimp_offset_tool_get_width  (offset_tool) / 2,
+                "y", gimp_offset_tool_get_height (offset_tool) / 2,
+                NULL);
+}
+
+static void
+gimp_offset_tool_half_x_clicked (GtkButton      *button,
+                                 GimpOffsetTool *offset_tool)
+{
+  g_object_set (GIMP_FILTER_TOOL (offset_tool)->config,
+                "x", gimp_offset_tool_get_width (offset_tool) / 2,
+                NULL);
+}
+
+static void
+gimp_offset_tool_half_y_clicked (GtkButton      *button,
+                                 GimpOffsetTool *offset_tool)
+{
+  g_object_set (GIMP_FILTER_TOOL (offset_tool)->config,
+                "y", gimp_offset_tool_get_height (offset_tool) / 2,
+                NULL);
+}
+
+static void
+gimp_offset_tool_edge_behavior_toggled (GtkToggleButton *toggle,
+                                        GimpOffsetTool  *offset_tool)
+{
+  if (gtk_toggle_button_get_active (toggle))
+    {
+      GimpOffsetType type;
+
+      type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (toggle),
+                                                 "gimp-item-data"));
+
+      g_object_set (GIMP_FILTER_TOOL (offset_tool)->config,
+                    "type", type,
+                    NULL);
+    }
+}
+
+static void
+gimp_offset_tool_background_changed (GimpContext    *context,
+                                     const GimpRGB  *color,
+                                     GimpOffsetTool *offset_tool)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (offset_tool);
+  GimpOffsetType  type;
+
+  g_object_get (filter_tool->config,
+                "type", &type,
+                NULL);
+
+  if (type == GIMP_OFFSET_BACKGROUND)
+    {
+      gegl_node_set (filter_tool->operation,
+                     "context", context,
+                     NULL);
+
+      gimp_drawable_filter_apply (filter_tool->filter, NULL);
+    }
+}
+
+static gint
+gimp_offset_tool_get_width (GimpOffsetTool *offset_tool)
+{
+  GeglRectangle drawable_area;
+  gint          drawable_offset_x;
+  gint          drawable_offset_y;
+
+  if (gimp_filter_tool_get_drawable_area (GIMP_FILTER_TOOL (offset_tool),
+                                          &drawable_offset_x,
+                                          &drawable_offset_y,
+                                          &drawable_area) &&
+      ! gegl_rectangle_is_empty (&drawable_area))
+    {
+      return drawable_area.width;
+    }
+
+  return 0;
+}
+
+static gint
+gimp_offset_tool_get_height (GimpOffsetTool *offset_tool)
+{
+  GeglRectangle drawable_area;
+  gint          drawable_offset_x;
+  gint          drawable_offset_y;
+
+  if (gimp_filter_tool_get_drawable_area (GIMP_FILTER_TOOL (offset_tool),
+                                          &drawable_offset_x,
+                                          &drawable_offset_y,
+                                          &drawable_area) &&
+      ! gegl_rectangle_is_empty (&drawable_area))
+    {
+      return drawable_area.height;
+    }
+
+  return 0;
+}
+
+static void
+gimp_offset_tool_update (GimpOffsetTool *offset_tool)
+{
+  GimpTool       *tool        = GIMP_TOOL (offset_tool);
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (offset_tool);
+  GimpOffsetType  orig_type;
+  gint            orig_x;
+  gint            orig_y;
+  GimpOffsetType  type;
+  gint            x;
+  gint            y;
+  gint            width;
+  gint            height;
+
+  g_object_get (filter_tool->config,
+                "type", &orig_type,
+                "x",    &orig_x,
+                "y",    &orig_y,
+                NULL);
+
+  width  = gimp_offset_tool_get_width  (offset_tool);
+  height = gimp_offset_tool_get_height (offset_tool);
+
+  x = CLAMP (orig_x, -width,  +width);
+  y = CLAMP (orig_y, -height, +height);
+
+  type = orig_type;
+
+  if (tool->drawable                             &&
+      ! gimp_drawable_has_alpha (tool->drawable) &&
+      type == GIMP_OFFSET_TRANSPARENT)
+    {
+      type = GIMP_OFFSET_BACKGROUND;
+    }
+
+  if (x    != orig_x ||
+      y    != orig_y ||
+      type != orig_type)
+    {
+      g_object_set (filter_tool->config,
+                    "type", type,
+                    "x",    x,
+                    "y",    y,
+                    NULL);
+    }
+
+  if (offset_tool->offset_se)
+    {
+      gint width  = gimp_offset_tool_get_width  (offset_tool);
+      gint height = gimp_offset_tool_get_height (offset_tool);
+
+      g_signal_handlers_block_by_func (offset_tool->offset_se,
+                                       gimp_offset_tool_offset_changed,
+                                       offset_tool);
+
+      gimp_size_entry_set_refval_boundaries (
+        GIMP_SIZE_ENTRY (offset_tool->offset_se), 0,
+        -width, +width);
+      gimp_size_entry_set_refval_boundaries (
+        GIMP_SIZE_ENTRY (offset_tool->offset_se), 1,
+        -height, +height);
+
+      gimp_size_entry_set_size (
+        GIMP_SIZE_ENTRY (offset_tool->offset_se), 0,
+        0, width);
+      gimp_size_entry_set_size (
+        GIMP_SIZE_ENTRY (offset_tool->offset_se), 1,
+        0, height);
+
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (offset_tool->offset_se), 0,
+                                  x);
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (offset_tool->offset_se), 1,
+                                  y);
+
+      g_signal_handlers_unblock_by_func (offset_tool->offset_se,
+                                         gimp_offset_tool_offset_changed,
+                                         offset_tool);
+    }
+
+  if (offset_tool->transparent_radio)
+    {
+      gimp_int_radio_group_set_active (
+        GTK_RADIO_BUTTON (offset_tool->transparent_radio),
+        type);
+    }
+}
+
+static void
+gimp_offset_tool_halt (GimpOffsetTool *offset_tool)
+{
+  GimpContext *context = GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (offset_tool));
+
+  offset_tool->offset_se         = NULL;
+  offset_tool->transparent_radio = NULL;
+
+  g_signal_handlers_disconnect_by_func (
+    context,
+    gimp_offset_tool_background_changed,
+    offset_tool);
+}
diff --git a/app/tools/gimpoffsettool.h b/app/tools/gimpoffsettool.h
new file mode 100644
index 0000000..ff651de
--- /dev/null
+++ b/app/tools/gimpoffsettool.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OFFSET_TOOL_H__
+#define __GIMP_OFFSET_TOOL_H__
+
+
+#include "gimpfiltertool.h"
+
+
+#define GIMP_TYPE_OFFSET_TOOL            (gimp_offset_tool_get_type ())
+#define GIMP_OFFSET_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OFFSET_TOOL, GimpOffsetTool))
+#define GIMP_OFFSET_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OFFSET_TOOL, GimpOffsetToolClass))
+#define GIMP_IS_OFFSET_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OFFSET_TOOL))
+#define GIMP_IS_OFFSET_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OFFSET_TOOL))
+#define GIMP_OFFSET_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OFFSET_TOOL, GimpOffsetToolClass))
+
+
+typedef struct _GimpOffsetTool      GimpOffsetTool;
+typedef struct _GimpOffsetToolClass GimpOffsetToolClass;
+
+struct _GimpOffsetTool
+{
+  GimpFilterTool  parent_instance;
+
+  gboolean        dragging;
+  gdouble         x;
+  gdouble         y;
+  gint            offset_x;
+  gint            offset_y;
+
+  /* dialog */
+  GtkWidget      *offset_se;
+  GtkWidget      *transparent_radio;
+};
+
+struct _GimpOffsetToolClass
+{
+  GimpFilterToolClass  parent_class;
+};
+
+
+void    gimp_offset_tool_register (GimpToolRegisterCallback callback,
+                                   gpointer                 data);
+
+GType   gimp_offset_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_OFFSET_TOOL_H__  */
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
new file mode 100644
index 0000000..73b9a98
--- /dev/null
+++ b/app/tools/gimpoperationtool.c
@@ -0,0 +1,914 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+#include "core/gimpparamspecs-duplicate.h"
+#include "core/gimppickable.h"
+#include "core/gimpsettings.h"
+
+#include "widgets/gimpbuffersourcebox.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppickablebutton.h"
+
+#include "propgui/gimppropgui.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolgui.h"
+
+#include "gimpfilteroptions.h"
+#include "gimpoperationtool.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _AuxInput AuxInput;
+
+struct _AuxInput
+{
+  GimpOperationTool *tool;
+  gchar             *pad;
+  GeglNode          *node;
+  GtkWidget         *box;
+};
+
+
+/*  local function prototypes  */
+
+static void        gimp_operation_tool_finalize                  (GObject           *object);
+
+static gboolean    gimp_operation_tool_initialize                (GimpTool          *tool,
+                                                                  GimpDisplay       *display,
+                                                                  GError           **error);
+static void        gimp_operation_tool_control                   (GimpTool          *tool,
+                                                                  GimpToolAction     action,
+                                                                  GimpDisplay       *display);
+
+static gchar     * gimp_operation_tool_get_operation             (GimpFilterTool    *filter_tool,
+                                                                  gchar            **description);
+static void        gimp_operation_tool_dialog                    (GimpFilterTool    *filter_tool);
+static void        gimp_operation_tool_reset                     (GimpFilterTool    *filter_tool);
+static void        gimp_operation_tool_set_config                (GimpFilterTool    *filter_tool,
+                                                                  GimpConfig        *config);
+static void        gimp_operation_tool_region_changed            (GimpFilterTool    *filter_tool);
+static void        gimp_operation_tool_color_picked              (GimpFilterTool    *filter_tool,
+                                                                  gpointer           identifier,
+                                                                  gdouble            x,
+                                                                  gdouble            y,
+                                                                  const Babl        *sample_format,
+                                                                  const GimpRGB     *color);
+
+static void        gimp_operation_tool_options_box_size_allocate (GtkWidget         *options_box,
+                                                                  GdkRectangle      *allocation,
+                                                                  GimpOperationTool *tool);
+
+static void        gimp_operation_tool_halt                      (GimpOperationTool *op_tool);
+static void        gimp_operation_tool_commit                    (GimpOperationTool *op_tool);
+
+static void        gimp_operation_tool_sync_op                   (GimpOperationTool *op_tool,
+                                                                  gboolean           sync_colors);
+static void        gimp_operation_tool_create_gui                (GimpOperationTool *tool);
+static void        gimp_operation_tool_add_gui                   (GimpOperationTool *tool);
+
+static AuxInput *  gimp_operation_tool_aux_input_new             (GimpOperationTool *tool,
+                                                                  GeglNode          *operation,
+                                                                  const gchar       *input_pad,
+                                                                  const gchar       *label);
+static void        gimp_operation_tool_aux_input_detach          (AuxInput          *input);
+static void        gimp_operation_tool_aux_input_clear           (AuxInput          *input);
+static void        gimp_operation_tool_aux_input_free            (AuxInput          *input);
+
+static void        gimp_operation_tool_unlink_chains             (GimpOperationTool *op_tool);
+static void        gimp_operation_tool_relink_chains             (GimpOperationTool *op_tool);
+
+
+G_DEFINE_TYPE (GimpOperationTool, gimp_operation_tool,
+               GIMP_TYPE_FILTER_TOOL)
+
+#define parent_class gimp_operation_tool_parent_class
+
+
+void
+gimp_operation_tool_register (GimpToolRegisterCallback  callback,
+                              gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_OPERATION_TOOL,
+                GIMP_TYPE_FILTER_OPTIONS,
+                gimp_color_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-operation-tool",
+                _("GEGL Operation"),
+                _("Operation Tool: Use an arbitrary GEGL operation"),
+                NULL, NULL,
+                NULL, GIMP_HELP_TOOL_GEGL,
+                GIMP_ICON_GEGL,
+                data);
+}
+
+static void
+gimp_operation_tool_class_init (GimpOperationToolClass *klass)
+{
+  GObjectClass        *object_class      = G_OBJECT_CLASS (klass);
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  object_class->finalize            = gimp_operation_tool_finalize;
+
+  tool_class->initialize            = gimp_operation_tool_initialize;
+  tool_class->control               = gimp_operation_tool_control;
+
+  filter_tool_class->get_operation  = gimp_operation_tool_get_operation;
+  filter_tool_class->dialog         = gimp_operation_tool_dialog;
+  filter_tool_class->reset          = gimp_operation_tool_reset;
+  filter_tool_class->set_config     = gimp_operation_tool_set_config;
+  filter_tool_class->region_changed = gimp_operation_tool_region_changed;
+  filter_tool_class->color_picked   = gimp_operation_tool_color_picked;
+}
+
+static void
+gimp_operation_tool_init (GimpOperationTool *op_tool)
+{
+}
+
+static void
+gimp_operation_tool_finalize (GObject *object)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (object);
+
+  g_clear_pointer (&op_tool->operation,   g_free);
+  g_clear_pointer (&op_tool->description, g_free);
+
+  g_list_free_full (op_tool->aux_inputs,
+                    (GDestroyNotify) gimp_operation_tool_aux_input_free);
+  op_tool->aux_inputs = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_operation_tool_initialize (GimpTool     *tool,
+                                GimpDisplay  *display,
+                                GError      **error)
+{
+  if (GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      GimpFilterTool    *filter_tool = GIMP_FILTER_TOOL (tool);
+      GimpOperationTool *op_tool     = GIMP_OPERATION_TOOL (tool);
+
+      if (filter_tool->config)
+        {
+          GtkWidget *options_gui;
+
+          gimp_operation_tool_sync_op (op_tool, TRUE);
+          options_gui = g_weak_ref_get (&op_tool->options_gui_ref);
+          if (! options_gui)
+            {
+              gimp_operation_tool_create_gui (op_tool);
+              gimp_operation_tool_add_gui (op_tool);
+            }
+          else
+            {
+              g_object_unref (options_gui);
+            }
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_operation_tool_control (GimpTool       *tool,
+                             GimpToolAction  action,
+                             GimpDisplay    *display)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_operation_tool_halt (op_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_operation_tool_commit (op_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static gchar *
+gimp_operation_tool_get_operation (GimpFilterTool  *filter_tool,
+                                   gchar          **description)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (filter_tool);
+
+  *description = g_strdup (op_tool->description);
+
+  return g_strdup (op_tool->operation);
+}
+
+static void
+gimp_operation_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (filter_tool);
+  GtkWidget         *main_vbox;
+  GtkWidget         *options_sw;
+  GtkWidget         *options_gui;
+  GtkWidget         *options_box;
+  GtkWidget         *viewport;
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  /*  The options scrolled window  */
+  options_sw = gtk_scrolled_window_new (NULL, NULL);
+  g_weak_ref_set (&op_tool->options_sw_ref, options_sw);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (options_sw),
+                                       GTK_SHADOW_NONE);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (options_sw),
+                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (main_vbox), options_sw,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (options_sw);
+
+  viewport = gtk_viewport_new (NULL, NULL);
+  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (options_sw), viewport);
+  gtk_widget_show (viewport);
+
+  /*  The options vbox  */
+  options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  g_weak_ref_set (&op_tool->options_box_ref, options_box);
+  gtk_container_add (GTK_CONTAINER (viewport), options_box);
+  gtk_widget_show (options_box);
+
+  g_signal_connect (options_box, "size-allocate",
+                    G_CALLBACK (gimp_operation_tool_options_box_size_allocate),
+                    op_tool);
+
+  options_gui = g_weak_ref_get (&op_tool->options_gui_ref);
+  if (options_gui)
+    {
+      gimp_operation_tool_add_gui (op_tool);
+      g_object_unref (options_gui);
+    }
+}
+
+static void
+gimp_operation_tool_reset (GimpFilterTool *filter_tool)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (filter_tool);
+
+  gimp_operation_tool_unlink_chains (op_tool);
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->reset (filter_tool);
+
+  if (filter_tool->config && GIMP_TOOL (op_tool)->drawable)
+    gimp_operation_tool_sync_op (op_tool, TRUE);
+
+  gimp_operation_tool_relink_chains (op_tool);
+}
+
+static void
+gimp_operation_tool_set_config (GimpFilterTool *filter_tool,
+                                GimpConfig     *config)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (filter_tool);
+
+  gimp_operation_tool_unlink_chains (op_tool);
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->set_config (filter_tool, config);
+
+  if (filter_tool->config && GIMP_TOOL (op_tool)->drawable)
+    gimp_operation_tool_sync_op (op_tool, FALSE);
+
+  gimp_operation_tool_relink_chains (op_tool);
+}
+
+static void
+gimp_operation_tool_region_changed (GimpFilterTool *filter_tool)
+{
+  GimpOperationTool *op_tool = GIMP_OPERATION_TOOL (filter_tool);
+
+  /* when the region changes, do we want the operation's on-canvas
+   * controller to move to a new position, or the operation to
+   * change its properties to match the on-canvas controller?
+   *
+   * decided to leave the on-canvas controller where it is and
+   * pretend it has changed, so the operation is updated
+   * accordingly...
+   */
+  if (filter_tool->widget)
+    g_signal_emit_by_name (filter_tool->widget, "changed");
+
+  gimp_operation_tool_sync_op (op_tool, FALSE);
+}
+
+static void
+gimp_operation_tool_color_picked (GimpFilterTool  *filter_tool,
+                                  gpointer         identifier,
+                                  gdouble          x,
+                                  gdouble          y,
+                                  const Babl      *sample_format,
+                                  const GimpRGB   *color)
+{
+  gchar **pspecs = g_strsplit (identifier, ":", 2);
+
+  if (pspecs[1])
+    {
+      GObjectClass  *object_class = G_OBJECT_GET_CLASS (filter_tool->config);
+      GParamSpec    *pspec_x;
+      GParamSpec    *pspec_y;
+      gint           off_x, off_y;
+      GeglRectangle  area;
+
+      gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+      x -= off_x + area.x;
+      y -= off_y + area.y;
+
+      pspec_x = g_object_class_find_property (object_class, pspecs[0]);
+      pspec_y = g_object_class_find_property (object_class, pspecs[1]);
+
+      if (pspec_x && pspec_y &&
+          G_PARAM_SPEC_TYPE (pspec_x) == G_PARAM_SPEC_TYPE (pspec_y))
+        {
+          GValue value_x = G_VALUE_INIT;
+          GValue value_y = G_VALUE_INIT;
+
+          g_value_init (&value_x, G_PARAM_SPEC_VALUE_TYPE (pspec_x));
+          g_value_init (&value_y, G_PARAM_SPEC_VALUE_TYPE (pspec_y));
+
+#define HAS_KEY(p,k,v) gimp_gegl_param_spec_has_key (p, k, v)
+
+          if (HAS_KEY (pspec_x, "unit", "relative-coordinate") &&
+              HAS_KEY (pspec_y, "unit", "relative-coordinate"))
+            {
+              x /= (gdouble) area.width;
+              y /= (gdouble) area.height;
+            }
+
+          if (G_IS_PARAM_SPEC_INT (pspec_x))
+            {
+              g_value_set_int (&value_x, x);
+              g_value_set_int (&value_y, y);
+
+              g_param_value_validate (pspec_x, &value_x);
+              g_param_value_validate (pspec_y, &value_y);
+
+              g_object_set (filter_tool->config,
+                            pspecs[0], g_value_get_int (&value_x),
+                            pspecs[1], g_value_get_int (&value_y),
+                            NULL);
+            }
+          else if (G_IS_PARAM_SPEC_DOUBLE (pspec_x))
+            {
+              g_value_set_double (&value_x, x);
+              g_value_set_double (&value_y, y);
+
+              g_param_value_validate (pspec_x, &value_x);
+              g_param_value_validate (pspec_y, &value_y);
+
+              g_object_set (filter_tool->config,
+                            pspecs[0], g_value_get_double (&value_x),
+                            pspecs[1], g_value_get_double (&value_y),
+                            NULL);
+            }
+          else
+            {
+              g_warning ("%s: unhandled param spec of type %s",
+                         G_STRFUNC, G_PARAM_SPEC_TYPE_NAME (pspec_x));
+            }
+
+          g_value_unset (&value_x);
+          g_value_unset (&value_y);
+        }
+    }
+  else
+    {
+      g_object_set (filter_tool->config,
+                    pspecs[0], color,
+                    NULL);
+    }
+
+  g_strfreev (pspecs);
+}
+
+static void
+gimp_operation_tool_options_box_size_allocate (GtkWidget         *options_box,
+                                               GdkRectangle      *allocation,
+                                               GimpOperationTool *op_tool)
+{
+  GimpTool       *tool = GIMP_TOOL (op_tool);
+  GtkWidget      *shell;
+  GtkWidget      *options_sw;
+  GdkRectangle    workarea;
+  GtkRequisition  minimum;
+  gint            maximum_height;
+
+  shell      = GTK_WIDGET (gimp_display_get_shell (tool->display));
+  options_sw = g_weak_ref_get (&op_tool->options_sw_ref);
+
+  g_return_if_fail (options_sw != NULL);
+
+  gdk_screen_get_monitor_workarea (gtk_widget_get_screen (shell),
+                                   gimp_widget_get_monitor (shell), &workarea);
+
+  maximum_height = workarea.height / 2;
+
+  gtk_widget_size_request (options_box, &minimum);
+
+  if (minimum.height > maximum_height)
+    {
+      GtkWidget *scrollbar;
+
+      minimum.height = maximum_height;
+
+      scrollbar = gtk_scrolled_window_get_vscrollbar (
+        GTK_SCROLLED_WINDOW (options_sw));
+
+      if (scrollbar)
+        {
+          GtkRequisition req;
+
+          gtk_widget_size_request (scrollbar, &req);
+
+          minimum.width += req.width;
+        }
+    }
+
+  gtk_widget_set_size_request (options_sw, minimum.width, minimum.height);
+
+  g_object_unref (options_sw);
+}
+
+static void
+gimp_operation_tool_halt (GimpOperationTool *op_tool)
+{
+  /*  don't reset op_tool->operation and op_tool->description so the
+   *  tool can be properly restarted by clicking on an image
+   */
+
+  g_list_free_full (op_tool->aux_inputs,
+                    (GDestroyNotify) gimp_operation_tool_aux_input_free);
+  op_tool->aux_inputs = NULL;
+}
+
+static void
+gimp_operation_tool_commit (GimpOperationTool *op_tool)
+{
+  /*  remove the aux input boxes from the dialog, so they don't get
+   *  destroyed when the parent class runs its commit()
+   */
+
+  g_list_foreach (op_tool->aux_inputs,
+                  (GFunc) gimp_operation_tool_aux_input_detach, NULL);
+}
+
+static void
+gimp_operation_tool_sync_op (GimpOperationTool *op_tool,
+                             gboolean           sync_colors)
+{
+  GimpFilterTool   *filter_tool = GIMP_FILTER_TOOL (op_tool);
+  GimpToolOptions  *options     = GIMP_TOOL_GET_OPTIONS (op_tool);
+  GParamSpec      **pspecs;
+  guint             n_pspecs;
+  gint              off_x, off_y;
+  GeglRectangle     area;
+  gint              i;
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (filter_tool->config),
+                                           &n_pspecs);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *pspec = pspecs[i];
+
+#define HAS_KEY(p,k,v) gimp_gegl_param_spec_has_key (p, k, v)
+
+      if (HAS_KEY (pspec, "role", "output-extent"))
+        {
+          if (HAS_KEY (pspec, "unit", "pixel-coordinate") &&
+              HAS_KEY (pspec, "axis", "x"))
+            {
+              g_object_set (filter_tool->config, pspec->name, 0, NULL);
+            }
+          else if (HAS_KEY (pspec, "unit", "pixel-coordinate") &&
+                   HAS_KEY (pspec, "axis", "y"))
+            {
+              g_object_set (filter_tool->config, pspec->name, 0, NULL);
+            }
+          else if (HAS_KEY (pspec, "unit", "pixel-distance") &&
+                   HAS_KEY (pspec, "axis", "x"))
+            {
+              g_object_set (filter_tool->config, pspec->name, area.width, NULL);
+            }
+          else if (HAS_KEY (pspec, "unit", "pixel-distance") &&
+                   HAS_KEY (pspec, "axis", "y"))
+            {
+              g_object_set (filter_tool->config, pspec->name, area.height, NULL);
+            }
+        }
+      else if (sync_colors)
+        {
+          if (HAS_KEY (pspec, "role", "color-primary"))
+            {
+              GimpRGB color;
+
+              gimp_context_get_foreground (GIMP_CONTEXT (options), &color);
+              g_object_set (filter_tool->config, pspec->name, &color, NULL);
+            }
+          else if (sync_colors && HAS_KEY (pspec, "role", "color-secondary"))
+            {
+              GimpRGB color;
+
+              gimp_context_get_background (GIMP_CONTEXT (options), &color);
+              g_object_set (filter_tool->config, pspec->name, &color, NULL);
+            }
+        }
+    }
+
+  g_free (pspecs);
+}
+
+static void
+gimp_operation_tool_create_gui (GimpOperationTool *op_tool)
+{
+  GimpFilterTool  *filter_tool = GIMP_FILTER_TOOL (op_tool);
+  GtkWidget       *options_gui;
+  gint             off_x, off_y;
+  GeglRectangle    area;
+  gchar          **input_pads;
+
+  gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
+
+  options_gui =
+    gimp_prop_gui_new (G_OBJECT (filter_tool->config),
+                       G_TYPE_FROM_INSTANCE (filter_tool->config), 0,
+                       &area,
+                       GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (op_tool)),
+                       (GimpCreatePickerFunc) gimp_filter_tool_add_color_picker,
+                       (GimpCreateControllerFunc) gimp_filter_tool_add_controller,
+                       filter_tool);
+  g_weak_ref_set (&op_tool->options_gui_ref, options_gui);
+
+  input_pads = gegl_node_list_input_pads (filter_tool->operation);
+
+  if (input_pads)
+    {
+      gint i;
+
+      for (i = 0; input_pads[i]; i++)
+        {
+          AuxInput *input;
+          GRegex   *regex;
+          gchar    *label;
+
+          if (! strcmp (input_pads[i], "input"))
+            continue;
+
+          regex = g_regex_new ("^aux(\\d*)$", 0, 0, NULL);
+
+          g_return_if_fail (regex != NULL);
+
+          /* Translators: don't translate "Aux" */
+          label = g_regex_replace (regex,
+                                   input_pads[i], -1, 0,
+                                   _("Aux\\1 Input"),
+                                   0, NULL);
+
+          input = gimp_operation_tool_aux_input_new (op_tool,
+                                                     filter_tool->operation,
+                                                     input_pads[i], label);
+
+          op_tool->aux_inputs = g_list_prepend (op_tool->aux_inputs, input);
+
+          g_free (label);
+
+          g_regex_unref (regex);
+        }
+
+      g_strfreev (input_pads);
+    }
+}
+
+static void
+gimp_operation_tool_add_gui (GimpOperationTool *op_tool)
+{
+  GtkSizeGroup *size_group  = NULL;
+  GtkWidget    *options_gui;
+  GtkWidget    *options_box;
+  GList        *list;
+
+  options_gui = g_weak_ref_get (&op_tool->options_gui_ref);
+  options_box = g_weak_ref_get (&op_tool->options_box_ref);
+  g_return_if_fail (options_gui && options_box);
+
+  for (list = op_tool->aux_inputs; list; list = g_list_next (list))
+    {
+      AuxInput  *input = list->data;
+      GtkWidget *toggle;
+
+      if (! size_group)
+        size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+      toggle =
+        gimp_buffer_source_box_get_toggle (GIMP_BUFFER_SOURCE_BOX (input->box));
+
+      gtk_size_group_add_widget (size_group, toggle);
+
+      gtk_box_pack_start (GTK_BOX (options_box), input->box,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (input->box);
+    }
+
+  if (size_group)
+    g_object_unref (size_group);
+
+  gtk_box_pack_start (GTK_BOX (options_box), options_gui, TRUE, TRUE, 0);
+  gtk_widget_show (options_gui);
+
+  g_object_unref (options_gui);
+  g_object_unref (options_box);
+}
+
+
+/*  aux input utility functions  */
+
+static void
+gimp_operation_tool_aux_input_notify (GimpBufferSourceBox *box,
+                                      const GParamSpec    *pspec,
+                                      AuxInput            *input)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (input->tool);
+
+  /* emit "notify" so GimpFilterTool will update its preview
+   *
+   * FIXME: this is a bad hack that should go away once GimpImageMap
+   * and GimpFilterTool are refactored to be more filter-ish.
+   */
+  if (filter_tool->config)
+    g_signal_emit_by_name (filter_tool->config,
+                           "notify", NULL);
+}
+
+static AuxInput *
+gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool,
+                                   GeglNode          *operation,
+                                   const gchar       *input_pad,
+                                   const gchar       *label)
+{
+  AuxInput    *input = g_slice_new (AuxInput);
+  GimpContext *context;
+
+  input->tool = op_tool;
+  input->pad  = g_strdup (input_pad);
+  input->node = gegl_node_new_child (NULL,
+                                     "operation", "gegl:buffer-source",
+                                     NULL);
+
+  gegl_node_connect_to (input->node, "output",
+                        operation,   input_pad);
+
+  context = GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (op_tool));
+
+  input->box = gimp_buffer_source_box_new (context, input->node, label);
+
+  /* make AuxInput owner of the box */
+  g_object_ref_sink (input->box);
+
+  g_signal_connect (input->box, "notify::pickable",
+                    G_CALLBACK (gimp_operation_tool_aux_input_notify),
+                    input);
+  g_signal_connect (input->box, "notify::enabled",
+                    G_CALLBACK (gimp_operation_tool_aux_input_notify),
+                    input);
+
+  return input;
+}
+
+static void
+gimp_operation_tool_aux_input_detach (AuxInput *input)
+{
+  GtkWidget *parent = gtk_widget_get_parent (input->box);
+
+  if (parent)
+    gtk_container_remove (GTK_CONTAINER (parent), input->box);
+}
+
+static void
+gimp_operation_tool_aux_input_clear (AuxInput *input)
+{
+  gimp_operation_tool_aux_input_detach (input);
+
+  g_object_set (input->box,
+                "pickable", NULL,
+                NULL);
+}
+
+static void
+gimp_operation_tool_aux_input_free (AuxInput *input)
+{
+  gimp_operation_tool_aux_input_clear (input);
+
+  g_free (input->pad);
+  g_object_unref (input->node);
+  g_object_unref (input->box);
+
+  g_slice_free (AuxInput, input);
+}
+
+static void
+gimp_operation_tool_unlink_chains (GimpOperationTool *op_tool)
+{
+  GObject *options_gui = g_weak_ref_get (&op_tool->options_gui_ref);
+  GList   *chains;
+
+  g_return_if_fail (options_gui != NULL);
+
+  chains = g_object_get_data (options_gui, "chains");
+
+  while (chains)
+    {
+      GimpChainButton *chain = chains->data;
+      gboolean         active;
+
+      active = gimp_chain_button_get_active (chain);
+
+      g_object_set_data (G_OBJECT (chain), "was-active",
+                         GINT_TO_POINTER (active));
+
+      if (active)
+        {
+          gimp_chain_button_set_active (chain, FALSE);
+        }
+
+      chains = chains->next;
+    }
+
+  g_object_unref (options_gui);
+}
+
+static void
+gimp_operation_tool_relink_chains (GimpOperationTool *op_tool)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (op_tool);
+  GObject        *options_gui = g_weak_ref_get (&op_tool->options_gui_ref);
+  GList          *chains;
+
+  g_return_if_fail (options_gui != NULL);
+
+  chains = g_object_get_data (options_gui, "chains");
+
+  while (chains)
+    {
+      GimpChainButton *chain = chains->data;
+
+      if (g_object_get_data (G_OBJECT (chain), "was-active"))
+        {
+          const gchar *name_x    = g_object_get_data (chains->data, "x-property");
+          const gchar *name_y    = g_object_get_data (chains->data, "y-property");
+          const gchar *names[2]  = { name_x, name_y };
+          GValue       values[2] = { G_VALUE_INIT, G_VALUE_INIT };
+          GValue       double_x  = G_VALUE_INIT;
+          GValue       double_y  = G_VALUE_INIT;
+
+          g_object_getv (filter_tool->config, 2, names, values);
+
+          g_value_init (&double_x, G_TYPE_DOUBLE);
+          g_value_init (&double_y, G_TYPE_DOUBLE);
+
+          if (g_value_transform (&values[0], &double_x) &&
+              g_value_transform (&values[1], &double_y) &&
+              g_value_get_double (&double_x) ==
+              g_value_get_double (&double_y))
+            {
+              gimp_chain_button_set_active (chain, TRUE);
+            }
+
+          g_value_unset (&double_x);
+          g_value_unset (&double_y);
+          g_value_unset (&values[0]);
+          g_value_unset (&values[1]);
+
+          g_object_set_data (G_OBJECT (chain), "was-active", NULL);
+        }
+
+      chains = chains->next;
+    }
+
+  g_object_unref (options_gui);
+}
+
+
+/*  public functions  */
+
+void
+gimp_operation_tool_set_operation (GimpOperationTool *op_tool,
+                                   const gchar       *operation,
+                                   const gchar       *title,
+                                   const gchar       *description,
+                                   const gchar       *undo_desc,
+                                   const gchar       *icon_name,
+                                   const gchar       *help_id)
+{
+  GimpTool       *tool;
+  GimpFilterTool *filter_tool;
+  GtkWidget      *options_gui;
+
+  g_return_if_fail (GIMP_IS_OPERATION_TOOL (op_tool));
+
+  tool        = GIMP_TOOL (op_tool);
+  filter_tool = GIMP_FILTER_TOOL (op_tool);
+
+  g_free (op_tool->operation);
+  g_free (op_tool->description);
+
+  op_tool->operation   = g_strdup (operation);
+  op_tool->description = g_strdup (description);
+
+  gimp_tool_set_label     (tool, title);
+  gimp_tool_set_undo_desc (tool, undo_desc);
+  gimp_tool_set_icon_name (tool, icon_name);
+  gimp_tool_set_help_id   (tool, help_id);
+
+  g_list_free_full (op_tool->aux_inputs,
+                    (GDestroyNotify) gimp_operation_tool_aux_input_free);
+  op_tool->aux_inputs = NULL;
+
+  gimp_filter_tool_set_widget (filter_tool, NULL);
+
+  options_gui = g_weak_ref_get (&op_tool->options_gui_ref);
+  if (options_gui)
+    {
+      gimp_filter_tool_disable_color_picking (filter_tool);
+      g_object_unref (options_gui);
+      gtk_widget_destroy (options_gui);
+    }
+
+  if (! operation)
+    return;
+
+  gimp_filter_tool_get_operation (filter_tool);
+
+  if (tool->drawable)
+    gimp_operation_tool_sync_op (op_tool, TRUE);
+
+  if (filter_tool->config && tool->display)
+    {
+      GtkWidget *options_box;
+
+      gimp_operation_tool_create_gui (op_tool);
+
+      options_box = g_weak_ref_get (&op_tool->options_box_ref);
+      if (options_box)
+        {
+          gimp_operation_tool_add_gui (op_tool);
+          g_object_unref (options_box);
+        }
+    }
+}
diff --git a/app/tools/gimpoperationtool.h b/app/tools/gimpoperationtool.h
new file mode 100644
index 0000000..c35c8ab
--- /dev/null
+++ b/app/tools/gimpoperationtool.h
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_TOOL_H__
+#define __GIMP_OPERATION_TOOL_H__
+
+
+#include "gimpfiltertool.h"
+
+
+#define GIMP_TYPE_OPERATION_TOOL            (gimp_operation_tool_get_type ())
+#define GIMP_OPERATION_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_TOOL, GimpOperationTool))
+#define GIMP_OPERATION_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_TOOL, GimpOperationToolClass))
+#define GIMP_IS_OPERATION_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_TOOL))
+#define GIMP_IS_OPERATION_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_TOOL))
+#define GIMP_OPERATION_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_TOOL, GimpOperationToolClass))
+
+
+typedef struct _GimpOperationTool      GimpOperationTool;
+typedef struct _GimpOperationToolClass GimpOperationToolClass;
+
+struct _GimpOperationTool
+{
+  GimpFilterTool  parent_instance;
+
+  gchar          *operation;
+  gchar          *description;
+
+  GList          *aux_inputs;
+
+  /* dialog */
+  GWeakRef        options_sw_ref;
+  GWeakRef        options_box_ref;
+  GWeakRef        options_gui_ref;
+};
+
+struct _GimpOperationToolClass
+{
+  GimpFilterToolClass  parent_class;
+};
+
+
+void    gimp_operation_tool_register      (GimpToolRegisterCallback  callback,
+                                           gpointer                  data);
+
+GType   gimp_operation_tool_get_type      (void) G_GNUC_CONST;
+
+void    gimp_operation_tool_set_operation (GimpOperationTool        *op_tool,
+                                           const gchar              *operation,
+                                           const gchar              *title,
+                                           const gchar              *description,
+                                           const gchar              *undo_desc,
+                                           const gchar              *icon_name,
+                                           const gchar              *help_id);
+
+
+#endif  /*  __GIMP_OPERATION_TOOL_H__  */
diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c
new file mode 100644
index 0000000..a8aefe8
--- /dev/null
+++ b/app/tools/gimppaintbrushtool.c
@@ -0,0 +1,94 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "gimppaintbrushtool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean   gimp_paintbrush_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                                                      GimpDrawable  *drawable);
+
+
+G_DEFINE_TYPE (GimpPaintbrushTool, gimp_paintbrush_tool, GIMP_TYPE_BRUSH_TOOL)
+
+
+void
+gimp_paintbrush_tool_register (GimpToolRegisterCallback  callback,
+                               gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_PAINTBRUSH_TOOL,
+                GIMP_TYPE_PAINT_OPTIONS,
+                gimp_paint_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_GRADIENT,
+                "gimp-paintbrush-tool",
+                _("Paintbrush"),
+                _("Paintbrush Tool: Paint smooth strokes using a brush"),
+                N_("_Paintbrush"), "P",
+                NULL, GIMP_HELP_TOOL_PAINTBRUSH,
+                GIMP_ICON_TOOL_PAINTBRUSH,
+                data);
+}
+
+static void
+gimp_paintbrush_tool_class_init (GimpPaintbrushToolClass *klass)
+{
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  paint_tool_class->is_alpha_only = gimp_paintbrush_tool_is_alpha_only;
+}
+
+static void
+gimp_paintbrush_tool_init (GimpPaintbrushTool *paintbrush)
+{
+  GimpTool *tool = GIMP_TOOL (paintbrush);
+
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_PAINTBRUSH);
+
+  gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (paintbrush),
+                                       GIMP_COLOR_PICK_TARGET_FOREGROUND);
+}
+
+static gboolean
+gimp_paintbrush_tool_is_alpha_only (GimpPaintTool *paint_tool,
+                                    GimpDrawable  *drawable)
+{
+  GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  GimpContext      *context       = GIMP_CONTEXT (paint_options);
+  GimpLayerMode     paint_mode    = gimp_context_get_paint_mode (context);
+
+  return gimp_layer_mode_is_alpha_only (paint_mode);
+}
diff --git a/app/tools/gimppaintbrushtool.h b/app/tools/gimppaintbrushtool.h
new file mode 100644
index 0000000..9014b6e
--- /dev/null
+++ b/app/tools/gimppaintbrushtool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINTBRUSH_TOOL_H__
+#define __GIMP_PAINTBRUSH_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+
+
+#define GIMP_TYPE_PAINTBRUSH_TOOL            (gimp_paintbrush_tool_get_type ())
+#define GIMP_PAINTBRUSH_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINTBRUSH_TOOL, GimpPaintbrushTool))
+#define GIMP_PAINTBRUSH_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINTBRUSH_TOOL, GimpPaintbrushToolClass))
+#define GIMP_IS_PAINTBRUSH_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINTBRUSH_TOOL))
+#define GIMP_IS_PAINTBRUSH_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINTBRUSH_TOOL))
+#define GIMP_PAINTBRUSH_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINTBRUSH_TOOL, GimpPaintbrushToolClass))
+
+
+typedef struct _GimpPaintbrushTool      GimpPaintbrushTool;
+typedef struct _GimpPaintbrushToolClass GimpPaintbrushToolClass;
+
+struct _GimpPaintbrushTool
+{
+  GimpBrushTool parent_instance;
+};
+
+struct _GimpPaintbrushToolClass
+{
+  GimpBrushToolClass parent_class;
+};
+
+
+void    gimp_paintbrush_tool_register (GimpToolRegisterCallback  callback,
+                                       gpointer                  data);
+
+GType   gimp_paintbrush_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PAINTBRUSH_TOOL_H__  */
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
new file mode 100644
index 0000000..211270f
--- /dev/null
+++ b/app/tools/gimppaintoptions-gui.c
@@ -0,0 +1,582 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimptoolinfo.h"
+
+#include "paint/gimppaintoptions.h"
+
+#include "widgets/gimplayermodebox.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-constructors.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpairbrushtool.h"
+#include "gimpclonetool.h"
+#include "gimpconvolvetool.h"
+#include "gimpdodgeburntool.h"
+#include "gimperasertool.h"
+#include "gimphealtool.h"
+#include "gimpinktool.h"
+#include "gimpmybrushtool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimppenciltool.h"
+#include "gimpperspectiveclonetool.h"
+#include "gimpsmudgetool.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+static void gimp_paint_options_gui_reset_size  (GtkWidget        *button,
+                                                GimpPaintOptions *paint_options);
+static void gimp_paint_options_gui_reset_aspect_ratio
+                                               (GtkWidget        *button,
+                                                GimpPaintOptions *paint_options);
+static void gimp_paint_options_gui_reset_angle (GtkWidget        *button,
+                                                GimpPaintOptions *paint_options);
+static void gimp_paint_options_gui_reset_spacing
+                                               (GtkWidget        *button,
+                                                GimpPaintOptions *paint_options);
+static void gimp_paint_options_gui_reset_hardness
+                                               (GtkWidget        *button,
+                                                GimpPaintOptions *paint_options);
+static void gimp_paint_options_gui_reset_force (GtkWidget        *button,
+                                                GimpPaintOptions *paint_options);
+
+static GtkWidget * dynamics_options_gui        (GimpPaintOptions *paint_options,
+                                                GType             tool_type);
+static GtkWidget * jitter_options_gui          (GimpPaintOptions *paint_options,
+                                                GType             tool_type);
+static GtkWidget * smoothing_options_gui       (GimpPaintOptions *paint_options,
+                                                GType             tool_type);
+
+static GtkWidget * gimp_paint_options_gui_scale_with_buttons
+                                               (GObject      *config,
+                                                gchar        *prop_name,
+                                                gchar        *link_prop_name,
+                                                gchar        *reset_tooltip,
+                                                gdouble       step_increment,
+                                                gdouble       page_increment,
+                                                gint          digits,
+                                                gdouble       scale_min,
+                                                gdouble       scale_max,
+                                                gdouble       factor,
+                                                gdouble       gamma,
+                                                GCallback     reset_callback,
+                                                GtkSizeGroup *link_group);
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_paint_options_gui (GimpToolOptions *tool_options)
+{
+  GObject          *config  = G_OBJECT (tool_options);
+  GimpPaintOptions *options = GIMP_PAINT_OPTIONS (tool_options);
+  GtkWidget        *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget        *menu;
+  GtkWidget        *scale;
+  GType             tool_type;
+
+  tool_type = tool_options->tool_info->tool_type;
+
+  /*  the paint mode menu  */
+  menu = gimp_prop_layer_mode_box_new (config, "paint-mode",
+                                       GIMP_LAYER_MODE_CONTEXT_PAINT);
+  gimp_layer_mode_box_set_label (GIMP_LAYER_MODE_BOX (menu), _("Mode"));
+  gimp_layer_mode_box_set_ellipsize (GIMP_LAYER_MODE_BOX (menu),
+                                     PANGO_ELLIPSIZE_END);
+  gtk_box_pack_start (GTK_BOX (vbox), menu, FALSE, FALSE, 0);
+  gtk_widget_show (menu);
+
+  g_object_set_data (G_OBJECT (vbox),
+                     "gimp-paint-options-gui-paint-mode-box", menu);
+
+  if (tool_type == GIMP_TYPE_ERASER_TOOL     ||
+      tool_type == GIMP_TYPE_CONVOLVE_TOOL   ||
+      tool_type == GIMP_TYPE_DODGE_BURN_TOOL ||
+      tool_type == GIMP_TYPE_HEAL_TOOL       ||
+      tool_type == GIMP_TYPE_MYBRUSH_TOOL    ||
+      tool_type == GIMP_TYPE_SMUDGE_TOOL)
+    {
+      gtk_widget_set_sensitive (menu, FALSE);
+    }
+
+  /*  the opacity scale  */
+  scale = gimp_prop_spin_scale_new (config, "opacity", NULL,
+                                    0.01, 0.1, 0);
+  gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  temp debug foo, disabled in stable  */
+  if (FALSE &&
+      g_type_is_a (tool_type, GIMP_TYPE_PAINT_TOOL) &&
+      tool_type != GIMP_TYPE_MYBRUSH_TOOL)
+    {
+      GtkWidget *button;
+
+      button = gimp_prop_check_button_new (config, "use-applicator", NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  /*  the brush  */
+  if (g_type_is_a (tool_type, GIMP_TYPE_BRUSH_TOOL))
+    {
+      GtkSizeGroup *link_group;
+      GtkWidget    *button;
+      GtkWidget    *frame;
+      GtkWidget    *hbox;
+
+      button = gimp_prop_brush_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                        _("Brush"), 2,
+                                        "brush-view-type", "brush-view-size",
+                                        "gimp-brush-editor",
+                                        _("Edit this brush"));
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      link_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+      hbox = gimp_paint_options_gui_scale_with_buttons
+        (config, "brush-size", "brush-link-size",
+         _("Reset size to brush's native size"),
+         1.0, 10.0, 2, 1.0, 1000.0, 1.0, 1.7,
+         G_CALLBACK (gimp_paint_options_gui_reset_size), link_group);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      hbox = gimp_paint_options_gui_scale_with_buttons
+        (config, "brush-aspect-ratio", "brush-link-aspect-ratio",
+         _("Reset aspect ratio to brush's native aspect ratio"),
+         0.1, 1.0, 2, -20.0, 20.0, 1.0, 1.0,
+         G_CALLBACK (gimp_paint_options_gui_reset_aspect_ratio), link_group);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      hbox = gimp_paint_options_gui_scale_with_buttons
+        (config, "brush-angle", "brush-link-angle",
+         _("Reset angle to brush's native angle"),
+         0.1, 1.0, 2, -180.0, 180.0, 1.0, 1.0,
+         G_CALLBACK (gimp_paint_options_gui_reset_angle), link_group);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      hbox = gimp_paint_options_gui_scale_with_buttons
+        (config, "brush-spacing", "brush-link-spacing",
+         _("Reset spacing to brush's native spacing"),
+         0.1, 1.0, 1, 1.0, 200.0, 100.0, 1.7,
+         G_CALLBACK (gimp_paint_options_gui_reset_spacing), link_group);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      hbox = gimp_paint_options_gui_scale_with_buttons
+        (config, "brush-hardness", "brush-link-hardness",
+         _("Reset hardness to brush's native hardness"),
+         0.1, 1.0, 1, 0.0, 100.0, 100.0, 1.0,
+         G_CALLBACK (gimp_paint_options_gui_reset_hardness), link_group);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      hbox = gimp_paint_options_gui_scale_with_buttons
+        (config, "brush-force", NULL,
+         _("Reset force to default"),
+         0.1, 1.0, 1, 0.0, 100.0, 100.0, 1.0,
+         G_CALLBACK (gimp_paint_options_gui_reset_force), link_group);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      if (tool_type == GIMP_TYPE_PENCIL_TOOL)
+        gtk_widget_set_sensitive (hbox, FALSE);
+
+      g_object_unref (link_group);
+
+      button = gimp_prop_dynamics_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                           _("Dynamics"), 2,
+                                           "dynamics-view-type",
+                                           "dynamics-view-size",
+                                           "gimp-dynamics-editor",
+                                           _("Edit this dynamics"));
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      frame = dynamics_options_gui (options, tool_type);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      gtk_widget_show (frame);
+
+      frame = jitter_options_gui (options, tool_type);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      gtk_widget_show (frame);
+    }
+
+  /*  the "smooth stroke" options  */
+  if (g_type_is_a (tool_type, GIMP_TYPE_PAINT_TOOL))
+    {
+      GtkWidget *frame;
+
+      frame = smoothing_options_gui (options, tool_type);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      gtk_widget_show (frame);
+    }
+
+  /*  the "Lock brush to view" toggle  */
+  if (g_type_is_a (tool_type, GIMP_TYPE_BRUSH_TOOL))
+    {
+      GtkWidget *button;
+
+      button = gimp_prop_check_button_new (config, "brush-lock-to-view", NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  /*  the "incremental" toggle  */
+  if (tool_type == GIMP_TYPE_PENCIL_TOOL     ||
+      tool_type == GIMP_TYPE_PAINTBRUSH_TOOL ||
+      tool_type == GIMP_TYPE_ERASER_TOOL     ||
+      tool_type == GIMP_TYPE_DODGE_BURN_TOOL)
+    {
+      GtkWidget *button;
+
+      button = gimp_prop_enum_check_button_new (config, "application-mode",
+                                                NULL,
+                                                GIMP_PAINT_CONSTANT,
+                                                GIMP_PAINT_INCREMENTAL);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  /* the "hard edge" toggle */
+  if (tool_type == GIMP_TYPE_ERASER_TOOL            ||
+      tool_type == GIMP_TYPE_CLONE_TOOL             ||
+      tool_type == GIMP_TYPE_HEAL_TOOL              ||
+      tool_type == GIMP_TYPE_PERSPECTIVE_CLONE_TOOL ||
+      tool_type == GIMP_TYPE_CONVOLVE_TOOL          ||
+      tool_type == GIMP_TYPE_DODGE_BURN_TOOL        ||
+      tool_type == GIMP_TYPE_SMUDGE_TOOL)
+    {
+      GtkWidget *button;
+
+      button = gimp_prop_check_button_new (config, "hard", NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  return vbox;
+}
+
+GtkWidget *
+gimp_paint_options_gui_get_paint_mode_box (GtkWidget *options_gui)
+{
+  return g_object_get_data (G_OBJECT (options_gui),
+                            "gimp-paint-options-gui-paint-mode-box");
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+dynamics_options_gui (GimpPaintOptions *paint_options,
+                      GType             tool_type)
+{
+  GObject   *config = G_OBJECT (paint_options);
+  GtkWidget *frame;
+  GtkWidget *inner_frame;
+  GtkWidget *scale;
+  GtkWidget *menu;
+  GtkWidget *combo;
+  GtkWidget *checkbox;
+  GtkWidget *vbox;
+  GtkWidget *inner_vbox;
+  GtkWidget *hbox;
+  GtkWidget *box;
+
+  frame = gimp_prop_expander_new (config, "dynamics-expanded", NULL);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  inner_frame = gimp_frame_new (_("Fade Options"));
+  gtk_box_pack_start (GTK_BOX (vbox), inner_frame, FALSE, FALSE, 0);
+  gtk_widget_show (inner_frame);
+
+  inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (inner_frame), inner_vbox);
+  gtk_widget_show (inner_vbox);
+
+  /*  the fade-out scale & unitmenu  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (inner_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  scale = gimp_prop_spin_scale_new (config, "fade-length", NULL,
+                                    1.0, 50.0, 0);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  menu = gimp_prop_unit_combo_box_new (config, "fade-unit");
+  gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
+  gtk_widget_show (menu);
+
+#if 0
+  /* FIXME pixel digits */
+  g_object_set_data (G_OBJECT (menu), "set_digits", spinbutton);
+  gimp_unit_menu_set_pixel_digits (GIMP_UNIT_MENU (menu), 0);
+#endif
+
+  /*  the repeat type  */
+  combo = gimp_prop_enum_combo_box_new (config, "fade-repeat", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Repeat"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  checkbox = gimp_prop_check_button_new (config, "fade-reverse", NULL);
+  gtk_box_pack_start (GTK_BOX (inner_vbox), checkbox, FALSE, FALSE, 0);
+  gtk_widget_show (checkbox);
+
+  /* Color UI */
+  if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
+      tool_type == GIMP_TYPE_SMUDGE_TOOL)
+    {
+      inner_frame = gimp_frame_new (_("Color Options"));
+      gtk_box_pack_start (GTK_BOX (vbox), inner_frame, FALSE, FALSE, 0);
+      gtk_widget_show (inner_frame);
+
+      inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+      gtk_container_add (GTK_CONTAINER (inner_frame), inner_vbox);
+      gtk_widget_show (inner_vbox);
+
+      box = gimp_prop_gradient_box_new (NULL, GIMP_CONTEXT (config),
+                                        _("Gradient"), 2,
+                                        "gradient-view-type",
+                                        "gradient-view-size",
+                                        "gradient-reverse",
+                                        "gradient-blend-color-space",
+                                        "gimp-gradient-editor",
+                                        _("Edit this gradient"));
+      gtk_box_pack_start (GTK_BOX (inner_vbox), box, FALSE, FALSE, 0);
+      gtk_widget_show (box);
+
+      /*  the blend color space  */
+      combo = gimp_prop_enum_combo_box_new (config, "gradient-blend-color-space",
+                                            0, 0);
+      gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo),
+                                    _("Blend Color Space"));
+      g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+      gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0);
+      gtk_widget_show (combo);
+    }
+
+  return frame;
+}
+
+static GtkWidget *
+jitter_options_gui (GimpPaintOptions *paint_options,
+                    GType             tool_type)
+{
+  GObject   *config = G_OBJECT (paint_options);
+  GtkWidget *frame;
+  GtkWidget *scale;
+
+  scale = gimp_prop_spin_scale_new (config, "jitter-amount", NULL,
+                                    0.01, 1.0, 2);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 5.0);
+
+  frame = gimp_prop_expanding_frame_new (config, "use-jitter", NULL,
+                                         scale, NULL);
+
+  return frame;
+}
+
+static GtkWidget *
+smoothing_options_gui (GimpPaintOptions *paint_options,
+                       GType             tool_type)
+{
+  GObject   *config = G_OBJECT (paint_options);
+  GtkWidget *frame;
+  GtkWidget *vbox;
+  GtkWidget *scale;
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+  frame = gimp_prop_expanding_frame_new (config, "use-smoothing", NULL,
+                                         vbox, NULL);
+
+  scale = gimp_prop_spin_scale_new (config, "smoothing-quality", NULL,
+                                    1, 10, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, "smoothing-factor", NULL,
+                                    1, 10, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return frame;
+}
+
+static void
+gimp_paint_options_gui_reset_size (GtkWidget        *button,
+                                   GimpPaintOptions *paint_options)
+{
+  GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    gimp_paint_options_set_default_brush_size (paint_options, brush);
+}
+
+static void
+gimp_paint_options_gui_reset_aspect_ratio (GtkWidget        *button,
+                                           GimpPaintOptions *paint_options)
+{
+  GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    gimp_paint_options_set_default_brush_aspect_ratio (paint_options, brush);
+}
+
+static void
+gimp_paint_options_gui_reset_angle (GtkWidget        *button,
+                                    GimpPaintOptions *paint_options)
+{
+  GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    gimp_paint_options_set_default_brush_angle (paint_options, brush);
+}
+
+static void
+gimp_paint_options_gui_reset_spacing (GtkWidget        *button,
+                                      GimpPaintOptions *paint_options)
+{
+  GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    gimp_paint_options_set_default_brush_spacing (paint_options, brush);
+}
+
+static void
+gimp_paint_options_gui_reset_hardness (GtkWidget        *button,
+                                       GimpPaintOptions *paint_options)
+{
+  GimpBrush *brush = gimp_context_get_brush (GIMP_CONTEXT (paint_options));
+
+  if (brush)
+    gimp_paint_options_set_default_brush_hardness (paint_options, brush);
+}
+
+static void
+gimp_paint_options_gui_reset_force (GtkWidget        *button,
+                                    GimpPaintOptions *paint_options)
+{
+  g_object_set (paint_options,
+                "brush-force", 0.5,
+                NULL);
+}
+
+static GtkWidget *
+gimp_paint_options_gui_scale_with_buttons (GObject      *config,
+                                           gchar        *prop_name,
+                                           gchar        *link_prop_name,
+                                           gchar        *reset_tooltip,
+                                           gdouble       step_increment,
+                                           gdouble       page_increment,
+                                           gint          digits,
+                                           gdouble       scale_min,
+                                           gdouble       scale_max,
+                                           gdouble       factor,
+                                           gdouble       gamma,
+                                           GCallback     reset_callback,
+                                           GtkSizeGroup *link_group)
+{
+  GtkWidget *scale;
+  GtkWidget *hbox;
+  GtkWidget *button;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  scale = gimp_prop_spin_scale_new (config, prop_name, NULL,
+                                    step_increment, page_increment, digits);
+  gimp_spin_scale_set_constrain_drag (GIMP_SPIN_SCALE (scale), TRUE);
+
+  gimp_prop_widget_set_factor (scale, factor,
+                               step_increment, page_increment, digits);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale),
+                                    scale_min, scale_max);
+  gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), gamma);
+  gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+  gtk_widget_show (scale);
+
+  button = gimp_icon_button_new (GIMP_ICON_RESET, NULL);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))),
+                                GIMP_ICON_RESET, GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    reset_callback,
+                    config);
+
+  gimp_help_set_help_data (button,
+                           reset_tooltip, NULL);
+
+  if (link_prop_name)
+    {
+      GtkWidget *image;
+
+      button = gtk_toggle_button_new ();
+      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_LINKED,
+                                            GTK_ICON_SIZE_MENU);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+
+      g_object_bind_property (config, link_prop_name,
+                              button, "active",
+                              G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+    }
+  else
+    {
+      button = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    }
+
+  gtk_size_group_add_widget (link_group, button);
+
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  gimp_help_set_help_data (button,
+                           _("Link to brush default"), NULL);
+
+  return hbox;
+}
diff --git a/app/tools/gimppaintoptions-gui.h b/app/tools/gimppaintoptions-gui.h
new file mode 100644
index 0000000..d747bbe
--- /dev/null
+++ b/app/tools/gimppaintoptions-gui.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_OPTIONS_GUI_H__
+#define __GIMP_PAINT_OPTIONS_GUI_H__
+
+
+GtkWidget * gimp_paint_options_gui                    (GimpToolOptions *tool_options);
+
+GtkWidget * gimp_paint_options_gui_get_paint_mode_box (GtkWidget       *options_gui);
+
+
+#endif /* __GIMP_PAINT_OPTIONS_GUI_H__ */
diff --git a/app/tools/gimppainttool-paint.c b/app/tools/gimppainttool-paint.c
new file mode 100644
index 0000000..88cd526
--- /dev/null
+++ b/app/tools/gimppainttool-paint.c
@@ -0,0 +1,540 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpimage.h"
+#include "core/gimpprojection.h"
+
+#include "paint/gimppaintcore.h"
+#include "paint/gimppaintoptions.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-utils.h"
+
+#include "gimppainttool.h"
+#include "gimppainttool-paint.h"
+
+
+#define DISPLAY_UPDATE_INTERVAL 10000 /* microseconds */
+
+
+#define PAINT_FINISH            NULL
+
+
+typedef struct
+{
+  GimpPaintTool          *paint_tool;
+  GimpPaintToolPaintFunc  func;
+  union
+    {
+      gpointer            data;
+      gboolean           *finished;
+    };
+} PaintItem;
+
+typedef struct
+{
+  GimpCoords coords;
+  guint32    time;
+} InterpolateData;
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_paint_tool_paint_use_thread  (GimpPaintTool   *paint_tool);
+static gpointer   gimp_paint_tool_paint_thread      (gpointer         data);
+
+static gboolean   gimp_paint_tool_paint_timeout     (GimpPaintTool   *paint_tool);
+
+static void       gimp_paint_tool_paint_interpolate (GimpPaintTool   *paint_tool,
+                                                     InterpolateData *data);
+
+
+/*  static variables  */
+
+static GThread           *paint_thread;
+
+static GMutex             paint_mutex;
+static GCond              paint_cond;
+
+static GQueue             paint_queue = G_QUEUE_INIT;
+static GMutex             paint_queue_mutex;
+static GCond              paint_queue_cond;
+
+static guint              paint_timeout_id;
+static volatile gboolean  paint_timeout_pending;
+
+
+/*  private functions  */
+
+
+static gboolean
+gimp_paint_tool_paint_use_thread (GimpPaintTool *paint_tool)
+{
+  if (! paint_tool->draw_line)
+    {
+      if (! paint_thread)
+        {
+          static gint use_paint_thread = -1;
+
+          if (use_paint_thread < 0)
+            use_paint_thread = g_getenv ("GIMP_NO_PAINT_THREAD") == NULL;
+
+          if (use_paint_thread)
+            {
+              paint_thread = g_thread_new ("paint",
+                                           gimp_paint_tool_paint_thread, NULL);
+            }
+        }
+
+      return paint_thread != NULL;
+    }
+
+  return FALSE;
+}
+
+static gpointer
+gimp_paint_tool_paint_thread (gpointer data)
+{
+  g_mutex_lock (&paint_queue_mutex);
+
+  while (TRUE)
+    {
+      PaintItem *item;
+
+      while (! (item = g_queue_pop_head (&paint_queue)))
+        g_cond_wait (&paint_queue_cond, &paint_queue_mutex);
+
+      if (item->func == PAINT_FINISH)
+        {
+          *item->finished = TRUE;
+          g_cond_signal (&paint_queue_cond);
+        }
+      else
+        {
+          g_mutex_unlock (&paint_queue_mutex);
+          g_mutex_lock (&paint_mutex);
+
+          while (paint_timeout_pending)
+            g_cond_wait (&paint_cond, &paint_mutex);
+
+          item->func (item->paint_tool, item->data);
+
+          g_mutex_unlock (&paint_mutex);
+          g_mutex_lock (&paint_queue_mutex);
+        }
+
+      g_slice_free (PaintItem, item);
+    }
+
+  g_mutex_unlock (&paint_queue_mutex);
+
+  return NULL;
+}
+
+static gboolean
+gimp_paint_tool_paint_timeout (GimpPaintTool *paint_tool)
+{
+  GimpPaintCore *core     = paint_tool->core;
+  GimpDrawable  *drawable = paint_tool->drawable;
+  gboolean       update;
+
+  paint_timeout_pending = TRUE;
+
+  g_mutex_lock (&paint_mutex);
+
+  paint_tool->paint_x = core->last_paint.x;
+  paint_tool->paint_y = core->last_paint.y;
+
+  update = gimp_drawable_flush_paint (drawable);
+
+  if (update && GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_flush)
+    GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_flush (paint_tool);
+
+  paint_timeout_pending = FALSE;
+  g_cond_signal (&paint_cond);
+
+  g_mutex_unlock (&paint_mutex);
+
+  if (update)
+    {
+      GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (paint_tool);
+      GimpDisplay  *display   = paint_tool->display;
+      GimpImage    *image     = gimp_display_get_image (display);
+
+      if (paint_tool->snap_brush)
+        gimp_draw_tool_pause (draw_tool);
+
+      gimp_projection_flush_now (gimp_image_get_projection (image), TRUE);
+      gimp_display_flush_now (display);
+
+      if (paint_tool->snap_brush)
+        gimp_draw_tool_resume (draw_tool);
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+gimp_paint_tool_paint_interpolate (GimpPaintTool   *paint_tool,
+                                   InterpolateData *data)
+{
+  GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  GimpPaintCore    *core          = paint_tool->core;
+  GimpDrawable     *drawable      = paint_tool->drawable;
+
+  gimp_paint_core_interpolate (core, drawable, paint_options,
+                               &data->coords, data->time);
+
+  g_slice_free (InterpolateData, data);
+}
+
+
+/*  public functions  */
+
+
+gboolean
+gimp_paint_tool_paint_start (GimpPaintTool     *paint_tool,
+                             GimpDisplay       *display,
+                             const GimpCoords  *coords,
+                             guint32            time,
+                             gboolean           constrain,
+                             GError           **error)
+{
+  GimpTool         *tool;
+  GimpPaintOptions *paint_options;
+  GimpPaintCore    *core;
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  GimpDrawable     *drawable;
+  GimpCoords        curr_coords;
+  gint              off_x, off_y;
+
+  g_return_val_if_fail (GIMP_IS_PAINT_TOOL (paint_tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+  g_return_val_if_fail (paint_tool->display == NULL, FALSE);
+
+  tool          = GIMP_TOOL (paint_tool);
+  paint_tool    = GIMP_PAINT_TOOL (paint_tool);
+  paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  core          = paint_tool->core;
+  shell         = gimp_display_get_shell (display);
+  image         = gimp_display_get_image (display);
+  drawable      = gimp_image_get_active_drawable (image);
+
+  curr_coords = *coords;
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  curr_coords.x -= off_x;
+  curr_coords.y -= off_y;
+
+  paint_tool->paint_x = curr_coords.x;
+  paint_tool->paint_y = curr_coords.y;
+
+  /*  If we use a separate paint thread, enter paint mode before starting the
+   *  paint core
+   */
+  if (gimp_paint_tool_paint_use_thread (paint_tool))
+    gimp_drawable_start_paint (drawable);
+
+  /*  Prepare to start the paint core  */
+  if (GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_prepare)
+    GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_prepare (paint_tool, display);
+
+  /*  Start the paint core  */
+  if (! gimp_paint_core_start (core,
+                               drawable, paint_options, &curr_coords,
+                               error))
+    {
+      gimp_drawable_end_paint (drawable);
+
+      return FALSE;
+    }
+
+  paint_tool->display  = display;
+  paint_tool->drawable = drawable;
+
+  if ((display != tool->display) || ! paint_tool->draw_line)
+    {
+      /*  If this is a new display, reset the "last stroke's endpoint"
+       *  because there is none
+       */
+      if (display != tool->display)
+        core->start_coords = core->cur_coords;
+
+      core->last_coords = core->cur_coords;
+
+      core->distance   = 0.0;
+      core->pixel_dist = 0.0;
+    }
+  else if (paint_tool->draw_line)
+    {
+      gdouble offset_angle;
+      gdouble xres, yres;
+
+      gimp_display_shell_get_constrained_line_params (shell,
+                                                      &offset_angle,
+                                                      &xres, &yres);
+
+      /*  If shift is down and this is not the first paint
+       *  stroke, then draw a line from the last coords to the pointer
+       */
+      gimp_paint_core_round_line (core, paint_options,
+                                  constrain, offset_angle, xres, yres);
+    }
+
+  /*  Notify subclasses  */
+  if (gimp_paint_tool_paint_use_thread (paint_tool) &&
+      GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_start)
+    {
+      GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_start (paint_tool);
+    }
+
+  /*  Let the specific painting function initialize itself  */
+  gimp_paint_core_paint (core, drawable, paint_options,
+                         GIMP_PAINT_STATE_INIT, time);
+
+  /*  Paint to the image  */
+  if (paint_tool->draw_line)
+    {
+      gimp_paint_core_interpolate (core, drawable, paint_options,
+                                   &core->cur_coords, time);
+    }
+  else
+    {
+      gimp_paint_core_paint (core, drawable, paint_options,
+                             GIMP_PAINT_STATE_MOTION, time);
+    }
+
+  gimp_projection_flush_now (gimp_image_get_projection (image), TRUE);
+  gimp_display_flush_now (display);
+
+  /*  Start the display update timeout  */
+  if (gimp_paint_tool_paint_use_thread (paint_tool))
+    {
+      paint_timeout_id = g_timeout_add_full (
+        G_PRIORITY_HIGH_IDLE,
+        DISPLAY_UPDATE_INTERVAL / 1000,
+        (GSourceFunc) gimp_paint_tool_paint_timeout,
+        paint_tool, NULL);
+    }
+
+  return TRUE;
+}
+
+void
+gimp_paint_tool_paint_end (GimpPaintTool *paint_tool,
+                           guint32        time,
+                           gboolean       cancel)
+{
+  GimpPaintOptions *paint_options;
+  GimpPaintCore    *core;
+  GimpDrawable     *drawable;
+
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool));
+  g_return_if_fail (paint_tool->display != NULL);
+
+  paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  core          = paint_tool->core;
+  drawable      = paint_tool->drawable;
+
+  /*  Process remaining paint items  */
+  if (gimp_paint_tool_paint_use_thread (paint_tool))
+    {
+      PaintItem *item;
+      gboolean   finished = FALSE;
+      guint64    end_time;
+
+      g_return_if_fail (gimp_paint_tool_paint_is_active (paint_tool));
+
+      g_source_remove (paint_timeout_id);
+      paint_timeout_id = 0;
+
+      item = g_slice_new (PaintItem);
+
+      item->paint_tool = paint_tool;
+      item->func       = PAINT_FINISH;
+      item->finished   = &finished;
+
+      g_mutex_lock (&paint_queue_mutex);
+
+      g_queue_push_tail (&paint_queue, item);
+      g_cond_signal (&paint_queue_cond);
+
+      end_time = g_get_monotonic_time () + DISPLAY_UPDATE_INTERVAL;
+
+      while (! finished)
+        {
+          if (! g_cond_wait_until (&paint_queue_cond, &paint_queue_mutex,
+                                   end_time))
+            {
+              g_mutex_unlock (&paint_queue_mutex);
+
+              gimp_paint_tool_paint_timeout (paint_tool);
+
+              g_mutex_lock (&paint_queue_mutex);
+
+              end_time = g_get_monotonic_time () + DISPLAY_UPDATE_INTERVAL;
+            }
+        }
+
+      g_mutex_unlock (&paint_queue_mutex);
+    }
+
+  /*  Let the specific painting function finish up  */
+  gimp_paint_core_paint (core, drawable, paint_options,
+                         GIMP_PAINT_STATE_FINISH, time);
+
+  if (cancel)
+    gimp_paint_core_cancel (core, drawable);
+  else
+    gimp_paint_core_finish (core, drawable, TRUE);
+
+  /*  Notify subclasses  */
+  if (gimp_paint_tool_paint_use_thread (paint_tool) &&
+      GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_end)
+    {
+      GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->paint_end (paint_tool);
+    }
+
+  /*  Exit paint mode  */
+  if (gimp_paint_tool_paint_use_thread (paint_tool))
+    gimp_drawable_end_paint (drawable);
+
+  paint_tool->display  = NULL;
+  paint_tool->drawable = NULL;
+}
+
+gboolean
+gimp_paint_tool_paint_is_active (GimpPaintTool *paint_tool)
+{
+  g_return_val_if_fail (GIMP_IS_PAINT_TOOL (paint_tool), FALSE);
+
+  return paint_tool->drawable != NULL &&
+         gimp_drawable_is_painting (paint_tool->drawable);
+}
+
+void
+gimp_paint_tool_paint_push (GimpPaintTool          *paint_tool,
+                            GimpPaintToolPaintFunc  func,
+                            gpointer                data)
+{
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool));
+  g_return_if_fail (func != NULL);
+
+  if (gimp_paint_tool_paint_use_thread (paint_tool))
+    {
+      PaintItem *item;
+
+      g_return_if_fail (gimp_paint_tool_paint_is_active (paint_tool));
+
+      /*  Push an item to the queue, to be processed by the paint thread  */
+
+      item = g_slice_new (PaintItem);
+
+      item->paint_tool = paint_tool;
+      item->func       = func;
+      item->data       = data;
+
+      g_mutex_lock (&paint_queue_mutex);
+
+      g_queue_push_tail (&paint_queue, item);
+      g_cond_signal (&paint_queue_cond);
+
+      g_mutex_unlock (&paint_queue_mutex);
+    }
+  else
+    {
+      GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (paint_tool);
+      GimpDisplay  *display   = paint_tool->display;
+      GimpImage    *image     = gimp_display_get_image (display);
+
+      /*  Paint directly  */
+
+      gimp_draw_tool_pause (draw_tool);
+
+      func (paint_tool, data);
+
+      gimp_projection_flush_now (gimp_image_get_projection (image), TRUE);
+      gimp_display_flush_now (display);
+
+      gimp_draw_tool_resume (draw_tool);
+    }
+}
+
+void
+gimp_paint_tool_paint_motion (GimpPaintTool    *paint_tool,
+                              const GimpCoords *coords,
+                              guint32           time)
+{
+  GimpPaintOptions *paint_options;
+  GimpPaintCore    *core;
+  GimpDrawable     *drawable;
+  InterpolateData  *data;
+  gint              off_x, off_y;
+
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (paint_tool));
+  g_return_if_fail (coords != NULL);
+  g_return_if_fail (paint_tool->display != NULL);
+
+  paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (paint_tool);
+  core          = paint_tool->core;
+  drawable      = paint_tool->drawable;
+
+  data = g_slice_new (InterpolateData);
+
+  data->coords = *coords;
+  data->time   = time;
+
+  gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+  data->coords.x -= off_x;
+  data->coords.y -= off_y;
+
+  paint_tool->cursor_x = data->coords.x;
+  paint_tool->cursor_y = data->coords.y;
+
+  gimp_paint_core_smooth_coords (core, paint_options, &data->coords);
+
+  /*  Don't paint while the Shift key is pressed for line drawing  */
+  if (paint_tool->draw_line)
+    {
+      gimp_paint_core_set_current_coords (core, &data->coords);
+
+      g_slice_free (InterpolateData, data);
+
+      return;
+    }
+
+  gimp_paint_tool_paint_push (
+    paint_tool,
+    (GimpPaintToolPaintFunc) gimp_paint_tool_paint_interpolate,
+    data);
+}
diff --git a/app/tools/gimppainttool-paint.h b/app/tools/gimppainttool-paint.h
new file mode 100644
index 0000000..b3a6b03
--- /dev/null
+++ b/app/tools/gimppainttool-paint.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_TOOL_PAINT_H__
+#define __GIMP_PAINT_TOOL_PAINT_H__
+
+
+typedef void (* GimpPaintToolPaintFunc) (GimpPaintTool *tool,
+                                         gpointer       data);
+
+
+
+gboolean   gimp_paint_tool_paint_start     (GimpPaintTool           *tool,
+                                            GimpDisplay             *display,
+                                            const GimpCoords        *coords,
+                                            guint32                  time,
+                                            gboolean                 constrain,
+                                            GError                 **error);
+void       gimp_paint_tool_paint_end       (GimpPaintTool           *tool,
+                                            guint32                  time,
+                                            gboolean                 cancel);
+
+gboolean   gimp_paint_tool_paint_is_active (GimpPaintTool           *tool);
+
+void       gimp_paint_tool_paint_push      (GimpPaintTool           *tool,
+                                            GimpPaintToolPaintFunc   func,
+                                            gpointer                 data);
+
+void       gimp_paint_tool_paint_motion    (GimpPaintTool           *tool,
+                                            const GimpCoords        *coords,
+                                            guint32                  time);
+
+
+#endif  /*  __GIMP_PAINT_TOOL_PAINT_H__  */
diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c
new file mode 100644
index 0000000..48eb215
--- /dev/null
+++ b/app/tools/gimppainttool.c
@@ -0,0 +1,991 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpdrawable.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimppaintinfo.h"
+#include "core/gimpprojection.h"
+#include "core/gimptoolinfo.h"
+
+#include "paint/gimppaintcore.h"
+#include "paint/gimppaintoptions.h"
+
+#include "widgets/gimpdevices.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-selection.h"
+#include "display/gimpdisplayshell-utils.h"
+
+#include "gimpcoloroptions.h"
+#include "gimppaintoptions-gui.h"
+#include "gimppainttool.h"
+#include "gimppainttool-paint.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_paint_tool_constructed    (GObject               *object);
+static void   gimp_paint_tool_finalize       (GObject               *object);
+
+static void   gimp_paint_tool_control        (GimpTool              *tool,
+                                              GimpToolAction         action,
+                                              GimpDisplay           *display);
+static void   gimp_paint_tool_button_press   (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonPressType    press_type,
+                                              GimpDisplay           *display);
+static void   gimp_paint_tool_button_release (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpButtonReleaseType  release_type,
+                                              GimpDisplay           *display);
+static void   gimp_paint_tool_motion         (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              guint32                time,
+                                              GdkModifierType        state,
+                                              GimpDisplay           *display);
+static void   gimp_paint_tool_modifier_key   (GimpTool              *tool,
+                                              GdkModifierType        key,
+                                              gboolean               press,
+                                              GdkModifierType        state,
+                                              GimpDisplay           *display);
+static void   gimp_paint_tool_cursor_update  (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              GdkModifierType        state,
+                                              GimpDisplay           *display);
+static void   gimp_paint_tool_oper_update    (GimpTool              *tool,
+                                              const GimpCoords      *coords,
+                                              GdkModifierType        state,
+                                              gboolean               proximity,
+                                              GimpDisplay           *display);
+
+static void   gimp_paint_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void
+          gimp_paint_tool_real_paint_prepare (GimpPaintTool         *paint_tool,
+                                              GimpDisplay           *display);
+
+static GimpCanvasItem *
+              gimp_paint_tool_get_outline    (GimpPaintTool         *paint_tool,
+                                              GimpDisplay           *display,
+                                              gdouble                x,
+                                              gdouble                y);
+
+static gboolean  gimp_paint_tool_check_alpha (GimpPaintTool         *paint_tool,
+                                              GimpDrawable          *drawable,
+                                              GimpDisplay           *display,
+                                              GError               **error);
+
+static void   gimp_paint_tool_hard_notify    (GimpPaintOptions      *options,
+                                              const GParamSpec      *pspec,
+                                              GimpPaintTool         *paint_tool);
+static void   gimp_paint_tool_cursor_notify  (GimpDisplayConfig     *config,
+                                              GParamSpec            *pspec,
+                                              GimpPaintTool         *paint_tool);
+
+
+G_DEFINE_TYPE (GimpPaintTool, gimp_paint_tool, GIMP_TYPE_COLOR_TOOL)
+
+#define parent_class gimp_paint_tool_parent_class
+
+
+static void
+gimp_paint_tool_class_init (GimpPaintToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->constructed  = gimp_paint_tool_constructed;
+  object_class->finalize     = gimp_paint_tool_finalize;
+
+  tool_class->control        = gimp_paint_tool_control;
+  tool_class->button_press   = gimp_paint_tool_button_press;
+  tool_class->button_release = gimp_paint_tool_button_release;
+  tool_class->motion         = gimp_paint_tool_motion;
+  tool_class->modifier_key   = gimp_paint_tool_modifier_key;
+  tool_class->cursor_update  = gimp_paint_tool_cursor_update;
+  tool_class->oper_update    = gimp_paint_tool_oper_update;
+
+  draw_tool_class->draw      = gimp_paint_tool_draw;
+
+  klass->paint_prepare       = gimp_paint_tool_real_paint_prepare;
+}
+
+static void
+gimp_paint_tool_init (GimpPaintTool *paint_tool)
+{
+  GimpTool *tool = GIMP_TOOL (paint_tool);
+
+  gimp_tool_control_set_motion_mode    (tool->control, GIMP_MOTION_MODE_EXACT);
+  gimp_tool_control_set_scroll_lock    (tool->control, TRUE);
+  gimp_tool_control_set_action_opacity (tool->control,
+                                        "context/context-opacity-set");
+
+  paint_tool->active        = TRUE;
+  paint_tool->pick_colors   = FALSE;
+  paint_tool->draw_line     = FALSE;
+
+  paint_tool->show_cursor   = TRUE;
+  paint_tool->draw_brush    = TRUE;
+  paint_tool->snap_brush    = FALSE;
+  paint_tool->draw_fallback = FALSE;
+  paint_tool->fallback_size = 0.0;
+  paint_tool->draw_circle   = FALSE;
+  paint_tool->circle_size   = 0.0;
+
+  paint_tool->status      = _("Click to paint");
+  paint_tool->status_line = _("Click to draw the line");
+  paint_tool->status_ctrl = _("%s to pick a color");
+
+  paint_tool->core        = NULL;
+}
+
+static void
+gimp_paint_tool_constructed (GObject *object)
+{
+  GimpTool          *tool       = GIMP_TOOL (object);
+  GimpPaintTool     *paint_tool = GIMP_PAINT_TOOL (object);
+  GimpPaintOptions  *options    = GIMP_PAINT_TOOL_GET_OPTIONS (tool);
+  GimpDisplayConfig *display_config;
+  GimpPaintInfo     *paint_info;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_TOOL_INFO (tool->tool_info));
+  gimp_assert (GIMP_IS_PAINT_INFO (tool->tool_info->paint_info));
+
+  display_config = GIMP_DISPLAY_CONFIG (tool->tool_info->gimp->config);
+
+  paint_info = tool->tool_info->paint_info;
+
+  gimp_assert (g_type_is_a (paint_info->paint_type, GIMP_TYPE_PAINT_CORE));
+
+  paint_tool->core = g_object_new (paint_info->paint_type,
+                                   "undo-desc", paint_info->blurb,
+                                   NULL);
+
+  g_signal_connect_object (options, "notify::hard",
+                           G_CALLBACK (gimp_paint_tool_hard_notify),
+                           paint_tool, 0);
+
+  gimp_paint_tool_hard_notify (options, NULL, paint_tool);
+
+  paint_tool->show_cursor = display_config->show_paint_tool_cursor;
+  paint_tool->draw_brush  = display_config->show_brush_outline;
+  paint_tool->snap_brush  = display_config->snap_brush_outline;
+
+  g_signal_connect_object (display_config, "notify::show-paint-tool-cursor",
+                           G_CALLBACK (gimp_paint_tool_cursor_notify),
+                           paint_tool, 0);
+  g_signal_connect_object (display_config, "notify::show-brush-outline",
+                           G_CALLBACK (gimp_paint_tool_cursor_notify),
+                           paint_tool, 0);
+  g_signal_connect_object (display_config, "notify::snap-brush-outline",
+                           G_CALLBACK (gimp_paint_tool_cursor_notify),
+                           paint_tool, 0);
+}
+
+static void
+gimp_paint_tool_finalize (GObject *object)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (object);
+
+  if (paint_tool->core)
+    {
+      g_object_unref (paint_tool->core);
+      paint_tool->core = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_paint_tool_control (GimpTool       *tool,
+                         GimpToolAction  action,
+                         GimpDisplay    *display)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_paint_core_cleanup (paint_tool->core);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_paint_tool_button_press (GimpTool            *tool,
+                              const GimpCoords    *coords,
+                              guint32              time,
+                              GdkModifierType      state,
+                              GimpButtonPressType  press_type,
+                              GimpDisplay         *display)
+{
+  GimpDrawTool     *draw_tool  = GIMP_DRAW_TOOL (tool);
+  GimpPaintTool    *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpPaintOptions *options    = GIMP_PAINT_TOOL_GET_OPTIONS (tool);
+  GimpGuiConfig    *config     = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpDisplayShell *shell      = gimp_display_get_shell (display);
+  GimpImage        *image      = gimp_display_get_image (display);
+  GimpDrawable     *drawable   = gimp_image_get_active_drawable (image);
+  gboolean          constrain;
+  GError           *error = NULL;
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+      return;
+    }
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("Cannot paint on layer groups."));
+      return;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("The active layer's pixels are locked."));
+      gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+      return;
+    }
+
+  if (! gimp_paint_tool_check_alpha (paint_tool, drawable, display, &error))
+    {
+      GtkWidget *options_gui;
+      GtkWidget *mode_box;
+
+      gimp_tool_message_literal (tool, display, error->message);
+
+      options_gui = gimp_tools_get_tool_options_gui (
+                      GIMP_TOOL_OPTIONS (options));
+      mode_box    = gimp_paint_options_gui_get_paint_mode_box (options_gui);
+
+      if (gtk_widget_is_sensitive (mode_box))
+        gimp_widget_blink (mode_box);
+
+      g_clear_error (&error);
+
+      return;
+    }
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("The active layer is not visible."));
+      return;
+    }
+
+  if (gimp_draw_tool_is_active (draw_tool))
+    gimp_draw_tool_stop (draw_tool);
+
+  if (tool->display            &&
+      tool->display != display &&
+      gimp_display_get_image (tool->display) == image)
+    {
+      /*  if this is a different display, but the same image, HACK around
+       *  in tool internals AFTER stopping the current draw_tool, so
+       *  straight line drawing works across different views of the
+       *  same image.
+       */
+
+      tool->display = display;
+    }
+
+  constrain = (state & gimp_get_constrain_behavior_mask ()) != 0;
+
+  if (! gimp_paint_tool_paint_start (paint_tool,
+                                     display, coords, time, constrain,
+                                     &error))
+    {
+      gimp_tool_message_literal (tool, display, error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  tool->display  = display;
+  tool->drawable = drawable;
+
+  /*  pause the current selection  */
+  gimp_display_shell_selection_pause (shell);
+
+  gimp_draw_tool_start (draw_tool, display);
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_paint_tool_button_release (GimpTool              *tool,
+                                const GimpCoords      *coords,
+                                guint32                time,
+                                GdkModifierType        state,
+                                GimpButtonReleaseType  release_type,
+                                GimpDisplay           *display)
+{
+  GimpPaintTool    *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpDisplayShell *shell      = gimp_display_get_shell (display);
+  GimpImage        *image      = gimp_display_get_image (display);
+  gboolean          cancel;
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time,
+                                                      state, release_type,
+                                                      display);
+      return;
+    }
+
+  cancel = (release_type == GIMP_BUTTON_RELEASE_CANCEL);
+
+  gimp_paint_tool_paint_end (paint_tool, time, cancel);
+
+  gimp_tool_control_halt (tool->control);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  /*  resume the current selection  */
+  gimp_display_shell_selection_resume (shell);
+
+  gimp_image_flush (image);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_paint_tool_motion (GimpTool         *tool,
+                        const GimpCoords *coords,
+                        guint32           time,
+                        GdkModifierType   state,
+                        GimpDisplay      *display)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+
+  GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, display);
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    return;
+
+  if (! paint_tool->snap_brush)
+    gimp_draw_tool_pause  (GIMP_DRAW_TOOL (tool));
+
+  gimp_paint_tool_paint_motion (paint_tool, coords, time);
+
+  if (! paint_tool->snap_brush)
+    gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_paint_tool_modifier_key (GimpTool        *tool,
+                              GdkModifierType  key,
+                              gboolean         press,
+                              GdkModifierType  state,
+                              GimpDisplay     *display)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpDrawTool  *draw_tool  = GIMP_DRAW_TOOL (tool);
+
+  if (paint_tool->pick_colors && ! paint_tool->draw_line)
+    {
+      if ((state & gimp_get_all_modifiers_mask ()) ==
+          gimp_get_constrain_behavior_mask ())
+        {
+          if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+            {
+              GimpToolInfo *info = gimp_get_tool_info (display->gimp,
+                                                       "gimp-color-picker-tool");
+
+              if (GIMP_IS_TOOL_INFO (info))
+                {
+                  if (gimp_draw_tool_is_active (draw_tool))
+                    gimp_draw_tool_stop (draw_tool);
+
+                  gimp_color_tool_enable (GIMP_COLOR_TOOL (tool),
+                                          GIMP_COLOR_OPTIONS (info->tool_options));
+
+                  switch (GIMP_COLOR_TOOL (tool)->pick_target)
+                    {
+                    case GIMP_COLOR_PICK_TARGET_FOREGROUND:
+                      gimp_tool_push_status (tool, display,
+                                             _("Click in any image to pick the "
+                                               "foreground color"));
+                      break;
+
+                    case GIMP_COLOR_PICK_TARGET_BACKGROUND:
+                      gimp_tool_push_status (tool, display,
+                                             _("Click in any image to pick the "
+                                               "background color"));
+                      break;
+
+                    default:
+                      break;
+                    }
+                }
+            }
+        }
+      else
+        {
+          if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+            {
+              gimp_tool_pop_status (tool, display);
+              gimp_color_tool_disable (GIMP_COLOR_TOOL (tool));
+            }
+        }
+    }
+}
+
+static void
+gimp_paint_tool_cursor_update (GimpTool         *tool,
+                               const GimpCoords *coords,
+                               GdkModifierType   state,
+                               GimpDisplay      *display)
+{
+  GimpPaintTool      *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpGuiConfig      *config     = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpCursorModifier  modifier;
+  GimpCursorModifier  toggle_modifier;
+  GimpCursorModifier  old_modifier;
+  GimpCursorModifier  old_toggle_modifier;
+
+  modifier        = tool->control->cursor_modifier;
+  toggle_modifier = tool->control->toggle_cursor_modifier;
+
+  old_modifier        = modifier;
+  old_toggle_modifier = toggle_modifier;
+
+  if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GimpImage    *image    = gimp_display_get_image (display);
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable))               ||
+          gimp_item_is_content_locked (GIMP_ITEM (drawable))                  ||
+          ! gimp_paint_tool_check_alpha (paint_tool, drawable, display, NULL) ||
+          ! (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+             config->edit_non_visible))
+        {
+          modifier        = GIMP_CURSOR_MODIFIER_BAD;
+          toggle_modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+
+      if (! paint_tool->show_cursor &&
+          modifier != GIMP_CURSOR_MODIFIER_BAD)
+        {
+          gimp_tool_set_cursor (tool, display,
+                                GIMP_CURSOR_NONE,
+                                GIMP_TOOL_CURSOR_NONE,
+                                GIMP_CURSOR_MODIFIER_NONE);
+          return;
+        }
+
+      gimp_tool_control_set_cursor_modifier        (tool->control,
+                                                    modifier);
+      gimp_tool_control_set_toggle_cursor_modifier (tool->control,
+                                                    toggle_modifier);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                 display);
+
+  /*  reset old stuff here so we are not interfering with the modifiers
+   *  set by our subclasses
+   */
+  gimp_tool_control_set_cursor_modifier        (tool->control,
+                                                old_modifier);
+  gimp_tool_control_set_toggle_cursor_modifier (tool->control,
+                                                old_toggle_modifier);
+}
+
+static void
+gimp_paint_tool_oper_update (GimpTool         *tool,
+                             const GimpCoords *coords,
+                             GdkModifierType   state,
+                             gboolean          proximity,
+                             GimpDisplay      *display)
+{
+  GimpPaintTool    *paint_tool    = GIMP_PAINT_TOOL (tool);
+  GimpDrawTool     *draw_tool     = GIMP_DRAW_TOOL (tool);
+  GimpPaintOptions *paint_options = GIMP_PAINT_TOOL_GET_OPTIONS (tool);
+  GimpPaintCore    *core          = paint_tool->core;
+  GimpDisplayShell *shell         = gimp_display_get_shell (display);
+  GimpImage        *image         = gimp_display_get_image (display);
+  GimpDrawable     *drawable      = gimp_image_get_active_drawable (image);
+
+  if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)))
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                                   proximity, display);
+      return;
+    }
+
+  gimp_draw_tool_pause (draw_tool);
+
+  if (gimp_draw_tool_is_active (draw_tool) &&
+      draw_tool->display != display)
+    gimp_draw_tool_stop (draw_tool);
+
+  gimp_tool_pop_status (tool, display);
+
+  if (tool->display            &&
+      tool->display != display &&
+      gimp_display_get_image (tool->display) == image)
+    {
+      /*  if this is a different display, but the same image, HACK around
+       *  in tool internals AFTER stopping the current draw_tool, so
+       *  straight line drawing works across different views of the
+       *  same image.
+       */
+
+      tool->display = display;
+    }
+
+  if (drawable && proximity)
+    {
+      gchar    *status;
+      gboolean  constrain_mask = gimp_get_constrain_behavior_mask ();
+      gint      off_x, off_y;
+
+      core->cur_coords = *coords;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      core->cur_coords.x -= off_x;
+      core->cur_coords.y -= off_y;
+
+      if (display == tool->display && (state & GIMP_PAINT_TOOL_LINE_MASK))
+        {
+          /*  If shift is down and this is not the first paint stroke,
+           *  draw a line.
+           */
+          gchar   *status_help;
+          gdouble  offset_angle;
+          gdouble  xres, yres;
+
+          gimp_display_shell_get_constrained_line_params (shell,
+                                                          &offset_angle,
+                                                          &xres, &yres);
+
+          gimp_paint_core_round_line (core, paint_options,
+                                      (state & constrain_mask) != 0,
+                                      offset_angle, xres, yres);
+
+          status_help = gimp_suggest_modifiers (paint_tool->status_line,
+                                                constrain_mask & ~state,
+                                                NULL,
+                                                _("%s for constrained angles"),
+                                                NULL);
+
+          status = gimp_display_shell_get_line_status (shell, status_help,
+                                                       ". ",
+                                                       core->last_coords.x,
+                                                       core->last_coords.y,
+                                                       core->cur_coords.x,
+                                                       core->cur_coords.y);
+          g_free (status_help);
+          paint_tool->draw_line = TRUE;
+        }
+      else
+        {
+          GdkModifierType  modifiers = 0;
+
+          /* HACK: A paint tool may set status_ctrl to NULL to indicate that
+           * it ignores the Ctrl modifier (temporarily or permanently), so
+           * it should not be suggested.  This is different from how
+           * gimp_suggest_modifiers() would interpret this parameter.
+           */
+          if (paint_tool->status_ctrl != NULL)
+            modifiers |= constrain_mask;
+
+          /* suggest drawing lines only after the first point is set
+           */
+          if (display == tool->display)
+            modifiers |= GIMP_PAINT_TOOL_LINE_MASK;
+
+          status = gimp_suggest_modifiers (paint_tool->status,
+                                           modifiers & ~state,
+                                           _("%s for a straight line"),
+                                           paint_tool->status_ctrl,
+                                           NULL);
+          paint_tool->draw_line = FALSE;
+        }
+      gimp_tool_push_status (tool, display, "%s", status);
+      g_free (status);
+
+      paint_tool->cursor_x = core->cur_coords.x;
+      paint_tool->cursor_y = core->cur_coords.y;
+
+      if (! gimp_draw_tool_is_active (draw_tool))
+        gimp_draw_tool_start (draw_tool, display);
+    }
+  else if (gimp_draw_tool_is_active (draw_tool))
+    {
+      gimp_draw_tool_stop (draw_tool);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+
+  gimp_draw_tool_resume (draw_tool);
+}
+
+static void
+gimp_paint_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (draw_tool);
+
+
+  if (paint_tool->active &&
+      ! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (draw_tool)))
+    {
+      GimpPaintCore  *core       = paint_tool->core;
+      GimpImage      *image      = gimp_display_get_image (draw_tool->display);
+      GimpDrawable   *drawable   = gimp_image_get_active_drawable (image);
+      GimpCanvasItem *outline    = NULL;
+      gboolean        line_drawn = FALSE;
+      gdouble         cur_x, cur_y;
+      gint            off_x, off_y;
+
+      gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      if (gimp_paint_tool_paint_is_active (paint_tool) &&
+          paint_tool->snap_brush)
+        {
+          cur_x = paint_tool->paint_x + off_x;
+          cur_y = paint_tool->paint_y + off_y;
+        }
+      else
+        {
+          cur_x = paint_tool->cursor_x + off_x;
+          cur_y = paint_tool->cursor_y + off_y;
+
+          if (paint_tool->draw_line &&
+              ! gimp_tool_control_is_active (GIMP_TOOL (draw_tool)->control))
+            {
+              GimpCanvasGroup *group;
+              gdouble          last_x, last_y;
+
+              last_x = core->last_coords.x + off_x;
+              last_y = core->last_coords.y + off_y;
+
+              group = gimp_draw_tool_add_stroke_group (draw_tool);
+              gimp_draw_tool_push_group (draw_tool, group);
+
+              gimp_draw_tool_add_handle (draw_tool,
+                                         GIMP_HANDLE_CIRCLE,
+                                         last_x, last_y,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_HANDLE_ANCHOR_CENTER);
+
+              gimp_draw_tool_add_line (draw_tool,
+                                       last_x, last_y,
+                                       cur_x, cur_y);
+
+              gimp_draw_tool_add_handle (draw_tool,
+                                         GIMP_HANDLE_CIRCLE,
+                                         cur_x, cur_y,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_HANDLE_ANCHOR_CENTER);
+
+              gimp_draw_tool_pop_group (draw_tool);
+
+              line_drawn = TRUE;
+            }
+        }
+
+      gimp_paint_tool_set_draw_fallback (paint_tool, FALSE, 0.0);
+
+      if (paint_tool->draw_brush)
+        outline = gimp_paint_tool_get_outline (paint_tool,
+                                               draw_tool->display,
+                                               cur_x, cur_y);
+
+      if (outline)
+        {
+          gimp_draw_tool_add_item (draw_tool, outline);
+          g_object_unref (outline);
+        }
+      else if (paint_tool->draw_fallback)
+        {
+          /* Lets make a sensible fallback cursor
+           *
+           * Sensible cursor is
+           *  * crossed to indicate draw point
+           *  * reactive to options alterations
+           *  * not a full circle that would be in the way
+           */
+          gint size = (gint) paint_tool->fallback_size;
+
+#define TICKMARK_ANGLE 48
+#define ROTATION_ANGLE G_PI / 4
+
+          /* marks for indicating full size */
+          gimp_draw_tool_add_arc (draw_tool,
+                                  FALSE,
+                                  cur_x - (size / 2.0),
+                                  cur_y - (size / 2.0),
+                                  size, size,
+                                  ROTATION_ANGLE - (2.0 * G_PI) / (TICKMARK_ANGLE * 2),
+                                  (2.0 * G_PI) / TICKMARK_ANGLE);
+
+          gimp_draw_tool_add_arc (draw_tool,
+                                  FALSE,
+                                  cur_x - (size / 2.0),
+                                  cur_y - (size / 2.0),
+                                  size, size,
+                                  ROTATION_ANGLE + G_PI / 2 - (2.0 * G_PI) / (TICKMARK_ANGLE * 2),
+                                  (2.0 * G_PI) / TICKMARK_ANGLE);
+
+          gimp_draw_tool_add_arc (draw_tool,
+                                  FALSE,
+                                  cur_x - (size / 2.0),
+                                  cur_y - (size / 2.0),
+                                  size, size,
+                                  ROTATION_ANGLE + G_PI - (2.0 * G_PI) / (TICKMARK_ANGLE * 2),
+                                  (2.0 * G_PI) / TICKMARK_ANGLE);
+
+          gimp_draw_tool_add_arc (draw_tool,
+                                  FALSE,
+                                  cur_x - (size / 2.0),
+                                  cur_y - (size / 2.0),
+                                  size, size,
+                                  ROTATION_ANGLE + 3 * G_PI / 2 - (2.0 * G_PI) / (TICKMARK_ANGLE * 2),
+                                  (2.0 * G_PI) / TICKMARK_ANGLE);
+        }
+      else if (paint_tool->draw_circle)
+        {
+          gint size = (gint) paint_tool->circle_size;
+
+          /* draw an indicatory circle */
+          gimp_draw_tool_add_arc (draw_tool,
+                                  FALSE,
+                                  cur_x - (size / 2.0),
+                                  cur_y - (size / 2.0),
+                                  size, size,
+                                  0.0, (2.0 * G_PI));
+        }
+
+      if (! outline                 &&
+          ! line_drawn              &&
+          ! paint_tool->show_cursor &&
+          ! paint_tool->draw_circle)
+        {
+          /*  don't leave the user without any indication and draw
+           *  a fallback crosshair
+           */
+          gimp_draw_tool_add_handle (draw_tool,
+                                     GIMP_HANDLE_CROSSHAIR,
+                                     cur_x, cur_y,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSSHAIR,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSSHAIR,
+                                     GIMP_HANDLE_ANCHOR_CENTER);
+        }
+    }
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+}
+
+static void
+gimp_paint_tool_real_paint_prepare (GimpPaintTool *paint_tool,
+                                    GimpDisplay   *display)
+{
+  GimpDisplayShell *shell = gimp_display_get_shell (display);
+
+  gimp_paint_core_set_show_all (paint_tool->core, shell->show_all);
+}
+
+static GimpCanvasItem *
+gimp_paint_tool_get_outline (GimpPaintTool *paint_tool,
+                             GimpDisplay   *display,
+                             gdouble        x,
+                             gdouble        y)
+{
+  if (GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->get_outline)
+    return GIMP_PAINT_TOOL_GET_CLASS (paint_tool)->get_outline (paint_tool,
+                                                                display, x, y);
+
+  return NULL;
+}
+
+static gboolean
+gimp_paint_tool_check_alpha (GimpPaintTool  *paint_tool,
+                             GimpDrawable   *drawable,
+                             GimpDisplay    *display,
+                             GError        **error)
+{
+  GimpPaintToolClass *klass = GIMP_PAINT_TOOL_GET_CLASS (paint_tool);
+
+  if (klass->is_alpha_only && klass->is_alpha_only (paint_tool, drawable))
+    {
+      if (! gimp_drawable_has_alpha (drawable))
+        {
+          g_set_error_literal (
+            error, GIMP_ERROR, GIMP_FAILED,
+            _("The active layer does not have an alpha channel."));
+
+          return FALSE;
+        }
+
+        if (GIMP_IS_LAYER (drawable) &&
+            gimp_layer_get_lock_alpha (GIMP_LAYER (drawable)))
+        {
+          g_set_error_literal (
+            error, GIMP_ERROR, GIMP_FAILED,
+            _("The active layer's alpha channel is locked."));
+
+          if (error)
+            gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_paint_tool_hard_notify (GimpPaintOptions *options,
+                             const GParamSpec *pspec,
+                             GimpPaintTool    *paint_tool)
+{
+  if (paint_tool->active)
+    {
+      GimpTool *tool = GIMP_TOOL (paint_tool);
+
+      gimp_tool_control_set_precision (tool->control,
+                                       options->hard ?
+                                       GIMP_CURSOR_PRECISION_PIXEL_CENTER :
+                                       GIMP_CURSOR_PRECISION_SUBPIXEL);
+    }
+}
+
+static void
+gimp_paint_tool_cursor_notify (GimpDisplayConfig *config,
+                               GParamSpec        *pspec,
+                               GimpPaintTool     *paint_tool)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (paint_tool));
+
+  paint_tool->show_cursor = config->show_paint_tool_cursor;
+  paint_tool->draw_brush  = config->show_brush_outline;
+  paint_tool->snap_brush  = config->snap_brush_outline;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (paint_tool));
+}
+
+void
+gimp_paint_tool_set_active (GimpPaintTool *tool,
+                            gboolean       active)
+{
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (tool));
+
+  if (active != tool->active)
+    {
+      GimpPaintOptions *options = GIMP_PAINT_TOOL_GET_OPTIONS (tool);
+
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+      tool->active = active;
+
+      if (active)
+        gimp_paint_tool_hard_notify (options, NULL, tool);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+}
+
+/**
+ * gimp_paint_tool_enable_color_picker:
+ * @tool:   a #GimpPaintTool
+ * @target: the #GimpColorPickTarget to set
+ *
+ * This is a convenience function used from the init method of paint
+ * tools that want the color picking functionality. The @mode that is
+ * set here is used to decide what cursor modifier to draw and if the
+ * picked color goes to the foreground or background color.
+ **/
+void
+gimp_paint_tool_enable_color_picker (GimpPaintTool       *tool,
+                                     GimpColorPickTarget  target)
+{
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (tool));
+
+  tool->pick_colors = TRUE;
+
+  GIMP_COLOR_TOOL (tool)->pick_target = target;
+}
+
+void
+gimp_paint_tool_set_draw_fallback (GimpPaintTool *tool,
+                                   gboolean       draw_fallback,
+                                   gint           fallback_size)
+{
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (tool));
+
+  tool->draw_fallback = draw_fallback;
+  tool->fallback_size = fallback_size;
+}
+
+void
+gimp_paint_tool_set_draw_circle (GimpPaintTool *tool,
+                                 gboolean       draw_circle,
+                                 gint           circle_size)
+{
+  g_return_if_fail (GIMP_IS_PAINT_TOOL (tool));
+
+  tool->draw_circle = draw_circle;
+  tool->circle_size = circle_size;
+}
diff --git a/app/tools/gimppainttool.h b/app/tools/gimppainttool.h
new file mode 100644
index 0000000..faaf9c7
--- /dev/null
+++ b/app/tools/gimppainttool.h
@@ -0,0 +1,109 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PAINT_TOOL_H__
+#define __GIMP_PAINT_TOOL_H__
+
+
+#include "gimpcolortool.h"
+
+
+#define GIMP_PAINT_TOOL_LINE_MASK (gimp_get_extend_selection_mask ())
+
+
+#define GIMP_TYPE_PAINT_TOOL            (gimp_paint_tool_get_type ())
+#define GIMP_PAINT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PAINT_TOOL, GimpPaintTool))
+#define GIMP_PAINT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PAINT_TOOL, GimpPaintToolClass))
+#define GIMP_IS_PAINT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PAINT_TOOL))
+#define GIMP_IS_PAINT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PAINT_TOOL))
+#define GIMP_PAINT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINT_TOOL, GimpPaintToolClass))
+
+#define GIMP_PAINT_TOOL_GET_OPTIONS(t)  (GIMP_PAINT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpPaintToolClass GimpPaintToolClass;
+
+struct _GimpPaintTool
+{
+  GimpColorTool  parent_instance;
+
+  gboolean       active;
+  gboolean       pick_colors;  /*  pick color if ctrl is pressed   */
+  gboolean       draw_line;
+
+  gboolean       show_cursor;
+  gboolean       draw_brush;
+  gboolean       snap_brush;
+  gboolean       draw_fallback;
+  gint           fallback_size;
+  gboolean       draw_circle;
+  gint           circle_size;
+
+  const gchar   *status;       /* status message */
+  const gchar   *status_line;  /* status message when drawing a line */
+  const gchar   *status_ctrl;  /* additional message for the ctrl modifier */
+
+  GimpPaintCore *core;
+
+  GimpDisplay   *display;
+  GimpDrawable  *drawable;
+
+  gdouble        cursor_x;
+  gdouble        cursor_y;
+
+  gdouble        paint_x;
+  gdouble        paint_y;
+};
+
+struct _GimpPaintToolClass
+{
+  GimpColorToolClass  parent_class;
+
+  void             (* paint_prepare) (GimpPaintTool *paint_tool,
+                                      GimpDisplay   *display);
+  void             (* paint_start)   (GimpPaintTool *paint_tool);
+  void             (* paint_end)     (GimpPaintTool *paint_tool);
+  void             (* paint_flush)   (GimpPaintTool *paint_tool);
+
+  GimpCanvasItem * (* get_outline)   (GimpPaintTool *paint_tool,
+                                      GimpDisplay   *display,
+                                      gdouble        x,
+                                      gdouble        y);
+
+  gboolean         (* is_alpha_only) (GimpPaintTool *paint_tool,
+                                      GimpDrawable  *drawable);
+};
+
+
+GType   gimp_paint_tool_get_type            (void) G_GNUC_CONST;
+
+void    gimp_paint_tool_set_active          (GimpPaintTool       *tool,
+                                             gboolean             active);
+
+void    gimp_paint_tool_enable_color_picker (GimpPaintTool       *tool,
+                                             GimpColorPickTarget  target);
+
+void    gimp_paint_tool_set_draw_fallback   (GimpPaintTool       *tool,
+                                             gboolean             draw_fallback,
+                                             gint                 fallback_size);
+
+void    gimp_paint_tool_set_draw_circle     (GimpPaintTool       *tool,
+                                             gboolean             draw_circle,
+                                             gint                 circle_size);
+
+
+#endif  /*  __GIMP_PAINT_TOOL_H__  */
diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c
new file mode 100644
index 0000000..70dd1ce
--- /dev/null
+++ b/app/tools/gimppenciltool.c
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimppenciloptions.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "gimppenciltool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+G_DEFINE_TYPE (GimpPencilTool, gimp_pencil_tool, GIMP_TYPE_PAINTBRUSH_TOOL)
+
+
+void
+gimp_pencil_tool_register (GimpToolRegisterCallback  callback,
+                           gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_PENCIL_TOOL,
+                GIMP_TYPE_PENCIL_OPTIONS,
+                gimp_paint_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_GRADIENT,
+                "gimp-pencil-tool",
+                _("Pencil"),
+                _("Pencil Tool: Hard edge painting using a brush"),
+                N_("Pe_ncil"), "N",
+                NULL, GIMP_HELP_TOOL_PENCIL,
+                GIMP_ICON_TOOL_PENCIL,
+                data);
+}
+
+static void
+gimp_pencil_tool_class_init (GimpPencilToolClass *klass)
+{
+}
+
+static void
+gimp_pencil_tool_init (GimpPencilTool *pencil)
+{
+  GimpTool *tool = GIMP_TOOL (pencil);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_PENCIL);
+}
diff --git a/app/tools/gimppenciltool.h b/app/tools/gimppenciltool.h
new file mode 100644
index 0000000..2e9b316
--- /dev/null
+++ b/app/tools/gimppenciltool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PENCIL_TOOL_H__
+#define __GIMP_PENCIL_TOOL_H__
+
+
+#include "gimppaintbrushtool.h"
+
+
+#define GIMP_TYPE_PENCIL_TOOL            (gimp_pencil_tool_get_type ())
+#define GIMP_PENCIL_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PENCIL_TOOL, GimpPencilTool))
+#define GIMP_PENCIL_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PENCIL_TOOL, GimpPencilToolClass))
+#define GIMP_IS_PENCIL_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PENCIL_TOOL))
+#define GIMP_IS_PENCIL_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PENCIL_TOOL))
+#define GIMP_PENCIL_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL_TOOL, GimpPencilToolClass))
+
+
+typedef struct _GimpPencilTool      GimpPencilTool;
+typedef struct _GimpPencilToolClass GimpPencilToolClass;
+
+struct _GimpPencilTool
+{
+  GimpPaintbrushTool parent_instance;
+};
+
+struct _GimpPencilToolClass
+{
+  GimpPaintbrushToolClass parent_class;
+};
+
+
+void    gimp_pencil_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data);
+
+GType   gimp_pencil_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PENCIL_TOOL_H__  */
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
new file mode 100644
index 0000000..ff57634
--- /dev/null
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -0,0 +1,913 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpimage.h"
+
+#include "paint/gimpperspectiveclone.h"
+#include "paint/gimpperspectivecloneoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasgroup.h"
+#include "display/gimpdisplay.h"
+#include "display/gimptooltransformgrid.h"
+
+#include "gimpperspectiveclonetool.h"
+#include "gimpcloneoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+/*  index into trans_info array  */
+enum
+{
+  X0,
+  Y0,
+  X1,
+  Y1,
+  X2,
+  Y2,
+  X3,
+  Y3,
+  PIVOT_X,
+  PIVOT_Y
+};
+
+
+static void     gimp_perspective_clone_tool_constructed    (GObject          *object);
+
+static gboolean gimp_perspective_clone_tool_initialize     (GimpTool         *tool,
+                                                            GimpDisplay      *display,
+                                                            GError          **error);
+
+static gboolean gimp_perspective_clone_tool_has_display    (GimpTool         *tool,
+                                                            GimpDisplay      *display);
+static GimpDisplay *
+                gimp_perspective_clone_tool_has_image      (GimpTool         *tool,
+                                                            GimpImage        *image);
+static void     gimp_perspective_clone_tool_control        (GimpTool         *tool,
+                                                            GimpToolAction    action,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_button_press   (GimpTool         *tool,
+                                                            const GimpCoords *coords,
+                                                            guint32           time,
+                                                            GdkModifierType   state,
+                                                            GimpButtonPressType  press_type,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_button_release (GimpTool         *tool,
+                                                            const GimpCoords *coords,
+                                                            guint32           time,
+                                                            GdkModifierType   state,
+                                                            GimpButtonReleaseType  release_type,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_motion         (GimpTool         *tool,
+                                                            const GimpCoords *coords,
+                                                            guint32           time,
+                                                            GdkModifierType   state,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_modifier_key   (GimpTool         *tool,
+                                                            GdkModifierType   key,
+                                                            gboolean          press,
+                                                            GdkModifierType   state,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_cursor_update  (GimpTool         *tool,
+                                                            const GimpCoords *coords,
+                                                            GdkModifierType   state,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_oper_update    (GimpTool         *tool,
+                                                            const GimpCoords *coords,
+                                                            GdkModifierType   state,
+                                                            gboolean          proximity,
+                                                            GimpDisplay      *display);
+static void     gimp_perspective_clone_tool_options_notify (GimpTool         *tool,
+                                                            GimpToolOptions  *options,
+                                                            const GParamSpec *pspec);
+
+static void     gimp_perspective_clone_tool_draw           (GimpDrawTool             *draw_tool);
+
+static void     gimp_perspective_clone_tool_halt           (GimpPerspectiveCloneTool *clone_tool);
+static void     gimp_perspective_clone_tool_bounds         (GimpPerspectiveCloneTool *clone_tool,
+                                                            GimpDisplay              *display);
+static void     gimp_perspective_clone_tool_prepare        (GimpPerspectiveCloneTool *clone_tool);
+static void     gimp_perspective_clone_tool_recalc_matrix  (GimpPerspectiveCloneTool *clone_tool,
+                                                            GimpToolWidget           *widget);
+
+static void     gimp_perspective_clone_tool_widget_changed (GimpToolWidget           *widget,
+                                                            GimpPerspectiveCloneTool *clone_tool);
+static void     gimp_perspective_clone_tool_widget_status  (GimpToolWidget           *widget,
+                                                            const gchar              *status,
+                                                            GimpPerspectiveCloneTool *clone_tool);
+
+static GtkWidget *
+                gimp_perspective_clone_options_gui         (GimpToolOptions *tool_options);
+
+
+G_DEFINE_TYPE (GimpPerspectiveCloneTool, gimp_perspective_clone_tool,
+               GIMP_TYPE_BRUSH_TOOL)
+
+#define parent_class gimp_perspective_clone_tool_parent_class
+
+
+void
+gimp_perspective_clone_tool_register (GimpToolRegisterCallback  callback,
+                                      gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_PERSPECTIVE_CLONE_TOOL,
+                GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS,
+                gimp_perspective_clone_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_PATTERN,
+                "gimp-perspective-clone-tool",
+                _("Perspective Clone"),
+                _("Perspective Clone Tool: Clone from an image source "
+                  "after applying a perspective transformation"),
+                N_("_Perspective Clone"), NULL,
+                NULL, GIMP_HELP_TOOL_PERSPECTIVE_CLONE,
+                GIMP_ICON_TOOL_PERSPECTIVE_CLONE,
+                data);
+}
+
+static void
+gimp_perspective_clone_tool_class_init (GimpPerspectiveCloneToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->constructed  = gimp_perspective_clone_tool_constructed;
+
+  tool_class->initialize     = gimp_perspective_clone_tool_initialize;
+  tool_class->has_display    = gimp_perspective_clone_tool_has_display;
+  tool_class->has_image      = gimp_perspective_clone_tool_has_image;
+  tool_class->control        = gimp_perspective_clone_tool_control;
+  tool_class->button_press   = gimp_perspective_clone_tool_button_press;
+  tool_class->button_release = gimp_perspective_clone_tool_button_release;
+  tool_class->motion         = gimp_perspective_clone_tool_motion;
+  tool_class->modifier_key   = gimp_perspective_clone_tool_modifier_key;
+  tool_class->cursor_update  = gimp_perspective_clone_tool_cursor_update;
+  tool_class->oper_update    = gimp_perspective_clone_tool_oper_update;
+  tool_class->options_notify = gimp_perspective_clone_tool_options_notify;
+
+  draw_tool_class->draw      = gimp_perspective_clone_tool_draw;
+}
+
+static void
+gimp_perspective_clone_tool_init (GimpPerspectiveCloneTool *clone_tool)
+{
+  GimpTool *tool = GIMP_TOOL (clone_tool);
+
+  gimp_tool_control_set_action_object_2 (tool->control,
+                                         "context/context-pattern-select-set");
+
+  gimp_matrix3_identity (&clone_tool->transform);
+}
+
+static void
+gimp_perspective_clone_tool_constructed (GObject *object)
+{
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    gimp_paint_tool_set_active (GIMP_PAINT_TOOL (object), FALSE);
+}
+
+static gboolean
+gimp_perspective_clone_tool_initialize (GimpTool     *tool,
+                                        GimpDisplay  *display,
+                                        GError      **error)
+{
+  GimpPerspectiveCloneTool *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      return FALSE;
+    }
+
+  if (display != tool->display)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (display);
+      GimpImage        *image = gimp_display_get_image (display);
+      gint              i;
+
+      tool->display  = display;
+      tool->drawable = gimp_image_get_active_drawable (image);
+
+      /*  Find the transform bounds initializing */
+      gimp_perspective_clone_tool_bounds (clone_tool, display);
+
+      gimp_perspective_clone_tool_prepare (clone_tool);
+
+      /*  Recalculate the transform tool  */
+      gimp_perspective_clone_tool_recalc_matrix (clone_tool, NULL);
+
+      clone_tool->widget =
+        gimp_tool_transform_grid_new (shell,
+                                      &clone_tool->transform,
+                                      clone_tool->x1,
+                                      clone_tool->y1,
+                                      clone_tool->x2,
+                                      clone_tool->y2);
+
+      g_object_set (clone_tool->widget,
+                    "pivot-x",                 (clone_tool->x1 + clone_tool->x2) / 2.0,
+                    "pivot-y",                 (clone_tool->y1 + clone_tool->y2) / 2.0,
+                    "inside-function",         GIMP_TRANSFORM_FUNCTION_MOVE,
+                    "outside-function",        GIMP_TRANSFORM_FUNCTION_ROTATE,
+                    "use-corner-handles",      TRUE,
+                    "use-perspective-handles", TRUE,
+                    "use-side-handles",        TRUE,
+                    "use-shear-handles",       TRUE,
+                    "use-pivot-handle",        TRUE,
+                    NULL);
+
+      g_signal_connect (clone_tool->widget, "changed",
+                        G_CALLBACK (gimp_perspective_clone_tool_widget_changed),
+                        clone_tool);
+      g_signal_connect (clone_tool->widget, "status",
+                        G_CALLBACK (gimp_perspective_clone_tool_widget_status),
+                        clone_tool);
+
+      /*  start drawing the bounding box and handles...  */
+      if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+        gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+      gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+
+      /*  Save the current transformation info  */
+      for (i = 0; i < TRANS_INFO_SIZE; i++)
+        clone_tool->old_trans_info[i] = clone_tool->trans_info[i];
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_perspective_clone_tool_has_display (GimpTool    *tool,
+                                         GimpDisplay *display)
+{
+  GimpPerspectiveCloneTool *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+
+  return (display == clone_tool->src_display ||
+          GIMP_TOOL_CLASS (parent_class)->has_display (tool, display));
+}
+
+static GimpDisplay *
+gimp_perspective_clone_tool_has_image (GimpTool  *tool,
+                                       GimpImage *image)
+{
+  GimpPerspectiveCloneTool *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpDisplay              *display;
+
+  display = GIMP_TOOL_CLASS (parent_class)->has_image (tool, image);
+
+  if (! display && clone_tool->src_display)
+    {
+      if (image && gimp_display_get_image (clone_tool->src_display) == image)
+        display = clone_tool->src_display;
+
+      /*  NULL image means any display  */
+      if (! image)
+        display = clone_tool->src_display;
+    }
+
+  return display;
+}
+
+static void
+gimp_perspective_clone_tool_control (GimpTool       *tool,
+                                     GimpToolAction  action,
+                                     GimpDisplay    *display)
+{
+  GimpPerspectiveCloneTool *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_perspective_clone_tool_halt (clone_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_perspective_clone_tool_button_press (GimpTool            *tool,
+                                          const GimpCoords    *coords,
+                                          guint32              time,
+                                          GdkModifierType      state,
+                                          GimpButtonPressType  press_type,
+                                          GimpDisplay         *display)
+{
+  GimpPaintTool               *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpPerspectiveCloneTool    *clone_tool  = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPerspectiveClone        *clone       = GIMP_PERSPECTIVE_CLONE (paint_tool->core);
+  GimpSourceCore              *source_core = GIMP_SOURCE_CORE (clone);
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    {
+      if (clone_tool->widget)
+        {
+          gimp_tool_widget_hover (clone_tool->widget, coords, state, TRUE);
+
+          if (gimp_tool_widget_button_press (clone_tool->widget, coords,
+                                             time, state, press_type))
+            {
+              clone_tool->grab_widget = clone_tool->widget;
+            }
+        }
+
+      gimp_tool_control_activate (tool->control);
+    }
+  else
+    {
+      GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+      gdouble         nnx, nny;
+
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+      if ((state & (toggle_mask | extend_mask)) == toggle_mask)
+        {
+          source_core->set_source = TRUE;
+
+          clone_tool->src_display = display;
+        }
+      else
+        {
+          source_core->set_source = FALSE;
+        }
+
+      GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                    press_type, display);
+
+      /* Set the coordinates for the reference cross */
+      gimp_perspective_clone_get_source_point (clone,
+                                               coords->x, coords->y,
+                                               &nnx, &nny);
+
+      clone_tool->src_x = floor (nnx);
+      clone_tool->src_y = floor (nny);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+}
+
+static void
+gimp_perspective_clone_tool_button_release (GimpTool              *tool,
+                                            const GimpCoords      *coords,
+                                            guint32                time,
+                                            GdkModifierType        state,
+                                            GimpButtonReleaseType  release_type,
+                                            GimpDisplay           *display)
+{
+  GimpPerspectiveCloneTool    *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  switch (options->clone_mode)
+    {
+    case GIMP_PERSPECTIVE_CLONE_MODE_ADJUST:
+      gimp_tool_control_halt (tool->control);
+
+      if (clone_tool->grab_widget)
+        {
+          gimp_tool_widget_button_release (clone_tool->grab_widget,
+                                           coords, time, state, release_type);
+          clone_tool->grab_widget = NULL;
+        }
+      break;
+
+    case GIMP_PERSPECTIVE_CLONE_MODE_PAINT:
+      GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
+                                                      release_type, display);
+      break;
+    }
+}
+
+static void
+gimp_perspective_clone_tool_motion (GimpTool         *tool,
+                                    const GimpCoords *coords,
+                                    guint32           time,
+                                    GdkModifierType   state,
+                                    GimpDisplay      *display)
+{
+  GimpPerspectiveCloneTool    *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPaintTool               *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpPerspectiveClone        *clone      = GIMP_PERSPECTIVE_CLONE (paint_tool->core);
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    {
+      if (clone_tool->grab_widget)
+        {
+          gimp_tool_widget_motion (clone_tool->grab_widget, coords, time, state);
+        }
+    }
+  else if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_PAINT)
+    {
+      gdouble nnx, nny;
+
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+      GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
+                                              display);
+
+      /* Set the coordinates for the reference cross */
+      gimp_perspective_clone_get_source_point (clone,
+                                               coords->x, coords->y,
+                                               &nnx, &nny);
+
+      clone_tool->src_x = floor (nnx);
+      clone_tool->src_y = floor (nny);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+}
+
+static void
+gimp_perspective_clone_tool_modifier_key (GimpTool        *tool,
+                                          GdkModifierType  key,
+                                          gboolean         press,
+                                          GdkModifierType  state,
+                                          GimpDisplay     *display)
+{
+  GimpPerspectiveCloneTool    *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_PAINT &&
+      key == gimp_get_toggle_behavior_mask ())
+    {
+      if (press)
+        {
+          clone_tool->saved_precision =
+            gimp_tool_control_get_precision (tool->control);
+          gimp_tool_control_set_precision (tool->control,
+                                           GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+        }
+      else
+        {
+          gimp_tool_control_set_precision (tool->control,
+                                           clone_tool->saved_precision);
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                display);
+}
+
+static void
+gimp_perspective_clone_tool_cursor_update (GimpTool         *tool,
+                                           const GimpCoords *coords,
+                                           GdkModifierType   state,
+                                           GimpDisplay      *display)
+{
+  GimpPerspectiveCloneTool    *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPerspectiveCloneOptions *options;
+  GimpImage                   *image;
+  GimpToolClass               *tool_class;
+  GimpCursorType               cursor      = GIMP_CURSOR_MOUSE;
+  GimpToolCursorType           tool_cursor = GIMP_TOOL_CURSOR_NONE;
+  GimpCursorModifier           modifier    = GIMP_CURSOR_MODIFIER_NONE;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  image = gimp_display_get_image (display);
+
+  if (gimp_image_coords_in_active_pickable (image, coords,
+                                            FALSE, FALSE, TRUE))
+    {
+      cursor = GIMP_CURSOR_MOUSE;
+    }
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    {
+      if (clone_tool->widget)
+        {
+          if (display == tool->display)
+            {
+              gimp_tool_widget_get_cursor (clone_tool->widget,
+                                           coords, state,
+                                           &cursor, &tool_cursor, &modifier);
+            }
+        }
+    }
+  else
+    {
+      GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      if ((state & (toggle_mask | extend_mask)) == toggle_mask)
+        {
+          cursor = GIMP_CURSOR_CROSSHAIR_SMALL;
+        }
+      else if (! GIMP_SOURCE_CORE (GIMP_PAINT_TOOL (tool)->core)->src_drawable)
+        {
+          modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+
+      tool_cursor = GIMP_TOOL_CURSOR_CLONE;
+    }
+
+  gimp_tool_control_set_cursor          (tool->control, cursor);
+  gimp_tool_control_set_tool_cursor     (tool->control, tool_cursor);
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  /*  If we are in adjust mode, skip the GimpBrushClass when chaining up.
+   *  This ensures that the cursor will be set regardless of
+   *  GimpBrushTool::show_cursor (see bug #354933).
+   */
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    tool_class = GIMP_TOOL_CLASS (g_type_class_peek_parent (parent_class));
+  else
+    tool_class = GIMP_TOOL_CLASS (parent_class);
+
+  tool_class->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_perspective_clone_tool_oper_update (GimpTool         *tool,
+                                         const GimpCoords *coords,
+                                         GdkModifierType   state,
+                                         gboolean          proximity,
+                                         GimpDisplay      *display)
+{
+  GimpPerspectiveCloneTool    *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    {
+      if (clone_tool->widget)
+        {
+          if (display == tool->display)
+            {
+              gimp_tool_widget_hover (clone_tool->widget, coords, state,
+                                      proximity);
+            }
+        }
+    }
+  else
+    {
+      GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                                   proximity, display);
+
+      if (proximity)
+        {
+          GimpPaintCore        *core        = GIMP_PAINT_TOOL (tool)->core;
+          GimpPerspectiveClone *clone       = GIMP_PERSPECTIVE_CLONE (core);
+          GimpSourceCore       *source_core = GIMP_SOURCE_CORE (core);
+
+          if (source_core->src_drawable == NULL)
+            {
+              gimp_tool_replace_status (tool, display,
+                                        _("Ctrl-Click to set a clone source"));
+            }
+          else
+            {
+              gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+              clone_tool->src_x = source_core->src_x;
+              clone_tool->src_y = source_core->src_y;
+
+              if (! source_core->first_stroke)
+                {
+                  if (GIMP_SOURCE_OPTIONS (options)->align_mode ==
+                      GIMP_SOURCE_ALIGN_YES)
+                    {
+                      gdouble nnx, nny;
+
+                      /* Set the coordinates for the reference cross */
+                      gimp_perspective_clone_get_source_point (clone,
+                                                               coords->x,
+                                                               coords->y,
+                                                               &nnx, &nny);
+
+                      clone_tool->src_x = floor (nnx);
+                      clone_tool->src_y = floor (nny);
+                    }
+                }
+
+              gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+            }
+        }
+    }
+}
+
+static void
+gimp_perspective_clone_tool_options_notify (GimpTool         *tool,
+                                            GimpToolOptions  *options,
+                                            const GParamSpec *pspec)
+{
+  GimpPerspectiveCloneTool    *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
+  GimpPaintTool               *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpPerspectiveCloneOptions *clone_options;
+
+  clone_options = GIMP_PERSPECTIVE_CLONE_OPTIONS (options);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! strcmp (pspec->name, "clone-mode"))
+    {
+      GimpPerspectiveClone *clone;
+
+      clone = GIMP_PERSPECTIVE_CLONE (GIMP_PAINT_TOOL (tool)->core);
+
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (clone_tool));
+
+      if (clone_options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_PAINT)
+        {
+          gimp_perspective_clone_set_transform (clone, &clone_tool->transform);
+
+          gimp_paint_tool_set_active (paint_tool, TRUE);
+        }
+      else
+        {
+          gimp_paint_tool_set_active (paint_tool, FALSE);
+
+          gimp_tool_control_set_precision (tool->control,
+                                           GIMP_CURSOR_PRECISION_SUBPIXEL);
+
+          /*  start drawing the bounding box and handles...  */
+          if (tool->display &&
+              ! gimp_draw_tool_is_active (GIMP_DRAW_TOOL (clone_tool)))
+            {
+              gimp_draw_tool_start (GIMP_DRAW_TOOL (clone_tool), tool->display);
+            }
+        }
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (clone_tool));
+    }
+}
+
+static void
+gimp_perspective_clone_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpTool                    *tool        = GIMP_TOOL (draw_tool);
+  GimpPerspectiveCloneTool    *clone_tool  = GIMP_PERSPECTIVE_CLONE_TOOL (draw_tool);
+  GimpPerspectiveClone        *clone       = GIMP_PERSPECTIVE_CLONE (GIMP_PAINT_TOOL (tool)->core);
+  GimpSourceCore              *source_core = GIMP_SOURCE_CORE (clone);
+  GimpPerspectiveCloneOptions *options;
+
+  options = GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS (tool);
+
+  if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
+    {
+      if (clone_tool->widget)
+        {
+          GimpCanvasItem *item = gimp_tool_widget_get_item (clone_tool->widget);
+
+          gimp_draw_tool_add_item (draw_tool, item);
+        }
+    }
+  else
+    {
+      GimpCanvasGroup *stroke_group;
+
+      stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
+
+      /*  draw the bounding box  */
+      gimp_draw_tool_push_group (draw_tool, stroke_group);
+
+      gimp_draw_tool_add_line (draw_tool,
+                               clone_tool->trans_info[X0],
+                               clone_tool->trans_info[Y0],
+                               clone_tool->trans_info[X1],
+                               clone_tool->trans_info[Y1]);
+      gimp_draw_tool_add_line (draw_tool,
+                               clone_tool->trans_info[X1],
+                               clone_tool->trans_info[Y1],
+                               clone_tool->trans_info[X3],
+                               clone_tool->trans_info[Y3]);
+      gimp_draw_tool_add_line (draw_tool,
+                               clone_tool->trans_info[X2],
+                               clone_tool->trans_info[Y2],
+                               clone_tool->trans_info[X3],
+                               clone_tool->trans_info[Y3]);
+      gimp_draw_tool_add_line (draw_tool,
+                               clone_tool->trans_info[X2],
+                               clone_tool->trans_info[Y2],
+                               clone_tool->trans_info[X0],
+                               clone_tool->trans_info[Y0]);
+
+      gimp_draw_tool_pop_group (draw_tool);
+    }
+
+  if (source_core->src_drawable && clone_tool->src_display)
+    {
+      GimpDisplay *tmp_display;
+
+      tmp_display = draw_tool->display;
+      draw_tool->display = clone_tool->src_display;
+
+      gimp_draw_tool_add_handle (draw_tool,
+                                 GIMP_HANDLE_CROSS,
+                                 clone_tool->src_x + 0.5,
+                                 clone_tool->src_y + 0.5,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+
+      draw_tool->display = tmp_display;
+    }
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+}
+
+static void
+gimp_perspective_clone_tool_halt (GimpPerspectiveCloneTool *clone_tool)
+{
+  GimpTool *tool = GIMP_TOOL (clone_tool);
+
+  clone_tool->src_display = NULL;
+
+  g_object_set (GIMP_PAINT_TOOL (tool)->core,
+                "src-drawable", NULL,
+                NULL);
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  g_clear_object (&clone_tool->widget);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+}
+
+static void
+gimp_perspective_clone_tool_bounds (GimpPerspectiveCloneTool *clone_tool,
+                                    GimpDisplay              *display)
+{
+  GimpImage *image = gimp_display_get_image (display);
+
+  clone_tool->x1 = 0;
+  clone_tool->y1 = 0;
+  clone_tool->x2 = gimp_image_get_width  (image);
+  clone_tool->y2 = gimp_image_get_height (image);
+}
+
+static void
+gimp_perspective_clone_tool_prepare (GimpPerspectiveCloneTool *clone_tool)
+{
+  clone_tool->trans_info[PIVOT_X] = (gdouble) (clone_tool->x1 + clone_tool->x2) / 2.0;
+  clone_tool->trans_info[PIVOT_Y] = (gdouble) (clone_tool->y1 + clone_tool->y2) / 2.0;
+
+  clone_tool->trans_info[X0] = clone_tool->x1;
+  clone_tool->trans_info[Y0] = clone_tool->y1;
+  clone_tool->trans_info[X1] = clone_tool->x2;
+  clone_tool->trans_info[Y1] = clone_tool->y1;
+  clone_tool->trans_info[X2] = clone_tool->x1;
+  clone_tool->trans_info[Y2] = clone_tool->y2;
+  clone_tool->trans_info[X3] = clone_tool->x2;
+  clone_tool->trans_info[Y3] = clone_tool->y2;
+}
+
+static void
+gimp_perspective_clone_tool_recalc_matrix (GimpPerspectiveCloneTool *clone_tool,
+                                           GimpToolWidget           *widget)
+{
+  gimp_matrix3_identity (&clone_tool->transform);
+  gimp_transform_matrix_perspective (&clone_tool->transform,
+                                     clone_tool->x1,
+                                     clone_tool->y1,
+                                     clone_tool->x2 - clone_tool->x1,
+                                     clone_tool->y2 - clone_tool->y1,
+                                     clone_tool->trans_info[X0],
+                                     clone_tool->trans_info[Y0],
+                                     clone_tool->trans_info[X1],
+                                     clone_tool->trans_info[Y1],
+                                     clone_tool->trans_info[X2],
+                                     clone_tool->trans_info[Y2],
+                                     clone_tool->trans_info[X3],
+                                     clone_tool->trans_info[Y3]);
+
+  if (widget)
+    g_object_set (widget,
+                  "transform", &clone_tool->transform,
+                  "x1",        (gdouble) clone_tool->x1,
+                  "y1",        (gdouble) clone_tool->y1,
+                  "x2",        (gdouble) clone_tool->x2,
+                  "y2",        (gdouble) clone_tool->y2,
+                  "pivot-x",   clone_tool->trans_info[PIVOT_X],
+                  "pivot-y",   clone_tool->trans_info[PIVOT_Y],
+                  NULL);
+}
+
+static void
+gimp_perspective_clone_tool_widget_changed (GimpToolWidget           *widget,
+                                            GimpPerspectiveCloneTool *clone_tool)
+{
+  GimpMatrix3 *transform;
+
+  g_object_get (widget,
+                "transform", &transform,
+                "pivot-x",   &clone_tool->trans_info[PIVOT_X],
+                "pivot-y",   &clone_tool->trans_info[PIVOT_Y],
+                NULL);
+
+  gimp_matrix3_transform_point (transform,
+                                clone_tool->x1, clone_tool->y1,
+                                &clone_tool->trans_info[X0],
+                                &clone_tool->trans_info[Y0]);
+  gimp_matrix3_transform_point (transform,
+                                clone_tool->x2, clone_tool->y1,
+                                &clone_tool->trans_info[X1],
+                                &clone_tool->trans_info[Y1]);
+  gimp_matrix3_transform_point (transform,
+                                clone_tool->x1, clone_tool->y2,
+                                &clone_tool->trans_info[X2],
+                                &clone_tool->trans_info[Y2]);
+  gimp_matrix3_transform_point (transform,
+                                clone_tool->x2, clone_tool->y2,
+                                &clone_tool->trans_info[X3],
+                                &clone_tool->trans_info[Y3]);
+
+  g_free (transform);
+
+  gimp_perspective_clone_tool_recalc_matrix (clone_tool, NULL);
+}
+
+static void
+gimp_perspective_clone_tool_widget_status (GimpToolWidget           *widget,
+                                           const gchar              *status,
+                                           GimpPerspectiveCloneTool *clone_tool)
+{
+  GimpTool *tool = GIMP_TOOL (clone_tool);
+
+  if (status)
+    {
+      gimp_tool_replace_status (tool, tool->display, "%s", status);
+    }
+  else
+    {
+      gimp_tool_pop_status (tool, tool->display);
+    }
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_perspective_clone_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_clone_options_gui (tool_options);
+  GtkWidget *mode;
+
+  /* radio buttons to set if you are modifying the perspective plane
+   * or painting
+   */
+  mode = gimp_prop_enum_radio_box_new (config, "clone-mode", 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), mode, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (vbox), mode, 0);
+  gtk_widget_show (mode);
+
+  return vbox;
+}
diff --git a/app/tools/gimpperspectiveclonetool.h b/app/tools/gimpperspectiveclonetool.h
new file mode 100644
index 0000000..d0c4697
--- /dev/null
+++ b/app/tools/gimpperspectiveclonetool.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PERSPECTIVE_CLONE_TOOL_H__
+#define __GIMP_PERSPECTIVE_CLONE_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+#include "gimptransformtool.h"  /* for TransInfo */
+
+
+#define GIMP_TYPE_PERSPECTIVE_CLONE_TOOL            (gimp_perspective_clone_tool_get_type ())
+#define GIMP_PERSPECTIVE_CLONE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_TOOL, GimpPerspectiveCloneTool))
+#define GIMP_PERSPECTIVE_CLONE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PERSPECTIVE_CLONE_TOOL, GimpPerspectiveCloneToolClass))
+#define GIMP_IS_PERSPECTIVE_CLONE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_TOOL))
+#define GIMP_IS_PERSPECTIVE_CLONE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PERSPECTIVE_CLONE_TOOL))
+#define GIMP_PERSPECTIVE_CLONE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_TOOL, GimpPerspectiveCloneToolClass))
+
+#define GIMP_PERSPECTIVE_CLONE_TOOL_GET_OPTIONS(t)  (GIMP_PERSPECTIVE_CLONE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpPerspectiveCloneTool      GimpPerspectiveCloneTool;
+typedef struct _GimpPerspectiveCloneToolClass GimpPerspectiveCloneToolClass;
+
+struct _GimpPerspectiveCloneTool
+{
+  GimpBrushTool        parent_instance;
+
+  GimpDisplay         *src_display;
+  gint                 src_x;
+  gint                 src_y;
+
+  GimpMatrix3          transform;      /*  transformation matrix            */
+  TransInfo            trans_info;     /*  transformation info              */
+  TransInfo            old_trans_info; /*  for cancelling a drag operation  */
+
+  gint                 x1, y1;         /*  upper left hand coordinate       */
+  gint                 x2, y2;         /*  lower right hand coords          */
+
+  GimpCursorPrecision  saved_precision;
+
+  GimpToolWidget      *widget;
+  GimpToolWidget      *grab_widget;
+};
+
+struct _GimpPerspectiveCloneToolClass
+{
+  GimpBrushToolClass  parent_class;
+};
+
+
+void    gimp_perspective_clone_tool_register (GimpToolRegisterCallback  callback,
+                                              gpointer                  data);
+
+GType   gimp_perspective_clone_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PERSPECTIVE_CLONE_TOOL_H__  */
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
new file mode 100644
index 0000000..c6f7a5d
--- /dev/null
+++ b/app/tools/gimpperspectivetool.c
@@ -0,0 +1,292 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptooltransformgrid.h"
+
+#include "gimpperspectivetool.h"
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+
+#include "gimp-intl.h"
+
+
+/*  index into trans_info array  */
+enum
+{
+  X0,
+  Y0,
+  X1,
+  Y1,
+  X2,
+  Y2,
+  X3,
+  Y3
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_perspective_tool_matrix_to_info (GimpTransformGridTool    *tg_tool,
+                                                              const GimpMatrix3        *transform);
+static void             gimp_perspective_tool_prepare        (GimpTransformGridTool    *tg_tool);
+static void             gimp_perspective_tool_readjust       (GimpTransformGridTool    *tg_tool);
+static GimpToolWidget * gimp_perspective_tool_get_widget     (GimpTransformGridTool    *tg_tool);
+static void             gimp_perspective_tool_update_widget  (GimpTransformGridTool    *tg_tool);
+static void             gimp_perspective_tool_widget_changed (GimpTransformGridTool    *tg_tool);
+
+static void             gimp_perspective_tool_info_to_points (GimpGenericTransformTool *generic);
+
+
+G_DEFINE_TYPE (GimpPerspectiveTool, gimp_perspective_tool,
+               GIMP_TYPE_GENERIC_TRANSFORM_TOOL)
+
+#define parent_class gimp_perspective_tool_parent_class
+
+
+void
+gimp_perspective_tool_register (GimpToolRegisterCallback  callback,
+                                gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_PERSPECTIVE_TOOL,
+                GIMP_TYPE_TRANSFORM_GRID_OPTIONS,
+                gimp_transform_grid_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-perspective-tool",
+                _("Perspective"),
+                _("Perspective Tool: "
+                  "Change perspective of the layer, selection or path"),
+                N_("_Perspective"), "<shift>P",
+                NULL, GIMP_HELP_TOOL_PERSPECTIVE,
+                GIMP_ICON_TOOL_PERSPECTIVE,
+                data);
+}
+
+static void
+gimp_perspective_tool_class_init (GimpPerspectiveToolClass *klass)
+{
+  GimpTransformToolClass        *tr_class      = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass    *tg_class      = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+  GimpGenericTransformToolClass *generic_class = GIMP_GENERIC_TRANSFORM_TOOL_CLASS (klass);
+
+  tg_class->matrix_to_info      = gimp_perspective_tool_matrix_to_info;
+  tg_class->prepare             = gimp_perspective_tool_prepare;
+  tg_class->readjust            = gimp_perspective_tool_readjust;
+  tg_class->get_widget          = gimp_perspective_tool_get_widget;
+  tg_class->update_widget       = gimp_perspective_tool_update_widget;
+  tg_class->widget_changed      = gimp_perspective_tool_widget_changed;
+
+  generic_class->info_to_points = gimp_perspective_tool_info_to_points;
+
+  tr_class->undo_desc           = C_("undo-type", "Perspective");
+  tr_class->progress_text       = _("Perspective transformation");
+}
+
+static void
+gimp_perspective_tool_init (GimpPerspectiveTool *perspective_tool)
+{
+  GimpTool *tool = GIMP_TOOL (perspective_tool);
+
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_PERSPECTIVE);
+}
+
+static void
+gimp_perspective_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                      const GimpMatrix3     *transform)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1,
+                                tr_tool->y1,
+                                &tg_tool->trans_info[X0],
+                                &tg_tool->trans_info[Y0]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2,
+                                tr_tool->y1,
+                                &tg_tool->trans_info[X1],
+                                &tg_tool->trans_info[Y1]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1,
+                                tr_tool->y2,
+                                &tg_tool->trans_info[X2],
+                                &tg_tool->trans_info[Y2]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2,
+                                tr_tool->y2,
+                                &tg_tool->trans_info[X3],
+                                &tg_tool->trans_info[Y3]);
+}
+
+static void
+gimp_perspective_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->prepare (tg_tool);
+
+  tg_tool->trans_info[X0] = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y0] = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X1] = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y1] = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X2] = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y2] = (gdouble) tr_tool->y2;
+  tg_tool->trans_info[X3] = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y3] = (gdouble) tr_tool->y2;
+}
+
+static void
+gimp_perspective_tool_readjust (GimpTransformGridTool *tg_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (tg_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+  gdouble           x;
+  gdouble           y;
+  gdouble           r;
+
+  x = shell->disp_width  / 2.0;
+  y = shell->disp_height / 2.0;
+  r = MAX (MIN (x, y) / G_SQRT2 -
+           GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE / 2.0,
+           GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE / 2.0);
+
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x - r, y - r,
+                                       &tg_tool->trans_info[X0],
+                                       &tg_tool->trans_info[Y0]);
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x + r, y - r,
+                                       &tg_tool->trans_info[X1],
+                                       &tg_tool->trans_info[Y1]);
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x - r, y + r,
+                                       &tg_tool->trans_info[X2],
+                                       &tg_tool->trans_info[Y2]);
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x + r, y + r,
+                                       &tg_tool->trans_info[X3],
+                                       &tg_tool->trans_info[Y3]);
+}
+
+static GimpToolWidget *
+gimp_perspective_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget    *widget;
+
+  widget = gimp_tool_transform_grid_new (shell,
+                                         &tr_tool->transform,
+                                         tr_tool->x1,
+                                         tr_tool->y1,
+                                         tr_tool->x2,
+                                         tr_tool->y2);
+
+  g_object_set (widget,
+                "inside-function",         GIMP_TRANSFORM_FUNCTION_PERSPECTIVE,
+                "outside-function",        GIMP_TRANSFORM_FUNCTION_PERSPECTIVE,
+                "use-perspective-handles", TRUE,
+                "use-center-handle",       TRUE,
+                NULL);
+
+  return widget;
+}
+
+static void
+gimp_perspective_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  g_object_set (tg_tool->widget,
+                "x1", (gdouble) tr_tool->x1,
+                "y1", (gdouble) tr_tool->y1,
+                "x2", (gdouble) tr_tool->x2,
+                "y2", (gdouble) tr_tool->y2,
+                NULL);
+}
+
+static void
+gimp_perspective_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpMatrix3       *transform;
+
+  g_object_get (tg_tool->widget,
+                "transform", &transform,
+                NULL);
+
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1, tr_tool->y1,
+                                &tg_tool->trans_info[X0],
+                                &tg_tool->trans_info[Y0]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2, tr_tool->y1,
+                                &tg_tool->trans_info[X1],
+                                &tg_tool->trans_info[Y1]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1, tr_tool->y2,
+                                &tg_tool->trans_info[X2],
+                                &tg_tool->trans_info[Y2]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2, tr_tool->y2,
+                                &tg_tool->trans_info[X3],
+                                &tg_tool->trans_info[Y3]);
+
+  g_free (transform);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+gimp_perspective_tool_info_to_points (GimpGenericTransformTool *generic)
+{
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (generic);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (generic);
+
+  generic->input_points[0]  = (GimpVector2) {tr_tool->x1, tr_tool->y1};
+  generic->input_points[1]  = (GimpVector2) {tr_tool->x2, tr_tool->y1};
+  generic->input_points[2]  = (GimpVector2) {tr_tool->x1, tr_tool->y2};
+  generic->input_points[3]  = (GimpVector2) {tr_tool->x2, tr_tool->y2};
+
+  generic->output_points[0] = (GimpVector2) {tg_tool->trans_info[X0],
+                                             tg_tool->trans_info[Y0]};
+  generic->output_points[1] = (GimpVector2) {tg_tool->trans_info[X1],
+                                             tg_tool->trans_info[Y1]};
+  generic->output_points[2] = (GimpVector2) {tg_tool->trans_info[X2],
+                                             tg_tool->trans_info[Y2]};
+  generic->output_points[3] = (GimpVector2) {tg_tool->trans_info[X3],
+                                             tg_tool->trans_info[Y3]};
+}
diff --git a/app/tools/gimpperspectivetool.h b/app/tools/gimpperspectivetool.h
new file mode 100644
index 0000000..b037747
--- /dev/null
+++ b/app/tools/gimpperspectivetool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PERSPECTIVE_TOOL_H__
+#define __GIMP_PERSPECTIVE_TOOL_H__
+
+
+#include "gimpgenerictransformtool.h"
+
+
+#define GIMP_TYPE_PERSPECTIVE_TOOL            (gimp_perspective_tool_get_type ())
+#define GIMP_PERSPECTIVE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PERSPECTIVE_TOOL, GimpPerspectiveTool))
+#define GIMP_PERSPECTIVE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PERSPECTIVE_TOOL, GimpPerspectiveToolClass))
+#define GIMP_IS_PERSPECTIVE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PERSPECTIVE_TOOL))
+#define GIMP_IS_PERSPECTIVE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PERSPECTIVE_TOOL))
+#define GIMP_PERSPECTIVE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_TOOL, GimpPerspectiveToolClass))
+
+
+typedef struct _GimpPerspectiveTool      GimpPerspectiveTool;
+typedef struct _GimpPerspectiveToolClass GimpPerspectiveToolClass;
+
+struct _GimpPerspectiveTool
+{
+  GimpGenericTransformTool  parent_instance;
+};
+
+struct _GimpPerspectiveToolClass
+{
+  GimpGenericTransformToolClass  parent_class;
+};
+
+
+void    gimp_perspective_tool_register (GimpToolRegisterCallback  callback,
+                                        gpointer                  data);
+
+GType   gimp_perspective_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_PERSPECTIVE_TOOL_H__  */
diff --git a/app/tools/gimppolygonselecttool.c b/app/tools/gimppolygonselecttool.c
new file mode 100644
index 0000000..878e226
--- /dev/null
+++ b/app/tools/gimppolygonselecttool.c
@@ -0,0 +1,555 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Major improvement to support polygonal segments
+ * Copyright (C) 2008 Martin Nordholts
+ *
+ * This program is polygon software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Polygon Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-floating-selection.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolpolygon.h"
+
+#include "gimppolygonselecttool.h"
+#include "gimpselectionoptions.h"
+#include "gimptoolcontrol.h"
+
+
+struct _GimpPolygonSelectToolPrivate
+{
+  GimpToolWidget *widget;
+  GimpToolWidget *grab_widget;
+
+  gboolean        pending_response;
+  gint            pending_response_id;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_polygon_select_tool_finalize                (GObject               *object);
+
+static void       gimp_polygon_select_tool_control                 (GimpTool              *tool,
+                                                                    GimpToolAction         action,
+                                                                    GimpDisplay           *display);
+static void       gimp_polygon_select_tool_button_press            (GimpTool              *tool,
+                                                                    const GimpCoords      *coords,
+                                                                    guint32                time,
+                                                                    GdkModifierType        state,
+                                                                    GimpButtonPressType    press_type,
+                                                                    GimpDisplay           *display);
+static void       gimp_polygon_select_tool_button_release          (GimpTool              *tool,
+                                                                    const GimpCoords      *coords,
+                                                                    guint32                time,
+                                                                    GdkModifierType        state,
+                                                                    GimpButtonReleaseType  release_type,
+                                                                    GimpDisplay           *display);
+static void       gimp_polygon_select_tool_motion                  (GimpTool              *tool,
+                                                                    const GimpCoords      *coords,
+                                                                    guint32                time,
+                                                                    GdkModifierType        state,
+                                                                    GimpDisplay           *display);
+static gboolean   gimp_polygon_select_tool_key_press               (GimpTool              *tool,
+                                                                    GdkEventKey           *kevent,
+                                                                    GimpDisplay           *display);
+static void       gimp_polygon_select_tool_modifier_key            (GimpTool              *tool,
+                                                                    GdkModifierType        key,
+                                                                    gboolean               press,
+                                                                    GdkModifierType        state,
+                                                                    GimpDisplay           *display);
+static void       gimp_polygon_select_tool_oper_update             (GimpTool              *tool,
+                                                                    const GimpCoords      *coords,
+                                                                    GdkModifierType        state,
+                                                                    gboolean               proximity,
+                                                                    GimpDisplay           *display);
+static void       gimp_polygon_select_tool_cursor_update           (GimpTool              *tool,
+                                                                    const GimpCoords      *coords,
+                                                                    GdkModifierType        state,
+                                                                    GimpDisplay           *display);
+
+static void       gimp_polygon_select_tool_real_confirm            (GimpPolygonSelectTool *poly_sel,
+                                                                    GimpDisplay           *display);
+
+static void       gimp_polygon_select_tool_polygon_change_complete (GimpToolWidget        *polygon,
+                                                                    GimpPolygonSelectTool *poly_sel);
+static void       gimp_polygon_select_tool_polygon_response        (GimpToolWidget        *polygon,
+                                                                    gint                   response_id,
+                                                                    GimpPolygonSelectTool *poly_sel);
+
+static void       gimp_polygon_select_tool_start                   (GimpPolygonSelectTool *poly_sel,
+                                                                    GimpDisplay           *display);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPolygonSelectTool, gimp_polygon_select_tool,
+                            GIMP_TYPE_SELECTION_TOOL)
+
+#define parent_class gimp_polygon_select_tool_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_polygon_select_tool_class_init (GimpPolygonSelectToolClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass *tool_class   = GIMP_TOOL_CLASS (klass);
+
+  object_class->finalize     = gimp_polygon_select_tool_finalize;
+
+  tool_class->control        = gimp_polygon_select_tool_control;
+  tool_class->button_press   = gimp_polygon_select_tool_button_press;
+  tool_class->button_release = gimp_polygon_select_tool_button_release;
+  tool_class->motion         = gimp_polygon_select_tool_motion;
+  tool_class->key_press      = gimp_polygon_select_tool_key_press;
+  tool_class->modifier_key   = gimp_polygon_select_tool_modifier_key;
+  tool_class->oper_update    = gimp_polygon_select_tool_oper_update;
+  tool_class->cursor_update  = gimp_polygon_select_tool_cursor_update;
+
+  klass->change_complete     = NULL;
+  klass->confirm             = gimp_polygon_select_tool_real_confirm;
+}
+
+static void
+gimp_polygon_select_tool_init (GimpPolygonSelectTool *poly_sel)
+{
+  GimpTool          *tool     = GIMP_TOOL (poly_sel);
+  GimpSelectionTool *sel_tool = GIMP_SELECTION_TOOL (tool);
+
+  poly_sel->priv = gimp_polygon_select_tool_get_instance_private (poly_sel);
+
+  gimp_tool_control_set_motion_mode        (tool->control,
+                                            GIMP_MOTION_MODE_EXACT);
+  gimp_tool_control_set_wants_click        (tool->control, TRUE);
+  gimp_tool_control_set_wants_double_click (tool->control, TRUE);
+  gimp_tool_control_set_active_modifiers   (tool->control,
+                                            GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_SUBPIXEL);
+
+  sel_tool->allow_move = FALSE;
+}
+
+static void
+gimp_polygon_select_tool_finalize (GObject *object)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (object);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+
+  g_clear_object (&priv->widget);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_polygon_select_tool_control (GimpTool       *tool,
+                                  GimpToolAction  action,
+                                  GimpDisplay    *display)
+{
+  GimpPolygonSelectTool *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_polygon_select_tool_halt (poly_sel);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_polygon_select_tool_button_press (GimpTool            *tool,
+                                       const GimpCoords    *coords,
+                                       guint32              time,
+                                       GdkModifierType      state,
+                                       GimpButtonPressType  press_type,
+                                       GimpDisplay         *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+
+  if (tool->display && tool->display != display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+
+  if (! priv->widget) /* not tool->display, we have a subclass */
+    {
+      /* First of all handle delegation to the selection mask edit logic
+       * if appropriate.
+       */
+      if (gimp_selection_tool_start_edit (GIMP_SELECTION_TOOL (poly_sel),
+                                          display, coords))
+        {
+          return;
+        }
+
+      gimp_polygon_select_tool_start (poly_sel, display);
+
+      gimp_tool_widget_hover (priv->widget, coords, state, TRUE);
+    }
+
+  if (gimp_tool_widget_button_press (priv->widget, coords, time, state,
+                                     press_type))
+    {
+      priv->grab_widget = priv->widget;
+    }
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_polygon_select_tool_button_release (GimpTool              *tool,
+                                         const GimpCoords      *coords,
+                                         guint32                time,
+                                         GdkModifierType        state,
+                                         GimpButtonReleaseType  release_type,
+                                         GimpDisplay           *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+  GimpImage                    *image    = gimp_display_get_image (display);
+
+  gimp_tool_control_halt (tool->control);
+
+  switch (release_type)
+    {
+    case GIMP_BUTTON_RELEASE_CLICK:
+    case GIMP_BUTTON_RELEASE_NO_MOTION:
+      /*  If there is a floating selection, anchor it  */
+      if (gimp_image_get_floating_selection (image))
+        {
+          floating_sel_anchor (gimp_image_get_floating_selection (image));
+
+          gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+          return;
+        }
+
+      /* fallthru */
+
+    default:
+      if (priv->grab_widget)
+        {
+          gimp_tool_widget_button_release (priv->grab_widget,
+                                           coords, time, state, release_type);
+          priv->grab_widget = NULL;
+        }
+    }
+
+  if (priv->pending_response)
+    {
+      gimp_polygon_select_tool_polygon_response (priv->widget,
+                                                 priv->pending_response_id,
+                                                 poly_sel);
+
+      priv->pending_response = FALSE;
+    }
+}
+
+static void
+gimp_polygon_select_tool_motion (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 guint32           time,
+                                 GdkModifierType   state,
+                                 GimpDisplay      *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+
+  if (priv->grab_widget)
+    {
+      gimp_tool_widget_motion (priv->grab_widget, coords, time, state);
+    }
+}
+
+static gboolean
+gimp_polygon_select_tool_key_press (GimpTool    *tool,
+                                    GdkEventKey *kevent,
+                                    GimpDisplay *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+
+  if (priv->widget && display == tool->display)
+    {
+      return gimp_tool_widget_key_press (priv->widget, kevent);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_polygon_select_tool_modifier_key (GimpTool        *tool,
+                                       GdkModifierType  key,
+                                       gboolean         press,
+                                       GdkModifierType  state,
+                                       GimpDisplay     *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+
+  if (priv->widget && display == tool->display)
+    {
+      gimp_tool_widget_hover_modifier (priv->widget, key, press, state);
+
+      /* let GimpSelectTool handle alt+<mod> */
+      if (! (state & GDK_MOD1_MASK))
+        {
+          /* otherwise, shift/ctrl are handled by the widget */
+          state &= ~(gimp_get_extend_selection_mask () |
+                     gimp_get_modify_selection_mask ());
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                display);
+}
+
+static void
+gimp_polygon_select_tool_oper_update (GimpTool         *tool,
+                                      const GimpCoords *coords,
+                                      GdkModifierType   state,
+                                      gboolean          proximity,
+                                      GimpDisplay      *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+
+  if (priv->widget && display == tool->display)
+    {
+      gimp_tool_widget_hover (priv->widget, coords, state, proximity);
+
+      /* let GimpSelectTool handle alt+<mod> */
+      if (! (state & GDK_MOD1_MASK))
+        {
+          /* otherwise, shift/ctrl are handled by the widget */
+          state &= ~(gimp_get_extend_selection_mask () |
+                     gimp_get_modify_selection_mask ());
+        }
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+}
+
+static void
+gimp_polygon_select_tool_cursor_update (GimpTool         *tool,
+                                        const GimpCoords *coords,
+                                        GdkModifierType   state,
+                                        GimpDisplay      *display)
+{
+  GimpPolygonSelectTool        *poly_sel = GIMP_POLYGON_SELECT_TOOL (tool);
+  GimpPolygonSelectToolPrivate *priv     = poly_sel->priv;
+  GimpCursorModifier            modifier = GIMP_CURSOR_MODIFIER_NONE;
+
+  if (tool->display)
+    {
+      if (priv->widget && display == tool->display)
+        {
+          gimp_tool_widget_get_cursor (priv->widget, coords, state,
+                                       NULL, NULL, &modifier);
+
+          /* let GimpSelectTool handle alt+<mod> */
+          if (! (state & GDK_MOD1_MASK))
+            {
+              /* otherwise, shift/ctrl are handled by the widget */
+              state &= ~(gimp_get_extend_selection_mask () |
+                         gimp_get_modify_selection_mask ());
+            }
+        }
+
+      gimp_tool_set_cursor (tool, display,
+                            gimp_tool_control_get_cursor (tool->control),
+                            gimp_tool_control_get_tool_cursor (tool->control),
+                            modifier);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                 display);
+}
+
+static void
+gimp_polygon_select_tool_real_confirm (GimpPolygonSelectTool *poly_sel,
+                                       GimpDisplay           *display)
+{
+  gimp_tool_control (GIMP_TOOL (poly_sel), GIMP_TOOL_ACTION_COMMIT, display);
+}
+
+static void
+gimp_polygon_select_tool_polygon_change_complete (GimpToolWidget        *polygon,
+                                                  GimpPolygonSelectTool *poly_sel)
+{
+  if (GIMP_POLYGON_SELECT_TOOL_GET_CLASS (poly_sel)->change_complete)
+    {
+      GIMP_POLYGON_SELECT_TOOL_GET_CLASS (poly_sel)->change_complete (
+        poly_sel, GIMP_TOOL (poly_sel)->display);
+    }
+}
+
+static void
+gimp_polygon_select_tool_polygon_response (GimpToolWidget        *polygon,
+                                           gint                   response_id,
+                                           GimpPolygonSelectTool *poly_sel)
+{
+  GimpTool                     *tool = GIMP_TOOL (poly_sel);
+  GimpPolygonSelectToolPrivate *priv = poly_sel->priv;
+
+  /* if we're in the middle of a click, defer the response to the
+   * button_release() event
+   */
+  if (gimp_tool_control_is_active (tool->control))
+    {
+      priv->pending_response    = TRUE;
+      priv->pending_response_id = response_id;
+
+      return;
+    }
+
+  switch (response_id)
+    {
+    case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM:
+      /*  don't gimp_tool_control(COMMIT) here because we don't always
+       *  want to HALT the tool after committing because we have a
+       *  subclass, we do that in the default implementation of
+       *  confirm().
+       */
+      if (GIMP_POLYGON_SELECT_TOOL_GET_CLASS (poly_sel)->confirm)
+        {
+          GIMP_POLYGON_SELECT_TOOL_GET_CLASS (poly_sel)->confirm (
+            poly_sel, tool->display);
+        }
+      break;
+
+    case GIMP_TOOL_WIDGET_RESPONSE_CANCEL:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      break;
+    }
+}
+
+static void
+gimp_polygon_select_tool_start (GimpPolygonSelectTool *poly_sel,
+                                GimpDisplay           *display)
+{
+  GimpTool                     *tool  = GIMP_TOOL (poly_sel);
+  GimpPolygonSelectToolPrivate *priv  = poly_sel->priv;
+  GimpDisplayShell             *shell = gimp_display_get_shell (display);
+
+  tool->display = display;
+
+  priv->widget = gimp_tool_polygon_new (shell);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), priv->widget);
+
+  g_signal_connect (priv->widget, "change-complete",
+                    G_CALLBACK (gimp_polygon_select_tool_polygon_change_complete),
+                    poly_sel);
+  g_signal_connect (priv->widget, "response",
+                    G_CALLBACK (gimp_polygon_select_tool_polygon_response),
+                    poly_sel);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+}
+
+
+/*  public functions  */
+
+gboolean
+gimp_polygon_select_tool_is_closed (GimpPolygonSelectTool *poly_sel)
+{
+  GimpPolygonSelectToolPrivate *priv;
+
+  g_return_val_if_fail (GIMP_IS_POLYGON_SELECT_TOOL (poly_sel), FALSE);
+
+  priv = poly_sel->priv;
+
+  if (priv->widget)
+    return gimp_tool_polygon_is_closed (GIMP_TOOL_POLYGON (priv->widget));
+
+  return FALSE;
+}
+
+void
+gimp_polygon_select_tool_get_points (GimpPolygonSelectTool  *poly_sel,
+                                     const GimpVector2     **points,
+                                     gint                   *n_points)
+{
+  GimpPolygonSelectToolPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_POLYGON_SELECT_TOOL (poly_sel));
+
+  priv = poly_sel->priv;
+
+  if (priv->widget)
+    {
+      gimp_tool_polygon_get_points (GIMP_TOOL_POLYGON (priv->widget),
+                                    points, n_points);
+    }
+  else
+    {
+      if (points)   *points   = NULL;
+      if (n_points) *n_points = 0;
+    }
+}
+
+
+/*  protected functions  */
+
+gboolean
+gimp_polygon_select_tool_is_grabbed (GimpPolygonSelectTool *poly_sel)
+{
+  GimpPolygonSelectToolPrivate *priv;
+
+  g_return_val_if_fail (GIMP_IS_POLYGON_SELECT_TOOL (poly_sel), FALSE);
+
+  priv = poly_sel->priv;
+
+  return priv->grab_widget != NULL;
+}
+
+void
+gimp_polygon_select_tool_halt (GimpPolygonSelectTool *poly_sel)
+{
+  GimpPolygonSelectToolPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_POLYGON_SELECT_TOOL (poly_sel));
+
+  priv = poly_sel->priv;
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (poly_sel), NULL);
+  g_clear_object (&priv->widget);
+}
diff --git a/app/tools/gimppolygonselecttool.h b/app/tools/gimppolygonselecttool.h
new file mode 100644
index 0000000..13de063
--- /dev/null
+++ b/app/tools/gimppolygonselecttool.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is polygon software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Polygon Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_POLYGON_SELECT_TOOL_H__
+#define __GIMP_POLYGON_SELECT_TOOL_H__
+
+
+#include "gimpselectiontool.h"
+
+
+#define GIMP_TYPE_POLYGON_SELECT_TOOL            (gimp_polygon_select_tool_get_type ())
+#define GIMP_POLYGON_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_POLYGON_SELECT_TOOL, GimpPolygonSelectTool))
+#define GIMP_POLYGON_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_POLYGON_SELECT_TOOL, GimpPolygonSelectToolClass))
+#define GIMP_IS_POLYGON_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_POLYGON_SELECT_TOOL))
+#define GIMP_IS_POLYGON_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_POLYGON_SELECT_TOOL))
+#define GIMP_POLYGON_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_POLYGON_SELECT_TOOL, GimpPolygonSelectToolClass))
+
+
+typedef struct _GimpPolygonSelectTool        GimpPolygonSelectTool;
+typedef struct _GimpPolygonSelectToolPrivate GimpPolygonSelectToolPrivate;
+typedef struct _GimpPolygonSelectToolClass   GimpPolygonSelectToolClass;
+
+struct _GimpPolygonSelectTool
+{
+  GimpSelectionTool             parent_instance;
+
+  GimpPolygonSelectToolPrivate *priv;
+};
+
+struct _GimpPolygonSelectToolClass
+{
+  GimpSelectionToolClass  parent_class;
+
+  /*  virtual functions  */
+  void (* change_complete) (GimpPolygonSelectTool *poly_sel,
+                            GimpDisplay           *display);
+  void (* confirm)         (GimpPolygonSelectTool *poly_sel,
+                            GimpDisplay           *display);
+};
+
+
+GType      gimp_polygon_select_tool_get_type   (void) G_GNUC_CONST;
+
+gboolean   gimp_polygon_select_tool_is_closed  (GimpPolygonSelectTool  *poly_sel);
+void       gimp_polygon_select_tool_get_points (GimpPolygonSelectTool  *poly_sel,
+                                                const GimpVector2     **points,
+                                                gint                   *n_points);
+
+/*  protected functions */
+gboolean   gimp_polygon_select_tool_is_grabbed (GimpPolygonSelectTool  *poly_sel);
+
+void       gimp_polygon_select_tool_halt       (GimpPolygonSelectTool  *poly_sel);
+
+
+#endif  /*  __GIMP_POLYGON_SELECT_TOOL_H__  */
diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c
new file mode 100644
index 0000000..aff6870
--- /dev/null
+++ b/app/tools/gimprectangleoptions.c
@@ -0,0 +1,1266 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimptooloptions.h"
+
+#include "widgets/gimppropwidgets.h"
+
+#include "gimprectangleoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+#define SB_WIDTH 5
+
+
+enum
+{
+  COLUMN_LEFT_NUMBER,
+  COLUMN_RIGHT_NUMBER,
+  COLUMN_TEXT,
+  N_COLUMNS
+};
+
+
+/*  local function prototypes  */
+
+static void     gimp_rectangle_options_fixed_rule_changed     (GtkWidget                   *combo_box,
+                                                               GimpRectangleOptionsPrivate *private);
+
+static void     gimp_rectangle_options_string_current_updates (GimpNumberPairEntry         *entry,
+                                                               GParamSpec                  *param,
+                                                               GimpRectangleOptions        *rectangle_options);
+static void     gimp_rectangle_options_setup_ratio_completion (GimpRectangleOptions        *rectangle_options,
+                                                               GtkWidget                   *entry,
+                                                               GtkListStore                *history);
+
+static gboolean gimp_number_pair_entry_history_select         (GtkEntryCompletion          *completion,
+                                                               GtkTreeModel                *model,
+                                                               GtkTreeIter                 *iter,
+                                                               GimpNumberPairEntry         *entry);
+
+static void     gimp_number_pair_entry_history_add            (GtkWidget                   *entry,
+                                                               GtkTreeModel                *model);
+
+
+G_DEFINE_INTERFACE (GimpRectangleOptions, gimp_rectangle_options, GIMP_TYPE_TOOL_OPTIONS)
+
+
+static void
+gimp_rectangle_options_default_init (GimpRectangleOptionsInterface *iface)
+{
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("auto-shrink",
+                                                             NULL,
+                                                             _("Automatically shrink to the nearest "
+                                                               "rectangular shape in a layer"),
+                                                             FALSE,
+                                                             GIMP_CONFIG_PARAM_FLAGS |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("shrink-merged",
+                                                             _("Shrink merged"),
+                                                             _("Use all visible layers when shrinking "
+                                                               "the selection"),
+                                                             FALSE,
+                                                             GIMP_CONFIG_PARAM_FLAGS |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_enum ("guide",
+                                                          NULL,
+                                                          _("Composition guides such as rule of thirds"),
+                                                          GIMP_TYPE_GUIDES_TYPE,
+                                                          GIMP_GUIDES_NONE,
+                                                          GIMP_CONFIG_PARAM_FLAGS |
+                                                          GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("x",
+                                                            NULL,
+                                                            _("X coordinate of top left corner"),
+                                                            -GIMP_MAX_IMAGE_SIZE,
+                                                            GIMP_MAX_IMAGE_SIZE,
+                                                            0.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("y",
+                                                            NULL,
+                                                            _("Y coordinate of top left corner"),
+                                                            -GIMP_MAX_IMAGE_SIZE,
+                                                            GIMP_MAX_IMAGE_SIZE,
+                                                            0.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("width",
+                                                            NULL,
+                                                            _("Width of selection"),
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            0.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("height",
+                                                            NULL,
+                                                            _("Height of selection"),
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            0.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       gimp_param_spec_unit ("position-unit",
+                                                             NULL,
+                                                             _("Unit of top left corner coordinate"),
+                                                             TRUE, TRUE,
+                                                             GIMP_UNIT_PIXEL,
+                                                             GIMP_PARAM_READWRITE |
+                                                             G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       gimp_param_spec_unit ("size-unit",
+                                                             NULL,
+                                                             _("Unit of selection size"),
+                                                             TRUE, TRUE,
+                                                             GIMP_UNIT_PIXEL,
+                                                             GIMP_PARAM_READWRITE |
+                                                             G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("fixed-rule-active",
+                                                             NULL,
+                                                             _("Enable lock of aspect ratio, "
+                                                               "width, height or size"),
+                                                             FALSE,
+                                                             GIMP_CONFIG_PARAM_FLAGS |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_enum ("fixed-rule",
+                                                          NULL,
+                                                          _("Choose what has to be locked"),
+                                                          GIMP_TYPE_RECTANGLE_FIXED_RULE,
+                                                          GIMP_RECTANGLE_FIXED_ASPECT,
+                                                          GIMP_CONFIG_PARAM_FLAGS |
+                                                          GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("desired-fixed-width",
+                                                            NULL,
+                                                            _("Custom fixed width"),
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            100.0,
+                                                            GIMP_CONFIG_PARAM_FLAGS |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("desired-fixed-height",
+                                                            NULL,
+                                                            _("Custom fixed height"),
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            100.0,
+                                                            GIMP_CONFIG_PARAM_FLAGS |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("desired-fixed-size-width",
+                                                            NULL, NULL,
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            100.0,
+                                                            GIMP_CONFIG_PARAM_FLAGS |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("desired-fixed-size-height",
+                                                            NULL, NULL,
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            100.0,
+                                                            GIMP_CONFIG_PARAM_FLAGS |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("default-fixed-size-width",
+                                                            NULL, NULL,
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            100.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("default-fixed-size-height",
+                                                            NULL, NULL,
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            100.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("overridden-fixed-size",
+                                                             NULL, NULL,
+                                                             FALSE,
+                                                             GIMP_CONFIG_PARAM_FLAGS |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("aspect-numerator",
+                                                            NULL, NULL,
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            1.0,
+                                                            GIMP_CONFIG_PARAM_FLAGS |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("aspect-denominator",
+                                                            NULL, NULL,
+                                                            0.0, GIMP_MAX_IMAGE_SIZE,
+                                                            1.0,
+                                                            GIMP_CONFIG_PARAM_FLAGS |
+                                                            GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("default-aspect-numerator",
+                                                            NULL, NULL,
+                                                            0.001, GIMP_MAX_IMAGE_SIZE,
+                                                            1.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_double ("default-aspect-denominator",
+                                                            NULL, NULL,
+                                                            0.001, GIMP_MAX_IMAGE_SIZE,
+                                                            1.0,
+                                                            GIMP_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("overridden-fixed-aspect",
+                                                             NULL, NULL,
+                                                             FALSE,
+                                                             GIMP_CONFIG_PARAM_FLAGS |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("use-string-current",
+                                                             NULL, NULL,
+                                                             FALSE,
+                                                             GIMP_PARAM_READWRITE |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+
+  g_object_interface_install_property (iface,
+                                       gimp_param_spec_unit ("fixed-unit",
+                                                             NULL,
+                                                             _("Unit of fixed width, height or size"),
+                                                             TRUE, TRUE,
+                                                             GIMP_UNIT_PIXEL,
+                                                             GIMP_PARAM_READWRITE |
+                                                             G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("fixed-center",
+                                                             _("Expand from center"),
+                                                             _("Expand selection from center outwards"),
+                                                             FALSE,
+                                                             GIMP_CONFIG_PARAM_FLAGS |
+                                                             GIMP_PARAM_STATIC_STRINGS));
+}
+
+static void
+gimp_rectangle_options_private_finalize (GimpRectangleOptionsPrivate *private)
+{
+  g_clear_object (&private->aspect_history);
+  g_clear_object (&private->size_history);
+
+  g_slice_free (GimpRectangleOptionsPrivate, private);
+}
+
+GimpRectangleOptionsPrivate *
+gimp_rectangle_options_get_private (GimpRectangleOptions *options)
+{
+  GimpRectangleOptionsPrivate *private;
+
+  static GQuark private_key = 0;
+
+  g_return_val_if_fail (GIMP_IS_RECTANGLE_OPTIONS (options), NULL);
+
+  if (! private_key)
+    private_key = g_quark_from_static_string ("gimp-rectangle-options-private");
+
+  private = g_object_get_qdata (G_OBJECT (options), private_key);
+
+  if (! private)
+    {
+      private = g_slice_new0 (GimpRectangleOptionsPrivate);
+
+      private->aspect_history = gtk_list_store_new (N_COLUMNS,
+                                                    G_TYPE_DOUBLE,
+                                                    G_TYPE_DOUBLE,
+                                                    G_TYPE_STRING);
+
+      private->size_history = gtk_list_store_new (N_COLUMNS,
+                                                  G_TYPE_DOUBLE,
+                                                  G_TYPE_DOUBLE,
+                                                  G_TYPE_STRING);
+
+      g_object_set_qdata_full (G_OBJECT (options), private_key, private,
+                               (GDestroyNotify) gimp_rectangle_options_private_finalize);
+    }
+
+  return private;
+}
+
+/**
+ * gimp_rectangle_options_install_properties:
+ * @klass: the class structure for a type deriving from #GObject
+ *
+ * Installs the necessary properties for a class implementing
+ * #GimpRectangleOptions. A #GimpRectangleOptionsProp property is installed
+ * for each property, using the values from the #GimpRectangleOptionsProp
+ * enumeration. The caller must make sure itself that the enumeration
+ * values don't collide with some other property values they
+ * are using (that's what %GIMP_RECTANGLE_OPTIONS_PROP_LAST is good for).
+ **/
+void
+gimp_rectangle_options_install_properties (GObjectClass *klass)
+{
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_AUTO_SHRINK,
+                                    "auto-shrink");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED,
+                                    "shrink-merged");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_GUIDE,
+                                    "guide");
+
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_X,
+                                    "x");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_Y,
+                                    "y");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_WIDTH,
+                                    "width");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT,
+                                    "height");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_POSITION_UNIT,
+                                    "position-unit");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_SIZE_UNIT,
+                                    "size-unit");
+
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE,
+                                    "fixed-rule-active");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE,
+                                    "fixed-rule");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_WIDTH,
+                                    "desired-fixed-width");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT,
+                                    "desired-fixed-height");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH,
+                                    "desired-fixed-size-width");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_HEIGHT,
+                                    "desired-fixed-size-height");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_WIDTH,
+                                    "default-fixed-size-width");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_HEIGHT,
+                                    "default-fixed-size-height");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE,
+                                    "overridden-fixed-size");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR,
+                                    "aspect-numerator");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR,
+                                    "aspect-denominator");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR,
+                                    "default-aspect-numerator");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR,
+                                    "default-aspect-denominator");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT,
+                                    "overridden-fixed-aspect");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT,
+                                    "use-string-current");
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT,
+                                    "fixed-unit");
+
+  g_object_class_override_property (klass,
+                                    GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER,
+                                    "fixed-center");
+}
+
+void
+gimp_rectangle_options_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpRectangleOptions        *options  = GIMP_RECTANGLE_OPTIONS (object);
+  GimpRectangleOptionsPrivate *private;
+
+  private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
+
+  switch (property_id)
+    {
+    case GIMP_RECTANGLE_OPTIONS_PROP_AUTO_SHRINK:
+      private->auto_shrink = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED:
+      private->shrink_merged = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT:
+      private->highlight = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT_OPACITY:
+      private->highlight_opacity = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_GUIDE:
+      private->guide = g_value_get_enum (value);
+      break;
+
+    case GIMP_RECTANGLE_OPTIONS_PROP_X:
+      private->x = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_Y:
+      private->y = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_WIDTH:
+      private->width = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT:
+      private->height = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_POSITION_UNIT:
+      private->position_unit = g_value_get_int (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_SIZE_UNIT:
+      private->size_unit = g_value_get_int (value);
+      break;
+
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE:
+      private->fixed_rule_active = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE:
+      private->fixed_rule = g_value_get_enum (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_WIDTH:
+      private->desired_fixed_width = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT:
+      private->desired_fixed_height = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH:
+      private->desired_fixed_size_width = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_HEIGHT:
+      private->desired_fixed_size_height = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_WIDTH:
+      private->default_fixed_size_width = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_HEIGHT:
+      private->default_fixed_size_height = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE:
+      private->overridden_fixed_size = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR:
+      private->aspect_numerator = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR:
+      private->aspect_denominator = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR:
+      private->default_aspect_numerator = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR:
+      private->default_aspect_denominator = g_value_get_double (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT:
+      private->overridden_fixed_aspect = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT:
+      private->use_string_current = g_value_get_boolean (value);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT:
+      private->fixed_unit = g_value_get_int (value);
+      break;
+
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER:
+      private->fixed_center = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+void
+gimp_rectangle_options_get_property (GObject      *object,
+                                     guint         property_id,
+                                     GValue       *value,
+                                     GParamSpec   *pspec)
+{
+  GimpRectangleOptions        *options  = GIMP_RECTANGLE_OPTIONS (object);
+  GimpRectangleOptionsPrivate *private;
+
+  private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
+
+  switch (property_id)
+    {
+    case GIMP_RECTANGLE_OPTIONS_PROP_AUTO_SHRINK:
+      g_value_set_boolean (value, private->auto_shrink);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED:
+      g_value_set_boolean (value, private->shrink_merged);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT:
+      g_value_set_boolean (value, private->highlight);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT_OPACITY:
+      g_value_set_double (value, private->highlight_opacity);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_GUIDE:
+      g_value_set_enum (value, private->guide);
+      break;
+
+    case GIMP_RECTANGLE_OPTIONS_PROP_X:
+      g_value_set_double (value, private->x);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_Y:
+      g_value_set_double (value, private->y);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_WIDTH:
+      g_value_set_double (value, private->width);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT:
+      g_value_set_double (value, private->height);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_POSITION_UNIT:
+      g_value_set_int (value, private->position_unit);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_SIZE_UNIT:
+      g_value_set_int (value, private->size_unit);
+      break;
+
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE:
+      g_value_set_boolean (value, private->fixed_rule_active);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE:
+      g_value_set_enum (value, private->fixed_rule);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_WIDTH:
+      g_value_set_double (value, private->desired_fixed_width);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT:
+      g_value_set_double (value, private->desired_fixed_height);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH:
+      g_value_set_double (value, private->desired_fixed_size_width);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_HEIGHT:
+      g_value_set_double (value, private->desired_fixed_size_height);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_WIDTH:
+      g_value_set_double (value, private->default_fixed_size_width);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_HEIGHT:
+      g_value_set_double (value, private->default_fixed_size_height);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE:
+      g_value_set_boolean (value, private->overridden_fixed_size);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR:
+      g_value_set_double (value, private->aspect_numerator);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR:
+      g_value_set_double (value, private->aspect_denominator);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR:
+      g_value_set_double (value, private->default_aspect_numerator);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR:
+      g_value_set_double (value, private->default_aspect_denominator);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT:
+      g_value_set_boolean (value, private->overridden_fixed_aspect);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT:
+      g_value_set_boolean (value, private->use_string_current);
+      break;
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT:
+      g_value_set_int (value, private->fixed_unit);
+      break;
+
+    case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER:
+      g_value_set_boolean (value, private->fixed_center);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_rectangle_options_get_size_entry:
+ * @rectangle_options:
+ *
+ * Returns: GtkEntry used to enter desired size of rectangle. For
+ *          testing purposes.
+ **/
+GtkWidget *
+gimp_rectangle_options_get_size_entry (GimpRectangleOptions *rectangle_options)
+{
+  GimpRectangleOptionsPrivate *private;
+
+  private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (rectangle_options);
+
+  return private->size_entry;
+}
+
+/**
+ * gimp_rectangle_options_fixed_rule_changed:
+ * @combo_box:
+ * @private:
+ *
+ * Updates tool options widgets depending on current fixed rule state.
+ */
+static void
+gimp_rectangle_options_fixed_rule_changed (GtkWidget                   *combo_box,
+                                           GimpRectangleOptionsPrivate *private)
+{
+  /* Setup sensitivity for Width and Height entries */
+
+  gtk_widget_set_sensitive (gimp_size_entry_get_help_widget (
+                              GIMP_SIZE_ENTRY (private->size_entry), 0),
+                            ! (private->fixed_rule_active &&
+                               (private->fixed_rule ==
+                                GIMP_RECTANGLE_FIXED_WIDTH ||
+                                private->fixed_rule ==
+                                GIMP_RECTANGLE_FIXED_SIZE)));
+
+  gtk_widget_set_sensitive (gimp_size_entry_get_help_widget (
+                              GIMP_SIZE_ENTRY (private->size_entry), 1),
+                            ! (private->fixed_rule_active &&
+                               (private->fixed_rule ==
+                                GIMP_RECTANGLE_FIXED_HEIGHT ||
+                                private->fixed_rule ==
+                                GIMP_RECTANGLE_FIXED_SIZE)));
+
+  /* Setup current fixed rule entries */
+
+  gtk_widget_hide (private->fixed_width_entry);
+  gtk_widget_hide (private->fixed_height_entry);
+  gtk_widget_hide (private->fixed_aspect_hbox);
+  gtk_widget_hide (private->fixed_size_hbox);
+
+  switch (private->fixed_rule)
+    {
+    case GIMP_RECTANGLE_FIXED_ASPECT:
+      gtk_widget_show (private->fixed_aspect_hbox);
+      break;
+
+    case GIMP_RECTANGLE_FIXED_WIDTH:
+      gtk_widget_show (private->fixed_width_entry);
+      break;
+
+    case GIMP_RECTANGLE_FIXED_HEIGHT:
+      gtk_widget_show (private->fixed_height_entry);
+      break;
+
+    case GIMP_RECTANGLE_FIXED_SIZE:
+      gtk_widget_show (private->fixed_size_hbox);
+      break;
+    }
+}
+
+static void
+gimp_rectangle_options_string_current_updates (GimpNumberPairEntry  *entry,
+                                               GParamSpec           *param,
+                                               GimpRectangleOptions *rectangle_options)
+{
+  GimpRectangleOptionsPrivate *private;
+  gboolean                     user_override;
+
+  private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (rectangle_options);
+
+  user_override = gimp_number_pair_entry_get_user_override (entry);
+
+  gimp_number_pair_entry_set_default_text (entry,
+                                           private->use_string_current ?
+                                           /* Current, as in what is currently in use. */
+                                           _("Current") : NULL);
+
+  gtk_widget_set_sensitive (private->aspect_button_box,
+                            ! private->use_string_current || user_override);
+}
+
+static GtkWidget *
+gimp_rectangle_options_prop_dimension_frame_new (GObject      *config,
+                                                 const gchar  *x_property_name,
+                                                 const gchar  *y_property_name,
+                                                 const gchar  *unit_property_name,
+                                                 const gchar  *table_label,
+                                                 GtkWidget   **entry)
+{
+  GimpUnit       unit_value;
+  GtkWidget     *frame;
+  GtkWidget     *hbox;
+  GtkWidget     *label;
+  GtkWidget     *menu;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adjustment;
+
+  g_object_get (config,
+                unit_property_name, &unit_value,
+                NULL);
+
+  frame = gimp_frame_new (NULL);
+
+  /*  title  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), hbox);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (table_label);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  menu = gimp_prop_unit_combo_box_new (config, unit_property_name);
+  gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
+  gtk_widget_show (menu);
+
+  /*  content  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+  gtk_widget_show (hbox);
+
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  spinbutton = gimp_spin_button_new (adjustment, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
+
+  *entry = gimp_size_entry_new (1, unit_value, "%a", TRUE, TRUE, FALSE,
+                                SB_WIDTH, GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_col_spacings (GTK_TABLE (*entry), 0);
+  gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (*entry), FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), *entry, TRUE, TRUE, 0);
+  gtk_widget_show (*entry);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (*entry),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, TRUE, TRUE, 0);
+  gtk_widget_show (spinbutton);
+
+  gimp_prop_coordinates_connect (config,
+                                 x_property_name, y_property_name,
+                                 unit_property_name,
+                                 *entry, NULL, 300, 300);
+
+  return frame;
+}
+
+GtkWidget *
+gimp_rectangle_options_gui (GimpToolOptions *tool_options)
+{
+  GimpRectangleOptionsPrivate *private;
+  GObject                     *config = G_OBJECT (tool_options);
+  GtkWidget                   *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget                   *button;
+  GtkWidget                   *combo;
+  GtkWidget                   *frame;
+
+  private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (tool_options);
+
+  /* Fixed Center */
+  button = gimp_prop_check_button_new (config, "fixed-center", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /* Rectangle fixed-rules (e.g. aspect or width). */
+  {
+    GtkWidget    *vbox2;
+    GtkWidget    *hbox;
+    GtkWidget    *entry;
+    GtkSizeGroup *size_group;
+    GList        *children;
+
+    frame = gimp_frame_new (NULL);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    gtk_widget_show (frame);
+
+    /* Setup frame title widgets */
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+    gtk_frame_set_label_widget (GTK_FRAME (frame), hbox);
+    gtk_widget_show (hbox);
+
+    button = gimp_prop_check_button_new (config, "fixed-rule-active", NULL);
+    gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (button)));
+    gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+    gtk_widget_show (button);
+
+    g_signal_connect (button, "toggled",
+                      G_CALLBACK (gimp_rectangle_options_fixed_rule_changed),
+                      private);
+
+    combo = gimp_prop_enum_combo_box_new (config, "fixed-rule", 0, 0);
+    gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fixed"));
+    g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+    gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+    gtk_widget_show (combo);
+
+    g_signal_connect (combo, "changed",
+                      G_CALLBACK (gimp_rectangle_options_fixed_rule_changed),
+                      private);
+
+    /* Setup frame content */
+
+    vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    gtk_container_add (GTK_CONTAINER (frame), vbox2);
+    gtk_widget_show (vbox2);
+
+    size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+
+    /* Fixed aspect entry/buttons */
+    private->fixed_aspect_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+    gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_aspect_hbox,
+                        FALSE, FALSE, 0);
+    gtk_size_group_add_widget (size_group, private->fixed_aspect_hbox);
+    g_object_unref (size_group);
+    /* don't show */
+
+    g_object_add_weak_pointer (G_OBJECT (private->fixed_aspect_hbox),
+                               (gpointer) &private->fixed_aspect_hbox);
+
+    entry = gimp_prop_number_pair_entry_new (config,
+                                             "aspect-numerator",
+                                             "aspect-denominator",
+                                             "default-aspect-numerator",
+                                             "default-aspect-denominator",
+                                             "overridden-fixed-aspect",
+                                             FALSE, TRUE,
+                                             ":/" "xX*",
+                                             TRUE,
+                                             0.001, GIMP_MAX_IMAGE_SIZE);
+    gtk_box_pack_start (GTK_BOX (private->fixed_aspect_hbox), entry,
+                        TRUE, TRUE, 0);
+    gtk_widget_show (entry);
+
+    g_signal_connect (entry, "notify::user-override",
+                      G_CALLBACK (gimp_rectangle_options_string_current_updates),
+                      config);
+    g_signal_connect_swapped (config, "notify::use-string-current",
+                              G_CALLBACK (gimp_rectangle_options_string_current_updates),
+                              entry);
+
+    gimp_rectangle_options_setup_ratio_completion (GIMP_RECTANGLE_OPTIONS (tool_options),
+                                                   entry,
+                                                   private->aspect_history);
+
+    private->aspect_button_box =
+      gimp_prop_enum_icon_box_new (G_OBJECT (entry),
+                                   "aspect", "gimp", -1, -1);
+    gtk_box_pack_start (GTK_BOX (private->fixed_aspect_hbox),
+                        private->aspect_button_box, FALSE, FALSE, 0);
+    gtk_widget_show (private->aspect_button_box);
+
+    g_object_add_weak_pointer (G_OBJECT (private->aspect_button_box),
+                               (gpointer) &private->aspect_button_box);
+
+    /* hide "square" */
+    children =
+      gtk_container_get_children (GTK_CONTAINER (private->aspect_button_box));
+    gtk_widget_hide (children->data);
+    g_list_free (children);
+
+    /* Fixed width entry */
+    private->fixed_width_entry =
+      gimp_prop_size_entry_new (config,
+                                "desired-fixed-width", TRUE, "fixed-unit", "%a",
+                                GIMP_SIZE_ENTRY_UPDATE_SIZE, 300);
+    gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_width_entry,
+                        FALSE, FALSE, 0);
+    gtk_size_group_add_widget (size_group, private->fixed_width_entry);
+    /* don't show */
+
+    g_object_add_weak_pointer (G_OBJECT (private->fixed_width_entry),
+                               (gpointer) &private->fixed_width_entry);
+
+    /* Fixed height entry */
+    private->fixed_height_entry =
+      gimp_prop_size_entry_new (config,
+                                "desired-fixed-height", TRUE, "fixed-unit", "%a",
+                                GIMP_SIZE_ENTRY_UPDATE_SIZE, 300);
+    gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_height_entry,
+                        FALSE, FALSE, 0);
+    gtk_size_group_add_widget (size_group, private->fixed_height_entry);
+    /* don't show */
+
+    g_object_add_weak_pointer (G_OBJECT (private->fixed_height_entry),
+                               (gpointer) &private->fixed_height_entry);
+
+    /* Fixed size entry */
+    private->fixed_size_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+    gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_size_hbox,
+                        FALSE, FALSE, 0);
+    gtk_size_group_add_widget (size_group, private->fixed_size_hbox);
+    /* don't show */
+
+    g_object_add_weak_pointer (G_OBJECT (private->fixed_size_hbox),
+                               (gpointer) &private->fixed_size_hbox);
+
+    entry = gimp_prop_number_pair_entry_new (config,
+                                             "desired-fixed-size-width",
+                                             "desired-fixed-size-height",
+                                             "default-fixed-size-width",
+                                             "default-fixed-size-height",
+                                             "overridden-fixed-size",
+                                             TRUE, FALSE,
+                                             "xX*" ":/",
+                                             FALSE,
+                                             1, GIMP_MAX_IMAGE_SIZE);
+    gtk_box_pack_start (GTK_BOX (private->fixed_size_hbox), entry,
+                        TRUE, TRUE, 0);
+    gtk_widget_show (entry);
+
+    gimp_rectangle_options_setup_ratio_completion (GIMP_RECTANGLE_OPTIONS (tool_options),
+                                                   entry,
+                                                   private->size_history);
+
+    private->size_button_box =
+      gimp_prop_enum_icon_box_new (G_OBJECT (entry),
+                                   "aspect", "gimp", -1, -1);
+    gtk_box_pack_start (GTK_BOX (private->fixed_size_hbox),
+                        private->size_button_box, FALSE, FALSE, 0);
+    gtk_widget_show (private->size_button_box);
+
+    /* hide "square" */
+    children =
+      gtk_container_get_children (GTK_CONTAINER (private->size_button_box));
+    gtk_widget_hide (children->data);
+    g_list_free (children);
+  }
+
+  /* X, Y */
+  frame = gimp_rectangle_options_prop_dimension_frame_new (config,
+                                                           "x", "y",
+                                                           "position-unit",
+                                                           _("Position:"),
+                                                           &private->position_entry);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /* Width, Height */
+  frame = gimp_rectangle_options_prop_dimension_frame_new (config,
+                                                           "width", "height",
+                                                           "size-unit",
+                                                           _("Size:"),
+                                                           &private->size_entry);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the Highlight frame  */
+  {
+    GtkWidget *scale;
+
+    scale = gimp_prop_spin_scale_new (config, "highlight-opacity", NULL,
+                                      0.01, 0.1, 0);
+    gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+
+    frame = gimp_prop_expanding_frame_new (config, "highlight", NULL,
+                                           scale, NULL);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    gtk_widget_show (frame);
+  }
+
+  /*  Guide  */
+  combo = gimp_prop_enum_combo_box_new (config, "guide",
+                                        GIMP_GUIDES_NONE,
+                                        GIMP_GUIDES_DIAGONALS);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  /*  Auto Shrink  */
+  private->auto_shrink_button = gtk_button_new_with_label (_("Auto Shrink"));
+  gtk_box_pack_start (GTK_BOX (vbox), private->auto_shrink_button,
+                      FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (private->auto_shrink_button, FALSE);
+  gtk_widget_show (private->auto_shrink_button);
+
+  g_object_add_weak_pointer (G_OBJECT (private->auto_shrink_button),
+                             (gpointer) &private->auto_shrink_button);
+
+  button = gimp_prop_check_button_new (config, "shrink-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /* Setup initial fixed rule widgets */
+  gimp_rectangle_options_fixed_rule_changed (NULL, private);
+
+  return vbox;
+}
+
+void
+gimp_rectangle_options_connect (GimpRectangleOptions *options,
+                                GimpImage            *image,
+                                GCallback             shrink_callback,
+                                gpointer              shrink_object)
+{
+  GimpRectangleOptionsPrivate *options_private;
+  gdouble                      xres;
+  gdouble                      yres;
+
+  g_return_if_fail (GIMP_IS_RECTANGLE_OPTIONS (options));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+  g_return_if_fail (shrink_callback != NULL);
+  g_return_if_fail (shrink_object != NULL);
+
+  options_private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  if (options_private->fixed_width_entry)
+    {
+      GtkWidget *entry = options_private->fixed_width_entry;
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 0, xres, FALSE);
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (entry), 0,
+                                0, gimp_image_get_width (image));
+    }
+
+  if (options_private->fixed_height_entry)
+    {
+      GtkWidget *entry = options_private->fixed_height_entry;
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 0, yres, FALSE);
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (entry), 0,
+                                0, gimp_image_get_height (image));
+    }
+
+  if (options_private->position_entry)
+    {
+      GtkWidget *entry = options_private->position_entry;
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 0, xres, FALSE);
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (entry), 0,
+                                0, gimp_image_get_width (image));
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 1, yres, FALSE);
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (entry), 1,
+                                0, gimp_image_get_height (image));
+    }
+
+  if (options_private->size_entry)
+    {
+      GtkWidget *entry = options_private->size_entry;
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 0, xres, FALSE);
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (entry), 0,
+                                0, gimp_image_get_width (image));
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (entry), 1, yres, FALSE);
+      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (entry), 1,
+                                0, gimp_image_get_height (image));
+    }
+
+  if (options_private->auto_shrink_button)
+    {
+      g_signal_connect_swapped (options_private->auto_shrink_button, "clicked",
+                                shrink_callback,
+                                shrink_object);
+
+      gtk_widget_set_sensitive (options_private->auto_shrink_button, TRUE);
+    }
+}
+
+void
+gimp_rectangle_options_disconnect (GimpRectangleOptions *options,
+                                   GCallback             shrink_callback,
+                                   gpointer              shrink_object)
+{
+  GimpRectangleOptionsPrivate *options_private;
+
+  g_return_if_fail (GIMP_IS_RECTANGLE_OPTIONS (options));
+  g_return_if_fail (shrink_callback != NULL);
+  g_return_if_fail (shrink_object != NULL);
+
+  options_private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
+
+  if (options_private->auto_shrink_button)
+    {
+      gtk_widget_set_sensitive (options_private->auto_shrink_button, FALSE);
+
+      g_signal_handlers_disconnect_by_func (options_private->auto_shrink_button,
+                                            shrink_callback,
+                                            shrink_object);
+    }
+}
+
+/**
+ * gimp_rectangle_options_fixed_rule_active:
+ * @rectangle_options:
+ * @fixed_rule:
+ *
+ * Return value: %TRUE if @fixed_rule is active, %FALSE otherwise.
+ */
+gboolean
+gimp_rectangle_options_fixed_rule_active (GimpRectangleOptions   *rectangle_options,
+                                          GimpRectangleFixedRule  fixed_rule)
+{
+  GimpRectangleOptionsPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_RECTANGLE_OPTIONS (rectangle_options), FALSE);
+
+  private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (rectangle_options);
+
+  return private->fixed_rule_active &&
+         private->fixed_rule == fixed_rule;
+}
+
+static void
+gimp_rectangle_options_setup_ratio_completion (GimpRectangleOptions *rectangle_options,
+                                               GtkWidget            *entry,
+                                               GtkListStore         *history)
+{
+  GtkEntryCompletion *completion;
+
+  completion = g_object_new (GTK_TYPE_ENTRY_COMPLETION,
+                             "model", history,
+                             "inline-completion", TRUE,
+                             NULL);
+
+  gtk_entry_completion_set_text_column (completion, COLUMN_TEXT);
+  gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+  g_object_unref (completion);
+
+  g_signal_connect (entry, "ratio-changed",
+                    G_CALLBACK (gimp_number_pair_entry_history_add),
+                    history);
+
+  g_signal_connect (completion, "match-selected",
+                    G_CALLBACK (gimp_number_pair_entry_history_select),
+                    entry);
+}
+
+static gboolean
+gimp_number_pair_entry_history_select (GtkEntryCompletion  *completion,
+                                       GtkTreeModel        *model,
+                                       GtkTreeIter         *iter,
+                                       GimpNumberPairEntry *entry)
+{
+  gdouble left_number;
+  gdouble right_number;
+
+  gtk_tree_model_get (model, iter,
+                      COLUMN_LEFT_NUMBER,  &left_number,
+                      COLUMN_RIGHT_NUMBER, &right_number,
+                      -1);
+
+  gimp_number_pair_entry_set_values (entry, left_number, right_number);
+
+  return TRUE;
+}
+
+static void
+gimp_number_pair_entry_history_add (GtkWidget    *entry,
+                                    GtkTreeModel *model)
+{
+  GValue       value = G_VALUE_INIT;
+  GtkTreeIter  iter;
+  gboolean     iter_valid;
+  gdouble      left_number;
+  gdouble      right_number;
+  const gchar *text;
+
+  text = gtk_entry_get_text (GTK_ENTRY (entry));
+  gimp_number_pair_entry_get_values (GIMP_NUMBER_PAIR_ENTRY (entry),
+                                     &left_number,
+                                     &right_number);
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      gtk_tree_model_get_value (model, &iter, COLUMN_TEXT, &value);
+
+      if (strcmp (text, g_value_get_string (&value)) == 0)
+        {
+          g_value_unset (&value);
+          break;
+        }
+
+      g_value_unset (&value);
+    }
+
+  if (iter_valid)
+    {
+      gtk_list_store_move_after (GTK_LIST_STORE (model), &iter, NULL);
+    }
+  else
+    {
+      gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+
+      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                          COLUMN_LEFT_NUMBER,  left_number,
+                          COLUMN_RIGHT_NUMBER, right_number,
+                          COLUMN_TEXT,        text,
+                          -1);
+
+      /* FIXME: limit the size of the history */
+    }
+}
diff --git a/app/tools/gimprectangleoptions.h b/app/tools/gimprectangleoptions.h
new file mode 100644
index 0000000..e3d011c
--- /dev/null
+++ b/app/tools/gimprectangleoptions.h
@@ -0,0 +1,181 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RECTANGLE_OPTIONS_H__
+#define __GIMP_RECTANGLE_OPTIONS_H__
+
+
+typedef enum
+{
+  GIMP_RECTANGLE_OPTIONS_PROP_0,
+
+  GIMP_RECTANGLE_OPTIONS_PROP_AUTO_SHRINK,
+  GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED,
+  GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
+  GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT_OPACITY,
+  GIMP_RECTANGLE_OPTIONS_PROP_GUIDE,
+
+  GIMP_RECTANGLE_OPTIONS_PROP_X,
+  GIMP_RECTANGLE_OPTIONS_PROP_Y,
+  GIMP_RECTANGLE_OPTIONS_PROP_WIDTH,
+  GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT,
+  GIMP_RECTANGLE_OPTIONS_PROP_POSITION_UNIT,
+  GIMP_RECTANGLE_OPTIONS_PROP_SIZE_UNIT,
+
+  GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE,
+  GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE,
+  GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_WIDTH,
+  GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT,
+  GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH,
+  GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_HEIGHT,
+  GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_WIDTH,
+  GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_HEIGHT,
+  GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE,
+  GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR,
+  GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR,
+  GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR,
+  GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR,
+  GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT,
+  GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT,
+  GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT,
+  GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER,
+
+  GIMP_RECTANGLE_OPTIONS_PROP_LAST = GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER
+} GimpRectangleOptionsProp;
+
+
+#define GIMP_TYPE_RECTANGLE_OPTIONS               (gimp_rectangle_options_get_type ())
+#define GIMP_IS_RECTANGLE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RECTANGLE_OPTIONS))
+#define GIMP_RECTANGLE_OPTIONS(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RECTANGLE_OPTIONS, GimpRectangleOptions))
+#define GIMP_RECTANGLE_OPTIONS_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_RECTANGLE_OPTIONS, GimpRectangleOptionsInterface))
+
+#define GIMP_RECTANGLE_OPTIONS_GET_PRIVATE(obj)   (gimp_rectangle_options_get_private (GIMP_RECTANGLE_OPTIONS (obj)))
+
+
+typedef struct _GimpRectangleOptions          GimpRectangleOptions;
+typedef struct _GimpRectangleOptionsInterface GimpRectangleOptionsInterface;
+typedef struct _GimpRectangleOptionsPrivate   GimpRectangleOptionsPrivate;
+
+struct _GimpRectangleOptionsInterface
+{
+  GTypeInterface base_iface;
+};
+
+struct _GimpRectangleOptionsPrivate
+{
+  gboolean                auto_shrink;
+  gboolean                shrink_merged;
+
+  gboolean                highlight;
+  gdouble                 highlight_opacity;
+  GimpGuidesType          guide;
+
+  gdouble                 x;
+  gdouble                 y;
+  gdouble                 width;
+  gdouble                 height;
+
+  GimpUnit                position_unit;
+  GimpUnit                size_unit;
+
+  gboolean                fixed_rule_active;
+  GimpRectangleFixedRule  fixed_rule;
+
+  gdouble                 desired_fixed_width;
+  gdouble                 desired_fixed_height;
+
+  gdouble                 desired_fixed_size_width;
+  gdouble                 desired_fixed_size_height;
+
+  gdouble                 default_fixed_size_width;
+  gdouble                 default_fixed_size_height;
+  gboolean                overridden_fixed_size;
+
+  gdouble                 aspect_numerator;
+  gdouble                 aspect_denominator;
+
+  gdouble                 default_aspect_numerator;
+  gdouble                 default_aspect_denominator;
+  gboolean                overridden_fixed_aspect;
+
+  gboolean                fixed_center;
+
+  /* This gboolean is not part of the actual rectangle tool options,
+   * and should be refactored out along with the pointers to widgets.
+   */
+  gboolean                use_string_current;
+
+  GimpUnit                fixed_unit;
+
+  /* options gui */
+
+  GtkWidget              *auto_shrink_button;
+
+  GtkWidget              *fixed_width_entry;
+  GtkWidget              *fixed_height_entry;
+
+  GtkWidget              *fixed_aspect_hbox;
+  GtkWidget              *aspect_button_box;
+  GtkListStore           *aspect_history;
+
+  GtkWidget              *fixed_size_hbox;
+  GtkWidget              *size_button_box;
+  GtkListStore           *size_history;
+
+  GtkWidget              *position_entry;
+  GtkWidget              *size_entry;
+};
+
+
+GType       gimp_rectangle_options_get_type           (void) G_GNUC_CONST;
+
+GtkWidget * gimp_rectangle_options_gui                (GimpToolOptions      *tool_options);
+
+void        gimp_rectangle_options_connect            (GimpRectangleOptions *options,
+                                                       GimpImage            *image,
+                                                       GCallback             shrink_callback,
+                                                       gpointer              shrink_object);
+void        gimp_rectangle_options_disconnect         (GimpRectangleOptions *options,
+                                                       GCallback             shrink_callback,
+                                                       gpointer              shrink_object);
+
+gboolean    gimp_rectangle_options_fixed_rule_active  (GimpRectangleOptions *rectangle_options,
+                                                       GimpRectangleFixedRule fixed_rule);
+
+GimpRectangleOptionsPrivate *
+            gimp_rectangle_options_get_private        (GimpRectangleOptions *options);
+
+
+/*  convenience functions  */
+
+void        gimp_rectangle_options_install_properties (GObjectClass *klass);
+void        gimp_rectangle_options_set_property       (GObject      *object,
+                                                       guint         property_id,
+                                                       const GValue *value,
+                                                       GParamSpec   *pspec);
+void        gimp_rectangle_options_get_property       (GObject      *object,
+                                                       guint         property_id,
+                                                       GValue       *value,
+                                                       GParamSpec   *pspec);
+
+
+/*  testing helper functions  */
+
+GtkWidget * gimp_rectangle_options_get_size_entry     (GimpRectangleOptions *rectangle_options);
+
+
+#endif  /* __GIMP_RECTANGLE_OPTIONS_H__ */
diff --git a/app/tools/gimprectangleselectoptions.c b/app/tools/gimprectangleselectoptions.c
new file mode 100644
index 0000000..ea8f0da
--- /dev/null
+++ b/app/tools/gimprectangleselectoptions.c
@@ -0,0 +1,203 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+
+#include "gimprectangleoptions.h"
+#include "gimprectangleselectoptions.h"
+#include "gimprectangleselecttool.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_ROUND_CORNERS = GIMP_RECTANGLE_OPTIONS_PROP_LAST + 1,
+  PROP_CORNER_RADIUS
+};
+
+
+static void   gimp_rectangle_select_options_set_property (GObject      *object,
+                                                          guint         property_id,
+                                                          const GValue *value,
+                                                          GParamSpec   *pspec);
+static void   gimp_rectangle_select_options_get_property (GObject      *object,
+                                                          guint         property_id,
+                                                          GValue       *value,
+                                                          GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpRectangleSelectOptions,
+                         gimp_rectangle_select_options,
+                         GIMP_TYPE_SELECTION_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_RECTANGLE_OPTIONS,
+                                                NULL))
+
+
+static void
+gimp_rectangle_select_options_class_init (GimpRectangleSelectOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_rectangle_select_options_set_property;
+  object_class->get_property = gimp_rectangle_select_options_get_property;
+
+  /* The 'highlight' property is defined here because we want different
+   * default values for the Crop and the Rectangle Select tools.
+   */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class,
+                            GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
+                            "highlight",
+                            _("Highlight"),
+                            _("Dim everything outside selection"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class,
+                           GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT_OPACITY,
+                           "highlight-opacity",
+                           _("Highlight opacity"),
+                           _("How much to dim everything outside selection"),
+                           0.0, 1.0, 0.5,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ROUND_CORNERS,
+                            "round-corners",
+                            _("Rounded corners"),
+                            _("Round corners of selection"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_CORNER_RADIUS,
+                           "corner-radius",
+                           _("Radius"),
+                           _("Radius of rounding in pixels"),
+                           0.0, 10000.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  gimp_rectangle_options_install_properties (object_class);
+}
+
+static void
+gimp_rectangle_select_options_init (GimpRectangleSelectOptions *options)
+{
+}
+
+static void
+gimp_rectangle_select_options_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpRectangleSelectOptions *options = GIMP_RECTANGLE_SELECT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ROUND_CORNERS:
+      options->round_corners = g_value_get_boolean (value);
+      break;
+
+    case PROP_CORNER_RADIUS:
+      options->corner_radius = g_value_get_double (value);
+      break;
+
+    default:
+      gimp_rectangle_options_set_property (object, property_id, value, pspec);
+      break;
+    }
+}
+
+static void
+gimp_rectangle_select_options_get_property (GObject    *object,
+                                            guint       property_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpRectangleSelectOptions *options = GIMP_RECTANGLE_SELECT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_ROUND_CORNERS:
+      g_value_set_boolean (value, options->round_corners);
+      break;
+
+    case PROP_CORNER_RADIUS:
+      g_value_set_double (value, options->corner_radius);
+      break;
+
+    default:
+      gimp_rectangle_options_get_property (object, property_id, value, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_rectangle_select_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_selection_options_gui (tool_options);
+
+  /*  the round corners frame  */
+  if (tool_options->tool_info->tool_type == GIMP_TYPE_RECTANGLE_SELECT_TOOL)
+    {
+      GtkWidget *frame;
+      GtkWidget *scale;
+      GtkWidget *toggle;
+
+      scale = gimp_prop_spin_scale_new (config, "corner-radius", NULL,
+                                        1.0, 10.0, 1);
+      gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale),
+                                        0.0, 1000.0);
+      gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), 1.7);
+
+      frame = gimp_prop_expanding_frame_new (config, "round-corners", NULL,
+                                             scale, NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      gtk_widget_show (frame);
+
+      toggle = GIMP_SELECTION_OPTIONS (tool_options)->antialias_toggle;
+
+      g_object_bind_property (config, "round-corners",
+                              toggle, "sensitive",
+                              G_BINDING_SYNC_CREATE);
+    }
+
+  /*  the rectangle options  */
+  {
+    GtkWidget *vbox_rectangle;
+
+    vbox_rectangle = gimp_rectangle_options_gui (tool_options);
+    gtk_box_pack_start (GTK_BOX (vbox), vbox_rectangle, FALSE, FALSE, 0);
+    gtk_widget_show (vbox_rectangle);
+  }
+
+  return vbox;
+}
diff --git a/app/tools/gimprectangleselectoptions.h b/app/tools/gimprectangleselectoptions.h
new file mode 100644
index 0000000..cf56f8f
--- /dev/null
+++ b/app/tools/gimprectangleselectoptions.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RECTANGLE_SELECT_OPTIONS_H__
+#define __GIMP_RECTANGLE_SELECT_OPTIONS_H__
+
+
+#include "gimpselectionoptions.h"
+
+
+#define GIMP_TYPE_RECTANGLE_SELECT_OPTIONS            (gimp_rectangle_select_options_get_type ())
+#define GIMP_RECTANGLE_SELECT_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RECTANGLE_SELECT_OPTIONS, GimpRectangleSelectOptions))
+#define GIMP_RECTANGLE_SELECT_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RECTANGLE_SELECT_OPTIONS, GimpRectangleSelectOptionsClass))
+#define GIMP_IS_RECTANGLE_SELECT_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RECTANGLE_SELECT_OPTIONS))
+#define GIMP_IS_RECTANGLE_SELECT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_RECTANGLE_SELECT_OPTIONS))
+#define GIMP_RECTANGLE_SELECT_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_RECTANGLE_SELECT_OPTIONS, GimpRectangleSelectOptionsClass))
+
+
+typedef struct _GimpRectangleSelectOptions GimpRectangleSelectOptions;
+typedef struct _GimpToolOptionsClass       GimpRectangleSelectOptionsClass;
+
+struct _GimpRectangleSelectOptions
+{
+  GimpSelectionOptions  parent_instance;
+
+  gboolean              round_corners;
+  gdouble               corner_radius;
+};
+
+
+GType       gimp_rectangle_select_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_rectangle_select_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_RECTANGLE_SELECT_OPTIONS_H__ */
diff --git a/app/tools/gimprectangleselecttool.c b/app/tools/gimprectangleselecttool.c
new file mode 100644
index 0000000..65f596d
--- /dev/null
+++ b/app/tools/gimprectangleselecttool.c
@@ -0,0 +1,918 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel-select.h"
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimppickable.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolrectangle.h"
+
+#include "gimpeditselectiontool.h"
+#include "gimprectangleoptions.h"
+#include "gimprectangleselecttool.h"
+#include "gimprectangleselectoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpRectangleSelectToolPrivate
+{
+  GimpChannelOps  operation;    /* remember for use when modifying   */
+  gboolean        use_saved_op; /* use operation or get from options */
+
+  gdouble         press_x;
+  gdouble         press_y;
+
+  GimpToolWidget *widget;
+  GimpToolWidget *grab_widget;
+  GList          *bindings;
+};
+
+
+static void     gimp_rectangle_select_tool_control        (GimpTool              *tool,
+                                                           GimpToolAction         action,
+                                                           GimpDisplay           *display);
+static void     gimp_rectangle_select_tool_button_press   (GimpTool              *tool,
+                                                           const GimpCoords      *coords,
+                                                           guint32                time,
+                                                           GdkModifierType        state,
+                                                           GimpButtonPressType    press_type,
+                                                           GimpDisplay           *display);
+static void     gimp_rectangle_select_tool_button_release (GimpTool              *tool,
+                                                           const GimpCoords      *coords,
+                                                           guint32                time,
+                                                           GdkModifierType        state,
+                                                           GimpButtonReleaseType  release_type,
+                                                           GimpDisplay           *display);
+static void     gimp_rectangle_select_tool_motion         (GimpTool              *tool,
+                                                           const GimpCoords      *coords,
+                                                           guint32                time,
+                                                           GdkModifierType        state,
+                                                           GimpDisplay           *display);
+static gboolean gimp_rectangle_select_tool_key_press      (GimpTool              *tool,
+                                                           GdkEventKey           *kevent,
+                                                           GimpDisplay           *display);
+static void     gimp_rectangle_select_tool_oper_update    (GimpTool              *tool,
+                                                           const GimpCoords      *coords,
+                                                           GdkModifierType        state,
+                                                           gboolean               proximity,
+                                                           GimpDisplay           *display);
+static void     gimp_rectangle_select_tool_cursor_update  (GimpTool              *tool,
+                                                           const GimpCoords      *coords,
+                                                           GdkModifierType        state,
+                                                           GimpDisplay           *display);
+static void     gimp_rectangle_select_tool_options_notify (GimpTool              *tool,
+                                                           GimpToolOptions       *options,
+                                                           const GParamSpec      *pspec);
+
+static gboolean gimp_rectangle_select_tool_select         (GimpRectangleSelectTool *rect_tool,
+                                                           gint                   x,
+                                                           gint                   y,
+                                                           gint                   w,
+                                                           gint                   h);
+static void     gimp_rectangle_select_tool_real_select    (GimpRectangleSelectTool *rect_tool,
+                                                           GimpChannelOps         operation,
+                                                           gint                   x,
+                                                           gint                   y,
+                                                           gint                   w,
+                                                           gint                   h);
+
+static void     gimp_rectangle_select_tool_rectangle_response
+                                                          (GimpToolWidget          *widget,
+                                                           gint                     response_id,
+                                                           GimpRectangleSelectTool *rect_tool);
+static void     gimp_rectangle_select_tool_rectangle_change_complete
+                                                          (GimpToolWidget          *widget,
+                                                           GimpRectangleSelectTool *rect_tool);
+
+static void     gimp_rectangle_select_tool_start          (GimpRectangleSelectTool *rect_tool,
+                                                           GimpDisplay             *display);
+static void     gimp_rectangle_select_tool_commit         (GimpRectangleSelectTool *rect_tool);
+static void     gimp_rectangle_select_tool_halt           (GimpRectangleSelectTool *rect_tool);
+
+static GimpChannelOps
+                gimp_rectangle_select_tool_get_operation  (GimpRectangleSelectTool *rect_tool);
+static void     gimp_rectangle_select_tool_update_option_defaults
+                                                          (GimpRectangleSelectTool *rect_tool,
+                                                           gboolean                 ignore_pending);
+static void     gimp_rectangle_select_tool_update         (GimpRectangleSelectTool *rect_tool);
+static void     gimp_rectangle_select_tool_auto_shrink    (GimpRectangleSelectTool *rect_tool);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpRectangleSelectTool, gimp_rectangle_select_tool,
+                            GIMP_TYPE_SELECTION_TOOL)
+
+#define parent_class gimp_rectangle_select_tool_parent_class
+
+
+void
+gimp_rectangle_select_tool_register (GimpToolRegisterCallback  callback,
+                                     gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_RECTANGLE_SELECT_TOOL,
+                GIMP_TYPE_RECTANGLE_SELECT_OPTIONS,
+                gimp_rectangle_select_options_gui,
+                0,
+                "gimp-rect-select-tool",
+                _("Rectangle Select"),
+                _("Rectangle Select Tool: Select a rectangular region"),
+                N_("_Rectangle Select"), "R",
+                NULL, GIMP_HELP_TOOL_RECT_SELECT,
+                GIMP_ICON_TOOL_RECT_SELECT,
+                data);
+}
+
+static void
+gimp_rectangle_select_tool_class_init (GimpRectangleSelectToolClass *klass)
+{
+  GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
+
+  tool_class->control        = gimp_rectangle_select_tool_control;
+  tool_class->button_press   = gimp_rectangle_select_tool_button_press;
+  tool_class->button_release = gimp_rectangle_select_tool_button_release;
+  tool_class->motion         = gimp_rectangle_select_tool_motion;
+  tool_class->key_press      = gimp_rectangle_select_tool_key_press;
+  tool_class->oper_update    = gimp_rectangle_select_tool_oper_update;
+  tool_class->cursor_update  = gimp_rectangle_select_tool_cursor_update;
+  tool_class->options_notify = gimp_rectangle_select_tool_options_notify;
+
+  klass->select              = gimp_rectangle_select_tool_real_select;
+}
+
+static void
+gimp_rectangle_select_tool_init (GimpRectangleSelectTool *rect_tool)
+{
+  GimpTool *tool = GIMP_TOOL (rect_tool);
+
+  rect_tool->private =
+    gimp_rectangle_select_tool_get_instance_private (rect_tool);
+
+  gimp_tool_control_set_wants_click      (tool->control, TRUE);
+  gimp_tool_control_set_active_modifiers (tool->control,
+                                          GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+  gimp_tool_control_set_precision        (tool->control,
+                                          GIMP_CURSOR_PRECISION_PIXEL_BORDER);
+  gimp_tool_control_set_tool_cursor      (tool->control,
+                                          GIMP_TOOL_CURSOR_RECT_SELECT);
+  gimp_tool_control_set_preserve         (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask       (tool->control,
+                                          GIMP_DIRTY_IMAGE_SIZE |
+                                          GIMP_DIRTY_SELECTION);
+  gimp_tool_control_set_dirty_action     (tool->control,
+                                          GIMP_TOOL_ACTION_COMMIT);
+}
+
+static void
+gimp_rectangle_select_tool_control (GimpTool       *tool,
+                                    GimpToolAction  action,
+                                    GimpDisplay    *display)
+{
+  GimpRectangleSelectTool *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_rectangle_select_tool_halt (rect_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_rectangle_select_tool_commit (rect_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_rectangle_select_tool_button_press (GimpTool            *tool,
+                                         const GimpCoords    *coords,
+                                         guint32              time,
+                                         GdkModifierType      state,
+                                         GimpButtonPressType  press_type,
+                                         GimpDisplay         *display)
+{
+  GimpRectangleSelectTool        *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+  GimpRectangleSelectToolPrivate *private   = rect_tool->private;
+  GimpRectangleFunction           function;
+
+  if (tool->display && display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+
+  if (gimp_selection_tool_start_edit (GIMP_SELECTION_TOOL (tool),
+                                      display, coords))
+    {
+      /* In some cases we want to finish the rectangle select tool
+       * and hand over responsibility to the selection tool
+       */
+
+      gboolean zero_rect = FALSE;
+
+      if (private->widget)
+        {
+          gdouble x1, y1, x2, y2;
+
+          gimp_tool_rectangle_get_public_rect (GIMP_TOOL_RECTANGLE (private->widget),
+                                               &x1, &y1, &x2, &y2);
+          if (x1 == x2 && y1 == y2)
+            zero_rect = TRUE;
+        }
+
+      /* Don't commit a zero-size rectangle, it would look like a
+       * click to commit() and that could anchor the floating
+       * selection or do other evil things. Instead, simply cancel a
+       * zero-size rectangle. See bug #796073.
+       */
+      if (zero_rect)
+        gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      else
+        gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+
+      gimp_rectangle_select_tool_update_option_defaults (rect_tool, TRUE);
+      return;
+    }
+
+  if (! tool->display)
+    {
+      gimp_rectangle_select_tool_start (rect_tool, display);
+
+      gimp_tool_widget_hover (private->widget, coords, state, TRUE);
+
+      /* HACK: force CREATING on a newly created rectangle; otherwise,
+       * the above binding of properties would cause the rectangle to
+       * start with the size from tool options.
+       */
+      gimp_tool_rectangle_set_function (GIMP_TOOL_RECTANGLE (private->widget),
+                                        GIMP_TOOL_RECTANGLE_CREATING);
+    }
+
+  /* if the shift or ctrl keys are down, we don't want to adjust, we
+   * want to create a new rectangle, regardless of pointer loc
+   */
+  if (state & (gimp_get_extend_selection_mask () |
+               gimp_get_modify_selection_mask ()))
+    {
+      gimp_tool_rectangle_set_function (GIMP_TOOL_RECTANGLE (private->widget),
+                                        GIMP_TOOL_RECTANGLE_CREATING);
+    }
+
+  if (gimp_tool_widget_button_press (private->widget, coords, time, state,
+                                     press_type))
+    {
+      private->grab_widget = private->widget;
+    }
+
+  private->press_x = coords->x;
+  private->press_y = coords->y;
+
+  /* if we have an existing rectangle in the current display, then
+   * we have already "executed", and need to undo at this point,
+   * unless the user has done something in the meantime
+   */
+  function =
+    gimp_tool_rectangle_get_function (GIMP_TOOL_RECTANGLE (private->widget));
+
+  if (function == GIMP_TOOL_RECTANGLE_CREATING)
+    private->use_saved_op = FALSE;
+
+  gimp_selection_tool_start_change (
+    GIMP_SELECTION_TOOL (tool),
+    function == GIMP_TOOL_RECTANGLE_CREATING,
+    gimp_rectangle_select_tool_get_operation (rect_tool));
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_rectangle_select_tool_button_release (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           guint32                time,
+                                           GdkModifierType        state,
+                                           GimpButtonReleaseType  release_type,
+                                           GimpDisplay           *display)
+{
+  GimpRectangleSelectTool        *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+  GimpRectangleSelectToolPrivate *priv      = rect_tool->private;
+
+  gimp_tool_control_halt (tool->control);
+
+  gimp_selection_tool_end_change (GIMP_SELECTION_TOOL (tool),
+                                  /* if the user has not moved the mouse,
+                                   * cancel the change
+                                   */
+                                  release_type == GIMP_BUTTON_RELEASE_CLICK ||
+                                  release_type == GIMP_BUTTON_RELEASE_CANCEL);
+
+  gimp_tool_pop_status (tool, display);
+
+  if (priv->grab_widget)
+    {
+      gimp_tool_widget_button_release (priv->grab_widget,
+                                       coords, time, state, release_type);
+      priv->grab_widget = NULL;
+    }
+}
+
+static void
+gimp_rectangle_select_tool_motion (GimpTool         *tool,
+                                   const GimpCoords *coords,
+                                   guint32           time,
+                                   GdkModifierType   state,
+                                   GimpDisplay      *display)
+{
+  GimpRectangleSelectTool        *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+  GimpRectangleSelectToolPrivate *priv      = rect_tool->private;
+
+  if (priv->grab_widget)
+    {
+      gimp_tool_widget_motion (priv->grab_widget, coords, time, state);
+    }
+}
+
+static gboolean
+gimp_rectangle_select_tool_key_press (GimpTool    *tool,
+                                      GdkEventKey *kevent,
+                                      GimpDisplay *display)
+{
+  GimpRectangleSelectTool        *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+  GimpRectangleSelectToolPrivate *priv      = rect_tool->private;
+
+  if (priv->widget && display == tool->display)
+    {
+      if (gimp_tool_widget_key_press (priv->widget, kevent))
+        return TRUE;
+    }
+
+  return gimp_edit_selection_tool_key_press (tool, kevent, display);
+}
+
+static void
+gimp_rectangle_select_tool_oper_update (GimpTool         *tool,
+                                        const GimpCoords *coords,
+                                        GdkModifierType   state,
+                                        gboolean          proximity,
+                                        GimpDisplay      *display)
+{
+  GimpRectangleSelectTool        *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+  GimpRectangleSelectToolPrivate *priv      = rect_tool->private;
+
+  if (priv->widget && display == tool->display)
+    {
+      gimp_tool_widget_hover (priv->widget, coords, state, proximity);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+}
+
+static void
+gimp_rectangle_select_tool_cursor_update (GimpTool         *tool,
+                                          const GimpCoords *coords,
+                                          GdkModifierType   state,
+                                          GimpDisplay      *display)
+{
+  GimpRectangleSelectTool        *rect_tool = GIMP_RECTANGLE_SELECT_TOOL (tool);
+  GimpRectangleSelectToolPrivate *private   = rect_tool->private;
+  GimpCursorType                  cursor    = GIMP_CURSOR_CROSSHAIR_SMALL;
+  GimpCursorModifier              modifier  = GIMP_CURSOR_MODIFIER_NONE;
+
+  if (private->widget && display == tool->display)
+    {
+      gimp_tool_widget_get_cursor (private->widget, coords, state,
+                                   &cursor, NULL, &modifier);
+    }
+
+  gimp_tool_control_set_cursor          (tool->control, cursor);
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  /* override the previous if shift or ctrl are down */
+  if (state & (gimp_get_extend_selection_mask () |
+               gimp_get_modify_selection_mask ()))
+    {
+      gimp_tool_control_set_cursor (tool->control,
+                                    GIMP_CURSOR_CROSSHAIR_SMALL);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_rectangle_select_tool_options_notify (GimpTool         *tool,
+                                           GimpToolOptions  *options,
+                                           const GParamSpec *pspec)
+{
+  if (! strcmp (pspec->name, "antialias")      ||
+      ! strcmp (pspec->name, "feather")        ||
+      ! strcmp (pspec->name, "feather-radius") ||
+      ! strcmp (pspec->name, "round-corners")  ||
+      ! strcmp (pspec->name, "corner-radius"))
+    {
+      gimp_rectangle_select_tool_update (GIMP_RECTANGLE_SELECT_TOOL (tool));
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+}
+
+static gboolean
+gimp_rectangle_select_tool_select (GimpRectangleSelectTool *rect_tool,
+                                   gint                     x,
+                                   gint                     y,
+                                   gint                     w,
+                                   gint                     h)
+{
+  GimpTool       *tool  = GIMP_TOOL (rect_tool);
+  GimpImage      *image = gimp_display_get_image (tool->display);
+  gboolean        rectangle_exists;
+  GimpChannelOps  operation;
+
+  gimp_tool_pop_status (tool, tool->display);
+
+  rectangle_exists = (x <= gimp_image_get_width  (image) &&
+                      y <= gimp_image_get_height (image) &&
+                      x + w >= 0                         &&
+                      y + h >= 0                         &&
+                      w > 0                              &&
+                      h > 0);
+
+  operation = gimp_rectangle_select_tool_get_operation (rect_tool);
+
+  /* if rectangle exists, turn it into a selection */
+  if (rectangle_exists)
+    {
+      gimp_selection_tool_start_change (GIMP_SELECTION_TOOL (rect_tool),
+                                        FALSE,
+                                        operation);
+
+      GIMP_RECTANGLE_SELECT_TOOL_GET_CLASS (rect_tool)->select (rect_tool,
+                                                                operation,
+                                                                x, y, w, h);
+
+      gimp_selection_tool_end_change (GIMP_SELECTION_TOOL (rect_tool),
+                                      FALSE);
+    }
+
+  return rectangle_exists;
+}
+
+static void
+gimp_rectangle_select_tool_real_select (GimpRectangleSelectTool *rect_tool,
+                                        GimpChannelOps           operation,
+                                        gint                     x,
+                                        gint                     y,
+                                        gint                     w,
+                                        gint                     h)
+{
+  GimpTool                   *tool    = GIMP_TOOL (rect_tool);
+  GimpSelectionOptions       *options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpRectangleSelectOptions *rect_options;
+  GimpChannel                *channel;
+
+  rect_options = GIMP_RECTANGLE_SELECT_TOOL_GET_OPTIONS (tool);
+
+  channel = gimp_image_get_mask (gimp_display_get_image (tool->display));
+
+  if (rect_options->round_corners)
+    {
+      /* To prevent elliptification of the rectangle,
+       * we must cap the corner radius.
+       */
+      gdouble max    = MIN (w / 2.0, h / 2.0);
+      gdouble radius = MIN (rect_options->corner_radius, max);
+
+      gimp_channel_select_round_rect (channel,
+                                      x, y, w, h,
+                                      radius, radius,
+                                      operation,
+                                      options->antialias,
+                                      options->feather,
+                                      options->feather_radius,
+                                      options->feather_radius,
+                                      TRUE);
+    }
+  else
+    {
+      gimp_channel_select_rectangle (channel,
+                                     x, y, w, h,
+                                     operation,
+                                     options->feather,
+                                     options->feather_radius,
+                                     options->feather_radius,
+                                     TRUE);
+    }
+}
+
+static void
+gimp_rectangle_select_tool_rectangle_response (GimpToolWidget          *widget,
+                                               gint                     response_id,
+                                               GimpRectangleSelectTool *rect_tool)
+{
+  GimpTool *tool = GIMP_TOOL (rect_tool);
+
+  switch (response_id)
+    {
+    case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM:
+      {
+        gdouble x1, y1, x2, y2;
+
+        gimp_tool_rectangle_get_public_rect (GIMP_TOOL_RECTANGLE (widget),
+                                             &x1, &y1, &x2, &y2);
+        if (x1 == x2 && y1 == y2)
+          {
+            /*  if there are no extents, we got here because of a
+             *  click, call commit() directly because we might want to
+             *  reconfigure the rectangle and continue, instead of
+             *  HALTing it like calling COMMIT would do
+             */
+            gimp_rectangle_select_tool_commit (rect_tool);
+
+            gimp_tool_rectangle_get_public_rect (GIMP_TOOL_RECTANGLE (widget),
+                                                 &x1, &y1, &x2, &y2);
+            if (x1 == x2 && y1 == y2)
+              {
+                /*  if there still is no rectangle after the
+                 *  tool_commit(), the click was outside the selection
+                 *  and we HALT to get rid of a zero-size tool widget.
+                 */
+                gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+              }
+         }
+        else
+          {
+            gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, tool->display);
+          }
+      }
+      break;
+
+    case GIMP_TOOL_WIDGET_RESPONSE_CANCEL:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      break;
+    }
+}
+
+static void
+gimp_rectangle_select_tool_rectangle_change_complete (GimpToolWidget          *widget,
+                                                      GimpRectangleSelectTool *rect_tool)
+{
+  gimp_rectangle_select_tool_update (rect_tool);
+}
+
+static void
+gimp_rectangle_select_tool_start (GimpRectangleSelectTool *rect_tool,
+                                  GimpDisplay             *display)
+{
+  static const gchar *properties[] =
+  {
+    "highlight",
+    "highlight-opacity",
+    "guide",
+    "round-corners",
+    "corner-radius",
+    "x",
+    "y",
+    "width",
+    "height",
+    "fixed-rule-active",
+    "fixed-rule",
+    "desired-fixed-width",
+    "desired-fixed-height",
+    "desired-fixed-size-width",
+    "desired-fixed-size-height",
+    "aspect-numerator",
+    "aspect-denominator",
+    "fixed-center"
+  };
+
+  GimpTool                       *tool    = GIMP_TOOL (rect_tool);
+  GimpRectangleSelectToolPrivate *private = rect_tool->private;
+  GimpDisplayShell               *shell   = gimp_display_get_shell (display);
+  GimpRectangleSelectOptions     *options;
+  GimpToolWidget                 *widget;
+  gboolean                        draw_ellipse;
+  gint                            i;
+
+  options = GIMP_RECTANGLE_SELECT_TOOL_GET_OPTIONS (rect_tool);
+
+  tool->display = display;
+
+  private->widget = widget = gimp_tool_rectangle_new (shell);
+
+  draw_ellipse = GIMP_RECTANGLE_SELECT_TOOL_GET_CLASS (rect_tool)->draw_ellipse;
+
+  g_object_set (widget,
+                "draw-ellipse", draw_ellipse,
+                "status-title", draw_ellipse ? _("Ellipse: ") : _("Rectangle: "),
+                NULL);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), widget);
+
+  for (i = 0; i < G_N_ELEMENTS (properties); i++)
+    {
+      GBinding *binding =
+        g_object_bind_property (G_OBJECT (options), properties[i],
+                                G_OBJECT (widget),  properties[i],
+                                G_BINDING_SYNC_CREATE |
+                                G_BINDING_BIDIRECTIONAL);
+
+      private->bindings = g_list_prepend (private->bindings, binding);
+    }
+
+  gimp_rectangle_options_connect (GIMP_RECTANGLE_OPTIONS (options),
+                                  gimp_display_get_image (shell->display),
+                                  G_CALLBACK (gimp_rectangle_select_tool_auto_shrink),
+                                  rect_tool);
+
+  g_signal_connect (widget, "response",
+                    G_CALLBACK (gimp_rectangle_select_tool_rectangle_response),
+                    rect_tool);
+  g_signal_connect (widget, "change-complete",
+                    G_CALLBACK (gimp_rectangle_select_tool_rectangle_change_complete),
+                    rect_tool);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+}
+
+/* This function is called if the user clicks and releases the left
+ * button without moving it.  There are the things we might want
+ * to do here:
+ * 1) If there is an existing rectangle and we are inside it, we
+ *    convert it into a selection.
+ * 2) If there is an existing rectangle and we are outside it, we
+ *    clear it.
+ * 3) If there is no rectangle and there is a floating selection,
+ *    we anchor it.
+ * 4) If there is no rectangle and we are inside the selection, we
+ *    create a rectangle from the selection bounds.
+ * 5) If there is no rectangle and we are outside the selection,
+ *    we clear the selection.
+ */
+static void
+gimp_rectangle_select_tool_commit (GimpRectangleSelectTool *rect_tool)
+{
+  GimpTool                       *tool = GIMP_TOOL (rect_tool);
+  GimpRectangleSelectToolPrivate *priv = rect_tool->private;
+
+  if (priv->widget)
+    {
+      gdouble x1, y1, x2, y2;
+      gint    w, h;
+
+      gimp_tool_rectangle_get_public_rect (GIMP_TOOL_RECTANGLE (priv->widget),
+                                           &x1, &y1, &x2, &y2);
+      w = x2 - x1;
+      h = y2 - y1;
+
+      if (w == 0 && h == 0)
+        {
+          GimpImage   *image     = gimp_display_get_image (tool->display);
+          GimpChannel *selection = gimp_image_get_mask (image);
+          gint         press_x;
+          gint         press_y;
+
+          if (gimp_image_get_floating_selection (image))
+            {
+              floating_sel_anchor (gimp_image_get_floating_selection (image));
+              gimp_image_flush (image);
+
+              return;
+            }
+
+          press_x = ROUND (priv->press_x);
+          press_y = ROUND (priv->press_y);
+
+          /*  if the click was inside the marching ants  */
+          if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (selection),
+                                            press_x, press_y) > 0.5)
+            {
+              gint x, y, w, h;
+
+              if (gimp_item_bounds (GIMP_ITEM (selection), &x, &y, &w, &h))
+                {
+                  g_object_set (priv->widget,
+                                "x1", (gdouble) x,
+                                "y1", (gdouble) y,
+                                "x2", (gdouble) (x + w),
+                                "y2", (gdouble) (y + h),
+                                NULL);
+                }
+
+              gimp_rectangle_select_tool_update (rect_tool);
+            }
+          else
+            {
+              GimpChannelOps  operation;
+
+              /* prevent this change from halting the tool */
+              gimp_tool_control_push_preserve (tool->control, TRUE);
+
+              /* We can conceptually think of a click outside of the
+               * selection as adding a 0px selection. Behave intuitively
+               * for the current selection mode
+               */
+              operation = gimp_rectangle_select_tool_get_operation (rect_tool);
+
+              switch (operation)
+                {
+                case GIMP_CHANNEL_OP_REPLACE:
+                case GIMP_CHANNEL_OP_INTERSECT:
+                  gimp_channel_clear (selection, NULL, TRUE);
+                  gimp_image_flush (image);
+                  break;
+
+                case GIMP_CHANNEL_OP_ADD:
+                case GIMP_CHANNEL_OP_SUBTRACT:
+                default:
+                  /* Do nothing */
+                  break;
+                }
+
+              gimp_tool_control_pop_preserve (tool->control);
+            }
+        }
+
+      gimp_rectangle_select_tool_update_option_defaults (rect_tool, FALSE);
+    }
+}
+
+static void
+gimp_rectangle_select_tool_halt (GimpRectangleSelectTool *rect_tool)
+{
+  GimpTool                       *tool = GIMP_TOOL (rect_tool);
+  GimpRectangleSelectToolPrivate *priv = rect_tool->private;
+  GimpRectangleSelectOptions     *options;
+
+  options = GIMP_RECTANGLE_SELECT_TOOL_GET_OPTIONS (rect_tool);
+
+  if (tool->display)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+
+      gimp_display_shell_set_highlight (shell, NULL, 0.0);
+
+      gimp_rectangle_options_disconnect (GIMP_RECTANGLE_OPTIONS (options),
+                                         G_CALLBACK (gimp_rectangle_select_tool_auto_shrink),
+                                         rect_tool);
+    }
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  /*  disconnect bindings manually so they are really gone *now*, we
+   *  might be in the middle of a signal emission that keeps the
+   *  widget and its bindings alive.
+   */
+  g_list_free_full (priv->bindings, (GDestroyNotify) g_object_unref);
+  priv->bindings = NULL;
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL);
+  g_clear_object (&priv->widget);
+
+  tool->display = NULL;
+
+  gimp_rectangle_select_tool_update_option_defaults (rect_tool, TRUE);
+}
+
+static GimpChannelOps
+gimp_rectangle_select_tool_get_operation (GimpRectangleSelectTool *rect_tool)
+{
+  GimpRectangleSelectToolPrivate *priv = rect_tool->private;
+  GimpSelectionOptions           *options;
+
+  options = GIMP_SELECTION_TOOL_GET_OPTIONS (rect_tool);
+
+  if (priv->use_saved_op)
+    return priv->operation;
+  else
+    return options->operation;
+}
+
+/**
+ * gimp_rectangle_select_tool_update_option_defaults:
+ * @crop_tool:
+ * @ignore_pending: %TRUE to ignore any pending crop rectangle.
+ *
+ * Sets the default Fixed: Aspect ratio and Fixed: Size option
+ * properties.
+ */
+static void
+gimp_rectangle_select_tool_update_option_defaults (GimpRectangleSelectTool *rect_tool,
+                                                   gboolean                 ignore_pending)
+{
+  GimpRectangleSelectToolPrivate *priv = rect_tool->private;
+  GimpTool                       *tool = GIMP_TOOL (rect_tool);
+  GimpRectangleOptions           *rect_options;
+
+  rect_options = GIMP_RECTANGLE_OPTIONS (gimp_tool_get_options (tool));
+
+  if (priv->widget && ! ignore_pending)
+    {
+      /* There is a pending rectangle and we should not ignore it, so
+       * set default Fixed: Size to the same as the current pending
+       * rectangle width/height.
+       */
+
+      gimp_tool_rectangle_pending_size_set (GIMP_TOOL_RECTANGLE (priv->widget),
+                                            G_OBJECT (rect_options),
+                                            "default-aspect-numerator",
+                                            "default-aspect-denominator");
+
+      g_object_set (G_OBJECT (rect_options),
+                    "use-string-current", TRUE,
+                    NULL);
+    }
+  else
+    {
+      g_object_set (G_OBJECT (rect_options),
+                    "default-aspect-numerator",   1.0,
+                    "default-aspect-denominator", 1.0,
+                    NULL);
+
+      g_object_set (G_OBJECT (rect_options),
+                    "use-string-current", FALSE,
+                    NULL);
+    }
+}
+
+static void
+gimp_rectangle_select_tool_update (GimpRectangleSelectTool *rect_tool)
+{
+  GimpTool                       *tool = GIMP_TOOL (rect_tool);
+  GimpRectangleSelectToolPrivate *priv = rect_tool->private;
+
+  /* prevent change in selection from halting the tool */
+  gimp_tool_control_push_preserve (tool->control, TRUE);
+
+  if (tool->display && ! gimp_tool_control_is_active (tool->control))
+    {
+      gdouble x1, y1, x2, y2;
+
+      gimp_tool_rectangle_get_public_rect (GIMP_TOOL_RECTANGLE (priv->widget),
+                                           &x1, &y1, &x2, &y2);
+
+      gimp_rectangle_select_tool_select (rect_tool,
+                                         x1, y1, x2 - x1, y2 - y1);
+
+      if (! priv->use_saved_op)
+        {
+          GimpSelectionOptions *options;
+
+          options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+
+          /* remember the operation now in case we modify the rectangle */
+          priv->operation    = options->operation;
+          priv->use_saved_op = TRUE;
+        }
+    }
+
+  gimp_tool_control_pop_preserve (tool->control);
+
+  gimp_rectangle_select_tool_update_option_defaults (rect_tool, FALSE);
+}
+
+static void
+gimp_rectangle_select_tool_auto_shrink (GimpRectangleSelectTool *rect_tool)
+{
+  GimpRectangleSelectToolPrivate *private = rect_tool->private;
+  gboolean                        shrink_merged;
+
+  g_object_get (gimp_tool_get_options (GIMP_TOOL (rect_tool)),
+                "shrink-merged", &shrink_merged,
+                NULL);
+
+  gimp_tool_rectangle_auto_shrink (GIMP_TOOL_RECTANGLE (private->widget),
+                                   shrink_merged);
+}
diff --git a/app/tools/gimprectangleselecttool.h b/app/tools/gimprectangleselecttool.h
new file mode 100644
index 0000000..eb4d9c3
--- /dev/null
+++ b/app/tools/gimprectangleselecttool.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_RECTANGLE_SELECT_TOOL_H__
+#define  __GIMP_RECTANGLE_SELECT_TOOL_H__
+
+
+#include "gimpselectiontool.h"
+
+
+#define GIMP_TYPE_RECTANGLE_SELECT_TOOL            (gimp_rectangle_select_tool_get_type ())
+#define GIMP_RECTANGLE_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RECTANGLE_SELECT_TOOL, GimpRectangleSelectTool))
+#define GIMP_RECTANGLE_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RECTANGLE_SELECT_TOOL, GimpRectangleSelectToolClass))
+#define GIMP_IS_RECTANGLE_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RECTANGLE_SELECT_TOOL))
+#define GIMP_IS_RECTANGLE_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_RECTANGLE_SELECT_TOOL))
+#define GIMP_RECTANGLE_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_RECTANGLE_SELECT_TOOL, GimpRectangleSelectToolClass))
+
+#define GIMP_RECTANGLE_SELECT_TOOL_GET_OPTIONS(t)  (GIMP_RECTANGLE_SELECT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpRectangleSelectTool        GimpRectangleSelectTool;
+typedef struct _GimpRectangleSelectToolPrivate GimpRectangleSelectToolPrivate;
+typedef struct _GimpRectangleSelectToolClass   GimpRectangleSelectToolClass;
+
+struct _GimpRectangleSelectTool
+{
+  GimpSelectionTool               parent_instance;
+
+  GimpRectangleSelectToolPrivate *private;
+};
+
+struct _GimpRectangleSelectToolClass
+{
+  GimpSelectionToolClass  parent_class;
+
+  void (* select) (GimpRectangleSelectTool *rect_select,
+                   GimpChannelOps           operation,
+                   gint                     x,
+                   gint                     y,
+                   gint                     w,
+                   gint                     h);
+
+  gboolean draw_ellipse;
+};
+
+
+void    gimp_rectangle_select_tool_register (GimpToolRegisterCallback  callback,
+                                             gpointer                  data);
+
+GType   gimp_rectangle_select_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_RECTANGLE_SELECT_TOOL_H__  */
diff --git a/app/tools/gimpregionselectoptions.c b/app/tools/gimpregionselectoptions.c
new file mode 100644
index 0000000..351c08f
--- /dev/null
+++ b/app/tools/gimpregionselectoptions.c
@@ -0,0 +1,290 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpregionselectoptions.h"
+#include "gimpregionselecttool.h"
+#include "gimpfuzzyselecttool.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SELECT_TRANSPARENT,
+  PROP_SAMPLE_MERGED,
+  PROP_DIAGONAL_NEIGHBORS,
+  PROP_THRESHOLD,
+  PROP_SELECT_CRITERION,
+  PROP_DRAW_MASK
+};
+
+
+static void   gimp_region_select_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void   gimp_region_select_options_set_property (GObject         *object,
+                                                       guint            property_id,
+                                                       const GValue    *value,
+                                                       GParamSpec      *pspec);
+static void   gimp_region_select_options_get_property (GObject         *object,
+                                                       guint            property_id,
+                                                       GValue          *value,
+                                                       GParamSpec      *pspec);
+
+static void   gimp_region_select_options_reset        (GimpConfig      *config);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpRegionSelectOptions, gimp_region_select_options,
+                         GIMP_TYPE_SELECTION_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_region_select_options_config_iface_init))
+
+#define parent_class gimp_region_select_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_region_select_options_class_init (GimpRegionSelectOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_region_select_options_set_property;
+  object_class->get_property = gimp_region_select_options_get_property;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SELECT_TRANSPARENT,
+                            "select-transparent",
+                            _("Select transparent areas"),
+                            _("Allow completely transparent regions "
+                              "to be selected"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            _("Base selection on all visible layers"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DIAGONAL_NEIGHBORS,
+                            "diagonal-neighbors",
+                            _("Diagonal neighbors"),
+                            _("Treat diagonally neighboring pixels as "
+                              "connected"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_THRESHOLD,
+                           "threshold",
+                           _("Threshold"),
+                           _("Maximum color difference"),
+                           0.0, 255.0, 15.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_SELECT_CRITERION,
+                         "select-criterion",
+                         _("Select by"),
+                         _("Selection criterion"),
+                         GIMP_TYPE_SELECT_CRITERION,
+                         GIMP_SELECT_CRITERION_COMPOSITE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DRAW_MASK,
+                            "draw-mask",
+                            _("Draw mask"),
+                            _("Draw the selected region's mask"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_region_select_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_region_select_options_reset;
+}
+
+static void
+gimp_region_select_options_init (GimpRegionSelectOptions *options)
+{
+}
+
+static void
+gimp_region_select_options_set_property (GObject      *object,
+                                         guint         property_id,
+                                         const GValue *value,
+                                         GParamSpec   *pspec)
+{
+  GimpRegionSelectOptions *options = GIMP_REGION_SELECT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SELECT_TRANSPARENT:
+      options->select_transparent = g_value_get_boolean (value);
+      break;
+
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+
+    case PROP_DIAGONAL_NEIGHBORS:
+      options->diagonal_neighbors = g_value_get_boolean (value);
+      break;
+
+    case PROP_THRESHOLD:
+      options->threshold = g_value_get_double (value);
+      break;
+
+    case PROP_SELECT_CRITERION:
+      options->select_criterion = g_value_get_enum (value);
+      break;
+
+    case PROP_DRAW_MASK:
+      options->draw_mask = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_region_select_options_get_property (GObject    *object,
+                                         guint       property_id,
+                                         GValue     *value,
+                                         GParamSpec *pspec)
+{
+  GimpRegionSelectOptions *options = GIMP_REGION_SELECT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SELECT_TRANSPARENT:
+      g_value_set_boolean (value, options->select_transparent);
+      break;
+
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+
+    case PROP_DIAGONAL_NEIGHBORS:
+      g_value_set_boolean (value, options->diagonal_neighbors);
+      break;
+
+    case PROP_THRESHOLD:
+      g_value_set_double (value, options->threshold);
+      break;
+
+    case PROP_SELECT_CRITERION:
+      g_value_set_enum (value, options->select_criterion);
+      break;
+
+    case PROP_DRAW_MASK:
+      g_value_set_boolean (value, options->draw_mask);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_region_select_options_reset (GimpConfig *config)
+{
+  GimpToolOptions *tool_options = GIMP_TOOL_OPTIONS (config);
+  GParamSpec      *pspec;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        "threshold");
+
+  if (pspec)
+    G_PARAM_SPEC_DOUBLE (pspec)->default_value =
+      tool_options->tool_info->gimp->config->default_threshold;
+
+  parent_config_iface->reset (config);
+}
+
+GtkWidget *
+gimp_region_select_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config  = G_OBJECT (tool_options);
+  GtkWidget *vbox    = gimp_selection_options_gui (tool_options);
+  GtkWidget *button;
+  GtkWidget *scale;
+  GtkWidget *combo;
+  GType      tool_type;
+
+  tool_type = tool_options->tool_info->tool_type;
+
+  /*  the select transparent areas toggle  */
+  button = gimp_prop_check_button_new (config, "select-transparent", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  the sample merged toggle  */
+  button = gimp_prop_check_button_new (config, "sample-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  the diagonal neighbors toggle  */
+  if (tool_type == GIMP_TYPE_FUZZY_SELECT_TOOL)
+    {
+      button = gimp_prop_check_button_new (config, "diagonal-neighbors", NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+    }
+
+  /*  the threshold scale  */
+  scale = gimp_prop_spin_scale_new (config, "threshold", NULL,
+                                    1.0, 16.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  the select criterion combo  */
+  combo = gimp_prop_enum_combo_box_new (config, "select-criterion", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Select by"));
+  gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
+  gtk_widget_show (combo);
+
+  /*  the show mask toggle  */
+  button = gimp_prop_check_button_new (config, "draw-mask", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return vbox;
+}
diff --git a/app/tools/gimpregionselectoptions.h b/app/tools/gimpregionselectoptions.h
new file mode 100644
index 0000000..24b8b42
--- /dev/null
+++ b/app/tools/gimpregionselectoptions.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_REGION_SELECT_OPTIONS_H__
+#define __GIMP_REGION_SELECT_OPTIONS_H__
+
+
+#include "gimpselectionoptions.h"
+
+
+#define GIMP_TYPE_REGION_SELECT_OPTIONS            (gimp_region_select_options_get_type ())
+#define GIMP_REGION_SELECT_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_REGION_SELECT_OPTIONS, GimpRegionSelectOptions))
+#define GIMP_REGION_SELECT_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_REGION_SELECT_OPTIONS, GimpRegionSelectOptionsClass))
+#define GIMP_IS_REGION_SELECT_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_REGION_SELECT_OPTIONS))
+#define GIMP_IS_REGION_SELECT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_REGION_SELECT_OPTIONS))
+#define GIMP_REGION_SELECT_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_REGION_SELECT_OPTIONS, GimpRegionSelectOptionsClass))
+
+
+typedef struct _GimpRegionSelectOptions GimpRegionSelectOptions;
+typedef struct _GimpToolOptionsClass    GimpRegionSelectOptionsClass;
+
+struct _GimpRegionSelectOptions
+{
+  GimpSelectionOptions  parent_instance;
+
+  gboolean              select_transparent;
+  gboolean              sample_merged;
+  gboolean              diagonal_neighbors;
+  gdouble               threshold;
+  GimpSelectCriterion   select_criterion;
+  gboolean              draw_mask;
+};
+
+
+GType       gimp_region_select_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_region_select_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_REGION_SELECT_OPTIONS_H__  */
diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c
new file mode 100644
index 0000000..fe08533
--- /dev/null
+++ b/app/tools/gimpregionselecttool.c
@@ -0,0 +1,386 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpregionselecttool.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpboundary.h"
+#include "core/gimpchannel.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer-floating-selection.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-cursor.h"
+
+#include "gimpregionselectoptions.h"
+#include "gimpregionselecttool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_region_select_tool_finalize       (GObject               *object);
+
+static void   gimp_region_select_tool_button_press   (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      guint32                time,
+                                                      GdkModifierType        state,
+                                                      GimpButtonPressType    press_type,
+                                                      GimpDisplay           *display);
+static void   gimp_region_select_tool_button_release (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      guint32                time,
+                                                      GdkModifierType        state,
+                                                      GimpButtonReleaseType  release_type,
+                                                      GimpDisplay           *display);
+static void   gimp_region_select_tool_motion         (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      guint32                time,
+                                                      GdkModifierType        state,
+                                                      GimpDisplay           *display);
+static void   gimp_region_select_tool_cursor_update  (GimpTool              *tool,
+                                                      const GimpCoords      *coords,
+                                                      GdkModifierType        state,
+                                                      GimpDisplay           *display);
+
+static void   gimp_region_select_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void   gimp_region_select_tool_get_mask       (GimpRegionSelectTool  *region_sel,
+                                                      GimpDisplay           *display);
+
+
+G_DEFINE_TYPE (GimpRegionSelectTool, gimp_region_select_tool,
+               GIMP_TYPE_SELECTION_TOOL)
+
+#define parent_class gimp_region_select_tool_parent_class
+
+
+static void
+gimp_region_select_tool_class_init (GimpRegionSelectToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->finalize     = gimp_region_select_tool_finalize;
+
+  tool_class->button_press   = gimp_region_select_tool_button_press;
+  tool_class->button_release = gimp_region_select_tool_button_release;
+  tool_class->motion         = gimp_region_select_tool_motion;
+  tool_class->cursor_update  = gimp_region_select_tool_cursor_update;
+
+  draw_tool_class->draw      = gimp_region_select_tool_draw;
+}
+
+static void
+gimp_region_select_tool_init (GimpRegionSelectTool *region_select)
+{
+  GimpTool *tool = GIMP_TOOL (region_select);
+
+  gimp_tool_control_set_scroll_lock (tool->control, TRUE);
+
+  region_select->x               = 0;
+  region_select->y               = 0;
+  region_select->saved_threshold = 0.0;
+
+  region_select->region_mask     = NULL;
+  region_select->segs            = NULL;
+  region_select->n_segs          = 0;
+}
+
+static void
+gimp_region_select_tool_finalize (GObject *object)
+{
+  GimpRegionSelectTool *region_sel = GIMP_REGION_SELECT_TOOL (object);
+
+  g_clear_object (&region_sel->region_mask);
+
+  g_clear_pointer (&region_sel->segs, g_free);
+  region_sel->n_segs = 0;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_region_select_tool_button_press (GimpTool            *tool,
+                                      const GimpCoords    *coords,
+                                      guint32              time,
+                                      GdkModifierType      state,
+                                      GimpButtonPressType  press_type,
+                                      GimpDisplay         *display)
+{
+  GimpRegionSelectTool    *region_sel = GIMP_REGION_SELECT_TOOL (tool);
+  GimpRegionSelectOptions *options    = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (tool);
+
+  region_sel->x               = coords->x;
+  region_sel->y               = coords->y;
+  region_sel->saved_threshold = options->threshold;
+
+  if (gimp_selection_tool_start_edit (GIMP_SELECTION_TOOL (region_sel),
+                                      display, coords))
+    {
+      return;
+    }
+
+  gimp_tool_control_activate (tool->control);
+  tool->display = display;
+
+  gimp_tool_push_status (tool, display,
+                         _("Move the mouse to change threshold"));
+
+  gimp_region_select_tool_get_mask (region_sel, display);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+}
+
+static void
+gimp_region_select_tool_button_release (GimpTool              *tool,
+                                        const GimpCoords      *coords,
+                                        guint32                time,
+                                        GdkModifierType        state,
+                                        GimpButtonReleaseType  release_type,
+                                        GimpDisplay           *display)
+{
+  GimpRegionSelectTool    *region_sel  = GIMP_REGION_SELECT_TOOL (tool);
+  GimpSelectionOptions    *sel_options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpRegionSelectOptions *options     = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (tool);
+  GimpImage               *image       = gimp_display_get_image (display);
+
+  gimp_tool_pop_status (tool, display);
+
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  gimp_tool_control_halt (tool->control);
+
+  if (options->draw_mask)
+    gimp_display_shell_set_mask (gimp_display_get_shell (display),
+                                 NULL, 0, 0, NULL, FALSE);
+
+  if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      if (GIMP_SELECTION_TOOL (tool)->function == SELECTION_ANCHOR)
+        {
+          if (gimp_image_get_floating_selection (image))
+            {
+              /*  If there is a floating selection, anchor it  */
+              floating_sel_anchor (gimp_image_get_floating_selection (image));
+            }
+          else
+            {
+              /*  Otherwise, clear the selection mask  */
+              gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
+            }
+
+          gimp_image_flush (image);
+        }
+      else if (region_sel->region_mask)
+        {
+          gint off_x = 0;
+          gint off_y = 0;
+
+          if (! options->sample_merged)
+            {
+              GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+              gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+            }
+
+          gimp_channel_select_buffer (gimp_image_get_mask (image),
+                                      GIMP_REGION_SELECT_TOOL_GET_CLASS (tool)->undo_desc,
+                                      region_sel->region_mask,
+                                      off_x,
+                                      off_y,
+                                      sel_options->operation,
+                                      sel_options->feather,
+                                      sel_options->feather_radius,
+                                      sel_options->feather_radius);
+
+
+          gimp_image_flush (image);
+        }
+    }
+
+  g_clear_object (&region_sel->region_mask);
+
+  g_clear_pointer (&region_sel->segs, g_free);
+  region_sel->n_segs = 0;
+
+  /*  Restore the original threshold  */
+  g_object_set (options,
+                "threshold", region_sel->saved_threshold,
+                NULL);
+}
+
+static void
+gimp_region_select_tool_motion (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                guint32           time,
+                                GdkModifierType   state,
+                                GimpDisplay      *display)
+{
+  GimpRegionSelectTool    *region_sel = GIMP_REGION_SELECT_TOOL (tool);
+  GimpRegionSelectOptions *options    = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (tool);
+  gint                     diff_x, diff_y;
+  gdouble                  diff;
+
+  static guint32 last_time = 0;
+
+  /* don't let the events come in too fast, ignore below a delay of 100 ms */
+  if (time - last_time < 100)
+    return;
+
+  last_time = time;
+
+  diff_x = coords->x - region_sel->x;
+  diff_y = coords->y - region_sel->y;
+
+  diff = ((ABS (diff_x) > ABS (diff_y)) ? diff_x : diff_y) / 2.0;
+
+  g_object_set (options,
+                "threshold", CLAMP (region_sel->saved_threshold + diff, 0, 255),
+                NULL);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  gimp_region_select_tool_get_mask (region_sel, display);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_region_select_tool_cursor_update (GimpTool         *tool,
+                                       const GimpCoords *coords,
+                                       GdkModifierType   state,
+                                       GimpDisplay      *display)
+{
+  GimpRegionSelectOptions *options  = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (tool);
+  GimpCursorModifier       modifier = GIMP_CURSOR_MODIFIER_NONE;
+  GimpImage               *image    = gimp_display_get_image (display);
+
+  if (! gimp_image_coords_in_active_pickable (image, coords,
+                                              FALSE, options->sample_merged,
+                                              FALSE))
+    modifier = GIMP_CURSOR_MODIFIER_BAD;
+
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_region_select_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpRegionSelectTool    *region_sel = GIMP_REGION_SELECT_TOOL (draw_tool);
+  GimpRegionSelectOptions *options    = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (draw_tool);
+
+  if (! options->draw_mask && region_sel->region_mask)
+    {
+      if (! region_sel->segs)
+        {
+          /*  calculate and allocate a new segment array which represents
+           *  the boundary of the contiguous region
+           */
+          region_sel->segs = gimp_boundary_find (region_sel->region_mask, NULL,
+                                                 babl_format ("Y float"),
+                                                 GIMP_BOUNDARY_WITHIN_BOUNDS,
+                                                 0, 0,
+                                                 gegl_buffer_get_width  (region_sel->region_mask),
+                                                 gegl_buffer_get_height (region_sel->region_mask),
+                                                 GIMP_BOUNDARY_HALF_WAY,
+                                                 &region_sel->n_segs);
+
+        }
+
+      if (region_sel->segs)
+        {
+          gint off_x = 0;
+          gint off_y = 0;
+
+          if (! options->sample_merged)
+            {
+              GimpImage    *image    = gimp_display_get_image (draw_tool->display);
+              GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+              gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+            }
+
+          gimp_draw_tool_add_boundary (draw_tool,
+                                       region_sel->segs,
+                                       region_sel->n_segs,
+                                       NULL,
+                                       off_x, off_y);
+        }
+    }
+}
+
+static void
+gimp_region_select_tool_get_mask (GimpRegionSelectTool *region_sel,
+                                  GimpDisplay          *display)
+{
+  GimpRegionSelectOptions *options = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (region_sel);
+  GimpDisplayShell        *shell   = gimp_display_get_shell (display);
+
+  gimp_display_shell_set_override_cursor (shell, (GimpCursorType) GDK_WATCH);
+
+  g_clear_pointer (&region_sel->segs, g_free);
+  region_sel->n_segs = 0;
+
+  if (region_sel->region_mask)
+    g_object_unref (region_sel->region_mask);
+
+  region_sel->region_mask =
+    GIMP_REGION_SELECT_TOOL_GET_CLASS (region_sel)->get_mask (region_sel,
+                                                              display);
+
+  if (options->draw_mask)
+    {
+      if (region_sel->region_mask)
+        {
+          GimpRGB color = { 1.0, 0.0, 1.0, 1.0 };
+          gint    off_x = 0;
+          gint    off_y = 0;
+
+          if (! options->sample_merged)
+            {
+              GimpImage    *image    = gimp_display_get_image (display);
+              GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+              gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+            }
+
+          gimp_display_shell_set_mask (shell, region_sel->region_mask,
+                                       off_x, off_y, &color, FALSE);
+        }
+      else
+        {
+          gimp_display_shell_set_mask (shell, NULL, 0, 0, NULL, FALSE);
+        }
+    }
+
+  gimp_display_shell_unset_override_cursor (shell);
+}
diff --git a/app/tools/gimpregionselecttool.h b/app/tools/gimpregionselecttool.h
new file mode 100644
index 0000000..63c2551
--- /dev/null
+++ b/app/tools/gimpregionselecttool.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpregionselecttool.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_REGION_SELECT_TOOL_H__
+#define __GIMP_REGION_SELECT_TOOL_H__
+
+
+#include "gimpselectiontool.h"
+
+
+#define GIMP_TYPE_REGION_SELECT_TOOL            (gimp_region_select_tool_get_type ())
+#define GIMP_REGION_SELECT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_REGION_SELECT_TOOL, GimpRegionSelectTool))
+#define GIMP_REGION_SELECT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_REGION_SELECT_TOOL, GimpRegionSelectToolClass))
+#define GIMP_IS_REGION_SELECT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_REGION_SELECT_TOOL))
+#define GIMP_IS_REGION_SELECT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_REGION_SELECT_TOOL))
+#define GIMP_REGION_SELECT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_REGION_SELECT_TOOL, GimpRegionSelectToolClass))
+
+#define GIMP_REGION_SELECT_TOOL_GET_OPTIONS(t)  (GIMP_REGION_SELECT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpRegionSelectTool      GimpRegionSelectTool;
+typedef struct _GimpRegionSelectToolClass GimpRegionSelectToolClass;
+
+struct _GimpRegionSelectTool
+{
+  GimpSelectionTool  parent_instance;
+
+  gint               x, y;
+  gdouble            saved_threshold;
+
+  GeglBuffer        *region_mask;
+  GimpBoundSeg      *segs;
+  gint               n_segs;
+};
+
+struct _GimpRegionSelectToolClass
+{
+  GimpSelectionToolClass parent_class;
+
+  const gchar * undo_desc;
+
+  GeglBuffer * (* get_mask) (GimpRegionSelectTool *region_tool,
+                             GimpDisplay          *display);
+};
+
+
+GType   gimp_region_select_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /* __GIMP_REGION_SELECT_TOOL_H__ */
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
new file mode 100644
index 0000000..b7959eb
--- /dev/null
+++ b/app/tools/gimprotatetool.c
@@ -0,0 +1,537 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppivotselector.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptoolrotategrid.h"
+
+#include "gimprotatetool.h"
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+
+#include "gimp-intl.h"
+
+
+/*  index into trans_info array  */
+enum
+{
+  ANGLE,
+  PIVOT_X,
+  PIVOT_Y
+};
+
+
+#define SB_WIDTH 8
+#define EPSILON  1e-6
+
+
+/*  local function prototypes  */
+
+static gboolean         gimp_rotate_tool_key_press      (GimpTool              *tool,
+                                                         GdkEventKey           *kevent,
+                                                         GimpDisplay           *display);
+
+static gboolean         gimp_rotate_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                                         GimpMatrix3           *transform);
+static void             gimp_rotate_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                                         const GimpMatrix3     *transform);
+static gchar          * gimp_rotate_tool_get_undo_desc  (GimpTransformGridTool *tg_tool);
+static void             gimp_rotate_tool_dialog         (GimpTransformGridTool *tg_tool);
+static void             gimp_rotate_tool_dialog_update  (GimpTransformGridTool *tg_tool);
+static void             gimp_rotate_tool_prepare        (GimpTransformGridTool *tg_tool);
+static void             gimp_rotate_tool_readjust       (GimpTransformGridTool *tg_tool);
+static GimpToolWidget * gimp_rotate_tool_get_widget     (GimpTransformGridTool *tg_tool);
+static void             gimp_rotate_tool_update_widget  (GimpTransformGridTool *tg_tool);
+static void             gimp_rotate_tool_widget_changed (GimpTransformGridTool *tg_tool);
+
+static void             rotate_angle_changed            (GtkAdjustment         *adj,
+                                                         GimpTransformGridTool *tg_tool);
+static void             rotate_center_changed           (GtkWidget             *entry,
+                                                         GimpTransformGridTool *tg_tool);
+static void             rotate_pivot_changed            (GimpPivotSelector     *selector,
+                                                         GimpTransformGridTool *tg_tool);
+
+
+G_DEFINE_TYPE (GimpRotateTool, gimp_rotate_tool, GIMP_TYPE_TRANSFORM_GRID_TOOL)
+
+#define parent_class gimp_rotate_tool_parent_class
+
+
+void
+gimp_rotate_tool_register (GimpToolRegisterCallback  callback,
+                           gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_ROTATE_TOOL,
+                GIMP_TYPE_TRANSFORM_GRID_OPTIONS,
+                gimp_transform_grid_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-rotate-tool",
+                _("Rotate"),
+                _("Rotate Tool: Rotate the layer, selection or path"),
+                N_("_Rotate"), "<shift>R",
+                NULL, GIMP_HELP_TOOL_ROTATE,
+                GIMP_ICON_TOOL_ROTATE,
+                data);
+}
+
+static void
+gimp_rotate_tool_class_init (GimpRotateToolClass *klass)
+{
+  GimpToolClass              *tool_class = GIMP_TOOL_CLASS (klass);
+  GimpTransformToolClass     *tr_class   = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass *tg_class   = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+
+  tool_class->key_press     = gimp_rotate_tool_key_press;
+
+  tg_class->info_to_matrix  = gimp_rotate_tool_info_to_matrix;
+  tg_class->matrix_to_info  = gimp_rotate_tool_matrix_to_info;
+  tg_class->get_undo_desc   = gimp_rotate_tool_get_undo_desc;
+  tg_class->dialog          = gimp_rotate_tool_dialog;
+  tg_class->dialog_update   = gimp_rotate_tool_dialog_update;
+  tg_class->prepare         = gimp_rotate_tool_prepare;
+  tg_class->readjust        = gimp_rotate_tool_readjust;
+  tg_class->get_widget      = gimp_rotate_tool_get_widget;
+  tg_class->update_widget   = gimp_rotate_tool_update_widget;
+  tg_class->widget_changed  = gimp_rotate_tool_widget_changed;
+
+  tr_class->undo_desc       = C_("undo-type", "Rotate");
+  tr_class->progress_text   = _("Rotating");
+  tg_class->ok_button_label = _("R_otate");
+}
+
+static void
+gimp_rotate_tool_init (GimpRotateTool *rotate_tool)
+{
+  GimpTool *tool = GIMP_TOOL (rotate_tool);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_ROTATE);
+}
+
+static gboolean
+gimp_rotate_tool_key_press (GimpTool    *tool,
+                            GdkEventKey *kevent,
+                            GimpDisplay *display)
+{
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (display == draw_tool->display)
+    {
+      GimpRotateTool *rotate     = GIMP_ROTATE_TOOL (tool);
+      GtkSpinButton  *angle_spin = GTK_SPIN_BUTTON (rotate->angle_spin_button);
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Up:
+          gtk_spin_button_spin (angle_spin, GTK_SPIN_STEP_FORWARD, 0.0);
+          return TRUE;
+
+        case GDK_KEY_Down:
+          gtk_spin_button_spin (angle_spin, GTK_SPIN_STEP_BACKWARD, 0.0);
+          return TRUE;
+
+        case GDK_KEY_Right:
+          gtk_spin_button_spin (angle_spin, GTK_SPIN_PAGE_FORWARD, 0.0);
+          return TRUE;
+
+        case GDK_KEY_Left:
+          gtk_spin_button_spin (angle_spin, GTK_SPIN_PAGE_BACKWARD, 0.0);
+          return TRUE;
+
+        default:
+          break;
+        }
+    }
+
+  return GIMP_TOOL_CLASS (parent_class)->key_press (tool, kevent, display);
+}
+
+static gboolean
+gimp_rotate_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                 GimpMatrix3           *transform)
+{
+  gimp_matrix3_identity (transform);
+  gimp_transform_matrix_rotate_center (transform,
+                                       tg_tool->trans_info[PIVOT_X],
+                                       tg_tool->trans_info[PIVOT_Y],
+                                       tg_tool->trans_info[ANGLE]);
+
+  return TRUE;
+}
+
+static void
+gimp_rotate_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                 const GimpMatrix3     *transform)
+{
+  gdouble c;
+  gdouble s;
+  gdouble x;
+  gdouble y;
+  gdouble q;
+
+  c = transform->coeff[0][0];
+  s = transform->coeff[1][0];
+  x = transform->coeff[0][2];
+  y = transform->coeff[1][2];
+
+  tg_tool->trans_info[ANGLE] = atan2 (s, c);
+
+  q = 2.0 * (1.0 - transform->coeff[0][0]);
+
+  if (fabs (q) > EPSILON)
+    {
+      tg_tool->trans_info[PIVOT_X] = ((1.0 - c) * x - s * y) / q;
+      tg_tool->trans_info[PIVOT_Y] = (s * x + (1.0 - c) * y) / q;
+    }
+  else
+    {
+      GimpMatrix3 transfer;
+
+      gimp_transform_grid_tool_info_to_matrix (tg_tool, &transfer);
+      gimp_matrix3_invert (&transfer);
+      gimp_matrix3_mult (transform, &transfer);
+
+      gimp_matrix3_transform_point (&transfer,
+                                    tg_tool->trans_info[PIVOT_X],
+                                    tg_tool->trans_info[PIVOT_Y],
+                                    &tg_tool->trans_info[PIVOT_X],
+                                    &tg_tool->trans_info[PIVOT_Y]);
+    }
+}
+
+static gchar *
+gimp_rotate_tool_get_undo_desc (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  gdouble            center_x;
+  gdouble            center_y;
+
+  center_x = (tr_tool->x1 + tr_tool->x2) / 2.0;
+  center_y = (tr_tool->y1 + tr_tool->y2) / 2.0;
+
+  if (fabs (tg_tool->trans_info[PIVOT_X] - center_x) <= EPSILON &&
+      fabs (tg_tool->trans_info[PIVOT_Y] - center_y) <= EPSILON)
+    {
+      return g_strdup_printf (C_("undo-type",
+                                 "Rotate by %-3.3g°"),
+                              gimp_rad_to_deg (tg_tool->trans_info[ANGLE]));
+    }
+  else
+    {
+      return g_strdup_printf (C_("undo-type",
+                                 "Rotate by %-3.3g° around (%g, %g)"),
+                              gimp_rad_to_deg (tg_tool->trans_info[ANGLE]),
+                              tg_tool->trans_info[PIVOT_X],
+                              tg_tool->trans_info[PIVOT_Y]);
+    }
+}
+
+static void
+gimp_rotate_tool_dialog (GimpTransformGridTool *tg_tool)
+{
+  GimpRotateTool *rotate = GIMP_ROTATE_TOOL (tg_tool);
+  GtkWidget      *table;
+  GtkWidget      *button;
+  GtkWidget      *scale;
+  GtkAdjustment  *adj;
+
+  table = gtk_table_new (4, 3, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 1, 6);
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (tg_tool->gui)), table,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  rotate->angle_adj = (GtkAdjustment *)
+    gtk_adjustment_new (0, -180, 180, 0.1, 15, 0);
+  button = gimp_spin_button_new (rotate->angle_adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (button), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("_Angle:"),
+                             0.0, 0.5, button, 1, TRUE);
+  rotate->angle_spin_button = button;
+
+  g_signal_connect (rotate->angle_adj, "value-changed",
+                    G_CALLBACK (rotate_angle_changed),
+                    tg_tool);
+
+  scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, rotate->angle_adj);
+  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
+  gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2,
+                    GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show (scale);
+
+  adj = (GtkAdjustment *) gtk_adjustment_new (0, -1, 1, 1, 10, 0);
+  button = gimp_spin_button_new (adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Center _X:"),
+                             0.0, 0.5, button, 1, TRUE);
+
+  rotate->sizeentry = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
+                                           TRUE, TRUE, FALSE, SB_WIDTH,
+                                           GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (rotate->sizeentry),
+                             GTK_SPIN_BUTTON (button), NULL);
+  gimp_size_entry_set_pixel_digits (GIMP_SIZE_ENTRY (rotate->sizeentry), 2);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Center _Y:"),
+                             0.0, 0.5, rotate->sizeentry, 1, TRUE);
+
+  g_signal_connect (rotate->sizeentry, "value-changed",
+                    G_CALLBACK (rotate_center_changed),
+                    tg_tool);
+
+  rotate->pivot_selector = gimp_pivot_selector_new (0.0, 0.0, 0.0, 0.0);
+  gtk_table_attach (GTK_TABLE (table), rotate->pivot_selector, 2, 3, 2, 4,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (rotate->pivot_selector);
+
+  g_signal_connect (rotate->pivot_selector, "changed",
+                    G_CALLBACK (rotate_pivot_changed),
+                    tg_tool);
+}
+
+static void
+gimp_rotate_tool_dialog_update (GimpTransformGridTool *tg_tool)
+{
+  GimpRotateTool *rotate = GIMP_ROTATE_TOOL (tg_tool);
+
+  gtk_adjustment_set_value (rotate->angle_adj,
+                            gimp_rad_to_deg (tg_tool->trans_info[ANGLE]));
+
+  g_signal_handlers_block_by_func (rotate->sizeentry,
+                                   rotate_center_changed,
+                                   tg_tool);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (rotate->sizeentry), 0,
+                              tg_tool->trans_info[PIVOT_X]);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (rotate->sizeentry), 1,
+                              tg_tool->trans_info[PIVOT_Y]);
+
+  g_signal_handlers_unblock_by_func (rotate->sizeentry,
+                                     rotate_center_changed,
+                                     tg_tool);
+
+  g_signal_handlers_block_by_func (rotate->pivot_selector,
+                                   rotate_pivot_changed,
+                                   tg_tool);
+
+  gimp_pivot_selector_set_position (
+    GIMP_PIVOT_SELECTOR (rotate->pivot_selector),
+    tg_tool->trans_info[PIVOT_X],
+    tg_tool->trans_info[PIVOT_Y]);
+
+  g_signal_handlers_unblock_by_func (rotate->pivot_selector,
+                                     rotate_pivot_changed,
+                                     tg_tool);
+}
+
+static void
+gimp_rotate_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpRotateTool    *rotate  = GIMP_ROTATE_TOOL (tg_tool);
+  GimpDisplay       *display = GIMP_TOOL (tg_tool)->display;
+  GimpImage         *image   = gimp_display_get_image (display);
+  gdouble            xres;
+  gdouble            yres;
+
+  tg_tool->trans_info[ANGLE]   = 0.0;
+  tg_tool->trans_info[PIVOT_X] = (gdouble) (tr_tool->x1 + tr_tool->x2) / 2.0;
+  tg_tool->trans_info[PIVOT_Y] = (gdouble) (tr_tool->y1 + tr_tool->y2) / 2.0;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  g_signal_handlers_block_by_func (rotate->sizeentry,
+                                   rotate_center_changed,
+                                   tg_tool);
+
+  gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (rotate->sizeentry),
+                            gimp_display_get_shell (display)->unit);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (rotate->sizeentry), 0,
+                                  xres, FALSE);
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (rotate->sizeentry), 1,
+                                  yres, FALSE);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (rotate->sizeentry), 0,
+                                         -65536,
+                                         65536 +
+                                         gimp_image_get_width (image));
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (rotate->sizeentry), 1,
+                                         -65536,
+                                         65536 +
+                                         gimp_image_get_height (image));
+
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (rotate->sizeentry), 0,
+                            tr_tool->x1, tr_tool->x2);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (rotate->sizeentry), 1,
+                            tr_tool->y1, tr_tool->y2);
+
+  g_signal_handlers_unblock_by_func (rotate->sizeentry,
+                                     rotate_center_changed,
+                                     tg_tool);
+
+  gimp_pivot_selector_set_bounds (GIMP_PIVOT_SELECTOR (rotate->pivot_selector),
+                                  tr_tool->x1, tr_tool->y1,
+                                  tr_tool->x2, tr_tool->y2);
+}
+
+static void
+gimp_rotate_tool_readjust (GimpTransformGridTool *tg_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (tg_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+
+  tg_tool->trans_info[ANGLE] = -gimp_deg_to_rad (shell->rotate_angle);
+
+  if (tg_tool->trans_info[ANGLE] <= -G_PI)
+    tg_tool->trans_info[ANGLE] += 2.0 * G_PI;
+
+  gimp_display_shell_untransform_xy_f (shell,
+                                       shell->disp_width  / 2.0,
+                                       shell->disp_height / 2.0,
+                                       &tg_tool->trans_info[PIVOT_X],
+                                       &tg_tool->trans_info[PIVOT_Y]);
+}
+
+static GimpToolWidget *
+gimp_rotate_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget    *widget;
+
+  widget = gimp_tool_rotate_grid_new (shell,
+                                      tr_tool->x1,
+                                      tr_tool->y1,
+                                      tr_tool->x2,
+                                      tr_tool->y2,
+                                      tg_tool->trans_info[PIVOT_X],
+                                      tg_tool->trans_info[PIVOT_Y],
+                                      tg_tool->trans_info[ANGLE]);
+
+  g_object_set (widget,
+                "inside-function",  GIMP_TRANSFORM_FUNCTION_ROTATE,
+                "outside-function", GIMP_TRANSFORM_FUNCTION_ROTATE,
+                "use-pivot-handle", TRUE,
+                NULL);
+
+  return widget;
+}
+
+static void
+gimp_rotate_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  g_object_set (tg_tool->widget,
+                "angle",   tg_tool->trans_info[ANGLE],
+                "pivot-x", tg_tool->trans_info[PIVOT_X],
+                "pivot-y", tg_tool->trans_info[PIVOT_Y],
+                NULL);
+}
+
+static void
+gimp_rotate_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  g_object_get (tg_tool->widget,
+                "angle",   &tg_tool->trans_info[ANGLE],
+                "pivot-x", &tg_tool->trans_info[PIVOT_X],
+                "pivot-y", &tg_tool->trans_info[PIVOT_Y],
+                NULL);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+rotate_angle_changed (GtkAdjustment         *adj,
+                      GimpTransformGridTool *tg_tool)
+{
+  gdouble value = gimp_deg_to_rad (gtk_adjustment_get_value (adj));
+
+  if (fabs (value - tg_tool->trans_info[ANGLE]) > EPSILON)
+    {
+      GimpTool          *tool    = GIMP_TOOL (tg_tool);
+      GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+      tg_tool->trans_info[ANGLE] = value;
+
+      gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+      gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+    }
+}
+
+static void
+rotate_center_changed (GtkWidget             *widget,
+                       GimpTransformGridTool *tg_tool)
+{
+  gdouble px = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 0);
+  gdouble py = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 1);
+
+  if ((px != tg_tool->trans_info[PIVOT_X]) ||
+      (py != tg_tool->trans_info[PIVOT_Y]))
+    {
+      GimpTool          *tool    = GIMP_TOOL (tg_tool);
+      GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+      tg_tool->trans_info[PIVOT_X] = px;
+      tg_tool->trans_info[PIVOT_Y] = py;
+
+      gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+      gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+    }
+}
+
+static void
+rotate_pivot_changed (GimpPivotSelector     *selector,
+                      GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  gimp_pivot_selector_get_position (selector,
+                                    &tg_tool->trans_info[PIVOT_X],
+                                    &tg_tool->trans_info[PIVOT_Y]);
+
+  gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+  gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+}
diff --git a/app/tools/gimprotatetool.h b/app/tools/gimprotatetool.h
new file mode 100644
index 0000000..5a09ca2
--- /dev/null
+++ b/app/tools/gimprotatetool.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ROTATE_TOOL_H__
+#define __GIMP_ROTATE_TOOL_H__
+
+
+#include "gimptransformgridtool.h"
+
+
+#define GIMP_TYPE_ROTATE_TOOL            (gimp_rotate_tool_get_type ())
+#define GIMP_ROTATE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ROTATE_TOOL, GimpRotateTool))
+#define GIMP_ROTATE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ROTATE_TOOL, GimpRotateToolClass))
+#define GIMP_IS_ROTATE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ROTATE_TOOL))
+#define GIMP_IS_ROTATE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ROTATE_TOOL))
+#define GIMP_ROTATE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ROTATE_TOOL, GimpRotateToolClass))
+
+
+typedef struct _GimpRotateTool      GimpRotateTool;
+typedef struct _GimpRotateToolClass GimpRotateToolClass;
+
+struct _GimpRotateTool
+{
+  GimpTransformGridTool  parent_instance;
+
+  GtkAdjustment         *angle_adj;
+  GtkWidget             *angle_spin_button;
+  GtkWidget             *sizeentry;
+  GtkWidget             *pivot_selector;
+};
+
+struct _GimpRotateToolClass
+{
+  GimpTransformGridToolClass  parent_class;
+};
+
+
+void    gimp_rotate_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data);
+
+GType   gimp_rotate_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_ROTATE_TOOL_H__  */
diff --git a/app/tools/gimpsamplepointtool.c b/app/tools/gimpsamplepointtool.c
new file mode 100644
index 0000000..8d0c153
--- /dev/null
+++ b/app/tools/gimpsamplepointtool.c
@@ -0,0 +1,373 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpsamplepoint.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-sample-points.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-selection.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimpsamplepointtool.h"
+#include "gimptoolcontrol.h"
+#include "tool_manager.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_sample_point_tool_button_release (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpButtonReleaseType  release_type,
+                                                     GimpDisplay           *display);
+static void   gimp_sample_point_tool_motion         (GimpTool              *tool,
+                                                     const GimpCoords      *coords,
+                                                     guint32                time,
+                                                     GdkModifierType        state,
+                                                     GimpDisplay           *display);
+
+static void   gimp_sample_point_tool_draw           (GimpDrawTool          *draw_tool);
+
+static void   gimp_sample_point_tool_start          (GimpTool              *parent_tool,
+                                                     GimpDisplay           *display,
+                                                     GimpSamplePoint       *sample_point);
+
+
+G_DEFINE_TYPE (GimpSamplePointTool, gimp_sample_point_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_sample_point_tool_parent_class
+
+
+static void
+gimp_sample_point_tool_class_init (GimpSamplePointToolClass *klass)
+{
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  tool_class->button_release = gimp_sample_point_tool_button_release;
+  tool_class->motion         = gimp_sample_point_tool_motion;
+
+  draw_tool_class->draw      = gimp_sample_point_tool_draw;
+}
+
+static void
+gimp_sample_point_tool_init (GimpSamplePointTool *sp_tool)
+{
+  GimpTool *tool = GIMP_TOOL (sp_tool);
+
+  gimp_tool_control_set_snap_to            (tool->control, FALSE);
+  gimp_tool_control_set_handle_empty_image (tool->control, TRUE);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_MOVE);
+  gimp_tool_control_set_scroll_lock        (tool->control, TRUE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+
+  sp_tool->sample_point   = NULL;
+  sp_tool->sample_point_x = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+  sp_tool->sample_point_y = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+}
+
+static void
+gimp_sample_point_tool_button_release (GimpTool              *tool,
+                                       const GimpCoords      *coords,
+                                       guint32                time,
+                                       GdkModifierType        state,
+                                       GimpButtonReleaseType  release_type,
+                                       GimpDisplay           *display)
+{
+  GimpSamplePointTool *sp_tool = GIMP_SAMPLE_POINT_TOOL (tool);
+  GimpDisplayShell    *shell   = gimp_display_get_shell (display);
+  GimpImage           *image   = gimp_display_get_image (display);
+
+  gimp_tool_pop_status (tool, display);
+
+  gimp_tool_control_halt (tool->control);
+
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      gint width  = gimp_image_get_width  (image);
+      gint height = gimp_image_get_height (image);
+
+      if (sp_tool->sample_point_x == GIMP_SAMPLE_POINT_POSITION_UNDEFINED ||
+          sp_tool->sample_point_x <  0                                    ||
+          sp_tool->sample_point_x >= width                                ||
+          sp_tool->sample_point_y == GIMP_SAMPLE_POINT_POSITION_UNDEFINED ||
+          sp_tool->sample_point_y <  0                                    ||
+          sp_tool->sample_point_y >= height)
+        {
+          if (sp_tool->sample_point)
+            {
+              gimp_image_remove_sample_point (image,
+                                              sp_tool->sample_point, TRUE);
+              sp_tool->sample_point = NULL;
+            }
+        }
+      else
+        {
+          if (sp_tool->sample_point)
+            {
+              gimp_image_move_sample_point (image,
+                                            sp_tool->sample_point,
+                                            sp_tool->sample_point_x,
+                                            sp_tool->sample_point_y,
+                                            TRUE);
+            }
+          else
+            {
+              sp_tool->sample_point =
+                gimp_image_add_sample_point_at_pos (image,
+                                                    sp_tool->sample_point_x,
+                                                    sp_tool->sample_point_y,
+                                                    TRUE);
+            }
+        }
+
+      gimp_image_flush (image);
+    }
+
+  gimp_display_shell_selection_resume (shell);
+
+  sp_tool->sample_point_x = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+  sp_tool->sample_point_y = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+
+  tool_manager_pop_tool (display->gimp);
+  g_object_unref (sp_tool);
+
+  {
+    GimpTool *active_tool = tool_manager_get_active (display->gimp);
+
+    if (GIMP_IS_DRAW_TOOL (active_tool))
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (active_tool));
+
+    tool_manager_oper_update_active (display->gimp, coords, state,
+                                     TRUE, display);
+    tool_manager_cursor_update_active (display->gimp, coords, state,
+                                       display);
+
+    if (GIMP_IS_DRAW_TOOL (active_tool))
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (active_tool));
+  }
+}
+
+static void
+gimp_sample_point_tool_motion (GimpTool         *tool,
+                               const GimpCoords *coords,
+                               guint32           time,
+                               GdkModifierType   state,
+                               GimpDisplay      *display)
+
+{
+  GimpSamplePointTool *sp_tool      = GIMP_SAMPLE_POINT_TOOL (tool);
+  GimpDisplayShell    *shell        = gimp_display_get_shell (display);
+  gboolean             delete_point = FALSE;
+  gint                 tx, ty;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  gimp_display_shell_transform_xy (shell,
+                                   coords->x, coords->y,
+                                   &tx, &ty);
+
+  if (tx < 0 || tx >= shell->disp_width ||
+      ty < 0 || ty >= shell->disp_height)
+    {
+      sp_tool->sample_point_x = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+      sp_tool->sample_point_y = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+
+      delete_point = TRUE;
+    }
+  else
+    {
+      GimpImage *image  = gimp_display_get_image (display);
+      gint       width  = gimp_image_get_width  (image);
+      gint       height = gimp_image_get_height (image);
+
+      sp_tool->sample_point_x = floor (coords->x);
+      sp_tool->sample_point_y = floor (coords->y);
+
+      if (sp_tool->sample_point_x <  0      ||
+          sp_tool->sample_point_x >= height ||
+          sp_tool->sample_point_y <  0      ||
+          sp_tool->sample_point_y >= width)
+        {
+          delete_point = TRUE;
+        }
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+  gimp_tool_pop_status (tool, display);
+
+  if (delete_point)
+    {
+      gimp_tool_push_status (tool, display,
+                             sp_tool->sample_point ?
+                             _("Remove Sample Point") :
+                             _("Cancel Sample Point"));
+    }
+  else if (sp_tool->sample_point)
+    {
+      gimp_tool_push_status_coords (tool, display,
+                                    gimp_tool_control_get_precision (tool->control),
+                                    _("Move Sample Point: "),
+                                    sp_tool->sample_point_x -
+                                    sp_tool->sample_point_old_x,
+                                    ", ",
+                                    sp_tool->sample_point_y -
+                                    sp_tool->sample_point_old_y,
+                                    NULL);
+    }
+  else
+    {
+      gimp_tool_push_status_coords (tool, display,
+                                    gimp_tool_control_get_precision (tool->control),
+                                    _("Add Sample Point: "),
+                                    sp_tool->sample_point_x,
+                                    ", ",
+                                    sp_tool->sample_point_y,
+                                    NULL);
+    }
+}
+
+static void
+gimp_sample_point_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpSamplePointTool *sp_tool = GIMP_SAMPLE_POINT_TOOL (draw_tool);
+
+  if (sp_tool->sample_point_x != GIMP_SAMPLE_POINT_POSITION_UNDEFINED &&
+      sp_tool->sample_point_y != GIMP_SAMPLE_POINT_POSITION_UNDEFINED)
+    {
+      gimp_draw_tool_add_crosshair (draw_tool,
+                                    sp_tool->sample_point_x,
+                                    sp_tool->sample_point_y);
+    }
+}
+
+static void
+gimp_sample_point_tool_start (GimpTool        *parent_tool,
+                              GimpDisplay     *display,
+                              GimpSamplePoint *sample_point)
+{
+  GimpSamplePointTool *sp_tool;
+  GimpTool            *tool;
+
+  sp_tool = g_object_new (GIMP_TYPE_SAMPLE_POINT_TOOL,
+                          "tool-info", parent_tool->tool_info,
+                          NULL);
+
+  tool = GIMP_TOOL (sp_tool);
+
+  gimp_display_shell_selection_pause (gimp_display_get_shell (display));
+
+  if (sample_point)
+    {
+      sp_tool->sample_point = sample_point;
+
+      gimp_sample_point_get_position (sample_point,
+                                      &sp_tool->sample_point_old_x,
+                                      &sp_tool->sample_point_old_y);
+
+      sp_tool->sample_point_x = sp_tool->sample_point_old_x;
+      sp_tool->sample_point_y = sp_tool->sample_point_old_y;
+    }
+  else
+    {
+      sp_tool->sample_point       = NULL;
+      sp_tool->sample_point_old_x = 0;
+      sp_tool->sample_point_old_y = 0;
+      sp_tool->sample_point_x     = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+      sp_tool->sample_point_y     = GIMP_SAMPLE_POINT_POSITION_UNDEFINED;
+    }
+
+  gimp_tool_set_cursor (tool, display,
+                        GIMP_CURSOR_MOUSE,
+                        GIMP_TOOL_CURSOR_COLOR_PICKER,
+                        GIMP_CURSOR_MODIFIER_MOVE);
+
+  tool_manager_push_tool (display->gimp, tool);
+
+  tool->display = display;
+  gimp_tool_control_activate (tool->control);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (sp_tool), display);
+
+  if (sp_tool->sample_point)
+    {
+      gimp_tool_push_status_coords (tool, display,
+                                    gimp_tool_control_get_precision (tool->control),
+                                    _("Move Sample Point: "),
+                                    sp_tool->sample_point_x -
+                                    sp_tool->sample_point_old_x,
+                                    ", ",
+                                    sp_tool->sample_point_y -
+                                    sp_tool->sample_point_old_y,
+                                    NULL);
+    }
+  else
+    {
+      gimp_tool_push_status_coords (tool, display,
+                                    gimp_tool_control_get_precision (tool->control),
+                                    _("Add Sample Point: "),
+                                    sp_tool->sample_point_x,
+                                    ", ",
+                                    sp_tool->sample_point_y,
+                                    NULL);
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_sample_point_tool_start_new (GimpTool    *parent_tool,
+                                  GimpDisplay *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (parent_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  gimp_sample_point_tool_start (parent_tool, display, NULL);
+}
+
+void
+gimp_sample_point_tool_start_edit (GimpTool        *parent_tool,
+                                   GimpDisplay     *display,
+                                   GimpSamplePoint *sample_point)
+{
+  g_return_if_fail (GIMP_IS_TOOL (parent_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT (sample_point));
+
+  gimp_sample_point_tool_start (parent_tool, display, sample_point);
+}
diff --git a/app/tools/gimpsamplepointtool.h b/app/tools/gimpsamplepointtool.h
new file mode 100644
index 0000000..1e5a3b2
--- /dev/null
+++ b/app/tools/gimpsamplepointtool.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SAMPLE_POINT_TOOL_H__
+#define __GIMP_SAMPLE_POINT_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_SAMPLE_POINT_TOOL            (gimp_sample_point_tool_get_type ())
+#define GIMP_SAMPLE_POINT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SAMPLE_POINT_TOOL, GimpSamplePointTool))
+#define GIMP_SAMPLE_POINT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SAMPLE_POINT_TOOL, GimpSamplePointToolClass))
+#define GIMP_IS_SAMPLE_POINT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SAMPLE_POINT_TOOL))
+#define GIMP_IS_SAMPLE_POINT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SAMPLE_POINT_TOOL))
+#define GIMP_SAMPLE_POINT_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SAMPLE_POINT_TOOL, GimpSamplePointToolClass))
+
+
+typedef struct _GimpSamplePointTool      GimpSamplePointTool;
+typedef struct _GimpSamplePointToolClass GimpSamplePointToolClass;
+
+struct _GimpSamplePointTool
+{
+  GimpDrawTool     parent_instance;
+
+  GimpSamplePoint *sample_point;
+  gint             sample_point_old_x;
+  gint             sample_point_old_y;
+  gint             sample_point_x;
+  gint             sample_point_y;
+};
+
+struct _GimpSamplePointToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+GType   gimp_sample_point_tool_get_type   (void) G_GNUC_CONST;
+
+void    gimp_sample_point_tool_start_new  (GimpTool        *parent_tool,
+                                           GimpDisplay     *display);
+void    gimp_sample_point_tool_start_edit (GimpTool        *parent_tool,
+                                           GimpDisplay     *display,
+                                           GimpSamplePoint *sample_point);
+
+
+#endif  /*  __GIMP_SAMPLE_POINT_TOOL_H__  */
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
new file mode 100644
index 0000000..b7fcd96
--- /dev/null
+++ b/app/tools/gimpscaletool.c
@@ -0,0 +1,474 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpsizebox.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptooltransformgrid.h"
+
+#include "gimpscaletool.h"
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON 1e-6
+
+
+/*  index into trans_info array  */
+enum
+{
+  X0,
+  Y0,
+  X1,
+  Y1
+};
+
+
+/*  local function prototypes  */
+
+static gboolean         gimp_scale_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                                        GimpMatrix3           *transform);
+static void             gimp_scale_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                                        const GimpMatrix3     *transform);
+static gchar          * gimp_scale_tool_get_undo_desc  (GimpTransformGridTool *tg_tool);
+static void             gimp_scale_tool_dialog         (GimpTransformGridTool *tg_tool);
+static void             gimp_scale_tool_dialog_update  (GimpTransformGridTool *tg_tool);
+static void             gimp_scale_tool_prepare        (GimpTransformGridTool *tg_tool);
+static void             gimp_scale_tool_readjust       (GimpTransformGridTool *tg_tool);
+static GimpToolWidget * gimp_scale_tool_get_widget     (GimpTransformGridTool *tg_tool);
+static void             gimp_scale_tool_update_widget  (GimpTransformGridTool *tg_tool);
+static void             gimp_scale_tool_widget_changed (GimpTransformGridTool *tg_tool);
+
+static void             gimp_scale_tool_size_notify    (GtkWidget             *box,
+                                                        GParamSpec            *pspec,
+                                                        GimpTransformGridTool *tg_tool);
+
+
+G_DEFINE_TYPE (GimpScaleTool, gimp_scale_tool, GIMP_TYPE_TRANSFORM_GRID_TOOL)
+
+#define parent_class gimp_scale_tool_parent_class
+
+
+void
+gimp_scale_tool_register (GimpToolRegisterCallback  callback,
+                          gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_SCALE_TOOL,
+                GIMP_TYPE_TRANSFORM_GRID_OPTIONS,
+                gimp_transform_grid_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-scale-tool",
+                _("Scale"),
+                _("Scale Tool: Scale the layer, selection or path"),
+                N_("_Scale"), "<shift>S",
+                NULL, GIMP_HELP_TOOL_SCALE,
+                GIMP_ICON_TOOL_SCALE,
+                data);
+}
+
+static void
+gimp_scale_tool_class_init (GimpScaleToolClass *klass)
+{
+  GimpTransformToolClass     *tr_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass *tg_class = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+
+  tg_class->info_to_matrix  = gimp_scale_tool_info_to_matrix;
+  tg_class->matrix_to_info  = gimp_scale_tool_matrix_to_info;
+  tg_class->get_undo_desc   = gimp_scale_tool_get_undo_desc;
+  tg_class->dialog          = gimp_scale_tool_dialog;
+  tg_class->dialog_update   = gimp_scale_tool_dialog_update;
+  tg_class->prepare         = gimp_scale_tool_prepare;
+  tg_class->readjust        = gimp_scale_tool_readjust;
+  tg_class->get_widget      = gimp_scale_tool_get_widget;
+  tg_class->update_widget   = gimp_scale_tool_update_widget;
+  tg_class->widget_changed  = gimp_scale_tool_widget_changed;
+
+  tr_class->undo_desc       = C_("undo-type", "Scale");
+  tr_class->progress_text   = _("Scaling");
+  tg_class->ok_button_label = _("_Scale");
+}
+
+static void
+gimp_scale_tool_init (GimpScaleTool *scale_tool)
+{
+  GimpTool *tool  = GIMP_TOOL (scale_tool);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_RESIZE);
+}
+
+static gboolean
+gimp_scale_tool_info_to_matrix  (GimpTransformGridTool *tg_tool,
+                                 GimpMatrix3           *transform)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  gimp_matrix3_identity (transform);
+  gimp_transform_matrix_scale (transform,
+                               tr_tool->x1,
+                               tr_tool->y1,
+                               tr_tool->x2 - tr_tool->x1,
+                               tr_tool->y2 - tr_tool->y1,
+                               tg_tool->trans_info[X0],
+                               tg_tool->trans_info[Y0],
+                               tg_tool->trans_info[X1] - tg_tool->trans_info[X0],
+                               tg_tool->trans_info[Y1] - tg_tool->trans_info[Y0]);
+
+  return TRUE;
+}
+
+static void
+gimp_scale_tool_matrix_to_info  (GimpTransformGridTool *tg_tool,
+                                 const GimpMatrix3     *transform)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  gdouble            x;
+  gdouble            y;
+  gdouble            w;
+  gdouble            h;
+
+  x = transform->coeff[0][2];
+  y = transform->coeff[1][2];
+  w = transform->coeff[0][0];
+  h = transform->coeff[1][1];
+
+  tg_tool->trans_info[X0] = x + w * tr_tool->x1;
+  tg_tool->trans_info[Y0] = y + h * tr_tool->y1;
+  tg_tool->trans_info[X1] = tg_tool->trans_info[X0] +
+                            w * (tr_tool->x2 - tr_tool->x1);
+  tg_tool->trans_info[Y1] = tg_tool->trans_info[Y0] +
+                            h * (tr_tool->y2 - tr_tool->y1);
+}
+
+static gchar *
+gimp_scale_tool_get_undo_desc (GimpTransformGridTool *tg_tool)
+{
+  gint width;
+  gint height;
+
+  width  = ROUND (tg_tool->trans_info[X1] - tg_tool->trans_info[X0]);
+  height = ROUND (tg_tool->trans_info[Y1] - tg_tool->trans_info[Y0]);
+
+  return g_strdup_printf (C_("undo-type", "Scale to %d x %d"),
+                          width, height);
+}
+
+static void
+gimp_scale_tool_dialog (GimpTransformGridTool *tg_tool)
+{
+}
+
+static void
+gimp_scale_tool_dialog_update (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  gint                      width;
+  gint                      height;
+
+  width  = ROUND (tg_tool->trans_info[X1] - tg_tool->trans_info[X0]);
+  height = ROUND (tg_tool->trans_info[Y1] - tg_tool->trans_info[Y0]);
+
+  g_object_set (GIMP_SCALE_TOOL (tg_tool)->box,
+                "width",       width,
+                "height",      height,
+                "keep-aspect", options->constrain_scale,
+                NULL);
+}
+
+static void
+gimp_scale_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpScaleTool            *scale   = GIMP_SCALE_TOOL (tg_tool);
+  GimpTransformTool        *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  GimpDisplay              *display = GIMP_TOOL (tg_tool)->display;
+  gdouble                   xres;
+  gdouble                   yres;
+
+  tg_tool->trans_info[X0] = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y0] = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X1] = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y1] = (gdouble) tr_tool->y2;
+
+  gimp_image_get_resolution (gimp_display_get_image (display),
+                             &xres, &yres);
+
+  if (scale->box)
+    {
+      g_signal_handlers_disconnect_by_func (scale->box,
+                                            gimp_scale_tool_size_notify,
+                                            tg_tool);
+      gtk_widget_destroy (scale->box);
+    }
+
+  /*  Need to create a new GimpSizeBox widget because the initial
+   *  width and height is what counts as 100%.
+   */
+  scale->box =
+    g_object_new (GIMP_TYPE_SIZE_BOX,
+                  "width",       tr_tool->x2 - tr_tool->x1,
+                  "height",      tr_tool->y2 - tr_tool->y1,
+                  "keep-aspect", options->constrain_scale,
+                  "unit",        gimp_display_get_shell (display)->unit,
+                  "xresolution", xres,
+                  "yresolution", yres,
+                  NULL);
+
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (tg_tool->gui)),
+                      scale->box, FALSE, FALSE, 0);
+  gtk_widget_show (scale->box);
+
+  g_signal_connect (scale->box, "notify",
+                    G_CALLBACK (gimp_scale_tool_size_notify),
+                    tg_tool);
+}
+
+static void
+gimp_scale_tool_readjust (GimpTransformGridTool *tg_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (tg_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+  gdouble           x;
+  gdouble           y;
+  gdouble           r;
+
+  x = shell->disp_width  / 2.0;
+  y = shell->disp_height / 2.0;
+  r = MAX (MIN (x, y) / G_SQRT2 -
+           GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE / 2.0,
+           GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE / 2.0);
+
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x, y,
+                                       &x, &y);
+
+  tg_tool->trans_info[X0] = RINT (x - FUNSCALEX (shell, r));
+  tg_tool->trans_info[Y0] = RINT (y - FUNSCALEY (shell, r));
+  tg_tool->trans_info[X1] = RINT (x + FUNSCALEX (shell, r));
+  tg_tool->trans_info[Y1] = RINT (y + FUNSCALEY (shell, r));
+}
+
+static GimpToolWidget *
+gimp_scale_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget    *widget;
+
+  widget = gimp_tool_transform_grid_new (shell,
+                                         &tr_tool->transform,
+                                         tr_tool->x1,
+                                         tr_tool->y1,
+                                         tr_tool->x2,
+                                         tr_tool->y2);
+
+  g_object_set (widget,
+                "inside-function",    GIMP_TRANSFORM_FUNCTION_SCALE,
+                "outside-function",   GIMP_TRANSFORM_FUNCTION_SCALE,
+                "use-corner-handles", TRUE,
+                "use-side-handles",   TRUE,
+                "use-center-handle",  TRUE,
+                NULL);
+
+  return widget;
+}
+
+static void
+gimp_scale_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  g_object_set (
+    tg_tool->widget,
+    "x1", (gdouble) tr_tool->x1,
+    "y1", (gdouble) tr_tool->y1,
+    "x2", (gdouble) tr_tool->x2,
+    "y2", (gdouble) tr_tool->y2,
+    NULL);
+}
+
+static void
+gimp_scale_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpMatrix3       *transform;
+  gdouble            x0, y0;
+  gdouble            x1, y1;
+  gint               width, height;
+
+  g_object_get (tg_tool->widget,
+                "transform", &transform,
+                NULL);
+
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1, tr_tool->y1,
+                                &x0,         &y0);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2, tr_tool->y2,
+                                &x1,         &y1);
+
+  g_free (transform);
+
+  width  = ROUND (x1 - x0);
+  height = ROUND (y1 - y0);
+
+  if (width > 0)
+    {
+      tg_tool->trans_info[X0] = x0;
+      tg_tool->trans_info[X1] = x1;
+    }
+  else if (fabs (x0 - tg_tool->trans_info[X0]) < EPSILON)
+    {
+      tg_tool->trans_info[X1] = tg_tool->trans_info[X0] + 1.0;
+    }
+  else if (fabs (x1 - tg_tool->trans_info[X1]) < EPSILON)
+    {
+      tg_tool->trans_info[X0] = tg_tool->trans_info[X1] - 1.0;
+    }
+  else
+    {
+      tg_tool->trans_info[X0] = (x0 + x1) / 2.0 - 0.5;
+      tg_tool->trans_info[X1] = (x0 + x1) / 2.0 + 0.5;
+    }
+
+  if (height > 0)
+    {
+      tg_tool->trans_info[Y0] = y0;
+      tg_tool->trans_info[Y1] = y1;
+    }
+  else if (fabs (y0 - tg_tool->trans_info[Y0]) < EPSILON)
+    {
+      tg_tool->trans_info[Y1] = tg_tool->trans_info[Y0] + 1.0;
+    }
+  else if (fabs (y1 - tg_tool->trans_info[Y1]) < EPSILON)
+    {
+      tg_tool->trans_info[Y0] = tg_tool->trans_info[Y1] - 1.0;
+    }
+  else
+    {
+      tg_tool->trans_info[Y0] = (y0 + y1) / 2.0 - 0.5;
+      tg_tool->trans_info[Y1] = (y0 + y1) / 2.0 + 0.5;
+    }
+
+  if (width <= 0 || height <= 0)
+    gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+gimp_scale_tool_size_notify (GtkWidget             *box,
+                             GParamSpec            *pspec,
+                             GimpTransformGridTool *tg_tool)
+{
+  GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+
+  if (! strcmp (pspec->name, "width") ||
+      ! strcmp (pspec->name, "height"))
+    {
+      gint width;
+      gint height;
+      gint old_width;
+      gint old_height;
+
+      g_object_get (box,
+                    "width",  &width,
+                    "height", &height,
+                    NULL);
+
+      old_width  = ROUND (tg_tool->trans_info[X1] - tg_tool->trans_info[X0]);
+      old_height = ROUND (tg_tool->trans_info[Y1] - tg_tool->trans_info[Y0]);
+
+      if ((width != old_width) || (height != old_height))
+        {
+          GimpTool          *tool    = GIMP_TOOL (tg_tool);
+          GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+          if (options->frompivot_scale)
+            {
+              gdouble center_x;
+              gdouble center_y;
+
+              center_x = (tg_tool->trans_info[X0] +
+                          tg_tool->trans_info[X1]) / 2.0;
+              center_y = (tg_tool->trans_info[Y0] +
+                          tg_tool->trans_info[Y1]) / 2.0;
+
+              tg_tool->trans_info[X0] = center_x - width  / 2.0;
+              tg_tool->trans_info[Y0] = center_y - height / 2.0;
+              tg_tool->trans_info[X1] = center_x + width  / 2.0;
+              tg_tool->trans_info[Y1] = center_y + height / 2.0;
+            }
+          else
+            {
+              tg_tool->trans_info[X1] = tg_tool->trans_info[X0] + width;
+              tg_tool->trans_info[Y1] = tg_tool->trans_info[Y0] + height;
+            }
+
+          gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+          gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+        }
+    }
+  else if (! strcmp (pspec->name, "keep-aspect"))
+    {
+      gboolean constrain;
+
+      g_object_get (box,
+                    "keep-aspect", &constrain,
+                    NULL);
+
+      if (constrain != options->constrain_scale)
+        {
+          gint width;
+          gint height;
+
+          g_object_get (box,
+                        "width",  &width,
+                        "height", &height,
+                        NULL);
+
+          g_object_set (options,
+                        "constrain-scale", constrain,
+                        NULL);
+        }
+    }
+}
diff --git a/app/tools/gimpscaletool.h b/app/tools/gimpscaletool.h
new file mode 100644
index 0000000..e3c4b19
--- /dev/null
+++ b/app/tools/gimpscaletool.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SCALE_TOOL_H__
+#define __GIMP_SCALE_TOOL_H__
+
+
+#include "gimptransformgridtool.h"
+
+
+#define GIMP_TYPE_SCALE_TOOL            (gimp_scale_tool_get_type ())
+#define GIMP_SCALE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_TOOL, GimpScaleTool))
+#define GIMP_SCALE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_TOOL, GimpScaleToolClass))
+#define GIMP_IS_SCALE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SCALE_TOOL))
+#define GIMP_SCALE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SCALE_TOOL, GimpScaleToolClass))
+
+
+typedef struct _GimpScaleTool      GimpScaleTool;
+typedef struct _GimpScaleToolClass GimpScaleToolClass;
+
+struct _GimpScaleTool
+{
+  GimpTransformGridTool  parent_instance;
+
+  GtkWidget             *box;
+};
+
+struct _GimpScaleToolClass
+{
+  GimpTransformGridToolClass parent_class;
+};
+
+
+void    gimp_scale_tool_register (GimpToolRegisterCallback  callback,
+                                  gpointer                  data);
+
+GType   gimp_scale_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SCALE_TOOL_H__  */
diff --git a/app/tools/gimpseamlesscloneoptions.c b/app/tools/gimpseamlesscloneoptions.c
new file mode 100644
index 0000000..cb2c557
--- /dev/null
+++ b/app/tools/gimpseamlesscloneoptions.c
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpseamlesscloneoptions.c
+ * Copyright (C) 2011 Barak Itkin <lightningismyname@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+
+#include "gimpseamlesscloneoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_MAX_REFINE_SCALE,
+};
+
+
+static void   gimp_seamless_clone_options_set_property (GObject      *object,
+                                                        guint         property_id,
+                                                        const GValue *value,
+                                                        GParamSpec   *pspec);
+static void   gimp_seamless_clone_options_get_property (GObject      *object,
+                                                        guint         property_id,
+                                                        GValue       *value,
+                                                        GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpSeamlessCloneOptions, gimp_seamless_clone_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_seamless_clone_options_parent_class
+
+
+static void
+gimp_seamless_clone_options_class_init (GimpSeamlessCloneOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_seamless_clone_options_set_property;
+  object_class->get_property = gimp_seamless_clone_options_get_property;
+
+  GIMP_CONFIG_PROP_INT  (object_class, PROP_MAX_REFINE_SCALE,
+                         "max-refine-scale",
+                         _("Refinement scale"),
+                         _("Maximal scale of refinement points to be "
+                           "used for the interpolation mesh"),
+                         0, 50, 5,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_seamless_clone_options_init (GimpSeamlessCloneOptions *options)
+{
+}
+
+static void
+gimp_seamless_clone_options_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpSeamlessCloneOptions *options = GIMP_SEAMLESS_CLONE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_MAX_REFINE_SCALE:
+      options->max_refine_scale = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_seamless_clone_options_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpSeamlessCloneOptions *options = GIMP_SEAMLESS_CLONE_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_MAX_REFINE_SCALE:
+      g_value_set_int (value, options->max_refine_scale);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_seamless_clone_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
+  GtkWidget *scale;
+
+  scale = gimp_prop_spin_scale_new (config, "max-refine-scale", NULL,
+                                    1.0, 10.0, 0);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 50.0);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return vbox;
+}
diff --git a/app/tools/gimpseamlesscloneoptions.h b/app/tools/gimpseamlesscloneoptions.h
new file mode 100644
index 0000000..872aa5d
--- /dev/null
+++ b/app/tools/gimpseamlesscloneoptions.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpseamlesscloneoptions.h
+ * Copyright (C) 2011 Barak Itkin <lightningismyname@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SEAMLESS_CLONE_OPTIONS_H__
+#define __GIMP_SEAMLESS_CLONE_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_SEAMLESS_CLONE_OPTIONS            (gimp_seamless_clone_options_get_type ())
+#define GIMP_SEAMLESS_CLONE_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SEAMLESS_CLONE_OPTIONS, GimpSeamlessCloneOptions))
+#define GIMP_SEAMLESS_CLONE_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SEAMLESS_CLONE_OPTIONS, GimpSeamlessCloneOptionsClass))
+#define GIMP_IS_SEAMLESS_CLONE_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SEAMLESS_CLONE_OPTIONS))
+#define GIMP_IS_SEAMLESS_CLONE_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SEAMLESS_CLONE_OPTIONS))
+#define GIMP_SEAMLESS_CLONE_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SEAMLESS_CLONE_OPTIONS, GimpSeamlessCloneOptionsClass))
+
+
+typedef struct _GimpSeamlessCloneOptions      GimpSeamlessCloneOptions;
+typedef struct _GimpSeamlessCloneOptionsClass GimpSeamlessCloneOptionsClass;
+
+struct _GimpSeamlessCloneOptions
+{
+  GimpToolOptions parent_instance;
+
+  gint            max_refine_scale;
+  gboolean        temp;
+};
+
+struct _GimpSeamlessCloneOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+};
+
+
+GType       gimp_seamless_clone_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_seamless_clone_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_SEAMLESS_CLONE_OPTIONS_H__  */
diff --git a/app/tools/gimpseamlessclonetool.c b/app/tools/gimpseamlessclonetool.c
new file mode 100644
index 0000000..79a9780
--- /dev/null
+++ b/app/tools/gimpseamlessclonetool.c
@@ -0,0 +1,845 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpseamlessclonetool.c
+ * Copyright (C) 2011 Barak Itkin <lightningismyname@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gegl-plugin.h> /* gegl_operation_invalidate() */
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h" /* playground */
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpclipboard.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimpseamlessclonetool.h"
+#include "gimpseamlesscloneoptions.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+#define SC_DEBUG TRUE
+
+#ifdef SC_DEBUG
+#define sc_debug_fstart() g_debug ("%s::start", __FUNCTION__);
+#define sc_debug_fend() g_debug ("%s::end", __FUNCTION__);
+#else
+#define sc_debug_fstart()
+#define sc_debug_fend()
+#endif
+
+#define gimp_seamless_clone_tool_is_in_paste(sc,x0,y0)          \
+  (   ((sc)->xoff <= (x0) && (x0) < (sc)->xoff + (sc)->width)   \
+   && ((sc)->yoff <= (y0) && (y0) < (sc)->yoff + (sc)->height)) \
+
+#define gimp_seamless_clone_tool_is_in_paste_c(sc,coords)       \
+  gimp_seamless_clone_tool_is_in_paste((sc),(coords)->x,(coords)->y)
+
+
+/*  init ----------> preprocess
+ *    |                  |
+ *    |                  |
+ *    |                  |
+ *    |                  v
+ *    |                render(wait, motion)
+ *    |               /  |
+ *    |         _____/   |
+ *    |   _____/         |
+ *    v  v               v
+ *  quit  <----------  commit
+ *
+ * Begin at INIT state
+ *
+ * INIT:       Wait for click on canvas
+ *             have a paste ? -> PREPROCESS : -> QUIT
+ *
+ * PREPROCESS: Do the preprocessing
+ *             -> RENDER
+ *
+ * RENDER:     Interact and wait for quit signal
+ *             commit quit ? -> COMMIT : -> QUIT
+ *
+ * COMMIT:     Commit the changes
+ *             -> QUIT
+ *
+ * QUIT:       Invoked by sending a ACTION_HALT to the tool_control
+ *             Free resources
+ */
+enum
+{
+  SC_STATE_INIT,
+  SC_STATE_PREPROCESS,
+  SC_STATE_RENDER_WAIT,
+  SC_STATE_RENDER_MOTION,
+  SC_STATE_COMMIT,
+  SC_STATE_QUIT
+};
+
+
+static void       gimp_seamless_clone_tool_control            (GimpTool              *tool,
+                                                               GimpToolAction         action,
+                                                               GimpDisplay           *display);
+static void       gimp_seamless_clone_tool_button_press       (GimpTool              *tool,
+                                                               const GimpCoords      *coords,
+                                                               guint32                time,
+                                                               GdkModifierType        state,
+                                                               GimpButtonPressType    press_type,
+                                                               GimpDisplay           *display);
+
+static void       gimp_seamless_clone_tool_button_release     (GimpTool              *tool,
+                                                               const GimpCoords      *coords,
+                                                               guint32                time,
+                                                               GdkModifierType        state,
+                                                               GimpButtonReleaseType  release_type,
+                                                               GimpDisplay           *display);
+static void       gimp_seamless_clone_tool_motion             (GimpTool              *tool,
+                                                               const GimpCoords      *coords,
+                                                               guint32                time,
+                                                               GdkModifierType        state,
+                                                               GimpDisplay           *display);
+static gboolean   gimp_seamless_clone_tool_key_press          (GimpTool              *tool,
+                                                               GdkEventKey           *kevent,
+                                                               GimpDisplay           *display);
+static void       gimp_seamless_clone_tool_oper_update        (GimpTool              *tool,
+                                                               const GimpCoords      *coords,
+                                                               GdkModifierType        state,
+                                                               gboolean               proximity,
+                                                               GimpDisplay           *display);
+static void       gimp_seamless_clone_tool_cursor_update      (GimpTool              *tool,
+                                                               const GimpCoords      *coords,
+                                                               GdkModifierType        state,
+                                                               GimpDisplay           *display);
+static void       gimp_seamless_clone_tool_options_notify     (GimpTool              *tool,
+                                                               GimpToolOptions       *options,
+                                                               const GParamSpec      *pspec);
+
+static void       gimp_seamless_clone_tool_draw               (GimpDrawTool          *draw_tool);
+
+static void       gimp_seamless_clone_tool_start              (GimpSeamlessCloneTool *sc,
+                                                               GimpDisplay           *display);
+
+static void       gimp_seamless_clone_tool_stop               (GimpSeamlessCloneTool *sc,
+                                                               gboolean               display_change_only);
+
+static void       gimp_seamless_clone_tool_commit             (GimpSeamlessCloneTool *sc);
+
+static void       gimp_seamless_clone_tool_create_render_node (GimpSeamlessCloneTool *sc);
+static gboolean   gimp_seamless_clone_tool_render_node_update (GimpSeamlessCloneTool *sc);
+static void       gimp_seamless_clone_tool_create_filter      (GimpSeamlessCloneTool *sc,
+                                                               GimpDrawable          *drawable);
+static void       gimp_seamless_clone_tool_filter_flush       (GimpDrawableFilter     *filter,
+                                                               GimpTool              *tool);
+static void       gimp_seamless_clone_tool_filter_update      (GimpSeamlessCloneTool *sc);
+
+
+G_DEFINE_TYPE (GimpSeamlessCloneTool, gimp_seamless_clone_tool,
+               GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_seamless_clone_tool_parent_class
+
+
+void
+gimp_seamless_clone_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data)
+{
+  /* we should not know that "data" is a Gimp*, but what the heck this
+   * is experimental playground stuff
+   */
+  if (GIMP_GUI_CONFIG (GIMP (data)->config)->playground_seamless_clone_tool)
+    (* callback) (GIMP_TYPE_SEAMLESS_CLONE_TOOL,
+                  GIMP_TYPE_SEAMLESS_CLONE_OPTIONS,
+                  gimp_seamless_clone_options_gui,
+                  0,
+                  "gimp-seamless-clone-tool",
+                  _("Seamless Clone"),
+                  _("Seamless Clone: Seamlessly paste one image into another"),
+                  N_("_Seamless Clone"), NULL,
+                  NULL, GIMP_HELP_TOOL_SEAMLESS_CLONE,
+                  GIMP_ICON_TOOL_SEAMLESS_CLONE,
+                  data);
+}
+
+static void
+gimp_seamless_clone_tool_class_init (GimpSeamlessCloneToolClass *klass)
+{
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  tool_class->control        = gimp_seamless_clone_tool_control;
+  tool_class->button_press   = gimp_seamless_clone_tool_button_press;
+  tool_class->button_release = gimp_seamless_clone_tool_button_release;
+  tool_class->motion         = gimp_seamless_clone_tool_motion;
+  tool_class->key_press      = gimp_seamless_clone_tool_key_press;
+  tool_class->oper_update    = gimp_seamless_clone_tool_oper_update;
+  tool_class->cursor_update  = gimp_seamless_clone_tool_cursor_update;
+  tool_class->options_notify = gimp_seamless_clone_tool_options_notify;
+
+  draw_tool_class->draw      = gimp_seamless_clone_tool_draw;
+}
+
+static void
+gimp_seamless_clone_tool_init (GimpSeamlessCloneTool *self)
+{
+  GimpTool *tool = GIMP_TOOL (self);
+
+  gimp_tool_control_set_dirty_mask  (tool->control,
+                                     GIMP_DIRTY_IMAGE           |
+                                     GIMP_DIRTY_IMAGE_STRUCTURE |
+                                     GIMP_DIRTY_DRAWABLE        |
+                                     GIMP_DIRTY_SELECTION);
+
+  gimp_tool_control_set_tool_cursor (tool->control,
+                                     GIMP_TOOL_CURSOR_MOVE);
+
+  self->tool_state = SC_STATE_INIT;
+}
+
+static void
+gimp_seamless_clone_tool_control (GimpTool       *tool,
+                                  GimpToolAction  action,
+                                  GimpDisplay    *display)
+{
+  GimpSeamlessCloneTool *sc = GIMP_SEAMLESS_CLONE_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      if (tool->display)
+        gimp_seamless_clone_tool_stop (sc, FALSE);
+
+      /* TODO: If we have any tool options that should be reset, here is
+       *       a good place to do so.
+       */
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_seamless_clone_tool_commit (sc);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+/**
+ * gimp_seamless_clone_tool_start:
+ * @sc: The GimpSeamlessCloneTool to initialize for usage on the given
+ *      display
+ * @display: The display to initialize the tool for
+ *
+ * A utility function to initialize a tool for working on a given
+ * display. At the beginning of each function, we can check if the event's
+ * display is the same as the tool's one, and if not call this. This is
+ * not required by the gimptool interface or anything like that, but
+ * this is a convenient way to do all the initialization work in one
+ * place, and this is how the base class (GimpDrawTool) does that
+ */
+static void
+gimp_seamless_clone_tool_start (GimpSeamlessCloneTool *sc,
+                                GimpDisplay           *display)
+{
+  GimpTool     *tool     = GIMP_TOOL (sc);
+  GimpImage    *image    = gimp_display_get_image (display);
+  GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+
+  /* First handle the paste - we need to make sure we have one in order
+   * to do anything else.
+   */
+  if (sc->paste == NULL)
+    {
+      GimpBuffer *buffer = gimp_clipboard_get_buffer (tool->tool_info->gimp);
+
+      if (! buffer)
+        {
+          gimp_tool_push_status (tool, display,
+                                 "%s",
+                                 _("There is no image data in the clipboard to paste."));
+          return;
+        }
+
+      sc->paste = gimp_gegl_buffer_dup (gimp_buffer_get_buffer (buffer));
+      g_object_unref (buffer);
+
+      sc->width  = gegl_buffer_get_width  (sc->paste);
+      sc->height = gegl_buffer_get_height (sc->paste);
+    }
+
+  /* Free resources which are relevant only for the previous display */
+  gimp_seamless_clone_tool_stop (sc, TRUE);
+
+  tool->display = display;
+
+  gimp_seamless_clone_tool_create_filter (sc, drawable);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (sc), display);
+
+  sc->tool_state = SC_STATE_RENDER_WAIT;
+}
+
+
+/**
+ * gimp_seamless_clone_tool_stop:
+ * @sc: The seamless clone tool whose resources should be freed
+ * @display_change_only: Mark that the only reason for this call was a
+ *                       switch of the working display.
+ *
+ * This function frees any resources associated with the seamless clone
+ * tool, including caches, gegl graphs, and anything the tool created.
+ * Afterwards, it initializes all the relevant pointers to some initial
+ * value (usually NULL) like the init function does.
+ *
+ * Note that for seamless cloning, no change needs to be done when
+ * switching to a different display, except for clearing the image map.
+ * So for that, we provide a boolean parameter to specify that the only
+ * change was one of the display
+ */
+static void
+gimp_seamless_clone_tool_stop (GimpSeamlessCloneTool *sc,
+                               gboolean               display_change_only)
+{
+  /* See if we actually have any reason to stop */
+  if (sc->tool_state == SC_STATE_INIT)
+    return;
+
+  if (! display_change_only)
+    {
+      sc->tool_state = SC_STATE_INIT;
+
+      g_clear_object (&sc->paste);
+      g_clear_object (&sc->render_node);
+      sc->sc_node = NULL;
+    }
+
+  /* This should always happen, even when we just switch a display */
+  if (sc->filter)
+    {
+      gimp_drawable_filter_abort (sc->filter);
+      g_clear_object (&sc->filter);
+
+      if (GIMP_TOOL (sc)->display)
+        gimp_image_flush (gimp_display_get_image (GIMP_TOOL (sc)->display));
+    }
+
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (sc));
+}
+
+static void
+gimp_seamless_clone_tool_commit (GimpSeamlessCloneTool *sc)
+{
+  GimpTool *tool = GIMP_TOOL (sc);
+
+  if (sc->filter)
+    {
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_drawable_filter_commit (sc->filter, GIMP_PROGRESS (tool), FALSE);
+      g_clear_object (&sc->filter);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+}
+
+static void
+gimp_seamless_clone_tool_button_press (GimpTool            *tool,
+                                       const GimpCoords    *coords,
+                                       guint32              time,
+                                       GdkModifierType      state,
+                                       GimpButtonPressType  press_type,
+                                       GimpDisplay         *display)
+{
+  GimpSeamlessCloneTool *sc = GIMP_SEAMLESS_CLONE_TOOL (tool);
+
+  if (display != tool->display)
+    {
+      gimp_seamless_clone_tool_start (sc, display);
+
+      /* Center the paste on the mouse */
+      sc->xoff = (gint) coords->x - sc->width / 2;
+      sc->yoff = (gint) coords->y - sc->height / 2;
+    }
+
+  if (sc->tool_state == SC_STATE_RENDER_WAIT &&
+      gimp_seamless_clone_tool_is_in_paste_c (sc, coords))
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (sc));
+
+      /* Record previous location, in case the user cancels the
+       * movement
+       */
+      sc->xoff_p = sc->xoff;
+      sc->yoff_p = sc->yoff;
+
+      /* Record the mouse location, so that the dragging offset can be
+       * calculated
+       */
+      sc->xclick = coords->x;
+      sc->yclick = coords->y;
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+      if (gimp_seamless_clone_tool_render_node_update (sc))
+        {
+          gimp_seamless_clone_tool_filter_update (sc);
+        }
+
+      sc->tool_state = SC_STATE_RENDER_MOTION;
+
+      /* In order to receive motion events from the current click, we must
+       * activate the tool control
+       */
+      gimp_tool_control_activate (tool->control);
+    }
+}
+
+void
+gimp_seamless_clone_tool_button_release (GimpTool              *tool,
+                                         const GimpCoords      *coords,
+                                         guint32                time,
+                                         GdkModifierType        state,
+                                         GimpButtonReleaseType  release_type,
+                                         GimpDisplay           *display)
+{
+  GimpSeamlessCloneTool *sc = GIMP_SEAMLESS_CLONE_TOOL (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  /* There is nothing to do, unless we were actually moving a paste */
+  if (sc->tool_state == SC_STATE_RENDER_MOTION)
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (sc));
+
+      if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+        {
+          sc->xoff = sc->xoff_p;
+          sc->yoff = sc->yoff_p;
+        }
+      else
+        {
+          sc->xoff = sc->xoff_p + (gint) (coords->x - sc->xclick);
+          sc->yoff = sc->yoff_p + (gint) (coords->y - sc->yclick);
+        }
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+      if (gimp_seamless_clone_tool_render_node_update (sc))
+        {
+          gimp_seamless_clone_tool_filter_update (sc);
+        }
+
+      sc->tool_state = SC_STATE_RENDER_WAIT;
+    }
+}
+
+static void
+gimp_seamless_clone_tool_motion (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 guint32           time,
+                                 GdkModifierType   state,
+                                 GimpDisplay      *display)
+{
+  GimpSeamlessCloneTool *sc = GIMP_SEAMLESS_CLONE_TOOL (tool);
+
+  if (sc->tool_state == SC_STATE_RENDER_MOTION)
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (sc));
+
+      sc->xoff = sc->xoff_p + (gint) (coords->x - sc->xclick);
+      sc->yoff = sc->yoff_p + (gint) (coords->y - sc->yclick);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+      if (gimp_seamless_clone_tool_render_node_update (sc))
+        {
+          gimp_seamless_clone_tool_filter_update (sc);
+        }
+    }
+}
+
+static gboolean
+gimp_seamless_clone_tool_key_press (GimpTool    *tool,
+                                    GdkEventKey *kevent,
+                                    GimpDisplay *display)
+{
+  GimpSeamlessCloneTool *sct = GIMP_SEAMLESS_CLONE_TOOL (tool);
+
+  if (sct->tool_state == SC_STATE_RENDER_MOTION ||
+      sct->tool_state == SC_STATE_RENDER_WAIT)
+    {
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Return:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_ISO_Enter:
+          gimp_tool_control_set_preserve (tool->control, TRUE);
+
+          /* TODO: there may be issues with committing the image map
+           *       result after some changes were made and the preview
+           *       was scrolled. We can fix these by either invalidating
+           *       the area which is a union of the previous paste
+           *       rectangle each time (in the update function) or by
+           *       invalidating and re-rendering all now (expensive and
+           *       perhaps useless */
+          gimp_drawable_filter_commit (sct->filter, GIMP_PROGRESS (tool), FALSE);
+          g_clear_object (&sct->filter);
+
+          gimp_tool_control_set_preserve (tool->control, FALSE);
+
+          gimp_image_flush (gimp_display_get_image (display));
+
+          gimp_seamless_clone_tool_control (tool, GIMP_TOOL_ACTION_HALT,
+                                            display);
+          return TRUE;
+
+        case GDK_KEY_Escape:
+          gimp_seamless_clone_tool_control (tool, GIMP_TOOL_ACTION_HALT,
+                                            display);
+          return TRUE;
+
+        default:
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_seamless_clone_tool_oper_update (GimpTool         *tool,
+                                      const GimpCoords *coords,
+                                      GdkModifierType   state,
+                                      gboolean          proximity,
+                                      GimpDisplay      *display)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  /* TODO: Modify data here */
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+/* Mouse cursor policy:
+ * - Always use the move cursor
+ * - While dragging the paste, use a move modified
+ * - Else, While hovering above it, display no modifier
+ * - Else, display a "bad" modifier
+ */
+static void
+gimp_seamless_clone_tool_cursor_update (GimpTool         *tool,
+                                        const GimpCoords *coords,
+                                        GdkModifierType   state,
+                                        GimpDisplay      *display)
+{
+  GimpSeamlessCloneTool *sc       = GIMP_SEAMLESS_CLONE_TOOL (tool);
+  GimpCursorModifier     modifier = GIMP_CURSOR_MODIFIER_BAD;
+
+  /* Only update if the tool is actually active on some display */
+  if (tool->display)
+    {
+      if (sc->tool_state == SC_STATE_RENDER_MOTION)
+        {
+          modifier = GIMP_CURSOR_MODIFIER_MOVE;
+        }
+      else if (sc->tool_state == SC_STATE_RENDER_WAIT &&
+               gimp_seamless_clone_tool_is_in_paste_c (sc, coords))
+        {
+          modifier = GIMP_CURSOR_MODIFIER_NONE;
+        }
+
+      gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_seamless_clone_tool_options_notify (GimpTool         *tool,
+                                         GimpToolOptions  *options,
+                                         const GParamSpec *pspec)
+{
+  GimpSeamlessCloneTool *sc = GIMP_SEAMLESS_CLONE_TOOL (tool);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! tool->display)
+    return;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  if (! strcmp (pspec->name, "max-refine-scale"))
+    {
+      if (gimp_seamless_clone_tool_render_node_update (sc))
+        {
+          gimp_seamless_clone_tool_filter_update (sc);
+        }
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_seamless_clone_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpSeamlessCloneTool *sc = GIMP_SEAMLESS_CLONE_TOOL (draw_tool);
+
+  if (sc->tool_state == SC_STATE_RENDER_WAIT ||
+      sc->tool_state == SC_STATE_RENDER_MOTION)
+    {
+      gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                    sc->xoff, sc->yoff, sc->width, sc->height);
+    }
+}
+
+/**
+ * gimp_seamless_clone_tool_create_render_node:
+ * @sc: The GimpSeamlessCloneTool to initialize
+ *
+ * This function creates a Gegl node graph of the composition which is
+ * needed to render the drawable. The graph should have an "input" pad
+ * which will receive the drawable on which the preview is applied, and
+ * it should also have an "output" pad to which the final result will be
+ * rendered
+ */
+static void
+gimp_seamless_clone_tool_create_render_node (GimpSeamlessCloneTool *sc)
+{
+  /* Here is a textual description of the graph we are going to create:
+   *
+   * <input>  <- drawable
+   * +--+--------------------------+
+   * |  |output                    |
+   * |  |                          |
+   * |  | <buffer-source> <- paste |
+   * |  |       |output            |
+   * |  |       |                  |
+   * |  |input  |aux               |
+   * |<seamless-paste-render>      |
+   * |    |output                  |
+   * |    |                        |
+   * |    |input                   |
+   * +----+------------------------+
+   *   <output>
+   */
+  GimpSeamlessCloneOptions *options = GIMP_SEAMLESS_CLONE_TOOL_GET_OPTIONS (sc);
+  GeglNode *node;
+  GeglNode *op, *paste, *overlay;
+  GeglNode *input, *output;
+
+  node = gegl_node_new ();
+
+  input  = gegl_node_get_input_proxy  (node, "input");
+  output = gegl_node_get_output_proxy (node, "output");
+
+  paste = gegl_node_new_child (node,
+                               "operation", "gegl:buffer-source",
+                               "buffer",    sc->paste,
+                               NULL);
+
+  op = gegl_node_new_child (node,
+                            "operation",         "gegl:seamless-clone",
+                            "max-refine-scale",  options->max_refine_scale,
+                            NULL);
+
+  overlay = gegl_node_new_child (node,
+                                 "operation", "svg:dst-over",
+                                 NULL);
+
+  gegl_node_connect_to (input,   "output",
+                        op,      "input");
+
+  gegl_node_connect_to (paste,   "output",
+                        op,      "aux");
+
+  gegl_node_connect_to (op,      "output",
+                        overlay, "input");
+
+  gegl_node_connect_to (input,   "output",
+                        overlay, "aux");
+
+  gegl_node_connect_to (overlay, "output",
+                        output,  "input");
+
+  sc->render_node = node;
+  sc->sc_node     = op;
+}
+
+/* gimp_seamless_clone_tool_render_node_update:
+ * sc: the Seamless Clone tool whose render has to be updated.
+ *
+ * Returns: TRUE if any property changed.
+ */
+static gboolean
+gimp_seamless_clone_tool_render_node_update (GimpSeamlessCloneTool *sc)
+{
+  static gint rendered__max_refine_scale = -1;
+  static gint rendered_xoff              = G_MAXINT;
+  static gint rendered_yoff              = G_MAXINT;
+
+  GimpSeamlessCloneOptions *options = GIMP_SEAMLESS_CLONE_TOOL_GET_OPTIONS (sc);
+  GimpDrawable *bg = GIMP_TOOL (sc)->drawable;
+  gint          off_x, off_y;
+
+  /* All properties stay the same. No need to update. */
+  if (rendered__max_refine_scale == options->max_refine_scale &&
+      rendered_xoff == sc->xoff                               &&
+      rendered_yoff == sc->yoff)
+    return FALSE;
+
+  gimp_item_get_offset (GIMP_ITEM (bg), &off_x, &off_y);
+
+  gegl_node_set (sc->sc_node,
+                 "xoff", (gint) sc->xoff - off_x,
+                 "yoff", (gint) sc->yoff - off_y,
+                 "max-refine-scale", (gint) options->max_refine_scale,
+                 NULL);
+
+  rendered__max_refine_scale = options->max_refine_scale;
+  rendered_xoff              = sc->xoff;
+  rendered_yoff              = sc->yoff;
+
+  return TRUE;
+}
+
+static void
+gimp_seamless_clone_tool_create_filter (GimpSeamlessCloneTool *sc,
+                                        GimpDrawable          *drawable)
+{
+  if (! sc->render_node)
+    gimp_seamless_clone_tool_create_render_node (sc);
+
+  sc->filter = gimp_drawable_filter_new (drawable,
+                                         _("Seamless Clone"),
+                                         sc->render_node,
+                                         GIMP_ICON_TOOL_SEAMLESS_CLONE);
+
+  gimp_drawable_filter_set_region (sc->filter, GIMP_FILTER_REGION_DRAWABLE);
+
+  g_signal_connect (sc->filter, "flush",
+                    G_CALLBACK (gimp_seamless_clone_tool_filter_flush),
+                    sc);
+}
+
+static void
+gimp_seamless_clone_tool_filter_flush (GimpDrawableFilter *filter,
+                                       GimpTool           *tool)
+{
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+static void
+gimp_seamless_clone_tool_filter_update (GimpSeamlessCloneTool *sc)
+{
+  GimpTool         *tool  = GIMP_TOOL (sc);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+  GimpItem         *item  = GIMP_ITEM (tool->drawable);
+  gint              x, y;
+  gint              w, h;
+  gint              off_x, off_y;
+  GeglRectangle     visible;
+  GeglOperation    *op = NULL;
+
+  GimpProgress     *progress;
+  GeglNode         *output;
+  GeglProcessor    *processor;
+  gdouble           value;
+
+  progress = gimp_progress_start (GIMP_PROGRESS (sc), FALSE,
+                                  _("Cloning the foreground object"));
+
+  /* Find out at which x,y is the top left corner of the currently
+   * displayed part */
+  gimp_display_shell_untransform_viewport (shell, ! shell->show_all,
+                                           &x, &y, &w, &h);
+
+  /* Find out where is our drawable positioned */
+  gimp_item_get_offset (item, &off_x, &off_y);
+
+  /* Create a rectangle from the intersection of the currently displayed
+   * part with the drawable */
+  gimp_rectangle_intersect (x, y, w, h,
+                            off_x,
+                            off_y,
+                            gimp_item_get_width  (item),
+                            gimp_item_get_height (item),
+                            &visible.x,
+                            &visible.y,
+                            &visible.width,
+                            &visible.height);
+
+  /* Since the filter_apply function receives a rectangle describing
+   * where it should update the preview, and since that rectangle should
+   * be relative to the drawable's location, we now offset back by the
+   * drawable's offsetts. */
+  visible.x -= off_x;
+  visible.y -= off_y;
+
+  g_object_get (sc->sc_node, "gegl-operation", &op, NULL);
+  /* If any cache of the visible area was present, clear it!
+   * We need to clear the cache in the sc_node, since that is
+   * where the previous paste was located
+   */
+  gegl_operation_invalidate (op, &visible, TRUE);
+  g_object_unref (op);
+
+  /* Now update the image map and show this area */
+  gimp_drawable_filter_apply (sc->filter, NULL);
+
+  /* Show update progress. */
+  output = gegl_node_get_output_proxy (sc->render_node, "output");
+  processor = gegl_node_new_processor (output, NULL);
+
+  while (gegl_processor_work (processor, &value))
+    {
+      if (progress)
+        gimp_progress_set_value (progress, value);
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  g_object_unref (processor);
+}
diff --git a/app/tools/gimpseamlessclonetool.h b/app/tools/gimpseamlessclonetool.h
new file mode 100644
index 0000000..d2c85a3
--- /dev/null
+++ b/app/tools/gimpseamlessclonetool.h
@@ -0,0 +1,86 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpseamlessclonetool.h
+ * Copyright (C) 2011 Barak Itkin <lightningismyname@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SEAMLESS_CLONE_TOOL_H__
+#define __GIMP_SEAMLESS_CLONE_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_SEAMLESS_CLONE_TOOL            (gimp_seamless_clone_tool_get_type ())
+#define GIMP_SEAMLESS_CLONE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SEAMLESS_CLONE_TOOL, GimpSeamlessCloneTool))
+#define GIMP_SEAMLESS_CLONE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SEAMLESS_CLONE_TOOL, GimpSeamlessCloneToolClass))
+#define GIMP_IS_SEAMLESS_CLONE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SEAMLESS_CLONE_TOOL))
+#define GIMP_IS_SEAMLESS_CLONE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SEAMLESS_CLONE_TOOL))
+#define GIMP_SEAMLESS_CLONE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SEAMLESS_CLONE_TOOL, GimpSeamlessCloneToolClass))
+
+#define GIMP_SEAMLESS_CLONE_TOOL_GET_OPTIONS(t)  (GIMP_SEAMLESS_CLONE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpSeamlessCloneTool      GimpSeamlessCloneTool;
+typedef struct _GimpSeamlessCloneToolClass GimpSeamlessCloneToolClass;
+
+struct _GimpSeamlessCloneTool
+{
+  GimpDrawTool    parent_instance;
+
+  GeglBuffer     *paste;         /* A buffer containing the original
+                                  * paste that will be used in the
+                                  * rendering process */
+
+  GeglNode       *render_node;    /* The parent of the Gegl graph that
+                                   * renders the seamless cloning */
+
+  GeglNode       *sc_node;        /* A Gegl node to do the seamless
+                                   * cloning live with translation of
+                                   * the paste */
+
+  gint            tool_state;     /* The current state in the tool's
+                                   * state machine */
+
+  GimpDrawableFilter *filter;     /* The filter object which renders
+                                   * the live preview, and commits it
+                                   * when at the end */
+
+  gint width, height;             /* The width and height of the paste.
+                                   * Needed for mouse hit detection */
+
+  gint xoff, yoff;                /* The current offset of the paste */
+  gint xoff_p, yoff_p;            /* The previous offset of the paste */
+
+  gdouble xclick, yclick;         /* The image location of the last
+                                   * mouse click. To be used when the
+                                   * mouse is in motion, to recalculate
+                                   * the xoff and yoff values */
+};
+
+struct _GimpSeamlessCloneToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+
+void    gimp_seamless_clone_tool_register (GimpToolRegisterCallback  callback,
+                                           gpointer                  data);
+
+GType   gimp_seamless_clone_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SEAMLESS_CLONE_TOOL_H__  */
diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c
new file mode 100644
index 0000000..4599386
--- /dev/null
+++ b/app/tools/gimpselectionoptions.c
@@ -0,0 +1,292 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpselectionoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OPERATION,
+  PROP_ANTIALIAS,
+  PROP_FEATHER,
+  PROP_FEATHER_RADIUS
+};
+
+
+static void   gimp_selection_options_set_property (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void   gimp_selection_options_get_property (GObject      *object,
+                                                   guint         property_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpSelectionOptions, gimp_selection_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_selection_options_parent_class
+
+
+static void
+gimp_selection_options_class_init (GimpSelectionOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_selection_options_set_property;
+  object_class->get_property = gimp_selection_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_OPERATION,
+                         "operation",
+                         NULL, NULL,
+                         GIMP_TYPE_CHANNEL_OPS,
+                         GIMP_CHANNEL_OP_REPLACE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            _("Smooth edges"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FEATHER,
+                            "feather",
+                            _("Feather edges"),
+                            _("Enable feathering of selection edges"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS,
+                           "feather-radius",
+                           _("Radius"),
+                           _("Radius of feathering"),
+                           0.0, 100.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_selection_options_init (GimpSelectionOptions *options)
+{
+}
+
+static void
+gimp_selection_options_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpSelectionOptions *options = GIMP_SELECTION_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_OPERATION:
+      options->operation = g_value_get_enum (value);
+      break;
+
+    case PROP_ANTIALIAS:
+      options->antialias = g_value_get_boolean (value);
+      break;
+
+    case PROP_FEATHER:
+      options->feather = g_value_get_boolean (value);
+      break;
+
+    case PROP_FEATHER_RADIUS:
+      options->feather_radius = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_selection_options_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpSelectionOptions *options = GIMP_SELECTION_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_OPERATION:
+      g_value_set_enum (value, options->operation);
+      break;
+
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, options->antialias);
+      break;
+
+    case PROP_FEATHER:
+      g_value_set_boolean (value, options->feather);
+      break;
+
+    case PROP_FEATHER_RADIUS:
+      g_value_set_double (value, options->feather_radius);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static const gchar *
+gimp_selection_options_get_modifiers (GimpChannelOps operation)
+{
+  GdkModifierType extend_mask;
+  GdkModifierType modify_mask;
+  GdkModifierType modifiers = 0;
+
+  extend_mask = gimp_get_extend_selection_mask ();
+  modify_mask = gimp_get_modify_selection_mask ();
+
+  switch (operation)
+    {
+    case GIMP_CHANNEL_OP_ADD:
+      modifiers = extend_mask;
+      break;
+
+    case GIMP_CHANNEL_OP_SUBTRACT:
+      modifiers = modify_mask;
+      break;
+
+    case GIMP_CHANNEL_OP_REPLACE:
+      modifiers = 0;
+      break;
+
+    case GIMP_CHANNEL_OP_INTERSECT:
+      modifiers = extend_mask | modify_mask;
+      break;
+    }
+
+  return gimp_get_mod_string (modifiers);
+}
+
+GtkWidget *
+gimp_selection_options_gui (GimpToolOptions *tool_options)
+{
+  GObject              *config  = G_OBJECT (tool_options);
+  GimpSelectionOptions *options = GIMP_SELECTION_OPTIONS (tool_options);
+  GtkWidget            *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget            *button;
+
+  /*  the selection operation radio buttons  */
+  {
+    GtkWidget *hbox;
+    GtkWidget *label;
+    GtkWidget *box;
+    GList     *children;
+    GList     *list;
+    gint       i;
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    options->mode_box = hbox;
+
+    label = gtk_label_new (_("Mode:"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    box = gimp_prop_enum_icon_box_new (config, "operation",
+                                       "gimp-selection", 0, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+    gtk_widget_show (box);
+
+    children = gtk_container_get_children (GTK_CONTAINER (box));
+
+    /*  add modifier keys to the tooltips  */
+    for (list = children, i = 0; list; list = list->next, i++)
+      {
+        GtkWidget   *button   = list->data;
+        const gchar *modifier = gimp_selection_options_get_modifiers (i);
+        gchar       *tooltip;
+
+        if (! modifier)
+          continue;
+
+        tooltip = gtk_widget_get_tooltip_text (button);
+
+        if (tooltip)
+          {
+            gchar *tip = g_strdup_printf ("%s  <b>%s</b>", tooltip, modifier);
+
+            gimp_help_set_help_data_with_markup (button, tip, NULL);
+
+            g_free (tip);
+            g_free (tooltip);
+          }
+        else
+          {
+            gimp_help_set_help_data (button, modifier, NULL);
+          }
+      }
+
+    /*  move GIMP_CHANNEL_OP_REPLACE to the front  */
+    gtk_box_reorder_child (GTK_BOX (box),
+                           GTK_WIDGET (children->next->next->data), 0);
+
+    g_list_free (children);
+  }
+
+  /*  the antialias toggle button  */
+  button = gimp_prop_check_button_new (config, "antialias", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  options->antialias_toggle = button;
+
+  /*  the feather frame  */
+  {
+    GtkWidget *frame;
+    GtkWidget *scale;
+
+    /*  the feather radius scale  */
+    scale = gimp_prop_spin_scale_new (config, "feather-radius", NULL,
+                                      1.0, 10.0, 1);
+
+    frame = gimp_prop_expanding_frame_new (config, "feather", NULL,
+                                           scale, NULL);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+    gtk_widget_show (frame);
+  }
+
+  return vbox;
+}
diff --git a/app/tools/gimpselectionoptions.h b/app/tools/gimpselectionoptions.h
new file mode 100644
index 0000000..9a2107d
--- /dev/null
+++ b/app/tools/gimpselectionoptions.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SELECTION_OPTIONS_H__
+#define __GIMP_SELECTION_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_SELECTION_OPTIONS            (gimp_selection_options_get_type ())
+#define GIMP_SELECTION_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SELECTION_OPTIONS, GimpSelectionOptions))
+#define GIMP_SELECTION_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SELECTION_OPTIONS, GimpSelectionOptionsClass))
+#define GIMP_IS_SELECTION_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SELECTION_OPTIONS))
+#define GIMP_IS_SELECTION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SELECTION_OPTIONS))
+#define GIMP_SELECTION_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SELECTION_OPTIONS, GimpSelectionOptionsClass))
+
+
+typedef struct _GimpSelectionOptions GimpSelectionOptions;
+typedef struct _GimpToolOptionsClass GimpSelectionOptionsClass;
+
+struct _GimpSelectionOptions
+{
+  GimpToolOptions  parent_instance;
+
+  GimpChannelOps   operation;
+  gboolean         antialias;
+  gboolean         feather;
+  gdouble          feather_radius;
+
+  /*  options gui  */
+  GtkWidget       *mode_box;
+  GtkWidget       *antialias_toggle;
+};
+
+
+GType       gimp_selection_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_selection_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_SELECTION_OPTIONS_H__  */
diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c
new file mode 100644
index 0000000..c1cec9c
--- /dev/null
+++ b/app/tools/gimpselectiontool.c
@@ -0,0 +1,830 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimppickable.h"
+#include "core/gimpundostack.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell-appearance.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpeditselectiontool.h"
+#include "gimpselectiontool.h"
+#include "gimpselectionoptions.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void       gimp_selection_tool_control             (GimpTool           *tool,
+                                                           GimpToolAction      action,
+                                                           GimpDisplay        *display);
+static void       gimp_selection_tool_modifier_key        (GimpTool           *tool,
+                                                           GdkModifierType     key,
+                                                           gboolean            press,
+                                                           GdkModifierType     state,
+                                                           GimpDisplay        *display);
+static void       gimp_selection_tool_oper_update         (GimpTool           *tool,
+                                                           const GimpCoords   *coords,
+                                                           GdkModifierType     state,
+                                                           gboolean            proximity,
+                                                           GimpDisplay        *display);
+static void       gimp_selection_tool_cursor_update       (GimpTool           *tool,
+                                                           const GimpCoords   *coords,
+                                                           GdkModifierType     state,
+                                                           GimpDisplay        *display);
+
+static gboolean   gimp_selection_tool_real_have_selection (GimpSelectionTool  *sel_tool,
+                                                           GimpDisplay        *display);
+
+static void       gimp_selection_tool_commit              (GimpSelectionTool  *sel_tool);
+static void       gimp_selection_tool_halt                (GimpSelectionTool  *sel_tool,
+                                                           GimpDisplay        *display);
+
+static gboolean   gimp_selection_tool_check               (GimpSelectionTool  *sel_tool,
+                                                           GimpDisplay        *display,
+                                                           GError            **error);
+
+static gboolean   gimp_selection_tool_have_selection      (GimpSelectionTool  *sel_tool,
+                                                           GimpDisplay        *display);
+
+static void       gimp_selection_tool_set_undo_ptr        (GimpUndo          **undo_ptr,
+                                                           GimpUndo           *undo);
+
+
+G_DEFINE_TYPE (GimpSelectionTool, gimp_selection_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_selection_tool_parent_class
+
+
+static void
+gimp_selection_tool_class_init (GimpSelectionToolClass *klass)
+{
+  GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
+
+  tool_class->control       = gimp_selection_tool_control;
+  tool_class->modifier_key  = gimp_selection_tool_modifier_key;
+  tool_class->key_press     = gimp_edit_selection_tool_key_press;
+  tool_class->oper_update   = gimp_selection_tool_oper_update;
+  tool_class->cursor_update = gimp_selection_tool_cursor_update;
+
+  klass->have_selection     = gimp_selection_tool_real_have_selection;
+}
+
+static void
+gimp_selection_tool_init (GimpSelectionTool *selection_tool)
+{
+  selection_tool->function             = SELECTION_SELECT;
+  selection_tool->saved_operation      = GIMP_CHANNEL_OP_REPLACE;
+
+  selection_tool->saved_show_selection = FALSE;
+  selection_tool->undo                 = NULL;
+  selection_tool->redo                 = NULL;
+  selection_tool->idle_id              = 0;
+
+  selection_tool->allow_move           = TRUE;
+}
+
+static void
+gimp_selection_tool_control (GimpTool       *tool,
+                             GimpToolAction  action,
+                             GimpDisplay    *display)
+{
+  GimpSelectionTool *selection_tool = GIMP_SELECTION_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_selection_tool_halt (selection_tool, display);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_selection_tool_commit (selection_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_selection_tool_modifier_key (GimpTool        *tool,
+                                  GdkModifierType  key,
+                                  gboolean         press,
+                                  GdkModifierType  state,
+                                  GimpDisplay     *display)
+{
+  GimpSelectionTool    *selection_tool = GIMP_SELECTION_TOOL (tool);
+  GimpSelectionOptions *options        = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GdkModifierType       extend_mask;
+  GdkModifierType       modify_mask;
+
+  extend_mask = gimp_get_extend_selection_mask ();
+  modify_mask = gimp_get_modify_selection_mask ();
+
+  if (key == extend_mask ||
+      key == modify_mask ||
+      key == GDK_MOD1_MASK)
+    {
+      GimpChannelOps button_op = options->operation;
+
+      state &= extend_mask |
+               modify_mask |
+               GDK_MOD1_MASK;
+
+      if (press)
+        {
+          if (key == state ||
+              /* GimpPolygonSelectTool may mask-out part of the state, which
+               * can cause the wrong mode to be restored on release if we don't
+               * init saved_operation here.
+               *
+               * see issue #4992.
+               */
+              ! state)
+            {
+              /*  first modifier pressed  */
+
+              selection_tool->saved_operation = options->operation;
+            }
+        }
+      else
+        {
+          if (! state)
+            {
+              /*  last modifier released  */
+
+              button_op = selection_tool->saved_operation;
+            }
+        }
+
+      if (state & GDK_MOD1_MASK)
+        {
+          /*  if alt is down, pretend that neither
+           *  shift nor control are down
+           */
+          button_op = selection_tool->saved_operation;
+        }
+      else if (state & (extend_mask |
+                        modify_mask))
+        {
+          /*  else get the operation from the modifier state, but only
+           *  if there is actually a modifier pressed, so we don't
+           *  override the "last modifier released" assignment above
+           */
+          button_op = gimp_modifiers_to_channel_op (state);
+        }
+
+      if (button_op != options->operation)
+        {
+          g_object_set (options, "operation", button_op, NULL);
+        }
+    }
+}
+
+static void
+gimp_selection_tool_oper_update (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 GdkModifierType   state,
+                                 gboolean          proximity,
+                                 GimpDisplay      *display)
+{
+  GimpSelectionTool    *selection_tool = GIMP_SELECTION_TOOL (tool);
+  GimpSelectionOptions *options        = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+  GimpImage            *image;
+  GimpDrawable         *drawable;
+  GimpLayer            *layer;
+  GimpLayer            *floating_sel;
+  GdkModifierType       extend_mask;
+  GdkModifierType       modify_mask;
+  gboolean              have_selection;
+  gboolean              move_layer        = FALSE;
+  gboolean              move_floating_sel = FALSE;
+
+  image        = gimp_display_get_image (display);
+  drawable     = gimp_image_get_active_drawable (image);
+  layer        = gimp_image_pick_layer (image, coords->x, coords->y, NULL);
+  floating_sel = gimp_image_get_floating_selection (image);
+
+  extend_mask = gimp_get_extend_selection_mask ();
+  modify_mask = gimp_get_modify_selection_mask ();
+
+  have_selection = gimp_selection_tool_have_selection (selection_tool, display);
+
+  if (drawable)
+    {
+      if (floating_sel)
+        {
+          if (layer == floating_sel)
+            move_floating_sel = TRUE;
+        }
+      else if (have_selection &&
+               gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                         NULL, NULL, NULL, NULL))
+        {
+          move_layer = TRUE;
+        }
+    }
+
+  selection_tool->function = SELECTION_SELECT;
+
+  if (selection_tool->allow_move &&
+      (state & GDK_MOD1_MASK) && (state & modify_mask) && move_layer)
+    {
+      /* move the selection */
+      selection_tool->function = SELECTION_MOVE;
+    }
+  else if (selection_tool->allow_move &&
+           (state & GDK_MOD1_MASK) && (state & extend_mask) && move_layer)
+    {
+      /* move a copy of the selection */
+      selection_tool->function = SELECTION_MOVE_COPY;
+    }
+  else if (selection_tool->allow_move &&
+           (state & GDK_MOD1_MASK) && have_selection)
+    {
+      /* move the selection mask */
+      selection_tool->function = SELECTION_MOVE_MASK;
+    }
+  else if (selection_tool->allow_move &&
+           ! (state & (extend_mask | modify_mask)) &&
+           move_floating_sel)
+    {
+      /* move the selection */
+      selection_tool->function = SELECTION_MOVE;
+    }
+  else if ((state & modify_mask) || (state & extend_mask))
+    {
+      /* select */
+      selection_tool->function = SELECTION_SELECT;
+    }
+  else if (floating_sel)
+    {
+      /* anchor the selection */
+      selection_tool->function = SELECTION_ANCHOR;
+    }
+
+  gimp_tool_pop_status (tool, display);
+
+  if (proximity)
+    {
+      const gchar     *status      = NULL;
+      gboolean         free_status = FALSE;
+      GdkModifierType  modifiers   = (extend_mask | modify_mask);
+
+      if (have_selection)
+        modifiers |= GDK_MOD1_MASK;
+
+      switch (selection_tool->function)
+        {
+        case SELECTION_SELECT:
+          switch (options->operation)
+            {
+            case GIMP_CHANNEL_OP_REPLACE:
+              if (have_selection)
+                {
+                  status = gimp_suggest_modifiers (_("Click-Drag to replace the "
+                                                     "current selection"),
+                                                   modifiers & ~state,
+                                                   NULL, NULL, NULL);
+                  free_status = TRUE;
+                }
+              else
+                {
+                  status = _("Click-Drag to create a new selection");
+                }
+              break;
+
+            case GIMP_CHANNEL_OP_ADD:
+              status = gimp_suggest_modifiers (_("Click-Drag to add to the "
+                                                 "current selection"),
+                                               modifiers
+                                               & ~(state | extend_mask),
+                                               NULL, NULL, NULL);
+              free_status = TRUE;
+              break;
+
+            case GIMP_CHANNEL_OP_SUBTRACT:
+              status = gimp_suggest_modifiers (_("Click-Drag to subtract from the "
+                                                 "current selection"),
+                                               modifiers
+                                               & ~(state | modify_mask),
+                                               NULL, NULL, NULL);
+              free_status = TRUE;
+              break;
+
+            case GIMP_CHANNEL_OP_INTERSECT:
+              status = gimp_suggest_modifiers (_("Click-Drag to intersect with "
+                                                 "the current selection"),
+                                               modifiers & ~state,
+                                               NULL, NULL, NULL);
+              free_status = TRUE;
+              break;
+            }
+          break;
+
+        case SELECTION_MOVE_MASK:
+          status = gimp_suggest_modifiers (_("Click-Drag to move the "
+                                             "selection mask"),
+                                           modifiers & ~state,
+                                           NULL, NULL, NULL);
+          free_status = TRUE;
+          break;
+
+        case SELECTION_MOVE:
+          status = _("Click-Drag to move the selected pixels");
+          break;
+
+        case SELECTION_MOVE_COPY:
+          status = _("Click-Drag to move a copy of the selected pixels");
+          break;
+
+        case SELECTION_ANCHOR:
+          status = _("Click to anchor the floating selection");
+          break;
+
+        default:
+          g_return_if_reached ();
+        }
+
+      if (status)
+        gimp_tool_push_status (tool, display, "%s", status);
+
+      if (free_status)
+        g_free ((gchar *) status);
+    }
+}
+
+static void
+gimp_selection_tool_cursor_update (GimpTool         *tool,
+                                   const GimpCoords *coords,
+                                   GdkModifierType   state,
+                                   GimpDisplay      *display)
+{
+  GimpSelectionTool    *selection_tool = GIMP_SELECTION_TOOL (tool);
+  GimpSelectionOptions *options;
+  GimpToolCursorType    tool_cursor;
+  GimpCursorModifier    modifier;
+
+  options = GIMP_SELECTION_TOOL_GET_OPTIONS (tool);
+
+  tool_cursor = gimp_tool_control_get_tool_cursor (tool->control);
+  modifier    = GIMP_CURSOR_MODIFIER_NONE;
+
+  switch (selection_tool->function)
+    {
+    case SELECTION_SELECT:
+      switch (options->operation)
+        {
+        case GIMP_CHANNEL_OP_REPLACE:
+          break;
+        case GIMP_CHANNEL_OP_ADD:
+          modifier = GIMP_CURSOR_MODIFIER_PLUS;
+          break;
+        case GIMP_CHANNEL_OP_SUBTRACT:
+          modifier = GIMP_CURSOR_MODIFIER_MINUS;
+          break;
+        case GIMP_CHANNEL_OP_INTERSECT:
+          modifier = GIMP_CURSOR_MODIFIER_INTERSECT;
+          break;
+        }
+      break;
+
+    case SELECTION_MOVE_MASK:
+      modifier = GIMP_CURSOR_MODIFIER_MOVE;
+      break;
+
+    case SELECTION_MOVE:
+    case SELECTION_MOVE_COPY:
+      tool_cursor = GIMP_TOOL_CURSOR_MOVE;
+      break;
+
+    case SELECTION_ANCHOR:
+      modifier = GIMP_CURSOR_MODIFIER_ANCHOR;
+      break;
+    }
+
+  /*  our subclass might have set a BAD modifier, in which case we leave it
+   *  there, since it's more important than what we have to say.
+   */
+  if (gimp_tool_control_get_cursor_modifier (tool->control) ==
+      GIMP_CURSOR_MODIFIER_BAD                              ||
+      ! gimp_selection_tool_check (selection_tool, display, NULL))
+    {
+      modifier = GIMP_CURSOR_MODIFIER_BAD;
+    }
+
+  gimp_tool_set_cursor (tool, display,
+                        gimp_tool_control_get_cursor (tool->control),
+                        tool_cursor,
+                        modifier);
+}
+
+static gboolean
+gimp_selection_tool_real_have_selection (GimpSelectionTool *sel_tool,
+                                         GimpDisplay       *display)
+{
+  GimpImage   *image     = gimp_display_get_image (display);
+  GimpChannel *selection = gimp_image_get_mask (image);
+
+  return ! gimp_channel_is_empty (selection);
+}
+
+static void
+gimp_selection_tool_commit (GimpSelectionTool *sel_tool)
+{
+  /* make sure gimp_selection_tool_halt() doesn't undo the change, if any */
+  gimp_selection_tool_set_undo_ptr (&sel_tool->undo, NULL);
+}
+
+static void
+gimp_selection_tool_halt (GimpSelectionTool *sel_tool,
+                          GimpDisplay       *display)
+{
+  g_warn_if_fail (sel_tool->change_count == 0);
+
+  if (display)
+    {
+      GimpTool      *tool       = GIMP_TOOL (sel_tool);
+      GimpImage     *image      = gimp_display_get_image (display);
+      GimpUndoStack *undo_stack = gimp_image_get_undo_stack (image);
+      GimpUndo      *undo       = gimp_undo_stack_peek (undo_stack);
+
+      /* if we have an existing selection in the current display, then
+       * we have already "executed", and need to undo at this point,
+       * unless the user has done something in the meantime
+       */
+      if (undo && sel_tool->undo == undo)
+        {
+          /* prevent this change from halting the tool */
+          gimp_tool_control_push_preserve (tool->control, TRUE);
+
+          gimp_image_undo (image);
+          gimp_image_flush (image);
+
+          gimp_tool_control_pop_preserve (tool->control);
+        }
+
+      /* reset the automatic undo/redo mechanism */
+      gimp_selection_tool_set_undo_ptr (&sel_tool->undo, NULL);
+      gimp_selection_tool_set_undo_ptr (&sel_tool->redo, NULL);
+    }
+}
+
+static gboolean
+gimp_selection_tool_check (GimpSelectionTool  *sel_tool,
+                           GimpDisplay        *display,
+                           GError            **error)
+{
+  GimpSelectionOptions *options  = GIMP_SELECTION_TOOL_GET_OPTIONS (sel_tool);
+  GimpImage            *image    = gimp_display_get_image (display);
+  GimpDrawable         *drawable = gimp_image_get_active_drawable (image);
+
+  switch (sel_tool->function)
+    {
+    case SELECTION_SELECT:
+      switch (options->operation)
+        {
+        case GIMP_CHANNEL_OP_ADD:
+        case GIMP_CHANNEL_OP_REPLACE:
+          break;
+
+        case GIMP_CHANNEL_OP_SUBTRACT:
+          if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                                  NULL, NULL, NULL, NULL))
+            {
+              g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot subtract from an empty selection."));
+
+              return FALSE;
+            }
+          break;
+
+        case GIMP_CHANNEL_OP_INTERSECT:
+          if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                                  NULL, NULL, NULL, NULL))
+            {
+              g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Cannot intersect with an empty selection."));
+
+              return FALSE;
+            }
+          break;
+        }
+      break;
+
+    case SELECTION_MOVE:
+    case SELECTION_MOVE_COPY:
+      if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+        {
+          g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                       _("Cannot modify the pixels of layer groups."));
+
+          return FALSE;
+        }
+      else if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+        {
+          g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                       _("The active layer's pixels are locked."));
+
+          if (error)
+            gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+
+          return FALSE;
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_selection_tool_have_selection (GimpSelectionTool *sel_tool,
+                                    GimpDisplay       *display)
+{
+  return GIMP_SELECTION_TOOL_GET_CLASS (sel_tool)->have_selection (sel_tool,
+                                                                   display);
+}
+
+static void
+gimp_selection_tool_set_undo_ptr (GimpUndo **undo_ptr,
+                                  GimpUndo  *undo)
+{
+  if (*undo_ptr)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (*undo_ptr),
+                                    (gpointer *) undo_ptr);
+    }
+
+  *undo_ptr = undo;
+
+  if (*undo_ptr)
+    {
+      g_object_add_weak_pointer (G_OBJECT (*undo_ptr),
+                                 (gpointer *) undo_ptr);
+    }
+}
+
+
+/*  public functions  */
+
+gboolean
+gimp_selection_tool_start_edit (GimpSelectionTool *sel_tool,
+                                GimpDisplay       *display,
+                                const GimpCoords  *coords)
+{
+  GimpTool             *tool;
+  GimpSelectionOptions *options;
+  GError               *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_SELECTION_TOOL (sel_tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+  g_return_val_if_fail (coords != NULL, FALSE);
+
+  tool    = GIMP_TOOL (sel_tool);
+  options = GIMP_SELECTION_TOOL_GET_OPTIONS (sel_tool);
+
+  g_return_val_if_fail (gimp_tool_control_is_active (tool->control) == FALSE,
+                        FALSE);
+
+  if (! gimp_selection_tool_check (sel_tool, display, &error))
+    {
+      gimp_tool_message_literal (tool, display, error->message);
+
+      gimp_widget_blink (options->mode_box);
+
+      g_clear_error (&error);
+
+      return TRUE;
+    }
+
+  switch (sel_tool->function)
+    {
+    case SELECTION_MOVE_MASK:
+      gimp_edit_selection_tool_start (tool, display, coords,
+                                      GIMP_TRANSLATE_MODE_MASK, FALSE);
+      return TRUE;
+
+    case SELECTION_MOVE:
+    case SELECTION_MOVE_COPY:
+      {
+        GimpTranslateMode edit_mode;
+
+        gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+
+        if (sel_tool->function == SELECTION_MOVE)
+          edit_mode = GIMP_TRANSLATE_MODE_MASK_TO_LAYER;
+        else
+          edit_mode = GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER;
+
+        gimp_edit_selection_tool_start (tool, display, coords,
+                                        edit_mode, FALSE);
+
+        return TRUE;
+      }
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_selection_tool_idle (GimpSelectionTool *sel_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (sel_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+
+  gimp_display_shell_set_show_selection (shell, FALSE);
+
+  sel_tool->idle_id = 0;
+
+  return G_SOURCE_REMOVE;
+}
+
+void
+gimp_selection_tool_start_change (GimpSelectionTool *sel_tool,
+                                  gboolean           create,
+                                  GimpChannelOps     operation)
+{
+  GimpTool         *tool;
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  GimpUndoStack    *undo_stack;
+
+  g_return_if_fail (GIMP_IS_SELECTION_TOOL (sel_tool));
+
+  tool = GIMP_TOOL (sel_tool);
+
+  g_return_if_fail (tool->display != NULL);
+
+  if (sel_tool->change_count++ > 0)
+    return;
+
+  shell      = gimp_display_get_shell (tool->display);
+  image      = gimp_display_get_image (tool->display);
+  undo_stack = gimp_image_get_undo_stack (image);
+
+  sel_tool->saved_show_selection =
+    gimp_display_shell_get_show_selection (shell);
+
+  if (create)
+    {
+      gimp_selection_tool_set_undo_ptr (&sel_tool->undo, NULL);
+    }
+  else
+    {
+      GimpUndoStack *redo_stack = gimp_image_get_redo_stack (image);
+      GimpUndo      *undo;
+
+      undo = gimp_undo_stack_peek (undo_stack);
+
+      if (undo && undo == sel_tool->undo)
+        {
+          /* prevent this change from halting the tool */
+          gimp_tool_control_push_preserve (tool->control, TRUE);
+
+          gimp_image_undo (image);
+
+          gimp_tool_control_pop_preserve (tool->control);
+
+          gimp_selection_tool_set_undo_ptr (&sel_tool->undo, NULL);
+
+          /* we will need to redo if the user cancels or executes */
+          gimp_selection_tool_set_undo_ptr (
+            &sel_tool->redo,
+            gimp_undo_stack_peek (redo_stack));
+        }
+
+      /* if the operation is "Replace", turn off the marching ants,
+       * because they are confusing ...
+       */
+      if (operation == GIMP_CHANNEL_OP_REPLACE)
+        {
+          /* ... however, do this in an idle function, to avoid unnecessarily
+           * restarting the selection if we don't visit the main loop between
+           * the start_change() and end_change() calls.
+           */
+          sel_tool->idle_id = g_idle_add_full (
+            G_PRIORITY_HIGH_IDLE,
+            (GSourceFunc) gimp_selection_tool_idle,
+            sel_tool, NULL);
+        }
+    }
+
+  gimp_selection_tool_set_undo_ptr (
+    &sel_tool->undo,
+    gimp_undo_stack_peek (undo_stack));
+}
+
+void
+gimp_selection_tool_end_change (GimpSelectionTool *sel_tool,
+                                gboolean           cancel)
+{
+  GimpTool         *tool;
+  GimpDisplayShell *shell;
+  GimpImage        *image;
+  GimpUndoStack    *undo_stack;
+
+  g_return_if_fail (GIMP_IS_SELECTION_TOOL (sel_tool));
+  g_return_if_fail (sel_tool->change_count > 0);
+
+  tool = GIMP_TOOL (sel_tool);
+
+  g_return_if_fail (tool->display != NULL);
+
+  if (--sel_tool->change_count > 0)
+    return;
+
+  shell      = gimp_display_get_shell (tool->display);
+  image      = gimp_display_get_image (tool->display);
+  undo_stack = gimp_image_get_undo_stack (image);
+
+  if (cancel)
+    {
+      GimpUndoStack *redo_stack = gimp_image_get_redo_stack (image);
+      GimpUndo      *redo       = gimp_undo_stack_peek (redo_stack);
+
+      if (redo && redo == sel_tool->redo)
+        {
+          /* prevent this from halting the tool */
+          gimp_tool_control_push_preserve (tool->control, TRUE);
+
+          gimp_image_redo (image);
+
+          gimp_tool_control_pop_preserve (tool->control);
+
+          gimp_selection_tool_set_undo_ptr (
+            &sel_tool->undo,
+            gimp_undo_stack_peek (undo_stack));
+        }
+      else
+        {
+          gimp_selection_tool_set_undo_ptr (&sel_tool->undo, NULL);
+        }
+    }
+  else
+    {
+      GimpUndo *undo = gimp_undo_stack_peek (undo_stack);
+
+      /* save the undo that we got when executing, but only if
+       * we actually selected something
+       */
+      if (undo && undo != sel_tool->undo)
+        gimp_selection_tool_set_undo_ptr (&sel_tool->undo, undo);
+      else
+        gimp_selection_tool_set_undo_ptr (&sel_tool->undo, NULL);
+    }
+
+  gimp_selection_tool_set_undo_ptr (&sel_tool->redo, NULL);
+
+  if (sel_tool->idle_id)
+    {
+      g_source_remove (sel_tool->idle_id);
+      sel_tool->idle_id = 0;
+    }
+  else
+    {
+      gimp_display_shell_set_show_selection (shell,
+                                             sel_tool->saved_show_selection);
+    }
+
+  gimp_image_flush (image);
+}
diff --git a/app/tools/gimpselectiontool.h b/app/tools/gimpselectiontool.h
new file mode 100644
index 0000000..0776056
--- /dev/null
+++ b/app/tools/gimpselectiontool.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SELECTION_TOOL_H__
+#define __GIMP_SELECTION_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_SELECTION_TOOL            (gimp_selection_tool_get_type ())
+#define GIMP_SELECTION_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SELECTION_TOOL, GimpSelectionTool))
+#define GIMP_SELECTION_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SELECTION_TOOL, GimpSelectionToolClass))
+#define GIMP_IS_SELECTION_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SELECTION_TOOL))
+#define GIMP_IS_SELECTION_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SELECTION_TOOL))
+#define GIMP_SELECTION_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SELECTION_TOOL, GimpSelectionToolClass))
+
+#define GIMP_SELECTION_TOOL_GET_OPTIONS(t)  (GIMP_SELECTION_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpSelectionTool      GimpSelectionTool;
+typedef struct _GimpSelectionToolClass GimpSelectionToolClass;
+
+struct _GimpSelectionTool
+{
+  GimpDrawTool    parent_instance;
+
+  SelectFunction  function;         /*  selection function        */
+  GimpChannelOps  saved_operation;  /*  saved tool options state  */
+
+  gint            change_count;
+  gboolean        saved_show_selection;
+  GimpUndo       *undo;
+  GimpUndo       *redo;
+  gint            idle_id;
+
+  gboolean        allow_move;
+};
+
+struct _GimpSelectionToolClass
+{
+  GimpDrawToolClass  parent_class;
+
+  /*  virtual functions  */
+  gboolean (* have_selection) (GimpSelectionTool *sel_tool,
+                               GimpDisplay       *display);
+};
+
+
+GType      gimp_selection_tool_get_type     (void) G_GNUC_CONST;
+
+/*  protected function  */
+gboolean   gimp_selection_tool_start_edit   (GimpSelectionTool *sel_tool,
+                                             GimpDisplay       *display,
+                                             const GimpCoords  *coords);
+
+void       gimp_selection_tool_start_change (GimpSelectionTool *sel_tool,
+                                             gboolean           create,
+                                             GimpChannelOps     operation);
+void       gimp_selection_tool_end_change   (GimpSelectionTool *sel_tool,
+                                             gboolean           cancel);
+
+
+#endif  /* __GIMP_SELECTION_TOOL_H__ */
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
new file mode 100644
index 0000000..9d76adf
--- /dev/null
+++ b/app/tools/gimpsheartool.c
@@ -0,0 +1,331 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-transform-utils.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpspinscale.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptoolsheargrid.h"
+
+#include "gimpsheartool.h"
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+
+#include "gimp-intl.h"
+
+
+/*  index into trans_info array  */
+enum
+{
+  ORIENTATION,
+  SHEAR_X,
+  SHEAR_Y
+};
+
+
+#define SB_WIDTH 10
+
+
+/*  local function prototypes  */
+
+static gboolean         gimp_shear_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                                        GimpMatrix3           *transform);
+static gchar          * gimp_shear_tool_get_undo_desc  (GimpTransformGridTool *tg_tool);
+static void             gimp_shear_tool_dialog         (GimpTransformGridTool *tg_tool);
+static void             gimp_shear_tool_dialog_update  (GimpTransformGridTool *tg_tool);
+static void             gimp_shear_tool_prepare        (GimpTransformGridTool *tg_tool);
+static GimpToolWidget * gimp_shear_tool_get_widget     (GimpTransformGridTool *tg_tool);
+static void             gimp_shear_tool_update_widget  (GimpTransformGridTool *tg_tool);
+static void             gimp_shear_tool_widget_changed (GimpTransformGridTool *tg_tool);
+
+static void             shear_x_mag_changed            (GtkAdjustment         *adj,
+                                                        GimpTransformGridTool *tg_tool);
+static void             shear_y_mag_changed            (GtkAdjustment         *adj,
+                                                        GimpTransformGridTool *tg_tool);
+
+
+G_DEFINE_TYPE (GimpShearTool, gimp_shear_tool, GIMP_TYPE_TRANSFORM_GRID_TOOL)
+
+#define parent_class gimp_shear_tool_parent_class
+
+
+void
+gimp_shear_tool_register (GimpToolRegisterCallback  callback,
+                          gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_SHEAR_TOOL,
+                GIMP_TYPE_TRANSFORM_GRID_OPTIONS,
+                gimp_transform_grid_options_gui,
+                0,
+                "gimp-shear-tool",
+                _("Shear"),
+                _("Shear Tool: Shear the layer, selection or path"),
+                N_("S_hear"), "<shift>H",
+                NULL, GIMP_HELP_TOOL_SHEAR,
+                GIMP_ICON_TOOL_SHEAR,
+                data);
+}
+
+static void
+gimp_shear_tool_class_init (GimpShearToolClass *klass)
+{
+  GimpTransformToolClass     *tr_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass *tg_class = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+
+  tg_class->info_to_matrix  = gimp_shear_tool_info_to_matrix;
+  tg_class->get_undo_desc   = gimp_shear_tool_get_undo_desc;
+  tg_class->dialog          = gimp_shear_tool_dialog;
+  tg_class->dialog_update   = gimp_shear_tool_dialog_update;
+  tg_class->prepare         = gimp_shear_tool_prepare;
+  tg_class->get_widget      = gimp_shear_tool_get_widget;
+  tg_class->update_widget   = gimp_shear_tool_update_widget;
+  tg_class->widget_changed  = gimp_shear_tool_widget_changed;
+
+  tr_class->progress_text   = C_("undo-type", "Shear");
+  tr_class->progress_text   = _("Shearing");
+  tg_class->ok_button_label = _("_Shear");
+}
+
+static void
+gimp_shear_tool_init (GimpShearTool *shear_tool)
+{
+  GimpTool *tool = GIMP_TOOL (shear_tool);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_SHEAR);
+}
+
+static gboolean
+gimp_shear_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                GimpMatrix3           *transform)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  gdouble            amount;
+
+  if (tg_tool->trans_info[SHEAR_X] == 0.0 &&
+      tg_tool->trans_info[SHEAR_Y] == 0.0)
+    {
+      tg_tool->trans_info[ORIENTATION] = GIMP_ORIENTATION_UNKNOWN;
+    }
+
+  if (tg_tool->trans_info[ORIENTATION] == GIMP_ORIENTATION_HORIZONTAL)
+    amount = tg_tool->trans_info[SHEAR_X];
+  else
+    amount = tg_tool->trans_info[SHEAR_Y];
+
+  gimp_matrix3_identity (transform);
+  gimp_transform_matrix_shear (transform,
+                               tr_tool->x1,
+                               tr_tool->y1,
+                               tr_tool->x2 - tr_tool->x1,
+                               tr_tool->y2 - tr_tool->y1,
+                               tg_tool->trans_info[ORIENTATION],
+                               amount);
+
+  return TRUE;
+}
+
+static gchar *
+gimp_shear_tool_get_undo_desc (GimpTransformGridTool *tg_tool)
+{
+  gdouble x = tg_tool->trans_info[SHEAR_X];
+  gdouble y = tg_tool->trans_info[SHEAR_Y];
+
+  switch ((gint) tg_tool->trans_info[ORIENTATION])
+    {
+    case GIMP_ORIENTATION_HORIZONTAL:
+      return g_strdup_printf (C_("undo-type", "Shear horizontally by %-3.3g"),
+                              x);
+
+    case GIMP_ORIENTATION_VERTICAL:
+      return g_strdup_printf (C_("undo-type", "Shear vertically by %-3.3g"),
+                              y);
+
+    default:
+      /* e.g. user entered numbers but no notification callback */
+      return g_strdup_printf (C_("undo-type", "Shear horizontally by %-3.3g, vertically by %-3.3g"),
+                              x, y);
+    }
+}
+
+static void
+gimp_shear_tool_dialog (GimpTransformGridTool *tg_tool)
+{
+  GimpShearTool *shear = GIMP_SHEAR_TOOL (tg_tool);
+  GtkWidget     *vbox;
+  GtkWidget     *scale;
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (tg_tool->gui)), vbox,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  shear->x_adj = (GtkAdjustment *)
+    gtk_adjustment_new (0, -65536, 65536, 1, 10, 0);
+  scale = gimp_spin_scale_new (shear->x_adj, _("Shear magnitude _X"), 0);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), -1000, 1000);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (shear->x_adj, "value-changed",
+                    G_CALLBACK (shear_x_mag_changed),
+                    tg_tool);
+
+  shear->y_adj = (GtkAdjustment *)
+    gtk_adjustment_new (0, -65536, 65536, 1, 10, 0);
+  scale = gimp_spin_scale_new (shear->y_adj, _("Shear magnitude _Y"), 0);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), -1000, 1000);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (shear->y_adj, "value-changed",
+                    G_CALLBACK (shear_y_mag_changed),
+                    tg_tool);
+}
+
+static void
+gimp_shear_tool_dialog_update (GimpTransformGridTool *tg_tool)
+{
+  GimpShearTool *shear = GIMP_SHEAR_TOOL (tg_tool);
+
+  gtk_adjustment_set_value (shear->x_adj, tg_tool->trans_info[SHEAR_X]);
+  gtk_adjustment_set_value (shear->y_adj, tg_tool->trans_info[SHEAR_Y]);
+}
+
+static void
+gimp_shear_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  tg_tool->trans_info[ORIENTATION] = GIMP_ORIENTATION_UNKNOWN;
+  tg_tool->trans_info[SHEAR_X]     = 0.0;
+  tg_tool->trans_info[SHEAR_Y]     = 0.0;
+}
+
+static GimpToolWidget *
+gimp_shear_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget    *widget;
+
+  widget = gimp_tool_shear_grid_new (shell,
+                                     tr_tool->x1,
+                                     tr_tool->y1,
+                                     tr_tool->x2,
+                                     tr_tool->y2,
+                                     tg_tool->trans_info[ORIENTATION],
+                                     tg_tool->trans_info[SHEAR_X],
+                                     tg_tool->trans_info[SHEAR_Y]);
+
+  g_object_set (widget,
+                "inside-function",  GIMP_TRANSFORM_FUNCTION_SHEAR,
+                "outside-function", GIMP_TRANSFORM_FUNCTION_SHEAR,
+                "frompivot-shear",  TRUE,
+                NULL);
+
+  return widget;
+}
+
+static void
+gimp_shear_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  g_object_set (tg_tool->widget,
+                "x1",          (gdouble) tr_tool->x1,
+                "y1",          (gdouble) tr_tool->y1,
+                "x2",          (gdouble) tr_tool->x2,
+                "y2",          (gdouble) tr_tool->y2,
+                "orientation", (gint) tg_tool->trans_info[ORIENTATION],
+                "shear-x",     tg_tool->trans_info[SHEAR_X],
+                "shear-y",     tg_tool->trans_info[SHEAR_Y],
+                NULL);
+}
+
+static void
+gimp_shear_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  GimpOrientationType orientation;
+
+  g_object_get (tg_tool->widget,
+                "orientation", &orientation,
+                "shear-x",     &tg_tool->trans_info[SHEAR_X],
+                "shear-y",     &tg_tool->trans_info[SHEAR_Y],
+                NULL);
+
+  tg_tool->trans_info[ORIENTATION] = orientation;
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+shear_x_mag_changed (GtkAdjustment         *adj,
+                     GimpTransformGridTool *tg_tool)
+{
+  gdouble value = gtk_adjustment_get_value (adj);
+
+  if (value != tg_tool->trans_info[SHEAR_X])
+    {
+      GimpTool          *tool    = GIMP_TOOL (tg_tool);
+      GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+      tg_tool->trans_info[ORIENTATION] = GIMP_ORIENTATION_HORIZONTAL;
+
+      tg_tool->trans_info[SHEAR_X] = value;
+      tg_tool->trans_info[SHEAR_Y] = 0.0;  /* can only shear in one axis */
+
+      gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+      gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+    }
+}
+
+static void
+shear_y_mag_changed (GtkAdjustment         *adj,
+                     GimpTransformGridTool *tg_tool)
+{
+  gdouble value = gtk_adjustment_get_value (adj);
+
+  if (value != tg_tool->trans_info[SHEAR_Y])
+    {
+      GimpTool          *tool    = GIMP_TOOL (tg_tool);
+      GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+      tg_tool->trans_info[ORIENTATION] = GIMP_ORIENTATION_VERTICAL;
+
+      tg_tool->trans_info[SHEAR_Y] = value;
+      tg_tool->trans_info[SHEAR_X] = 0.0;  /* can only shear in one axis */
+
+      gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+      gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+    }
+}
diff --git a/app/tools/gimpsheartool.h b/app/tools/gimpsheartool.h
new file mode 100644
index 0000000..0ab6d25
--- /dev/null
+++ b/app/tools/gimpsheartool.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SHEAR_TOOL_H__
+#define __GIMP_SHEAR_TOOL_H__
+
+
+#include "gimptransformgridtool.h"
+
+
+#define GIMP_TYPE_SHEAR_TOOL            (gimp_shear_tool_get_type ())
+#define GIMP_SHEAR_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SHEAR_TOOL, GimpShearTool))
+#define GIMP_SHEAR_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SHEAR_TOOL, GimpShearToolClass))
+#define GIMP_IS_SHEAR_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SHEAR_TOOL))
+#define GIMP_IS_SHEAR_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SHEAR_TOOL))
+#define GIMP_SHEAR_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SHEAR_TOOL, GimpShearToolClass))
+
+
+typedef struct _GimpShearTool      GimpShearTool;
+typedef struct _GimpShearToolClass GimpShearToolClass;
+
+struct _GimpShearTool
+{
+  GimpTransformGridTool  parent_instance;
+
+  GtkAdjustment         *x_adj;
+  GtkAdjustment         *y_adj;
+};
+
+struct _GimpShearToolClass
+{
+  GimpTransformGridToolClass  parent_class;
+};
+
+
+void    gimp_shear_tool_register (GimpToolRegisterCallback  callback,
+                                  gpointer                  data);
+
+GType   gimp_shear_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SHEAR_TOOL_H__  */
diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c
new file mode 100644
index 0000000..d6c5f65
--- /dev/null
+++ b/app/tools/gimpsmudgetool.c
@@ -0,0 +1,115 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "paint/gimpsmudgeoptions.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppropwidgets.h"
+
+#include "gimpsmudgetool.h"
+#include "gimppaintoptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static GtkWidget * gimp_smudge_options_gui (GimpToolOptions *tool_options);
+
+
+G_DEFINE_TYPE (GimpSmudgeTool, gimp_smudge_tool, GIMP_TYPE_BRUSH_TOOL)
+
+
+void
+gimp_smudge_tool_register (GimpToolRegisterCallback  callback,
+                           gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_SMUDGE_TOOL,
+                GIMP_TYPE_SMUDGE_OPTIONS,
+                gimp_smudge_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_GRADIENT,
+                "gimp-smudge-tool",
+                _("Smudge"),
+                _("Smudge Tool: Smudge selectively using a brush"),
+                N_("_Smudge"), "S",
+                NULL, GIMP_HELP_TOOL_SMUDGE,
+                GIMP_ICON_TOOL_SMUDGE,
+                data);
+}
+
+static void
+gimp_smudge_tool_class_init (GimpSmudgeToolClass *klass)
+{
+}
+
+static void
+gimp_smudge_tool_init (GimpSmudgeTool *smudge)
+{
+  GimpTool      *tool       = GIMP_TOOL (smudge);
+  GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (smudge);
+
+  gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_SMUDGE);
+
+  gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (smudge),
+                                       GIMP_COLOR_PICK_TARGET_FOREGROUND);
+
+  paint_tool->status      = _("Click to smudge");
+  paint_tool->status_line = _("Click to smudge the line");
+  paint_tool->status_ctrl = NULL;
+}
+
+
+/*  tool options stuff  */
+
+static GtkWidget *
+gimp_smudge_options_gui (GimpToolOptions *tool_options)
+{
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget *scale;
+  GtkWidget *button;
+
+  button = gimp_prop_check_button_new (config, "no-erasing", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_prop_check_button_new (config, "sample-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  the rate scale  */
+  scale = gimp_prop_spin_scale_new (config, "rate", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, "flow", NULL,
+                                    1.0, 10.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  return vbox;
+}
diff --git a/app/tools/gimpsmudgetool.h b/app/tools/gimpsmudgetool.h
new file mode 100644
index 0000000..ab5f977
--- /dev/null
+++ b/app/tools/gimpsmudgetool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SMUDGE_TOOL_H__
+#define __GIMP_SMUDGE_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+
+
+#define GIMP_TYPE_SMUDGE_TOOL            (gimp_smudge_tool_get_type ())
+#define GIMP_SMUDGE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SMUDGE_TOOL, GimpSmudgeTool))
+#define GIMP_SMUDGE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SMUDGE_TOOL, GimpSmudgeToolClass))
+#define GIMP_IS_SMUDGE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SMUDGE_TOOL))
+#define GIMP_IS_SMUDGE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SMUDGE_TOOL))
+#define GIMP_SMUDGE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE_TOOL, GimpSmudgeToolClass))
+
+
+typedef struct _GimpSmudgeTool      GimpSmudgeTool;
+typedef struct _GimpSmudgeToolClass GimpSmudgeToolClass;
+
+struct _GimpSmudgeTool
+{
+  GimpBrushTool parent_instance;
+};
+
+struct _GimpSmudgeToolClass
+{
+  GimpBrushToolClass parent_class;
+};
+
+
+void    gimp_smudge_tool_register (GimpToolRegisterCallback  callback,
+                                   gpointer                  data);
+
+GType   gimp_smudge_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SMUDGE_TOOL_H__  */
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
new file mode 100644
index 0000000..9d9f725
--- /dev/null
+++ b/app/tools/gimpsourcetool.c
@@ -0,0 +1,519 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+
+#include "paint/gimpsourcecore.h"
+#include "paint/gimpsourceoptions.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvashandle.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-items.h"
+
+#include "gimpsourcetool.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean      gimp_source_tool_has_display   (GimpTool            *tool,
+                                                     GimpDisplay         *display);
+static GimpDisplay * gimp_source_tool_has_image     (GimpTool            *tool,
+                                                     GimpImage           *image);
+static void          gimp_source_tool_control       (GimpTool            *tool,
+                                                     GimpToolAction       action,
+                                                     GimpDisplay         *display);
+static void          gimp_source_tool_button_press  (GimpTool            *tool,
+                                                     const GimpCoords    *coords,
+                                                     guint32              time,
+                                                     GdkModifierType      state,
+                                                     GimpButtonPressType  press_type,
+                                                     GimpDisplay         *display);
+static void          gimp_source_tool_motion        (GimpTool            *tool,
+                                                     const GimpCoords    *coords,
+                                                     guint32              time,
+                                                     GdkModifierType      state,
+                                                     GimpDisplay         *display);
+static void          gimp_source_tool_cursor_update (GimpTool            *tool,
+                                                     const GimpCoords    *coords,
+                                                     GdkModifierType      state,
+                                                     GimpDisplay         *display);
+static void          gimp_source_tool_modifier_key  (GimpTool            *tool,
+                                                     GdkModifierType      key,
+                                                     gboolean             press,
+                                                     GdkModifierType      state,
+                                                     GimpDisplay         *display);
+static void          gimp_source_tool_oper_update   (GimpTool            *tool,
+                                                     const GimpCoords    *coords,
+                                                     GdkModifierType      state,
+                                                     gboolean             proximity,
+                                                     GimpDisplay         *display);
+
+static void          gimp_source_tool_draw          (GimpDrawTool        *draw_tool);
+
+static void          gimp_source_tool_paint_prepare (GimpPaintTool       *paint_tool,
+                                                     GimpDisplay         *display);
+
+static void          gimp_source_tool_set_src_display (GimpSourceTool      *source_tool,
+                                                       GimpDisplay         *display);
+
+
+G_DEFINE_TYPE (GimpSourceTool, gimp_source_tool, GIMP_TYPE_BRUSH_TOOL)
+
+#define parent_class gimp_source_tool_parent_class
+
+
+static void
+gimp_source_tool_class_init (GimpSourceToolClass *klass)
+{
+  GimpToolClass      *tool_class       = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass  *draw_tool_class  = GIMP_DRAW_TOOL_CLASS (klass);
+  GimpPaintToolClass *paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
+
+  tool_class->has_display         = gimp_source_tool_has_display;
+  tool_class->has_image           = gimp_source_tool_has_image;
+  tool_class->control             = gimp_source_tool_control;
+  tool_class->button_press        = gimp_source_tool_button_press;
+  tool_class->motion              = gimp_source_tool_motion;
+  tool_class->modifier_key        = gimp_source_tool_modifier_key;
+  tool_class->oper_update         = gimp_source_tool_oper_update;
+  tool_class->cursor_update       = gimp_source_tool_cursor_update;
+
+  draw_tool_class->draw           = gimp_source_tool_draw;
+
+  paint_tool_class->paint_prepare = gimp_source_tool_paint_prepare;
+}
+
+static void
+gimp_source_tool_init (GimpSourceTool *source)
+{
+  source->show_source_outline = TRUE;
+}
+
+static gboolean
+gimp_source_tool_has_display (GimpTool    *tool,
+                              GimpDisplay *display)
+{
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+
+  return (display == source_tool->src_display ||
+          GIMP_TOOL_CLASS (parent_class)->has_display (tool, display));
+}
+
+static GimpDisplay *
+gimp_source_tool_has_image (GimpTool  *tool,
+                            GimpImage *image)
+{
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+  GimpDisplay    *display;
+
+  display = GIMP_TOOL_CLASS (parent_class)->has_image (tool, image);
+
+  if (! display && source_tool->src_display)
+    {
+      if (image && gimp_display_get_image (source_tool->src_display) == image)
+        display = source_tool->src_display;
+
+      /*  NULL image means any display  */
+      if (! image)
+        display = source_tool->src_display;
+    }
+
+  return display;
+}
+
+static void
+gimp_source_tool_control (GimpTool       *tool,
+                          GimpToolAction  action,
+                          GimpDisplay    *display)
+{
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_source_tool_set_src_display (source_tool, NULL);
+      g_object_set (GIMP_PAINT_TOOL (tool)->core,
+                    "src-drawable", NULL,
+                    NULL);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_source_tool_button_press (GimpTool            *tool,
+                               const GimpCoords    *coords,
+                               guint32              time,
+                               GdkModifierType      state,
+                               GimpButtonPressType  press_type,
+                               GimpDisplay         *display)
+{
+  GimpPaintTool  *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+  GimpSourceCore *source      = GIMP_SOURCE_CORE (paint_tool->core);
+  GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  if ((state & (toggle_mask | extend_mask)) == toggle_mask)
+    {
+      source->set_source = TRUE;
+
+      gimp_source_tool_set_src_display (source_tool, display);
+    }
+  else
+    {
+      source->set_source = FALSE;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
+                                                press_type, display);
+
+  source_tool->src_x = source->src_x;
+  source_tool->src_y = source->src_y;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_source_tool_motion (GimpTool         *tool,
+                         const GimpCoords *coords,
+                         guint32           time,
+                         GdkModifierType   state,
+                         GimpDisplay      *display)
+{
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (tool);
+  GimpPaintTool  *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpSourceCore *source      = GIMP_SOURCE_CORE (paint_tool->core);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, display);
+
+  source_tool->src_x = source->src_x;
+  source_tool->src_y = source->src_y;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_source_tool_modifier_key (GimpTool        *tool,
+                               GdkModifierType  key,
+                               gboolean         press,
+                               GdkModifierType  state,
+                               GimpDisplay     *display)
+{
+  GimpSourceTool    *source_tool = GIMP_SOURCE_TOOL (tool);
+  GimpPaintTool     *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpSourceOptions *options     = GIMP_SOURCE_TOOL_GET_OPTIONS (tool);
+
+  if (gimp_source_core_use_source (GIMP_SOURCE_CORE (paint_tool->core),
+                                   options) &&
+      key == gimp_get_toggle_behavior_mask ())
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+      if (press)
+        {
+          paint_tool->status = source_tool->status_set_source;
+
+          source_tool->show_source_outline = FALSE;
+
+          source_tool->saved_precision =
+            gimp_tool_control_get_precision (tool->control);
+          gimp_tool_control_set_precision (tool->control,
+                                           GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+        }
+      else
+        {
+          paint_tool->status = source_tool->status_paint;
+
+          source_tool->show_source_outline = TRUE;
+
+          gimp_tool_control_set_precision (tool->control,
+                                           source_tool->saved_precision);
+        }
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                display);
+}
+
+static void
+gimp_source_tool_cursor_update (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                GimpDisplay      *display)
+{
+  GimpPaintTool      *paint_tool = GIMP_PAINT_TOOL (tool);
+  GimpSourceOptions  *options    = GIMP_SOURCE_TOOL_GET_OPTIONS (tool);
+  GimpCursorType      cursor     = GIMP_CURSOR_MOUSE;
+  GimpCursorModifier  modifier   = GIMP_CURSOR_MODIFIER_NONE;
+
+  if (gimp_source_core_use_source (GIMP_SOURCE_CORE (paint_tool->core),
+                                   options))
+    {
+      GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+      GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+      if ((state & (toggle_mask | extend_mask)) == toggle_mask)
+        {
+          cursor = GIMP_CURSOR_CROSSHAIR_SMALL;
+        }
+      else if (! GIMP_SOURCE_CORE (GIMP_PAINT_TOOL (tool)->core)->src_drawable)
+        {
+          modifier = GIMP_CURSOR_MODIFIER_BAD;
+        }
+    }
+
+  gimp_tool_control_set_cursor          (tool->control, cursor);
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_source_tool_oper_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              gboolean          proximity,
+                              GimpDisplay      *display)
+{
+  GimpPaintTool     *paint_tool  = GIMP_PAINT_TOOL (tool);
+  GimpSourceTool    *source_tool = GIMP_SOURCE_TOOL (tool);
+  GimpSourceOptions *options     = GIMP_SOURCE_TOOL_GET_OPTIONS (tool);
+  GimpSourceCore    *source;
+
+  source = GIMP_SOURCE_CORE (GIMP_PAINT_TOOL (tool)->core);
+
+  if (proximity)
+    {
+      if (gimp_source_core_use_source (source, options))
+        paint_tool->status_ctrl = source_tool->status_set_source_ctrl;
+      else
+        paint_tool->status_ctrl = NULL;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
+                                               display);
+
+  if (gimp_source_core_use_source (source, options))
+    {
+      if (source->src_drawable == NULL)
+        {
+          GdkModifierType toggle_mask = gimp_get_toggle_behavior_mask ();
+
+          if (state & toggle_mask)
+            {
+              gimp_tool_replace_status (tool, display, "%s",
+                                        source_tool->status_set_source);
+            }
+          else
+            {
+              gimp_tool_replace_status (tool, display, "%s-%s",
+                                        gimp_get_mod_string (toggle_mask),
+                                        source_tool->status_set_source);
+            }
+        }
+      else
+        {
+          gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+          source_tool->src_x = source->src_x;
+          source_tool->src_y = source->src_y;
+
+          if (! source->first_stroke)
+            {
+              switch (options->align_mode)
+                {
+                case GIMP_SOURCE_ALIGN_YES:
+                  source_tool->src_x = floor (coords->x) + source->offset_x;
+                  source_tool->src_y = floor (coords->y) + source->offset_y;
+                  break;
+
+                case GIMP_SOURCE_ALIGN_REGISTERED:
+                  source_tool->src_x = floor (coords->x);
+                  source_tool->src_y = floor (coords->y);
+                  break;
+
+                default:
+                  break;
+                }
+            }
+
+          gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+        }
+    }
+}
+
+static void
+gimp_source_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpSourceTool    *source_tool = GIMP_SOURCE_TOOL (draw_tool);
+  GimpSourceOptions *options     = GIMP_SOURCE_TOOL_GET_OPTIONS (draw_tool);
+  GimpSourceCore    *source;
+
+  source = GIMP_SOURCE_CORE (GIMP_PAINT_TOOL (draw_tool)->core);
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+
+  if (gimp_source_core_use_source (source, options) &&
+      source->src_drawable && source_tool->src_display)
+    {
+      GimpDisplayShell *src_shell;
+      gint              off_x;
+      gint              off_y;
+      gdouble           src_x;
+      gdouble           src_y;
+
+      src_shell = gimp_display_get_shell (source_tool->src_display);
+
+      gimp_item_get_offset (GIMP_ITEM (source->src_drawable), &off_x, &off_y);
+
+      src_x = source_tool->src_x + off_x + 0.5;
+      src_y = source_tool->src_y + off_y + 0.5;
+
+      if (source_tool->src_outline)
+        {
+          gimp_display_shell_remove_tool_item (src_shell,
+                                               source_tool->src_outline);
+          source_tool->src_outline = NULL;
+        }
+
+      if (source_tool->show_source_outline)
+        {
+          source_tool->src_outline =
+            gimp_brush_tool_create_outline (GIMP_BRUSH_TOOL (source_tool),
+                                            source_tool->src_display,
+                                            src_x, src_y);
+
+          if (source_tool->src_outline)
+            {
+              gimp_display_shell_add_tool_item (src_shell,
+                                                source_tool->src_outline);
+              g_object_unref (source_tool->src_outline);
+            }
+        }
+
+      if (source_tool->src_outline)
+        {
+          if (source_tool->src_handle)
+            {
+              gimp_display_shell_remove_tool_item (src_shell,
+                                                   source_tool->src_handle);
+              source_tool->src_handle = NULL;
+            }
+        }
+      else
+        {
+          if (! source_tool->src_handle)
+            {
+              source_tool->src_handle =
+                gimp_canvas_handle_new (src_shell,
+                                        GIMP_HANDLE_CROSS,
+                                        GIMP_HANDLE_ANCHOR_CENTER,
+                                        src_x, src_y,
+                                        GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                        GIMP_TOOL_HANDLE_SIZE_CROSS);
+              gimp_display_shell_add_tool_item (src_shell,
+                                                source_tool->src_handle);
+              g_object_unref (source_tool->src_handle);
+            }
+          else
+            {
+              gimp_canvas_handle_set_position (source_tool->src_handle,
+                                               src_x, src_y);
+            }
+        }
+    }
+}
+
+static void
+gimp_source_tool_paint_prepare (GimpPaintTool *paint_tool,
+                                GimpDisplay   *display)
+{
+  GimpSourceTool *source_tool = GIMP_SOURCE_TOOL (paint_tool);
+
+  if (GIMP_PAINT_TOOL_CLASS (parent_class)->paint_prepare)
+    GIMP_PAINT_TOOL_CLASS (parent_class)->paint_prepare (paint_tool, display);
+
+  if (source_tool->src_display)
+    {
+      GimpDisplayShell *src_shell;
+
+      src_shell = gimp_display_get_shell (source_tool->src_display);
+
+      gimp_paint_core_set_show_all (paint_tool->core, src_shell->show_all);
+    }
+}
+
+static void
+gimp_source_tool_set_src_display (GimpSourceTool *source_tool,
+                                  GimpDisplay    *display)
+{
+  if (source_tool->src_display != display)
+    {
+      if (source_tool->src_display)
+        {
+          GimpDisplayShell *src_shell;
+
+          src_shell = gimp_display_get_shell (source_tool->src_display);
+
+          if (source_tool->src_handle)
+            {
+              gimp_display_shell_remove_tool_item (src_shell,
+                                                   source_tool->src_handle);
+              source_tool->src_handle = NULL;
+            }
+
+          if (source_tool->src_outline)
+            {
+              gimp_display_shell_remove_tool_item (src_shell,
+                                                   source_tool->src_outline);
+              source_tool->src_outline = NULL;
+            }
+        }
+
+      source_tool->src_display = display;
+    }
+}
diff --git a/app/tools/gimpsourcetool.h b/app/tools/gimpsourcetool.h
new file mode 100644
index 0000000..c573791
--- /dev/null
+++ b/app/tools/gimpsourcetool.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SOURCE_TOOL_H__
+#define __GIMP_SOURCE_TOOL_H__
+
+
+#include "gimpbrushtool.h"
+
+
+#define GIMP_TYPE_SOURCE_TOOL            (gimp_source_tool_get_type ())
+#define GIMP_SOURCE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SOURCE_TOOL, GimpSourceTool))
+#define GIMP_SOURCE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SOURCE_TOOL, GimpSourceToolClass))
+#define GIMP_IS_SOURCE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SOURCE_TOOL))
+#define GIMP_IS_SOURCE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SOURCE_TOOL))
+#define GIMP_SOURCE_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_TOOL, GimpSourceToolClass))
+
+#define GIMP_SOURCE_TOOL_GET_OPTIONS(t)  (GIMP_SOURCE_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpSourceTool      GimpSourceTool;
+typedef struct _GimpSourceToolClass GimpSourceToolClass;
+
+struct _GimpSourceTool
+{
+  GimpBrushTool        parent_instance;
+
+  GimpDisplay         *src_display;
+  gint                 src_x;
+  gint                 src_y;
+
+  gboolean             show_source_outline;
+  GimpCursorPrecision  saved_precision;
+
+  GimpCanvasItem      *src_handle;
+  GimpCanvasItem      *src_outline;
+
+  const gchar         *status_paint;
+  const gchar         *status_set_source;
+  const gchar         *status_set_source_ctrl;
+};
+
+struct _GimpSourceToolClass
+{
+  GimpBrushToolClass  parent_class;
+};
+
+
+GType   gimp_source_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_SOURCE_TOOL_H__  */
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
new file mode 100644
index 0000000..70f2dc4
--- /dev/null
+++ b/app/tools/gimptextoptions.c
@@ -0,0 +1,743 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpconfig-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpviewable.h"
+
+#include "text/gimptext.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimptextbuffer.h"
+#include "widgets/gimptexteditor.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimptextoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FONT_SIZE,
+  PROP_UNIT,
+  PROP_ANTIALIAS,
+  PROP_HINT_STYLE,
+  PROP_LANGUAGE,
+  PROP_BASE_DIR,
+  PROP_JUSTIFICATION,
+  PROP_INDENTATION,
+  PROP_LINE_SPACING,
+  PROP_LETTER_SPACING,
+  PROP_BOX_MODE,
+
+  PROP_USE_EDITOR,
+
+  PROP_FONT_VIEW_TYPE,
+  PROP_FONT_VIEW_SIZE
+};
+
+
+static void  gimp_text_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void  gimp_text_options_finalize           (GObject         *object);
+static void  gimp_text_options_set_property       (GObject         *object,
+                                                   guint            property_id,
+                                                   const GValue    *value,
+                                                   GParamSpec      *pspec);
+static void  gimp_text_options_get_property       (GObject         *object,
+                                                   guint            property_id,
+                                                   GValue          *value,
+                                                   GParamSpec      *pspec);
+
+static void  gimp_text_options_reset              (GimpConfig      *config);
+
+static void  gimp_text_options_notify_font        (GimpContext     *context,
+                                                   GParamSpec      *pspec,
+                                                   GimpText        *text);
+static void  gimp_text_options_notify_text_font   (GimpText        *text,
+                                                   GParamSpec      *pspec,
+                                                   GimpContext     *context);
+static void  gimp_text_options_notify_color       (GimpContext     *context,
+                                                   GParamSpec      *pspec,
+                                                   GimpText        *text);
+static void  gimp_text_options_notify_text_color  (GimpText        *text,
+                                                   GParamSpec      *pspec,
+                                                   GimpContext     *context);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpTextOptions, gimp_text_options,
+                         GIMP_TYPE_TOOL_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_text_options_config_iface_init))
+
+#define parent_class gimp_text_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_text_options_class_init (GimpTextOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_text_options_finalize;
+  object_class->set_property = gimp_text_options_set_property;
+  object_class->get_property = gimp_text_options_get_property;
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_UNIT,
+                         "font-size-unit",
+                         _("Unit"),
+                         _("Font size unit"),
+                         TRUE, FALSE, GIMP_UNIT_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FONT_SIZE,
+                           "font-size",
+                           _("Font size"),
+                           _("Font size"),
+                           0.0, 8192.0, 62.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_HINT_STYLE,
+                         "hint-style",
+                         _("Hinting"),
+                         _("Hinting alters the font outline to "
+                           "produce a crisp bitmap at small "
+                           "sizes"),
+                         GIMP_TYPE_TEXT_HINT_STYLE,
+                         GIMP_TEXT_HINT_STYLE_MEDIUM,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LANGUAGE,
+                           "language",
+                           _("Language"),
+                           _("The text language may have an effect "
+                             "on the way the text is rendered."),
+                           (const gchar *) gtk_get_default_language (),
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BASE_DIR,
+                         "base-direction",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_DIRECTION,
+                         GIMP_TEXT_DIRECTION_LTR,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_JUSTIFICATION,
+                         "justify",
+                         _("Justify"),
+                         _("Text alignment"),
+                         GIMP_TYPE_TEXT_JUSTIFICATION,
+                         GIMP_TEXT_JUSTIFY_LEFT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_INDENTATION,
+                           "indent",
+                           _("Indentation"),
+                           _("Indentation of the first line"),
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LINE_SPACING,
+                           "line-spacing",
+                           _("Line spacing"),
+                           _("Adjust line spacing"),
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LETTER_SPACING,
+                           "letter-spacing",
+                           _("Letter spacing"),
+                           _("Adjust letter spacing"),
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BOX_MODE,
+                         "box-mode",
+                         _("Box"),
+                         _("Whether text flows into rectangular shape or "
+                           "moves into a new line when you press Enter"),
+                         GIMP_TYPE_TEXT_BOX_MODE,
+                         GIMP_TEXT_BOX_DYNAMIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_EDITOR,
+                            "use-editor",
+                            _("Use editor"),
+                            _("Use an external editor window for text entry"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FONT_VIEW_TYPE,
+                         "font-view-type",
+                         NULL, NULL,
+                         GIMP_TYPE_VIEW_TYPE,
+                         GIMP_VIEW_TYPE_LIST,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_FONT_VIEW_SIZE,
+                        "font-view-size",
+                        NULL, NULL,
+                        GIMP_VIEW_SIZE_TINY,
+                        GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                        GIMP_VIEW_SIZE_SMALL,
+                        GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_text_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_text_options_reset;
+}
+
+static void
+gimp_text_options_init (GimpTextOptions *options)
+{
+  options->size_entry = NULL;
+}
+
+static void
+gimp_text_options_finalize (GObject *object)
+{
+  GimpTextOptions *options = GIMP_TEXT_OPTIONS (object);
+
+  g_clear_pointer (&options->language, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpTextOptions *options = GIMP_TEXT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FONT_SIZE:
+      g_value_set_double (value, options->font_size);
+      break;
+    case PROP_UNIT:
+      g_value_set_int (value, options->unit);
+      break;
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, options->antialias);
+      break;
+    case PROP_HINT_STYLE:
+      g_value_set_enum (value, options->hint_style);
+      break;
+    case PROP_LANGUAGE:
+      g_value_set_string (value, options->language);
+      break;
+    case PROP_BASE_DIR:
+      g_value_set_enum (value, options->base_dir);
+      break;
+    case PROP_JUSTIFICATION:
+      g_value_set_enum (value, options->justify);
+      break;
+    case PROP_INDENTATION:
+      g_value_set_double (value, options->indent);
+      break;
+    case PROP_LINE_SPACING:
+      g_value_set_double (value, options->line_spacing);
+      break;
+    case PROP_LETTER_SPACING:
+      g_value_set_double (value, options->letter_spacing);
+      break;
+    case PROP_BOX_MODE:
+      g_value_set_enum (value, options->box_mode);
+      break;
+
+    case PROP_USE_EDITOR:
+      g_value_set_boolean (value, options->use_editor);
+      break;
+
+    case PROP_FONT_VIEW_TYPE:
+      g_value_set_enum (value, options->font_view_type);
+      break;
+    case PROP_FONT_VIEW_SIZE:
+      g_value_set_int (value, options->font_view_size);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpTextOptions *options = GIMP_TEXT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FONT_SIZE:
+      options->font_size = g_value_get_double (value);
+      break;
+    case PROP_UNIT:
+      options->unit = g_value_get_int (value);
+      break;
+    case PROP_ANTIALIAS:
+      options->antialias = g_value_get_boolean (value);
+      break;
+    case PROP_HINT_STYLE:
+      options->hint_style = g_value_get_enum (value);
+      break;
+    case PROP_BASE_DIR:
+      options->base_dir = g_value_get_enum (value);
+      break;
+    case PROP_LANGUAGE:
+      g_free (options->language);
+      options->language = g_value_dup_string (value);
+      break;
+    case PROP_JUSTIFICATION:
+      options->justify = g_value_get_enum (value);
+      break;
+    case PROP_INDENTATION:
+      options->indent = g_value_get_double (value);
+      break;
+    case PROP_LINE_SPACING:
+      options->line_spacing = g_value_get_double (value);
+      break;
+    case PROP_LETTER_SPACING:
+      options->letter_spacing = g_value_get_double (value);
+      break;
+    case PROP_BOX_MODE:
+      options->box_mode = g_value_get_enum (value);
+      break;
+
+    case PROP_USE_EDITOR:
+      options->use_editor = g_value_get_boolean (value);
+      break;
+
+    case PROP_FONT_VIEW_TYPE:
+      options->font_view_type = g_value_get_enum (value);
+      break;
+    case PROP_FONT_VIEW_SIZE:
+      options->font_view_size = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_options_reset (GimpConfig *config)
+{
+  GObject *object = G_OBJECT (config);
+
+  /*  implement reset() ourselves because the default impl would
+   *  reset *all* properties, including all rectangle properties
+   *  of the text box
+   */
+
+  /* context */
+  gimp_config_reset_property (object, "font");
+  gimp_config_reset_property (object, "foreground");
+
+  /* text options */
+  gimp_config_reset_property (object, "font-size");
+  gimp_config_reset_property (object, "font-size-unit");
+  gimp_config_reset_property (object, "antialias");
+  gimp_config_reset_property (object, "hint-style");
+  gimp_config_reset_property (object, "language");
+  gimp_config_reset_property (object, "base-direction");
+  gimp_config_reset_property (object, "justify");
+  gimp_config_reset_property (object, "indent");
+  gimp_config_reset_property (object, "line-spacing");
+  gimp_config_reset_property (object, "letter-spacing");
+  gimp_config_reset_property (object, "box-mode");
+  gimp_config_reset_property (object, "use-editor");
+}
+
+static void
+gimp_text_options_notify_font (GimpContext *context,
+                               GParamSpec  *pspec,
+                               GimpText    *text)
+{
+  g_signal_handlers_block_by_func (text,
+                                   gimp_text_options_notify_text_font,
+                                   context);
+
+  g_object_set (text, "font", gimp_context_get_font_name (context), NULL);
+
+  g_signal_handlers_unblock_by_func (text,
+                                     gimp_text_options_notify_text_font,
+                                     context);
+}
+
+static void
+gimp_text_options_notify_text_font (GimpText    *text,
+                                    GParamSpec  *pspec,
+                                    GimpContext *context)
+{
+  g_signal_handlers_block_by_func (context,
+                                   gimp_text_options_notify_font, text);
+
+  gimp_context_set_font_name (context, text->font);
+
+  g_signal_handlers_unblock_by_func (context,
+                                     gimp_text_options_notify_font, text);
+}
+
+static void
+gimp_text_options_notify_color (GimpContext *context,
+                                GParamSpec  *pspec,
+                                GimpText    *text)
+{
+  GimpRGB  color;
+
+  gimp_context_get_foreground (context, &color);
+
+  g_signal_handlers_block_by_func (text,
+                                   gimp_text_options_notify_text_color,
+                                   context);
+
+  g_object_set (text, "color", &color, NULL);
+
+  g_signal_handlers_unblock_by_func (text,
+                                     gimp_text_options_notify_text_color,
+                                     context);
+}
+
+static void
+gimp_text_options_notify_text_color (GimpText    *text,
+                                     GParamSpec  *pspec,
+                                     GimpContext *context)
+{
+  g_signal_handlers_block_by_func (context,
+                                   gimp_text_options_notify_color, text);
+
+  gimp_context_set_foreground (context, &text->color);
+
+  g_signal_handlers_unblock_by_func (context,
+                                     gimp_text_options_notify_color, text);
+}
+
+/*  This function could live in gimptexttool.c also.
+ *  But it takes some bloat out of that file...
+ */
+void
+gimp_text_options_connect_text (GimpTextOptions *options,
+                                GimpText        *text)
+{
+  GimpContext *context;
+  GimpRGB      color;
+
+  g_return_if_fail (GIMP_IS_TEXT_OPTIONS (options));
+  g_return_if_fail (GIMP_IS_TEXT (text));
+
+  context = GIMP_CONTEXT (options);
+
+  gimp_context_get_foreground (context, &color);
+
+  gimp_config_sync (G_OBJECT (options), G_OBJECT (text), 0);
+
+  g_object_set (text,
+                "color", &color,
+                "font",  gimp_context_get_font_name (context),
+                NULL);
+
+  gimp_config_connect (G_OBJECT (options), G_OBJECT (text), NULL);
+
+  g_signal_connect_object (options, "notify::font",
+                           G_CALLBACK (gimp_text_options_notify_font),
+                           text, 0);
+  g_signal_connect_object (text, "notify::font",
+                           G_CALLBACK (gimp_text_options_notify_text_font),
+                           options, 0);
+
+  g_signal_connect_object (options, "notify::foreground",
+                           G_CALLBACK (gimp_text_options_notify_color),
+                           text, 0);
+  g_signal_connect_object (text, "notify::color",
+                           G_CALLBACK (gimp_text_options_notify_text_color),
+                           options, 0);
+}
+
+GtkWidget *
+gimp_text_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config    = G_OBJECT (tool_options);
+  GimpTextOptions *options   = GIMP_TEXT_OPTIONS (tool_options);
+  GtkWidget       *main_vbox = gimp_tool_options_gui (tool_options);
+  GimpAsyncSet    *async_set;
+  GtkWidget       *options_vbox;
+  GtkWidget       *table;
+  GtkWidget       *vbox;
+  GtkWidget       *hbox;
+  GtkWidget       *button;
+  GtkWidget       *entry;
+  GtkWidget       *box;
+  GtkWidget       *spinbutton;
+  GtkWidget       *combo;
+  GtkSizeGroup    *size_group;
+  gint             row = 0;
+
+  async_set =
+    gimp_data_factory_get_async_set (tool_options->tool_info->gimp->font_factory);
+
+  box = gimp_busy_box_new (_("Loading fonts (this may take a while...)"));
+  gtk_container_set_border_width (GTK_CONTAINER (box), 8);
+  gtk_box_pack_start (GTK_BOX (main_vbox), box, FALSE, FALSE, 0);
+
+  g_object_bind_property (async_set, "empty",
+                          box,       "visible",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_INVERT_BOOLEAN);
+
+  options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL,
+                              gtk_box_get_spacing (GTK_BOX (main_vbox)));
+  gtk_box_pack_start (GTK_BOX (main_vbox), options_vbox, FALSE, FALSE, 0);
+  gtk_widget_show (options_vbox);
+
+  g_object_bind_property (async_set,    "empty",
+                          options_vbox, "sensitive",
+                          G_BINDING_SYNC_CREATE);
+
+  hbox = gimp_prop_font_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                 _("Font"), 2,
+                                 "font-view-type", "font-view-size");
+  gtk_box_pack_start (GTK_BOX (options_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  table = gtk_table_new (1, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (options_vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  entry = gimp_prop_size_entry_new (config,
+                                    "font-size", FALSE, "font-size-unit", "%p",
+                                    GIMP_SIZE_ENTRY_UPDATE_SIZE, 72.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Size:"), 0.0, 0.5,
+                             entry, 2, FALSE);
+
+  options->size_entry = entry;
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (options_vbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  button = gimp_prop_check_button_new (config, "use-editor", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_prop_check_button_new (config, "antialias", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  table = gtk_table_new (6, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (options_vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  row = 0;
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  button = gimp_prop_enum_combo_box_new (config, "hint-style", -1, -1);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Hinting:"), 0.0, 0.5,
+                             button, 1, TRUE);
+  gtk_size_group_add_widget (size_group, button);
+
+  button = gimp_prop_color_button_new (config, "foreground", _("Text Color"),
+                                       40, 24, GIMP_COLOR_AREA_FLAT);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
+                                GIMP_CONTEXT (options));
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Color:"), 0.0, 0.5,
+                             button, 1, TRUE);
+  gtk_size_group_add_widget (size_group, button);
+
+  box = gimp_prop_enum_icon_box_new (config, "justify", "format-justify", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Justify:"), 0.0, 0.5,
+                             box, 2, TRUE);
+  gtk_size_group_add_widget (size_group, box);
+  g_object_unref (size_group);
+
+  spinbutton = gimp_prop_spin_button_new (config, "indent", 1.0, 10.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
+  gimp_table_attach_icon (GTK_TABLE (table), row++,
+                          GIMP_ICON_FORMAT_INDENT_MORE,
+                          spinbutton, 1, TRUE);
+
+  spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
+  gimp_table_attach_icon (GTK_TABLE (table), row++,
+                          GIMP_ICON_FORMAT_TEXT_SPACING_LINE,
+                          spinbutton, 1, TRUE);
+
+  spinbutton = gimp_prop_spin_button_new (config,
+                                          "letter-spacing", 1.0, 10.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
+  gimp_table_attach_icon (GTK_TABLE (table), row++,
+                          GIMP_ICON_FORMAT_TEXT_SPACING_LETTER,
+                          spinbutton, 1, TRUE);
+
+  combo = gimp_prop_enum_combo_box_new (config, "box-mode", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Box:"), 0.0, 0.5,
+                             combo, 1, TRUE);
+
+  /*  Only add the language entry if the iso-codes package is available.  */
+
+#ifdef HAVE_ISO_CODES
+  {
+    GtkWidget *label;
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+    gtk_box_pack_start (GTK_BOX (options_vbox), vbox, FALSE, FALSE, 0);
+    gtk_widget_show (vbox);
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    label = gtk_label_new (_("Language:"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    entry = gimp_prop_language_entry_new (config, "language");
+    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+    gtk_widget_show (entry);
+  }
+#endif
+
+  return main_vbox;
+}
+
+static void
+gimp_text_options_editor_dir_changed (GimpTextEditor  *editor,
+                                      GimpTextOptions *options)
+{
+  g_object_set (options,
+                "base-direction", editor->base_dir,
+                NULL);
+}
+
+static void
+gimp_text_options_editor_notify_dir (GimpTextOptions *options,
+                                     GParamSpec      *pspec,
+                                     GimpTextEditor  *editor)
+{
+  GimpTextDirection  dir;
+
+  g_object_get (options,
+                "base-direction", &dir,
+                NULL);
+
+  gimp_text_editor_set_direction (editor, dir);
+}
+
+static void
+gimp_text_options_editor_notify_font (GimpTextOptions *options,
+                                      GParamSpec      *pspec,
+                                      GimpTextEditor  *editor)
+{
+  const gchar *font_name;
+
+  font_name = gimp_context_get_font_name (GIMP_CONTEXT (options));
+
+  gimp_text_editor_set_font_name (editor, font_name);
+}
+
+GtkWidget *
+gimp_text_options_editor_new (GtkWindow       *parent,
+                              Gimp            *gimp,
+                              GimpTextOptions *options,
+                              GimpMenuFactory *menu_factory,
+                              const gchar     *title,
+                              GimpText        *text,
+                              GimpTextBuffer  *text_buffer,
+                              gdouble          xres,
+                              gdouble          yres)
+{
+  GtkWidget   *editor;
+  const gchar *font_name;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_OPTIONS (options), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (text_buffer), NULL);
+
+  editor = gimp_text_editor_new (title, parent, gimp, menu_factory,
+                                 text, text_buffer, xres, yres);
+
+  font_name = gimp_context_get_font_name (GIMP_CONTEXT (options));
+
+  gimp_text_editor_set_direction (GIMP_TEXT_EDITOR (editor),
+                                  options->base_dir);
+  gimp_text_editor_set_font_name (GIMP_TEXT_EDITOR (editor),
+                                  font_name);
+
+  g_signal_connect_object (editor, "dir-changed",
+                           G_CALLBACK (gimp_text_options_editor_dir_changed),
+                           options, 0);
+  g_signal_connect_object (options, "notify::base-direction",
+                           G_CALLBACK (gimp_text_options_editor_notify_dir),
+                           editor, 0);
+  g_signal_connect_object (options, "notify::font",
+                           G_CALLBACK (gimp_text_options_editor_notify_font),
+                           editor, 0);
+
+  return editor;
+}
diff --git a/app/tools/gimptextoptions.h b/app/tools/gimptextoptions.h
new file mode 100644
index 0000000..d80c21f
--- /dev/null
+++ b/app/tools/gimptextoptions.h
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_OPTIONS_H__
+#define __GIMP_TEXT_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_TEXT_OPTIONS            (gimp_text_options_get_type ())
+#define GIMP_TEXT_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_OPTIONS, GimpTextOptions))
+#define GIMP_TEXT_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_OPTIONS, GimpTextOptionsClass))
+#define GIMP_IS_TEXT_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_OPTIONS))
+#define GIMP_IS_TEXT_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_OPTIONS))
+#define GIMP_TEXT_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEXT_OPTIONS, GimpTextOptionsClass))
+
+
+typedef struct _GimpTextOptions      GimpTextOptions;
+typedef struct _GimpToolOptionsClass GimpTextOptionsClass;
+
+struct _GimpTextOptions
+{
+  GimpToolOptions        tool_options;
+
+  GimpUnit               unit;
+  gdouble                font_size;
+  gboolean               antialias;
+  GimpTextHintStyle      hint_style;
+  gchar                 *language;
+  GimpTextDirection      base_dir;
+  GimpTextJustification  justify;
+  gdouble                indent;
+  gdouble                line_spacing;
+  gdouble                letter_spacing;
+  GimpTextBoxMode        box_mode;
+
+  GimpViewType           font_view_type;
+  GimpViewSize           font_view_size;
+
+  gboolean               use_editor;
+
+  /*  options gui  */
+  GtkWidget             *size_entry;
+};
+
+
+GType       gimp_text_options_get_type     (void) G_GNUC_CONST;
+
+void        gimp_text_options_connect_text (GimpTextOptions *options,
+                                            GimpText        *text);
+
+GtkWidget * gimp_text_options_gui          (GimpToolOptions *tool_options);
+
+GtkWidget * gimp_text_options_editor_new   (GtkWindow       *parent,
+                                            Gimp            *gimp,
+                                            GimpTextOptions *options,
+                                            GimpMenuFactory *menu_factory,
+                                            const gchar     *title,
+                                            GimpText        *text,
+                                            GimpTextBuffer  *text_buffer,
+                                            gdouble          xres,
+                                            gdouble          yres);
+
+
+#endif /* __GIMP_TEXT_OPTIONS_H__ */
diff --git a/app/tools/gimptexttool-editor.c b/app/tools/gimptexttool-editor.c
new file mode 100644
index 0000000..62ee118
--- /dev/null
+++ b/app/tools/gimptexttool-editor.c
@@ -0,0 +1,1864 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextTool
+ * Copyright (C) 2002-2010  Sven Neumann <sven@gimp.org>
+ *                          Daniel Eddeland <danedde@svn.gnome.org>
+ *                          Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolinfo.h"
+
+#include "text/gimptext.h"
+#include "text/gimptextlayout.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimpoverlaybox.h"
+#include "widgets/gimpoverlayframe.h"
+#include "widgets/gimptextbuffer.h"
+#include "widgets/gimptexteditor.h"
+#include "widgets/gimptextproxy.h"
+#include "widgets/gimptextstyleeditor.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimptextoptions.h"
+#include "gimptexttool.h"
+#include "gimptexttool-editor.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void     gimp_text_tool_ensure_proxy       (GimpTextTool    *text_tool);
+static void     gimp_text_tool_move_cursor        (GimpTextTool    *text_tool,
+                                                   GtkMovementStep  step,
+                                                   gint             count,
+                                                   gboolean         extend_selection);
+static void     gimp_text_tool_insert_at_cursor   (GimpTextTool    *text_tool,
+                                                   const gchar     *str);
+static void     gimp_text_tool_delete_from_cursor (GimpTextTool    *text_tool,
+                                                   GtkDeleteType    type,
+                                                   gint             count);
+static void     gimp_text_tool_backspace          (GimpTextTool    *text_tool);
+static void     gimp_text_tool_toggle_overwrite   (GimpTextTool    *text_tool);
+static void     gimp_text_tool_select_all         (GimpTextTool    *text_tool,
+                                                   gboolean         select);
+static void     gimp_text_tool_change_size        (GimpTextTool    *text_tool,
+                                                   gdouble          amount);
+static void     gimp_text_tool_change_baseline    (GimpTextTool    *text_tool,
+                                                   gdouble          amount);
+static void     gimp_text_tool_change_kerning     (GimpTextTool    *text_tool,
+                                                   gdouble          amount);
+
+static void     gimp_text_tool_options_notify     (GimpTextOptions *options,
+                                                   GParamSpec      *pspec,
+                                                   GimpTextTool    *text_tool);
+static void     gimp_text_tool_editor_dialog      (GimpTextTool    *text_tool);
+static void     gimp_text_tool_editor_destroy     (GtkWidget       *dialog,
+                                                   GimpTextTool    *text_tool);
+static void     gimp_text_tool_enter_text         (GimpTextTool    *text_tool,
+                                                   const gchar     *str);
+static void     gimp_text_tool_xy_to_iter         (GimpTextTool    *text_tool,
+                                                   gdouble          x,
+                                                   gdouble          y,
+                                                   GtkTextIter     *iter);
+
+static void     gimp_text_tool_im_preedit_start   (GtkIMContext    *context,
+                                                   GimpTextTool    *text_tool);
+static void     gimp_text_tool_im_preedit_end     (GtkIMContext    *context,
+                                                   GimpTextTool    *text_tool);
+static void     gimp_text_tool_im_preedit_changed (GtkIMContext    *context,
+                                                   GimpTextTool    *text_tool);
+static void     gimp_text_tool_im_commit          (GtkIMContext    *context,
+                                                   const gchar     *str,
+                                                   GimpTextTool    *text_tool);
+static gboolean gimp_text_tool_im_retrieve_surrounding
+                                                  (GtkIMContext    *context,
+                                                   GimpTextTool    *text_tool);
+static gboolean gimp_text_tool_im_delete_surrounding
+                                                  (GtkIMContext    *context,
+                                                   gint             offset,
+                                                   gint             n_chars,
+                                                   GimpTextTool    *text_tool);
+
+static void     gimp_text_tool_im_delete_preedit  (GimpTextTool    *text_tool);
+
+static void     gimp_text_tool_editor_copy_selection_to_clipboard
+                                                  (GimpTextTool    *text_tool);
+
+static void   gimp_text_tool_fix_position         (GimpTextTool    *text_tool,
+                                                   gdouble         *x,
+                                                   gdouble         *y);
+
+static void   gimp_text_tool_convert_gdkkeyevent  (GimpTextTool    *text_tool,
+                                                   GdkEventKey     *kevent);
+
+
+/*  public functions  */
+
+void
+gimp_text_tool_editor_init (GimpTextTool *text_tool)
+{
+  text_tool->im_context     = gtk_im_multicontext_new ();
+  text_tool->needs_im_reset = FALSE;
+
+  text_tool->preedit_string = NULL;
+  text_tool->preedit_cursor = 0;
+  text_tool->overwrite_mode = FALSE;
+  text_tool->x_pos          = -1;
+
+  g_signal_connect (text_tool->im_context, "preedit-start",
+                    G_CALLBACK (gimp_text_tool_im_preedit_start),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "preedit-end",
+                    G_CALLBACK (gimp_text_tool_im_preedit_end),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "preedit-changed",
+                    G_CALLBACK (gimp_text_tool_im_preedit_changed),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "commit",
+                    G_CALLBACK (gimp_text_tool_im_commit),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "retrieve-surrounding",
+                    G_CALLBACK (gimp_text_tool_im_retrieve_surrounding),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "delete-surrounding",
+                    G_CALLBACK (gimp_text_tool_im_delete_surrounding),
+                    text_tool);
+}
+
+void
+gimp_text_tool_editor_finalize (GimpTextTool *text_tool)
+{
+  if (text_tool->im_context)
+    {
+      g_object_unref (text_tool->im_context);
+      text_tool->im_context = NULL;
+    }
+}
+
+void
+gimp_text_tool_editor_start (GimpTextTool *text_tool)
+{
+  GimpTool         *tool    = GIMP_TOOL (text_tool);
+  GimpTextOptions  *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+  GimpDisplayShell *shell   = gimp_display_get_shell (tool->display);
+
+  gtk_im_context_set_client_window (text_tool->im_context,
+                                    gtk_widget_get_window (shell->canvas));
+
+  text_tool->needs_im_reset = TRUE;
+  gimp_text_tool_reset_im_context (text_tool);
+
+  gtk_im_context_focus_in (text_tool->im_context);
+
+  if (options->use_editor)
+    gimp_text_tool_editor_dialog (text_tool);
+
+  g_signal_connect (options, "notify::use-editor",
+                    G_CALLBACK (gimp_text_tool_options_notify),
+                    text_tool);
+
+  if (! text_tool->style_overlay)
+    {
+      Gimp          *gimp = GIMP_CONTEXT (options)->gimp;
+      GimpContainer *fonts;
+      gdouble        xres = 1.0;
+      gdouble        yres = 1.0;
+
+      text_tool->style_overlay = gimp_overlay_frame_new ();
+      gtk_container_set_border_width (GTK_CONTAINER (text_tool->style_overlay),
+                                      4);
+      gimp_display_shell_add_overlay (shell,
+                                      text_tool->style_overlay,
+                                      0, 0,
+                                      GIMP_HANDLE_ANCHOR_CENTER, 0, 0);
+      gimp_overlay_box_set_child_opacity (GIMP_OVERLAY_BOX (shell->canvas),
+                                          text_tool->style_overlay, 0.7);
+
+      if (text_tool->image)
+        gimp_image_get_resolution (text_tool->image, &xres, &yres);
+
+      fonts = gimp_data_factory_get_container (gimp->font_factory);
+
+      text_tool->style_editor = gimp_text_style_editor_new (gimp,
+                                                            text_tool->proxy,
+                                                            text_tool->buffer,
+                                                            fonts,
+                                                            xres, yres);
+      gtk_container_add (GTK_CONTAINER (text_tool->style_overlay),
+                         text_tool->style_editor);
+      gtk_widget_show (text_tool->style_editor);
+    }
+
+  gimp_text_tool_editor_position (text_tool);
+  gtk_widget_show (text_tool->style_overlay);
+}
+
+void
+gimp_text_tool_editor_position (GimpTextTool *text_tool)
+{
+  if (text_tool->style_overlay)
+    {
+      GimpTool         *tool    = GIMP_TOOL (text_tool);
+      GimpDisplayShell *shell   = gimp_display_get_shell (tool->display);
+      GtkRequisition    requisition;
+      gdouble           x, y;
+
+      gtk_widget_size_request (text_tool->style_overlay, &requisition);
+
+      g_object_get (text_tool->widget,
+                    "x1", &x,
+                    "y1", &y,
+                    NULL);
+
+      gimp_display_shell_move_overlay (shell,
+                                       text_tool->style_overlay,
+                                       x, y,
+                                       GIMP_HANDLE_ANCHOR_SOUTH_WEST, 4, 12);
+
+      if (text_tool->image)
+        {
+          gdouble xres, yres;
+
+          gimp_image_get_resolution (text_tool->image, &xres, &yres);
+
+          g_object_set (text_tool->style_editor,
+                        "resolution-x", xres,
+                        "resolution-y", yres,
+                        NULL);
+        }
+    }
+}
+
+void
+gimp_text_tool_editor_halt (GimpTextTool *text_tool)
+{
+  GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+
+  if (text_tool->style_overlay)
+    {
+      gtk_widget_destroy (text_tool->style_overlay);
+      text_tool->style_overlay = NULL;
+      text_tool->style_editor  = NULL;
+    }
+
+  g_signal_handlers_disconnect_by_func (options,
+                                        gimp_text_tool_options_notify,
+                                        text_tool);
+
+  if (text_tool->editor_dialog)
+    {
+      g_signal_handlers_disconnect_by_func (text_tool->editor_dialog,
+                                            gimp_text_tool_editor_destroy,
+                                            text_tool);
+      gtk_widget_destroy (text_tool->editor_dialog);
+    }
+
+  if (text_tool->proxy_text_view)
+    {
+      gtk_widget_destroy (text_tool->offscreen_window);
+      text_tool->offscreen_window = NULL;
+      text_tool->proxy_text_view = NULL;
+    }
+
+  text_tool->needs_im_reset = TRUE;
+  gimp_text_tool_reset_im_context (text_tool);
+
+  gtk_im_context_focus_out (text_tool->im_context);
+
+  gtk_im_context_set_client_window (text_tool->im_context, NULL);
+}
+
+void
+gimp_text_tool_editor_button_press (GimpTextTool        *text_tool,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    GimpButtonPressType  press_type)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    cursor;
+  GtkTextIter    selection;
+
+  gimp_text_tool_xy_to_iter (text_tool, x, y, &cursor);
+
+  selection = cursor;
+
+  text_tool->select_start_iter = cursor;
+  text_tool->select_words      = FALSE;
+  text_tool->select_lines      = FALSE;
+
+  switch (press_type)
+    {
+      GtkTextIter start, end;
+
+    case GIMP_BUTTON_PRESS_NORMAL:
+      if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end) ||
+          gtk_text_iter_compare (&start, &cursor))
+        gtk_text_buffer_place_cursor (buffer, &cursor);
+      break;
+
+    case GIMP_BUTTON_PRESS_DOUBLE:
+      text_tool->select_words = TRUE;
+
+      if (! gtk_text_iter_starts_word (&cursor))
+        gtk_text_iter_backward_visible_word_starts (&cursor, 1);
+
+      if (! gtk_text_iter_ends_word (&selection) &&
+          ! gtk_text_iter_forward_visible_word_ends (&selection, 1))
+        gtk_text_iter_forward_to_line_end (&selection);
+
+      gtk_text_buffer_select_range (buffer, &cursor, &selection);
+      break;
+
+    case GIMP_BUTTON_PRESS_TRIPLE:
+      text_tool->select_lines = TRUE;
+
+      gtk_text_iter_set_line_offset (&cursor, 0);
+      gtk_text_iter_forward_to_line_end (&selection);
+
+      gtk_text_buffer_select_range (buffer, &cursor, &selection);
+      break;
+    }
+}
+
+void
+gimp_text_tool_editor_button_release (GimpTextTool *text_tool)
+{
+  gimp_text_tool_editor_copy_selection_to_clipboard (text_tool);
+}
+
+void
+gimp_text_tool_editor_motion (GimpTextTool *text_tool,
+                              gdouble       x,
+                              gdouble       y)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    old_cursor;
+  GtkTextIter    old_selection;
+  GtkTextIter    cursor;
+  GtkTextIter    selection;
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &old_cursor,
+                                    gtk_text_buffer_get_insert (buffer));
+  gtk_text_buffer_get_iter_at_mark (buffer, &old_selection,
+                                    gtk_text_buffer_get_selection_bound (buffer));
+
+  gimp_text_tool_xy_to_iter (text_tool, x, y, &cursor);
+  selection = text_tool->select_start_iter;
+
+  if (text_tool->select_words ||
+      text_tool->select_lines)
+    {
+      GtkTextIter start;
+      GtkTextIter end;
+
+      if (gtk_text_iter_compare (&cursor, &selection) < 0)
+        {
+          start = cursor;
+          end   = selection;
+        }
+      else
+        {
+          start = selection;
+          end   = cursor;
+        }
+
+      if (text_tool->select_words)
+        {
+          if (! gtk_text_iter_starts_word (&start))
+            gtk_text_iter_backward_visible_word_starts (&start, 1);
+
+          if (! gtk_text_iter_ends_word (&end) &&
+              ! gtk_text_iter_forward_visible_word_ends (&end, 1))
+            gtk_text_iter_forward_to_line_end (&end);
+        }
+      else if (text_tool->select_lines)
+        {
+          gtk_text_iter_set_line_offset (&start, 0);
+          gtk_text_iter_forward_to_line_end (&end);
+        }
+
+      if (gtk_text_iter_compare (&cursor, &selection) < 0)
+        {
+          cursor    = start;
+          selection = end;
+        }
+      else
+        {
+          selection = start;
+          cursor    = end;
+        }
+    }
+
+  if (! gtk_text_iter_equal (&cursor,    &old_cursor) ||
+      ! gtk_text_iter_equal (&selection, &old_selection))
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (text_tool));
+
+      gtk_text_buffer_select_range (buffer, &cursor, &selection);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (text_tool));
+    }
+}
+
+gboolean
+gimp_text_tool_editor_key_press (GimpTextTool *text_tool,
+                                 GdkEventKey  *kevent)
+{
+  GimpTool         *tool   = GIMP_TOOL (text_tool);
+  GimpDisplayShell *shell  = gimp_display_get_shell (tool->display);
+  GtkTextBuffer    *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter       cursor;
+  GtkTextIter       selection;
+  gboolean          retval = TRUE;
+
+  if (! gtk_widget_has_focus (shell->canvas))
+    {
+      /*  The focus is in the floating style editor, and the event
+       *  was not handled there, focus the canvas.
+       */
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Tab:
+        case GDK_KEY_KP_Tab:
+        case GDK_KEY_ISO_Left_Tab:
+        case GDK_KEY_Escape:
+          gtk_widget_grab_focus (shell->canvas);
+          return TRUE;
+
+        default:
+          break;
+        }
+    }
+
+  if (gtk_im_context_filter_keypress (text_tool->im_context, kevent))
+    {
+      text_tool->needs_im_reset = TRUE;
+      text_tool->x_pos          = -1;
+
+      return TRUE;
+    }
+
+  gimp_text_tool_convert_gdkkeyevent (text_tool, kevent);
+
+  gimp_text_tool_ensure_proxy (text_tool);
+
+  if (gtk_bindings_activate_event (GTK_OBJECT (text_tool->proxy_text_view),
+                                   kevent))
+    {
+      GIMP_LOG (TEXT_EDITING, "binding handled event");
+
+      return TRUE;
+    }
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                    gtk_text_buffer_get_insert (buffer));
+  gtk_text_buffer_get_iter_at_mark (buffer, &selection,
+                                    gtk_text_buffer_get_selection_bound (buffer));
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      gimp_text_tool_reset_im_context (text_tool);
+      gimp_text_tool_enter_text (text_tool, "\n");
+      break;
+
+    case GDK_KEY_Tab:
+    case GDK_KEY_KP_Tab:
+    case GDK_KEY_ISO_Left_Tab:
+      gimp_text_tool_reset_im_context (text_tool);
+      gimp_text_tool_enter_text (text_tool, "\t");
+      break;
+
+    case GDK_KEY_Escape:
+      gimp_tool_control (GIMP_TOOL (text_tool), GIMP_TOOL_ACTION_HALT,
+                         GIMP_TOOL (text_tool)->display);
+      break;
+
+    default:
+      retval = FALSE;
+    }
+
+  text_tool->x_pos = -1;
+
+  return retval;
+}
+
+gboolean
+gimp_text_tool_editor_key_release (GimpTextTool *text_tool,
+                                   GdkEventKey  *kevent)
+{
+  if (gtk_im_context_filter_keypress (text_tool->im_context, kevent))
+    {
+      text_tool->needs_im_reset = TRUE;
+
+      return TRUE;
+    }
+
+  gimp_text_tool_convert_gdkkeyevent (text_tool, kevent);
+
+  gimp_text_tool_ensure_proxy (text_tool);
+
+  if (gtk_bindings_activate_event (GTK_OBJECT (text_tool->proxy_text_view),
+                                   kevent))
+    {
+      GIMP_LOG (TEXT_EDITING, "binding handled event");
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_text_tool_reset_im_context (GimpTextTool *text_tool)
+{
+  if (text_tool->needs_im_reset)
+    {
+      text_tool->needs_im_reset = FALSE;
+      gtk_im_context_reset (text_tool->im_context);
+    }
+}
+
+void
+gimp_text_tool_abort_im_context (GimpTextTool *text_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (text_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+
+  text_tool->needs_im_reset = TRUE;
+  gimp_text_tool_reset_im_context (text_tool);
+
+  /* Making sure preedit text is removed. */
+  gimp_text_tool_im_delete_preedit (text_tool);
+
+  /* the following lines seem to be the only way of really getting
+   * rid of any ongoing preedit state, please somebody tell me
+   * a clean way... mitch
+   */
+
+  gtk_im_context_focus_out (text_tool->im_context);
+  gtk_im_context_set_client_window (text_tool->im_context, NULL);
+
+  g_object_unref (text_tool->im_context);
+  text_tool->im_context = gtk_im_multicontext_new ();
+  gtk_im_context_set_client_window (text_tool->im_context,
+                                    gtk_widget_get_window (shell->canvas));
+  gtk_im_context_focus_in (text_tool->im_context);
+  g_signal_connect (text_tool->im_context, "preedit-start",
+                    G_CALLBACK (gimp_text_tool_im_preedit_start),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "preedit-end",
+                    G_CALLBACK (gimp_text_tool_im_preedit_end),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "preedit-changed",
+                    G_CALLBACK (gimp_text_tool_im_preedit_changed),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "commit",
+                    G_CALLBACK (gimp_text_tool_im_commit),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "retrieve-surrounding",
+                    G_CALLBACK (gimp_text_tool_im_retrieve_surrounding),
+                    text_tool);
+  g_signal_connect (text_tool->im_context, "delete-surrounding",
+                    G_CALLBACK (gimp_text_tool_im_delete_surrounding),
+                    text_tool);
+}
+
+void
+gimp_text_tool_editor_get_cursor_rect (GimpTextTool   *text_tool,
+                                       gboolean        overwrite,
+                                       PangoRectangle *cursor_rect)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  PangoLayout   *layout;
+  PangoContext  *context;
+  gint           offset_x;
+  gint           offset_y;
+  GtkTextIter    cursor;
+  gint           cursor_index;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+  g_return_if_fail (cursor_rect != NULL);
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                    gtk_text_buffer_get_insert (buffer));
+  cursor_index = gimp_text_buffer_get_iter_index (text_tool->buffer, &cursor,
+                                                  TRUE);
+
+  gimp_text_tool_ensure_layout (text_tool);
+
+  layout = gimp_text_layout_get_pango_layout (text_tool->layout);
+
+  context = pango_layout_get_context (layout);
+
+  gimp_text_layout_get_offsets (text_tool->layout, &offset_x, &offset_y);
+
+  if (overwrite)
+    {
+      pango_layout_index_to_pos (layout, cursor_index, cursor_rect);
+
+      /* pango_layout_index_to_pos() returns wrong position, if gravity is west
+       * and cursor is at end of line. Avoid this behavior. (pango 1.42.1)
+       */
+      if (pango_context_get_base_gravity (context) == PANGO_GRAVITY_WEST &&
+          cursor_rect->width == 0)
+        pango_layout_get_cursor_pos (layout, cursor_index, cursor_rect, NULL);
+    }
+ else
+    pango_layout_get_cursor_pos (layout, cursor_index, cursor_rect, NULL);
+
+  gimp_text_layout_transform_rect (text_tool->layout, cursor_rect);
+
+  switch (gimp_text_tool_get_direction (text_tool))
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+    case GIMP_TEXT_DIRECTION_RTL:
+      cursor_rect->x      = PANGO_PIXELS (cursor_rect->x) + offset_x;
+      cursor_rect->y      = PANGO_PIXELS (cursor_rect->y) + offset_y;
+      cursor_rect->width  = PANGO_PIXELS (cursor_rect->width);
+      cursor_rect->height = PANGO_PIXELS (cursor_rect->height);
+      break;
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+      {
+      gint temp, width, height;
+
+      gimp_text_layout_get_size (text_tool->layout, &width, &height);
+
+      temp                = cursor_rect->x;
+      cursor_rect->x      = width - PANGO_PIXELS (cursor_rect->y) + offset_x;
+      cursor_rect->y      = PANGO_PIXELS (temp) + offset_y;
+
+      temp                = cursor_rect->width;
+      cursor_rect->width  = PANGO_PIXELS (cursor_rect->height);
+      cursor_rect->height = PANGO_PIXELS (temp);
+      }
+      break;
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      {
+      gint temp, width, height;
+
+      gimp_text_layout_get_size (text_tool->layout, &width, &height);
+
+      temp                = cursor_rect->x;
+      cursor_rect->x      = PANGO_PIXELS (cursor_rect->y) + offset_x;
+      cursor_rect->y      = height - PANGO_PIXELS (temp) + offset_y;
+
+      temp                = cursor_rect->width;
+      cursor_rect->width  = PANGO_PIXELS (cursor_rect->height);
+      cursor_rect->height = PANGO_PIXELS (temp);
+      }
+      break;
+   }
+}
+
+void
+gimp_text_tool_editor_update_im_cursor (GimpTextTool *text_tool)
+{
+  GimpDisplayShell *shell;
+  PangoRectangle    rect = { 0, };
+  gdouble           off_x, off_y;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+
+  shell = gimp_display_get_shell (GIMP_TOOL (text_tool)->display);
+
+  if (text_tool->text)
+    gimp_text_tool_editor_get_cursor_rect (text_tool,
+                                           text_tool->overwrite_mode,
+                                           &rect);
+
+  g_object_get (text_tool->widget,
+                "x1", &off_x,
+                "y1", &off_y,
+                NULL);
+
+  rect.x += off_x;
+  rect.y += off_y;
+
+  gimp_display_shell_transform_xy (shell, rect.x, rect.y, &rect.x, &rect.y);
+
+  gtk_im_context_set_cursor_location (text_tool->im_context,
+                                      (GdkRectangle *) &rect);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_text_tool_ensure_proxy (GimpTextTool *text_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (text_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+
+  if (text_tool->offscreen_window &&
+      gtk_widget_get_screen (text_tool->offscreen_window) !=
+      gtk_widget_get_screen (GTK_WIDGET (shell)))
+    {
+      gtk_window_set_screen (GTK_WINDOW (text_tool->offscreen_window),
+                             gtk_widget_get_screen (GTK_WIDGET (shell)));
+      gtk_window_move (GTK_WINDOW (text_tool->offscreen_window), -200, -200);
+    }
+  else if (! text_tool->offscreen_window)
+    {
+      text_tool->offscreen_window = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_window_set_screen (GTK_WINDOW (text_tool->offscreen_window),
+                             gtk_widget_get_screen (GTK_WIDGET (shell)));
+      gtk_window_move (GTK_WINDOW (text_tool->offscreen_window), -200, -200);
+      gtk_widget_show (text_tool->offscreen_window);
+
+      text_tool->proxy_text_view = gimp_text_proxy_new ();
+      gtk_container_add (GTK_CONTAINER (text_tool->offscreen_window),
+                         text_tool->proxy_text_view);
+      gtk_widget_show (text_tool->proxy_text_view);
+
+      g_signal_connect_swapped (text_tool->proxy_text_view, "move-cursor",
+                                G_CALLBACK (gimp_text_tool_move_cursor),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "insert-at-cursor",
+                                G_CALLBACK (gimp_text_tool_insert_at_cursor),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "delete-from-cursor",
+                                G_CALLBACK (gimp_text_tool_delete_from_cursor),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "backspace",
+                                G_CALLBACK (gimp_text_tool_backspace),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "cut-clipboard",
+                                G_CALLBACK (gimp_text_tool_cut_clipboard),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "copy-clipboard",
+                                G_CALLBACK (gimp_text_tool_copy_clipboard),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "paste-clipboard",
+                                G_CALLBACK (gimp_text_tool_paste_clipboard),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "toggle-overwrite",
+                                G_CALLBACK (gimp_text_tool_toggle_overwrite),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "select-all",
+                                G_CALLBACK (gimp_text_tool_select_all),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "change-size",
+                                G_CALLBACK (gimp_text_tool_change_size),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "change-baseline",
+                                G_CALLBACK (gimp_text_tool_change_baseline),
+                                text_tool);
+      g_signal_connect_swapped (text_tool->proxy_text_view, "change-kerning",
+                                G_CALLBACK (gimp_text_tool_change_kerning),
+                                text_tool);
+    }
+}
+
+static void
+gimp_text_tool_move_cursor (GimpTextTool    *text_tool,
+                            GtkMovementStep  step,
+                            gint             count,
+                            gboolean         extend_selection)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    cursor;
+  GtkTextIter    selection;
+  GtkTextIter   *sel_start;
+  gboolean       cancel_selection = FALSE;
+  gint           x_pos  = -1;
+
+  if (text_tool->pending)
+    {
+      /* If there are any pending text commits, there would be
+       * inconsistencies between the text_tool->buffer and layout.
+       * This could result in crashes. See bug 751333.
+       * Therefore we apply them first.
+       */
+      gimp_text_tool_apply (text_tool, TRUE);
+    }
+  GIMP_LOG (TEXT_EDITING, "%s count = %d, select = %s",
+            g_enum_get_value (g_type_class_ref (GTK_TYPE_MOVEMENT_STEP),
+                              step)->value_name,
+            count,
+            extend_selection ? "TRUE" : "FALSE");
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                    gtk_text_buffer_get_insert (buffer));
+  gtk_text_buffer_get_iter_at_mark (buffer, &selection,
+                                    gtk_text_buffer_get_selection_bound (buffer));
+
+  if (extend_selection)
+    {
+      sel_start = &selection;
+    }
+  else
+    {
+      /*  when there is a selection, moving the cursor without
+       *  extending it should move the cursor to the end of the
+       *  selection that is in moving direction
+       */
+      if (count > 0)
+        gtk_text_iter_order (&selection, &cursor);
+      else
+        gtk_text_iter_order (&cursor, &selection);
+
+      sel_start = &cursor;
+
+      /* if we actually have a selection, just move *to* the beginning/end
+       * of the selection and not *from* there on LOGICAL_POSITIONS
+       * and VISUAL_POSITIONS movement
+       */
+      if (! gtk_text_iter_equal (&cursor, &selection))
+        cancel_selection = TRUE;
+    }
+
+  switch (step)
+    {
+    case GTK_MOVEMENT_LOGICAL_POSITIONS:
+      if (! cancel_selection)
+        gtk_text_iter_forward_visible_cursor_positions (&cursor, count);
+      break;
+
+    case GTK_MOVEMENT_VISUAL_POSITIONS:
+      if (! cancel_selection)
+        {
+          PangoLayout *layout;
+          const gchar *text;
+
+          if (! gimp_text_tool_ensure_layout (text_tool))
+            break;
+
+          layout = gimp_text_layout_get_pango_layout (text_tool->layout);
+          text = pango_layout_get_text (layout);
+
+          while (count != 0)
+            {
+              const gunichar word_joiner = 8288; /*g_utf8_get_char(WORD_JOINER);*/
+              gint index;
+              gint trailing = 0;
+              gint new_index;
+
+              index = gimp_text_buffer_get_iter_index (text_tool->buffer,
+                                                       &cursor, TRUE);
+
+              if (count > 0)
+                {
+                  if (g_utf8_get_char (text + index) == word_joiner)
+                    pango_layout_move_cursor_visually (layout, TRUE,
+                                                       index, 0, 1,
+                                                       &new_index, &trailing);
+                  else
+                    new_index = index;
+
+                  pango_layout_move_cursor_visually (layout, TRUE,
+                                                     new_index, trailing, 1,
+                                                     &new_index, &trailing);
+                  count--;
+                }
+              else
+                {
+                  pango_layout_move_cursor_visually (layout, TRUE,
+                                                     index, 0, -1,
+                                                     &new_index, &trailing);
+
+                  if (new_index != -1 && new_index != G_MAXINT &&
+                      g_utf8_get_char (text + new_index) == word_joiner)
+                    {
+                      pango_layout_move_cursor_visually (layout, TRUE,
+                                                         new_index, trailing, -1,
+                                                         &new_index, &trailing);
+                    }
+
+                  count++;
+                }
+
+              if (new_index != G_MAXINT && new_index != -1)
+                index = new_index;
+              else
+                break;
+
+              gimp_text_buffer_get_iter_at_index (text_tool->buffer,
+                                                  &cursor, index, TRUE);
+              gtk_text_iter_forward_chars (&cursor, trailing);
+            }
+        }
+      break;
+
+    case GTK_MOVEMENT_WORDS:
+      if (count < 0)
+        {
+          gtk_text_iter_backward_visible_word_starts (&cursor, -count);
+        }
+      else if (count > 0)
+        {
+          if (! gtk_text_iter_forward_visible_word_ends (&cursor, count))
+            gtk_text_iter_forward_to_line_end (&cursor);
+        }
+      break;
+
+    case GTK_MOVEMENT_DISPLAY_LINES:
+      {
+        GtkTextIter      start;
+        GtkTextIter      end;
+        gint             cursor_index;
+        PangoLayout     *layout;
+        PangoLayoutLine *layout_line;
+        PangoLayoutIter *layout_iter;
+        PangoRectangle   logical;
+        gint             line;
+        gint             trailing;
+        gint             i;
+
+        gtk_text_buffer_get_bounds (buffer, &start, &end);
+
+        cursor_index = gimp_text_buffer_get_iter_index (text_tool->buffer,
+                                                        &cursor, TRUE);
+
+        if (! gimp_text_tool_ensure_layout (text_tool))
+          break;
+
+        layout = gimp_text_layout_get_pango_layout (text_tool->layout);
+
+        pango_layout_index_to_line_x (layout, cursor_index, FALSE,
+                                      &line, &x_pos);
+
+        layout_iter = pango_layout_get_iter (layout);
+        for (i = 0; i < line; i++)
+          pango_layout_iter_next_line (layout_iter);
+
+        pango_layout_iter_get_line_extents (layout_iter, NULL, &logical);
+
+        x_pos += logical.x;
+
+        pango_layout_iter_free (layout_iter);
+
+        /*  try to go to the remembered x_pos if it exists *and* we are at
+         *  the beginning or at the end of the current line
+         */
+        if (text_tool->x_pos != -1 && (x_pos <= logical.x ||
+                                       x_pos >= logical.x + logical.width))
+          x_pos = text_tool->x_pos;
+
+        line += count;
+
+        if (line < 0)
+          {
+            cursor = start;
+            break;
+          }
+        else if (line >= pango_layout_get_line_count (layout))
+          {
+            cursor = end;
+            break;
+          }
+
+        layout_iter = pango_layout_get_iter (layout);
+        for (i = 0; i < line; i++)
+          pango_layout_iter_next_line (layout_iter);
+
+        layout_line = pango_layout_iter_get_line_readonly (layout_iter);
+        pango_layout_iter_get_line_extents (layout_iter, NULL, &logical);
+
+        pango_layout_iter_free (layout_iter);
+
+        pango_layout_line_x_to_index (layout_line, x_pos - logical.x,
+                                      &cursor_index, &trailing);
+
+        gimp_text_buffer_get_iter_at_index (text_tool->buffer, &cursor,
+                                            cursor_index, TRUE);
+
+        while (trailing--)
+          gtk_text_iter_forward_char (&cursor);
+      }
+      break;
+
+    case GTK_MOVEMENT_PAGES: /* well... */
+    case GTK_MOVEMENT_BUFFER_ENDS:
+      if (count < 0)
+        {
+          gtk_text_buffer_get_start_iter (buffer, &cursor);
+        }
+      else if (count > 0)
+        {
+          gtk_text_buffer_get_end_iter (buffer, &cursor);
+        }
+      break;
+
+    case GTK_MOVEMENT_PARAGRAPH_ENDS:
+      if (count < 0)
+        {
+          gtk_text_iter_set_line_offset (&cursor, 0);
+        }
+      else if (count > 0)
+        {
+          if (! gtk_text_iter_ends_line (&cursor))
+            gtk_text_iter_forward_to_line_end (&cursor);
+        }
+      break;
+
+    case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
+      if (count < 0)
+        {
+          gtk_text_iter_set_line_offset (&cursor, 0);
+        }
+      else if (count > 0)
+        {
+          if (! gtk_text_iter_ends_line (&cursor))
+            gtk_text_iter_forward_to_line_end (&cursor);
+        }
+      break;
+
+    default:
+      return;
+    }
+
+  text_tool->x_pos = x_pos;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (text_tool));
+
+  gimp_text_tool_reset_im_context (text_tool);
+
+  gtk_text_buffer_select_range (buffer, &cursor, sel_start);
+  gimp_text_tool_editor_copy_selection_to_clipboard (text_tool);
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (text_tool));
+}
+
+static void
+gimp_text_tool_insert_at_cursor (GimpTextTool *text_tool,
+                                 const gchar  *str)
+{
+  gimp_text_buffer_insert (text_tool->buffer, str);
+}
+
+static gboolean
+is_whitespace (gunichar ch,
+               gpointer user_data)
+{
+  return (ch == ' ' || ch == '\t');
+}
+
+static gboolean
+is_not_whitespace (gunichar ch,
+                   gpointer user_data)
+{
+  return ! is_whitespace (ch, user_data);
+}
+
+static gboolean
+find_whitepace_region (const GtkTextIter *center,
+                       GtkTextIter       *start,
+                       GtkTextIter       *end)
+{
+  *start = *center;
+  *end   = *center;
+
+  if (gtk_text_iter_backward_find_char (start, is_not_whitespace, NULL, NULL))
+    gtk_text_iter_forward_char (start); /* we want the first whitespace... */
+
+  if (is_whitespace (gtk_text_iter_get_char (end), NULL))
+    gtk_text_iter_forward_find_char (end, is_not_whitespace, NULL, NULL);
+
+  return ! gtk_text_iter_equal (start, end);
+}
+
+static void
+gimp_text_tool_delete_from_cursor (GimpTextTool  *text_tool,
+                                   GtkDeleteType  type,
+                                   gint           count)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    cursor;
+  GtkTextIter    end;
+
+  GIMP_LOG (TEXT_EDITING, "%s count = %d",
+            g_enum_get_value (g_type_class_ref (GTK_TYPE_DELETE_TYPE),
+                              type)->value_name,
+            count);
+
+  gimp_text_tool_reset_im_context (text_tool);
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                    gtk_text_buffer_get_insert (buffer));
+  end = cursor;
+
+  switch (type)
+    {
+    case GTK_DELETE_CHARS:
+      if (gtk_text_buffer_get_has_selection (buffer))
+        {
+          gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
+          return;
+        }
+      else
+        {
+          gtk_text_iter_forward_cursor_positions (&end, count);
+        }
+      break;
+
+    case GTK_DELETE_WORD_ENDS:
+      if (count < 0)
+        {
+          if (! gtk_text_iter_starts_word (&cursor))
+            gtk_text_iter_backward_visible_word_starts (&cursor, 1);
+        }
+      else if (count > 0)
+        {
+          if (! gtk_text_iter_ends_word (&end) &&
+              ! gtk_text_iter_forward_visible_word_ends (&end, 1))
+            gtk_text_iter_forward_to_line_end (&end);
+        }
+      break;
+
+    case GTK_DELETE_WORDS:
+      if (! gtk_text_iter_starts_word (&cursor))
+        gtk_text_iter_backward_visible_word_starts (&cursor, 1);
+
+      if (! gtk_text_iter_ends_word (&end) &&
+          ! gtk_text_iter_forward_visible_word_ends (&end, 1))
+        gtk_text_iter_forward_to_line_end (&end);
+      break;
+
+    case GTK_DELETE_DISPLAY_LINES:
+      break;
+
+    case GTK_DELETE_DISPLAY_LINE_ENDS:
+      break;
+
+    case GTK_DELETE_PARAGRAPH_ENDS:
+      if (count < 0)
+        {
+          gtk_text_iter_set_line_offset (&cursor, 0);
+        }
+      else if (count > 0)
+        {
+          if (! gtk_text_iter_ends_line (&end))
+            gtk_text_iter_forward_to_line_end (&end);
+          else
+            gtk_text_iter_forward_cursor_positions (&end, 1);
+        }
+      break;
+
+    case GTK_DELETE_PARAGRAPHS:
+      break;
+
+    case GTK_DELETE_WHITESPACE:
+      find_whitepace_region (&cursor, &cursor, &end);
+      break;
+    }
+
+  if (! gtk_text_iter_equal (&cursor, &end))
+    {
+      gtk_text_buffer_delete_interactive (buffer, &cursor, &end, TRUE);
+    }
+}
+
+static void
+gimp_text_tool_backspace (GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+
+  gimp_text_tool_reset_im_context (text_tool);
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
+    }
+  else
+    {
+      GtkTextIter cursor;
+
+      gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                        gtk_text_buffer_get_insert (buffer));
+
+      gtk_text_buffer_backspace (buffer, &cursor, TRUE, TRUE);
+    }
+}
+
+static void
+gimp_text_tool_toggle_overwrite (GimpTextTool *text_tool)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (text_tool));
+
+  text_tool->overwrite_mode = ! text_tool->overwrite_mode;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (text_tool));
+}
+
+static void
+gimp_text_tool_select_all (GimpTextTool *text_tool,
+                           gboolean      select)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (text_tool));
+
+  if (select)
+    {
+      GtkTextIter start, end;
+
+      gtk_text_buffer_get_bounds (buffer, &start, &end);
+      gtk_text_buffer_select_range (buffer, &start, &end);
+    }
+  else
+    {
+      GtkTextIter cursor;
+
+      gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                        gtk_text_buffer_get_insert (buffer));
+      gtk_text_buffer_move_mark_by_name (buffer, "selection_bound", &cursor);
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (text_tool));
+}
+
+static void
+gimp_text_tool_change_size (GimpTextTool *text_tool,
+                            gdouble       amount)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    start;
+  GtkTextIter    end;
+
+  if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+    {
+      return;
+    }
+
+  gtk_text_iter_order (&start, &end);
+  gimp_text_buffer_change_size (text_tool->buffer, &start, &end,
+                                amount * PANGO_SCALE);
+}
+
+static void
+gimp_text_tool_change_baseline (GimpTextTool *text_tool,
+                                gdouble       amount)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    start;
+  GtkTextIter    end;
+
+  if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+    {
+      gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                        gtk_text_buffer_get_insert (buffer));
+      gtk_text_buffer_get_end_iter (buffer, &end);
+    }
+
+  gtk_text_iter_order (&start, &end);
+  gimp_text_buffer_change_baseline (text_tool->buffer, &start, &end,
+                                    amount * PANGO_SCALE);
+}
+
+static void
+gimp_text_tool_change_kerning (GimpTextTool *text_tool,
+                               gdouble       amount)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    start;
+  GtkTextIter    end;
+
+  if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+    {
+      gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                        gtk_text_buffer_get_insert (buffer));
+      end = start;
+      gtk_text_iter_forward_char (&end);
+    }
+
+  gtk_text_iter_order (&start, &end);
+  gimp_text_buffer_change_kerning (text_tool->buffer, &start, &end,
+                                   amount * PANGO_SCALE);
+}
+
+static void
+gimp_text_tool_options_notify (GimpTextOptions *options,
+                               GParamSpec      *pspec,
+                               GimpTextTool    *text_tool)
+{
+  const gchar *param_name = g_param_spec_get_name (pspec);
+
+  if (! strcmp (param_name, "use-editor"))
+    {
+      if (options->use_editor)
+        {
+          gimp_text_tool_editor_dialog (text_tool);
+        }
+      else
+        {
+          if (text_tool->editor_dialog)
+            gtk_widget_destroy (text_tool->editor_dialog);
+        }
+    }
+}
+
+static void
+gimp_text_tool_editor_dialog (GimpTextTool *text_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (text_tool);
+  GimpTextOptions   *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (tool->display);
+  GimpImageWindow   *image_window;
+  GimpDialogFactory *dialog_factory;
+  GtkWindow         *parent  = NULL;
+  gdouble            xres    = 1.0;
+  gdouble            yres    = 1.0;
+
+  if (text_tool->editor_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (text_tool->editor_dialog));
+      return;
+    }
+
+  image_window   = gimp_display_shell_get_window (shell);
+  dialog_factory = gimp_dock_container_get_dialog_factory (GIMP_DOCK_CONTAINER (image_window));
+
+  if (text_tool->image)
+    gimp_image_get_resolution (text_tool->image, &xres, &yres);
+
+  text_tool->editor_dialog =
+    gimp_text_options_editor_new (parent, tool->tool_info->gimp, options,
+                                  gimp_dialog_factory_get_menu_factory (dialog_factory),
+                                  _("GIMP Text Editor"),
+                                  text_tool->proxy, text_tool->buffer,
+                                  xres, yres);
+
+  g_object_add_weak_pointer (G_OBJECT (text_tool->editor_dialog),
+                             (gpointer) &text_tool->editor_dialog);
+
+  gimp_dialog_factory_add_foreign (dialog_factory,
+                                   "gimp-text-tool-dialog",
+                                   text_tool->editor_dialog,
+                                   gtk_widget_get_screen (GTK_WIDGET (image_window)),
+                                   gimp_widget_get_monitor (GTK_WIDGET (image_window)));
+
+  g_signal_connect (text_tool->editor_dialog, "destroy",
+                    G_CALLBACK (gimp_text_tool_editor_destroy),
+                    text_tool);
+
+  gtk_widget_show (text_tool->editor_dialog);
+}
+
+static void
+gimp_text_tool_editor_destroy (GtkWidget    *dialog,
+                               GimpTextTool *text_tool)
+{
+  GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+
+  g_object_set (options,
+                "use-editor", FALSE,
+                NULL);
+}
+
+static void
+gimp_text_tool_enter_text (GimpTextTool *text_tool,
+                           const gchar  *str)
+{
+  GtkTextBuffer *buffer      = GTK_TEXT_BUFFER (text_tool->buffer);
+  GList         *insert_tags = NULL;
+  GList         *remove_tags = NULL;
+  gboolean       had_selection;
+
+  had_selection = gtk_text_buffer_get_has_selection (buffer);
+
+  gtk_text_buffer_begin_user_action (buffer);
+
+  if (had_selection && text_tool->style_editor)
+    insert_tags = gimp_text_style_editor_list_tags (GIMP_TEXT_STYLE_EDITOR (text_tool->style_editor),
+                                                    &remove_tags);
+
+  gimp_text_tool_delete_selection (text_tool);
+
+  if (! had_selection && text_tool->overwrite_mode && strcmp (str, "\n"))
+    {
+      GtkTextIter cursor;
+
+      gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                        gtk_text_buffer_get_insert (buffer));
+
+      if (! gtk_text_iter_ends_line (&cursor))
+        gimp_text_tool_delete_from_cursor (text_tool, GTK_DELETE_CHARS, 1);
+    }
+
+  if (had_selection && text_tool->style_editor)
+    gimp_text_buffer_set_insert_tags (text_tool->buffer,
+                                      insert_tags, remove_tags);
+
+  gimp_text_buffer_insert (text_tool->buffer, str);
+
+  gtk_text_buffer_end_user_action (buffer);
+}
+
+static void
+gimp_text_tool_xy_to_iter (GimpTextTool *text_tool,
+                           gdouble       x,
+                           gdouble       y,
+                           GtkTextIter  *iter)
+{
+  PangoLayout *layout;
+  gint         offset_x;
+  gint         offset_y;
+  gint         index;
+  gint         trailing;
+
+  gimp_text_tool_ensure_layout (text_tool);
+
+  gimp_text_layout_untransform_point (text_tool->layout, &x, &y);
+
+  gimp_text_layout_get_offsets (text_tool->layout, &offset_x, &offset_y);
+  x -= offset_x;
+  y -= offset_y;
+
+  layout = gimp_text_layout_get_pango_layout (text_tool->layout);
+
+  gimp_text_tool_fix_position (text_tool, &x, &y);
+
+  pango_layout_xy_to_index (layout,
+                            x * PANGO_SCALE,
+                            y * PANGO_SCALE,
+                            &index, &trailing);
+
+  gimp_text_buffer_get_iter_at_index (text_tool->buffer, iter, index, TRUE);
+
+  if (trailing)
+    gtk_text_iter_forward_char (iter);
+}
+
+static void
+gimp_text_tool_im_preedit_start (GtkIMContext *context,
+                                 GimpTextTool *text_tool)
+{
+  GIMP_LOG (TEXT_EDITING, "preedit start");
+
+  text_tool->preedit_active = TRUE;
+}
+
+static void
+gimp_text_tool_im_preedit_end (GtkIMContext *context,
+                               GimpTextTool *text_tool)
+{
+  gimp_text_tool_delete_selection (text_tool);
+
+  text_tool->preedit_active = FALSE;
+
+  GIMP_LOG (TEXT_EDITING, "preedit end");
+}
+
+static void
+gimp_text_tool_im_preedit_changed (GtkIMContext *context,
+                                   GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  PangoAttrList *attrs;
+
+  GIMP_LOG (TEXT_EDITING, "preedit changed");
+
+  gtk_text_buffer_begin_user_action (buffer);
+
+  gimp_text_tool_im_delete_preedit (text_tool);
+
+  gimp_text_tool_delete_selection (text_tool);
+
+  gtk_im_context_get_preedit_string (context,
+                                     &text_tool->preedit_string, &attrs,
+                                     &text_tool->preedit_cursor);
+
+  if (text_tool->preedit_string && *text_tool->preedit_string)
+    {
+      PangoAttrIterator *attr_iter;
+      GtkTextIter        iter;
+      gint               i;
+
+      /* Save the preedit start position. */
+      gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+                                        gtk_text_buffer_get_insert (buffer));
+      text_tool->preedit_start = gtk_text_buffer_create_mark (buffer,
+                                                              "preedit-start",
+                                                              &iter, TRUE);
+
+      /* Loop through chunks of preedit text with different attributes. */
+      attr_iter = pango_attr_list_get_iterator (attrs);
+      do
+        {
+          gint attr_start;
+          gint attr_end;
+
+          pango_attr_iterator_range (attr_iter, &attr_start, &attr_end);
+          if (attr_start < strlen (text_tool->preedit_string))
+            {
+              GSList      *attrs_pos;
+              GtkTextMark *start_mark;
+              GtkTextIter  start;
+              GtkTextIter  end;
+
+              gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                                gtk_text_buffer_get_insert (buffer));
+              start_mark = gtk_text_buffer_create_mark (buffer,
+                                                        NULL,
+                                                        &start, TRUE);
+
+              gtk_text_buffer_begin_user_action (buffer);
+
+              /* Insert the preedit chunk at current cursor position. */
+              gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (text_tool->buffer),
+                                                text_tool->preedit_string + attr_start,
+                                                attr_end - attr_start);
+              gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                                start_mark);
+              gtk_text_buffer_delete_mark (buffer, start_mark);
+              gtk_text_buffer_get_iter_at_mark (buffer, &end,
+                                                gtk_text_buffer_get_insert (buffer));
+
+              /* Apply text attributes to preedit text. */
+              attrs_pos = pango_attr_iterator_get_attrs (attr_iter);
+              while (attrs_pos)
+                {
+                  PangoAttribute *attr = attrs_pos->data;
+
+                  if (attr)
+                    {
+                      switch (attr->klass->type)
+                        {
+                        case PANGO_ATTR_UNDERLINE:
+                          gtk_text_buffer_apply_tag (buffer,
+                                                     text_tool->buffer->preedit_underline_tag,
+                                                     &start, &end);
+                          break;
+                        case PANGO_ATTR_BACKGROUND:
+                        case PANGO_ATTR_FOREGROUND:
+                            {
+                              PangoAttrColor *color_attr = (PangoAttrColor *) attr;
+                              GimpRGB         color;
+
+                              color.r = (gdouble) color_attr->color.red / 65535.0;
+                              color.g = (gdouble) color_attr->color.green / 65535.0;
+                              color.b = (gdouble) color_attr->color.blue / 65535.0;
+
+                              if (attr->klass->type == PANGO_ATTR_BACKGROUND)
+                                {
+                                  gimp_text_buffer_set_preedit_bg_color (text_tool->buffer,
+                                                                         &start, &end,
+                                                                         &color);
+                                }
+                              else
+                                {
+                                  gimp_text_buffer_set_preedit_color (text_tool->buffer,
+                                                                      &start, &end,
+                                                                      &color);
+                                }
+                            }
+                          break;
+                        default:
+                          /* Unsupported tags. */
+                          break;
+                        }
+                    }
+
+                  attrs_pos = attrs_pos->next;
+                }
+
+              gtk_text_buffer_end_user_action (buffer);
+            }
+        }
+      while (pango_attr_iterator_next (attr_iter));
+
+      /* Save the preedit end position. */
+      gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+                                        gtk_text_buffer_get_insert (buffer));
+      text_tool->preedit_end = gtk_text_buffer_create_mark (buffer,
+                                                            "preedit-end",
+                                                            &iter, FALSE);
+
+      /* Move the cursor to the expected location. */
+      gtk_text_buffer_get_iter_at_mark (buffer, &iter, text_tool->preedit_start);
+      for (i = 0; i < text_tool->preedit_cursor; i++)
+        gtk_text_iter_forward_char (&iter);
+      gtk_text_buffer_place_cursor (buffer, &iter);
+
+      pango_attr_iterator_destroy (attr_iter);
+    }
+
+  pango_attr_list_unref (attrs);
+
+  gtk_text_buffer_end_user_action (buffer);
+}
+
+static void
+gimp_text_tool_im_commit (GtkIMContext *context,
+                          const gchar  *str,
+                          GimpTextTool *text_tool)
+{
+  gboolean preedit_active = text_tool->preedit_active;
+
+  gimp_text_tool_im_delete_preedit (text_tool);
+
+  /* Some IMEs would emit a preedit-commit before preedit-end.
+   * To keep undo consistency, we fake and end then immediate restart of
+   * preediting.
+   */
+  if (preedit_active)
+    gimp_text_tool_im_preedit_end (context, text_tool);
+
+  gimp_text_tool_enter_text (text_tool, str);
+
+  if (preedit_active)
+    gimp_text_tool_im_preedit_start (context, text_tool);
+}
+
+static gboolean
+gimp_text_tool_im_retrieve_surrounding (GtkIMContext *context,
+                                        GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    start;
+  GtkTextIter    end;
+  gint           pos;
+  gchar         *text;
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                    gtk_text_buffer_get_insert (buffer));
+  end = start;
+
+  pos = gtk_text_iter_get_line_index (&start);
+  gtk_text_iter_set_line_offset (&start, 0);
+  gtk_text_iter_forward_to_line_end (&end);
+
+  text = gtk_text_iter_get_slice (&start, &end);
+  gtk_im_context_set_surrounding (context, text, -1, pos);
+  g_free (text);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_text_tool_im_delete_surrounding (GtkIMContext *context,
+                                      gint          offset,
+                                      gint          n_chars,
+                                      GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+  GtkTextIter    start;
+  GtkTextIter    end;
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                    gtk_text_buffer_get_insert (buffer));
+  end = start;
+
+  gtk_text_iter_forward_chars (&start, offset);
+  gtk_text_iter_forward_chars (&end, offset + n_chars);
+
+  gtk_text_buffer_delete_interactive (buffer, &start, &end, TRUE);
+
+  return TRUE;
+}
+
+static void
+gimp_text_tool_im_delete_preedit (GimpTextTool *text_tool)
+{
+  if (text_tool->preedit_string)
+    {
+      if (*text_tool->preedit_string)
+        {
+          GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+          GtkTextIter    start;
+          GtkTextIter    end;
+
+          gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                            text_tool->preedit_start);
+          gtk_text_buffer_get_iter_at_mark (buffer, &end,
+                                            text_tool->preedit_end);
+
+          gtk_text_buffer_delete_interactive (buffer, &start, &end, TRUE);
+
+          gtk_text_buffer_delete_mark (buffer, text_tool->preedit_start);
+          gtk_text_buffer_delete_mark (buffer, text_tool->preedit_end);
+          text_tool->preedit_start = NULL;
+          text_tool->preedit_end = NULL;
+        }
+
+      g_clear_pointer (&text_tool->preedit_string, g_free);
+    }
+}
+
+static void
+gimp_text_tool_editor_copy_selection_to_clipboard (GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+
+  if (! text_tool->editor_dialog &&
+      gtk_text_buffer_get_has_selection (buffer))
+    {
+      GimpTool         *tool  = GIMP_TOOL (text_tool);
+      GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+      GtkClipboard     *clipboard;
+
+      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (shell),
+                                            GDK_SELECTION_PRIMARY);
+
+      gtk_text_buffer_copy_clipboard (buffer, clipboard);
+    }
+}
+
+static void
+gimp_text_tool_fix_position (GimpTextTool *text_tool,
+                             gdouble      *x,
+                             gdouble      *y)
+{
+  gint temp, width, height;
+
+  gimp_text_layout_get_size (text_tool->layout, &width, &height);
+  switch (gimp_text_tool_get_direction(text_tool))
+    {
+      case GIMP_TEXT_DIRECTION_RTL:
+      case GIMP_TEXT_DIRECTION_LTR:
+      break;
+      case GIMP_TEXT_DIRECTION_TTB_RTL:
+      case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+      temp = width - *x;
+      *x = *y;
+      *y = temp;
+      break;
+      case GIMP_TEXT_DIRECTION_TTB_LTR:
+      case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      temp = *x;
+      *x = height - *y;
+      *y = temp;
+      break;
+    }
+}
+
+static void
+gimp_text_tool_convert_gdkkeyevent (GimpTextTool *text_tool,
+                                    GdkEventKey  *kevent)
+{
+  switch (gimp_text_tool_get_direction (text_tool))
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+    case GIMP_TEXT_DIRECTION_RTL:
+      break;
+
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+#ifdef _WIN32
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Up:
+          kevent->hardware_keycode = 0x25;/* VK_LEFT */
+          kevent->keyval = GDK_KEY_Left;
+          break;
+        case GDK_KEY_Down:
+          kevent->hardware_keycode = 0x27;/* VK_RIGHT */
+          kevent->keyval = GDK_KEY_Right;
+          break;
+        case GDK_KEY_Left:
+          kevent->hardware_keycode = 0x28;/* VK_DOWN */
+          kevent->keyval = GDK_KEY_Down;
+          break;
+        case GDK_KEY_Right:
+          kevent->hardware_keycode = 0x26;/* VK_UP */
+          kevent->keyval = GDK_KEY_Up;
+          break;
+        }
+#else
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Up:
+          kevent->hardware_keycode = 113;
+          kevent->keyval = GDK_KEY_Left;
+          break;
+        case GDK_KEY_Down:
+          kevent->hardware_keycode = 114;
+          kevent->keyval = GDK_KEY_Right;
+          break;
+        case GDK_KEY_Left:
+          kevent->hardware_keycode = 116;
+          kevent->keyval = GDK_KEY_Down;
+          break;
+        case GDK_KEY_Right:
+          kevent->hardware_keycode = 111;
+          kevent->keyval = GDK_KEY_Up;
+          break;
+        }
+#endif
+      break;
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+#ifdef _WIN32
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Up:
+          kevent->hardware_keycode = 0x26;/* VK_UP */
+          kevent->keyval = GDK_KEY_Up;
+          break;
+        case GDK_KEY_Down:
+          kevent->hardware_keycode = 0x28;/* VK_DOWN */
+          kevent->keyval = GDK_KEY_Down;
+          break;
+        case GDK_KEY_Left:
+          kevent->hardware_keycode = 0x25;/* VK_LEFT */
+          kevent->keyval = GDK_KEY_Left;
+          break;
+        case GDK_KEY_Right:
+          kevent->hardware_keycode = 0x27;/* VK_RIGHT */
+          kevent->keyval = GDK_KEY_Right;
+          break;
+        }
+#else
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Up:
+          kevent->hardware_keycode = 114;
+          kevent->keyval = GDK_KEY_Right;
+          break;
+        case GDK_KEY_Down:
+          kevent->hardware_keycode = 113;
+          kevent->keyval = GDK_KEY_Left;
+          break;
+        case GDK_KEY_Left:
+          kevent->hardware_keycode = 111;
+          kevent->keyval = GDK_KEY_Up;
+          break;
+        case GDK_KEY_Right:
+          kevent->hardware_keycode = 116;
+          kevent->keyval = GDK_KEY_Down;
+          break;
+        }
+#endif
+      break;
+    }
+}
diff --git a/app/tools/gimptexttool-editor.h b/app/tools/gimptexttool-editor.h
new file mode 100644
index 0000000..e8e7d7d
--- /dev/null
+++ b/app/tools/gimptexttool-editor.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextTool
+ * Copyright (C) 2002-2010  Sven Neumann <sven@gimp.org>
+ *                          Daniel Eddeland <danedde@svn.gnome.org>
+ *                          Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_TOOL_EDITOR_H__
+#define __GIMP_TEXT_TOOL_EDITOR_H__
+
+
+void       gimp_text_tool_editor_init             (GimpTextTool        *text_tool);
+void       gimp_text_tool_editor_finalize         (GimpTextTool        *text_tool);
+
+void       gimp_text_tool_editor_start            (GimpTextTool        *text_tool);
+void       gimp_text_tool_editor_position         (GimpTextTool        *text_tool);
+void       gimp_text_tool_editor_halt             (GimpTextTool        *text_tool);
+
+void       gimp_text_tool_editor_button_press     (GimpTextTool        *text_tool,
+                                                   gdouble              x,
+                                                   gdouble              y,
+                                                   GimpButtonPressType  press_type);
+void       gimp_text_tool_editor_button_release   (GimpTextTool        *text_tool);
+void       gimp_text_tool_editor_motion           (GimpTextTool        *text_tool,
+                                                   gdouble              x,
+                                                   gdouble              y);
+gboolean   gimp_text_tool_editor_key_press        (GimpTextTool        *text_tool,
+                                                   GdkEventKey         *kevent);
+gboolean   gimp_text_tool_editor_key_release      (GimpTextTool        *text_tool,
+                                                   GdkEventKey         *kevent);
+
+void       gimp_text_tool_reset_im_context        (GimpTextTool        *text_tool);
+void       gimp_text_tool_abort_im_context        (GimpTextTool        *text_tool);
+
+void       gimp_text_tool_editor_get_cursor_rect  (GimpTextTool        *text_tool,
+                                                   gboolean             overwrite,
+                                                   PangoRectangle      *cursor_rect);
+void       gimp_text_tool_editor_update_im_cursor (GimpTextTool        *text_tool);
+
+
+#endif /* __GIMP_TEXT_TOOL_EDITOR_H__ */
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
new file mode 100644
index 0000000..45023ab
--- /dev/null
+++ b/app/tools/gimptexttool.c
@@ -0,0 +1,2388 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextTool
+ * Copyright (C) 2002-2010  Sven Neumann <sven@gimp.org>
+ *                          Daniel Eddeland <danedde@svn.gnome.org>
+ *                          Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpasyncset.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimp-palettes.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpundostack.h"
+
+#include "text/gimptext.h"
+#include "text/gimptext-vectors.h"
+#include "text/gimptextlayer.h"
+#include "text/gimptextlayout.h"
+#include "text/gimptextundo.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-warp.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpdockcontainer.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimptextbuffer.h"
+#include "widgets/gimpuimanager.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "display/gimpcanvasgroup.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolrectangle.h"
+
+#include "gimptextoptions.h"
+#include "gimptexttool.h"
+#include "gimptexttool-editor.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-intl.h"
+
+
+#define TEXT_UNDO_TIMEOUT 3
+
+
+/*  local function prototypes  */
+
+static void      gimp_text_tool_constructed     (GObject           *object);
+static void      gimp_text_tool_finalize        (GObject           *object);
+
+static void      gimp_text_tool_control         (GimpTool          *tool,
+                                                 GimpToolAction     action,
+                                                 GimpDisplay       *display);
+static void      gimp_text_tool_button_press    (GimpTool          *tool,
+                                                 const GimpCoords  *coords,
+                                                 guint32            time,
+                                                 GdkModifierType    state,
+                                                 GimpButtonPressType  press_type,
+                                                 GimpDisplay       *display);
+static void      gimp_text_tool_button_release  (GimpTool          *tool,
+                                                 const GimpCoords  *coords,
+                                                 guint32            time,
+                                                 GdkModifierType    state,
+                                                 GimpButtonReleaseType release_type,
+                                                 GimpDisplay       *display);
+static void      gimp_text_tool_motion          (GimpTool          *tool,
+                                                 const GimpCoords  *coords,
+                                                 guint32            time,
+                                                 GdkModifierType    state,
+                                                 GimpDisplay       *display);
+static gboolean  gimp_text_tool_key_press       (GimpTool          *tool,
+                                                 GdkEventKey       *kevent,
+                                                 GimpDisplay       *display);
+static gboolean  gimp_text_tool_key_release     (GimpTool          *tool,
+                                                 GdkEventKey       *kevent,
+                                                 GimpDisplay       *display);
+static void      gimp_text_tool_oper_update     (GimpTool          *tool,
+                                                 const GimpCoords  *coords,
+                                                 GdkModifierType    state,
+                                                 gboolean           proximity,
+                                                 GimpDisplay       *display);
+static void      gimp_text_tool_cursor_update   (GimpTool          *tool,
+                                                 const GimpCoords  *coords,
+                                                 GdkModifierType    state,
+                                                 GimpDisplay       *display);
+static GimpUIManager * gimp_text_tool_get_popup (GimpTool          *tool,
+                                                 const GimpCoords  *coords,
+                                                 GdkModifierType    state,
+                                                 GimpDisplay       *display,
+                                                 const gchar      **ui_path);
+
+static void      gimp_text_tool_draw            (GimpDrawTool      *draw_tool);
+static void      gimp_text_tool_draw_selection  (GimpDrawTool      *draw_tool);
+
+static gboolean  gimp_text_tool_start           (GimpTextTool      *text_tool,
+                                                 GimpDisplay       *display,
+                                                 GimpLayer         *layer,
+                                                 GError           **error);
+static void      gimp_text_tool_halt            (GimpTextTool      *text_tool);
+
+static void      gimp_text_tool_frame_item      (GimpTextTool      *text_tool);
+
+static void      gimp_text_tool_rectangle_response
+                                                (GimpToolRectangle *rectangle,
+                                                 gint               response_id,
+                                                 GimpTextTool      *text_tool);
+static void      gimp_text_tool_rectangle_change_complete
+                                                (GimpToolRectangle *rectangle,
+                                                 GimpTextTool      *text_tool);
+
+static void      gimp_text_tool_connect         (GimpTextTool      *text_tool,
+                                                 GimpTextLayer     *layer,
+                                                 GimpText          *text);
+
+static void      gimp_text_tool_layer_notify    (GimpTextLayer     *layer,
+                                                 const GParamSpec  *pspec,
+                                                 GimpTextTool      *text_tool);
+static void      gimp_text_tool_proxy_notify    (GimpText          *text,
+                                                 const GParamSpec  *pspec,
+                                                 GimpTextTool      *text_tool);
+
+static void      gimp_text_tool_text_notify     (GimpText          *text,
+                                                 const GParamSpec  *pspec,
+                                                 GimpTextTool      *text_tool);
+static void      gimp_text_tool_text_changed    (GimpText          *text,
+                                                 GimpTextTool      *text_tool);
+
+static void
+    gimp_text_tool_fonts_async_set_empty_notify (GimpAsyncSet      *async_set,
+                                                 GParamSpec        *pspec,
+                                                 GimpTextTool      *text_tool);
+
+static void      gimp_text_tool_apply_list      (GimpTextTool      *text_tool,
+                                                 GList             *pspecs);
+
+static void      gimp_text_tool_create_layer    (GimpTextTool      *text_tool,
+                                                 GimpText          *text);
+
+static void      gimp_text_tool_layer_changed   (GimpImage         *image,
+                                                 GimpTextTool      *text_tool);
+static void      gimp_text_tool_set_image       (GimpTextTool      *text_tool,
+                                                 GimpImage         *image);
+static gboolean  gimp_text_tool_set_drawable    (GimpTextTool      *text_tool,
+                                                 GimpDrawable      *drawable,
+                                                 gboolean           confirm);
+
+static void      gimp_text_tool_block_drawing   (GimpTextTool      *text_tool);
+static void      gimp_text_tool_unblock_drawing (GimpTextTool      *text_tool);
+
+static void    gimp_text_tool_buffer_begin_edit (GimpTextBuffer    *buffer,
+                                                 GimpTextTool      *text_tool);
+static void    gimp_text_tool_buffer_end_edit   (GimpTextBuffer    *buffer,
+                                                 GimpTextTool      *text_tool);
+
+static void    gimp_text_tool_buffer_color_applied
+                                                (GimpTextBuffer    *buffer,
+                                                 const GimpRGB     *color,
+                                                 GimpTextTool      *text_tool);
+
+
+G_DEFINE_TYPE (GimpTextTool, gimp_text_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_text_tool_parent_class
+
+
+void
+gimp_text_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_TEXT_TOOL,
+                GIMP_TYPE_TEXT_OPTIONS,
+                gimp_text_options_gui,
+                GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                GIMP_CONTEXT_PROP_MASK_FONT       |
+                GIMP_CONTEXT_PROP_MASK_PALETTE /* for the color popup's palette tab */,
+                "gimp-text-tool",
+                _("Text"),
+                _("Text Tool: Create or edit text layers"),
+                N_("Te_xt"), "T",
+                NULL, GIMP_HELP_TOOL_TEXT,
+                GIMP_ICON_TOOL_TEXT,
+                data);
+}
+
+static void
+gimp_text_tool_class_init (GimpTextToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->constructed    = gimp_text_tool_constructed;
+  object_class->finalize       = gimp_text_tool_finalize;
+
+  tool_class->control          = gimp_text_tool_control;
+  tool_class->button_press     = gimp_text_tool_button_press;
+  tool_class->motion           = gimp_text_tool_motion;
+  tool_class->button_release   = gimp_text_tool_button_release;
+  tool_class->key_press        = gimp_text_tool_key_press;
+  tool_class->key_release      = gimp_text_tool_key_release;
+  tool_class->oper_update      = gimp_text_tool_oper_update;
+  tool_class->cursor_update    = gimp_text_tool_cursor_update;
+  tool_class->get_popup        = gimp_text_tool_get_popup;
+
+  draw_tool_class->draw        = gimp_text_tool_draw;
+}
+
+static void
+gimp_text_tool_init (GimpTextTool *text_tool)
+{
+  GimpTool *tool = GIMP_TOOL (text_tool);
+
+  text_tool->buffer = gimp_text_buffer_new ();
+
+  g_signal_connect (text_tool->buffer, "begin-user-action",
+                    G_CALLBACK (gimp_text_tool_buffer_begin_edit),
+                    text_tool);
+  g_signal_connect (text_tool->buffer, "end-user-action",
+                    G_CALLBACK (gimp_text_tool_buffer_end_edit),
+                    text_tool);
+  g_signal_connect (text_tool->buffer, "color-applied",
+                    G_CALLBACK (gimp_text_tool_buffer_color_applied),
+                    text_tool);
+
+  text_tool->handle_rectangle_change_complete = TRUE;
+
+  gimp_text_tool_editor_init (text_tool);
+
+  gimp_tool_control_set_scroll_lock          (tool->control, TRUE);
+  gimp_tool_control_set_handle_empty_image   (tool->control, TRUE);
+  gimp_tool_control_set_wants_click          (tool->control, TRUE);
+  gimp_tool_control_set_wants_double_click   (tool->control, TRUE);
+  gimp_tool_control_set_wants_triple_click   (tool->control, TRUE);
+  gimp_tool_control_set_wants_all_key_events (tool->control, TRUE);
+  gimp_tool_control_set_active_modifiers     (tool->control,
+                                              GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE);
+  gimp_tool_control_set_precision            (tool->control,
+                                              GIMP_CURSOR_PRECISION_PIXEL_BORDER);
+  gimp_tool_control_set_tool_cursor          (tool->control,
+                                              GIMP_TOOL_CURSOR_TEXT);
+  gimp_tool_control_set_action_object_1      (tool->control,
+                                              "context/context-font-select-set");
+}
+
+static void
+gimp_text_tool_constructed (GObject *object)
+{
+  GimpTextTool    *text_tool = GIMP_TEXT_TOOL (object);
+  GimpTextOptions *options   = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+  GimpTool        *tool      = GIMP_TOOL (text_tool);
+  GimpAsyncSet    *async_set;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  text_tool->proxy = g_object_new (GIMP_TYPE_TEXT, NULL);
+
+  gimp_text_options_connect_text (options, text_tool->proxy);
+
+  g_signal_connect_object (text_tool->proxy, "notify",
+                           G_CALLBACK (gimp_text_tool_proxy_notify),
+                           text_tool, 0);
+
+  async_set =
+    gimp_data_factory_get_async_set (tool->tool_info->gimp->font_factory);
+
+  g_signal_connect_object (async_set,
+                           "notify::empty",
+                           G_CALLBACK (gimp_text_tool_fonts_async_set_empty_notify),
+                           text_tool, 0);
+}
+
+static void
+gimp_text_tool_finalize (GObject *object)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (object);
+
+  g_clear_object (&text_tool->proxy);
+  g_clear_object (&text_tool->buffer);
+  g_clear_object (&text_tool->ui_manager);
+
+  gimp_text_tool_editor_finalize (text_tool);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_tool_remove_empty_text_layer (GimpTextTool *text_tool)
+{
+  GimpTextLayer *text_layer = text_tool->layer;
+
+  if (text_layer && text_layer->auto_rename)
+    {
+      GimpText *text = gimp_text_layer_get_text (text_layer);
+
+      if (text && text->box_mode == GIMP_TEXT_BOX_DYNAMIC &&
+          (! text->text || text->text[0] == '\0') &&
+          (! text->markup || text->markup[0] == '\0'))
+        {
+          GimpImage *image = gimp_item_get_image (GIMP_ITEM (text_layer));
+
+          if (text_tool->image == image)
+            g_signal_handlers_block_by_func (image,
+                                             gimp_text_tool_layer_changed,
+                                             text_tool);
+
+          gimp_image_remove_layer (image, GIMP_LAYER (text_layer), TRUE, NULL);
+          gimp_image_flush (image);
+
+          if (text_tool->image == image)
+            g_signal_handlers_unblock_by_func (image,
+                                               gimp_text_tool_layer_changed,
+                                               text_tool);
+        }
+    }
+}
+
+static void
+gimp_text_tool_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_text_tool_halt (text_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_text_tool_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (tool);
+  GimpImage         *image     = gimp_display_get_image (display);
+  GimpText          *text      = text_tool->text;
+  GimpToolRectangle *rectangle;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+  if (tool->display && tool->display != display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+  if (! text_tool->widget)
+    {
+      GError *error = NULL;
+
+      if (! gimp_text_tool_start (text_tool, display, NULL, &error))
+        {
+          gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+          gimp_tool_message_literal (tool, display, error->message);
+
+          g_clear_error (&error);
+
+          return;
+        }
+
+      gimp_tool_widget_hover (text_tool->widget, coords, state, TRUE);
+
+      /* HACK: force CREATING on a newly created rectangle; otherwise,
+       * the above binding of properties would cause the rectangle to
+       * start with the size from tool options.
+       */
+      gimp_tool_rectangle_set_function (GIMP_TOOL_RECTANGLE (text_tool->widget),
+                                        GIMP_TOOL_RECTANGLE_CREATING);
+    }
+
+  rectangle = GIMP_TOOL_RECTANGLE (text_tool->widget);
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    {
+      gimp_tool_control_activate (tool->control);
+
+      /* clicking anywhere while a preedit is going on aborts the
+       * preedit, this is ugly but at least leaves everything in
+       * a consistent state
+       */
+      if (text_tool->preedit_active)
+        gimp_text_tool_abort_im_context (text_tool);
+      else
+        gimp_text_tool_reset_im_context (text_tool);
+
+      text_tool->selecting = FALSE;
+
+      if (gimp_tool_rectangle_point_in_rectangle (rectangle,
+                                                  coords->x,
+                                                  coords->y) &&
+          ! text_tool->moving)
+        {
+          gimp_tool_rectangle_set_function (rectangle,
+                                            GIMP_TOOL_RECTANGLE_DEAD);
+        }
+      else if (gimp_tool_widget_button_press (text_tool->widget, coords,
+                                              time, state, press_type))
+        {
+          text_tool->grab_widget = text_tool->widget;
+        }
+
+      /*  bail out now if the user user clicked on a handle of an
+       *  existing rectangle, but not inside an existing framed layer
+       */
+      if (gimp_tool_rectangle_get_function (rectangle) !=
+          GIMP_TOOL_RECTANGLE_CREATING)
+        {
+          if (text_tool->layer)
+            {
+              GimpItem *item = GIMP_ITEM (text_tool->layer);
+              gdouble   x    = coords->x - gimp_item_get_offset_x (item);
+              gdouble   y    = coords->y - gimp_item_get_offset_y (item);
+
+              if (x < 0 || x >= gimp_item_get_width  (item) ||
+                  y < 0 || y >= gimp_item_get_height (item))
+                {
+                  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+                  return;
+                }
+            }
+          else
+            {
+              gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+              return;
+            }
+        }
+
+      /* if the the click is not related to the currently edited text
+       * layer in any way, try to pick a text layer
+       */
+      if (! text_tool->moving &&
+          gimp_tool_rectangle_get_function (rectangle) ==
+          GIMP_TOOL_RECTANGLE_CREATING)
+        {
+          GimpTextLayer *text_layer;
+
+          text_layer = gimp_image_pick_text_layer (image, coords->x, coords->y);
+
+          if (text_layer && text_layer != text_tool->layer)
+            {
+              if (text_tool->image == image)
+                g_signal_handlers_block_by_func (image,
+                                                 gimp_text_tool_layer_changed,
+                                                 text_tool);
+
+              gimp_image_set_active_layer (image, GIMP_LAYER (text_layer));
+
+              if (text_tool->image == image)
+                g_signal_handlers_unblock_by_func (image,
+                                                   gimp_text_tool_layer_changed,
+                                                   text_tool);
+            }
+        }
+    }
+
+  if (gimp_image_coords_in_active_pickable (image, coords, FALSE, FALSE, FALSE))
+    {
+      GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+      GimpItem     *item     = GIMP_ITEM (drawable);
+      gdouble       x        = coords->x - gimp_item_get_offset_x (item);
+      gdouble       y        = coords->y - gimp_item_get_offset_y (item);
+
+      /*  did the user click on a text layer?  */
+      if (gimp_text_tool_set_drawable (text_tool, drawable, TRUE))
+        {
+          if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+            {
+              /*  if we clicked on a text layer while the tool was idle
+               *  (didn't show a rectangle), frame the layer and switch to
+               *  selecting instead of drawing a new rectangle
+               */
+              if (gimp_tool_rectangle_get_function (rectangle) ==
+                  GIMP_TOOL_RECTANGLE_CREATING)
+                {
+                  gimp_tool_rectangle_set_function (rectangle,
+                                                    GIMP_TOOL_RECTANGLE_DEAD);
+
+                  gimp_text_tool_frame_item (text_tool);
+                }
+
+              if (text_tool->text && text_tool->text != text)
+                {
+                  gimp_text_tool_editor_start (text_tool);
+                }
+            }
+
+          if (text_tool->text && ! text_tool->moving)
+            {
+              text_tool->selecting = TRUE;
+
+              gimp_text_tool_editor_button_press (text_tool, x, y, press_type);
+            }
+          else
+            {
+              text_tool->selecting = FALSE;
+            }
+
+          gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+          return;
+        }
+    }
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    {
+      /*  create a new text layer  */
+      text_tool->text_box_fixed = FALSE;
+
+      /* make sure the text tool has an image, even if the user didn't click
+       * inside the active drawable, in particular, so that the text style
+       * editor picks the correct resolution.
+       */
+      gimp_text_tool_set_image (text_tool, image);
+
+      gimp_text_tool_connect (text_tool, NULL, NULL);
+      gimp_text_tool_editor_start (text_tool);
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
+
+static void
+gimp_text_tool_button_release (GimpTool              *tool,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type,
+                               GimpDisplay           *display)
+{
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (tool);
+  GimpToolRectangle *rectangle = GIMP_TOOL_RECTANGLE (text_tool->widget);
+
+  gimp_tool_control_halt (tool->control);
+
+  if (text_tool->selecting)
+    {
+      /*  we are in a selection process (user has initially clicked on
+       *  an existing text layer), so finish the selection process and
+       *  ignore rectangle-change-complete.
+       */
+
+      /*  need to block "end-user-action" on the text buffer, because
+       *  GtkTextBuffer considers copying text to the clipboard an
+       *  undo-relevant user action, which is clearly a bug, but what
+       *  can we do...
+       */
+      g_signal_handlers_block_by_func (text_tool->buffer,
+                                       gimp_text_tool_buffer_begin_edit,
+                                       text_tool);
+      g_signal_handlers_block_by_func (text_tool->buffer,
+                                       gimp_text_tool_buffer_end_edit,
+                                       text_tool);
+
+      gimp_text_tool_editor_button_release (text_tool);
+
+      g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                         gimp_text_tool_buffer_end_edit,
+                                         text_tool);
+      g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                         gimp_text_tool_buffer_begin_edit,
+                                         text_tool);
+
+      text_tool->selecting = FALSE;
+
+      text_tool->handle_rectangle_change_complete = FALSE;
+
+      /*  there is no cancelling of selections yet  */
+      if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+        release_type = GIMP_BUTTON_RELEASE_NORMAL;
+    }
+  else if (text_tool->moving)
+    {
+      /*  the user has moved the text layer with Alt-drag, fall
+       *  through and let rectangle-change-complete do its job of
+       *  setting text layer's new position.
+       */
+    }
+  else if (gimp_tool_rectangle_get_function (rectangle) ==
+           GIMP_TOOL_RECTANGLE_DEAD)
+    {
+      /*  the user clicked in dead space (like between the corner and
+       *  edge handles, so completely ignore that.
+       */
+
+      text_tool->handle_rectangle_change_complete = FALSE;
+    }
+  else if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      /*  user has canceled the rectangle resizing, fall through
+       *  and let the rectangle handle restoring the previous size
+       */
+    }
+  else
+    {
+      gdouble x1, y1;
+      gdouble x2, y2;
+
+      /*  otherwise the user has clicked outside of any text layer in
+       *  order to create a new text, fall through and let
+       *  rectangle-change-complete do its job of setting the new text
+       *  layer's size.
+       */
+
+      g_object_get (rectangle,
+                    "x1", &x1,
+                    "y1", &y1,
+                    "x2", &x2,
+                    "y2", &y2,
+                    NULL);
+
+      if (release_type == GIMP_BUTTON_RELEASE_CLICK ||
+          (x2 - x1) < 3                             ||
+          (y2 - y1) < 3)
+        {
+          /*  unless the rectangle is unreasonably small to hold any
+           *  real text (the user has eitherjust clicked or just made
+           *  a rectangle of a few pixels), so set the text box to
+           *  dynamic and ignore rectangle-change-complete.
+           */
+
+          g_object_set (text_tool->proxy,
+                        "box-mode", GIMP_TEXT_BOX_DYNAMIC,
+                        NULL);
+
+          text_tool->handle_rectangle_change_complete = FALSE;
+        }
+    }
+
+  if (text_tool->grab_widget)
+    {
+      gimp_tool_widget_button_release (text_tool->grab_widget,
+                                       coords, time, state, release_type);
+      text_tool->grab_widget = NULL;
+    }
+
+  text_tool->handle_rectangle_change_complete = TRUE;
+}
+
+static void
+gimp_text_tool_motion (GimpTool         *tool,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state,
+                       GimpDisplay      *display)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
+
+  if (! text_tool->selecting)
+    {
+      if (text_tool->grab_widget)
+        {
+          gimp_tool_widget_motion (text_tool->grab_widget,
+                                   coords, time, state);
+        }
+    }
+  else
+    {
+      GimpItem *item = GIMP_ITEM (text_tool->layer);
+      gdouble   x    = coords->x - gimp_item_get_offset_x (item);
+      gdouble   y    = coords->y - gimp_item_get_offset_y (item);
+
+      gimp_text_tool_editor_motion (text_tool, x, y);
+    }
+}
+
+static gboolean
+gimp_text_tool_key_press (GimpTool    *tool,
+                          GdkEventKey *kevent,
+                          GimpDisplay *display)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
+
+  if (display == tool->display)
+    return gimp_text_tool_editor_key_press (text_tool, kevent);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_text_tool_key_release (GimpTool    *tool,
+                            GdkEventKey *kevent,
+                            GimpDisplay *display)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
+
+  if (display == tool->display)
+    return gimp_text_tool_editor_key_release (text_tool, kevent);
+
+  return FALSE;
+}
+
+static void
+gimp_text_tool_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (tool);
+  GimpToolRectangle *rectangle = GIMP_TOOL_RECTANGLE (text_tool->widget);
+
+  GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
+                                               proximity, display);
+
+  text_tool->moving = (text_tool->widget &&
+                       gimp_tool_rectangle_get_function (rectangle) ==
+                       GIMP_TOOL_RECTANGLE_MOVING &&
+                       (state & GDK_MOD1_MASK));
+}
+
+static void
+gimp_text_tool_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (tool);
+  GimpToolRectangle *rectangle = GIMP_TOOL_RECTANGLE (text_tool->widget);
+
+  if (rectangle && tool->display == display)
+    {
+      if (gimp_tool_rectangle_point_in_rectangle (rectangle,
+                                                  coords->x,
+                                                  coords->y) &&
+          ! text_tool->moving)
+        {
+          gimp_tool_set_cursor (tool, display,
+                                (GimpCursorType) GDK_XTERM,
+                                gimp_tool_control_get_tool_cursor (tool->control),
+                                GIMP_CURSOR_MODIFIER_NONE);
+        }
+      else
+        {
+          GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                         display);
+        }
+    }
+  else
+    {
+      GimpAsyncSet *async_set;
+
+      async_set =
+        gimp_data_factory_get_async_set (tool->tool_info->gimp->font_factory);
+
+      if (gimp_async_set_is_empty (async_set))
+        {
+          GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                         display);
+        }
+      else
+        {
+          gimp_tool_set_cursor (tool, display,
+                                gimp_tool_control_get_cursor (tool->control),
+                                gimp_tool_control_get_tool_cursor (tool->control),
+                                GIMP_CURSOR_MODIFIER_BAD);
+        }
+    }
+}
+
+static GimpUIManager *
+gimp_text_tool_get_popup (GimpTool         *tool,
+                          const GimpCoords *coords,
+                          GdkModifierType   state,
+                          GimpDisplay      *display,
+                          const gchar     **ui_path)
+{
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (tool);
+  GimpToolRectangle *rectangle = GIMP_TOOL_RECTANGLE (text_tool->widget);
+
+  if (rectangle &&
+      gimp_tool_rectangle_point_in_rectangle (rectangle,
+                                              coords->x,
+                                              coords->y))
+    {
+      if (! text_tool->ui_manager)
+        {
+          GimpDisplayShell  *shell = gimp_display_get_shell (tool->display);
+          GimpImageWindow   *image_window;
+          GimpDialogFactory *dialog_factory;
+          GtkWidget         *im_menu;
+          GList             *children;
+
+          image_window   = gimp_display_shell_get_window (shell);
+          dialog_factory = gimp_dock_container_get_dialog_factory (GIMP_DOCK_CONTAINER (image_window));
+
+          text_tool->ui_manager =
+            gimp_menu_factory_manager_new (gimp_dialog_factory_get_menu_factory (dialog_factory),
+                                           "<TextTool>",
+                                           text_tool, FALSE);
+
+          im_menu = gimp_ui_manager_get_widget (text_tool->ui_manager,
+                                                "/text-tool-popup/text-tool-input-methods-menu");
+
+          if (GTK_IS_MENU_ITEM (im_menu))
+            im_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (im_menu));
+
+          /*  hide the generated "empty" item  */
+          children = gtk_container_get_children (GTK_CONTAINER (im_menu));
+          while (children)
+            {
+              gtk_widget_hide (children->data);
+              children = g_list_remove (children, children->data);
+            }
+
+          gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_tool->im_context),
+                                                GTK_MENU_SHELL (im_menu));
+        }
+
+      gimp_ui_manager_update (text_tool->ui_manager, text_tool);
+
+      *ui_path = "/text-tool-popup";
+
+      return text_tool->ui_manager;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_text_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (draw_tool);
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+
+  if (! text_tool->text  ||
+      ! text_tool->layer ||
+      ! text_tool->layer->text)
+    {
+      gimp_text_tool_editor_update_im_cursor (text_tool);
+
+      return;
+    }
+
+  gimp_text_tool_ensure_layout (text_tool);
+
+  if (gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (text_tool->buffer)))
+    {
+      /* If the text buffer has a selection, highlight the selected letters */
+
+      gimp_text_tool_draw_selection (draw_tool);
+    }
+  else
+    {
+      /* If the text buffer has no selection, draw the text cursor */
+
+      GimpCanvasItem   *item;
+      PangoRectangle    cursor_rect;
+      gint              off_x, off_y;
+      gboolean          overwrite;
+      GimpTextDirection direction;
+
+      gimp_text_tool_editor_get_cursor_rect (text_tool,
+                                             text_tool->overwrite_mode,
+                                             &cursor_rect);
+
+      gimp_item_get_offset (GIMP_ITEM (text_tool->layer), &off_x, &off_y);
+      cursor_rect.x += off_x;
+      cursor_rect.y += off_y;
+
+      overwrite = text_tool->overwrite_mode && cursor_rect.width != 0;
+
+      direction = gimp_text_tool_get_direction (text_tool);
+
+      item = gimp_draw_tool_add_text_cursor (draw_tool, &cursor_rect,
+                                             overwrite, direction);
+      gimp_canvas_item_set_highlight (item, TRUE);
+    }
+
+  gimp_text_tool_editor_update_im_cursor (text_tool);
+}
+
+static void
+gimp_text_tool_draw_selection (GimpDrawTool *draw_tool)
+{
+  GimpTextTool     *text_tool = GIMP_TEXT_TOOL (draw_tool);
+  GtkTextBuffer    *buffer    = GTK_TEXT_BUFFER (text_tool->buffer);
+  GimpCanvasGroup  *group;
+  PangoLayout      *layout;
+  gint              offset_x;
+  gint              offset_y;
+  gint              width;
+  gint              height;
+  gint              off_x, off_y;
+  PangoLayoutIter  *iter;
+  GtkTextIter       sel_start, sel_end;
+  gint              min, max;
+  gint              i;
+  GimpTextDirection direction;
+
+  group = gimp_draw_tool_add_stroke_group (draw_tool);
+  gimp_canvas_item_set_highlight (GIMP_CANVAS_ITEM (group), TRUE);
+
+  gtk_text_buffer_get_selection_bounds (buffer, &sel_start, &sel_end);
+
+  min = gimp_text_buffer_get_iter_index (text_tool->buffer, &sel_start, TRUE);
+  max = gimp_text_buffer_get_iter_index (text_tool->buffer, &sel_end, TRUE);
+
+  layout = gimp_text_layout_get_pango_layout (text_tool->layout);
+
+  gimp_text_layout_get_offsets (text_tool->layout, &offset_x, &offset_y);
+
+  gimp_text_layout_get_size (text_tool->layout, &width, &height);
+
+  gimp_item_get_offset (GIMP_ITEM (text_tool->layer), &off_x, &off_y);
+  offset_x += off_x;
+  offset_y += off_y;
+
+  direction = gimp_text_tool_get_direction (text_tool);
+
+  iter = pango_layout_get_iter (layout);
+
+  gimp_draw_tool_push_group (draw_tool, group);
+
+  do
+    {
+      if (! pango_layout_iter_get_run (iter))
+        continue;
+
+      i = pango_layout_iter_get_index (iter);
+
+      if (i >= min && i < max)
+        {
+          PangoRectangle rect;
+          gint           ytop, ybottom;
+
+          pango_layout_iter_get_char_extents (iter, &rect);
+          pango_layout_iter_get_line_yrange (iter, &ytop, &ybottom);
+
+          rect.y      = ytop;
+          rect.height = ybottom - ytop;
+
+          pango_extents_to_pixels (&rect, NULL);
+
+          gimp_text_layout_transform_rect (text_tool->layout, &rect);
+
+          switch (direction)
+            {
+            case GIMP_TEXT_DIRECTION_LTR:
+            case GIMP_TEXT_DIRECTION_RTL:
+              rect.x += offset_x;
+              rect.y += offset_y;
+              gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                            rect.x, rect.y,
+                                            rect.width, rect.height);
+              break;
+            case GIMP_TEXT_DIRECTION_TTB_RTL:
+            case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+              rect.y = offset_x - rect.y + width;
+              rect.x = offset_y + rect.x;
+              gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                            rect.y, rect.x,
+                                            -rect.height, rect.width);
+              break;
+            case GIMP_TEXT_DIRECTION_TTB_LTR:
+            case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+              rect.y = offset_x + rect.y;
+              rect.x = offset_y - rect.x + height;
+              gimp_draw_tool_add_rectangle (draw_tool, FALSE,
+                                            rect.y, rect.x,
+                                            rect.height, -rect.width);
+              break;
+            }
+        }
+    }
+  while (pango_layout_iter_next_char (iter));
+
+  gimp_draw_tool_pop_group (draw_tool);
+
+  pango_layout_iter_free (iter);
+}
+
+static gboolean
+gimp_text_tool_start (GimpTextTool  *text_tool,
+                      GimpDisplay   *display,
+                      GimpLayer     *layer,
+                      GError       **error)
+{
+  GimpTool         *tool  = GIMP_TOOL (text_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (display);
+  GimpToolWidget   *widget;
+  GimpAsyncSet     *async_set;
+
+  async_set =
+    gimp_data_factory_get_async_set (tool->tool_info->gimp->font_factory);
+
+  if (! gimp_async_set_is_empty (async_set))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Fonts are still loading"));
+
+      return FALSE;
+    }
+
+  tool->display = display;
+
+  text_tool->widget = widget = gimp_tool_rectangle_new (shell);
+
+  g_object_set (widget,
+                "force-narrow-mode", TRUE,
+                "status-title",      _("Text box: "),
+                NULL);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), widget);
+
+  g_signal_connect (widget, "response",
+                    G_CALLBACK (gimp_text_tool_rectangle_response),
+                    text_tool);
+  g_signal_connect (widget, "change-complete",
+                    G_CALLBACK (gimp_text_tool_rectangle_change_complete),
+                    text_tool);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+
+  if (layer)
+    {
+      gimp_text_tool_frame_item (text_tool);
+      gimp_text_tool_editor_start (text_tool);
+      gimp_text_tool_editor_position (text_tool);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_text_tool_halt (GimpTextTool *text_tool)
+{
+  GimpTool *tool = GIMP_TOOL (text_tool);
+
+  gimp_text_tool_editor_halt (text_tool);
+  gimp_text_tool_clear_layout (text_tool);
+  gimp_text_tool_set_drawable (text_tool, NULL, FALSE);
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL);
+  g_clear_object (&text_tool->widget);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+}
+
+static void
+gimp_text_tool_frame_item (GimpTextTool *text_tool)
+{
+  g_return_if_fail (GIMP_IS_LAYER (text_tool->layer));
+
+  text_tool->handle_rectangle_change_complete = FALSE;
+
+  gimp_tool_rectangle_frame_item (GIMP_TOOL_RECTANGLE (text_tool->widget),
+                                  GIMP_ITEM (text_tool->layer));
+
+  text_tool->handle_rectangle_change_complete = TRUE;
+}
+
+static void
+gimp_text_tool_rectangle_response (GimpToolRectangle *rectangle,
+                                   gint               response_id,
+                                   GimpTextTool      *text_tool)
+{
+  GimpTool *tool = GIMP_TOOL (text_tool);
+
+  /* this happens when a newly created rectangle gets canceled,
+   * we have to shut down the tool
+   */
+  if (response_id == GIMP_TOOL_WIDGET_RESPONSE_CANCEL)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+}
+
+static void
+gimp_text_tool_rectangle_change_complete (GimpToolRectangle *rectangle,
+                                          GimpTextTool      *text_tool)
+{
+  gimp_text_tool_editor_position (text_tool);
+
+  if (text_tool->handle_rectangle_change_complete)
+    {
+      GimpItem *item = GIMP_ITEM (text_tool->layer);
+      gdouble   x1, y1;
+      gdouble   x2, y2;
+
+      if (! item)
+        {
+          /* we can't set properties for the text layer, because it
+           * isn't created until some text has been inserted, so we
+           * need to make a special note that will remind us what to
+           * do when we actually create the layer
+           */
+          text_tool->text_box_fixed = TRUE;
+
+          return;
+        }
+
+      g_object_get (rectangle,
+                    "x1", &x1,
+                    "y1", &y1,
+                    "x2", &x2,
+                    "y2", &y2,
+                    NULL);
+
+      if ((x2 - x1) != gimp_item_get_width  (item) ||
+          (y2 - y1) != gimp_item_get_height (item))
+        {
+          GimpUnit  box_unit = text_tool->proxy->box_unit;
+          gdouble   xres, yres;
+          gboolean  push_undo = TRUE;
+          GimpUndo *undo;
+
+          gimp_image_get_resolution (text_tool->image, &xres, &yres);
+
+          g_object_set (text_tool->proxy,
+                        "box-mode",   GIMP_TEXT_BOX_FIXED,
+                        "box-width",  gimp_pixels_to_units (x2 - x1,
+                                                            box_unit, xres),
+                        "box-height", gimp_pixels_to_units (y2 - y1,
+                                                            box_unit, yres),
+                        NULL);
+
+          undo = gimp_image_undo_can_compress (text_tool->image,
+                                               GIMP_TYPE_UNDO_STACK,
+                                               GIMP_UNDO_GROUP_TEXT);
+
+          if (undo &&
+              gimp_undo_get_age (undo) <= TEXT_UNDO_TIMEOUT &&
+              g_object_get_data (G_OBJECT (undo), "reshape-text-layer") == (gpointer) item)
+            push_undo = FALSE;
+
+          if (push_undo)
+            {
+              gimp_image_undo_group_start (text_tool->image, GIMP_UNDO_GROUP_TEXT,
+                                           _("Reshape Text Layer"));
+
+              undo = gimp_image_undo_can_compress (text_tool->image, GIMP_TYPE_UNDO_STACK,
+                                                   GIMP_UNDO_GROUP_TEXT);
+
+              if (undo)
+                g_object_set_data (G_OBJECT (undo), "reshape-text-layer",
+                                   (gpointer) item);
+            }
+
+          gimp_text_tool_block_drawing (text_tool);
+
+          gimp_item_translate (item,
+                               x1 - gimp_item_get_offset_x (item),
+                               y1 - gimp_item_get_offset_y (item),
+                               push_undo);
+          gimp_text_tool_apply (text_tool, push_undo);
+
+          gimp_text_tool_unblock_drawing (text_tool);
+
+          if (push_undo)
+            gimp_image_undo_group_end (text_tool->image);
+        }
+      else if (x1 != gimp_item_get_offset_x (item) ||
+               y1 != gimp_item_get_offset_y (item))
+        {
+          gimp_text_tool_block_drawing (text_tool);
+
+          gimp_text_tool_apply (text_tool, TRUE);
+
+          gimp_item_translate (item,
+                               x1 - gimp_item_get_offset_x (item),
+                               y1 - gimp_item_get_offset_y (item),
+                               TRUE);
+
+          gimp_text_tool_unblock_drawing (text_tool);
+
+          gimp_image_flush (text_tool->image);
+        }
+    }
+}
+
+static void
+gimp_text_tool_connect (GimpTextTool  *text_tool,
+                        GimpTextLayer *layer,
+                        GimpText      *text)
+{
+  GimpTool *tool = GIMP_TOOL (text_tool);
+
+  g_return_if_fail (text == NULL || (layer != NULL && layer->text == text));
+
+  if (text_tool->text != text)
+    {
+      GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (tool);
+
+      g_signal_handlers_block_by_func (text_tool->buffer,
+                                       gimp_text_tool_buffer_begin_edit,
+                                       text_tool);
+      g_signal_handlers_block_by_func (text_tool->buffer,
+                                       gimp_text_tool_buffer_end_edit,
+                                       text_tool);
+
+      if (text_tool->text)
+        {
+          g_signal_handlers_disconnect_by_func (text_tool->text,
+                                                gimp_text_tool_text_notify,
+                                                text_tool);
+          g_signal_handlers_disconnect_by_func (text_tool->text,
+                                                gimp_text_tool_text_changed,
+                                                text_tool);
+
+          if (text_tool->pending)
+            gimp_text_tool_apply (text_tool, TRUE);
+
+          g_clear_object (&text_tool->text);
+
+          g_object_set (text_tool->proxy,
+                        "text",   NULL,
+                        "markup", NULL,
+                        NULL);
+          gimp_text_buffer_set_text (text_tool->buffer, NULL);
+
+          gimp_text_tool_clear_layout (text_tool);
+        }
+
+      gimp_context_define_property (GIMP_CONTEXT (options),
+                                    GIMP_CONTEXT_PROP_FOREGROUND,
+                                    text != NULL);
+
+      if (text)
+        {
+          if (text->unit != text_tool->proxy->unit)
+            gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (options->size_entry),
+                                      text->unit);
+
+          gimp_config_sync (G_OBJECT (text), G_OBJECT (text_tool->proxy), 0);
+
+          if (text->markup)
+            gimp_text_buffer_set_markup (text_tool->buffer, text->markup);
+          else
+            gimp_text_buffer_set_text (text_tool->buffer, text->text);
+
+          gimp_text_tool_clear_layout (text_tool);
+
+          text_tool->text = g_object_ref (text);
+
+          g_signal_connect (text, "notify",
+                            G_CALLBACK (gimp_text_tool_text_notify),
+                            text_tool);
+          g_signal_connect (text, "changed",
+                            G_CALLBACK (gimp_text_tool_text_changed),
+                            text_tool);
+        }
+
+      g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                         gimp_text_tool_buffer_end_edit,
+                                         text_tool);
+      g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                         gimp_text_tool_buffer_begin_edit,
+                                         text_tool);
+    }
+
+  if (text_tool->layer != layer)
+    {
+      if (text_tool->layer)
+        {
+          g_signal_handlers_disconnect_by_func (text_tool->layer,
+                                                gimp_text_tool_layer_notify,
+                                                text_tool);
+
+          /*  don't try to remove the layer if it is not attached,
+           *  which can happen if we got here because the layer was
+           *  somehow deleted from the image (like by the user in the
+           *  layers dialog).
+           */
+          if (gimp_item_is_attached (GIMP_ITEM (text_tool->layer)))
+            gimp_text_tool_remove_empty_text_layer (text_tool);
+        }
+
+      text_tool->layer = layer;
+
+      if (layer)
+        {
+          g_signal_connect_object (text_tool->layer, "notify",
+                                   G_CALLBACK (gimp_text_tool_layer_notify),
+                                   text_tool, 0);
+        }
+    }
+}
+
+static void
+gimp_text_tool_layer_notify (GimpTextLayer    *layer,
+                             const GParamSpec *pspec,
+                             GimpTextTool     *text_tool)
+{
+  GimpTool *tool = GIMP_TOOL (text_tool);
+
+  if (! strcmp (pspec->name, "modified"))
+    {
+      if (layer->modified)
+        gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+    }
+  else if (! strcmp (pspec->name, "text"))
+    {
+      if (! layer->text)
+        gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+    }
+  else if (! strcmp (pspec->name, "offset-x") ||
+           ! strcmp (pspec->name, "offset-y"))
+    {
+      if (gimp_item_is_attached (GIMP_ITEM (layer)))
+        {
+          gimp_text_tool_block_drawing (text_tool);
+
+          gimp_text_tool_frame_item (text_tool);
+
+          gimp_text_tool_unblock_drawing (text_tool);
+        }
+    }
+}
+
+static gboolean
+gimp_text_tool_apply_idle (GimpTextTool *text_tool)
+{
+  text_tool->idle_id = 0;
+
+  gimp_text_tool_apply (text_tool, TRUE);
+
+  gimp_text_tool_unblock_drawing (text_tool);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_text_tool_proxy_notify (GimpText         *text,
+                             const GParamSpec *pspec,
+                             GimpTextTool     *text_tool)
+{
+  if (! text_tool->text)
+    return;
+
+  if ((pspec->flags & G_PARAM_READWRITE) == G_PARAM_READWRITE &&
+      pspec->owner_type == GIMP_TYPE_TEXT)
+    {
+      if (text_tool->preedit_active)
+        {
+          /* if there is a preedit going on, don't queue pending
+           * changes to be idle-applied with undo; instead, flush the
+           * pending queue (happens only when preedit starts), and
+           * apply the changes to text_tool->text directly. Preedit
+           * will *always* end by removing the preedit string, and if
+           * the preedit was committed, it will insert the resulting
+           * text, which will not trigger this if() any more.
+           */
+
+          GList *list = NULL;
+
+         /* if there are pending changes, apply them before applying
+           * preedit stuff directly (bypassing undo)
+           */
+          if (text_tool->pending)
+            {
+              gimp_text_tool_block_drawing (text_tool);
+              gimp_text_tool_apply (text_tool, TRUE);
+              gimp_text_tool_unblock_drawing (text_tool);
+            }
+
+          gimp_text_tool_block_drawing (text_tool);
+
+          list = g_list_append (list, (gpointer) pspec);
+          gimp_text_tool_apply_list (text_tool, list);
+          g_list_free (list);
+
+          gimp_text_tool_frame_item (text_tool);
+
+          gimp_image_flush (gimp_item_get_image (GIMP_ITEM (text_tool->layer)));
+
+          gimp_text_tool_unblock_drawing (text_tool);
+        }
+      else
+        {
+          /* else queue the property change for normal processing,
+           * including undo
+           */
+
+          text_tool->pending = g_list_append (text_tool->pending,
+                                              (gpointer) pspec);
+
+          if (! text_tool->idle_id)
+            {
+              gimp_text_tool_block_drawing (text_tool);
+
+              text_tool->idle_id =
+                g_idle_add_full (G_PRIORITY_LOW,
+                                 (GSourceFunc) gimp_text_tool_apply_idle,
+                                 text_tool,
+                                 NULL);
+            }
+        }
+    }
+}
+
+static void
+gimp_text_tool_text_notify (GimpText         *text,
+                            const GParamSpec *pspec,
+                            GimpTextTool     *text_tool)
+{
+  g_return_if_fail (text == text_tool->text);
+
+  /* an undo cancels all preedit operations */
+  if (text_tool->preedit_active)
+    gimp_text_tool_abort_im_context (text_tool);
+
+  gimp_text_tool_block_drawing (text_tool);
+
+  if ((pspec->flags & G_PARAM_READWRITE) == G_PARAM_READWRITE)
+    {
+      GValue value = G_VALUE_INIT;
+
+      g_value_init (&value, pspec->value_type);
+
+      g_object_get_property (G_OBJECT (text), pspec->name, &value);
+
+      g_signal_handlers_block_by_func (text_tool->proxy,
+                                       gimp_text_tool_proxy_notify,
+                                       text_tool);
+
+      g_object_set_property (G_OBJECT (text_tool->proxy), pspec->name, &value);
+
+      g_signal_handlers_unblock_by_func (text_tool->proxy,
+                                         gimp_text_tool_proxy_notify,
+                                         text_tool);
+
+      g_value_unset (&value);
+    }
+
+  /* if the text has changed, (probably because of an undo), we put
+   * the new text into the text buffer
+   */
+  if (strcmp (pspec->name, "text")   == 0 ||
+      strcmp (pspec->name, "markup") == 0)
+    {
+      g_signal_handlers_block_by_func (text_tool->buffer,
+                                       gimp_text_tool_buffer_begin_edit,
+                                       text_tool);
+      g_signal_handlers_block_by_func (text_tool->buffer,
+                                       gimp_text_tool_buffer_end_edit,
+                                       text_tool);
+
+      if (text->markup)
+        gimp_text_buffer_set_markup (text_tool->buffer, text->markup);
+      else
+        gimp_text_buffer_set_text (text_tool->buffer, text->text);
+
+      g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                         gimp_text_tool_buffer_end_edit,
+                                         text_tool);
+      g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                         gimp_text_tool_buffer_begin_edit,
+                                         text_tool);
+    }
+
+  gimp_text_tool_unblock_drawing (text_tool);
+}
+
+static void
+gimp_text_tool_text_changed (GimpText     *text,
+                             GimpTextTool *text_tool)
+{
+  gimp_text_tool_block_drawing (text_tool);
+
+  /* we need to redraw the rectangle in any case because whatever
+   * changes to the text can change its size
+   */
+  gimp_text_tool_frame_item (text_tool);
+
+  gimp_text_tool_unblock_drawing (text_tool);
+}
+
+static void
+gimp_text_tool_fonts_async_set_empty_notify (GimpAsyncSet *async_set,
+                                             GParamSpec   *pspec,
+                                             GimpTextTool *text_tool)
+{
+  GimpTool *tool = GIMP_TOOL (text_tool);
+
+  if (! gimp_async_set_is_empty (async_set) && tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+}
+
+static void
+gimp_text_tool_apply_list (GimpTextTool *text_tool,
+                           GList        *pspecs)
+{
+  GObject *src  = G_OBJECT (text_tool->proxy);
+  GObject *dest = G_OBJECT (text_tool->text);
+  GList   *list;
+
+  g_signal_handlers_block_by_func (dest,
+                                   gimp_text_tool_text_notify,
+                                   text_tool);
+  g_signal_handlers_block_by_func (dest,
+                                   gimp_text_tool_text_changed,
+                                   text_tool);
+
+  g_object_freeze_notify (dest);
+
+  for (list = pspecs; list; list = g_list_next (list))
+    {
+      const GParamSpec *pspec;
+      GValue            value = G_VALUE_INIT;
+
+      /*  look ahead and compress changes  */
+      if (list->next && list->next->data == list->data)
+        continue;
+
+      pspec = list->data;
+
+      g_value_init (&value, pspec->value_type);
+
+      g_object_get_property (src,  pspec->name, &value);
+      g_object_set_property (dest, pspec->name, &value);
+
+      g_value_unset (&value);
+    }
+
+  g_object_thaw_notify (dest);
+
+  g_signal_handlers_unblock_by_func (dest,
+                                     gimp_text_tool_text_notify,
+                                     text_tool);
+  g_signal_handlers_unblock_by_func (dest,
+                                     gimp_text_tool_text_changed,
+                                     text_tool);
+}
+
+static void
+gimp_text_tool_create_layer (GimpTextTool *text_tool,
+                             GimpText     *text)
+{
+  GimpTool  *tool  = GIMP_TOOL (text_tool);
+  GimpImage *image = gimp_display_get_image (tool->display);
+  GimpLayer *layer;
+  gdouble    x1, y1;
+  gdouble    x2, y2;
+
+  gimp_text_tool_block_drawing (text_tool);
+
+  if (text)
+    {
+      text = gimp_config_duplicate (GIMP_CONFIG (text));
+    }
+  else
+    {
+      gchar *string;
+
+      if (gimp_text_buffer_has_markup (text_tool->buffer))
+        {
+          string = gimp_text_buffer_get_markup (text_tool->buffer);
+
+          g_object_set (text_tool->proxy,
+                        "markup",   string,
+                        "box-mode", GIMP_TEXT_BOX_DYNAMIC,
+                        NULL);
+        }
+      else
+        {
+          string = gimp_text_buffer_get_text (text_tool->buffer);
+
+          g_object_set (text_tool->proxy,
+                        "text",     string,
+                        "box-mode", GIMP_TEXT_BOX_DYNAMIC,
+                        NULL);
+        }
+
+      g_free (string);
+
+      text = gimp_config_duplicate (GIMP_CONFIG (text_tool->proxy));
+    }
+
+  layer = gimp_text_layer_new (image, text);
+
+  g_object_unref (text);
+
+  if (! layer)
+    {
+      gimp_text_tool_unblock_drawing (text_tool);
+      return;
+    }
+
+  gimp_text_tool_connect (text_tool, GIMP_TEXT_LAYER (layer), text);
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TEXT,
+                               _("Add Text Layer"));
+
+  if (gimp_image_get_floating_selection (image))
+    {
+      g_signal_handlers_block_by_func (image,
+                                       gimp_text_tool_layer_changed,
+                                       text_tool);
+
+      floating_sel_anchor (gimp_image_get_floating_selection (image));
+
+      g_signal_handlers_unblock_by_func (image,
+                                         gimp_text_tool_layer_changed,
+                                         text_tool);
+    }
+
+  g_object_get (text_tool->widget,
+                "x1", &x1,
+                "y1", &y1,
+                "x2", &x2,
+                "y2", &y2,
+                NULL);
+
+  if (text_tool->text_box_fixed == FALSE)
+    {
+      if (text_tool->text &&
+          (text_tool->text->base_dir == GIMP_TEXT_DIRECTION_TTB_RTL ||
+           text_tool->text->base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT))
+        {
+          x1 -= gimp_item_get_width (GIMP_ITEM (layer));
+        }
+    }
+  gimp_item_set_offset (GIMP_ITEM (layer), x1, y1);
+
+  gimp_image_add_layer (image, layer,
+                        GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+  if (text_tool->text_box_fixed)
+    {
+      GimpUnit box_unit = text_tool->proxy->box_unit;
+      gdouble  xres, yres;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      g_object_set (text_tool->proxy,
+                    "box-mode",   GIMP_TEXT_BOX_FIXED,
+                    "box-width",  gimp_pixels_to_units (x2 - x1,
+                                                        box_unit, xres),
+                    "box-height", gimp_pixels_to_units (y2 - y1,
+                                                        box_unit, yres),
+                    NULL);
+
+      gimp_text_tool_apply (text_tool, TRUE); /* unblocks drawing */
+    }
+  else
+    {
+      gimp_text_tool_frame_item (text_tool);
+    }
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_flush (image);
+
+  gimp_text_tool_set_drawable (text_tool, GIMP_DRAWABLE (layer), FALSE);
+
+  gimp_text_tool_unblock_drawing (text_tool);
+}
+
+#define  RESPONSE_NEW 1
+
+static void
+gimp_text_tool_confirm_response (GtkWidget    *widget,
+                                 gint          response_id,
+                                 GimpTextTool *text_tool)
+{
+  GimpTextLayer *layer = text_tool->layer;
+
+  gtk_widget_destroy (widget);
+
+  if (layer && layer->text)
+    {
+      switch (response_id)
+        {
+        case RESPONSE_NEW:
+          gimp_text_tool_create_layer (text_tool, layer->text);
+          break;
+
+        case GTK_RESPONSE_ACCEPT:
+          gimp_text_tool_connect (text_tool, layer, layer->text);
+
+          /*  cause the text layer to be rerendered  */
+          g_object_notify (G_OBJECT (text_tool->proxy), "markup");
+
+          gimp_text_tool_editor_start (text_tool);
+          break;
+
+        default:
+          break;
+        }
+    }
+}
+
+static void
+gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
+{
+  GimpTool         *tool  = GIMP_TOOL (text_tool);
+  GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
+  GtkWidget        *dialog;
+  GtkWidget        *vbox;
+  GtkWidget        *label;
+
+  g_return_if_fail (text_tool->layer != NULL);
+
+  if (text_tool->confirm_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (text_tool->confirm_dialog));
+      return;
+    }
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (text_tool->layer),
+                                     GIMP_CONTEXT (gimp_tool_get_options (tool)),
+                                     _("Confirm Text Editing"),
+                                     "gimp-text-tool-confirm",
+                                     GIMP_ICON_LAYER_TEXT_LAYER,
+                                     _("Confirm Text Editing"),
+                                     GTK_WIDGET (shell),
+                                     gimp_standard_help_func, NULL,
+
+                                     _("Create _New Layer"), RESPONSE_NEW,
+                                     _("_Cancel"),           GTK_RESPONSE_CANCEL,
+                                     _("_Edit"),             GTK_RESPONSE_ACCEPT,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_NEW,
+                                           GTK_RESPONSE_ACCEPT,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gimp_text_tool_confirm_response),
+                    text_tool);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  label = gtk_label_new (_("The layer you selected is a text layer but "
+                           "it has been modified using other tools. "
+                           "Editing the layer with the text tool will "
+                           "discard these modifications."
+                           "\n\n"
+                           "You can edit the layer or create a new "
+                           "text layer from its text attributes."));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  gtk_widget_show (dialog);
+
+  text_tool->confirm_dialog = dialog;
+  g_signal_connect_swapped (dialog, "destroy",
+                            G_CALLBACK (g_nullify_pointer),
+                            &text_tool->confirm_dialog);
+}
+
+static void
+gimp_text_tool_layer_changed (GimpImage    *image,
+                              GimpTextTool *text_tool)
+{
+  GimpLayer *layer = gimp_image_get_active_layer (image);
+
+  if (layer != GIMP_LAYER (text_tool->layer))
+    {
+      GimpTool    *tool    = GIMP_TOOL (text_tool);
+      GimpDisplay *display = tool->display;
+
+      if (display)
+        {
+          gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+          if (gimp_text_tool_set_drawable (text_tool, GIMP_DRAWABLE (layer),
+                                           FALSE) &&
+              GIMP_LAYER (text_tool->layer) == layer)
+            {
+              GError *error = NULL;
+
+              if (! gimp_text_tool_start (text_tool, display, layer, &error))
+                {
+                  gimp_text_tool_set_drawable (text_tool, NULL, FALSE);
+
+                  gimp_tool_message_literal (tool, display, error->message);
+
+                  g_clear_error (&error);
+
+                  return;
+                }
+            }
+        }
+    }
+}
+
+static void
+gimp_text_tool_set_image (GimpTextTool *text_tool,
+                          GimpImage    *image)
+{
+  if (text_tool->image == image)
+    return;
+
+  if (text_tool->image)
+    {
+      g_signal_handlers_disconnect_by_func (text_tool->image,
+                                            gimp_text_tool_layer_changed,
+                                            text_tool);
+
+      g_object_remove_weak_pointer (G_OBJECT (text_tool->image),
+                                    (gpointer) &text_tool->image);
+    }
+
+  text_tool->image = image;
+
+  if (image)
+    {
+      GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+      gdouble          xres;
+      gdouble          yres;
+
+      g_object_add_weak_pointer (G_OBJECT (text_tool->image),
+                                 (gpointer) &text_tool->image);
+
+      g_signal_connect_object (text_tool->image, "active-layer-changed",
+                               G_CALLBACK (gimp_text_tool_layer_changed),
+                               text_tool, 0);
+
+      gimp_image_get_resolution (image, &xres, &yres);
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (options->size_entry), 0,
+                                      yres, FALSE);
+    }
+}
+
+static gboolean
+gimp_text_tool_set_drawable (GimpTextTool *text_tool,
+                             GimpDrawable *drawable,
+                             gboolean      confirm)
+{
+  GimpImage *image = NULL;
+
+  if (text_tool->confirm_dialog)
+    gtk_widget_destroy (text_tool->confirm_dialog);
+
+  if (drawable)
+    image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  gimp_text_tool_set_image (text_tool, image);
+
+  if (GIMP_IS_TEXT_LAYER (drawable) && GIMP_TEXT_LAYER (drawable)->text)
+    {
+      GimpTextLayer *layer = GIMP_TEXT_LAYER (drawable);
+
+      if (layer == text_tool->layer && layer->text == text_tool->text)
+        return TRUE;
+
+      if (layer->modified)
+        {
+          if (confirm)
+            {
+              gimp_text_tool_connect (text_tool, layer, NULL);
+              gimp_text_tool_confirm_dialog (text_tool);
+              return TRUE;
+            }
+        }
+      else
+        {
+          gimp_text_tool_connect (text_tool, layer, layer->text);
+          return TRUE;
+        }
+    }
+
+  gimp_text_tool_connect (text_tool, NULL, NULL);
+
+  return FALSE;
+}
+
+static void
+gimp_text_tool_block_drawing (GimpTextTool *text_tool)
+{
+  if (text_tool->drawing_blocked == 0)
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (text_tool));
+
+      gimp_text_tool_clear_layout (text_tool);
+    }
+
+  text_tool->drawing_blocked++;
+}
+
+static void
+gimp_text_tool_unblock_drawing (GimpTextTool *text_tool)
+{
+  g_return_if_fail (text_tool->drawing_blocked > 0);
+
+  text_tool->drawing_blocked--;
+
+  if (text_tool->drawing_blocked == 0)
+    gimp_draw_tool_resume (GIMP_DRAW_TOOL (text_tool));
+}
+
+static void
+gimp_text_tool_buffer_begin_edit (GimpTextBuffer *buffer,
+                                  GimpTextTool   *text_tool)
+{
+  gimp_text_tool_block_drawing (text_tool);
+}
+
+static void
+gimp_text_tool_buffer_end_edit (GimpTextBuffer *buffer,
+                                GimpTextTool   *text_tool)
+{
+  if (text_tool->text)
+    {
+      gchar *string;
+
+      if (gimp_text_buffer_has_markup (buffer))
+        {
+          string = gimp_text_buffer_get_markup (buffer);
+
+          g_object_set (text_tool->proxy,
+                        "markup", string,
+                        NULL);
+        }
+      else
+        {
+          string = gimp_text_buffer_get_text (buffer);
+
+          g_object_set (text_tool->proxy,
+                        "text", string,
+                        NULL);
+        }
+
+      g_free (string);
+    }
+  else
+    {
+      gimp_text_tool_create_layer (text_tool, NULL);
+    }
+
+  gimp_text_tool_unblock_drawing (text_tool);
+}
+
+static void
+gimp_text_tool_buffer_color_applied (GimpTextBuffer *buffer,
+                                     const GimpRGB  *color,
+                                     GimpTextTool   *text_tool)
+{
+  gimp_palettes_add_color_history (GIMP_TOOL (text_tool)->tool_info->gimp,
+                                   color);
+}
+
+
+/*  public functions  */
+
+void
+gimp_text_tool_clear_layout (GimpTextTool *text_tool)
+{
+  g_clear_object (&text_tool->layout);
+}
+
+gboolean
+gimp_text_tool_ensure_layout (GimpTextTool *text_tool)
+{
+  if (! text_tool->layout && text_tool->text)
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (text_tool->layer));
+      gdouble    xres;
+      gdouble    yres;
+      GError    *error = NULL;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      text_tool->layout = gimp_text_layout_new (text_tool->layer->text,
+                                                xres, yres, &error);
+      if (error)
+        {
+          gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_error_free (error);
+        }
+    }
+
+  return text_tool->layout != NULL;
+}
+
+void
+gimp_text_tool_apply (GimpTextTool *text_tool,
+                      gboolean      push_undo)
+{
+  const GParamSpec *pspec = NULL;
+  GimpImage        *image;
+  GimpTextLayer    *layer;
+  GList            *list;
+  gboolean          undo_group = FALSE;
+
+  if (text_tool->idle_id)
+    {
+      g_source_remove (text_tool->idle_id);
+      text_tool->idle_id = 0;
+
+      gimp_text_tool_unblock_drawing (text_tool);
+    }
+
+  g_return_if_fail (text_tool->text != NULL);
+  g_return_if_fail (text_tool->layer != NULL);
+
+  layer = text_tool->layer;
+  image = gimp_item_get_image (GIMP_ITEM (layer));
+
+  g_return_if_fail (layer->text == text_tool->text);
+
+  /*  Walk over the list of changes and figure out if we are changing
+   *  a single property or need to push a full text undo.
+   */
+  for (list = text_tool->pending;
+       list && list->next && list->next->data == list->data;
+       list = list->next)
+    /* do nothing */;
+
+  if (g_list_length (list) == 1)
+    pspec = list->data;
+
+  /*  If we are changing a single property, we don't need to push
+   *  an undo if all of the following is true:
+   *   - the redo stack is empty
+   *   - the last item on the undo stack is a text undo
+   *   - the last undo changed the same text property on the same layer
+   *   - the last undo happened less than TEXT_UNDO_TIMEOUT seconds ago
+   */
+  if (pspec)
+    {
+      GimpUndo *undo = gimp_image_undo_can_compress (image, GIMP_TYPE_TEXT_UNDO,
+                                                     GIMP_UNDO_TEXT_LAYER);
+
+      if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+        {
+          GimpTextUndo *text_undo = GIMP_TEXT_UNDO (undo);
+
+          if (text_undo->pspec == pspec)
+            {
+              if (gimp_undo_get_age (undo) < TEXT_UNDO_TIMEOUT)
+                {
+                  GimpTool    *tool = GIMP_TOOL (text_tool);
+                  GimpContext *context;
+
+                  context = GIMP_CONTEXT (gimp_tool_get_options (tool));
+
+                  push_undo = FALSE;
+                  gimp_undo_reset_age (undo);
+                  gimp_undo_refresh_preview (undo, context);
+                }
+            }
+        }
+    }
+
+  if (push_undo)
+    {
+      if (layer->modified)
+        {
+          undo_group = TRUE;
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TEXT, NULL);
+
+          gimp_image_undo_push_text_layer_modified (image, NULL, layer);
+
+          /*  see comment in gimp_text_layer_set()  */
+          gimp_image_undo_push_drawable_mod (image, NULL,
+                                             GIMP_DRAWABLE (layer), TRUE);
+        }
+
+      gimp_image_undo_push_text_layer (image, NULL, layer, pspec);
+    }
+
+  gimp_text_tool_apply_list (text_tool, list);
+
+  g_list_free (text_tool->pending);
+  text_tool->pending = NULL;
+
+  if (push_undo)
+    {
+      g_object_set (layer, "modified", FALSE, NULL);
+
+      if (undo_group)
+        gimp_image_undo_group_end (image);
+    }
+
+  gimp_text_tool_frame_item (text_tool);
+
+  gimp_image_flush (image);
+}
+
+gboolean
+gimp_text_tool_set_layer (GimpTextTool *text_tool,
+                          GimpLayer    *layer)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_TOOL (text_tool), FALSE);
+  g_return_val_if_fail (layer == NULL || GIMP_IS_LAYER (layer), FALSE);
+
+  if (layer == GIMP_LAYER (text_tool->layer))
+    return TRUE;
+
+  /*  FIXME this function works, and I have no clue why: first we set
+   *  the drawable, then we HALT the tool and start() it without
+   *  re-setting the drawable. Why this works perfectly anyway when
+   *  double clicking a text layer in the layers dialog... no idea.
+   */
+  if (gimp_text_tool_set_drawable (text_tool, GIMP_DRAWABLE (layer), TRUE))
+    {
+      GimpTool    *tool = GIMP_TOOL (text_tool);
+      GimpItem    *item = GIMP_ITEM (layer);
+      GimpContext *context;
+      GimpDisplay *display;
+
+      context = gimp_get_user_context (tool->tool_info->gimp);
+      display = gimp_context_get_display (context);
+
+      if (! display ||
+          gimp_display_get_image (display) != gimp_item_get_image (item))
+        {
+          GList *list;
+
+          display = NULL;
+
+          for (list = gimp_get_display_iter (tool->tool_info->gimp);
+               list;
+               list = g_list_next (list))
+            {
+              display = list->data;
+
+              if (gimp_display_get_image (display) == gimp_item_get_image (item))
+                {
+                  gimp_context_set_display (context, display);
+                  break;
+                }
+
+              display = NULL;
+            }
+        }
+
+      if (tool->display)
+        gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+      if (display)
+        {
+          GError *error = NULL;
+
+          if (! gimp_text_tool_start (text_tool, display, layer, &error))
+            {
+              gimp_text_tool_set_drawable (text_tool, NULL, FALSE);
+
+              gimp_tool_message_literal (tool, display, error->message);
+
+              g_clear_error (&error);
+
+              return FALSE;
+            }
+
+          tool->drawable = GIMP_DRAWABLE (layer);
+        }
+    }
+
+  return TRUE;
+}
+
+gboolean
+gimp_text_tool_get_has_text_selection (GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+
+  return gtk_text_buffer_get_has_selection (buffer);
+}
+
+void
+gimp_text_tool_delete_selection (GimpTextTool *text_tool)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
+    }
+}
+
+void
+gimp_text_tool_cut_clipboard (GimpTextTool *text_tool)
+{
+  GimpDisplayShell *shell;
+  GtkClipboard     *clipboard;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+
+  shell = gimp_display_get_shell (GIMP_TOOL (text_tool)->display);
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (shell),
+                                        GDK_SELECTION_CLIPBOARD);
+
+  gtk_text_buffer_cut_clipboard (GTK_TEXT_BUFFER (text_tool->buffer),
+                                 clipboard, TRUE);
+}
+
+void
+gimp_text_tool_copy_clipboard (GimpTextTool *text_tool)
+{
+  GimpDisplayShell *shell;
+  GtkClipboard     *clipboard;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+
+  shell = gimp_display_get_shell (GIMP_TOOL (text_tool)->display);
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (shell),
+                                        GDK_SELECTION_CLIPBOARD);
+
+  /*  need to block "end-user-action" on the text buffer, because
+   *  GtkTextBuffer considers copying text to the clipboard an
+   *  undo-relevant user action, which is clearly a bug, but what
+   *  can we do...
+   */
+  g_signal_handlers_block_by_func (text_tool->buffer,
+                                   gimp_text_tool_buffer_begin_edit,
+                                   text_tool);
+  g_signal_handlers_block_by_func (text_tool->buffer,
+                                   gimp_text_tool_buffer_end_edit,
+                                   text_tool);
+
+  gtk_text_buffer_copy_clipboard (GTK_TEXT_BUFFER (text_tool->buffer),
+                                  clipboard);
+
+  g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                     gimp_text_tool_buffer_end_edit,
+                                     text_tool);
+  g_signal_handlers_unblock_by_func (text_tool->buffer,
+                                     gimp_text_tool_buffer_begin_edit,
+                                     text_tool);
+}
+
+void
+gimp_text_tool_paste_clipboard (GimpTextTool *text_tool)
+{
+  GimpDisplayShell *shell;
+  GtkClipboard     *clipboard;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+
+  shell = gimp_display_get_shell (GIMP_TOOL (text_tool)->display);
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (shell),
+                                        GDK_SELECTION_CLIPBOARD);
+
+  gtk_text_buffer_paste_clipboard (GTK_TEXT_BUFFER (text_tool->buffer),
+                                   clipboard, NULL, TRUE);
+}
+
+void
+gimp_text_tool_create_vectors (GimpTextTool *text_tool)
+{
+  GimpVectors *vectors;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+
+  if (! text_tool->text || ! text_tool->image)
+    return;
+
+  vectors = gimp_text_vectors_new (text_tool->image, text_tool->text);
+
+  if (text_tool->layer)
+    {
+      gint x, y;
+
+      gimp_item_get_offset (GIMP_ITEM (text_tool->layer), &x, &y);
+      gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
+    }
+
+  gimp_image_add_vectors (text_tool->image, vectors,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+  gimp_image_flush (text_tool->image);
+}
+
+void
+gimp_text_tool_create_vectors_warped (GimpTextTool *text_tool)
+{
+  GimpVectors       *vectors0;
+  GimpVectors       *vectors;
+  gdouble            box_width;
+  gdouble            box_height;
+  GimpTextDirection  dir;
+  gdouble            offset = 0.0;
+
+  g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
+
+  if (! text_tool->text || ! text_tool->image || ! text_tool->layer)
+    return;
+
+  box_width  = gimp_item_get_width  (GIMP_ITEM (text_tool->layer));
+  box_height = gimp_item_get_height (GIMP_ITEM (text_tool->layer));
+
+  vectors0 = gimp_image_get_active_vectors (text_tool->image);
+  if (! vectors0)
+    return;
+
+  vectors = gimp_text_vectors_new (text_tool->image, text_tool->text);
+
+  offset = 0;
+  dir = gimp_text_tool_get_direction (text_tool);
+  switch (dir)
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+    case GIMP_TEXT_DIRECTION_RTL:
+      offset = 0.5 * box_height;
+      break;
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      {
+        GimpStroke *stroke = NULL;
+
+        while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+          {
+            gimp_stroke_rotate (stroke, 0, 0, 270);
+            gimp_stroke_translate (stroke, 0, box_width);
+          }
+      }
+      offset = 0.5 * box_width;
+      break;
+    }
+
+  gimp_vectors_warp_vectors (vectors0, vectors, offset);
+
+  gimp_item_set_visible (GIMP_ITEM (vectors), TRUE, FALSE);
+
+  gimp_image_add_vectors (text_tool->image, vectors,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+  gimp_image_flush (text_tool->image);
+}
+
+GimpTextDirection
+gimp_text_tool_get_direction  (GimpTextTool *text_tool)
+{
+  GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
+  return options->base_dir;
+}
diff --git a/app/tools/gimptexttool.h b/app/tools/gimptexttool.h
new file mode 100644
index 0000000..b939d18
--- /dev/null
+++ b/app/tools/gimptexttool.h
@@ -0,0 +1,132 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextTool
+ * Copyright (C) 2002-2010  Sven Neumann <sven@gimp.org>
+ *                          Daniel Eddeland <danedde@svn.gnome.org>
+ *                          Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_TOOL_H__
+#define __GIMP_TEXT_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_TEXT_TOOL            (gimp_text_tool_get_type ())
+#define GIMP_TEXT_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_TOOL, GimpTextTool))
+#define GIMP_IS_TEXT_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_TOOL))
+#define GIMP_TEXT_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_TOOL, GimpTextToolClass))
+#define GIMP_IS_TEXT_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_TOOL))
+
+#define GIMP_TEXT_TOOL_GET_OPTIONS(t)  (GIMP_TEXT_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpTextTool       GimpTextTool;
+typedef struct _GimpTextToolClass  GimpTextToolClass;
+
+struct _GimpTextTool
+{
+  GimpDrawTool    parent_instance;
+
+  GimpText       *proxy;
+  GList          *pending;
+  guint           idle_id;
+
+  gboolean        moving;
+
+  GimpTextBuffer *buffer;
+
+  GimpText       *text;
+  GimpTextLayer  *layer;
+  GimpImage      *image;
+
+  GtkWidget      *confirm_dialog;
+  GimpUIManager  *ui_manager;
+
+  gboolean        handle_rectangle_change_complete;
+  gboolean        text_box_fixed;
+
+  GimpTextLayout *layout;
+  gint            drawing_blocked;
+
+  GimpToolWidget *widget;
+  GimpToolWidget *grab_widget;
+
+  /* text editor state: */
+
+  GtkWidget      *style_overlay;
+  GtkWidget      *style_editor;
+
+  gboolean        selecting;
+  GtkTextIter     select_start_iter;
+  gboolean        select_words;
+  gboolean        select_lines;
+
+  GtkIMContext   *im_context;
+  gboolean        needs_im_reset;
+
+  gboolean        preedit_active;
+  gchar          *preedit_string;
+  gint            preedit_cursor;
+  GtkTextMark    *preedit_start;
+  GtkTextMark    *preedit_end;
+
+  gboolean        overwrite_mode;
+  gint            x_pos;
+
+  GtkWidget      *offscreen_window;
+  GtkWidget      *proxy_text_view;
+
+  GtkWidget      *editor_dialog;
+};
+
+struct _GimpTextToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+void       gimp_text_tool_register               (GimpToolRegisterCallback  callback,
+                                                  gpointer                  data);
+
+GType      gimp_text_tool_get_type               (void) G_GNUC_CONST;
+
+gboolean   gimp_text_tool_set_layer              (GimpTextTool *text_tool,
+                                                  GimpLayer    *layer);
+
+gboolean   gimp_text_tool_get_has_text_selection (GimpTextTool *text_tool);
+
+void       gimp_text_tool_delete_selection       (GimpTextTool *text_tool);
+void       gimp_text_tool_cut_clipboard          (GimpTextTool *text_tool);
+void       gimp_text_tool_copy_clipboard         (GimpTextTool *text_tool);
+void       gimp_text_tool_paste_clipboard        (GimpTextTool *text_tool);
+
+void       gimp_text_tool_create_vectors         (GimpTextTool *text_tool);
+void       gimp_text_tool_create_vectors_warped  (GimpTextTool *text_tool);
+
+GimpTextDirection
+           gimp_text_tool_get_direction          (GimpTextTool *text_tool);
+
+/*  only for the text editor  */
+void       gimp_text_tool_clear_layout           (GimpTextTool *text_tool);
+gboolean   gimp_text_tool_ensure_layout          (GimpTextTool *text_tool);
+void       gimp_text_tool_apply                  (GimpTextTool *text_tool,
+                                                  gboolean      push_undo);
+
+
+#endif /* __GIMP_TEXT_TOOL_H__ */
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
new file mode 100644
index 0000000..3b21d72
--- /dev/null
+++ b/app/tools/gimpthresholdtool.c
@@ -0,0 +1,436 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-gui.h"
+#include "core/gimpasync.h"
+#include "core/gimpcancelable.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-histogram.h"
+#include "core/gimphistogram.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptriviallycancelablewaitable.h"
+#include "core/gimpwaitable.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimphistogrambox.h"
+#include "widgets/gimphistogramview.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimphistogramoptions.h"
+#include "gimpthresholdtool.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void       gimp_threshold_tool_finalize        (GObject           *object);
+
+static gboolean   gimp_threshold_tool_initialize      (GimpTool          *tool,
+                                                       GimpDisplay       *display,
+                                                       GError           **error);
+
+static gchar    * gimp_threshold_tool_get_operation   (GimpFilterTool    *filter_tool,
+                                                       gchar            **description);
+static void       gimp_threshold_tool_dialog          (GimpFilterTool    *filter_tool);
+static void       gimp_threshold_tool_config_notify   (GimpFilterTool    *filter_tool,
+                                                       GimpConfig        *config,
+                                                       const GParamSpec  *pspec);
+
+static gboolean   gimp_threshold_tool_channel_sensitive
+                                                      (gint               value,
+                                                       gpointer           data);
+static void       gimp_threshold_tool_histogram_range (GimpHistogramView *view,
+                                                       gint               start,
+                                                       gint               end,
+                                                       GimpThresholdTool *t_tool);
+static void       gimp_threshold_tool_auto_clicked    (GtkWidget         *button,
+                                                       GimpThresholdTool *t_tool);
+
+
+G_DEFINE_TYPE (GimpThresholdTool, gimp_threshold_tool,
+               GIMP_TYPE_FILTER_TOOL)
+
+#define parent_class gimp_threshold_tool_parent_class
+
+
+void
+gimp_threshold_tool_register (GimpToolRegisterCallback  callback,
+                              gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_THRESHOLD_TOOL,
+                GIMP_TYPE_HISTOGRAM_OPTIONS,
+                NULL,
+                0,
+                "gimp-threshold-tool",
+                _("Threshold"),
+                _("Reduce image to two colors using a threshold"),
+                N_("_Threshold..."), NULL,
+                NULL, GIMP_HELP_TOOL_THRESHOLD,
+                GIMP_ICON_TOOL_THRESHOLD,
+                data);
+}
+
+static void
+gimp_threshold_tool_class_init (GimpThresholdToolClass *klass)
+{
+  GObjectClass        *object_class      = G_OBJECT_CLASS (klass);
+  GimpToolClass       *tool_class        = GIMP_TOOL_CLASS (klass);
+  GimpFilterToolClass *filter_tool_class = GIMP_FILTER_TOOL_CLASS (klass);
+
+  object_class->finalize           = gimp_threshold_tool_finalize;
+
+  tool_class->initialize           = gimp_threshold_tool_initialize;
+
+  filter_tool_class->get_operation = gimp_threshold_tool_get_operation;
+  filter_tool_class->dialog        = gimp_threshold_tool_dialog;
+  filter_tool_class->config_notify = gimp_threshold_tool_config_notify;
+}
+
+static void
+gimp_threshold_tool_init (GimpThresholdTool *t_tool)
+{
+  t_tool->histogram = gimp_histogram_new (FALSE);
+}
+
+static void
+gimp_threshold_tool_finalize (GObject *object)
+{
+  GimpThresholdTool *t_tool = GIMP_THRESHOLD_TOOL (object);
+
+  g_clear_object (&t_tool->histogram);
+  g_clear_object (&t_tool->histogram_async);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_threshold_tool_initialize (GimpTool     *tool,
+                                GimpDisplay  *display,
+                                GError      **error)
+{
+  GimpThresholdTool *t_tool      = GIMP_THRESHOLD_TOOL (tool);
+  GimpFilterTool    *filter_tool = GIMP_FILTER_TOOL (tool);
+  GimpImage         *image       = gimp_display_get_image (display);
+  GimpDrawable      *drawable    = gimp_image_get_active_drawable (image);
+  gdouble            low;
+  gdouble            high;
+  gint               n_bins;
+
+  if (! GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error))
+    {
+      return FALSE;
+    }
+
+  g_clear_object (&t_tool->histogram_async);
+
+  g_object_get (filter_tool->config,
+                "low",  &low,
+                "high", &high,
+                NULL);
+
+  /* this is a hack to make sure that
+   * 'gimp_histogram_n_bins (t_tool->histogram)' returns the correct value for
+   * 'drawable' before the asynchronous calculation of its histogram is
+   * finished.
+   */
+  {
+    GeglBuffer *temp;
+
+    temp = gegl_buffer_new (GEGL_RECTANGLE (0, 0, 1, 1),
+                            gimp_drawable_get_format (drawable));
+
+    gimp_histogram_calculate (t_tool->histogram,
+                              temp, GEGL_RECTANGLE (0, 0, 1, 1),
+                              NULL, NULL);
+
+    g_object_unref (temp);
+  }
+
+  n_bins = gimp_histogram_n_bins (t_tool->histogram);
+
+  t_tool->histogram_async = gimp_drawable_calculate_histogram_async (
+    drawable, t_tool->histogram, FALSE);
+  gimp_histogram_view_set_histogram (t_tool->histogram_box->view,
+                                     t_tool->histogram);
+
+  gimp_histogram_view_set_range (t_tool->histogram_box->view,
+                                 low  * (n_bins - 0.0001),
+                                 high * (n_bins - 0.0001));
+
+  return TRUE;
+}
+
+static gchar *
+gimp_threshold_tool_get_operation (GimpFilterTool  *filter_tool,
+                                   gchar          **description)
+{
+  *description = g_strdup (_("Apply Threshold"));
+
+  return g_strdup ("gimp:threshold");
+}
+
+
+/**********************/
+/*  Threshold dialog  */
+/**********************/
+
+static void
+gimp_threshold_tool_dialog (GimpFilterTool *filter_tool)
+{
+  GimpThresholdTool    *t_tool       = GIMP_THRESHOLD_TOOL (filter_tool);
+  GimpToolOptions      *tool_options = GIMP_TOOL_GET_OPTIONS (filter_tool);
+  GtkWidget            *main_vbox;
+  GtkWidget            *main_frame;
+  GtkWidget            *frame_vbox;
+  GtkWidget            *hbox;
+  GtkWidget            *label;
+  GtkWidget            *hbox2;
+  GtkWidget            *box;
+  GtkWidget            *button;
+  GimpHistogramChannel  channel;
+
+  main_vbox = gimp_filter_tool_dialog_get_vbox (filter_tool);
+
+  main_frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (main_vbox), main_frame, TRUE, TRUE, 0);
+  gtk_widget_show (main_frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_frame_set_label_widget (GTK_FRAME (main_frame), hbox);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("Cha_nnel:"));
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  t_tool->channel_menu = gimp_prop_enum_combo_box_new (filter_tool->config,
+                                                       "channel", -1, -1);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (t_tool->channel_menu),
+                                       "gimp-channel");
+
+  gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (t_tool->channel_menu),
+                                      gimp_threshold_tool_channel_sensitive,
+                                      filter_tool, NULL);
+
+  gtk_box_pack_start (GTK_BOX (hbox), t_tool->channel_menu, FALSE, FALSE, 0);
+  gtk_widget_show (t_tool->channel_menu);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), t_tool->channel_menu);
+
+  hbox2 = gimp_prop_enum_icon_box_new (G_OBJECT (tool_options),
+                                       "histogram-scale", "gimp-histogram",
+                                       0, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  frame_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (main_frame), frame_vbox);
+  gtk_widget_show (frame_vbox);
+
+  box = gimp_histogram_box_new ();
+  gtk_box_pack_start (GTK_BOX (frame_vbox), box, TRUE, TRUE, 0);
+  gtk_widget_show (box);
+
+  t_tool->histogram_box = GIMP_HISTOGRAM_BOX (box);
+
+  g_object_get (filter_tool->config,
+                "channel", &channel,
+                NULL);
+
+  gimp_histogram_view_set_channel (t_tool->histogram_box->view, channel);
+
+  g_signal_connect (t_tool->histogram_box->view, "range-changed",
+                    G_CALLBACK (gimp_threshold_tool_histogram_range),
+                    t_tool);
+
+  g_object_bind_property (G_OBJECT (tool_options),                "histogram-scale",
+                          G_OBJECT (t_tool->histogram_box->view), "histogram-scale",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (frame_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gtk_button_new_with_mnemonic (_("_Auto"));
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gimp_help_set_help_data (button, _("Automatically adjust to optimal "
+                                     "binarization threshold"), NULL);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_threshold_tool_auto_clicked),
+                    t_tool);
+}
+
+static void
+gimp_threshold_tool_config_notify (GimpFilterTool   *filter_tool,
+                                   GimpConfig       *config,
+                                   const GParamSpec *pspec)
+{
+  GimpThresholdTool *t_tool = GIMP_THRESHOLD_TOOL (filter_tool);
+
+  GIMP_FILTER_TOOL_CLASS (parent_class)->config_notify (filter_tool,
+                                                        config, pspec);
+
+  if (! t_tool->histogram_box)
+    return;
+
+  if (! strcmp (pspec->name, "channel"))
+    {
+      GimpHistogramChannel channel;
+
+      g_object_get (config,
+                    "channel", &channel,
+                    NULL);
+
+      gimp_histogram_view_set_channel (t_tool->histogram_box->view,
+                                       channel);
+    }
+  else if (! strcmp (pspec->name, "low") ||
+           ! strcmp (pspec->name, "high"))
+    {
+      gdouble low;
+      gdouble high;
+      gint    n_bins;
+
+      g_object_get (config,
+                    "low",  &low,
+                    "high", &high,
+                    NULL);
+
+      n_bins = gimp_histogram_n_bins (t_tool->histogram);
+
+      gimp_histogram_view_set_range (t_tool->histogram_box->view,
+                                     low  * (n_bins - 0.0001),
+                                     high * (n_bins - 0.0001));
+    }
+}
+
+static gboolean
+gimp_threshold_tool_channel_sensitive (gint     value,
+                                       gpointer data)
+{
+  GimpDrawable         *drawable = GIMP_TOOL (data)->drawable;
+  GimpHistogramChannel  channel  = value;
+
+  if (!drawable)
+    return FALSE;
+
+  switch (channel)
+    {
+    case GIMP_HISTOGRAM_VALUE:
+      return TRUE;
+
+    case GIMP_HISTOGRAM_RED:
+    case GIMP_HISTOGRAM_GREEN:
+    case GIMP_HISTOGRAM_BLUE:
+      return gimp_drawable_is_rgb (drawable);
+
+    case GIMP_HISTOGRAM_ALPHA:
+      return gimp_drawable_has_alpha (drawable);
+
+    case GIMP_HISTOGRAM_RGB:
+      return gimp_drawable_is_rgb (drawable);
+
+    case GIMP_HISTOGRAM_LUMINANCE:
+      return gimp_drawable_is_rgb (drawable);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_threshold_tool_histogram_range (GimpHistogramView *widget,
+                                     gint               start,
+                                     gint               end,
+                                     GimpThresholdTool *t_tool)
+{
+  GimpFilterTool *filter_tool = GIMP_FILTER_TOOL (t_tool);
+  gint            n_bins      = gimp_histogram_n_bins (t_tool->histogram);
+  gdouble         low         = (gdouble) start / (n_bins - 1);
+  gdouble         high        = (gdouble) end   / (n_bins - 1);
+  gdouble         config_low;
+  gdouble         config_high;
+
+  g_object_get (filter_tool->config,
+                "low",  &config_low,
+                "high", &config_high,
+                NULL);
+
+  if (low  != config_low ||
+      high != config_high)
+    {
+      g_object_set (filter_tool->config,
+                    "low",  low,
+                    "high", high,
+                    NULL);
+    }
+}
+
+static void
+gimp_threshold_tool_auto_clicked (GtkWidget         *button,
+                                  GimpThresholdTool *t_tool)
+{
+  GimpTool     *tool = GIMP_TOOL (t_tool);
+  GimpWaitable *waitable;
+
+  waitable = gimp_trivially_cancelable_waitable_new (
+    GIMP_WAITABLE (t_tool->histogram_async));
+
+  gimp_wait (tool->tool_info->gimp, waitable, _("Calculating histogram..."));
+
+  g_object_unref (waitable);
+
+  if (gimp_async_is_synced   (t_tool->histogram_async) &&
+      gimp_async_is_finished (t_tool->histogram_async))
+    {
+      GimpHistogramChannel channel;
+      gint                 n_bins;
+      gdouble              low;
+
+      g_object_get (GIMP_FILTER_TOOL (t_tool)->config,
+                    "channel", &channel,
+                    NULL);
+
+      n_bins = gimp_histogram_n_bins (t_tool->histogram);
+
+      low = gimp_histogram_get_threshold (t_tool->histogram,
+                                          channel,
+                                          0, n_bins - 1);
+
+      gimp_histogram_view_set_range (t_tool->histogram_box->view,
+                                     low, n_bins - 1);
+    }
+}
diff --git a/app/tools/gimpthresholdtool.h b/app/tools/gimpthresholdtool.h
new file mode 100644
index 0000000..95f80eb
--- /dev/null
+++ b/app/tools/gimpthresholdtool.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_THRESHOLD_TOOL_H__
+#define __GIMP_THRESHOLD_TOOL_H__
+
+
+#include "gimpfiltertool.h"
+
+
+#define GIMP_TYPE_THRESHOLD_TOOL            (gimp_threshold_tool_get_type ())
+#define GIMP_THRESHOLD_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_THRESHOLD_TOOL, GimpThresholdTool))
+#define GIMP_THRESHOLD_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_THRESHOLD_TOOL, GimpThresholdToolClass))
+#define GIMP_IS_THRESHOLD_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_THRESHOLD_TOOL))
+#define GIMP_IS_THRESHOLD_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_THRESHOLD_TOOL))
+#define GIMP_THRESHOLD_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_THRESHOLD_TOOL, GimpThresholdToolClass))
+
+
+typedef struct _GimpThresholdTool      GimpThresholdTool;
+typedef struct _GimpThresholdToolClass GimpThresholdToolClass;
+
+struct _GimpThresholdTool
+{
+  GimpFilterTool    parent_instance;
+
+  /*  dialog  */
+  GimpHistogram    *histogram;
+  GimpAsync        *histogram_async;
+  GtkWidget        *channel_menu;
+  GimpHistogramBox *histogram_box;
+};
+
+struct _GimpThresholdToolClass
+{
+  GimpFilterToolClass  parent_class;
+};
+
+
+void    gimp_threshold_tool_register (GimpToolRegisterCallback  callback,
+                                      gpointer                  data);
+
+GType   gimp_threshold_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_THRESHOLD_TOOL_H__  */
diff --git a/app/tools/gimptilehandleriscissors.c b/app/tools/gimptilehandleriscissors.c
new file mode 100644
index 0000000..63e434a
--- /dev/null
+++ b/app/tools/gimptilehandleriscissors.c
@@ -0,0 +1,331 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimppickable.h"
+
+#include "gimptilehandleriscissors.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PICKABLE
+};
+
+
+static void   gimp_tile_handler_iscissors_finalize     (GObject         *object);
+static void   gimp_tile_handler_iscissors_set_property (GObject         *object,
+                                                        guint            property_id,
+                                                        const GValue    *value,
+                                                        GParamSpec      *pspec);
+static void   gimp_tile_handler_iscissors_get_property (GObject         *object,
+                                                        guint            property_id,
+                                                        GValue          *value,
+                                                        GParamSpec      *pspec);
+
+static void   gimp_tile_handler_iscissors_validate     (GimpTileHandlerValidate *validate,
+                                                        const GeglRectangle     *rect,
+                                                        const Babl              *format,
+                                                        gpointer                 dest_buf,
+                                                        gint                     dest_stride);
+
+
+G_DEFINE_TYPE (GimpTileHandlerIscissors, gimp_tile_handler_iscissors,
+               GIMP_TYPE_TILE_HANDLER_VALIDATE)
+
+#define parent_class gimp_tile_handler_iscissors_parent_class
+
+
+static void
+gimp_tile_handler_iscissors_class_init (GimpTileHandlerIscissorsClass *klass)
+{
+  GObjectClass                 *object_class = G_OBJECT_CLASS (klass);
+  GimpTileHandlerValidateClass *validate_class;
+
+  validate_class = GIMP_TILE_HANDLER_VALIDATE_CLASS (klass);
+
+  object_class->finalize     = gimp_tile_handler_iscissors_finalize;
+  object_class->set_property = gimp_tile_handler_iscissors_set_property;
+  object_class->get_property = gimp_tile_handler_iscissors_get_property;
+
+  validate_class->validate   = gimp_tile_handler_iscissors_validate;
+
+  g_object_class_install_property (object_class, PROP_PICKABLE,
+                                   g_param_spec_object ("pickable", NULL, NULL,
+                                                        GIMP_TYPE_PICKABLE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_tile_handler_iscissors_init (GimpTileHandlerIscissors *iscissors)
+{
+}
+
+static void
+gimp_tile_handler_iscissors_finalize (GObject *object)
+{
+  GimpTileHandlerIscissors *iscissors = GIMP_TILE_HANDLER_ISCISSORS (object);
+
+  if (iscissors->pickable)
+    {
+      g_object_unref (iscissors->pickable);
+      iscissors->pickable = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tile_handler_iscissors_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpTileHandlerIscissors *iscissors = GIMP_TILE_HANDLER_ISCISSORS (object);
+
+  switch (property_id)
+    {
+    case PROP_PICKABLE:
+      iscissors->pickable = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tile_handler_iscissors_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpTileHandlerIscissors *iscissors = GIMP_TILE_HANDLER_ISCISSORS (object);
+
+  switch (property_id)
+    {
+    case PROP_PICKABLE:
+      g_value_set_object (value, iscissors->pickable);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static const gfloat horz_deriv[9] =
+{
+  1,  0, -1,
+  2,  0, -2,
+  1,  0, -1,
+};
+
+static const gfloat vert_deriv[9] =
+{
+  1,  2,  1,
+  0,  0,  0,
+  -1, -2, -1,
+};
+
+static const gfloat blur_32[9] =
+{
+  1,  1,  1,
+  1, 24,  1,
+  1,  1,  1,
+};
+
+#define  MAX_GRADIENT 179.606  /* == sqrt (127^2 + 127^2) */
+#define  MIN_GRADIENT  63      /* gradients < this are directionless */
+#define  COST_WIDTH     2      /* number of bytes for each pixel in cost map */
+
+static void
+gimp_tile_handler_iscissors_validate (GimpTileHandlerValidate *validate,
+                                      const GeglRectangle     *rect,
+                                      const Babl              *format,
+                                      gpointer                 dest_buf,
+                                      gint                     dest_stride)
+{
+  GimpTileHandlerIscissors *iscissors = GIMP_TILE_HANDLER_ISCISSORS (validate);
+  GeglBuffer               *src;
+  GeglBuffer               *temp0;
+  GeglBuffer               *temp1;
+  GeglBuffer               *temp2;
+  gint                      stride1;
+  gint                      stride2;
+  gint                      i, j;
+
+  /*  temporary convolution buffers --  */
+  guchar *maxgrad_conv1;
+  guchar *maxgrad_conv2;
+
+#if 0
+  g_printerr ("validating at %d %d %d %d\n",
+              rect->x,
+              rect->y,
+              rect->width,
+              rect->height);
+#endif
+
+  gimp_pickable_flush (iscissors->pickable);
+
+  src = gimp_pickable_get_buffer (iscissors->pickable);
+
+  temp0 = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                           rect->width,
+                                           rect->height),
+                           babl_format ("R'G'B'A u8"));
+
+  temp1 = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                           rect->width,
+                                           rect->height),
+                           babl_format ("R'G'B'A u8"));
+
+  temp2 = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
+                                           rect->width,
+                                           rect->height),
+                           babl_format ("R'G'B'A u8"));
+
+  /* XXX tile edges? */
+
+  /*  Blur the source to get rid of noise  */
+  gimp_gegl_convolve (src,   rect,
+                      temp0, GEGL_RECTANGLE (0, 0, rect->width, rect->height),
+                      blur_32, 3, 32, GIMP_NORMAL_CONVOL, FALSE);
+
+  /*  Use this blurred region as the new source  */
+
+  /*  Get the horizontal derivative  */
+  gimp_gegl_convolve (temp0, GEGL_RECTANGLE (0, 0, rect->width, rect->height),
+                      temp1, GEGL_RECTANGLE (0, 0, rect->width, rect->height),
+                      horz_deriv, 3, 1, GIMP_NEGATIVE_CONVOL, FALSE);
+
+  /*  Get the vertical derivative  */
+  gimp_gegl_convolve (temp0, GEGL_RECTANGLE (0, 0, rect->width, rect->height),
+                      temp2, GEGL_RECTANGLE (0, 0, rect->width, rect->height),
+                      vert_deriv, 3, 1, GIMP_NEGATIVE_CONVOL, FALSE);
+
+  maxgrad_conv1 =
+    (guchar *) gegl_buffer_linear_open (temp1,
+                                        GEGL_RECTANGLE (0, 0,
+                                                        rect->width,
+                                                        rect->height),
+                                        &stride1, NULL);
+
+  maxgrad_conv2 =
+    (guchar *) gegl_buffer_linear_open (temp2,
+                                        GEGL_RECTANGLE (0, 0,
+                                                        rect->width,
+                                                        rect->height),
+                                        &stride2, NULL);
+
+  /* calculate overall gradient */
+
+  for (i = 0; i < rect->height; i++)
+    {
+      const guint8 *datah   = maxgrad_conv1 + stride1 * i;
+      const guint8 *datav   = maxgrad_conv2 + stride2 * i;
+      guint8       *gradmap = (guint8 *) dest_buf + dest_stride * i;
+
+      for (j = 0; j < rect->width; j++)
+        {
+          gint8  hmax = datah[0] - 128;
+          gint8  vmax = datav[0] - 128;
+          gfloat gradient;
+          gint   b;
+
+          for (b = 1; b < 4; b++)
+            {
+              if (abs (datah[b] - 128) > abs (hmax))
+                hmax = datah[b] - 128;
+
+              if (abs (datav[b] - 128) > abs (vmax))
+                vmax = datav[b] - 128;
+            }
+
+          if (i == 0 || j == 0 || i == rect->height - 1 || j == rect->width - 1)
+            {
+              gradmap[j * COST_WIDTH + 0] = 0;
+              gradmap[j * COST_WIDTH + 1] = 255;
+              goto contin;
+            }
+
+          /* 1 byte absolute magnitude first */
+          gradient = sqrt (SQR (hmax) + SQR (vmax));
+          gradmap[j * COST_WIDTH] = gradient * 255 / MAX_GRADIENT;
+
+          /* then 1 byte direction */
+          if (gradient > MIN_GRADIENT)
+            {
+              gfloat direction;
+
+              if (! hmax)
+                direction = (vmax > 0) ? G_PI_2 : -G_PI_2;
+              else
+                direction = atan ((gdouble) vmax / (gdouble) hmax);
+
+              /* Scale the direction from between 0 and 254,
+               *  corresponding to -PI/2, PI/2 255 is reserved for
+               *  directionless pixels
+               */
+              gradmap[j * COST_WIDTH + 1] =
+                (guint8) (254 * (direction + G_PI_2) / G_PI);
+            }
+          else
+            {
+              gradmap[j * COST_WIDTH + 1] = 255; /* reserved for weak gradient */
+            }
+
+        contin:
+          datah += 4;
+          datav += 4;
+        }
+    }
+
+  gegl_buffer_linear_close (temp1, maxgrad_conv1);
+  gegl_buffer_linear_close (temp2, maxgrad_conv2);
+
+  g_object_unref (temp0);
+  g_object_unref (temp1);
+  g_object_unref (temp2);
+}
+
+GeglTileHandler *
+gimp_tile_handler_iscissors_new (GimpPickable *pickable)
+{
+  g_return_val_if_fail (GIMP_IS_PICKABLE (pickable), NULL);
+
+  return g_object_new (GIMP_TYPE_TILE_HANDLER_ISCISSORS,
+                       "whole-tile", TRUE,
+                       "pickable",   pickable,
+                       NULL);
+}
diff --git a/app/tools/gimptilehandleriscissors.h b/app/tools/gimptilehandleriscissors.h
new file mode 100644
index 0000000..a2c1916
--- /dev/null
+++ b/app/tools/gimptilehandleriscissors.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TILE_HANDLER_ISCISSORS_H__
+#define __GIMP_TILE_HANDLER_ISCISSORS_H__
+
+
+#include "gegl/gimptilehandlervalidate.h"
+
+
+/***
+ * GimpTileHandlerIscissors is a GeglTileHandler that renders the
+ * Iscissors tool's gradmap.
+ */
+
+#define GIMP_TYPE_TILE_HANDLER_ISCISSORS            (gimp_tile_handler_iscissors_get_type ())
+#define GIMP_TILE_HANDLER_ISCISSORS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TILE_HANDLER_ISCISSORS, GimpTileHandlerIscissors))
+#define GIMP_TILE_HANDLER_ISCISSORS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_TILE_HANDLER_ISCISSORS, GimpTileHandlerIscissorsClass))
+#define GIMP_IS_TILE_HANDLER_ISCISSORS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TILE_HANDLER_ISCISSORS))
+#define GIMP_IS_TILE_HANDLER_ISCISSORS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_TILE_HANDLER_ISCISSORS))
+#define GIMP_TILE_HANDLER_ISCISSORS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_TILE_HANDLER_ISCISSORS, GimpTileHandlerIscissorsClass))
+
+
+typedef struct _GimpTileHandlerIscissors      GimpTileHandlerIscissors;
+typedef struct _GimpTileHandlerIscissorsClass GimpTileHandlerIscissorsClass;
+
+struct _GimpTileHandlerIscissors
+{
+  GimpTileHandlerValidate  parent_instance;
+
+  GimpPickable            *pickable;
+};
+
+struct _GimpTileHandlerIscissorsClass
+{
+  GimpTileHandlerValidateClass  parent_class;
+};
+
+
+GType             gimp_tile_handler_iscissors_get_type (void) G_GNUC_CONST;
+
+GeglTileHandler * gimp_tile_handler_iscissors_new      (GimpPickable *pickable);
+
+
+#endif /* __GIMP_TILE_HANDLER_ISCISSORS_H__ */
diff --git a/app/tools/gimptool-progress.c b/app/tools/gimptool-progress.c
new file mode 100644
index 0000000..09b0a9d
--- /dev/null
+++ b/app/tools/gimptool-progress.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptool-progress.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "tools-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasprogress.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-items.h"
+#include "display/gimpdisplayshell-transform.h"
+
+#include "gimptool.h"
+#include "gimptool-progress.h"
+
+
+/*  local function prototypes  */
+
+static GimpProgress * gimp_tool_progress_start     (GimpProgress        *progress,
+                                                    gboolean             cancellable,
+                                                    const gchar         *message);
+static void           gimp_tool_progress_end       (GimpProgress        *progress);
+static gboolean       gimp_tool_progress_is_active (GimpProgress        *progress);
+static void           gimp_tool_progress_set_text  (GimpProgress        *progress,
+                                                    const gchar         *message);
+static void           gimp_tool_progress_set_value (GimpProgress        *progress,
+                                                    gdouble              percentage);
+static gdouble        gimp_tool_progress_get_value (GimpProgress        *progress);
+static void           gimp_tool_progress_pulse     (GimpProgress        *progress);
+static gboolean       gimp_tool_progress_message   (GimpProgress        *progress,
+                                                    Gimp                *gimp,
+                                                    GimpMessageSeverity  severity,
+                                                    const gchar         *domain,
+                                                    const gchar         *message);
+
+
+/*  public functions  */
+
+void
+gimp_tool_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start     = gimp_tool_progress_start;
+  iface->end       = gimp_tool_progress_end;
+  iface->is_active = gimp_tool_progress_is_active;
+  iface->set_text  = gimp_tool_progress_set_text;
+  iface->set_value = gimp_tool_progress_set_value;
+  iface->get_value = gimp_tool_progress_get_value;
+  iface->pulse     = gimp_tool_progress_pulse;
+  iface->message   = gimp_tool_progress_message;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_tool_progress_button_press (GtkWidget            *widget,
+                                 const GdkEventButton *bevent,
+                                 GimpTool             *tool)
+{
+  if (bevent->type   == GDK_BUTTON_PRESS &&
+      bevent->button == 1)
+    {
+      GtkWidget        *event_widget;
+      GimpDisplayShell *shell;
+
+      event_widget = gtk_get_event_widget ((GdkEvent *) bevent);
+      shell        = gimp_display_get_shell (tool->progress_display);
+
+      if (shell->canvas == event_widget)
+        {
+          gint x, y;
+
+          gimp_display_shell_unzoom_xy (shell, bevent->x, bevent->y,
+                                        &x, &y, FALSE);
+
+          if (gimp_canvas_item_hit (tool->progress, x, y))
+            {
+              gimp_progress_cancel (GIMP_PROGRESS (tool));
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_tool_progress_key_press (GtkWidget         *widget,
+                              const GdkEventKey *kevent,
+                              GimpTool          *tool)
+{
+  if (kevent->keyval == GDK_KEY_Escape)
+    {
+      gimp_progress_cancel (GIMP_PROGRESS (tool));
+    }
+
+  return TRUE;
+}
+
+static GimpProgress *
+gimp_tool_progress_start (GimpProgress *progress,
+                          gboolean      cancellable,
+                          const gchar  *message)
+{
+  GimpTool         *tool = GIMP_TOOL (progress);
+  GimpDisplayShell *shell;
+  gint              x, y;
+
+  g_return_val_if_fail (GIMP_IS_DISPLAY (tool->display), NULL);
+  g_return_val_if_fail (tool->progress == NULL, NULL);
+
+  shell = gimp_display_get_shell (tool->display);
+
+  x = shell->disp_width  / 2;
+  y = shell->disp_height / 2;
+
+  gimp_display_shell_unzoom_xy (shell, x, y, &x, &y, FALSE);
+
+  tool->progress = gimp_canvas_progress_new (shell,
+                                             GIMP_HANDLE_ANCHOR_CENTER,
+                                             x, y);
+  gimp_display_shell_add_unrotated_item (shell, tool->progress);
+  g_object_unref (tool->progress);
+
+  gimp_progress_start (GIMP_PROGRESS (tool->progress), FALSE,
+                       "%s", message);
+  gimp_widget_flush_expose (shell->canvas);
+
+  tool->progress_display = tool->display;
+
+  if (cancellable)
+    {
+      tool->progress_grab_widget = gtk_invisible_new ();
+      gtk_widget_show (tool->progress_grab_widget);
+      gtk_grab_add (tool->progress_grab_widget);
+
+      g_signal_connect (tool->progress_grab_widget, "button-press-event",
+                        G_CALLBACK (gimp_tool_progress_button_press),
+                        tool);
+      g_signal_connect (tool->progress_grab_widget, "key-press-event",
+                        G_CALLBACK (gimp_tool_progress_key_press),
+                        tool);
+    }
+
+  return progress;
+}
+
+static void
+gimp_tool_progress_end (GimpProgress *progress)
+{
+  GimpTool *tool = GIMP_TOOL (progress);
+
+  if (tool->progress)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (tool->progress_display);
+
+      gimp_progress_end (GIMP_PROGRESS (tool->progress));
+      gimp_display_shell_remove_unrotated_item (shell, tool->progress);
+
+      tool->progress         = NULL;
+      tool->progress_display = NULL;
+
+      if (tool->progress_grab_widget)
+        {
+          gtk_grab_remove (tool->progress_grab_widget);
+          gtk_widget_destroy (tool->progress_grab_widget);
+          tool->progress_grab_widget = NULL;
+        }
+    }
+}
+
+static gboolean
+gimp_tool_progress_is_active (GimpProgress *progress)
+{
+  GimpTool *tool = GIMP_TOOL (progress);
+
+  return tool->progress != NULL;
+}
+
+static void
+gimp_tool_progress_set_text (GimpProgress *progress,
+                             const gchar  *message)
+{
+  GimpTool *tool = GIMP_TOOL (progress);
+
+  if (tool->progress)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (tool->progress_display);
+
+      gimp_progress_set_text_literal (GIMP_PROGRESS (tool->progress), message);
+      gimp_widget_flush_expose (shell->canvas);
+    }
+}
+
+static void
+gimp_tool_progress_set_value (GimpProgress *progress,
+                              gdouble       percentage)
+{
+  GimpTool *tool = GIMP_TOOL (progress);
+
+  if (tool->progress)
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (tool->progress_display);
+
+      gimp_progress_set_value (GIMP_PROGRESS (tool->progress), percentage);
+      gimp_widget_flush_expose (shell->canvas);
+    }
+}
+
+static gdouble
+gimp_tool_progress_get_value (GimpProgress *progress)
+{
+  GimpTool *tool = GIMP_TOOL (progress);
+
+  if (tool->progress)
+    return gimp_progress_get_value (GIMP_PROGRESS (tool->progress));
+
+  return 0.0;
+}
+
+static void
+gimp_tool_progress_pulse (GimpProgress *progress)
+{
+}
+
+static gboolean
+gimp_tool_progress_message (GimpProgress        *progress,
+                            Gimp                *gimp,
+                            GimpMessageSeverity  severity,
+                            const gchar         *domain,
+                            const gchar         *message)
+{
+  return FALSE;
+}
diff --git a/app/tools/gimptool-progress.h b/app/tools/gimptool-progress.h
new file mode 100644
index 0000000..7a34db6
--- /dev/null
+++ b/app/tools/gimptool-progress.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptool-progress.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PROGRESS_H__
+#define __GIMP_TOOL_PROGRESS_H__
+
+
+void   gimp_tool_progress_iface_init (GimpProgressInterface *iface);
+
+
+#endif /* __GIMP_TOOL_PROGRESS */
diff --git a/app/tools/gimptool.c b/app/tools/gimptool.c
new file mode 100644
index 0000000..53981c1
--- /dev/null
+++ b/app/tools/gimptool.c
@@ -0,0 +1,1512 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+#include "core/gimptoolinfo.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-cursor.h"
+#include "display/gimpstatusbar.h"
+
+#include "gimptool.h"
+#include "gimptool-progress.h"
+#include "gimptoolcontrol.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+/* #define DEBUG_ACTIVE_STATE 1 */
+
+
+enum
+{
+  PROP_0,
+  PROP_TOOL_INFO
+};
+
+
+static void            gimp_tool_constructed         (GObject          *object);
+static void            gimp_tool_dispose             (GObject          *object);
+static void            gimp_tool_finalize            (GObject          *object);
+static void            gimp_tool_set_property        (GObject          *object,
+                                                      guint             property_id,
+                                                      const GValue     *value,
+                                                      GParamSpec       *pspec);
+static void            gimp_tool_get_property        (GObject          *object,
+                                                      guint             property_id,
+                                                      GValue           *value,
+                                                      GParamSpec       *pspec);
+
+static gboolean        gimp_tool_real_has_display    (GimpTool         *tool,
+                                                      GimpDisplay      *display);
+static GimpDisplay   * gimp_tool_real_has_image      (GimpTool         *tool,
+                                                      GimpImage        *image);
+static gboolean        gimp_tool_real_initialize     (GimpTool         *tool,
+                                                      GimpDisplay      *display,
+                                                      GError          **error);
+static void            gimp_tool_real_control        (GimpTool         *tool,
+                                                      GimpToolAction    action,
+                                                      GimpDisplay      *display);
+static void            gimp_tool_real_button_press   (GimpTool         *tool,
+                                                      const GimpCoords *coords,
+                                                      guint32           time,
+                                                      GdkModifierType   state,
+                                                      GimpButtonPressType press_type,
+                                                      GimpDisplay      *display);
+static void            gimp_tool_real_button_release (GimpTool         *tool,
+                                                      const GimpCoords *coords,
+                                                      guint32           time,
+                                                      GdkModifierType   state,
+                                                      GimpButtonReleaseType release_type,
+                                                      GimpDisplay      *display);
+static void            gimp_tool_real_motion         (GimpTool         *tool,
+                                                      const GimpCoords *coords,
+                                                      guint32           time,
+                                                      GdkModifierType   state,
+                                                      GimpDisplay      *display);
+static gboolean        gimp_tool_real_key_press      (GimpTool         *tool,
+                                                      GdkEventKey      *kevent,
+                                                      GimpDisplay      *display);
+static gboolean        gimp_tool_real_key_release    (GimpTool         *tool,
+                                                      GdkEventKey      *kevent,
+                                                      GimpDisplay      *display);
+static void            gimp_tool_real_modifier_key   (GimpTool         *tool,
+                                                      GdkModifierType   key,
+                                                      gboolean          press,
+                                                      GdkModifierType   state,
+                                                      GimpDisplay      *display);
+static void       gimp_tool_real_active_modifier_key (GimpTool         *tool,
+                                                      GdkModifierType   key,
+                                                      gboolean          press,
+                                                      GdkModifierType   state,
+                                                      GimpDisplay      *display);
+static void            gimp_tool_real_oper_update    (GimpTool         *tool,
+                                                      const GimpCoords *coords,
+                                                      GdkModifierType   state,
+                                                      gboolean          proximity,
+                                                      GimpDisplay      *display);
+static void            gimp_tool_real_cursor_update  (GimpTool         *tool,
+                                                      const GimpCoords *coords,
+                                                      GdkModifierType   state,
+                                                      GimpDisplay      *display);
+static const gchar   * gimp_tool_real_can_undo       (GimpTool         *tool,
+                                                      GimpDisplay      *display);
+static const gchar   * gimp_tool_real_can_redo       (GimpTool         *tool,
+                                                      GimpDisplay      *display);
+static gboolean        gimp_tool_real_undo           (GimpTool         *tool,
+                                                      GimpDisplay      *display);
+static gboolean        gimp_tool_real_redo           (GimpTool         *tool,
+                                                      GimpDisplay      *display);
+static GimpUIManager * gimp_tool_real_get_popup      (GimpTool         *tool,
+                                                      const GimpCoords *coords,
+                                                      GdkModifierType   state,
+                                                      GimpDisplay      *display,
+                                                      const gchar     **ui_path);
+static void            gimp_tool_real_options_notify (GimpTool         *tool,
+                                                      GimpToolOptions  *options,
+                                                      const GParamSpec *pspec);
+
+static void            gimp_tool_options_notify      (GimpToolOptions  *options,
+                                                      const GParamSpec *pspec,
+                                                      GimpTool         *tool);
+static void            gimp_tool_clear_status        (GimpTool         *tool);
+static void            gimp_tool_release             (GimpTool         *tool);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpTool, gimp_tool, GIMP_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_tool_progress_iface_init))
+
+#define parent_class gimp_tool_parent_class
+
+static gint global_tool_ID = 1;
+
+
+static void
+gimp_tool_class_init (GimpToolClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_tool_constructed;
+  object_class->dispose      = gimp_tool_dispose;
+  object_class->finalize     = gimp_tool_finalize;
+  object_class->set_property = gimp_tool_set_property;
+  object_class->get_property = gimp_tool_get_property;
+
+  klass->has_display         = gimp_tool_real_has_display;
+  klass->has_image           = gimp_tool_real_has_image;
+  klass->initialize          = gimp_tool_real_initialize;
+  klass->control             = gimp_tool_real_control;
+  klass->button_press        = gimp_tool_real_button_press;
+  klass->button_release      = gimp_tool_real_button_release;
+  klass->motion              = gimp_tool_real_motion;
+  klass->key_press           = gimp_tool_real_key_press;
+  klass->key_release         = gimp_tool_real_key_release;
+  klass->modifier_key        = gimp_tool_real_modifier_key;
+  klass->active_modifier_key = gimp_tool_real_active_modifier_key;
+  klass->oper_update         = gimp_tool_real_oper_update;
+  klass->cursor_update       = gimp_tool_real_cursor_update;
+  klass->can_undo            = gimp_tool_real_can_undo;
+  klass->can_redo            = gimp_tool_real_can_redo;
+  klass->undo                = gimp_tool_real_undo;
+  klass->redo                = gimp_tool_real_redo;
+  klass->get_popup           = gimp_tool_real_get_popup;
+  klass->options_notify      = gimp_tool_real_options_notify;
+
+  g_object_class_install_property (object_class, PROP_TOOL_INFO,
+                                   g_param_spec_object ("tool-info",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TOOL_INFO,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_tool_init (GimpTool *tool)
+{
+  tool->tool_info             = NULL;
+  tool->ID                    = global_tool_ID++;
+  tool->control               = g_object_new (GIMP_TYPE_TOOL_CONTROL, NULL);
+  tool->display               = NULL;
+  tool->drawable              = NULL;
+  tool->focus_display         = NULL;
+  tool->modifier_state        = 0;
+  tool->active_modifier_state = 0;
+  tool->button_press_state    = 0;
+}
+
+static void
+gimp_tool_constructed (GObject *object)
+{
+  GimpTool *tool = GIMP_TOOL (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_TOOL_INFO (tool->tool_info));
+
+  g_signal_connect_object (gimp_tool_get_options (tool), "notify",
+                           G_CALLBACK (gimp_tool_options_notify),
+                           tool, 0);
+}
+
+static void
+gimp_tool_dispose (GObject *object)
+{
+  GimpTool *tool = GIMP_TOOL (object);
+
+  gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tool_finalize (GObject *object)
+{
+  GimpTool *tool = GIMP_TOOL (object);
+
+  g_clear_object (&tool->tool_info);
+  g_clear_object (&tool->control);
+  g_clear_pointer (&tool->label,     g_free);
+  g_clear_pointer (&tool->undo_desc, g_free);
+  g_clear_pointer (&tool->icon_name, g_free);
+  g_clear_pointer (&tool->help_id,   g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpTool *tool = GIMP_TOOL (object);
+
+  switch (property_id)
+    {
+    case PROP_TOOL_INFO:
+      tool->tool_info = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GimpTool *tool = GIMP_TOOL (object);
+
+  switch (property_id)
+    {
+    case PROP_TOOL_INFO:
+      g_value_set_object (value, tool->tool_info);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  standard member functions  */
+
+static gboolean
+gimp_tool_real_has_display (GimpTool    *tool,
+                            GimpDisplay *display)
+{
+  return (display == tool->display ||
+          g_list_find (tool->status_displays, display));
+}
+
+static GimpDisplay *
+gimp_tool_real_has_image (GimpTool  *tool,
+                          GimpImage *image)
+{
+  if (tool->display)
+    {
+      if (image && gimp_display_get_image (tool->display) == image)
+        return tool->display;
+
+      /*  NULL image means any display  */
+      if (! image)
+        return tool->display;
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_tool_real_initialize (GimpTool     *tool,
+                           GimpDisplay  *display,
+                           GError      **error)
+{
+  return TRUE;
+}
+
+static void
+gimp_tool_real_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      tool->display  = NULL;
+      tool->drawable = NULL;
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+}
+
+static void
+gimp_tool_real_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    {
+      GimpImage *image = gimp_display_get_image (display);
+
+      tool->display  = display;
+      tool->drawable = gimp_image_get_active_drawable (image);
+
+      gimp_tool_control_activate (tool->control);
+    }
+}
+
+static void
+gimp_tool_real_button_release (GimpTool              *tool,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type,
+                               GimpDisplay           *display)
+{
+  gimp_tool_control_halt (tool->control);
+}
+
+static void
+gimp_tool_real_motion (GimpTool         *tool,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state,
+                       GimpDisplay      *display)
+{
+}
+
+static gboolean
+gimp_tool_real_key_press (GimpTool    *tool,
+                          GdkEventKey *kevent,
+                          GimpDisplay *display)
+{
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_real_key_release (GimpTool    *tool,
+                            GdkEventKey *kevent,
+                            GimpDisplay *display)
+{
+  return FALSE;
+}
+
+static void
+gimp_tool_real_modifier_key (GimpTool        *tool,
+                             GdkModifierType  key,
+                             gboolean         press,
+                             GdkModifierType  state,
+                             GimpDisplay     *display)
+{
+}
+
+static void
+gimp_tool_real_active_modifier_key (GimpTool        *tool,
+                                    GdkModifierType  key,
+                                    gboolean         press,
+                                    GdkModifierType  state,
+                                    GimpDisplay     *display)
+{
+}
+
+static void
+gimp_tool_real_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+}
+
+static void
+gimp_tool_real_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  gimp_tool_set_cursor (tool, display,
+                        gimp_tool_control_get_cursor (tool->control),
+                        gimp_tool_control_get_tool_cursor (tool->control),
+                        gimp_tool_control_get_cursor_modifier (tool->control));
+}
+
+static const gchar *
+gimp_tool_real_can_undo (GimpTool    *tool,
+                         GimpDisplay *display)
+{
+  return NULL;
+}
+
+static const gchar *
+gimp_tool_real_can_redo (GimpTool    *tool,
+                         GimpDisplay *display)
+{
+  return NULL;
+}
+
+static gboolean
+gimp_tool_real_undo (GimpTool    *tool,
+                     GimpDisplay *display)
+{
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_real_redo (GimpTool    *tool,
+                     GimpDisplay *display)
+{
+  return FALSE;
+}
+
+static GimpUIManager *
+gimp_tool_real_get_popup (GimpTool         *tool,
+                          const GimpCoords *coords,
+                          GdkModifierType   state,
+                          GimpDisplay      *display,
+                          const gchar     **ui_path)
+{
+  *ui_path = NULL;
+
+  return NULL;
+}
+
+static void
+gimp_tool_real_options_notify (GimpTool         *tool,
+                               GimpToolOptions  *options,
+                               const GParamSpec *pspec)
+{
+}
+
+
+/*  public functions  */
+
+GimpToolOptions *
+gimp_tool_get_options (GimpTool *tool)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool->tool_info), NULL);
+
+  return tool->tool_info->tool_options;
+}
+
+void
+gimp_tool_set_label (GimpTool    *tool,
+                     const gchar *label)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  g_free (tool->label);
+  tool->label = g_strdup (label);
+}
+
+const gchar *
+gimp_tool_get_label (GimpTool *tool)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+
+  if (tool->label)
+    return tool->label;
+
+  return tool->tool_info->label;
+}
+
+void
+gimp_tool_set_undo_desc (GimpTool    *tool,
+                         const gchar *undo_desc)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  g_free (tool->undo_desc);
+  tool->undo_desc = g_strdup (undo_desc);
+}
+
+const gchar *
+gimp_tool_get_undo_desc (GimpTool *tool)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+
+  if (tool->undo_desc)
+    return tool->undo_desc;
+
+  return tool->tool_info->label;
+}
+
+void
+gimp_tool_set_icon_name (GimpTool    *tool,
+                         const gchar *icon_name)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  g_free (tool->icon_name);
+  tool->icon_name = g_strdup (icon_name);
+}
+
+const gchar *
+gimp_tool_get_icon_name (GimpTool *tool)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+
+  if (tool->icon_name)
+    return tool->icon_name;
+
+  return gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool->tool_info));
+}
+
+void
+gimp_tool_set_help_id (GimpTool    *tool,
+                       const gchar *help_id)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  g_free (tool->help_id);
+  tool->help_id = g_strdup (help_id);
+}
+
+const gchar *
+gimp_tool_get_help_id (GimpTool *tool)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+
+  if (tool->help_id)
+    return tool->help_id;
+
+  return tool->tool_info->help_id;
+}
+
+gboolean
+gimp_tool_has_display (GimpTool    *tool,
+                       GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  return GIMP_TOOL_GET_CLASS (tool)->has_display (tool, display);
+}
+
+GimpDisplay *
+gimp_tool_has_image (GimpTool  *tool,
+                     GimpImage *image)
+{
+  GimpDisplay *display;
+
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
+
+  display = GIMP_TOOL_GET_CLASS (tool)->has_image (tool, image);
+
+  /*  check status displays last because they don't affect the tool
+   *  itself (unlike tool->display or draw_tool->display)
+   */
+  if (! display && tool->status_displays)
+    {
+      GList *list;
+
+      for (list = tool->status_displays; list; list = g_list_next (list))
+        {
+          GimpDisplay *status_display = list->data;
+
+          if (gimp_display_get_image (status_display) == image)
+            return status_display;
+        }
+
+      /*  NULL image means any display  */
+      if (! image)
+        return tool->status_displays->data;
+    }
+
+  return display;
+}
+
+gboolean
+gimp_tool_initialize (GimpTool    *tool,
+                      GimpDisplay *display)
+{
+  GError *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  if (! GIMP_TOOL_GET_CLASS (tool)->initialize (tool, display, &error))
+    {
+      if (error)
+        {
+          gimp_tool_message_literal (tool, display, error->message);
+          g_clear_error (&error);
+        }
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+void
+gimp_tool_control (GimpTool       *tool,
+                   GimpToolAction  action,
+                   GimpDisplay    *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  g_object_ref (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+      if (! gimp_tool_control_is_paused (tool->control))
+        GIMP_TOOL_GET_CLASS (tool)->control (tool, action, display);
+
+      gimp_tool_control_pause (tool->control);
+      break;
+
+    case GIMP_TOOL_ACTION_RESUME:
+      if (gimp_tool_control_is_paused (tool->control))
+        {
+          gimp_tool_control_resume (tool->control);
+
+          if (! gimp_tool_control_is_paused (tool->control))
+            GIMP_TOOL_GET_CLASS (tool)->control (tool, action, display);
+        }
+      else
+        {
+          g_warning ("gimp_tool_control: unable to RESUME tool with "
+                     "tool->control->paused_count == 0");
+        }
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_tool_release (tool);
+
+      GIMP_TOOL_GET_CLASS (tool)->control (tool, action, display);
+
+      /*  always HALT after COMMIT here and not in each tool individually;
+       *  some tools interact with their subclasses (e.g. filter tool
+       *  and operation tool), and it's essential that COMMIT runs
+       *  through the entire class hierarchy before HALT
+       */
+      action = GIMP_TOOL_ACTION_HALT;
+
+      /* pass through */
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_tool_release (tool);
+
+      GIMP_TOOL_GET_CLASS (tool)->control (tool, action, display);
+
+      if (gimp_tool_control_is_active (tool->control))
+        gimp_tool_control_halt (tool->control);
+
+      gimp_tool_clear_status (tool);
+      break;
+    }
+
+  g_object_unref (tool);
+}
+
+void
+gimp_tool_button_press (GimpTool            *tool,
+                        const GimpCoords    *coords,
+                        guint32              time,
+                        GdkModifierType      state,
+                        GimpButtonPressType  press_type,
+                        GimpDisplay         *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (coords != NULL);
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  GIMP_TOOL_GET_CLASS (tool)->button_press (tool, coords, time, state,
+                                            press_type, display);
+
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL &&
+      gimp_tool_control_is_active (tool->control))
+    {
+      tool->button_press_state    = state;
+      tool->active_modifier_state = state;
+
+      tool->last_pointer_coords = *coords;
+      tool->last_pointer_time   = time - g_get_monotonic_time () / 1000;
+      tool->last_pointer_state  = state;
+
+      if (gimp_tool_control_get_wants_click (tool->control))
+        {
+          tool->in_click_distance   = TRUE;
+          tool->got_motion_event    = FALSE;
+          tool->button_press_coords = *coords;
+          tool->button_press_time   = time;
+        }
+      else
+        {
+          tool->in_click_distance   = FALSE;
+        }
+    }
+}
+
+static gboolean
+gimp_tool_check_click_distance (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                guint32           time,
+                                GimpDisplay      *display)
+{
+  GimpDisplayShell *shell;
+  gint              double_click_time;
+  gint              double_click_distance;
+
+  if (! tool->in_click_distance)
+    return FALSE;
+
+  shell = gimp_display_get_shell (display);
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (shell)),
+                "gtk-double-click-time",     &double_click_time,
+                "gtk-double-click-distance", &double_click_distance,
+                NULL);
+
+  if ((time - tool->button_press_time) > double_click_time)
+    {
+      tool->in_click_distance = FALSE;
+    }
+  else
+    {
+      GimpDisplayShell *shell = gimp_display_get_shell (display);
+      gdouble           dx;
+      gdouble           dy;
+
+      dx = SCALEX (shell, tool->button_press_coords.x - coords->x);
+      dy = SCALEY (shell, tool->button_press_coords.y - coords->y);
+
+      if ((SQR (dx) + SQR (dy)) > SQR (double_click_distance))
+        {
+          tool->in_click_distance = FALSE;
+        }
+    }
+
+  return tool->in_click_distance;
+}
+
+void
+gimp_tool_button_release (GimpTool         *tool,
+                          const GimpCoords *coords,
+                          guint32           time,
+                          GdkModifierType   state,
+                          GimpDisplay      *display)
+{
+  GimpButtonReleaseType release_type = GIMP_BUTTON_RELEASE_NORMAL;
+  GimpCoords            my_coords;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (coords != NULL);
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == TRUE);
+
+  g_object_ref (tool);
+
+  tool->last_pointer_state = 0;
+
+  my_coords = *coords;
+
+  if (state & GDK_BUTTON3_MASK)
+    {
+      release_type = GIMP_BUTTON_RELEASE_CANCEL;
+    }
+  else if (gimp_tool_control_get_wants_click (tool->control))
+    {
+      if (gimp_tool_check_click_distance (tool, coords, time, display))
+        {
+          release_type = GIMP_BUTTON_RELEASE_CLICK;
+          my_coords    = tool->button_press_coords;
+
+          if (tool->got_motion_event)
+            {
+              /*  if there has been a motion() since button_press(),
+               *  synthesize a motion() back to the recorded press
+               *  coordinates
+               */
+              GIMP_TOOL_GET_CLASS (tool)->motion (tool, &my_coords, time,
+                                                  state & GDK_BUTTON1_MASK,
+                                                  display);
+            }
+        }
+      else if (! tool->got_motion_event)
+        {
+          release_type = GIMP_BUTTON_RELEASE_NO_MOTION;
+        }
+    }
+
+  GIMP_TOOL_GET_CLASS (tool)->button_release (tool, &my_coords, time, state,
+                                              release_type, display);
+
+  g_warn_if_fail (gimp_tool_control_is_active (tool->control) == FALSE);
+
+  if (tool->active_modifier_state                            != 0 &&
+      gimp_tool_control_get_active_modifiers (tool->control) !=
+      GIMP_TOOL_ACTIVE_MODIFIERS_SAME)
+    {
+      gimp_tool_control_activate (tool->control);
+
+      gimp_tool_set_active_modifier_state (tool, 0, display);
+
+      gimp_tool_control_halt (tool->control);
+    }
+
+  tool->button_press_state    = 0;
+  tool->active_modifier_state = 0;
+
+  g_object_unref (tool);
+}
+
+void
+gimp_tool_motion (GimpTool         *tool,
+                  const GimpCoords *coords,
+                  guint32           time,
+                  GdkModifierType   state,
+                  GimpDisplay      *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (coords != NULL);
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == TRUE);
+
+  tool->got_motion_event = TRUE;
+
+  tool->last_pointer_coords = *coords;
+  tool->last_pointer_time   = time - g_get_monotonic_time () / 1000;
+  tool->last_pointer_state  = state;
+
+  GIMP_TOOL_GET_CLASS (tool)->motion (tool, coords, time, state, display);
+}
+
+void
+gimp_tool_set_focus_display (GimpTool    *tool,
+                             GimpDisplay *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (display == NULL || GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == FALSE);
+
+  GIMP_LOG (TOOL_FOCUS, "tool: %p  focus_display: %p  tool->focus_display: %p",
+            tool, display, tool->focus_display);
+
+  if (display != tool->focus_display)
+    {
+      if (tool->focus_display)
+        {
+          if (tool->active_modifier_state != 0)
+            {
+              gimp_tool_control_activate (tool->control);
+
+              gimp_tool_set_active_modifier_state (tool, 0, tool->focus_display);
+
+              gimp_tool_control_halt (tool->control);
+            }
+
+          if (tool->modifier_state != 0)
+            gimp_tool_set_modifier_state (tool, 0, tool->focus_display);
+        }
+
+      tool->focus_display = display;
+    }
+}
+
+gboolean
+gimp_tool_key_press (GimpTool    *tool,
+                     GdkEventKey *kevent,
+                     GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+  g_return_val_if_fail (display == tool->focus_display, FALSE);
+  g_return_val_if_fail (gimp_tool_control_is_active (tool->control) == FALSE,
+                        FALSE);
+
+  return GIMP_TOOL_GET_CLASS (tool)->key_press (tool, kevent, display);
+}
+
+gboolean
+gimp_tool_key_release (GimpTool    *tool,
+                       GdkEventKey *kevent,
+                       GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+  g_return_val_if_fail (display == tool->focus_display, FALSE);
+  g_return_val_if_fail (gimp_tool_control_is_active (tool->control) == FALSE,
+                        FALSE);
+
+  return GIMP_TOOL_GET_CLASS (tool)->key_release (tool, kevent, display);
+}
+
+static void
+gimp_tool_modifier_key (GimpTool        *tool,
+                        GdkModifierType  key,
+                        gboolean         press,
+                        GdkModifierType  state,
+                        GimpDisplay     *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (display == tool->focus_display);
+
+  GIMP_TOOL_GET_CLASS (tool)->modifier_key (tool, key, press, state, display);
+}
+
+static void
+gimp_tool_active_modifier_key (GimpTool        *tool,
+                               GdkModifierType  key,
+                               gboolean         press,
+                               GdkModifierType  state,
+                               GimpDisplay     *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (display == tool->focus_display);
+
+  GIMP_TOOL_GET_CLASS (tool)->active_modifier_key (tool, key, press, state,
+                                                   display);
+}
+
+static gboolean
+state_changed (GdkModifierType  old_state,
+               GdkModifierType  new_state,
+               GdkModifierType  modifier,
+               gboolean        *press)
+{
+  if ((old_state & modifier) != (new_state & modifier))
+    {
+      *press = (new_state & modifier) ? TRUE : FALSE;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_tool_set_modifier_state (GimpTool        *tool,
+                              GdkModifierType  state,
+                              GimpDisplay     *display)
+{
+  gboolean press;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == FALSE);
+
+  GIMP_LOG (TOOL_FOCUS, "tool: %p  display: %p  tool->focus_display: %p",
+            tool, display, tool->focus_display);
+
+  g_return_if_fail (display == tool->focus_display);
+
+  if (state_changed (tool->modifier_state, state, GDK_SHIFT_MASK, &press))
+    {
+      gimp_tool_modifier_key (tool, GDK_SHIFT_MASK,
+                              press, state,
+                              display);
+    }
+
+  if (state_changed (tool->modifier_state, state, GDK_CONTROL_MASK, &press))
+    {
+      gimp_tool_modifier_key (tool, GDK_CONTROL_MASK,
+                              press, state,
+                              display);
+    }
+
+  if (state_changed (tool->modifier_state, state, GDK_MOD1_MASK, &press))
+    {
+      gimp_tool_modifier_key (tool, GDK_MOD1_MASK,
+                              press, state,
+                              display);
+    }
+
+  if (state_changed (tool->modifier_state, state, GDK_MOD2_MASK, &press))
+    {
+      gimp_tool_modifier_key (tool, GDK_MOD2_MASK,
+                              press, state,
+                              display);
+    }
+
+  tool->modifier_state = state;
+}
+
+void
+gimp_tool_set_active_modifier_state (GimpTool        *tool,
+                                     GdkModifierType  state,
+                                     GimpDisplay     *display)
+{
+  GimpToolActiveModifiers active_modifiers;
+  gboolean                press;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == TRUE);
+
+  GIMP_LOG (TOOL_FOCUS, "tool: %p  display: %p  tool->focus_display: %p",
+            tool, display, tool->focus_display);
+
+  g_return_if_fail (display == tool->focus_display);
+
+  active_modifiers = gimp_tool_control_get_active_modifiers (tool->control);
+
+  if (state_changed (tool->active_modifier_state, state, GDK_SHIFT_MASK,
+                     &press))
+    {
+#ifdef DEBUG_ACTIVE_STATE
+      g_printerr ("%s: SHIFT %s\n", G_STRFUNC,
+                  press ? "pressed" : "released");
+#endif
+
+      switch (active_modifiers)
+        {
+        case GIMP_TOOL_ACTIVE_MODIFIERS_OFF:
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SAME:
+          gimp_tool_modifier_key (tool, GDK_SHIFT_MASK,
+                                  press, state,
+                                  display);
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE:
+          if (! press && (tool->button_press_state & GDK_SHIFT_MASK))
+            {
+              tool->button_press_state &= ~GDK_SHIFT_MASK;
+            }
+          else
+            {
+              gimp_tool_active_modifier_key (tool, GDK_SHIFT_MASK,
+                                             press, state,
+                                             display);
+            }
+          break;
+        }
+    }
+
+  if (state_changed (tool->active_modifier_state, state, GDK_CONTROL_MASK,
+                     &press))
+    {
+#ifdef DEBUG_ACTIVE_STATE
+      g_printerr ("%s: CONTROL %s\n", G_STRFUNC,
+                  press ? "pressed" : "released");
+#endif
+
+      switch (active_modifiers)
+        {
+        case GIMP_TOOL_ACTIVE_MODIFIERS_OFF:
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SAME:
+          gimp_tool_modifier_key (tool, GDK_CONTROL_MASK,
+                                  press, state,
+                                  display);
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE:
+          if (! press && (tool->button_press_state & GDK_CONTROL_MASK))
+            {
+              tool->button_press_state &= ~GDK_CONTROL_MASK;
+            }
+          else
+            {
+              gimp_tool_active_modifier_key (tool, GDK_CONTROL_MASK,
+                                             press, state,
+                                             display);
+            }
+          break;
+        }
+    }
+
+  if (state_changed (tool->active_modifier_state, state, GDK_MOD1_MASK,
+                     &press))
+    {
+#ifdef DEBUG_ACTIVE_STATE
+      g_printerr ("%s: ALT %s\n", G_STRFUNC,
+                  press ? "pressed" : "released");
+#endif
+
+      switch (active_modifiers)
+        {
+        case GIMP_TOOL_ACTIVE_MODIFIERS_OFF:
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SAME:
+          gimp_tool_modifier_key (tool, GDK_MOD1_MASK,
+                                  press, state,
+                                  display);
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE:
+          if (! press && (tool->button_press_state & GDK_MOD1_MASK))
+            {
+              tool->button_press_state &= ~GDK_MOD1_MASK;
+            }
+          else
+            {
+              gimp_tool_active_modifier_key (tool, GDK_MOD1_MASK,
+                                             press, state,
+                                             display);
+            }
+          break;
+        }
+    }
+
+  if (state_changed (tool->active_modifier_state, state, GDK_MOD2_MASK,
+                     &press))
+    {
+#ifdef DEBUG_ACTIVE_STATE
+      g_printerr ("%s: MOD2 %s\n", G_STRFUNC,
+                  press ? "pressed" : "released");
+#endif
+
+      switch (active_modifiers)
+        {
+        case GIMP_TOOL_ACTIVE_MODIFIERS_OFF:
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SAME:
+          gimp_tool_modifier_key (tool, GDK_MOD2_MASK,
+                                  press, state,
+                                  display);
+          break;
+
+        case GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE:
+          if (! press && (tool->button_press_state & GDK_MOD2_MASK))
+            {
+              tool->button_press_state &= ~GDK_MOD2_MASK;
+            }
+          else
+            {
+              gimp_tool_active_modifier_key (tool, GDK_MOD2_MASK,
+                                             press, state,
+                                             display);
+            }
+          break;
+        }
+    }
+
+  tool->active_modifier_state = state;
+
+  if (active_modifiers == GIMP_TOOL_ACTIVE_MODIFIERS_SAME)
+    tool->modifier_state = state;
+}
+
+void
+gimp_tool_oper_update (GimpTool         *tool,
+                       const GimpCoords *coords,
+                       GdkModifierType   state,
+                       gboolean          proximity,
+                       GimpDisplay      *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (coords != NULL);
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == FALSE);
+
+  GIMP_TOOL_GET_CLASS (tool)->oper_update (tool, coords, state, proximity,
+                                           display);
+
+  if (G_UNLIKELY (gimp_image_is_empty (gimp_display_get_image (display)) &&
+                  ! gimp_tool_control_get_handle_empty_image (tool->control)))
+    {
+      gimp_tool_replace_status (tool, display,
+                                "%s",
+                                _("Can't work on an empty image, "
+                                  "add a layer first"));
+    }
+}
+
+void
+gimp_tool_cursor_update (GimpTool         *tool,
+                         const GimpCoords *coords,
+                         GdkModifierType   state,
+                         GimpDisplay      *display)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (coords != NULL);
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (gimp_tool_control_is_active (tool->control) == FALSE);
+
+  GIMP_TOOL_GET_CLASS (tool)->cursor_update (tool, coords, state, display);
+}
+
+const gchar *
+gimp_tool_can_undo (GimpTool    *tool,
+                    GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  if (display == tool->display)
+    return GIMP_TOOL_GET_CLASS (tool)->can_undo (tool, display);
+
+  return NULL;
+}
+
+const gchar *
+gimp_tool_can_redo (GimpTool    *tool,
+                    GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  if (display == tool->display)
+    return GIMP_TOOL_GET_CLASS (tool)->can_redo (tool, display);
+
+  return NULL;
+}
+
+gboolean
+gimp_tool_undo (GimpTool    *tool,
+                GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  if (gimp_tool_can_undo (tool, display))
+    return GIMP_TOOL_GET_CLASS (tool)->undo (tool, display);
+
+  return FALSE;
+}
+
+gboolean
+gimp_tool_redo (GimpTool    *tool,
+                GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  if (gimp_tool_can_redo (tool, display))
+    return GIMP_TOOL_GET_CLASS (tool)->redo (tool, display);
+
+  return FALSE;
+}
+
+GimpUIManager *
+gimp_tool_get_popup (GimpTool         *tool,
+                     const GimpCoords *coords,
+                     GdkModifierType   state,
+                     GimpDisplay      *display,
+                     const gchar     **ui_path)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL (tool), NULL);
+  g_return_val_if_fail (coords != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (ui_path != NULL, NULL);
+
+  return GIMP_TOOL_GET_CLASS (tool)->get_popup (tool, coords, state, display,
+                                                ui_path);
+}
+
+void
+gimp_tool_push_status (GimpTool    *tool,
+                       GimpDisplay *display,
+                       const gchar *format,
+                       ...)
+{
+  GimpDisplayShell *shell;
+  const gchar      *icon_name;
+  va_list           args;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (format != NULL);
+
+  shell = gimp_display_get_shell (display);
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool->tool_info));
+
+  va_start (args, format);
+
+  gimp_statusbar_push_valist (gimp_display_shell_get_statusbar (shell),
+                              G_OBJECT_TYPE_NAME (tool), icon_name,
+                              format, args);
+
+  va_end (args);
+
+  tool->status_displays = g_list_remove (tool->status_displays, display);
+  tool->status_displays = g_list_prepend (tool->status_displays, display);
+}
+
+void
+gimp_tool_push_status_coords (GimpTool            *tool,
+                              GimpDisplay         *display,
+                              GimpCursorPrecision  precision,
+                              const gchar         *title,
+                              gdouble              x,
+                              const gchar         *separator,
+                              gdouble              y,
+                              const gchar         *help)
+{
+  GimpDisplayShell *shell;
+  const gchar      *icon_name;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  shell = gimp_display_get_shell (display);
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool->tool_info));
+
+  gimp_statusbar_push_coords (gimp_display_shell_get_statusbar (shell),
+                              G_OBJECT_TYPE_NAME (tool), icon_name,
+                              precision, title, x, separator, y,
+                              help);
+
+  tool->status_displays = g_list_remove (tool->status_displays, display);
+  tool->status_displays = g_list_prepend (tool->status_displays, display);
+}
+
+void
+gimp_tool_push_status_length (GimpTool            *tool,
+                              GimpDisplay         *display,
+                              const gchar         *title,
+                              GimpOrientationType  axis,
+                              gdouble              value,
+                              const gchar         *help)
+{
+  GimpDisplayShell *shell;
+  const gchar      *icon_name;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  shell = gimp_display_get_shell (display);
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool->tool_info));
+
+  gimp_statusbar_push_length (gimp_display_shell_get_statusbar (shell),
+                              G_OBJECT_TYPE_NAME (tool), icon_name,
+                              title, axis, value, help);
+
+  tool->status_displays = g_list_remove (tool->status_displays, display);
+  tool->status_displays = g_list_prepend (tool->status_displays, display);
+}
+
+void
+gimp_tool_replace_status (GimpTool    *tool,
+                          GimpDisplay *display,
+                          const gchar *format,
+                          ...)
+{
+  GimpDisplayShell *shell;
+  const gchar      *icon_name;
+  va_list           args;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (format != NULL);
+
+  shell = gimp_display_get_shell (display);
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool->tool_info));
+
+  va_start (args, format);
+
+  gimp_statusbar_replace_valist (gimp_display_shell_get_statusbar (shell),
+                                 G_OBJECT_TYPE_NAME (tool), icon_name,
+                                 format, args);
+
+  va_end (args);
+
+  tool->status_displays = g_list_remove (tool->status_displays, display);
+  tool->status_displays = g_list_prepend (tool->status_displays, display);
+}
+
+void
+gimp_tool_pop_status (GimpTool    *tool,
+                      GimpDisplay *display)
+{
+  GimpDisplayShell *shell;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  shell = gimp_display_get_shell (display);
+
+  gimp_statusbar_pop (gimp_display_shell_get_statusbar (shell),
+                      G_OBJECT_TYPE_NAME (tool));
+
+  tool->status_displays = g_list_remove (tool->status_displays, display);
+}
+
+void
+gimp_tool_message (GimpTool    *tool,
+                   GimpDisplay *display,
+                   const gchar *format,
+                   ...)
+{
+  va_list args;
+
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (format != NULL);
+
+  va_start (args, format);
+
+  gimp_message_valist (display->gimp, G_OBJECT (display),
+                       GIMP_MESSAGE_WARNING, format, args);
+
+  va_end (args);
+}
+
+void
+gimp_tool_message_literal (GimpTool    *tool,
+                           GimpDisplay *display,
+                           const gchar *message)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+  g_return_if_fail (message != NULL);
+
+  gimp_message_literal (display->gimp, G_OBJECT (display),
+                        GIMP_MESSAGE_WARNING, message);
+}
+
+void
+gimp_tool_set_cursor (GimpTool           *tool,
+                      GimpDisplay        *display,
+                      GimpCursorType      cursor,
+                      GimpToolCursorType  tool_cursor,
+                      GimpCursorModifier  modifier)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  gimp_display_shell_set_cursor (gimp_display_get_shell (display),
+                                 cursor, tool_cursor, modifier);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tool_options_notify (GimpToolOptions  *options,
+                          const GParamSpec *pspec,
+                          GimpTool         *tool)
+{
+  GIMP_TOOL_GET_CLASS (tool)->options_notify (tool, options, pspec);
+}
+
+static void
+gimp_tool_clear_status (GimpTool *tool)
+{
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  while (tool->status_displays)
+    gimp_tool_pop_status (tool, tool->status_displays->data);
+}
+
+static void
+gimp_tool_release (GimpTool *tool)
+{
+  if (tool->last_pointer_state &&
+      gimp_tool_control_is_active (tool->control))
+    {
+      gimp_tool_button_release (
+        tool,
+        &tool->last_pointer_coords,
+        tool->last_pointer_time + g_get_monotonic_time () / 1000,
+        tool->last_pointer_state,
+        tool->display);
+    }
+}
diff --git a/app/tools/gimptool.h b/app/tools/gimptool.h
new file mode 100644
index 0000000..c7943fd
--- /dev/null
+++ b/app/tools/gimptool.h
@@ -0,0 +1,299 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_H__
+#define __GIMP_TOOL_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_TOOL            (gimp_tool_get_type ())
+#define GIMP_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL, GimpTool))
+#define GIMP_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL, GimpToolClass))
+#define GIMP_IS_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL))
+#define GIMP_IS_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL))
+#define GIMP_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL, GimpToolClass))
+
+#define GIMP_TOOL_GET_OPTIONS(t)  (gimp_tool_get_options (GIMP_TOOL (t)))
+
+
+typedef struct _GimpToolClass GimpToolClass;
+
+struct _GimpTool
+{
+  GimpObject       parent_instance;
+
+  GimpToolInfo    *tool_info;
+
+  gchar           *label;
+  gchar           *undo_desc;
+  gchar           *icon_name;
+  gchar           *help_id;
+
+  gint             ID;          /*  unique tool ID                         */
+
+  GimpToolControl *control;
+
+  GimpDisplay     *display;     /*  pointer to currently active display    */
+  GimpDrawable    *drawable;    /*  pointer to the tool's current drawable */
+
+  /*  private state of gimp_tool_set_focus_display() and
+   *  gimp_tool_set_[active_]modifier_state()
+   */
+  GimpDisplay     *focus_display;
+  GdkModifierType  modifier_state;
+  GdkModifierType  button_press_state;
+  GdkModifierType  active_modifier_state;
+
+  /*  private state for synthesizing button_release() events
+   */
+  GimpCoords       last_pointer_coords;
+  guint32          last_pointer_time;
+  GdkModifierType  last_pointer_state;
+
+  /*  private state for click detection
+   */
+  gboolean         in_click_distance;
+  gboolean         got_motion_event;
+  GimpCoords       button_press_coords;
+  guint32          button_press_time;
+
+  /*  private list of displays which have a status message from this tool
+   */
+  GList           *status_displays;
+
+  /*  on-canvas progress  */
+  GimpCanvasItem  *progress;
+  GimpDisplay     *progress_display;
+  GtkWidget       *progress_grab_widget;
+};
+
+struct _GimpToolClass
+{
+  GimpObjectClass  parent_class;
+
+  /*  virtual functions  */
+
+  gboolean        (* has_display)         (GimpTool              *tool,
+                                           GimpDisplay           *display);
+  GimpDisplay   * (* has_image)           (GimpTool              *tool,
+                                           GimpImage             *image);
+
+  gboolean        (* initialize)          (GimpTool              *tool,
+                                           GimpDisplay           *display,
+                                           GError               **error);
+  void            (* control)             (GimpTool              *tool,
+                                           GimpToolAction         action,
+                                           GimpDisplay           *display);
+
+  void            (* button_press)        (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           guint32                time,
+                                           GdkModifierType        state,
+                                           GimpButtonPressType    press_type,
+                                           GimpDisplay           *display);
+  void            (* button_release)      (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           guint32                time,
+                                           GdkModifierType        state,
+                                           GimpButtonReleaseType  release_type,
+                                           GimpDisplay           *display);
+  void            (* motion)              (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           guint32                time,
+                                           GdkModifierType        state,
+                                           GimpDisplay           *display);
+
+  gboolean        (* key_press)           (GimpTool              *tool,
+                                           GdkEventKey           *kevent,
+                                           GimpDisplay           *display);
+  gboolean        (* key_release)         (GimpTool              *tool,
+                                           GdkEventKey           *kevent,
+                                           GimpDisplay           *display);
+  void            (* modifier_key)        (GimpTool              *tool,
+                                           GdkModifierType        key,
+                                           gboolean               press,
+                                           GdkModifierType        state,
+                                           GimpDisplay           *display);
+  void            (* active_modifier_key) (GimpTool              *tool,
+                                           GdkModifierType        key,
+                                           gboolean               press,
+                                           GdkModifierType        state,
+                                           GimpDisplay           *display);
+
+  void            (* oper_update)         (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           GdkModifierType        state,
+                                           gboolean               proximity,
+                                           GimpDisplay           *display);
+  void            (* cursor_update)       (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           GdkModifierType        state,
+                                           GimpDisplay           *display);
+
+  const gchar   * (* can_undo)            (GimpTool              *tool,
+                                           GimpDisplay           *display);
+  const gchar   * (* can_redo)            (GimpTool              *tool,
+                                           GimpDisplay           *display);
+  gboolean        (* undo)                (GimpTool              *tool,
+                                           GimpDisplay           *display);
+  gboolean        (* redo)                (GimpTool              *tool,
+                                           GimpDisplay           *display);
+
+  GimpUIManager * (* get_popup)           (GimpTool              *tool,
+                                           const GimpCoords      *coords,
+                                           GdkModifierType        state,
+                                           GimpDisplay           *display,
+                                           const gchar          **ui_path);
+
+  void            (* options_notify)      (GimpTool              *tool,
+                                           GimpToolOptions       *options,
+                                           const GParamSpec      *pspec);
+};
+
+
+GType             gimp_tool_get_type            (void) G_GNUC_CONST;
+
+GimpToolOptions * gimp_tool_get_options         (GimpTool            *tool);
+
+void              gimp_tool_set_label           (GimpTool            *tool,
+                                                 const gchar         *label);
+const gchar     * gimp_tool_get_label           (GimpTool            *tool);
+
+void              gimp_tool_set_undo_desc       (GimpTool            *tool,
+                                                 const gchar         *undo_desc);
+const gchar     * gimp_tool_get_undo_desc       (GimpTool            *tool);
+
+void              gimp_tool_set_icon_name       (GimpTool            *tool,
+                                                 const gchar         *icon_name);
+const gchar     * gimp_tool_get_icon_name       (GimpTool            *tool);
+
+void              gimp_tool_set_help_id         (GimpTool            *tool,
+                                                 const gchar         *help_id);
+const gchar     * gimp_tool_get_help_id         (GimpTool            *tool);
+
+gboolean          gimp_tool_has_display         (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+GimpDisplay     * gimp_tool_has_image           (GimpTool            *tool,
+                                                 GimpImage           *image);
+
+gboolean          gimp_tool_initialize          (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+void              gimp_tool_control             (GimpTool            *tool,
+                                                 GimpToolAction       action,
+                                                 GimpDisplay         *display);
+
+void              gimp_tool_button_press        (GimpTool            *tool,
+                                                 const GimpCoords    *coords,
+                                                 guint32              time,
+                                                 GdkModifierType      state,
+                                                 GimpButtonPressType  press_type,
+                                                 GimpDisplay         *display);
+void              gimp_tool_button_release      (GimpTool            *tool,
+                                                 const GimpCoords    *coords,
+                                                 guint32              time,
+                                                 GdkModifierType      state,
+                                                 GimpDisplay         *display);
+void              gimp_tool_motion              (GimpTool            *tool,
+                                                 const GimpCoords    *coords,
+                                                 guint32              time,
+                                                 GdkModifierType      state,
+                                                 GimpDisplay         *display);
+
+gboolean          gimp_tool_key_press           (GimpTool            *tool,
+                                                 GdkEventKey         *kevent,
+                                                 GimpDisplay         *display);
+gboolean          gimp_tool_key_release         (GimpTool            *tool,
+                                                 GdkEventKey         *kevent,
+                                                 GimpDisplay         *display);
+
+void              gimp_tool_set_focus_display   (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+void              gimp_tool_set_modifier_state  (GimpTool            *tool,
+                                                 GdkModifierType      state,
+                                                 GimpDisplay         *display);
+void        gimp_tool_set_active_modifier_state (GimpTool            *tool,
+                                                 GdkModifierType      state,
+                                                 GimpDisplay         *display);
+
+void              gimp_tool_oper_update         (GimpTool            *tool,
+                                                 const GimpCoords    *coords,
+                                                 GdkModifierType      state,
+                                                 gboolean             proximity,
+                                                 GimpDisplay         *display);
+void              gimp_tool_cursor_update       (GimpTool            *tool,
+                                                 const GimpCoords    *coords,
+                                                 GdkModifierType      state,
+                                                 GimpDisplay         *display);
+
+const gchar     * gimp_tool_can_undo            (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+const gchar     * gimp_tool_can_redo            (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+gboolean          gimp_tool_undo                (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+gboolean          gimp_tool_redo                (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+
+GimpUIManager   * gimp_tool_get_popup           (GimpTool            *tool,
+                                                 const GimpCoords    *coords,
+                                                 GdkModifierType      state,
+                                                 GimpDisplay         *display,
+                                                 const gchar        **ui_path);
+
+void              gimp_tool_push_status         (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 const gchar         *format,
+                                                 ...) G_GNUC_PRINTF(3,4);
+void              gimp_tool_push_status_coords  (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 GimpCursorPrecision  precision,
+                                                 const gchar         *title,
+                                                 gdouble              x,
+                                                 const gchar         *separator,
+                                                 gdouble              y,
+                                                 const gchar         *help);
+void              gimp_tool_push_status_length  (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 const gchar         *title,
+                                                 GimpOrientationType  axis,
+                                                 gdouble              value,
+                                                 const gchar         *help);
+void              gimp_tool_replace_status      (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 const gchar         *format,
+                                                 ...) G_GNUC_PRINTF(3,4);
+void              gimp_tool_pop_status          (GimpTool            *tool,
+                                                 GimpDisplay         *display);
+
+void              gimp_tool_message             (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 const gchar         *format,
+                                                 ...) G_GNUC_PRINTF(3,4);
+void              gimp_tool_message_literal     (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 const gchar         *message);
+
+void              gimp_tool_set_cursor          (GimpTool            *tool,
+                                                 GimpDisplay         *display,
+                                                 GimpCursorType       cursor,
+                                                 GimpToolCursorType   tool_cursor,
+                                                 GimpCursorModifier   modifier);
+
+
+#endif  /*  __GIMP_TOOL_H__  */
diff --git a/app/tools/gimptoolcontrol.c b/app/tools/gimptoolcontrol.c
new file mode 100644
index 0000000..d8b1386
--- /dev/null
+++ b/app/tools/gimptoolcontrol.c
@@ -0,0 +1,727 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "tools-types.h"
+
+#include "gimptoolcontrol.h"
+
+
+static void gimp_tool_control_finalize (GObject *object);
+
+
+G_DEFINE_TYPE (GimpToolControl, gimp_tool_control, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_tool_control_parent_class
+
+
+static void
+gimp_tool_control_class_init (GimpToolControlClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_tool_control_finalize;
+}
+
+static void
+gimp_tool_control_init (GimpToolControl *control)
+{
+  control->active                 = FALSE;
+  control->paused_count           = 0;
+
+  control->preserve               = TRUE;
+  control->scroll_lock            = FALSE;
+  control->handle_empty_image     = FALSE;
+
+  control->dirty_mask             = GIMP_DIRTY_NONE;
+  control->dirty_action           = GIMP_TOOL_ACTION_HALT;
+  control->motion_mode            = GIMP_MOTION_MODE_COMPRESS;
+
+  control->auto_snap_to           = TRUE;
+  control->snap_offset_x          = 0;
+  control->snap_offset_y          = 0;
+  control->snap_width             = 0;
+  control->snap_height            = 0;
+
+  control->precision              = GIMP_CURSOR_PRECISION_PIXEL_CENTER;
+
+  control->toggled                = FALSE;
+
+  control->wants_click            = FALSE;
+  control->wants_double_click     = FALSE;
+  control->wants_triple_click     = FALSE;
+  control->wants_all_key_events   = FALSE;
+
+  control->active_modifiers       = GIMP_TOOL_ACTIVE_MODIFIERS_OFF;
+
+  control->cursor                 = GIMP_CURSOR_MOUSE;
+  control->tool_cursor            = GIMP_TOOL_CURSOR_NONE;
+  control->cursor_modifier        = GIMP_CURSOR_MODIFIER_NONE;
+
+  control->toggle_cursor          = -1;
+  control->toggle_tool_cursor     = -1;
+  control->toggle_cursor_modifier = -1;
+}
+
+static void
+gimp_tool_control_finalize (GObject *object)
+{
+  GimpToolControl *control = GIMP_TOOL_CONTROL (object);
+
+  g_slist_free (control->preserve_stack);
+
+  g_free (control->action_opacity);
+  g_free (control->action_size);
+  g_free (control->action_aspect);
+  g_free (control->action_angle);
+  g_free (control->action_spacing);
+  g_free (control->action_hardness);
+  g_free (control->action_force);
+  g_free (control->action_object_1);
+  g_free (control->action_object_2);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+/*  public functions  */
+
+void
+gimp_tool_control_activate (GimpToolControl *control)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+  g_return_if_fail (control->active == FALSE);
+
+  control->active = TRUE;
+}
+
+void
+gimp_tool_control_halt (GimpToolControl *control)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+  g_return_if_fail (control->active == TRUE);
+
+  control->active = FALSE;
+}
+
+gboolean
+gimp_tool_control_is_active (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->active;
+}
+
+void
+gimp_tool_control_pause (GimpToolControl *control)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->paused_count++;
+}
+
+void
+gimp_tool_control_resume (GimpToolControl *control)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+  g_return_if_fail (control->paused_count > 0);
+
+  control->paused_count--;
+}
+
+gboolean
+gimp_tool_control_is_paused (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->paused_count > 0;
+}
+
+void
+gimp_tool_control_set_preserve (GimpToolControl *control,
+                                gboolean         preserve)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->preserve = preserve ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_preserve (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->preserve;
+}
+
+void
+gimp_tool_control_push_preserve (GimpToolControl *control,
+                                 gboolean         preserve)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->preserve_stack =
+    g_slist_prepend (control->preserve_stack,
+                     GINT_TO_POINTER (control->preserve));
+
+  control->preserve = preserve ? TRUE : FALSE;
+}
+
+void
+gimp_tool_control_pop_preserve (GimpToolControl *control)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+  g_return_if_fail (control->preserve_stack != NULL);
+
+  control->preserve = GPOINTER_TO_INT (control->preserve_stack->data);
+
+  control->preserve_stack = g_slist_delete_link (control->preserve_stack,
+                                                 control->preserve_stack);
+}
+
+void
+gimp_tool_control_set_scroll_lock (GimpToolControl *control,
+                                   gboolean         scroll_lock)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->scroll_lock = scroll_lock ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_scroll_lock (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->scroll_lock;
+}
+
+void
+gimp_tool_control_set_handle_empty_image (GimpToolControl *control,
+                                          gboolean         handle_empty)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->handle_empty_image = handle_empty ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_handle_empty_image (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->handle_empty_image;
+}
+
+void
+gimp_tool_control_set_dirty_mask (GimpToolControl *control,
+                                  GimpDirtyMask    dirty_mask)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->dirty_mask = dirty_mask;
+}
+
+GimpDirtyMask
+gimp_tool_control_get_dirty_mask (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), GIMP_DIRTY_NONE);
+
+  return control->dirty_mask;
+}
+
+void
+gimp_tool_control_set_dirty_action (GimpToolControl *control,
+                                    GimpToolAction  action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->dirty_action = action;
+}
+
+GimpToolAction
+gimp_tool_control_get_dirty_action (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), GIMP_TOOL_ACTION_HALT);
+
+  return control->dirty_action;
+}
+
+void
+gimp_tool_control_set_motion_mode (GimpToolControl *control,
+                                   GimpMotionMode   motion_mode)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->motion_mode = motion_mode;
+}
+
+GimpMotionMode
+gimp_tool_control_get_motion_mode (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), GIMP_MOTION_MODE_EXACT);
+
+  return control->motion_mode;
+}
+
+void
+gimp_tool_control_set_snap_to (GimpToolControl *control,
+                               gboolean         snap_to)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->auto_snap_to = snap_to ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_snap_to (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->auto_snap_to;
+}
+
+void
+gimp_tool_control_set_wants_click (GimpToolControl *control,
+                                   gboolean         wants_click)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->wants_click = wants_click ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_wants_click (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->wants_click;
+}
+
+void
+gimp_tool_control_set_wants_double_click (GimpToolControl *control,
+                                          gboolean         wants_double_click)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->wants_double_click = wants_double_click ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_wants_double_click (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->wants_double_click;
+}
+
+void
+gimp_tool_control_set_wants_triple_click (GimpToolControl *control,
+                                          gboolean         wants_triple_click)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->wants_triple_click = wants_triple_click ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_wants_triple_click (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->wants_triple_click;
+}
+
+void
+gimp_tool_control_set_wants_all_key_events (GimpToolControl *control,
+                                            gboolean         wants_key_events)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->wants_all_key_events = wants_key_events ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_wants_all_key_events (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->wants_all_key_events;
+}
+
+void
+gimp_tool_control_set_active_modifiers (GimpToolControl         *control,
+                                        GimpToolActiveModifiers  active_modifiers)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->active_modifiers = active_modifiers;
+}
+
+GimpToolActiveModifiers
+gimp_tool_control_get_active_modifiers (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control),
+                        GIMP_TOOL_ACTIVE_MODIFIERS_OFF);
+
+  return control->active_modifiers;
+}
+
+void
+gimp_tool_control_set_snap_offsets (GimpToolControl *control,
+                                    gint             offset_x,
+                                    gint             offset_y,
+                                    gint             width,
+                                    gint             height)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->snap_offset_x = offset_x;
+  control->snap_offset_y = offset_y;
+  control->snap_width    = width;
+  control->snap_height   = height;
+}
+
+void
+gimp_tool_control_get_snap_offsets (GimpToolControl *control,
+                                    gint            *offset_x,
+                                    gint            *offset_y,
+                                    gint            *width,
+                                    gint            *height)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (offset_x) *offset_x = control->snap_offset_x;
+  if (offset_y) *offset_y = control->snap_offset_y;
+  if (width)    *width    = control->snap_width;
+  if (height)   *height   = control->snap_height;
+}
+
+void
+gimp_tool_control_set_precision (GimpToolControl     *control,
+                                 GimpCursorPrecision  precision)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->precision = precision;
+}
+
+GimpCursorPrecision
+gimp_tool_control_get_precision (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control),
+                        GIMP_CURSOR_PRECISION_PIXEL_CENTER);
+
+  return control->precision;
+}
+
+void
+gimp_tool_control_set_toggled (GimpToolControl *control,
+                               gboolean         toggled)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->toggled = toggled ? TRUE : FALSE;
+}
+
+gboolean
+gimp_tool_control_get_toggled (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  return control->toggled;
+}
+
+void
+gimp_tool_control_set_cursor (GimpToolControl *control,
+                              GimpCursorType   cursor)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->cursor = cursor;
+}
+
+void
+gimp_tool_control_set_tool_cursor (GimpToolControl    *control,
+                                   GimpToolCursorType  cursor)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->tool_cursor = cursor;
+}
+
+void
+gimp_tool_control_set_cursor_modifier (GimpToolControl    *control,
+                                       GimpCursorModifier  modifier)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->cursor_modifier = modifier;
+}
+
+void
+gimp_tool_control_set_toggle_cursor (GimpToolControl *control,
+                                     GimpCursorType   cursor)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->toggle_cursor = cursor;
+}
+
+void
+gimp_tool_control_set_toggle_tool_cursor (GimpToolControl    *control,
+                                          GimpToolCursorType  cursor)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->toggle_tool_cursor = cursor;
+}
+
+void
+gimp_tool_control_set_toggle_cursor_modifier (GimpToolControl    *control,
+                                              GimpCursorModifier  modifier)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  control->toggle_cursor_modifier = modifier;
+}
+
+GimpCursorType
+gimp_tool_control_get_cursor (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  if (control->toggled && control->toggle_cursor != -1)
+    return control->toggle_cursor;
+
+  return control->cursor;
+}
+
+GimpToolCursorType
+gimp_tool_control_get_tool_cursor (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  if (control->toggled && control->toggle_tool_cursor != -1)
+    return control->toggle_tool_cursor;
+
+  return control->tool_cursor;
+}
+
+GimpCursorModifier
+gimp_tool_control_get_cursor_modifier (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), FALSE);
+
+  if (control->toggled && control->toggle_cursor_modifier != -1)
+    return control->toggle_cursor_modifier;
+
+  return control->cursor_modifier;
+}
+
+void
+gimp_tool_control_set_action_opacity (GimpToolControl *control,
+                                      const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_opacity)
+    {
+      g_free (control->action_opacity);
+      control->action_opacity = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_opacity (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_opacity;
+}
+
+void
+gimp_tool_control_set_action_size (GimpToolControl *control,
+                                   const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_size)
+    {
+      g_free (control->action_size);
+      control->action_size = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_size (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_size;
+}
+
+void
+gimp_tool_control_set_action_aspect (GimpToolControl *control,
+                                     const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_aspect)
+    {
+      g_free (control->action_aspect);
+      control->action_aspect = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_aspect (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_aspect;
+}
+
+void
+gimp_tool_control_set_action_angle (GimpToolControl *control,
+                                    const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_angle)
+    {
+      g_free (control->action_angle);
+      control->action_angle = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_angle (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_angle;
+}
+
+void
+gimp_tool_control_set_action_spacing (GimpToolControl *control,
+                                      const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_spacing)
+    {
+      g_free (control->action_spacing);
+      control->action_spacing = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_spacing (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_spacing;
+}
+
+void
+gimp_tool_control_set_action_hardness (GimpToolControl *control,
+                                       const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_hardness)
+    {
+      g_free (control->action_hardness);
+      control->action_hardness = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_hardness (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_hardness;
+}
+
+void
+gimp_tool_control_set_action_force (GimpToolControl *control,
+                                      const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_force)
+    {
+      g_free (control->action_force);
+      control->action_force = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_force (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_force;
+}
+
+void
+gimp_tool_control_set_action_object_1 (GimpToolControl *control,
+                                       const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_object_1)
+    {
+      g_free (control->action_object_1);
+      control->action_object_1 = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_object_1 (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_object_1;
+}
+
+void
+gimp_tool_control_set_action_object_2 (GimpToolControl *control,
+                                       const gchar     *action)
+{
+  g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
+
+  if (action != control->action_object_2)
+    {
+      g_free (control->action_object_2);
+      control->action_object_2 = g_strdup (action);
+    }
+}
+
+const gchar *
+gimp_tool_control_get_action_object_2 (GimpToolControl *control)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
+
+  return control->action_object_2;
+}
diff --git a/app/tools/gimptoolcontrol.h b/app/tools/gimptoolcontrol.h
new file mode 100644
index 0000000..8551806
--- /dev/null
+++ b/app/tools/gimptoolcontrol.h
@@ -0,0 +1,254 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_CONTROL_H__
+#define __GIMP_TOOL_CONTROL_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_TOOL_CONTROL            (gimp_tool_control_get_type ())
+#define GIMP_TOOL_CONTROL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_CONTROL, GimpToolControl))
+#define GIMP_TOOL_CONTROL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_CONTROL, GimpToolControlClass))
+#define GIMP_IS_TOOL_CONTROL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_CONTROL))
+#define GIMP_IS_TOOL_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_CONTROL))
+#define GIMP_TOOL_CONTROL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_CONTROL, GimpToolControlClass))
+
+
+typedef struct _GimpToolControlClass GimpToolControlClass;
+
+
+struct _GimpToolControl
+{
+  GimpObject           parent_instance;
+
+  gboolean             active;             /*  state of tool activity          */
+  gint                 paused_count;       /*  paused control count            */
+
+  gboolean             preserve;           /*  Preserve this tool across       *
+                                            *  drawable changes                */
+  GSList              *preserve_stack;     /*  for push/pop preserve           */
+
+  gboolean             scroll_lock;        /*  allow scrolling or not          */
+  gboolean             handle_empty_image; /*  invoke the tool on images       *
+                                            *  without active drawable         */
+  GimpDirtyMask        dirty_mask;         /*  if preserve is FALSE, stop      *
+                                            *  the tool on these events        */
+  GimpToolAction       dirty_action;       /*  use this action to stop the     *
+                                            *  tool when one of the dirty      *
+                                            *  events occurs                   */
+  GimpMotionMode       motion_mode;        /*  how to process motion events    *
+                                            *  before they go to the tool      */
+  gboolean             auto_snap_to;       /*  snap to guides automatically    */
+  gint                 snap_offset_x;
+  gint                 snap_offset_y;
+  gint                 snap_width;
+  gint                 snap_height;
+
+  GimpCursorPrecision  precision;
+
+  gboolean             wants_click;        /*  wants click detection           */
+  gboolean             wants_double_click;
+  gboolean             wants_triple_click;
+  gboolean             wants_all_key_events;
+
+  GimpToolActiveModifiers  active_modifiers;
+
+  gboolean             toggled;
+
+  GimpCursorType       cursor;
+  GimpToolCursorType   tool_cursor;
+  GimpCursorModifier   cursor_modifier;
+
+  GimpCursorType       toggle_cursor;
+  GimpToolCursorType   toggle_tool_cursor;
+  GimpCursorModifier   toggle_cursor_modifier;
+
+  gchar               *action_opacity;
+  gchar               *action_size;
+  gchar               *action_aspect;
+  gchar               *action_angle;
+  gchar               *action_spacing;
+  gchar               *action_hardness;
+  gchar               *action_force;
+  gchar               *action_object_1;
+  gchar               *action_object_2;
+};
+
+struct _GimpToolControlClass
+{
+  GimpObjectClass parent_class;
+};
+
+
+GType          gimp_tool_control_get_type           (void) G_GNUC_CONST;
+
+void           gimp_tool_control_activate           (GimpToolControl *control);
+void           gimp_tool_control_halt               (GimpToolControl *control);
+gboolean       gimp_tool_control_is_active          (GimpToolControl *control);
+
+void           gimp_tool_control_pause              (GimpToolControl *control);
+void           gimp_tool_control_resume             (GimpToolControl *control);
+gboolean       gimp_tool_control_is_paused          (GimpToolControl *control);
+
+void           gimp_tool_control_set_preserve       (GimpToolControl *control,
+                                                     gboolean         preserve);
+gboolean       gimp_tool_control_get_preserve       (GimpToolControl *control);
+
+void           gimp_tool_control_push_preserve      (GimpToolControl *control,
+                                                     gboolean         preserve);
+void           gimp_tool_control_pop_preserve       (GimpToolControl *control);
+
+void           gimp_tool_control_set_scroll_lock    (GimpToolControl *control,
+                                                     gboolean         scroll_lock);
+gboolean       gimp_tool_control_get_scroll_lock    (GimpToolControl *control);
+
+void           gimp_tool_control_set_handle_empty_image
+                                                    (GimpToolControl *control,
+                                                     gboolean         handle_empty);
+gboolean       gimp_tool_control_get_handle_empty_image
+                                                    (GimpToolControl *control);
+
+void           gimp_tool_control_set_dirty_mask     (GimpToolControl *control,
+                                                     GimpDirtyMask    dirty_mask);
+GimpDirtyMask  gimp_tool_control_get_dirty_mask     (GimpToolControl *control);
+
+void           gimp_tool_control_set_dirty_action   (GimpToolControl *control,
+                                                     GimpToolAction   action);
+GimpToolAction gimp_tool_control_get_dirty_action   (GimpToolControl *control);
+
+void           gimp_tool_control_set_motion_mode    (GimpToolControl *control,
+                                                     GimpMotionMode   motion_mode);
+GimpMotionMode gimp_tool_control_get_motion_mode    (GimpToolControl *control);
+
+void           gimp_tool_control_set_snap_to        (GimpToolControl *control,
+                                                     gboolean         snap_to);
+gboolean       gimp_tool_control_get_snap_to        (GimpToolControl *control);
+
+void           gimp_tool_control_set_wants_click    (GimpToolControl *control,
+                                                     gboolean         wants_click);
+gboolean       gimp_tool_control_get_wants_click    (GimpToolControl *control);
+
+void           gimp_tool_control_set_wants_double_click
+                                                    (GimpToolControl *control,
+                                                     gboolean         wants_double_click);
+gboolean       gimp_tool_control_get_wants_double_click
+                                                    (GimpToolControl *control);
+
+void           gimp_tool_control_set_wants_triple_click
+                                                    (GimpToolControl *control,
+                                                     gboolean         wants_double_click);
+gboolean       gimp_tool_control_get_wants_triple_click
+                                                    (GimpToolControl *control);
+
+void           gimp_tool_control_set_wants_all_key_events
+                                                    (GimpToolControl *control,
+                                                     gboolean         wants_key_events);
+gboolean       gimp_tool_control_get_wants_all_key_events
+                                                    (GimpToolControl *control);
+
+void           gimp_tool_control_set_active_modifiers
+                                                    (GimpToolControl *control,
+                                                     GimpToolActiveModifiers  active_modifiers);
+GimpToolActiveModifiers
+               gimp_tool_control_get_active_modifiers
+                                                    (GimpToolControl *control);
+
+void           gimp_tool_control_set_snap_offsets   (GimpToolControl *control,
+                                                     gint             offset_x,
+                                                     gint             offset_y,
+                                                     gint             width,
+                                                     gint             height);
+void           gimp_tool_control_get_snap_offsets   (GimpToolControl *control,
+                                                     gint            *offset_x,
+                                                     gint            *offset_y,
+                                                     gint            *width,
+                                                     gint            *height);
+
+void           gimp_tool_control_set_precision      (GimpToolControl *control,
+                                                     GimpCursorPrecision  precision);
+GimpCursorPrecision
+               gimp_tool_control_get_precision      (GimpToolControl *control);
+
+void           gimp_tool_control_set_toggled        (GimpToolControl *control,
+                                                     gboolean         toggled);
+gboolean       gimp_tool_control_get_toggled        (GimpToolControl *control);
+
+void           gimp_tool_control_set_cursor         (GimpToolControl *control,
+                                                     GimpCursorType   cursor);
+void           gimp_tool_control_set_tool_cursor    (GimpToolControl *control,
+                                                     GimpToolCursorType  cursor);
+void           gimp_tool_control_set_cursor_modifier
+                                                    (GimpToolControl *control,
+                                                     GimpCursorModifier  modifier);
+void           gimp_tool_control_set_toggle_cursor  (GimpToolControl *control,
+                                                     GimpCursorType   cursor);
+void           gimp_tool_control_set_toggle_tool_cursor
+                                                    (GimpToolControl *control,
+                                                     GimpToolCursorType  cursor);
+void           gimp_tool_control_set_toggle_cursor_modifier
+                                                    (GimpToolControl *control,
+                                                     GimpCursorModifier  modifier);
+
+GimpCursorType
+              gimp_tool_control_get_cursor          (GimpToolControl *control);
+
+GimpToolCursorType
+              gimp_tool_control_get_tool_cursor     (GimpToolControl *control);
+
+GimpCursorModifier
+              gimp_tool_control_get_cursor_modifier (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_opacity  (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_opacity  (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_size     (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_size     (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_aspect   (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_aspect   (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_angle    (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_angle    (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_spacing  (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_spacing  (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_hardness (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_hardness (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_force    (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_force    (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_object_1 (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_object_1 (GimpToolControl *control);
+
+void          gimp_tool_control_set_action_object_2 (GimpToolControl *control,
+                                                     const gchar     *action);
+const gchar * gimp_tool_control_get_action_object_2 (GimpToolControl *control);
+
+
+#endif /* __GIMP_TOOL_CONTROL_H__ */
diff --git a/app/tools/gimptooloptions-gui.c b/app/tools/gimptooloptions-gui.c
new file mode 100644
index 0000000..7e0ef3e
--- /dev/null
+++ b/app/tools/gimptooloptions-gui.c
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimptooloptions.h"
+
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_tool_options_gui (GimpToolOptions *tool_options)
+{
+  GtkWidget *vbox;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options), NULL);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+
+  return vbox;
+}
+
+GtkWidget *
+gimp_tool_options_empty_gui (GimpToolOptions *tool_options)
+{
+  GtkWidget *vbox = gimp_tool_options_gui (tool_options);
+  GtkWidget *label;
+
+  label = gtk_label_new (_("This tool has\nno options."));
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
+  gtk_widget_show (label);
+
+  return vbox;
+}
diff --git a/app/tools/gimptooloptions-gui.h b/app/tools/gimptooloptions-gui.h
new file mode 100644
index 0000000..5847e92
--- /dev/null
+++ b/app/tools/gimptooloptions-gui.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_OPTIONS_GUI_H__
+#define __GIMP_TOOL_OPTIONS_GUI_H__
+
+
+GtkWidget * gimp_tool_options_gui       (GimpToolOptions *tool_options);
+GtkWidget * gimp_tool_options_empty_gui (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_TOOL_OPTIONS_GUI_H__  */
diff --git a/app/tools/gimptools-utils.c b/app/tools/gimptools-utils.c
new file mode 100644
index 0000000..27fe0b6
--- /dev/null
+++ b/app/tools/gimptools-utils.c
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimplayer.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpitemtreeview.h"
+#include "widgets/gimpwidgets-utils.h"
+#include "widgets/gimpwindowstrategy.h"
+
+#include "gimptools-utils.h"
+
+
+/*  public functions  */
+
+void
+gimp_tools_blink_lock_box (Gimp     *gimp,
+                           GimpItem *item)
+{
+  GtkWidget        *dockable;
+  GimpItemTreeView *view;
+  GdkScreen        *screen;
+  gint              monitor;
+  const gchar      *identifier;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  if (GIMP_IS_LAYER (item))
+    identifier = "gimp-layer-list";
+  else if (GIMP_IS_CHANNEL (item))
+    identifier = "gimp-channel-list";
+  else if (GIMP_IS_VECTORS (item))
+    identifier = "gimp-vectors-list";
+  else
+    return;
+
+  monitor = gimp_get_monitor_at_pointer (&screen);
+
+  dockable = gimp_window_strategy_show_dockable_dialog (
+    GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)),
+    gimp,
+    gimp_dialog_factory_get_singleton (),
+    screen, monitor,
+    identifier);
+
+  if (! dockable)
+    return;
+
+  view = GIMP_ITEM_TREE_VIEW (gtk_bin_get_child (GTK_BIN (dockable)));
+
+  gimp_widget_blink (gimp_item_tree_view_get_lock_box (view));
+}
diff --git a/app/tools/gimptools-utils.h b/app/tools/gimptools-utils.h
new file mode 100644
index 0000000..5810f19
--- /dev/null
+++ b/app/tools/gimptools-utils.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLS_UTILS_H__
+#define __GIMP_TOOLS_UTILS_H__
+
+
+void   gimp_tools_blink_lock_box (Gimp     *gimp,
+                                  GimpItem *item);
+
+
+#endif  /* __GIMP_TOOLS_UTILS_H__ */
diff --git a/app/tools/gimptransform3doptions.c b/app/tools/gimptransform3doptions.c
new file mode 100644
index 0000000..bede62b
--- /dev/null
+++ b/app/tools/gimptransform3doptions.c
@@ -0,0 +1,225 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimptransform3doptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_MODE,
+  PROP_UNIFIED,
+  PROP_CONSTRAIN_AXIS,
+  PROP_Z_AXIS,
+  PROP_LOCAL_FRAME
+};
+
+
+static void   gimp_transform_3d_options_set_property (GObject      *object,
+                                                      guint         property_id,
+                                                      const GValue *value,
+                                                      GParamSpec   *pspec);
+static void   gimp_transform_3d_options_get_property (GObject      *object,
+                                                      guint         property_id,
+                                                      GValue       *value,
+                                                      GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpTransform3DOptions, gimp_transform_3d_options,
+               GIMP_TYPE_TRANSFORM_GRID_OPTIONS)
+
+#define parent_class gimp_transform_3d_options_parent_class
+
+
+static void
+gimp_transform_3d_options_class_init (GimpTransform3DOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_transform_3d_options_set_property;
+  object_class->get_property = gimp_transform_3d_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_MODE,
+                         "mode",
+                         _("Mode"),
+                         _("Transform mode"),
+                         GIMP_TYPE_TRANSFORM_3D_MODE,
+                         GIMP_TRANSFORM_3D_MODE_ROTATE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_UNIFIED,
+                            "unified",
+                            _("Unified interaction"),
+                            _("Combine all interaction modes"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_AXIS,
+                            "constrain-axis",
+                            NULL,
+                            _("Constrain transformation to a single axis"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_Z_AXIS,
+                            "z-axis",
+                            NULL,
+                            _("Transform along the Z axis"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_LOCAL_FRAME,
+                            "local-frame",
+                            NULL,
+                            _("Transform in the local frame of reference"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_transform_3d_options_init (GimpTransform3DOptions *options)
+{
+}
+
+static void
+gimp_transform_3d_options_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpTransform3DOptions *options = GIMP_TRANSFORM_3D_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      options->mode = g_value_get_enum (value);
+      break;
+    case PROP_UNIFIED:
+      options->unified = g_value_get_boolean (value);
+      break;
+
+    case PROP_CONSTRAIN_AXIS:
+      options->constrain_axis = g_value_get_boolean (value);
+      break;
+    case PROP_Z_AXIS:
+      options->z_axis = g_value_get_boolean (value);
+      break;
+    case PROP_LOCAL_FRAME:
+      options->local_frame = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_transform_3d_options_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpTransform3DOptions *options = GIMP_TRANSFORM_3D_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      g_value_set_enum (value, options->mode);
+      break;
+    case PROP_UNIFIED:
+      g_value_set_boolean (value, options->unified);
+      break;
+
+    case PROP_CONSTRAIN_AXIS:
+      g_value_set_boolean (value, options->constrain_axis);
+      break;
+    case PROP_Z_AXIS:
+      g_value_set_boolean (value, options->z_axis);
+      break;
+    case PROP_LOCAL_FRAME:
+      g_value_set_boolean (value, options->local_frame);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_transform_3d_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config = G_OBJECT (tool_options);
+  GtkWidget       *vbox   = gimp_transform_grid_options_gui (tool_options);
+  GtkWidget       *button;
+  gchar           *label;
+  GdkModifierType  extend_mask    = gimp_get_extend_selection_mask ();
+  GdkModifierType  constrain_mask = gimp_get_constrain_behavior_mask ();
+
+  button = gimp_prop_check_button_new (config, "unified", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  label = g_strdup_printf (_("Constrain axis (%s)"),
+                           gimp_get_mod_string (extend_mask));
+
+  button = gimp_prop_check_button_new (config, "constrain-axis", label);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_free (label);
+
+  label = g_strdup_printf (_("Z axis (%s)"),
+                           gimp_get_mod_string (constrain_mask));
+
+  button = gimp_prop_check_button_new (config, "z-axis", label);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_free (label);
+
+  label = g_strdup_printf (_("Local frame (%s)"),
+                           gimp_get_mod_string (GDK_MOD1_MASK));
+
+  button = gimp_prop_check_button_new (config, "local-frame", label);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_free (label);
+
+  return vbox;
+}
diff --git a/app/tools/gimptransform3doptions.h b/app/tools/gimptransform3doptions.h
new file mode 100644
index 0000000..d0fd3e0
--- /dev/null
+++ b/app/tools/gimptransform3doptions.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_3D_OPTIONS_H__
+#define __GIMP_TRANSFORM_3D_OPTIONS_H__
+
+
+#include "gimptransformgridoptions.h"
+
+
+#define GIMP_TYPE_TRANSFORM_3D_OPTIONS            (gimp_transform_3d_options_get_type ())
+#define GIMP_TRANSFORM_3D_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_3D_OPTIONS, GimpTransform3DOptions))
+#define GIMP_TRANSFORM_3D_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_3D_OPTIONS, GimpTransform3DOptionsClass))
+#define GIMP_IS_TRANSFORM_3D_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_3D_OPTIONS))
+#define GIMP_IS_TRANSFORM_3D_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSFORM_3D_OPTIONS))
+#define GIMP_TRANSFORM_3D_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_3D_OPTIONS, GimpTransform3DOptionsClass))
+
+
+typedef struct _GimpTransform3DOptions      GimpTransform3DOptions;
+typedef struct _GimpTransform3DOptionsClass GimpTransform3DOptionsClass;
+
+struct _GimpTransform3DOptions
+{
+  GimpTransformGridOptions  parent_instance;
+
+  GimpTransform3DMode       mode;
+  gboolean                  unified;
+
+  gboolean                  constrain_axis;
+  gboolean                  z_axis;
+  gboolean                  local_frame;
+};
+
+struct _GimpTransform3DOptionsClass
+{
+  GimpTransformGridOptionsClass  parent_class;
+};
+
+
+GType       gimp_transform_3d_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_transform_3d_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif /* __GIMP_TRANSFORM_3D_OPTIONS_H__ */
diff --git a/app/tools/gimptransform3dtool.c b/app/tools/gimptransform3dtool.c
new file mode 100644
index 0000000..15b50f7
--- /dev/null
+++ b/app/tools/gimptransform3dtool.c
@@ -0,0 +1,1036 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp-transform-3d-utils.h"
+#include "core/gimpimage.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimppivotselector.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptooltransform3dgrid.h"
+
+#include "gimptoolcontrol.h"
+#include "gimptransform3doptions.h"
+#include "gimptransform3dtool.h"
+
+#include "gimp-intl.h"
+
+
+/*  index into trans_info array  */
+enum
+{
+  VANISHING_POINT_X,
+  VANISHING_POINT_Y,
+  LENS_MODE,
+  LENS_VALUE,
+  OFFSET_X,
+  OFFSET_Y,
+  OFFSET_Z,
+  ROTATION_ORDER,
+  ANGLE_X,
+  ANGLE_Y,
+  ANGLE_Z,
+  PIVOT_X,
+  PIVOT_Y,
+  PIVOT_Z
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_transform_3d_tool_modifier_key           (GimpTool              *tool,
+                                                                       GdkModifierType        key,
+                                                                       gboolean               press,
+                                                                       GdkModifierType        state,
+                                                                       GimpDisplay           *display);
+
+static gboolean         gimp_transform_3d_tool_info_to_matrix         (GimpTransformGridTool *tg_tool,
+                                                                       GimpMatrix3           *transform);
+static void             gimp_transform_3d_tool_dialog                 (GimpTransformGridTool *tg_tool);
+static void             gimp_transform_3d_tool_dialog_update          (GimpTransformGridTool *tg_tool);
+static void             gimp_transform_3d_tool_prepare                (GimpTransformGridTool *tg_tool);
+static GimpToolWidget * gimp_transform_3d_tool_get_widget             (GimpTransformGridTool *tg_tool);
+static void             gimp_transform_3d_tool_update_widget          (GimpTransformGridTool *tg_tool);
+static void             gimp_transform_3d_tool_widget_changed         (GimpTransformGridTool *tg_tool);
+
+static void             gimp_transform_3d_tool_dialog_changed         (GObject               *object,
+                                                                       GimpTransform3DTool   *t3d);
+static void             gimp_transform_3d_tool_lens_mode_changed      (GtkComboBox           *combo,
+                                                                       GimpTransform3DTool   *t3d);
+static void             gimp_transform_3d_tool_rotation_order_clicked (GtkButton             *button,
+                                                                       GimpTransform3DTool   *t3d);
+static void             gimp_transform_3d_tool_pivot_changed          (GimpPivotSelector     *selector,
+                                                                       GimpTransform3DTool   *t3d);
+
+static gdouble          gimp_transform_3d_tool_get_focal_length       (GimpTransform3DTool   *t3d);
+
+
+G_DEFINE_TYPE (GimpTransform3DTool, gimp_transform_3d_tool, GIMP_TYPE_TRANSFORM_GRID_TOOL)
+
+#define parent_class gimp_transform_3d_tool_parent_class
+
+
+void
+gimp_transform_3d_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_TRANSFORM_3D_TOOL,
+                GIMP_TYPE_TRANSFORM_3D_OPTIONS,
+                gimp_transform_3d_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-transform-3d-tool",
+                _("3D Transform"),
+                _("3D Transform Tool: Apply a 3D transformation to the layer, selection or path"),
+                N_("_3D Transform"), "<shift>W",
+                NULL, GIMP_HELP_TOOL_TRANSFORM_3D,
+                GIMP_ICON_TOOL_TRANSFORM_3D,
+                data);
+}
+
+static void
+gimp_transform_3d_tool_class_init (GimpTransform3DToolClass *klass)
+{
+  GimpToolClass              *tool_class = GIMP_TOOL_CLASS (klass);
+  GimpTransformToolClass     *tr_class   = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass *tg_class   = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+
+  tool_class->modifier_key  = gimp_transform_3d_tool_modifier_key;
+
+  tg_class->info_to_matrix  = gimp_transform_3d_tool_info_to_matrix;
+  tg_class->dialog          = gimp_transform_3d_tool_dialog;
+  tg_class->dialog_update   = gimp_transform_3d_tool_dialog_update;
+  tg_class->prepare         = gimp_transform_3d_tool_prepare;
+  tg_class->get_widget      = gimp_transform_3d_tool_get_widget;
+  tg_class->update_widget   = gimp_transform_3d_tool_update_widget;
+  tg_class->widget_changed  = gimp_transform_3d_tool_widget_changed;
+
+  tr_class->undo_desc       = C_("undo-type", "3D Transform");
+  tr_class->progress_text   = _("3D transformation");
+}
+
+static void
+gimp_transform_3d_tool_init (GimpTransform3DTool *t3d)
+{
+}
+
+static void
+gimp_transform_3d_tool_modifier_key (GimpTool        *tool,
+                                     GdkModifierType  key,
+                                     gboolean         press,
+                                     GdkModifierType  state,
+                                     GimpDisplay     *display)
+{
+  GimpTransform3DOptions *options = GIMP_TRANSFORM_3D_TOOL_GET_OPTIONS (tool);
+
+  if (key == gimp_get_extend_selection_mask ())
+    {
+      g_object_set (options,
+                    "constrain-axis", ! options->constrain_axis,
+                    NULL);
+    }
+  else if (key == gimp_get_constrain_behavior_mask ())
+    {
+      g_object_set (options,
+                    "z-axis", ! options->z_axis,
+                    NULL);
+    }
+  else if (key == GDK_MOD1_MASK)
+    {
+      g_object_set (options,
+                    "local-frame", ! options->local_frame,
+                    NULL);
+    }
+}
+
+static gboolean
+gimp_transform_3d_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                       GimpMatrix3           *transform)
+{
+  GimpTransform3DTool *t3d = GIMP_TRANSFORM_3D_TOOL (tg_tool);
+
+  gimp_transform_3d_matrix (transform,
+
+                            tg_tool->trans_info[VANISHING_POINT_X],
+                            tg_tool->trans_info[VANISHING_POINT_Y],
+                            -gimp_transform_3d_tool_get_focal_length (t3d),
+
+                            tg_tool->trans_info[OFFSET_X],
+                            tg_tool->trans_info[OFFSET_Y],
+                            tg_tool->trans_info[OFFSET_Z],
+
+                            tg_tool->trans_info[ROTATION_ORDER],
+                            tg_tool->trans_info[ANGLE_X],
+                            tg_tool->trans_info[ANGLE_Y],
+                            tg_tool->trans_info[ANGLE_Z],
+
+                            tg_tool->trans_info[PIVOT_X],
+                            tg_tool->trans_info[PIVOT_Y],
+                            tg_tool->trans_info[PIVOT_Z]);
+
+  return TRUE;
+}
+
+static void
+gimp_transform_3d_tool_dialog (GimpTransformGridTool *tg_tool)
+{
+  GimpTransform3DTool    *t3d   = GIMP_TRANSFORM_3D_TOOL (tg_tool);
+  GimpTransform3DOptions *options   = GIMP_TRANSFORM_3D_TOOL_GET_OPTIONS (tg_tool);
+  GtkWidget              *notebook;
+  GtkWidget              *label;
+  GtkWidget              *vbox;
+  GtkWidget              *frame;
+  GtkWidget              *vbox2;
+  GtkWidget              *se;
+  GtkWidget              *spinbutton;
+  GtkWidget              *combo;
+  GtkWidget              *scale;
+  GtkWidget              *table;
+  GtkWidget              *button;
+  GtkWidget              *selector;
+  gint                    i;
+
+  /* main notebook */
+  notebook = gtk_notebook_new ();
+  gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_LEFT);
+  gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (tg_tool->gui)),
+                      notebook, FALSE, FALSE, 0);
+  gtk_widget_show (notebook);
+
+  t3d->notebook = notebook;
+
+  /* camera page */
+  label = gtk_image_new_from_icon_name (GIMP_ICON_TRANSFORM_3D_CAMERA,
+                                        GTK_ICON_SIZE_MENU);
+  gimp_help_set_help_data (label, _("Camera"), NULL);
+  gtk_widget_show (label);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (vbox);
+
+  /* vanishing-point frame */
+  frame = gimp_frame_new (_("Vanishing Point"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  /* vanishing-point size entry */
+  se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a", TRUE, TRUE, FALSE, 6,
+                            GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_row_spacings (GTK_TABLE (se), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (se), 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), se, FALSE, FALSE, 0);
+  gtk_widget_show (se);
+
+  t3d->vanishing_point_se = se;
+
+  spinbutton = gimp_spin_button_new_with_range (0.0, 0.0, 1.0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6);
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (se),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (se), spinbutton, 1, 2, 0, 1);
+  gtk_widget_show (spinbutton);
+
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (se), _("_X:"), 0, 0, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (se), _("_Y:"), 1, 0, 0.0);
+
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (se), 0, 2);
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (se), 1, 2);
+
+  g_signal_connect (se, "value-changed",
+                    G_CALLBACK (gimp_transform_3d_tool_dialog_changed),
+                    t3d);
+
+  /* lens frame */
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /* lens-mode combo */
+  combo = gimp_enum_combo_box_new (GIMP_TYPE_TRANSFORM_3D_LENS_MODE);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
+  gtk_widget_show (combo);
+
+  t3d->lens_mode_combo = combo;
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_transform_3d_tool_lens_mode_changed),
+                    t3d);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  /* focal-length size entry */
+  se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a", TRUE, FALSE, FALSE, 6,
+                            GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_col_spacings (GTK_TABLE (se), 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), se, FALSE, FALSE, 0);
+
+  t3d->focal_length_se = se;
+
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (se), 0, 2);
+
+  gimp_size_entry_set_value_boundaries (GIMP_SIZE_ENTRY (se), 0,
+                                        0.0, G_MAXDOUBLE);
+
+  g_signal_connect (se, "value-changed",
+                    G_CALLBACK (gimp_transform_3d_tool_dialog_changed),
+                    t3d);
+
+  /* angle-of-view spin scale */
+  t3d->angle_of_view_adj = (GtkAdjustment *)
+    gtk_adjustment_new (0, 0, 180, 1, 10, 0);
+  scale = gimp_spin_scale_new (t3d->angle_of_view_adj,
+                               _("Angle"), 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  t3d->angle_of_view_scale = scale;
+
+  g_signal_connect (t3d->angle_of_view_adj, "value-changed",
+                    G_CALLBACK (gimp_transform_3d_tool_dialog_changed),
+                    t3d);
+
+  /* move page */
+  label = gtk_image_new_from_icon_name (GIMP_ICON_TRANSFORM_3D_MOVE,
+                                        GTK_ICON_SIZE_MENU);
+  gimp_help_set_help_data (label, _("Move"), NULL);
+  gtk_widget_show (label);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (vbox);
+
+  /* offset frame */
+  frame = gimp_frame_new (_("Offset"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  /* offset size entry */
+  se = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a", TRUE, TRUE, FALSE, 6,
+                            GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_row_spacings (GTK_TABLE (se), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (se), 2);
+  gtk_box_pack_start (GTK_BOX (vbox2), se, FALSE, FALSE, 0);
+  gtk_widget_show (se);
+
+  t3d->offset_se = se;
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_attach_defaults (GTK_TABLE (se), table, 0, 2, 0, 1);
+  gtk_widget_show (table);
+
+  spinbutton = gimp_spin_button_new_with_range (0.0, 0.0, 1.0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6);
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (se),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 1, 2);
+  gtk_widget_show (spinbutton);
+
+  spinbutton = gimp_spin_button_new_with_range (0.0, 0.0, 1.0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6);
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (se),
+                             GTK_SPIN_BUTTON (spinbutton), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 0, 1);
+  gtk_widget_show (spinbutton);
+
+  label = gtk_label_new_with_mnemonic (_("_X:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new_with_mnemonic (_("_Y:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new_with_mnemonic (_("_Z:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (se), label, 0, 1, 1, 2,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (label);
+
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 0,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 1,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (se), 2,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (se), 0, 2);
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (se), 1, 2);
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (se), 2, 2);
+
+  g_signal_connect (se, "value-changed",
+                    G_CALLBACK (gimp_transform_3d_tool_dialog_changed),
+                    t3d);
+
+  /* rotate page */
+  label = gtk_image_new_from_icon_name (GIMP_ICON_TRANSFORM_3D_ROTATE,
+                                        GTK_ICON_SIZE_MENU);
+  gimp_help_set_help_data (label, _("Rotate"), NULL);
+  gtk_widget_show (label);
+
+  /* angle frame */
+  frame = gimp_frame_new (_("Angle"));
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (3, 3, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  for (i = 0; i < 3; i++)
+    {
+      const gchar *labels[3] = {_("X"), _("Y"), _("Z")};
+
+      /* rotation-order button */
+      button = gtk_button_new ();
+      gimp_help_set_help_data (button, _("Rotation axis order"), NULL);
+      gtk_table_attach (GTK_TABLE (table), button, 0, 1, i, i + 1,
+                        GTK_SHRINK, GTK_FILL, 0, 0);
+      gtk_widget_show (button);
+
+      t3d->rotation_order_buttons[i] = button;
+
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (gimp_transform_3d_tool_rotation_order_clicked),
+                        t3d);
+
+      /* angle spin scale */
+      t3d->angle_adj[i] = (GtkAdjustment *)
+        gtk_adjustment_new (0, -180, 180, 1, 10, 0);
+      scale = gimp_spin_scale_new (t3d->angle_adj[i],
+                                   labels[i], 2);
+      gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (scale), TRUE);
+      gtk_table_attach (GTK_TABLE (table), scale, 1, 2, i, i + 1,
+                        GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+      gtk_widget_show (scale);
+
+      g_signal_connect (t3d->angle_adj[i], "value-changed",
+                        G_CALLBACK (gimp_transform_3d_tool_dialog_changed),
+                        t3d);
+    }
+
+  /* pivot selector */
+  selector = gimp_pivot_selector_new (0.0, 0.0, 0.0, 0.0);
+  gtk_table_attach (GTK_TABLE (table), selector, 2, 3, 0, 3,
+                        GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (selector);
+
+  t3d->pivot_selector = selector;
+
+  g_signal_connect (selector, "changed",
+                    G_CALLBACK (gimp_transform_3d_tool_pivot_changed),
+                    t3d);
+
+  g_object_bind_property (options,        "mode",
+                          t3d->notebook,  "page",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+}
+
+static void
+gimp_transform_3d_tool_dialog_update (GimpTransformGridTool *tg_tool)
+{
+  GimpTransform3DTool     *t3d     = GIMP_TRANSFORM_3D_TOOL (tg_tool);
+  Gimp3DTrasnformLensMode  lens_mode;
+  gint                     permutation[3];
+  gint                     i;
+
+  t3d->updating = TRUE;
+
+  /* vanishing-point size entry */
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (t3d->vanishing_point_se),
+                              0, tg_tool->trans_info[VANISHING_POINT_X]);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (t3d->vanishing_point_se),
+                              1, tg_tool->trans_info[VANISHING_POINT_Y]);
+
+  lens_mode = tg_tool->trans_info[LENS_MODE];
+
+  /* lens-mode combo */
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (t3d->lens_mode_combo),
+                                 lens_mode);
+
+  /* focal-length size entry / angle-of-view spin scale */
+  gtk_widget_set_visible (t3d->focal_length_se,
+                          lens_mode ==
+                          GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH);
+  gtk_widget_set_visible (t3d->angle_of_view_scale,
+                          lens_mode !=
+                          GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH);
+
+  switch (lens_mode)
+    {
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH:
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (t3d->focal_length_se),
+                                  0, tg_tool->trans_info[LENS_VALUE]);
+      break;
+
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE:
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM:
+      gtk_adjustment_set_value (
+        t3d->angle_of_view_adj,
+        gimp_rad_to_deg (tg_tool->trans_info[LENS_VALUE]));
+      break;
+    }
+
+  /* offset size entry */
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (t3d->offset_se),
+                              0, tg_tool->trans_info[OFFSET_X]);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (t3d->offset_se),
+                              1, tg_tool->trans_info[OFFSET_Y]);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (t3d->offset_se),
+                              2, tg_tool->trans_info[OFFSET_Z]);
+
+  /* rotation-order buttons */
+  gimp_transform_3d_rotation_order_to_permutation (
+    tg_tool->trans_info[ROTATION_ORDER], permutation);
+
+  for (i = 0; i < 3; i++)
+    {
+      gchar *label;
+
+      label = g_strdup_printf ("%d", i + 1);
+
+      gtk_button_set_label (
+        GTK_BUTTON (t3d->rotation_order_buttons[permutation[i]]), label);
+
+      g_free (label);
+    }
+
+  /* angle spin scales */
+  gtk_adjustment_set_value (t3d->angle_adj[0],
+                            gimp_rad_to_deg (tg_tool->trans_info[ANGLE_X]));
+  gtk_adjustment_set_value (t3d->angle_adj[1],
+                            gimp_rad_to_deg (tg_tool->trans_info[ANGLE_Y]));
+  gtk_adjustment_set_value (t3d->angle_adj[2],
+                            gimp_rad_to_deg (tg_tool->trans_info[ANGLE_Z]));
+
+  /* pivot selector */
+  gimp_pivot_selector_set_position (GIMP_PIVOT_SELECTOR (t3d->pivot_selector),
+                                    tg_tool->trans_info[PIVOT_X],
+                                    tg_tool->trans_info[PIVOT_Y]);
+
+  t3d->updating = FALSE;
+}
+
+static void
+gimp_transform_3d_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpTool            *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool   *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransform3DTool *t3d     = GIMP_TRANSFORM_3D_TOOL (tg_tool);
+  GimpDisplay         *display = tool->display;
+  GimpDisplayShell    *shell   = gimp_display_get_shell (display);
+  GimpImage           *image   = gimp_display_get_image (display);
+  GimpSizeEntry       *se;
+  gdouble              xres;
+  gdouble              yres;
+  gint                 width;
+  gint                 height;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  width  = gimp_image_get_width  (image);
+  height = gimp_image_get_height (image);
+
+  tg_tool->trans_info[VANISHING_POINT_X] = (tr_tool->x1 + tr_tool->x2) / 2.0;
+  tg_tool->trans_info[VANISHING_POINT_Y] = (tr_tool->y1 + tr_tool->y2) / 2.0;
+
+  tg_tool->trans_info[LENS_MODE]         = GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM;
+  tg_tool->trans_info[LENS_VALUE]        = gimp_deg_to_rad (45.0);
+
+  tg_tool->trans_info[OFFSET_X]          = 0.0;
+  tg_tool->trans_info[OFFSET_Y]          = 0.0;
+  tg_tool->trans_info[OFFSET_Z]          = 0.0;
+
+  tg_tool->trans_info[ROTATION_ORDER]    =
+    gimp_transform_3d_permutation_to_rotation_order ((const gint[]) {0, 1, 2});
+  tg_tool->trans_info[ANGLE_X]           = 0.0;
+  tg_tool->trans_info[ANGLE_Y]           = 0.0;
+  tg_tool->trans_info[ANGLE_Z]           = 0.0;
+
+  tg_tool->trans_info[PIVOT_X]           = (tr_tool->x1 + tr_tool->x2) / 2.0;
+  tg_tool->trans_info[PIVOT_Y]           = (tr_tool->y1 + tr_tool->y2) / 2.0;
+  tg_tool->trans_info[PIVOT_Z]           = 0.0;
+
+  t3d->updating = TRUE;
+
+  /* vanishing-point size entry */
+  se = GIMP_SIZE_ENTRY (t3d->vanishing_point_se);
+
+  gimp_size_entry_set_unit (se, shell->unit);
+
+  gimp_size_entry_set_resolution (se, 0, xres, FALSE);
+  gimp_size_entry_set_resolution (se, 1, yres, FALSE);
+
+  gimp_size_entry_set_refval_boundaries (se, 0,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+  gimp_size_entry_set_refval_boundaries (se, 1,
+                                         -GIMP_MAX_IMAGE_SIZE,
+                                         GIMP_MAX_IMAGE_SIZE);
+
+  gimp_size_entry_set_size (se, 0, tr_tool->x1, tr_tool->x2);
+  gimp_size_entry_set_size (se, 1, tr_tool->y1, tr_tool->y2);
+
+  /* focal-length size entry */
+  se = GIMP_SIZE_ENTRY (t3d->focal_length_se);
+
+  gimp_size_entry_set_unit (se, shell->unit);
+
+  gimp_size_entry_set_resolution (se, 0, width >= height ? xres : yres, FALSE);
+
+  /* offset size entry */
+  se = GIMP_SIZE_ENTRY (t3d->offset_se);
+
+  gimp_size_entry_set_unit (se, shell->unit);
+
+  gimp_size_entry_set_resolution (se, 0, xres, FALSE);
+  gimp_size_entry_set_resolution (se, 1, yres, FALSE);
+  gimp_size_entry_set_resolution (se, 2, width >= height ? xres : yres, FALSE);
+
+  gimp_size_entry_set_size (se, 0, 0, width);
+  gimp_size_entry_set_size (se, 1, 0, height);
+  gimp_size_entry_set_size (se, 2, 0, MAX (width, height));
+
+  /* pivot selector */
+  gimp_pivot_selector_set_bounds (GIMP_PIVOT_SELECTOR (t3d->pivot_selector),
+                                  tr_tool->x1, tr_tool->y1,
+                                  tr_tool->x2, tr_tool->y2);
+
+  t3d->updating = FALSE;
+}
+
+static GimpToolWidget *
+gimp_transform_3d_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool               *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool      *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransform3DTool    *t3d     = GIMP_TRANSFORM_3D_TOOL (tg_tool);
+  GimpTransform3DOptions *options = GIMP_TRANSFORM_3D_TOOL_GET_OPTIONS (tg_tool);
+  GimpDisplayShell       *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget         *widget;
+  gint                    i;
+
+  static const gchar *bound_properties[] =
+  {
+    "mode",
+    "unified",
+    "constrain-axis",
+    "z-axis",
+    "local-frame",
+  };
+
+  widget = gimp_tool_transform_3d_grid_new (
+    shell,
+    tr_tool->x1,
+    tr_tool->y1,
+    tr_tool->x2,
+    tr_tool->y2,
+    tg_tool->trans_info[VANISHING_POINT_X],
+    tg_tool->trans_info[VANISHING_POINT_Y],
+    -gimp_transform_3d_tool_get_focal_length (t3d));
+
+  for (i = 0; i < G_N_ELEMENTS (bound_properties); i++)
+    {
+      g_object_bind_property (options, bound_properties[i],
+                              widget,  bound_properties[i],
+                              G_BINDING_SYNC_CREATE |
+                              G_BINDING_BIDIRECTIONAL);
+    }
+
+  return widget;
+}
+
+static void
+gimp_transform_3d_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool   *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransform3DTool *t3d     = GIMP_TRANSFORM_3D_TOOL (tg_tool);
+  GimpMatrix3          transform;
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  gimp_transform_grid_tool_info_to_matrix (tg_tool, &transform);
+
+  g_object_set (
+    tg_tool->widget,
+
+    "x1",             (gdouble) tr_tool->x1,
+    "y1",             (gdouble) tr_tool->y1,
+    "x2",             (gdouble) tr_tool->x2,
+    "y2",             (gdouble) tr_tool->y2,
+
+    "camera-x",       tg_tool->trans_info[VANISHING_POINT_X],
+    "camera-y",       tg_tool->trans_info[VANISHING_POINT_Y],
+    "camera-z",       -gimp_transform_3d_tool_get_focal_length (t3d),
+
+    "offset-x",       tg_tool->trans_info[OFFSET_X],
+    "offset-y",       tg_tool->trans_info[OFFSET_Y],
+    "offset-z",       tg_tool->trans_info[OFFSET_Z],
+
+    "rotation-order", (gint) tg_tool->trans_info[ROTATION_ORDER],
+    "angle-x",        tg_tool->trans_info[ANGLE_X],
+    "angle-y",        tg_tool->trans_info[ANGLE_Y],
+    "angle-z",        tg_tool->trans_info[ANGLE_Z],
+
+    "pivot-3d-x",     tg_tool->trans_info[PIVOT_X],
+    "pivot-3d-y",     tg_tool->trans_info[PIVOT_Y],
+    "pivot-3d-z",     tg_tool->trans_info[PIVOT_Z],
+
+    "transform",      &transform,
+
+    NULL);
+}
+
+static void
+gimp_transform_3d_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  g_object_get (
+    tg_tool->widget,
+
+    "camera-x", &tg_tool->trans_info[VANISHING_POINT_X],
+    "camera-y", &tg_tool->trans_info[VANISHING_POINT_Y],
+
+    "offset-x", &tg_tool->trans_info[OFFSET_X],
+    "offset-y", &tg_tool->trans_info[OFFSET_Y],
+    "offset-z", &tg_tool->trans_info[OFFSET_Z],
+
+    "angle-x",  &tg_tool->trans_info[ANGLE_X],
+    "angle-y",  &tg_tool->trans_info[ANGLE_Y],
+    "angle-z",  &tg_tool->trans_info[ANGLE_Z],
+
+    NULL);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+gimp_transform_3d_tool_dialog_changed (GObject             *object,
+                                       GimpTransform3DTool *t3d)
+{
+  GimpTool              *tool    = GIMP_TOOL (t3d);
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (t3d);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (t3d);
+
+  if (t3d->updating)
+    return;
+
+  /* vanishing-point size entry */
+  tg_tool->trans_info[VANISHING_POINT_X] = gimp_size_entry_get_refval (
+    GIMP_SIZE_ENTRY (t3d->vanishing_point_se), 0);
+  tg_tool->trans_info[VANISHING_POINT_Y] = gimp_size_entry_get_refval (
+    GIMP_SIZE_ENTRY (t3d->vanishing_point_se), 1);
+
+  /* focal-length size entry / angle-of-view spin scale */
+  switch ((gint) tg_tool->trans_info[LENS_MODE])
+    {
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH:
+      tg_tool->trans_info[LENS_VALUE] = gimp_size_entry_get_refval (
+        GIMP_SIZE_ENTRY (t3d->focal_length_se), 0);
+      break;
+
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE:
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM:
+      tg_tool->trans_info[LENS_VALUE] = gimp_deg_to_rad (
+        gtk_adjustment_get_value (t3d->angle_of_view_adj));
+      break;
+    }
+
+  /* offset size entry */
+  tg_tool->trans_info[OFFSET_X] = gimp_size_entry_get_refval (
+    GIMP_SIZE_ENTRY (t3d->offset_se), 0);
+  tg_tool->trans_info[OFFSET_Y] = gimp_size_entry_get_refval (
+    GIMP_SIZE_ENTRY (t3d->offset_se), 1);
+  tg_tool->trans_info[OFFSET_Z] = gimp_size_entry_get_refval (
+    GIMP_SIZE_ENTRY (t3d->offset_se), 2);
+
+  /* angle spin scales */
+  tg_tool->trans_info[ANGLE_X] = gimp_deg_to_rad (gtk_adjustment_get_value (
+    t3d->angle_adj[0]));
+  tg_tool->trans_info[ANGLE_Y] = gimp_deg_to_rad (gtk_adjustment_get_value (
+    t3d->angle_adj[1]));
+  tg_tool->trans_info[ANGLE_Z] = gimp_deg_to_rad (gtk_adjustment_get_value (
+    t3d->angle_adj[2]));
+
+  gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+  gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+}
+
+static void
+gimp_transform_3d_tool_lens_mode_changed (GtkComboBox         *combo,
+                                          GimpTransform3DTool *t3d)
+{
+  GimpTool              *tool    = GIMP_TOOL (t3d);
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (t3d);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (t3d);
+  GimpDisplay           *display = tool->display;
+  GimpImage             *image   = gimp_display_get_image (display);
+  gdouble                x1      = 0.0;
+  gdouble                y1      = 0.0;
+  gdouble                x2      = 0.0;
+  gdouble                y2      = 0.0;
+  gint                   width;
+  gint                   height;
+  gint                   lens_mode;
+  gdouble                focal_length;
+
+  if (t3d->updating)
+    return;
+
+  if (! gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &lens_mode))
+    return;
+
+  width  = gimp_image_get_width  (image);
+  height = gimp_image_get_height (image);
+
+  focal_length = gimp_transform_3d_tool_get_focal_length (t3d);
+
+  tg_tool->trans_info[LENS_MODE] = lens_mode;
+
+  switch (lens_mode)
+    {
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH:
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE:
+      x1 = 0.0;
+      y1 = 0.0;
+
+      x2 = width;
+      y2 = height;
+      break;
+
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM:
+      x1 = tr_tool->x1;
+      y1 = tr_tool->y1;
+
+      x2 = tr_tool->x2;
+      y2 = tr_tool->y2;
+      break;
+    }
+
+  switch (lens_mode)
+    {
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH:
+      tg_tool->trans_info[LENS_VALUE] = focal_length;
+      break;
+
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE:
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM:
+      tg_tool->trans_info[LENS_VALUE] =
+        gimp_transform_3d_focal_length_to_angle_of_view (
+          focal_length, x2 - x1, y2 - y1);
+      break;
+    }
+
+  /* vanishing-point size entry */
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (t3d->vanishing_point_se), 0,
+                            x1, x2);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (t3d->vanishing_point_se), 1,
+                            y1, y2);
+
+  gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+  gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+}
+
+static void
+gimp_transform_3d_tool_rotation_order_clicked (GtkButton           *button,
+                                               GimpTransform3DTool *t3d)
+{
+  GimpTool              *tool = GIMP_TOOL (t3d);
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (t3d);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (t3d);
+  GimpMatrix4            matrix;
+  gint                   permutation[3];
+  gint                   b;
+  gint                   i;
+
+  for (b = 0; b < 3; b++)
+    {
+      if (GTK_BUTTON (t3d->rotation_order_buttons[b]) == button)
+        break;
+    }
+
+  gimp_transform_3d_rotation_order_to_permutation (
+    tg_tool->trans_info[ROTATION_ORDER], permutation);
+
+  if (permutation[0] == b)
+    {
+      gint temp;
+
+      temp           = permutation[1];
+      permutation[1] = permutation[2];
+      permutation[2] = temp;
+    }
+  else
+    {
+      gint temp;
+
+      temp           = permutation[0];
+      permutation[0] = b;
+
+      for (i = 1; i < 3; i++)
+        {
+          if (permutation[i] == b)
+            {
+              permutation[i] = temp;
+
+              break;
+            }
+        }
+    }
+
+  gimp_matrix4_identity (&matrix);
+
+  gimp_transform_3d_matrix4_rotate_euler (&matrix,
+                                          tg_tool->trans_info[ROTATION_ORDER],
+                                          tg_tool->trans_info[ANGLE_X],
+                                          tg_tool->trans_info[ANGLE_Y],
+                                          tg_tool->trans_info[ANGLE_Z],
+                                          0.0, 0.0, 0.0);
+
+  tg_tool->trans_info[ROTATION_ORDER] =
+    gimp_transform_3d_permutation_to_rotation_order (permutation);
+
+  gimp_transform_3d_matrix4_rotate_euler_decompose (
+    &matrix,
+    tg_tool->trans_info[ROTATION_ORDER],
+    &tg_tool->trans_info[ANGLE_X],
+    &tg_tool->trans_info[ANGLE_Y],
+    &tg_tool->trans_info[ANGLE_Z]);
+
+  gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+  gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+}
+
+static void
+gimp_transform_3d_tool_pivot_changed (GimpPivotSelector   *selector,
+                                      GimpTransform3DTool *t3d)
+{
+  GimpTool              *tool = GIMP_TOOL (t3d);
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (t3d);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (t3d);
+  GimpMatrix4            matrix;
+  gdouble                offset_x;
+  gdouble                offset_y;
+  gdouble                offset_z;
+
+  if (t3d->updating)
+    return;
+
+  gimp_matrix4_identity (&matrix);
+
+  gimp_transform_3d_matrix4_rotate_euler (&matrix,
+                                          tg_tool->trans_info[ROTATION_ORDER],
+                                          tg_tool->trans_info[ANGLE_X],
+                                          tg_tool->trans_info[ANGLE_Y],
+                                          tg_tool->trans_info[ANGLE_Z],
+                                          tg_tool->trans_info[PIVOT_X],
+                                          tg_tool->trans_info[PIVOT_Y],
+                                          tg_tool->trans_info[PIVOT_Z]);
+
+  gimp_pivot_selector_get_position (GIMP_PIVOT_SELECTOR (t3d->pivot_selector),
+                                    &tg_tool->trans_info[PIVOT_X],
+                                    &tg_tool->trans_info[PIVOT_Y]);
+
+  gimp_matrix4_transform_point (&matrix,
+                                tg_tool->trans_info[PIVOT_X],
+                                tg_tool->trans_info[PIVOT_Y],
+                                tg_tool->trans_info[PIVOT_Z],
+                                &offset_x, &offset_y, &offset_z);
+
+  tg_tool->trans_info[OFFSET_X] += offset_x - tg_tool->trans_info[PIVOT_X];
+  tg_tool->trans_info[OFFSET_Y] += offset_y - tg_tool->trans_info[PIVOT_Y];
+  tg_tool->trans_info[OFFSET_Z] += offset_z - tg_tool->trans_info[PIVOT_Z];
+
+  gimp_transform_grid_tool_push_internal_undo (tg_tool, TRUE);
+
+  gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+}
+
+static gdouble
+gimp_transform_3d_tool_get_focal_length (GimpTransform3DTool *t3d)
+{
+  GimpTool              *tool    = GIMP_TOOL (t3d);
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (t3d);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (t3d);
+  GimpImage             *image   = gimp_display_get_image (tool->display);
+  gdouble                width   = 0.0;
+  gdouble                height  = 0.0;
+
+  switch ((int) tg_tool->trans_info[LENS_MODE])
+    {
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH:
+      return tg_tool->trans_info[LENS_VALUE];
+
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE:
+      width  = gimp_image_get_width  (image);
+      height = gimp_image_get_height (image);
+      break;
+
+    case GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM:
+      width  = tr_tool->x2 - tr_tool->x1;
+      height = tr_tool->y2 - tr_tool->y1;
+      break;
+    }
+
+  return gimp_transform_3d_angle_of_view_to_focal_length (
+    tg_tool->trans_info[LENS_VALUE], width, height);
+}
diff --git a/app/tools/gimptransform3dtool.h b/app/tools/gimptransform3dtool.h
new file mode 100644
index 0000000..636beff
--- /dev/null
+++ b/app/tools/gimptransform3dtool.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_3D_TOOL_H__
+#define __GIMP_TRANSFORM_3D_TOOL_H__
+
+
+#include "gimptransformgridtool.h"
+
+
+#define GIMP_TYPE_TRANSFORM_3D_TOOL           (gimp_transform_3d_tool_get_type ())
+#define GIMP_TRANSFORM_3D_TOOL(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_3D_TOOL, GimpTransform3DTool))
+#define GIMP_TRANSFORM_3D_TOOL_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_3D_TOOL, GimpTransform3DToolClass))
+#define GIMP_IS_TRANSFORM_3D_TOOL(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_3D_TOOL))
+#define GIMP_TRANSFORM_3D_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_3D_TOOL, GimpTransform3DToolClass))
+
+#define GIMP_TRANSFORM_3D_TOOL_GET_OPTIONS(t) (GIMP_TRANSFORM_3D_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpTransform3DTool      GimpTransform3DTool;
+typedef struct _GimpTransform3DToolClass GimpTransform3DToolClass;
+
+struct _GimpTransform3DTool
+{
+  GimpTransformGridTool  parent_instance;
+
+  gboolean               updating;
+
+  GtkWidget             *notebook;
+  GtkWidget             *vanishing_point_se;
+  GtkWidget             *lens_mode_combo;
+  GtkWidget             *focal_length_se;
+  GtkWidget             *angle_of_view_scale;
+  GtkAdjustment         *angle_of_view_adj;
+  GtkWidget             *offset_se;
+  GtkWidget             *rotation_order_buttons[3];
+  GtkAdjustment         *angle_adj[3];
+  GtkWidget             *pivot_selector;
+};
+
+struct _GimpTransform3DToolClass
+{
+  GimpTransformGridToolClass parent_class;
+};
+
+
+void    gimp_transform_3d_tool_register (GimpToolRegisterCallback  callback,
+                                         gpointer                  data);
+
+GType   gimp_transform_3d_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_TRANSFORM_3D_TOOL_H__  */
diff --git a/app/tools/gimptransformgridoptions.c b/app/tools/gimptransformgridoptions.c
new file mode 100644
index 0000000..c8d0b09
--- /dev/null
+++ b/app/tools/gimptransformgridoptions.c
@@ -0,0 +1,712 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpperspectivetool.h"
+#include "gimprotatetool.h"
+#include "gimpscaletool.h"
+#include "gimpunifiedtransformtool.h"
+#include "gimptooloptions-gui.h"
+#include "gimptransformgridoptions.h"
+#include "gimptransformgridtool.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_DIRECTION,
+  PROP_DIRECTION_LINKED,
+  PROP_SHOW_PREVIEW,
+  PROP_COMPOSITED_PREVIEW,
+  PROP_PREVIEW_LINKED,
+  PROP_SYNCHRONOUS_PREVIEW,
+  PROP_PREVIEW_OPACITY,
+  PROP_GRID_TYPE,
+  PROP_GRID_SIZE,
+  PROP_CONSTRAIN_MOVE,
+  PROP_CONSTRAIN_SCALE,
+  PROP_CONSTRAIN_ROTATE,
+  PROP_CONSTRAIN_SHEAR,
+  PROP_CONSTRAIN_PERSPECTIVE,
+  PROP_FROMPIVOT_SCALE,
+  PROP_FROMPIVOT_SHEAR,
+  PROP_FROMPIVOT_PERSPECTIVE,
+  PROP_CORNERSNAP,
+  PROP_FIXEDPIVOT,
+};
+
+
+static void       gimp_transform_grid_options_set_property (GObject      *object,
+                                                            guint         property_id,
+                                                            const GValue *value,
+                                                            GParamSpec   *pspec);
+static void       gimp_transform_grid_options_get_property (GObject      *object,
+                                                            guint         property_id,
+                                                            GValue       *value,
+                                                            GParamSpec   *pspec);
+
+static gboolean   gimp_transform_grid_options_sync_grid    (GBinding     *binding,
+                                                            const GValue *source_value,
+                                                            GValue       *target_value,
+                                                            gpointer      user_data);
+
+
+G_DEFINE_TYPE (GimpTransformGridOptions, gimp_transform_grid_options,
+               GIMP_TYPE_TRANSFORM_OPTIONS)
+
+#define parent_class gimp_transform_grid_options_parent_class
+
+
+static void
+gimp_transform_grid_options_class_init (GimpTransformGridOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_transform_grid_options_set_property;
+  object_class->get_property = gimp_transform_grid_options_get_property;
+
+  g_object_class_override_property (object_class, PROP_DIRECTION,
+                                    "direction");
+
+  g_object_class_install_property (object_class, PROP_DIRECTION_LINKED,
+                                   g_param_spec_boolean ("direction-linked",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SHOW_PREVIEW,
+                            "show-preview",
+                            _("Show image preview"),
+                            _("Show a preview of the transformed image"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COMPOSITED_PREVIEW,
+                            "composited-preview",
+                            _("Composited preview"),
+                            _("Show preview as part of the image composition"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_PREVIEW_LINKED,
+                            "preview-linked",
+                            _("Preview linked items"),
+                            _("Include linked items in the preview"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SYNCHRONOUS_PREVIEW,
+                            "synchronous-preview",
+                            _("Synchronous preview"),
+                            _("Render the preview synchronously"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_PREVIEW_OPACITY,
+                           "preview-opacity",
+                           _("Image opacity"),
+                           _("Opacity of the preview image"),
+                           0.0, 1.0, 1.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_GRID_TYPE,
+                         "grid-type",
+                         _("Guides"),
+                         _("Composition guides such as rule of thirds"),
+                         GIMP_TYPE_GUIDES_TYPE,
+                         GIMP_GUIDES_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_GRID_SIZE,
+                        "grid-size",
+                        NULL,
+                        _("Size of a grid cell for variable number "
+                          "of composition guides"),
+                        1, 128, 15,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_MOVE,
+                            "constrain-move",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_SCALE,
+                            "constrain-scale",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_ROTATE,
+                            "constrain-rotate",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_SHEAR,
+                            "constrain-shear",
+                            NULL, NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_PERSPECTIVE,
+                            "constrain-perspective",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FROMPIVOT_SCALE,
+                            "frompivot-scale",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FROMPIVOT_SHEAR,
+                            "frompivot-shear",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FROMPIVOT_PERSPECTIVE,
+                            "frompivot-perspective",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_CORNERSNAP,
+                            "cornersnap",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FIXEDPIVOT,
+                            "fixedpivot",
+                            NULL, NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_transform_grid_options_init (GimpTransformGridOptions *options)
+{
+}
+
+static void
+gimp_transform_grid_options_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpTransformGridOptions *options           = GIMP_TRANSFORM_GRID_OPTIONS (object);
+  GimpTransformOptions     *transform_options = GIMP_TRANSFORM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_DIRECTION:
+      transform_options->direction = g_value_get_enum (value);
+
+      /* Expected default for corrective transform_grid is to see the
+       * original image only.
+       */
+      g_object_set (options,
+                    "show-preview",
+                    transform_options->direction != GIMP_TRANSFORM_BACKWARD,
+                    NULL);
+      break;
+    case PROP_DIRECTION_LINKED:
+      options->direction_linked = g_value_get_boolean (value);
+      break;
+    case PROP_SHOW_PREVIEW:
+      options->show_preview = g_value_get_boolean (value);
+      break;
+    case PROP_COMPOSITED_PREVIEW:
+      options->composited_preview = g_value_get_boolean (value);
+      break;
+    case PROP_PREVIEW_LINKED:
+      options->preview_linked = g_value_get_boolean (value);
+      break;
+    case PROP_SYNCHRONOUS_PREVIEW:
+      options->synchronous_preview = g_value_get_boolean (value);
+      break;
+    case PROP_PREVIEW_OPACITY:
+      options->preview_opacity = g_value_get_double (value);
+      break;
+    case PROP_GRID_TYPE:
+      options->grid_type = g_value_get_enum (value);
+      break;
+    case PROP_GRID_SIZE:
+      options->grid_size = g_value_get_int (value);
+      break;
+    case PROP_CONSTRAIN_MOVE:
+      options->constrain_move = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_SCALE:
+      options->constrain_scale = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_ROTATE:
+      options->constrain_rotate = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_SHEAR:
+      options->constrain_shear = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAIN_PERSPECTIVE:
+      options->constrain_perspective = g_value_get_boolean (value);
+      break;
+    case PROP_FROMPIVOT_SCALE:
+      options->frompivot_scale = g_value_get_boolean (value);
+      break;
+    case PROP_FROMPIVOT_SHEAR:
+      options->frompivot_shear = g_value_get_boolean (value);
+      break;
+    case PROP_FROMPIVOT_PERSPECTIVE:
+      options->frompivot_perspective = g_value_get_boolean (value);
+      break;
+    case PROP_CORNERSNAP:
+      options->cornersnap = g_value_get_boolean (value);
+      break;
+    case PROP_FIXEDPIVOT:
+      options->fixedpivot = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_transform_grid_options_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpTransformGridOptions *options           = GIMP_TRANSFORM_GRID_OPTIONS (object);
+  GimpTransformOptions     *transform_options = GIMP_TRANSFORM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_DIRECTION:
+      g_value_set_enum (value, transform_options->direction);
+      break;
+    case PROP_DIRECTION_LINKED:
+      g_value_set_boolean (value, options->direction_linked);
+      break;
+    case PROP_SHOW_PREVIEW:
+      g_value_set_boolean (value, options->show_preview);
+      break;
+    case PROP_COMPOSITED_PREVIEW:
+      g_value_set_boolean (value, options->composited_preview);
+      break;
+    case PROP_PREVIEW_LINKED:
+      g_value_set_boolean (value, options->preview_linked);
+      break;
+    case PROP_SYNCHRONOUS_PREVIEW:
+      g_value_set_boolean (value, options->synchronous_preview);
+      break;
+    case PROP_PREVIEW_OPACITY:
+      g_value_set_double (value, options->preview_opacity);
+      break;
+    case PROP_GRID_TYPE:
+      g_value_set_enum (value, options->grid_type);
+      break;
+    case PROP_GRID_SIZE:
+      g_value_set_int (value, options->grid_size);
+      break;
+    case PROP_CONSTRAIN_MOVE:
+      g_value_set_boolean (value, options->constrain_move);
+      break;
+    case PROP_CONSTRAIN_SCALE:
+      g_value_set_boolean (value, options->constrain_scale);
+      break;
+    case PROP_CONSTRAIN_ROTATE:
+      g_value_set_boolean (value, options->constrain_rotate);
+      break;
+    case PROP_CONSTRAIN_SHEAR:
+      g_value_set_boolean (value, options->constrain_shear);
+      break;
+    case PROP_CONSTRAIN_PERSPECTIVE:
+      g_value_set_boolean (value, options->constrain_perspective);
+      break;
+    case PROP_FROMPIVOT_SCALE:
+      g_value_set_boolean (value, options->frompivot_scale);
+      break;
+    case PROP_FROMPIVOT_SHEAR:
+      g_value_set_boolean (value, options->frompivot_shear);
+      break;
+    case PROP_FROMPIVOT_PERSPECTIVE:
+      g_value_set_boolean (value, options->frompivot_perspective);
+      break;
+    case PROP_CORNERSNAP:
+      g_value_set_boolean (value, options->cornersnap);
+      break;
+    case PROP_FIXEDPIVOT:
+      g_value_set_boolean (value, options->fixedpivot);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_transform_grid_options_gui:
+ * @tool_options: a #GimpToolOptions
+ *
+ * Build the TransformGrid Tool Options.
+ *
+ * Return value: a container holding the transform_grid tool options
+ **/
+GtkWidget *
+gimp_transform_grid_options_gui (GimpToolOptions *tool_options)
+{
+  GObject                    *config  = G_OBJECT (tool_options);
+  GimpTransformGridOptions   *options = GIMP_TRANSFORM_GRID_OPTIONS (tool_options);
+  GimpTransformGridToolClass *tg_class;
+  GtkWidget                  *vbox;
+  GtkWidget                  *vbox2;
+  GtkWidget                  *vbox3;
+  GtkWidget                  *button;
+  GtkWidget                  *frame;
+  GtkWidget                  *combo;
+  GtkWidget                  *scale;
+  GtkWidget                  *grid_box;
+  GdkModifierType             extend_mask    = gimp_get_extend_selection_mask ();
+  GdkModifierType             constrain_mask = gimp_get_constrain_behavior_mask ();
+
+  vbox = gimp_transform_options_gui (tool_options, TRUE, TRUE, TRUE);
+
+  tg_class  = g_type_class_ref (tool_options->tool_info->tool_type);
+
+  /* the direction-link button */
+  if (tg_class->matrix_to_info)
+    {
+      GimpTransformOptions *tr_options = GIMP_TRANSFORM_OPTIONS (tool_options);
+      GtkWidget            *hbox;
+
+      vbox2 = gtk_bin_get_child (GTK_BIN (tr_options->direction_frame));
+      g_object_ref (vbox2);
+      gtk_container_remove (GTK_CONTAINER (tr_options->direction_frame), vbox2);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
+      gtk_container_add (GTK_CONTAINER (tr_options->direction_frame), hbox);
+      gtk_widget_show (hbox);
+
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
+      g_object_unref (vbox2);
+
+      button = gimp_chain_button_new (GIMP_CHAIN_RIGHT);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      gtk_widget_set_sensitive (button, FALSE);
+      gimp_chain_button_set_icon_size (GIMP_CHAIN_BUTTON (button),
+                                       GTK_ICON_SIZE_MENU);
+      gtk_widget_show (button);
+
+      g_object_bind_property (config, "direction-linked",
+                              button, "active",
+                              G_BINDING_BIDIRECTIONAL |
+                              G_BINDING_SYNC_CREATE);
+
+      options->direction_chain_button = button;
+    }
+
+  g_type_class_unref (tg_class);
+
+  /*  the preview frame  */
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+  button = gimp_prop_check_button_new (config, "preview-linked", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox3), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_prop_check_button_new (config, "synchronous-preview", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox3), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  frame = gimp_prop_expanding_frame_new (config, "composited-preview", NULL,
+                                         vbox3, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  scale = gimp_prop_spin_scale_new (config, "preview-opacity", NULL,
+                                    0.01, 0.1, 0);
+  gimp_prop_widget_set_factor (scale, 100.0, 0.0, 0.0, 1);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_object_bind_property (config, "composited-preview",
+                          scale,  "sensitive",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_INVERT_BOOLEAN);
+
+  frame = gimp_prop_expanding_frame_new (config, "show-preview", NULL,
+                                         vbox2, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the guides frame  */
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the guides type menu  */
+  combo = gimp_prop_enum_combo_box_new (config, "grid-type", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Guides"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
+  gtk_widget_show (combo);
+
+  /*  the grid density scale  */
+  scale = gimp_prop_spin_scale_new (config, "grid-size", NULL,
+                                    1.8, 8.0, 0);
+  gimp_spin_scale_set_label (GIMP_SPIN_SCALE (scale), NULL);
+  gtk_container_add (GTK_CONTAINER (frame), scale);
+
+  g_object_bind_property_full (config, "grid-type",
+                               scale,  "visible",
+                               G_BINDING_SYNC_CREATE,
+                               gimp_transform_grid_options_sync_grid,
+                               NULL,
+                               NULL, NULL);
+
+  if (tool_options->tool_info->tool_type == GIMP_TYPE_ROTATE_TOOL)
+    {
+      gchar *label;
+
+      label = g_strdup_printf (_("15 degrees (%s)"),
+                               gimp_get_mod_string (extend_mask));
+
+      button = gimp_prop_check_button_new (config, "constrain-rotate", label);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      gimp_help_set_help_data (button, _("Limit rotation steps to 15 degrees"),
+                               NULL);
+
+      g_free (label);
+    }
+  else if (tool_options->tool_info->tool_type == GIMP_TYPE_SCALE_TOOL)
+    {
+      gchar *label;
+
+      label = g_strdup_printf (_("Keep aspect (%s)"),
+                               gimp_get_mod_string (extend_mask));
+
+      button = gimp_prop_check_button_new (config, "constrain-scale", label);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      gimp_help_set_help_data (button, _("Keep the original aspect ratio"),
+                               NULL);
+
+      g_free (label);
+
+      label = g_strdup_printf (_("Around center (%s)"),
+                               gimp_get_mod_string (constrain_mask));
+
+      button = gimp_prop_check_button_new (config, "frompivot-scale", label);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      gimp_help_set_help_data (button, _("Scale around the center point"),
+                               NULL);
+
+      g_free (label);
+    }
+  else if (tool_options->tool_info->tool_type == GIMP_TYPE_PERSPECTIVE_TOOL)
+    {
+      gchar *label;
+
+      label = g_strdup_printf (_("Constrain handles (%s)"),
+                               gimp_get_mod_string (extend_mask));
+
+      button = gimp_prop_check_button_new (config, "constrain-perspective", label);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      gimp_help_set_help_data (
+        button, _("Constrain handles to move along edges and diagonal (%s)"),
+        NULL);
+
+      g_free (label);
+
+      label = g_strdup_printf (_("Around center (%s)"),
+                               gimp_get_mod_string (constrain_mask));
+
+      button = gimp_prop_check_button_new (config, "frompivot-perspective", label);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      gimp_help_set_help_data (
+        button, _("Transform around the center point"),
+        NULL);
+
+      g_free (label);
+    }
+  else if (tool_options->tool_info->tool_type == GIMP_TYPE_UNIFIED_TRANSFORM_TOOL)
+    {
+      struct
+      {
+        GdkModifierType  mod;
+        gchar           *name;
+        gchar           *desc;
+        gchar           *tip;
+      }
+      opt_list[] =
+      {
+        { extend_mask, NULL, N_("Constrain (%s)") },
+        { extend_mask, "constrain-move", N_("Move"),
+          N_("Constrain movement to 45 degree angles from center (%s)") },
+        { extend_mask, "constrain-scale", N_("Scale"),
+          N_("Maintain aspect ratio when scaling (%s)") },
+        { extend_mask, "constrain-rotate", N_("Rotate"),
+          N_("Constrain rotation to 15 degree increments (%s)") },
+        { extend_mask, "constrain-shear", N_("Shear"),
+          N_("Shear along edge direction only (%s)") },
+        { extend_mask, "constrain-perspective", N_("Perspective"),
+          N_("Constrain perspective handles to move along edges and diagonal (%s)") },
+
+        { constrain_mask, NULL,
+          N_("From pivot  (%s)") },
+        { constrain_mask, "frompivot-scale", N_("Scale"),
+          N_("Scale from pivot point (%s)") },
+        { constrain_mask, "frompivot-shear", N_("Shear"),
+          N_("Shear opposite edge by same amount (%s)") },
+        { constrain_mask, "frompivot-perspective", N_("Perspective"),
+          N_("Maintain position of pivot while changing perspective (%s)") },
+
+        { 0, NULL,
+          N_("Pivot") },
+        { extend_mask, "cornersnap", N_("Snap (%s)"),
+          N_("Snap pivot to corners and center (%s)") },
+        { 0, "fixedpivot", N_("Lock"),
+          N_("Lock pivot position to canvas") },
+      };
+
+      gchar *label;
+      gint   i;
+
+      frame = NULL;
+
+      for (i = 0; i < G_N_ELEMENTS (opt_list); i++)
+        {
+          if (! opt_list[i].name && ! opt_list[i].desc)
+            {
+              frame = NULL;
+              continue;
+            }
+
+          label = g_strdup_printf (gettext (opt_list[i].desc),
+                                   gimp_get_mod_string (opt_list[i].mod));
+
+          if (opt_list[i].name)
+            {
+              button = gimp_prop_check_button_new (config, opt_list[i].name,
+                                                   label);
+
+              gtk_box_pack_start (GTK_BOX (frame ? grid_box : vbox),
+                                  button, FALSE, FALSE, 0);
+
+              gtk_widget_show (button);
+
+              g_free (label);
+              label = g_strdup_printf (gettext (opt_list[i].tip),
+                                       gimp_get_mod_string (opt_list[i].mod));
+
+              gimp_help_set_help_data (button, label, NULL);
+            }
+          else
+            {
+              frame = gimp_frame_new (label);
+              gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+              gtk_widget_show (frame);
+
+              grid_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+              gtk_container_add (GTK_CONTAINER (frame), grid_box);
+              gtk_widget_show (grid_box);
+            }
+
+          g_free (label);
+        }
+    }
+
+  return vbox;
+}
+
+gboolean
+gimp_transform_grid_options_show_preview (GimpTransformGridOptions *options)
+{
+  GimpTransformOptions *transform_options;
+
+  g_return_val_if_fail (GIMP_IS_TRANSFORM_GRID_OPTIONS (options), FALSE);
+
+  transform_options = GIMP_TRANSFORM_OPTIONS (options);
+
+  if (options->show_preview)
+    {
+      switch (transform_options->type)
+        {
+        case GIMP_TRANSFORM_TYPE_LAYER:
+        case GIMP_TRANSFORM_TYPE_IMAGE:
+          return TRUE;
+
+        case GIMP_TRANSFORM_TYPE_SELECTION:
+        case GIMP_TRANSFORM_TYPE_PATH:
+          return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_transform_grid_options_sync_grid (GBinding     *binding,
+                                       const GValue *source_value,
+                                       GValue       *target_value,
+                                       gpointer      user_data)
+{
+  GimpGuidesType type = g_value_get_enum (source_value);
+
+  g_value_set_boolean (target_value,
+                       type == GIMP_GUIDES_N_LINES ||
+                       type == GIMP_GUIDES_SPACING);
+
+  return TRUE;
+}
+
diff --git a/app/tools/gimptransformgridoptions.h b/app/tools/gimptransformgridoptions.h
new file mode 100644
index 0000000..e20b2e8
--- /dev/null
+++ b/app/tools/gimptransformgridoptions.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_GRID_OPTIONS_H__
+#define __GIMP_TRANSFORM_GRID_OPTIONS_H__
+
+
+#include "gimptransformoptions.h"
+
+
+#define GIMP_TYPE_TRANSFORM_GRID_OPTIONS            (gimp_transform_grid_options_get_type ())
+#define GIMP_TRANSFORM_GRID_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_GRID_OPTIONS, GimpTransformGridOptions))
+#define GIMP_TRANSFORM_GRID_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_GRID_OPTIONS, GimpTransformGridOptionsClass))
+#define GIMP_IS_TRANSFORM_GRID_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_GRID_OPTIONS))
+#define GIMP_IS_TRANSFORM_GRID_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSFORM_GRID_OPTIONS))
+#define GIMP_TRANSFORM_GRID_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_GRID_OPTIONS, GimpTransformGridOptionsClass))
+
+
+typedef struct _GimpTransformGridOptions      GimpTransformGridOptions;
+typedef struct _GimpTransformGridOptionsClass GimpTransformGridOptionsClass;
+
+struct _GimpTransformGridOptions
+{
+  GimpTransformOptions  parent_instance;
+
+  gboolean              direction_linked;
+  gboolean              show_preview;
+  gboolean              composited_preview;
+  gboolean              preview_linked;
+  gboolean              synchronous_preview;
+  gdouble               preview_opacity;
+  GimpGuidesType        grid_type;
+  gint                  grid_size;
+  gboolean              constrain_move;
+  gboolean              constrain_scale;
+  gboolean              constrain_rotate;
+  gboolean              constrain_shear;
+  gboolean              constrain_perspective;
+  gboolean              frompivot_scale;
+  gboolean              frompivot_shear;
+  gboolean              frompivot_perspective;
+  gboolean              cornersnap;
+  gboolean              fixedpivot;
+
+  /*  options gui  */
+  GtkWidget            *direction_chain_button;
+};
+
+struct _GimpTransformGridOptionsClass
+{
+  GimpTransformOptionsClass  parent_class;
+};
+
+
+GType       gimp_transform_grid_options_get_type     (void) G_GNUC_CONST;
+
+GtkWidget * gimp_transform_grid_options_gui          (GimpToolOptions          *tool_options);
+
+gboolean    gimp_transform_grid_options_show_preview (GimpTransformGridOptions *options);
+
+
+#endif /* __GIMP_TRANSFORM_GRID_OPTIONS_H__ */
diff --git a/app/tools/gimptransformgridtool.c b/app/tools/gimptransformgridtool.c
new file mode 100644
index 0000000..87ade22
--- /dev/null
+++ b/app/tools/gimptransformgridtool.c
@@ -0,0 +1,2209 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "gegl/gimpapplicator.h"
+#include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimp-transform-resize.h"
+#include "core/gimp-transform-utils.h"
+#include "core/gimpboundary.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimperror.h"
+#include "core/gimpfilter.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-item-list.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimppickable.h"
+#include "core/gimpprojection.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpviewable.h"
+
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpstroke.h"
+
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpcanvasitem.h"
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptoolwidget.h"
+
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+#include "gimptransformgridtool.h"
+#include "gimptransformgridtoolundo.h"
+#include "gimptransformoptions.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON 1e-6
+
+
+#define RESPONSE_RESET     1
+#define RESPONSE_READJUST  2
+
+#define UNDO_COMPRESS_TIME (0.5 * G_TIME_SPAN_SECOND)
+
+
+typedef struct
+{
+  GimpTransformGridTool *tg_tool;
+
+  GimpDrawable          *drawable;
+  GimpDrawableFilter    *filter;
+
+  GimpDrawable          *root_drawable;
+
+  GeglNode              *transform_node;
+  GeglNode              *crop_node;
+
+  GimpMatrix3            transform;
+  GeglRectangle          bounds;
+} Filter;
+
+typedef struct
+{
+  GimpTransformGridTool *tg_tool;
+  GimpDrawable          *root_drawable;
+} AddFilterData;
+
+typedef struct
+{
+  gint64                 time;
+  GimpTransformDirection direction;
+  TransInfo              trans_infos[2];
+} UndoInfo;
+
+
+static void      gimp_transform_grid_tool_finalize           (GObject                *object);
+
+static gboolean  gimp_transform_grid_tool_initialize         (GimpTool               *tool,
+                                                              GimpDisplay            *display,
+                                                              GError                **error);
+static void      gimp_transform_grid_tool_control            (GimpTool               *tool,
+                                                              GimpToolAction          action,
+                                                              GimpDisplay            *display);
+static void      gimp_transform_grid_tool_button_press       (GimpTool               *tool,
+                                                              const GimpCoords       *coords,
+                                                              guint32                 time,
+                                                              GdkModifierType         state,
+                                                              GimpButtonPressType     press_type,
+                                                              GimpDisplay            *display);
+static void      gimp_transform_grid_tool_button_release     (GimpTool               *tool,
+                                                              const GimpCoords       *coords,
+                                                              guint32                 time,
+                                                              GdkModifierType         state,
+                                                              GimpButtonReleaseType   release_type,
+                                                              GimpDisplay            *display);
+static void      gimp_transform_grid_tool_motion             (GimpTool               *tool,
+                                                              const GimpCoords       *coords,
+                                                              guint32                 time,
+                                                              GdkModifierType         state,
+                                                              GimpDisplay            *display);
+static void      gimp_transform_grid_tool_modifier_key       (GimpTool               *tool,
+                                                              GdkModifierType         key,
+                                                              gboolean                press,
+                                                              GdkModifierType         state,
+                                                              GimpDisplay            *display);
+static void      gimp_transform_grid_tool_cursor_update      (GimpTool               *tool,
+                                                              const GimpCoords       *coords,
+                                                              GdkModifierType         state,
+                                                              GimpDisplay            *display);
+static const gchar * gimp_transform_grid_tool_can_undo       (GimpTool               *tool,
+                                                              GimpDisplay            *display);
+static const gchar * gimp_transform_grid_tool_can_redo       (GimpTool               *tool,
+                                                              GimpDisplay            *display);
+static gboolean  gimp_transform_grid_tool_undo               (GimpTool               *tool,
+                                                              GimpDisplay            *display);
+static gboolean  gimp_transform_grid_tool_redo               (GimpTool               *tool,
+                                                              GimpDisplay            *display);
+static void      gimp_transform_grid_tool_options_notify     (GimpTool               *tool,
+                                                              GimpToolOptions        *options,
+                                                              const GParamSpec       *pspec);
+
+static void      gimp_transform_grid_tool_draw               (GimpDrawTool           *draw_tool);
+
+static void      gimp_transform_grid_tool_recalc_matrix      (GimpTransformTool      *tr_tool);
+static gchar   * gimp_transform_grid_tool_get_undo_desc      (GimpTransformTool      *tr_tool);
+static GimpTransformDirection gimp_transform_grid_tool_get_direction
+                                                             (GimpTransformTool      *tr_tool);
+static GeglBuffer * gimp_transform_grid_tool_transform       (GimpTransformTool      *tr_tool,
+                                                              GimpObject             *object,
+                                                              GeglBuffer             *orig_buffer,
+                                                              gint                    orig_offset_x,
+                                                              gint                    orig_offset_y,
+                                                              GimpColorProfile      **buffer_profile,
+                                                              gint                   *new_offset_x,
+                                                              gint                   *new_offset_y);
+
+static void     gimp_transform_grid_tool_real_apply_info     (GimpTransformGridTool  *tg_tool,
+                                                              const TransInfo         info);
+static gchar  * gimp_transform_grid_tool_real_get_undo_desc  (GimpTransformGridTool  *tg_tool);
+static void     gimp_transform_grid_tool_real_update_widget  (GimpTransformGridTool  *tg_tool);
+static void     gimp_transform_grid_tool_real_widget_changed (GimpTransformGridTool  *tg_tool);
+static GeglBuffer * gimp_transform_grid_tool_real_transform  (GimpTransformGridTool  *tg_tool,
+                                                              GimpObject             *object,
+                                                              GeglBuffer             *orig_buffer,
+                                                              gint                    orig_offset_x,
+                                                              gint                    orig_offset_y,
+                                                              GimpColorProfile      **buffer_profile,
+                                                              gint                   *new_offset_x,
+                                                              gint                   *new_offset_y);
+
+static void      gimp_transform_grid_tool_widget_changed     (GimpToolWidget         *widget,
+                                                              GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_widget_response    (GimpToolWidget         *widget,
+                                                              gint                    response_id,
+                                                              GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_filter_flush       (GimpDrawableFilter     *filter,
+                                                              GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_image_linked_items_changed
+                                                             (GimpImage              *image,
+                                                              GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_halt               (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_commit             (GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_dialog             (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_dialog_update      (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_prepare            (GimpTransformGridTool  *tg_tool,
+                                                              GimpDisplay            *display);
+static GimpToolWidget * gimp_transform_grid_tool_get_widget  (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_update_widget      (GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_response           (GimpToolGui            *gui,
+                                                              gint                    response_id,
+                                                              GimpTransformGridTool  *tg_tool);
+
+static gboolean  gimp_transform_grid_tool_composited_preview (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_update_sensitivity (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_update_preview     (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_update_filters     (GimpTransformGridTool  *tg_tool);
+static void      gimp_transform_grid_tool_hide_active_object (GimpTransformGridTool  *tg_tool,
+                                                              GimpObject             *object);
+static void      gimp_transform_grid_tool_show_active_object (GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_add_filter         (GimpDrawable           *drawable,
+                                                              AddFilterData          *data);
+static void      gimp_transform_grid_tool_remove_filter      (GimpDrawable           *drawable,
+                                                              GimpTransformGridTool  *tg_tool);
+
+static void      gimp_transform_grid_tool_effective_mode_changed
+                                                             (GimpLayer              *layer,
+                                                              GimpTransformGridTool  *tg_tool);
+
+static Filter  * filter_new                                  (GimpTransformGridTool  *tg_tool,
+                                                              GimpDrawable           *drawable,
+                                                              GimpDrawable           *root_drawable,
+                                                              gboolean                add_filter);
+static void      filter_free                                 (Filter                 *filter);
+
+static UndoInfo * undo_info_new  (void);
+static void       undo_info_free (UndoInfo *info);
+
+static gboolean   trans_info_equal  (const TransInfo  trans_info1,
+                                     const TransInfo  trans_info2);
+static gboolean   trans_infos_equal (const TransInfo *trans_infos1,
+                                     const TransInfo *trans_infos2);
+
+
+G_DEFINE_TYPE (GimpTransformGridTool, gimp_transform_grid_tool, GIMP_TYPE_TRANSFORM_TOOL)
+
+#define parent_class gimp_transform_grid_tool_parent_class
+
+
+static void
+gimp_transform_grid_tool_class_init (GimpTransformGridToolClass *klass)
+{
+  GObjectClass           *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass          *tool_class   = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass      *draw_class   = GIMP_DRAW_TOOL_CLASS (klass);
+  GimpTransformToolClass *tr_class     = GIMP_TRANSFORM_TOOL_CLASS (klass);
+
+  object_class->finalize     = gimp_transform_grid_tool_finalize;
+
+  tool_class->initialize     = gimp_transform_grid_tool_initialize;
+  tool_class->control        = gimp_transform_grid_tool_control;
+  tool_class->button_press   = gimp_transform_grid_tool_button_press;
+  tool_class->button_release = gimp_transform_grid_tool_button_release;
+  tool_class->motion         = gimp_transform_grid_tool_motion;
+  tool_class->modifier_key   = gimp_transform_grid_tool_modifier_key;
+  tool_class->cursor_update  = gimp_transform_grid_tool_cursor_update;
+  tool_class->can_undo       = gimp_transform_grid_tool_can_undo;
+  tool_class->can_redo       = gimp_transform_grid_tool_can_redo;
+  tool_class->undo           = gimp_transform_grid_tool_undo;
+  tool_class->redo           = gimp_transform_grid_tool_redo;
+  tool_class->options_notify = gimp_transform_grid_tool_options_notify;
+
+  draw_class->draw           = gimp_transform_grid_tool_draw;
+
+  tr_class->recalc_matrix    = gimp_transform_grid_tool_recalc_matrix;
+  tr_class->get_undo_desc    = gimp_transform_grid_tool_get_undo_desc;
+  tr_class->get_direction    = gimp_transform_grid_tool_get_direction;
+  tr_class->transform        = gimp_transform_grid_tool_transform;
+
+  klass->info_to_matrix      = NULL;
+  klass->matrix_to_info      = NULL;
+  klass->apply_info          = gimp_transform_grid_tool_real_apply_info;
+  klass->get_undo_desc       = gimp_transform_grid_tool_real_get_undo_desc;
+  klass->dialog              = NULL;
+  klass->dialog_update       = NULL;
+  klass->prepare             = NULL;
+  klass->readjust            = NULL;
+  klass->get_widget          = NULL;
+  klass->update_widget       = gimp_transform_grid_tool_real_update_widget;
+  klass->widget_changed      = gimp_transform_grid_tool_real_widget_changed;
+  klass->transform           = gimp_transform_grid_tool_real_transform;
+
+  klass->ok_button_label     = _("_Transform");
+}
+
+static void
+gimp_transform_grid_tool_init (GimpTransformGridTool *tg_tool)
+{
+  GimpTool *tool = GIMP_TOOL (tg_tool);
+
+  gimp_tool_control_set_scroll_lock      (tool->control, TRUE);
+  gimp_tool_control_set_preserve         (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask       (tool->control,
+                                          GIMP_DIRTY_IMAGE_SIZE      |
+                                          GIMP_DIRTY_IMAGE_STRUCTURE |
+                                          GIMP_DIRTY_DRAWABLE        |
+                                          GIMP_DIRTY_SELECTION       |
+                                          GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_active_modifiers (tool->control,
+                                          GIMP_TOOL_ACTIVE_MODIFIERS_SAME);
+  gimp_tool_control_set_precision        (tool->control,
+                                          GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_cursor           (tool->control,
+                                          GIMP_CURSOR_CROSSHAIR_SMALL);
+  gimp_tool_control_set_action_opacity   (tool->control,
+                                          "tools/tools-transform-preview-opacity-set");
+
+  tg_tool->strokes = g_ptr_array_new ();
+}
+
+static void
+gimp_transform_grid_tool_finalize (GObject *object)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (object);
+
+  g_clear_object (&tg_tool->gui);
+  g_clear_pointer (&tg_tool->strokes, g_ptr_array_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_transform_grid_tool_initialize (GimpTool     *tool,
+                                     GimpDisplay  *display,
+                                     GError      **error)
+{
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (tool);
+  GimpTransformGridTool    *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tool);
+  GimpImage                *image      = gimp_display_get_image (display);
+  GimpDrawable             *drawable   = gimp_image_get_active_drawable (image);
+  GimpObject               *object;
+  UndoInfo                 *undo_info;
+
+  object = gimp_transform_tool_check_active_object (tr_tool, display, error);
+
+  if (! object)
+    return FALSE;
+
+  tool->display   = display;
+  tool->drawable  = drawable;
+
+  tr_tool->object = object;
+
+  if (GIMP_IS_DRAWABLE (object))
+    gimp_viewable_preview_freeze (GIMP_VIEWABLE (object));
+
+  /*  Initialize the transform_grid tool dialog  */
+  if (! tg_tool->gui)
+    gimp_transform_grid_tool_dialog (tg_tool);
+
+  /*  Find the transform bounds for some tools (like scale,
+   *  perspective) that actually need the bounds for initializing
+   */
+  gimp_transform_tool_bounds (tr_tool, display);
+
+  /*  Initialize the tool-specific trans_info, and adjust the tool dialog  */
+  gimp_transform_grid_tool_prepare (tg_tool, display);
+
+  /*  Recalculate the tool's transformation matrix  */
+  gimp_transform_tool_recalc_matrix (tr_tool, display);
+
+  /*  Get the on-canvas gui  */
+  tg_tool->widget = gimp_transform_grid_tool_get_widget (tg_tool);
+
+  gimp_transform_grid_tool_hide_active_object (tg_tool, object);
+
+  /*  start drawing the bounding box and handles...  */
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+
+  /* Initialize undo and redo lists */
+  undo_info = undo_info_new ();
+  tg_tool->undo_list = g_list_prepend (NULL, undo_info);
+  tg_tool->redo_list = NULL;
+
+  /*  Save the current transformation info  */
+  memcpy (undo_info->trans_infos, tg_tool->trans_infos,
+          sizeof (tg_tool->trans_infos));
+
+  if (tg_options->direction_chain_button)
+    gtk_widget_set_sensitive (tg_options->direction_chain_button, TRUE);
+
+  g_signal_connect (
+    image, "linked-items-changed",
+    G_CALLBACK (gimp_transform_grid_tool_image_linked_items_changed),
+    tg_tool);
+
+  return TRUE;
+}
+
+static void
+gimp_transform_grid_tool_control (GimpTool       *tool,
+                                  GimpToolAction  action,
+                                  GimpDisplay    *display)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_transform_grid_tool_halt (tg_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      if (tool->display)
+        gimp_transform_grid_tool_commit (tg_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_transform_grid_tool_button_press (GimpTool            *tool,
+                                       const GimpCoords    *coords,
+                                       guint32              time,
+                                       GdkModifierType      state,
+                                       GimpButtonPressType  press_type,
+                                       GimpDisplay         *display)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  if (tg_tool->widget)
+    {
+      gimp_tool_widget_hover (tg_tool->widget, coords, state, TRUE);
+
+      if (gimp_tool_widget_button_press (tg_tool->widget, coords, time, state,
+                                         press_type))
+        {
+          tg_tool->grab_widget = tg_tool->widget;
+        }
+    }
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_transform_grid_tool_button_release (GimpTool              *tool,
+                                         const GimpCoords      *coords,
+                                         guint32                time,
+                                         GdkModifierType        state,
+                                         GimpButtonReleaseType  release_type,
+                                         GimpDisplay           *display)
+{
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (tool);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  if (tg_tool->grab_widget)
+    {
+      gimp_tool_widget_button_release (tg_tool->grab_widget,
+                                       coords, time, state, release_type);
+      tg_tool->grab_widget = NULL;
+    }
+
+  if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      /* We're done with an interaction, save it on the undo list */
+      gimp_transform_grid_tool_push_internal_undo (tg_tool, FALSE);
+    }
+  else
+    {
+      UndoInfo *undo_info = tg_tool->undo_list->data;
+
+      /*  Restore the last saved state  */
+      memcpy (tg_tool->trans_infos, undo_info->trans_infos,
+              sizeof (tg_tool->trans_infos));
+
+      /*  recalculate the tool's transformation matrix  */
+      gimp_transform_tool_recalc_matrix (tr_tool, display);
+    }
+}
+
+static void
+gimp_transform_grid_tool_motion (GimpTool         *tool,
+                                 const GimpCoords *coords,
+                                 guint32           time,
+                                 GdkModifierType   state,
+                                 GimpDisplay      *display)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  if (tg_tool->grab_widget)
+    {
+      gimp_tool_widget_motion (tg_tool->grab_widget, coords, time, state);
+    }
+}
+
+static void
+gimp_transform_grid_tool_modifier_key (GimpTool        *tool,
+                                       GdkModifierType  key,
+                                       gboolean         press,
+                                       GdkModifierType  state,
+                                       GimpDisplay     *display)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  if (tg_tool->widget)
+    {
+      GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press,
+                                                    state, display);
+    }
+  else
+    {
+      GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tool);
+
+      if (key == gimp_get_constrain_behavior_mask ())
+        {
+          g_object_set (options,
+                        "frompivot-scale",       ! options->frompivot_scale,
+                        "frompivot-shear",       ! options->frompivot_shear,
+                        "frompivot-perspective", ! options->frompivot_perspective,
+                        NULL);
+        }
+      else if (key == gimp_get_extend_selection_mask ())
+        {
+          g_object_set (options,
+                        "cornersnap",            ! options->cornersnap,
+                        "constrain-move",        ! options->constrain_move,
+                        "constrain-scale",       ! options->constrain_scale,
+                        "constrain-rotate",      ! options->constrain_rotate,
+                        "constrain-shear",       ! options->constrain_shear,
+                        "constrain-perspective", ! options->constrain_perspective,
+                        NULL);
+        }
+    }
+}
+
+static void
+gimp_transform_grid_tool_cursor_update (GimpTool         *tool,
+                                        const GimpCoords *coords,
+                                        GdkModifierType   state,
+                                        GimpDisplay      *display)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
+
+  if (display != tool->display &&
+      ! gimp_transform_tool_check_active_object (tr_tool, display, NULL))
+    {
+      gimp_tool_set_cursor (tool, display,
+                            gimp_tool_control_get_cursor (tool->control),
+                            gimp_tool_control_get_tool_cursor (tool->control),
+                            GIMP_CURSOR_MODIFIER_BAD);
+      return;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static const gchar *
+gimp_transform_grid_tool_can_undo (GimpTool    *tool,
+                                   GimpDisplay *display)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  if (! tg_tool->undo_list || ! tg_tool->undo_list->next)
+    return NULL;
+
+  return _("Transform Step");
+}
+
+static const gchar *
+gimp_transform_grid_tool_can_redo (GimpTool    *tool,
+                                   GimpDisplay *display)
+{
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tool);
+
+  if (! tg_tool->redo_list)
+    return NULL;
+
+  return _("Transform Step");
+}
+
+static gboolean
+gimp_transform_grid_tool_undo (GimpTool    *tool,
+                               GimpDisplay *display)
+{
+  GimpTransformTool      *tr_tool    = GIMP_TRANSFORM_TOOL (tool);
+  GimpTransformGridTool  *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (tool);
+  GimpTransformOptions   *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
+  UndoInfo               *undo_info;
+  GimpTransformDirection  direction;
+
+  undo_info = tg_tool->undo_list->data;
+  direction = undo_info->direction;
+
+  /* Move undo_info from undo_list to redo_list */
+  tg_tool->redo_list = g_list_prepend (tg_tool->redo_list, undo_info);
+  tg_tool->undo_list = g_list_remove (tg_tool->undo_list, undo_info);
+
+  undo_info = tg_tool->undo_list->data;
+
+  /*  Restore the previous transformation info  */
+  memcpy (tg_tool->trans_infos, undo_info->trans_infos,
+          sizeof (tg_tool->trans_infos));
+
+  /*  Restore the previous transformation direction  */
+  if (direction != tr_options->direction)
+    {
+      g_object_set (tr_options,
+                    "direction", direction,
+                    NULL);
+    }
+
+  /*  recalculate the tool's transformation matrix  */
+  gimp_transform_tool_recalc_matrix (tr_tool, display);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_transform_grid_tool_redo (GimpTool    *tool,
+                               GimpDisplay *display)
+{
+  GimpTransformTool      *tr_tool    = GIMP_TRANSFORM_TOOL (tool);
+  GimpTransformGridTool  *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (tool);
+  GimpTransformOptions   *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
+  UndoInfo               *undo_info;
+  GimpTransformDirection  direction;
+
+  undo_info = tg_tool->redo_list->data;
+  direction = undo_info->direction;
+
+  /* Move undo_info from redo_list to undo_list */
+  tg_tool->undo_list = g_list_prepend (tg_tool->undo_list, undo_info);
+  tg_tool->redo_list = g_list_remove (tg_tool->redo_list, undo_info);
+
+  /*  Restore the previous transformation info  */
+  memcpy (tg_tool->trans_infos, undo_info->trans_infos,
+          sizeof (tg_tool->trans_infos));
+
+  /*  Restore the previous transformation direction  */
+  if (direction != tr_options->direction)
+    {
+      g_object_set (tr_options,
+                    "direction", direction,
+                    NULL);
+    }
+
+  /*  recalculate the tool's transformation matrix  */
+  gimp_transform_tool_recalc_matrix (tr_tool, display);
+
+  return TRUE;
+}
+
+static void
+gimp_transform_grid_tool_options_notify (GimpTool         *tool,
+                                         GimpToolOptions  *options,
+                                         const GParamSpec *pspec)
+{
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (tool);
+  GimpTransformGridTool    *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_OPTIONS (options);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! strcmp (pspec->name, "type"))
+    {
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+      return;
+    }
+
+  if (! tg_tool->widget)
+    return;
+
+  if (! strcmp (pspec->name, "direction"))
+    {
+      /*  recalculate the tool's transformation matrix  */
+      gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+    }
+  else if (! strcmp (pspec->name, "show-preview") ||
+           ! strcmp (pspec->name, "composited-preview"))
+    {
+      if (tg_tool->preview)
+        {
+          GimpDisplay *display;
+          GimpObject  *object;
+
+          display = tool->display;
+          object  = gimp_transform_tool_get_active_object (tr_tool, display);
+
+          if (object)
+            {
+              if (tg_options->show_preview &&
+                  ! gimp_transform_grid_tool_composited_preview (tg_tool))
+                {
+                  gimp_transform_grid_tool_hide_active_object (tg_tool, object);
+                }
+              else
+                {
+                  gimp_transform_grid_tool_show_active_object (tg_tool);
+                }
+            }
+
+          gimp_transform_grid_tool_update_preview (tg_tool);
+        }
+    }
+  else if (! strcmp (pspec->name, "preview-linked") &&
+           tg_tool->filters)
+    {
+      gimp_transform_grid_tool_update_filters (tg_tool);
+      gimp_transform_grid_tool_update_preview (tg_tool);
+    }
+  else if (! strcmp (pspec->name, "interpolation") ||
+           ! strcmp (pspec->name, "clip")          ||
+           ! strcmp (pspec->name, "preview-opacity"))
+    {
+      gimp_transform_grid_tool_update_preview (tg_tool);
+    }
+  else if (g_str_has_prefix (pspec->name, "constrain-") ||
+           g_str_has_prefix (pspec->name, "frompivot-") ||
+           ! strcmp (pspec->name, "fixedpivot") ||
+           ! strcmp (pspec->name, "cornersnap"))
+    {
+      gimp_transform_grid_tool_dialog_update (tg_tool);
+    }
+}
+
+static void
+gimp_transform_grid_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpTool                 *tool       = GIMP_TOOL (draw_tool);
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (draw_tool);
+  GimpTransformGridTool    *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (draw_tool);
+  GimpTransformGridOptions *options    = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tool);
+  GimpTransformOptions     *tr_options = GIMP_TRANSFORM_OPTIONS (options);
+  GimpDisplayShell         *shell      = gimp_display_get_shell (tool->display);
+  GimpImage                *image      = gimp_display_get_image (tool->display);
+  GimpMatrix3               matrix     = tr_tool->transform;
+  GimpCanvasItem           *item;
+
+  if (tr_options->direction == GIMP_TRANSFORM_BACKWARD)
+    gimp_matrix3_invert (&matrix);
+
+  if (tr_options->type == GIMP_TRANSFORM_TYPE_LAYER ||
+      tr_options->type == GIMP_TRANSFORM_TYPE_IMAGE)
+    {
+      GimpPickable *pickable;
+
+      if (tr_options->type == GIMP_TRANSFORM_TYPE_IMAGE)
+        {
+          if (! shell->show_all)
+            pickable = GIMP_PICKABLE (image);
+          else
+            pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+        }
+      else
+        {
+          pickable = GIMP_PICKABLE (tool->drawable);
+        }
+
+      tg_tool->preview =
+        gimp_draw_tool_add_transform_preview (draw_tool,
+                                              pickable,
+                                              &matrix,
+                                              tr_tool->x1,
+                                              tr_tool->y1,
+                                              tr_tool->x2,
+                                              tr_tool->y2);
+      g_object_add_weak_pointer (G_OBJECT (tg_tool->preview),
+                                 (gpointer) &tg_tool->preview);
+    }
+
+  if (tr_options->type == GIMP_TRANSFORM_TYPE_SELECTION)
+    {
+      const GimpBoundSeg *segs_in;
+      const GimpBoundSeg *segs_out;
+      gint                n_segs_in;
+      gint                n_segs_out;
+
+      gimp_channel_boundary (gimp_image_get_mask (image),
+                             &segs_in, &segs_out,
+                             &n_segs_in, &n_segs_out,
+                             0, 0, 0, 0);
+
+      if (segs_in)
+        {
+          tg_tool->boundary_in =
+            gimp_draw_tool_add_boundary (draw_tool,
+                                         segs_in, n_segs_in,
+                                         &matrix,
+                                         0, 0);
+          g_object_add_weak_pointer (G_OBJECT (tg_tool->boundary_in),
+                                     (gpointer) &tg_tool->boundary_in);
+
+          gimp_canvas_item_set_visible (tg_tool->boundary_in,
+                                        tr_tool->transform_valid);
+        }
+
+      if (segs_out)
+        {
+          tg_tool->boundary_out =
+            gimp_draw_tool_add_boundary (draw_tool,
+                                         segs_out, n_segs_out,
+                                         &matrix,
+                                         0, 0);
+          g_object_add_weak_pointer (G_OBJECT (tg_tool->boundary_out),
+                                     (gpointer) &tg_tool->boundary_out);
+
+          gimp_canvas_item_set_visible (tg_tool->boundary_out,
+                                        tr_tool->transform_valid);
+        }
+    }
+  else if (tr_options->type == GIMP_TRANSFORM_TYPE_PATH)
+    {
+      GimpVectors *vectors = gimp_image_get_active_vectors (image);
+
+      if (vectors)
+        {
+          GimpStroke *stroke = NULL;
+
+          while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
+            {
+              GArray   *coords;
+              gboolean  closed;
+
+              coords = gimp_stroke_interpolate (stroke, 1.0, &closed);
+
+              if (coords && coords->len)
+                {
+                  item =
+                    gimp_draw_tool_add_strokes (draw_tool,
+                                                &g_array_index (coords,
+                                                                GimpCoords, 0),
+                                                coords->len, &matrix, FALSE);
+
+                  g_ptr_array_add (tg_tool->strokes, item);
+                  g_object_weak_ref (G_OBJECT (item),
+                                     (GWeakNotify) g_ptr_array_remove,
+                                     tg_tool->strokes);
+
+                  gimp_canvas_item_set_visible (item, tr_tool->transform_valid);
+                }
+
+              if (coords)
+                g_array_free (coords, TRUE);
+            }
+        }
+    }
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
+
+  gimp_transform_grid_tool_update_preview (tg_tool);
+}
+
+static void
+gimp_transform_grid_tool_recalc_matrix (GimpTransformTool *tr_tool)
+{
+  GimpTransformGridTool    *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (tr_tool);
+  GimpTransformOptions     *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tr_tool);
+
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->info_to_matrix)
+    {
+      GimpMatrix3 forward_transform;
+      GimpMatrix3 backward_transform;
+      gboolean    forward_transform_valid;
+      gboolean    backward_transform_valid;
+
+      tg_tool->trans_info      = tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD];
+      forward_transform_valid  = gimp_transform_grid_tool_info_to_matrix (
+                                   tg_tool, &forward_transform);
+
+      tg_tool->trans_info      = tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD];
+      backward_transform_valid = gimp_transform_grid_tool_info_to_matrix (
+                                   tg_tool, &backward_transform);
+
+      if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->matrix_to_info &&
+          tg_options->direction_linked)
+        {
+          GimpMatrix3 transform = tr_tool->transform;
+
+          switch (tr_options->direction)
+            {
+            case GIMP_TRANSFORM_FORWARD:
+              if (forward_transform_valid)
+                {
+                  gimp_matrix3_invert (&transform);
+
+                  backward_transform = forward_transform;
+                  gimp_matrix3_mult (&transform, &backward_transform);
+
+                  tg_tool->trans_info =
+                    tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD];
+                  gimp_transform_grid_tool_matrix_to_info (tg_tool,
+                                                           &backward_transform);
+                  backward_transform_valid =
+                    gimp_transform_grid_tool_info_to_matrix (
+                      tg_tool, &backward_transform);
+                }
+              break;
+
+            case GIMP_TRANSFORM_BACKWARD:
+              if (backward_transform_valid)
+                {
+                  forward_transform = backward_transform;
+                  gimp_matrix3_mult (&transform, &forward_transform);
+
+                  tg_tool->trans_info =
+                    tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD];
+                  gimp_transform_grid_tool_matrix_to_info (tg_tool,
+                                                           &forward_transform);
+                  forward_transform_valid =
+                    gimp_transform_grid_tool_info_to_matrix (
+                      tg_tool, &forward_transform);
+                }
+              break;
+            }
+        }
+      else if (forward_transform_valid && backward_transform_valid)
+        {
+          tr_tool->transform = backward_transform;
+          gimp_matrix3_invert (&tr_tool->transform);
+          gimp_matrix3_mult (&forward_transform, &tr_tool->transform);
+        }
+
+      tr_tool->transform_valid = forward_transform_valid &&
+                                 backward_transform_valid;
+    }
+
+  tg_tool->trans_info = tg_tool->trans_infos[tr_options->direction];
+
+  gimp_transform_grid_tool_dialog_update (tg_tool);
+  gimp_transform_grid_tool_update_sensitivity (tg_tool);
+  gimp_transform_grid_tool_update_widget (tg_tool);
+  gimp_transform_grid_tool_update_preview (tg_tool);
+
+  if (tg_tool->gui)
+    gimp_tool_gui_show (tg_tool->gui);
+}
+
+static gchar *
+gimp_transform_grid_tool_get_undo_desc (GimpTransformTool *tr_tool)
+{
+  GimpTransformGridTool *tg_tool    = GIMP_TRANSFORM_GRID_TOOL (tr_tool);
+  GimpTransformOptions  *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+  gchar                 *result;
+
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->matrix_to_info)
+    {
+      TransInfo trans_info;
+
+      memcpy (&trans_info, &tg_tool->init_trans_info, sizeof (TransInfo));
+
+      tg_tool->trans_info = trans_info;
+      gimp_transform_grid_tool_matrix_to_info (tg_tool, &tr_tool->transform);
+      result = GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->get_undo_desc (
+        tg_tool);
+    }
+  else if (trans_info_equal (tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD],
+                             tg_tool->init_trans_info))
+    {
+      tg_tool->trans_info = tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD];
+      result = GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->get_undo_desc (
+        tg_tool);
+    }
+  else if (trans_info_equal (tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD],
+                             tg_tool->init_trans_info))
+    {
+      gchar *desc;
+
+      tg_tool->trans_info = tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD];
+      desc = GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->get_undo_desc (
+        tg_tool);
+
+      result = g_strdup_printf (_("%s (Corrective)"), desc);
+
+      g_free (desc);
+    }
+  else
+    {
+      result = GIMP_TRANSFORM_TOOL_CLASS (parent_class)->get_undo_desc (
+        tr_tool);
+    }
+
+  tg_tool->trans_info = tg_tool->trans_infos[tr_options->direction];
+
+  return result;
+}
+
+static GimpTransformDirection
+gimp_transform_grid_tool_get_direction (GimpTransformTool *tr_tool)
+{
+  return GIMP_TRANSFORM_FORWARD;
+}
+
+static GeglBuffer *
+gimp_transform_grid_tool_transform (GimpTransformTool  *tr_tool,
+                                    GimpObject         *object,
+                                    GeglBuffer         *orig_buffer,
+                                    gint                orig_offset_x,
+                                    gint                orig_offset_y,
+                                    GimpColorProfile  **buffer_profile,
+                                    gint               *new_offset_x,
+                                    gint               *new_offset_y)
+{
+  GimpTool              *tool    = GIMP_TOOL (tr_tool);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (tr_tool);
+  GimpDisplay           *display = tool->display;
+  GimpImage             *image   = gimp_display_get_image (display);
+  GeglBuffer            *new_buffer;
+
+  /*  Send the request for the transformation to the tool...
+   */
+  new_buffer =
+    GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->transform (tg_tool,
+                                                             object,
+                                                             orig_buffer,
+                                                             orig_offset_x,
+                                                             orig_offset_y,
+                                                             buffer_profile,
+                                                             new_offset_x,
+                                                             new_offset_y);
+
+  gimp_image_undo_push (image, GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO,
+                        GIMP_UNDO_TRANSFORM_GRID, NULL,
+                        0,
+                        "transform-tool", tg_tool,
+                        NULL);
+
+  return new_buffer;
+}
+
+static void
+gimp_transform_grid_tool_real_apply_info (GimpTransformGridTool *tg_tool,
+                                          const TransInfo        info)
+{
+  memcpy (tg_tool->trans_info, info, sizeof (TransInfo));
+}
+
+static gchar *
+gimp_transform_grid_tool_real_get_undo_desc (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  return GIMP_TRANSFORM_TOOL_CLASS (parent_class)->get_undo_desc (tr_tool);
+}
+
+static void
+gimp_transform_grid_tool_real_update_widget (GimpTransformGridTool *tg_tool)
+{
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->info_to_matrix)
+    {
+      GimpMatrix3 transform;
+
+      gimp_transform_grid_tool_info_to_matrix (tg_tool, &transform);
+
+      g_object_set (tg_tool->widget,
+                    "transform", &transform,
+                    NULL);
+    }
+}
+
+static void
+gimp_transform_grid_tool_real_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpToolWidget    *widget  = tg_tool->widget;
+
+  /* suppress the call to GimpTransformGridTool::update_widget() when
+   * recalculating the matrix
+   */
+  tg_tool->widget = NULL;
+
+  gimp_transform_tool_recalc_matrix (tr_tool, tool->display);
+
+  tg_tool->widget = widget;
+}
+
+static GeglBuffer *
+gimp_transform_grid_tool_real_transform (GimpTransformGridTool  *tg_tool,
+                                         GimpObject             *object,
+                                         GeglBuffer             *orig_buffer,
+                                         gint                    orig_offset_x,
+                                         gint                    orig_offset_y,
+                                         GimpColorProfile      **buffer_profile,
+                                         gint                   *new_offset_x,
+                                         gint                   *new_offset_y)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  return GIMP_TRANSFORM_TOOL_CLASS (parent_class)->transform (tr_tool,
+                                                              object,
+                                                              orig_buffer,
+                                                              orig_offset_x,
+                                                              orig_offset_y,
+                                                              buffer_profile,
+                                                              new_offset_x,
+                                                              new_offset_y);
+}
+
+static void
+gimp_transform_grid_tool_widget_changed (GimpToolWidget        *widget,
+                                         GimpTransformGridTool *tg_tool)
+{
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->widget_changed)
+    GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->widget_changed (tg_tool);
+}
+
+static void
+gimp_transform_grid_tool_widget_response (GimpToolWidget        *widget,
+                                          gint                   response_id,
+                                          GimpTransformGridTool *tg_tool)
+{
+  switch (response_id)
+    {
+    case GIMP_TOOL_WIDGET_RESPONSE_CONFIRM:
+      gimp_transform_grid_tool_response (NULL, GTK_RESPONSE_OK, tg_tool);
+      break;
+
+    case GIMP_TOOL_WIDGET_RESPONSE_CANCEL:
+      gimp_transform_grid_tool_response (NULL, GTK_RESPONSE_CANCEL, tg_tool);
+      break;
+
+    case GIMP_TOOL_WIDGET_RESPONSE_RESET:
+      gimp_transform_grid_tool_response (NULL, RESPONSE_RESET, tg_tool);
+      break;
+    }
+}
+
+static void
+gimp_transform_grid_tool_filter_flush (GimpDrawableFilter    *filter,
+                                       GimpTransformGridTool *tg_tool)
+{
+  GimpTool  *tool = GIMP_TOOL (tg_tool);
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+static void
+gimp_transform_grid_tool_image_linked_items_changed (GimpImage             *image,
+                                                     GimpTransformGridTool *tg_tool)
+{
+  if (tg_tool->filters)
+    {
+      gimp_transform_grid_tool_update_filters (tg_tool);
+      gimp_transform_grid_tool_update_preview (tg_tool);
+    }
+}
+
+static void
+gimp_transform_grid_tool_halt (GimpTransformGridTool *tg_tool)
+{
+  GimpTool                 *tool       = GIMP_TOOL (tg_tool);
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+
+  if (tool->display)
+    {
+      GimpImage *image = gimp_display_get_image (tool->display);
+
+      g_signal_handlers_disconnect_by_func (
+        image,
+        gimp_transform_grid_tool_image_linked_items_changed,
+        tg_tool);
+    }
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tg_tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tg_tool));
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tg_tool), NULL);
+  g_clear_object (&tg_tool->widget);
+
+  g_clear_pointer (&tg_tool->filters, g_hash_table_unref);
+  g_clear_pointer (&tg_tool->preview_drawables, g_list_free);
+
+  if (tg_tool->gui)
+    gimp_tool_gui_hide (tg_tool->gui);
+
+  if (tg_tool->redo_list)
+    {
+      g_list_free_full (tg_tool->redo_list, (GDestroyNotify) undo_info_free);
+      tg_tool->redo_list = NULL;
+    }
+
+  if (tg_tool->undo_list)
+    {
+      g_list_free_full (tg_tool->undo_list, (GDestroyNotify) undo_info_free);
+      tg_tool->undo_list = NULL;
+    }
+
+  gimp_transform_grid_tool_show_active_object (tg_tool);
+
+  if (tg_options->direction_chain_button)
+    {
+      g_object_set (tg_options,
+                    "direction-linked", FALSE,
+                    NULL);
+
+      gtk_widget_set_sensitive (tg_options->direction_chain_button, FALSE);
+    }
+
+  tool->display   = NULL;
+  tool->drawable  = NULL;
+
+  if (tr_tool->object)
+    {
+      if (GIMP_IS_DRAWABLE (tr_tool->object))
+        gimp_viewable_preview_thaw (GIMP_VIEWABLE (tr_tool->object));
+
+      tr_tool->object = NULL;
+    }
+}
+
+static void
+gimp_transform_grid_tool_commit (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpDisplay       *display = tool->display;
+
+  /* undraw the tool before we muck around with the transform matrix */
+  gimp_draw_tool_stop (GIMP_DRAW_TOOL (tg_tool));
+
+  gimp_transform_tool_transform (tr_tool, display);
+}
+
+static void
+gimp_transform_grid_tool_dialog (GimpTransformGridTool *tg_tool)
+{
+  GimpTool         *tool      = GIMP_TOOL (tg_tool);
+  GimpToolInfo     *tool_info = tool->tool_info;
+  GimpDisplayShell *shell;
+  const gchar      *ok_button_label;
+
+  if (! GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->dialog)
+    return;
+
+  g_return_if_fail (tool->display != NULL);
+
+  shell = gimp_display_get_shell (tool->display);
+
+  ok_button_label = GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->ok_button_label;
+
+  tg_tool->gui = gimp_tool_gui_new (tool_info,
+                                    NULL, NULL, NULL, NULL,
+                                    gtk_widget_get_screen (GTK_WIDGET (shell)),
+                                    gimp_widget_get_monitor (GTK_WIDGET (shell)),
+                                    TRUE,
+                                    NULL);
+
+  gimp_tool_gui_add_button   (tg_tool->gui, _("_Reset"),     RESPONSE_RESET);
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->readjust)
+    gimp_tool_gui_add_button (tg_tool->gui, _("Re_adjust"),  RESPONSE_READJUST);
+  gimp_tool_gui_add_button   (tg_tool->gui, _("_Cancel"),    GTK_RESPONSE_CANCEL);
+  gimp_tool_gui_add_button   (tg_tool->gui, ok_button_label, GTK_RESPONSE_OK);
+
+  gimp_tool_gui_set_auto_overlay (tg_tool->gui, TRUE);
+  gimp_tool_gui_set_default_response (tg_tool->gui, GTK_RESPONSE_OK);
+
+  gimp_tool_gui_set_alternative_button_order (tg_tool->gui,
+                                              RESPONSE_RESET,
+                                              RESPONSE_READJUST,
+                                              GTK_RESPONSE_OK,
+                                              GTK_RESPONSE_CANCEL,
+                                              -1);
+
+  g_signal_connect (tg_tool->gui, "response",
+                    G_CALLBACK (gimp_transform_grid_tool_response),
+                    tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->dialog (tg_tool);
+}
+
+static void
+gimp_transform_grid_tool_dialog_update (GimpTransformGridTool *tg_tool)
+{
+  if (tg_tool->gui &&
+      GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->dialog_update)
+    {
+      GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->dialog_update (tg_tool);
+    }
+}
+
+static void
+gimp_transform_grid_tool_prepare (GimpTransformGridTool *tg_tool,
+                                  GimpDisplay           *display)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  if (tg_tool->gui)
+    {
+      GimpObject *object = gimp_transform_tool_get_active_object (tr_tool,
+                                                                  display);
+
+      gimp_tool_gui_set_shell (tg_tool->gui, gimp_display_get_shell (display));
+      gimp_tool_gui_set_viewable (tg_tool->gui, GIMP_VIEWABLE (object));
+    }
+
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->prepare)
+    {
+      tg_tool->trans_info = tg_tool->init_trans_info;
+      GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->prepare (tg_tool);
+
+      memcpy (tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD],
+              tg_tool->init_trans_info, sizeof (TransInfo));
+      memcpy (tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD],
+              tg_tool->init_trans_info, sizeof (TransInfo));
+    }
+
+  gimp_matrix3_identity (&tr_tool->transform);
+  tr_tool->transform_valid = TRUE;
+}
+
+static GimpToolWidget *
+gimp_transform_grid_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  static const gchar *properties[] =
+  {
+    "constrain-move",
+    "constrain-scale",
+    "constrain-rotate",
+    "constrain-shear",
+    "constrain-perspective",
+    "frompivot-scale",
+    "frompivot-shear",
+    "frompivot-perspective",
+    "cornersnap",
+    "fixedpivot"
+  };
+
+  GimpToolWidget *widget = NULL;
+
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->get_widget)
+    {
+      GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+      gint                      i;
+
+      widget = GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->get_widget (tg_tool);
+
+      gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tg_tool), widget);
+
+      g_object_bind_property (G_OBJECT (options), "grid-type",
+                              G_OBJECT (widget),  "guide-type",
+                              G_BINDING_SYNC_CREATE |
+                              G_BINDING_BIDIRECTIONAL);
+      g_object_bind_property (G_OBJECT (options), "grid-size",
+                              G_OBJECT (widget),  "n-guides",
+                              G_BINDING_SYNC_CREATE |
+                              G_BINDING_BIDIRECTIONAL);
+
+      for (i = 0; i < G_N_ELEMENTS (properties); i++)
+        g_object_bind_property (G_OBJECT (options), properties[i],
+                                G_OBJECT (widget),  properties[i],
+                                G_BINDING_SYNC_CREATE |
+                                G_BINDING_BIDIRECTIONAL);
+
+      g_signal_connect (widget, "changed",
+                        G_CALLBACK (gimp_transform_grid_tool_widget_changed),
+                        tg_tool);
+      g_signal_connect (widget, "response",
+                        G_CALLBACK (gimp_transform_grid_tool_widget_response),
+                        tg_tool);
+    }
+
+  return widget;
+}
+
+static void
+gimp_transform_grid_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  if (tg_tool->widget &&
+      GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->update_widget)
+    {
+      g_signal_handlers_block_by_func (
+        tg_tool->widget,
+        G_CALLBACK (gimp_transform_grid_tool_widget_changed),
+        tg_tool);
+
+      GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->update_widget (tg_tool);
+
+      g_signal_handlers_unblock_by_func (
+        tg_tool->widget,
+        G_CALLBACK (gimp_transform_grid_tool_widget_changed),
+        tg_tool);
+    }
+}
+
+static void
+gimp_transform_grid_tool_response (GimpToolGui           *gui,
+                                   gint                   response_id,
+                                   GimpTransformGridTool *tg_tool)
+{
+  GimpTool                 *tool       = GIMP_TOOL (tg_tool);
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransformOptions     *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tg_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  GimpDisplay              *display    = tool->display;
+
+  /* we can get here while already committing a transformation.  just return in
+   * this case.  see issue #4734.
+   */
+  if (! gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tg_tool)))
+    return;
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      {
+        gboolean direction_linked;
+
+        /*  restore the initial transformation info  */
+        memcpy (tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD],
+                tg_tool->init_trans_info,
+                sizeof (TransInfo));
+        memcpy (tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD],
+                tg_tool->init_trans_info,
+                sizeof (TransInfo));
+
+        /*  recalculate the tool's transformation matrix  */
+        direction_linked             = tg_options->direction_linked;
+        tg_options->direction_linked = FALSE;
+        gimp_transform_tool_recalc_matrix (tr_tool, display);
+        tg_options->direction_linked = direction_linked;
+
+        /*  push the restored info to the undo stack  */
+        gimp_transform_grid_tool_push_internal_undo (tg_tool, FALSE);
+      }
+      break;
+
+    case RESPONSE_READJUST:
+      if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->readjust       &&
+          GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->matrix_to_info &&
+          tr_tool->transform_valid)
+        {
+          TransInfo old_trans_infos[2];
+          gboolean  direction_linked;
+          gboolean  transform_valid;
+
+          /*  save the current transformation info  */
+          memcpy (old_trans_infos, tg_tool->trans_infos,
+                  sizeof (old_trans_infos));
+
+          /*  readjust the transformation info to view  */
+          GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->readjust (tg_tool);
+
+          /*  recalculate the tool's transformation matrix, preserving the
+           *  overall transformation
+           */
+          direction_linked             = tg_options->direction_linked;
+          tg_options->direction_linked = TRUE;
+          gimp_transform_tool_recalc_matrix (tr_tool, display);
+          tg_options->direction_linked = direction_linked;
+
+          transform_valid = tr_tool->transform_valid;
+
+          /*  if the resulting transformation is invalid, or if the
+           *  transformation info is already adjusted to view ...
+           */
+          if (! transform_valid ||
+              trans_infos_equal (old_trans_infos, tg_tool->trans_infos))
+            {
+              /*  ... readjust the transformation info to the item bounds  */
+              GimpMatrix3 transform = tr_tool->transform;
+
+              if (tr_options->direction == GIMP_TRANSFORM_BACKWARD)
+                gimp_matrix3_invert (&transform);
+
+              GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->apply_info (
+                tg_tool, tg_tool->init_trans_info);
+              GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->matrix_to_info (
+                tg_tool, &transform);
+
+              /*  recalculate the tool's transformation matrix, preserving the
+               *  overall transformation
+               */
+              direction_linked             = tg_options->direction_linked;
+              tg_options->direction_linked = TRUE;
+              gimp_transform_tool_recalc_matrix (tr_tool, display);
+              tg_options->direction_linked = direction_linked;
+
+              if (! tr_tool->transform_valid ||
+                  ! trans_infos_equal (old_trans_infos, tg_tool->trans_infos))
+                {
+                  transform_valid = tr_tool->transform_valid;
+                }
+            }
+
+          if (transform_valid)
+            {
+              /*  push the new info to the undo stack  */
+              gimp_transform_grid_tool_push_internal_undo (tg_tool, FALSE);
+            }
+          else
+            {
+              /*  restore the old transformation info  */
+              memcpy (tg_tool->trans_infos, old_trans_infos,
+                      sizeof (old_trans_infos));
+
+              /*  recalculate the tool's transformation matrix  */
+              direction_linked             = tg_options->direction_linked;
+              tg_options->direction_linked = FALSE;
+              gimp_transform_tool_recalc_matrix (tr_tool, display);
+              tg_options->direction_linked = direction_linked;
+
+              gimp_tool_message_literal (tool, tool->display,
+                                         _("Cannot readjust the transformation"));
+            }
+        }
+      break;
+
+    case GTK_RESPONSE_OK:
+      g_return_if_fail (display != NULL);
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+      break;
+
+    default:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+      /*  update the undo actions / menu items  */
+      if (display)
+        gimp_image_flush (gimp_display_get_image (display));
+      break;
+    }
+}
+
+static gboolean
+gimp_transform_grid_tool_composited_preview (GimpTransformGridTool *tg_tool)
+{
+  GimpTool                 *tool       = GIMP_TOOL (tg_tool);
+  GimpTransformOptions     *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tg_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  GimpImage                *image      = gimp_display_get_image (tool->display);
+
+  return tg_options->composited_preview                &&
+         tr_options->type == GIMP_TRANSFORM_TYPE_LAYER &&
+         gimp_channel_is_empty (gimp_image_get_mask (image));
+}
+
+static void
+gimp_transform_grid_tool_update_sensitivity (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  if (! tg_tool->gui)
+    return;
+
+  gimp_tool_gui_set_response_sensitive (
+    tg_tool->gui, GTK_RESPONSE_OK,
+    tr_tool->transform_valid);
+
+  gimp_tool_gui_set_response_sensitive (
+    tg_tool->gui, RESPONSE_RESET,
+    ! (trans_info_equal (tg_tool->trans_infos[GIMP_TRANSFORM_FORWARD],
+                         tg_tool->init_trans_info) &&
+       trans_info_equal (tg_tool->trans_infos[GIMP_TRANSFORM_BACKWARD],
+                         tg_tool->init_trans_info)));
+
+  gimp_tool_gui_set_response_sensitive (
+    tg_tool->gui, RESPONSE_READJUST,
+    tr_tool->transform_valid);
+}
+
+static void
+gimp_transform_grid_tool_update_preview (GimpTransformGridTool *tg_tool)
+{
+  GimpTool                 *tool       = GIMP_TOOL (tg_tool);
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransformOptions     *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tg_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  gint                      i;
+
+  if (! tool->display)
+    return;
+
+  if (tg_options->show_preview                              &&
+      gimp_transform_grid_tool_composited_preview (tg_tool) &&
+      tr_tool->transform_valid)
+    {
+      GHashTableIter  iter;
+      GimpDrawable   *drawable;
+      Filter         *filter;
+      gboolean        flush = FALSE;
+
+      if (! tg_tool->filters)
+        {
+          tg_tool->filters = g_hash_table_new_full (
+            g_direct_hash, g_direct_equal,
+            NULL, (GDestroyNotify) filter_free);
+
+          gimp_transform_grid_tool_update_filters (tg_tool);
+        }
+
+      g_hash_table_iter_init (&iter, tg_tool->filters);
+
+      while (g_hash_table_iter_next (&iter,
+                                     (gpointer *) &drawable,
+                                     (gpointer *) &filter))
+        {
+          GimpMatrix3   transform;
+          GeglRectangle bounds;
+          gint          offset_x;
+          gint          offset_y;
+          gint          width;
+          gint          height;
+          gint          x1, y1;
+          gint          x2, y2;
+          gboolean      update = FALSE;
+
+          if (! filter->filter)
+            continue;
+
+          gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
+
+          width  = gimp_item_get_width  (GIMP_ITEM (drawable));
+          height = gimp_item_get_height (GIMP_ITEM (drawable));
+
+          gimp_matrix3_identity (&transform);
+          gimp_matrix3_translate (&transform, +offset_x, +offset_y);
+          gimp_matrix3_mult (&tr_tool->transform, &transform);
+          gimp_matrix3_translate (&transform, -offset_x, -offset_y);
+
+          gimp_transform_resize_boundary (&tr_tool->transform,
+                                          gimp_item_get_clip (
+                                            GIMP_ITEM (filter->root_drawable),
+                                            tr_options->clip),
+                                          offset_x,         offset_y,
+                                          offset_x + width, offset_y + height,
+                                          &x1,              &y1,
+                                          &x2,              &y2);
+
+          bounds.x      = x1 - offset_x;
+          bounds.y      = y1 - offset_y;
+          bounds.width  = x2 - x1;
+          bounds.height = y2 - y1;
+
+          if (! gimp_matrix3_equal (&transform, &filter->transform))
+            {
+              filter->transform = transform;
+
+              gimp_gegl_node_set_matrix (filter->transform_node, &transform);
+
+              update = TRUE;
+            }
+
+          if (! gegl_rectangle_equal (&bounds, &filter->bounds))
+            {
+              filter->bounds = bounds;
+
+              gegl_node_set (filter->crop_node,
+                             "x",      (gdouble) bounds.x,
+                             "y",      (gdouble) bounds.y,
+                             "width",  (gdouble) bounds.width,
+                             "height", (gdouble) bounds.height,
+                             NULL);
+
+              update = TRUE;
+            }
+
+          if (GIMP_IS_LAYER (drawable))
+            {
+              gimp_drawable_filter_set_add_alpha (
+                filter->filter,
+                tr_options->interpolation != GIMP_INTERPOLATION_NONE);
+            }
+
+          if (update)
+            {
+              if (tg_options->synchronous_preview)
+                {
+                  g_signal_handlers_block_by_func (
+                    filter->filter,
+                    G_CALLBACK (gimp_transform_grid_tool_filter_flush),
+                    tg_tool);
+                }
+
+              gimp_drawable_filter_apply (filter->filter, NULL);
+
+              if (tg_options->synchronous_preview)
+                {
+                  g_signal_handlers_unblock_by_func (
+                    filter->filter,
+                    G_CALLBACK (gimp_transform_grid_tool_filter_flush),
+                    tg_tool);
+
+                  flush = TRUE;
+                }
+            }
+        }
+
+      if (flush)
+        {
+          GimpImage *image = gimp_display_get_image (tool->display);
+
+          gimp_projection_flush_now (gimp_image_get_projection (image), TRUE);
+          gimp_display_flush_now (tool->display);
+        }
+    }
+  else
+    {
+      g_clear_pointer (&tg_tool->filters, g_hash_table_unref);
+      g_clear_pointer (&tg_tool->preview_drawables, g_list_free);
+    }
+
+  if (tg_tool->preview)
+    {
+      if (tg_options->show_preview                                &&
+          ! gimp_transform_grid_tool_composited_preview (tg_tool) &&
+          tr_tool->transform_valid)
+        {
+          gimp_canvas_item_begin_change (tg_tool->preview);
+          gimp_canvas_item_set_visible (tg_tool->preview, TRUE);
+          g_object_set (
+            tg_tool->preview,
+            "transform", &tr_tool->transform,
+            "clip",      gimp_item_get_clip (GIMP_ITEM (tool->drawable),
+                                             tr_options->clip),
+            "opacity",   tg_options->preview_opacity,
+            NULL);
+          gimp_canvas_item_end_change (tg_tool->preview);
+        }
+      else
+        {
+          gimp_canvas_item_set_visible (tg_tool->preview, FALSE);
+        }
+    }
+
+  if (tg_tool->boundary_in)
+    {
+      gimp_canvas_item_begin_change (tg_tool->boundary_in);
+      gimp_canvas_item_set_visible (tg_tool->boundary_in,
+                                    tr_tool->transform_valid);
+      g_object_set (tg_tool->boundary_in,
+                    "transform", &tr_tool->transform,
+                    NULL);
+      gimp_canvas_item_end_change (tg_tool->boundary_in);
+    }
+
+  if (tg_tool->boundary_out)
+    {
+      gimp_canvas_item_begin_change (tg_tool->boundary_out);
+      gimp_canvas_item_set_visible (tg_tool->boundary_out,
+                                    tr_tool->transform_valid);
+      g_object_set (tg_tool->boundary_out,
+                    "transform", &tr_tool->transform,
+                    NULL);
+      gimp_canvas_item_end_change (tg_tool->boundary_out);
+    }
+
+  for (i = 0; i < tg_tool->strokes->len; i++)
+    {
+      GimpCanvasItem *item = g_ptr_array_index (tg_tool->strokes, i);
+
+      gimp_canvas_item_begin_change (item);
+      gimp_canvas_item_set_visible (item, tr_tool->transform_valid);
+      g_object_set (item,
+                    "transform", &tr_tool->transform,
+                    NULL);
+      gimp_canvas_item_end_change (item);
+    }
+}
+
+static void
+gimp_transform_grid_tool_update_filters (GimpTransformGridTool *tg_tool)
+{
+  GimpTool                 *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformGridOptions *options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  GHashTable               *new_drawables;
+  GList                    *drawables;
+  GList                    *iter;
+  GimpDrawable             *drawable;
+  GHashTableIter            hash_iter;
+
+  if (! tg_tool->filters)
+    return;
+
+  if (options->preview_linked &&
+      gimp_item_get_linked (GIMP_ITEM (tool->drawable)))
+    {
+      GimpImage *image = gimp_display_get_image (tool->display);
+
+      drawables = gimp_image_item_list_get_list (image,
+                                                 GIMP_ITEM_TYPE_LAYERS |
+                                                 GIMP_ITEM_TYPE_CHANNELS,
+                                                 GIMP_ITEM_SET_LINKED);
+
+      drawables = gimp_image_item_list_filter (drawables);
+    }
+  else
+    {
+      drawables = g_list_prepend (NULL, tool->drawable);
+    }
+
+  new_drawables = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+  for (iter = drawables; iter; iter = g_list_next (iter))
+    g_hash_table_add (new_drawables, iter->data);
+
+  for (iter = tg_tool->preview_drawables; iter; iter = g_list_next (iter))
+    {
+      drawable = iter->data;
+
+      if (! g_hash_table_remove (new_drawables, drawable))
+        gimp_transform_grid_tool_remove_filter (drawable, tg_tool);
+    }
+
+  g_hash_table_iter_init (&hash_iter, new_drawables);
+
+  while (g_hash_table_iter_next (&hash_iter, (gpointer *) &drawable, NULL))
+    {
+      AddFilterData data;
+
+      data.tg_tool       = tg_tool;
+      data.root_drawable = drawable;
+
+      gimp_transform_grid_tool_add_filter (drawable, &data);
+    }
+
+  g_hash_table_unref (new_drawables);
+
+  g_list_free (tg_tool->preview_drawables);
+  tg_tool->preview_drawables = drawables;
+}
+
+static void
+gimp_transform_grid_tool_hide_active_object (GimpTransformGridTool *tg_tool,
+                                             GimpObject            *object)
+{
+  GimpTransformGridOptions *options    = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  GimpTransformOptions     *tr_options = GIMP_TRANSFORM_OPTIONS (options);
+  GimpDisplay              *display    = GIMP_TOOL (tg_tool)->display;
+  GimpImage                *image      = gimp_display_get_image (display);
+
+  if (options->show_preview)
+    {
+      /*  hide only complete layers and channels, not layer masks  */
+      if (tr_options->type == GIMP_TRANSFORM_TYPE_LAYER &&
+          ! options->composited_preview                 &&
+          GIMP_IS_DRAWABLE (object)                     &&
+          ! GIMP_IS_LAYER_MASK (object)                 &&
+          gimp_item_get_visible (GIMP_ITEM (object))    &&
+          gimp_channel_is_empty (gimp_image_get_mask (image)))
+        {
+          tg_tool->hidden_object = object;
+
+          gimp_item_set_visible (GIMP_ITEM (object), FALSE, FALSE);
+
+          gimp_projection_flush (gimp_image_get_projection (image));
+        }
+      else if (tr_options->type == GIMP_TRANSFORM_TYPE_IMAGE)
+        {
+          tg_tool->hidden_object = object;
+
+          gimp_display_shell_set_show_image (gimp_display_get_shell (display),
+                                             FALSE);
+        }
+    }
+}
+
+static void
+gimp_transform_grid_tool_show_active_object (GimpTransformGridTool *tg_tool)
+{
+  if (tg_tool->hidden_object)
+    {
+      GimpDisplay *display = GIMP_TOOL (tg_tool)->display;
+      GimpImage   *image   = gimp_display_get_image (display);
+
+      if (GIMP_IS_ITEM (tg_tool->hidden_object))
+        {
+          gimp_item_set_visible (GIMP_ITEM (tg_tool->hidden_object), TRUE,
+                                            FALSE);
+        }
+      else
+        {
+          g_return_if_fail (GIMP_IS_IMAGE (tg_tool->hidden_object));
+
+          gimp_display_shell_set_show_image (gimp_display_get_shell (display),
+                                             TRUE);
+        }
+
+      tg_tool->hidden_object = NULL;
+
+      gimp_image_flush (image);
+    }
+}
+
+static void
+gimp_transform_grid_tool_add_filter (GimpDrawable  *drawable,
+                                     AddFilterData *data)
+{
+  Filter        *filter;
+  GimpLayerMode  mode = GIMP_LAYER_MODE_NORMAL;
+
+  if (GIMP_IS_LAYER (drawable))
+    {
+      gimp_layer_get_effective_mode (GIMP_LAYER (drawable),
+                                     &mode, NULL, NULL, NULL);
+    }
+
+  if (mode != GIMP_LAYER_MODE_PASS_THROUGH)
+    {
+      filter = filter_new (data->tg_tool, drawable, data->root_drawable, TRUE);
+    }
+  else
+    {
+      GimpContainer *container;
+
+      filter = filter_new (data->tg_tool, drawable, data->root_drawable, FALSE);
+
+      container = gimp_viewable_get_children (GIMP_VIEWABLE (drawable));
+
+      gimp_container_foreach (container,
+                              (GFunc) gimp_transform_grid_tool_add_filter,
+                              data);
+    }
+
+  g_hash_table_insert (data->tg_tool->filters, drawable, filter);
+
+  if (GIMP_IS_LAYER (drawable))
+    {
+      GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (drawable));
+
+      if (mask)
+        gimp_transform_grid_tool_add_filter (GIMP_DRAWABLE (mask), data);
+    }
+}
+
+static void
+gimp_transform_grid_tool_remove_filter (GimpDrawable          *drawable,
+                                        GimpTransformGridTool *tg_tool)
+{
+  Filter *filter = g_hash_table_lookup (tg_tool->filters, drawable);
+
+  if (GIMP_IS_LAYER (drawable))
+    {
+      GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (drawable));
+
+      if (mask)
+        gimp_transform_grid_tool_remove_filter (GIMP_DRAWABLE (mask), tg_tool);
+    }
+
+  if (! filter->filter)
+    {
+      GimpContainer *container;
+
+      container = gimp_viewable_get_children (GIMP_VIEWABLE (drawable));
+
+      gimp_container_foreach (container,
+                              (GFunc) gimp_transform_grid_tool_remove_filter,
+                              tg_tool);
+    }
+
+  g_hash_table_remove (tg_tool->filters, drawable);
+}
+
+static void
+gimp_transform_grid_tool_effective_mode_changed (GimpLayer             *layer,
+                                                 GimpTransformGridTool *tg_tool)
+{
+  Filter        *filter = g_hash_table_lookup (tg_tool->filters, layer);
+  GimpLayerMode  mode;
+  gboolean       old_pass_through;
+  gboolean       new_pass_through;
+
+  gimp_layer_get_effective_mode (layer, &mode, NULL, NULL, NULL);
+
+  old_pass_through = ! filter->filter;
+  new_pass_through = mode == GIMP_LAYER_MODE_PASS_THROUGH;
+
+  if (old_pass_through != new_pass_through)
+    {
+      AddFilterData data;
+
+      data.tg_tool       = tg_tool;
+      data.root_drawable = filter->root_drawable;
+
+      gimp_transform_grid_tool_remove_filter (GIMP_DRAWABLE (layer), tg_tool);
+      gimp_transform_grid_tool_add_filter    (GIMP_DRAWABLE (layer), &data);
+
+      gimp_transform_grid_tool_update_preview (tg_tool);
+    }
+}
+
+static Filter *
+filter_new (GimpTransformGridTool *tg_tool,
+            GimpDrawable          *drawable,
+            GimpDrawable          *root_drawable,
+            gboolean               add_filter)
+{
+  Filter   *filter = g_slice_new0 (Filter);
+  GeglNode *node;
+  GeglNode *input_node;
+  GeglNode *output_node;
+
+  filter->tg_tool       = tg_tool;
+  filter->drawable      = drawable;
+  filter->root_drawable = root_drawable;
+
+  if (add_filter)
+    {
+      node = gegl_node_new ();
+
+      input_node  = gegl_node_get_input_proxy (node, "input");
+      output_node = gegl_node_get_input_proxy (node, "output");
+
+      filter->transform_node = gegl_node_new_child (
+        node,
+        "operation", "gegl:transform",
+        "near-z",    GIMP_TRANSFORM_NEAR_Z,
+        "sampler",   GEGL_SAMPLER_NEAREST,
+        NULL);
+
+      filter->crop_node = gegl_node_new_child (
+        node,
+        "operation", "gegl:crop",
+        NULL);
+
+      gegl_node_link_many (input_node,
+                           filter->transform_node,
+                           filter->crop_node,
+                           output_node,
+                           NULL);
+
+      gimp_gegl_node_set_underlying_operation (node, filter->transform_node);
+
+      filter->filter = gimp_drawable_filter_new (
+        drawable,
+        GIMP_TRANSFORM_TOOL_GET_CLASS (tg_tool)->undo_desc,
+        node,
+        gimp_tool_get_icon_name (GIMP_TOOL (tg_tool)));
+
+      gimp_drawable_filter_set_clip (filter->filter, FALSE);
+      gimp_drawable_filter_set_override_constraints (filter->filter, TRUE);
+
+      g_signal_connect (
+        filter->filter, "flush",
+        G_CALLBACK (gimp_transform_grid_tool_filter_flush),
+        tg_tool);
+
+      g_object_unref (node);
+    }
+
+  if (GIMP_IS_GROUP_LAYER (drawable))
+    {
+      g_signal_connect (
+        drawable, "effective-mode-changed",
+        G_CALLBACK (gimp_transform_grid_tool_effective_mode_changed),
+        tg_tool);
+    }
+
+  return filter;
+}
+
+static void
+filter_free (Filter *filter)
+{
+  if (filter->filter)
+    {
+      gimp_drawable_filter_abort (filter->filter);
+
+      g_object_unref (filter->filter);
+    }
+
+  if (GIMP_IS_GROUP_LAYER (filter->drawable))
+    {
+      g_signal_handlers_disconnect_by_func (
+        filter->drawable,
+        gimp_transform_grid_tool_effective_mode_changed,
+        filter->tg_tool);
+    }
+
+  g_slice_free (Filter, filter);
+}
+
+static UndoInfo *
+undo_info_new (void)
+{
+  return g_slice_new0 (UndoInfo);
+}
+
+static void
+undo_info_free (UndoInfo *info)
+{
+  g_slice_free (UndoInfo, info);
+}
+
+static gboolean
+trans_info_equal (const TransInfo trans_info1,
+                  const TransInfo trans_info2)
+{
+  gint i;
+
+  for (i = 0; i < TRANS_INFO_SIZE; i++)
+    {
+      if (fabs (trans_info1[i] - trans_info2[i]) > EPSILON)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+trans_infos_equal (const TransInfo *trans_infos1,
+                   const TransInfo *trans_infos2)
+{
+  return trans_info_equal (trans_infos1[GIMP_TRANSFORM_FORWARD],
+                           trans_infos2[GIMP_TRANSFORM_FORWARD]) &&
+         trans_info_equal (trans_infos1[GIMP_TRANSFORM_BACKWARD],
+                           trans_infos2[GIMP_TRANSFORM_BACKWARD]);
+}
+
+gboolean
+gimp_transform_grid_tool_info_to_matrix (GimpTransformGridTool *tg_tool,
+                                         GimpMatrix3           *transform)
+{
+  g_return_val_if_fail (GIMP_IS_TRANSFORM_GRID_TOOL (tg_tool), FALSE);
+  g_return_val_if_fail (transform != NULL, FALSE);
+
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->info_to_matrix)
+    {
+      return GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->info_to_matrix (
+        tg_tool, transform);
+    }
+
+  return FALSE;
+}
+
+void
+gimp_transform_grid_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                         const GimpMatrix3     *transform)
+{
+  g_return_if_fail (GIMP_IS_TRANSFORM_GRID_TOOL (tg_tool));
+  g_return_if_fail (transform != NULL);
+
+  if (GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->matrix_to_info)
+    {
+      return GIMP_TRANSFORM_GRID_TOOL_GET_CLASS (tg_tool)->matrix_to_info (
+        tg_tool, transform);
+    }
+}
+
+void
+gimp_transform_grid_tool_push_internal_undo (GimpTransformGridTool *tg_tool,
+                                             gboolean               compress)
+{
+  UndoInfo *undo_info;
+
+  g_return_if_fail (GIMP_IS_TRANSFORM_GRID_TOOL (tg_tool));
+  g_return_if_fail (tg_tool->undo_list != NULL);
+
+  undo_info = tg_tool->undo_list->data;
+
+  /* push current state on the undo list and set this state as the
+   * current state, but avoid doing this if there were no changes
+   */
+  if (! trans_infos_equal (undo_info->trans_infos, tg_tool->trans_infos))
+    {
+      GimpTransformOptions *tr_options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tg_tool);
+      gint64                time       = 0;
+      gboolean              flush = FALSE;
+
+      if (tg_tool->undo_list->next == NULL)
+        flush = TRUE;
+
+      if (compress)
+        time = g_get_monotonic_time ();
+
+      if (! compress || time - undo_info->time >= UNDO_COMPRESS_TIME)
+        {
+          undo_info = undo_info_new ();
+
+          tg_tool->undo_list = g_list_prepend (tg_tool->undo_list, undo_info);
+        }
+
+      undo_info->time      = time;
+      undo_info->direction = tr_options->direction;
+      memcpy (undo_info->trans_infos, tg_tool->trans_infos,
+              sizeof (tg_tool->trans_infos));
+
+      /* If we undid anything and started interacting, we have to
+       * discard the redo history
+       */
+      if (tg_tool->redo_list)
+        {
+          g_list_free_full (tg_tool->redo_list,
+                            (GDestroyNotify) undo_info_free);
+          tg_tool->redo_list = NULL;
+
+          flush = TRUE;
+        }
+
+      gimp_transform_grid_tool_update_sensitivity (tg_tool);
+
+      /*  update the undo actions / menu items  */
+      if (flush)
+        {
+          gimp_image_flush (
+            gimp_display_get_image (GIMP_TOOL (tg_tool)->display));
+        }
+    }
+}
diff --git a/app/tools/gimptransformgridtool.h b/app/tools/gimptransformgridtool.h
new file mode 100644
index 0000000..3a83418
--- /dev/null
+++ b/app/tools/gimptransformgridtool.h
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_GRID_TOOL_H__
+#define __GIMP_TRANSFORM_GRID_TOOL_H__
+
+
+#include "gimptransformtool.h"
+
+
+/* This is not the number of items in the enum above, but the max size
+ * of the enums at the top of each transformation tool, stored in
+ * trans_info and related
+ */
+#define TRANS_INFO_SIZE 17
+
+typedef gdouble TransInfo[TRANS_INFO_SIZE];
+
+
+#define GIMP_TYPE_TRANSFORM_GRID_TOOL            (gimp_transform_grid_tool_get_type ())
+#define GIMP_TRANSFORM_GRID_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_GRID_TOOL, GimpTransformGridTool))
+#define GIMP_TRANSFORM_GRID_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_GRID_TOOL, GimpTransformGridToolClass))
+#define GIMP_IS_TRANSFORM_GRID_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_GRID_TOOL))
+#define GIMP_IS_TRANSFORM_GRID_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSFORM_GRID_TOOL))
+#define GIMP_TRANSFORM_GRID_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_GRID_TOOL, GimpTransformGridToolClass))
+
+#define GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS(t)  (GIMP_TRANSFORM_GRID_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpTransformGridToolClass GimpTransformGridToolClass;
+
+struct _GimpTransformGridTool
+{
+  GimpTransformTool   parent_instance;
+
+  TransInfo           init_trans_info;  /*  initial transformation info           */
+  TransInfo           trans_infos[2];   /*  forward/backward transformation info  */
+  gdouble            *trans_info;       /*  current transformation info           */
+  GList              *undo_list;        /*  list of all states,
+                                            head is current == prev_trans_info,
+                                            tail is original == old_trans_info    */
+  GList              *redo_list;        /*  list of all undone states,
+                                            NULL when nothing undone */
+
+  GimpObject         *hidden_object;    /*  the object that was hidden during
+                                            the transform                         */
+
+  GimpToolWidget     *widget;
+  GimpToolWidget     *grab_widget;
+  GimpCanvasItem     *preview;
+  GimpCanvasItem     *boundary_in;
+  GimpCanvasItem     *boundary_out;
+  GPtrArray          *strokes;
+
+  GHashTable         *filters;
+  GList              *preview_drawables;
+
+  GimpToolGui        *gui;
+};
+
+struct _GimpTransformGridToolClass
+{
+  GimpTransformToolClass  parent_class;
+
+  /*  virtual functions  */
+  gboolean         (* info_to_matrix) (GimpTransformGridTool  *tg_tool,
+                                       GimpMatrix3            *transform);
+  void             (* matrix_to_info) (GimpTransformGridTool  *tg_tool,
+                                       const GimpMatrix3      *transform);
+  void             (* apply_info)     (GimpTransformGridTool  *tg_tool,
+                                       const TransInfo         info);
+  gchar          * (* get_undo_desc)  (GimpTransformGridTool  *tg_tool);
+  void             (* dialog)         (GimpTransformGridTool  *tg_tool);
+  void             (* dialog_update)  (GimpTransformGridTool  *tg_tool);
+  void             (* prepare)        (GimpTransformGridTool  *tg_tool);
+  void             (* readjust)       (GimpTransformGridTool  *tg_tool);
+  GimpToolWidget * (* get_widget)     (GimpTransformGridTool  *tg_tool);
+  void             (* update_widget)  (GimpTransformGridTool  *tg_tool);
+  void             (* widget_changed) (GimpTransformGridTool  *tg_tool);
+  GeglBuffer     * (* transform)      (GimpTransformGridTool  *tg_tool,
+                                       GimpObject             *object,
+                                       GeglBuffer             *orig_buffer,
+                                       gint                    orig_offset_x,
+                                       gint                    orig_offset_y,
+                                       GimpColorProfile      **buffer_profile,
+                                       gint                   *new_offset_x,
+                                       gint                   *new_offset_y);
+
+  const gchar *ok_button_label;
+};
+
+
+GType      gimp_transform_grid_tool_get_type           (void) G_GNUC_CONST;
+
+gboolean   gimp_transform_grid_tool_info_to_matrix     (GimpTransformGridTool *tg_tool,
+                                                        GimpMatrix3           *transform);
+void       gimp_transform_grid_tool_matrix_to_info     (GimpTransformGridTool *tg_tool,
+                                                        const GimpMatrix3     *transform);
+
+void       gimp_transform_grid_tool_push_internal_undo (GimpTransformGridTool *tg_tool,
+                                                        gboolean               compress);
+
+
+#endif  /*  __GIMP_TRANSFORM_GRID_TOOL_H__  */
diff --git a/app/tools/gimptransformgridtoolundo.c b/app/tools/gimptransformgridtoolundo.c
new file mode 100644
index 0000000..035d9e5
--- /dev/null
+++ b/app/tools/gimptransformgridtoolundo.c
@@ -0,0 +1,220 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "tools-types.h"
+
+#include "gimptoolcontrol.h"
+#include "gimptransformgridtool.h"
+#include "gimptransformgridtoolundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TRANSFORM_TOOL
+};
+
+
+static void   gimp_transform_grid_tool_undo_constructed  (GObject             *object);
+static void   gimp_transform_grid_tool_undo_set_property (GObject             *object,
+                                                          guint                property_id,
+                                                          const GValue        *value,
+                                                          GParamSpec          *pspec);
+static void   gimp_transform_grid_tool_undo_get_property (GObject             *object,
+                                                          guint                property_id,
+                                                          GValue              *value,
+                                                          GParamSpec          *pspec);
+
+static void   gimp_transform_grid_tool_undo_pop          (GimpUndo            *undo,
+                                                          GimpUndoMode         undo_mode,
+                                                          GimpUndoAccumulator *accum);
+static void   gimp_transform_grid_tool_undo_free         (GimpUndo            *undo,
+                                                          GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpTransformGridToolUndo, gimp_transform_grid_tool_undo, GIMP_TYPE_UNDO)
+
+#define parent_class gimp_transform_grid_tool_undo_parent_class
+
+
+static void
+gimp_transform_grid_tool_undo_class_init (GimpTransformGridToolUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed  = gimp_transform_grid_tool_undo_constructed;
+  object_class->set_property = gimp_transform_grid_tool_undo_set_property;
+  object_class->get_property = gimp_transform_grid_tool_undo_get_property;
+
+  undo_class->pop            = gimp_transform_grid_tool_undo_pop;
+  undo_class->free           = gimp_transform_grid_tool_undo_free;
+
+  g_object_class_install_property (object_class, PROP_TRANSFORM_TOOL,
+                                   g_param_spec_object ("transform-tool",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TRANSFORM_GRID_TOOL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_transform_grid_tool_undo_init (GimpTransformGridToolUndo *undo)
+{
+}
+
+static void
+gimp_transform_grid_tool_undo_constructed (GObject *object)
+{
+  GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (object);
+  GimpTransformGridTool     *tg_tool;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_TRANSFORM_GRID_TOOL (tg_tool_undo->tg_tool));
+
+  tg_tool = tg_tool_undo->tg_tool;
+
+  memcpy (tg_tool_undo->trans_infos[GIMP_TRANSFORM_FORWARD],
+          tg_tool->init_trans_info, sizeof (TransInfo));
+  memcpy (tg_tool_undo->trans_infos[GIMP_TRANSFORM_BACKWARD],
+          tg_tool->init_trans_info, sizeof (TransInfo));
+
+#if 0
+  if (tg_tool->original)
+    tg_tool_undo->original = tile_manager_ref (tg_tool->original);
+#endif
+
+  g_object_add_weak_pointer (G_OBJECT (tg_tool_undo->tg_tool),
+                             (gpointer) &tg_tool_undo->tg_tool);
+}
+
+static void
+gimp_transform_grid_tool_undo_set_property (GObject      *object,
+                                            guint         property_id,
+                                            const GValue *value,
+                                            GParamSpec   *pspec)
+{
+  GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_TRANSFORM_TOOL:
+      tg_tool_undo->tg_tool = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_transform_grid_tool_undo_get_property (GObject    *object,
+                                            guint       property_id,
+                                            GValue     *value,
+                                            GParamSpec *pspec)
+{
+  GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_TRANSFORM_TOOL:
+      g_value_set_object (value, tg_tool_undo->tg_tool);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_transform_grid_tool_undo_pop (GimpUndo            *undo,
+                                   GimpUndoMode         undo_mode,
+                                   GimpUndoAccumulator *accum)
+{
+  GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (undo);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  if (tg_tool_undo->tg_tool)
+    {
+      GimpTransformGridTool *tg_tool;
+#if 0
+      TileManager           *temp;
+#endif
+      TransInfo              temp_trans_infos[2];
+
+      tg_tool = tg_tool_undo->tg_tool;
+
+      /*  swap the transformation information00 arrays  */
+      memcpy (temp_trans_infos, tg_tool_undo->trans_infos,
+              sizeof (tg_tool->trans_infos));
+      memcpy (tg_tool_undo->trans_infos, tg_tool->trans_infos,
+              sizeof (tg_tool->trans_infos));
+      memcpy (tg_tool->trans_infos, temp_trans_infos,
+              sizeof (tg_tool->trans_infos));
+
+#if 0
+      /*  swap the original buffer--the source buffer for repeated transform_grids
+       */
+      temp                   = tg_tool_undo->original;
+      tg_tool_undo->original = tg_tool->original;
+      tg_tool->original      = temp;
+#endif
+
+#if 0
+      /*  If we're re-implementing the first transform_grid, reactivate tool  */
+      if (undo_mode == GIMP_UNDO_MODE_REDO && tg_tool->original)
+        {
+          gimp_tool_control_activate (GIMP_TOOL (tg_tool)->control);
+
+          gimp_draw_tool_resume (GIMP_DRAW_TOOL (tg_tool));
+        }
+#endif
+    }
+ }
+
+static void
+gimp_transform_grid_tool_undo_free (GimpUndo     *undo,
+                                    GimpUndoMode  undo_mode)
+{
+  GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (undo);
+
+  if (tg_tool_undo->tg_tool)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (tg_tool_undo->tg_tool),
+                                    (gpointer) &tg_tool_undo->tg_tool);
+      tg_tool_undo->tg_tool = NULL;
+    }
+
+#if 0
+  if (tg_tool_undo->original)
+    {
+      tile_manager_unref (tg_tool_undo->original);
+      tg_tool_undo->original = NULL;
+    }
+#endif
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/tools/gimptransformgridtoolundo.h b/app/tools/gimptransformgridtoolundo.h
new file mode 100644
index 0000000..3fc7a24
--- /dev/null
+++ b/app/tools/gimptransformgridtoolundo.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_GRID_TOOL_UNDO_H__
+#define __GIMP_TRANSFORM_GRID_TOOL_UNDO_H__
+
+
+#include "core/gimpundo.h"
+
+
+#define GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO            (gimp_transform_grid_tool_undo_get_type ())
+#define GIMP_TRANSFORM_GRID_TOOL_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO, GimpTransformGridToolUndo))
+#define GIMP_TRANSFORM_GRID_TOOL_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO, GimpTransformGridToolUndoClass))
+#define GIMP_IS_TRANSFORM_GRID_TOOL_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO))
+#define GIMP_IS_TRANSFORM_GRID_TOOL_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO))
+#define GIMP_TRANSFORM_GRID_TOOL_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_GRID_TOOL_UNDO, GimpTransformGridToolUndoClass))
+
+
+typedef struct _GimpTransformGridToolUndo      GimpTransformGridToolUndo;
+typedef struct _GimpTransformGridToolUndoClass GimpTransformGridToolUndoClass;
+
+struct _GimpTransformGridToolUndo
+{
+  GimpUndo               parent_instance;
+
+  GimpTransformGridTool *tg_tool;
+  TransInfo              trans_infos[2];
+#if 0                   
+  TileManager           *original;
+#endif
+};
+
+struct _GimpTransformGridToolUndoClass
+{
+  GimpUndoClass  parent_class;
+};
+
+
+GType   gimp_transform_grid_tool_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_TRANSFORM_GRID_TOOL_UNDO_H__ */
diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c
new file mode 100644
index 0000000..d1c75e6
--- /dev/null
+++ b/app/tools/gimptransformoptions.c
@@ -0,0 +1,271 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimptooloptions-gui.h"
+#include "gimptransformoptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_DIRECTION,
+  PROP_INTERPOLATION,
+  PROP_CLIP
+};
+
+
+static void     gimp_transform_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void     gimp_transform_options_set_property (GObject         *object,
+                                                     guint            property_id,
+                                                     const GValue    *value,
+                                                     GParamSpec      *pspec);
+static void     gimp_transform_options_get_property (GObject         *object,
+                                                     guint            property_id,
+                                                     GValue          *value,
+                                                     GParamSpec      *pspec);
+
+static void     gimp_transform_options_reset        (GimpConfig      *config);
+
+G_DEFINE_TYPE_WITH_CODE (GimpTransformOptions, gimp_transform_options,
+                         GIMP_TYPE_TOOL_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_transform_options_config_iface_init))
+
+#define parent_class gimp_transform_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_transform_options_class_init (GimpTransformOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_transform_options_set_property;
+  object_class->get_property = gimp_transform_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_TYPE,
+                         "type",
+                         NULL, NULL,
+                         GIMP_TYPE_TRANSFORM_TYPE,
+                         GIMP_TRANSFORM_TYPE_LAYER,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_DIRECTION,
+                         "direction",
+                         _("Direction"),
+                         _("Direction of transformation"),
+                         GIMP_TYPE_TRANSFORM_DIRECTION,
+                         GIMP_TRANSFORM_FORWARD,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_INTERPOLATION,
+                         "interpolation",
+                         _("Interpolation"),
+                         _("Interpolation method"),
+                         GIMP_TYPE_INTERPOLATION_TYPE,
+                         GIMP_INTERPOLATION_LINEAR,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_CLIP,
+                         "clip",
+                         _("Clipping"),
+                         _("How to clip"),
+                         GIMP_TYPE_TRANSFORM_RESIZE,
+                         GIMP_TRANSFORM_RESIZE_ADJUST,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_transform_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_transform_options_reset;
+}
+
+static void
+gimp_transform_options_init (GimpTransformOptions *options)
+{
+}
+
+static void
+gimp_transform_options_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      options->type = g_value_get_enum (value);
+      break;
+    case PROP_DIRECTION:
+      options->direction = g_value_get_enum (value);
+      break;
+    case PROP_INTERPOLATION:
+      options->interpolation = g_value_get_enum (value);
+      break;
+    case PROP_CLIP:
+      options->clip = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_transform_options_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, options->type);
+      break;
+    case PROP_DIRECTION:
+      g_value_set_enum (value, options->direction);
+      break;
+    case PROP_INTERPOLATION:
+      g_value_set_enum (value, options->interpolation);
+      break;
+    case PROP_CLIP:
+      g_value_set_enum (value, options->clip);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_transform_options_reset (GimpConfig *config)
+{
+  GimpToolOptions *tool_options = GIMP_TOOL_OPTIONS (config);
+  GParamSpec      *pspec;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        "interpolation");
+
+  if (pspec)
+    G_PARAM_SPEC_ENUM (pspec)->default_value =
+      tool_options->tool_info->gimp->config->interpolation_type;
+
+  parent_config_iface->reset (config);
+}
+
+/**
+ * gimp_transform_options_gui:
+ * @tool_options:  a #GimpToolOptions
+ * @direction:     whether to show the direction frame
+ * @interpolation: whether to show the interpolation menu
+ * @clipping:      whether to show the clipping menu
+ *
+ * Build the Transform Tool Options.
+ *
+ * Return value: a container holding the transform tool options
+ **/
+GtkWidget *
+gimp_transform_options_gui (GimpToolOptions *tool_options,
+                            gboolean         direction,
+                            gboolean         interpolation,
+                            gboolean         clipping)
+{
+  GObject              *config  = G_OBJECT (tool_options);
+  GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (tool_options);
+  GtkWidget            *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget            *hbox;
+  GtkWidget            *box;
+  GtkWidget            *label;
+  GtkWidget            *frame;
+  GtkWidget            *combo;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  options->type_box = hbox;
+
+  label = gtk_label_new (_("Transform:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  box = gimp_prop_enum_icon_box_new (config, "type", "gimp", 0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  if (direction)
+    {
+      frame = gimp_prop_enum_radio_frame_new (config, "direction", NULL,
+                                              0, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      gtk_widget_show (frame);
+
+      options->direction_frame = frame;
+    }
+
+  /*  the interpolation menu  */
+  if (interpolation)
+    {
+      combo = gimp_prop_enum_combo_box_new (config, "interpolation", 0, 0);
+      gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Interpolation"));
+      g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+      gtk_widget_show (combo);
+    }
+
+  /*  the clipping menu  */
+  if (clipping)
+    {
+      combo = gimp_prop_enum_combo_box_new (config, "clip", 0, 0);
+      gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Clipping"));
+      g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+      gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+      gtk_widget_show (combo);
+    }
+
+  return vbox;
+}
diff --git a/app/tools/gimptransformoptions.h b/app/tools/gimptransformoptions.h
new file mode 100644
index 0000000..ca8d032
--- /dev/null
+++ b/app/tools/gimptransformoptions.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_OPTIONS_H__
+#define __GIMP_TRANSFORM_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_TRANSFORM_OPTIONS            (gimp_transform_options_get_type ())
+#define GIMP_TRANSFORM_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_OPTIONS, GimpTransformOptions))
+#define GIMP_TRANSFORM_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_OPTIONS, GimpTransformOptionsClass))
+#define GIMP_IS_TRANSFORM_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_OPTIONS))
+#define GIMP_IS_TRANSFORM_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSFORM_OPTIONS))
+#define GIMP_TRANSFORM_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_OPTIONS, GimpTransformOptionsClass))
+
+
+typedef struct _GimpTransformOptions      GimpTransformOptions;
+typedef struct _GimpTransformOptionsClass GimpTransformOptionsClass;
+
+struct _GimpTransformOptions
+{
+  GimpToolOptions         parent_instance;
+
+  GimpTransformType       type;
+  GimpTransformDirection  direction;
+  GimpInterpolationType   interpolation;
+  GimpTransformResize     clip;
+
+  /*  options gui  */
+  GtkWidget              *type_box;
+  GtkWidget              *direction_frame;
+};
+
+struct _GimpTransformOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+};
+
+
+GType       gimp_transform_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_transform_options_gui      (GimpToolOptions *tool_options,
+                                             gboolean         direction,
+                                             gboolean         interpolation,
+                                             gboolean         clipping);
+
+
+#endif /* __GIMP_TRANSFORM_OPTIONS_H__ */
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
new file mode 100644
index 0000000..3190e14
--- /dev/null
+++ b/app/tools/gimptransformtool.c
@@ -0,0 +1,925 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable-transform.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-item-list.h"
+#include "core/gimpimage-transform.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpitem-linked.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimpprogress.h"
+#include "core/gimp-transform-resize.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+
+#include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+#include "gimptransformoptions.h"
+#include "gimptransformtool.h"
+
+#include "gimp-intl.h"
+
+
+/* the minimal ratio between the transformed item size and the image size,
+ * above which confirmation is required.
+ */
+#define MIN_CONFIRMATION_RATIO 10
+
+
+/*  local function prototypes  */
+
+static void                     gimp_transform_tool_control            (GimpTool           *tool,
+                                                                        GimpToolAction      action,
+                                                                        GimpDisplay        *display);
+
+static gchar                  * gimp_transform_tool_real_get_undo_desc (GimpTransformTool  *tr_tool);
+static GimpTransformDirection   gimp_transform_tool_real_get_direction (GimpTransformTool  *tr_tool);
+static GeglBuffer             * gimp_transform_tool_real_transform     (GimpTransformTool  *tr_tool,
+                                                                        GimpObject         *object,
+                                                                        GeglBuffer         *orig_buffer,
+                                                                        gint                orig_offset_x,
+                                                                        gint                orig_offset_y,
+                                                                        GimpColorProfile  **buffer_profile,
+                                                                        gint               *new_offset_x,
+                                                                        gint               *new_offset_y);
+
+static void                     gimp_transform_tool_halt               (GimpTransformTool  *tr_tool);
+
+static gboolean                 gimp_transform_tool_confirm            (GimpTransformTool  *tr_tool,
+                                                                        GimpDisplay        *display);
+
+
+G_DEFINE_TYPE (GimpTransformTool, gimp_transform_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_transform_tool_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_transform_tool_class_init (GimpTransformToolClass *klass)
+{
+  GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
+
+  tool_class->control  = gimp_transform_tool_control;
+
+  klass->recalc_matrix = NULL;
+  klass->get_undo_desc = gimp_transform_tool_real_get_undo_desc;
+  klass->get_direction = gimp_transform_tool_real_get_direction;
+  klass->transform     = gimp_transform_tool_real_transform;
+
+  klass->undo_desc     = _("Transform");
+  klass->progress_text = _("Transforming");
+}
+
+static void
+gimp_transform_tool_init (GimpTransformTool *tr_tool)
+{
+  gimp_matrix3_identity (&tr_tool->transform);
+  tr_tool->transform_valid = TRUE;
+
+  tr_tool->restore_type = FALSE;
+}
+
+static void
+gimp_transform_tool_control (GimpTool       *tool,
+                             GimpToolAction  action,
+                             GimpDisplay    *display)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_transform_tool_halt (tr_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static gchar *
+gimp_transform_tool_real_get_undo_desc (GimpTransformTool *tr_tool)
+{
+  return g_strdup (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->undo_desc);
+}
+
+static GimpTransformDirection
+gimp_transform_tool_real_get_direction (GimpTransformTool *tr_tool)
+{
+  GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+
+  return options->direction;
+}
+
+static GeglBuffer *
+gimp_transform_tool_real_transform (GimpTransformTool *tr_tool,
+                                    GimpObject        *object,
+                                    GeglBuffer        *orig_buffer,
+                                    gint               orig_offset_x,
+                                    gint               orig_offset_y,
+                                    GimpColorProfile **buffer_profile,
+                                    gint              *new_offset_x,
+                                    gint              *new_offset_y)
+{
+  GimpTransformToolClass *klass   = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool);
+  GimpTool               *tool    = GIMP_TOOL (tr_tool);
+  GimpTransformOptions   *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
+  GimpContext            *context = GIMP_CONTEXT (options);
+  GeglBuffer             *ret     = NULL;
+  GimpTransformResize     clip    = options->clip;
+  GimpTransformDirection  direction;
+  GimpProgress           *progress;
+
+  direction = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->get_direction (tr_tool);
+
+  progress = gimp_progress_start (GIMP_PROGRESS (tool), FALSE,
+                                  "%s", klass->progress_text);
+
+  if (orig_buffer)
+    {
+      /*  this happens when transforming a selection cut out of a
+       *  normal drawable
+       */
+
+      g_return_val_if_fail (GIMP_IS_DRAWABLE (object), NULL);
+
+      ret = gimp_drawable_transform_buffer_affine (GIMP_DRAWABLE (object),
+                                                   context,
+                                                   orig_buffer,
+                                                   orig_offset_x,
+                                                   orig_offset_y,
+                                                   &tr_tool->transform,
+                                                   direction,
+                                                   options->interpolation,
+                                                   clip,
+                                                   buffer_profile,
+                                                   new_offset_x,
+                                                   new_offset_y,
+                                                   progress);
+    }
+  else if (GIMP_IS_ITEM (object))
+    {
+      /*  this happens for entire drawables, paths and layer groups  */
+
+      GimpItem *item = GIMP_ITEM (object);
+
+      if (gimp_item_get_linked (item))
+        {
+          gimp_item_linked_transform (item, context,
+                                      &tr_tool->transform,
+                                      direction,
+                                      options->interpolation,
+                                      clip,
+                                      progress);
+        }
+      else
+        {
+          clip = gimp_item_get_clip (item, clip);
+
+          gimp_item_transform (item, context,
+                               &tr_tool->transform,
+                               direction,
+                               options->interpolation,
+                               clip,
+                               progress);
+        }
+    }
+  else
+    {
+      /*  this happens for images  */
+
+      g_return_val_if_fail (GIMP_IS_IMAGE (object), NULL);
+
+      gimp_image_transform (GIMP_IMAGE (object), context,
+                            &tr_tool->transform,
+                            direction,
+                            options->interpolation,
+                            clip,
+                            progress);
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  return ret;
+}
+
+static void
+gimp_transform_tool_halt (GimpTransformTool *tr_tool)
+{
+  GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+
+  tr_tool->x1 = 0;
+  tr_tool->y1 = 0;
+  tr_tool->x2 = 0;
+  tr_tool->y2 = 0;
+
+  if (tr_tool->restore_type)
+    {
+      g_object_set (options,
+                    "type", tr_tool->saved_type,
+                    NULL);
+
+      tr_tool->restore_type = FALSE;
+    }
+}
+
+static gboolean
+gimp_transform_tool_confirm (GimpTransformTool *tr_tool,
+                             GimpDisplay       *display)
+{
+  GimpTransformOptions *options          = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+  GimpDisplayShell     *shell            = gimp_display_get_shell (display);
+  GimpImage            *image            = gimp_display_get_image (display);
+  GimpObject           *active_object;
+  gdouble               max_ratio        = 0.0;
+  GimpObject           *max_ratio_object = NULL;
+
+  active_object = gimp_transform_tool_get_active_object (tr_tool, display);
+
+  if (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc_matrix)
+    {
+      GimpMatrix3             transform;
+      GimpTransformDirection  direction;
+      GeglRectangle           selection_bounds;
+      gboolean                selection_empty = TRUE;
+      GList                  *objects;
+      GList                  *iter;
+
+      transform = tr_tool->transform;
+      direction = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->get_direction (
+        tr_tool);
+
+      if (direction == GIMP_TRANSFORM_BACKWARD)
+        gimp_matrix3_invert (&transform);
+
+      if (options->type == GIMP_TRANSFORM_TYPE_LAYER &&
+          ! gimp_viewable_get_children (GIMP_VIEWABLE (active_object)))
+        {
+          selection_empty = ! gimp_item_bounds (
+            GIMP_ITEM (gimp_image_get_mask (image)),
+            &selection_bounds.x,     &selection_bounds.y,
+            &selection_bounds.width, &selection_bounds.height);
+        }
+
+      if (selection_empty              &&
+          GIMP_IS_ITEM (active_object) &&
+          gimp_item_get_linked (GIMP_ITEM (active_object)))
+        {
+          objects = gimp_image_item_list_get_list (image,
+                                                   GIMP_ITEM_TYPE_ALL,
+                                                   GIMP_ITEM_SET_LINKED);
+        }
+      else
+        {
+          objects = g_list_append (NULL, active_object);
+        }
+
+      if (options->type == GIMP_TRANSFORM_TYPE_IMAGE)
+        {
+          objects = g_list_concat (
+            objects,
+            gimp_image_item_list_get_list (image,
+                                           GIMP_ITEM_TYPE_ALL,
+                                           GIMP_ITEM_SET_ALL));
+        }
+
+      for (iter = objects; iter; iter = g_list_next (iter))
+        {
+          GimpObject          *object = iter->data;
+          GimpTransformResize  clip   = options->clip;
+          GeglRectangle        orig_bounds;
+          GeglRectangle        new_bounds;
+          gdouble              ratio  = 0.0;
+
+          if (GIMP_IS_DRAWABLE (object))
+            {
+              if (selection_empty)
+                {
+                  GimpItem *item = GIMP_ITEM (object);
+
+                  gimp_item_get_offset (item, &orig_bounds.x, &orig_bounds.y);
+
+                  orig_bounds.width  = gimp_item_get_width  (item);
+                  orig_bounds.height = gimp_item_get_height (item);
+
+                  clip = gimp_item_get_clip (item, clip);
+                }
+              else
+                {
+                  orig_bounds = selection_bounds;
+                }
+            }
+          else if (GIMP_IS_ITEM (object))
+            {
+              GimpItem *item = GIMP_ITEM (object);
+
+              gimp_item_bounds (item,
+                                &orig_bounds.x,     &orig_bounds.y,
+                                &orig_bounds.width, &orig_bounds.height);
+
+              clip = gimp_item_get_clip (item, clip);
+            }
+          else
+            {
+              GimpImage *image;
+
+              g_return_val_if_fail (GIMP_IS_IMAGE (object), FALSE);
+
+              image = GIMP_IMAGE (object);
+
+              orig_bounds.x      = 0;
+              orig_bounds.y      = 0;
+              orig_bounds.width  = gimp_image_get_width  (image);
+              orig_bounds.height = gimp_image_get_height (image);
+            }
+
+          gimp_transform_resize_boundary (&transform, clip,
+
+                                          orig_bounds.x,
+                                          orig_bounds.y,
+                                          orig_bounds.x + orig_bounds.width,
+                                          orig_bounds.y + orig_bounds.height,
+
+                                          &new_bounds.x,
+                                          &new_bounds.y,
+                                          &new_bounds.width,
+                                          &new_bounds.height);
+
+          new_bounds.width  -= new_bounds.x;
+          new_bounds.height -= new_bounds.y;
+
+          if (new_bounds.width > orig_bounds.width)
+            {
+              ratio = MAX (ratio,
+                           (gdouble) new_bounds.width /
+                           (gdouble) gimp_image_get_width (image));
+            }
+
+          if (new_bounds.height > orig_bounds.height)
+            {
+              ratio = MAX (ratio,
+                           (gdouble) new_bounds.height /
+                           (gdouble) gimp_image_get_height (image));
+            }
+
+          if (ratio > max_ratio)
+            {
+              max_ratio        = ratio;
+              max_ratio_object = object;
+            }
+        }
+
+      g_list_free (objects);
+    }
+
+  if (max_ratio > MIN_CONFIRMATION_RATIO)
+    {
+      GtkWidget *dialog;
+      gint       response;
+
+      dialog = gimp_message_dialog_new (_("Confirm Transformation"),
+                                        GIMP_ICON_DIALOG_WARNING,
+                                        GTK_WIDGET (shell),
+                                        GTK_DIALOG_MODAL |
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        gimp_standard_help_func, NULL,
+
+                                        _("_Cancel"),    GTK_RESPONSE_CANCEL,
+                                        _("_Transform"), GTK_RESPONSE_OK,
+
+                                        NULL);
+
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      if (GIMP_IS_ITEM (max_ratio_object))
+        {
+          gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                             _("Transformation creates "
+                                               "a very large item."));
+
+          gimp_message_box_set_text (
+            GIMP_MESSAGE_DIALOG (dialog)->box,
+            _("Applying the transformation will result "
+              "in an item that is over %g times larger "
+              "than the image."),
+              floor (max_ratio));
+        }
+      else
+        {
+          gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                             _("Transformation creates "
+                                               "a very large image."));
+
+          gimp_message_box_set_text (
+            GIMP_MESSAGE_DIALOG (dialog)->box,
+            _("Applying the transformation will enlarge "
+              "the image by a factor of %g."),
+              floor (max_ratio));
+        }
+
+      response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+      gtk_widget_destroy (dialog);
+
+      if (response != GTK_RESPONSE_OK)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+
+gboolean
+gimp_transform_tool_bounds (GimpTransformTool *tr_tool,
+                            GimpDisplay       *display)
+{
+  GimpTransformOptions *options;
+  GimpDisplayShell     *shell;
+  GimpImage            *image;
+  gboolean              non_empty = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool), FALSE);
+
+  options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+  image   = gimp_display_get_image (display);
+  shell   = gimp_display_get_shell (display);
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  switch (options->type)
+    {
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      {
+        GimpDrawable *drawable;
+        gint          offset_x;
+        gint          offset_y;
+        gint          x, y;
+        gint          width, height;
+
+        drawable = gimp_image_get_active_drawable (image);
+
+        gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
+
+        non_empty = gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                              &x, &y, &width, &height);
+        tr_tool->x1 = x + offset_x;
+        tr_tool->y1 = y + offset_y;
+        tr_tool->x2 = x + width  + offset_x;
+        tr_tool->y2 = y + height + offset_y;
+      }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+      {
+        gimp_item_bounds (GIMP_ITEM (gimp_image_get_mask (image)),
+                          &tr_tool->x1, &tr_tool->y1,
+                          &tr_tool->x2, &tr_tool->y2);
+        tr_tool->x2 += tr_tool->x1;
+        tr_tool->y2 += tr_tool->y1;
+      }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_PATH:
+      {
+        GimpChannel *selection = gimp_image_get_mask (image);
+
+        /* if selection is not empty, use its bounds to perform the
+         * transformation of the path
+         */
+
+        if (! gimp_channel_is_empty (selection))
+          {
+            gimp_item_bounds (GIMP_ITEM (selection),
+                              &tr_tool->x1, &tr_tool->y1,
+                              &tr_tool->x2, &tr_tool->y2);
+          }
+        else
+          {
+            /* without selection, test the emptiness of the path bounds :
+             * if empty, use the canvas bounds
+             * else use the path bounds
+             */
+
+            if (! gimp_item_bounds (GIMP_ITEM (gimp_image_get_active_vectors (image)),
+                                    &tr_tool->x1, &tr_tool->y1,
+                                    &tr_tool->x2, &tr_tool->y2))
+              {
+                tr_tool->x1 = 0;
+                tr_tool->y1 = 0;
+                tr_tool->x2 = gimp_image_get_width (image);
+                tr_tool->y2 = gimp_image_get_height (image);
+              }
+          }
+
+        tr_tool->x2 += tr_tool->x1;
+        tr_tool->y2 += tr_tool->y1;
+      }
+
+      break;
+
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      if (! shell->show_all)
+        {
+          tr_tool->x1 = 0;
+          tr_tool->y1 = 0;
+          tr_tool->x2 = gimp_image_get_width  (image);
+          tr_tool->y2 = gimp_image_get_height (image);
+        }
+      else
+        {
+          GeglRectangle bounding_box;
+
+          bounding_box = gimp_display_shell_get_bounding_box (shell);
+
+          tr_tool->x1 = bounding_box.x;
+          tr_tool->y1 = bounding_box.y;
+          tr_tool->x2 = bounding_box.x + bounding_box.width;
+          tr_tool->y2 = bounding_box.y + bounding_box.height;
+        }
+      break;
+    }
+
+  return non_empty;
+}
+
+void
+gimp_transform_tool_recalc_matrix (GimpTransformTool *tr_tool,
+                                   GimpDisplay       *display)
+{
+  g_return_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool));
+  g_return_if_fail (GIMP_IS_DISPLAY (display));
+
+  if (tr_tool->x1 == tr_tool->x2 && tr_tool->y1 == tr_tool->y2)
+    gimp_transform_tool_bounds (tr_tool, display);
+
+  if (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc_matrix)
+    GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc_matrix (tr_tool);
+}
+
+GimpObject *
+gimp_transform_tool_get_active_object (GimpTransformTool  *tr_tool,
+                                       GimpDisplay        *display)
+{
+  GimpTransformOptions *options;
+  GimpImage            *image;
+  GimpObject           *object = NULL;
+
+  g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool), NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+
+  image = gimp_display_get_image (display);
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  if (tr_tool->object)
+    return tr_tool->object;
+
+  switch (options->type)
+    {
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      object = GIMP_OBJECT (gimp_image_get_active_drawable (image));
+      break;
+
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+      object = GIMP_OBJECT (gimp_image_get_mask (image));
+
+      if (gimp_channel_is_empty (GIMP_CHANNEL (object)))
+        object = NULL;
+      break;
+
+    case GIMP_TRANSFORM_TYPE_PATH:
+      object = GIMP_OBJECT (gimp_image_get_active_vectors (image));
+      break;
+
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      object = GIMP_OBJECT (image);
+      break;
+    }
+
+  return object;
+}
+
+GimpObject *
+gimp_transform_tool_check_active_object (GimpTransformTool  *tr_tool,
+                                         GimpDisplay        *display,
+                                         GError            **error)
+{
+  GimpTransformOptions *options;
+  GimpObject           *object;
+  const gchar          *null_message   = NULL;
+  const gchar          *locked_message = NULL;
+  GimpGuiConfig        *config         = GIMP_GUI_CONFIG (display->gimp->config);
+
+  g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool), NULL);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+
+  object = gimp_transform_tool_get_active_object (tr_tool, display);
+
+  switch (options->type)
+    {
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      null_message = _("There is no layer to transform.");
+
+      if (object)
+        {
+          GimpItem *item = GIMP_ITEM (object);
+
+          if (gimp_item_is_content_locked (item))
+            locked_message = _("The active layer's pixels are locked.");
+          else if (gimp_item_is_position_locked (item))
+            locked_message = _("The active layer's position and size are locked.");
+
+          if (! gimp_item_is_visible (item) &&
+              ! config->edit_non_visible &&
+              object != tr_tool->object) /* see bug #759194 */
+            {
+              g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                                   _("The active layer is not visible."));
+              return NULL;
+            }
+
+          if (! gimp_transform_tool_bounds (tr_tool, display))
+            {
+              g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                                   _("The selection does not intersect with the layer."));
+              return NULL;
+            }
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+      null_message = _("There is no selection to transform.");
+
+      if (object)
+        {
+          GimpItem *item = GIMP_ITEM (object);
+
+          /* cannot happen, so don't translate these messages */
+          if (gimp_item_is_content_locked (item))
+            locked_message = "The selection's pixels are locked.";
+          else if (gimp_item_is_position_locked (item))
+            locked_message = "The selection's position and size are locked.";
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_PATH:
+      null_message = _("There is no path to transform.");
+
+      if (object)
+        {
+          GimpItem *item = GIMP_ITEM (object);
+
+          if (gimp_item_is_content_locked (item))
+            locked_message = _("The active path's strokes are locked.");
+          else if (gimp_item_is_position_locked (item))
+            locked_message = _("The active path's position is locked.");
+          else if (! gimp_vectors_get_n_strokes (GIMP_VECTORS (item)))
+            locked_message = _("The active path has no strokes.");
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      /* cannot happen, so don't translate this message */
+      null_message = "There is no image to transform.";
+      break;
+    }
+
+  if (! object)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, null_message);
+      if (error)
+        gimp_widget_blink (options->type_box);
+      return NULL;
+    }
+
+  if (locked_message)
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, locked_message);
+      if (error)
+        gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (object));
+      return NULL;
+    }
+
+  return object;
+}
+
+gboolean
+gimp_transform_tool_transform (GimpTransformTool *tr_tool,
+                               GimpDisplay       *display)
+{
+  GimpTool             *tool;
+  GimpTransformOptions *options;
+  GimpContext          *context;
+  GimpImage            *image;
+  GimpObject           *active_object;
+  GeglBuffer           *orig_buffer   = NULL;
+  gint                  orig_offset_x = 0;
+  gint                  orig_offset_y = 0;
+  GeglBuffer           *new_buffer;
+  gint                  new_offset_x;
+  gint                  new_offset_y;
+  GimpColorProfile     *buffer_profile;
+  gchar                *undo_desc     = NULL;
+  gboolean              new_layer     = FALSE;
+  GError               *error         = NULL;
+
+  g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  tool    = GIMP_TOOL (tr_tool);
+  options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
+  context = GIMP_CONTEXT (options);
+  image   = gimp_display_get_image (display);
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  active_object = gimp_transform_tool_check_active_object (tr_tool, display,
+                                                           &error);
+
+  if (! active_object)
+    {
+      gimp_tool_message_literal (tool, display, error->message);
+      g_clear_error (&error);
+      return FALSE;
+    }
+
+  gimp_transform_tool_recalc_matrix (tr_tool, display);
+
+  if (! tr_tool->transform_valid)
+    {
+      gimp_tool_message_literal (tool, display,
+                                 _("The current transform is invalid"));
+      return FALSE;
+    }
+
+  if (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->recalc_matrix &&
+      gimp_matrix3_is_identity (&tr_tool->transform))
+    {
+      /* No need to commit an identity transformation! */
+      return TRUE;
+    }
+
+  if (! gimp_transform_tool_confirm (tr_tool, display))
+    return FALSE;
+
+  gimp_set_busy (display->gimp);
+
+  /*  We're going to dirty this image, but we want to keep the tool around  */
+  gimp_tool_control_push_preserve (tool->control, TRUE);
+
+  undo_desc = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->get_undo_desc (tr_tool);
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, undo_desc);
+  g_free (undo_desc);
+
+  switch (options->type)
+    {
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      if (! gimp_viewable_get_children (GIMP_VIEWABLE (active_object)) &&
+          ! gimp_channel_is_empty (gimp_image_get_mask (image)))
+        {
+          orig_buffer = gimp_drawable_transform_cut (
+            GIMP_DRAWABLE (active_object),
+            context,
+            &orig_offset_x,
+            &orig_offset_y,
+            &new_layer);
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+    case GIMP_TRANSFORM_TYPE_PATH:
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      break;
+    }
+
+  /*  Send the request for the transformation to the tool...
+   */
+  new_buffer = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->transform (
+    tr_tool,
+    active_object,
+    orig_buffer,
+    orig_offset_x,
+    orig_offset_y,
+    &buffer_profile,
+    &new_offset_x,
+    &new_offset_y);
+
+  if (orig_buffer)
+    g_object_unref (orig_buffer);
+
+  switch (options->type)
+    {
+    case GIMP_TRANSFORM_TYPE_LAYER:
+      if (new_buffer)
+        {
+          /*  paste the new transformed image to the image...also implement
+           *  undo...
+           */
+          gimp_drawable_transform_paste (GIMP_DRAWABLE (active_object),
+                                         new_buffer, buffer_profile,
+                                         new_offset_x, new_offset_y,
+                                         new_layer);
+          g_object_unref (new_buffer);
+        }
+      break;
+
+    case GIMP_TRANSFORM_TYPE_SELECTION:
+    case GIMP_TRANSFORM_TYPE_PATH:
+    case GIMP_TRANSFORM_TYPE_IMAGE:
+      /*  Nothing to be done  */
+      break;
+    }
+
+  gimp_image_undo_group_end (image);
+
+  /*  We're done dirtying the image, and would like to be restarted if
+   *  the image gets dirty while the tool exists
+   */
+  gimp_tool_control_pop_preserve (tool->control);
+
+  gimp_unset_busy (display->gimp);
+
+  gimp_image_flush (image);
+
+  return TRUE;
+}
+
+void
+gimp_transform_tool_set_type (GimpTransformTool *tr_tool,
+                              GimpTransformType  type)
+{
+  GimpTransformOptions *options;
+
+  g_return_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool));
+
+  options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+
+  if (! tr_tool->restore_type)
+    tr_tool->saved_type = options->type;
+
+  tr_tool->restore_type = FALSE;
+
+  g_object_set (options,
+                "type", type,
+                NULL);
+
+  tr_tool->restore_type = TRUE;
+}
diff --git a/app/tools/gimptransformtool.h b/app/tools/gimptransformtool.h
new file mode 100644
index 0000000..afe17e3
--- /dev/null
+++ b/app/tools/gimptransformtool.h
@@ -0,0 +1,104 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSFORM_TOOL_H__
+#define __GIMP_TRANSFORM_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+/* This is not the number of items in the enum above, but the max size
+ * of the enums at the top of each transformation tool, stored in
+ * trans_info and related
+ */
+#define TRANS_INFO_SIZE 17
+
+typedef gdouble TransInfo[TRANS_INFO_SIZE];
+
+
+#define GIMP_TYPE_TRANSFORM_TOOL            (gimp_transform_tool_get_type ())
+#define GIMP_TRANSFORM_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSFORM_TOOL, GimpTransformTool))
+#define GIMP_TRANSFORM_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSFORM_TOOL, GimpTransformToolClass))
+#define GIMP_IS_TRANSFORM_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSFORM_TOOL))
+#define GIMP_IS_TRANSFORM_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSFORM_TOOL))
+#define GIMP_TRANSFORM_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSFORM_TOOL, GimpTransformToolClass))
+
+#define GIMP_TRANSFORM_TOOL_GET_OPTIONS(t)  (GIMP_TRANSFORM_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpTransformToolClass GimpTransformToolClass;
+
+struct _GimpTransformTool
+{
+  GimpDrawTool       parent_instance;
+
+  GimpObject        *object;
+
+  gint               x1, y1;             /*  upper left hand coordinate   */
+  gint               x2, y2;             /*  lower right hand coords      */
+
+  GimpMatrix3        transform;          /*  transformation matrix        */
+  gboolean           transform_valid;    /*  whether the matrix is valid  */
+
+  gboolean           restore_type;
+  GimpTransformType  saved_type;
+};
+
+struct _GimpTransformToolClass
+{
+  GimpDrawToolClass  parent_class;
+
+  /*  virtual functions  */
+  void                     (* recalc_matrix) (GimpTransformTool  *tr_tool);
+  gchar                  * (* get_undo_desc) (GimpTransformTool  *tr_tool);
+  GimpTransformDirection   (* get_direction) (GimpTransformTool  *tr_tool);
+  GeglBuffer             * (* transform)     (GimpTransformTool  *tr_tool,
+                                              GimpObject         *object,
+                                              GeglBuffer         *orig_buffer,
+                                              gint                orig_offset_x,
+                                              gint                orig_offset_y,
+                                              GimpColorProfile  **buffer_profile,
+                                              gint               *new_offset_x,
+                                              gint               *new_offset_y);
+
+  const gchar *undo_desc;
+  const gchar *progress_text;
+};
+
+
+GType        gimp_transform_tool_get_type            (void) G_GNUC_CONST;
+
+GimpObject * gimp_transform_tool_get_active_object   (GimpTransformTool  *tr_tool,
+                                                      GimpDisplay        *display);
+GimpObject * gimp_transform_tool_check_active_object (GimpTransformTool  *tr_tool,
+                                                      GimpDisplay        *display,
+                                                      GError            **error);
+
+gboolean     gimp_transform_tool_bounds              (GimpTransformTool  *tr_tool,
+                                                      GimpDisplay        *display);
+void         gimp_transform_tool_recalc_matrix       (GimpTransformTool  *tr_tool,
+                                                      GimpDisplay        *display);
+
+gboolean     gimp_transform_tool_transform           (GimpTransformTool  *tr_tool,
+                                                      GimpDisplay        *display);
+
+void         gimp_transform_tool_set_type            (GimpTransformTool  *tr_tool,
+                                                      GimpTransformType   type);
+
+
+#endif  /*  __GIMP_TRANSFORM_TOOL_H__  */
diff --git a/app/tools/gimpunifiedtransformtool.c b/app/tools/gimpunifiedtransformtool.c
new file mode 100644
index 0000000..85682bb
--- /dev/null
+++ b/app/tools/gimpunifiedtransformtool.c
@@ -0,0 +1,355 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimphelp-ids.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimpdisplayshell-transform.h"
+#include "display/gimptoolgui.h"
+#include "display/gimptooltransformgrid.h"
+
+#include "gimptoolcontrol.h"
+#include "gimptransformgridoptions.h"
+#include "gimpunifiedtransformtool.h"
+
+#include "gimp-intl.h"
+
+
+/*  index into trans_info array  */
+enum
+{
+  X0,
+  Y0,
+  X1,
+  Y1,
+  X2,
+  Y2,
+  X3,
+  Y3,
+  PIVOT_X,
+  PIVOT_Y,
+};
+
+
+/*  local function prototypes  */
+
+static void             gimp_unified_transform_tool_matrix_to_info (GimpTransformGridTool    *tg_tool,
+                                                                    const GimpMatrix3        *transform);
+static void             gimp_unified_transform_tool_apply_info     (GimpTransformGridTool    *tg_tool,
+                                                                    const TransInfo           info);
+static void             gimp_unified_transform_tool_prepare        (GimpTransformGridTool    *tg_tool);
+static void             gimp_unified_transform_tool_readjust       (GimpTransformGridTool    *tg_tool);
+static GimpToolWidget * gimp_unified_transform_tool_get_widget     (GimpTransformGridTool    *tg_tool);
+static void             gimp_unified_transform_tool_update_widget  (GimpTransformGridTool    *tg_tool);
+static void             gimp_unified_transform_tool_widget_changed (GimpTransformGridTool    *tg_tool);
+
+static void             gimp_unified_transform_tool_info_to_points (GimpGenericTransformTool *generic);
+
+
+G_DEFINE_TYPE (GimpUnifiedTransformTool, gimp_unified_transform_tool,
+               GIMP_TYPE_GENERIC_TRANSFORM_TOOL)
+
+#define parent_class gimp_unified_transform_tool_parent_class
+
+
+void
+gimp_unified_transform_tool_register (GimpToolRegisterCallback  callback,
+                                      gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_UNIFIED_TRANSFORM_TOOL,
+                GIMP_TYPE_TRANSFORM_GRID_OPTIONS,
+                gimp_transform_grid_options_gui,
+                GIMP_CONTEXT_PROP_MASK_BACKGROUND,
+                "gimp-unified-transform-tool",
+                _("Unified Transform"),
+                _("Unified Transform Tool: "
+                  "Transform the layer, selection or path"),
+                N_("_Unified Transform"), "<shift>T",
+                NULL, GIMP_HELP_TOOL_UNIFIED_TRANSFORM,
+                GIMP_ICON_TOOL_UNIFIED_TRANSFORM,
+                data);
+}
+
+static void
+gimp_unified_transform_tool_class_init (GimpUnifiedTransformToolClass *klass)
+{
+  GimpTransformToolClass        *tr_class      = GIMP_TRANSFORM_TOOL_CLASS (klass);
+  GimpTransformGridToolClass    *tg_class      = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
+  GimpGenericTransformToolClass *generic_class = GIMP_GENERIC_TRANSFORM_TOOL_CLASS (klass);
+
+  tg_class->matrix_to_info      = gimp_unified_transform_tool_matrix_to_info;
+  tg_class->apply_info          = gimp_unified_transform_tool_apply_info;
+  tg_class->prepare             = gimp_unified_transform_tool_prepare;
+  tg_class->readjust            = gimp_unified_transform_tool_readjust;
+  tg_class->get_widget          = gimp_unified_transform_tool_get_widget;
+  tg_class->update_widget       = gimp_unified_transform_tool_update_widget;
+  tg_class->widget_changed      = gimp_unified_transform_tool_widget_changed;
+
+  generic_class->info_to_points = gimp_unified_transform_tool_info_to_points;
+
+  tr_class->undo_desc           = C_("undo-type", "Unified Transform");
+  tr_class->progress_text       = _("Unified transform");
+}
+
+static void
+gimp_unified_transform_tool_init (GimpUnifiedTransformTool *unified_tool)
+{
+}
+
+static void
+gimp_unified_transform_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
+                                            const GimpMatrix3     *transform)
+{
+  GimpTransformTool        *tr_tool    = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+
+  if (! tg_options->fixedpivot)
+    {
+      GimpMatrix3 transfer;
+
+      gimp_transform_grid_tool_info_to_matrix (tg_tool, &transfer);
+      gimp_matrix3_invert (&transfer);
+      gimp_matrix3_mult (transform, &transfer);
+
+      gimp_matrix3_transform_point (&transfer,
+                                    tg_tool->trans_info[PIVOT_X],
+                                    tg_tool->trans_info[PIVOT_Y],
+                                    &tg_tool->trans_info[PIVOT_X],
+                                    &tg_tool->trans_info[PIVOT_Y]);
+    }
+
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1,
+                                tr_tool->y1,
+                                &tg_tool->trans_info[X0],
+                                &tg_tool->trans_info[Y0]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2,
+                                tr_tool->y1,
+                                &tg_tool->trans_info[X1],
+                                &tg_tool->trans_info[Y1]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1,
+                                tr_tool->y2,
+                                &tg_tool->trans_info[X2],
+                                &tg_tool->trans_info[Y2]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2,
+                                tr_tool->y2,
+                                &tg_tool->trans_info[X3],
+                                &tg_tool->trans_info[Y3]);
+}
+
+static void
+gimp_unified_transform_tool_apply_info (GimpTransformGridTool *tg_tool,
+                                        const TransInfo        info)
+{
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+
+  tg_tool->trans_info[X0] = info[X0];
+  tg_tool->trans_info[Y0] = info[Y0];
+
+  tg_tool->trans_info[X1] = info[X1];
+  tg_tool->trans_info[Y1] = info[Y1];
+
+  tg_tool->trans_info[X2] = info[X2];
+  tg_tool->trans_info[Y2] = info[Y2];
+
+  tg_tool->trans_info[X3] = info[X3];
+  tg_tool->trans_info[Y3] = info[Y3];
+
+  if (! tg_options->fixedpivot)
+    {
+      tg_tool->trans_info[PIVOT_X] = info[PIVOT_X];
+      tg_tool->trans_info[PIVOT_Y] = info[PIVOT_Y];
+    }
+}
+
+static void
+gimp_unified_transform_tool_prepare (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->prepare (tg_tool);
+
+  tg_tool->trans_info[PIVOT_X] = (gdouble) (tr_tool->x1 + tr_tool->x2) / 2.0;
+  tg_tool->trans_info[PIVOT_Y] = (gdouble) (tr_tool->y1 + tr_tool->y2) / 2.0;
+
+  tg_tool->trans_info[X0] = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y0] = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X1] = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y1] = (gdouble) tr_tool->y1;
+  tg_tool->trans_info[X2] = (gdouble) tr_tool->x1;
+  tg_tool->trans_info[Y2] = (gdouble) tr_tool->y2;
+  tg_tool->trans_info[X3] = (gdouble) tr_tool->x2;
+  tg_tool->trans_info[Y3] = (gdouble) tr_tool->y2;
+}
+
+static void
+gimp_unified_transform_tool_readjust (GimpTransformGridTool *tg_tool)
+{
+  GimpTool                 *tool       = GIMP_TOOL (tg_tool);
+  GimpTransformGridOptions *tg_options = GIMP_TRANSFORM_GRID_TOOL_GET_OPTIONS (tg_tool);
+  GimpDisplayShell         *shell      = gimp_display_get_shell (tool->display);
+  gdouble                   x;
+  gdouble                   y;
+  gdouble                   r;
+
+  x = shell->disp_width  / 2.0;
+  y = shell->disp_height / 2.0;
+  r = MAX (MIN (x, y) / G_SQRT2 -
+           GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE / 2.0,
+           GIMP_TOOL_TRANSFORM_GRID_MAX_HANDLE_SIZE / 2.0);
+
+  if (! tg_options->fixedpivot)
+    {
+      gimp_display_shell_untransform_xy_f (shell,
+                                           x, y,
+                                           &tg_tool->trans_info[PIVOT_X],
+                                           &tg_tool->trans_info[PIVOT_Y]);
+    }
+
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x - r, y - r,
+                                       &tg_tool->trans_info[X0],
+                                       &tg_tool->trans_info[Y0]);
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x + r, y - r,
+                                       &tg_tool->trans_info[X1],
+                                       &tg_tool->trans_info[Y1]);
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x - r, y + r,
+                                       &tg_tool->trans_info[X2],
+                                       &tg_tool->trans_info[Y2]);
+  gimp_display_shell_untransform_xy_f (shell,
+                                       x + r, y + r,
+                                       &tg_tool->trans_info[X3],
+                                       &tg_tool->trans_info[Y3]);
+}
+
+static GimpToolWidget *
+gimp_unified_transform_tool_get_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTool          *tool    = GIMP_TOOL (tg_tool);
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (tool->display);
+  GimpToolWidget    *widget;
+
+  widget = gimp_tool_transform_grid_new (shell,
+                                         &tr_tool->transform,
+                                         tr_tool->x1,
+                                         tr_tool->y1,
+                                         tr_tool->x2,
+                                         tr_tool->y2);
+
+  g_object_set (widget,
+                "pivot-x",                 (tr_tool->x1 + tr_tool->x2) / 2.0,
+                "pivot-y",                 (tr_tool->y1 + tr_tool->y2) / 2.0,
+                "inside-function",         GIMP_TRANSFORM_FUNCTION_MOVE,
+                "outside-function",        GIMP_TRANSFORM_FUNCTION_ROTATE,
+                "use-corner-handles",      TRUE,
+                "use-perspective-handles", TRUE,
+                "use-side-handles",        TRUE,
+                "use-shear-handles",       TRUE,
+                "use-pivot-handle",        TRUE,
+                NULL);
+
+  return widget;
+}
+
+static void
+gimp_unified_transform_tool_update_widget (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
+
+  g_object_set (tg_tool->widget,
+                "x1",      (gdouble) tr_tool->x1,
+                "y1",      (gdouble) tr_tool->y1,
+                "x2",      (gdouble) tr_tool->x2,
+                "y2",      (gdouble) tr_tool->y2,
+                "pivot-x", tg_tool->trans_info[PIVOT_X],
+                "pivot-y", tg_tool->trans_info[PIVOT_Y],
+                NULL);
+}
+
+static void
+gimp_unified_transform_tool_widget_changed (GimpTransformGridTool *tg_tool)
+{
+  GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
+  GimpMatrix3       *transform;
+
+  g_object_get (tg_tool->widget,
+                "transform", &transform,
+                "pivot-x",   &tg_tool->trans_info[PIVOT_X],
+                "pivot-y",   &tg_tool->trans_info[PIVOT_Y],
+                NULL);
+
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1, tr_tool->y1,
+                                &tg_tool->trans_info[X0],
+                                &tg_tool->trans_info[Y0]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2, tr_tool->y1,
+                                &tg_tool->trans_info[X1],
+                                &tg_tool->trans_info[Y1]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x1, tr_tool->y2,
+                                &tg_tool->trans_info[X2],
+                                &tg_tool->trans_info[Y2]);
+  gimp_matrix3_transform_point (transform,
+                                tr_tool->x2, tr_tool->y2,
+                                &tg_tool->trans_info[X3],
+                                &tg_tool->trans_info[Y3]);
+
+  g_free (transform);
+
+  GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
+}
+
+static void
+gimp_unified_transform_tool_info_to_points (GimpGenericTransformTool *generic)
+{
+  GimpTransformTool     *tr_tool = GIMP_TRANSFORM_TOOL (generic);
+  GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (generic);
+
+  generic->input_points[0]  = (GimpVector2) {tr_tool->x1, tr_tool->y1};
+  generic->input_points[1]  = (GimpVector2) {tr_tool->x2, tr_tool->y1};
+  generic->input_points[2]  = (GimpVector2) {tr_tool->x1, tr_tool->y2};
+  generic->input_points[3]  = (GimpVector2) {tr_tool->x2, tr_tool->y2};
+
+  generic->output_points[0] = (GimpVector2) {tg_tool->trans_info[X0],
+                                             tg_tool->trans_info[Y0]};
+  generic->output_points[1] = (GimpVector2) {tg_tool->trans_info[X1],
+                                             tg_tool->trans_info[Y1]};
+  generic->output_points[2] = (GimpVector2) {tg_tool->trans_info[X2],
+                                             tg_tool->trans_info[Y2]};
+  generic->output_points[3] = (GimpVector2) {tg_tool->trans_info[X3],
+                                             tg_tool->trans_info[Y3]};
+}
diff --git a/app/tools/gimpunifiedtransformtool.h b/app/tools/gimpunifiedtransformtool.h
new file mode 100644
index 0000000..923f933
--- /dev/null
+++ b/app/tools/gimpunifiedtransformtool.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UNIFIED_TRANSFORM_TOOL_H__
+#define __GIMP_UNIFIED_TRANSFORM_TOOL_H__
+
+
+#include "gimpgenerictransformtool.h"
+
+
+#define GIMP_TYPE_UNIFIED_TRANSFORM_TOOL            (gimp_unified_transform_tool_get_type ())
+#define GIMP_UNIFIED_TRANSFORM_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNIFIED_TRANSFORM_TOOL, GimpUnifiedTransformTool))
+#define GIMP_UNIFIED_TRANSFORM_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNIFIED_TRANSFORM_TOOL, GimpUnifiedTransformToolClass))
+#define GIMP_IS_UNIFIED_TRANSFORM_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UNIFIED_TRANSFORM_TOOL))
+#define GIMP_IS_UNIFIED_TRANSFORM_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNIFIED_TRANSFORM_TOOL))
+#define GIMP_UNIFIED_TRANSFORM_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNIFIED_TRANSFORM_TOOL, GimpUnifiedTransformToolClass))
+
+
+typedef struct _GimpUnifiedTransformTool      GimpUnifiedTransformTool;
+typedef struct _GimpUnifiedTransformToolClass GimpUnifiedTransformToolClass;
+
+struct _GimpUnifiedTransformTool
+{
+  GimpGenericTransformTool  parent_instance;
+};
+
+struct _GimpUnifiedTransformToolClass
+{
+  GimpGenericTransformToolClass  parent_class;
+};
+
+
+void    gimp_unified_transform_tool_register (GimpToolRegisterCallback  callback,
+                                              gpointer                  data);
+
+GType   gimp_unified_transform_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_UNIFIED_TRANSFORM_TOOL_H__  */
diff --git a/app/tools/gimpvectoroptions.c b/app/tools/gimpvectoroptions.c
new file mode 100644
index 0000000..c6abb2c
--- /dev/null
+++ b/app/tools/gimpvectoroptions.c
@@ -0,0 +1,219 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectoroptions.c
+ * Copyright (C) 1999 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpvectoroptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VECTORS_EDIT_MODE,
+  PROP_VECTORS_POLYGONAL
+};
+
+
+static void   gimp_vector_options_set_property (GObject      *object,
+                                                guint         property_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec);
+static void   gimp_vector_options_get_property (GObject      *object,
+                                                guint         property_id,
+                                                GValue       *value,
+                                                GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpVectorOptions, gimp_vector_options, GIMP_TYPE_TOOL_OPTIONS)
+
+
+static void
+gimp_vector_options_class_init (GimpVectorOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_vector_options_set_property;
+  object_class->get_property = gimp_vector_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_VECTORS_EDIT_MODE,
+                         "vectors-edit-mode",
+                         _("Edit Mode"),
+                         NULL,
+                         GIMP_TYPE_VECTOR_MODE,
+                         GIMP_VECTOR_MODE_DESIGN,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_VECTORS_POLYGONAL,
+                            "vectors-polygonal",
+                            _("Polygonal"),
+                            _("Restrict editing to polygons"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_vector_options_init (GimpVectorOptions *options)
+{
+}
+
+static void
+gimp_vector_options_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_VECTORS_EDIT_MODE:
+      options->edit_mode = g_value_get_enum (value);
+      break;
+    case PROP_VECTORS_POLYGONAL:
+      options->polygonal = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+static void
+gimp_vector_options_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_VECTORS_EDIT_MODE:
+      g_value_set_enum (value, options->edit_mode);
+      break;
+    case PROP_VECTORS_POLYGONAL:
+      g_value_set_boolean (value, options->polygonal);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+button_append_modifier (GtkWidget       *button,
+                        GdkModifierType  modifiers)
+{
+  gchar *str = g_strdup_printf ("%s (%s)",
+                                gtk_button_get_label (GTK_BUTTON (button)),
+                                gimp_get_mod_string (modifiers));
+
+  gtk_button_set_label (GTK_BUTTON (button), str);
+  g_free (str);
+}
+
+GtkWidget *
+gimp_vector_options_gui (GimpToolOptions *tool_options)
+{
+  GObject           *config  = G_OBJECT (tool_options);
+  GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (tool_options);
+  GtkWidget         *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget         *frame;
+  GtkWidget         *button;
+  gchar             *str;
+
+  /*  tool toggle  */
+  frame = gimp_prop_enum_radio_frame_new (config, "vectors-edit-mode", NULL,
+                                          0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  button = g_object_get_data (G_OBJECT (frame), "radio-button");
+
+  if (GTK_IS_RADIO_BUTTON (button))
+    {
+      GSList *list = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+
+      /* GIMP_VECTOR_MODE_MOVE  */
+      button_append_modifier (list->data, GDK_MOD1_MASK);
+
+      if (list->next)   /* GIMP_VECTOR_MODE_EDIT  */
+        button_append_modifier (list->next->data,
+                                gimp_get_toggle_behavior_mask ());
+    }
+
+  button = gimp_prop_check_button_new (config, "vectors-polygonal", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  str = g_strdup_printf (_("Path to Selection\n"
+                           "%s  Add\n"
+                           "%s  Subtract\n"
+                           "%s  Intersect"),
+                         gimp_get_mod_string (gimp_get_extend_selection_mask ()),
+                         gimp_get_mod_string (gimp_get_modify_selection_mask ()),
+                         gimp_get_mod_string (gimp_get_extend_selection_mask () |
+                                              gimp_get_modify_selection_mask ()));
+
+  button = gimp_button_new ();
+  /*  Create a selection from the current path  */
+  gtk_button_set_label (GTK_BUTTON (button), _("Selection from Path"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (button, FALSE);
+  gimp_help_set_help_data (button, str, GIMP_HELP_PATH_SELECTION_REPLACE);
+  gtk_widget_show (button);
+
+  g_free (str);
+
+  options->to_selection_button = button;
+
+  button = gtk_button_new_with_label (_("Fill Path"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (button, FALSE);
+  gimp_help_set_help_data (button, NULL, GIMP_HELP_PATH_FILL);
+  gtk_widget_show (button);
+
+  options->fill_button = button;
+
+  button = gtk_button_new_with_label (_("Stroke Path"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (button, FALSE);
+  gimp_help_set_help_data (button, NULL, GIMP_HELP_PATH_STROKE);
+  gtk_widget_show (button);
+
+  options->stroke_button = button;
+
+  return vbox;
+}
diff --git a/app/tools/gimpvectoroptions.h b/app/tools/gimpvectoroptions.h
new file mode 100644
index 0000000..e13e8f3
--- /dev/null
+++ b/app/tools/gimpvectoroptions.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTOR_OPTIONS_H__
+#define __GIMP_VECTOR_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_VECTOR_OPTIONS            (gimp_vector_options_get_type ())
+#define GIMP_VECTOR_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTOR_OPTIONS, GimpVectorOptions))
+#define GIMP_VECTOR_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTOR_OPTIONS, GimpVectorOptionsClass))
+#define GIMP_IS_VECTOR_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTOR_OPTIONS))
+#define GIMP_IS_VECTOR_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTOR_OPTIONS))
+#define GIMP_VECTOR_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTOR_OPTIONS, GimpVectorOptionsClass))
+
+
+typedef struct _GimpVectorOptions    GimpVectorOptions;
+typedef struct _GimpToolOptionsClass GimpVectorOptionsClass;
+
+struct _GimpVectorOptions
+{
+  GimpToolOptions  parent_instance;
+
+  GimpVectorMode   edit_mode;
+  gboolean         polygonal;
+
+  /*  options gui  */
+  GtkWidget       *to_selection_button;
+  GtkWidget       *fill_button;
+  GtkWidget       *stroke_button;
+};
+
+
+GType       gimp_vector_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_vector_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_VECTOR_OPTIONS_H__  */
diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c
new file mode 100644
index 0000000..3040a2a
--- /dev/null
+++ b/app/tools/gimpvectortool.c
@@ -0,0 +1,852 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Vector tool
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdialogconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-item.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpundostack.h"
+
+#include "paint/gimppaintoptions.h" /* GIMP_PAINT_OPTIONS_CONTEXT_MASK */
+
+#include "vectors/gimpvectors.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+#include "display/gimpdisplayshell.h"
+#include "display/gimptoolpath.h"
+
+#include "gimptoolcontrol.h"
+#include "gimpvectoroptions.h"
+#include "gimpvectortool.h"
+
+#include "dialogs/fill-dialog.h"
+#include "dialogs/stroke-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define TOGGLE_MASK  gimp_get_extend_selection_mask ()
+#define MOVE_MASK    GDK_MOD1_MASK
+#define INSDEL_MASK  gimp_get_toggle_behavior_mask ()
+
+
+/*  local function prototypes  */
+
+static void     gimp_vector_tool_dispose         (GObject               *object);
+
+static void     gimp_vector_tool_control         (GimpTool              *tool,
+                                                  GimpToolAction         action,
+                                                  GimpDisplay           *display);
+static void     gimp_vector_tool_button_press    (GimpTool              *tool,
+                                                  const GimpCoords      *coords,
+                                                  guint32                time,
+                                                  GdkModifierType        state,
+                                                  GimpButtonPressType    press_type,
+                                                  GimpDisplay           *display);
+static void     gimp_vector_tool_button_release  (GimpTool              *tool,
+                                                  const GimpCoords      *coords,
+                                                  guint32                time,
+                                                  GdkModifierType        state,
+                                                  GimpButtonReleaseType  release_type,
+                                                  GimpDisplay           *display);
+static void     gimp_vector_tool_motion          (GimpTool              *tool,
+                                                  const GimpCoords      *coords,
+                                                  guint32                time,
+                                                  GdkModifierType        state,
+                                                  GimpDisplay           *display);
+static void     gimp_vector_tool_modifier_key    (GimpTool              *tool,
+                                                  GdkModifierType        key,
+                                                  gboolean               press,
+                                                  GdkModifierType        state,
+                                                  GimpDisplay           *display);
+static void     gimp_vector_tool_cursor_update   (GimpTool              *tool,
+                                                  const GimpCoords      *coords,
+                                                  GdkModifierType        state,
+                                                  GimpDisplay           *display);
+
+static void     gimp_vector_tool_start           (GimpVectorTool        *vector_tool,
+                                                  GimpDisplay           *display);
+static void     gimp_vector_tool_halt            (GimpVectorTool        *vector_tool);
+
+static void     gimp_vector_tool_path_changed    (GimpToolWidget        *path,
+                                                  GimpVectorTool        *vector_tool);
+static void     gimp_vector_tool_path_begin_change
+                                                 (GimpToolWidget        *path,
+                                                  const gchar           *desc,
+                                                  GimpVectorTool        *vector_tool);
+static void     gimp_vector_tool_path_end_change (GimpToolWidget        *path,
+                                                  gboolean               success,
+                                                  GimpVectorTool        *vector_tool);
+static void     gimp_vector_tool_path_activate   (GimpToolWidget        *path,
+                                                  GdkModifierType        state,
+                                                  GimpVectorTool        *vector_tool);
+
+static void     gimp_vector_tool_vectors_changed (GimpImage             *image,
+                                                  GimpVectorTool        *vector_tool);
+static void     gimp_vector_tool_vectors_removed (GimpVectors           *vectors,
+                                                  GimpVectorTool        *vector_tool);
+
+static void     gimp_vector_tool_to_selection    (GimpVectorTool        *vector_tool);
+static void     gimp_vector_tool_to_selection_extended
+                                                 (GimpVectorTool        *vector_tool,
+                                                  GdkModifierType        state);
+
+static void     gimp_vector_tool_fill_vectors    (GimpVectorTool        *vector_tool,
+                                                  GtkWidget             *button);
+static void     gimp_vector_tool_fill_callback   (GtkWidget             *dialog,
+                                                  GimpItem              *item,
+                                                  GimpDrawable          *drawable,
+                                                  GimpContext           *context,
+                                                  GimpFillOptions       *options,
+                                                  gpointer               data);
+
+static void     gimp_vector_tool_stroke_vectors  (GimpVectorTool        *vector_tool,
+                                                  GtkWidget             *button);
+static void     gimp_vector_tool_stroke_callback (GtkWidget             *dialog,
+                                                  GimpItem              *item,
+                                                  GimpDrawable          *drawable,
+                                                  GimpContext           *context,
+                                                  GimpStrokeOptions     *options,
+                                                  gpointer               data);
+
+
+G_DEFINE_TYPE (GimpVectorTool, gimp_vector_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_vector_tool_parent_class
+
+
+void
+gimp_vector_tool_register (GimpToolRegisterCallback callback,
+                           gpointer                 data)
+{
+  (* callback) (GIMP_TYPE_VECTOR_TOOL,
+                GIMP_TYPE_VECTOR_OPTIONS,
+                gimp_vector_options_gui,
+                GIMP_PAINT_OPTIONS_CONTEXT_MASK |
+                GIMP_CONTEXT_PROP_MASK_PATTERN  |
+                GIMP_CONTEXT_PROP_MASK_GRADIENT, /* for stroking */
+                "gimp-vector-tool",
+                _("Paths"),
+                _("Paths Tool: Create and edit paths"),
+                N_("Pat_hs"), "b",
+                NULL, GIMP_HELP_TOOL_PATH,
+                GIMP_ICON_TOOL_PATH,
+                data);
+}
+
+static void
+gimp_vector_tool_class_init (GimpVectorToolClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpToolClass *tool_class   = GIMP_TOOL_CLASS (klass);
+
+  object_class->dispose      = gimp_vector_tool_dispose;
+
+  tool_class->control        = gimp_vector_tool_control;
+  tool_class->button_press   = gimp_vector_tool_button_press;
+  tool_class->button_release = gimp_vector_tool_button_release;
+  tool_class->motion         = gimp_vector_tool_motion;
+  tool_class->modifier_key   = gimp_vector_tool_modifier_key;
+  tool_class->cursor_update  = gimp_vector_tool_cursor_update;
+}
+
+static void
+gimp_vector_tool_init (GimpVectorTool *vector_tool)
+{
+  GimpTool *tool = GIMP_TOOL (vector_tool);
+
+  gimp_tool_control_set_handle_empty_image (tool->control, TRUE);
+  gimp_tool_control_set_precision          (tool->control,
+                                            GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_tool_cursor        (tool->control,
+                                            GIMP_TOOL_CURSOR_PATHS);
+
+  vector_tool->saved_mode = GIMP_VECTOR_MODE_DESIGN;
+}
+
+static void
+gimp_vector_tool_dispose (GObject *object)
+{
+  GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (object);
+
+  gimp_vector_tool_set_vectors (vector_tool, NULL);
+  g_clear_object (&vector_tool->widget);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_vector_tool_control (GimpTool       *tool,
+                          GimpToolAction  action,
+                          GimpDisplay    *display)
+{
+  GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_vector_tool_halt (vector_tool);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_vector_tool_button_press (GimpTool            *tool,
+                               const GimpCoords    *coords,
+                               guint32              time,
+                               GdkModifierType      state,
+                               GimpButtonPressType  press_type,
+                               GimpDisplay         *display)
+{
+  GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool);
+
+  if (tool->display && display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  if (! tool->display)
+    {
+      gimp_vector_tool_start (vector_tool, display);
+
+      gimp_tool_widget_hover (vector_tool->widget, coords, state, TRUE);
+    }
+
+  if (gimp_tool_widget_button_press (vector_tool->widget, coords, time, state,
+                                     press_type))
+    {
+      vector_tool->grab_widget = vector_tool->widget;
+    }
+
+  gimp_tool_control_activate (tool->control);
+}
+
+static void
+gimp_vector_tool_button_release (GimpTool              *tool,
+                                 const GimpCoords      *coords,
+                                 guint32                time,
+                                 GdkModifierType        state,
+                                 GimpButtonReleaseType  release_type,
+                                 GimpDisplay           *display)
+{
+  GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool);
+
+  gimp_tool_control_halt (tool->control);
+
+  if (vector_tool->grab_widget)
+    {
+      gimp_tool_widget_button_release (vector_tool->grab_widget,
+                                       coords, time, state, release_type);
+      vector_tool->grab_widget = NULL;
+    }
+}
+
+static void
+gimp_vector_tool_motion (GimpTool         *tool,
+                         const GimpCoords *coords,
+                         guint32           time,
+                         GdkModifierType   state,
+                         GimpDisplay      *display)
+{
+  GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool);
+
+  if (vector_tool->grab_widget)
+    {
+      gimp_tool_widget_motion (vector_tool->grab_widget, coords, time, state);
+    }
+}
+
+static void
+gimp_vector_tool_modifier_key (GimpTool        *tool,
+                               GdkModifierType  key,
+                               gboolean         press,
+                               GdkModifierType  state,
+                               GimpDisplay     *display)
+{
+  GimpVectorTool    *vector_tool = GIMP_VECTOR_TOOL (tool);
+  GimpVectorOptions *options     = GIMP_VECTOR_TOOL_GET_OPTIONS (tool);
+
+  if (key == TOGGLE_MASK)
+    return;
+
+  if (key == INSDEL_MASK || key == MOVE_MASK)
+    {
+      GimpVectorMode button_mode = options->edit_mode;
+
+      if (press)
+        {
+          if (key == (state & (INSDEL_MASK | MOVE_MASK)))
+            {
+              /*  first modifier pressed  */
+
+              vector_tool->saved_mode = options->edit_mode;
+            }
+        }
+      else
+        {
+          if (! (state & (INSDEL_MASK | MOVE_MASK)))
+            {
+              /*  last modifier released  */
+
+              button_mode = vector_tool->saved_mode;
+            }
+        }
+
+      if (state & MOVE_MASK)
+        {
+          button_mode = GIMP_VECTOR_MODE_MOVE;
+        }
+      else if (state & INSDEL_MASK)
+        {
+          button_mode = GIMP_VECTOR_MODE_EDIT;
+        }
+
+      if (button_mode != options->edit_mode)
+        {
+          g_object_set (options, "vectors-edit-mode", button_mode, NULL);
+        }
+    }
+}
+
+static void
+gimp_vector_tool_cursor_update (GimpTool         *tool,
+                                const GimpCoords *coords,
+                                GdkModifierType   state,
+                                GimpDisplay      *display)
+{
+  GimpVectorTool   *vector_tool = GIMP_VECTOR_TOOL (tool);
+  GimpDisplayShell *shell       = gimp_display_get_shell (display);
+
+  if (display != tool->display || ! vector_tool->widget)
+    {
+      GimpToolCursorType tool_cursor = GIMP_TOOL_CURSOR_PATHS;
+
+      if (gimp_image_pick_vectors (gimp_display_get_image (display),
+                                   coords->x, coords->y,
+                                   FUNSCALEX (shell,
+                                              GIMP_TOOL_HANDLE_SIZE_CIRCLE / 2),
+                                   FUNSCALEY (shell,
+                                              GIMP_TOOL_HANDLE_SIZE_CIRCLE / 2)))
+        {
+          tool_cursor = GIMP_TOOL_CURSOR_HAND;
+        }
+
+      gimp_tool_control_set_tool_cursor (tool->control, tool_cursor);
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+static void
+gimp_vector_tool_start (GimpVectorTool *vector_tool,
+                        GimpDisplay    *display)
+{
+  GimpTool          *tool    = GIMP_TOOL (vector_tool);
+  GimpVectorOptions *options = GIMP_VECTOR_TOOL_GET_OPTIONS (tool);
+  GimpDisplayShell  *shell   = gimp_display_get_shell (display);
+  GimpToolWidget    *widget;
+
+  tool->display = display;
+
+  vector_tool->widget = widget = gimp_tool_path_new (shell);
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), widget);
+
+  g_object_bind_property (G_OBJECT (options), "vectors-edit-mode",
+                          G_OBJECT (widget),  "edit-mode",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+  g_object_bind_property (G_OBJECT (options), "vectors-polygonal",
+                          G_OBJECT (widget),  "polygonal",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_BIDIRECTIONAL);
+
+  gimp_tool_path_set_vectors (GIMP_TOOL_PATH (widget),
+                              vector_tool->vectors);
+
+  g_signal_connect (widget, "changed",
+                    G_CALLBACK (gimp_vector_tool_path_changed),
+                    vector_tool);
+  g_signal_connect (widget, "begin-change",
+                    G_CALLBACK (gimp_vector_tool_path_begin_change),
+                    vector_tool);
+  g_signal_connect (widget, "end-change",
+                    G_CALLBACK (gimp_vector_tool_path_end_change),
+                    vector_tool);
+  g_signal_connect (widget, "activate",
+                    G_CALLBACK (gimp_vector_tool_path_activate),
+                    vector_tool);
+
+  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), display);
+}
+
+static void
+gimp_vector_tool_halt (GimpVectorTool *vector_tool)
+{
+  GimpTool *tool = GIMP_TOOL (vector_tool);
+
+  if (tool->display)
+    gimp_tool_pop_status (tool, tool->display);
+
+  gimp_vector_tool_set_vectors (vector_tool, NULL);
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tool)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool));
+
+  gimp_draw_tool_set_widget (GIMP_DRAW_TOOL (tool), NULL);
+  g_clear_object (&vector_tool->widget);
+
+  tool->display = NULL;
+}
+
+static void
+gimp_vector_tool_path_changed (GimpToolWidget *path,
+                               GimpVectorTool *vector_tool)
+{
+  GimpDisplayShell *shell = gimp_tool_widget_get_shell (path);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+  GimpVectors      *vectors;
+
+  g_object_get (path,
+                "vectors", &vectors,
+                NULL);
+
+  if (vectors != vector_tool->vectors)
+    {
+      if (vectors && ! gimp_item_is_attached (GIMP_ITEM (vectors)))
+        {
+          gimp_image_add_vectors (image, vectors,
+                                  GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+          gimp_image_flush (image);
+
+          gimp_vector_tool_set_vectors (vector_tool, vectors);
+        }
+      else
+        {
+          gimp_vector_tool_set_vectors (vector_tool, vectors);
+
+          if (vectors)
+            gimp_image_set_active_vectors (image, vectors);
+        }
+    }
+
+  if (vectors)
+    g_object_unref (vectors);
+}
+
+static void
+gimp_vector_tool_path_begin_change (GimpToolWidget *path,
+                                    const gchar    *desc,
+                                    GimpVectorTool *vector_tool)
+{
+  GimpDisplayShell *shell = gimp_tool_widget_get_shell (path);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+
+  gimp_image_undo_push_vectors_mod (image, desc, vector_tool->vectors);
+}
+
+static void
+gimp_vector_tool_path_end_change (GimpToolWidget *path,
+                                  gboolean        success,
+                                  GimpVectorTool *vector_tool)
+{
+  GimpDisplayShell *shell = gimp_tool_widget_get_shell (path);
+  GimpImage        *image = gimp_display_get_image (shell->display);
+
+  if (! success)
+    {
+      GimpUndo            *undo;
+      GimpUndoAccumulator  accum = { 0, };
+
+      undo = gimp_undo_stack_pop_undo (gimp_image_get_undo_stack (image),
+                                       GIMP_UNDO_MODE_UNDO, &accum);
+
+      gimp_image_undo_event (image, GIMP_UNDO_EVENT_UNDO_EXPIRED, undo);
+
+      gimp_undo_free (undo, GIMP_UNDO_MODE_UNDO);
+      g_object_unref (undo);
+    }
+
+  gimp_image_flush (image);
+}
+
+static void
+gimp_vector_tool_path_activate (GimpToolWidget  *path,
+                                GdkModifierType  state,
+                                GimpVectorTool  *vector_tool)
+{
+  gimp_vector_tool_to_selection_extended (vector_tool, state);
+}
+
+static void
+gimp_vector_tool_vectors_changed (GimpImage      *image,
+                                  GimpVectorTool *vector_tool)
+{
+  gimp_vector_tool_set_vectors (vector_tool,
+                                gimp_image_get_active_vectors (image));
+}
+
+static void
+gimp_vector_tool_vectors_removed (GimpVectors    *vectors,
+                                  GimpVectorTool *vector_tool)
+{
+  gimp_vector_tool_set_vectors (vector_tool, NULL);
+}
+
+void
+gimp_vector_tool_set_vectors (GimpVectorTool *vector_tool,
+                              GimpVectors    *vectors)
+{
+  GimpTool          *tool;
+  GimpItem          *item = NULL;
+  GimpVectorOptions *options;
+
+  g_return_if_fail (GIMP_IS_VECTOR_TOOL (vector_tool));
+  g_return_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors));
+
+  tool    = GIMP_TOOL (vector_tool);
+  options = GIMP_VECTOR_TOOL_GET_OPTIONS (vector_tool);
+
+  if (vectors)
+    item = GIMP_ITEM (vectors);
+
+  if (vectors == vector_tool->vectors)
+    return;
+
+  if (vector_tool->vectors)
+    {
+      GimpImage *old_image;
+
+      old_image = gimp_item_get_image (GIMP_ITEM (vector_tool->vectors));
+
+      g_signal_handlers_disconnect_by_func (old_image,
+                                            gimp_vector_tool_vectors_changed,
+                                            vector_tool);
+      g_signal_handlers_disconnect_by_func (vector_tool->vectors,
+                                            gimp_vector_tool_vectors_removed,
+                                            vector_tool);
+
+      g_clear_object (&vector_tool->vectors);
+
+      if (options->to_selection_button)
+        {
+          gtk_widget_set_sensitive (options->to_selection_button, FALSE);
+          g_signal_handlers_disconnect_by_func (options->to_selection_button,
+                                                gimp_vector_tool_to_selection,
+                                                tool);
+          g_signal_handlers_disconnect_by_func (options->to_selection_button,
+                                                gimp_vector_tool_to_selection_extended,
+                                                tool);
+        }
+
+      if (options->fill_button)
+        {
+          gtk_widget_set_sensitive (options->fill_button, FALSE);
+          g_signal_handlers_disconnect_by_func (options->fill_button,
+                                                gimp_vector_tool_fill_vectors,
+                                                tool);
+        }
+
+      if (options->stroke_button)
+        {
+          gtk_widget_set_sensitive (options->stroke_button, FALSE);
+          g_signal_handlers_disconnect_by_func (options->stroke_button,
+                                                gimp_vector_tool_stroke_vectors,
+                                                tool);
+        }
+    }
+
+  if (! vectors ||
+      (tool->display &&
+       gimp_display_get_image (tool->display) != gimp_item_get_image (item)))
+    {
+      gimp_vector_tool_halt (vector_tool);
+    }
+
+  if (! vectors)
+    return;
+
+  vector_tool->vectors = g_object_ref (vectors);
+
+  g_signal_connect_object (gimp_item_get_image (item), "active-vectors-changed",
+                           G_CALLBACK (gimp_vector_tool_vectors_changed),
+                           vector_tool, 0);
+  g_signal_connect_object (vectors, "removed",
+                           G_CALLBACK (gimp_vector_tool_vectors_removed),
+                           vector_tool, 0);
+
+  if (options->to_selection_button)
+    {
+      g_signal_connect_swapped (options->to_selection_button, "clicked",
+                                G_CALLBACK (gimp_vector_tool_to_selection),
+                                tool);
+      g_signal_connect_swapped (options->to_selection_button, "extended-clicked",
+                                G_CALLBACK (gimp_vector_tool_to_selection_extended),
+                                tool);
+      gtk_widget_set_sensitive (options->to_selection_button, TRUE);
+    }
+
+  if (options->fill_button)
+    {
+      g_signal_connect_swapped (options->fill_button, "clicked",
+                                G_CALLBACK (gimp_vector_tool_fill_vectors),
+                                tool);
+      gtk_widget_set_sensitive (options->fill_button, TRUE);
+    }
+
+  if (options->stroke_button)
+    {
+      g_signal_connect_swapped (options->stroke_button, "clicked",
+                                G_CALLBACK (gimp_vector_tool_stroke_vectors),
+                                tool);
+      gtk_widget_set_sensitive (options->stroke_button, TRUE);
+    }
+
+  if (tool->display)
+    {
+      gimp_tool_path_set_vectors (GIMP_TOOL_PATH (vector_tool->widget), vectors);
+    }
+  else
+    {
+      GimpContext *context = gimp_get_user_context (tool->tool_info->gimp);
+      GimpDisplay *display = gimp_context_get_display (context);
+
+      if (! display ||
+          gimp_display_get_image (display) != gimp_item_get_image (item))
+        {
+          GList *list;
+
+          display = NULL;
+
+          for (list = gimp_get_display_iter (gimp_item_get_image (item)->gimp);
+               list;
+               list = g_list_next (list))
+            {
+              display = list->data;
+
+              if (gimp_display_get_image (display) == gimp_item_get_image (item))
+                {
+                  gimp_context_set_display (context, display);
+                  break;
+                }
+
+              display = NULL;
+            }
+        }
+
+      if (display)
+        gimp_vector_tool_start (vector_tool, display);
+    }
+
+  if (options->edit_mode != GIMP_VECTOR_MODE_DESIGN)
+    g_object_set (options, "vectors-edit-mode",
+                  GIMP_VECTOR_MODE_DESIGN, NULL);
+}
+
+static void
+gimp_vector_tool_to_selection (GimpVectorTool *vector_tool)
+{
+  gimp_vector_tool_to_selection_extended (vector_tool, 0);
+}
+
+static void
+gimp_vector_tool_to_selection_extended (GimpVectorTool  *vector_tool,
+                                        GdkModifierType  state)
+{
+  GimpImage *image;
+
+  if (! vector_tool->vectors)
+    return;
+
+  image = gimp_item_get_image (GIMP_ITEM (vector_tool->vectors));
+
+  gimp_item_to_selection (GIMP_ITEM (vector_tool->vectors),
+                          gimp_modifiers_to_channel_op (state),
+                          TRUE, FALSE, 0, 0);
+  gimp_image_flush (image);
+}
+
+
+static void
+gimp_vector_tool_fill_vectors (GimpVectorTool *vector_tool,
+                               GtkWidget      *button)
+{
+  GimpDialogConfig *config;
+  GimpImage        *image;
+  GimpDrawable     *drawable;
+  GtkWidget        *dialog;
+
+  if (! vector_tool->vectors)
+    return;
+
+  image = gimp_item_get_image (GIMP_ITEM (vector_tool->vectors));
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      gimp_tool_message (GIMP_TOOL (vector_tool),
+                         GIMP_TOOL (vector_tool)->display,
+                         _("There is no active layer or channel to fill"));
+      return;
+    }
+
+  dialog = fill_dialog_new (GIMP_ITEM (vector_tool->vectors),
+                            drawable,
+                            GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (vector_tool)),
+                            _("Fill Path"),
+                            GIMP_ICON_TOOL_BUCKET_FILL,
+                            GIMP_HELP_PATH_FILL,
+                            button,
+                            config->fill_options,
+                            gimp_vector_tool_fill_callback,
+                            vector_tool);
+  gtk_widget_show (dialog);
+}
+
+static void
+gimp_vector_tool_fill_callback (GtkWidget       *dialog,
+                                GimpItem        *item,
+                                GimpDrawable    *drawable,
+                                GimpContext     *context,
+                                GimpFillOptions *options,
+                                gpointer         data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (context->gimp->config);
+  GimpImage        *image  = gimp_item_get_image (item);
+  GError           *error  = NULL;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (config->fill_options), 0);
+
+  if (! gimp_item_fill (item, drawable, options,
+                        TRUE, NULL, &error))
+    {
+      gimp_message_literal (context->gimp,
+                            G_OBJECT (dialog),
+                            GIMP_MESSAGE_WARNING,
+                            error ? error->message : "NULL");
+
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
+
+
+static void
+gimp_vector_tool_stroke_vectors (GimpVectorTool *vector_tool,
+                                 GtkWidget      *button)
+{
+  GimpDialogConfig *config;
+  GimpImage        *image;
+  GimpDrawable     *drawable;
+  GtkWidget        *dialog;
+
+  if (! vector_tool->vectors)
+    return;
+
+  image = gimp_item_get_image (GIMP_ITEM (vector_tool->vectors));
+
+  config = GIMP_DIALOG_CONFIG (image->gimp->config);
+
+  drawable = gimp_image_get_active_drawable (image);
+
+  if (! drawable)
+    {
+      gimp_tool_message (GIMP_TOOL (vector_tool),
+                         GIMP_TOOL (vector_tool)->display,
+                         _("There is no active layer or channel to stroke to"));
+      return;
+    }
+
+  dialog = stroke_dialog_new (GIMP_ITEM (vector_tool->vectors),
+                              drawable,
+                              GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (vector_tool)),
+                              _("Stroke Path"),
+                              GIMP_ICON_PATH_STROKE,
+                              GIMP_HELP_PATH_STROKE,
+                              button,
+                              config->stroke_options,
+                              gimp_vector_tool_stroke_callback,
+                              vector_tool);
+  gtk_widget_show (dialog);
+}
+
+static void
+gimp_vector_tool_stroke_callback (GtkWidget         *dialog,
+                                  GimpItem          *item,
+                                  GimpDrawable      *drawable,
+                                  GimpContext       *context,
+                                  GimpStrokeOptions *options,
+                                  gpointer           data)
+{
+  GimpDialogConfig *config = GIMP_DIALOG_CONFIG (context->gimp->config);
+  GimpImage        *image  = gimp_item_get_image (item);
+  GError           *error  = NULL;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (config->stroke_options), 0);
+
+  if (! gimp_item_stroke (item, drawable, context, options, NULL,
+                          TRUE, NULL, &error))
+    {
+      gimp_message_literal (context->gimp,
+                            G_OBJECT (dialog),
+                            GIMP_MESSAGE_WARNING,
+                            error ? error->message : "NULL");
+
+      g_clear_error (&error);
+      return;
+    }
+
+  gimp_image_flush (image);
+
+  gtk_widget_destroy (dialog);
+}
diff --git a/app/tools/gimpvectortool.h b/app/tools/gimpvectortool.h
new file mode 100644
index 0000000..686ad88
--- /dev/null
+++ b/app/tools/gimpvectortool.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Vector tool
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTOR_TOOL_H__
+#define __GIMP_VECTOR_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_VECTOR_TOOL            (gimp_vector_tool_get_type ())
+#define GIMP_VECTOR_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTOR_TOOL, GimpVectorTool))
+#define GIMP_VECTOR_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTOR_TOOL, GimpVectorToolClass))
+#define GIMP_IS_VECTOR_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTOR_TOOL))
+#define GIMP_IS_VECTOR_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTOR_TOOL))
+#define GIMP_VECTOR_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTOR_TOOL, GimpVectorToolClass))
+
+#define GIMP_VECTOR_TOOL_GET_OPTIONS(t)  (GIMP_VECTOR_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpVectorTool      GimpVectorTool;
+typedef struct _GimpVectorToolClass GimpVectorToolClass;
+
+struct _GimpVectorTool
+{
+  GimpDrawTool    parent_instance;
+
+  GimpVectors    *vectors;        /* the current Vector data           */
+  GimpVectorMode  saved_mode;     /* used by modifier_key()            */
+
+  GimpToolWidget *widget;
+  GimpToolWidget *grab_widget;
+};
+
+struct _GimpVectorToolClass
+{
+  GimpDrawToolClass  parent_class;
+};
+
+
+void    gimp_vector_tool_register    (GimpToolRegisterCallback  callback,
+                                      gpointer                  data);
+
+GType   gimp_vector_tool_get_type    (void) G_GNUC_CONST;
+
+void    gimp_vector_tool_set_vectors (GimpVectorTool           *vector_tool,
+                                      GimpVectors              *vectors);
+
+
+#endif  /*  __GIMP_VECTOR_TOOL_H__  */
diff --git a/app/tools/gimpwarpoptions.c b/app/tools/gimpwarpoptions.c
new file mode 100644
index 0000000..2c2d3d9
--- /dev/null
+++ b/app/tools/gimpwarpoptions.c
@@ -0,0 +1,407 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpwarpoptions.c
+ * Copyright (C) 2011 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpspinscale.h"
+
+#include "gimpwarpoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_BEHAVIOR,
+  PROP_EFFECT_SIZE,
+  PROP_EFFECT_HARDNESS,
+  PROP_EFFECT_STRENGTH,
+  PROP_STROKE_SPACING,
+  PROP_INTERPOLATION,
+  PROP_ABYSS_POLICY,
+  PROP_HIGH_QUALITY_PREVIEW,
+  PROP_REAL_TIME_PREVIEW,
+  PROP_STROKE_DURING_MOTION,
+  PROP_STROKE_PERIODICALLY,
+  PROP_STROKE_PERIODICALLY_RATE,
+  PROP_N_ANIMATION_FRAMES
+};
+
+
+static void       gimp_warp_options_set_property (GObject      *object,
+                                                  guint         property_id,
+                                                  const GValue *value,
+                                                  GParamSpec   *pspec);
+static void       gimp_warp_options_get_property (GObject      *object,
+                                                  guint         property_id,
+                                                  GValue       *value,
+                                                  GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpWarpOptions, gimp_warp_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_warp_options_parent_class
+
+
+static void
+gimp_warp_options_class_init (GimpWarpOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_warp_options_set_property;
+  object_class->get_property = gimp_warp_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BEHAVIOR,
+                         "behavior",
+                         _("Behavior"),
+                         _("Behavior"),
+                         GIMP_TYPE_WARP_BEHAVIOR,
+                         GIMP_WARP_BEHAVIOR_MOVE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EFFECT_SIZE,
+                           "effect-size",
+                           _("Size"),
+                           _("Effect Size"),
+                           1.0, 10000.0, 40.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EFFECT_HARDNESS,
+                           "effect-hardness",
+                           _("Hardness"),
+                           _("Effect Hardness"),
+                           0.0, 100.0, 50.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EFFECT_STRENGTH,
+                           "effect-strength",
+                           _("Strength"),
+                           _("Effect Strength"),
+                           1.0, 100.0, 50.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_STROKE_SPACING,
+                           "stroke-spacing",
+                           _("Spacing"),
+                           _("Stroke Spacing"),
+                           1.0, 100.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_INTERPOLATION,
+                         "interpolation",
+                         _("Interpolation"),
+                         _("Interpolation method"),
+                         GIMP_TYPE_INTERPOLATION_TYPE,
+                         GIMP_INTERPOLATION_CUBIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_ABYSS_POLICY,
+                         "abyss-policy",
+                         _("Abyss policy"),
+                         _("Out-of-bounds sampling behavior"),
+                         GEGL_TYPE_ABYSS_POLICY,
+                         GEGL_ABYSS_NONE,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_HIGH_QUALITY_PREVIEW,
+                            "high-quality-preview",
+                            _("High quality preview"),
+                            _("Use an accurate but slower preview"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_REAL_TIME_PREVIEW,
+                            "real-time-preview",
+                            _("Real-time preview"),
+                            _("Render preview in real time (slower)"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_STROKE_DURING_MOTION,
+                            "stroke-during-motion",
+                            _("During motion"),
+                            _("Apply effect during motion"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_STROKE_PERIODICALLY,
+                            "stroke-periodically",
+                            _("Periodically"),
+                            _("Apply effect periodically"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_STROKE_PERIODICALLY_RATE,
+                           "stroke-periodically-rate",
+                           _("Rate"),
+                           _("Periodic stroke rate"),
+                           0.0, 100.0, 50.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_N_ANIMATION_FRAMES,
+                        "n-animation-frames",
+                        _("Frames"),
+                        _("Number of animation frames"),
+                        3, 1000, 10,
+                        GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_warp_options_init (GimpWarpOptions *options)
+{
+}
+
+static void
+gimp_warp_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpWarpOptions *options = GIMP_WARP_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_BEHAVIOR:
+      options->behavior = g_value_get_enum (value);
+      break;
+    case PROP_EFFECT_SIZE:
+      options->effect_size = g_value_get_double (value);
+      break;
+    case PROP_EFFECT_HARDNESS:
+      options->effect_hardness = g_value_get_double (value);
+      break;
+    case PROP_EFFECT_STRENGTH:
+      options->effect_strength = g_value_get_double (value);
+      break;
+    case PROP_STROKE_SPACING:
+      options->stroke_spacing = g_value_get_double (value);
+      break;
+    case PROP_INTERPOLATION:
+      options->interpolation = g_value_get_enum (value);
+      break;
+    case PROP_ABYSS_POLICY:
+      options->abyss_policy = g_value_get_enum (value);
+      break;
+    case PROP_HIGH_QUALITY_PREVIEW:
+      options->high_quality_preview = g_value_get_boolean (value);
+      break;
+    case PROP_REAL_TIME_PREVIEW:
+      options->real_time_preview = g_value_get_boolean (value);
+      break;
+    case PROP_STROKE_DURING_MOTION:
+      options->stroke_during_motion = g_value_get_boolean (value);
+      break;
+    case PROP_STROKE_PERIODICALLY:
+      options->stroke_periodically = g_value_get_boolean (value);
+      break;
+    case PROP_STROKE_PERIODICALLY_RATE:
+      options->stroke_periodically_rate = g_value_get_double (value);
+      break;
+    case PROP_N_ANIMATION_FRAMES:
+      options->n_animation_frames = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_warp_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpWarpOptions *options = GIMP_WARP_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_BEHAVIOR:
+      g_value_set_enum (value, options->behavior);
+      break;
+    case PROP_EFFECT_SIZE:
+      g_value_set_double (value, options->effect_size);
+      break;
+    case PROP_EFFECT_HARDNESS:
+      g_value_set_double (value, options->effect_hardness);
+      break;
+    case PROP_EFFECT_STRENGTH:
+      g_value_set_double (value, options->effect_strength);
+      break;
+    case PROP_STROKE_SPACING:
+      g_value_set_double (value, options->stroke_spacing);
+      break;
+    case PROP_INTERPOLATION:
+      g_value_set_enum (value, options->interpolation);
+      break;
+    case PROP_ABYSS_POLICY:
+      g_value_set_enum (value, options->abyss_policy);
+      break;
+    case PROP_HIGH_QUALITY_PREVIEW:
+      g_value_set_boolean (value, options->high_quality_preview);
+      break;
+    case PROP_REAL_TIME_PREVIEW:
+      g_value_set_boolean (value, options->real_time_preview);
+      break;
+    case PROP_STROKE_DURING_MOTION:
+      g_value_set_boolean (value, options->stroke_during_motion);
+      break;
+    case PROP_STROKE_PERIODICALLY:
+      g_value_set_boolean (value, options->stroke_periodically);
+      break;
+    case PROP_STROKE_PERIODICALLY_RATE:
+      g_value_set_double (value, options->stroke_periodically_rate);
+      break;
+    case PROP_N_ANIMATION_FRAMES:
+      g_value_set_int (value, options->n_animation_frames);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_warp_options_gui (GimpToolOptions *tool_options)
+{
+  GimpWarpOptions *options = GIMP_WARP_OPTIONS (tool_options);
+  GObject         *config  = G_OBJECT (tool_options);
+  GtkWidget       *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget       *frame;
+  GtkWidget       *vbox2;
+  GtkWidget       *button;
+  GtkWidget       *combo;
+  GtkWidget       *scale;
+
+  combo = gimp_prop_enum_combo_box_new (config, "behavior", 0, 0);
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  options->behavior_combo = combo;
+
+  scale = gimp_prop_spin_scale_new (config, "effect-size", NULL,
+                                    0.01, 1.0, 2);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, "effect-hardness", NULL,
+                                    1, 10, 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 100.0);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, "effect-strength", NULL,
+                                    1, 10, 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  scale = gimp_prop_spin_scale_new (config, "stroke-spacing", NULL,
+                                    1, 10, 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  combo = gimp_prop_enum_combo_box_new (config, "interpolation", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Interpolation"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  combo = gimp_prop_enum_combo_box_new (config, "abyss-policy",
+                                        GEGL_ABYSS_NONE, GEGL_ABYSS_LOOP);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Abyss policy"));
+  g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  button = gimp_prop_check_button_new (config, "high-quality-preview", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_prop_check_button_new (config, "real-time-preview", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  /*  the stroke frame  */
+  frame = gimp_frame_new (_("Stroke"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  options->stroke_frame = frame;
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  button = gimp_prop_check_button_new (config, "stroke-during-motion", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  scale = gimp_prop_spin_scale_new (config, "stroke-periodically-rate", NULL,
+                                    1, 10, 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 100.0);
+
+  frame = gimp_prop_expanding_frame_new (config, "stroke-periodically", NULL,
+                                         scale, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  the animation frame  */
+  frame = gimp_frame_new (_("Animate"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  gtk_widget_show (vbox2);
+
+  scale = gimp_prop_spin_scale_new (config, "n-animation-frames", NULL,
+                                    1.0, 10.0, 0);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 3.0, 100.0);
+  gtk_box_pack_start (GTK_BOX (vbox2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  options->animate_button = gtk_button_new_with_label (_("Create Animation"));
+  gtk_widget_set_sensitive (options->animate_button, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), options->animate_button,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (options->animate_button);
+
+  g_object_add_weak_pointer (G_OBJECT (options->animate_button),
+                             (gpointer) &options->animate_button);
+
+  return vbox;
+}
diff --git a/app/tools/gimpwarpoptions.h b/app/tools/gimpwarpoptions.h
new file mode 100644
index 0000000..eacfb71
--- /dev/null
+++ b/app/tools/gimpwarpoptions.h
@@ -0,0 +1,75 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpwarpoptions.h
+ * Copyright (C) 2011 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_WARP_OPTIONS_H__
+#define __GIMP_WARP_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_WARP_OPTIONS            (gimp_warp_options_get_type ())
+#define GIMP_WARP_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WARP_OPTIONS, GimpWarpOptions))
+#define GIMP_WARP_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_WARP_OPTIONS, GimpWarpOptionsClass))
+#define GIMP_IS_WARP_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_WARP_OPTIONS))
+#define GIMP_IS_WARP_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_WARP_OPTIONS))
+#define GIMP_WARP_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_WARP_OPTIONS, GimpWarpOptionsClass))
+
+
+typedef struct _GimpWarpOptions      GimpWarpOptions;
+typedef struct _GimpWarpOptionsClass GimpWarpOptionsClass;
+
+struct _GimpWarpOptions
+{
+  GimpToolOptions        parent_instance;
+
+  GimpWarpBehavior       behavior;
+  gdouble                effect_size;
+  gdouble                effect_hardness;
+  gdouble                effect_strength;
+  gdouble                stroke_spacing;
+  GimpInterpolationType  interpolation;
+  GeglAbyssPolicy        abyss_policy;
+  gboolean               high_quality_preview;
+  gboolean               real_time_preview;
+
+  gboolean               stroke_during_motion;
+  gboolean               stroke_periodically;
+  gdouble                stroke_periodically_rate;
+
+  gint                   n_animation_frames;
+
+  /*  options gui  */
+  GtkWidget             *behavior_combo;
+  GtkWidget             *stroke_frame;
+  GtkWidget             *animate_button;
+};
+
+struct _GimpWarpOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+};
+
+
+GType       gimp_warp_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_warp_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_WARP_OPTIONS_H__  */
diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c
new file mode 100644
index 0000000..c76f950
--- /dev/null
+++ b/app/tools/gimpwarptool.c
@@ -0,0 +1,1484 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpwarptool.c
+ * Copyright (C) 2011 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gegl-plugin.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpdisplayconfig.h"
+#include "config/gimpguiconfig.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawablefilter.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimpprogress.h"
+#include "core/gimpprojection.h"
+#include "core/gimpsubprogress.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "display/gimpdisplay.h"
+
+#include "gimpwarptool.h"
+#include "gimpwarpoptions.h"
+#include "gimptoolcontrol.h"
+#include "gimptools-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define STROKE_TIMER_MAX_FPS 20
+#define PREVIEW_SAMPLER      GEGL_SAMPLER_NEAREST
+
+
+static void            gimp_warp_tool_constructed               (GObject               *object);
+
+static void            gimp_warp_tool_control                   (GimpTool              *tool,
+                                                                 GimpToolAction         action,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_button_press              (GimpTool              *tool,
+                                                                 const GimpCoords      *coords,
+                                                                 guint32                time,
+                                                                 GdkModifierType        state,
+                                                                 GimpButtonPressType    press_type,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_button_release            (GimpTool              *tool,
+                                                                 const GimpCoords      *coords,
+                                                                 guint32                time,
+                                                                 GdkModifierType        state,
+                                                                 GimpButtonReleaseType  release_type,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_motion                    (GimpTool              *tool,
+                                                                 const GimpCoords      *coords,
+                                                                 guint32                time,
+                                                                 GdkModifierType        state,
+                                                                 GimpDisplay           *display);
+static gboolean        gimp_warp_tool_key_press                 (GimpTool              *tool,
+                                                                 GdkEventKey           *kevent,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_oper_update               (GimpTool              *tool,
+                                                                 const GimpCoords      *coords,
+                                                                 GdkModifierType        state,
+                                                                 gboolean               proximity,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_cursor_update             (GimpTool              *tool,
+                                                                 const GimpCoords      *coords,
+                                                                 GdkModifierType        state,
+                                                                 GimpDisplay           *display);
+const gchar          * gimp_warp_tool_can_undo                  (GimpTool              *tool,
+                                                                 GimpDisplay           *display);
+const gchar          * gimp_warp_tool_can_redo                  (GimpTool              *tool,
+                                                                 GimpDisplay           *display);
+static gboolean        gimp_warp_tool_undo                      (GimpTool              *tool,
+                                                                 GimpDisplay           *display);
+static gboolean        gimp_warp_tool_redo                      (GimpTool              *tool,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_options_notify            (GimpTool              *tool,
+                                                                 GimpToolOptions       *options,
+                                                                 const GParamSpec      *pspec);
+
+static void            gimp_warp_tool_draw                      (GimpDrawTool          *draw_tool);
+
+static void            gimp_warp_tool_cursor_notify             (GimpDisplayConfig     *config,
+                                                                 GParamSpec            *pspec,
+                                                                 GimpWarpTool          *wt);
+
+static gboolean        gimp_warp_tool_can_stroke                (GimpWarpTool          *wt,
+                                                                 GimpDisplay           *display,
+                                                                 gboolean               show_message);
+
+static gboolean        gimp_warp_tool_start                     (GimpWarpTool          *wt,
+                                                                 GimpDisplay           *display);
+static void            gimp_warp_tool_halt                      (GimpWarpTool          *wt);
+static void            gimp_warp_tool_commit                    (GimpWarpTool          *wt);
+
+static void            gimp_warp_tool_start_stroke_timer        (GimpWarpTool          *wt);
+static void            gimp_warp_tool_stop_stroke_timer         (GimpWarpTool          *wt);
+static gboolean        gimp_warp_tool_stroke_timer              (GimpWarpTool          *wt);
+
+static void            gimp_warp_tool_create_graph              (GimpWarpTool          *wt);
+static void            gimp_warp_tool_create_filter             (GimpWarpTool          *wt,
+                                                                 GimpDrawable          *drawable);
+static void            gimp_warp_tool_set_sampler               (GimpWarpTool          *wt,
+                                                                 gboolean               commit);
+static GeglRectangle
+                       gimp_warp_tool_get_stroke_bounds         (GeglNode              *node);
+static GeglRectangle   gimp_warp_tool_get_node_bounds           (GeglNode              *node);
+static void            gimp_warp_tool_clear_node_bounds         (GeglNode              *node);
+static GeglRectangle   gimp_warp_tool_get_invalidated_by_change (GimpWarpTool          *wt,
+                                                                 const GeglRectangle   *area);
+static void            gimp_warp_tool_update_bounds             (GimpWarpTool          *wt);
+static void            gimp_warp_tool_update_area               (GimpWarpTool          *wt,
+                                                                 const GeglRectangle   *area,
+                                                                 gboolean               synchronous);
+static void            gimp_warp_tool_update_stroke             (GimpWarpTool          *wt,
+                                                                 GeglNode              *node);
+static void            gimp_warp_tool_stroke_append             (GimpWarpTool          *wt,
+                                                                 gchar                  type,
+                                                                 gdouble                x,
+                                                                 gdouble                y);
+static void            gimp_warp_tool_filter_flush              (GimpDrawableFilter    *filter,
+                                                                 GimpTool              *tool);
+static void            gimp_warp_tool_add_op                    (GimpWarpTool          *wt,
+                                                                 GeglNode              *op);
+static void            gimp_warp_tool_remove_op                 (GimpWarpTool          *wt,
+                                                                 GeglNode              *op);
+static void            gimp_warp_tool_free_op                   (GeglNode              *op);
+
+static void            gimp_warp_tool_animate                   (GimpWarpTool          *wt);
+
+
+G_DEFINE_TYPE (GimpWarpTool, gimp_warp_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_warp_tool_parent_class
+
+
+void
+gimp_warp_tool_register (GimpToolRegisterCallback  callback,
+                         gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_WARP_TOOL,
+                GIMP_TYPE_WARP_OPTIONS,
+                gimp_warp_options_gui,
+                0,
+                "gimp-warp-tool",
+                _("Warp Transform"),
+                _("Warp Transform: Deform with different tools"),
+                N_("_Warp Transform"), "W",
+                NULL, GIMP_HELP_TOOL_WARP,
+                GIMP_ICON_TOOL_WARP,
+                data);
+}
+
+static void
+gimp_warp_tool_class_init (GimpWarpToolClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  object_class->constructed  = gimp_warp_tool_constructed;
+
+  tool_class->control        = gimp_warp_tool_control;
+  tool_class->button_press   = gimp_warp_tool_button_press;
+  tool_class->button_release = gimp_warp_tool_button_release;
+  tool_class->motion         = gimp_warp_tool_motion;
+  tool_class->key_press      = gimp_warp_tool_key_press;
+  tool_class->oper_update    = gimp_warp_tool_oper_update;
+  tool_class->cursor_update  = gimp_warp_tool_cursor_update;
+  tool_class->can_undo       = gimp_warp_tool_can_undo;
+  tool_class->can_redo       = gimp_warp_tool_can_redo;
+  tool_class->undo           = gimp_warp_tool_undo;
+  tool_class->redo           = gimp_warp_tool_redo;
+  tool_class->options_notify = gimp_warp_tool_options_notify;
+
+  draw_tool_class->draw      = gimp_warp_tool_draw;
+}
+
+static void
+gimp_warp_tool_init (GimpWarpTool *self)
+{
+  GimpTool *tool = GIMP_TOOL (self);
+
+  gimp_tool_control_set_motion_mode     (tool->control, GIMP_MOTION_MODE_EXACT);
+  gimp_tool_control_set_scroll_lock     (tool->control, TRUE);
+  gimp_tool_control_set_preserve        (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask      (tool->control,
+                                         GIMP_DIRTY_IMAGE           |
+                                         GIMP_DIRTY_DRAWABLE        |
+                                         GIMP_DIRTY_SELECTION       |
+                                         GIMP_DIRTY_ACTIVE_DRAWABLE);
+  gimp_tool_control_set_dirty_action    (tool->control,
+                                         GIMP_TOOL_ACTION_COMMIT);
+  gimp_tool_control_set_wants_click     (tool->control, TRUE);
+  gimp_tool_control_set_precision       (tool->control,
+                                         GIMP_CURSOR_PRECISION_SUBPIXEL);
+  gimp_tool_control_set_tool_cursor     (tool->control,
+                                         GIMP_TOOL_CURSOR_WARP);
+  gimp_tool_control_set_action_size     (tool->control,
+                                         "tools/tools-warp-effect-size-set");
+  gimp_tool_control_set_action_hardness (tool->control,
+                                         "tools/tools-warp-effect-hardness-set");
+
+  self->show_cursor = TRUE;
+  self->draw_brush  = TRUE;
+  self->snap_brush  = FALSE;
+}
+
+static void
+gimp_warp_tool_constructed (GObject *object)
+{
+  GimpWarpTool      *wt   = GIMP_WARP_TOOL (object);
+  GimpTool          *tool = GIMP_TOOL (object);
+  GimpDisplayConfig *display_config;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  display_config = GIMP_DISPLAY_CONFIG (tool->tool_info->gimp->config);
+
+  wt->show_cursor = display_config->show_paint_tool_cursor;
+  wt->draw_brush  = display_config->show_brush_outline;
+  wt->snap_brush  = display_config->snap_brush_outline;
+
+  g_signal_connect_object (display_config, "notify::show-paint-tool-cursor",
+                           G_CALLBACK (gimp_warp_tool_cursor_notify),
+                           wt, 0);
+  g_signal_connect_object (display_config, "notify::show-brush-outline",
+                           G_CALLBACK (gimp_warp_tool_cursor_notify),
+                           wt, 0);
+  g_signal_connect_object (display_config, "notify::snap-brush-outline",
+                           G_CALLBACK (gimp_warp_tool_cursor_notify),
+                           wt, 0);
+}
+
+static void
+gimp_warp_tool_control (GimpTool       *tool,
+                        GimpToolAction  action,
+                        GimpDisplay    *display)
+{
+  GimpWarpTool *wt = GIMP_WARP_TOOL (tool);
+
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_warp_tool_halt (wt);
+      break;
+
+    case GIMP_TOOL_ACTION_COMMIT:
+      gimp_warp_tool_commit (wt);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+static void
+gimp_warp_tool_button_press (GimpTool            *tool,
+                             const GimpCoords    *coords,
+                             guint32              time,
+                             GdkModifierType      state,
+                             GimpButtonPressType  press_type,
+                             GimpDisplay         *display)
+{
+  GimpWarpTool    *wt      = GIMP_WARP_TOOL (tool);
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GeglNode        *new_op;
+  gint             off_x, off_y;
+
+  if (tool->display && display != tool->display)
+    gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, tool->display);
+
+  if (! tool->display)
+    {
+      if (! gimp_warp_tool_start (wt, display))
+        return;
+    }
+
+  if (! gimp_warp_tool_can_stroke (wt, display, TRUE))
+    return;
+
+  wt->current_stroke = gegl_path_new ();
+
+  wt->last_pos.x = coords->x;
+  wt->last_pos.y = coords->y;
+
+  wt->total_dist = 0.0;
+
+  new_op = gegl_node_new_child (NULL,
+                                "operation", "gegl:warp",
+                                "behavior",  options->behavior,
+                                "size",      options->effect_size,
+                                "hardness",  options->effect_hardness / 100.0,
+                                "strength",  options->effect_strength,
+                                /* we implement spacing manually.
+                                 * anything > 1 will do.
+                                 */
+                                "spacing",   10.0,
+                                "stroke",    wt->current_stroke,
+                                NULL);
+
+  gimp_warp_tool_add_op (wt, new_op);
+  g_object_unref (new_op);
+
+  gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
+
+  gimp_warp_tool_stroke_append (wt,
+                                'M', wt->last_pos.x - off_x,
+                                     wt->last_pos.y - off_y);
+
+  gimp_warp_tool_start_stroke_timer (wt);
+
+  gimp_tool_control_activate (tool->control);
+}
+
+void
+gimp_warp_tool_button_release (GimpTool              *tool,
+                               const GimpCoords      *coords,
+                               guint32                time,
+                               GdkModifierType        state,
+                               GimpButtonReleaseType  release_type,
+                               GimpDisplay           *display)
+{
+  GimpWarpTool *wt = GIMP_WARP_TOOL (tool);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (wt));
+
+  gimp_tool_control_halt (tool->control);
+
+  gimp_warp_tool_stop_stroke_timer (wt);
+
+#ifdef WARP_DEBUG
+  g_printerr ("%s\n", gegl_path_to_string (wt->current_stroke));
+#endif
+
+  g_clear_object (&wt->current_stroke);
+
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+      gimp_warp_tool_undo (tool, display);
+
+      /*  the just undone stroke has no business on the redo stack  */
+      gimp_warp_tool_free_op (wt->redo_stack->data);
+      wt->redo_stack = g_list_remove_link (wt->redo_stack, wt->redo_stack);
+    }
+  else
+    {
+      if (wt->redo_stack)
+        {
+          /*  the redo stack becomes invalid by actually doing a stroke  */
+          g_list_free_full (wt->redo_stack,
+                            (GDestroyNotify) gimp_warp_tool_free_op);
+          wt->redo_stack = NULL;
+        }
+
+      gimp_tool_push_status (tool, tool->display,
+                             _("Press ENTER to commit the transform"));
+    }
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+
+  /*  update the undo actions / menu items  */
+  gimp_image_flush (gimp_display_get_image (GIMP_TOOL (wt)->display));
+}
+
+static void
+gimp_warp_tool_motion (GimpTool         *tool,
+                       const GimpCoords *coords,
+                       guint32           time,
+                       GdkModifierType   state,
+                       GimpDisplay      *display)
+{
+  GimpWarpTool    *wt             = GIMP_WARP_TOOL (tool);
+  GimpWarpOptions *options        = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GimpVector2      old_cursor_pos;
+  GimpVector2      delta;
+  gdouble          dist;
+  gdouble          step;
+  gboolean         stroke_changed = FALSE;
+
+  if (! wt->snap_brush)
+    gimp_draw_tool_pause (GIMP_DRAW_TOOL (wt));
+
+  old_cursor_pos = wt->cursor_pos;
+
+  wt->cursor_pos.x = coords->x;
+  wt->cursor_pos.y = coords->y;
+
+  gimp_vector2_sub (&delta, &wt->cursor_pos, &old_cursor_pos);
+  dist = gimp_vector2_length (&delta);
+
+  step = options->effect_size * options->stroke_spacing / 100.0;
+
+  while (wt->total_dist + dist >= step)
+    {
+      gdouble diff = step - wt->total_dist;
+
+      gimp_vector2_mul (&delta, diff / dist);
+      gimp_vector2_add (&old_cursor_pos, &old_cursor_pos, &delta);
+
+      gimp_vector2_sub (&delta, &wt->cursor_pos, &old_cursor_pos);
+      dist -= diff;
+
+      wt->last_pos   = old_cursor_pos;
+      wt->total_dist = 0.0;
+
+      if (options->stroke_during_motion)
+        {
+          gint off_x, off_y;
+
+          if (! stroke_changed)
+            {
+              stroke_changed = TRUE;
+
+              gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+            }
+
+          gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
+
+          gimp_warp_tool_stroke_append (wt,
+                                        'L', wt->last_pos.x - off_x,
+                                             wt->last_pos.y - off_y);
+        }
+    }
+
+  wt->total_dist += dist;
+
+  if (stroke_changed)
+    {
+      gimp_warp_tool_start_stroke_timer (wt);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+
+  if (! wt->snap_brush)
+    gimp_draw_tool_resume (GIMP_DRAW_TOOL (wt));
+}
+
+static gboolean
+gimp_warp_tool_key_press (GimpTool    *tool,
+                          GdkEventKey *kevent,
+                          GimpDisplay *display)
+{
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_BackSpace:
+      return TRUE;
+
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_COMMIT, display);
+      return TRUE;
+
+    case GDK_KEY_Escape:
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_warp_tool_oper_update (GimpTool         *tool,
+                            const GimpCoords *coords,
+                            GdkModifierType   state,
+                            gboolean          proximity,
+                            GimpDisplay      *display)
+{
+  GimpWarpTool *wt        = GIMP_WARP_TOOL (tool);
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
+
+  if (proximity)
+    {
+      gimp_draw_tool_pause (draw_tool);
+
+      if (! tool->display || display == tool->display)
+        {
+          wt->cursor_pos.x = coords->x;
+          wt->cursor_pos.y = coords->y;
+
+          wt->last_pos = wt->cursor_pos;
+        }
+
+      if (! gimp_draw_tool_is_active (draw_tool))
+        gimp_draw_tool_start (draw_tool, display);
+
+      gimp_draw_tool_resume (draw_tool);
+    }
+  else if (gimp_draw_tool_is_active (draw_tool))
+    {
+      gimp_draw_tool_stop (draw_tool);
+    }
+}
+
+static void
+gimp_warp_tool_cursor_update (GimpTool         *tool,
+                              const GimpCoords *coords,
+                              GdkModifierType   state,
+                              GimpDisplay      *display)
+{
+  GimpWarpTool       *wt       = GIMP_WARP_TOOL (tool);
+  GimpWarpOptions    *options  = GIMP_WARP_TOOL_GET_OPTIONS (tool);
+  GimpCursorModifier  modifier = GIMP_CURSOR_MODIFIER_NONE;
+
+  if (! gimp_warp_tool_can_stroke (wt, display, FALSE))
+    {
+      modifier = GIMP_CURSOR_MODIFIER_BAD;
+    }
+  else if (display == tool->display)
+    {
+#if 0
+      /* FIXME have better cursors  */
+
+      switch (options->behavior)
+        {
+        case GIMP_WARP_BEHAVIOR_MOVE:
+        case GIMP_WARP_BEHAVIOR_GROW:
+        case GIMP_WARP_BEHAVIOR_SHRINK:
+        case GIMP_WARP_BEHAVIOR_SWIRL_CW:
+        case GIMP_WARP_BEHAVIOR_SWIRL_CCW:
+        case GIMP_WARP_BEHAVIOR_ERASE:
+        case GIMP_WARP_BEHAVIOR_SMOOTH:
+          modifier = GIMP_CURSOR_MODIFIER_MOVE;
+          break;
+        }
+#else
+      (void) options;
+#endif
+    }
+
+  if (! wt->show_cursor && modifier != GIMP_CURSOR_MODIFIER_BAD)
+    {
+      gimp_tool_set_cursor (tool, display,
+                            GIMP_CURSOR_NONE,
+                            GIMP_TOOL_CURSOR_NONE,
+                            GIMP_CURSOR_MODIFIER_NONE);
+      return;
+    }
+
+  gimp_tool_control_set_cursor_modifier (tool->control, modifier);
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+}
+
+const gchar *
+gimp_warp_tool_can_undo (GimpTool    *tool,
+                         GimpDisplay *display)
+{
+  GimpWarpTool *wt = GIMP_WARP_TOOL (tool);
+  GeglNode     *to_delete;
+  const gchar  *type;
+
+  if (! wt->render_node)
+    return NULL;
+
+  to_delete = gegl_node_get_producer (wt->render_node, "aux", NULL);
+  type = gegl_node_get_operation (to_delete);
+
+  if (strcmp (type, "gegl:warp"))
+    return NULL;
+
+  return _("Warp Tool Stroke");
+}
+
+const gchar *
+gimp_warp_tool_can_redo (GimpTool    *tool,
+                         GimpDisplay *display)
+{
+  GimpWarpTool *wt = GIMP_WARP_TOOL (tool);
+
+  if (! wt->render_node || ! wt->redo_stack)
+    return NULL;
+
+  return _("Warp Tool Stroke");
+}
+
+static gboolean
+gimp_warp_tool_undo (GimpTool    *tool,
+                     GimpDisplay *display)
+{
+  GimpWarpTool *wt = GIMP_WARP_TOOL (tool);
+  GeglNode     *to_delete;
+  GeglNode     *prev_node;
+
+  to_delete = gegl_node_get_producer (wt->render_node, "aux", NULL);
+
+  wt->redo_stack = g_list_prepend (wt->redo_stack, to_delete);
+
+  /* we connect render_node to the previous node, but keep the current node
+   * in the graph, connected to the previous node as well, so that it doesn't
+   * get invalidated and maintains its cache.  this way, redoing it doesn't
+   * require reprocessing.
+   */
+  prev_node = gegl_node_get_producer (to_delete, "input", NULL);
+
+  gegl_node_connect_to (prev_node,       "output",
+                        wt->render_node, "aux");
+
+  gimp_warp_tool_update_bounds (wt);
+  gimp_warp_tool_update_stroke (wt, to_delete);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_warp_tool_redo (GimpTool    *tool,
+                     GimpDisplay *display)
+{
+  GimpWarpTool *wt = GIMP_WARP_TOOL (tool);
+  GeglNode     *to_add;
+
+  to_add = wt->redo_stack->data;
+
+  gegl_node_connect_to (to_add,          "output",
+                        wt->render_node, "aux");
+
+  wt->redo_stack = g_list_remove_link (wt->redo_stack, wt->redo_stack);
+
+  gimp_warp_tool_update_bounds (wt);
+  gimp_warp_tool_update_stroke (wt, to_add);
+
+  return TRUE;
+}
+
+static void
+gimp_warp_tool_options_notify (GimpTool         *tool,
+                               GimpToolOptions  *options,
+                               const GParamSpec *pspec)
+{
+  GimpWarpTool    *wt         = GIMP_WARP_TOOL (tool);
+  GimpWarpOptions *wt_options = GIMP_WARP_OPTIONS (options);
+
+  GIMP_TOOL_CLASS (parent_class)->options_notify (tool, options, pspec);
+
+  if (! strcmp (pspec->name, "effect-size"))
+    {
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+    }
+  else if (! strcmp (pspec->name, "interpolation"))
+    {
+      gimp_warp_tool_set_sampler (wt, /* commit = */ FALSE);
+    }
+  else if (! strcmp (pspec->name, "abyss-policy"))
+    {
+      if (wt->render_node)
+        {
+          gegl_node_set (wt->render_node,
+                         "abyss-policy", wt_options->abyss_policy,
+                         NULL);
+
+          gimp_warp_tool_update_stroke (wt, NULL);
+        }
+    }
+  else if (! strcmp (pspec->name, "high-quality-preview"))
+    {
+      gimp_warp_tool_set_sampler (wt, /* commit = */ FALSE);
+    }
+}
+
+static void
+gimp_warp_tool_draw (GimpDrawTool *draw_tool)
+{
+  GimpWarpTool    *wt      = GIMP_WARP_TOOL (draw_tool);
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  gdouble          x, y;
+
+  if (wt->snap_brush)
+    {
+      x = wt->last_pos.x;
+      y = wt->last_pos.y;
+    }
+  else
+    {
+      x = wt->cursor_pos.x;
+      y = wt->cursor_pos.y;
+    }
+
+  if (wt->draw_brush)
+    {
+      gimp_draw_tool_add_arc (draw_tool,
+                              FALSE,
+                              x - options->effect_size * 0.5,
+                              y - options->effect_size * 0.5,
+                              options->effect_size,
+                              options->effect_size,
+                              0.0, 2.0 * G_PI);
+    }
+  else if (! wt->show_cursor)
+    {
+      /*  don't leave the user without any indication and draw
+       *  a fallback crosshair
+       */
+      gimp_draw_tool_add_handle (draw_tool,
+                                 GIMP_HANDLE_CROSSHAIR,
+                                 x, y,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSSHAIR,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSSHAIR,
+                                 GIMP_HANDLE_ANCHOR_CENTER);
+    }
+}
+
+static void
+gimp_warp_tool_cursor_notify (GimpDisplayConfig *config,
+                              GParamSpec        *pspec,
+                              GimpWarpTool      *wt)
+{
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (wt));
+
+  wt->show_cursor = config->show_paint_tool_cursor;
+  wt->draw_brush  = config->show_brush_outline;
+  wt->snap_brush  = config->snap_brush_outline;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (wt));
+}
+
+static gboolean
+gimp_warp_tool_can_stroke (GimpWarpTool *wt,
+                           GimpDisplay  *display,
+                           gboolean      show_message)
+{
+  GimpTool        *tool     = GIMP_TOOL (wt);
+  GimpWarpOptions *options  = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GimpGuiConfig   *config   = GIMP_GUI_CONFIG (display->gimp->config);
+  GimpImage       *image    = gimp_display_get_image (display);
+  GimpDrawable    *drawable = gimp_image_get_active_drawable (image);
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
+    {
+      if (show_message)
+        {
+          gimp_tool_message_literal (tool, display,
+                                     _("Cannot warp layer groups."));
+        }
+
+      return FALSE;
+    }
+
+  if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
+    {
+      if (show_message)
+        {
+          gimp_tool_message_literal (tool, display,
+                                     _("The active layer's pixels are locked."));
+
+          gimp_tools_blink_lock_box (display->gimp, GIMP_ITEM (drawable));
+        }
+
+      return FALSE;
+    }
+
+  if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+      ! config->edit_non_visible)
+    {
+      if (show_message)
+        {
+          gimp_tool_message_literal (tool, display,
+                                     _("The active layer is not visible."));
+        }
+
+      return FALSE;
+    }
+
+  if (! options->stroke_during_motion &&
+      ! options->stroke_periodically)
+    {
+      if (show_message)
+        {
+          gimp_tool_message_literal (tool, display,
+                                     _("No stroke events selected."));
+
+          gimp_widget_blink (options->stroke_frame);
+        }
+
+      return FALSE;
+    }
+
+  if (! wt->filter || ! gimp_tool_can_undo (tool, display))
+    {
+      const gchar *message = NULL;
+
+      switch (options->behavior)
+        {
+        case GIMP_WARP_BEHAVIOR_MOVE:
+        case GIMP_WARP_BEHAVIOR_GROW:
+        case GIMP_WARP_BEHAVIOR_SHRINK:
+        case GIMP_WARP_BEHAVIOR_SWIRL_CW:
+        case GIMP_WARP_BEHAVIOR_SWIRL_CCW:
+          break;
+
+        case GIMP_WARP_BEHAVIOR_ERASE:
+          message = _("No warp to erase.");
+          break;
+
+        case GIMP_WARP_BEHAVIOR_SMOOTH:
+          message = _("No warp to smooth.");
+          break;
+        }
+
+      if (message)
+        {
+          if (show_message)
+            {
+              gimp_tool_message_literal (tool, display, message);
+
+              gimp_widget_blink (options->behavior_combo);
+            }
+
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_warp_tool_start (GimpWarpTool *wt,
+                      GimpDisplay  *display)
+{
+  GimpTool        *tool     = GIMP_TOOL (wt);
+  GimpWarpOptions *options  = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GimpImage       *image    = gimp_display_get_image (display);
+  GimpDrawable    *drawable = gimp_image_get_active_drawable (image);
+  const Babl      *format;
+  GeglRectangle    bbox;
+
+  if (! gimp_warp_tool_can_stroke (wt, display, TRUE))
+    return FALSE;
+
+  tool->display  = display;
+  tool->drawable = drawable;
+
+  /* Create the coords buffer, with the size of the selection */
+  format = babl_format_n (babl_type ("float"), 2);
+
+  gimp_item_mask_intersect (GIMP_ITEM (drawable), &bbox.x, &bbox.y,
+                            &bbox.width, &bbox.height);
+
+#ifdef WARP_DEBUG
+  g_printerr ("Initialize coordinate buffer (%d,%d) at %d,%d\n",
+              bbox.width, bbox.height, bbox.x, bbox.y);
+#endif
+
+  wt->coords_buffer = gegl_buffer_new (&bbox, format);
+
+  gimp_warp_tool_create_filter (wt, drawable);
+
+  if (! gimp_draw_tool_is_active (GIMP_DRAW_TOOL (wt)))
+    gimp_draw_tool_start (GIMP_DRAW_TOOL (wt), display);
+
+  if (options->animate_button)
+    {
+      g_signal_connect_swapped (options->animate_button, "clicked",
+                                G_CALLBACK (gimp_warp_tool_animate),
+                                wt);
+
+      gtk_widget_set_sensitive (options->animate_button, TRUE);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_warp_tool_halt (GimpWarpTool *wt)
+{
+  GimpTool        *tool    = GIMP_TOOL (wt);
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+
+  g_clear_object (&wt->coords_buffer);
+
+  g_clear_object (&wt->graph);
+  wt->render_node = NULL;
+
+  if (wt->filter)
+    {
+      gimp_drawable_filter_abort (wt->filter);
+      g_clear_object (&wt->filter);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+
+  if (wt->redo_stack)
+    {
+      g_list_free (wt->redo_stack);
+      wt->redo_stack = NULL;
+    }
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
+
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (wt)))
+    gimp_draw_tool_stop (GIMP_DRAW_TOOL (wt));
+
+  if (options->animate_button)
+    {
+      gtk_widget_set_sensitive (options->animate_button, FALSE);
+
+      g_signal_handlers_disconnect_by_func (options->animate_button,
+                                            gimp_warp_tool_animate,
+                                            wt);
+    }
+}
+
+static void
+gimp_warp_tool_commit (GimpWarpTool *wt)
+{
+  GimpTool *tool = GIMP_TOOL (wt);
+
+  /* don't commit a nop */
+  if (tool->display && gimp_tool_can_undo (tool, tool->display))
+    {
+      gimp_tool_control_push_preserve (tool->control, TRUE);
+
+      gimp_warp_tool_set_sampler (wt, /* commit = */ TRUE);
+
+      gimp_drawable_filter_commit (wt->filter, GIMP_PROGRESS (tool), FALSE);
+      g_clear_object (&wt->filter);
+
+      gimp_tool_control_pop_preserve (tool->control);
+
+      gimp_image_flush (gimp_display_get_image (tool->display));
+    }
+}
+
+static void
+gimp_warp_tool_start_stroke_timer (GimpWarpTool *wt)
+{
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+
+  gimp_warp_tool_stop_stroke_timer (wt);
+
+  if (options->stroke_periodically                    &&
+      options->stroke_periodically_rate > 0.0         &&
+      ! (options->behavior == GIMP_WARP_BEHAVIOR_MOVE &&
+         options->stroke_during_motion))
+    {
+      gdouble fps;
+
+      fps = STROKE_TIMER_MAX_FPS * options->stroke_periodically_rate / 100.0;
+
+      wt->stroke_timer = g_timeout_add (1000.0 / fps,
+                                        (GSourceFunc) gimp_warp_tool_stroke_timer,
+                                        wt);
+    }
+}
+
+static void
+gimp_warp_tool_stop_stroke_timer (GimpWarpTool *wt)
+{
+  if (wt->stroke_timer)
+    g_source_remove (wt->stroke_timer);
+
+  wt->stroke_timer = 0;
+}
+
+static gboolean
+gimp_warp_tool_stroke_timer (GimpWarpTool *wt)
+{
+  GimpTool *tool = GIMP_TOOL (wt);
+  gint      off_x, off_y;
+
+  gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
+
+  gimp_warp_tool_stroke_append (wt,
+                                'L', wt->last_pos.x - off_x,
+                                     wt->last_pos.y - off_y);
+
+  return TRUE;
+}
+
+static void
+gimp_warp_tool_create_graph (GimpWarpTool *wt)
+{
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GeglNode        *graph;           /* Wrapper to be returned */
+  GeglNode        *input, *output;  /* Proxy nodes */
+  GeglNode        *coords, *render; /* Render nodes */
+
+  /* render_node is not supposed to be recreated */
+  g_return_if_fail (wt->graph == NULL);
+
+  graph = gegl_node_new ();
+
+  input  = gegl_node_get_input_proxy  (graph, "input");
+  output = gegl_node_get_output_proxy (graph, "output");
+
+  coords = gegl_node_new_child (graph,
+                               "operation", "gegl:buffer-source",
+                               "buffer",    wt->coords_buffer,
+                               NULL);
+
+  render = gegl_node_new_child (graph,
+                                "operation",    "gegl:map-relative",
+                                "abyss-policy", options->abyss_policy,
+                                NULL);
+
+  gegl_node_connect_to (input,  "output",
+                        render, "input");
+
+  gegl_node_connect_to (coords, "output",
+                        render, "aux");
+
+  gegl_node_connect_to (render, "output",
+                        output, "input");
+
+  wt->graph       = graph;
+  wt->render_node = render;
+}
+
+static void
+gimp_warp_tool_create_filter (GimpWarpTool *wt,
+                              GimpDrawable *drawable)
+{
+  if (! wt->graph)
+    gimp_warp_tool_create_graph (wt);
+
+  gimp_warp_tool_set_sampler (wt, /* commit = */ FALSE);
+
+  wt->filter = gimp_drawable_filter_new (drawable,
+                                         _("Warp transform"),
+                                         wt->graph,
+                                         GIMP_ICON_TOOL_WARP);
+
+  gimp_drawable_filter_set_region (wt->filter, GIMP_FILTER_REGION_DRAWABLE);
+
+#if 0
+  g_object_set (wt->filter, "gegl-caching", TRUE, NULL);
+#endif
+
+  g_signal_connect (wt->filter, "flush",
+                    G_CALLBACK (gimp_warp_tool_filter_flush),
+                    wt);
+}
+
+static void
+gimp_warp_tool_set_sampler (GimpWarpTool *wt,
+                            gboolean      commit)
+{
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GeglSamplerType  sampler;
+  GeglSamplerType  old_sampler;
+
+  if (! wt->render_node)
+    return;
+
+  if (commit || options->high_quality_preview)
+    sampler = (GeglSamplerType) options->interpolation;
+  else
+    sampler = PREVIEW_SAMPLER;
+
+  gegl_node_get (wt->render_node,
+                 "sampler-type", &old_sampler,
+                 NULL);
+
+  if (sampler != old_sampler)
+    {
+      gegl_node_set (wt->render_node,
+                     "sampler-type", sampler,
+                     NULL);
+
+      gimp_warp_tool_update_bounds (wt);
+      gimp_warp_tool_update_stroke (wt, NULL);
+    }
+}
+
+static GeglRectangle
+gimp_warp_tool_get_stroke_bounds (GeglNode *node)
+{
+  GeglRectangle  bbox = {0, 0, 0, 0};
+  GeglPath      *stroke;
+  gdouble        size;
+
+  gegl_node_get (node,
+                 "stroke", &stroke,
+                 "size",   &size,
+                 NULL);
+
+  if (stroke)
+    {
+      gdouble        min_x;
+      gdouble        max_x;
+      gdouble        min_y;
+      gdouble        max_y;
+
+      gegl_path_get_bounds (stroke, &min_x, &max_x, &min_y, &max_y);
+      g_object_unref (stroke);
+
+      bbox.x      = floor (min_x - size * 0.5);
+      bbox.y      = floor (min_y - size * 0.5);
+      bbox.width  = ceil (max_x + size * 0.5) - bbox.x;
+      bbox.height = ceil (max_y + size * 0.5) - bbox.y;
+    }
+
+  return bbox;
+}
+
+static GeglRectangle
+gimp_warp_tool_get_node_bounds (GeglNode *node)
+{
+  GeglRectangle *bounds;
+
+  if (! node || strcmp (gegl_node_get_operation (node), "gegl:warp"))
+    return *GEGL_RECTANGLE (0, 0, 0, 0);
+
+  bounds = g_object_get_data (G_OBJECT (node), "gimp-warp-tool-bounds");
+
+  if (! bounds)
+    {
+      GeglNode      *input_node;
+      GeglRectangle  input_bounds;
+      GeglRectangle  stroke_bounds;
+
+      input_node   = gegl_node_get_producer (node, "input", NULL);
+      input_bounds = gimp_warp_tool_get_node_bounds (input_node);
+
+      stroke_bounds = gimp_warp_tool_get_stroke_bounds (node);
+
+      gegl_rectangle_bounding_box (&input_bounds,
+                                   &input_bounds, &stroke_bounds);
+
+      bounds = gegl_rectangle_dup (&input_bounds);
+
+      g_object_set_data_full (G_OBJECT (node), "gimp-warp-tool-bounds",
+                              bounds, g_free);
+    }
+
+  return *bounds;
+}
+
+static void
+gimp_warp_tool_clear_node_bounds (GeglNode *node)
+{
+  if (node && ! strcmp (gegl_node_get_operation (node), "gegl:warp"))
+    g_object_set_data (G_OBJECT (node), "gimp-warp-tool-bounds", NULL);
+}
+
+static GeglRectangle
+gimp_warp_tool_get_invalidated_by_change (GimpWarpTool        *wt,
+                                          const GeglRectangle *area)
+{
+  GeglRectangle result = *area;
+
+  if (! wt->filter)
+    return result;
+
+  if (wt->render_node)
+    {
+      GeglOperation *operation = gegl_node_get_gegl_operation (wt->render_node);
+
+      result = gegl_operation_get_invalidated_by_change (operation,
+                                                         "aux", area);
+    }
+
+  return result;
+}
+
+static void
+gimp_warp_tool_update_bounds (GimpWarpTool *wt)
+{
+  GeglRectangle bounds = {0, 0, 0, 0};
+
+  if (! wt->filter)
+    return;
+
+  if (wt->render_node)
+    {
+      GeglNode *node = gegl_node_get_producer (wt->render_node, "aux", NULL);
+
+      bounds = gimp_warp_tool_get_node_bounds (node);
+
+      bounds = gimp_warp_tool_get_invalidated_by_change (wt, &bounds);
+    }
+
+  gimp_drawable_filter_set_crop (wt->filter, &bounds, FALSE);
+}
+
+static void
+gimp_warp_tool_update_area (GimpWarpTool        *wt,
+                            const GeglRectangle *area,
+                            gboolean             synchronous)
+{
+  GeglRectangle rect;
+
+  if (! wt->filter)
+    return;
+
+  rect = gimp_warp_tool_get_invalidated_by_change (wt, area);
+
+  if (synchronous)
+    {
+      GimpTool  *tool  = GIMP_TOOL (wt);
+      GimpImage *image = gimp_display_get_image (tool->display);
+
+      g_signal_handlers_block_by_func (wt->filter,
+                                       gimp_warp_tool_filter_flush,
+                                       wt);
+
+      gimp_drawable_filter_apply (wt->filter, &rect);
+
+      gimp_projection_flush_now (gimp_image_get_projection (image), TRUE);
+      gimp_display_flush_now (tool->display);
+
+      g_signal_handlers_unblock_by_func (wt->filter,
+                                         gimp_warp_tool_filter_flush,
+                                         wt);
+    }
+  else
+    {
+      gimp_drawable_filter_apply (wt->filter, &rect);
+    }
+}
+
+static void
+gimp_warp_tool_update_stroke (GimpWarpTool *wt,
+                              GeglNode     *node)
+{
+  GeglRectangle bounds = {0, 0, 0, 0};
+
+  if (! wt->filter)
+    return;
+
+  if (node)
+    {
+      /* update just this stroke */
+      bounds = gimp_warp_tool_get_stroke_bounds (node);
+    }
+  else if (wt->render_node)
+    {
+      node = gegl_node_get_producer (wt->render_node, "aux", NULL);
+
+      bounds = gimp_warp_tool_get_node_bounds (node);
+    }
+
+  if (! gegl_rectangle_is_empty (&bounds))
+    {
+#ifdef WARP_DEBUG
+  g_printerr ("update stroke: (%d,%d), %dx%d\n",
+              bounds.x, bounds.y,
+              bounds.width, bounds.height);
+#endif
+
+      gimp_warp_tool_update_area (wt, &bounds, FALSE);
+    }
+}
+
+static void
+gimp_warp_tool_stroke_append (GimpWarpTool *wt,
+                              gchar         type,
+                              gdouble       x,
+                              gdouble       y)
+{
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GeglRectangle    area;
+
+  if (! wt->filter)
+    return;
+
+  gegl_path_append (wt->current_stroke, type, x, y);
+
+  area.x      = floor (x - options->effect_size * 0.5);
+  area.y      = floor (y - options->effect_size * 0.5);
+  area.width  = ceil  (x + options->effect_size * 0.5) - area.x;
+  area.height = ceil  (y + options->effect_size * 0.5) - area.y;
+
+#ifdef WARP_DEBUG
+  g_printerr ("update rect: (%d,%d), %dx%d\n",
+              area.x, area.y,
+              area.width, area.height);
+#endif
+
+  if (wt->render_node)
+    {
+      GeglNode *node = gegl_node_get_producer (wt->render_node, "aux", NULL);
+
+      gimp_warp_tool_clear_node_bounds (node);
+
+      gimp_warp_tool_update_bounds (wt);
+    }
+
+  gimp_warp_tool_update_area (wt, &area, options->real_time_preview);
+}
+
+static void
+gimp_warp_tool_filter_flush (GimpDrawableFilter *filter,
+                             GimpTool           *tool)
+{
+  GimpImage *image = gimp_display_get_image (tool->display);
+
+  gimp_projection_flush (gimp_image_get_projection (image));
+}
+
+static void
+gimp_warp_tool_add_op (GimpWarpTool *wt,
+                       GeglNode     *op)
+{
+  GeglNode *last_op;
+
+  g_return_if_fail (GEGL_IS_NODE (wt->render_node));
+
+  gegl_node_add_child (wt->graph, op);
+
+  last_op = gegl_node_get_producer (wt->render_node, "aux", NULL);
+
+  gegl_node_disconnect (wt->render_node, "aux");
+  gegl_node_connect_to (last_op,         "output",
+                        op    ,          "input");
+  gegl_node_connect_to (op,              "output",
+                        wt->render_node, "aux");
+}
+
+static void
+gimp_warp_tool_remove_op (GimpWarpTool *wt,
+                          GeglNode     *op)
+{
+  GeglNode *previous;
+
+  g_return_if_fail (GEGL_IS_NODE (wt->render_node));
+
+  previous = gegl_node_get_producer (op, "input", NULL);
+
+  gegl_node_disconnect (op,              "input");
+  gegl_node_connect_to (previous,        "output",
+                        wt->render_node, "aux");
+
+  gegl_node_remove_child (wt->graph, op);
+}
+
+static void
+gimp_warp_tool_free_op (GeglNode *op)
+{
+  GeglNode *parent;
+
+  parent = gegl_node_get_parent (op);
+
+  gimp_assert (parent != NULL);
+
+  gegl_node_remove_child (parent, op);
+}
+
+static void
+gimp_warp_tool_animate (GimpWarpTool *wt)
+{
+  GimpTool        *tool    = GIMP_TOOL (wt);
+  GimpWarpOptions *options = GIMP_WARP_TOOL_GET_OPTIONS (wt);
+  GimpImage       *orig_image;
+  GimpImage       *image;
+  GimpLayer       *layer;
+  GimpLayer       *first_layer;
+  GeglNode        *scale_node;
+  GimpProgress    *progress;
+  GtkWidget       *widget;
+  gint             i;
+
+  if (! gimp_warp_tool_can_undo (tool, tool->display))
+    {
+      gimp_tool_message_literal (tool, tool->display,
+                                 _("Please add some warp strokes first."));
+      return;
+    }
+
+  /*  get rid of the image map so we can use wt->graph  */
+  if (wt->filter)
+    {
+      gimp_drawable_filter_abort (wt->filter);
+      g_clear_object (&wt->filter);
+    }
+
+  gimp_warp_tool_set_sampler (wt, /* commit = */ TRUE);
+
+  gimp_progress_start (GIMP_PROGRESS (tool), FALSE,
+                       _("Rendering Frame %d"), 1);
+
+  orig_image = gimp_item_get_image (GIMP_ITEM (tool->drawable));
+
+  image = gimp_create_image (orig_image->gimp,
+                             gimp_item_get_width  (GIMP_ITEM (tool->drawable)),
+                             gimp_item_get_height (GIMP_ITEM (tool->drawable)),
+                             gimp_drawable_get_base_type (tool->drawable),
+                             gimp_drawable_get_precision (tool->drawable),
+                             TRUE);
+
+  /*  the first frame is always the unwarped image  */
+  layer = GIMP_LAYER (gimp_item_convert (GIMP_ITEM (tool->drawable), image,
+                                         GIMP_TYPE_LAYER));
+  gimp_object_take_name (GIMP_OBJECT (layer),
+                         g_strdup_printf (_("Frame %d"), 1));
+
+  gimp_item_set_offset (GIMP_ITEM (layer), 0, 0);
+  gimp_item_set_visible (GIMP_ITEM (layer), TRUE, FALSE);
+  gimp_layer_set_mode (layer, gimp_image_get_default_new_layer_mode (image),
+                       FALSE);
+  gimp_layer_set_opacity (layer, GIMP_OPACITY_OPAQUE, FALSE);
+  gimp_image_add_layer (image, layer, NULL, 0, FALSE);
+
+  first_layer = layer;
+
+  scale_node = gegl_node_new_child (NULL,
+                                    "operation",    "gimp:scalar-multiply",
+                                    "n-components", 2,
+                                    NULL);
+  gimp_warp_tool_add_op (wt, scale_node);
+
+  progress = gimp_sub_progress_new (GIMP_PROGRESS (tool));
+
+  for (i = 1; i < options->n_animation_frames; i++)
+    {
+      gimp_progress_set_text (GIMP_PROGRESS (tool),
+                              _("Rendering Frame %d"), i + 1);
+
+      gimp_sub_progress_set_step (GIMP_SUB_PROGRESS (progress),
+                                  i, options->n_animation_frames);
+
+      layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (first_layer),
+                                               GIMP_TYPE_LAYER));
+      gimp_object_take_name (GIMP_OBJECT (layer),
+                             g_strdup_printf (_("Frame %d"), i + 1));
+
+      gegl_node_set (scale_node,
+                     "factor", (gdouble) i /
+                               (gdouble) (options->n_animation_frames - 1),
+                     NULL);
+
+      gimp_gegl_apply_operation (gimp_drawable_get_buffer (GIMP_DRAWABLE (first_layer)),
+                                 progress,
+                                 _("Frame"),
+                                 wt->graph,
+                                 gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                 NULL, FALSE);
+
+      gimp_image_add_layer (image, layer, NULL, 0, FALSE);
+    }
+
+  g_object_unref (progress);
+
+  gimp_warp_tool_remove_op (wt, scale_node);
+
+  gimp_progress_end (GIMP_PROGRESS (tool));
+
+  /*  recreate the image map  */
+  gimp_warp_tool_create_filter (wt, tool->drawable);
+  gimp_warp_tool_update_stroke (wt, NULL);
+
+  widget = GTK_WIDGET (gimp_display_get_shell (tool->display));
+  gimp_create_display (orig_image->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                       G_OBJECT (gtk_widget_get_screen (widget)),
+                       gimp_widget_get_monitor (widget));
+  g_object_unref (image);
+}
diff --git a/app/tools/gimpwarptool.h b/app/tools/gimpwarptool.h
new file mode 100644
index 0000000..ad2e390
--- /dev/null
+++ b/app/tools/gimpwarptool.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpwarptool.h
+ * Copyright (C) 2011 Michael Muré <batolettre@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_WARP_TOOL_H__
+#define __GIMP_WARP_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+
+
+#define GIMP_TYPE_WARP_TOOL            (gimp_warp_tool_get_type ())
+#define GIMP_WARP_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WARP_TOOL, GimpWarpTool))
+#define GIMP_WARP_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_WARP_TOOL, GimpWarpToolClass))
+#define GIMP_IS_WARP_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_WARP_TOOL))
+#define GIMP_IS_WARP_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_WARP_TOOL))
+#define GIMP_WARP_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_WARP_TOOL, GimpWarpToolClass))
+
+#define GIMP_WARP_TOOL_GET_OPTIONS(t)  (GIMP_WARP_OPTIONS (gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpWarpTool      GimpWarpTool;
+typedef struct _GimpWarpToolClass GimpWarpToolClass;
+
+struct _GimpWarpTool
+{
+  GimpDrawTool        parent_instance;
+
+  gboolean            show_cursor;
+  gboolean            draw_brush;
+  gboolean            snap_brush;
+
+  GimpVector2         cursor_pos;    /* Hold the cursor position */
+
+  GeglBuffer         *coords_buffer; /* Buffer where coordinates are stored */
+
+  GeglNode           *graph;         /* Top level GeglNode */
+  GeglNode           *render_node;   /* Node to render the transformation */
+
+  GeglPath           *current_stroke;
+  guint               stroke_timer;
+
+  GimpVector2         last_pos;
+  gdouble             total_dist;
+
+  GimpDrawableFilter *filter;
+
+  GList              *redo_stack;
+};
+
+struct _GimpWarpToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+
+void    gimp_warp_tool_register (GimpToolRegisterCallback  callback,
+                                 gpointer                  data);
+
+GType   gimp_warp_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_WARP_TOOL_H__  */
diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c
new file mode 100644
index 0000000..3b8bc88
--- /dev/null
+++ b/app/tools/tool_manager.c
@@ -0,0 +1,966 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "tools-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimpimage.h"
+#include "core/gimptoolgroup.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+#include "core/gimptoolpreset.h"
+
+#include "display/gimpdisplay.h"
+
+#include "widgets/gimpcairo-wilber.h"
+
+#include "gimptool.h"
+#include "gimptoolcontrol.h"
+#include "tool_manager.h"
+
+
+typedef struct _GimpToolManager GimpToolManager;
+
+struct _GimpToolManager
+{
+  Gimp          *gimp;
+
+  GimpTool      *active_tool;
+  GSList        *tool_stack;
+
+  GimpToolGroup *active_tool_group;
+
+  GQuark         image_clean_handler_id;
+  GQuark         image_dirty_handler_id;
+  GQuark         image_saving_handler_id;
+};
+
+
+/*  local function prototypes  */
+
+static void              tool_manager_set                       (Gimp            *gimp,
+                                                                 GimpToolManager *tool_manager);
+static GimpToolManager * tool_manager_get                       (Gimp            *gimp);
+
+static void              tool_manager_select_tool               (GimpToolManager *tool_manager,
+                                                                 GimpTool        *tool);
+
+static void              tool_manager_set_active_tool_group     (GimpToolManager *tool_manager,
+                                                                 GimpToolGroup   *tool_group);
+
+static void              tool_manager_tool_changed              (GimpContext     *user_context,
+                                                                 GimpToolInfo    *tool_info,
+                                                                 GimpToolManager *tool_manager);
+static void              tool_manager_preset_changed            (GimpContext     *user_context,
+                                                                 GimpToolPreset  *preset,
+                                                                 GimpToolManager *tool_manager);
+static void              tool_manager_image_clean_dirty         (GimpImage       *image,
+                                                                 GimpDirtyMask    dirty_mask,
+                                                                 GimpToolManager *tool_manager);
+static void              tool_manager_image_saving              (GimpImage       *image,
+                                                                 GimpToolManager *tool_manager);
+static void              tool_manager_tool_ancestry_changed     (GimpToolInfo    *tool_info,
+                                                                 GimpToolManager *tool_manager);
+static void              tool_manager_group_active_tool_changed (GimpToolGroup   *tool_group,
+                                                                 GimpToolManager *tool_manager);
+
+static void              tool_manager_cast_spell                (GimpToolInfo    *tool_info);
+
+
+/*  public functions  */
+
+void
+tool_manager_init (Gimp *gimp)
+{
+  GimpToolManager *tool_manager;
+  GimpContext     *user_context;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = g_slice_new0 (GimpToolManager);
+
+  tool_manager->gimp                    = gimp;
+  tool_manager->active_tool             = NULL;
+  tool_manager->tool_stack              = NULL;
+  tool_manager->active_tool_group       = NULL;
+  tool_manager->image_clean_handler_id  = 0;
+  tool_manager->image_dirty_handler_id  = 0;
+  tool_manager->image_saving_handler_id = 0;
+
+  tool_manager_set (gimp, tool_manager);
+
+  tool_manager->image_clean_handler_id =
+    gimp_container_add_handler (gimp->images, "clean",
+                                G_CALLBACK (tool_manager_image_clean_dirty),
+                                tool_manager);
+
+  tool_manager->image_dirty_handler_id =
+    gimp_container_add_handler (gimp->images, "dirty",
+                                G_CALLBACK (tool_manager_image_clean_dirty),
+                                tool_manager);
+
+  tool_manager->image_saving_handler_id =
+    gimp_container_add_handler (gimp->images, "saving",
+                                G_CALLBACK (tool_manager_image_saving),
+                                tool_manager);
+
+  user_context = gimp_get_user_context (gimp);
+
+  g_signal_connect (user_context, "tool-changed",
+                    G_CALLBACK (tool_manager_tool_changed),
+                    tool_manager);
+  g_signal_connect (user_context, "tool-preset-changed",
+                    G_CALLBACK (tool_manager_preset_changed),
+                    tool_manager);
+
+  tool_manager_tool_changed (user_context,
+                             gimp_context_get_tool (user_context),
+                             tool_manager);
+}
+
+void
+tool_manager_exit (Gimp *gimp)
+{
+  GimpToolManager *tool_manager;
+  GimpContext     *user_context;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+  tool_manager_set (gimp, NULL);
+
+  user_context = gimp_get_user_context (gimp);
+
+  g_signal_handlers_disconnect_by_func (user_context,
+                                        tool_manager_tool_changed,
+                                        tool_manager);
+  g_signal_handlers_disconnect_by_func (user_context,
+                                        tool_manager_preset_changed,
+                                        tool_manager);
+
+  gimp_container_remove_handler (gimp->images,
+                                 tool_manager->image_clean_handler_id);
+  gimp_container_remove_handler (gimp->images,
+                                 tool_manager->image_dirty_handler_id);
+  gimp_container_remove_handler (gimp->images,
+                                 tool_manager->image_saving_handler_id);
+
+  if (tool_manager->active_tool)
+    {
+      g_signal_handlers_disconnect_by_func (
+        tool_manager->active_tool->tool_info,
+        tool_manager_tool_ancestry_changed,
+        tool_manager);
+
+      g_clear_object (&tool_manager->active_tool);
+    }
+
+  tool_manager_set_active_tool_group (tool_manager, NULL);
+
+  g_slice_free (GimpToolManager, tool_manager);
+}
+
+GimpTool *
+tool_manager_get_active (Gimp *gimp)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  tool_manager = tool_manager_get (gimp);
+
+  return tool_manager->active_tool;
+}
+
+void
+tool_manager_push_tool (Gimp     *gimp,
+                        GimpTool *tool)
+{
+  GimpToolManager *tool_manager;
+  GimpDisplay     *focus_display = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_TOOL (tool));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      focus_display = tool_manager->active_tool->focus_display;
+
+      tool_manager->tool_stack = g_slist_prepend (tool_manager->tool_stack,
+                                                  tool_manager->active_tool);
+
+      g_object_ref (tool_manager->tool_stack->data);
+    }
+
+  tool_manager_select_tool (tool_manager, tool);
+
+  if (focus_display)
+    tool_manager_focus_display_active (gimp, focus_display);
+}
+
+void
+tool_manager_pop_tool (Gimp *gimp)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->tool_stack)
+    {
+      GimpTool *tool = tool_manager->tool_stack->data;
+
+      tool_manager->tool_stack = g_slist_remove (tool_manager->tool_stack,
+                                                 tool);
+
+      tool_manager_select_tool (tool_manager, tool);
+
+      g_object_unref (tool);
+    }
+}
+
+gboolean
+tool_manager_initialize_active (Gimp        *gimp,
+                                GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      GimpTool *tool = tool_manager->active_tool;
+
+      if (gimp_tool_initialize (tool, display))
+        {
+          GimpImage *image = gimp_display_get_image (display);
+
+          tool->drawable = gimp_image_get_active_drawable (image);
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+void
+tool_manager_control_active (Gimp           *gimp,
+                             GimpToolAction  action,
+                             GimpDisplay    *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      GimpTool *tool = tool_manager->active_tool;
+
+      if (display && gimp_tool_has_display (tool, display))
+        {
+          gimp_tool_control (tool, action, display);
+        }
+      else if (action == GIMP_TOOL_ACTION_HALT)
+        {
+          if (gimp_tool_control_is_active (tool->control))
+            gimp_tool_control_halt (tool->control);
+        }
+    }
+}
+
+void
+tool_manager_button_press_active (Gimp                *gimp,
+                                  const GimpCoords    *coords,
+                                  guint32              time,
+                                  GdkModifierType      state,
+                                  GimpButtonPressType  press_type,
+                                  GimpDisplay         *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      gimp_tool_button_press (tool_manager->active_tool,
+                              coords, time, state, press_type,
+                              display);
+    }
+}
+
+void
+tool_manager_button_release_active (Gimp             *gimp,
+                                    const GimpCoords *coords,
+                                    guint32           time,
+                                    GdkModifierType   state,
+                                    GimpDisplay      *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      gimp_tool_button_release (tool_manager->active_tool,
+                                coords, time, state,
+                                display);
+    }
+}
+
+void
+tool_manager_motion_active (Gimp             *gimp,
+                            const GimpCoords *coords,
+                            guint32           time,
+                            GdkModifierType   state,
+                            GimpDisplay      *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      gimp_tool_motion (tool_manager->active_tool,
+                        coords, time, state,
+                        display);
+    }
+}
+
+gboolean
+tool_manager_key_press_active (Gimp        *gimp,
+                               GdkEventKey *kevent,
+                               GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_key_press (tool_manager->active_tool,
+                                  kevent,
+                                  display);
+    }
+
+  return FALSE;
+}
+
+gboolean
+tool_manager_key_release_active (Gimp        *gimp,
+                                 GdkEventKey *kevent,
+                                 GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_key_release (tool_manager->active_tool,
+                                    kevent,
+                                    display);
+    }
+
+  return FALSE;
+}
+
+void
+tool_manager_focus_display_active (Gimp        *gimp,
+                                   GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool &&
+      ! gimp_tool_control_is_active (tool_manager->active_tool->control))
+    {
+      gimp_tool_set_focus_display (tool_manager->active_tool,
+                                   display);
+    }
+}
+
+void
+tool_manager_modifier_state_active (Gimp            *gimp,
+                                    GdkModifierType  state,
+                                    GimpDisplay     *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool &&
+      ! gimp_tool_control_is_active (tool_manager->active_tool->control))
+    {
+      gimp_tool_set_modifier_state (tool_manager->active_tool,
+                                    state,
+                                    display);
+    }
+}
+
+void
+tool_manager_active_modifier_state_active (Gimp            *gimp,
+                                           GdkModifierType  state,
+                                           GimpDisplay     *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      gimp_tool_set_active_modifier_state (tool_manager->active_tool,
+                                           state,
+                                           display);
+    }
+}
+
+void
+tool_manager_oper_update_active (Gimp             *gimp,
+                                 const GimpCoords *coords,
+                                 GdkModifierType   state,
+                                 gboolean          proximity,
+                                 GimpDisplay      *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool &&
+      ! gimp_tool_control_is_active (tool_manager->active_tool->control))
+    {
+      gimp_tool_oper_update (tool_manager->active_tool,
+                             coords, state, proximity,
+                             display);
+    }
+}
+
+void
+tool_manager_cursor_update_active (Gimp             *gimp,
+                                   const GimpCoords *coords,
+                                   GdkModifierType   state,
+                                   GimpDisplay      *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool &&
+      ! gimp_tool_control_is_active (tool_manager->active_tool->control))
+    {
+      gimp_tool_cursor_update (tool_manager->active_tool,
+                               coords, state,
+                               display);
+    }
+}
+
+const gchar *
+tool_manager_can_undo_active (Gimp        *gimp,
+                              GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_can_undo (tool_manager->active_tool,
+                                 display);
+    }
+
+  return NULL;
+}
+
+const gchar *
+tool_manager_can_redo_active (Gimp        *gimp,
+                              GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_can_redo (tool_manager->active_tool,
+                                 display);
+    }
+
+  return NULL;
+}
+
+gboolean
+tool_manager_undo_active (Gimp        *gimp,
+                          GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_undo (tool_manager->active_tool,
+                             display);
+    }
+
+  return FALSE;
+}
+
+gboolean
+tool_manager_redo_active (Gimp        *gimp,
+                          GimpDisplay *display)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_redo (tool_manager->active_tool,
+                             display);
+    }
+
+  return FALSE;
+}
+
+GimpUIManager *
+tool_manager_get_popup_active (Gimp             *gimp,
+                               const GimpCoords *coords,
+                               GdkModifierType   state,
+                               GimpDisplay      *display,
+                               const gchar     **ui_path)
+{
+  GimpToolManager *tool_manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  tool_manager = tool_manager_get (gimp);
+
+  if (tool_manager->active_tool)
+    {
+      return gimp_tool_get_popup (tool_manager->active_tool,
+                                  coords, state,
+                                  display,
+                                  ui_path);
+    }
+
+  return NULL;
+}
+
+
+/*  private functions  */
+
+static GQuark tool_manager_quark = 0;
+
+static void
+tool_manager_set (Gimp            *gimp,
+                  GimpToolManager *tool_manager)
+{
+  if (! tool_manager_quark)
+    tool_manager_quark = g_quark_from_static_string ("gimp-tool-manager");
+
+  g_object_set_qdata (G_OBJECT (gimp), tool_manager_quark, tool_manager);
+}
+
+static GimpToolManager *
+tool_manager_get (Gimp *gimp)
+{
+  if (! tool_manager_quark)
+    tool_manager_quark = g_quark_from_static_string ("gimp-tool-manager");
+
+  return g_object_get_qdata (G_OBJECT (gimp), tool_manager_quark);
+}
+
+static void
+tool_manager_select_tool (GimpToolManager *tool_manager,
+                          GimpTool        *tool)
+{
+  Gimp *gimp = tool_manager->gimp;
+
+  /*  reset the previously selected tool, but only if it is not only
+   *  temporarily pushed to the tool stack
+   */
+  if (tool_manager->active_tool)
+    {
+      if (! tool_manager->tool_stack ||
+          tool_manager->active_tool != tool_manager->tool_stack->data)
+        {
+          GimpTool    *active_tool = tool_manager->active_tool;
+          GimpDisplay *display;
+
+          /*  NULL image returns any display (if there is any)  */
+          display = gimp_tool_has_image (active_tool, NULL);
+
+          tool_manager_control_active (gimp, GIMP_TOOL_ACTION_HALT, display);
+          tool_manager_focus_display_active (gimp, NULL);
+        }
+    }
+
+  g_set_object (&tool_manager->active_tool, tool);
+}
+
+static void
+tool_manager_set_active_tool_group (GimpToolManager *tool_manager,
+                                    GimpToolGroup   *tool_group)
+{
+  if (tool_group != tool_manager->active_tool_group)
+    {
+      if (tool_manager->active_tool_group)
+        {
+          g_signal_handlers_disconnect_by_func (
+            tool_manager->active_tool_group,
+            tool_manager_group_active_tool_changed,
+            tool_manager);
+        }
+
+      g_set_weak_pointer (&tool_manager->active_tool_group, tool_group);
+
+      if (tool_manager->active_tool_group)
+        {
+          g_signal_connect (
+            tool_manager->active_tool_group, "active-tool-changed",
+            G_CALLBACK (tool_manager_group_active_tool_changed),
+            tool_manager);
+        }
+    }
+}
+
+static void
+tool_manager_tool_changed (GimpContext     *user_context,
+                           GimpToolInfo    *tool_info,
+                           GimpToolManager *tool_manager)
+{
+  GimpTool *new_tool = NULL;
+
+  if (! tool_info)
+    return;
+
+  if (! g_type_is_a (tool_info->tool_type, GIMP_TYPE_TOOL))
+    {
+      g_warning ("%s: tool_info->tool_type is no GimpTool subclass",
+                 G_STRFUNC);
+      return;
+    }
+
+  /* FIXME: gimp_busy HACK */
+  if (user_context->gimp->busy)
+    {
+      /*  there may be contexts waiting for the user_context's "tool-changed"
+       *  signal, so stop emitting it.
+       */
+      g_signal_stop_emission_by_name (user_context, "tool-changed");
+
+      if (G_TYPE_FROM_INSTANCE (tool_manager->active_tool) !=
+          tool_info->tool_type)
+        {
+          g_signal_handlers_block_by_func (user_context,
+                                           tool_manager_tool_changed,
+                                           tool_manager);
+
+          /*  explicitly set the current tool  */
+          gimp_context_set_tool (user_context,
+                                 tool_manager->active_tool->tool_info);
+
+          g_signal_handlers_unblock_by_func (user_context,
+                                             tool_manager_tool_changed,
+                                             tool_manager);
+        }
+
+      return;
+    }
+
+  g_return_if_fail (tool_manager->tool_stack == NULL);
+
+  if (tool_manager->active_tool)
+    {
+      GimpTool    *active_tool = tool_manager->active_tool;
+      GimpDisplay *display;
+
+      /*  NULL image returns any display (if there is any)  */
+      display = gimp_tool_has_image (active_tool, NULL);
+
+      /*  commit the old tool's operation before creating the new tool
+       *  because creating a tool might mess with the old tool's
+       *  options (old and new tool might be the same)
+       */
+      if (display)
+        tool_manager_control_active (user_context->gimp, GIMP_TOOL_ACTION_COMMIT,
+                                     display);
+
+      g_signal_handlers_disconnect_by_func (active_tool->tool_info,
+                                            tool_manager_tool_ancestry_changed,
+                                            tool_manager);
+    }
+
+  g_signal_connect (tool_info, "ancestry-changed",
+                    G_CALLBACK (tool_manager_tool_ancestry_changed),
+                    tool_manager);
+
+  tool_manager_tool_ancestry_changed (tool_info, tool_manager);
+
+  new_tool = g_object_new (tool_info->tool_type,
+                           "tool-info", tool_info,
+                           NULL);
+
+  tool_manager_select_tool (tool_manager, new_tool);
+
+  g_object_unref (new_tool);
+
+  /* ??? */
+  tool_manager_cast_spell (tool_info);
+}
+
+static void
+tool_manager_copy_tool_options (GObject *src,
+                                GObject *dest)
+{
+  GList *diff;
+
+  diff = gimp_config_diff (src, dest, G_PARAM_READWRITE);
+
+  if (diff)
+    {
+      GList *list;
+
+      g_object_freeze_notify (dest);
+
+      for (list = diff; list; list = list->next)
+        {
+          GParamSpec *prop_spec = list->data;
+
+          if (g_type_is_a (prop_spec->owner_type, GIMP_TYPE_TOOL_OPTIONS) &&
+              ! (prop_spec->flags & G_PARAM_CONSTRUCT_ONLY))
+            {
+              GValue value = G_VALUE_INIT;
+
+              g_value_init (&value, prop_spec->value_type);
+
+              g_object_get_property (src,  prop_spec->name, &value);
+              g_object_set_property (dest, prop_spec->name, &value);
+
+              g_value_unset (&value);
+            }
+        }
+
+      g_object_thaw_notify (dest);
+
+      g_list_free (diff);
+    }
+}
+
+static void
+tool_manager_preset_changed (GimpContext     *user_context,
+                             GimpToolPreset  *preset,
+                             GimpToolManager *tool_manager)
+{
+  GimpToolInfo *preset_tool;
+
+  if (! preset || user_context->gimp->busy)
+    return;
+
+  preset_tool = gimp_context_get_tool (GIMP_CONTEXT (preset->tool_options));
+
+  /* first, select the preset's tool, even if it's already the active
+   * tool
+   */
+  gimp_context_set_tool (user_context, preset_tool);
+
+  /* then, copy the context properties the preset remembers, possibly
+   * changing some tool options due to the "link brush stuff to brush
+   * defaults" settings in gimptooloptions.c
+   */
+  gimp_context_copy_properties (GIMP_CONTEXT (preset->tool_options),
+                                user_context,
+                                gimp_tool_preset_get_prop_mask (preset));
+
+  /* finally, copy all tool options properties, overwriting any
+   * changes resulting from setting the context properties above, we
+   * really want exactly what is in the preset and nothing else
+   */
+  tool_manager_copy_tool_options (G_OBJECT (preset->tool_options),
+                                  G_OBJECT (preset_tool->tool_options));
+}
+
+static void
+tool_manager_image_clean_dirty (GimpImage       *image,
+                                GimpDirtyMask    dirty_mask,
+                                GimpToolManager *tool_manager)
+{
+  GimpTool *tool = tool_manager->active_tool;
+
+  if (tool &&
+      ! gimp_tool_control_get_preserve (tool->control) &&
+      (gimp_tool_control_get_dirty_mask (tool->control) & dirty_mask))
+    {
+      GimpDisplay *display = gimp_tool_has_image (tool, image);
+
+      if (display)
+        {
+          tool_manager_control_active (
+            image->gimp,
+            gimp_tool_control_get_dirty_action (tool->control),
+            display);
+        }
+    }
+}
+
+static void
+tool_manager_image_saving (GimpImage       *image,
+                           GimpToolManager *tool_manager)
+{
+  GimpTool *tool = tool_manager->active_tool;
+
+  if (tool &&
+      ! gimp_tool_control_get_preserve (tool->control))
+    {
+      GimpDisplay *display = gimp_tool_has_image (tool, image);
+
+      if (display)
+        tool_manager_control_active (image->gimp, GIMP_TOOL_ACTION_COMMIT,
+                                     display);
+    }
+}
+
+static void
+tool_manager_tool_ancestry_changed (GimpToolInfo    *tool_info,
+                                    GimpToolManager *tool_manager)
+{
+  GimpViewable *parent;
+
+  parent = gimp_viewable_get_parent (GIMP_VIEWABLE (tool_info));
+
+  if (parent)
+    {
+      gimp_tool_group_set_active_tool_info (GIMP_TOOL_GROUP (parent),
+                                            tool_info);
+    }
+
+  tool_manager_set_active_tool_group (tool_manager, GIMP_TOOL_GROUP (parent));
+}
+
+static void
+tool_manager_group_active_tool_changed (GimpToolGroup   *tool_group,
+                                        GimpToolManager *tool_manager)
+{
+  gimp_context_set_tool (tool_manager->gimp->user_context,
+                         gimp_tool_group_get_active_tool_info (tool_group));
+}
+
+static void
+tool_manager_cast_spell (GimpToolInfo *tool_info)
+{
+  typedef struct
+  {
+    const gchar *sequence;
+    GCallback    func;
+  } Spell;
+
+  static const Spell spells[] =
+  {
+    { .sequence = "gimp-warp-tool\0"
+                  "gimp-iscissors-tool\0"
+                  "gimp-gradient-tool\0"
+                  "gimp-vector-tool\0"
+                  "gimp-ellipse-select-tool\0"
+                  "gimp-rect-select-tool\0",
+      .func     = gimp_cairo_wilber_toggle_pointer_eyes
+    }
+  };
+
+  static const gchar *spell_progress[G_N_ELEMENTS (spells)];
+  const gchar        *tool_name;
+  gint                i;
+
+  tool_name = gimp_object_get_name (GIMP_OBJECT (tool_info));
+
+  for (i = 0; i < G_N_ELEMENTS (spells); i++)
+    {
+      if (! spell_progress[i])
+        spell_progress[i] = spells[i].sequence;
+
+      while (spell_progress[i])
+        {
+          if (! strcmp (tool_name, spell_progress[i]))
+            {
+              spell_progress[i] += strlen (spell_progress[i]) + 1;
+
+              if (! *spell_progress[i])
+                {
+                  spell_progress[i] = NULL;
+
+                  spells[i].func ();
+                }
+
+              break;
+            }
+          else
+            {
+              if (spell_progress[i] == spells[i].sequence)
+                spell_progress[i] = NULL;
+              else
+                spell_progress[i] = spells[i].sequence;
+            }
+        }
+    }
+}
diff --git a/app/tools/tool_manager.h b/app/tools/tool_manager.h
new file mode 100644
index 0000000..2f406a1
--- /dev/null
+++ b/app/tools/tool_manager.h
@@ -0,0 +1,96 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOL_MANAGER_H__
+#define __TOOL_MANAGER_H__
+
+
+void       tool_manager_init                       (Gimp             *gimp);
+void       tool_manager_exit                       (Gimp             *gimp);
+
+GimpTool * tool_manager_get_active                 (Gimp             *gimp);
+
+void       tool_manager_push_tool                  (Gimp             *gimp,
+                                                    GimpTool         *tool);
+void       tool_manager_pop_tool                   (Gimp             *gimp);
+
+
+gboolean   tool_manager_initialize_active          (Gimp             *gimp,
+                                                    GimpDisplay      *display);
+void       tool_manager_control_active             (Gimp             *gimp,
+                                                    GimpToolAction    action,
+                                                    GimpDisplay      *display);
+void       tool_manager_button_press_active        (Gimp             *gimp,
+                                                    const GimpCoords *coords,
+                                                    guint32           time,
+                                                    GdkModifierType   state,
+                                                    GimpButtonPressType press_type,
+                                                    GimpDisplay      *display);
+void       tool_manager_button_release_active      (Gimp             *gimp,
+                                                    const GimpCoords *coords,
+                                                    guint32           time,
+                                                    GdkModifierType   state,
+                                                    GimpDisplay      *display);
+void       tool_manager_motion_active              (Gimp             *gimp,
+                                                    const GimpCoords *coords,
+                                                    guint32           time,
+                                                    GdkModifierType   state,
+                                                    GimpDisplay      *display);
+gboolean   tool_manager_key_press_active           (Gimp             *gimp,
+                                                    GdkEventKey      *kevent,
+                                                    GimpDisplay      *display);
+gboolean   tool_manager_key_release_active         (Gimp             *gimp,
+                                                    GdkEventKey      *kevent,
+                                                    GimpDisplay      *display);
+
+void       tool_manager_focus_display_active       (Gimp             *gimp,
+                                                    GimpDisplay      *display);
+void       tool_manager_modifier_state_active      (Gimp             *gimp,
+                                                    GdkModifierType   state,
+                                                    GimpDisplay      *display);
+
+void     tool_manager_active_modifier_state_active (Gimp             *gimp,
+                                                    GdkModifierType   state,
+                                                    GimpDisplay      *display);
+
+void       tool_manager_oper_update_active         (Gimp             *gimp,
+                                                    const GimpCoords *coords,
+                                                    GdkModifierType   state,
+                                                    gboolean          proximity,
+                                                    GimpDisplay      *display);
+void       tool_manager_cursor_update_active       (Gimp             *gimp,
+                                                    const GimpCoords *coords,
+                                                    GdkModifierType   state,
+                                                    GimpDisplay      *display);
+
+const gchar   * tool_manager_can_undo_active       (Gimp             *gimp,
+                                                    GimpDisplay      *display);
+const gchar   * tool_manager_can_redo_active       (Gimp             *gimp,
+                                                    GimpDisplay      *display);
+gboolean        tool_manager_undo_active           (Gimp             *gimp,
+                                                    GimpDisplay      *display);
+gboolean        tool_manager_redo_active           (Gimp             *gimp,
+                                                    GimpDisplay      *display);
+
+GimpUIManager * tool_manager_get_popup_active      (Gimp             *gimp,
+                                                    const GimpCoords *coords,
+                                                    GdkModifierType   state,
+                                                    GimpDisplay      *display,
+                                                    const gchar     **ui_path);
+
+
+#endif  /*  __TOOL_MANAGER_H__  */
diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c
new file mode 100644
index 0000000..5e637e9
--- /dev/null
+++ b/app/tools/tools-enums.c
@@ -0,0 +1,342 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gio/gio.h>
+#include "libgimpbase/gimpbase.h"
+#include "core/core-enums.h"
+#include "tools-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "tools-enums.h" */
+GType
+gimp_bucket_fill_area_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_BUCKET_FILL_SELECTION, "GIMP_BUCKET_FILL_SELECTION", "selection" },
+    { GIMP_BUCKET_FILL_SIMILAR_COLORS, "GIMP_BUCKET_FILL_SIMILAR_COLORS", "similar-colors" },
+    { GIMP_BUCKET_FILL_LINE_ART, "GIMP_BUCKET_FILL_LINE_ART", "line-art" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_BUCKET_FILL_SELECTION, NC_("bucket-fill-area", "Fill whole selection"), NULL },
+    { GIMP_BUCKET_FILL_SIMILAR_COLORS, NC_("bucket-fill-area", "Fill similar colors"), NULL },
+    { GIMP_BUCKET_FILL_LINE_ART, NC_("bucket-fill-area", "Fill by line art detection"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpBucketFillArea", values);
+      gimp_type_set_translation_context (type, "bucket-fill-area");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_line_art_source_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_LINE_ART_SOURCE_SAMPLE_MERGED, "GIMP_LINE_ART_SOURCE_SAMPLE_MERGED", "sample-merged" },
+    { GIMP_LINE_ART_SOURCE_ACTIVE_LAYER, "GIMP_LINE_ART_SOURCE_ACTIVE_LAYER", "active-layer" },
+    { GIMP_LINE_ART_SOURCE_LOWER_LAYER, "GIMP_LINE_ART_SOURCE_LOWER_LAYER", "lower-layer" },
+    { GIMP_LINE_ART_SOURCE_UPPER_LAYER, "GIMP_LINE_ART_SOURCE_UPPER_LAYER", "upper-layer" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_LINE_ART_SOURCE_SAMPLE_MERGED, NC_("line-art-source", "All visible layers"), NULL },
+    { GIMP_LINE_ART_SOURCE_ACTIVE_LAYER, NC_("line-art-source", "Active layer"), NULL },
+    { GIMP_LINE_ART_SOURCE_LOWER_LAYER, NC_("line-art-source", "Layer below the active one"), NULL },
+    { GIMP_LINE_ART_SOURCE_UPPER_LAYER, NC_("line-art-source", "Layer above the active one"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpLineArtSource", values);
+      gimp_type_set_translation_context (type, "line-art-source");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_rect_select_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_RECT_SELECT_MODE_FREE, "GIMP_RECT_SELECT_MODE_FREE", "free" },
+    { GIMP_RECT_SELECT_MODE_FIXED_SIZE, "GIMP_RECT_SELECT_MODE_FIXED_SIZE", "fixed-size" },
+    { GIMP_RECT_SELECT_MODE_FIXED_RATIO, "GIMP_RECT_SELECT_MODE_FIXED_RATIO", "fixed-ratio" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_RECT_SELECT_MODE_FREE, NC_("rect-select-mode", "Free select"), NULL },
+    { GIMP_RECT_SELECT_MODE_FIXED_SIZE, NC_("rect-select-mode", "Fixed size"), NULL },
+    { GIMP_RECT_SELECT_MODE_FIXED_RATIO, NC_("rect-select-mode", "Fixed aspect ratio"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpRectSelectMode", values);
+      gimp_type_set_translation_context (type, "rect-select-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_transform_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TRANSFORM_TYPE_LAYER, "GIMP_TRANSFORM_TYPE_LAYER", "layer" },
+    { GIMP_TRANSFORM_TYPE_SELECTION, "GIMP_TRANSFORM_TYPE_SELECTION", "selection" },
+    { GIMP_TRANSFORM_TYPE_PATH, "GIMP_TRANSFORM_TYPE_PATH", "path" },
+    { GIMP_TRANSFORM_TYPE_IMAGE, "GIMP_TRANSFORM_TYPE_IMAGE", "image" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TRANSFORM_TYPE_LAYER, NC_("transform-type", "Layer"), NULL },
+    { GIMP_TRANSFORM_TYPE_SELECTION, NC_("transform-type", "Selection"), NULL },
+    { GIMP_TRANSFORM_TYPE_PATH, NC_("transform-type", "Path"), NULL },
+    { GIMP_TRANSFORM_TYPE_IMAGE, NC_("transform-type", "Image"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTransformType", values);
+      gimp_type_set_translation_context (type, "transform-type");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_tool_action_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TOOL_ACTION_PAUSE, "GIMP_TOOL_ACTION_PAUSE", "pause" },
+    { GIMP_TOOL_ACTION_RESUME, "GIMP_TOOL_ACTION_RESUME", "resume" },
+    { GIMP_TOOL_ACTION_HALT, "GIMP_TOOL_ACTION_HALT", "halt" },
+    { GIMP_TOOL_ACTION_COMMIT, "GIMP_TOOL_ACTION_COMMIT", "commit" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TOOL_ACTION_PAUSE, "GIMP_TOOL_ACTION_PAUSE", NULL },
+    { GIMP_TOOL_ACTION_RESUME, "GIMP_TOOL_ACTION_RESUME", NULL },
+    { GIMP_TOOL_ACTION_HALT, "GIMP_TOOL_ACTION_HALT", NULL },
+    { GIMP_TOOL_ACTION_COMMIT, "GIMP_TOOL_ACTION_COMMIT", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpToolAction", values);
+      gimp_type_set_translation_context (type, "tool-action");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_tool_active_modifiers_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TOOL_ACTIVE_MODIFIERS_OFF, "GIMP_TOOL_ACTIVE_MODIFIERS_OFF", "off" },
+    { GIMP_TOOL_ACTIVE_MODIFIERS_SAME, "GIMP_TOOL_ACTIVE_MODIFIERS_SAME", "same" },
+    { GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE, "GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE", "separate" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TOOL_ACTIVE_MODIFIERS_OFF, "GIMP_TOOL_ACTIVE_MODIFIERS_OFF", NULL },
+    { GIMP_TOOL_ACTIVE_MODIFIERS_SAME, "GIMP_TOOL_ACTIVE_MODIFIERS_SAME", NULL },
+    { GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE, "GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpToolActiveModifiers", values);
+      gimp_type_set_translation_context (type, "tool-active-modifiers");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_matting_draw_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_MATTING_DRAW_MODE_FOREGROUND, "GIMP_MATTING_DRAW_MODE_FOREGROUND", "foreground" },
+    { GIMP_MATTING_DRAW_MODE_BACKGROUND, "GIMP_MATTING_DRAW_MODE_BACKGROUND", "background" },
+    { GIMP_MATTING_DRAW_MODE_UNKNOWN, "GIMP_MATTING_DRAW_MODE_UNKNOWN", "unknown" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_MATTING_DRAW_MODE_FOREGROUND, NC_("matting-draw-mode", "Draw foreground"), NULL },
+    { GIMP_MATTING_DRAW_MODE_BACKGROUND, NC_("matting-draw-mode", "Draw background"), NULL },
+    { GIMP_MATTING_DRAW_MODE_UNKNOWN, NC_("matting-draw-mode", "Draw unknown"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpMattingDrawMode", values);
+      gimp_type_set_translation_context (type, "matting-draw-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_matting_preview_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_MATTING_PREVIEW_MODE_ON_COLOR, "GIMP_MATTING_PREVIEW_MODE_ON_COLOR", "on-color" },
+    { GIMP_MATTING_PREVIEW_MODE_GRAYSCALE, "GIMP_MATTING_PREVIEW_MODE_GRAYSCALE", "grayscale" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_MATTING_PREVIEW_MODE_ON_COLOR, NC_("matting-preview-mode", "Color"), NULL },
+    { GIMP_MATTING_PREVIEW_MODE_GRAYSCALE, NC_("matting-preview-mode", "Grayscale"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpMattingPreviewMode", values);
+      gimp_type_set_translation_context (type, "matting-preview-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_transform_3d_lens_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH, "GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH", "focal-length" },
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE, "GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE", "fov-image" },
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM, "GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM", "fov-item" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH, NC_("3-dtrasnform-lens-mode", "Focal length"), NULL },
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE, NC_("3-dtrasnform-lens-mode", "Field of view (relative to image)"), NULL },
+    /* Translators: this is an abbreviated version of "Field of view (relative to image)".
+       Keep it short. */
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE, NC_("3-dtrasnform-lens-mode", "FOV (image)"), NULL },
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM, NC_("3-dtrasnform-lens-mode", "Field of view (relative to item)"), NULL },
+    /* Translators: this is an abbreviated version of "Field of view (relative to item)".
+       Keep it short. */
+    { GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM, NC_("3-dtrasnform-lens-mode", "FOV (item)"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("Gimp3DTrasnformLensMode", values);
+      gimp_type_set_translation_context (type, "3-dtrasnform-lens-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_warp_behavior_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_WARP_BEHAVIOR_MOVE, "GIMP_WARP_BEHAVIOR_MOVE", "move" },
+    { GIMP_WARP_BEHAVIOR_GROW, "GIMP_WARP_BEHAVIOR_GROW", "grow" },
+    { GIMP_WARP_BEHAVIOR_SHRINK, "GIMP_WARP_BEHAVIOR_SHRINK", "shrink" },
+    { GIMP_WARP_BEHAVIOR_SWIRL_CW, "GIMP_WARP_BEHAVIOR_SWIRL_CW", "swirl-cw" },
+    { GIMP_WARP_BEHAVIOR_SWIRL_CCW, "GIMP_WARP_BEHAVIOR_SWIRL_CCW", "swirl-ccw" },
+    { GIMP_WARP_BEHAVIOR_ERASE, "GIMP_WARP_BEHAVIOR_ERASE", "erase" },
+    { GIMP_WARP_BEHAVIOR_SMOOTH, "GIMP_WARP_BEHAVIOR_SMOOTH", "smooth" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_WARP_BEHAVIOR_MOVE, NC_("warp-behavior", "Move pixels"), NULL },
+    { GIMP_WARP_BEHAVIOR_GROW, NC_("warp-behavior", "Grow area"), NULL },
+    { GIMP_WARP_BEHAVIOR_SHRINK, NC_("warp-behavior", "Shrink area"), NULL },
+    { GIMP_WARP_BEHAVIOR_SWIRL_CW, NC_("warp-behavior", "Swirl clockwise"), NULL },
+    { GIMP_WARP_BEHAVIOR_SWIRL_CCW, NC_("warp-behavior", "Swirl counter-clockwise"), NULL },
+    { GIMP_WARP_BEHAVIOR_ERASE, NC_("warp-behavior", "Erase warping"), NULL },
+    { GIMP_WARP_BEHAVIOR_SMOOTH, NC_("warp-behavior", "Smooth warping"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpWarpBehavior", values);
+      gimp_type_set_translation_context (type, "warp-behavior");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h
new file mode 100644
index 0000000..f994bc1
--- /dev/null
+++ b/app/tools/tools-enums.h
@@ -0,0 +1,203 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOLS_ENUMS_H__
+#define __TOOLS_ENUMS_H__
+
+
+/*
+ * these enums are registered with the type system
+ */
+
+/**
+ * GimpBucketFillArea:
+ * @GIMP_BUCKET_FILL_SELECTION:      Fill whole selection
+ * @GIMP_BUCKET_FILL_SIMILAR_COLORS: Fill similar colors
+ * @GIMP_BUCKET_FILL_LINE_ART:       Fill by line art detection
+ *
+ * Bucket fill area.
+ */
+#define GIMP_TYPE_BUCKET_FILL_AREA (gimp_bucket_fill_area_get_type ())
+
+GType gimp_bucket_fill_area_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_BUCKET_FILL_SELECTION,       /*< desc="Fill whole selection" >*/
+  GIMP_BUCKET_FILL_SIMILAR_COLORS,  /*< desc="Fill similar colors" >*/
+  GIMP_BUCKET_FILL_LINE_ART         /*< desc="Fill by line art detection" >*/
+} GimpBucketFillArea;
+
+
+/**
+ * GimpLineArtSource:
+ * @GIMP_LINE_ART_SOURCE_SAMPLE_MERGED: All visible layers
+ * @GIMP_LINE_ART_SOURCE_ACTIVE_LAYER:  Active layer
+ * @GIMP_LINE_ART_SOURCE_LOWER_LAYER:   Layer below the active one
+ * @GIMP_LINE_ART_SOURCE_UPPER_LAYER:   Layer above the active one
+ *
+ * Bucket fill area.
+ */
+#define GIMP_TYPE_LINE_ART_SOURCE (gimp_line_art_source_get_type ())
+
+GType gimp_line_art_source_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_LINE_ART_SOURCE_SAMPLE_MERGED, /*< desc="All visible layers" >*/
+  GIMP_LINE_ART_SOURCE_ACTIVE_LAYER,  /*< desc="Active layer" >*/
+  GIMP_LINE_ART_SOURCE_LOWER_LAYER,   /*< desc="Layer below the active one" >*/
+  GIMP_LINE_ART_SOURCE_UPPER_LAYER    /*< desc="Layer above the active one" >*/
+} GimpLineArtSource;
+
+
+#define GIMP_TYPE_RECT_SELECT_MODE (gimp_rect_select_mode_get_type ())
+
+GType gimp_rect_select_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_RECT_SELECT_MODE_FREE,        /*< desc="Free select"        >*/
+  GIMP_RECT_SELECT_MODE_FIXED_SIZE,  /*< desc="Fixed size"         >*/
+  GIMP_RECT_SELECT_MODE_FIXED_RATIO  /*< desc="Fixed aspect ratio" >*/
+} GimpRectSelectMode;
+
+
+#define GIMP_TYPE_TRANSFORM_TYPE (gimp_transform_type_get_type ())
+
+GType gimp_transform_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TRANSFORM_TYPE_LAYER,     /*< desc="Layer"     >*/
+  GIMP_TRANSFORM_TYPE_SELECTION, /*< desc="Selection" >*/
+  GIMP_TRANSFORM_TYPE_PATH,      /*< desc="Path"      >*/
+  GIMP_TRANSFORM_TYPE_IMAGE      /*< desc="Image"     >*/
+} GimpTransformType;
+
+
+#define GIMP_TYPE_TOOL_ACTION (gimp_tool_action_get_type ())
+
+GType gimp_tool_action_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TOOL_ACTION_PAUSE,
+  GIMP_TOOL_ACTION_RESUME,
+  GIMP_TOOL_ACTION_HALT,
+  GIMP_TOOL_ACTION_COMMIT
+} GimpToolAction;
+
+
+#define GIMP_TYPE_TOOL_ACTIVE_MODIFIERS (gimp_tool_active_modifiers_get_type ())
+
+GType gimp_tool_active_modifiers_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TOOL_ACTIVE_MODIFIERS_OFF,
+  GIMP_TOOL_ACTIVE_MODIFIERS_SAME,
+  GIMP_TOOL_ACTIVE_MODIFIERS_SEPARATE,
+} GimpToolActiveModifiers;
+
+
+#define GIMP_TYPE_MATTING_DRAW_MODE (gimp_matting_draw_mode_get_type ())
+
+GType gimp_matting_draw_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+ GIMP_MATTING_DRAW_MODE_FOREGROUND,   /*< desc="Draw foreground" >*/
+ GIMP_MATTING_DRAW_MODE_BACKGROUND,   /*< desc="Draw background" >*/
+ GIMP_MATTING_DRAW_MODE_UNKNOWN,      /*< desc="Draw unknown" >*/
+} GimpMattingDrawMode;
+
+
+#define GIMP_TYPE_MATTING_PREVIEW_MODE (gimp_matting_preview_mode_get_type ())
+
+GType gimp_matting_preview_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+ GIMP_MATTING_PREVIEW_MODE_ON_COLOR,        /*< desc="Color" >*/
+ GIMP_MATTING_PREVIEW_MODE_GRAYSCALE,       /*< desc="Grayscale" >*/
+} GimpMattingPreviewMode;
+
+
+#define GIMP_TYPE_TRANSFORM_3D_LENS_MODE (gimp_transform_3d_lens_mode_get_type ())
+
+GType gimp_transform_3d_lens_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< lowercase_name=gimp_transform_3d_lens_mode >*/
+{
+  GIMP_TRANSFORM_3D_LENS_MODE_FOCAL_LENGTH, /*< desc="Focal length" >*/
+  GIMP_TRANSFORM_3D_LENS_MODE_FOV_IMAGE,    /*< desc="Field of view (relative to image)", abbrev="FOV (image)" >*/
+  GIMP_TRANSFORM_3D_LENS_MODE_FOV_ITEM,     /*< desc="Field of view (relative to item)", abbrev="FOV (item)" >*/
+} Gimp3DTrasnformLensMode;
+
+
+#define GIMP_TYPE_WARP_BEHAVIOR (gimp_warp_behavior_get_type ())
+
+GType gimp_warp_behavior_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_WARP_BEHAVIOR_MOVE,      /*< desc="Move pixels" >*/
+  GIMP_WARP_BEHAVIOR_GROW,      /*< desc="Grow area" >*/
+  GIMP_WARP_BEHAVIOR_SHRINK,    /*< desc="Shrink area" >*/
+  GIMP_WARP_BEHAVIOR_SWIRL_CW,  /*< desc="Swirl clockwise" >*/
+  GIMP_WARP_BEHAVIOR_SWIRL_CCW, /*< desc="Swirl counter-clockwise" >*/
+  GIMP_WARP_BEHAVIOR_ERASE,     /*< desc="Erase warping" >*/
+  GIMP_WARP_BEHAVIOR_SMOOTH     /*< desc="Smooth warping" >*/
+} GimpWarpBehavior;
+
+
+/*
+ * non-registered enums; register them if needed
+ */
+
+typedef enum /*< skip >*/
+{
+  SELECTION_SELECT,
+  SELECTION_MOVE_MASK,
+  SELECTION_MOVE,
+  SELECTION_MOVE_COPY,
+  SELECTION_ANCHOR
+} SelectFunction;
+
+/*  Modes of GimpEditSelectionTool  */
+typedef enum /*< skip >*/
+{
+  GIMP_TRANSLATE_MODE_VECTORS,
+  GIMP_TRANSLATE_MODE_CHANNEL,
+  GIMP_TRANSLATE_MODE_LAYER_MASK,
+  GIMP_TRANSLATE_MODE_MASK,
+  GIMP_TRANSLATE_MODE_MASK_TO_LAYER,
+  GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER,
+  GIMP_TRANSLATE_MODE_LAYER,
+  GIMP_TRANSLATE_MODE_FLOATING_SEL
+} GimpTranslateMode;
+
+/*  Motion event report modes  */
+typedef enum /*< skip >*/
+{
+  GIMP_MOTION_MODE_EXACT,
+  GIMP_MOTION_MODE_COMPRESS
+} GimpMotionMode;
+
+
+#endif /* __TOOLS_ENUMS_H__ */
diff --git a/app/tools/tools-types.h b/app/tools/tools-types.h
new file mode 100644
index 0000000..ea115ba
--- /dev/null
+++ b/app/tools/tools-types.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TOOLS_TYPES_H__
+#define __TOOLS_TYPES_H__
+
+#include "paint/paint-types.h"
+#include "display/display-types.h"
+
+#include "tools/tools-enums.h"
+
+
+G_BEGIN_DECLS
+
+
+typedef struct _GimpTool                     GimpTool;
+typedef struct _GimpToolControl              GimpToolControl;
+
+typedef struct _GimpBrushTool                GimpBrushTool;
+typedef struct _GimpColorTool                GimpColorTool;
+typedef struct _GimpDrawTool                 GimpDrawTool;
+typedef struct _GimpFilterTool               GimpFilterTool;
+typedef struct _GimpGenericTransformTool     GimpGenericTransformTool;
+typedef struct _GimpPaintTool                GimpPaintTool;
+typedef struct _GimpTransformGridTool        GimpTransformGridTool;
+typedef struct _GimpTransformTool            GimpTransformTool;
+
+typedef struct _GimpColorOptions             GimpColorOptions;
+typedef struct _GimpFilterOptions            GimpFilterOptions;
+
+
+/*  functions  */
+
+typedef void (* GimpToolRegisterCallback) (GType                     tool_type,
+                                           GType                     tool_option_type,
+                                           GimpToolOptionsGUIFunc    options_gui_func,
+                                           GimpContextPropMask       context_props,
+                                           const gchar              *identifier,
+                                           const gchar              *label,
+                                           const gchar              *tooltip,
+                                           const gchar              *menu_path,
+                                           const gchar              *menu_accel,
+                                           const gchar              *help_domain,
+                                           const gchar              *help_data,
+                                           const gchar              *icon_name,
+                                           gpointer                  register_data);
+
+typedef void (* GimpToolRegisterFunc)     (GimpToolRegisterCallback  callback,
+                                           gpointer                  register_data);
+
+
+G_END_DECLS
+
+#endif /* __TOOLS_TYPES_H__ */
diff --git a/app/unique.c b/app/unique.c
new file mode 100644
index 0000000..28e5caa
--- /dev/null
+++ b/app/unique.c
@@ -0,0 +1,304 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+#include "core/core-types.h"
+
+#ifndef GIMP_CONSOLE_COMPILATION
+/*  for the DBus service names  */
+#include "gui/gimpdbusservice.h"
+#endif
+
+#include "unique.h"
+
+
+static gboolean  gimp_unique_dbus_open  (const gchar **filenames,
+                                         gboolean      as_new);
+#ifdef G_OS_WIN32
+static gboolean  gimp_unique_win32_open (const gchar **filenames,
+                                         gboolean      as_new);
+#endif
+static gboolean  gimp_unique_dbus_batch_run (const gchar  *batch_interpreter,
+                                             const gchar **batch_commands);
+
+gboolean
+gimp_unique_open (const gchar **filenames,
+                  gboolean      as_new)
+{
+#ifdef G_OS_WIN32
+  return gimp_unique_win32_open (filenames, as_new);
+#elif defined (PLATFORM_OSX)
+  /* Opening files through "Open with" from other software is likely handled
+   * instead by gui_unique_quartz_init() by gtkosx signal handling.
+   *
+   * Opening files through command lines will always create new process, because
+   * dbus is usually not installed by default on macOS (and when it is, it may
+   * not work properly). See !808 and #8997.
+   */
+  return FALSE;
+#else
+  return gimp_unique_dbus_open (filenames, as_new);
+#endif
+}
+
+gboolean
+gimp_unique_batch_run (const gchar  *batch_interpreter,
+                       const gchar **batch_commands)
+{
+#ifdef G_OS_WIN32
+  g_printerr ("Batch commands cannot be run in existing instance in Win32.\n");
+  return FALSE;
+#elif defined (PLATFORM_OSX)
+  /* Running batch commands through command lines will always run in the new
+   * process, because dbus is usually not installed by default on macOS (and
+   * when it is, it may not work properly). See !808 and #8997.
+   */
+  return FALSE;
+#else
+  return gimp_unique_dbus_batch_run (batch_interpreter,
+                                     batch_commands);
+#endif
+}
+
+static gboolean
+gimp_unique_dbus_open (const gchar **filenames,
+                       gboolean      as_new)
+{
+#ifndef GIMP_CONSOLE_COMPILATION
+
+  GDBusConnection *connection;
+  GError          *error = NULL;
+
+  connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+
+  if (connection)
+    {
+      gboolean success = TRUE;
+
+      if (filenames)
+        {
+          const gchar *method = as_new ? "OpenAsNew" : "Open";
+          gchar       *cwd    = g_get_current_dir ();
+          gint         i;
+
+          for (i = 0; filenames[i] && success; i++)
+            {
+              GFile *file;
+
+              file = g_file_new_for_commandline_arg_and_cwd (filenames[i], cwd);
+
+              if (file)
+                {
+                  GVariant *result;
+                  gchar    *uri = g_file_get_uri (file);
+
+                  result = g_dbus_connection_call_sync (connection,
+                                                        GIMP_DBUS_SERVICE_NAME,
+                                                        GIMP_DBUS_SERVICE_PATH,
+                                                        GIMP_DBUS_INTERFACE_NAME,
+                                                        method,
+                                                        g_variant_new ("(s)",
+                                                                       uri),
+                                                        NULL,
+                                                        G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                                                        -1,
+                                                        NULL, NULL);
+
+                  g_free (uri);
+
+                  if (result)
+                    g_variant_unref (result);
+                  else
+                    success = FALSE;
+
+                  g_object_unref (file);
+                }
+              else
+                {
+                  g_printerr ("conversion to uri failed for '%s'\n",
+                              filenames[i]);
+                }
+            }
+
+          g_free (cwd);
+        }
+      else
+        {
+          GVariant *result;
+
+          result = g_dbus_connection_call_sync (connection,
+                                                GIMP_DBUS_SERVICE_NAME,
+                                                GIMP_DBUS_SERVICE_PATH,
+                                                GIMP_DBUS_INTERFACE_NAME,
+                                                "Activate",
+                                                NULL,
+                                                NULL,
+                                                G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                                                -1,
+                                                NULL, NULL);
+          if (result)
+            g_variant_unref (result);
+          else
+            success = FALSE;
+        }
+
+      g_object_unref (connection);
+
+      return success;
+    }
+  else
+    {
+      g_printerr ("%s\n", error->message);
+      g_clear_error (&error);
+    }
+#endif
+
+  return FALSE;
+}
+
+#ifdef G_OS_WIN32
+
+static gboolean
+gimp_unique_win32_open (const gchar **filenames,
+                        gboolean      as_new)
+{
+#ifndef GIMP_CONSOLE_COMPILATION
+
+/*  for the proxy window names  */
+#include "gui/gui-unique.h"
+
+  HWND  window_handle = FindWindowW (GIMP_UNIQUE_WIN32_WINDOW_CLASS,
+                                     GIMP_UNIQUE_WIN32_WINDOW_NAME);
+
+  if (window_handle)
+    {
+      COPYDATASTRUCT  copydata = { 0, };
+
+      if (filenames)
+        {
+          gchar  *cwd   = g_get_current_dir ();
+          gint    i;
+
+          for (i = 0; filenames[i]; i++)
+            {
+              GFile *file;
+              file = g_file_new_for_commandline_arg_and_cwd (filenames[i], cwd);
+
+              if (file)
+                {
+                  gchar *uri = g_file_get_uri (file);
+
+                  copydata.lpData = uri;
+                  copydata.cbData = strlen (uri) + 1;  /* size in bytes   */
+                  copydata.dwData = (long) as_new;
+
+                  SendMessage (window_handle,
+                               WM_COPYDATA, (WPARAM) window_handle, (LPARAM) &copydata);
+
+                  g_free (uri);
+                  g_object_unref (file);
+                }
+              else
+                {
+                  g_printerr ("conversion to uri failed for '%s'\n",
+                              filenames[i]);
+                }
+            }
+
+          g_free (cwd);
+        }
+      else
+        {
+          SendMessage (window_handle,
+                       WM_COPYDATA, (WPARAM) window_handle, (LPARAM) &copydata);
+        }
+
+      return TRUE;
+    }
+
+#endif
+
+  return FALSE;
+}
+
+#endif  /* G_OS_WIN32 */
+
+static gboolean
+gimp_unique_dbus_batch_run (const gchar  *batch_interpreter,
+                            const gchar **batch_commands)
+{
+#ifndef GIMP_CONSOLE_COMPILATION
+
+  GDBusConnection *connection;
+  GError          *error = NULL;
+
+  connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+
+  if (connection)
+    {
+      const gchar *method = "BatchRun";
+      gboolean     success = TRUE;
+      gint         i;
+
+      for (i = 0; batch_commands[i] && success; i++)
+        {
+          GVariant    *result;
+          const gchar *interpreter;
+
+          /* NULL is not a valid string GVariant. */
+          interpreter = batch_interpreter ? batch_interpreter : "";
+
+          result = g_dbus_connection_call_sync (connection,
+                                                GIMP_DBUS_SERVICE_NAME,
+                                                GIMP_DBUS_SERVICE_PATH,
+                                                GIMP_DBUS_INTERFACE_NAME,
+                                                method,
+                                                g_variant_new ("(ss)",
+                                                               interpreter,
+                                                               batch_commands[i]),
+                                                NULL,
+                                                G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                                                -1,
+                                                NULL, NULL);
+
+
+          if (result)
+            g_variant_unref (result);
+          else
+            success = FALSE;
+        }
+
+      g_object_unref (connection);
+
+      return success;
+    }
+  else
+    {
+      g_printerr ("%s\n", error->message);
+      g_clear_error (&error);
+    }
+#endif
+
+  return FALSE;
+}
diff --git a/app/unique.h b/app/unique.h
new file mode 100644
index 0000000..6b24ea8
--- /dev/null
+++ b/app/unique.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __UNIQUE_H__
+#define __UNIQUE_H__
+
+
+gboolean gimp_unique_open (const gchar **filenames,
+                           gboolean      as_new);
+
+gboolean gimp_unique_batch_run (const gchar  *batch_interpreter,
+                                const gchar **batch_commands);
+
+
+#endif /* __UNIQUE_H__ */
diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am
new file mode 100644
index 0000000..aa6e10d
--- /dev/null
+++ b/app/vectors/Makefile.am
@@ -0,0 +1,44 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Vectors\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappvectors.a
+
+libappvectors_a_SOURCES = \
+	vectors-enums.h		\
+	vectors-types.h		\
+	gimpanchor.c		\
+	gimpanchor.h		\
+	gimpbezierstroke.h	\
+	gimpbezierstroke.c	\
+	gimpstroke.h		\
+	gimpstroke.c		\
+	gimpstroke-new.h	\
+	gimpstroke-new.c	\
+	gimpvectors.c		\
+	gimpvectors.h		\
+	gimpvectors-compat.c	\
+	gimpvectors-compat.h	\
+	gimpvectors-export.c	\
+	gimpvectors-export.h	\
+	gimpvectors-import.c	\
+	gimpvectors-import.h	\
+	gimpvectors-preview.c	\
+	gimpvectors-preview.h	\
+	gimpvectors-warp.c	\
+	gimpvectors-warp.h	\
+	gimpvectorsmodundo.c	\
+	gimpvectorsmodundo.h	\
+	gimpvectorspropundo.c	\
+	gimpvectorspropundo.h	\
+	gimpvectorsundo.c	\
+	gimpvectorsundo.h
diff --git a/app/vectors/Makefile.in b/app/vectors/Makefile.in
new file mode 100644
index 0000000..5a08c69
--- /dev/null
+++ b/app/vectors/Makefile.in
@@ -0,0 +1,992 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/vectors
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappvectors_a_AR = $(AR) $(ARFLAGS)
+libappvectors_a_LIBADD =
+am_libappvectors_a_OBJECTS = gimpanchor.$(OBJEXT) \
+	gimpbezierstroke.$(OBJEXT) gimpstroke.$(OBJEXT) \
+	gimpstroke-new.$(OBJEXT) gimpvectors.$(OBJEXT) \
+	gimpvectors-compat.$(OBJEXT) gimpvectors-export.$(OBJEXT) \
+	gimpvectors-import.$(OBJEXT) gimpvectors-preview.$(OBJEXT) \
+	gimpvectors-warp.$(OBJEXT) gimpvectorsmodundo.$(OBJEXT) \
+	gimpvectorspropundo.$(OBJEXT) gimpvectorsundo.$(OBJEXT)
+libappvectors_a_OBJECTS = $(am_libappvectors_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimpanchor.Po \
+	./$(DEPDIR)/gimpbezierstroke.Po ./$(DEPDIR)/gimpstroke-new.Po \
+	./$(DEPDIR)/gimpstroke.Po ./$(DEPDIR)/gimpvectors-compat.Po \
+	./$(DEPDIR)/gimpvectors-export.Po \
+	./$(DEPDIR)/gimpvectors-import.Po \
+	./$(DEPDIR)/gimpvectors-preview.Po \
+	./$(DEPDIR)/gimpvectors-warp.Po ./$(DEPDIR)/gimpvectors.Po \
+	./$(DEPDIR)/gimpvectorsmodundo.Po \
+	./$(DEPDIR)/gimpvectorspropundo.Po \
+	./$(DEPDIR)/gimpvectorsundo.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappvectors_a_SOURCES)
+DIST_SOURCES = $(libappvectors_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Vectors\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappvectors.a
+libappvectors_a_SOURCES = \
+	vectors-enums.h		\
+	vectors-types.h		\
+	gimpanchor.c		\
+	gimpanchor.h		\
+	gimpbezierstroke.h	\
+	gimpbezierstroke.c	\
+	gimpstroke.h		\
+	gimpstroke.c		\
+	gimpstroke-new.h	\
+	gimpstroke-new.c	\
+	gimpvectors.c		\
+	gimpvectors.h		\
+	gimpvectors-compat.c	\
+	gimpvectors-compat.h	\
+	gimpvectors-export.c	\
+	gimpvectors-export.h	\
+	gimpvectors-import.c	\
+	gimpvectors-import.h	\
+	gimpvectors-preview.c	\
+	gimpvectors-preview.h	\
+	gimpvectors-warp.c	\
+	gimpvectors-warp.h	\
+	gimpvectorsmodundo.c	\
+	gimpvectorsmodundo.h	\
+	gimpvectorspropundo.c	\
+	gimpvectorspropundo.h	\
+	gimpvectorsundo.c	\
+	gimpvectorsundo.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/vectors/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/vectors/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappvectors.a: $(libappvectors_a_OBJECTS) $(libappvectors_a_DEPENDENCIES) $(EXTRA_libappvectors_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappvectors.a
+	$(AM_V_AR)$(libappvectors_a_AR) libappvectors.a $(libappvectors_a_OBJECTS) $(libappvectors_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappvectors.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpanchor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbezierstroke.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpstroke-new.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpstroke.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectors-compat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectors-export.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectors-import.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectors-preview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectors-warp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectorsmodundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectorspropundo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectorsundo.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimpanchor.Po
+	-rm -f ./$(DEPDIR)/gimpbezierstroke.Po
+	-rm -f ./$(DEPDIR)/gimpstroke-new.Po
+	-rm -f ./$(DEPDIR)/gimpstroke.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-compat.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-export.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-import.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-preview.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-warp.Po
+	-rm -f ./$(DEPDIR)/gimpvectors.Po
+	-rm -f ./$(DEPDIR)/gimpvectorsmodundo.Po
+	-rm -f ./$(DEPDIR)/gimpvectorspropundo.Po
+	-rm -f ./$(DEPDIR)/gimpvectorsundo.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimpanchor.Po
+	-rm -f ./$(DEPDIR)/gimpbezierstroke.Po
+	-rm -f ./$(DEPDIR)/gimpstroke-new.Po
+	-rm -f ./$(DEPDIR)/gimpstroke.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-compat.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-export.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-import.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-preview.Po
+	-rm -f ./$(DEPDIR)/gimpvectors-warp.Po
+	-rm -f ./$(DEPDIR)/gimpvectors.Po
+	-rm -f ./$(DEPDIR)/gimpvectorsmodundo.Po
+	-rm -f ./$(DEPDIR)/gimpvectorspropundo.Po
+	-rm -f ./$(DEPDIR)/gimpvectorsundo.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/vectors/gimpanchor.c b/app/vectors/gimpanchor.c
new file mode 100644
index 0000000..f5085cd
--- /dev/null
+++ b/app/vectors/gimpanchor.c
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpanchor.c
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "vectors-types.h"
+
+#include "gimpanchor.h"
+
+
+GType
+gimp_anchor_get_type (void)
+{
+  static GType anchor_type = 0;
+
+  if (!anchor_type)
+    anchor_type = g_boxed_type_register_static ("GimpAnchor",
+                                                (GBoxedCopyFunc) gimp_anchor_copy,
+                                                (GBoxedFreeFunc) gimp_anchor_free);
+
+  return anchor_type;
+}
+
+GimpAnchor *
+gimp_anchor_new (GimpAnchorType    type,
+                 const GimpCoords *position)
+{
+  GimpAnchor *anchor = g_slice_new0 (GimpAnchor);
+
+  anchor->type = type;
+
+  if (position)
+    anchor->position = *position;
+
+  return anchor;
+}
+
+GimpAnchor *
+gimp_anchor_copy (const GimpAnchor *anchor)
+{
+  g_return_val_if_fail (anchor != NULL, NULL);
+
+  return g_slice_dup (GimpAnchor, anchor);
+}
+
+void
+gimp_anchor_free (GimpAnchor *anchor)
+{
+  g_return_if_fail (anchor != NULL);
+
+  g_slice_free (GimpAnchor, anchor);
+}
diff --git a/app/vectors/gimpanchor.h b/app/vectors/gimpanchor.h
new file mode 100644
index 0000000..75203a4
--- /dev/null
+++ b/app/vectors/gimpanchor.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpanchor.h
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ANCHOR_H__
+#define __GIMP_ANCHOR_H__
+
+#define GIMP_ANCHOR(anchor)  ((GimpAnchor *) (anchor))
+
+#define GIMP_TYPE_ANCHOR               (gimp_anchor_get_type ())
+#define GIMP_VALUE_HOLDS_ANCHOR(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_ANCHOR))
+
+GType   gimp_anchor_get_type           (void) G_GNUC_CONST;
+
+
+struct _GimpAnchor
+{
+  GimpCoords        position;
+
+  GimpAnchorType    type;   /* Interpretation dependent on GimpStroke type */
+  gboolean          selected;
+};
+
+
+GimpAnchor  * gimp_anchor_new  (GimpAnchorType    type,
+                                const GimpCoords *position);
+
+GimpAnchor  * gimp_anchor_copy (const GimpAnchor *anchor);
+void          gimp_anchor_free (GimpAnchor       *anchor);
+
+
+#endif /* __GIMP_ANCHOR_H__ */
diff --git a/app/vectors/gimpbezierstroke.c b/app/vectors/gimpbezierstroke.c
new file mode 100644
index 0000000..3cfe735
--- /dev/null
+++ b/app/vectors/gimpbezierstroke.c
@@ -0,0 +1,2309 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbezierstroke.c
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <cairo.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "vectors-types.h"
+
+#include "core/gimp-transform-utils.h"
+#include "core/gimpbezierdesc.h"
+#include "core/gimpcoords.h"
+#include "core/gimpcoords-interpolate.h"
+
+#include "gimpanchor.h"
+#include "gimpbezierstroke.h"
+
+
+/*  local prototypes  */
+
+static gdouble
+    gimp_bezier_stroke_nearest_point_get   (GimpStroke            *stroke,
+                                            const GimpCoords      *coord,
+                                            gdouble                precision,
+                                            GimpCoords            *ret_point,
+                                            GimpAnchor           **ret_segment_start,
+                                            GimpAnchor           **ret_segment_end,
+                                            gdouble               *ret_pos);
+static gdouble
+    gimp_bezier_stroke_segment_nearest_point_get
+                                           (const GimpCoords      *beziercoords,
+                                            const GimpCoords      *coord,
+                                            gdouble                precision,
+                                            GimpCoords            *ret_point,
+                                            gdouble               *ret_pos,
+                                            gint                   depth);
+static gdouble
+    gimp_bezier_stroke_nearest_tangent_get (GimpStroke            *stroke,
+                                            const GimpCoords      *coord1,
+                                            const GimpCoords      *coord2,
+                                            gdouble                precision,
+                                            GimpCoords            *nearest,
+                                            GimpAnchor           **ret_segment_start,
+                                            GimpAnchor           **ret_segment_end,
+                                            gdouble               *ret_pos);
+static gdouble
+    gimp_bezier_stroke_segment_nearest_tangent_get
+                                           (const GimpCoords      *beziercoords,
+                                            const GimpCoords      *coord1,
+                                            const GimpCoords      *coord2,
+                                            gdouble                precision,
+                                            GimpCoords            *ret_point,
+                                            gdouble               *ret_pos);
+static void
+    gimp_bezier_stroke_anchor_move_relative
+                                           (GimpStroke            *stroke,
+                                            GimpAnchor            *anchor,
+                                            const GimpCoords      *deltacoord,
+                                            GimpAnchorFeatureType  feature);
+static void
+    gimp_bezier_stroke_anchor_move_absolute
+                                           (GimpStroke            *stroke,
+                                            GimpAnchor            *anchor,
+                                            const GimpCoords      *coord,
+                                            GimpAnchorFeatureType  feature);
+static void
+    gimp_bezier_stroke_anchor_convert      (GimpStroke            *stroke,
+                                            GimpAnchor            *anchor,
+                                            GimpAnchorFeatureType  feature);
+static void
+    gimp_bezier_stroke_anchor_delete       (GimpStroke            *stroke,
+                                            GimpAnchor            *anchor);
+static gboolean
+    gimp_bezier_stroke_point_is_movable    (GimpStroke            *stroke,
+                                            GimpAnchor            *predec,
+                                            gdouble                position);
+static void
+    gimp_bezier_stroke_point_move_relative (GimpStroke            *stroke,
+                                            GimpAnchor            *predec,
+                                            gdouble                position,
+                                            const GimpCoords      *deltacoord,
+                                            GimpAnchorFeatureType  feature);
+static void
+    gimp_bezier_stroke_point_move_absolute (GimpStroke            *stroke,
+                                            GimpAnchor            *predec,
+                                            gdouble                position,
+                                            const GimpCoords      *coord,
+                                            GimpAnchorFeatureType  feature);
+
+static void gimp_bezier_stroke_close       (GimpStroke            *stroke);
+
+static GimpStroke *
+    gimp_bezier_stroke_open                (GimpStroke            *stroke,
+                                            GimpAnchor            *end_anchor);
+static gboolean
+    gimp_bezier_stroke_anchor_is_insertable
+                                           (GimpStroke            *stroke,
+                                            GimpAnchor            *predec,
+                                            gdouble                position);
+static GimpAnchor *
+    gimp_bezier_stroke_anchor_insert       (GimpStroke            *stroke,
+                                            GimpAnchor            *predec,
+                                            gdouble                position);
+static gboolean
+    gimp_bezier_stroke_is_extendable       (GimpStroke            *stroke,
+                                            GimpAnchor            *neighbor);
+static gboolean
+    gimp_bezier_stroke_connect_stroke      (GimpStroke            *stroke,
+                                            GimpAnchor            *anchor,
+                                            GimpStroke            *extension,
+                                            GimpAnchor            *neighbor);
+static GArray *
+    gimp_bezier_stroke_interpolate         (GimpStroke            *stroke,
+                                            gdouble                precision,
+                                            gboolean              *closed);
+static GimpBezierDesc *
+    gimp_bezier_stroke_make_bezier         (GimpStroke            *stroke);
+static void gimp_bezier_stroke_transform   (GimpStroke            *stroke,
+                                            const GimpMatrix3     *matrix,
+                                            GQueue                *ret_strokes);
+
+static void gimp_bezier_stroke_finalize    (GObject               *object);
+
+
+static GList * gimp_bezier_stroke_get_anchor_listitem
+                                           (GList                 *list);
+
+
+G_DEFINE_TYPE (GimpBezierStroke, gimp_bezier_stroke, GIMP_TYPE_STROKE)
+
+#define parent_class gimp_bezier_stroke_parent_class
+
+
+static void
+gimp_bezier_stroke_class_init (GimpBezierStrokeClass *klass)
+{
+  GObjectClass    *object_class = G_OBJECT_CLASS (klass);
+  GimpStrokeClass *stroke_class = GIMP_STROKE_CLASS (klass);
+
+  object_class->finalize             = gimp_bezier_stroke_finalize;
+
+  stroke_class->nearest_point_get    = gimp_bezier_stroke_nearest_point_get;
+  stroke_class->nearest_tangent_get  = gimp_bezier_stroke_nearest_tangent_get;
+  stroke_class->nearest_intersection_get = NULL;
+  stroke_class->anchor_move_relative = gimp_bezier_stroke_anchor_move_relative;
+  stroke_class->anchor_move_absolute = gimp_bezier_stroke_anchor_move_absolute;
+  stroke_class->anchor_convert       = gimp_bezier_stroke_anchor_convert;
+  stroke_class->anchor_delete        = gimp_bezier_stroke_anchor_delete;
+  stroke_class->point_is_movable     = gimp_bezier_stroke_point_is_movable;
+  stroke_class->point_move_relative  = gimp_bezier_stroke_point_move_relative;
+  stroke_class->point_move_absolute  = gimp_bezier_stroke_point_move_absolute;
+  stroke_class->close                = gimp_bezier_stroke_close;
+  stroke_class->open                 = gimp_bezier_stroke_open;
+  stroke_class->anchor_is_insertable = gimp_bezier_stroke_anchor_is_insertable;
+  stroke_class->anchor_insert        = gimp_bezier_stroke_anchor_insert;
+  stroke_class->is_extendable        = gimp_bezier_stroke_is_extendable;
+  stroke_class->extend               = gimp_bezier_stroke_extend;
+  stroke_class->connect_stroke       = gimp_bezier_stroke_connect_stroke;
+  stroke_class->interpolate          = gimp_bezier_stroke_interpolate;
+  stroke_class->make_bezier          = gimp_bezier_stroke_make_bezier;
+  stroke_class->transform            = gimp_bezier_stroke_transform;
+}
+
+static void
+gimp_bezier_stroke_init (GimpBezierStroke *stroke)
+{
+}
+
+static void
+gimp_bezier_stroke_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+/* Bezier specific functions */
+
+GimpStroke *
+gimp_bezier_stroke_new (void)
+{
+  return g_object_new (GIMP_TYPE_BEZIER_STROKE, NULL);
+}
+
+
+GimpStroke *
+gimp_bezier_stroke_new_from_coords (const GimpCoords *coords,
+                                    gint              n_coords,
+                                    gboolean          closed)
+{
+  GimpStroke *stroke;
+  GimpAnchor *last_anchor;
+  gint        count;
+
+  g_return_val_if_fail (coords != NULL, NULL);
+  g_return_val_if_fail (n_coords >= 3, NULL);
+  g_return_val_if_fail ((n_coords % 3) == 0, NULL);
+
+  stroke = gimp_bezier_stroke_new ();
+
+  last_anchor = NULL;
+
+  for (count = 0; count < n_coords; count++)
+    last_anchor = gimp_bezier_stroke_extend (stroke,
+                                             &coords[count],
+                                             last_anchor,
+                                             EXTEND_SIMPLE);
+
+  if (closed)
+    gimp_stroke_close (stroke);
+
+  return stroke;
+}
+
+static void
+gimp_bezier_stroke_anchor_delete (GimpStroke *stroke,
+                                  GimpAnchor *anchor)
+{
+  GList *list;
+  GList *list2;
+  gint   i;
+
+  /* Anchors always are surrounded by two handles that have to
+   * be deleted too
+   */
+
+  list2 = g_queue_find (stroke->anchors, anchor);
+  list = g_list_previous (list2);
+
+  for (i = 0; i < 3; i++)
+    {
+      g_return_if_fail (list != NULL);
+
+      list2 = g_list_next (list);
+      gimp_anchor_free (list->data);
+      g_queue_delete_link (stroke->anchors, list);
+      list = list2;
+    }
+}
+
+static GimpStroke *
+gimp_bezier_stroke_open (GimpStroke *stroke,
+                         GimpAnchor *end_anchor)
+{
+  GList      *list;
+  GList      *list2;
+  GimpStroke *new_stroke = NULL;
+
+  list = g_queue_find (stroke->anchors, end_anchor);
+
+  g_return_val_if_fail (list != NULL && list->next != NULL, NULL);
+
+  list = g_list_next (list);  /* protect the handle... */
+
+  list2 = list->next;
+  list->next = NULL;
+
+  if (list2 != NULL)
+    {
+      GList *tail = stroke->anchors->tail;
+
+      stroke->anchors->tail = list;
+      stroke->anchors->length -= g_list_length (list2);
+
+      list2->prev = NULL;
+
+      if (stroke->closed)
+        {
+          GList *l;
+
+          for (l = tail; l; l = g_list_previous (l))
+            g_queue_push_head (stroke->anchors, l->data);
+
+          g_list_free (list2);
+        }
+      else
+        {
+          new_stroke = gimp_bezier_stroke_new ();
+          new_stroke->anchors->head = list2;
+          new_stroke->anchors->tail = g_list_last (list2);
+          new_stroke->anchors->length = g_list_length (list2);
+        }
+    }
+
+  stroke->closed = FALSE;
+  g_object_notify (G_OBJECT (stroke), "closed");
+
+  return new_stroke;
+}
+
+static gboolean
+gimp_bezier_stroke_anchor_is_insertable (GimpStroke *stroke,
+                                         GimpAnchor *predec,
+                                         gdouble     position)
+{
+  return (g_queue_find (stroke->anchors, predec) != NULL);
+}
+
+
+static GimpAnchor *
+gimp_bezier_stroke_anchor_insert (GimpStroke *stroke,
+                                  GimpAnchor *predec,
+                                  gdouble     position)
+{
+  GList      *segment_start;
+  GList      *list;
+  GList      *list2;
+  GimpCoords  subdivided[8];
+  GimpCoords  beziercoords[4];
+  gint        i;
+
+  segment_start = g_queue_find (stroke->anchors, predec);
+
+  if (! segment_start)
+    return NULL;
+
+  list = segment_start;
+
+  for (i = 0; i <= 3; i++)
+    {
+      beziercoords[i] = GIMP_ANCHOR (list->data)->position;
+      list = g_list_next (list);
+      if (! list)
+        list = stroke->anchors->head;
+    }
+
+  subdivided[0] = beziercoords[0];
+  subdivided[6] = beziercoords[3];
+
+  gimp_coords_mix (1-position, &(beziercoords[0]),
+                   position,   &(beziercoords[1]),
+                   &(subdivided[1]));
+
+  gimp_coords_mix (1-position, &(beziercoords[1]),
+                   position,   &(beziercoords[2]),
+                   &(subdivided[7]));
+
+  gimp_coords_mix (1-position, &(beziercoords[2]),
+                   position,   &(beziercoords[3]),
+                   &(subdivided[5]));
+
+  gimp_coords_mix (1-position, &(subdivided[1]),
+                   position,   &(subdivided[7]),
+                   &(subdivided[2]));
+
+  gimp_coords_mix (1-position, &(subdivided[7]),
+                   position,   &(subdivided[5]),
+                   &(subdivided[4]));
+
+  gimp_coords_mix (1-position, &(subdivided[2]),
+                   position,   &(subdivided[4]),
+                   &(subdivided[3]));
+
+  /* subdivided 0-6 contains the bezier segment subdivided at <position> */
+
+  list = segment_start;
+
+  for (i = 0; i <= 6; i++)
+    {
+      if (i >= 2 && i <= 4)
+        {
+          list2 = g_list_append (NULL,
+                                 gimp_anchor_new ((i == 3 ?
+                                                    GIMP_ANCHOR_ANCHOR:
+                                                    GIMP_ANCHOR_CONTROL),
+                                                  &(subdivided[i])));
+          /* insert it *before* list manually. */
+          list2->next = list;
+          list2->prev = list->prev;
+          if (list->prev)
+            list->prev->next = list2;
+          list->prev = list2;
+
+          list = list2;
+
+          if (i == 3)
+            segment_start = list;
+        }
+      else
+        {
+          GIMP_ANCHOR (list->data)->position = subdivided[i];
+        }
+
+      list = g_list_next (list);
+      if (! list)
+        list = stroke->anchors->head;
+    }
+
+  stroke->anchors->head = g_list_first (list);
+  stroke->anchors->tail = g_list_last (list);
+  stroke->anchors->length += 3;
+
+  return GIMP_ANCHOR (segment_start->data);
+}
+
+
+static gboolean
+gimp_bezier_stroke_point_is_movable (GimpStroke *stroke,
+                                     GimpAnchor *predec,
+                                     gdouble     position)
+{
+  return (g_queue_find (stroke->anchors, predec) != NULL);
+}
+
+
+static void
+gimp_bezier_stroke_point_move_relative (GimpStroke            *stroke,
+                                        GimpAnchor            *predec,
+                                        gdouble                position,
+                                        const GimpCoords      *deltacoord,
+                                        GimpAnchorFeatureType  feature)
+{
+  GimpCoords  offsetcoords[2];
+  GList      *segment_start;
+  GList      *list;
+  gint        i;
+  gdouble     feel_good;
+
+  segment_start = g_queue_find (stroke->anchors, predec);
+
+  g_return_if_fail (segment_start != NULL);
+
+  /* dragging close to endpoints just moves the handle related to
+   * the endpoint. Just make sure that feel_good is in the range from
+   * 0 to 1. The 1.0 / 6.0 and 5.0 / 6.0 are duplicated in
+   * tools/gimpvectortool.c.
+   */
+  if (position <= 1.0 / 6.0)
+    feel_good = 0;
+  else if (position <= 0.5)
+    feel_good = (pow((6 * position - 1) / 2.0, 3)) / 2;
+  else if (position <= 5.0 / 6.0)
+    feel_good = (1 - pow((6 * (1-position) - 1) / 2.0, 3)) / 2 + 0.5;
+  else
+    feel_good = 1;
+
+  gimp_coords_scale ((1-feel_good)/(3*position*
+                                    (1-position)*(1-position)),
+                     deltacoord,
+                     &(offsetcoords[0]));
+  gimp_coords_scale (feel_good/(3*position*position*(1-position)),
+                     deltacoord,
+                     &(offsetcoords[1]));
+
+  list = segment_start;
+  list = g_list_next (list);
+  if (! list)
+    list = stroke->anchors->head;
+
+  for (i = 0; i <= 1; i++)
+    {
+      gimp_stroke_anchor_move_relative (stroke, GIMP_ANCHOR (list->data),
+                                        &(offsetcoords[i]), feature);
+      list = g_list_next (list);
+      if (! list)
+        list = stroke->anchors->head;
+    }
+}
+
+
+static void
+gimp_bezier_stroke_point_move_absolute (GimpStroke            *stroke,
+                                        GimpAnchor            *predec,
+                                        gdouble                position,
+                                        const GimpCoords      *coord,
+                                        GimpAnchorFeatureType  feature)
+{
+  GimpCoords  deltacoord;
+  GimpCoords  tmp1, tmp2, abs_pos;
+  GimpCoords  beziercoords[4];
+  GList      *segment_start;
+  GList      *list;
+  gint        i;
+
+  segment_start = g_queue_find (stroke->anchors, predec);
+
+  g_return_if_fail (segment_start != NULL);
+
+  list = segment_start;
+
+  for (i = 0; i <= 3; i++)
+    {
+      beziercoords[i] = GIMP_ANCHOR (list->data)->position;
+      list = g_list_next (list);
+      if (! list)
+        list = stroke->anchors->head;
+    }
+
+  gimp_coords_mix ((1-position)*(1-position)*(1-position), &(beziercoords[0]),
+                   3*(1-position)*(1-position)*position, &(beziercoords[1]),
+                   &tmp1);
+  gimp_coords_mix (3*(1-position)*position*position, &(beziercoords[2]),
+                   position*position*position, &(beziercoords[3]),
+                   &tmp2);
+  gimp_coords_add (&tmp1, &tmp2, &abs_pos);
+
+  gimp_coords_difference (coord, &abs_pos, &deltacoord);
+
+  gimp_bezier_stroke_point_move_relative (stroke, predec, position,
+                                          &deltacoord, feature);
+}
+
+static void
+gimp_bezier_stroke_close (GimpStroke *stroke)
+{
+  GList      *start;
+  GList      *end;
+  GimpAnchor *anchor;
+
+  start = stroke->anchors->head;
+  end   = stroke->anchors->tail;
+
+  g_return_if_fail (start->next != NULL && end->prev != NULL);
+
+  if (start->next != end->prev)
+    {
+      if (gimp_coords_equal (&(GIMP_ANCHOR (start->next->data)->position),
+                             &(GIMP_ANCHOR (start->data)->position)) &&
+          gimp_coords_equal (&(GIMP_ANCHOR (start->data)->position),
+                             &(GIMP_ANCHOR (end->data)->position)) &&
+          gimp_coords_equal (&(GIMP_ANCHOR (end->data)->position),
+                             &(GIMP_ANCHOR (end->prev->data)->position)))
+        {
+          /* redundant segment */
+
+          gimp_anchor_free (stroke->anchors->tail->data);
+          g_queue_delete_link (stroke->anchors, stroke->anchors->tail);
+
+          gimp_anchor_free (stroke->anchors->tail->data);
+          g_queue_delete_link (stroke->anchors, stroke->anchors->tail);
+
+          anchor = stroke->anchors->tail->data;
+          g_queue_delete_link (stroke->anchors, stroke->anchors->tail);
+
+          gimp_anchor_free (stroke->anchors->head->data);
+          stroke->anchors->head->data = anchor;
+        }
+    }
+
+  GIMP_STROKE_CLASS (parent_class)->close (stroke);
+}
+
+static gdouble
+gimp_bezier_stroke_nearest_point_get (GimpStroke        *stroke,
+                                      const GimpCoords  *coord,
+                                      gdouble            precision,
+                                      GimpCoords        *ret_point,
+                                      GimpAnchor       **ret_segment_start,
+                                      GimpAnchor       **ret_segment_end,
+                                      gdouble           *ret_pos)
+{
+  gdouble     min_dist, dist, pos;
+  GimpCoords  point = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
+  GimpCoords  segmentcoords[4];
+  GList      *anchorlist;
+  GimpAnchor *segment_start;
+  GimpAnchor *segment_end = NULL;
+  GimpAnchor *anchor;
+  gint        count;
+
+  if (g_queue_is_empty (stroke->anchors))
+    return -1.0;
+
+  count = 0;
+  min_dist = -1;
+  pos = 0;
+
+  for (anchorlist = stroke->anchors->head;
+       GIMP_ANCHOR (anchorlist->data)->type != GIMP_ANCHOR_ANCHOR;
+       anchorlist = g_list_next (anchorlist));
+
+  segment_start = anchorlist->data;
+
+  for ( ; anchorlist; anchorlist = g_list_next (anchorlist))
+    {
+      anchor = anchorlist->data;
+
+      segmentcoords[count] = anchor->position;
+      count++;
+
+      if (count == 4)
+        {
+          segment_end = anchorlist->data;
+          dist = gimp_bezier_stroke_segment_nearest_point_get (segmentcoords,
+                                                               coord, precision,
+                                                               &point, &pos,
+                                                               10);
+
+          if (dist < min_dist || min_dist < 0)
+            {
+              min_dist = dist;
+
+              if (ret_pos)
+                *ret_pos = pos;
+              if (ret_point)
+                *ret_point = point;
+              if (ret_segment_start)
+                *ret_segment_start = segment_start;
+              if (ret_segment_end)
+                *ret_segment_end = segment_end;
+            }
+
+          segment_start = anchorlist->data;
+          segmentcoords[0] = segmentcoords[3];
+          count = 1;
+        }
+    }
+
+  if (stroke->closed && stroke->anchors->head)
+    {
+      anchorlist = stroke->anchors->head;
+
+      while (count < 3)
+        {
+          segmentcoords[count] = GIMP_ANCHOR (anchorlist->data)->position;
+          count++;
+        }
+
+      anchorlist = g_list_next (anchorlist);
+
+      if (anchorlist)
+        {
+          segment_end = GIMP_ANCHOR (anchorlist->data);
+          segmentcoords[3] = segment_end->position;
+        }
+
+      dist = gimp_bezier_stroke_segment_nearest_point_get (segmentcoords,
+                                                           coord, precision,
+                                                           &point, &pos,
+                                                           10);
+
+      if (dist < min_dist || min_dist < 0)
+        {
+          min_dist = dist;
+
+          if (ret_pos)
+            *ret_pos = pos;
+          if (ret_point)
+            *ret_point = point;
+          if (ret_segment_start)
+            *ret_segment_start = segment_start;
+          if (ret_segment_end)
+            *ret_segment_end = segment_end;
+        }
+    }
+
+  return min_dist;
+}
+
+
+static gdouble
+gimp_bezier_stroke_segment_nearest_point_get (const GimpCoords *beziercoords,
+                                              const GimpCoords *coord,
+                                              gdouble           precision,
+                                              GimpCoords       *ret_point,
+                                              gdouble          *ret_pos,
+                                              gint              depth)
+{
+  /*
+   * beziercoords has to contain four GimpCoords with the four control points
+   * of the bezier segment. We subdivide it at the parameter 0.5.
+   */
+
+  GimpCoords subdivided[8];
+  gdouble    dist1, dist2;
+  GimpCoords point1, point2;
+  gdouble    pos1, pos2;
+
+  gimp_coords_difference (&beziercoords[1], &beziercoords[0], &point1);
+  gimp_coords_difference (&beziercoords[3], &beziercoords[2], &point2);
+
+  if (! depth || (gimp_coords_bezier_is_straight (beziercoords, precision) &&
+                  gimp_coords_length_squared (&point1) < precision         &&
+                  gimp_coords_length_squared (&point2) < precision))
+    {
+      GimpCoords line, dcoord;
+      gdouble    length2, scalar;
+      gint       i;
+
+      gimp_coords_difference (&(beziercoords[3]),
+                              &(beziercoords[0]),
+                              &line);
+
+      gimp_coords_difference (coord,
+                              &(beziercoords[0]),
+                              &dcoord);
+
+      length2 = gimp_coords_scalarprod (&line, &line);
+      scalar = gimp_coords_scalarprod (&line, &dcoord) / length2;
+
+      scalar = CLAMP (scalar, 0.0, 1.0);
+
+      /* lines look the same as bezier curves where the handles
+       * sit on the anchors, however, they are parametrized
+       * differently. Hence we have to do some weird approximation.  */
+
+      pos1 = pos2 = 0.5;
+
+      for (i = 0; i <= 15; i++)
+        {
+          pos2 *= 0.5;
+
+          if (3 * pos1 * pos1 * (1-pos1) + pos1 * pos1 * pos1 < scalar)
+            pos1 += pos2;
+          else
+            pos1 -= pos2;
+        }
+
+      *ret_pos = pos1;
+
+      gimp_coords_mix (1.0, &(beziercoords[0]),
+                       scalar, &line,
+                       ret_point);
+
+      gimp_coords_difference (coord, ret_point, &dcoord);
+
+      return gimp_coords_length (&dcoord);
+    }
+
+  /* ok, we have to subdivide */
+
+  subdivided[0] = beziercoords[0];
+  subdivided[6] = beziercoords[3];
+
+  /* if (!depth) g_printerr ("Hit recursion depth limit!\n"); */
+
+  gimp_coords_average (&(beziercoords[0]), &(beziercoords[1]),
+                       &(subdivided[1]));
+
+  gimp_coords_average (&(beziercoords[1]), &(beziercoords[2]),
+                       &(subdivided[7]));
+
+  gimp_coords_average (&(beziercoords[2]), &(beziercoords[3]),
+                       &(subdivided[5]));
+
+  gimp_coords_average (&(subdivided[1]), &(subdivided[7]),
+                       &(subdivided[2]));
+
+  gimp_coords_average (&(subdivided[7]), &(subdivided[5]),
+                       &(subdivided[4]));
+
+  gimp_coords_average (&(subdivided[2]), &(subdivided[4]),
+                       &(subdivided[3]));
+
+  /*
+   * We now have the coordinates of the two bezier segments in
+   * subdivided [0-3] and subdivided [3-6]
+   */
+
+  dist1 = gimp_bezier_stroke_segment_nearest_point_get (&(subdivided[0]),
+                                                        coord, precision,
+                                                        &point1, &pos1,
+                                                        depth - 1);
+
+  dist2 = gimp_bezier_stroke_segment_nearest_point_get (&(subdivided[3]),
+                                                        coord, precision,
+                                                        &point2, &pos2,
+                                                        depth - 1);
+
+  if (dist1 <= dist2)
+    {
+      *ret_point = point1;
+      *ret_pos = 0.5 * pos1;
+      return dist1;
+    }
+  else
+    {
+      *ret_point = point2;
+      *ret_pos = 0.5 + 0.5 * pos2;
+      return dist2;
+    }
+}
+
+
+static gdouble
+gimp_bezier_stroke_nearest_tangent_get (GimpStroke        *stroke,
+                                        const GimpCoords  *coord1,
+                                        const GimpCoords  *coord2,
+                                        gdouble            precision,
+                                        GimpCoords        *nearest,
+                                        GimpAnchor       **ret_segment_start,
+                                        GimpAnchor       **ret_segment_end,
+                                        gdouble           *ret_pos)
+{
+  gdouble     min_dist, dist, pos;
+  GimpCoords  point;
+  GimpCoords  segmentcoords[4];
+  GList      *anchorlist;
+  GimpAnchor *segment_start;
+  GimpAnchor *segment_end = NULL;
+  GimpAnchor *anchor;
+  gint        count;
+
+  if (g_queue_is_empty (stroke->anchors))
+    return -1.0;
+
+  count = 0;
+  min_dist = -1;
+
+  for (anchorlist = stroke->anchors->head;
+       GIMP_ANCHOR (anchorlist->data)->type != GIMP_ANCHOR_ANCHOR;
+       anchorlist = g_list_next (anchorlist));
+
+  segment_start = anchorlist->data;
+
+  for ( ; anchorlist; anchorlist = g_list_next (anchorlist))
+    {
+      anchor = anchorlist->data;
+
+      segmentcoords[count] = anchor->position;
+      count++;
+
+      if (count == 4)
+        {
+          segment_end = anchorlist->data;
+          dist = gimp_bezier_stroke_segment_nearest_tangent_get (segmentcoords,
+                                                                 coord1, coord2,
+                                                                 precision,
+                                                                 &point, &pos);
+
+          if (dist >= 0 && (dist < min_dist || min_dist < 0))
+            {
+              min_dist = dist;
+
+              if (ret_pos)
+                *ret_pos = pos;
+              if (nearest)
+                *nearest = point;
+              if (ret_segment_start)
+                *ret_segment_start = segment_start;
+              if (ret_segment_end)
+                *ret_segment_end = segment_end;
+            }
+
+          segment_start = anchorlist->data;
+          segmentcoords[0] = segmentcoords[3];
+          count = 1;
+        }
+    }
+
+  if (stroke->closed && ! g_queue_is_empty (stroke->anchors))
+    {
+      anchorlist = stroke->anchors->head;
+
+      while (count < 3)
+        {
+          segmentcoords[count] = GIMP_ANCHOR (anchorlist->data)->position;
+          count++;
+        }
+
+      anchorlist = g_list_next (anchorlist);
+
+      if (anchorlist)
+        {
+          segment_end = GIMP_ANCHOR (anchorlist->data);
+          segmentcoords[3] = segment_end->position;
+        }
+
+      dist = gimp_bezier_stroke_segment_nearest_tangent_get (segmentcoords,
+                                                             coord1, coord2,
+                                                             precision,
+                                                             &point, &pos);
+
+      if (dist >= 0 && (dist < min_dist || min_dist < 0))
+        {
+          min_dist = dist;
+
+          if (ret_pos)
+            *ret_pos = pos;
+          if (nearest)
+            *nearest = point;
+          if (ret_segment_start)
+            *ret_segment_start = segment_start;
+          if (ret_segment_end)
+            *ret_segment_end = segment_end;
+        }
+    }
+
+  return min_dist;
+}
+
+static gdouble
+gimp_bezier_stroke_segment_nearest_tangent_get (const GimpCoords *beziercoords,
+                                                const GimpCoords *coord1,
+                                                const GimpCoords *coord2,
+                                                gdouble           precision,
+                                                GimpCoords       *ret_point,
+                                                gdouble          *ret_pos)
+{
+  GArray     *ret_coords;
+  GArray     *ret_params;
+  GimpCoords  dir, line, dcoord, min_point;
+  gdouble     min_dist = -1;
+  gdouble     dist, length2, scalar, ori, ori2;
+  gint        i;
+
+  gimp_coords_difference (coord2, coord1, &line);
+
+  ret_coords = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+  ret_params = g_array_new (FALSE, FALSE, sizeof (gdouble));
+
+  g_printerr ("(%.2f, %.2f)-(%.2f,%.2f): ", coord1->x, coord1->y,
+              coord2->x, coord2->y);
+
+  gimp_coords_interpolate_bezier (beziercoords, precision,
+                                  ret_coords, ret_params);
+
+  g_return_val_if_fail (ret_coords->len == ret_params->len, -1.0);
+
+  if (ret_coords->len < 2)
+    return -1;
+
+  gimp_coords_difference (&g_array_index (ret_coords, GimpCoords, 1),
+                          &g_array_index (ret_coords, GimpCoords, 0),
+                          &dir);
+  ori = dir.x * line.y - dir.y * line.x;
+
+  for (i = 2; i < ret_coords->len; i++)
+    {
+      gimp_coords_difference (&g_array_index (ret_coords, GimpCoords, i),
+                              &g_array_index (ret_coords, GimpCoords, i-1),
+                              &dir);
+      ori2 = dir.x * line.y - dir.y * line.x;
+
+      if (ori * ori2 <= 0)
+        {
+          gimp_coords_difference (&g_array_index (ret_coords, GimpCoords, i),
+                                  coord1,
+                                  &dcoord);
+
+          length2 = gimp_coords_scalarprod (&line, &line);
+          scalar = gimp_coords_scalarprod (&line, &dcoord) / length2;
+
+          if (scalar >= 0 && scalar <= 1)
+            {
+              gimp_coords_mix (1.0, coord1,
+                               scalar, &line,
+                               &min_point);
+              gimp_coords_difference (&min_point,
+                                      &g_array_index (ret_coords, GimpCoords, i),
+                                      &dcoord);
+              dist = gimp_coords_length (&dcoord);
+
+              if (dist < min_dist || min_dist < 0)
+                {
+                  min_dist   = dist;
+                  *ret_point = g_array_index (ret_coords, GimpCoords, i);
+                  *ret_pos   = g_array_index (ret_params, gdouble, i);
+                }
+            }
+        }
+      ori = ori2;
+    }
+
+  if (min_dist < 0)
+    g_printerr ("-\n");
+  else
+    g_printerr ("%f: (%.2f, %.2f) /%.3f/\n", min_dist,
+                (*ret_point).x, (*ret_point).y, *ret_pos);
+
+  g_array_free (ret_coords, TRUE);
+  g_array_free (ret_params, TRUE);
+
+  return min_dist;
+}
+
+static gboolean
+gimp_bezier_stroke_is_extendable (GimpStroke *stroke,
+                                  GimpAnchor *neighbor)
+{
+  GList *listneighbor;
+  gint   loose_end;
+
+  if (stroke->closed)
+    return FALSE;
+
+  if (g_queue_is_empty (stroke->anchors))
+    return TRUE;
+
+  /* assure that there is a neighbor specified */
+  g_return_val_if_fail (neighbor != NULL, FALSE);
+
+  loose_end = 0;
+  listneighbor = stroke->anchors->tail;
+
+  /* Check if the neighbor is at an end of the control points */
+  if (listneighbor->data == neighbor)
+    {
+      loose_end = 1;
+    }
+  else
+    {
+      listneighbor = g_list_first (stroke->anchors->head);
+
+      if (listneighbor->data == neighbor)
+        {
+          loose_end = -1;
+        }
+      else
+        {
+          /*
+           * It isn't. If we are on a handle go to the nearest
+           * anchor and see if we can find an end from it.
+           * Yes, this is tedious.
+           */
+
+          listneighbor = g_queue_find (stroke->anchors, neighbor);
+
+          if (listneighbor && neighbor->type == GIMP_ANCHOR_CONTROL)
+            {
+              if (listneighbor->prev &&
+                  GIMP_ANCHOR (listneighbor->prev->data)->type == GIMP_ANCHOR_ANCHOR)
+                {
+                  listneighbor = listneighbor->prev;
+                }
+              else if (listneighbor->next &&
+                       GIMP_ANCHOR (listneighbor->next->data)->type == GIMP_ANCHOR_ANCHOR)
+                {
+                  listneighbor = listneighbor->next;
+                }
+              else
+                {
+                  loose_end = 0;
+                  listneighbor = NULL;
+                }
+            }
+
+          if (listneighbor)
+            /* we found a suitable ANCHOR_ANCHOR now, lets
+             * search for its loose end.
+             */
+            {
+              if (listneighbor->prev &&
+                  listneighbor->prev->prev == NULL)
+                {
+                  loose_end = -1;
+                }
+              else if (listneighbor->next &&
+                       listneighbor->next->next == NULL)
+                {
+                  loose_end = 1;
+                }
+            }
+        }
+    }
+
+  return (loose_end != 0);
+}
+
+GimpAnchor *
+gimp_bezier_stroke_extend (GimpStroke           *stroke,
+                           const GimpCoords     *coords,
+                           GimpAnchor           *neighbor,
+                           GimpVectorExtendMode  extend_mode)
+{
+  GimpAnchor *anchor = NULL;
+  GList      *listneighbor;
+  gint        loose_end, control_count;
+
+  if (g_queue_is_empty (stroke->anchors))
+    {
+      /* assure that there is no neighbor specified */
+      g_return_val_if_fail (neighbor == NULL, NULL);
+
+      anchor = gimp_anchor_new (GIMP_ANCHOR_CONTROL, coords);
+
+      g_queue_push_tail (stroke->anchors, anchor);
+
+      switch (extend_mode)
+        {
+        case EXTEND_SIMPLE:
+          break;
+
+        case EXTEND_EDITABLE:
+          anchor = gimp_bezier_stroke_extend (stroke,
+                                              coords, anchor,
+                                              EXTEND_SIMPLE);
+
+          /* we return the GIMP_ANCHOR_ANCHOR */
+          gimp_bezier_stroke_extend (stroke,
+                                     coords, anchor,
+                                     EXTEND_SIMPLE);
+
+          break;
+
+        default:
+          anchor = NULL;
+        }
+
+      return anchor;
+    }
+  else
+    {
+      /* assure that there is a neighbor specified */
+      g_return_val_if_fail (neighbor != NULL, NULL);
+
+      loose_end = 0;
+      listneighbor = stroke->anchors->tail;
+
+      /* Check if the neighbor is at an end of the control points */
+      if (listneighbor->data == neighbor)
+        {
+          loose_end = 1;
+        }
+      else
+        {
+          listneighbor = stroke->anchors->head;
+
+          if (listneighbor->data == neighbor)
+            {
+              loose_end = -1;
+            }
+          else
+            {
+              /*
+               * It isn't. If we are on a handle go to the nearest
+               * anchor and see if we can find an end from it.
+               * Yes, this is tedious.
+               */
+
+              listneighbor = g_queue_find (stroke->anchors, neighbor);
+
+              if (listneighbor && neighbor->type == GIMP_ANCHOR_CONTROL)
+                {
+                  if (listneighbor->prev &&
+                      GIMP_ANCHOR (listneighbor->prev->data)->type == GIMP_ANCHOR_ANCHOR)
+                    {
+                      listneighbor = listneighbor->prev;
+                    }
+                  else if (listneighbor->next &&
+                           GIMP_ANCHOR (listneighbor->next->data)->type == GIMP_ANCHOR_ANCHOR)
+                    {
+                      listneighbor = listneighbor->next;
+                    }
+                  else
+                    {
+                      loose_end = 0;
+                      listneighbor = NULL;
+                    }
+                }
+
+              if (listneighbor)
+                /* we found a suitable ANCHOR_ANCHOR now, lets
+                 * search for its loose end.
+                 */
+                {
+                  if (listneighbor->next &&
+                      listneighbor->next->next == NULL)
+                    {
+                      loose_end = 1;
+                      listneighbor = listneighbor->next;
+                    }
+                  else if (listneighbor->prev &&
+                      listneighbor->prev->prev == NULL)
+                    {
+                      loose_end = -1;
+                      listneighbor = listneighbor->prev;
+                    }
+                }
+            }
+        }
+
+      if (loose_end)
+        {
+          GimpAnchorType  type;
+
+          /* We have to detect the type of the point to add... */
+
+          control_count = 0;
+
+          if (loose_end == 1)
+            {
+              while (listneighbor &&
+                     GIMP_ANCHOR (listneighbor->data)->type == GIMP_ANCHOR_CONTROL)
+                {
+                  control_count++;
+                  listneighbor = listneighbor->prev;
+                }
+            }
+          else
+            {
+              while (listneighbor &&
+                     GIMP_ANCHOR (listneighbor->data)->type == GIMP_ANCHOR_CONTROL)
+                {
+                  control_count++;
+                  listneighbor = listneighbor->next;
+                }
+            }
+
+          switch (extend_mode)
+            {
+            case EXTEND_SIMPLE:
+              switch (control_count)
+                {
+                case 0:
+                  type = GIMP_ANCHOR_CONTROL;
+                  break;
+                case 1:
+                  if (listneighbor)  /* only one handle in the path? */
+                    type = GIMP_ANCHOR_CONTROL;
+                  else
+                    type = GIMP_ANCHOR_ANCHOR;
+                  break;
+                case 2:
+                  type = GIMP_ANCHOR_ANCHOR;
+                  break;
+                default:
+                  g_warning ("inconsistent bezier curve: "
+                             "%d successive control handles", control_count);
+                  type = GIMP_ANCHOR_ANCHOR;
+                }
+
+              anchor = gimp_anchor_new (type, coords);
+
+              if (loose_end == 1)
+                g_queue_push_tail (stroke->anchors, anchor);
+
+              if (loose_end == -1)
+                g_queue_push_head (stroke->anchors, anchor);
+              break;
+
+            case EXTEND_EDITABLE:
+              switch (control_count)
+                {
+                case 0:
+                  neighbor = gimp_bezier_stroke_extend (stroke,
+                                                        &(neighbor->position),
+                                                        neighbor,
+                                                        EXTEND_SIMPLE);
+                case 1:
+                  neighbor = gimp_bezier_stroke_extend (stroke,
+                                                        coords,
+                                                        neighbor,
+                                                        EXTEND_SIMPLE);
+                case 2:
+                  anchor = gimp_bezier_stroke_extend (stroke,
+                                                      coords,
+                                                      neighbor,
+                                                      EXTEND_SIMPLE);
+
+                  neighbor = gimp_bezier_stroke_extend (stroke,
+                                                        coords,
+                                                        anchor,
+                                                        EXTEND_SIMPLE);
+                  break;
+                default:
+                  g_warning ("inconsistent bezier curve: "
+                             "%d successive control handles", control_count);
+                }
+            }
+
+          return anchor;
+        }
+
+      return NULL;
+    }
+}
+
+static gboolean
+gimp_bezier_stroke_connect_stroke (GimpStroke *stroke,
+                                   GimpAnchor *anchor,
+                                   GimpStroke *extension,
+                                   GimpAnchor *neighbor)
+{
+  GList *list1;
+  GList *list2;
+
+  list1 = g_queue_find (stroke->anchors, anchor);
+  list1 = gimp_bezier_stroke_get_anchor_listitem (list1);
+  list2 = g_queue_find (extension->anchors, neighbor);
+  list2 = gimp_bezier_stroke_get_anchor_listitem (list2);
+
+  g_return_val_if_fail (list1 != NULL && list2 != NULL, FALSE);
+
+  if (stroke == extension)
+    {
+      g_return_val_if_fail ((list1->prev && list1->prev->prev == NULL &&
+                             list2->next && list2->next->next == NULL) ||
+                            (list1->next && list1->next->next == NULL &&
+                             list2->prev && list2->prev->prev == NULL), FALSE);
+      gimp_stroke_close (stroke);
+      return TRUE;
+    }
+
+  if (list1->prev && list1->prev->prev == NULL)
+    {
+      g_queue_reverse (stroke->anchors);
+    }
+
+  g_return_val_if_fail (list1->next && list1->next->next == NULL, FALSE);
+
+  if (list2->next && list2->next->next == NULL)
+    {
+      g_queue_reverse (extension->anchors);
+    }
+
+  g_return_val_if_fail (list2->prev && list2->prev->prev == NULL, FALSE);
+
+  for (list1 = extension->anchors->head; list1; list1 = g_list_next (list1))
+    g_queue_push_tail (stroke->anchors, list1->data);
+
+  g_queue_clear (extension->anchors);
+
+  return TRUE;
+}
+
+
+static void
+gimp_bezier_stroke_anchor_move_relative (GimpStroke            *stroke,
+                                         GimpAnchor            *anchor,
+                                         const GimpCoords      *deltacoord,
+                                         GimpAnchorFeatureType  feature)
+{
+  GimpCoords  delta, coord1, coord2;
+  GList      *anchor_list;
+
+  delta = *deltacoord;
+  delta.pressure = 0;
+  delta.xtilt    = 0;
+  delta.ytilt    = 0;
+  delta.wheel    = 0;
+
+  gimp_coords_add (&(anchor->position), &delta, &coord1);
+  anchor->position = coord1;
+
+  anchor_list = g_queue_find (stroke->anchors, anchor);
+  g_return_if_fail (anchor_list != NULL);
+
+  if (anchor->type == GIMP_ANCHOR_ANCHOR)
+    {
+      if (g_list_previous (anchor_list))
+        {
+          coord2 = GIMP_ANCHOR (g_list_previous (anchor_list)->data)->position;
+          gimp_coords_add (&coord2, &delta, &coord1);
+          GIMP_ANCHOR (g_list_previous (anchor_list)->data)->position = coord1;
+        }
+
+      if (g_list_next (anchor_list))
+        {
+          coord2 = GIMP_ANCHOR (g_list_next (anchor_list)->data)->position;
+          gimp_coords_add (&coord2, &delta, &coord1);
+          GIMP_ANCHOR (g_list_next (anchor_list)->data)->position = coord1;
+        }
+    }
+  else
+    {
+      if (feature == GIMP_ANCHOR_FEATURE_SYMMETRIC)
+        {
+          GList *neighbour = NULL, *opposite = NULL;
+
+          /* search for opposite control point. Sigh. */
+          neighbour = g_list_previous (anchor_list);
+          if (neighbour &&
+              GIMP_ANCHOR (neighbour->data)->type == GIMP_ANCHOR_ANCHOR)
+            {
+              opposite = g_list_previous (neighbour);
+            }
+          else
+            {
+              neighbour = g_list_next (anchor_list);
+              if (neighbour &&
+                  GIMP_ANCHOR (neighbour->data)->type == GIMP_ANCHOR_ANCHOR)
+                {
+                  opposite = g_list_next (neighbour);
+                }
+            }
+          if (opposite &&
+              GIMP_ANCHOR (opposite->data)->type == GIMP_ANCHOR_CONTROL)
+            {
+              gimp_coords_difference (&(GIMP_ANCHOR (neighbour->data)->position),
+                                      &(anchor->position), &delta);
+              gimp_coords_add (&(GIMP_ANCHOR (neighbour->data)->position),
+                               &delta, &coord1);
+              GIMP_ANCHOR (opposite->data)->position = coord1;
+            }
+        }
+    }
+}
+
+
+static void
+gimp_bezier_stroke_anchor_move_absolute (GimpStroke            *stroke,
+                                         GimpAnchor            *anchor,
+                                         const GimpCoords      *coord,
+                                         GimpAnchorFeatureType  feature)
+{
+  GimpCoords deltacoord;
+
+  gimp_coords_difference (coord, &anchor->position, &deltacoord);
+  gimp_bezier_stroke_anchor_move_relative (stroke, anchor,
+                                           &deltacoord, feature);
+}
+
+static void
+gimp_bezier_stroke_anchor_convert (GimpStroke            *stroke,
+                                   GimpAnchor            *anchor,
+                                   GimpAnchorFeatureType  feature)
+{
+  GList *anchor_list;
+
+  anchor_list = g_queue_find (stroke->anchors, anchor);
+
+  g_return_if_fail (anchor_list != NULL);
+
+  switch (feature)
+    {
+    case GIMP_ANCHOR_FEATURE_EDGE:
+      if (anchor->type == GIMP_ANCHOR_ANCHOR)
+        {
+          if (g_list_previous (anchor_list))
+            GIMP_ANCHOR (g_list_previous (anchor_list)->data)->position =
+              anchor->position;
+
+          if (g_list_next (anchor_list))
+            GIMP_ANCHOR (g_list_next (anchor_list)->data)->position =
+              anchor->position;
+        }
+      else
+        {
+          if (g_list_previous (anchor_list) &&
+              GIMP_ANCHOR (g_list_previous (anchor_list)->data)->type == GIMP_ANCHOR_ANCHOR)
+            anchor->position = GIMP_ANCHOR (g_list_previous (anchor_list)->data)->position;
+          if (g_list_next (anchor_list) &&
+              GIMP_ANCHOR (g_list_next (anchor_list)->data)->type == GIMP_ANCHOR_ANCHOR)
+            anchor->position = GIMP_ANCHOR (g_list_next (anchor_list)->data)->position;
+        }
+
+      break;
+
+    default:
+      g_warning ("gimp_bezier_stroke_anchor_convert: "
+                 "unimplemented anchor conversion %d\n", feature);
+    }
+}
+
+
+static GimpBezierDesc *
+gimp_bezier_stroke_make_bezier (GimpStroke *stroke)
+{
+  GArray            *points;
+  GArray            *cmd_array;
+  GimpBezierDesc    *bezdesc;
+  cairo_path_data_t  pathdata;
+  gint               num_cmds, i;
+
+  points = gimp_stroke_control_points_get (stroke, NULL);
+
+  g_return_val_if_fail (points && points->len % 3 == 0, NULL);
+  if (points->len < 3)
+    return NULL;
+
+  /* Moveto + (n-1) * curveto + (if closed) curveto + closepath */
+  num_cmds = 2 + (points->len / 3 - 1) * 4;
+  if (stroke->closed)
+    num_cmds += 1 + 4;
+
+  cmd_array = g_array_sized_new (FALSE, FALSE,
+                                 sizeof (cairo_path_data_t),
+                                 num_cmds);
+
+  pathdata.header.type = CAIRO_PATH_MOVE_TO;
+  pathdata.header.length = 2;
+  g_array_append_val (cmd_array, pathdata);
+  pathdata.point.x = g_array_index (points, GimpAnchor, 1).position.x;
+  pathdata.point.y = g_array_index (points, GimpAnchor, 1).position.y;
+  g_array_append_val (cmd_array, pathdata);
+
+  for (i = 2; i+2 < points->len; i += 3)
+    {
+      pathdata.header.type = CAIRO_PATH_CURVE_TO;
+      pathdata.header.length = 4;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.point.x = g_array_index (points, GimpAnchor, i).position.x;
+      pathdata.point.y = g_array_index (points, GimpAnchor, i).position.y;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.point.x = g_array_index (points, GimpAnchor, i+1).position.x;
+      pathdata.point.y = g_array_index (points, GimpAnchor, i+1).position.y;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.point.x = g_array_index (points, GimpAnchor, i+2).position.x;
+      pathdata.point.y = g_array_index (points, GimpAnchor, i+2).position.y;
+      g_array_append_val (cmd_array, pathdata);
+    }
+
+  if (stroke->closed)
+    {
+      pathdata.header.type = CAIRO_PATH_CURVE_TO;
+      pathdata.header.length = 4;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.point.x = g_array_index (points, GimpAnchor, i).position.x;
+      pathdata.point.y = g_array_index (points, GimpAnchor, i).position.y;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.point.x = g_array_index (points, GimpAnchor, 0).position.x;
+      pathdata.point.y = g_array_index (points, GimpAnchor, 0).position.y;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.point.x = g_array_index (points, GimpAnchor, 1).position.x;
+      pathdata.point.y = g_array_index (points, GimpAnchor, 1).position.y;
+      g_array_append_val (cmd_array, pathdata);
+
+      pathdata.header.type = CAIRO_PATH_CLOSE_PATH;
+      pathdata.header.length = 1;
+      g_array_append_val (cmd_array, pathdata);
+    }
+
+  if (cmd_array->len != num_cmds)
+    g_printerr ("miscalculated path cmd length! (%d vs. %d)\n",
+                cmd_array->len, num_cmds);
+
+  bezdesc = gimp_bezier_desc_new ((cairo_path_data_t *) cmd_array->data,
+                                  cmd_array->len);
+  g_array_free (points, TRUE);
+  g_array_free (cmd_array, FALSE);
+
+  return bezdesc;
+}
+
+
+static GArray *
+gimp_bezier_stroke_interpolate (GimpStroke *stroke,
+                                gdouble     precision,
+                                gboolean   *ret_closed)
+{
+  GArray     *ret_coords;
+  GimpAnchor *anchor;
+  GList      *anchorlist;
+  GimpCoords  segmentcoords[4];
+  gint        count;
+  gboolean    need_endpoint = FALSE;
+
+  if (g_queue_is_empty (stroke->anchors))
+    {
+      if (ret_closed)
+        *ret_closed = FALSE;
+      return NULL;
+    }
+
+  ret_coords = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+
+  count = 0;
+
+  for (anchorlist = stroke->anchors->head;
+       anchorlist && GIMP_ANCHOR (anchorlist->data)->type != GIMP_ANCHOR_ANCHOR;
+       anchorlist = g_list_next (anchorlist));
+
+  for ( ; anchorlist; anchorlist = g_list_next (anchorlist))
+    {
+      anchor = anchorlist->data;
+
+      segmentcoords[count] = anchor->position;
+      count++;
+
+      if (count == 4)
+        {
+          gimp_coords_interpolate_bezier (segmentcoords, precision,
+                                          ret_coords, NULL);
+          segmentcoords[0] = segmentcoords[3];
+          count = 1;
+          need_endpoint = TRUE;
+        }
+    }
+
+  if (stroke->closed && ! g_queue_is_empty (stroke->anchors))
+    {
+      anchorlist = stroke->anchors->head;
+
+      while (count < 3)
+        {
+          segmentcoords[count] = GIMP_ANCHOR (anchorlist->data)->position;
+          count++;
+        }
+      anchorlist = g_list_next (anchorlist);
+      if (anchorlist)
+        segmentcoords[3] = GIMP_ANCHOR (anchorlist->data)->position;
+
+      gimp_coords_interpolate_bezier (segmentcoords, precision,
+                                      ret_coords, NULL);
+      need_endpoint = TRUE;
+
+    }
+
+  if (need_endpoint)
+    ret_coords = g_array_append_val (ret_coords, segmentcoords[3]);
+
+  if (ret_closed)
+    *ret_closed = stroke->closed;
+
+  if (ret_coords->len == 0)
+    {
+      g_array_free (ret_coords, TRUE);
+      ret_coords = NULL;
+    }
+
+  return ret_coords;
+}
+
+
+static void
+gimp_bezier_stroke_transform (GimpStroke        *stroke,
+                              const GimpMatrix3 *matrix,
+                              GQueue            *ret_strokes)
+{
+  GimpStroke *first_stroke = NULL;
+  GimpStroke *last_stroke  = NULL;
+  GList      *anchorlist;
+  GimpAnchor *anchor;
+  GimpCoords  segmentcoords[4];
+  GQueue     *transformed[2];
+  gint        n_transformed;
+  gint        count;
+  gboolean    first;
+  gboolean    last;
+
+  /* if there's no need for clipping, use the default implementation */
+  if (! ret_strokes                   ||
+      gimp_matrix3_is_affine (matrix) ||
+      g_queue_is_empty (stroke->anchors))
+    {
+      GIMP_STROKE_CLASS (parent_class)->transform (stroke, matrix, ret_strokes);
+
+      return;
+    }
+
+  /* transform the individual segments */
+  count = 0;
+  first = TRUE;
+  last  = FALSE;
+
+  /* find the first non-control anchor */
+  for (anchorlist = stroke->anchors->head;
+       anchorlist && GIMP_ANCHOR (anchorlist->data)->type != GIMP_ANCHOR_ANCHOR;
+       anchorlist = g_list_next (anchorlist));
+
+  for ( ; anchorlist || stroke->closed; anchorlist = g_list_next (anchorlist))
+    {
+      /* wrap around if 'stroke' is closed, so that we transform the final
+       * segment
+       */
+      if (! anchorlist)
+        {
+          anchorlist = stroke->anchors->head;
+          last       = TRUE;
+        }
+
+      anchor = anchorlist->data;
+
+      segmentcoords[count] = anchor->position;
+      count++;
+
+      if (count == 4)
+        {
+          gboolean start_in;
+          gboolean end_in;
+          gint     i;
+
+          gimp_transform_bezier_coords (matrix, segmentcoords,
+                                        transformed, &n_transformed,
+                                        &start_in, &end_in);
+
+          for (i = 0; i < n_transformed; i++)
+            {
+              GimpStroke *s = NULL;
+              GList      *list;
+              gint        j;
+
+              if (i == 0 && start_in)
+                {
+                  /* current stroke is connected to last stroke */
+                  s = last_stroke;
+                }
+              else if (last_stroke)
+                {
+                  /* current stroke is not connected to last stroke.  finalize
+                   * last stroke.
+                   */
+                  anchor = g_queue_peek_tail (last_stroke->anchors);
+
+                  g_queue_push_tail (last_stroke->anchors,
+                                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                                      &anchor->position));
+                }
+
+              for (list = transformed[i]->head; list; list = g_list_next (list))
+                {
+                  GimpCoords *transformedcoords = list->data;
+
+                  if (! s)
+                    {
+                      /* start a new stroke */
+                      s = gimp_bezier_stroke_new ();
+
+                      g_queue_push_tail (s->anchors,
+                                         gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                                          &transformedcoords[0]));
+
+                      g_queue_push_tail (ret_strokes, s);
+
+                      j = 0;
+                    }
+                  else
+                    {
+                      /* continue an existing stroke, skipping the first anchor,
+                       * which is the same as the last anchor of the last stroke
+                       */
+                      j = 1;
+                    }
+
+                  for (; j < 4; j++)
+                    {
+                      GimpAnchorType type;
+
+                      if (j == 0 || j == 3)
+                        type = GIMP_ANCHOR_ANCHOR;
+                      else
+                        type = GIMP_ANCHOR_CONTROL;
+
+                      g_queue_push_tail (s->anchors,
+                                         gimp_anchor_new (type,
+                                                          &transformedcoords[j]));
+                    }
+
+                  g_free (transformedcoords);
+                }
+
+              g_queue_free (transformed[i]);
+
+              /* if the current stroke is an initial segment of 'stroke',
+               * remember it, so that we can possibly connect it to the last
+               * stroke later.
+               */
+              if (i == 0 && start_in && first)
+                first_stroke = s;
+
+              last_stroke = s;
+              first       = FALSE;
+            }
+
+          if (! end_in && last_stroke)
+            {
+              /* the next stroke is not connected to the last stroke.  finalize
+               * the last stroke.
+               */
+              anchor = g_queue_peek_tail (last_stroke->anchors);
+
+              g_queue_push_tail (last_stroke->anchors,
+                                 gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                                  &anchor->position));
+
+              last_stroke = NULL;
+            }
+
+          if (last)
+            break;
+
+          segmentcoords[0] = segmentcoords[3];
+          count = 1;
+        }
+    }
+
+  /* if the last stroke is a final segment of 'stroke'... */
+  if (last_stroke)
+    {
+      /* ... and the first stroke is an initial segment of 'stroke', and
+       * 'stroke' is closed ...
+       */
+      if (first_stroke && stroke->closed)
+        {
+          /* connect the first and last strokes */
+
+          /* remove the first anchor, which is a synthetic control point */
+          gimp_anchor_free (g_queue_pop_head (first_stroke->anchors));
+          /* remove the last anchor, which is the same anchor point as the
+           * first anchor
+           */
+          gimp_anchor_free (g_queue_pop_tail (last_stroke->anchors));
+
+          if (first_stroke == last_stroke)
+            {
+              /* the result is a single stroke.  move the last anchor, which is
+               * an orphan control point, to the front, to fill in the removed
+               * control point of the first anchor, and close the stroke.
+               */
+              g_queue_push_head (first_stroke->anchors,
+                                 g_queue_pop_tail (first_stroke->anchors));
+
+              first_stroke->closed = TRUE;
+            }
+          else
+            {
+              /* the result is multiple strokes.  prepend the last stroke to
+               * the first stroke, and discard it.
+               */
+              while ((anchor = g_queue_pop_tail (last_stroke->anchors)))
+                g_queue_push_head (first_stroke->anchors, anchor);
+
+              g_object_unref (g_queue_pop_tail (ret_strokes));
+            }
+        }
+      else
+        {
+          /* otherwise, the first and last strokes are not connected.  finalize
+           * the last stroke.
+           */
+          anchor = g_queue_peek_tail (last_stroke->anchors);
+
+          g_queue_push_tail (last_stroke->anchors,
+                             gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                              &anchor->position));
+        }
+    }
+}
+
+
+GimpStroke *
+gimp_bezier_stroke_new_moveto (const GimpCoords *start)
+{
+  GimpStroke *stroke = gimp_bezier_stroke_new ();
+
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      start));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_ANCHOR,
+                                      start));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      start));
+  return stroke;
+}
+
+void
+gimp_bezier_stroke_lineto (GimpStroke       *stroke,
+                           const GimpCoords *end)
+{
+  g_return_if_fail (GIMP_IS_BEZIER_STROKE (stroke));
+  g_return_if_fail (stroke->closed == FALSE);
+  g_return_if_fail (g_queue_is_empty (stroke->anchors) == FALSE);
+
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      end));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_ANCHOR,
+                                      end));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      end));
+}
+
+void
+gimp_bezier_stroke_conicto (GimpStroke       *stroke,
+                            const GimpCoords *control,
+                            const GimpCoords *end)
+{
+  GimpCoords start, coords;
+
+  g_return_if_fail (GIMP_IS_BEZIER_STROKE (stroke));
+  g_return_if_fail (stroke->closed == FALSE);
+  g_return_if_fail (g_queue_get_length (stroke->anchors) > 1);
+
+  start = GIMP_ANCHOR (stroke->anchors->tail->prev->data)->position;
+
+  gimp_coords_mix (2.0 / 3.0, control, 1.0 / 3.0, &start, &coords);
+
+  GIMP_ANCHOR (stroke->anchors->tail->data)->position = coords;
+
+  gimp_coords_mix (2.0 / 3.0, control, 1.0 / 3.0, end, &coords);
+
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      &coords));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_ANCHOR,
+                                      end));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      end));
+}
+
+void
+gimp_bezier_stroke_cubicto (GimpStroke       *stroke,
+                            const GimpCoords *control1,
+                            const GimpCoords *control2,
+                            const GimpCoords *end)
+{
+  g_return_if_fail (GIMP_IS_BEZIER_STROKE (stroke));
+  g_return_if_fail (stroke->closed == FALSE);
+  g_return_if_fail (g_queue_is_empty (stroke->anchors) == FALSE);
+
+  GIMP_ANCHOR (stroke->anchors->tail->data)->position = *control1;
+
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      control2));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_ANCHOR,
+                                      end));
+  g_queue_push_tail (stroke->anchors,
+                     gimp_anchor_new (GIMP_ANCHOR_CONTROL,
+                                      end));
+}
+
+static gdouble
+arcto_circleparam (gdouble  h,
+                   gdouble *y)
+{
+  gdouble t0 = 0.5;
+  gdouble dt = 0.25;
+  gdouble pt0;
+  gdouble y01, y12, y23, y012, y123, y0123;   /* subdividing y[] */
+
+  while (dt >= 0.00001)
+    {
+      pt0 = (    y[0] * (1-t0) * (1-t0) * (1-t0) +
+             3 * y[1] * (1-t0) * (1-t0) * t0     +
+             3 * y[2] * (1-t0) * t0     * t0     +
+                 y[3] * t0     * t0     * t0 );
+
+      if (pt0 > h)
+        t0 = t0 - dt;
+      else if (pt0 < h)
+        t0 = t0 + dt;
+      else
+        break;
+      dt = dt/2;
+    }
+
+  y01   = y[0] * (1-t0) + y[1] * t0;
+  y12   = y[1] * (1-t0) + y[2] * t0;
+  y23   = y[2] * (1-t0) + y[3] * t0;
+  y012  = y01  * (1-t0) + y12  * t0;
+  y123  = y12  * (1-t0) + y23  * t0;
+  y0123 = y012 * (1-t0) + y123 * t0;
+
+  y[0] = y0123; y[1] = y123; y[2] = y23; /* y[3] unchanged */
+
+  return t0;
+}
+
+static void
+arcto_subdivide (gdouble     t,
+                 gint        part,
+                 GimpCoords *p)
+{
+  GimpCoords p01, p12, p23, p012, p123, p0123;
+
+  gimp_coords_mix (1-t, &(p[0]), t, &(p[1]), &p01  );
+  gimp_coords_mix (1-t, &(p[1]), t, &(p[2]), &p12  );
+  gimp_coords_mix (1-t, &(p[2]), t, &(p[3]), &p23  );
+  gimp_coords_mix (1-t,  &p01  , t,  &p12  , &p012 );
+  gimp_coords_mix (1-t,  &p12  , t,  &p23  , &p123 );
+  gimp_coords_mix (1-t,  &p012 , t,  &p123 , &p0123);
+
+  if (part == 0)
+    {
+      /* p[0] unchanged */
+      p[1] = p01;
+      p[2] = p012;
+      p[3] = p0123;
+    }
+  else
+    {
+      p[0] = p0123;
+      p[1] = p123;
+      p[2] = p23;
+      /* p[3] unchanged */
+    }
+}
+
+static void
+arcto_ellipsesegment (gdouble     radius_x,
+                      gdouble     radius_y,
+                      gdouble     phi0,
+                      gdouble     phi1,
+                      GimpCoords *ellips)
+{
+  const GimpCoords  template    = GIMP_COORDS_DEFAULT_VALUES;
+  const gdouble     circlemagic = 4.0 * (G_SQRT2 - 1.0) / 3.0;
+
+  gdouble  phi_s, phi_e;
+  gdouble  y[4];
+  gdouble  h0, h1;
+  gdouble  t0, t1;
+
+  g_return_if_fail (ellips != NULL);
+
+  y[0] = 0.0;
+  y[1] = circlemagic;
+  y[2] = 1.0;
+  y[3] = 1.0;
+
+  ellips[0] = template;
+  ellips[1] = template;
+  ellips[2] = template;
+  ellips[3] = template;
+
+  if (phi0 < phi1)
+    {
+      phi_s = floor (phi0 / G_PI_2) * G_PI_2;
+      while (phi_s < 0) phi_s += 2 * G_PI;
+      phi_e = phi_s + G_PI_2;
+    }
+  else
+    {
+      phi_e = floor (phi1 / G_PI_2) * G_PI_2;
+      while (phi_e < 0) phi_e += 2 * G_PI;
+      phi_s = phi_e + G_PI_2;
+    }
+
+  h0 = sin (fabs (phi0-phi_s));
+  h1 = sin (fabs (phi1-phi_s));
+
+  ellips[0].x = cos (phi_s); ellips[0].y = sin (phi_s);
+  ellips[3].x = cos (phi_e); ellips[3].y = sin (phi_e);
+
+  gimp_coords_mix (1, &(ellips[0]), circlemagic, &(ellips[3]), &(ellips[1]));
+  gimp_coords_mix (circlemagic, &(ellips[0]), 1, &(ellips[3]), &(ellips[2]));
+
+  if (h0 > y[0])
+    {
+      t0 = arcto_circleparam (h0, y); /* also subdivides y[] at t0 */
+      arcto_subdivide (t0, 1, ellips);
+    }
+
+  if (h1 < y[3])
+    {
+      t1 = arcto_circleparam (h1, y);
+      arcto_subdivide (t1, 0, ellips);
+    }
+
+  ellips[0].x *= radius_x ; ellips[0].y *= radius_y;
+  ellips[1].x *= radius_x ; ellips[1].y *= radius_y;
+  ellips[2].x *= radius_x ; ellips[2].y *= radius_y;
+  ellips[3].x *= radius_x ; ellips[3].y *= radius_y;
+}
+
+void
+gimp_bezier_stroke_arcto (GimpStroke       *bez_stroke,
+                          gdouble           radius_x,
+                          gdouble           radius_y,
+                          gdouble           angle_rad,
+                          gboolean          large_arc,
+                          gboolean          sweep,
+                          const GimpCoords *end)
+{
+  GimpCoords  start;
+  GimpCoords  middle;   /* between start and end */
+  GimpCoords  trans_delta;
+  GimpCoords  trans_center;
+  GimpCoords  tmp_center;
+  GimpCoords  center;
+  GimpCoords  ellips[4]; /* control points of untransformed ellipse segment */
+  GimpCoords  ctrl[4];   /* control points of next bezier segment           */
+
+  GimpMatrix3 anglerot;
+
+  gdouble     lambda;
+  gdouble     phi0, phi1, phi2;
+  gdouble     tmpx, tmpy;
+
+  g_return_if_fail (GIMP_IS_BEZIER_STROKE (bez_stroke));
+  g_return_if_fail (bez_stroke->closed == FALSE);
+  g_return_if_fail (g_queue_get_length (bez_stroke->anchors) > 1);
+
+  if (radius_x == 0 || radius_y == 0)
+    {
+      gimp_bezier_stroke_lineto (bez_stroke, end);
+      return;
+    }
+
+  start = GIMP_ANCHOR (bez_stroke->anchors->tail->prev->data)->position;
+
+  gimp_matrix3_identity (&anglerot);
+  gimp_matrix3_rotate (&anglerot, -angle_rad);
+
+  gimp_coords_mix (0.5, &start, -0.5, end, &trans_delta);
+  gimp_matrix3_transform_point (&anglerot,
+                                trans_delta.x, trans_delta.y,
+                                &tmpx, &tmpy);
+  trans_delta.x = tmpx;
+  trans_delta.y = tmpy;
+
+  lambda = (SQR (trans_delta.x) / SQR (radius_x) +
+            SQR (trans_delta.y) / SQR (radius_y));
+
+  if (lambda < 0.00001)
+    {
+      /* don't bother with it - endpoint is too close to startpoint */
+      return;
+    }
+
+  trans_center = trans_delta;
+
+  if (lambda > 1.0)
+    {
+      /* The radii are too small for a matching ellipse. We expand them
+       * so that they fit exactly (center of the ellipse between the
+       * start- and endpoint
+       */
+      radius_x *= sqrt (lambda);
+      radius_y *= sqrt (lambda);
+      trans_center.x = 0.0;
+      trans_center.y = 0.0;
+    }
+  else
+    {
+      gdouble factor = sqrt ((1.0 - lambda) / lambda);
+
+      trans_center.x =   trans_delta.y * radius_x / radius_y * factor;
+      trans_center.y = - trans_delta.x * radius_y / radius_x * factor;
+    }
+
+  if ((large_arc && sweep) || (!large_arc && !sweep))
+    {
+      trans_center.x *= -1;
+      trans_center.y *= -1;
+    }
+
+  gimp_matrix3_identity (&anglerot);
+  gimp_matrix3_rotate (&anglerot, angle_rad);
+
+  tmp_center = trans_center;
+  gimp_matrix3_transform_point (&anglerot,
+                                tmp_center.x, tmp_center.y,
+                                &tmpx, &tmpy);
+  tmp_center.x = tmpx;
+  tmp_center.y = tmpy;
+
+  gimp_coords_mix (0.5, &start, 0.5, end, &middle);
+  gimp_coords_add (&tmp_center, &middle, &center);
+
+  phi1 = atan2 ((trans_delta.y - trans_center.y) / radius_y,
+                (trans_delta.x - trans_center.x) / radius_x);
+
+  phi2 = atan2 ((- trans_delta.y - trans_center.y) / radius_y,
+                (- trans_delta.x - trans_center.x) / radius_x);
+
+  if (phi1 < 0)
+    phi1 += 2 * G_PI;
+
+  if (phi2 < 0)
+    phi2 += 2 * G_PI;
+
+  if (sweep)
+    {
+      while (phi2 < phi1)
+        phi2 += 2 * G_PI;
+
+      phi0 = floor (phi1 / G_PI_2) * G_PI_2;
+
+      while (phi0 < phi2)
+        {
+          arcto_ellipsesegment (radius_x, radius_y,
+                                MAX (phi0, phi1), MIN (phi0 + G_PI_2, phi2),
+                                ellips);
+
+          gimp_matrix3_transform_point (&anglerot, ellips[0].x, ellips[0].y,
+                                        &tmpx, &tmpy);
+          ellips[0].x = tmpx; ellips[0].y = tmpy;
+          gimp_matrix3_transform_point (&anglerot, ellips[1].x, ellips[1].y,
+                                        &tmpx, &tmpy);
+          ellips[1].x = tmpx; ellips[1].y = tmpy;
+          gimp_matrix3_transform_point (&anglerot, ellips[2].x, ellips[2].y,
+                                        &tmpx, &tmpy);
+          ellips[2].x = tmpx; ellips[2].y = tmpy;
+          gimp_matrix3_transform_point (&anglerot, ellips[3].x, ellips[3].y,
+                                        &tmpx, &tmpy);
+          ellips[3].x = tmpx; ellips[3].y = tmpy;
+
+          gimp_coords_add (&center, &(ellips[1]), &(ctrl[1]));
+          gimp_coords_add (&center, &(ellips[2]), &(ctrl[2]));
+          gimp_coords_add (&center, &(ellips[3]), &(ctrl[3]));
+
+          gimp_bezier_stroke_cubicto (bez_stroke,
+                                      &(ctrl[1]), &(ctrl[2]), &(ctrl[3]));
+          phi0 += G_PI_2;
+        }
+    }
+  else
+    {
+      while (phi1 < phi2)
+        phi1 += 2 * G_PI;
+
+      phi0 = ceil (phi1 / G_PI_2) * G_PI_2;
+
+      while (phi0 > phi2)
+        {
+          arcto_ellipsesegment (radius_x, radius_y,
+                                MIN (phi0, phi1), MAX (phi0 - G_PI_2, phi2),
+                                ellips);
+
+          gimp_matrix3_transform_point (&anglerot, ellips[0].x, ellips[0].y,
+                                        &tmpx, &tmpy);
+          ellips[0].x = tmpx; ellips[0].y = tmpy;
+          gimp_matrix3_transform_point (&anglerot, ellips[1].x, ellips[1].y,
+                                        &tmpx, &tmpy);
+          ellips[1].x = tmpx; ellips[1].y = tmpy;
+          gimp_matrix3_transform_point (&anglerot, ellips[2].x, ellips[2].y,
+                                        &tmpx, &tmpy);
+          ellips[2].x = tmpx; ellips[2].y = tmpy;
+          gimp_matrix3_transform_point (&anglerot, ellips[3].x, ellips[3].y,
+                                        &tmpx, &tmpy);
+          ellips[3].x = tmpx; ellips[3].y = tmpy;
+
+          gimp_coords_add (&center, &(ellips[1]), &(ctrl[1]));
+          gimp_coords_add (&center, &(ellips[2]), &(ctrl[2]));
+          gimp_coords_add (&center, &(ellips[3]), &(ctrl[3]));
+
+          gimp_bezier_stroke_cubicto (bez_stroke,
+                                      &(ctrl[1]), &(ctrl[2]), &(ctrl[3]));
+          phi0 -= G_PI_2;
+        }
+    }
+}
+
+GimpStroke *
+gimp_bezier_stroke_new_ellipse (const GimpCoords *center,
+                                gdouble           radius_x,
+                                gdouble           radius_y,
+                                gdouble           angle)
+{
+  GimpStroke    *stroke;
+  GimpCoords     p1 = *center;
+  GimpCoords     p2 = *center;
+  GimpCoords     p3 = *center;
+  GimpCoords     dx = { 0, };
+  GimpCoords     dy = { 0, };
+  const gdouble  circlemagic = 4.0 * (G_SQRT2 - 1.0) / 3.0;
+  GimpAnchor    *handle;
+
+  dx.x =   radius_x * cos (angle);
+  dx.y = - radius_x * sin (angle);
+  dy.x =   radius_y * sin (angle);
+  dy.y =   radius_y * cos (angle);
+
+  gimp_coords_mix (1.0, center, 1.0, &dx, &p1);
+  stroke = gimp_bezier_stroke_new_moveto (&p1);
+
+  handle = g_queue_peek_head (stroke->anchors);
+  gimp_coords_mix (1.0,    &p1, -circlemagic, &dy, &handle->position);
+
+  gimp_coords_mix (1.0,    &p1,  circlemagic, &dy, &p1);
+  gimp_coords_mix (1.0, center,          1.0, &dy, &p3);
+  gimp_coords_mix (1.0,    &p3,  circlemagic, &dx, &p2);
+  gimp_bezier_stroke_cubicto (stroke, &p1, &p2, &p3);
+
+  gimp_coords_mix (1.0,    &p3, -circlemagic, &dx, &p1);
+  gimp_coords_mix (1.0, center,         -1.0, &dx, &p3);
+  gimp_coords_mix (1.0,    &p3,  circlemagic, &dy, &p2);
+  gimp_bezier_stroke_cubicto (stroke, &p1, &p2, &p3);
+
+  gimp_coords_mix (1.0,    &p3, -circlemagic, &dy, &p1);
+  gimp_coords_mix (1.0, center,         -1.0, &dy, &p3);
+  gimp_coords_mix (1.0,    &p3, -circlemagic, &dx, &p2);
+  gimp_bezier_stroke_cubicto (stroke, &p1, &p2, &p3);
+
+  handle = g_queue_peek_tail (stroke->anchors);
+  gimp_coords_mix (1.0,    &p3,  circlemagic, &dx, &handle->position);
+
+  gimp_stroke_close (stroke);
+
+  return stroke;
+}
+
+
+/* helper function to get the associated anchor of a listitem */
+
+static GList *
+gimp_bezier_stroke_get_anchor_listitem (GList *list)
+{
+  if (!list)
+    return NULL;
+
+  if (GIMP_ANCHOR (list->data)->type == GIMP_ANCHOR_ANCHOR)
+    return list;
+
+  if (list->prev && GIMP_ANCHOR (list->prev->data)->type == GIMP_ANCHOR_ANCHOR)
+    return list->prev;
+
+  if (list->next && GIMP_ANCHOR (list->next->data)->type == GIMP_ANCHOR_ANCHOR)
+    return list->next;
+
+  g_return_val_if_fail (/* bezier stroke inconsistent! */ FALSE, NULL);
+
+  return NULL;
+}
diff --git a/app/vectors/gimpbezierstroke.h b/app/vectors/gimpbezierstroke.h
new file mode 100644
index 0000000..2fe6b98
--- /dev/null
+++ b/app/vectors/gimpbezierstroke.h
@@ -0,0 +1,84 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbezierstroke.h
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BEZIER_STROKE_H__
+#define __GIMP_BEZIER_STROKE_H__
+
+#include "gimpstroke.h"
+
+
+#define GIMP_TYPE_BEZIER_STROKE            (gimp_bezier_stroke_get_type ())
+#define GIMP_BEZIER_STROKE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BEZIER_STROKE, GimpBezierStroke))
+#define GIMP_BEZIER_STROKE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BEZIER_STROKE, GimpBezierStrokeClass))
+#define GIMP_IS_BEZIER_STROKE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BEZIER_STROKE))
+#define GIMP_IS_BEZIER_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BEZIER_STROKE))
+#define GIMP_BEZIER_STROKE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BEZIER_STROKE, GimpBezierStrokeClass))
+
+
+typedef struct _GimpBezierStrokeClass GimpBezierStrokeClass;
+
+struct _GimpBezierStroke
+{
+  GimpStroke  parent_instance;
+};
+
+struct _GimpBezierStrokeClass
+{
+  GimpStrokeClass  parent_class;
+};
+
+
+GType        gimp_bezier_stroke_get_type        (void) G_GNUC_CONST;
+
+GimpStroke * gimp_bezier_stroke_new             (void);
+GimpStroke * gimp_bezier_stroke_new_from_coords (const GimpCoords *coords,
+                                                 gint              n_coords,
+                                                 gboolean          closed);
+
+GimpStroke * gimp_bezier_stroke_new_moveto      (const GimpCoords *start);
+void         gimp_bezier_stroke_lineto          (GimpStroke       *bez_stroke,
+                                                 const GimpCoords *end);
+void         gimp_bezier_stroke_conicto         (GimpStroke       *bez_stroke,
+                                                 const GimpCoords *control,
+                                                 const GimpCoords *end);
+void         gimp_bezier_stroke_cubicto         (GimpStroke       *bez_stroke,
+                                                 const GimpCoords *control1,
+                                                 const GimpCoords *control2,
+                                                 const GimpCoords *end);
+void         gimp_bezier_stroke_arcto           (GimpStroke       *bez_stroke,
+                                                 gdouble           radius_x,
+                                                 gdouble           radius_y,
+                                                 gdouble           angle_rad,
+                                                 gboolean          large_arc,
+                                                 gboolean          sweep,
+                                                 const GimpCoords *end);
+GimpStroke * gimp_bezier_stroke_new_ellipse     (const GimpCoords *center,
+                                                 gdouble           radius_x,
+                                                 gdouble           radius_y,
+                                                 gdouble           angle);
+
+
+GimpAnchor * gimp_bezier_stroke_extend      (GimpStroke           *stroke,
+                                             const GimpCoords     *coords,
+                                             GimpAnchor           *neighbor,
+                                             GimpVectorExtendMode  extend_mode);
+
+
+#endif /* __GIMP_BEZIER_STROKE_H__ */
diff --git a/app/vectors/gimpstroke-new.c b/app/vectors/gimpstroke-new.c
new file mode 100644
index 0000000..daba683
--- /dev/null
+++ b/app/vectors/gimpstroke-new.c
@@ -0,0 +1,47 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstroke-new.c
+ * Copyright (C) 2006 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+
+#include "vectors-types.h"
+
+#include "gimpstroke-new.h"
+#include "gimpbezierstroke.h"
+
+
+GimpStroke *
+gimp_stroke_new_from_coords (GimpVectorsStrokeType  type,
+                             const GimpCoords      *coords,
+                             gint                   n_coords,
+                             gboolean               closed)
+{
+  switch (type)
+    {
+    case GIMP_VECTORS_STROKE_TYPE_BEZIER:
+      return gimp_bezier_stroke_new_from_coords (coords, n_coords, closed);
+      break;
+    default:
+      g_warning ("unknown type in gimp_stroke_new_from_coords(): %d", type);
+      return NULL;
+    }
+}
+
diff --git a/app/vectors/gimpstroke-new.h b/app/vectors/gimpstroke-new.h
new file mode 100644
index 0000000..5365cc5
--- /dev/null
+++ b/app/vectors/gimpstroke-new.h
@@ -0,0 +1,31 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstroke-new.c
+ * Copyright (C) 2006 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_NEW_H__
+#define __GIMP_VECTORS_NEW_H__
+
+
+GimpStroke * gimp_stroke_new_from_coords (GimpVectorsStrokeType  type,
+                                          const GimpCoords      *coords,
+                                          gint                   n_coords,
+                                          gboolean               closed);
+
+
+#endif /* __GIMP_VECTORS_NEW_H__ */
diff --git a/app/vectors/gimpstroke.c b/app/vectors/gimpstroke.c
new file mode 100644
index 0000000..3a3ab90
--- /dev/null
+++ b/app/vectors/gimpstroke.c
@@ -0,0 +1,1431 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstroke.c
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "vectors-types.h"
+
+#include "core/gimp-memsize.h"
+#include "core/gimpcoords.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimp-transform-utils.h"
+
+#include "gimpanchor.h"
+#include "gimpstroke.h"
+
+enum
+{
+  PROP_0,
+  PROP_CONTROL_POINTS,
+  PROP_CLOSED
+};
+
+/* Prototypes */
+
+static void    gimp_stroke_set_property              (GObject      *object,
+                                                      guint         property_id,
+                                                      const GValue *value,
+                                                      GParamSpec   *pspec);
+static void    gimp_stroke_get_property              (GObject      *object,
+                                                      guint         property_id,
+                                                      GValue       *value,
+                                                      GParamSpec   *pspec);
+static void    gimp_stroke_finalize                  (GObject      *object);
+
+static gint64  gimp_stroke_get_memsize               (GimpObject   *object,
+                                                      gint64       *gui_size);
+
+static GimpAnchor * gimp_stroke_real_anchor_get      (GimpStroke       *stroke,
+                                                      const GimpCoords *coord);
+static GimpAnchor * gimp_stroke_real_anchor_get_next (GimpStroke       *stroke,
+                                                      const GimpAnchor *prev);
+static void         gimp_stroke_real_anchor_select   (GimpStroke       *stroke,
+                                                      GimpAnchor       *anchor,
+                                                      gboolean          selected,
+                                                      gboolean          exclusive);
+static void    gimp_stroke_real_anchor_move_relative (GimpStroke       *stroke,
+                                                      GimpAnchor       *anchor,
+                                                      const GimpCoords *delta,
+                                                      GimpAnchorFeatureType feature);
+static void    gimp_stroke_real_anchor_move_absolute (GimpStroke       *stroke,
+                                                      GimpAnchor       *anchor,
+                                                      const GimpCoords *delta,
+                                                      GimpAnchorFeatureType feature);
+static void         gimp_stroke_real_anchor_convert  (GimpStroke       *stroke,
+                                                      GimpAnchor       *anchor,
+                                                      GimpAnchorFeatureType  feature);
+static void         gimp_stroke_real_anchor_delete   (GimpStroke       *stroke,
+                                                      GimpAnchor       *anchor);
+static gboolean     gimp_stroke_real_point_is_movable
+                                              (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position);
+static void         gimp_stroke_real_point_move_relative
+                                              (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position,
+                                               const GimpCoords      *deltacoord,
+                                               GimpAnchorFeatureType  feature);
+static void         gimp_stroke_real_point_move_absolute
+                                              (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position,
+                                               const GimpCoords      *coord,
+                                               GimpAnchorFeatureType  feature);
+
+static void         gimp_stroke_real_close           (GimpStroke       *stroke);
+static GimpStroke * gimp_stroke_real_open            (GimpStroke       *stroke,
+                                                      GimpAnchor       *end_anchor);
+static gboolean     gimp_stroke_real_anchor_is_insertable
+                                                     (GimpStroke       *stroke,
+                                                      GimpAnchor       *predec,
+                                                      gdouble           position);
+static GimpAnchor * gimp_stroke_real_anchor_insert   (GimpStroke       *stroke,
+                                                      GimpAnchor       *predec,
+                                                      gdouble           position);
+
+static gboolean     gimp_stroke_real_is_extendable   (GimpStroke       *stroke,
+                                                      GimpAnchor       *neighbor);
+
+static GimpAnchor * gimp_stroke_real_extend (GimpStroke           *stroke,
+                                             const GimpCoords     *coords,
+                                             GimpAnchor           *neighbor,
+                                             GimpVectorExtendMode  extend_mode);
+
+gboolean     gimp_stroke_real_connect_stroke (GimpStroke          *stroke,
+                                              GimpAnchor          *anchor,
+                                              GimpStroke          *extension,
+                                              GimpAnchor          *neighbor);
+
+
+static gboolean     gimp_stroke_real_is_empty        (GimpStroke       *stroke);
+
+static gdouble      gimp_stroke_real_get_length      (GimpStroke       *stroke,
+                                                      gdouble           precision);
+static gdouble      gimp_stroke_real_get_distance    (GimpStroke       *stroke,
+                                                      const GimpCoords *coord);
+static GArray *     gimp_stroke_real_interpolate     (GimpStroke       *stroke,
+                                                      gdouble           precision,
+                                                      gboolean         *closed);
+static GimpStroke * gimp_stroke_real_duplicate       (GimpStroke       *stroke);
+static GimpBezierDesc * gimp_stroke_real_make_bezier (GimpStroke       *stroke);
+
+static void         gimp_stroke_real_translate       (GimpStroke       *stroke,
+                                                      gdouble           offset_x,
+                                                      gdouble           offset_y);
+static void         gimp_stroke_real_scale           (GimpStroke       *stroke,
+                                                      gdouble           scale_x,
+                                                      gdouble           scale_y);
+static void         gimp_stroke_real_rotate          (GimpStroke       *stroke,
+                                                      gdouble           center_x,
+                                                      gdouble           center_y,
+                                                      gdouble           angle);
+static void         gimp_stroke_real_flip            (GimpStroke       *stroke,
+                                                      GimpOrientationType flip_type,
+                                                      gdouble           axis);
+static void         gimp_stroke_real_flip_free       (GimpStroke       *stroke,
+                                                      gdouble           x1,
+                                                      gdouble           y1,
+                                                      gdouble           x2,
+                                                      gdouble           y2);
+static void         gimp_stroke_real_transform       (GimpStroke        *stroke,
+                                                      const GimpMatrix3 *matrix,
+                                                      GQueue            *ret_strokes);
+
+static GList    * gimp_stroke_real_get_draw_anchors  (GimpStroke       *stroke);
+static GList    * gimp_stroke_real_get_draw_controls (GimpStroke       *stroke);
+static GArray   * gimp_stroke_real_get_draw_lines    (GimpStroke       *stroke);
+static GArray *  gimp_stroke_real_control_points_get (GimpStroke       *stroke,
+                                                      gboolean         *ret_closed);
+static gboolean   gimp_stroke_real_get_point_at_dist (GimpStroke       *stroke,
+                                                      gdouble           dist,
+                                                      gdouble           precision,
+                                                      GimpCoords       *position,
+                                                      gdouble          *slope);
+
+
+G_DEFINE_TYPE (GimpStroke, gimp_stroke, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_stroke_parent_class
+
+
+static void
+gimp_stroke_class_init (GimpStrokeClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GParamSpec      *param_spec;
+
+  object_class->finalize          = gimp_stroke_finalize;
+  object_class->get_property      = gimp_stroke_get_property;
+  object_class->set_property      = gimp_stroke_set_property;
+
+  gimp_object_class->get_memsize  = gimp_stroke_get_memsize;
+
+  klass->changed                  = NULL;
+  klass->removed                  = NULL;
+
+  klass->anchor_get               = gimp_stroke_real_anchor_get;
+  klass->anchor_get_next          = gimp_stroke_real_anchor_get_next;
+  klass->anchor_select            = gimp_stroke_real_anchor_select;
+  klass->anchor_move_relative     = gimp_stroke_real_anchor_move_relative;
+  klass->anchor_move_absolute     = gimp_stroke_real_anchor_move_absolute;
+  klass->anchor_convert           = gimp_stroke_real_anchor_convert;
+  klass->anchor_delete            = gimp_stroke_real_anchor_delete;
+
+  klass->point_is_movable         = gimp_stroke_real_point_is_movable;
+  klass->point_move_relative      = gimp_stroke_real_point_move_relative;
+  klass->point_move_absolute      = gimp_stroke_real_point_move_absolute;
+
+  klass->nearest_point_get        = NULL;
+  klass->nearest_tangent_get      = NULL;
+  klass->nearest_intersection_get = NULL;
+  klass->close                    = gimp_stroke_real_close;
+  klass->open                     = gimp_stroke_real_open;
+  klass->anchor_is_insertable     = gimp_stroke_real_anchor_is_insertable;
+  klass->anchor_insert            = gimp_stroke_real_anchor_insert;
+  klass->is_extendable            = gimp_stroke_real_is_extendable;
+  klass->extend                   = gimp_stroke_real_extend;
+  klass->connect_stroke           = gimp_stroke_real_connect_stroke;
+
+  klass->is_empty                 = gimp_stroke_real_is_empty;
+  klass->get_length               = gimp_stroke_real_get_length;
+  klass->get_distance             = gimp_stroke_real_get_distance;
+  klass->get_point_at_dist        = gimp_stroke_real_get_point_at_dist;
+  klass->interpolate              = gimp_stroke_real_interpolate;
+
+  klass->duplicate                = gimp_stroke_real_duplicate;
+  klass->make_bezier              = gimp_stroke_real_make_bezier;
+
+  klass->translate                = gimp_stroke_real_translate;
+  klass->scale                    = gimp_stroke_real_scale;
+  klass->rotate                   = gimp_stroke_real_rotate;
+  klass->flip                     = gimp_stroke_real_flip;
+  klass->flip_free                = gimp_stroke_real_flip_free;
+  klass->transform                = gimp_stroke_real_transform;
+
+
+  klass->get_draw_anchors         = gimp_stroke_real_get_draw_anchors;
+  klass->get_draw_controls        = gimp_stroke_real_get_draw_controls;
+  klass->get_draw_lines           = gimp_stroke_real_get_draw_lines;
+  klass->control_points_get       = gimp_stroke_real_control_points_get;
+
+  param_spec = g_param_spec_boxed ("gimp-anchor",
+                                   "Gimp Anchor",
+                                   "The control points of a Stroke",
+                                   GIMP_TYPE_ANCHOR,
+                                   GIMP_PARAM_WRITABLE |
+                                   G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (object_class, PROP_CONTROL_POINTS,
+                                   gimp_param_spec_value_array ("control-points",
+                                                                "Control Points",
+                                                                "This is an ValueArray "
+                                                                "with the initial "
+                                                                "control points of "
+                                                                "the new Stroke",
+                                                                param_spec,
+                                                                GIMP_PARAM_WRITABLE |
+                                                                G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CLOSED,
+                                   g_param_spec_boolean ("closed",
+                                                         "Close Flag",
+                                                         "this flag indicates "
+                                                         "whether the stroke "
+                                                         "is closed or not",
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_stroke_init (GimpStroke *stroke)
+{
+  stroke->anchors = g_queue_new ();
+}
+
+static void
+gimp_stroke_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpStroke     *stroke = GIMP_STROKE (object);
+  GimpValueArray *val_array;
+  gint            length;
+  gint            i;
+
+  switch (property_id)
+    {
+    case PROP_CLOSED:
+      stroke->closed = g_value_get_boolean (value);
+      break;
+
+    case PROP_CONTROL_POINTS:
+      g_return_if_fail (g_queue_is_empty (stroke->anchors));
+      g_return_if_fail (value != NULL);
+
+      val_array = g_value_get_boxed (value);
+
+      if (val_array == NULL)
+        return;
+
+      length = gimp_value_array_length (val_array);
+
+      for (i = 0; i < length; i++)
+        {
+          GValue *item = gimp_value_array_index (val_array, i);
+
+          g_return_if_fail (G_VALUE_HOLDS (item, GIMP_TYPE_ANCHOR));
+          g_queue_push_tail (stroke->anchors, g_value_dup_boxed (item));
+        }
+
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_stroke_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpStroke *stroke = GIMP_STROKE (object);
+
+  switch (property_id)
+    {
+    case PROP_CLOSED:
+      g_value_set_boolean (value, stroke->closed);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_stroke_finalize (GObject *object)
+{
+  GimpStroke *stroke = GIMP_STROKE (object);
+
+  g_queue_free_full (stroke->anchors, (GDestroyNotify) gimp_anchor_free);
+  stroke->anchors = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_stroke_get_memsize (GimpObject *object,
+                         gint64     *gui_size)
+{
+  GimpStroke *stroke  = GIMP_STROKE (object);
+  gint64      memsize = 0;
+
+  memsize += gimp_g_queue_get_memsize (stroke->anchors, sizeof (GimpAnchor));
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+void
+gimp_stroke_set_ID (GimpStroke *stroke,
+                    gint        id)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+  g_return_if_fail (stroke->ID == 0 /* we don't want changing IDs... */);
+
+  stroke->ID = id;
+}
+
+gint
+gimp_stroke_get_ID (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), -1);
+
+  return stroke->ID;
+}
+
+
+GimpAnchor *
+gimp_stroke_anchor_get (GimpStroke       *stroke,
+                        const GimpCoords *coord)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->anchor_get (stroke, coord);
+}
+
+
+gdouble
+gimp_stroke_nearest_point_get (GimpStroke       *stroke,
+                               const GimpCoords *coord,
+                               const gdouble     precision,
+                               GimpCoords       *ret_point,
+                               GimpAnchor      **ret_segment_start,
+                               GimpAnchor      **ret_segment_end,
+                               gdouble          *ret_pos)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+  g_return_val_if_fail (coord != NULL, FALSE);
+
+  if (GIMP_STROKE_GET_CLASS (stroke)->nearest_point_get)
+    return GIMP_STROKE_GET_CLASS (stroke)->nearest_point_get (stroke,
+                                                              coord,
+                                                              precision,
+                                                              ret_point,
+                                                              ret_segment_start,
+                                                              ret_segment_end,
+                                                              ret_pos);
+  return -1;
+}
+
+gdouble
+gimp_stroke_nearest_tangent_get (GimpStroke            *stroke,
+                                 const GimpCoords      *coords1,
+                                 const GimpCoords      *coords2,
+                                 gdouble                precision,
+                                 GimpCoords            *nearest,
+                                 GimpAnchor           **ret_segment_start,
+                                 GimpAnchor           **ret_segment_end,
+                                 gdouble               *ret_pos)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+  g_return_val_if_fail (coords1 != NULL, FALSE);
+  g_return_val_if_fail (coords2 != NULL, FALSE);
+
+  if (GIMP_STROKE_GET_CLASS (stroke)->nearest_tangent_get)
+    return GIMP_STROKE_GET_CLASS (stroke)->nearest_tangent_get (stroke,
+                                                                coords1,
+                                                                coords2,
+                                                                precision,
+                                                                nearest,
+                                                                ret_segment_start,
+                                                                ret_segment_end,
+                                                                ret_pos);
+  return -1;
+}
+
+gdouble
+gimp_stroke_nearest_intersection_get (GimpStroke        *stroke,
+                                      const GimpCoords  *coords1,
+                                      const GimpCoords  *direction,
+                                      gdouble            precision,
+                                      GimpCoords        *nearest,
+                                      GimpAnchor       **ret_segment_start,
+                                      GimpAnchor       **ret_segment_end,
+                                      gdouble           *ret_pos)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+  g_return_val_if_fail (coords1 != NULL, FALSE);
+  g_return_val_if_fail (direction != NULL, FALSE);
+
+  if (GIMP_STROKE_GET_CLASS (stroke)->nearest_intersection_get)
+    return GIMP_STROKE_GET_CLASS (stroke)->nearest_intersection_get (stroke,
+                                                                     coords1,
+                                                                     direction,
+                                                                     precision,
+                                                                     nearest,
+                                                                     ret_segment_start,
+                                                                     ret_segment_end,
+                                                                     ret_pos);
+  return -1;
+}
+
+static GimpAnchor *
+gimp_stroke_real_anchor_get (GimpStroke       *stroke,
+                             const GimpCoords *coord)
+{
+  gdouble     dx, dy;
+  gdouble     mindist = -1;
+  GList      *anchors;
+  GList      *list;
+  GimpAnchor *anchor = NULL;
+
+  anchors = gimp_stroke_get_draw_controls (stroke);
+
+  for (list = anchors; list; list = g_list_next (list))
+    {
+      dx = coord->x - GIMP_ANCHOR (list->data)->position.x;
+      dy = coord->y - GIMP_ANCHOR (list->data)->position.y;
+
+      if (mindist < 0 || mindist > dx * dx + dy * dy)
+        {
+          mindist = dx * dx + dy * dy;
+          anchor = GIMP_ANCHOR (list->data);
+        }
+    }
+
+  g_list_free (anchors);
+
+  anchors = gimp_stroke_get_draw_anchors (stroke);
+
+  for (list = anchors; list; list = g_list_next (list))
+    {
+      dx = coord->x - GIMP_ANCHOR (list->data)->position.x;
+      dy = coord->y - GIMP_ANCHOR (list->data)->position.y;
+
+      if (mindist < 0 || mindist > dx * dx + dy * dy)
+        {
+          mindist = dx * dx + dy * dy;
+          anchor = GIMP_ANCHOR (list->data);
+        }
+    }
+
+  g_list_free (anchors);
+
+  return anchor;
+}
+
+
+GimpAnchor *
+gimp_stroke_anchor_get_next (GimpStroke       *stroke,
+                             const GimpAnchor *prev)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->anchor_get_next (stroke, prev);
+}
+
+static GimpAnchor *
+gimp_stroke_real_anchor_get_next (GimpStroke       *stroke,
+                                  const GimpAnchor *prev)
+{
+  GList *list;
+
+  if (prev)
+    {
+      list = g_queue_find (stroke->anchors, prev);
+      if (list)
+        list = g_list_next (list);
+    }
+  else
+    {
+      list = stroke->anchors->head;
+    }
+
+  if (list)
+    return GIMP_ANCHOR (list->data);
+
+  return NULL;
+}
+
+
+void
+gimp_stroke_anchor_select (GimpStroke *stroke,
+                           GimpAnchor *anchor,
+                           gboolean    selected,
+                           gboolean    exclusive)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->anchor_select (stroke, anchor,
+                                                 selected, exclusive);
+}
+
+static void
+gimp_stroke_real_anchor_select (GimpStroke *stroke,
+                                GimpAnchor *anchor,
+                                gboolean    selected,
+                                gboolean    exclusive)
+{
+  GList *list = stroke->anchors->head;
+
+  if (exclusive)
+    {
+      while (list)
+        {
+          GIMP_ANCHOR (list->data)->selected = FALSE;
+          list = g_list_next (list);
+        }
+    }
+
+  list = g_queue_find (stroke->anchors, anchor);
+
+  if (list)
+    GIMP_ANCHOR (list->data)->selected = selected;
+}
+
+
+void
+gimp_stroke_anchor_move_relative (GimpStroke            *stroke,
+                                  GimpAnchor            *anchor,
+                                  const GimpCoords      *delta,
+                                  GimpAnchorFeatureType  feature)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+  g_return_if_fail (anchor != NULL);
+  g_return_if_fail (g_queue_find (stroke->anchors, anchor));
+
+  GIMP_STROKE_GET_CLASS (stroke)->anchor_move_relative (stroke, anchor,
+                                                        delta, feature);
+}
+
+static void
+gimp_stroke_real_anchor_move_relative (GimpStroke            *stroke,
+                                       GimpAnchor            *anchor,
+                                       const GimpCoords      *delta,
+                                       GimpAnchorFeatureType  feature)
+{
+  anchor->position.x += delta->x;
+  anchor->position.y += delta->y;
+}
+
+
+void
+gimp_stroke_anchor_move_absolute (GimpStroke            *stroke,
+                                  GimpAnchor            *anchor,
+                                  const GimpCoords      *coord,
+                                  GimpAnchorFeatureType  feature)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+  g_return_if_fail (anchor != NULL);
+  g_return_if_fail (g_queue_find (stroke->anchors, anchor));
+
+  GIMP_STROKE_GET_CLASS (stroke)->anchor_move_absolute (stroke, anchor,
+                                                        coord, feature);
+}
+
+static void
+gimp_stroke_real_anchor_move_absolute (GimpStroke            *stroke,
+                                       GimpAnchor            *anchor,
+                                       const GimpCoords      *coord,
+                                       GimpAnchorFeatureType  feature)
+{
+  anchor->position.x = coord->x;
+  anchor->position.y = coord->y;
+}
+
+gboolean
+gimp_stroke_point_is_movable (GimpStroke *stroke,
+                              GimpAnchor *predec,
+                              gdouble     position)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->point_is_movable (stroke, predec,
+                                                           position);
+}
+
+
+static gboolean
+gimp_stroke_real_point_is_movable (GimpStroke *stroke,
+                                   GimpAnchor *predec,
+                                   gdouble     position)
+{
+  return FALSE;
+}
+
+
+void
+gimp_stroke_point_move_relative (GimpStroke            *stroke,
+                                 GimpAnchor            *predec,
+                                 gdouble                position,
+                                 const GimpCoords      *deltacoord,
+                                 GimpAnchorFeatureType  feature)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->point_move_relative (stroke, predec,
+                                                       position, deltacoord,
+                                                       feature);
+}
+
+
+static void
+gimp_stroke_real_point_move_relative (GimpStroke           *stroke,
+                                      GimpAnchor           *predec,
+                                      gdouble               position,
+                                      const GimpCoords     *deltacoord,
+                                      GimpAnchorFeatureType feature)
+{
+  g_printerr ("gimp_stroke_point_move_relative: default implementation\n");
+}
+
+
+void
+gimp_stroke_point_move_absolute (GimpStroke            *stroke,
+                                 GimpAnchor            *predec,
+                                 gdouble                position,
+                                 const GimpCoords      *coord,
+                                 GimpAnchorFeatureType  feature)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->point_move_absolute (stroke, predec,
+                                                       position, coord,
+                                                       feature);
+}
+
+static void
+gimp_stroke_real_point_move_absolute (GimpStroke           *stroke,
+                                      GimpAnchor           *predec,
+                                      gdouble               position,
+                                      const GimpCoords     *coord,
+                                      GimpAnchorFeatureType feature)
+{
+  g_printerr ("gimp_stroke_point_move_absolute: default implementation\n");
+}
+
+
+void
+gimp_stroke_close (GimpStroke *stroke)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+  g_return_if_fail (g_queue_is_empty (stroke->anchors) == FALSE);
+
+  GIMP_STROKE_GET_CLASS (stroke)->close (stroke);
+}
+
+static void
+gimp_stroke_real_close (GimpStroke *stroke)
+{
+  stroke->closed = TRUE;
+  g_object_notify (G_OBJECT (stroke), "closed");
+}
+
+
+void
+gimp_stroke_anchor_convert (GimpStroke            *stroke,
+                            GimpAnchor            *anchor,
+                            GimpAnchorFeatureType  feature)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->anchor_convert (stroke, anchor, feature);
+}
+
+static void
+gimp_stroke_real_anchor_convert (GimpStroke            *stroke,
+                                 GimpAnchor            *anchor,
+                                 GimpAnchorFeatureType  feature)
+{
+  g_printerr ("gimp_stroke_anchor_convert: default implementation\n");
+}
+
+
+void
+gimp_stroke_anchor_delete (GimpStroke *stroke,
+                           GimpAnchor *anchor)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+  g_return_if_fail (anchor && anchor->type == GIMP_ANCHOR_ANCHOR);
+
+  GIMP_STROKE_GET_CLASS (stroke)->anchor_delete (stroke, anchor);
+}
+
+static void
+gimp_stroke_real_anchor_delete (GimpStroke *stroke,
+                                GimpAnchor *anchor)
+{
+  g_printerr ("gimp_stroke_anchor_delete: default implementation\n");
+}
+
+GimpStroke *
+gimp_stroke_open (GimpStroke *stroke,
+                  GimpAnchor *end_anchor)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+  g_return_val_if_fail (end_anchor &&
+                        end_anchor->type == GIMP_ANCHOR_ANCHOR, NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->open (stroke, end_anchor);
+}
+
+static GimpStroke *
+gimp_stroke_real_open (GimpStroke *stroke,
+                       GimpAnchor *end_anchor)
+{
+  g_printerr ("gimp_stroke_open: default implementation\n");
+  return NULL;
+}
+
+gboolean
+gimp_stroke_anchor_is_insertable (GimpStroke *stroke,
+                                  GimpAnchor *predec,
+                                  gdouble     position)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->anchor_is_insertable (stroke,
+                                                               predec,
+                                                               position);
+}
+
+static gboolean
+gimp_stroke_real_anchor_is_insertable (GimpStroke *stroke,
+                                       GimpAnchor *predec,
+                                       gdouble     position)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+
+  return FALSE;
+}
+
+GimpAnchor *
+gimp_stroke_anchor_insert (GimpStroke *stroke,
+                           GimpAnchor *predec,
+                           gdouble     position)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+  g_return_val_if_fail (predec->type == GIMP_ANCHOR_ANCHOR, NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->anchor_insert (stroke,
+                                                        predec, position);
+}
+
+static GimpAnchor *
+gimp_stroke_real_anchor_insert (GimpStroke *stroke,
+                                GimpAnchor *predec,
+                                gdouble     position)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return NULL;
+}
+
+
+gboolean
+gimp_stroke_is_extendable (GimpStroke *stroke,
+                           GimpAnchor *neighbor)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->is_extendable (stroke, neighbor);
+}
+
+static gboolean
+gimp_stroke_real_is_extendable (GimpStroke *stroke,
+                                GimpAnchor *neighbor)
+{
+  return FALSE;
+}
+
+
+GimpAnchor *
+gimp_stroke_extend (GimpStroke           *stroke,
+                    const GimpCoords     *coords,
+                    GimpAnchor           *neighbor,
+                    GimpVectorExtendMode  extend_mode)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+  g_return_val_if_fail (!stroke->closed, NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->extend (stroke, coords,
+                                                 neighbor, extend_mode);
+}
+
+static GimpAnchor *
+gimp_stroke_real_extend (GimpStroke           *stroke,
+                         const GimpCoords     *coords,
+                         GimpAnchor           *neighbor,
+                         GimpVectorExtendMode  extend_mode)
+{
+  g_printerr ("gimp_stroke_extend: default implementation\n");
+  return NULL;
+}
+
+gboolean
+gimp_stroke_connect_stroke (GimpStroke *stroke,
+                            GimpAnchor *anchor,
+                            GimpStroke *extension,
+                            GimpAnchor *neighbor)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+  g_return_val_if_fail (GIMP_IS_STROKE (extension), FALSE);
+  g_return_val_if_fail (stroke->closed == FALSE &&
+                        extension->closed == FALSE, FALSE);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->connect_stroke (stroke, anchor,
+                                                         extension, neighbor);
+}
+
+gboolean
+gimp_stroke_real_connect_stroke (GimpStroke *stroke,
+                                 GimpAnchor *anchor,
+                                 GimpStroke *extension,
+                                 GimpAnchor *neighbor)
+{
+  g_printerr ("gimp_stroke_connect_stroke: default implementation\n");
+  return FALSE;
+}
+
+gboolean
+gimp_stroke_is_empty (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->is_empty (stroke);
+}
+
+static gboolean
+gimp_stroke_real_is_empty (GimpStroke *stroke)
+{
+  return g_queue_is_empty (stroke->anchors);
+}
+
+
+gdouble
+gimp_stroke_get_length (GimpStroke *stroke,
+                        gdouble     precision)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), 0.0);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->get_length (stroke, precision);
+}
+
+static gdouble
+gimp_stroke_real_get_length (GimpStroke *stroke,
+                             gdouble     precision)
+{
+  GArray     *points;
+  gint        i;
+  gdouble     length;
+  GimpCoords  difference;
+
+  if (g_queue_is_empty (stroke->anchors))
+    return -1;
+
+  points = gimp_stroke_interpolate (stroke, precision, NULL);
+  if (points == NULL)
+    return -1;
+
+  length = 0;
+
+  for (i = 0; i < points->len - 1; i++ )
+    {
+       gimp_coords_difference (&(g_array_index (points, GimpCoords, i)),
+                               &(g_array_index (points, GimpCoords, i+1)),
+                               &difference);
+       length += gimp_coords_length (&difference);
+    }
+
+  g_array_free(points, TRUE);
+
+  return length;
+}
+
+
+gdouble
+gimp_stroke_get_distance (GimpStroke       *stroke,
+                          const GimpCoords *coord)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), 0.0);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->get_distance (stroke, coord);
+}
+
+static gdouble
+gimp_stroke_real_get_distance (GimpStroke       *stroke,
+                               const GimpCoords *coord)
+{
+  g_printerr ("gimp_stroke_get_distance: default implementation\n");
+
+  return 0.0;
+}
+
+
+GArray *
+gimp_stroke_interpolate (GimpStroke *stroke,
+                         gdouble     precision,
+                         gboolean   *ret_closed)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->interpolate (stroke, precision,
+                                                      ret_closed);
+}
+
+static GArray *
+gimp_stroke_real_interpolate (GimpStroke *stroke,
+                              gdouble     precision,
+                              gboolean   *ret_closed)
+{
+  g_printerr ("gimp_stroke_interpolate: default implementation\n");
+
+  return NULL;
+}
+
+GimpStroke *
+gimp_stroke_duplicate (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->duplicate (stroke);
+}
+
+static GimpStroke *
+gimp_stroke_real_duplicate (GimpStroke *stroke)
+{
+  GimpStroke *new_stroke;
+  GList      *list;
+
+  new_stroke = g_object_new (G_TYPE_FROM_INSTANCE (stroke),
+                             "name", gimp_object_get_name (stroke),
+                             NULL);
+
+  g_queue_free_full (new_stroke->anchors, (GDestroyNotify) gimp_anchor_free);
+  new_stroke->anchors = g_queue_copy (stroke->anchors);
+
+  for (list = new_stroke->anchors->head; list; list = g_list_next (list))
+    {
+      list->data = gimp_anchor_copy (GIMP_ANCHOR (list->data));
+    }
+
+  new_stroke->closed = stroke->closed;
+  /* we do *not* copy the ID! */
+
+  return new_stroke;
+}
+
+
+GimpBezierDesc *
+gimp_stroke_make_bezier (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->make_bezier (stroke);
+}
+
+static GimpBezierDesc *
+gimp_stroke_real_make_bezier (GimpStroke *stroke)
+{
+  g_printerr ("gimp_stroke_make_bezier: default implementation\n");
+
+  return NULL;
+}
+
+
+void
+gimp_stroke_translate (GimpStroke *stroke,
+                       gdouble     offset_x,
+                       gdouble     offset_y)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->translate (stroke, offset_x, offset_y);
+}
+
+static void
+gimp_stroke_real_translate (GimpStroke *stroke,
+                            gdouble     offset_x,
+                            gdouble     offset_y)
+{
+  GList *list;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      GimpAnchor *anchor = list->data;
+
+      anchor->position.x += offset_x;
+      anchor->position.y += offset_y;
+    }
+}
+
+
+void
+gimp_stroke_scale (GimpStroke *stroke,
+                   gdouble     scale_x,
+                   gdouble     scale_y)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->scale (stroke, scale_x, scale_y);
+}
+
+static void
+gimp_stroke_real_scale (GimpStroke *stroke,
+                        gdouble     scale_x,
+                        gdouble     scale_y)
+{
+  GList *list;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      GimpAnchor *anchor = list->data;
+
+      anchor->position.x *= scale_x;
+      anchor->position.y *= scale_y;
+    }
+}
+
+void
+gimp_stroke_rotate (GimpStroke *stroke,
+                    gdouble     center_x,
+                    gdouble     center_y,
+                    gdouble     angle)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->rotate (stroke, center_x, center_y, angle);
+}
+
+static void
+gimp_stroke_real_rotate (GimpStroke *stroke,
+                         gdouble     center_x,
+                         gdouble     center_y,
+                         gdouble     angle)
+{
+  GimpMatrix3  matrix;
+
+  angle = angle / 180.0 * G_PI;
+  gimp_matrix3_identity (&matrix);
+  gimp_transform_matrix_rotate_center (&matrix, center_x, center_y, angle);
+
+  gimp_stroke_transform (stroke, &matrix, NULL);
+}
+
+void
+gimp_stroke_flip (GimpStroke          *stroke,
+                  GimpOrientationType  flip_type,
+                  gdouble              axis)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->flip (stroke, flip_type, axis);
+}
+
+static void
+gimp_stroke_real_flip (GimpStroke          *stroke,
+                       GimpOrientationType  flip_type,
+                       gdouble              axis)
+{
+  GimpMatrix3  matrix;
+
+  gimp_matrix3_identity (&matrix);
+  gimp_transform_matrix_flip (&matrix, flip_type, axis);
+  gimp_stroke_transform (stroke, &matrix, NULL);
+}
+
+void
+gimp_stroke_flip_free (GimpStroke *stroke,
+                       gdouble     x1,
+                       gdouble     y1,
+                       gdouble     x2,
+                       gdouble     y2)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->flip_free (stroke, x1, y1, x2, y2);
+}
+
+static void
+gimp_stroke_real_flip_free (GimpStroke *stroke,
+                            gdouble     x1,
+                            gdouble     y1,
+                            gdouble     x2,
+                            gdouble     y2)
+{
+  /* x, y, width and height parameter in gimp_transform_matrix_flip_free are unused */
+  GimpMatrix3  matrix;
+
+  gimp_matrix3_identity (&matrix);
+  gimp_transform_matrix_flip_free (&matrix, x1, y1, x2, y2);
+
+  gimp_stroke_transform (stroke, &matrix, NULL);
+}
+
+/* transforms 'stroke' by 'matrix'.  due to clipping, the transformation may
+ * result in multiple strokes.
+ *
+ * if 'ret_strokes' is not NULL, the transformed strokes are appended to the
+ * queue, and 'stroke' is left in an unspecified state.  one of the resulting
+ * strokes may alias 'stroke'.
+ *
+ * if 'ret_strokes' is NULL, the transformation is performed in-place.  if the
+ * transformation results in multiple strokes (which, atm, can only happen for
+ * non-affine transformation), the result is undefined.
+ */
+void
+gimp_stroke_transform (GimpStroke        *stroke,
+                       const GimpMatrix3 *matrix,
+                       GQueue            *ret_strokes)
+{
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  GIMP_STROKE_GET_CLASS (stroke)->transform (stroke, matrix, ret_strokes);
+}
+
+static void
+gimp_stroke_real_transform (GimpStroke        *stroke,
+                            const GimpMatrix3 *matrix,
+                            GQueue            *ret_strokes)
+{
+  GList *list;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      GimpAnchor *anchor = list->data;
+
+      gimp_matrix3_transform_point (matrix,
+                                    anchor->position.x,
+                                    anchor->position.y,
+                                    &anchor->position.x,
+                                    &anchor->position.y);
+    }
+
+  if (ret_strokes)
+    {
+      stroke->ID = 0;
+
+      g_queue_push_tail (ret_strokes, g_object_ref (stroke));
+    }
+}
+
+
+GList *
+gimp_stroke_get_draw_anchors (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->get_draw_anchors (stroke);
+}
+
+static GList *
+gimp_stroke_real_get_draw_anchors (GimpStroke *stroke)
+{
+  GList *list;
+  GList *ret_list = NULL;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      if (GIMP_ANCHOR (list->data)->type == GIMP_ANCHOR_ANCHOR)
+        ret_list = g_list_prepend (ret_list, list->data);
+    }
+
+  return g_list_reverse (ret_list);
+}
+
+
+GList *
+gimp_stroke_get_draw_controls (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->get_draw_controls (stroke);
+}
+
+static GList *
+gimp_stroke_real_get_draw_controls (GimpStroke *stroke)
+{
+  GList *list;
+  GList *ret_list = NULL;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      GimpAnchor *anchor = list->data;
+
+      if (anchor->type == GIMP_ANCHOR_CONTROL)
+        {
+          GimpAnchor *next = list->next ? list->next->data : NULL;
+          GimpAnchor *prev = list->prev ? list->prev->data : NULL;
+
+          if (next && next->type == GIMP_ANCHOR_ANCHOR && next->selected)
+            {
+              /* Ok, this is a hack.
+               * The idea is to give control points at the end of a
+               * stroke a higher priority for the interactive tool.
+               */
+              if (prev)
+                ret_list = g_list_prepend (ret_list, anchor);
+              else
+                ret_list = g_list_append (ret_list, anchor);
+            }
+          else if (prev && prev->type == GIMP_ANCHOR_ANCHOR && prev->selected)
+            {
+              /* same here... */
+              if (next)
+                ret_list = g_list_prepend (ret_list, anchor);
+              else
+                ret_list = g_list_append (ret_list, anchor);
+            }
+        }
+    }
+
+  return g_list_reverse (ret_list);
+}
+
+
+GArray *
+gimp_stroke_get_draw_lines (GimpStroke *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->get_draw_lines (stroke);
+}
+
+static GArray *
+gimp_stroke_real_get_draw_lines (GimpStroke *stroke)
+{
+  GList  *list;
+  GArray *ret_lines = NULL;
+  gint    count = 0;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      GimpAnchor *anchor = list->data;
+
+      if (anchor->type == GIMP_ANCHOR_ANCHOR && anchor->selected)
+        {
+          if (list->next)
+            {
+              GimpAnchor *next = list->next->data;
+
+              if (count == 0)
+                ret_lines = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+
+              ret_lines = g_array_append_val (ret_lines, anchor->position);
+              ret_lines = g_array_append_val (ret_lines, next->position);
+              count += 1;
+            }
+
+          if (list->prev)
+            {
+              GimpAnchor *prev = list->prev->data;
+
+              if (count == 0)
+                ret_lines = g_array_new (FALSE, FALSE, sizeof (GimpCoords));
+
+              ret_lines = g_array_append_val (ret_lines, anchor->position);
+              ret_lines = g_array_append_val (ret_lines, prev->position);
+              count += 1;
+            }
+        }
+    }
+
+  return ret_lines;
+}
+
+GArray *
+gimp_stroke_control_points_get (GimpStroke *stroke,
+                                gboolean   *ret_closed)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), NULL);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->control_points_get (stroke,
+                                                             ret_closed);
+}
+
+static GArray *
+gimp_stroke_real_control_points_get (GimpStroke *stroke,
+                                     gboolean   *ret_closed)
+{
+  guint   num_anchors;
+  GArray *ret_array;
+  GList  *list;
+
+  num_anchors = g_queue_get_length (stroke->anchors);
+  ret_array = g_array_sized_new (FALSE, FALSE,
+                                 sizeof (GimpAnchor), num_anchors);
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      g_array_append_vals (ret_array, list->data, 1);
+    }
+
+  if (ret_closed)
+    *ret_closed = stroke->closed;
+
+  return ret_array;
+}
+
+gboolean
+gimp_stroke_get_point_at_dist (GimpStroke *stroke,
+                               gdouble     dist,
+                               gdouble     precision,
+                               GimpCoords *position,
+                               gdouble    *slope)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), FALSE);
+
+  return GIMP_STROKE_GET_CLASS (stroke)->get_point_at_dist (stroke,
+                                                            dist,
+                                                            precision,
+                                                            position,
+                                                            slope);
+}
+
+
+static gboolean
+gimp_stroke_real_get_point_at_dist (GimpStroke *stroke,
+                                    gdouble     dist,
+                                    gdouble     precision,
+                                    GimpCoords *position,
+                                    gdouble    *slope)
+{
+  GArray     *points;
+  gint        i;
+  gdouble     length;
+  gdouble     segment_length;
+  gboolean    ret = FALSE;
+  GimpCoords  difference;
+
+  points = gimp_stroke_interpolate (stroke, precision, NULL);
+  if (points == NULL)
+    return ret;
+
+  length = 0;
+  for (i=0; i < points->len - 1; i++)
+    {
+      gimp_coords_difference (&(g_array_index (points, GimpCoords , i)),
+                              &(g_array_index (points, GimpCoords , i+1)),
+                              &difference);
+      segment_length = gimp_coords_length (&difference);
+
+      if (segment_length == 0 || length + segment_length < dist )
+        {
+          length += segment_length;
+        }
+      else
+        {
+          /* x = x1 + (x2 - x1 ) u  */
+          /* x   = x1 (1-u) + u x2  */
+
+          gdouble u = (dist - length) / segment_length;
+
+          gimp_coords_mix (1 - u, &(g_array_index (points, GimpCoords , i)),
+                               u, &(g_array_index (points, GimpCoords , i+1)),
+                           position);
+
+          if (difference.x == 0)
+            *slope = G_MAXDOUBLE;
+          else
+            *slope = difference.y / difference.x;
+
+          ret = TRUE;
+          break;
+        }
+    }
+
+  g_array_free (points, TRUE);
+
+  return ret;
+}
diff --git a/app/vectors/gimpstroke.h b/app/vectors/gimpstroke.h
new file mode 100644
index 0000000..f44b9ab
--- /dev/null
+++ b/app/vectors/gimpstroke.h
@@ -0,0 +1,343 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstroke.h
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_STROKE_H__
+#define __GIMP_STROKE_H__
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_STROKE            (gimp_stroke_get_type ())
+#define GIMP_STROKE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STROKE, GimpStroke))
+#define GIMP_STROKE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STROKE, GimpStrokeClass))
+#define GIMP_IS_STROKE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_STROKE))
+#define GIMP_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_STROKE))
+#define GIMP_STROKE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_STROKE, GimpStrokeClass))
+
+
+typedef struct _GimpStrokeClass GimpStrokeClass;
+
+struct _GimpStroke
+{
+  GimpObject  parent_instance;
+  gint        ID;
+
+  GQueue     *anchors;
+
+  gboolean    closed;
+};
+
+struct _GimpStrokeClass
+{
+  GimpObjectClass  parent_class;
+
+  void          (* changed)              (GimpStroke            *stroke);
+  void          (* removed)              (GimpStroke            *stroke);
+
+  GimpAnchor  * (* anchor_get)           (GimpStroke            *stroke,
+                                          const GimpCoords      *coord);
+  gdouble       (* nearest_point_get)    (GimpStroke            *stroke,
+                                          const GimpCoords      *coord,
+                                          gdouble                precision,
+                                          GimpCoords            *ret_point,
+                                          GimpAnchor           **ret_segment_start,
+                                          GimpAnchor           **ret_segment_end,
+                                          gdouble               *ret_pos);
+  gdouble       (* nearest_tangent_get)  (GimpStroke            *stroke,
+                                          const GimpCoords      *coord1,
+                                          const GimpCoords      *coord2,
+                                          gdouble                precision,
+                                          GimpCoords            *nearest,
+                                          GimpAnchor           **ret_segment_start,
+                                          GimpAnchor           **ret_segment_end,
+                                          gdouble               *ret_pos);
+  gdouble       (* nearest_intersection_get)
+                                         (GimpStroke            *stroke,
+                                          const GimpCoords      *coord1,
+                                          const GimpCoords      *direction,
+                                          gdouble                precision,
+                                          GimpCoords            *nearest,
+                                          GimpAnchor           **ret_segment_start,
+                                          GimpAnchor           **ret_segment_end,
+                                          gdouble               *ret_pos);
+  GimpAnchor  * (* anchor_get_next)      (GimpStroke            *stroke,
+                                          const GimpAnchor      *prev);
+  void          (* anchor_select)        (GimpStroke            *stroke,
+                                          GimpAnchor            *anchor,
+                                          gboolean               selected,
+                                          gboolean               exclusive);
+  void          (* anchor_move_relative) (GimpStroke            *stroke,
+                                          GimpAnchor            *anchor,
+                                          const GimpCoords      *deltacoord,
+                                          GimpAnchorFeatureType  feature);
+  void          (* anchor_move_absolute) (GimpStroke            *stroke,
+                                          GimpAnchor            *anchor,
+                                          const GimpCoords      *coord,
+                                          GimpAnchorFeatureType  feature);
+  void          (* anchor_convert)       (GimpStroke            *stroke,
+                                          GimpAnchor            *anchor,
+                                          GimpAnchorFeatureType  feature);
+  void          (* anchor_delete)        (GimpStroke            *stroke,
+                                          GimpAnchor            *anchor);
+
+  gboolean      (* point_is_movable)     (GimpStroke            *stroke,
+                                          GimpAnchor            *predec,
+                                          gdouble                position);
+  void          (* point_move_relative)  (GimpStroke            *stroke,
+                                          GimpAnchor            *predec,
+                                          gdouble                position,
+                                          const GimpCoords      *deltacoord,
+                                          GimpAnchorFeatureType  feature);
+  void          (* point_move_absolute)  (GimpStroke            *stroke,
+                                          GimpAnchor            *predec,
+                                          gdouble                position,
+                                          const GimpCoords      *coord,
+                                          GimpAnchorFeatureType  feature);
+
+  void          (* close)                (GimpStroke            *stroke);
+  GimpStroke  * (* open)                 (GimpStroke            *stroke,
+                                          GimpAnchor            *end_anchor);
+  gboolean      (* anchor_is_insertable) (GimpStroke            *stroke,
+                                          GimpAnchor            *predec,
+                                          gdouble                position);
+  GimpAnchor  * (* anchor_insert)        (GimpStroke            *stroke,
+                                          GimpAnchor            *predec,
+                                          gdouble                position);
+  gboolean      (* is_extendable)        (GimpStroke            *stroke,
+                                          GimpAnchor            *neighbor);
+  GimpAnchor  * (* extend)               (GimpStroke            *stroke,
+                                          const GimpCoords      *coords,
+                                          GimpAnchor            *neighbor,
+                                          GimpVectorExtendMode   extend_mode);
+  gboolean      (* connect_stroke)       (GimpStroke            *stroke,
+                                          GimpAnchor            *anchor,
+                                          GimpStroke            *extension,
+                                          GimpAnchor            *neighbor);
+
+  gboolean      (* is_empty)             (GimpStroke            *stroke);
+  gdouble       (* get_length)           (GimpStroke            *stroke,
+                                          gdouble                precision);
+  gdouble       (* get_distance)         (GimpStroke            *stroke,
+                                          const GimpCoords      *coord);
+  gboolean      (* get_point_at_dist)    (GimpStroke            *stroke,
+                                          gdouble                dist,
+                                          gdouble                precision,
+                                          GimpCoords            *position,
+                                          gdouble               *slope);
+
+  GArray      * (* interpolate)          (GimpStroke            *stroke,
+                                          gdouble                precision,
+                                          gboolean              *ret_closed);
+
+  GimpStroke  * (* duplicate)            (GimpStroke            *stroke);
+
+  GimpBezierDesc * (* make_bezier)       (GimpStroke            *stroke);
+
+  void          (* translate)            (GimpStroke            *stroke,
+                                          gdouble                offset_x,
+                                          gdouble                offset_y);
+  void          (* scale)                (GimpStroke            *stroke,
+                                          gdouble                scale_x,
+                                          gdouble                scale_y);
+  void          (* rotate)               (GimpStroke            *stroke,
+                                          gdouble                center_x,
+                                          gdouble                center_y,
+                                          gdouble                angle);
+  void          (* flip)                 (GimpStroke             *stroke,
+                                          GimpOrientationType    flip_type,
+                                          gdouble                axis);
+  void          (* flip_free)            (GimpStroke            *stroke,
+                                          gdouble                x1,
+                                          gdouble                y1,
+                                          gdouble                x2,
+                                          gdouble                y2);
+  void          (* transform)            (GimpStroke            *stroke,
+                                          const GimpMatrix3     *matrix,
+                                          GQueue                *ret_strokes);
+
+  GList       * (* get_draw_anchors)     (GimpStroke            *stroke);
+  GList       * (* get_draw_controls)    (GimpStroke            *stroke);
+  GArray      * (* get_draw_lines)       (GimpStroke            *stroke);
+  GArray      * (* control_points_get)   (GimpStroke            *stroke,
+                                          gboolean              *ret_closed);
+};
+
+
+GType        gimp_stroke_get_type             (void) G_GNUC_CONST;
+
+void         gimp_stroke_set_ID               (GimpStroke            *stroke,
+                                               gint                   id);
+gint         gimp_stroke_get_ID               (GimpStroke            *stroke);
+
+
+/* accessing / modifying the anchors */
+
+GArray     * gimp_stroke_control_points_get   (GimpStroke            *stroke,
+                                               gboolean              *closed);
+
+GimpAnchor * gimp_stroke_anchor_get           (GimpStroke            *stroke,
+                                               const GimpCoords      *coord);
+
+gdouble      gimp_stroke_nearest_point_get    (GimpStroke            *stroke,
+                                               const GimpCoords      *coord,
+                                               gdouble                precision,
+                                               GimpCoords            *ret_point,
+                                               GimpAnchor           **ret_segment_start,
+                                               GimpAnchor           **ret_segment_end,
+                                               gdouble               *ret_pos);
+gdouble     gimp_stroke_nearest_tangent_get   (GimpStroke            *stroke,
+                                               const GimpCoords      *coords1,
+                                               const GimpCoords      *coords2,
+                                               gdouble                precision,
+                                               GimpCoords            *nearest,
+                                               GimpAnchor           **ret_segment_start,
+                                               GimpAnchor           **ret_segment_end,
+                                               gdouble               *ret_pos);
+gdouble  gimp_stroke_nearest_intersection_get (GimpStroke            *stroke,
+                                               const GimpCoords      *coords1,
+                                               const GimpCoords      *direction,
+                                               gdouble                precision,
+                                               GimpCoords            *nearest,
+                                               GimpAnchor           **ret_segment_start,
+                                               GimpAnchor           **ret_segment_end,
+                                               gdouble               *ret_pos);
+
+
+/* prev == NULL: "first" anchor */
+GimpAnchor * gimp_stroke_anchor_get_next      (GimpStroke            *stroke,
+                                               const GimpAnchor      *prev);
+
+void         gimp_stroke_anchor_select        (GimpStroke            *stroke,
+                                               GimpAnchor            *anchor,
+                                               gboolean               selected,
+                                               gboolean               exclusive);
+
+/* type will be an xorable enum:
+ * VECTORS_NONE, VECTORS_FIX_ANGLE, VECTORS_FIX_RATIO, VECTORS_RESTRICT_ANGLE
+ *  or so.
+ */
+void         gimp_stroke_anchor_move_relative (GimpStroke            *stroke,
+                                               GimpAnchor            *anchor,
+                                               const GimpCoords      *delta,
+                                               GimpAnchorFeatureType  feature);
+void         gimp_stroke_anchor_move_absolute (GimpStroke            *stroke,
+                                               GimpAnchor            *anchor,
+                                               const GimpCoords      *coord,
+                                               GimpAnchorFeatureType  feature);
+
+gboolean     gimp_stroke_point_is_movable     (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position);
+void         gimp_stroke_point_move_relative  (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position,
+                                               const GimpCoords      *deltacoord,
+                                               GimpAnchorFeatureType  feature);
+void         gimp_stroke_point_move_absolute  (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position,
+                                               const GimpCoords      *coord,
+                                               GimpAnchorFeatureType  feature);
+
+void         gimp_stroke_close                (GimpStroke            *stroke);
+
+void         gimp_stroke_anchor_convert       (GimpStroke            *stroke,
+                                               GimpAnchor            *anchor,
+                                               GimpAnchorFeatureType  feature);
+
+void         gimp_stroke_anchor_delete        (GimpStroke            *stroke,
+                                               GimpAnchor            *anchor);
+
+GimpStroke * gimp_stroke_open                 (GimpStroke            *stroke,
+                                               GimpAnchor            *end_anchor);
+gboolean     gimp_stroke_anchor_is_insertable (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position);
+GimpAnchor * gimp_stroke_anchor_insert        (GimpStroke            *stroke,
+                                               GimpAnchor            *predec,
+                                               gdouble                position);
+
+gboolean     gimp_stroke_is_extendable        (GimpStroke            *stroke,
+                                               GimpAnchor            *neighbor);
+
+GimpAnchor * gimp_stroke_extend               (GimpStroke            *stroke,
+                                               const GimpCoords      *coords,
+                                               GimpAnchor            *neighbor,
+                                               GimpVectorExtendMode   extend_mode);
+
+gboolean     gimp_stroke_connect_stroke       (GimpStroke            *stroke,
+                                               GimpAnchor            *anchor,
+                                               GimpStroke            *extension,
+                                               GimpAnchor            *neighbor);
+
+gboolean     gimp_stroke_is_empty             (GimpStroke            *stroke);
+
+/* accessing the shape of the curve */
+
+gdouble      gimp_stroke_get_length           (GimpStroke            *stroke,
+                                               gdouble                precision);
+gdouble      gimp_stroke_get_distance         (GimpStroke            *stroke,
+                                               const GimpCoords      *coord);
+
+gboolean     gimp_stroke_get_point_at_dist    (GimpStroke            *stroke,
+                                               gdouble                dist,
+                                               gdouble                precision,
+                                               GimpCoords            *position,
+                                               gdouble               *slope);
+
+/* returns an array of valid coordinates */
+GArray     * gimp_stroke_interpolate          (GimpStroke            *stroke,
+                                               const gdouble          precision,
+                                               gboolean              *closed);
+
+GimpStroke * gimp_stroke_duplicate            (GimpStroke            *stroke);
+
+/* creates a bezier approximation. */
+GimpBezierDesc * gimp_stroke_make_bezier      (GimpStroke            *stroke);
+
+void         gimp_stroke_translate            (GimpStroke            *stroke,
+                                               gdouble                offset_x,
+                                               gdouble                offset_y);
+void         gimp_stroke_scale                (GimpStroke            *stroke,
+                                               gdouble                scale_x,
+                                               gdouble                scale_y);
+void         gimp_stroke_rotate               (GimpStroke            *stroke,
+                                               gdouble                center_x,
+                                               gdouble                center_y,
+                                               gdouble                angle);
+void         gimp_stroke_flip                 (GimpStroke             *stroke,
+                                               GimpOrientationType    flip_type,
+                                               gdouble                axis);
+void         gimp_stroke_flip_free            (GimpStroke            *stroke,
+                                               gdouble                x1,
+                                               gdouble                y1,
+                                               gdouble                x2,
+                                               gdouble                y2);
+void         gimp_stroke_transform            (GimpStroke            *stroke,
+                                               const GimpMatrix3     *matrix,
+                                               GQueue                *ret_strokes);
+
+
+GList      * gimp_stroke_get_draw_anchors     (GimpStroke            *stroke);
+GList      * gimp_stroke_get_draw_controls    (GimpStroke            *stroke);
+GArray     * gimp_stroke_get_draw_lines       (GimpStroke            *stroke);
+
+#endif /* __GIMP_STROKE_H__ */
+
diff --git a/app/vectors/gimpvectors-compat.c b/app/vectors/gimpvectors-compat.c
new file mode 100644
index 0000000..5416d00
--- /dev/null
+++ b/app/vectors/gimpvectors-compat.c
@@ -0,0 +1,285 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectors-compat.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "vectors-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpanchor.h"
+#include "gimpbezierstroke.h"
+#include "gimpvectors.h"
+#include "gimpvectors-compat.h"
+
+
+enum
+{
+  GIMP_VECTORS_COMPAT_ANCHOR     = 1,
+  GIMP_VECTORS_COMPAT_CONTROL    = 2,
+  GIMP_VECTORS_COMPAT_NEW_STROKE = 3
+};
+
+
+static const GimpCoords default_coords = GIMP_COORDS_DEFAULT_VALUES;
+
+
+GimpVectors *
+gimp_vectors_compat_new (GimpImage              *image,
+                         const gchar            *name,
+                         GimpVectorsCompatPoint *points,
+                         gint                    n_points,
+                         gboolean                closed)
+{
+  GimpVectors *vectors;
+  GimpStroke  *stroke;
+  GimpCoords  *coords;
+  GimpCoords  *curr_stroke;
+  GimpCoords  *curr_coord;
+  gint         i;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (points != NULL || n_points == 0, NULL);
+  g_return_val_if_fail (n_points >= 0, NULL);
+
+  vectors = gimp_vectors_new (image, name);
+
+  coords = g_new0 (GimpCoords, n_points + 1);
+
+  curr_stroke = curr_coord = coords;
+
+  /*  skip the first control point, will set it later  */
+  curr_coord++;
+
+  for (i = 0; i < n_points; i++)
+    {
+      *curr_coord = default_coords;
+
+      curr_coord->x = points[i].x;
+      curr_coord->y = points[i].y;
+
+      /*  copy the first anchor to be the first control point  */
+      if (curr_coord == curr_stroke + 1)
+        *curr_stroke = *curr_coord;
+
+      /*  found new stroke start  */
+      if (points[i].type == GIMP_VECTORS_COMPAT_NEW_STROKE)
+        {
+          /*  copy the last control point to the beginning of the stroke  */
+          *curr_stroke = *(curr_coord - 1);
+
+          stroke =
+            gimp_bezier_stroke_new_from_coords (curr_stroke,
+                                                curr_coord - curr_stroke - 1,
+                                                TRUE);
+          gimp_vectors_stroke_add (vectors, stroke);
+          g_object_unref (stroke);
+
+          /*  start a new stroke  */
+          curr_stroke = curr_coord - 1;
+
+          /*  copy the first anchor to be the first control point  */
+          *curr_stroke = *curr_coord;
+        }
+
+      curr_coord++;
+    }
+
+  if (closed)
+    {
+      /*  copy the last control point to the beginning of the stroke  */
+      curr_coord--;
+      *curr_stroke = *curr_coord;
+    }
+
+  stroke = gimp_bezier_stroke_new_from_coords (curr_stroke,
+                                               curr_coord - curr_stroke,
+                                               closed);
+  gimp_vectors_stroke_add (vectors, stroke);
+  g_object_unref (stroke);
+
+  g_free (coords);
+
+  return vectors;
+}
+
+gboolean
+gimp_vectors_compat_is_compatible (GimpImage *image)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+
+  for (list = gimp_image_get_vectors_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpVectors *vectors    = GIMP_VECTORS (list->data);
+      GList       *strokes;
+      gint         open_count = 0;
+
+      if (gimp_item_get_visible (GIMP_ITEM (vectors)))
+        return FALSE;
+
+      for (strokes = vectors->strokes->head;
+           strokes;
+           strokes = g_list_next (strokes))
+        {
+           GimpStroke *stroke = GIMP_STROKE (strokes->data);
+
+          if (! GIMP_IS_BEZIER_STROKE (stroke))
+            return FALSE;
+
+          if (!stroke->closed)
+            open_count++;
+        }
+
+      if (open_count >= 2)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+GimpVectorsCompatPoint *
+gimp_vectors_compat_get_points (GimpVectors *vectors,
+                                gint32      *n_points,
+                                gint32      *closed)
+{
+  GimpVectorsCompatPoint *points;
+  GList                  *strokes;
+  gint                    i;
+  GList                  *postponed = NULL;  /* for the one open stroke... */
+  gint                    open_count;
+  gboolean                first_stroke = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (n_points != NULL, NULL);
+  g_return_val_if_fail (closed != NULL, NULL);
+
+  *n_points = 0;
+  *closed   = TRUE;
+
+  open_count = 0;
+
+  for (strokes = vectors->strokes->head;
+       strokes;
+       strokes = g_list_next (strokes))
+    {
+      GimpStroke *stroke = strokes->data;
+      gint        n_anchors;
+
+      if (! stroke->closed)
+        {
+          open_count++;
+          postponed = strokes;
+          *closed = FALSE;
+
+          if (open_count >= 2)
+            {
+              g_warning ("gimp_vectors_compat_get_points(): convert failed");
+              *n_points = 0;
+              return NULL;
+            }
+        }
+
+      n_anchors = g_queue_get_length (stroke->anchors);
+
+      if (! stroke->closed)
+        n_anchors--;
+
+      *n_points += n_anchors;
+    }
+
+  points = g_new0 (GimpVectorsCompatPoint, *n_points);
+
+  i = 0;
+
+  for (strokes = vectors->strokes->head;
+       strokes || postponed;
+       strokes = g_list_next (strokes))
+    {
+      GimpStroke *stroke;
+      GList      *anchors;
+
+      if (strokes)
+        {
+          if (postponed && strokes == postponed)
+            /* we need to visit the open stroke last... */
+            continue;
+          else
+            stroke = GIMP_STROKE (strokes->data);
+        }
+      else
+        {
+          stroke = GIMP_STROKE (postponed->data);
+          postponed = NULL;
+        }
+
+      for (anchors = stroke->anchors->head;
+           anchors;
+           anchors = g_list_next (anchors))
+        {
+          GimpAnchor *anchor = anchors->data;
+
+          /*  skip the first anchor, will add it at the end if needed  */
+          if (! anchors->prev)
+            continue;
+
+          switch (anchor->type)
+            {
+            case GIMP_ANCHOR_ANCHOR:
+              if (anchors->prev == stroke->anchors->head && ! first_stroke)
+                points[i].type = GIMP_VECTORS_COMPAT_NEW_STROKE;
+              else
+                points[i].type = GIMP_VECTORS_COMPAT_ANCHOR;
+              break;
+
+            case GIMP_ANCHOR_CONTROL:
+              points[i].type = GIMP_VECTORS_COMPAT_CONTROL;
+              break;
+            }
+
+          points[i].x = anchor->position.x;
+          points[i].y = anchor->position.y;
+
+          i++;
+
+          /*  write the skipped control point  */
+          if (! anchors->next && stroke->closed)
+            {
+              anchor = g_queue_peek_head (stroke->anchors);
+
+              points[i].type = GIMP_VECTORS_COMPAT_CONTROL;
+              points[i].x    = anchor->position.x;
+              points[i].y    = anchor->position.y;
+
+              i++;
+            }
+        }
+      first_stroke = FALSE;
+    }
+
+  return points;
+}
diff --git a/app/vectors/gimpvectors-compat.h b/app/vectors/gimpvectors-compat.h
new file mode 100644
index 0000000..561043a
--- /dev/null
+++ b/app/vectors/gimpvectors-compat.h
@@ -0,0 +1,48 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectors-compat.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_COMPAT_H__
+#define __GIMP_VECTORS_COMPAT_H__
+
+
+typedef struct _GimpVectorsCompatPoint GimpVectorsCompatPoint;
+
+struct _GimpVectorsCompatPoint
+{
+  guint32 type;
+  gdouble x;
+  gdouble y;
+};
+
+
+GimpVectors * gimp_vectors_compat_new (GimpImage              *image,
+                                       const gchar            *name,
+                                       GimpVectorsCompatPoint *points,
+                                       gint                    n_points,
+                                       gboolean                closed);
+
+gboolean              gimp_vectors_compat_is_compatible (GimpImage   *image);
+
+GimpVectorsCompatPoint * gimp_vectors_compat_get_points (GimpVectors *vectors,
+                                                         gint32      *n_points,
+                                                         gint32      *closed);
+
+
+#endif /* __GIMP_VECTORS_COMPAT_H__ */
diff --git a/app/vectors/gimpvectors-export.c b/app/vectors/gimpvectors-export.c
new file mode 100644
index 0000000..f8a33e8
--- /dev/null
+++ b/app/vectors/gimpvectors-export.c
@@ -0,0 +1,333 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "vectors-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+
+#include "gimpanchor.h"
+#include "gimpstroke.h"
+#include "gimpbezierstroke.h"
+#include "gimpvectors.h"
+#include "gimpvectors-export.h"
+
+#include "gimp-intl.h"
+
+
+static GString * gimp_vectors_export            (GimpImage   *image,
+                                                 GimpVectors *vectors);
+static void      gimp_vectors_export_image_size (GimpImage   *image,
+                                                 GString     *str);
+static void      gimp_vectors_export_path       (GimpVectors *vectors,
+                                                 GString     *str);
+static gchar   * gimp_vectors_export_path_data  (GimpVectors *vectors);
+
+
+/**
+ * gimp_vectors_export_file:
+ * @image: the #GimpImage from which to export vectors
+ * @vectors: a #GimpVectors object or %NULL to export all vectors in @image
+ * @file: the file to write
+ * @error: return location for errors
+ *
+ * Exports one or more vectors to a SVG file.
+ *
+ * Return value: %TRUE on success,
+ *               %FALSE if there was an error writing the file
+ **/
+gboolean
+gimp_vectors_export_file (GimpImage    *image,
+                          GimpVectors  *vectors,
+                          GFile        *file,
+                          GError      **error)
+{
+  GOutputStream *output;
+  GString       *string;
+  GError        *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, error));
+  if (! output)
+    return FALSE;
+
+  string = gimp_vectors_export (image, vectors);
+
+  if (! g_output_stream_write_all (output, string->str, string->len,
+                                   NULL, NULL, &my_error))
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      g_set_error (error, my_error->domain, my_error->code,
+                   _("Writing SVG file '%s' failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+      g_clear_error (&my_error);
+      g_string_free (string, TRUE);
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (output, cancellable, NULL);
+      g_object_unref (cancellable);
+      g_object_unref (output);
+
+      return FALSE;
+    }
+
+  g_string_free (string, TRUE);
+  g_object_unref (output);
+
+  return TRUE;
+}
+
+/**
+ * gimp_vectors_export_string:
+ * @image: the #GimpImage from which to export vectors
+ * @vectors: a #GimpVectors object or %NULL to export all vectors in @image
+ *
+ * Exports one or more vectors to a SVG string.
+ *
+ * Return value: a %NUL-terminated string that holds a complete XML document
+ **/
+gchar *
+gimp_vectors_export_string (GimpImage   *image,
+                            GimpVectors *vectors)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (vectors == NULL || GIMP_IS_VECTORS (vectors), NULL);
+
+  return g_string_free (gimp_vectors_export (image, vectors), FALSE);
+}
+
+static GString *
+gimp_vectors_export (GimpImage   *image,
+                     GimpVectors *vectors)
+{
+  GString *str = g_string_new (NULL);
+
+  g_string_append_printf (str,
+                          "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+                          "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n"
+                          "              \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n"
+                          "\n"
+                          "<svg xmlns=\"http://www.w3.org/2000/svg\"\n");
+
+  g_string_append (str, "     ");
+  gimp_vectors_export_image_size (image, str);
+  g_string_append_c (str, '\n');
+
+  g_string_append_printf (str,
+                          "     viewBox=\"0 0 %d %d\">\n",
+                          gimp_image_get_width  (image),
+                          gimp_image_get_height (image));
+
+  if (vectors)
+    {
+      gimp_vectors_export_path (vectors, str);
+    }
+  else
+    {
+      GList *list;
+
+      for (list = gimp_image_get_vectors_iter (image);
+           list;
+           list = list->next)
+        {
+          gimp_vectors_export_path (GIMP_VECTORS (list->data), str);
+        }
+    }
+
+  g_string_append (str, "</svg>\n");
+
+  return str;
+}
+
+static void
+gimp_vectors_export_image_size (GimpImage *image,
+                                GString   *str)
+{
+  GimpUnit     unit;
+  const gchar *abbrev;
+  gchar        wbuf[G_ASCII_DTOSTR_BUF_SIZE];
+  gchar        hbuf[G_ASCII_DTOSTR_BUF_SIZE];
+  gdouble      xres;
+  gdouble      yres;
+  gdouble      w, h;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  w = (gdouble) gimp_image_get_width  (image) / xres;
+  h = (gdouble) gimp_image_get_height (image) / yres;
+
+  /*  FIXME: should probably use the display unit here  */
+  unit = gimp_image_get_unit (image);
+  switch (unit)
+    {
+    case GIMP_UNIT_INCH:  abbrev = "in";  break;
+    case GIMP_UNIT_MM:    abbrev = "mm";  break;
+    case GIMP_UNIT_POINT: abbrev = "pt";  break;
+    case GIMP_UNIT_PICA:  abbrev = "pc";  break;
+    default:              abbrev = "cm";
+      unit = GIMP_UNIT_MM;
+      w /= 10.0;
+      h /= 10.0;
+      break;
+    }
+
+  g_ascii_formatd (wbuf, sizeof (wbuf), "%g", w * gimp_unit_get_factor (unit));
+  g_ascii_formatd (hbuf, sizeof (hbuf), "%g", h * gimp_unit_get_factor (unit));
+
+  g_string_append_printf (str,
+                          "width=\"%s%s\" height=\"%s%s\"",
+                          wbuf, abbrev, hbuf, abbrev);
+}
+
+static void
+gimp_vectors_export_path (GimpVectors *vectors,
+                          GString     *str)
+{
+  const gchar *name = gimp_object_get_name (vectors);
+  gchar       *data = gimp_vectors_export_path_data (vectors);
+  gchar       *esc_name;
+
+  esc_name = g_markup_escape_text (name, strlen (name));
+
+  g_string_append_printf (str,
+                          "  <path id=\"%s\"\n"
+                          "        fill=\"none\" stroke=\"black\" stroke-width=\"1\"\n"
+                          "        d=\"%s\" />\n",
+                          esc_name, data);
+
+  g_free (esc_name);
+  g_free (data);
+}
+
+
+#define NEWLINE "\n           "
+
+static gchar *
+gimp_vectors_export_path_data (GimpVectors *vectors)
+{
+  GString  *str;
+  GList    *strokes;
+  gchar     x_string[G_ASCII_DTOSTR_BUF_SIZE];
+  gchar     y_string[G_ASCII_DTOSTR_BUF_SIZE];
+  gboolean  closed = FALSE;
+
+  str = g_string_new (NULL);
+
+  for (strokes = vectors->strokes->head;
+       strokes;
+       strokes = strokes->next)
+    {
+      GimpStroke *stroke = strokes->data;
+      GArray     *control_points;
+      GimpAnchor *anchor;
+      gint        i;
+
+      if (closed)
+        g_string_append_printf (str, NEWLINE);
+
+      control_points = gimp_stroke_control_points_get (stroke, &closed);
+
+      if (GIMP_IS_BEZIER_STROKE (stroke))
+        {
+          if (control_points->len >= 3)
+            {
+              anchor = &g_array_index (control_points, GimpAnchor, 1);
+              g_ascii_formatd (x_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               "%.2f", anchor->position.x);
+              g_ascii_formatd (y_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               "%.2f", anchor->position.y);
+              g_string_append_printf (str, "M %s,%s", x_string, y_string);
+            }
+
+          if (control_points->len > 3)
+            {
+              g_string_append_printf (str, NEWLINE "C");
+            }
+
+          for (i = 2; i < (control_points->len + (closed ? 2 : - 1)); i++)
+            {
+              if (i > 2 && i % 3 == 2)
+                g_string_append_printf (str, NEWLINE " ");
+
+              anchor = &g_array_index (control_points, GimpAnchor,
+                                       i % control_points->len);
+              g_ascii_formatd (x_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               "%.2f", anchor->position.x);
+              g_ascii_formatd (y_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               "%.2f", anchor->position.y);
+              g_string_append_printf (str, " %s,%s", x_string, y_string);
+            }
+
+          if (closed && control_points->len > 3)
+            g_string_append_printf (str, " Z");
+        }
+      else
+        {
+          g_printerr ("Unknown stroke type\n");
+
+          if (control_points->len >= 1)
+            {
+              anchor = &g_array_index (control_points, GimpAnchor, 0);
+              g_ascii_formatd (x_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               ".2f", anchor->position.x);
+              g_ascii_formatd (y_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               ".2f", anchor->position.y);
+              g_string_append_printf (str, "M %s,%s", x_string, y_string);
+            }
+
+          if (control_points->len > 1)
+            {
+              g_string_append_printf (str, NEWLINE "L");
+            }
+
+          for (i = 1; i < control_points->len; i++)
+            {
+              if (i > 1 && i % 3 == 1)
+                g_string_append_printf (str, NEWLINE " ");
+
+              anchor = &g_array_index (control_points, GimpAnchor, i);
+              g_ascii_formatd (x_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               "%.2f", anchor->position.x);
+              g_ascii_formatd (y_string, G_ASCII_DTOSTR_BUF_SIZE,
+                               "%.2f", anchor->position.y);
+              g_string_append_printf (str, " %s,%s", x_string, y_string);
+            }
+
+          if (closed && control_points->len > 1)
+            g_string_append_printf (str, " Z");
+        }
+
+      g_array_free (control_points, TRUE);
+    }
+
+  return g_strchomp (g_string_free (str, FALSE));
+}
diff --git a/app/vectors/gimpvectors-export.h b/app/vectors/gimpvectors-export.h
new file mode 100644
index 0000000..d61eae2
--- /dev/null
+++ b/app/vectors/gimpvectors-export.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_EXPORT_H__
+#define __GIMP_VECTORS_EXPORT_H__
+
+
+gboolean   gimp_vectors_export_file   (GimpImage    *image,
+                                       GimpVectors  *vectors,
+                                       GFile        *file,
+                                       GError      **error);
+gchar    * gimp_vectors_export_string (GimpImage    *image,
+                                       GimpVectors  *vectors);
+
+
+#endif /* __GIMP_VECTORS_IMPORT_H__ */
diff --git a/app/vectors/gimpvectors-import.c b/app/vectors/gimpvectors-import.c
new file mode 100644
index 0000000..fa631ee
--- /dev/null
+++ b/app/vectors/gimpvectors-import.c
@@ -0,0 +1,1784 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpVectors Import
+ * Copyright (C) 2003-2004  Sven Neumann <sven@gimp.org>
+ *
+ * Some code here is based on code from librsvg that was originally
+ * written by Raph Levien <raph@artofcode.com> for Gill.
+ *
+ * This SVG path importer implements a subset of SVG that is
+ * sufficient to parse path elements and basic shapes and to apply
+ * transformations as described by the SVG specification:
+ * http://www.w3.org/TR/SVG/.  It must handle the SVG files exported
+ * by GIMP but it is also supposed to be able to extract paths and
+ * shapes from foreign SVG documents.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <errno.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "vectors-types.h"
+
+#include "config/gimpxmlparser.h"
+
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+
+#include "gimpbezierstroke.h"
+#include "gimpstroke.h"
+#include "gimpvectors.h"
+#include "gimpvectors-import.h"
+
+#include "gimp-intl.h"
+
+
+#define COORDS_INIT   \
+  {                   \
+    .x         = 0.0, \
+    .y         = 0.0, \
+    .pressure  = 1.0, \
+    .xtilt     = 0.0, \
+    .ytilt     = 0.0, \
+    .wheel     = 0.5, \
+    .velocity  = 0.0, \
+    .direction = 0.0  \
+  }
+
+
+typedef struct
+{
+  GQueue       *stack;
+  GimpImage    *image;
+  gboolean      scale;
+  gint          svg_depth;
+} SvgParser;
+
+
+typedef struct _SvgHandler SvgHandler;
+
+struct _SvgHandler
+{
+  const gchar  *name;
+
+  void (* start) (SvgHandler   *handler,
+                  const gchar **names,
+                  const gchar **values,
+                  SvgParser    *parser);
+  void (* end)   (SvgHandler   *handler,
+                  SvgParser    *parser);
+
+  gdouble       width;
+  gdouble       height;
+  gchar        *id;
+  GList        *paths;
+  GimpMatrix3  *transform;
+};
+
+
+typedef struct
+{
+  gchar        *id;
+  GList        *strokes;
+} SvgPath;
+
+
+static gboolean  gimp_vectors_import  (GimpImage            *image,
+                                       GFile                *file,
+                                       const gchar          *str,
+                                       gsize                 len,
+                                       gboolean              merge,
+                                       gboolean              scale,
+                                       GimpVectors          *parent,
+                                       gint                  position,
+                                       GList               **ret_vectors,
+                                       GError              **error);
+
+static void  svg_parser_start_element (GMarkupParseContext  *context,
+                                       const gchar          *element_name,
+                                       const gchar         **attribute_names,
+                                       const gchar         **attribute_values,
+                                       gpointer              user_data,
+                                       GError              **error);
+static void  svg_parser_end_element   (GMarkupParseContext  *context,
+                                       const gchar          *element_name,
+                                       gpointer              user_data,
+                                       GError              **error);
+
+static const GMarkupParser markup_parser =
+{
+  svg_parser_start_element,
+  svg_parser_end_element,
+  NULL,  /*  characters   */
+  NULL,  /*  passthrough  */
+  NULL   /*  error        */
+};
+
+
+static void  svg_handler_svg_start     (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+static void  svg_handler_svg_end       (SvgHandler   *handler,
+                                        SvgParser    *parser);
+static void  svg_handler_group_start   (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+static void  svg_handler_path_start    (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+static void  svg_handler_rect_start    (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+static void  svg_handler_ellipse_start (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+static void  svg_handler_line_start    (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+static void  svg_handler_poly_start    (SvgHandler   *handler,
+                                        const gchar **names,
+                                        const gchar **values,
+                                        SvgParser    *parser);
+
+static const SvgHandler svg_handlers[] =
+{
+  { "svg",      svg_handler_svg_start,     svg_handler_svg_end },
+  { "g",        svg_handler_group_start,   NULL                },
+  { "path",     svg_handler_path_start,    NULL                },
+  { "rect",     svg_handler_rect_start,    NULL                },
+  { "circle",   svg_handler_ellipse_start, NULL                },
+  { "ellipse",  svg_handler_ellipse_start, NULL                },
+  { "line",     svg_handler_line_start,    NULL                },
+  { "polyline", svg_handler_poly_start,    NULL                },
+  { "polygon",  svg_handler_poly_start,    NULL                }
+};
+
+
+static gboolean   parse_svg_length    (const gchar  *value,
+                                       gdouble       reference,
+                                       gdouble       resolution,
+                                       gdouble      *length);
+static gboolean   parse_svg_viewbox   (const gchar  *value,
+                                       gdouble      *width,
+                                       gdouble      *height,
+                                       GimpMatrix3  *matrix);
+static gboolean   parse_svg_transform (const gchar  *value,
+                                       GimpMatrix3  *matrix);
+static GList    * parse_path_data     (const gchar  *data);
+
+
+/**
+ * gimp_vectors_import_file:
+ * @image:    the #GimpImage to add the paths to
+ * @file:     a SVG file
+ * @merge:    should multiple paths be merged into a single #GimpVectors object
+ * @scale:    should the SVG be scaled to fit the image dimensions
+ * @position: position in the image's vectors stack where to add the vectors
+ * @error:    location to store possible errors
+ *
+ * Imports one or more paths and basic shapes from a SVG file.
+ *
+ * Return value: %TRUE on success, %FALSE if an error occurred
+ **/
+gboolean
+gimp_vectors_import_file (GimpImage    *image,
+                          GFile        *file,
+                          gboolean      merge,
+                          gboolean      scale,
+                          GimpVectors  *parent,
+                          gint          position,
+                          GList       **ret_vectors,
+                          GError      **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        GIMP_IS_VECTORS (parent), FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_item_is_attached (GIMP_ITEM (parent)), FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_item_get_image (GIMP_ITEM (parent)) == image,
+                        FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_viewable_get_children (GIMP_VIEWABLE (parent)),
+                        FALSE);
+  g_return_val_if_fail (ret_vectors == NULL || *ret_vectors == NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return gimp_vectors_import (image, file, NULL, 0, merge, scale,
+                              parent, position,
+                              ret_vectors, error);
+}
+
+/**
+ * gimp_vectors_import_string:
+ * @image:  the #GimpImage to add the paths to
+ * @buffer: a character buffer to parse
+ * @len:    number of bytes in @str or -1 if @str is %NUL-terminated
+ * @merge:  should multiple paths be merged into a single #GimpVectors object
+ * @scale:  should the SVG be scaled to fit the image dimensions
+ * @error:  location to store possible errors
+ *
+ * Imports one or more paths and basic shapes from a SVG file.
+ *
+ * Return value: %TRUE on success, %FALSE if an error occurred
+ **/
+gboolean
+gimp_vectors_import_buffer (GimpImage    *image,
+                            const gchar  *buffer,
+                            gsize         len,
+                            gboolean      merge,
+                            gboolean      scale,
+                            GimpVectors  *parent,
+                            gint          position,
+                            GList       **ret_vectors,
+                            GError      **error)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (buffer != NULL || len == 0, FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        GIMP_IS_VECTORS (parent), FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_item_is_attached (GIMP_ITEM (parent)), FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_item_get_image (GIMP_ITEM (parent)) == image,
+                        FALSE);
+  g_return_val_if_fail (parent == NULL ||
+                        parent == GIMP_IMAGE_ACTIVE_PARENT ||
+                        gimp_viewable_get_children (GIMP_VIEWABLE (parent)),
+                        FALSE);
+  g_return_val_if_fail (ret_vectors == NULL || *ret_vectors == NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return gimp_vectors_import (image, NULL, buffer, len, merge, scale,
+                              parent, position,
+                              ret_vectors, error);
+}
+
+static gboolean
+gimp_vectors_import (GimpImage    *image,
+                     GFile        *file,
+                     const gchar  *str,
+                     gsize         len,
+                     gboolean      merge,
+                     gboolean      scale,
+                     GimpVectors  *parent,
+                     gint          position,
+                     GList       **ret_vectors,
+                     GError      **error)
+{
+  GimpXmlParser *xml_parser;
+  SvgParser      parser;
+  GList         *paths;
+  SvgHandler    *base;
+  gboolean       success = TRUE;
+
+  parser.stack     = g_queue_new ();
+  parser.image     = image;
+  parser.scale     = scale;
+  parser.svg_depth = 0;
+
+  /*  the base of the stack, defines the size of the view-port  */
+  base = g_slice_new0 (SvgHandler);
+  base->name   = "image";
+  base->width  = gimp_image_get_width  (image);
+  base->height = gimp_image_get_height (image);
+
+  g_queue_push_head (parser.stack, base);
+
+  xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
+
+  if (file)
+    success = gimp_xml_parser_parse_gfile (xml_parser, file, error);
+  else
+    success = gimp_xml_parser_parse_buffer (xml_parser, str, len, error);
+
+  gimp_xml_parser_free (xml_parser);
+
+  if (success)
+    {
+      if (base->paths)
+        {
+          GimpVectors *vectors = NULL;
+
+          base->paths = g_list_reverse (base->paths);
+
+          merge = merge && base->paths->next;
+
+          gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_VECTORS_IMPORT,
+                                       _("Import Paths"));
+
+          for (paths = base->paths; paths; paths = paths->next)
+            {
+              SvgPath *path = paths->data;
+              GList   *list;
+
+              if (! merge || ! vectors)
+                {
+                  vectors = gimp_vectors_new (image,
+                                              ((merge || ! path->id) ?
+                                               _("Imported Path") : path->id));
+                  gimp_image_add_vectors (image, vectors,
+                                          parent, position, TRUE);
+                  gimp_vectors_freeze (vectors);
+
+                  if (ret_vectors)
+                    *ret_vectors = g_list_prepend (*ret_vectors, vectors);
+
+                  if (position != -1)
+                    position++;
+                }
+
+              for (list = path->strokes; list; list = list->next)
+                gimp_vectors_stroke_add (vectors, GIMP_STROKE (list->data));
+
+              if (! merge)
+                gimp_vectors_thaw (vectors);
+
+              g_list_free_full (path->strokes, g_object_unref);
+              path->strokes = NULL;
+            }
+
+          if (merge)
+            gimp_vectors_thaw (vectors);
+
+          gimp_image_undo_group_end (image);
+        }
+      else
+        {
+          if (file)
+            g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                         _("No paths found in '%s'"),
+                         gimp_file_get_utf8_name (file));
+          else
+            g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                                 _("No paths found in the buffer"));
+
+          success = FALSE;
+        }
+    }
+  else if (error && *error && file) /*  parser reported an error  */
+    {
+      gchar *msg = (*error)->message;
+
+      (*error)->message =
+        g_strdup_printf (_("Failed to import paths from '%s': %s"),
+                         gimp_file_get_utf8_name (file), msg);
+
+      g_free (msg);
+    }
+
+  while ((base = g_queue_pop_head (parser.stack)) != NULL)
+    {
+      for (paths = base->paths; paths; paths = paths->next)
+        {
+          SvgPath *path = paths->data;
+          GList   *list;
+
+          g_free (path->id);
+
+          for (list = path->strokes; list; list = list->next)
+            g_object_unref (list->data);
+
+          g_list_free (path->strokes);
+
+          g_slice_free (SvgPath, path);
+        }
+
+      g_list_free (base->paths);
+
+      g_slice_free (GimpMatrix3, base->transform);
+      g_slice_free (SvgHandler, base);
+    }
+
+  g_queue_free (parser.stack);
+
+  return success;
+}
+
+static void
+svg_parser_start_element (GMarkupParseContext  *context,
+                          const gchar          *element_name,
+                          const gchar         **attribute_names,
+                          const gchar         **attribute_values,
+                          gpointer              user_data,
+                          GError              **error)
+{
+  SvgParser  *parser = user_data;
+  SvgHandler *handler;
+  SvgHandler *base;
+  gint        i = 0;
+
+  handler = g_slice_new0 (SvgHandler);
+  base    = g_queue_peek_head (parser->stack);
+
+  /* if the element is not rendered, always use the generic handler */
+  if (base->width <= 0.0 || base->height <= 0.0)
+    i = G_N_ELEMENTS (svg_handlers);
+
+  for (; i < G_N_ELEMENTS (svg_handlers); i++)
+    if (strcmp (svg_handlers[i].name, element_name) == 0)
+      {
+        handler->name  = svg_handlers[i].name;
+        handler->start = svg_handlers[i].start;
+        break;
+      }
+
+  handler->width  = base->width;
+  handler->height = base->height;
+
+  g_queue_push_head (parser->stack, handler);
+
+  if (handler->start)
+    handler->start (handler, attribute_names, attribute_values, parser);
+}
+
+static void
+svg_parser_end_element (GMarkupParseContext  *context,
+                        const gchar          *element_name,
+                        gpointer              user_data,
+                        GError              **error)
+{
+  SvgParser  *parser = user_data;
+  SvgHandler *handler;
+  SvgHandler *base;
+  GList      *paths;
+
+  handler = g_queue_pop_head (parser->stack);
+
+  g_return_if_fail (handler != NULL &&
+                    (handler->name == NULL ||
+                     strcmp (handler->name, element_name) == 0));
+
+  if (handler->end)
+    handler->end (handler, parser);
+
+  if (handler->paths)
+    {
+      if (handler->transform)
+        {
+          for (paths = handler->paths; paths; paths = paths->next)
+            {
+              SvgPath *path = paths->data;
+              GList   *list;
+
+              for (list = path->strokes; list; list = list->next)
+                gimp_stroke_transform (GIMP_STROKE (list->data),
+                                       handler->transform, NULL);
+            }
+
+          g_slice_free (GimpMatrix3, handler->transform);
+        }
+
+      base = g_queue_peek_head (parser->stack);
+      base->paths = g_list_concat (base->paths, handler->paths);
+    }
+
+  g_slice_free (SvgHandler, handler);
+}
+
+static void
+svg_handler_svg_start (SvgHandler   *handler,
+                       const gchar **names,
+                       const gchar **values,
+                       SvgParser    *parser)
+{
+  GimpMatrix3 *matrix;
+  GimpMatrix3  box;
+  const gchar *viewbox = NULL;
+  gdouble      x = 0;
+  gdouble      y = 0;
+  gdouble      w = handler->width;
+  gdouble      h = handler->height;
+  gdouble      xres;
+  gdouble      yres;
+
+  matrix = g_slice_new (GimpMatrix3);
+  gimp_matrix3_identity (matrix);
+
+  gimp_image_get_resolution (parser->image, &xres, &yres);
+
+  while (*names)
+    {
+      switch (*names[0])
+        {
+        case 'x':
+          if (strcmp (*names, "x") == 0)
+            parse_svg_length (*values, handler->width, xres, &x);
+          break;
+
+        case 'y':
+          if (strcmp (*names, "y") == 0)
+            parse_svg_length (*values, handler->height, yres, &y);
+          break;
+
+        case 'w':
+          if (strcmp (*names, "width") == 0)
+            parse_svg_length (*values, handler->width, xres, &w);
+          break;
+
+        case 'h':
+          if (strcmp (*names, "height") == 0)
+            parse_svg_length (*values, handler->height, yres, &h);
+          break;
+
+        case 'v':
+          if (strcmp (*names, "viewBox") == 0)
+            viewbox = *values;
+          break;
+        }
+
+      names++;
+      values++;
+    }
+
+  if (x || y)
+    {
+      /* according to the spec offsets are meaningless on the outermost svg */
+      if (parser->svg_depth > 0)
+        gimp_matrix3_translate (matrix, x, y);
+    }
+
+  if (viewbox && parse_svg_viewbox (viewbox, &w, &h, &box))
+    {
+      gimp_matrix3_mult (&box, matrix);
+    }
+
+  /*  optionally scale the outermost svg to image size  */
+  if (parser->scale && parser->svg_depth == 0)
+    {
+      if (w > 0.0 && h > 0.0)
+        gimp_matrix3_scale (matrix,
+                            gimp_image_get_width  (parser->image) / w,
+                            gimp_image_get_height (parser->image) / h);
+    }
+
+  handler->width  = w;
+  handler->height = h;
+
+  handler->transform = matrix;
+
+  parser->svg_depth++;
+}
+
+static void
+svg_handler_svg_end (SvgHandler   *handler,
+                     SvgParser    *parser)
+{
+  parser->svg_depth--;
+}
+
+static void
+svg_handler_group_start (SvgHandler   *handler,
+                         const gchar **names,
+                         const gchar **values,
+                         SvgParser    *parser)
+{
+  while (*names)
+    {
+      if (strcmp (*names, "transform") == 0 && ! handler->transform)
+        {
+          GimpMatrix3  matrix;
+
+          if (parse_svg_transform (*values, &matrix))
+            {
+              handler->transform = g_slice_dup (GimpMatrix3, &matrix);
+
+#ifdef DEBUG_VECTORS_IMPORT
+              g_printerr ("transform %s: %g %g %g   %g %g %g   %g %g %g\n",
+                          handler->id ? handler->id : "(null)",
+                          handler->transform->coeff[0][0],
+                          handler->transform->coeff[0][1],
+                          handler->transform->coeff[0][2],
+                          handler->transform->coeff[1][0],
+                          handler->transform->coeff[1][1],
+                          handler->transform->coeff[1][2],
+                          handler->transform->coeff[2][0],
+                          handler->transform->coeff[2][1],
+                          handler->transform->coeff[2][2]);
+#endif
+            }
+        }
+
+      names++;
+      values++;
+    }
+}
+
+static void
+svg_handler_path_start (SvgHandler   *handler,
+                        const gchar **names,
+                        const gchar **values,
+                        SvgParser    *parser)
+{
+  SvgPath *path = g_slice_new0 (SvgPath);
+
+  while (*names)
+    {
+      switch (*names[0])
+        {
+        case 'i':
+          if (strcmp (*names, "id") == 0 && ! path->id)
+            path->id = g_strdup (*values);
+          break;
+
+        case 'd':
+          if (strcmp (*names, "d") == 0 && ! path->strokes)
+            path->strokes = parse_path_data (*values);
+          break;
+
+        case 't':
+          if (strcmp (*names, "transform") == 0 && ! handler->transform)
+            {
+              GimpMatrix3  matrix;
+
+              if (parse_svg_transform (*values, &matrix))
+                {
+                  handler->transform = g_slice_dup (GimpMatrix3, &matrix);
+                }
+            }
+          break;
+        }
+
+      names++;
+      values++;
+    }
+
+  handler->paths = g_list_prepend (handler->paths, path);
+}
+
+static void
+svg_handler_rect_start (SvgHandler   *handler,
+                        const gchar **names,
+                        const gchar **values,
+                        SvgParser    *parser)
+{
+  SvgPath *path   = g_slice_new0 (SvgPath);
+  gdouble  x      = 0.0;
+  gdouble  y      = 0.0;
+  gdouble  width  = 0.0;
+  gdouble  height = 0.0;
+  gdouble  rx     = 0.0;
+  gdouble  ry     = 0.0;
+  gdouble  xres;
+  gdouble  yres;
+
+  gimp_image_get_resolution (parser->image, &xres, &yres);
+
+  while (*names)
+    {
+      switch (*names[0])
+        {
+        case 'i':
+          if (strcmp (*names, "id") == 0 && ! path->id)
+            path->id = g_strdup (*values);
+          break;
+
+        case 'x':
+          if (strcmp (*names, "x") == 0)
+            parse_svg_length (*values, handler->width, xres, &x);
+          break;
+
+        case 'y':
+          if (strcmp (*names, "y") == 0)
+            parse_svg_length (*values, handler->height, yres, &y);
+          break;
+
+        case 'w':
+          if (strcmp (*names, "width") == 0)
+            parse_svg_length (*values, handler->width, xres, &width);
+          break;
+
+        case 'h':
+          if (strcmp (*names, "height") == 0)
+            parse_svg_length (*values, handler->height, yres, &height);
+          break;
+
+        case 'r':
+          if (strcmp (*names, "rx") == 0)
+            parse_svg_length (*values, handler->width, xres, &rx);
+          else if (strcmp (*names, "ry") == 0)
+            parse_svg_length (*values, handler->height, yres, &ry);
+          break;
+
+        case 't':
+          if (strcmp (*names, "transform") == 0 && ! handler->transform)
+            {
+              GimpMatrix3  matrix;
+
+              if (parse_svg_transform (*values, &matrix))
+                {
+                  handler->transform = g_slice_dup (GimpMatrix3, &matrix);
+                }
+            }
+          break;
+        }
+
+      names++;
+      values++;
+    }
+
+  if (width > 0.0 && height > 0.0 && rx >= 0.0 && ry >= 0.0)
+    {
+      GimpStroke *stroke;
+      GimpCoords  point = COORDS_INIT;
+
+      if (rx == 0.0)
+        rx = ry;
+      if (ry == 0.0)
+        ry = rx;
+
+      rx = MIN (rx, width / 2);
+      ry = MIN (ry, height / 2);
+
+      point.x = x + width - rx;
+      point.y = y;
+      stroke = gimp_bezier_stroke_new_moveto (&point);
+
+      if (rx)
+        {
+          GimpCoords  end = COORDS_INIT;
+
+          end.x = x + width;
+          end.y = y + ry;
+
+          gimp_bezier_stroke_arcto (stroke, rx, ry, 0, FALSE, TRUE, &end);
+        }
+
+      point.x = x + width;
+      point.y = y + height - ry;
+      gimp_bezier_stroke_lineto (stroke, &point);
+
+      if (rx)
+        {
+          GimpCoords  end = COORDS_INIT;
+
+          end.x = x + width - rx;
+          end.y = y + height;
+
+          gimp_bezier_stroke_arcto (stroke, rx, ry, 0, FALSE, TRUE, &end);
+        }
+
+      point.x = x + rx;
+      point.y = y + height;
+      gimp_bezier_stroke_lineto (stroke, &point);
+
+      if (rx)
+        {
+          GimpCoords  end = COORDS_INIT;
+
+          end.x = x;
+          end.y = y + height - ry;
+
+          gimp_bezier_stroke_arcto (stroke, rx, ry, 0, FALSE, TRUE, &end);
+        }
+
+      point.x = x;
+      point.y = y + ry;
+      gimp_bezier_stroke_lineto (stroke, &point);
+
+      if (rx)
+        {
+          GimpCoords  end = COORDS_INIT;
+
+          end.x = x + rx;
+          end.y = y;
+
+          gimp_bezier_stroke_arcto (stroke, rx, ry, 0, FALSE, TRUE, &end);
+        }
+
+      /* the last line is handled by closing the stroke */
+      gimp_stroke_close (stroke);
+
+      path->strokes = g_list_prepend (path->strokes, stroke);
+    }
+
+  handler->paths = g_list_prepend (handler->paths, path);
+}
+
+static void
+svg_handler_ellipse_start (SvgHandler   *handler,
+                           const gchar **names,
+                           const gchar **values,
+                           SvgParser    *parser)
+{
+  SvgPath    *path   = g_slice_new0 (SvgPath);
+  GimpCoords  center = COORDS_INIT;
+  gdouble     rx     = 0.0;
+  gdouble     ry     = 0.0;
+  gdouble     xres;
+  gdouble     yres;
+
+  gimp_image_get_resolution (parser->image, &xres, &yres);
+
+  while (*names)
+    {
+      switch (*names[0])
+        {
+        case 'i':
+          if (strcmp (*names, "id") == 0 && ! path->id)
+            path->id = g_strdup (*values);
+          break;
+
+        case 'c':
+          if (strcmp (*names, "cx") == 0)
+            parse_svg_length (*values, handler->width, xres, &center.x);
+          else if (strcmp (*names, "cy") == 0)
+            parse_svg_length (*values, handler->height, yres, &center.y);
+          break;
+
+        case 'r':
+          if (strcmp (*names, "r") == 0)
+            {
+              parse_svg_length (*values, handler->width,  xres, &rx);
+              parse_svg_length (*values, handler->height, yres, &ry);
+            }
+          else if (strcmp (*names, "rx") == 0)
+            {
+              parse_svg_length (*values, handler->width, xres, &rx);
+            }
+          else if (strcmp (*names, "ry") == 0)
+            {
+              parse_svg_length (*values, handler->height, yres, &ry);
+            }
+          break;
+
+        case 't':
+          if (strcmp (*names, "transform") == 0 && ! handler->transform)
+            {
+              GimpMatrix3  matrix;
+
+              if (parse_svg_transform (*values, &matrix))
+                {
+                  handler->transform = g_slice_dup (GimpMatrix3, &matrix);
+                }
+            }
+          break;
+        }
+
+      names++;
+      values++;
+    }
+
+  if (rx >= 0.0 && ry >= 0.0)
+    path->strokes = g_list_prepend (path->strokes,
+                                    gimp_bezier_stroke_new_ellipse (&center,
+                                                                    rx, ry,
+                                                                    0.0));
+
+  handler->paths = g_list_prepend (handler->paths, path);
+}
+
+static void
+svg_handler_line_start (SvgHandler   *handler,
+                        const gchar **names,
+                        const gchar **values,
+                        SvgParser    *parser)
+{
+  SvgPath    *path  = g_slice_new0 (SvgPath);
+  GimpCoords  start = COORDS_INIT;
+  GimpCoords  end   = COORDS_INIT;
+  GimpStroke *stroke;
+  gdouble     xres;
+  gdouble     yres;
+
+  gimp_image_get_resolution (parser->image, &xres, &yres);
+
+  while (*names)
+    {
+      switch (*names[0])
+        {
+        case 'i':
+          if (strcmp (*names, "id") == 0 && ! path->id)
+            path->id = g_strdup (*values);
+          break;
+
+        case 'x':
+          if (strcmp (*names, "x1") == 0)
+            parse_svg_length (*values, handler->width, xres, &start.x);
+          else if (strcmp (*names, "x2") == 0)
+            parse_svg_length (*values, handler->width, xres, &end.x);
+          break;
+
+        case 'y':
+          if (strcmp (*names, "y1") == 0)
+            parse_svg_length (*values, handler->height, yres, &start.y);
+          else if (strcmp (*names, "y2") == 0)
+            parse_svg_length (*values, handler->height, yres, &end.y);
+          break;
+
+        case 't':
+          if (strcmp (*names, "transform") == 0 && ! handler->transform)
+            {
+              GimpMatrix3  matrix;
+
+              if (parse_svg_transform (*values, &matrix))
+                {
+                  handler->transform = g_slice_dup (GimpMatrix3, &matrix);
+                }
+            }
+          break;
+        }
+
+      names++;
+      values++;
+    }
+
+  stroke = gimp_bezier_stroke_new_moveto (&start);
+  gimp_bezier_stroke_lineto (stroke, &end);
+
+  path->strokes = g_list_prepend (path->strokes, stroke);
+
+  handler->paths = g_list_prepend (handler->paths, path);
+}
+
+static void
+svg_handler_poly_start (SvgHandler   *handler,
+                        const gchar **names,
+                        const gchar **values,
+                        SvgParser    *parser)
+{
+  SvgPath *path   = g_slice_new0 (SvgPath);
+  GString *points = NULL;
+
+  while (*names)
+    {
+      switch (*names[0])
+        {
+        case 'i':
+          if (strcmp (*names, "id") == 0 && ! path->id)
+            path->id = g_strdup (*values);
+          break;
+
+        case 'p':
+          if (strcmp (*names, "points") == 0 && ! points)
+            {
+              const gchar *p = *values;
+              const gchar *m = NULL;
+              const gchar *l = NULL;
+              gint         n = 0;
+
+              while (*p)
+                {
+                  while (g_ascii_isspace (*p) || *p == ',')
+                    p++;
+
+                  switch (n)
+                    {
+                    case 0:
+                      m = p;
+                      break;
+                    case 2:
+                      l = p;
+                      break;
+                    }
+
+                  if (*p)
+                    n++;
+
+                  while (*p && ! g_ascii_isspace (*p) && *p != ',')
+                    p++;
+                }
+
+              if ((n > 3) && (n % 2 == 0))
+                {
+                  points = g_string_sized_new (p - *values + 8);
+
+                  g_string_append_len (points, "M ", 2);
+                  g_string_append_len (points, m, l - m);
+
+                  g_string_append_len (points, "L ", 2);
+                  g_string_append_len (points, l, p - l);
+
+                  if (strcmp (handler->name, "polygon") == 0)
+                    g_string_append_c (points, 'Z');
+                }
+            }
+          break;
+
+        case 't':
+          if (strcmp (*names, "transform") == 0 && ! handler->transform)
+            {
+              GimpMatrix3  matrix;
+
+              if (parse_svg_transform (*values, &matrix))
+                {
+                  handler->transform = g_slice_dup (GimpMatrix3, &matrix);
+                }
+            }
+          break;
+        }
+
+      names++;
+      values++;
+    }
+
+  if (points)
+    {
+      path->strokes = parse_path_data (points->str);
+      g_string_free (points, TRUE);
+    }
+
+  handler->paths = g_list_prepend (handler->paths, path);
+}
+
+static gboolean
+parse_svg_length (const gchar *value,
+                  gdouble      reference,
+                  gdouble      resolution,
+                  gdouble     *length)
+{
+  GimpUnit  unit = GIMP_UNIT_PIXEL;
+  gdouble   len;
+  gchar    *ptr;
+
+  len = g_ascii_strtod (value, &ptr);
+
+  while (g_ascii_isspace (*ptr))
+    ptr++;
+
+  switch (ptr[0])
+    {
+    case '\0':
+      break;
+
+    case 'p':
+      switch (ptr[1])
+        {
+        case 'x':                         break;
+        case 't': unit = GIMP_UNIT_POINT; break;
+        case 'c': unit = GIMP_UNIT_PICA;  break;
+        default:
+          return FALSE;
+        }
+      ptr += 2;
+      break;
+
+    case 'c':
+      if (ptr[1] == 'm')
+        len *= 10.0, unit = GIMP_UNIT_MM;
+      else
+        return FALSE;
+      ptr += 2;
+      break;
+
+    case 'm':
+      if (ptr[1] == 'm')
+        unit = GIMP_UNIT_MM;
+      else
+        return FALSE;
+      ptr += 2;
+      break;
+
+    case 'i':
+      if (ptr[1] == 'n')
+        unit = GIMP_UNIT_INCH;
+      else
+        return FALSE;
+      ptr += 2;
+      break;
+
+    case '%':
+      unit = GIMP_UNIT_PERCENT;
+      ptr += 1;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  while (g_ascii_isspace (*ptr))
+    ptr++;
+
+  if (*ptr)
+    return FALSE;
+
+  switch (unit)
+    {
+    case GIMP_UNIT_PERCENT:
+      *length = len * reference / 100.0;
+      break;
+
+    case GIMP_UNIT_PIXEL:
+      *length = len;
+      break;
+
+    default:
+      *length = len * resolution / gimp_unit_get_factor (unit);
+      break;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+parse_svg_viewbox (const gchar *value,
+                   gdouble     *width,
+                   gdouble     *height,
+                   GimpMatrix3 *matrix)
+{
+  gdouble   x, y, w, h;
+  gchar    *tok;
+  gchar    *str     = g_strdup (value);
+  gboolean  success = FALSE;
+
+  x = y = w = h = 0;
+
+  tok = strtok (str, ", \t");
+  if (tok)
+    {
+      x = g_ascii_strtod (tok, NULL);
+      tok = strtok (NULL, ", \t");
+      if (tok)
+        {
+          y = g_ascii_strtod (tok, NULL);
+          tok = strtok (NULL, ", \t");
+          if (tok != NULL)
+            {
+              w = g_ascii_strtod (tok, NULL);
+              tok = strtok (NULL, ", \t");
+              if (tok)
+                {
+                  h = g_ascii_strtod (tok, NULL);
+                  success = TRUE;
+                }
+            }
+        }
+    }
+
+  g_free (str);
+
+  if (success)
+    {
+      gimp_matrix3_identity (matrix);
+      gimp_matrix3_translate (matrix, -x,  -y);
+
+      if (w > 0.0 && h > 0.0)
+        {
+          gimp_matrix3_scale (matrix, *width / w, *height / h);
+        }
+      else  /* disable rendering of the element */
+        {
+#ifdef DEBUG_VECTORS_IMPORT
+          g_printerr ("empty viewBox");
+#endif
+          *width = *height = 0.0;
+        }
+    }
+  else
+    {
+      g_printerr ("SVG import: cannot parse viewBox attribute\n");
+    }
+
+  return success;
+}
+
+static gboolean
+parse_svg_transform (const gchar *value,
+                     GimpMatrix3 *matrix)
+{
+  gint i;
+
+  gimp_matrix3_identity (matrix);
+
+  for (i = 0; value[i]; i++)
+    {
+      GimpMatrix3  trafo;
+      gchar        keyword[32];
+      gdouble      args[6];
+      gint         n_args;
+      gint         key_len;
+
+      gimp_matrix3_identity (&trafo);
+
+      /* skip initial whitespace */
+      while (g_ascii_isspace (value[i]))
+        i++;
+
+      /* parse keyword */
+      for (key_len = 0; key_len < sizeof (keyword); key_len++)
+        {
+          gchar c = value[i];
+
+          if (g_ascii_isalpha (c) || c == '-')
+            keyword[key_len] = value[i++];
+          else
+            break;
+        }
+
+      if (key_len >= sizeof (keyword))
+        return FALSE;
+
+      keyword[key_len] = '\0';
+
+      /* skip whitespace */
+      while (g_ascii_isspace (value[i]))
+        i++;
+
+      if (value[i] != '(')
+        return FALSE;
+      i++;
+
+      for (n_args = 0; ; n_args++)
+        {
+          gchar  c;
+          gchar *end_ptr;
+
+          /* skip whitespace */
+          while (g_ascii_isspace (value[i]))
+            i++;
+
+          c = value[i];
+          if (g_ascii_isdigit (c) || c == '+' || c == '-' || c == '.')
+            {
+              if (n_args == G_N_ELEMENTS (args))
+                return FALSE; /* too many args */
+
+              args[n_args] = g_ascii_strtod (value + i, &end_ptr);
+              i = end_ptr - value;
+
+              while (g_ascii_isspace (value[i]))
+                i++;
+
+              /* skip optional comma */
+              if (value[i] == ',')
+                i++;
+            }
+          else if (c == ')')
+            break;
+          else
+            return FALSE;
+        }
+
+      /* OK, have parsed keyword and args, now calculate the transform matrix */
+
+      if (strcmp (keyword, "matrix") == 0)
+        {
+          if (n_args != 6)
+            return FALSE;
+
+          gimp_matrix3_affine (&trafo,
+                               args[0], args[1],
+                               args[2], args[3],
+                               args[4], args[5]);
+        }
+      else if (strcmp (keyword, "translate") == 0)
+        {
+          if (n_args == 1)
+            args[1] = 0.0;
+          else if (n_args != 2)
+            return FALSE;
+
+          gimp_matrix3_translate (&trafo, args[0], args[1]);
+        }
+      else if (strcmp (keyword, "scale") == 0)
+        {
+          if (n_args == 1)
+            args[1] = args[0];
+          else if (n_args != 2)
+            return FALSE;
+
+          gimp_matrix3_scale (&trafo, args[0], args[1]);
+        }
+      else if (strcmp (keyword, "rotate") == 0)
+        {
+          if (n_args == 1)
+            {
+              gimp_matrix3_rotate (&trafo, gimp_deg_to_rad (args[0]));
+            }
+          else if (n_args == 3)
+            {
+              gimp_matrix3_translate (&trafo, -args[1], -args[2]);
+              gimp_matrix3_rotate (&trafo, gimp_deg_to_rad (args[0]));
+              gimp_matrix3_translate (&trafo, args[1], args[2]);
+            }
+          else
+            return FALSE;
+        }
+      else if (strcmp (keyword, "skewX") == 0)
+        {
+          if (n_args != 1)
+            return FALSE;
+
+          gimp_matrix3_xshear (&trafo, tan (gimp_deg_to_rad (args[0])));
+        }
+      else if (strcmp (keyword, "skewY") == 0)
+        {
+          if (n_args != 1)
+            return FALSE;
+
+          gimp_matrix3_yshear (&trafo, tan (gimp_deg_to_rad (args[0])));
+        }
+      else
+        {
+          return FALSE; /* unknown keyword */
+        }
+
+      gimp_matrix3_invert (&trafo);
+      gimp_matrix3_mult (&trafo, matrix);
+    }
+
+  gimp_matrix3_invert (matrix);
+
+  return TRUE;
+}
+
+
+/**********************************************************/
+/*  Below is the code that parses the actual path data.   */
+/*                                                        */
+/*  This code is taken from librsvg and was originally    */
+/*  written by Raph Levien <raph@artofcode.com> for Gill. */
+/**********************************************************/
+
+typedef struct
+{
+  GList       *strokes;
+  GimpStroke  *stroke;
+  gdouble      cpx, cpy;  /* current point                               */
+  gdouble      rpx, rpy;  /* reflection point (for 's' and 't' commands) */
+  gchar        cmd;       /* current command (lowercase)                 */
+  gint         param;     /* number of parameters                        */
+  gboolean     rel;       /* true if relative coords                     */
+  gdouble      params[7]; /* parameters that have been parsed            */
+} ParsePathContext;
+
+
+static void  parse_path_default_xy (ParsePathContext *ctx,
+                                    gint              n_params);
+static void  parse_path_do_cmd     (ParsePathContext *ctx,
+                                    gboolean          final);
+
+
+static GList *
+parse_path_data (const gchar *data)
+{
+  ParsePathContext ctx;
+
+  gboolean  in_num        = FALSE;
+  gboolean  in_frac       = FALSE;
+  gboolean  in_exp        = FALSE;
+  gboolean  exp_wait_sign = FALSE;
+  gdouble   val           = 0.0;
+  gchar     c             = 0;
+  gint      sign          = 0;
+  gint      exp           = 0;
+  gint      exp_sign      = 0;
+  gdouble   frac          = 0.0;
+  gint      i;
+
+  memset (&ctx, 0, sizeof (ParsePathContext));
+
+  for (i = 0; ; i++)
+    {
+      c = data[i];
+
+      if (c >= '0' && c <= '9')
+        {
+          /* digit */
+          if (in_num)
+            {
+              if (in_exp)
+                {
+                  exp = (exp * 10) + c - '0';
+                  exp_wait_sign = FALSE;
+                }
+              else if (in_frac)
+                val += (frac *= 0.1) * (c - '0');
+              else
+                val = (val * 10) + c - '0';
+            }
+          else
+            {
+              in_num = TRUE;
+              in_frac = FALSE;
+              in_exp = FALSE;
+              exp = 0;
+              exp_sign = 1;
+              exp_wait_sign = FALSE;
+              val = c - '0';
+              sign = 1;
+            }
+        }
+      else if (c == '.')
+        {
+          if (! in_num)
+            {
+              in_num = TRUE;
+              val = 0;
+            }
+
+          in_frac = TRUE;
+          frac = 1;
+        }
+      else if ((c == 'E' || c == 'e') && in_num)
+        {
+          in_exp = TRUE;
+          exp_wait_sign = TRUE;
+          exp = 0;
+          exp_sign = 1;
+        }
+      else if ((c == '+' || c == '-') && in_exp)
+        {
+          exp_sign = c == '+' ? 1 : -1;
+        }
+      else if (in_num)
+        {
+          /* end of number */
+
+          val *= sign * pow (10, exp_sign * exp);
+
+          if (ctx.rel)
+            {
+              /* Handle relative coordinates. This switch statement attempts
+                 to determine _what_ the coords are relative to. This is
+                 underspecified in the 12 Apr working draft. */
+              switch (ctx.cmd)
+                {
+                case 'l':
+                case 'm':
+                case 'c':
+                case 's':
+                case 'q':
+                case 't':
+                  /* rule: even-numbered params are x-relative, odd-numbered
+                     are y-relative */
+                  if ((ctx.param & 1) == 0)
+                    val += ctx.cpx;
+                  else if ((ctx.param & 1) == 1)
+                    val += ctx.cpy;
+                  break;
+
+                case 'a':
+                  /* rule: sixth and seventh are x and y, rest are not
+                     relative */
+                  if (ctx.param == 5)
+                    val += ctx.cpx;
+                  else if (ctx.param == 6)
+                    val += ctx.cpy;
+                  break;
+
+                case 'h':
+                  /* rule: x-relative */
+                  val += ctx.cpx;
+                  break;
+
+                case 'v':
+                  /* rule: y-relative */
+                  val += ctx.cpy;
+                  break;
+                }
+            }
+
+          ctx.params[ctx.param++] = val;
+          parse_path_do_cmd (&ctx, FALSE);
+          in_num = FALSE;
+        }
+
+      if (c == '\0')
+        {
+          break;
+        }
+      else if ((c == '+' || c == '-') && ! exp_wait_sign)
+        {
+          sign = c == '+' ? 1 : -1;
+          val = 0;
+          in_num = TRUE;
+          in_frac = FALSE;
+          in_exp = FALSE;
+          exp = 0;
+          exp_sign = 1;
+          exp_wait_sign = FALSE;
+        }
+      else if (c == 'z' || c == 'Z')
+        {
+          if (ctx.param)
+            parse_path_do_cmd (&ctx, TRUE);
+
+          if (ctx.stroke)
+            gimp_stroke_close (ctx.stroke);
+        }
+      else if (c >= 'A' && c <= 'Z' && c != 'E')
+        {
+          if (ctx.param)
+            parse_path_do_cmd (&ctx, TRUE);
+
+          ctx.cmd = c + 'a' - 'A';
+          ctx.rel = FALSE;
+        }
+      else if (c >= 'a' && c <= 'z' && c != 'e')
+        {
+          if (ctx.param)
+            parse_path_do_cmd (&ctx, TRUE);
+
+          ctx.cmd = c;
+          ctx.rel = TRUE;
+        }
+      /* else c _should_ be whitespace or , */
+    }
+
+  return g_list_reverse (ctx.strokes);
+}
+
+/* supply defaults for missing parameters, assuming relative coordinates
+   are to be interpreted as x,y */
+static void
+parse_path_default_xy (ParsePathContext *ctx,
+                       gint              n_params)
+{
+  gint i;
+
+  if (ctx->rel)
+    {
+      for (i = ctx->param; i < n_params; i++)
+        {
+          if (i > 2)
+            ctx->params[i] = ctx->params[i - 2];
+          else if (i == 1)
+            ctx->params[i] = ctx->cpy;
+          else if (i == 0)
+            /* we shouldn't get here (ctx->param > 0 as precondition) */
+            ctx->params[i] = ctx->cpx;
+        }
+    }
+  else
+    {
+      for (i = ctx->param; i < n_params; i++)
+        ctx->params[i] = 0.0;
+    }
+}
+
+static void
+parse_path_do_cmd (ParsePathContext *ctx,
+                   gboolean          final)
+{
+  GimpCoords coords = COORDS_INIT;
+
+  switch (ctx->cmd)
+    {
+    case 'm':
+      /* moveto */
+      if (ctx->param == 2 || final)
+        {
+          parse_path_default_xy (ctx, 2);
+
+          coords.x = ctx->cpx = ctx->rpx = ctx->params[0];
+          coords.y = ctx->cpy = ctx->rpy = ctx->params[1];
+
+          ctx->stroke = gimp_bezier_stroke_new_moveto (&coords);
+          ctx->strokes = g_list_prepend (ctx->strokes, ctx->stroke);
+
+          ctx->param = 0;
+
+          /* If a moveto is followed by multiple pairs of coordinates,
+           * the subsequent pairs are treated as implicit lineto commands.
+           */
+          ctx->cmd = 'l';
+        }
+      break;
+
+    case 'l':
+      /* lineto */
+      if (ctx->param == 2 || final)
+        {
+          parse_path_default_xy (ctx, 2);
+
+          coords.x = ctx->cpx = ctx->rpx = ctx->params[0];
+          coords.y = ctx->cpy = ctx->rpy = ctx->params[1];
+
+          gimp_bezier_stroke_lineto (ctx->stroke, &coords);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'c':
+      /* curveto */
+      if (ctx->param == 6 || final)
+        {
+          GimpCoords ctrl1 = COORDS_INIT;
+          GimpCoords ctrl2 = COORDS_INIT;
+
+          parse_path_default_xy (ctx, 6);
+
+          ctrl1.x  = ctx->params[0];
+          ctrl1.y  = ctx->params[1];
+          ctrl2.x  = ctx->rpx = ctx->params[2];
+          ctrl2.y  = ctx->rpy = ctx->params[3];
+          coords.x = ctx->cpx = ctx->params[4];
+          coords.y = ctx->cpy = ctx->params[5];
+
+          gimp_bezier_stroke_cubicto (ctx->stroke, &ctrl1, &ctrl2, &coords);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 's':
+      /* smooth curveto */
+      if (ctx->param == 4 || final)
+        {
+          GimpCoords ctrl1 = COORDS_INIT;
+          GimpCoords ctrl2 = COORDS_INIT;
+
+          parse_path_default_xy (ctx, 4);
+
+          ctrl1.x  = 2 * ctx->cpx - ctx->rpx;
+          ctrl1.y  = 2 * ctx->cpy - ctx->rpy;
+          ctrl2.x  = ctx->rpx = ctx->params[0];
+          ctrl2.y  = ctx->rpy = ctx->params[1];
+          coords.x = ctx->cpx = ctx->params[2];
+          coords.y = ctx->cpy = ctx->params[3];
+
+          gimp_bezier_stroke_cubicto (ctx->stroke, &ctrl1, &ctrl2, &coords);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'h':
+      /* horizontal lineto */
+      if (ctx->param == 1)
+        {
+          coords.x = ctx->cpx = ctx->rpx = ctx->params[0];
+          coords.y = ctx->cpy;
+
+          gimp_bezier_stroke_lineto (ctx->stroke, &coords);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'v':
+      /* vertical lineto */
+      if (ctx->param == 1)
+        {
+          coords.x = ctx->cpx;
+          coords.y = ctx->cpy = ctx->rpy = ctx->params[0];
+
+          gimp_bezier_stroke_lineto (ctx->stroke, &coords);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'q':
+      /* quadratic bezier curveto */
+      if (ctx->param == 4 || final)
+        {
+          GimpCoords ctrl = COORDS_INIT;
+
+          parse_path_default_xy (ctx, 4);
+
+          ctrl.x   = ctx->rpx = ctx->params[0];
+          ctrl.y   = ctx->rpy = ctx->params[1];
+          coords.x = ctx->cpx = ctx->params[2];
+          coords.y = ctx->cpy = ctx->params[3];
+
+          gimp_bezier_stroke_conicto (ctx->stroke, &ctrl, &coords);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 't':
+      /* truetype quadratic bezier curveto */
+      if (ctx->param == 2 || final)
+        {
+          GimpCoords ctrl = COORDS_INIT;
+
+          parse_path_default_xy (ctx, 2);
+
+          ctrl.x   = ctx->rpx = 2 * ctx->cpx - ctx->rpx;
+          ctrl.y   = ctx->rpy = 2 * ctx->cpy - ctx->rpy;
+          coords.x = ctx->cpx = ctx->params[0];
+          coords.y = ctx->cpy = ctx->params[1];
+
+          gimp_bezier_stroke_conicto (ctx->stroke, &ctrl, &coords);
+
+          ctx->param = 0;
+        }
+      else if (final)
+        {
+          if (ctx->param > 2)
+            {
+              GimpCoords ctrl = COORDS_INIT;
+
+              parse_path_default_xy (ctx, 4);
+
+              ctrl.x   = ctx->rpx = ctx->params[0];
+              ctrl.y   = ctx->rpy = ctx->params[1];
+              coords.x = ctx->cpx = ctx->params[2];
+              coords.y = ctx->cpy = ctx->params[3];
+
+              gimp_bezier_stroke_conicto (ctx->stroke, &ctrl, &coords);
+            }
+          else
+            {
+              parse_path_default_xy (ctx, 2);
+
+              coords.x = ctx->cpx = ctx->rpx = ctx->params[0];
+              coords.y = ctx->cpy = ctx->rpy = ctx->params[1];
+
+              gimp_bezier_stroke_lineto (ctx->stroke, &coords);
+            }
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'a':
+      if (ctx->param == 7 || final)
+        {
+          coords.x = ctx->cpx = ctx->rpx = ctx->params[5];
+          coords.y = ctx->cpy = ctx->rpy = ctx->params[6];
+
+          gimp_bezier_stroke_arcto (ctx->stroke,
+                                    ctx->params[0], ctx->params[1],
+                                    gimp_deg_to_rad (ctx->params[2]),
+                                    ctx->params[3], ctx->params[4],
+                                    &coords);
+          ctx->param = 0;
+        }
+      break;
+
+    default:
+      ctx->param = 0;
+      break;
+    }
+}
diff --git a/app/vectors/gimpvectors-import.h b/app/vectors/gimpvectors-import.h
new file mode 100644
index 0000000..1d7f8a6
--- /dev/null
+++ b/app/vectors/gimpvectors-import.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpVectors Import
+ * Copyright (C) 2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_IMPORT_H__
+#define __GIMP_VECTORS_IMPORT_H__
+
+
+gboolean  gimp_vectors_import_file   (GimpImage    *image,
+                                      GFile        *file,
+                                      gboolean      merge,
+                                      gboolean      scale,
+                                      GimpVectors  *parent,
+                                      gint          position,
+                                      GList       **ret_vectors,
+                                      GError      **error);
+gboolean  gimp_vectors_import_buffer (GimpImage    *image,
+                                      const gchar  *buffer,
+                                      gsize         len,
+                                      gboolean      merge,
+                                      gboolean      scale,
+                                      GimpVectors  *parent,
+                                      gint          position,
+                                      GList       **ret_vectors,
+                                      GError      **error);
+
+
+#endif /* __GIMP_VECTORS_IMPORT_H__ */
diff --git a/app/vectors/gimpvectors-preview.c b/app/vectors/gimpvectors-preview.c
new file mode 100644
index 0000000..988148a
--- /dev/null
+++ b/app/vectors/gimpvectors-preview.c
@@ -0,0 +1,93 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "vectors-types.h"
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpstroke.h"
+#include "gimpvectors.h"
+#include "gimpvectors-preview.h"
+
+
+/*  public functions  */
+
+GimpTempBuf *
+gimp_vectors_get_new_preview (GimpViewable *viewable,
+                              GimpContext  *context,
+                              gint          width,
+                              gint          height)
+{
+  GimpVectors *vectors;
+  GimpItem    *item;
+  GimpStroke  *cur_stroke;
+  gdouble      xscale, yscale;
+  guchar      *data;
+  GimpTempBuf *temp_buf;
+
+  vectors = GIMP_VECTORS (viewable);
+  item    = GIMP_ITEM (viewable);
+
+  xscale = ((gdouble) width)  / gimp_image_get_width  (gimp_item_get_image (item));
+  yscale = ((gdouble) height) / gimp_image_get_height (gimp_item_get_image (item));
+
+  temp_buf = gimp_temp_buf_new (width, height, babl_format ("Y' u8"));
+  data = gimp_temp_buf_get_data (temp_buf);
+  memset (data, 255, width * height);
+
+  for (cur_stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+       cur_stroke;
+       cur_stroke = gimp_vectors_stroke_get_next (vectors, cur_stroke))
+    {
+      GArray   *coords;
+      gboolean  closed;
+      gint      i;
+
+      coords = gimp_stroke_interpolate (cur_stroke, 0.5, &closed);
+
+      if (coords)
+        {
+          for (i = 0; i < coords->len; i++)
+            {
+              GimpCoords point;
+              gint       x, y;
+
+              point = g_array_index (coords, GimpCoords, i);
+
+              x = ROUND (point.x * xscale);
+              y = ROUND (point.y * yscale);
+
+              if (x >= 0 && y >= 0 && x < width && y < height)
+                data[y * width + x] = 0;
+            }
+
+          g_array_free (coords, TRUE);
+        }
+    }
+
+  return temp_buf;
+}
diff --git a/app/vectors/gimpvectors-preview.h b/app/vectors/gimpvectors-preview.h
new file mode 100644
index 0000000..f934d8e
--- /dev/null
+++ b/app/vectors/gimpvectors-preview.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_PREVIEW_H__
+#define __GIMP_VECTORS_PREVIEW_H__
+
+
+/*
+ *  virtual function of GimpVectors -- don't call directly
+ */
+
+GimpTempBuf * gimp_vectors_get_new_preview (GimpViewable *viewable,
+                                            GimpContext  *context,
+                                            gint          width,
+                                            gint          height);
+
+
+#endif /* __GIMP_VECTORS_PREVIEW_H__ */
diff --git a/app/vectors/gimpvectors-warp.c b/app/vectors/gimpvectors-warp.c
new file mode 100644
index 0000000..aeb8dec
--- /dev/null
+++ b/app/vectors/gimpvectors-warp.c
@@ -0,0 +1,210 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectors-warp.c
+ * Copyright (C) 2005 Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "vectors-types.h"
+
+#include "libgimpmath/gimpmath.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpcoords.h"
+
+#include "gimpanchor.h"
+#include "gimpstroke.h"
+#include "gimpvectors.h"
+#include "gimpvectors-warp.h"
+
+
+#define EPSILON 0.2
+#define DX      2.0
+
+
+static void   gimp_stroke_warp_point   (GimpStroke  *stroke,
+                                        gdouble      x,
+                                        gdouble      y,
+                                        GimpCoords  *point_warped,
+                                        gdouble      y_offset,
+                                        gdouble      x_len);
+
+static void   gimp_vectors_warp_stroke (GimpVectors *vectors,
+                                        GimpStroke  *stroke,
+                                        gdouble      y_offset);
+
+
+void
+gimp_vectors_warp_point (GimpVectors *vectors,
+                         GimpCoords  *point,
+                         GimpCoords  *point_warped,
+                         gdouble      y_offset)
+{
+  gdouble     x      = point->x;
+  gdouble     y      = point->y;
+  gdouble     len;
+  GList      *list;
+  GimpStroke *stroke;
+
+  for (list = vectors->strokes->head;
+       list;
+       list = g_list_next (list))
+    {
+      stroke = list->data;
+
+      len = gimp_vectors_stroke_get_length (vectors, stroke);
+
+      if (x < len || ! list->next)
+        break;
+
+      x -= len;
+    }
+
+  if (! list)
+    {
+      point_warped->x = 0;
+      point_warped->y = 0;
+      return;
+    }
+
+  gimp_stroke_warp_point (stroke, x, y, point_warped, y_offset, len);
+}
+
+static void
+gimp_stroke_warp_point (GimpStroke *stroke,
+                        gdouble     x,
+                        gdouble     y,
+                        GimpCoords *point_warped,
+                        gdouble     y_offset,
+                        gdouble     x_len)
+{
+  GimpCoords point_zero  = { 0, };
+  GimpCoords point_minus = { 0, };
+  GimpCoords point_plus  = { 0, };
+  gdouble    slope;
+  gdouble    dx, dy, nx, ny, len;
+
+  if (x + DX >= x_len)
+    {
+      gdouble tx, ty;
+
+      if (! gimp_stroke_get_point_at_dist (stroke, x_len, EPSILON,
+                                           &point_zero, &slope))
+        {
+          point_warped->x = 0;
+          point_warped->y = 0;
+          return;
+        }
+
+      point_warped->x = point_zero.x;
+      point_warped->y = point_zero.y;
+
+      if (! gimp_stroke_get_point_at_dist (stroke, x_len - DX, EPSILON,
+                                           &point_minus, &slope))
+        return;
+
+      dx = point_zero.x - point_minus.x;
+      dy = point_zero.y - point_minus.y;
+
+      len = hypot (dx, dy);
+
+      if (len < 0.01)
+        return;
+
+      tx = dx / len;
+      ty = dy / len;
+
+      nx = - dy / len;
+      ny =   dx / len;
+
+      point_warped->x += tx * (x - x_len) + nx * (y - y_offset);
+      point_warped->y += ty * (x - x_len) + ny * (y - y_offset);
+
+      return;
+    }
+
+  if (! gimp_stroke_get_point_at_dist (stroke, x, EPSILON,
+                                       &point_zero, &slope))
+    {
+      point_warped->x = 0;
+      point_warped->y = 0;
+      return;
+    }
+
+  point_warped->x = point_zero.x;
+  point_warped->y = point_zero.y;
+
+  if (! gimp_stroke_get_point_at_dist (stroke, x - DX, EPSILON,
+                                       &point_minus, &slope))
+    return;
+
+  if (! gimp_stroke_get_point_at_dist (stroke, x + DX, EPSILON,
+                                       &point_plus, &slope))
+    return;
+
+  dx = point_plus.x - point_minus.x;
+  dy = point_plus.y - point_minus.y;
+
+  len = hypot (dx, dy);
+
+  if (len < 0.01)
+    return;
+
+  nx = - dy / len;
+  ny =   dx / len;
+
+  point_warped->x = point_zero.x + nx * (y - y_offset);
+  point_warped->y = point_zero.y + ny * (y - y_offset);
+}
+
+static void
+gimp_vectors_warp_stroke (GimpVectors *vectors,
+                          GimpStroke  *stroke,
+                          gdouble      y_offset)
+{
+  GList *list;
+
+  for (list = stroke->anchors->head; list; list = g_list_next (list))
+    {
+      GimpAnchor *anchor = list->data;
+
+      gimp_vectors_warp_point (vectors,
+                               &anchor->position, &anchor->position,
+                               y_offset);
+    }
+}
+
+void
+gimp_vectors_warp_vectors (GimpVectors *vectors,
+                           GimpVectors *vectors_in,
+                           gdouble      y_offset)
+{
+  GList *list;
+
+  for (list = vectors_in->strokes->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_vectors_warp_stroke (vectors, stroke, y_offset);
+    }
+}
diff --git a/app/vectors/gimpvectors-warp.h b/app/vectors/gimpvectors-warp.h
new file mode 100644
index 0000000..12b8993
--- /dev/null
+++ b/app/vectors/gimpvectors-warp.h
@@ -0,0 +1,36 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectors-warp.h
+ * Copyright (C) 2005 Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_WARP_H__
+#define __GIMP_VECTORS_WARP_H__
+
+
+void gimp_vectors_warp_point   (GimpVectors *vectors,
+                                GimpCoords  *point,
+                                GimpCoords  *point_warped,
+                                gdouble      y_offset);
+
+void gimp_vectors_warp_vectors (GimpVectors *vectors,
+                                GimpVectors *vectors_in,
+                                gdouble      yoffset);
+
+
+#endif /* __GIMP_VECTORS_WARP_H__ */
+
diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c
new file mode 100644
index 0000000..1a65eac
--- /dev/null
+++ b/app/vectors/gimpvectors.c
@@ -0,0 +1,1255 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectors.c
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "vectors-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-transform-utils.h"
+#include "core/gimpbezierdesc.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable-fill.h"
+#include "core/gimpdrawable-stroke.h"
+#include "core/gimperror.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpmarshal.h"
+#include "core/gimppaintinfo.h"
+#include "core/gimpstrokeoptions.h"
+
+#include "paint/gimppaintcore-stroke.h"
+#include "paint/gimppaintoptions.h"
+
+#include "gimpanchor.h"
+#include "gimpstroke.h"
+#include "gimpvectors.h"
+#include "gimpvectors-preview.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  FREEZE,
+  THAW,
+  LAST_SIGNAL
+};
+
+
+static void       gimp_vectors_finalize      (GObject           *object);
+
+static gint64     gimp_vectors_get_memsize   (GimpObject        *object,
+                                              gint64            *gui_size);
+
+static gboolean   gimp_vectors_is_attached   (GimpItem          *item);
+static GimpItemTree * gimp_vectors_get_tree  (GimpItem          *item);
+static gboolean   gimp_vectors_bounds        (GimpItem          *item,
+                                              gdouble           *x,
+                                              gdouble           *y,
+                                              gdouble           *width,
+                                              gdouble           *height);
+static GimpItem * gimp_vectors_duplicate     (GimpItem          *item,
+                                              GType              new_type);
+static void       gimp_vectors_convert       (GimpItem          *item,
+                                              GimpImage         *dest_image,
+                                              GType              old_type);
+static void       gimp_vectors_translate     (GimpItem          *item,
+                                              gdouble            offset_x,
+                                              gdouble            offset_y,
+                                              gboolean           push_undo);
+static void       gimp_vectors_scale         (GimpItem          *item,
+                                              gint               new_width,
+                                              gint               new_height,
+                                              gint               new_offset_x,
+                                              gint               new_offset_y,
+                                              GimpInterpolationType  interp_type,
+                                              GimpProgress      *progress);
+static void       gimp_vectors_resize        (GimpItem          *item,
+                                              GimpContext       *context,
+                                              GimpFillType       fill_type,
+                                              gint               new_width,
+                                              gint               new_height,
+                                              gint               offset_x,
+                                              gint               offset_y);
+static void       gimp_vectors_flip          (GimpItem          *item,
+                                              GimpContext       *context,
+                                              GimpOrientationType  flip_type,
+                                              gdouble            axis,
+                                              gboolean           clip_result);
+static void       gimp_vectors_rotate        (GimpItem          *item,
+                                              GimpContext       *context,
+                                              GimpRotationType   rotate_type,
+                                              gdouble            center_x,
+                                              gdouble            center_y,
+                                              gboolean           clip_result);
+static void       gimp_vectors_transform     (GimpItem          *item,
+                                              GimpContext       *context,
+                                              const GimpMatrix3 *matrix,
+                                              GimpTransformDirection direction,
+                                              GimpInterpolationType interp_type,
+                                              GimpTransformResize   clip_result,
+                                              GimpProgress      *progress);
+static GimpTransformResize
+                  gimp_vectors_get_clip      (GimpItem          *item,
+                                              GimpTransformResize clip_result);
+static gboolean   gimp_vectors_fill          (GimpItem          *item,
+                                              GimpDrawable      *drawable,
+                                              GimpFillOptions   *fill_options,
+                                              gboolean           push_undo,
+                                              GimpProgress      *progress,
+                                              GError           **error);
+static gboolean   gimp_vectors_stroke        (GimpItem          *item,
+                                              GimpDrawable      *drawable,
+                                              GimpStrokeOptions *stroke_options,
+                                              gboolean           push_undo,
+                                              GimpProgress      *progress,
+                                              GError           **error);
+static void       gimp_vectors_to_selection  (GimpItem          *item,
+                                              GimpChannelOps     op,
+                                              gboolean           antialias,
+                                              gboolean           feather,
+                                              gdouble            feather_radius_x,
+                                              gdouble            feather_radius_y);
+
+static void       gimp_vectors_real_freeze          (GimpVectors       *vectors);
+static void       gimp_vectors_real_thaw            (GimpVectors       *vectors);
+static void       gimp_vectors_real_stroke_add      (GimpVectors       *vectors,
+                                                     GimpStroke        *stroke);
+static void       gimp_vectors_real_stroke_remove   (GimpVectors       *vectors,
+                                                     GimpStroke        *stroke);
+static GimpStroke * gimp_vectors_real_stroke_get    (GimpVectors       *vectors,
+                                                     const GimpCoords  *coord);
+static GimpStroke *gimp_vectors_real_stroke_get_next(GimpVectors       *vectors,
+                                                     GimpStroke        *prev);
+static gdouble gimp_vectors_real_stroke_get_length  (GimpVectors       *vectors,
+                                                     GimpStroke        *prev);
+static GimpAnchor * gimp_vectors_real_anchor_get    (GimpVectors       *vectors,
+                                                     const GimpCoords  *coord,
+                                                     GimpStroke       **ret_stroke);
+static void       gimp_vectors_real_anchor_delete   (GimpVectors       *vectors,
+                                                     GimpAnchor        *anchor);
+static gdouble    gimp_vectors_real_get_length      (GimpVectors       *vectors,
+                                                     const GimpAnchor  *start);
+static gdouble    gimp_vectors_real_get_distance    (GimpVectors       *vectors,
+                                                     const GimpCoords  *coord);
+static gint       gimp_vectors_real_interpolate     (GimpVectors       *vectors,
+                                                     GimpStroke        *stroke,
+                                                     gdouble            precision,
+                                                     gint               max_points,
+                                                     GimpCoords        *ret_coords);
+
+static GimpBezierDesc * gimp_vectors_make_bezier      (GimpVectors     *vectors);
+static GimpBezierDesc * gimp_vectors_real_make_bezier (GimpVectors     *vectors);
+
+
+G_DEFINE_TYPE (GimpVectors, gimp_vectors, GIMP_TYPE_ITEM)
+
+#define parent_class gimp_vectors_parent_class
+
+static guint gimp_vectors_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_vectors_class_init (GimpVectorsClass *klass)
+{
+  GObjectClass      *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass   *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class    = GIMP_VIEWABLE_CLASS (klass);
+  GimpItemClass     *item_class        = GIMP_ITEM_CLASS (klass);
+
+  gimp_vectors_signals[FREEZE] =
+    g_signal_new ("freeze",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpVectorsClass, freeze),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gimp_vectors_signals[THAW] =
+    g_signal_new ("thaw",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpVectorsClass, thaw),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->finalize            = gimp_vectors_finalize;
+
+  gimp_object_class->get_memsize    = gimp_vectors_get_memsize;
+
+  viewable_class->get_new_preview   = gimp_vectors_get_new_preview;
+  viewable_class->default_icon_name = "gimp-path";
+
+  item_class->is_attached           = gimp_vectors_is_attached;
+  item_class->get_tree              = gimp_vectors_get_tree;
+  item_class->bounds                = gimp_vectors_bounds;
+  item_class->duplicate             = gimp_vectors_duplicate;
+  item_class->convert               = gimp_vectors_convert;
+  item_class->translate             = gimp_vectors_translate;
+  item_class->scale                 = gimp_vectors_scale;
+  item_class->resize                = gimp_vectors_resize;
+  item_class->flip                  = gimp_vectors_flip;
+  item_class->rotate                = gimp_vectors_rotate;
+  item_class->transform             = gimp_vectors_transform;
+  item_class->get_clip              = gimp_vectors_get_clip;
+  item_class->fill                  = gimp_vectors_fill;
+  item_class->stroke                = gimp_vectors_stroke;
+  item_class->to_selection          = gimp_vectors_to_selection;
+  item_class->default_name          = _("Path");
+  item_class->rename_desc           = C_("undo-type", "Rename Path");
+  item_class->translate_desc        = C_("undo-type", "Move Path");
+  item_class->scale_desc            = C_("undo-type", "Scale Path");
+  item_class->resize_desc           = C_("undo-type", "Resize Path");
+  item_class->flip_desc             = C_("undo-type", "Flip Path");
+  item_class->rotate_desc           = C_("undo-type", "Rotate Path");
+  item_class->transform_desc        = C_("undo-type", "Transform Path");
+  item_class->fill_desc             = C_("undo-type", "Fill Path");
+  item_class->stroke_desc           = C_("undo-type", "Stroke Path");
+  item_class->to_selection_desc     = C_("undo-type", "Path to Selection");
+  item_class->reorder_desc          = C_("undo-type", "Reorder Path");
+  item_class->raise_desc            = C_("undo-type", "Raise Path");
+  item_class->raise_to_top_desc     = C_("undo-type", "Raise Path to Top");
+  item_class->lower_desc            = C_("undo-type", "Lower Path");
+  item_class->lower_to_bottom_desc  = C_("undo-type", "Lower Path to Bottom");
+  item_class->raise_failed          = _("Path cannot be raised higher.");
+  item_class->lower_failed          = _("Path cannot be lowered more.");
+
+  klass->freeze                     = gimp_vectors_real_freeze;
+  klass->thaw                       = gimp_vectors_real_thaw;
+
+  klass->stroke_add                 = gimp_vectors_real_stroke_add;
+  klass->stroke_remove              = gimp_vectors_real_stroke_remove;
+  klass->stroke_get                 = gimp_vectors_real_stroke_get;
+  klass->stroke_get_next            = gimp_vectors_real_stroke_get_next;
+  klass->stroke_get_length          = gimp_vectors_real_stroke_get_length;
+
+  klass->anchor_get                 = gimp_vectors_real_anchor_get;
+  klass->anchor_delete              = gimp_vectors_real_anchor_delete;
+
+  klass->get_length                 = gimp_vectors_real_get_length;
+  klass->get_distance               = gimp_vectors_real_get_distance;
+  klass->interpolate                = gimp_vectors_real_interpolate;
+
+  klass->make_bezier                = gimp_vectors_real_make_bezier;
+}
+
+static void
+gimp_vectors_init (GimpVectors *vectors)
+{
+  gimp_item_set_visible (GIMP_ITEM (vectors), FALSE, FALSE);
+
+  vectors->strokes        = g_queue_new ();
+  vectors->stroke_to_list = g_hash_table_new (g_direct_hash, g_direct_equal);
+  vectors->last_stroke_ID = 0;
+  vectors->freeze_count   = 0;
+  vectors->precision      = 0.2;
+
+  vectors->bezier_desc    = NULL;
+  vectors->bounds_valid   = FALSE;
+}
+
+static void
+gimp_vectors_finalize (GObject *object)
+{
+  GimpVectors *vectors = GIMP_VECTORS (object);
+
+  if (vectors->bezier_desc)
+    {
+      gimp_bezier_desc_free (vectors->bezier_desc);
+      vectors->bezier_desc = NULL;
+    }
+
+  if (vectors->strokes)
+    {
+      g_queue_free_full (vectors->strokes, (GDestroyNotify) g_object_unref);
+      vectors->strokes = NULL;
+    }
+
+  if (vectors->stroke_to_list)
+    {
+      g_hash_table_destroy (vectors->stroke_to_list);
+      vectors->stroke_to_list = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_vectors_get_memsize (GimpObject *object,
+                          gint64     *gui_size)
+{
+  GimpVectors *vectors;
+  GList       *list;
+  gint64       memsize = 0;
+
+  vectors = GIMP_VECTORS (object);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    memsize += (gimp_object_get_memsize (GIMP_OBJECT (list->data), gui_size) +
+                sizeof (GList));
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_vectors_is_attached (GimpItem *item)
+{
+  GimpImage *image = gimp_item_get_image (item);
+
+  return (GIMP_IS_IMAGE (image) &&
+          gimp_container_have (gimp_image_get_vectors (image),
+                               GIMP_OBJECT (item)));
+}
+
+static GimpItemTree *
+gimp_vectors_get_tree (GimpItem *item)
+{
+  if (gimp_item_is_attached (item))
+    {
+      GimpImage *image = gimp_item_get_image (item);
+
+      return gimp_image_get_vectors_tree (image);
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_vectors_bounds (GimpItem *item,
+                     gdouble  *x,
+                     gdouble  *y,
+                     gdouble  *width,
+                     gdouble  *height)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+
+  if (! vectors->bounds_valid)
+    {
+      GimpStroke *stroke;
+
+      vectors->bounds_empty = TRUE;
+      vectors->bounds_x1 = vectors->bounds_x2 = 0.0;
+      vectors->bounds_y1 = vectors->bounds_y2 = 0.0;
+
+      for (stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+           stroke;
+           stroke = gimp_vectors_stroke_get_next (vectors, stroke))
+        {
+          GArray   *stroke_coords;
+          gboolean  closed;
+
+          stroke_coords = gimp_stroke_interpolate (stroke, 1.0, &closed);
+
+          if (stroke_coords)
+            {
+              GimpCoords point;
+              gint       i;
+
+              if (vectors->bounds_empty && stroke_coords->len > 0)
+                {
+                  point = g_array_index (stroke_coords, GimpCoords, 0);
+
+                  vectors->bounds_x1 = vectors->bounds_x2 = point.x;
+                  vectors->bounds_y1 = vectors->bounds_y2 = point.y;
+
+                  vectors->bounds_empty = FALSE;
+                }
+
+              for (i = 0; i < stroke_coords->len; i++)
+                {
+                  point = g_array_index (stroke_coords, GimpCoords, i);
+
+                  vectors->bounds_x1 = MIN (vectors->bounds_x1, point.x);
+                  vectors->bounds_y1 = MIN (vectors->bounds_y1, point.y);
+                  vectors->bounds_x2 = MAX (vectors->bounds_x2, point.x);
+                  vectors->bounds_y2 = MAX (vectors->bounds_y2, point.y);
+                }
+
+              g_array_free (stroke_coords, TRUE);
+            }
+        }
+
+      vectors->bounds_valid = TRUE;
+    }
+
+  *x      = vectors->bounds_x1;
+  *y      = vectors->bounds_y1;
+  *width  = vectors->bounds_x2 - vectors->bounds_x1;
+  *height = vectors->bounds_y2 - vectors->bounds_y1;
+
+  return ! vectors->bounds_empty;
+}
+
+static GimpItem *
+gimp_vectors_duplicate (GimpItem *item,
+                        GType     new_type)
+{
+  GimpItem *new_item;
+
+  g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_VECTORS), NULL);
+
+  new_item = GIMP_ITEM_CLASS (parent_class)->duplicate (item, new_type);
+
+  if (GIMP_IS_VECTORS (new_item))
+    {
+      GimpVectors *vectors     = GIMP_VECTORS (item);
+      GimpVectors *new_vectors = GIMP_VECTORS (new_item);
+
+      gimp_vectors_copy_strokes (vectors, new_vectors);
+    }
+
+  return new_item;
+}
+
+static void
+gimp_vectors_convert (GimpItem  *item,
+                      GimpImage *dest_image,
+                      GType      old_type)
+{
+  gimp_item_set_size (item,
+                      gimp_image_get_width  (dest_image),
+                      gimp_image_get_height (dest_image));
+
+  GIMP_ITEM_CLASS (parent_class)->convert (item, dest_image, old_type);
+}
+
+static void
+gimp_vectors_translate (GimpItem *item,
+                        gdouble   offset_x,
+                        gdouble   offset_y,
+                        gboolean  push_undo)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GList       *list;
+
+  gimp_vectors_freeze (vectors);
+
+  if (push_undo)
+    gimp_image_undo_push_vectors_mod (gimp_item_get_image (item),
+                                      _("Move Path"),
+                                      vectors);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_stroke_translate (stroke, offset_x, offset_y);
+    }
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_scale (GimpItem              *item,
+                    gint                   new_width,
+                    gint                   new_height,
+                    gint                   new_offset_x,
+                    gint                   new_offset_y,
+                    GimpInterpolationType  interpolation_type,
+                    GimpProgress          *progress)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GimpImage   *image   = gimp_item_get_image (item);
+  GList       *list;
+
+  gimp_vectors_freeze (vectors);
+
+  if (gimp_item_is_attached (item))
+    gimp_image_undo_push_vectors_mod (image, NULL, vectors);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_stroke_scale (stroke,
+                         (gdouble) new_width  / (gdouble) gimp_item_get_width  (item),
+                         (gdouble) new_height / (gdouble) gimp_item_get_height (item));
+      gimp_stroke_translate (stroke, new_offset_x, new_offset_y);
+    }
+
+  GIMP_ITEM_CLASS (parent_class)->scale (item,
+                                         gimp_image_get_width  (image),
+                                         gimp_image_get_height (image),
+                                         0, 0,
+                                         interpolation_type, progress);
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_resize (GimpItem     *item,
+                     GimpContext  *context,
+                     GimpFillType  fill_type,
+                     gint          new_width,
+                     gint          new_height,
+                     gint          offset_x,
+                     gint          offset_y)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GimpImage   *image   = gimp_item_get_image (item);
+  GList       *list;
+
+  gimp_vectors_freeze (vectors);
+
+  if (gimp_item_is_attached (item))
+    gimp_image_undo_push_vectors_mod (image, NULL, vectors);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_stroke_translate (stroke, offset_x, offset_y);
+    }
+
+  GIMP_ITEM_CLASS (parent_class)->resize (item, context, fill_type,
+                                          gimp_image_get_width  (image),
+                                          gimp_image_get_height (image),
+                                          0, 0);
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_flip (GimpItem            *item,
+                   GimpContext         *context,
+                   GimpOrientationType  flip_type,
+                   gdouble              axis,
+                   gboolean             clip_result)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GList       *list;
+  GimpMatrix3  matrix;
+
+  gimp_matrix3_identity (&matrix);
+  gimp_transform_matrix_flip (&matrix, flip_type, axis);
+
+  gimp_vectors_freeze (vectors);
+
+  gimp_image_undo_push_vectors_mod (gimp_item_get_image (item),
+                                    _("Flip Path"),
+                                    vectors);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_stroke_transform (stroke, &matrix, NULL);
+    }
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_rotate (GimpItem         *item,
+                     GimpContext      *context,
+                     GimpRotationType  rotate_type,
+                     gdouble           center_x,
+                     gdouble           center_y,
+                     gboolean          clip_result)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GList       *list;
+  GimpMatrix3  matrix;
+
+  gimp_matrix3_identity (&matrix);
+  gimp_transform_matrix_rotate (&matrix, rotate_type, center_x, center_y);
+
+  gimp_vectors_freeze (vectors);
+
+  gimp_image_undo_push_vectors_mod (gimp_item_get_image (item),
+                                    _("Rotate Path"),
+                                    vectors);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_stroke_transform (stroke, &matrix, NULL);
+    }
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_transform (GimpItem               *item,
+                        GimpContext            *context,
+                        const GimpMatrix3      *matrix,
+                        GimpTransformDirection  direction,
+                        GimpInterpolationType   interpolation_type,
+                        GimpTransformResize     clip_result,
+                        GimpProgress           *progress)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GimpMatrix3  local_matrix;
+  GQueue       strokes;
+  GList       *list;
+
+  gimp_vectors_freeze (vectors);
+
+  gimp_image_undo_push_vectors_mod (gimp_item_get_image (item),
+                                    _("Transform Path"),
+                                    vectors);
+
+  local_matrix = *matrix;
+
+  if (direction == GIMP_TRANSFORM_BACKWARD)
+    gimp_matrix3_invert (&local_matrix);
+
+  g_queue_init (&strokes);
+
+  while (! g_queue_is_empty (vectors->strokes))
+    {
+      GimpStroke *stroke = g_queue_peek_head (vectors->strokes);
+
+      g_object_ref (stroke);
+
+      gimp_vectors_stroke_remove (vectors, stroke);
+
+      gimp_stroke_transform (stroke, &local_matrix, &strokes);
+
+      g_object_unref (stroke);
+    }
+
+  vectors->last_stroke_ID = 0;
+
+  for (list = strokes.head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_vectors_stroke_add (vectors, stroke);
+
+      g_object_unref (stroke);
+    }
+
+  g_queue_clear (&strokes);
+
+  gimp_vectors_thaw (vectors);
+}
+
+static GimpTransformResize
+gimp_vectors_get_clip (GimpItem            *item,
+                       GimpTransformResize  clip_result)
+{
+  return GIMP_TRANSFORM_RESIZE_ADJUST;
+}
+
+static gboolean
+gimp_vectors_fill (GimpItem         *item,
+                   GimpDrawable     *drawable,
+                   GimpFillOptions  *fill_options,
+                   gboolean          push_undo,
+                   GimpProgress     *progress,
+                   GError          **error)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+
+  if (g_queue_is_empty (vectors->strokes))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Not enough points to fill"));
+      return FALSE;
+    }
+
+  return gimp_drawable_fill_vectors (drawable, fill_options,
+                                     vectors, push_undo, error);
+}
+
+static gboolean
+gimp_vectors_stroke (GimpItem           *item,
+                     GimpDrawable       *drawable,
+                     GimpStrokeOptions  *stroke_options,
+                     gboolean            push_undo,
+                     GimpProgress       *progress,
+                     GError            **error)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  gboolean     retval  = FALSE;
+
+  if (g_queue_is_empty (vectors->strokes))
+    {
+      g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
+                           _("Not enough points to stroke"));
+      return FALSE;
+    }
+
+  switch (gimp_stroke_options_get_method (stroke_options))
+    {
+    case GIMP_STROKE_LINE:
+      retval = gimp_drawable_stroke_vectors (drawable, stroke_options,
+                                             vectors, push_undo, error);
+      break;
+
+    case GIMP_STROKE_PAINT_METHOD:
+      {
+        GimpPaintInfo    *paint_info;
+        GimpPaintCore    *core;
+        GimpPaintOptions *paint_options;
+        gboolean          emulate_dynamics;
+
+        paint_info = gimp_context_get_paint_info (GIMP_CONTEXT (stroke_options));
+
+        core = g_object_new (paint_info->paint_type, NULL);
+
+        paint_options = gimp_stroke_options_get_paint_options (stroke_options);
+        emulate_dynamics = gimp_stroke_options_get_emulate_dynamics (stroke_options);
+
+        retval = gimp_paint_core_stroke_vectors (core, drawable,
+                                                 paint_options,
+                                                 emulate_dynamics,
+                                                 vectors, push_undo, error);
+
+        g_object_unref (core);
+      }
+      break;
+
+    default:
+      g_return_val_if_reached (FALSE);
+    }
+
+  return retval;
+}
+
+static void
+gimp_vectors_to_selection (GimpItem       *item,
+                           GimpChannelOps  op,
+                           gboolean        antialias,
+                           gboolean        feather,
+                           gdouble         feather_radius_x,
+                           gdouble         feather_radius_y)
+{
+  GimpVectors *vectors = GIMP_VECTORS (item);
+  GimpImage   *image   = gimp_item_get_image (item);
+
+  gimp_channel_select_vectors (gimp_image_get_mask (image),
+                               GIMP_ITEM_GET_CLASS (item)->to_selection_desc,
+                               vectors,
+                               op, antialias,
+                               feather, feather_radius_x, feather_radius_x,
+                               TRUE);
+}
+
+static void
+gimp_vectors_real_freeze (GimpVectors *vectors)
+{
+  /*  release cached bezier representation  */
+  if (vectors->bezier_desc)
+    {
+      gimp_bezier_desc_free (vectors->bezier_desc);
+      vectors->bezier_desc = NULL;
+    }
+
+  /*  invalidate bounds  */
+  vectors->bounds_valid = FALSE;
+}
+
+static void
+gimp_vectors_real_thaw (GimpVectors *vectors)
+{
+  gimp_viewable_invalidate_preview (GIMP_VIEWABLE (vectors));
+}
+
+
+/*  public functions  */
+
+GimpVectors *
+gimp_vectors_new (GimpImage   *image,
+                  const gchar *name)
+{
+  GimpVectors *vectors;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  vectors = GIMP_VECTORS (gimp_item_new (GIMP_TYPE_VECTORS,
+                                         image, name,
+                                         0, 0,
+                                         gimp_image_get_width  (image),
+                                         gimp_image_get_height (image)));
+
+  return vectors;
+}
+
+GimpVectors *
+gimp_vectors_get_parent (GimpVectors *vectors)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+
+  return GIMP_VECTORS (gimp_viewable_get_parent (GIMP_VIEWABLE (vectors)));
+}
+
+void
+gimp_vectors_freeze (GimpVectors *vectors)
+{
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+
+  vectors->freeze_count++;
+
+  if (vectors->freeze_count == 1)
+    g_signal_emit (vectors, gimp_vectors_signals[FREEZE], 0);
+}
+
+void
+gimp_vectors_thaw (GimpVectors *vectors)
+{
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+  g_return_if_fail (vectors->freeze_count > 0);
+
+  vectors->freeze_count--;
+
+  if (vectors->freeze_count == 0)
+    g_signal_emit (vectors, gimp_vectors_signals[THAW], 0);
+}
+
+void
+gimp_vectors_copy_strokes (GimpVectors *src_vectors,
+                           GimpVectors *dest_vectors)
+{
+  g_return_if_fail (GIMP_IS_VECTORS (src_vectors));
+  g_return_if_fail (GIMP_IS_VECTORS (dest_vectors));
+
+  gimp_vectors_freeze (dest_vectors);
+
+  g_queue_free_full (dest_vectors->strokes, (GDestroyNotify) g_object_unref);
+  dest_vectors->strokes = g_queue_new ();
+  g_hash_table_remove_all (dest_vectors->stroke_to_list);
+
+  dest_vectors->last_stroke_ID = 0;
+
+  gimp_vectors_add_strokes (src_vectors, dest_vectors);
+
+  gimp_vectors_thaw (dest_vectors);
+}
+
+
+void
+gimp_vectors_add_strokes (GimpVectors *src_vectors,
+                          GimpVectors *dest_vectors)
+{
+  GList *stroke;
+
+  g_return_if_fail (GIMP_IS_VECTORS (src_vectors));
+  g_return_if_fail (GIMP_IS_VECTORS (dest_vectors));
+
+  gimp_vectors_freeze (dest_vectors);
+
+  for (stroke = src_vectors->strokes->head;
+       stroke != NULL;
+       stroke = g_list_next (stroke))
+    {
+      GimpStroke *newstroke = gimp_stroke_duplicate (stroke->data);
+
+      g_queue_push_tail (dest_vectors->strokes, newstroke);
+
+      /* Also add to {stroke: GList node} map */
+      g_hash_table_insert (dest_vectors->stroke_to_list,
+                           newstroke,
+                           g_queue_peek_tail_link (dest_vectors->strokes));
+
+      dest_vectors->last_stroke_ID++;
+      gimp_stroke_set_ID (newstroke,
+                          dest_vectors->last_stroke_ID);
+    }
+
+  gimp_vectors_thaw (dest_vectors);
+}
+
+
+void
+gimp_vectors_stroke_add (GimpVectors *vectors,
+                         GimpStroke  *stroke)
+{
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  gimp_vectors_freeze (vectors);
+
+  GIMP_VECTORS_GET_CLASS (vectors)->stroke_add (vectors, stroke);
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_real_stroke_add (GimpVectors *vectors,
+                              GimpStroke  *stroke)
+{
+  /*
+   * Don't prepend into vector->strokes.  See ChangeLog 2003-05-21
+   * --Mitch
+   */
+  g_queue_push_tail (vectors->strokes, g_object_ref (stroke));
+
+  /* Also add to {stroke: GList node} map */
+  g_hash_table_insert (vectors->stroke_to_list,
+                       stroke,
+                       g_queue_peek_tail_link (vectors->strokes));
+
+  vectors->last_stroke_ID++;
+  gimp_stroke_set_ID (stroke, vectors->last_stroke_ID);
+}
+
+void
+gimp_vectors_stroke_remove (GimpVectors *vectors,
+                            GimpStroke  *stroke)
+{
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+  g_return_if_fail (GIMP_IS_STROKE (stroke));
+
+  gimp_vectors_freeze (vectors);
+
+  GIMP_VECTORS_GET_CLASS (vectors)->stroke_remove (vectors, stroke);
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_real_stroke_remove (GimpVectors *vectors,
+                                 GimpStroke  *stroke)
+{
+  GList *list = g_hash_table_lookup (vectors->stroke_to_list, stroke);
+
+  if (list)
+    {
+      g_queue_delete_link (vectors->strokes, list);
+      g_hash_table_remove (vectors->stroke_to_list, stroke);
+      g_object_unref (stroke);
+    }
+}
+
+gint
+gimp_vectors_get_n_strokes (GimpVectors *vectors)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), 0);
+
+  return g_queue_get_length (vectors->strokes);
+}
+
+
+GimpStroke *
+gimp_vectors_stroke_get (GimpVectors      *vectors,
+                         const GimpCoords *coord)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->stroke_get (vectors, coord);
+}
+
+static GimpStroke *
+gimp_vectors_real_stroke_get (GimpVectors      *vectors,
+                              const GimpCoords *coord)
+{
+  GimpStroke *minstroke = NULL;
+  gdouble     mindist   = G_MAXDOUBLE;
+  GList      *list;
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+      GimpAnchor *anchor = gimp_stroke_anchor_get (stroke, coord);
+
+      if (anchor)
+        {
+          gdouble dx = coord->x - anchor->position.x;
+          gdouble dy = coord->y - anchor->position.y;
+
+          if (mindist > dx * dx + dy * dy)
+            {
+              mindist   = dx * dx + dy * dy;
+              minstroke = stroke;
+            }
+        }
+    }
+
+  return minstroke;
+}
+
+GimpStroke *
+gimp_vectors_stroke_get_by_ID (GimpVectors *vectors,
+                               gint         id)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      if (gimp_stroke_get_ID (list->data) == id)
+        return list->data;
+    }
+
+  return NULL;
+}
+
+
+GimpStroke *
+gimp_vectors_stroke_get_next (GimpVectors *vectors,
+                              GimpStroke  *prev)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->stroke_get_next (vectors, prev);
+}
+
+static GimpStroke *
+gimp_vectors_real_stroke_get_next (GimpVectors *vectors,
+                                   GimpStroke  *prev)
+{
+  if (! prev)
+    {
+      return g_queue_peek_head (vectors->strokes);
+    }
+  else
+    {
+      GList *stroke = g_hash_table_lookup (vectors->stroke_to_list, prev);
+
+      g_return_val_if_fail (stroke != NULL, NULL);
+
+      return stroke->next ? stroke->next->data : NULL;
+    }
+}
+
+
+gdouble
+gimp_vectors_stroke_get_length (GimpVectors *vectors,
+                                GimpStroke  *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), 0.0);
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), 0.0);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->stroke_get_length (vectors, stroke);
+}
+
+static gdouble
+gimp_vectors_real_stroke_get_length (GimpVectors *vectors,
+                                     GimpStroke  *stroke)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), 0.0);
+  g_return_val_if_fail (GIMP_IS_STROKE (stroke), 0.0);
+
+  return gimp_stroke_get_length (stroke, vectors->precision);
+}
+
+
+GimpAnchor *
+gimp_vectors_anchor_get (GimpVectors       *vectors,
+                         const GimpCoords  *coord,
+                         GimpStroke       **ret_stroke)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->anchor_get (vectors, coord,
+                                                       ret_stroke);
+}
+
+static GimpAnchor *
+gimp_vectors_real_anchor_get (GimpVectors       *vectors,
+                              const GimpCoords  *coord,
+                              GimpStroke       **ret_stroke)
+{
+  GimpAnchor *minanchor = NULL;
+  gdouble     mindist   = -1;
+  GList      *list;
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+      GimpAnchor *anchor = gimp_stroke_anchor_get (stroke, coord);
+
+      if (anchor)
+        {
+          gdouble dx = coord->x - anchor->position.x;
+          gdouble dy = coord->y - anchor->position.y;
+
+          if (mindist > dx * dx + dy * dy || mindist < 0)
+            {
+              mindist   = dx * dx + dy * dy;
+              minanchor = anchor;
+
+              if (ret_stroke)
+                *ret_stroke = stroke;
+            }
+        }
+    }
+
+  return minanchor;
+}
+
+
+void
+gimp_vectors_anchor_delete (GimpVectors *vectors,
+                            GimpAnchor  *anchor)
+{
+  g_return_if_fail (GIMP_IS_VECTORS (vectors));
+  g_return_if_fail (anchor != NULL);
+
+  GIMP_VECTORS_GET_CLASS (vectors)->anchor_delete (vectors, anchor);
+}
+
+static void
+gimp_vectors_real_anchor_delete (GimpVectors *vectors,
+                                 GimpAnchor  *anchor)
+{
+}
+
+
+void
+gimp_vectors_anchor_select (GimpVectors *vectors,
+                            GimpStroke  *target_stroke,
+                            GimpAnchor  *anchor,
+                            gboolean     selected,
+                            gboolean     exclusive)
+{
+  GList *list;
+
+  for (list = vectors->strokes->head; list; list = g_list_next (list))
+    {
+      GimpStroke *stroke = list->data;
+
+      gimp_stroke_anchor_select (stroke,
+                                 stroke == target_stroke ? anchor : NULL,
+                                 selected, exclusive);
+    }
+}
+
+
+gdouble
+gimp_vectors_get_length (GimpVectors      *vectors,
+                         const GimpAnchor *start)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), 0.0);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->get_length (vectors, start);
+}
+
+static gdouble
+gimp_vectors_real_get_length (GimpVectors      *vectors,
+                              const GimpAnchor *start)
+{
+  g_printerr ("gimp_vectors_get_length: default implementation\n");
+
+  return 0;
+}
+
+
+gdouble
+gimp_vectors_get_distance (GimpVectors      *vectors,
+                           const GimpCoords *coord)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), 0.0);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->get_distance (vectors, coord);
+}
+
+static gdouble
+gimp_vectors_real_get_distance (GimpVectors      *vectors,
+                                const GimpCoords *coord)
+{
+  g_printerr ("gimp_vectors_get_distance: default implementation\n");
+
+  return 0;
+}
+
+gint
+gimp_vectors_interpolate (GimpVectors *vectors,
+                          GimpStroke  *stroke,
+                          gdouble      precision,
+                          gint         max_points,
+                          GimpCoords  *ret_coords)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), 0);
+
+  return GIMP_VECTORS_GET_CLASS (vectors)->interpolate (vectors, stroke,
+                                                        precision, max_points,
+                                                        ret_coords);
+}
+
+static gint
+gimp_vectors_real_interpolate (GimpVectors *vectors,
+                               GimpStroke  *stroke,
+                               gdouble      precision,
+                               gint         max_points,
+                               GimpCoords  *ret_coords)
+{
+  g_printerr ("gimp_vectors_interpolate: default implementation\n");
+
+  return 0;
+}
+
+const GimpBezierDesc *
+gimp_vectors_get_bezier (GimpVectors *vectors)
+{
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+
+  if (! vectors->bezier_desc)
+    {
+      vectors->bezier_desc = gimp_vectors_make_bezier (vectors);
+    }
+
+  return  vectors->bezier_desc;
+}
+
+static GimpBezierDesc *
+gimp_vectors_make_bezier (GimpVectors *vectors)
+{
+  return GIMP_VECTORS_GET_CLASS (vectors)->make_bezier (vectors);
+}
+
+static GimpBezierDesc *
+gimp_vectors_real_make_bezier (GimpVectors *vectors)
+{
+  GimpStroke     *stroke;
+  GArray         *cmd_array;
+  GimpBezierDesc *ret_bezdesc = NULL;
+
+  cmd_array = g_array_new (FALSE, FALSE, sizeof (cairo_path_data_t));
+
+  for (stroke = gimp_vectors_stroke_get_next (vectors, NULL);
+       stroke;
+       stroke = gimp_vectors_stroke_get_next (vectors, stroke))
+    {
+      GimpBezierDesc *bezdesc = gimp_stroke_make_bezier (stroke);
+
+      if (bezdesc)
+        {
+          cmd_array = g_array_append_vals (cmd_array, bezdesc->data,
+                                           bezdesc->num_data);
+          gimp_bezier_desc_free (bezdesc);
+        }
+    }
+
+  if (cmd_array->len > 0)
+    ret_bezdesc = gimp_bezier_desc_new ((cairo_path_data_t *) cmd_array->data,
+                                        cmd_array->len);
+
+  g_array_free (cmd_array, FALSE);
+
+  return ret_bezdesc;
+}
diff --git a/app/vectors/gimpvectors.h b/app/vectors/gimpvectors.h
new file mode 100644
index 0000000..a0d8a64
--- /dev/null
+++ b/app/vectors/gimpvectors.h
@@ -0,0 +1,184 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectors.h
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_H__
+#define __GIMP_VECTORS_H__
+
+#include "core/gimpitem.h"
+
+#define GIMP_TYPE_VECTORS            (gimp_vectors_get_type ())
+#define GIMP_VECTORS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTORS, GimpVectors))
+#define GIMP_VECTORS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTORS, GimpVectorsClass))
+#define GIMP_IS_VECTORS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTORS))
+#define GIMP_IS_VECTORS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTORS))
+#define GIMP_VECTORS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS, GimpVectorsClass))
+
+
+typedef struct _GimpVectorsClass  GimpVectorsClass;
+
+struct _GimpVectors
+{
+  GimpItem        parent_instance;
+
+  GQueue         *strokes;        /* Queue of GimpStrokes         */
+  GHashTable     *stroke_to_list; /* Map from GimpStroke to strokes listnode */
+  gint            last_stroke_ID;
+
+  gint            freeze_count;
+  gdouble         precision;
+
+  GimpBezierDesc *bezier_desc;    /* Cached bezier representation */
+
+  gboolean        bounds_valid;   /* Cached bounding box          */
+  gboolean        bounds_empty;
+  gdouble         bounds_x1;
+  gdouble         bounds_y1;
+  gdouble         bounds_x2;
+  gdouble         bounds_y2;
+};
+
+struct _GimpVectorsClass
+{
+  GimpItemClass  parent_class;
+
+  /*  signals  */
+  void          (* freeze)            (GimpVectors       *vectors);
+  void          (* thaw)              (GimpVectors       *vectors);
+
+  /*  virtual functions  */
+  void          (* stroke_add)        (GimpVectors       *vectors,
+                                       GimpStroke        *stroke);
+  void          (* stroke_remove)     (GimpVectors       *vectors,
+                                       GimpStroke        *stroke);
+  GimpStroke  * (* stroke_get)        (GimpVectors       *vectors,
+                                       const GimpCoords  *coord);
+  GimpStroke  * (* stroke_get_next)   (GimpVectors       *vectors,
+                                       GimpStroke        *prev);
+  gdouble       (* stroke_get_length) (GimpVectors       *vectors,
+                                       GimpStroke        *stroke);
+  GimpAnchor  * (* anchor_get)        (GimpVectors       *vectors,
+                                       const GimpCoords  *coord,
+                                       GimpStroke       **ret_stroke);
+  void          (* anchor_delete)     (GimpVectors       *vectors,
+                                       GimpAnchor        *anchor);
+  gdouble       (* get_length)        (GimpVectors       *vectors,
+                                       const GimpAnchor  *start);
+  gdouble       (* get_distance)      (GimpVectors       *vectors,
+                                       const GimpCoords  *coord);
+  gint          (* interpolate)       (GimpVectors       *vectors,
+                                       GimpStroke        *stroke,
+                                       gdouble            precision,
+                                       gint               max_points,
+                                       GimpCoords        *ret_coords);
+  GimpBezierDesc * (* make_bezier)    (GimpVectors       *vectors);
+};
+
+
+/*  vectors utility functions  */
+
+GType           gimp_vectors_get_type           (void) G_GNUC_CONST;
+
+GimpVectors   * gimp_vectors_new                (GimpImage         *image,
+                                                 const gchar       *name);
+
+GimpVectors   * gimp_vectors_get_parent         (GimpVectors       *vectors);
+
+void            gimp_vectors_freeze             (GimpVectors       *vectors);
+void            gimp_vectors_thaw               (GimpVectors       *vectors);
+
+void            gimp_vectors_copy_strokes       (GimpVectors       *src_vectors,
+                                                 GimpVectors       *dest_vectors);
+void            gimp_vectors_add_strokes        (GimpVectors       *src_vectors,
+                                                 GimpVectors       *dest_vectors);
+
+
+/* accessing / modifying the anchors */
+
+GimpAnchor    * gimp_vectors_anchor_get         (GimpVectors       *vectors,
+                                                 const GimpCoords  *coord,
+                                                 GimpStroke       **ret_stroke);
+
+/* prev == NULL: "first" anchor */
+GimpAnchor    * gimp_vectors_anchor_get_next    (GimpVectors        *vectors,
+                                                 const GimpAnchor   *prev);
+
+/* type will be an xorable enum:
+ * VECTORS_NONE, VECTORS_FIX_ANGLE, VECTORS_FIX_RATIO, VECTORS_RESTRICT_ANGLE
+ *  or so.
+ */
+void          gimp_vectors_anchor_move_relative (GimpVectors        *vectors,
+                                                 GimpAnchor         *anchor,
+                                                 const GimpCoords   *deltacoord,
+                                                 gint                type);
+void          gimp_vectors_anchor_move_absolute (GimpVectors        *vectors,
+                                                 GimpAnchor         *anchor,
+                                                 const GimpCoords   *coord,
+                                                 gint                type);
+
+void          gimp_vectors_anchor_delete        (GimpVectors        *vectors,
+                                                 GimpAnchor         *anchor);
+
+void          gimp_vectors_anchor_select        (GimpVectors        *vectors,
+                                                 GimpStroke         *target_stroke,
+                                                 GimpAnchor         *anchor,
+                                                 gboolean            selected,
+                                                 gboolean            exclusive);
+
+
+/* GimpStroke is a connected component of a GimpVectors object */
+
+void            gimp_vectors_stroke_add         (GimpVectors        *vectors,
+                                                 GimpStroke         *stroke);
+void            gimp_vectors_stroke_remove      (GimpVectors        *vectors,
+                                                 GimpStroke         *stroke);
+gint            gimp_vectors_get_n_strokes      (GimpVectors        *vectors);
+GimpStroke    * gimp_vectors_stroke_get         (GimpVectors        *vectors,
+                                                 const GimpCoords   *coord);
+GimpStroke    * gimp_vectors_stroke_get_by_ID   (GimpVectors        *vectors,
+                                                 gint                id);
+
+/* prev == NULL: "first" stroke */
+GimpStroke    * gimp_vectors_stroke_get_next    (GimpVectors        *vectors,
+                                                 GimpStroke         *prev);
+gdouble         gimp_vectors_stroke_get_length  (GimpVectors        *vectors,
+                                                 GimpStroke         *stroke);
+
+/* accessing the shape of the curve */
+
+gdouble         gimp_vectors_get_length         (GimpVectors        *vectors,
+                                                 const GimpAnchor   *start);
+gdouble         gimp_vectors_get_distance       (GimpVectors        *vectors,
+                                                 const GimpCoords   *coord);
+
+/* returns the number of valid coordinates */
+
+gint            gimp_vectors_interpolate        (GimpVectors        *vectors,
+                                                 GimpStroke         *stroke,
+                                                 gdouble             precision,
+                                                 gint                max_points,
+                                                 GimpCoords         *ret_coords);
+
+/* usually overloaded */
+
+/* returns a bezier representation */
+const GimpBezierDesc * gimp_vectors_get_bezier  (GimpVectors        *vectors);
+
+
+#endif /* __GIMP_VECTORS_H__ */
diff --git a/app/vectors/gimpvectorsmodundo.c b/app/vectors/gimpvectorsmodundo.c
new file mode 100644
index 0000000..b681ba9
--- /dev/null
+++ b/app/vectors/gimpvectorsmodundo.c
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "vectors-types.h"
+
+#include "gimpvectors.h"
+#include "gimpvectorsmodundo.h"
+
+
+static void     gimp_vectors_mod_undo_constructed (GObject             *object);
+
+static gint64   gimp_vectors_mod_undo_get_memsize (GimpObject          *object,
+                                                   gint64              *gui_size);
+
+static void     gimp_vectors_mod_undo_pop         (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode,
+                                                   GimpUndoAccumulator *accum);
+static void     gimp_vectors_mod_undo_free        (GimpUndo            *undo,
+                                                   GimpUndoMode         undo_mode);
+
+
+G_DEFINE_TYPE (GimpVectorsModUndo, gimp_vectors_mod_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_vectors_mod_undo_parent_class
+
+
+static void
+gimp_vectors_mod_undo_class_init (GimpVectorsModUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_vectors_mod_undo_constructed;
+
+  gimp_object_class->get_memsize = gimp_vectors_mod_undo_get_memsize;
+
+  undo_class->pop                = gimp_vectors_mod_undo_pop;
+  undo_class->free               = gimp_vectors_mod_undo_free;
+}
+
+static void
+gimp_vectors_mod_undo_init (GimpVectorsModUndo *undo)
+{
+}
+
+static void
+gimp_vectors_mod_undo_constructed (GObject *object)
+{
+  GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (object);
+  GimpVectors        *vectors;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_VECTORS (GIMP_ITEM_UNDO (object)->item));
+
+  vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (object)->item);
+
+  vectors_mod_undo->vectors =
+    GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
+                                       G_TYPE_FROM_INSTANCE (vectors)));
+}
+
+static gint64
+gimp_vectors_mod_undo_get_memsize (GimpObject *object,
+                                   gint64     *gui_size)
+{
+  GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (object);
+  gint64              memsize          = 0;
+
+  memsize += gimp_object_get_memsize (GIMP_OBJECT (vectors_mod_undo->vectors),
+                                      gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_vectors_mod_undo_pop (GimpUndo            *undo,
+                           GimpUndoMode         undo_mode,
+                           GimpUndoAccumulator *accum)
+{
+  GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (undo);
+  GimpVectors        *vectors          = GIMP_VECTORS (GIMP_ITEM_UNDO (undo)->item);
+  GimpVectors        *temp;
+  gint                offset_x;
+  gint                offset_y;
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  temp = vectors_mod_undo->vectors;
+
+  vectors_mod_undo->vectors =
+    GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
+                                       G_TYPE_FROM_INSTANCE (vectors)));
+
+  gimp_vectors_freeze (vectors);
+
+  gimp_vectors_copy_strokes (temp, vectors);
+
+  gimp_item_get_offset (GIMP_ITEM (temp), &offset_x, &offset_y);
+  gimp_item_set_offset (GIMP_ITEM (vectors), offset_x, offset_y);
+
+  gimp_item_set_size (GIMP_ITEM (vectors),
+                      gimp_item_get_width  (GIMP_ITEM (temp)),
+                      gimp_item_get_height (GIMP_ITEM (temp)));
+
+  g_object_unref (temp);
+
+  gimp_vectors_thaw (vectors);
+}
+
+static void
+gimp_vectors_mod_undo_free (GimpUndo     *undo,
+                            GimpUndoMode  undo_mode)
+{
+  GimpVectorsModUndo *vectors_mod_undo = GIMP_VECTORS_MOD_UNDO (undo);
+
+  g_clear_object (&vectors_mod_undo->vectors);
+
+  GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
+}
diff --git a/app/vectors/gimpvectorsmodundo.h b/app/vectors/gimpvectorsmodundo.h
new file mode 100644
index 0000000..e63a0ef
--- /dev/null
+++ b/app/vectors/gimpvectorsmodundo.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_MOD_UNDO_H__
+#define __GIMP_VECTORS_MOD_UNDO_H__
+
+
+#include "core/gimpitemundo.h"
+
+
+#define GIMP_TYPE_VECTORS_MOD_UNDO            (gimp_vectors_mod_undo_get_type ())
+#define GIMP_VECTORS_MOD_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTORS_MOD_UNDO, GimpVectorsModUndo))
+#define GIMP_VECTORS_MOD_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTORS_MOD_UNDO, GimpVectorsModUndoClass))
+#define GIMP_IS_VECTORS_MOD_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTORS_MOD_UNDO))
+#define GIMP_IS_VECTORS_MOD_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTORS_MOD_UNDO))
+#define GIMP_VECTORS_MOD_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_MOD_UNDO, GimpVectorsModUndoClass))
+
+
+typedef struct _GimpVectorsModUndo      GimpVectorsModUndo;
+typedef struct _GimpVectorsModUndoClass GimpVectorsModUndoClass;
+
+struct _GimpVectorsModUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpVectors  *vectors;
+};
+
+struct _GimpVectorsModUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_vectors_mod_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VECTORS_MOD_UNDO_H__ */
diff --git a/app/vectors/gimpvectorspropundo.c b/app/vectors/gimpvectorspropundo.c
new file mode 100644
index 0000000..1a093df
--- /dev/null
+++ b/app/vectors/gimpvectorspropundo.c
@@ -0,0 +1,94 @@
+/* Gimp - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "vectors-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpvectors.h"
+#include "gimpvectorspropundo.h"
+
+
+static void   gimp_vectors_prop_undo_constructed (GObject             *object);
+
+static void   gimp_vectors_prop_undo_pop         (GimpUndo            *undo,
+                                                  GimpUndoMode         undo_mode,
+                                                  GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpVectorsPropUndo, gimp_vectors_prop_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_vectors_prop_undo_parent_class
+
+
+static void
+gimp_vectors_prop_undo_class_init (GimpVectorsPropUndoClass *klass)
+{
+  GObjectClass  *object_class = G_OBJECT_CLASS (klass);
+  GimpUndoClass *undo_class   = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed = gimp_vectors_prop_undo_constructed;
+
+  undo_class->pop           = gimp_vectors_prop_undo_pop;
+}
+
+static void
+gimp_vectors_prop_undo_init (GimpVectorsPropUndo *undo)
+{
+}
+
+static void
+gimp_vectors_prop_undo_constructed (GObject *object)
+{
+  /* GimpVectors *vectors; */
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_VECTORS (GIMP_ITEM_UNDO (object)->item));
+
+  /* vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (object)->item); */
+
+  switch (GIMP_UNDO (object)->undo_type)
+    {
+    default:
+      gimp_assert_not_reached ();
+    }
+}
+
+static void
+gimp_vectors_prop_undo_pop (GimpUndo            *undo,
+                            GimpUndoMode         undo_mode,
+                            GimpUndoAccumulator *accum)
+{
+#if 0
+  GimpVectorsPropUndo *vectors_prop_undo = GIMP_VECTORS_PROP_UNDO (undo);
+  GimpVectors         *vectors           = GIMP_VECTORS (GIMP_ITEM_UNDO (undo)->item);
+#endif
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  switch (undo->undo_type)
+    {
+    default:
+      gimp_assert_not_reached ();
+    }
+}
diff --git a/app/vectors/gimpvectorspropundo.h b/app/vectors/gimpvectorspropundo.h
new file mode 100644
index 0000000..8909226
--- /dev/null
+++ b/app/vectors/gimpvectorspropundo.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_PROP_UNDO_H__
+#define __GIMP_VECTORS_PROP_UNDO_H__
+
+
+#include "core/gimpitemundo.h"
+
+
+#define GIMP_TYPE_VECTORS_PROP_UNDO            (gimp_vectors_prop_undo_get_type ())
+#define GIMP_VECTORS_PROP_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTORS_PROP_UNDO, GimpVectorsPropUndo))
+#define GIMP_VECTORS_PROP_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTORS_PROP_UNDO, GimpVectorsPropUndoClass))
+#define GIMP_IS_VECTORS_PROP_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTORS_PROP_UNDO))
+#define GIMP_IS_VECTORS_PROP_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTORS_PROP_UNDO))
+#define GIMP_VECTORS_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_PROP_UNDO, GimpVectorsPropUndoClass))
+
+
+typedef struct _GimpVectorsPropUndo      GimpVectorsPropUndo;
+typedef struct _GimpVectorsPropUndoClass GimpVectorsPropUndoClass;
+
+struct _GimpVectorsPropUndo
+{
+  GimpItemUndo  parent_instance;
+};
+
+struct _GimpVectorsPropUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_vectors_prop_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VECTORS_PROP_UNDO_H__ */
diff --git a/app/vectors/gimpvectorsundo.c b/app/vectors/gimpvectorsundo.c
new file mode 100644
index 0000000..646869f
--- /dev/null
+++ b/app/vectors/gimpvectorsundo.c
@@ -0,0 +1,213 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
+
+#include "vectors-types.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpvectors.h"
+#include "gimpvectorsundo.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PREV_PARENT,
+  PROP_PREV_POSITION,
+  PROP_PREV_VECTORS
+};
+
+
+static void     gimp_vectors_undo_constructed  (GObject             *object);
+static void     gimp_vectors_undo_set_property (GObject             *object,
+                                                guint                property_id,
+                                                const GValue        *value,
+                                                GParamSpec          *pspec);
+static void     gimp_vectors_undo_get_property (GObject             *object,
+                                                guint                property_id,
+                                                GValue              *value,
+                                                GParamSpec          *pspec);
+
+static gint64   gimp_vectors_undo_get_memsize  (GimpObject          *object,
+                                                gint64              *gui_size);
+
+static void     gimp_vectors_undo_pop          (GimpUndo            *undo,
+                                                GimpUndoMode         undo_mode,
+                                                GimpUndoAccumulator *accum);
+
+
+G_DEFINE_TYPE (GimpVectorsUndo, gimp_vectors_undo, GIMP_TYPE_ITEM_UNDO)
+
+#define parent_class gimp_vectors_undo_parent_class
+
+
+static void
+gimp_vectors_undo_class_init (GimpVectorsUndoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GimpUndoClass   *undo_class        = GIMP_UNDO_CLASS (klass);
+
+  object_class->constructed      = gimp_vectors_undo_constructed;
+  object_class->set_property     = gimp_vectors_undo_set_property;
+  object_class->get_property     = gimp_vectors_undo_get_property;
+
+  gimp_object_class->get_memsize = gimp_vectors_undo_get_memsize;
+
+  undo_class->pop                = gimp_vectors_undo_pop;
+
+  g_object_class_install_property (object_class, PROP_PREV_PARENT,
+                                   g_param_spec_object ("prev-parent",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_VECTORS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PREV_POSITION,
+                                   g_param_spec_int ("prev-position", NULL, NULL,
+                                                     0, G_MAXINT, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PREV_VECTORS,
+                                   g_param_spec_object ("prev-vectors", NULL, NULL,
+                                                        GIMP_TYPE_VECTORS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_vectors_undo_init (GimpVectorsUndo *undo)
+{
+}
+
+static void
+gimp_vectors_undo_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_VECTORS (GIMP_ITEM_UNDO (object)->item));
+}
+
+static void
+gimp_vectors_undo_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpVectorsUndo *vectors_undo = GIMP_VECTORS_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREV_PARENT:
+      vectors_undo->prev_parent = g_value_get_object (value);
+      break;
+    case PROP_PREV_POSITION:
+      vectors_undo->prev_position = g_value_get_int (value);
+      break;
+    case PROP_PREV_VECTORS:
+      vectors_undo->prev_vectors = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_vectors_undo_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpVectorsUndo *vectors_undo = GIMP_VECTORS_UNDO (object);
+
+  switch (property_id)
+    {
+    case PROP_PREV_PARENT:
+      g_value_set_object (value, vectors_undo->prev_parent);
+      break;
+    case PROP_PREV_POSITION:
+      g_value_set_int (value, vectors_undo->prev_position);
+      break;
+    case PROP_PREV_VECTORS:
+      g_value_set_object (value, vectors_undo->prev_vectors);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gint64
+gimp_vectors_undo_get_memsize (GimpObject *object,
+                               gint64     *gui_size)
+{
+  GimpItemUndo *item_undo = GIMP_ITEM_UNDO (object);
+  gint64        memsize   = 0;
+
+  if (! gimp_item_is_attached (item_undo->item))
+    memsize += gimp_object_get_memsize (GIMP_OBJECT (item_undo->item),
+                                        gui_size);
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static void
+gimp_vectors_undo_pop (GimpUndo            *undo,
+                       GimpUndoMode         undo_mode,
+                       GimpUndoAccumulator *accum)
+{
+  GimpVectorsUndo *vectors_undo = GIMP_VECTORS_UNDO (undo);
+  GimpVectors     *vectors      = GIMP_VECTORS (GIMP_ITEM_UNDO (undo)->item);
+
+  GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
+
+  if ((undo_mode       == GIMP_UNDO_MODE_UNDO &&
+       undo->undo_type == GIMP_UNDO_VECTORS_ADD) ||
+      (undo_mode       == GIMP_UNDO_MODE_REDO &&
+       undo->undo_type == GIMP_UNDO_VECTORS_REMOVE))
+    {
+      /*  remove vectors  */
+
+      /*  record the current parent and position  */
+      vectors_undo->prev_parent   = gimp_vectors_get_parent (vectors);
+      vectors_undo->prev_position = gimp_item_get_index (GIMP_ITEM (vectors));
+
+      gimp_image_remove_vectors (undo->image, vectors, FALSE,
+                                 vectors_undo->prev_vectors);
+    }
+  else
+    {
+      /*  restore vectors  */
+
+      /*  record the active vectors  */
+      vectors_undo->prev_vectors = gimp_image_get_active_vectors (undo->image);
+
+      gimp_image_add_vectors (undo->image, vectors,
+                              vectors_undo->prev_parent,
+                              vectors_undo->prev_position, FALSE);
+    }
+}
diff --git a/app/vectors/gimpvectorsundo.h b/app/vectors/gimpvectorsundo.h
new file mode 100644
index 0000000..9b54346
--- /dev/null
+++ b/app/vectors/gimpvectorsundo.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_UNDO_H__
+#define __GIMP_VECTORS_UNDO_H__
+
+
+#include "core/gimpitemundo.h"
+
+
+#define GIMP_TYPE_VECTORS_UNDO            (gimp_vectors_undo_get_type ())
+#define GIMP_VECTORS_UNDO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTORS_UNDO, GimpVectorsUndo))
+#define GIMP_VECTORS_UNDO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTORS_UNDO, GimpVectorsUndoClass))
+#define GIMP_IS_VECTORS_UNDO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTORS_UNDO))
+#define GIMP_IS_VECTORS_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTORS_UNDO))
+#define GIMP_VECTORS_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_UNDO, GimpVectorsUndoClass))
+
+
+typedef struct _GimpVectorsUndo      GimpVectorsUndo;
+typedef struct _GimpVectorsUndoClass GimpVectorsUndoClass;
+
+struct _GimpVectorsUndo
+{
+  GimpItemUndo  parent_instance;
+
+  GimpVectors  *prev_parent;
+  gint          prev_position;   /*  former position in list  */
+  GimpVectors  *prev_vectors;    /*  previous active vectors  */
+};
+
+struct _GimpVectorsUndoClass
+{
+  GimpItemUndoClass  parent_class;
+};
+
+
+GType   gimp_vectors_undo_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VECTORS_UNDO_H__ */
diff --git a/app/vectors/vectors-enums.h b/app/vectors/vectors-enums.h
new file mode 100644
index 0000000..c0c603b
--- /dev/null
+++ b/app/vectors/vectors-enums.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * vectors-enums.h
+ * Copyright (C) 2006 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_ENUMS_H__
+#define __VECTORS_ENUMS_H__
+
+
+typedef enum
+{
+  GIMP_ANCHOR_ANCHOR,
+  GIMP_ANCHOR_CONTROL
+} GimpAnchorType;
+
+typedef enum
+{
+  GIMP_ANCHOR_FEATURE_NONE,
+  GIMP_ANCHOR_FEATURE_EDGE,
+  GIMP_ANCHOR_FEATURE_ALIGNED,
+  GIMP_ANCHOR_FEATURE_SYMMETRIC
+} GimpAnchorFeatureType;
+
+typedef enum
+{
+  EXTEND_SIMPLE,
+  EXTEND_EDITABLE
+} GimpVectorExtendMode;
+
+
+#endif /* __VECTORS_ENUMS_H__ */
diff --git a/app/vectors/vectors-types.h b/app/vectors/vectors-types.h
new file mode 100644
index 0000000..7c0d2d3
--- /dev/null
+++ b/app/vectors/vectors-types.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * vectors-types.h
+ * Copyright (C) 2002 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __VECTORS_TYPES_H__
+#define __VECTORS_TYPES_H__
+
+
+#include "core/core-types.h"
+
+#include "vectors/vectors-enums.h"
+
+
+typedef struct _GimpAnchor       GimpAnchor;
+
+typedef struct _GimpVectors      GimpVectors;
+typedef struct _GimpStroke       GimpStroke;
+typedef struct _GimpBezierStroke GimpBezierStroke;
+
+
+#endif /* __VECTORS_TYPES_H__ */
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
new file mode 100644
index 0000000..451e88c
--- /dev/null
+++ b/app/widgets/Makefile.am
@@ -0,0 +1,514 @@
+## Process this file with automake to produce Makefile.in
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+xobjective_cxx = "-xobjective-c++"
+xnone = "-xnone"
+endif
+
+AM_CPPFLAGS = \
+        -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\"		\
+        -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\"	\
+	-DG_LOG_DOMAIN=\"Gimp-Widgets\"				\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GEGL_CFLAGS)						\
+	$(GTK_CFLAGS)						\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappwidgets.a
+
+libappwidgets_a_sources = \
+	widgets-enums.h			\
+	widgets-types.h			\
+	gimpaccellabel.c		\
+	gimpaccellabel.h		\
+	gimpaction.c			\
+	gimpaction.h			\
+	gimpaction-history.c		\
+	gimpaction-history.h		\
+	gimpactioneditor.c		\
+	gimpactioneditor.h		\
+	gimpactionfactory.c		\
+	gimpactionfactory.h		\
+	gimpactiongroup.c		\
+	gimpactiongroup.h		\
+	gimpactionimpl.c		\
+	gimpactionimpl.h		\
+	gimpactionview.c		\
+	gimpactionview.h		\
+	gimpblobeditor.c		\
+	gimpblobeditor.h		\
+	gimpbrusheditor.c		\
+	gimpbrusheditor.h		\
+	gimpbrushfactoryview.c		\
+	gimpbrushfactoryview.h		\
+	gimpbrushselect.c		\
+	gimpbrushselect.h		\
+	gimpbuffersourcebox.c		\
+	gimpbuffersourcebox.h		\
+	gimpbufferview.c		\
+	gimpbufferview.h		\
+	gimpcairo-wilber.c		\
+	gimpcairo-wilber.h		\
+	gimpcellrendererbutton.c	\
+	gimpcellrendererbutton.h	\
+	gimpcellrendererdashes.c	\
+	gimpcellrendererdashes.h	\
+	gimpcellrendererviewable.c	\
+	gimpcellrendererviewable.h	\
+	gimpcircle.c			\
+	gimpcircle.h			\
+	gimpchanneltreeview.c		\
+	gimpchanneltreeview.h		\
+	gimpclipboard.c			\
+	gimpclipboard.h			\
+	gimpcolorbar.c			\
+	gimpcolorbar.h			\
+	gimpcolordialog.c		\
+	gimpcolordialog.h		\
+	gimpcolordisplayeditor.c	\
+	gimpcolordisplayeditor.h	\
+	gimpcoloreditor.c		\
+	gimpcoloreditor.h		\
+	gimpcolorframe.c		\
+	gimpcolorframe.h		\
+	gimpcolorhistory.c		\
+	gimpcolorhistory.h		\
+	gimpcolormapeditor.c		\
+	gimpcolormapeditor.h		\
+	gimpcolorpanel.c		\
+	gimpcolorpanel.h		\
+	gimpcolorselectorpalette.c	\
+	gimpcolorselectorpalette.h	\
+	gimpcombotagentry.c		\
+	gimpcombotagentry.h		\
+	gimpcomponenteditor.c		\
+	gimpcomponenteditor.h		\
+	gimpcompressioncombobox.c	\
+	gimpcompressioncombobox.h	\
+	gimpcontainerbox.c		\
+	gimpcontainerbox.h		\
+	gimpcontainercombobox.c		\
+	gimpcontainercombobox.h		\
+	gimpcontainereditor.c		\
+	gimpcontainereditor.h		\
+	gimpcontainerentry.c		\
+	gimpcontainerentry.h		\
+	gimpcontainergridview.c		\
+	gimpcontainergridview.h		\
+	gimpcontainericonview.c		\
+	gimpcontainericonview.h		\
+	gimpcontainerpopup.c		\
+	gimpcontainerpopup.h		\
+	gimpcontainertreestore.c	\
+	gimpcontainertreestore.h	\
+	gimpcontainertreeview.c		\
+	gimpcontainertreeview.h		\
+	gimpcontainertreeview-dnd.c	\
+	gimpcontainertreeview-dnd.h	\
+	gimpcontainertreeview-private.h	\
+	gimpcontainerview.c		\
+	gimpcontainerview.h		\
+	gimpcontainerview-utils.c	\
+	gimpcontainerview-utils.h	\
+	gimpcontrollereditor.c		\
+	gimpcontrollereditor.h		\
+	gimpcontrollerinfo.c		\
+	gimpcontrollerinfo.h		\
+	gimpcontrollerlist.c		\
+	gimpcontrollerlist.h		\
+	gimpcontrollers.c		\
+	gimpcontrollers.h		\
+	gimpcontrollerkeyboard.c	\
+	gimpcontrollerkeyboard.h	\
+	gimpcontrollermouse.c		\
+	gimpcontrollermouse.h		\
+	gimpcontrollerwheel.c		\
+	gimpcontrollerwheel.h		\
+	gimpcriticaldialog.c		\
+	gimpcriticaldialog.h		\
+	gimpcursor.c			\
+	gimpcursor.h			\
+	gimpcurveview.c			\
+	gimpcurveview.h			\
+	gimpdashboard.c			\
+	gimpdashboard.h			\
+	gimpdasheditor.c		\
+	gimpdasheditor.h		\
+	gimpdataeditor.c		\
+	gimpdataeditor.h		\
+	gimpdatafactoryview.c		\
+	gimpdatafactoryview.h		\
+	gimpdeviceeditor.c		\
+	gimpdeviceeditor.h		\
+	gimpdeviceinfo.c		\
+	gimpdeviceinfo.h		\
+	gimpdeviceinfo-coords.c		\
+	gimpdeviceinfo-coords.h		\
+	gimpdeviceinfoeditor.c		\
+	gimpdeviceinfoeditor.h		\
+	gimpdevicemanager.c		\
+	gimpdevicemanager.h		\
+	gimpdevices.c			\
+	gimpdevices.h			\
+	gimpdevicestatus.c		\
+	gimpdevicestatus.h		\
+	gimpdial.c			\
+	gimpdial.h			\
+	gimpdialogfactory.c		\
+	gimpdialogfactory.h		\
+	gimpdnd.c			\
+	gimpdnd.h			\
+	gimpdnd-xds.c			\
+	gimpdnd-xds.h			\
+	gimpdock.c			\
+	gimpdock.h			\
+	gimpdockcolumns.c		\
+	gimpdockcolumns.h		\
+	gimpdockable.c			\
+	gimpdockable.h			\
+	gimpdockbook.c			\
+	gimpdockbook.h			\
+	gimpdockcontainer.c		\
+	gimpdockcontainer.h		\
+	gimpdocked.c			\
+	gimpdocked.h			\
+	gimpdockwindow.c		\
+	gimpdockwindow.h		\
+	gimpdocumentview.c		\
+	gimpdocumentview.h		\
+	gimpdrawabletreeview.c		\
+	gimpdrawabletreeview.h		\
+	gimpdynamicseditor.c		\
+	gimpdynamicseditor.h		\
+	gimpdynamicsfactoryview.c	\
+	gimpdynamicsfactoryview.h	\
+	gimpdynamicsoutputeditor.c	\
+	gimpdynamicsoutputeditor.h	\
+	gimpeditor.c			\
+	gimpeditor.h			\
+	gimpenumaction.c		\
+	gimpenumaction.h		\
+	gimperrorconsole.c		\
+	gimperrorconsole.h		\
+	gimperrordialog.c		\
+	gimperrordialog.h		\
+	gimpexportdialog.c		\
+	gimpexportdialog.h		\
+	gimpfgbgeditor.c		\
+	gimpfgbgeditor.h		\
+	gimpfgbgview.c			\
+	gimpfgbgview.h			\
+	gimpfiledialog.c		\
+	gimpfiledialog.h		\
+	gimpfileprocview.c		\
+	gimpfileprocview.h		\
+	gimpfilleditor.c		\
+	gimpfilleditor.h		\
+	gimpfontfactoryview.c		\
+	gimpfontfactoryview.h		\
+	gimpfontselect.c		\
+	gimpfontselect.h		\
+	gimpgradienteditor.c		\
+	gimpgradienteditor.h		\
+	gimpgradientselect.c		\
+	gimpgradientselect.h		\
+	gimpgrideditor.c		\
+	gimpgrideditor.h		\
+	gimphandlebar.c			\
+	gimphandlebar.h			\
+	gimphelp.c			\
+	gimphelp.h			\
+	gimphelp-ids.h			\
+	gimphighlightablebutton.c	\
+	gimphighlightablebutton.h	\
+	gimphistogrambox.c		\
+	gimphistogrambox.h		\
+	gimphistogrameditor.c		\
+	gimphistogrameditor.h		\
+	gimphistogramview.c		\
+	gimphistogramview.h		\
+	gimpiconpicker.c		\
+	gimpiconpicker.h		\
+	gimpiconsizescale.c		\
+	gimpiconsizescale.h		\
+	gimpimagecommenteditor.c	\
+	gimpimagecommenteditor.h	\
+	gimpimageeditor.c		\
+	gimpimageeditor.h		\
+	gimpimageparasiteview.c		\
+	gimpimageparasiteview.h		\
+	gimpimageprofileview.c		\
+	gimpimageprofileview.h		\
+	gimpimagepropview.c		\
+	gimpimagepropview.h		\
+	gimpimageview.c			\
+	gimpimageview.h			\
+	gimpitemtreeview.c		\
+	gimpitemtreeview.h		\
+	gimplanguagecombobox.c		\
+	gimplanguagecombobox.h		\
+	gimplanguageentry.c		\
+	gimplanguageentry.h		\
+	gimplanguagestore.c		\
+	gimplanguagestore.h		\
+	gimplanguagestore-parser.c	\
+	gimplanguagestore-parser.h	\
+	gimplayermodebox.c		\
+	gimplayermodebox.h		\
+	gimplayermodecombobox.c		\
+	gimplayermodecombobox.h		\
+	gimplayertreeview.c		\
+	gimplayertreeview.h		\
+	gimpmenudock.c			\
+	gimpmenudock.h			\
+	gimpmenufactory.c		\
+	gimpmenufactory.h		\
+	gimpmessagebox.c		\
+	gimpmessagebox.h		\
+	gimpmessagedialog.c		\
+	gimpmessagedialog.h		\
+	gimpmeter.c			\
+	gimpmeter.h			\
+	gimpnavigationview.c		\
+	gimpnavigationview.h		\
+	gimpopendialog.c		\
+	gimpopendialog.h		\
+	gimpoverlaybox.c		\
+	gimpoverlaybox.h		\
+	gimpoverlaychild.c		\
+	gimpoverlaychild.h		\
+	gimpoverlaydialog.c		\
+	gimpoverlaydialog.h		\
+	gimpoverlayframe.c		\
+	gimpoverlayframe.h		\
+	gimppaletteeditor.c		\
+	gimppaletteeditor.h		\
+	gimppaletteselect.c		\
+	gimppaletteselect.h		\
+	gimppaletteview.c		\
+	gimppaletteview.h		\
+	gimppanedbox.c			\
+	gimppanedbox.h			\
+	gimppatternfactoryview.c	\
+	gimppatternfactoryview.h	\
+	gimppatternselect.c		\
+	gimppatternselect.h		\
+	gimppdbdialog.c			\
+	gimppdbdialog.h			\
+	gimppickablebutton.c		\
+	gimppickablebutton.h		\
+	gimppickablepopup.c		\
+	gimppickablepopup.h		\
+	gimppivotselector.c		\
+	gimppivotselector.h		\
+	gimppixbuf.c			\
+	gimppixbuf.h			\
+	gimppluginview.c		\
+	gimppluginview.h		\
+	gimppolar.c			\
+	gimppolar.h			\
+	gimppopup.c			\
+	gimppopup.h			\
+	gimpprefsbox.c			\
+	gimpprefsbox.h			\
+	gimpprocedureaction.c		\
+	gimpprocedureaction.h		\
+	gimpprogressbox.c		\
+	gimpprogressbox.h		\
+	gimpprogressdialog.c		\
+	gimpprogressdialog.h		\
+	gimppropwidgets.c		\
+	gimppropwidgets.h		\
+	gimpradioaction.c		\
+	gimpradioaction.h		\
+	gimprender.c			\
+	gimprender.h			\
+	gimpsamplepointeditor.c		\
+	gimpsamplepointeditor.h		\
+	gimpsavedialog.c		\
+	gimpsavedialog.h		\
+	gimpscalebutton.c		\
+	gimpscalebutton.h		\
+	gimpsearchpopup.c		\
+	gimpsearchpopup.h		\
+	gimpselectiondata.c		\
+	gimpselectiondata.h		\
+	gimpselectioneditor.c		\
+	gimpselectioneditor.h		\
+	gimpsessioninfo.c		\
+	gimpsessioninfo.h		\
+	gimpsessioninfo-aux.c		\
+	gimpsessioninfo-aux.h		\
+	gimpsessioninfo-book.c		\
+	gimpsessioninfo-book.h		\
+	gimpsessioninfo-dock.c		\
+	gimpsessioninfo-dock.h		\
+	gimpsessioninfo-dockable.c	\
+	gimpsessioninfo-dockable.h	\
+	gimpsessioninfo-private.h	\
+	gimpsessionmanaged.c		\
+	gimpsessionmanaged.h		\
+	gimpsettingsbox.c		\
+	gimpsettingsbox.h		\
+	gimpsettingseditor.c		\
+	gimpsettingseditor.h		\
+	gimpsizebox.c			\
+	gimpsizebox.h			\
+	gimpspinscale.c			\
+	gimpspinscale.h			\
+	gimpstringaction.c		\
+	gimpstringaction.h		\
+	gimpstrokeeditor.c		\
+	gimpstrokeeditor.h		\
+	gimpsymmetryeditor.c		\
+	gimpsymmetryeditor.h		\
+	gimptagentry.c			\
+	gimptagentry.h			\
+	gimptagpopup.c			\
+	gimptagpopup.h			\
+	gimptemplateeditor.c		\
+	gimptemplateeditor.h		\
+	gimptemplateview.c		\
+	gimptemplateview.h		\
+	gimptextbuffer.c		\
+	gimptextbuffer.h		\
+	gimptextbuffer-serialize.c	\
+	gimptextbuffer-serialize.h	\
+	gimptexteditor.c		\
+	gimptexteditor.h		\
+	gimptextproxy.c			\
+	gimptextproxy.h			\
+	gimptextstyleeditor.c		\
+	gimptextstyleeditor.h		\
+	gimptexttag.c			\
+	gimptexttag.h			\
+	gimpthumbbox.c			\
+	gimpthumbbox.h			\
+	gimptoggleaction.c		\
+	gimptoggleaction.h		\
+	gimptoolbox.c			\
+	gimptoolbox.h			\
+	gimptoolbox-color-area.c	\
+	gimptoolbox-color-area.h	\
+	gimptoolbox-dnd.c		\
+	gimptoolbox-dnd.h		\
+	gimptoolbox-image-area.c	\
+	gimptoolbox-image-area.h	\
+	gimptoolbox-indicator-area.c	\
+	gimptoolbox-indicator-area.h	\
+        gimptoolbutton.c                \
+        gimptoolbutton.h                \
+	gimptooleditor.c		\
+	gimptooleditor.h		\
+	gimptooloptionseditor.c		\
+	gimptooloptionseditor.h		\
+	gimptoolpalette.c		\
+	gimptoolpalette.h		\
+	gimptoolpreseteditor.c		\
+	gimptoolpreseteditor.h		\
+	gimptoolpresetfactoryview.c	\
+	gimptoolpresetfactoryview.h	\
+	gimptranslationstore.c		\
+	gimptranslationstore.h		\
+	gimpuimanager.c			\
+	gimpuimanager.h			\
+	gimpundoeditor.c		\
+	gimpundoeditor.h		\
+	gimpvectorstreeview.c		\
+	gimpvectorstreeview.h		\
+	gimpview.c			\
+	gimpview.h			\
+	gimpview-popup.c		\
+	gimpview-popup.h		\
+	gimpviewablebox.c		\
+	gimpviewablebox.h		\
+	gimpviewablebutton.c		\
+	gimpviewablebutton.h		\
+	gimpviewabledialog.c		\
+	gimpviewabledialog.h		\
+	gimpviewrenderer.c		\
+	gimpviewrenderer.h		\
+	gimpviewrenderer-frame.c	\
+	gimpviewrenderer-frame.h	\
+	gimpviewrenderer-utils.c	\
+	gimpviewrenderer-utils.h	\
+	gimpviewrendererbrush.c		\
+	gimpviewrendererbrush.h		\
+	gimpviewrendererbuffer.c	\
+	gimpviewrendererbuffer.h	\
+	gimpviewrendererdrawable.c	\
+	gimpviewrendererdrawable.h	\
+	gimpviewrenderergradient.c	\
+	gimpviewrenderergradient.h	\
+	gimpviewrendererimage.c 	\
+	gimpviewrendererimage.h 	\
+	gimpviewrendererimagefile.c	\
+	gimpviewrendererimagefile.h	\
+	gimpviewrendererlayer.c		\
+	gimpviewrendererlayer.h		\
+	gimpviewrendererpalette.c	\
+	gimpviewrendererpalette.h	\
+	gimpviewrenderervectors.c	\
+	gimpviewrenderervectors.h	\
+	gimpwidgets-constructors.c	\
+	gimpwidgets-constructors.h	\
+	gimpwidgets-utils.c		\
+	gimpwidgets-utils.h		\
+	gimpwindow.c			\
+	gimpwindow.h			\
+	gimpwindowstrategy.c		\
+	gimpwindowstrategy.h		\
+	gtkwrapbox.c			\
+	gtkwrapbox.h			\
+	gtkhwrapbox.c			\
+	gtkhwrapbox.h
+
+libappwidgets_a_built_sources = widgets-enums.c
+
+libappwidgets_a_SOURCES = \
+	$(libappwidgets_a_built_sources) $(libappwidgets_a_sources)
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-wec
+CLEANFILES = $(gen_sources)
+
+xgen-wec: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gtk/gtk.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"widgets-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/widgets-enums.c: xgen-wec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
diff --git a/app/widgets/Makefile.in b/app/widgets/Makefile.in
new file mode 100644
index 0000000..b4c608a
--- /dev/null
+++ b/app/widgets/Makefile.in
@@ -0,0 +1,2356 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/widgets
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappwidgets_a_AR = $(AR) $(ARFLAGS)
+libappwidgets_a_LIBADD =
+am__objects_1 = widgets-enums.$(OBJEXT)
+am__objects_2 = gimpaccellabel.$(OBJEXT) gimpaction.$(OBJEXT) \
+	gimpaction-history.$(OBJEXT) gimpactioneditor.$(OBJEXT) \
+	gimpactionfactory.$(OBJEXT) gimpactiongroup.$(OBJEXT) \
+	gimpactionimpl.$(OBJEXT) gimpactionview.$(OBJEXT) \
+	gimpblobeditor.$(OBJEXT) gimpbrusheditor.$(OBJEXT) \
+	gimpbrushfactoryview.$(OBJEXT) gimpbrushselect.$(OBJEXT) \
+	gimpbuffersourcebox.$(OBJEXT) gimpbufferview.$(OBJEXT) \
+	gimpcairo-wilber.$(OBJEXT) gimpcellrendererbutton.$(OBJEXT) \
+	gimpcellrendererdashes.$(OBJEXT) \
+	gimpcellrendererviewable.$(OBJEXT) gimpcircle.$(OBJEXT) \
+	gimpchanneltreeview.$(OBJEXT) gimpclipboard.$(OBJEXT) \
+	gimpcolorbar.$(OBJEXT) gimpcolordialog.$(OBJEXT) \
+	gimpcolordisplayeditor.$(OBJEXT) gimpcoloreditor.$(OBJEXT) \
+	gimpcolorframe.$(OBJEXT) gimpcolorhistory.$(OBJEXT) \
+	gimpcolormapeditor.$(OBJEXT) gimpcolorpanel.$(OBJEXT) \
+	gimpcolorselectorpalette.$(OBJEXT) gimpcombotagentry.$(OBJEXT) \
+	gimpcomponenteditor.$(OBJEXT) \
+	gimpcompressioncombobox.$(OBJEXT) gimpcontainerbox.$(OBJEXT) \
+	gimpcontainercombobox.$(OBJEXT) gimpcontainereditor.$(OBJEXT) \
+	gimpcontainerentry.$(OBJEXT) gimpcontainergridview.$(OBJEXT) \
+	gimpcontainericonview.$(OBJEXT) gimpcontainerpopup.$(OBJEXT) \
+	gimpcontainertreestore.$(OBJEXT) \
+	gimpcontainertreeview.$(OBJEXT) \
+	gimpcontainertreeview-dnd.$(OBJEXT) \
+	gimpcontainerview.$(OBJEXT) gimpcontainerview-utils.$(OBJEXT) \
+	gimpcontrollereditor.$(OBJEXT) gimpcontrollerinfo.$(OBJEXT) \
+	gimpcontrollerlist.$(OBJEXT) gimpcontrollers.$(OBJEXT) \
+	gimpcontrollerkeyboard.$(OBJEXT) gimpcontrollermouse.$(OBJEXT) \
+	gimpcontrollerwheel.$(OBJEXT) gimpcriticaldialog.$(OBJEXT) \
+	gimpcursor.$(OBJEXT) gimpcurveview.$(OBJEXT) \
+	gimpdashboard.$(OBJEXT) gimpdasheditor.$(OBJEXT) \
+	gimpdataeditor.$(OBJEXT) gimpdatafactoryview.$(OBJEXT) \
+	gimpdeviceeditor.$(OBJEXT) gimpdeviceinfo.$(OBJEXT) \
+	gimpdeviceinfo-coords.$(OBJEXT) gimpdeviceinfoeditor.$(OBJEXT) \
+	gimpdevicemanager.$(OBJEXT) gimpdevices.$(OBJEXT) \
+	gimpdevicestatus.$(OBJEXT) gimpdial.$(OBJEXT) \
+	gimpdialogfactory.$(OBJEXT) gimpdnd.$(OBJEXT) \
+	gimpdnd-xds.$(OBJEXT) gimpdock.$(OBJEXT) \
+	gimpdockcolumns.$(OBJEXT) gimpdockable.$(OBJEXT) \
+	gimpdockbook.$(OBJEXT) gimpdockcontainer.$(OBJEXT) \
+	gimpdocked.$(OBJEXT) gimpdockwindow.$(OBJEXT) \
+	gimpdocumentview.$(OBJEXT) gimpdrawabletreeview.$(OBJEXT) \
+	gimpdynamicseditor.$(OBJEXT) gimpdynamicsfactoryview.$(OBJEXT) \
+	gimpdynamicsoutputeditor.$(OBJEXT) gimpeditor.$(OBJEXT) \
+	gimpenumaction.$(OBJEXT) gimperrorconsole.$(OBJEXT) \
+	gimperrordialog.$(OBJEXT) gimpexportdialog.$(OBJEXT) \
+	gimpfgbgeditor.$(OBJEXT) gimpfgbgview.$(OBJEXT) \
+	gimpfiledialog.$(OBJEXT) gimpfileprocview.$(OBJEXT) \
+	gimpfilleditor.$(OBJEXT) gimpfontfactoryview.$(OBJEXT) \
+	gimpfontselect.$(OBJEXT) gimpgradienteditor.$(OBJEXT) \
+	gimpgradientselect.$(OBJEXT) gimpgrideditor.$(OBJEXT) \
+	gimphandlebar.$(OBJEXT) gimphelp.$(OBJEXT) \
+	gimphighlightablebutton.$(OBJEXT) gimphistogrambox.$(OBJEXT) \
+	gimphistogrameditor.$(OBJEXT) gimphistogramview.$(OBJEXT) \
+	gimpiconpicker.$(OBJEXT) gimpiconsizescale.$(OBJEXT) \
+	gimpimagecommenteditor.$(OBJEXT) gimpimageeditor.$(OBJEXT) \
+	gimpimageparasiteview.$(OBJEXT) gimpimageprofileview.$(OBJEXT) \
+	gimpimagepropview.$(OBJEXT) gimpimageview.$(OBJEXT) \
+	gimpitemtreeview.$(OBJEXT) gimplanguagecombobox.$(OBJEXT) \
+	gimplanguageentry.$(OBJEXT) gimplanguagestore.$(OBJEXT) \
+	gimplanguagestore-parser.$(OBJEXT) gimplayermodebox.$(OBJEXT) \
+	gimplayermodecombobox.$(OBJEXT) gimplayertreeview.$(OBJEXT) \
+	gimpmenudock.$(OBJEXT) gimpmenufactory.$(OBJEXT) \
+	gimpmessagebox.$(OBJEXT) gimpmessagedialog.$(OBJEXT) \
+	gimpmeter.$(OBJEXT) gimpnavigationview.$(OBJEXT) \
+	gimpopendialog.$(OBJEXT) gimpoverlaybox.$(OBJEXT) \
+	gimpoverlaychild.$(OBJEXT) gimpoverlaydialog.$(OBJEXT) \
+	gimpoverlayframe.$(OBJEXT) gimppaletteeditor.$(OBJEXT) \
+	gimppaletteselect.$(OBJEXT) gimppaletteview.$(OBJEXT) \
+	gimppanedbox.$(OBJEXT) gimppatternfactoryview.$(OBJEXT) \
+	gimppatternselect.$(OBJEXT) gimppdbdialog.$(OBJEXT) \
+	gimppickablebutton.$(OBJEXT) gimppickablepopup.$(OBJEXT) \
+	gimppivotselector.$(OBJEXT) gimppixbuf.$(OBJEXT) \
+	gimppluginview.$(OBJEXT) gimppolar.$(OBJEXT) \
+	gimppopup.$(OBJEXT) gimpprefsbox.$(OBJEXT) \
+	gimpprocedureaction.$(OBJEXT) gimpprogressbox.$(OBJEXT) \
+	gimpprogressdialog.$(OBJEXT) gimppropwidgets.$(OBJEXT) \
+	gimpradioaction.$(OBJEXT) gimprender.$(OBJEXT) \
+	gimpsamplepointeditor.$(OBJEXT) gimpsavedialog.$(OBJEXT) \
+	gimpscalebutton.$(OBJEXT) gimpsearchpopup.$(OBJEXT) \
+	gimpselectiondata.$(OBJEXT) gimpselectioneditor.$(OBJEXT) \
+	gimpsessioninfo.$(OBJEXT) gimpsessioninfo-aux.$(OBJEXT) \
+	gimpsessioninfo-book.$(OBJEXT) gimpsessioninfo-dock.$(OBJEXT) \
+	gimpsessioninfo-dockable.$(OBJEXT) \
+	gimpsessionmanaged.$(OBJEXT) gimpsettingsbox.$(OBJEXT) \
+	gimpsettingseditor.$(OBJEXT) gimpsizebox.$(OBJEXT) \
+	gimpspinscale.$(OBJEXT) gimpstringaction.$(OBJEXT) \
+	gimpstrokeeditor.$(OBJEXT) gimpsymmetryeditor.$(OBJEXT) \
+	gimptagentry.$(OBJEXT) gimptagpopup.$(OBJEXT) \
+	gimptemplateeditor.$(OBJEXT) gimptemplateview.$(OBJEXT) \
+	gimptextbuffer.$(OBJEXT) gimptextbuffer-serialize.$(OBJEXT) \
+	gimptexteditor.$(OBJEXT) gimptextproxy.$(OBJEXT) \
+	gimptextstyleeditor.$(OBJEXT) gimptexttag.$(OBJEXT) \
+	gimpthumbbox.$(OBJEXT) gimptoggleaction.$(OBJEXT) \
+	gimptoolbox.$(OBJEXT) gimptoolbox-color-area.$(OBJEXT) \
+	gimptoolbox-dnd.$(OBJEXT) gimptoolbox-image-area.$(OBJEXT) \
+	gimptoolbox-indicator-area.$(OBJEXT) gimptoolbutton.$(OBJEXT) \
+	gimptooleditor.$(OBJEXT) gimptooloptionseditor.$(OBJEXT) \
+	gimptoolpalette.$(OBJEXT) gimptoolpreseteditor.$(OBJEXT) \
+	gimptoolpresetfactoryview.$(OBJEXT) \
+	gimptranslationstore.$(OBJEXT) gimpuimanager.$(OBJEXT) \
+	gimpundoeditor.$(OBJEXT) gimpvectorstreeview.$(OBJEXT) \
+	gimpview.$(OBJEXT) gimpview-popup.$(OBJEXT) \
+	gimpviewablebox.$(OBJEXT) gimpviewablebutton.$(OBJEXT) \
+	gimpviewabledialog.$(OBJEXT) gimpviewrenderer.$(OBJEXT) \
+	gimpviewrenderer-frame.$(OBJEXT) \
+	gimpviewrenderer-utils.$(OBJEXT) \
+	gimpviewrendererbrush.$(OBJEXT) \
+	gimpviewrendererbuffer.$(OBJEXT) \
+	gimpviewrendererdrawable.$(OBJEXT) \
+	gimpviewrenderergradient.$(OBJEXT) \
+	gimpviewrendererimage.$(OBJEXT) \
+	gimpviewrendererimagefile.$(OBJEXT) \
+	gimpviewrendererlayer.$(OBJEXT) \
+	gimpviewrendererpalette.$(OBJEXT) \
+	gimpviewrenderervectors.$(OBJEXT) \
+	gimpwidgets-constructors.$(OBJEXT) gimpwidgets-utils.$(OBJEXT) \
+	gimpwindow.$(OBJEXT) gimpwindowstrategy.$(OBJEXT) \
+	gtkwrapbox.$(OBJEXT) gtkhwrapbox.$(OBJEXT)
+am_libappwidgets_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+libappwidgets_a_OBJECTS = $(am_libappwidgets_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimpaccellabel.Po \
+	./$(DEPDIR)/gimpaction-history.Po ./$(DEPDIR)/gimpaction.Po \
+	./$(DEPDIR)/gimpactioneditor.Po \
+	./$(DEPDIR)/gimpactionfactory.Po \
+	./$(DEPDIR)/gimpactiongroup.Po ./$(DEPDIR)/gimpactionimpl.Po \
+	./$(DEPDIR)/gimpactionview.Po ./$(DEPDIR)/gimpblobeditor.Po \
+	./$(DEPDIR)/gimpbrusheditor.Po \
+	./$(DEPDIR)/gimpbrushfactoryview.Po \
+	./$(DEPDIR)/gimpbrushselect.Po \
+	./$(DEPDIR)/gimpbuffersourcebox.Po \
+	./$(DEPDIR)/gimpbufferview.Po ./$(DEPDIR)/gimpcairo-wilber.Po \
+	./$(DEPDIR)/gimpcellrendererbutton.Po \
+	./$(DEPDIR)/gimpcellrendererdashes.Po \
+	./$(DEPDIR)/gimpcellrendererviewable.Po \
+	./$(DEPDIR)/gimpchanneltreeview.Po ./$(DEPDIR)/gimpcircle.Po \
+	./$(DEPDIR)/gimpclipboard.Po ./$(DEPDIR)/gimpcolorbar.Po \
+	./$(DEPDIR)/gimpcolordialog.Po \
+	./$(DEPDIR)/gimpcolordisplayeditor.Po \
+	./$(DEPDIR)/gimpcoloreditor.Po ./$(DEPDIR)/gimpcolorframe.Po \
+	./$(DEPDIR)/gimpcolorhistory.Po \
+	./$(DEPDIR)/gimpcolormapeditor.Po \
+	./$(DEPDIR)/gimpcolorpanel.Po \
+	./$(DEPDIR)/gimpcolorselectorpalette.Po \
+	./$(DEPDIR)/gimpcombotagentry.Po \
+	./$(DEPDIR)/gimpcomponenteditor.Po \
+	./$(DEPDIR)/gimpcompressioncombobox.Po \
+	./$(DEPDIR)/gimpcontainerbox.Po \
+	./$(DEPDIR)/gimpcontainercombobox.Po \
+	./$(DEPDIR)/gimpcontainereditor.Po \
+	./$(DEPDIR)/gimpcontainerentry.Po \
+	./$(DEPDIR)/gimpcontainergridview.Po \
+	./$(DEPDIR)/gimpcontainericonview.Po \
+	./$(DEPDIR)/gimpcontainerpopup.Po \
+	./$(DEPDIR)/gimpcontainertreestore.Po \
+	./$(DEPDIR)/gimpcontainertreeview-dnd.Po \
+	./$(DEPDIR)/gimpcontainertreeview.Po \
+	./$(DEPDIR)/gimpcontainerview-utils.Po \
+	./$(DEPDIR)/gimpcontainerview.Po \
+	./$(DEPDIR)/gimpcontrollereditor.Po \
+	./$(DEPDIR)/gimpcontrollerinfo.Po \
+	./$(DEPDIR)/gimpcontrollerkeyboard.Po \
+	./$(DEPDIR)/gimpcontrollerlist.Po \
+	./$(DEPDIR)/gimpcontrollermouse.Po \
+	./$(DEPDIR)/gimpcontrollers.Po \
+	./$(DEPDIR)/gimpcontrollerwheel.Po \
+	./$(DEPDIR)/gimpcriticaldialog.Po ./$(DEPDIR)/gimpcursor.Po \
+	./$(DEPDIR)/gimpcurveview.Po ./$(DEPDIR)/gimpdashboard.Po \
+	./$(DEPDIR)/gimpdasheditor.Po ./$(DEPDIR)/gimpdataeditor.Po \
+	./$(DEPDIR)/gimpdatafactoryview.Po \
+	./$(DEPDIR)/gimpdeviceeditor.Po \
+	./$(DEPDIR)/gimpdeviceinfo-coords.Po \
+	./$(DEPDIR)/gimpdeviceinfo.Po \
+	./$(DEPDIR)/gimpdeviceinfoeditor.Po \
+	./$(DEPDIR)/gimpdevicemanager.Po ./$(DEPDIR)/gimpdevices.Po \
+	./$(DEPDIR)/gimpdevicestatus.Po ./$(DEPDIR)/gimpdial.Po \
+	./$(DEPDIR)/gimpdialogfactory.Po ./$(DEPDIR)/gimpdnd-xds.Po \
+	./$(DEPDIR)/gimpdnd.Po ./$(DEPDIR)/gimpdock.Po \
+	./$(DEPDIR)/gimpdockable.Po ./$(DEPDIR)/gimpdockbook.Po \
+	./$(DEPDIR)/gimpdockcolumns.Po \
+	./$(DEPDIR)/gimpdockcontainer.Po ./$(DEPDIR)/gimpdocked.Po \
+	./$(DEPDIR)/gimpdockwindow.Po ./$(DEPDIR)/gimpdocumentview.Po \
+	./$(DEPDIR)/gimpdrawabletreeview.Po \
+	./$(DEPDIR)/gimpdynamicseditor.Po \
+	./$(DEPDIR)/gimpdynamicsfactoryview.Po \
+	./$(DEPDIR)/gimpdynamicsoutputeditor.Po \
+	./$(DEPDIR)/gimpeditor.Po ./$(DEPDIR)/gimpenumaction.Po \
+	./$(DEPDIR)/gimperrorconsole.Po ./$(DEPDIR)/gimperrordialog.Po \
+	./$(DEPDIR)/gimpexportdialog.Po ./$(DEPDIR)/gimpfgbgeditor.Po \
+	./$(DEPDIR)/gimpfgbgview.Po ./$(DEPDIR)/gimpfiledialog.Po \
+	./$(DEPDIR)/gimpfileprocview.Po ./$(DEPDIR)/gimpfilleditor.Po \
+	./$(DEPDIR)/gimpfontfactoryview.Po \
+	./$(DEPDIR)/gimpfontselect.Po \
+	./$(DEPDIR)/gimpgradienteditor.Po \
+	./$(DEPDIR)/gimpgradientselect.Po \
+	./$(DEPDIR)/gimpgrideditor.Po ./$(DEPDIR)/gimphandlebar.Po \
+	./$(DEPDIR)/gimphelp.Po ./$(DEPDIR)/gimphighlightablebutton.Po \
+	./$(DEPDIR)/gimphistogrambox.Po \
+	./$(DEPDIR)/gimphistogrameditor.Po \
+	./$(DEPDIR)/gimphistogramview.Po ./$(DEPDIR)/gimpiconpicker.Po \
+	./$(DEPDIR)/gimpiconsizescale.Po \
+	./$(DEPDIR)/gimpimagecommenteditor.Po \
+	./$(DEPDIR)/gimpimageeditor.Po \
+	./$(DEPDIR)/gimpimageparasiteview.Po \
+	./$(DEPDIR)/gimpimageprofileview.Po \
+	./$(DEPDIR)/gimpimagepropview.Po ./$(DEPDIR)/gimpimageview.Po \
+	./$(DEPDIR)/gimpitemtreeview.Po \
+	./$(DEPDIR)/gimplanguagecombobox.Po \
+	./$(DEPDIR)/gimplanguageentry.Po \
+	./$(DEPDIR)/gimplanguagestore-parser.Po \
+	./$(DEPDIR)/gimplanguagestore.Po \
+	./$(DEPDIR)/gimplayermodebox.Po \
+	./$(DEPDIR)/gimplayermodecombobox.Po \
+	./$(DEPDIR)/gimplayertreeview.Po ./$(DEPDIR)/gimpmenudock.Po \
+	./$(DEPDIR)/gimpmenufactory.Po ./$(DEPDIR)/gimpmessagebox.Po \
+	./$(DEPDIR)/gimpmessagedialog.Po ./$(DEPDIR)/gimpmeter.Po \
+	./$(DEPDIR)/gimpnavigationview.Po \
+	./$(DEPDIR)/gimpopendialog.Po ./$(DEPDIR)/gimpoverlaybox.Po \
+	./$(DEPDIR)/gimpoverlaychild.Po \
+	./$(DEPDIR)/gimpoverlaydialog.Po \
+	./$(DEPDIR)/gimpoverlayframe.Po \
+	./$(DEPDIR)/gimppaletteeditor.Po \
+	./$(DEPDIR)/gimppaletteselect.Po \
+	./$(DEPDIR)/gimppaletteview.Po ./$(DEPDIR)/gimppanedbox.Po \
+	./$(DEPDIR)/gimppatternfactoryview.Po \
+	./$(DEPDIR)/gimppatternselect.Po ./$(DEPDIR)/gimppdbdialog.Po \
+	./$(DEPDIR)/gimppickablebutton.Po \
+	./$(DEPDIR)/gimppickablepopup.Po \
+	./$(DEPDIR)/gimppivotselector.Po ./$(DEPDIR)/gimppixbuf.Po \
+	./$(DEPDIR)/gimppluginview.Po ./$(DEPDIR)/gimppolar.Po \
+	./$(DEPDIR)/gimppopup.Po ./$(DEPDIR)/gimpprefsbox.Po \
+	./$(DEPDIR)/gimpprocedureaction.Po \
+	./$(DEPDIR)/gimpprogressbox.Po \
+	./$(DEPDIR)/gimpprogressdialog.Po \
+	./$(DEPDIR)/gimppropwidgets.Po ./$(DEPDIR)/gimpradioaction.Po \
+	./$(DEPDIR)/gimprender.Po ./$(DEPDIR)/gimpsamplepointeditor.Po \
+	./$(DEPDIR)/gimpsavedialog.Po ./$(DEPDIR)/gimpscalebutton.Po \
+	./$(DEPDIR)/gimpsearchpopup.Po \
+	./$(DEPDIR)/gimpselectiondata.Po \
+	./$(DEPDIR)/gimpselectioneditor.Po \
+	./$(DEPDIR)/gimpsessioninfo-aux.Po \
+	./$(DEPDIR)/gimpsessioninfo-book.Po \
+	./$(DEPDIR)/gimpsessioninfo-dock.Po \
+	./$(DEPDIR)/gimpsessioninfo-dockable.Po \
+	./$(DEPDIR)/gimpsessioninfo.Po \
+	./$(DEPDIR)/gimpsessionmanaged.Po \
+	./$(DEPDIR)/gimpsettingsbox.Po \
+	./$(DEPDIR)/gimpsettingseditor.Po ./$(DEPDIR)/gimpsizebox.Po \
+	./$(DEPDIR)/gimpspinscale.Po ./$(DEPDIR)/gimpstringaction.Po \
+	./$(DEPDIR)/gimpstrokeeditor.Po \
+	./$(DEPDIR)/gimpsymmetryeditor.Po ./$(DEPDIR)/gimptagentry.Po \
+	./$(DEPDIR)/gimptagpopup.Po ./$(DEPDIR)/gimptemplateeditor.Po \
+	./$(DEPDIR)/gimptemplateview.Po \
+	./$(DEPDIR)/gimptextbuffer-serialize.Po \
+	./$(DEPDIR)/gimptextbuffer.Po ./$(DEPDIR)/gimptexteditor.Po \
+	./$(DEPDIR)/gimptextproxy.Po \
+	./$(DEPDIR)/gimptextstyleeditor.Po ./$(DEPDIR)/gimptexttag.Po \
+	./$(DEPDIR)/gimpthumbbox.Po ./$(DEPDIR)/gimptoggleaction.Po \
+	./$(DEPDIR)/gimptoolbox-color-area.Po \
+	./$(DEPDIR)/gimptoolbox-dnd.Po \
+	./$(DEPDIR)/gimptoolbox-image-area.Po \
+	./$(DEPDIR)/gimptoolbox-indicator-area.Po \
+	./$(DEPDIR)/gimptoolbox.Po ./$(DEPDIR)/gimptoolbutton.Po \
+	./$(DEPDIR)/gimptooleditor.Po \
+	./$(DEPDIR)/gimptooloptionseditor.Po \
+	./$(DEPDIR)/gimptoolpalette.Po \
+	./$(DEPDIR)/gimptoolpreseteditor.Po \
+	./$(DEPDIR)/gimptoolpresetfactoryview.Po \
+	./$(DEPDIR)/gimptranslationstore.Po \
+	./$(DEPDIR)/gimpuimanager.Po ./$(DEPDIR)/gimpundoeditor.Po \
+	./$(DEPDIR)/gimpvectorstreeview.Po \
+	./$(DEPDIR)/gimpview-popup.Po ./$(DEPDIR)/gimpview.Po \
+	./$(DEPDIR)/gimpviewablebox.Po \
+	./$(DEPDIR)/gimpviewablebutton.Po \
+	./$(DEPDIR)/gimpviewabledialog.Po \
+	./$(DEPDIR)/gimpviewrenderer-frame.Po \
+	./$(DEPDIR)/gimpviewrenderer-utils.Po \
+	./$(DEPDIR)/gimpviewrenderer.Po \
+	./$(DEPDIR)/gimpviewrendererbrush.Po \
+	./$(DEPDIR)/gimpviewrendererbuffer.Po \
+	./$(DEPDIR)/gimpviewrendererdrawable.Po \
+	./$(DEPDIR)/gimpviewrenderergradient.Po \
+	./$(DEPDIR)/gimpviewrendererimage.Po \
+	./$(DEPDIR)/gimpviewrendererimagefile.Po \
+	./$(DEPDIR)/gimpviewrendererlayer.Po \
+	./$(DEPDIR)/gimpviewrendererpalette.Po \
+	./$(DEPDIR)/gimpviewrenderervectors.Po \
+	./$(DEPDIR)/gimpwidgets-constructors.Po \
+	./$(DEPDIR)/gimpwidgets-utils.Po ./$(DEPDIR)/gimpwindow.Po \
+	./$(DEPDIR)/gimpwindowstrategy.Po ./$(DEPDIR)/gtkhwrapbox.Po \
+	./$(DEPDIR)/gtkwrapbox.Po ./$(DEPDIR)/widgets-enums.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappwidgets_a_SOURCES)
+DIST_SOURCES = $(libappwidgets_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
+@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
+@PLATFORM_OSX_TRUE@xnone = "-xnone"
+AM_CPPFLAGS = \
+        -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\"		\
+        -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\"	\
+	-DG_LOG_DOMAIN=\"Gimp-Widgets\"				\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GEGL_CFLAGS)						\
+	$(GTK_CFLAGS)						\
+	-I$(includedir)
+
+AM_CFLAGS = \
+	$(xobjective_c)
+
+AM_CXXFLAGS = \
+	$(xobjective_cxx)
+
+AM_LDFLAGS = \
+	$(xnone)
+
+noinst_LIBRARIES = libappwidgets.a
+libappwidgets_a_sources = \
+	widgets-enums.h			\
+	widgets-types.h			\
+	gimpaccellabel.c		\
+	gimpaccellabel.h		\
+	gimpaction.c			\
+	gimpaction.h			\
+	gimpaction-history.c		\
+	gimpaction-history.h		\
+	gimpactioneditor.c		\
+	gimpactioneditor.h		\
+	gimpactionfactory.c		\
+	gimpactionfactory.h		\
+	gimpactiongroup.c		\
+	gimpactiongroup.h		\
+	gimpactionimpl.c		\
+	gimpactionimpl.h		\
+	gimpactionview.c		\
+	gimpactionview.h		\
+	gimpblobeditor.c		\
+	gimpblobeditor.h		\
+	gimpbrusheditor.c		\
+	gimpbrusheditor.h		\
+	gimpbrushfactoryview.c		\
+	gimpbrushfactoryview.h		\
+	gimpbrushselect.c		\
+	gimpbrushselect.h		\
+	gimpbuffersourcebox.c		\
+	gimpbuffersourcebox.h		\
+	gimpbufferview.c		\
+	gimpbufferview.h		\
+	gimpcairo-wilber.c		\
+	gimpcairo-wilber.h		\
+	gimpcellrendererbutton.c	\
+	gimpcellrendererbutton.h	\
+	gimpcellrendererdashes.c	\
+	gimpcellrendererdashes.h	\
+	gimpcellrendererviewable.c	\
+	gimpcellrendererviewable.h	\
+	gimpcircle.c			\
+	gimpcircle.h			\
+	gimpchanneltreeview.c		\
+	gimpchanneltreeview.h		\
+	gimpclipboard.c			\
+	gimpclipboard.h			\
+	gimpcolorbar.c			\
+	gimpcolorbar.h			\
+	gimpcolordialog.c		\
+	gimpcolordialog.h		\
+	gimpcolordisplayeditor.c	\
+	gimpcolordisplayeditor.h	\
+	gimpcoloreditor.c		\
+	gimpcoloreditor.h		\
+	gimpcolorframe.c		\
+	gimpcolorframe.h		\
+	gimpcolorhistory.c		\
+	gimpcolorhistory.h		\
+	gimpcolormapeditor.c		\
+	gimpcolormapeditor.h		\
+	gimpcolorpanel.c		\
+	gimpcolorpanel.h		\
+	gimpcolorselectorpalette.c	\
+	gimpcolorselectorpalette.h	\
+	gimpcombotagentry.c		\
+	gimpcombotagentry.h		\
+	gimpcomponenteditor.c		\
+	gimpcomponenteditor.h		\
+	gimpcompressioncombobox.c	\
+	gimpcompressioncombobox.h	\
+	gimpcontainerbox.c		\
+	gimpcontainerbox.h		\
+	gimpcontainercombobox.c		\
+	gimpcontainercombobox.h		\
+	gimpcontainereditor.c		\
+	gimpcontainereditor.h		\
+	gimpcontainerentry.c		\
+	gimpcontainerentry.h		\
+	gimpcontainergridview.c		\
+	gimpcontainergridview.h		\
+	gimpcontainericonview.c		\
+	gimpcontainericonview.h		\
+	gimpcontainerpopup.c		\
+	gimpcontainerpopup.h		\
+	gimpcontainertreestore.c	\
+	gimpcontainertreestore.h	\
+	gimpcontainertreeview.c		\
+	gimpcontainertreeview.h		\
+	gimpcontainertreeview-dnd.c	\
+	gimpcontainertreeview-dnd.h	\
+	gimpcontainertreeview-private.h	\
+	gimpcontainerview.c		\
+	gimpcontainerview.h		\
+	gimpcontainerview-utils.c	\
+	gimpcontainerview-utils.h	\
+	gimpcontrollereditor.c		\
+	gimpcontrollereditor.h		\
+	gimpcontrollerinfo.c		\
+	gimpcontrollerinfo.h		\
+	gimpcontrollerlist.c		\
+	gimpcontrollerlist.h		\
+	gimpcontrollers.c		\
+	gimpcontrollers.h		\
+	gimpcontrollerkeyboard.c	\
+	gimpcontrollerkeyboard.h	\
+	gimpcontrollermouse.c		\
+	gimpcontrollermouse.h		\
+	gimpcontrollerwheel.c		\
+	gimpcontrollerwheel.h		\
+	gimpcriticaldialog.c		\
+	gimpcriticaldialog.h		\
+	gimpcursor.c			\
+	gimpcursor.h			\
+	gimpcurveview.c			\
+	gimpcurveview.h			\
+	gimpdashboard.c			\
+	gimpdashboard.h			\
+	gimpdasheditor.c		\
+	gimpdasheditor.h		\
+	gimpdataeditor.c		\
+	gimpdataeditor.h		\
+	gimpdatafactoryview.c		\
+	gimpdatafactoryview.h		\
+	gimpdeviceeditor.c		\
+	gimpdeviceeditor.h		\
+	gimpdeviceinfo.c		\
+	gimpdeviceinfo.h		\
+	gimpdeviceinfo-coords.c		\
+	gimpdeviceinfo-coords.h		\
+	gimpdeviceinfoeditor.c		\
+	gimpdeviceinfoeditor.h		\
+	gimpdevicemanager.c		\
+	gimpdevicemanager.h		\
+	gimpdevices.c			\
+	gimpdevices.h			\
+	gimpdevicestatus.c		\
+	gimpdevicestatus.h		\
+	gimpdial.c			\
+	gimpdial.h			\
+	gimpdialogfactory.c		\
+	gimpdialogfactory.h		\
+	gimpdnd.c			\
+	gimpdnd.h			\
+	gimpdnd-xds.c			\
+	gimpdnd-xds.h			\
+	gimpdock.c			\
+	gimpdock.h			\
+	gimpdockcolumns.c		\
+	gimpdockcolumns.h		\
+	gimpdockable.c			\
+	gimpdockable.h			\
+	gimpdockbook.c			\
+	gimpdockbook.h			\
+	gimpdockcontainer.c		\
+	gimpdockcontainer.h		\
+	gimpdocked.c			\
+	gimpdocked.h			\
+	gimpdockwindow.c		\
+	gimpdockwindow.h		\
+	gimpdocumentview.c		\
+	gimpdocumentview.h		\
+	gimpdrawabletreeview.c		\
+	gimpdrawabletreeview.h		\
+	gimpdynamicseditor.c		\
+	gimpdynamicseditor.h		\
+	gimpdynamicsfactoryview.c	\
+	gimpdynamicsfactoryview.h	\
+	gimpdynamicsoutputeditor.c	\
+	gimpdynamicsoutputeditor.h	\
+	gimpeditor.c			\
+	gimpeditor.h			\
+	gimpenumaction.c		\
+	gimpenumaction.h		\
+	gimperrorconsole.c		\
+	gimperrorconsole.h		\
+	gimperrordialog.c		\
+	gimperrordialog.h		\
+	gimpexportdialog.c		\
+	gimpexportdialog.h		\
+	gimpfgbgeditor.c		\
+	gimpfgbgeditor.h		\
+	gimpfgbgview.c			\
+	gimpfgbgview.h			\
+	gimpfiledialog.c		\
+	gimpfiledialog.h		\
+	gimpfileprocview.c		\
+	gimpfileprocview.h		\
+	gimpfilleditor.c		\
+	gimpfilleditor.h		\
+	gimpfontfactoryview.c		\
+	gimpfontfactoryview.h		\
+	gimpfontselect.c		\
+	gimpfontselect.h		\
+	gimpgradienteditor.c		\
+	gimpgradienteditor.h		\
+	gimpgradientselect.c		\
+	gimpgradientselect.h		\
+	gimpgrideditor.c		\
+	gimpgrideditor.h		\
+	gimphandlebar.c			\
+	gimphandlebar.h			\
+	gimphelp.c			\
+	gimphelp.h			\
+	gimphelp-ids.h			\
+	gimphighlightablebutton.c	\
+	gimphighlightablebutton.h	\
+	gimphistogrambox.c		\
+	gimphistogrambox.h		\
+	gimphistogrameditor.c		\
+	gimphistogrameditor.h		\
+	gimphistogramview.c		\
+	gimphistogramview.h		\
+	gimpiconpicker.c		\
+	gimpiconpicker.h		\
+	gimpiconsizescale.c		\
+	gimpiconsizescale.h		\
+	gimpimagecommenteditor.c	\
+	gimpimagecommenteditor.h	\
+	gimpimageeditor.c		\
+	gimpimageeditor.h		\
+	gimpimageparasiteview.c		\
+	gimpimageparasiteview.h		\
+	gimpimageprofileview.c		\
+	gimpimageprofileview.h		\
+	gimpimagepropview.c		\
+	gimpimagepropview.h		\
+	gimpimageview.c			\
+	gimpimageview.h			\
+	gimpitemtreeview.c		\
+	gimpitemtreeview.h		\
+	gimplanguagecombobox.c		\
+	gimplanguagecombobox.h		\
+	gimplanguageentry.c		\
+	gimplanguageentry.h		\
+	gimplanguagestore.c		\
+	gimplanguagestore.h		\
+	gimplanguagestore-parser.c	\
+	gimplanguagestore-parser.h	\
+	gimplayermodebox.c		\
+	gimplayermodebox.h		\
+	gimplayermodecombobox.c		\
+	gimplayermodecombobox.h		\
+	gimplayertreeview.c		\
+	gimplayertreeview.h		\
+	gimpmenudock.c			\
+	gimpmenudock.h			\
+	gimpmenufactory.c		\
+	gimpmenufactory.h		\
+	gimpmessagebox.c		\
+	gimpmessagebox.h		\
+	gimpmessagedialog.c		\
+	gimpmessagedialog.h		\
+	gimpmeter.c			\
+	gimpmeter.h			\
+	gimpnavigationview.c		\
+	gimpnavigationview.h		\
+	gimpopendialog.c		\
+	gimpopendialog.h		\
+	gimpoverlaybox.c		\
+	gimpoverlaybox.h		\
+	gimpoverlaychild.c		\
+	gimpoverlaychild.h		\
+	gimpoverlaydialog.c		\
+	gimpoverlaydialog.h		\
+	gimpoverlayframe.c		\
+	gimpoverlayframe.h		\
+	gimppaletteeditor.c		\
+	gimppaletteeditor.h		\
+	gimppaletteselect.c		\
+	gimppaletteselect.h		\
+	gimppaletteview.c		\
+	gimppaletteview.h		\
+	gimppanedbox.c			\
+	gimppanedbox.h			\
+	gimppatternfactoryview.c	\
+	gimppatternfactoryview.h	\
+	gimppatternselect.c		\
+	gimppatternselect.h		\
+	gimppdbdialog.c			\
+	gimppdbdialog.h			\
+	gimppickablebutton.c		\
+	gimppickablebutton.h		\
+	gimppickablepopup.c		\
+	gimppickablepopup.h		\
+	gimppivotselector.c		\
+	gimppivotselector.h		\
+	gimppixbuf.c			\
+	gimppixbuf.h			\
+	gimppluginview.c		\
+	gimppluginview.h		\
+	gimppolar.c			\
+	gimppolar.h			\
+	gimppopup.c			\
+	gimppopup.h			\
+	gimpprefsbox.c			\
+	gimpprefsbox.h			\
+	gimpprocedureaction.c		\
+	gimpprocedureaction.h		\
+	gimpprogressbox.c		\
+	gimpprogressbox.h		\
+	gimpprogressdialog.c		\
+	gimpprogressdialog.h		\
+	gimppropwidgets.c		\
+	gimppropwidgets.h		\
+	gimpradioaction.c		\
+	gimpradioaction.h		\
+	gimprender.c			\
+	gimprender.h			\
+	gimpsamplepointeditor.c		\
+	gimpsamplepointeditor.h		\
+	gimpsavedialog.c		\
+	gimpsavedialog.h		\
+	gimpscalebutton.c		\
+	gimpscalebutton.h		\
+	gimpsearchpopup.c		\
+	gimpsearchpopup.h		\
+	gimpselectiondata.c		\
+	gimpselectiondata.h		\
+	gimpselectioneditor.c		\
+	gimpselectioneditor.h		\
+	gimpsessioninfo.c		\
+	gimpsessioninfo.h		\
+	gimpsessioninfo-aux.c		\
+	gimpsessioninfo-aux.h		\
+	gimpsessioninfo-book.c		\
+	gimpsessioninfo-book.h		\
+	gimpsessioninfo-dock.c		\
+	gimpsessioninfo-dock.h		\
+	gimpsessioninfo-dockable.c	\
+	gimpsessioninfo-dockable.h	\
+	gimpsessioninfo-private.h	\
+	gimpsessionmanaged.c		\
+	gimpsessionmanaged.h		\
+	gimpsettingsbox.c		\
+	gimpsettingsbox.h		\
+	gimpsettingseditor.c		\
+	gimpsettingseditor.h		\
+	gimpsizebox.c			\
+	gimpsizebox.h			\
+	gimpspinscale.c			\
+	gimpspinscale.h			\
+	gimpstringaction.c		\
+	gimpstringaction.h		\
+	gimpstrokeeditor.c		\
+	gimpstrokeeditor.h		\
+	gimpsymmetryeditor.c		\
+	gimpsymmetryeditor.h		\
+	gimptagentry.c			\
+	gimptagentry.h			\
+	gimptagpopup.c			\
+	gimptagpopup.h			\
+	gimptemplateeditor.c		\
+	gimptemplateeditor.h		\
+	gimptemplateview.c		\
+	gimptemplateview.h		\
+	gimptextbuffer.c		\
+	gimptextbuffer.h		\
+	gimptextbuffer-serialize.c	\
+	gimptextbuffer-serialize.h	\
+	gimptexteditor.c		\
+	gimptexteditor.h		\
+	gimptextproxy.c			\
+	gimptextproxy.h			\
+	gimptextstyleeditor.c		\
+	gimptextstyleeditor.h		\
+	gimptexttag.c			\
+	gimptexttag.h			\
+	gimpthumbbox.c			\
+	gimpthumbbox.h			\
+	gimptoggleaction.c		\
+	gimptoggleaction.h		\
+	gimptoolbox.c			\
+	gimptoolbox.h			\
+	gimptoolbox-color-area.c	\
+	gimptoolbox-color-area.h	\
+	gimptoolbox-dnd.c		\
+	gimptoolbox-dnd.h		\
+	gimptoolbox-image-area.c	\
+	gimptoolbox-image-area.h	\
+	gimptoolbox-indicator-area.c	\
+	gimptoolbox-indicator-area.h	\
+        gimptoolbutton.c                \
+        gimptoolbutton.h                \
+	gimptooleditor.c		\
+	gimptooleditor.h		\
+	gimptooloptionseditor.c		\
+	gimptooloptionseditor.h		\
+	gimptoolpalette.c		\
+	gimptoolpalette.h		\
+	gimptoolpreseteditor.c		\
+	gimptoolpreseteditor.h		\
+	gimptoolpresetfactoryview.c	\
+	gimptoolpresetfactoryview.h	\
+	gimptranslationstore.c		\
+	gimptranslationstore.h		\
+	gimpuimanager.c			\
+	gimpuimanager.h			\
+	gimpundoeditor.c		\
+	gimpundoeditor.h		\
+	gimpvectorstreeview.c		\
+	gimpvectorstreeview.h		\
+	gimpview.c			\
+	gimpview.h			\
+	gimpview-popup.c		\
+	gimpview-popup.h		\
+	gimpviewablebox.c		\
+	gimpviewablebox.h		\
+	gimpviewablebutton.c		\
+	gimpviewablebutton.h		\
+	gimpviewabledialog.c		\
+	gimpviewabledialog.h		\
+	gimpviewrenderer.c		\
+	gimpviewrenderer.h		\
+	gimpviewrenderer-frame.c	\
+	gimpviewrenderer-frame.h	\
+	gimpviewrenderer-utils.c	\
+	gimpviewrenderer-utils.h	\
+	gimpviewrendererbrush.c		\
+	gimpviewrendererbrush.h		\
+	gimpviewrendererbuffer.c	\
+	gimpviewrendererbuffer.h	\
+	gimpviewrendererdrawable.c	\
+	gimpviewrendererdrawable.h	\
+	gimpviewrenderergradient.c	\
+	gimpviewrenderergradient.h	\
+	gimpviewrendererimage.c 	\
+	gimpviewrendererimage.h 	\
+	gimpviewrendererimagefile.c	\
+	gimpviewrendererimagefile.h	\
+	gimpviewrendererlayer.c		\
+	gimpviewrendererlayer.h		\
+	gimpviewrendererpalette.c	\
+	gimpviewrendererpalette.h	\
+	gimpviewrenderervectors.c	\
+	gimpviewrenderervectors.h	\
+	gimpwidgets-constructors.c	\
+	gimpwidgets-constructors.h	\
+	gimpwidgets-utils.c		\
+	gimpwidgets-utils.h		\
+	gimpwindow.c			\
+	gimpwindow.h			\
+	gimpwindowstrategy.c		\
+	gimpwindowstrategy.h		\
+	gtkwrapbox.c			\
+	gtkwrapbox.h			\
+	gtkhwrapbox.c			\
+	gtkhwrapbox.h
+
+libappwidgets_a_built_sources = widgets-enums.c
+libappwidgets_a_SOURCES = \
+	$(libappwidgets_a_built_sources) $(libappwidgets_a_sources)
+
+
+#
+# rules to generate built sources
+#
+# setup autogeneration dependencies
+gen_sources = xgen-wec
+CLEANFILES = $(gen_sources)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/widgets/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/widgets/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappwidgets.a: $(libappwidgets_a_OBJECTS) $(libappwidgets_a_DEPENDENCIES) $(EXTRA_libappwidgets_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappwidgets.a
+	$(AM_V_AR)$(libappwidgets_a_AR) libappwidgets.a $(libappwidgets_a_OBJECTS) $(libappwidgets_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappwidgets.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpaccellabel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpaction-history.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpaction.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpactioneditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpactionfactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpactiongroup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpactionimpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpactionview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpblobeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrusheditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushfactoryview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbrushselect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbuffersourcebox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpbufferview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcairo-wilber.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcellrendererbutton.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcellrendererdashes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcellrendererviewable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpchanneltreeview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcircle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpclipboard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorbar.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolordialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolordisplayeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcoloreditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorframe.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorhistory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolormapeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorpanel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorselectorpalette.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcombotagentry.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcomponenteditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcompressioncombobox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainerbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainercombobox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainereditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainerentry.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainergridview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainericonview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainerpopup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainertreestore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainertreeview-dnd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainertreeview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainerview-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontainerview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollereditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollerinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollerkeyboard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollerlist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollermouse.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollers.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcontrollerwheel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcriticaldialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcursor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcurveview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdashboard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdasheditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdataeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdatafactoryview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdeviceeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdeviceinfo-coords.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdeviceinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdeviceinfoeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdevicemanager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdevices.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdevicestatus.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdial.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdialogfactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdnd-xds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdnd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdockable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdockbook.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdockcolumns.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdockcontainer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdocked.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdockwindow.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdocumentview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdrawabletreeview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamicseditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamicsfactoryview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpdynamicsoutputeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpenumaction.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimperrorconsole.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimperrordialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpexportdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfgbgeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfgbgview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfiledialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfileprocview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfilleditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfontfactoryview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpfontselect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradienteditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgradientselect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgrideditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphandlebar.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphelp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphighlightablebutton.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphistogrambox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphistogrameditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimphistogramview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpiconpicker.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpiconsizescale.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimagecommenteditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimageeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimageparasiteview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimageprofileview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimagepropview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpimageview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpitemtreeview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplanguagecombobox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplanguageentry.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplanguagestore-parser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplanguagestore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayermodebox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayermodecombobox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimplayertreeview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmenudock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmenufactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmessagebox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmessagedialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpmeter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpnavigationview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpopendialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoverlaybox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoverlaychild.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoverlaydialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpoverlayframe.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaletteeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaletteselect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppaletteview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppanedbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppatternfactoryview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppatternselect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppdbdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppickablebutton.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppickablepopup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppivotselector.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppixbuf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppluginview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppolar.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppopup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprefsbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprocedureaction.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprogressbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpprogressdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimppropwidgets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpradioaction.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimprender.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsamplepointeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsavedialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpscalebutton.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsearchpopup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpselectiondata.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpselectioneditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsessioninfo-aux.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsessioninfo-book.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsessioninfo-dock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsessioninfo-dockable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsessioninfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsessionmanaged.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsettingsbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsettingseditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsizebox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpspinscale.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpstringaction.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpstrokeeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpsymmetryeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptagentry.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptagpopup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptemplateeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptemplateview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextbuffer-serialize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextbuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptexteditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextproxy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptextstyleeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptexttag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpthumbbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoggleaction.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolbox-color-area.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolbox-dnd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolbox-image-area.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolbox-indicator-area.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolbutton.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooleditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptooloptionseditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpalette.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpreseteditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptoolpresetfactoryview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimptranslationstore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpuimanager.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpundoeditor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpvectorstreeview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpview-popup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpview.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewablebox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewablebutton.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewabledialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrenderer-frame.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrenderer-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrenderer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererbrush.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererbuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererdrawable.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrenderergradient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererimage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererimagefile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererlayer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrendererpalette.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpviewrenderervectors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwidgets-constructors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwidgets-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwindow.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpwindowstrategy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkhwrapbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkwrapbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets-enums.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gimpaccellabel.Po
+	-rm -f ./$(DEPDIR)/gimpaction-history.Po
+	-rm -f ./$(DEPDIR)/gimpaction.Po
+	-rm -f ./$(DEPDIR)/gimpactioneditor.Po
+	-rm -f ./$(DEPDIR)/gimpactionfactory.Po
+	-rm -f ./$(DEPDIR)/gimpactiongroup.Po
+	-rm -f ./$(DEPDIR)/gimpactionimpl.Po
+	-rm -f ./$(DEPDIR)/gimpactionview.Po
+	-rm -f ./$(DEPDIR)/gimpblobeditor.Po
+	-rm -f ./$(DEPDIR)/gimpbrusheditor.Po
+	-rm -f ./$(DEPDIR)/gimpbrushfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpbrushselect.Po
+	-rm -f ./$(DEPDIR)/gimpbuffersourcebox.Po
+	-rm -f ./$(DEPDIR)/gimpbufferview.Po
+	-rm -f ./$(DEPDIR)/gimpcairo-wilber.Po
+	-rm -f ./$(DEPDIR)/gimpcellrendererbutton.Po
+	-rm -f ./$(DEPDIR)/gimpcellrendererdashes.Po
+	-rm -f ./$(DEPDIR)/gimpcellrendererviewable.Po
+	-rm -f ./$(DEPDIR)/gimpchanneltreeview.Po
+	-rm -f ./$(DEPDIR)/gimpcircle.Po
+	-rm -f ./$(DEPDIR)/gimpclipboard.Po
+	-rm -f ./$(DEPDIR)/gimpcolorbar.Po
+	-rm -f ./$(DEPDIR)/gimpcolordialog.Po
+	-rm -f ./$(DEPDIR)/gimpcolordisplayeditor.Po
+	-rm -f ./$(DEPDIR)/gimpcoloreditor.Po
+	-rm -f ./$(DEPDIR)/gimpcolorframe.Po
+	-rm -f ./$(DEPDIR)/gimpcolorhistory.Po
+	-rm -f ./$(DEPDIR)/gimpcolormapeditor.Po
+	-rm -f ./$(DEPDIR)/gimpcolorpanel.Po
+	-rm -f ./$(DEPDIR)/gimpcolorselectorpalette.Po
+	-rm -f ./$(DEPDIR)/gimpcombotagentry.Po
+	-rm -f ./$(DEPDIR)/gimpcomponenteditor.Po
+	-rm -f ./$(DEPDIR)/gimpcompressioncombobox.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerbox.Po
+	-rm -f ./$(DEPDIR)/gimpcontainercombobox.Po
+	-rm -f ./$(DEPDIR)/gimpcontainereditor.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerentry.Po
+	-rm -f ./$(DEPDIR)/gimpcontainergridview.Po
+	-rm -f ./$(DEPDIR)/gimpcontainericonview.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerpopup.Po
+	-rm -f ./$(DEPDIR)/gimpcontainertreestore.Po
+	-rm -f ./$(DEPDIR)/gimpcontainertreeview-dnd.Po
+	-rm -f ./$(DEPDIR)/gimpcontainertreeview.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerview-utils.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerview.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollereditor.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerinfo.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerkeyboard.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerlist.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollermouse.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollers.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerwheel.Po
+	-rm -f ./$(DEPDIR)/gimpcriticaldialog.Po
+	-rm -f ./$(DEPDIR)/gimpcursor.Po
+	-rm -f ./$(DEPDIR)/gimpcurveview.Po
+	-rm -f ./$(DEPDIR)/gimpdashboard.Po
+	-rm -f ./$(DEPDIR)/gimpdasheditor.Po
+	-rm -f ./$(DEPDIR)/gimpdataeditor.Po
+	-rm -f ./$(DEPDIR)/gimpdatafactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceeditor.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceinfo-coords.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceinfo.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceinfoeditor.Po
+	-rm -f ./$(DEPDIR)/gimpdevicemanager.Po
+	-rm -f ./$(DEPDIR)/gimpdevices.Po
+	-rm -f ./$(DEPDIR)/gimpdevicestatus.Po
+	-rm -f ./$(DEPDIR)/gimpdial.Po
+	-rm -f ./$(DEPDIR)/gimpdialogfactory.Po
+	-rm -f ./$(DEPDIR)/gimpdnd-xds.Po
+	-rm -f ./$(DEPDIR)/gimpdnd.Po
+	-rm -f ./$(DEPDIR)/gimpdock.Po
+	-rm -f ./$(DEPDIR)/gimpdockable.Po
+	-rm -f ./$(DEPDIR)/gimpdockbook.Po
+	-rm -f ./$(DEPDIR)/gimpdockcolumns.Po
+	-rm -f ./$(DEPDIR)/gimpdockcontainer.Po
+	-rm -f ./$(DEPDIR)/gimpdocked.Po
+	-rm -f ./$(DEPDIR)/gimpdockwindow.Po
+	-rm -f ./$(DEPDIR)/gimpdocumentview.Po
+	-rm -f ./$(DEPDIR)/gimpdrawabletreeview.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicseditor.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicsfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicsoutputeditor.Po
+	-rm -f ./$(DEPDIR)/gimpeditor.Po
+	-rm -f ./$(DEPDIR)/gimpenumaction.Po
+	-rm -f ./$(DEPDIR)/gimperrorconsole.Po
+	-rm -f ./$(DEPDIR)/gimperrordialog.Po
+	-rm -f ./$(DEPDIR)/gimpexportdialog.Po
+	-rm -f ./$(DEPDIR)/gimpfgbgeditor.Po
+	-rm -f ./$(DEPDIR)/gimpfgbgview.Po
+	-rm -f ./$(DEPDIR)/gimpfiledialog.Po
+	-rm -f ./$(DEPDIR)/gimpfileprocview.Po
+	-rm -f ./$(DEPDIR)/gimpfilleditor.Po
+	-rm -f ./$(DEPDIR)/gimpfontfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpfontselect.Po
+	-rm -f ./$(DEPDIR)/gimpgradienteditor.Po
+	-rm -f ./$(DEPDIR)/gimpgradientselect.Po
+	-rm -f ./$(DEPDIR)/gimpgrideditor.Po
+	-rm -f ./$(DEPDIR)/gimphandlebar.Po
+	-rm -f ./$(DEPDIR)/gimphelp.Po
+	-rm -f ./$(DEPDIR)/gimphighlightablebutton.Po
+	-rm -f ./$(DEPDIR)/gimphistogrambox.Po
+	-rm -f ./$(DEPDIR)/gimphistogrameditor.Po
+	-rm -f ./$(DEPDIR)/gimphistogramview.Po
+	-rm -f ./$(DEPDIR)/gimpiconpicker.Po
+	-rm -f ./$(DEPDIR)/gimpiconsizescale.Po
+	-rm -f ./$(DEPDIR)/gimpimagecommenteditor.Po
+	-rm -f ./$(DEPDIR)/gimpimageeditor.Po
+	-rm -f ./$(DEPDIR)/gimpimageparasiteview.Po
+	-rm -f ./$(DEPDIR)/gimpimageprofileview.Po
+	-rm -f ./$(DEPDIR)/gimpimagepropview.Po
+	-rm -f ./$(DEPDIR)/gimpimageview.Po
+	-rm -f ./$(DEPDIR)/gimpitemtreeview.Po
+	-rm -f ./$(DEPDIR)/gimplanguagecombobox.Po
+	-rm -f ./$(DEPDIR)/gimplanguageentry.Po
+	-rm -f ./$(DEPDIR)/gimplanguagestore-parser.Po
+	-rm -f ./$(DEPDIR)/gimplanguagestore.Po
+	-rm -f ./$(DEPDIR)/gimplayermodebox.Po
+	-rm -f ./$(DEPDIR)/gimplayermodecombobox.Po
+	-rm -f ./$(DEPDIR)/gimplayertreeview.Po
+	-rm -f ./$(DEPDIR)/gimpmenudock.Po
+	-rm -f ./$(DEPDIR)/gimpmenufactory.Po
+	-rm -f ./$(DEPDIR)/gimpmessagebox.Po
+	-rm -f ./$(DEPDIR)/gimpmessagedialog.Po
+	-rm -f ./$(DEPDIR)/gimpmeter.Po
+	-rm -f ./$(DEPDIR)/gimpnavigationview.Po
+	-rm -f ./$(DEPDIR)/gimpopendialog.Po
+	-rm -f ./$(DEPDIR)/gimpoverlaybox.Po
+	-rm -f ./$(DEPDIR)/gimpoverlaychild.Po
+	-rm -f ./$(DEPDIR)/gimpoverlaydialog.Po
+	-rm -f ./$(DEPDIR)/gimpoverlayframe.Po
+	-rm -f ./$(DEPDIR)/gimppaletteeditor.Po
+	-rm -f ./$(DEPDIR)/gimppaletteselect.Po
+	-rm -f ./$(DEPDIR)/gimppaletteview.Po
+	-rm -f ./$(DEPDIR)/gimppanedbox.Po
+	-rm -f ./$(DEPDIR)/gimppatternfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimppatternselect.Po
+	-rm -f ./$(DEPDIR)/gimppdbdialog.Po
+	-rm -f ./$(DEPDIR)/gimppickablebutton.Po
+	-rm -f ./$(DEPDIR)/gimppickablepopup.Po
+	-rm -f ./$(DEPDIR)/gimppivotselector.Po
+	-rm -f ./$(DEPDIR)/gimppixbuf.Po
+	-rm -f ./$(DEPDIR)/gimppluginview.Po
+	-rm -f ./$(DEPDIR)/gimppolar.Po
+	-rm -f ./$(DEPDIR)/gimppopup.Po
+	-rm -f ./$(DEPDIR)/gimpprefsbox.Po
+	-rm -f ./$(DEPDIR)/gimpprocedureaction.Po
+	-rm -f ./$(DEPDIR)/gimpprogressbox.Po
+	-rm -f ./$(DEPDIR)/gimpprogressdialog.Po
+	-rm -f ./$(DEPDIR)/gimppropwidgets.Po
+	-rm -f ./$(DEPDIR)/gimpradioaction.Po
+	-rm -f ./$(DEPDIR)/gimprender.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepointeditor.Po
+	-rm -f ./$(DEPDIR)/gimpsavedialog.Po
+	-rm -f ./$(DEPDIR)/gimpscalebutton.Po
+	-rm -f ./$(DEPDIR)/gimpsearchpopup.Po
+	-rm -f ./$(DEPDIR)/gimpselectiondata.Po
+	-rm -f ./$(DEPDIR)/gimpselectioneditor.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-aux.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-book.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-dock.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-dockable.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo.Po
+	-rm -f ./$(DEPDIR)/gimpsessionmanaged.Po
+	-rm -f ./$(DEPDIR)/gimpsettingsbox.Po
+	-rm -f ./$(DEPDIR)/gimpsettingseditor.Po
+	-rm -f ./$(DEPDIR)/gimpsizebox.Po
+	-rm -f ./$(DEPDIR)/gimpspinscale.Po
+	-rm -f ./$(DEPDIR)/gimpstringaction.Po
+	-rm -f ./$(DEPDIR)/gimpstrokeeditor.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetryeditor.Po
+	-rm -f ./$(DEPDIR)/gimptagentry.Po
+	-rm -f ./$(DEPDIR)/gimptagpopup.Po
+	-rm -f ./$(DEPDIR)/gimptemplateeditor.Po
+	-rm -f ./$(DEPDIR)/gimptemplateview.Po
+	-rm -f ./$(DEPDIR)/gimptextbuffer-serialize.Po
+	-rm -f ./$(DEPDIR)/gimptextbuffer.Po
+	-rm -f ./$(DEPDIR)/gimptexteditor.Po
+	-rm -f ./$(DEPDIR)/gimptextproxy.Po
+	-rm -f ./$(DEPDIR)/gimptextstyleeditor.Po
+	-rm -f ./$(DEPDIR)/gimptexttag.Po
+	-rm -f ./$(DEPDIR)/gimpthumbbox.Po
+	-rm -f ./$(DEPDIR)/gimptoggleaction.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-color-area.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-dnd.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-image-area.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-indicator-area.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox.Po
+	-rm -f ./$(DEPDIR)/gimptoolbutton.Po
+	-rm -f ./$(DEPDIR)/gimptooleditor.Po
+	-rm -f ./$(DEPDIR)/gimptooloptionseditor.Po
+	-rm -f ./$(DEPDIR)/gimptoolpalette.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreseteditor.Po
+	-rm -f ./$(DEPDIR)/gimptoolpresetfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimptranslationstore.Po
+	-rm -f ./$(DEPDIR)/gimpuimanager.Po
+	-rm -f ./$(DEPDIR)/gimpundoeditor.Po
+	-rm -f ./$(DEPDIR)/gimpvectorstreeview.Po
+	-rm -f ./$(DEPDIR)/gimpview-popup.Po
+	-rm -f ./$(DEPDIR)/gimpview.Po
+	-rm -f ./$(DEPDIR)/gimpviewablebox.Po
+	-rm -f ./$(DEPDIR)/gimpviewablebutton.Po
+	-rm -f ./$(DEPDIR)/gimpviewabledialog.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderer-frame.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderer-utils.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderer.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererbrush.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererbuffer.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererdrawable.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderergradient.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererimage.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererimagefile.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererlayer.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererpalette.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderervectors.Po
+	-rm -f ./$(DEPDIR)/gimpwidgets-constructors.Po
+	-rm -f ./$(DEPDIR)/gimpwidgets-utils.Po
+	-rm -f ./$(DEPDIR)/gimpwindow.Po
+	-rm -f ./$(DEPDIR)/gimpwindowstrategy.Po
+	-rm -f ./$(DEPDIR)/gtkhwrapbox.Po
+	-rm -f ./$(DEPDIR)/gtkwrapbox.Po
+	-rm -f ./$(DEPDIR)/widgets-enums.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gimpaccellabel.Po
+	-rm -f ./$(DEPDIR)/gimpaction-history.Po
+	-rm -f ./$(DEPDIR)/gimpaction.Po
+	-rm -f ./$(DEPDIR)/gimpactioneditor.Po
+	-rm -f ./$(DEPDIR)/gimpactionfactory.Po
+	-rm -f ./$(DEPDIR)/gimpactiongroup.Po
+	-rm -f ./$(DEPDIR)/gimpactionimpl.Po
+	-rm -f ./$(DEPDIR)/gimpactionview.Po
+	-rm -f ./$(DEPDIR)/gimpblobeditor.Po
+	-rm -f ./$(DEPDIR)/gimpbrusheditor.Po
+	-rm -f ./$(DEPDIR)/gimpbrushfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpbrushselect.Po
+	-rm -f ./$(DEPDIR)/gimpbuffersourcebox.Po
+	-rm -f ./$(DEPDIR)/gimpbufferview.Po
+	-rm -f ./$(DEPDIR)/gimpcairo-wilber.Po
+	-rm -f ./$(DEPDIR)/gimpcellrendererbutton.Po
+	-rm -f ./$(DEPDIR)/gimpcellrendererdashes.Po
+	-rm -f ./$(DEPDIR)/gimpcellrendererviewable.Po
+	-rm -f ./$(DEPDIR)/gimpchanneltreeview.Po
+	-rm -f ./$(DEPDIR)/gimpcircle.Po
+	-rm -f ./$(DEPDIR)/gimpclipboard.Po
+	-rm -f ./$(DEPDIR)/gimpcolorbar.Po
+	-rm -f ./$(DEPDIR)/gimpcolordialog.Po
+	-rm -f ./$(DEPDIR)/gimpcolordisplayeditor.Po
+	-rm -f ./$(DEPDIR)/gimpcoloreditor.Po
+	-rm -f ./$(DEPDIR)/gimpcolorframe.Po
+	-rm -f ./$(DEPDIR)/gimpcolorhistory.Po
+	-rm -f ./$(DEPDIR)/gimpcolormapeditor.Po
+	-rm -f ./$(DEPDIR)/gimpcolorpanel.Po
+	-rm -f ./$(DEPDIR)/gimpcolorselectorpalette.Po
+	-rm -f ./$(DEPDIR)/gimpcombotagentry.Po
+	-rm -f ./$(DEPDIR)/gimpcomponenteditor.Po
+	-rm -f ./$(DEPDIR)/gimpcompressioncombobox.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerbox.Po
+	-rm -f ./$(DEPDIR)/gimpcontainercombobox.Po
+	-rm -f ./$(DEPDIR)/gimpcontainereditor.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerentry.Po
+	-rm -f ./$(DEPDIR)/gimpcontainergridview.Po
+	-rm -f ./$(DEPDIR)/gimpcontainericonview.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerpopup.Po
+	-rm -f ./$(DEPDIR)/gimpcontainertreestore.Po
+	-rm -f ./$(DEPDIR)/gimpcontainertreeview-dnd.Po
+	-rm -f ./$(DEPDIR)/gimpcontainertreeview.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerview-utils.Po
+	-rm -f ./$(DEPDIR)/gimpcontainerview.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollereditor.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerinfo.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerkeyboard.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerlist.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollermouse.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollers.Po
+	-rm -f ./$(DEPDIR)/gimpcontrollerwheel.Po
+	-rm -f ./$(DEPDIR)/gimpcriticaldialog.Po
+	-rm -f ./$(DEPDIR)/gimpcursor.Po
+	-rm -f ./$(DEPDIR)/gimpcurveview.Po
+	-rm -f ./$(DEPDIR)/gimpdashboard.Po
+	-rm -f ./$(DEPDIR)/gimpdasheditor.Po
+	-rm -f ./$(DEPDIR)/gimpdataeditor.Po
+	-rm -f ./$(DEPDIR)/gimpdatafactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceeditor.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceinfo-coords.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceinfo.Po
+	-rm -f ./$(DEPDIR)/gimpdeviceinfoeditor.Po
+	-rm -f ./$(DEPDIR)/gimpdevicemanager.Po
+	-rm -f ./$(DEPDIR)/gimpdevices.Po
+	-rm -f ./$(DEPDIR)/gimpdevicestatus.Po
+	-rm -f ./$(DEPDIR)/gimpdial.Po
+	-rm -f ./$(DEPDIR)/gimpdialogfactory.Po
+	-rm -f ./$(DEPDIR)/gimpdnd-xds.Po
+	-rm -f ./$(DEPDIR)/gimpdnd.Po
+	-rm -f ./$(DEPDIR)/gimpdock.Po
+	-rm -f ./$(DEPDIR)/gimpdockable.Po
+	-rm -f ./$(DEPDIR)/gimpdockbook.Po
+	-rm -f ./$(DEPDIR)/gimpdockcolumns.Po
+	-rm -f ./$(DEPDIR)/gimpdockcontainer.Po
+	-rm -f ./$(DEPDIR)/gimpdocked.Po
+	-rm -f ./$(DEPDIR)/gimpdockwindow.Po
+	-rm -f ./$(DEPDIR)/gimpdocumentview.Po
+	-rm -f ./$(DEPDIR)/gimpdrawabletreeview.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicseditor.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicsfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpdynamicsoutputeditor.Po
+	-rm -f ./$(DEPDIR)/gimpeditor.Po
+	-rm -f ./$(DEPDIR)/gimpenumaction.Po
+	-rm -f ./$(DEPDIR)/gimperrorconsole.Po
+	-rm -f ./$(DEPDIR)/gimperrordialog.Po
+	-rm -f ./$(DEPDIR)/gimpexportdialog.Po
+	-rm -f ./$(DEPDIR)/gimpfgbgeditor.Po
+	-rm -f ./$(DEPDIR)/gimpfgbgview.Po
+	-rm -f ./$(DEPDIR)/gimpfiledialog.Po
+	-rm -f ./$(DEPDIR)/gimpfileprocview.Po
+	-rm -f ./$(DEPDIR)/gimpfilleditor.Po
+	-rm -f ./$(DEPDIR)/gimpfontfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimpfontselect.Po
+	-rm -f ./$(DEPDIR)/gimpgradienteditor.Po
+	-rm -f ./$(DEPDIR)/gimpgradientselect.Po
+	-rm -f ./$(DEPDIR)/gimpgrideditor.Po
+	-rm -f ./$(DEPDIR)/gimphandlebar.Po
+	-rm -f ./$(DEPDIR)/gimphelp.Po
+	-rm -f ./$(DEPDIR)/gimphighlightablebutton.Po
+	-rm -f ./$(DEPDIR)/gimphistogrambox.Po
+	-rm -f ./$(DEPDIR)/gimphistogrameditor.Po
+	-rm -f ./$(DEPDIR)/gimphistogramview.Po
+	-rm -f ./$(DEPDIR)/gimpiconpicker.Po
+	-rm -f ./$(DEPDIR)/gimpiconsizescale.Po
+	-rm -f ./$(DEPDIR)/gimpimagecommenteditor.Po
+	-rm -f ./$(DEPDIR)/gimpimageeditor.Po
+	-rm -f ./$(DEPDIR)/gimpimageparasiteview.Po
+	-rm -f ./$(DEPDIR)/gimpimageprofileview.Po
+	-rm -f ./$(DEPDIR)/gimpimagepropview.Po
+	-rm -f ./$(DEPDIR)/gimpimageview.Po
+	-rm -f ./$(DEPDIR)/gimpitemtreeview.Po
+	-rm -f ./$(DEPDIR)/gimplanguagecombobox.Po
+	-rm -f ./$(DEPDIR)/gimplanguageentry.Po
+	-rm -f ./$(DEPDIR)/gimplanguagestore-parser.Po
+	-rm -f ./$(DEPDIR)/gimplanguagestore.Po
+	-rm -f ./$(DEPDIR)/gimplayermodebox.Po
+	-rm -f ./$(DEPDIR)/gimplayermodecombobox.Po
+	-rm -f ./$(DEPDIR)/gimplayertreeview.Po
+	-rm -f ./$(DEPDIR)/gimpmenudock.Po
+	-rm -f ./$(DEPDIR)/gimpmenufactory.Po
+	-rm -f ./$(DEPDIR)/gimpmessagebox.Po
+	-rm -f ./$(DEPDIR)/gimpmessagedialog.Po
+	-rm -f ./$(DEPDIR)/gimpmeter.Po
+	-rm -f ./$(DEPDIR)/gimpnavigationview.Po
+	-rm -f ./$(DEPDIR)/gimpopendialog.Po
+	-rm -f ./$(DEPDIR)/gimpoverlaybox.Po
+	-rm -f ./$(DEPDIR)/gimpoverlaychild.Po
+	-rm -f ./$(DEPDIR)/gimpoverlaydialog.Po
+	-rm -f ./$(DEPDIR)/gimpoverlayframe.Po
+	-rm -f ./$(DEPDIR)/gimppaletteeditor.Po
+	-rm -f ./$(DEPDIR)/gimppaletteselect.Po
+	-rm -f ./$(DEPDIR)/gimppaletteview.Po
+	-rm -f ./$(DEPDIR)/gimppanedbox.Po
+	-rm -f ./$(DEPDIR)/gimppatternfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimppatternselect.Po
+	-rm -f ./$(DEPDIR)/gimppdbdialog.Po
+	-rm -f ./$(DEPDIR)/gimppickablebutton.Po
+	-rm -f ./$(DEPDIR)/gimppickablepopup.Po
+	-rm -f ./$(DEPDIR)/gimppivotselector.Po
+	-rm -f ./$(DEPDIR)/gimppixbuf.Po
+	-rm -f ./$(DEPDIR)/gimppluginview.Po
+	-rm -f ./$(DEPDIR)/gimppolar.Po
+	-rm -f ./$(DEPDIR)/gimppopup.Po
+	-rm -f ./$(DEPDIR)/gimpprefsbox.Po
+	-rm -f ./$(DEPDIR)/gimpprocedureaction.Po
+	-rm -f ./$(DEPDIR)/gimpprogressbox.Po
+	-rm -f ./$(DEPDIR)/gimpprogressdialog.Po
+	-rm -f ./$(DEPDIR)/gimppropwidgets.Po
+	-rm -f ./$(DEPDIR)/gimpradioaction.Po
+	-rm -f ./$(DEPDIR)/gimprender.Po
+	-rm -f ./$(DEPDIR)/gimpsamplepointeditor.Po
+	-rm -f ./$(DEPDIR)/gimpsavedialog.Po
+	-rm -f ./$(DEPDIR)/gimpscalebutton.Po
+	-rm -f ./$(DEPDIR)/gimpsearchpopup.Po
+	-rm -f ./$(DEPDIR)/gimpselectiondata.Po
+	-rm -f ./$(DEPDIR)/gimpselectioneditor.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-aux.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-book.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-dock.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo-dockable.Po
+	-rm -f ./$(DEPDIR)/gimpsessioninfo.Po
+	-rm -f ./$(DEPDIR)/gimpsessionmanaged.Po
+	-rm -f ./$(DEPDIR)/gimpsettingsbox.Po
+	-rm -f ./$(DEPDIR)/gimpsettingseditor.Po
+	-rm -f ./$(DEPDIR)/gimpsizebox.Po
+	-rm -f ./$(DEPDIR)/gimpspinscale.Po
+	-rm -f ./$(DEPDIR)/gimpstringaction.Po
+	-rm -f ./$(DEPDIR)/gimpstrokeeditor.Po
+	-rm -f ./$(DEPDIR)/gimpsymmetryeditor.Po
+	-rm -f ./$(DEPDIR)/gimptagentry.Po
+	-rm -f ./$(DEPDIR)/gimptagpopup.Po
+	-rm -f ./$(DEPDIR)/gimptemplateeditor.Po
+	-rm -f ./$(DEPDIR)/gimptemplateview.Po
+	-rm -f ./$(DEPDIR)/gimptextbuffer-serialize.Po
+	-rm -f ./$(DEPDIR)/gimptextbuffer.Po
+	-rm -f ./$(DEPDIR)/gimptexteditor.Po
+	-rm -f ./$(DEPDIR)/gimptextproxy.Po
+	-rm -f ./$(DEPDIR)/gimptextstyleeditor.Po
+	-rm -f ./$(DEPDIR)/gimptexttag.Po
+	-rm -f ./$(DEPDIR)/gimpthumbbox.Po
+	-rm -f ./$(DEPDIR)/gimptoggleaction.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-color-area.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-dnd.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-image-area.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox-indicator-area.Po
+	-rm -f ./$(DEPDIR)/gimptoolbox.Po
+	-rm -f ./$(DEPDIR)/gimptoolbutton.Po
+	-rm -f ./$(DEPDIR)/gimptooleditor.Po
+	-rm -f ./$(DEPDIR)/gimptooloptionseditor.Po
+	-rm -f ./$(DEPDIR)/gimptoolpalette.Po
+	-rm -f ./$(DEPDIR)/gimptoolpreseteditor.Po
+	-rm -f ./$(DEPDIR)/gimptoolpresetfactoryview.Po
+	-rm -f ./$(DEPDIR)/gimptranslationstore.Po
+	-rm -f ./$(DEPDIR)/gimpuimanager.Po
+	-rm -f ./$(DEPDIR)/gimpundoeditor.Po
+	-rm -f ./$(DEPDIR)/gimpvectorstreeview.Po
+	-rm -f ./$(DEPDIR)/gimpview-popup.Po
+	-rm -f ./$(DEPDIR)/gimpview.Po
+	-rm -f ./$(DEPDIR)/gimpviewablebox.Po
+	-rm -f ./$(DEPDIR)/gimpviewablebutton.Po
+	-rm -f ./$(DEPDIR)/gimpviewabledialog.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderer-frame.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderer-utils.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderer.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererbrush.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererbuffer.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererdrawable.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderergradient.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererimage.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererimagefile.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererlayer.Po
+	-rm -f ./$(DEPDIR)/gimpviewrendererpalette.Po
+	-rm -f ./$(DEPDIR)/gimpviewrenderervectors.Po
+	-rm -f ./$(DEPDIR)/gimpwidgets-constructors.Po
+	-rm -f ./$(DEPDIR)/gimpwidgets-utils.Po
+	-rm -f ./$(DEPDIR)/gimpwindow.Po
+	-rm -f ./$(DEPDIR)/gimpwindowstrategy.Po
+	-rm -f ./$(DEPDIR)/gtkhwrapbox.Po
+	-rm -f ./$(DEPDIR)/gtkwrapbox.Po
+	-rm -f ./$(DEPDIR)/widgets-enums.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+xgen-wec: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS) Makefile.am
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
+		--fhead "#include \"config.h\"\n#include <gtk/gtk.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"widgets-enums.h\"\n#include \"gimp-intl.h\"" \
+		--fprod "\n/* enumerations from \"@basename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if ('@valueabbrev@' ne 'NULL')@\n    /* Translators: this is an abbreviated version of @valueudesc@.\n       Keep it short. */\n    { @VALUENAME@, @valueabbrev@, NULL },@endif@" \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+		$< > $@
+
+# copy the generated enum file back to the source directory only if it's
+# changed; otherwise, only update its timestamp, so that the recipe isn't
+# executed again on the next build, however, allow this to (harmlessly) fail,
+# to support building from a read-only source tree.
+$(srcdir)/widgets-enums.c: xgen-wec
+	$(AM_V_GEN) if ! cmp -s $< $@; then \
+		cp $< $@; \
+	else \
+		touch $@ 2> /dev/null \
+		|| true; \
+	fi
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/widgets/gimpaccellabel.c b/app/widgets/gimpaccellabel.c
new file mode 100644
index 0000000..cd97206
--- /dev/null
+++ b/app/widgets/gimpaccellabel.c
@@ -0,0 +1,285 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaccellabel.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "widgets-types.h"
+
+#include "gimpaction.h"
+#include "gimpaccellabel.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ACTION
+};
+
+
+struct _GimpAccelLabelPrivate
+{
+  GimpAction *action;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_accel_label_dispose       (GObject             *object);
+static void   gimp_accel_label_set_property  (GObject             *object,
+                                              guint                property_id,
+                                              const GValue        *value,
+                                              GParamSpec          *pspec);
+static void   gimp_accel_label_get_property  (GObject             *object,
+                                              guint                property_id,
+                                              GValue              *value,
+                                              GParamSpec          *pspec);
+
+static void   gimp_accel_label_accel_changed (GtkAccelGroup       *accel_group,
+                                              guint                keyval,
+                                              GdkModifierType      modifier,
+                                              GClosure            *accel_closure,
+                                              GimpAccelLabel      *accel_label);
+
+static void   gimp_accel_label_update        (GimpAccelLabel      *accel_label);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpAccelLabel, gimp_accel_label, GTK_TYPE_LABEL)
+
+#define parent_class gimp_accel_label_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_accel_label_class_init (GimpAccelLabelClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_accel_label_dispose;
+  object_class->get_property = gimp_accel_label_get_property;
+  object_class->set_property = gimp_accel_label_set_property;
+
+  g_object_class_install_property (object_class, PROP_ACTION,
+                                   g_param_spec_object ("action",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_ACTION,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_accel_label_init (GimpAccelLabel *accel_label)
+{
+  accel_label->priv = gimp_accel_label_get_instance_private (accel_label);
+}
+
+static void
+gimp_accel_label_dispose (GObject *object)
+{
+  GimpAccelLabel *accel_label = GIMP_ACCEL_LABEL (object);
+
+  gimp_accel_label_set_action (accel_label, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_accel_label_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpAccelLabel *accel_label = GIMP_ACCEL_LABEL (object);
+
+  switch (property_id)
+    {
+    case PROP_ACTION:
+      gimp_accel_label_set_action (accel_label, g_value_get_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_accel_label_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpAccelLabel *accel_label = GIMP_ACCEL_LABEL (object);
+
+  switch (property_id)
+    {
+    case PROP_ACTION:
+      g_value_set_object (value, accel_label->priv->action);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_accel_label_accel_changed (GtkAccelGroup   *accel_group,
+                                guint            keyval,
+                                GdkModifierType  modifier,
+                                GClosure        *accel_closure,
+                                GimpAccelLabel  *accel_label)
+{
+  if (accel_closure ==
+      gimp_action_get_accel_closure (accel_label->priv->action))
+    {
+      gimp_accel_label_update (accel_label);
+    }
+}
+
+static gboolean
+gimp_accel_label_update_accel_find_func (GtkAccelKey *key,
+                                         GClosure    *closure,
+                                         gpointer     data)
+{
+  return (GClosure *) data == closure;
+}
+
+static void
+gimp_accel_label_update (GimpAccelLabel *accel_label)
+{
+  GClosure      *accel_closure;
+  GtkAccelGroup *accel_group;
+  GtkAccelKey   *accel_key;
+
+  gtk_label_set_label (GTK_LABEL (accel_label), NULL);
+
+  if (! accel_label->priv->action)
+    return;
+
+  accel_closure = gimp_action_get_accel_closure (accel_label->priv->action);
+
+  if (! accel_closure)
+    return;
+
+  accel_group = gtk_accel_group_from_accel_closure (accel_closure);
+
+  if (! accel_group)
+    return;
+
+  accel_key = gtk_accel_group_find (accel_group,
+                                    gimp_accel_label_update_accel_find_func,
+                                    accel_closure);
+
+  if (accel_key            &&
+      accel_key->accel_key &&
+      (accel_key->accel_flags & GTK_ACCEL_VISIBLE))
+    {
+      gchar *label;
+
+      label = gtk_accelerator_get_label (accel_key->accel_key,
+                                         accel_key->accel_mods);
+
+      gtk_label_set_label (GTK_LABEL (accel_label), label);
+
+      g_free (label);
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_accel_label_new (GimpAction *action)
+{
+  g_return_val_if_fail (action == NULL || GIMP_IS_ACTION (action), NULL);
+
+  return g_object_new (GIMP_TYPE_ACCEL_LABEL,
+                       "action", action,
+                       NULL);
+}
+
+void
+gimp_accel_label_set_action (GimpAccelLabel *accel_label,
+                             GimpAction     *action)
+{
+  g_return_if_fail (GIMP_IS_ACCEL_LABEL (accel_label));
+  g_return_if_fail (action == NULL || GIMP_IS_ACTION (action));
+
+  if (action != accel_label->priv->action)
+    {
+      if (accel_label->priv->action)
+        {
+          GClosure *accel_closure;
+
+          accel_closure = gimp_action_get_accel_closure (
+            accel_label->priv->action);
+
+          if (accel_closure)
+            {
+              GtkAccelGroup *accel_group;
+
+              accel_group = gtk_accel_group_from_accel_closure (accel_closure);
+
+              g_signal_handlers_disconnect_by_func (
+                accel_group,
+                gimp_accel_label_accel_changed,
+                accel_label);
+            }
+        }
+
+      g_set_object (&accel_label->priv->action, action);
+
+      if (accel_label->priv->action)
+        {
+          GClosure *accel_closure;
+
+          accel_closure = gimp_action_get_accel_closure (
+            accel_label->priv->action);
+
+          if (accel_closure)
+            {
+              GtkAccelGroup *accel_group;
+
+              accel_group = gtk_accel_group_from_accel_closure (accel_closure);
+
+              g_signal_connect (accel_group, "accel-changed",
+                                G_CALLBACK (gimp_accel_label_accel_changed),
+                                accel_label);
+            }
+        }
+
+      gimp_accel_label_update (accel_label);
+
+      g_object_notify (G_OBJECT (accel_label), "action");
+    }
+}
+
+GimpAction *
+gimp_accel_label_get_action (GimpAccelLabel *accel_label)
+{
+  g_return_val_if_fail (GIMP_IS_ACCEL_LABEL (accel_label), NULL);
+
+  return accel_label->priv->action;
+}
diff --git a/app/widgets/gimpaccellabel.h b/app/widgets/gimpaccellabel.h
new file mode 100644
index 0000000..5438121
--- /dev/null
+++ b/app/widgets/gimpaccellabel.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaccellabel.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACCEL_LABEL_H__
+#define __GIMP_ACCEL_LABEL_H__
+
+
+#define GIMP_TYPE_ACCEL_LABEL            (gimp_accel_label_get_type ())
+#define GIMP_ACCEL_LABEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACCEL_LABEL, GimpAccelLabel))
+#define GIMP_ACCEL_LABEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACCEL_LABEL, GimpAccelLabelClass))
+#define GIMP_IS_ACCEL_LABEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_ACCEL_LABEL))
+#define GIMP_IS_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ACCEL_LABEL))
+#define GIMP_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ACCEL_LABEL, GimpAccelLabelClass))
+
+
+typedef struct _GimpAccelLabelPrivate GimpAccelLabelPrivate;
+typedef struct _GimpAccelLabelClass   GimpAccelLabelClass;
+
+struct _GimpAccelLabel
+{
+  GtkLabel               parent_instance;
+
+  GimpAccelLabelPrivate *priv;
+};
+
+struct _GimpAccelLabelClass
+{
+  GtkLabelClass  parent_class;
+};
+
+
+GType        gimp_accel_label_get_type   (void) G_GNUC_CONST;
+
+GtkWidget  * gimp_accel_label_new        (GimpAction     *action);
+
+void         gimp_accel_label_set_action (GimpAccelLabel *accel_label,
+                                          GimpAction     *action);
+GimpAction * gimp_accel_label_get_action (GimpAccelLabel *accel_label);
+
+
+#endif /* __GIMP_ACCEL_LABEL_H__ */
diff --git a/app/widgets/gimpaction-history.c b/app/widgets/gimpaction-history.c
new file mode 100644
index 0000000..37cdc03
--- /dev/null
+++ b/app/widgets/gimpaction-history.c
@@ -0,0 +1,503 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaction-history.c
+ * Copyright (C) 2013  Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "gimpuimanager.h"
+#include "gimpaction.h"
+#include "gimpaction-history.h"
+
+
+#define GIMP_ACTION_HISTORY_FILENAME "action-history"
+
+/* History items are stored in a queue, sorted by frequency (number of times
+ * the action was activated), from most frequent to least frequent.  Each item,
+ * in addition to the corresponding action name and its index in the queue,
+ * stores a "delta": the difference in frequency between it, and the next item
+ * in the queue; note that the frequency itself is not stored anywhere.
+ *
+ * To keep items from remaining at the top of the queue for too long, the delta
+ * is capped above, such the the maximal delta of the first item is MAX_DELTA,
+ * and the maximal delta of each subsequent item is the maximal delta of the
+ * previous item, times MAX_DELTA_FALLOFF.
+ *
+ * When an action is activated, its frequency grows by 1, meaning that the
+ * delta of the corresponding item is incremented (if below the maximum), and
+ * the delta of the previous item is decremented (if above 0).  If the delta of
+ * the previous item is already 0, then, before the above, the current and
+ * previous items swap frequencies, and the current item is moved up the queue
+ * until the preceding item's frequency is greater than 0 (or until it reaches
+ * the front of the queue).
+ */
+#define MAX_DELTA         5
+#define MAX_DELTA_FALLOFF 0.95
+
+
+enum
+{
+  HISTORY_ITEM = 1
+};
+
+typedef struct
+{
+  gchar *action_name;
+  gint   index;
+  gint   delta;
+} GimpActionHistoryItem;
+
+static struct
+{
+  Gimp       *gimp;
+  GQueue     *items;
+  GHashTable *links;
+} history;
+
+
+static GimpActionHistoryItem * gimp_action_history_item_new       (const gchar           *action_name,
+                                                                   gint                   index,
+                                                                   gint                   delta);
+static void                    gimp_action_history_item_free      (GimpActionHistoryItem *item);
+
+static gint                    gimp_action_history_item_max_delta (gint                   index);
+
+
+/*  public functions  */
+
+void
+gimp_action_history_init (Gimp *gimp)
+{
+  GimpGuiConfig *config;
+  GFile         *file;
+  GScanner      *scanner;
+  GTokenType     token;
+  gint           delta = 0;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  if (history.gimp != NULL)
+    {
+      g_warning ("%s: must be run only once.", G_STRFUNC);
+      return;
+    }
+
+  history.gimp  = gimp;
+  history.items = g_queue_new ();
+  history.links = g_hash_table_new (g_str_hash, g_str_equal);
+
+  file = gimp_directory_file (GIMP_ACTION_HISTORY_FILENAME, NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  scanner = gimp_scanner_new_gfile (file, NULL);
+  g_object_unref (file);
+
+  if (! scanner)
+    return;
+
+  g_scanner_scope_add_symbol (scanner, 0, "history-item",
+                              GINT_TO_POINTER (HISTORY_ITEM));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          if (scanner->value.v_symbol == GINT_TO_POINTER (HISTORY_ITEM))
+            {
+              gchar *action_name;
+
+              token = G_TOKEN_STRING;
+
+              if (g_scanner_peek_next_token (scanner) != token)
+                break;
+
+              if (! gimp_scanner_parse_string (scanner, &action_name))
+                break;
+
+              token = G_TOKEN_INT;
+
+              if (g_scanner_peek_next_token (scanner) != token ||
+                  ! gimp_scanner_parse_int (scanner, &delta))
+                {
+                  g_free (action_name);
+                  break;
+                }
+
+              if (! gimp_action_history_is_excluded_action (action_name) &&
+                  ! g_hash_table_contains (history.links, action_name))
+                {
+                  GimpActionHistoryItem *item;
+
+                  item = gimp_action_history_item_new (
+                    action_name,
+                    g_queue_get_length (history.items),
+                    delta);
+
+                  g_queue_push_tail (history.items, item);
+
+                  g_hash_table_insert (history.links,
+                                       item->action_name,
+                                       g_queue_peek_tail_link (history.items));
+                }
+
+              g_free (action_name);
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+
+          if (g_queue_get_length (history.items) >= config->action_history_size)
+            goto done;
+          break;
+
+        default: /* do nothing */
+          break;
+        }
+    }
+
+ done:
+  gimp_scanner_destroy (scanner);
+}
+
+void
+gimp_action_history_exit (Gimp *gimp)
+{
+  GimpGuiConfig         *config;
+  GimpActionHistoryItem *item;
+  GList                 *actions;
+  GFile                 *file;
+  GimpConfigWriter      *writer;
+  gint                   i;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  file = gimp_directory_file (GIMP_ACTION_HISTORY_FILENAME, NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  writer = gimp_config_writer_new_gfile (file, TRUE, "GIMP action-history",
+                                         NULL);
+  g_object_unref (file);
+
+  for (actions = history.items->head, i = 0;
+       actions && i < config->action_history_size;
+       actions = g_list_next (actions), i++)
+    {
+      item = actions->data;
+
+      gimp_config_writer_open (writer, "history-item");
+      gimp_config_writer_string (writer, item->action_name);
+      gimp_config_writer_printf (writer, "%d", item->delta);
+      gimp_config_writer_close (writer);
+    }
+
+  gimp_config_writer_finish (writer, "end of action-history", NULL);
+
+  gimp_action_history_clear (gimp);
+
+  g_clear_pointer (&history.links, g_hash_table_unref);
+  g_clear_pointer (&history.items, g_queue_free);
+  history.gimp = NULL;
+}
+
+void
+gimp_action_history_clear (Gimp *gimp)
+{
+  GimpActionHistoryItem *item;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_hash_table_remove_all (history.links);
+
+  while ((item = g_queue_pop_head (history.items)))
+    gimp_action_history_item_free (item);
+}
+
+/* Search all history actions which match "keyword" with function
+ * match_func(action, keyword).
+ *
+ * @return a list of GtkAction*, to free with:
+ * g_list_free_full (result, (GDestroyNotify) g_object_unref);
+ */
+GList *
+gimp_action_history_search (Gimp                *gimp,
+                            GimpActionMatchFunc  match_func,
+                            const gchar         *keyword)
+{
+  GimpGuiConfig *config;
+  GimpUIManager *manager;
+  GList         *actions;
+  GList         *result = NULL;
+  gint           i;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (match_func != NULL, NULL);
+
+  config  = GIMP_GUI_CONFIG (gimp->config);
+  manager = gimp_ui_managers_from_name ("<Image>")->data;
+
+  for (actions = history.items->head, i = 0;
+       actions && i < config->action_history_size;
+       actions = g_list_next (actions), i++)
+    {
+      GimpActionHistoryItem *item   = actions->data;
+      GimpAction            *action;
+
+      action = gimp_ui_manager_find_action (manager, NULL, item->action_name);
+      if (action == NULL)
+        continue;
+
+      if (! gimp_action_is_visible (action)    ||
+          (! gimp_action_is_sensitive (action) &&
+           ! config->search_show_unavailable))
+        continue;
+
+      if (match_func (action, keyword, NULL, gimp))
+        result = g_list_prepend (result, g_object_ref (action));
+    }
+
+  return g_list_reverse (result);
+}
+
+/* gimp_action_history_is_blacklisted_action:
+ *
+ * Returns whether an action should be excluded from both
+ * history and search results.
+ */
+gboolean
+gimp_action_history_is_blacklisted_action (const gchar *action_name)
+{
+  if (gimp_action_is_gui_blacklisted (action_name))
+    return TRUE;
+
+  return (g_str_has_suffix (action_name, "-set")            ||
+          g_str_has_suffix (action_name, "-accel")          ||
+          g_str_has_prefix (action_name, "context-")        ||
+          g_str_has_prefix (action_name, "filters-recent-") ||
+          g_strcmp0 (action_name, "dialogs-action-search") == 0);
+}
+
+/* gimp_action_history_is_excluded_action:
+ *
+ * Returns whether an action should be excluded from history.
+ *
+ * Some actions should not be logged in the history, but should
+ * otherwise appear in the search results, since they correspond
+ * to different functions at different times, or since their
+ * label may interfere with more relevant, but less frequent,
+ * actions.
+ */
+gboolean
+gimp_action_history_is_excluded_action (const gchar *action_name)
+{
+  if (gimp_action_history_is_blacklisted_action (action_name))
+    return TRUE;
+
+  return (g_strcmp0 (action_name, "edit-undo") == 0        ||
+          g_strcmp0 (action_name, "edit-strong-undo") == 0 ||
+          g_strcmp0 (action_name, "edit-redo") == 0        ||
+          g_strcmp0 (action_name, "edit-strong-redo") == 0 ||
+          g_strcmp0 (action_name, "filters-repeat") == 0   ||
+          g_strcmp0 (action_name, "filters-reshow") == 0);
+}
+
+/* Called whenever a GimpAction is activated.
+ * It allows us to log all used actions.
+ */
+void
+gimp_action_history_action_activated (GimpAction *action)
+{
+  GimpGuiConfig         *config;
+  const gchar           *action_name;
+  GList                 *link;
+  GimpActionHistoryItem *item;
+
+  /* Silently return when called at the wrong time, like when the
+   * activated action was "quit" and the history is already gone.
+   */
+  if (! history.gimp)
+    return;
+
+  config = GIMP_GUI_CONFIG (history.gimp->config);
+
+  if (config->action_history_size == 0)
+    return;
+
+  action_name = gimp_action_get_name (action);
+
+  /* Some specific actions are of no log interest. */
+  if (gimp_action_history_is_excluded_action (action_name))
+    return;
+
+  g_return_if_fail (action_name != NULL);
+
+  /* Remove excessive items. */
+  while (g_queue_get_length (history.items) > config->action_history_size)
+    {
+      item = g_queue_pop_tail (history.items);
+
+      g_hash_table_remove (history.links, item->action_name);
+
+      gimp_action_history_item_free (item);
+    }
+
+  /* Look up the action in the history. */
+  link = g_hash_table_lookup (history.links, action_name);
+
+  /* If the action is not in the history, insert it
+   * at the back of the history queue, possibly
+   * replacing the last item.
+   */
+  if (! link)
+    {
+      if (g_queue_get_length (history.items) == config->action_history_size)
+        {
+          item = g_queue_pop_tail (history.items);
+
+          g_hash_table_remove (history.links, item->action_name);
+
+          gimp_action_history_item_free (item);
+        }
+
+      item = gimp_action_history_item_new (
+        action_name,
+        g_queue_get_length (history.items),
+        0);
+
+      g_queue_push_tail (history.items, item);
+      link = g_queue_peek_tail_link (history.items);
+
+      g_hash_table_insert (history.links, item->action_name, link);
+    }
+  else
+    {
+      item = link->data;
+    }
+
+  /* Update the history, according to the logic described
+   * in the comment at the beginning of the file.
+   */
+  if (item->index > 0)
+    {
+      GList                 *prev_link = g_list_previous (link);
+      GimpActionHistoryItem *prev_item = prev_link->data;
+
+      if (prev_item->delta == 0)
+        {
+          for (; prev_link; prev_link = g_list_previous (prev_link))
+            {
+              prev_item = prev_link->data;
+
+              if (prev_item->delta > 0)
+                break;
+
+              prev_item->index++;
+              item->index--;
+
+              prev_item->delta = item->delta;
+              item->delta      = 0;
+            }
+
+          g_queue_unlink (history.items, link);
+
+          if (prev_link)
+            {
+              link->prev = prev_link;
+              link->next = prev_link->next;
+
+              link->prev->next = link;
+              link->next->prev = link;
+
+              history.items->length++;
+            }
+          else
+            {
+              g_queue_push_head_link (history.items, link);
+            }
+        }
+
+      if (item->index > 0)
+        prev_item->delta--;
+    }
+
+  if (item->delta < gimp_action_history_item_max_delta (item->index))
+    item->delta++;
+}
+
+
+/*  private functions  */
+
+static GimpActionHistoryItem *
+gimp_action_history_item_new (const gchar *action_name,
+                              gint         index,
+                              gint         delta)
+{
+  GimpActionHistoryItem *item = g_slice_new (GimpActionHistoryItem);
+
+  item->action_name = g_strdup (action_name);
+  item->index       = index;
+  item->delta       = CLAMP (delta, 0, gimp_action_history_item_max_delta (index));
+
+  return item;
+}
+
+static void
+gimp_action_history_item_free (GimpActionHistoryItem *item)
+{
+  g_free (item->action_name);
+
+  g_slice_free (GimpActionHistoryItem, item);
+}
+
+static gint
+gimp_action_history_item_max_delta (gint index)
+{
+  return floor (MAX_DELTA * exp (log (MAX_DELTA_FALLOFF) * index));
+}
diff --git a/app/widgets/gimpaction-history.h b/app/widgets/gimpaction-history.h
new file mode 100644
index 0000000..40252a8
--- /dev/null
+++ b/app/widgets/gimpaction-history.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaction-history.h
+ * Copyright (C) 2013  Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_HISTORY_H__
+#define __GIMP_ACTION_HISTORY_H__
+
+
+typedef gboolean (* GimpActionMatchFunc) (GimpAction  *action,
+                                          const gchar *keyword,
+                                          gint        *section,
+                                          Gimp        *gimp);
+
+
+void       gimp_action_history_init                  (Gimp                *gimp);
+void       gimp_action_history_exit                  (Gimp                *gimp);
+
+void       gimp_action_history_clear                 (Gimp                *gimp);
+
+GList    * gimp_action_history_search                (Gimp                *gimp,
+                                                      GimpActionMatchFunc  match_func,
+                                                      const gchar         *keyword);
+
+gboolean   gimp_action_history_is_blacklisted_action (const gchar         *action_name);
+gboolean   gimp_action_history_is_excluded_action    (const gchar         *action_name);
+
+void       gimp_action_history_action_activated      (GimpAction          *action);
+
+
+#endif  /* __GIMP_ACTION_HISTORY_H__ */
diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c
new file mode 100644
index 0000000..88cae45
--- /dev/null
+++ b/app/widgets/gimpaction.c
@@ -0,0 +1,392 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaction.c
+ * Copyright (C) 2004-2019 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpaction.h"
+
+
+enum
+{
+  ACTIVATE,
+  CHANGE_STATE,
+  LAST_SIGNAL
+};
+
+
+static void   gimp_action_set_proxy_tooltip (GimpAction       *action,
+                                             GtkWidget        *proxy);
+static void   gimp_action_tooltip_notify    (GimpAction       *action,
+                                             const GParamSpec *pspec,
+                                             gpointer          data);
+
+
+G_DEFINE_INTERFACE (GimpAction, gimp_action, GTK_TYPE_ACTION)
+
+static guint action_signals[LAST_SIGNAL];
+
+
+static void
+gimp_action_default_init (GimpActionInterface *iface)
+{
+  action_signals[ACTIVATE] =
+    g_signal_new ("gimp-activate",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpActionInterface, activate),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VARIANT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_VARIANT);
+
+  action_signals[CHANGE_STATE] =
+    g_signal_new ("gimp-change-state",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpActionInterface, change_state),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VARIANT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_VARIANT);
+}
+
+void
+gimp_action_init (GimpAction *action)
+{
+  g_return_if_fail (GIMP_IS_ACTION (action));
+
+  g_signal_connect (action, "notify::tooltip",
+                    G_CALLBACK (gimp_action_tooltip_notify),
+                    NULL);
+}
+
+
+/*  public functions  */
+
+void
+gimp_action_emit_activate (GimpAction *action,
+                           GVariant   *value)
+{
+  g_return_if_fail (GIMP_IS_ACTION (action));
+
+  if (value)
+    g_variant_ref_sink (value);
+
+  g_signal_emit (action, action_signals[ACTIVATE], 0, value);
+
+  if (value)
+    g_variant_unref (value);
+}
+
+void
+gimp_action_emit_change_state (GimpAction *action,
+                               GVariant   *value)
+{
+  g_return_if_fail (GIMP_IS_ACTION (action));
+
+  if (value)
+    g_variant_ref_sink (value);
+
+  g_signal_emit (action, action_signals[CHANGE_STATE], 0, value);
+
+  if (value)
+    g_variant_unref (value);
+}
+
+void
+gimp_action_set_proxy (GimpAction *action,
+                       GtkWidget  *proxy)
+{
+  g_return_if_fail (GIMP_IS_ACTION (action));
+  g_return_if_fail (GTK_IS_WIDGET (proxy));
+
+  gimp_action_set_proxy_tooltip (action, proxy);
+}
+
+const gchar *
+gimp_action_get_name (GimpAction *action)
+{
+  return gtk_action_get_name ((GtkAction *) action);
+}
+
+void
+gimp_action_set_label (GimpAction  *action,
+                       const gchar *label)
+{
+  gtk_action_set_label ((GtkAction *) action, label);
+}
+
+const gchar *
+gimp_action_get_label (GimpAction *action)
+{
+  return gtk_action_get_label ((GtkAction *) action);
+}
+
+void
+gimp_action_set_tooltip (GimpAction  *action,
+                         const gchar *tooltip)
+{
+  gtk_action_set_tooltip ((GtkAction *) action, tooltip);
+}
+
+const gchar *
+gimp_action_get_tooltip (GimpAction *action)
+{
+  return gtk_action_get_tooltip ((GtkAction *) action);
+}
+
+void
+gimp_action_set_icon_name (GimpAction  *action,
+                           const gchar *icon_name)
+{
+  gtk_action_set_icon_name ((GtkAction *) action, icon_name);
+}
+
+const gchar *
+gimp_action_get_icon_name (GimpAction *action)
+{
+  return gtk_action_get_icon_name ((GtkAction *) action);
+}
+
+void
+gimp_action_set_gicon (GimpAction *action,
+                       GIcon      *icon)
+{
+  gtk_action_set_gicon ((GtkAction *) action, icon);
+}
+
+GIcon *
+gimp_action_get_gicon (GimpAction *action)
+{
+  return gtk_action_get_gicon ((GtkAction *) action);
+}
+
+void
+gimp_action_set_help_id (GimpAction  *action,
+                         const gchar *help_id)
+{
+  g_return_if_fail (GIMP_IS_ACTION (action));
+
+  g_object_set_qdata_full (G_OBJECT (action), GIMP_HELP_ID,
+                           g_strdup (help_id),
+                           (GDestroyNotify) g_free);
+}
+
+const gchar *
+gimp_action_get_help_id (GimpAction *action)
+{
+  g_return_val_if_fail (GIMP_IS_ACTION (action), NULL);
+
+  return g_object_get_qdata (G_OBJECT (action), GIMP_HELP_ID);
+}
+
+void
+gimp_action_set_visible (GimpAction *action,
+                         gboolean    visible)
+{
+  gtk_action_set_visible ((GtkAction *) action, visible);
+}
+
+gboolean
+gimp_action_get_visible (GimpAction *action)
+{
+  return gtk_action_get_visible ((GtkAction *) action);
+}
+
+gboolean
+gimp_action_is_visible (GimpAction *action)
+{
+  return gtk_action_is_visible ((GtkAction *) action);
+}
+
+void
+gimp_action_set_sensitive (GimpAction *action,
+                           gboolean    sensitive)
+{
+  gtk_action_set_sensitive ((GtkAction *) action, sensitive);
+}
+
+gboolean
+gimp_action_get_sensitive (GimpAction *action)
+{
+  return gtk_action_get_sensitive ((GtkAction *) action);
+}
+
+gboolean
+gimp_action_is_sensitive (GimpAction *action)
+{
+  return gtk_action_is_sensitive ((GtkAction *) action);
+}
+
+GClosure *
+gimp_action_get_accel_closure (GimpAction *action)
+{
+  return gtk_action_get_accel_closure ((GtkAction *) action);
+}
+
+void
+gimp_action_set_accel_path (GimpAction  *action,
+                            const gchar *accel_path)
+{
+  gtk_action_set_accel_path ((GtkAction *) action, accel_path);
+}
+
+const gchar *
+gimp_action_get_accel_path (GimpAction *action)
+{
+  return gtk_action_get_accel_path ((GtkAction *) action);
+}
+
+void
+gimp_action_set_accel_group (GimpAction  *action,
+                             GtkAccelGroup *accel_group)
+{
+  gtk_action_set_accel_group ((GtkAction *) action, accel_group);
+}
+
+void
+gimp_action_connect_accelerator (GimpAction  *action)
+{
+  gtk_action_connect_accelerator ((GtkAction *) action);
+}
+
+GSList *
+gimp_action_get_proxies (GimpAction *action)
+{
+  return gtk_action_get_proxies ((GtkAction *) action);
+}
+
+void
+gimp_action_activate (GimpAction *action)
+{
+  gtk_action_activate ((GtkAction *) action);
+}
+
+gint
+gimp_action_name_compare (GimpAction  *action1,
+                          GimpAction  *action2)
+{
+  return strcmp (gimp_action_get_name (action1),
+                 gimp_action_get_name (action2));
+}
+
+gboolean
+gimp_action_is_gui_blacklisted (const gchar *action_name)
+{
+  static const gchar *suffixes[] =
+    {
+      "-menu",
+      "-popup"
+    };
+
+  static const gchar *prefixes[] =
+    {
+      "<",
+      "tools-color-average-radius-",
+      "tools-paintbrush-size-",
+      "tools-paintbrush-aspect-ratio-",
+      "tools-paintbrush-angle-",
+      "tools-paintbrush-spacing-",
+      "tools-paintbrush-hardness-",
+      "tools-paintbrush-force-",
+      "tools-ink-blob-size-",
+      "tools-ink-blob-aspect-",
+      "tools-ink-blob-angle-",
+      "tools-mypaint-brush-radius-",
+      "tools-mypaint-brush-hardness-",
+      "tools-foreground-select-brush-size-",
+      "tools-transform-preview-opacity-",
+      "tools-warp-effect-size-",
+      "tools-warp-effect-hardness-"
+    };
+
+  static const gchar *actions[] =
+    {
+      "tools-brightness-contrast",
+      "tools-curves",
+      "tools-levels",
+      "tools-offset",
+      "tools-threshold"
+    };
+
+  gint i;
+
+  if (! (action_name && *action_name))
+    return TRUE;
+
+  for (i = 0; i < G_N_ELEMENTS (suffixes); i++)
+    {
+      if (g_str_has_suffix (action_name, suffixes[i]))
+        return TRUE;
+    }
+
+  for (i = 0; i < G_N_ELEMENTS (prefixes); i++)
+    {
+      if (g_str_has_prefix (action_name, prefixes[i]))
+        return TRUE;
+    }
+
+  for (i = 0; i < G_N_ELEMENTS (actions); i++)
+    {
+      if (! strcmp (action_name, actions[i]))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_action_set_proxy_tooltip (GimpAction *action,
+                               GtkWidget  *proxy)
+{
+  const gchar *tooltip = gimp_action_get_tooltip (action);
+
+  if (tooltip)
+    gimp_help_set_help_data (proxy, tooltip,
+                             g_object_get_qdata (G_OBJECT (proxy),
+                                                 GIMP_HELP_ID));
+}
+
+static void
+gimp_action_tooltip_notify (GimpAction       *action,
+                            const GParamSpec *pspec,
+                            gpointer          data)
+{
+  GSList *list;
+
+  for (list = gimp_action_get_proxies (action);
+       list;
+       list = g_slist_next (list))
+    {
+      gimp_action_set_proxy_tooltip (action, list->data);
+    }
+}
diff --git a/app/widgets/gimpaction.h b/app/widgets/gimpaction.h
new file mode 100644
index 0000000..58bd798
--- /dev/null
+++ b/app/widgets/gimpaction.h
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaction.h
+ * Copyright (C) 2004-2019 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_H__
+#define __GIMP_ACTION_H__
+
+
+#define GIMP_TYPE_ACTION               (gimp_action_get_type ())
+#define GIMP_ACTION(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION, GimpAction))
+#define GIMP_IS_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION))
+#define GIMP_ACTION_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), GIMP_TYPE_ACTION, GimpActionInterface))
+
+
+typedef struct _GimpActionInterface GimpActionInterface;
+
+struct _GimpActionInterface
+{
+  GTypeInterface base_interface;
+
+  void (* activate)     (GimpAction *action,
+                         GVariant   *value);
+  void (* change_state) (GimpAction *action,
+                         GVariant   *value);
+};
+
+
+GType         gimp_action_get_type            (void) G_GNUC_CONST;
+
+void          gimp_action_init                (GimpAction    *action);
+
+void          gimp_action_emit_activate       (GimpAction    *action,
+                                               GVariant      *value);
+void          gimp_action_emit_change_state   (GimpAction    *action,
+                                               GVariant      *value);
+
+void          gimp_action_set_proxy           (GimpAction    *action,
+                                               GtkWidget     *proxy);
+
+const gchar * gimp_action_get_name            (GimpAction    *action);
+
+void          gimp_action_set_label           (GimpAction    *action,
+                                               const gchar   *label);
+const gchar * gimp_action_get_label           (GimpAction    *action);
+
+void          gimp_action_set_tooltip         (GimpAction    *action,
+                                               const gchar   *tooltip);
+const gchar * gimp_action_get_tooltip         (GimpAction    *action);
+
+void          gimp_action_set_icon_name       (GimpAction    *action,
+                                               const gchar   *icon_name);
+const gchar * gimp_action_get_icon_name       (GimpAction    *action);
+
+void          gimp_action_set_gicon           (GimpAction    *action,
+                                               GIcon         *icon);
+GIcon       * gimp_action_get_gicon           (GimpAction    *action);
+
+void          gimp_action_set_help_id         (GimpAction    *action,
+                                               const gchar   *help_id);
+const gchar * gimp_action_get_help_id         (GimpAction    *action);
+
+void          gimp_action_set_visible         (GimpAction    *action,
+                                               gboolean       visible);
+gboolean      gimp_action_get_visible         (GimpAction    *action);
+gboolean      gimp_action_is_visible          (GimpAction    *action);
+
+void          gimp_action_set_sensitive       (GimpAction    *action,
+                                               gboolean       sensitive);
+gboolean      gimp_action_get_sensitive       (GimpAction    *action);
+gboolean      gimp_action_is_sensitive        (GimpAction    *action);
+
+GClosure    * gimp_action_get_accel_closure   (GimpAction    *action);
+
+void          gimp_action_set_accel_path      (GimpAction    *action,
+                                               const gchar   *accel_path);
+const gchar * gimp_action_get_accel_path      (GimpAction    *action);
+
+void          gimp_action_set_accel_group     (GimpAction    *action,
+                                               GtkAccelGroup *accel_group);
+void          gimp_action_connect_accelerator (GimpAction    *action);
+
+GSList      * gimp_action_get_proxies         (GimpAction    *action);
+
+void          gimp_action_activate            (GimpAction    *action);
+
+gint          gimp_action_name_compare        (GimpAction    *action1,
+                                               GimpAction    *action2);
+
+gboolean      gimp_action_is_gui_blacklisted  (const gchar   *action_name);
+
+
+#endif  /* __GIMP_ACTION_H__ */
diff --git a/app/widgets/gimpactioneditor.c b/app/widgets/gimpactioneditor.c
new file mode 100644
index 0000000..903e4a5
--- /dev/null
+++ b/app/widgets/gimpactioneditor.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactioneditor.c
+ * Copyright (C) 2008  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpactioneditor.h"
+#include "gimpactionview.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_action_editor_filter_clear   (GtkEntry         *entry);
+static void   gimp_action_editor_filter_changed (GtkEntry         *entry,
+                                                 GimpActionEditor *editor);
+
+
+G_DEFINE_TYPE (GimpActionEditor, gimp_action_editor, GTK_TYPE_BOX)
+
+#define parent_class gimp_action_editor_parent_class
+
+
+static void
+gimp_action_editor_class_init (GimpActionEditorClass *klass)
+{
+}
+
+static void
+gimp_action_editor_init (GimpActionEditor *editor)
+{
+  GtkWidget *hbox;
+  GtkWidget *label;
+  GtkWidget *entry;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("_Search:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  entry = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+  gtk_widget_show (entry);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
+
+  gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                                     GTK_ENTRY_ICON_SECONDARY, "edit-clear");
+  gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+                                  GTK_ENTRY_ICON_SECONDARY, TRUE);
+  gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
+                                GTK_ENTRY_ICON_SECONDARY, FALSE);
+
+  g_signal_connect (entry, "icon-press",
+                    G_CALLBACK (gimp_action_editor_filter_clear),
+                    NULL);
+  g_signal_connect (entry, "changed",
+                    G_CALLBACK (gimp_action_editor_filter_changed),
+                    editor);
+}
+
+GtkWidget *
+gimp_action_editor_new (GimpUIManager *manager,
+                        const gchar   *select_action,
+                        gboolean       show_shortcuts)
+{
+  GimpActionEditor *editor;
+  GtkWidget        *scrolled_window;
+
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), NULL);
+
+  editor = g_object_new (GIMP_TYPE_ACTION_EDITOR, NULL);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  editor->view = gimp_action_view_new (manager, select_action, show_shortcuts);
+  gtk_widget_set_size_request (editor->view, 300, 400);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), editor->view);
+  gtk_widget_show (editor->view);
+
+  return GTK_WIDGET (editor);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_action_editor_filter_clear (GtkEntry *entry)
+{
+  gtk_entry_set_text (entry, "");
+}
+
+static void
+gimp_action_editor_filter_changed (GtkEntry         *entry,
+                                   GimpActionEditor *editor)
+{
+  gimp_action_view_set_filter (GIMP_ACTION_VIEW (editor->view),
+                               gtk_entry_get_text (entry));
+  gtk_entry_set_icon_sensitive (entry,
+                                GTK_ENTRY_ICON_SECONDARY,
+                                gtk_entry_get_text_length (entry) > 0);
+}
+
diff --git a/app/widgets/gimpactioneditor.h b/app/widgets/gimpactioneditor.h
new file mode 100644
index 0000000..e8aab48
--- /dev/null
+++ b/app/widgets/gimpactioneditor.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactioneditor.h
+ * Copyright (C) 2008  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_EDITOR_H__
+#define __GIMP_ACTION_EDITOR_H__
+
+
+#define GIMP_TYPE_ACTION_EDITOR            (gimp_action_editor_get_type ())
+#define GIMP_ACTION_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_EDITOR, GimpActionEditor))
+#define GIMP_ACTION_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION_EDITOR, GimpActionEditorClass))
+#define GIMP_IS_ACTION_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION_EDITOR))
+#define GIMP_IS_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ACTION_EDITOR))
+#define GIMP_ACTION_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ACTION_EDITOR, GimpActionEditorClass))
+
+
+typedef struct _GimpActionEditorClass GimpActionEditorClass;
+
+struct _GimpActionEditor
+{
+  GtkBox     parent_instance;
+
+  GtkWidget *view;
+};
+
+struct _GimpActionEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_action_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_action_editor_new      (GimpUIManager *manager,
+                                         const gchar   *select_action,
+                                         gboolean       show_shortcuts);
+
+
+#endif  /*  __GIMP_ACTION_EDITOR_H__  */
diff --git a/app/widgets/gimpactionfactory.c b/app/widgets/gimpactionfactory.c
new file mode 100644
index 0000000..2512028
--- /dev/null
+++ b/app/widgets/gimpactionfactory.c
@@ -0,0 +1,162 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactionfactory.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+
+#include "gimpactionfactory.h"
+#include "gimpactiongroup.h"
+
+
+static void   gimp_action_factory_finalize (GObject *object);
+
+
+G_DEFINE_TYPE (GimpActionFactory, gimp_action_factory, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_action_factory_parent_class
+
+
+static void
+gimp_action_factory_class_init (GimpActionFactoryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_action_factory_finalize;
+}
+
+static void
+gimp_action_factory_init (GimpActionFactory *factory)
+{
+  factory->gimp              = NULL;
+  factory->registered_groups = NULL;
+}
+
+static void
+gimp_action_factory_finalize (GObject *object)
+{
+  GimpActionFactory *factory = GIMP_ACTION_FACTORY (object);
+  GList             *list;
+
+  for (list = factory->registered_groups; list; list = g_list_next (list))
+    {
+      GimpActionFactoryEntry *entry = list->data;
+
+      g_free (entry->identifier);
+      g_free (entry->label);
+      g_free (entry->icon_name);
+
+      g_slice_free (GimpActionFactoryEntry, entry);
+    }
+
+  g_list_free (factory->registered_groups);
+  factory->registered_groups = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GimpActionFactory *
+gimp_action_factory_new (Gimp *gimp)
+{
+  GimpActionFactory *factory;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  factory = g_object_new (GIMP_TYPE_ACTION_FACTORY, NULL);
+
+  factory->gimp = gimp;
+
+  return factory;
+}
+
+void
+gimp_action_factory_group_register (GimpActionFactory         *factory,
+                                    const gchar               *identifier,
+                                    const gchar               *label,
+                                    const gchar               *icon_name,
+                                    GimpActionGroupSetupFunc   setup_func,
+                                    GimpActionGroupUpdateFunc  update_func)
+{
+  GimpActionFactoryEntry *entry;
+
+  g_return_if_fail (GIMP_IS_ACTION_FACTORY (factory));
+  g_return_if_fail (identifier != NULL);
+  g_return_if_fail (label != NULL);
+  g_return_if_fail (setup_func != NULL);
+  g_return_if_fail (update_func != NULL);
+
+  entry = g_slice_new0 (GimpActionFactoryEntry);
+
+  entry->identifier  = g_strdup (identifier);
+  entry->label       = g_strdup (label);
+  entry->icon_name   = g_strdup (icon_name);
+  entry->setup_func  = setup_func;
+  entry->update_func = update_func;
+
+  factory->registered_groups = g_list_prepend (factory->registered_groups,
+                                               entry);
+}
+
+GimpActionGroup *
+gimp_action_factory_group_new (GimpActionFactory *factory,
+                               const gchar       *identifier,
+                               gpointer           user_data)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_ACTION_FACTORY (factory), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  for (list = factory->registered_groups; list; list = g_list_next (list))
+    {
+      GimpActionFactoryEntry *entry = list->data;
+
+      if (! strcmp (entry->identifier, identifier))
+        {
+          GimpActionGroup *group;
+
+          group = gimp_action_group_new (factory->gimp,
+                                         entry->identifier,
+                                         entry->label,
+                                         entry->icon_name,
+                                         user_data,
+                                         entry->update_func);
+
+          if (entry->setup_func)
+            entry->setup_func (group);
+
+          return group;
+        }
+    }
+
+  g_warning ("%s: no entry registered for \"%s\"",
+             G_STRFUNC, identifier);
+
+  return NULL;
+}
diff --git a/app/widgets/gimpactionfactory.h b/app/widgets/gimpactionfactory.h
new file mode 100644
index 0000000..fddcfa1
--- /dev/null
+++ b/app/widgets/gimpactionfactory.h
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactionfactory.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_FACTORY_H__
+#define __GIMP_ACTION_FACTORY_H__
+
+
+#include "core/gimpobject.h"
+
+
+typedef struct _GimpActionFactoryEntry GimpActionFactoryEntry;
+
+struct _GimpActionFactoryEntry
+{
+  gchar                     *identifier;
+  gchar                     *label;
+  gchar                     *icon_name;
+  GimpActionGroupSetupFunc   setup_func;
+  GimpActionGroupUpdateFunc  update_func;
+};
+
+
+#define GIMP_TYPE_ACTION_FACTORY            (gimp_action_factory_get_type ())
+#define GIMP_ACTION_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_FACTORY, GimpActionFactory))
+#define GIMP_ACTION_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION_FACTORY, GimpActionFactoryClass))
+#define GIMP_IS_ACTION_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION_FACTORY))
+#define GIMP_IS_ACTION_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ACTION_FACTORY))
+#define GIMP_ACTION_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ACTION_FACTORY, GimpActionFactoryClass))
+
+
+typedef struct _GimpActionFactoryClass  GimpActionFactoryClass;
+
+struct _GimpActionFactory
+{
+  GimpObject  parent_instance;
+
+  Gimp       *gimp;
+  GList      *registered_groups;
+};
+
+struct _GimpActionFactoryClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType               gimp_action_factory_get_type (void) G_GNUC_CONST;
+
+GimpActionFactory * gimp_action_factory_new      (Gimp              *gimp);
+
+void          gimp_action_factory_group_register (GimpActionFactory *factory,
+                                                  const gchar       *identifier,
+                                                  const gchar       *label,
+                                                  const gchar       *icon_name,
+                                                  GimpActionGroupSetupFunc  setup_func,
+                                                  GimpActionGroupUpdateFunc update_func);
+
+GimpActionGroup * gimp_action_factory_group_new  (GimpActionFactory *factory,
+                                                  const gchar       *identifier,
+                                                  gpointer           user_data);
+
+
+#endif  /*  __GIMP_ACTION_FACTORY_H__  */
diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c
new file mode 100644
index 0000000..04bd1b6
--- /dev/null
+++ b/app/widgets/gimpactiongroup.c
@@ -0,0 +1,1068 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactiongroup.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpviewable.h"
+
+#include "gimpaction.h"
+#include "gimpactiongroup.h"
+#include "gimpactionimpl.h"
+#include "gimpenumaction.h"
+#include "gimpprocedureaction.h"
+#include "gimpradioaction.h"
+#include "gimpstringaction.h"
+#include "gimptoggleaction.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  ACTION_ADDED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_LABEL,
+  PROP_ICON_NAME
+};
+
+
+static void   gimp_action_group_constructed   (GObject      *object);
+static void   gimp_action_group_dispose       (GObject      *object);
+static void   gimp_action_group_finalize      (GObject      *object);
+static void   gimp_action_group_set_property  (GObject      *object,
+                                               guint         prop_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void   gimp_action_group_get_property  (GObject      *object,
+                                               guint         prop_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpActionGroup, gimp_action_group, GTK_TYPE_ACTION_GROUP)
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+#define parent_class gimp_action_group_parent_class
+
+
+static void
+gimp_action_group_class_init (GimpActionGroupClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_action_group_constructed;
+  object_class->dispose      = gimp_action_group_dispose;
+  object_class->finalize     = gimp_action_group_finalize;
+  object_class->set_property = gimp_action_group_set_property;
+  object_class->get_property = gimp_action_group_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_LABEL,
+                                   g_param_spec_string ("label",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  klass->groups = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+  signals[ACTION_ADDED] =
+    g_signal_new ("action-added",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpActionGroupClass, action_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_ACTION);
+}
+
+static void
+gimp_action_group_init (GimpActionGroup *group)
+{
+}
+
+static void
+gimp_action_group_constructed (GObject *object)
+{
+  GimpActionGroup *group = GIMP_ACTION_GROUP (object);
+  const gchar     *name;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (group->gimp));
+
+  name = gimp_action_group_get_name (group);
+
+  if (name)
+    {
+      GimpActionGroupClass *group_class;
+      GList                *list;
+
+      group_class = GIMP_ACTION_GROUP_GET_CLASS (object);
+
+      list = g_hash_table_lookup (group_class->groups, name);
+
+      list = g_list_append (list, object);
+
+      g_hash_table_replace (group_class->groups,
+                            g_strdup (name), list);
+    }
+}
+
+static void
+gimp_action_group_dispose (GObject *object)
+{
+  const gchar *name = gimp_action_group_get_name (GIMP_ACTION_GROUP (object));
+
+  if (name)
+    {
+      GimpActionGroupClass *group_class;
+      GList                *list;
+
+      group_class = GIMP_ACTION_GROUP_GET_CLASS (object);
+
+      list = g_hash_table_lookup (group_class->groups, name);
+
+      if (list)
+        {
+          list = g_list_remove (list, object);
+
+          if (list)
+            g_hash_table_replace (group_class->groups,
+                                  g_strdup (name), list);
+          else
+            g_hash_table_remove (group_class->groups, name);
+        }
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_action_group_finalize (GObject *object)
+{
+  GimpActionGroup *group = GIMP_ACTION_GROUP (object);
+
+  g_clear_pointer (&group->label,     g_free);
+  g_clear_pointer (&group->icon_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_action_group_set_property (GObject      *object,
+                                guint         prop_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpActionGroup *group = GIMP_ACTION_GROUP (object);
+
+  switch (prop_id)
+    {
+    case PROP_GIMP:
+      group->gimp = g_value_get_object (value);
+      break;
+    case PROP_LABEL:
+      group->label = g_value_dup_string (value);
+      break;
+    case PROP_ICON_NAME:
+      group->icon_name = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_action_group_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpActionGroup *group = GIMP_ACTION_GROUP (object);
+
+  switch (prop_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, group->gimp);
+      break;
+    case PROP_LABEL:
+      g_value_set_string (value, group->label);
+      break;
+    case PROP_ICON_NAME:
+      g_value_set_string (value, group->icon_name);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_action_group_check_unique_action (GimpActionGroup *group,
+                                       const gchar     *action_name)
+{
+  if (G_UNLIKELY (gimp_action_group_get_action (group, action_name)))
+    {
+      g_warning ("Refusing to add non-unique action '%s' to action group '%s'",
+                 action_name,
+                 gimp_action_group_get_name (group));
+      return FALSE;
+    }
+
+  return TRUE;
+
+}
+
+/**
+ * gimp_action_group_new:
+ * @gimp:        the @Gimp instance this action group belongs to
+ * @name:        the name of the action group.
+ * @label:       the user visible label of the action group.
+ * @icon_name:   the icon of the action group.
+ * @user_data:   the user_data for #GtkAction callbacks.
+ * @update_func: the function that will be called on
+ *               gimp_action_group_update().
+ *
+ * Creates a new #GimpActionGroup object. The name of the action group
+ * is used when associating <link linkend="Action-Accel">keybindings</link>
+ * with the actions.
+ *
+ * Returns: the new #GimpActionGroup
+ */
+GimpActionGroup *
+gimp_action_group_new (Gimp                      *gimp,
+                       const gchar               *name,
+                       const gchar               *label,
+                       const gchar               *icon_name,
+                       gpointer                   user_data,
+                       GimpActionGroupUpdateFunc  update_func)
+{
+  GimpActionGroup *group;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  group = g_object_new (GIMP_TYPE_ACTION_GROUP,
+                        "gimp",      gimp,
+                        "name",      name,
+                        "label",     label,
+                        "icon-name", icon_name,
+                        NULL);
+
+  group->user_data   = user_data;
+  group->update_func = update_func;
+
+  return group;
+}
+
+const gchar *
+gimp_action_group_get_name (GimpActionGroup *group)
+{
+  return gtk_action_group_get_name ((GtkActionGroup *) group);
+}
+
+void
+gimp_action_group_add_action (GimpActionGroup *action_group,
+                              GimpAction      *action)
+{
+  gtk_action_group_add_action ((GtkActionGroup *) action_group,
+                               (GtkAction *) action);
+}
+
+void
+gimp_action_group_add_action_with_accel (GimpActionGroup *action_group,
+                                         GimpAction      *action,
+                                         const gchar     *accelerator)
+{
+  gtk_action_group_add_action_with_accel ((GtkActionGroup *) action_group,
+                                          (GtkAction *) action,
+                                          accelerator);
+}
+
+void
+gimp_action_group_remove_action (GimpActionGroup *action_group,
+                                 GimpAction      *action)
+{
+  gtk_action_group_remove_action ((GtkActionGroup *) action_group,
+                                  (GtkAction *) action);
+}
+
+GimpAction *
+gimp_action_group_get_action (GimpActionGroup *group,
+                              const gchar     *action_name)
+{
+  return (GimpAction *) gtk_action_group_get_action ((GtkActionGroup *) group,
+                                                     action_name);
+}
+
+GList *
+gimp_action_group_list_actions (GimpActionGroup *group)
+{
+  return gtk_action_group_list_actions ((GtkActionGroup *) group);
+}
+
+GList *
+gimp_action_groups_from_name (const gchar *name)
+{
+  GimpActionGroupClass *group_class;
+  GList                *list;
+
+  g_return_val_if_fail (name != NULL, NULL);
+
+  group_class = g_type_class_ref (GIMP_TYPE_ACTION_GROUP);
+
+  list = g_hash_table_lookup (group_class->groups, name);
+
+  g_type_class_unref (group_class);
+
+  return list;
+}
+
+void
+gimp_action_group_update (GimpActionGroup *group,
+                          gpointer         update_data)
+{
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+
+  if (group->update_func)
+    group->update_func (group, update_data);
+}
+
+void
+gimp_action_group_add_actions (GimpActionGroup       *group,
+                               const gchar           *msg_context,
+                               const GimpActionEntry *entries,
+                               guint                  n_entries)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GimpAction  *action;
+      const gchar *label;
+      const gchar *tooltip = NULL;
+
+      if (! gimp_action_group_check_unique_action (group, entries[i].name))
+        continue;
+
+      if (msg_context)
+        {
+          label = g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
+
+      action = gimp_action_impl_new (entries[i].name, label, tooltip,
+                                     entries[i].icon_name,
+                                     entries[i].help_id);
+
+      if (entries[i].callback)
+        g_signal_connect (action, "gimp-activate",
+                          G_CALLBACK (entries[i].callback),
+                          group->user_data);
+
+      gimp_action_group_add_action_with_accel (group, GIMP_ACTION (action),
+                                               entries[i].accelerator);
+      g_signal_emit (group, signals[ACTION_ADDED], 0, action);
+
+      g_object_unref (action);
+    }
+}
+
+void
+gimp_action_group_add_toggle_actions (GimpActionGroup             *group,
+                                      const gchar                 *msg_context,
+                                      const GimpToggleActionEntry *entries,
+                                      guint                        n_entries)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GtkToggleAction *action;
+      const gchar     *label;
+      const gchar     *tooltip = NULL;
+
+      if (! gimp_action_group_check_unique_action (group, entries[i].name))
+        continue;
+
+      if (msg_context)
+        {
+          label = g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
+
+      action = gimp_toggle_action_new (entries[i].name, label, tooltip,
+                                       entries[i].icon_name,
+                                       entries[i].help_id);
+
+      gimp_toggle_action_set_active (GIMP_TOGGLE_ACTION (action),
+                                     entries[i].is_active);
+
+      if (entries[i].callback)
+        g_signal_connect (action, "gimp-change-state",
+                          G_CALLBACK (entries[i].callback),
+                          group->user_data);
+
+      gimp_action_group_add_action_with_accel (group, GIMP_ACTION (action),
+                                               entries[i].accelerator);
+      g_signal_emit (group, signals[ACTION_ADDED], 0, action);
+
+      g_object_unref (action);
+    }
+}
+
+GSList *
+gimp_action_group_add_radio_actions (GimpActionGroup            *group,
+                                     const gchar                *msg_context,
+                                     const GimpRadioActionEntry *entries,
+                                     guint                       n_entries,
+                                     GSList                     *radio_group,
+                                     gint                        value,
+                                     GimpActionCallback          callback)
+{
+  GtkRadioAction *first_action = NULL;
+  gint            i;
+
+  g_return_val_if_fail (GIMP_IS_ACTION_GROUP (group), NULL);
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GtkRadioAction *action;
+      const gchar    *label;
+      const gchar    *tooltip = NULL;
+
+      if (! gimp_action_group_check_unique_action (group, entries[i].name))
+        continue;
+
+      if (msg_context)
+        {
+          label = g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
+
+      action = gimp_radio_action_new (entries[i].name, label, tooltip,
+                                      entries[i].icon_name,
+                                      entries[i].help_id,
+                                      entries[i].value);
+
+      if (i == 0)
+        first_action = action;
+
+      gtk_radio_action_set_group (action, radio_group);
+      radio_group = gtk_radio_action_get_group (action);
+
+      if (value == entries[i].value)
+        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+
+      gimp_action_group_add_action_with_accel (group, GIMP_ACTION (action),
+                                               entries[i].accelerator);
+      g_signal_emit (group, signals[ACTION_ADDED], 0, action);
+
+      g_object_unref (action);
+    }
+
+  if (callback && first_action)
+    g_signal_connect (first_action, "gimp-change-state",
+                      G_CALLBACK (callback),
+                      group->user_data);
+
+  return radio_group;
+}
+
+void
+gimp_action_group_add_enum_actions (GimpActionGroup           *group,
+                                    const gchar               *msg_context,
+                                    const GimpEnumActionEntry *entries,
+                                    guint                      n_entries,
+                                    GimpActionCallback         callback)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GimpEnumAction *action;
+      const gchar    *label;
+      const gchar    *tooltip = NULL;
+
+      if (! gimp_action_group_check_unique_action (group, entries[i].name))
+        continue;
+
+      if (msg_context)
+        {
+          label = g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
+
+      action = gimp_enum_action_new (entries[i].name, label, tooltip,
+                                     entries[i].icon_name,
+                                     entries[i].help_id,
+                                     entries[i].value,
+                                     entries[i].value_variable);
+
+      if (callback)
+        g_signal_connect (action, "gimp-activate",
+                          G_CALLBACK (callback),
+                          group->user_data);
+
+      gimp_action_group_add_action_with_accel (group, GIMP_ACTION (action),
+                                               entries[i].accelerator);
+      g_signal_emit (group, signals[ACTION_ADDED], 0, action);
+
+      g_object_unref (action);
+    }
+}
+
+void
+gimp_action_group_add_string_actions (GimpActionGroup             *group,
+                                      const gchar                 *msg_context,
+                                      const GimpStringActionEntry *entries,
+                                      guint                        n_entries,
+                                      GimpActionCallback           callback)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GimpStringAction *action;
+      const gchar      *label;
+      const gchar      *tooltip = NULL;
+
+      if (! gimp_action_group_check_unique_action (group, entries[i].name))
+        continue;
+
+      if (msg_context)
+        {
+          label = g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
+
+      action = gimp_string_action_new (entries[i].name, label, tooltip,
+                                       entries[i].icon_name,
+                                       entries[i].help_id,
+                                       entries[i].value);
+
+      if (callback)
+        g_signal_connect (action, "gimp-activate",
+                          G_CALLBACK (callback),
+                          group->user_data);
+
+      gimp_action_group_add_action_with_accel (group, GIMP_ACTION (action),
+                                               entries[i].accelerator);
+      g_signal_emit (group, signals[ACTION_ADDED], 0, action);
+
+      g_object_unref (action);
+    }
+}
+
+void
+gimp_action_group_add_procedure_actions (GimpActionGroup                *group,
+                                         const GimpProcedureActionEntry *entries,
+                                         guint                           n_entries,
+                                         GimpActionCallback              callback)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+
+  for (i = 0; i < n_entries; i++)
+    {
+      GimpProcedureAction *action;
+
+      if (! gimp_action_group_check_unique_action (group, entries[i].name))
+        continue;
+
+      action = gimp_procedure_action_new (entries[i].name,
+                                          entries[i].label,
+                                          entries[i].tooltip,
+                                          entries[i].icon_name,
+                                          entries[i].help_id,
+                                          entries[i].procedure);
+
+      if (callback)
+        g_signal_connect (action, "gimp-activate",
+                          G_CALLBACK (callback),
+                          group->user_data);
+
+      gimp_action_group_add_action_with_accel (group, GIMP_ACTION (action),
+                                               entries[i].accelerator);
+      g_signal_emit (group, signals[ACTION_ADDED], 0, action);
+
+      g_object_unref (action);
+    }
+}
+
+/**
+ * gimp_action_group_remove_action_and_accel:
+ * @group:  the #GimpActionGroup to which @action belongs.
+ * @action: the #GimpAction.
+ *
+ * This function removes @action from @group and clean any
+ * accelerator this action may have set.
+ * If you wish to only remove the action from the group, use
+ * gimp_action_group_remove_action() instead.
+ */
+void
+gimp_action_group_remove_action_and_accel (GimpActionGroup *group,
+                                           GimpAction      *action)
+{
+  const gchar *action_name;
+  const gchar *group_name;
+  gchar       *accel_path;
+
+  action_name = gimp_action_get_name (action);
+  group_name  = gimp_action_group_get_name (group);
+  accel_path = g_strconcat ("<Actions>/", group_name, "/",
+                            action_name, NULL);
+
+  gtk_accel_map_change_entry (accel_path, 0, 0, FALSE);
+
+  gimp_action_group_remove_action (group, action);
+  g_free (accel_path);
+}
+
+void
+gimp_action_group_activate_action (GimpActionGroup *group,
+                                   const gchar     *action_name)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to activate action which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gimp_action_activate (action);
+}
+
+void
+gimp_action_group_set_action_visible (GimpActionGroup *group,
+                                      const gchar     *action_name,
+                                      gboolean         visible)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set visibility of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gimp_action_set_visible (action, visible);
+}
+
+void
+gimp_action_group_set_action_sensitive (GimpActionGroup *group,
+                                        const gchar     *action_name,
+                                        gboolean         sensitive)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set sensitivity of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gimp_action_set_sensitive (action, sensitive);
+}
+
+void
+gimp_action_group_set_action_active (GimpActionGroup *group,
+                                     const gchar     *action_name,
+                                     gboolean         active)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set \"active\" of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  if (! GTK_IS_TOGGLE_ACTION (action))
+    {
+      g_warning ("%s: Unable to set \"active\" of action "
+                 "which is not a GtkToggleAction: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                active ? TRUE : FALSE);
+}
+
+void
+gimp_action_group_set_action_label (GimpActionGroup *group,
+                                    const gchar     *action_name,
+                                    const gchar     *label)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set label of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gimp_action_set_label (action, label);
+}
+
+void
+gimp_action_group_set_action_pixbuf (GimpActionGroup *group,
+                                     const gchar     *action_name,
+                                     GdkPixbuf       *pixbuf)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set pixbuf of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gimp_action_set_gicon (action, G_ICON (pixbuf));
+}
+
+
+void
+gimp_action_group_set_action_tooltip (GimpActionGroup     *group,
+                                      const gchar         *action_name,
+                                      const gchar         *tooltip)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set tooltip of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gimp_action_set_tooltip (action, tooltip);
+}
+
+const gchar *
+gimp_action_group_get_action_tooltip (GimpActionGroup     *group,
+                                      const gchar         *action_name)
+{
+  GimpAction *action;
+
+  g_return_val_if_fail (GIMP_IS_ACTION_GROUP (group), NULL);
+  g_return_val_if_fail (action_name != NULL, NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to get tooltip of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return NULL;
+    }
+
+  return gimp_action_get_tooltip (action);
+}
+
+void
+gimp_action_group_set_action_context (GimpActionGroup *group,
+                                      const gchar     *action_name,
+                                      GimpContext     *context)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set context of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  if (! GIMP_IS_ACTION (action))
+    {
+      g_warning ("%s: Unable to set \"context\" of action "
+                 "which is not a GimpAction: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  g_object_set (action, "context", context, NULL);
+}
+
+void
+gimp_action_group_set_action_color (GimpActionGroup *group,
+                                    const gchar     *action_name,
+                                    const GimpRGB   *color,
+                                    gboolean         set_label)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set color of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  if (! GIMP_IS_ACTION (action))
+    {
+      g_warning ("%s: Unable to set \"color\" of action "
+                 "which is not a GimpAction: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  if (set_label)
+    {
+      gchar *label;
+
+      if (color)
+        label = g_strdup_printf (_("RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"),
+                                 color->r, color->g, color->b, color->a);
+      else
+        label = g_strdup (_("(none)"));
+
+      g_object_set (action,
+                    "color", color,
+                    "label", label,
+                    NULL);
+      g_free (label);
+    }
+  else
+    {
+      g_object_set (action, "color", color, NULL);
+    }
+}
+
+void
+gimp_action_group_set_action_viewable (GimpActionGroup *group,
+                                       const gchar     *action_name,
+                                       GimpViewable    *viewable)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+  g_return_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable));
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set viewable of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  if (! GIMP_IS_ACTION (action))
+    {
+      g_warning ("%s: Unable to set \"viewable\" of action "
+                 "which is not a GimpAction: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  g_object_set (action, "viewable", viewable, NULL);
+}
+
+void
+gimp_action_group_set_action_hide_empty (GimpActionGroup *group,
+                                         const gchar     *action_name,
+                                         gboolean         hide_empty)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set \"hide-if-empty\" of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  g_object_set (action, "hide-if-empty", hide_empty ? TRUE : FALSE, NULL);
+}
+
+void
+gimp_action_group_set_action_always_show_image (GimpActionGroup *group,
+                                                const gchar     *action_name,
+                                                gboolean         always_show_image)
+{
+  GimpAction *action;
+
+  g_return_if_fail (GIMP_IS_ACTION_GROUP (group));
+  g_return_if_fail (action_name != NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  if (! action)
+    {
+      g_warning ("%s: Unable to set \"always-show-image\" of action "
+                 "which doesn't exist: %s",
+                 G_STRFUNC, action_name);
+      return;
+    }
+
+  gtk_action_set_always_show_image ((GtkAction *) action, always_show_image);
+}
diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h
new file mode 100644
index 0000000..3436be3
--- /dev/null
+++ b/app/widgets/gimpactiongroup.h
@@ -0,0 +1,241 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactiongroup.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_GROUP_H__
+#define __GIMP_ACTION_GROUP_H__
+
+
+#define GIMP_TYPE_ACTION_GROUP              (gimp_action_group_get_type ())
+#define GIMP_ACTION_GROUP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_GROUP, GimpActionGroup))
+#define GIMP_ACTION_GROUP_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GIMP_TYPE_ACTION_GROUP, GimpActionGroupClass))
+#define GIMP_IS_ACTION_GROUP(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION_GROUP))
+#define GIMP_IS_ACTION_GROUP_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GIMP_TYPE_ACTION_GROUP))
+#define GIMP_ACTION_GROUP_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((inst), GIMP_TYPE_ACTION_GROUP, GimpActionGroupClass))
+
+
+typedef struct _GimpActionGroupClass GimpActionGroupClass;
+
+struct _GimpActionGroup
+{
+  GtkActionGroup             parent_instance;
+
+  Gimp                      *gimp;
+  gchar                     *label;
+  gchar                     *icon_name;
+
+  gpointer                   user_data;
+
+  GimpActionGroupUpdateFunc  update_func;
+};
+
+struct _GimpActionGroupClass
+{
+  GtkActionGroupClass  parent_class;
+
+  GHashTable          *groups;
+
+  /* signals */
+  void (* action_added) (GimpActionGroup *group,
+                         GimpAction      *action);
+};
+
+
+typedef void (* GimpActionCallback) (GimpAction *action,
+                                     GVariant   *value,
+                                     gpointer    data);
+
+struct _GimpActionEntry
+{
+  const gchar        *name;
+  const gchar        *icon_name;
+  const gchar        *label;
+  const gchar        *accelerator;
+  const gchar        *tooltip;
+  GimpActionCallback  callback;
+
+  const gchar        *help_id;
+};
+
+struct _GimpToggleActionEntry
+{
+  const gchar        *name;
+  const gchar        *icon_name;
+  const gchar        *label;
+  const gchar        *accelerator;
+  const gchar        *tooltip;
+  GimpActionCallback  callback;
+  gboolean            is_active;
+
+  const gchar *help_id;
+};
+
+struct _GimpRadioActionEntry
+{
+  const gchar *name;
+  const gchar *icon_name;
+  const gchar *label;
+  const gchar *accelerator;
+  const gchar *tooltip;
+  gint         value;
+
+  const gchar *help_id;
+};
+
+struct _GimpEnumActionEntry
+{
+  const gchar *name;
+  const gchar *icon_name;
+  const gchar *label;
+  const gchar *accelerator;
+  const gchar *tooltip;
+  gint         value;
+  gboolean     value_variable;
+
+  const gchar *help_id;
+};
+
+struct _GimpStringActionEntry
+{
+  const gchar *name;
+  const gchar *icon_name;
+  const gchar *label;
+  const gchar *accelerator;
+  const gchar *tooltip;
+  const gchar *value;
+
+  const gchar *help_id;
+};
+
+struct _GimpProcedureActionEntry
+{
+  const gchar   *name;
+  const gchar   *icon_name;
+  const gchar   *label;
+  const gchar   *accelerator;
+  const gchar   *tooltip;
+  GimpProcedure *procedure;
+
+  const gchar   *help_id;
+};
+
+
+GType            gimp_action_group_get_type   (void) G_GNUC_CONST;
+
+GimpActionGroup *gimp_action_group_new        (Gimp                  *gimp,
+                                               const gchar           *name,
+                                               const gchar           *label,
+                                               const gchar           *icon_name,
+                                               gpointer               user_data,
+                                               GimpActionGroupUpdateFunc update_func);
+
+GList *gimp_action_groups_from_name           (const gchar           *name);
+
+const gchar * gimp_action_group_get_name       (GimpActionGroup       *group);
+
+void  gimp_action_group_add_action            (GimpActionGroup *action_group,
+                                               GimpAction      *action);
+void  gimp_action_group_add_action_with_accel (GimpActionGroup *action_group,
+                                               GimpAction      *action,
+                                               const gchar     *accelerator);
+void  gimp_action_group_remove_action         (GimpActionGroup *action_group,
+                                               GimpAction      *action);
+
+GimpAction  * gimp_action_group_get_action     (GimpActionGroup       *group,
+                                                const gchar           *action_name);
+GList       * gimp_action_group_list_actions   (GimpActionGroup       *group);
+
+void   gimp_action_group_update               (GimpActionGroup       *group,
+                                               gpointer               update_data);
+
+void   gimp_action_group_add_actions          (GimpActionGroup             *group,
+                                               const gchar                 *msg_context,
+                                               const GimpActionEntry       *entries,
+                                               guint                        n_entries);
+void   gimp_action_group_add_toggle_actions   (GimpActionGroup             *group,
+                                               const gchar                 *msg_context,
+                                               const GimpToggleActionEntry *entries,
+                                               guint                        n_entries);
+GSList *gimp_action_group_add_radio_actions   (GimpActionGroup             *group,
+                                               const gchar                 *msg_context,
+                                               const GimpRadioActionEntry  *entries,
+                                               guint                        n_entries,
+                                               GSList                      *radio_group,
+                                               gint                         value,
+                                               GimpActionCallback           callback);
+void   gimp_action_group_add_enum_actions     (GimpActionGroup             *group,
+                                               const gchar                 *msg_context,
+                                               const GimpEnumActionEntry   *entries,
+                                               guint                        n_entries,
+                                               GimpActionCallback           callback);
+void   gimp_action_group_add_string_actions   (GimpActionGroup             *group,
+                                               const gchar                 *msg_context,
+                                               const GimpStringActionEntry *entries,
+                                               guint                        n_entries,
+                                               GimpActionCallback           callback);
+void   gimp_action_group_add_procedure_actions(GimpActionGroup             *group,
+                                               const GimpProcedureActionEntry *entries,
+                                               guint                        n_entries,
+                                               GimpActionCallback           callback);
+
+void   gimp_action_group_remove_action_and_accel (GimpActionGroup          *group,
+                                                  GimpAction               *action);
+
+void          gimp_action_group_activate_action       (GimpActionGroup *group,
+                                                       const gchar     *action_name);
+void          gimp_action_group_set_action_visible    (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       gboolean         visible);
+void          gimp_action_group_set_action_sensitive  (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       gboolean         sensitive);
+void          gimp_action_group_set_action_active     (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       gboolean         active);
+void          gimp_action_group_set_action_label      (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       const gchar     *label);
+void          gimp_action_group_set_action_pixbuf     (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       GdkPixbuf       *pixbuf);
+void          gimp_action_group_set_action_tooltip    (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       const gchar     *tooltip);
+const gchar * gimp_action_group_get_action_tooltip    (GimpActionGroup *group,
+                                                       const gchar     *action_name);
+void          gimp_action_group_set_action_context    (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       GimpContext     *context);
+void          gimp_action_group_set_action_color      (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       const GimpRGB   *color,
+                                                       gboolean         set_label);
+void          gimp_action_group_set_action_viewable   (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       GimpViewable    *viewable);
+void          gimp_action_group_set_action_hide_empty (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       gboolean         hide_empty);
+void   gimp_action_group_set_action_always_show_image (GimpActionGroup *group,
+                                                       const gchar     *action_name,
+                                                       gboolean         always_show_image);
+
+
+
+#endif  /* __GIMP_ACTION_GROUP_H__ */
diff --git a/app/widgets/gimpactionimpl.c b/app/widgets/gimpactionimpl.c
new file mode 100644
index 0000000..1ebd404
--- /dev/null
+++ b/app/widgets/gimpactionimpl.c
@@ -0,0 +1,400 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpaction.c
+ * Copyright (C) 2004-2019 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpimagefile.h"  /* eek */
+
+#include "gimpaction.h"
+#include "gimpactionimpl.h"
+#include "gimpaction-history.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_COLOR,
+  PROP_VIEWABLE,
+  PROP_ELLIPSIZE,
+  PROP_MAX_WIDTH_CHARS
+};
+
+
+static void   gimp_action_impl_finalize      (GObject        *object);
+static void   gimp_action_impl_set_property  (GObject        *object,
+                                              guint           prop_id,
+                                              const GValue   *value,
+                                              GParamSpec     *pspec);
+static void   gimp_action_impl_get_property  (GObject        *object,
+                                              guint           prop_id,
+                                              GValue         *value,
+                                              GParamSpec     *pspec);
+
+static void   gimp_action_impl_activate      (GtkAction      *action);
+static void   gimp_action_impl_connect_proxy (GtkAction      *action,
+                                              GtkWidget      *proxy);
+
+static void   gimp_action_impl_set_proxy     (GimpActionImpl *impl,
+                                              GtkWidget      *proxy);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpActionImpl, gimp_action_impl, GTK_TYPE_ACTION,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_ACTION, NULL))
+
+#define parent_class gimp_action_impl_parent_class
+
+
+static void
+gimp_action_impl_class_init (GimpActionImplClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkActionClass *action_class = GTK_ACTION_CLASS (klass);
+  GimpRGB         black;
+
+  object_class->finalize      = gimp_action_impl_finalize;
+  object_class->set_property  = gimp_action_impl_set_property;
+  object_class->get_property  = gimp_action_impl_get_property;
+
+  action_class->activate      = gimp_action_impl_activate;
+  action_class->connect_proxy = gimp_action_impl_connect_proxy;
+
+  gimp_rgba_set (&black, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_COLOR,
+                                   gimp_param_spec_rgb ("color",
+                                                        NULL, NULL,
+                                                        TRUE, &black,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_VIEWABLE,
+                                   g_param_spec_object ("viewable",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_VIEWABLE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ELLIPSIZE,
+                                   g_param_spec_enum ("ellipsize",
+                                                      NULL, NULL,
+                                                      PANGO_TYPE_ELLIPSIZE_MODE,
+                                                      PANGO_ELLIPSIZE_NONE,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_MAX_WIDTH_CHARS,
+                                   g_param_spec_int ("max-width-chars",
+                                                     NULL, NULL,
+                                                     -1, G_MAXINT, -1,
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_action_impl_init (GimpActionImpl *impl)
+{
+  impl->ellipsize       = PANGO_ELLIPSIZE_NONE;
+  impl->max_width_chars = -1;
+
+  gimp_action_init (GIMP_ACTION (impl));
+}
+
+static void
+gimp_action_impl_finalize (GObject *object)
+{
+  GimpActionImpl *impl = GIMP_ACTION_IMPL (object);
+
+  g_clear_object (&impl->context);
+  g_clear_pointer (&impl->color, g_free);
+  g_clear_object (&impl->viewable);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_action_impl_get_property (GObject    *object,
+                               guint       prop_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpActionImpl *impl = GIMP_ACTION_IMPL (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, impl->context);
+      break;
+
+    case PROP_COLOR:
+      g_value_set_boxed (value, impl->color);
+      break;
+
+    case PROP_VIEWABLE:
+      g_value_set_object (value, impl->viewable);
+      break;
+
+    case PROP_ELLIPSIZE:
+      g_value_set_enum (value, impl->ellipsize);
+      break;
+
+    case PROP_MAX_WIDTH_CHARS:
+      g_value_set_int (value, impl->max_width_chars);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_action_impl_set_property (GObject      *object,
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpActionImpl *impl      = GIMP_ACTION_IMPL (object);
+  gboolean        set_proxy = FALSE;
+
+  switch (prop_id)
+    {
+    case PROP_CONTEXT:
+      g_set_object (&impl->context, g_value_get_object (value));
+      break;
+
+    case PROP_COLOR:
+      g_clear_pointer (&impl->color, g_free);
+      impl->color = g_value_dup_boxed (value);
+      set_proxy = TRUE;
+      break;
+
+    case PROP_VIEWABLE:
+      g_set_object  (&impl->viewable, g_value_get_object (value));
+      set_proxy = TRUE;
+      break;
+
+    case PROP_ELLIPSIZE:
+      impl->ellipsize = g_value_get_enum (value);
+      set_proxy = TRUE;
+      break;
+
+    case PROP_MAX_WIDTH_CHARS:
+      impl->max_width_chars = g_value_get_int (value);
+      set_proxy = TRUE;
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+
+  if (set_proxy)
+    {
+      GSList *list;
+
+      for (list = gimp_action_get_proxies (GIMP_ACTION (impl));
+           list;
+           list = g_slist_next (list))
+        {
+          gimp_action_impl_set_proxy (impl, list->data);
+        }
+    }
+}
+
+static void
+gimp_action_impl_activate (GtkAction *action)
+{
+  if (GTK_ACTION_CLASS (parent_class)->activate)
+    GTK_ACTION_CLASS (parent_class)->activate (action);
+
+  gimp_action_emit_activate (GIMP_ACTION (action), NULL);
+
+  gimp_action_history_action_activated (GIMP_ACTION (action));
+}
+
+static void
+gimp_action_impl_connect_proxy (GtkAction *action,
+                                GtkWidget *proxy)
+{
+  GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
+
+  gimp_action_impl_set_proxy (GIMP_ACTION_IMPL (action), proxy);
+
+  gimp_action_set_proxy (GIMP_ACTION (action), proxy);
+}
+
+
+/*  public functions  */
+
+GimpAction *
+gimp_action_impl_new (const gchar *name,
+                      const gchar *label,
+                      const gchar *tooltip,
+                      const gchar *icon_name,
+                      const gchar *help_id)
+{
+  GimpAction *action;
+
+  action = g_object_new (GIMP_TYPE_ACTION_IMPL,
+                         "name",      name,
+                         "label",     label,
+                         "tooltip",   tooltip,
+                         "icon-name", icon_name,
+                         NULL);
+
+  gimp_action_set_help_id (action, help_id);
+
+  return action;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_action_impl_set_proxy (GimpActionImpl *impl,
+                            GtkWidget      *proxy)
+{
+  if (! GTK_IS_IMAGE_MENU_ITEM (proxy))
+    return;
+
+  if (impl->color)
+    {
+      GtkWidget *area;
+
+      area = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (proxy));
+
+      if (GIMP_IS_COLOR_AREA (area))
+        {
+          gimp_color_area_set_color (GIMP_COLOR_AREA (area), impl->color);
+        }
+      else
+        {
+          gint width, height;
+
+          area = gimp_color_area_new (impl->color,
+                                      GIMP_COLOR_AREA_SMALL_CHECKS, 0);
+          gimp_color_area_set_draw_border (GIMP_COLOR_AREA (area), TRUE);
+
+          if (impl->context)
+            gimp_color_area_set_color_config (GIMP_COLOR_AREA (area),
+                                              impl->context->gimp->config->color_management);
+
+          gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (proxy),
+                                             GTK_ICON_SIZE_MENU,
+                                             &width, &height);
+
+          gtk_widget_set_size_request (area, width, height);
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), area);
+          gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy),
+                                                     TRUE);
+          gtk_widget_show (area);
+        }
+    }
+  else if (impl->viewable)
+    {
+      GtkWidget *view;
+
+      view = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (proxy));
+
+      if (GIMP_IS_VIEW (view) &&
+          g_type_is_a (G_TYPE_FROM_INSTANCE (impl->viewable),
+                       GIMP_VIEW (view)->renderer->viewable_type))
+        {
+          gimp_view_set_viewable (GIMP_VIEW (view), impl->viewable);
+        }
+      else
+        {
+          GtkIconSize size;
+          gint        width, height;
+          gint        border_width;
+
+          if (GIMP_IS_IMAGEFILE (impl->viewable))
+            {
+              size         = GTK_ICON_SIZE_LARGE_TOOLBAR;
+              border_width = 0;
+            }
+          else
+            {
+              size         = GTK_ICON_SIZE_MENU;
+              border_width = 1;
+            }
+
+          gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (proxy),
+                                             size, &width, &height);
+
+          view = gimp_view_new_full (impl->context, impl->viewable,
+                                     width, height, border_width,
+                                     FALSE, FALSE, FALSE);
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), view);
+          gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy),
+                                                     TRUE);
+          gtk_widget_show (view);
+        }
+    }
+  else
+    {
+      GtkWidget *image;
+
+      image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (proxy));
+
+      if (GIMP_IS_VIEW (image) || GIMP_IS_COLOR_AREA (image))
+        {
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), NULL);
+          gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy),
+                                                     FALSE);
+          g_object_notify (G_OBJECT (impl), "icon-name");
+        }
+    }
+
+  {
+    GtkWidget *child = gtk_bin_get_child (GTK_BIN (proxy));
+
+    if (GTK_IS_BOX (child))
+      child = g_object_get_data (G_OBJECT (proxy), "gimp-menu-item-label");
+
+    if (GTK_IS_LABEL (child))
+      {
+        GtkLabel *label = GTK_LABEL (child);
+
+        gtk_label_set_ellipsize (label, impl->ellipsize);
+        gtk_label_set_max_width_chars (label, impl->max_width_chars);
+      }
+  }
+}
diff --git a/app/widgets/gimpactionimpl.h b/app/widgets/gimpactionimpl.h
new file mode 100644
index 0000000..cd6e7a5
--- /dev/null
+++ b/app/widgets/gimpactionimpl.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactionimpl.h
+ * Copyright (C) 2004-2019 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_IMPL_H__
+#define __GIMP_ACTION_IMPL_H__
+
+
+#define GIMP_TYPE_ACTION_IMPL            (gimp_action_impl_get_type ())
+#define GIMP_ACTION_IMPL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_IMPL, GimpActionImpl))
+#define GIMP_ACTION_IMPL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION_IMPL, GimpActionImplClass))
+#define GIMP_IS_ACTION_IMPL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION_IMPL))
+#define GIMP_IS_ACTION_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ACTION_IMPL))
+#define GIMP_ACTION_IMPL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_ACTION_IMPL, GimpActionImplClass))
+
+typedef struct _GimpActionImpl      GimpActionImpl;
+typedef struct _GimpActionImplClass GimpActionImplClass;
+
+struct _GimpActionImpl
+{
+  GtkAction           parent_instance;
+
+  GimpContext        *context;
+
+  GimpRGB            *color;
+  GimpViewable       *viewable;
+  PangoEllipsizeMode  ellipsize;
+  gint                max_width_chars;
+};
+
+struct _GimpActionImplClass
+{
+  GtkActionClass parent_class;
+};
+
+GType         gimp_action_impl_get_type       (void) G_GNUC_CONST;
+
+GimpAction  * gimp_action_impl_new            (const gchar   *name,
+                                               const gchar   *label,
+                                               const gchar   *tooltip,
+                                               const gchar   *icon_name,
+                                               const gchar   *help_id);
+
+
+#endif  /* __GIMP_ACTION_IMPL_H__ */
diff --git a/app/widgets/gimpactionview.c b/app/widgets/gimpactionview.c
new file mode 100644
index 0000000..36c2e98
--- /dev/null
+++ b/app/widgets/gimpactionview.c
@@ -0,0 +1,905 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactionview.c
+ * Copyright (C) 2004-2005  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+
+#include "gimpaction.h"
+#include "gimpactiongroup.h"
+#include "gimpactionview.h"
+#include "gimpmessagebox.h"
+#include "gimpmessagedialog.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void     gimp_action_view_dispose         (GObject         *object);
+static void     gimp_action_view_finalize        (GObject         *object);
+
+static void     gimp_action_view_select_path     (GimpActionView  *view,
+                                                  GtkTreePath     *path);
+static gboolean gimp_action_view_accel_find_func (GtkAccelKey     *key,
+                                                  GClosure        *closure,
+                                                  gpointer         data);
+static void     gimp_action_view_accel_changed   (GtkAccelGroup   *accel_group,
+                                                  guint            unused1,
+                                                  GdkModifierType  unused2,
+                                                  GClosure        *accel_closure,
+                                                  GimpActionView  *view);
+static void     gimp_action_view_accel_edited    (GtkCellRendererAccel *accel,
+                                                  const char      *path_string,
+                                                  guint            accel_key,
+                                                  GdkModifierType  accel_mask,
+                                                  guint            hardware_keycode,
+                                                  GimpActionView  *view);
+static void     gimp_action_view_accel_cleared   (GtkCellRendererAccel *accel,
+                                                  const char      *path_string,
+                                                  GimpActionView  *view);
+
+
+G_DEFINE_TYPE (GimpActionView, gimp_action_view, GTK_TYPE_TREE_VIEW)
+
+#define parent_class gimp_action_view_parent_class
+
+
+static void
+gimp_action_view_class_init (GimpActionViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose  = gimp_action_view_dispose;
+  object_class->finalize = gimp_action_view_finalize;
+}
+
+static void
+gimp_action_view_init (GimpActionView *view)
+{
+}
+
+static void
+gimp_action_view_dispose (GObject *object)
+{
+  GimpActionView *view = GIMP_ACTION_VIEW (object);
+
+  if (view->manager)
+    {
+      if (view->show_shortcuts)
+        {
+          GtkAccelGroup *group;
+
+          group = gimp_ui_manager_get_accel_group (view->manager);
+
+          g_signal_handlers_disconnect_by_func (group,
+                                                gimp_action_view_accel_changed,
+                                                view);
+        }
+
+      g_clear_object (&view->manager);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_action_view_finalize (GObject *object)
+{
+  GimpActionView *view = GIMP_ACTION_VIEW (object);
+
+  g_clear_pointer (&view->filter, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+idle_start_editing (GtkTreeView *tree_view)
+{
+  GtkTreePath *path;
+
+  path = g_object_get_data (G_OBJECT (tree_view), "start-editing-path");
+
+  if (path)
+    {
+      gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+      gtk_tree_view_set_cursor (tree_view, path,
+                                gtk_tree_view_get_column (tree_view, 1),
+                                TRUE);
+
+      g_object_set_data (G_OBJECT (tree_view), "start-editing-path", NULL);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_action_view_button_press (GtkWidget      *widget,
+                               GdkEventButton *event)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+  GtkTreePath *path;
+
+  if (event->window != gtk_tree_view_get_bin_window (tree_view))
+    return FALSE;
+
+  if (gtk_tree_view_get_path_at_pos (tree_view,
+                                     (gint) event->x,
+                                     (gint) event->y,
+                                     &path, NULL,
+                                     NULL, NULL))
+    {
+      GClosure *closure;
+      GSource  *source;
+
+      if (gtk_tree_path_get_depth (path) == 1)
+        {
+          gtk_tree_path_free (path);
+          return FALSE;
+        }
+
+      g_object_set_data_full (G_OBJECT (tree_view), "start-editing-path",
+                              path, (GDestroyNotify) gtk_tree_path_free);
+
+      g_signal_stop_emission_by_name (tree_view, "button-press-event");
+
+      closure = g_cclosure_new_object (G_CALLBACK (idle_start_editing),
+                                       G_OBJECT (tree_view));
+
+      source = g_idle_source_new ();
+      g_source_set_closure (source, closure);
+      g_source_attach (source, NULL);
+      g_source_unref (source);
+    }
+
+  return TRUE;
+}
+
+GtkWidget *
+gimp_action_view_new (GimpUIManager *manager,
+                      const gchar   *select_action,
+                      gboolean       show_shortcuts)
+{
+  GtkTreeView       *view;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer   *cell;
+  GtkTreeStore      *store;
+  GtkTreeModel      *filter;
+  GtkAccelGroup     *accel_group;
+  GList             *list;
+  GtkTreePath       *select_path = NULL;
+
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), NULL);
+
+  store = gtk_tree_store_new (GIMP_ACTION_VIEW_N_COLUMNS,
+                              G_TYPE_BOOLEAN,         /* COLUMN_VISIBLE        */
+                              GIMP_TYPE_ACTION,       /* COLUMN_ACTION         */
+                              G_TYPE_STRING,          /* COLUMN_ICON_NAME      */
+                              G_TYPE_STRING,          /* COLUMN_LABEL          */
+                              G_TYPE_STRING,          /* COLUMN_LABEL_CASEFOLD */
+                              G_TYPE_STRING,          /* COLUMN_NAME           */
+                              G_TYPE_UINT,            /* COLUMN_ACCEL_KEY      */
+                              GDK_TYPE_MODIFIER_TYPE, /* COLUMN_ACCEL_MASK     */
+                              G_TYPE_CLOSURE);        /* COLUMN_ACCEL_CLOSURE  */
+
+  accel_group = gimp_ui_manager_get_accel_group (manager);
+
+  for (list = gimp_ui_manager_get_action_groups (manager);
+       list;
+       list = g_list_next (list))
+    {
+      GimpActionGroup *group = list->data;
+      GList           *actions;
+      GList           *list2;
+      GtkTreeIter      group_iter;
+
+      gtk_tree_store_append (store, &group_iter, NULL);
+
+      gtk_tree_store_set (store, &group_iter,
+                          GIMP_ACTION_VIEW_COLUMN_ICON_NAME, group->icon_name,
+                          GIMP_ACTION_VIEW_COLUMN_LABEL,     group->label,
+                          -1);
+
+      actions = gimp_action_group_list_actions (group);
+
+      actions = g_list_sort (actions, (GCompareFunc) gimp_action_name_compare);
+
+      for (list2 = actions; list2; list2 = g_list_next (list2))
+        {
+          GimpAction      *action        = list2->data;
+          const gchar     *name          = gimp_action_get_name (action);
+          const gchar     *icon_name     = gimp_action_get_icon_name (action);
+          gchar           *label;
+          gchar           *label_casefold;
+          guint            accel_key     = 0;
+          GdkModifierType  accel_mask    = 0;
+          GClosure        *accel_closure = NULL;
+          GtkTreeIter      action_iter;
+
+          if (gimp_action_is_gui_blacklisted (name))
+            continue;
+
+          label = gimp_strip_uline (gimp_action_get_label (action));
+
+          if (! (label && strlen (label)))
+            {
+              g_free (label);
+              label = g_strdup (name);
+            }
+
+          label_casefold = g_utf8_casefold (label, -1);
+
+          if (show_shortcuts)
+            {
+              accel_closure = gimp_action_get_accel_closure (action);
+
+              if (accel_closure)
+                {
+                  GtkAccelKey *key;
+
+                  key = gtk_accel_group_find (accel_group,
+                                              gimp_action_view_accel_find_func,
+                                              accel_closure);
+
+                  if (key            &&
+                      key->accel_key &&
+                      key->accel_flags & GTK_ACCEL_VISIBLE)
+                    {
+                      accel_key  = key->accel_key;
+                      accel_mask = key->accel_mods;
+                    }
+                }
+            }
+
+          gtk_tree_store_append (store, &action_iter, &group_iter);
+
+          gtk_tree_store_set (store, &action_iter,
+                              GIMP_ACTION_VIEW_COLUMN_VISIBLE,        TRUE,
+                              GIMP_ACTION_VIEW_COLUMN_ACTION,         action,
+                              GIMP_ACTION_VIEW_COLUMN_ICON_NAME,      icon_name,
+                              GIMP_ACTION_VIEW_COLUMN_LABEL,          label,
+                              GIMP_ACTION_VIEW_COLUMN_LABEL_CASEFOLD, label_casefold,
+                              GIMP_ACTION_VIEW_COLUMN_NAME,           name,
+                              GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,      accel_key,
+                              GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK,     accel_mask,
+                              GIMP_ACTION_VIEW_COLUMN_ACCEL_CLOSURE,  accel_closure,
+                              -1);
+
+          g_free (label);
+          g_free (label_casefold);
+
+          if (select_action && ! strcmp (select_action, name))
+            {
+              select_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store),
+                                                     &action_iter);
+            }
+        }
+
+      g_list_free (actions);
+    }
+
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
+
+  g_object_unref (store);
+
+  view = g_object_new (GIMP_TYPE_ACTION_VIEW,
+                       "model",      filter,
+                       "rules-hint", TRUE,
+                       NULL);
+
+  g_object_unref (filter);
+
+  gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter),
+                                            GIMP_ACTION_VIEW_COLUMN_VISIBLE);
+
+  GIMP_ACTION_VIEW (view)->manager        = g_object_ref (manager);
+  GIMP_ACTION_VIEW (view)->show_shortcuts = show_shortcuts;
+
+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (view),
+                                   GIMP_ACTION_VIEW_COLUMN_LABEL);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Action"));
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, cell, FALSE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "icon-name",
+                                       GIMP_ACTION_VIEW_COLUMN_ICON_NAME,
+                                       NULL);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text",
+                                       GIMP_ACTION_VIEW_COLUMN_LABEL,
+                                       NULL);
+
+  gtk_tree_view_append_column (view, column);
+
+  if (show_shortcuts)
+    {
+      g_signal_connect (view, "button-press-event",
+                        G_CALLBACK (gimp_action_view_button_press),
+                        NULL);
+
+      g_signal_connect (accel_group, "accel-changed",
+                        G_CALLBACK (gimp_action_view_accel_changed),
+                        view);
+
+      column = gtk_tree_view_column_new ();
+      gtk_tree_view_column_set_title (column, _("Shortcut"));
+
+      cell = gtk_cell_renderer_accel_new ();
+      g_object_set (cell,
+                    "mode",     GTK_CELL_RENDERER_MODE_EDITABLE,
+                    "editable", TRUE,
+                    NULL);
+      gtk_tree_view_column_pack_start (column, cell, TRUE);
+      gtk_tree_view_column_set_attributes (column, cell,
+                                           "accel-key",
+                                           GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,
+                                           "accel-mods",
+                                           GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK,
+                                           NULL);
+
+      g_signal_connect (cell, "accel-edited",
+                        G_CALLBACK (gimp_action_view_accel_edited),
+                        view);
+      g_signal_connect (cell, "accel-cleared",
+                        G_CALLBACK (gimp_action_view_accel_cleared),
+                        view);
+
+      gtk_tree_view_append_column (view, column);
+    }
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Name"));
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text",
+                                       GIMP_ACTION_VIEW_COLUMN_NAME,
+                                       NULL);
+
+  gtk_tree_view_append_column (view, column);
+
+  if (select_path)
+    {
+      gimp_action_view_select_path (GIMP_ACTION_VIEW (view), select_path);
+      gtk_tree_path_free (select_path);
+    }
+
+  return GTK_WIDGET (view);
+}
+
+void
+gimp_action_view_set_filter (GimpActionView *view,
+                             const gchar    *filter)
+{
+  GtkTreeSelection    *sel;
+  GtkTreeModel        *filtered_model;
+  GtkTreeModel        *model;
+  GtkTreeIter          iter;
+  gboolean             iter_valid;
+  GtkTreeRowReference *selected_row = NULL;
+
+  g_return_if_fail (GIMP_IS_ACTION_VIEW (view));
+
+  filtered_model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+  model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filtered_model));
+
+  if (filter && ! strlen (filter))
+    filter = NULL;
+
+  g_clear_pointer (&view->filter, g_free);
+
+  if (filter)
+    view->filter = g_utf8_casefold (filter, -1);
+
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+  if (gtk_tree_selection_get_selected (sel, NULL, &iter))
+    {
+      GtkTreePath *path = gtk_tree_model_get_path (filtered_model, &iter);
+
+      selected_row = gtk_tree_row_reference_new (filtered_model, path);
+    }
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      GtkTreeIter child_iter;
+      gboolean    child_valid;
+      gint        n_children = 0;
+
+      for (child_valid = gtk_tree_model_iter_children (model, &child_iter,
+                                                       &iter);
+           child_valid;
+           child_valid = gtk_tree_model_iter_next (model, &child_iter))
+        {
+          gboolean visible = TRUE;
+
+          if (view->filter)
+            {
+              gchar *label;
+              gchar *name;
+
+              gtk_tree_model_get (model, &child_iter,
+                                  GIMP_ACTION_VIEW_COLUMN_LABEL_CASEFOLD, &label,
+                                  GIMP_ACTION_VIEW_COLUMN_NAME,           &name,
+                                  -1);
+
+              visible = label && name && (strstr (label, view->filter) != NULL ||
+                                          strstr (name,  view->filter) != NULL);
+
+              g_free (label);
+              g_free (name);
+            }
+
+          gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
+                              GIMP_ACTION_VIEW_COLUMN_VISIBLE, visible,
+                              -1);
+
+          if (visible)
+            n_children++;
+        }
+
+      gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
+                          GIMP_ACTION_VIEW_COLUMN_VISIBLE, n_children > 0,
+                          -1);
+    }
+
+  if (view->filter)
+    gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
+  else
+    gtk_tree_view_collapse_all (GTK_TREE_VIEW (view));
+
+  gtk_tree_view_columns_autosize (GTK_TREE_VIEW (view));
+
+  if (selected_row)
+    {
+      if (gtk_tree_row_reference_valid (selected_row))
+        {
+          GtkTreePath *path = gtk_tree_row_reference_get_path (selected_row);
+
+          gimp_action_view_select_path (view, path);
+          gtk_tree_path_free (path);
+        }
+
+      gtk_tree_row_reference_free (selected_row);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_action_view_select_path (GimpActionView *view,
+                              GtkTreePath    *path)
+{
+  GtkTreeView *tv = GTK_TREE_VIEW (view);
+  GtkTreePath *expand;
+
+  expand = gtk_tree_path_copy (path);
+  gtk_tree_path_up (expand);
+  gtk_tree_view_expand_row (tv, expand, FALSE);
+  gtk_tree_path_free (expand);
+
+  gtk_tree_view_set_cursor (tv, path, NULL, FALSE);
+  gtk_tree_view_scroll_to_cell (tv, path, NULL, TRUE, 0.5, 0.0);
+}
+
+static gboolean
+gimp_action_view_accel_find_func (GtkAccelKey *key,
+                                  GClosure    *closure,
+                                  gpointer     data)
+{
+  return (GClosure *) data == closure;
+}
+
+static void
+gimp_action_view_accel_changed (GtkAccelGroup   *accel_group,
+                                guint            unused1,
+                                GdkModifierType  unused2,
+                                GClosure        *accel_closure,
+                                GimpActionView  *view)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gboolean      iter_valid;
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+  if (! model)
+    return;
+
+  model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
+  if (! model)
+    return;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      GtkTreeIter child_iter;
+      gboolean    child_valid;
+
+      for (child_valid = gtk_tree_model_iter_children (model, &child_iter,
+                                                       &iter);
+           child_valid;
+           child_valid = gtk_tree_model_iter_next (model, &child_iter))
+        {
+          GClosure *closure;
+
+          gtk_tree_model_get (model, &child_iter,
+                              GIMP_ACTION_VIEW_COLUMN_ACCEL_CLOSURE, &closure,
+                              -1);
+
+          if (closure)
+            g_closure_unref (closure);
+
+          if (accel_closure == closure)
+            {
+              GtkAccelKey     *key;
+              guint            accel_key  = 0;
+              GdkModifierType  accel_mask = 0;
+
+              key = gtk_accel_group_find (accel_group,
+                                          gimp_action_view_accel_find_func,
+                                          accel_closure);
+
+              if (key            &&
+                  key->accel_key &&
+                  key->accel_flags & GTK_ACCEL_VISIBLE)
+                {
+                  accel_key  = key->accel_key;
+                  accel_mask = key->accel_mods;
+                }
+
+              gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
+                                  GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,  accel_key,
+                                  GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK, accel_mask,
+                                  -1);
+
+              return;
+            }
+        }
+    }
+}
+
+typedef struct
+{
+  GimpUIManager   *manager;
+  gchar           *accel_path;
+  guint            accel_key;
+  GdkModifierType  accel_mask;
+} ConfirmData;
+
+static void
+gimp_action_view_conflict_response (GtkWidget   *dialog,
+                                    gint         response_id,
+                                    ConfirmData *confirm_data)
+{
+  gtk_widget_destroy (dialog);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      if (! gtk_accel_map_change_entry (confirm_data->accel_path,
+                                        confirm_data->accel_key,
+                                        confirm_data->accel_mask,
+                                        TRUE))
+        {
+          gimp_message_literal (confirm_data->manager->gimp, G_OBJECT (dialog),
+                                GIMP_MESSAGE_ERROR,
+                                _("Changing shortcut failed."));
+        }
+    }
+
+  g_free (confirm_data->accel_path);
+
+  g_slice_free (ConfirmData, confirm_data);
+}
+
+static void
+gimp_action_view_conflict_confirm (GimpActionView  *view,
+                                   GimpAction      *action,
+                                   guint            accel_key,
+                                   GdkModifierType  accel_mask,
+                                   const gchar     *accel_path)
+{
+  GimpActionGroup *group;
+  gchar           *label;
+  gchar           *accel_string;
+  ConfirmData     *confirm_data;
+  GtkWidget       *dialog;
+  GimpMessageBox  *box;
+
+  g_object_get (action, "action-group", &group, NULL);
+
+  label = gimp_strip_uline (gimp_action_get_label (action));
+
+  accel_string = gtk_accelerator_get_label (accel_key, accel_mask);
+
+  confirm_data = g_slice_new (ConfirmData);
+
+  confirm_data->manager    = view->manager;
+  confirm_data->accel_path = g_strdup (accel_path);
+  confirm_data->accel_key  = accel_key;
+  confirm_data->accel_mask = accel_mask;
+
+  dialog =
+    gimp_message_dialog_new (_("Conflicting Shortcuts"),
+                             GIMP_ICON_DIALOG_WARNING,
+                             gtk_widget_get_toplevel (GTK_WIDGET (view)), 0,
+                             gimp_standard_help_func, NULL,
+
+                             _("_Cancel"),            GTK_RESPONSE_CANCEL,
+                             _("_Reassign Shortcut"), GTK_RESPONSE_OK,
+
+                             NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gimp_action_view_conflict_response),
+                    confirm_data);
+
+  box = GIMP_MESSAGE_DIALOG (dialog)->box;
+
+  gimp_message_box_set_primary_text (box,
+                                     _("Shortcut \"%s\" is already taken "
+                                       "by \"%s\" from the \"%s\" group."),
+                                     accel_string, label, group->label);
+  gimp_message_box_set_text (box,
+                             _("Reassigning the shortcut will cause it "
+                               "to be removed from \"%s\"."),
+                             label);
+
+  g_free (label);
+  g_free (accel_string);
+
+  g_object_unref (group);
+
+  gtk_widget_show (dialog);
+}
+
+static const gchar *
+gimp_action_view_get_accel_action (GimpActionView  *view,
+                                   const gchar     *path_string,
+                                   GimpAction     **action_return,
+                                   guint           *action_accel_key,
+                                   GdkModifierType *action_accel_mask)
+{
+  GtkTreeModel *model;
+  GtkTreePath  *path;
+  GtkTreeIter   iter;
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+  if (! model)
+    return NULL;
+
+  path = gtk_tree_path_new_from_string (path_string);
+
+  if (gtk_tree_model_get_iter (model, &iter, path))
+    {
+      GimpAction *action;
+
+      gtk_tree_model_get (model, &iter,
+                          GIMP_ACTION_VIEW_COLUMN_ACTION,     &action,
+                          GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,  action_accel_key,
+                          GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK, action_accel_mask,
+                          -1);
+
+      if (! action)
+        goto done;
+
+      gtk_tree_path_free (path);
+      g_object_unref (action);
+
+      *action_return = action;
+
+      return gimp_action_get_accel_path (action);
+    }
+
+ done:
+  gtk_tree_path_free (path);
+
+  return NULL;
+}
+
+static void
+gimp_action_view_accel_edited (GtkCellRendererAccel *accel,
+                               const char           *path_string,
+                               guint                 accel_key,
+                               GdkModifierType       accel_mask,
+                               guint                 hardware_keycode,
+                               GimpActionView       *view)
+{
+  GimpAction      *action;
+  guint            action_accel_key;
+  GdkModifierType  action_accel_mask;
+  const gchar     *accel_path;
+
+  accel_path = gimp_action_view_get_accel_action (view, path_string,
+                                                  &action,
+                                                  &action_accel_key,
+                                                  &action_accel_mask);
+
+  if (! accel_path)
+    return;
+
+  if (accel_key  == action_accel_key &&
+      accel_mask == action_accel_mask)
+    return;
+
+  if (! accel_key ||
+
+      /* Don't allow arrow keys, they are all swallowed by the canvas
+       * and cannot be invoked anyway, the same applies to space.
+       */
+      accel_key == GDK_KEY_Left  ||
+      accel_key == GDK_KEY_Right ||
+      accel_key == GDK_KEY_Up    ||
+      accel_key == GDK_KEY_Down  ||
+      accel_key == GDK_KEY_space ||
+      accel_key == GDK_KEY_KP_Space)
+    {
+      gimp_message_literal (view->manager->gimp,
+                            G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                            _("Invalid shortcut."));
+    }
+  else if (accel_key        == GDK_KEY_F1 ||
+           action_accel_key == GDK_KEY_F1)
+    {
+      gimp_message_literal (view->manager->gimp,
+                            G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                            _("F1 cannot be remapped."));
+    }
+  else if (accel_key  >= GDK_KEY_0 &&
+           accel_key  <= GDK_KEY_9 &&
+           accel_mask == GDK_MOD1_MASK)
+    {
+      gimp_message (view->manager->gimp,
+                    G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                    _("Alt+%d is used to switch to display %d and "
+                      "cannot be remapped."),
+                    accel_key - GDK_KEY_0,
+                    accel_key == GDK_KEY_0 ? 10 : accel_key - GDK_KEY_0);
+    }
+  else if (! gtk_accel_map_change_entry (accel_path,
+                                         accel_key, accel_mask, FALSE))
+    {
+      GtkTreeModel *model;
+      GimpAction   *conflict_action = NULL;
+      GtkTreeIter   iter;
+      gboolean      iter_valid;
+
+      model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+      model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
+
+      for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+           iter_valid;
+           iter_valid = gtk_tree_model_iter_next (model, &iter))
+        {
+          GtkTreeIter child_iter;
+          gboolean    child_valid;
+
+          for (child_valid = gtk_tree_model_iter_children (model,
+                                                           &child_iter,
+                                                           &iter);
+               child_valid;
+               child_valid = gtk_tree_model_iter_next (model, &child_iter))
+            {
+              guint           child_accel_key;
+              GdkModifierType child_accel_mask;
+
+              gtk_tree_model_get (model, &child_iter,
+                                  GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,
+                                  &child_accel_key,
+                                  GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK,
+                                  &child_accel_mask,
+                                  -1);
+
+              if (accel_key  == child_accel_key &&
+                  accel_mask == child_accel_mask)
+                {
+                  gtk_tree_model_get (model, &child_iter,
+                                      GIMP_ACTION_VIEW_COLUMN_ACTION,
+                                      &conflict_action,
+                                      -1);
+                  break;
+                }
+            }
+
+          if (conflict_action)
+            break;
+        }
+
+      if (conflict_action != action)
+        {
+          if (conflict_action)
+            {
+              gimp_action_view_conflict_confirm (view, conflict_action,
+                                                 accel_key,
+                                                 accel_mask,
+                                                 accel_path);
+              g_object_unref (conflict_action);
+            }
+          else
+            {
+              gimp_message_literal (view->manager->gimp,
+                                    G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                                    _("Changing shortcut failed."));
+            }
+        }
+    }
+}
+
+static void
+gimp_action_view_accel_cleared (GtkCellRendererAccel *accel,
+                                const char           *path_string,
+                                GimpActionView       *view)
+{
+  GimpAction      *action;
+  guint            action_accel_key;
+  GdkModifierType  action_accel_mask;
+  const gchar     *accel_path;
+
+  accel_path = gimp_action_view_get_accel_action (view, path_string,
+                                                  &action,
+                                                  &action_accel_key,
+                                                  &action_accel_mask);
+
+  if (! accel_path)
+    return;
+
+  if (action_accel_key == GDK_KEY_F1)
+    {
+      gimp_message_literal (view->manager->gimp,
+                            G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                            _("F1 cannot be remapped."));
+      return;
+    }
+
+  if (! gtk_accel_map_change_entry (accel_path, 0, 0, FALSE))
+    {
+      gimp_message_literal (view->manager->gimp,
+                            G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                            _("Removing shortcut failed."));
+    }
+}
diff --git a/app/widgets/gimpactionview.h b/app/widgets/gimpactionview.h
new file mode 100644
index 0000000..2170bf0
--- /dev/null
+++ b/app/widgets/gimpactionview.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpactionview.h
+ * Copyright (C) 2004-2005  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ACTION_VIEW_H__
+#define __GIMP_ACTION_VIEW_H__
+
+
+enum
+{
+  GIMP_ACTION_VIEW_COLUMN_VISIBLE,
+  GIMP_ACTION_VIEW_COLUMN_ACTION,
+  GIMP_ACTION_VIEW_COLUMN_ICON_NAME,
+  GIMP_ACTION_VIEW_COLUMN_LABEL,
+  GIMP_ACTION_VIEW_COLUMN_LABEL_CASEFOLD,
+  GIMP_ACTION_VIEW_COLUMN_NAME,
+  GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,
+  GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK,
+  GIMP_ACTION_VIEW_COLUMN_ACCEL_CLOSURE,
+  GIMP_ACTION_VIEW_N_COLUMNS
+};
+
+
+#define GIMP_TYPE_ACTION_VIEW            (gimp_action_view_get_type ())
+#define GIMP_ACTION_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_VIEW, GimpActionView))
+#define GIMP_ACTION_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION_VIEW, GimpActionViewClass))
+#define GIMP_IS_ACTION_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION_VIEW))
+#define GIMP_IS_ACTION_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ACTION_VIEW))
+#define GIMP_ACTION_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ACTION_VIEW, GimpActionViewClass))
+
+
+typedef struct _GimpActionViewClass GimpActionViewClass;
+
+struct _GimpActionView
+{
+  GtkTreeView    parent_instance;
+
+  GimpUIManager *manager;
+  gboolean       show_shortcuts;
+
+  gchar         *filter;
+};
+
+struct _GimpActionViewClass
+{
+  GtkTreeViewClass  parent_class;
+};
+
+
+GType       gimp_action_view_get_type   (void) G_GNUC_CONST;
+
+GtkWidget * gimp_action_view_new        (GimpUIManager  *manager,
+                                         const gchar    *select_action,
+                                         gboolean        show_shortcuts);
+
+void        gimp_action_view_set_filter (GimpActionView *view,
+                                         const gchar    *filter);
+
+
+#endif  /*  __GIMP_ACTION_VIEW_H__  */
diff --git a/app/widgets/gimpblobeditor.c b/app/widgets/gimpblobeditor.c
new file mode 100644
index 0000000..39daed1
--- /dev/null
+++ b/app/widgets/gimpblobeditor.c
@@ -0,0 +1,389 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "libgimpmath/gimpmath.h"
+
+#include "paint/gimpink-blob.h"
+
+#include "gimpblobeditor.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TYPE,
+  PROP_ASPECT,
+  PROP_ANGLE
+};
+
+
+static void      gimp_blob_editor_set_property   (GObject        *object,
+                                                  guint           property_id,
+                                                  const GValue   *value,
+                                                  GParamSpec     *pspec);
+static void      gimp_blob_editor_get_property   (GObject        *object,
+                                                  guint           property_id,
+                                                  GValue         *value,
+                                                  GParamSpec     *pspec);
+
+static gboolean  gimp_blob_editor_expose         (GtkWidget      *widget,
+                                                  GdkEventExpose *event);
+static gboolean  gimp_blob_editor_button_press   (GtkWidget      *widget,
+                                                  GdkEventButton *event);
+static gboolean  gimp_blob_editor_button_release (GtkWidget      *widget,
+                                                  GdkEventButton *event);
+static gboolean  gimp_blob_editor_motion_notify  (GtkWidget      *widget,
+                                                  GdkEventMotion *event);
+
+static void      gimp_blob_editor_get_handle     (GimpBlobEditor *editor,
+                                                  GdkRectangle   *rect);
+static void      gimp_blob_editor_draw_blob      (GimpBlobEditor *editor,
+                                                  cairo_t        *cr,
+                                                  gdouble         xc,
+                                                  gdouble         yc,
+                                                  gdouble         radius);
+
+
+G_DEFINE_TYPE (GimpBlobEditor, gimp_blob_editor, GTK_TYPE_DRAWING_AREA)
+
+#define parent_class gimp_blob_editor_parent_class
+
+
+static void
+gimp_blob_editor_class_init (GimpBlobEditorClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->set_property         = gimp_blob_editor_set_property;
+  object_class->get_property         = gimp_blob_editor_get_property;
+
+  widget_class->expose_event         = gimp_blob_editor_expose;
+  widget_class->button_press_event   = gimp_blob_editor_button_press;
+  widget_class->button_release_event = gimp_blob_editor_button_release;
+  widget_class->motion_notify_event  = gimp_blob_editor_motion_notify;
+
+  g_object_class_install_property (object_class, PROP_TYPE,
+                                   g_param_spec_enum ("blob-type",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_INK_BLOB_TYPE,
+                                                      GIMP_INK_BLOB_TYPE_CIRCLE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_ASPECT,
+                                   g_param_spec_double ("blob-aspect",
+                                                        NULL, NULL,
+                                                        1.0, 10.0, 1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_ANGLE,
+                                   g_param_spec_double ("blob-angle",
+                                                        NULL, NULL,
+                                                        -G_PI, G_PI, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_blob_editor_init (GimpBlobEditor *editor)
+{
+  editor->active = FALSE;
+
+  gtk_widget_add_events (GTK_WIDGET (editor),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_EXPOSURE_MASK);
+}
+
+GtkWidget *
+gimp_blob_editor_new (GimpInkBlobType  type,
+                      gdouble          aspect,
+                      gdouble          angle)
+{
+  return g_object_new (GIMP_TYPE_BLOB_EDITOR,
+                       "blob-type",   type,
+                       "blob-aspect", aspect,
+                       "blob-angle",  angle,
+                       NULL);
+}
+
+static void
+gimp_blob_editor_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpBlobEditor *editor = GIMP_BLOB_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      editor->type = g_value_get_enum (value);
+      break;
+    case PROP_ASPECT:
+      editor->aspect = g_value_get_double (value);
+      break;
+    case PROP_ANGLE:
+      editor->angle = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+}
+
+static void
+gimp_blob_editor_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpBlobEditor *editor = GIMP_BLOB_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_TYPE:
+      g_value_set_enum (value, editor->type);
+      break;
+    case PROP_ASPECT:
+      g_value_set_double (value, editor->aspect);
+      break;
+    case PROP_ANGLE:
+      g_value_set_double (value, editor->angle);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_blob_editor_expose (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
+  GtkStyle       *style  = gtk_widget_get_style (widget);
+  GtkStateType    state  = gtk_widget_get_state (widget);
+  GtkAllocation   allocation;
+  cairo_t        *cr;
+  GdkRectangle    rect;
+  gint            r0;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  r0 = MIN (allocation.width, allocation.height) / 2;
+
+  if (r0 < 2)
+    return TRUE;
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+  gimp_blob_editor_draw_blob (editor, cr,
+                              allocation.width  / 2.0,
+                              allocation.height / 2.0,
+                              0.9 * r0);
+
+  gimp_blob_editor_get_handle (editor, &rect);
+
+  cairo_rectangle (cr,
+                   rect.x + 0.5, rect.y + 0.5, rect.width - 1, rect.width - 1);
+  gdk_cairo_set_source_color (cr, &style->light[state]);
+  cairo_fill_preserve (cr);
+
+  gdk_cairo_set_source_color (cr, &style->dark[state]);
+  cairo_set_line_width (cr, 1);
+  cairo_stroke (cr);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_blob_editor_button_press (GtkWidget      *widget,
+                               GdkEventButton *event)
+{
+  GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
+  GdkRectangle    rect;
+
+  gimp_blob_editor_get_handle (editor, &rect);
+
+  if ((event->x >= rect.x) && (event->x - rect.x < rect.width) &&
+      (event->y >= rect.y) && (event->y - rect.y < rect.height))
+    {
+      editor->active = TRUE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_blob_editor_button_release (GtkWidget      *widget,
+                                 GdkEventButton *event)
+{
+  GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
+
+  editor->active = FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gimp_blob_editor_motion_notify (GtkWidget      *widget,
+                                GdkEventMotion *event)
+{
+  GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
+
+  if (editor->active)
+    {
+      GtkAllocation allocation;
+      gint          x;
+      gint          y;
+      gint          rsquare;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      x = event->x - allocation.width  / 2;
+      y = event->y - allocation.height / 2;
+
+      rsquare = SQR (x) + SQR (y);
+
+      if (rsquare > 0)
+        {
+          gint     r0;
+          gdouble  angle;
+          gdouble  aspect;
+
+          r0 = MIN (allocation.width, allocation.height) / 2;
+
+          angle  = atan2 (y, x);
+          aspect = 10.0 * sqrt ((gdouble) rsquare / (r0 * r0)) / 0.85;
+
+          aspect = CLAMP (aspect, 1.0, 10.0);
+
+          g_object_set (editor,
+                        "blob-angle",  angle,
+                        "blob-aspect", aspect,
+                        NULL);
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_blob_editor_get_handle (GimpBlobEditor *editor,
+                             GdkRectangle   *rect)
+{
+  GtkWidget     *widget = GTK_WIDGET (editor);
+  GtkAllocation  allocation;
+  gint           x, y;
+  gint           r;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  r = MIN (allocation.width, allocation.height) / 2;
+
+  x = (allocation.width / 2 +
+       0.85 * r *editor->aspect / 10.0 * cos (editor->angle));
+
+  y = (allocation.height / 2 +
+       0.85 * r * editor->aspect / 10.0 * sin (editor->angle));
+
+  rect->x      = x - 5;
+  rect->y      = y - 5;
+  rect->width  = 10;
+  rect->height = 10;
+}
+
+static void
+gimp_blob_editor_draw_blob (GimpBlobEditor *editor,
+                            cairo_t        *cr,
+                            gdouble         xc,
+                            gdouble         yc,
+                            gdouble         radius)
+{
+  GtkWidget    *widget   = GTK_WIDGET (editor);
+  GtkStyle     *style    = gtk_widget_get_style (widget);
+  GimpBlob     *blob;
+  GimpBlobFunc  function = gimp_blob_ellipse;
+  gint          i;
+
+  switch (editor->type)
+    {
+    case GIMP_INK_BLOB_TYPE_CIRCLE:
+      function = gimp_blob_ellipse;
+      break;
+
+    case GIMP_INK_BLOB_TYPE_SQUARE:
+      function = gimp_blob_square;
+      break;
+
+    case GIMP_INK_BLOB_TYPE_DIAMOND:
+      function = gimp_blob_diamond;
+      break;
+    }
+
+  /*  to get a nice antialiased outline, render the blob at double size  */
+  radius *= 2.0;
+  blob = function (2.0 * xc, 2.0 * yc,
+                   radius * cos (editor->angle),
+                   radius * sin (editor->angle),
+                   (- (radius / editor->aspect) * sin (editor->angle)),
+                   (  (radius / editor->aspect) * cos (editor->angle)));
+
+  for (i = 0; i < blob->height; i++)
+    if (blob->data[i].left <= blob->data[i].right)
+      {
+        cairo_move_to (cr, blob->data[i].left / 2.0, (blob->y + i) / 2.0);
+        break;
+      }
+
+  for (i = i + 1; i < blob->height; i++)
+    {
+      if (blob->data[i].left > blob->data[i].right)
+        break;
+
+      cairo_line_to (cr, blob->data[i].left / 2.0, (blob->y + i) / 2.0);
+    }
+
+  for (i = i - 1; i >= 0; i--)
+    {
+      if (blob->data[i].left > blob->data[i].right)
+        break;
+
+      cairo_line_to (cr, blob->data[i].right / 2.0, (blob->y + i) / 2.0);
+    }
+
+  cairo_close_path (cr);
+
+  g_free (blob);
+
+  gdk_cairo_set_source_color (cr, &style->fg[gtk_widget_get_state (widget)]);
+  cairo_fill (cr);
+}
diff --git a/app/widgets/gimpblobeditor.h b/app/widgets/gimpblobeditor.h
new file mode 100644
index 0000000..007bacc
--- /dev/null
+++ b/app/widgets/gimpblobeditor.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpblobeditor.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_BLOB_EDITOR_H__
+#define  __GIMP_BLOB_EDITOR_H__
+
+
+#define GIMP_TYPE_BLOB_EDITOR            (gimp_blob_editor_get_type ())
+#define GIMP_BLOB_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditor))
+#define GIMP_BLOB_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditorClass))
+#define GIMP_IS_BLOB_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BLOB_EDITOR))
+#define GIMP_IS_BLOB_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BLOB_EDITOR))
+#define GIMP_BLOB_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditorClass))
+
+
+typedef struct _GimpBlobEditorClass GimpBlobEditorClass;
+
+struct _GimpBlobEditor
+{
+  GtkDrawingArea       parent_instance;
+
+  GimpInkBlobType      type;
+  gdouble              aspect;
+  gdouble              angle;
+
+  /*<  private  >*/
+  gboolean             active;
+};
+
+struct _GimpBlobEditorClass
+{
+  GtkDrawingAreaClass  parent_class;
+};
+
+
+GType       gimp_blob_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_blob_editor_new      (GimpInkBlobType  type,
+                                       gdouble          aspect,
+                                       gdouble          angle);
+
+
+#endif  /*  __GIMP_BLOB_EDITOR_H__  */
diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c
new file mode 100644
index 0000000..c664e38
--- /dev/null
+++ b/app/widgets/gimpbrusheditor.c
@@ -0,0 +1,464 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrusheditor.c
+ * Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpcontext.h"
+
+#include "gimpbrusheditor.h"
+#include "gimpdocked.h"
+#include "gimpspinscale.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+
+#include "gimp-intl.h"
+
+
+#define BRUSH_VIEW_SIZE 96
+
+
+/*  local function prototypes  */
+
+static void   gimp_brush_editor_docked_iface_init (GimpDockedInterface *face);
+
+static void   gimp_brush_editor_constructed    (GObject            *object);
+
+static void   gimp_brush_editor_set_data       (GimpDataEditor     *editor,
+                                                GimpData           *data);
+
+static void   gimp_brush_editor_set_context    (GimpDocked         *docked,
+                                                GimpContext        *context);
+
+static void   gimp_brush_editor_update_brush   (GtkAdjustment      *adjustment,
+                                                GimpBrushEditor    *editor);
+static void   gimp_brush_editor_update_shape   (GtkWidget          *widget,
+                                                GimpBrushEditor    *editor);
+static void   gimp_brush_editor_notify_brush   (GimpBrushGenerated *brush,
+                                                GParamSpec         *pspec,
+                                                GimpBrushEditor    *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBrushEditor, gimp_brush_editor,
+                         GIMP_TYPE_DATA_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_brush_editor_docked_iface_init))
+
+#define parent_class gimp_brush_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_brush_editor_class_init (GimpBrushEditorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpDataEditorClass *editor_class = GIMP_DATA_EDITOR_CLASS (klass);
+
+  object_class->constructed = gimp_brush_editor_constructed;
+
+  editor_class->set_data    = gimp_brush_editor_set_data;
+  editor_class->title       = _("Brush Editor");
+}
+
+static void
+gimp_brush_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_brush_editor_set_context;
+}
+
+static void
+gimp_brush_editor_init (GimpBrushEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+  GtkWidget      *frame;
+  GtkWidget      *hbox;
+  GtkWidget      *label;
+  GtkWidget      *box;
+  GtkWidget      *scale;
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  data_editor->view = gimp_view_new_full_by_types (NULL,
+                                                   GIMP_TYPE_VIEW,
+                                                   GIMP_TYPE_BRUSH,
+                                                   BRUSH_VIEW_SIZE,
+                                                   BRUSH_VIEW_SIZE, 0,
+                                                   FALSE, FALSE, TRUE);
+  gtk_widget_set_size_request (data_editor->view, -1, BRUSH_VIEW_SIZE);
+  gimp_view_set_expand (GIMP_VIEW (data_editor->view), TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), data_editor->view);
+  gtk_widget_show (data_editor->view);
+
+  editor->shape_group = NULL;
+
+  editor->options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (editor), editor->options_box, FALSE, FALSE, 0);
+  gtk_widget_show (editor->options_box);
+
+  /* Stock Box for the brush shape */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Shape:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  box = gimp_enum_icon_box_new (GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                "gimp-shape",
+                                GTK_ICON_SIZE_MENU,
+                                G_CALLBACK (gimp_brush_editor_update_shape),
+                                editor,
+                                &editor->shape_group);
+  gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  /*  brush radius scale  */
+  editor->radius_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.1, 1000.0, 1.0, 10.0, 0.0));
+  scale = gimp_spin_scale_new (editor->radius_data, _("Radius"), 1);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (editor->radius_data, "value-changed",
+                    G_CALLBACK (gimp_brush_editor_update_brush),
+                    editor);
+
+  /*  number of spikes  */
+  editor->spikes_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (2.0, 2.0, 20.0, 1.0, 1.0, 0.0));
+  scale = gimp_spin_scale_new (editor->spikes_data, _("Spikes"), 0);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (editor->spikes_data, "value-changed",
+                    G_CALLBACK (gimp_brush_editor_update_brush),
+                    editor);
+
+  /*  brush hardness scale  */
+  editor->hardness_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.0));
+  scale = gimp_spin_scale_new (editor->hardness_data, _("Hardness"), 2);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (editor->hardness_data, "value-changed",
+                    G_CALLBACK (gimp_brush_editor_update_brush),
+                    editor);
+
+  /*  brush aspect ratio scale  */
+  editor->aspect_ratio_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 20.0, 0.1, 1.0, 0.0));
+  scale = gimp_spin_scale_new (editor->aspect_ratio_data, _("Aspect ratio"), 1);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (editor->aspect_ratio_data,"value-changed",
+                    G_CALLBACK (gimp_brush_editor_update_brush),
+                    editor);
+
+  /*  brush angle scale  */
+  editor->angle_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 180.0, 0.1, 1.0, 0.0));
+  scale = gimp_spin_scale_new (editor->angle_data, _("Angle"), 1);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (editor->angle_data, "value-changed",
+                    G_CALLBACK (gimp_brush_editor_update_brush),
+                    editor);
+
+  /*  brush spacing  */
+  editor->spacing_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 5000.0, 1.0, 10.0, 0.0));
+  scale = gimp_spin_scale_new (editor->spacing_data, _("Spacing"), 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 200.0);
+  gtk_box_pack_start (GTK_BOX (editor->options_box), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  gimp_help_set_help_data (scale, _("Percentage of width of brush"), NULL);
+
+  g_signal_connect (editor->spacing_data, "value-changed",
+                    G_CALLBACK (gimp_brush_editor_update_brush),
+                    editor);
+}
+
+static void
+gimp_brush_editor_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_docked_set_show_button_bar (GIMP_DOCKED (object), FALSE);
+}
+
+static void
+gimp_brush_editor_set_data (GimpDataEditor *editor,
+                            GimpData       *data)
+{
+  GimpBrushEditor         *brush_editor = GIMP_BRUSH_EDITOR (editor);
+  GimpBrushGeneratedShape  shape        = GIMP_BRUSH_GENERATED_CIRCLE;
+  gdouble                  radius       = 0.0;
+  gint                     spikes       = 2;
+  gdouble                  hardness     = 0.0;
+  gdouble                  ratio        = 0.0;
+  gdouble                  angle        = 0.0;
+  gdouble                  spacing      = 0.0;
+
+  if (editor->data)
+    g_signal_handlers_disconnect_by_func (editor->data,
+                                          gimp_brush_editor_notify_brush,
+                                          editor);
+
+  GIMP_DATA_EDITOR_CLASS (parent_class)->set_data (editor, data);
+
+  if (editor->data)
+    g_signal_connect (editor->data, "notify",
+                      G_CALLBACK (gimp_brush_editor_notify_brush),
+                      editor);
+
+  gimp_view_set_viewable (GIMP_VIEW (editor->view), GIMP_VIEWABLE (data));
+
+  if (editor->data)
+    {
+      spacing = gimp_brush_get_spacing (GIMP_BRUSH (editor->data));
+
+      if (GIMP_IS_BRUSH_GENERATED (editor->data))
+        {
+          GimpBrushGenerated *brush = GIMP_BRUSH_GENERATED (editor->data);
+
+          shape    = gimp_brush_generated_get_shape        (brush);
+          radius   = gimp_brush_generated_get_radius       (brush);
+          spikes   = gimp_brush_generated_get_spikes       (brush);
+          hardness = gimp_brush_generated_get_hardness     (brush);
+          ratio    = gimp_brush_generated_get_aspect_ratio (brush);
+          angle    = gimp_brush_generated_get_angle        (brush);
+        }
+    }
+
+  gtk_widget_set_sensitive (brush_editor->options_box,
+                            editor->data_editable);
+
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (brush_editor->shape_group),
+                                   shape);
+
+  gtk_adjustment_set_value (brush_editor->radius_data,       radius);
+  gtk_adjustment_set_value (brush_editor->spikes_data,       spikes);
+  gtk_adjustment_set_value (brush_editor->hardness_data,     hardness);
+  gtk_adjustment_set_value (brush_editor->aspect_ratio_data, ratio);
+  gtk_adjustment_set_value (brush_editor->angle_data,        angle);
+  gtk_adjustment_set_value (brush_editor->spacing_data,      spacing);
+}
+
+static void
+gimp_brush_editor_set_context (GimpDocked  *docked,
+                               GimpContext *context)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (docked);
+
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_view_renderer_set_context (GIMP_VIEW (data_editor->view)->renderer,
+                                  context);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_brush_editor_new (GimpContext     *context,
+                       GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_BRUSH_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<BrushEditor>",
+                       "ui-path",         "/brush-editor-popup",
+                       "data-factory",    context->gimp->brush_factory,
+                       "context",         context,
+                       "data",            gimp_context_get_brush (context),
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_brush_editor_update_brush (GtkAdjustment   *adjustment,
+                                GimpBrushEditor *editor)
+{
+  GimpBrushGenerated *brush;
+  gdouble             value;
+
+  if (! GIMP_IS_BRUSH_GENERATED (GIMP_DATA_EDITOR (editor)->data))
+    return;
+
+  brush = GIMP_BRUSH_GENERATED (GIMP_DATA_EDITOR (editor)->data);
+
+  g_signal_handlers_block_by_func (brush,
+                                   gimp_brush_editor_notify_brush,
+                                   editor);
+
+  value = gtk_adjustment_get_value (adjustment);
+
+  if (adjustment == editor->radius_data)
+    {
+      if (value != gimp_brush_generated_get_radius (brush))
+        gimp_brush_generated_set_radius (brush, value);
+    }
+  else if (adjustment == editor->spikes_data)
+    {
+      if (ROUND (value) != gimp_brush_generated_get_spikes (brush))
+        gimp_brush_generated_set_spikes (brush, ROUND (value));
+    }
+  else if (adjustment == editor->hardness_data)
+    {
+      if (value != gimp_brush_generated_get_hardness (brush))
+        gimp_brush_generated_set_hardness (brush, value);
+    }
+  else if (adjustment == editor->aspect_ratio_data)
+    {
+      if (value != gimp_brush_generated_get_aspect_ratio (brush))
+        gimp_brush_generated_set_aspect_ratio (brush, value);
+    }
+  else if (adjustment == editor->angle_data)
+    {
+      if (value != gimp_brush_generated_get_angle (brush))
+        gimp_brush_generated_set_angle (brush, value);
+    }
+  else if (adjustment == editor->spacing_data)
+    {
+      if (value != gimp_brush_get_spacing (GIMP_BRUSH (brush)))
+        gimp_brush_set_spacing (GIMP_BRUSH (brush), value);
+    }
+
+  g_signal_handlers_unblock_by_func (brush,
+                                     gimp_brush_editor_notify_brush,
+                                     editor);
+}
+
+static void
+gimp_brush_editor_update_shape (GtkWidget       *widget,
+                                GimpBrushEditor *editor)
+{
+  GimpBrushGenerated *brush;
+
+  if (! GIMP_IS_BRUSH_GENERATED (GIMP_DATA_EDITOR (editor)->data))
+    return;
+
+  brush = GIMP_BRUSH_GENERATED (GIMP_DATA_EDITOR (editor)->data);
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GimpBrushGeneratedShape shape;
+
+      shape = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                  "gimp-item-data"));
+
+      if (gimp_brush_generated_get_shape (brush) != shape)
+        gimp_brush_generated_set_shape (brush, shape);
+    }
+}
+
+static void
+gimp_brush_editor_notify_brush (GimpBrushGenerated *brush,
+                                GParamSpec         *pspec,
+                                GimpBrushEditor    *editor)
+{
+  GtkAdjustment *adj   = NULL;
+  gdouble        value = 0.0;
+
+  if (! strcmp (pspec->name, "shape"))
+    {
+      g_signal_handlers_block_by_func (editor->shape_group,
+                                       gimp_brush_editor_update_shape,
+                                       editor);
+
+      gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (editor->shape_group),
+                                       brush->shape);
+
+      g_signal_handlers_unblock_by_func (editor->shape_group,
+                                         gimp_brush_editor_update_shape,
+                                         editor);
+    }
+  else if (! strcmp (pspec->name, "radius"))
+    {
+      adj   = editor->radius_data;
+      value = gimp_brush_generated_get_radius (brush);
+    }
+  else if (! strcmp (pspec->name, "spikes"))
+    {
+      adj   = editor->spikes_data;
+      value = gimp_brush_generated_get_spikes (brush);
+    }
+  else if (! strcmp (pspec->name, "hardness"))
+    {
+      adj   = editor->hardness_data;
+      value = gimp_brush_generated_get_hardness (brush);
+    }
+  else if (! strcmp (pspec->name, "angle"))
+    {
+      adj   = editor->angle_data;
+      value = gimp_brush_generated_get_angle (brush);
+    }
+  else if (! strcmp (pspec->name, "aspect-ratio"))
+    {
+      adj   = editor->aspect_ratio_data;
+      value = gimp_brush_generated_get_aspect_ratio (brush);
+    }
+  else if (! strcmp (pspec->name, "spacing"))
+    {
+      adj   = editor->spacing_data;
+      value = gimp_brush_get_spacing (GIMP_BRUSH (brush));
+    }
+
+  if (adj)
+    {
+      g_signal_handlers_block_by_func (adj,
+                                       gimp_brush_editor_update_brush,
+                                       editor);
+
+      gtk_adjustment_set_value (adj, value);
+
+      g_signal_handlers_unblock_by_func (adj,
+                                         gimp_brush_editor_update_brush,
+                                         editor);
+    }
+}
diff --git a/app/widgets/gimpbrusheditor.h b/app/widgets/gimpbrusheditor.h
new file mode 100644
index 0000000..43a6dfd
--- /dev/null
+++ b/app/widgets/gimpbrusheditor.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrusheditor.h
+ * Copyright 1998 Jay Cox <jaycox@earthlink.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef  __GIMP_BRUSH_EDITOR_H__
+#define  __GIMP_BRUSH_EDITOR_H__
+
+
+#include "gimpdataeditor.h"
+
+
+#define GIMP_TYPE_BRUSH_EDITOR            (gimp_brush_editor_get_type ())
+#define GIMP_BRUSH_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_EDITOR, GimpBrushEditor))
+#define GIMP_BRUSH_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_EDITOR, GimpBrushEditorClass))
+#define GIMP_IS_BRUSH_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_EDITOR))
+#define GIMP_IS_BRUSH_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_EDITOR))
+#define GIMP_BRUSH_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_EDITOR, GimpBrushEditorClass))
+
+
+typedef struct _GimpBrushEditorClass GimpBrushEditorClass;
+
+struct _GimpBrushEditor
+{
+  GimpDataEditor  parent_instance;
+
+  GtkWidget      *shape_group;
+  GtkWidget      *options_box;
+  GtkAdjustment  *radius_data;
+  GtkAdjustment  *spikes_data;
+  GtkAdjustment  *hardness_data;
+  GtkAdjustment  *angle_data;
+  GtkAdjustment  *aspect_ratio_data;
+  GtkAdjustment  *spacing_data;
+};
+
+struct _GimpBrushEditorClass
+{
+  GimpDataEditorClass  parent_class;
+};
+
+
+GType       gimp_brush_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_brush_editor_new      (GimpContext     *context,
+                                        GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_BRUSH_EDITOR_H__  */
diff --git a/app/widgets/gimpbrushfactoryview.c b/app/widgets/gimpbrushfactoryview.c
new file mode 100644
index 0000000..9c55b24
--- /dev/null
+++ b/app/widgets/gimpbrushfactoryview.c
@@ -0,0 +1,253 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushfactoryview.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpbrush.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimpdatafactory.h"
+
+#include "gimpbrushfactoryview.h"
+#include "gimpcontainerview.h"
+#include "gimpeditor.h"
+#include "gimpmenufactory.h"
+#include "gimpspinscale.h"
+#include "gimpviewrenderer.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_brush_factory_view_dispose         (GObject              *object);
+
+static void   gimp_brush_factory_view_select_item     (GimpContainerEditor  *editor,
+                                                       GimpViewable         *viewable);
+
+static void   gimp_brush_factory_view_spacing_changed (GimpBrush            *brush,
+                                                       GimpBrushFactoryView *view);
+static void   gimp_brush_factory_view_spacing_update  (GtkAdjustment        *adjustment,
+                                                       GimpBrushFactoryView *view);
+
+
+G_DEFINE_TYPE (GimpBrushFactoryView, gimp_brush_factory_view,
+               GIMP_TYPE_DATA_FACTORY_VIEW)
+
+#define parent_class gimp_brush_factory_view_parent_class
+
+
+static void
+gimp_brush_factory_view_class_init (GimpBrushFactoryViewClass *klass)
+{
+  GObjectClass             *object_class = G_OBJECT_CLASS (klass);
+  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
+
+  object_class->dispose     = gimp_brush_factory_view_dispose;
+
+  editor_class->select_item = gimp_brush_factory_view_select_item;
+}
+
+static void
+gimp_brush_factory_view_init (GimpBrushFactoryView *view)
+{
+  view->spacing_adjustment =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 5000.0,
+                                        1.0, 10.0, 0.0));
+
+  view->spacing_scale = gimp_spin_scale_new (view->spacing_adjustment,
+                                             _("Spacing"), 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (view->spacing_scale),
+                                   1.0, 200.0);
+  gimp_help_set_help_data (view->spacing_scale,
+                           _("Percentage of width of brush"),
+                           NULL);
+
+  g_signal_connect (view->spacing_adjustment, "value-changed",
+                    G_CALLBACK (gimp_brush_factory_view_spacing_update),
+                    view);
+}
+
+static void
+gimp_brush_factory_view_dispose (GObject *object)
+{
+  GimpBrushFactoryView *view   = GIMP_BRUSH_FACTORY_VIEW (object);
+  GimpContainerEditor  *editor = GIMP_CONTAINER_EDITOR (object);
+
+  if (view->spacing_changed_handler_id)
+    {
+      GimpDataFactory *factory;
+      GimpContainer   *container;
+
+      factory   = gimp_data_factory_view_get_data_factory (GIMP_DATA_FACTORY_VIEW (editor));
+      container = gimp_data_factory_get_container (factory);
+
+      gimp_container_remove_handler (container,
+                                     view->spacing_changed_handler_id);
+
+      view->spacing_changed_handler_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+GtkWidget *
+gimp_brush_factory_view_new (GimpViewType     view_type,
+                             GimpDataFactory *factory,
+                             GimpContext     *context,
+                             gboolean         change_brush_spacing,
+                             gint             view_size,
+                             gint             view_border_width,
+                             GimpMenuFactory *menu_factory)
+{
+  GimpBrushFactoryView *factory_view;
+  GimpContainerEditor  *editor;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  factory_view = g_object_new (GIMP_TYPE_BRUSH_FACTORY_VIEW,
+                               "view-type",         view_type,
+                               "data-factory",      factory,
+                               "context",           context,
+                               "view-size",         view_size,
+                               "view-border-width", view_border_width,
+                               "menu-factory",      menu_factory,
+                               "menu-identifier",   "<Brushes>",
+                               "ui-path",           "/brushes-popup",
+                               "action-group",      "brushes",
+                               NULL);
+
+  factory_view->change_brush_spacing = change_brush_spacing;
+
+  editor = GIMP_CONTAINER_EDITOR (factory_view);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                 "brushes", "brushes-open-as-image",
+                                 NULL);
+
+  gtk_box_pack_end (GTK_BOX (editor->view), factory_view->spacing_scale,
+                    FALSE, FALSE, 0);
+  gtk_widget_show (factory_view->spacing_scale);
+
+  factory_view->spacing_changed_handler_id =
+    gimp_container_add_handler (gimp_data_factory_get_container (factory), "spacing-changed",
+                                G_CALLBACK (gimp_brush_factory_view_spacing_changed),
+                                factory_view);
+
+  return GTK_WIDGET (factory_view);
+}
+
+static void
+gimp_brush_factory_view_select_item (GimpContainerEditor *editor,
+                                     GimpViewable        *viewable)
+{
+  GimpBrushFactoryView *view = GIMP_BRUSH_FACTORY_VIEW (editor);
+  GimpContainer        *container;
+  gboolean              spacing_sensitive = FALSE;
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item (editor, viewable);
+
+  container = gimp_container_view_get_container (editor->view);
+
+  if (viewable && gimp_container_have (container, GIMP_OBJECT (viewable)))
+    {
+      GimpBrush *brush = GIMP_BRUSH (viewable);
+
+      spacing_sensitive = TRUE;
+
+      g_signal_handlers_block_by_func (view->spacing_adjustment,
+                                       gimp_brush_factory_view_spacing_update,
+                                       view);
+
+      gtk_adjustment_set_value (view->spacing_adjustment,
+                                gimp_brush_get_spacing (brush));
+
+      g_signal_handlers_unblock_by_func (view->spacing_adjustment,
+                                         gimp_brush_factory_view_spacing_update,
+                                         view);
+    }
+
+  gtk_widget_set_sensitive (view->spacing_scale, spacing_sensitive);
+}
+
+static void
+gimp_brush_factory_view_spacing_changed (GimpBrush            *brush,
+                                         GimpBrushFactoryView *view)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (view);
+  GimpContext         *context;
+
+  context = gimp_container_view_get_context (editor->view);
+
+  if (brush == gimp_context_get_brush (context))
+    {
+      g_signal_handlers_block_by_func (view->spacing_adjustment,
+                                       gimp_brush_factory_view_spacing_update,
+                                       view);
+
+      gtk_adjustment_set_value (view->spacing_adjustment,
+                                gimp_brush_get_spacing (brush));
+
+      g_signal_handlers_unblock_by_func (view->spacing_adjustment,
+                                         gimp_brush_factory_view_spacing_update,
+                                         view);
+    }
+}
+
+static void
+gimp_brush_factory_view_spacing_update (GtkAdjustment        *adjustment,
+                                        GimpBrushFactoryView *view)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (view);
+  GimpContext         *context;
+  GimpBrush           *brush;
+
+  context = gimp_container_view_get_context (editor->view);
+
+  brush = gimp_context_get_brush (context);
+
+  if (brush && view->change_brush_spacing)
+    {
+      g_signal_handlers_block_by_func (brush,
+                                       gimp_brush_factory_view_spacing_changed,
+                                       view);
+
+      gimp_brush_set_spacing (brush, gtk_adjustment_get_value (adjustment));
+
+      g_signal_handlers_unblock_by_func (brush,
+                                         gimp_brush_factory_view_spacing_changed,
+                                         view);
+    }
+}
diff --git a/app/widgets/gimpbrushfactoryview.h b/app/widgets/gimpbrushfactoryview.h
new file mode 100644
index 0000000..dce4c3c
--- /dev/null
+++ b/app/widgets/gimpbrushfactoryview.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushfactoryview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_FACTORY_VIEW_H__
+#define __GIMP_BRUSH_FACTORY_VIEW_H__
+
+#include "gimpdatafactoryview.h"
+
+
+#define GIMP_TYPE_BRUSH_FACTORY_VIEW            (gimp_brush_factory_view_get_type ())
+#define GIMP_BRUSH_FACTORY_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_FACTORY_VIEW, GimpBrushFactoryView))
+#define GIMP_BRUSH_FACTORY_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_FACTORY_VIEW, GimpBrushFactoryViewClass))
+#define GIMP_IS_BRUSH_FACTORY_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_FACTORY_VIEW))
+#define GIMP_IS_BRUSH_FACTORY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_FACTORY_VIEW))
+#define GIMP_BRUSH_FACTORY_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_FACTORY_VIEW, GimpBrushFactoryViewClass))
+
+
+typedef struct _GimpBrushFactoryViewClass  GimpBrushFactoryViewClass;
+
+struct _GimpBrushFactoryView
+{
+  GimpDataFactoryView  parent_instance;
+
+  GtkWidget           *spacing_scale;
+  GtkAdjustment       *spacing_adjustment;
+
+  gboolean             change_brush_spacing;
+  GQuark               spacing_changed_handler_id;
+};
+
+struct _GimpBrushFactoryViewClass
+{
+  GimpDataFactoryViewClass  parent_class;
+};
+
+
+GType       gimp_brush_factory_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_brush_factory_view_new      (GimpViewType     view_type,
+                                              GimpDataFactory *factory,
+                                              GimpContext     *context,
+                                              gboolean         change_brush_spacing,
+                                              gint             view_size,
+                                              gint             view_border_width,
+                                              GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_BRUSH_FACTORY_VIEW_H__  */
diff --git a/app/widgets/gimpbrushselect.c b/app/widgets/gimpbrushselect.c
new file mode 100644
index 0000000..6ee62dc
--- /dev/null
+++ b/app/widgets/gimpbrushselect.c
@@ -0,0 +1,346 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushselect.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gegl/gimp-babl-compat.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpbrush.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpbrushfactoryview.h"
+#include "gimpbrushselect.h"
+#include "gimpcontainerbox.h"
+#include "gimplayermodebox.h"
+#include "gimpspinscale.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OPACITY,
+  PROP_PAINT_MODE,
+  PROP_SPACING
+};
+
+
+static void             gimp_brush_select_constructed  (GObject         *object);
+static void             gimp_brush_select_set_property (GObject         *object,
+                                                        guint            property_id,
+                                                        const GValue    *value,
+                                                        GParamSpec      *pspec);
+
+static GimpValueArray * gimp_brush_select_run_callback (GimpPdbDialog   *dialog,
+                                                        GimpObject      *object,
+                                                        gboolean         closing,
+                                                        GError         **error);
+
+static void          gimp_brush_select_opacity_changed (GimpContext     *context,
+                                                        gdouble          opacity,
+                                                        GimpBrushSelect *select);
+static void          gimp_brush_select_mode_changed    (GimpContext     *context,
+                                                        GimpLayerMode    paint_mode,
+                                                        GimpBrushSelect *select);
+
+static void          gimp_brush_select_opacity_update  (GtkAdjustment   *adj,
+                                                        GimpBrushSelect *select);
+static void          gimp_brush_select_spacing_update  (GtkAdjustment   *adj,
+                                                        GimpBrushSelect *select);
+
+
+G_DEFINE_TYPE (GimpBrushSelect, gimp_brush_select, GIMP_TYPE_PDB_DIALOG)
+
+#define parent_class gimp_brush_select_parent_class
+
+
+static void
+gimp_brush_select_class_init (GimpBrushSelectClass *klass)
+{
+  GObjectClass       *object_class = G_OBJECT_CLASS (klass);
+  GimpPdbDialogClass *pdb_class    = GIMP_PDB_DIALOG_CLASS (klass);
+
+  object_class->constructed  = gimp_brush_select_constructed;
+  object_class->set_property = gimp_brush_select_set_property;
+
+  pdb_class->run_callback    = gimp_brush_select_run_callback;
+
+  g_object_class_install_property (object_class, PROP_OPACITY,
+                                   g_param_spec_double ("opacity", NULL, NULL,
+                                                        GIMP_OPACITY_TRANSPARENT,
+                                                        GIMP_OPACITY_OPAQUE,
+                                                        GIMP_OPACITY_OPAQUE,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_PAINT_MODE,
+                                   g_param_spec_enum ("paint-mode", NULL, NULL,
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_WRITABLE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SPACING,
+                                   g_param_spec_int ("spacing", NULL, NULL,
+                                                     -G_MAXINT, 1000, -1,
+                                                     GIMP_PARAM_WRITABLE |
+                                                     G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_brush_select_init (GimpBrushSelect *select)
+{
+}
+
+static void
+gimp_brush_select_constructed (GObject *object)
+{
+  GimpPdbDialog   *dialog = GIMP_PDB_DIALOG (object);
+  GimpBrushSelect *select = GIMP_BRUSH_SELECT (object);
+  GtkWidget       *content_area;
+  GtkWidget       *vbox;
+  GtkWidget       *scale;
+  GtkWidget       *hbox;
+  GtkWidget       *label;
+  GtkAdjustment   *spacing_adj;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_context_set_opacity    (dialog->context, select->initial_opacity);
+  gimp_context_set_paint_mode (dialog->context, select->initial_mode);
+
+  g_signal_connect (dialog->context, "opacity-changed",
+                    G_CALLBACK (gimp_brush_select_opacity_changed),
+                    dialog);
+  g_signal_connect (dialog->context, "paint-mode-changed",
+                    G_CALLBACK (gimp_brush_select_mode_changed),
+                    dialog);
+
+  dialog->view =
+    gimp_brush_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                 dialog->context->gimp->brush_factory,
+                                 dialog->context,
+                                 FALSE,
+                                 GIMP_VIEW_SIZE_MEDIUM, 1,
+                                 dialog->menu_factory);
+
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
+                                       5 * (GIMP_VIEW_SIZE_MEDIUM + 2),
+                                       5 * (GIMP_VIEW_SIZE_MEDIUM + 2));
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->view);
+
+  vbox = GTK_WIDGET (GIMP_CONTAINER_EDITOR (dialog->view)->view);
+
+  /*  Create the opacity scale widget  */
+  select->opacity_data =
+    GTK_ADJUSTMENT (gtk_adjustment_new (gimp_context_get_opacity (dialog->context) * 100.0,
+                                        0.0, 100.0,
+                                        1.0, 10.0, 0.0));
+
+  scale = gimp_spin_scale_new (select->opacity_data,
+                               _("Opacity"), 1);
+  gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  g_signal_connect (select->opacity_data, "value-changed",
+                    G_CALLBACK (gimp_brush_select_opacity_update),
+                    select);
+
+  /*  Create the paint mode option menu  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Mode:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  select->layer_mode_box = gimp_layer_mode_box_new (GIMP_LAYER_MODE_CONTEXT_PAINT);
+  gtk_box_pack_start (GTK_BOX (hbox), select->layer_mode_box, TRUE, TRUE, 0);
+  gtk_widget_show (select->layer_mode_box);
+
+  g_object_bind_property (G_OBJECT (dialog->context),        "paint-mode",
+                          G_OBJECT (select->layer_mode_box), "layer-mode",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+
+  spacing_adj = GIMP_BRUSH_FACTORY_VIEW (dialog->view)->spacing_adjustment;
+
+  /*  Use passed spacing instead of brushes default  */
+  if (select->spacing >= 0)
+    gtk_adjustment_set_value (spacing_adj, select->spacing);
+
+  g_signal_connect (spacing_adj, "value-changed",
+                    G_CALLBACK (gimp_brush_select_spacing_update),
+                    select);
+}
+
+static void
+gimp_brush_select_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpPdbDialog   *dialog = GIMP_PDB_DIALOG (object);
+  GimpBrushSelect *select = GIMP_BRUSH_SELECT (object);
+
+  switch (property_id)
+    {
+    case PROP_OPACITY:
+      if (dialog->view)
+        gimp_context_set_opacity (dialog->context, g_value_get_double (value));
+      else
+        select->initial_opacity = g_value_get_double (value);
+      break;
+    case PROP_PAINT_MODE:
+      if (dialog->view)
+        gimp_context_set_paint_mode (dialog->context, g_value_get_enum (value));
+      else
+        select->initial_mode = g_value_get_enum (value);
+      break;
+    case PROP_SPACING:
+      if (dialog->view)
+        {
+          if (g_value_get_int (value) >= 0)
+            gtk_adjustment_set_value (GIMP_BRUSH_FACTORY_VIEW (dialog->view)->spacing_adjustment,
+                                      g_value_get_int (value));
+        }
+      else
+        {
+          select->spacing = g_value_get_int (value);
+        }
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpValueArray *
+gimp_brush_select_run_callback (GimpPdbDialog  *dialog,
+                                GimpObject     *object,
+                                gboolean        closing,
+                                GError        **error)
+{
+  GimpBrush      *brush = GIMP_BRUSH (object);
+  GimpTempBuf    *mask  = gimp_brush_get_mask (brush);
+  const Babl     *format;
+  gpointer        data;
+  GimpArray      *array;
+  GimpValueArray *return_vals;
+
+  format = gimp_babl_compat_u8_mask_format (gimp_temp_buf_get_format (mask));
+  data   = gimp_temp_buf_lock (mask, format, GEGL_ACCESS_READ);
+
+  array = gimp_array_new (data,
+                          gimp_temp_buf_get_width         (mask) *
+                          gimp_temp_buf_get_height        (mask) *
+                          babl_format_get_bytes_per_pixel (format),
+                          TRUE);
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name (dialog->pdb,
+                                        dialog->caller_context,
+                                        NULL, error,
+                                        dialog->callback_name,
+                                        G_TYPE_STRING,        gimp_object_get_name (object),
+                                        G_TYPE_DOUBLE,        gimp_context_get_opacity (dialog->context) * 100.0,
+                                        GIMP_TYPE_INT32,      GIMP_BRUSH_SELECT (dialog)->spacing,
+                                        GIMP_TYPE_INT32,      gimp_context_get_paint_mode (dialog->context),
+                                        GIMP_TYPE_INT32,      gimp_brush_get_width  (brush),
+                                        GIMP_TYPE_INT32,      gimp_brush_get_height (brush),
+                                        GIMP_TYPE_INT32,      array->length,
+                                        GIMP_TYPE_INT8_ARRAY, array,
+                                        GIMP_TYPE_INT32,      closing,
+                                        G_TYPE_NONE);
+
+  gimp_array_free (array);
+
+  gimp_temp_buf_unlock (mask, data);
+
+  return return_vals;
+}
+
+static void
+gimp_brush_select_opacity_changed (GimpContext     *context,
+                                   gdouble          opacity,
+                                   GimpBrushSelect *select)
+{
+  g_signal_handlers_block_by_func (select->opacity_data,
+                                   gimp_brush_select_opacity_update,
+                                   select);
+
+  gtk_adjustment_set_value (select->opacity_data, opacity * 100.0);
+
+  g_signal_handlers_unblock_by_func (select->opacity_data,
+                                     gimp_brush_select_opacity_update,
+                                     select);
+
+  gimp_pdb_dialog_run_callback (GIMP_PDB_DIALOG (select), FALSE);
+}
+
+static void
+gimp_brush_select_mode_changed (GimpContext     *context,
+                                GimpLayerMode    paint_mode,
+                                GimpBrushSelect *select)
+{
+  gimp_pdb_dialog_run_callback (GIMP_PDB_DIALOG (select), FALSE);
+}
+
+static void
+gimp_brush_select_opacity_update (GtkAdjustment   *adjustment,
+                                  GimpBrushSelect *select)
+{
+  gimp_context_set_opacity (GIMP_PDB_DIALOG (select)->context,
+                            gtk_adjustment_get_value (adjustment) / 100.0);
+}
+
+static void
+gimp_brush_select_spacing_update (GtkAdjustment   *adjustment,
+                                  GimpBrushSelect *select)
+{
+  gdouble value = gtk_adjustment_get_value (adjustment);
+
+  if (select->spacing != value)
+    {
+      select->spacing = value;
+
+      gimp_pdb_dialog_run_callback (GIMP_PDB_DIALOG (select), FALSE);
+    }
+}
diff --git a/app/widgets/gimpbrushselect.h b/app/widgets/gimpbrushselect.h
new file mode 100644
index 0000000..e09ae8b
--- /dev/null
+++ b/app/widgets/gimpbrushselect.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbrushselect.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BRUSH_SELECT_H__
+#define __GIMP_BRUSH_SELECT_H__
+
+#include "gimppdbdialog.h"
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_BRUSH_SELECT            (gimp_brush_select_get_type ())
+#define GIMP_BRUSH_SELECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_SELECT, GimpBrushSelect))
+#define GIMP_BRUSH_SELECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BRUSH_SELECT, GimpBrushSelectClass))
+#define GIMP_IS_BRUSH_SELECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BRUSH_SELECT))
+#define GIMP_IS_BRUSH_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BRUSH_SELECT))
+#define GIMP_BRUSH_SELECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BRUSH_SELECT, GimpBrushSelectClass))
+
+
+typedef struct _GimpBrushSelectClass  GimpBrushSelectClass;
+
+struct _GimpBrushSelect
+{
+  GimpPdbDialog  parent_instance;
+
+  gdouble        initial_opacity;
+  GimpLayerMode  initial_mode;
+
+  gint           spacing;
+  GtkAdjustment *opacity_data;
+  GtkWidget     *layer_mode_box;
+};
+
+struct _GimpBrushSelectClass
+{
+  GimpPdbDialogClass  parent_class;
+};
+
+
+GType  gimp_brush_select_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_BRUSH_SELECT_H__ */
diff --git a/app/widgets/gimpbuffersourcebox.c b/app/widgets/gimpbuffersourcebox.c
new file mode 100644
index 0000000..bb19ef2
--- /dev/null
+++ b/app/widgets/gimpbuffersourcebox.c
@@ -0,0 +1,357 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbuffersourcebox.c
+ * Copyright (C) 2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gegl/gimp-gegl-utils.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimppickable.h"
+
+#include "gimpbuffersourcebox.h"
+#include "gimppickablebutton.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_SOURCE_NODE,
+  PROP_NAME,
+  PROP_PICKABLE,
+  PROP_ENABLED
+};
+
+struct _GimpBufferSourceBoxPrivate
+{
+  GimpContext  *context;
+  GeglNode     *source_node;
+  gchar        *name;
+  GimpPickable *pickable;
+  gboolean      enabled;
+
+  GtkWidget    *toggle;
+  GtkWidget    *button;
+  GtkWidget    *label;
+};
+
+
+static void   gimp_buffer_source_box_constructed     (GObject             *object);
+static void   gimp_buffer_source_box_finalize        (GObject             *object);
+static void   gimp_buffer_source_box_set_property    (GObject             *object,
+                                                      guint                property_id,
+                                                      const GValue        *value,
+                                                      GParamSpec          *pspec);
+static void   gimp_buffer_source_box_get_property    (GObject             *object,
+                                                      guint                property_id,
+                                                      GValue              *value,
+                                                      GParamSpec          *pspec);
+
+static void   gimp_buffer_source_box_notify_pickable (GimpPickableButton  *button,
+                                                      const GParamSpec    *pspec,
+                                                      GimpBufferSourceBox *box);
+static void   gimp_buffer_source_box_enable_toggled  (GtkToggleButton     *button,
+                                                      GimpBufferSourceBox *box);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpBufferSourceBox, gimp_buffer_source_box,
+                            GTK_TYPE_BOX)
+
+#define parent_class gimp_buffer_source_box_parent_class
+
+
+static void
+gimp_buffer_source_box_class_init (GimpBufferSourceBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_buffer_source_box_constructed;
+  object_class->finalize     = gimp_buffer_source_box_finalize;
+  object_class->set_property = gimp_buffer_source_box_set_property;
+  object_class->get_property = gimp_buffer_source_box_get_property;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SOURCE_NODE,
+                                   g_param_spec_object ("source-node", NULL, NULL,
+                                                        GEGL_TYPE_NODE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_NAME,
+                                   g_param_spec_string ("name", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PICKABLE,
+                                   g_param_spec_object ("pickable", NULL, NULL,
+                                                        GIMP_TYPE_PICKABLE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ENABLED,
+                                   g_param_spec_boolean ("enabled", NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_buffer_source_box_init (GimpBufferSourceBox *box)
+{
+  box->priv = gimp_buffer_source_box_get_instance_private (box);
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_HORIZONTAL);
+  gtk_box_set_spacing (GTK_BOX (box), 2);
+}
+
+static void
+gimp_buffer_source_box_constructed (GObject *object)
+{
+  GimpBufferSourceBox *box = GIMP_BUFFER_SOURCE_BOX (object);
+  GtkWidget           *alignment;
+
+  alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
+  gtk_box_pack_start (GTK_BOX (box), alignment, FALSE, FALSE, 0);
+  gtk_widget_show (alignment);
+
+  box->priv->toggle = gtk_check_button_new_with_mnemonic (box->priv->name);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->priv->toggle),
+                                box->priv->enabled);
+  gtk_container_add (GTK_CONTAINER (alignment), box->priv->toggle);
+  gtk_widget_show (box->priv->toggle);
+
+  g_signal_connect_object (box->priv->toggle, "toggled",
+                           G_CALLBACK (gimp_buffer_source_box_enable_toggled),
+                           box, 0);
+
+  box->priv->button = gimp_pickable_button_new (box->priv->context,
+                                                GIMP_VIEW_SIZE_LARGE, 1);
+  gimp_pickable_button_set_pickable (GIMP_PICKABLE_BUTTON (box->priv->button),
+                                     box->priv->pickable);
+  gtk_box_pack_start (GTK_BOX (box), box->priv->button, FALSE, FALSE, 0);
+  gtk_widget_show (box->priv->button);
+
+  box->priv->label = gtk_label_new (_("(none)"));
+  gtk_label_set_xalign (GTK_LABEL (box->priv->label), 0.0);
+  gtk_label_set_ellipsize (GTK_LABEL (box->priv->label), PANGO_ELLIPSIZE_END);
+  gtk_box_pack_start (GTK_BOX (box), box->priv->label, TRUE, TRUE, 0);
+  gtk_widget_show (box->priv->label);
+
+  g_signal_connect_object (box->priv->button, "notify::pickable",
+                           G_CALLBACK (gimp_buffer_source_box_notify_pickable),
+                           box, 0);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+static void
+gimp_buffer_source_box_finalize (GObject *object)
+{
+  GimpBufferSourceBox *box = GIMP_BUFFER_SOURCE_BOX (object);
+
+  g_clear_object (&box->priv->context);
+  g_clear_object (&box->priv->source_node);
+  g_clear_pointer (&box->priv->name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_buffer_source_box_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpBufferSourceBox *box = GIMP_BUFFER_SOURCE_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      box->priv->context = g_value_dup_object (value);
+      break;
+
+    case PROP_SOURCE_NODE:
+      box->priv->source_node = g_value_dup_object (value);
+      break;
+
+    case PROP_NAME:
+      box->priv->name = g_value_dup_string (value);
+      break;
+
+    case PROP_PICKABLE:
+      box->priv->pickable = g_value_get_object (value);
+      if (box->priv->button)
+        gimp_pickable_button_set_pickable (GIMP_PICKABLE_BUTTON (box->priv->button),
+                                           box->priv->pickable);
+      break;
+
+    case PROP_ENABLED:
+      box->priv->enabled = g_value_get_boolean (value);
+      if (box->priv->toggle)
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->priv->toggle),
+                                      box->priv->enabled);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_buffer_source_box_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpBufferSourceBox *box = GIMP_BUFFER_SOURCE_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, box->priv->context);
+      break;
+
+    case PROP_SOURCE_NODE:
+      g_value_set_object (value, box->priv->source_node);
+      break;
+
+    case PROP_NAME:
+      g_value_set_string (value, box->priv->name);
+      break;
+
+    case PROP_PICKABLE:
+      g_value_set_object (value, box->priv->pickable);
+      break;
+
+    case PROP_ENABLED:
+      g_value_set_boolean (value, box->priv->enabled);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_buffer_source_box_update_node (GimpBufferSourceBox *box)
+{
+  GeglBuffer *buffer = NULL;
+
+  if (box->priv->pickable)
+    {
+      gchar *desc;
+
+      if (box->priv->enabled)
+        {
+          gimp_pickable_flush (box->priv->pickable);
+
+          /* dup the buffer, since the original may be modified while applying
+           * the operation.  see issue #1283.
+           */
+          buffer = gimp_gegl_buffer_dup (
+            gimp_pickable_get_buffer (box->priv->pickable));
+        }
+
+      desc = gimp_viewable_get_description (GIMP_VIEWABLE (box->priv->pickable),
+                                            NULL);
+      gtk_label_set_text (GTK_LABEL (box->priv->label), desc);
+      g_free (desc);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (box->priv->label), _("(none)"));
+    }
+
+  gegl_node_set (box->priv->source_node,
+                 "buffer", buffer,
+                 NULL);
+
+  g_clear_object (&buffer);
+}
+
+static void
+gimp_buffer_source_box_notify_pickable (GimpPickableButton  *button,
+                                        const GParamSpec    *pspec,
+                                        GimpBufferSourceBox *box)
+{
+  box->priv->pickable = gimp_pickable_button_get_pickable (button);
+
+  gimp_buffer_source_box_update_node (box);
+
+  g_object_notify (G_OBJECT (box), "pickable");
+}
+
+static void
+gimp_buffer_source_box_enable_toggled (GtkToggleButton     *button,
+                                       GimpBufferSourceBox *box)
+{
+  box->priv->enabled = gtk_toggle_button_get_active (button);
+
+  gimp_buffer_source_box_update_node (box);
+
+  g_object_notify (G_OBJECT (box), "enabled");
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_buffer_source_box_new (GimpContext *context,
+                            GeglNode    *source_node,
+                            const gchar *name)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GEGL_IS_NODE (source_node), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_BUFFER_SOURCE_BOX,
+                       "context",     context,
+                       "source-node", source_node,
+                       "name",        name,
+                       NULL);
+}
+
+GtkWidget *
+gimp_buffer_source_box_get_toggle (GimpBufferSourceBox *box)
+{
+  g_return_val_if_fail (GIMP_IS_BUFFER_SOURCE_BOX (box), NULL);
+
+  return box->priv->toggle;
+}
diff --git a/app/widgets/gimpbuffersourcebox.h b/app/widgets/gimpbuffersourcebox.h
new file mode 100644
index 0000000..fa769cb
--- /dev/null
+++ b/app/widgets/gimpbuffersourcebox.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbuffersourcebox.h
+ * Copyright (C) 2015  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BUFFER_SOURCE_BOX_H__
+#define __GIMP_BUFFER_SOURCE_BOX_H__
+
+
+#define GIMP_TYPE_BUFFER_SOURCE_BOX            (gimp_buffer_source_box_get_type ())
+#define GIMP_BUFFER_SOURCE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BUFFER_SOURCE_BOX, GimpBufferSourceBox))
+#define GIMP_BUFFER_SOURCE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUFFER_SOURCE_BOX, GimpBufferSourceBoxClass))
+#define GIMP_IS_BUFFER_SOURCE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BUFFER_SOURCE_BOX))
+#define GIMP_IS_BUFFER_SOURCE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUFFER_SOURCE_BOX))
+#define GIMP_BUFFER_SOURCE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BUFFER_SOURCE_BOX, GimpBufferSourceBoxClass))
+
+
+typedef struct _GimpBufferSourceBoxPrivate GimpBufferSourceBoxPrivate;
+typedef struct _GimpBufferSourceBoxClass   GimpBufferSourceBoxClass;
+
+struct _GimpBufferSourceBox
+{
+  GtkBox                      parent_instance;
+
+  GimpBufferSourceBoxPrivate *priv;
+};
+
+struct _GimpBufferSourceBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_buffer_source_box_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_buffer_source_box_new        (GimpContext         *context,
+                                               GeglNode            *source_node,
+                                               const gchar         *name);
+
+GtkWidget * gimp_buffer_source_box_get_toggle (GimpBufferSourceBox *box);
+
+
+#endif  /*  __GIMP_BUFFER_SOURCE_BOX_H__  */
diff --git a/app/widgets/gimpbufferview.c b/app/widgets/gimpbufferview.c
new file mode 100644
index 0000000..8600712
--- /dev/null
+++ b/app/widgets/gimpbufferview.c
@@ -0,0 +1,308 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbufferview.c
+ * Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpbufferview.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpeditor.h"
+#include "gimphelp-ids.h"
+#include "gimpview.h"
+#include "gimpviewrendererbuffer.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_buffer_view_docked_iface_init (GimpDockedInterface *iface);
+
+static void   gimp_buffer_view_set_context       (GimpDocked          *docked,
+                                                  GimpContext         *context);
+
+static void   gimp_buffer_view_activate_item     (GimpContainerEditor *editor,
+                                                  GimpViewable        *viewable);
+
+static void   gimp_buffer_view_clipboard_changed (Gimp                *gimp,
+                                                  GimpBufferView      *buffer_view);
+static void   gimp_buffer_view_view_notify       (GimpContainerView   *view,
+                                                  GParamSpec          *pspec,
+                                                  GimpBufferView      *buffer_view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBufferView, gimp_buffer_view,
+                         GIMP_TYPE_CONTAINER_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_buffer_view_docked_iface_init))
+
+#define parent_class gimp_buffer_view_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_buffer_view_class_init (GimpBufferViewClass *klass)
+{
+  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
+
+  editor_class->activate_item = gimp_buffer_view_activate_item;
+}
+
+static void
+gimp_buffer_view_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_buffer_view_set_context;
+}
+
+static void
+gimp_buffer_view_init (GimpBufferView *view)
+{
+}
+
+static void
+gimp_buffer_view_set_context (GimpDocked  *docked,
+                              GimpContext *context)
+{
+  GimpBufferView *view = GIMP_BUFFER_VIEW (docked);
+
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_view_renderer_set_context (GIMP_VIEW (view->clipboard_view)->renderer,
+                                  context);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_buffer_view_new (GimpViewType     view_type,
+                      GimpContainer   *container,
+                      GimpContext     *context,
+                      gint             view_size,
+                      gint             view_border_width,
+                      GimpMenuFactory *menu_factory)
+{
+  GimpBufferView      *buffer_view;
+  GimpContainerEditor *editor;
+  GtkWidget           *frame;
+  GtkWidget           *hbox;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, FALSE);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        FALSE);
+
+  buffer_view = g_object_new (GIMP_TYPE_BUFFER_VIEW,
+                              "view-type",         view_type,
+                              "container",         container,
+                              "context",           context,
+                              "view-size",         view_size,
+                              "view-border-width", view_border_width,
+                              "menu-factory",      menu_factory,
+                              "menu-identifier",   "<Buffers>",
+                              "ui-path",           "/buffers-popup",
+                              NULL);
+
+  editor = GIMP_CONTAINER_EDITOR (buffer_view);
+
+  if (GIMP_IS_CONTAINER_TREE_VIEW (editor->view))
+    {
+      GimpContainerTreeView *tree_view;
+
+      tree_view = GIMP_CONTAINER_TREE_VIEW (editor->view);
+
+      gimp_container_tree_view_connect_name_edited (tree_view,
+                                                    G_CALLBACK (gimp_container_tree_view_name_edited),
+                                                    tree_view);
+    }
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (editor), frame, 0);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+  gtk_widget_show (hbox);
+
+  /* FIXME: enable preview of a clipboard image, not just buffer */
+  buffer_view->clipboard_view =
+    gimp_view_new_full_by_types (NULL,
+                                 GIMP_TYPE_VIEW,
+                                 GIMP_TYPE_BUFFER,
+                                 view_size, view_size, view_border_width,
+                                 FALSE, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), buffer_view->clipboard_view,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (buffer_view->clipboard_view);
+
+  g_signal_connect_object (editor->view, "notify::view-size",
+                           G_CALLBACK (gimp_buffer_view_view_notify),
+                           buffer_view, 0);
+  g_signal_connect_object (editor->view, "notify::view-border-width",
+                           G_CALLBACK (gimp_buffer_view_view_notify),
+                           buffer_view, 0);
+
+  buffer_view->clipboard_label = gtk_label_new (_("(None)"));
+  gtk_box_pack_start (GTK_BOX (hbox), buffer_view->clipboard_label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (buffer_view->clipboard_label);
+
+  g_signal_connect_object (context->gimp, "clipboard-changed",
+                           G_CALLBACK (gimp_buffer_view_clipboard_changed),
+                           G_OBJECT (buffer_view), 0);
+
+  gimp_buffer_view_clipboard_changed (context->gimp, buffer_view);
+
+  buffer_view->paste_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "buffers",
+                                   "buffers-paste",
+                                   "buffers-paste-in-place",
+                                   gimp_get_extend_selection_mask (),
+                                   NULL);
+
+  buffer_view->paste_into_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "buffers",
+                                   "buffers-paste-into",
+                                   "buffers-paste-into-in-place",
+                                   gimp_get_extend_selection_mask (),
+                                   NULL);
+
+  buffer_view->paste_as_new_layer_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "buffers",
+                                   "buffers-paste-as-new-layer",
+                                   "buffers-paste-as-new-layer-in-place",
+                                   gimp_get_extend_selection_mask (),
+                                   NULL);
+
+  buffer_view->paste_as_new_image_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "buffers",
+                                   "buffers-paste-as-new-image", NULL);
+
+  buffer_view->delete_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "buffers",
+                                   "buffers-delete", NULL);
+
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (buffer_view->paste_button),
+                                  GIMP_TYPE_BUFFER);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (buffer_view->paste_into_button),
+                                  GIMP_TYPE_BUFFER);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (buffer_view->paste_as_new_layer_button),
+                                  GIMP_TYPE_BUFFER);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (buffer_view->paste_as_new_image_button),
+                                  GIMP_TYPE_BUFFER);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (buffer_view->delete_button),
+                                  GIMP_TYPE_BUFFER);
+
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)),
+                          editor);
+
+  return GTK_WIDGET (buffer_view);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_buffer_view_activate_item (GimpContainerEditor *editor,
+                                GimpViewable        *viewable)
+{
+  GimpBufferView *view = GIMP_BUFFER_VIEW (editor);
+  GimpContainer  *container;
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item (editor, viewable);
+
+  container = gimp_container_view_get_container (editor->view);
+
+  if (viewable && gimp_container_have (container, GIMP_OBJECT (viewable)))
+    {
+      gtk_button_clicked (GTK_BUTTON (view->paste_button));
+    }
+}
+
+static void
+gimp_buffer_view_clipboard_changed (Gimp           *gimp,
+                                    GimpBufferView *buffer_view)
+{
+  GimpBuffer *buffer = gimp_get_clipboard_buffer (gimp);
+
+  gimp_view_set_viewable (GIMP_VIEW (buffer_view->clipboard_view),
+                          GIMP_VIEWABLE (buffer));
+
+  if (buffer)
+    {
+      gchar *desc = gimp_viewable_get_description (GIMP_VIEWABLE (buffer),
+                                                   NULL);
+      gtk_label_set_text (GTK_LABEL (buffer_view->clipboard_label), desc);
+      g_free (desc);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (buffer_view->clipboard_label), _("(None)"));
+    }
+}
+
+static void
+gimp_buffer_view_view_notify (GimpContainerView *container_view,
+                              GParamSpec        *pspec,
+                              GimpBufferView    *buffer_view)
+{
+  GimpView *view = GIMP_VIEW (buffer_view->clipboard_view);
+  gint      view_size;
+  gint      view_border_width;
+
+  view_size = gimp_container_view_get_view_size (container_view,
+                                                 &view_border_width);
+
+  gimp_view_renderer_set_size_full (view->renderer,
+                                    view_size, view_size, view_border_width);
+}
diff --git a/app/widgets/gimpbufferview.h b/app/widgets/gimpbufferview.h
new file mode 100644
index 0000000..547b798
--- /dev/null
+++ b/app/widgets/gimpbufferview.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpbufferview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_BUFFER_VIEW_H__
+#define __GIMP_BUFFER_VIEW_H__
+
+
+#include "gimpcontainereditor.h"
+
+
+#define GIMP_TYPE_BUFFER_VIEW            (gimp_buffer_view_get_type ())
+#define GIMP_BUFFER_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BUFFER_VIEW, GimpBufferView))
+#define GIMP_BUFFER_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BUFFER_VIEW, GimpBufferViewClass))
+#define GIMP_IS_BUFFER_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BUFFER_VIEW))
+#define GIMP_IS_BUFFER_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BUFFER_VIEW))
+#define GIMP_BUFFER_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_BUFFER_VIEW, GimpBufferViewClass))
+
+
+typedef struct _GimpBufferViewClass  GimpBufferViewClass;
+
+struct _GimpBufferView
+{
+  GimpContainerEditor  parent_instance;
+
+  GtkWidget           *clipboard_view;
+  GtkWidget           *clipboard_label;
+
+  GtkWidget           *paste_button;
+  GtkWidget           *paste_into_button;
+  GtkWidget           *paste_as_new_layer_button;
+  GtkWidget           *paste_as_new_image_button;
+  GtkWidget           *delete_button;
+};
+
+struct _GimpBufferViewClass
+{
+  GimpContainerEditorClass  parent_class;
+};
+
+
+GType       gimp_buffer_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_buffer_view_new      (GimpViewType     view_type,
+                                       GimpContainer   *container,
+                                       GimpContext     *context,
+                                       gint             view_size,
+                                       gint             view_border_width,
+                                       GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_BUFFER_VIEW_H__  */
diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
new file mode 100644
index 0000000..faf75bf
--- /dev/null
+++ b/app/widgets/gimpcairo-wilber.c
@@ -0,0 +1,1010 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Wilber Cairo rendering
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * Some code here is based on code from librsvg that was originally
+ * written by Raph Levien <raph@artofcode.com> for Gill.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "gimpcairo-wilber.h"
+
+
+static void   gimp_cairo_wilber_internal (GtkWidget *widget,
+                                          cairo_t   *cr,
+                                          gdouble    x,
+                                          gdouble    y,
+                                          gdouble    factor,
+                                          gdouble    max_eye_angle);
+static void   gimp_cairo_eyes            (GtkWidget *widget,
+                                          cairo_t   *cr,
+                                          gdouble    x,
+                                          gdouble    y,
+                                          gdouble    factor,
+                                          gdouble    max_eye_angle);
+
+
+static gboolean  pointer_eyes         = FALSE;
+static GSList   *cairo_wilber_widgets = NULL;
+
+
+void
+gimp_cairo_wilber_toggle_pointer_eyes (void)
+{
+  GSList *iter;
+
+  pointer_eyes = ! pointer_eyes;
+
+  for (iter = cairo_wilber_widgets; iter; iter = g_slist_next (iter))
+    {
+      if (pointer_eyes)
+        g_object_set_data (G_OBJECT (iter->data), "wilber-eyes-state", NULL);
+
+      gtk_widget_queue_draw (GTK_WIDGET (iter->data));
+    }
+}
+
+void
+gimp_cairo_draw_toolbox_wilber (GtkWidget *widget,
+                                cairo_t   *cr)
+{
+  GtkStyle     *style;
+  GtkStateType  state;
+  GtkAllocation allocation;
+  gdouble       wilber_width;
+  gdouble       wilber_height;
+  gdouble       factor;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (cr != NULL);
+
+  style = gtk_widget_get_style (widget);
+  state = gtk_widget_get_state (widget);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gimp_cairo_wilber_get_size (cr, &wilber_width, &wilber_height);
+
+  factor = allocation.width / wilber_width * 0.9;
+
+  if (! gtk_widget_get_has_window (widget))
+    cairo_translate (cr, allocation.x, allocation.y);
+
+  cairo_scale (cr, factor, factor);
+
+  gimp_cairo_wilber_internal (widget, cr,
+                              (allocation.width  / factor - wilber_width)  / 2.0,
+                              (allocation.height / factor - wilber_height) / 2.0,
+                              factor, 30.0 * G_PI / 180.0);
+
+  cairo_set_source_rgba (cr,
+                         style->fg[state].red   / 65535.0,
+                         style->fg[state].green / 65535.0,
+                         style->fg[state].blue  / 65535.0,
+                         0.10);
+  cairo_fill (cr);
+}
+
+void
+gimp_cairo_draw_drop_wilber (GtkWidget *widget,
+                             cairo_t   *cr,
+                             gboolean   blink)
+{
+  GtkStyle     *style;
+  GtkStateType  state;
+  GtkAllocation allocation;
+  gdouble       wilber_width;
+  gdouble       wilber_height;
+  gdouble       width;
+  gdouble       height;
+  gdouble       side;
+  gdouble       factor;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (cr != NULL);
+
+  style  = gtk_widget_get_style (widget);
+  state  = gtk_widget_get_state (widget);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gimp_cairo_wilber_get_size (cr, &wilber_width, &wilber_height);
+
+  wilber_width  /= 2;
+  wilber_height /= 2;
+
+  side = MIN (MIN (allocation.width, allocation.height),
+              MAX (allocation.width, allocation.height) / 2);
+
+  width  = MAX (wilber_width,  side);
+  height = MAX (wilber_height, side);
+
+  factor = MIN (width / wilber_width, height / wilber_height);
+
+  if (! gtk_widget_get_has_window (widget))
+    cairo_translate (cr, allocation.x, allocation.y);
+
+  cairo_scale (cr, factor, factor);
+
+  /*  magic factors depend on the image used, everything else is generic
+   */
+  gimp_cairo_wilber_internal (widget, cr,
+                              - wilber_width * 0.6,
+                              allocation.height / factor - wilber_height * 1.1,
+                              factor, 50.0 * G_PI / 180.0);
+
+  cairo_set_source_rgba (cr,
+                         style->fg[state].red   / 65535.0,
+                         style->fg[state].green / 65535.0,
+                         style->fg[state].blue  / 65535.0,
+                         0.15);
+  cairo_fill (cr);
+
+  if (blink)
+    {
+      gimp_cairo_eyes (widget, cr,
+                       - wilber_width * 0.6,
+                       allocation.height / factor - wilber_height * 1.1,
+                       factor, 50.0 * G_PI / 180.0);
+
+      cairo_set_source_rgba (cr,
+                             style->fg[state].red   / 65535.0,
+                             0,
+                             0,
+                             1.0);
+      cairo_fill (cr);
+    }
+}
+
+
+/* This string is a path description as found in SVG files.  You can
+ * use Inkscape to create the SVG file, then copy the path from it.
+ * It works best if you combine all paths into one. Inkscape has a
+ * function to do that.
+ */
+static const gchar wilber_path[] =
+  "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z ";
+
+static const gchar eyes_path[] =
+  "M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
+
+static cairo_path_t *wilber_cairo_path = NULL;
+static gdouble       wilber_x1, wilber_y1;
+static gdouble       wilber_x2, wilber_y2;
+
+static cairo_path_t *eyes_cairo_path = NULL;
+static gdouble       eyes_x1, eyes_y1;
+static gdouble       eyes_x2, eyes_y2;
+
+
+static void  parse_path_data    (cairo_t     *cr,
+                                 const gchar *data);
+static void  wilber_get_extents (cairo_t     *cr);
+static void  eyes_get_extents   (cairo_t     *cr);
+
+
+/**
+ * gimp_cairo_wilber:
+ * @cr: Cairo context
+ * @x: x position
+ * @y: y position
+ *
+ * Draw a Wilber path at position @x, @y.
+ */
+void
+gimp_cairo_wilber (cairo_t *cr,
+                   gdouble  x,
+                   gdouble  y)
+{
+  gimp_cairo_wilber_internal (NULL, cr, x, y, 1.0, 0.0);
+}
+
+static void
+gimp_cairo_wilber_weak_notify (gpointer  data,
+                               GObject  *widget)
+{
+  cairo_wilber_widgets = g_slist_remove (cairo_wilber_widgets, widget);
+}
+
+static void
+gimp_cairo_wilber_internal (GtkWidget *widget,
+                            cairo_t   *cr,
+                            gdouble    x,
+                            gdouble    y,
+                            gdouble    factor,
+                            gdouble    max_eye_angle)
+{
+  wilber_get_extents (cr);
+
+  cairo_save (cr);
+
+  cairo_translate (cr, x - wilber_x1, y - wilber_y1);
+  cairo_append_path (cr, wilber_cairo_path);
+
+  cairo_restore (cr);
+
+  gimp_cairo_eyes (widget, cr, x, y, factor, max_eye_angle);
+
+  if (widget && ! g_slist_find (cairo_wilber_widgets, widget))
+    {
+      cairo_wilber_widgets = g_slist_prepend (cairo_wilber_widgets, widget);
+
+      g_object_weak_ref (G_OBJECT (widget),
+                         gimp_cairo_wilber_weak_notify, NULL);
+    }
+}
+
+typedef struct
+{
+  gdouble x;
+  gdouble y;
+  gdouble radius;
+
+  gdouble a;
+  gdouble b;
+  gdouble r;
+} Eye;
+
+static const Eye eyes[2] =
+{
+  { .x      = (344.151 + 382.496) / 2.0,
+    .y      = (501.128 + 539.473) / 2.0,
+    .radius = (382.496 - 344.151) / 2.0,
+
+    .a      = 25.0 * G_PI / 180.0,
+    .b      = 24.0 * G_PI / 180.0,
+    .r      = 0.475
+  },
+
+  { .x      = (385.287 + 442.878) / 2.0,
+    .y      = (491.431 + 549.022) / 2.0,
+    .radius = (442.878 - 385.287) / 2.0,
+
+    .a      = 34.0 * G_PI / 180.0,
+    .b      = 19.0 * G_PI / 180.0,
+    .r      = 0.5
+  }
+};
+
+typedef struct
+{
+  gdouble a;
+  gdouble b;
+} EyeState;
+
+typedef struct
+{
+  EyeState eyes[2];
+  gdouble  x;
+  gdouble  y;
+  gdouble  factor;
+  gdouble  max_eye_angle;
+  gdouble  t;
+  gint     timeout_id;
+} EyesState;
+
+static EyesState *
+eyes_state_new (void)
+{
+  EyesState *state = g_slice_new0 (EyesState);
+  gint       i;
+
+  for (i = 0; i < 2; i++)
+    {
+      state->eyes[i].a = eyes[i].a;
+      state->eyes[i].b = eyes[i].b;
+    }
+
+  state->t = (gdouble) g_get_monotonic_time () / G_TIME_SPAN_SECOND;
+
+  return state;
+}
+
+static void
+eyes_state_free (EyesState *state)
+{
+  if (state->timeout_id)
+    g_source_remove (state->timeout_id);
+
+  g_slice_free (EyesState, state);
+}
+
+static gboolean
+gimp_cairo_pointer_eyes_timeout (GtkWidget *widget)
+{
+  EyesState     *state;
+  gdouble        t;
+  gint           pointer_x;
+  gint           pointer_y;
+  GtkAllocation  allocation;
+  GdkWindow     *window;
+  gint           window_x;
+  gint           window_y;
+  gint           redraw = 2;
+  gint           i;
+
+  state = g_object_get_data (G_OBJECT (widget), "wilber-eyes-state");
+
+  t = (gdouble) g_get_monotonic_time () / G_TIME_SPAN_SECOND;
+
+  gdk_display_get_pointer (gtk_widget_get_display (widget),
+                           NULL, &pointer_x, &pointer_y, NULL);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  window = gtk_widget_get_window (widget);
+
+  if (window)
+    gdk_window_get_origin (window, &window_x, &window_y);
+
+  for (i = 0; i < 2; i++)
+    {
+      const Eye   *eye = &eyes[i];
+      gdouble      a;
+      gdouble      b;
+      gdouble      c;
+      GimpVector3  u;
+      GimpVector3  v;
+      GimpVector3  w;
+
+      if (pointer_eyes)
+        {
+          gdouble screen_x;
+          gdouble screen_y;
+          gdouble z = 220.0 * state->factor;
+          gdouble d;
+
+          screen_x = (eye->x + state->x - wilber_x1) * state->factor;
+          screen_y = (eye->y + state->y - wilber_y1) * state->factor;
+
+          if (! gtk_widget_get_has_window (widget))
+            {
+              screen_x += allocation.x;
+              screen_y += allocation.y;
+            }
+
+          if (window)
+            {
+              screen_x += window_x;
+              screen_y += window_y;
+            }
+
+          d = sqrt (SQR (pointer_x - screen_x) + SQR (pointer_y - screen_y));
+          a = atan2 (pointer_y - screen_y, pointer_x - screen_x);
+          b = atan (d / z);
+          b = MIN (b, state->max_eye_angle);
+        }
+      else
+        {
+          a = eyes[i].a;
+          b = eyes[i].b;
+        }
+
+      if (a == state->eyes[i].a && b == state->eyes[i].b)
+        {
+          redraw--;
+
+          continue;
+        }
+
+      u.x = sin (state->eyes[i].b) * cos (state->eyes[i].a);
+      u.y = sin (state->eyes[i].b) * sin (state->eyes[i].a);
+      u.z = cos (state->eyes[i].b);
+
+      v.x = sin (b) * cos (a);
+      v.y = sin (b) * sin (a);
+      v.z = cos (b);
+
+      c = acos (gimp_vector3_inner_product (&u, &v));
+
+      if (c < 1e-2)
+        {
+          state->eyes[i].a = a;
+          state->eyes[i].b = b;
+
+          continue;
+        }
+
+      c *= 1.0 - exp (-(t - state->t) * 15.0);
+
+      w = gimp_vector3_cross_product (&u, &v);
+      w = gimp_vector3_cross_product (&w, &u);
+      gimp_vector3_normalize (&w);
+
+      v.x = u.x * cos (c) + w.x * sin (c);
+      v.y = u.y * cos (c) + w.y * sin (c);
+      v.z = u.z * cos (c) + w.z * sin (c);
+
+      a = atan2 (v.y, v.x);
+      b = acos (v.z);
+
+      state->eyes[i].a = a;
+      state->eyes[i].b = b;
+    }
+
+  state->t = t;
+
+  if (redraw)
+    {
+      state->timeout_id = 0;
+
+      gtk_widget_queue_draw (widget);
+
+      return G_SOURCE_REMOVE;
+    }
+  else if (! pointer_eyes)
+    {
+      state->timeout_id = 0;
+
+      g_object_set_data (G_OBJECT (widget), "wilber-eyes-state", NULL);
+      gtk_widget_queue_draw (widget);
+
+      return G_SOURCE_REMOVE;
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+gimp_cairo_pointer_eyes (GtkWidget *widget,
+                         cairo_t   *cr,
+                         gdouble    x,
+                         gdouble    y,
+                         gdouble    factor,
+                         gdouble    max_eye_angle)
+{
+  EyesState *state;
+  gint       i;
+
+  state = g_object_get_data (G_OBJECT (widget), "wilber-eyes-state");
+
+  if (! state)
+    {
+      state = eyes_state_new ();
+
+      g_object_set_data_full (G_OBJECT (widget), "wilber-eyes-state", state,
+                              (GDestroyNotify) eyes_state_free);
+    }
+
+  for (i = 0; i < 2; i++)
+    {
+      const Eye *eye = &eyes[i];
+      gdouble    R = eye->radius;
+      gdouble    r = eye->r * eye->radius;
+      gint       j;
+
+      cairo_save (cr);
+
+      cairo_translate (cr, eye->x, eye->y);
+      cairo_rotate (cr, state->eyes[i].a);
+
+      for (j = 0; j < 32; j++)
+        {
+          gdouble a = -2.0 * G_PI * j / 32.0;
+          gdouble u = r * cos (a);
+          gdouble v = r * sin (a);
+          gdouble w = sqrt (SQR (R) - SQR (v));
+          gdouble b = asin (u / w);
+
+          b = CLAMP (b + state->eyes[i].b, -G_PI / 2.0, +G_PI / 2.0);
+          u = w * sin (b);
+
+          if (j == 0)
+            cairo_move_to (cr, u, v);
+          else
+            cairo_line_to (cr, u, v);
+        }
+
+      cairo_close_path (cr);
+
+      cairo_restore (cr);
+    }
+
+  state->x             = x;
+  state->y             = y;
+  state->factor        = factor;
+  state->max_eye_angle = max_eye_angle;
+
+  if (! state->timeout_id)
+    {
+      state->timeout_id =
+        g_timeout_add (17,
+                       (GSourceFunc) gimp_cairo_pointer_eyes_timeout,
+                       widget);
+    }
+}
+
+static void
+gimp_cairo_eyes (GtkWidget *widget,
+                 cairo_t   *cr,
+                 gdouble    x,
+                 gdouble    y,
+                 gdouble    factor,
+                 gdouble    max_eye_angle)
+{
+  wilber_get_extents (cr);
+  eyes_get_extents (cr);
+
+  cairo_save (cr);
+
+  cairo_translate (cr, x - wilber_x1, y - wilber_y1);
+  if (widget        &&
+      (pointer_eyes ||
+       g_object_get_data (G_OBJECT (widget), "wilber-eyes-state")))
+    {
+      gimp_cairo_pointer_eyes (widget, cr, x, y, factor, max_eye_angle);
+    }
+  else
+    {
+      cairo_append_path (cr, eyes_cairo_path);
+    }
+
+  cairo_restore (cr);
+}
+
+void
+gimp_cairo_wilber_get_size (cairo_t *cr,
+                            gdouble *width,
+                            gdouble *height)
+{
+  wilber_get_extents (cr);
+
+  *width  = wilber_x2 - wilber_x1;
+  *height = wilber_y2 - wilber_y1;
+}
+
+
+static void
+wilber_get_extents (cairo_t *unused)
+{
+  if (! wilber_cairo_path)
+    {
+      cairo_surface_t *s  = cairo_image_surface_create (CAIRO_FORMAT_A8, 1, 1);
+      cairo_t         *cr = cairo_create (s);
+
+      parse_path_data (cr, wilber_path);
+      cairo_fill_extents (cr, &wilber_x1, &wilber_y1, &wilber_x2, &wilber_y2);
+
+      wilber_cairo_path = cairo_copy_path (cr);
+
+      cairo_destroy (cr);
+      cairo_surface_destroy (s);
+    }
+}
+
+static void
+eyes_get_extents (cairo_t *unused)
+{
+  if (! eyes_cairo_path)
+    {
+      cairo_surface_t *s  = cairo_image_surface_create (CAIRO_FORMAT_A8, 1, 1);
+      cairo_t         *cr = cairo_create (s);
+
+      parse_path_data (cr, eyes_path);
+      cairo_fill_extents (cr, &eyes_x1, &eyes_y1, &eyes_x2, &eyes_y2);
+
+      eyes_cairo_path = cairo_copy_path (cr);
+
+      cairo_destroy (cr);
+      cairo_surface_destroy (s);
+    }
+}
+
+/**********************************************************/
+/*  Below is the code that parses the actual path data.   */
+/*                                                        */
+/*  This code is taken from librsvg and was originally    */
+/*  written by Raph Levien <raph@artofcode.com> for Gill. */
+/**********************************************************/
+
+typedef struct
+{
+  cairo_t     *cr;
+  gdouble      cpx, cpy;  /* current point                               */
+  gdouble      rpx, rpy;  /* reflection point (for 's' and 't' commands) */
+  gchar        cmd;       /* current command (lowercase)                 */
+  gint         param;     /* number of parameters                        */
+  gboolean     rel;       /* true if relative coords                     */
+  gdouble      params[7]; /* parameters that have been parsed            */
+} ParsePathContext;
+
+
+static void  parse_path_default_xy (ParsePathContext *ctx,
+                                    gint              n_params);
+static void  parse_path_do_cmd     (ParsePathContext *ctx,
+                                    gboolean          final);
+
+
+static void
+parse_path_data (cairo_t     *cr,
+                 const gchar *data)
+{
+  ParsePathContext ctx;
+
+  gboolean  in_num        = FALSE;
+  gboolean  in_frac       = FALSE;
+  gboolean  in_exp        = FALSE;
+  gboolean  exp_wait_sign = FALSE;
+  gdouble   val           = 0.0;
+  gchar     c             = 0;
+  gint      sign          = 0;
+  gint      exp           = 0;
+  gint      exp_sign      = 0;
+  gdouble   frac          = 0.0;
+  gint      i;
+
+  memset (&ctx, 0, sizeof (ParsePathContext));
+
+  ctx.cr = cr;
+
+  for (i = 0; ; i++)
+    {
+      c = data[i];
+      if (c >= '0' && c <= '9')
+        {
+          /* digit */
+          if (in_num)
+            {
+              if (in_exp)
+                {
+                  exp = (exp * 10) + c - '0';
+                  exp_wait_sign = FALSE;
+                }
+              else if (in_frac)
+                val += (frac *= 0.1) * (c - '0');
+              else
+                val = (val * 10) + c - '0';
+            }
+          else
+            {
+              in_num = TRUE;
+              in_frac = FALSE;
+              in_exp = FALSE;
+              exp = 0;
+              exp_sign = 1;
+              exp_wait_sign = FALSE;
+              val = c - '0';
+              sign = 1;
+            }
+        }
+      else if (c == '.')
+        {
+          if (!in_num)
+            {
+              in_num = TRUE;
+              val = 0;
+            }
+          in_frac = TRUE;
+          frac = 1;
+        }
+      else if ((c == 'E' || c == 'e') && in_num)
+        {
+          in_exp = TRUE;
+          exp_wait_sign = TRUE;
+          exp = 0;
+          exp_sign = 1;
+        }
+      else if ((c == '+' || c == '-') && in_exp)
+        {
+          exp_sign = c == '+' ? 1 : -1;
+        }
+      else if (in_num)
+        {
+          /* end of number */
+
+          val *= sign * pow (10, exp_sign * exp);
+          if (ctx.rel)
+            {
+              /* Handle relative coordinates. This switch statement attempts
+                 to determine _what_ the coords are relative to. This is
+                 underspecified in the 12 Apr working draft. */
+              switch (ctx.cmd)
+                {
+                case 'l':
+                case 'm':
+                case 'c':
+                case 's':
+                case 'q':
+                case 't':
+                  /* rule: even-numbered params are x-relative, odd-numbered
+                     are y-relative */
+                  if ((ctx.param & 1) == 0)
+                    val += ctx.cpx;
+                  else if ((ctx.param & 1) == 1)
+                    val += ctx.cpy;
+                  break;
+
+                case 'a':
+                  /* rule: sixth and seventh are x and y, rest are not
+                     relative */
+                  if (ctx.param == 5)
+                    val += ctx.cpx;
+                  else if (ctx.param == 6)
+                    val += ctx.cpy;
+                  break;
+                case 'h':
+                  /* rule: x-relative */
+                  val += ctx.cpx;
+                  break;
+                case 'v':
+                  /* rule: y-relative */
+                  val += ctx.cpy;
+                  break;
+                }
+            }
+
+          ctx.params[ctx.param++] = val;
+          parse_path_do_cmd (&ctx, FALSE);
+          in_num = FALSE;
+        }
+
+      if (c == '\0')
+        break;
+      else if ((c == '+' || c == '-') && !exp_wait_sign)
+        {
+          sign = c == '+' ? 1 : -1;
+          val = 0;
+          in_num = TRUE;
+          in_frac = FALSE;
+          in_exp = FALSE;
+          exp = 0;
+          exp_sign = 1;
+          exp_wait_sign = FALSE;
+        }
+      else if (c == 'z' || c == 'Z')
+        {
+          if (ctx.param)
+            parse_path_do_cmd (&ctx, TRUE);
+
+          cairo_close_path (ctx.cr);
+        }
+      else if (c >= 'A' && c <= 'Z' && c != 'E')
+        {
+          if (ctx.param)
+            parse_path_do_cmd (&ctx, TRUE);
+          ctx.cmd = c + 'a' - 'A';
+          ctx.rel = FALSE;
+        }
+      else if (c >= 'a' && c <= 'z' && c != 'e')
+        {
+          if (ctx.param)
+            parse_path_do_cmd (&ctx, TRUE);
+          ctx.cmd = c;
+          ctx.rel = TRUE;
+        }
+      /* else c _should_ be whitespace or , */
+    }
+}
+
+/* supply defaults for missing parameters, assuming relative coordinates
+   are to be interpreted as x,y */
+static void
+parse_path_default_xy (ParsePathContext *ctx,
+                       gint              n_params)
+{
+  gint i;
+
+  if (ctx->rel)
+    {
+      for (i = ctx->param; i < n_params; i++)
+        {
+          if (i > 2)
+            ctx->params[i] = ctx->params[i - 2];
+          else if (i == 1)
+            ctx->params[i] = ctx->cpy;
+          else if (i == 0)
+            /* we shouldn't get here (ctx->param > 0 as precondition) */
+            ctx->params[i] = ctx->cpx;
+        }
+    }
+  else
+    {
+      for (i = ctx->param; i < n_params; i++)
+        ctx->params[i] = 0.0;
+    }
+}
+
+static void
+parse_path_do_cmd (ParsePathContext *ctx,
+                   gboolean          final)
+{
+  switch (ctx->cmd)
+    {
+    case 'm':
+      /* moveto */
+      if (ctx->param == 2 || final)
+        {
+          parse_path_default_xy (ctx, 2);
+
+          ctx->cpx = ctx->rpx = ctx->params[0];
+          ctx->cpy = ctx->rpy = ctx->params[1];
+
+          cairo_move_to (ctx->cr, ctx->cpx, ctx->cpy);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'l':
+      /* lineto */
+      if (ctx->param == 2 || final)
+        {
+          parse_path_default_xy (ctx, 2);
+
+          ctx->cpx = ctx->rpx = ctx->params[0];
+          ctx->cpy = ctx->rpy = ctx->params[1];
+
+          cairo_line_to (ctx->cr, ctx->cpx, ctx->cpy);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'c':
+      /* curveto */
+      if (ctx->param == 6 || final)
+        {
+          gdouble x, y;
+
+          parse_path_default_xy (ctx, 6);
+
+          x        = ctx->params[0];
+          y        = ctx->params[1];
+          ctx->rpx = ctx->params[2];
+          ctx->rpy = ctx->params[3];
+          ctx->cpx = ctx->params[4];
+          ctx->cpy = ctx->params[5];
+
+          cairo_curve_to (ctx->cr,
+                          x, y, ctx->rpx, ctx->rpy, ctx->cpx, ctx->cpy);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 's':
+      /* smooth curveto */
+      if (ctx->param == 4 || final)
+        {
+          gdouble x, y;
+
+          parse_path_default_xy (ctx, 4);
+
+          x = 2 * ctx->cpx - ctx->rpx;
+          y = 2 * ctx->cpy - ctx->rpy;
+          ctx->rpx = ctx->params[0];
+          ctx->rpy = ctx->params[1];
+          ctx->cpx = ctx->params[2];
+          ctx->cpy = ctx->params[3];
+
+          cairo_curve_to (ctx->cr,
+                          x, y, ctx->rpx, ctx->rpy, ctx->cpx, ctx->cpy);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'h':
+      /* horizontal lineto */
+      if (ctx->param == 1)
+        {
+          ctx->cpx = ctx->rpx = ctx->params[0];
+
+          cairo_line_to (ctx->cr, ctx->cpx, ctx->cpy);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'v':
+      /* vertical lineto */
+      if (ctx->param == 1)
+        {
+          ctx->cpy = ctx->rpy = ctx->params[0];
+
+          cairo_line_to (ctx->cr, ctx->cpx, ctx->cpy);
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'q':
+      /* quadratic bezier curveto */
+      if (ctx->param == 4 || final)
+        {
+          parse_path_default_xy (ctx, 4);
+
+          ctx->rpx = ctx->params[0];
+          ctx->rpy = ctx->params[1];
+          ctx->cpx = ctx->params[2];
+          ctx->cpy = ctx->params[3];
+
+          g_warning ("quadratic bezier curveto not implemented");
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 't':
+      /* truetype quadratic bezier curveto */
+      if (ctx->param == 2 || final)
+        {
+          parse_path_default_xy (ctx, 2);
+
+          ctx->rpx = 2 * ctx->cpx - ctx->rpx;
+          ctx->rpy = 2 * ctx->cpy - ctx->rpy;
+          ctx->cpx = ctx->params[0];
+          ctx->cpy = ctx->params[1];
+
+          g_warning ("truetype quadratic bezier curveto not implemented");
+
+          ctx->param = 0;
+        }
+      else if (final)
+        {
+          if (ctx->param > 2)
+            {
+              parse_path_default_xy (ctx, 4);
+
+              ctx->rpx = ctx->params[0];
+              ctx->rpy = ctx->params[1];
+              ctx->cpx = ctx->params[2];
+              ctx->cpy = ctx->params[3];
+
+              g_warning ("conicto not implemented");
+            }
+          else
+            {
+              parse_path_default_xy (ctx, 2);
+
+              ctx->cpx = ctx->rpx = ctx->params[0];
+              ctx->cpy = ctx->rpy = ctx->params[1];
+
+              cairo_line_to (ctx->cr, ctx->cpx, ctx->cpy);
+            }
+
+          ctx->param = 0;
+        }
+      break;
+
+    case 'a':
+      if (ctx->param == 7 || final)
+        {
+          ctx->cpx = ctx->rpx = ctx->params[5];
+          ctx->cpy = ctx->rpy = ctx->params[6];
+
+          g_warning ("arcto not implemented");
+
+          ctx->param = 0;
+        }
+      break;
+
+    default:
+      ctx->param = 0;
+      break;
+    }
+}
diff --git a/app/widgets/gimpcairo-wilber.h b/app/widgets/gimpcairo-wilber.h
new file mode 100644
index 0000000..52873ad
--- /dev/null
+++ b/app/widgets/gimpcairo-wilber.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Wilber Cairo rendering
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * Some code here is based on code from librsvg that was originally
+ * written by Raph Levien <raph@artofcode.com> for Gill.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CAIRO_WILBER_H__
+#define __GIMP_CAIRO_WILBER_H__
+
+
+void   gimp_cairo_wilber_toggle_pointer_eyes (void);
+
+
+void   gimp_cairo_draw_toolbox_wilber        (GtkWidget *widget,
+                                              cairo_t   *cr);
+void   gimp_cairo_draw_drop_wilber           (GtkWidget *widget,
+                                              cairo_t   *cr,
+                                              gboolean   blink);
+
+void   gimp_cairo_wilber                     (cairo_t   *cr,
+                                              gdouble    x,
+                                              gdouble    y);
+void   gimp_cairo_wilber_get_size            (cairo_t   *cr,
+                                              gdouble   *width,
+                                              gdouble   *height);
+
+
+#endif /* __GIMP_CAIRO_WILBER_H__ */
diff --git a/app/widgets/gimpcellrendererbutton.c b/app/widgets/gimpcellrendererbutton.c
new file mode 100644
index 0000000..e051121
--- /dev/null
+++ b/app/widgets/gimpcellrendererbutton.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcellrendererbutton.c
+ * Copyright (C) 2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpcellrendererbutton.h"
+
+
+enum
+{
+  CLICKED,
+  LAST_SIGNAL
+};
+
+
+static gboolean gimp_cell_renderer_button_activate (GtkCellRenderer     *cell,
+                                                    GdkEvent            *event,
+                                                    GtkWidget           *widget,
+                                                    const gchar         *path,
+                                                    GdkRectangle        *background_area,
+                                                    GdkRectangle        *cell_area,
+                                                    GtkCellRendererState flags);
+
+
+G_DEFINE_TYPE (GimpCellRendererButton, gimp_cell_renderer_button,
+               GTK_TYPE_CELL_RENDERER_PIXBUF)
+
+#define parent_class gimp_cell_renderer_button_parent_class
+
+static guint button_cell_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_cell_renderer_button_class_init (GimpCellRendererButtonClass *klass)
+{
+  GObjectClass         *object_class = G_OBJECT_CLASS (klass);
+  GtkCellRendererClass *cell_class   = GTK_CELL_RENDERER_CLASS (klass);
+
+  /**
+   * GimpCellRendererButton::clicked:
+   * @cell:
+   * @path:
+   * @state:
+   *
+   * Called on a button cell when it is clicked.
+   **/
+  button_cell_signals[CLICKED] =
+    g_signal_new ("clicked",
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpCellRendererButtonClass, clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__STRING_FLAGS,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_STRING,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  cell_class->activate = gimp_cell_renderer_button_activate;
+
+  klass->clicked       = NULL;
+}
+
+static void
+gimp_cell_renderer_button_init (GimpCellRendererButton *cell_button)
+{
+  g_object_set (cell_button,
+                "mode",       GTK_CELL_RENDERER_MODE_ACTIVATABLE,
+                "xpad",       2,
+                "ypad",       2,
+                "stock-size", GTK_ICON_SIZE_BUTTON,
+                NULL);
+}
+
+static gboolean
+gimp_cell_renderer_button_activate (GtkCellRenderer      *cell,
+                                    GdkEvent             *event,
+                                    GtkWidget            *widget,
+                                    const gchar          *path,
+                                    GdkRectangle         *background_area,
+                                    GdkRectangle         *cell_area,
+                                    GtkCellRendererState  flags)
+{
+  GimpCellRendererButton *cell_button = GIMP_CELL_RENDERER_BUTTON (cell);
+  GdkModifierType         state       = 0;
+
+  if (event && ((GdkEventAny *) event)->type == GDK_BUTTON_PRESS)
+    state = ((GdkEventButton *) event)->state;
+
+  if (! event ||
+      (((GdkEventAny *) event)->type == GDK_BUTTON_PRESS &&
+       ((GdkEventButton *) event)->button == 1))
+    {
+      gimp_cell_renderer_button_clicked (cell_button, path, state);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*  public functions  */
+
+GtkCellRenderer *
+gimp_cell_renderer_button_new (void)
+{
+  return g_object_new (GIMP_TYPE_CELL_RENDERER_BUTTON, NULL);
+}
+
+void
+gimp_cell_renderer_button_clicked (GimpCellRendererButton *cell,
+                                   const gchar            *path,
+                                   GdkModifierType         state)
+{
+  g_return_if_fail (GIMP_IS_CELL_RENDERER_BUTTON (cell));
+  g_return_if_fail (path != NULL);
+
+  g_signal_emit (cell, button_cell_signals[CLICKED], 0, path, state);
+}
diff --git a/app/widgets/gimpcellrendererbutton.h b/app/widgets/gimpcellrendererbutton.h
new file mode 100644
index 0000000..93e9580
--- /dev/null
+++ b/app/widgets/gimpcellrendererbutton.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcellrendererbutton.h
+ * Copyright (C) 2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CELL_RENDERER_BUTTON_H__
+#define __GIMP_CELL_RENDERER_BUTTON_H__
+
+
+#define GIMP_TYPE_CELL_RENDERER_BUTTON            (gimp_cell_renderer_button_get_type ())
+#define GIMP_CELL_RENDERER_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_BUTTON, GimpCellRendererButton))
+#define GIMP_CELL_RENDERER_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_BUTTON, GimpCellRendererButtonClass))
+#define GIMP_IS_CELL_RENDERER_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CELL_RENDERER_BUTTON))
+#define GIMP_IS_CELL_RENDERER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CELL_RENDERER_BUTTON))
+#define GIMP_CELL_RENDERER_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CELL_RENDERER_BUTTON, GimpCellRendererButtonClass))
+
+
+typedef struct _GimpCellRendererButtonClass GimpCellRendererButtonClass;
+
+struct _GimpCellRendererButton
+{
+  GtkCellRendererPixbuf  parent_instance;
+};
+
+struct _GimpCellRendererButtonClass
+{
+  GtkCellRendererPixbufClass  parent_class;
+
+  void (* clicked) (GimpCellRendererButton *cell,
+                    const gchar            *path,
+                    GdkModifierType         state);
+};
+
+
+GType             gimp_cell_renderer_button_get_type (void) G_GNUC_CONST;
+
+GtkCellRenderer * gimp_cell_renderer_button_new      (void);
+
+void              gimp_cell_renderer_button_clicked  (GimpCellRendererButton *cell,
+                                                      const gchar            *path,
+                                                      GdkModifierType         state);
+
+
+#endif /* __GIMP_CELL_RENDERER_BUTTON_H__ */
diff --git a/app/widgets/gimpcellrendererdashes.c b/app/widgets/gimpcellrendererdashes.c
new file mode 100644
index 0000000..cf6b71a
--- /dev/null
+++ b/app/widgets/gimpcellrendererdashes.c
@@ -0,0 +1,262 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcellrendererdashes.c
+ * Copyright (C) 2005 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpdashpattern.h"
+
+#include "gimpcellrendererdashes.h"
+
+
+#define DASHES_WIDTH   96
+#define DASHES_HEIGHT   4
+
+#define N_SEGMENTS     24
+#define BLOCK_WIDTH    (DASHES_WIDTH / (2 * N_SEGMENTS))
+
+
+enum
+{
+  PROP_0,
+  PROP_PATTERN
+};
+
+
+static void gimp_cell_renderer_dashes_finalize     (GObject         *object);
+static void gimp_cell_renderer_dashes_get_property (GObject         *object,
+                                                    guint            param_id,
+                                                    GValue          *value,
+                                                    GParamSpec      *pspec);
+static void gimp_cell_renderer_dashes_set_property (GObject         *object,
+                                                    guint            param_id,
+                                                    const GValue    *value,
+                                                    GParamSpec      *pspec);
+static void gimp_cell_renderer_dashes_get_size     (GtkCellRenderer *cell,
+                                                    GtkWidget       *widget,
+                                                    GdkRectangle    *rectangle,
+                                                    gint            *x_offset,
+                                                    gint            *y_offset,
+                                                    gint            *width,
+                                                    gint            *height);
+static void gimp_cell_renderer_dashes_render       (GtkCellRenderer *cell,
+                                                    GdkWindow       *window,
+                                                    GtkWidget       *widget,
+                                                    GdkRectangle    *background_area,
+                                                    GdkRectangle    *cell_area,
+                                                    GdkRectangle    *expose_area,
+                                                    GtkCellRendererState flags);
+
+
+G_DEFINE_TYPE (GimpCellRendererDashes, gimp_cell_renderer_dashes,
+               GTK_TYPE_CELL_RENDERER)
+
+#define parent_class gimp_cell_renderer_dashes_parent_class
+
+
+static void
+gimp_cell_renderer_dashes_class_init (GimpCellRendererDashesClass *klass)
+{
+  GObjectClass         *object_class = G_OBJECT_CLASS (klass);
+  GtkCellRendererClass *cell_class   = GTK_CELL_RENDERER_CLASS (klass);
+
+  object_class->finalize     = gimp_cell_renderer_dashes_finalize;
+  object_class->get_property = gimp_cell_renderer_dashes_get_property;
+  object_class->set_property = gimp_cell_renderer_dashes_set_property;
+
+  cell_class->get_size       = gimp_cell_renderer_dashes_get_size;
+  cell_class->render         = gimp_cell_renderer_dashes_render;
+
+  g_object_class_install_property (object_class, PROP_PATTERN,
+                                   g_param_spec_boxed ("pattern", NULL, NULL,
+                                                       GIMP_TYPE_DASH_PATTERN,
+                                                       GIMP_PARAM_WRITABLE));
+}
+
+static void
+gimp_cell_renderer_dashes_init (GimpCellRendererDashes *dashes)
+{
+  dashes->segments = g_new0 (gboolean, N_SEGMENTS);
+}
+
+static void
+gimp_cell_renderer_dashes_finalize (GObject *object)
+{
+  GimpCellRendererDashes *dashes = GIMP_CELL_RENDERER_DASHES (object);
+
+  g_free (dashes->segments);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_cell_renderer_dashes_get_property (GObject    *object,
+                                        guint       param_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+}
+
+static void
+gimp_cell_renderer_dashes_set_property (GObject      *object,
+                                        guint         param_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpCellRendererDashes *dashes = GIMP_CELL_RENDERER_DASHES (object);
+
+  switch (param_id)
+    {
+    case PROP_PATTERN:
+      gimp_dash_pattern_fill_segments (g_value_get_boxed (value),
+                                       dashes->segments, N_SEGMENTS);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_cell_renderer_dashes_get_size (GtkCellRenderer *cell,
+                                    GtkWidget       *widget,
+                                    GdkRectangle    *cell_area,
+                                    gint            *x_offset,
+                                    gint            *y_offset,
+                                    gint            *width,
+                                    gint            *height)
+{
+  gfloat xalign, yalign;
+  gint   xpad, ypad;
+
+  gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+
+  if (cell_area)
+    {
+      if (x_offset)
+        {
+          gdouble align;
+
+          align = ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
+                   1.0 - xalign : xalign);
+
+          *x_offset = align * (cell_area->width - DASHES_WIDTH);
+          *x_offset = MAX (*x_offset, 0) + xpad;
+        }
+
+      if (y_offset)
+        {
+          *y_offset = yalign * (cell_area->height - DASHES_HEIGHT);
+          *y_offset = MAX (*y_offset, 0) + ypad;
+        }
+    }
+  else
+    {
+      if (x_offset)
+        *x_offset = 0;
+
+      if (y_offset)
+        *y_offset = 0;
+    }
+
+  *width  = DASHES_WIDTH  + 2 * xpad;
+  *height = DASHES_HEIGHT + 2 * ypad;
+}
+
+static void
+gimp_cell_renderer_dashes_render (GtkCellRenderer      *cell,
+                                  GdkWindow            *window,
+                                  GtkWidget            *widget,
+                                  GdkRectangle         *background_area,
+                                  GdkRectangle         *cell_area,
+                                  GdkRectangle         *expose_area,
+                                  GtkCellRendererState  flags)
+{
+  GimpCellRendererDashes *dashes = GIMP_CELL_RENDERER_DASHES (cell);
+  GtkStyle               *style  = gtk_widget_get_style (widget);
+  GtkStateType            state;
+  gint                    xpad, ypad;
+  cairo_t                *cr;
+  gint                    width;
+  gint                    x, y;
+
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+
+  if (! gtk_cell_renderer_get_sensitive (cell))
+    {
+      state = GTK_STATE_INSENSITIVE;
+    }
+  else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+    {
+      if (gtk_widget_has_focus (widget))
+        state = GTK_STATE_SELECTED;
+      else
+        state = GTK_STATE_ACTIVE;
+    }
+  else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
+           gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT)
+    {
+      state = GTK_STATE_PRELIGHT;
+    }
+  else
+    {
+      if (gtk_widget_is_sensitive (widget))
+        state = GTK_STATE_NORMAL;
+      else
+        state = GTK_STATE_INSENSITIVE;
+    }
+
+  y = cell_area->y + (cell_area->height - DASHES_HEIGHT) / 2;
+  width = cell_area->width - 2 * xpad;
+
+  cr = gdk_cairo_create (window);
+
+  gdk_cairo_rectangle (cr, expose_area);
+  cairo_clip (cr);
+
+  for (x = 0; x < width + BLOCK_WIDTH; x += BLOCK_WIDTH)
+    {
+      guint index = ((guint) x / BLOCK_WIDTH) % N_SEGMENTS;
+
+      if (dashes->segments[index])
+        {
+          cairo_rectangle (cr,
+                           cell_area->x + xpad + x, y,
+                           MIN (BLOCK_WIDTH, width - x), DASHES_HEIGHT);
+        }
+    }
+
+  gdk_cairo_set_source_color (cr, &style->text[state]);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);
+}
+
+GtkCellRenderer *
+gimp_cell_renderer_dashes_new (void)
+{
+  return g_object_new (GIMP_TYPE_CELL_RENDERER_DASHES, NULL);
+}
diff --git a/app/widgets/gimpcellrendererdashes.h b/app/widgets/gimpcellrendererdashes.h
new file mode 100644
index 0000000..5b2ed8d
--- /dev/null
+++ b/app/widgets/gimpcellrendererdashes.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcellrendererdashes.h
+ * Copyright (C) 2005 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CELL_RENDERER_DASHES_H__
+#define __GIMP_CELL_RENDERER_DASHES_H__
+
+
+#define GIMP_TYPE_CELL_RENDERER_DASHES            (gimp_cell_renderer_dashes_get_type ())
+#define GIMP_CELL_RENDERER_DASHES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashes))
+#define GIMP_CELL_RENDERER_DASHES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashesClass))
+#define GIMP_IS_CELL_RENDERER_DASHES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CELL_RENDERER_DASHES))
+#define GIMP_IS_CELL_RENDERER_DASHES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CELL_RENDERER_DASHES))
+#define GIMP_CELL_RENDERER_DASHES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashesClass))
+
+
+typedef struct _GimpCellRendererDashesClass GimpCellRendererDashesClass;
+
+struct _GimpCellRendererDashes
+{
+  GtkCellRenderer   parent_instance;
+
+  gboolean         *segments;
+};
+
+struct _GimpCellRendererDashesClass
+{
+  GtkCellRendererClass  parent_class;
+};
+
+
+GType             gimp_cell_renderer_dashes_get_type (void) G_GNUC_CONST;
+
+GtkCellRenderer * gimp_cell_renderer_dashes_new      (void);
+
+
+#endif /* __GIMP_CELL_RENDERER_DASHES_H__ */
diff --git a/app/widgets/gimpcellrendererviewable.c b/app/widgets/gimpcellrendererviewable.c
new file mode 100644
index 0000000..2155567
--- /dev/null
+++ b/app/widgets/gimpcellrendererviewable.c
@@ -0,0 +1,416 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcellrendererviewable.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcellrendererviewable.h"
+#include "gimpview-popup.h"
+#include "gimpviewrenderer.h"
+
+
+enum
+{
+  PRE_CLICKED,
+  CLICKED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_RENDERER
+};
+
+
+static void gimp_cell_renderer_viewable_finalize     (GObject         *object);
+static void gimp_cell_renderer_viewable_get_property (GObject         *object,
+                                                      guint            param_id,
+                                                      GValue          *value,
+                                                      GParamSpec      *pspec);
+static void gimp_cell_renderer_viewable_set_property (GObject         *object,
+                                                      guint            param_id,
+                                                      const GValue    *value,
+                                                      GParamSpec      *pspec);
+static void gimp_cell_renderer_viewable_get_size     (GtkCellRenderer *cell,
+                                                      GtkWidget       *widget,
+                                                      GdkRectangle    *rectangle,
+                                                      gint            *x_offset,
+                                                      gint            *y_offset,
+                                                      gint            *width,
+                                                      gint            *height);
+static void gimp_cell_renderer_viewable_render       (GtkCellRenderer *cell,
+                                                      GdkWindow       *window,
+                                                      GtkWidget       *widget,
+                                                      GdkRectangle    *background_area,
+                                                      GdkRectangle    *cell_area,
+                                                      GdkRectangle    *expose_area,
+                                                      GtkCellRendererState flags);
+static gboolean gimp_cell_renderer_viewable_activate (GtkCellRenderer *cell,
+                                                      GdkEvent        *event,
+                                                      GtkWidget       *widget,
+                                                      const gchar     *path,
+                                                      GdkRectangle    *background_area,
+                                                      GdkRectangle    *cell_area,
+                                                      GtkCellRendererState flags);
+
+
+G_DEFINE_TYPE (GimpCellRendererViewable, gimp_cell_renderer_viewable,
+               GTK_TYPE_CELL_RENDERER)
+
+#define parent_class gimp_cell_renderer_viewable_parent_class
+
+static guint viewable_cell_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_cell_renderer_viewable_class_init (GimpCellRendererViewableClass *klass)
+{
+  GObjectClass         *object_class = G_OBJECT_CLASS (klass);
+  GtkCellRendererClass *cell_class   = GTK_CELL_RENDERER_CLASS (klass);
+
+  /**
+   * GimpCellRendererViewable::pre-clicked:
+   * @cell:
+   * @path:
+   * @state:
+   *
+   * Called early on a viewable cell when it is clicked, typically
+   * before selection code is invoked for example.
+   *
+   * Returns: %TRUE if the signal handled the event and event
+   *          propagation should stop, for example preventing a
+   *          selection from happening, %FALSE to continue as normal
+   **/
+  viewable_cell_signals[PRE_CLICKED] =
+    g_signal_new ("pre-clicked",
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpCellRendererViewableClass, pre_clicked),
+                  g_signal_accumulator_true_handled, NULL,
+                  gimp_marshal_BOOLEAN__STRING_FLAGS,
+                  G_TYPE_BOOLEAN, 2,
+                  G_TYPE_STRING,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  /**
+   * GimpCellRendererViewable::clicked:
+   * @cell:
+   * @path:
+   * @state:
+   *
+   * Called late on a viewable cell when it is clicked, typically
+   * after selection code has been invoked for example.
+   **/
+  viewable_cell_signals[CLICKED] =
+    g_signal_new ("clicked",
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpCellRendererViewableClass, clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__STRING_FLAGS,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_STRING,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  object_class->finalize     = gimp_cell_renderer_viewable_finalize;
+  object_class->get_property = gimp_cell_renderer_viewable_get_property;
+  object_class->set_property = gimp_cell_renderer_viewable_set_property;
+
+  cell_class->get_size       = gimp_cell_renderer_viewable_get_size;
+  cell_class->render         = gimp_cell_renderer_viewable_render;
+  cell_class->activate       = gimp_cell_renderer_viewable_activate;
+
+  klass->clicked             = NULL;
+
+  g_object_class_install_property (object_class, PROP_RENDERER,
+                                   g_param_spec_object ("renderer",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_VIEW_RENDERER,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_cell_renderer_viewable_init (GimpCellRendererViewable *cellviewable)
+{
+  g_object_set (cellviewable,
+                "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
+                NULL);
+}
+
+static void
+gimp_cell_renderer_viewable_finalize (GObject *object)
+{
+  GimpCellRendererViewable *cell = GIMP_CELL_RENDERER_VIEWABLE (object);
+
+  g_clear_object (&cell->renderer);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_cell_renderer_viewable_get_property (GObject    *object,
+                                          guint       param_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpCellRendererViewable *cell = GIMP_CELL_RENDERER_VIEWABLE (object);
+
+  switch (param_id)
+    {
+    case PROP_RENDERER:
+      g_value_set_object (value, cell->renderer);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_cell_renderer_viewable_set_property (GObject      *object,
+                                          guint         param_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpCellRendererViewable *cell = GIMP_CELL_RENDERER_VIEWABLE (object);
+
+  switch (param_id)
+    {
+    case PROP_RENDERER:
+      {
+        GimpViewRenderer *renderer = g_value_dup_object (value);
+
+        if (cell->renderer)
+          g_object_unref (cell->renderer);
+
+        cell->renderer = renderer;
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_cell_renderer_viewable_get_size (GtkCellRenderer *cell,
+                                      GtkWidget       *widget,
+                                      GdkRectangle    *cell_area,
+                                      gint            *x_offset,
+                                      gint            *y_offset,
+                                      gint            *width,
+                                      gint            *height)
+{
+  GimpCellRendererViewable *cellviewable;
+  gfloat                    xalign, yalign;
+  gint                      xpad, ypad;
+  gint                      view_width  = 0;
+  gint                      view_height = 0;
+  gint                      calc_width;
+  gint                      calc_height;
+
+  gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+
+  cellviewable = GIMP_CELL_RENDERER_VIEWABLE (cell);
+
+  if (cellviewable->renderer)
+    {
+      view_width  = (cellviewable->renderer->width  +
+                     2 * cellviewable->renderer->border_width);
+      view_height = (cellviewable->renderer->height +
+                     2 * cellviewable->renderer->border_width);
+    }
+
+  calc_width  = (gint) xpad * 2 + view_width;
+  calc_height = (gint) ypad * 2 + view_height;
+
+  if (x_offset) *x_offset = 0;
+  if (y_offset) *y_offset = 0;
+
+  if (cell_area && view_width > 0 && view_height > 0)
+    {
+      if (x_offset)
+        {
+          *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
+                        1.0 - xalign : xalign) *
+                       (cell_area->width - calc_width - 2 * xpad));
+          *x_offset = (MAX (*x_offset, 0) + xpad);
+        }
+      if (y_offset)
+        {
+          *y_offset = (yalign * (cell_area->height - calc_height - 2 * ypad));
+          *y_offset = (MAX (*y_offset, 0) + ypad);
+        }
+    }
+
+  if (width)  *width  = calc_width;
+  if (height) *height = calc_height;
+}
+
+static void
+gimp_cell_renderer_viewable_render (GtkCellRenderer      *cell,
+                                    GdkWindow            *window,
+                                    GtkWidget            *widget,
+                                    GdkRectangle         *background_area,
+                                    GdkRectangle         *cell_area,
+                                    GdkRectangle         *expose_area,
+                                    GtkCellRendererState  flags)
+{
+  GimpCellRendererViewable *cellviewable;
+
+  cellviewable = GIMP_CELL_RENDERER_VIEWABLE (cell);
+
+  if (cellviewable->renderer)
+    {
+      cairo_t *cr;
+
+      if (! (flags & GTK_CELL_RENDERER_SELECTED))
+        {
+          /* this is an ugly hack. The cell state should be passed to
+           * the view renderer, so that it can adjust its border.
+           * (or something like this) */
+          if (cellviewable->renderer->border_type == GIMP_VIEW_BORDER_WHITE)
+            gimp_view_renderer_set_border_type (cellviewable->renderer,
+                                                GIMP_VIEW_BORDER_BLACK);
+
+          gimp_view_renderer_remove_idle (cellviewable->renderer);
+        }
+
+      cr = gdk_cairo_create (window);
+      gdk_cairo_rectangle (cr, expose_area);
+      cairo_clip (cr);
+
+      cairo_translate (cr, cell_area->x, cell_area->y);
+
+      gimp_view_renderer_draw (cellviewable->renderer, widget, cr,
+                               cell_area->width,
+                               cell_area->height);
+
+      cairo_destroy (cr);
+    }
+}
+
+static gboolean
+gimp_cell_renderer_viewable_activate (GtkCellRenderer      *cell,
+                                      GdkEvent             *event,
+                                      GtkWidget            *widget,
+                                      const gchar          *path,
+                                      GdkRectangle         *background_area,
+                                      GdkRectangle         *cell_area,
+                                      GtkCellRendererState  flags)
+{
+  GimpCellRendererViewable *cellviewable;
+
+  cellviewable = GIMP_CELL_RENDERER_VIEWABLE (cell);
+
+  if (cellviewable->renderer)
+    {
+      GdkModifierType state = 0;
+
+      if (event && ((GdkEventAny *) event)->type == GDK_BUTTON_PRESS)
+        state = ((GdkEventButton *) event)->state;
+
+      if (! event ||
+          (((GdkEventAny *) event)->type == GDK_BUTTON_PRESS &&
+           ((GdkEventButton *) event)->button == 1))
+        {
+          gimp_cell_renderer_viewable_clicked (cellviewable, path, state);
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+GtkCellRenderer *
+gimp_cell_renderer_viewable_new (void)
+{
+  return g_object_new (GIMP_TYPE_CELL_RENDERER_VIEWABLE, NULL);
+}
+
+gboolean
+gimp_cell_renderer_viewable_pre_clicked (GimpCellRendererViewable *cell,
+                                         const gchar              *path,
+                                         GdkModifierType           state)
+{
+  gboolean handled = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_CELL_RENDERER_VIEWABLE (cell), FALSE);
+  g_return_val_if_fail (path != NULL, FALSE);
+
+  g_signal_emit (cell,
+                 viewable_cell_signals[PRE_CLICKED],
+                 0 /*detail*/,
+                 path, state,
+                 &handled);
+
+  return handled;
+}
+
+void
+gimp_cell_renderer_viewable_clicked (GimpCellRendererViewable *cell,
+                                     const gchar              *path,
+                                     GdkModifierType           state)
+{
+
+  g_return_if_fail (GIMP_IS_CELL_RENDERER_VIEWABLE (cell));
+  g_return_if_fail (path != NULL);
+
+  if (cell->renderer)
+    {
+      GdkEvent *event = gtk_get_current_event ();
+
+      if (event)
+        {
+          GdkEventButton *bevent = (GdkEventButton *) event;
+
+          if (bevent->type == GDK_BUTTON_PRESS &&
+              (bevent->button == 1 || bevent->button == 2))
+            {
+              gimp_view_popup_show (gtk_get_event_widget (event),
+                                    bevent,
+                                    cell->renderer->context,
+                                    cell->renderer->viewable,
+                                    cell->renderer->width,
+                                    cell->renderer->height,
+                                    cell->renderer->dot_for_dot);
+            }
+
+          gdk_event_free (event);
+        }
+    }
+
+  /*  emit the signal last so no callback effects can set
+   *  cell->renderer to NULL.
+   */
+  g_signal_emit (cell, viewable_cell_signals[CLICKED], 0, path, state);
+}
diff --git a/app/widgets/gimpcellrendererviewable.h b/app/widgets/gimpcellrendererviewable.h
new file mode 100644
index 0000000..150596e
--- /dev/null
+++ b/app/widgets/gimpcellrendererviewable.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcellrendererviewable.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CELL_RENDERER_VIEWABLE_H__
+#define __GIMP_CELL_RENDERER_VIEWABLE_H__
+
+
+#define GIMP_TYPE_CELL_RENDERER_VIEWABLE            (gimp_cell_renderer_viewable_get_type ())
+#define GIMP_CELL_RENDERER_VIEWABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewable))
+#define GIMP_CELL_RENDERER_VIEWABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewableClass))
+#define GIMP_IS_CELL_RENDERER_VIEWABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CELL_RENDERER_VIEWABLE))
+#define GIMP_IS_CELL_RENDERER_VIEWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CELL_RENDERER_VIEWABLE))
+#define GIMP_CELL_RENDERER_VIEWABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewableClass))
+
+
+typedef struct _GimpCellRendererViewableClass GimpCellRendererViewableClass;
+
+struct _GimpCellRendererViewable
+{
+  GtkCellRenderer   parent_instance;
+
+  GimpViewRenderer *renderer;
+};
+
+struct _GimpCellRendererViewableClass
+{
+  GtkCellRendererClass  parent_class;
+
+  gboolean (* pre_clicked) (GimpCellRendererViewable *cell,
+                            const gchar              *path,
+                            GdkModifierType           state);
+  void     (* clicked)     (GimpCellRendererViewable *cell,
+                            const gchar              *path,
+                            GdkModifierType           state);
+};
+
+
+GType             gimp_cell_renderer_viewable_get_type    (void) G_GNUC_CONST;
+GtkCellRenderer * gimp_cell_renderer_viewable_new         (void);
+gboolean          gimp_cell_renderer_viewable_pre_clicked (GimpCellRendererViewable *cell,
+                                                           const gchar              *path,
+                                                           GdkModifierType           state);
+void              gimp_cell_renderer_viewable_clicked     (GimpCellRendererViewable *cell,
+                                                           const gchar              *path,
+                                                           GdkModifierType           state);
+
+
+#endif /* __GIMP_CELL_RENDERER_VIEWABLE_H__ */
diff --git a/app/widgets/gimpchanneltreeview.c b/app/widgets/gimpchanneltreeview.c
new file mode 100644
index 0000000..5b77aa4
--- /dev/null
+++ b/app/widgets/gimpchanneltreeview.c
@@ -0,0 +1,368 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpchanneltreeview.c
+ * Copyright (C) 2001-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+
+#include "gimpactiongroup.h"
+#include "gimpchanneltreeview.h"
+#include "gimpcomponenteditor.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimphelp-ids.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpChannelTreeViewPrivate
+{
+  GtkWidget *component_editor;
+
+  GtkWidget *toselection_button;
+};
+
+
+static void  gimp_channel_tree_view_view_iface_init   (GimpContainerViewInterface *iface);
+
+static void   gimp_channel_tree_view_constructed      (GObject                 *object);
+
+static void   gimp_channel_tree_view_drop_viewable    (GimpContainerTreeView   *view,
+                                                       GimpViewable            *src_viewable,
+                                                       GimpViewable            *dest_viewable,
+                                                       GtkTreeViewDropPosition  drop_pos);
+static void   gimp_channel_tree_view_drop_component   (GimpContainerTreeView   *tree_view,
+                                                       GimpImage               *image,
+                                                       GimpChannelType          component,
+                                                       GimpViewable            *dest_viewable,
+                                                       GtkTreeViewDropPosition  drop_pos);
+static void   gimp_channel_tree_view_set_image        (GimpItemTreeView        *item_view,
+                                                       GimpImage               *image);
+static GimpItem * gimp_channel_tree_view_item_new     (GimpImage               *image);
+
+static void   gimp_channel_tree_view_set_context      (GimpContainerView       *view,
+                                                       GimpContext             *context);
+static void   gimp_channel_tree_view_set_view_size    (GimpContainerView       *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpChannelTreeView, gimp_channel_tree_view,
+                         GIMP_TYPE_DRAWABLE_TREE_VIEW,
+                         G_ADD_PRIVATE (GimpChannelTreeView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_channel_tree_view_view_iface_init))
+
+#define parent_class gimp_channel_tree_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_channel_tree_view_class_init (GimpChannelTreeViewClass *klass)
+{
+  GObjectClass               *object_class = G_OBJECT_CLASS (klass);
+  GimpContainerTreeViewClass *view_class   = GIMP_CONTAINER_TREE_VIEW_CLASS (klass);
+  GimpItemTreeViewClass      *iv_class     = GIMP_ITEM_TREE_VIEW_CLASS (klass);
+
+  object_class->constructed  = gimp_channel_tree_view_constructed;
+
+  view_class->drop_viewable  = gimp_channel_tree_view_drop_viewable;
+  view_class->drop_component = gimp_channel_tree_view_drop_component;
+
+  iv_class->set_image        = gimp_channel_tree_view_set_image;
+
+  iv_class->item_type        = GIMP_TYPE_CHANNEL;
+  iv_class->signal_name      = "active-channel-changed";
+
+  iv_class->get_container    = gimp_image_get_channels;
+  iv_class->get_active_item  = (GimpGetItemFunc) gimp_image_get_active_channel;
+  iv_class->set_active_item  = (GimpSetItemFunc) gimp_image_set_active_channel;
+  iv_class->add_item         = (GimpAddItemFunc) gimp_image_add_channel;
+  iv_class->remove_item      = (GimpRemoveItemFunc) gimp_image_remove_channel;
+  iv_class->new_item         = gimp_channel_tree_view_item_new;
+
+  iv_class->action_group          = "channels";
+  iv_class->activate_action       = "channels-edit-attributes";
+  iv_class->new_action            = "channels-new";
+  iv_class->new_default_action    = "channels-new-last-values";
+  iv_class->raise_action          = "channels-raise";
+  iv_class->raise_top_action      = "channels-raise-to-top";
+  iv_class->lower_action          = "channels-lower";
+  iv_class->lower_bottom_action   = "channels-lower-to-bottom";
+  iv_class->duplicate_action      = "channels-duplicate";
+  iv_class->delete_action         = "channels-delete";
+  iv_class->lock_content_help_id  = GIMP_HELP_CHANNEL_LOCK_PIXELS;
+  iv_class->lock_position_help_id = GIMP_HELP_CHANNEL_LOCK_POSITION;
+}
+
+static void
+gimp_channel_tree_view_view_iface_init (GimpContainerViewInterface *view_iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (view_iface);
+
+  view_iface->set_context   = gimp_channel_tree_view_set_context;
+  view_iface->set_view_size = gimp_channel_tree_view_set_view_size;
+}
+
+static void
+gimp_channel_tree_view_init (GimpChannelTreeView *view)
+{
+  view->priv = gimp_channel_tree_view_get_instance_private (view);
+
+  view->priv->component_editor   = NULL;
+  view->priv->toselection_button = NULL;
+}
+
+static void
+gimp_channel_tree_view_constructed (GObject *object)
+{
+  GimpChannelTreeView   *view      = GIMP_CHANNEL_TREE_VIEW (object);
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (object);
+  GdkModifierType        extend_mask;
+  GdkModifierType        modify_mask;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  extend_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (object),
+                                              GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+  modify_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (object),
+                                              GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER,
+                               NULL, tree_view);
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER_MASK,
+                               NULL, tree_view);
+  gimp_dnd_component_dest_add (GTK_WIDGET (tree_view->view),
+                               NULL, tree_view);
+
+  view->priv->toselection_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (view), "channels",
+                                   "channels-selection-replace",
+                                   "channels-selection-add",
+                                   extend_mask,
+                                   "channels-selection-subtract",
+                                   modify_mask,
+                                   "channels-selection-intersect",
+                                   extend_mask | modify_mask,
+                                   NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (view),
+                                  GTK_BUTTON (view->priv->toselection_button),
+                                  GIMP_TYPE_CHANNEL);
+  gtk_box_reorder_child (gimp_editor_get_button_box (GIMP_EDITOR (view)),
+                         view->priv->toselection_button, 4);
+}
+
+
+/*  GimpContainerTreeView methods  */
+
+static void
+gimp_channel_tree_view_drop_viewable (GimpContainerTreeView   *tree_view,
+                                      GimpViewable            *src_viewable,
+                                      GimpViewable            *dest_viewable,
+                                      GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeView      *item_view = GIMP_ITEM_TREE_VIEW (tree_view);
+  GimpImage             *image     = gimp_item_tree_view_get_image (item_view);
+  GimpItemTreeViewClass *item_view_class;
+
+  item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
+
+  if (GIMP_IS_DRAWABLE (src_viewable) &&
+      (image != gimp_item_get_image (GIMP_ITEM (src_viewable)) ||
+       G_TYPE_FROM_INSTANCE (src_viewable) != item_view_class->item_type))
+    {
+      GimpItem *new_item;
+      GimpItem *parent;
+      gint      index;
+
+      index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                                  drop_pos,
+                                                  (GimpViewable **) &parent);
+
+      new_item = gimp_item_convert (GIMP_ITEM (src_viewable),
+                                    gimp_item_tree_view_get_image (item_view),
+                                    item_view_class->item_type);
+
+      gimp_item_set_linked (new_item, FALSE, FALSE);
+
+      item_view_class->add_item (image, new_item, parent, index, TRUE);
+
+      gimp_image_flush (image);
+
+      return;
+    }
+
+  GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_viewable (tree_view,
+                                                                src_viewable,
+                                                                dest_viewable,
+                                                                drop_pos);
+}
+
+static void
+gimp_channel_tree_view_drop_component (GimpContainerTreeView   *tree_view,
+                                       GimpImage               *src_image,
+                                       GimpChannelType          component,
+                                       GimpViewable            *dest_viewable,
+                                       GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (tree_view);
+  GimpImage        *image     = gimp_item_tree_view_get_image (item_view);
+  GimpItem         *new_item;
+  GimpChannel      *parent;
+  gint              index;
+  const gchar      *desc;
+  gchar            *name;
+
+  index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                              drop_pos,
+                                              (GimpViewable **) &parent);
+
+  gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
+                       NULL, NULL, &desc, NULL);
+  name = g_strdup_printf (_("%s Channel Copy"), desc);
+
+  new_item = GIMP_ITEM (gimp_channel_new_from_component (src_image, component,
+                                                         name, NULL));
+
+  /*  copied components are invisible by default so subsequent copies
+   *  of components don't affect each other
+   */
+  gimp_item_set_visible (new_item, FALSE, FALSE);
+
+  g_free (name);
+
+  if (src_image != image)
+    GIMP_ITEM_GET_CLASS (new_item)->convert (new_item, image,
+                                             GIMP_TYPE_CHANNEL);
+
+  gimp_image_add_channel (image, GIMP_CHANNEL (new_item), parent, index, TRUE);
+
+  gimp_image_flush (image);
+}
+
+
+/*  GimpItemTreeView methods  */
+
+static void
+gimp_channel_tree_view_set_image (GimpItemTreeView *item_view,
+                                  GimpImage        *image)
+{
+  GimpChannelTreeView *channel_view = GIMP_CHANNEL_TREE_VIEW (item_view);
+
+  if (! channel_view->priv->component_editor)
+    {
+      GimpContainerView *view = GIMP_CONTAINER_VIEW (item_view);
+      gint               view_size;
+
+      view_size = gimp_container_view_get_view_size (view, NULL);
+
+      channel_view->priv->component_editor =
+        gimp_component_editor_new (view_size,
+                                   gimp_editor_get_menu_factory (GIMP_EDITOR (item_view)));
+      gimp_docked_set_context (GIMP_DOCKED (channel_view->priv->component_editor),
+                               gimp_container_view_get_context (view));
+      gtk_box_pack_start (GTK_BOX (item_view), channel_view->priv->component_editor,
+                          FALSE, FALSE, 0);
+      gtk_box_reorder_child (GTK_BOX (item_view),
+                             channel_view->priv->component_editor, 0);
+    }
+
+  if (! image)
+    gtk_widget_hide (channel_view->priv->component_editor);
+
+  gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (channel_view->priv->component_editor),
+                               image);
+
+  GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (item_view, image);
+
+  if (gimp_item_tree_view_get_image (item_view))
+    gtk_widget_show (channel_view->priv->component_editor);
+}
+
+static GimpItem *
+gimp_channel_tree_view_item_new (GimpImage *image)
+{
+  GimpChannel *new_channel;
+  GimpRGB      color;
+
+  gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.5);
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                               _("New Channel"));
+
+  new_channel = gimp_channel_new (image,
+                                  gimp_image_get_width (image),
+                                  gimp_image_get_height (image),
+                                  _("Channel"), &color);
+
+  gimp_image_add_channel (image, new_channel,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+  gimp_image_undo_group_end (image);
+
+  return GIMP_ITEM (new_channel);
+}
+
+
+/*  GimpContainerView methods  */
+
+static void
+gimp_channel_tree_view_set_context (GimpContainerView *view,
+                                    GimpContext       *context)
+{
+  GimpChannelTreeView *channel_view = GIMP_CHANNEL_TREE_VIEW (view);
+
+  parent_view_iface->set_context (view, context);
+
+  if (channel_view->priv->component_editor)
+    gimp_docked_set_context (GIMP_DOCKED (channel_view->priv->component_editor),
+                             context);
+}
+
+static void
+gimp_channel_tree_view_set_view_size (GimpContainerView *view)
+{
+  GimpChannelTreeView *channel_view = GIMP_CHANNEL_TREE_VIEW (view);
+  gint                 view_size;
+
+  parent_view_iface->set_view_size (view);
+
+  view_size = gimp_container_view_get_view_size (view, NULL);
+
+  if (channel_view->priv->component_editor)
+    gimp_component_editor_set_view_size (GIMP_COMPONENT_EDITOR (channel_view->priv->component_editor),
+                                         view_size);
+}
diff --git a/app/widgets/gimpchanneltreeview.h b/app/widgets/gimpchanneltreeview.h
new file mode 100644
index 0000000..933dcdd
--- /dev/null
+++ b/app/widgets/gimpchanneltreeview.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpchanneltreeview.h
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CHANNEL_TREE_VIEW_H__
+#define __GIMP_CHANNEL_TREE_VIEW_H__
+
+
+#include "gimpdrawabletreeview.h"
+
+
+#define GIMP_TYPE_CHANNEL_TREE_VIEW            (gimp_channel_tree_view_get_type ())
+#define GIMP_CHANNEL_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CHANNEL_TREE_VIEW, GimpChannelTreeView))
+#define GIMP_CHANNEL_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CHANNEL_TREE_VIEW, GimpChannelTreeViewClass))
+#define GIMP_IS_CHANNEL_TREE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CHANNEL_TREE_VIEW))
+#define GIMP_IS_CHANNEL_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CHANNEL_TREE_VIEW))
+#define GIMP_CHANNEL_TREE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CHANNEL_TREE_VIEW, GimpChannelTreeViewClass))
+
+
+typedef struct _GimpChannelTreeViewClass   GimpChannelTreeViewClass;
+typedef struct _GimpChannelTreeViewPrivate GimpChannelTreeViewPrivate;
+
+struct _GimpChannelTreeView
+{
+  GimpDrawableTreeView        parent_instance;
+
+  GimpChannelTreeViewPrivate *priv;
+};
+
+struct _GimpChannelTreeViewClass
+{
+  GimpDrawableTreeViewClass  parent_class;
+};
+
+
+GType   gimp_channel_tree_view_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_CHANNEL_TREE_VIEW_H__  */
diff --git a/app/widgets/gimpcircle.c b/app/widgets/gimpcircle.c
new file mode 100644
index 0000000..407d9e7
--- /dev/null
+++ b/app/widgets/gimpcircle.c
@@ -0,0 +1,589 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcircle.c
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on code from the color-rotate plug-in
+ * Copyright (C) 1997-1999 Sven Anders (anderss@fmi.uni-passau.de)
+ *                         Based on code from Pavel Grinfeld (pavel@ml.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpcircle.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SIZE,
+  PROP_BORDER_WIDTH,
+  PROP_BACKGROUND
+};
+
+
+struct _GimpCirclePrivate
+{
+  gint                  size;
+  gint                  border_width;
+  GimpCircleBackground  background;
+
+  GdkWindow            *event_window;
+  cairo_surface_t      *surface;
+  gboolean              has_grab;
+  gboolean              in_widget;
+};
+
+
+static void        gimp_circle_dispose              (GObject              *object);
+static void        gimp_circle_set_property         (GObject              *object,
+                                                     guint                 property_id,
+                                                     const GValue         *value,
+                                                     GParamSpec           *pspec);
+static void        gimp_circle_get_property         (GObject              *object,
+                                                     guint                 property_id,
+                                                     GValue               *value,
+                                                     GParamSpec           *pspec);
+
+static void        gimp_circle_realize              (GtkWidget            *widget);
+static void        gimp_circle_unrealize            (GtkWidget            *widget);
+static void        gimp_circle_map                  (GtkWidget            *widget);
+static void        gimp_circle_unmap                (GtkWidget            *widget);
+static void        gimp_circle_size_request         (GtkWidget            *widget,
+                                                     GtkRequisition       *requisition);
+static void        gimp_circle_size_allocate        (GtkWidget            *widget,
+                                                     GtkAllocation        *allocation);
+static gboolean    gimp_circle_expose_event         (GtkWidget            *widget,
+                                                     GdkEventExpose       *event);
+static gboolean    gimp_circle_button_press_event   (GtkWidget            *widget,
+                                                     GdkEventButton       *bevent);
+static gboolean    gimp_circle_button_release_event (GtkWidget            *widget,
+                                                     GdkEventButton       *bevent);
+static gboolean    gimp_circle_enter_notify_event   (GtkWidget            *widget,
+                                                     GdkEventCrossing     *event);
+static gboolean    gimp_circle_leave_notify_event   (GtkWidget            *widget,
+                                                     GdkEventCrossing     *event);
+
+static void        gimp_circle_real_reset_target    (GimpCircle           *circle);
+
+static void        gimp_circle_background_hsv       (gdouble               angle,
+                                                     gdouble               distance,
+                                                     guchar               *rgb);
+
+static void        gimp_circle_draw_background      (GimpCircle           *circle,
+                                                     cairo_t              *cr,
+                                                     gint                  size,
+                                                     GimpCircleBackground  background);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpCircle, gimp_circle, GTK_TYPE_WIDGET)
+
+#define parent_class gimp_circle_parent_class
+
+
+static void
+gimp_circle_class_init (GimpCircleClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose              = gimp_circle_dispose;
+  object_class->get_property         = gimp_circle_get_property;
+  object_class->set_property         = gimp_circle_set_property;
+
+  widget_class->realize              = gimp_circle_realize;
+  widget_class->unrealize            = gimp_circle_unrealize;
+  widget_class->map                  = gimp_circle_map;
+  widget_class->unmap                = gimp_circle_unmap;
+  widget_class->size_request         = gimp_circle_size_request;
+  widget_class->size_allocate        = gimp_circle_size_allocate;
+  widget_class->expose_event         = gimp_circle_expose_event;
+  widget_class->button_press_event   = gimp_circle_button_press_event;
+  widget_class->button_release_event = gimp_circle_button_release_event;
+  widget_class->enter_notify_event   = gimp_circle_enter_notify_event;
+  widget_class->leave_notify_event   = gimp_circle_leave_notify_event;
+
+  klass->reset_target                = gimp_circle_real_reset_target;
+
+  g_object_class_install_property (object_class, PROP_SIZE,
+                                   g_param_spec_int ("size",
+                                                     NULL, NULL,
+                                                     32, 1024, 96,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BORDER_WIDTH,
+                                   g_param_spec_int ("border-width",
+                                                     NULL, NULL,
+                                                     0, 64, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BACKGROUND,
+                                   g_param_spec_enum ("background",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_CIRCLE_BACKGROUND,
+                                                      GIMP_CIRCLE_BACKGROUND_HSV,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_circle_init (GimpCircle *circle)
+{
+  circle->priv = gimp_circle_get_instance_private (circle);
+
+  gtk_widget_set_has_window (GTK_WIDGET (circle), FALSE);
+  gtk_widget_add_events (GTK_WIDGET (circle),
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_BUTTON1_MOTION_MASK |
+                         GDK_ENTER_NOTIFY_MASK   |
+                         GDK_LEAVE_NOTIFY_MASK);
+}
+
+static void
+gimp_circle_dispose (GObject *object)
+{
+  GimpCircle *circle = GIMP_CIRCLE (object);
+
+  g_clear_pointer (&circle->priv->surface, cairo_surface_destroy);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_circle_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpCircle *circle = GIMP_CIRCLE (object);
+
+  switch (property_id)
+    {
+    case PROP_SIZE:
+      circle->priv->size = g_value_get_int (value);
+      gtk_widget_queue_resize (GTK_WIDGET (circle));
+      break;
+
+    case PROP_BORDER_WIDTH:
+      circle->priv->border_width = g_value_get_int (value);
+      gtk_widget_queue_resize (GTK_WIDGET (circle));
+      break;
+
+    case PROP_BACKGROUND:
+      circle->priv->background = g_value_get_enum (value);
+      g_clear_pointer (&circle->priv->surface, cairo_surface_destroy);
+      gtk_widget_queue_draw (GTK_WIDGET (circle));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_circle_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpCircle *circle = GIMP_CIRCLE (object);
+
+  switch (property_id)
+    {
+    case PROP_SIZE:
+      g_value_set_int (value, circle->priv->size);
+      break;
+
+    case PROP_BORDER_WIDTH:
+      g_value_set_int (value, circle->priv->border_width);
+      break;
+
+    case PROP_BACKGROUND:
+      g_value_set_enum (value, circle->priv->background);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_circle_realize (GtkWidget *widget)
+{
+  GimpCircle    *circle = GIMP_CIRCLE (widget);
+  GtkAllocation  allocation;
+  GdkWindowAttr  attributes;
+  gint           attributes_mask;
+
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x           = allocation.x;
+  attributes.y           = allocation.y;
+  attributes.width       = allocation.width;
+  attributes.height      = allocation.height;
+  attributes.wclass      = GDK_INPUT_ONLY;
+  attributes.event_mask  = gtk_widget_get_events (widget);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  circle->priv->event_window = gdk_window_new (gtk_widget_get_window (widget),
+                                               &attributes, attributes_mask);
+  gdk_window_set_user_data (circle->priv->event_window, circle);
+}
+
+static void
+gimp_circle_unrealize (GtkWidget *widget)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  if (circle->priv->event_window)
+    {
+      gdk_window_set_user_data (circle->priv->event_window, NULL);
+      gdk_window_destroy (circle->priv->event_window);
+      circle->priv->event_window = NULL;
+    }
+
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+gimp_circle_map (GtkWidget *widget)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+  if (circle->priv->event_window)
+    gdk_window_show (circle->priv->event_window);
+}
+
+static void
+gimp_circle_unmap (GtkWidget *widget)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  if (circle->priv->has_grab)
+    {
+      gtk_grab_remove (widget);
+      circle->priv->has_grab = FALSE;
+    }
+
+  if (circle->priv->event_window)
+    gdk_window_hide (circle->priv->event_window);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_circle_size_request (GtkWidget      *widget,
+                        GtkRequisition *requisition)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  requisition->width  = 2 * circle->priv->border_width + circle->priv->size;
+  requisition->height = 2 * circle->priv->border_width + circle->priv->size;
+}
+
+static void
+gimp_circle_size_allocate (GtkWidget     *widget,
+                           GtkAllocation *allocation)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    gdk_window_move_resize (circle->priv->event_window,
+                            allocation->x,
+                            allocation->y,
+                            allocation->width,
+                            allocation->height);
+
+  g_clear_pointer (&circle->priv->surface, cairo_surface_destroy);
+}
+
+static gboolean
+gimp_circle_expose_event (GtkWidget      *widget,
+                          GdkEventExpose *event)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  if (gtk_widget_is_drawable (widget))
+    {
+      GtkAllocation  allocation;
+      gint           size = circle->priv->size;
+      cairo_t       *cr;
+
+      cr = gdk_cairo_create (event->window);
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      cairo_translate (cr,
+                       allocation.x + (allocation.width  - size) / 2,
+                       allocation.y + (allocation.height - size) / 2);
+
+      gimp_circle_draw_background (circle, cr, size, circle->priv->background);
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_circle_button_press_event (GtkWidget      *widget,
+                                GdkEventButton *bevent)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  if (bevent->type == GDK_BUTTON_PRESS &&
+      bevent->button == 1)
+    {
+      gtk_grab_add (widget);
+      circle->priv->has_grab = TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_circle_button_release_event (GtkWidget      *widget,
+                                  GdkEventButton *bevent)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  if (bevent->button == 1)
+    {
+      gtk_grab_remove (widget);
+      circle->priv->has_grab = FALSE;
+
+      if (! circle->priv->in_widget)
+        GIMP_CIRCLE_GET_CLASS (circle)->reset_target (circle);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_circle_enter_notify_event (GtkWidget        *widget,
+                                GdkEventCrossing *event)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  circle->priv->in_widget = TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+gimp_circle_leave_notify_event (GtkWidget        *widget,
+                                GdkEventCrossing *event)
+{
+  GimpCircle *circle = GIMP_CIRCLE (widget);
+
+  circle->priv->in_widget = FALSE;
+
+  if (! circle->priv->has_grab)
+    GIMP_CIRCLE_GET_CLASS (circle)->reset_target (circle);
+
+  return FALSE;
+}
+
+static void
+gimp_circle_real_reset_target (GimpCircle *circle)
+{
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_circle_new (void)
+{
+  return g_object_new (GIMP_TYPE_CIRCLE, NULL);
+}
+
+
+/*  protected functions  */
+
+static gdouble
+get_angle_and_distance (gdouble  center_x,
+                        gdouble  center_y,
+                        gdouble  radius,
+                        gdouble  x,
+                        gdouble  y,
+                        gdouble *distance)
+{
+  gdouble angle = atan2 (center_y - y,
+                         x - center_x);
+
+  if (angle < 0)
+    angle += 2 * G_PI;
+
+  if (distance)
+    *distance = sqrt ((SQR (x - center_x) +
+                       SQR (y - center_y)) / SQR (radius));
+
+  return angle;
+}
+
+gboolean
+_gimp_circle_has_grab (GimpCircle *circle)
+{
+  g_return_val_if_fail (GIMP_IS_CIRCLE (circle), FALSE);
+
+  return circle->priv->has_grab;
+}
+
+gdouble
+_gimp_circle_get_angle_and_distance (GimpCircle *circle,
+                                     gdouble     event_x,
+                                     gdouble     event_y,
+                                     gdouble    *distance)
+{
+  GtkAllocation allocation;
+  gdouble       center_x;
+  gdouble       center_y;
+
+  g_return_val_if_fail (GIMP_IS_CIRCLE (circle), 0.0);
+
+  gtk_widget_get_allocation (GTK_WIDGET (circle), &allocation);
+
+  center_x = allocation.width  / 2.0;
+  center_y = allocation.height / 2.0;
+
+  return get_angle_and_distance (center_x, center_y, circle->priv->size / 2.0,
+                                 event_x, event_y,
+                                 distance);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_circle_background_hsv (gdouble  angle,
+                            gdouble  distance,
+                            guchar  *rgb)
+{
+  GimpHSV hsv;
+  GimpRGB color;
+
+  gimp_hsv_set (&hsv,
+                angle / (2.0 * G_PI),
+                distance,
+                1 - sqrt (distance) / 4 /* it just looks nicer this way */);
+
+  gimp_hsv_to_rgb (&hsv, &color);
+
+  gimp_rgb_get_uchar (&color, rgb, rgb + 1, rgb + 2);
+}
+
+static void
+gimp_circle_draw_background (GimpCircle           *circle,
+                             cairo_t              *cr,
+                             gint                  size,
+                             GimpCircleBackground  background)
+{
+  cairo_save (cr);
+
+  if (background == GIMP_CIRCLE_BACKGROUND_PLAIN)
+    {
+      cairo_arc (cr, size / 2.0, size / 2.0, size / 2.0 - 1.5, 0.0, 2 * G_PI);
+
+      cairo_set_line_width (cr, 3.0);
+      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.6);
+      cairo_stroke_preserve (cr);
+
+      cairo_set_line_width (cr, 1.0);
+      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      if (! circle->priv->surface)
+        {
+          guchar *data;
+          gint    stride;
+          gint    x, y;
+
+          circle->priv->surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                                              size, size);
+
+          data   = cairo_image_surface_get_data (circle->priv->surface);
+          stride = cairo_image_surface_get_stride (circle->priv->surface);
+
+          for (y = 0; y < size; y++)
+            {
+              for (x = 0; x < size; x++)
+                {
+                  gdouble angle;
+                  gdouble distance;
+                  guchar  rgb[3] = { 0, };
+
+                  angle = get_angle_and_distance (size / 2.0, size / 2.0,
+                                                  size / 2.0,
+                                                  x, y,
+                                                  &distance);
+
+                  switch (background)
+                    {
+                    case GIMP_CIRCLE_BACKGROUND_HSV:
+                      gimp_circle_background_hsv (angle, distance, rgb);
+                      break;
+
+                    default:
+                      break;
+                    }
+
+                  GIMP_CAIRO_ARGB32_SET_PIXEL (data + y * stride + x * 4,
+                                               rgb[0], rgb[1], rgb[2], 255);
+                }
+            }
+
+          cairo_surface_mark_dirty (circle->priv->surface);
+        }
+
+      cairo_set_source_surface (cr, circle->priv->surface, 0.0, 0.0);
+
+      cairo_arc (cr, size / 2.0, size / 2.0, size / 2.0, 0.0, 2 * G_PI);
+      cairo_clip (cr);
+
+      cairo_paint (cr);
+    }
+
+  cairo_restore (cr);
+}
diff --git a/app/widgets/gimpcircle.h b/app/widgets/gimpcircle.h
new file mode 100644
index 0000000..815358c
--- /dev/null
+++ b/app/widgets/gimpcircle.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcircle.h
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on code from the color-rotate plug-in
+ * Copyright (C) 1997-1999 Sven Anders (anderss@fmi.uni-passau.de)
+ *                         Based on code from Pavel Grinfeld (pavel@ml.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CIRCLE_H__
+#define __GIMP_CIRCLE_H__
+
+
+#define GIMP_TYPE_CIRCLE            (gimp_circle_get_type ())
+#define GIMP_CIRCLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CIRCLE, GimpCircle))
+#define GIMP_CIRCLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CIRCLE, GimpCircleClass))
+#define GIMP_IS_CIRCLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_CIRCLE))
+#define GIMP_IS_CIRCLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CIRCLE))
+#define GIMP_CIRCLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CIRCLE, GimpCircleClass))
+
+
+typedef struct _GimpCirclePrivate GimpCirclePrivate;
+typedef struct _GimpCircleClass   GimpCircleClass;
+
+struct _GimpCircle
+{
+  GtkWidget          parent_instance;
+
+  GimpCirclePrivate *priv;
+};
+
+struct _GimpCircleClass
+{
+  GtkWidgetClass  parent_class;
+
+  void (* reset_target) (GimpCircle *circle);
+};
+
+
+GType          gimp_circle_get_type                (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_circle_new                     (void);
+
+gboolean       _gimp_circle_has_grab               (GimpCircle *circle);
+gdouble        _gimp_circle_get_angle_and_distance (GimpCircle *circle,
+                                                    gdouble     event_x,
+                                                    gdouble     event_y,
+                                                    gdouble    *distance);
+
+
+#endif /* __GIMP_CIRCLE_H__ */
diff --git a/app/widgets/gimpclipboard.c b/app/widgets/gimpclipboard.c
new file mode 100644
index 0000000..4c77de6
--- /dev/null
+++ b/app/widgets/gimpclipboard.c
@@ -0,0 +1,1293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpcurve.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+
+#include "gimpclipboard.h"
+#include "gimppixbuf.h"
+#include "gimpselectiondata.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_CLIPBOARD_KEY "gimp-clipboard"
+
+
+typedef struct _GimpClipboard GimpClipboard;
+
+struct _GimpClipboard
+{
+  GSList         *pixbuf_formats;
+
+  GtkTargetEntry *image_target_entries;
+  gint            n_image_target_entries;
+
+  GtkTargetEntry *buffer_target_entries;
+  gint            n_buffer_target_entries;
+
+  GtkTargetEntry *svg_target_entries;
+  gint            n_svg_target_entries;
+
+  GtkTargetEntry *curve_target_entries;
+  gint            n_curve_target_entries;
+
+  GimpImage      *image;
+  GimpBuffer     *buffer;
+  gchar          *svg;
+  GimpCurve      *curve;
+};
+
+
+static GimpClipboard * gimp_clipboard_get        (Gimp             *gimp);
+
+static GimpClipboard * gimp_clipboard_new        (gboolean          verbose);
+static void            gimp_clipboard_free       (GimpClipboard    *gimp_clip);
+
+static void      gimp_clipboard_clear            (GimpClipboard    *gimp_clip);
+
+static GdkAtom * gimp_clipboard_wait_for_targets (Gimp             *gimp,
+                                                  gint             *n_targets);
+static GdkAtom   gimp_clipboard_wait_for_image   (Gimp             *gimp);
+static GdkAtom   gimp_clipboard_wait_for_buffer  (Gimp             *gimp);
+static GdkAtom   gimp_clipboard_wait_for_svg     (Gimp             *gimp);
+static GdkAtom   gimp_clipboard_wait_for_curve   (Gimp             *gimp);
+
+static void      gimp_clipboard_send_image       (GtkClipboard     *clipboard,
+                                                  GtkSelectionData *data,
+                                                  guint             info,
+                                                  Gimp             *gimp);
+static void      gimp_clipboard_send_buffer      (GtkClipboard     *clipboard,
+                                                  GtkSelectionData *data,
+                                                  guint             info,
+                                                  Gimp             *gimp);
+static void      gimp_clipboard_send_svg         (GtkClipboard     *clipboard,
+                                                  GtkSelectionData *data,
+                                                  guint             info,
+                                                  Gimp             *gimp);
+static void      gimp_clipboard_send_curve       (GtkClipboard     *clipboard,
+                                                  GtkSelectionData *data,
+                                                  guint             info,
+                                                  Gimp             *gimp);
+
+
+/*  public functions  */
+
+void
+gimp_clipboard_init (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  g_return_if_fail (gimp_clip == NULL);
+
+  gimp_clip = gimp_clipboard_new (gimp->be_verbose);
+
+  g_object_set_data_full (G_OBJECT (gimp), GIMP_CLIPBOARD_KEY,
+                          gimp_clip, (GDestroyNotify) gimp_clipboard_free);
+}
+
+void
+gimp_clipboard_exit (Gimp *gimp)
+{
+  GtkClipboard *clipboard;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) == G_OBJECT (gimp))
+    {
+      gtk_clipboard_store (clipboard);
+    }
+
+  if (clipboard)
+    /* If we don't clear the clipboard, it keeps a reference on the object
+     * owner (i.e. Gimp object probably) which fails to finalize.
+     */
+    gtk_clipboard_clear (clipboard);
+
+  g_object_set_data (G_OBJECT (gimp), GIMP_CLIPBOARD_KEY, NULL);
+}
+
+/**
+ * gimp_clipboard_has_image:
+ * @gimp: pointer to #Gimp
+ *
+ * Tests if there's an image in the clipboard. If the global image cut
+ * buffer of @gimp is empty, this function returns %NULL.
+ *
+ * Return value: %TRUE if there's an image in the clipboard, %FALSE otherwise
+ **/
+gboolean
+gimp_clipboard_has_image (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      if (gimp_clipboard_wait_for_image (gimp) != GDK_NONE)
+        {
+          return TRUE;
+        }
+
+      return FALSE;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  return (gimp_clip->image != NULL);
+}
+
+/**
+ * gimp_clipboard_has_buffer:
+ * @gimp: pointer to #Gimp
+ *
+ * Tests if there's image data in the clipboard. If the global cut
+ * buffer of @gimp is empty, this function checks if there's image
+ * data in %GDK_SELECTION_CLIPBOARD. This is done in a main-loop
+ * similar to gtk_clipboard_wait_is_text_available(). The same caveats
+ * apply here.
+ *
+ * Return value: %TRUE if there's image data in the clipboard, %FALSE otherwise
+ **/
+gboolean
+gimp_clipboard_has_buffer (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      if (gimp_clipboard_wait_for_buffer (gimp) != GDK_NONE)
+        {
+          return TRUE;
+        }
+
+      return FALSE;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  return (gimp_clip->buffer != NULL);
+}
+
+/**
+ * gimp_clipboard_has_svg:
+ * @gimp: pointer to #Gimp
+ *
+ * Tests if there's SVG data in %GDK_SELECTION_CLIPBOARD.
+ * This is done in a main-loop similar to
+ * gtk_clipboard_wait_is_text_available(). The same caveats apply here.
+ *
+ * Return value: %TRUE if there's SVG data in the clipboard, %FALSE otherwise
+ **/
+gboolean
+gimp_clipboard_has_svg (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      if (gimp_clipboard_wait_for_svg (gimp) != GDK_NONE)
+        {
+          return TRUE;
+        }
+
+      return FALSE;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  return (gimp_clip->svg != NULL);
+}
+
+/**
+ * gimp_clipboard_has_curve:
+ * @gimp: pointer to #Gimp
+ *
+ * Tests if there's curve data in %GDK_SELECTION_CLIPBOARD.
+ * This is done in a main-loop similar to
+ * gtk_clipboard_wait_is_text_available(). The same caveats apply here.
+ *
+ * Return value: %TRUE if there's curve data in the clipboard, %FALSE otherwise
+ **/
+gboolean
+gimp_clipboard_has_curve (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      if (gimp_clipboard_wait_for_curve (gimp) != GDK_NONE)
+        {
+          return TRUE;
+        }
+
+      return FALSE;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  return (gimp_clip->curve != NULL);
+}
+
+/**
+ * gimp_clipboard_get_object:
+ * @gimp: pointer to #Gimp
+ *
+ * Retrieves either an image or a buffer from the global image cut
+ * buffer of @gimp.
+ *
+ * The returned #GimpObject needs to be unref'ed when it's no longer
+ * needed.
+ *
+ * Return value: a reference to a #GimpObject or %NULL if there's no
+ *               image or buffer in the clipboard
+ **/
+GimpObject *
+gimp_clipboard_get_object (Gimp *gimp)
+{
+  GimpObject *object;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  object = GIMP_OBJECT (gimp_clipboard_get_image (gimp));
+
+  if (! object)
+    object = GIMP_OBJECT (gimp_clipboard_get_buffer (gimp));
+
+  return object;
+}
+
+/**
+ * gimp_clipboard_get_image:
+ * @gimp: pointer to #Gimp
+ *
+ * Retrieves an image from the global image cut buffer of @gimp.
+ *
+ * The returned #GimpImage needs to be unref'ed when it's no longer
+ * needed.
+ *
+ * Return value: a reference to a #GimpImage or %NULL if there's no
+ *               image in the clipboard
+ **/
+GimpImage *
+gimp_clipboard_get_image (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+  GimpImage     *image = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      GdkAtom atom = gimp_clipboard_wait_for_image (gimp);
+
+      if (atom != GDK_NONE)
+        {
+          GtkSelectionData *data;
+
+          gimp_set_busy (gimp);
+
+          data = gtk_clipboard_wait_for_contents (clipboard, atom);
+
+          if (data)
+            {
+              image = gimp_selection_data_get_xcf (data, gimp);
+
+              gtk_selection_data_free (data);
+            }
+
+          gimp_unset_busy (gimp);
+        }
+
+      return image;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  if (! image && gimp_clip->image)
+    image = g_object_ref (gimp_clip->image);
+
+  return image;
+}
+
+/**
+ * gimp_clipboard_get_buffer:
+ * @gimp: pointer to #Gimp
+ *
+ * Retrieves either image data from %GDK_SELECTION_CLIPBOARD or from
+ * the global cut buffer of @gimp.
+ *
+ * The returned #GimpBuffer needs to be unref'ed when it's no longer
+ * needed.
+ *
+ * Return value: a reference to a #GimpBuffer or %NULL if there's no
+ *               image data
+ **/
+GimpBuffer *
+gimp_clipboard_get_buffer (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+  GimpBuffer    *buffer = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      GdkAtom atom = gimp_clipboard_wait_for_buffer (gimp);
+
+      if (atom != GDK_NONE)
+        {
+          GtkSelectionData *data;
+
+          gimp_set_busy (gimp);
+
+          data = gtk_clipboard_wait_for_contents (clipboard, atom);
+
+          if (data)
+            {
+              GdkPixbuf *pixbuf = gtk_selection_data_get_pixbuf (data);
+
+              gtk_selection_data_free (data);
+
+              if (pixbuf)
+                {
+                  buffer = gimp_buffer_new_from_pixbuf (pixbuf, _("Clipboard"),
+                                                        0, 0);
+                  g_object_unref (pixbuf);
+                }
+            }
+
+          gimp_unset_busy (gimp);
+        }
+
+      return buffer;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  if (! buffer && gimp_clip->buffer)
+    buffer = g_object_ref (gimp_clip->buffer);
+
+  return buffer;
+}
+
+/**
+ * gimp_clipboard_get_svg:
+ * @gimp: pointer to #Gimp
+ * @svg_length: returns the size of the SVG stream in bytes
+ *
+ * Retrieves SVG data from %GDK_SELECTION_CLIPBOARD or from the global
+ * SVG buffer of @gimp.
+ *
+ * The returned data needs to be freed when it's no longer needed.
+ *
+ * Return value: a reference to a #GimpBuffer or %NULL if there's no
+ *               image data
+ **/
+gchar *
+gimp_clipboard_get_svg (Gimp  *gimp,
+                        gsize *svg_length)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+  gchar         *svg = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (svg_length != NULL, NULL);
+
+  *svg_length = 0;
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      GdkAtom atom = gimp_clipboard_wait_for_svg (gimp);
+
+      if (atom != GDK_NONE)
+        {
+          GtkSelectionData *data;
+
+          gimp_set_busy (gimp);
+
+          data = gtk_clipboard_wait_for_contents (clipboard, atom);
+
+          if (data)
+            {
+              const guchar *stream;
+
+              stream = gimp_selection_data_get_stream (data, svg_length);
+
+              if (stream)
+                svg = g_memdup (stream, *svg_length);
+
+              gtk_selection_data_free (data);
+            }
+
+          gimp_unset_busy (gimp);
+        }
+
+      return svg;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  if (! svg && gimp_clip->svg)
+    {
+      svg = g_strdup (gimp_clip->svg);
+      *svg_length = strlen (svg);
+    }
+
+  return svg;
+}
+
+/**
+ * gimp_clipboard_get_curve:
+ * @gimp: pointer to #Gimp
+ *
+ * Retrieves curve data from %GDK_SELECTION_CLIPBOARD or from the global
+ * curve buffer of @gimp.
+ *
+ * The returned curve needs to be unref'ed when it's no longer needed.
+ *
+ * Return value: a reference to a #GimpCurve or %NULL if there's no
+ *               curve data
+ **/
+GimpCurve *
+gimp_clipboard_get_curve (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+  GimpCurve     *curve = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard &&
+      gtk_clipboard_get_owner (clipboard) != G_OBJECT (gimp))
+    {
+      GdkAtom atom = gimp_clipboard_wait_for_curve (gimp);
+
+      if (atom != GDK_NONE)
+        {
+          GtkSelectionData *data;
+
+          gimp_set_busy (gimp);
+
+          data = gtk_clipboard_wait_for_contents (clipboard, atom);
+
+          if (data)
+            {
+              curve = gimp_selection_data_get_curve (data);
+
+              gtk_selection_data_free (data);
+            }
+
+          gimp_unset_busy (gimp);
+        }
+
+      return curve;
+    }
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  if (! curve && gimp_clip->curve)
+    curve = g_object_ref (gimp_clip->curve);
+
+  return curve;
+}
+
+/**
+ * gimp_clipboard_set_image:
+ * @gimp:  pointer to #Gimp
+ * @image: a #GimpImage, or %NULL.
+ *
+ * Offers the image in %GDK_SELECTION_CLIPBOARD.
+ **/
+void
+gimp_clipboard_set_image (Gimp      *gimp,
+                          GimpImage *image)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+  if (! clipboard)
+    return;
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_clipboard_clear (gimp_clip);
+
+  if (image)
+    {
+      gimp_clip->image = g_object_ref (image);
+
+      gtk_clipboard_set_with_owner (clipboard,
+                                    gimp_clip->image_target_entries,
+                                    gimp_clip->n_image_target_entries,
+                                    (GtkClipboardGetFunc) gimp_clipboard_send_image,
+                                    (GtkClipboardClearFunc) NULL,
+                                    G_OBJECT (gimp));
+
+      /*  mark the first two entries (image/x-xcf and image/png) as
+       *  suitable for storing
+       */
+      gtk_clipboard_set_can_store (clipboard,
+                                   gimp_clip->image_target_entries,
+                                   MIN (2, gimp_clip->n_image_target_entries));
+    }
+  else if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (gimp))
+    {
+      gtk_clipboard_clear (clipboard);
+    }
+}
+
+/**
+ * gimp_clipboard_set_buffer:
+ * @gimp:   pointer to #Gimp
+ * @buffer: a #GimpBuffer, or %NULL.
+ *
+ * Offers the buffer in %GDK_SELECTION_CLIPBOARD.
+ **/
+void
+gimp_clipboard_set_buffer (Gimp       *gimp,
+                           GimpBuffer *buffer)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (buffer == NULL || GIMP_IS_BUFFER (buffer));
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+  if (! clipboard)
+    return;
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_clipboard_clear (gimp_clip);
+
+  if (buffer)
+    {
+      gimp_clip->buffer = g_object_ref (buffer);
+
+      gtk_clipboard_set_with_owner (clipboard,
+                                    gimp_clip->buffer_target_entries,
+                                    gimp_clip->n_buffer_target_entries,
+                                    (GtkClipboardGetFunc) gimp_clipboard_send_buffer,
+                                    (GtkClipboardClearFunc) NULL,
+                                    G_OBJECT (gimp));
+
+      /*  mark the first entry (image/png) as suitable for storing  */
+      if (gimp_clip->n_buffer_target_entries > 0)
+        gtk_clipboard_set_can_store (clipboard,
+                                     gimp_clip->buffer_target_entries, 1);
+    }
+  else if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (gimp))
+    {
+      gtk_clipboard_clear (clipboard);
+    }
+}
+
+/**
+ * gimp_clipboard_set_svg:
+ * @gimp: pointer to #Gimp
+ * @svg: a string containing the SVG data, or %NULL
+ *
+ * Offers SVG data in %GDK_SELECTION_CLIPBOARD.
+ **/
+void
+gimp_clipboard_set_svg (Gimp        *gimp,
+                        const gchar *svg)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+  if (! clipboard)
+    return;
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_clipboard_clear (gimp_clip);
+
+  if (svg)
+    {
+      gimp_clip->svg = g_strdup (svg);
+
+      gtk_clipboard_set_with_owner (clipboard,
+                                    gimp_clip->svg_target_entries,
+                                    gimp_clip->n_svg_target_entries,
+                                    (GtkClipboardGetFunc) gimp_clipboard_send_svg,
+                                    (GtkClipboardClearFunc) NULL,
+                                    G_OBJECT (gimp));
+
+      /*  mark the first entry (image/svg) as suitable for storing  */
+      gtk_clipboard_set_can_store (clipboard,
+                                   gimp_clip->svg_target_entries, 1);
+    }
+  else if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (gimp))
+    {
+      gtk_clipboard_clear (clipboard);
+    }
+}
+
+/**
+ * gimp_clipboard_set_text:
+ * @gimp: pointer to #Gimp
+ * @text: a %NULL-terminated string in UTF-8 encoding
+ *
+ * Offers @text in %GDK_SELECTION_CLIPBOARD and %GDK_SELECTION_PRIMARY.
+ **/
+void
+gimp_clipboard_set_text (Gimp        *gimp,
+                         const gchar *text)
+{
+  GtkClipboard *clipboard;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (text != NULL);
+
+  gimp_clipboard_clear (gimp_clipboard_get (gimp));
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+  if (clipboard)
+    gtk_clipboard_set_text (clipboard, text, -1);
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_PRIMARY);
+  if (clipboard)
+    gtk_clipboard_set_text (clipboard, text, -1);
+}
+
+/**
+ * gimp_clipboard_set_curve:
+ * @gimp: pointer to #Gimp
+ * @curve: a #GimpCurve, or %NULL
+ *
+ * Offers curve data in %GDK_SELECTION_CLIPBOARD.
+ **/
+void
+gimp_clipboard_set_curve (Gimp      *gimp,
+                          GimpCurve *curve)
+{
+  GimpClipboard *gimp_clip;
+  GtkClipboard  *clipboard;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (curve == NULL || GIMP_IS_CURVE (curve));
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+  if (! clipboard)
+    return;
+
+  gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_clipboard_clear (gimp_clip);
+
+  if (curve)
+    {
+      gimp_clip->curve = g_object_ref (curve);
+
+      gtk_clipboard_set_with_owner (clipboard,
+                                    gimp_clip->curve_target_entries,
+                                    gimp_clip->n_curve_target_entries,
+                                    (GtkClipboardGetFunc) gimp_clipboard_send_curve,
+                                    (GtkClipboardClearFunc) NULL,
+                                    G_OBJECT (gimp));
+
+      gtk_clipboard_set_can_store (clipboard,
+                                   gimp_clip->curve_target_entries, 1);
+    }
+  else if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (gimp))
+    {
+      gtk_clipboard_clear (clipboard);
+    }
+}
+
+
+/*  private functions  */
+
+static GimpClipboard *
+gimp_clipboard_get (Gimp *gimp)
+{
+  return g_object_get_data (G_OBJECT (gimp), GIMP_CLIPBOARD_KEY);
+}
+
+static GimpClipboard *
+gimp_clipboard_new (gboolean verbose)
+{
+  GimpClipboard *gimp_clip = g_slice_new0 (GimpClipboard);
+  GSList        *list;
+
+  gimp_clip->pixbuf_formats = gimp_pixbuf_get_formats ();
+
+  for (list = gimp_clip->pixbuf_formats; list; list = g_slist_next (list))
+    {
+      GdkPixbufFormat *format = list->data;
+
+      if (gdk_pixbuf_format_is_writable (format))
+        {
+          gchar **mime_types;
+          gchar **type;
+
+          mime_types = gdk_pixbuf_format_get_mime_types (format);
+
+          for (type = mime_types; *type; type++)
+            gimp_clip->n_buffer_target_entries++;
+
+          g_strfreev (mime_types);
+        }
+    }
+
+  /*  the image_target_entries have the XCF target, and all pixbuf
+   *  targets that are also in buffer_target_entries
+   */
+  gimp_clip->n_image_target_entries = gimp_clip->n_buffer_target_entries + 1;
+  gimp_clip->image_target_entries   = g_new0 (GtkTargetEntry,
+                                              gimp_clip->n_image_target_entries);
+
+  gimp_clip->image_target_entries[0].target = g_strdup ("image/x-xcf");
+  gimp_clip->image_target_entries[0].flags  = 0;
+  gimp_clip->image_target_entries[0].info   = 0;
+
+  if (gimp_clip->n_buffer_target_entries > 0)
+    {
+      gint i = 0;
+
+      gimp_clip->buffer_target_entries = g_new0 (GtkTargetEntry,
+                                                 gimp_clip->n_buffer_target_entries);
+
+      for (list = gimp_clip->pixbuf_formats; list; list = g_slist_next (list))
+        {
+          GdkPixbufFormat *format = list->data;
+
+          if (gdk_pixbuf_format_is_writable (format))
+            {
+              gchar  *format_name;
+              gchar **mime_types;
+              gchar **type;
+
+              format_name = gdk_pixbuf_format_get_name (format);
+              mime_types  = gdk_pixbuf_format_get_mime_types (format);
+
+              for (type = mime_types; *type; type++)
+                {
+                  const gchar *mime_type = *type;
+
+                  if (verbose)
+                    g_printerr ("clipboard: writable pixbuf format: %s\n",
+                                mime_type);
+
+                  gimp_clip->image_target_entries[i + 1].target = g_strdup (mime_type);
+                  gimp_clip->image_target_entries[i + 1].flags  = 0;
+                  gimp_clip->image_target_entries[i + 1].info   = i + 1;
+
+                  gimp_clip->buffer_target_entries[i].target = g_strdup (mime_type);
+                  gimp_clip->buffer_target_entries[i].flags  = 0;
+                  gimp_clip->buffer_target_entries[i].info   = i;
+
+                  i++;
+                }
+
+              g_strfreev (mime_types);
+              g_free (format_name);
+            }
+        }
+    }
+
+  gimp_clip->n_svg_target_entries = 2;
+  gimp_clip->svg_target_entries   = g_new0 (GtkTargetEntry, 2);
+
+  gimp_clip->svg_target_entries[0].target = g_strdup ("image/svg");
+  gimp_clip->svg_target_entries[0].flags  = 0;
+  gimp_clip->svg_target_entries[0].info   = 0;
+
+  gimp_clip->svg_target_entries[1].target = g_strdup ("image/svg+xml");
+  gimp_clip->svg_target_entries[1].flags  = 0;
+  gimp_clip->svg_target_entries[1].info   = 1;
+
+  gimp_clip->n_curve_target_entries = 1;
+  gimp_clip->curve_target_entries   = g_new0 (GtkTargetEntry, 1);
+
+  gimp_clip->curve_target_entries[0].target = g_strdup ("application/x-gimp-curve");
+  gimp_clip->curve_target_entries[0].flags  = 0;
+  gimp_clip->curve_target_entries[0].info   = 0;
+
+  return gimp_clip;
+}
+
+static void
+gimp_clipboard_free (GimpClipboard *gimp_clip)
+{
+  gint i;
+
+  gimp_clipboard_clear (gimp_clip);
+
+  g_slist_free (gimp_clip->pixbuf_formats);
+
+  for (i = 0; i < gimp_clip->n_image_target_entries; i++)
+    g_free ((gchar *) gimp_clip->image_target_entries[i].target);
+
+  g_free (gimp_clip->image_target_entries);
+
+  for (i = 0; i < gimp_clip->n_buffer_target_entries; i++)
+    g_free ((gchar *) gimp_clip->buffer_target_entries[i].target);
+
+  g_free (gimp_clip->buffer_target_entries);
+
+  for (i = 0; i < gimp_clip->n_svg_target_entries; i++)
+    g_free ((gchar *) gimp_clip->svg_target_entries[i].target);
+
+  g_free (gimp_clip->svg_target_entries);
+
+  for (i = 0; i < gimp_clip->n_curve_target_entries; i++)
+    g_free ((gchar *) gimp_clip->curve_target_entries[i].target);
+
+  g_free (gimp_clip->curve_target_entries);
+
+  g_slice_free (GimpClipboard, gimp_clip);
+}
+
+static void
+gimp_clipboard_clear (GimpClipboard *gimp_clip)
+{
+  g_clear_object (&gimp_clip->image);
+  g_clear_object (&gimp_clip->buffer);
+  g_clear_pointer (&gimp_clip->svg, g_free);
+  g_clear_object (&gimp_clip->curve);
+}
+
+static GdkAtom *
+gimp_clipboard_wait_for_targets (Gimp *gimp,
+                                 gint *n_targets)
+{
+  GtkClipboard *clipboard;
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard)
+    {
+      GtkSelectionData *data;
+      GdkAtom           atom = gdk_atom_intern_static_string ("TARGETS");
+
+      data = gtk_clipboard_wait_for_contents (clipboard, atom);
+
+      if (data)
+        {
+          GdkAtom  *targets;
+          gboolean  success;
+
+          success = gtk_selection_data_get_targets (data, &targets, n_targets);
+
+          gtk_selection_data_free (data);
+
+          if (success)
+            {
+              if (gimp->be_verbose)
+                {
+                  gint i;
+
+                  for (i = 0; i < *n_targets; i++)
+                    g_printerr ("clipboard: offered type: %s\n",
+                                gdk_atom_name (targets[i]));
+
+                  g_printerr ("\n");
+                }
+
+              return targets;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+static GdkAtom
+gimp_clipboard_wait_for_image (Gimp *gimp)
+{
+  GdkAtom *targets;
+  gint     n_targets;
+  GdkAtom  result = GDK_NONE;
+
+  targets = gimp_clipboard_wait_for_targets (gimp, &n_targets);
+
+  if (targets)
+    {
+      GdkAtom image_atom = gdk_atom_intern_static_string ("image/x-xcf");
+      gint    i;
+
+      for (i = 0; i < n_targets; i++)
+        {
+          if (targets[i] == image_atom)
+            {
+              result = image_atom;
+              break;
+            }
+        }
+
+      g_free (targets);
+    }
+
+  return result;
+}
+
+static GdkAtom
+gimp_clipboard_wait_for_buffer (Gimp *gimp)
+{
+  GimpClipboard *gimp_clip = gimp_clipboard_get (gimp);
+  GdkAtom       *targets;
+  gint           n_targets;
+  GdkAtom        result    = GDK_NONE;
+
+  targets = gimp_clipboard_wait_for_targets (gimp, &n_targets);
+
+  if (targets)
+    {
+      GSList *list;
+
+      for (list = gimp_clip->pixbuf_formats; list; list = g_slist_next (list))
+        {
+          GdkPixbufFormat  *format = list->data;
+          gchar           **mime_types;
+          gchar           **type;
+
+          if (gimp->be_verbose)
+            g_printerr ("clipboard: checking pixbuf format '%s'\n",
+                        gdk_pixbuf_format_get_name (format));
+
+          mime_types = gdk_pixbuf_format_get_mime_types (format);
+
+          for (type = mime_types; *type; type++)
+            {
+              gchar   *mime_type = *type;
+              GdkAtom  atom      = gdk_atom_intern (mime_type, FALSE);
+              gint     i;
+
+              if (gimp->be_verbose)
+                g_printerr ("  - checking mime type '%s'\n", mime_type);
+
+              for (i = 0; i < n_targets; i++)
+                {
+                  if (targets[i] == atom)
+                    {
+                      result = atom;
+                      break;
+                    }
+                }
+
+              if (result != GDK_NONE)
+                break;
+            }
+
+          g_strfreev (mime_types);
+
+          if (result != GDK_NONE)
+            break;
+        }
+
+      g_free (targets);
+    }
+
+  return result;
+}
+
+static GdkAtom
+gimp_clipboard_wait_for_svg (Gimp *gimp)
+{
+  GdkAtom *targets;
+  gint     n_targets;
+  GdkAtom  result = GDK_NONE;
+
+  targets = gimp_clipboard_wait_for_targets (gimp, &n_targets);
+
+  if (targets)
+    {
+      GdkAtom svg_atom     = gdk_atom_intern_static_string ("image/svg");
+      GdkAtom svg_xml_atom = gdk_atom_intern_static_string ("image/svg+xml");
+      gint    i;
+
+      for (i = 0; i < n_targets; i++)
+        {
+          if (targets[i] == svg_atom)
+            {
+              result = svg_atom;
+              break;
+            }
+          else if (targets[i] == svg_xml_atom)
+            {
+              result = svg_xml_atom;
+              break;
+            }
+        }
+
+      g_free (targets);
+    }
+
+  return result;
+}
+
+static GdkAtom
+gimp_clipboard_wait_for_curve (Gimp *gimp)
+{
+  GdkAtom *targets;
+  gint     n_targets;
+  GdkAtom  result = GDK_NONE;
+
+  targets = gimp_clipboard_wait_for_targets (gimp, &n_targets);
+
+  if (targets)
+    {
+      GdkAtom curve_atom = gdk_atom_intern_static_string ("application/x-gimp-curve");
+      gint    i;
+
+      for (i = 0; i < n_targets; i++)
+        {
+          if (targets[i] == curve_atom)
+            {
+              result = curve_atom;
+              break;
+            }
+        }
+
+      g_free (targets);
+    }
+
+  return result;
+}
+
+static void
+gimp_clipboard_send_image (GtkClipboard     *clipboard,
+                           GtkSelectionData *data,
+                           guint             info,
+                           Gimp             *gimp)
+{
+  GimpClipboard *gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_set_busy (gimp);
+
+  if (info == 0)
+    {
+      if (gimp->be_verbose)
+        g_printerr ("clipboard: sending image data as '%s'\n",
+                    gimp_clip->image_target_entries[info].target);
+
+      gimp_selection_data_set_xcf (data, gimp_clip->image);
+    }
+  else
+    {
+      GdkPixbuf *pixbuf;
+
+      gimp_pickable_flush (GIMP_PICKABLE (gimp_clip->image));
+
+      pixbuf = gimp_viewable_get_pixbuf (GIMP_VIEWABLE (gimp_clip->image),
+                                         gimp_get_user_context (gimp),
+                                         gimp_image_get_width (gimp_clip->image),
+                                         gimp_image_get_height (gimp_clip->image));
+
+      if (pixbuf)
+        {
+          gdouble res_x;
+          gdouble res_y;
+          gchar   str[16];
+
+          gimp_image_get_resolution (gimp_clip->image, &res_x, &res_y);
+
+          g_snprintf (str, sizeof (str), "%d", ROUND (res_x));
+          gdk_pixbuf_set_option (pixbuf, "x-dpi", str);
+
+          g_snprintf (str, sizeof (str), "%d", ROUND (res_y));
+          gdk_pixbuf_set_option (pixbuf, "y-dpi", str);
+
+          if (gimp->be_verbose)
+            g_printerr ("clipboard: sending image data as '%s'\n",
+                        gimp_clip->image_target_entries[info].target);
+
+          gtk_selection_data_set_pixbuf (data, pixbuf);
+        }
+      else
+        {
+          g_warning ("%s: gimp_viewable_get_pixbuf() failed", G_STRFUNC);
+        }
+    }
+
+  gimp_unset_busy (gimp);
+}
+
+static void
+gimp_clipboard_send_buffer (GtkClipboard     *clipboard,
+                            GtkSelectionData *data,
+                            guint             info,
+                            Gimp             *gimp)
+{
+  GimpClipboard *gimp_clip = gimp_clipboard_get (gimp);
+  GdkPixbuf     *pixbuf;
+
+  gimp_set_busy (gimp);
+
+  pixbuf = gimp_viewable_get_pixbuf (GIMP_VIEWABLE (gimp_clip->buffer),
+                                     gimp_get_user_context (gimp),
+                                     gimp_buffer_get_width (gimp_clip->buffer),
+                                     gimp_buffer_get_height (gimp_clip->buffer));
+
+  if (pixbuf)
+    {
+      gdouble res_x;
+      gdouble res_y;
+      gchar   str[16];
+
+      gimp_buffer_get_resolution (gimp_clip->buffer, &res_x, &res_y);
+
+      g_snprintf (str, sizeof (str), "%d", ROUND (res_x));
+      gdk_pixbuf_set_option (pixbuf, "x-dpi", str);
+
+      g_snprintf (str, sizeof (str), "%d", ROUND (res_y));
+      gdk_pixbuf_set_option (pixbuf, "y-dpi", str);
+
+      if (gimp->be_verbose)
+        g_printerr ("clipboard: sending pixbuf data as '%s'\n",
+                    gimp_clip->buffer_target_entries[info].target);
+
+      gtk_selection_data_set_pixbuf (data, pixbuf);
+    }
+  else
+    {
+      g_warning ("%s: gimp_viewable_get_pixbuf() failed", G_STRFUNC);
+    }
+
+  gimp_unset_busy (gimp);
+}
+
+static void
+gimp_clipboard_send_svg (GtkClipboard     *clipboard,
+                         GtkSelectionData *data,
+                         guint             info,
+                         Gimp             *gimp)
+{
+  GimpClipboard *gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_set_busy (gimp);
+
+  if (gimp_clip->svg)
+    {
+      if (gimp->be_verbose)
+        g_printerr ("clipboard: sending SVG data as '%s'\n",
+                    gimp_clip->svg_target_entries[info].target);
+
+      gimp_selection_data_set_stream (data,
+                                      (const guchar *) gimp_clip->svg,
+                                      strlen (gimp_clip->svg));
+    }
+
+  gimp_unset_busy (gimp);
+}
+
+static void
+gimp_clipboard_send_curve (GtkClipboard     *clipboard,
+                           GtkSelectionData *data,
+                           guint             info,
+                           Gimp             *gimp)
+{
+  GimpClipboard *gimp_clip = gimp_clipboard_get (gimp);
+
+  gimp_set_busy (gimp);
+
+  if (gimp_clip->curve)
+    {
+      if (gimp->be_verbose)
+        g_printerr ("clipboard: sending curve data as '%s'\n",
+                    gimp_clip->curve_target_entries[info].target);
+
+      gimp_selection_data_set_curve (data, gimp_clip->curve);
+    }
+
+  gimp_unset_busy (gimp);
+}
diff --git a/app/widgets/gimpclipboard.h b/app/widgets/gimpclipboard.h
new file mode 100644
index 0000000..13f60d3
--- /dev/null
+++ b/app/widgets/gimpclipboard.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CLIPBOARD_H__
+#define __GIMP_CLIPBOARD_H__
+
+
+void         gimp_clipboard_init       (Gimp        *gimp);
+void         gimp_clipboard_exit       (Gimp        *gimp);
+
+gboolean     gimp_clipboard_has_image  (Gimp        *gimp);
+gboolean     gimp_clipboard_has_buffer (Gimp        *gimp);
+gboolean     gimp_clipboard_has_svg    (Gimp        *gimp);
+gboolean     gimp_clipboard_has_curve  (Gimp        *gimp);
+
+GimpObject * gimp_clipboard_get_object (Gimp        *gimp);
+
+GimpImage  * gimp_clipboard_get_image  (Gimp        *gimp);
+GimpBuffer * gimp_clipboard_get_buffer (Gimp        *gimp);
+gchar      * gimp_clipboard_get_svg    (Gimp        *gimp,
+                                        gsize       *svg_length);
+GimpCurve  * gimp_clipboard_get_curve  (Gimp        *gimp);
+
+void         gimp_clipboard_set_image  (Gimp        *gimp,
+                                        GimpImage   *image);
+void         gimp_clipboard_set_buffer (Gimp        *gimp,
+                                        GimpBuffer  *buffer);
+void         gimp_clipboard_set_svg    (Gimp        *gimp,
+                                        const gchar *svg);
+void         gimp_clipboard_set_text   (Gimp        *gimp,
+                                        const gchar *text);
+void         gimp_clipboard_set_curve  (Gimp        *gimp,
+                                        GimpCurve   *curve);
+
+
+#endif /* __GIMP_CLIPBOARD_H__ */
diff --git a/app/widgets/gimpcolorbar.c b/app/widgets/gimpcolorbar.c
new file mode 100644
index 0000000..529cb18
--- /dev/null
+++ b/app/widgets/gimpcolorbar.c
@@ -0,0 +1,344 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "gimpcolorbar.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_COLOR,
+  PROP_CHANNEL
+};
+
+
+/*  local function prototypes  */
+
+static void      gimp_color_bar_set_property (GObject        *object,
+                                              guint           property_id,
+                                              const GValue   *value,
+                                              GParamSpec     *pspec);
+static void      gimp_color_bar_get_property (GObject        *object,
+                                              guint           property_id,
+                                              GValue         *value,
+                                              GParamSpec     *pspec);
+
+static gboolean  gimp_color_bar_expose       (GtkWidget      *widget,
+                                              GdkEventExpose *event);
+
+
+G_DEFINE_TYPE (GimpColorBar, gimp_color_bar, GTK_TYPE_EVENT_BOX)
+
+#define parent_class gimp_color_bar_parent_class
+
+
+static void
+gimp_color_bar_class_init (GimpColorBarClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpRGB         white        = { 1.0, 1.0, 1.0, 1.0 };
+
+  object_class->set_property = gimp_color_bar_set_property;
+  object_class->get_property = gimp_color_bar_get_property;
+
+  widget_class->expose_event = gimp_color_bar_expose;
+
+  g_object_class_install_property (object_class, PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation",
+                                                      NULL, NULL,
+                                                      GTK_TYPE_ORIENTATION,
+                                                      GTK_ORIENTATION_HORIZONTAL,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_COLOR,
+                                   gimp_param_spec_rgb ("color",
+                                                        NULL, NULL,
+                                                        FALSE, &white,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CHANNEL,
+                                   g_param_spec_enum ("histogram-channel",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                      GIMP_HISTOGRAM_VALUE,
+                                                      GIMP_PARAM_WRITABLE));
+}
+
+static void
+gimp_color_bar_init (GimpColorBar *bar)
+{
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (bar), FALSE);
+
+  bar->orientation = GTK_ORIENTATION_HORIZONTAL;
+}
+
+
+static void
+gimp_color_bar_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpColorBar *bar = GIMP_COLOR_BAR (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      bar->orientation = g_value_get_enum (value);
+      break;
+    case PROP_COLOR:
+      gimp_color_bar_set_color (bar, g_value_get_boxed (value));
+      break;
+    case PROP_CHANNEL:
+      gimp_color_bar_set_channel (bar, g_value_get_enum (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_bar_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpColorBar *bar = GIMP_COLOR_BAR (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, bar->orientation);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_color_bar_expose (GtkWidget      *widget,
+                       GdkEventExpose *event)
+{
+  GimpColorBar    *bar = GIMP_COLOR_BAR (widget);
+  cairo_t         *cr;
+  GtkAllocation    allocation;
+  cairo_surface_t *surface;
+  cairo_pattern_t *pattern;
+  guchar          *src;
+  guchar          *dest;
+  gint             x, y;
+  gint             width, height;
+  gint             i;
+
+  cr = gdk_cairo_create (event->window);
+
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  x = y = gtk_container_get_border_width (GTK_CONTAINER (bar));
+
+  width  = allocation.width  - 2 * x;
+  height = allocation.height - 2 * y;
+
+  if (width < 1 || height < 1)
+    return TRUE;
+
+  cairo_translate (cr, allocation.x + x, allocation.y + y);
+  cairo_rectangle (cr, 0, 0, width, height);
+  cairo_clip (cr);
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 256, 1);
+
+  for (i = 0, src = bar->buf, dest = cairo_image_surface_get_data (surface);
+       i < 256;
+       i++, src += 3, dest += 4)
+    {
+      GIMP_CAIRO_RGB24_SET_PIXEL(dest, src[0], src[1], src[2]);
+    }
+
+  cairo_surface_mark_dirty (surface);
+
+  pattern = cairo_pattern_create_for_surface (surface);
+  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REFLECT);
+  cairo_surface_destroy (surface);
+
+  if (bar->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      cairo_scale (cr, (gdouble) width / 256.0, 1.0);
+    }
+  else
+    {
+      cairo_translate (cr, 0, height);
+      cairo_scale (cr, 1.0, (gdouble) height / 256.0);
+      cairo_rotate (cr, - G_PI / 2);
+    }
+
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+
+  cairo_paint (cr);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_color_bar_new:
+ * @orientation: whether the bar should be oriented horizontally or
+ *               vertically
+ *
+ * Creates a new #GimpColorBar widget.
+ *
+ * Return value: The new #GimpColorBar widget.
+ **/
+GtkWidget *
+gimp_color_bar_new (GtkOrientation  orientation)
+{
+  return g_object_new (GIMP_TYPE_COLOR_BAR,
+                       "orientation", orientation,
+                       NULL);
+}
+
+/**
+ * gimp_color_bar_set_color:
+ * @bar:   a #GimpColorBar widget
+ * @color: a #GimpRGB color
+ *
+ * Makes the @bar display a gradient from black (on the left or the
+ * bottom), to the given @color (on the right or at the top).
+ **/
+void
+gimp_color_bar_set_color (GimpColorBar  *bar,
+                          const GimpRGB *color)
+{
+  guchar *buf;
+  gint    i;
+
+  g_return_if_fail (GIMP_IS_COLOR_BAR (bar));
+  g_return_if_fail (color != NULL);
+
+  for (i = 0, buf = bar->buf; i < 256; i++, buf += 3)
+    {
+      buf[0] = ROUND (color->r * (gdouble) i);
+      buf[1] = ROUND (color->g * (gdouble) i);
+      buf[2] = ROUND (color->b * (gdouble) i);
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (bar));
+}
+
+/**
+ * gimp_color_bar_set_channel:
+ * @bar:     a #GimpColorBar widget
+ * @channel: a #GimpHistogramChannel
+ *
+ * Convenience function that calls gimp_color_bar_set_color() with the
+ * color that matches the @channel.
+ **/
+void
+gimp_color_bar_set_channel (GimpColorBar         *bar,
+                            GimpHistogramChannel  channel)
+{
+  GimpRGB  color = { 1.0, 1.0, 1.0, 1.0 };
+
+  g_return_if_fail (GIMP_IS_COLOR_BAR (bar));
+
+  switch (channel)
+    {
+    case GIMP_HISTOGRAM_VALUE:
+    case GIMP_HISTOGRAM_LUMINANCE:
+    case GIMP_HISTOGRAM_ALPHA:
+    case GIMP_HISTOGRAM_RGB:
+      gimp_rgb_set (&color, 1.0, 1.0, 1.0);
+      break;
+    case GIMP_HISTOGRAM_RED:
+      gimp_rgb_set (&color, 1.0, 0.0, 0.0);
+      break;
+    case GIMP_HISTOGRAM_GREEN:
+      gimp_rgb_set (&color, 0.0, 1.0, 0.0);
+      break;
+    case GIMP_HISTOGRAM_BLUE:
+      gimp_rgb_set (&color, 0.0, 0.0, 1.0);
+      break;
+    }
+
+  gimp_color_bar_set_color (bar, &color);
+}
+
+/**
+ * gimp_color_bar_set_buffers:
+ * @bar:   a #GimpColorBar widget
+ * @red:   an array of 256 values
+ * @green: an array of 256 values
+ * @blue:  an array of 256 values
+ *
+ * This function gives full control over the colors displayed by the
+ * @bar widget. The 3 arrays can for example be taken from a #Levels
+ * or a #Curves struct.
+ **/
+void
+gimp_color_bar_set_buffers (GimpColorBar *bar,
+                            const guchar *red,
+                            const guchar *green,
+                            const guchar *blue)
+{
+  guchar *buf;
+  gint    i;
+
+  g_return_if_fail (GIMP_IS_COLOR_BAR (bar));
+  g_return_if_fail (red != NULL);
+  g_return_if_fail (green != NULL);
+  g_return_if_fail (blue != NULL);
+
+  for (i = 0, buf = bar->buf; i < 256; i++, buf += 3)
+    {
+      buf[0] = red[i];
+      buf[1] = green[i];
+      buf[2] = blue[i];
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (bar));
+}
diff --git a/app/widgets/gimpcolorbar.h b/app/widgets/gimpcolorbar.h
new file mode 100644
index 0000000..eb5e734
--- /dev/null
+++ b/app/widgets/gimpcolorbar.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_BAR_H__
+#define __GIMP_COLOR_BAR_H__
+
+
+#define GIMP_TYPE_COLOR_BAR            (gimp_color_bar_get_type ())
+#define GIMP_COLOR_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_BAR, GimpColorBar))
+#define GIMP_COLOR_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_BAR, GimpColorBarClass))
+#define GIMP_IS_COLOR_BAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_BAR))
+#define GIMP_IS_COLOR_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_BAR))
+#define GIMP_COLOR_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_BAR, GimpColorBarClass))
+
+
+typedef struct _GimpColorBarClass  GimpColorBarClass;
+
+struct _GimpColorBar
+{
+  GtkEventBox     parent_class;
+
+  GtkOrientation  orientation;
+  guchar          buf[3 * 256];
+};
+
+struct _GimpColorBarClass
+{
+  GtkEventBoxClass  parent_class;
+};
+
+
+GType       gimp_color_bar_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_bar_new         (GtkOrientation        orientation);
+
+void        gimp_color_bar_set_color   (GimpColorBar         *bar,
+                                        const GimpRGB        *color);
+void        gimp_color_bar_set_channel (GimpColorBar         *bar,
+                                        GimpHistogramChannel  channel);
+void        gimp_color_bar_set_buffers (GimpColorBar         *bar,
+                                        const guchar         *red,
+                                        const guchar         *green,
+                                        const guchar         *blue);
+
+
+#endif  /*  __GIMP_COLOR_BAR_H__  */
diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c
new file mode 100644
index 0000000..18c4ef5
--- /dev/null
+++ b/app/widgets/gimpcolordialog.c
@@ -0,0 +1,388 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * color_dialog module (C) 1998 Austin Donnelly <austin@greenend.org.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-palettes.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimppalettemru.h"
+
+#include "gimpcolordialog.h"
+#include "gimpcolorhistory.h"
+#include "gimpdialogfactory.h"
+#include "gimphelp-ids.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET   1
+#define COLOR_AREA_SIZE 20
+
+
+enum
+{
+  UPDATE,
+  LAST_SIGNAL
+};
+
+
+static void   gimp_color_dialog_constructed      (GObject            *object);
+
+static void   gimp_color_dialog_response         (GtkDialog          *dialog,
+                                                  gint                response_id);
+
+static void   gimp_color_dialog_help_func        (const gchar        *help_id,
+                                                  gpointer            help_data);
+static void   gimp_color_dialog_color_changed    (GimpColorSelection *selection,
+                                                  GimpColorDialog    *dialog);
+
+static void   gimp_color_history_add_clicked     (GtkWidget          *widget,
+                                                  GimpColorDialog    *dialog);
+
+static void   gimp_color_dialog_history_selected (GimpColorHistory   *history,
+                                                  const GimpRGB      *rgb,
+                                                  GimpColorDialog    *dialog);
+
+G_DEFINE_TYPE (GimpColorDialog, gimp_color_dialog, GIMP_TYPE_VIEWABLE_DIALOG)
+
+#define parent_class gimp_color_dialog_parent_class
+
+static guint color_dialog_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_color_dialog_class_init (GimpColorDialogClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+
+  object_class->constructed = gimp_color_dialog_constructed;
+
+  dialog_class->response    = gimp_color_dialog_response;
+
+  color_dialog_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpColorDialogClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__BOXED_ENUM,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_RGB,
+                  GIMP_TYPE_COLOR_DIALOG_STATE);
+}
+
+static void
+gimp_color_dialog_init (GimpColorDialog *dialog)
+{
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+
+                          _("_Reset"),  RESPONSE_RESET,
+                          _("_Cancel"), GTK_RESPONSE_CANCEL,
+                          _("_OK"),     GTK_RESPONSE_OK,
+
+                          NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  dialog->selection = gimp_color_selection_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->selection), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      dialog->selection, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->selection);
+
+  g_signal_connect (dialog->selection, "color-changed",
+                    G_CALLBACK (gimp_color_dialog_color_changed),
+                    dialog);
+}
+
+static void
+gimp_color_dialog_constructed (GObject *object)
+{
+  GimpColorDialog    *dialog          = GIMP_COLOR_DIALOG (object);
+  GimpViewableDialog *viewable_dialog = GIMP_VIEWABLE_DIALOG (object);
+  GtkWidget          *hbox;
+  GtkWidget          *history;
+  GtkWidget          *button;
+  GtkWidget          *arrow;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  /* Color history box. */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_end (GTK_BOX (GIMP_COLOR_SELECTION (dialog->selection)->right_vbox),
+                    hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /* Button for adding to color history. */
+  button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (button), FALSE, FALSE, 0);
+  gimp_help_set_help_data (button,
+                           _("Add the current color to the color history"),
+                           NULL);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_color_history_add_clicked),
+                    dialog);
+
+  arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (button), arrow);
+  gtk_widget_show (arrow);
+
+  /* Color history table. */
+  history = gimp_color_history_new (viewable_dialog->context, 12);
+  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (history), TRUE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (history));
+
+  g_signal_connect (history, "color-selected",
+                    G_CALLBACK (gimp_color_dialog_history_selected),
+                    dialog);
+}
+
+static void
+gimp_color_dialog_response (GtkDialog *gtk_dialog,
+                            gint       response_id)
+{
+  GimpColorDialog *dialog = GIMP_COLOR_DIALOG (gtk_dialog);
+  GimpRGB          color;
+
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gimp_color_selection_reset (GIMP_COLOR_SELECTION (dialog->selection));
+      break;
+
+    case GTK_RESPONSE_OK:
+      gimp_color_selection_get_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                      &color);
+
+      g_signal_emit (dialog, color_dialog_signals[UPDATE], 0,
+                     &color, GIMP_COLOR_DIALOG_OK);
+      break;
+
+    default:
+      gimp_color_selection_get_old_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                          &color);
+
+      g_signal_emit (dialog, color_dialog_signals[UPDATE], 0,
+                     &color, GIMP_COLOR_DIALOG_CANCEL);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_color_dialog_new (GimpViewable      *viewable,
+                       GimpContext       *context,
+                       const gchar       *title,
+                       const gchar       *icon_name,
+                       const gchar       *desc,
+                       GtkWidget         *parent,
+                       GimpDialogFactory *dialog_factory,
+                       const gchar       *dialog_identifier,
+                       const GimpRGB     *color,
+                       gboolean           wants_updates,
+                       gboolean           show_alpha)
+{
+  GimpColorDialog *dialog;
+  const gchar     *role;
+
+  g_return_val_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (dialog_factory == NULL ||
+                        GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
+  g_return_val_if_fail (dialog_factory == NULL || dialog_identifier != NULL,
+                        NULL);
+  g_return_val_if_fail (color != NULL, NULL);
+
+  role = dialog_identifier ? dialog_identifier : "gimp-color-selector";
+
+  dialog = g_object_new (GIMP_TYPE_COLOR_DIALOG,
+                         "title",       title,
+                         "role",        role,
+                         "help-func",   gimp_color_dialog_help_func,
+                         "help-id",     GIMP_HELP_COLOR_DIALOG,
+                         "icon-name",   icon_name,
+                         "description", desc,
+                         "context",     context,
+                         "parent",      parent,
+                         NULL);
+
+  if (viewable)
+    {
+      gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (dialog),
+                                         viewable, context);
+    }
+  else
+    {
+      GtkWidget *parent;
+
+      parent = gtk_widget_get_parent (GIMP_VIEWABLE_DIALOG (dialog)->icon);
+      parent = gtk_widget_get_parent (parent);
+
+      gtk_widget_hide (parent);
+    }
+
+  dialog->wants_updates = wants_updates;
+
+  if (dialog_factory)
+    {
+      gimp_dialog_factory_add_foreign (dialog_factory, dialog_identifier,
+                                       GTK_WIDGET (dialog),
+                                       gtk_widget_get_screen (parent),
+                                       gimp_widget_get_monitor (parent));
+    }
+
+  gimp_color_selection_set_show_alpha (GIMP_COLOR_SELECTION (dialog->selection),
+                                       show_alpha);
+
+  g_object_set_data (G_OBJECT (context->gimp->config->color_management),
+                     "gimp-context", context);
+
+  gimp_color_selection_set_config (GIMP_COLOR_SELECTION (dialog->selection),
+                                   context->gimp->config->color_management);
+
+  g_object_set_data (G_OBJECT (context->gimp->config->color_management),
+                     "gimp-context", NULL);
+
+  gimp_color_selection_set_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                  color);
+  gimp_color_selection_set_old_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                      color);
+
+  return GTK_WIDGET (dialog);
+}
+
+void
+gimp_color_dialog_set_color (GimpColorDialog *dialog,
+                             const GimpRGB   *color)
+{
+  g_return_if_fail (GIMP_IS_COLOR_DIALOG (dialog));
+  g_return_if_fail (color != NULL);
+
+  g_signal_handlers_block_by_func (dialog->selection,
+                                   gimp_color_dialog_color_changed,
+                                   dialog);
+
+  gimp_color_selection_set_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                  color);
+  gimp_color_selection_set_old_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                      color);
+
+  g_signal_handlers_unblock_by_func (dialog->selection,
+                                     gimp_color_dialog_color_changed,
+                                     dialog);
+}
+
+void
+gimp_color_dialog_get_color (GimpColorDialog *dialog,
+                             GimpRGB         *color)
+{
+  g_return_if_fail (GIMP_IS_COLOR_DIALOG (dialog));
+  g_return_if_fail (color != NULL);
+
+  gimp_color_selection_get_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                  color);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_color_dialog_help_func (const gchar *help_id,
+                             gpointer     help_data)
+{
+  GimpColorDialog   *dialog = GIMP_COLOR_DIALOG (help_data);
+  GimpColorNotebook *notebook;
+
+  notebook =
+    GIMP_COLOR_NOTEBOOK (GIMP_COLOR_SELECTION (dialog->selection)->notebook);
+
+  help_id = GIMP_COLOR_SELECTOR_GET_CLASS (notebook->cur_page)->help_id;
+
+  gimp_standard_help_func (help_id, NULL);
+}
+
+static void
+gimp_color_dialog_color_changed (GimpColorSelection *selection,
+                                 GimpColorDialog    *dialog)
+{
+  if (dialog->wants_updates)
+    {
+      GimpRGB color;
+
+      gimp_color_selection_get_color (selection, &color);
+
+      g_signal_emit (dialog, color_dialog_signals[UPDATE], 0,
+                     &color, GIMP_COLOR_DIALOG_UPDATE);
+    }
+}
+
+
+/* History-adding button callback */
+
+static void
+gimp_color_history_add_clicked (GtkWidget       *widget,
+                                GimpColorDialog *dialog)
+{
+  GimpViewableDialog *viewable_dialog = GIMP_VIEWABLE_DIALOG (dialog);
+  GimpPalette        *history;
+  GimpRGB             color;
+
+  history = gimp_palettes_get_color_history (viewable_dialog->context->gimp);
+
+  gimp_color_selection_get_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                  &color);
+
+  gimp_palette_mru_add (GIMP_PALETTE_MRU (history), &color);
+}
+
+/* Color history callback  */
+
+static void
+gimp_color_dialog_history_selected (GimpColorHistory *history,
+                                    const GimpRGB    *rgb,
+                                    GimpColorDialog  *dialog)
+{
+  gimp_color_selection_set_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                  rgb);
+}
diff --git a/app/widgets/gimpcolordialog.h b/app/widgets/gimpcolordialog.h
new file mode 100644
index 0000000..a60c010
--- /dev/null
+++ b/app/widgets/gimpcolordialog.h
@@ -0,0 +1,79 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolordialog.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_DIALOG_H__
+#define __GIMP_COLOR_DIALOG_H__
+
+
+#include "gimpviewabledialog.h"
+
+
+#define GIMP_COLOR_DIALOG_HISTORY_SIZE 12
+
+
+#define GIMP_TYPE_COLOR_DIALOG            (gimp_color_dialog_get_type ())
+#define GIMP_COLOR_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_DIALOG, GimpColorDialog))
+#define GIMP_COLOR_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_DIALOG, GimpColorDialogClass))
+#define GIMP_IS_COLOR_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_DIALOG))
+#define GIMP_IS_COLOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_DIALOG))
+#define GIMP_COLOR_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_DIALOG, GimpColorDialogClass))
+
+
+typedef struct _GimpColorDialogClass GimpColorDialogClass;
+
+struct _GimpColorDialog
+{
+  GimpViewableDialog   parent_instance;
+
+  gboolean             wants_updates;
+
+  GtkWidget           *selection;
+};
+
+struct _GimpColorDialogClass
+{
+  GimpViewableDialogClass  parent_class;
+
+  void (* update) (GimpColorDialog      *dialog,
+                   const GimpRGB        *color,
+                   GimpColorDialogState  state);
+};
+
+
+GType       gimp_color_dialog_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_dialog_new       (GimpViewable      *viewable,
+                                         GimpContext       *context,
+                                         const gchar       *title,
+                                         const gchar       *icon_name,
+                                         const gchar       *desc,
+                                         GtkWidget         *parent,
+                                         GimpDialogFactory *dialog_factory,
+                                         const gchar       *dialog_identifier,
+                                         const GimpRGB     *color,
+                                         gboolean           wants_update,
+                                         gboolean           show_alpha);
+
+void        gimp_color_dialog_set_color (GimpColorDialog   *dialog,
+                                         const GimpRGB     *color);
+void        gimp_color_dialog_get_color (GimpColorDialog   *dialog,
+                                         GimpRGB           *color);
+
+
+#endif /* __GIMP_COLOR_DIALOG_H__ */
diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c
new file mode 100644
index 0000000..4328604
--- /dev/null
+++ b/app/widgets/gimpcolordisplayeditor.c
@@ -0,0 +1,836 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolordisplayeditor.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "propgui/propgui-types.h"
+
+#include "core/gimp.h"
+
+#include "propgui/gimppropgui.h"
+
+#include "gimpcolordisplayeditor.h"
+#include "gimpeditor.h"
+
+#include "gimp-intl.h"
+
+
+#define LIST_WIDTH  200
+#define LIST_HEIGHT 100
+
+
+enum
+{
+  SRC_COLUMN_NAME,
+  SRC_COLUMN_ICON,
+  SRC_COLUMN_TYPE,
+  N_SRC_COLUMNS
+};
+
+enum
+{
+  DEST_COLUMN_ENABLED,
+  DEST_COLUMN_NAME,
+  DEST_COLUMN_ICON,
+  DEST_COLUMN_FILTER,
+  N_DEST_COLUMNS
+};
+
+
+static void   gimp_color_display_editor_dispose        (GObject               *object);
+
+static void   gimp_color_display_editor_add_clicked    (GtkWidget             *widget,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_remove_clicked (GtkWidget             *widget,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_up_clicked     (GtkWidget             *widget,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_down_clicked   (GtkWidget             *widget,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_reset_clicked  (GtkWidget             *widget,
+                                                        GimpColorDisplayEditor *editor);
+
+static void   gimp_color_display_editor_src_changed    (GtkTreeSelection       *sel,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_dest_changed   (GtkTreeSelection       *sel,
+                                                        GimpColorDisplayEditor *editor);
+
+static void   gimp_color_display_editor_added          (GimpColorDisplayStack  *stack,
+                                                        GimpColorDisplay       *display,
+                                                        gint                    position,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_removed        (GimpColorDisplayStack  *stack,
+                                                        GimpColorDisplay       *display,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_reordered      (GimpColorDisplayStack  *stack,
+                                                        GimpColorDisplay       *display,
+                                                        gint                    position,
+                                                        GimpColorDisplayEditor *editor);
+
+static void   gimp_color_display_editor_enabled        (GimpColorDisplay       *display,
+                                                        GParamSpec             *pspec,
+                                                        GimpColorDisplayEditor *editor);
+static void   gimp_color_display_editor_enable_toggled (GtkCellRendererToggle  *toggle,
+                                                        const gchar            *path,
+                                                        GimpColorDisplayEditor *editor);
+
+static void   gimp_color_display_editor_update_buttons (GimpColorDisplayEditor *editor);
+
+
+G_DEFINE_TYPE (GimpColorDisplayEditor, gimp_color_display_editor, GTK_TYPE_BOX)
+
+#define parent_class gimp_color_display_editor_parent_class
+
+
+static void
+gimp_color_display_editor_class_init (GimpColorDisplayEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_color_display_editor_dispose;
+}
+
+static void
+gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
+{
+  GtkWidget         *paned;
+  GtkWidget         *hbox;
+  GtkWidget         *ed;
+  GtkWidget         *scrolled_win;
+  GtkWidget         *tv;
+  GtkWidget         *vbox;
+  GtkWidget         *image;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer   *rend;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+  gtk_box_pack_start (GTK_BOX (editor), paned, TRUE, TRUE, 0);
+  gtk_widget_show (paned);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_paned_pack1 (GTK_PANED (paned), hbox, FALSE, FALSE);
+  gtk_widget_show (hbox);
+
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_win);
+
+  editor->src = gtk_list_store_new (N_SRC_COLUMNS,
+                                    G_TYPE_STRING,
+                                    G_TYPE_STRING,
+                                    G_TYPE_GTYPE);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (editor->src),
+                                        SRC_COLUMN_NAME, GTK_SORT_ASCENDING);
+  tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (editor->src));
+  g_object_unref (editor->src);
+
+  gtk_widget_set_size_request (tv, LIST_WIDTH, LIST_HEIGHT);
+  gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tv), FALSE);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Available Filters"));
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column);
+
+  rend = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, rend, FALSE);
+  gtk_tree_view_column_set_attributes (column, rend,
+                                       "icon-name", SRC_COLUMN_ICON,
+                                       NULL);
+
+  rend = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, rend, TRUE);
+  gtk_tree_view_column_set_attributes (column, rend,
+                                       "text", SRC_COLUMN_NAME,
+                                       NULL);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_win), tv);
+  gtk_widget_show (tv);
+
+  editor->src_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
+
+  g_signal_connect (editor->src_sel, "changed",
+                    G_CALLBACK (gimp_color_display_editor_src_changed),
+                    editor);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  editor->add_button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), editor->add_button, TRUE, FALSE, 0);
+  gtk_widget_set_sensitive (editor->add_button, FALSE);
+  gtk_widget_show (editor->add_button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
+                                        GTK_ICON_SIZE_BUTTON);
+  gtk_container_add (GTK_CONTAINER (editor->add_button), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (editor->add_button, "clicked",
+                    G_CALLBACK (gimp_color_display_editor_add_clicked),
+                    editor);
+
+  editor->remove_button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), editor->remove_button, TRUE, FALSE, 0);
+  gtk_widget_set_sensitive (editor->remove_button, FALSE);
+  gtk_widget_show (editor->remove_button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
+                                        GTK_ICON_SIZE_BUTTON);
+  gtk_container_add (GTK_CONTAINER (editor->remove_button), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (editor->remove_button, "clicked",
+                    G_CALLBACK (gimp_color_display_editor_remove_clicked),
+                    editor);
+
+  ed = gimp_editor_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), ed, TRUE, TRUE, 0);
+  gtk_widget_show (ed);
+
+  editor->up_button =
+    gimp_editor_add_button (GIMP_EDITOR (ed),
+                            GIMP_ICON_GO_UP,
+                            _("Move the selected filter up"),
+                            NULL,
+                            G_CALLBACK (gimp_color_display_editor_up_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  editor->down_button =
+    gimp_editor_add_button (GIMP_EDITOR (ed),
+                            GIMP_ICON_GO_DOWN,
+                            _("Move the selected filter down"),
+                            NULL,
+                            G_CALLBACK (gimp_color_display_editor_down_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  gtk_widget_set_sensitive (editor->up_button,   FALSE);
+  gtk_widget_set_sensitive (editor->down_button, FALSE);
+
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (ed), scrolled_win, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_win);
+
+  editor->dest = gtk_list_store_new (N_DEST_COLUMNS,
+                                     G_TYPE_BOOLEAN,
+                                     G_TYPE_STRING,
+                                     G_TYPE_STRING,
+                                     GIMP_TYPE_COLOR_DISPLAY);
+  tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (editor->dest));
+  g_object_unref (editor->dest);
+
+  gtk_widget_set_size_request (tv, LIST_WIDTH, LIST_HEIGHT);
+  gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tv), FALSE);
+
+  rend = gtk_cell_renderer_toggle_new ();
+
+  g_signal_connect (rend, "toggled",
+                    G_CALLBACK (gimp_color_display_editor_enable_toggled),
+                    editor);
+
+  column = gtk_tree_view_column_new_with_attributes (NULL, rend,
+                                                     "active",
+                                                     DEST_COLUMN_ENABLED,
+                                                     NULL);
+  gtk_tree_view_insert_column (GTK_TREE_VIEW (tv), column, 0);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_VISIBLE,
+                                        GTK_ICON_SIZE_MENU);
+  gtk_tree_view_column_set_widget (column, image);
+  gtk_widget_show (image);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Active Filters"));
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column);
+
+  rend = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, rend, FALSE);
+  gtk_tree_view_column_set_attributes (column, rend,
+                                       "icon-name", DEST_COLUMN_ICON,
+                                       NULL);
+
+  rend = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, rend, TRUE);
+  gtk_tree_view_column_set_attributes (column, rend,
+                                       "text", DEST_COLUMN_NAME,
+                                       NULL);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_win), tv);
+  gtk_widget_show (tv);
+
+  editor->dest_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
+
+  g_signal_connect (editor->dest_sel, "changed",
+                    G_CALLBACK (gimp_color_display_editor_dest_changed),
+                    editor);
+
+  /*  the config frame  */
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_paned_pack2 (GTK_PANED (paned), vbox, TRUE, FALSE);
+  gtk_widget_show (vbox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  editor->config_frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), editor->config_frame, TRUE, TRUE, 0);
+  gtk_widget_show (editor->config_frame);
+
+  editor->config_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (editor->config_frame), editor->config_box);
+  gtk_widget_show (editor->config_box);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_end (GTK_BOX (editor->config_box), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  editor->reset_button = gtk_button_new_with_mnemonic (_("_Reset"));
+  gtk_box_pack_end (GTK_BOX (hbox), editor->reset_button, FALSE, FALSE, 0);
+  gtk_widget_show (editor->reset_button);
+
+  gimp_help_set_help_data (editor->reset_button,
+                           _("Reset the selected filter to default values"),
+                           NULL);
+
+  g_signal_connect (editor->reset_button, "clicked",
+                    G_CALLBACK (gimp_color_display_editor_reset_clicked),
+                    editor);
+
+  gimp_color_display_editor_dest_changed (editor->dest_sel, editor);
+}
+
+static void
+gimp_color_display_editor_dispose (GObject *object)
+{
+  GimpColorDisplayEditor *editor = GIMP_COLOR_DISPLAY_EDITOR (object);
+
+  if (editor->selected)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (editor->selected),
+                                    (gpointer) &editor->selected);
+      editor->selected = NULL;
+    }
+
+  g_clear_object (&editor->stack);
+  g_clear_object (&editor->config);
+  g_clear_object (&editor->managed);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+GtkWidget *
+gimp_color_display_editor_new (Gimp                  *gimp,
+                               GimpColorDisplayStack *stack,
+                               GimpColorConfig       *config,
+                               GimpColorManaged      *managed)
+{
+  GimpColorDisplayEditor *editor;
+  GType                  *display_types;
+  guint                   n_display_types;
+  gint                    i;
+  GList                  *list;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_COLOR_DISPLAY_STACK (stack), NULL);
+  g_return_val_if_fail (GIMP_IS_COLOR_CONFIG (config), NULL);
+  g_return_val_if_fail (GIMP_IS_COLOR_MANAGED (managed), NULL);
+
+  editor = g_object_new (GIMP_TYPE_COLOR_DISPLAY_EDITOR, NULL);
+
+  editor->gimp    = gimp;
+  editor->stack   = g_object_ref (stack);
+  editor->config  = g_object_ref (config);
+  editor->managed = g_object_ref (managed);
+
+  display_types = g_type_children (GIMP_TYPE_COLOR_DISPLAY, &n_display_types);
+
+  for (i = 0; i < n_display_types; i++)
+    {
+      GimpColorDisplayClass *display_class;
+      GtkTreeIter            iter;
+
+      display_class = g_type_class_ref (display_types[i]);
+
+      gtk_list_store_append (editor->src, &iter);
+
+      gtk_list_store_set (editor->src, &iter,
+                          SRC_COLUMN_ICON, display_class->icon_name,
+                          SRC_COLUMN_NAME, display_class->name,
+                          SRC_COLUMN_TYPE, display_types[i],
+                          -1);
+
+      g_type_class_unref (display_class);
+    }
+
+  g_free (display_types);
+
+  for (list = stack->filters; list; list = g_list_next (list))
+    {
+      GimpColorDisplay *display = list->data;
+      GtkTreeIter       iter;
+      gboolean          enabled;
+      const gchar      *name;
+      const gchar      *icon_name;
+
+      enabled = gimp_color_display_get_enabled (display);
+
+      name      = GIMP_COLOR_DISPLAY_GET_CLASS (display)->name;
+      icon_name = GIMP_COLOR_DISPLAY_GET_CLASS (display)->icon_name;
+
+      gtk_list_store_append (editor->dest, &iter);
+
+      gtk_list_store_set (editor->dest, &iter,
+                          DEST_COLUMN_ENABLED, enabled,
+                          DEST_COLUMN_ICON,    icon_name,
+                          DEST_COLUMN_NAME,    name,
+                          DEST_COLUMN_FILTER,  display,
+                          -1);
+
+      g_signal_connect_object (display, "notify::enabled",
+                               G_CALLBACK (gimp_color_display_editor_enabled),
+                               G_OBJECT (editor), 0);
+    }
+
+  g_signal_connect_object (stack, "added",
+                           G_CALLBACK (gimp_color_display_editor_added),
+                           G_OBJECT (editor), 0);
+  g_signal_connect_object (stack, "removed",
+                           G_CALLBACK (gimp_color_display_editor_removed),
+                           G_OBJECT (editor), 0);
+  g_signal_connect_object (stack, "reordered",
+                           G_CALLBACK (gimp_color_display_editor_reordered),
+                           G_OBJECT (editor), 0);
+
+  return GTK_WIDGET (editor);
+}
+
+static void
+gimp_color_display_editor_add_clicked (GtkWidget              *widget,
+                                       GimpColorDisplayEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+
+  if (gtk_tree_selection_get_selected (editor->src_sel, &model, &iter))
+    {
+      GimpColorDisplay *display;
+      GType             type;
+
+      gtk_tree_model_get (model, &iter, SRC_COLUMN_TYPE, &type, -1);
+
+      display = g_object_new (type,
+                              "color-config",  editor->config,
+                              "color-managed", editor->managed,
+                              NULL);
+
+      if (display)
+        {
+          gimp_color_display_stack_add (editor->stack, display);
+          g_object_unref (display);
+        }
+    }
+}
+
+static void
+gimp_color_display_editor_remove_clicked (GtkWidget             *widget,
+                                          GimpColorDisplayEditor *editor)
+{
+  if (editor->selected)
+    gimp_color_display_stack_remove (editor->stack, editor->selected);
+}
+
+static void
+gimp_color_display_editor_up_clicked (GtkWidget             *widget,
+                                      GimpColorDisplayEditor *editor)
+{
+  if (editor->selected)
+    gimp_color_display_stack_reorder_up (editor->stack, editor->selected);
+}
+
+static void
+gimp_color_display_editor_down_clicked (GtkWidget             *widget,
+                                        GimpColorDisplayEditor *editor)
+{
+  if (editor->selected)
+    gimp_color_display_stack_reorder_down (editor->stack, editor->selected);
+}
+
+static void
+gimp_color_display_editor_reset_clicked (GtkWidget             *widget,
+                                         GimpColorDisplayEditor *editor)
+{
+  if (editor->selected)
+    gimp_color_display_configure_reset (editor->selected);
+}
+
+static void
+gimp_color_display_editor_src_changed (GtkTreeSelection       *sel,
+                                       GimpColorDisplayEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gchar        *tip  = NULL;
+  const gchar  *name = NULL;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      GValue val = G_VALUE_INIT;
+
+      gtk_tree_model_get_value (model, &iter, SRC_COLUMN_NAME, &val);
+
+      name = g_value_get_string (&val);
+
+      tip = g_strdup_printf (_("Add '%s' to the list of active filters"), name);
+
+      g_value_unset (&val);
+    }
+
+  gtk_widget_set_sensitive (editor->add_button, name != NULL);
+
+  gimp_help_set_help_data (editor->add_button, tip, NULL);
+  g_free (tip);
+}
+
+static void
+gimp_color_display_editor_dest_changed (GtkTreeSelection       *sel,
+                                        GimpColorDisplayEditor *editor)
+{
+  GtkTreeModel     *model;
+  GtkTreeIter       iter;
+  GimpColorDisplay *display = NULL;
+  gchar            *tip     = NULL;
+
+  if (editor->selected)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (editor->selected),
+                                    (gpointer) &editor->selected);
+      editor->selected = NULL;
+    }
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      GValue val = G_VALUE_INIT;
+
+      gtk_tree_model_get_value (model, &iter, DEST_COLUMN_FILTER, &val);
+
+      display = g_value_get_object (&val);
+
+      g_value_unset (&val);
+
+      tip = g_strdup_printf (_("Remove '%s' from the list of active filters"),
+                             GIMP_COLOR_DISPLAY_GET_CLASS (display)->name);
+    }
+
+  gimp_help_set_help_data (editor->remove_button, tip, NULL);
+  g_free (tip);
+
+  gtk_widget_set_sensitive (editor->remove_button, display != NULL);
+  gtk_widget_set_sensitive (editor->reset_button,  display != NULL);
+
+  if (editor->config_widget)
+    gtk_container_remove (GTK_CONTAINER (editor->config_box),
+                          editor->config_widget);
+
+  if (display)
+    {
+      editor->selected = display;
+
+      g_object_add_weak_pointer (G_OBJECT (display),
+                                 (gpointer) &editor->selected);
+
+      editor->config_widget = gimp_color_display_configure (display);
+
+      if (! editor->config_widget)
+        {
+          editor->config_widget =
+            gimp_prop_gui_new (G_OBJECT (display),
+                               G_TYPE_FROM_INSTANCE (display), 0,
+                               NULL,
+                               gimp_get_user_context (editor->gimp),
+                               NULL, NULL, NULL);
+        }
+
+      gtk_frame_set_label (GTK_FRAME (editor->config_frame),
+                           GIMP_COLOR_DISPLAY_GET_CLASS (display)->name);
+    }
+  else
+    {
+      editor->config_widget = NULL;
+
+      gtk_frame_set_label (GTK_FRAME (editor->config_frame),
+                           _("No filter selected"));
+    }
+
+  if (editor->config_widget)
+    {
+      gtk_box_pack_start (GTK_BOX (editor->config_box), editor->config_widget,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (editor->config_widget);
+
+      g_object_add_weak_pointer (G_OBJECT (editor->config_widget),
+                                 (gpointer) &editor->config_widget);
+    }
+
+  gimp_color_display_editor_update_buttons (editor);
+}
+
+static void
+gimp_color_display_editor_added (GimpColorDisplayStack  *stack,
+                                 GimpColorDisplay       *display,
+                                 gint                    position,
+                                 GimpColorDisplayEditor *editor)
+{
+  GtkTreeIter  iter;
+  gboolean     enabled;
+  const gchar *name;
+  const gchar *icon_name;
+
+  enabled = gimp_color_display_get_enabled (display);
+
+  name      = GIMP_COLOR_DISPLAY_GET_CLASS (display)->name;
+  icon_name = GIMP_COLOR_DISPLAY_GET_CLASS (display)->icon_name;
+
+  gtk_list_store_insert (editor->dest, &iter, position);
+
+  gtk_list_store_set (editor->dest, &iter,
+                      DEST_COLUMN_ENABLED, enabled,
+                      DEST_COLUMN_ICON,    icon_name,
+                      DEST_COLUMN_NAME,    name,
+                      DEST_COLUMN_FILTER,  display,
+                      -1);
+
+  g_signal_connect_object (display, "notify::enabled",
+                           G_CALLBACK (gimp_color_display_editor_enabled),
+                           G_OBJECT (editor), 0);
+
+  gimp_color_display_editor_update_buttons (editor);
+}
+
+static void
+gimp_color_display_editor_removed (GimpColorDisplayStack  *stack,
+                                   GimpColorDisplay       *display,
+                                   GimpColorDisplayEditor *editor)
+{
+  GtkTreeIter iter;
+  gboolean    iter_valid;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (editor->dest),
+                                                   &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (editor->dest),
+                                              &iter))
+    {
+      GimpColorDisplay *display2;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (editor->dest), &iter,
+                          DEST_COLUMN_FILTER, &display2,
+                          -1);
+
+      g_object_unref (display2);
+
+      if (display == display2)
+        {
+          g_signal_handlers_disconnect_by_func (display,
+                                                gimp_color_display_editor_enabled,
+                                                editor);
+
+          gtk_list_store_remove (editor->dest, &iter);
+
+          gimp_color_display_editor_update_buttons (editor);
+          break;
+        }
+    }
+}
+
+static void
+gimp_color_display_editor_reordered (GimpColorDisplayStack  *stack,
+                                     GimpColorDisplay       *display,
+                                     gint                    position,
+                                     GimpColorDisplayEditor *editor)
+{
+  GtkTreeIter iter;
+  gboolean    iter_valid;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (editor->dest),
+                                                   &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (editor->dest),
+                                              &iter))
+    {
+      GimpColorDisplay *display2;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (editor->dest), &iter,
+                          DEST_COLUMN_FILTER, &display2,
+                          -1);
+
+      g_object_unref (display2);
+
+      if (display == display2)
+        {
+          GtkTreePath *path;
+          gint         old_position;
+
+          path = gtk_tree_model_get_path (GTK_TREE_MODEL (editor->dest), &iter);
+          old_position = gtk_tree_path_get_indices (path)[0];
+          gtk_tree_path_free (path);
+
+          if (position == old_position)
+            return;
+
+          if (position == -1 || position == g_list_length (stack->filters) - 1)
+            {
+              gtk_list_store_move_before (editor->dest, &iter, NULL);
+            }
+          else if (position == 0)
+            {
+              gtk_list_store_move_after (editor->dest, &iter, NULL);
+            }
+          else
+            {
+              GtkTreeIter place_iter;
+
+              path = gtk_tree_path_new_from_indices (position, -1);
+              gtk_tree_model_get_iter (GTK_TREE_MODEL (editor->dest),
+                                       &place_iter, path);
+              gtk_tree_path_free (path);
+
+              if (position > old_position)
+                gtk_list_store_move_after (editor->dest, &iter, &place_iter);
+              else
+                gtk_list_store_move_before (editor->dest, &iter, &place_iter);
+            }
+
+          gimp_color_display_editor_update_buttons (editor);
+
+          return;
+        }
+    }
+}
+
+static void
+gimp_color_display_editor_enabled (GimpColorDisplay       *display,
+                                   GParamSpec             *pspec,
+                                   GimpColorDisplayEditor *editor)
+{
+  GtkTreeIter iter;
+  gboolean    iter_valid;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (editor->dest),
+                                                   &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (editor->dest),
+                                              &iter))
+    {
+      GimpColorDisplay *display2;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (editor->dest), &iter,
+                          DEST_COLUMN_FILTER,  &display2,
+                          -1);
+
+      g_object_unref (display2);
+
+      if (display == display2)
+        {
+          gboolean enabled = gimp_color_display_get_enabled (display);
+
+          gtk_list_store_set (editor->dest, &iter,
+                              DEST_COLUMN_ENABLED, enabled,
+                              -1);
+
+          break;
+        }
+    }
+}
+
+static void
+gimp_color_display_editor_enable_toggled (GtkCellRendererToggle  *toggle,
+                                          const gchar            *path_str,
+                                          GimpColorDisplayEditor *editor)
+{
+  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
+  GtkTreeIter  iter;
+
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (editor->dest), &iter, path))
+    {
+      GimpColorDisplay *display;
+      gboolean          enabled;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (editor->dest), &iter,
+                          DEST_COLUMN_FILTER,  &display,
+                          DEST_COLUMN_ENABLED, &enabled,
+                          -1);
+
+      gimp_color_display_set_enabled (display, ! enabled);
+
+      g_object_unref (display);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_color_display_editor_update_buttons (GimpColorDisplayEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gboolean      up_sensitive   = FALSE;
+  gboolean      down_sensitive = FALSE;
+
+  if (gtk_tree_selection_get_selected (editor->dest_sel, &model, &iter))
+    {
+      GtkTreePath *path    = gtk_tree_model_get_path (model, &iter);
+      gint        *indices = gtk_tree_path_get_indices (path);
+
+      up_sensitive   = indices[0] > 0;
+      down_sensitive = indices[0] < (g_list_length (editor->stack->filters) - 1);
+
+      gtk_tree_path_free (path);
+    }
+
+  gtk_widget_set_sensitive (editor->up_button,   up_sensitive);
+  gtk_widget_set_sensitive (editor->down_button, down_sensitive);
+}
diff --git a/app/widgets/gimpcolordisplayeditor.h b/app/widgets/gimpcolordisplayeditor.h
new file mode 100644
index 0000000..cd84fd9
--- /dev/null
+++ b/app/widgets/gimpcolordisplayeditor.h
@@ -0,0 +1,79 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolordisplayeditor.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_DISPLAY_EDITOR_H__
+#define __GIMP_COLOR_DISPLAY_EDITOR_H__
+
+
+#define GIMP_TYPE_COLOR_DISPLAY_EDITOR            (gimp_color_display_editor_get_type ())
+#define GIMP_COLOR_DISPLAY_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditor))
+#define GIMP_COLOR_DISPLAY_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditorClass))
+#define GIMP_IS_COLOR_DISPLAY_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_DISPLAY_EDITOR))
+#define GIMP_IS_COLOR_DISPLAY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_DISPLAY_EDITOR))
+#define GIMP_COLOR_DISPLAY_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditorClass))
+
+
+typedef struct _GimpColorDisplayEditorClass  GimpColorDisplayEditorClass;
+
+struct _GimpColorDisplayEditor
+{
+  GtkBox                 parent_instance;
+
+  Gimp                  *gimp;
+  GimpColorDisplayStack *stack;
+  GimpColorConfig       *config;
+  GimpColorManaged      *managed;
+
+  GtkListStore          *src;
+  GtkListStore          *dest;
+
+  GtkTreeSelection      *src_sel;
+  GtkTreeSelection      *dest_sel;
+
+  GimpColorDisplay      *selected;
+
+  GtkWidget             *add_button;
+
+  GtkWidget             *remove_button;
+  GtkWidget             *up_button;
+  GtkWidget             *down_button;
+
+  GtkWidget             *config_frame;
+  GtkWidget             *config_box;
+  GtkWidget             *config_widget;
+
+  GtkWidget             *reset_button;
+};
+
+struct _GimpColorDisplayEditorClass
+{
+  GtkBoxClass parent_class;
+};
+
+
+GType       gimp_color_display_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_display_editor_new      (Gimp                  *gimp,
+                                                GimpColorDisplayStack *stack,
+                                                GimpColorConfig       *config,
+                                                GimpColorManaged      *managed);
+
+
+#endif  /*  __GIMP_COLOR_DISPLAY_EDITOR_H__  */
diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c
new file mode 100644
index 0000000..cfcfec0
--- /dev/null
+++ b/app/widgets/gimpcoloreditor.c
@@ -0,0 +1,695 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcoloreditor.c
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "gimpcoloreditor.h"
+#include "gimpcolorhistory.h"
+#include "gimpdocked.h"
+#include "gimpfgbgeditor.h"
+#include "gimpfgbgview.h"
+#include "gimpsessioninfo-aux.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT
+};
+
+
+static void   gimp_color_editor_docked_iface_init (GimpDockedInterface  *iface);
+
+static void   gimp_color_editor_constructed     (GObject           *object);
+static void   gimp_color_editor_dispose         (GObject           *object);
+static void   gimp_color_editor_set_property    (GObject           *object,
+                                                 guint              property_id,
+                                                 const GValue      *value,
+                                                 GParamSpec        *pspec);
+static void   gimp_color_editor_get_property    (GObject           *object,
+                                                 guint              property_id,
+                                                 GValue            *value,
+                                                 GParamSpec        *pspec);
+
+static void   gimp_color_editor_style_set       (GtkWidget         *widget,
+                                                 GtkStyle          *prev_style);
+
+static void   gimp_color_editor_set_aux_info    (GimpDocked        *docked,
+                                                 GList             *aux_info);
+static GList *gimp_color_editor_get_aux_info     (GimpDocked       *docked);
+static GtkWidget *gimp_color_editor_get_preview (GimpDocked        *docked,
+                                                 GimpContext       *context,
+                                                 GtkIconSize        size);
+static void   gimp_color_editor_set_context     (GimpDocked        *docked,
+                                                 GimpContext       *context);
+
+static void   gimp_color_editor_fg_changed      (GimpContext       *context,
+                                                 const GimpRGB     *rgb,
+                                                 GimpColorEditor   *editor);
+static void   gimp_color_editor_bg_changed      (GimpContext       *context,
+                                                 const GimpRGB     *rgb,
+                                                 GimpColorEditor   *editor);
+static void   gimp_color_editor_color_changed   (GimpColorSelector *selector,
+                                                 const GimpRGB     *rgb,
+                                                 const GimpHSV     *hsv,
+                                                 GimpColorEditor   *editor);
+static void   gimp_color_editor_tab_toggled     (GtkWidget         *widget,
+                                                 GimpColorEditor   *editor);
+static void   gimp_color_editor_fg_bg_notify    (GtkWidget         *widget,
+                                                 GParamSpec        *pspec,
+                                                 GimpColorEditor   *editor);
+static void   gimp_color_editor_color_picked    (GtkWidget         *widget,
+                                                 const GimpRGB     *rgb,
+                                                 GimpColorEditor   *editor);
+static void   gimp_color_editor_entry_changed   (GimpColorHexEntry *entry,
+                                                 GimpColorEditor   *editor);
+
+static void  gimp_color_editor_history_selected (GimpColorHistory *history,
+                                                 const GimpRGB    *rgb,
+                                                 GimpColorEditor  *editor);
+
+G_DEFINE_TYPE_WITH_CODE (GimpColorEditor, gimp_color_editor, GIMP_TYPE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_color_editor_docked_iface_init))
+
+#define parent_class gimp_color_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_color_editor_class_init (GimpColorEditorClass* klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed  = gimp_color_editor_constructed;
+  object_class->dispose      = gimp_color_editor_dispose;
+  object_class->set_property = gimp_color_editor_set_property;
+  object_class->get_property = gimp_color_editor_get_property;
+
+  widget_class->style_set    = gimp_color_editor_style_set;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        G_PARAM_CONSTRUCT |
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_color_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->get_preview  = gimp_color_editor_get_preview;
+  iface->set_aux_info = gimp_color_editor_set_aux_info;
+  iface->get_aux_info = gimp_color_editor_get_aux_info;
+  iface->set_context  = gimp_color_editor_set_context;
+}
+
+static void
+gimp_color_editor_init (GimpColorEditor *editor)
+{
+  GtkWidget   *notebook;
+  GtkWidget   *hbox;
+  GtkWidget   *button;
+  gint         content_spacing;
+  gint         button_spacing;
+  GtkIconSize  button_icon_size;
+  GimpRGB      rgb;
+  GimpHSV      hsv;
+  GList       *list;
+  GSList      *group;
+
+  editor->context = NULL;
+  editor->edit_bg = FALSE;
+
+  gimp_rgba_set (&rgb, 0.0, 0.0, 0.0, 1.0);
+  gimp_rgb_to_hsv (&rgb, &hsv);
+
+  gtk_widget_style_get (GTK_WIDGET (editor),
+                        "content-spacing",  &content_spacing,
+                        "button-spacing",   &button_spacing,
+                        "button-icon-size", &button_icon_size,
+                        NULL);
+
+  editor->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, button_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (editor->hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (editor), editor->hbox, FALSE, FALSE, 0);
+  gtk_widget_show (editor->hbox);
+
+  editor->notebook = gimp_color_selector_new (GIMP_TYPE_COLOR_NOTEBOOK,
+                                              &rgb, &hsv,
+                                              GIMP_COLOR_SELECTOR_RED);
+  gimp_color_selector_set_show_alpha (GIMP_COLOR_SELECTOR (editor->notebook),
+                                      FALSE);
+  gtk_box_pack_start (GTK_BOX (editor), editor->notebook,
+                      TRUE, TRUE, content_spacing);
+  gtk_widget_show (editor->notebook);
+
+  g_signal_connect (editor->notebook, "color-changed",
+                    G_CALLBACK (gimp_color_editor_color_changed),
+                    editor);
+
+  notebook = GIMP_COLOR_NOTEBOOK (editor->notebook)->notebook;
+
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
+
+  gimp_color_notebook_set_has_page (GIMP_COLOR_NOTEBOOK (editor->notebook),
+                                    GIMP_TYPE_COLOR_SCALES, TRUE);
+
+  group = NULL;
+
+  for (list = GIMP_COLOR_NOTEBOOK (editor->notebook)->selectors;
+       list;
+       list = g_list_next (list))
+    {
+      GimpColorSelector      *selector;
+      GimpColorSelectorClass *selector_class;
+      GtkWidget              *button;
+      GtkWidget              *image;
+
+      selector       = GIMP_COLOR_SELECTOR (list->data);
+      selector_class = GIMP_COLOR_SELECTOR_GET_CLASS (selector);
+
+      button = gtk_radio_button_new (group);
+      group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+      gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
+      gtk_box_pack_start (GTK_BOX (editor->hbox), button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
+      image = gtk_image_new_from_icon_name (selector_class->icon_name,
+                                            GTK_ICON_SIZE_BUTTON);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+
+      gimp_help_set_help_data (button,
+                               selector_class->name, selector_class->help_id);
+
+      g_object_set_data (G_OBJECT (button),   "selector", selector);
+      g_object_set_data (G_OBJECT (selector), "button",   button);
+
+      g_signal_connect (button, "toggled",
+                        G_CALLBACK (gimp_color_editor_tab_toggled),
+                        editor);
+    }
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
+  gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /*  FG/BG editor  */
+  editor->fg_bg = gimp_fg_bg_editor_new (NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), editor->fg_bg, TRUE, TRUE, 0);
+  gtk_widget_show (editor->fg_bg);
+
+  g_signal_connect (editor->fg_bg, "notify::active-color",
+                    G_CALLBACK (gimp_color_editor_fg_bg_notify),
+                    editor);
+
+  /*  The color picker  */
+  button = gimp_pick_button_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "color-picked",
+                    G_CALLBACK (gimp_color_editor_color_picked),
+                    editor);
+
+  /*  The hex triplet entry  */
+  editor->hex_entry = gimp_color_hex_entry_new ();
+  gtk_box_pack_end (GTK_BOX (hbox), editor->hex_entry, TRUE, TRUE, 0);
+  gtk_widget_show (editor->hex_entry);
+
+  g_signal_connect (editor->hex_entry, "color-changed",
+                    G_CALLBACK (gimp_color_editor_entry_changed),
+                    editor);
+}
+
+static void
+gimp_color_editor_constructed (GObject *object)
+{
+  GimpColorEditor *editor = GIMP_COLOR_EDITOR (object);
+  GtkWidget       *history;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  /* The color history */
+  history = gimp_color_history_new (editor->context, 12);
+  gtk_box_pack_end (GTK_BOX (editor), history, FALSE, FALSE, 0);
+  gtk_widget_show (history);
+
+  g_signal_connect (history, "color-selected",
+                    G_CALLBACK (gimp_color_editor_history_selected),
+                    editor);
+}
+
+static void
+gimp_color_editor_dispose (GObject *object)
+{
+  GimpColorEditor *editor = GIMP_COLOR_EDITOR (object);
+
+  if (editor->context)
+    gimp_docked_set_context (GIMP_DOCKED (editor), NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_color_editor_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      gimp_docked_set_context (GIMP_DOCKED (object),
+                               g_value_get_object (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_editor_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpColorEditor *editor = GIMP_COLOR_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, editor->context);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GtkWidget *
+gimp_color_editor_get_preview (GimpDocked  *docked,
+                               GimpContext *context,
+                               GtkIconSize  size)
+{
+  GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (docked));
+  GtkWidget   *preview;
+  gint         width;
+  gint         height;
+
+  preview = gimp_fg_bg_view_new (context);
+
+  if (gtk_icon_size_lookup_for_settings (settings, size, &width, &height))
+    gtk_widget_set_size_request (preview, width, height);
+
+  return preview;
+}
+
+#define AUX_INFO_CURRENT_PAGE "current-page"
+
+static void
+gimp_color_editor_set_aux_info (GimpDocked *docked,
+                                GList      *aux_info)
+{
+  GimpColorEditor *editor   = GIMP_COLOR_EDITOR (docked);
+  GtkWidget       *notebook = GIMP_COLOR_NOTEBOOK (editor->notebook)->notebook;
+  GList           *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (! strcmp (aux->name, AUX_INFO_CURRENT_PAGE))
+        {
+          GList *children;
+          GList *child;
+
+          children = gtk_container_get_children (GTK_CONTAINER (notebook));
+
+          for (child = children; child; child = g_list_next (child))
+            {
+              if (! strcmp (G_OBJECT_TYPE_NAME (child->data), aux->value))
+                {
+                  GtkWidget *button;
+
+                  button = g_object_get_data (G_OBJECT (child->data), "button");
+
+                  if (button)
+                    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                                  TRUE);
+
+                  break;
+                }
+            }
+
+          g_list_free (children);
+        }
+    }
+}
+
+static GList *
+gimp_color_editor_get_aux_info (GimpDocked *docked)
+{
+  GimpColorEditor    *editor   = GIMP_COLOR_EDITOR (docked);
+  GimpColorNotebook  *notebook = GIMP_COLOR_NOTEBOOK (editor->notebook);
+  GList              *aux_info;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  if (notebook->cur_page)
+    {
+      GimpSessionInfoAux *aux;
+
+      aux = gimp_session_info_aux_new (AUX_INFO_CURRENT_PAGE,
+                                       G_OBJECT_TYPE_NAME (notebook->cur_page));
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
+
+static void
+gimp_color_editor_set_context (GimpDocked  *docked,
+                               GimpContext *context)
+{
+  GimpColorEditor *editor = GIMP_COLOR_EDITOR (docked);
+
+  if (context == editor->context)
+    return;
+
+  if (editor->context)
+    {
+      g_signal_handlers_disconnect_by_func (editor->context,
+                                            gimp_color_editor_fg_changed,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->context,
+                                            gimp_color_editor_bg_changed,
+                                            editor);
+
+      g_object_unref (editor->context);
+    }
+
+  editor->context = context;
+
+  if (editor->context)
+    {
+      GimpRGB rgb;
+
+      g_object_ref (editor->context);
+
+      g_signal_connect (editor->context, "foreground-changed",
+                        G_CALLBACK (gimp_color_editor_fg_changed),
+                        editor);
+      g_signal_connect (editor->context, "background-changed",
+                        G_CALLBACK (gimp_color_editor_bg_changed),
+                        editor);
+
+      if (editor->edit_bg)
+        {
+          gimp_context_get_background (editor->context, &rgb);
+          gimp_color_editor_bg_changed (editor->context, &rgb, editor);
+        }
+      else
+        {
+          gimp_context_get_foreground (editor->context, &rgb);
+          gimp_color_editor_fg_changed (editor->context, &rgb, editor);
+        }
+
+      g_object_set_data (G_OBJECT (context->gimp->config->color_management),
+                         "gimp-context", editor->context);
+
+      gimp_color_selector_set_config (GIMP_COLOR_SELECTOR (editor->notebook),
+                                      context->gimp->config->color_management);
+
+      g_object_set_data (G_OBJECT (context->gimp->config->color_management),
+                         "gimp-context", NULL);
+    }
+
+  gimp_fg_bg_editor_set_context (GIMP_FG_BG_EDITOR (editor->fg_bg), context);
+}
+
+GtkWidget *
+gimp_color_editor_new (GimpContext *context)
+{
+  return g_object_new (GIMP_TYPE_COLOR_EDITOR,
+                       "context", context,
+                       NULL);
+}
+
+static void
+gimp_color_editor_style_set (GtkWidget *widget,
+                             GtkStyle  *prev_style)
+{
+  GimpColorEditor *editor = GIMP_COLOR_EDITOR (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  if (editor->hbox)
+    gimp_editor_set_box_style (GIMP_EDITOR (editor), GTK_BOX (editor->hbox));
+}
+
+
+static void
+gimp_color_editor_set_color (GimpColorEditor *editor,
+                             const GimpRGB   *rgb)
+{
+  GimpHSV hsv;
+
+  gimp_rgb_to_hsv (rgb, &hsv);
+
+  g_signal_handlers_block_by_func (editor->notebook,
+                                   gimp_color_editor_color_changed,
+                                   editor);
+
+  gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (editor->notebook),
+                                 rgb, &hsv);
+
+  g_signal_handlers_unblock_by_func (editor->notebook,
+                                     gimp_color_editor_color_changed,
+                                     editor);
+
+  g_signal_handlers_block_by_func (editor->hex_entry,
+                                   gimp_color_editor_entry_changed,
+                                   editor);
+
+  gimp_color_hex_entry_set_color (GIMP_COLOR_HEX_ENTRY (editor->hex_entry),
+                                  rgb);
+
+  g_signal_handlers_unblock_by_func (editor->hex_entry,
+                                     gimp_color_editor_entry_changed,
+                                     editor);
+}
+
+static void
+gimp_color_editor_fg_changed (GimpContext     *context,
+                              const GimpRGB   *rgb,
+                              GimpColorEditor *editor)
+{
+  if (! editor->edit_bg)
+    gimp_color_editor_set_color (editor, rgb);
+}
+
+static void
+gimp_color_editor_bg_changed (GimpContext     *context,
+                              const GimpRGB   *rgb,
+                              GimpColorEditor *editor)
+{
+  if (editor->edit_bg)
+    gimp_color_editor_set_color (editor, rgb);
+}
+
+static void
+gimp_color_editor_color_changed (GimpColorSelector *selector,
+                                 const GimpRGB     *rgb,
+                                 const GimpHSV     *hsv,
+                                 GimpColorEditor   *editor)
+{
+  if (editor->context)
+    {
+      if (editor->edit_bg)
+        {
+          g_signal_handlers_block_by_func (editor->context,
+                                           gimp_color_editor_bg_changed,
+                                           editor);
+
+          gimp_context_set_background (editor->context, rgb);
+
+          g_signal_handlers_unblock_by_func (editor->context,
+                                             gimp_color_editor_bg_changed,
+                                             editor);
+        }
+      else
+        {
+          g_signal_handlers_block_by_func (editor->context,
+                                           gimp_color_editor_fg_changed,
+                                           editor);
+
+          gimp_context_set_foreground (editor->context, rgb);
+
+          g_signal_handlers_unblock_by_func (editor->context,
+                                             gimp_color_editor_fg_changed,
+                                             editor);
+        }
+    }
+
+  g_signal_handlers_block_by_func (editor->hex_entry,
+                                   gimp_color_editor_entry_changed,
+                                   editor);
+
+  gimp_color_hex_entry_set_color (GIMP_COLOR_HEX_ENTRY (editor->hex_entry),
+                                  rgb);
+
+  g_signal_handlers_unblock_by_func (editor->hex_entry,
+                                     gimp_color_editor_entry_changed,
+                                     editor);
+}
+
+static void
+gimp_color_editor_tab_toggled (GtkWidget       *widget,
+                               GimpColorEditor *editor)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GtkWidget *selector;
+
+      selector = g_object_get_data (G_OBJECT (widget), "selector");
+
+      if (selector)
+        {
+          GtkWidget *notebook;
+          gint       page_num;
+
+          notebook = GIMP_COLOR_NOTEBOOK (editor->notebook)->notebook;
+
+          page_num = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), selector);
+
+          if (page_num >= 0)
+            gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page_num);
+        }
+    }
+}
+
+static void
+gimp_color_editor_fg_bg_notify (GtkWidget       *widget,
+                                GParamSpec      *pspec,
+                                GimpColorEditor *editor)
+{
+  gboolean edit_bg;
+
+  edit_bg = (GIMP_FG_BG_EDITOR (widget)->active_color ==
+             GIMP_ACTIVE_COLOR_BACKGROUND);
+
+  if (edit_bg != editor->edit_bg)
+    {
+      editor->edit_bg = edit_bg;
+
+      if (editor->context)
+        {
+          GimpRGB rgb;
+
+          if (edit_bg)
+            {
+              gimp_context_get_background (editor->context, &rgb);
+              gimp_color_editor_bg_changed (editor->context, &rgb, editor);
+            }
+          else
+            {
+              gimp_context_get_foreground (editor->context, &rgb);
+              gimp_color_editor_fg_changed (editor->context, &rgb, editor);
+            }
+        }
+    }
+}
+
+static void
+gimp_color_editor_color_picked (GtkWidget       *widget,
+                                const GimpRGB   *rgb,
+                                GimpColorEditor *editor)
+{
+  if (editor->context)
+    {
+      if (editor->edit_bg)
+        gimp_context_set_background (editor->context, rgb);
+      else
+        gimp_context_set_foreground (editor->context, rgb);
+    }
+}
+
+static void
+gimp_color_editor_entry_changed (GimpColorHexEntry *entry,
+                                 GimpColorEditor   *editor)
+{
+  GimpRGB  rgb;
+
+  gimp_color_hex_entry_get_color (entry, &rgb);
+
+  if (editor->context)
+    {
+      if (editor->edit_bg)
+        gimp_context_set_background (editor->context, &rgb);
+      else
+        gimp_context_set_foreground (editor->context, &rgb);
+    }
+}
+
+static void
+gimp_color_editor_history_selected (GimpColorHistory *history,
+                                    const GimpRGB    *rgb,
+                                    GimpColorEditor  *editor)
+{
+  if (editor->context)
+    {
+      if (editor->edit_bg)
+        gimp_context_set_background (editor->context, rgb);
+      else
+        gimp_context_set_foreground (editor->context, rgb);
+    }
+}
diff --git a/app/widgets/gimpcoloreditor.h b/app/widgets/gimpcoloreditor.h
new file mode 100644
index 0000000..ec37cfc
--- /dev/null
+++ b/app/widgets/gimpcoloreditor.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcoloreditor.h
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_EDITOR_H__
+#define __GIMP_COLOR_EDITOR_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_COLOR_EDITOR            (gimp_color_editor_get_type ())
+#define GIMP_COLOR_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_EDITOR, GimpColorEditor))
+#define GIMP_COLOR_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_EDITOR, GimpColorEditorClass))
+#define GIMP_IS_COLOR_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_EDITOR))
+#define GIMP_IS_COLOR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_EDITOR))
+#define GIMP_COLOR_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_EDITOR, GimpColorEditorClass))
+
+
+typedef struct _GimpColorEditorClass GimpColorEditorClass;
+
+struct _GimpColorEditor
+{
+  GimpEditor   parent_instance;
+
+  GimpContext *context;
+  gboolean     edit_bg;
+
+  GtkWidget   *hbox;
+  GtkWidget   *notebook;
+  GtkWidget   *fg_bg;
+  GtkWidget   *hex_entry;
+};
+
+struct _GimpColorEditorClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType       gimp_color_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_editor_new      (GimpContext *context);
+
+
+#endif /* __GIMP_COLOR_EDITOR_H__ */
diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c
new file mode 100644
index 0000000..8a51bf2
--- /dev/null
+++ b/app/widgets/gimpcolorframe.c
@@ -0,0 +1,1127 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimpimage.h"
+
+#include "gimpcolorframe.h"
+
+#include "gimp-intl.h"
+
+
+#define RGBA_EPSILON 1e-6
+
+enum
+{
+  PROP_0,
+  PROP_MODE,
+  PROP_HAS_NUMBER,
+  PROP_NUMBER,
+  PROP_HAS_COLOR_AREA,
+  PROP_HAS_COORDS,
+  PROP_ELLIPSIZE,
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_color_frame_dispose           (GObject        *object);
+static void       gimp_color_frame_finalize          (GObject        *object);
+static void       gimp_color_frame_get_property      (GObject        *object,
+                                                      guint           property_id,
+                                                      GValue         *value,
+                                                      GParamSpec     *pspec);
+static void       gimp_color_frame_set_property      (GObject        *object,
+                                                      guint           property_id,
+                                                      const GValue   *value,
+                                                      GParamSpec     *pspec);
+
+static void       gimp_color_frame_style_set         (GtkWidget      *widget,
+                                                      GtkStyle       *prev_style);
+static gboolean   gimp_color_frame_expose            (GtkWidget      *widget,
+                                                      GdkEventExpose *eevent);
+
+static void       gimp_color_frame_combo_callback    (GtkWidget      *widget,
+                                                      GimpColorFrame *frame);
+static void       gimp_color_frame_update            (GimpColorFrame *frame);
+
+static void       gimp_color_frame_create_transform  (GimpColorFrame *frame);
+static void       gimp_color_frame_destroy_transform (GimpColorFrame *frame);
+
+
+G_DEFINE_TYPE (GimpColorFrame, gimp_color_frame, GIMP_TYPE_FRAME)
+
+#define parent_class gimp_color_frame_parent_class
+
+
+static void
+gimp_color_frame_class_init (GimpColorFrameClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose      = gimp_color_frame_dispose;
+  object_class->finalize     = gimp_color_frame_finalize;
+  object_class->get_property = gimp_color_frame_get_property;
+  object_class->set_property = gimp_color_frame_set_property;
+
+  widget_class->style_set    = gimp_color_frame_style_set;
+  widget_class->expose_event = gimp_color_frame_expose;
+
+  g_object_class_install_property (object_class, PROP_MODE,
+                                   g_param_spec_enum ("mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_COLOR_PICK_MODE,
+                                                      GIMP_COLOR_PICK_MODE_PIXEL,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HAS_NUMBER,
+                                   g_param_spec_boolean ("has-number",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_NUMBER,
+                                   g_param_spec_int ("number",
+                                                     NULL, NULL,
+                                                     0, 256, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HAS_COLOR_AREA,
+                                   g_param_spec_boolean ("has-color-area",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_HAS_COORDS,
+                                   g_param_spec_boolean ("has-coords",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ELLIPSIZE,
+                                   g_param_spec_enum ("ellipsize",
+                                                      NULL, NULL,
+                                                      PANGO_TYPE_ELLIPSIZE_MODE,
+                                                      PANGO_ELLIPSIZE_NONE,
+                                                      GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_color_frame_init (GimpColorFrame *frame)
+{
+  GtkListStore *store;
+  GtkWidget    *vbox;
+  GtkWidget    *vbox2;
+  GtkWidget    *label;
+  gint          i;
+
+  frame->sample_valid  = FALSE;
+  frame->sample_format = babl_format ("R'G'B' u8");
+
+  gimp_rgba_set (&frame->color, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+
+  /* create the store manually so the values have a nice order */
+  store = gimp_enum_store_new_with_values (GIMP_TYPE_COLOR_PICK_MODE,
+                                           GIMP_COLOR_PICK_MODE_LAST + 1,
+                                           GIMP_COLOR_PICK_MODE_PIXEL,
+                                           GIMP_COLOR_PICK_MODE_RGB_PERCENT,
+                                           GIMP_COLOR_PICK_MODE_RGB_U8,
+                                           GIMP_COLOR_PICK_MODE_HSV,
+                                           GIMP_COLOR_PICK_MODE_LCH,
+                                           GIMP_COLOR_PICK_MODE_LAB,
+                                           GIMP_COLOR_PICK_MODE_XYY,
+                                           GIMP_COLOR_PICK_MODE_YUV,
+                                           GIMP_COLOR_PICK_MODE_CMYK);
+  frame->combo = gimp_enum_combo_box_new_with_model (GIMP_ENUM_STORE (store));
+  g_object_unref (store);
+
+  gtk_frame_set_label_widget (GTK_FRAME (frame), frame->combo);
+  gtk_widget_show (frame->combo);
+
+  g_signal_connect (frame->combo, "changed",
+                    G_CALLBACK (gimp_color_frame_combo_callback),
+                    frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  frame->color_area =
+    g_object_new (GIMP_TYPE_COLOR_AREA,
+                  "color",          &frame->color,
+                  "type",           GIMP_COLOR_AREA_SMALL_CHECKS,
+                  "drag-mask",      GDK_BUTTON1_MASK,
+                  "draw-border",    TRUE,
+                  "height-request", 20,
+                  NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame->color_area, FALSE, FALSE, 0);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_set_homogeneous (GTK_BOX (vbox2), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
+  gtk_widget_show (vbox2);
+
+  for (i = 0; i < GIMP_COLOR_FRAME_ROWS; i++)
+    {
+      GtkWidget *hbox;
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      frame->name_labels[i] = gtk_label_new (" ");
+      gtk_label_set_xalign (GTK_LABEL (frame->name_labels[i]), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), frame->name_labels[i],
+                          FALSE, FALSE, 0);
+      gtk_widget_show (frame->name_labels[i]);
+
+      frame->value_labels[i] = gtk_label_new (" ");
+      gtk_label_set_selectable (GTK_LABEL (frame->value_labels[i]), TRUE);
+      gtk_label_set_xalign (GTK_LABEL (frame->value_labels[i]), 1.0);
+      gtk_box_pack_end (GTK_BOX (hbox), frame->value_labels[i],
+                        TRUE, TRUE, 0);
+      gtk_widget_show (frame->value_labels[i]);
+    }
+
+  frame->coords_box_x = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), frame->coords_box_x, FALSE, FALSE, 0);
+
+  /* TRANSLATORS: X for the X coordinate. */
+  label = gtk_label_new (C_("Coordinates", "X:"));
+  gtk_box_pack_start (GTK_BOX (frame->coords_box_x), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  frame->coords_label_x = gtk_label_new (" ");
+  gtk_label_set_selectable (GTK_LABEL (frame->coords_label_x), TRUE);
+  gtk_box_pack_end (GTK_BOX (frame->coords_box_x), frame->coords_label_x,
+                    FALSE, FALSE, 0);
+  gtk_widget_show (frame->coords_label_x);
+
+  frame->coords_box_y = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), frame->coords_box_y, FALSE, FALSE, 0);
+
+  /* TRANSLATORS: Y for the Y coordinate. */
+  label = gtk_label_new (C_("Coordinates", "Y:"));
+  gtk_box_pack_start (GTK_BOX (frame->coords_box_y), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  frame->coords_label_y = gtk_label_new (" ");
+  gtk_label_set_selectable (GTK_LABEL (frame->coords_label_y), TRUE);
+  gtk_box_pack_end (GTK_BOX (frame->coords_box_y), frame->coords_label_y,
+                    FALSE, FALSE, 0);
+  gtk_widget_show (frame->coords_label_y);
+}
+
+static void
+gimp_color_frame_dispose (GObject *object)
+{
+  GimpColorFrame *frame = GIMP_COLOR_FRAME (object);
+
+  gimp_color_frame_set_color_config (frame, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_color_frame_finalize (GObject *object)
+{
+  GimpColorFrame *frame = GIMP_COLOR_FRAME (object);
+
+  g_clear_object (&frame->number_layout);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_color_frame_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpColorFrame *frame = GIMP_COLOR_FRAME (object);
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      g_value_set_enum (value, frame->pick_mode);
+      break;
+
+    case PROP_ELLIPSIZE:
+      g_value_set_enum (value, frame->ellipsize);
+      break;
+
+    case PROP_HAS_NUMBER:
+      g_value_set_boolean (value, frame->has_number);
+      break;
+
+    case PROP_NUMBER:
+      g_value_set_int (value, frame->number);
+      break;
+
+    case PROP_HAS_COLOR_AREA:
+      g_value_set_boolean (value, frame->has_color_area);
+      break;
+
+    case PROP_HAS_COORDS:
+      g_value_set_boolean (value, frame->has_coords);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_frame_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpColorFrame *frame = GIMP_COLOR_FRAME (object);
+
+  switch (property_id)
+    {
+    case PROP_MODE:
+      gimp_color_frame_set_mode (frame, g_value_get_enum (value));
+      break;
+
+    case PROP_ELLIPSIZE:
+      gimp_color_frame_set_ellipsize (frame, g_value_get_enum (value));
+      break;
+
+    case PROP_HAS_NUMBER:
+      gimp_color_frame_set_has_number (frame, g_value_get_boolean (value));
+      break;
+
+    case PROP_NUMBER:
+      gimp_color_frame_set_number (frame, g_value_get_int (value));
+      break;
+
+    case PROP_HAS_COLOR_AREA:
+      gimp_color_frame_set_has_color_area (frame, g_value_get_boolean (value));
+      break;
+
+    case PROP_HAS_COORDS:
+      gimp_color_frame_set_has_coords (frame, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_frame_style_set (GtkWidget *widget,
+                            GtkStyle  *prev_style)
+{
+  GimpColorFrame *frame = GIMP_COLOR_FRAME (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  g_clear_object (&frame->number_layout);
+}
+
+static gboolean
+gimp_color_frame_expose (GtkWidget      *widget,
+                         GdkEventExpose *eevent)
+{
+  GimpColorFrame *frame = GIMP_COLOR_FRAME (widget);
+
+  if (frame->has_number)
+    {
+      GtkStyle      *style = gtk_widget_get_style (widget);
+      GtkAllocation  allocation;
+      GtkAllocation  combo_allocation;
+      GtkAllocation  color_area_allocation;
+      GtkAllocation  coords_box_x_allocation;
+      GtkAllocation  coords_box_y_allocation;
+      cairo_t       *cr;
+      gchar          buf[8];
+      gint           w, h;
+      gdouble        scale;
+
+      gtk_widget_get_allocation (widget, &allocation);
+      gtk_widget_get_allocation (frame->combo, &combo_allocation);
+      gtk_widget_get_allocation (frame->color_area, &color_area_allocation);
+      gtk_widget_get_allocation (frame->coords_box_x, &coords_box_x_allocation);
+      gtk_widget_get_allocation (frame->coords_box_y, &coords_box_y_allocation);
+
+      cr = gdk_cairo_create (gtk_widget_get_window (widget));
+      gdk_cairo_region (cr, eevent->region);
+      cairo_clip (cr);
+
+      cairo_translate (cr, allocation.x, allocation.y);
+
+      gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]);
+
+      g_snprintf (buf, sizeof (buf), "%d", frame->number);
+
+      if (! frame->number_layout)
+        frame->number_layout = gtk_widget_create_pango_layout (widget, NULL);
+
+      pango_layout_set_text (frame->number_layout, buf, -1);
+      pango_layout_get_pixel_size (frame->number_layout, &w, &h);
+
+      scale = ((gdouble) (allocation.height -
+                          combo_allocation.height -
+                          color_area_allocation.height -
+                          (coords_box_x_allocation.height +
+                           coords_box_y_allocation.height)) /
+               (gdouble) h);
+
+      cairo_scale (cr, scale, scale);
+
+      cairo_move_to (cr,
+                     (allocation.width / 2.0) / scale - w / 2.0,
+                     (allocation.height / 2.0 +
+                      combo_allocation.height / 2.0 +
+                      color_area_allocation.height / 2.0 +
+                      coords_box_x_allocation.height / 2.0 +
+                      coords_box_y_allocation.height / 2.0) / scale - h / 2.0);
+      pango_cairo_show_layout (cr, frame->number_layout);
+
+      cairo_destroy (cr);
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, eevent);
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_color_frame_new:
+ *
+ * Creates a new #GimpColorFrame widget.
+ *
+ * Return value: The new #GimpColorFrame widget.
+ **/
+GtkWidget *
+gimp_color_frame_new (void)
+{
+  return g_object_new (GIMP_TYPE_COLOR_FRAME, NULL);
+}
+
+
+/**
+ * gimp_color_frame_set_mode:
+ * @frame: The #GimpColorFrame.
+ * @mode:  The new @mode.
+ *
+ * Sets the #GimpColorFrame's color pick @mode. Calling this function
+ * does the same as selecting the @mode from the frame's #GtkComboBox.
+ **/
+void
+gimp_color_frame_set_mode (GimpColorFrame    *frame,
+                           GimpColorPickMode  mode)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (frame->combo), mode);
+}
+
+void
+gimp_color_frame_set_ellipsize (GimpColorFrame     *frame,
+                                PangoEllipsizeMode  ellipsize)
+{
+  gint i;
+
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  if (ellipsize != frame->ellipsize)
+    {
+      frame->ellipsize = ellipsize;
+
+      for (i = 0; i < GIMP_COLOR_FRAME_ROWS; i++)
+        {
+          if (frame->value_labels[i])
+            gtk_label_set_ellipsize (GTK_LABEL (frame->value_labels[i]),
+                                     ellipsize);
+        }
+    }
+}
+
+void
+gimp_color_frame_set_has_number (GimpColorFrame *frame,
+                                 gboolean        has_number)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  if (has_number != frame->has_number)
+    {
+      frame->has_number = has_number ? TRUE : FALSE;
+
+      gtk_widget_queue_draw (GTK_WIDGET (frame));
+
+      g_object_notify (G_OBJECT (frame), "has-number");
+    }
+}
+
+void
+gimp_color_frame_set_number (GimpColorFrame *frame,
+                             gint            number)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  if (number != frame->number)
+    {
+      frame->number = number;
+
+      gtk_widget_queue_draw (GTK_WIDGET (frame));
+
+      g_object_notify (G_OBJECT (frame), "number");
+    }
+}
+
+void
+gimp_color_frame_set_has_color_area (GimpColorFrame *frame,
+                                     gboolean        has_color_area)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  if (has_color_area != frame->has_color_area)
+    {
+      frame->has_color_area = has_color_area ? TRUE : FALSE;
+
+      g_object_set (frame->color_area, "visible", frame->has_color_area, NULL);
+
+      g_object_notify (G_OBJECT (frame), "has-color-area");
+    }
+}
+
+void
+gimp_color_frame_set_has_coords (GimpColorFrame *frame,
+                                 gboolean        has_coords)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  if (has_coords != frame->has_coords)
+    {
+      frame->has_coords = has_coords ? TRUE : FALSE;
+
+      g_object_set (frame->coords_box_x, "visible", frame->has_coords, NULL);
+      g_object_set (frame->coords_box_y, "visible", frame->has_coords, NULL);
+
+      g_object_notify (G_OBJECT (frame), "has-coords");
+    }
+}
+
+/**
+ * gimp_color_frame_set_color:
+ * @frame:          The #GimpColorFrame.
+ * @sample_average: The set @color is the result of averaging
+ * @sample_format:  The format of the #GimpDrawable or #GimpImage the @color
+ *                  was picked from.
+ * @pixel:          The raw pixel in @sample_format.
+ * @color:          The @color to set.
+ * @x:              X position where the color was picked.
+ * @y:              Y position where the color was picked.
+ *
+ * Sets the color sample to display in the #GimpColorFrame. if
+ * @sample_average is %TRUE, @pixel represents the sample at the
+ * center of the average area and will not be displayed.
+ **/
+void
+gimp_color_frame_set_color (GimpColorFrame *frame,
+                            gboolean        sample_average,
+                            const Babl     *sample_format,
+                            gpointer        pixel,
+                            const GimpRGB  *color,
+                            gint            x,
+                            gint            y)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+  g_return_if_fail (color != NULL);
+
+  if (frame->sample_valid                     &&
+      frame->sample_average == sample_average &&
+      frame->sample_format  == sample_format  &&
+      frame->x              == x              &&
+      frame->y              == y              &&
+      gimp_rgba_distance (&frame->color, color) < RGBA_EPSILON)
+    {
+      frame->color = *color;
+      return;
+    }
+
+  frame->sample_valid   = TRUE;
+  frame->sample_average = sample_average;
+  frame->sample_format  = sample_format;
+  frame->color          = *color;
+  frame->x              = x;
+  frame->y              = y;
+
+  memcpy (frame->pixel, pixel, babl_format_get_bytes_per_pixel (sample_format));
+
+  gimp_color_frame_update (frame);
+}
+
+/**
+ * gimp_color_frame_set_invalid:
+ * @frame: The #GimpColorFrame.
+ *
+ * Tells the #GimpColorFrame that the current sample is invalid. All labels
+ * visible for the current color space will show "n/a" (not available).
+ *
+ * There is no special API for setting the frame to "valid" again because
+ * this happens automatically when calling gimp_color_frame_set_color().
+ **/
+void
+gimp_color_frame_set_invalid (GimpColorFrame *frame)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+
+  if (! frame->sample_valid)
+    return;
+
+  frame->sample_valid = FALSE;
+
+  gimp_color_frame_update (frame);
+}
+
+void
+gimp_color_frame_set_color_config (GimpColorFrame  *frame,
+                                   GimpColorConfig *config)
+{
+  g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
+  g_return_if_fail (config == NULL || GIMP_IS_COLOR_CONFIG (config));
+
+  if (config != frame->config)
+    {
+      if (frame->config)
+        {
+          g_signal_handlers_disconnect_by_func (frame->config,
+                                                gimp_color_frame_destroy_transform,
+                                                frame);
+          g_object_unref (frame->config);
+
+          gimp_color_frame_destroy_transform (frame);
+        }
+
+      frame->config = config;
+
+      if (frame->config)
+        {
+          g_object_ref (frame->config);
+
+          g_signal_connect_swapped (frame->config, "notify",
+                                    G_CALLBACK (gimp_color_frame_destroy_transform),
+                                    frame);
+        }
+
+      gimp_color_area_set_color_config (GIMP_COLOR_AREA (frame->color_area),
+                                        config);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_color_frame_combo_callback (GtkWidget      *widget,
+                                 GimpColorFrame *frame)
+{
+  gint value;
+
+  if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value))
+    {
+      frame->pick_mode = value;
+      gimp_color_frame_update (frame);
+
+      g_object_notify (G_OBJECT (frame), "mode");
+    }
+}
+
+static void
+gimp_color_frame_update (GimpColorFrame *frame)
+{
+  const gchar  *names[GIMP_COLOR_FRAME_ROWS]  = { NULL, };
+  gchar       **values = NULL;
+  gboolean      has_alpha;
+  gint          i;
+
+  has_alpha = babl_format_has_alpha (frame->sample_format);
+
+  if (frame->sample_valid)
+    {
+      gchar str[16];
+
+      gimp_color_area_set_color (GIMP_COLOR_AREA (frame->color_area),
+                                 &frame->color);
+
+      g_snprintf (str, sizeof (str), "%d", frame->x);
+      gtk_label_set_text (GTK_LABEL (frame->coords_label_x), str);
+
+      g_snprintf (str, sizeof (str), "%d", frame->y);
+      gtk_label_set_text (GTK_LABEL (frame->coords_label_y), str);
+    }
+  else
+    {
+      /* TRANSLATORS: n/a for Not Available. */
+      gtk_label_set_text (GTK_LABEL (frame->coords_label_x), C_("Coordinates", "n/a"));
+      /* TRANSLATORS: n/a for Not Available. */
+      gtk_label_set_text (GTK_LABEL (frame->coords_label_y), C_("Coordinates", "n/a"));
+    }
+
+  switch (frame->pick_mode)
+    {
+    case GIMP_COLOR_PICK_MODE_PIXEL:
+      {
+        GimpImageBaseType base_type;
+
+        base_type = gimp_babl_format_get_base_type (frame->sample_format);
+
+        if (frame->sample_valid)
+          {
+            const Babl *print_format = NULL;
+            guchar      print_pixel[32];
+
+            switch (gimp_babl_format_get_precision (frame->sample_format))
+              {
+              case GIMP_PRECISION_U8_GAMMA:
+                if (babl_format_is_palette (frame->sample_format))
+                  {
+                    print_format = gimp_babl_format (GIMP_RGB,
+                                                     GIMP_PRECISION_U8_GAMMA,
+                                                     has_alpha);
+                    break;
+                  }
+                /* else fall thru */
+
+              case GIMP_PRECISION_U8_LINEAR:
+              case GIMP_PRECISION_U16_LINEAR:
+              case GIMP_PRECISION_U16_GAMMA:
+              case GIMP_PRECISION_U32_LINEAR:
+              case GIMP_PRECISION_U32_GAMMA:
+              case GIMP_PRECISION_FLOAT_LINEAR:
+              case GIMP_PRECISION_FLOAT_GAMMA:
+              case GIMP_PRECISION_DOUBLE_LINEAR:
+              case GIMP_PRECISION_DOUBLE_GAMMA:
+                print_format = frame->sample_format;
+                break;
+
+              case GIMP_PRECISION_HALF_GAMMA:
+                print_format = gimp_babl_format (base_type,
+                                                 GIMP_PRECISION_FLOAT_GAMMA,
+                                                 has_alpha);
+                break;
+
+              case GIMP_PRECISION_HALF_LINEAR:
+                print_format = gimp_babl_format (base_type,
+                                                 GIMP_PRECISION_FLOAT_LINEAR,
+                                                 has_alpha);
+                break;
+              }
+
+            if (frame->sample_average)
+              {
+                /* FIXME: this is broken: can't use the averaged sRGB GimpRGB
+                 * value for displaying pixel values when color management
+                 * is enabled
+                 */
+                gimp_rgba_get_pixel (&frame->color, print_format, print_pixel);
+              }
+            else
+              {
+                babl_process (babl_fish (frame->sample_format, print_format),
+                              frame->pixel, print_pixel, 1);
+              }
+
+            values = gimp_babl_print_pixel (print_format, print_pixel);
+          }
+
+        if (base_type == GIMP_GRAY)
+          {
+            /* TRANSLATORS: V for Value (grayscale) */
+            names[0] = C_("Grayscale", "V:");
+
+            if (has_alpha)
+              /* TRANSLATORS: A for Alpha (color transparency) */
+              names[1] = C_("Alpha channel", "A:");
+          }
+        else
+          {
+            /* TRANSLATORS: R for Red (RGB) */
+            names[0] = C_("RGB", "R:");
+            /* TRANSLATORS: G for Green (RGB) */
+            names[1] = C_("RGB", "G:");
+            /* TRANSLATORS: B for Blue (RGB) */
+            names[2] = C_("RGB", "B:");
+
+            if (has_alpha)
+              /* TRANSLATORS: A for Alpha (color transparency) */
+              names[3] = C_("Alpha channel", "A:");
+
+            if (babl_format_is_palette (frame->sample_format))
+              {
+                /* TRANSLATORS: Index of the color in the palette. */
+                names[4] = C_("Indexed color", "Index:");
+
+                if (frame->sample_valid)
+                  {
+                    gchar **v   = g_new0 (gchar *, 6);
+                    gchar **tmp = values;
+
+                    memcpy (v, values, 4 * sizeof (gchar *));
+                    values = v;
+
+                    g_free (tmp);
+
+                    if (! frame->sample_average)
+                      {
+                        values[4] = g_strdup_printf (
+                          "%d", ((guint8 *) frame->pixel)[0]);
+                      }
+                  }
+              }
+          }
+      }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_RGB_PERCENT:
+    case GIMP_COLOR_PICK_MODE_RGB_U8:
+      /* TRANSLATORS: R for Red (RGB) */
+      names[0] = C_("RGB", "R:");
+      /* TRANSLATORS: G for Green (RGB) */
+      names[1] = C_("RGB", "G:");
+      /* TRANSLATORS: B for Blue (RGB) */
+      names[2] = C_("RGB", "B:");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[3] = C_("Alpha channel", "A:");
+
+      /* TRANSLATORS: Hex for Hexadecimal (representation of a color) */
+      names[4] = C_("Color representation", "Hex:");
+
+      if (frame->sample_valid)
+        {
+          guchar r, g, b, a;
+
+          values = g_new0 (gchar *, 6);
+
+          gimp_rgba_get_uchar (&frame->color, &r, &g, &b, &a);
+
+          if (frame->pick_mode == GIMP_COLOR_PICK_MODE_RGB_PERCENT)
+            {
+              values[0] = g_strdup_printf ("%.01f %%", frame->color.r * 100.0);
+              values[1] = g_strdup_printf ("%.01f %%", frame->color.g * 100.0);
+              values[2] = g_strdup_printf ("%.01f %%", frame->color.b * 100.0);
+              values[3] = g_strdup_printf ("%.01f %%", frame->color.a * 100.0);
+            }
+          else
+            {
+              values[0] = g_strdup_printf ("%d", r);
+              values[1] = g_strdup_printf ("%d", g);
+              values[2] = g_strdup_printf ("%d", b);
+              values[3] = g_strdup_printf ("%d", a);
+            }
+
+          values[4] = g_strdup_printf ("%.2x%.2x%.2x", r, g, b);
+        }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_HSV:
+      /* TRANSLATORS: H for Hue (HSV color space) */
+      names[0] = C_("HSV color space", "H:");
+      /* TRANSLATORS: S for Saturation (HSV color space) */
+      names[1] = C_("HSV color space", "S:");
+      /* TRANSLATORS: V for Value (HSV color space) */
+      names[2] = C_("HSV color space", "V:");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[3] = C_("Alpha channel", "A:");
+
+      if (frame->sample_valid)
+        {
+          GimpHSV hsv;
+
+          gimp_rgb_to_hsv (&frame->color, &hsv);
+          hsv.a = frame->color.a;
+
+          values = g_new0 (gchar *, 5);
+
+          values[0] = g_strdup_printf ("%.01f \302\260", hsv.h * 360.0);
+          values[1] = g_strdup_printf ("%.01f %%",       hsv.s * 100.0);
+          values[2] = g_strdup_printf ("%.01f %%",       hsv.v * 100.0);
+          values[3] = g_strdup_printf ("%.01f %%",       hsv.a * 100.0);
+        }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_LCH:
+      /* TRANSLATORS: L for Lightness (LCH color space) */
+      names[0] = C_("LCH color space", "L*:");
+      /* TRANSLATORS: C for Chroma (LCH color space) */
+      names[1] = C_("LCH color space", "C*:");
+      /* TRANSLATORS: H for Hue angle (LCH color space) */
+      names[2] = C_("LCH color space", "h\302\260:");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[3] = C_("Alpha channel", "A:");
+
+      if (frame->sample_valid)
+        {
+          static const Babl *fish = NULL;
+          gfloat             lch[4];
+
+          if (G_UNLIKELY (! fish))
+            fish = babl_fish (babl_format ("R'G'B'A double"),
+                              babl_format ("CIE LCH(ab) alpha float"));
+
+          babl_process (fish, &frame->color, lch, 1);
+
+          values = g_new0 (gchar *, 5);
+
+          values[0] = g_strdup_printf ("%.01f  ",        lch[0]);
+          values[1] = g_strdup_printf ("%.01f  ",        lch[1]);
+          values[2] = g_strdup_printf ("%.01f \302\260", lch[2]);
+          values[3] = g_strdup_printf ("%.01f %%",       lch[3] * 100.0);
+        }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_LAB:
+      /* TRANSLATORS: L* for Lightness (Lab color space) */
+      names[0] = C_("Lab color space", "L*:");
+      /* TRANSLATORS: a* color channel in Lab color space */
+      names[1] = C_("Lab color space", "a*:");
+      /* TRANSLATORS: b* color channel in Lab color space */
+      names[2] = C_("Lab color space", "b*:");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[3] = C_("Alpha channel", "A:");
+
+      if (frame->sample_valid)
+        {
+          static const Babl *fish = NULL;
+          gfloat             lab[4];
+
+          if (G_UNLIKELY (! fish))
+            fish = babl_fish (babl_format ("R'G'B'A double"),
+                              babl_format ("CIE Lab alpha float"));
+
+          babl_process (fish, &frame->color, lab, 1);
+
+          values = g_new0 (gchar *, 5);
+
+          values[0] = g_strdup_printf ("%.01f  ",  lab[0]);
+          values[1] = g_strdup_printf ("%.01f  ",  lab[1]);
+          values[2] = g_strdup_printf ("%.01f  ",  lab[2]);
+          values[3] = g_strdup_printf ("%.01f %%", lab[3] * 100.0);
+        }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_XYY:
+      /* TRANSLATORS: x from xyY color space */
+      names[0] = C_("xyY color space", "x:");
+      /* TRANSLATORS: y from xyY color space */
+      names[1] = C_("xyY color space", "y:");
+      /* TRANSLATORS: Y from xyY color space */
+      names[2] = C_("xyY color space", "Y:");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[3] = C_("Alpha channel", "A:");
+
+      if (frame->sample_valid)
+        {
+          static const Babl *fish = NULL;
+          gfloat             xyY[4];
+
+          if (G_UNLIKELY (! fish))
+            fish = babl_fish (babl_format ("R'G'B'A double"),
+                              babl_format ("CIE xyY alpha float"));
+
+          babl_process (fish, &frame->color, xyY, 1);
+
+          values = g_new0 (gchar *, 5);
+
+          values[0] = g_strdup_printf ("%1.6f  ",  xyY[0]);
+          values[1] = g_strdup_printf ("%1.6f  ",  xyY[1]);
+          values[2] = g_strdup_printf ("%1.6f  ",  xyY[2]);
+          values[3] = g_strdup_printf ("%.01f %%", xyY[3] * 100.0);
+        }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_YUV:
+      /* TRANSLATORS: Y from Yu'v' color space */
+      names[0] = C_("Yu'v' color space", "Y:");
+      /* TRANSLATORS: u' from Yu'v' color space */
+      names[1] = C_("Yu'v' color space", "u':");
+      /* TRANSLATORS: v' from Yu'v' color space */
+      names[2] = C_("Yu'v' color space", "v':");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[3] = C_("Alpha channel", "A:");
+
+      if (frame->sample_valid)
+        {
+          static const Babl *fish = NULL;
+          gfloat             Yuv[4];
+
+          if (G_UNLIKELY (! fish))
+            fish = babl_fish (babl_format ("R'G'B'A double"),
+                              babl_format ("CIE Yuv alpha float"));
+
+          babl_process (fish, &frame->color, Yuv, 1);
+
+          values = g_new0 (gchar *, 5);
+
+          values[0] = g_strdup_printf ("%1.6f  ",  Yuv[0]);
+          values[1] = g_strdup_printf ("%1.6f  ",  Yuv[1]);
+          values[2] = g_strdup_printf ("%1.6f  ",  Yuv[2]);
+          values[3] = g_strdup_printf ("%.01f %%", Yuv[3] * 100.0);
+        }
+      break;
+
+    case GIMP_COLOR_PICK_MODE_CMYK:
+      /* TRANSLATORS: C for Cyan (CMYK) */
+      names[0] = C_("CMYK", "C:");
+      /* TRANSLATORS: M for Magenta (CMYK) */
+      names[1] = C_("CMYK", "M:");
+      /* TRANSLATORS: Y for Yellow (CMYK) */
+      names[2] = C_("CMYK", "Y:");
+      /* TRANSLATORS: K for Key/black (CMYK) */
+      names[3] = C_("CMYK", "K:");
+
+      if (has_alpha)
+        /* TRANSLATORS: A for Alpha (color transparency) */
+        names[4] = C_("Alpha channel", "A:");
+
+      if (frame->sample_valid)
+        {
+          GimpCMYK cmyk;
+
+          if (! frame->transform)
+            gimp_color_frame_create_transform (frame);
+
+          if (frame->transform)
+            {
+              gdouble rgb_values[3];
+              gdouble cmyk_values[4];
+
+              rgb_values[0] = frame->color.r;
+              rgb_values[1] = frame->color.g;
+              rgb_values[2] = frame->color.b;
+
+              gimp_color_transform_process_pixels (frame->transform,
+                                                   babl_format ("R'G'B' double"),
+                                                   rgb_values,
+                                                   babl_format ("CMYK double"),
+                                                   cmyk_values,
+                                                   1);
+
+              cmyk.c = cmyk_values[0] / 100.0;
+              cmyk.m = cmyk_values[1] / 100.0;
+              cmyk.y = cmyk_values[2] / 100.0;
+              cmyk.k = cmyk_values[3] / 100.0;
+            }
+          else
+            {
+              gimp_rgb_to_cmyk (&frame->color, 1.0, &cmyk);
+            }
+
+          cmyk.a = frame->color.a;
+
+          values = g_new0 (gchar *, 6);
+
+          values[0] = g_strdup_printf ("%.01f %%", cmyk.c * 100.0);
+          values[1] = g_strdup_printf ("%.01f %%", cmyk.m * 100.0);
+          values[2] = g_strdup_printf ("%.01f %%", cmyk.y * 100.0);
+          values[3] = g_strdup_printf ("%.01f %%", cmyk.k * 100.0);
+          values[4] = g_strdup_printf ("%.01f %%", cmyk.a * 100.0);
+        }
+      break;
+    }
+
+  for (i = 0; i < GIMP_COLOR_FRAME_ROWS; i++)
+    {
+      if (names[i])
+        {
+          gtk_label_set_text (GTK_LABEL (frame->name_labels[i]), names[i]);
+
+          if (frame->sample_valid && values[i])
+            gtk_label_set_text (GTK_LABEL (frame->value_labels[i]), values[i]);
+          else
+            gtk_label_set_text (GTK_LABEL (frame->value_labels[i]),
+                                C_("Color value", "n/a"));
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (frame->name_labels[i]),  " ");
+          gtk_label_set_text (GTK_LABEL (frame->value_labels[i]), " ");
+        }
+    }
+
+  g_strfreev (values);
+}
+
+static void
+gimp_color_frame_create_transform (GimpColorFrame *frame)
+{
+  if (frame->config)
+    {
+      GimpColorProfile *cmyk_profile;
+
+      cmyk_profile = gimp_color_config_get_cmyk_color_profile (frame->config,
+                                                               NULL);
+
+      if (cmyk_profile)
+        {
+          static GimpColorProfile *rgb_profile = NULL;
+
+          if (G_UNLIKELY (! rgb_profile))
+            rgb_profile = gimp_color_profile_new_rgb_srgb ();
+
+          frame->transform =
+            gimp_color_transform_new (rgb_profile,
+                                      babl_format ("R'G'B' double"),
+                                      cmyk_profile,
+                                      babl_format ("CMYK double"),
+                                      GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
+                                      GIMP_COLOR_TRANSFORM_FLAGS_NOOPTIMIZE |
+                                      GIMP_COLOR_TRANSFORM_FLAGS_BLACK_POINT_COMPENSATION);
+        }
+    }
+}
+
+static void
+gimp_color_frame_destroy_transform (GimpColorFrame *frame)
+{
+  g_clear_object (&frame->transform);
+
+  gimp_color_frame_update (frame);
+}
diff --git a/app/widgets/gimpcolorframe.h b/app/widgets/gimpcolorframe.h
new file mode 100644
index 0000000..90cb05b
--- /dev/null
+++ b/app/widgets/gimpcolorframe.h
@@ -0,0 +1,111 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_FRAME_H__
+#define __GIMP_COLOR_FRAME_H__
+
+
+#define GIMP_COLOR_FRAME_ROWS 5
+
+
+#define GIMP_TYPE_COLOR_FRAME            (gimp_color_frame_get_type ())
+#define GIMP_COLOR_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_FRAME, GimpColorFrame))
+#define GIMP_COLOR_FRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_FRAME, GimpColorFrameClass))
+#define GIMP_IS_COLOR_FRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_FRAME))
+#define GIMP_IS_COLOR_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_FRAME))
+#define GIMP_COLOR_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_FRAME, GimpColorFrameClass))
+
+
+typedef struct _GimpColorFrameClass GimpColorFrameClass;
+
+struct _GimpColorFrame
+{
+  GimpFrame           parent_instance;
+
+  gboolean            sample_valid;
+  gboolean            sample_average;
+  const Babl         *sample_format;
+  gdouble             pixel[4];
+  GimpRGB             color;
+  gint                x;
+  gint                y;
+
+  GimpColorPickMode   pick_mode;
+
+  PangoEllipsizeMode  ellipsize;
+
+  gboolean            has_number;
+  gint                number;
+
+  gboolean            has_color_area;
+  gboolean            has_coords;
+
+  GtkWidget          *combo;
+  GtkWidget          *color_area;
+  GtkWidget          *coords_box_x;
+  GtkWidget          *coords_box_y;
+  GtkWidget          *coords_label_x;
+  GtkWidget          *coords_label_y;
+  GtkWidget          *name_labels[GIMP_COLOR_FRAME_ROWS];
+  GtkWidget          *value_labels[GIMP_COLOR_FRAME_ROWS];
+
+  PangoLayout        *number_layout;
+
+  GimpColorConfig    *config;
+  GimpColorTransform *transform;
+};
+
+struct _GimpColorFrameClass
+{
+  GimpFrameClass      parent_class;
+};
+
+
+GType       gimp_color_frame_get_type           (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_frame_new                (void);
+
+void        gimp_color_frame_set_mode           (GimpColorFrame     *frame,
+                                                 GimpColorPickMode   mode);
+
+void        gimp_color_frame_set_ellipsize      (GimpColorFrame     *frame,
+                                                 PangoEllipsizeMode  ellipsize);
+
+void        gimp_color_frame_set_has_number     (GimpColorFrame     *frame,
+                                                 gboolean            has_number);
+void        gimp_color_frame_set_number         (GimpColorFrame     *frame,
+                                                 gint                number);
+
+void        gimp_color_frame_set_has_color_area (GimpColorFrame     *frame,
+                                                 gboolean            has_color_area);
+void        gimp_color_frame_set_has_coords     (GimpColorFrame     *frame,
+                                                 gboolean            has_coords);
+
+void        gimp_color_frame_set_color          (GimpColorFrame     *frame,
+                                                 gboolean            sample_average,
+                                                 const Babl         *format,
+                                                 gpointer            pixel,
+                                                 const GimpRGB      *color,
+                                                 gint                x,
+                                                 gint                y);
+void        gimp_color_frame_set_invalid        (GimpColorFrame     *frame);
+
+void        gimp_color_frame_set_color_config   (GimpColorFrame     *frame,
+                                                 GimpColorConfig    *config);
+
+
+#endif  /*  __GIMP_COLOR_FRAME_H__  */
diff --git a/app/widgets/gimpcolorhistory.c b/app/widgets/gimpcolorhistory.c
new file mode 100644
index 0000000..9a9f38a
--- /dev/null
+++ b/app/widgets/gimpcolorhistory.c
@@ -0,0 +1,325 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolorhistory.c
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimp-palettes.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimppalettemru.h"
+
+#include "gimpcolorhistory.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  COLOR_SELECTED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_HISTORY_SIZE,
+};
+
+
+#define DEFAULT_HISTORY_SIZE 12
+#define COLOR_AREA_SIZE      20
+
+static void   gimp_color_history_constructed   (GObject           *object);
+static void   gimp_color_history_finalize      (GObject           *object);
+static void   gimp_color_history_set_property  (GObject           *object,
+                                                guint              property_id,
+                                                const GValue      *value,
+                                                GParamSpec        *pspec);
+static void   gimp_color_history_get_property  (GObject           *object,
+                                                guint              property_id,
+                                                GValue            *value,
+                                                GParamSpec        *pspec);
+
+static void   gimp_color_history_color_clicked (GtkWidget         *widget,
+                                                GimpColorHistory  *history);
+
+static void   gimp_color_history_palette_dirty (GimpPalette       *palette,
+                                                GimpColorHistory  *history);
+
+static void   gimp_color_history_color_changed (GtkWidget         *widget,
+                                                gpointer           data);
+
+
+G_DEFINE_TYPE (GimpColorHistory, gimp_color_history, GTK_TYPE_TABLE)
+
+#define parent_class gimp_color_history_parent_class
+
+static guint history_signals[LAST_SIGNAL] = { 0 };
+
+static void
+gimp_color_history_class_init (GimpColorHistoryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_color_history_constructed;
+  object_class->set_property = gimp_color_history_set_property;
+  object_class->get_property = gimp_color_history_get_property;
+  object_class->finalize     = gimp_color_history_finalize;
+
+  history_signals[COLOR_SELECTED] =
+    g_signal_new ("color-selected",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpColorHistoryClass, color_selected),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_HISTORY_SIZE,
+                                   g_param_spec_int ("history-size",
+                                                     NULL, NULL,
+                                                     2, G_MAXINT,
+                                                     DEFAULT_HISTORY_SIZE,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  klass->color_selected = NULL;
+}
+
+static void
+gimp_color_history_init (GimpColorHistory *history)
+{
+  history->color_areas = NULL;
+}
+
+static void
+gimp_color_history_constructed (GObject *object)
+{
+  GimpColorHistory *history = GIMP_COLOR_HISTORY (object);
+  GimpPalette      *palette;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  palette = gimp_palettes_get_color_history (history->context->gimp);
+
+  g_signal_connect_object (palette, "dirty",
+                           G_CALLBACK (gimp_color_history_palette_dirty),
+                           G_OBJECT (history), 0);
+
+  gimp_color_history_palette_dirty (palette, history);
+}
+
+static void
+gimp_color_history_finalize (GObject *object)
+{
+  GimpColorHistory *history = GIMP_COLOR_HISTORY (object);
+
+  g_clear_pointer (&history->color_areas, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_color_history_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpColorHistory *history = GIMP_COLOR_HISTORY (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      history->context = g_value_get_object (value);
+      break;
+    case PROP_HISTORY_SIZE:
+      {
+        GtkWidget *button;
+        gint       i;
+
+        /* Destroy previous color buttons. */
+        gtk_container_foreach (GTK_CONTAINER (history),
+                               (GtkCallback) gtk_widget_destroy, NULL);
+        history->history_size = g_value_get_int (value);
+        gtk_table_resize (GTK_TABLE (history),
+                          2, (history->history_size + 1)/ 2);
+        gtk_table_set_row_spacings (GTK_TABLE (history), 2);
+        gtk_table_set_col_spacings (GTK_TABLE (history), 2);
+        history->color_areas = g_realloc_n (history->color_areas,
+                                            history->history_size,
+                                            sizeof (GtkWidget*));
+        for (i = 0; i < history->history_size; i++)
+          {
+            GimpRGB black = { 0.0, 0.0, 0.0, 1.0 };
+            gint    row, column;
+
+            column = i % (history->history_size / 2);
+            row    = i / (history->history_size / 2);
+
+            button = gtk_button_new ();
+            gtk_widget_set_size_request (button, COLOR_AREA_SIZE, COLOR_AREA_SIZE);
+            gtk_table_attach_defaults (GTK_TABLE (history), button,
+                                       column, column + 1, row, row + 1);
+            gtk_widget_show (button);
+
+            history->color_areas[i] = gimp_color_area_new (&black,
+                                                           GIMP_COLOR_AREA_SMALL_CHECKS,
+                                                           GDK_BUTTON2_MASK);
+            gimp_color_area_set_color_config (GIMP_COLOR_AREA (history->color_areas[i]),
+                                              history->context->gimp->config->color_management);
+            gtk_container_add (GTK_CONTAINER (button), history->color_areas[i]);
+            gtk_widget_show (history->color_areas[i]);
+
+            g_signal_connect (button, "clicked",
+                              G_CALLBACK (gimp_color_history_color_clicked),
+                              history);
+
+            g_signal_connect (history->color_areas[i], "color-changed",
+                              G_CALLBACK (gimp_color_history_color_changed),
+                              GINT_TO_POINTER (i));
+          }
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_history_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpColorHistory *history = GIMP_COLOR_HISTORY (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, history->context);
+      break;
+    case PROP_HISTORY_SIZE:
+      g_value_set_int (value, history->history_size);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/*  Public Functions  */
+
+GtkWidget *
+gimp_color_history_new (GimpContext *context,
+                        gint         history_size)
+{
+  GimpColorHistory *history;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  history = g_object_new (GIMP_TYPE_COLOR_HISTORY,
+                          "context",      context,
+                          "history-size", history_size,
+                          NULL);
+
+  return GTK_WIDGET (history);
+}
+
+/*  Color history callback.  */
+
+static void
+gimp_color_history_color_clicked (GtkWidget        *widget,
+                                  GimpColorHistory *history)
+{
+  GimpColorArea *color_area;
+  GimpRGB        color;
+
+  color_area = GIMP_COLOR_AREA (gtk_bin_get_child (GTK_BIN (widget)));
+
+  gimp_color_area_get_color (color_area, &color);
+
+  g_signal_emit (history, history_signals[COLOR_SELECTED], 0,
+                 &color);
+}
+
+/* Color history palette callback. */
+
+static void
+gimp_color_history_palette_dirty (GimpPalette      *palette,
+                                  GimpColorHistory *history)
+{
+  gint i;
+
+  for (i = 0; i < history->history_size; i++)
+    {
+      GimpPaletteEntry *entry = gimp_palette_get_entry (palette, i);
+      GimpRGB           black = { 0.0, 0.0, 0.0, 1.0 };
+
+      g_signal_handlers_block_by_func (history->color_areas[i],
+                                       gimp_color_history_color_changed,
+                                       GINT_TO_POINTER (i));
+
+      gimp_color_area_set_color (GIMP_COLOR_AREA (history->color_areas[i]),
+                                 entry ? &entry->color : &black);
+
+      g_signal_handlers_unblock_by_func (history->color_areas[i],
+                                         gimp_color_history_color_changed,
+                                         GINT_TO_POINTER (i));
+    }
+}
+
+/* Color area callbacks. */
+
+static void
+gimp_color_history_color_changed (GtkWidget *widget,
+                                  gpointer   data)
+{
+  GimpColorHistory *history;
+  GimpPalette      *palette;
+  GimpRGB           color;
+
+  history = GIMP_COLOR_HISTORY (gtk_widget_get_ancestor (widget,
+                                                         GIMP_TYPE_COLOR_HISTORY));
+
+  palette = gimp_palettes_get_color_history (history->context->gimp);
+
+  gimp_color_area_get_color (GIMP_COLOR_AREA (widget), &color);
+
+  gimp_palette_set_entry_color (palette, GPOINTER_TO_INT (data), &color);
+}
diff --git a/app/widgets/gimpcolorhistory.h b/app/widgets/gimpcolorhistory.h
new file mode 100644
index 0000000..7370fa2
--- /dev/null
+++ b/app/widgets/gimpcolorhistory.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcolorhistory.h
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_HISTORY_H__
+#define __GIMP_COLOR_HISTORY_H__
+
+
+#define GIMP_TYPE_COLOR_HISTORY            (gimp_color_history_get_type ())
+#define GIMP_COLOR_HISTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_HISTORY, GimpColorHistory))
+#define GIMP_COLOR_HISTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_HISTORY, GimpColorHistoryClass))
+#define GIMP_IS_COLOR_HISTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_HISTORY))
+#define GIMP_IS_COLOR_HISTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_HISTORY))
+#define GIMP_COLOR_HISTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_HISTORY, GimpColorHistoryClass))
+
+
+typedef struct _GimpColorHistoryClass GimpColorHistoryClass;
+
+struct _GimpColorHistory
+{
+  GtkTable      parent_instance;
+
+  GimpContext  *context;
+
+  GtkWidget   **color_areas;
+  gint          history_size;
+};
+
+struct _GimpColorHistoryClass
+{
+  GtkTableClass  parent_class;
+
+  /*  signals  */
+  void   (* color_selected)             (GimpColorHistory *history,
+                                         const GimpRGB    *rgb);
+};
+
+
+GType       gimp_color_history_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_history_new      (GimpContext     *context,
+                                         gint             history_size);
+
+#endif /* __GIMP_COLOR_HISTORY_H__ */
+
diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c
new file mode 100644
index 0000000..4ab5ec6
--- /dev/null
+++ b/app/widgets/gimpcolormapeditor.c
@@ -0,0 +1,826 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+#include "core/gimpmarshal.h"
+#include "core/gimppalette.h"
+#include "core/gimpprojection.h"
+
+#include "gimpcolordialog.h"
+#include "gimpcolormapeditor.h"
+#include "gimpdialogfactory.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpmenufactory.h"
+#include "gimppaletteview.h"
+#include "gimpuimanager.h"
+#include "gimpviewrendererpalette.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define BORDER      6
+#define RGB_EPSILON 1e-6
+
+#define HAVE_COLORMAP(image) \
+        (image != NULL && \
+         gimp_image_get_base_type (image) == GIMP_INDEXED && \
+         gimp_image_get_colormap (image) != NULL)
+
+
+static void gimp_colormap_editor_docked_iface_init (GimpDockedInterface *face);
+
+static void   gimp_colormap_editor_constructed     (GObject            *object);
+static void   gimp_colormap_editor_dispose         (GObject            *object);
+static void   gimp_colormap_editor_finalize        (GObject            *object);
+
+static void   gimp_colormap_editor_unmap           (GtkWidget          *widget);
+
+static void   gimp_colormap_editor_set_image       (GimpImageEditor    *editor,
+                                                    GimpImage          *image);
+
+static void   gimp_colormap_editor_set_context     (GimpDocked        *docked,
+                                                    GimpContext       *context);
+
+static PangoLayout *
+              gimp_colormap_editor_create_layout   (GtkWidget          *widget);
+
+static void   gimp_colormap_editor_update_entries  (GimpColormapEditor *editor);
+
+static gboolean gimp_colormap_preview_expose       (GtkWidget          *widget,
+                                                    GdkEventExpose     *event,
+                                                    GimpColormapEditor *editor);
+
+static void   gimp_colormap_editor_entry_clicked   (GimpPaletteView    *view,
+                                                    GimpPaletteEntry   *entry,
+                                                    GdkModifierType    state,
+                                                    GimpColormapEditor *editor);
+static void   gimp_colormap_editor_entry_selected  (GimpPaletteView    *view,
+                                                    GimpPaletteEntry   *entry,
+                                                    GimpColormapEditor *editor);
+static void   gimp_colormap_editor_entry_activated (GimpPaletteView    *view,
+                                                    GimpPaletteEntry   *entry,
+                                                    GimpColormapEditor *editor);
+static void   gimp_colormap_editor_entry_context   (GimpPaletteView    *view,
+                                                    GimpPaletteEntry   *entry,
+                                                    GimpColormapEditor *editor);
+static void   gimp_colormap_editor_color_dropped   (GimpPaletteView    *view,
+                                                    GimpPaletteEntry   *entry,
+                                                    const GimpRGB      *color,
+                                                    GimpColormapEditor *editor);
+
+static void   gimp_colormap_adjustment_changed     (GtkAdjustment      *adjustment,
+                                                    GimpColormapEditor *editor);
+static void   gimp_colormap_hex_entry_changed      (GimpColorHexEntry  *entry,
+                                                    GimpColormapEditor *editor);
+
+static void   gimp_colormap_image_mode_changed     (GimpImage          *image,
+                                                    GimpColormapEditor *editor);
+static void   gimp_colormap_image_colormap_changed (GimpImage          *image,
+                                                    gint                ncol,
+                                                    GimpColormapEditor *editor);
+
+static void   gimp_colormap_editor_edit_color_update
+                                                    (GimpColorDialog    *dialog,
+                                                     const GimpRGB      *color,
+                                                     GimpColorDialogState state,
+                                                     GimpColormapEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpColormapEditor, gimp_colormap_editor,
+                         GIMP_TYPE_IMAGE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_colormap_editor_docked_iface_init))
+
+#define parent_class gimp_colormap_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_colormap_editor_class_init (GimpColormapEditorClass* klass)
+{
+  GObjectClass         *object_class       = G_OBJECT_CLASS (klass);
+  GtkWidgetClass       *widget_class       = GTK_WIDGET_CLASS (klass);
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  object_class->constructed     = gimp_colormap_editor_constructed;
+  object_class->dispose         = gimp_colormap_editor_dispose;
+  object_class->finalize        = gimp_colormap_editor_finalize;
+
+  widget_class->unmap           = gimp_colormap_editor_unmap;
+
+  image_editor_class->set_image = gimp_colormap_editor_set_image;
+}
+
+static void
+gimp_colormap_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_colormap_editor_set_context;
+}
+
+static void
+gimp_colormap_editor_init (GimpColormapEditor *editor)
+{
+  GtkWidget *frame;
+  GtkWidget *table;
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  editor->view = gimp_view_new_full_by_types (NULL,
+                                              GIMP_TYPE_PALETTE_VIEW,
+                                              GIMP_TYPE_PALETTE,
+                                              1, 1, 0,
+                                              FALSE, TRUE, FALSE);
+  gimp_view_set_expand (GIMP_VIEW (editor->view), TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), editor->view);
+  gtk_widget_show (editor->view);
+
+  g_signal_connect (editor->view, "expose-event",
+                    G_CALLBACK (gimp_colormap_preview_expose),
+                    editor);
+
+  g_signal_connect (editor->view, "entry-clicked",
+                    G_CALLBACK (gimp_colormap_editor_entry_clicked),
+                    editor);
+  g_signal_connect (editor->view, "entry-selected",
+                    G_CALLBACK (gimp_colormap_editor_entry_selected),
+                    editor);
+  g_signal_connect (editor->view, "entry-activated",
+                    G_CALLBACK (gimp_colormap_editor_entry_activated),
+                    editor);
+  g_signal_connect (editor->view, "entry-context",
+                    G_CALLBACK (gimp_colormap_editor_entry_context),
+                    editor);
+  g_signal_connect (editor->view, "color-dropped",
+                    G_CALLBACK (gimp_colormap_editor_color_dropped),
+                    editor);
+
+  /*  Some helpful hints  */
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
+  gtk_box_pack_end (GTK_BOX (editor), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  editor->index_adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (0, 0, 0, 1, 10, 0);
+  editor->index_spinbutton = gimp_spin_button_new (editor->index_adjustment,
+                                                   1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (editor->index_spinbutton),
+                               TRUE);
+
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("Color index:"), 0.0, 0.5,
+                             editor->index_spinbutton, 1, TRUE);
+
+  g_signal_connect (editor->index_adjustment, "value-changed",
+                    G_CALLBACK (gimp_colormap_adjustment_changed),
+                    editor);
+
+  editor->color_entry = gimp_color_hex_entry_new ();
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             _("HTML notation:"), 0.0, 0.5,
+                             editor->color_entry, 1, TRUE);
+
+  g_signal_connect (editor->color_entry, "color-changed",
+                    G_CALLBACK (gimp_colormap_hex_entry_changed),
+                    editor);
+}
+
+static void
+gimp_colormap_editor_constructed (GObject *object)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (object);
+  GdkModifierType     extend_mask;
+  GdkModifierType     modify_mask;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  extend_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (object),
+                                              GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+  modify_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (object),
+                                              GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "colormap",
+                                 "colormap-edit-color",
+                                 NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "colormap",
+                                 "colormap-add-color-from-fg",
+                                 "colormap-add-color-from-bg",
+                                 gimp_get_toggle_behavior_mask (),
+                                 NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "colormap",
+                                 "colormap-selection-replace",
+                                 "colormap-selection-add",
+                                 extend_mask,
+                                 "colormap-selection-subtract",
+                                 modify_mask,
+                                 "colormap-selection-intersect",
+                                 extend_mask | modify_mask,
+                                 NULL);
+}
+
+static void
+gimp_colormap_editor_dispose (GObject *object)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (object);
+
+  g_clear_pointer (&editor->color_dialog, gtk_widget_destroy);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_colormap_editor_finalize (GObject *object)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (object);
+
+  g_clear_object (&editor->layout);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_colormap_editor_unmap (GtkWidget *widget)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (widget);
+
+  if (editor->color_dialog)
+    gtk_widget_hide (editor->color_dialog);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_colormap_editor_set_image (GimpImageEditor *image_editor,
+                                GimpImage       *image)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (image_editor);
+
+  if (image_editor->image)
+    {
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_colormap_image_mode_changed,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_colormap_image_colormap_changed,
+                                            editor);
+
+      if (editor->color_dialog)
+        gtk_widget_hide (editor->color_dialog);
+
+      if (! HAVE_COLORMAP (image))
+        {
+          gtk_adjustment_set_upper (editor->index_adjustment, 0);
+
+          if (gtk_widget_get_mapped (GTK_WIDGET (editor)))
+            gimp_view_set_viewable (GIMP_VIEW (editor->view), NULL);
+        }
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (image_editor, image);
+
+  editor->col_index = 0;
+
+  if (image)
+    {
+      g_signal_connect (image, "mode-changed",
+                        G_CALLBACK (gimp_colormap_image_mode_changed),
+                        editor);
+      g_signal_connect (image, "colormap-changed",
+                        G_CALLBACK (gimp_colormap_image_colormap_changed),
+                        editor);
+
+      if (HAVE_COLORMAP (image))
+        {
+          gimp_view_set_viewable (GIMP_VIEW (editor->view),
+                                  GIMP_VIEWABLE (gimp_image_get_colormap_palette (image)));
+
+          gtk_adjustment_set_upper (editor->index_adjustment,
+                                    gimp_image_get_colormap_size (image) - 1);
+        }
+    }
+
+  gimp_colormap_editor_update_entries (editor);
+}
+
+static void
+gimp_colormap_editor_set_context (GimpDocked  *docked,
+                                  GimpContext *context)
+{
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (docked);
+
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_view_renderer_set_context (GIMP_VIEW (editor->view)->renderer,
+                                  context);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_colormap_editor_new (GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_COLORMAP_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<Colormap>",
+                       "ui-path",         "/colormap-popup",
+                       NULL);
+}
+
+void
+gimp_colormap_editor_edit_color (GimpColormapEditor *editor)
+{
+  GimpImage    *image;
+  const guchar *colormap;
+  GimpRGB       color;
+  gchar        *desc;
+  gint         index;
+
+  g_return_if_fail (GIMP_IS_COLORMAP_EDITOR (editor));
+
+  image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (! HAVE_COLORMAP (image))
+    return;
+
+  index = editor->col_index;
+
+  colormap = gimp_image_get_colormap (image);
+
+  gimp_rgba_set_uchar (&color,
+                       colormap[index * 3],
+                       colormap[index * 3 + 1],
+                       colormap[index * 3 + 2],
+                       255);
+
+  desc = g_strdup_printf (_("Edit colormap entry #%d"), index);
+
+  if (! editor->color_dialog)
+    {
+      editor->color_dialog =
+        gimp_color_dialog_new (GIMP_VIEWABLE (image),
+                               GIMP_IMAGE_EDITOR (editor)->context,
+                               _("Edit Colormap Entry"),
+                               GIMP_ICON_COLORMAP,
+                               desc,
+                               GTK_WIDGET (editor),
+                               gimp_dialog_factory_get_singleton (),
+                               "gimp-colormap-editor-color-dialog",
+                               (const GimpRGB *) &color,
+                               TRUE, FALSE);
+
+      g_signal_connect (editor->color_dialog, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &editor->color_dialog);
+
+      g_signal_connect (editor->color_dialog, "update",
+                        G_CALLBACK (gimp_colormap_editor_edit_color_update),
+                        editor);
+    }
+  else
+    {
+      gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (editor->color_dialog),
+                                         GIMP_VIEWABLE (image),
+                                         GIMP_IMAGE_EDITOR (editor)->context);
+      g_object_set (editor->color_dialog, "description", desc, NULL);
+      gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (editor->color_dialog),
+                                   &color);
+
+      if (! gtk_widget_get_visible (editor->color_dialog))
+        gimp_dialog_factory_position_dialog (gimp_dialog_factory_get_singleton (),
+                                             "gimp-colormap-editor-color-dialog",
+                                             editor->color_dialog,
+                                             gtk_widget_get_screen (GTK_WIDGET (editor)),
+                                             gimp_widget_get_monitor (GTK_WIDGET (editor)));
+    }
+
+  g_free (desc);
+
+  gtk_window_present (GTK_WINDOW (editor->color_dialog));
+}
+
+gint
+gimp_colormap_editor_get_index (GimpColormapEditor *editor,
+                                const GimpRGB      *search)
+{
+  GimpImage *image;
+  gint       index;
+
+  g_return_val_if_fail (GIMP_IS_COLORMAP_EDITOR (editor), 0);
+
+  image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (! HAVE_COLORMAP (image))
+    return -1;
+
+  index = editor->col_index;
+
+  if (search)
+    {
+      GimpRGB temp;
+
+      gimp_image_get_colormap_entry (image, index, &temp);
+
+      if (gimp_rgb_distance (&temp, search) > RGB_EPSILON)
+        {
+          gint n_colors = gimp_image_get_colormap_size (image);
+          gint i;
+
+          for (i = 0; i < n_colors; i++)
+            {
+              gimp_image_get_colormap_entry (image, i, &temp);
+
+              if (gimp_rgb_distance (&temp, search) < RGB_EPSILON)
+                {
+                  index = i;
+                  break;
+                }
+            }
+        }
+    }
+
+  return index;
+}
+
+gboolean
+gimp_colormap_editor_set_index (GimpColormapEditor *editor,
+                                gint                index,
+                                GimpRGB            *color)
+{
+  GimpImage *image;
+  gint       size;
+
+  g_return_val_if_fail (GIMP_IS_COLORMAP_EDITOR (editor), FALSE);
+
+  image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (! HAVE_COLORMAP (image))
+    return FALSE;
+
+  size = gimp_image_get_colormap_size (image);
+
+  if (size < 1)
+    return FALSE;
+
+  index = CLAMP (index, 0, size - 1);
+
+  if (index != editor->col_index)
+    {
+      GimpPalette *palette = gimp_image_get_colormap_palette (image);
+
+      editor->col_index = index;
+
+      gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view),
+                                      gimp_palette_get_entry (palette, index));
+
+      gimp_colormap_editor_update_entries (editor);
+    }
+
+  if (color)
+    gimp_image_get_colormap_entry (GIMP_IMAGE_EDITOR (editor)->image,
+                                   index, color);
+
+  return TRUE;
+}
+
+gint
+gimp_colormap_editor_max_index (GimpColormapEditor *editor)
+{
+  GimpImage *image;
+
+  g_return_val_if_fail (GIMP_IS_COLORMAP_EDITOR (editor), -1);
+
+  image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (! HAVE_COLORMAP (image))
+    return -1;
+
+  return MAX (0, gimp_image_get_colormap_size (image) - 1);
+}
+
+
+/*  private functions  */
+
+static PangoLayout *
+gimp_colormap_editor_create_layout (GtkWidget *widget)
+{
+  PangoLayout    *layout;
+  PangoAttrList  *attrs;
+  PangoAttribute *attr;
+
+  layout = gtk_widget_create_pango_layout (widget,
+                                           _("Only indexed images have "
+                                             "a colormap."));
+
+  pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+
+  attrs = pango_attr_list_new ();
+
+  attr = pango_attr_style_new (PANGO_STYLE_ITALIC);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (attrs, attr);
+
+  pango_layout_set_attributes (layout, attrs);
+  pango_attr_list_unref (attrs);
+
+  return layout;
+}
+
+static gboolean
+gimp_colormap_preview_expose (GtkWidget          *widget,
+                              GdkEventExpose     *event,
+                              GimpColormapEditor *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GtkStyle        *style;
+  cairo_t         *cr;
+  GtkAllocation    allocation;
+  gint             width, height;
+  gint             y;
+
+  if (image_editor->image == NULL ||
+      gimp_image_get_base_type (image_editor->image) == GIMP_INDEXED)
+    return FALSE;
+
+  cr = gdk_cairo_create (event->window);
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  style = gtk_widget_get_style (widget);
+  gdk_cairo_set_source_color (cr, &style->fg[gtk_widget_get_state (widget)]);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  if (! gtk_widget_get_has_window (widget))
+    cairo_translate (cr, allocation.x, allocation.y);
+
+  if (! editor->layout)
+    editor->layout = gimp_colormap_editor_create_layout (editor->view);
+
+  pango_layout_set_width (editor->layout,
+                          PANGO_SCALE * (allocation.width - 2 * BORDER));
+
+  pango_layout_get_pixel_size (editor->layout, &width, &height);
+
+  y = (allocation.height - height) / 2;
+
+  cairo_move_to (cr, BORDER, MAX (y, 0));
+  pango_cairo_show_layout (cr, editor->layout);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+static void
+gimp_colormap_editor_update_entries (GimpColormapEditor *editor)
+{
+  GimpImage *image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (! HAVE_COLORMAP (image) ||
+      ! gimp_image_get_colormap_size (image))
+    {
+      gtk_widget_set_sensitive (editor->index_spinbutton, FALSE);
+      gtk_widget_set_sensitive (editor->color_entry, FALSE);
+
+      gtk_adjustment_set_value (editor->index_adjustment, 0);
+      gtk_entry_set_text (GTK_ENTRY (editor->color_entry), "");
+    }
+  else
+    {
+      const guchar *colormap = gimp_image_get_colormap (image);
+      const guchar *col;
+      gchar        *string;
+
+      gtk_adjustment_set_value (editor->index_adjustment, editor->col_index);
+
+      col = colormap + editor->col_index * 3;
+
+      string = g_strdup_printf ("%02x%02x%02x", col[0], col[1], col[2]);
+      gtk_entry_set_text (GTK_ENTRY (editor->color_entry), string);
+      g_free (string);
+
+      gtk_widget_set_sensitive (editor->index_spinbutton, TRUE);
+      gtk_widget_set_sensitive (editor->color_entry, TRUE);
+    }
+}
+
+static void
+gimp_colormap_editor_entry_clicked (GimpPaletteView    *view,
+                                    GimpPaletteEntry   *entry,
+                                    GdkModifierType     state,
+                                    GimpColormapEditor *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+
+  gimp_colormap_editor_set_index (editor, entry->position, NULL);
+
+  if (state & gimp_get_toggle_behavior_mask ())
+    gimp_context_set_background (image_editor->context, &entry->color);
+  else
+    gimp_context_set_foreground (image_editor->context, &entry->color);
+}
+
+static void
+gimp_colormap_editor_entry_selected (GimpPaletteView    *view,
+                                     GimpPaletteEntry   *entry,
+                                     GimpColormapEditor *editor)
+{
+  gint index = entry ? entry->position : 0;
+
+  gimp_colormap_editor_set_index (editor, index, NULL);
+}
+
+static void
+gimp_colormap_editor_entry_activated (GimpPaletteView    *view,
+                                      GimpPaletteEntry   *entry,
+                                      GimpColormapEditor *editor)
+{
+  gimp_colormap_editor_set_index (editor, entry->position, NULL);
+
+  gimp_ui_manager_activate_action (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                                   "colormap",
+                                   "colormap-edit-color");
+}
+
+static void
+gimp_colormap_editor_entry_context (GimpPaletteView    *view,
+                                    GimpPaletteEntry   *entry,
+                                    GimpColormapEditor *editor)
+{
+  gimp_colormap_editor_set_index (editor, entry->position, NULL);
+
+  gimp_editor_popup_menu (GIMP_EDITOR (editor), NULL, NULL);
+}
+
+static void
+gimp_colormap_editor_color_dropped (GimpPaletteView    *view,
+                                    GimpPaletteEntry   *entry,
+                                    const GimpRGB      *color,
+                                    GimpColormapEditor *editor)
+{
+}
+
+static void
+gimp_colormap_adjustment_changed (GtkAdjustment      *adjustment,
+                                  GimpColormapEditor *editor)
+{
+  GimpImage *image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (HAVE_COLORMAP (image))
+    {
+      gint index = ROUND (gtk_adjustment_get_value (adjustment));
+
+      gimp_colormap_editor_set_index (editor, index, NULL);
+
+      gimp_colormap_editor_update_entries (editor);
+    }
+}
+
+static void
+gimp_colormap_hex_entry_changed (GimpColorHexEntry  *entry,
+                                 GimpColormapEditor *editor)
+{
+  GimpImage *image = GIMP_IMAGE_EDITOR (editor)->image;
+
+  if (image)
+    {
+      GimpRGB color;
+
+      gimp_color_hex_entry_get_color (entry, &color);
+
+      gimp_image_set_colormap_entry (image, editor->col_index, &color, TRUE);
+      gimp_image_flush (image);
+    }
+}
+
+static void
+gimp_colormap_image_mode_changed (GimpImage          *image,
+                                  GimpColormapEditor *editor)
+{
+  if (editor->color_dialog)
+    gtk_widget_hide (editor->color_dialog);
+
+  gimp_colormap_image_colormap_changed (image, -1, editor);
+}
+
+static void
+gimp_colormap_image_colormap_changed (GimpImage          *image,
+                                      gint                ncol,
+                                      GimpColormapEditor *editor)
+{
+  if (HAVE_COLORMAP (image))
+    {
+      gimp_view_set_viewable (GIMP_VIEW (editor->view),
+                              GIMP_VIEWABLE (gimp_image_get_colormap_palette (image)));
+
+      gtk_adjustment_set_upper (editor->index_adjustment,
+                                gimp_image_get_colormap_size (image) - 1);
+    }
+  else
+    {
+      gimp_view_set_viewable (GIMP_VIEW (editor->view), NULL);
+    }
+
+  if (ncol == editor->col_index || ncol == -1)
+    gimp_colormap_editor_update_entries (editor);
+}
+
+static void
+gimp_colormap_editor_edit_color_update (GimpColorDialog      *dialog,
+                                        const GimpRGB        *color,
+                                        GimpColorDialogState  state,
+                                        GimpColormapEditor   *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GimpImage       *image        = image_editor->image;
+  gboolean         push_undo    = FALSE;
+
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_OK:
+      push_undo = TRUE;
+
+      if (state & gimp_get_toggle_behavior_mask ())
+        gimp_context_set_background (image_editor->context, color);
+      else
+        gimp_context_set_foreground (image_editor->context, color);
+      /* Fall through */
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      gtk_widget_hide (editor->color_dialog);
+      break;
+
+    case GIMP_COLOR_DIALOG_UPDATE:
+      break;
+    }
+
+  if (image)
+    {
+      if (push_undo)
+        {
+          GimpRGB old_color;
+
+          gimp_color_selection_get_old_color (
+            GIMP_COLOR_SELECTION (dialog->selection), &old_color);
+
+          /* Restore old color for undo */
+          gimp_image_set_colormap_entry (image, editor->col_index, &old_color,
+                                         FALSE);
+        }
+
+      gimp_image_set_colormap_entry (image, editor->col_index, color,
+                                     push_undo);
+
+      if (push_undo)
+        gimp_image_flush (image);
+      else
+        gimp_projection_flush (gimp_image_get_projection (image));
+    }
+}
diff --git a/app/widgets/gimpcolormapeditor.h b/app/widgets/gimpcolormapeditor.h
new file mode 100644
index 0000000..fd539da
--- /dev/null
+++ b/app/widgets/gimpcolormapeditor.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLORMAP_EDITOR_H__
+#define __GIMP_COLORMAP_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_COLORMAP_EDITOR            (gimp_colormap_editor_get_type ())
+#define GIMP_COLORMAP_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLORMAP_EDITOR, GimpColormapEditor))
+#define GIMP_COLORMAP_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLORMAP_EDITOR, GimpColormapEditorClass))
+#define GIMP_IS_COLORMAP_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLORMAP_EDITOR))
+#define GIMP_IS_COLORMAP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLORMAP_EDITOR))
+#define GIMP_COLORMAP_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLORMAP_EDITOR, GimpColormapEditorClass))
+
+
+typedef struct _GimpColormapEditorClass GimpColormapEditorClass;
+
+struct _GimpColormapEditor
+{
+  GimpImageEditor  parent_instance;
+
+  GtkWidget       *view;
+  gint             col_index;
+
+  PangoLayout     *layout;
+
+  GtkAdjustment   *index_adjustment;
+  GtkWidget       *index_spinbutton;
+  GtkWidget       *color_entry;
+
+  GtkWidget       *color_dialog;
+};
+
+struct _GimpColormapEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_colormap_editor_get_type   (void) G_GNUC_CONST;
+
+GtkWidget * gimp_colormap_editor_new        (GimpMenuFactory    *menu_factory);
+
+void        gimp_colormap_editor_edit_color (GimpColormapEditor *editor);
+
+gint        gimp_colormap_editor_get_index  (GimpColormapEditor *editor,
+                                             const GimpRGB      *search);
+gboolean    gimp_colormap_editor_set_index  (GimpColormapEditor *editor,
+                                             gint                index,
+                                             GimpRGB            *color);
+
+gint        gimp_colormap_editor_max_index  (GimpColormapEditor *editor);
+
+
+#endif /* __GIMP_COLORMAP_EDITOR_H__ */
diff --git a/app/widgets/gimpcolorpanel.c b/app/widgets/gimpcolorpanel.c
new file mode 100644
index 0000000..ccb816e
--- /dev/null
+++ b/app/widgets/gimpcolorpanel.c
@@ -0,0 +1,331 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpaction.h"
+#include "gimpactiongroup.h"
+#include "gimpactionimpl.h"
+#include "gimpcolordialog.h"
+#include "gimpcolorpanel.h"
+
+
+#define RGBA_EPSILON 1e-6
+
+enum
+{
+  RESPONSE,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_color_panel_dispose         (GObject            *object);
+
+static gboolean   gimp_color_panel_button_press    (GtkWidget          *widget,
+                                                    GdkEventButton     *bevent);
+
+static void       gimp_color_panel_clicked         (GtkButton          *button);
+
+static void       gimp_color_panel_color_changed   (GimpColorButton    *button);
+static GType      gimp_color_panel_get_action_type (GimpColorButton    *button);
+
+static void       gimp_color_panel_dialog_update   (GimpColorDialog    *dialog,
+                                                    const GimpRGB      *color,
+                                                    GimpColorDialogState state,
+                                                    GimpColorPanel     *panel);
+
+
+G_DEFINE_TYPE (GimpColorPanel, gimp_color_panel, GIMP_TYPE_COLOR_BUTTON)
+
+#define parent_class gimp_color_panel_parent_class
+
+static guint color_panel_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_color_panel_class_init (GimpColorPanelClass *klass)
+{
+  GObjectClass         *object_class       = G_OBJECT_CLASS (klass);
+  GtkWidgetClass       *widget_class       = GTK_WIDGET_CLASS (klass);
+  GtkButtonClass       *button_class       = GTK_BUTTON_CLASS (klass);
+  GimpColorButtonClass *color_button_class = GIMP_COLOR_BUTTON_CLASS (klass);
+
+  object_class->dispose               = gimp_color_panel_dispose;
+
+  widget_class->button_press_event    = gimp_color_panel_button_press;
+
+  button_class->clicked               = gimp_color_panel_clicked;
+
+  color_button_class->color_changed   = gimp_color_panel_color_changed;
+  color_button_class->get_action_type = gimp_color_panel_get_action_type;
+
+  color_panel_signals[RESPONSE] =
+    g_signal_new ("response",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpColorPanelClass, response),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_COLOR_DIALOG_STATE);
+}
+
+static void
+gimp_color_panel_init (GimpColorPanel *panel)
+{
+  panel->context      = NULL;
+  panel->color_dialog = NULL;
+}
+
+static void
+gimp_color_panel_dispose (GObject *object)
+{
+  GimpColorPanel *panel = GIMP_COLOR_PANEL (object);
+
+  if (panel->color_dialog)
+    {
+      gtk_widget_destroy (panel->color_dialog);
+      panel->color_dialog = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static gboolean
+gimp_color_panel_button_press (GtkWidget      *widget,
+                               GdkEventButton *bevent)
+{
+  if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+    {
+      GimpColorButton *color_button;
+      GimpColorPanel  *color_panel;
+      GtkUIManager    *ui_manager;
+      GimpActionGroup *group;
+      GimpAction      *action;
+      GimpRGB          color;
+
+      color_button = GIMP_COLOR_BUTTON (widget);
+      color_panel  = GIMP_COLOR_PANEL (widget);
+      ui_manager   = gimp_color_button_get_ui_manager (color_button);
+
+      group = gtk_ui_manager_get_action_groups (ui_manager)->data;
+
+      action = gimp_action_group_get_action (group,
+                                             "color-button-use-foreground");
+      gimp_action_set_visible (action, color_panel->context != NULL);
+
+      action = gimp_action_group_get_action (group,
+                                             "color-button-use-background");
+      gimp_action_set_visible (action, color_panel->context != NULL);
+
+      if (color_panel->context)
+        {
+          action = gimp_action_group_get_action (group,
+                                                 "color-button-use-foreground");
+          gimp_context_get_foreground (color_panel->context, &color);
+          g_object_set (action, "color", &color, NULL);
+
+          action = gimp_action_group_get_action (group,
+                                                 "color-button-use-background");
+          gimp_context_get_background (color_panel->context, &color);
+          g_object_set (action, "color", &color, NULL);
+        }
+
+      action = gimp_action_group_get_action (group, "color-button-use-black");
+      gimp_rgba_set (&color, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+      g_object_set (action, "color", &color, NULL);
+
+      action = gimp_action_group_get_action (group, "color-button-use-white");
+      gimp_rgba_set (&color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+      g_object_set (action, "color", &color, NULL);
+    }
+
+  if (GTK_WIDGET_CLASS (parent_class)->button_press_event)
+    return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, bevent);
+
+  return FALSE;
+}
+
+static void
+gimp_color_panel_clicked (GtkButton *button)
+{
+  GimpColorPanel *panel = GIMP_COLOR_PANEL (button);
+  GimpRGB         color;
+
+  gimp_color_button_get_color (GIMP_COLOR_BUTTON (button), &color);
+
+  if (! panel->color_dialog)
+    {
+      GimpColorButton *color_button = GIMP_COLOR_BUTTON (button);
+
+      panel->color_dialog =
+        gimp_color_dialog_new (NULL, panel->context,
+                               gimp_color_button_get_title (color_button),
+                               NULL, NULL,
+                               GTK_WIDGET (button),
+                               NULL, NULL,
+                               &color,
+                               gimp_color_button_get_update (color_button),
+                               gimp_color_button_has_alpha (color_button));
+
+      g_signal_connect (panel->color_dialog, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &panel->color_dialog);
+
+      g_signal_connect (panel->color_dialog, "update",
+                        G_CALLBACK (gimp_color_panel_dialog_update),
+                        panel);
+    }
+  else
+    {
+      gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (panel->color_dialog),
+                                   &color);
+    }
+
+  gtk_window_present (GTK_WINDOW (panel->color_dialog));
+}
+
+static GType
+gimp_color_panel_get_action_type (GimpColorButton *button)
+{
+  return GIMP_TYPE_ACTION_IMPL;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_color_panel_new (const gchar       *title,
+                      const GimpRGB     *color,
+                      GimpColorAreaType  type,
+                      gint               width,
+                      gint               height)
+{
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (color != NULL, NULL);
+  g_return_val_if_fail (width > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+
+  return g_object_new (GIMP_TYPE_COLOR_PANEL,
+                       "title",       title,
+                       "type",        type,
+                       "color",       color,
+                       "area-width",  width,
+                       "area-height", height,
+                       NULL);
+}
+
+static void
+gimp_color_panel_color_changed (GimpColorButton *button)
+{
+  GimpColorPanel *panel = GIMP_COLOR_PANEL (button);
+  GimpRGB         color;
+
+  if (panel->color_dialog)
+    {
+      GimpRGB dialog_color;
+
+      gimp_color_button_get_color (GIMP_COLOR_BUTTON (button), &color);
+      gimp_color_dialog_get_color (GIMP_COLOR_DIALOG (panel->color_dialog),
+                                   &dialog_color);
+
+      if (gimp_rgba_distance (&color, &dialog_color) > RGBA_EPSILON ||
+          color.a != dialog_color.a)
+        {
+          gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (panel->color_dialog),
+                                       &color);
+        }
+    }
+}
+
+void
+gimp_color_panel_set_context (GimpColorPanel *panel,
+                              GimpContext    *context)
+{
+  g_return_if_fail (GIMP_IS_COLOR_PANEL (panel));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  panel->context = context;
+
+  if (context)
+    gimp_color_button_set_color_config (GIMP_COLOR_BUTTON (panel),
+                                        context->gimp->config->color_management);
+}
+
+void
+gimp_color_panel_dialog_response (GimpColorPanel       *panel,
+                                  GimpColorDialogState  state)
+{
+  g_return_if_fail (GIMP_IS_COLOR_PANEL (panel));
+  g_return_if_fail (state == GIMP_COLOR_DIALOG_OK ||
+                    state == GIMP_COLOR_DIALOG_CANCEL);
+
+  if (panel->color_dialog && gtk_widget_get_visible (panel->color_dialog))
+    gimp_color_panel_dialog_update (NULL, NULL, state, panel);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_color_panel_dialog_update (GimpColorDialog      *dialog,
+                                const GimpRGB        *color,
+                                GimpColorDialogState  state,
+                                GimpColorPanel       *panel)
+{
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_UPDATE:
+      if (gimp_color_button_get_update (GIMP_COLOR_BUTTON (panel)))
+        gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
+      break;
+
+    case GIMP_COLOR_DIALOG_OK:
+      if (! gimp_color_button_get_update (GIMP_COLOR_BUTTON (panel)))
+        gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
+      gtk_widget_hide (panel->color_dialog);
+
+      g_signal_emit (panel, color_panel_signals[RESPONSE], 0,
+                     state);
+      break;
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      if (gimp_color_button_get_update (GIMP_COLOR_BUTTON (panel)))
+        gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color);
+      gtk_widget_hide (panel->color_dialog);
+
+      g_signal_emit (panel, color_panel_signals[RESPONSE], 0,
+                     state);
+      break;
+    }
+}
diff --git a/app/widgets/gimpcolorpanel.h b/app/widgets/gimpcolorpanel.h
new file mode 100644
index 0000000..a5a2e10
--- /dev/null
+++ b/app/widgets/gimpcolorpanel.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_PANEL_H__
+#define __GIMP_COLOR_PANEL_H__
+
+
+#define GIMP_TYPE_COLOR_PANEL            (gimp_color_panel_get_type ())
+#define GIMP_COLOR_PANEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_PANEL, GimpColorPanel))
+#define GIMP_COLOR_PANEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_PANEL, GimpColorPanelClass))
+#define GIMP_IS_COLOR_PANEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_PANEL))
+#define GIMP_IS_COLOR_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_PANEL))
+#define GIMP_COLOR_PANEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_PANEL, GimpColorPanelClass))
+
+
+typedef struct _GimpColorPanelClass GimpColorPanelClass;
+
+struct _GimpColorPanel
+{
+  GimpColorButton  parent_instance;
+
+  GimpContext     *context;
+  GtkWidget       *color_dialog;
+};
+
+struct _GimpColorPanelClass
+{
+  GimpColorButtonClass  parent_class;
+
+  /*  signals  */
+  void (* response) (GimpColorPanel       *panel,
+                     GimpColorDialogState  state);
+};
+
+
+GType       gimp_color_panel_get_type        (void) G_GNUC_CONST;
+
+GtkWidget * gimp_color_panel_new             (const gchar          *title,
+                                              const GimpRGB        *color,
+                                              GimpColorAreaType     type,
+                                              gint                  width,
+                                              gint                  height);
+
+void        gimp_color_panel_set_context     (GimpColorPanel       *panel,
+                                              GimpContext          *context);
+
+void        gimp_color_panel_dialog_response (GimpColorPanel       *panel,
+                                              GimpColorDialogState  state);
+
+
+#endif  /*  __GIMP_COLOR_PANEL_H__  */
diff --git a/app/widgets/gimpcolorselectorpalette.c b/app/widgets/gimpcolorselectorpalette.c
new file mode 100644
index 0000000..7c98c5a
--- /dev/null
+++ b/app/widgets/gimpcolorselectorpalette.c
@@ -0,0 +1,183 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcolorselectorpalette.c
+ * Copyright (C) 2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimppalette.h"
+
+#include "gimpcolorselectorpalette.h"
+#include "gimphelp-ids.h"
+#include "gimppaletteview.h"
+#include "gimpviewrendererpalette.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_color_selector_palette_set_color  (GimpColorSelector *selector,
+                                                      const GimpRGB     *rgb,
+                                                      const GimpHSV     *hsv);
+static void   gimp_color_selector_palette_set_config (GimpColorSelector *selector,
+                                                      GimpColorConfig   *config);
+
+
+G_DEFINE_TYPE (GimpColorSelectorPalette, gimp_color_selector_palette,
+               GIMP_TYPE_COLOR_SELECTOR)
+
+#define parent_class gimp_color_selector_palette_parent_class
+
+
+static void
+gimp_color_selector_palette_class_init (GimpColorSelectorPaletteClass *klass)
+{
+  GimpColorSelectorClass *selector_class = GIMP_COLOR_SELECTOR_CLASS (klass);
+
+  selector_class->name       = _("Palette");
+  selector_class->help_id    = GIMP_HELP_COLORSELECTOR_PALETTE;
+  selector_class->icon_name  = GIMP_ICON_PALETTE;
+  selector_class->set_color  = gimp_color_selector_palette_set_color;
+  selector_class->set_config = gimp_color_selector_palette_set_config;
+}
+
+static void
+gimp_color_selector_palette_init (GimpColorSelectorPalette *select)
+{
+}
+
+static void
+gimp_color_selector_palette_set_color (GimpColorSelector *selector,
+                                       const GimpRGB     *rgb,
+                                       const GimpHSV     *hsv)
+{
+  GimpColorSelectorPalette *select = GIMP_COLOR_SELECTOR_PALETTE (selector);
+
+  if (select->context)
+    {
+      GimpPalette *palette = gimp_context_get_palette (select->context);
+
+      if (palette && gimp_palette_get_n_colors (palette) > 0)
+        {
+          GimpPaletteEntry *entry;
+
+          entry = gimp_palette_find_entry (palette, rgb,
+                                           GIMP_PALETTE_VIEW (select->view)->selected);
+
+          if (entry)
+            gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (select->view),
+                                            entry);
+        }
+    }
+}
+
+static void
+gimp_color_selector_palette_palette_changed (GimpContext              *context,
+                                             GimpPalette              *palette,
+                                             GimpColorSelectorPalette *select)
+{
+  gimp_view_set_viewable (GIMP_VIEW (select->view), GIMP_VIEWABLE (palette));
+}
+
+static void
+gimp_color_selector_palette_entry_clicked (GimpPaletteView   *view,
+                                           GimpPaletteEntry  *entry,
+                                           GdkModifierType    state,
+                                           GimpColorSelector *selector)
+{
+  selector->rgb = entry->color;
+  gimp_rgb_to_hsv (&selector->rgb, &selector->hsv);
+
+  gimp_color_selector_color_changed (selector);
+}
+
+static void
+gimp_color_selector_palette_set_config (GimpColorSelector *selector,
+                                        GimpColorConfig   *config)
+{
+  GimpColorSelectorPalette *select = GIMP_COLOR_SELECTOR_PALETTE (selector);
+
+  if (select->context)
+    {
+      g_signal_handlers_disconnect_by_func (select->context,
+                                            gimp_color_selector_palette_palette_changed,
+                                            select);
+      gimp_view_renderer_set_context (GIMP_VIEW (select->view)->renderer,
+                                      NULL);
+
+      g_clear_object (&select->context);
+    }
+
+  if (config)
+    select->context = g_object_get_data (G_OBJECT (config), "gimp-context");
+
+  if (select->context)
+    {
+      g_object_ref (select->context);
+
+      if (! select->view)
+        {
+          GtkWidget *frame;
+
+          frame = gtk_frame_new (NULL);
+          gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+          gtk_box_pack_start (GTK_BOX (select), frame, TRUE, TRUE, 0);
+          gtk_widget_show (frame);
+
+          select->view = gimp_view_new_full_by_types (select->context,
+                                                      GIMP_TYPE_PALETTE_VIEW,
+                                                      GIMP_TYPE_PALETTE,
+                                                      100, 100, 0,
+                                                      FALSE, TRUE, FALSE);
+          gimp_view_set_expand (GIMP_VIEW (select->view), TRUE);
+          gimp_view_renderer_palette_set_cell_size
+            (GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (select->view)->renderer),
+             -1);
+          gimp_view_renderer_palette_set_draw_grid
+            (GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (select->view)->renderer),
+             TRUE);
+          gtk_container_add (GTK_CONTAINER (frame), select->view);
+          gtk_widget_show (select->view);
+
+          g_signal_connect (select->view, "entry-clicked",
+                            G_CALLBACK (gimp_color_selector_palette_entry_clicked),
+                            select);
+        }
+      else
+        {
+          gimp_view_renderer_set_context (GIMP_VIEW (select->view)->renderer,
+                                          select->context);
+        }
+
+      g_signal_connect_object (select->context, "palette-changed",
+                               G_CALLBACK (gimp_color_selector_palette_palette_changed),
+                               select, 0);
+
+      gimp_color_selector_palette_palette_changed (select->context,
+                                                   gimp_context_get_palette (select->context),
+                                                   select);
+    }
+}
diff --git a/app/widgets/gimpcolorselectorpalette.h b/app/widgets/gimpcolorselectorpalette.h
new file mode 100644
index 0000000..fc4268e
--- /dev/null
+++ b/app/widgets/gimpcolorselectorpalette.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcolorselectorpalette.h
+ * Copyright (C) 2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COLOR_SELECTOR_PALETTE_H__
+#define __GIMP_COLOR_SELECTOR_PALETTE_H__
+
+
+#define GIMP_TYPE_COLOR_SELECTOR_PALETTE            (gimp_color_selector_palette_get_type ())
+#define GIMP_COLOR_SELECTOR_PALETTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_SELECTOR_PALETTE, GimpColorSelectorPalette))
+#define GIMP_IS_COLOR_SELECTOR_PALETTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_SELECTOR_PALETTE))
+#define GIMP_COLOR_SELECTOR_PALETTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_SELECTOR_PALETTE, GimpColorSelectorPaletteClass))
+#define GIMP_IS_COLOR_SELECTOR_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_SELECTOR_PALETTE))
+#define GIMP_COLOR_SELECTOR_PALETTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_SELECTOR_PALETTE, GimpColorSelectorPaletteClass))
+
+
+typedef struct _GimpColorSelectorPalette      GimpColorSelectorPalette;
+typedef struct _GimpColorSelectorPaletteClass GimpColorSelectorPaletteClass;
+
+struct _GimpColorSelectorPalette
+{
+  GimpColorSelector  parent_instance;
+
+  GimpContext       *context;
+  GtkWidget         *view;
+};
+
+struct _GimpColorSelectorPaletteClass
+{
+  GimpColorSelectorClass  parent_class;
+};
+
+
+GType   gimp_color_selector_palette_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_COLOR_SELECTOR_PALETTE_H__ */
diff --git a/app/widgets/gimpcombotagentry.c b/app/widgets/gimpcombotagentry.c
new file mode 100644
index 0000000..7aaaee9
--- /dev/null
+++ b/app/widgets/gimpcombotagentry.c
@@ -0,0 +1,307 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcombotagentry.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptag.h"
+#include "core/gimptagged.h"
+#include "core/gimptaggedcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimptagentry.h"
+#include "gimptagpopup.h"
+#include "gimpcombotagentry.h"
+
+
+static void     gimp_combo_tag_entry_constructed       (GObject              *object);
+static void     gimp_combo_tag_entry_dispose           (GObject              *object);
+
+static gboolean gimp_combo_tag_entry_expose            (GtkWidget            *widget,
+                                                        GdkEventExpose       *event);
+static void     gimp_combo_tag_entry_style_set         (GtkWidget            *widget,
+                                                        GtkStyle             *previous_style);
+
+static void     gimp_combo_tag_entry_icon_press        (GtkWidget            *widget,
+                                                        GtkEntryIconPosition  icon_pos,
+                                                        GdkEvent             *event,
+                                                        gpointer              user_data);
+
+static void     gimp_combo_tag_entry_popup_destroy     (GtkWidget            *widget,
+                                                        GimpComboTagEntry    *entry);
+
+static void     gimp_combo_tag_entry_tag_count_changed (GimpTaggedContainer  *container,
+                                                        gint                  tag_count,
+                                                        GimpComboTagEntry    *entry);
+
+
+G_DEFINE_TYPE (GimpComboTagEntry, gimp_combo_tag_entry, GIMP_TYPE_TAG_ENTRY);
+
+#define parent_class gimp_combo_tag_entry_parent_class
+
+
+static void
+gimp_combo_tag_entry_class_init (GimpComboTagEntryClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed  = gimp_combo_tag_entry_constructed;
+  object_class->dispose      = gimp_combo_tag_entry_dispose;
+
+  widget_class->expose_event = gimp_combo_tag_entry_expose;
+  widget_class->style_set    = gimp_combo_tag_entry_style_set;
+}
+
+static void
+gimp_combo_tag_entry_init (GimpComboTagEntry *entry)
+{
+  entry->popup                 = NULL;
+  entry->normal_item_attr      = NULL;
+  entry->selected_item_attr    = NULL;
+  entry->insensitive_item_attr = NULL;
+
+  gtk_widget_add_events (GTK_WIDGET (entry),
+                         GDK_BUTTON_PRESS_MASK |
+                         GDK_POINTER_MOTION_MASK);
+
+  gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     GIMP_ICON_GO_DOWN);
+
+  g_signal_connect (entry, "icon-press",
+                    G_CALLBACK (gimp_combo_tag_entry_icon_press),
+                    NULL);
+}
+
+static void
+gimp_combo_tag_entry_constructed (GObject *object)
+{
+  GimpComboTagEntry *entry = GIMP_COMBO_TAG_ENTRY (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_signal_connect_object (GIMP_TAG_ENTRY (entry)->container,
+                           "tag-count-changed",
+                           G_CALLBACK (gimp_combo_tag_entry_tag_count_changed),
+                           entry, 0);
+}
+
+static void
+gimp_combo_tag_entry_dispose (GObject *object)
+{
+  GimpComboTagEntry *combo_entry = GIMP_COMBO_TAG_ENTRY (object);
+
+  g_clear_object (&combo_entry->arrow_pixbuf);
+
+  if (combo_entry->normal_item_attr)
+    {
+      pango_attr_list_unref (combo_entry->normal_item_attr);
+      combo_entry->normal_item_attr = NULL;
+    }
+
+  if (combo_entry->selected_item_attr)
+    {
+      pango_attr_list_unref (combo_entry->selected_item_attr);
+      combo_entry->selected_item_attr = NULL;
+    }
+
+  if (combo_entry->insensitive_item_attr)
+    {
+      pango_attr_list_unref (combo_entry->insensitive_item_attr);
+      combo_entry->insensitive_item_attr = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static gboolean
+gimp_combo_tag_entry_expose (GtkWidget      *widget,
+                             GdkEventExpose *event)
+{
+  GimpComboTagEntry *entry = GIMP_COMBO_TAG_ENTRY (widget);
+
+  if (! entry->arrow_pixbuf)
+    {
+      GtkStyle  *style = gtk_widget_get_style (widget);
+      GdkPixmap *pixmap;
+      cairo_t   *cr;
+
+      pixmap = gdk_pixmap_new (gtk_widget_get_window (widget), 8, 8, -1);
+
+      cr = gdk_cairo_create (pixmap);
+      gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
+      cairo_paint (cr);
+      cairo_destroy (cr);
+
+      gtk_paint_arrow (style, pixmap,
+                       GTK_STATE_NORMAL,
+                       GTK_SHADOW_NONE, NULL, widget, NULL,
+                       GTK_ARROW_DOWN, TRUE,
+                       0, 0, 8, 8);
+
+      entry->arrow_pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL,
+                                                          0, 0, 0, 0, 8, 8);
+
+      g_object_unref (pixmap);
+
+      gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry),
+                                      GTK_ENTRY_ICON_SECONDARY,
+                                      entry->arrow_pixbuf);
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+}
+
+static void
+gimp_combo_tag_entry_style_set (GtkWidget *widget,
+                                GtkStyle  *previous_style)
+{
+  GimpComboTagEntry *entry = GIMP_COMBO_TAG_ENTRY (widget);
+  GtkStyle          *style = gtk_widget_get_style (widget);
+  GdkColor           color;
+  PangoAttribute    *attribute;
+
+  if (GTK_WIDGET_CLASS (parent_class)->style_set)
+    GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
+
+  if (entry->normal_item_attr)
+    pango_attr_list_unref (entry->normal_item_attr);
+  entry->normal_item_attr = pango_attr_list_new ();
+
+  if (style->font_desc)
+    {
+      attribute = pango_attr_font_desc_new (style->font_desc);
+      pango_attr_list_insert (entry->normal_item_attr, attribute);
+    }
+  color = style->text[GTK_STATE_NORMAL];
+  attribute = pango_attr_foreground_new (color.red, color.green, color.blue);
+  pango_attr_list_insert (entry->normal_item_attr, attribute);
+
+  if (entry->selected_item_attr)
+    pango_attr_list_unref (entry->selected_item_attr);
+  entry->selected_item_attr = pango_attr_list_copy (entry->normal_item_attr);
+
+  color = style->text[GTK_STATE_SELECTED];
+  attribute = pango_attr_foreground_new (color.red, color.green, color.blue);
+  pango_attr_list_insert (entry->selected_item_attr, attribute);
+  color = style->base[GTK_STATE_SELECTED];
+  attribute = pango_attr_background_new (color.red, color.green, color.blue);
+  pango_attr_list_insert (entry->selected_item_attr, attribute);
+
+  if (entry->insensitive_item_attr)
+    pango_attr_list_unref (entry->insensitive_item_attr);
+  entry->insensitive_item_attr = pango_attr_list_copy (entry->normal_item_attr);
+
+  color = style->text[GTK_STATE_INSENSITIVE];
+  attribute = pango_attr_foreground_new (color.red, color.green, color.blue);
+  pango_attr_list_insert (entry->insensitive_item_attr, attribute);
+  color = style->base[GTK_STATE_INSENSITIVE];
+  attribute = pango_attr_background_new (color.red, color.green, color.blue);
+  pango_attr_list_insert (entry->insensitive_item_attr, attribute);
+
+  entry->selected_item_color = style->base[GTK_STATE_SELECTED];
+
+  g_clear_object (&entry->arrow_pixbuf);
+}
+
+/**
+ * gimp_combo_tag_entry_new:
+ * @container: a tagged container to be used.
+ * @mode:      tag entry mode to work in.
+ *
+ * Creates a new #GimpComboTagEntry widget which extends #GimpTagEntry by
+ * adding ability to pick tags using popup window (similar to combo box).
+ *
+ * Return value: a new #GimpComboTagEntry widget.
+ **/
+GtkWidget *
+gimp_combo_tag_entry_new (GimpTaggedContainer *container,
+                          GimpTagEntryMode     mode)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED_CONTAINER (container), NULL);
+
+  return g_object_new (GIMP_TYPE_COMBO_TAG_ENTRY,
+                       "container", container,
+                       "mode",      mode,
+                       NULL);
+}
+
+static void
+gimp_combo_tag_entry_icon_press (GtkWidget            *widget,
+                                 GtkEntryIconPosition  icon_pos,
+                                 GdkEvent             *event,
+                                 gpointer              user_data)
+{
+  GimpComboTagEntry *entry = GIMP_COMBO_TAG_ENTRY (widget);
+
+  if (! entry->popup)
+    {
+      GimpTaggedContainer *container = GIMP_TAG_ENTRY (entry)->container;
+      gint                 tag_count;
+
+      tag_count = gimp_tagged_container_get_tag_count (container);
+
+      if (tag_count > 0 && ! GIMP_TAG_ENTRY (entry)->has_invalid_tags)
+        {
+          entry->popup = gimp_tag_popup_new (entry);
+          g_signal_connect (entry->popup, "destroy",
+                            G_CALLBACK (gimp_combo_tag_entry_popup_destroy),
+                            entry);
+          gimp_tag_popup_show (GIMP_TAG_POPUP (entry->popup));
+        }
+    }
+  else
+    {
+      gtk_widget_destroy (entry->popup);
+    }
+}
+
+static void
+gimp_combo_tag_entry_popup_destroy (GtkWidget         *widget,
+                                    GimpComboTagEntry *entry)
+{
+  entry->popup = NULL;
+  gtk_widget_grab_focus (GTK_WIDGET (entry));
+}
+
+static void
+gimp_combo_tag_entry_tag_count_changed (GimpTaggedContainer *container,
+                                        gint                 tag_count,
+                                        GimpComboTagEntry   *entry)
+{
+  gboolean sensitive;
+
+  sensitive = tag_count > 0 && ! GIMP_TAG_ENTRY (entry)->has_invalid_tags;
+
+  gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
+                                GTK_ENTRY_ICON_SECONDARY,
+                                sensitive);
+}
diff --git a/app/widgets/gimpcombotagentry.h b/app/widgets/gimpcombotagentry.h
new file mode 100644
index 0000000..5996dc0
--- /dev/null
+++ b/app/widgets/gimpcombotagentry.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcombotagentry.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COMBO_TAG_ENTRY_H__
+#define __GIMP_COMBO_TAG_ENTRY_H__
+
+#include "gimptagentry.h"
+
+#define GIMP_TYPE_COMBO_TAG_ENTRY            (gimp_combo_tag_entry_get_type ())
+#define GIMP_COMBO_TAG_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COMBO_TAG_ENTRY, GimpComboTagEntry))
+#define GIMP_COMBO_TAG_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COMBO_TAG_ENTRY, GimpComboTagEntryClass))
+#define GIMP_IS_COMBO_TAG_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COMBO_TAG_ENTRY))
+#define GIMP_IS_COMBO_TAG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COMBO_TAG_ENTRY))
+#define GIMP_COMBO_TAG_ENTRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COMBO_TAG_ENTRY, GimpComboTagEntryClass))
+
+
+typedef struct _GimpComboTagEntryClass  GimpComboTagEntryClass;
+
+struct _GimpComboTagEntry
+{
+  GimpTagEntry    parent_instance;
+
+  GdkPixbuf      *arrow_pixbuf;
+
+  GtkWidget      *popup;
+  PangoAttrList  *normal_item_attr;
+  PangoAttrList  *selected_item_attr;
+  PangoAttrList  *insensitive_item_attr;
+  GdkColor        selected_item_color;
+};
+
+struct _GimpComboTagEntryClass
+{
+  GimpTagEntryClass  parent_class;
+};
+
+
+GType       gimp_combo_tag_entry_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_combo_tag_entry_new      (GimpTaggedContainer *container,
+                                           GimpTagEntryMode     mode);
+
+
+#endif  /*  __GIMP_COMBO_TAG_ENTRY_H__  */
diff --git a/app/widgets/gimpcomponenteditor.c b/app/widgets/gimpcomponenteditor.c
new file mode 100644
index 0000000..c16548d
--- /dev/null
+++ b/app/widgets/gimpcomponenteditor.c
@@ -0,0 +1,631 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcomponenteditor.c
+ * Copyright (C) 2003-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpchannel.h"
+#include "core/gimpimage.h"
+
+#include "gimpcellrendererviewable.h"
+#include "gimpcomponenteditor.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpmenufactory.h"
+#include "gimpviewrendererimage.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLUMN_CHANNEL,
+  COLUMN_VISIBLE,
+  COLUMN_RENDERER,
+  COLUMN_NAME,
+  N_COLUMNS
+};
+
+
+static void gimp_component_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void gimp_component_editor_set_context       (GimpDocked          *docked,
+                                                     GimpContext         *context);
+
+static void gimp_component_editor_set_image         (GimpImageEditor     *editor,
+                                                     GimpImage           *image);
+
+static void gimp_component_editor_create_components (GimpComponentEditor *editor);
+static void gimp_component_editor_clear_components  (GimpComponentEditor *editor);
+static void gimp_component_editor_clicked         (GtkCellRendererToggle *cellrenderertoggle,
+                                                   gchar                 *path,
+                                                   GdkModifierType        state,
+                                                   GimpComponentEditor   *editor);
+static gboolean gimp_component_editor_select        (GtkTreeSelection    *selection,
+                                                     GtkTreeModel        *model,
+                                                     GtkTreePath         *path,
+                                                     gboolean             path_currently_selected,
+                                                     gpointer             data);
+static gboolean gimp_component_editor_button_press  (GtkWidget           *widget,
+                                                     GdkEventButton      *bevent,
+                                                     GimpComponentEditor *editor);
+static void gimp_component_editor_renderer_update   (GimpViewRenderer    *renderer,
+                                                     GimpComponentEditor *editor);
+static void gimp_component_editor_mode_changed      (GimpImage           *image,
+                                                     GimpComponentEditor *editor);
+static void gimp_component_editor_alpha_changed     (GimpImage           *image,
+                                                     GimpComponentEditor *editor);
+static void gimp_component_editor_visibility_changed(GimpImage           *image,
+                                                     GimpChannelType      channel,
+                                                     GimpComponentEditor *editor);
+static void gimp_component_editor_active_changed    (GimpImage           *image,
+                                                     GimpChannelType      channel,
+                                                     GimpComponentEditor *editor);
+static GimpImage * gimp_component_editor_drag_component (GtkWidget       *widget,
+                                                         GimpContext    **context,
+                                                         GimpChannelType *channel,
+                                                         gpointer         data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpComponentEditor, gimp_component_editor,
+                         GIMP_TYPE_IMAGE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_component_editor_docked_iface_init))
+
+#define parent_class gimp_component_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_component_editor_class_init (GimpComponentEditorClass *klass)
+{
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  image_editor_class->set_image = gimp_component_editor_set_image;
+}
+
+static void
+gimp_component_editor_init (GimpComponentEditor *editor)
+{
+  GtkWidget    *frame;
+  GtkListStore *list;
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  list = gtk_list_store_new (N_COLUMNS,
+                             G_TYPE_INT,
+                             G_TYPE_BOOLEAN,
+                             GIMP_TYPE_VIEW_RENDERER,
+                             G_TYPE_STRING);
+  editor->model = GTK_TREE_MODEL (list);
+
+  editor->view = GTK_TREE_VIEW (gtk_tree_view_new_with_model (editor->model));
+  g_object_unref (list);
+
+  gtk_tree_view_set_headers_visible (editor->view, FALSE);
+
+  editor->eye_column = gtk_tree_view_column_new ();
+  gtk_tree_view_append_column (editor->view, editor->eye_column);
+
+  editor->eye_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_VISIBLE);
+  gtk_tree_view_column_pack_start (editor->eye_column, editor->eye_cell,
+                                   FALSE);
+  gtk_tree_view_column_set_attributes (editor->eye_column, editor->eye_cell,
+                                       "active", COLUMN_VISIBLE,
+                                       NULL);
+
+  g_signal_connect (editor->eye_cell, "clicked",
+                    G_CALLBACK (gimp_component_editor_clicked),
+                    editor);
+
+  editor->renderer_cell = gimp_cell_renderer_viewable_new ();
+  gtk_tree_view_insert_column_with_attributes (editor->view,
+                                               -1, NULL,
+                                               editor->renderer_cell,
+                                               "renderer", COLUMN_RENDERER,
+                                               NULL);
+
+  gtk_tree_view_insert_column_with_attributes (editor->view,
+                                               -1, NULL,
+                                               gtk_cell_renderer_text_new (),
+                                               "text", COLUMN_NAME,
+                                               NULL);
+
+  gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (editor->view));
+  gtk_widget_show (GTK_WIDGET (editor->view));
+
+  g_signal_connect (editor->view, "button-press-event",
+                    G_CALLBACK (gimp_component_editor_button_press),
+                    editor);
+
+  editor->selection = gtk_tree_view_get_selection (editor->view);
+  gtk_tree_selection_set_mode (editor->selection, GTK_SELECTION_MULTIPLE);
+
+  gtk_tree_selection_set_select_function (editor->selection,
+                                          gimp_component_editor_select,
+                                          editor, NULL);
+
+  gimp_dnd_component_source_add (GTK_WIDGET (editor->view),
+                                 gimp_component_editor_drag_component,
+                                 editor);
+}
+
+static void
+gimp_component_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_component_editor_set_context;
+}
+
+static void
+gimp_component_editor_set_context (GimpDocked  *docked,
+                                   GimpContext *context)
+{
+  GimpComponentEditor *editor = GIMP_COMPONENT_EDITOR (docked);
+  GtkTreeIter          iter;
+  gboolean             iter_valid;
+
+  parent_docked_iface->set_context (docked, context);
+
+  for (iter_valid = gtk_tree_model_get_iter_first (editor->model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (editor->model, &iter))
+    {
+      GimpViewRenderer *renderer;
+
+      gtk_tree_model_get (editor->model, &iter,
+                          COLUMN_RENDERER, &renderer,
+                          -1);
+
+      gimp_view_renderer_set_context (renderer, context);
+      g_object_unref (renderer);
+    }
+}
+
+static void
+gimp_component_editor_set_image (GimpImageEditor *editor,
+                                 GimpImage       *image)
+{
+  GimpComponentEditor *component_editor = GIMP_COMPONENT_EDITOR (editor);
+
+  if (editor->image)
+    {
+      gimp_component_editor_clear_components (component_editor);
+
+      g_signal_handlers_disconnect_by_func (editor->image,
+                                            gimp_component_editor_mode_changed,
+                                            component_editor);
+      g_signal_handlers_disconnect_by_func (editor->image,
+                                            gimp_component_editor_alpha_changed,
+                                            component_editor);
+      g_signal_handlers_disconnect_by_func (editor->image,
+                                            gimp_component_editor_visibility_changed,
+                                            component_editor);
+      g_signal_handlers_disconnect_by_func (editor->image,
+                                            gimp_component_editor_active_changed,
+                                            component_editor);
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (editor, image);
+
+  if (editor->image)
+    {
+      gimp_component_editor_create_components (component_editor);
+
+      g_signal_connect (editor->image, "mode-changed",
+                        G_CALLBACK (gimp_component_editor_mode_changed),
+                        component_editor);
+      g_signal_connect (editor->image, "alpha-changed",
+                        G_CALLBACK (gimp_component_editor_alpha_changed),
+                        component_editor);
+      g_signal_connect (editor->image, "component-visibility-changed",
+                        G_CALLBACK (gimp_component_editor_visibility_changed),
+                        component_editor);
+      g_signal_connect (editor->image, "component-active-changed",
+                        G_CALLBACK (gimp_component_editor_active_changed),
+                        component_editor);
+    }
+}
+
+GtkWidget *
+gimp_component_editor_new (gint             view_size,
+                           GimpMenuFactory *menu_factory)
+{
+  GimpComponentEditor *editor;
+
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  editor = g_object_new (GIMP_TYPE_COMPONENT_EDITOR,
+                         "menu-factory",    menu_factory,
+                         "menu-identifier", "<Channels>",
+                         "ui-path",         "/channels-popup",
+                         NULL);
+
+  gimp_component_editor_set_view_size (editor, view_size);
+
+  return GTK_WIDGET (editor);
+}
+
+void
+gimp_component_editor_set_view_size (GimpComponentEditor *editor,
+                                     gint                 view_size)
+{
+  GtkWidget   *tree_widget;
+  GtkStyle    *tree_style;
+  GtkIconSize  icon_size;
+  GtkTreeIter  iter;
+  gboolean     iter_valid;
+
+  g_return_if_fail (GIMP_IS_COMPONENT_EDITOR (editor));
+  g_return_if_fail (view_size >  0 &&
+                    view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+
+  tree_widget = GTK_WIDGET (editor->view);
+  tree_style  = gtk_widget_get_style (tree_widget);
+
+  icon_size = gimp_get_icon_size (tree_widget,
+                                  GIMP_ICON_VISIBLE,
+                                  GTK_ICON_SIZE_BUTTON,
+                                  view_size -
+                                  2 * tree_style->xthickness,
+                                  view_size -
+                                  2 * tree_style->ythickness);
+
+  g_object_set (editor->eye_cell,
+                "stock-size", icon_size,
+                NULL);
+
+  for (iter_valid = gtk_tree_model_get_iter_first (editor->model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (editor->model, &iter))
+    {
+      GimpViewRenderer *renderer;
+
+      gtk_tree_model_get (editor->model, &iter,
+                          COLUMN_RENDERER, &renderer,
+                          -1);
+
+      gimp_view_renderer_set_size (renderer, view_size, 1);
+      g_object_unref (renderer);
+    }
+
+  editor->view_size = view_size;
+
+  gtk_tree_view_columns_autosize (editor->view);
+}
+
+static void
+gimp_component_editor_create_components (GimpComponentEditor *editor)
+{
+  GimpImage       *image        = GIMP_IMAGE_EDITOR (editor)->image;
+  gint             n_components = 0;
+  GimpChannelType  components[MAX_CHANNELS];
+  GEnumClass      *enum_class;
+  gint             i;
+
+  switch (gimp_image_get_base_type (image))
+    {
+    case GIMP_RGB:
+      n_components  = 3;
+      components[0] = GIMP_CHANNEL_RED;
+      components[1] = GIMP_CHANNEL_GREEN;
+      components[2] = GIMP_CHANNEL_BLUE;
+      break;
+
+    case GIMP_GRAY:
+      n_components  = 1;
+      components[0] = GIMP_CHANNEL_GRAY;
+      break;
+
+    case GIMP_INDEXED:
+      n_components  = 1;
+      components[0] = GIMP_CHANNEL_INDEXED;
+      break;
+    }
+
+  if (gimp_image_has_alpha (image))
+    components[n_components++] = GIMP_CHANNEL_ALPHA;
+
+  enum_class = g_type_class_ref (GIMP_TYPE_CHANNEL_TYPE);
+
+  for (i = 0; i < n_components; i++)
+    {
+      GimpViewRenderer *renderer;
+      GtkTreeIter       iter;
+      GEnumValue       *enum_value;
+      const gchar      *desc;
+      gboolean          visible;
+
+      visible = gimp_image_get_component_visible (image, components[i]);
+
+      renderer = gimp_view_renderer_new (GIMP_IMAGE_EDITOR (editor)->context,
+                                         G_TYPE_FROM_INSTANCE (image),
+                                         editor->view_size, 1, FALSE);
+      gimp_view_renderer_set_viewable (renderer, GIMP_VIEWABLE (image));
+      gimp_view_renderer_remove_idle (renderer);
+
+      GIMP_VIEW_RENDERER_IMAGE (renderer)->channel = components[i];
+
+      g_signal_connect (renderer, "update",
+                        G_CALLBACK (gimp_component_editor_renderer_update),
+                        editor);
+
+      enum_value = g_enum_get_value (enum_class, components[i]);
+      desc = gimp_enum_value_get_desc (enum_class, enum_value);
+
+      gtk_list_store_append (GTK_LIST_STORE (editor->model), &iter);
+
+      gtk_list_store_set (GTK_LIST_STORE (editor->model), &iter,
+                          COLUMN_CHANNEL,  components[i],
+                          COLUMN_VISIBLE,  visible,
+                          COLUMN_RENDERER, renderer,
+                          COLUMN_NAME,     desc,
+                          -1);
+
+      g_object_unref (renderer);
+
+      if (gimp_image_get_component_active (image, components[i]))
+        gtk_tree_selection_select_iter (editor->selection, &iter);
+    }
+
+  g_type_class_unref (enum_class);
+}
+
+static void
+gimp_component_editor_clear_components (GimpComponentEditor *editor)
+{
+  gtk_list_store_clear (GTK_LIST_STORE (editor->model));
+
+  /*  Clear the renderer so that it don't reference the viewable.
+   *  See bug #149906.
+   */
+  g_object_set (editor->renderer_cell, "renderer", NULL, NULL);
+}
+
+static void
+gimp_component_editor_clicked (GtkCellRendererToggle *cellrenderertoggle,
+                               gchar                 *path_str,
+                               GdkModifierType        state,
+                               GimpComponentEditor   *editor)
+{
+  GtkTreePath *path;
+  GtkTreeIter  iter;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (editor->model, &iter, path))
+    {
+      GimpImage       *image = GIMP_IMAGE_EDITOR (editor)->image;
+      GimpChannelType  channel;
+      gboolean         active;
+
+      gtk_tree_model_get (editor->model, &iter,
+                          COLUMN_CHANNEL, &channel,
+                          -1);
+      g_object_get (cellrenderertoggle,
+                    "active", &active,
+                    NULL);
+
+      gimp_image_set_component_visible (image, channel, !active);
+      gimp_image_flush (image);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static gboolean
+gimp_component_editor_select (GtkTreeSelection *selection,
+                              GtkTreeModel     *model,
+                              GtkTreePath      *path,
+                              gboolean          path_currently_selected,
+                              gpointer          data)
+{
+  GimpComponentEditor *editor = GIMP_COMPONENT_EDITOR (data);
+  GtkTreeIter          iter;
+  GimpChannelType      channel;
+  gboolean             active;
+
+  gtk_tree_model_get_iter (editor->model, &iter, path);
+  gtk_tree_model_get (editor->model, &iter,
+                      COLUMN_CHANNEL, &channel,
+                      -1);
+
+  active = gimp_image_get_component_active (GIMP_IMAGE_EDITOR (editor)->image,
+                                            channel);
+
+  return active != path_currently_selected;
+}
+
+static gboolean
+gimp_component_editor_button_press (GtkWidget           *widget,
+                                    GdkEventButton      *bevent,
+                                    GimpComponentEditor *editor)
+{
+  GtkTreeViewColumn *column;
+  GtkTreePath       *path;
+
+  editor->clicked_component = -1;
+
+  if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
+                                     bevent->x,
+                                     bevent->y,
+                                     &path, &column, NULL, NULL))
+    {
+      GtkTreeIter     iter;
+      GimpChannelType channel;
+      gboolean        active;
+
+      active = gtk_tree_selection_path_is_selected (editor->selection, path);
+
+      gtk_tree_model_get_iter (editor->model, &iter, path);
+
+      gtk_tree_path_free (path);
+
+      gtk_tree_model_get (editor->model, &iter,
+                          COLUMN_CHANNEL, &channel,
+                          -1);
+
+      editor->clicked_component = channel;
+
+      if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+        {
+          gimp_editor_popup_menu (GIMP_EDITOR (editor), NULL, NULL);
+        }
+      else if (bevent->type == GDK_BUTTON_PRESS && bevent->button == 1 &&
+               column != editor->eye_column)
+        {
+          GimpImage *image = GIMP_IMAGE_EDITOR (editor)->image;
+
+          gimp_image_set_component_active (image, channel, ! active);
+          gimp_image_flush (image);
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_component_editor_get_iter (GimpComponentEditor *editor,
+                                GimpChannelType      channel,
+                                GtkTreeIter         *iter)
+{
+  gint index;
+
+  index = gimp_image_get_component_index (GIMP_IMAGE_EDITOR (editor)->image,
+                                          channel);
+
+  if (index != -1)
+    return gtk_tree_model_iter_nth_child (editor->model, iter, NULL, index);
+
+  return FALSE;
+}
+
+static void
+gimp_component_editor_renderer_update (GimpViewRenderer    *renderer,
+                                       GimpComponentEditor *editor)
+{
+  GimpChannelType channel = GIMP_VIEW_RENDERER_IMAGE (renderer)->channel;
+  GtkTreeIter     iter;
+
+  if (gimp_component_editor_get_iter (editor, channel, &iter))
+    {
+      GtkTreePath *path;
+
+      path = gtk_tree_model_get_path (editor->model, &iter);
+      gtk_tree_model_row_changed (editor->model, path, &iter);
+      gtk_tree_path_free (path);
+    }
+}
+
+static void
+gimp_component_editor_mode_changed (GimpImage           *image,
+                                    GimpComponentEditor *editor)
+{
+  gimp_component_editor_clear_components (editor);
+  gimp_component_editor_create_components (editor);
+}
+
+static void
+gimp_component_editor_alpha_changed (GimpImage           *image,
+                                     GimpComponentEditor *editor)
+{
+  gimp_component_editor_clear_components (editor);
+  gimp_component_editor_create_components (editor);
+}
+
+static void
+gimp_component_editor_visibility_changed (GimpImage           *image,
+                                          GimpChannelType      channel,
+                                          GimpComponentEditor *editor)
+{
+  GtkTreeIter iter;
+
+  if (gimp_component_editor_get_iter (editor, channel, &iter))
+    {
+      gboolean visible = gimp_image_get_component_visible (image, channel);
+
+      gtk_list_store_set (GTK_LIST_STORE (editor->model), &iter,
+                          COLUMN_VISIBLE, visible,
+                          -1);
+    }
+}
+
+static void
+gimp_component_editor_active_changed (GimpImage           *image,
+                                      GimpChannelType      channel,
+                                      GimpComponentEditor *editor)
+{
+  GtkTreeIter iter;
+
+  if (gimp_component_editor_get_iter (editor, channel, &iter))
+    {
+      gboolean active = gimp_image_get_component_active (image, channel);
+
+      if (gtk_tree_selection_iter_is_selected (editor->selection, &iter) !=
+          active)
+        {
+          if (active)
+            gtk_tree_selection_select_iter (editor->selection, &iter);
+          else
+            gtk_tree_selection_unselect_iter (editor->selection, &iter);
+        }
+    }
+}
+
+static GimpImage *
+gimp_component_editor_drag_component (GtkWidget        *widget,
+                                      GimpContext     **context,
+                                      GimpChannelType  *channel,
+                                      gpointer          data)
+{
+  GimpComponentEditor *editor = GIMP_COMPONENT_EDITOR (data);
+
+  if (GIMP_IMAGE_EDITOR (editor)->image &&
+      editor->clicked_component != -1)
+    {
+      if (channel)
+        *channel = editor->clicked_component;
+
+      if (context)
+        *context = GIMP_IMAGE_EDITOR (editor)->context;
+
+      return GIMP_IMAGE_EDITOR (editor)->image;
+    }
+
+  return NULL;
+}
diff --git a/app/widgets/gimpcomponenteditor.h b/app/widgets/gimpcomponenteditor.h
new file mode 100644
index 0000000..717e8cb
--- /dev/null
+++ b/app/widgets/gimpcomponenteditor.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcomponenteditor.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COMPONENT_EDITOR_H__
+#define __GIMP_COMPONENT_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_COMPONENT_EDITOR            (gimp_component_editor_get_type ())
+#define GIMP_COMPONENT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COMPONENT_EDITOR, GimpComponentEditor))
+#define GIMP_COMPONENT_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COMPONENT_EDITOR, GimpComponentEditorClass))
+#define GIMP_IS_COMPONENT_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COMPONENT_EDITOR))
+#define GIMP_IS_COMPONENT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COMPONENT_EDITOR))
+#define GIMP_COMPONENT_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COMPONENT_EDITOR, GimpComponentEditorClass))
+
+
+typedef struct _GimpComponentEditorClass  GimpComponentEditorClass;
+
+struct _GimpComponentEditor
+{
+  GimpImageEditor    parent_instance;
+
+  gint               view_size;
+
+  GtkTreeModel      *model;
+  GtkTreeView       *view;
+  GtkTreeSelection  *selection;
+
+  GtkTreeViewColumn *eye_column;
+  GtkCellRenderer   *eye_cell;
+  GtkCellRenderer   *renderer_cell;
+
+  GimpChannelType    clicked_component;
+};
+
+struct _GimpComponentEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_component_editor_get_type      (void) G_GNUC_CONST;
+
+GtkWidget * gimp_component_editor_new           (gint                 view_size,
+                                                 GimpMenuFactory     *menu_factory);
+void        gimp_component_editor_set_view_size (GimpComponentEditor *editor,
+                                                 gint                 view_size);
+
+
+#endif  /*  __GIMP_COMPONENT_EDITOR_H__  */
diff --git a/app/widgets/gimpcompressioncombobox.c b/app/widgets/gimpcompressioncombobox.c
new file mode 100644
index 0000000..917237e
--- /dev/null
+++ b/app/widgets/gimpcompressioncombobox.c
@@ -0,0 +1,212 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcompressioncombobox.c
+ * Copyright (C) 2004, 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "stdlib.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpcompressioncombobox.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLUMN_ID,
+  COLUMN_LABEL,
+  N_COLUMNS
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_compression_combo_box_constructed    (GObject      *object);
+
+static gboolean   gimp_compression_combo_box_separator_func (GtkTreeModel *model,
+                                                             GtkTreeIter  *iter,
+                                                             gpointer      data);
+
+
+G_DEFINE_TYPE (GimpCompressionComboBox, gimp_compression_combo_box,
+               GIMP_TYPE_STRING_COMBO_BOX)
+
+#define parent_class gimp_compression_combo_box_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_compression_combo_box_class_init (GimpCompressionComboBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = gimp_compression_combo_box_constructed;
+}
+
+static void
+gimp_compression_combo_box_init (GimpCompressionComboBox *combo_box)
+{
+}
+
+static void
+gimp_compression_combo_box_constructed (GObject *object)
+{
+  GimpCompressionComboBox *combo_box = GIMP_COMPRESSION_COMBO_BOX (object);
+  GtkCellLayout           *layout;
+  GtkCellRenderer         *cell;
+  GtkListStore            *store;
+  GtkTreeIter              iter;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  store = gtk_list_store_new (N_COLUMNS,
+                              G_TYPE_STRING,   /* ID    */
+                              G_TYPE_STRING);  /* LABEL */
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
+  g_object_unref (store);
+
+  gtk_combo_box_set_row_separator_func (
+    GTK_COMBO_BOX (combo_box),
+    gimp_compression_combo_box_separator_func,
+    NULL,
+    NULL);
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set    (store, &iter,
+                         COLUMN_ID,    "none",
+                         COLUMN_LABEL, C_("compression", "None"),
+                         -1);
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set    (store, &iter,
+                         COLUMN_ID,    NULL,
+                         COLUMN_LABEL, NULL,
+                         -1);
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set    (store, &iter,
+                         COLUMN_ID,    "fast",
+                         COLUMN_LABEL, C_("compression", "Best performance"),
+                         -1);
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set    (store, &iter,
+                         COLUMN_ID,    "balanced",
+                         COLUMN_LABEL, C_("compression", "Balanced"),
+                         -1);
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set    (store, &iter,
+                         COLUMN_ID,    "best",
+                         COLUMN_LABEL, C_("compression", "Best compression"),
+                         -1);
+
+  gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo_box),
+                                       COLUMN_LABEL);
+
+  layout = GTK_CELL_LAYOUT (combo_box);
+
+  cell = gtk_cell_renderer_text_new ();
+
+  gtk_cell_layout_clear (layout);
+  gtk_cell_layout_pack_start (layout, cell, TRUE);
+  gtk_cell_layout_set_attributes (layout, cell,
+                                  "text", COLUMN_LABEL,
+                                  NULL);
+}
+
+static gboolean
+gimp_compression_combo_box_separator_func (GtkTreeModel *model,
+                                           GtkTreeIter  *iter,
+                                           gpointer      data)
+{
+  gchar    *value;
+  gboolean  result;
+
+  gtk_tree_model_get (model, iter, COLUMN_ID, &value, -1);
+
+  result = ! value;
+
+  g_free (value);
+
+  return result;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_compression_combo_box_new (void)
+{
+  return g_object_new (GIMP_TYPE_COMPRESSION_COMBO_BOX,
+                       "has-entry",    TRUE,
+                       "id-column",    COLUMN_ID,
+                       "label-column", COLUMN_LABEL,
+                       NULL);
+}
+
+void
+gimp_compression_combo_box_set_compression (GimpCompressionComboBox *combo_box,
+                                            const gchar             *compression)
+{
+  g_return_if_fail (GIMP_IS_COMPRESSION_COMBO_BOX (combo_box));
+  g_return_if_fail (compression != NULL);
+
+  if (! gimp_string_combo_box_set_active (GIMP_STRING_COMBO_BOX (combo_box),
+                                          compression))
+    {
+      GtkWidget *entry;
+
+      entry = gtk_bin_get_child (GTK_BIN (combo_box));
+
+      gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), -1);
+
+      gtk_entry_set_text (GTK_ENTRY (entry), compression);
+    }
+}
+
+gchar *
+gimp_compression_combo_box_get_compression (GimpCompressionComboBox *combo_box)
+{
+  gchar *result;
+
+  g_return_val_if_fail (GIMP_IS_COMPRESSION_COMBO_BOX (combo_box), NULL);
+
+  result = gimp_string_combo_box_get_active (GIMP_STRING_COMBO_BOX (combo_box));
+
+  if (! result)
+    {
+      GtkWidget *entry;
+
+      entry = gtk_bin_get_child (GTK_BIN (combo_box));
+
+      result = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+    }
+
+  return result;
+}
diff --git a/app/widgets/gimpcompressioncombobox.h b/app/widgets/gimpcompressioncombobox.h
new file mode 100644
index 0000000..71ac450
--- /dev/null
+++ b/app/widgets/gimpcompressioncombobox.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcompressioncombobox.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_COMPRESSION_COMBO_BOX_H__
+#define __GIMP_COMPRESSION_COMBO_BOX_H__
+
+
+#define GIMP_TYPE_COMPRESSION_COMBO_BOX            (gimp_compression_combo_box_get_type ())
+#define GIMP_COMPRESSION_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COMPRESSION_COMBO_BOX, GimpCompressionComboBox))
+#define GIMP_COMPRESSION_COMBO_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COMPRESSION_COMBO_BOX, GimpCompressionComboBoxClass))
+#define GIMP_IS_COMPRESSION_COMBO_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COMPRESSION_COMBO_BOX))
+#define GIMP_IS_COMPRESSION_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COMPRESSION_COMBO_BOX))
+#define GIMP_COMPRESSION_COMBO_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COMPRESSION_COMBO_BOX, GimpCompressionComboBoxClass))
+
+
+typedef struct _GimpCompressionComboBoxClass  GimpCompressionComboBoxClass;
+
+
+struct _GimpCompressionComboBox
+{
+  GimpStringComboBox  parent_instance;
+};
+
+struct _GimpCompressionComboBoxClass
+{
+  GimpStringComboBoxClass  parent_instance;
+};
+
+
+GType       gimp_compression_combo_box_get_type        (void) G_GNUC_CONST;
+
+GtkWidget * gimp_compression_combo_box_new             (void);
+
+void        gimp_compression_combo_box_set_compression (GimpCompressionComboBox *combo_box,
+                                                        const gchar             *compression);
+gchar     * gimp_compression_combo_box_get_compression (GimpCompressionComboBox *combo_box);
+
+#endif  /* __GIMP_COMPRESSION_COMBO_BOX_H__ */
diff --git a/app/widgets/gimpcontainerbox.c b/app/widgets/gimpcontainerbox.c
new file mode 100644
index 0000000..d957b84
--- /dev/null
+++ b/app/widgets/gimpcontainerbox.c
@@ -0,0 +1,219 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerbox.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+
+#include "gimpcontainerbox.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimppropwidgets.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+
+
+static void   gimp_container_box_view_iface_init   (GimpContainerViewInterface *iface);
+static void   gimp_container_box_docked_iface_init (GimpDockedInterface *iface);
+
+static void   gimp_container_box_constructed       (GObject      *object);
+
+static GtkWidget * gimp_container_box_get_preview  (GimpDocked   *docked,
+                                                    GimpContext  *context,
+                                                    GtkIconSize   size);
+static void        gimp_container_box_set_context  (GimpDocked   *docked,
+                                                    GimpContext  *context);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerBox, gimp_container_box,
+                         GIMP_TYPE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_container_box_view_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_container_box_docked_iface_init))
+
+#define parent_class gimp_container_box_parent_class
+
+
+static void
+gimp_container_box_class_init (GimpContainerBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_container_box_constructed;
+  object_class->set_property = gimp_container_view_set_property;
+  object_class->get_property = gimp_container_view_get_property;
+
+  gimp_container_view_install_properties (object_class);
+}
+
+static void
+gimp_container_box_init (GimpContainerBox *box)
+{
+  GtkWidget *sb;
+
+  box->scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_box_pack_start (GTK_BOX (box), box->scrolled_win, TRUE, TRUE, 0);
+  gtk_widget_show (box->scrolled_win);
+
+  sb = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (box->scrolled_win));
+
+  gtk_widget_set_can_focus (sb, FALSE);
+}
+
+static void
+gimp_container_box_view_iface_init (GimpContainerViewInterface *iface)
+{
+}
+
+static void
+gimp_container_box_docked_iface_init (GimpDockedInterface *iface)
+{
+  iface->get_preview = gimp_container_box_get_preview;
+  iface->set_context = gimp_container_box_set_context;
+}
+
+static void
+gimp_container_box_constructed (GObject *object)
+{
+  GimpContainerBox *box = GIMP_CONTAINER_BOX (object);
+
+  /* This is evil: the hash table of "insert_data" is created on
+   * demand when GimpContainerView API is used, using a
+   * value_free_func that is set in the interface_init functions of
+   * its implementors. Therefore, no GimpContainerView API must be
+   * called from any init() function, because the interface_init()
+   * function of a subclass that sets the right value_free_func might
+   * not have been called yet, leaving the insert_data hash table
+   * without memory management.
+   *
+   * Call GimpContainerView API from GObject::constructed() instead,
+   * which runs after everything is set up correctly.
+   */
+  gimp_container_view_set_dnd_widget (GIMP_CONTAINER_VIEW (box),
+                                      box->scrolled_win);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+void
+gimp_container_box_set_size_request (GimpContainerBox *box,
+                                     gint              width,
+                                     gint              height)
+{
+  GimpContainerView      *view;
+  GtkScrolledWindowClass *sw_class;
+  GtkStyle               *sw_style;
+  GtkWidget              *sb;
+  GtkRequisition          req;
+  gint                    view_size;
+  gint                    scrollbar_width;
+  gint                    border_x;
+  gint                    border_y;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_BOX (box));
+
+  view = GIMP_CONTAINER_VIEW (box);
+
+  view_size = gimp_container_view_get_view_size (view, NULL);
+
+  g_return_if_fail (width  <= 0 || width  >= view_size);
+  g_return_if_fail (height <= 0 || height >= view_size);
+
+  sw_class = GTK_SCROLLED_WINDOW_GET_CLASS (box->scrolled_win);
+
+  if (sw_class->scrollbar_spacing >= 0)
+    scrollbar_width = sw_class->scrollbar_spacing;
+  else
+    gtk_widget_style_get (GTK_WIDGET (box->scrolled_win),
+                          "scrollbar-spacing", &scrollbar_width,
+                          NULL);
+
+  sb = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (box->scrolled_win));
+
+  gtk_widget_size_request (sb, &req);
+  scrollbar_width += req.width;
+
+  border_x = border_y = gtk_container_get_border_width (GTK_CONTAINER (box));
+
+  sw_style = gtk_widget_get_style (box->scrolled_win);
+
+  border_x += sw_style->xthickness * 2 + scrollbar_width;
+  border_y += sw_style->ythickness * 2;
+
+  gtk_widget_set_size_request (box->scrolled_win,
+                               width  > 0 ? width  + border_x : -1,
+                               height > 0 ? height + border_y : -1);
+}
+
+static void
+gimp_container_box_set_context (GimpDocked  *docked,
+                                GimpContext *context)
+{
+  gimp_container_view_set_context (GIMP_CONTAINER_VIEW (docked), context);
+}
+
+static GtkWidget *
+gimp_container_box_get_preview (GimpDocked   *docked,
+                                GimpContext  *context,
+                                GtkIconSize   size)
+{
+  GimpContainerBox  *box  = GIMP_CONTAINER_BOX (docked);
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (docked);
+  GimpContainer     *container;
+  GtkWidget         *preview;
+  gint               width;
+  gint               height;
+  gint               border_width = 1;
+  const gchar       *prop_name;
+
+  container = gimp_container_view_get_container (view);
+
+  g_return_val_if_fail (container != NULL, NULL);
+
+  gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (box)),
+                                     size, &width, &height);
+
+  prop_name = gimp_context_type_to_prop_name (gimp_container_get_children_type (container));
+
+  preview = gimp_prop_view_new (G_OBJECT (context), prop_name,
+                                context, height);
+  GIMP_VIEW (preview)->renderer->size = -1;
+
+  gimp_container_view_get_view_size (view, &border_width);
+
+  border_width = MIN (1, border_width);
+
+  gimp_view_renderer_set_size_full (GIMP_VIEW (preview)->renderer,
+                                    width, height, border_width);
+
+  return preview;
+}
diff --git a/app/widgets/gimpcontainerbox.h b/app/widgets/gimpcontainerbox.h
new file mode 100644
index 0000000..e003efe
--- /dev/null
+++ b/app/widgets/gimpcontainerbox.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerbox.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_BOX_H__
+#define __GIMP_CONTAINER_BOX_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_CONTAINER_BOX            (gimp_container_box_get_type ())
+#define GIMP_CONTAINER_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_BOX, GimpContainerBox))
+#define GIMP_CONTAINER_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_BOX, GimpContainerBoxClass))
+#define GIMP_IS_CONTAINER_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_BOX))
+#define GIMP_IS_CONTAINER_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_BOX))
+#define GIMP_CONTAINER_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_BOX, GimpContainerBoxClass))
+
+
+typedef struct _GimpContainerBoxClass  GimpContainerBoxClass;
+
+struct _GimpContainerBox
+{
+  GimpEditor  parent_instance;
+
+  GtkWidget  *scrolled_win;
+};
+
+struct _GimpContainerBoxClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType     gimp_container_box_get_type         (void) G_GNUC_CONST;
+
+void      gimp_container_box_set_size_request (GimpContainerBox *box,
+                                               gint              width,
+                                               gint              height);
+
+
+#endif  /*  __GIMP_CONTAINER_BOX_H__  */
diff --git a/app/widgets/gimpcontainercombobox.c b/app/widgets/gimpcontainercombobox.c
new file mode 100644
index 0000000..87e2af8
--- /dev/null
+++ b/app/widgets/gimpcontainercombobox.c
@@ -0,0 +1,420 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainercombobox.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcellrendererviewable.h"
+#include "gimpcontainercombobox.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpviewrenderer.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ELLIPSIZE = GIMP_CONTAINER_VIEW_PROP_LAST + 1
+};
+
+
+static void     gimp_container_combo_box_view_iface_init (GimpContainerViewInterface *iface);
+
+static void     gimp_container_combo_box_set_property (GObject                *object,
+                                                       guint                   property_id,
+                                                       const GValue           *value,
+                                                       GParamSpec             *pspec);
+static void     gimp_container_combo_box_get_property (GObject                *object,
+                                                       guint                   property_id,
+                                                       GValue                 *value,
+                                                       GParamSpec             *pspec);
+
+static void     gimp_container_combo_box_set_context  (GimpContainerView      *view,
+                                                       GimpContext            *context);
+static gpointer gimp_container_combo_box_insert_item  (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                parent_insert_data,
+                                                       gint                    index);
+static void     gimp_container_combo_box_remove_item  (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+static void     gimp_container_combo_box_reorder_item (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gint                    new_index,
+                                                       gpointer                insert_data);
+static void     gimp_container_combo_box_rename_item  (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+static gboolean  gimp_container_combo_box_select_item (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+static void     gimp_container_combo_box_clear_items  (GimpContainerView      *view);
+static void    gimp_container_combo_box_set_view_size (GimpContainerView      *view);
+
+static void     gimp_container_combo_box_changed      (GtkComboBox            *combo_box,
+                                                       GimpContainerView      *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerComboBox, gimp_container_combo_box,
+                         GTK_TYPE_COMBO_BOX,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_container_combo_box_view_iface_init))
+
+#define parent_class gimp_container_combo_box_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_container_combo_box_class_init (GimpContainerComboBoxClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_container_combo_box_set_property;
+  object_class->get_property = gimp_container_combo_box_get_property;
+
+  gimp_container_view_install_properties (object_class);
+
+  g_object_class_install_property (object_class,
+                                   PROP_ELLIPSIZE,
+                                   g_param_spec_enum ("ellipsize", NULL, NULL,
+                                                      PANGO_TYPE_ELLIPSIZE_MODE,
+                                                      PANGO_ELLIPSIZE_MIDDLE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_container_combo_box_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_view_iface)
+    parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
+
+  iface->set_context   = gimp_container_combo_box_set_context;
+  iface->insert_item   = gimp_container_combo_box_insert_item;
+  iface->remove_item   = gimp_container_combo_box_remove_item;
+  iface->reorder_item  = gimp_container_combo_box_reorder_item;
+  iface->rename_item   = gimp_container_combo_box_rename_item;
+  iface->select_item   = gimp_container_combo_box_select_item;
+  iface->clear_items   = gimp_container_combo_box_clear_items;
+  iface->set_view_size = gimp_container_combo_box_set_view_size;
+
+  iface->insert_data_free = (GDestroyNotify) gtk_tree_iter_free;
+}
+
+static void
+gimp_container_combo_box_init (GimpContainerComboBox *combo)
+{
+  GtkTreeModel    *model;
+  GtkCellLayout   *layout;
+  GtkCellRenderer *cell;
+  GType            types[GIMP_CONTAINER_TREE_STORE_N_COLUMNS];
+  gint             n_types = 0;
+
+  gimp_container_tree_store_columns_init (types, &n_types);
+
+  model = gimp_container_tree_store_new (GIMP_CONTAINER_VIEW (combo),
+                                         n_types, types);
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model);
+
+  g_object_unref (model);
+
+  layout = GTK_CELL_LAYOUT (combo);
+
+  cell = gimp_cell_renderer_viewable_new ();
+  gtk_cell_layout_pack_start (layout, cell, FALSE);
+  gtk_cell_layout_set_attributes (layout, cell,
+                                  "renderer",
+                                  GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
+                                  NULL);
+
+  gimp_container_tree_store_add_renderer_cell (GIMP_CONTAINER_TREE_STORE (model),
+                                               cell);
+
+  combo->viewable_renderer = cell;
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_pack_start (layout, cell, TRUE);
+  gtk_cell_layout_set_attributes (layout, cell,
+                                  "text",
+                                  GIMP_CONTAINER_TREE_STORE_COLUMN_NAME,
+                                  NULL);
+
+  combo->text_renderer = cell;
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_container_combo_box_changed),
+                    combo);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE);
+}
+
+static void
+gimp_container_combo_box_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpContainerComboBox *combo = GIMP_CONTAINER_COMBO_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_ELLIPSIZE:
+      g_object_set_property (G_OBJECT (combo->text_renderer),
+                             pspec->name, value);
+      break;
+
+    default:
+      gimp_container_view_set_property (object, property_id, value, pspec);
+      break;
+    }
+}
+
+static void
+gimp_container_combo_box_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpContainerComboBox *combo = GIMP_CONTAINER_COMBO_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_ELLIPSIZE:
+      g_object_get_property (G_OBJECT (combo->text_renderer),
+                             pspec->name, value);
+      break;
+
+    default:
+      gimp_container_view_get_property (object, property_id, value, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_container_combo_box_new (GimpContainer *container,
+                              GimpContext   *context,
+                              gint           view_size,
+                              gint           view_border_width)
+{
+  GtkWidget         *combo_box;
+  GimpContainerView *view;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+
+  combo_box = g_object_new (GIMP_TYPE_CONTAINER_COMBO_BOX, NULL);
+
+  view = GIMP_CONTAINER_VIEW (combo_box);
+
+  gimp_container_view_set_view_size (view, view_size, view_border_width);
+
+  if (container)
+    gimp_container_view_set_container (view, container);
+
+  if (context)
+    gimp_container_view_set_context (view, context);
+
+  return combo_box;
+}
+
+
+/*  GimpContainerView methods  */
+
+static void
+gimp_container_combo_box_set_context (GimpContainerView *view,
+                                      GimpContext       *context)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  parent_view_iface->set_context (view, context);
+
+  if (model)
+    gimp_container_tree_store_set_context (GIMP_CONTAINER_TREE_STORE (model),
+                                           context);
+}
+
+static gpointer
+gimp_container_combo_box_insert_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           parent_insert_data,
+                                      gint               index)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  if (model)
+    {
+      GtkTreeIter *iter;
+
+      iter = gimp_container_tree_store_insert_item (GIMP_CONTAINER_TREE_STORE (model),
+                                                    viewable,
+                                                    parent_insert_data,
+                                                    index);
+
+      if (gtk_tree_model_iter_n_children (model, NULL) == 1)
+        {
+          /*  GimpContainerViews don't select items by default  */
+          gtk_combo_box_set_active (GTK_COMBO_BOX (view), -1);
+
+          gtk_widget_set_sensitive (GTK_WIDGET (view), TRUE);
+        }
+
+      return iter;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_container_combo_box_remove_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  if (model)
+    {
+      GtkTreeIter *iter = insert_data;
+
+      gimp_container_tree_store_remove_item (GIMP_CONTAINER_TREE_STORE (model),
+                                             viewable,
+                                             iter);
+
+      if (iter && gtk_tree_model_iter_n_children (model, NULL) == 0)
+        {
+          gtk_widget_set_sensitive (GTK_WIDGET (view), FALSE);
+        }
+    }
+}
+
+static void
+gimp_container_combo_box_reorder_item (GimpContainerView *view,
+                                       GimpViewable      *viewable,
+                                       gint               new_index,
+                                       gpointer           insert_data)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  if (model)
+    gimp_container_tree_store_reorder_item (GIMP_CONTAINER_TREE_STORE (model),
+                                            viewable,
+                                            new_index,
+                                            insert_data);
+}
+
+static void
+gimp_container_combo_box_rename_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  if (model)
+    gimp_container_tree_store_rename_item (GIMP_CONTAINER_TREE_STORE (model),
+                                           viewable,
+                                           insert_data);
+}
+
+static gboolean
+gimp_container_combo_box_select_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GtkComboBox *combo_box = GTK_COMBO_BOX (view);
+
+  if (gtk_combo_box_get_model (GTK_COMBO_BOX (view)))
+    {
+      GtkTreeIter *iter = insert_data;
+
+     g_signal_handlers_block_by_func (combo_box,
+                                       gimp_container_combo_box_changed,
+                                       view);
+
+      if (iter)
+        {
+          gtk_combo_box_set_active_iter (combo_box, iter);
+        }
+      else
+        {
+          gtk_combo_box_set_active (combo_box, -1);
+        }
+
+      g_signal_handlers_unblock_by_func (combo_box,
+                                         gimp_container_combo_box_changed,
+                                         view);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_container_combo_box_clear_items (GimpContainerView *view)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  if (model)
+    gimp_container_tree_store_clear_items (GIMP_CONTAINER_TREE_STORE (model));
+
+  gtk_widget_set_sensitive (GTK_WIDGET (view), FALSE);
+
+  parent_view_iface->clear_items (view);
+}
+
+static void
+gimp_container_combo_box_set_view_size (GimpContainerView *view)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view));
+
+  if (model)
+    gimp_container_tree_store_set_view_size (GIMP_CONTAINER_TREE_STORE (model));
+}
+
+static void
+gimp_container_combo_box_changed (GtkComboBox       *combo,
+                                  GimpContainerView *view)
+{
+  GtkTreeIter iter;
+
+  if (gtk_combo_box_get_active_iter (combo, &iter))
+    {
+      GimpViewRenderer *renderer;
+
+      gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      gimp_container_view_item_selected (view, renderer->viewable);
+      g_object_unref (renderer);
+    }
+}
diff --git a/app/widgets/gimpcontainercombobox.h b/app/widgets/gimpcontainercombobox.h
new file mode 100644
index 0000000..6fbeea1
--- /dev/null
+++ b/app/widgets/gimpcontainercombobox.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainercombobox.h
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_COMBO_BOX_H__
+#define __GIMP_CONTAINER_COMBO_BOX_H__
+
+
+#define GIMP_TYPE_CONTAINER_COMBO_BOX            (gimp_container_combo_box_get_type ())
+#define GIMP_CONTAINER_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBox))
+#define GIMP_CONTAINER_COMBO_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBoxClass))
+#define GIMP_IS_CONTAINER_COMBO_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_COMBO_BOX))
+#define GIMP_IS_CONTAINER_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_COMBO_BOX))
+#define GIMP_CONTAINER_COMBO_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBoxClass))
+
+
+typedef struct _GimpContainerComboBoxClass  GimpContainerComboBoxClass;
+
+struct _GimpContainerComboBox
+{
+  GtkComboBox      parent_instance;
+
+  GtkCellRenderer *text_renderer;
+  GtkCellRenderer *viewable_renderer;
+};
+
+struct _GimpContainerComboBoxClass
+{
+  GtkComboBoxClass  parent_class;
+};
+
+
+GType       gimp_container_combo_box_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_container_combo_box_new      (GimpContainer *container,
+                                               GimpContext   *context,
+                                               gint           view_size,
+                                               gint           view_border_width);
+
+
+#endif  /*  __GIMP_CONTAINER_COMBO_BOX_H__  */
diff --git a/app/widgets/gimpcontainereditor.c b/app/widgets/gimpcontainereditor.c
new file mode 100644
index 0000000..9292f33
--- /dev/null
+++ b/app/widgets/gimpcontainereditor.c
@@ -0,0 +1,579 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainereditor.c
+ * Copyright (C) 2001-2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpasyncset.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainereditor.h"
+#include "gimpcontainergridview.h"
+#include "gimpcontainericonview.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpdocked.h"
+#include "gimpmenufactory.h"
+#include "gimpviewrenderer.h"
+#include "gimpuimanager.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VIEW_TYPE,
+  PROP_CONTAINER,
+  PROP_CONTEXT,
+  PROP_VIEW_SIZE,
+  PROP_VIEW_BORDER_WIDTH,
+  PROP_MENU_FACTORY,
+  PROP_MENU_IDENTIFIER,
+  PROP_UI_PATH
+};
+
+
+struct _GimpContainerEditorPrivate
+{
+  GimpViewType     view_type;
+  GimpContainer   *container;
+  GimpContext     *context;
+  gint             view_size;
+  gint             view_border_width;
+  GimpMenuFactory *menu_factory;
+  gchar           *menu_identifier;
+  gchar           *ui_path;
+  GtkWidget       *busy_box;
+  GBinding        *async_set_binding;
+};
+
+
+static void  gimp_container_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void   gimp_container_editor_constructed      (GObject             *object);
+static void   gimp_container_editor_dispose          (GObject             *object);
+static void   gimp_container_editor_set_property     (GObject             *object,
+                                                      guint                property_id,
+                                                      const GValue        *value,
+                                                      GParamSpec          *pspec);
+static void   gimp_container_editor_get_property     (GObject             *object,
+                                                      guint                property_id,
+                                                      GValue              *value,
+                                                      GParamSpec          *pspec);
+
+static gboolean gimp_container_editor_select_item    (GtkWidget           *widget,
+                                                      GimpViewable        *viewable,
+                                                      gpointer             insert_data,
+                                                      GimpContainerEditor *editor);
+static void   gimp_container_editor_activate_item    (GtkWidget           *widget,
+                                                      GimpViewable        *viewable,
+                                                      gpointer             insert_data,
+                                                      GimpContainerEditor *editor);
+static void   gimp_container_editor_context_item     (GtkWidget           *widget,
+                                                      GimpViewable        *viewable,
+                                                      gpointer             insert_data,
+                                                      GimpContainerEditor *editor);
+static void   gimp_container_editor_real_context_item(GimpContainerEditor *editor,
+                                                      GimpViewable        *viewable);
+
+static GtkWidget * gimp_container_editor_get_preview (GimpDocked       *docked,
+                                                      GimpContext      *context,
+                                                      GtkIconSize       size);
+static void        gimp_container_editor_set_context (GimpDocked       *docked,
+                                                      GimpContext      *context);
+static GimpUIManager * gimp_container_editor_get_menu(GimpDocked       *docked,
+                                                      const gchar     **ui_path,
+                                                      gpointer         *popup_data);
+
+static gboolean  gimp_container_editor_has_button_bar      (GimpDocked *docked);
+static void      gimp_container_editor_set_show_button_bar (GimpDocked *docked,
+                                                            gboolean    show);
+static gboolean  gimp_container_editor_get_show_button_bar (GimpDocked *docked);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerEditor, gimp_container_editor,
+                         GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (GimpContainerEditor)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_container_editor_docked_iface_init))
+
+#define parent_class gimp_container_editor_parent_class
+
+
+static void
+gimp_container_editor_class_init (GimpContainerEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed   = gimp_container_editor_constructed;
+  object_class->dispose       = gimp_container_editor_dispose;
+  object_class->set_property  = gimp_container_editor_set_property;
+  object_class->get_property  = gimp_container_editor_get_property;
+
+  klass->select_item     = NULL;
+  klass->activate_item   = NULL;
+  klass->context_item    = gimp_container_editor_real_context_item;
+
+  g_object_class_install_property (object_class, PROP_VIEW_TYPE,
+                                   g_param_spec_enum ("view-type",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_VIEW_TYPE,
+                                                      GIMP_VIEW_TYPE_LIST,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONTAINER,
+                                   g_param_spec_object ("container",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_VIEW_SIZE,
+                                   g_param_spec_int ("view-size",
+                                                     NULL, NULL,
+                                                     1, GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
+                                                     GIMP_VIEW_SIZE_MEDIUM,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_VIEW_BORDER_WIDTH,
+                                   g_param_spec_int ("view-border-width",
+                                                     NULL, NULL,
+                                                     0,
+                                                     GIMP_VIEW_MAX_BORDER_WIDTH,
+                                                     1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_MENU_FACTORY,
+                                   g_param_spec_object ("menu-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_MENU_FACTORY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_MENU_IDENTIFIER,
+                                   g_param_spec_string ("menu-identifier",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_UI_PATH,
+                                   g_param_spec_string ("ui-path",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_container_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  iface->get_preview         = gimp_container_editor_get_preview;
+  iface->set_context         = gimp_container_editor_set_context;
+  iface->get_menu            = gimp_container_editor_get_menu;
+  iface->has_button_bar      = gimp_container_editor_has_button_bar;
+  iface->set_show_button_bar = gimp_container_editor_set_show_button_bar;
+  iface->get_show_button_bar = gimp_container_editor_get_show_button_bar;
+}
+
+static void
+gimp_container_editor_init (GimpContainerEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  editor->priv = gimp_container_editor_get_instance_private (editor);
+}
+
+static void
+gimp_container_editor_constructed (GObject *object)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CONTAINER (editor->priv->container));
+  gimp_assert (GIMP_IS_CONTEXT (editor->priv->context));
+
+  switch (editor->priv->view_type)
+    {
+    case GIMP_VIEW_TYPE_GRID:
+#if 0
+      editor->view =
+        GIMP_CONTAINER_VIEW (gimp_container_icon_view_new (editor->priv->container,
+                                                           editor->priv->context,
+                                                           editor->priv->view_size,
+                                                           editor->priv->view_border_width));
+#else
+      editor->view =
+        GIMP_CONTAINER_VIEW (gimp_container_grid_view_new (editor->priv->container,
+                                                           editor->priv->context,
+                                                           editor->priv->view_size,
+                                                           editor->priv->view_border_width));
+#endif
+      break;
+
+    case GIMP_VIEW_TYPE_LIST:
+      editor->view =
+        GIMP_CONTAINER_VIEW (gimp_container_tree_view_new (editor->priv->container,
+                                                           editor->priv->context,
+                                                           editor->priv->view_size,
+                                                           editor->priv->view_border_width));
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+    }
+
+  if (GIMP_IS_LIST (editor->priv->container))
+    gimp_container_view_set_reorderable (GIMP_CONTAINER_VIEW (editor->view),
+                                         ! GIMP_LIST (editor->priv->container)->sort_func);
+
+  if (editor->priv->menu_factory    &&
+      editor->priv->menu_identifier &&
+      editor->priv->ui_path)
+    {
+      gimp_editor_create_menu (GIMP_EDITOR (editor->view),
+                               editor->priv->menu_factory,
+                               editor->priv->menu_identifier,
+                               editor->priv->ui_path,
+                               editor);
+    }
+
+  gtk_box_pack_start (GTK_BOX (editor), GTK_WIDGET (editor->view),
+                      TRUE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (editor->view));
+
+  editor->priv->busy_box = gimp_busy_box_new (NULL);
+  gtk_box_pack_start (GTK_BOX (editor), editor->priv->busy_box, TRUE, TRUE, 0);
+
+  g_object_bind_property (editor->priv->busy_box, "visible",
+                          editor->view,           "visible",
+                          G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+  /*  Connect "select-item" with G_CONNECT_AFTER because it's a
+   *  RUN_LAST signal and the default handler selecting the row must
+   *  run before signal connections. See bug #784176.
+   */
+  g_signal_connect_object (editor->view, "select-item",
+                           G_CALLBACK (gimp_container_editor_select_item),
+                           editor, G_CONNECT_AFTER);
+
+  g_signal_connect_object (editor->view, "activate-item",
+                           G_CALLBACK (gimp_container_editor_activate_item),
+                           editor, 0);
+  g_signal_connect_object (editor->view, "context-item",
+                           G_CALLBACK (gimp_container_editor_context_item),
+                           editor, 0);
+
+  {
+    GimpObject *object = gimp_context_get_by_type (editor->priv->context,
+                                                   gimp_container_get_children_type (editor->priv->container));
+
+    gimp_container_editor_select_item (GTK_WIDGET (editor->view),
+                                       (GimpViewable *) object, NULL,
+                                       editor);
+  }
+}
+
+static void
+gimp_container_editor_dispose (GObject *object)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (object);
+
+  gimp_container_editor_bind_to_async_set (editor, NULL, NULL);
+
+  g_clear_object (&editor->priv->container);
+  g_clear_object (&editor->priv->context);
+  g_clear_object (&editor->priv->menu_factory);
+
+  g_clear_pointer (&editor->priv->menu_identifier, g_free);
+  g_clear_pointer (&editor->priv->ui_path,         g_free);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_container_editor_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_VIEW_TYPE:
+      editor->priv->view_type = g_value_get_enum (value);
+      break;
+
+    case PROP_CONTAINER:
+      editor->priv->container = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTEXT:
+      editor->priv->context = g_value_dup_object (value);
+      break;
+
+    case PROP_VIEW_SIZE:
+      editor->priv->view_size = g_value_get_int (value);
+      break;
+
+    case PROP_VIEW_BORDER_WIDTH:
+      editor->priv->view_border_width = g_value_get_int (value);
+      break;
+
+    case PROP_MENU_FACTORY:
+      editor->priv->menu_factory = g_value_dup_object (value);
+      break;
+
+    case PROP_MENU_IDENTIFIER:
+      editor->priv->menu_identifier = g_value_dup_string (value);
+      break;
+
+    case PROP_UI_PATH:
+      editor->priv->ui_path = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_container_editor_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_VIEW_TYPE:
+      g_value_set_enum (value, editor->priv->view_type);
+      break;
+
+    case PROP_CONTAINER:
+      g_value_set_object (value, editor->priv->container);
+      break;
+
+    case PROP_CONTEXT:
+      g_value_set_object (value, editor->priv->context);
+      break;
+
+    case PROP_VIEW_SIZE:
+      g_value_set_int (value, editor->priv->view_size);
+      break;
+
+    case PROP_VIEW_BORDER_WIDTH:
+      g_value_set_int (value, editor->priv->view_border_width);
+      break;
+
+    case PROP_MENU_FACTORY:
+      g_value_set_object (value, editor->priv->menu_factory);
+      break;
+
+    case PROP_MENU_IDENTIFIER:
+      g_value_set_string (value, editor->priv->menu_identifier);
+      break;
+
+    case PROP_UI_PATH:
+      g_value_set_string (value, editor->priv->ui_path);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkSelectionMode
+gimp_container_editor_get_selection_mode (GimpContainerEditor *editor)
+{
+  return gimp_container_view_get_selection_mode (GIMP_CONTAINER_VIEW (editor->view));
+}
+
+void
+gimp_container_editor_set_selection_mode (GimpContainerEditor *editor,
+                                          GtkSelectionMode     mode)
+{
+  gimp_container_view_set_selection_mode (GIMP_CONTAINER_VIEW (editor->view),
+                                          mode);
+}
+
+/*  private functions  */
+
+static gboolean
+gimp_container_editor_select_item (GtkWidget           *widget,
+                                   GimpViewable        *viewable,
+                                   gpointer             insert_data,
+                                   GimpContainerEditor *editor)
+{
+  GimpContainerEditorClass *klass = GIMP_CONTAINER_EDITOR_GET_CLASS (editor);
+
+  if (klass->select_item)
+    klass->select_item (editor, viewable);
+
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor->view)));
+
+  return TRUE;
+}
+
+static void
+gimp_container_editor_activate_item (GtkWidget           *widget,
+                                     GimpViewable        *viewable,
+                                     gpointer             insert_data,
+                                     GimpContainerEditor *editor)
+{
+  GimpContainerEditorClass *klass = GIMP_CONTAINER_EDITOR_GET_CLASS (editor);
+
+  if (klass->activate_item)
+    klass->activate_item (editor, viewable);
+}
+
+static void
+gimp_container_editor_context_item (GtkWidget           *widget,
+                                    GimpViewable        *viewable,
+                                    gpointer             insert_data,
+                                    GimpContainerEditor *editor)
+{
+  GimpContainerEditorClass *klass = GIMP_CONTAINER_EDITOR_GET_CLASS (editor);
+
+  if (klass->context_item)
+    klass->context_item (editor, viewable);
+}
+
+static void
+gimp_container_editor_real_context_item (GimpContainerEditor *editor,
+                                         GimpViewable        *viewable)
+{
+  GimpContainer *container = gimp_container_view_get_container (editor->view);
+
+  if (viewable && gimp_container_have (container, GIMP_OBJECT (viewable)))
+    {
+      gimp_editor_popup_menu (GIMP_EDITOR (editor->view), NULL, NULL);
+    }
+}
+
+static GtkWidget *
+gimp_container_editor_get_preview (GimpDocked   *docked,
+                                   GimpContext  *context,
+                                   GtkIconSize   size)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (docked);
+
+  return gimp_docked_get_preview (GIMP_DOCKED (editor->view),
+                                  context, size);
+}
+
+static void
+gimp_container_editor_set_context (GimpDocked  *docked,
+                                   GimpContext *context)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (docked);
+
+  gimp_docked_set_context (GIMP_DOCKED (editor->view), context);
+}
+
+static GimpUIManager *
+gimp_container_editor_get_menu (GimpDocked   *docked,
+                                const gchar **ui_path,
+                                gpointer     *popup_data)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (docked);
+
+  return gimp_docked_get_menu (GIMP_DOCKED (editor->view), ui_path, popup_data);
+}
+
+static gboolean
+gimp_container_editor_has_button_bar (GimpDocked *docked)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (docked);
+
+  return gimp_docked_has_button_bar (GIMP_DOCKED (editor->view));
+}
+
+static void
+gimp_container_editor_set_show_button_bar (GimpDocked *docked,
+                                           gboolean    show)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (docked);
+
+  gimp_docked_set_show_button_bar (GIMP_DOCKED (editor->view), show);
+}
+
+static gboolean
+gimp_container_editor_get_show_button_bar (GimpDocked *docked)
+{
+  GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (docked);
+
+  return gimp_docked_get_show_button_bar (GIMP_DOCKED (editor->view));
+}
+
+void
+gimp_container_editor_bind_to_async_set (GimpContainerEditor *editor,
+                                         GimpAsyncSet        *async_set,
+                                         const gchar         *message)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_EDITOR (editor));
+  g_return_if_fail (async_set == NULL || GIMP_IS_ASYNC_SET (async_set));
+  g_return_if_fail (async_set == NULL || message != NULL);
+
+  if (! async_set && ! editor->priv->async_set_binding)
+    return;
+
+  g_clear_object (&editor->priv->async_set_binding);
+
+  if (async_set)
+    {
+      gimp_busy_box_set_message (GIMP_BUSY_BOX (editor->priv->busy_box),
+                                 message);
+
+      editor->priv->async_set_binding = g_object_bind_property (
+        async_set,              "empty",
+        editor->priv->busy_box, "visible",
+        G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+    }
+  else
+    {
+      gtk_widget_hide (editor->priv->busy_box);
+    }
+}
diff --git a/app/widgets/gimpcontainereditor.h b/app/widgets/gimpcontainereditor.h
new file mode 100644
index 0000000..728d604
--- /dev/null
+++ b/app/widgets/gimpcontainereditor.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainereditor.h
+ * Copyright (C) 2001-2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_EDITOR_H__
+#define __GIMP_CONTAINER_EDITOR_H__
+
+
+#define GIMP_TYPE_CONTAINER_EDITOR            (gimp_container_editor_get_type ())
+#define GIMP_CONTAINER_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditor))
+#define GIMP_CONTAINER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditorClass))
+#define GIMP_IS_CONTAINER_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_EDITOR))
+#define GIMP_IS_CONTAINER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_EDITOR))
+#define GIMP_CONTAINER_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditorClass))
+
+
+typedef struct _GimpContainerEditorPrivate GimpContainerEditorPrivate;
+typedef struct _GimpContainerEditorClass   GimpContainerEditorClass;
+
+struct _GimpContainerEditor
+{
+  GtkBox             parent_instance;
+
+  GimpContainerView *view;
+
+  GimpContainerEditorPrivate *priv;
+};
+
+struct _GimpContainerEditorClass
+{
+  GtkBoxClass  parent_class;
+
+  void (* select_item)   (GimpContainerEditor *editor,
+                          GimpViewable        *object);
+  void (* activate_item) (GimpContainerEditor *editor,
+                          GimpViewable        *object);
+  void (* context_item)  (GimpContainerEditor *editor,
+                          GimpViewable        *object);
+};
+
+
+GType            gimp_container_editor_get_type           (void) G_GNUC_CONST;
+
+GtkSelectionMode gimp_container_editor_get_selection_mode (GimpContainerEditor *editor);
+void             gimp_container_editor_set_selection_mode (GimpContainerEditor *editor,
+                                                           GtkSelectionMode     mode);
+
+void             gimp_container_editor_bind_to_async_set  (GimpContainerEditor *editor,
+                                                           GimpAsyncSet        *async_set,
+                                                           const gchar         *message);
+
+
+#endif  /*  __GIMP_CONTAINER_EDITOR_H__  */
diff --git a/app/widgets/gimpcontainerentry.c b/app/widgets/gimpcontainerentry.c
new file mode 100644
index 0000000..7c9bb33
--- /dev/null
+++ b/app/widgets/gimpcontainerentry.c
@@ -0,0 +1,438 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerentry.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcellrendererviewable.h"
+#include "gimpcontainerentry.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpviewrenderer.h"
+
+
+static void     gimp_container_entry_view_iface_init (GimpContainerViewInterface *iface);
+
+static void     gimp_container_entry_finalize     (GObject                *object);
+
+static void     gimp_container_entry_set_context  (GimpContainerView      *view,
+                                                   GimpContext            *context);
+static gpointer gimp_container_entry_insert_item  (GimpContainerView      *view,
+                                                   GimpViewable           *viewable,
+                                                   gpointer                parent_insert_data,
+                                                   gint                    index);
+static void     gimp_container_entry_remove_item  (GimpContainerView      *view,
+                                                   GimpViewable           *viewable,
+                                                   gpointer                insert_data);
+static void     gimp_container_entry_reorder_item (GimpContainerView      *view,
+                                                   GimpViewable           *viewable,
+                                                   gint                    new_index,
+                                                   gpointer                insert_data);
+static void     gimp_container_entry_rename_item  (GimpContainerView      *view,
+                                                   GimpViewable           *viewable,
+                                                   gpointer                insert_data);
+static gboolean  gimp_container_entry_select_item (GimpContainerView      *view,
+                                                   GimpViewable           *viewable,
+                                                   gpointer                insert_data);
+static void     gimp_container_entry_clear_items  (GimpContainerView      *view);
+static void    gimp_container_entry_set_view_size (GimpContainerView      *view);
+
+static void     gimp_container_entry_changed      (GtkEntry               *entry,
+                                                   GimpContainerView      *view);
+static void   gimp_container_entry_match_selected (GtkEntryCompletion     *widget,
+                                                   GtkTreeModel           *model,
+                                                   GtkTreeIter            *iter,
+                                                   GimpContainerView      *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerEntry, gimp_container_entry,
+                         GTK_TYPE_ENTRY,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_container_entry_view_iface_init))
+
+#define parent_class gimp_container_entry_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_container_entry_class_init (GimpContainerEntryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_container_view_set_property;
+  object_class->get_property = gimp_container_view_get_property;
+  object_class->finalize     = gimp_container_entry_finalize;
+
+  gimp_container_view_install_properties (object_class);
+}
+
+static void
+gimp_container_entry_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_view_iface)
+    parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
+
+  iface->set_context   = gimp_container_entry_set_context;
+  iface->insert_item   = gimp_container_entry_insert_item;
+  iface->remove_item   = gimp_container_entry_remove_item;
+  iface->reorder_item  = gimp_container_entry_reorder_item;
+  iface->rename_item   = gimp_container_entry_rename_item;
+  iface->select_item   = gimp_container_entry_select_item;
+  iface->clear_items   = gimp_container_entry_clear_items;
+  iface->set_view_size = gimp_container_entry_set_view_size;
+
+  iface->insert_data_free = (GDestroyNotify) gtk_tree_iter_free;
+}
+
+static void
+gimp_container_entry_init (GimpContainerEntry *entry)
+{
+  GtkEntryCompletion *completion;
+  GtkTreeModel       *model;
+  GtkCellRenderer    *cell;
+  GType               types[GIMP_CONTAINER_TREE_STORE_N_COLUMNS];
+  gint                n_types = 0;
+
+  entry->viewable = NULL;
+
+  completion = g_object_new (GTK_TYPE_ENTRY_COMPLETION,
+                             "inline-completion",  TRUE,
+                             "popup-single-match", FALSE,
+                             "popup-set-width",    FALSE,
+                             NULL);
+
+  gimp_container_tree_store_columns_init (types, &n_types);
+
+  model = gimp_container_tree_store_new (GIMP_CONTAINER_VIEW (entry),
+                                         n_types, types);
+  gimp_container_tree_store_set_use_name (GIMP_CONTAINER_TREE_STORE (model),
+                                          TRUE);
+
+  gtk_entry_completion_set_model (completion, model);
+  g_object_unref (model);
+
+  gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+
+  g_signal_connect (completion, "match-selected",
+                    G_CALLBACK (gimp_container_entry_match_selected),
+                    entry);
+
+  g_object_unref (completion);
+
+  /*  FIXME: This can be done better with GTK+ 2.6.  */
+
+  cell = gimp_cell_renderer_viewable_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), cell, FALSE);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (completion), cell,
+                                  "renderer",
+                                  GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
+                                  NULL);
+
+  gimp_container_tree_store_add_renderer_cell (GIMP_CONTAINER_TREE_STORE (model),
+                                               cell);
+
+  gtk_entry_completion_set_text_column (completion,
+                                        GIMP_CONTAINER_TREE_STORE_COLUMN_NAME);
+
+  g_signal_connect (entry, "changed",
+                    G_CALLBACK (gimp_container_entry_changed),
+                    entry);
+}
+
+GtkWidget *
+gimp_container_entry_new (GimpContainer *container,
+                          GimpContext   *context,
+                          gint           view_size,
+                          gint           view_border_width)
+{
+  GtkWidget         *entry;
+  GimpContainerView *view;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+
+  entry = g_object_new (GIMP_TYPE_CONTAINER_ENTRY, NULL);
+
+  view = GIMP_CONTAINER_VIEW (entry);
+
+  gimp_container_view_set_view_size (view, view_size, view_border_width);
+
+  if (container)
+    gimp_container_view_set_container (view, container);
+
+  if (context)
+    gimp_container_view_set_context (view, context);
+
+  return entry;
+}
+
+
+/*  GimpContainerView methods  */
+
+static GtkTreeModel *
+gimp_container_entry_get_model (GimpContainerView *view)
+{
+  GtkEntryCompletion *completion;
+
+  completion = gtk_entry_get_completion (GTK_ENTRY (view));
+
+  if (completion)
+    return gtk_entry_completion_get_model (completion);
+
+  return NULL;
+}
+
+static void
+gimp_container_entry_finalize (GObject *object)
+{
+  GimpContainerEntry *entry = GIMP_CONTAINER_ENTRY (object);
+
+  if (entry->viewable)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (entry->viewable),
+                                    (gpointer) &entry->viewable);
+      entry->viewable = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_container_entry_set_context (GimpContainerView *view,
+                                  GimpContext       *context)
+{
+  GtkTreeModel *model = gimp_container_entry_get_model (view);
+
+  parent_view_iface->set_context (view, context);
+
+  if (model)
+    gimp_container_tree_store_set_context (GIMP_CONTAINER_TREE_STORE (model),
+                                           context);
+}
+
+static gpointer
+gimp_container_entry_insert_item (GimpContainerView *view,
+                                  GimpViewable      *viewable,
+                                  gpointer           parent_insert_data,
+                                  gint               index)
+{
+  GtkTreeModel *model = gimp_container_entry_get_model (view);
+
+  return gimp_container_tree_store_insert_item (GIMP_CONTAINER_TREE_STORE (model),
+                                                viewable,
+                                                parent_insert_data,
+                                                index);
+}
+
+static void
+gimp_container_entry_remove_item (GimpContainerView *view,
+                                  GimpViewable      *viewable,
+                                  gpointer           insert_data)
+{
+  GtkTreeModel *model = gimp_container_entry_get_model (view);
+
+  gimp_container_tree_store_remove_item (GIMP_CONTAINER_TREE_STORE (model),
+                                         viewable,
+                                         insert_data);
+}
+
+static void
+gimp_container_entry_reorder_item (GimpContainerView *view,
+                                   GimpViewable      *viewable,
+                                   gint               new_index,
+                                   gpointer           insert_data)
+{
+  GtkTreeModel *model = gimp_container_entry_get_model (view);
+
+  gimp_container_tree_store_reorder_item (GIMP_CONTAINER_TREE_STORE (model),
+                                          viewable,
+                                          new_index,
+                                          insert_data);
+}
+
+static void
+gimp_container_entry_rename_item (GimpContainerView *view,
+                                  GimpViewable      *viewable,
+                                  gpointer           insert_data)
+{
+  GimpContainerEntry *container_entry = GIMP_CONTAINER_ENTRY (view);
+  GtkEntry           *entry           = GTK_ENTRY (view);
+  GtkTreeModel       *model           = gimp_container_entry_get_model (view);
+
+  if (viewable == container_entry->viewable)
+    {
+      g_signal_handlers_block_by_func (entry,
+                                       gimp_container_entry_changed,
+                                       view);
+
+      gtk_entry_set_text (entry, gimp_object_get_name (viewable));
+
+      g_signal_handlers_unblock_by_func (entry,
+                                         gimp_container_entry_changed,
+                                         view);
+    }
+
+  gimp_container_tree_store_rename_item (GIMP_CONTAINER_TREE_STORE (model),
+                                         viewable,
+                                         insert_data);
+}
+
+static gboolean
+gimp_container_entry_select_item (GimpContainerView *view,
+                                  GimpViewable      *viewable,
+                                  gpointer           insert_data)
+{
+  GimpContainerEntry *container_entry = GIMP_CONTAINER_ENTRY (view);
+  GtkEntry           *entry           = GTK_ENTRY (view);
+  GtkTreeIter        *iter            = insert_data;
+
+  g_signal_handlers_block_by_func (entry,
+                                   gimp_container_entry_changed,
+                                   view);
+
+  if (container_entry->viewable)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (container_entry->viewable),
+                                    (gpointer) &container_entry->viewable);
+      container_entry->viewable = NULL;
+    }
+
+  if (iter)
+    {
+      container_entry->viewable = viewable;
+      g_object_add_weak_pointer (G_OBJECT (container_entry->viewable),
+                                 (gpointer) &container_entry->viewable);
+
+      gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+    }
+  else
+    {
+      /* The selected item does not exist. */
+      GdkColor     gdk_red;
+
+      gdk_red.red = 65535;
+      gdk_red.green = 0;
+      gdk_red.blue = 0;
+
+      gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, &gdk_red);
+    }
+  gtk_entry_set_text (entry, viewable? gimp_object_get_name (viewable) : "");
+
+  g_signal_handlers_unblock_by_func (entry,
+                                     gimp_container_entry_changed,
+                                     view);
+
+  return TRUE;
+}
+
+static void
+gimp_container_entry_clear_items (GimpContainerView *view)
+{
+  GtkTreeModel *model = gimp_container_entry_get_model (view);
+
+  /* model is NULL in dispose() */
+  if (model)
+    gimp_container_tree_store_clear_items (GIMP_CONTAINER_TREE_STORE (model));
+
+  parent_view_iface->clear_items (view);
+}
+
+static void
+gimp_container_entry_set_view_size (GimpContainerView *view)
+{
+  GtkTreeModel *model = gimp_container_entry_get_model (view);
+
+  gimp_container_tree_store_set_view_size (GIMP_CONTAINER_TREE_STORE (model));
+}
+
+static void
+gimp_container_entry_changed (GtkEntry          *entry,
+                              GimpContainerView *view)
+{
+  GimpContainerEntry *container_entry = GIMP_CONTAINER_ENTRY (entry);
+  GimpContainer      *container       = gimp_container_view_get_container (view);
+  GimpObject         *object;
+  const gchar        *text;
+
+  if (! container)
+    return;
+
+  if (container_entry->viewable)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (container_entry->viewable),
+                                    (gpointer) &container_entry->viewable);
+      container_entry->viewable = NULL;
+    }
+
+  text = gtk_entry_get_text (entry);
+
+  object = gimp_container_get_child_by_name (container, text);
+
+  if (object)
+    {
+      container_entry->viewable = GIMP_VIEWABLE (object);
+      g_object_add_weak_pointer (G_OBJECT (container_entry->viewable),
+                                 (gpointer) &container_entry->viewable);
+
+      gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+      gimp_container_view_item_selected (view, GIMP_VIEWABLE (object));
+    }
+  else
+    {
+      /* While editing the entry, contents shows in red for non-existent item. */
+      GdkColor     gdk_red;
+
+      gdk_red.red = 65535;
+      gdk_red.green = 0;
+      gdk_red.blue = 0;
+
+      gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, &gdk_red);
+    }
+}
+
+static void
+gimp_container_entry_match_selected (GtkEntryCompletion *widget,
+                                     GtkTreeModel       *model,
+                                     GtkTreeIter        *iter,
+                                     GimpContainerView  *view)
+{
+  GimpViewRenderer *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  gimp_container_view_item_selected (view, renderer->viewable);
+  g_object_unref (renderer);
+}
diff --git a/app/widgets/gimpcontainerentry.h b/app/widgets/gimpcontainerentry.h
new file mode 100644
index 0000000..6705ac2
--- /dev/null
+++ b/app/widgets/gimpcontainerentry.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerentry.h
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_ENTRY_H__
+#define __GIMP_CONTAINER_ENTRY_H__
+
+
+#define GIMP_TYPE_CONTAINER_ENTRY            (gimp_container_entry_get_type ())
+#define GIMP_CONTAINER_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_ENTRY, GimpContainerEntry))
+#define GIMP_CONTAINER_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_ENTRY, GimpContainerEntryClass))
+#define GIMP_IS_CONTAINER_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_ENTRY))
+#define GIMP_IS_CONTAINER_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_ENTRY))
+#define GIMP_CONTAINER_ENTRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_ENTRY, GimpContainerEntryClass))
+
+
+typedef struct _GimpContainerEntryClass  GimpContainerEntryClass;
+
+struct _GimpContainerEntry
+{
+  GtkEntry        parent_instance;
+
+  GimpViewable   *viewable;
+};
+
+struct _GimpContainerEntryClass
+{
+  GtkEntryClass   parent_class;
+};
+
+
+GType       gimp_container_entry_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_container_entry_new      (GimpContainer *container,
+                                           GimpContext   *context,
+                                           gint           view_size,
+                                           gint           view_border_width);
+
+
+#endif  /*  __GIMP_CONTAINER_ENTRY_H__  */
diff --git a/app/widgets/gimpcontainergridview.c b/app/widgets/gimpcontainergridview.c
new file mode 100644
index 0000000..0f12698
--- /dev/null
+++ b/app/widgets/gimpcontainergridview.c
@@ -0,0 +1,742 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainergridview.c
+ * Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainergridview.h"
+#include "gimpcontainerview.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+#include "gtkhwrapbox.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  MOVE_CURSOR,
+  LAST_SIGNAL
+};
+
+
+static void  gimp_container_grid_view_view_iface_init (GimpContainerViewInterface *iface);
+
+static gboolean gimp_container_grid_view_move_cursor  (GimpContainerGridView  *view,
+                                                       GtkMovementStep         step,
+                                                       gint                    count);
+static gboolean gimp_container_grid_view_focus        (GtkWidget              *widget,
+                                                       GtkDirectionType        direction);
+static gboolean  gimp_container_grid_view_popup_menu  (GtkWidget              *widget);
+
+static void     gimp_container_grid_view_set_context  (GimpContainerView      *view,
+                                                       GimpContext            *context);
+static gpointer gimp_container_grid_view_insert_item  (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                parent_insert_data,
+                                                       gint                    index);
+static void     gimp_container_grid_view_remove_item  (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+static void     gimp_container_grid_view_reorder_item (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gint                    new_index,
+                                                       gpointer                insert_data);
+static void     gimp_container_grid_view_rename_item  (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+static gboolean  gimp_container_grid_view_select_item (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+static void     gimp_container_grid_view_clear_items  (GimpContainerView      *view);
+static void    gimp_container_grid_view_set_view_size (GimpContainerView      *view);
+
+static gboolean gimp_container_grid_view_item_selected(GtkWidget              *widget,
+                                                       GdkEventButton         *bevent,
+                                                       gpointer                data);
+static void   gimp_container_grid_view_item_activated (GtkWidget              *widget,
+                                                       gpointer                data);
+static void   gimp_container_grid_view_item_context   (GtkWidget              *widget,
+                                                       gpointer                data);
+static void   gimp_container_grid_view_highlight_item (GimpContainerView      *view,
+                                                       GimpViewable           *viewable,
+                                                       gpointer                insert_data);
+
+static void gimp_container_grid_view_viewport_resized (GtkWidget              *widget,
+                                                       GtkAllocation          *allocation,
+                                                       GimpContainerGridView  *view);
+static gboolean gimp_container_grid_view_button_press (GtkWidget              *widget,
+                                                       GdkEventButton         *bevent,
+                                                       GimpContainerGridView  *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerGridView, gimp_container_grid_view,
+                         GIMP_TYPE_CONTAINER_BOX,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_container_grid_view_view_iface_init))
+
+#define parent_class gimp_container_grid_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+static guint grid_view_signals[LAST_SIGNAL] = { 0 };
+
+static GimpRGB  white_color;
+static GimpRGB  black_color;
+
+
+static void
+gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkBindingSet  *binding_set;
+
+  binding_set  = gtk_binding_set_by_class (klass);
+
+  widget_class->focus      = gimp_container_grid_view_focus;
+  widget_class->popup_menu = gimp_container_grid_view_popup_menu;
+
+  klass->move_cursor       = gimp_container_grid_view_move_cursor;
+
+  grid_view_signals[MOVE_CURSOR] =
+    g_signal_new ("move-cursor",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpContainerGridViewClass, move_cursor),
+                  NULL, NULL,
+                  gimp_marshal_BOOLEAN__ENUM_INT,
+                  G_TYPE_BOOLEAN, 2,
+                  GTK_TYPE_MOVEMENT_STEP,
+                  G_TYPE_INT);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, 0,
+                                "move-cursor", 2,
+                                G_TYPE_ENUM, GTK_MOVEMENT_BUFFER_ENDS,
+                                G_TYPE_INT, -1);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, 0,
+                                "move-cursor", 2,
+                                G_TYPE_ENUM, GTK_MOVEMENT_BUFFER_ENDS,
+                                G_TYPE_INT, 1);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0,
+                                "move-cursor", 2,
+                                G_TYPE_ENUM, GTK_MOVEMENT_PAGES,
+                                G_TYPE_INT, -1);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
+                                "move-cursor", 2,
+                                G_TYPE_ENUM, GTK_MOVEMENT_PAGES,
+                                G_TYPE_INT, 1);
+
+  gimp_rgba_set (&white_color, 1.0, 1.0, 1.0, 1.0);
+  gimp_rgba_set (&black_color, 0.0, 0.0, 0.0, 1.0);
+}
+
+static void
+gimp_container_grid_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  iface->set_context   = gimp_container_grid_view_set_context;
+  iface->insert_item   = gimp_container_grid_view_insert_item;
+  iface->remove_item   = gimp_container_grid_view_remove_item;
+  iface->reorder_item  = gimp_container_grid_view_reorder_item;
+  iface->rename_item   = gimp_container_grid_view_rename_item;
+  iface->select_item   = gimp_container_grid_view_select_item;
+  iface->clear_items   = gimp_container_grid_view_clear_items;
+  iface->set_view_size = gimp_container_grid_view_set_view_size;
+}
+
+static void
+gimp_container_grid_view_init (GimpContainerGridView *grid_view)
+{
+  GimpContainerBox *box = GIMP_CONTAINER_BOX (grid_view);
+  GtkWidget        *viewport;
+
+  grid_view->rows          = 1;
+  grid_view->columns       = 1;
+  grid_view->visible_rows  = 0;
+  grid_view->selected_item = NULL;
+
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box->scrolled_win),
+                                  GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+  gimp_editor_set_show_name (GIMP_EDITOR (grid_view), TRUE);
+
+  viewport = gtk_viewport_new (NULL, NULL);
+  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (box->scrolled_win), viewport);
+  gtk_widget_show (viewport);
+
+  grid_view->wrap_box = gtk_hwrap_box_new (FALSE);
+  /* set a silly small and random size request so it doesn't initially
+   * request too much and breaks dock geometry deserialization
+   */
+  gtk_widget_set_size_request (grid_view->wrap_box, 16, 16);
+  gtk_container_add (GTK_CONTAINER (viewport), grid_view->wrap_box);
+  gtk_widget_show (grid_view->wrap_box);
+
+  g_signal_connect (viewport, "size-allocate",
+                    G_CALLBACK (gimp_container_grid_view_viewport_resized),
+                    grid_view);
+  g_signal_connect (viewport, "button-press-event",
+                    G_CALLBACK (gimp_container_grid_view_button_press),
+                    grid_view);
+
+  gtk_widget_set_can_focus (GTK_WIDGET (grid_view), TRUE);
+}
+
+GtkWidget *
+gimp_container_grid_view_new (GimpContainer *container,
+                              GimpContext   *context,
+                              gint           view_size,
+                              gint           view_border_width)
+{
+  GimpContainerGridView *grid_view;
+  GimpContainerView     *view;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size  > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+
+  grid_view = g_object_new (GIMP_TYPE_CONTAINER_GRID_VIEW, NULL);
+
+  view = GIMP_CONTAINER_VIEW (grid_view);
+
+  gimp_container_view_set_view_size (view, view_size, view_border_width);
+
+  if (container)
+    gimp_container_view_set_container (view, container);
+
+  if (context)
+    gimp_container_view_set_context (view, context);
+
+  return GTK_WIDGET (grid_view);
+}
+
+static gboolean
+gimp_container_grid_view_move_by (GimpContainerGridView *grid_view,
+                                  gint                   x,
+                                  gint                   y)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (grid_view);
+  GimpContainer     *container;
+  GimpViewable      *item;
+  gint               index;
+
+  if (! grid_view->selected_item)
+    return FALSE;
+
+  container = gimp_container_view_get_container (view);
+
+  item = grid_view->selected_item->viewable;
+
+  index = gimp_container_get_child_index (container, GIMP_OBJECT (item));
+
+  index += x;
+  index = CLAMP (index, 0, gimp_container_get_n_children (container) - 1);
+
+  index += y * grid_view->columns;
+  while (index < 0)
+    index += grid_view->columns;
+  while (index >= gimp_container_get_n_children (container))
+    index -= grid_view->columns;
+
+  item = (GimpViewable *) gimp_container_get_child_by_index (container, index);
+  if (item)
+    gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (view), item);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_container_grid_view_move_cursor (GimpContainerGridView *grid_view,
+                                      GtkMovementStep        step,
+                                      gint                   count)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (grid_view);
+  GimpContainer     *container;
+  GimpViewable      *item;
+
+  if (! gtk_widget_has_focus (GTK_WIDGET (grid_view)) || count == 0)
+    return FALSE;
+
+  container = gimp_container_view_get_container (view);
+
+  switch (step)
+    {
+    case GTK_MOVEMENT_PAGES:
+      return gimp_container_grid_view_move_by (grid_view, 0,
+                                               count * grid_view->visible_rows);
+
+    case GTK_MOVEMENT_BUFFER_ENDS:
+      count = count < 0 ? 0 : gimp_container_get_n_children (container) - 1;
+
+      item = (GimpViewable *) gimp_container_get_child_by_index (container,
+                                                                 count);
+      if (item)
+        gimp_container_view_item_selected (view, item);
+
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_container_grid_view_focus (GtkWidget        *widget,
+                                GtkDirectionType  direction)
+{
+  GimpContainerGridView *view = GIMP_CONTAINER_GRID_VIEW (widget);
+
+  if (gtk_widget_get_can_focus (widget) && ! gtk_widget_has_focus (widget))
+    {
+      gtk_widget_grab_focus (GTK_WIDGET (widget));
+      return TRUE;
+    }
+
+  switch (direction)
+    {
+    case GTK_DIR_UP:
+      return gimp_container_grid_view_move_by (view,  0, -1);
+    case GTK_DIR_DOWN:
+      return gimp_container_grid_view_move_by (view,  0,  1);
+    case GTK_DIR_LEFT:
+      return gimp_container_grid_view_move_by (view, -1,  0);
+    case GTK_DIR_RIGHT:
+      return gimp_container_grid_view_move_by (view,  1,  0);
+
+    case GTK_DIR_TAB_FORWARD:
+    case GTK_DIR_TAB_BACKWARD:
+      break;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_container_grid_view_menu_position (GtkMenu  *menu,
+                                        gint     *x,
+                                        gint     *y,
+                                        gpointer  data)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (data);
+  GtkWidget             *widget;
+  GtkAllocation          allocation;
+
+  if (grid_view->selected_item)
+    widget = GTK_WIDGET (grid_view->selected_item);
+  else
+    widget = GTK_WIDGET (grid_view->wrap_box);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+
+  if (! gtk_widget_get_has_window (widget))
+    {
+      *x += allocation.x;
+      *y += allocation.y;
+    }
+
+  if (grid_view->selected_item)
+    {
+      *x += allocation.width  / 2;
+      *y += allocation.height / 2;
+    }
+  else
+    {
+      GtkStyle *style = gtk_widget_get_style (widget);
+
+      *x += style->xthickness;
+      *y += style->ythickness;
+    }
+
+  gimp_menu_position (menu, x, y);
+}
+
+static gboolean
+gimp_container_grid_view_popup_menu (GtkWidget *widget)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (widget);
+
+  return gimp_editor_popup_menu (GIMP_EDITOR (widget),
+                                 gimp_container_grid_view_menu_position,
+                                 grid_view);
+}
+
+static void
+gimp_container_grid_view_set_context (GimpContainerView *view,
+                                      GimpContext       *context)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
+  GtkWrapBoxChild       *child;
+
+  parent_view_iface->set_context (view, context);
+
+  for (child = GTK_WRAP_BOX (grid_view->wrap_box)->children;
+       child;
+       child = child->next)
+    {
+      GimpView *view = GIMP_VIEW (child->widget);
+
+      gimp_view_renderer_set_context (view->renderer, context);
+    }
+}
+
+static gpointer
+gimp_container_grid_view_insert_item (GimpContainerView *container_view,
+                                      GimpViewable      *viewable,
+                                      gpointer           parent_insert_data,
+                                      gint               index)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (container_view);
+  GtkWidget             *view;
+  gint                   view_size;
+
+  view_size = gimp_container_view_get_view_size (container_view, NULL);
+
+  view = gimp_view_new_full (gimp_container_view_get_context (container_view),
+                             viewable,
+                             view_size, view_size, 1,
+                             FALSE, TRUE, TRUE);
+  gimp_view_renderer_set_border_type (GIMP_VIEW (view)->renderer,
+                                      GIMP_VIEW_BORDER_WHITE);
+  gimp_view_renderer_remove_idle (GIMP_VIEW (view)->renderer);
+
+  gtk_wrap_box_pack (GTK_WRAP_BOX (grid_view->wrap_box), view,
+                     FALSE, FALSE, FALSE, FALSE);
+
+  if (index != -1)
+    gtk_wrap_box_reorder_child (GTK_WRAP_BOX (grid_view->wrap_box),
+                                view, index);
+
+  gtk_widget_show (view);
+
+  g_signal_connect (view, "button-press-event",
+                    G_CALLBACK (gimp_container_grid_view_item_selected),
+                    container_view);
+  g_signal_connect (view, "double-clicked",
+                    G_CALLBACK (gimp_container_grid_view_item_activated),
+                    container_view);
+  g_signal_connect (view, "context",
+                    G_CALLBACK (gimp_container_grid_view_item_context),
+                    container_view);
+
+  return (gpointer) view;
+}
+
+static void
+gimp_container_grid_view_remove_item (GimpContainerView *container_view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (container_view);
+  GtkWidget             *view      = GTK_WIDGET (insert_data);
+
+  if (view == (GtkWidget *) grid_view->selected_item)
+    grid_view->selected_item = NULL;
+
+  gtk_widget_destroy (view);
+}
+
+static void
+gimp_container_grid_view_reorder_item (GimpContainerView *container_view,
+                                       GimpViewable      *viewable,
+                                       gint               new_index,
+                                       gpointer           insert_data)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (container_view);
+  GtkWidget             *view      = GTK_WIDGET (insert_data);
+
+  gtk_wrap_box_reorder_child (GTK_WRAP_BOX (grid_view->wrap_box),
+                              view, new_index);
+}
+
+static void
+gimp_container_grid_view_rename_item (GimpContainerView *container_view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (container_view);
+  GtkWidget             *view      = GTK_WIDGET (insert_data);
+
+  if (view == (GtkWidget *) grid_view->selected_item)
+    {
+      gchar *name = gimp_viewable_get_description (viewable, NULL);
+
+      gimp_editor_set_name (GIMP_EDITOR (container_view), name);
+      g_free (name);
+    }
+}
+
+static gboolean
+gimp_container_grid_view_select_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  gimp_container_grid_view_highlight_item (view, viewable, insert_data);
+
+  return TRUE;
+}
+
+static void
+gimp_container_grid_view_clear_items (GimpContainerView *view)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
+
+  grid_view->selected_item = NULL;
+
+  while (GTK_WRAP_BOX (grid_view->wrap_box)->children)
+    gtk_widget_destroy (GTK_WRAP_BOX (grid_view->wrap_box)->children->widget);
+
+  parent_view_iface->clear_items (view);
+}
+
+static void
+gimp_container_grid_view_set_view_size (GimpContainerView *view)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
+  GtkWrapBoxChild       *child;
+  gint                   view_size;
+
+  view_size = gimp_container_view_get_view_size (view, NULL);
+
+  for (child = GTK_WRAP_BOX (grid_view->wrap_box)->children;
+       child;
+       child = child->next)
+    {
+      GimpView *view = GIMP_VIEW (child->widget);
+
+      gimp_view_renderer_set_size (view->renderer,
+                                   view_size,
+                                   view->renderer->border_width);
+    }
+
+  gtk_widget_queue_resize (grid_view->wrap_box);
+}
+
+static gboolean
+gimp_container_grid_view_item_selected (GtkWidget      *widget,
+                                        GdkEventButton *bevent,
+                                        gpointer        data)
+{
+  if (bevent->type == GDK_BUTTON_PRESS && bevent->button == 1)
+    {
+      if (gtk_widget_get_can_focus (data) && ! gtk_widget_has_focus (data))
+        gtk_widget_grab_focus (GTK_WIDGET (data));
+
+      gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (data),
+                                         GIMP_VIEW (widget)->viewable);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_container_grid_view_item_activated (GtkWidget *widget,
+                                         gpointer   data)
+{
+  gimp_container_view_item_activated (GIMP_CONTAINER_VIEW (data),
+                                      GIMP_VIEW (widget)->viewable);
+}
+
+static void
+gimp_container_grid_view_item_context (GtkWidget *widget,
+                                       gpointer   data)
+{
+  /*  ref the view because calling gimp_container_view_item_selected()
+   *  may destroy the widget
+   */
+  g_object_ref (data);
+
+  if (gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (data),
+                                         GIMP_VIEW (widget)->viewable))
+    {
+      gimp_container_view_item_context (GIMP_CONTAINER_VIEW (data),
+                                        GIMP_VIEW (widget)->viewable);
+    }
+
+  g_object_unref (data);
+}
+
+static void
+gimp_container_grid_view_highlight_item (GimpContainerView *container_view,
+                                         GimpViewable      *viewable,
+                                         gpointer           insert_data)
+{
+  GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (container_view);
+  GimpContainerBox      *box       = GIMP_CONTAINER_BOX (container_view);
+  GimpContainer         *container;
+  GimpView              *view      = NULL;
+
+  container = gimp_container_view_get_container (container_view);
+
+  if (insert_data)
+    view = GIMP_VIEW (insert_data);
+
+  if (grid_view->selected_item && grid_view->selected_item != view)
+    {
+      gimp_view_renderer_set_border_type (grid_view->selected_item->renderer,
+                                          GIMP_VIEW_BORDER_WHITE);
+      gimp_view_renderer_update (grid_view->selected_item->renderer);
+    }
+
+  if (view)
+    {
+      GtkRequisition  view_requisition;
+      GtkAdjustment  *adj;
+      gint            item_height;
+      gint            index;
+      gint            row;
+      gchar          *name;
+
+      adj = gtk_scrolled_window_get_vadjustment
+        (GTK_SCROLLED_WINDOW (box->scrolled_win));
+
+      gtk_widget_size_request (GTK_WIDGET (view), &view_requisition);
+
+      item_height = view_requisition.height;
+
+      index = gimp_container_get_child_index (container,
+                                              GIMP_OBJECT (viewable));
+
+      row = index / grid_view->columns;
+
+      if (row * item_height < gtk_adjustment_get_value (adj))
+        {
+          gtk_adjustment_set_value (adj, row * item_height);
+        }
+      else if ((row + 1) * item_height > (gtk_adjustment_get_value (adj) +
+                                          gtk_adjustment_get_page_size (adj)))
+        {
+          gtk_adjustment_set_value (adj,
+                                    (row + 1) * item_height -
+                                    gtk_adjustment_get_page_size (adj));
+        }
+
+      gimp_view_renderer_set_border_type (view->renderer,
+                                          GIMP_VIEW_BORDER_BLACK);
+      gimp_view_renderer_update (view->renderer);
+
+      name = gimp_viewable_get_description (view->renderer->viewable, NULL);
+      gimp_editor_set_name (GIMP_EDITOR (grid_view), name);
+      g_free (name);
+    }
+  else
+    {
+      gimp_editor_set_name (GIMP_EDITOR (grid_view), NULL);
+    }
+
+  grid_view->selected_item = view;
+}
+
+static void
+gimp_container_grid_view_viewport_resized (GtkWidget             *widget,
+                                           GtkAllocation         *allocation,
+                                           GimpContainerGridView *grid_view)
+{
+  GimpContainerView *container_view = GIMP_CONTAINER_VIEW (grid_view);
+
+  if (gimp_container_view_get_container (container_view))
+    {
+      GList *children;
+      gint   n_children;
+
+      children = gtk_container_get_children (GTK_CONTAINER (grid_view->wrap_box));
+      n_children = g_list_length (children);
+
+      if (children)
+        {
+          GtkRequisition view_requisition;
+          gint           columns;
+          gint           rows;
+
+          gtk_widget_size_request (GTK_WIDGET (children->data),
+                                   &view_requisition);
+
+          g_list_free (children);
+
+          columns = MAX (1, allocation->width / view_requisition.width);
+
+          rows = n_children / columns;
+
+          if (n_children % columns)
+            rows++;
+
+          if ((rows != grid_view->rows) || (columns != grid_view->columns))
+            {
+              grid_view->rows    = rows;
+              grid_view->columns = columns;
+
+              gtk_widget_set_size_request (grid_view->wrap_box,
+                                           view_requisition.width,
+                                           rows * view_requisition.height);
+            }
+
+          grid_view->visible_rows = (allocation->height /
+                                     view_requisition.height);
+        }
+
+      if (grid_view->selected_item)
+        {
+          GimpView *view = grid_view->selected_item;
+
+          gimp_container_grid_view_highlight_item (container_view,
+                                                   view->viewable,
+                                                   view);
+        }
+    }
+}
+
+static gboolean
+gimp_container_grid_view_button_press (GtkWidget             *widget,
+                                       GdkEventButton        *bevent,
+                                       GimpContainerGridView *grid_view)
+{
+  if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+    {
+      gimp_editor_popup_menu (GIMP_EDITOR (grid_view), NULL, NULL);
+    }
+
+  return TRUE;
+}
diff --git a/app/widgets/gimpcontainergridview.h b/app/widgets/gimpcontainergridview.h
new file mode 100644
index 0000000..14de9eb
--- /dev/null
+++ b/app/widgets/gimpcontainergridview.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainergridview.h
+ * Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_GRID_VIEW_H__
+#define __GIMP_CONTAINER_GRID_VIEW_H__
+
+
+#include "gimpcontainerbox.h"
+
+
+#define GIMP_TYPE_CONTAINER_GRID_VIEW            (gimp_container_grid_view_get_type ())
+#define GIMP_CONTAINER_GRID_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_GRID_VIEW, GimpContainerGridView))
+#define GIMP_CONTAINER_GRID_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_GRID_VIEW, GimpContainerGridViewClass))
+#define GIMP_IS_CONTAINER_GRID_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_GRID_VIEW))
+#define GIMP_IS_CONTAINER_GRID_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_GRID_VIEW))
+#define GIMP_CONTAINER_GRID_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_GRID_VIEW, GimpContainerGridViewClass))
+
+
+typedef struct _GimpContainerGridViewClass GimpContainerGridViewClass;
+
+struct _GimpContainerGridView
+{
+  GimpContainerBox  parent_instance;
+
+  GtkWidget        *wrap_box;
+
+  gint              rows;
+  gint              columns;
+  gint              visible_rows;
+
+  GimpView         *selected_item;
+};
+
+struct _GimpContainerGridViewClass
+{
+  GimpContainerBoxClass  parent_class;
+
+  gboolean (* move_cursor) (GimpContainerGridView *grid_view,
+                            GtkMovementStep        step,
+                            gint                   count);
+};
+
+
+GType       gimp_container_grid_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_container_grid_view_new      (GimpContainer *container,
+                                               GimpContext   *context,
+                                               gint           view_size,
+                                               gint           view_border_width);
+
+
+#endif  /*  __GIMP_CONTAINER_GRID_VIEW_H__  */
diff --git a/app/widgets/gimpcontainericonview.c b/app/widgets/gimpcontainericonview.c
new file mode 100644
index 0000000..5b141e2
--- /dev/null
+++ b/app/widgets/gimpcontainericonview.c
@@ -0,0 +1,805 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainericonview.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcellrendererviewable.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainericonview.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+
+struct _GimpContainerIconViewPrivate
+{
+  GimpViewRenderer *dnd_renderer;
+};
+
+
+static void          gimp_container_icon_view_view_iface_init   (GimpContainerViewInterface  *iface);
+
+static void          gimp_container_icon_view_constructed       (GObject                     *object);
+static void          gimp_container_icon_view_finalize          (GObject                     *object);
+
+static void          gimp_container_icon_view_unmap             (GtkWidget                   *widget);
+static gboolean      gimp_container_icon_view_popup_menu        (GtkWidget                   *widget);
+
+static void          gimp_container_icon_view_set_container     (GimpContainerView           *view,
+                                                                 GimpContainer               *container);
+static void          gimp_container_icon_view_set_context       (GimpContainerView           *view,
+                                                                 GimpContext                 *context);
+static void          gimp_container_icon_view_set_selection_mode(GimpContainerView           *view,
+                                                                 GtkSelectionMode             mode);
+
+static gpointer      gimp_container_icon_view_insert_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     parent_insert_data,
+                                                                 gint                         index);
+static void          gimp_container_icon_view_remove_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_icon_view_reorder_item      (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gint                         new_index,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_icon_view_rename_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static gboolean      gimp_container_icon_view_select_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_icon_view_clear_items       (GimpContainerView           *view);
+static void          gimp_container_icon_view_set_view_size     (GimpContainerView           *view);
+
+static void          gimp_container_icon_view_selection_changed (GtkIconView                 *view,
+                                                                 GimpContainerIconView       *icon_view);
+static void          gimp_container_icon_view_item_activated    (GtkIconView                 *view,
+                                                                 GtkTreePath                 *path,
+                                                                 GimpContainerIconView       *icon_view);
+static gboolean      gimp_container_icon_view_button_press      (GtkWidget                   *widget,
+                                                                 GdkEventButton              *bevent,
+                                                                 GimpContainerIconView       *icon_view);
+static gboolean      gimp_container_icon_view_tooltip           (GtkWidget                   *widget,
+                                                                 gint                         x,
+                                                                 gint                         y,
+                                                                 gboolean                     keyboard_tip,
+                                                                 GtkTooltip                  *tooltip,
+                                                                 GimpContainerIconView       *icon_view);
+
+static GimpViewable * gimp_container_icon_view_drag_viewable    (GtkWidget    *widget,
+                                                                 GimpContext **context,
+                                                                 gpointer      data);
+static GdkPixbuf    * gimp_container_icon_view_drag_pixbuf        (GtkWidget *widget,
+                                                                   gpointer   data);
+static gboolean      gimp_container_icon_view_get_selected_single (GimpContainerIconView  *icon_view,
+                                                                   GtkTreeIter            *iter);
+static gint          gimp_container_icon_view_get_selected        (GimpContainerView    *view,
+                                                                   GList               **items);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerIconView, gimp_container_icon_view,
+                         GIMP_TYPE_CONTAINER_BOX,
+                         G_ADD_PRIVATE (GimpContainerIconView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_container_icon_view_view_iface_init))
+
+#define parent_class gimp_container_icon_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_container_icon_view_class_init (GimpContainerIconViewClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed = gimp_container_icon_view_constructed;
+  object_class->finalize    = gimp_container_icon_view_finalize;
+
+  widget_class->unmap       = gimp_container_icon_view_unmap;
+  widget_class->popup_menu  = gimp_container_icon_view_popup_menu;
+}
+
+static void
+gimp_container_icon_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_view_iface)
+    parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
+
+  iface->set_container      = gimp_container_icon_view_set_container;
+  iface->set_context        = gimp_container_icon_view_set_context;
+  iface->set_selection_mode = gimp_container_icon_view_set_selection_mode;
+  iface->insert_item        = gimp_container_icon_view_insert_item;
+  iface->remove_item        = gimp_container_icon_view_remove_item;
+  iface->reorder_item       = gimp_container_icon_view_reorder_item;
+  iface->rename_item        = gimp_container_icon_view_rename_item;
+  iface->select_item        = gimp_container_icon_view_select_item;
+  iface->clear_items        = gimp_container_icon_view_clear_items;
+  iface->set_view_size      = gimp_container_icon_view_set_view_size;
+  iface->get_selected       = gimp_container_icon_view_get_selected;
+
+  iface->insert_data_free = (GDestroyNotify) gtk_tree_iter_free;
+}
+
+static void
+gimp_container_icon_view_init (GimpContainerIconView *icon_view)
+{
+  GimpContainerBox *box = GIMP_CONTAINER_BOX (icon_view);
+
+  icon_view->priv = gimp_container_icon_view_get_instance_private (icon_view);
+
+  gimp_container_tree_store_columns_init (icon_view->model_columns,
+                                          &icon_view->n_model_columns);
+
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box->scrolled_win),
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+}
+
+static void
+gimp_container_icon_view_constructed (GObject *object)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (object);
+  GimpContainerView     *view      = GIMP_CONTAINER_VIEW (object);
+  GimpContainerBox      *box       = GIMP_CONTAINER_BOX (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  icon_view->model = gimp_container_tree_store_new (view,
+                                                    icon_view->n_model_columns,
+                                                    icon_view->model_columns);
+
+  icon_view->view = g_object_new (GTK_TYPE_ICON_VIEW,
+                                  "model",          icon_view->model,
+                                  "row-spacing",    0,
+                                  "column-spacing", 0,
+                                  "margin",         0,
+                                  "item-padding",   1,
+                                  "has-tooltip",    TRUE,
+                                  NULL);
+  g_object_unref (icon_view->model);
+
+  gtk_container_add (GTK_CONTAINER (box->scrolled_win),
+                     GTK_WIDGET (icon_view->view));
+  gtk_widget_show (GTK_WIDGET (icon_view->view));
+
+  gimp_container_view_set_dnd_widget (view, GTK_WIDGET (icon_view->view));
+
+  icon_view->renderer_cell = gimp_cell_renderer_viewable_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view->view),
+                              icon_view->renderer_cell,
+                              FALSE);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view->view),
+                                  icon_view->renderer_cell,
+                                  "renderer", GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
+                                  NULL);
+
+  gimp_container_tree_store_add_renderer_cell (GIMP_CONTAINER_TREE_STORE (icon_view->model),
+                                               icon_view->renderer_cell);
+
+  g_signal_connect (icon_view->view, "selection-changed",
+                    G_CALLBACK (gimp_container_icon_view_selection_changed),
+                    icon_view);
+  g_signal_connect (icon_view->view, "item-activated",
+                    G_CALLBACK (gimp_container_icon_view_item_activated),
+                    icon_view);
+  g_signal_connect (icon_view->view, "query-tooltip",
+                    G_CALLBACK (gimp_container_icon_view_tooltip),
+                    icon_view);
+}
+
+static void
+gimp_container_icon_view_finalize (GObject *object)
+{
+  //GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (object);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_container_icon_view_unmap (GtkWidget *widget)
+{
+  //GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_container_icon_view_menu_position (GtkMenu  *menu,
+                                        gint     *x,
+                                        gint     *y,
+                                        gpointer  data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (data);
+  GtkWidget             *widget    = GTK_WIDGET (icon_view->view);
+  GtkAllocation          allocation;
+#if 0
+  GtkTreeIter            selected_iter;
+#endif
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+
+  if (! gtk_widget_get_has_window (widget))
+    {
+      *x += allocation.x;
+      *y += allocation.y;
+    }
+
+#if 0
+  if (gimp_container_icon_view_get_selected_single (icon_view, &selected_iter))
+    {
+      GtkTreePath  *path;
+      GdkRectangle  cell_rect;
+      gint          center;
+
+      path = gtk_tree_model_get_path (icon_view->model, &selected_iter);
+      gtk_icon_view_get_cell_area (icon_view->view, path,
+                                   icon_view->main_column, &cell_rect);
+      gtk_tree_path_free (path);
+
+      center = cell_rect.y + cell_rect.height / 2;
+      center = CLAMP (center, 0, allocation.height);
+
+      *x += allocation.width / 2;
+      *y += center;
+    }
+  else
+#endif
+    {
+      GtkStyle *style = gtk_widget_get_style (widget);
+
+      *x += style->xthickness;
+      *y += style->ythickness;
+    }
+
+  gimp_menu_position (menu, x, y);
+}
+
+static gboolean
+gimp_container_icon_view_popup_menu (GtkWidget *widget)
+{
+  return gimp_editor_popup_menu (GIMP_EDITOR (widget),
+                                 gimp_container_icon_view_menu_position,
+                                 widget);
+}
+
+GtkWidget *
+gimp_container_icon_view_new (GimpContainer *container,
+                              GimpContext   *context,
+                              gint           view_size,
+                              gint           view_border_width)
+{
+  GimpContainerIconView *icon_view;
+  GimpContainerView     *view;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+
+  icon_view = g_object_new (GIMP_TYPE_CONTAINER_ICON_VIEW, NULL);
+
+  view = GIMP_CONTAINER_VIEW (icon_view);
+
+  gimp_container_view_set_view_size (view, view_size, 0 /* ignore border */);
+
+  if (container)
+    gimp_container_view_set_container (view, container);
+
+  if (context)
+    gimp_container_view_set_context (view, context);
+
+  return GTK_WIDGET (icon_view);
+}
+
+
+/*  GimpContainerView methods  */
+
+static void
+gimp_container_icon_view_set_container (GimpContainerView *view,
+                                        GimpContainer     *container)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+  GimpContainer         *old_container;
+
+  old_container = gimp_container_view_get_container (view);
+
+  if (old_container)
+    {
+      if (! container)
+        {
+          if (gimp_dnd_viewable_source_remove (GTK_WIDGET (icon_view->view),
+                                               gimp_container_get_children_type (old_container)))
+            {
+              if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (old_container)))->get_size)
+                gimp_dnd_pixbuf_source_remove (GTK_WIDGET (icon_view->view));
+
+              gtk_drag_source_unset (GTK_WIDGET (icon_view->view));
+            }
+
+          g_signal_handlers_disconnect_by_func (icon_view->view,
+                                                gimp_container_icon_view_button_press,
+                                                icon_view);
+        }
+    }
+  else if (container)
+    {
+      if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (icon_view->view),
+                                            GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                                            gimp_container_get_children_type (container),
+                                            GDK_ACTION_COPY))
+        {
+          gimp_dnd_viewable_source_add (GTK_WIDGET (icon_view->view),
+                                        gimp_container_get_children_type (container),
+                                        gimp_container_icon_view_drag_viewable,
+                                        icon_view);
+
+          if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (container)))->get_size)
+            gimp_dnd_pixbuf_source_add (GTK_WIDGET (icon_view->view),
+                                        gimp_container_icon_view_drag_pixbuf,
+                                        icon_view);
+        }
+
+      g_signal_connect (icon_view->view, "button-press-event",
+                        G_CALLBACK (gimp_container_icon_view_button_press),
+                        icon_view);
+    }
+
+  parent_view_iface->set_container (view, container);
+}
+
+static void
+gimp_container_icon_view_set_context (GimpContainerView *view,
+                                      GimpContext       *context)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+
+  parent_view_iface->set_context (view, context);
+
+  if (icon_view->model)
+    gimp_container_tree_store_set_context (GIMP_CONTAINER_TREE_STORE (icon_view->model),
+                                           context);
+}
+
+static void
+gimp_container_icon_view_set_selection_mode (GimpContainerView *view,
+                                             GtkSelectionMode   mode)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+
+  gtk_icon_view_set_selection_mode (icon_view->view, mode);
+
+  parent_view_iface->set_selection_mode (view, mode);
+}
+
+static gpointer
+gimp_container_icon_view_insert_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           parent_insert_data,
+                                      gint               index)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+  GtkTreeIter           *iter;
+
+  iter = gimp_container_tree_store_insert_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
+                                                viewable,
+                                                parent_insert_data,
+                                                index);
+
+  if (parent_insert_data)
+    {
+#if 0
+      GtkTreePath *path = gtk_tree_model_get_path (icon_view->model, iter);
+
+      gtk_icon_view_expand_to_path (icon_view->view, path);
+
+      gtk_tree_path_free (path);
+#endif
+    }
+
+  return iter;
+}
+
+static void
+gimp_container_icon_view_remove_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+
+  gimp_container_tree_store_remove_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
+                                         viewable,
+                                         insert_data);
+}
+
+static void
+gimp_container_icon_view_reorder_item (GimpContainerView *view,
+                                       GimpViewable      *viewable,
+                                       gint               new_index,
+                                       gpointer           insert_data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+  GtkTreeIter           *iter      = (GtkTreeIter *) insert_data;
+  gboolean               selected  = FALSE;
+
+  if (iter)
+    {
+      GtkTreeIter selected_iter;
+
+      selected = gimp_container_icon_view_get_selected_single (icon_view,
+                                                               &selected_iter);
+
+      if (selected)
+        {
+          GimpViewRenderer *renderer;
+
+          gtk_tree_model_get (icon_view->model, &selected_iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                              -1);
+
+          if (renderer->viewable != viewable)
+            selected = FALSE;
+
+          g_object_unref (renderer);
+        }
+    }
+
+  gimp_container_tree_store_reorder_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
+                                          viewable,
+                                          new_index,
+                                          iter);
+
+  if (selected)
+    gimp_container_view_select_item (view, viewable);
+}
+
+static void
+gimp_container_icon_view_rename_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+  GtkTreeIter           *iter      = (GtkTreeIter *) insert_data;
+
+  gimp_container_tree_store_rename_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
+                                         viewable,
+                                         iter);
+}
+
+static gboolean
+gimp_container_icon_view_select_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+
+  if (viewable && insert_data)
+    {
+      GtkTreePath *path;
+      GtkTreePath *parent_path;
+      GtkTreeIter *iter = (GtkTreeIter *) insert_data;
+
+      path = gtk_tree_model_get_path (icon_view->model, iter);
+
+      parent_path = gtk_tree_path_copy (path);
+
+      if (gtk_tree_path_up (parent_path))
+        ;
+#if 0
+        gtk_icon_view_expand_to_path (icon_view->view, parent_path);
+#endif
+
+      gtk_tree_path_free (parent_path);
+
+      g_signal_handlers_block_by_func (icon_view->view,
+                                       gimp_container_icon_view_selection_changed,
+                                       icon_view);
+
+      gtk_icon_view_select_path (icon_view->view, path);
+      gtk_icon_view_set_cursor (icon_view->view, path, NULL, FALSE);
+
+      g_signal_handlers_unblock_by_func (icon_view->view,
+                                         gimp_container_icon_view_selection_changed,
+                                         icon_view);
+
+      gtk_icon_view_scroll_to_path (icon_view->view, path, FALSE, 0.0, 0.0);
+
+      gtk_tree_path_free (path);
+    }
+  else if (insert_data == NULL)
+    {
+      /* viewable == NULL && insert_data != NULL means multiple selection.
+       * viewable == NULL && insert_data == NULL means no selection. */
+      gtk_icon_view_unselect_all (icon_view->view);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_container_icon_view_clear_items (GimpContainerView *view)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+
+  gimp_container_tree_store_clear_items (GIMP_CONTAINER_TREE_STORE (icon_view->model));
+
+  parent_view_iface->clear_items (view);
+}
+
+static void
+gimp_container_icon_view_set_view_size (GimpContainerView *view)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+
+  if (icon_view->model)
+    gimp_container_tree_store_set_view_size (GIMP_CONTAINER_TREE_STORE (icon_view->model));
+
+  if (icon_view->view)
+    {
+      gtk_icon_view_set_columns (icon_view->view, -1);
+      gtk_icon_view_set_item_width (icon_view->view, -1);
+    }
+}
+
+
+/*  callbacks  */
+
+static void
+gimp_container_icon_view_selection_changed (GtkIconView           *gtk_icon_view,
+                                            GimpContainerIconView *icon_view)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (icon_view);
+  GList             *items;
+
+  gimp_container_icon_view_get_selected (view, &items);
+  gimp_container_view_multi_selected (view, items);
+  g_list_free (items);
+}
+
+static void
+gimp_container_icon_view_item_activated (GtkIconView           *view,
+                                         GtkTreePath           *path,
+                                         GimpContainerIconView *icon_view)
+{
+  GtkTreeIter       iter;
+  GimpViewRenderer *renderer;
+
+  gtk_tree_model_get_iter (icon_view->model, &iter, path);
+
+  gtk_tree_model_get (icon_view->model, &iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  gimp_container_view_item_activated (GIMP_CONTAINER_VIEW (icon_view),
+                                      renderer->viewable);
+
+  g_object_unref (renderer);
+}
+
+static gboolean
+gimp_container_icon_view_button_press (GtkWidget             *widget,
+                                       GdkEventButton        *bevent,
+                                       GimpContainerIconView *icon_view)
+{
+  GtkTreePath *path;
+
+  icon_view->priv->dnd_renderer = NULL;
+
+  path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (widget),
+                                        bevent->x, bevent->y);
+
+  if (path)
+    {
+      GimpViewRenderer *renderer;
+      GtkTreeIter       iter;
+
+      gtk_tree_model_get_iter (icon_view->model, &iter, path);
+
+      gtk_tree_model_get (icon_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      icon_view->priv->dnd_renderer = renderer;
+
+      g_object_unref (renderer);
+
+      gtk_tree_path_free (path);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_container_icon_view_tooltip (GtkWidget             *widget,
+                                  gint                   x,
+                                  gint                   y,
+                                  gboolean               keyboard_tip,
+                                  GtkTooltip            *tooltip,
+                                  GimpContainerIconView *icon_view)
+{
+  GimpViewRenderer *renderer;
+  GtkTreeIter       iter;
+  GtkTreePath      *path;
+  gboolean          show_tip = FALSE;
+
+  if (! gtk_icon_view_get_tooltip_context (GTK_ICON_VIEW (widget), &x, &y,
+                                           keyboard_tip,
+                                           NULL, &path, &iter))
+    return FALSE;
+
+  gtk_tree_model_get (icon_view->model, &iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      gchar *desc;
+      gchar *tip;
+
+      desc = gimp_viewable_get_description (renderer->viewable, &tip);
+
+      if (tip)
+        {
+          gtk_tooltip_set_text (tooltip, tip);
+          gtk_icon_view_set_tooltip_cell (GTK_ICON_VIEW (widget), tooltip, path,
+                                          icon_view->renderer_cell);
+
+          show_tip = TRUE;
+
+          g_free (tip);
+        }
+
+      g_free (desc);
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+
+  return show_tip;
+}
+
+static GimpViewable *
+gimp_container_icon_view_drag_viewable (GtkWidget    *widget,
+                                        GimpContext **context,
+                                        gpointer      data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (data);
+
+  if (context)
+    *context = gimp_container_view_get_context (GIMP_CONTAINER_VIEW (data));
+
+  if (icon_view->priv->dnd_renderer)
+    return icon_view->priv->dnd_renderer->viewable;
+
+  return NULL;
+}
+
+static GdkPixbuf *
+gimp_container_icon_view_drag_pixbuf (GtkWidget *widget,
+                                      gpointer   data)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (data);
+  GimpViewRenderer      *renderer  = icon_view->priv->dnd_renderer;
+  gint                   width;
+  gint                   height;
+
+  if (renderer && gimp_viewable_get_size (renderer->viewable, &width, &height))
+    return gimp_viewable_get_new_pixbuf (renderer->viewable,
+                                         renderer->context,
+                                         width, height);
+
+  return NULL;
+}
+
+static gboolean
+gimp_container_icon_view_get_selected_single (GimpContainerIconView  *icon_view,
+                                              GtkTreeIter            *iter)
+{
+  GList    *selected_items;
+  gboolean  retval;
+
+  selected_items = gtk_icon_view_get_selected_items (icon_view->view);
+
+  if (g_list_length (selected_items) == 1)
+    {
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (icon_view->model), iter,
+                               (GtkTreePath *) selected_items->data);
+
+      retval = TRUE;
+    }
+  else
+    {
+      retval = FALSE;
+    }
+
+  g_list_free_full (selected_items, (GDestroyNotify) gtk_tree_path_free);
+
+  return retval;
+}
+
+static gint
+gimp_container_icon_view_get_selected (GimpContainerView    *view,
+                                       GList               **items)
+{
+  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
+  GList                 *selected_items;
+  gint                   selected_count;
+
+  selected_items = gtk_icon_view_get_selected_items (icon_view->view);
+  selected_count = g_list_length (selected_items);
+
+  if (items)
+    {
+      GList *list;
+
+      *items = NULL;
+
+      for (list = selected_items;
+           list;
+           list = g_list_next (list))
+        {
+          GtkTreeIter       iter;
+          GimpViewRenderer *renderer;
+
+          gtk_tree_model_get_iter (GTK_TREE_MODEL (icon_view->model), &iter,
+                                   (GtkTreePath *) list->data);
+
+          gtk_tree_model_get (icon_view->model, &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                              -1);
+
+          if (renderer->viewable)
+            *items = g_list_prepend (*items, renderer->viewable);
+
+          g_object_unref (renderer);
+        }
+
+      *items = g_list_reverse (*items);
+    }
+
+  g_list_free_full (selected_items, (GDestroyNotify) gtk_tree_path_free);
+
+  return selected_count;
+}
diff --git a/app/widgets/gimpcontainericonview.h b/app/widgets/gimpcontainericonview.h
new file mode 100644
index 0000000..c7d15cd
--- /dev/null
+++ b/app/widgets/gimpcontainericonview.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainericonview.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_ICON_VIEW_H__
+#define __GIMP_CONTAINER_ICON_VIEW_H__
+
+
+#include "gimpcontainerbox.h"
+
+
+#define GIMP_TYPE_CONTAINER_ICON_VIEW            (gimp_container_icon_view_get_type ())
+#define GIMP_CONTAINER_ICON_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_ICON_VIEW, GimpContainerIconView))
+#define GIMP_CONTAINER_ICON_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_ICON_VIEW, GimpContainerIconViewClass))
+#define GIMP_IS_CONTAINER_ICON_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_ICON_VIEW))
+#define GIMP_IS_CONTAINER_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_ICON_VIEW))
+#define GIMP_CONTAINER_ICON_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_ICON_VIEW, GimpContainerIconViewClass))
+
+
+typedef struct _GimpContainerIconViewClass   GimpContainerIconViewClass;
+typedef struct _GimpContainerIconViewPrivate GimpContainerIconViewPrivate;
+
+struct _GimpContainerIconView
+{
+  GimpContainerBox              parent_instance;
+
+  GtkTreeModel                 *model;
+  gint                          n_model_columns;
+  GType                         model_columns[16];
+
+  GtkIconView                  *view;
+
+  GtkCellRenderer              *renderer_cell;
+
+  Gimp                         *dnd_gimp; /* eek */
+
+  GimpContainerIconViewPrivate *priv;
+};
+
+struct _GimpContainerIconViewClass
+{
+  GimpContainerBoxClass  parent_class;
+};
+
+
+GType       gimp_container_icon_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_container_icon_view_new      (GimpContainer *container,
+                                               GimpContext   *context,
+                                               gint           view_size,
+                                               gint           view_border_width);
+
+
+#endif  /*  __GIMP_CONTAINER_ICON_VIEW_H__  */
diff --git a/app/widgets/gimpcontainerpopup.c b/app/widgets/gimpcontainerpopup.c
new file mode 100644
index 0000000..c862f09
--- /dev/null
+++ b/app/widgets/gimpcontainerpopup.c
@@ -0,0 +1,406 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerpopup.c
+ * Copyright (C) 2003-2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainerbox.h"
+#include "gimpcontainereditor.h"
+#include "gimpcontainerpopup.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpdialogfactory.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_container_popup_finalize         (GObject            *object);
+
+static void   gimp_container_popup_confirm          (GimpPopup          *popup);
+
+static void   gimp_container_popup_create_view      (GimpContainerPopup *popup);
+
+static void   gimp_container_popup_smaller_clicked  (GtkWidget          *button,
+                                                     GimpContainerPopup *popup);
+static void   gimp_container_popup_larger_clicked   (GtkWidget          *button,
+                                                     GimpContainerPopup *popup);
+static void   gimp_container_popup_view_type_toggled(GtkWidget          *button,
+                                                     GimpContainerPopup *popup);
+static void   gimp_container_popup_dialog_clicked   (GtkWidget          *button,
+                                                     GimpContainerPopup *popup);
+
+
+G_DEFINE_TYPE (GimpContainerPopup, gimp_container_popup, GIMP_TYPE_POPUP)
+
+#define parent_class gimp_container_popup_parent_class
+
+
+static void
+gimp_container_popup_class_init (GimpContainerPopupClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GimpPopupClass *popup_class  = GIMP_POPUP_CLASS (klass);
+
+  object_class->finalize = gimp_container_popup_finalize;
+
+  popup_class->confirm   = gimp_container_popup_confirm;
+}
+
+static void
+gimp_container_popup_init (GimpContainerPopup *popup)
+{
+  popup->view_type         = GIMP_VIEW_TYPE_LIST;
+  popup->default_view_size = GIMP_VIEW_SIZE_SMALL;
+  popup->view_size         = GIMP_VIEW_SIZE_SMALL;
+  popup->view_border_width = 1;
+
+  popup->frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (popup->frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (popup), popup->frame);
+  gtk_widget_show (popup->frame);
+}
+
+static void
+gimp_container_popup_finalize (GObject *object)
+{
+  GimpContainerPopup *popup = GIMP_CONTAINER_POPUP (object);
+
+  g_clear_object (&popup->context);
+
+  g_clear_pointer (&popup->dialog_identifier, g_free);
+  g_clear_pointer (&popup->dialog_icon_name,  g_free);
+  g_clear_pointer (&popup->dialog_tooltip,    g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_container_popup_confirm (GimpPopup *popup)
+{
+  GimpContainerPopup *c_popup = GIMP_CONTAINER_POPUP (popup);
+  GimpObject         *object;
+
+  object = gimp_context_get_by_type (c_popup->context,
+                                     gimp_container_get_children_type (c_popup->container));
+  gimp_context_set_by_type (c_popup->orig_context,
+                            gimp_container_get_children_type (c_popup->container),
+                            object);
+
+  GIMP_POPUP_CLASS (parent_class)->confirm (popup);
+}
+
+static void
+gimp_container_popup_context_changed (GimpContext        *context,
+                                      GimpViewable       *viewable,
+                                      GimpContainerPopup *popup)
+{
+  GdkEvent *current_event;
+  gboolean  confirm = FALSE;
+
+  current_event = gtk_get_current_event ();
+
+  if (current_event)
+    {
+      if (((GdkEventAny *) current_event)->type == GDK_BUTTON_PRESS ||
+          ((GdkEventAny *) current_event)->type == GDK_BUTTON_RELEASE)
+        confirm = TRUE;
+
+      gdk_event_free (current_event);
+    }
+
+  if (confirm)
+    g_signal_emit_by_name (popup, "confirm");
+}
+
+GtkWidget *
+gimp_container_popup_new (GimpContainer     *container,
+                          GimpContext       *context,
+                          GimpViewType       view_type,
+                          gint               default_view_size,
+                          gint               view_size,
+                          gint               view_border_width,
+                          GimpDialogFactory *dialog_factory,
+                          const gchar       *dialog_identifier,
+                          const gchar       *dialog_icon_name,
+                          const gchar       *dialog_tooltip)
+{
+  GimpContainerPopup *popup;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (default_view_size >  0 &&
+                        default_view_size <= GIMP_VIEWABLE_MAX_POPUP_SIZE,
+                        NULL);
+  g_return_val_if_fail (view_size >  0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_POPUP_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (dialog_factory == NULL ||
+                        GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
+  if (dialog_factory)
+    {
+      g_return_val_if_fail (dialog_identifier != NULL, NULL);
+      g_return_val_if_fail (dialog_icon_name != NULL, NULL);
+      g_return_val_if_fail (dialog_tooltip != NULL, NULL);
+    }
+
+  popup = g_object_new (GIMP_TYPE_CONTAINER_POPUP,
+                        "type", GTK_WINDOW_POPUP,
+                        NULL);
+  gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
+
+  popup->container    = container;
+  popup->orig_context = context;
+  popup->context      = gimp_context_new (context->gimp, "popup", context);
+
+  popup->view_type         = view_type;
+  popup->default_view_size = default_view_size;
+  popup->view_size         = view_size;
+  popup->view_border_width = view_border_width;
+
+  g_signal_connect (popup->context,
+                    gimp_context_type_to_signal_name (gimp_container_get_children_type (container)),
+                    G_CALLBACK (gimp_container_popup_context_changed),
+                    popup);
+
+  if (dialog_factory)
+    {
+      popup->dialog_factory    = dialog_factory;
+      popup->dialog_identifier = g_strdup (dialog_identifier);
+      popup->dialog_icon_name  = g_strdup (dialog_icon_name);
+      popup->dialog_tooltip    = g_strdup (dialog_tooltip);
+    }
+
+  gimp_container_popup_create_view (popup);
+
+  return GTK_WIDGET (popup);
+}
+
+GimpViewType
+gimp_container_popup_get_view_type (GimpContainerPopup *popup)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER_POPUP (popup), GIMP_VIEW_TYPE_LIST);
+
+  return popup->view_type;
+}
+
+void
+gimp_container_popup_set_view_type (GimpContainerPopup *popup,
+                                    GimpViewType        view_type)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_POPUP (popup));
+
+  if (view_type != popup->view_type)
+    {
+      popup->view_type = view_type;
+
+      gtk_widget_destroy (GTK_WIDGET (popup->editor));
+      gimp_container_popup_create_view (popup);
+    }
+}
+
+gint
+gimp_container_popup_get_view_size (GimpContainerPopup *popup)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER_POPUP (popup), GIMP_VIEW_SIZE_SMALL);
+
+  return popup->view_size;
+}
+
+void
+gimp_container_popup_set_view_size (GimpContainerPopup *popup,
+                                    gint                view_size)
+{
+  GtkWidget     *scrolled_win;
+  GtkWidget     *viewport;
+  GtkAllocation  allocation;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_POPUP (popup));
+
+  scrolled_win = GIMP_CONTAINER_BOX (popup->editor->view)->scrolled_win;
+  viewport     = gtk_bin_get_child (GTK_BIN (scrolled_win));
+
+  gtk_widget_get_allocation (viewport, &allocation);
+
+  view_size = CLAMP (view_size, GIMP_VIEW_SIZE_TINY,
+                     MIN (GIMP_VIEW_SIZE_GIGANTIC,
+                          allocation.width - 2 * popup->view_border_width));
+
+  if (view_size != popup->view_size)
+    {
+      popup->view_size = view_size;
+
+      gimp_container_view_set_view_size (popup->editor->view,
+                                         popup->view_size,
+                                         popup->view_border_width);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_container_popup_create_view (GimpContainerPopup *popup)
+{
+  GimpEditor *editor;
+  GtkWidget  *button;
+  gint        rows;
+  gint        columns;
+
+  popup->editor = g_object_new (GIMP_TYPE_CONTAINER_EDITOR,
+                                "view-type",         popup->view_type,
+                                "container",         popup->container,
+                                "context",           popup->context,
+                                "view-size",         popup->view_size,
+                                "view-border-width", popup->view_border_width,
+                                NULL);
+
+  gimp_container_view_set_reorderable (GIMP_CONTAINER_VIEW (popup->editor->view),
+                                       FALSE);
+
+  if (popup->view_type == GIMP_VIEW_TYPE_LIST)
+    {
+      GtkWidget *search_entry;
+
+      search_entry = gtk_entry_new ();
+      gtk_box_pack_end (GTK_BOX (popup->editor->view), search_entry,
+                        FALSE, FALSE, 0);
+      gtk_tree_view_set_search_entry (GTK_TREE_VIEW (GIMP_CONTAINER_TREE_VIEW (GIMP_CONTAINER_VIEW (popup->editor->view))->view),
+                                      GTK_ENTRY (search_entry));
+      gtk_widget_show (search_entry);
+    }
+
+  /* lame workaround for bug #761998 */
+  if (popup->default_view_size >= GIMP_VIEW_SIZE_LARGE)
+    {
+      rows    = 6;
+      columns = 6;
+    }
+  else
+    {
+      rows    = 10;
+      columns = 6;
+    }
+
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (popup->editor->view),
+                                       columns * (popup->default_view_size +
+                                                  2 * popup->view_border_width),
+                                       rows    * (popup->default_view_size +
+                                                  2 * popup->view_border_width));
+
+  if (GIMP_IS_EDITOR (popup->editor->view))
+    gimp_editor_set_show_name (GIMP_EDITOR (popup->editor->view), FALSE);
+
+  gtk_container_add (GTK_CONTAINER (popup->frame), GTK_WIDGET (popup->editor));
+  gtk_widget_show (GTK_WIDGET (popup->editor));
+
+  editor = GIMP_EDITOR (popup->editor->view);
+
+  gimp_editor_add_button (editor, "zoom-out",
+                          _("Smaller Previews"), NULL,
+                          G_CALLBACK (gimp_container_popup_smaller_clicked),
+                          NULL,
+                          G_OBJECT (popup));
+  gimp_editor_add_button (editor, "zoom-in",
+                          _("Larger Previews"), NULL,
+                          G_CALLBACK (gimp_container_popup_larger_clicked),
+                          NULL,
+                          G_OBJECT (popup));
+
+  button = gimp_editor_add_icon_box (editor, GIMP_TYPE_VIEW_TYPE, "gimp",
+                                     G_CALLBACK (gimp_container_popup_view_type_toggled),
+                                     popup);
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (button), popup->view_type);
+
+  if (popup->dialog_factory)
+    gimp_editor_add_button (editor, popup->dialog_icon_name,
+                            popup->dialog_tooltip, NULL,
+                            G_CALLBACK (gimp_container_popup_dialog_clicked),
+                            NULL,
+                            G_OBJECT (popup));
+
+  gtk_widget_grab_focus (GTK_WIDGET (popup->editor));
+}
+
+static void
+gimp_container_popup_smaller_clicked (GtkWidget          *button,
+                                      GimpContainerPopup *popup)
+{
+  gint view_size;
+
+  view_size = gimp_container_view_get_view_size (popup->editor->view, NULL);
+
+  gimp_container_popup_set_view_size (popup, view_size * 0.8);
+}
+
+static void
+gimp_container_popup_larger_clicked (GtkWidget          *button,
+                                     GimpContainerPopup *popup)
+{
+  gint view_size;
+
+  view_size = gimp_container_view_get_view_size (popup->editor->view, NULL);
+
+  gimp_container_popup_set_view_size (popup, view_size * 1.2);
+}
+
+static void
+gimp_container_popup_view_type_toggled (GtkWidget          *button,
+                                        GimpContainerPopup *popup)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+    {
+      GimpViewType view_type;
+
+      view_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+                                                      "gimp-item-data"));
+
+      gimp_container_popup_set_view_type (popup, view_type);
+    }
+}
+
+static void
+gimp_container_popup_dialog_clicked (GtkWidget          *button,
+                                     GimpContainerPopup *popup)
+{
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (popup->context->gimp)),
+                                             popup->context->gimp,
+                                             popup->dialog_factory,
+                                             gtk_widget_get_screen (button),
+                                             gimp_widget_get_monitor (button),
+                                             popup->dialog_identifier);
+  g_signal_emit_by_name (popup, "cancel");
+}
diff --git a/app/widgets/gimpcontainerpopup.h b/app/widgets/gimpcontainerpopup.h
new file mode 100644
index 0000000..7bfbf69
--- /dev/null
+++ b/app/widgets/gimpcontainerpopup.h
@@ -0,0 +1,88 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerpopup.h
+ * Copyright (C) 2003-2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_POPUP_H__
+#define __GIMP_CONTAINER_POPUP_H__
+
+
+#include "gimppopup.h"
+
+
+#define GIMP_TYPE_CONTAINER_POPUP            (gimp_container_popup_get_type ())
+#define GIMP_CONTAINER_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopup))
+#define GIMP_CONTAINER_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopupClass))
+#define GIMP_IS_CONTAINER_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_POPUP))
+#define GIMP_IS_CONTAINER_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_POPUP))
+#define GIMP_CONTAINER_POPUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopupClass))
+
+
+typedef struct _GimpContainerPopupClass  GimpContainerPopupClass;
+
+struct _GimpContainerPopup
+{
+  GimpPopup            parent_instance;
+
+  GimpContainer       *container;
+  GimpContext         *orig_context;
+  GimpContext         *context;
+
+  GimpViewType         view_type;
+  gint                 default_view_size;
+  gint                 view_size;
+  gint                 view_border_width;
+
+  GtkWidget           *frame;
+  GimpContainerEditor *editor;
+
+  GimpDialogFactory   *dialog_factory;
+  gchar               *dialog_identifier;
+  gchar               *dialog_icon_name;
+  gchar               *dialog_tooltip;
+};
+
+struct _GimpContainerPopupClass
+{
+  GimpPopupClass  parent_instance;
+};
+
+
+GType       gimp_container_popup_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_container_popup_new      (GimpContainer      *container,
+                                           GimpContext        *context,
+                                           GimpViewType        view_type,
+                                           gint                default_view_size,
+                                           gint                view_size,
+                                           gint                view_border_width,
+                                           GimpDialogFactory  *dialog_factory,
+                                           const gchar        *dialog_identifier,
+                                           const gchar        *dialog_icon_name,
+                                           const gchar        *dialog_tooltip);
+
+GimpViewType gimp_container_popup_get_view_type (GimpContainerPopup *popup);
+void         gimp_container_popup_set_view_type (GimpContainerPopup *popup,
+                                                 GimpViewType        view_type);
+
+gint         gimp_container_popup_get_view_size (GimpContainerPopup *popup);
+void         gimp_container_popup_set_view_size (GimpContainerPopup *popup,
+                                                 gint                view_size);
+
+
+#endif  /*  __GIMP_CONTAINER_POPUP_H__  */
diff --git a/app/widgets/gimpcontainertreestore.c b/app/widgets/gimpcontainertreestore.c
new file mode 100644
index 0000000..643368d
--- /dev/null
+++ b/app/widgets/gimpcontainertreestore.c
@@ -0,0 +1,612 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreestore.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcellrendererviewable.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpviewrenderer.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTAINER_VIEW,
+  PROP_USE_NAME
+};
+
+
+typedef struct _GimpContainerTreeStorePrivate GimpContainerTreeStorePrivate;
+
+struct _GimpContainerTreeStorePrivate
+{
+  GimpContainerView *container_view;
+  GList             *renderer_cells;
+  gboolean           use_name;
+};
+
+#define GET_PRIVATE(store) \
+        ((GimpContainerTreeStorePrivate *) gimp_container_tree_store_get_instance_private ((GimpContainerTreeStore *) (store)))
+
+
+static void   gimp_container_tree_store_constructed     (GObject                *object);
+static void   gimp_container_tree_store_finalize        (GObject                *object);
+static void   gimp_container_tree_store_set_property    (GObject                *object,
+                                                         guint                   property_id,
+                                                         const GValue           *value,
+                                                         GParamSpec             *pspec);
+static void   gimp_container_tree_store_get_property    (GObject                *object,
+                                                         guint                   property_id,
+                                                         GValue                 *value,
+                                                         GParamSpec             *pspec);
+
+static void   gimp_container_tree_store_set             (GimpContainerTreeStore *store,
+                                                         GtkTreeIter            *iter,
+                                                         GimpViewable           *viewable);
+static void   gimp_container_tree_store_renderer_update (GimpViewRenderer       *renderer,
+                                                         GimpContainerTreeStore *store);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpContainerTreeStore, gimp_container_tree_store,
+                            GTK_TYPE_TREE_STORE)
+
+#define parent_class gimp_container_tree_store_parent_class
+
+
+static void
+gimp_container_tree_store_class_init (GimpContainerTreeStoreClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_container_tree_store_constructed;
+  object_class->finalize     = gimp_container_tree_store_finalize;
+  object_class->set_property = gimp_container_tree_store_set_property;
+  object_class->get_property = gimp_container_tree_store_get_property;
+
+  g_object_class_install_property (object_class, PROP_CONTAINER_VIEW,
+                                   g_param_spec_object ("container-view",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER_VIEW,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_USE_NAME,
+                                   g_param_spec_boolean ("use-name",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_container_tree_store_init (GimpContainerTreeStore *store)
+{
+}
+
+static void
+gimp_container_tree_store_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+static void
+gimp_container_tree_store_finalize (GObject *object)
+{
+  GimpContainerTreeStorePrivate *private = GET_PRIVATE (object);
+
+  if (private->renderer_cells)
+    {
+      g_list_free (private->renderer_cells);
+      private->renderer_cells = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_container_tree_store_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpContainerTreeStorePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTAINER_VIEW:
+      private->container_view = g_value_get_object (value); /* don't ref */
+      break;
+    case PROP_USE_NAME:
+      private->use_name = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_container_tree_store_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpContainerTreeStorePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTAINER_VIEW:
+      g_value_set_object (value, private->container_view);
+      break;
+    case PROP_USE_NAME:
+      g_value_set_boolean (value, private->use_name);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GtkTreeModel *
+gimp_container_tree_store_new (GimpContainerView *container_view,
+                               gint               n_columns,
+                               GType             *types)
+{
+  GimpContainerTreeStore *store;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (container_view), NULL);
+  g_return_val_if_fail (n_columns >= GIMP_CONTAINER_TREE_STORE_N_COLUMNS, NULL);
+  g_return_val_if_fail (types != NULL, NULL);
+
+  store = g_object_new (GIMP_TYPE_CONTAINER_TREE_STORE,
+                        "container-view", container_view,
+                        NULL);
+
+  gtk_tree_store_set_column_types (GTK_TREE_STORE (store), n_columns, types);
+
+  return GTK_TREE_MODEL (store);
+}
+
+void
+gimp_container_tree_store_add_renderer_cell (GimpContainerTreeStore *store,
+                                             GtkCellRenderer        *cell)
+{
+  GimpContainerTreeStorePrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store));
+  g_return_if_fail (GIMP_IS_CELL_RENDERER_VIEWABLE (cell));
+
+  private = GET_PRIVATE (store);
+
+  private->renderer_cells = g_list_prepend (private->renderer_cells, cell);
+}
+
+void
+gimp_container_tree_store_set_use_name (GimpContainerTreeStore *store,
+                                        gboolean                use_name)
+{
+  GimpContainerTreeStorePrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store));
+
+  private = GET_PRIVATE (store);
+
+  if (private->use_name != use_name)
+    {
+      private->use_name = use_name ? TRUE : FALSE;
+      g_object_notify (G_OBJECT (store), "use-name");
+    }
+}
+
+gboolean
+gimp_container_tree_store_get_use_name (GimpContainerTreeStore *store)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store), FALSE);
+
+  return GET_PRIVATE (store)->use_name;
+}
+
+static gboolean
+gimp_container_tree_store_set_context_foreach (GtkTreeModel *model,
+                                               GtkTreePath  *path,
+                                               GtkTreeIter  *iter,
+                                               gpointer      data)
+{
+  GimpContext      *context = data;
+  GimpViewRenderer *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  gimp_view_renderer_set_context (renderer, context);
+
+  g_object_unref (renderer);
+
+  return FALSE;
+}
+
+void
+gimp_container_tree_store_set_context (GimpContainerTreeStore *store,
+                                       GimpContext            *context)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store));
+
+  gtk_tree_model_foreach (GTK_TREE_MODEL (store),
+                          gimp_container_tree_store_set_context_foreach,
+                          context);
+}
+
+GtkTreeIter *
+gimp_container_tree_store_insert_item (GimpContainerTreeStore *store,
+                                       GimpViewable           *viewable,
+                                       GtkTreeIter            *parent,
+                                       gint                    index)
+{
+  GtkTreeIter iter;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store), NULL);
+
+  if (index == -1)
+    gtk_tree_store_append (GTK_TREE_STORE (store), &iter, parent);
+  else
+    gtk_tree_store_insert (GTK_TREE_STORE (store), &iter, parent, index);
+
+  gimp_container_tree_store_set (store, &iter, viewable);
+
+  return gtk_tree_iter_copy (&iter);
+}
+
+void
+gimp_container_tree_store_remove_item (GimpContainerTreeStore *store,
+                                       GimpViewable           *viewable,
+                                       GtkTreeIter            *iter)
+{
+  if (iter)
+    {
+      GtkTreeModel *model = GTK_TREE_MODEL (store);
+      GtkTreePath  *path;
+
+      /* emit a "row-changed" signal for 'iter', so that editing of
+       * corresponding tree-view rows is canceled.  otherwise, if we remove the
+       * item while a corresponding row is being edited, bad things happen (see
+       * bug #792991).
+       */
+      path = gtk_tree_model_get_path (model, iter);
+      gtk_tree_model_row_changed (model, path, iter);
+      gtk_tree_path_free (path);
+
+      gtk_tree_store_remove (GTK_TREE_STORE (store), iter);
+
+      /*  If the store is empty after this remove, clear out renderers
+       *  from all cells so they don't keep refing the viewables
+       *  (see bug #149906).
+       */
+      if (! gtk_tree_model_iter_n_children (model, NULL))
+        {
+          GimpContainerTreeStorePrivate *private = GET_PRIVATE (store);
+          GList                         *list;
+
+          for (list = private->renderer_cells; list; list = list->next)
+            g_object_set (list->data, "renderer", NULL, NULL);
+        }
+    }
+}
+
+void
+gimp_container_tree_store_reorder_item (GimpContainerTreeStore *store,
+                                        GimpViewable           *viewable,
+                                        gint                    new_index,
+                                        GtkTreeIter            *iter)
+{
+  GimpContainerTreeStorePrivate *private;
+  GimpViewable                  *parent;
+  GimpContainer                 *container;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store));
+
+  private = GET_PRIVATE (store);
+
+  if (! iter)
+    return;
+
+  parent = gimp_viewable_get_parent (viewable);
+
+  if (parent)
+    container = gimp_viewable_get_children (parent);
+  else
+    container = gimp_container_view_get_container (private->container_view);
+
+  if (new_index == -1 ||
+      new_index == gimp_container_get_n_children (container) - 1)
+    {
+      gtk_tree_store_move_before (GTK_TREE_STORE (store), iter, NULL);
+    }
+  else if (new_index == 0)
+    {
+      gtk_tree_store_move_after (GTK_TREE_STORE (store), iter, NULL);
+    }
+  else
+    {
+      GtkTreePath *path;
+      GtkTreeIter  place_iter;
+      gint         depth;
+      gint        *indices;
+      gint         old_index;
+
+      path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter);
+      indices = gtk_tree_path_get_indices (path);
+
+      depth = gtk_tree_path_get_depth (path);
+
+      old_index = indices[depth - 1];
+
+      if (new_index != old_index)
+        {
+          indices[depth - 1] = new_index;
+
+          gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &place_iter, path);
+
+          if (new_index > old_index)
+            gtk_tree_store_move_after (GTK_TREE_STORE (store),
+                                       iter, &place_iter);
+          else
+            gtk_tree_store_move_before (GTK_TREE_STORE (store),
+                                        iter, &place_iter);
+        }
+
+      gtk_tree_path_free (path);
+    }
+}
+
+gboolean
+gimp_container_tree_store_rename_item (GimpContainerTreeStore *store,
+                                       GimpViewable           *viewable,
+                                       GtkTreeIter            *iter)
+{
+  gboolean new_name_shorter = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store), FALSE);
+
+  if (iter)
+    {
+      GimpContainerTreeStorePrivate *private = GET_PRIVATE (store);
+      gchar                         *name;
+      gchar                         *old_name;
+
+      if (private->use_name)
+        name = (gchar *) gimp_object_get_name (viewable);
+      else
+        name = gimp_viewable_get_description (viewable, NULL);
+
+      gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, &old_name,
+                          -1);
+
+      gtk_tree_store_set (GTK_TREE_STORE (store), iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, name,
+                          -1);
+
+      if (name && old_name && strlen (name) < strlen (old_name))
+        new_name_shorter = TRUE;
+
+      if (! private->use_name)
+        g_free (name);
+
+      g_free (old_name);
+    }
+
+  return new_name_shorter;
+}
+
+void
+gimp_container_tree_store_clear_items (GimpContainerTreeStore *store)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store));
+
+  gtk_tree_store_clear (GTK_TREE_STORE (store));
+
+  /*  If the store is empty after this remove, clear out renderers
+   *  from all cells so they don't keep refing the viewables
+   *  (see bug #149906).
+   */
+  if (! gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL))
+    {
+      GimpContainerTreeStorePrivate *private = GET_PRIVATE (store);
+      GList                         *list;
+
+      for (list = private->renderer_cells; list; list = list->next)
+        g_object_set (list->data, "renderer", NULL, NULL);
+    }
+}
+
+typedef struct
+{
+  gint view_size;
+  gint border_width;
+} SetSizeForeachData;
+
+static gboolean
+gimp_container_tree_store_set_view_size_foreach (GtkTreeModel *model,
+                                                 GtkTreePath  *path,
+                                                 GtkTreeIter  *iter,
+                                                 gpointer      data)
+{
+  SetSizeForeachData *size_data = data;
+  GimpViewRenderer   *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  gimp_view_renderer_set_size (renderer,
+                               size_data->view_size,
+                               size_data->border_width);
+
+  g_object_unref (renderer);
+
+  return FALSE;
+}
+
+void
+gimp_container_tree_store_set_view_size (GimpContainerTreeStore *store)
+{
+  GimpContainerTreeStorePrivate *private;
+  SetSizeForeachData             size_data;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_STORE (store));
+
+  private = GET_PRIVATE (store);
+
+  size_data.view_size =
+    gimp_container_view_get_view_size (private->container_view,
+                                       &size_data.border_width);
+
+  gtk_tree_model_foreach (GTK_TREE_MODEL (store),
+                          gimp_container_tree_store_set_view_size_foreach,
+                          &size_data);
+}
+
+
+/*  private functions  */
+
+void
+gimp_container_tree_store_columns_init (GType *types,
+                                        gint  *n_types)
+{
+  g_return_if_fail (types != NULL);
+  g_return_if_fail (n_types != NULL);
+  g_return_if_fail (*n_types == 0);
+
+  gimp_assert (GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER ==
+               gimp_container_tree_store_columns_add (types, n_types,
+                                                      GIMP_TYPE_VIEW_RENDERER));
+
+  gimp_assert (GIMP_CONTAINER_TREE_STORE_COLUMN_NAME ==
+               gimp_container_tree_store_columns_add (types, n_types,
+                                                      G_TYPE_STRING));
+
+  gimp_assert (GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_ATTRIBUTES ==
+               gimp_container_tree_store_columns_add (types, n_types,
+                                                      PANGO_TYPE_ATTR_LIST));
+
+  gimp_assert (GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_SENSITIVE ==
+               gimp_container_tree_store_columns_add (types, n_types,
+                                                      G_TYPE_BOOLEAN));
+
+  gimp_assert (GIMP_CONTAINER_TREE_STORE_COLUMN_USER_DATA ==
+               gimp_container_tree_store_columns_add (types, n_types,
+                                                      G_TYPE_POINTER));
+}
+
+gint
+gimp_container_tree_store_columns_add (GType *types,
+                                       gint  *n_types,
+                                       GType  type)
+{
+  g_return_val_if_fail (types != NULL, 0);
+  g_return_val_if_fail (n_types != NULL, 0);
+  g_return_val_if_fail (*n_types >= 0, 0);
+
+  types[*n_types] = type;
+  (*n_types)++;
+
+  return *n_types - 1;
+}
+
+static void
+gimp_container_tree_store_set (GimpContainerTreeStore *store,
+                               GtkTreeIter            *iter,
+                               GimpViewable           *viewable)
+{
+  GimpContainerTreeStorePrivate *private = GET_PRIVATE (store);
+  GimpContext                   *context;
+  GimpViewRenderer              *renderer;
+  gchar                         *name;
+  gint                           view_size;
+  gint                           border_width;
+
+  context = gimp_container_view_get_context (private->container_view);
+
+  view_size = gimp_container_view_get_view_size (private->container_view,
+                                                 &border_width);
+
+  renderer = gimp_view_renderer_new (context,
+                                     G_TYPE_FROM_INSTANCE (viewable),
+                                     view_size, border_width,
+                                     FALSE);
+  gimp_view_renderer_set_viewable (renderer, viewable);
+  gimp_view_renderer_remove_idle (renderer);
+
+  g_signal_connect (renderer, "update",
+                    G_CALLBACK (gimp_container_tree_store_renderer_update),
+                    store);
+
+  if (private->use_name)
+    name = (gchar *) gimp_object_get_name (viewable);
+  else
+    name = gimp_viewable_get_description (viewable, NULL);
+
+  gtk_tree_store_set (GTK_TREE_STORE (store), iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,       renderer,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_NAME,           name,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_SENSITIVE, TRUE,
+                      -1);
+
+  if (! private->use_name)
+    g_free (name);
+
+  g_object_unref (renderer);
+}
+
+static void
+gimp_container_tree_store_renderer_update (GimpViewRenderer       *renderer,
+                                           GimpContainerTreeStore *store)
+{
+  GimpContainerTreeStorePrivate *private = GET_PRIVATE (store);
+  GtkTreeIter                   *iter;
+
+  iter = gimp_container_view_lookup (private->container_view,
+                                     renderer->viewable);
+
+  if (iter)
+    {
+      GtkTreePath *path;
+
+      path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter);
+      gtk_tree_model_row_changed (GTK_TREE_MODEL (store), path, iter);
+      gtk_tree_path_free (path);
+    }
+}
diff --git a/app/widgets/gimpcontainertreestore.h b/app/widgets/gimpcontainertreestore.h
new file mode 100644
index 0000000..29b6635
--- /dev/null
+++ b/app/widgets/gimpcontainertreestore.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreestore.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_TREE_STORE_H__
+#define __GIMP_CONTAINER_TREE_STORE_H__
+
+
+enum
+{
+  GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
+  GIMP_CONTAINER_TREE_STORE_COLUMN_NAME,
+  GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_ATTRIBUTES,
+  GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_SENSITIVE,
+  GIMP_CONTAINER_TREE_STORE_COLUMN_USER_DATA,
+  GIMP_CONTAINER_TREE_STORE_N_COLUMNS
+};
+
+
+#define GIMP_TYPE_CONTAINER_TREE_STORE            (gimp_container_tree_store_get_type ())
+#define GIMP_CONTAINER_TREE_STORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_TREE_STORE, GimpContainerTreeStore))
+#define GIMP_CONTAINER_TREE_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_TREE_STORE, GimpContainerTreeStoreClass))
+#define GIMP_IS_CONTAINER_TREE_STORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_TREE_STORE))
+#define GIMP_IS_CONTAINER_TREE_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_TREE_STORE))
+#define GIMP_CONTAINER_TREE_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_TREE_STORE, GimpContainerTreeStoreClass))
+
+
+typedef struct _GimpContainerTreeStoreClass GimpContainerTreeStoreClass;
+
+struct _GimpContainerTreeStore
+{
+  GtkTreeStore  parent_instance;
+};
+
+struct _GimpContainerTreeStoreClass
+{
+  GtkTreeStoreClass  parent_class;
+};
+
+
+GType          gimp_container_tree_store_get_type      (void) G_GNUC_CONST;
+
+void           gimp_container_tree_store_columns_init  (GType                  *types,
+                                                        gint                   *n_types);
+gint           gimp_container_tree_store_columns_add   (GType                  *types,
+                                                        gint                   *n_types,
+                                                        GType                   type);
+
+GtkTreeModel * gimp_container_tree_store_new           (GimpContainerView      *container_view,
+                                                        gint                    n_columns,
+                                                        GType                  *types);
+
+void       gimp_container_tree_store_add_renderer_cell (GimpContainerTreeStore *store,
+                                                        GtkCellRenderer        *cell);
+void           gimp_container_tree_store_set_use_name  (GimpContainerTreeStore *store,
+                                                        gboolean                use_name);
+gboolean       gimp_container_tree_store_get_use_name  (GimpContainerTreeStore *store);
+
+void           gimp_container_tree_store_set_context   (GimpContainerTreeStore *store,
+                                                        GimpContext            *context);
+GtkTreeIter *  gimp_container_tree_store_insert_item   (GimpContainerTreeStore *store,
+                                                        GimpViewable           *viewable,
+                                                        GtkTreeIter            *parent,
+                                                        gint                    index);
+void           gimp_container_tree_store_remove_item   (GimpContainerTreeStore *store,
+                                                        GimpViewable           *viewable,
+                                                        GtkTreeIter            *iter);
+void           gimp_container_tree_store_reorder_item  (GimpContainerTreeStore *store,
+                                                        GimpViewable           *viewable,
+                                                        gint                    new_index,
+                                                        GtkTreeIter            *iter);
+gboolean       gimp_container_tree_store_rename_item   (GimpContainerTreeStore *store,
+                                                        GimpViewable           *viewable,
+                                                        GtkTreeIter            *iter);
+void           gimp_container_tree_store_clear_items   (GimpContainerTreeStore *store);
+void           gimp_container_tree_store_set_view_size (GimpContainerTreeStore *store);
+
+
+#endif  /*  __GIMP_CONTAINER_TREE_STORE_H__  */
diff --git a/app/widgets/gimpcontainertreeview-dnd.c b/app/widgets/gimpcontainertreeview-dnd.c
new file mode 100644
index 0000000..720488e
--- /dev/null
+++ b/app/widgets/gimpcontainertreeview-dnd.c
@@ -0,0 +1,733 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreeview-dnd.c
+ * Copyright (C) 2003-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainertreestore.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainertreeview-dnd.h"
+#include "gimpcontainertreeview-private.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpviewrenderer.h"
+#include "gimpselectiondata.h"
+
+
+static gboolean
+gimp_container_tree_view_drop_status (GimpContainerTreeView    *tree_view,
+                                      GdkDragContext           *context,
+                                      gint                      x,
+                                      gint                      y,
+                                      guint                     time,
+                                      GtkTreePath             **return_path,
+                                      GdkAtom                  *return_atom,
+                                      GimpDndType              *return_src_type,
+                                      GimpViewable            **return_src,
+                                      GimpViewable            **return_dest,
+                                      GtkTreeViewDropPosition  *return_pos)
+{
+  GimpViewable            *src_viewable  = NULL;
+  GimpViewable            *dest_viewable = NULL;
+  GtkTreePath             *drop_path     = NULL;
+  GtkTargetList           *target_list;
+  GdkAtom                  target_atom;
+  GimpDndType              src_type;
+  GtkTreeViewDropPosition  drop_pos      = GTK_TREE_VIEW_DROP_BEFORE;
+  GdkDragAction            drag_action   = 0;
+
+  if (! gimp_container_view_get_container (GIMP_CONTAINER_VIEW (tree_view)) ||
+      ! gimp_container_view_get_reorderable (GIMP_CONTAINER_VIEW (tree_view)))
+    goto drop_impossible;
+
+  target_list = gtk_drag_dest_get_target_list (GTK_WIDGET (tree_view->view));
+  target_atom = gtk_drag_dest_find_target (GTK_WIDGET (tree_view->view),
+                                           context, target_list);
+  if (! gtk_target_list_find (target_list, target_atom, &src_type))
+    goto drop_impossible;
+
+  switch (src_type)
+    {
+    case GIMP_DND_TYPE_URI_LIST:
+    case GIMP_DND_TYPE_TEXT_PLAIN:
+    case GIMP_DND_TYPE_NETSCAPE_URL:
+    case GIMP_DND_TYPE_COLOR:
+    case GIMP_DND_TYPE_SVG:
+    case GIMP_DND_TYPE_SVG_XML:
+    case GIMP_DND_TYPE_COMPONENT:
+    case GIMP_DND_TYPE_PIXBUF:
+      break;
+
+    default:
+      {
+        GtkWidget *src_widget = gtk_drag_get_source_widget (context);
+
+        if (! src_widget)
+          goto drop_impossible;
+
+        src_viewable = gimp_dnd_get_drag_data (src_widget);
+
+        if (! GIMP_IS_VIEWABLE (src_viewable))
+          goto drop_impossible;
+      }
+      break;
+    }
+
+  gtk_tree_view_convert_widget_to_bin_window_coords (tree_view->view, x, y, &x, &y);
+  if (gtk_tree_view_get_path_at_pos (tree_view->view, x, y,
+                                     &drop_path, NULL, NULL, NULL))
+    {
+      GimpViewRenderer *renderer;
+      GtkTreeIter       iter;
+      GdkRectangle      cell_area;
+
+      gtk_tree_model_get_iter (tree_view->model, &iter, drop_path);
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      dest_viewable = renderer->viewable;
+
+      g_object_unref (renderer);
+
+      gtk_tree_view_get_cell_area (tree_view->view, drop_path, NULL, &cell_area);
+
+      if (gimp_viewable_get_children (dest_viewable))
+        {
+          if (gtk_tree_view_row_expanded (tree_view->view, drop_path))
+            {
+              if (y >= (cell_area.y + cell_area.height / 2))
+                drop_pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
+              else
+                drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+            }
+          else
+            {
+              if (y >= (cell_area.y + 2 * (cell_area.height / 3)))
+                drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+              else if (y <= (cell_area.y + cell_area.height / 3))
+                drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+              else
+                drop_pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
+            }
+        }
+      else
+        {
+          if (y >= (cell_area.y + cell_area.height / 2))
+            drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+          else
+            drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+        }
+    }
+  else
+    {
+      GtkTreeIter iter;
+      gint        n_children;
+
+      n_children = gtk_tree_model_iter_n_children (tree_view->model, NULL);
+
+      if (n_children > 0 &&
+          gtk_tree_model_iter_nth_child (tree_view->model, &iter,
+                                         NULL, n_children - 1))
+        {
+          GimpViewRenderer *renderer;
+
+          gtk_tree_model_get (tree_view->model, &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
+                              &renderer,
+                              -1);
+
+          drop_path     = gtk_tree_model_get_path (tree_view->model, &iter);
+          dest_viewable = renderer->viewable;
+          drop_pos      = GTK_TREE_VIEW_DROP_AFTER;
+
+          g_object_unref (renderer);
+        }
+    }
+
+  if (dest_viewable || tree_view->priv->dnd_drop_to_empty)
+    {
+      if (GIMP_CONTAINER_TREE_VIEW_GET_CLASS (tree_view)->drop_possible (tree_view,
+                                                                         src_type,
+                                                                         src_viewable,
+                                                                         dest_viewable,
+                                                                         drop_path,
+                                                                         drop_pos,
+                                                                         &drop_pos,
+                                                                         &drag_action))
+        {
+          gdk_drag_status (context, drag_action, time);
+
+          if (return_path)
+            *return_path = drop_path;
+          else
+            gtk_tree_path_free (drop_path);
+
+          if (return_atom)
+            *return_atom = target_atom;
+
+          if (return_src)
+            *return_src = src_viewable;
+
+          if (return_dest)
+            *return_dest = dest_viewable;
+
+          if (return_pos)
+            *return_pos = drop_pos;
+
+          return TRUE;
+        }
+
+      gtk_tree_path_free (drop_path);
+    }
+
+ drop_impossible:
+
+  gdk_drag_status (context, 0, time);
+
+  return FALSE;
+}
+
+#define SCROLL_DISTANCE 30
+#define SCROLL_STEP     10
+#define SCROLL_INTERVAL  5
+/* #define SCROLL_DEBUG 1 */
+
+static gboolean
+gimp_container_tree_view_scroll_timeout (gpointer data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (data);
+  GtkAdjustment         *adj;
+  gdouble                new_value;
+
+  adj = gtk_tree_view_get_vadjustment (GTK_TREE_VIEW (tree_view->view));
+
+#ifdef SCROLL_DEBUG
+  g_print ("scroll_timeout: scrolling by %d\n", SCROLL_STEP);
+#endif
+
+  if (tree_view->priv->scroll_dir == GDK_SCROLL_UP)
+    new_value = gtk_adjustment_get_value (adj) - SCROLL_STEP;
+  else
+    new_value = gtk_adjustment_get_value (adj) + SCROLL_STEP;
+
+  new_value = CLAMP (new_value,
+                     gtk_adjustment_get_lower (adj),
+                     gtk_adjustment_get_upper (adj) -
+                     gtk_adjustment_get_page_size (adj));
+
+  gtk_adjustment_set_value (adj, new_value);
+
+  if (tree_view->priv->scroll_timeout_id)
+    {
+      g_source_remove (tree_view->priv->scroll_timeout_id);
+
+      tree_view->priv->scroll_timeout_id =
+        g_timeout_add (tree_view->priv->scroll_timeout_interval,
+                       gimp_container_tree_view_scroll_timeout,
+                       tree_view);
+    }
+
+  return FALSE;
+}
+
+void
+gimp_container_tree_view_drag_failed (GtkWidget             *widget,
+                                      GdkDragContext        *context,
+                                      GtkDragResult          result,
+                                      GimpContainerTreeView *tree_view)
+{
+  if (tree_view->priv->scroll_timeout_id)
+    {
+      g_source_remove (tree_view->priv->scroll_timeout_id);
+      tree_view->priv->scroll_timeout_id = 0;
+    }
+
+  gtk_tree_view_set_drag_dest_row (tree_view->view, NULL, 0);
+}
+
+void
+gimp_container_tree_view_drag_leave (GtkWidget             *widget,
+                                     GdkDragContext        *context,
+                                     guint                  time,
+                                     GimpContainerTreeView *tree_view)
+{
+  if (tree_view->priv->scroll_timeout_id)
+    {
+      g_source_remove (tree_view->priv->scroll_timeout_id);
+      tree_view->priv->scroll_timeout_id = 0;
+    }
+
+  gtk_tree_view_set_drag_dest_row (tree_view->view, NULL, 0);
+}
+
+gboolean
+gimp_container_tree_view_drag_motion (GtkWidget             *widget,
+                                      GdkDragContext        *context,
+                                      gint                   x,
+                                      gint                   y,
+                                      guint                  time,
+                                      GimpContainerTreeView *tree_view)
+{
+  GtkAllocation            allocation;
+  GtkTreePath             *drop_path;
+  GtkTreeViewDropPosition  drop_pos;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  if (y < SCROLL_DISTANCE || y > (allocation.height - SCROLL_DISTANCE))
+    {
+      gint distance;
+
+      if (y < SCROLL_DISTANCE)
+        {
+          tree_view->priv->scroll_dir = GDK_SCROLL_UP;
+          distance = MIN (-y, -1);
+        }
+      else
+        {
+          tree_view->priv->scroll_dir = GDK_SCROLL_DOWN;
+          distance = MAX (allocation.height - y, 1);
+        }
+
+      tree_view->priv->scroll_timeout_interval = SCROLL_INTERVAL * ABS (distance);
+
+#ifdef SCROLL_DEBUG
+      g_print ("drag_motion: scroll_distance = %d  scroll_interval = %d\n",
+               distance, tree_view->priv->scroll_timeout_interval);
+#endif
+
+      if (! tree_view->priv->scroll_timeout_id)
+        tree_view->priv->scroll_timeout_id =
+          g_timeout_add (tree_view->priv->scroll_timeout_interval,
+                         gimp_container_tree_view_scroll_timeout,
+                         tree_view);
+    }
+  else if (tree_view->priv->scroll_timeout_id)
+    {
+      g_source_remove (tree_view->priv->scroll_timeout_id);
+      tree_view->priv->scroll_timeout_id = 0;
+    }
+
+  if (gimp_container_tree_view_drop_status (tree_view,
+                                            context, x, y, time,
+                                            &drop_path, NULL, NULL, NULL, NULL,
+                                            &drop_pos))
+    {
+      gtk_tree_view_set_drag_dest_row (tree_view->view, drop_path, drop_pos);
+      gtk_tree_path_free (drop_path);
+    }
+  else
+    {
+      gtk_tree_view_set_drag_dest_row (tree_view->view, NULL, 0);
+    }
+
+  /*  always return TRUE so drag_leave() is called  */
+  return TRUE;
+}
+
+gboolean
+gimp_container_tree_view_drag_drop (GtkWidget             *widget,
+                                    GdkDragContext        *context,
+                                    gint                   x,
+                                    gint                   y,
+                                    guint                  time,
+                                    GimpContainerTreeView *tree_view)
+{
+  GimpDndType              src_type;
+  GimpViewable            *src_viewable;
+  GimpViewable            *dest_viewable;
+  GdkAtom                  target;
+  GtkTreeViewDropPosition  drop_pos;
+
+  if (tree_view->priv->scroll_timeout_id)
+    {
+      g_source_remove (tree_view->priv->scroll_timeout_id);
+      tree_view->priv->scroll_timeout_id = 0;
+    }
+
+  if (gimp_container_tree_view_drop_status (tree_view,
+                                            context, x, y, time,
+                                            NULL, &target, &src_type,
+                                            &src_viewable,
+                                            &dest_viewable, &drop_pos))
+    {
+      GimpContainerTreeViewClass *tree_view_class;
+
+      tree_view_class = GIMP_CONTAINER_TREE_VIEW_GET_CLASS (tree_view);
+
+      if (src_viewable)
+        {
+          gboolean success = TRUE;
+
+          /* XXX: Make GimpContainerTreeViewClass::drop_viewable()
+           * return success?
+           */
+          tree_view_class->drop_viewable (tree_view, src_viewable,
+                                          dest_viewable, drop_pos);
+
+          gtk_drag_finish (context, success, FALSE, time);
+        }
+      else
+        {
+          gtk_drag_get_data (widget, context, target, time);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_container_tree_view_drag_data_received (GtkWidget             *widget,
+                                             GdkDragContext        *context,
+                                             gint                   x,
+                                             gint                   y,
+                                             GtkSelectionData      *selection_data,
+                                             guint                  info,
+                                             guint                  time,
+                                             GimpContainerTreeView *tree_view)
+{
+  GimpViewable            *dest_viewable;
+  GtkTreeViewDropPosition  drop_pos;
+  gboolean                 success = FALSE;
+
+  if (gimp_container_tree_view_drop_status (tree_view,
+                                            context, x, y, time,
+                                            NULL, NULL, NULL, NULL,
+                                            &dest_viewable, &drop_pos))
+    {
+      GimpContainerTreeViewClass *tree_view_class;
+
+      tree_view_class = GIMP_CONTAINER_TREE_VIEW_GET_CLASS (tree_view);
+
+      switch (info)
+        {
+        case GIMP_DND_TYPE_URI_LIST:
+        case GIMP_DND_TYPE_TEXT_PLAIN:
+        case GIMP_DND_TYPE_NETSCAPE_URL:
+          if (tree_view_class->drop_uri_list)
+            {
+              GList *uri_list;
+
+              uri_list = gimp_selection_data_get_uri_list (selection_data);
+
+              if (uri_list)
+                {
+                  tree_view_class->drop_uri_list (tree_view, uri_list,
+                                                  dest_viewable, drop_pos);
+
+                  g_list_free_full (uri_list, (GDestroyNotify) g_free);
+
+                  success = TRUE;
+                }
+            }
+          break;
+
+        case GIMP_DND_TYPE_COLOR:
+          if (tree_view_class->drop_color)
+            {
+              GimpRGB color;
+
+              if (gimp_selection_data_get_color (selection_data, &color))
+                {
+                  tree_view_class->drop_color (tree_view, &color,
+                                               dest_viewable, drop_pos);
+
+                  success = TRUE;
+                }
+            }
+          break;
+
+        case GIMP_DND_TYPE_SVG:
+        case GIMP_DND_TYPE_SVG_XML:
+          if (tree_view_class->drop_svg)
+            {
+              const guchar *stream;
+              gsize         stream_length;
+
+              stream = gimp_selection_data_get_stream (selection_data,
+                                                       &stream_length);
+
+              if (stream)
+                {
+                  tree_view_class->drop_svg (tree_view,
+                                             (const gchar *) stream,
+                                             stream_length,
+                                             dest_viewable, drop_pos);
+
+                  success = TRUE;
+                }
+            }
+          break;
+
+        case GIMP_DND_TYPE_COMPONENT:
+          if (tree_view_class->drop_component)
+            {
+              GimpImage       *image = NULL;
+              GimpChannelType  component;
+
+              if (tree_view->dnd_gimp)
+                image = gimp_selection_data_get_component (selection_data,
+                                                           tree_view->dnd_gimp,
+                                                           &component);
+
+              if (image)
+                {
+                  tree_view_class->drop_component (tree_view,
+                                                   image, component,
+                                                   dest_viewable, drop_pos);
+
+                  success = TRUE;
+                }
+            }
+          break;
+
+        case GIMP_DND_TYPE_PIXBUF:
+          if (tree_view_class->drop_pixbuf)
+            {
+              GdkPixbuf *pixbuf;
+
+              pixbuf = gtk_selection_data_get_pixbuf (selection_data);
+
+              if (pixbuf)
+                {
+                  tree_view_class->drop_pixbuf (tree_view,
+                                                pixbuf,
+                                                dest_viewable, drop_pos);
+                  g_object_unref (pixbuf);
+
+                  success = TRUE;
+                }
+            }
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  gtk_drag_finish (context, success, FALSE, time);
+}
+
+gboolean
+gimp_container_tree_view_real_drop_possible (GimpContainerTreeView   *tree_view,
+                                             GimpDndType              src_type,
+                                             GimpViewable            *src_viewable,
+                                             GimpViewable            *dest_viewable,
+                                             GtkTreePath             *drop_path,
+                                             GtkTreeViewDropPosition  drop_pos,
+                                             GtkTreeViewDropPosition *return_drop_pos,
+                                             GdkDragAction           *return_drag_action)
+{
+  GimpContainerView *view           = GIMP_CONTAINER_VIEW (tree_view);
+  GimpContainer     *container      = gimp_container_view_get_container (view);
+  GimpContainer     *src_container  = NULL;
+  GimpContainer     *dest_container = NULL;
+  gint               src_index      = -1;
+  gint               dest_index     = -1;
+
+  if (src_viewable)
+    {
+      GimpViewable *parent = gimp_viewable_get_parent (src_viewable);
+
+      if (parent)
+        src_container = gimp_viewable_get_children (parent);
+      else if (gimp_container_have (container, GIMP_OBJECT (src_viewable)))
+        src_container = container;
+
+      if (src_container)
+        src_index = gimp_container_get_child_index (src_container,
+                                                    GIMP_OBJECT (src_viewable));
+    }
+
+  if (dest_viewable)
+    {
+      GimpViewable *parent;
+
+      /*  dropping on the lower third of a group item drops into that group  */
+      if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER &&
+          gimp_viewable_get_children (dest_viewable))
+        {
+          parent = dest_viewable;
+        }
+      else
+        {
+          parent = gimp_viewable_get_parent (dest_viewable);
+        }
+
+      if (parent)
+        dest_container = gimp_viewable_get_children (parent);
+      else if (gimp_container_have (container, GIMP_OBJECT (dest_viewable)))
+        dest_container = container;
+
+      if (parent == dest_viewable)
+        dest_index = 0;
+      else
+        dest_index = gimp_container_get_child_index (dest_container,
+                                                     GIMP_OBJECT (dest_viewable));
+    }
+
+  if (src_viewable && g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable),
+                                   gimp_container_get_children_type (container)))
+    {
+      if (src_viewable == dest_viewable)
+        return FALSE;
+
+      if (src_index == -1 || dest_index == -1)
+        return FALSE;
+
+      /*  don't allow dropping a parent node onto one of its descendants
+       */
+      if (gimp_viewable_is_ancestor (src_viewable, dest_viewable))
+        return FALSE;
+    }
+
+  if (src_container == dest_container)
+    {
+      if (drop_pos == GTK_TREE_VIEW_DROP_BEFORE)
+        {
+          if (dest_index == (src_index + 1))
+            return FALSE;
+        }
+      else if (drop_pos == GTK_TREE_VIEW_DROP_AFTER)
+        {
+          if (dest_index == (src_index - 1))
+            return FALSE;
+        }
+    }
+
+  if (return_drop_pos)
+    *return_drop_pos = drop_pos;
+
+  if (return_drag_action)
+    {
+      if (src_viewable && g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable),
+                                       gimp_container_get_children_type (container)))
+        *return_drag_action = GDK_ACTION_MOVE;
+      else
+        *return_drag_action = GDK_ACTION_COPY;
+    }
+
+  return TRUE;
+}
+
+void
+gimp_container_tree_view_real_drop_viewable (GimpContainerTreeView   *tree_view,
+                                             GimpViewable            *src_viewable,
+                                             GimpViewable            *dest_viewable,
+                                             GtkTreeViewDropPosition  drop_pos)
+{
+  GimpContainerView *view       = GIMP_CONTAINER_VIEW (tree_view);
+  GimpContainer     *src_container;
+  GimpContainer     *dest_container;
+  gint               dest_index = 0;
+
+  if (gimp_viewable_get_parent (src_viewable))
+    {
+      src_container = gimp_viewable_get_children (
+        gimp_viewable_get_parent (src_viewable));
+    }
+  else
+    {
+      src_container = gimp_container_view_get_container (view);
+    }
+
+  if ((drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER   ||
+       drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) &&
+      gimp_viewable_get_children (dest_viewable))
+    {
+      dest_container = gimp_viewable_get_children (dest_viewable);
+      dest_viewable  = NULL;
+      drop_pos       = GTK_TREE_VIEW_DROP_BEFORE;
+    }
+  else if (gimp_viewable_get_parent (dest_viewable))
+    {
+      dest_container = gimp_viewable_get_children (
+        gimp_viewable_get_parent (dest_viewable));
+    }
+  else
+    {
+      dest_container = gimp_container_view_get_container (view);
+    }
+
+  if (dest_viewable)
+    {
+      dest_index = gimp_container_get_child_index (dest_container,
+                                                   GIMP_OBJECT (dest_viewable));
+    }
+
+  if (src_container == dest_container)
+    {
+      gint src_index;
+
+      src_index  = gimp_container_get_child_index (src_container,
+                                                   GIMP_OBJECT (src_viewable));
+
+      switch (drop_pos)
+        {
+        case GTK_TREE_VIEW_DROP_AFTER:
+        case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
+          if (src_index > dest_index)
+            dest_index++;
+          break;
+
+        case GTK_TREE_VIEW_DROP_BEFORE:
+        case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
+          if (src_index < dest_index)
+            dest_index--;
+          break;
+        }
+
+      gimp_container_reorder (src_container,
+                              GIMP_OBJECT (src_viewable), dest_index);
+    }
+  else
+    {
+      switch (drop_pos)
+        {
+        case GTK_TREE_VIEW_DROP_AFTER:
+        case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
+          dest_index++;
+          break;
+
+        case GTK_TREE_VIEW_DROP_BEFORE:
+        case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
+          break;
+        }
+
+      g_object_ref (src_viewable);
+
+      gimp_container_remove (src_container,  GIMP_OBJECT (src_viewable));
+      gimp_container_insert (dest_container, GIMP_OBJECT (src_viewable),
+                             dest_index);
+
+      g_object_unref (src_viewable);
+    }
+}
diff --git a/app/widgets/gimpcontainertreeview-dnd.h b/app/widgets/gimpcontainertreeview-dnd.h
new file mode 100644
index 0000000..1345892
--- /dev/null
+++ b/app/widgets/gimpcontainertreeview-dnd.h
@@ -0,0 +1,71 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreeview-dnd.h
+ * Copyright (C) 2003-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_TREE_VIEW_DND_H__
+#define __GIMP_CONTAINER_TREE_VIEW_DND_H__
+
+
+void     gimp_container_tree_view_drag_failed (GtkWidget             *widget,
+                                               GdkDragContext        *context,
+                                               GtkDragResult          result,
+                                               GimpContainerTreeView *tree_view);
+void     gimp_container_tree_view_drag_leave  (GtkWidget             *widget,
+                                               GdkDragContext        *context,
+                                               guint                  time,
+                                               GimpContainerTreeView *view);
+gboolean gimp_container_tree_view_drag_motion (GtkWidget             *widget,
+                                               GdkDragContext        *context,
+                                               gint                   x,
+                                               gint                   y,
+                                               guint                  time,
+                                               GimpContainerTreeView *view);
+gboolean gimp_container_tree_view_drag_drop   (GtkWidget             *widget,
+                                               GdkDragContext        *context,
+                                               gint                   x,
+                                               gint                   y,
+                                               guint                  time,
+                                               GimpContainerTreeView *view);
+void     gimp_container_tree_view_drag_data_received
+                                              (GtkWidget             *widget,
+                                               GdkDragContext        *context,
+                                               gint                   x,
+                                               gint                   y,
+                                               GtkSelectionData      *selection_data,
+                                               guint                  info,
+                                               guint                  time,
+                                               GimpContainerTreeView *view);
+
+gboolean
+gimp_container_tree_view_real_drop_possible (GimpContainerTreeView   *tree_view,
+                                             GimpDndType              src_type,
+                                             GimpViewable            *src_viewable,
+                                             GimpViewable            *dest_viewable,
+                                             GtkTreePath             *drop_path,
+                                             GtkTreeViewDropPosition  drop_pos,
+                                             GtkTreeViewDropPosition *return_drop_pos,
+                                             GdkDragAction           *return_drag_action);
+void
+gimp_container_tree_view_real_drop_viewable (GimpContainerTreeView   *tree_view,
+                                             GimpViewable            *src_viewable,
+                                             GimpViewable            *dest_viewable,
+                                             GtkTreeViewDropPosition  drop_pos);
+
+
+#endif  /*  __GIMP_CONTAINER_TREE_VIEW_DND_H__  */
diff --git a/app/widgets/gimpcontainertreeview-private.h b/app/widgets/gimpcontainertreeview-private.h
new file mode 100644
index 0000000..66c21f4
--- /dev/null
+++ b/app/widgets/gimpcontainertreeview-private.h
@@ -0,0 +1,46 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreeview-private.h
+ * Copyright (C) 2003-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_TREE_VIEW_PRIVATE_H__
+#define __GIMP_CONTAINER_TREE_VIEW_PRIVATE_H__
+
+
+struct _GimpContainerTreeViewPrivate
+{
+  GtkTreeSelection   *selection;
+
+  GtkCellRenderer    *name_cell;
+
+  GList              *editable_cells;
+
+  GimpViewRenderer   *dnd_renderer;
+
+  GList              *toggle_cells;
+  GList              *renderer_cells;
+
+  guint               scroll_timeout_id;
+  guint               scroll_timeout_interval;
+  GdkScrollDirection  scroll_dir;
+
+  gboolean            dnd_drop_to_empty;
+};
+
+
+#endif  /*  __GIMP_CONTAINER_TREE_VIEW_PRIVATE_H__  */
diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c
new file mode 100644
index 0000000..f496a7e
--- /dev/null
+++ b/app/widgets/gimpcontainertreeview.c
@@ -0,0 +1,1709 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreeview.c
+ * Copyright (C) 2003-2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcellrendererbutton.h"
+#include "gimpcellrendererviewable.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainertreeview-dnd.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainertreeview-private.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+
+enum
+{
+  EDIT_NAME,
+  LAST_SIGNAL
+};
+
+
+static void          gimp_container_tree_view_view_iface_init   (GimpContainerViewInterface  *iface);
+
+static void          gimp_container_tree_view_constructed       (GObject                     *object);
+static void          gimp_container_tree_view_finalize          (GObject                     *object);
+
+static void          gimp_container_tree_view_style_set         (GtkWidget                   *widget,
+                                                                 GtkStyle                    *prev_style);
+static void          gimp_container_tree_view_unmap             (GtkWidget                   *widget);
+static gboolean      gimp_container_tree_view_popup_menu        (GtkWidget                   *widget);
+
+static void          gimp_container_tree_view_set_container     (GimpContainerView           *view,
+                                                                 GimpContainer               *container);
+static void          gimp_container_tree_view_set_context       (GimpContainerView           *view,
+                                                                 GimpContext                 *context);
+static void          gimp_container_tree_view_set_selection_mode(GimpContainerView           *view,
+                                                                 GtkSelectionMode             mode);
+
+static gpointer      gimp_container_tree_view_insert_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     parent_insert_data,
+                                                                 gint                         index);
+static void          gimp_container_tree_view_remove_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_tree_view_reorder_item      (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gint                         new_index,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_tree_view_rename_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_tree_view_expand_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static gboolean      gimp_container_tree_view_select_item       (GimpContainerView           *view,
+                                                                 GimpViewable                *viewable,
+                                                                 gpointer                     insert_data);
+static void          gimp_container_tree_view_clear_items       (GimpContainerView           *view);
+static void          gimp_container_tree_view_set_view_size     (GimpContainerView           *view);
+
+static void          gimp_container_tree_view_real_edit_name    (GimpContainerTreeView       *tree_view);
+
+static gboolean      gimp_container_tree_view_edit_focus_out    (GtkWidget                   *widget,
+                                                                 GdkEvent                    *event,
+                                                                 gpointer                     user_data);
+static void          gimp_container_tree_view_name_started      (GtkCellRendererText         *cell,
+                                                                 GtkCellEditable             *editable,
+                                                                 const gchar                 *path_str,
+                                                                 GimpContainerTreeView       *tree_view);
+static void          gimp_container_tree_view_name_canceled     (GtkCellRendererText         *cell,
+                                                                 GimpContainerTreeView       *tree_view);
+
+static void          gimp_container_tree_view_cursor_changed    (GtkTreeView                 *view,
+                                                                 GimpContainerTreeView       *tree_view);
+static void          gimp_container_tree_view_selection_changed (GtkTreeSelection            *sel,
+                                                                 GimpContainerTreeView       *tree_view);
+static gboolean      gimp_container_tree_view_button_press      (GtkWidget                   *widget,
+                                                                 GdkEventButton              *bevent,
+                                                                 GimpContainerTreeView       *tree_view);
+static gboolean      gimp_container_tree_view_tooltip           (GtkWidget                   *widget,
+                                                                 gint                         x,
+                                                                 gint                         y,
+                                                                 gboolean                     keyboard_tip,
+                                                                 GtkTooltip                  *tooltip,
+                                                                 GimpContainerTreeView       *tree_view);
+static GimpViewable *gimp_container_tree_view_drag_viewable     (GtkWidget                   *widget,
+                                                                 GimpContext                **context,
+                                                                 gpointer                     data);
+static GdkPixbuf    *gimp_container_tree_view_drag_pixbuf       (GtkWidget                   *widget,
+                                                                 gpointer                     data);
+
+static gboolean      gimp_container_tree_view_get_selected_single (GimpContainerTreeView  *tree_view,
+                                                                   GtkTreeIter            *iter);
+static gint          gimp_container_tree_view_get_selected        (GimpContainerView    *view,
+                                                                   GList               **items);
+static void          gimp_container_tree_view_row_expanded        (GtkTreeView               *tree_view,
+                                                                   GtkTreeIter               *iter,
+                                                                   GtkTreePath               *path,
+                                                                   GimpContainerTreeView     *view);
+static void          gimp_container_tree_view_expand_rows         (GtkTreeModel             *model,
+                                                                   GtkTreeView              *view,
+                                                                   GtkTreeIter              *parent);
+
+static void          gimp_container_tree_view_monitor_changed     (GimpContainerTreeView    *view);
+
+static void          gimp_container_tree_view_process_updates     (GimpContainerTreeView    *tree_view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpContainerTreeView, gimp_container_tree_view,
+                         GIMP_TYPE_CONTAINER_BOX,
+                         G_ADD_PRIVATE (GimpContainerTreeView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_container_tree_view_view_iface_init))
+
+#define parent_class gimp_container_tree_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+static guint tree_view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_container_tree_view_class_init (GimpContainerTreeViewClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkBindingSet  *binding_set;
+
+  object_class->constructed = gimp_container_tree_view_constructed;
+  object_class->finalize    = gimp_container_tree_view_finalize;
+
+  widget_class->style_set   = gimp_container_tree_view_style_set;
+  widget_class->unmap       = gimp_container_tree_view_unmap;
+  widget_class->popup_menu  = gimp_container_tree_view_popup_menu;
+
+  klass->edit_name          = gimp_container_tree_view_real_edit_name;
+  klass->drop_possible      = gimp_container_tree_view_real_drop_possible;
+  klass->drop_viewable      = gimp_container_tree_view_real_drop_viewable;
+  klass->drop_color         = NULL;
+  klass->drop_uri_list      = NULL;
+  klass->drop_svg           = NULL;
+  klass->drop_component     = NULL;
+  klass->drop_pixbuf        = NULL;
+
+  tree_view_signals[EDIT_NAME] =
+    g_signal_new ("edit-name",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpContainerTreeViewClass, edit_name),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  binding_set = gtk_binding_set_by_class (klass);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_F2, 0,
+                                "edit-name", 0);
+}
+
+static void
+gimp_container_tree_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_view_iface)
+    parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
+
+  iface->set_container      = gimp_container_tree_view_set_container;
+  iface->set_context        = gimp_container_tree_view_set_context;
+  iface->set_selection_mode = gimp_container_tree_view_set_selection_mode;
+  iface->insert_item        = gimp_container_tree_view_insert_item;
+  iface->remove_item        = gimp_container_tree_view_remove_item;
+  iface->reorder_item       = gimp_container_tree_view_reorder_item;
+  iface->rename_item        = gimp_container_tree_view_rename_item;
+  iface->expand_item        = gimp_container_tree_view_expand_item;
+  iface->select_item        = gimp_container_tree_view_select_item;
+  iface->clear_items        = gimp_container_tree_view_clear_items;
+  iface->set_view_size      = gimp_container_tree_view_set_view_size;
+  iface->get_selected       = gimp_container_tree_view_get_selected;
+
+  iface->insert_data_free = (GDestroyNotify) gtk_tree_iter_free;
+}
+
+static void
+gimp_container_tree_view_init (GimpContainerTreeView *tree_view)
+{
+  GimpContainerBox *box = GIMP_CONTAINER_BOX (tree_view);
+
+  tree_view->priv = gimp_container_tree_view_get_instance_private (tree_view);
+
+  gimp_container_tree_store_columns_init (tree_view->model_columns,
+                                          &tree_view->n_model_columns);
+
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box->scrolled_win),
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+  gimp_widget_track_monitor (GTK_WIDGET (tree_view),
+                             G_CALLBACK (gimp_container_tree_view_monitor_changed),
+                             NULL);
+}
+
+static void
+gimp_container_tree_view_constructed (GObject *object)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (object);
+  GimpContainerView     *view      = GIMP_CONTAINER_VIEW (object);
+  GimpContainerBox      *box       = GIMP_CONTAINER_BOX (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  tree_view->model = gimp_container_tree_store_new (view,
+                                                    tree_view->n_model_columns,
+                                                    tree_view->model_columns);
+
+  tree_view->view = g_object_new (GTK_TYPE_TREE_VIEW,
+                                  "model",           tree_view->model,
+                                  "search-column",   GIMP_CONTAINER_TREE_STORE_COLUMN_NAME,
+                                  "enable-search",   FALSE,
+                                  "headers-visible", FALSE,
+                                  "has-tooltip",     TRUE,
+                                  "show-expanders",  GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->model_is_tree,
+                                  NULL);
+
+  gtk_container_add (GTK_CONTAINER (box->scrolled_win),
+                     GTK_WIDGET (tree_view->view));
+  gtk_widget_show (GTK_WIDGET (tree_view->view));
+
+  gimp_container_view_set_dnd_widget (view, GTK_WIDGET (tree_view->view));
+
+  g_signal_connect (tree_view->view, "cursor-changed",
+                    G_CALLBACK (gimp_container_tree_view_cursor_changed),
+                    tree_view);
+
+  tree_view->main_column = gtk_tree_view_column_new ();
+  gtk_tree_view_insert_column (tree_view->view, tree_view->main_column, 0);
+
+  gtk_tree_view_set_expander_column (tree_view->view, tree_view->main_column);
+  gtk_tree_view_set_enable_tree_lines (tree_view->view, TRUE);
+
+  tree_view->renderer_cell = gimp_cell_renderer_viewable_new ();
+  gtk_tree_view_column_pack_start (tree_view->main_column,
+                                   tree_view->renderer_cell,
+                                   FALSE);
+
+  gtk_tree_view_column_set_attributes (tree_view->main_column,
+                                       tree_view->renderer_cell,
+                                       "renderer", GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
+                                       NULL);
+
+  tree_view->priv->name_cell = gtk_cell_renderer_text_new ();
+  g_object_set (tree_view->priv->name_cell, "xalign", 0.0, NULL);
+  gtk_tree_view_column_pack_end (tree_view->main_column,
+                                 tree_view->priv->name_cell,
+                                 FALSE);
+
+  gtk_tree_view_column_set_attributes (tree_view->main_column,
+                                       tree_view->priv->name_cell,
+                                       "text",       GIMP_CONTAINER_TREE_STORE_COLUMN_NAME,
+                                       "attributes", GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_ATTRIBUTES,
+                                       "sensitive",  GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_SENSITIVE,
+                                       NULL);
+
+  g_signal_connect (tree_view->priv->name_cell, "editing-started",
+                    G_CALLBACK (gimp_container_tree_view_name_started),
+                    tree_view);
+  g_signal_connect (tree_view->priv->name_cell, "editing-canceled",
+                    G_CALLBACK (gimp_container_tree_view_name_canceled),
+                    tree_view);
+
+  gimp_container_tree_view_add_renderer_cell (tree_view,
+                                              tree_view->renderer_cell);
+
+  tree_view->priv->selection = gtk_tree_view_get_selection (tree_view->view);
+
+  g_signal_connect (tree_view->priv->selection, "changed",
+                    G_CALLBACK (gimp_container_tree_view_selection_changed),
+                    tree_view);
+
+  g_signal_connect (tree_view->view, "drag-failed",
+                    G_CALLBACK (gimp_container_tree_view_drag_failed),
+                    tree_view);
+  g_signal_connect (tree_view->view, "drag-leave",
+                    G_CALLBACK (gimp_container_tree_view_drag_leave),
+                    tree_view);
+  g_signal_connect (tree_view->view, "drag-motion",
+                    G_CALLBACK (gimp_container_tree_view_drag_motion),
+                    tree_view);
+  g_signal_connect (tree_view->view, "drag-drop",
+                    G_CALLBACK (gimp_container_tree_view_drag_drop),
+                    tree_view);
+  g_signal_connect (tree_view->view, "drag-data-received",
+                    G_CALLBACK (gimp_container_tree_view_drag_data_received),
+                    tree_view);
+
+  /* connect_after so external code can connect to "query-tooltip" too
+   * and override the default tip
+   */
+  g_signal_connect_after (tree_view->view, "query-tooltip",
+                          G_CALLBACK (gimp_container_tree_view_tooltip),
+                          tree_view);
+}
+
+static void
+gimp_container_tree_view_finalize (GObject *object)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (object);
+
+  g_clear_object (&tree_view->model);
+
+  if (tree_view->priv->toggle_cells)
+    {
+      g_list_free (tree_view->priv->toggle_cells);
+      tree_view->priv->toggle_cells = NULL;
+    }
+
+  if (tree_view->priv->renderer_cells)
+    {
+      g_list_free (tree_view->priv->renderer_cells);
+      tree_view->priv->renderer_cells = NULL;
+    }
+
+  if (tree_view->priv->editable_cells)
+    {
+      g_list_free (tree_view->priv->editable_cells);
+      tree_view->priv->editable_cells = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gimp_container_tree_view_style_set_foreach (GtkTreeModel *model,
+                                            GtkTreePath  *path,
+                                            GtkTreeIter  *iter,
+                                            gpointer      data)
+{
+  GimpViewRenderer *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      gimp_view_renderer_invalidate (renderer);
+      g_object_unref (renderer);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_container_tree_view_style_set (GtkWidget *widget,
+                                    GtkStyle  *prev_style)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  if (tree_view->model)
+    gtk_tree_model_foreach (tree_view->model,
+                            gimp_container_tree_view_style_set_foreach,
+                            NULL);
+}
+
+static void
+gimp_container_tree_view_unmap (GtkWidget *widget)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (widget);
+
+  if (tree_view->priv->scroll_timeout_id)
+    {
+      g_source_remove (tree_view->priv->scroll_timeout_id);
+      tree_view->priv->scroll_timeout_id = 0;
+    }
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_container_tree_view_menu_position (GtkMenu  *menu,
+                                        gint     *x,
+                                        gint     *y,
+                                        gpointer  data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (data);
+  GtkWidget             *widget    = GTK_WIDGET (tree_view->view);
+  GtkAllocation          allocation;
+  GtkTreeIter            selected_iter;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+
+  if (! gtk_widget_get_has_window (widget))
+    {
+      *x += allocation.x;
+      *y += allocation.y;
+    }
+
+  if (gimp_container_tree_view_get_selected_single (tree_view, &selected_iter))
+    {
+      GtkTreePath  *path;
+      GdkRectangle  cell_rect;
+      gint          center;
+
+      path = gtk_tree_model_get_path (tree_view->model, &selected_iter);
+      gtk_tree_view_get_cell_area (tree_view->view, path,
+                                   tree_view->main_column, &cell_rect);
+      gtk_tree_path_free (path);
+
+      center = cell_rect.y + cell_rect.height / 2;
+      center = CLAMP (center, 0, allocation.height);
+
+      *x += allocation.width / 2;
+      *y += center;
+    }
+  else
+    {
+      GtkStyle *style = gtk_widget_get_style (widget);
+
+      *x += style->xthickness;
+      *y += style->ythickness;
+    }
+
+  gimp_menu_position (menu, x, y);
+}
+
+static gboolean
+gimp_container_tree_view_popup_menu (GtkWidget *widget)
+{
+  return gimp_editor_popup_menu (GIMP_EDITOR (widget),
+                                 gimp_container_tree_view_menu_position,
+                                 widget);
+}
+
+GtkWidget *
+gimp_container_tree_view_new (GimpContainer *container,
+                              GimpContext   *context,
+                              gint           view_size,
+                              gint           view_border_width)
+{
+  GimpContainerTreeView *tree_view;
+  GimpContainerView     *view;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+
+  tree_view = g_object_new (GIMP_TYPE_CONTAINER_TREE_VIEW, NULL);
+
+  view = GIMP_CONTAINER_VIEW (tree_view);
+
+  gimp_container_view_set_view_size (view, view_size, view_border_width);
+
+  if (container)
+    gimp_container_view_set_container (view, container);
+
+  if (context)
+    gimp_container_view_set_context (view, context);
+
+  return GTK_WIDGET (tree_view);
+}
+
+GtkCellRenderer *
+gimp_container_tree_view_get_name_cell (GimpContainerTreeView *tree_view)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view), NULL);
+
+  return tree_view->priv->name_cell;
+}
+
+void
+gimp_container_tree_view_set_main_column_title (GimpContainerTreeView *tree_view,
+                                                const gchar           *title)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view));
+
+  gtk_tree_view_column_set_title (tree_view->main_column,
+                                  title);
+}
+
+void
+gimp_container_tree_view_add_toggle_cell (GimpContainerTreeView *tree_view,
+                                          GtkCellRenderer       *cell)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view));
+  g_return_if_fail (GIMP_IS_CELL_RENDERER_TOGGLE (cell) ||
+                    GIMP_IS_CELL_RENDERER_BUTTON (cell));
+
+  tree_view->priv->toggle_cells = g_list_prepend (tree_view->priv->toggle_cells,
+                                                  cell);
+}
+
+void
+gimp_container_tree_view_add_renderer_cell (GimpContainerTreeView *tree_view,
+                                            GtkCellRenderer       *cell)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view));
+  g_return_if_fail (GIMP_IS_CELL_RENDERER_VIEWABLE (cell));
+
+  tree_view->priv->renderer_cells = g_list_prepend (tree_view->priv->renderer_cells,
+                                                    cell);
+
+  gimp_container_tree_store_add_renderer_cell (GIMP_CONTAINER_TREE_STORE (tree_view->model),
+                                               cell);
+}
+
+void
+gimp_container_tree_view_set_dnd_drop_to_empty (GimpContainerTreeView *tree_view,
+                                                gboolean               dnd_drop_to_empty)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view));
+
+  tree_view->priv->dnd_drop_to_empty = dnd_drop_to_empty;
+}
+
+void
+gimp_container_tree_view_connect_name_edited (GimpContainerTreeView *tree_view,
+                                              GCallback              callback,
+                                              gpointer               data)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view));
+  g_return_if_fail (callback != NULL);
+
+  g_object_set (tree_view->priv->name_cell,
+                "mode",     GTK_CELL_RENDERER_MODE_EDITABLE,
+                "editable", TRUE,
+                NULL);
+
+  if (! g_list_find (tree_view->priv->editable_cells, tree_view->priv->name_cell))
+    tree_view->priv->editable_cells = g_list_prepend (tree_view->priv->editable_cells,
+                                                      tree_view->priv->name_cell);
+
+  g_signal_connect (tree_view->priv->name_cell, "edited",
+                    callback,
+                    data);
+}
+
+gboolean
+gimp_container_tree_view_name_edited (GtkCellRendererText   *cell,
+                                      const gchar           *path_str,
+                                      const gchar           *new_name,
+                                      GimpContainerTreeView *tree_view)
+{
+  GtkTreePath *path;
+  GtkTreeIter  iter;
+  gboolean     changed = FALSE;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpObject       *object;
+      const gchar      *old_name;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      object = GIMP_OBJECT (renderer->viewable);
+
+      old_name = gimp_object_get_name (object);
+
+      if (! old_name) old_name = "";
+      if (! new_name) new_name = "";
+
+      if (strcmp (old_name, new_name))
+        {
+          gimp_object_set_name (object, new_name);
+
+          changed = TRUE;
+        }
+      else
+        {
+          gchar *name = gimp_viewable_get_description (renderer->viewable,
+                                                       NULL);
+
+          gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, name,
+                              -1);
+          g_free (name);
+        }
+
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+
+  return changed;
+}
+
+
+/*  GimpContainerView methods  */
+
+static void
+gimp_container_tree_view_set_container (GimpContainerView *view,
+                                        GimpContainer     *container)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GimpContainer         *old_container;
+
+  old_container = gimp_container_view_get_container (view);
+
+  if (old_container)
+    {
+      tree_view->priv->dnd_renderer = NULL;
+
+      g_signal_handlers_disconnect_by_func (tree_view->view,
+                                            gimp_container_tree_view_row_expanded,
+                                            tree_view);
+      if (! container)
+        {
+          if (gimp_dnd_viewable_source_remove (GTK_WIDGET (tree_view->view),
+                                               gimp_container_get_children_type (old_container)))
+            {
+              if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (old_container)))->get_size)
+                gimp_dnd_pixbuf_source_remove (GTK_WIDGET (tree_view->view));
+
+              gtk_drag_source_unset (GTK_WIDGET (tree_view->view));
+            }
+
+          g_signal_handlers_disconnect_by_func (tree_view->view,
+                                                gimp_container_tree_view_button_press,
+                                                tree_view);
+        }
+    }
+  else if (container)
+    {
+      if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (tree_view->view),
+                                            GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                                            gimp_container_get_children_type (container),
+                                            GDK_ACTION_COPY))
+        {
+          gimp_dnd_viewable_source_add (GTK_WIDGET (tree_view->view),
+                                        gimp_container_get_children_type (container),
+                                        gimp_container_tree_view_drag_viewable,
+                                        tree_view);
+
+          if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (container)))->get_size)
+            gimp_dnd_pixbuf_source_add (GTK_WIDGET (tree_view->view),
+                                        gimp_container_tree_view_drag_pixbuf,
+                                        tree_view);
+        }
+
+      /*  connect button_press_event after DND so we can keep the list from
+       *  selecting the item on button2
+       */
+      g_signal_connect (tree_view->view, "button-press-event",
+                        G_CALLBACK (gimp_container_tree_view_button_press),
+                        tree_view);
+    }
+
+  parent_view_iface->set_container (view, container);
+
+  if (container)
+    {
+      gimp_container_tree_view_expand_rows (tree_view->model,
+                                            tree_view->view,
+                                            NULL);
+
+      g_signal_connect (tree_view->view,
+                        "row-collapsed",
+                        G_CALLBACK (gimp_container_tree_view_row_expanded),
+                        tree_view);
+      g_signal_connect (tree_view->view,
+                        "row-expanded",
+                        G_CALLBACK (gimp_container_tree_view_row_expanded),
+                        tree_view);
+    }
+
+  gtk_tree_view_columns_autosize (tree_view->view);
+}
+
+static void
+gimp_container_tree_view_set_context (GimpContainerView *view,
+                                      GimpContext       *context)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  if (tree_view->model)
+    gimp_container_tree_store_set_context (GIMP_CONTAINER_TREE_STORE (tree_view->model),
+                                           context);
+
+  parent_view_iface->set_context (view, context);
+}
+
+static void
+gimp_container_tree_view_set_selection_mode (GimpContainerView *view,
+                                             GtkSelectionMode   mode)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  gtk_tree_selection_set_mode (tree_view->priv->selection, mode);
+
+  parent_view_iface->set_selection_mode (view, mode);
+}
+
+static gpointer
+gimp_container_tree_view_insert_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           parent_insert_data,
+                                      gint               index)
+{
+  GimpContainerTreeView *tree_view   = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *parent_iter = parent_insert_data;
+  GtkTreeIter           *iter;
+
+  iter = gimp_container_tree_store_insert_item (GIMP_CONTAINER_TREE_STORE (tree_view->model),
+                                                viewable,
+                                                parent_iter,
+                                                index);
+
+  if (parent_iter)
+    gimp_container_tree_view_expand_item (view, viewable, parent_iter);
+
+  return iter;
+}
+
+static void
+gimp_container_tree_view_remove_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter      = (GtkTreeIter *) insert_data;
+
+  gimp_container_tree_store_remove_item (GIMP_CONTAINER_TREE_STORE (tree_view->model),
+                                         viewable,
+                                         iter);
+
+  if (iter)
+    gtk_tree_view_columns_autosize (tree_view->view);
+}
+
+static void
+gimp_container_tree_view_reorder_item (GimpContainerView *view,
+                                       GimpViewable      *viewable,
+                                       gint               new_index,
+                                       gpointer           insert_data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter      = (GtkTreeIter *) insert_data;
+  GtkTreeIter            parent_iter;
+  gboolean               selected  = FALSE;
+
+  if (iter)
+    {
+      GtkTreeIter selected_iter;
+
+      selected = gimp_container_tree_view_get_selected_single (tree_view,
+                                                               &selected_iter);
+
+      if (selected)
+        {
+          GimpViewRenderer *renderer;
+
+          gtk_tree_model_get (tree_view->model, &selected_iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                              -1);
+
+          if (renderer->viewable != viewable)
+            selected = FALSE;
+
+          g_object_unref (renderer);
+        }
+    }
+
+  gimp_container_tree_store_reorder_item (GIMP_CONTAINER_TREE_STORE (tree_view->model),
+                                          viewable,
+                                          new_index,
+                                          iter);
+
+  if (selected)
+    gimp_container_view_select_item (view, viewable);
+
+  if (gtk_tree_model_iter_parent (tree_view->model, &parent_iter, iter))
+    gimp_container_tree_view_expand_item (view, viewable, &parent_iter);
+}
+
+static void
+gimp_container_tree_view_rename_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter      = (GtkTreeIter *) insert_data;
+
+  if (gimp_container_tree_store_rename_item (GIMP_CONTAINER_TREE_STORE (tree_view->model),
+                                             viewable,
+                                             iter))
+    {
+      gtk_tree_view_columns_autosize (tree_view->view);
+    }
+}
+
+static void
+gimp_container_tree_view_expand_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter      = (GtkTreeIter *) insert_data;
+  GimpViewRenderer      *renderer;
+
+  gtk_tree_model_get (tree_view->model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      GtkTreePath *path = gtk_tree_model_get_path (tree_view->model, iter);
+
+      g_signal_handlers_block_by_func (tree_view,
+                                       gimp_container_tree_view_row_expanded,
+                                       view);
+
+      if (gimp_viewable_get_expanded (renderer->viewable))
+        gtk_tree_view_expand_row (tree_view->view, path, FALSE);
+      else
+        gtk_tree_view_collapse_row (tree_view->view, path);
+
+      g_signal_handlers_unblock_by_func (tree_view,
+                                         gimp_container_tree_view_row_expanded,
+                                         view);
+
+      gtk_tree_path_free (path);
+      g_object_unref (renderer);
+    }
+}
+
+static gboolean
+gimp_container_tree_view_select_item (GimpContainerView *view,
+                                      GimpViewable      *viewable,
+                                      gpointer           insert_data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  if (viewable && insert_data)
+    {
+      GtkTreePath *path;
+      GtkTreePath *parent_path;
+      GtkTreeIter *iter = (GtkTreeIter *) insert_data;
+
+      path = gtk_tree_model_get_path (tree_view->model, iter);
+
+      parent_path = gtk_tree_path_copy (path);
+
+      if (gtk_tree_path_up (parent_path))
+        gtk_tree_view_expand_to_path (tree_view->view, parent_path);
+
+      gtk_tree_path_free (parent_path);
+
+      g_signal_handlers_block_by_func (tree_view->priv->selection,
+                                       gimp_container_tree_view_selection_changed,
+                                       tree_view);
+
+      gtk_tree_view_set_cursor (tree_view->view, path, NULL, FALSE);
+
+      g_signal_handlers_unblock_by_func (tree_view->priv->selection,
+                                         gimp_container_tree_view_selection_changed,
+                                         tree_view);
+
+      gtk_tree_view_scroll_to_cell (tree_view->view, path,
+                                    NULL, FALSE, 0.0, 0.0);
+
+      gtk_tree_path_free (path);
+    }
+  else if (insert_data == NULL)
+    {
+      /* viewable == NULL && insert_data != NULL means multiple selection.
+       * viewable == NULL && insert_data == NULL means no selection. */
+      gtk_tree_selection_unselect_all (tree_view->priv->selection);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_container_tree_view_clear_items (GimpContainerView *view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  g_signal_handlers_block_by_func (tree_view->priv->selection,
+                                   gimp_container_tree_view_selection_changed,
+                                   tree_view);
+
+  /* temporarily unset the tree-view's model, so that name editing is stopped
+   * now, before clearing the tree store.  otherwise, name editing would stop
+   * when the corresponding item is removed from the store, leading us to
+   * rename the wrong item.  see issue #3284.
+   */
+  gtk_tree_view_set_model (tree_view->view, NULL);
+
+  gimp_container_tree_store_clear_items (GIMP_CONTAINER_TREE_STORE (tree_view->model));
+
+  gtk_tree_view_set_model (tree_view->view, tree_view->model);
+
+  g_signal_handlers_unblock_by_func (tree_view->priv->selection,
+                                     gimp_container_tree_view_selection_changed,
+                                     tree_view);
+
+  parent_view_iface->clear_items (view);
+}
+
+static void
+gimp_container_tree_view_set_view_size (GimpContainerView *view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkWidget             *tree_widget;
+  GList                 *list;
+  gint                   view_size;
+  gint                   border_width;
+
+  view_size = gimp_container_view_get_view_size (view, &border_width);
+
+  if (tree_view->model)
+    gimp_container_tree_store_set_view_size (GIMP_CONTAINER_TREE_STORE (tree_view->model));
+
+  tree_widget = GTK_WIDGET (tree_view->view);
+
+  if (! tree_widget)
+    return;
+
+  for (list = tree_view->priv->toggle_cells; list; list = g_list_next (list))
+    {
+      gchar       *icon_name;
+      GtkIconSize  icon_size;
+
+      g_object_get (list->data, "icon-name", &icon_name, NULL);
+
+      if (icon_name)
+        {
+          GtkStyle *style = gtk_widget_get_style (tree_widget);
+
+          icon_size = gimp_get_icon_size (tree_widget,
+                                          icon_name,
+                                          GTK_ICON_SIZE_BUTTON,
+                                          view_size -
+                                          2 * style->xthickness,
+                                          view_size -
+                                          2 * style->ythickness);
+
+          g_object_set (list->data, "stock-size", icon_size, NULL);
+
+          g_free (icon_name);
+        }
+    }
+
+  gtk_tree_view_columns_autosize (tree_view->view);
+}
+
+
+/*  GimpContainerTreeView methods  */
+
+static void
+gimp_container_tree_view_real_edit_name (GimpContainerTreeView *tree_view)
+{
+  GtkTreeIter selected_iter;
+  gboolean    success = FALSE;
+
+  if (g_list_find (tree_view->priv->editable_cells,
+                   tree_view->priv->name_cell) &&
+      gimp_container_tree_view_get_selected_single (tree_view,
+                                                    &selected_iter))
+    {
+      GimpViewRenderer *renderer;
+
+      gtk_tree_model_get (tree_view->model, &selected_iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      if (gimp_viewable_is_name_editable (renderer->viewable))
+        {
+          GtkTreePath *path;
+
+          path = gtk_tree_model_get_path (tree_view->model, &selected_iter);
+
+          gtk_tree_view_set_cursor_on_cell (tree_view->view, path,
+                                            tree_view->main_column,
+                                            tree_view->priv->name_cell,
+                                            TRUE);
+
+          gtk_tree_path_free (path);
+
+          success = TRUE;
+        }
+
+      g_object_unref (renderer);
+    }
+
+  if (! success)
+    gtk_widget_error_bell (GTK_WIDGET (tree_view));
+}
+
+
+/*  callbacks  */
+
+static gboolean
+gimp_container_tree_view_edit_focus_out (GtkWidget *widget,
+                                         GdkEvent  *event,
+                                         gpointer   user_data)
+{
+  /*  When focusing out of a tree view, we want its content to be
+   *  updated as though it had been activated.
+   */
+  g_signal_emit_by_name (widget, "activate", 0);
+
+  return TRUE;
+}
+
+static void
+gimp_container_tree_view_name_started (GtkCellRendererText   *cell,
+                                       GtkCellEditable       *editable,
+                                       const gchar           *path_str,
+                                       GimpContainerTreeView *tree_view)
+{
+  GtkTreePath *path;
+  GtkTreeIter  iter;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  g_signal_connect (GTK_ENTRY (editable), "focus-out-event",
+                    G_CALLBACK (gimp_container_tree_view_edit_focus_out),
+                    tree_view);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      const gchar      *real_name;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      real_name = gimp_object_get_name (renderer->viewable);
+
+      g_object_unref (renderer);
+
+      gtk_entry_set_text (GTK_ENTRY (editable), real_name);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_container_tree_view_name_canceled (GtkCellRendererText   *cell,
+                                        GimpContainerTreeView *tree_view)
+{
+  GtkTreeIter iter;
+
+  if (gimp_container_tree_view_get_selected_single (tree_view, &iter))
+    {
+      GimpViewRenderer *renderer;
+      gchar            *name;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      name = gimp_viewable_get_description (renderer->viewable, NULL);
+
+      gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, name,
+                          -1);
+
+      g_free (name);
+      g_object_unref (renderer);
+    }
+}
+
+static void
+gimp_container_tree_view_cursor_changed (GtkTreeView           *view,
+                                         GimpContainerTreeView *tree_view)
+{
+  gimp_container_tree_view_process_updates (tree_view);
+}
+
+static void
+gimp_container_tree_view_selection_changed (GtkTreeSelection      *selection,
+                                            GimpContainerTreeView *tree_view)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (tree_view);
+  GList             *items;
+
+  gimp_container_tree_view_get_selected (view, &items);
+  gimp_container_view_multi_selected (view, items);
+  g_list_free (items);
+
+  if (items)
+    gimp_container_tree_view_process_updates (tree_view);
+}
+
+static GtkCellRenderer *
+gimp_container_tree_view_find_click_cell (GtkWidget         *widget,
+                                          GList             *cells,
+                                          GtkTreeViewColumn *column,
+                                          GdkRectangle      *column_area,
+                                          gint               tree_x,
+                                          gint               tree_y)
+{
+  GList    *list;
+  gboolean  rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+
+  for (list = cells; list; list = g_list_next (list))
+    {
+      GtkCellRenderer *renderer = list->data;
+      gint             start;
+      gint             width;
+
+      if (gtk_cell_renderer_get_visible (renderer) &&
+          gtk_tree_view_column_cell_get_position (column, renderer,
+                                                  &start, &width))
+        {
+          gint xpad, ypad;
+          gint x;
+
+          gtk_cell_renderer_get_padding (renderer, &xpad, &ypad);
+
+          if (rtl)
+            x = column_area->x + column_area->width - start - width;
+          else
+            x = start + column_area->x;
+
+          if (tree_x >= x + xpad &&
+              tree_x <  x + width - xpad)
+            {
+              return renderer;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+static gboolean
+gimp_container_tree_view_button_press (GtkWidget             *widget,
+                                       GdkEventButton        *bevent,
+                                       GimpContainerTreeView *tree_view)
+{
+  GimpContainerView *container_view = GIMP_CONTAINER_VIEW (tree_view);
+  GtkTreeViewColumn *column;
+  GtkTreePath       *path;
+
+  tree_view->priv->dnd_renderer = NULL;
+
+  if (! gtk_widget_has_focus (widget))
+    gtk_widget_grab_focus (widget);
+
+  if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
+                                     bevent->x, bevent->y,
+                                     &path, &column, NULL, NULL))
+    {
+      GimpViewRenderer         *renderer;
+      GtkCellRenderer          *toggled_cell = NULL;
+      GimpCellRendererViewable *clicked_cell = NULL;
+      GtkCellRenderer          *edit_cell    = NULL;
+      GdkRectangle              column_area;
+      GtkTreeIter               iter;
+      gboolean                  handled = TRUE;
+      gboolean                  multisel_mode;
+
+      multisel_mode = (gtk_tree_selection_get_mode (tree_view->priv->selection)
+                       == GTK_SELECTION_MULTIPLE);
+
+      if (! (bevent->state & (gimp_get_extend_selection_mask () |
+                              gimp_get_modify_selection_mask ())))
+        {
+          /*  don't chain up for multi-selection handling if none of
+           *  the participating modifiers is pressed, we implement
+           *  button_press completely ourselves for a reason and don't
+           *  want the default implementation mess up our state
+           */
+          multisel_mode = FALSE;
+        }
+
+      gtk_tree_model_get_iter (tree_view->model, &iter, path);
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      tree_view->priv->dnd_renderer = renderer;
+
+      gtk_tree_view_get_cell_area (tree_view->view, path,
+                                   column, &column_area);
+
+      gtk_tree_view_column_cell_set_cell_data (column,
+                                               tree_view->model,
+                                               &iter,
+                                               FALSE, FALSE);
+
+      if (bevent->button == 1                                     &&
+          gtk_tree_model_iter_has_child (tree_view->model, &iter) &&
+          column == gtk_tree_view_get_expander_column (tree_view->view))
+        {
+          GList *cells;
+
+          cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
+
+          if (! gimp_container_tree_view_find_click_cell (widget,
+                                                          cells,
+                                                          column, &column_area,
+                                                          bevent->x, bevent->y))
+            {
+              /*  we didn't click on any cell, but we clicked on empty
+               *  space in the expander column of a row that has
+               *  children; let GtkTreeView process the button press
+               *  to maybe handle a click on an expander.
+               */
+              g_list_free (cells);
+              gtk_tree_path_free (path);
+              g_object_unref (renderer);
+
+              return FALSE;
+            }
+
+          g_list_free (cells);
+        }
+
+      toggled_cell =
+        gimp_container_tree_view_find_click_cell (widget,
+                                                  tree_view->priv->toggle_cells,
+                                                  column, &column_area,
+                                                  bevent->x, bevent->y);
+
+      if (! toggled_cell)
+        clicked_cell = (GimpCellRendererViewable *)
+          gimp_container_tree_view_find_click_cell (widget,
+                                                    tree_view->priv->renderer_cells,
+                                                    column, &column_area,
+                                                    bevent->x, bevent->y);
+
+      if (! toggled_cell && ! clicked_cell)
+        edit_cell =
+          gimp_container_tree_view_find_click_cell (widget,
+                                                    tree_view->priv->editable_cells,
+                                                    column, &column_area,
+                                                    bevent->x, bevent->y);
+
+      g_object_ref (tree_view);
+
+      if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+        {
+          if (gimp_container_view_item_selected (container_view,
+                                                 renderer->viewable))
+            {
+              if (gimp_container_view_get_container (container_view))
+                gimp_container_view_item_context (container_view,
+                                                  renderer->viewable);
+            }
+        }
+      else if (bevent->button == 1)
+        {
+          if (bevent->type == GDK_BUTTON_PRESS)
+            {
+              /*  don't select item if a toggle was clicked */
+              if (! toggled_cell)
+                {
+                  gchar *path_str = gtk_tree_path_to_string (path);
+
+                  handled = FALSE;
+
+                  if (clicked_cell)
+                    handled =
+                      gimp_cell_renderer_viewable_pre_clicked (clicked_cell,
+                                                               path_str,
+                                                               bevent->state);
+
+                  if (! handled)
+                    {
+                      if (multisel_mode)
+                        {
+                          /* let parent do the work */
+                        }
+                      else
+                        {
+                          handled =
+                            gimp_container_view_item_selected (container_view,
+                                                               renderer->viewable);
+                        }
+                    }
+
+                  g_free (path_str);
+                }
+
+              /*  a callback invoked by selecting the item may have
+               *  destroyed us, so check if the container is still there
+               */
+              if (gimp_container_view_get_container (container_view))
+                {
+                  /*  another row may have been set by selecting  */
+                  gtk_tree_view_column_cell_set_cell_data (column,
+                                                           tree_view->model,
+                                                           &iter,
+                                                           FALSE, FALSE);
+
+                  if (toggled_cell || clicked_cell)
+                    {
+                      gchar *path_str = gtk_tree_path_to_string (path);
+
+                      if (toggled_cell)
+                        {
+                          if (GIMP_IS_CELL_RENDERER_TOGGLE (toggled_cell))
+                            {
+                              gimp_cell_renderer_toggle_clicked (GIMP_CELL_RENDERER_TOGGLE (toggled_cell),
+                                                                 path_str,
+                                                                 bevent->state);
+                            }
+                          else if (GIMP_IS_CELL_RENDERER_BUTTON (toggled_cell))
+                            {
+                              gimp_cell_renderer_button_clicked (GIMP_CELL_RENDERER_BUTTON (toggled_cell),
+                                                                 path_str,
+                                                                 bevent->state);
+                            }
+                        }
+                      else if (clicked_cell)
+                        {
+                          gimp_cell_renderer_viewable_clicked (clicked_cell,
+                                                               path_str,
+                                                               bevent->state);
+                        }
+
+                      g_free (path_str);
+                    }
+                }
+            }
+          else if (bevent->type == GDK_2BUTTON_PRESS)
+            {
+              gboolean success = TRUE;
+
+              /*  don't select item if a toggle was clicked */
+              if (! toggled_cell)
+                success = gimp_container_view_item_selected (container_view,
+                                                             renderer->viewable);
+
+              if (success)
+                {
+                  if (edit_cell)
+                    {
+                      if (gimp_viewable_is_name_editable (renderer->viewable))
+                        {
+                          gtk_tree_view_set_cursor_on_cell (tree_view->view,
+                                                            path,
+                                                            column, edit_cell,
+                                                            TRUE);
+                        }
+                      else
+                        {
+                          gtk_widget_error_bell (widget);
+                        }
+                    }
+                  else if (! toggled_cell &&
+                           ! (bevent->state & gimp_get_all_modifiers_mask ()))
+                    {
+                      /* Only activate if we're not in a toggled cell
+                       * and no modifier keys are pressed
+                       */
+                      gimp_container_view_item_activated (container_view,
+                                                          renderer->viewable);
+                    }
+                }
+            }
+        }
+      else if (bevent->button == 2)
+        {
+          if (bevent->type == GDK_BUTTON_PRESS)
+            {
+              if (clicked_cell)
+                {
+                  gchar *path_str = gtk_tree_path_to_string (path);
+
+                  gimp_cell_renderer_viewable_clicked (clicked_cell,
+                                                       path_str,
+                                                       bevent->state);
+
+                  g_free (path_str);
+                }
+            }
+        }
+
+      g_object_unref (tree_view);
+
+      gtk_tree_path_free (path);
+      g_object_unref (renderer);
+
+      return multisel_mode ? handled : TRUE;
+    }
+  else
+    {
+      if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+        {
+          gimp_editor_popup_menu (GIMP_EDITOR (tree_view), NULL, NULL);
+        }
+
+      return TRUE;
+    }
+}
+
+static gboolean
+gimp_container_tree_view_tooltip (GtkWidget             *widget,
+                                  gint                   x,
+                                  gint                   y,
+                                  gboolean               keyboard_tip,
+                                  GtkTooltip            *tooltip,
+                                  GimpContainerTreeView *tree_view)
+{
+  GimpViewRenderer *renderer;
+  GtkTreeIter       iter;
+  GtkTreePath      *path;
+  gboolean          show_tip = FALSE;
+
+  if (! gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (widget), &x, &y,
+                                           keyboard_tip,
+                                           NULL, &path, &iter))
+    return FALSE;
+
+  gtk_tree_model_get (tree_view->model, &iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      gchar *desc;
+      gchar *tip;
+
+      desc = gimp_viewable_get_description (renderer->viewable, &tip);
+
+      if (tip)
+        {
+          gtk_tooltip_set_text (tooltip, tip);
+          gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (widget), tooltip, path);
+
+          show_tip = TRUE;
+
+          g_free (tip);
+        }
+
+      g_free (desc);
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+
+  return show_tip;
+}
+
+static GimpViewable *
+gimp_container_tree_view_drag_viewable (GtkWidget    *widget,
+                                        GimpContext **context,
+                                        gpointer      data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (data);
+
+  if (context)
+    *context = gimp_container_view_get_context (GIMP_CONTAINER_VIEW (data));
+
+  if (tree_view->priv->dnd_renderer)
+    return tree_view->priv->dnd_renderer->viewable;
+
+  return NULL;
+}
+
+static GdkPixbuf *
+gimp_container_tree_view_drag_pixbuf (GtkWidget *widget,
+                                      gpointer   data)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (data);
+  GimpViewRenderer      *renderer  = tree_view->priv->dnd_renderer;
+  gint                   width;
+  gint                   height;
+
+  if (renderer && gimp_viewable_get_size (renderer->viewable, &width, &height))
+    return gimp_viewable_get_new_pixbuf (renderer->viewable,
+                                         renderer->context,
+                                         width, height);
+
+  return NULL;
+}
+
+static gboolean
+gimp_container_tree_view_get_selected_single (GimpContainerTreeView  *tree_view,
+                                              GtkTreeIter            *iter)
+{
+  GtkTreeSelection *selection;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view->view));
+
+  if (gtk_tree_selection_count_selected_rows (selection) == 1)
+    {
+      GList    *selected_rows;
+
+      selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
+
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_view->model), iter,
+                               (GtkTreePath *) selected_rows->data);
+
+      g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
+
+      return TRUE;
+    }
+  else
+    {
+      return FALSE;
+    }
+}
+
+static gint
+gimp_container_tree_view_get_selected (GimpContainerView    *view,
+                                       GList               **items)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeSelection      *selection;
+  gint                   selected_count;
+  GList                 *selected_rows;
+  GList                 *current_row;
+  GtkTreeIter            iter;
+  GimpViewRenderer      *renderer;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view->view));
+  selected_count = gtk_tree_selection_count_selected_rows (selection);
+
+  if (items == NULL)
+    {
+      /* just provide selected count */
+      return selected_count;
+    }
+
+  selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
+
+  *items = NULL;
+  for (current_row = selected_rows;
+       current_row;
+       current_row = g_list_next (current_row))
+    {
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_view->model), &iter,
+                               (GtkTreePath *) current_row->data);
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      if (renderer->viewable)
+        *items = g_list_prepend (*items, renderer->viewable);
+
+      g_object_unref (renderer);
+    }
+
+  g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
+
+  *items = g_list_reverse (*items);
+
+  return selected_count;
+}
+
+static void
+gimp_container_tree_view_row_expanded (GtkTreeView           *tree_view,
+                                       GtkTreeIter           *iter,
+                                       GtkTreePath           *path,
+                                       GimpContainerTreeView *view)
+{
+  GimpViewRenderer *renderer;
+
+  gtk_tree_model_get (view->model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+  if (renderer)
+    {
+      gboolean expanded = gtk_tree_view_row_expanded (tree_view, path);
+
+      gimp_viewable_set_expanded (renderer->viewable,
+                                  expanded);
+      if (expanded)
+        {
+          g_signal_handlers_block_by_func (tree_view,
+                                           gimp_container_tree_view_row_expanded,
+                                           view);
+
+          gimp_container_tree_view_expand_rows (view->model, tree_view, iter);
+
+          g_signal_handlers_unblock_by_func (tree_view,
+                                             gimp_container_tree_view_row_expanded,
+                                             view);
+        }
+
+      g_object_unref (renderer);
+    }
+}
+
+static void
+gimp_container_tree_view_expand_rows (GtkTreeModel *model,
+                                      GtkTreeView  *view,
+                                      GtkTreeIter  *parent)
+{
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_iter_children (model, &iter, parent))
+    do
+      if (gtk_tree_model_iter_has_child (model, &iter))
+        {
+          GimpViewRenderer *renderer;
+
+          gtk_tree_model_get (model, &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                              -1);
+          if (renderer)
+            {
+              GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
+
+              if (gimp_viewable_get_expanded (renderer->viewable))
+                gtk_tree_view_expand_row (view, path, FALSE);
+              else
+                gtk_tree_view_collapse_row (view, path);
+
+              gtk_tree_path_free (path);
+              g_object_unref (renderer);
+            }
+
+          gimp_container_tree_view_expand_rows (model, view, &iter);
+        }
+    while (gtk_tree_model_iter_next (model, &iter));
+}
+
+static gboolean
+gimp_container_tree_view_monitor_changed_foreach (GtkTreeModel *model,
+                                                  GtkTreePath  *path,
+                                                  GtkTreeIter  *iter,
+                                                  gpointer      data)
+{
+  GimpViewRenderer *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      gimp_view_renderer_free_color_transform (renderer);
+      g_object_unref (renderer);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_container_tree_view_monitor_changed (GimpContainerTreeView *view)
+{
+  gtk_tree_model_foreach (view->model,
+                          gimp_container_tree_view_monitor_changed_foreach,
+                          NULL);
+}
+
+static void
+gimp_container_tree_view_process_updates (GimpContainerTreeView *tree_view)
+{
+  GdkWindow *window = gtk_tree_view_get_bin_window (tree_view->view);
+
+  /* this is a hack, necessary to work around a gtk bug which can cause the
+   * window containing the tree view to stop processing updates until
+   * explicitly requested.
+   */
+  if (window)
+    gdk_window_process_updates (window, TRUE);
+}
diff --git a/app/widgets/gimpcontainertreeview.h b/app/widgets/gimpcontainertreeview.h
new file mode 100644
index 0000000..b31d24f
--- /dev/null
+++ b/app/widgets/gimpcontainertreeview.h
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainertreeview.h
+ * Copyright (C) 2003-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_TREE_VIEW_H__
+#define __GIMP_CONTAINER_TREE_VIEW_H__
+
+
+#include "gimpcontainerbox.h"
+
+
+#define GIMP_TYPE_CONTAINER_TREE_VIEW            (gimp_container_tree_view_get_type ())
+#define GIMP_CONTAINER_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_TREE_VIEW, GimpContainerTreeView))
+#define GIMP_CONTAINER_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_TREE_VIEW, GimpContainerTreeViewClass))
+#define GIMP_IS_CONTAINER_TREE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_TREE_VIEW))
+#define GIMP_IS_CONTAINER_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_TREE_VIEW))
+#define GIMP_CONTAINER_TREE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_TREE_VIEW, GimpContainerTreeViewClass))
+
+
+typedef struct _GimpContainerTreeViewClass   GimpContainerTreeViewClass;
+typedef struct _GimpContainerTreeViewPrivate GimpContainerTreeViewPrivate;
+
+struct _GimpContainerTreeView
+{
+  GimpContainerBox              parent_instance;
+
+  GtkTreeModel                 *model;
+  gint                          n_model_columns;
+  GType                         model_columns[16];
+
+  GtkTreeView                  *view;
+
+  GtkTreeViewColumn            *main_column;
+  GtkCellRenderer              *renderer_cell;
+
+  Gimp                         *dnd_gimp; /* eek */
+
+  GimpContainerTreeViewPrivate *priv;
+};
+
+struct _GimpContainerTreeViewClass
+{
+  GimpContainerBoxClass  parent_class;
+
+  /* signals */
+
+  void     (* edit_name)      (GimpContainerTreeView   *tree_view);
+
+  /* virtual functions */
+
+  gboolean (* drop_possible)  (GimpContainerTreeView   *tree_view,
+                               GimpDndType              src_type,
+                               GimpViewable            *src_viewable,
+                               GimpViewable            *dest_viewable,
+                               GtkTreePath             *drop_path,
+                               GtkTreeViewDropPosition  drop_pos,
+                               GtkTreeViewDropPosition *return_drop_pos,
+                               GdkDragAction           *return_drag_action);
+  void     (* drop_viewable)  (GimpContainerTreeView   *tree_view,
+                               GimpViewable            *src_viewable,
+                               GimpViewable            *dest_viewable,
+                               GtkTreeViewDropPosition  drop_pos);
+  void     (* drop_color)     (GimpContainerTreeView   *tree_view,
+                               const GimpRGB           *src_color,
+                               GimpViewable            *dest_viewable,
+                               GtkTreeViewDropPosition  drop_pos);
+  void     (* drop_uri_list)  (GimpContainerTreeView   *tree_view,
+                               GList                   *uri_list,
+                               GimpViewable            *dest_viewable,
+                               GtkTreeViewDropPosition  drop_pos);
+  void     (* drop_svg)       (GimpContainerTreeView   *tree_view,
+                               const gchar             *svg_data,
+                               gsize                    svg_data_length,
+                               GimpViewable            *dest_viewable,
+                               GtkTreeViewDropPosition  drop_pos);
+  void     (* drop_component) (GimpContainerTreeView   *tree_view,
+                               GimpImage               *image,
+                               GimpChannelType          component,
+                               GimpViewable            *dest_viewable,
+                               GtkTreeViewDropPosition  drop_pos);
+  void     (* drop_pixbuf)    (GimpContainerTreeView   *tree_view,
+                               GdkPixbuf               *pixbuf,
+                               GimpViewable            *dest_viewable,
+                               GtkTreeViewDropPosition  drop_pos);
+};
+
+
+GType       gimp_container_tree_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_container_tree_view_new      (GimpContainer *container,
+                                               GimpContext   *context,
+                                               gint           view_size,
+                                               gint           view_border_width);
+
+GtkCellRenderer *
+            gimp_container_tree_view_get_name_cell
+                                              (GimpContainerTreeView *tree_view);
+
+void        gimp_container_tree_view_set_main_column_title
+                                              (GimpContainerTreeView *tree_view,
+                                               const gchar           *title);
+
+void        gimp_container_tree_view_add_toggle_cell
+                                              (GimpContainerTreeView *tree_view,
+                                               GtkCellRenderer       *cell);
+
+void        gimp_container_tree_view_add_renderer_cell
+                                              (GimpContainerTreeView *tree_view,
+                                               GtkCellRenderer       *cell);
+
+void        gimp_container_tree_view_set_dnd_drop_to_empty
+                                              (GimpContainerTreeView *tree_view,
+                                               gboolean               dnd_drop_to_emtpy);
+void        gimp_container_tree_view_connect_name_edited
+                                              (GimpContainerTreeView *tree_view,
+                                               GCallback              callback,
+                                               gpointer               data);
+gboolean    gimp_container_tree_view_name_edited
+                                              (GtkCellRendererText   *cell,
+                                               const gchar           *path_str,
+                                               const gchar           *new_name,
+                                               GimpContainerTreeView *tree_view);
+
+
+#endif  /*  __GIMP_CONTAINER_TREE_VIEW_H__  */
diff --git a/app/widgets/gimpcontainerview-utils.c b/app/widgets/gimpcontainerview-utils.c
new file mode 100644
index 0000000..c20a8ac
--- /dev/null
+++ b/app/widgets/gimpcontainerview-utils.c
@@ -0,0 +1,92 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+
+#include "gimpcontainereditor.h"
+#include "gimpcontainerview.h"
+#include "gimpcontainerview-utils.h"
+#include "gimpdockable.h"
+
+
+/*  public functions  */
+
+GimpContainerView *
+gimp_container_view_get_by_dockable (GimpDockable *dockable)
+{
+  GtkWidget *child;
+
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  child = gtk_bin_get_child (GTK_BIN (dockable));
+
+  if (child)
+    {
+      if (GIMP_IS_CONTAINER_EDITOR (child))
+        {
+          return GIMP_CONTAINER_EDITOR (child)->view;
+        }
+      else if (GIMP_IS_CONTAINER_VIEW (child))
+        {
+          return GIMP_CONTAINER_VIEW (child);
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_container_view_remove_active (GimpContainerView *view)
+{
+  GimpContext   *context;
+  GimpContainer *container;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+
+  context   = gimp_container_view_get_context (view);
+  container = gimp_container_view_get_container (view);
+
+  if (context && container)
+    {
+      GType       children_type;
+      GimpObject *active;
+
+      children_type = gimp_container_get_children_type (container);
+
+      active = gimp_context_get_by_type (context, children_type);
+
+      if (active)
+        {
+          GimpObject *new;
+
+          new = gimp_container_get_neighbor_of (container, active);
+
+          if (new)
+            gimp_context_set_by_type (context, children_type, new);
+
+          gimp_container_remove (container, active);
+        }
+    }
+}
diff --git a/app/widgets/gimpcontainerview-utils.h b/app/widgets/gimpcontainerview-utils.h
new file mode 100644
index 0000000..b179eef
--- /dev/null
+++ b/app/widgets/gimpcontainerview-utils.h
@@ -0,0 +1,30 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerview-utils.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_VIEW_UTILS_H__
+#define __GIMP_CONTAINER_VIEW_UTILS_H__
+
+
+GimpContainerView * gimp_container_view_get_by_dockable (GimpDockable      *dockable);
+
+void                gimp_container_view_remove_active   (GimpContainerView *view);
+
+
+#endif  /*  __GIMP_CONTAINER_VIEW_UTILS_H__  */
diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c
new file mode 100644
index 0000000..0a9d4ea
--- /dev/null
+++ b/app/widgets/gimpcontainerview.c
@@ -0,0 +1,1331 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerview.c
+ * Copyright (C) 2001-2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptreehandler.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpviewrenderer.h"
+#include "gimpuimanager.h"
+#include "gimpcontainertreeview.h"
+
+
+enum
+{
+  SELECT_ITEM,
+  ACTIVATE_ITEM,
+  CONTEXT_ITEM,
+  LAST_SIGNAL
+};
+
+
+#define GIMP_CONTAINER_VIEW_GET_PRIVATE(obj) (gimp_container_view_get_private ((GimpContainerView *) (obj)))
+
+
+typedef struct _GimpContainerViewPrivate GimpContainerViewPrivate;
+
+struct _GimpContainerViewPrivate
+{
+  GimpContainer   *container;
+  GimpContext     *context;
+
+  GHashTable      *item_hash;
+
+  gint             view_size;
+  gint             view_border_width;
+  gboolean         reorderable;
+  GtkSelectionMode selection_mode;
+
+  /*  initialized by subclass  */
+  GtkWidget       *dnd_widget;
+
+  GimpTreeHandler *name_changed_handler;
+  GimpTreeHandler *expanded_changed_handler;
+};
+
+
+/*  local function prototypes  */
+
+static GimpContainerViewPrivate *
+              gimp_container_view_get_private        (GimpContainerView *view);
+
+static void   gimp_container_view_real_set_container (GimpContainerView *view,
+                                                      GimpContainer     *container);
+static void   gimp_container_view_real_set_context   (GimpContainerView *view,
+                                                      GimpContext       *context);
+static void   gimp_container_view_real_set_selection_mode (GimpContainerView *view,
+                                                           GtkSelectionMode   mode);
+
+static void   gimp_container_view_clear_items      (GimpContainerView  *view);
+static void   gimp_container_view_real_clear_items (GimpContainerView  *view);
+
+static void   gimp_container_view_add_container    (GimpContainerView  *view,
+                                                    GimpContainer      *container);
+static void   gimp_container_view_add_foreach      (GimpViewable       *viewable,
+                                                    GimpContainerView  *view);
+static void   gimp_container_view_add              (GimpContainerView  *view,
+                                                    GimpViewable       *viewable,
+                                                    GimpContainer      *container);
+
+static void   gimp_container_view_remove_container (GimpContainerView  *view,
+                                                    GimpContainer      *container);
+static void   gimp_container_view_remove_foreach   (GimpViewable       *viewable,
+                                                    GimpContainerView  *view);
+static void   gimp_container_view_remove           (GimpContainerView  *view,
+                                                    GimpViewable       *viewable,
+                                                    GimpContainer      *container);
+
+static void   gimp_container_view_reorder          (GimpContainerView  *view,
+                                                    GimpViewable       *viewable,
+                                                    gint                new_index,
+                                                    GimpContainer      *container);
+
+static void   gimp_container_view_freeze           (GimpContainerView  *view,
+                                                    GimpContainer      *container);
+static void   gimp_container_view_thaw             (GimpContainerView  *view,
+                                                    GimpContainer      *container);
+static void   gimp_container_view_name_changed     (GimpViewable       *viewable,
+                                                    GimpContainerView  *view);
+static void   gimp_container_view_expanded_changed (GimpViewable       *viewable,
+                                                    GimpContainerView  *view);
+
+static void   gimp_container_view_connect_context    (GimpContainerView *view);
+static void   gimp_container_view_disconnect_context (GimpContainerView *view);
+
+static void   gimp_container_view_context_changed  (GimpContext        *context,
+                                                    GimpViewable       *viewable,
+                                                    GimpContainerView  *view);
+static void   gimp_container_view_viewable_dropped (GtkWidget          *widget,
+                                                    gint                x,
+                                                    gint                y,
+                                                    GimpViewable       *viewable,
+                                                    gpointer            data);
+static void  gimp_container_view_button_viewable_dropped (GtkWidget    *widget,
+                                                          gint          x,
+                                                          gint          y,
+                                                          GimpViewable *viewable,
+                                                          gpointer      data);
+static gint  gimp_container_view_real_get_selected (GimpContainerView    *view,
+                                                    GList               **list);
+
+
+G_DEFINE_INTERFACE (GimpContainerView, gimp_container_view, GTK_TYPE_WIDGET)
+
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_container_view_default_init (GimpContainerViewInterface *iface)
+{
+  view_signals[SELECT_ITEM] =
+    g_signal_new ("select-item",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpContainerViewInterface, select_item),
+                  NULL, NULL,
+                  gimp_marshal_BOOLEAN__OBJECT_POINTER,
+                  G_TYPE_BOOLEAN, 2,
+                  GIMP_TYPE_OBJECT,
+                  G_TYPE_POINTER);
+
+  view_signals[ACTIVATE_ITEM] =
+    g_signal_new ("activate-item",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContainerViewInterface, activate_item),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_POINTER,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_OBJECT,
+                  G_TYPE_POINTER);
+
+  view_signals[CONTEXT_ITEM] =
+    g_signal_new ("context-item",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpContainerViewInterface, context_item),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_POINTER,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_OBJECT,
+                  G_TYPE_POINTER);
+
+  iface->select_item        = NULL;
+  iface->activate_item      = NULL;
+  iface->context_item       = NULL;
+
+  iface->set_container      = gimp_container_view_real_set_container;
+  iface->set_context        = gimp_container_view_real_set_context;
+  iface->set_selection_mode = gimp_container_view_real_set_selection_mode;
+  iface->insert_item        = NULL;
+  iface->insert_item_after  = NULL;
+  iface->remove_item        = NULL;
+  iface->reorder_item       = NULL;
+  iface->rename_item        = NULL;
+  iface->expand_item        = NULL;
+  iface->clear_items        = gimp_container_view_real_clear_items;
+  iface->set_view_size      = NULL;
+  iface->get_selected       = gimp_container_view_real_get_selected;
+
+  iface->insert_data_free   = NULL;
+  iface->model_is_tree      = FALSE;
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_object ("container",
+                                                            NULL, NULL,
+                                                            GIMP_TYPE_CONTAINER,
+                                                            GIMP_PARAM_READWRITE));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_object ("context",
+                                                            NULL, NULL,
+                                                            GIMP_TYPE_CONTEXT,
+                                                            GIMP_PARAM_READWRITE));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_enum ("selection-mode",
+                                                          NULL, NULL,
+                                                          GTK_TYPE_SELECTION_MODE,
+                                                          GTK_SELECTION_SINGLE,
+                                                          GIMP_PARAM_READWRITE));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_boolean ("reorderable",
+                                                             NULL, NULL,
+                                                             FALSE,
+                                                             GIMP_PARAM_READWRITE));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_int ("view-size",
+                                                         NULL, NULL,
+                                                         1, GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
+                                                         GIMP_VIEW_SIZE_MEDIUM,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_interface_install_property (iface,
+                                       g_param_spec_int ("view-border-width",
+                                                         NULL, NULL,
+                                                         0,
+                                                         GIMP_VIEW_MAX_BORDER_WIDTH,
+                                                         1,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_container_view_private_dispose (GimpContainerView        *view,
+                                     GimpContainerViewPrivate *private)
+{
+  if (private->container)
+    gimp_container_view_set_container (view, NULL);
+
+  if (private->context)
+    gimp_container_view_set_context (view, NULL);
+}
+
+static void
+gimp_container_view_private_finalize (GimpContainerViewPrivate *private)
+{
+  if (private->item_hash)
+    {
+      g_hash_table_destroy (private->item_hash);
+      private->item_hash = NULL;
+    }
+  g_clear_pointer (&private->name_changed_handler,
+                   gimp_tree_handler_disconnect);
+  g_clear_pointer (&private->expanded_changed_handler,
+                   gimp_tree_handler_disconnect);
+
+  g_slice_free (GimpContainerViewPrivate, private);
+}
+
+static GimpContainerViewPrivate *
+gimp_container_view_get_private (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private;
+
+  static GQuark private_key = 0;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), NULL);
+
+  if (! private_key)
+    private_key = g_quark_from_static_string ("gimp-container-view-private");
+
+  private = g_object_get_qdata ((GObject *) view, private_key);
+
+  if (! private)
+    {
+      GimpContainerViewInterface *view_iface;
+
+      view_iface = GIMP_CONTAINER_VIEW_GET_INTERFACE (view);
+
+      private = g_slice_new0 (GimpContainerViewPrivate);
+
+      private->view_border_width = 1;
+
+      private->item_hash = g_hash_table_new_full (g_direct_hash,
+                                                  g_direct_equal,
+                                                  NULL,
+                                                  view_iface->insert_data_free);
+
+      g_object_set_qdata_full ((GObject *) view, private_key, private,
+                               (GDestroyNotify) gimp_container_view_private_finalize);
+
+      g_signal_connect (view, "destroy",
+                        G_CALLBACK (gimp_container_view_private_dispose),
+                        private);
+    }
+
+  return private;
+}
+
+/**
+ * gimp_container_view_install_properties:
+ * @klass: the class structure for a type deriving from #GObject
+ *
+ * Installs the necessary properties for a class implementing
+ * #GimpContainerView. A #GimpContainerViewProp property is installed
+ * for each property, using the values from the #GimpContainerViewProp
+ * enumeration. The caller must make sure itself that the enumeration
+ * values don't collide with some other property values they
+ * are using (that's what %GIMP_CONTAINER_VIEW_PROP_LAST is good for).
+ **/
+void
+gimp_container_view_install_properties (GObjectClass *klass)
+{
+  g_object_class_override_property (klass,
+                                    GIMP_CONTAINER_VIEW_PROP_CONTAINER,
+                                    "container");
+  g_object_class_override_property (klass,
+                                    GIMP_CONTAINER_VIEW_PROP_CONTEXT,
+                                    "context");
+  g_object_class_override_property (klass,
+                                    GIMP_CONTAINER_VIEW_PROP_SELECTION_MODE,
+                                    "selection-mode");
+  g_object_class_override_property (klass,
+                                    GIMP_CONTAINER_VIEW_PROP_REORDERABLE,
+                                    "reorderable");
+  g_object_class_override_property (klass,
+                                    GIMP_CONTAINER_VIEW_PROP_VIEW_SIZE,
+                                    "view-size");
+  g_object_class_override_property (klass,
+                                    GIMP_CONTAINER_VIEW_PROP_VIEW_BORDER_WIDTH,
+                                    "view-border-width");
+}
+
+GimpContainer *
+gimp_container_view_get_container (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), NULL);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  return private->container;
+}
+
+void
+gimp_container_view_set_container (GimpContainerView *view,
+                                   GimpContainer     *container)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (container == NULL || GIMP_IS_CONTAINER (container));
+  if (container)
+    g_return_if_fail (g_type_is_a (gimp_container_get_children_type (container),
+                                   GIMP_TYPE_VIEWABLE));
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (container != private->container)
+    {
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->set_container (view, container);
+
+      g_object_notify (G_OBJECT (view), "container");
+    }
+}
+
+static void
+gimp_container_view_real_set_container (GimpContainerView *view,
+                                        GimpContainer     *container)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (private->container)
+    {
+      if (private->context)
+        gimp_container_view_disconnect_context (view);
+
+      gimp_container_view_select_item (view, NULL);
+
+      /* freeze/thaw is only supported for the toplevel container */
+      g_signal_handlers_disconnect_by_func (private->container,
+                                            gimp_container_view_freeze,
+                                            view);
+      g_signal_handlers_disconnect_by_func (private->container,
+                                            gimp_container_view_thaw,
+                                            view);
+
+      if (! gimp_container_frozen (private->container))
+        gimp_container_view_remove_container (view, private->container);
+    }
+
+  private->container = container;
+
+  if (private->container)
+    {
+      if (! gimp_container_frozen (private->container))
+        gimp_container_view_add_container (view, private->container);
+
+      /* freeze/thaw is only supported for the toplevel container */
+      g_signal_connect_object (private->container, "freeze",
+                               G_CALLBACK (gimp_container_view_freeze),
+                               view,
+                               G_CONNECT_SWAPPED);
+      g_signal_connect_object (private->container, "thaw",
+                               G_CALLBACK (gimp_container_view_thaw),
+                               view,
+                               G_CONNECT_SWAPPED);
+
+      if (private->context)
+        gimp_container_view_connect_context (view);
+    }
+}
+
+GimpContext *
+gimp_container_view_get_context (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), NULL);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  return private->context;
+}
+
+void
+gimp_container_view_set_context (GimpContainerView *view,
+                                 GimpContext       *context)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (context != private->context)
+    {
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->set_context (view, context);
+
+      g_object_notify (G_OBJECT (view), "context");
+    }
+}
+
+static void
+gimp_container_view_real_set_context (GimpContainerView *view,
+                                      GimpContext       *context)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (private->context &&
+      private->container)
+    {
+      gimp_container_view_disconnect_context (view);
+    }
+
+  g_set_object (&private->context, context);
+
+  if (private->context &&
+      private->container)
+    {
+      gimp_container_view_connect_context (view);
+    }
+}
+
+GtkSelectionMode
+gimp_container_view_get_selection_mode (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  return private->selection_mode;
+}
+
+void
+gimp_container_view_set_selection_mode (GimpContainerView *view,
+                                        GtkSelectionMode   mode)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (mode == GTK_SELECTION_SINGLE ||
+                    mode == GTK_SELECTION_MULTIPLE);
+
+  GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->set_selection_mode (view, mode);
+}
+
+static void
+gimp_container_view_real_set_selection_mode (GimpContainerView *view,
+                                             GtkSelectionMode   mode)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  private->selection_mode = mode;
+}
+
+gint
+gimp_container_view_get_view_size (GimpContainerView *view,
+                                   gint              *view_border_width)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), 0);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (view_border_width)
+    *view_border_width = private->view_border_width;
+
+  return private->view_size;
+}
+
+void
+gimp_container_view_set_view_size (GimpContainerView *view,
+                                   gint               view_size,
+                                   gint               view_border_width)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (view_size >  0 &&
+                    view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+  g_return_if_fail (view_border_width >= 0 &&
+                    view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (private->view_size         != view_size ||
+      private->view_border_width != view_border_width)
+    {
+      private->view_size         = view_size;
+      private->view_border_width = view_border_width;
+
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->set_view_size (view);
+
+      g_object_freeze_notify (G_OBJECT (view));
+      g_object_notify (G_OBJECT (view), "view-size");
+      g_object_notify (G_OBJECT (view), "view-border-width");
+      g_object_thaw_notify (G_OBJECT (view));
+    }
+}
+
+gboolean
+gimp_container_view_get_reorderable (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), FALSE);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  return private->reorderable;
+}
+
+void
+gimp_container_view_set_reorderable (GimpContainerView *view,
+                                     gboolean           reorderable)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  private->reorderable = reorderable ? TRUE : FALSE;
+  g_object_notify (G_OBJECT (view), "reorderable");
+}
+
+GtkWidget *
+gimp_container_view_get_dnd_widget (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), NULL);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  return private->dnd_widget;
+}
+
+void
+gimp_container_view_set_dnd_widget (GimpContainerView *view,
+                                    GtkWidget         *dnd_widget)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (dnd_widget == NULL || GTK_IS_WIDGET (dnd_widget));
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  private->dnd_widget = dnd_widget;
+}
+
+void
+gimp_container_view_enable_dnd (GimpContainerView *view,
+                                GtkButton         *button,
+                                GType              children_type)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (GTK_IS_BUTTON (button));
+
+  gimp_dnd_viewable_dest_add (GTK_WIDGET (button),
+                              children_type,
+                              gimp_container_view_button_viewable_dropped,
+                              view);
+}
+
+gboolean
+gimp_container_view_select_item (GimpContainerView *view,
+                                 GimpViewable      *viewable)
+{
+  GimpContainerViewPrivate *private;
+  gboolean                  success = FALSE;
+  gpointer                  insert_data;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), FALSE);
+  g_return_val_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (gimp_container_frozen (private->container))
+    return TRUE;
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  g_signal_emit (view, view_signals[SELECT_ITEM], 0,
+                 viewable, insert_data, &success);
+
+  return success;
+}
+
+void
+gimp_container_view_activate_item (GimpContainerView *view,
+                                   GimpViewable      *viewable)
+{
+  GimpContainerViewPrivate *private;
+  gpointer                  insert_data;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (gimp_container_frozen (private->container))
+    return;
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  g_signal_emit (view, view_signals[ACTIVATE_ITEM], 0,
+                 viewable, insert_data);
+}
+
+void
+gimp_container_view_context_item (GimpContainerView *view,
+                                  GimpViewable      *viewable)
+{
+  GimpContainerViewPrivate *private;
+  gpointer                  insert_data;
+
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (gimp_container_frozen (private->container))
+    return;
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  g_signal_emit (view, view_signals[CONTEXT_ITEM], 0,
+                 viewable, insert_data);
+}
+
+gpointer
+gimp_container_view_lookup (GimpContainerView *view,
+                            GimpViewable      *viewable)
+{
+  GimpContainerViewPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), NULL);
+  g_return_val_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable), NULL);
+
+  /*  we handle the NULL viewable here as a workaround for bug #149906 */
+  if (! viewable)
+    return NULL;
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  return g_hash_table_lookup (private->item_hash, viewable);
+}
+
+gboolean
+gimp_container_view_item_selected (GimpContainerView *view,
+                                   GimpViewable      *viewable)
+{
+  GimpContainerViewPrivate *private;
+  gboolean                  success;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), FALSE);
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  /* HACK */
+  if (private->container && private->context)
+    {
+      GType        children_type;
+      const gchar *signal_name;
+
+      children_type = gimp_container_get_children_type (private->container);
+      signal_name   = gimp_context_type_to_signal_name (children_type);
+
+      if (signal_name)
+        {
+          gimp_context_set_by_type (private->context, children_type,
+                                    GIMP_OBJECT (viewable));
+          return TRUE;
+        }
+    }
+
+  success = gimp_container_view_select_item (view, viewable);
+
+#if 0
+  if (success && private->container && private->context)
+    {
+      GimpContext *context;
+      GType        children_type;
+
+      /*  ref and remember the context because private->context may
+       *  become NULL by calling gimp_context_set_by_type()
+       */
+      context       = g_object_ref (private->context);
+      children_type = gimp_container_get_children_type (private->container);
+
+      g_signal_handlers_block_by_func (context,
+                                       gimp_container_view_context_changed,
+                                       view);
+
+      gimp_context_set_by_type (context, children_type, GIMP_OBJECT (viewable));
+
+      g_signal_handlers_unblock_by_func (context,
+                                         gimp_container_view_context_changed,
+                                         view);
+
+      g_object_unref (context);
+    }
+#endif
+
+  return success;
+}
+
+gboolean
+gimp_container_view_multi_selected (GimpContainerView *view,
+                                    GList             *items)
+{
+  guint                     selected_count;
+  gboolean                  success = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), FALSE);
+
+  selected_count = g_list_length (items);
+
+  if (selected_count == 0)
+    {
+      /* do nothing */
+    }
+  else if (selected_count == 1)
+    {
+      success = gimp_container_view_item_selected (view, items->data);
+    }
+  else
+    {
+      success = FALSE;
+      g_signal_emit (view, view_signals[SELECT_ITEM], 0,
+                     NULL, items, &success);
+    }
+
+  return success;
+}
+
+gint
+gimp_container_view_get_selected (GimpContainerView  *view,
+                                  GList             **list)
+{
+  g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), 0);
+
+  return GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->get_selected (view, list);
+}
+
+static gint
+gimp_container_view_real_get_selected (GimpContainerView    *view,
+                                       GList               **list)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  GType                     children_type;
+  GimpObject               *object;
+
+  if (list)
+    *list = NULL;
+
+  if (! private->container || ! private->context)
+    return 0;
+
+  children_type = gimp_container_get_children_type (private->container);
+  object = gimp_context_get_by_type (private->context,
+                                     children_type);
+
+  if (list && object)
+    *list = g_list_append (*list, object);
+
+  return object ? 1 : 0;
+}
+
+void
+gimp_container_view_item_activated (GimpContainerView *view,
+                                    GimpViewable      *viewable)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  gimp_container_view_activate_item (view, viewable);
+}
+
+void
+gimp_container_view_item_context (GimpContainerView *view,
+                                  GimpViewable      *viewable)
+{
+  g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
+  g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
+
+  gimp_container_view_context_item (view, viewable);
+}
+
+void
+gimp_container_view_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (object);
+
+  switch (property_id)
+    {
+    case GIMP_CONTAINER_VIEW_PROP_CONTAINER:
+      gimp_container_view_set_container (view, g_value_get_object (value));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_CONTEXT:
+      gimp_container_view_set_context (view, g_value_get_object (value));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_SELECTION_MODE:
+      gimp_container_view_set_selection_mode (view, g_value_get_enum (value));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_REORDERABLE:
+      gimp_container_view_set_reorderable (view, g_value_get_boolean (value));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_VIEW_SIZE:
+    case GIMP_CONTAINER_VIEW_PROP_VIEW_BORDER_WIDTH:
+      {
+        gint size, border;
+
+        size = gimp_container_view_get_view_size (view, &border);
+
+        if (property_id == GIMP_CONTAINER_VIEW_PROP_VIEW_SIZE)
+          size = g_value_get_int (value);
+        else
+          border = g_value_get_int (value);
+
+        gimp_container_view_set_view_size (view, size, border);
+      }
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+void
+gimp_container_view_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (object);
+
+  switch (property_id)
+    {
+    case GIMP_CONTAINER_VIEW_PROP_CONTAINER:
+      g_value_set_object (value, gimp_container_view_get_container (view));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_CONTEXT:
+      g_value_set_object (value, gimp_container_view_get_context (view));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_SELECTION_MODE:
+      g_value_set_enum (value, gimp_container_view_get_selection_mode (view));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_REORDERABLE:
+      g_value_set_boolean (value, gimp_container_view_get_reorderable (view));
+      break;
+    case GIMP_CONTAINER_VIEW_PROP_VIEW_SIZE:
+    case GIMP_CONTAINER_VIEW_PROP_VIEW_BORDER_WIDTH:
+      {
+        gint size, border;
+
+        size = gimp_container_view_get_view_size (view, &border);
+
+        if (property_id == GIMP_CONTAINER_VIEW_PROP_VIEW_SIZE)
+          g_value_set_int (value, size);
+        else
+          g_value_set_int (value, border);
+      }
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_container_view_clear_items (GimpContainerView *view)
+{
+  GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->clear_items (view);
+}
+
+static void
+gimp_container_view_real_clear_items (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  g_hash_table_remove_all (private->item_hash);
+}
+
+static void
+gimp_container_view_add_container (GimpContainerView *view,
+                                   GimpContainer     *container)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_view_add_foreach,
+                          view);
+
+  if (container == private->container)
+    {
+      GType              children_type;
+      GimpViewableClass *viewable_class;
+
+      children_type  = gimp_container_get_children_type (container);
+      viewable_class = g_type_class_ref (children_type);
+
+      private->name_changed_handler =
+        gimp_tree_handler_connect (container,
+                                   viewable_class->name_changed_signal,
+                                   G_CALLBACK (gimp_container_view_name_changed),
+                                   view);
+
+      if (GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->expand_item)
+        {
+          private->expanded_changed_handler =
+            gimp_tree_handler_connect (container,
+                                       "expanded-changed",
+                                       G_CALLBACK (gimp_container_view_expanded_changed),
+                                       view);
+        }
+
+      g_type_class_unref (viewable_class);
+    }
+
+  g_signal_connect_object (container, "add",
+                           G_CALLBACK (gimp_container_view_add),
+                           view,
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (container, "remove",
+                           G_CALLBACK (gimp_container_view_remove),
+                           view,
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (container, "reorder",
+                           G_CALLBACK (gimp_container_view_reorder),
+                           view,
+                           G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_container_view_add_foreach (GimpViewable      *viewable,
+                                 GimpContainerView *view)
+{
+  GimpContainerViewInterface *view_iface;
+  GimpContainerViewPrivate   *private;
+  GimpViewable               *parent;
+  GimpContainer              *children;
+  gpointer                    parent_insert_data = NULL;
+  gpointer                    insert_data;
+
+  view_iface = GIMP_CONTAINER_VIEW_GET_INTERFACE (view);
+  private    = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  parent = gimp_viewable_get_parent (viewable);
+
+  if (parent)
+    parent_insert_data = g_hash_table_lookup (private->item_hash, parent);
+
+  insert_data = view_iface->insert_item (view, viewable,
+                                         parent_insert_data, -1);
+
+  g_hash_table_insert (private->item_hash, viewable, insert_data);
+
+  if (view_iface->insert_item_after)
+    view_iface->insert_item_after (view, viewable, insert_data);
+
+  children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    gimp_container_view_add_container (view, children);
+}
+
+static void
+gimp_container_view_add (GimpContainerView *view,
+                         GimpViewable      *viewable,
+                         GimpContainer     *container)
+{
+  GimpContainerViewInterface *view_iface;
+  GimpContainerViewPrivate   *private;
+  GimpViewable               *parent;
+  GimpContainer              *children;
+  gpointer                    parent_insert_data = NULL;
+  gpointer                    insert_data;
+  gint                        index;
+
+  view_iface = GIMP_CONTAINER_VIEW_GET_INTERFACE (view);
+  private    = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  index = gimp_container_get_child_index (container,
+                                          GIMP_OBJECT (viewable));
+
+  parent = gimp_viewable_get_parent (viewable);
+
+  if (parent)
+    parent_insert_data = g_hash_table_lookup (private->item_hash, parent);
+
+  insert_data = view_iface->insert_item (view, viewable,
+                                         parent_insert_data, index);
+
+  g_hash_table_insert (private->item_hash, viewable, insert_data);
+
+  if (view_iface->insert_item_after)
+    view_iface->insert_item_after (view, viewable, insert_data);
+
+  children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    gimp_container_view_add_container (view, children);
+}
+
+static void
+gimp_container_view_remove_container (GimpContainerView *view,
+                                      GimpContainer     *container)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  g_object_ref (container);
+
+  g_signal_handlers_disconnect_by_func (container,
+                                        gimp_container_view_add,
+                                        view);
+  g_signal_handlers_disconnect_by_func (container,
+                                        gimp_container_view_remove,
+                                        view);
+  g_signal_handlers_disconnect_by_func (container,
+                                        gimp_container_view_reorder,
+                                        view);
+
+  if (container == private->container)
+    {
+      g_clear_pointer (&private->name_changed_handler,
+                       gimp_tree_handler_disconnect);
+      g_clear_pointer (&private->expanded_changed_handler,
+                       gimp_tree_handler_disconnect);
+
+      /* optimization: when the toplevel container gets removed, call
+       * clear_items() which will get rid of all view widget stuff
+       * *and* empty private->item_hash, so below call to
+       * remove_foreach() will only disconnect all containers but not
+       * remove all items individually (because they are gone from
+       * item_hash).
+       */
+      gimp_container_view_clear_items (view);
+    }
+
+  gimp_container_foreach (container,
+                          (GFunc) gimp_container_view_remove_foreach,
+                          view);
+
+  g_object_unref (container);
+}
+
+static void
+gimp_container_view_remove_foreach (GimpViewable      *viewable,
+                                    GimpContainerView *view)
+{
+  gimp_container_view_remove (view, viewable, NULL);
+}
+
+static void
+gimp_container_view_remove (GimpContainerView *view,
+                            GimpViewable      *viewable,
+                            GimpContainer     *unused)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  GimpContainer            *children;
+  gpointer                  insert_data;
+
+  children = gimp_viewable_get_children (viewable);
+
+  if (children)
+    gimp_container_view_remove_container (view, children);
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  if (insert_data)
+    {
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->remove_item (view,
+                                                             viewable,
+                                                             insert_data);
+
+      g_hash_table_remove (private->item_hash, viewable);
+    }
+}
+
+static void
+gimp_container_view_reorder (GimpContainerView *view,
+                             GimpViewable      *viewable,
+                             gint               new_index,
+                             GimpContainer     *container)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  gpointer                  insert_data;
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  if (insert_data)
+    {
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->reorder_item (view,
+                                                              viewable,
+                                                              new_index,
+                                                              insert_data);
+    }
+}
+
+static void
+gimp_container_view_freeze (GimpContainerView *view,
+                            GimpContainer     *container)
+{
+  gimp_container_view_remove_container (view, container);
+}
+
+static void
+gimp_container_view_thaw (GimpContainerView *view,
+                          GimpContainer     *container)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  gimp_container_view_add_container (view, container);
+
+  if (private->context)
+    {
+      GType        children_type;
+      const gchar *signal_name;
+
+      children_type = gimp_container_get_children_type (private->container);
+      signal_name   = gimp_context_type_to_signal_name (children_type);
+
+      if (signal_name)
+        {
+          GimpObject *object;
+
+          object = gimp_context_get_by_type (private->context, children_type);
+
+          gimp_container_view_select_item (view, GIMP_VIEWABLE (object));
+        }
+    }
+}
+
+static void
+gimp_container_view_name_changed (GimpViewable      *viewable,
+                                  GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  gpointer                  insert_data;
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  if (insert_data)
+    {
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->rename_item (view,
+                                                             viewable,
+                                                             insert_data);
+    }
+}
+
+static void
+gimp_container_view_expanded_changed (GimpViewable      *viewable,
+                                      GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  gpointer                  insert_data;
+
+  insert_data = g_hash_table_lookup (private->item_hash, viewable);
+
+  if (insert_data)
+    {
+      GIMP_CONTAINER_VIEW_GET_INTERFACE (view)->expand_item (view,
+                                                             viewable,
+                                                             insert_data);
+    }
+}
+
+static void
+gimp_container_view_connect_context (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  GType                     children_type;
+  const gchar              *signal_name;
+
+  children_type = gimp_container_get_children_type (private->container);
+  signal_name   = gimp_context_type_to_signal_name (children_type);
+
+  if (signal_name)
+    {
+      g_signal_connect_object (private->context, signal_name,
+                               G_CALLBACK (gimp_container_view_context_changed),
+                               view,
+                               0);
+
+      if (private->dnd_widget)
+        gimp_dnd_viewable_dest_add (private->dnd_widget,
+                                    children_type,
+                                    gimp_container_view_viewable_dropped,
+                                    view);
+
+      if (! gimp_container_frozen (private->container))
+        {
+          GimpObject *object = gimp_context_get_by_type (private->context,
+                                                         children_type);
+
+          gimp_container_view_select_item (view, GIMP_VIEWABLE (object));
+        }
+    }
+}
+
+static void
+gimp_container_view_disconnect_context (GimpContainerView *view)
+{
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+  GType                     children_type;
+  const gchar              *signal_name;
+
+  children_type = gimp_container_get_children_type (private->container);
+  signal_name   = gimp_context_type_to_signal_name (children_type);
+
+  if (signal_name)
+    {
+      g_signal_handlers_disconnect_by_func (private->context,
+                                            gimp_container_view_context_changed,
+                                            view);
+
+      if (private->dnd_widget)
+        {
+          gtk_drag_dest_unset (private->dnd_widget);
+          gimp_dnd_viewable_dest_remove (private->dnd_widget,
+                                         children_type);
+        }
+    }
+}
+
+static void
+gimp_container_view_context_changed (GimpContext       *context,
+                                     GimpViewable      *viewable,
+                                     GimpContainerView *view)
+{
+  if (! gimp_container_view_select_item (view, viewable))
+    g_warning ("%s: select_item() failed (should not happen)", G_STRFUNC);
+}
+
+static void
+gimp_container_view_viewable_dropped (GtkWidget    *widget,
+                                      gint          x,
+                                      gint          y,
+                                      GimpViewable *viewable,
+                                      gpointer      data)
+{
+  GimpContainerView        *view    = GIMP_CONTAINER_VIEW (data);
+  GimpContainerViewPrivate *private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
+
+  if (viewable && private->container &&
+      gimp_container_have (private->container, GIMP_OBJECT (viewable)))
+    {
+      gimp_container_view_item_selected (view, viewable);
+    }
+}
+
+static void
+gimp_container_view_button_viewable_dropped (GtkWidget    *widget,
+                                             gint          x,
+                                             gint          y,
+                                             GimpViewable *viewable,
+                                             gpointer      data)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (data);
+
+  if (viewable && gimp_container_view_lookup (view, viewable))
+    {
+      gimp_container_view_item_selected (view, viewable);
+
+      gtk_button_clicked (GTK_BUTTON (widget));
+    }
+}
+
diff --git a/app/widgets/gimpcontainerview.h b/app/widgets/gimpcontainerview.h
new file mode 100644
index 0000000..bdf3783
--- /dev/null
+++ b/app/widgets/gimpcontainerview.h
@@ -0,0 +1,168 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontainerview.h
+ * Copyright (C) 2001-2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTAINER_VIEW_H__
+#define __GIMP_CONTAINER_VIEW_H__
+
+
+typedef enum
+{
+  GIMP_CONTAINER_VIEW_PROP_0,
+  GIMP_CONTAINER_VIEW_PROP_CONTAINER,
+  GIMP_CONTAINER_VIEW_PROP_CONTEXT,
+  GIMP_CONTAINER_VIEW_PROP_SELECTION_MODE,
+  GIMP_CONTAINER_VIEW_PROP_REORDERABLE,
+  GIMP_CONTAINER_VIEW_PROP_VIEW_SIZE,
+  GIMP_CONTAINER_VIEW_PROP_VIEW_BORDER_WIDTH,
+  GIMP_CONTAINER_VIEW_PROP_LAST = GIMP_CONTAINER_VIEW_PROP_VIEW_BORDER_WIDTH
+} GimpContainerViewProp;
+
+
+#define GIMP_TYPE_CONTAINER_VIEW               (gimp_container_view_get_type ())
+#define GIMP_CONTAINER_VIEW(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_VIEW, GimpContainerView))
+#define GIMP_IS_CONTAINER_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_VIEW))
+#define GIMP_CONTAINER_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONTAINER_VIEW, GimpContainerViewInterface))
+
+
+typedef struct _GimpContainerViewInterface GimpContainerViewInterface;
+
+struct _GimpContainerViewInterface
+{
+  GTypeInterface base_iface;
+
+  /*  signals  */
+  gboolean (* select_item)        (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+  void     (* activate_item)      (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+  void     (* context_item)       (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+
+  /*  virtual functions  */
+  void     (* set_container)      (GimpContainerView *view,
+                                   GimpContainer     *container);
+  void     (* set_context)        (GimpContainerView *view,
+                                   GimpContext       *context);
+  void     (* set_selection_mode) (GimpContainerView *view,
+                                   GtkSelectionMode   mode);
+
+  gpointer (* insert_item)        (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           parent_insert_data,
+                                   gint               index);
+  void     (* insert_item_after)  (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+  void     (* remove_item)        (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+  void     (* reorder_item)       (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gint               new_index,
+                                   gpointer           insert_data);
+  void     (* rename_item)        (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+  void     (* expand_item)        (GimpContainerView *view,
+                                   GimpViewable      *object,
+                                   gpointer           insert_data);
+  void     (* clear_items)        (GimpContainerView *view);
+  void     (* set_view_size)      (GimpContainerView *view);
+  gint     (* get_selected)       (GimpContainerView  *view,
+                                   GList             **items);
+
+
+  /*  the destroy notifier for private->hash_table's values  */
+  GDestroyNotify  insert_data_free;
+  gboolean        model_is_tree;
+};
+
+
+GType              gimp_container_view_get_type           (void) G_GNUC_CONST;
+
+GimpContainer    * gimp_container_view_get_container      (GimpContainerView  *view);
+void               gimp_container_view_set_container      (GimpContainerView  *view,
+                                                           GimpContainer      *container);
+
+GimpContext      * gimp_container_view_get_context        (GimpContainerView  *view);
+void               gimp_container_view_set_context        (GimpContainerView  *view,
+                                                           GimpContext        *context);
+
+GtkSelectionMode   gimp_container_view_get_selection_mode (GimpContainerView  *view);
+void               gimp_container_view_set_selection_mode (GimpContainerView  *view,
+                                                           GtkSelectionMode    mode);
+
+gint               gimp_container_view_get_view_size      (GimpContainerView  *view,
+                                                           gint               *view_border_width);
+void               gimp_container_view_set_view_size      (GimpContainerView  *view,
+                                                           gint                view_size,
+                                                           gint                view_border_width);
+
+gboolean           gimp_container_view_get_reorderable    (GimpContainerView  *view);
+void               gimp_container_view_set_reorderable    (GimpContainerView  *view,
+                                                           gboolean            reorderable);
+
+GtkWidget        * gimp_container_view_get_dnd_widget     (GimpContainerView  *view);
+void               gimp_container_view_set_dnd_widget     (GimpContainerView  *view,
+                                                           GtkWidget          *dnd_widget);
+
+void               gimp_container_view_enable_dnd         (GimpContainerView  *editor,
+                                                           GtkButton          *button,
+                                                           GType               children_type);
+
+gboolean           gimp_container_view_select_item        (GimpContainerView  *view,
+                                                           GimpViewable       *viewable);
+void               gimp_container_view_activate_item      (GimpContainerView  *view,
+                                                           GimpViewable       *viewable);
+void               gimp_container_view_context_item       (GimpContainerView  *view,
+                                                           GimpViewable       *viewable);
+gint               gimp_container_view_get_selected       (GimpContainerView  *view,
+                                                           GList             **list);
+
+/*  protected  */
+
+gpointer           gimp_container_view_lookup             (GimpContainerView  *view,
+                                                           GimpViewable       *viewable);
+
+gboolean           gimp_container_view_item_selected      (GimpContainerView  *view,
+                                                           GimpViewable       *item);
+gboolean           gimp_container_view_multi_selected     (GimpContainerView  *view,
+                                                           GList              *items);
+void               gimp_container_view_item_activated     (GimpContainerView  *view,
+                                                           GimpViewable       *item);
+void               gimp_container_view_item_context       (GimpContainerView  *view,
+                                                           GimpViewable       *item);
+
+/*  convenience functions  */
+
+void               gimp_container_view_install_properties (GObjectClass       *klass);
+void               gimp_container_view_set_property       (GObject            *object,
+                                                           guint               property_id,
+                                                           const GValue       *value,
+                                                           GParamSpec         *pspec);
+void               gimp_container_view_get_property       (GObject            *object,
+                                                           guint               property_id,
+                                                           GValue             *value,
+                                                           GParamSpec         *pspec);
+
+#endif  /*  __GIMP_CONTAINER_VIEW_H__  */
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
new file mode 100644
index 0000000..6266c5f
--- /dev/null
+++ b/app/widgets/gimpcontrollereditor.c
@@ -0,0 +1,888 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontrollereditor.c
+ * Copyright (C) 2004-2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimpaction.h"
+#include "gimpactioneditor.h"
+#include "gimpactionview.h"
+#include "gimpcontrollereditor.h"
+#include "gimpcontrollerinfo.h"
+#include "gimpdialogfactory.h"
+#include "gimphelp-ids.h"
+#include "gimpuimanager.h"
+#include "gimpviewabledialog.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTROLLER_INFO,
+  PROP_CONTEXT
+};
+
+enum
+{
+  COLUMN_EVENT,
+  COLUMN_BLURB,
+  COLUMN_ICON_NAME,
+  COLUMN_ACTION,
+  N_COLUMNS
+};
+
+
+static void gimp_controller_editor_constructed    (GObject              *object);
+static void gimp_controller_editor_finalize       (GObject              *object);
+static void gimp_controller_editor_set_property   (GObject              *object,
+                                                   guint                 property_id,
+                                                   const GValue         *value,
+                                                   GParamSpec           *pspec);
+static void gimp_controller_editor_get_property   (GObject              *object,
+                                                   guint                 property_id,
+                                                   GValue               *value,
+                                                   GParamSpec           *pspec);
+
+
+static void gimp_controller_editor_unmap          (GtkWidget            *widget);
+
+static void gimp_controller_editor_sel_changed    (GtkTreeSelection     *sel,
+                                                   GimpControllerEditor *editor);
+
+static void gimp_controller_editor_row_activated  (GtkTreeView          *tv,
+                                                   GtkTreePath          *path,
+                                                   GtkTreeViewColumn    *column,
+                                                   GimpControllerEditor *editor);
+
+static void gimp_controller_editor_grab_toggled   (GtkWidget            *button,
+                                                   GimpControllerEditor *editor);
+static void gimp_controller_editor_edit_clicked   (GtkWidget            *button,
+                                                   GimpControllerEditor *editor);
+static void gimp_controller_editor_delete_clicked (GtkWidget            *button,
+                                                   GimpControllerEditor *editor);
+
+static void gimp_controller_editor_edit_activated (GtkTreeView          *tv,
+                                                   GtkTreePath          *path,
+                                                   GtkTreeViewColumn    *column,
+                                                   GimpControllerEditor *editor);
+static void gimp_controller_editor_edit_response  (GtkWidget            *dialog,
+                                                   gint                  response_id,
+                                                   GimpControllerEditor *editor);
+
+static GtkWidget *  gimp_controller_string_view_new (GimpController *controller,
+                                                     GParamSpec     *pspec);
+static GtkWidget *  gimp_controller_int_view_new    (GimpController *controller,
+                                                     GParamSpec     *pspec);
+
+
+G_DEFINE_TYPE (GimpControllerEditor, gimp_controller_editor, GTK_TYPE_BOX)
+
+#define parent_class gimp_controller_editor_parent_class
+
+
+static void
+gimp_controller_editor_class_init (GimpControllerEditorClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed  = gimp_controller_editor_constructed;
+  object_class->finalize     = gimp_controller_editor_finalize;
+  object_class->set_property = gimp_controller_editor_set_property;
+  object_class->get_property = gimp_controller_editor_get_property;
+
+  widget_class->unmap        = gimp_controller_editor_unmap;
+
+  g_object_class_install_property (object_class, PROP_CONTROLLER_INFO,
+                                   g_param_spec_object ("controller-info",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTROLLER_INFO,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_controller_editor_init (GimpControllerEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
+
+  editor->info = NULL;
+}
+
+static void
+gimp_controller_editor_constructed (GObject *object)
+{
+  GimpControllerEditor *editor = GIMP_CONTROLLER_EDITOR (object);
+  GimpControllerInfo   *info;
+  GimpController       *controller;
+  GimpControllerClass  *controller_class;
+  GimpUIManager        *ui_manager;
+  GtkListStore         *store;
+  GtkWidget            *frame;
+  GtkWidget            *vbox;
+  GtkWidget            *table;
+  GtkWidget            *hbox;
+  GtkWidget            *button;
+  GtkWidget            *tv;
+  GtkWidget            *sw;
+  GtkWidget            *entry;
+  GtkTreeViewColumn    *column;
+  GtkCellRenderer      *cell;
+  GParamSpec          **property_specs;
+  guint                 n_property_specs;
+  gint                  n_events;
+  gint                  row;
+  gint                  i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CONTROLLER_INFO (editor->info));
+
+  info             = editor->info;
+  controller       = info->controller;
+  controller_class = GIMP_CONTROLLER_GET_CLASS (controller);
+
+  frame = gimp_frame_new (_("General"));
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  entry = gimp_prop_entry_new (G_OBJECT (info), "name", -1);
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  button = gimp_prop_check_button_new (G_OBJECT (info), "debug-events",
+                                       _("_Dump events from this controller"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_prop_check_button_new (G_OBJECT (info), "enabled",
+                                       _("_Enable this controller"));
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  frame = gimp_frame_new (controller_class->name);
+  gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  row = 0;
+
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Name:"), 0.0, 0.5,
+                             gimp_prop_label_new (G_OBJECT (controller),
+                                                  "name"),
+                             1, TRUE);
+
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("State:"), 0.0, 0.5,
+                             gimp_prop_label_new (G_OBJECT (controller),
+                                                  "state"),
+                             1, TRUE);
+
+  property_specs =
+    g_object_class_list_properties (G_OBJECT_CLASS (controller_class),
+                                    &n_property_specs);
+
+  for (i = 0; i < n_property_specs; i++)
+    {
+      GParamSpec *pspec = property_specs[i];
+      GtkWidget  *widget;
+
+      if (pspec->owner_type == GIMP_TYPE_CONTROLLER)
+        continue;
+
+      if (G_IS_PARAM_SPEC_STRING (pspec))
+        {
+          widget = gimp_controller_string_view_new (controller, pspec);
+
+          gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                                     g_param_spec_get_nick (pspec),
+                                     0.0, 0.5,
+                                     widget,
+                                     1, FALSE);
+        }
+      else if (G_IS_PARAM_SPEC_INT (pspec))
+        {
+          widget = gimp_controller_int_view_new (controller, pspec);
+
+          gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                                     g_param_spec_get_nick (pspec),
+                                     0.0, 0.5,
+                                     widget,
+                                     1, TRUE);
+        }
+    }
+
+  g_free (property_specs);
+
+  store = gtk_list_store_new (N_COLUMNS,
+                              G_TYPE_STRING,
+                              G_TYPE_STRING,
+                              G_TYPE_STRING,
+                              G_TYPE_STRING);
+  tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+  g_object_unref (store);
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                       GTK_SHADOW_IN);
+  gtk_widget_set_size_request (sw, 400, 300);
+  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_widget_show (tv);
+
+  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+  gtk_widget_show (sw);
+
+  g_signal_connect (tv, "row-activated",
+                    G_CALLBACK (gimp_controller_editor_row_activated),
+                    editor);
+
+  editor->sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
+
+  g_signal_connect (editor->sel, "changed",
+                    G_CALLBACK (gimp_controller_editor_sel_changed),
+                    editor);
+
+  ui_manager = gimp_ui_managers_from_name ("<Image>")->data;
+
+  n_events = gimp_controller_get_n_events (controller);
+
+  for (i = 0; i < n_events; i++)
+    {
+      GtkTreeIter iter;
+      const gchar *event_name;
+      const gchar *event_blurb;
+      const gchar *event_action;
+      const gchar *icon_name = NULL;
+
+      event_name  = gimp_controller_get_event_name  (controller, i);
+      event_blurb = gimp_controller_get_event_blurb (controller, i);
+
+      event_action = g_hash_table_lookup (info->mapping, event_name);
+
+      if (event_action)
+        {
+          GimpAction *action;
+
+          action = gimp_ui_manager_find_action (ui_manager, NULL, event_action);
+
+          if (action)
+            icon_name = gimp_action_get_icon_name (action);
+        }
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter,
+                          COLUMN_EVENT,     event_name,
+                          COLUMN_BLURB,     event_blurb,
+                          COLUMN_ICON_NAME, icon_name,
+                          COLUMN_ACTION,    event_action,
+                          -1);
+    }
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tv), 0,
+                                               _("Event"),
+                                               gtk_cell_renderer_text_new (),
+                                               "text", COLUMN_BLURB,
+                                               NULL);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Action"));
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column);
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, cell, FALSE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "icon-name", COLUMN_ICON_NAME,
+                                       NULL);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text", COLUMN_ACTION,
+                                       NULL);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  editor->grab_button = gtk_toggle_button_new_with_mnemonic (_("_Grab event"));
+  gtk_box_pack_start (GTK_BOX (hbox), editor->grab_button, TRUE, TRUE, 0);
+  gtk_widget_show (editor->grab_button);
+
+  g_signal_connect (editor->grab_button, "toggled",
+                    G_CALLBACK (gimp_controller_editor_grab_toggled),
+                    editor);
+
+  gimp_help_set_help_data (editor->grab_button,
+                           _("Select the next event arriving from "
+                             "the controller"),
+                           NULL);
+
+  editor->edit_button = gtk_button_new_with_mnemonic (_("_Edit event"));
+  gtk_box_pack_start (GTK_BOX (hbox), editor->edit_button, TRUE, TRUE, 0);
+  gtk_widget_show (editor->edit_button);
+
+  g_signal_connect (editor->edit_button, "clicked",
+                    G_CALLBACK (gimp_controller_editor_edit_clicked),
+                    editor);
+
+  editor->delete_button = gtk_button_new_with_mnemonic (_("_Clear event"));
+  gtk_box_pack_start (GTK_BOX (hbox), editor->delete_button, TRUE, TRUE, 0);
+  gtk_widget_show (editor->delete_button);
+
+  g_signal_connect (editor->delete_button, "clicked",
+                    G_CALLBACK (gimp_controller_editor_delete_clicked),
+                    editor);
+
+  gtk_widget_set_sensitive (editor->edit_button,   FALSE);
+  gtk_widget_set_sensitive (editor->delete_button, FALSE);
+}
+
+static void
+gimp_controller_editor_finalize (GObject *object)
+{
+  GimpControllerEditor *editor = GIMP_CONTROLLER_EDITOR (object);
+
+  if (editor->info)
+    {
+      gimp_controller_info_set_event_snooper (editor->info, NULL, NULL);
+
+      g_clear_object (&editor->info);
+    }
+
+  g_clear_object (&editor->context);
+
+  if (editor->edit_dialog)
+    gtk_widget_destroy (editor->edit_dialog);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_controller_editor_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpControllerEditor *editor = GIMP_CONTROLLER_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTROLLER_INFO:
+      editor->info = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTEXT:
+      editor->context = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_controller_editor_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpControllerEditor *editor = GIMP_CONTROLLER_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTROLLER_INFO:
+      g_value_set_object (value, editor->info);
+      break;
+
+    case PROP_CONTEXT:
+      g_value_set_object (value, editor->context);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_controller_editor_unmap (GtkWidget *widget)
+{
+  GimpControllerEditor *editor = GIMP_CONTROLLER_EDITOR (widget);
+
+  if (editor->edit_dialog)
+    gtk_dialog_response (GTK_DIALOG (editor->edit_dialog),
+                         GTK_RESPONSE_CANCEL);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_controller_editor_new (GimpControllerInfo *info,
+                            GimpContext        *context)
+{
+  g_return_val_if_fail (GIMP_IS_CONTROLLER_INFO (info), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_CONTROLLER_EDITOR,
+                       "controller-info", info,
+                       "context",         context,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_controller_editor_sel_changed (GtkTreeSelection     *sel,
+                                    GimpControllerEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gchar        *edit_help        = NULL;
+  gchar        *delete_help      = NULL;
+  gboolean      edit_sensitive   = FALSE;
+  gboolean      delete_sensitive = FALSE;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      gchar *event  = NULL;
+      gchar *action = NULL;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_BLURB,  &event,
+                          COLUMN_ACTION, &action,
+                          -1);
+
+      if (action)
+        {
+          g_free (action);
+
+          delete_sensitive = TRUE;
+          if (event)
+            delete_help =
+              g_strdup_printf (_("Remove the action assigned to '%s'"), event);
+        }
+
+      edit_sensitive = TRUE;
+      if (event)
+        edit_help = g_strdup_printf (_("Assign an action to '%s'"), event);
+
+      g_free (event);
+    }
+
+  gimp_help_set_help_data (editor->edit_button, edit_help, NULL);
+  gtk_widget_set_sensitive (editor->edit_button, edit_sensitive);
+  g_free (edit_help);
+
+  gimp_help_set_help_data (editor->delete_button, delete_help, NULL);
+  gtk_widget_set_sensitive (editor->delete_button, delete_sensitive);
+  g_free (delete_help);
+
+  gimp_controller_info_set_event_snooper (editor->info, NULL, NULL);
+}
+
+static void
+gimp_controller_editor_row_activated (GtkTreeView          *tv,
+                                      GtkTreePath          *path,
+                                      GtkTreeViewColumn    *column,
+                                      GimpControllerEditor *editor)
+{
+  if (gtk_widget_is_sensitive (editor->edit_button))
+    gtk_button_clicked (GTK_BUTTON (editor->edit_button));
+}
+
+static gboolean
+gimp_controller_editor_snooper (GimpControllerInfo        *info,
+                                GimpController            *controller,
+                                const GimpControllerEvent *event,
+                                gpointer                   user_data)
+{
+  GimpControllerEditor *editor = GIMP_CONTROLLER_EDITOR (user_data);
+  GtkTreeModel         *model;
+  GtkTreeIter           iter;
+  gboolean              iter_valid;
+  const gchar          *event_name;
+
+  gtk_tree_selection_get_selected (editor->sel, &model, &iter);
+
+  event_name = gimp_controller_get_event_name (info->controller,
+                                               event->any.event_id);
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      gchar *list_name;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_EVENT, &list_name,
+                          -1);
+
+      if (! strcmp (list_name, event_name))
+        {
+          GtkTreeView *view;
+          GtkTreePath *path;
+
+          view = gtk_tree_selection_get_tree_view (editor->sel);
+
+          gtk_tree_selection_select_iter (editor->sel, &iter);
+
+          path = gtk_tree_model_get_path (model, &iter);
+          gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0.0, 0.0);
+          gtk_tree_view_set_cursor (view, path, NULL, FALSE);
+          gtk_tree_path_free (path);
+
+          gtk_widget_grab_focus (GTK_WIDGET (view));
+
+          g_free (list_name);
+          break;
+        }
+
+      g_free (list_name);
+    }
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->grab_button), FALSE);
+
+  return TRUE;
+}
+
+static void
+gimp_controller_editor_grab_toggled (GtkWidget            *button,
+                                     GimpControllerEditor *editor)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+    {
+      gimp_controller_info_set_event_snooper (editor->info,
+                                              gimp_controller_editor_snooper,
+                                              editor);
+    }
+  else
+    {
+      gimp_controller_info_set_event_snooper (editor->info, NULL, NULL);
+    }
+}
+
+static void
+gimp_controller_editor_edit_clicked (GtkWidget            *button,
+                                     GimpControllerEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gchar        *event_name  = NULL;
+  gchar        *event_blurb = NULL;
+  gchar        *action_name = NULL;
+
+  gimp_controller_info_set_event_snooper (editor->info, NULL, NULL);
+
+  if (gtk_tree_selection_get_selected (editor->sel, &model, &iter))
+    gtk_tree_model_get (model, &iter,
+                        COLUMN_EVENT,  &event_name,
+                        COLUMN_BLURB,  &event_blurb,
+                        COLUMN_ACTION, &action_name,
+                        -1);
+
+  if (event_name)
+    {
+      GtkWidget *view;
+      gchar     *title;
+
+      title = g_strdup_printf (_("Select Action for Event '%s'"),
+                               event_blurb);
+
+      editor->edit_dialog =
+        gimp_viewable_dialog_new (GIMP_VIEWABLE (editor->info), editor->context,
+                                  _("Select Controller Event Action"),
+                                  "gimp-controller-action-dialog",
+                                  GIMP_ICON_EDIT,
+                                  title,
+                                  gtk_widget_get_toplevel (GTK_WIDGET (editor)),
+                                  gimp_standard_help_func,
+                                  GIMP_HELP_PREFS_INPUT_CONTROLLERS,
+
+                                  _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                  _("_OK"),     GTK_RESPONSE_OK,
+
+                                  NULL);
+
+      g_free (title);
+
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (editor->edit_dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      g_object_add_weak_pointer (G_OBJECT (editor->edit_dialog),
+                                 (gpointer) &editor->edit_dialog);
+
+      gimp_dialog_factory_add_foreign (gimp_dialog_factory_get_singleton (),
+                                       "gimp-controller-action-dialog",
+                                       editor->edit_dialog,
+                                       gtk_widget_get_screen (button),
+                                       gimp_widget_get_monitor (button));
+
+      g_signal_connect (editor->edit_dialog, "response",
+                        G_CALLBACK (gimp_controller_editor_edit_response),
+                        editor);
+
+      view = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data,
+                                     action_name, FALSE);
+      gtk_container_set_border_width (GTK_CONTAINER (view), 12);
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (editor->edit_dialog))),
+                          view, TRUE, TRUE, 0);
+      gtk_widget_show (view);
+
+      g_signal_connect (GIMP_ACTION_EDITOR (view)->view, "row-activated",
+                        G_CALLBACK (gimp_controller_editor_edit_activated),
+                        editor);
+
+      editor->edit_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (GIMP_ACTION_EDITOR (view)->view));
+
+      g_object_add_weak_pointer (G_OBJECT (editor->edit_sel),
+                                 (gpointer) &editor->edit_sel);
+
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+      gtk_widget_show (editor->edit_dialog);
+
+      g_free (event_name);
+      g_free (event_blurb);
+      g_free (action_name);
+    }
+}
+
+static void
+gimp_controller_editor_delete_clicked (GtkWidget            *button,
+                                       GimpControllerEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gchar        *event_name = NULL;
+
+  gimp_controller_info_set_event_snooper (editor->info, NULL, NULL);
+
+  if (gtk_tree_selection_get_selected (editor->sel, &model, &iter))
+    gtk_tree_model_get (model, &iter,
+                        COLUMN_EVENT, &event_name,
+                        -1);
+
+  if (event_name)
+    {
+      g_hash_table_remove (editor->info->mapping, event_name);
+      g_free (event_name);
+
+      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                          COLUMN_ICON_NAME, NULL,
+                          COLUMN_ACTION,    NULL,
+                          -1);
+    }
+}
+
+static void
+gimp_controller_editor_edit_activated (GtkTreeView          *tv,
+                                       GtkTreePath          *path,
+                                       GtkTreeViewColumn    *column,
+                                       GimpControllerEditor *editor)
+{
+  gtk_dialog_response (GTK_DIALOG (editor->edit_dialog), GTK_RESPONSE_OK);
+}
+
+static void
+gimp_controller_editor_edit_response (GtkWidget            *dialog,
+                                      gint                  response_id,
+                                      GimpControllerEditor *editor)
+{
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GtkTreeModel *model;
+      GtkTreeIter   iter;
+      gchar        *event_name  = NULL;
+      gchar        *icon_name   = NULL;
+      gchar        *action_name = NULL;
+
+      if (gtk_tree_selection_get_selected (editor->edit_sel, &model, &iter))
+        gtk_tree_model_get (model, &iter,
+                            GIMP_ACTION_VIEW_COLUMN_ICON_NAME, &icon_name,
+                            GIMP_ACTION_VIEW_COLUMN_NAME,      &action_name,
+                            -1);
+
+      if (gtk_tree_selection_get_selected (editor->sel, &model, &iter))
+        gtk_tree_model_get (model, &iter,
+                            COLUMN_EVENT, &event_name,
+                            -1);
+
+      if (event_name && action_name)
+        {
+          g_hash_table_insert (editor->info->mapping,
+                               g_strdup (event_name),
+                               g_strdup (action_name));
+
+          gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                              COLUMN_ICON_NAME, icon_name,
+                              COLUMN_ACTION,    action_name,
+                              -1);
+        }
+
+      g_free (event_name);
+      g_free (icon_name);
+      g_free (action_name);
+
+      gimp_controller_editor_sel_changed (editor->sel, editor);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static GtkWidget *
+gimp_controller_string_view_new (GimpController *controller,
+                                 GParamSpec     *pspec)
+{
+  GtkWidget *widget = NULL;
+
+  g_return_val_if_fail (G_IS_PARAM_SPEC_STRING (pspec), NULL);
+
+  if (pspec->flags & G_PARAM_WRITABLE)
+    {
+      GtkTreeModel *model      = NULL;
+      gchar        *model_name = g_strdup_printf ("%s-values", pspec->name);
+      GParamSpec   *model_spec;
+
+      model_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (controller),
+                                                 model_name);
+
+      if (G_IS_PARAM_SPEC_OBJECT (model_spec) &&
+          g_type_is_a (model_spec->value_type, GTK_TYPE_LIST_STORE))
+        {
+          g_object_get (controller,
+                        model_name, &model,
+                        NULL);
+        }
+
+      g_free (model_name);
+
+      if (model)
+        {
+          widget = gimp_prop_string_combo_box_new (G_OBJECT (controller),
+                                                   pspec->name, model, 0, 1);
+          g_object_unref (model);
+        }
+      else
+        {
+          widget = gimp_prop_entry_new (G_OBJECT (controller), pspec->name, -1);
+        }
+    }
+  else
+    {
+      widget = gimp_prop_label_new (G_OBJECT (controller), pspec->name);
+    }
+
+  return widget;
+}
+
+
+static GtkWidget *
+gimp_controller_int_view_new (GimpController *controller,
+                              GParamSpec     *pspec)
+{
+  GtkWidget *widget = NULL;
+
+  g_return_val_if_fail (G_IS_PARAM_SPEC_INT (pspec), NULL);
+
+  if (pspec->flags & G_PARAM_WRITABLE)
+    {
+      GimpIntStore *model      = NULL;
+      gchar        *model_name = g_strdup_printf ("%s-values", pspec->name);
+      GParamSpec   *model_spec;
+
+      model_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (controller),
+                                                 model_name);
+
+      if (G_IS_PARAM_SPEC_OBJECT (model_spec) &&
+          g_type_is_a (model_spec->value_type, GIMP_TYPE_INT_STORE))
+        {
+          g_object_get (controller,
+                        model_name, &model,
+                        NULL);
+        }
+
+      g_free (model_name);
+
+      if (model)
+        {
+          widget = gimp_prop_int_combo_box_new (G_OBJECT (controller),
+                                                pspec->name, model);
+          g_object_unref (model);
+        }
+      else
+        {
+          widget = gimp_prop_spin_button_new (G_OBJECT (controller),
+                                              pspec->name, 1, 8, 0);
+        }
+    }
+  else
+    {
+      widget = gimp_prop_label_new (G_OBJECT (controller), pspec->name);
+    }
+
+  return widget;
+}
diff --git a/app/widgets/gimpcontrollereditor.h b/app/widgets/gimpcontrollereditor.h
new file mode 100644
index 0000000..d46aa17
--- /dev/null
+++ b/app/widgets/gimpcontrollereditor.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontrollereditor.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLER_EDITOR_H__
+#define __GIMP_CONTROLLER_EDITOR_H__
+
+
+#define GIMP_TYPE_CONTROLLER_EDITOR            (gimp_controller_editor_get_type ())
+#define GIMP_CONTROLLER_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditor))
+#define GIMP_CONTROLLER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditorClass))
+#define GIMP_IS_CONTROLLER_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTROLLER_EDITOR))
+#define GIMP_IS_CONTROLLER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTROLLER_EDITOR))
+#define GIMP_CONTROLLER_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditorClass))
+
+
+typedef struct _GimpControllerEditorClass GimpControllerEditorClass;
+
+struct _GimpControllerEditor
+{
+  GtkBox              parent_instance;
+
+  GimpControllerInfo *info;
+  GimpContext        *context;
+
+  GtkTreeSelection   *sel;
+
+  GtkWidget          *grab_button;
+  GtkWidget          *edit_button;
+  GtkWidget          *delete_button;
+
+  GtkWidget          *edit_dialog;
+  GtkTreeSelection   *edit_sel;
+};
+
+struct _GimpControllerEditorClass
+{
+  GtkBoxClass   parent_class;
+};
+
+
+GType       gimp_controller_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_controller_editor_new      (GimpControllerInfo *info,
+                                             GimpContext        *context);
+
+
+#endif  /*  __GIMP_CONTROLLER_EDITOR_H__  */
diff --git a/app/widgets/gimpcontrollerinfo.c b/app/widgets/gimpcontrollerinfo.c
new file mode 100644
index 0000000..a67203d
--- /dev/null
+++ b/app/widgets/gimpcontrollerinfo.c
@@ -0,0 +1,532 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollerinfo.c
+ * Copyright (C) 2004-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpcontrollerinfo.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ENABLED,
+  PROP_DEBUG_EVENTS,
+  PROP_CONTROLLER,
+  PROP_MAPPING
+};
+
+enum
+{
+  EVENT_MAPPED,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_controller_info_config_iface_init (GimpConfigInterface *iface);
+
+static void     gimp_controller_info_finalize     (GObject          *object);
+static void     gimp_controller_info_set_property (GObject          *object,
+                                                   guint             property_id,
+                                                   const GValue     *value,
+                                                   GParamSpec       *pspec);
+static void     gimp_controller_info_get_property (GObject          *object,
+                                                   guint             property_id,
+                                                   GValue           *value,
+                                                   GParamSpec       *pspec);
+
+static gboolean gimp_controller_info_serialize_property   (GimpConfig       *config,
+                                                           guint             property_id,
+                                                           const GValue     *value,
+                                                           GParamSpec       *pspec,
+                                                           GimpConfigWriter *writer);
+static gboolean gimp_controller_info_deserialize_property (GimpConfig       *config,
+                                                           guint             property_id,
+                                                           GValue           *value,
+                                                           GParamSpec       *pspec,
+                                                           GScanner         *scanner,
+                                                           GTokenType       *expected);
+
+static gboolean gimp_controller_info_event (GimpController            *controller,
+                                            const GimpControllerEvent *event,
+                                            GimpControllerInfo        *info);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpControllerInfo, gimp_controller_info,
+                         GIMP_TYPE_VIEWABLE,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_controller_info_config_iface_init))
+
+#define parent_class gimp_controller_info_parent_class
+
+static guint info_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_controller_info_class_init (GimpControllerInfoClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+
+  object_class->finalize            = gimp_controller_info_finalize;
+  object_class->set_property        = gimp_controller_info_set_property;
+  object_class->get_property        = gimp_controller_info_get_property;
+
+  viewable_class->default_icon_name = GIMP_ICON_CONTROLLER;
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ENABLED,
+                            "enabled",
+                            _("Enabled"),
+                            NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DEBUG_EVENTS,
+                            "debug-events",
+                            _("Debug events"),
+                            NULL,
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_CONTROLLER,
+                           "controller",
+                           "Controller",
+                           NULL,
+                           GIMP_TYPE_CONTROLLER,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOXED (object_class, PROP_MAPPING,
+                          "mapping",
+                          "Mapping",
+                          NULL,
+                          G_TYPE_HASH_TABLE,
+                          GIMP_PARAM_STATIC_STRINGS);
+
+  info_signals[EVENT_MAPPED] =
+    g_signal_new ("event-mapped",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpControllerInfoClass, event_mapped),
+                  g_signal_accumulator_true_handled, NULL,
+                  gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING,
+                  G_TYPE_BOOLEAN, 3,
+                  G_TYPE_OBJECT,
+                  G_TYPE_POINTER,
+                  G_TYPE_STRING);
+}
+
+static void
+gimp_controller_info_init (GimpControllerInfo *info)
+{
+  info->controller = NULL;
+  info->mapping    = g_hash_table_new_full (g_str_hash,
+                                            g_str_equal,
+                                            (GDestroyNotify) g_free,
+                                            (GDestroyNotify) g_free);
+}
+
+static void
+gimp_controller_info_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize_property   = gimp_controller_info_serialize_property;
+  iface->deserialize_property = gimp_controller_info_deserialize_property;
+}
+
+static void
+gimp_controller_info_finalize (GObject *object)
+{
+  GimpControllerInfo *info = GIMP_CONTROLLER_INFO (object);
+
+  g_clear_object (&info->controller);
+  g_clear_pointer (&info->mapping, g_hash_table_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_controller_info_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpControllerInfo *info = GIMP_CONTROLLER_INFO (object);
+
+  switch (property_id)
+    {
+    case PROP_ENABLED:
+      info->enabled = g_value_get_boolean (value);
+      break;
+    case PROP_DEBUG_EVENTS:
+      info->debug_events = g_value_get_boolean (value);
+      break;
+    case PROP_CONTROLLER:
+      if (info->controller)
+        {
+          g_signal_handlers_disconnect_by_func (info->controller,
+                                                gimp_controller_info_event,
+                                                info);
+          g_object_unref (info->controller);
+        }
+
+      info->controller = g_value_dup_object (value);
+
+      if (info->controller)
+        {
+          GimpControllerClass *controller_class;
+
+          g_signal_connect_object (info->controller, "event",
+                                   G_CALLBACK (gimp_controller_info_event),
+                                   G_OBJECT (info),
+                                   0);
+
+          controller_class = GIMP_CONTROLLER_GET_CLASS (info->controller);
+          gimp_viewable_set_icon_name (GIMP_VIEWABLE (info),
+                                       controller_class->icon_name);
+        }
+      break;
+    case PROP_MAPPING:
+      if (info->mapping)
+        g_hash_table_unref (info->mapping);
+      info->mapping = g_value_dup_boxed (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_controller_info_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpControllerInfo *info = GIMP_CONTROLLER_INFO (object);
+
+  switch (property_id)
+    {
+    case PROP_ENABLED:
+      g_value_set_boolean (value, info->enabled);
+      break;
+    case PROP_DEBUG_EVENTS:
+      g_value_set_boolean (value, info->debug_events);
+      break;
+    case PROP_CONTROLLER:
+      g_value_set_object (value, info->controller);
+      break;
+    case PROP_MAPPING:
+      g_value_set_boxed (value, info->mapping);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_controller_info_serialize_mapping (gpointer key,
+                                        gpointer value,
+                                        gpointer data)
+{
+  const gchar      *event_name  = key;
+  const gchar      *action_name = value;
+  GimpConfigWriter *writer      = data;
+
+  gimp_config_writer_open (writer, "map");
+  gimp_config_writer_string (writer, event_name);
+  gimp_config_writer_string (writer, action_name);
+  gimp_config_writer_close (writer);
+}
+
+static gboolean
+gimp_controller_info_serialize_property (GimpConfig       *config,
+                                         guint             property_id,
+                                         const GValue     *value,
+                                         GParamSpec       *pspec,
+                                         GimpConfigWriter *writer)
+{
+  GHashTable *mapping;
+
+  if (property_id != PROP_MAPPING)
+    return FALSE;
+
+  mapping = g_value_get_boxed (value);
+
+  if (mapping)
+    {
+      gimp_config_writer_open (writer, pspec->name);
+
+      g_hash_table_foreach (mapping,
+                            (GHFunc) gimp_controller_info_serialize_mapping,
+                            writer);
+
+      gimp_config_writer_close (writer);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_controller_info_deserialize_property (GimpConfig *config,
+                                           guint       property_id,
+                                           GValue     *value,
+                                           GParamSpec *pspec,
+                                           GScanner   *scanner,
+                                           GTokenType *expected)
+{
+  GHashTable *mapping;
+  GTokenType  token;
+
+  if (property_id != PROP_MAPPING)
+    return FALSE;
+
+  mapping = g_hash_table_new_full (g_str_hash,
+                                   g_str_equal,
+                                   (GDestroyNotify) g_free,
+                                   (GDestroyNotify) g_free);
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_IDENTIFIER;
+          break;
+
+        case G_TOKEN_IDENTIFIER:
+          if (! strcmp (scanner->value.v_identifier, "map"))
+            {
+              gchar *event_name;
+              gchar *action_name;
+
+              token = G_TOKEN_STRING;
+              if (! gimp_scanner_parse_string (scanner, &event_name))
+                goto error;
+
+              token = G_TOKEN_STRING;
+              if (! gimp_scanner_parse_string (scanner, &action_name))
+                goto error;
+
+              g_hash_table_insert (mapping, event_name, action_name);
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (token == G_TOKEN_LEFT_PAREN)
+    {
+      token = G_TOKEN_RIGHT_PAREN;
+
+      if (g_scanner_peek_next_token (scanner) == token)
+        {
+          g_value_take_boxed (value, mapping);
+        }
+      else
+        {
+          goto error;
+        }
+    }
+  else
+    {
+    error:
+      g_hash_table_unref (mapping);
+
+      *expected = token;
+    }
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GimpControllerInfo *
+gimp_controller_info_new (GType type)
+{
+  GimpControllerClass *controller_class;
+  GimpController      *controller;
+  GimpControllerInfo  *info;
+
+  g_return_val_if_fail (g_type_is_a (type, GIMP_TYPE_CONTROLLER), NULL);
+
+  controller_class = g_type_class_ref (type);
+
+  controller = gimp_controller_new (type);
+  info = g_object_new (GIMP_TYPE_CONTROLLER_INFO,
+                       "name",       controller_class->name,
+                       "controller", controller,
+                       NULL);
+  g_object_unref (controller);
+
+  g_type_class_unref (controller_class);
+
+  return info;
+}
+
+void
+gimp_controller_info_set_enabled (GimpControllerInfo *info,
+                                  gboolean            enabled)
+{
+  g_return_if_fail (GIMP_IS_CONTROLLER_INFO (info));
+
+  if (enabled != info->enabled)
+    g_object_set (info, "enabled", enabled, NULL);
+}
+
+gboolean
+gimp_controller_info_get_enabled (GimpControllerInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_CONTROLLER_INFO (info), FALSE);
+
+  return info->enabled;
+}
+
+void
+gimp_controller_info_set_event_snooper (GimpControllerInfo         *info,
+                                        GimpControllerEventSnooper  snooper,
+                                        gpointer                    snooper_data)
+{
+  g_return_if_fail (GIMP_IS_CONTROLLER_INFO (info));
+
+  info->snooper      = snooper;
+  info->snooper_data = snooper_data;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_controller_info_event (GimpController            *controller,
+                            const GimpControllerEvent *event,
+                            GimpControllerInfo        *info)
+{
+  const gchar *event_name;
+  const gchar *event_blurb;
+  const gchar *action_name = NULL;
+
+  event_name = gimp_controller_get_event_name (controller,
+                                               event->any.event_id);
+  event_blurb = gimp_controller_get_event_blurb (controller,
+                                                 event->any.event_id);
+
+  if (info->debug_events)
+    {
+      g_print ("Received '%s' (class '%s')\n"
+               "    controller event '%s (%s)'\n",
+               controller->name, GIMP_CONTROLLER_GET_CLASS (controller)->name,
+               event_name, event_blurb);
+
+      switch (event->any.type)
+        {
+        case GIMP_CONTROLLER_EVENT_TRIGGER:
+          g_print ("    (trigger event)\n");
+          break;
+
+        case GIMP_CONTROLLER_EVENT_VALUE:
+          if (G_VALUE_HOLDS_DOUBLE (&event->value.value))
+            g_print ("    (value event, value = %f)\n",
+                     g_value_get_double (&event->value.value));
+          else
+            g_print ("    (value event, unhandled type '%s')\n",
+                     g_type_name (event->value.value.g_type));
+          break;
+        }
+    }
+
+  if (info->snooper)
+    {
+      if (info->snooper (info, controller, event, info->snooper_data))
+        {
+          if (info->debug_events)
+            g_print ("    intercepted by event snooper\n\n");
+
+          return TRUE;
+        }
+    }
+
+  if (! info->enabled)
+    {
+      if (info->debug_events)
+        g_print ("    ignoring because controller is disabled\n\n");
+
+      return FALSE;
+    }
+
+  if (info->mapping)
+    action_name = g_hash_table_lookup (info->mapping, event_name);
+
+  if (action_name)
+    {
+      gboolean retval = FALSE;
+
+      if (info->debug_events)
+        g_print ("    maps to action '%s'\n", action_name);
+
+      g_signal_emit (info, info_signals[EVENT_MAPPED], 0,
+                     controller, event, action_name, &retval);
+
+      if (info->debug_events)
+        {
+          if (retval)
+            g_print ("    action was found\n\n");
+          else
+            g_print ("    action NOT found\n\n");
+        }
+
+      return retval;
+    }
+  else
+    {
+      if (info->debug_events)
+        g_print ("    doesn't map to action\n\n");
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpcontrollerinfo.h b/app/widgets/gimpcontrollerinfo.h
new file mode 100644
index 0000000..b655f47
--- /dev/null
+++ b/app/widgets/gimpcontrollerinfo.h
@@ -0,0 +1,82 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollerinfo.h
+ * Copyright (C) 2004-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLER_INFO_H__
+#define __GIMP_CONTROLLER_INFO_H__
+
+
+#include "core/gimpviewable.h"
+
+
+typedef gboolean (* GimpControllerEventSnooper) (GimpControllerInfo        *info,
+                                                 GimpController            *controller,
+                                                 const GimpControllerEvent *event,
+                                                 gpointer                   user_data);
+
+
+#define GIMP_TYPE_CONTROLLER_INFO            (gimp_controller_info_get_type ())
+#define GIMP_CONTROLLER_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_INFO, GimpControllerInfo))
+#define GIMP_CONTROLLER_INFO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_INFO, GimpControllerInfoClass))
+#define GIMP_IS_CONTROLLER_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTROLLER_INFO))
+#define GIMP_IS_CONTROLLER_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTROLLER_INFO))
+#define GIMP_CONTROLLER_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTROLLER_INFO, GimpControllerInfoClass))
+
+
+typedef struct _GimpControllerInfoClass GimpControllerInfoClass;
+
+struct _GimpControllerInfo
+{
+  GimpViewable                parent_instance;
+
+  gboolean                    enabled;
+  gboolean                    debug_events;
+
+  GimpController             *controller;
+  GHashTable                 *mapping;
+
+  GimpControllerEventSnooper  snooper;
+  gpointer                    snooper_data;
+};
+
+struct _GimpControllerInfoClass
+{
+  GimpViewableClass  parent_class;
+
+  gboolean (* event_mapped) (GimpControllerInfo        *info,
+                             GimpController            *controller,
+                             const GimpControllerEvent *event,
+                             const gchar               *action_name);
+};
+
+
+GType    gimp_controller_info_get_type          (void) G_GNUC_CONST;
+
+GimpControllerInfo * gimp_controller_info_new   (GType                       type);
+
+void     gimp_controller_info_set_enabled       (GimpControllerInfo         *info,
+                                                 gboolean                    enabled);
+gboolean gimp_controller_info_get_enabled       (GimpControllerInfo         *info);
+
+void     gimp_controller_info_set_event_snooper (GimpControllerInfo         *info,
+                                                 GimpControllerEventSnooper  snooper,
+                                                 gpointer                    snooper_data);
+
+
+#endif /* __GIMP_CONTROLLER_INFO_H__ */
diff --git a/app/widgets/gimpcontrollerkeyboard.c b/app/widgets/gimpcontrollerkeyboard.c
new file mode 100644
index 0000000..a523d26
--- /dev/null
+++ b/app/widgets/gimpcontrollerkeyboard.c
@@ -0,0 +1,294 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollerkeyboard.c
+ * Copyright (C) 2004-2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#undef GDK_MULTIHEAD_SAFE /* for gdk_keymap_get_default() */
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpcontrollerkeyboard.h"
+#include "gimphelp-ids.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _KeyboardEvent KeyboardEvent;
+
+struct _KeyboardEvent
+{
+  const guint      keyval;
+  const gchar     *modifier_string;
+  GdkModifierType  modifiers;
+  const gchar     *name;
+  const gchar     *blurb;
+};
+
+
+static void          gimp_controller_keyboard_constructed     (GObject        *object);
+
+static gint          gimp_controller_keyboard_get_n_events    (GimpController *controller);
+static const gchar * gimp_controller_keyboard_get_event_name  (GimpController *controller,
+                                                               gint            event_id);
+static const gchar * gimp_controller_keyboard_get_event_blurb (GimpController *controller,
+                                                               gint            event_id);
+
+
+G_DEFINE_TYPE (GimpControllerKeyboard, gimp_controller_keyboard,
+               GIMP_TYPE_CONTROLLER)
+
+#define parent_class gimp_controller_keyboard_parent_class
+
+
+static KeyboardEvent keyboard_events[] =
+{
+  { GDK_KEY_Up, NULL, 0,
+    "cursor-up",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Shift>", 0,
+    "cursor-up-shift",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Primary>", 0,
+    "cursor-up-primary",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Alt>", 0,
+    "cursor-up-alt",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Shift><Primary>", 0,
+    "cursor-up-shift-primary",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Shift><Alt>", 0,
+    "cursor-up-shift-alt",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Primary><Alt>", 0,
+    "cursor-up-primary-alt",
+    N_("Cursor Up") },
+  { GDK_KEY_Up, "<Shift><Primary><Alt>", 0,
+    "cursor-up-shift-primary-alt",
+    N_("Cursor Up") },
+
+  { GDK_KEY_Down, NULL, 0,
+    "cursor-down",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Shift>", 0,
+    "cursor-down-shift",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Primary>", 0,
+    "cursor-down-primary",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Alt>", 0,
+    "cursor-down-alt",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Shift><Primary>", 0,
+    "cursor-down-shift-primary",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Shift><Alt>", 0,
+    "cursor-down-shift-alt",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Primary><Alt>", 0,
+    "cursor-down-primary-alt",
+    N_("Cursor Down") },
+  { GDK_KEY_Down, "<Shift><Primary><Alt>", 0,
+    "cursor-down-shift-primary-alt",
+    N_("Cursor Down") },
+
+  { GDK_KEY_Left, NULL, 0,
+    "cursor-left",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Shift>", 0,
+    "cursor-left-shift",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Primary>", 0,
+    "cursor-left-primary",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Alt>", 0,
+    "cursor-left-alt",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Shift><Primary>", 0,
+    "cursor-left-shift-primary",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Shift><Alt>", 0,
+    "cursor-left-shift-alt",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Primary><Alt>", 0,
+    "cursor-left-primary-alt",
+    N_("Cursor Left") },
+  { GDK_KEY_Left, "<Shift><Primary><Alt>", 0,
+    "cursor-left-shift-primary-alt",
+    N_("Cursor Left") },
+
+  { GDK_KEY_Right, NULL, 0,
+    "cursor-right",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Shift>", 0,
+    "cursor-right-shift",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Primary>", 0,
+    "cursor-right-primary",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Alt>", 0,
+    "cursor-right-alt",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Shift><Primary>", 0,
+    "cursor-right-shift-primary",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Shift><Alt>", 0,
+    "cursor-right-shift-alt",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Primary><Alt>", 0,
+    "cursor-right-primary-alt",
+    N_("Cursor Right") },
+  { GDK_KEY_Right, "<Shift><Primary><Alt>", 0,
+    "cursor-right-shift-primary-alt",
+    N_("Cursor Right") }
+};
+
+
+static void
+gimp_controller_keyboard_class_init (GimpControllerKeyboardClass *klass)
+{
+  GObjectClass        *object_class     = G_OBJECT_CLASS (klass);
+  GimpControllerClass *controller_class = GIMP_CONTROLLER_CLASS (klass);
+
+  object_class->constructed         = gimp_controller_keyboard_constructed;
+
+  controller_class->name            = _("Keyboard");
+  controller_class->help_id         = GIMP_HELP_CONTROLLER_KEYBOARD;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_KEYBOARD;
+
+  controller_class->get_n_events    = gimp_controller_keyboard_get_n_events;
+  controller_class->get_event_name  = gimp_controller_keyboard_get_event_name;
+  controller_class->get_event_blurb = gimp_controller_keyboard_get_event_blurb;
+}
+
+static void
+gimp_controller_keyboard_init (GimpControllerKeyboard *keyboard)
+{
+  static gboolean event_names_initialized = FALSE;
+
+  if (! event_names_initialized)
+    {
+      GdkKeymap *keymap = gdk_keymap_get_default ();
+      gint       i;
+
+      for (i = 0; i < G_N_ELEMENTS (keyboard_events); i++)
+        {
+          KeyboardEvent *kevent = &keyboard_events[i];
+
+          if (kevent->modifier_string)
+            {
+              gtk_accelerator_parse (kevent->modifier_string, NULL,
+                                     &kevent->modifiers);
+              gdk_keymap_map_virtual_modifiers (keymap, &kevent->modifiers);
+            }
+
+          if (kevent->modifiers != 0)
+            {
+              kevent->blurb =
+                g_strdup_printf ("%s (%s)", gettext (kevent->blurb),
+                                 gimp_get_mod_string (kevent->modifiers));
+            }
+          else
+            {
+              kevent->blurb = gettext (kevent->blurb);
+            }
+        }
+
+      event_names_initialized = TRUE;
+    }
+}
+
+static void
+gimp_controller_keyboard_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_object_set (object,
+                "name",  _("Keyboard Events"),
+                "state", _("Ready"),
+                NULL);
+}
+
+static gint
+gimp_controller_keyboard_get_n_events (GimpController *controller)
+{
+  return G_N_ELEMENTS (keyboard_events);
+}
+
+static const gchar *
+gimp_controller_keyboard_get_event_name (GimpController *controller,
+                                         gint            event_id)
+{
+  if (event_id < 0 || event_id >= G_N_ELEMENTS (keyboard_events))
+    return NULL;
+
+  return keyboard_events[event_id].name;
+}
+
+static const gchar *
+gimp_controller_keyboard_get_event_blurb (GimpController *controller,
+                                          gint            event_id)
+{
+  if (event_id < 0 || event_id >= G_N_ELEMENTS (keyboard_events))
+    return NULL;
+
+  return keyboard_events[event_id].blurb;
+}
+
+gboolean
+gimp_controller_keyboard_key_press (GimpControllerKeyboard *keyboard,
+                                    const GdkEventKey      *kevent)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_CONTROLLER_KEYBOARD (keyboard), FALSE);
+  g_return_val_if_fail (kevent != NULL, FALSE);
+
+  /*  start with the last event because the last ones in the
+   *  up,down,left,right groups have the most keyboard modifiers
+   */
+  for (i = G_N_ELEMENTS (keyboard_events) - 1; i >= 0; i--)
+    {
+      if (keyboard_events[i].keyval == kevent->keyval &&
+          (keyboard_events[i].modifiers & kevent->state) ==
+          keyboard_events[i].modifiers)
+        {
+          GimpControllerEvent         controller_event;
+          GimpControllerEventTrigger *trigger;
+
+          trigger = (GimpControllerEventTrigger *) &controller_event;
+
+          trigger->type     = GIMP_CONTROLLER_EVENT_TRIGGER;
+          trigger->source   = GIMP_CONTROLLER (keyboard);
+          trigger->event_id = i;
+
+          return gimp_controller_event (GIMP_CONTROLLER (keyboard),
+                                        &controller_event);
+        }
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpcontrollerkeyboard.h b/app/widgets/gimpcontrollerkeyboard.h
new file mode 100644
index 0000000..f17d0a1
--- /dev/null
+++ b/app/widgets/gimpcontrollerkeyboard.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollerkeyboard.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLER_KEYBOARD_H__
+#define __GIMP_CONTROLLER_KEYBOARD_H__
+
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+
+#define GIMP_TYPE_CONTROLLER_KEYBOARD            (gimp_controller_keyboard_get_type ())
+#define GIMP_CONTROLLER_KEYBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_KEYBOARD, GimpControllerKeyboard))
+#define GIMP_CONTROLLER_KEYBOARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_KEYBOARD, GimpControllerKeyboardClass))
+#define GIMP_IS_CONTROLLER_KEYBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTROLLER_KEYBOARD))
+#define GIMP_IS_CONTROLLER_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTROLLER_KEYBOARD))
+#define GIMP_CONTROLLER_KEYBOARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTROLLER_KEYBOARD, GimpControllerKeyboardClass))
+
+
+typedef struct _GimpControllerKeyboardClass GimpControllerKeyboardClass;
+
+struct _GimpControllerKeyboard
+{
+  GimpController parent_instance;
+};
+
+struct _GimpControllerKeyboardClass
+{
+  GimpControllerClass parent_class;
+};
+
+
+GType      gimp_controller_keyboard_get_type  (void) G_GNUC_CONST;
+
+gboolean   gimp_controller_keyboard_key_press (GimpControllerKeyboard *keyboard,
+                                               const GdkEventKey      *kevent);
+
+
+#endif /* __GIMP_CONTROLLER_KEYBOARD_H__ */
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
new file mode 100644
index 0000000..0d36fd7
--- /dev/null
+++ b/app/widgets/gimpcontrollerlist.c
@@ -0,0 +1,719 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontrollerlist.c
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpcontrollereditor.h"
+#include "gimpcontrollerlist.h"
+#include "gimpcontrollerinfo.h"
+#include "gimpcontrollerkeyboard.h"
+#include "gimpcontrollermouse.h"
+#include "gimpcontrollerwheel.h"
+#include "gimpcontrollers.h"
+#include "gimpdialogfactory.h"
+#include "gimphelp-ids.h"
+#include "gimpmessagebox.h"
+#include "gimpmessagedialog.h"
+#include "gimppropwidgets.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+enum
+{
+  COLUMN_ICON,
+  COLUMN_NAME,
+  COLUMN_TYPE,
+  N_COLUMNS
+};
+
+
+static void gimp_controller_list_constructed     (GObject            *object);
+static void gimp_controller_list_finalize        (GObject            *object);
+static void gimp_controller_list_set_property    (GObject            *object,
+                                                  guint               property_id,
+                                                  const GValue       *value,
+                                                  GParamSpec         *pspec);
+static void gimp_controller_list_get_property    (GObject            *object,
+                                                  guint               property_id,
+                                                  GValue             *value,
+                                                  GParamSpec         *pspec);
+
+static void gimp_controller_list_src_sel_changed (GtkTreeSelection   *sel,
+                                                  GimpControllerList *list);
+static void gimp_controller_list_row_activated   (GtkTreeView        *tv,
+                                                  GtkTreePath        *path,
+                                                  GtkTreeViewColumn  *column,
+                                                  GimpControllerList *list);
+
+static void gimp_controller_list_select_item     (GimpContainerView  *view,
+                                                  GimpViewable       *viewable,
+                                                  gpointer            insert_data,
+                                                  GimpControllerList *list);
+static void gimp_controller_list_activate_item   (GimpContainerView  *view,
+                                                  GimpViewable       *viewable,
+                                                  gpointer            insert_data,
+                                                  GimpControllerList *list);
+
+static void gimp_controller_list_add_clicked     (GtkWidget          *button,
+                                                  GimpControllerList *list);
+static void gimp_controller_list_remove_clicked  (GtkWidget          *button,
+                                                  GimpControllerList *list);
+
+static void gimp_controller_list_edit_clicked    (GtkWidget          *button,
+                                                  GimpControllerList *list);
+static void gimp_controller_list_edit_destroy    (GtkWidget          *widget,
+                                                  GimpControllerInfo *info);
+static void gimp_controller_list_up_clicked      (GtkWidget          *button,
+                                                  GimpControllerList *list);
+static void gimp_controller_list_down_clicked    (GtkWidget          *button,
+                                                  GimpControllerList *list);
+
+
+G_DEFINE_TYPE (GimpControllerList, gimp_controller_list, GTK_TYPE_BOX)
+
+#define parent_class gimp_controller_list_parent_class
+
+
+static void
+gimp_controller_list_class_init (GimpControllerListClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_controller_list_constructed;
+  object_class->finalize     = gimp_controller_list_finalize;
+  object_class->set_property = gimp_controller_list_set_property;
+  object_class->get_property = gimp_controller_list_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_controller_list_init (GimpControllerList *list)
+{
+  GtkWidget         *hbox;
+  GtkWidget         *sw;
+  GtkWidget         *tv;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer   *cell;
+  GtkWidget         *vbox;
+  GtkWidget         *image;
+  GtkIconSize        icon_size;
+  gint               icon_width;
+  gint               icon_height;
+  GType             *controller_types;
+  guint              n_controller_types;
+  gint               i;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (list),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  list->gimp = NULL;
+
+  list->hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (list), hbox, TRUE, TRUE, 0);
+  gtk_widget_show (hbox);
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0);
+  gtk_widget_show (sw);
+
+  list->src = gtk_list_store_new (N_COLUMNS,
+                                  G_TYPE_STRING,
+                                  G_TYPE_STRING,
+                                  G_TYPE_GTYPE);
+  tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list->src));
+  g_object_unref (list->src);
+
+  gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tv), FALSE);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Available Controllers"));
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column);
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, cell, FALSE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "icon-name", COLUMN_ICON,
+                                       NULL);
+
+  g_object_get (cell, "stock-size", &icon_size, NULL);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text", COLUMN_NAME,
+                                       NULL);
+
+  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_widget_show (tv);
+
+  g_signal_connect_object (tv, "row-activated",
+                           G_CALLBACK (gimp_controller_list_row_activated),
+                           G_OBJECT (list), 0);
+
+  list->src_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
+  gtk_tree_selection_set_mode (list->src_sel, GTK_SELECTION_BROWSE);
+
+  g_signal_connect_object (list->src_sel, "changed",
+                           G_CALLBACK (gimp_controller_list_src_sel_changed),
+                           G_OBJECT (list), 0);
+
+  controller_types = g_type_children (GIMP_TYPE_CONTROLLER,
+                                      &n_controller_types);
+
+  for (i = 0; i < n_controller_types; i++)
+    {
+      GimpControllerClass *controller_class;
+      GtkTreeIter          iter;
+
+      controller_class = g_type_class_ref (controller_types[i]);
+
+      gtk_list_store_append (list->src, &iter);
+      gtk_list_store_set (list->src, &iter,
+                          COLUMN_ICON, controller_class->icon_name,
+                          COLUMN_NAME, controller_class->name,
+                          COLUMN_TYPE, controller_types[i],
+                          -1);
+
+      g_type_class_unref (controller_class);
+    }
+
+  g_free (controller_types);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  list->add_button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), list->add_button, TRUE, FALSE, 0);
+  gtk_widget_set_sensitive (list->add_button, FALSE);
+  gtk_widget_show (list->add_button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_NEXT,
+                                        GTK_ICON_SIZE_BUTTON);
+  gtk_container_add (GTK_CONTAINER (list->add_button), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (list->add_button, "clicked",
+                    G_CALLBACK (gimp_controller_list_add_clicked),
+                    list);
+
+  g_object_add_weak_pointer (G_OBJECT (list->add_button),
+                             (gpointer) &list->add_button);
+
+  list->remove_button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), list->remove_button, TRUE, FALSE, 0);
+  gtk_widget_set_sensitive (list->remove_button, FALSE);
+  gtk_widget_show (list->remove_button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_GO_PREVIOUS,
+                                        GTK_ICON_SIZE_BUTTON);
+  gtk_container_add (GTK_CONTAINER (list->remove_button), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (list->remove_button, "clicked",
+                    G_CALLBACK (gimp_controller_list_remove_clicked),
+                    list);
+
+  g_object_add_weak_pointer (G_OBJECT (list->remove_button),
+                             (gpointer) &list->remove_button);
+
+  gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (list)),
+                                     icon_size, &icon_width, &icon_height);
+
+  list->dest = gimp_container_tree_view_new (NULL, NULL, icon_height, 0);
+  gimp_container_tree_view_set_main_column_title (GIMP_CONTAINER_TREE_VIEW (list->dest),
+                                                  _("Active Controllers"));
+  gtk_tree_view_set_headers_visible (GIMP_CONTAINER_TREE_VIEW (list->dest)->view,
+                                     TRUE);
+  gtk_box_pack_start (GTK_BOX (list->hbox), list->dest, TRUE, TRUE, 0);
+  gtk_widget_show (list->dest);
+
+  g_signal_connect_object (list->dest, "select-item",
+                           G_CALLBACK (gimp_controller_list_select_item),
+                           G_OBJECT (list), 0);
+  g_signal_connect_object (list->dest, "activate-item",
+                           G_CALLBACK (gimp_controller_list_activate_item),
+                           G_OBJECT (list), 0);
+
+  list->edit_button =
+    gimp_editor_add_button (GIMP_EDITOR (list->dest),
+                            GIMP_ICON_DOCUMENT_PROPERTIES,
+                            _("Configure the selected controller"),
+                            NULL,
+                            G_CALLBACK (gimp_controller_list_edit_clicked),
+                            NULL,
+                            G_OBJECT (list));
+  list->up_button =
+    gimp_editor_add_button (GIMP_EDITOR (list->dest),
+                            GIMP_ICON_GO_UP,
+                            _("Move the selected controller up"),
+                            NULL,
+                            G_CALLBACK (gimp_controller_list_up_clicked),
+                            NULL,
+                            G_OBJECT (list));
+  list->down_button =
+    gimp_editor_add_button (GIMP_EDITOR (list->dest),
+                            GIMP_ICON_GO_DOWN,
+                            _("Move the selected controller down"),
+                            NULL,
+                            G_CALLBACK (gimp_controller_list_down_clicked),
+                            NULL,
+                            G_OBJECT (list));
+
+  gtk_widget_set_sensitive (list->edit_button, FALSE);
+  gtk_widget_set_sensitive (list->up_button,   FALSE);
+  gtk_widget_set_sensitive (list->down_button, FALSE);
+}
+
+static void
+gimp_controller_list_constructed (GObject *object)
+{
+  GimpControllerList *list = GIMP_CONTROLLER_LIST (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (list->gimp));
+
+  gimp_container_view_set_container (GIMP_CONTAINER_VIEW (list->dest),
+                                     gimp_controllers_get_list (list->gimp));
+
+  gimp_container_view_set_context (GIMP_CONTAINER_VIEW (list->dest),
+                                   gimp_get_user_context (list->gimp));
+}
+
+static void
+gimp_controller_list_finalize (GObject *object)
+{
+  GimpControllerList *list = GIMP_CONTROLLER_LIST (object);
+
+  g_clear_object (&list->gimp);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_controller_list_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpControllerList *list = GIMP_CONTROLLER_LIST (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      list->gimp = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_controller_list_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpControllerList *list = GIMP_CONTROLLER_LIST (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, list->gimp);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_controller_list_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_CONTROLLER_LIST,
+                       "gimp", gimp,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_controller_list_src_sel_changed (GtkTreeSelection   *sel,
+                                      GimpControllerList *list)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gchar        *tip = NULL;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      gchar *name;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_NAME, &name,
+                          COLUMN_TYPE, &list->src_gtype,
+                          -1);
+
+      if (list->add_button)
+        {
+          tip =
+            g_strdup_printf (_("Add '%s' to the list of active controllers"),
+                             name);
+          gtk_widget_set_sensitive (list->add_button, TRUE);
+        }
+
+      g_free (name);
+    }
+  else
+    {
+      if (list->add_button)
+        gtk_widget_set_sensitive (list->add_button, FALSE);
+    }
+
+  if (list->add_button)
+    {
+      gimp_help_set_help_data (list->add_button, tip, NULL);
+      g_free (tip);
+    }
+}
+
+static void
+gimp_controller_list_row_activated (GtkTreeView        *tv,
+                                    GtkTreePath        *path,
+                                    GtkTreeViewColumn  *column,
+                                    GimpControllerList *list)
+{
+  if (gtk_widget_is_sensitive (list->add_button))
+    gtk_button_clicked (GTK_BUTTON (list->add_button));
+}
+
+static void
+gimp_controller_list_select_item (GimpContainerView  *view,
+                                  GimpViewable       *viewable,
+                                  gpointer            insert_data,
+                                  GimpControllerList *list)
+{
+  gboolean selected;
+
+  list->dest_info = GIMP_CONTROLLER_INFO (viewable);
+
+  selected = GIMP_IS_CONTROLLER_INFO (list->dest_info);
+
+  if (list->remove_button)
+    {
+      GimpObject *object = GIMP_OBJECT (list->dest_info);
+      gchar      *tip    = NULL;
+
+      gtk_widget_set_sensitive (list->remove_button, selected);
+
+      if (selected)
+        tip =
+          g_strdup_printf (_("Remove '%s' from the list of active controllers"),
+                           gimp_object_get_name (object));
+
+      gimp_help_set_help_data (list->remove_button, tip, NULL);
+      g_free (tip);
+    }
+
+  gtk_widget_set_sensitive (list->edit_button, selected);
+  gtk_widget_set_sensitive (list->up_button,   selected);
+  gtk_widget_set_sensitive (list->down_button, selected);
+}
+
+static void
+gimp_controller_list_activate_item (GimpContainerView  *view,
+                                    GimpViewable       *viewable,
+                                    gpointer            insert_data,
+                                    GimpControllerList *list)
+{
+  if (gtk_widget_is_sensitive (list->edit_button))
+    gtk_button_clicked (GTK_BUTTON (list->edit_button));
+}
+
+static void
+gimp_controller_list_add_clicked (GtkWidget          *button,
+                                  GimpControllerList *list)
+{
+  GimpControllerInfo *info;
+  GimpContainer      *container;
+
+  if (list->src_gtype == GIMP_TYPE_CONTROLLER_KEYBOARD &&
+      gimp_controllers_get_keyboard (list->gimp) != NULL)
+    {
+      gimp_message_literal (list->gimp,
+                            G_OBJECT (button), GIMP_MESSAGE_WARNING,
+                            _("There can only be one active keyboard "
+                              "controller.\n\n"
+                              "You already have a keyboard controller in "
+                              "your list of active controllers."));
+      return;
+    }
+  else if (list->src_gtype == GIMP_TYPE_CONTROLLER_WHEEL &&
+           gimp_controllers_get_wheel (list->gimp) != NULL)
+    {
+      gimp_message_literal (list->gimp,
+                            G_OBJECT (button), GIMP_MESSAGE_WARNING,
+                            _("There can only be one active wheel "
+                              "controller.\n\n"
+                              "You already have a wheel controller in "
+                              "your list of active controllers."));
+      return;
+    }
+  else if (list->src_gtype == GIMP_TYPE_CONTROLLER_MOUSE &&
+           gimp_controllers_get_mouse (list->gimp) != NULL)
+    {
+      gimp_message_literal (list->gimp,
+                            G_OBJECT (button), GIMP_MESSAGE_WARNING,
+                            _("There can only be one active mouse "
+                              "controller.\n\n"
+                              "You already have a mouse controller in "
+                              "your list of active controllers."));
+      return;
+    }
+
+  info = gimp_controller_info_new (list->src_gtype);
+  container = gimp_controllers_get_list (list->gimp);
+  gimp_container_add (container, GIMP_OBJECT (info));
+  g_object_unref (info);
+
+  gimp_container_view_select_item (GIMP_CONTAINER_VIEW (list->dest),
+                                   GIMP_VIEWABLE (info));
+  gimp_controller_list_edit_clicked (list->edit_button, list);
+}
+
+static void
+gimp_controller_list_remove_clicked (GtkWidget          *button,
+                                     GimpControllerList *list)
+{
+  GtkWidget   *dialog;
+  const gchar *name;
+
+#define RESPONSE_DISABLE 1
+
+  dialog = gimp_message_dialog_new (_("Remove Controller?"),
+                                    GIMP_ICON_DIALOG_WARNING,
+                                    GTK_WIDGET (list), GTK_DIALOG_MODAL,
+                                    NULL, NULL,
+
+                                    _("_Disable Controller"), RESPONSE_DISABLE,
+                                    _("_Cancel"),             GTK_RESPONSE_CANCEL,
+                                    _("_Remove Controller"),  GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           RESPONSE_DISABLE,
+                                           -1);
+
+  name = gimp_object_get_name (list->dest_info);
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Remove Controller '%s'?"), name);
+
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             "%s",
+                             _("Removing this controller from the list of "
+                               "active controllers will permanently delete "
+                               "all event mappings you have configured.\n\n"
+                               "Selecting \"Disable Controller\" will disable "
+                               "the controller without removing it."));
+
+  switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
+    {
+    case RESPONSE_DISABLE:
+      gimp_controller_info_set_enabled (list->dest_info, FALSE);
+      break;
+
+    case GTK_RESPONSE_OK:
+      {
+        GtkWidget     *editor_dialog;
+        GimpContainer *container;
+
+        editor_dialog = g_object_get_data (G_OBJECT (list->dest_info),
+                                           "gimp-controller-editor-dialog");
+
+        if (editor_dialog)
+          gtk_dialog_response (GTK_DIALOG (editor_dialog),
+                               GTK_RESPONSE_DELETE_EVENT);
+
+        container = gimp_controllers_get_list (list->gimp);
+        gimp_container_remove (container, GIMP_OBJECT (list->dest_info));
+      }
+      break;
+
+    default:
+      break;
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+gimp_controller_list_edit_clicked (GtkWidget          *button,
+                                   GimpControllerList *list)
+{
+  GtkWidget *dialog;
+  GtkWidget *editor;
+
+  dialog = g_object_get_data (G_OBJECT (list->dest_info),
+                              "gimp-controller-editor-dialog");
+
+  if (dialog)
+    {
+      gtk_window_present (GTK_WINDOW (dialog));
+      return;
+    }
+
+  dialog = gimp_dialog_new (_("Configure Input Controller"),
+                            "gimp-controller-editor-dialog",
+                            gtk_widget_get_toplevel (GTK_WIDGET (list)),
+                            GTK_DIALOG_DESTROY_WITH_PARENT,
+                            gimp_standard_help_func,
+                            GIMP_HELP_PREFS_INPUT_CONTROLLERS,
+
+                            _("_Close"), GTK_RESPONSE_CLOSE,
+
+                            NULL);
+
+  gimp_dialog_factory_add_foreign (gimp_dialog_factory_get_singleton (),
+                                   "gimp-controller-editor-dialog",
+                                   dialog,
+                                   gtk_widget_get_screen (button),
+                                   gimp_widget_get_monitor (button));
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+
+  editor = gimp_controller_editor_new (list->dest_info,
+                                       gimp_get_user_context (list->gimp));
+  gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+  g_object_set_data (G_OBJECT (list->dest_info), "gimp-controller-editor-dialog",
+                     dialog);
+
+  g_signal_connect_object (dialog, "destroy",
+                           G_CALLBACK (gimp_controller_list_edit_destroy),
+                           G_OBJECT (list->dest_info), 0);
+
+  g_signal_connect_object (list, "destroy",
+                           G_CALLBACK (gtk_widget_destroy),
+                           G_OBJECT (dialog),
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (list, "unmap",
+                           G_CALLBACK (gtk_widget_destroy),
+                           G_OBJECT (dialog),
+                           G_CONNECT_SWAPPED);
+
+  gtk_widget_show (dialog);
+}
+
+static void
+gimp_controller_list_edit_destroy (GtkWidget          *widget,
+                                   GimpControllerInfo *info)
+{
+  g_object_set_data (G_OBJECT (info), "gimp-controller-editor-dialog", NULL);
+}
+
+static void
+gimp_controller_list_up_clicked (GtkWidget          *button,
+                                 GimpControllerList *list)
+{
+  GimpContainer *container;
+  gint           index;
+
+  container = gimp_controllers_get_list (list->gimp);
+
+  index = gimp_container_get_child_index (container,
+                                          GIMP_OBJECT (list->dest_info));
+
+  if (index > 0)
+    gimp_container_reorder (container, GIMP_OBJECT (list->dest_info),
+                            index - 1);
+}
+
+static void
+gimp_controller_list_down_clicked (GtkWidget          *button,
+                                   GimpControllerList *list)
+{
+  GimpContainer *container;
+  gint           index;
+
+  container = gimp_controllers_get_list (list->gimp);
+
+  index = gimp_container_get_child_index (container,
+                                          GIMP_OBJECT (list->dest_info));
+
+  if (index < gimp_container_get_n_children (container) - 1)
+    gimp_container_reorder (container, GIMP_OBJECT (list->dest_info),
+                            index + 1);
+}
diff --git a/app/widgets/gimpcontrollerlist.h b/app/widgets/gimpcontrollerlist.h
new file mode 100644
index 0000000..7ba996f
--- /dev/null
+++ b/app/widgets/gimpcontrollerlist.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontrollerlist.h
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLER_LIST_H__
+#define __GIMP_CONTROLLER_LIST_H__
+
+
+#define GIMP_TYPE_CONTROLLER_LIST            (gimp_controller_list_get_type ())
+#define GIMP_CONTROLLER_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_LIST, GimpControllerList))
+#define GIMP_CONTROLLER_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_LIST, GimpControllerListClass))
+#define GIMP_IS_CONTROLLER_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTROLLER_LIST))
+#define GIMP_IS_CONTROLLER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTROLLER_LIST))
+#define GIMP_CONTROLLER_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTROLLER_LIST, GimpControllerListClass))
+
+
+typedef struct _GimpControllerListClass GimpControllerListClass;
+
+struct _GimpControllerList
+{
+  GtkBox              parent_instance;
+
+  Gimp               *gimp;
+
+  GtkWidget          *hbox;
+
+  GtkListStore       *src;
+  GtkTreeSelection   *src_sel;
+  GType               src_gtype;
+
+  GtkWidget          *dest;
+  GimpControllerInfo *dest_info;
+
+  GtkWidget          *add_button;
+  GtkWidget          *remove_button;
+  GtkWidget          *edit_button;
+  GtkWidget          *up_button;
+  GtkWidget          *down_button;
+};
+
+struct _GimpControllerListClass
+{
+  GtkBoxClass   parent_class;
+};
+
+
+GType       gimp_controller_list_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_controller_list_new      (Gimp *gimp);
+
+
+#endif  /*  __GIMP_CONTROLLER_LIST_H__  */
diff --git a/app/widgets/gimpcontrollermouse.c b/app/widgets/gimpcontrollermouse.c
new file mode 100644
index 0000000..c2cd4d0
--- /dev/null
+++ b/app/widgets/gimpcontrollermouse.c
@@ -0,0 +1,315 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollermouse.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2011 Mikael Magnusson <mikachu@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#undef GDK_MULTIHEAD_SAFE /* for gdk_keymap_get_default() */
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpcontrollermouse.h"
+#include "gimphelp-ids.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _MouseEvent MouseEvent;
+
+struct _MouseEvent
+{
+  const guint      button;
+  const gchar     *modifier_string;
+  GdkModifierType  modifiers;
+  const gchar     *name;
+  const gchar     *blurb;
+};
+
+
+static void          gimp_controller_mouse_constructed     (GObject        *object);
+
+static gint          gimp_controller_mouse_get_n_events    (GimpController *controller);
+static const gchar * gimp_controller_mouse_get_event_name  (GimpController *controller,
+                                                            gint            event_id);
+static const gchar * gimp_controller_mouse_get_event_blurb (GimpController *controller,
+                                                            gint            event_id);
+
+
+G_DEFINE_TYPE (GimpControllerMouse, gimp_controller_mouse,
+               GIMP_TYPE_CONTROLLER)
+
+#define parent_class gimp_controller_mouse_parent_class
+
+
+static MouseEvent mouse_events[] =
+{
+  { 8, NULL, 0,
+    "8",
+    N_("Button 8") },
+  { 8, "<Shift>", 0,
+    "8-shift",
+    N_("Button 8") },
+  { 8, "<Primary>", 0,
+    "8-primary",
+    N_("Button 8") },
+  { 8, "<Alt>", 0,
+    "8-alt",
+    N_("Button 8") },
+  { 8, "<Shift><Primary>", 0,
+    "8-shift-primary",
+    N_("Button 8") },
+  { 8, "<Shift><Alt>", 0,
+    "8-shift-alt",
+    N_("Button 8") },
+  { 8, "<Primary><Alt>", 0,
+    "8-primary-alt",
+    N_("Button 8") },
+  { 8, "<Shift><Primary><Alt>", 0,
+    "8-shift-primary-alt",
+    N_("Button 8") },
+
+  { 9, NULL, 0,
+    "9",
+    N_("Button 9") },
+  { 9, "<Shift>", 0,
+    "9-shift",
+    N_("Button 9") },
+  { 9, "<Primary>", 0,
+    "9-primary",
+    N_("Button 9") },
+  { 9, "<Alt>", 0,
+    "9-alt",
+    N_("Button 9") },
+  { 9, "<Shift><Primary>", 0,
+    "9-shift-primary",
+    N_("Button 9") },
+  { 9, "<Shift><Alt>", 0,
+    "9-shift-alt",
+    N_("Button 9") },
+  { 9, "<Primary><Alt>", 0,
+    "9-primary-alt",
+    N_("Button 9") },
+  { 9, "<Shift><Primary><Alt>", 0,
+    "9-shift-primary-alt",
+    N_("Button 9") },
+
+  { 10, NULL, 0,
+    "10",
+    N_("Button 10") },
+  { 10, "<Shift>", 0,
+    "10-shift",
+    N_("Button 10") },
+  { 10, "<Primary>", 0,
+    "10-primary",
+    N_("Button 10") },
+  { 10, "<Alt>", 0,
+    "10-alt",
+    N_("Button 10") },
+  { 10, "<Shift><Primary>", 0,
+    "10-shift-primary",
+    N_("Button 10") },
+  { 10, "<Shift><Alt>", 0,
+    "10-shift-alt",
+    N_("Button 10") },
+  { 10, "<Primary><Alt>", 0,
+    "10-primary-alt",
+    N_("Button 10") },
+  { 10, "<Shift><Primary><Alt>", 0,
+    "10-shift-primary-alt",
+    N_("Button 10") },
+
+  { 11, NULL, 0,
+    "11",
+    N_("Button 11") },
+  { 11, "<Shift>", 0,
+    "11-shift",
+    N_("Button 11") },
+  { 11, "<Primary>", 0,
+    "11-primary",
+    N_("Button 11") },
+  { 11, "<Alt>", 0,
+    "11-alt",
+    N_("Button 11") },
+  { 11, "<Shift><Primary>", 0,
+    "11-shift-primary",
+    N_("Button 11") },
+  { 11, "<Shift><Alt>", 0,
+    "11-shift-alt",
+    N_("Button 11") },
+  { 11, "<Primary><Alt>", 0,
+    "11-primary-alt",
+    N_("Button 11") },
+  { 11, "<Shift><Primary><Alt>", 0,
+    "11-shift-primary-alt",
+    N_("Button 11") },
+
+  { 12, NULL, 0,
+    "12",
+    N_("Button 12") },
+  { 12, "<Shift>", 0,
+    "12-shift",
+    N_("Button 12") },
+  { 12, "<Primary>", 0,
+    "12-primary",
+    N_("Button 12") },
+  { 12, "<Alt>", 0,
+    "12-alt",
+    N_("Button 12") },
+  { 12, "<Shift><Primary>", 0,
+    "12-shift-primary",
+    N_("Button 12") },
+  { 12, "<Shift><Alt>", 0,
+    "12-shift-alt",
+    N_("Button 12") },
+  { 12, "<Primary><Alt>", 0,
+    "12-primary-alt",
+    N_("Button 12") },
+  { 12, "<Shift><Primary><Alt>", 0,
+    "12-shift-primary-alt",
+    N_("Button 12") },
+};
+
+
+static void
+gimp_controller_mouse_class_init (GimpControllerMouseClass *klass)
+{
+  GObjectClass        *object_class     = G_OBJECT_CLASS (klass);
+  GimpControllerClass *controller_class = GIMP_CONTROLLER_CLASS (klass);
+
+  object_class->constructed         = gimp_controller_mouse_constructed;
+
+  controller_class->name            = _("Mouse Buttons");
+  controller_class->help_id         = GIMP_HELP_CONTROLLER_MOUSE;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_MOUSE;
+
+  controller_class->get_n_events    = gimp_controller_mouse_get_n_events;
+  controller_class->get_event_name  = gimp_controller_mouse_get_event_name;
+  controller_class->get_event_blurb = gimp_controller_mouse_get_event_blurb;
+}
+
+static void
+gimp_controller_mouse_init (GimpControllerMouse *mouse)
+{
+  static gboolean event_names_initialized = FALSE;
+
+  if (! event_names_initialized)
+    {
+      GdkKeymap *keymap = gdk_keymap_get_default ();
+      gint       i;
+
+      for (i = 0; i < G_N_ELEMENTS (mouse_events); i++)
+        {
+          MouseEvent *mevent = &mouse_events[i];
+
+          if (mevent->modifier_string)
+            {
+              gtk_accelerator_parse (mevent->modifier_string, NULL,
+                                     &mevent->modifiers);
+              gdk_keymap_map_virtual_modifiers (keymap, &mevent->modifiers);
+            }
+
+          if (mevent->modifiers != 0)
+            {
+              mevent->blurb =
+                g_strdup_printf ("%s (%s)", gettext (mevent->blurb),
+                                 gimp_get_mod_string (mevent->modifiers));
+            }
+        }
+
+      event_names_initialized = TRUE;
+    }
+}
+
+static void
+gimp_controller_mouse_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_object_set (object,
+                "name",  _("Mouse Button Events"),
+                "state", _("Ready"),
+                NULL);
+}
+
+static gint
+gimp_controller_mouse_get_n_events (GimpController *controller)
+{
+  return G_N_ELEMENTS (mouse_events);
+}
+
+static const gchar *
+gimp_controller_mouse_get_event_name (GimpController *controller,
+                                      gint            event_id)
+{
+  if (event_id < 0 || event_id >= G_N_ELEMENTS (mouse_events))
+    return NULL;
+
+  return mouse_events[event_id].name;
+}
+
+static const gchar *
+gimp_controller_mouse_get_event_blurb (GimpController *controller,
+                                       gint            event_id)
+{
+  if (event_id < 0 || event_id >= G_N_ELEMENTS (mouse_events))
+    return NULL;
+
+  return mouse_events[event_id].blurb;
+}
+
+gboolean
+gimp_controller_mouse_button (GimpControllerMouse  *mouse,
+                              const GdkEventButton *bevent)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_CONTROLLER_MOUSE (mouse), FALSE);
+  g_return_val_if_fail (bevent != NULL, FALSE);
+
+  /*  start with the last event because the last ones in the
+   *  up,down,left,right groups have the most keyboard modifiers
+   */
+  for (i = G_N_ELEMENTS (mouse_events) - 1; i >= 0; i--)
+    {
+      if (mouse_events[i].button == bevent->button &&
+          (mouse_events[i].modifiers & bevent->state) ==
+          mouse_events[i].modifiers)
+        {
+          GimpControllerEvent         controller_event;
+          GimpControllerEventTrigger *trigger;
+
+          trigger = (GimpControllerEventTrigger *) &controller_event;
+
+          trigger->type     = GIMP_CONTROLLER_EVENT_TRIGGER;
+          trigger->source   = GIMP_CONTROLLER (mouse);
+          trigger->event_id = i;
+
+          return gimp_controller_event (GIMP_CONTROLLER (mouse),
+                                        &controller_event);
+        }
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpcontrollermouse.h b/app/widgets/gimpcontrollermouse.h
new file mode 100644
index 0000000..743cc6b
--- /dev/null
+++ b/app/widgets/gimpcontrollermouse.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollermouse.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2011 Mikael Magnusson <mikachu@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLER_MOUSE_H__
+#define __GIMP_CONTROLLER_MOUSE_H__
+
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+
+#define GIMP_TYPE_CONTROLLER_MOUSE            (gimp_controller_mouse_get_type ())
+#define GIMP_CONTROLLER_MOUSE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_MOUSE, GimpControllerMouse))
+#define GIMP_CONTROLLER_MOUSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_MOUSE, GimpControllerMouseClass))
+#define GIMP_IS_CONTROLLER_MOUSE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTROLLER_MOUSE))
+#define GIMP_IS_CONTROLLER_MOUSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTROLLER_MOUSE))
+#define GIMP_CONTROLLER_MOUSE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTROLLER_MOUSE, GimpControllerMouseClass))
+
+
+typedef struct _GimpControllerMouseClass GimpControllerMouseClass;
+
+struct _GimpControllerMouse
+{
+  GimpController parent_instance;
+};
+
+struct _GimpControllerMouseClass
+{
+  GimpControllerClass parent_class;
+};
+
+
+GType      gimp_controller_mouse_get_type (void) G_GNUC_CONST;
+
+gboolean   gimp_controller_mouse_button   (GimpControllerMouse  *mouse,
+                                           const GdkEventButton *bevent);
+
+
+#endif /* __GIMP_CONTROLLER_MOUSE_H__ */
diff --git a/app/widgets/gimpcontrollers.c b/app/widgets/gimpcontrollers.c
new file mode 100644
index 0000000..3a4b921
--- /dev/null
+++ b/app/widgets/gimpcontrollers.c
@@ -0,0 +1,382 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimplist.h"
+
+#include "gimpaction.h"
+#include "gimpactiongroup.h"
+#include "gimpcontrollerinfo.h"
+#include "gimpcontrollers.h"
+#include "gimpcontrollerkeyboard.h"
+#include "gimpcontrollermouse.h"
+#include "gimpcontrollerwheel.h"
+#include "gimpenumaction.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_CONTROLLER_MANAGER_DATA_KEY "gimp-controller-manager"
+
+
+typedef struct _GimpControllerManager GimpControllerManager;
+
+struct _GimpControllerManager
+{
+  GimpContainer  *controllers;
+  GQuark          event_mapped_id;
+  GimpController *mouse;
+  GimpController *wheel;
+  GimpController *keyboard;
+  GimpUIManager  *ui_manager;
+};
+
+
+/*  local function prototypes  */
+
+static GimpControllerManager * gimp_controller_manager_get  (Gimp *gimp);
+static void   gimp_controller_manager_free (GimpControllerManager *manager);
+
+static void   gimp_controllers_add         (GimpContainer         *container,
+                                            GimpControllerInfo    *info,
+                                            GimpControllerManager *manager);
+static void   gimp_controllers_remove      (GimpContainer         *container,
+                                            GimpControllerInfo    *info,
+                                            GimpControllerManager *manager);
+
+static gboolean gimp_controllers_event_mapped (GimpControllerInfo        *info,
+                                               GimpController            *controller,
+                                               const GimpControllerEvent *event,
+                                               const gchar               *action_name,
+                                               GimpControllerManager     *manager);
+
+
+/*  public functions  */
+
+void
+gimp_controllers_init (Gimp *gimp)
+{
+  GimpControllerManager *manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (gimp_controller_manager_get (gimp) == NULL);
+
+  manager = g_slice_new0 (GimpControllerManager);
+
+  g_object_set_data_full (G_OBJECT (gimp),
+                          GIMP_CONTROLLER_MANAGER_DATA_KEY, manager,
+                          (GDestroyNotify) gimp_controller_manager_free);
+
+  manager->controllers = gimp_list_new (GIMP_TYPE_CONTROLLER_INFO, TRUE);
+
+  g_signal_connect (manager->controllers, "add",
+                    G_CALLBACK (gimp_controllers_add),
+                    manager);
+  g_signal_connect (manager->controllers, "remove",
+                    G_CALLBACK (gimp_controllers_remove),
+                    manager);
+
+  manager->event_mapped_id =
+    gimp_container_add_handler (manager->controllers, "event-mapped",
+                                G_CALLBACK (gimp_controllers_event_mapped),
+                                manager);
+
+  g_type_class_ref (GIMP_TYPE_CONTROLLER_MOUSE);
+  g_type_class_ref (GIMP_TYPE_CONTROLLER_WHEEL);
+  g_type_class_ref (GIMP_TYPE_CONTROLLER_KEYBOARD);
+}
+
+void
+gimp_controllers_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (gimp_controller_manager_get (gimp) != NULL);
+
+  g_object_set_data (G_OBJECT (gimp), GIMP_CONTROLLER_MANAGER_DATA_KEY, NULL);
+
+  g_type_class_unref (g_type_class_peek (GIMP_TYPE_CONTROLLER_WHEEL));
+  g_type_class_unref (g_type_class_peek (GIMP_TYPE_CONTROLLER_KEYBOARD));
+}
+
+void
+gimp_controllers_restore (Gimp          *gimp,
+                          GimpUIManager *ui_manager)
+{
+  GimpControllerManager *manager;
+  GFile                 *file;
+  GError                *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GIMP_IS_UI_MANAGER (ui_manager));
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_if_fail (manager != NULL);
+  g_return_if_fail (manager->ui_manager == NULL);
+
+  manager->ui_manager = g_object_ref (ui_manager);
+
+  file = gimp_directory_file ("controllerrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (manager->controllers),
+                                       file, NULL, &error))
+    {
+      if (error->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        {
+          g_clear_error (&error);
+          g_object_unref (file);
+
+          file = gimp_sysconf_directory_file ("controllerrc", NULL);
+
+          if (! gimp_config_deserialize_gfile (GIMP_CONFIG (manager->controllers),
+                                               file, NULL, &error))
+            {
+              gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+                                    error->message);
+            }
+        }
+      else
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+        }
+
+      g_clear_error (&error);
+    }
+
+  gimp_list_reverse (GIMP_LIST (manager->controllers));
+
+  g_object_unref (file);
+}
+
+void
+gimp_controllers_save (Gimp *gimp)
+{
+  const gchar *header =
+    "GIMP controllerrc\n"
+    "\n"
+    "This file will be entirely rewritten each time you exit.";
+  const gchar *footer =
+    "end of controllerrc";
+
+  GimpControllerManager *manager;
+  GFile                 *file;
+  GError                *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_if_fail (manager != NULL);
+
+  file = gimp_directory_file ("controllerrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (manager->controllers),
+                                        file,
+                                        header, footer, NULL,
+                                        &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_error_free (error);
+    }
+
+  g_object_unref (file);
+}
+
+GimpContainer *
+gimp_controllers_get_list (Gimp *gimp)
+{
+  GimpControllerManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_val_if_fail (manager != NULL, NULL);
+
+  return manager->controllers;
+}
+
+GimpUIManager *
+gimp_controllers_get_ui_manager (Gimp *gimp)
+{
+  GimpControllerManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_val_if_fail (manager != NULL, NULL);
+
+  return manager->ui_manager;
+}
+
+GimpController *
+gimp_controllers_get_mouse (Gimp *gimp)
+{
+  GimpControllerManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_val_if_fail (manager != NULL, NULL);
+
+  return manager->mouse;
+}
+
+GimpController *
+gimp_controllers_get_wheel (Gimp *gimp)
+{
+  GimpControllerManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_val_if_fail (manager != NULL, NULL);
+
+  return manager->wheel;
+}
+
+GimpController *
+gimp_controllers_get_keyboard (Gimp *gimp)
+{
+  GimpControllerManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = gimp_controller_manager_get (gimp);
+
+  g_return_val_if_fail (manager != NULL, NULL);
+
+  return manager->keyboard;
+}
+
+
+/*  private functions  */
+
+static GimpControllerManager *
+gimp_controller_manager_get (Gimp *gimp)
+{
+  return g_object_get_data (G_OBJECT (gimp), GIMP_CONTROLLER_MANAGER_DATA_KEY);
+}
+
+static void
+gimp_controller_manager_free (GimpControllerManager *manager)
+{
+  gimp_container_remove_handler (manager->controllers,
+                                 manager->event_mapped_id);
+
+  g_clear_object (&manager->controllers);
+  g_clear_object (&manager->ui_manager);
+
+  g_slice_free (GimpControllerManager, manager);
+}
+
+static void
+gimp_controllers_add (GimpContainer         *container,
+                      GimpControllerInfo    *info,
+                      GimpControllerManager *manager)
+{
+  if (GIMP_IS_CONTROLLER_WHEEL (info->controller))
+    manager->wheel = info->controller;
+  else if (GIMP_IS_CONTROLLER_KEYBOARD (info->controller))
+    manager->keyboard = info->controller;
+  else if (GIMP_IS_CONTROLLER_MOUSE (info->controller))
+    manager->mouse = info->controller;
+}
+
+static void
+gimp_controllers_remove (GimpContainer         *container,
+                         GimpControllerInfo    *info,
+                         GimpControllerManager *manager)
+{
+  if (info->controller == manager->wheel)
+    manager->wheel = NULL;
+  else if (info->controller == manager->keyboard)
+    manager->keyboard = NULL;
+}
+
+static gboolean
+gimp_controllers_event_mapped (GimpControllerInfo        *info,
+                               GimpController            *controller,
+                               const GimpControllerEvent *event,
+                               const gchar               *action_name,
+                               GimpControllerManager     *manager)
+{
+  GList *list;
+
+  for (list = gimp_ui_manager_get_action_groups (manager->ui_manager);
+       list;
+       list = g_list_next (list))
+    {
+      GimpActionGroup *group = list->data;
+      GimpAction      *action;
+
+      action = gimp_action_group_get_action (group, action_name);
+
+      if (action)
+        {
+          switch (event->type)
+            {
+            case GIMP_CONTROLLER_EVENT_VALUE:
+              if (G_VALUE_HOLDS_DOUBLE (&event->value.value) &&
+                  GIMP_IS_ENUM_ACTION (action)               &&
+                  GIMP_ENUM_ACTION (action)->value_variable)
+                {
+                  gdouble value = g_value_get_double (&event->value.value);
+
+                  gimp_action_emit_activate (GIMP_ACTION (action),
+                                             g_variant_new_int32 (value * 1000));
+
+                  break;
+                }
+              /* else fallthru */
+
+            case GIMP_CONTROLLER_EVENT_TRIGGER:
+            default:
+              gimp_action_activate (action);
+              break;
+            }
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpcontrollers.h b/app/widgets/gimpcontrollers.h
new file mode 100644
index 0000000..b4efeeb
--- /dev/null
+++ b/app/widgets/gimpcontrollers.h
@@ -0,0 +1,39 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcontrollers.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLERS_H__
+#define __GIMP_CONTROLLERS_H__
+
+
+void             gimp_controllers_init           (Gimp          *gimp);
+void             gimp_controllers_exit           (Gimp          *gimp);
+
+void             gimp_controllers_restore        (Gimp          *gimp,
+                                                  GimpUIManager *ui_manager);
+void             gimp_controllers_save           (Gimp          *gimp);
+
+GimpContainer  * gimp_controllers_get_list       (Gimp          *gimp);
+GimpUIManager  * gimp_controllers_get_ui_manager (Gimp          *gimp);
+GimpController * gimp_controllers_get_mouse      (Gimp          *gimp);
+GimpController * gimp_controllers_get_wheel      (Gimp          *gimp);
+GimpController * gimp_controllers_get_keyboard   (Gimp          *gimp);
+
+
+#endif /* __GIMP_CONTROLLERS_H__ */
diff --git a/app/widgets/gimpcontrollerwheel.c b/app/widgets/gimpcontrollerwheel.c
new file mode 100644
index 0000000..977543d
--- /dev/null
+++ b/app/widgets/gimpcontrollerwheel.c
@@ -0,0 +1,293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollerwheel.c
+ * Copyright (C) 2004-2015 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#undef GDK_MULTIHEAD_SAFE /* for gdk_keymap_get_default() */
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpcontrollerwheel.h"
+#include "gimphelp-ids.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _WheelEvent WheelEvent;
+
+struct _WheelEvent
+{
+  const GdkScrollDirection  direction;
+  const gchar              *modifier_string;
+  GdkModifierType           modifiers;
+  const gchar              *name;
+  const gchar              *blurb;
+};
+
+
+static void          gimp_controller_wheel_constructed     (GObject        *object);
+
+static gint          gimp_controller_wheel_get_n_events    (GimpController *controller);
+static const gchar * gimp_controller_wheel_get_event_name  (GimpController *controller,
+                                                            gint            event_id);
+static const gchar * gimp_controller_wheel_get_event_blurb (GimpController *controller,
+                                                            gint            event_id);
+
+
+G_DEFINE_TYPE (GimpControllerWheel, gimp_controller_wheel,
+               GIMP_TYPE_CONTROLLER)
+
+#define parent_class gimp_controller_wheel_parent_class
+
+
+static WheelEvent wheel_events[] =
+{
+  { GDK_SCROLL_UP, NULL, 0,
+    "scroll-up",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Shift>", 0,
+    "scroll-up-shift",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Primary>", 0,
+    "scroll-up-primary",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Alt>", 0,
+    "scroll-up-alt",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Shift><Primary>", 0,
+    "scroll-up-shift-primary",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Shift><Alt>", 0,
+    "scroll-up-shift-alt",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Primary><Alt>", 0,
+    "scroll-up-primary-alt",
+    N_("Scroll Up") },
+  { GDK_SCROLL_UP, "<Shift><Primary><Alt>", 0,
+    "scroll-up-shift-primary-alt",
+    N_("Scroll Up") },
+
+  { GDK_SCROLL_DOWN, NULL, 0,
+    "scroll-down",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Shift>", 0,
+    "scroll-down-shift",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Primary>", 0,
+    "scroll-down-primary",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Alt>", 0,
+    "scroll-down-alt",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Shift><Primary>", 0,
+    "scroll-down-shift-primary",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Shift><Alt>", 0,
+    "scroll-down-shift-alt",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Primary><Alt>", 0,
+    "scroll-down-primary-alt",
+    N_("Scroll Down") },
+  { GDK_SCROLL_DOWN, "<Shift><Primary><Alt>", 0,
+    "scroll-down-shift-primary-alt",
+    N_("Scroll Down") },
+
+  { GDK_SCROLL_LEFT, NULL, 0,
+    "scroll-left",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Shift>", 0,
+    "scroll-left-shift",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Primary>", 0,
+    "scroll-left-primary",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Alt>", 0,
+    "scroll-left-alt",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Shift><Primary>", 0,
+    "scroll-left-shift-primary",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Shift><Alt>", 0,
+    "scroll-left-shift-alt",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Primary><Alt>", 0,
+    "scroll-left-primary-alt",
+    N_("Scroll Left") },
+  { GDK_SCROLL_LEFT, "<Shift><Primary><Alt>", 0,
+    "scroll-left-shift-primary-alt",
+    N_("Scroll Left") },
+
+  { GDK_SCROLL_RIGHT, NULL, 0,
+    "scroll-right",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Shift>", 0,
+    "scroll-right-shift",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Primary>", 0,
+    "scroll-right-primary",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Alt>", 0,
+    "scroll-right-alt",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Shift><Primary>", 0,
+    "scroll-right-shift-primary",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Shift><Alt>", 0,
+    "scroll-right-shift-alt",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Primary><Alt>", 0,
+    "scroll-right-primary-alt",
+    N_("Scroll Right") },
+  { GDK_SCROLL_RIGHT, "<Shift><Primary><Alt>", 0,
+    "scroll-right-shift-primary-alt",
+    N_("Scroll Right") }
+};
+
+
+static void
+gimp_controller_wheel_class_init (GimpControllerWheelClass *klass)
+{
+  GObjectClass        *object_class     = G_OBJECT_CLASS (klass);
+  GimpControllerClass *controller_class = GIMP_CONTROLLER_CLASS (klass);
+
+  object_class->constructed         = gimp_controller_wheel_constructed;
+
+  controller_class->name            = _("Mouse Wheel");
+  controller_class->help_id         = GIMP_HELP_CONTROLLER_WHEEL;
+  controller_class->icon_name       = GIMP_ICON_CONTROLLER_WHEEL;
+
+  controller_class->get_n_events    = gimp_controller_wheel_get_n_events;
+  controller_class->get_event_name  = gimp_controller_wheel_get_event_name;
+  controller_class->get_event_blurb = gimp_controller_wheel_get_event_blurb;
+}
+
+static void
+gimp_controller_wheel_init (GimpControllerWheel *wheel)
+{
+  static gboolean events_initialized = FALSE;
+
+  if (! events_initialized)
+    {
+      GdkKeymap *keymap = gdk_keymap_get_default ();
+      gint       i;
+
+      for (i = 0; i < G_N_ELEMENTS (wheel_events); i++)
+        {
+          WheelEvent *wevent = &wheel_events[i];
+
+          if (wevent->modifier_string)
+            {
+              gtk_accelerator_parse (wevent->modifier_string, NULL,
+                                     &wevent->modifiers);
+              gdk_keymap_map_virtual_modifiers (keymap, &wevent->modifiers);
+            }
+
+          if (wevent->modifiers != 0)
+            {
+              wevent->blurb =
+                g_strdup_printf ("%s (%s)", gettext (wevent->blurb),
+                                 gimp_get_mod_string (wevent->modifiers));
+            }
+          else
+            {
+              wevent->blurb = gettext (wevent->blurb);
+            }
+        }
+
+      events_initialized = TRUE;
+    }
+}
+
+static void
+gimp_controller_wheel_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_object_set (object,
+                "name",  _("Mouse Wheel Events"),
+                "state", _("Ready"),
+                NULL);
+}
+
+static gint
+gimp_controller_wheel_get_n_events (GimpController *controller)
+{
+  return G_N_ELEMENTS (wheel_events);
+}
+
+static const gchar *
+gimp_controller_wheel_get_event_name (GimpController *controller,
+                                      gint            event_id)
+{
+  if (event_id < 0 || event_id >= G_N_ELEMENTS (wheel_events))
+    return NULL;
+
+  return wheel_events[event_id].name;
+}
+
+static const gchar *
+gimp_controller_wheel_get_event_blurb (GimpController *controller,
+                                       gint            event_id)
+{
+  if (event_id < 0 || event_id >= G_N_ELEMENTS (wheel_events))
+    return NULL;
+
+  return wheel_events[event_id].blurb;
+}
+
+gboolean
+gimp_controller_wheel_scroll (GimpControllerWheel  *wheel,
+                              const GdkEventScroll *sevent)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_CONTROLLER_WHEEL (wheel), FALSE);
+  g_return_val_if_fail (sevent != NULL, FALSE);
+
+  /*  start with the last event because the last ones in the
+   *  up,down,left,right groups have the most keyboard modifiers
+   */
+  for (i = G_N_ELEMENTS (wheel_events) - 1; i >= 0; i--)
+    {
+      if (wheel_events[i].direction == sevent->direction &&
+          (wheel_events[i].modifiers & sevent->state) ==
+          wheel_events[i].modifiers)
+        {
+          GimpControllerEvent         controller_event;
+          GimpControllerEventTrigger *trigger;
+
+          trigger = (GimpControllerEventTrigger *) &controller_event;
+
+          trigger->type     = GIMP_CONTROLLER_EVENT_TRIGGER;
+          trigger->source   = GIMP_CONTROLLER (wheel);
+          trigger->event_id = i;
+
+          return gimp_controller_event (GIMP_CONTROLLER (wheel),
+                                        &controller_event);
+        }
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpcontrollerwheel.h b/app/widgets/gimpcontrollerwheel.h
new file mode 100644
index 0000000..ede6564
--- /dev/null
+++ b/app/widgets/gimpcontrollerwheel.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * gimpcontrollerwheel.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CONTROLLER_WHEEL_H__
+#define __GIMP_CONTROLLER_WHEEL_H__
+
+
+#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
+#include "libgimpwidgets/gimpcontroller.h"
+
+
+#define GIMP_TYPE_CONTROLLER_WHEEL            (gimp_controller_wheel_get_type ())
+#define GIMP_CONTROLLER_WHEEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_WHEEL, GimpControllerWheel))
+#define GIMP_CONTROLLER_WHEEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_WHEEL, GimpControllerWheelClass))
+#define GIMP_IS_CONTROLLER_WHEEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTROLLER_WHEEL))
+#define GIMP_IS_CONTROLLER_WHEEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTROLLER_WHEEL))
+#define GIMP_CONTROLLER_WHEEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTROLLER_WHEEL, GimpControllerWheelClass))
+
+
+typedef struct _GimpControllerWheelClass GimpControllerWheelClass;
+
+struct _GimpControllerWheel
+{
+  GimpController parent_instance;
+};
+
+struct _GimpControllerWheelClass
+{
+  GimpControllerClass parent_class;
+};
+
+
+GType      gimp_controller_wheel_get_type (void) G_GNUC_CONST;
+
+gboolean   gimp_controller_wheel_scroll   (GimpControllerWheel  *wheel,
+                                           const GdkEventScroll *sevent);
+
+
+#endif /* __GIMP_CONTROLLER_WHEEL_H__ */
diff --git a/app/widgets/gimpcriticaldialog.c b/app/widgets/gimpcriticaldialog.c
new file mode 100644
index 0000000..8a46465
--- /dev/null
+++ b/app/widgets/gimpcriticaldialog.c
@@ -0,0 +1,628 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcriticaldialog.c
+ * Copyright (C) 2018  Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This widget is particular that I want to be able to use it
+ * internally but also from an alternate tool (gimp-debug-tool). It
+ * means that the implementation must stay as generic glib/GTK+ as
+ * possible.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#ifdef PLATFORM_OSX
+#import <Cocoa/Cocoa.h>
+#endif
+
+#ifdef G_OS_WIN32
+#undef DATADIR
+#include <windows.h>
+#endif
+
+#include "gimpcriticaldialog.h"
+
+#include "gimp-intl.h"
+#include "gimp-version.h"
+
+
+#define GIMP_CRITICAL_RESPONSE_CLIPBOARD 1
+#define GIMP_CRITICAL_RESPONSE_URL       2
+#define GIMP_CRITICAL_RESPONSE_RESTART   3
+#define GIMP_CRITICAL_RESPONSE_DOWNLOAD  4
+
+#define BUTTON1_TEXT _("Copy Bug Information")
+#define BUTTON2_TEXT _("Open Bug Tracker")
+
+enum
+{
+  PROP_0,
+  PROP_LAST_VERSION,
+  PROP_RELEASE_DATE
+};
+
+static void     gimp_critical_dialog_constructed  (GObject      *object);
+static void     gimp_critical_dialog_finalize     (GObject      *object);
+static void     gimp_critical_dialog_set_property (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void     gimp_critical_dialog_response     (GtkDialog    *dialog,
+                                                   gint          response_id);
+
+static void     gimp_critical_dialog_copy_info    (GimpCriticalDialog *dialog);
+static gboolean browser_open_url                  (const gchar  *url,
+                                                   GError      **error);
+
+
+G_DEFINE_TYPE (GimpCriticalDialog, gimp_critical_dialog, GTK_TYPE_DIALOG)
+
+#define parent_class gimp_critical_dialog_parent_class
+
+
+static void
+gimp_critical_dialog_class_init (GimpCriticalDialogClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+
+  object_class->constructed  = gimp_critical_dialog_constructed;
+  object_class->finalize     = gimp_critical_dialog_finalize;
+  object_class->set_property = gimp_critical_dialog_set_property;
+
+  dialog_class->response = gimp_critical_dialog_response;
+
+  g_object_class_install_property (object_class, PROP_LAST_VERSION,
+                                   g_param_spec_string ("last-version",
+                                                        NULL, NULL, NULL,
+                                                        G_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_RELEASE_DATE,
+                                   g_param_spec_string ("release-date",
+                                                        NULL, NULL, NULL,
+                                                        G_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_critical_dialog_init (GimpCriticalDialog *dialog)
+{
+  PangoAttrList  *attrs;
+  PangoAttribute *attr;
+
+  gtk_window_set_role (GTK_WINDOW (dialog), "gimp-critical");
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+  gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
+
+  dialog->main_vbox = gtk_vbox_new (FALSE, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->main_vbox), 6);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      dialog->main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->main_vbox);
+
+  /* The error label. */
+  dialog->top_label = gtk_label_new (NULL);
+  gtk_misc_set_alignment (GTK_MISC (dialog->top_label), 0.0, 0.5);
+  gtk_label_set_ellipsize (GTK_LABEL (dialog->top_label), PANGO_ELLIPSIZE_END);
+  gtk_label_set_selectable (GTK_LABEL (dialog->top_label), TRUE);
+  gtk_box_pack_start (GTK_BOX (dialog->main_vbox), dialog->top_label,
+                      FALSE, FALSE, 0);
+
+  attrs = pango_attr_list_new ();
+  attr  = pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD);
+  pango_attr_list_insert (attrs, attr);
+  gtk_label_set_attributes (GTK_LABEL (dialog->top_label), attrs);
+  pango_attr_list_unref (attrs);
+
+  gtk_widget_show (dialog->top_label);
+
+  dialog->center_label = gtk_label_new (NULL);
+
+  gtk_misc_set_alignment (GTK_MISC (dialog->center_label), 0.0, 0.5);
+  gtk_label_set_selectable (GTK_LABEL (dialog->center_label), TRUE);
+  gtk_box_pack_start (GTK_BOX (dialog->main_vbox), dialog->center_label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (dialog->center_label);
+
+  dialog->bottom_label = gtk_label_new (NULL);
+  gtk_misc_set_alignment (GTK_MISC (dialog->bottom_label), 0.0, 0.5);
+  gtk_box_pack_start (GTK_BOX (dialog->main_vbox), dialog->bottom_label, FALSE, FALSE, 0);
+
+  attrs = pango_attr_list_new ();
+  attr  = pango_attr_style_new (PANGO_STYLE_ITALIC);
+  pango_attr_list_insert (attrs, attr);
+  gtk_label_set_attributes (GTK_LABEL (dialog->bottom_label), attrs);
+  pango_attr_list_unref (attrs);
+  gtk_widget_show (dialog->bottom_label);
+
+  dialog->pid      = 0;
+  dialog->program  = NULL;
+}
+
+static void
+gimp_critical_dialog_constructed (GObject *object)
+{
+  GimpCriticalDialog *dialog = GIMP_CRITICAL_DIALOG (object);
+  GtkWidget          *scrolled;
+  GtkTextBuffer      *buffer;
+  gchar              *version;
+  gchar              *text;
+
+  /* Bug details for developers. */
+  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
+                                       GTK_SHADOW_IN);
+  gtk_widget_set_size_request (scrolled, -1, 200);
+
+  if (dialog->last_version)
+    {
+      GtkWidget *expander;
+      GtkWidget *vbox;
+      GtkWidget *button;
+
+      expander = gtk_expander_new (_("See bug details"));
+      gtk_box_pack_start (GTK_BOX (dialog->main_vbox), expander, TRUE, TRUE, 0);
+      gtk_widget_show (expander);
+
+      vbox = gtk_vbox_new (FALSE, 4);
+      gtk_container_add (GTK_CONTAINER (expander), vbox);
+      gtk_widget_show (vbox);
+
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0);
+      gtk_widget_show (scrolled);
+
+      button = gtk_button_new_with_label (BUTTON1_TEXT);
+      g_signal_connect_swapped (button, "clicked",
+                                G_CALLBACK (gimp_critical_dialog_copy_info),
+                                dialog);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                              _("Go to _Download page"), GIMP_CRITICAL_RESPONSE_DOWNLOAD,
+                              _("_Close"),               GTK_RESPONSE_CLOSE,
+                              NULL);
+
+      /* Recommend an update. */
+      text = g_strdup_printf (_("A new version of GIMP (%s) was released on %s.\n"
+                                "It is recommended to update."),
+                              dialog->last_version, dialog->release_date);
+      gtk_label_set_text (GTK_LABEL (dialog->center_label), text);
+      g_free (text);
+
+      text = _("You are running an unsupported version!");
+      gtk_label_set_text (GTK_LABEL (dialog->bottom_label), text);
+    }
+  else
+    {
+      /* Pack directly (and well visible) the bug details. */
+      gtk_box_pack_start (GTK_BOX (dialog->main_vbox), scrolled, TRUE, TRUE, 0);
+      gtk_widget_show (scrolled);
+
+      gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                              BUTTON1_TEXT, GIMP_CRITICAL_RESPONSE_CLIPBOARD,
+                              BUTTON2_TEXT, GIMP_CRITICAL_RESPONSE_URL,
+                              _("_Close"),  GTK_RESPONSE_CLOSE,
+                              NULL);
+
+      /* Generic "report a bug" instructions. */
+      text = g_strdup_printf ("%s\n"
+                              " \xe2\x80\xa2 %s %s\n"
+                              " \xe2\x80\xa2 %s %s\n"
+                              " \xe2\x80\xa2 %s\n"
+                              " \xe2\x80\xa2 %s\n"
+                              " \xe2\x80\xa2 %s\n"
+                              " \xe2\x80\xa2 %s",
+                              _("To help us improve GIMP, you can report the bug with "
+                                "these simple steps:"),
+                              _("Copy the bug information to the clipboard by clicking: "),
+                              BUTTON1_TEXT,
+                              _("Open our bug tracker in the browser by clicking: "),
+                              BUTTON2_TEXT,
+                              _("Create a login if you don't have one yet."),
+                              _("Paste the clipboard text in a new bug report."),
+                              _("Add relevant information in English in the bug report "
+                                "explaining what you were doing when this error occurred."),
+                              _("This error may have left GIMP in an inconsistent state. "
+                                "It is advised to save your work and restart GIMP."));
+      gtk_label_set_text (GTK_LABEL (dialog->center_label), text);
+      g_free (text);
+
+      text = _("You can also close the dialog directly but "
+               "reporting bugs is the best way to make your "
+               "software awesome.");
+      gtk_label_set_text (GTK_LABEL (dialog->bottom_label), text);
+    }
+
+  buffer = gtk_text_buffer_new (NULL);
+  version = gimp_version (TRUE, FALSE);
+  text = g_strdup_printf ("<!-- %s -->\n\n\n```\n%s\n```",
+                          _("Copy-paste this whole debug data to report to developers"),
+                          version);
+  gtk_text_buffer_set_text (buffer, text, -1);
+  g_free (version);
+  g_free (text);
+
+  dialog->details = gtk_text_view_new_with_buffer (buffer);
+  g_object_unref (buffer);
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (dialog->details), FALSE);
+  gtk_widget_show (dialog->details);
+  gtk_container_add (GTK_CONTAINER (scrolled), dialog->details);
+}
+
+static void
+gimp_critical_dialog_finalize (GObject *object)
+{
+  GimpCriticalDialog *dialog = GIMP_CRITICAL_DIALOG (object);
+
+  if (dialog->program)
+    g_free (dialog->program);
+  if (dialog->last_version)
+    g_free (dialog->last_version);
+  if (dialog->release_date)
+    g_free (dialog->release_date);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_critical_dialog_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpCriticalDialog *dialog = GIMP_CRITICAL_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_LAST_VERSION:
+      dialog->last_version = g_value_dup_string (value);
+      break;
+    case PROP_RELEASE_DATE:
+      dialog->release_date = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_critical_dialog_copy_info (GimpCriticalDialog *dialog)
+{
+  GtkClipboard *clipboard;
+
+  clipboard = gtk_clipboard_get_for_display (gdk_display_get_default (),
+                                             GDK_SELECTION_CLIPBOARD);
+  if (clipboard)
+    {
+      GtkTextBuffer *buffer;
+      gchar         *text;
+      GtkTextIter    start;
+      GtkTextIter    end;
+
+      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->details));
+      gtk_text_buffer_get_iter_at_offset (buffer, &start, 0);
+      gtk_text_buffer_get_iter_at_offset (buffer, &end, -1);
+      text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+      gtk_clipboard_set_text (clipboard, text, -1);
+      g_free (text);
+    }
+}
+
+/* XXX This is taken straight from plug-ins/common/web-browser.c
+ *
+ * This really sucks but this class also needs to be called by
+ * tools/gimp-debug-tool.c as a separate process and therefore cannot
+ * make use of the PDB. Anyway shouldn't we just move this as a utils
+ * function?  Why does such basic feature as opening a URL in a
+ * cross-platform way need to be a plug-in?
+ */
+static gboolean
+browser_open_url (const gchar  *url,
+                  GError      **error)
+{
+#ifdef G_OS_WIN32
+
+  HINSTANCE hinst = ShellExecute (GetDesktopWindow(),
+                                  "open", url, NULL, NULL, SW_SHOW);
+
+  if ((gint) hinst <= 32)
+    {
+      const gchar *err;
+
+      switch ((gint) hinst)
+        {
+          case 0 :
+            err = _("The operating system is out of memory or resources.");
+            break;
+          case ERROR_FILE_NOT_FOUND :
+            err = _("The specified file was not found.");
+            break;
+          case ERROR_PATH_NOT_FOUND :
+            err = _("The specified path was not found.");
+            break;
+          case ERROR_BAD_FORMAT :
+            err = _("The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image).");
+            break;
+          case SE_ERR_ACCESSDENIED :
+            err = _("The operating system denied access to the specified file.");
+            break;
+          case SE_ERR_ASSOCINCOMPLETE :
+            err = _("The file name association is incomplete or invalid.");
+            break;
+          case SE_ERR_DDEBUSY :
+            err = _("DDE transaction busy");
+            break;
+          case SE_ERR_DDEFAIL :
+            err = _("The DDE transaction failed.");
+            break;
+          case SE_ERR_DDETIMEOUT :
+            err = _("The DDE transaction timed out.");
+            break;
+          case SE_ERR_DLLNOTFOUND :
+            err = _("The specified DLL was not found.");
+            break;
+          case SE_ERR_NOASSOC :
+            err = _("There is no application associated with the given file name extension.");
+            break;
+          case SE_ERR_OOM :
+            err = _("There was not enough memory to complete the operation.");
+            break;
+          case SE_ERR_SHARE:
+            err = _("A sharing violation occurred.");
+            break;
+          default :
+            err = _("Unknown Microsoft Windows error.");
+        }
+
+      g_set_error (error, 0, 0, _("Failed to open '%s': %s"), url, err);
+
+      return FALSE;
+    }
+
+  return TRUE;
+
+#elif defined(PLATFORM_OSX)
+
+  NSURL    *ns_url;
+  gboolean  retval;
+
+  NSAutoreleasePool *arp = [NSAutoreleasePool new];
+    {
+      ns_url = [NSURL URLWithString: [NSString stringWithUTF8String: url]];
+      retval = [[NSWorkspace sharedWorkspace] openURL: ns_url];
+    }
+  [arp release];
+
+  return retval;
+
+#else
+
+  return gtk_show_uri (gdk_screen_get_default (),
+                       url,
+                       gtk_get_current_event_time(),
+                       error);
+
+#endif
+}
+
+static void
+gimp_critical_dialog_response (GtkDialog *dialog,
+                               gint       response_id)
+{
+  GimpCriticalDialog *critical = GIMP_CRITICAL_DIALOG (dialog);
+  const gchar        *url      = NULL;
+
+  switch (response_id)
+    {
+    case GIMP_CRITICAL_RESPONSE_CLIPBOARD:
+      gimp_critical_dialog_copy_info (critical);
+      break;
+
+    case GIMP_CRITICAL_RESPONSE_DOWNLOAD:
+      url = "https://www.gimp.org/downloads/";
+    case GIMP_CRITICAL_RESPONSE_URL:
+      if (url == NULL)
+        {
+          gchar *temp = g_ascii_strdown (BUG_REPORT_URL, -1);
+
+          /* Only accept custom web links. */
+          if (g_str_has_prefix (temp, "http://") ||
+              g_str_has_prefix (temp, "https://"))
+            url = BUG_REPORT_URL;
+          else
+            /* XXX Ideally I'd find a way to prefill the bug report
+             * through the URL or with POST data. But I could not find
+             * any. Anyway since we may soon ditch bugzilla to follow
+             * GNOME infrastructure changes, I don't want to waste too
+             * much time digging into it.
+             */
+            url = PACKAGE_BUGREPORT;
+
+          g_free (temp);
+        }
+
+      browser_open_url (url, NULL);
+      break;
+
+    case GIMP_CRITICAL_RESPONSE_RESTART:
+      {
+        gchar *args[2] = { critical->program , NULL };
+
+#ifndef G_OS_WIN32
+        /* It is unneeded to kill the process on Win32. This was run
+         * as an async call and the main process should already be
+         * dead by now.
+         */
+        if (critical->pid > 0)
+          kill ((pid_t ) critical->pid, SIGINT);
+#endif
+        if (critical->program)
+          g_spawn_async (NULL, args, NULL, G_SPAWN_DEFAULT,
+                         NULL, NULL, NULL, NULL);
+      }
+      /* Fall through. */
+    case GTK_RESPONSE_DELETE_EVENT:
+    case GTK_RESPONSE_CLOSE:
+    default:
+      gtk_widget_destroy (GTK_WIDGET (dialog));
+      break;
+    }
+}
+
+/*  public functions  */
+
+GtkWidget *
+gimp_critical_dialog_new (const gchar *title,
+                          const gchar *last_version,
+                          gint64       release_timestamp)
+{
+  GtkWidget *dialog;
+  gchar     *date = NULL;
+
+  g_return_val_if_fail (title != NULL, NULL);
+
+  if (release_timestamp > 0)
+    {
+      GDateTime *datetime;
+
+      datetime = g_date_time_new_from_unix_local (release_timestamp);
+      date = g_date_time_format (datetime, "%x");
+      g_date_time_unref (datetime);
+    }
+
+  dialog = g_object_new (GIMP_TYPE_CRITICAL_DIALOG,
+                         "title",        title,
+                         "last-version", last_version,
+                         "release-date", date,
+                         NULL);
+  g_free (date);
+
+  return dialog;
+}
+
+void
+gimp_critical_dialog_add (GtkWidget   *dialog,
+                          const gchar *message,
+                          const gchar *trace,
+                          gboolean     is_fatal,
+                          const gchar *program,
+                          gint         pid)
+{
+  GimpCriticalDialog *critical;
+  GtkTextBuffer      *buffer;
+  GtkTextIter         end;
+  gchar              *text;
+
+  if (! GIMP_IS_CRITICAL_DIALOG (dialog) || ! message)
+    {
+      /* This is a bit hackish. We usually should use
+       * g_return_if_fail(). But I don't want to end up in a critical
+       * recursing loop if our code had bugs. We would crash GIMP with
+       * a CRITICAL which would otherwise not have necessarily ended up
+       * in a crash.
+       */
+      return;
+    }
+  critical = GIMP_CRITICAL_DIALOG (dialog);
+
+  /* The user text, which should be localized. */
+  if (is_fatal)
+    {
+      text = g_strdup_printf (_("GIMP crashed with a fatal error: %s"),
+                              message);
+    }
+  else if (! gtk_label_get_text (GTK_LABEL (critical->top_label)) ||
+           strlen (gtk_label_get_text (GTK_LABEL (critical->top_label))) == 0)
+    {
+      /* First error. Let's just display it. */
+      text = g_strdup_printf (_("GIMP encountered an error: %s"),
+                              message);
+    }
+  else
+    {
+      /* Let's not display all errors. They will be in the bug report
+       * part anyway.
+       */
+      text = g_strdup_printf (_("GIMP encountered several critical errors!"));
+    }
+  gtk_label_set_text (GTK_LABEL (critical->top_label),
+                      text);
+  g_free (text);
+
+  if (is_fatal && ! critical->last_version)
+    {
+      /* Same text as before except that we don't need the last point
+       * about saving and restarting since anyway we are crashing and
+       * manual saving is not possible anymore (or even advisable since
+       * if it fails, one may corrupt files).
+       */
+      text = g_strdup_printf ("%s\n"
+                              " \xe2\x80\xa2 %s \"%s\"\n"
+                              " \xe2\x80\xa2 %s \"%s\"\n"
+                              " \xe2\x80\xa2 %s\n"
+                              " \xe2\x80\xa2 %s\n"
+                              " \xe2\x80\xa2 %s",
+                              _("To help us improve GIMP, you can report the bug with "
+                                "these simple steps:"),
+                              _("Copy the bug information to the clipboard by clicking: "),
+                              BUTTON1_TEXT,
+                              _("Open our bug tracker in the browser by clicking: "),
+                              BUTTON2_TEXT,
+                              _("Create a login if you don't have one yet."),
+                              _("Paste the clipboard text in a new bug report."),
+                              _("Add relevant information in English in the bug report "
+                                "explaining what you were doing when this error occurred."));
+      gtk_label_set_text (GTK_LABEL (critical->center_label), text);
+      g_free (text);
+    }
+
+  /* The details text is untranslated on purpose. This is the message
+   * meant to go to clipboard for the bug report. It has to be in
+   * English.
+   */
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (critical->details));
+  gtk_text_buffer_get_iter_at_offset (buffer, &end, -1);
+  if (trace)
+    text = g_strdup_printf ("\n> %s\n\nStack trace:\n```\n%s\n```", message, trace);
+  else
+    text = g_strdup_printf ("\n> %s\n", message);
+  gtk_text_buffer_insert (buffer, &end, text, -1);
+  g_free (text);
+
+  /* Finally when encountering a fatal message, propose one more button
+   * to restart GIMP.
+   */
+  if (is_fatal)
+    {
+      gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                              _("_Restart GIMP"), GIMP_CRITICAL_RESPONSE_RESTART,
+                              NULL);
+      critical->program = g_strdup (program);
+      critical->pid     = pid;
+    }
+}
diff --git a/app/widgets/gimpcriticaldialog.h b/app/widgets/gimpcriticaldialog.h
new file mode 100644
index 0000000..9721bf0
--- /dev/null
+++ b/app/widgets/gimpcriticaldialog.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcriticaldialog.h
+ * Copyright (C) 2018  Jehan <jehan@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CRITICAL_DIALOG_H__
+#define __GIMP_CRITICAL_DIALOG_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_CRITICAL_DIALOG            (gimp_critical_dialog_get_type ())
+#define GIMP_CRITICAL_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CRITICAL_DIALOG, GimpCriticalDialog))
+#define GIMP_CRITICAL_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CRITICAL_DIALOG, GimpCriticalDialogClass))
+#define GIMP_IS_CRITICAL_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CRITICAL_DIALOG))
+#define GIMP_IS_CRITICAL_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CRITICAL_DIALOG))
+#define GIMP_CRITICAL_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CRITICAL_DIALOG, GimpCriticalDialogClass))
+
+
+typedef struct _GimpCriticalDialog       GimpCriticalDialog;
+typedef struct _GimpCriticalDialogClass  GimpCriticalDialogClass;
+
+struct _GimpCriticalDialog
+{
+  GtkDialog        parent_instance;
+
+  GtkWidget       *main_vbox;
+  GtkWidget       *top_label;
+  GtkWidget       *center_label;
+  GtkWidget       *bottom_label;
+  GtkWidget       *details;
+
+  gchar           *program;
+  gint             pid;
+
+  gchar           *last_version;
+  gchar           *release_date;
+};
+
+struct _GimpCriticalDialogClass
+{
+  GtkDialogClass   parent_class;
+};
+
+
+GType       gimp_critical_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_critical_dialog_new      (const gchar        *title,
+                                           const gchar        *last_version,
+                                           gint64              release_timestamp);
+void        gimp_critical_dialog_add      (GtkWidget          *dialog,
+                                           const gchar        *message,
+                                           const gchar        *trace,
+                                           gboolean            is_fatal,
+                                           const gchar        *program,
+                                           gint                pid);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_CRITICAL_DIALOG_H__ */
diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
new file mode 100644
index 0000000..7509f48
--- /dev/null
+++ b/app/widgets/gimpcursor.c
@@ -0,0 +1,526 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpcursor.h"
+#include "gimpwidgets-utils.h"
+
+#include "cursors/gimp-tool-cursors.c"
+
+
+#define cursor_default_hot_x 10
+#define cursor_default_hot_y 10
+
+#define cursor_mouse_hot_x 3
+#define cursor_mouse_hot_y 2
+#define cursor_crosshair_hot_x 15
+#define cursor_crosshair_hot_y 15
+#define cursor_zoom_hot_x 8
+#define cursor_zoom_hot_y 8
+#define cursor_color_picker_hot_x 1
+#define cursor_color_picker_hot_y 30
+
+
+typedef struct _GimpCursor GimpCursor;
+
+struct _GimpCursor
+{
+  const gchar *resource_name;
+  const gint   hot_x;
+  const gint   hot_y;
+
+  GdkPixbuf   *pixbuf;
+  GdkPixbuf   *pixbuf_x2;
+};
+
+
+static GimpCursor gimp_cursors[] =
+{
+  /* these have to match up with enum GimpCursorType in widgets-enums.h */
+
+  {
+    "cursor-none",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-mouse",
+    cursor_mouse_hot_x, cursor_mouse_hot_y
+  },
+  {
+    "cursor-crosshair",
+    cursor_crosshair_hot_x, cursor_crosshair_hot_y
+  },
+  {
+    "cursor-crosshair-small",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-bad",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-move",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-zoom",
+    cursor_zoom_hot_x, cursor_zoom_hot_y
+  },
+  {
+    "cursor-color-picker",
+    cursor_color_picker_hot_x, cursor_color_picker_hot_y
+  },
+  {
+    "cursor-corner-top",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-top-right",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-right",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-bottom-right",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-bottom",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-bottom-left",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-left",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-corner-top-left",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-top",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-top-right",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-right",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-bottom-right",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-bottom",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-bottom-left",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-left",
+    cursor_default_hot_x, cursor_default_hot_y
+  },
+  {
+    "cursor-side-top-left",
+    cursor_default_hot_x, cursor_default_hot_y
+  }
+};
+
+static GimpCursor gimp_tool_cursors[] =
+{
+  /* these have to match up with enum GimpToolCursorType in widgets-enums.h */
+
+  { NULL },
+  { "tool-rect-select" },
+  { "tool-ellipse-select" },
+  { "tool-free-select" },
+  { "tool-polygon-select" },
+  { "tool-fuzzy-select" },
+  { "tool-paths" },
+  { "tool-paths-anchor" },
+  { "tool-paths-control" },
+  { "tool-paths-segment" },
+  { "tool-iscissors" },
+  { "tool-move" },
+  { "tool-zoom" },
+  { "tool-crop" },
+  { "tool-resize" },
+  { "tool-rotate" },
+  { "tool-shear" },
+  { "tool-perspective" },
+  { "tool-transform-3d-camera" },
+  { "tool-flip-horizontal" },
+  { "tool-flip-vertical" },
+  { "tool-text" },
+  { "tool-color-picker" },
+  { "tool-bucket-fill" },
+  { "tool-gradient" },
+  { "tool-pencil" },
+  { "tool-paintbrush" },
+  { "tool-airbrush" },
+  { "tool-ink" },
+  { "tool-clone" },
+  { "tool-heal" },
+  { "tool-eraser" },
+  { "tool-smudge" },
+  { "tool-blur" },
+  { "tool-dodge" },
+  { "tool-burn" },
+  { "tool-measure" },
+  { "tool-warp" },
+  { "tool-hand" }
+};
+
+static GimpCursor gimp_cursor_modifiers[] =
+{
+  /* these have to match up with enum GimpCursorModifier in widgets-enums.h */
+
+  { NULL },
+  { "modifier-bad" },
+  { "modifier-plus" },
+  { "modifier-minus" },
+  { "modifier-intersect" },
+  { "modifier-move" },
+  { "modifier-resize" },
+  { "modifier-rotate" },
+  { "modifier-zoom" },
+  { "modifier-control" },
+  { "modifier-anchor" },
+  { "modifier-foreground" },
+  { "modifier-background" },
+  { "modifier-pattern" },
+  { "modifier-join" },
+  { "modifier-select" }
+};
+
+
+static const GdkPixbuf *
+get_cursor_pixbuf (GimpCursor *cursor,
+                   gint        scale_factor)
+{
+  gchar  *resource_path;
+  GError *error = NULL;
+
+  if (! cursor->pixbuf)
+    {
+      resource_path = g_strconcat ("/org/gimp/tool-cursors/",
+                                   cursor->resource_name,
+                                   ".png", NULL);
+
+      cursor->pixbuf = gdk_pixbuf_new_from_resource (resource_path, &error);
+
+      if (! cursor->pixbuf)
+        {
+          g_critical ("Failed to create cursor image '%s': %s",
+                      resource_path, error->message);
+          g_clear_error (&error);
+        }
+
+      g_free (resource_path);
+    }
+
+  if (scale_factor == 2 && ! cursor->pixbuf_x2)
+    {
+      resource_path = g_strconcat ("/org/gimp/tool-cursors/",
+                                   cursor->resource_name,
+                                   "-x2.png", NULL);
+
+      cursor->pixbuf_x2 = gdk_pixbuf_new_from_resource (resource_path, &error);
+
+      if (! cursor->pixbuf_x2)
+        {
+          /* no critical here until we actually have the cursor files */
+          g_printerr ("Failed to create scaled cursor image '%s' "
+                      "falling back to upscaling default cursor: %s\n",
+                      resource_path, error->message);
+          g_clear_error (&error);
+
+          if (cursor->pixbuf)
+            {
+              gint width  = gdk_pixbuf_get_width  (cursor->pixbuf);
+              gint height = gdk_pixbuf_get_height (cursor->pixbuf);
+
+              cursor->pixbuf_x2 = gdk_pixbuf_scale_simple (cursor->pixbuf,
+                                                           width  * 2,
+                                                           height * 2,
+                                                           GDK_INTERP_NEAREST);
+            }
+        }
+
+      g_free (resource_path);
+    }
+
+  if (scale_factor == 2)
+    return cursor->pixbuf_x2;
+  else
+    return cursor->pixbuf;
+}
+
+GdkCursor *
+gimp_cursor_new (GdkWindow          *window,
+                 GimpHandedness      cursor_handedness,
+                 GimpCursorType      cursor_type,
+                 GimpToolCursorType  tool_cursor,
+                 GimpCursorModifier  modifier)
+{
+  GdkDisplay *display;
+  GimpCursor *bmcursor   = NULL;
+  GimpCursor *bmmodifier = NULL;
+  GimpCursor *bmtool     = NULL;
+  GdkCursor  *cursor;
+  GdkPixbuf  *pixbuf;
+  gint        scale_factor;
+  gint        hot_x;
+  gint        hot_y;
+
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+  g_return_val_if_fail (cursor_type < GIMP_CURSOR_LAST, NULL);
+
+  display = gdk_window_get_display (window);
+
+  if (cursor_type <= (GimpCursorType) GDK_LAST_CURSOR)
+    return gdk_cursor_new_for_display (display, (GdkCursorType) cursor_type);
+
+  g_return_val_if_fail (cursor_type >= GIMP_CURSOR_NONE, NULL);
+
+  /*  disallow the small tool cursor with some cursors
+   */
+  if (cursor_type <= GIMP_CURSOR_NONE         ||
+      cursor_type == GIMP_CURSOR_CROSSHAIR    ||
+      cursor_type == GIMP_CURSOR_ZOOM         ||
+      cursor_type == GIMP_CURSOR_COLOR_PICKER ||
+      cursor_type >= GIMP_CURSOR_LAST)
+    {
+      tool_cursor = GIMP_TOOL_CURSOR_NONE;
+    }
+
+  /*  don't allow anything with the empty cursor
+   */
+  if (cursor_type == GIMP_CURSOR_NONE)
+    {
+      tool_cursor = GIMP_TOOL_CURSOR_NONE;
+      modifier    = GIMP_CURSOR_MODIFIER_NONE;
+    }
+
+  /*  some more sanity checks
+   */
+  if (cursor_type == GIMP_CURSOR_MOVE &&
+      modifier    == GIMP_CURSOR_MODIFIER_MOVE)
+    {
+      modifier = GIMP_CURSOR_MODIFIER_NONE;
+    }
+
+  /*  when cursor is "corner" or "side" sides must be exchanged for
+   *  left-hand-mice-flipping of pixbuf below
+   */
+
+  if (cursor_handedness == GIMP_HANDEDNESS_LEFT)
+    {
+      switch (cursor_type)
+        {
+        case GIMP_CURSOR_CORNER_TOP_LEFT:
+          cursor_type = GIMP_CURSOR_CORNER_TOP_RIGHT; break;
+
+        case GIMP_CURSOR_CORNER_TOP_RIGHT:
+          cursor_type = GIMP_CURSOR_CORNER_TOP_LEFT; break;
+
+        case GIMP_CURSOR_CORNER_LEFT:
+          cursor_type = GIMP_CURSOR_CORNER_RIGHT; break;
+
+        case GIMP_CURSOR_CORNER_RIGHT:
+          cursor_type = GIMP_CURSOR_CORNER_LEFT; break;
+
+        case GIMP_CURSOR_CORNER_BOTTOM_LEFT:
+          cursor_type = GIMP_CURSOR_CORNER_BOTTOM_RIGHT; break;
+
+        case GIMP_CURSOR_CORNER_BOTTOM_RIGHT:
+          cursor_type = GIMP_CURSOR_CORNER_BOTTOM_LEFT; break;
+
+        case GIMP_CURSOR_SIDE_TOP_LEFT:
+          cursor_type = GIMP_CURSOR_SIDE_TOP_RIGHT; break;
+
+        case GIMP_CURSOR_SIDE_TOP_RIGHT:
+          cursor_type = GIMP_CURSOR_SIDE_TOP_LEFT; break;
+
+        case GIMP_CURSOR_SIDE_LEFT:
+          cursor_type = GIMP_CURSOR_SIDE_RIGHT; break;
+
+        case GIMP_CURSOR_SIDE_RIGHT:
+          cursor_type = GIMP_CURSOR_SIDE_LEFT; break;
+
+        case GIMP_CURSOR_SIDE_BOTTOM_LEFT:
+          cursor_type = GIMP_CURSOR_SIDE_BOTTOM_RIGHT; break;
+
+        case GIMP_CURSOR_SIDE_BOTTOM_RIGHT:
+          cursor_type = GIMP_CURSOR_SIDE_BOTTOM_LEFT; break;
+
+        default:
+          break;
+        }
+    }
+
+  /*  prepare the main cursor  */
+
+  cursor_type -= GIMP_CURSOR_NONE;
+  bmcursor = &gimp_cursors[cursor_type];
+
+  /*  prepare the tool cursor  */
+
+  if (tool_cursor > GIMP_TOOL_CURSOR_NONE &&
+      tool_cursor < GIMP_TOOL_CURSOR_LAST)
+    {
+      bmtool = &gimp_tool_cursors[tool_cursor];
+    }
+
+  /*  prepare the cursor modifier  */
+
+  if (modifier > GIMP_CURSOR_MODIFIER_NONE &&
+      modifier < GIMP_CURSOR_MODIFIER_LAST)
+    {
+      bmmodifier = &gimp_cursor_modifiers[modifier];
+    }
+
+  scale_factor = 1;
+
+  /* guess HiDPI */
+  {
+    GdkScreen *screen = gdk_window_get_screen (window);
+    gdouble    xres, yres;
+
+    gimp_get_monitor_resolution (screen,
+                                 gdk_screen_get_monitor_at_window (screen, window),
+                                 &xres, &yres);
+
+    if ((xres + yres) / 2.0 > 250.0)
+      scale_factor = 2;
+  }
+
+  pixbuf = gdk_pixbuf_copy (get_cursor_pixbuf (bmcursor, scale_factor));
+
+  if (bmmodifier || bmtool)
+    {
+      gint width  = gdk_pixbuf_get_width  (pixbuf);
+      gint height = gdk_pixbuf_get_height (pixbuf);
+
+      if (bmmodifier)
+        gdk_pixbuf_composite (get_cursor_pixbuf (bmmodifier, scale_factor),
+                              pixbuf,
+                              0, 0, width, height,
+                              0.0, 0.0, 1.0, 1.0,
+                              GDK_INTERP_NEAREST, 200);
+
+      if (bmtool)
+        gdk_pixbuf_composite (get_cursor_pixbuf (bmtool, scale_factor),
+                              pixbuf,
+                              0, 0, width, height,
+                              0.0, 0.0, 1.0, 1.0,
+                              GDK_INTERP_NEAREST, 200);
+    }
+
+  hot_x = bmcursor->hot_x;
+  hot_y = bmcursor->hot_y;
+
+  /*  flip the cursor if mouse setting is left-handed  */
+
+  if (cursor_handedness == GIMP_HANDEDNESS_LEFT)
+    {
+      GdkPixbuf *flipped = gdk_pixbuf_flip (pixbuf, TRUE);
+      gint       width   = gdk_pixbuf_get_width (flipped);
+
+      g_object_unref (pixbuf);
+      pixbuf = flipped;
+
+      hot_x = (width - 1) - hot_x;
+    }
+
+  cursor = gdk_cursor_new_from_pixbuf (display, pixbuf,
+                                       hot_x * scale_factor,
+                                       hot_y * scale_factor);
+
+  g_object_unref (pixbuf);
+
+  return cursor;
+}
+
+void
+gimp_cursor_set (GtkWidget          *widget,
+                 GimpHandedness      cursor_handedness,
+                 GimpCursorType      cursor_type,
+                 GimpToolCursorType  tool_cursor,
+                 GimpCursorModifier  modifier)
+{
+  GdkWindow *window;
+  GdkCursor *cursor;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (gtk_widget_get_realized (widget));
+
+  window = gtk_widget_get_window (widget);
+
+  cursor = gimp_cursor_new (window,
+                            cursor_handedness,
+                            cursor_type,
+                            tool_cursor,
+                            modifier);
+  gdk_window_set_cursor (window, cursor);
+  gdk_cursor_unref (cursor);
+
+  gdk_display_flush (gdk_window_get_display (window));
+}
+
+GimpCursorType
+gimp_cursor_rotate (GimpCursorType  cursor,
+                    gdouble         angle)
+{
+  if (cursor >= GIMP_CURSOR_CORNER_TOP &&
+      cursor <= GIMP_CURSOR_SIDE_TOP_LEFT)
+    {
+      gint offset = (gint) (angle / 45 + 0.5);
+
+      if (cursor < GIMP_CURSOR_SIDE_TOP)
+        {
+          cursor += offset;
+
+          if (cursor > GIMP_CURSOR_CORNER_TOP_LEFT)
+            cursor -= 8;
+        }
+      else
+        {
+          cursor += offset;
+
+          if (cursor > GIMP_CURSOR_SIDE_TOP_LEFT)
+            cursor -= 8;
+        }
+   }
+
+  return cursor;
+}
diff --git a/app/widgets/gimpcursor.h b/app/widgets/gimpcursor.h
new file mode 100644
index 0000000..f6b9ad0
--- /dev/null
+++ b/app/widgets/gimpcursor.h
@@ -0,0 +1,37 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURSOR_H__
+#define __GIMP_CURSOR_H__
+
+
+GdkCursor      * gimp_cursor_new    (GdkWindow          *window,
+                                     GimpHandedness      cursor_handedness,
+                                     GimpCursorType      cursor_type,
+                                     GimpToolCursorType  tool_cursor,
+                                     GimpCursorModifier  modifier);
+void             gimp_cursor_set    (GtkWidget          *widget,
+                                     GimpHandedness      cursor_handedness,
+                                     GimpCursorType      cursor_type,
+                                     GimpToolCursorType  tool_cursor,
+                                     GimpCursorModifier  modifier);
+
+GimpCursorType   gimp_cursor_rotate (GimpCursorType      cursor,
+                                     gdouble             angle);
+
+
+#endif /*  __GIMP_CURSOR_H__  */
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
new file mode 100644
index 0000000..c34d06e
--- /dev/null
+++ b/app/widgets/gimpcurveview.c
@@ -0,0 +1,1547 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcurve.h"
+#include "core/gimpcurve-map.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpclipboard.h"
+#include "gimpcurveview.h"
+#include "gimpwidgets-utils.h"
+
+
+#define POINT_MAX_DISTANCE 16.0
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_BASE_LINE,
+  PROP_GRID_ROWS,
+  PROP_GRID_COLUMNS,
+  PROP_X_AXIS_LABEL,
+  PROP_Y_AXIS_LABEL
+};
+
+enum
+{
+  SELECTION_CHANGED,
+  CUT_CLIPBOARD,
+  COPY_CLIPBOARD,
+  PASTE_CLIPBOARD,
+  LAST_SIGNAL
+};
+
+
+typedef struct
+{
+  GimpCurve *curve;
+  GimpRGB    color;
+  gboolean   color_set;
+} BGCurve;
+
+
+static void       gimp_curve_view_finalize              (GObject          *object);
+static void       gimp_curve_view_dispose               (GObject          *object);
+static void       gimp_curve_view_set_property          (GObject          *object,
+                                                         guint             property_id,
+                                                         const GValue     *value,
+                                                         GParamSpec       *pspec);
+static void       gimp_curve_view_get_property          (GObject          *object,
+                                                         guint             property_id,
+                                                         GValue           *value,
+                                                         GParamSpec       *pspec);
+
+static void       gimp_curve_view_style_set             (GtkWidget        *widget,
+                                                         GtkStyle         *prev_style);
+static gboolean   gimp_curve_view_expose                (GtkWidget        *widget,
+                                                         GdkEventExpose   *event);
+static gboolean   gimp_curve_view_button_press          (GtkWidget        *widget,
+                                                         GdkEventButton   *bevent);
+static gboolean   gimp_curve_view_button_release        (GtkWidget        *widget,
+                                                         GdkEventButton   *bevent);
+static gboolean   gimp_curve_view_motion_notify         (GtkWidget        *widget,
+                                                         GdkEventMotion   *bevent);
+static gboolean   gimp_curve_view_leave_notify          (GtkWidget        *widget,
+                                                         GdkEventCrossing *cevent);
+static gboolean   gimp_curve_view_key_press             (GtkWidget        *widget,
+                                                         GdkEventKey      *kevent);
+
+static void       gimp_curve_view_cut_clipboard         (GimpCurveView    *view);
+static void       gimp_curve_view_copy_clipboard        (GimpCurveView    *view);
+static void       gimp_curve_view_paste_clipboard       (GimpCurveView    *view);
+
+static void       gimp_curve_view_curve_dirty           (GimpCurve        *curve,
+                                                         GimpCurveView    *view);
+static void       gimp_curve_view_curve_notify_n_points (GimpCurve        *curve,
+                                                         GParamSpec       *pspec,
+                                                         GimpCurveView    *view);
+
+static void       gimp_curve_view_set_cursor            (GimpCurveView    *view,
+                                                         gdouble           x,
+                                                         gdouble           y);
+static void       gimp_curve_view_unset_cursor          (GimpCurveView *view);
+
+
+G_DEFINE_TYPE (GimpCurveView, gimp_curve_view,
+               GIMP_TYPE_HISTOGRAM_VIEW)
+
+#define parent_class gimp_curve_view_parent_class
+
+static guint curve_view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_curve_view_class_init (GimpCurveViewClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkBindingSet  *binding_set;
+
+  object_class->finalize             = gimp_curve_view_finalize;
+  object_class->dispose              = gimp_curve_view_dispose;
+  object_class->set_property         = gimp_curve_view_set_property;
+  object_class->get_property         = gimp_curve_view_get_property;
+
+  widget_class->style_set            = gimp_curve_view_style_set;
+  widget_class->expose_event         = gimp_curve_view_expose;
+  widget_class->button_press_event   = gimp_curve_view_button_press;
+  widget_class->button_release_event = gimp_curve_view_button_release;
+  widget_class->motion_notify_event  = gimp_curve_view_motion_notify;
+  widget_class->leave_notify_event   = gimp_curve_view_leave_notify;
+  widget_class->key_press_event      = gimp_curve_view_key_press;
+
+  klass->selection_changed           = NULL;
+  klass->cut_clipboard               = gimp_curve_view_cut_clipboard;
+  klass->copy_clipboard              = gimp_curve_view_copy_clipboard;
+  klass->paste_clipboard             = gimp_curve_view_paste_clipboard;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_BASE_LINE,
+                                   g_param_spec_boolean ("base-line",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_GRID_ROWS,
+                                   g_param_spec_int ("grid-rows", NULL, NULL,
+                                                     0, 100, 8,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_GRID_COLUMNS,
+                                   g_param_spec_int ("grid-columns", NULL, NULL,
+                                                     0, 100, 8,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_X_AXIS_LABEL,
+                                   g_param_spec_string ("x-axis-label", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_Y_AXIS_LABEL,
+                                   g_param_spec_string ("y-axis-label", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+
+  curve_view_signals[SELECTION_CHANGED] =
+    g_signal_new ("selection-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpCurveViewClass, selection_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  curve_view_signals[CUT_CLIPBOARD] =
+    g_signal_new ("cut-clipboard",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpCurveViewClass, cut_clipboard),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  curve_view_signals[COPY_CLIPBOARD] =
+    g_signal_new ("copy-clipboard",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpCurveViewClass, copy_clipboard),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  curve_view_signals[PASTE_CLIPBOARD] =
+    g_signal_new ("paste-clipboard",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpCurveViewClass, paste_clipboard),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  binding_set = gtk_binding_set_by_class (klass);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_CONTROL_MASK,
+                                "cut-clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
+                                "copy-clipboard", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_CONTROL_MASK,
+                                "paste-clipboard", 0);
+}
+
+static void
+gimp_curve_view_init (GimpCurveView *view)
+{
+  view->curve       = NULL;
+  view->selected    = -1;
+  view->offset_x    = 0.0;
+  view->offset_y    = 0.0;
+  view->last_x      = 0.0;
+  view->last_y      = 0.0;
+  view->cursor_type = -1;
+  view->xpos        = -1.0;
+  view->cursor_x    = -1.0;
+  view->cursor_y    = -1.0;
+  view->range_x_min = 0.0;
+  view->range_x_max = 1.0;
+  view->range_y_min = 0.0;
+  view->range_y_max = 1.0;
+
+  view->x_axis_label = NULL;
+  view->y_axis_label = NULL;
+
+  gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE);
+  gtk_widget_add_events (GTK_WIDGET (view),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_BUTTON1_MOTION_MASK |
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_KEY_PRESS_MASK      |
+                         GDK_LEAVE_NOTIFY_MASK);
+}
+
+static void
+gimp_curve_view_finalize (GObject *object)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (object);
+
+  g_clear_object (&view->orig_curve);
+
+  g_clear_object (&view->layout);
+  g_clear_object (&view->cursor_layout);
+
+  g_clear_pointer (&view->x_axis_label, g_free);
+  g_clear_pointer (&view->y_axis_label, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_curve_view_dispose (GObject *object)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (object);
+
+  gimp_curve_view_set_curve (view, NULL, NULL);
+
+  if (view->bg_curves)
+    gimp_curve_view_remove_all_backgrounds (view);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_curve_view_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      view->gimp = g_value_get_object (value); /* don't ref */
+      break;
+    case PROP_GRID_ROWS:
+      view->grid_rows = g_value_get_int (value);
+      break;
+    case PROP_GRID_COLUMNS:
+      view->grid_columns = g_value_get_int (value);
+      break;
+    case PROP_BASE_LINE:
+      view->draw_base_line = g_value_get_boolean (value);
+      break;
+    case PROP_X_AXIS_LABEL:
+      gimp_curve_view_set_x_axis_label (view, g_value_get_string (value));
+      break;
+    case PROP_Y_AXIS_LABEL:
+      gimp_curve_view_set_y_axis_label (view, g_value_get_string (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_curve_view_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, view->gimp);
+      break;
+    case PROP_GRID_ROWS:
+      g_value_set_int (value, view->grid_rows);
+      break;
+    case PROP_GRID_COLUMNS:
+      g_value_set_int (value, view->grid_columns);
+      break;
+    case PROP_BASE_LINE:
+      g_value_set_boolean (value, view->draw_base_line);
+      break;
+    case PROP_X_AXIS_LABEL:
+      g_value_set_string (value, view->x_axis_label);
+      break;
+    case PROP_Y_AXIS_LABEL:
+      g_value_set_string (value, view->y_axis_label);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_curve_view_style_set (GtkWidget *widget,
+                           GtkStyle  *prev_style)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  g_clear_object (&view->layout);
+  g_clear_object (&view->cursor_layout);
+}
+
+static void
+gimp_curve_view_draw_grid (GimpCurveView *view,
+                           cairo_t       *cr,
+                           gint           width,
+                           gint           height,
+                           gint           border)
+{
+  gint i;
+
+  for (i = 1; i < view->grid_rows; i++)
+    {
+      gint y = i * (height - 1) / view->grid_rows;
+
+      if ((view->grid_rows % 2) == 0 && (i == view->grid_rows / 2))
+        continue;
+
+      cairo_move_to (cr, border,             border + y);
+      cairo_line_to (cr, border + width - 1, border + y);
+    }
+
+  for (i = 1; i < view->grid_columns; i++)
+    {
+      gint x = i * (width - 1) / view->grid_columns;
+
+      if ((view->grid_columns % 2) == 0 && (i == view->grid_columns / 2))
+        continue;
+
+      cairo_move_to (cr, border + x, border);
+      cairo_line_to (cr, border + x, border + height - 1);
+    }
+
+  if (view->draw_base_line)
+    {
+      cairo_move_to (cr, border, border + height - 1);
+      cairo_line_to (cr, border + width - 1, border);
+    }
+
+  cairo_set_line_width (cr, 0.6);
+  cairo_stroke (cr);
+
+  if ((view->grid_rows % 2) == 0)
+    {
+      gint y = (height - 1) / 2;
+
+      cairo_move_to (cr, border,             border + y);
+      cairo_line_to (cr, border + width - 1, border + y);
+    }
+
+  if ((view->grid_columns % 2) == 0)
+    {
+      gint x = (width - 1) / 2;
+
+      cairo_move_to (cr, border + x, border);
+      cairo_line_to (cr, border + x, border + height - 1);
+    }
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_stroke (cr);
+}
+
+static void
+gimp_curve_view_draw_point (GimpCurveView *view,
+                            cairo_t       *cr,
+                            gint           i,
+                            gint           width,
+                            gint           height,
+                            gint           border)
+{
+  gdouble x, y;
+
+  gimp_curve_get_point (view->curve, i, &x, &y);
+
+  y = 1.0 - y;
+
+#define CIRCLE_RADIUS  3
+#define DIAMOND_RADIUS (G_SQRT2 * CIRCLE_RADIUS)
+
+  switch (gimp_curve_get_point_type (view->curve, i))
+    {
+    case GIMP_CURVE_POINT_SMOOTH:
+      cairo_move_to (cr,
+                     border + (gdouble) (width  - 1) * x + CIRCLE_RADIUS,
+                     border + (gdouble) (height - 1) * y);
+      cairo_arc     (cr,
+                     border + (gdouble) (width  - 1) * x,
+                     border + (gdouble) (height - 1) * y,
+                     CIRCLE_RADIUS,
+                     0, 2 * G_PI);
+      break;
+
+    case GIMP_CURVE_POINT_CORNER:
+      cairo_move_to    (cr,
+                        border + (gdouble) (width  - 1) * x,
+                        border + (gdouble) (height - 1) * y - DIAMOND_RADIUS);
+      cairo_line_to    (cr,
+                        border + (gdouble) (width  - 1) * x + DIAMOND_RADIUS,
+                        border + (gdouble) (height - 1) * y);
+      cairo_line_to    (cr,
+                        border + (gdouble) (width  - 1) * x,
+                        border + (gdouble) (height - 1) * y + DIAMOND_RADIUS);
+      cairo_line_to    (cr,
+                        border + (gdouble) (width  - 1) * x - DIAMOND_RADIUS,
+                        border + (gdouble) (height - 1) * y);
+      cairo_close_path (cr);
+      break;
+    }
+}
+
+static void
+gimp_curve_view_draw_curve (GimpCurveView *view,
+                            cairo_t       *cr,
+                            GimpCurve     *curve,
+                            gint           width,
+                            gint           height,
+                            gint           border)
+{
+  gdouble x, y;
+  gint    i;
+
+  x = 0.0;
+  y = 1.0 - gimp_curve_map_value (curve, 0.0);
+
+  cairo_move_to (cr,
+                 border + (gdouble) (width  - 1) * x,
+                 border + (gdouble) (height - 1)* y);
+
+  for (i = 1; i < 256; i++)
+    {
+      x = (gdouble) i / 255.0;
+      y = 1.0 - gimp_curve_map_value (curve, x);
+
+      cairo_line_to (cr,
+                     border + (gdouble) (width  - 1) * x,
+                     border + (gdouble) (height - 1) * y);
+    }
+
+  cairo_stroke (cr);
+}
+
+static gboolean
+gimp_curve_view_expose (GtkWidget      *widget,
+                        GdkEventExpose *event)
+{
+  GimpCurveView *view   = GIMP_CURVE_VIEW (widget);
+  GdkWindow     *window = gtk_widget_get_window (widget);
+  GtkStyle      *style  = gtk_widget_get_style (widget);
+  GtkAllocation  allocation;
+  cairo_t       *cr;
+  GList         *list;
+  gint           border;
+  gint           width;
+  gint           height;
+  gint           layout_x;
+  gint           layout_y;
+  gdouble        x, y;
+  gint           i;
+
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+  if (! view->curve)
+    return FALSE;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  border = GIMP_HISTOGRAM_VIEW (view)->border_width;
+  width  = allocation.width  - 2 * border;
+  height = allocation.height - 2 * border;
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  if (gtk_widget_has_focus (widget))
+    {
+      gtk_paint_focus (style, window,
+                       gtk_widget_get_state (widget),
+                       &event->area, widget, NULL,
+                       border - 2, border - 2,
+                       width + 4, height + 4);
+    }
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+  cairo_translate (cr, 0.5, 0.5);
+
+  /*  Draw the grid lines  */
+  gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]);
+
+  gimp_curve_view_draw_grid (view, cr, width, height, border);
+
+  /*  Draw the axis labels  */
+
+  if (view->x_axis_label)
+    {
+      if (! view->layout)
+        view->layout = gtk_widget_create_pango_layout (widget, NULL);
+
+      pango_layout_set_text (view->layout, view->x_axis_label, -1);
+      pango_layout_get_pixel_size (view->layout, &layout_x, &layout_y);
+
+      cairo_move_to (cr,
+                     width - border - layout_x,
+                     height - border - layout_y);
+
+      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+      pango_cairo_show_layout (cr, view->layout);
+    }
+
+  if (view->y_axis_label)
+    {
+      if (! view->layout)
+        view->layout = gtk_widget_create_pango_layout (widget, NULL);
+
+      pango_layout_set_text (view->layout, view->y_axis_label, -1);
+      pango_layout_get_pixel_size (view->layout, &layout_x, &layout_y);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr,
+                     2 * border,
+                     2 * border + layout_x);
+      cairo_rotate (cr, - G_PI / 2);
+
+      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+      pango_cairo_show_layout (cr, view->layout);
+
+      cairo_restore (cr);
+    }
+
+
+  /*  Draw the background curves  */
+  for (list = view->bg_curves; list; list = g_list_next (list))
+    {
+      BGCurve *bg = list->data;
+
+      if (bg->color_set)
+        {
+          cairo_set_source_rgba (cr,
+                                 bg->color.r,
+                                 bg->color.g,
+                                 bg->color.b,
+                                 0.5);
+        }
+      else
+        {
+          cairo_set_source_rgba (cr,
+                                 style->text[GTK_STATE_NORMAL].red / 65535.0,
+                                 style->text[GTK_STATE_NORMAL].green / 65535.0,
+                                 style->text[GTK_STATE_NORMAL].blue / 65535.0,
+                                 0.5);
+        }
+
+      gimp_curve_view_draw_curve (view, cr, bg->curve,
+                                  width, height, border);
+    }
+
+  /*  Draw the curve  */
+  if (view->curve_color)
+    gimp_cairo_set_source_rgb (cr, view->curve_color);
+  else
+    gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+
+  gimp_curve_view_draw_curve (view, cr, view->curve,
+                              width, height, border);
+
+  /*  Draw the points  */
+  if (gimp_curve_get_curve_type (view->curve) == GIMP_CURVE_SMOOTH)
+    {
+      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+
+      /*  Draw the unselected points  */
+      for (i = 0; i < view->curve->n_points; i++)
+        {
+          if (i == view->selected)
+            continue;
+
+          gimp_curve_view_draw_point (view, cr, i, width, height, border);
+        }
+
+      cairo_stroke (cr);
+
+      /*  Draw the selected point  */
+      if (view->selected != -1)
+        {
+          gimp_curve_view_draw_point (view, cr, view->selected,
+                                      width, height, border);
+          cairo_fill (cr);
+       }
+    }
+
+  if (view->xpos >= 0.0)
+    {
+      gchar buf[32];
+
+      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+
+      /* draw the color line */
+      cairo_move_to (cr,
+                     border + ROUND ((gdouble) (width - 1) * view->xpos),
+                     border + 1);
+      cairo_line_to (cr,
+                     border + ROUND ((gdouble) (width - 1) * view->xpos),
+                     border + height - 1);
+      cairo_stroke (cr);
+
+      if (view->range_x_max == 255.0)
+        {
+          /*  stupid heuristic: special-case for 0..255  */
+
+          g_snprintf (buf, sizeof (buf), "x:%3d",
+                      (gint) (view->xpos *
+                              (view->range_x_max - view->range_x_min) +
+                              view->range_x_min));
+        }
+      else if (view->range_x_max == 100.0)
+        {
+          /*  and for 0..100  */
+
+          g_snprintf (buf, sizeof (buf), "x:%0.2f",
+                      view->xpos *
+                      (view->range_x_max - view->range_x_min) +
+                      view->range_x_min);
+        }
+      else
+        {
+          g_snprintf (buf, sizeof (buf), "x:%0.3f",
+                      view->xpos *
+                      (view->range_x_max - view->range_x_min) +
+                      view->range_x_min);
+        }
+
+      if (! view->layout)
+        view->layout = gtk_widget_create_pango_layout (widget, NULL);
+
+      pango_layout_set_text (view->layout, buf, -1);
+      pango_layout_get_pixel_size (view->layout, &layout_x, &layout_y);
+
+      if (view->xpos < 0.5)
+        layout_x = border;
+      else
+        layout_x = -(layout_x + border);
+
+      cairo_move_to (cr,
+                     border + (gdouble) width * view->xpos + layout_x,
+                     border + height - border - layout_y);
+      pango_cairo_show_layout (cr, view->layout);
+    }
+
+  if (view->cursor_x >= 0.0 && view->cursor_x <= 1.0 &&
+      view->cursor_y >= 0.0 && view->cursor_y <= 1.0)
+    {
+      gchar  buf[32];
+      gint   w, h;
+
+      if (! view->cursor_layout)
+        view->cursor_layout = gtk_widget_create_pango_layout (widget, NULL);
+
+      if (view->range_x_max == 255.0 &&
+          view->range_y_max == 255.0)
+        {
+          /*  stupid heuristic: special-case for 0..255  */
+
+          g_snprintf (buf, sizeof (buf), "x:%3d y:%3d",
+                      (gint) round (view->cursor_x *
+                                    (view->range_x_max - view->range_x_min) +
+                                    view->range_x_min),
+                      (gint) round ((1.0 - view->cursor_y) *
+                                    (view->range_y_max - view->range_y_min) +
+                                    view->range_y_min));
+        }
+      else if (view->range_x_max == 100.0 &&
+               view->range_y_max == 100.0)
+        {
+          /*  and for 0..100  */
+
+          g_snprintf (buf, sizeof (buf), "x:%0.2f y:%0.2f",
+                      view->cursor_x *
+                      (view->range_x_max - view->range_x_min) +
+                      view->range_x_min,
+                      (1.0 - view->cursor_y) *
+                      (view->range_y_max - view->range_y_min) +
+                      view->range_y_min);
+        }
+      else
+        {
+          g_snprintf (buf, sizeof (buf), "x:%0.3f y:%0.3f",
+                      view->cursor_x *
+                      (view->range_x_max - view->range_x_min) +
+                      view->range_x_min,
+                      (1.0 - view->cursor_y) *
+                      (view->range_y_max - view->range_y_min) +
+                      view->range_y_min);
+        }
+
+      pango_layout_set_text (view->cursor_layout, buf, -1);
+      pango_layout_get_pixel_extents (view->cursor_layout,
+                                      NULL, &view->cursor_rect);
+
+      x = border * 2 + 3;
+      y = border * 2 + 3;
+      w = view->cursor_rect.width;
+      h = view->cursor_rect.height;
+
+      if (view->x_axis_label)
+        x += border + view->cursor_rect.height; /* coincidentially the right value */
+
+      cairo_push_group (cr);
+
+      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+      cairo_rectangle (cr, x + 0.5, y + 0.5, w, h);
+      cairo_fill_preserve (cr);
+
+      cairo_set_line_width (cr, 6);
+      cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+      cairo_stroke (cr);
+
+      gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
+      cairo_move_to (cr, x, y);
+      pango_cairo_show_layout (cr, view->cursor_layout);
+
+      cairo_pop_group_to_source (cr);
+      cairo_paint_with_alpha (cr, 0.6);
+    }
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static void
+set_cursor (GimpCurveView *view,
+            GdkCursorType  new_cursor)
+{
+  if (new_cursor != view->cursor_type)
+    {
+      GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (view));
+      GdkCursor  *cursor  = gdk_cursor_new_for_display (display, new_cursor);
+
+      gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (view)), cursor);
+      gdk_cursor_unref (cursor);
+
+      view->cursor_type = new_cursor;
+    }
+}
+
+static gboolean
+gimp_curve_view_button_press (GtkWidget      *widget,
+                              GdkEventButton *bevent)
+{
+  GimpCurveView *view  = GIMP_CURVE_VIEW (widget);
+  GimpCurve     *curve = view->curve;
+  GtkAllocation  allocation;
+  gint           border;
+  gint           width, height;
+  gdouble        x;
+  gdouble        y;
+  gint           point;
+  gdouble        point_x;
+  gdouble        point_y;
+
+  if (! curve || bevent->button != 1)
+    return TRUE;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  border = GIMP_HISTOGRAM_VIEW (view)->border_width;
+  width  = allocation.width  - 2 * border;
+  height = allocation.height - 2 * border;
+
+  x = (gdouble) (bevent->x - border) / (gdouble) width;
+  y = (gdouble) (bevent->y - border) / (gdouble) height;
+
+  x = CLAMP (x, 0.0, 1.0);
+  y = CLAMP (y, 0.0, 1.0);
+
+  view->grabbed = TRUE;
+
+  view->orig_curve = GIMP_CURVE (gimp_data_duplicate (GIMP_DATA (curve)));
+
+  set_cursor (view, GDK_TCROSS);
+
+  switch (gimp_curve_get_curve_type (curve))
+    {
+    case GIMP_CURVE_SMOOTH:
+      point = gimp_curve_get_closest_point (curve, x, 1.0 - y,
+                                            POINT_MAX_DISTANCE /
+                                            MAX (width, height));
+
+      if (point < 0)
+        {
+          GimpCurvePointType type = GIMP_CURVE_POINT_SMOOTH;
+
+          if (bevent->state & gimp_get_constrain_behavior_mask ())
+            y = 1.0 - gimp_curve_map_value (view->orig_curve, x);
+
+          if (view->selected >= 0)
+            type = gimp_curve_get_point_type (curve, view->selected);
+
+          point = gimp_curve_add_point (curve, x, 1.0 - y);
+
+          gimp_curve_set_point_type (curve, point, type);
+        }
+
+      if (point > 0)
+        gimp_curve_get_point (curve, point - 1, &view->leftmost, NULL);
+      else
+        view->leftmost = -1.0;
+
+      if (point < gimp_curve_get_n_points (curve) - 1)
+        gimp_curve_get_point (curve, point + 1, &view->rightmost, NULL);
+      else
+        view->rightmost = 2.0;
+
+      gimp_curve_view_set_selected (view, point);
+
+      gimp_curve_get_point (curve, point, &point_x, &point_y);
+
+      view->offset_x = point_x         - x;
+      view->offset_y = (1.0 - point_y) - y;
+
+      view->point_type = gimp_curve_get_point_type (curve, point);
+      break;
+
+    case GIMP_CURVE_FREE:
+      view->last_x = x;
+      view->last_y = y;
+
+      gimp_curve_set_curve (curve, x, 1.0 - y);
+      break;
+    }
+
+  if (! gtk_widget_has_focus (widget))
+    gtk_widget_grab_focus (widget);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_curve_view_button_release (GtkWidget      *widget,
+                                GdkEventButton *bevent)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (widget);
+
+  if (bevent->button != 1)
+    return TRUE;
+
+  g_clear_object (&view->orig_curve);
+
+  view->offset_x = 0.0;
+  view->offset_y = 0.0;
+
+  view->grabbed = FALSE;
+
+  set_cursor (view, GDK_FLEUR);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_curve_view_motion_notify (GtkWidget      *widget,
+                               GdkEventMotion *mevent)
+{
+  GimpCurveView  *view       = GIMP_CURVE_VIEW (widget);
+  GimpCurve      *curve      = view->curve;
+  GtkAllocation   allocation;
+  GdkCursorType   new_cursor = GDK_X_CURSOR;
+  gint            border;
+  gint            width, height;
+  gdouble         x;
+  gdouble         y;
+  gdouble         point_x;
+  gdouble         point_y;
+  gint            point;
+
+  if (! curve)
+    return TRUE;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  border = GIMP_HISTOGRAM_VIEW (view)->border_width;
+  width  = allocation.width  - 2 * border;
+  height = allocation.height - 2 * border;
+
+  x = (gdouble) (mevent->x - border) / (gdouble) width;
+  y = (gdouble) (mevent->y - border) / (gdouble) height;
+
+  x += view->offset_x;
+  y += view->offset_y;
+
+  x = CLAMP (x, 0.0, 1.0);
+  y = CLAMP (y, 0.0, 1.0);
+
+  switch (gimp_curve_get_curve_type (curve))
+    {
+    case GIMP_CURVE_SMOOTH:
+      if (! view->grabbed) /*  If no point is grabbed...  */
+        {
+          point = gimp_curve_get_closest_point (curve, x, 1.0 - y,
+                                                POINT_MAX_DISTANCE /
+                                                MAX (width, height));
+
+          if (point >= 0)
+            {
+              gimp_curve_get_point (curve, point, &point_x, &point_y);
+
+              new_cursor = GDK_FLEUR;
+
+              x = point_x;
+              y = 1.0 - point_y;
+            }
+          else
+            {
+              new_cursor = GDK_TCROSS;
+
+              if (mevent->state & gimp_get_constrain_behavior_mask ())
+                y = 1.0 - gimp_curve_map_value (view->curve, x);
+            }
+        }
+      else /*  Else, drag the grabbed point  */
+        {
+          new_cursor = GDK_TCROSS;
+
+          if (mevent->state & gimp_get_constrain_behavior_mask ())
+            y = 1.0 - gimp_curve_map_value (view->orig_curve, x);
+
+          gimp_data_freeze (GIMP_DATA (curve));
+
+          if (x > view->leftmost && x < view->rightmost)
+            {
+              if (view->selected < 0)
+                {
+                  gimp_curve_view_set_selected (
+                    view,
+                    gimp_curve_add_point (curve, x, 1.0 - y));
+
+                  gimp_curve_set_point_type (curve,
+                                             view->selected, view->point_type);
+                }
+              else
+                {
+                  gimp_curve_set_point (curve, view->selected, x, 1.0 - y);
+                }
+            }
+          else
+            {
+              if (view->selected >= 0)
+                {
+                  gimp_curve_delete_point (curve, view->selected);
+
+                  gimp_curve_view_set_selected (view, -1);
+                }
+            }
+
+          gimp_data_thaw (GIMP_DATA (curve));
+        }
+      break;
+
+    case GIMP_CURVE_FREE:
+      if (view->grabbed)
+        {
+          gint    n_samples = gimp_curve_get_n_samples (curve);
+          gdouble x1, x2;
+          gdouble y1, y2;
+
+          if (view->last_x > x)
+            {
+              x1 = x;
+              x2 = view->last_x;
+              y1 = y;
+              y2 = view->last_y;
+            }
+          else
+            {
+              x1 = view->last_x;
+              x2 = x;
+              y1 = view->last_y;
+              y2 = y;
+            }
+
+          if (x2 != x1)
+            {
+              gint from = ROUND (x1 * (gdouble) (n_samples - 1));
+              gint to   = ROUND (x2 * (gdouble) (n_samples - 1));
+              gint i;
+
+              gimp_data_freeze (GIMP_DATA (curve));
+
+              for (i = from; i <= to; i++)
+                {
+                  gdouble xpos = (gdouble) i / (gdouble) (n_samples - 1);
+                  gdouble ypos = (y1 + ((y2 - y1) * (xpos - x1)) / (x2 - x1));
+
+                  xpos = CLAMP (xpos, 0.0, 1.0);
+                  ypos = CLAMP (ypos, 0.0, 1.0);
+
+                  gimp_curve_set_curve (curve, xpos, 1.0 - ypos);
+                }
+
+              gimp_data_thaw (GIMP_DATA (curve));
+            }
+          else
+            {
+              gimp_curve_set_curve (curve, x, 1.0 - y);
+            }
+
+          view->last_x = x;
+          view->last_y = y;
+        }
+
+      if (mevent->state & GDK_BUTTON1_MASK)
+        new_cursor = GDK_TCROSS;
+      else
+        new_cursor = GDK_PENCIL;
+
+      break;
+    }
+
+  set_cursor (view, new_cursor);
+
+  gimp_curve_view_set_cursor (view, x, y);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_curve_view_leave_notify (GtkWidget        *widget,
+                              GdkEventCrossing *cevent)
+{
+  GimpCurveView *view = GIMP_CURVE_VIEW (widget);
+
+  gimp_curve_view_unset_cursor (view);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_curve_view_key_press (GtkWidget   *widget,
+                           GdkEventKey *kevent)
+{
+  GimpCurveView *view    = GIMP_CURVE_VIEW (widget);
+  GimpCurve     *curve   = view->curve;
+  gboolean       handled = FALSE;
+
+  if (! view->grabbed                                        &&
+      curve                                                  &&
+      gimp_curve_get_curve_type (curve) == GIMP_CURVE_SMOOTH &&
+      view->selected                    >= 0)
+    {
+      gint    i = view->selected;
+      gdouble x, y;
+
+      gimp_curve_get_point (curve, i, NULL, &y);
+
+      switch (kevent->keyval)
+        {
+        case GDK_KEY_Left:
+          for (i = i - 1; i >= 0 && ! handled; i--)
+            {
+              gimp_curve_get_point (curve, i, &x, NULL);
+
+              if (x >= 0.0)
+                {
+                  gimp_curve_view_set_selected (view, i);
+
+                  handled = TRUE;
+                }
+            }
+          break;
+
+        case GDK_KEY_Right:
+          for (i = i + 1; i < curve->n_points && ! handled; i++)
+            {
+              gimp_curve_get_point (curve, i, &x, NULL);
+
+              if (x >= 0.0)
+                {
+                  gimp_curve_view_set_selected (view, i);
+
+                  handled = TRUE;
+                }
+            }
+          break;
+
+        case GDK_KEY_Up:
+          if (y < 1.0)
+            {
+              y = y + (kevent->state & GDK_SHIFT_MASK ?
+                       (16.0 / 255.0) : (1.0 / 255.0));
+
+              gimp_curve_move_point (curve, i, CLAMP (y, 0.0, 1.0));
+
+              handled = TRUE;
+            }
+          break;
+
+        case GDK_KEY_Down:
+          if (y > 0)
+            {
+              y = y - (kevent->state & GDK_SHIFT_MASK ?
+                       (16.0 / 255.0) : (1.0 / 255.0));
+
+              gimp_curve_move_point (curve, i, CLAMP (y, 0.0, 1.0));
+
+              handled = TRUE;
+            }
+          break;
+
+        case GDK_KEY_Delete:
+          gimp_curve_delete_point (curve, i);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (handled)
+    {
+      set_cursor (view, GDK_TCROSS);
+
+      return TRUE;
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, kevent);
+}
+
+static void
+gimp_curve_view_cut_clipboard (GimpCurveView *view)
+{
+  g_printerr ("%s\n", G_STRFUNC);
+
+  if (! view->curve || ! view->gimp)
+    {
+      gtk_widget_error_bell (GTK_WIDGET (view));
+      return;
+    }
+
+  gimp_curve_view_copy_clipboard (view);
+
+  gimp_curve_reset (view->curve, FALSE);
+}
+
+static void
+gimp_curve_view_copy_clipboard (GimpCurveView *view)
+{
+  GimpCurve *copy;
+
+  g_printerr ("%s\n", G_STRFUNC);
+
+  if (! view->curve || ! view->gimp)
+    {
+      gtk_widget_error_bell (GTK_WIDGET (view));
+      return;
+    }
+
+  copy = GIMP_CURVE (gimp_data_duplicate (GIMP_DATA (view->curve)));
+  gimp_clipboard_set_curve (view->gimp, copy);
+  g_object_unref (copy);
+}
+
+static void
+gimp_curve_view_paste_clipboard (GimpCurveView *view)
+{
+  GimpCurve *copy;
+
+  g_printerr ("%s\n", G_STRFUNC);
+
+  if (! view->curve || ! view->gimp)
+    {
+      gtk_widget_error_bell (GTK_WIDGET (view));
+      return;
+    }
+
+  copy = gimp_clipboard_get_curve (view->gimp);
+
+  if (copy)
+    {
+      gimp_config_copy (GIMP_CONFIG (copy),
+                        GIMP_CONFIG (view->curve), 0);
+      g_object_unref (copy);
+    }
+}
+
+static void
+gimp_curve_view_curve_dirty (GimpCurve     *curve,
+                             GimpCurveView *view)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+static void
+gimp_curve_view_curve_notify_n_points (GimpCurve     *curve,
+                                       GParamSpec    *pspec,
+                                       GimpCurveView *view)
+{
+  gimp_curve_view_set_selected (view, -1);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_curve_view_new (void)
+{
+  return g_object_new (GIMP_TYPE_CURVE_VIEW, NULL);
+}
+
+void
+gimp_curve_view_set_curve (GimpCurveView *view,
+                           GimpCurve     *curve,
+                           const GimpRGB *color)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+  g_return_if_fail (curve == NULL || GIMP_IS_CURVE (curve));
+
+  if (view->curve == curve)
+    return;
+
+  if (view->curve)
+    {
+      g_signal_handlers_disconnect_by_func (view->curve,
+                                            gimp_curve_view_curve_dirty,
+                                            view);
+      g_signal_handlers_disconnect_by_func (view->curve,
+                                            gimp_curve_view_curve_notify_n_points,
+                                            view);
+      g_object_unref (view->curve);
+    }
+
+  view->curve = curve;
+
+  if (view->curve)
+    {
+      g_object_ref (view->curve);
+      g_signal_connect (view->curve, "dirty",
+                        G_CALLBACK (gimp_curve_view_curve_dirty),
+                        view);
+      g_signal_connect (view->curve, "notify::n-points",
+                        G_CALLBACK (gimp_curve_view_curve_notify_n_points),
+                        view);
+    }
+
+  if (view->curve_color)
+    g_free (view->curve_color);
+
+  if (color)
+    view->curve_color = g_memdup (color, sizeof (GimpRGB));
+  else
+    view->curve_color = NULL;
+
+  gimp_curve_view_set_selected (view, -1);
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+GimpCurve *
+gimp_curve_view_get_curve (GimpCurveView *view)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE_VIEW (view), NULL);
+
+  return view->curve;
+}
+
+void
+gimp_curve_view_add_background (GimpCurveView *view,
+                                GimpCurve     *curve,
+                                const GimpRGB *color)
+{
+  GList   *list;
+  BGCurve *bg;
+
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+
+  for (list = view->bg_curves; list; list = g_list_next (list))
+    {
+      bg = list->data;
+
+      g_return_if_fail (curve != bg->curve);
+    }
+
+  bg = g_slice_new0 (BGCurve);
+
+  bg->curve = g_object_ref (curve);
+
+  if (color)
+    {
+      bg->color     = *color;
+      bg->color_set = TRUE;
+    }
+
+  g_signal_connect (bg->curve, "dirty",
+                    G_CALLBACK (gimp_curve_view_curve_dirty),
+                    view);
+
+  view->bg_curves = g_list_append (view->bg_curves, bg);
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_curve_view_remove_background (GimpCurveView *view,
+                                   GimpCurve     *curve)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+
+  for (list = view->bg_curves; list; list = g_list_next (list))
+    {
+      BGCurve *bg = list->data;
+
+      if (bg->curve == curve)
+        {
+          g_signal_handlers_disconnect_by_func (bg->curve,
+                                                gimp_curve_view_curve_dirty,
+                                                view);
+          g_object_unref (bg->curve);
+
+          view->bg_curves = g_list_remove (view->bg_curves, bg);
+
+          g_slice_free (BGCurve, bg);
+
+          gtk_widget_queue_draw (GTK_WIDGET (view));
+
+          break;
+        }
+    }
+
+  if (! list)
+    g_return_if_reached ();
+}
+
+void
+gimp_curve_view_remove_all_backgrounds (GimpCurveView *view)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  while (view->bg_curves)
+    {
+      BGCurve *bg = view->bg_curves->data;
+
+      g_signal_handlers_disconnect_by_func (bg->curve,
+                                            gimp_curve_view_curve_dirty,
+                                            view);
+      g_object_unref (bg->curve);
+
+      view->bg_curves = g_list_remove (view->bg_curves, bg);
+
+      g_slice_free (BGCurve, bg);
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_curve_view_set_selected (GimpCurveView *view,
+                              gint           selected)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  if (selected != view->selected)
+    {
+      view->selected = selected;
+
+      g_signal_emit (view, curve_view_signals[SELECTION_CHANGED], 0);
+
+      gtk_widget_queue_draw (GTK_WIDGET (view));
+    }
+}
+
+gint
+gimp_curve_view_get_selected (GimpCurveView *view)
+{
+  g_return_val_if_fail (GIMP_IS_CURVE_VIEW (view), -1);
+
+  if (view->curve && view->selected < gimp_curve_get_n_points (view->curve))
+    return view->selected;
+  else
+    return -1;
+}
+
+void
+gimp_curve_view_set_range_x (GimpCurveView *view,
+                             gdouble        min,
+                             gdouble        max)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  view->range_x_min = min;
+  view->range_x_max = max;
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_curve_view_set_range_y (GimpCurveView *view,
+                             gdouble        min,
+                             gdouble        max)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  view->range_y_min = min;
+  view->range_y_max = max;
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_curve_view_set_xpos (GimpCurveView *view,
+                          gdouble        x)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  view->xpos = x;
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_curve_view_set_x_axis_label (GimpCurveView *view,
+                                  const gchar   *label)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  if (view->x_axis_label)
+    g_free (view->x_axis_label);
+
+  view->x_axis_label = g_strdup (label);
+
+  g_object_notify (G_OBJECT (view), "x-axis-label");
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_curve_view_set_y_axis_label (GimpCurveView *view,
+                                  const gchar   *label)
+{
+  g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
+
+  if (view->y_axis_label)
+    g_free (view->y_axis_label);
+
+  view->y_axis_label = g_strdup (label);
+
+  g_object_notify (G_OBJECT (view), "y-axis-label");
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+
+/*  private functions  */
+
+static void
+gimp_curve_view_set_cursor (GimpCurveView *view,
+                            gdouble        x,
+                            gdouble        y)
+{
+  view->cursor_x = x;
+  view->cursor_y = y;
+
+  /* TODO: only invalidate the cursor label area */
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+static void
+gimp_curve_view_unset_cursor (GimpCurveView *view)
+{
+  view->cursor_x = -1.0;
+  view->cursor_y = -1.0;
+
+  /* TODO: only invalidate the cursor label area */
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
diff --git a/app/widgets/gimpcurveview.h b/app/widgets/gimpcurveview.h
new file mode 100644
index 0000000..add6048
--- /dev/null
+++ b/app/widgets/gimpcurveview.h
@@ -0,0 +1,130 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CURVE_VIEW_H__
+#define __GIMP_CURVE_VIEW_H__
+
+
+#include "gimphistogramview.h"
+
+
+#define GIMP_TYPE_CURVE_VIEW            (gimp_curve_view_get_type ())
+#define GIMP_CURVE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CURVE_VIEW, GimpCurveView))
+#define GIMP_CURVE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CURVE_VIEW, GimpCurveViewClass))
+#define GIMP_IS_CURVE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CURVE_VIEW))
+#define GIMP_IS_CURVE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CURVE_VIEW))
+#define GIMP_CURVE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CURVE_VIEW, GimpCurveViewClass))
+
+
+typedef struct _GimpCurveViewClass  GimpCurveViewClass;
+
+struct _GimpCurveView
+{
+  GimpHistogramView  parent_instance;
+
+  Gimp              *gimp; /* only needed for copy & paste */
+
+  GimpCurve         *curve;
+  GimpRGB           *curve_color;
+
+  GList             *bg_curves;
+
+  gboolean           draw_base_line;
+  gint               grid_rows;
+  gint               grid_columns;
+
+  gint               selected;
+  gdouble            offset_x;
+  gdouble            offset_y;
+  GimpCurvePointType point_type;
+  gdouble            last_x;
+  gdouble            last_y;
+  gdouble            leftmost;
+  gdouble            rightmost;
+  gboolean           grabbed;
+  GimpCurve         *orig_curve;
+
+  GdkCursorType      cursor_type;
+
+  gdouble            xpos;
+
+  PangoLayout       *layout;
+
+  gdouble            range_x_min;
+  gdouble            range_x_max;
+  gdouble            range_y_min;
+  gdouble            range_y_max;
+
+  gdouble            cursor_x;
+  gdouble            cursor_y;
+  PangoLayout       *cursor_layout;
+  PangoRectangle     cursor_rect;
+
+  gchar             *x_axis_label;
+  gchar             *y_axis_label;
+};
+
+struct _GimpCurveViewClass
+{
+  GimpHistogramViewClass  parent_class;
+
+  /* signals */
+  void (* selection_changed) (GimpCurveView *view);
+
+  void (* cut_clipboard)     (GimpCurveView *view);
+  void (* copy_clipboard)    (GimpCurveView *view);
+  void (* paste_clipboard)   (GimpCurveView *view);
+};
+
+
+GType       gimp_curve_view_get_type          (void) G_GNUC_CONST;
+
+GtkWidget * gimp_curve_view_new               (void);
+
+void        gimp_curve_view_set_curve         (GimpCurveView *view,
+                                               GimpCurve     *curve,
+                                               const GimpRGB *color);
+GimpCurve * gimp_curve_view_get_curve         (GimpCurveView *view);
+
+void        gimp_curve_view_add_background    (GimpCurveView *view,
+                                               GimpCurve     *curve,
+                                               const GimpRGB *color);
+void        gimp_curve_view_remove_background (GimpCurveView *view,
+                                               GimpCurve     *curve);
+
+void   gimp_curve_view_remove_all_backgrounds (GimpCurveView *view);
+
+void        gimp_curve_view_set_selected      (GimpCurveView *view,
+                                               gint           selected);
+gint        gimp_curve_view_get_selected      (GimpCurveView *view);
+
+void        gimp_curve_view_set_range_x       (GimpCurveView *view,
+                                               gdouble        min,
+                                               gdouble        max);
+void        gimp_curve_view_set_range_y       (GimpCurveView *view,
+                                               gdouble        min,
+                                               gdouble        max);
+void        gimp_curve_view_set_xpos          (GimpCurveView *view,
+                                               gdouble        x);
+
+void        gimp_curve_view_set_x_axis_label  (GimpCurveView *view,
+                                               const gchar   *label);
+void        gimp_curve_view_set_y_axis_label  (GimpCurveView *view,
+                                               const gchar   *label);
+
+
+#endif /* __GIMP_CURVE_VIEW_H__ */
diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c
new file mode 100644
index 0000000..8e8273b
--- /dev/null
+++ b/app/widgets/gimpdashboard.c
@@ -0,0 +1,5054 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdashboard.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include <gegl.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <psapi.h>
+#define HAVE_CPU_GROUP
+#define HAVE_MEMORY_GROUP
+#elif defined(PLATFORM_OSX)
+#include <mach/mach.h>
+#include <sys/times.h>
+#define HAVE_CPU_GROUP
+#define HAVE_MEMORY_GROUP
+#else /* ! G_OS_WIN32 && ! PLATFORM_OSX */
+#ifdef HAVE_SYS_TIMES_H
+#include <sys/times.h>
+#define HAVE_CPU_GROUP
+#endif /* HAVE_SYS_TIMES_H */
+#if defined (HAVE_UNISTD_H) && defined (HAVE_FCNTL_H)
+#include <unistd.h>
+#include <fcntl.h>
+#ifdef _SC_PAGE_SIZE
+#define HAVE_MEMORY_GROUP
+#endif /* _SC_PAGE_SIZE */
+#endif /* HAVE_UNISTD_H && HAVE_FCNTL_H */
+#endif /* ! G_OS_WIN32 */
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-gui.h"
+#include "core/gimp-utils.h"
+#include "core/gimp-parallel.h"
+#include "core/gimpasync.h"
+#include "core/gimpbacktrace.h"
+#include "core/gimptempbuf.h"
+#include "core/gimpwaitable.h"
+
+#include "gimpactiongroup.h"
+#include "gimpdocked.h"
+#include "gimpdashboard.h"
+#include "gimpdialogfactory.h"
+#include "gimphelp-ids.h"
+#include "gimphighlightablebutton.h"
+#include "gimpmeter.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimptoggleaction.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+#include "gimp-log.h"
+#include "gimp-version.h"
+
+
+#define DEFAULT_UPDATE_INTERVAL        GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC
+#define DEFAULT_HISTORY_DURATION       GIMP_DASHBOARD_HISTORY_DURATION_60_SEC
+#define DEFAULT_LOW_SWAP_SPACE_WARNING TRUE
+
+#define LOW_SWAP_SPACE_WARNING_ON      /* swap occupied is above */ 0.90 /* of swap limit */
+#define LOW_SWAP_SPACE_WARNING_OFF     /* swap occupied is below */ 0.85 /* of swap limit */
+
+#define CPU_ACTIVE_ON                  /* individual cpu usage is above */ 0.75
+#define CPU_ACTIVE_OFF                 /* individual cpu usage is below */ 0.25
+
+#define LOG_VERSION                    1
+#define LOG_SAMPLE_FREQUENCY_MIN       1 /* samples per second */
+#define LOG_SAMPLE_FREQUENCY_MAX       1000 /* samples per second */
+#define LOG_DEFAULT_SAMPLE_FREQUENCY   10 /* samples per second */
+#define LOG_DEFAULT_BACKTRACE          TRUE
+#define LOG_DEFAULT_MESSAGES           TRUE
+#define LOG_DEFAULT_PROGRESSIVE        FALSE
+
+
+typedef enum
+{
+  VARIABLE_NONE,
+  FIRST_VARIABLE,
+
+
+  /* cache */
+  VARIABLE_CACHE_OCCUPIED = FIRST_VARIABLE,
+  VARIABLE_CACHE_MAXIMUM,
+  VARIABLE_CACHE_LIMIT,
+
+  VARIABLE_CACHE_COMPRESSION,
+  VARIABLE_CACHE_HIT_MISS,
+
+  /* swap */
+  VARIABLE_SWAP_OCCUPIED,
+  VARIABLE_SWAP_SIZE,
+  VARIABLE_SWAP_LIMIT,
+
+  VARIABLE_SWAP_QUEUED,
+  VARIABLE_SWAP_QUEUE_STALLS,
+  VARIABLE_SWAP_QUEUE_FULL,
+
+  VARIABLE_SWAP_READ,
+  VARIABLE_SWAP_READ_THROUGHPUT,
+  VARIABLE_SWAP_WRITTEN,
+  VARIABLE_SWAP_WRITE_THROUGHPUT,
+
+  VARIABLE_SWAP_COMPRESSION,
+
+#ifdef HAVE_CPU_GROUP
+  /* cpu */
+  VARIABLE_CPU_USAGE,
+  VARIABLE_CPU_ACTIVE,
+  VARIABLE_CPU_ACTIVE_TIME,
+#endif
+
+#ifdef HAVE_MEMORY_GROUP
+  /* memory */
+  VARIABLE_MEMORY_USED,
+  VARIABLE_MEMORY_AVAILABLE,
+  VARIABLE_MEMORY_SIZE,
+#endif
+
+  /* misc */
+  VARIABLE_MIPMAPED,
+  VARIABLE_ASSIGNED_THREADS,
+  VARIABLE_ACTIVE_THREADS,
+  VARIABLE_ASYNC_RUNNING,
+  VARIABLE_TILE_ALLOC_TOTAL,
+  VARIABLE_SCRATCH_TOTAL,
+  VARIABLE_TEMP_BUF_TOTAL,
+
+
+  N_VARIABLES,
+
+  VARIABLE_SEPARATOR
+} Variable;
+
+typedef enum
+{
+  VARIABLE_TYPE_BOOLEAN,
+  VARIABLE_TYPE_INTEGER,
+  VARIABLE_TYPE_SIZE,
+  VARIABLE_TYPE_SIZE_RATIO,
+  VARIABLE_TYPE_INT_RATIO,
+  VARIABLE_TYPE_PERCENTAGE,
+  VARIABLE_TYPE_DURATION,
+  VARIABLE_TYPE_RATE_OF_CHANGE
+} VariableType;
+
+typedef enum
+{
+  FIRST_GROUP,
+
+  GROUP_CACHE = FIRST_GROUP,
+  GROUP_SWAP,
+#ifdef HAVE_CPU_GROUP
+  GROUP_CPU,
+#endif
+#ifdef HAVE_MEMORY_GROUP
+  GROUP_MEMORY,
+#endif
+  GROUP_MISC,
+
+  N_GROUPS
+} Group;
+
+
+typedef struct _VariableInfo  VariableInfo;
+typedef struct _FieldInfo     FieldInfo;
+typedef struct _GroupInfo     GroupInfo;
+typedef struct _VariableData  VariableData;
+typedef struct _FieldData     FieldData;
+typedef struct _GroupData     GroupData;
+
+typedef void (* VariableFunc) (GimpDashboard *dashboard,
+                               Variable       variable);
+
+
+struct _VariableInfo
+{
+  const gchar   *name;
+  const gchar   *title;
+  const gchar   *description;
+  VariableType   type;
+  gboolean       exclude_from_log;
+  GimpRGB        color;
+  VariableFunc   sample_func;
+  VariableFunc   reset_func;
+  gconstpointer  data;
+};
+
+struct _FieldInfo
+{
+  Variable     variable;
+  const gchar *title;
+  gboolean     default_active;
+  gboolean     show_in_header;
+  Variable     meter_variable;
+  gint         meter_value;
+  gboolean     meter_cumulative;
+};
+
+struct _GroupInfo
+{
+  const gchar     *name;
+  const gchar     *title;
+  const gchar     *description;
+  gboolean         default_active;
+  gboolean         default_expanded;
+  gboolean         has_meter;
+  Variable         meter_limit;
+  const Variable  *meter_led;
+  const FieldInfo *fields;
+};
+
+struct _VariableData
+{
+  gboolean available;
+
+  union
+  {
+    gboolean  boolean;
+    gint      integer;
+    guint64   size;           /* in bytes                   */
+    struct
+    {
+      guint64 antecedent;
+      guint64 consequent;
+    } size_ratio;
+    struct
+    {
+      gint    antecedent;
+      gint    consequent;
+    } int_ratio;
+    gdouble   percentage;     /* from 0 to 1                */
+    gdouble   duration;       /* in seconds                 */
+    gdouble   rate_of_change; /* in source units per second */
+  } value;
+
+  gpointer data;
+  gsize    data_size;
+};
+
+struct _FieldData
+{
+  gboolean          active;
+
+  GtkCheckMenuItem *menu_item;
+  GtkLabel         *value_label;
+};
+
+struct _GroupData
+{
+  gint              n_fields;
+  gint              n_meter_values;
+
+  gboolean          active;
+  gdouble           limit;
+
+  GimpToggleAction *action;
+  GtkExpander      *expander;
+  GtkLabel         *header_values_label;
+  GtkButton        *menu_button;
+  GtkMenu          *menu;
+  GimpMeter        *meter;
+  GtkTable         *table;
+
+  FieldData        *fields;
+};
+
+struct _GimpDashboardPrivate
+{
+  Gimp                         *gimp;
+
+  VariableData                  variables[N_VARIABLES];
+  GroupData                     groups[N_GROUPS];
+
+  GThread                      *thread;
+  GMutex                        mutex;
+  GCond                         cond;
+  gboolean                      quit;
+  gboolean                      update_now;
+
+  gint                          update_idle_id;
+  gint                          low_swap_space_idle_id;
+
+  GimpDashboardUpdateInteval    update_interval;
+  GimpDashboardHistoryDuration  history_duration;
+  gboolean                      low_swap_space_warning;
+
+  GOutputStream                *log_output;
+  GError                       *log_error;
+  GimpDashboardLogParams        log_params;
+  gint64                        log_start_time;
+  gint                          log_n_samples;
+  gint                          log_n_markers;
+  VariableData                  log_variables[N_VARIABLES];
+  GimpBacktrace                *log_backtrace;
+  GHashTable                   *log_addresses;
+  GimpLogHandler                log_log_handler;
+
+  GimpHighlightableButton      *log_record_button;
+  GtkLabel                     *log_add_marker_label;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_dashboard_docked_iface_init              (GimpDockedInterface *iface);
+
+static void       gimp_dashboard_constructed                    (GObject             *object);
+static void       gimp_dashboard_dispose                        (GObject             *object);
+static void       gimp_dashboard_finalize                       (GObject             *object);
+
+static void       gimp_dashboard_map                            (GtkWidget           *widget);
+static void       gimp_dashboard_unmap                          (GtkWidget           *widget);
+
+static void       gimp_dashboard_set_aux_info                   (GimpDocked          *docked,
+                                                                 GList               *aux_info);
+static GList    * gimp_dashboard_get_aux_info                   (GimpDocked          *docked);
+
+static gboolean   gimp_dashboard_group_expander_button_press    (GimpDashboard       *dashboard,
+                                                                 GdkEventButton      *bevent,
+                                                                 GtkWidget           *widget);
+
+static void       gimp_dashboard_group_action_toggled           (GimpDashboard       *dashboard,
+                                                                 GimpToggleAction    *action);
+static void       gimp_dashboard_field_menu_item_toggled        (GimpDashboard       *dashboard,
+                                                                 GtkCheckMenuItem    *item);
+
+static gpointer   gimp_dashboard_sample                         (GimpDashboard       *dashboard);
+
+static gboolean   gimp_dashboard_update                         (GimpDashboard       *dashboard);
+static gboolean   gimp_dashboard_low_swap_space                 (GimpDashboard       *dashboard);
+
+static void       gimp_dashboard_sample_function                (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_gegl_config             (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_gegl_stats              (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_variable_changed        (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_variable_rate_of_change (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_swap_limit              (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+#ifdef HAVE_CPU_GROUP
+static void       gimp_dashboard_sample_cpu_usage               (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_cpu_active              (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_cpu_active_time         (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+#endif /* HAVE_CPU_GROUP */
+
+#ifdef HAVE_MEMORY_GROUP
+static void       gimp_dashboard_sample_memory_used             (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_memory_available        (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static void       gimp_dashboard_sample_memory_size             (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+#endif /* HAVE_MEMORY_GROUP */
+
+static void       gimp_dashboard_sample_object                  (GimpDashboard       *dashboard,
+                                                                 GObject             *object,
+                                                                 Variable             variable);
+
+static void       gimp_dashboard_group_menu_position            (GtkMenu             *menu,
+                                                                 gint                *x,
+                                                                 gint                *y,
+                                                                 gboolean            *push_in,
+                                                                 gpointer             user_data);
+
+static void       gimp_dashboard_update_groups                  (GimpDashboard       *dashboard);
+static void       gimp_dashboard_update_group                   (GimpDashboard       *dashboard,
+                                                                 Group                group);
+static void       gimp_dashboard_update_group_values            (GimpDashboard       *dashboard,
+                                                                 Group                group);
+
+static void       gimp_dashboard_group_set_active               (GimpDashboard       *dashboard,
+                                                                 Group                group,
+                                                                 gboolean             active);
+static void       gimp_dashboard_field_set_active               (GimpDashboard       *dashboard,
+                                                                 Group                group,
+                                                                 gint                 field,
+                                                                 gboolean             active);
+
+static void       gimp_dashboard_reset_unlocked                 (GimpDashboard       *dashboard);
+
+static void       gimp_dashboard_reset_variables                (GimpDashboard       *dashboard);
+
+static gpointer   gimp_dashboard_variable_get_data              (GimpDashboard       *dashboard,
+                                                                 Variable             variable,
+                                                                 gsize                size);
+
+static gboolean   gimp_dashboard_variable_to_boolean            (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+static gdouble    gimp_dashboard_variable_to_double             (GimpDashboard       *dashboard,
+                                                                 Variable             variable);
+
+static gchar    * gimp_dashboard_field_to_string                (GimpDashboard       *dashboard,
+                                                                 Group                group,
+                                                                 gint                 field,
+                                                                 gboolean             full);
+
+static gboolean   gimp_dashboard_log_printf                     (GimpDashboard       *dashboard,
+                                                                 const gchar         *format,
+                                                                 ...) G_GNUC_PRINTF (2, 3);
+static gboolean   gimp_dashboard_log_print_escaped              (GimpDashboard       *dashboard,
+                                                                 const gchar         *string);
+static gint64     gimp_dashboard_log_time                       (GimpDashboard       *dashboard);
+static void       gimp_dashboard_log_sample                     (GimpDashboard       *dashboard,
+                                                                 gboolean             variables_changed,
+                                                                 gboolean             include_current_thread);
+static void       gimp_dashboard_log_add_marker_unlocked        (GimpDashboard       *dashboard,
+                                                                 const gchar         *description);
+static void       gimp_dashboard_log_update_highlight           (GimpDashboard       *dashboard);
+static void       gimp_dashboard_log_update_n_markers           (GimpDashboard       *dashboard);
+
+static void       gimp_dashboard_log_write_address_map          (GimpDashboard       *dashboard,
+                                                                 guintptr            *addresses,
+                                                                 gint                 n_addresses,
+                                                                 GimpAsync           *async);
+static void       gimp_dashboard_log_write_global_address_map   (GimpAsync           *async,
+                                                                 GimpDashboard       *dashboard);
+static void       gimp_dashboard_log_log_func                   (const gchar         *log_domain,
+                                                                 GLogLevelFlags       log_levels,
+                                                                 const gchar         *message,
+                                                                 GimpDashboard       *dashboard);
+
+static gboolean   gimp_dashboard_field_use_meter_underlay       (Group                group,
+                                                                 gint                 field);
+
+static gchar    * gimp_dashboard_format_rate_of_change          (const gchar         *value);
+static gchar    * gimp_dashboard_format_value                   (VariableType         type,
+                                                                 gdouble              value);
+
+static void       gimp_dashboard_label_set_text                 (GtkLabel            *label,
+                                                                 const gchar         *text);
+
+
+/*  static variables  */
+
+static const VariableInfo variables[] =
+{
+  /* cache variables */
+
+  [VARIABLE_CACHE_OCCUPIED] =
+  { .name             = "cache-occupied",
+    .title            = NC_("dashboard-variable", "Occupied"),
+    .description      = N_("Tile cache occupied size"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.3, 0.6, 0.3, 1.0},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "tile-cache-total"
+  },
+
+  [VARIABLE_CACHE_MAXIMUM] =
+  { .name             = "cache-maximum",
+    .title            = NC_("dashboard-variable", "Maximum"),
+    .description      = N_("Maximal tile cache occupied size"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.3, 0.7, 0.8, 1.0},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "tile-cache-total-max"
+  },
+
+  [VARIABLE_CACHE_LIMIT] =
+  { .name             = "cache-limit",
+    .title            = NC_("dashboard-variable", "Limit"),
+    .description      = N_("Tile cache size limit"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .sample_func      = gimp_dashboard_sample_gegl_config,
+    .data             = "tile-cache-size"
+  },
+
+  [VARIABLE_CACHE_COMPRESSION] =
+  { .name             = "cache-compression",
+    .title            = NC_("dashboard-variable", "Compression"),
+    .description      = N_("Tile cache compression ratio"),
+    .type             = VARIABLE_TYPE_SIZE_RATIO,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "tile-cache-total\0"
+                        "tile-cache-total-uncompressed"
+  },
+
+  [VARIABLE_CACHE_HIT_MISS] =
+  { .name             = "cache-hit-miss",
+    .title            = NC_("dashboard-variable", "Hit/Miss"),
+    .description      = N_("Tile cache hit/miss ratio"),
+    .type             = VARIABLE_TYPE_INT_RATIO,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "tile-cache-hits\0"
+                        "tile-cache-misses"
+  },
+
+
+  /* swap variables */
+
+  [VARIABLE_SWAP_OCCUPIED] =
+  { .name             = "swap-occupied",
+    .title            = NC_("dashboard-variable", "Occupied"),
+    .description      = N_("Swap file occupied size"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.8, 0.2, 0.2, 1.0},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-total"
+  },
+
+  [VARIABLE_SWAP_SIZE] =
+  { .name             = "swap-size",
+    .title            = NC_("dashboard-variable", "Size"),
+    .description      = N_("Swap file size"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.8, 0.6, 0.4, 1.0},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-file-size"
+  },
+
+  [VARIABLE_SWAP_LIMIT] =
+  { .name             = "swap-limit",
+    .title            = NC_("dashboard-variable", "Limit"),
+    .description      = N_("Swap file size limit"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .sample_func      = gimp_dashboard_sample_swap_limit,
+  },
+
+  [VARIABLE_SWAP_QUEUED] =
+  { .name             = "swap-queued",
+    .title            = NC_("dashboard-variable", "Queued"),
+    .description      = N_("Size of data queued for writing to the swap"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.8, 0.8, 0.2, 0.5},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-queued-total"
+  },
+
+  [VARIABLE_SWAP_QUEUE_STALLS] =
+  { .name             = "swap-queue-stalls",
+    .title            = NC_("dashboard-variable", "Queue stalls"),
+    .description      = N_("Number of times the writing to the swap has been "
+                           "stalled, due to a full queue"),
+    .type             = VARIABLE_TYPE_INTEGER,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-queue-stalls"
+  },
+
+  [VARIABLE_SWAP_QUEUE_FULL] =
+  { .name             = "swap-queue-full",
+    .title            = NC_("dashboard-variable", "Queue full"),
+    .description      = N_("Whether the swap queue is full"),
+    .type             = VARIABLE_TYPE_BOOLEAN,
+    .sample_func      = gimp_dashboard_sample_variable_changed,
+    .data             = GINT_TO_POINTER (VARIABLE_SWAP_QUEUE_STALLS)
+  },
+
+  [VARIABLE_SWAP_READ] =
+  { .name             = "swap-read",
+    /* Translators: this is the past participle form of "read",
+     *              as in "total amount of data read from the swap".
+     */
+    .title            = NC_("dashboard-variable", "Read"),
+    .description      = N_("Total amount of data read from the swap"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.2, 0.4, 1.0, 0.4},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-read-total"
+  },
+
+  [VARIABLE_SWAP_READ_THROUGHPUT] =
+  { .name             = "swap-read-throughput",
+    .title            = NC_("dashboard-variable", "Read throughput"),
+    .description      = N_("The rate at which data is read from the swap"),
+    .type             = VARIABLE_TYPE_RATE_OF_CHANGE,
+    .color            = {0.2, 0.4, 1.0, 1.0},
+    .sample_func      = gimp_dashboard_sample_variable_rate_of_change,
+    .data             = GINT_TO_POINTER (VARIABLE_SWAP_READ)
+  },
+
+  [VARIABLE_SWAP_WRITTEN] =
+  { .name             = "swap-written",
+    /* Translators: this is the past participle form of "write",
+     *              as in "total amount of data written to the swap".
+     */
+    .title            = NC_("dashboard-variable", "Written"),
+    .description      = N_("Total amount of data written to the swap"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.8, 0.3, 0.2, 0.4},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-write-total"
+  },
+
+  [VARIABLE_SWAP_WRITE_THROUGHPUT] =
+  { .name             = "swap-write-throughput",
+    .title            = NC_("dashboard-variable", "Write throughput"),
+    .description      = N_("The rate at which data is written to the swap"),
+    .type             = VARIABLE_TYPE_RATE_OF_CHANGE,
+    .color            = {0.8, 0.3, 0.2, 1.0},
+    .sample_func      = gimp_dashboard_sample_variable_rate_of_change,
+    .data             = GINT_TO_POINTER (VARIABLE_SWAP_WRITTEN)
+  },
+
+  [VARIABLE_SWAP_COMPRESSION] =
+  { .name             = "swap-compression",
+    .title            = NC_("dashboard-variable", "Compression"),
+    .description      = N_("Swap compression ratio"),
+    .type             = VARIABLE_TYPE_SIZE_RATIO,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "swap-total\0"
+                        "swap-total-uncompressed"
+  },
+
+
+#ifdef HAVE_CPU_GROUP
+  /* cpu variables */
+
+  [VARIABLE_CPU_USAGE] =
+  { .name             = "cpu-usage",
+    .title            = NC_("dashboard-variable", "Usage"),
+    .description      = N_("Total CPU usage"),
+    .type             = VARIABLE_TYPE_PERCENTAGE,
+    .color            = {0.8, 0.7, 0.2, 1.0},
+    .sample_func      = gimp_dashboard_sample_cpu_usage
+  },
+
+  [VARIABLE_CPU_ACTIVE] =
+  { .name             = "cpu-active",
+    .title            = NC_("dashboard-variable", "Active"),
+    .description      = N_("Whether the CPU is active"),
+    .type             = VARIABLE_TYPE_BOOLEAN,
+    .color            = {0.9, 0.8, 0.3, 1.0},
+    .sample_func      = gimp_dashboard_sample_cpu_active
+  },
+
+  [VARIABLE_CPU_ACTIVE_TIME] =
+  { .name             = "cpu-active-time",
+    .title            = NC_("dashboard-variable", "Active"),
+    .description      = N_("Total amount of time the CPU has been active"),
+    .type             = VARIABLE_TYPE_DURATION,
+    .color            = {0.8, 0.7, 0.2, 0.4},
+    .sample_func      = gimp_dashboard_sample_cpu_active_time
+  },
+#endif /* HAVE_CPU_GROUP */
+
+
+#ifdef HAVE_MEMORY_GROUP
+  /* memory variables */
+
+  [VARIABLE_MEMORY_USED] =
+  { .name             = "memory-used",
+    .title            = NC_("dashboard-variable", "Used"),
+    .description      = N_("Amount of memory used by the process"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.8, 0.5, 0.2, 1.0},
+    .sample_func      = gimp_dashboard_sample_memory_used
+  },
+
+  [VARIABLE_MEMORY_AVAILABLE] =
+  { .name             = "memory-available",
+    .title            = NC_("dashboard-variable", "Available"),
+    .description      = N_("Amount of available physical memory"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.8, 0.5, 0.2, 0.4},
+    .sample_func      = gimp_dashboard_sample_memory_available
+  },
+
+  [VARIABLE_MEMORY_SIZE] =
+  { .name             = "memory-size",
+    .title            = NC_("dashboard-variable", "Size"),
+    .description      = N_("Physical memory size"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .sample_func      = gimp_dashboard_sample_memory_size
+  },
+#endif /* HAVE_MEMORY_GROUP */
+
+
+  /* misc variables */
+
+  [VARIABLE_MIPMAPED] =
+  { .name             = "mipmapped",
+    .title            = NC_("dashboard-variable", "Mipmapped"),
+    .description      = N_("Total size of processed mipmapped data"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "zoom-total"
+  },
+
+  [VARIABLE_ASSIGNED_THREADS] =
+  { .name             = "assigned-threads",
+    .title            = NC_("dashboard-variable", "Assigned"),
+    .description      = N_("Number of assigned worker threads"),
+    .type             = VARIABLE_TYPE_INTEGER,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "assigned-threads"
+  },
+
+  [VARIABLE_ACTIVE_THREADS] =
+  { .name             = "active-threads",
+    .title            = NC_("dashboard-variable", "Active"),
+    .description      = N_("Number of active worker threads"),
+    .type             = VARIABLE_TYPE_INTEGER,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "active-threads"
+  },
+
+  [VARIABLE_ASYNC_RUNNING] =
+  { .name             = "async-running",
+    .title            = NC_("dashboard-variable", "Async"),
+    .description      = N_("Number of ongoing asynchronous operations"),
+    .type             = VARIABLE_TYPE_INTEGER,
+    .sample_func      = gimp_dashboard_sample_function,
+    .data             = gimp_async_get_n_running
+  },
+
+  [VARIABLE_TILE_ALLOC_TOTAL] =
+  { .name             = "tile-alloc-total",
+    .title            = NC_("dashboard-variable", "Tile"),
+    .description      = N_("Total size of tile memory"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .color            = {0.3, 0.3, 1.0, 1.0},
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "tile-alloc-total"
+  },
+
+  [VARIABLE_SCRATCH_TOTAL] =
+  { .name             = "scratch-total",
+    .title            = NC_("dashboard-variable", "Scratch"),
+    .description      = N_("Total size of scratch memory"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .sample_func      = gimp_dashboard_sample_gegl_stats,
+    .data             = "scratch-total"
+  },
+
+  [VARIABLE_TEMP_BUF_TOTAL] =
+  { .name             = "temp-buf-total",
+    /* Translators:  "TempBuf" is a technical term referring to an internal
+     * GIMP data structure.  It's probably OK to leave it untranslated.
+     */
+    .title            = NC_("dashboard-variable", "TempBuf"),
+    .description      = N_("Total size of temporary buffers"),
+    .type             = VARIABLE_TYPE_SIZE,
+    .sample_func      = gimp_dashboard_sample_function,
+    .data             = gimp_temp_buf_get_total_memsize
+  }
+};
+
+static const GroupInfo groups[] =
+{
+  /* cache group */
+  [GROUP_CACHE] =
+  { .name             = "cache",
+    .title            = NC_("dashboard-group", "Cache"),
+    .description      = N_("In-memory tile cache"),
+    .default_active   = TRUE,
+    .default_expanded = TRUE,
+    .has_meter        = TRUE,
+    .meter_limit      = VARIABLE_CACHE_LIMIT,
+    .fields           = (const FieldInfo[])
+                        {
+                          { .variable         = VARIABLE_CACHE_OCCUPIED,
+                            .default_active   = TRUE,
+                            .show_in_header   = TRUE,
+                            .meter_value      = 2
+                          },
+                          { .variable         = VARIABLE_CACHE_MAXIMUM,
+                            .default_active   = FALSE,
+                            .meter_value      = 1
+                          },
+                          { .variable         = VARIABLE_CACHE_LIMIT,
+                            .default_active   = TRUE
+                          },
+
+                          { VARIABLE_SEPARATOR },
+
+                          { .variable         = VARIABLE_CACHE_COMPRESSION,
+                            .default_active   = FALSE
+                          },
+                          { .variable         = VARIABLE_CACHE_HIT_MISS,
+                            .default_active   = FALSE
+                          },
+
+                          {}
+                        }
+  },
+
+  /* swap group */
+  [GROUP_SWAP] =
+  { .name             = "swap",
+    .title            = NC_("dashboard-group", "Swap"),
+    .description      = N_("On-disk tile swap"),
+    .default_active   = TRUE,
+    .default_expanded = TRUE,
+    .has_meter        = TRUE,
+    .meter_limit      = VARIABLE_SWAP_LIMIT,
+    .meter_led        = (const Variable[])
+                        {
+                          VARIABLE_SWAP_QUEUE_FULL,
+                          VARIABLE_SWAP_READ_THROUGHPUT,
+                          VARIABLE_SWAP_WRITE_THROUGHPUT,
+
+                          VARIABLE_NONE
+                        },
+    .fields           = (const FieldInfo[])
+                        {
+                          { .variable         = VARIABLE_SWAP_OCCUPIED,
+                            .default_active   = TRUE,
+                            .show_in_header   = TRUE,
+                            .meter_value      = 5
+                          },
+                          { .variable         = VARIABLE_SWAP_SIZE,
+                            .default_active   = TRUE,
+                            .meter_value      = 4
+                          },
+                          { .variable         = VARIABLE_SWAP_LIMIT,
+                            .default_active   = TRUE
+                          },
+
+                          { VARIABLE_SEPARATOR },
+
+                          { .variable         = VARIABLE_SWAP_QUEUED,
+                            .default_active   = FALSE,
+                            .meter_variable   = VARIABLE_SWAP_QUEUE_FULL,
+                            .meter_value      = 3
+                          },
+
+                          { VARIABLE_SEPARATOR },
+
+                          { .variable         = VARIABLE_SWAP_READ,
+                            .default_active   = FALSE,
+                            .meter_variable   = VARIABLE_SWAP_READ_THROUGHPUT,
+                            .meter_value      = 2
+                          },
+
+                          { .variable         = VARIABLE_SWAP_WRITTEN,
+                            .default_active   = FALSE,
+                            .meter_variable   = VARIABLE_SWAP_WRITE_THROUGHPUT,
+                            .meter_value      = 1
+                          },
+
+                          { VARIABLE_SEPARATOR },
+
+                          { .variable         = VARIABLE_SWAP_COMPRESSION,
+                            .default_active   = FALSE
+                          },
+
+                          {}
+                        }
+  },
+
+#ifdef HAVE_CPU_GROUP
+  /* cpu group */
+  [GROUP_CPU] =
+  { .name             = "cpu",
+    .title            = NC_("dashboard-group", "CPU"),
+    .description      = N_("CPU usage"),
+    .default_active   = TRUE,
+    .default_expanded = FALSE,
+    .has_meter        = TRUE,
+    .meter_led        = (const Variable[])
+                        {
+                          VARIABLE_CPU_ACTIVE,
+
+                          VARIABLE_NONE
+                        },
+    .fields           = (const FieldInfo[])
+                        {
+                          { .variable         = VARIABLE_CPU_USAGE,
+                            .default_active   = TRUE,
+                            .show_in_header   = TRUE,
+                            .meter_value      = 2
+                          },
+
+                          { VARIABLE_SEPARATOR },
+
+                          { .variable         = VARIABLE_CPU_ACTIVE_TIME,
+                            .default_active   = FALSE,
+                            .meter_variable   = VARIABLE_CPU_ACTIVE,
+                            .meter_value      = 1
+                          },
+
+                          {}
+                        }
+  },
+#endif /* HAVE_CPU_GROUP */
+
+#ifdef HAVE_MEMORY_GROUP
+  /* memory group */
+  [GROUP_MEMORY] =
+  { .name             = "memory",
+    .title            = NC_("dashboard-group", "Memory"),
+    .description      = N_("Memory usage"),
+    .default_active   = TRUE,
+    .default_expanded = FALSE,
+    .has_meter        = TRUE,
+    .meter_limit      = VARIABLE_MEMORY_SIZE,
+    .fields           = (const FieldInfo[])
+                        {
+                          { .variable         = VARIABLE_CACHE_OCCUPIED,
+                            .title            = NC_("dashboard-variable", "Cache"),
+                            .default_active   = FALSE,
+                            .meter_value      = 4
+                          },
+                          { .variable         = VARIABLE_TILE_ALLOC_TOTAL,
+                            .default_active   = FALSE,
+                            .meter_value      = 3
+                          },
+
+                          { VARIABLE_SEPARATOR },
+
+                          { .variable         = VARIABLE_MEMORY_USED,
+                            .default_active   = TRUE,
+                            .show_in_header   = TRUE,
+                            .meter_value      = 2,
+                            .meter_cumulative = TRUE
+                          },
+                          { .variable         = VARIABLE_MEMORY_AVAILABLE,
+                            .default_active   = TRUE,
+                            .meter_value      = 1,
+                            .meter_cumulative = TRUE
+                          },
+                          { .variable         = VARIABLE_MEMORY_SIZE,
+                            .default_active   = TRUE
+                          },
+
+                          {}
+                        }
+  },
+#endif /* HAVE_MEMORY_GROUP */
+
+  /* misc group */
+  [GROUP_MISC] =
+  { .name             = "misc",
+    .title            = NC_("dashboard-group", "Misc"),
+    .description      = N_("Miscellaneous information"),
+    .default_active   = FALSE,
+    .default_expanded = FALSE,
+    .has_meter        = FALSE,
+    .fields           = (const FieldInfo[])
+                        {
+                          { .variable       = VARIABLE_MIPMAPED,
+                            .default_active = TRUE
+                          },
+                          { .variable       = VARIABLE_ASSIGNED_THREADS,
+                            .default_active = TRUE
+                          },
+                          { .variable       = VARIABLE_ACTIVE_THREADS,
+                            .default_active = TRUE
+                          },
+                          { .variable       = VARIABLE_ASYNC_RUNNING,
+                            .default_active = TRUE
+                          },
+                          { .variable       = VARIABLE_TILE_ALLOC_TOTAL,
+                            .default_active = TRUE
+                          },
+                          { .variable       = VARIABLE_SCRATCH_TOTAL,
+                            .default_active = TRUE
+                          },
+                          { .variable       = VARIABLE_TEMP_BUF_TOTAL,
+                            .default_active = TRUE
+                          },
+
+                          {}
+                        }
+  },
+};
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDashboard, gimp_dashboard, GIMP_TYPE_EDITOR,
+                         G_ADD_PRIVATE (GimpDashboard)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_dashboard_docked_iface_init))
+
+#define parent_class gimp_dashboard_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+/*  private functions  */
+
+
+static void
+gimp_dashboard_class_init (GimpDashboardClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed = gimp_dashboard_constructed;
+  object_class->dispose     = gimp_dashboard_dispose;
+  object_class->finalize    = gimp_dashboard_finalize;
+
+  widget_class->map         = gimp_dashboard_map;
+  widget_class->unmap       = gimp_dashboard_unmap;
+}
+
+static void
+gimp_dashboard_init (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv;
+  GtkWidget            *box;
+  GtkWidget            *scrolled_window;
+  GtkWidget            *viewport;
+  GtkWidget            *vbox;
+  GtkWidget            *expander;
+  GtkWidget            *hbox;
+  GtkWidget            *button;
+  GtkWidget            *image;
+  GtkWidget            *menu;
+  GtkWidget            *item;
+  GtkWidget            *frame;
+  GtkWidget            *vbox2;
+  GtkWidget            *meter;
+  GtkWidget            *table;
+  GtkWidget            *label;
+  gint                  content_spacing;
+  Group                 group;
+  gint                  field;
+
+  priv = dashboard->priv = gimp_dashboard_get_instance_private (dashboard);
+
+  g_mutex_init (&priv->mutex);
+  g_cond_init (&priv->cond);
+
+  priv->update_interval        = DEFAULT_UPDATE_INTERVAL;
+  priv->history_duration       = DEFAULT_HISTORY_DURATION;
+  priv->low_swap_space_warning = DEFAULT_LOW_SWAP_SPACE_WARNING;
+
+  gtk_widget_style_get (GTK_WIDGET (dashboard),
+                        "content-spacing", &content_spacing,
+                        NULL);
+
+  /* we put the dashboard inside an event box, so that it gets its own window,
+   * which reduces the overhead of updating the ui, since it gets updated
+   * frequently.  unfortunately, this means that the dashboard's background
+   * color may be a bit off for some themes.
+   */
+  box = gtk_event_box_new ();
+  gtk_box_pack_start (GTK_BOX (dashboard), box, TRUE, TRUE, 0);
+  gtk_widget_show (box);
+
+  /* scrolled window */
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_container_add (GTK_CONTAINER (box), scrolled_window);
+  gtk_widget_show (scrolled_window);
+
+  /* viewport */
+  viewport = gtk_viewport_new (
+    gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)),
+    gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
+  gtk_widget_show (viewport);
+
+  /* main vbox */
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 * content_spacing);
+  gtk_container_add (GTK_CONTAINER (viewport), vbox);
+  gtk_widget_show (vbox);
+
+  /* construct the groups */
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    {
+      const GroupInfo *group_info = &groups[group];
+      GroupData       *group_data = &priv->groups[group];
+
+      group_data->n_fields       = 0;
+      group_data->n_meter_values = 0;
+
+      for (field = 0; group_info->fields[field].variable; field++)
+        {
+          const FieldInfo *field_info = &group_info->fields[field];
+
+          group_data->n_fields++;
+          group_data->n_meter_values = MAX (group_data->n_meter_values,
+                                            field_info->meter_value);
+        }
+
+      group_data->fields = g_new0 (FieldData, group_data->n_fields);
+
+      /* group expander */
+      expander = gtk_expander_new (NULL);
+      group_data->expander = GTK_EXPANDER (expander);
+      gtk_expander_set_expanded (GTK_EXPANDER (expander),
+                                 group_info->default_expanded);
+      gtk_expander_set_label_fill (GTK_EXPANDER (expander), TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+
+      g_object_set_data (G_OBJECT (expander),
+                         "gimp-dashboard-group", GINT_TO_POINTER (group));
+      g_signal_connect_swapped (expander, "button-press-event",
+                                G_CALLBACK (gimp_dashboard_group_expander_button_press),
+                                dashboard);
+
+      /* group expander label box */
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gimp_help_set_help_data (hbox,
+                               g_dgettext (NULL, group_info->description),
+                               NULL);
+      gtk_expander_set_label_widget (GTK_EXPANDER (expander), hbox);
+      gtk_widget_show (hbox);
+
+      /* group expander label */
+      label = gtk_label_new (g_dpgettext2 (NULL, "dashboard-group",
+                                           group_info->title));
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gimp_label_set_attributes (GTK_LABEL (label),
+                                 PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                                 -1);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+
+      /* group expander values label */
+      label = gtk_label_new (NULL);
+      group_data->header_values_label = GTK_LABEL (label);
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 4);
+
+      g_object_bind_property (expander, "expanded",
+                              label,    "visible",
+                              G_BINDING_SYNC_CREATE |
+                              G_BINDING_INVERT_BOOLEAN);
+
+      /* group expander menu button */
+      button = gtk_button_new ();
+      group_data->menu_button = GTK_BUTTON (button);
+      gimp_help_set_help_data (button, _("Select fields"),
+                               NULL);
+      gtk_widget_set_can_focus (button, FALSE);
+      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+      gtk_widget_show (button);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
+                                            GTK_ICON_SIZE_MENU);
+      gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
+      gtk_image_set_from_icon_name (GTK_IMAGE (image), GIMP_ICON_MENU_LEFT,
+                                    GTK_ICON_SIZE_MENU);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+
+      /* group menu */
+      menu = gtk_menu_new ();
+      group_data->menu = GTK_MENU (menu);
+      gtk_menu_attach_to_widget (GTK_MENU (menu), button, NULL);
+
+      for (field = 0; field < group_data->n_fields; field++)
+        {
+          const FieldInfo *field_info = &group_info->fields[field];
+          FieldData       *field_data = &group_data->fields[field];
+
+          if (field_info->variable != VARIABLE_SEPARATOR)
+            {
+              const VariableInfo *variable_info = &variables[field_info->variable];
+
+              item = gtk_check_menu_item_new_with_label (
+                g_dpgettext2 (NULL, "dashboard-variable",
+                              field_info->title ? field_info->title :
+                                                  variable_info->title));
+              field_data->menu_item = GTK_CHECK_MENU_ITEM (item);
+              gimp_help_set_help_data (item,
+                                       g_dgettext (NULL, variable_info->description),
+                                       NULL);
+
+              g_object_set_data (G_OBJECT (item),
+                                 "gimp-dashboard-group", GINT_TO_POINTER (group));
+              g_object_set_data (G_OBJECT (item),
+                                 "gimp-dashboard-field", GINT_TO_POINTER (field));
+              g_signal_connect_swapped (item, "toggled",
+                                        G_CALLBACK (gimp_dashboard_field_menu_item_toggled),
+                                        dashboard);
+
+              gimp_dashboard_field_set_active (dashboard, group, field,
+                                               field_info->default_active);
+            }
+          else
+            {
+              item = gtk_separator_menu_item_new ();
+            }
+
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+          gtk_widget_show (item);
+        }
+
+      /* group frame */
+      frame = gimp_frame_new (NULL);
+      gtk_container_add (GTK_CONTAINER (expander), frame);
+      gtk_widget_show (frame);
+
+      /* group vbox */
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 * content_spacing);
+      gtk_container_add (GTK_CONTAINER (frame), vbox2);
+      gtk_widget_show (vbox2);
+
+      /* group meter */
+      if (group_info->has_meter)
+        {
+          meter = gimp_meter_new (group_data->n_meter_values);
+          group_data->meter = GIMP_METER (meter);
+          gimp_help_set_help_data (meter,
+                                   g_dgettext (NULL, group_info->description),
+                                   NULL);
+          gimp_meter_set_history_resolution (GIMP_METER (meter),
+                                             priv->update_interval / 1000.0);
+          gimp_meter_set_history_duration (GIMP_METER (meter),
+                                           priv->history_duration / 1000.0);
+          gtk_box_pack_start (GTK_BOX (vbox2), meter, FALSE, FALSE, 0);
+          gtk_widget_show (meter);
+
+          for (field = 0; field < group_data->n_fields; field++)
+            {
+              const FieldInfo *field_info = &group_info->fields[field];
+
+              if (field_info->meter_value)
+                {
+                  const VariableInfo *variable_info = &variables[field_info->variable];
+
+                  gimp_meter_set_value_color (GIMP_METER (meter),
+                                              field_info->meter_value - 1,
+                                              &variable_info->color);
+
+                  if (gimp_dashboard_field_use_meter_underlay (group, field))
+                    {
+                      gimp_meter_set_value_show_in_gauge (GIMP_METER (meter),
+                                                          field_info->meter_value - 1,
+                                                          FALSE);
+                      gimp_meter_set_value_interpolation (GIMP_METER (meter),
+                                                          field_info->meter_value - 1,
+                                                          GIMP_INTERPOLATION_NONE);
+                    }
+                }
+            }
+        }
+
+      /* group table */
+      table = gtk_table_new (1, 1, FALSE);
+      group_data->table = GTK_TABLE (table);
+      gtk_table_set_row_spacings (GTK_TABLE (table), content_spacing);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+      gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
+      gtk_widget_show (table);
+
+      gimp_dashboard_group_set_active (dashboard, group,
+                                       group_info->default_active);
+      gimp_dashboard_update_group (dashboard, group);
+    }
+
+  /* sampler thread
+   *
+   * we use a separate thread for sampling, so that data is sampled even when
+   * the main thread is busy
+   */
+  priv->thread = g_thread_new ("dashboard",
+                               (GThreadFunc) gimp_dashboard_sample,
+                               dashboard);
+}
+
+static void
+gimp_dashboard_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_aux_info = gimp_dashboard_set_aux_info;
+  iface->get_aux_info = gimp_dashboard_get_aux_info;
+}
+
+static void
+gimp_dashboard_constructed (GObject *object)
+{
+  GimpDashboard        *dashboard = GIMP_DASHBOARD (object);
+  GimpDashboardPrivate *priv = dashboard->priv;
+  GimpUIManager        *ui_manager;
+  GimpActionGroup      *action_group;
+  GimpAction           *action;
+  GtkWidget            *button;
+  GtkWidget            *alignment;
+  GtkWidget            *box;
+  GtkWidget            *image;
+  GtkWidget            *label;
+  Group                 group;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  ui_manager   = gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard));
+  action_group = gimp_ui_manager_get_action_group (ui_manager, "dashboard");
+
+  /* group actions */
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    {
+      const GroupInfo       *group_info = &groups[group];
+      GroupData             *group_data = &priv->groups[group];
+      GimpToggleActionEntry  entry      = {};
+
+      entry.name      = g_strdup_printf ("dashboard-group-%s", group_info->name);
+      entry.label     = g_dpgettext2 (NULL, "dashboard-group", group_info->title);
+      entry.tooltip   = g_dgettext (NULL, group_info->description);
+      entry.help_id   = GIMP_HELP_DASHBOARD_GROUPS;
+      entry.is_active = group_data->active;
+
+      gimp_action_group_add_toggle_actions (action_group, "dashboard-groups",
+                                            &entry, 1);
+
+      action = gimp_ui_manager_find_action (ui_manager, "dashboard", entry.name);
+      group_data->action = GIMP_TOGGLE_ACTION (action);
+
+      g_object_set_data (G_OBJECT (action),
+                         "gimp-dashboard-group", GINT_TO_POINTER (group));
+      g_signal_connect_swapped (action, "toggled",
+                                G_CALLBACK (gimp_dashboard_group_action_toggled),
+                                dashboard);
+
+      g_free ((gpointer) entry.name);
+    }
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
+                                          "dashboard-log-record", NULL);
+  priv->log_record_button = GIMP_HIGHLIGHTABLE_BUTTON (button);
+  gimp_highlightable_button_set_highlight_color (
+    GIMP_HIGHLIGHTABLE_BUTTON (button),
+    GIMP_HIGHLIGHTABLE_BUTTON_COLOR_AFFIRMATIVE);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
+                                          "dashboard-log-add-marker",
+                                          "dashboard-log-add-empty-marker",
+                                          gimp_get_extend_selection_mask (),
+                                          NULL);
+
+  action = gimp_action_group_get_action (action_group,
+                                         "dashboard-log-add-marker");
+  g_object_bind_property (action, "sensitive",
+                          button, "visible",
+                          G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+
+  image = g_object_ref (gtk_bin_get_child (GTK_BIN (button)));
+  gtk_container_remove (GTK_CONTAINER (button), image);
+
+  alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (button), alignment);
+  gtk_widget_show (alignment);
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_container_add (GTK_CONTAINER (alignment), box);
+  gtk_widget_show (box);
+
+  gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
+  g_object_unref (image);
+
+  label = gtk_label_new (NULL);
+  priv->log_add_marker_label = GTK_LABEL (label);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
+                                          "dashboard-reset", NULL);
+
+  action = gimp_action_group_get_action (action_group,
+                                         "dashboard-reset");
+  g_object_bind_property (action, "sensitive",
+                          button, "visible",
+                          G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+
+  gimp_action_group_update (action_group, dashboard);
+}
+
+static void
+gimp_dashboard_dispose (GObject *object)
+{
+  GimpDashboard        *dashboard = GIMP_DASHBOARD (object);
+  GimpDashboardPrivate *priv      = dashboard->priv;
+
+  if (priv->thread)
+    {
+      g_mutex_lock (&priv->mutex);
+
+      priv->quit = TRUE;
+      g_cond_signal (&priv->cond);
+
+      g_mutex_unlock (&priv->mutex);
+
+      g_clear_pointer (&priv->thread, g_thread_join);
+    }
+
+  if (priv->update_idle_id)
+    {
+      g_source_remove (priv->update_idle_id);
+      priv->update_idle_id = 0;
+    }
+
+  if (priv->low_swap_space_idle_id)
+    {
+      g_source_remove (priv->low_swap_space_idle_id);
+      priv->low_swap_space_idle_id = 0;
+    }
+
+  gimp_dashboard_log_stop_recording (dashboard, NULL);
+
+  gimp_dashboard_reset_variables (dashboard);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dashboard_finalize (GObject *object)
+{
+  GimpDashboard        *dashboard = GIMP_DASHBOARD (object);
+  GimpDashboardPrivate *priv      = dashboard->priv;
+  gint                  i;
+
+  for (i = FIRST_GROUP; i < N_GROUPS; i++)
+    g_free (priv->groups[i].fields);
+
+  g_mutex_clear (&priv->mutex);
+  g_cond_clear (&priv->cond);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dashboard_map (GtkWidget *widget)
+{
+  GimpDashboard *dashboard = GIMP_DASHBOARD (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+  gimp_dashboard_update (dashboard);
+}
+
+static void
+gimp_dashboard_unmap (GtkWidget *widget)
+{
+  GimpDashboard        *dashboard = GIMP_DASHBOARD (widget);
+  GimpDashboardPrivate *priv      = dashboard->priv;
+
+  g_mutex_lock (&priv->mutex);
+
+  if (priv->update_idle_id)
+    {
+      g_source_remove (priv->update_idle_id);
+      priv->update_idle_id = 0;
+    }
+
+  g_mutex_unlock (&priv->mutex);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+#define AUX_INFO_UPDATE_INTERVAL        "update-interval"
+#define AUX_INFO_HISTORY_DURATION       "history-duration"
+#define AUX_INFO_LOW_SWAP_SPACE_WARNING "low-swap-space-warning"
+
+static void
+gimp_dashboard_set_aux_info (GimpDocked *docked,
+                             GList      *aux_info)
+{
+  GimpDashboard        *dashboard = GIMP_DASHBOARD (docked);
+  GimpDashboardPrivate *priv      = dashboard->priv;
+  gchar                *name;
+  GList                *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (! strcmp (aux->name, AUX_INFO_UPDATE_INTERVAL))
+        {
+          gint                       value = atoi (aux->value);
+          GimpDashboardUpdateInteval update_interval;
+
+          for (update_interval = GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC;
+               update_interval < value &&
+               update_interval < GIMP_DASHBOARD_UPDATE_INTERVAL_4_SEC;
+               update_interval *= 2);
+
+          gimp_dashboard_set_update_interval (dashboard, update_interval);
+        }
+      else if (! strcmp (aux->name, AUX_INFO_HISTORY_DURATION))
+        {
+          gint                         value = atoi (aux->value);
+          GimpDashboardHistoryDuration history_duration;
+
+          for (history_duration = GIMP_DASHBOARD_HISTORY_DURATION_15_SEC;
+               history_duration < value &&
+               history_duration < GIMP_DASHBOARD_HISTORY_DURATION_240_SEC;
+               history_duration *= 2);
+
+          gimp_dashboard_set_history_duration (dashboard, history_duration);
+        }
+      else if (! strcmp (aux->name, AUX_INFO_LOW_SWAP_SPACE_WARNING))
+        {
+          gimp_dashboard_set_low_swap_space_warning (dashboard,
+                                                     ! strcmp (aux->value, "yes"));
+        }
+      else
+        {
+          Group group;
+          gint  field;
+
+          for (group = FIRST_GROUP; group < N_GROUPS; group++)
+            {
+              const GroupInfo *group_info = &groups[group];
+              GroupData       *group_data = &priv->groups[group];
+
+              name = g_strdup_printf ("%s-active", group_info->name);
+
+              if (! strcmp (aux->name, name))
+                {
+                  gboolean active = ! strcmp (aux->value, "yes");
+
+                  gimp_dashboard_group_set_active (dashboard, group, active);
+
+                  g_free (name);
+                  goto next_aux_info;
+                }
+
+              g_free (name);
+
+              name = g_strdup_printf ("%s-expanded", group_info->name);
+
+              if (! strcmp (aux->name, name))
+                {
+                  gboolean expanded = ! strcmp (aux->value, "yes");
+
+                  gtk_expander_set_expanded (group_data->expander, expanded);
+
+                  g_free (name);
+                  goto next_aux_info;
+                }
+
+              g_free (name);
+
+              for (field = 0; field < group_data->n_fields; field++)
+                {
+                  const FieldInfo *field_info = &group_info->fields[field];
+
+                  if (field_info->variable != VARIABLE_SEPARATOR)
+                    {
+                      const VariableInfo *variable_info = &variables[field_info->variable];
+
+                      name = g_strdup_printf ("%s-%s-active",
+                                              group_info->name,
+                                              variable_info->name);
+
+                      if (! strcmp (aux->name, name))
+                        {
+                          gboolean active = ! strcmp (aux->value, "yes");
+
+                          gimp_dashboard_field_set_active (dashboard,
+                                                           group, field,
+                                                           active);
+
+                          g_free (name);
+                          goto next_aux_info;
+                        }
+
+                      g_free (name);
+                    }
+                }
+            }
+        }
+next_aux_info: ;
+    }
+
+  gimp_dashboard_update_groups (dashboard);
+}
+
+static GList *
+gimp_dashboard_get_aux_info (GimpDocked *docked)
+{
+  GimpDashboard        *dashboard = GIMP_DASHBOARD (docked);
+  GimpDashboardPrivate *priv      = dashboard->priv;
+  GList                *aux_info;
+  GimpSessionInfoAux   *aux;
+  gchar                *name;
+  gchar                *value;
+  Group                 group;
+  gint                  field;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  if (priv->update_interval != DEFAULT_UPDATE_INTERVAL)
+    {
+      value    = g_strdup_printf ("%d", priv->update_interval);
+      aux      = gimp_session_info_aux_new (AUX_INFO_UPDATE_INTERVAL, value);
+      aux_info = g_list_append (aux_info, aux);
+      g_free (value);
+    }
+
+  if (priv->history_duration != DEFAULT_HISTORY_DURATION)
+    {
+      value    = g_strdup_printf ("%d", priv->history_duration);
+      aux      = gimp_session_info_aux_new (AUX_INFO_HISTORY_DURATION, value);
+      aux_info = g_list_append (aux_info, aux);
+      g_free (value);
+    }
+
+  if (priv->low_swap_space_warning != DEFAULT_LOW_SWAP_SPACE_WARNING)
+    {
+      value    = priv->low_swap_space_warning ? "yes" : "no";
+      aux      = gimp_session_info_aux_new (AUX_INFO_LOW_SWAP_SPACE_WARNING, value);
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    {
+      const GroupInfo *group_info = &groups[group];
+      GroupData       *group_data = &priv->groups[group];
+      gboolean         active     = group_data->active;
+      gboolean         expanded   = gtk_expander_get_expanded (group_data->expander);
+
+      if (active != group_info->default_active)
+        {
+          name     = g_strdup_printf ("%s-active", group_info->name);
+          value    = active ? "yes" : "no";
+          aux      = gimp_session_info_aux_new (name, value);
+          aux_info = g_list_append (aux_info, aux);
+          g_free (name);
+        }
+
+      if (expanded != group_info->default_expanded)
+        {
+          name     = g_strdup_printf ("%s-expanded", group_info->name);
+          value    = expanded ? "yes" : "no";
+          aux      = gimp_session_info_aux_new (name, value);
+          aux_info = g_list_append (aux_info, aux);
+          g_free (name);
+        }
+
+      for (field = 0; field < group_data->n_fields; field++)
+        {
+          const FieldInfo *field_info = &group_info->fields[field];
+          FieldData       *field_data = &group_data->fields[field];
+          gboolean         active     = field_data->active;
+
+          if (field_info->variable != VARIABLE_SEPARATOR)
+            {
+              const VariableInfo *variable_info = &variables[field_info->variable];
+
+              if (active != field_info->default_active)
+                {
+                  name = g_strdup_printf ("%s-%s-active",
+                                          group_info->name,
+                                          variable_info->name);
+                  value    = active ? "yes" : "no";
+                  aux      = gimp_session_info_aux_new (name, value);
+                  aux_info = g_list_append (aux_info, aux);
+                  g_free (name);
+                }
+            }
+        }
+    }
+
+  return aux_info;
+}
+
+static gboolean
+gimp_dashboard_group_expander_button_press (GimpDashboard  *dashboard,
+                                            GdkEventButton *bevent,
+                                            GtkWidget      *widget)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  Group                 group;
+  GroupData            *group_data;
+  GtkAllocation         expander_allocation;
+  GtkAllocation         allocation;
+
+  group      = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                   "gimp-dashboard-group"));
+  group_data = &priv->groups[group];
+
+  gtk_widget_get_allocation (GTK_WIDGET (group_data->expander),
+                             &expander_allocation);
+  gtk_widget_get_allocation (GTK_WIDGET (group_data->menu_button),
+                             &allocation);
+
+  allocation.x -= expander_allocation.x;
+  allocation.y -= expander_allocation.y;
+
+  if (bevent->button == 1                          &&
+      bevent->x >= allocation.x                    &&
+      bevent->x <  allocation.x + allocation.width &&
+      bevent->y >= allocation.y                    &&
+      bevent->y <  allocation.y + allocation.height)
+    {
+      gtk_menu_popup (group_data->menu,
+                      NULL, NULL,
+                      gimp_dashboard_group_menu_position,
+                      group_data->menu_button,
+                      bevent->button, bevent->time);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_dashboard_group_action_toggled (GimpDashboard    *dashboard,
+                                     GimpToggleAction *action)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  Group                 group;
+  GroupData            *group_data;
+
+  group      = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (action),
+                                                   "gimp-dashboard-group"));
+  group_data = &priv->groups[group];
+
+  group_data->active = gimp_toggle_action_get_active (action);
+
+  gimp_dashboard_update_group (dashboard, group);
+}
+
+static void
+gimp_dashboard_field_menu_item_toggled (GimpDashboard    *dashboard,
+                                        GtkCheckMenuItem *item)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  Group                 group;
+  GroupData            *group_data;
+  gint                  field;
+  FieldData            *field_data;
+
+  group      = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item),
+                                                   "gimp-dashboard-group"));
+  group_data = &priv->groups[group];
+
+  field      = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item),
+                                                   "gimp-dashboard-field"));
+  field_data = &group_data->fields[field];
+
+  field_data->active = gtk_check_menu_item_get_active (item);
+
+  gimp_dashboard_update_group (dashboard, group);
+}
+
+static gpointer
+gimp_dashboard_sample (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv                = dashboard->priv;
+  gint64                last_sample_time    = 0;
+  gint64                last_update_time    = 0;
+  gboolean              seen_low_swap_space = FALSE;
+
+  g_mutex_lock (&priv->mutex);
+
+  while (! priv->quit)
+    {
+      gint64 update_interval;
+      gint64 sample_interval;
+      gint64 end_time;
+
+      update_interval = priv->update_interval * G_TIME_SPAN_SECOND / 1000;
+
+      if (priv->log_output)
+        {
+          sample_interval = G_TIME_SPAN_SECOND /
+                            priv->log_params.sample_frequency;
+        }
+      else
+        {
+          sample_interval = update_interval;
+        }
+
+      end_time = last_sample_time + sample_interval;
+
+      if (! g_cond_wait_until (&priv->cond, &priv->mutex, end_time) ||
+          priv->update_now)
+        {
+          gint64   time;
+          gboolean variables_changed = FALSE;
+          Variable variable;
+          Group    group;
+          gint     field;
+
+          time = g_get_monotonic_time ();
+
+          /* sample all variables */
+          for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
+            {
+              const VariableInfo *variable_info      = &variables[variable];
+              const VariableData *variable_data      = &priv->variables[variable];
+              VariableData        prev_variable_data = *variable_data;
+
+              variable_info->sample_func (dashboard, variable);
+
+              variables_changed = variables_changed ||
+                                  memcmp (variable_data, &prev_variable_data,
+                                          sizeof (VariableData));
+            }
+
+          /* log sample */
+          if (priv->log_output)
+            gimp_dashboard_log_sample (dashboard, variables_changed, FALSE);
+
+          /* update gui */
+          if (priv->update_now   ||
+              ! priv->log_output ||
+              time - last_update_time >= update_interval)
+            {
+              /* add samples to meters */
+              for (group = FIRST_GROUP; group < N_GROUPS; group++)
+                {
+                  const GroupInfo *group_info = &groups[group];
+                  GroupData       *group_data = &priv->groups[group];
+                  gdouble         *sample;
+                  gdouble          total      = 0.0;
+
+                  if (! group_info->has_meter)
+                    continue;
+
+                  sample = g_new (gdouble, group_data->n_meter_values);
+
+                  for (field = 0; field < group_data->n_fields; field++)
+                    {
+                      const FieldInfo *field_info = &group_info->fields[field];
+
+                      if (field_info->meter_value)
+                        {
+                          gdouble value;
+
+                          if (field_info->meter_variable)
+                            variable = field_info->meter_variable;
+                          else
+                            variable = field_info->variable;
+
+                          value = gimp_dashboard_variable_to_double (dashboard,
+                                                                     variable);
+
+                          if (value &&
+                              gimp_dashboard_field_use_meter_underlay (group,
+                                                                       field))
+                            {
+                              value = G_MAXDOUBLE;
+                            }
+
+                          if (field_info->meter_cumulative)
+                            {
+                              total += value;
+                              value  = total;
+                            }
+
+                          sample[field_info->meter_value - 1] = value;
+                        }
+                    }
+
+                  gimp_meter_add_sample (group_data->meter, sample);
+
+                  g_free (sample);
+                }
+
+              if (variables_changed)
+                {
+                  /* enqueue update source */
+                  if (! priv->update_idle_id &&
+                      gtk_widget_get_mapped (GTK_WIDGET (dashboard)))
+                    {
+                      priv->update_idle_id = g_idle_add_full (
+                        G_PRIORITY_DEFAULT,
+                        (GSourceFunc) gimp_dashboard_update,
+                        dashboard, NULL);
+                    }
+
+                  /* check for low swap space */
+                  if (priv->low_swap_space_warning                      &&
+                      priv->variables[VARIABLE_SWAP_OCCUPIED].available &&
+                      priv->variables[VARIABLE_SWAP_LIMIT].available)
+                    {
+                      guint64 swap_occupied;
+                      guint64 swap_limit;
+
+                      swap_occupied = priv->variables[VARIABLE_SWAP_OCCUPIED].value.size;
+                      swap_limit    = priv->variables[VARIABLE_SWAP_LIMIT].value.size;
+
+                      if (! seen_low_swap_space &&
+                          swap_occupied >= LOW_SWAP_SPACE_WARNING_ON * swap_limit)
+                        {
+                          if (! priv->low_swap_space_idle_id)
+                            {
+                              priv->low_swap_space_idle_id =
+                                g_idle_add_full (G_PRIORITY_HIGH,
+                                                 (GSourceFunc) gimp_dashboard_low_swap_space,
+                                                 dashboard, NULL);
+                            }
+
+                          seen_low_swap_space = TRUE;
+                        }
+                      else if (seen_low_swap_space &&
+                               swap_occupied <= LOW_SWAP_SPACE_WARNING_OFF * swap_limit)
+                        {
+                          if (priv->low_swap_space_idle_id)
+                            {
+                              g_source_remove (priv->low_swap_space_idle_id);
+
+                              priv->low_swap_space_idle_id = 0;
+                            }
+
+                          seen_low_swap_space = FALSE;
+                        }
+                    }
+                }
+
+              priv->update_now = FALSE;
+
+              last_update_time = time;
+            }
+
+          last_sample_time = time;
+        }
+    }
+
+  g_mutex_unlock (&priv->mutex);
+
+  return NULL;
+}
+
+static gboolean
+gimp_dashboard_update (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  Group                 group;
+
+  g_mutex_lock (&priv->mutex);
+
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    gimp_dashboard_update_group_values (dashboard, group);
+
+  priv->update_idle_id = 0;
+
+  g_mutex_unlock (&priv->mutex);
+
+  return G_SOURCE_REMOVE;
+}
+
+static gboolean
+gimp_dashboard_low_swap_space (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+
+  if (priv->gimp)
+    {
+      GdkScreen *screen;
+      gint       monitor;
+      gint       field;
+
+      gtk_expander_set_expanded (priv->groups[GROUP_SWAP].expander, TRUE);
+
+      for (field = 0; field < priv->groups[GROUP_SWAP].n_fields; field++)
+        {
+          const FieldInfo *field_info = &groups[GROUP_SWAP].fields[field];
+
+          if (field_info->variable == VARIABLE_SWAP_OCCUPIED ||
+              field_info->variable == VARIABLE_SWAP_LIMIT)
+            {
+              gimp_dashboard_field_set_active (dashboard,
+                                               GROUP_SWAP, field, TRUE);
+            }
+        }
+
+      gimp_dashboard_update_groups (dashboard);
+
+      monitor = gimp_get_monitor_at_pointer (&screen);
+
+      gimp_window_strategy_show_dockable_dialog (
+        GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (priv->gimp)),
+        priv->gimp,
+        gimp_dialog_factory_get_singleton (),
+        screen, monitor,
+        "gimp-dashboard");
+
+      g_mutex_lock (&priv->mutex);
+
+      priv->low_swap_space_idle_id = 0;
+
+      g_mutex_unlock (&priv->mutex);
+    }
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_dashboard_sample_function (GimpDashboard *dashboard,
+                                Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  const VariableInfo   *variable_info = &variables[variable];
+  VariableData         *variable_data = &priv->variables[variable];
+
+  #define CALL_FUNC(result_type) \
+    (((result_type (*) (void)) variable_info->data) ())
+
+  switch (variable_info->type)
+    {
+    case VARIABLE_TYPE_BOOLEAN:
+      variable_data->value.boolean = CALL_FUNC (gboolean);
+      break;
+
+    case VARIABLE_TYPE_INTEGER:
+      variable_data->value.integer = CALL_FUNC (gint);
+
+    case VARIABLE_TYPE_SIZE:
+      variable_data->value.size = CALL_FUNC (guint64);
+      break;
+
+    case VARIABLE_TYPE_PERCENTAGE:
+      variable_data->value.percentage = CALL_FUNC (gdouble);
+      break;
+
+    case VARIABLE_TYPE_DURATION:
+      variable_data->value.duration = CALL_FUNC (gdouble);
+      break;
+
+    case VARIABLE_TYPE_RATE_OF_CHANGE:
+      variable_data->value.rate_of_change = CALL_FUNC (gdouble);
+      break;
+
+    case VARIABLE_TYPE_SIZE_RATIO:
+    case VARIABLE_TYPE_INT_RATIO:
+      g_return_if_reached ();
+      break;
+    }
+
+  #undef CALL_FUNC
+
+  variable_data->available = TRUE;
+}
+
+static void
+gimp_dashboard_sample_gegl_config (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  gimp_dashboard_sample_object (dashboard, G_OBJECT (gegl_config ()), variable);
+}
+
+static void
+gimp_dashboard_sample_gegl_stats (GimpDashboard *dashboard,
+                                  Variable       variable)
+{
+  gimp_dashboard_sample_object (dashboard, G_OBJECT (gegl_stats ()), variable);
+}
+
+static void
+gimp_dashboard_sample_variable_changed (GimpDashboard *dashboard,
+                                        Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  const VariableInfo   *variable_info = &variables[variable];
+  VariableData         *variable_data = &priv->variables[variable];
+  Variable              var           = GPOINTER_TO_INT (variable_info->data);
+  const VariableData   *var_data      = &priv->variables[var];
+  gpointer              prev_value    = gimp_dashboard_variable_get_data (
+                                          dashboard, variable,
+                                          sizeof (var_data->value));
+
+  if (var_data->available)
+    {
+      variable_data->available     = TRUE;
+      variable_data->value.boolean = memcmp (&var_data->value, prev_value,
+                                             sizeof (var_data->value)) != 0;
+
+      if (variable_data->value.boolean)
+        memcpy (prev_value, &var_data->value, sizeof (var_data->value));
+    }
+  else
+    {
+      variable_data->available     = FALSE;
+    }
+}
+
+static void
+gimp_dashboard_sample_variable_rate_of_change (GimpDashboard *dashboard,
+                                               Variable       variable)
+{
+  typedef struct
+  {
+    gint64   last_time;
+    gboolean last_available;
+    gdouble  last_value;
+  } Data;
+
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  const VariableInfo   *variable_info = &variables[variable];
+  VariableData         *variable_data = &priv->variables[variable];
+  Variable              var           = GPOINTER_TO_INT (variable_info->data);
+  const VariableData   *var_data      = &priv->variables[var];
+  Data                 *data          = gimp_dashboard_variable_get_data (
+                                          dashboard, variable, sizeof (Data));
+  gint64                time;
+
+  time = g_get_monotonic_time ();
+
+  if (time == data->last_time)
+    return;
+
+  variable_data->available = FALSE;
+
+  if (var_data->available)
+    {
+      gdouble value = gimp_dashboard_variable_to_double (dashboard, var);
+
+      if (data->last_available)
+        {
+          variable_data->available = TRUE;
+          variable_data->value.rate_of_change = (value - data->last_value) *
+                                                G_TIME_SPAN_SECOND         /
+                                                (time - data->last_time);
+        }
+
+      data->last_value = value;
+    }
+
+  data->last_time      = time;
+  data->last_available = var_data->available;
+}
+
+static void
+gimp_dashboard_sample_swap_limit (GimpDashboard *dashboard,
+                                  Variable       variable)
+{
+  typedef struct
+  {
+    guint64  free_space;
+    gboolean has_free_space;
+    gint64   last_check_time;
+  } Data;
+
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  Data                 *data          = gimp_dashboard_variable_get_data (
+                                          dashboard, variable, sizeof (Data));
+  gint64                time;
+
+  /* we don't have a config option for limiting the swap size, so we simply
+   * return the free space available on the filesystem containing the swap
+   */
+
+  time = g_get_monotonic_time ();
+
+  if (time - data->last_check_time >= G_TIME_SPAN_SECOND)
+    {
+      gchar *swap_dir;
+
+      g_object_get (gegl_config (),
+                    "swap", &swap_dir,
+                    NULL);
+
+      data->free_space     = 0;
+      data->has_free_space = FALSE;
+
+      if (swap_dir)
+        {
+          GFile     *file;
+          GFileInfo *info;
+
+          file = g_file_new_for_path (swap_dir);
+
+          info = g_file_query_filesystem_info (file,
+                                               G_FILE_ATTRIBUTE_FILESYSTEM_FREE,
+                                               NULL, NULL);
+
+          if (info)
+            {
+              data->free_space     =
+                g_file_info_get_attribute_uint64 (info,
+                                                  G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+              data->has_free_space = TRUE;
+
+              g_object_unref (info);
+            }
+
+          g_object_unref (file);
+
+          g_free (swap_dir);
+        }
+
+      data->last_check_time = time;
+    }
+
+  variable_data->available = data->has_free_space;
+
+  if (data->has_free_space)
+    {
+      variable_data->value.size = data->free_space;
+
+      if (priv->variables[VARIABLE_SWAP_SIZE].available)
+        {
+          /* the swap limit is the sum of free_space and swap_size, since the
+           * swap itself occupies space in the filesystem
+           */
+          variable_data->value.size +=
+            priv->variables[VARIABLE_SWAP_SIZE].value.size;
+        }
+    }
+}
+
+#ifdef HAVE_CPU_GROUP
+
+#ifdef HAVE_SYS_TIMES_H
+
+static void
+gimp_dashboard_sample_cpu_usage (GimpDashboard *dashboard,
+                                 Variable       variable)
+{
+  typedef struct
+  {
+    clock_t prev_clock;
+    clock_t prev_usage;
+  } Data;
+
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  Data                 *data          = gimp_dashboard_variable_get_data (
+                                          dashboard, variable, sizeof (Data));
+  clock_t               curr_clock;
+  clock_t               curr_usage;
+  struct tms            tms;
+
+  curr_clock = times (&tms);
+
+  if (curr_clock == (clock_t) -1)
+    {
+      data->prev_clock = 0;
+
+      variable_data->available = FALSE;
+
+      return;
+    }
+
+  curr_usage = tms.tms_utime + tms.tms_stime;
+
+  if (data->prev_clock && curr_clock != data->prev_clock)
+    {
+      variable_data->available         = TRUE;
+      variable_data->value.percentage  = (gdouble) (curr_usage - data->prev_usage) /
+                                                   (curr_clock - data->prev_clock);
+      variable_data->value.percentage /= g_get_num_processors ();
+    }
+  else
+    {
+      variable_data->available         = FALSE;
+    }
+
+  data->prev_clock = curr_clock;
+  data->prev_usage = curr_usage;
+}
+
+#elif defined (G_OS_WIN32)
+
+static void
+gimp_dashboard_sample_cpu_usage (GimpDashboard *dashboard,
+                                 Variable       variable)
+{
+  typedef struct
+  {
+    guint64 prev_time;
+    guint64 prev_usage;
+  } Data;
+
+  GimpDashboardPrivate *priv            = dashboard->priv;
+  VariableData         *variable_data   = &priv->variables[variable];
+  Data                 *data            = gimp_dashboard_variable_get_data (
+                                            dashboard, variable, sizeof (Data));
+  guint64               curr_time;
+  guint64               curr_usage;
+  FILETIME              system_time;
+  FILETIME              process_creation_time;
+  FILETIME              process_exit_time;
+  FILETIME              process_kernel_time;
+  FILETIME              process_user_time;
+
+  if (! GetProcessTimes (GetCurrentProcess (),
+                         &process_creation_time,
+                         &process_exit_time,
+                         &process_kernel_time,
+                         &process_user_time))
+    {
+      data->prev_time = 0;
+
+      variable_data->available = FALSE;
+
+      return;
+    }
+
+  GetSystemTimeAsFileTime (&system_time);
+
+  curr_time   = ((guint64) system_time.dwHighDateTime << 32) |
+                 (guint64) system_time.dwLowDateTime;
+
+  curr_usage  = ((guint64) process_kernel_time.dwHighDateTime << 32) |
+                 (guint64) process_kernel_time.dwLowDateTime;
+  curr_usage += ((guint64) process_user_time.dwHighDateTime << 32) |
+                 (guint64) process_user_time.dwLowDateTime;
+
+  if (data->prev_time && curr_time != data->prev_time)
+    {
+      variable_data->available         = TRUE;
+      variable_data->value.percentage  = (gdouble) (curr_usage - data->prev_usage) /
+                                                   (curr_time  - data->prev_time);
+      variable_data->value.percentage /= g_get_num_processors ();
+    }
+  else
+    {
+      variable_data->available         = FALSE;
+    }
+
+  data->prev_time  = curr_time;
+  data->prev_usage = curr_usage;
+}
+
+#endif /* G_OS_WIN32 */
+
+static void
+gimp_dashboard_sample_cpu_active (GimpDashboard *dashboard,
+                                  Variable       variable)
+{
+  typedef struct
+  {
+    gboolean active;
+  } Data;
+
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  Data                 *data          = gimp_dashboard_variable_get_data (
+                                          dashboard, variable, sizeof (Data));
+  gboolean              active        = FALSE;
+
+  if (priv->variables[VARIABLE_CPU_USAGE].available)
+    {
+      if (! data->active)
+        {
+          active =
+            priv->variables[VARIABLE_CPU_USAGE].value.percentage *
+            g_get_num_processors () > CPU_ACTIVE_ON;
+        }
+      else
+        {
+          active =
+            priv->variables[VARIABLE_CPU_USAGE].value.percentage *
+            g_get_num_processors () > CPU_ACTIVE_OFF;
+        }
+
+      variable_data->available = TRUE;
+    }
+  else
+    {
+      variable_data->available = FALSE;
+    }
+
+  data->active                 = active;
+  variable_data->value.boolean = active;
+}
+
+static void
+gimp_dashboard_sample_cpu_active_time (GimpDashboard *dashboard,
+                                       Variable       variable)
+{
+  typedef struct
+  {
+    gint64 prev_time;
+    gint64 active_time;
+  } Data;
+
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  Data                 *data          = gimp_dashboard_variable_get_data (
+                                          dashboard, variable, sizeof (Data));
+  gint64                curr_time;
+
+  curr_time = g_get_monotonic_time ();
+
+  if (priv->variables[VARIABLE_CPU_ACTIVE].available)
+    {
+      gboolean active = priv->variables[VARIABLE_CPU_ACTIVE].value.boolean;
+
+      if (active && data->prev_time)
+        data->active_time += curr_time - data->prev_time;
+    }
+
+  data->prev_time = curr_time;
+
+  variable_data->available      = TRUE;
+  variable_data->value.duration = data->active_time / 1000000.0;
+}
+
+#endif /* HAVE_CPU_GROUP */
+
+#ifdef HAVE_MEMORY_GROUP
+#ifdef PLATFORM_OSX
+static void
+gimp_dashboard_sample_memory_used (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  GimpDashboardPrivate        *priv          = dashboard->priv;
+  VariableData                *variable_data = &priv->variables[variable];
+
+  variable_data->available = FALSE;
+#ifndef TASK_VM_INFO_REV0_COUNT /* phys_footprint added in REV1 */
+  struct mach_task_basic_info info;
+  mach_msg_type_number_t      infoCount      = MACH_TASK_BASIC_INFO_COUNT;
+
+  if( task_info(mach_task_self (), MACH_TASK_BASIC_INFO,
+                             (task_info_t)&info, &infoCount ) != KERN_SUCCESS )
+    return;      /* Can't access? */
+
+  variable_data->available  = TRUE;
+  variable_data->value.size = info.resident_size;
+#else
+  task_vm_info_data_t         info;
+  mach_msg_type_number_t      infoCount      = TASK_VM_INFO_COUNT;
+
+  if( task_info(mach_task_self (), TASK_VM_INFO,
+                             (task_info_t)&info, &infoCount ) != KERN_SUCCESS )
+    return;      /* Can't access? */
+  variable_data->available  = TRUE;
+  variable_data->value.size = info.phys_footprint;
+#endif /* ! TASK_VM_INFO_REV0_COUNT */
+}
+
+static void
+gimp_dashboard_sample_memory_available (GimpDashboard *dashboard,
+                                        Variable       variable)
+{
+  GimpDashboardPrivate        *priv          = dashboard->priv;
+  VariableData                *variable_data = &priv->variables[variable];
+  vm_statistics_data_t        info;
+  mach_msg_type_number_t      infoCount      = HOST_VM_INFO_COUNT;
+
+  variable_data->available = FALSE;
+
+
+  if( host_statistics(mach_host_self (), HOST_VM_INFO,
+                             (host_info_t)&info, &infoCount ) != KERN_SUCCESS )
+    return;      /* Can't access? */
+
+  variable_data->available  = TRUE;
+  variable_data->value.size = info.free_count * PAGE_SIZE;
+}
+
+#elif defined(G_OS_WIN32)
+static void
+gimp_dashboard_sample_memory_used (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  GimpDashboardPrivate       *priv          = dashboard->priv;
+  VariableData               *variable_data = &priv->variables[variable];
+  PROCESS_MEMORY_COUNTERS_EX  pmc           = {};
+
+  variable_data->available = FALSE;
+
+  if (! GetProcessMemoryInfo (GetCurrentProcess (),
+                              (PPROCESS_MEMORY_COUNTERS) &pmc,
+                              sizeof (pmc)) ||
+      pmc.cb != sizeof (pmc))
+    {
+      return;
+    }
+
+  variable_data->available  = TRUE;
+  variable_data->value.size = pmc.PrivateUsage;
+}
+
+static void
+gimp_dashboard_sample_memory_available (GimpDashboard *dashboard,
+                                        Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  MEMORYSTATUSEX        ms;
+
+  variable_data->available = FALSE;
+
+  ms.dwLength = sizeof (ms);
+
+  if (! GlobalMemoryStatusEx (&ms))
+    return;
+
+  variable_data->available  = TRUE;
+  variable_data->value.size = ms.ullAvailPhys;
+}
+
+#elif defined(__OpenBSD__)
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+static void
+gimp_dashboard_sample_memory_used (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  struct rusage         rusage;
+
+  variable_data->available = FALSE;
+
+  if (getrusage (RUSAGE_SELF, &rusage) == -1)
+    return;
+  variable_data->available  = TRUE;
+  variable_data->value.size = (guint64) (rusage.ru_maxrss * 1024);
+}
+
+static void
+gimp_dashboard_sample_memory_available (GimpDashboard *dashboard,
+                                        Variable       variable)
+{
+  GimpDashboardPrivate *priv            = dashboard->priv;
+  VariableData         *variable_data   = &priv->variables[variable];
+  int                   mib[]           = { CTL_HW, HW_PHYSMEM64 };
+  int64_t               result;
+  size_t                sz              = sizeof(int64_t);
+
+  variable_data->available = FALSE;
+
+  if (sysctl (mib, 2, &result, &sz, NULL, 0) == -1)
+    return;
+  variable_data->available  = TRUE;
+  variable_data->value.size = (guint64) result;
+}
+
+#else /* ! G_OS_WIN32 && ! PLATFORM_OSX */
+static void
+gimp_dashboard_sample_memory_used (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+  static gboolean       initialized   = FALSE;
+  static long           page_size;
+  static gint           fd            = -1;
+  gchar                 buffer[128];
+  gint                  size;
+  unsigned long long    resident;
+  unsigned long long    shared;
+
+  if (! initialized)
+    {
+      page_size = sysconf (_SC_PAGE_SIZE);
+
+      if (page_size > 0)
+        fd = open ("/proc/self/statm", O_RDONLY);
+
+      initialized = TRUE;
+    }
+
+  variable_data->available = FALSE;
+
+  if (fd < 0)
+    return;
+
+  if (lseek (fd, 0, SEEK_SET))
+    return;
+
+  size = read (fd, buffer, sizeof (buffer) - 1);
+
+  if (size <= 0)
+    return;
+
+  buffer[size] = '\0';
+
+  if (sscanf (buffer, "%*u %llu %llu", &resident, &shared) != 2)
+    return;
+
+  variable_data->available  = TRUE;
+  variable_data->value.size = (guint64) (resident - shared) * page_size;
+}
+
+static void
+gimp_dashboard_sample_memory_available (GimpDashboard *dashboard,
+                                        Variable       variable)
+{
+  GimpDashboardPrivate *priv            = dashboard->priv;
+  VariableData         *variable_data   = &priv->variables[variable];
+  static gboolean       initialized     = FALSE;
+  static gint64         last_check_time = 0;
+  static gint           fd;
+  static guint64        available;
+  static gboolean       has_available   = FALSE;
+  gint64                time;
+
+  if (! initialized)
+    {
+      fd = open ("/proc/meminfo", O_RDONLY);
+
+      initialized = TRUE;
+    }
+
+  variable_data->available = FALSE;
+
+  if (fd < 0)
+    return;
+
+  /* we don't have a config option for limiting the swap size, so we simply
+   * return the free space available on the filesystem containing the swap
+   */
+
+  time = g_get_monotonic_time ();
+
+  if (time - last_check_time >= G_TIME_SPAN_SECOND)
+    {
+      gchar  buffer[512];
+      gint   size;
+      gchar *str;
+
+      last_check_time = time;
+
+      has_available = FALSE;
+
+      if (lseek (fd, 0, SEEK_SET))
+        return;
+
+      size = read (fd, buffer, sizeof (buffer) - 1);
+
+      if (size <= 0)
+        return;
+
+      buffer[size] = '\0';
+
+      str = strstr (buffer, "MemAvailable:");
+
+      if (! str)
+        return;
+
+      available = strtoull (str + 13, &str, 0);
+
+      if (! str)
+        return;
+
+      for (; *str; str++)
+        {
+          if (*str == 'k')
+            {
+              available <<= 10;
+              break;
+            }
+          else if (*str == 'M')
+            {
+              available <<= 20;
+              break;
+            }
+        }
+
+      if (! *str)
+        return;
+
+      has_available = TRUE;
+    }
+
+  if (! has_available)
+    return;
+
+  variable_data->available  = TRUE;
+  variable_data->value.size = available;
+}
+
+#endif
+
+static void
+gimp_dashboard_sample_memory_size (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+
+  variable_data->value.size = gimp_get_physical_memory_size ();
+  variable_data->available  = variable_data->value.size > 0;
+}
+
+#endif /* HAVE_MEMORY_GROUP */
+
+static void
+gimp_dashboard_sample_object (GimpDashboard *dashboard,
+                              GObject       *object,
+                              Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  GObjectClass         *klass         = G_OBJECT_GET_CLASS (object);
+  const VariableInfo   *variable_info = &variables[variable];
+  VariableData         *variable_data = &priv->variables[variable];
+
+  variable_data->available = FALSE;
+
+  switch (variable_info->type)
+    {
+    case VARIABLE_TYPE_BOOLEAN:
+      if (g_object_class_find_property (klass, variable_info->data))
+        {
+          variable_data->available = TRUE;
+
+          g_object_get (object,
+                        variable_info->data, &variable_data->value.boolean,
+                        NULL);
+        }
+      break;
+
+    case VARIABLE_TYPE_INTEGER:
+      if (g_object_class_find_property (klass, variable_info->data))
+        {
+          variable_data->available = TRUE;
+
+          g_object_get (object,
+                        variable_info->data, &variable_data->value.integer,
+                        NULL);
+        }
+      break;
+
+    case VARIABLE_TYPE_SIZE:
+      if (g_object_class_find_property (klass, variable_info->data))
+        {
+          variable_data->available = TRUE;
+
+          g_object_get (object,
+                        variable_info->data, &variable_data->value.size,
+                        NULL);
+        }
+      break;
+
+    case VARIABLE_TYPE_SIZE_RATIO:
+      {
+        const gchar *antecedent = variable_info->data;
+        const gchar *consequent = antecedent + strlen (antecedent) + 1;
+
+        if (g_object_class_find_property (klass, antecedent) &&
+            g_object_class_find_property (klass, consequent))
+          {
+            variable_data->available = TRUE;
+
+            g_object_get (object,
+                          antecedent, &variable_data->value.size_ratio.antecedent,
+                          consequent, &variable_data->value.size_ratio.consequent,
+                          NULL);
+          }
+      }
+      break;
+
+    case VARIABLE_TYPE_INT_RATIO:
+      {
+        const gchar *antecedent = variable_info->data;
+        const gchar *consequent = antecedent + strlen (antecedent) + 1;
+
+        if (g_object_class_find_property (klass, antecedent) &&
+            g_object_class_find_property (klass, consequent))
+          {
+            variable_data->available = TRUE;
+
+            g_object_get (object,
+                          antecedent, &variable_data->value.int_ratio.antecedent,
+                          consequent, &variable_data->value.int_ratio.consequent,
+                          NULL);
+          }
+      }
+      break;
+
+    case VARIABLE_TYPE_PERCENTAGE:
+      if (g_object_class_find_property (klass, variable_info->data))
+        {
+          variable_data->available = TRUE;
+
+          g_object_get (object,
+                        variable_info->data, &variable_data->value.percentage,
+                        NULL);
+        }
+      break;
+
+    case VARIABLE_TYPE_DURATION:
+      if (g_object_class_find_property (klass, variable_info->data))
+        {
+          variable_data->available = TRUE;
+
+          g_object_get (object,
+                        variable_info->data, &variable_data->value.duration,
+                        NULL);
+        }
+      break;
+
+    case VARIABLE_TYPE_RATE_OF_CHANGE:
+      if (g_object_class_find_property (klass, variable_info->data))
+        {
+          variable_data->available = TRUE;
+
+          g_object_get (object,
+                        variable_info->data, &variable_data->value.rate_of_change,
+                        NULL);
+        }
+      break;
+    }
+}
+
+static void
+gimp_dashboard_group_menu_position (GtkMenu  *menu,
+                                    gint     *x,
+                                    gint     *y,
+                                    gboolean *push_in,
+                                    gpointer  user_data)
+{
+  gimp_button_menu_position (user_data, menu, GTK_POS_LEFT, x, y);
+}
+
+static void
+gimp_dashboard_update_groups (GimpDashboard *dashboard)
+{
+  Group group;
+
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    gimp_dashboard_update_group (dashboard, group);
+}
+
+static void
+gimp_dashboard_update_group (GimpDashboard *dashboard,
+                             Group          group)
+{
+  GimpDashboardPrivate *priv       = dashboard->priv;
+  const GroupInfo      *group_info = &groups[group];
+  GroupData            *group_data = &priv->groups[group];
+  gint                  n_rows;
+  gboolean              add_separator;
+  gint                  field;
+
+  gtk_widget_set_visible (GTK_WIDGET (group_data->expander),
+                          group_data->active);
+
+  if (! group_data->active)
+    return;
+
+  n_rows        = 0;
+  add_separator = FALSE;
+
+  for (field = 0; field < group_data->n_fields; field++)
+    {
+      const FieldInfo *field_info = &group_info->fields[field];
+      const FieldData *field_data = &group_data->fields[field];
+
+      if (field_info->variable != VARIABLE_SEPARATOR)
+        {
+          if (group_info->has_meter && field_info->meter_value)
+            {
+              gimp_meter_set_value_active (group_data->meter,
+                                           field_info->meter_value - 1,
+                                           field_data->active);
+            }
+
+          if (field_data->active)
+            {
+              if (add_separator)
+                {
+                  add_separator = FALSE;
+                  n_rows++;
+                }
+
+              n_rows++;
+            }
+        }
+      else
+        {
+          if (n_rows > 0)
+            add_separator = TRUE;
+        }
+    }
+
+  gimp_gtk_container_clear (GTK_CONTAINER (group_data->table));
+  gtk_table_resize (group_data->table, MAX (n_rows, 1), 3);
+
+  n_rows        = 0;
+  add_separator = FALSE;
+
+  for (field = 0; field < group_data->n_fields; field++)
+    {
+      const FieldInfo *field_info = &group_info->fields[field];
+      FieldData       *field_data = &group_data->fields[field];
+
+      if (field_info->variable != VARIABLE_SEPARATOR)
+        {
+          const VariableInfo *variable_info = &variables[field_info->variable];
+          GtkWidget          *separator;
+          GtkWidget          *color_area;
+          GtkWidget          *label;
+          const gchar        *description;
+          gchar              *str;
+
+          if (! field_data->active)
+            continue;
+
+          description = g_dgettext (NULL, variable_info->description);
+
+          if (add_separator)
+            {
+              separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+              gtk_table_attach (group_data->table, separator,
+                                0, 3, n_rows, n_rows + 1,
+                                GTK_EXPAND | GTK_FILL, 0,
+                                0, 0);
+              gtk_widget_show (separator);
+
+              add_separator = FALSE;
+              n_rows++;
+            }
+
+          if (group_info->has_meter && field_info->meter_value)
+            {
+              color_area = gimp_color_area_new (&variable_info->color,
+                                                GIMP_COLOR_AREA_FLAT, 0);
+              gimp_help_set_help_data (color_area, description,
+                                       NULL);
+              gtk_widget_set_size_request (color_area, 5, 5);
+              gtk_table_attach (group_data->table, color_area,
+                                0, 1, n_rows, n_rows + 1,
+                                0, 0,
+                                0, 0);
+              gtk_widget_show (color_area);
+            }
+
+          str = g_strdup_printf ("%s:",
+                                 g_dpgettext2 (NULL, "dashboard-variable",
+                                               field_info->title ?
+                                                 field_info->title :
+                                                 variable_info->title));
+
+          label = gtk_label_new (str);
+          gimp_help_set_help_data (label, description,
+                                   NULL);
+          gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+          gtk_table_attach (group_data->table, label,
+                            1, 2, n_rows, n_rows + 1,
+                            GTK_FILL, 0,
+                            0, 0);
+          gtk_widget_show (label);
+
+          g_free (str);
+
+          label = gtk_label_new (NULL);
+          field_data->value_label = GTK_LABEL (label);
+          gimp_help_set_help_data (label, description,
+                                   NULL);
+          gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+          gtk_table_attach (group_data->table, label,
+                            2, 3, n_rows, n_rows + 1,
+                            GTK_EXPAND | GTK_FILL, 0,
+                            0, 0);
+          gtk_widget_show (label);
+
+          n_rows++;
+        }
+      else
+        {
+          if (n_rows > 0)
+            add_separator = TRUE;
+        }
+    }
+
+  g_mutex_lock (&priv->mutex);
+
+  gimp_dashboard_update_group_values (dashboard, group);
+
+  g_mutex_unlock (&priv->mutex);
+}
+
+static void
+gimp_dashboard_update_group_values (GimpDashboard *dashboard,
+                                    Group          group)
+{
+  GimpDashboardPrivate *priv       = dashboard->priv;
+  const GroupInfo      *group_info = &groups[group];
+  GroupData            *group_data = &priv->groups[group];
+  gdouble               limit      = 0.0;
+  GString              *header_values;
+  gint                  field;
+
+  if (! group_data->active)
+    return;
+
+  if (group_info->has_meter)
+    {
+      if (group_info->meter_limit)
+        {
+          const VariableData *variable_data = &priv->variables[group_info->meter_limit];
+
+          if (variable_data->available)
+            {
+              limit = gimp_dashboard_variable_to_double (dashboard,
+                                                        group_info->meter_limit);
+            }
+          else
+            {
+              for (field = 0; field < group_data->n_fields; field++)
+                {
+                  const FieldInfo *field_info = &group_info->fields[field];
+                  const FieldData *field_data = &group_data->fields[field];
+
+                  if (field_info->meter_value && field_data->active)
+                    {
+                      gdouble value;
+
+                      value = gimp_dashboard_variable_to_double (dashboard,
+                                                                 field_info->variable);
+
+                      limit = MAX (limit, value);
+                    }
+                }
+            }
+
+          gimp_meter_set_range (group_data->meter, 0.0, limit);
+        }
+
+      if (group_info->meter_led)
+        {
+          GimpRGB         color  = {0.0, 0.0, 0.0, 1.0};
+          gboolean        active = FALSE;
+          const Variable *var;
+
+          for (var = group_info->meter_led; *var; var++)
+            {
+              if (gimp_dashboard_variable_to_boolean (dashboard, *var))
+                {
+                  const VariableInfo *variable_info = &variables[*var];
+
+                  color.r = MAX (color.r, variable_info->color.r);
+                  color.g = MAX (color.g, variable_info->color.g);
+                  color.b = MAX (color.b, variable_info->color.b);
+
+                  active = TRUE;
+                }
+            }
+
+          if (active)
+            gimp_meter_set_led_color (group_data->meter, &color);
+
+          gimp_meter_set_led_active (group_data->meter, active);
+        }
+    }
+
+  group_data->limit = limit;
+
+  header_values = g_string_new (NULL);
+
+  for (field = 0; field < group_data->n_fields; field++)
+    {
+      const FieldInfo *field_info = &group_info->fields[field];
+      const FieldData *field_data = &group_data->fields[field];
+
+      if (field_data->active)
+        {
+          gchar *text;
+
+          text = gimp_dashboard_field_to_string (dashboard,
+                                                 group, field, TRUE);
+
+          gimp_dashboard_label_set_text (field_data->value_label, text);
+
+          g_free (text);
+
+          if (field_info->show_in_header)
+            {
+              text = gimp_dashboard_field_to_string (dashboard,
+                                                     group, field, FALSE);
+
+              if (header_values->len > 0)
+                g_string_append (header_values, ", ");
+
+              g_string_append (header_values, text);
+
+              g_free (text);
+            }
+        }
+    }
+
+  if (header_values->len > 0)
+    {
+      g_string_prepend (header_values, "(");
+      g_string_append  (header_values, ")");
+    }
+
+  gimp_dashboard_label_set_text (group_data->header_values_label,
+                                 header_values->str);
+
+  g_string_free (header_values, TRUE);
+}
+
+static void
+gimp_dashboard_group_set_active (GimpDashboard *dashboard,
+                                 Group          group,
+                                 gboolean       active)
+{
+  GimpDashboardPrivate *priv       = dashboard->priv;
+  GroupData            *group_data = &priv->groups[group];
+
+  if (active != group_data->active)
+    {
+      group_data->active = active;
+
+      if (group_data->action)
+        {
+          g_signal_handlers_block_by_func (group_data->action,
+                                           gimp_dashboard_group_action_toggled,
+                                           dashboard);
+
+          gimp_toggle_action_set_active (group_data->action, active);
+
+          g_signal_handlers_unblock_by_func (group_data->action,
+                                             gimp_dashboard_group_action_toggled,
+                                             dashboard);
+        }
+    }
+}
+
+static void
+gimp_dashboard_field_set_active (GimpDashboard *dashboard,
+                                 Group          group,
+                                 gint           field,
+                                 gboolean       active)
+{
+  GimpDashboardPrivate *priv       = dashboard->priv;
+  GroupData            *group_data = &priv->groups[group];
+  FieldData            *field_data = &group_data->fields[field];
+
+  if (active != field_data->active)
+    {
+      field_data->active = active;
+
+      g_signal_handlers_block_by_func (field_data->menu_item,
+                                       gimp_dashboard_field_menu_item_toggled,
+                                       dashboard);
+
+      gtk_check_menu_item_set_active (field_data->menu_item, active);
+
+      g_signal_handlers_unblock_by_func (field_data->menu_item,
+                                         gimp_dashboard_field_menu_item_toggled,
+                                         dashboard);
+    }
+}
+
+static void
+gimp_dashboard_reset_unlocked (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv;
+  Group                 group;
+
+  priv = dashboard->priv;
+
+  gegl_reset_stats ();
+
+  gimp_dashboard_reset_variables (dashboard);
+
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    {
+      GroupData *group_data = &priv->groups[group];
+
+      if (group_data->meter)
+        gimp_meter_clear_history (group_data->meter);
+    }
+}
+
+static void
+gimp_dashboard_reset_variables (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  Variable              variable;
+
+  for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
+    {
+      const VariableInfo *variable_info = &variables[variable];
+      VariableData       *variable_data = &priv->variables[variable];
+
+      if (variable_info->reset_func)
+        variable_info->reset_func (dashboard, variable);
+
+      g_clear_pointer (&variable_data->data, g_free);
+      variable_data->data_size = 0;
+    }
+}
+
+static gpointer
+gimp_dashboard_variable_get_data (GimpDashboard *dashboard,
+                                  Variable       variable,
+                                  gsize          size)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  VariableData         *variable_data = &priv->variables[variable];
+
+  if (variable_data->data_size != size)
+    {
+      variable_data->data = g_realloc (variable_data->data, size);
+
+      if (variable_data->data_size < size)
+        {
+          memset ((guint8 *) variable_data->data + variable_data->data_size,
+                  0, size - variable_data->data_size);
+        }
+
+      variable_data->data_size = size;
+    }
+
+  return variable_data->data;
+}
+
+static gboolean
+gimp_dashboard_variable_to_boolean (GimpDashboard *dashboard,
+                                    Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  const VariableInfo   *variable_info = &variables[variable];
+  const VariableData   *variable_data = &priv->variables[variable];
+
+  if (variable_data->available)
+    {
+      switch (variable_info->type)
+        {
+        case VARIABLE_TYPE_BOOLEAN:
+          return variable_data->value.boolean;
+
+        case VARIABLE_TYPE_INTEGER:
+          return variable_data->value.integer != 0;
+
+        case VARIABLE_TYPE_SIZE:
+          return variable_data->value.size > 0;
+
+        case VARIABLE_TYPE_SIZE_RATIO:
+          return variable_data->value.size_ratio.antecedent != 0 &&
+                 variable_data->value.size_ratio.consequent != 0;
+
+        case VARIABLE_TYPE_INT_RATIO:
+          return variable_data->value.int_ratio.antecedent != 0 &&
+                 variable_data->value.int_ratio.consequent != 0;
+
+        case VARIABLE_TYPE_PERCENTAGE:
+          return variable_data->value.percentage != 0.0;
+
+        case VARIABLE_TYPE_DURATION:
+          return variable_data->value.duration != 0.0;
+
+        case VARIABLE_TYPE_RATE_OF_CHANGE:
+          return variable_data->value.rate_of_change != 0.0;
+        }
+    }
+
+  return FALSE;
+}
+
+static gdouble
+gimp_dashboard_variable_to_double (GimpDashboard *dashboard,
+                                   Variable       variable)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  const VariableInfo   *variable_info = &variables[variable];
+  const VariableData   *variable_data = &priv->variables[variable];
+
+  if (variable_data->available)
+    {
+      switch (variable_info->type)
+        {
+        case VARIABLE_TYPE_BOOLEAN:
+          return variable_data->value.boolean ? 1.0 : 0.0;
+
+        case VARIABLE_TYPE_INTEGER:
+          return variable_data->value.integer;
+
+        case VARIABLE_TYPE_SIZE:
+          return variable_data->value.size;
+
+        case VARIABLE_TYPE_SIZE_RATIO:
+          if (variable_data->value.size_ratio.consequent)
+            {
+              return (gdouble) variable_data->value.size_ratio.antecedent /
+                     (gdouble) variable_data->value.size_ratio.consequent;
+            }
+          break;
+
+        case VARIABLE_TYPE_INT_RATIO:
+          if (variable_data->value.int_ratio.consequent)
+            {
+              return (gdouble) variable_data->value.int_ratio.antecedent /
+                     (gdouble) variable_data->value.int_ratio.consequent;
+            }
+          break;
+
+        case VARIABLE_TYPE_PERCENTAGE:
+          return variable_data->value.percentage;
+
+        case VARIABLE_TYPE_DURATION:
+          return variable_data->value.duration;
+
+        case VARIABLE_TYPE_RATE_OF_CHANGE:
+          return variable_data->value.rate_of_change;
+        }
+    }
+
+  return 0.0;
+}
+
+static gchar *
+gimp_dashboard_field_to_string (GimpDashboard *dashboard,
+                                Group          group,
+                                gint           field,
+                                gboolean       full)
+{
+  GimpDashboardPrivate *priv          = dashboard->priv;
+  const GroupInfo      *group_info    = &groups[group];
+  const GroupData      *group_data    = &priv->groups[group];
+  const FieldInfo      *field_info    = &group_info->fields[field];
+  const VariableInfo   *variable_info = &variables[field_info->variable];
+  const VariableData   *variable_data = &priv->variables[field_info->variable];
+  /* Tranlators: "N/A" is an abbreviation for "not available" */
+  const gchar          *str           = C_("dashboard-value", "N/A");
+  gboolean              static_str    = TRUE;
+  gboolean              show_limit    = TRUE;
+
+  if (variable_data->available)
+    {
+      switch (variable_info->type)
+        {
+        case VARIABLE_TYPE_BOOLEAN:
+          str = variable_data->value.boolean ? C_("dashboard-value", "Yes") :
+                                               C_("dashboard-value", "No");
+          break;
+
+        case VARIABLE_TYPE_INTEGER:
+          str        = g_strdup_printf ("%d", variable_data->value.integer);
+          static_str = FALSE;
+          break;
+
+        case VARIABLE_TYPE_SIZE:
+          str        = g_format_size_full (variable_data->value.size,
+                                           G_FORMAT_SIZE_IEC_UNITS);
+          static_str = FALSE;
+          break;
+
+        case VARIABLE_TYPE_SIZE_RATIO:
+          {
+            if (variable_data->value.size_ratio.consequent)
+              {
+                gdouble value;
+
+                value = 100.0 * variable_data->value.size_ratio.antecedent /
+                                variable_data->value.size_ratio.consequent;
+
+                str        = g_strdup_printf ("%d%%", SIGNED_ROUND (value));
+                static_str = FALSE;
+              }
+          }
+          break;
+
+        case VARIABLE_TYPE_INT_RATIO:
+          {
+            gdouble  min;
+            gdouble  max;
+            gdouble  antecedent;
+            gdouble  consequent;
+
+            antecedent = variable_data->value.int_ratio.antecedent;
+            consequent = variable_data->value.int_ratio.consequent;
+
+            min = MIN (ABS (antecedent), ABS (consequent));
+            max = MAX (ABS (antecedent), ABS (consequent));
+
+            if (min)
+              {
+                antecedent /= min;
+                consequent /= min;
+              }
+            else if (max)
+              {
+                antecedent /= max;
+                consequent /= max;
+              }
+
+            if (max)
+              {
+                str        = g_strdup_printf ("%g:%g",
+                                              RINT (100.0 * antecedent) / 100.0,
+                                              RINT (100.0 * consequent) / 100.0);
+                static_str = FALSE;
+              }
+          }
+          break;
+
+        case VARIABLE_TYPE_PERCENTAGE:
+          str        = g_strdup_printf ("%d%%",
+                                        SIGNED_ROUND (100.0 * variable_data->value.percentage));
+          static_str = FALSE;
+          show_limit = FALSE;
+          break;
+
+        case VARIABLE_TYPE_DURATION:
+          str        = g_strdup_printf ("%02d:%02d:%04.1f",
+                                        (gint) floor (variable_data->value.duration / 3600.0),
+                                        (gint) floor (fmod (variable_data->value.duration / 60.0, 60.0)),
+                                        floor (fmod (variable_data->value.duration, 60.0) * 10.0) / 10.0);
+          static_str = FALSE;
+          show_limit = FALSE;
+          break;
+
+        case VARIABLE_TYPE_RATE_OF_CHANGE:
+          /* Translators:  This string reports the rate of change of a measured
+           * value.  The "%g" is replaced by a certain quantity, and the "/s"
+           * is an abbreviation for "per second".
+           */
+          str        = g_strdup_printf (_("%g/s"),
+                                        variable_data->value.rate_of_change);
+          static_str = FALSE;
+          break;
+        }
+
+      if (show_limit                   &&
+          variable_data->available     &&
+          field_info->meter_value      &&
+          ! field_info->meter_variable &&
+          group_data->limit)
+        {
+          gdouble  value;
+          gchar   *tmp;
+
+          value = gimp_dashboard_variable_to_double (dashboard,
+                                                     field_info->variable);
+
+          if (full)
+            {
+              tmp = g_strdup_printf ("%s (%d%%)",
+                                     str,
+                                     SIGNED_ROUND (100.0 * value /
+                                                   group_data->limit));
+            }
+          else
+            {
+              tmp = g_strdup_printf ("%d%%",
+                                     SIGNED_ROUND (100.0 * value /
+                                                   group_data->limit));
+            }
+
+          if (! static_str)
+            g_free ((gpointer) str);
+
+          str        = tmp;
+          static_str = FALSE;
+        }
+      else if (full                         &&
+               field_info->meter_variable   &&
+               variables[field_info->meter_variable].type ==
+               VARIABLE_TYPE_RATE_OF_CHANGE &&
+               priv->variables[field_info->meter_variable].available)
+        {
+          gdouble  value;
+          gchar   *value_str;
+          gchar   *rate_of_change_str;
+          gchar   *tmp;
+
+          value = gimp_dashboard_variable_to_double (dashboard,
+                                                     field_info->meter_variable);
+
+          value_str = gimp_dashboard_format_value (variable_info->type, value);
+
+          rate_of_change_str = gimp_dashboard_format_rate_of_change (value_str);
+
+          g_free (value_str);
+
+          tmp = g_strdup_printf ("%s (%s)", str, rate_of_change_str);
+
+          g_free (rate_of_change_str);
+
+          if (! static_str)
+            g_free ((gpointer) str);
+
+          str        = tmp;
+          static_str = FALSE;
+        }
+    }
+
+  if (static_str)
+    return g_strdup (str);
+  else
+    return (gpointer) str;
+}
+
+static gboolean
+gimp_dashboard_log_printf (GimpDashboard *dashboard,
+                           const gchar   *format,
+                           ...)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  va_list               args;
+  gboolean              result;
+
+  if (priv->log_error)
+    return FALSE;
+
+  va_start (args, format);
+
+  result = g_output_stream_vprintf (priv->log_output,
+                                    NULL, NULL,
+                                    &priv->log_error,
+                                    format, args);
+
+  va_end (args);
+
+  return result;
+}
+
+static gboolean
+gimp_dashboard_log_print_escaped (GimpDashboard *dashboard,
+                                  const gchar   *string)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  gchar                 buffer[1024];
+  const gchar          *s;
+  gint                  i;
+
+  if (priv->log_error)
+    return FALSE;
+
+  i = 0;
+
+  #define FLUSH()                                                 \
+    G_STMT_START                                                  \
+      {                                                           \
+        if (! g_output_stream_write_all (priv->log_output,        \
+                                         buffer, i, NULL,         \
+                                         NULL, &priv->log_error)) \
+          {                                                       \
+            return FALSE;                                         \
+          }                                                       \
+                                                                  \
+        i = 0;                                                    \
+      }                                                           \
+    G_STMT_END
+
+  #define RESERVE(n)                   \
+    G_STMT_START                       \
+      {                                \
+        if (i + (n) > sizeof (buffer)) \
+          FLUSH ();                    \
+      }                                \
+    G_STMT_END
+
+  for (s = string; *s; s++)
+    {
+      #define ESCAPE(from, to)                      \
+        case from:                                  \
+          RESERVE (sizeof (to) - 1);                \
+          memcpy (&buffer[i], to, sizeof (to) - 1); \
+          i += sizeof (to) - 1;                     \
+          break;
+
+      switch (*s)
+        {
+        ESCAPE ('"',  "&quot;")
+        ESCAPE ('\'', "&apos;")
+        ESCAPE ('<',  "&lt;")
+        ESCAPE ('>',  "&gt;")
+        ESCAPE ('&',  "&amp;")
+
+        default:
+          RESERVE (1);
+          buffer[i++] = *s;
+          break;
+        }
+
+      #undef ESCAPE
+    }
+
+  FLUSH ();
+
+  #undef FLUSH
+  #undef RESERVE
+
+  return TRUE;
+}
+
+static gint64
+gimp_dashboard_log_time (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+
+  return g_get_monotonic_time () - priv->log_start_time;
+}
+
+static void
+gimp_dashboard_log_sample (GimpDashboard *dashboard,
+                           gboolean       variables_changed,
+                           gboolean       include_current_thread)
+{
+  GimpDashboardPrivate *priv      = dashboard->priv;
+  GimpBacktrace        *backtrace = NULL;
+  GArray               *addresses = NULL;
+  gboolean              empty     = TRUE;
+  Variable              variable;
+
+  #define NONEMPTY()                              \
+    G_STMT_START                                  \
+      {                                           \
+        if (empty)                                \
+          {                                       \
+            gimp_dashboard_log_printf (dashboard, \
+                                       ">\n");    \
+                                                  \
+            empty = FALSE;                        \
+          }                                       \
+      }                                           \
+    G_STMT_END
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<sample id=\"%d\" t=\"%lld\"",
+                             priv->log_n_samples,
+                             (long long) gimp_dashboard_log_time (dashboard));
+
+  if (priv->log_n_samples == 0 || variables_changed)
+    {
+      NONEMPTY ();
+
+      gimp_dashboard_log_printf (dashboard,
+                                 "<vars>\n");
+
+      for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
+        {
+          const VariableInfo *variable_info     = &variables[variable];
+          const VariableData *variable_data     = &priv->variables[variable];
+          VariableData       *log_variable_data = &priv->log_variables[variable];
+
+          if (variable_info->exclude_from_log)
+            continue;
+
+          if (priv->log_n_samples > 0 &&
+              ! memcmp (variable_data, log_variable_data,
+                        sizeof (VariableData)))
+            {
+              continue;
+            }
+
+          *log_variable_data = *variable_data;
+
+          if (variable_data->available)
+            {
+              #define LOG_VAR(format, ...)                          \
+                gimp_dashboard_log_printf (dashboard,               \
+                                           "<%s>" format "</%s>\n", \
+                                           variable_info->name,     \
+                                           __VA_ARGS__,             \
+                                           variable_info->name)
+
+              #define LOG_VAR_FLOAT(value)                                  \
+                G_STMT_START                                                \
+                  {                                                         \
+                    gchar buffer[G_ASCII_DTOSTR_BUF_SIZE];                  \
+                                                                            \
+                    LOG_VAR ("%s", g_ascii_dtostr (buffer, sizeof (buffer), \
+                                                   value));                 \
+                  }                                                         \
+                G_STMT_END
+
+              switch (variable_info->type)
+                {
+                case VARIABLE_TYPE_BOOLEAN:
+                  LOG_VAR (
+                    "%d",
+                    variable_data->value.boolean);
+                  break;
+
+                case VARIABLE_TYPE_INTEGER:
+                  LOG_VAR (
+                    "%d",
+                    variable_data->value.integer);
+                  break;
+
+                case VARIABLE_TYPE_SIZE:
+                  LOG_VAR (
+                    "%llu",
+                    (unsigned long long) variable_data->value.size);
+                  break;
+
+                case VARIABLE_TYPE_SIZE_RATIO:
+                  LOG_VAR (
+                    "%llu/%llu",
+                    (unsigned long long) variable_data->value.size_ratio.antecedent,
+                    (unsigned long long) variable_data->value.size_ratio.consequent);
+                  break;
+
+                case VARIABLE_TYPE_INT_RATIO:
+                  LOG_VAR (
+                    "%d:%d",
+                    variable_data->value.int_ratio.antecedent,
+                    variable_data->value.int_ratio.consequent);
+                  break;
+
+                case VARIABLE_TYPE_PERCENTAGE:
+                  LOG_VAR_FLOAT (
+                    variable_data->value.percentage);
+                  break;
+
+                case VARIABLE_TYPE_DURATION:
+                  LOG_VAR_FLOAT (
+                    variable_data->value.duration);
+                  break;
+
+                case VARIABLE_TYPE_RATE_OF_CHANGE:
+                  LOG_VAR_FLOAT (
+                    variable_data->value.rate_of_change);
+                  break;
+                }
+
+              #undef LOG_VAR
+              #undef LOG_VAR_FLOAT
+            }
+          else
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         "<%s />\n",
+                                         variable_info->name);
+            }
+        }
+
+      gimp_dashboard_log_printf (dashboard,
+                                 "</vars>\n");
+    }
+
+  if (priv->log_params.backtrace)
+    backtrace = gimp_backtrace_new (include_current_thread);
+
+  if (backtrace)
+    {
+      gboolean backtrace_empty = TRUE;
+      gint     n_threads;
+      gint     thread;
+
+      #define BACKTRACE_NONEMPTY()                           \
+        G_STMT_START                                         \
+          {                                                  \
+            if (backtrace_empty)                             \
+              {                                              \
+                NONEMPTY ();                                 \
+                                                             \
+                gimp_dashboard_log_printf (dashboard,        \
+                                           "<backtrace>\n"); \
+                                                             \
+                backtrace_empty = FALSE;                     \
+              }                                              \
+          }                                                  \
+        G_STMT_END
+
+      if (priv->log_backtrace)
+        {
+          n_threads = gimp_backtrace_get_n_threads (priv->log_backtrace);
+
+          for (thread = 0; thread < n_threads; thread++)
+            {
+              guintptr thread_id;
+
+              thread_id = gimp_backtrace_get_thread_id (priv->log_backtrace,
+                                                        thread);
+
+              if (gimp_backtrace_find_thread_by_id (backtrace,
+                                                    thread_id, thread) < 0)
+                {
+                  const gchar *thread_name;
+
+                  BACKTRACE_NONEMPTY ();
+
+                  thread_name =
+                    gimp_backtrace_get_thread_name (priv->log_backtrace,
+                                                    thread);
+
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<thread id=\"%llu\"",
+                                             (unsigned long long) thread_id);
+
+                  if (thread_name)
+                    {
+                      gimp_dashboard_log_printf (dashboard,
+                                                 " name=\"");
+                      gimp_dashboard_log_print_escaped (dashboard, thread_name);
+                      gimp_dashboard_log_printf (dashboard,
+                                                 "\"");
+                    }
+
+                  gimp_dashboard_log_printf (dashboard,
+                                             " />\n");
+                }
+            }
+        }
+
+      n_threads = gimp_backtrace_get_n_threads (backtrace);
+
+      for (thread = 0; thread < n_threads; thread++)
+        {
+          guintptr     thread_id;
+          const gchar *thread_name;
+          gint         last_running  = -1;
+          gint         running;
+          gint         last_n_frames = -1;
+          gint         n_frames;
+          gint         n_head        = 0;
+          gint         n_tail        = 0;
+          gint         frame;
+
+          thread_id   = gimp_backtrace_get_thread_id     (backtrace, thread);
+          thread_name = gimp_backtrace_get_thread_name   (backtrace, thread);
+
+          running     = gimp_backtrace_is_thread_running (backtrace, thread);
+          n_frames    = gimp_backtrace_get_n_frames      (backtrace, thread);
+
+          if (priv->log_backtrace)
+            {
+              gint other_thread = gimp_backtrace_find_thread_by_id (
+                priv->log_backtrace, thread_id, thread);
+
+              if (other_thread >= 0)
+                {
+                  gint n;
+                  gint i;
+
+                  last_running  = gimp_backtrace_is_thread_running (
+                    priv->log_backtrace, other_thread);
+                  last_n_frames = gimp_backtrace_get_n_frames (
+                    priv->log_backtrace, other_thread);
+
+                  n = MIN (n_frames, last_n_frames);
+
+                  for (i = 0; i < n; i++)
+                    {
+                      if (gimp_backtrace_get_frame_address (backtrace,
+                                                            thread, i) !=
+                          gimp_backtrace_get_frame_address (priv->log_backtrace,
+                                                            other_thread, i))
+                        {
+                          break;
+                        }
+                    }
+
+                  n_head  = i;
+                  n      -= i;
+
+                  for (i = 0; i < n; i++)
+                    {
+                      if (gimp_backtrace_get_frame_address (backtrace,
+                                                            thread, -i - 1) !=
+                          gimp_backtrace_get_frame_address (priv->log_backtrace,
+                                                            other_thread, -i - 1))
+                        {
+                          break;
+                        }
+                    }
+
+                  n_tail = i;
+                }
+            }
+
+          if (running         == last_running  &&
+              n_frames        == last_n_frames &&
+              n_head + n_tail == n_frames)
+            {
+              continue;
+            }
+
+          BACKTRACE_NONEMPTY ();
+
+          gimp_dashboard_log_printf (dashboard,
+                                     "<thread id=\"%llu\"",
+                                     (unsigned long long) thread_id);
+
+          if (thread_name)
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         " name=\"");
+              gimp_dashboard_log_print_escaped (dashboard, thread_name);
+              gimp_dashboard_log_printf (dashboard,
+                                         "\"");
+            }
+
+          gimp_dashboard_log_printf (dashboard,
+                                     " running=\"%d\"",
+                                     running);
+
+          if (n_head > 0)
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         " head=\"%d\"",
+                                         n_head);
+            }
+
+          if (n_tail > 0)
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         " tail=\"%d\"",
+                                         n_tail);
+            }
+
+          if (n_frames == 0 || n_head + n_tail < n_frames)
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                          ">\n");
+
+              for (frame = n_head; frame < n_frames - n_tail; frame++)
+                {
+                  guintptr address;
+
+                  address = gimp_backtrace_get_frame_address (backtrace,
+                                                              thread, frame);
+
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<frame address=\"0x%llx\" />\n",
+                                             (unsigned long long) address);
+
+                  if (g_hash_table_add (priv->log_addresses,
+                                        (gpointer) address) &&
+                      priv->log_params.progressive)
+                    {
+                      if (! addresses)
+                        {
+                          addresses = g_array_new (FALSE, FALSE,
+                                                   sizeof (guintptr));
+                        }
+
+                      g_array_append_val (addresses, address);
+                    }
+                }
+
+              gimp_dashboard_log_printf (dashboard,
+                                         "</thread>\n");
+            }
+          else
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         " />\n");
+            }
+        }
+
+      if (! backtrace_empty)
+        {
+          gimp_dashboard_log_printf (dashboard,
+                                     "</backtrace>\n");
+        }
+
+      #undef BACKTRACE_NONEMPTY
+    }
+  else if (priv->log_backtrace)
+    {
+      NONEMPTY ();
+
+      gimp_dashboard_log_printf (dashboard,
+                                 "<backtrace />\n");
+    }
+
+  gimp_backtrace_free (priv->log_backtrace);
+  priv->log_backtrace = backtrace;
+
+  if (empty)
+    {
+      gimp_dashboard_log_printf (dashboard,
+                                 " />\n");
+    }
+  else
+    {
+      gimp_dashboard_log_printf (dashboard,
+                                 "</sample>\n");
+    }
+
+  if (addresses)
+    {
+      gimp_dashboard_log_write_address_map (dashboard,
+                                            (guintptr *) addresses->data,
+                                            addresses->len,
+                                            NULL);
+
+      g_array_free (addresses, TRUE);
+    }
+
+  if (priv->log_params.progressive)
+    g_output_stream_flush (priv->log_output, NULL, NULL);
+
+  #undef NONEMPTY
+
+  priv->log_n_samples++;
+}
+
+static void
+gimp_dashboard_log_add_marker_unlocked (GimpDashboard *dashboard,
+                                        const gchar   *description)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+
+  priv->log_n_markers++;
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<marker id=\"%d\" t=\"%lld\"",
+                             priv->log_n_markers,
+                             (long long) gimp_dashboard_log_time (dashboard));
+
+  if (description && description[0])
+    {
+      gimp_dashboard_log_printf (dashboard,
+                                 ">\n");
+      gimp_dashboard_log_print_escaped (dashboard, description);
+      gimp_dashboard_log_printf (dashboard,
+                                 "\n"
+                                 "</marker>\n");
+    }
+  else
+    {
+      gimp_dashboard_log_printf (dashboard,
+                                 " />\n");
+    }
+
+  gimp_dashboard_log_update_n_markers (dashboard);
+}
+
+static void
+gimp_dashboard_log_update_highlight (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+
+  gimp_highlightable_button_set_highlight (
+    priv->log_record_button,
+    gimp_dashboard_log_is_recording (dashboard));
+}
+
+static void
+gimp_dashboard_log_update_n_markers (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  gchar                 buffer[32];
+
+  g_snprintf (buffer, sizeof (buffer), "%d", priv->log_n_markers + 1);
+
+  gtk_label_set_text (priv->log_add_marker_label, buffer);
+}
+
+static gint
+gimp_dashboard_log_compare_addresses (gconstpointer a1,
+                                      gconstpointer a2)
+{
+  guintptr address1 = *(const guintptr *) a1;
+  guintptr address2 = *(const guintptr *) a2;
+
+  if (address1 < address2)
+    return -1;
+  else if (address1 > address2)
+    return +1;
+  else
+    return 0;
+}
+
+static void
+gimp_dashboard_log_write_address_map (GimpDashboard *dashboard,
+                                      guintptr      *addresses,
+                                      gint           n_addresses,
+                                      GimpAsync     *async)
+{
+  GimpBacktraceAddressInfo infos[2];
+  gint                     i;
+  gint                     n;
+
+  if (n_addresses == 0)
+    return;
+
+  qsort (addresses, n_addresses, sizeof (guintptr),
+         gimp_dashboard_log_compare_addresses);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<address-map>\n");
+
+  n = 0;
+
+  for (i = 0; i < n_addresses; i++)
+    {
+      GimpBacktraceAddressInfo       *info      = &infos[n       % 2];
+      const GimpBacktraceAddressInfo *prev_info = &infos[(n + 1) % 2];
+
+      if (async && gimp_async_is_canceled (async))
+        break;
+
+      if (gimp_backtrace_get_address_info (addresses[i], info))
+        {
+          gboolean empty = TRUE;
+
+          #define NONEMPTY()                              \
+            G_STMT_START                                  \
+              {                                           \
+                if (empty)                                \
+                  {                                       \
+                    gimp_dashboard_log_printf (dashboard, \
+                                               ">\n");    \
+                                                          \
+                    empty = FALSE;                        \
+                  }                                       \
+              }                                           \
+            G_STMT_END
+
+          gimp_dashboard_log_printf (dashboard,
+                                     "\n"
+                                     "<address value=\"0x%llx\"",
+                                     (unsigned long long) addresses[i]);
+
+          if (n == 0 || strcmp (info->object_name, prev_info->object_name))
+            {
+              NONEMPTY ();
+
+              if (info->object_name[0])
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<object>");
+                  gimp_dashboard_log_print_escaped (dashboard,
+                                                    info->object_name);
+                  gimp_dashboard_log_printf (dashboard,
+                                             "</object>\n");
+                }
+              else
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<object />\n");
+                }
+            }
+
+          if (n == 0 || strcmp (info->symbol_name, prev_info->symbol_name))
+            {
+              NONEMPTY ();
+
+              if (info->symbol_name[0])
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<symbol>");
+                  gimp_dashboard_log_print_escaped (dashboard,
+                                                    info->symbol_name);
+                  gimp_dashboard_log_printf (dashboard,
+                                             "</symbol>\n");
+                }
+              else
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<symbol />\n");
+                }
+            }
+
+          if (n == 0 || info->symbol_address != prev_info->symbol_address)
+            {
+              NONEMPTY ();
+
+              if (info->symbol_address)
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<base>0x%llx</base>\n",
+                                             (unsigned long long)
+                                               info->symbol_address);
+                }
+              else
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<base />\n");
+                }
+            }
+
+          if (n == 0 || strcmp (info->source_file, prev_info->source_file))
+            {
+              NONEMPTY ();
+
+              if (info->source_file[0])
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<source>");
+                  gimp_dashboard_log_print_escaped (dashboard,
+                                                    info->source_file);
+                  gimp_dashboard_log_printf (dashboard,
+                                             "</source>\n");
+                }
+              else
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<source />\n");
+                }
+            }
+
+          if (n == 0 || info->source_line != prev_info->source_line)
+            {
+              NONEMPTY ();
+
+              if (info->source_line)
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<line>%d</line>\n",
+                                             info->source_line);
+                }
+              else
+                {
+                  gimp_dashboard_log_printf (dashboard,
+                                             "<line />\n");
+                }
+            }
+
+          if (empty)
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         " />\n");
+            }
+          else
+            {
+              gimp_dashboard_log_printf (dashboard,
+                                         "</address>\n");
+            }
+
+          #undef NONEMPTY
+
+          n++;
+        }
+    }
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "</address-map>\n");
+}
+
+static void
+gimp_dashboard_log_write_global_address_map (GimpAsync     *async,
+                                             GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv = dashboard->priv;
+  gint                  n_addresses;
+
+  n_addresses = g_hash_table_size (priv->log_addresses);
+
+  if (n_addresses > 0)
+    {
+      guintptr *addresses;
+      GList    *iter;
+      gint      i;
+
+      addresses = g_new (guintptr, n_addresses);
+
+      for (iter = g_hash_table_get_keys (priv->log_addresses), i = 0;
+           iter;
+           iter = g_list_next (iter), i++)
+        {
+          addresses[i] = (guintptr) iter->data;
+        }
+
+      gimp_dashboard_log_write_address_map (dashboard,
+                                            addresses, n_addresses,
+                                            async);
+
+      g_free (addresses);
+    }
+
+  gimp_async_finish (async, NULL);
+}
+
+static void
+gimp_dashboard_log_log_func (const gchar    *log_domain,
+                             GLogLevelFlags  log_levels,
+                             const gchar    *message,
+                             GimpDashboard  *dashboard)
+{
+  GimpDashboardPrivate *priv      = dashboard->priv;
+  const gchar          *log_level = NULL;
+  gchar                *description;
+
+  g_mutex_lock (&priv->mutex);
+
+  switch (log_levels & G_LOG_LEVEL_MASK)
+    {
+    case G_LOG_LEVEL_ERROR:    log_level = "ERROR";    break;
+    case G_LOG_LEVEL_CRITICAL: log_level = "CRITICAL"; break;
+    case G_LOG_LEVEL_WARNING:  log_level = "WARNING";  break;
+    case G_LOG_LEVEL_MESSAGE:  log_level = "MESSAGE";  break;
+    case G_LOG_LEVEL_INFO:     log_level = "INFO";     break;
+    case G_LOG_LEVEL_DEBUG:    log_level = "DEBUG";    break;
+    default:                   log_level = "UNKNOWN";  break;
+    }
+
+  description = g_strdup_printf ("[%s] %s: %s", log_domain, log_level, message);
+
+  gimp_dashboard_log_add_marker_unlocked (dashboard, description);
+
+  gimp_dashboard_log_sample (dashboard, FALSE, TRUE);
+
+  g_free (description);
+
+  g_mutex_unlock (&priv->mutex);
+}
+
+static gboolean
+gimp_dashboard_field_use_meter_underlay (Group group,
+                                         gint  field)
+{
+  const GroupInfo    *group_info = &groups[group];
+  Variable            variable   = group_info->fields[field].variable;
+  const VariableInfo *variable_info;
+
+  if (group_info->fields[field].meter_variable)
+    variable = group_info->fields[field].meter_variable;
+
+  variable_info = &variables [variable];
+
+  return variable_info->type == VARIABLE_TYPE_BOOLEAN ||
+         (group_info->fields[field].meter_variable    &&
+          variable_info->type == VARIABLE_TYPE_RATE_OF_CHANGE);
+}
+
+static gchar *
+gimp_dashboard_format_rate_of_change (const gchar *value)
+{
+  /* Translators:  This string reports the rate of change of a measured value.
+   * The first "%s" is replaced by a certain quantity, usually followed by a
+   * unit of measurement (e.g., "10 bytes"). and the final "/s" is an
+   * abbreviation for "per second" (so the full string would read
+   * "10 bytes/s", that is, "10 bytes per second".
+   */
+  return g_strdup_printf (_("%s/s"), value);
+}
+
+static gchar *
+gimp_dashboard_format_value (VariableType type,
+                             gdouble      value)
+{
+  switch (type)
+    {
+    case VARIABLE_TYPE_BOOLEAN:
+      return g_strdup (value ? C_("dashboard-value", "Yes") :
+                               C_("dashboard-value", "No"));
+
+    case VARIABLE_TYPE_INTEGER:
+      return g_strdup_printf ("%g", value);
+
+    case VARIABLE_TYPE_SIZE:
+      return g_format_size_full (value, G_FORMAT_SIZE_IEC_UNITS);
+
+    case VARIABLE_TYPE_SIZE_RATIO:
+      if (isfinite (value))
+        return g_strdup_printf ("%d%%", SIGNED_ROUND (100.0 * value));
+      break;
+
+    case VARIABLE_TYPE_INT_RATIO:
+      if (isfinite (value))
+        {
+          gdouble  min;
+          gdouble  max;
+          gdouble  antecedent;
+          gdouble  consequent;
+
+          antecedent = value;
+          consequent = 1.0;
+
+          min = MIN (ABS (antecedent), ABS (consequent));
+          max = MAX (ABS (antecedent), ABS (consequent));
+
+          if (min)
+            {
+              antecedent /= min;
+              consequent /= min;
+            }
+          else
+            {
+              antecedent /= max;
+              consequent /= max;
+            }
+
+          return g_strdup_printf ("%g:%g",
+                                  RINT (100.0 * antecedent) / 100.0,
+                                  RINT (100.0 * consequent) / 100.0);
+        }
+      else if (isinf (value))
+        {
+          return g_strdup ("1:0");
+        }
+      break;
+
+    case VARIABLE_TYPE_PERCENTAGE:
+      return g_strdup_printf ("%d%%", SIGNED_ROUND (100.0 * value));
+
+    case VARIABLE_TYPE_DURATION:
+      return g_strdup_printf ("%02d:%02d:%04.1f",
+                              (gint) floor (value / 3600.0),
+                              (gint) floor (fmod (value / 60.0, 60.0)),
+                              floor (fmod (value, 60.0) * 10.0) / 10.0);
+
+    case VARIABLE_TYPE_RATE_OF_CHANGE:
+      {
+        gchar buf[64];
+
+        g_snprintf (buf, sizeof (buf), "%g", value);
+
+        return gimp_dashboard_format_rate_of_change (buf);
+      }
+    }
+
+  return g_strdup (_("N/A"));
+}
+
+static void
+gimp_dashboard_label_set_text (GtkLabel    *label,
+                               const gchar *text)
+{
+  /* the strcmp() reduces the overhead of gtk_label_set_text() when the
+   * text hasn't changed
+   */
+  if (g_strcmp0 (gtk_label_get_text (label), text))
+    gtk_label_set_text (label, text);
+}
+
+
+/*  public functions  */
+
+
+GtkWidget *
+gimp_dashboard_new (Gimp            *gimp,
+                    GimpMenuFactory *menu_factory)
+{
+  GimpDashboard *dashboard;
+
+  dashboard = g_object_new (GIMP_TYPE_DASHBOARD,
+                            "menu-factory",    menu_factory,
+                            "menu-identifier", "<Dashboard>",
+                            "ui-path",         "/dashboard-popup",
+                            NULL);
+
+  dashboard->priv->gimp = gimp;
+
+  return GTK_WIDGET (dashboard);
+}
+
+gboolean
+gimp_dashboard_log_start_recording (GimpDashboard                 *dashboard,
+                                    GFile                         *file,
+                                    const GimpDashboardLogParams  *params,
+                                    GError                       **error)
+{
+  GimpDashboardPrivate  *priv;
+  GimpUIManager         *ui_manager;
+  GimpActionGroup       *action_group;
+  gchar                 *version;
+  gchar                **envp;
+  gchar                **env;
+  GParamSpec           **pspecs;
+  guint                  n_pspecs;
+  gboolean               has_backtrace;
+  Variable               variable;
+  guint                  i;
+
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  priv = dashboard->priv;
+
+  g_return_val_if_fail (! gimp_dashboard_log_is_recording (dashboard), FALSE);
+
+  if (! params)
+    params = gimp_dashboard_log_get_default_params (dashboard);
+
+  priv->log_params = *params;
+
+  if (g_getenv ("GIMP_PERFORMANCE_LOG_SAMPLE_FREQUENCY"))
+    {
+      priv->log_params.sample_frequency =
+        atoi (g_getenv ("GIMP_PERFORMANCE_LOG_SAMPLE_FREQUENCY"));
+    }
+
+  if (g_getenv ("GIMP_PERFORMANCE_LOG_BACKTRACE"))
+    {
+      priv->log_params.backtrace =
+        atoi (g_getenv ("GIMP_PERFORMANCE_LOG_BACKTRACE")) ? 1 : 0;
+    }
+
+  if (g_getenv ("GIMP_PERFORMANCE_LOG_MESSAGES"))
+    {
+      priv->log_params.messages =
+        atoi (g_getenv ("GIMP_PERFORMANCE_LOG_MESSAGES")) ? 1 : 0;
+    }
+
+  if (g_getenv ("GIMP_PERFORMANCE_LOG_PROGRESSIVE"))
+    {
+      priv->log_params.progressive =
+        atoi (g_getenv ("GIMP_PERFORMANCE_LOG_PROGRESSIVE")) ? 1 : 0;
+    }
+
+  priv->log_params.sample_frequency = CLAMP (priv->log_params.sample_frequency,
+                                             LOG_SAMPLE_FREQUENCY_MIN,
+                                             LOG_SAMPLE_FREQUENCY_MAX);
+
+  g_mutex_lock (&priv->mutex);
+
+  if (priv->log_params.progressive     &&
+      g_file_query_exists (file, NULL) &&
+      ! g_file_delete (file, NULL, error))
+    {
+      g_mutex_unlock (&priv->mutex);
+
+      return FALSE;
+    }
+
+  priv->log_output = G_OUTPUT_STREAM (g_file_replace (file,
+                                      NULL, FALSE, G_FILE_CREATE_NONE, NULL,
+                                      error));
+
+  if (! priv->log_output)
+    {
+      g_mutex_unlock (&priv->mutex);
+
+      return FALSE;
+    }
+
+  priv->log_error      = NULL;
+  priv->log_start_time = g_get_monotonic_time ();
+  priv->log_n_samples  = 0;
+  priv->log_n_markers  = 0;
+  priv->log_backtrace  = NULL;
+  priv->log_addresses  = g_hash_table_new (NULL, NULL);
+
+  if (priv->log_params.backtrace)
+    has_backtrace = gimp_backtrace_start ();
+  else
+    has_backtrace = FALSE;
+
+  gimp_dashboard_log_printf (dashboard,
+                             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                             "<gimp-performance-log version=\"%d\">\n",
+                             LOG_VERSION);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<params>\n"
+                             "<sample-frequency>%d</sample-frequency>\n"
+                             "<backtrace>%d</backtrace>\n"
+                             "<messages>%d</messages>\n"
+                             "<progressive>%d</progressive>\n"
+                             "</params>\n",
+                             priv->log_params.sample_frequency,
+                             has_backtrace,
+                             priv->log_params.messages,
+                             priv->log_params.progressive);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<info>\n");
+
+  version = gimp_version (TRUE, FALSE);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<gimp-version>\n");
+  gimp_dashboard_log_print_escaped (dashboard, version);
+  gimp_dashboard_log_printf (dashboard,
+                             "</gimp-version>\n");
+
+  g_free (version);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<env>\n");
+
+  envp = g_get_environ ();
+
+  for (env = envp; *env; env++)
+    {
+      if (g_str_has_prefix (*env, "BABL_") ||
+          g_str_has_prefix (*env, "GEGL_") ||
+          g_str_has_prefix (*env, "GIMP_"))
+        {
+          gchar       *delim = strchr (*env, '=');
+          const gchar *s;
+
+          if (! delim)
+            continue;
+
+          for (s = *env;
+               s != delim && (g_ascii_isalnum (*s) || *s == '_' || *s == '-');
+               s++);
+
+          if (s != delim)
+            continue;
+
+          *delim = '\0';
+
+          gimp_dashboard_log_printf (dashboard,
+                                     "<%s>",
+                                     *env);
+          gimp_dashboard_log_print_escaped (dashboard, delim + 1);
+          gimp_dashboard_log_printf (dashboard,
+                                     "</%s>\n",
+                                     *env);
+        }
+    }
+
+  g_strfreev (envp);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "</env>\n");
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<gegl-config>\n");
+
+  pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (gegl_config ()),
+                                           &n_pspecs);
+
+  for (i = 0; i < n_pspecs; i++)
+    {
+      const GParamSpec *pspec     = pspecs[i];
+      GValue            value     = {};
+      GValue            str_value = {};
+
+      g_value_init (&value,     pspec->value_type);
+      g_value_init (&str_value, G_TYPE_STRING);
+
+      g_object_get_property (G_OBJECT (gegl_config ()), pspec->name, &value);
+
+      if (g_value_transform (&value, &str_value))
+        {
+          gimp_dashboard_log_printf (dashboard,
+                                     "<%s>",
+                                     pspec->name);
+          gimp_dashboard_log_print_escaped (dashboard,
+                                            g_value_get_string (&str_value));
+          gimp_dashboard_log_printf (dashboard,
+                                     "</%s>\n",
+                                     pspec->name);
+        }
+
+      g_value_unset (&str_value);
+      g_value_unset (&value);
+    }
+
+  g_free (pspecs);
+
+  gimp_dashboard_log_printf (dashboard,
+                             "</gegl-config>\n");
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "</info>\n");
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<var-defs>\n");
+
+  for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
+    {
+      const VariableInfo *variable_info = &variables[variable];
+      const gchar        *type          = "";
+
+      if (variable_info->exclude_from_log)
+        continue;
+
+      switch (variable_info->type)
+        {
+        case VARIABLE_TYPE_BOOLEAN:        type = "boolean";        break;
+        case VARIABLE_TYPE_INTEGER:        type = "integer";        break;
+        case VARIABLE_TYPE_SIZE:           type = "size";           break;
+        case VARIABLE_TYPE_SIZE_RATIO:     type = "size-ratio";     break;
+        case VARIABLE_TYPE_INT_RATIO:      type = "int-ratio";      break;
+        case VARIABLE_TYPE_PERCENTAGE:     type = "percentage";     break;
+        case VARIABLE_TYPE_DURATION:       type = "duration";       break;
+        case VARIABLE_TYPE_RATE_OF_CHANGE: type = "rate-of-change"; break;
+        }
+
+      gimp_dashboard_log_printf (dashboard,
+                                 "<var name=\"%s\" type=\"%s\" desc=\"",
+                                 variable_info->name,
+                                 type);
+      gimp_dashboard_log_print_escaped (dashboard,
+                                        /* intentionally untranslated */
+                                        variable_info->description);
+      gimp_dashboard_log_printf (dashboard,
+                                 "\" />\n");
+    }
+
+  gimp_dashboard_log_printf (dashboard,
+                             "</var-defs>\n");
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "<samples>\n");
+
+  if (priv->log_error)
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      gimp_backtrace_stop ();
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (priv->log_output, cancellable, NULL);
+      g_object_unref (cancellable);
+
+      g_clear_object (&priv->log_output);
+
+      g_propagate_error (error, priv->log_error);
+      priv->log_error = NULL;
+
+      g_mutex_unlock (&priv->mutex);
+
+      return FALSE;
+    }
+
+  gimp_dashboard_reset_unlocked (dashboard);
+
+  if (priv->log_params.messages)
+    {
+      priv->log_log_handler = gimp_log_set_handler (
+        TRUE,
+        G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
+        (GLogFunc) gimp_dashboard_log_log_func,
+        dashboard);
+    }
+
+  priv->update_now = TRUE;
+  g_cond_signal (&priv->cond);
+
+  g_mutex_unlock (&priv->mutex);
+
+  gimp_dashboard_log_update_n_markers (dashboard);
+
+  ui_manager   = gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard));
+  action_group = gimp_ui_manager_get_action_group (ui_manager, "dashboard");
+
+  gimp_action_group_update (action_group, dashboard);
+
+  gimp_dashboard_log_update_highlight (dashboard);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dashboard_log_stop_recording (GimpDashboard  *dashboard,
+                                   GError        **error)
+{
+  GimpDashboardPrivate *priv;
+  GimpUIManager        *ui_manager;
+  GimpActionGroup      *action_group;
+  gboolean              result = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  priv = dashboard->priv;
+
+  if (! gimp_dashboard_log_is_recording (dashboard))
+    return TRUE;
+
+  g_mutex_lock (&priv->mutex);
+
+  if (priv->log_log_handler)
+    {
+      gimp_log_remove_handler (priv->log_log_handler);
+
+      priv->log_log_handler = 0;
+    }
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "</samples>\n");
+
+
+  if (! priv->log_params.progressive &&
+      g_hash_table_size (priv->log_addresses) > 0)
+    {
+      GimpAsync *async;
+
+      async = gimp_parallel_run_async_independent (
+        (GimpRunAsyncFunc) gimp_dashboard_log_write_global_address_map,
+        dashboard);
+
+      gimp_wait (priv->gimp, GIMP_WAITABLE (async),
+                 _("Resolving symbol information..."));
+
+      g_object_unref (async);
+    }
+
+  gimp_dashboard_log_printf (dashboard,
+                             "\n"
+                             "</gimp-performance-log>\n");
+
+  if (priv->log_params.backtrace)
+    gimp_backtrace_stop ();
+
+  if (! priv->log_error)
+    {
+      g_output_stream_close (priv->log_output, NULL, &priv->log_error);
+    }
+  else
+    {
+      GCancellable *cancellable = g_cancellable_new ();
+
+      /* Cancel the overwrite initiated by g_file_replace(). */
+      g_cancellable_cancel (cancellable);
+      g_output_stream_close (priv->log_output, cancellable, NULL);
+      g_object_unref (cancellable);
+    }
+
+  g_clear_object (&priv->log_output);
+
+  if (priv->log_error)
+    {
+      g_propagate_error (error, priv->log_error);
+      priv->log_error = NULL;
+
+      result = FALSE;
+    }
+
+  g_clear_pointer (&priv->log_backtrace, gimp_backtrace_free);
+  g_clear_pointer (&priv->log_addresses, g_hash_table_unref);
+
+  g_mutex_unlock (&priv->mutex);
+
+  ui_manager   = gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard));
+  action_group = gimp_ui_manager_get_action_group (ui_manager, "dashboard");
+
+  gimp_action_group_update (action_group, dashboard);
+
+  gimp_dashboard_log_update_highlight (dashboard);
+
+  return result;
+}
+
+gboolean
+gimp_dashboard_log_is_recording (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv;
+
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), FALSE);
+
+  priv = dashboard->priv;
+
+  return priv->log_output != NULL;
+}
+
+const GimpDashboardLogParams *
+gimp_dashboard_log_get_default_params (GimpDashboard *dashboard)
+{
+  static const GimpDashboardLogParams default_params =
+  {
+    .sample_frequency = LOG_DEFAULT_SAMPLE_FREQUENCY,
+    .backtrace        = LOG_DEFAULT_BACKTRACE,
+    .messages         = LOG_DEFAULT_MESSAGES,
+    .progressive      = LOG_DEFAULT_PROGRESSIVE
+  };
+
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), NULL);
+
+  return &default_params;
+}
+
+void
+gimp_dashboard_log_add_marker (GimpDashboard *dashboard,
+                               const gchar   *description)
+{
+  GimpDashboardPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+  g_return_if_fail (gimp_dashboard_log_is_recording (dashboard));
+
+  priv = dashboard->priv;
+
+  g_mutex_lock (&priv->mutex);
+
+  gimp_dashboard_log_add_marker_unlocked (dashboard, description);
+
+  g_mutex_unlock (&priv->mutex);
+}
+
+void
+gimp_dashboard_reset (GimpDashboard *dashboard)
+{
+  GimpDashboardPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+
+  priv = dashboard->priv;
+
+  g_mutex_lock (&priv->mutex);
+
+  gimp_dashboard_reset_unlocked (dashboard);
+
+  priv->update_now = TRUE;
+  g_cond_signal (&priv->cond);
+
+  g_mutex_unlock (&priv->mutex);
+}
+
+void
+gimp_dashboard_set_update_interval (GimpDashboard              *dashboard,
+                                    GimpDashboardUpdateInteval  update_interval)
+{
+  GimpDashboardPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+
+  priv = dashboard->priv;
+
+  if (update_interval != priv->update_interval)
+    {
+      Group group;
+
+      g_mutex_lock (&priv->mutex);
+
+      priv->update_interval = update_interval;
+
+      for (group = FIRST_GROUP; group < N_GROUPS; group++)
+        {
+          GroupData *group_data = &priv->groups[group];
+
+          if (group_data->meter)
+            {
+              gimp_meter_set_history_resolution (group_data->meter,
+                                                 update_interval / 1000.0);
+            }
+        }
+
+      priv->update_now = TRUE;
+      g_cond_signal (&priv->cond);
+
+      g_mutex_unlock (&priv->mutex);
+    }
+}
+
+GimpDashboardUpdateInteval
+gimp_dashboard_get_update_interval (GimpDashboard *dashboard)
+{
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), DEFAULT_UPDATE_INTERVAL);
+
+  return dashboard->priv->update_interval;
+}
+
+void
+gimp_dashboard_set_history_duration (GimpDashboard                *dashboard,
+                                     GimpDashboardHistoryDuration  history_duration)
+{
+  GimpDashboardPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+
+  priv = dashboard->priv;
+
+  if (history_duration != priv->history_duration)
+    {
+      Group group;
+
+      g_mutex_lock (&priv->mutex);
+
+      priv->history_duration = history_duration;
+
+      for (group = FIRST_GROUP; group < N_GROUPS; group++)
+        {
+          GroupData *group_data = &priv->groups[group];
+
+          if (group_data->meter)
+            {
+              gimp_meter_set_history_duration (group_data->meter,
+                                               history_duration / 1000.0);
+            }
+        }
+
+      priv->update_now = TRUE;
+      g_cond_signal (&priv->cond);
+
+      g_mutex_unlock (&priv->mutex);
+    }
+}
+
+GimpDashboardHistoryDuration
+gimp_dashboard_get_history_duration (GimpDashboard *dashboard)
+{
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), DEFAULT_HISTORY_DURATION);
+
+  return dashboard->priv->history_duration;
+}
+
+void
+gimp_dashboard_set_low_swap_space_warning (GimpDashboard *dashboard,
+                                           gboolean       low_swap_space_warning)
+{
+  GimpDashboardPrivate *priv;
+
+  g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+
+  priv = dashboard->priv;
+
+  if (low_swap_space_warning != priv->low_swap_space_warning)
+    {
+      g_mutex_lock (&priv->mutex);
+
+      priv->low_swap_space_warning = low_swap_space_warning;
+
+      g_mutex_unlock (&priv->mutex);
+    }
+}
+
+gboolean
+gimp_dashboard_get_low_swap_space_warning (GimpDashboard *dashboard)
+{
+  g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), DEFAULT_LOW_SWAP_SPACE_WARNING);
+
+  return dashboard->priv->low_swap_space_warning;
+}
+
+void
+gimp_dashboard_menu_setup (GimpUIManager *manager,
+                           const gchar   *ui_path)
+{
+  guint merge_id;
+  Group group;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+
+  merge_id = gimp_ui_manager_new_merge_id (manager);
+
+  for (group = FIRST_GROUP; group < N_GROUPS; group++)
+    {
+      const GroupInfo *group_info = &groups[group];
+      gchar           *action_name;
+      gchar           *action_path;
+
+      action_name = g_strdup_printf ("dashboard-group-%s", group_info->name);
+      action_path = g_strdup_printf ("%s/Groups/Groups", ui_path);
+
+      gimp_ui_manager_add_ui (manager, merge_id,
+                              action_path, action_name, action_name,
+                              GTK_UI_MANAGER_MENUITEM,
+                              FALSE);
+
+      g_free (action_name);
+      g_free (action_path);
+    }
+}
diff --git a/app/widgets/gimpdashboard.h b/app/widgets/gimpdashboard.h
new file mode 100644
index 0000000..5d8a73f
--- /dev/null
+++ b/app/widgets/gimpdashboard.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdashboard.h
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DASHBOARD_H__
+#define __GIMP_DASHBOARD_H__
+
+
+#include "gimpeditor.h"
+
+
+struct _GimpDashboardLogParams
+{
+  gint     sample_frequency;
+  gboolean backtrace;
+  gboolean messages;
+  gboolean progressive;
+};
+
+
+#define GIMP_TYPE_DASHBOARD            (gimp_dashboard_get_type ())
+#define GIMP_DASHBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DASHBOARD, GimpDashboard))
+#define GIMP_DASHBOARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DASHBOARD, GimpDashboardClass))
+#define GIMP_IS_DASHBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DASHBOARD))
+#define GIMP_IS_DASHBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DASHBOARD))
+#define GIMP_DASHBOARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DASHBOARD, GimpDashboardClass))
+
+
+typedef struct _GimpDashboardPrivate GimpDashboardPrivate;
+typedef struct _GimpDashboardClass   GimpDashboardClass;
+
+struct _GimpDashboard
+{
+  GimpEditor            parent_instance;
+
+  GimpDashboardPrivate *priv;
+};
+
+struct _GimpDashboardClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType                          gimp_dashboard_get_type                   (void) G_GNUC_CONST;
+
+GtkWidget                    * gimp_dashboard_new                        (Gimp                          *gimp,
+                                                                          GimpMenuFactory               *menu_factory);
+
+gboolean                       gimp_dashboard_log_start_recording        (GimpDashboard                 *dashboard,
+                                                                          GFile                         *file,
+                                                                          const GimpDashboardLogParams  *params,
+                                                                          GError                       **error);
+gboolean                       gimp_dashboard_log_stop_recording         (GimpDashboard                 *dashboard,
+                                                                          GError                       **error);
+gboolean                       gimp_dashboard_log_is_recording           (GimpDashboard                 *dashboard);
+const GimpDashboardLogParams * gimp_dashboard_log_get_default_params     (GimpDashboard                 *dashboard);
+void                           gimp_dashboard_log_add_marker             (GimpDashboard                 *dashboard,
+                                                                          const gchar                   *description);
+
+void                           gimp_dashboard_reset                      (GimpDashboard                 *dashboard);
+
+void                           gimp_dashboard_set_update_interval        (GimpDashboard                 *dashboard,
+                                                                          GimpDashboardUpdateInteval     update_interval);
+GimpDashboardUpdateInteval     gimp_dashboard_get_update_interval        (GimpDashboard                 *dashboard);
+
+void                           gimp_dashboard_set_history_duration       (GimpDashboard                 *dashboard,
+                                                                          GimpDashboardHistoryDuration   history_duration);
+GimpDashboardHistoryDuration   gimp_dashboard_get_history_duration       (GimpDashboard                 *dashboard);
+
+void                           gimp_dashboard_set_low_swap_space_warning (GimpDashboard                 *dashboard,
+                                                                          gboolean                       low_swap_space_warning);
+gboolean                       gimp_dashboard_get_low_swap_space_warning (GimpDashboard                 *dashboard);
+
+void                           gimp_dashboard_menu_setup                 (GimpUIManager                 *manager,
+                                                                          const gchar                   *ui_path);
+
+
+#endif  /*  __GIMP_DASHBOARD_H__  */
diff --git a/app/widgets/gimpdasheditor.c b/app/widgets/gimpdasheditor.c
new file mode 100644
index 0000000..c320929
--- /dev/null
+++ b/app/widgets/gimpdasheditor.c
@@ -0,0 +1,513 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdasheditor.c
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpdashpattern.h"
+#include "core/gimpstrokeoptions.h"
+
+#include "gimpdasheditor.h"
+
+
+#define MIN_WIDTH          64
+#define MIN_HEIGHT         20
+
+#define DEFAULT_N_SEGMENTS 24
+
+
+enum
+{
+  PROP_0,
+  PROP_STROKE_OPTIONS,
+  PROP_N_SEGMENTS,
+  PROP_LENGTH
+};
+
+
+static void gimp_dash_editor_finalize           (GObject        *object);
+static void gimp_dash_editor_set_property       (GObject        *object,
+                                                 guint           property_id,
+                                                 const GValue   *value,
+                                                 GParamSpec     *pspec);
+static void gimp_dash_editor_get_property       (GObject        *object,
+                                                 guint           property_id,
+                                                 GValue         *value,
+                                                 GParamSpec     *pspec);
+
+static void gimp_dash_editor_size_request       (GtkWidget      *widget,
+                                                 GtkRequisition *requisition);
+static gboolean gimp_dash_editor_expose         (GtkWidget      *widget,
+                                                 GdkEventExpose *event);
+static gboolean gimp_dash_editor_button_press   (GtkWidget      *widget,
+                                                 GdkEventButton *bevent);
+static gboolean gimp_dash_editor_button_release (GtkWidget      *widget,
+                                                 GdkEventButton *bevent);
+static gboolean gimp_dash_editor_motion_notify  (GtkWidget      *widget,
+                                                 GdkEventMotion *bevent);
+
+/* helper function */
+static void update_segments_from_options        (GimpDashEditor *editor);
+static void update_options_from_segments        (GimpDashEditor *editor);
+static void update_blocksize                    (GimpDashEditor *editor);
+static gint dash_x_to_index                     (GimpDashEditor *editor,
+                                                 gint            x);
+
+
+G_DEFINE_TYPE (GimpDashEditor, gimp_dash_editor, GTK_TYPE_DRAWING_AREA)
+
+#define parent_class gimp_dash_editor_parent_class
+
+
+static void
+gimp_dash_editor_class_init (GimpDashEditorClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->finalize     = gimp_dash_editor_finalize;
+  object_class->get_property = gimp_dash_editor_get_property;
+  object_class->set_property = gimp_dash_editor_set_property;
+
+  widget_class->size_request         = gimp_dash_editor_size_request;
+  widget_class->expose_event         = gimp_dash_editor_expose;
+  widget_class->button_press_event   = gimp_dash_editor_button_press;
+  widget_class->button_release_event = gimp_dash_editor_button_release;
+  widget_class->motion_notify_event  = gimp_dash_editor_motion_notify;
+
+  g_object_class_install_property (object_class, PROP_STROKE_OPTIONS,
+                                   g_param_spec_object ("stroke-options",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_STROKE_OPTIONS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_N_SEGMENTS,
+                                   g_param_spec_int ("n-segments",
+                                                     NULL, NULL,
+                                                     2, 120, DEFAULT_N_SEGMENTS,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_LENGTH,
+                                   g_param_spec_double ("dash-length",
+                                                        NULL, NULL,
+                                                        0.0, 2000.0,
+                                                        0.5 * DEFAULT_N_SEGMENTS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_dash_editor_init (GimpDashEditor *editor)
+{
+  editor->segments       = NULL;
+  editor->block_width    = 6;
+  editor->block_height   = 6;
+  editor->edit_mode      = TRUE;
+  editor->edit_button_x0 = 0;
+
+  gtk_widget_add_events (GTK_WIDGET (editor),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_BUTTON1_MOTION_MASK);
+}
+
+static void
+gimp_dash_editor_finalize (GObject *object)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (object);
+
+  g_clear_object (&editor->stroke_options);
+  g_clear_pointer (&editor->segments, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dash_editor_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_STROKE_OPTIONS:
+      g_return_if_fail (editor->stroke_options == NULL);
+
+      editor->stroke_options = g_value_dup_object (value);
+      g_signal_connect_object (editor->stroke_options, "notify::dash-info",
+                               G_CALLBACK (update_segments_from_options),
+                               editor, G_CONNECT_SWAPPED);
+      break;
+
+    case PROP_N_SEGMENTS:
+      editor->n_segments = g_value_get_int (value);
+
+      if (editor->segments)
+        g_free (editor->segments);
+      editor->segments = g_new0 (gboolean, editor->n_segments);
+      break;
+
+    case PROP_LENGTH:
+      editor->dash_length = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+
+  update_segments_from_options (editor);
+}
+
+static void
+gimp_dash_editor_get_property (GObject      *object,
+                               guint         property_id,
+                               GValue       *value,
+                               GParamSpec   *pspec)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_STROKE_OPTIONS:
+      g_value_set_object (value, editor->stroke_options);
+      break;
+    case PROP_N_SEGMENTS:
+      g_value_set_int (value, editor->n_segments);
+      break;
+    case PROP_LENGTH:
+      g_value_set_double (value, editor->dash_length);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dash_editor_size_request (GtkWidget      *widget,
+                               GtkRequisition *requisition)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (widget);
+
+  requisition->width  = MAX (editor->block_width * editor->n_segments + 20,
+                             MIN_WIDTH);
+  requisition->height = MAX (editor->block_height + 10, MIN_HEIGHT);
+}
+
+static gboolean
+gimp_dash_editor_expose (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (widget);
+  GtkStyle       *style  = gtk_widget_get_style (widget);
+  cairo_t        *cr     = gdk_cairo_create (gtk_widget_get_window (widget));
+  GtkAllocation   allocation;
+  gint            x;
+  gint            w, h;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  update_blocksize (editor);
+
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_clip (cr);
+
+  /*  draw the background  */
+
+  gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
+  cairo_paint (cr);
+
+  w = editor->block_width;
+  h = editor->block_height;
+
+  editor->x0 = (allocation.width - w * editor->n_segments) / 2;
+  editor->y0 = (allocation.height - h) / 2;
+
+  /*  draw the dash segments  */
+
+  x = editor->x0 % w;
+
+  if (x > 0)
+    x -= w;
+
+  for (; x < editor->x0; x += w)
+    {
+      gint index = dash_x_to_index (editor, x);
+
+      if (editor->segments[index])
+        cairo_rectangle (cr, x, editor->y0, w, h);
+    }
+
+  gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]);
+  cairo_fill (cr);
+
+  for (; x < editor->x0 + editor->n_segments * w; x += w)
+    {
+      gint index = dash_x_to_index (editor, x);
+
+      if (editor->segments[index])
+        cairo_rectangle (cr, x, editor->y0, w, h);
+    }
+
+  gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+  cairo_fill (cr);
+
+  for (; x < allocation.width + w; x += w)
+    {
+      gint index = dash_x_to_index (editor, x);
+
+      if (editor->segments[index])
+        cairo_rectangle (cr, x, editor->y0, w, h);
+    }
+
+  gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]);
+  cairo_fill (cr);
+
+  /*  draw rulers  */
+
+  x = editor->x0 % w;
+
+  if (x > 0)
+    x -= w;
+
+  for (; x < allocation.width + w; x += w)
+    {
+      gint index = dash_x_to_index (editor, x);
+
+      if (editor->n_segments % 4 == 0 &&
+          (index + 1) % (editor->n_segments / 4) == 0)
+        {
+          cairo_move_to (cr, x + w - 0.5, editor->y0 - 2);
+          cairo_line_to (cr, x + w - 0.5, editor->y0 + h + 2);
+        }
+      else if (index % 2 == 1)
+        {
+          cairo_move_to (cr, x + w - 0.5, editor->y0 + 1);
+          cairo_line_to (cr, x + w - 0.5, editor->y0 + h - 1);
+        }
+      else
+        {
+          cairo_move_to (cr, x + w - 0.5, editor->y0 + h / 2 - 1);
+          cairo_line_to (cr, x + w - 0.5, editor->y0 + h / 2 + 1);
+        }
+    }
+
+  cairo_move_to (cr, editor->x0 - 0.5, editor->y0 - 1);
+  cairo_move_to (cr, editor->x0 - 0.5, editor->y0 + h);
+
+  gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]);
+  cairo_set_line_width (cr, 1.0);
+  cairo_stroke (cr);
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_dash_editor_button_press (GtkWidget      *widget,
+                               GdkEventButton *bevent)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (widget);
+  gint            index;
+
+  if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS)
+    {
+      gtk_grab_add (widget);
+
+      index = dash_x_to_index (editor, bevent->x);
+
+      editor->edit_mode = ! editor->segments [index];
+      editor->edit_button_x0 = bevent->x;
+
+      editor->segments [index] = editor->edit_mode;
+
+      gtk_widget_queue_draw (widget);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_dash_editor_button_release (GtkWidget      *widget,
+                                 GdkEventButton *bevent)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (widget);
+
+  if (bevent->button == 1)
+    {
+      gtk_grab_remove (widget);
+
+      update_options_from_segments (editor);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_dash_editor_motion_notify (GtkWidget      *widget,
+                                GdkEventMotion *mevent)
+{
+  GimpDashEditor *editor = GIMP_DASH_EDITOR (widget);
+  gint            x, index;
+
+  index = dash_x_to_index (editor, mevent->x);
+  editor->segments [index] = editor->edit_mode;
+
+  if (mevent->x > editor->edit_button_x0)
+    {
+      for (x = editor->edit_button_x0; x < mevent->x; x += editor->block_width)
+        {
+          index = dash_x_to_index (editor, x);
+          editor->segments[index] = editor->edit_mode;
+        }
+    }
+
+  if (mevent->x < editor->edit_button_x0)
+    {
+      for (x = editor->edit_button_x0; x > mevent->x; x -= editor->block_width)
+        {
+          index = dash_x_to_index (editor, x);
+          editor->segments[index] = editor->edit_mode;
+        }
+    }
+
+  gtk_widget_queue_draw (widget);
+
+  return TRUE;
+}
+
+GtkWidget *
+gimp_dash_editor_new (GimpStrokeOptions *stroke_options)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (stroke_options), NULL);
+
+  return g_object_new (GIMP_TYPE_DASH_EDITOR,
+                       "stroke-options", stroke_options,
+                       NULL);
+}
+
+void
+gimp_dash_editor_shift_right (GimpDashEditor *editor)
+{
+  gboolean swap;
+  gint     i;
+
+  g_return_if_fail (GIMP_IS_DASH_EDITOR (editor));
+  g_return_if_fail (editor->n_segments > 0);
+
+  swap = editor->segments[editor->n_segments - 1];
+  for (i = editor->n_segments - 1; i > 0; i--)
+    editor->segments[i] = editor->segments[i-1];
+  editor->segments[0] = swap;
+
+  update_options_from_segments (editor);
+}
+
+void
+gimp_dash_editor_shift_left (GimpDashEditor *editor)
+{
+  gboolean swap;
+  gint     i;
+
+  g_return_if_fail (GIMP_IS_DASH_EDITOR (editor));
+  g_return_if_fail (editor->n_segments > 0);
+
+  swap = editor->segments[0];
+  for (i = 1; i < editor->n_segments; i++)
+    editor->segments[i-1] = editor->segments[i];
+  editor->segments[editor->n_segments - 1] = swap;
+
+  update_options_from_segments (editor);
+}
+
+static void
+update_segments_from_options (GimpDashEditor *editor)
+{
+  GArray *dash_info;
+
+  if (editor->stroke_options == NULL || editor->segments == NULL)
+    return;
+
+  g_return_if_fail (GIMP_IS_STROKE_OPTIONS (editor->stroke_options));
+
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+
+  dash_info = gimp_stroke_options_get_dash_info (editor->stroke_options);
+
+  gimp_dash_pattern_fill_segments (dash_info,
+                                   editor->segments, editor->n_segments);
+}
+
+static void
+update_options_from_segments (GimpDashEditor *editor)
+{
+  GArray *pattern = gimp_dash_pattern_new_from_segments (editor->segments,
+                                                         editor->n_segments,
+                                                         editor->dash_length);
+
+  gimp_stroke_options_take_dash_pattern (editor->stroke_options,
+                                         GIMP_DASH_CUSTOM, pattern);
+}
+
+static void
+update_blocksize (GimpDashEditor *editor)
+{
+  GtkWidget     *widget = GTK_WIDGET (editor);
+  GtkAllocation  allocation;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  editor->block_height = 6;
+
+  editor->block_width = MAX (ROUND (editor->dash_length /
+                                    editor->n_segments * editor->block_height),
+                             4);
+  editor->block_height = MIN (ROUND (((float) editor->block_width) *
+                                     editor->n_segments / editor->dash_length),
+                              allocation.height - 4);
+}
+
+static gint
+dash_x_to_index (GimpDashEditor *editor,
+                 gint            x)
+{
+  gint index = x - editor->x0;
+
+  while (index < 0)
+    index += editor->n_segments * editor->block_width;
+
+  index = (index / editor->block_width) % editor->n_segments;
+
+  return index;
+}
diff --git a/app/widgets/gimpdasheditor.h b/app/widgets/gimpdasheditor.h
new file mode 100644
index 0000000..cfc346f
--- /dev/null
+++ b/app/widgets/gimpdasheditor.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdasheditor.h
+ * Copyright (C) 2003 Simon Budig  <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DASH_EDITOR_H__
+#define __GIMP_DASH_EDITOR_H__
+
+
+#define GIMP_TYPE_DASH_EDITOR            (gimp_dash_editor_get_type ())
+#define GIMP_DASH_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DASH_EDITOR, GimpDashEditor))
+#define GIMP_DASH_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DASH_EDITOR, GimpDashEditorClass))
+#define GIMP_IS_DASH_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DASH_EDITOR))
+#define GIMP_IS_DASH_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DASH_EDITOR))
+#define GIMP_DASH_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DASH_EDITOR, GimpDashEditorClass))
+
+
+typedef struct _GimpDashEditorClass  GimpDashEditorClass;
+
+struct _GimpDashEditor
+{
+  GtkDrawingArea     parent_instance;
+
+  GimpStrokeOptions *stroke_options;
+  gdouble            dash_length;
+
+  /* GUI stuff */
+  gint               n_segments;
+  gboolean          *segments;
+
+  /* coordinates of the first block main dash pattern */
+  gint               x0;
+  gint               y0;
+  gint               block_width;
+  gint               block_height;
+
+  gboolean           edit_mode;
+  gint               edit_button_x0;
+};
+
+struct _GimpDashEditorClass
+{
+  GtkDrawingAreaClass  parent_class;
+};
+
+
+GType       gimp_dash_editor_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_dash_editor_new         (GimpStrokeOptions *stroke_options);
+
+void        gimp_dash_editor_shift_left  (GimpDashEditor    *editor);
+void        gimp_dash_editor_shift_right (GimpDashEditor    *editor);
+
+
+#endif /* __GIMP_DASH_EDITOR_H__ */
diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c
new file mode 100644
index 0000000..833be37
--- /dev/null
+++ b/app/widgets/gimpdataeditor.c
@@ -0,0 +1,619 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdataeditor.c
+ * Copyright (C) 2002-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+#include "core/gimpdatafactory.h"
+
+#include "gimpdataeditor.h"
+#include "gimpdocked.h"
+#include "gimpmenufactory.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_MINIMAL_HEIGHT 96
+
+
+enum
+{
+  PROP_0,
+  PROP_DATA_FACTORY,
+  PROP_CONTEXT,
+  PROP_DATA
+};
+
+
+static void       gimp_data_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void       gimp_data_editor_constructed       (GObject        *object);
+static void       gimp_data_editor_dispose           (GObject        *object);
+static void       gimp_data_editor_set_property      (GObject        *object,
+                                                      guint           property_id,
+                                                      const GValue   *value,
+                                                      GParamSpec     *pspec);
+static void       gimp_data_editor_get_property      (GObject        *object,
+                                                      guint           property_id,
+                                                      GValue         *value,
+                                                      GParamSpec     *pspec);
+
+static void       gimp_data_editor_style_set         (GtkWidget      *widget,
+                                                      GtkStyle       *prev_style);
+
+static void       gimp_data_editor_set_context       (GimpDocked     *docked,
+                                                      GimpContext    *context);
+static void       gimp_data_editor_set_aux_info      (GimpDocked     *docked,
+                                                      GList          *aux_info);
+static GList    * gimp_data_editor_get_aux_info      (GimpDocked     *docked);
+static gchar    * gimp_data_editor_get_title         (GimpDocked     *docked);
+
+static void       gimp_data_editor_real_set_data     (GimpDataEditor *editor,
+                                                      GimpData       *data);
+
+static void       gimp_data_editor_data_changed      (GimpContext    *context,
+                                                      GimpData       *data,
+                                                      GimpDataEditor *editor);
+static gboolean   gimp_data_editor_name_key_press    (GtkWidget      *widget,
+                                                      GdkEventKey    *kevent,
+                                                      GimpDataEditor *editor);
+static void       gimp_data_editor_name_activate     (GtkWidget      *widget,
+                                                      GimpDataEditor *editor);
+static gboolean   gimp_data_editor_name_focus_out    (GtkWidget      *widget,
+                                                      GdkEvent       *event,
+                                                      GimpDataEditor *editor);
+
+static void       gimp_data_editor_data_name_changed (GimpObject     *object,
+                                                      GimpDataEditor *editor);
+
+static void       gimp_data_editor_save_dirty        (GimpDataEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDataEditor, gimp_data_editor, GIMP_TYPE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_data_editor_docked_iface_init))
+
+#define parent_class gimp_data_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_data_editor_class_init (GimpDataEditorClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed  = gimp_data_editor_constructed;
+  object_class->dispose      = gimp_data_editor_dispose;
+  object_class->set_property = gimp_data_editor_set_property;
+  object_class->get_property = gimp_data_editor_get_property;
+
+  widget_class->style_set    = gimp_data_editor_style_set;
+
+  klass->set_data            = gimp_data_editor_real_set_data;
+
+  g_object_class_install_property (object_class, PROP_DATA_FACTORY,
+                                   g_param_spec_object ("data-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DATA_FACTORY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DATA,
+                                   g_param_spec_object ("data",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DATA,
+                                                        GIMP_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("minimal-height",
+                                                             NULL, NULL,
+                                                             32,
+                                                             G_MAXINT,
+                                                             DEFAULT_MINIMAL_HEIGHT,
+                                                             GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_data_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context  = gimp_data_editor_set_context;
+  iface->set_aux_info = gimp_data_editor_set_aux_info;
+  iface->get_aux_info = gimp_data_editor_get_aux_info;
+  iface->get_title    = gimp_data_editor_get_title;
+}
+
+static void
+gimp_data_editor_init (GimpDataEditor *editor)
+{
+  editor->data_factory  = NULL;
+  editor->context       = NULL;
+  editor->data          = NULL;
+  editor->data_editable = FALSE;
+
+  editor->name_entry = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (editor), editor->name_entry, FALSE, FALSE, 0);
+  gtk_widget_show (editor->name_entry);
+
+  gtk_editable_set_editable (GTK_EDITABLE (editor->name_entry), FALSE);
+
+  g_signal_connect (editor->name_entry, "key-press-event",
+                    G_CALLBACK (gimp_data_editor_name_key_press),
+                    editor);
+  g_signal_connect (editor->name_entry, "activate",
+                    G_CALLBACK (gimp_data_editor_name_activate),
+                    editor);
+  g_signal_connect (editor->name_entry, "focus-out-event",
+                    G_CALLBACK (gimp_data_editor_name_focus_out),
+                    editor);
+}
+
+static void
+gimp_data_editor_constructed (GObject *object)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_DATA_FACTORY (editor->data_factory));
+  gimp_assert (GIMP_IS_CONTEXT (editor->context));
+
+  gimp_data_editor_set_edit_active (editor, TRUE);
+}
+
+static void
+gimp_data_editor_dispose (GObject *object)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (object);
+
+  if (editor->data)
+    {
+      /* Save dirty data before we clear out */
+      gimp_data_editor_save_dirty (editor);
+      gimp_data_editor_set_data (editor, NULL);
+    }
+
+  if (editor->context)
+    gimp_docked_set_context (GIMP_DOCKED (editor), NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_data_editor_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_DATA_FACTORY:
+      editor->data_factory = g_value_get_object (value);
+      break;
+    case PROP_CONTEXT:
+      gimp_docked_set_context (GIMP_DOCKED (object),
+                               g_value_get_object (value));
+      break;
+    case PROP_DATA:
+      gimp_data_editor_set_data (editor, g_value_get_object (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_editor_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_DATA_FACTORY:
+      g_value_set_object (value, editor->data_factory);
+      break;
+    case PROP_CONTEXT:
+      g_value_set_object (value, editor->context);
+      break;
+    case PROP_DATA:
+      g_value_set_object (value, editor->data);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_editor_style_set (GtkWidget *widget,
+                            GtkStyle  *prev_style)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (widget);
+  gint            minimal_height;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget,
+                        "minimal-height", &minimal_height,
+                        NULL);
+
+  if (editor->view)
+    gtk_widget_set_size_request (editor->view, -1, minimal_height);
+}
+
+static void
+gimp_data_editor_set_context (GimpDocked  *docked,
+                              GimpContext *context)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (docked);
+
+  if (context == editor->context)
+    return;
+
+  if (parent_docked_iface->set_context)
+    parent_docked_iface->set_context (docked, context);
+
+  if (editor->context)
+    {
+      g_signal_handlers_disconnect_by_func (editor->context,
+                                            gimp_data_editor_data_changed,
+                                            editor);
+
+      g_object_unref (editor->context);
+    }
+
+  editor->context = context;
+
+  if (editor->context)
+    {
+      GType     data_type;
+      GimpData *data;
+
+      g_object_ref (editor->context);
+
+      data_type = gimp_data_factory_get_data_type (editor->data_factory);
+      data = GIMP_DATA (gimp_context_get_by_type (editor->context, data_type));
+
+      g_signal_connect (editor->context,
+                        gimp_context_type_to_signal_name (data_type),
+                        G_CALLBACK (gimp_data_editor_data_changed),
+                        editor);
+
+      gimp_data_editor_data_changed (editor->context, data, editor);
+    }
+}
+
+#define AUX_INFO_EDIT_ACTIVE  "edit-active"
+#define AUX_INFO_CURRENT_DATA "current-data"
+
+static void
+gimp_data_editor_set_aux_info (GimpDocked *docked,
+                               GList      *aux_info)
+{
+  GimpDataEditor *editor = GIMP_DATA_EDITOR (docked);
+  GList          *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (! strcmp (aux->name, AUX_INFO_EDIT_ACTIVE))
+        {
+          gboolean edit_active;
+
+          edit_active = ! g_ascii_strcasecmp (aux->value, "true");
+
+          gimp_data_editor_set_edit_active (editor, edit_active);
+        }
+      else if (! strcmp (aux->name, AUX_INFO_CURRENT_DATA))
+        {
+          if (! editor->edit_active)
+            {
+              GimpData *data;
+
+              data = (GimpData *)
+                gimp_container_get_child_by_name (gimp_data_factory_get_container (editor->data_factory),
+                                                  aux->value);
+
+              if (data)
+                gimp_data_editor_set_data (editor, data);
+            }
+        }
+    }
+}
+
+static GList *
+gimp_data_editor_get_aux_info (GimpDocked *docked)
+{
+  GimpDataEditor     *editor = GIMP_DATA_EDITOR (docked);
+  GList              *aux_info;
+  GimpSessionInfoAux *aux;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  aux = gimp_session_info_aux_new (AUX_INFO_EDIT_ACTIVE,
+                                   editor->edit_active ? "true" : "false");
+  aux_info = g_list_append (aux_info, aux);
+
+  if (editor->data)
+    {
+      const gchar *value;
+
+      value = gimp_object_get_name (editor->data);
+
+      aux = gimp_session_info_aux_new (AUX_INFO_CURRENT_DATA, value);
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
+
+static gchar *
+gimp_data_editor_get_title (GimpDocked *docked)
+{
+  GimpDataEditor      *editor       = GIMP_DATA_EDITOR (docked);
+  GimpDataEditorClass *editor_class = GIMP_DATA_EDITOR_GET_CLASS (editor);
+
+  if (editor->data_editable)
+    return g_strdup (editor_class->title);
+  else
+    return g_strdup_printf (_("%s (read only)"), editor_class->title);
+}
+
+static void
+gimp_data_editor_real_set_data (GimpDataEditor *editor,
+                                GimpData       *data)
+{
+  gboolean editable;
+
+  if (editor->data)
+    {
+      gimp_data_editor_save_dirty (editor);
+
+      g_signal_handlers_disconnect_by_func (editor->data,
+                                            gimp_data_editor_data_name_changed,
+                                            editor);
+
+      g_object_unref (editor->data);
+    }
+
+  editor->data = data;
+
+  if (editor->data)
+    {
+      g_object_ref (editor->data);
+
+      g_signal_connect (editor->data, "name-changed",
+                        G_CALLBACK (gimp_data_editor_data_name_changed),
+                        editor);
+
+      gtk_entry_set_text (GTK_ENTRY (editor->name_entry),
+                          gimp_object_get_name (editor->data));
+    }
+  else
+    {
+      gtk_entry_set_text (GTK_ENTRY (editor->name_entry), "");
+    }
+
+  gtk_editable_set_editable (
+    GTK_EDITABLE (editor->name_entry),
+    editor->data &&
+    gimp_viewable_is_name_editable (GIMP_VIEWABLE (editor->data)));
+
+  editable = (editor->data && gimp_data_is_writable (editor->data));
+
+  if (editor->data_editable != editable)
+    {
+      editor->data_editable = editable;
+
+      gimp_docked_title_changed (GIMP_DOCKED (editor));
+    }
+}
+
+void
+gimp_data_editor_set_data (GimpDataEditor *editor,
+                           GimpData       *data)
+{
+  g_return_if_fail (GIMP_IS_DATA_EDITOR (editor));
+  g_return_if_fail (data == NULL || GIMP_IS_DATA (data));
+  g_return_if_fail (data == NULL ||
+                    g_type_is_a (G_TYPE_FROM_INSTANCE (data),
+                                 gimp_data_factory_get_data_type (editor->data_factory)));
+
+  if (editor->data != data)
+    {
+      GIMP_DATA_EDITOR_GET_CLASS (editor)->set_data (editor, data);
+
+      g_object_notify (G_OBJECT (editor), "data");
+
+      if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+        gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                                gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+    }
+}
+
+GimpData *
+gimp_data_editor_get_data (GimpDataEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_EDITOR (editor), NULL);
+
+  return editor->data;
+}
+
+void
+gimp_data_editor_set_edit_active (GimpDataEditor *editor,
+                                  gboolean        edit_active)
+{
+  g_return_if_fail (GIMP_IS_DATA_EDITOR (editor));
+
+  if (editor->edit_active != edit_active)
+    {
+      editor->edit_active = edit_active;
+
+      if (editor->edit_active && editor->context)
+        {
+          GType     data_type;
+          GimpData *data;
+
+          data_type = gimp_data_factory_get_data_type (editor->data_factory);
+          data = GIMP_DATA (gimp_context_get_by_type (editor->context,
+                                                      data_type));
+
+          gimp_data_editor_set_data (editor, data);
+        }
+    }
+}
+
+gboolean
+gimp_data_editor_get_edit_active (GimpDataEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_EDITOR (editor), FALSE);
+
+  return editor->edit_active;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_data_editor_data_changed (GimpContext    *context,
+                               GimpData       *data,
+                               GimpDataEditor *editor)
+{
+  if (editor->edit_active)
+    gimp_data_editor_set_data (editor, data);
+}
+
+static gboolean
+gimp_data_editor_name_key_press (GtkWidget      *widget,
+                                 GdkEventKey    *kevent,
+                                 GimpDataEditor *editor)
+{
+  if (kevent->keyval == GDK_KEY_Escape)
+    {
+      gtk_entry_set_text (GTK_ENTRY (editor->name_entry),
+                          gimp_object_get_name (editor->data));
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_data_editor_name_activate (GtkWidget      *widget,
+                                GimpDataEditor *editor)
+{
+  if (editor->data)
+    {
+      gchar *new_name;
+
+      new_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
+      new_name = g_strstrip (new_name);
+
+      if (strlen (new_name) &&
+          g_strcmp0 (new_name, gimp_object_get_name (editor->data)))
+        {
+          gimp_object_take_name (GIMP_OBJECT (editor->data), new_name);
+        }
+      else
+        {
+          gtk_entry_set_text (GTK_ENTRY (widget),
+                              gimp_object_get_name (editor->data));
+          g_free (new_name);
+        }
+    }
+}
+
+static gboolean
+gimp_data_editor_name_focus_out (GtkWidget      *widget,
+                                 GdkEvent       *event,
+                                 GimpDataEditor *editor)
+{
+  gimp_data_editor_name_activate (widget, editor);
+
+  return FALSE;
+}
+
+static void
+gimp_data_editor_data_name_changed (GimpObject     *object,
+                                    GimpDataEditor *editor)
+{
+  gtk_entry_set_text (GTK_ENTRY (editor->name_entry),
+                      gimp_object_get_name (object));
+}
+
+static void
+gimp_data_editor_save_dirty (GimpDataEditor *editor)
+{
+  GimpData *data = editor->data;
+
+  if (data                      &&
+      gimp_data_is_dirty (data) &&
+      gimp_data_is_writable (data))
+    {
+      GError *error = NULL;
+
+      if (! gimp_data_factory_data_save_single (editor->data_factory, data,
+                                                &error))
+        {
+          gimp_message_literal (gimp_data_factory_get_gimp (editor->data_factory),
+                                G_OBJECT (editor),
+                                GIMP_MESSAGE_ERROR,
+                                error->message);
+          g_clear_error (&error);
+        }
+    }
+}
diff --git a/app/widgets/gimpdataeditor.h b/app/widgets/gimpdataeditor.h
new file mode 100644
index 0000000..70d77bf
--- /dev/null
+++ b/app/widgets/gimpdataeditor.h
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdataeditor.h
+ * Copyright (C) 2002-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DATA_EDITOR_H__
+#define __GIMP_DATA_EDITOR_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_DATA_EDITOR            (gimp_data_editor_get_type ())
+#define GIMP_DATA_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DATA_EDITOR, GimpDataEditor))
+#define GIMP_DATA_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DATA_EDITOR, GimpDataEditorClass))
+#define GIMP_IS_DATA_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DATA_EDITOR))
+#define GIMP_IS_DATA_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DATA_EDITOR))
+#define GIMP_DATA_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DATA_EDITOR, GimpDataEditorClass))
+
+
+typedef struct _GimpDataEditorClass GimpDataEditorClass;
+
+struct _GimpDataEditor
+{
+  GimpEditor       parent_instance;
+
+  GimpDataFactory *data_factory;
+  GimpContext     *context;
+  gboolean         edit_active;
+
+  GimpData        *data;
+  gboolean         data_editable;
+
+  GtkWidget       *name_entry;
+
+  GtkWidget       *view; /* filled by subclasses */
+};
+
+struct _GimpDataEditorClass
+{
+  GimpEditorClass  parent_class;
+
+  /*  virtual functions  */
+  void (* set_data) (GimpDataEditor *editor,
+                     GimpData       *data);
+
+  const gchar *title;
+};
+
+
+GType       gimp_data_editor_get_type        (void) G_GNUC_CONST;
+
+void        gimp_data_editor_set_data        (GimpDataEditor *editor,
+                                              GimpData       *data);
+GimpData  * gimp_data_editor_get_data        (GimpDataEditor *editor);
+
+void        gimp_data_editor_set_edit_active (GimpDataEditor *editor,
+                                              gboolean        edit_active);
+gboolean    gimp_data_editor_get_edit_active (GimpDataEditor *editor);
+
+
+#endif  /*  __GIMP_DATA_EDITOR_H__  */
diff --git a/app/widgets/gimpdatafactoryview.c b/app/widgets/gimpdatafactoryview.c
new file mode 100644
index 0000000..35c8eb1
--- /dev/null
+++ b/app/widgets/gimpdatafactoryview.c
@@ -0,0 +1,627 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdatafactoryview.c
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdata.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimplist.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptaggedcontainer.h"
+
+#include "gimpcombotagentry.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpdatafactoryview.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpmenufactory.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimptagentry.h"
+#include "gimpuimanager.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_DATA_FACTORY,
+  PROP_ACTION_GROUP
+};
+
+
+struct _GimpDataFactoryViewPrivate
+{
+  GimpDataFactory *factory;
+  gchar           *action_group;
+
+  GimpContainer   *tagged_container;
+  GtkWidget       *query_tag_entry;
+  GtkWidget       *assign_tag_entry;
+  GList           *selected_items;
+
+  GtkWidget       *edit_button;
+  GtkWidget       *new_button;
+  GtkWidget       *duplicate_button;
+  GtkWidget       *delete_button;
+  GtkWidget       *refresh_button;
+};
+
+
+static void    gimp_data_factory_view_docked_iface_init (GimpDockedInterface *iface);
+
+static GObject *
+               gimp_data_factory_view_constructor    (GType                type,
+                                                      guint                n_construct_params,
+                                                      GObjectConstructParam *construct_params);
+static void    gimp_data_factory_view_constructed    (GObject             *object);
+static void    gimp_data_factory_view_dispose        (GObject             *object);
+static void    gimp_data_factory_view_set_property   (GObject             *object,
+                                                      guint                property_id,
+                                                      const GValue        *value,
+                                                      GParamSpec          *pspec);
+static void    gimp_data_factory_view_get_property   (GObject             *object,
+                                                      guint                property_id,
+                                                      GValue              *value,
+                                                      GParamSpec          *pspec);
+
+static void    gimp_data_factory_view_set_aux_info   (GimpDocked          *docked,
+                                                      GList               *aux_info);
+static GList * gimp_data_factory_view_get_aux_info   (GimpDocked          *docked);
+
+static void    gimp_data_factory_view_activate_item  (GimpContainerEditor *editor,
+                                                      GimpViewable        *viewable);
+static void    gimp_data_factory_view_select_item    (GimpContainerEditor *editor,
+                                                      GimpViewable        *viewable);
+static void  gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
+                                                      const gchar         *path,
+                                                      const gchar         *name,
+                                                      GimpDataFactoryView *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDataFactoryView, gimp_data_factory_view,
+                         GIMP_TYPE_CONTAINER_EDITOR,
+                         G_ADD_PRIVATE (GimpDataFactoryView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_data_factory_view_docked_iface_init))
+
+#define parent_class gimp_data_factory_view_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_data_factory_view_class_init (GimpDataFactoryViewClass *klass)
+{
+  GObjectClass             *object_class = G_OBJECT_CLASS (klass);
+  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
+
+  object_class->constructor   = gimp_data_factory_view_constructor;
+  object_class->constructed   = gimp_data_factory_view_constructed;
+  object_class->dispose       = gimp_data_factory_view_dispose;
+  object_class->set_property  = gimp_data_factory_view_set_property;
+  object_class->get_property  = gimp_data_factory_view_get_property;
+
+  editor_class->select_item   = gimp_data_factory_view_select_item;
+  editor_class->activate_item = gimp_data_factory_view_activate_item;
+
+  g_object_class_install_property (object_class, PROP_DATA_FACTORY,
+                                   g_param_spec_object ("data-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DATA_FACTORY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ACTION_GROUP,
+                                   g_param_spec_string ("action-group",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_data_factory_view_init (GimpDataFactoryView *view)
+{
+  view->priv = gimp_data_factory_view_get_instance_private (view);
+
+  view->priv->tagged_container = NULL;
+  view->priv->query_tag_entry  = NULL;
+  view->priv->assign_tag_entry = NULL;
+  view->priv->selected_items   = NULL;
+  view->priv->edit_button      = NULL;
+  view->priv->new_button       = NULL;
+  view->priv->duplicate_button = NULL;
+  view->priv->delete_button    = NULL;
+  view->priv->refresh_button   = NULL;
+}
+
+static void
+gimp_data_factory_view_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_aux_info = gimp_data_factory_view_set_aux_info;
+  iface->get_aux_info = gimp_data_factory_view_get_aux_info;
+}
+
+static GObject *
+gimp_data_factory_view_constructor (GType                  type,
+                                    guint                  n_construct_params,
+                                    GObjectConstructParam *construct_params)
+{
+  GimpDataFactoryView *factory_view;
+  GObject             *object;
+
+  object = G_OBJECT_CLASS (parent_class)->constructor (type,
+                                                       n_construct_params,
+                                                       construct_params);
+
+  factory_view = GIMP_DATA_FACTORY_VIEW (object);
+
+  gimp_assert (GIMP_IS_DATA_FACTORY (factory_view->priv->factory));
+  gimp_assert (factory_view->priv->action_group != NULL);
+
+  factory_view->priv->tagged_container =
+    gimp_tagged_container_new (gimp_data_factory_get_container (factory_view->priv->factory));
+
+  /* this must happen in constructor(), because doing it in
+   * set_property() warns about wrong construct property usage
+   */
+  g_object_set (object,
+                "container", factory_view->priv->tagged_container,
+                NULL);
+
+  return object;
+}
+
+static void
+gimp_data_factory_view_constructed (GObject *object)
+{
+  GimpDataFactoryView        *factory_view = GIMP_DATA_FACTORY_VIEW (object);
+  GimpDataFactoryViewPrivate *priv         = factory_view->priv;
+  GimpContainerEditor        *editor       = GIMP_CONTAINER_EDITOR (object);
+  GimpUIManager              *manager;
+  gchar                      *str;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_container_editor_set_selection_mode (editor, GTK_SELECTION_MULTIPLE);
+
+  if (GIMP_IS_CONTAINER_TREE_VIEW (editor->view))
+    {
+      GimpContainerTreeView *tree_view;
+
+      tree_view = GIMP_CONTAINER_TREE_VIEW (editor->view);
+
+      gimp_container_tree_view_connect_name_edited (tree_view,
+                                                    G_CALLBACK (gimp_data_factory_view_tree_name_edited),
+                                                    factory_view);
+    }
+
+  manager = gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view));
+
+  str = g_strdup_printf ("%s-edit", priv->action_group);
+  if (gimp_ui_manager_find_action (manager, priv->action_group, str))
+    priv->edit_button =
+      gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                     priv->action_group,
+                                     str, NULL);
+  g_free (str);
+
+  if (gimp_data_factory_view_has_data_new_func (factory_view))
+    {
+      str = g_strdup_printf ("%s-new", priv->action_group);
+      priv->new_button =
+        gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                       priv->action_group,
+                                       str, NULL);
+      g_free (str);
+    }
+
+  str = g_strdup_printf ("%s-duplicate", priv->action_group);
+  if (gimp_ui_manager_find_action (manager, priv->action_group, str))
+    priv->duplicate_button =
+      gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                     priv->action_group,
+                                     str, NULL);
+  g_free (str);
+
+  str = g_strdup_printf ("%s-delete", priv->action_group);
+  if (gimp_ui_manager_find_action (manager, priv->action_group, str))
+    priv->delete_button =
+      gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                     priv->action_group,
+                                     str, NULL);
+  g_free (str);
+
+  str = g_strdup_printf ("%s-refresh", priv->action_group);
+  if (gimp_ui_manager_find_action (manager, priv->action_group, str))
+    priv->refresh_button =
+      gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                     priv->action_group,
+                                     str, NULL);
+  g_free (str);
+
+  /* Query tag entry */
+  priv->query_tag_entry =
+    gimp_combo_tag_entry_new (GIMP_TAGGED_CONTAINER (priv->tagged_container),
+                              GIMP_TAG_ENTRY_MODE_QUERY);
+  gtk_box_pack_start (GTK_BOX (editor->view),
+                      priv->query_tag_entry,
+                      FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (editor->view),
+                         priv->query_tag_entry, 0);
+  gtk_widget_show (priv->query_tag_entry);
+
+  /* Assign tag entry */
+  priv->assign_tag_entry =
+    gimp_combo_tag_entry_new (GIMP_TAGGED_CONTAINER (priv->tagged_container),
+                              GIMP_TAG_ENTRY_MODE_ASSIGN);
+  gimp_tag_entry_set_selected_items (GIMP_TAG_ENTRY (priv->assign_tag_entry),
+                                     priv->selected_items);
+  g_list_free (priv->selected_items);
+  priv->selected_items = NULL;
+  gtk_box_pack_start (GTK_BOX (editor->view),
+                      priv->assign_tag_entry,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (priv->assign_tag_entry);
+
+  if (priv->edit_button)
+    gimp_container_view_enable_dnd (editor->view,
+                                    GTK_BUTTON (priv->edit_button),
+                                    gimp_data_factory_get_data_type (priv->factory));
+
+  if (priv->duplicate_button)
+    gimp_container_view_enable_dnd (editor->view,
+                                    GTK_BUTTON (priv->duplicate_button),
+                                    gimp_data_factory_get_data_type (priv->factory));
+
+  if (priv->delete_button)
+    gimp_container_view_enable_dnd (editor->view,
+                                    GTK_BUTTON (priv->delete_button),
+                                    gimp_data_factory_get_data_type (priv->factory));
+
+  gimp_ui_manager_update (manager, editor);
+}
+
+static void
+gimp_data_factory_view_dispose (GObject *object)
+{
+  GimpDataFactoryView *factory_view = GIMP_DATA_FACTORY_VIEW (object);
+
+  g_clear_object (&factory_view->priv->tagged_container);
+  g_clear_object (&factory_view->priv->factory);
+
+  g_clear_pointer (&factory_view->priv->action_group, g_free);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_data_factory_view_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpDataFactoryView *factory_view = GIMP_DATA_FACTORY_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_DATA_FACTORY:
+      factory_view->priv->factory = g_value_dup_object (value);
+      break;
+
+    case PROP_ACTION_GROUP:
+      factory_view->priv->action_group = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_data_factory_view_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpDataFactoryView *factory_view = GIMP_DATA_FACTORY_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_DATA_FACTORY:
+      g_value_set_object (value, factory_view->priv->factory);
+      break;
+
+    case PROP_ACTION_GROUP:
+      g_value_set_string (value, factory_view->priv->action_group);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+#define AUX_INFO_TAG_FILTER "tag-filter"
+
+static void
+gimp_data_factory_view_set_aux_info (GimpDocked *docked,
+                                     GList      *aux_info)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (docked);
+  GList               *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (! strcmp (aux->name, AUX_INFO_TAG_FILTER))
+        {
+          gtk_entry_set_text (GTK_ENTRY (view->priv->query_tag_entry),
+                              aux->value);
+        }
+    }
+}
+
+static GList *
+gimp_data_factory_view_get_aux_info (GimpDocked *docked)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (docked);
+  GList               *aux_info;
+  const gchar         *tag_filter;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  tag_filter = gtk_entry_get_text (GTK_ENTRY (view->priv->query_tag_entry));
+  if (tag_filter && *tag_filter)
+    {
+      GimpSessionInfoAux *aux;
+
+      aux = gimp_session_info_aux_new (AUX_INFO_TAG_FILTER, tag_filter);
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
+
+GtkWidget *
+gimp_data_factory_view_new (GimpViewType      view_type,
+                            GimpDataFactory  *factory,
+                            GimpContext      *context,
+                            gint              view_size,
+                            gint              view_border_width,
+                            GimpMenuFactory  *menu_factory,
+                            const gchar      *menu_identifier,
+                            const gchar      *ui_path,
+                            const gchar      *action_group)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (action_group != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_DATA_FACTORY_VIEW,
+                       "view-type",         view_type,
+                       "data-factory",      factory,
+                       "context",           context,
+                       "view-size",         view_size,
+                       "view-border-width", view_border_width,
+                       "menu-factory",      menu_factory,
+                       "menu-identifier",   menu_identifier,
+                       "ui-path",           ui_path,
+                       "action-group",      action_group,
+                       NULL);
+}
+
+GtkWidget *
+gimp_data_factory_view_get_edit_button (GimpDataFactoryView *factory_view)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), NULL);
+
+  return factory_view->priv->edit_button;
+}
+
+GtkWidget *
+gimp_data_factory_view_get_duplicate_button (GimpDataFactoryView *factory_view)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), NULL);
+
+  return factory_view->priv->duplicate_button;
+}
+
+GimpDataFactory *
+gimp_data_factory_view_get_data_factory (GimpDataFactoryView *factory_view)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), NULL);
+
+  return factory_view->priv->factory;
+}
+
+GType
+gimp_data_factory_view_get_children_type (GimpDataFactoryView *factory_view)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), G_TYPE_NONE);
+
+  return gimp_data_factory_get_data_type (factory_view->priv->factory);
+}
+
+gboolean
+gimp_data_factory_view_has_data_new_func (GimpDataFactoryView *factory_view)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), FALSE);
+
+  return gimp_data_factory_has_data_new_func (factory_view->priv->factory);
+}
+
+gboolean
+gimp_data_factory_view_have (GimpDataFactoryView *factory_view,
+                             GimpObject          *object)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), FALSE);
+
+  return gimp_container_have (gimp_data_factory_get_container (factory_view->priv->factory),
+                              object);
+}
+
+static void
+gimp_data_factory_view_select_item (GimpContainerEditor *editor,
+                                    GimpViewable        *viewable)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (editor);
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item (editor, viewable);
+
+  if (view->priv->assign_tag_entry)
+    {
+      GimpContainerView *container_view = GIMP_CONTAINER_VIEW (editor->view);
+      GList             *active_items   = NULL;
+
+      gimp_container_view_get_selected (container_view, &active_items);
+      gimp_tag_entry_set_selected_items (GIMP_TAG_ENTRY (view->priv->assign_tag_entry),
+                                         active_items);
+      g_list_free (active_items);
+    }
+  else if (viewable)
+    {
+      view->priv->selected_items = g_list_append (view->priv->selected_items,
+                                                  viewable);
+    }
+}
+
+static void
+gimp_data_factory_view_activate_item (GimpContainerEditor *editor,
+                                      GimpViewable        *viewable)
+{
+  GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (editor);
+  GimpData            *data = GIMP_DATA (viewable);
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item (editor, viewable);
+
+  if (data && gimp_data_factory_view_have (view,
+                                           GIMP_OBJECT (data)))
+    {
+      if (view->priv->edit_button &&
+          gtk_widget_is_sensitive (view->priv->edit_button))
+        gtk_button_clicked (GTK_BUTTON (view->priv->edit_button));
+    }
+}
+
+static void
+gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
+                                         const gchar         *path_str,
+                                         const gchar         *new_name,
+                                         GimpDataFactoryView *view)
+{
+  GimpContainerTreeView *tree_view;
+  GtkTreePath           *path;
+  GtkTreeIter            iter;
+
+  tree_view = GIMP_CONTAINER_TREE_VIEW (GIMP_CONTAINER_EDITOR (view)->view);
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpData         *data;
+      gchar            *name;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      data = GIMP_DATA (renderer->viewable);
+
+      if (! new_name)
+        new_name = "";
+
+      name = g_strstrip (g_strdup (new_name));
+
+      /* We must block the edited callback at this point, because either
+       * the call to gimp_object_take_name() or gtk_tree_store_set() below
+       * will trigger a re-ordering and emission of the rows_reordered signal.
+       * This in turn will stop the editing operation and cause a call to this
+       * very callback function again. Because the order of the rows has
+       * changed by then, "path_str" will point at another item and cause the
+       * name of this item to be changed as well.
+       */
+      g_signal_handlers_block_by_func (cell,
+                                       gimp_data_factory_view_tree_name_edited,
+                                       view);
+
+      if (gimp_data_is_writable (data) &&
+          strlen (name)                &&
+          g_strcmp0 (name, gimp_object_get_name (data)))
+        {
+          gimp_object_take_name (GIMP_OBJECT (data), name);
+        }
+      else
+        {
+          g_free (name);
+
+          name = gimp_viewable_get_description (renderer->viewable, NULL);
+          gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, name,
+                              -1);
+          g_free (name);
+        }
+
+      g_signal_handlers_unblock_by_func (cell,
+                                         gimp_data_factory_view_tree_name_edited,
+                                         view);
+
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+}
diff --git a/app/widgets/gimpdatafactoryview.h b/app/widgets/gimpdatafactoryview.h
new file mode 100644
index 0000000..3470295
--- /dev/null
+++ b/app/widgets/gimpdatafactoryview.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdatafactoryview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DATA_FACTORY_VIEW_H__
+#define __GIMP_DATA_FACTORY_VIEW_H__
+
+
+#include "gimpcontainereditor.h"
+
+
+#define GIMP_TYPE_DATA_FACTORY_VIEW            (gimp_data_factory_view_get_type ())
+#define GIMP_DATA_FACTORY_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DATA_FACTORY_VIEW, GimpDataFactoryView))
+#define GIMP_DATA_FACTORY_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DATA_FACTORY_VIEW, GimpDataFactoryViewClass))
+#define GIMP_IS_DATA_FACTORY_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DATA_FACTORY_VIEW))
+#define GIMP_IS_DATA_FACTORY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DATA_FACTORY_VIEW))
+#define GIMP_DATA_FACTORY_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DATA_FACTORY_VIEW, GimpDataFactoryViewClass))
+
+
+typedef struct _GimpDataFactoryViewClass   GimpDataFactoryViewClass;
+typedef struct _GimpDataFactoryViewPrivate GimpDataFactoryViewPrivate;
+
+struct _GimpDataFactoryView
+{
+  GimpContainerEditor         parent_instance;
+
+  GimpDataFactoryViewPrivate *priv;
+};
+
+struct _GimpDataFactoryViewClass
+{
+  GimpContainerEditorClass  parent_class;
+};
+
+
+GType             gimp_data_factory_view_get_type             (void) G_GNUC_CONST;
+
+GtkWidget *       gimp_data_factory_view_new                  (GimpViewType      view_type,
+                                                               GimpDataFactory  *factory,
+                                                               GimpContext      *context,
+                                                               gint              view_size,
+                                                               gint              view_border_width,
+                                                               GimpMenuFactory  *menu_factory,
+                                                               const gchar      *menu_identifier,
+                                                               const gchar      *ui_path,
+                                                               const gchar      *action_group);
+
+GtkWidget       * gimp_data_factory_view_get_edit_button      (GimpDataFactoryView *factory_view);
+GtkWidget       * gimp_data_factory_view_get_duplicate_button (GimpDataFactoryView *factory_view);
+GimpDataFactory * gimp_data_factory_view_get_data_factory     (GimpDataFactoryView *factory_view);
+GType             gimp_data_factory_view_get_children_type    (GimpDataFactoryView *factory_view);
+gboolean          gimp_data_factory_view_has_data_new_func    (GimpDataFactoryView *factory_view);
+gboolean          gimp_data_factory_view_have                 (GimpDataFactoryView *factory_view,
+                                                               GimpObject          *object);
+
+
+#endif  /*  __GIMP_DATA_FACTORY_VIEW_H__  */
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
new file mode 100644
index 0000000..6b9e884
--- /dev/null
+++ b/app/widgets/gimpdeviceeditor.c
@@ -0,0 +1,550 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdeviceeditor.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpcontainerview.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainertreeview.h"
+#include "gimpdeviceeditor.h"
+#include "gimpdeviceinfo.h"
+#include "gimpdeviceinfoeditor.h"
+#include "gimpdevicemanager.h"
+#include "gimpdevices.h"
+#include "gimpmessagebox.h"
+#include "gimpmessagedialog.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+
+typedef struct _GimpDeviceEditorPrivate GimpDeviceEditorPrivate;
+
+struct _GimpDeviceEditorPrivate
+{
+  Gimp      *gimp;
+
+  GQuark     name_changed_handler;
+
+  GtkWidget *treeview;
+  GtkWidget *delete_button;
+
+  GtkWidget *label;
+  GtkWidget *image;
+
+  GtkWidget *notebook;
+};
+
+
+#define GIMP_DEVICE_EDITOR_GET_PRIVATE(editor) \
+        ((GimpDeviceEditorPrivate *) gimp_device_editor_get_instance_private ((GimpDeviceEditor *) (editor)))
+
+
+static void   gimp_device_editor_constructed    (GObject           *object);
+static void   gimp_device_editor_dispose        (GObject           *object);
+static void   gimp_device_editor_set_property   (GObject           *object,
+                                                 guint              property_id,
+                                                 const GValue      *value,
+                                                 GParamSpec        *pspec);
+static void   gimp_device_editor_get_property   (GObject           *object,
+                                                 guint              property_id,
+                                                 GValue            *value,
+                                                 GParamSpec        *pspec);
+
+static void   gimp_device_editor_add_device     (GimpContainer     *container,
+                                                 GimpDeviceInfo    *info,
+                                                 GimpDeviceEditor  *editor);
+static void   gimp_device_editor_remove_device  (GimpContainer     *container,
+                                                 GimpDeviceInfo    *info,
+                                                 GimpDeviceEditor  *editor);
+static void   gimp_device_editor_device_changed (GimpDeviceInfo    *info,
+                                                 GimpDeviceEditor  *editor);
+
+static void   gimp_device_editor_select_device  (GimpContainerView *view,
+                                                 GimpViewable      *viewable,
+                                                 gpointer           insert_data,
+                                                 GimpDeviceEditor  *editor);
+
+static void   gimp_device_editor_switch_page    (GtkNotebook       *notebook,
+                                                 gpointer           page,
+                                                 guint              page_num,
+                                                 GimpDeviceEditor  *editor);
+static void   gimp_device_editor_delete_clicked (GtkWidget         *button,
+                                                 GimpDeviceEditor  *editor);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDeviceEditor, gimp_device_editor,
+                            GTK_TYPE_PANED)
+
+#define parent_class gimp_device_editor_parent_class
+
+
+static void
+gimp_device_editor_class_init (GimpDeviceEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_device_editor_constructed;
+  object_class->dispose      = gimp_device_editor_dispose;
+  object_class->set_property = gimp_device_editor_set_property;
+  object_class->get_property = gimp_device_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_device_editor_init (GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GtkWidget               *vbox;
+  GtkWidget               *ebox;
+  GtkWidget               *hbox;
+  gint                     icon_width;
+  gint                     icon_height;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
+  gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (editor)),
+                                     GTK_ICON_SIZE_BUTTON,
+                                     &icon_width, &icon_height);
+
+  private->treeview = gimp_container_tree_view_new (NULL, NULL, icon_height, 0);
+  gtk_widget_set_size_request (private->treeview, 300, -1);
+  gtk_paned_pack1 (GTK_PANED (editor), private->treeview, TRUE, FALSE);
+  gtk_widget_show (private->treeview);
+
+  g_signal_connect_object (private->treeview, "select-item",
+                           G_CALLBACK (gimp_device_editor_select_device),
+                           G_OBJECT (editor), 0);
+
+  private->delete_button =
+    gimp_editor_add_button (GIMP_EDITOR (private->treeview),
+                            "edit-delete",
+                            _("Delete the selected device"),
+                            NULL,
+                            G_CALLBACK (gimp_device_editor_delete_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  gtk_widget_set_sensitive (private->delete_button, FALSE);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_paned_pack2 (GTK_PANED (editor), vbox, TRUE, FALSE);
+  gtk_widget_show (vbox);
+
+  ebox = gtk_event_box_new ();
+  gtk_widget_set_state (ebox, GTK_STATE_SELECTED);
+  gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, FALSE, 0);
+  gtk_widget_show (ebox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
+  gtk_container_add (GTK_CONTAINER (ebox), hbox);
+  gtk_widget_show (hbox);
+
+  private->label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (private->label), 0.0);
+  gtk_label_set_ellipsize (GTK_LABEL (private->label), PANGO_ELLIPSIZE_END);
+  gimp_label_set_attributes (GTK_LABEL (private->label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (hbox), private->label, TRUE, TRUE, 0);
+  gtk_widget_show (private->label);
+
+  private->image = gtk_image_new ();
+  gtk_widget_set_size_request (private->image, -1, 24);
+  gtk_box_pack_end (GTK_BOX (hbox), private->image, FALSE, FALSE, 0);
+  gtk_widget_show (private->image);
+
+  private->notebook = gtk_notebook_new ();
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), private->notebook, TRUE, TRUE, 0);
+  gtk_widget_show (private->notebook);
+
+  g_signal_connect (private->notebook, "switch-page",
+                    G_CALLBACK (gimp_device_editor_switch_page),
+                    editor);
+}
+
+static void
+gimp_device_editor_constructed (GObject *object)
+{
+  GimpDeviceEditor        *editor  = GIMP_DEVICE_EDITOR (object);
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GimpContainer           *devices;
+  GimpContext             *context;
+  GList                   *list;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (private->gimp));
+
+  devices = GIMP_CONTAINER (gimp_devices_get_manager (private->gimp));
+
+  /*  connect to "remove" before the container view does so we can get
+   *  the notebook child stored in its model
+   */
+  g_signal_connect (devices, "remove",
+                    G_CALLBACK (gimp_device_editor_remove_device),
+                    editor);
+
+  gimp_container_view_set_container (GIMP_CONTAINER_VIEW (private->treeview),
+                                     devices);
+
+  context = gimp_context_new (private->gimp, "device-editor-list", NULL);
+  gimp_container_view_set_context (GIMP_CONTAINER_VIEW (private->treeview),
+                                   context);
+  g_object_unref (context);
+
+  g_signal_connect (devices, "add",
+                    G_CALLBACK (gimp_device_editor_add_device),
+                    editor);
+
+  private->name_changed_handler =
+    gimp_container_add_handler (devices, "name-changed",
+                                G_CALLBACK (gimp_device_editor_device_changed),
+                                editor);
+
+  for (list = GIMP_LIST (devices)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      gimp_device_editor_add_device (devices, list->data, editor);
+    }
+}
+
+static void
+gimp_device_editor_dispose (GObject *object)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (object);
+  GimpContainer           *devices;
+
+  devices = GIMP_CONTAINER (gimp_devices_get_manager (private->gimp));
+
+  g_signal_handlers_disconnect_by_func (devices,
+                                        gimp_device_editor_add_device,
+                                        object);
+
+  g_signal_handlers_disconnect_by_func (devices,
+                                        gimp_device_editor_remove_device,
+                                        object);
+
+  if (private->name_changed_handler)
+    {
+      gimp_container_remove_handler (devices, private->name_changed_handler);
+      private->name_changed_handler = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_device_editor_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_device_editor_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_device_editor_add_device (GimpContainer    *container,
+                               GimpDeviceInfo   *info,
+                               GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GtkWidget               *widget;
+  GtkTreeIter             *iter;
+
+  widget = gimp_device_info_editor_new (info);
+  gtk_notebook_append_page (GTK_NOTEBOOK (private->notebook), widget, NULL);
+  gtk_widget_show (widget);
+
+  iter = gimp_container_view_lookup (GIMP_CONTAINER_VIEW (private->treeview),
+                                     GIMP_VIEWABLE (info));
+
+  if (iter)
+    {
+      GimpContainerTreeView *treeview;
+
+      treeview = GIMP_CONTAINER_TREE_VIEW (private->treeview);
+
+      gtk_tree_store_set (GTK_TREE_STORE (treeview->model), iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_USER_DATA, widget,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_SENSITIVE,
+                          gimp_device_info_get_device (info, NULL) != NULL,
+                          -1);
+    }
+}
+
+static void
+gimp_device_editor_remove_device (GimpContainer    *container,
+                                  GimpDeviceInfo   *info,
+                                  GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GtkTreeIter             *iter;
+
+  iter = gimp_container_view_lookup (GIMP_CONTAINER_VIEW (private->treeview),
+                                     GIMP_VIEWABLE (info));
+
+  if (iter)
+    {
+      GimpContainerTreeView *treeview;
+      GtkWidget             *widget;
+
+      treeview = GIMP_CONTAINER_TREE_VIEW (private->treeview);
+
+      gtk_tree_model_get (treeview->model, iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_USER_DATA, &widget,
+                          -1);
+
+      if (widget)
+        gtk_widget_destroy (widget);
+    }
+}
+
+static void
+gimp_device_editor_device_changed (GimpDeviceInfo   *info,
+                                   GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GtkTreeIter             *iter;
+
+  iter = gimp_container_view_lookup (GIMP_CONTAINER_VIEW (private->treeview),
+                                     GIMP_VIEWABLE (info));
+
+  if (iter)
+    {
+      GimpContainerTreeView *treeview;
+
+      treeview = GIMP_CONTAINER_TREE_VIEW (private->treeview);
+
+      gtk_tree_store_set (GTK_TREE_STORE (treeview->model), iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_SENSITIVE,
+                          gimp_device_info_get_device (info, NULL) != NULL,
+                          -1);
+    }
+}
+
+static void
+gimp_device_editor_select_device (GimpContainerView *view,
+                                  GimpViewable      *viewable,
+                                  gpointer           insert_data,
+                                  GimpDeviceEditor  *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+
+  if (viewable && insert_data)
+    {
+      GimpContainerTreeView *treeview;
+      GtkWidget             *widget;
+
+      treeview = GIMP_CONTAINER_TREE_VIEW (private->treeview);
+
+      gtk_tree_model_get (treeview->model, insert_data,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_USER_DATA, &widget,
+                          -1);
+
+      if (widget)
+        {
+          gint page_num = gtk_notebook_page_num (GTK_NOTEBOOK (private->notebook),
+                                                 widget);
+
+          gtk_notebook_set_current_page (GTK_NOTEBOOK (private->notebook),
+                                         page_num);
+        }
+    }
+}
+
+static void
+gimp_device_editor_switch_page (GtkNotebook      *notebook,
+                                gpointer          page,
+                                guint             page_num,
+                                GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GtkWidget               *widget;
+  GimpDeviceInfo          *info;
+  gboolean                 delete_sensitive = FALSE;
+
+  widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num);
+
+  g_object_get (widget ,"info", &info, NULL);
+
+  gtk_label_set_text (GTK_LABEL (private->label),
+                      gimp_object_get_name (info));
+  gtk_image_set_from_icon_name (GTK_IMAGE (private->image),
+                                gimp_viewable_get_icon_name (GIMP_VIEWABLE (info)),
+                                GTK_ICON_SIZE_BUTTON);
+
+  if (! gimp_device_info_get_device (info, NULL))
+    delete_sensitive = TRUE;
+
+  gtk_widget_set_sensitive (private->delete_button, delete_sensitive);
+
+  g_object_unref (info);
+}
+
+static void
+gimp_device_editor_delete_response (GtkWidget        *dialog,
+                                    gint              response_id,
+                                    GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+
+  gtk_widget_destroy (dialog);
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GList *selected;
+
+      if (gimp_container_view_get_selected (GIMP_CONTAINER_VIEW (private->treeview),
+                                            &selected))
+        {
+          GimpContainer *devices;
+
+          devices = GIMP_CONTAINER (gimp_devices_get_manager (private->gimp));
+
+          gimp_container_remove (devices, selected->data);
+
+          g_list_free (selected);
+        }
+    }
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+}
+
+static void
+gimp_device_editor_delete_clicked (GtkWidget        *button,
+                                   GimpDeviceEditor *editor)
+{
+  GimpDeviceEditorPrivate *private = GIMP_DEVICE_EDITOR_GET_PRIVATE (editor);
+  GtkWidget               *dialog;
+  GList                   *selected;
+
+  if (! gimp_container_view_get_selected (GIMP_CONTAINER_VIEW (private->treeview),
+                                          &selected))
+    return;
+
+  dialog = gimp_message_dialog_new (_("Delete Device Settings"),
+                                    GIMP_ICON_DIALOG_QUESTION,
+                                    gtk_widget_get_toplevel (GTK_WIDGET (editor)),
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    _("_Delete"), GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gimp_device_editor_delete_response),
+                    editor);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("Delete \"%s\"?"),
+                                     gimp_object_get_name (selected->data));
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("You are about to delete this device's "
+                               "stored settings.\n"
+                               "The next time this device is plugged, "
+                               "default settings will be used."));
+
+  g_list_free (selected);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+
+  gtk_widget_show (dialog);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_device_editor_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_DEVICE_EDITOR,
+                       "gimp", gimp,
+                       NULL);
+}
diff --git a/app/widgets/gimpdeviceeditor.h b/app/widgets/gimpdeviceeditor.h
new file mode 100644
index 0000000..38de6ce
--- /dev/null
+++ b/app/widgets/gimpdeviceeditor.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdeviceeditor.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICE_EDITOR_H__
+#define __GIMP_DEVICE_EDITOR_H__
+
+
+#define GIMP_TYPE_DEVICE_EDITOR            (gimp_device_editor_get_type ())
+#define GIMP_DEVICE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_EDITOR, GimpDeviceEditor))
+#define GIMP_DEVICE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_EDITOR, GimpDeviceEditorClass))
+#define GIMP_IS_DEVICE_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DEVICE_EDITOR))
+#define GIMP_IS_DEVICE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DEVICE_EDITOR))
+#define GIMP_DEVICE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DEVICE_EDITOR, GimpDeviceEditorClass))
+
+
+typedef struct _GimpDeviceEditorClass GimpDeviceEditorClass;
+
+struct _GimpDeviceEditor
+{
+  GtkPaned  parent_instance;
+};
+
+struct _GimpDeviceEditorClass
+{
+  GtkPanedClass  parent_class;
+};
+
+
+GType       gimp_device_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_device_editor_new      (Gimp *gimp);
+
+
+#endif /* __GIMP_DEVICE_EDITOR_H__ */
diff --git a/app/widgets/gimpdeviceinfo-coords.c b/app/widgets/gimpdeviceinfo-coords.c
new file mode 100644
index 0000000..93c1d90
--- /dev/null
+++ b/app/widgets/gimpdeviceinfo-coords.c
@@ -0,0 +1,262 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpdeviceinfo.h"
+#include "gimpdeviceinfo-coords.h"
+
+
+static const GimpCoords default_coords = GIMP_COORDS_DEFAULT_VALUES;
+
+
+/*  public functions  */
+
+gboolean
+gimp_device_info_get_event_coords (GimpDeviceInfo *info,
+                                   GdkWindow      *window,
+                                   const GdkEvent *event,
+                                   GimpCoords     *coords)
+{
+  gdouble x;
+
+  if (event && gdk_event_get_axis (event, GDK_AXIS_X, &x))
+    {
+      *coords = default_coords;
+
+      coords->x = x;
+      gdk_event_get_axis (event, GDK_AXIS_Y, &coords->y);
+
+      /* translate event coordinates to window coordinates, only
+       * happens if we drag a guide from a ruler
+       */
+      if (event->any.window &&
+          event->any.window != window)
+        {
+          GtkWidget *src_widget;
+          GtkWidget *dest_widget;
+
+          src_widget = gtk_get_event_widget ((GdkEvent *) event);
+          gdk_window_get_user_data (window, (gpointer) &dest_widget);
+
+          if (src_widget && dest_widget)
+            {
+              gint offset_x;
+              gint offset_y;
+
+              if (gtk_widget_translate_coordinates (src_widget, dest_widget,
+                                                    0, 0,
+                                                    &offset_x, &offset_y))
+                {
+                  coords->x += offset_x;
+                  coords->y += offset_y;
+                }
+            }
+        }
+
+      if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &coords->pressure))
+        {
+          coords->pressure = gimp_device_info_map_axis (info,
+                                                        GDK_AXIS_PRESSURE,
+                                                        coords->pressure);
+        }
+
+      if (gdk_event_get_axis (event, GDK_AXIS_XTILT, &coords->xtilt))
+        {
+          coords->xtilt = gimp_device_info_map_axis (info,
+                                                     GDK_AXIS_XTILT,
+                                                     coords->xtilt);
+        }
+
+      if (gdk_event_get_axis (event, GDK_AXIS_YTILT, &coords->ytilt))
+        {
+          coords->ytilt = gimp_device_info_map_axis (info,
+                                                     GDK_AXIS_YTILT,
+                                                     coords->ytilt);
+        }
+
+      if (gdk_event_get_axis (event, GDK_AXIS_WHEEL, &coords->wheel))
+        {
+          coords->wheel = gimp_device_info_map_axis (info,
+                                                     GDK_AXIS_WHEEL,
+                                                     coords->wheel);
+        }
+
+      if (gimp_device_info_get_mode (info)     != GDK_MODE_DISABLED &&
+          gdk_device_get_source (info->device) != GDK_SOURCE_MOUSE)
+        {
+          /* The event was generated by an enabled extended non-mouse device */
+          coords->extended = TRUE;
+        }
+      else
+        {
+          /* The event was generated by a not extended enabled device */
+          coords->extended = FALSE;
+        }
+
+      return TRUE;
+    }
+
+  gimp_device_info_get_device_coords (info, window, coords);
+
+  return FALSE;
+}
+
+void
+gimp_device_info_get_device_coords (GimpDeviceInfo *info,
+                                    GdkWindow      *window,
+                                    GimpCoords     *coords)
+{
+  gdouble axes[GDK_AXIS_LAST] = { 0, };
+
+  *coords = default_coords;
+
+  gdk_device_get_state (info->device, window, axes, NULL);
+
+  gdk_device_get_axis (info->device, axes, GDK_AXIS_X, &coords->x);
+  gdk_device_get_axis (info->device, axes, GDK_AXIS_Y, &coords->y);
+
+  if (gdk_device_get_axis (info->device,
+                           axes, GDK_AXIS_PRESSURE, &coords->pressure))
+    {
+      coords->pressure = gimp_device_info_map_axis (info,
+                                                    GDK_AXIS_PRESSURE,
+                                                    coords->pressure);
+    }
+
+  if (gdk_device_get_axis (info->device,
+                           axes, GDK_AXIS_XTILT, &coords->xtilt))
+    {
+      coords->xtilt = gimp_device_info_map_axis (info,
+                                                 GDK_AXIS_XTILT,
+                                                 coords->xtilt);
+    }
+
+  if (gdk_device_get_axis (info->device,
+                           axes, GDK_AXIS_YTILT, &coords->ytilt))
+    {
+      coords->ytilt = gimp_device_info_map_axis (info,
+                                                 GDK_AXIS_YTILT,
+                                                 coords->ytilt);
+    }
+
+  if (gdk_device_get_axis (info->device,
+                           axes, GDK_AXIS_WHEEL, &coords->wheel))
+    {
+      coords->wheel = gimp_device_info_map_axis (info,
+                                                 GDK_AXIS_WHEEL,
+                                                 coords->wheel);
+    }
+
+  if (gimp_device_info_get_mode (info)     != GDK_MODE_DISABLED &&
+      gdk_device_get_source (info->device) != GDK_SOURCE_MOUSE)
+    {
+      /* The event was generated by an enabled extended non-mouse device */
+      coords->extended = TRUE;
+    }
+  else
+    {
+      /* The event was generated by a not extended enabled device */
+      coords->extended = FALSE;
+    }
+}
+
+void
+gimp_device_info_get_time_coords (GimpDeviceInfo *info,
+                                  GdkTimeCoord   *event,
+                                  GimpCoords     *coords)
+{
+  *coords = default_coords;
+
+  gdk_device_get_axis (info->device, event->axes, GDK_AXIS_X, &coords->x);
+  gdk_device_get_axis (info->device, event->axes, GDK_AXIS_Y, &coords->y);
+
+  /*  CLAMP() the return value of each *_get_axis() call to be safe
+   *  against buggy XInput drivers.
+   */
+
+  if (gdk_device_get_axis (info->device,
+                           event->axes, GDK_AXIS_PRESSURE, &coords->pressure))
+    {
+      coords->pressure = gimp_device_info_map_axis (info,
+                                                    GDK_AXIS_PRESSURE,
+                                                    coords->pressure);
+    }
+
+  if (gdk_device_get_axis (info->device,
+                           event->axes, GDK_AXIS_XTILT, &coords->xtilt))
+    {
+      coords->xtilt = gimp_device_info_map_axis (info,
+                                                 GDK_AXIS_XTILT,
+                                                 coords->xtilt);
+    }
+
+  if (gdk_device_get_axis (info->device,
+                           event->axes, GDK_AXIS_YTILT, &coords->ytilt))
+    {
+      coords->ytilt = gimp_device_info_map_axis (info,
+                                                 GDK_AXIS_YTILT,
+                                                 coords->ytilt);
+    }
+
+  if (gdk_device_get_axis (info->device,
+                           event->axes, GDK_AXIS_WHEEL, &coords->wheel))
+    {
+      coords->wheel = gimp_device_info_map_axis (info,
+                                                 GDK_AXIS_WHEEL,
+                                                 coords->wheel);
+    }
+
+  if (gimp_device_info_get_mode (info)     != GDK_MODE_DISABLED &&
+      gdk_device_get_source (info->device) != GDK_SOURCE_MOUSE)
+    {
+      /* The event was generated by an enabled extended non-mouse device */
+      coords->extended = TRUE;
+    }
+  else
+    {
+      /* The event was generated by a not extended enabled device */
+      coords->extended = FALSE;
+    }
+}
+
+gboolean
+gimp_device_info_get_event_state (GimpDeviceInfo  *info,
+                                  GdkWindow       *window,
+                                  const GdkEvent  *event,
+                                  GdkModifierType *state)
+{
+  if (gdk_event_get_state (event, state))
+    return TRUE;
+
+  gimp_device_info_get_device_state (info, window, state);
+
+  return FALSE;
+}
+
+void
+gimp_device_info_get_device_state (GimpDeviceInfo  *info,
+                                   GdkWindow       *window,
+                                   GdkModifierType *state)
+{
+  gdk_device_get_state (info->device, window, NULL, state);
+}
diff --git a/app/widgets/gimpdeviceinfo-coords.h b/app/widgets/gimpdeviceinfo-coords.h
new file mode 100644
index 0000000..862a75f
--- /dev/null
+++ b/app/widgets/gimpdeviceinfo-coords.h
@@ -0,0 +1,43 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICE_INFO_COORDS_H__
+#define __GIMP_DEVICE_INFO_COORDS_H__
+
+
+gboolean gimp_device_info_get_event_coords   (GimpDeviceInfo  *info,
+                                              GdkWindow       *window,
+                                              const GdkEvent  *event,
+                                              GimpCoords      *coords);
+void     gimp_device_info_get_device_coords  (GimpDeviceInfo  *info,
+                                              GdkWindow       *window,
+                                              GimpCoords      *coords);
+
+void     gimp_device_info_get_time_coords    (GimpDeviceInfo  *info,
+                                              GdkTimeCoord    *event,
+                                              GimpCoords      *coords);
+
+gboolean gimp_device_info_get_event_state    (GimpDeviceInfo  *info,
+                                              GdkWindow       *window,
+                                              const GdkEvent  *event,
+                                              GdkModifierType *state);
+void     gimp_device_info_get_device_state   (GimpDeviceInfo  *info,
+                                              GdkWindow       *window,
+                                              GdkModifierType *state);
+
+
+#endif /* __GIMP_DEVICE_INFO_COORDS_H__ */
diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c
new file mode 100644
index 0000000..594dd90
--- /dev/null
+++ b/app/widgets/gimpdeviceinfo.c
@@ -0,0 +1,945 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#undef GSEAL_ENABLE
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcurve.h"
+#include "core/gimpcurve-map.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimptoolinfo.h"
+
+#include "gimpdeviceinfo.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_DEVICE_INFO_DATA_KEY "gimp-device-info"
+
+
+enum
+{
+  PROP_0,
+  PROP_DEVICE,
+  PROP_DISPLAY,
+  PROP_MODE,
+  PROP_AXES,
+  PROP_KEYS,
+  PROP_PRESSURE_CURVE
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_device_info_constructed  (GObject        *object);
+static void   gimp_device_info_finalize     (GObject        *object);
+static void   gimp_device_info_set_property (GObject        *object,
+                                             guint           property_id,
+                                             const GValue   *value,
+                                             GParamSpec     *pspec);
+static void   gimp_device_info_get_property (GObject        *object,
+                                             guint           property_id,
+                                             GValue         *value,
+                                             GParamSpec     *pspec);
+
+static void   gimp_device_info_guess_icon   (GimpDeviceInfo *info);
+
+
+G_DEFINE_TYPE (GimpDeviceInfo, gimp_device_info, GIMP_TYPE_TOOL_PRESET)
+
+#define parent_class gimp_device_info_parent_class
+
+
+static void
+gimp_device_info_class_init (GimpDeviceInfoClass *klass)
+{
+  GObjectClass      *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
+  GParamSpec        *param_spec;
+
+  object_class->constructed         = gimp_device_info_constructed;
+  object_class->finalize            = gimp_device_info_finalize;
+  object_class->set_property        = gimp_device_info_set_property;
+  object_class->get_property        = gimp_device_info_get_property;
+
+  viewable_class->default_icon_name = GIMP_ICON_INPUT_DEVICE;
+
+  g_object_class_install_property (object_class, PROP_DEVICE,
+                                   g_param_spec_object ("device",
+                                                        NULL, NULL,
+                                                        GDK_TYPE_DEVICE,
+                                                        GIMP_PARAM_STATIC_STRINGS |
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DISPLAY,
+                                   g_param_spec_object ("display",
+                                                        NULL, NULL,
+                                                        GDK_TYPE_DISPLAY,
+                                                        GIMP_PARAM_STATIC_STRINGS |
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_MODE,
+                         "mode",
+                         _("Mode"),
+                         NULL,
+                         GDK_TYPE_INPUT_MODE,
+                         GDK_MODE_DISABLED,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  param_spec = g_param_spec_enum ("axis",
+                                  NULL, NULL,
+                                  GDK_TYPE_AXIS_USE,
+                                  GDK_AXIS_IGNORE,
+                                  GIMP_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_AXES,
+                                   gimp_param_spec_value_array ("axes",
+                                                                NULL, NULL,
+                                                                param_spec,
+                                                                GIMP_PARAM_STATIC_STRINGS |
+                                                                GIMP_CONFIG_PARAM_FLAGS));
+
+  param_spec = g_param_spec_string ("key",
+                                    NULL, NULL,
+                                    NULL,
+                                    GIMP_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_KEYS,
+                                   gimp_param_spec_value_array ("keys",
+                                                                NULL, NULL,
+                                                                param_spec,
+                                                                GIMP_PARAM_STATIC_STRINGS |
+                                                                GIMP_CONFIG_PARAM_FLAGS));
+
+  GIMP_CONFIG_PROP_OBJECT (object_class, PROP_PRESSURE_CURVE,
+                           "pressure-curve",
+                           _("Pressure curve"),
+                           NULL,
+                           GIMP_TYPE_CURVE,
+                           GIMP_CONFIG_PARAM_AGGREGATE);
+}
+
+static void
+gimp_device_info_init (GimpDeviceInfo *info)
+{
+  gimp_data_make_internal (GIMP_DATA (info), NULL);
+
+  info->mode           = GDK_MODE_DISABLED;
+  info->pressure_curve = GIMP_CURVE (gimp_curve_new ("pressure curve"));
+
+  g_signal_connect (info, "notify::name",
+                    G_CALLBACK (gimp_device_info_guess_icon),
+                    NULL);
+}
+
+static void
+gimp_device_info_constructed (GObject *object)
+{
+  GimpDeviceInfo *info = GIMP_DEVICE_INFO (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert ((info->device == NULL         && info->display == NULL) ||
+               (GDK_IS_DEVICE (info->device) && GDK_IS_DISPLAY (info->display)));
+
+  if (info->device)
+    {
+      gint i;
+
+      g_object_set_data (G_OBJECT (info->device), GIMP_DEVICE_INFO_DATA_KEY,
+                         info);
+
+      gimp_object_set_name (GIMP_OBJECT (info), info->device->name);
+
+      info->mode = gdk_device_get_mode (info->device);
+
+      info->n_axes = gdk_device_get_n_axes (info->device);
+      info->axes = g_new0 (GdkAxisUse, info->n_axes);
+      for (i = 0; i < info->n_axes; i++)
+        info->axes[i] = gdk_device_get_axis_use (info->device, i);
+
+      info->n_keys = gdk_device_get_n_keys (info->device);
+      info->keys = g_new0 (GdkDeviceKey, info->n_keys);
+      for (i = 0; i < info->n_keys; i++)
+        gdk_device_get_key (info->device, i,
+                            &info->keys[i].keyval,
+                            &info->keys[i].modifiers);
+    }
+}
+
+static void
+gimp_device_info_finalize (GObject *object)
+{
+  GimpDeviceInfo *info = GIMP_DEVICE_INFO (object);
+
+  g_clear_pointer (&info->axes, g_free);
+  g_clear_pointer (&info->keys, g_free);
+
+  g_clear_object (&info->pressure_curve);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_device_info_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpDeviceInfo *info       = GIMP_DEVICE_INFO (object);
+  GdkDevice      *device     = info->device;
+  GimpCurve      *src_curve  = NULL;
+  GimpCurve      *dest_curve = NULL;
+
+  switch (property_id)
+    {
+    case PROP_DEVICE:
+      info->device = g_value_get_object (value);
+      break;
+
+    case PROP_DISPLAY:
+      info->display = g_value_get_object (value);
+      break;
+
+    case PROP_MODE:
+      gimp_device_info_set_mode (info, g_value_get_enum (value));
+      break;
+
+    case PROP_AXES:
+      {
+        GimpValueArray *array = g_value_get_boxed (value);
+
+        if (array)
+          {
+            gint i;
+            gint n_device_values = gimp_value_array_length (array);
+
+            if (device)
+              n_device_values = MIN (n_device_values,
+                                     gdk_device_get_n_axes (device));
+
+            info->n_axes = n_device_values;
+            info->axes   = g_renew (GdkAxisUse, info->axes, info->n_axes);
+            memset (info->axes, 0, info->n_axes * sizeof (GdkAxisUse));
+
+            for (i = 0; i < n_device_values; i++)
+              {
+                GdkAxisUse axis_use;
+
+                axis_use = g_value_get_enum (gimp_value_array_index (array, i));
+
+                gimp_device_info_set_axis_use (info, i, axis_use);
+              }
+          }
+      }
+      break;
+
+    case PROP_KEYS:
+      {
+        GimpValueArray *array = g_value_get_boxed (value);
+
+        if (array)
+          {
+            gint i;
+            gint n_device_values = gimp_value_array_length (array);
+
+            if (device)
+              n_device_values = MIN (n_device_values,
+                                     gdk_device_get_n_keys (device));
+
+            info->n_keys = n_device_values;
+            info->keys   = g_renew (GdkDeviceKey, info->keys, info->n_keys);
+            memset (info->keys, 0, info->n_keys * sizeof (GdkDeviceKey));
+
+            for (i = 0; i < n_device_values; i++)
+              {
+                const gchar     *accel;
+                guint            keyval;
+                GdkModifierType  modifiers;
+
+                accel = g_value_get_string (gimp_value_array_index (array, i));
+
+                gtk_accelerator_parse (accel, &keyval, &modifiers);
+
+                gimp_device_info_set_key (info, i, keyval, modifiers);
+              }
+          }
+      }
+      break;
+
+    case PROP_PRESSURE_CURVE:
+      src_curve  = g_value_get_object (value);
+      dest_curve = info->pressure_curve;
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+
+  if (src_curve && dest_curve)
+    {
+      gimp_config_copy (GIMP_CONFIG (src_curve),
+                        GIMP_CONFIG (dest_curve),
+                        GIMP_CONFIG_PARAM_SERIALIZE);
+    }
+}
+
+static void
+gimp_device_info_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpDeviceInfo *info = GIMP_DEVICE_INFO (object);
+
+  switch (property_id)
+    {
+    case PROP_DEVICE:
+      g_value_set_object (value, info->device);
+      break;
+
+    case PROP_DISPLAY:
+      g_value_set_object (value, info->display);
+      break;
+
+    case PROP_MODE:
+      g_value_set_enum (value, gimp_device_info_get_mode (info));
+      break;
+
+    case PROP_AXES:
+      {
+        GimpValueArray *array;
+        GValue          enum_value = G_VALUE_INIT;
+        gint            n_axes;
+        gint            i;
+
+        array = gimp_value_array_new (6);
+        g_value_init (&enum_value, GDK_TYPE_AXIS_USE);
+
+        n_axes = gimp_device_info_get_n_axes (info);
+
+        for (i = 0; i < n_axes; i++)
+          {
+            g_value_set_enum (&enum_value,
+                              gimp_device_info_get_axis_use (info, i));
+
+            gimp_value_array_append (array, &enum_value);
+          }
+
+        g_value_unset (&enum_value);
+
+        g_value_take_boxed (value, array);
+      }
+      break;
+
+    case PROP_KEYS:
+      {
+        GimpValueArray *array;
+        GValue          string_value = G_VALUE_INIT;
+        gint            n_keys;
+        gint            i;
+
+        array = gimp_value_array_new (32);
+        g_value_init (&string_value, G_TYPE_STRING);
+
+        n_keys = gimp_device_info_get_n_keys (info);
+
+        for (i = 0; i < n_keys; i++)
+          {
+            guint           keyval;
+            GdkModifierType modifiers;
+
+            gimp_device_info_get_key (info, i, &keyval, &modifiers);
+
+            if (keyval)
+              {
+                gchar *accel;
+                gchar *escaped;
+
+                accel = gtk_accelerator_name (keyval, modifiers);
+                escaped = g_strescape (accel, NULL);
+                g_free (accel);
+
+                g_value_set_string (&string_value, escaped);
+                g_free (escaped);
+              }
+            else
+              {
+                g_value_set_string (&string_value, "");
+              }
+
+            gimp_value_array_append (array, &string_value);
+          }
+
+        g_value_unset (&string_value);
+
+        g_value_take_boxed (value, array);
+      }
+      break;
+
+    case PROP_PRESSURE_CURVE:
+      g_value_set_object (value, info->pressure_curve);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_device_info_guess_icon (GimpDeviceInfo *info)
+{
+  GimpViewable *viewable = GIMP_VIEWABLE (info);
+
+  if (gimp_object_get_name (viewable) &&
+      ! strcmp (gimp_viewable_get_icon_name (viewable),
+                GIMP_VIEWABLE_GET_CLASS (viewable)->default_icon_name))
+    {
+      const gchar *icon_name = NULL;
+      gchar       *down      = g_ascii_strdown (gimp_object_get_name (viewable),
+                                                -1);
+
+      if (strstr (down, "eraser"))
+        {
+          icon_name = GIMP_ICON_TOOL_ERASER;
+        }
+      else if (strstr (down, "pen"))
+        {
+          icon_name = GIMP_ICON_TOOL_PAINTBRUSH;
+        }
+      else if (strstr (down, "airbrush"))
+        {
+          icon_name = GIMP_ICON_TOOL_AIRBRUSH;
+        }
+      else if (strstr (down, "cursor")   ||
+               strstr (down, "mouse")    ||
+               strstr (down, "pointer")  ||
+               strstr (down, "touchpad") ||
+               strstr (down, "trackpoint"))
+        {
+          icon_name = GIMP_ICON_CURSOR;
+        }
+
+      g_free (down);
+
+      if (icon_name)
+        gimp_viewable_set_icon_name (viewable, icon_name);
+    }
+}
+
+
+/*  public functions  */
+
+GimpDeviceInfo *
+gimp_device_info_new (Gimp       *gimp,
+                      GdkDevice  *device,
+                      GdkDisplay *display)
+{
+  GimpContext  *context;
+  GimpToolInfo *tool_info;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  context   = gimp_get_user_context (gimp);
+  tool_info = gimp_context_get_tool (context);
+
+  g_return_val_if_fail (tool_info != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_DEVICE_INFO,
+                       "gimp",         gimp,
+                       "device",       device,
+                       "display",      display,
+                       "tool-options", tool_info->tool_options,
+                       NULL);
+}
+
+GdkDevice *
+gimp_device_info_get_device (GimpDeviceInfo  *info,
+                             GdkDisplay     **display)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), NULL);
+
+  if (display)
+    *display = info->display;
+
+  return info->device;
+}
+
+gboolean
+gimp_device_info_set_device (GimpDeviceInfo *info,
+                             GdkDevice      *device,
+                             GdkDisplay     *display)
+{
+  gint i;
+
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), FALSE);
+  g_return_val_if_fail ((device == NULL && display == NULL) ||
+                        (GDK_IS_DEVICE (device) && GDK_IS_DISPLAY (display)),
+                        FALSE);
+
+  if (device && info->device)
+    {
+      g_printerr ("%s: trying to set GdkDevice '%s' on GimpDeviceInfo "
+                  "which already has a device\n",
+                  G_STRFUNC, gdk_device_get_name (device));
+
+#ifdef G_OS_WIN32
+      /*  This is a very weird/dirty difference we make between Win32 and
+       *  Linux. On Linux, we had breakage because of duplicate devices,
+       *  fixed by overwriting the info's old device (assuming it to be
+       *  dead) with the new one. Unfortunately doing this on Windows
+       *  too broke a lot of devices (which used to work with the old
+       *  way). See the regression bug #2495.
+       *
+       *  NOTE that this only happens if something is wrong on the USB
+       *  or udev or libinput or whatever side and the same device is
+       *  present multiple times. Therefore there doesn't seem to be an
+       *  absolute single "solution" to this problem (well there is, but
+       *  probably not in GIMP, where we can only react). This is more
+       *  of an experimenting-in-real-life kind of bug.
+       *  Also we had no clear report on macOS or BSD (AFAIK) of broken
+       *  tablets with any of the version of the code. So let's keep
+       *  these similar to Linux for now.
+       */
+      return FALSE;
+#endif /* G_OS_WIN32 */
+    }
+  else if (! device && ! info->device)
+    {
+      g_printerr ("%s: trying to unset GdkDevice of GimpDeviceInfo '%s'"
+                  "which has no device\n",
+                  G_STRFUNC, gimp_object_get_name (info));
+
+      /*  bail out, unsetting twice makes no sense  */
+      return FALSE;
+    }
+
+  g_return_val_if_fail (device == NULL ||
+                        strcmp (gdk_device_get_name (device),
+                                gimp_object_get_name (info)) == 0, FALSE);
+
+  if (device)
+    {
+      info->device  = device;
+      info->display = display;
+
+      g_object_set_data (G_OBJECT (device), GIMP_DEVICE_INFO_DATA_KEY, info);
+
+      gimp_device_info_set_mode (info, info->mode);
+
+      if (info->n_axes != device->num_axes)
+        g_printerr ("%s: stored 'num-axes' for device '%s' doesn't match "
+                    "number of axes present in device\n",
+                    G_STRFUNC, device->name);
+
+      for (i = 0; i < MIN (info->n_axes, device->num_axes); i++)
+        gimp_device_info_set_axis_use (info, i,
+                                       info->axes[i]);
+
+      if (info->n_keys != device->num_keys)
+        g_printerr ("%s: stored 'num-keys' for device '%s' doesn't match "
+                    "number of keys present in device\n",
+                    G_STRFUNC, device->name);
+
+      for (i = 0; i < MIN (info->n_keys, device->num_keys); i++)
+        gimp_device_info_set_key (info, i,
+                                  info->keys[i].keyval,
+                                  info->keys[i].modifiers);
+    }
+  else
+    {
+      device  = info->device;
+      display = info->display;
+
+      info->device  = NULL;
+      info->display = NULL;
+
+      g_object_set_data (G_OBJECT (device), GIMP_DEVICE_INFO_DATA_KEY, NULL);
+
+      gimp_device_info_set_mode (info, device->mode);
+
+      info->n_axes = device->num_axes;
+      info->axes   = g_renew (GdkAxisUse, info->axes, info->n_axes);
+      memset (info->axes, 0, info->n_axes * sizeof (GdkAxisUse));
+
+      for (i = 0; i < info->n_axes; i++)
+        gimp_device_info_set_axis_use (info, i,
+                                       device->axes[i].use);
+
+      info->n_keys = device->num_keys;
+      info->keys   = g_renew (GdkDeviceKey, info->keys, info->n_keys);
+      memset (info->keys, 0, info->n_keys * sizeof (GdkDeviceKey));
+
+      for (i = 0; i < MIN (info->n_keys, device->num_keys); i++)
+        gimp_device_info_set_key (info, i,
+                                  device->keys[i].keyval,
+                                  device->keys[i].modifiers);
+    }
+
+  /*  sort order depends on device presence  */
+  gimp_object_name_changed (GIMP_OBJECT (info));
+
+  g_object_notify (G_OBJECT (info), "device");
+
+  return TRUE;
+}
+
+void
+gimp_device_info_set_default_tool (GimpDeviceInfo *info)
+{
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+
+  if (info->device &&
+      gdk_device_get_source (info->device) == GDK_SOURCE_ERASER)
+    {
+      GimpContainer *tools = GIMP_TOOL_PRESET (info)->gimp->tool_info_list;
+      GimpToolInfo  *eraser;
+
+      eraser =
+        GIMP_TOOL_INFO (gimp_container_get_child_by_name (tools,
+                                                          "gimp-eraser-tool"));
+
+      if (eraser)
+        g_object_set (info,
+                      "tool-options", eraser->tool_options,
+                      NULL);
+    }
+}
+
+void
+gimp_device_info_save_tool (GimpDeviceInfo *info)
+{
+  GimpToolPreset      *preset = GIMP_TOOL_PRESET (info);
+  GimpContext         *user_context;
+  GimpToolInfo        *tool_info;
+  GimpContextPropMask  serialize_props;
+
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+
+  user_context = gimp_get_user_context (GIMP_TOOL_PRESET (info)->gimp);
+
+  tool_info = gimp_context_get_tool (user_context);
+
+  g_object_set (info,
+                "tool-options", tool_info->tool_options,
+                NULL);
+
+  serialize_props =
+    gimp_context_get_serialize_properties (GIMP_CONTEXT (preset->tool_options));
+
+  g_object_set (preset,
+                "use-fg-bg",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_FOREGROUND) ||
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_BACKGROUND),
+
+                "use-brush",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_BRUSH) != 0,
+
+                "use-dynamics",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS) != 0,
+
+                "use-mypaint-brush",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_MYBRUSH) != 0,
+
+                "use-gradient",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_GRADIENT) != 0,
+
+                "use-pattern",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_PATTERN) != 0,
+
+                "use-palette",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_PALETTE) != 0,
+
+                "use-font",
+                (serialize_props & GIMP_CONTEXT_PROP_MASK_FONT) != 0,
+
+                NULL);
+}
+
+void
+gimp_device_info_restore_tool (GimpDeviceInfo *info)
+{
+  GimpToolPreset *preset;
+  GimpContext    *user_context;
+
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+
+  preset = GIMP_TOOL_PRESET (info);
+
+  user_context = gimp_get_user_context (GIMP_TOOL_PRESET (info)->gimp);
+
+  if (preset->tool_options)
+    {
+      if (gimp_context_get_tool_preset (user_context) != preset)
+        {
+          gimp_context_set_tool_preset (user_context, preset);
+        }
+      else
+        {
+          gimp_context_tool_preset_changed (user_context);
+        }
+    }
+}
+
+GdkInputMode
+gimp_device_info_get_mode (GimpDeviceInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), GDK_MODE_DISABLED);
+
+  if (info->device)
+    return info->device->mode;
+  else
+    return info->mode;
+}
+
+void
+gimp_device_info_set_mode (GimpDeviceInfo *info,
+                           GdkInputMode    mode)
+{
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+
+  if (mode != gimp_device_info_get_mode (info))
+    {
+      if (info->device)
+        gdk_device_set_mode (info->device, mode);
+      else
+        info->mode = mode;
+
+      g_object_notify (G_OBJECT (info), "mode");
+    }
+}
+
+gboolean
+gimp_device_info_has_cursor (GimpDeviceInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), FALSE);
+
+  if (info->device)
+    return info->device->has_cursor;
+
+  return FALSE;
+}
+
+gint
+gimp_device_info_get_n_axes (GimpDeviceInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), 0);
+
+  if (info->device)
+    return info->device->num_axes;
+  else
+    return info->n_axes;
+}
+
+GdkAxisUse
+gimp_device_info_get_axis_use (GimpDeviceInfo *info,
+                               gint            axis)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), GDK_AXIS_IGNORE);
+  g_return_val_if_fail (axis >= 0 && axis < gimp_device_info_get_n_axes (info),
+                        GDK_AXIS_IGNORE);
+
+  if (info->device)
+    return info->device->axes[axis].use;
+  else
+    return info->axes[axis];
+}
+
+void
+gimp_device_info_set_axis_use (GimpDeviceInfo *info,
+                               gint            axis,
+                               GdkAxisUse      use)
+{
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+  g_return_if_fail (axis >= 0 && axis < gimp_device_info_get_n_axes (info));
+
+  if (use != gimp_device_info_get_axis_use (info, axis))
+    {
+      if (info->device)
+        gdk_device_set_axis_use (info->device, axis, use);
+
+      info->axes[axis] = use;
+
+      g_object_notify (G_OBJECT (info), "axes");
+    }
+}
+
+gint
+gimp_device_info_get_n_keys (GimpDeviceInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), 0);
+
+  if (info->device)
+    return info->device->num_keys;
+  else
+    return info->n_keys;
+}
+
+void
+gimp_device_info_get_key (GimpDeviceInfo  *info,
+                          gint             key,
+                          guint           *keyval,
+                          GdkModifierType *modifiers)
+{
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+  g_return_if_fail (key >= 0 && key < gimp_device_info_get_n_keys (info));
+  g_return_if_fail (keyval != NULL);
+  g_return_if_fail (modifiers != NULL);
+
+  if (info->device)
+    {
+      *keyval    = info->device->keys[key].keyval;
+      *modifiers = info->device->keys[key].modifiers;
+    }
+  else
+    {
+      *keyval    = info->keys[key].keyval;
+      *modifiers = info->keys[key].modifiers;
+    }
+}
+
+void
+gimp_device_info_set_key (GimpDeviceInfo *info,
+                          gint             key,
+                          guint            keyval,
+                          GdkModifierType  modifiers)
+{
+  guint           old_keyval;
+  GdkModifierType old_modifiers;
+
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+  g_return_if_fail (key >= 0 && key < gimp_device_info_get_n_keys (info));
+
+  gimp_device_info_get_key (info, key, &old_keyval, &old_modifiers);
+
+  if (keyval    != old_keyval ||
+      modifiers != old_modifiers)
+    {
+      if (info->device)
+        gdk_device_set_key (info->device, key, keyval, modifiers);
+
+      info->keys[key].keyval    = keyval;
+      info->keys[key].modifiers = modifiers;
+
+      g_object_notify (G_OBJECT (info), "keys");
+    }
+}
+
+GimpCurve *
+gimp_device_info_get_curve (GimpDeviceInfo *info,
+                            GdkAxisUse      use)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), NULL);
+
+  switch (use)
+    {
+    case GDK_AXIS_PRESSURE:
+      return info->pressure_curve;
+      break;
+
+    default:
+      return NULL;
+    }
+}
+
+gdouble
+gimp_device_info_map_axis (GimpDeviceInfo *info,
+                           GdkAxisUse      use,
+                           gdouble         value)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), value);
+
+  /* CLAMP() the return values be safe against buggy XInput drivers */
+
+  switch (use)
+    {
+    case GDK_AXIS_PRESSURE:
+      return gimp_curve_map_value (info->pressure_curve, value);
+
+    case GDK_AXIS_XTILT:
+      return CLAMP (value, GIMP_COORDS_MIN_TILT, GIMP_COORDS_MAX_TILT);
+
+    case GDK_AXIS_YTILT:
+      return CLAMP (value, GIMP_COORDS_MIN_TILT, GIMP_COORDS_MAX_TILT);
+
+    case GDK_AXIS_WHEEL:
+      return CLAMP (value, GIMP_COORDS_MIN_WHEEL, GIMP_COORDS_MAX_WHEEL);
+
+    default:
+      break;
+    }
+
+  return value;
+}
+
+GimpDeviceInfo *
+gimp_device_info_get_by_device (GdkDevice *device)
+{
+  g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
+
+  return g_object_get_data (G_OBJECT (device), GIMP_DEVICE_INFO_DATA_KEY);
+}
+
+gint
+gimp_device_info_compare (GimpDeviceInfo *a,
+                          GimpDeviceInfo *b)
+{
+  if (a->device && a->display &&
+      a->device == gdk_display_get_core_pointer (a->display))
+    {
+      return -1;
+    }
+  else if (b->device && b->display &&
+           b->device == gdk_display_get_core_pointer (b->display))
+    {
+      return 1;
+    }
+  else if (a->device && ! b->device)
+    {
+      return -1;
+    }
+  else if (! a->device && b->device)
+    {
+      return 1;
+    }
+  else
+    {
+      return gimp_object_name_collate ((GimpObject *) a,
+                                       (GimpObject *) b);
+    }
+}
diff --git a/app/widgets/gimpdeviceinfo.h b/app/widgets/gimpdeviceinfo.h
new file mode 100644
index 0000000..59955ed
--- /dev/null
+++ b/app/widgets/gimpdeviceinfo.h
@@ -0,0 +1,120 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICE_INFO_H__
+#define __GIMP_DEVICE_INFO_H__
+
+
+#include "core/gimptoolpreset.h"
+
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_DEVICE_INFO            (gimp_device_info_get_type ())
+#define GIMP_DEVICE_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_INFO, GimpDeviceInfo))
+#define GIMP_DEVICE_INFO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_INFO, GimpDeviceInfoClass))
+#define GIMP_IS_DEVICE_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DEVICE_INFO))
+#define GIMP_IS_DEVICE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DEVICE_INFO))
+#define GIMP_DEVICE_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DEVICE_INFO, GimpDeviceInfoClass))
+
+
+typedef struct _GimpDeviceInfoClass GimpDeviceInfoClass;
+
+struct _GimpDeviceInfo
+{
+  GimpToolPreset  parent_instance;
+
+  GdkDevice      *device;
+  GdkDisplay     *display;
+
+  /*  either "device" or the options below are set  */
+
+  GdkInputMode    mode;
+  gint            n_axes;
+  GdkAxisUse     *axes;
+  gint            n_keys;
+  GdkDeviceKey   *keys;
+
+  /*  curves  */
+
+  GimpCurve      *pressure_curve;
+};
+
+struct _GimpDeviceInfoClass
+{
+  GimpToolPresetClass  parent_class;
+};
+
+
+GType            gimp_device_info_get_type          (void) G_GNUC_CONST;
+
+GimpDeviceInfo * gimp_device_info_new               (Gimp            *gimp,
+                                                     GdkDevice       *device,
+                                                     GdkDisplay      *display);
+
+GdkDevice      * gimp_device_info_get_device        (GimpDeviceInfo  *info,
+                                                     GdkDisplay     **display);
+gboolean         gimp_device_info_set_device        (GimpDeviceInfo  *info,
+                                                     GdkDevice       *device,
+                                                     GdkDisplay      *display);
+
+void             gimp_device_info_set_default_tool  (GimpDeviceInfo  *info);
+
+void             gimp_device_info_save_tool         (GimpDeviceInfo  *info);
+void             gimp_device_info_restore_tool      (GimpDeviceInfo  *info);
+
+GdkInputMode     gimp_device_info_get_mode          (GimpDeviceInfo  *info);
+void             gimp_device_info_set_mode          (GimpDeviceInfo  *info,
+                                                     GdkInputMode     mode);
+
+gboolean         gimp_device_info_has_cursor        (GimpDeviceInfo  *info);
+
+gint             gimp_device_info_get_n_axes        (GimpDeviceInfo  *info);
+GdkAxisUse       gimp_device_info_get_axis_use      (GimpDeviceInfo  *info,
+                                                     gint             axis);
+void             gimp_device_info_set_axis_use      (GimpDeviceInfo  *info,
+                                                     gint             axis,
+                                                     GdkAxisUse       use);
+
+gint             gimp_device_info_get_n_keys        (GimpDeviceInfo  *info);
+void             gimp_device_info_get_key           (GimpDeviceInfo  *info,
+                                                     gint             key,
+                                                     guint           *keyval,
+                                                     GdkModifierType *modifiers);
+void             gimp_device_info_set_key           (GimpDeviceInfo  *info,
+                                                     gint             key,
+                                                     guint            keyval,
+                                                     GdkModifierType  modifiers);
+
+GimpCurve      * gimp_device_info_get_curve         (GimpDeviceInfo  *info,
+                                                     GdkAxisUse       use);
+gdouble          gimp_device_info_map_axis          (GimpDeviceInfo  *info,
+                                                     GdkAxisUse       use,
+                                                     gdouble          value);
+
+void             gimp_device_info_changed           (GimpDeviceInfo  *info);
+
+GimpDeviceInfo * gimp_device_info_get_by_device     (GdkDevice       *device);
+
+gint             gimp_device_info_compare           (GimpDeviceInfo  *a,
+                                                     GimpDeviceInfo  *b);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_DEVICE_INFO_H__ */
diff --git a/app/widgets/gimpdeviceinfoeditor.c b/app/widgets/gimpdeviceinfoeditor.c
new file mode 100644
index 0000000..12aa1f5
--- /dev/null
+++ b/app/widgets/gimpdeviceinfoeditor.c
@@ -0,0 +1,770 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdeviceinfoeditor.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcurve.h"
+
+#include "gimpcurveview.h"
+#include "gimpdeviceinfo.h"
+#include "gimpdeviceinfoeditor.h"
+
+#include "gimp-intl.h"
+
+
+#define CURVE_SIZE   256
+#define CURVE_BORDER   4
+
+
+enum
+{
+  PROP_0,
+  PROP_INFO
+};
+
+enum
+{
+  AXIS_COLUMN_INDEX,
+  AXIS_COLUMN_NAME,
+  AXIS_COLUMN_INPUT_NAME,
+  AXIS_N_COLUMNS
+};
+
+enum
+{
+  INPUT_COLUMN_INDEX,
+  INPUT_COLUMN_NAME,
+  INPUT_N_COLUMNS
+};
+
+enum
+{
+  KEY_COLUMN_INDEX,
+  KEY_COLUMN_NAME,
+  KEY_COLUMN_KEY,
+  KEY_COLUMN_MASK,
+  KEY_N_COLUMNS
+};
+
+
+typedef struct _GimpDeviceInfoEditorPrivate GimpDeviceInfoEditorPrivate;
+
+struct _GimpDeviceInfoEditorPrivate
+{
+  GimpDeviceInfo *info;
+
+  GtkWidget      *vbox;
+
+  GtkListStore   *input_store;
+
+  GtkListStore   *axis_store;
+  GtkTreeIter     axis_iters[GDK_AXIS_LAST - GDK_AXIS_X];
+
+  GtkListStore   *key_store;
+
+  GtkWidget      *notebook;
+};
+
+#define GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE(editor) \
+        ((GimpDeviceInfoEditorPrivate *) gimp_device_info_editor_get_instance_private ((GimpDeviceInfoEditor *) (editor)))
+
+
+static void   gimp_device_info_editor_constructed   (GObject              *object);
+static void   gimp_device_info_editor_finalize      (GObject              *object);
+static void   gimp_device_info_editor_set_property  (GObject              *object,
+                                                     guint                 property_id,
+                                                     const GValue         *value,
+                                                     GParamSpec           *pspec);
+static void   gimp_device_info_editor_get_property  (GObject              *object,
+                                                     guint                 property_id,
+                                                     GValue               *value,
+                                                     GParamSpec           *pspec);
+
+static void   gimp_device_info_editor_set_axes      (GimpDeviceInfoEditor *editor);
+
+static void   gimp_device_info_editor_axis_changed  (GtkCellRendererCombo *combo,
+                                                     const gchar          *path_string,
+                                                     GtkTreeIter          *new_iter,
+                                                     GimpDeviceInfoEditor *editor);
+static void   gimp_device_info_editor_axis_selected (GtkTreeSelection     *selection,
+                                                     GimpDeviceInfoEditor *editor);
+
+static void   gimp_device_info_editor_key_edited    (GtkCellRendererAccel *accel,
+                                                     const char           *path_string,
+                                                     guint                 accel_key,
+                                                     GdkModifierType       accel_mask,
+                                                     guint                 hardware_keycode,
+                                                     GimpDeviceInfoEditor *editor);
+static void   gimp_device_info_editor_key_cleared   (GtkCellRendererAccel *accel,
+                                                     const char           *path_string,
+                                                     GimpDeviceInfoEditor *editor);
+
+static void   gimp_device_info_editor_curve_reset   (GtkWidget            *button,
+                                                     GimpCurve            *curve);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDeviceInfoEditor, gimp_device_info_editor,
+                            GTK_TYPE_BOX)
+
+#define parent_class gimp_device_info_editor_parent_class
+
+
+static const gchar *const axis_use_strings[] =
+{
+  N_("X"),
+  N_("Y"),
+  N_("Pressure"),
+  N_("X tilt"),
+  N_("Y tilt"),
+  /* Wheel as in mouse or input device wheel.
+   * Some pens use the same axis for their rotation feature.
+   * See bug 791455.
+   */
+  N_("Wheel/Rotation")
+};
+
+
+static void
+gimp_device_info_editor_class_init (GimpDeviceInfoEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_device_info_editor_constructed;
+  object_class->finalize     = gimp_device_info_editor_finalize;
+  object_class->set_property = gimp_device_info_editor_set_property;
+  object_class->get_property = gimp_device_info_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_INFO,
+                                   g_param_spec_object ("info",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DEVICE_INFO,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_device_info_editor_init (GimpDeviceInfoEditor *editor)
+{
+  GimpDeviceInfoEditorPrivate *private;
+  GtkWidget                   *frame;
+  GtkWidget                   *frame2;
+  GtkWidget                   *view;
+  GtkTreeSelection            *sel;
+  GtkWidget                   *scrolled_win;
+  GtkWidget                   *key_view;
+  GtkCellRenderer             *cell;
+  gint                         i;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
+
+  private->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_pack_start (GTK_BOX (editor), private->vbox, TRUE, TRUE, 0);
+  gtk_widget_show (private->vbox);
+
+  /*  the axes  */
+
+  /* The axes of an input device */
+  frame = gimp_frame_new (_("Axes"));
+  gtk_box_pack_start (GTK_BOX (private->vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  frame2 = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
+  gtk_container_add (GTK_CONTAINER (frame), frame2);
+  gtk_widget_show (frame2);
+
+  private->axis_store = gtk_list_store_new (AXIS_N_COLUMNS,
+                                            G_TYPE_INT,
+                                            G_TYPE_STRING,
+                                            G_TYPE_STRING);
+
+  for (i = GDK_AXIS_X; i < GDK_AXIS_LAST; i++)
+    {
+      const gchar *string = gettext (axis_use_strings[i - 1]);
+
+      gtk_list_store_insert_with_values (private->axis_store,
+                                         &private->axis_iters[i - 1], -1,
+                                         AXIS_COLUMN_INDEX, i,
+                                         AXIS_COLUMN_NAME,  string,
+                                         -1);
+    }
+
+  view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (private->axis_store));
+  g_object_unref (private->axis_store);
+
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+                                               -1, NULL,
+                                               gtk_cell_renderer_text_new (),
+                                               "text", AXIS_COLUMN_NAME,
+                                               NULL);
+
+  private->input_store = gtk_list_store_new (INPUT_N_COLUMNS,
+                                             G_TYPE_INT,
+                                             G_TYPE_STRING);
+
+  cell = gtk_cell_renderer_combo_new ();
+  g_object_set (cell,
+                "mode",        GTK_CELL_RENDERER_MODE_EDITABLE,
+                "editable",    TRUE,
+                "model",       private->input_store,
+                "text-column", INPUT_COLUMN_NAME,
+                "has-entry",   FALSE,
+                NULL);
+
+  g_object_unref (private->input_store);
+
+  g_signal_connect (cell, "changed",
+                    G_CALLBACK (gimp_device_info_editor_axis_changed),
+                    editor);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+                                               -1, NULL,
+                                               cell,
+                                               "text", AXIS_COLUMN_INPUT_NAME,
+                                               NULL);
+
+  gtk_container_add (GTK_CONTAINER (frame2), view);
+  gtk_widget_show (view);
+
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+  gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE);
+  gtk_tree_selection_select_iter (sel, &private->axis_iters[0]);
+
+  g_signal_connect (sel, "changed",
+                    G_CALLBACK (gimp_device_info_editor_axis_selected),
+                    editor);
+
+  /*  the keys  */
+
+  frame = gimp_frame_new (_("Keys"));
+  gtk_box_pack_end (GTK_BOX (private->vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  private->key_store = gtk_list_store_new (KEY_N_COLUMNS,
+                                           G_TYPE_INT,
+                                           G_TYPE_STRING,
+                                           G_TYPE_UINT,
+                                           GDK_TYPE_MODIFIER_TYPE);
+  key_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (private->key_store));
+  g_object_unref (private->key_store);
+
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (key_view), FALSE);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (key_view),
+                                               -1, NULL,
+                                               gtk_cell_renderer_text_new (),
+                                               "text", KEY_COLUMN_NAME,
+                                               NULL);
+
+  cell = gtk_cell_renderer_accel_new ();
+  g_object_set (cell,
+                "mode",     GTK_CELL_RENDERER_MODE_EDITABLE,
+                "editable", TRUE,
+                NULL);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (key_view),
+                                               -1, NULL,
+                                               cell,
+                                               "accel-key",  KEY_COLUMN_KEY,
+                                               "accel-mods", KEY_COLUMN_MASK,
+                                               NULL);
+
+  g_signal_connect (cell, "accel-edited",
+                    G_CALLBACK (gimp_device_info_editor_key_edited),
+                    editor);
+  g_signal_connect (cell, "accel-cleared",
+                    G_CALLBACK (gimp_device_info_editor_key_cleared),
+                    editor);
+
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_container_add (GTK_CONTAINER (frame), scrolled_win);
+  gtk_widget_show (scrolled_win);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_win), key_view);
+  gtk_widget_show (key_view);
+}
+
+static void
+gimp_device_info_editor_constructed (GObject *object)
+{
+  GimpDeviceInfoEditor        *editor  = GIMP_DEVICE_INFO_EDITOR (object);
+  GimpDeviceInfoEditorPrivate *private;
+  GtkWidget                   *hbox;
+  GtkWidget                   *label;
+  GtkWidget                   *combo;
+  gint                         n_axes;
+  gint                         n_keys;
+  gint                         i;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_DEVICE_INFO (private->info));
+
+  /*  the mode menu  */
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (private->vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (private->vbox), hbox, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new_with_mnemonic (_("_Mode:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  combo = gimp_prop_enum_combo_box_new (G_OBJECT (private->info), "mode",
+                                        0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+  /*  the axes  */
+
+  n_axes = gimp_device_info_get_n_axes (private->info);
+
+  for (i = -1; i < n_axes; i++)
+    {
+      gchar name[16];
+
+      if (i == -1)
+        g_snprintf (name, sizeof (name), _("none"));
+      else
+        g_snprintf (name, sizeof (name), "%d", i + 1);
+
+      gtk_list_store_insert_with_values (private->input_store, NULL, -1,
+                                         INPUT_COLUMN_INDEX, i,
+                                         INPUT_COLUMN_NAME,  name,
+                                         -1);
+    }
+
+  gimp_device_info_editor_set_axes (editor);
+
+  /*  the keys  */
+
+  n_keys = gimp_device_info_get_n_keys (private->info);
+
+  for (i = 0; i < n_keys; i++)
+    {
+      gchar           string[16];
+      guint           keyval;
+      GdkModifierType modifiers;
+
+      g_snprintf (string, sizeof (string), "%d", i + 1);
+
+      gimp_device_info_get_key (private->info, i, &keyval, &modifiers);
+
+      gtk_list_store_insert_with_values (private->key_store, NULL, -1,
+                                         KEY_COLUMN_INDEX, i,
+                                         KEY_COLUMN_NAME,  string,
+                                         KEY_COLUMN_KEY,   keyval,
+                                         KEY_COLUMN_MASK,  modifiers,
+                                         -1);
+    }
+
+  /*  the curves  */
+
+  private->notebook = gtk_notebook_new ();
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_box_pack_start (GTK_BOX (editor), private->notebook, TRUE, TRUE, 0);
+  gtk_widget_show (private->notebook);
+
+  for (i = GDK_AXIS_X; i < GDK_AXIS_LAST; i++)
+    {
+      GtkWidget *frame;
+      GimpCurve *curve;
+      gchar     *title;
+
+      /* e.g. "Pressure Curve" for mapping input device axes */
+      title = g_strdup_printf (_("%s Curve"), gettext (axis_use_strings[i - 1]));
+
+      frame = gimp_frame_new (title);
+      gtk_notebook_append_page (GTK_NOTEBOOK (private->notebook), frame, NULL);
+      gtk_widget_show (frame);
+
+      g_free (title);
+
+      curve = gimp_device_info_get_curve (private->info, i);
+
+      if (curve)
+        {
+          GtkWidget *vbox;
+          GtkWidget *view;
+          GtkWidget *label;
+          GtkWidget *combo;
+          GtkWidget *button;
+
+          vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+          gtk_box_set_spacing (GTK_BOX (vbox), 6);
+          gtk_container_add (GTK_CONTAINER (frame), vbox);
+          gtk_widget_show (vbox);
+
+          frame = gtk_frame_new (NULL);
+          gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+          gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+          gtk_widget_show (frame);
+
+          view = gimp_curve_view_new ();
+          g_object_set (view,
+                        "gimp",         GIMP_TOOL_PRESET (private->info)->gimp,
+                        "border-width", CURVE_BORDER,
+                        NULL);
+          gtk_widget_set_size_request (view,
+                                       CURVE_SIZE + CURVE_BORDER * 2,
+                                       CURVE_SIZE + CURVE_BORDER * 2);
+          gtk_container_add (GTK_CONTAINER (frame), view);
+          gtk_widget_show (view);
+
+          gimp_curve_view_set_curve (GIMP_CURVE_VIEW (view), curve, NULL);
+
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+          gtk_box_set_spacing (GTK_BOX (hbox), 6);
+          gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+          gtk_widget_show (hbox);
+
+          label = gtk_label_new_with_mnemonic (_("Curve _type:"));
+          gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+          gtk_widget_show (label);
+
+          combo = gimp_prop_enum_combo_box_new (G_OBJECT (curve),
+                                                "curve-type", 0, 0);
+          gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (combo),
+                                               "gimp-curve");
+          gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+          gtk_widget_show (combo);
+
+          gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+          button = gtk_button_new_with_mnemonic (_("_Reset Curve"));
+          gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+          gtk_widget_show (button);
+
+          g_signal_connect (button, "clicked",
+                            G_CALLBACK (gimp_device_info_editor_curve_reset),
+                            curve);
+        }
+      else
+        {
+          GtkWidget *label;
+          gchar     *string;
+
+          string = g_strdup_printf (_("The axis '%s' has no curve"),
+                                    gettext (axis_use_strings[i - 1]));
+
+          label = gtk_label_new (string);
+          gtk_container_add (GTK_CONTAINER (frame), label);
+          gtk_widget_show (label);
+
+          g_free (string);
+        }
+    }
+}
+
+static void
+gimp_device_info_editor_finalize (GObject *object)
+{
+  GimpDeviceInfoEditorPrivate *private;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (object);
+
+  g_clear_object (&private->info);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_device_info_editor_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpDeviceInfoEditorPrivate *private;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_INFO:
+      private->info = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_device_info_editor_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpDeviceInfoEditorPrivate *private;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_INFO:
+      g_value_set_object (value, private->info);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_device_info_editor_set_axes (GimpDeviceInfoEditor *editor)
+{
+  GimpDeviceInfoEditorPrivate *private;
+  gint                         n_axes;
+  gint                         i;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
+
+  n_axes = gimp_device_info_get_n_axes (private->info);
+
+  for (i = GDK_AXIS_X; i < GDK_AXIS_LAST; i++)
+    {
+      gchar input_name[16];
+      gint  j;
+
+      for (j = 0; j < n_axes; j++)
+        {
+          if (gimp_device_info_get_axis_use (private->info, j) == i)
+            break;
+        }
+
+      if (j == n_axes)
+        j = -1;
+
+      if (j == -1)
+        g_snprintf (input_name, sizeof (input_name), _("none"));
+      else
+        g_snprintf (input_name, sizeof (input_name), "%d", j + 1);
+
+      gtk_list_store_set (private->axis_store,
+                          &private->axis_iters[i - 1],
+                          AXIS_COLUMN_INPUT_NAME, input_name,
+                          -1);
+    }
+}
+
+static void
+gimp_device_info_editor_axis_changed (GtkCellRendererCombo  *combo,
+                                      const gchar           *path_string,
+                                      GtkTreeIter           *new_iter,
+                                      GimpDeviceInfoEditor  *editor)
+{
+  GimpDeviceInfoEditorPrivate *private;
+  GtkTreePath                 *path;
+  GtkTreeIter                  new_use_iter;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
+
+  path = gtk_tree_path_new_from_string (path_string);
+
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (private->axis_store),
+                               &new_use_iter, path))
+    {
+      GdkAxisUse new_use  = GDK_AXIS_IGNORE;
+      GdkAxisUse old_use  = GDK_AXIS_IGNORE;
+      gint       new_axis = -1;
+      gint       old_axis = -1;
+      gint       n_axes;
+      gint       i;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->axis_store), &new_use_iter,
+                          AXIS_COLUMN_INDEX, &new_use,
+                          -1);
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->input_store), new_iter,
+                          INPUT_COLUMN_INDEX, &new_axis,
+                          -1);
+
+      n_axes = gimp_device_info_get_n_axes (private->info);
+
+      for (i = 0; i < n_axes; i++)
+        if (gimp_device_info_get_axis_use (private->info, i) == new_use)
+          {
+            old_axis = i;
+            break;
+          }
+
+      if (new_axis == old_axis)
+        goto out;
+
+      if (new_axis != -1)
+        old_use = gimp_device_info_get_axis_use (private->info, new_axis);
+
+      /* we must always have an x and a y axis */
+      if ((new_axis == -1 && (new_use == GDK_AXIS_X ||
+                              new_use == GDK_AXIS_Y)) ||
+          (old_axis == -1 && (old_use == GDK_AXIS_X ||
+                              old_use == GDK_AXIS_Y)))
+        {
+          /* do nothing */
+        }
+      else
+        {
+          if (new_axis != -1)
+            gimp_device_info_set_axis_use (private->info, new_axis, new_use);
+
+          if (old_axis != -1)
+            gimp_device_info_set_axis_use (private->info, old_axis, old_use);
+
+          gimp_device_info_editor_set_axes (editor);
+        }
+    }
+
+ out:
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_device_info_editor_axis_selected (GtkTreeSelection     *selection,
+                                       GimpDeviceInfoEditor *editor)
+{
+  GimpDeviceInfoEditorPrivate *private;
+  GtkTreeIter                  iter;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
+
+  if (gtk_tree_selection_get_selected (selection, NULL, &iter))
+    {
+      GdkAxisUse use;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->axis_store), &iter,
+                          AXIS_COLUMN_INDEX, &use,
+                          -1);
+
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (private->notebook),
+                                     use - 1);
+    }
+}
+
+static void
+gimp_device_info_editor_key_edited (GtkCellRendererAccel *accel,
+                                    const char           *path_string,
+                                    guint                 accel_key,
+                                    GdkModifierType       accel_mask,
+                                    guint                 hardware_keycode,
+                                    GimpDeviceInfoEditor *editor)
+{
+  GimpDeviceInfoEditorPrivate *private;
+  GtkTreePath                 *path;
+  GtkTreeIter                  iter;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
+
+  path = gtk_tree_path_new_from_string (path_string);
+
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (private->key_store), &iter, path))
+    {
+      gint index;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->key_store), &iter,
+                          KEY_COLUMN_INDEX, &index,
+                          -1);
+
+      gtk_list_store_set (private->key_store, &iter,
+                          KEY_COLUMN_KEY,  accel_key,
+                          KEY_COLUMN_MASK, accel_mask,
+                          -1);
+
+      gimp_device_info_set_key (private->info, index, accel_key, accel_mask);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_device_info_editor_key_cleared (GtkCellRendererAccel *accel,
+                                     const char           *path_string,
+                                     GimpDeviceInfoEditor *editor)
+{
+  GimpDeviceInfoEditorPrivate *private;
+  GtkTreePath                 *path;
+  GtkTreeIter                  iter;
+
+  private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
+
+  path = gtk_tree_path_new_from_string (path_string);
+
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (private->key_store), &iter, path))
+    {
+      gint index;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (private->key_store), &iter,
+                          KEY_COLUMN_INDEX, &index,
+                          -1);
+
+      gtk_list_store_set (private->key_store, &iter,
+                          KEY_COLUMN_KEY,  0,
+                          KEY_COLUMN_MASK, 0,
+                          -1);
+
+      gimp_device_info_set_key (private->info, index, 0, 0);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_device_info_editor_curve_reset (GtkWidget *button,
+                                     GimpCurve *curve)
+{
+  gimp_curve_reset (curve, TRUE);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_device_info_editor_new (GimpDeviceInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_INFO (info), NULL);
+
+  return g_object_new (GIMP_TYPE_DEVICE_INFO_EDITOR,
+                       "info", info,
+                       NULL);
+}
diff --git a/app/widgets/gimpdeviceinfoeditor.h b/app/widgets/gimpdeviceinfoeditor.h
new file mode 100644
index 0000000..85fafc7
--- /dev/null
+++ b/app/widgets/gimpdeviceinfoeditor.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdeviceinfoeditor.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICE_INFO_EDITOR_H__
+#define __GIMP_DEVICE_INFO_EDITOR_H__
+
+
+#define GIMP_TYPE_DEVICE_INFO_EDITOR            (gimp_device_info_editor_get_type ())
+#define GIMP_DEVICE_INFO_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_INFO_EDITOR, GimpDeviceInfoEditor))
+#define GIMP_DEVICE_INFO_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_INFO_EDITOR, GimpDeviceInfoEditorClass))
+#define GIMP_IS_DEVICE_INFO_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DEVICE_INFO_EDITOR))
+#define GIMP_IS_DEVICE_INFO_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DEVICE_INFO_EDITOR))
+#define GIMP_DEVICE_INFO_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DEVICE_INFO_EDITOR, GimpDeviceInfoEditorClass))
+
+
+typedef struct _GimpDeviceInfoEditorClass GimpDeviceInfoEditorClass;
+
+struct _GimpDeviceInfoEditor
+{
+  GtkBox  parent_instance;
+};
+
+struct _GimpDeviceInfoEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_device_info_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_device_info_editor_new      (GimpDeviceInfo *info);
+
+
+#endif /* __GIMP_DEVICE_INFO_EDITOR_H__ */
diff --git a/app/widgets/gimpdevicemanager.c b/app/widgets/gimpdevicemanager.c
new file mode 100644
index 0000000..7051de7
--- /dev/null
+++ b/app/widgets/gimpdevicemanager.c
@@ -0,0 +1,547 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdevicemanager.c
+ * Copyright (C) 2011 Michael Natterer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#undef GSEAL_ENABLE
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "config/gimpconfig-utils.h"
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptoolinfo.h"
+
+#include "gimpdeviceinfo.h"
+#include "gimpdevicemanager.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_CURRENT_DEVICE
+};
+
+
+
+struct _GimpDeviceManagerPrivate
+{
+  Gimp           *gimp;
+  GHashTable     *displays;
+  GimpDeviceInfo *current_device;
+  GimpToolInfo   *active_tool;
+};
+
+#define GET_PRIVATE(obj) (((GimpDeviceManager *) (obj))->priv)
+
+
+static void   gimp_device_manager_constructed     (GObject           *object);
+static void   gimp_device_manager_dispose         (GObject           *object);
+static void   gimp_device_manager_finalize        (GObject           *object);
+static void   gimp_device_manager_set_property    (GObject           *object,
+                                                   guint              property_id,
+                                                   const GValue      *value,
+                                                   GParamSpec        *pspec);
+static void   gimp_device_manager_get_property    (GObject           *object,
+                                                   guint              property_id,
+                                                   GValue            *value,
+                                                   GParamSpec        *pspec);
+
+static void   gimp_device_manager_display_opened  (GdkDisplayManager *disp_manager,
+                                                   GdkDisplay        *display,
+                                                   GimpDeviceManager *manager);
+static void   gimp_device_manager_display_closed  (GdkDisplay        *display,
+                                                   gboolean           is_error,
+                                                   GimpDeviceManager *manager);
+
+static void   gimp_device_manager_device_added    (GdkDisplay        *gdk_display,
+                                                   GdkDevice         *device,
+                                                   GimpDeviceManager *manager);
+static void   gimp_device_manager_device_removed  (GdkDisplay        *gdk_display,
+                                                   GdkDevice         *device,
+                                                   GimpDeviceManager *manager);
+
+static void   gimp_device_manager_config_notify   (GimpGuiConfig     *config,
+                                                   const GParamSpec  *pspec,
+                                                   GimpDeviceManager *manager);
+
+static void   gimp_device_manager_tool_changed    (GimpContext       *user_context,
+                                                   GimpToolInfo      *tool_info,
+                                                   GimpDeviceManager *manager);
+
+static void   gimp_device_manager_connect_tool    (GimpDeviceManager *manager);
+static void   gimp_device_manager_disconnect_tool (GimpDeviceManager *manager);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDeviceManager, gimp_device_manager,
+                            GIMP_TYPE_LIST)
+
+#define parent_class gimp_device_manager_parent_class
+
+
+static void
+gimp_device_manager_class_init (GimpDeviceManagerClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed        = gimp_device_manager_constructed;
+  object_class->dispose            = gimp_device_manager_dispose;
+  object_class->finalize           = gimp_device_manager_finalize;
+  object_class->set_property       = gimp_device_manager_set_property;
+  object_class->get_property       = gimp_device_manager_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_STATIC_STRINGS |
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CURRENT_DEVICE,
+                                   g_param_spec_object ("current-device",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DEVICE_INFO,
+                                                        GIMP_PARAM_STATIC_STRINGS |
+                                                        G_PARAM_READABLE));
+}
+
+static void
+gimp_device_manager_init (GimpDeviceManager *manager)
+{
+  manager->priv = gimp_device_manager_get_instance_private (manager);
+
+  manager->priv->displays = g_hash_table_new_full (g_str_hash,
+                                                   g_str_equal,
+                                                   g_free, NULL);
+}
+
+static void
+gimp_device_manager_constructed (GObject *object)
+{
+  GimpDeviceManager        *manager = GIMP_DEVICE_MANAGER (object);
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (object);
+  GdkDisplayManager        *disp_manager;
+  GSList                   *displays;
+  GSList                   *list;
+  GdkDisplay               *display;
+  GimpDeviceInfo           *device_info;
+  GimpContext              *user_context;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (private->gimp));
+
+  disp_manager = gdk_display_manager_get ();
+
+  displays = gdk_display_manager_list_displays (disp_manager);
+
+  /*  present displays in the order in which they were opened  */
+  displays = g_slist_reverse (displays);
+
+  for (list = displays; list; list = g_slist_next (list))
+    {
+      gimp_device_manager_display_opened (disp_manager, list->data, manager);
+    }
+
+  g_slist_free (displays);
+
+  g_signal_connect (disp_manager, "display-opened",
+                    G_CALLBACK (gimp_device_manager_display_opened),
+                    manager);
+
+  display = gdk_display_get_default ();
+
+  device_info =
+    gimp_device_info_get_by_device (gdk_display_get_core_pointer (display));
+
+  gimp_device_manager_set_current_device (manager, device_info);
+
+  g_signal_connect_object (private->gimp->config, "notify::devices-share-tool",
+                           G_CALLBACK (gimp_device_manager_config_notify),
+                           manager, 0);
+
+  user_context = gimp_get_user_context (private->gimp);
+
+  g_signal_connect_object (user_context, "tool-changed",
+                           G_CALLBACK (gimp_device_manager_tool_changed),
+                           manager, 0);
+}
+
+static void
+gimp_device_manager_dispose (GObject *object)
+{
+  GimpDeviceManager *manager = GIMP_DEVICE_MANAGER (object);
+
+  gimp_device_manager_disconnect_tool (manager);
+
+  g_signal_handlers_disconnect_by_func (gdk_display_manager_get (),
+                                        gimp_device_manager_display_opened,
+                                        object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_device_manager_finalize (GObject *object)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->displays, g_hash_table_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_device_manager_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_device_manager_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    case PROP_CURRENT_DEVICE:
+      g_value_set_object (value, private->current_device);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GimpDeviceManager *
+gimp_device_manager_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_DEVICE_MANAGER,
+                       "gimp",          gimp,
+                       "children-type", GIMP_TYPE_DEVICE_INFO,
+                       "policy",        GIMP_CONTAINER_POLICY_STRONG,
+                       "unique-names",  TRUE,
+                       "sort-func",     gimp_device_info_compare,
+                       NULL);
+}
+
+GimpDeviceInfo *
+gimp_device_manager_get_current_device (GimpDeviceManager *manager)
+{
+  g_return_val_if_fail (GIMP_IS_DEVICE_MANAGER (manager), NULL);
+
+  return GET_PRIVATE (manager)->current_device;
+}
+
+void
+gimp_device_manager_set_current_device (GimpDeviceManager *manager,
+                                        GimpDeviceInfo    *info)
+{
+  GimpDeviceManagerPrivate *private;
+  GimpGuiConfig            *config;
+
+  g_return_if_fail (GIMP_IS_DEVICE_MANAGER (manager));
+  g_return_if_fail (GIMP_IS_DEVICE_INFO (info));
+
+  private = GET_PRIVATE (manager);
+
+  config = GIMP_GUI_CONFIG (private->gimp->config);
+
+  if (! config->devices_share_tool && private->current_device)
+    {
+      gimp_device_manager_disconnect_tool (manager);
+    }
+
+  private->current_device = info;
+
+  if (! config->devices_share_tool && private->current_device)
+    {
+      GimpContext *user_context = gimp_get_user_context (private->gimp);
+
+      g_signal_handlers_block_by_func (user_context,
+                                       gimp_device_manager_tool_changed,
+                                       manager);
+
+      gimp_device_info_restore_tool (private->current_device);
+
+      g_signal_handlers_unblock_by_func (user_context,
+                                         gimp_device_manager_tool_changed,
+                                         manager);
+
+      private->active_tool = gimp_context_get_tool (user_context);
+      gimp_device_manager_connect_tool (manager);
+    }
+
+  g_object_notify (G_OBJECT (manager), "current-device");
+}
+
+
+/*  private functions  */
+
+static void
+gimp_device_manager_display_opened (GdkDisplayManager *disp_manager,
+                                    GdkDisplay        *gdk_display,
+                                    GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GList                    *list;
+  const gchar              *display_name;
+  gint                      count;
+
+  display_name = gdk_display_get_name (gdk_display);
+
+  count = GPOINTER_TO_INT (g_hash_table_lookup (private->displays,
+                                                display_name));
+
+  g_hash_table_insert (private->displays, g_strdup (display_name),
+                       GINT_TO_POINTER (count + 1));
+
+  /*  don't add the same display twice  */
+  if (count > 0)
+    return;
+
+  /*  create device info structures for present devices */
+  for (list = gdk_display_list_devices (gdk_display); list; list = list->next)
+    {
+      GdkDevice *device = list->data;
+
+      gimp_device_manager_device_added (gdk_display, device, manager);
+    }
+
+  g_signal_connect (gdk_display, "closed",
+                    G_CALLBACK (gimp_device_manager_display_closed),
+                    manager);
+}
+
+static void
+gimp_device_manager_display_closed (GdkDisplay        *gdk_display,
+                                    gboolean           is_error,
+                                    GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GList                    *list;
+  const gchar              *display_name;
+  gint                      count;
+
+  display_name = gdk_display_get_name (gdk_display);
+
+  count = GPOINTER_TO_INT (g_hash_table_lookup (private->displays,
+                                                display_name));
+
+  /*  don't remove the same display twice  */
+  if (count > 1)
+    {
+      g_hash_table_insert (private->displays, g_strdup (display_name),
+                           GINT_TO_POINTER (count - 1));
+      return;
+    }
+
+  g_hash_table_remove (private->displays, display_name);
+
+  for (list = gdk_display_list_devices (gdk_display); list; list = list->next)
+    {
+      GdkDevice *device = list->data;
+
+      gimp_device_manager_device_removed (gdk_display, device, manager);
+    }
+}
+
+static void
+gimp_device_manager_device_added (GdkDisplay        *gdk_display,
+                                  GdkDevice         *device,
+                                  GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GimpDeviceInfo           *device_info;
+
+  device_info =
+    GIMP_DEVICE_INFO (gimp_container_get_child_by_name (GIMP_CONTAINER (manager),
+                                                        device->name));
+
+  if (device_info)
+    {
+      gimp_device_info_set_device (device_info, device, gdk_display);
+    }
+  else
+    {
+      device_info = gimp_device_info_new (private->gimp, device, gdk_display);
+
+      gimp_device_info_set_default_tool (device_info);
+
+      gimp_container_add (GIMP_CONTAINER (manager), GIMP_OBJECT (device_info));
+      g_object_unref (device_info);
+    }
+}
+
+static void
+gimp_device_manager_device_removed (GdkDisplay        *gdk_display,
+                                    GdkDevice         *device,
+                                    GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GimpDeviceInfo           *device_info;
+
+  device_info =
+    GIMP_DEVICE_INFO (gimp_container_get_child_by_name (GIMP_CONTAINER (manager),
+                                                        device->name));
+
+  if (device_info)
+    {
+      gimp_device_info_set_device (device_info, NULL, NULL);
+
+      if (device_info == private->current_device)
+        {
+          device      = gdk_display_get_core_pointer (gdk_display);
+          device_info = gimp_device_info_get_by_device (device);
+
+          gimp_device_manager_set_current_device (manager, device_info);
+        }
+    }
+}
+
+static void
+gimp_device_manager_config_notify (GimpGuiConfig     *config,
+                                   const GParamSpec  *pspec,
+                                   GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GimpDeviceInfo           *current_device;
+
+  current_device = gimp_device_manager_get_current_device (manager);
+
+  if (config->devices_share_tool)
+    {
+      gimp_device_manager_disconnect_tool (manager);
+      gimp_device_info_save_tool (current_device);
+    }
+  else
+    {
+      GimpContext *user_context = gimp_get_user_context (private->gimp);
+
+      g_signal_handlers_block_by_func (user_context,
+                                       gimp_device_manager_tool_changed,
+                                       manager);
+
+      gimp_device_info_restore_tool (private->current_device);
+
+      g_signal_handlers_unblock_by_func (user_context,
+                                         gimp_device_manager_tool_changed,
+                                         manager);
+
+      private->active_tool = gimp_context_get_tool (user_context);
+      gimp_device_manager_connect_tool (manager);
+    }
+}
+
+static void
+gimp_device_manager_tool_changed (GimpContext       *user_context,
+                                  GimpToolInfo      *tool_info,
+                                  GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GimpGuiConfig            *config;
+
+  config = GIMP_GUI_CONFIG (private->gimp->config);
+
+  if (! config->devices_share_tool)
+    {
+      gimp_device_manager_disconnect_tool (manager);
+    }
+
+  private->active_tool = tool_info;
+
+  if (! config->devices_share_tool)
+    {
+      gimp_device_info_save_tool (private->current_device);
+      gimp_device_manager_connect_tool (manager);
+    }
+}
+
+static void
+gimp_device_manager_connect_tool (GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GimpGuiConfig            *config;
+
+  config = GIMP_GUI_CONFIG (private->gimp->config);
+
+  if (! config->devices_share_tool &&
+      private->active_tool && private->current_device)
+    {
+      GimpToolPreset *preset = GIMP_TOOL_PRESET (private->current_device);
+
+      gimp_config_connect (G_OBJECT (private->active_tool->tool_options),
+                           G_OBJECT (preset->tool_options),
+                           NULL);
+    }
+}
+
+static void
+gimp_device_manager_disconnect_tool (GimpDeviceManager *manager)
+{
+  GimpDeviceManagerPrivate *private = GET_PRIVATE (manager);
+  GimpGuiConfig            *config;
+
+  config = GIMP_GUI_CONFIG (private->gimp->config);
+
+  if (! config->devices_share_tool &&
+      private->active_tool && private->current_device)
+    {
+      GimpToolPreset *preset = GIMP_TOOL_PRESET (private->current_device);
+
+      gimp_config_disconnect (G_OBJECT (private->active_tool->tool_options),
+                              G_OBJECT (preset->tool_options));
+    }
+}
diff --git a/app/widgets/gimpdevicemanager.h b/app/widgets/gimpdevicemanager.h
new file mode 100644
index 0000000..23953ed
--- /dev/null
+++ b/app/widgets/gimpdevicemanager.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdevicemanager.h
+ * Copyright (C) 2011 Michael Natterer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICE_MANAGER_H__
+#define __GIMP_DEVICE_MANAGER_H__
+
+
+#include "core/gimplist.h"
+
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_DEVICE_MANAGER            (gimp_device_manager_get_type ())
+#define GIMP_DEVICE_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_MANAGER, GimpDeviceManager))
+#define GIMP_DEVICE_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_MANAGER, GimpDeviceManagerClass))
+#define GIMP_IS_DEVICE_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DEVICE_MANAGER))
+#define GIMP_IS_DEVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DEVICE_MANAGER))
+#define GIMP_DEVICE_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DEVICE_MANAGER, GimpDeviceManagerClass))
+
+
+typedef struct _GimpDeviceManagerPrivate GimpDeviceManagerPrivate;
+typedef struct _GimpDeviceManagerClass   GimpDeviceManagerClass;
+
+struct _GimpDeviceManager
+{
+  GimpList                  parent_instance;
+
+  GimpDeviceManagerPrivate *priv;
+};
+
+struct _GimpDeviceManagerClass
+{
+  GimpListClass  parent_class;
+};
+
+
+GType               gimp_device_manager_get_type           (void) G_GNUC_CONST;
+
+GimpDeviceManager * gimp_device_manager_new                (Gimp *gimp);
+
+GimpDeviceInfo    * gimp_device_manager_get_current_device (GimpDeviceManager *manager);
+void                gimp_device_manager_set_current_device (GimpDeviceManager *manager,
+                                                            GimpDeviceInfo    *info);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_DEVICE_MANAGER_H__ */
diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c
new file mode 100644
index 0000000..22c691e
--- /dev/null
+++ b/app/widgets/gimpdevices.c
@@ -0,0 +1,343 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpbase/gimpbase.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimperror.h"
+#include "core/gimpgradient.h"
+#include "core/gimplist.h"
+#include "core/gimppattern.h"
+#include "core/gimptoolinfo.h"
+
+#include "gimpdeviceinfo.h"
+#include "gimpdevicemanager.h"
+#include "gimpdevices.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_DEVICE_MANAGER_DATA_KEY "gimp-device-manager"
+
+
+static gboolean devicerc_deleted = FALSE;
+
+
+/*  public functions  */
+
+void
+gimp_devices_init (Gimp *gimp)
+{
+  GimpDeviceManager *manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  manager = g_object_get_data (G_OBJECT (gimp), GIMP_DEVICE_MANAGER_DATA_KEY);
+
+  g_return_if_fail (manager == NULL);
+
+  manager = gimp_device_manager_new (gimp);
+
+  g_object_set_data_full (G_OBJECT (gimp),
+                          GIMP_DEVICE_MANAGER_DATA_KEY, manager,
+                          (GDestroyNotify) g_object_unref);
+}
+
+void
+gimp_devices_exit (Gimp *gimp)
+{
+  GimpDeviceManager *manager;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  manager = gimp_devices_get_manager (gimp);
+
+  g_return_if_fail (GIMP_IS_DEVICE_MANAGER (manager));
+
+  g_object_set_data (G_OBJECT (gimp), GIMP_DEVICE_MANAGER_DATA_KEY, NULL);
+}
+
+void
+gimp_devices_restore (Gimp *gimp)
+{
+  GimpDeviceManager *manager;
+  GList             *list;
+  GFile             *file;
+  GError            *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  manager = gimp_devices_get_manager (gimp);
+
+  g_return_if_fail (GIMP_IS_DEVICE_MANAGER (manager));
+
+  for (list = GIMP_LIST (manager)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpDeviceInfo *device_info = list->data;
+
+      gimp_device_info_save_tool (device_info);
+      gimp_device_info_set_default_tool (device_info);
+    }
+
+  file = gimp_directory_file ("devicerc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! gimp_config_deserialize_gfile (GIMP_CONFIG (manager),
+                                       file,
+                                       gimp,
+                                       &error))
+    {
+      if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
+        gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+
+      g_error_free (error);
+      /* don't bail out here */
+    }
+
+  g_object_unref (file);
+
+  for (list = GIMP_LIST (manager)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      GimpDeviceInfo *device_info = list->data;
+
+      if (! GIMP_TOOL_PRESET (device_info)->tool_options)
+        {
+          gimp_device_info_save_tool (device_info);
+
+          g_printerr ("%s: set default tool on loaded GimpDeviceInfo without tool options: %s\n",
+                      G_STRFUNC, gimp_object_get_name (device_info));
+        }
+    }
+
+  if (! GIMP_GUI_CONFIG (gimp->config)->devices_share_tool)
+    {
+      GimpDeviceInfo *current_device;
+
+      current_device = gimp_device_manager_get_current_device (manager);
+
+      gimp_device_info_restore_tool (current_device);
+    }
+}
+
+void
+gimp_devices_save (Gimp     *gimp,
+                   gboolean  always_save)
+{
+  GimpDeviceManager *manager;
+  GFile             *file;
+  GError            *error = NULL;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  manager = gimp_devices_get_manager (gimp);
+
+  g_return_if_fail (GIMP_IS_DEVICE_MANAGER (manager));
+
+  if (devicerc_deleted && ! always_save)
+    return;
+
+  file = gimp_directory_file ("devicerc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  if (! GIMP_GUI_CONFIG (gimp->config)->devices_share_tool)
+    {
+      GimpDeviceInfo *current_device;
+
+      current_device = gimp_device_manager_get_current_device (manager);
+
+      gimp_device_info_save_tool (current_device);
+    }
+
+  if (! gimp_config_serialize_to_gfile (GIMP_CONFIG (manager),
+                                        file,
+                                        "GIMP devicerc",
+                                        "end of devicerc",
+                                        NULL,
+                                        &error))
+    {
+      gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+      g_error_free (error);
+    }
+
+  g_object_unref (file);
+
+  devicerc_deleted = FALSE;
+}
+
+gboolean
+gimp_devices_clear (Gimp    *gimp,
+                    GError **error)
+{
+  GimpDeviceManager *manager;
+  GFile             *file;
+  GError            *my_error = NULL;
+  gboolean           success  = TRUE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  manager = gimp_devices_get_manager (gimp);
+
+  g_return_val_if_fail (GIMP_IS_DEVICE_MANAGER (manager), FALSE);
+
+  file = gimp_directory_file ("devicerc", NULL);
+
+  if (! g_file_delete (file, NULL, &my_error) &&
+      my_error->code != G_IO_ERROR_NOT_FOUND)
+    {
+      success = FALSE;
+
+      g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                   _("Deleting \"%s\" failed: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+    }
+  else
+    {
+      devicerc_deleted = TRUE;
+    }
+
+  g_clear_error (&my_error);
+  g_object_unref (file);
+
+  return success;
+}
+
+GimpDeviceManager *
+gimp_devices_get_manager (Gimp *gimp)
+{
+  GimpDeviceManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = g_object_get_data (G_OBJECT (gimp), GIMP_DEVICE_MANAGER_DATA_KEY);
+
+  g_return_val_if_fail (GIMP_IS_DEVICE_MANAGER (manager), NULL);
+
+  return manager;
+}
+
+void
+gimp_devices_add_widget (Gimp      *gimp,
+                         GtkWidget *widget)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gtk_widget_set_extension_events (widget, GDK_EXTENSION_EVENTS_ALL);
+
+  g_signal_connect (widget, "motion-notify-event",
+                    G_CALLBACK (gimp_devices_check_callback),
+                    gimp);
+}
+
+gboolean
+gimp_devices_check_callback (GtkWidget *widget,
+                             GdkEvent  *event,
+                             Gimp      *gimp)
+{
+  g_return_val_if_fail (event != NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  if (! gimp->busy)
+    gimp_devices_check_change (gimp, event);
+
+  return FALSE;
+}
+
+gboolean
+gimp_devices_check_change (Gimp     *gimp,
+                           GdkEvent *event)
+{
+  GimpDeviceManager *manager;
+  GdkDevice         *device;
+  GimpDeviceInfo    *device_info;
+  GtkWidget         *source;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  manager = gimp_devices_get_manager (gimp);
+
+  g_return_val_if_fail (GIMP_IS_DEVICE_MANAGER (manager), FALSE);
+
+  /* It is possible that the event was propagated from a widget that does not
+     want extension events and therefore always sends core pointer events.
+     This can cause a false switch to the core pointer device. */
+
+  source = gtk_get_event_widget (event);
+
+  if (source &&
+      gtk_widget_get_extension_events (source) == GDK_EXTENSION_EVENTS_NONE)
+    return FALSE;
+
+  switch (event->type)
+    {
+    case GDK_MOTION_NOTIFY:
+      device = ((GdkEventMotion *) event)->device;
+      break;
+
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      device = ((GdkEventButton *) event)->device;
+      break;
+
+    case GDK_PROXIMITY_IN:
+    case GDK_PROXIMITY_OUT:
+      device = ((GdkEventProximity *) event)->device;
+      break;
+
+    case GDK_SCROLL:
+      device = ((GdkEventScroll *) event)->device;
+      break;
+
+    default:
+      device = gimp_device_manager_get_current_device (manager)->device;
+      break;
+    }
+
+  device_info = gimp_device_info_get_by_device (device);
+
+  if (device_info != gimp_device_manager_get_current_device (manager))
+    {
+      gimp_device_manager_set_current_device (manager, device_info);
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpdevices.h b/app/widgets/gimpdevices.h
new file mode 100644
index 0000000..de31289
--- /dev/null
+++ b/app/widgets/gimpdevices.h
@@ -0,0 +1,44 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICES_H__
+#define __GIMP_DEVICES_H__
+
+
+void                gimp_devices_init           (Gimp      *gimp);
+void                gimp_devices_exit           (Gimp      *gimp);
+
+void                gimp_devices_restore        (Gimp      *gimp);
+void                gimp_devices_save           (Gimp      *gimp,
+                                                 gboolean   always_save);
+
+gboolean            gimp_devices_clear          (Gimp      *gimp,
+                                                 GError   **error);
+
+GimpDeviceManager * gimp_devices_get_manager    (Gimp      *gimp);
+
+void                gimp_devices_add_widget     (Gimp      *gimp,
+                                                 GtkWidget *widget);
+
+gboolean            gimp_devices_check_callback (GtkWidget *widget,
+                                                 GdkEvent  *event,
+                                                 Gimp      *gimp);
+gboolean            gimp_devices_check_change   (Gimp      *gimp,
+                                                 GdkEvent  *event);
+
+
+#endif /* __GIMP_DEVICES_H__ */
diff --git a/app/widgets/gimpdevicestatus.c b/app/widgets/gimpdevicestatus.c
new file mode 100644
index 0000000..c8064a4
--- /dev/null
+++ b/app/widgets/gimpdevicestatus.c
@@ -0,0 +1,586 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdevicestatus.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#undef GSEAL_ENABLE
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+#include "core/gimplist.h"
+#include "core/gimppattern.h"
+#include "core/gimptoolinfo.h"
+
+#include "gimpdnd.h"
+#include "gimpdeviceinfo.h"
+#include "gimpdevicemanager.h"
+#include "gimpdevices.h"
+#include "gimpdevicestatus.h"
+#include "gimpdialogfactory.h"
+#include "gimppropwidgets.h"
+#include "gimpview.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+
+
+#define CELL_SIZE 20 /* The size of the view cells */
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+
+struct _GimpDeviceStatusEntry
+{
+  GimpDeviceInfo  *device_info;
+  GimpContext     *context;
+  GimpToolOptions *tool_options;
+
+  GtkWidget       *ebox;
+  GtkWidget       *options_hbox;
+  GtkWidget       *tool;
+  GtkWidget       *foreground;
+  GtkWidget       *foreground_none;
+  GtkWidget       *background;
+  GtkWidget       *background_none;
+  GtkWidget       *brush;
+  GtkWidget       *brush_none;
+  GtkWidget       *pattern;
+  GtkWidget       *pattern_none;
+  GtkWidget       *gradient;
+  GtkWidget       *gradient_none;
+};
+
+
+static void gimp_device_status_constructed     (GObject               *object);
+static void gimp_device_status_dispose         (GObject               *object);
+static void gimp_device_status_set_property    (GObject               *object,
+                                                guint                  property_id,
+                                                const GValue          *value,
+                                                GParamSpec            *pspec);
+
+static void gimp_device_status_device_add      (GimpContainer         *devices,
+                                                GimpDeviceInfo        *device_info,
+                                                GimpDeviceStatus      *status);
+static void gimp_device_status_device_remove   (GimpContainer         *devices,
+                                                GimpDeviceInfo        *device_info,
+                                                GimpDeviceStatus      *status);
+
+static void gimp_device_status_notify_device   (GimpDeviceManager     *manager,
+                                                const GParamSpec      *pspec,
+                                                GimpDeviceStatus      *status);
+static void gimp_device_status_config_notify   (GimpGuiConfig         *config,
+                                                const GParamSpec      *pspec,
+                                                GimpDeviceStatus      *status);
+static void gimp_device_status_notify_info     (GimpDeviceInfo        *device_info,
+                                                const GParamSpec      *pspec,
+                                                GimpDeviceStatusEntry *entry);
+static void gimp_device_status_save_clicked    (GtkWidget             *button,
+                                                GimpDeviceStatus      *status);
+static void gimp_device_status_view_clicked    (GtkWidget             *widget,
+                                                GdkModifierType        state,
+                                                const gchar           *identifier);
+
+
+G_DEFINE_TYPE (GimpDeviceStatus, gimp_device_status, GIMP_TYPE_EDITOR)
+
+#define parent_class gimp_device_status_parent_class
+
+
+static void
+gimp_device_status_class_init (GimpDeviceStatusClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_device_status_constructed;
+  object_class->dispose      = gimp_device_status_dispose;
+  object_class->set_property = gimp_device_status_set_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_device_status_init (GimpDeviceStatus *status)
+{
+  status->gimp           = NULL;
+  status->current_device = NULL;
+
+  status->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (status->vbox), 2);
+  gtk_box_pack_start (GTK_BOX (status), status->vbox, TRUE, TRUE, 0);
+  gtk_widget_show (status->vbox);
+
+  status->save_button =
+    gimp_editor_add_button (GIMP_EDITOR (status), GIMP_ICON_DOCUMENT_SAVE,
+                            _("Save device status"), NULL,
+                            G_CALLBACK (gimp_device_status_save_clicked),
+                            NULL,
+                            G_OBJECT (status));
+}
+
+static void
+gimp_device_status_constructed (GObject *object)
+{
+  GimpDeviceStatus *status = GIMP_DEVICE_STATUS (object);
+  GimpContainer    *devices;
+  GList            *list;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (status->gimp));
+
+  devices = GIMP_CONTAINER (gimp_devices_get_manager (status->gimp));
+
+  for (list = GIMP_LIST (devices)->queue->head; list; list = list->next)
+    gimp_device_status_device_add (devices, list->data, status);
+
+  g_signal_connect_object (devices, "add",
+                           G_CALLBACK (gimp_device_status_device_add),
+                           status, 0);
+  g_signal_connect_object (devices, "remove",
+                           G_CALLBACK (gimp_device_status_device_remove),
+                           status, 0);
+
+  g_signal_connect (devices, "notify::current-device",
+                    G_CALLBACK (gimp_device_status_notify_device),
+                    status);
+
+  gimp_device_status_notify_device (GIMP_DEVICE_MANAGER (devices), NULL, status);
+
+  g_signal_connect_object (status->gimp->config, "notify::devices-share-tool",
+                           G_CALLBACK (gimp_device_status_config_notify),
+                           status, 0);
+
+  gimp_device_status_config_notify (GIMP_GUI_CONFIG (status->gimp->config),
+                                    NULL, status);
+}
+
+static void
+gimp_device_status_dispose (GObject *object)
+{
+  GimpDeviceStatus *status = GIMP_DEVICE_STATUS (object);
+
+  if (status->devices)
+    {
+      GList *list;
+
+      for (list = status->devices; list; list = list->next)
+        {
+          GimpDeviceStatusEntry *entry = list->data;
+
+          g_signal_handlers_disconnect_by_func (entry->device_info,
+                                                gimp_device_status_notify_info,
+                                                entry);
+
+          g_object_unref (entry->context);
+          g_slice_free (GimpDeviceStatusEntry, entry);
+        }
+
+      g_list_free (status->devices);
+      status->devices = NULL;
+
+      g_signal_handlers_disconnect_by_func (gimp_devices_get_manager (status->gimp),
+                                            gimp_device_status_notify_device,
+                                            status);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_device_status_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpDeviceStatus *status = GIMP_DEVICE_STATUS (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      status->gimp = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+pack_prop_widget (GtkBox     *hbox,
+                  GtkWidget  *widget,
+                  GtkWidget **none_widget)
+{
+  GtkSizeGroup *size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+  gtk_size_group_add_widget (size_group, widget);
+  gtk_widget_show (widget);
+
+  *none_widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), *none_widget, FALSE, FALSE, 0);
+  gtk_size_group_add_widget (size_group, *none_widget);
+
+  g_object_unref (size_group);
+}
+
+static void
+gimp_device_status_device_add (GimpContainer    *devices,
+                               GimpDeviceInfo   *device_info,
+                               GimpDeviceStatus *status)
+{
+  GimpDeviceStatusEntry *entry;
+  GClosure              *closure;
+  GParamSpec            *pspec;
+  GtkWidget             *vbox;
+  GtkWidget             *hbox;
+  GtkWidget             *label;
+  gchar                 *name;
+
+  entry = g_slice_new0 (GimpDeviceStatusEntry);
+
+  status->devices = g_list_prepend (status->devices, entry);
+
+  entry->device_info = device_info;
+  entry->context     = gimp_context_new (GIMP_TOOL_PRESET (device_info)->gimp,
+                                         gimp_object_get_name (device_info),
+                                         NULL);
+
+  gimp_context_define_properties (entry->context,
+                                  GIMP_CONTEXT_PROP_MASK_TOOL       |
+                                  GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                                  GIMP_CONTEXT_PROP_MASK_BACKGROUND |
+                                  GIMP_CONTEXT_PROP_MASK_BRUSH      |
+                                  GIMP_CONTEXT_PROP_MASK_PATTERN    |
+                                  GIMP_CONTEXT_PROP_MASK_GRADIENT,
+                                  FALSE);
+
+  closure = g_cclosure_new (G_CALLBACK (gimp_device_status_notify_info),
+                            entry, NULL);
+  g_object_watch_closure (G_OBJECT (status), closure);
+  g_signal_connect_closure (device_info, "notify", closure,
+                            FALSE);
+
+  entry->ebox = gtk_event_box_new ();
+  gtk_box_pack_start (GTK_BOX (status->vbox), entry->ebox,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (entry->ebox);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  gtk_container_add (GTK_CONTAINER (entry->ebox), vbox);
+  gtk_widget_show (vbox);
+
+  /*  the device name  */
+
+  if (device_info->display == NULL ||
+      device_info->display == gdk_display_get_default ())
+    name = g_strdup (gimp_object_get_name (device_info));
+  else
+    name = g_strdup_printf ("%s (%s)",
+                            gimp_object_get_name (device_info),
+                            gdk_display_get_name (device_info->display));
+
+  label = gtk_label_new (name);
+  g_free (name);
+
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  /*  the row of properties  */
+
+  hbox = entry->options_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /*  the tool  */
+
+  entry->tool = gimp_prop_view_new (G_OBJECT (entry->context), "tool",
+                                    entry->context, CELL_SIZE);
+  gtk_box_pack_start (GTK_BOX (hbox), entry->tool, FALSE, FALSE, 0);
+  gtk_widget_show (entry->tool);
+
+  /*  the foreground color  */
+
+  entry->foreground = gimp_prop_color_area_new (G_OBJECT (entry->context),
+                                                "foreground",
+                                                CELL_SIZE, CELL_SIZE,
+                                                GIMP_COLOR_AREA_FLAT);
+  gtk_widget_add_events (entry->foreground,
+                         GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+  pack_prop_widget (GTK_BOX (hbox), entry->foreground, &entry->foreground_none);
+
+  /*  the background color  */
+
+  entry->background = gimp_prop_color_area_new (G_OBJECT (entry->context),
+                                                "background",
+                                                CELL_SIZE, CELL_SIZE,
+                                                GIMP_COLOR_AREA_FLAT);
+  gtk_widget_add_events (entry->background,
+                         GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+  pack_prop_widget (GTK_BOX (hbox), entry->background, &entry->background_none);
+
+  /*  the brush  */
+
+  entry->brush = gimp_prop_view_new (G_OBJECT (entry->context), "brush",
+                                     entry->context, CELL_SIZE);
+  GIMP_VIEW (entry->brush)->clickable  = TRUE;
+  GIMP_VIEW (entry->brush)->show_popup = TRUE;
+  pack_prop_widget (GTK_BOX (hbox), entry->brush, &entry->brush_none);
+
+  g_signal_connect (entry->brush, "clicked",
+                    G_CALLBACK (gimp_device_status_view_clicked),
+                    "gimp-brush-grid|gimp-brush-list");
+
+  /*  the pattern  */
+
+  entry->pattern = gimp_prop_view_new (G_OBJECT (entry->context), "pattern",
+                                       entry->context, CELL_SIZE);
+  GIMP_VIEW (entry->pattern)->clickable  = TRUE;
+  GIMP_VIEW (entry->pattern)->show_popup = TRUE;
+  pack_prop_widget (GTK_BOX (hbox), entry->pattern, &entry->pattern_none);
+
+  g_signal_connect (entry->pattern, "clicked",
+                    G_CALLBACK (gimp_device_status_view_clicked),
+                    "gimp-pattern-grid|gimp-pattern-list");
+
+  /*  the gradient  */
+
+  entry->gradient = gimp_prop_view_new (G_OBJECT (entry->context), "gradient",
+                                        entry->context, 2 * CELL_SIZE);
+  GIMP_VIEW (entry->gradient)->clickable  = TRUE;
+  GIMP_VIEW (entry->gradient)->show_popup = TRUE;
+  pack_prop_widget (GTK_BOX (hbox), entry->gradient, &entry->gradient_none);
+
+  g_signal_connect (entry->gradient, "clicked",
+                    G_CALLBACK (gimp_device_status_view_clicked),
+                    "gimp-gradient-list|gimp-gradient-grid");
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (device_info),
+                                        "tool-options");
+  gimp_device_status_notify_info (device_info, pspec, entry);
+}
+
+static void
+gimp_device_status_device_remove (GimpContainer    *devices,
+                                  GimpDeviceInfo   *device_info,
+                                  GimpDeviceStatus *status)
+{
+  GList *list;
+
+  for (list = status->devices; list; list = list->next)
+    {
+      GimpDeviceStatusEntry *entry = list->data;
+
+      if (entry->device_info == device_info)
+        {
+          status->devices = g_list_remove (status->devices, entry);
+
+          g_signal_handlers_disconnect_by_func (entry->device_info,
+                                                gimp_device_status_notify_info,
+                                                entry);
+
+          g_object_unref (entry->context);
+          g_slice_free (GimpDeviceStatusEntry, entry);
+
+          return;
+        }
+    }
+}
+
+GtkWidget *
+gimp_device_status_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_DEVICE_STATUS,
+                       "gimp", gimp,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_device_status_notify_device (GimpDeviceManager *manager,
+                                  const GParamSpec  *pspec,
+                                  GimpDeviceStatus  *status)
+{
+  GList *list;
+
+  status->current_device = gimp_device_manager_get_current_device (manager);
+
+  for (list = status->devices; list; list = list->next)
+    {
+      GimpDeviceStatusEntry *entry = list->data;
+
+      gtk_widget_set_state (entry->ebox,
+                            entry->device_info == status->current_device ?
+                            GTK_STATE_SELECTED : GTK_STATE_NORMAL);
+    }
+}
+
+static void
+gimp_device_status_config_notify (GimpGuiConfig    *config,
+                                  const GParamSpec *pspec,
+                                  GimpDeviceStatus *status)
+{
+  gboolean  show_options;
+  GList    *list;
+
+  show_options = ! GIMP_GUI_CONFIG (status->gimp->config)->devices_share_tool;
+
+  for (list = status->devices; list; list = list->next)
+    {
+      GimpDeviceStatusEntry *entry = list->data;
+
+      gtk_widget_set_visible (entry->options_hbox, show_options);
+    }
+}
+
+static void
+toggle_prop_visible (GtkWidget *widget,
+                     GtkWidget *widget_none,
+                     gboolean   available)
+{
+  gtk_widget_set_visible (widget, available);
+  gtk_widget_set_visible (widget_none, ! available);
+}
+
+static void
+gimp_device_status_notify_info (GimpDeviceInfo        *device_info,
+                                const GParamSpec      *pspec,
+                                GimpDeviceStatusEntry *entry)
+{
+  GimpToolOptions *tool_options = GIMP_TOOL_PRESET (device_info)->tool_options;
+
+  if (tool_options != entry->tool_options)
+    {
+      GimpContextPropMask serialize_props;
+
+      entry->tool_options = tool_options;
+      gimp_context_set_parent (entry->context, GIMP_CONTEXT (tool_options));
+
+      serialize_props =
+        gimp_context_get_serialize_properties (GIMP_CONTEXT (tool_options));
+
+      toggle_prop_visible (entry->foreground,
+                           entry->foreground_none,
+                           serialize_props & GIMP_CONTEXT_PROP_MASK_FOREGROUND);
+
+      toggle_prop_visible (entry->background,
+                           entry->background_none,
+                           serialize_props & GIMP_CONTEXT_PROP_MASK_BACKGROUND);
+
+      toggle_prop_visible (entry->brush,
+                           entry->brush_none,
+                           serialize_props & GIMP_CONTEXT_PROP_MASK_BRUSH);
+
+      toggle_prop_visible (entry->pattern,
+                           entry->pattern_none,
+                           serialize_props & GIMP_CONTEXT_PROP_MASK_PATTERN);
+
+      toggle_prop_visible (entry->gradient,
+                           entry->gradient_none,
+                           serialize_props & GIMP_CONTEXT_PROP_MASK_GRADIENT);
+    }
+
+  if (! gimp_device_info_get_device (device_info, NULL) ||
+      gimp_device_info_get_mode (device_info) == GDK_MODE_DISABLED)
+    {
+      gtk_widget_hide (entry->ebox);
+    }
+  else
+    {
+      gtk_widget_show (entry->ebox);
+    }
+
+  if (! strcmp (pspec->name, "tool-options"))
+    {
+      GimpRGB color;
+      guchar  r, g, b;
+      gchar   buf[64];
+
+      gimp_context_get_foreground (entry->context, &color);
+      gimp_rgb_get_uchar (&color, &r, &g, &b);
+      g_snprintf (buf, sizeof (buf), _("Foreground: %d, %d, %d"), r, g, b);
+      gimp_help_set_help_data (entry->foreground, buf, NULL);
+
+      gimp_context_get_background (entry->context, &color);
+      gimp_rgb_get_uchar (&color, &r, &g, &b);
+      g_snprintf (buf, sizeof (buf), _("Background: %d, %d, %d"), r, g, b);
+      gimp_help_set_help_data (entry->background, buf, NULL);
+    }
+}
+
+static void
+gimp_device_status_save_clicked (GtkWidget        *button,
+                                 GimpDeviceStatus *status)
+{
+  gimp_devices_save (status->gimp, TRUE);
+}
+
+static void
+gimp_device_status_view_clicked (GtkWidget       *widget,
+                                 GdkModifierType  state,
+                                 const gchar     *identifier)
+{
+  GimpDeviceStatus  *status;
+  GimpDialogFactory *dialog_factory;
+
+  status = GIMP_DEVICE_STATUS (gtk_widget_get_ancestor (widget,
+                                                        GIMP_TYPE_DEVICE_STATUS));
+  dialog_factory = gimp_dialog_factory_get_singleton ();
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (status->gimp)),
+                                             status->gimp,
+                                             dialog_factory,
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             identifier);
+}
diff --git a/app/widgets/gimpdevicestatus.h b/app/widgets/gimpdevicestatus.h
new file mode 100644
index 0000000..2bc4650
--- /dev/null
+++ b/app/widgets/gimpdevicestatus.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdevicestatus.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DEVICE_STATUS_H__
+#define __GIMP_DEVICE_STATUS_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_DEVICE_STATUS            (gimp_device_status_get_type ())
+#define GIMP_DEVICE_STATUS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_STATUS, GimpDeviceStatus))
+#define GIMP_DEVICE_STATUS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_STATUS, GimpDeviceStatusClass))
+#define GIMP_IS_DEVICE_STATUS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DEVICE_STATUS))
+#define GIMP_IS_DEVICE_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DEVICE_STATUS))
+#define GIMP_DEVICE_STATUS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DEVICE_STATUS, GimpDeviceStatusClass))
+
+
+typedef struct _GimpDeviceStatusEntry GimpDeviceStatusEntry;
+typedef struct _GimpDeviceStatusClass GimpDeviceStatusClass;
+
+struct _GimpDeviceStatus
+{
+  GimpEditor      parent_instance;
+
+  Gimp           *gimp;
+  GimpDeviceInfo *current_device;
+
+  GList          *devices;
+
+  GtkWidget      *vbox;
+
+  GtkWidget      *save_button;
+  GtkWidget      *edit_button;
+};
+
+struct _GimpDeviceStatusClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType       gimp_device_status_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_device_status_new      (Gimp *gimp);
+
+
+#endif  /*  __GIMP_DEVICE_STATUS_H__  */
diff --git a/app/widgets/gimpdial.c b/app/widgets/gimpdial.c
new file mode 100644
index 0000000..bda1236
--- /dev/null
+++ b/app/widgets/gimpdial.c
@@ -0,0 +1,596 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdial.c
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on code from the color-rotate plug-in
+ * Copyright (C) 1997-1999 Sven Anders (anderss@fmi.uni-passau.de)
+ *                         Based on code from Pavel Grinfeld (pavel@ml.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimpdial.h"
+
+
+#define SEGMENT_FRACTION 0.3
+
+
+enum
+{
+  PROP_0,
+  PROP_DRAW_BETA,
+  PROP_ALPHA,
+  PROP_BETA,
+  PROP_CLOCKWISE_ANGLES,
+  PROP_CLOCKWISE_DELTA
+};
+
+typedef enum
+{
+  DIAL_TARGET_NONE  = 0,
+  DIAL_TARGET_ALPHA = 1 << 0,
+  DIAL_TARGET_BETA  = 1 << 1,
+  DIAL_TARGET_BOTH  = DIAL_TARGET_ALPHA | DIAL_TARGET_BETA
+} DialTarget;
+
+
+struct _GimpDialPrivate
+{
+  gdouble     alpha;
+  gdouble     beta;
+  gboolean    clockwise_angles;
+  gboolean    clockwise_delta;
+  gboolean    draw_beta;
+
+  DialTarget  target;
+  gdouble     last_angle;
+};
+
+
+static void        gimp_dial_set_property         (GObject            *object,
+                                                   guint               property_id,
+                                                   const GValue       *value,
+                                                   GParamSpec         *pspec);
+static void        gimp_dial_get_property         (GObject            *object,
+                                                   guint               property_id,
+                                                   GValue             *value,
+                                                   GParamSpec         *pspec);
+
+static gboolean    gimp_dial_expose_event         (GtkWidget          *widget,
+                                                   GdkEventExpose     *event);
+static gboolean    gimp_dial_button_press_event   (GtkWidget          *widget,
+                                                   GdkEventButton     *bevent);
+static gboolean    gimp_dial_motion_notify_event  (GtkWidget          *widget,
+                                                   GdkEventMotion     *mevent);
+
+static void        gimp_dial_reset_target         (GimpCircle         *circle);
+
+static void        gimp_dial_set_target           (GimpDial           *dial,
+                                                   DialTarget          target);
+
+static void        gimp_dial_draw_arrows          (cairo_t            *cr,
+                                                   gint                size,
+                                                   gdouble             alpha,
+                                                   gdouble             beta,
+                                                   gboolean            clockwise_delta,
+                                                   DialTarget          highlight,
+                                                   gboolean            draw_beta);
+
+static gdouble     gimp_dial_normalize_angle      (gdouble             angle);
+static gdouble     gimp_dial_get_angle_distance   (gdouble             alpha,
+                                                   gdouble             beta);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDial, gimp_dial, GIMP_TYPE_CIRCLE)
+
+#define parent_class gimp_dial_parent_class
+
+
+static void
+gimp_dial_class_init (GimpDialClass *klass)
+{
+  GObjectClass    *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass  *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpCircleClass *circle_class = GIMP_CIRCLE_CLASS (klass);
+
+  object_class->get_property         = gimp_dial_get_property;
+  object_class->set_property         = gimp_dial_set_property;
+
+  widget_class->expose_event         = gimp_dial_expose_event;
+  widget_class->button_press_event   = gimp_dial_button_press_event;
+  widget_class->motion_notify_event  = gimp_dial_motion_notify_event;
+
+  circle_class->reset_target         = gimp_dial_reset_target;
+
+  g_object_class_install_property (object_class, PROP_ALPHA,
+                                   g_param_spec_double ("alpha",
+                                                        NULL, NULL,
+                                                        0.0, 2 * G_PI, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BETA,
+                                   g_param_spec_double ("beta",
+                                                        NULL, NULL,
+                                                        0.0, 2 * G_PI, G_PI,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CLOCKWISE_ANGLES,
+                                   g_param_spec_boolean ("clockwise-angles",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CLOCKWISE_DELTA,
+                                   g_param_spec_boolean ("clockwise-delta",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DRAW_BETA,
+                                   g_param_spec_boolean ("draw-beta",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_dial_init (GimpDial *dial)
+{
+  dial->priv = gimp_dial_get_instance_private (dial);
+}
+
+static void
+gimp_dial_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GimpDial *dial = GIMP_DIAL (object);
+
+  switch (property_id)
+    {
+    case PROP_ALPHA:
+      dial->priv->alpha = g_value_get_double (value);
+      gtk_widget_queue_draw (GTK_WIDGET (dial));
+      break;
+
+    case PROP_BETA:
+      dial->priv->beta = g_value_get_double (value);
+      gtk_widget_queue_draw (GTK_WIDGET (dial));
+      break;
+
+    case PROP_CLOCKWISE_ANGLES:
+      dial->priv->clockwise_angles = g_value_get_boolean (value);
+      gtk_widget_queue_draw (GTK_WIDGET (dial));
+      break;
+
+    case PROP_CLOCKWISE_DELTA:
+      dial->priv->clockwise_delta = g_value_get_boolean (value);
+      gtk_widget_queue_draw (GTK_WIDGET (dial));
+      break;
+
+    case PROP_DRAW_BETA:
+      dial->priv->draw_beta = g_value_get_boolean (value);
+      gtk_widget_queue_draw (GTK_WIDGET (dial));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dial_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GimpDial *dial = GIMP_DIAL (object);
+
+  switch (property_id)
+    {
+    case PROP_ALPHA:
+      g_value_set_double (value, dial->priv->alpha);
+      break;
+
+    case PROP_BETA:
+      g_value_set_double (value, dial->priv->beta);
+      break;
+
+    case PROP_CLOCKWISE_ANGLES:
+      g_value_set_boolean (value, dial->priv->clockwise_angles);
+      break;
+
+    case PROP_CLOCKWISE_DELTA:
+      g_value_set_boolean (value, dial->priv->clockwise_delta);
+      break;
+
+    case PROP_DRAW_BETA:
+      g_value_set_boolean (value, dial->priv->draw_beta);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_dial_expose_event (GtkWidget      *widget,
+                        GdkEventExpose *event)
+{
+  GimpDial *dial = GIMP_DIAL (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+  if (gtk_widget_is_drawable (widget))
+    {
+      GtkAllocation  allocation;
+      gint           size;
+      cairo_t       *cr;
+      gdouble        alpha = dial->priv->alpha;
+      gdouble        beta  = dial->priv->beta;
+
+      g_object_get (widget,
+                    "size", &size,
+                    NULL);
+
+      cr = gdk_cairo_create (event->window);
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      cairo_translate (cr,
+                       (gdouble) allocation.x + (allocation.width  - size) / 2.0,
+                       (gdouble) allocation.y + (allocation.height - size) / 2.0);
+
+      if (dial->priv->clockwise_angles)
+        {
+          alpha = -alpha;
+          beta  = -beta;
+        }
+
+      gimp_dial_draw_arrows (cr, size,
+                             alpha, beta,
+                             dial->priv->clockwise_delta,
+                             dial->priv->target,
+                             dial->priv->draw_beta);
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_dial_button_press_event (GtkWidget      *widget,
+                              GdkEventButton *bevent)
+{
+  GimpDial *dial = GIMP_DIAL (widget);
+
+  if (bevent->type == GDK_BUTTON_PRESS &&
+      bevent->button == 1              &&
+      dial->priv->target != DIAL_TARGET_NONE)
+    {
+      gdouble angle;
+
+      GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, bevent);
+
+      angle = _gimp_circle_get_angle_and_distance (GIMP_CIRCLE (dial),
+                                                   bevent->x, bevent->y,
+                                                   NULL);
+
+      if (dial->priv->clockwise_angles && angle)
+        angle = 2.0 * G_PI - angle;
+
+      dial->priv->last_angle = angle;
+
+      switch (dial->priv->target)
+        {
+        case DIAL_TARGET_ALPHA:
+          g_object_set (dial, "alpha", angle, NULL);
+          break;
+
+        case DIAL_TARGET_BETA:
+          g_object_set (dial, "beta", angle, NULL);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_dial_motion_notify_event (GtkWidget      *widget,
+                               GdkEventMotion *mevent)
+{
+  GimpDial *dial = GIMP_DIAL (widget);
+  gdouble   angle;
+  gdouble   distance;
+
+  angle = _gimp_circle_get_angle_and_distance (GIMP_CIRCLE (dial),
+                                               mevent->x, mevent->y,
+                                               &distance);
+
+  if (dial->priv->clockwise_angles && angle)
+    angle = 2.0 * G_PI - angle;
+
+  if (_gimp_circle_has_grab (GIMP_CIRCLE (dial)))
+    {
+      gdouble delta;
+
+      delta = angle - dial->priv->last_angle;
+      dial->priv->last_angle = angle;
+
+      if (delta != 0.0)
+        {
+          switch (dial->priv->target)
+            {
+            case DIAL_TARGET_ALPHA:
+              g_object_set (dial, "alpha", angle, NULL);
+              break;
+
+            case DIAL_TARGET_BETA:
+              g_object_set (dial, "beta", angle, NULL);
+              break;
+
+            case DIAL_TARGET_BOTH:
+              g_object_set (dial,
+                            "alpha", gimp_dial_normalize_angle (dial->priv->alpha + delta),
+                            "beta",  gimp_dial_normalize_angle (dial->priv->beta  + delta),
+                            NULL);
+              break;
+
+            default:
+              break;
+            }
+        }
+    }
+  else
+    {
+      DialTarget target;
+      gdouble    dist_alpha;
+      gdouble    dist_beta;
+
+      dist_alpha = gimp_dial_get_angle_distance (dial->priv->alpha, angle);
+      dist_beta  = gimp_dial_get_angle_distance (dial->priv->beta, angle);
+
+      if (dial->priv->draw_beta       &&
+          distance > SEGMENT_FRACTION &&
+          MIN (dist_alpha, dist_beta) < G_PI / 12)
+        {
+          if (dist_alpha < dist_beta)
+            {
+              target = DIAL_TARGET_ALPHA;
+            }
+          else
+            {
+              target = DIAL_TARGET_BETA;
+            }
+        }
+      else
+        {
+          target = DIAL_TARGET_BOTH;
+        }
+
+      gimp_dial_set_target (dial, target);
+    }
+
+  gdk_event_request_motions (mevent);
+
+  return FALSE;
+}
+
+static void
+gimp_dial_reset_target (GimpCircle *circle)
+{
+  gimp_dial_set_target (GIMP_DIAL (circle), DIAL_TARGET_NONE);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_dial_new (void)
+{
+  return g_object_new (GIMP_TYPE_DIAL, NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_dial_set_target (GimpDial   *dial,
+                      DialTarget  target)
+{
+  if (target != dial->priv->target)
+    {
+      dial->priv->target = target;
+      gtk_widget_queue_draw (GTK_WIDGET (dial));
+    }
+}
+
+static void
+gimp_dial_draw_arrow (cairo_t *cr,
+                      gdouble  radius,
+                      gdouble  angle)
+{
+#define REL 0.8
+#define DEL 0.1
+
+  cairo_move_to (cr, radius, radius);
+  cairo_line_to (cr,
+                 radius + radius * cos (angle),
+                 radius - radius * sin (angle));
+
+  cairo_move_to (cr,
+                 radius + radius * cos (angle),
+                 radius - radius * sin (angle));
+  cairo_line_to (cr,
+                 radius + radius * REL * cos (angle - DEL),
+                 radius - radius * REL * sin (angle - DEL));
+
+  cairo_move_to (cr,
+                 radius + radius * cos (angle),
+                 radius - radius * sin (angle));
+  cairo_line_to (cr,
+                 radius + radius * REL * cos (angle + DEL),
+                 radius - radius * REL * sin (angle + DEL));
+}
+
+static void
+gimp_dial_draw_segment (cairo_t  *cr,
+                        gdouble   radius,
+                        gdouble   alpha,
+                        gdouble   beta,
+                        gboolean  clockwise_delta)
+{
+  gint    direction = clockwise_delta ? -1 : 1;
+  gint    segment_dist;
+  gint    tick;
+  gdouble slice;
+
+  segment_dist = radius * SEGMENT_FRACTION;
+  tick         = MIN (10, segment_dist);
+
+  cairo_move_to (cr,
+                 radius + segment_dist * cos (beta),
+                 radius - segment_dist * sin (beta));
+  cairo_line_to (cr,
+                 radius + segment_dist * cos (beta) +
+                 direction * tick * sin (beta),
+                 radius - segment_dist * sin (beta) +
+                 direction * tick * cos (beta));
+
+  cairo_new_sub_path (cr);
+
+  if (clockwise_delta)
+    slice = -gimp_dial_normalize_angle (alpha - beta);
+  else
+    slice = gimp_dial_normalize_angle (beta - alpha);
+
+  gimp_cairo_arc (cr, radius, radius, segment_dist,
+                  alpha, slice);
+}
+
+static void
+gimp_dial_draw_arrows (cairo_t    *cr,
+                       gint        size,
+                       gdouble     alpha,
+                       gdouble     beta,
+                       gboolean    clockwise_delta,
+                       DialTarget  highlight,
+                       gboolean    draw_beta)
+{
+  gdouble radius = size / 2.0 - 2.0; /* half the broad line with and half a px */
+
+  cairo_save (cr);
+
+  cairo_translate (cr, 2.0, 2.0); /* half the broad line width and half a px*/
+
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+
+  if (highlight != DIAL_TARGET_BOTH)
+    {
+      if (! (highlight & DIAL_TARGET_ALPHA))
+        gimp_dial_draw_arrow (cr, radius, alpha);
+
+      if (draw_beta)
+        {
+          if (! (highlight & DIAL_TARGET_BETA))
+            gimp_dial_draw_arrow (cr, radius, beta);
+
+          if ((highlight & DIAL_TARGET_BOTH) != DIAL_TARGET_BOTH)
+            gimp_dial_draw_segment (cr, radius, alpha, beta, clockwise_delta);
+        }
+
+      cairo_set_line_width (cr, 3.0);
+      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.6);
+      cairo_stroke_preserve (cr);
+
+      cairo_set_line_width (cr, 1.0);
+      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
+      cairo_stroke (cr);
+    }
+
+  if (highlight != DIAL_TARGET_NONE)
+    {
+      if (highlight & DIAL_TARGET_ALPHA)
+        gimp_dial_draw_arrow (cr, radius, alpha);
+
+      if (draw_beta)
+        {
+          if (highlight & DIAL_TARGET_BETA)
+            gimp_dial_draw_arrow (cr, radius, beta);
+
+          if ((highlight & DIAL_TARGET_BOTH) == DIAL_TARGET_BOTH)
+            gimp_dial_draw_segment (cr, radius, alpha, beta, clockwise_delta);
+        }
+
+      cairo_set_line_width (cr, 3.0);
+      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.6);
+      cairo_stroke_preserve (cr);
+
+      cairo_set_line_width (cr, 1.0);
+      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.8);
+      cairo_stroke (cr);
+    }
+
+  cairo_restore (cr);
+}
+
+static gdouble
+gimp_dial_normalize_angle (gdouble angle)
+{
+  if (angle < 0)
+    return angle + 2 * G_PI;
+  else if (angle > 2 * G_PI)
+    return angle - 2 * G_PI;
+  else
+    return angle;
+}
+
+static gdouble
+gimp_dial_get_angle_distance (gdouble alpha,
+                              gdouble beta)
+{
+  return ABS (MIN (gimp_dial_normalize_angle (alpha - beta),
+                   2 * G_PI - gimp_dial_normalize_angle (alpha - beta)));
+}
diff --git a/app/widgets/gimpdial.h b/app/widgets/gimpdial.h
new file mode 100644
index 0000000..bc7e8ca
--- /dev/null
+++ b/app/widgets/gimpdial.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdial.h
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on code from the color-rotate plug-in
+ * Copyright (C) 1997-1999 Sven Anders (anderss@fmi.uni-passau.de)
+ *                         Based on code from Pavel Grinfeld (pavel@ml.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DIAL_H__
+#define __GIMP_DIAL_H__
+
+
+#include "gimpcircle.h"
+
+
+#define GIMP_TYPE_DIAL            (gimp_dial_get_type ())
+#define GIMP_DIAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DIAL, GimpDial))
+#define GIMP_DIAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DIAL, GimpDialClass))
+#define GIMP_IS_DIAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_DIAL))
+#define GIMP_IS_DIAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DIAL))
+#define GIMP_DIAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DIAL, GimpDialClass))
+
+
+typedef struct _GimpDialPrivate GimpDialPrivate;
+typedef struct _GimpDialClass   GimpDialClass;
+
+struct _GimpDial
+{
+  GimpCircle       parent_instance;
+
+  GimpDialPrivate *priv;
+};
+
+struct _GimpDialClass
+{
+  GimpCircleClass  parent_class;
+};
+
+
+GType          gimp_dial_get_type          (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_dial_new               (void);
+
+
+#endif /* __GIMP_DIAL_H__ */
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
new file mode 100644
index 0000000..9d2ce0c
--- /dev/null
+++ b/app/widgets/gimpdialogfactory.c
@@ -0,0 +1,1681 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdialogfactory.c
+ * Copyright (C) 2001-2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpcursor.h"
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockbook.h"
+#include "gimpdockable.h"
+#include "gimpdockcontainer.h"
+#include "gimpdockwindow.h"
+#include "gimpmenufactory.h"
+#include "gimpsessioninfo.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-log.h"
+
+
+enum
+{
+  DOCK_WINDOW_ADDED,
+  DOCK_WINDOW_REMOVED,
+  LAST_SIGNAL
+};
+
+
+struct _GimpDialogFactoryPrivate
+{
+  GimpContext      *context;
+  GimpMenuFactory  *menu_factory;
+
+  GList            *open_dialogs;
+  GList            *session_infos;
+
+  GList            *registered_dialogs;
+
+  GimpDialogsState  dialog_state;
+};
+
+
+static void        gimp_dialog_factory_dispose              (GObject                *object);
+static void        gimp_dialog_factory_finalize             (GObject                *object);
+static GtkWidget * gimp_dialog_factory_constructor          (GimpDialogFactory      *factory,
+                                                             GimpDialogFactoryEntry *entry,
+                                                             GimpContext            *context,
+                                                             GimpUIManager          *ui_manager,
+                                                             gint                    view_size);
+static void        gimp_dialog_factory_config_notify        (GimpDialogFactory      *factory,
+                                                             GParamSpec             *pspec,
+                                                             GimpGuiConfig          *config);
+static void        gimp_dialog_factory_set_widget_data      (GtkWidget              *dialog,
+                                                             GimpDialogFactory      *factory,
+                                                             GimpDialogFactoryEntry *entry);
+static void        gimp_dialog_factory_unset_widget_data    (GtkWidget              *dialog);
+static gboolean    gimp_dialog_factory_set_user_pos         (GtkWidget              *dialog,
+                                                             GdkEventConfigure      *cevent,
+                                                             gpointer                data);
+static gboolean    gimp_dialog_factory_dialog_configure     (GtkWidget              *dialog,
+                                                             GdkEventConfigure      *cevent,
+                                                             GimpDialogFactory      *factory);
+static void        gimp_dialog_factory_hide                 (GimpDialogFactory      *factory);
+static void        gimp_dialog_factory_show                 (GimpDialogFactory      *factory);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDialogFactory, gimp_dialog_factory,
+                            GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_dialog_factory_parent_class
+
+static guint factory_signals[LAST_SIGNAL] = { 0 };
+
+
+/* Is set by dialogs.c to a dialog factory initialized there.
+ *
+ * FIXME: The layer above should not do this kind of initialization of
+ * layers below.
+ */
+static GimpDialogFactory *gimp_toplevel_factory = NULL;
+
+
+static void
+gimp_dialog_factory_class_init (GimpDialogFactoryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose  = gimp_dialog_factory_dispose;
+  object_class->finalize = gimp_dialog_factory_finalize;
+
+  factory_signals[DOCK_WINDOW_ADDED] =
+    g_signal_new ("dock-window-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpDialogFactoryClass, dock_window_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCK_WINDOW);
+
+  factory_signals[DOCK_WINDOW_REMOVED] =
+    g_signal_new ("dock-window-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpDialogFactoryClass, dock_window_removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCK_WINDOW);
+}
+
+static void
+gimp_dialog_factory_init (GimpDialogFactory *factory)
+{
+  factory->p = gimp_dialog_factory_get_instance_private (factory);
+  factory->p->dialog_state = GIMP_DIALOGS_SHOWN;
+}
+
+static void
+gimp_dialog_factory_dispose (GObject *object)
+{
+  GimpDialogFactory *factory = GIMP_DIALOG_FACTORY (object);
+  GList             *list;
+
+  /*  start iterating from the beginning each time we destroyed a
+   *  toplevel because destroying a dock may cause lots of items
+   *  to be removed from factory->p->open_dialogs
+   */
+  while (factory->p->open_dialogs)
+    {
+      for (list = factory->p->open_dialogs; list; list = g_list_next (list))
+        {
+          if (gtk_widget_is_toplevel (list->data))
+            {
+              gtk_widget_destroy (GTK_WIDGET (list->data));
+              break;
+            }
+        }
+
+      /*  the list being non-empty without any toplevel is an error,
+       *  so eek and chain up
+       */
+      if (! list)
+        {
+          g_warning ("%s: %d stale non-toplevel entries in factory->p->open_dialogs",
+                     G_STRFUNC, g_list_length (factory->p->open_dialogs));
+          break;
+        }
+    }
+
+  if (factory->p->open_dialogs)
+    {
+      g_list_free (factory->p->open_dialogs);
+      factory->p->open_dialogs = NULL;
+    }
+
+  if (factory->p->session_infos)
+    {
+      g_list_free_full (factory->p->session_infos,
+                        (GDestroyNotify) g_object_unref);
+      factory->p->session_infos = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dialog_factory_finalize (GObject *object)
+{
+  GimpDialogFactory *factory = GIMP_DIALOG_FACTORY (object);
+  GList             *list;
+
+  for (list = factory->p->registered_dialogs; list; list = g_list_next (list))
+    {
+      GimpDialogFactoryEntry *entry = list->data;
+
+      g_free (entry->identifier);
+      g_free (entry->name);
+      g_free (entry->blurb);
+      g_free (entry->icon_name);
+      g_free (entry->help_id);
+
+      g_slice_free (GimpDialogFactoryEntry, entry);
+    }
+
+  if (factory->p->registered_dialogs)
+    {
+      g_list_free (factory->p->registered_dialogs);
+      factory->p->registered_dialogs = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GimpDialogFactory *
+gimp_dialog_factory_new (const gchar           *name,
+                         GimpContext           *context,
+                         GimpMenuFactory       *menu_factory)
+{
+  GimpDialogFactory *factory;
+  GimpGuiConfig     *config;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (! menu_factory || GIMP_IS_MENU_FACTORY (menu_factory),
+                        NULL);
+
+  factory = g_object_new (GIMP_TYPE_DIALOG_FACTORY, NULL);
+
+  gimp_object_set_name (GIMP_OBJECT (factory), name);
+
+  config = GIMP_GUI_CONFIG (context->gimp->config);
+
+  factory->p->context      = context;
+  factory->p->menu_factory = menu_factory;
+  factory->p->dialog_state = (config->hide_docks ?
+                              GIMP_DIALOGS_HIDDEN_EXPLICITLY :
+                              GIMP_DIALOGS_SHOWN);
+
+  g_signal_connect_object (config, "notify::hide-docks",
+                           G_CALLBACK (gimp_dialog_factory_config_notify),
+                           factory, G_CONNECT_SWAPPED);
+
+  return factory;
+}
+
+void
+gimp_dialog_factory_register_entry (GimpDialogFactory    *factory,
+                                    const gchar          *identifier,
+                                    const gchar          *name,
+                                    const gchar          *blurb,
+                                    const gchar          *icon_name,
+                                    const gchar          *help_id,
+                                    GimpDialogNewFunc     new_func,
+                                    GimpDialogRestoreFunc restore_func,
+                                    gint                  view_size,
+                                    gboolean              singleton,
+                                    gboolean              session_managed,
+                                    gboolean              remember_size,
+                                    gboolean              remember_if_open,
+                                    gboolean              hideable,
+                                    gboolean              image_window,
+                                    gboolean              dockable)
+{
+  GimpDialogFactoryEntry *entry;
+
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (identifier != NULL);
+
+  entry = g_slice_new0 (GimpDialogFactoryEntry);
+
+  entry->identifier       = g_strdup (identifier);
+  entry->name             = g_strdup (name);
+  entry->blurb            = g_strdup (blurb);
+  entry->icon_name        = g_strdup (icon_name);
+  entry->help_id          = g_strdup (help_id);
+  entry->new_func         = new_func;
+  entry->restore_func     = restore_func;
+  entry->view_size        = view_size;
+  entry->singleton        = singleton ? TRUE : FALSE;
+  entry->session_managed  = session_managed ? TRUE : FALSE;
+  entry->remember_size    = remember_size ? TRUE : FALSE;
+  entry->remember_if_open = remember_if_open ? TRUE : FALSE;
+  entry->hideable         = hideable ? TRUE : FALSE;
+  entry->image_window     = image_window ? TRUE : FALSE;
+  entry->dockable         = dockable ? TRUE : FALSE;
+
+  factory->p->registered_dialogs = g_list_prepend (factory->p->registered_dialogs,
+                                                   entry);
+}
+
+GimpDialogFactoryEntry *
+gimp_dialog_factory_find_entry (GimpDialogFactory *factory,
+                                const gchar       *identifier)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  for (list = factory->p->registered_dialogs; list; list = g_list_next (list))
+    {
+      GimpDialogFactoryEntry *entry = list->data;
+
+      if (! strcmp (identifier, entry->identifier))
+        return entry;
+    }
+
+  return NULL;
+}
+
+GimpSessionInfo *
+gimp_dialog_factory_find_session_info (GimpDialogFactory *factory,
+                                       const gchar       *identifier)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  for (list = factory->p->session_infos; list; list = g_list_next (list))
+    {
+      GimpSessionInfo *info = list->data;
+
+      if (gimp_session_info_get_factory_entry (info) &&
+          g_str_equal (identifier,
+                       gimp_session_info_get_factory_entry (info)->identifier))
+        {
+          return info;
+        }
+    }
+
+  return NULL;
+}
+
+GtkWidget *
+gimp_dialog_factory_find_widget (GimpDialogFactory *factory,
+                                 const gchar       *identifiers)
+{
+  GtkWidget  *widget = NULL;
+  gchar     **ids;
+  gint        i;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (identifiers != NULL, NULL);
+
+  ids = g_strsplit (identifiers, "|", 0);
+
+  for (i = 0; ids[i]; i++)
+    {
+      GimpSessionInfo *info;
+
+      info = gimp_dialog_factory_find_session_info (factory, ids[i]);
+
+      if (info)
+        {
+          widget =  gimp_session_info_get_widget (info);
+
+          if (widget)
+            break;
+        }
+    }
+
+  g_strfreev (ids);
+
+  return widget;
+}
+
+/**
+ * gimp_dialog_factory_dialog_sane:
+ * @factory:
+ * @widget_factory:
+ * @widget_entry:
+ * @widget:
+ *
+ * Makes sure that the @widget with the given @widget_entry that was
+ * created by the given @widget_factory belongs to @efactory.
+ *
+ * Returns: %TRUE if that is the case, %FALSE otherwise.
+ **/
+static gboolean
+gimp_dialog_factory_dialog_sane (GimpDialogFactory      *factory,
+                                 GimpDialogFactory      *widget_factory,
+                                 GimpDialogFactoryEntry *widget_entry,
+                                 GtkWidget              *widget)
+{
+  if (! widget_factory || ! widget_entry)
+    {
+      g_warning ("%s: dialog was not created by a GimpDialogFactory",
+                 G_STRFUNC);
+      return FALSE;
+    }
+
+  if (widget_factory != factory)
+    {
+      g_warning ("%s: dialog was created by a different GimpDialogFactory",
+                 G_STRFUNC);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/**
+ * gimp_dialog_factory_dialog_new_internal:
+ * @factory:
+ * @screen:
+ * @context:
+ * @ui_manager:
+ * @identifier:
+ * @view_size:
+ * @return_existing:   If %TRUE, (or if the dialog is a singleton),
+ *                     don't create a new dialog if it exists, instead
+ *                     return the existing one
+ * @present:           If %TRUE, the toplevel that contains the dialog (if any)
+ *                     will be gtk_window_present():ed
+ * @create_containers: If %TRUE, then containers for the
+ *                     dialog/dockable will be created as well. If you
+ *                     want to manage your own containers, pass %FALSE
+ *
+ * This is the lowest level dialog factory creation function.
+ *
+ * Returns: A created or existing #GtkWidget.
+ **/
+static GtkWidget *
+gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
+                                         GdkScreen         *screen,
+                                         gint               monitor,
+                                         GimpContext       *context,
+                                         GimpUIManager     *ui_manager,
+                                         const gchar       *identifier,
+                                         gint               view_size,
+                                         gboolean           return_existing,
+                                         gboolean           present,
+                                         gboolean           create_containers)
+{
+  GimpDialogFactoryEntry *entry    = NULL;
+  GtkWidget              *dialog   = NULL;
+  GtkWidget              *toplevel = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  entry = gimp_dialog_factory_find_entry (factory, identifier);
+
+  if (! entry)
+    {
+      g_warning ("%s: no entry registered for \"%s\"",
+                 G_STRFUNC, identifier);
+      return NULL;
+    }
+
+  if (! entry->new_func)
+    {
+      g_warning ("%s: entry for \"%s\" has no constructor",
+                 G_STRFUNC, identifier);
+      return NULL;
+    }
+
+  /*  a singleton dialog is always returned if it already exists  */
+  if (return_existing || entry->singleton)
+    {
+      dialog = gimp_dialog_factory_find_widget (factory, identifier);
+    }
+
+  /*  create the dialog if it was not found  */
+  if (! dialog)
+    {
+      GtkWidget *dock              = NULL;
+      GtkWidget *dock_window       = NULL;
+
+      /* What follows is special-case code for some entries. At some
+       * point we might want to abstract this block of code away.
+       */
+      if (create_containers)
+        {
+          if (entry->dockable)
+            {
+              GtkWidget *dockbook;
+
+              /*  It doesn't make sense to have a dockable without a dock
+               *  so create one. Create a new dock _before_ creating the
+               *  dialog. We do this because the new dockable needs to be
+               *  created in its dock's context.
+               */
+              dock     = gimp_dock_with_window_new (factory,
+                                                    screen,
+                                                    monitor,
+                                                    FALSE /*toolbox*/);
+              dockbook = gimp_dockbook_new (factory->p->menu_factory);
+
+              gimp_dock_add_book (GIMP_DOCK (dock),
+                                  GIMP_DOCKBOOK (dockbook),
+                                  0);
+            }
+          else if (strcmp ("gimp-toolbox", entry->identifier) == 0)
+            {
+              GimpDockContainer *dock_container;
+
+              dock_window = gimp_dialog_factory_dialog_new (factory,
+                                                            screen,
+                                                            monitor,
+                                                            NULL /*ui_manager*/,
+                                                            "gimp-toolbox-window",
+                                                            -1 /*view_size*/,
+                                                            FALSE /*present*/);
+
+              /* When we get a dock window, we also get a UI
+               * manager
+               */
+              dock_container = GIMP_DOCK_CONTAINER (dock_window);
+              ui_manager     = gimp_dock_container_get_ui_manager (dock_container);
+            }
+        }
+
+      /*  Create the new dialog in the appropriate context which is
+       *  - the passed context if not NULL
+       *  - the newly created dock's context if we just created it
+       *  - the factory's context, which happens when raising a toplevel
+       *    dialog was the original request.
+       */
+      if (view_size < GIMP_VIEW_SIZE_TINY)
+        view_size = entry->view_size;
+
+      if (context)
+        dialog = gimp_dialog_factory_constructor (factory, entry,
+                                                  context,
+                                                  ui_manager,
+                                                  view_size);
+      else if (dock)
+        dialog = gimp_dialog_factory_constructor (factory, entry,
+                                                  gimp_dock_get_context (GIMP_DOCK (dock)),
+                                                  gimp_dock_get_ui_manager (GIMP_DOCK (dock)),
+                                                  view_size);
+      else
+        dialog = gimp_dialog_factory_constructor (factory, entry,
+                                                  factory->p->context,
+                                                  ui_manager,
+                                                  view_size);
+
+      if (dialog)
+        {
+          gimp_dialog_factory_set_widget_data (dialog, factory, entry);
+
+          /*  If we created a dock before, the newly created dialog is
+           *  supposed to be a GimpDockable.
+           */
+          if (dock)
+            {
+              if (GIMP_IS_DOCKABLE (dialog))
+                {
+                  gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dialog),
+                                 0, 0);
+
+                  gtk_widget_show (dock);
+                }
+              else
+                {
+                  g_warning ("%s: GimpDialogFactory is a dockable factory "
+                             "but constructor for \"%s\" did not return a "
+                             "GimpDockable",
+                             G_STRFUNC, identifier);
+
+                  gtk_widget_destroy (dialog);
+                  gtk_widget_destroy (dock);
+
+                  dialog = NULL;
+                  dock   = NULL;
+                }
+            }
+          else if (dock_window)
+            {
+              if (GIMP_IS_DOCK (dialog))
+                {
+                  gimp_dock_window_add_dock (GIMP_DOCK_WINDOW (dock_window),
+                                             GIMP_DOCK (dialog),
+                                             -1 /*index*/);
+
+                  gtk_widget_set_visible (dialog, present);
+                  gtk_widget_set_visible (dock_window, present);
+                }
+              else
+                {
+                  g_warning ("%s: GimpDialogFactory is a dock factory entry "
+                             "but constructor for \"%s\" did not return a "
+                             "GimpDock",
+                             G_STRFUNC, identifier);
+
+                  gtk_widget_destroy (dialog);
+                  gtk_widget_destroy (dock_window);
+
+                  dialog      = NULL;
+                  dock_window = NULL;
+                }
+            }
+        }
+      else if (dock)
+        {
+          g_warning ("%s: constructor for \"%s\" returned NULL",
+                     G_STRFUNC, identifier);
+
+          gtk_widget_destroy (dock);
+
+          dock = NULL;
+        }
+
+      if (dialog)
+        gimp_dialog_factory_add_dialog (factory, dialog, screen, monitor);
+    }
+
+  /*  Finally, if we found an existing dialog or created a new one, raise it.
+   */
+  if (! dialog)
+    return NULL;
+
+  if (gtk_widget_is_toplevel (dialog))
+    {
+      gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+
+      toplevel = dialog;
+    }
+  else if (GIMP_IS_DOCK (dialog))
+    {
+      toplevel = gtk_widget_get_toplevel (dialog);
+    }
+  else if (GIMP_IS_DOCKABLE (dialog))
+    {
+      GimpDockable *dockable = GIMP_DOCKABLE (dialog);
+
+      if (gimp_dockable_get_dockbook (dockable) &&
+          gimp_dockbook_get_dock (gimp_dockable_get_dockbook (dockable)))
+        {
+          GtkNotebook *notebook = GTK_NOTEBOOK (gimp_dockable_get_dockbook (dockable));
+          gint         num      = gtk_notebook_page_num (notebook, dialog);
+
+          if (num != -1)
+            {
+              gtk_notebook_set_current_page (notebook, num);
+
+              gimp_widget_blink (dialog);
+            }
+        }
+
+      toplevel = gtk_widget_get_toplevel (dialog);
+    }
+
+  if (present && GTK_IS_WINDOW (toplevel))
+    {
+      /*  Work around focus-stealing protection, or whatever makes the
+       *  dock appear below the one where we clicked a button to open
+       *  it. See bug #630173.
+       */
+      gtk_widget_show_now (toplevel);
+      gdk_window_raise (gtk_widget_get_window (toplevel));
+    }
+
+  return dialog;
+}
+
+/**
+ * gimp_dialog_factory_dialog_new:
+ * @factory:      a #GimpDialogFactory
+ * @screen:       the #GdkScreen the dialog should appear on
+ * @ui_manager:   A #GimpUIManager, if applicable.
+ * @identifier:   the identifier of the dialog as registered with
+ *                gimp_dialog_factory_register_entry()
+ * @view_size:    the initial preview size
+ * @present:      whether gtk_window_present() should be called
+ *
+ * Creates a new toplevel dialog or a #GimpDockable, depending on whether
+ * %factory is a toplevel of dockable factory.
+ *
+ * Return value: the newly created dialog or an already existing singleton
+ *               dialog.
+ **/
+GtkWidget *
+gimp_dialog_factory_dialog_new (GimpDialogFactory *factory,
+                                GdkScreen         *screen,
+                                gint               monitor,
+                                GimpUIManager     *ui_manager,
+                                const gchar       *identifier,
+                                gint               view_size,
+                                gboolean           present)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  return gimp_dialog_factory_dialog_new_internal (factory,
+                                                  screen,
+                                                  monitor,
+                                                  factory->p->context,
+                                                  ui_manager,
+                                                  identifier,
+                                                  view_size,
+                                                  FALSE /*return_existing*/,
+                                                  present,
+                                                  FALSE /*create_containers*/);
+}
+
+GimpContext *
+gimp_dialog_factory_get_context (GimpDialogFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+
+  return factory->p->context;
+}
+
+GimpMenuFactory *
+gimp_dialog_factory_get_menu_factory (GimpDialogFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+
+  return factory->p->menu_factory;
+}
+
+GList *
+gimp_dialog_factory_get_open_dialogs (GimpDialogFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+
+  return factory->p->open_dialogs;
+}
+
+GList *
+gimp_dialog_factory_get_session_infos (GimpDialogFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+
+  return factory->p->session_infos;
+}
+
+void
+gimp_dialog_factory_add_session_info (GimpDialogFactory *factory,
+                                      GimpSessionInfo   *info)
+{
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+
+  /* We want to append rather than prepend so that the serialized
+   * order in sessionrc remains the same
+   */
+  factory->p->session_infos = g_list_append (factory->p->session_infos,
+                                             g_object_ref (info));
+}
+
+/**
+ * gimp_dialog_factory_dialog_raise:
+ * @factory:      a #GimpDialogFactory
+ * @screen:       the #GdkScreen the dialog should appear on
+ * @identifiers:  a '|' separated list of identifiers of dialogs as
+ *                registered with gimp_dialog_factory_register_entry()
+ * @view_size:    the initial preview size if a dialog needs to be created
+ *
+ * Raises any of a list of already existing toplevel dialog or
+ * #GimpDockable if it was already created by this %facory.
+ *
+ * Implicitly creates the first dialog in the list if none of the dialogs
+ * were found.
+ *
+ * Return value: the raised or newly created dialog.
+ **/
+GtkWidget *
+gimp_dialog_factory_dialog_raise (GimpDialogFactory *factory,
+                                  GdkScreen         *screen,
+                                  gint               monitor,
+                                  const gchar       *identifiers,
+                                  gint               view_size)
+{
+  GtkWidget *dialog;
+  gchar    **ids;
+  gint       i;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  g_return_val_if_fail (identifiers != NULL, NULL);
+
+  /*  If the identifier is a list, try to find a matching dialog and
+   *  raise it. If there's no match, use the first list item.
+   *
+   *  (we split the identifier list manually here because we must pass
+   *  a single identifier, not a list, to new_internal() below)
+   */
+  ids = g_strsplit (identifiers, "|", 0);
+  for (i = 0; ids[i]; i++)
+    {
+      if (gimp_dialog_factory_find_widget (factory, ids[i]))
+        break;
+    }
+
+  dialog = gimp_dialog_factory_dialog_new_internal (factory,
+                                                    screen,
+                                                    monitor,
+                                                    NULL,
+                                                    NULL,
+                                                    ids[i] ? ids[i] : ids[0],
+                                                    view_size,
+                                                    TRUE /*return_existing*/,
+                                                    TRUE /*present*/,
+                                                    TRUE /*create_containers*/);
+  g_strfreev (ids);
+
+  return dialog;
+}
+
+/**
+ * gimp_dialog_factory_dockable_new:
+ * @factory:      a #GimpDialogFactory
+ * @dock:         a #GimpDock created by this %factory.
+ * @identifier:   the identifier of the dialog as registered with
+ *                gimp_dialog_factory_register_entry()
+ * @view_size:
+ *
+ * Creates a new #GimpDockable in the context of the #GimpDock it will be
+ * added to.
+ *
+ * Implicitly raises & returns an already existing singleton dockable,
+ * so callers should check that gimp_dockable_get_dockbook (dockable)
+ * is NULL before trying to add it to it's #GimpDockbook.
+ *
+ * Return value: the newly created #GimpDockable or an already existing
+ *               singleton dockable.
+ **/
+GtkWidget *
+gimp_dialog_factory_dockable_new (GimpDialogFactory *factory,
+                                  GimpDock          *dock,
+                                  const gchar       *identifier,
+                                  gint               view_size)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  return gimp_dialog_factory_dialog_new_internal (factory,
+                                                  gtk_widget_get_screen (GTK_WIDGET (dock)),
+                                                  0,
+                                                  gimp_dock_get_context (dock),
+                                                  gimp_dock_get_ui_manager (dock),
+                                                  identifier,
+                                                  view_size,
+                                                  FALSE /*return_existing*/,
+                                                  FALSE /*present*/,
+                                                  FALSE /*create_containers*/);
+}
+
+void
+gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
+                                GtkWidget         *dialog,
+                                GdkScreen         *screen,
+                                gint               monitor)
+{
+  GimpDialogFactory      *dialog_factory = NULL;
+  GimpDialogFactoryEntry *entry          = NULL;
+  GimpSessionInfo        *info           = NULL;
+  GList                  *list           = NULL;
+  gboolean                toplevel       = FALSE;
+
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  if (g_list_find (factory->p->open_dialogs, dialog))
+    {
+      g_warning ("%s: dialog already registered", G_STRFUNC);
+      return;
+    }
+
+  dialog_factory = gimp_dialog_factory_from_widget (dialog, &entry);
+
+  if (! gimp_dialog_factory_dialog_sane (factory,
+                                         dialog_factory,
+                                         entry,
+                                         dialog))
+    return;
+
+  toplevel = gtk_widget_is_toplevel (dialog);
+
+  if (entry)
+    {
+      /* dialog is a toplevel (but not a GimpDockWindow) or a GimpDockable */
+
+      GIMP_LOG (DIALOG_FACTORY, "adding %s \"%s\"",
+                toplevel ? "toplevel" : "dockable",
+                entry->identifier);
+
+      for (list = factory->p->session_infos; list; list = g_list_next (list))
+        {
+          GimpSessionInfo *current_info = list->data;
+
+          if (gimp_session_info_get_factory_entry (current_info) == entry)
+            {
+              if (gimp_session_info_get_widget (current_info))
+                {
+                  if (gimp_session_info_is_singleton (current_info))
+                    {
+                      g_warning ("%s: singleton dialog \"%s\" created twice",
+                                 G_STRFUNC, entry->identifier);
+
+                      GIMP_LOG (DIALOG_FACTORY,
+                                "corrupt session info: %p (widget %p)",
+                                current_info,
+                                gimp_session_info_get_widget (current_info));
+
+                      return;
+                    }
+
+                  continue;
+                }
+
+              gimp_session_info_set_widget (current_info, dialog);
+
+              GIMP_LOG (DIALOG_FACTORY,
+                        "updating session info %p (widget %p) for %s \"%s\"",
+                        current_info,
+                        gimp_session_info_get_widget (current_info),
+                        toplevel ? "toplevel" : "dockable",
+                        entry->identifier);
+
+              if (toplevel &&
+                  gimp_session_info_is_session_managed (current_info) &&
+                  ! gtk_widget_get_visible (dialog))
+                {
+                  GimpGuiConfig *gui_config;
+
+                  gui_config = GIMP_GUI_CONFIG (factory->p->context->gimp->config);
+
+                  gimp_session_info_apply_geometry (current_info,
+                                                    screen, monitor,
+                                                    gui_config->restore_monitor);
+                }
+
+              info = current_info;
+              break;
+            }
+        }
+
+      if (! info)
+        {
+          info = gimp_session_info_new ();
+
+          gimp_session_info_set_widget (info, dialog);
+
+          GIMP_LOG (DIALOG_FACTORY,
+                    "creating session info %p (widget %p) for %s \"%s\"",
+                    info,
+                    gimp_session_info_get_widget (info),
+                    toplevel ? "toplevel" : "dockable",
+                    entry->identifier);
+
+          gimp_session_info_set_factory_entry (info, entry);
+
+          if (gimp_session_info_is_session_managed (info))
+            {
+              /* Make the dialog show up at the user position the
+               * first time it is shown. After it has been shown the
+               * first time we don't want it to show at the mouse the
+               * next time. Think of the use cases "hide and show with
+               * tab" and "change virtual desktops"
+               */
+              GIMP_LOG (WM, "setting GTK_WIN_POS_MOUSE for %p (\"%s\")\n",
+                        dialog, entry->identifier);
+
+              gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+              g_signal_connect (dialog, "configure-event",
+                                G_CALLBACK (gimp_dialog_factory_set_user_pos),
+                                NULL);
+            }
+
+          gimp_dialog_factory_add_session_info (factory, info);
+          g_object_unref (info);
+        }
+    }
+
+  /* Some special logic for dock windows */
+  if (GIMP_IS_DOCK_WINDOW (dialog))
+    {
+      g_signal_emit (factory, factory_signals[DOCK_WINDOW_ADDED], 0, dialog);
+    }
+
+  factory->p->open_dialogs = g_list_prepend (factory->p->open_dialogs, dialog);
+
+  g_signal_connect_object (dialog, "destroy",
+                           G_CALLBACK (gimp_dialog_factory_remove_dialog),
+                           factory,
+                           G_CONNECT_SWAPPED);
+
+  if (gimp_session_info_is_session_managed (info))
+    g_signal_connect_object (dialog, "configure-event",
+                             G_CALLBACK (gimp_dialog_factory_dialog_configure),
+                             factory,
+                             0);
+}
+
+void
+gimp_dialog_factory_add_foreign (GimpDialogFactory *factory,
+                                 const gchar       *identifier,
+                                 GtkWidget         *dialog,
+                                 GdkScreen         *screen,
+                                 gint               monitor)
+{
+  GimpDialogFactory      *dialog_factory;
+  GimpDialogFactoryEntry *entry;
+
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (identifier != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+  g_return_if_fail (gtk_widget_is_toplevel (dialog));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  dialog_factory = gimp_dialog_factory_from_widget (dialog, &entry);
+
+  if (dialog_factory || entry)
+    {
+      g_warning ("%s: dialog was created by a GimpDialogFactory",
+                 G_STRFUNC);
+      return;
+    }
+
+  entry = gimp_dialog_factory_find_entry (factory, identifier);
+
+  if (! entry)
+    {
+      g_warning ("%s: no entry registered for \"%s\"",
+                 G_STRFUNC, identifier);
+      return;
+    }
+
+  if (entry->new_func)
+    {
+      g_warning ("%s: entry for \"%s\" has a constructor (is not foreign)",
+                 G_STRFUNC, identifier);
+      return;
+    }
+
+  gimp_dialog_factory_set_widget_data (dialog, factory, entry);
+
+  gimp_dialog_factory_add_dialog (factory, dialog, screen, monitor);
+}
+
+/**
+ * gimp_dialog_factory_position_dialog:
+ * @factory:
+ * @identifier:
+ * @dialog:
+ * @screen:
+ * @monitor:
+ *
+ * We correctly position all newly created dialog via
+ * gimp_dialog_factory_add_dialog(), but some dialogs (like various
+ * color dialogs) are never destroyed but created only once per
+ * session. On re-showing, whatever window managing magic kicks in and
+ * the dialog sometimes goes where it shouldn't.
+ *
+ * This function correctly positions a dialog on re-showing so it
+ * appears where it was before it was hidden.
+ *
+ * See https://gitlab.gnome.org/GNOME/gimp/issues/1093
+ **/
+void
+gimp_dialog_factory_position_dialog (GimpDialogFactory *factory,
+                                     const gchar       *identifier,
+                                     GtkWidget         *dialog,
+                                     GdkScreen         *screen,
+                                     gint               monitor)
+{
+  GimpSessionInfo *info;
+  GimpGuiConfig   *gui_config;
+
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (identifier != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+  g_return_if_fail (gtk_widget_is_toplevel (dialog));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  info = gimp_dialog_factory_find_session_info (factory, identifier);
+
+  if (! info)
+    {
+      g_warning ("%s: no session info found for \"%s\"",
+                 G_STRFUNC, identifier);
+      return;
+    }
+
+  if (gimp_session_info_get_widget (info) != dialog)
+    {
+      g_warning ("%s: session info for \"%s\" is for a different widget",
+                 G_STRFUNC, identifier);
+      return;
+    }
+
+  gui_config = GIMP_GUI_CONFIG (factory->p->context->gimp->config);
+
+  gimp_session_info_apply_geometry (info,
+                                    screen, monitor,
+                                    gui_config->restore_monitor);
+}
+
+void
+gimp_dialog_factory_remove_dialog (GimpDialogFactory *factory,
+                                   GtkWidget         *dialog)
+{
+  GimpDialogFactory      *dialog_factory;
+  GimpDialogFactoryEntry *entry;
+  GList                  *list;
+
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+
+  if (! g_list_find (factory->p->open_dialogs, dialog))
+    {
+      g_warning ("%s: dialog not registered", G_STRFUNC);
+      return;
+    }
+
+  factory->p->open_dialogs = g_list_remove (factory->p->open_dialogs, dialog);
+
+  dialog_factory = gimp_dialog_factory_from_widget (dialog, &entry);
+
+  if (! gimp_dialog_factory_dialog_sane (factory,
+                                         dialog_factory,
+                                         entry,
+                                         dialog))
+    return;
+
+  GIMP_LOG (DIALOG_FACTORY, "removing \"%s\" (dialog = %p)",
+            entry->identifier,
+            dialog);
+
+  for (list = factory->p->session_infos; list; list = g_list_next (list))
+    {
+      GimpSessionInfo *session_info = list->data;
+
+      if (gimp_session_info_get_widget (session_info) == dialog)
+        {
+          GIMP_LOG (DIALOG_FACTORY,
+                    "clearing session info %p (widget %p) for \"%s\"",
+                    session_info, gimp_session_info_get_widget (session_info),
+                    entry->identifier);
+
+          gimp_session_info_set_widget (session_info, NULL);
+
+          gimp_dialog_factory_unset_widget_data (dialog);
+
+          g_signal_handlers_disconnect_by_func (dialog,
+                                                gimp_dialog_factory_set_user_pos,
+                                                NULL);
+          g_signal_handlers_disconnect_by_func (dialog,
+                                                gimp_dialog_factory_remove_dialog,
+                                                factory);
+
+          if (gimp_session_info_is_session_managed (session_info))
+            g_signal_handlers_disconnect_by_func (dialog,
+                                                  gimp_dialog_factory_dialog_configure,
+                                                  factory);
+
+          if (GIMP_IS_DOCK_WINDOW (dialog))
+            {
+              /*  don't save session info for empty docks  */
+              factory->p->session_infos = g_list_remove (factory->p->session_infos,
+                                                         session_info);
+              g_object_unref (session_info);
+
+              g_signal_emit (factory, factory_signals[DOCK_WINDOW_REMOVED], 0,
+                             dialog);
+            }
+
+          break;
+        }
+    }
+}
+
+void
+gimp_dialog_factory_hide_dialog (GtkWidget *dialog)
+{
+  GimpDialogFactory *factory = NULL;
+
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+  g_return_if_fail (gtk_widget_is_toplevel (dialog));
+
+  if (! (factory = gimp_dialog_factory_from_widget (dialog, NULL)))
+    {
+      g_warning ("%s: dialog was not created by a GimpDialogFactory",
+                 G_STRFUNC);
+      return;
+    }
+
+  gtk_widget_hide (dialog);
+
+  if (factory->p->dialog_state != GIMP_DIALOGS_SHOWN)
+    g_object_set_data (G_OBJECT (dialog), GIMP_DIALOG_VISIBILITY_KEY,
+                       GINT_TO_POINTER (GIMP_DIALOG_VISIBILITY_INVISIBLE));
+}
+
+void
+gimp_dialog_factory_set_state (GimpDialogFactory *factory,
+                               GimpDialogsState   state)
+{
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+
+  factory->p->dialog_state = state;
+
+  if (state == GIMP_DIALOGS_SHOWN)
+    {
+      gimp_dialog_factory_show (factory);
+    }
+  else
+    {
+      gimp_dialog_factory_hide (factory);
+    }
+}
+
+GimpDialogsState
+gimp_dialog_factory_get_state (GimpDialogFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), 0);
+
+  return factory->p->dialog_state;
+}
+
+void
+gimp_dialog_factory_show_with_display (GimpDialogFactory *factory)
+{
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+
+  if (factory->p->dialog_state == GIMP_DIALOGS_HIDDEN_WITH_DISPLAY)
+    {
+      gimp_dialog_factory_set_state (factory, GIMP_DIALOGS_SHOWN);
+    }
+}
+
+void
+gimp_dialog_factory_hide_with_display (GimpDialogFactory *factory)
+{
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+
+  if (factory->p->dialog_state == GIMP_DIALOGS_SHOWN)
+    {
+      gimp_dialog_factory_set_state (factory, GIMP_DIALOGS_HIDDEN_WITH_DISPLAY);
+    }
+}
+
+static GQuark gimp_dialog_factory_key       = 0;
+static GQuark gimp_dialog_factory_entry_key = 0;
+
+GimpDialogFactory *
+gimp_dialog_factory_from_widget (GtkWidget               *dialog,
+                                 GimpDialogFactoryEntry **entry)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (dialog), NULL);
+
+  if (! gimp_dialog_factory_key)
+    {
+      gimp_dialog_factory_key =
+        g_quark_from_static_string ("gimp-dialog-factory");
+
+      gimp_dialog_factory_entry_key =
+        g_quark_from_static_string ("gimp-dialog-factory-entry");
+    }
+
+  if (entry)
+    *entry = g_object_get_qdata (G_OBJECT (dialog),
+                                 gimp_dialog_factory_entry_key);
+
+  return g_object_get_qdata (G_OBJECT (dialog), gimp_dialog_factory_key);
+}
+
+#define GIMP_DIALOG_FACTORY_MIN_SIZE_KEY "gimp-dialog-factory-min-size"
+
+void
+gimp_dialog_factory_set_has_min_size (GtkWindow *window,
+                                      gboolean   has_min_size)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  g_object_set_data (G_OBJECT (window), GIMP_DIALOG_FACTORY_MIN_SIZE_KEY,
+                     GINT_TO_POINTER (has_min_size ? TRUE : FALSE));
+}
+
+gboolean
+gimp_dialog_factory_get_has_min_size (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window),
+                                             GIMP_DIALOG_FACTORY_MIN_SIZE_KEY));
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+gimp_dialog_factory_constructor (GimpDialogFactory      *factory,
+                                 GimpDialogFactoryEntry *entry,
+                                 GimpContext            *context,
+                                 GimpUIManager          *ui_manager,
+                                 gint                    view_size)
+{
+  GtkWidget *widget;
+
+  widget = entry->new_func (factory, context, ui_manager, view_size);
+
+  /* The entry is for a dockable, so we simply need to put the created
+   * widget in a dockable
+   */
+  if (widget && entry->dockable)
+    {
+      GtkWidget *dockable = NULL;
+
+      dockable = gimp_dockable_new (entry->name, entry->blurb,
+                                    entry->icon_name, entry->help_id);
+      gtk_container_add (GTK_CONTAINER (dockable), widget);
+      gtk_widget_show (widget);
+
+      /* EEK */
+      g_object_set_data (G_OBJECT (dockable), "gimp-dialog-identifier",
+                         entry->identifier);
+
+      /* Return the dockable instead */
+      widget = dockable;
+    }
+
+  return widget;
+}
+
+static void
+gimp_dialog_factory_config_notify (GimpDialogFactory *factory,
+                                   GParamSpec        *pspec,
+                                   GimpGuiConfig     *config)
+{
+  GimpDialogsState state     = gimp_dialog_factory_get_state (factory);
+  GimpDialogsState new_state = state;
+
+  /* Make sure the state and config are in sync */
+  if (config->hide_docks && state == GIMP_DIALOGS_SHOWN)
+    new_state = GIMP_DIALOGS_HIDDEN_EXPLICITLY;
+  else if (! config->hide_docks)
+    new_state = GIMP_DIALOGS_SHOWN;
+
+  if (state != new_state)
+    gimp_dialog_factory_set_state (factory, new_state);
+}
+
+static void
+gimp_dialog_factory_set_widget_data (GtkWidget              *dialog,
+                                     GimpDialogFactory      *factory,
+                                     GimpDialogFactoryEntry *entry)
+{
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+
+  if (! gimp_dialog_factory_key)
+    {
+      gimp_dialog_factory_key =
+        g_quark_from_static_string ("gimp-dialog-factory");
+
+      gimp_dialog_factory_entry_key =
+        g_quark_from_static_string ("gimp-dialog-factory-entry");
+    }
+
+  g_object_set_qdata (G_OBJECT (dialog), gimp_dialog_factory_key, factory);
+
+  if (entry)
+    g_object_set_qdata (G_OBJECT (dialog), gimp_dialog_factory_entry_key,
+                        entry);
+}
+
+static void
+gimp_dialog_factory_unset_widget_data (GtkWidget *dialog)
+{
+  g_return_if_fail (GTK_IS_WIDGET (dialog));
+
+  if (! gimp_dialog_factory_key)
+    return;
+
+  g_object_set_qdata (G_OBJECT (dialog), gimp_dialog_factory_key,       NULL);
+  g_object_set_qdata (G_OBJECT (dialog), gimp_dialog_factory_entry_key, NULL);
+}
+
+static gboolean
+gimp_dialog_factory_set_user_pos (GtkWidget         *dialog,
+                                  GdkEventConfigure *cevent,
+                                  gpointer           data)
+{
+  GdkWindowHints geometry_mask;
+
+  /* Not only set geometry hints, also reset window position */
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_NONE);
+  g_signal_handlers_disconnect_by_func (dialog,
+                                        gimp_dialog_factory_set_user_pos,
+                                        data);
+
+  GIMP_LOG (WM, "setting GDK_HINT_USER_POS for %p\n", dialog);
+  geometry_mask = GDK_HINT_USER_POS;
+
+  if (gimp_dialog_factory_get_has_min_size (GTK_WINDOW (dialog)))
+    geometry_mask |= GDK_HINT_MIN_SIZE;
+
+  gtk_window_set_geometry_hints (GTK_WINDOW (dialog), NULL, NULL,
+                                 geometry_mask);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_dialog_factory_dialog_configure (GtkWidget         *dialog,
+                                      GdkEventConfigure *cevent,
+                                      GimpDialogFactory *factory)
+{
+  GimpDialogFactory      *dialog_factory;
+  GimpDialogFactoryEntry *entry;
+  GList                  *list;
+
+  if (! g_list_find (factory->p->open_dialogs, dialog))
+    {
+      g_warning ("%s: dialog not registered", G_STRFUNC);
+      return FALSE;
+    }
+
+  dialog_factory = gimp_dialog_factory_from_widget (dialog, &entry);
+
+  if (! gimp_dialog_factory_dialog_sane (factory,
+                                         dialog_factory,
+                                         entry,
+                                         dialog))
+    return FALSE;
+
+  for (list = factory->p->session_infos; list; list = g_list_next (list))
+    {
+      GimpSessionInfo *session_info = list->data;
+
+      if (gimp_session_info_get_widget (session_info) == dialog)
+        {
+          gimp_session_info_read_geometry (session_info, cevent);
+
+          GIMP_LOG (DIALOG_FACTORY,
+                    "updated session info for \"%s\" from window geometry "
+                    "(x=%d y=%d  %dx%d)",
+                    entry->identifier,
+                    gimp_session_info_get_x (session_info),
+                    gimp_session_info_get_y (session_info),
+                    gimp_session_info_get_width (session_info),
+                    gimp_session_info_get_height (session_info));
+
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+void
+gimp_dialog_factory_save (GimpDialogFactory *factory,
+                          GimpConfigWriter  *writer)
+{
+  GList *infos;
+
+  for (infos = factory->p->session_infos; infos; infos = g_list_next (infos))
+    {
+      GimpSessionInfo *info = infos->data;
+
+      /*  we keep session info entries for all toplevel dialogs created
+       *  by the factory but don't save them if they don't want to be
+       *  managed
+       */
+      if (! gimp_session_info_is_session_managed (info) ||
+          gimp_session_info_get_factory_entry (info) == NULL)
+        continue;
+
+      if (gimp_session_info_get_widget (info))
+        gimp_session_info_get_info (info);
+
+      gimp_config_writer_open (writer, "session-info");
+      gimp_config_writer_string (writer,
+                                 gimp_object_get_name (factory));
+
+      GIMP_CONFIG_GET_INTERFACE (info)->serialize (GIMP_CONFIG (info),
+                                                   writer,
+                                                   NULL);
+
+      gimp_config_writer_close (writer);
+
+      if (gimp_session_info_get_widget (info))
+        gimp_session_info_clear_info (info);
+    }
+}
+
+void
+gimp_dialog_factory_restore (GimpDialogFactory *factory,
+                             GdkScreen         *screen,
+                             gint               monitor)
+{
+  GList *infos;
+
+  for (infos = factory->p->session_infos; infos; infos = g_list_next (infos))
+    {
+      GimpSessionInfo *info = infos->data;
+
+      if (gimp_session_info_get_open (info))
+        {
+          gimp_session_info_restore (info, factory, screen, monitor);
+        }
+      else
+        {
+          GIMP_LOG (DIALOG_FACTORY,
+                    "skipping to restore session info %p, not open",
+                    info);
+        }
+    }
+}
+
+static void
+gimp_dialog_factory_hide (GimpDialogFactory *factory)
+{
+  GList *list;
+
+  for (list = factory->p->open_dialogs; list; list = g_list_next (list))
+    {
+      GtkWidget *widget = list->data;
+
+      if (GTK_IS_WIDGET (widget) && gtk_widget_is_toplevel (widget))
+        {
+          GimpDialogFactoryEntry    *entry      = NULL;
+          GimpDialogVisibilityState  visibility = GIMP_DIALOG_VISIBILITY_UNKNOWN;
+
+          gimp_dialog_factory_from_widget (widget, &entry);
+          if (! entry->hideable)
+            continue;
+
+          if (gtk_widget_get_visible (widget))
+            {
+              gtk_widget_hide (widget);
+              visibility = GIMP_DIALOG_VISIBILITY_HIDDEN;
+
+              GIMP_LOG (WM, "Hiding '%s' [%p]",
+                        gtk_window_get_title (GTK_WINDOW (widget)),
+                        widget);
+            }
+          else
+            {
+              visibility = GIMP_DIALOG_VISIBILITY_INVISIBLE;
+            }
+
+          g_object_set_data (G_OBJECT (widget),
+                             GIMP_DIALOG_VISIBILITY_KEY,
+                             GINT_TO_POINTER (visibility));
+        }
+    }
+}
+
+static void
+gimp_dialog_factory_show (GimpDialogFactory *factory)
+{
+  GList *list;
+
+  for (list = factory->p->open_dialogs; list; list = g_list_next (list))
+    {
+      GtkWidget *widget = list->data;
+
+      if (GTK_IS_WIDGET (widget) && gtk_widget_is_toplevel (widget))
+        {
+          GimpDialogVisibilityState visibility;
+
+          visibility =
+            GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                GIMP_DIALOG_VISIBILITY_KEY));
+
+          if (! gtk_widget_get_visible (widget) &&
+              visibility == GIMP_DIALOG_VISIBILITY_HIDDEN)
+            {
+              GIMP_LOG (WM, "Showing '%s' [%p]",
+                        gtk_window_get_title (GTK_WINDOW (widget)),
+                        widget);
+
+              /* Don't use gtk_window_present() here, we don't want the
+               * keyboard focus to move.
+               */
+              gtk_widget_show (widget);
+              g_object_set_data (G_OBJECT (widget),
+                                 GIMP_DIALOG_VISIBILITY_KEY,
+                                 GINT_TO_POINTER (GIMP_DIALOG_VISIBILITY_VISIBLE));
+
+              if (gtk_widget_get_visible (widget))
+                gdk_window_raise (gtk_widget_get_window (widget));
+            }
+        }
+    }
+}
+
+void
+gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
+{
+  GList *list;
+
+  if (! factory)
+    return;
+
+  for (list = factory->p->open_dialogs; list; list = g_list_next (list))
+    {
+      GtkWidget *widget = list->data;
+
+      if (GTK_IS_WIDGET (widget) && gtk_widget_is_toplevel (widget))
+        {
+          GdkWindow *window = gtk_widget_get_window (widget);
+
+          if (window)
+            {
+              GdkCursor *cursor = gimp_cursor_new (window,
+                                                   GIMP_HANDEDNESS_RIGHT,
+                                                   (GimpCursorType) GDK_WATCH,
+                                                   GIMP_TOOL_CURSOR_NONE,
+                                                   GIMP_CURSOR_MODIFIER_NONE);
+              gdk_window_set_cursor (window, cursor);
+              gdk_cursor_unref (cursor);
+            }
+        }
+    }
+}
+
+void
+gimp_dialog_factory_unset_busy (GimpDialogFactory *factory)
+{
+  GList *list;
+
+  if (! factory)
+    return;
+
+  for (list = factory->p->open_dialogs; list; list = g_list_next (list))
+    {
+      GtkWidget *widget = list->data;
+
+      if (GTK_IS_WIDGET (widget) && gtk_widget_is_toplevel (widget))
+        {
+          GdkWindow *window = gtk_widget_get_window (widget);
+
+          if (window)
+            gdk_window_set_cursor (window, NULL);
+        }
+    }
+}
+
+/**
+ * gimp_dialog_factory_get_singleton:
+ *
+ * Returns: The toplevel GimpDialogFactory instance.
+ **/
+GimpDialogFactory *
+gimp_dialog_factory_get_singleton (void)
+{
+  g_return_val_if_fail (gimp_toplevel_factory != NULL, NULL);
+
+  return gimp_toplevel_factory;
+}
+
+/**
+ * gimp_dialog_factory_set_singleton:
+ * @:
+ *
+ * Set the toplevel GimpDialogFactory instance. Must only be called by
+ * dialogs_init()!.
+ **/
+void
+gimp_dialog_factory_set_singleton (GimpDialogFactory *factory)
+{
+  g_return_if_fail (gimp_toplevel_factory == NULL ||
+                    factory               == NULL);
+
+  gimp_toplevel_factory = factory;
+}
diff --git a/app/widgets/gimpdialogfactory.h b/app/widgets/gimpdialogfactory.h
new file mode 100644
index 0000000..52d6d48
--- /dev/null
+++ b/app/widgets/gimpdialogfactory.h
@@ -0,0 +1,217 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdialogfactory.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DIALOG_FACTORY_H__
+#define __GIMP_DIALOG_FACTORY_H__
+
+
+#include "core/gimpobject.h"
+
+#define GIMP_DIALOG_VISIBILITY_KEY "gimp-dialog-visibility"
+
+typedef enum
+{
+  GIMP_DIALOG_VISIBILITY_UNKNOWN = 0,
+  GIMP_DIALOG_VISIBILITY_INVISIBLE,
+  GIMP_DIALOG_VISIBILITY_VISIBLE,
+  GIMP_DIALOG_VISIBILITY_HIDDEN
+} GimpDialogVisibilityState;
+
+
+/* In order to support constructors of various types, these functions
+ * takes the union of the set of arguments required for each type of
+ * widget constructor. If this set becomes too big we can consider
+ * passing a struct or use varargs.
+ */
+typedef GtkWidget * (* GimpDialogNewFunc)     (GimpDialogFactory      *factory,
+                                               GimpContext            *context,
+                                               GimpUIManager          *ui_manager,
+                                               gint                    view_size);
+
+
+struct _GimpDialogFactoryEntry
+{
+  gchar                *identifier;
+  gchar                *name;
+  gchar                *blurb;
+  gchar                *icon_name;
+  gchar                *help_id;
+
+  GimpDialogNewFunc     new_func;
+  GimpDialogRestoreFunc restore_func;
+  gint                  view_size;
+
+  gboolean              singleton;
+  gboolean              session_managed;
+  gboolean              remember_size;
+  gboolean              remember_if_open;
+
+  /* If TRUE the visibility of the dialog is toggleable */
+  gboolean              hideable;
+
+  /* If TRUE the entry is for a GimpImageWindow, FALSE otherwise */
+  gboolean              image_window;
+
+  /* If TRUE the entry is for a dockable, FALSE otherwise */
+  gboolean              dockable;
+};
+
+
+#define GIMP_TYPE_DIALOG_FACTORY            (gimp_dialog_factory_get_type ())
+#define GIMP_DIALOG_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DIALOG_FACTORY, GimpDialogFactory))
+#define GIMP_DIALOG_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DIALOG_FACTORY, GimpDialogFactoryClass))
+#define GIMP_IS_DIALOG_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DIALOG_FACTORY))
+#define GIMP_IS_DIALOG_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DIALOG_FACTORY))
+#define GIMP_DIALOG_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DIALOG_FACTORY, GimpDialogFactoryClass))
+
+
+typedef struct _GimpDialogFactoryPrivate  GimpDialogFactoryPrivate;
+typedef struct _GimpDialogFactoryClass    GimpDialogFactoryClass;
+
+/**
+ * GimpDialogFactory:
+ *
+ * A factory with the main purpose of creating toplevel windows and
+ * position them according to the session information kept within the
+ * factory. Over time it has accumulated more functionality than this.
+ */
+struct _GimpDialogFactory
+{
+  GimpObject                parent_instance;
+
+  GimpDialogFactoryPrivate *p;
+};
+
+struct _GimpDialogFactoryClass
+{
+  GimpObjectClass  parent_class;
+
+  void (* dock_window_added)   (GimpDialogFactory *factory,
+                                GimpDockWindow    *dock_window);
+  void (* dock_window_removed) (GimpDialogFactory *factory,
+                                GimpDockWindow    *dock_window);
+};
+
+
+GType               gimp_dialog_factory_get_type             (void) G_GNUC_CONST;
+GimpDialogFactory * gimp_dialog_factory_new                  (const gchar             *name,
+                                                              GimpContext             *context,
+                                                              GimpMenuFactory         *menu_factory);
+
+void                gimp_dialog_factory_register_entry       (GimpDialogFactory       *factory,
+                                                              const gchar             *identifier,
+                                                              const gchar             *name,
+                                                              const gchar             *blurb,
+                                                              const gchar             *icon_name,
+                                                              const gchar             *help_id,
+                                                              GimpDialogNewFunc        new_func,
+                                                              GimpDialogRestoreFunc    restore_func,
+                                                              gint                     view_size,
+                                                              gboolean                 singleton,
+                                                              gboolean                 session_managed,
+                                                              gboolean                 remember_size,
+                                                              gboolean                 remember_if_open,
+                                                              gboolean                 hideable,
+                                                              gboolean                 image_window,
+                                                              gboolean                 dockable);
+
+GimpDialogFactoryEntry *
+                    gimp_dialog_factory_find_entry           (GimpDialogFactory       *factory,
+                                                              const gchar             *identifier);
+GimpSessionInfo *   gimp_dialog_factory_find_session_info    (GimpDialogFactory       *factory,
+                                                              const gchar             *identifier);
+GtkWidget *         gimp_dialog_factory_find_widget          (GimpDialogFactory       *factory,
+                                                              const gchar             *identifiers);
+
+GtkWidget *         gimp_dialog_factory_dialog_new           (GimpDialogFactory       *factory,
+                                                              GdkScreen               *screen,
+                                                              gint                     monitor,
+                                                              GimpUIManager           *ui_manager,
+                                                              const gchar             *identifier,
+                                                              gint                     view_size,
+                                                              gboolean                 present);
+
+GimpContext *       gimp_dialog_factory_get_context          (GimpDialogFactory       *factory);
+GimpMenuFactory *   gimp_dialog_factory_get_menu_factory     (GimpDialogFactory       *factory);
+GList *             gimp_dialog_factory_get_open_dialogs     (GimpDialogFactory       *factory);
+
+GList *             gimp_dialog_factory_get_session_infos    (GimpDialogFactory       *factory);
+void                gimp_dialog_factory_add_session_info     (GimpDialogFactory       *factory,
+                                                              GimpSessionInfo         *info);
+
+GtkWidget *         gimp_dialog_factory_dialog_raise         (GimpDialogFactory       *factory,
+                                                              GdkScreen               *screen,
+                                                              gint                     monitor,
+                                                              const gchar             *identifiers,
+                                                              gint                     view_size);
+
+GtkWidget *         gimp_dialog_factory_dockable_new         (GimpDialogFactory       *factory,
+                                                              GimpDock                *dock,
+                                                              const gchar             *identifier,
+                                                              gint                     view_size);
+
+void                gimp_dialog_factory_add_dialog           (GimpDialogFactory       *factory,
+                                                              GtkWidget               *dialog,
+                                                              GdkScreen               *screen,
+                                                              gint                     monitor);
+void                gimp_dialog_factory_add_foreign          (GimpDialogFactory       *factory,
+                                                              const gchar             *identifier,
+                                                              GtkWidget               *dialog,
+                                                              GdkScreen               *screen,
+                                                              gint                     monitor);
+
+void                gimp_dialog_factory_position_dialog      (GimpDialogFactory       *factory,
+                                                              const gchar             *identifier,
+                                                              GtkWidget               *dialog,
+                                                              GdkScreen               *screen,
+                                                              gint                     monitor);
+void                gimp_dialog_factory_remove_dialog        (GimpDialogFactory       *factory,
+                                                              GtkWidget               *dialog);
+
+void                gimp_dialog_factory_hide_dialog          (GtkWidget               *dialog);
+
+void                gimp_dialog_factory_save                 (GimpDialogFactory       *factory,
+                                                              GimpConfigWriter        *writer);
+void                gimp_dialog_factory_restore              (GimpDialogFactory       *factory,
+                                                              GdkScreen               *screen,
+                                                              gint                     monitor);
+
+void                gimp_dialog_factory_set_state            (GimpDialogFactory       *factory,
+                                                              GimpDialogsState         state);
+GimpDialogsState    gimp_dialog_factory_get_state            (GimpDialogFactory       *factory);
+
+void                gimp_dialog_factory_show_with_display    (GimpDialogFactory       *factory);
+void                gimp_dialog_factory_hide_with_display    (GimpDialogFactory       *factory);
+
+void                gimp_dialog_factory_set_busy             (GimpDialogFactory       *factory);
+void                gimp_dialog_factory_unset_busy           (GimpDialogFactory       *factory);
+
+GimpDialogFactory * gimp_dialog_factory_from_widget          (GtkWidget               *dialog,
+                                                              GimpDialogFactoryEntry **entry);
+
+void                gimp_dialog_factory_set_has_min_size     (GtkWindow               *window,
+                                                              gboolean                 has_min_size);
+gboolean            gimp_dialog_factory_get_has_min_size     (GtkWindow               *window);
+
+GimpDialogFactory * gimp_dialog_factory_get_singleton        (void);
+void                gimp_dialog_factory_set_singleton        (GimpDialogFactory       *factory);
+
+
+#endif  /*  __GIMP_DIALOG_FACTORY_H__  */
diff --git a/app/widgets/gimpdnd-xds.c b/app/widgets/gimpdnd-xds.c
new file mode 100644
index 0000000..f04c179
--- /dev/null
+++ b/app/widgets/gimpdnd-xds.c
@@ -0,0 +1,262 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpdnd-xds.c
+ * Copyright (C) 2005  Sven Neumann <sven@gimp.org>
+ *
+ * Saving Files via Drag-and-Drop:
+ * The Direct Save Protocol for the X Window System
+ *
+ *   http://www.newplanetsoftware.com/xds/
+ *   http://rox.sourceforge.net/xds.html
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#undef GSEAL_ENABLE
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpimage.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "file/file-save.h"
+
+#include "gimpdnd-xds.h"
+#include "gimpfiledialog.h"
+#include "gimpmessagebox.h"
+#include "gimpmessagedialog.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+#define MAX_URI_LEN 4096
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_file_overwrite_dialog (GtkWidget *parent,
+                                              GFile     *file);
+
+
+/*  public functions  */
+
+void
+gimp_dnd_xds_source_set (GdkDragContext *context,
+                         GimpImage      *image)
+{
+  GdkAtom  property;
+
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  GIMP_LOG (DND, NULL);
+
+  property = gdk_atom_intern_static_string ("XdndDirectSave0");
+
+  if (image)
+    {
+      GdkAtom  type = gdk_atom_intern_static_string ("text/plain");
+      GFile   *untitled;
+      GFile   *file;
+      gchar   *basename;
+
+      basename = g_strconcat (_("Untitled"), ".xcf", NULL);
+      untitled = g_file_new_for_path (basename);
+      g_free (basename);
+
+      file = gimp_image_get_any_file (image);
+
+      if (file)
+        {
+          GFile *xcf_file = gimp_file_with_new_extension (file, untitled);
+          basename = g_file_get_basename (xcf_file);
+          g_object_unref (xcf_file);
+        }
+      else
+        {
+          basename = g_file_get_path (untitled);
+        }
+
+      g_object_unref (untitled);
+
+      gdk_property_change (context->source_window,
+                           property, type, 8, GDK_PROP_MODE_REPLACE,
+                           (const guchar *) basename,
+                           basename ? strlen (basename) : 0);
+
+      g_free (basename);
+    }
+  else
+    {
+      gdk_property_delete (context->source_window, property);
+    }
+}
+
+void
+gimp_dnd_xds_save_image (GdkDragContext   *context,
+                         GimpImage        *image,
+                         GtkSelectionData *selection)
+{
+  GimpPlugInProcedure *proc;
+  GdkAtom              property;
+  GdkAtom              type;
+  gint                 length;
+  guchar              *data;
+  gchar               *uri;
+  GFile               *file;
+  gboolean             export = FALSE;
+  GError              *error  = NULL;
+
+  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  GIMP_LOG (DND, NULL);
+
+  property = gdk_atom_intern_static_string ("XdndDirectSave0");
+  type     = gdk_atom_intern_static_string ("text/plain");
+
+  if (! gdk_property_get (context->source_window, property, type,
+                          0, MAX_URI_LEN, FALSE,
+                          NULL, NULL, &length, &data))
+    return;
+
+
+  uri = g_strndup ((const gchar *) data, length);
+  g_free (data);
+
+  file = g_file_new_for_uri (uri);
+
+  proc = gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                   GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                                                   file, NULL);
+  if (! proc)
+    {
+      proc = gimp_plug_in_manager_file_procedure_find (image->gimp->plug_in_manager,
+                                                       GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                                                       file, NULL);
+      export = TRUE;
+    }
+
+  if (proc)
+    {
+      if (! g_file_query_exists (file, NULL) ||
+          gimp_file_overwrite_dialog (NULL, file))
+        {
+          if (file_save (image->gimp,
+                         image, NULL,
+                         file, proc, GIMP_RUN_INTERACTIVE,
+                         ! export, FALSE, export,
+                         &error) == GIMP_PDB_SUCCESS)
+            {
+              gtk_selection_data_set (selection,
+                                      gtk_selection_data_get_target (selection),
+                                      8, (const guchar *) "S", 1);
+            }
+          else
+            {
+              gtk_selection_data_set (selection,
+                                      gtk_selection_data_get_target (selection),
+                                      8, (const guchar *) "E", 1);
+
+              if (error)
+                {
+                  gimp_message (image->gimp, NULL, GIMP_MESSAGE_ERROR,
+                                _("Saving '%s' failed:\n\n%s"),
+                                gimp_file_get_utf8_name (file),
+                                error->message);
+                  g_clear_error (&error);
+                }
+            }
+        }
+    }
+  else
+    {
+      gtk_selection_data_set (selection,
+                              gtk_selection_data_get_target (selection),
+                              8, (const guchar *) "E", 1);
+
+      gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            _("The given filename does not have any known "
+                              "file extension."));
+    }
+
+  g_object_unref (file);
+  g_free (uri);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_file_overwrite_dialog (GtkWidget *parent,
+                            GFile     *file)
+{
+  GtkWidget *dialog;
+  gboolean   overwrite = FALSE;
+
+  dialog = gimp_message_dialog_new (_("File Exists"),
+                                    GIMP_ICON_DIALOG_WARNING,
+                                    parent, GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    gimp_standard_help_func, NULL,
+
+                                    _("_Cancel"),  GTK_RESPONSE_CANCEL,
+                                    _("_Replace"), GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("A file named '%s' already exists."),
+                                     gimp_file_get_utf8_name (file));
+
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("Do you want to replace it with the image "
+                               "you are saving?"));
+
+  if (GTK_IS_DIALOG (parent))
+    gtk_dialog_set_response_sensitive (GTK_DIALOG (parent),
+                                       GTK_RESPONSE_CANCEL, FALSE);
+
+  g_object_ref (dialog);
+
+  overwrite = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
+
+  gtk_widget_destroy (dialog);
+  g_object_unref (dialog);
+
+  if (GTK_IS_DIALOG (parent))
+    gtk_dialog_set_response_sensitive (GTK_DIALOG (parent),
+                                       GTK_RESPONSE_CANCEL, TRUE);
+
+  return overwrite;
+}
diff --git a/app/widgets/gimpdnd-xds.h b/app/widgets/gimpdnd-xds.h
new file mode 100644
index 0000000..c6aa4c1
--- /dev/null
+++ b/app/widgets/gimpdnd-xds.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpdnd-xds.c
+ * Copyright (C) 2005  Sven Neumann <sven@gimp.org>
+ *
+ * Saving Files via Drag-and-Drop:
+ * The Direct Save Protocol for the X Window System
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DND_XDS_H__
+#define __GIMP_DND_XDS_H__
+
+
+void  gimp_dnd_xds_source_set (GdkDragContext   *context,
+                               GimpImage        *image);
+void  gimp_dnd_xds_save_image (GdkDragContext   *context,
+                               GimpImage        *image,
+                               GtkSelectionData *selection);
+
+
+#endif /* __GIMP_DND_XDS_H__ */
diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c
new file mode 100644
index 0000000..7be8622
--- /dev/null
+++ b/app/widgets/gimpdnd.c
@@ -0,0 +1,2465 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimppalette.h"
+#include "core/gimppattern.h"
+#include "core/gimptemplate.h"
+#include "core/gimptoolitem.h"
+
+#include "text/gimpfont.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimpdnd.h"
+#include "gimpdnd-xds.h"
+#include "gimppixbuf.h"
+#include "gimpselectiondata.h"
+#include "gimpview.h"
+#include "gimpviewrendererimage.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+#define DRAG_PREVIEW_SIZE  GIMP_VIEW_SIZE_LARGE
+#define DRAG_ICON_OFFSET   -8
+
+
+typedef GtkWidget * (* GimpDndGetIconFunc)  (GtkWidget        *widget,
+                                             GdkDragContext   *context,
+                                             GCallback         get_data_func,
+                                             gpointer          get_data_data);
+typedef void        (* GimpDndDragDataFunc) (GtkWidget        *widget,
+                                             GdkDragContext   *context,
+                                             GCallback         get_data_func,
+                                             gpointer          get_data_data,
+                                             GtkSelectionData *selection);
+typedef gboolean    (* GimpDndDropDataFunc) (GtkWidget        *widget,
+                                             gint              x,
+                                             gint              y,
+                                             GCallback         set_data_func,
+                                             gpointer          set_data_data,
+                                             GtkSelectionData *selection);
+
+
+typedef struct _GimpDndDataDef GimpDndDataDef;
+
+struct _GimpDndDataDef
+{
+  GtkTargetEntry       target_entry;
+
+  const gchar         *get_data_func_name;
+  const gchar         *get_data_data_name;
+
+  const gchar         *set_data_func_name;
+  const gchar         *set_data_data_name;
+
+  GimpDndGetIconFunc   get_icon_func;
+  GimpDndDragDataFunc  get_data_func;
+  GimpDndDropDataFunc  set_data_func;
+};
+
+
+static GtkWidget * gimp_dnd_get_viewable_icon   (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_viewable_func,
+                                                 gpointer          get_viewable_data);
+static GtkWidget * gimp_dnd_get_component_icon  (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_comp_func,
+                                                 gpointer          get_comp_data);
+static GtkWidget * gimp_dnd_get_color_icon      (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_color_func,
+                                                 gpointer          get_color_data);
+
+static void        gimp_dnd_get_uri_list_data   (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_uri_list_func,
+                                                 gpointer          get_uri_list_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_uri_list_data   (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_uri_list_func,
+                                                 gpointer          set_uri_list_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_xds_data        (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_image_func,
+                                                 gpointer          get_image_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_color_data      (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_color_func,
+                                                 gpointer          get_color_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_color_data      (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_color_func,
+                                                 gpointer          set_color_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_stream_data     (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_stream_func,
+                                                 gpointer          get_stream_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_stream_data     (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_stream_func,
+                                                 gpointer          set_stream_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_pixbuf_data     (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_pixbuf_func,
+                                                 gpointer          get_pixbuf_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_pixbuf_data     (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_pixbuf_func,
+                                                 gpointer          set_pixbuf_data,
+                                                 GtkSelectionData *selection);
+static void        gimp_dnd_get_component_data  (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_comp_func,
+                                                 gpointer          get_comp_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_component_data  (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_comp_func,
+                                                 gpointer          set_comp_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_image_data      (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_image_func,
+                                                 gpointer          get_image_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_image_data      (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_image_func,
+                                                 gpointer          set_image_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_item_data       (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_item_func,
+                                                 gpointer          get_item_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_item_data       (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_item_func,
+                                                 gpointer          set_item_data,
+                                                 GtkSelectionData *selection);
+
+static void        gimp_dnd_get_object_data     (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GCallback         get_object_func,
+                                                 gpointer          get_object_data,
+                                                 GtkSelectionData *selection);
+
+static gboolean    gimp_dnd_set_brush_data      (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_brush_func,
+                                                 gpointer          set_brush_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_pattern_data    (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_pattern_func,
+                                                 gpointer          set_pattern_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_gradient_data   (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_gradient_func,
+                                                 gpointer          set_gradient_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_palette_data    (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_palette_func,
+                                                 gpointer          set_palette_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_font_data       (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_font_func,
+                                                 gpointer          set_font_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_buffer_data     (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_buffer_func,
+                                                 gpointer          set_buffer_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_imagefile_data  (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_imagefile_func,
+                                                 gpointer          set_imagefile_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_template_data   (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_template_func,
+                                                 gpointer          set_template_data,
+                                                 GtkSelectionData *selection);
+static gboolean    gimp_dnd_set_tool_item_data  (GtkWidget        *widget,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GCallback         set_tool_item_func,
+                                                 gpointer          set_tool_item_data,
+                                                 GtkSelectionData *selection);
+
+
+
+static const GimpDndDataDef dnd_data_defs[] =
+{
+  {
+    { NULL, 0, -1 },
+
+    NULL,
+    NULL,
+
+    NULL,
+    NULL,
+    NULL
+  },
+
+  {
+    GIMP_TARGET_URI_LIST,
+
+    "gimp-dnd-get-uri-list-func",
+    "gimp-dnd-get-uri-list-data",
+
+    "gimp-dnd-set-uri-list-func",
+    "gimp-dnd-set-uri-list-data",
+
+    NULL,
+    gimp_dnd_get_uri_list_data,
+    gimp_dnd_set_uri_list_data
+  },
+
+  {
+    GIMP_TARGET_TEXT_PLAIN,
+
+    NULL,
+    NULL,
+
+    "gimp-dnd-set-uri-list-func",
+    "gimp-dnd-set-uri-list-data",
+
+    NULL,
+    NULL,
+    gimp_dnd_set_uri_list_data
+  },
+
+  {
+    GIMP_TARGET_NETSCAPE_URL,
+
+    NULL,
+    NULL,
+
+    "gimp-dnd-set-uri-list-func",
+    "gimp-dnd-set-uri-list-data",
+
+    NULL,
+    NULL,
+    gimp_dnd_set_uri_list_data
+  },
+
+  {
+    GIMP_TARGET_XDS,
+
+    "gimp-dnd-get-xds-func",
+    "gimp-dnd-get-xds-data",
+
+    NULL,
+    NULL,
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_xds_data,
+    NULL
+  },
+
+  {
+    GIMP_TARGET_COLOR,
+
+    "gimp-dnd-get-color-func",
+    "gimp-dnd-get-color-data",
+
+    "gimp-dnd-set-color-func",
+    "gimp-dnd-set-color-data",
+
+    gimp_dnd_get_color_icon,
+    gimp_dnd_get_color_data,
+    gimp_dnd_set_color_data
+  },
+
+  {
+    GIMP_TARGET_SVG,
+
+    "gimp-dnd-get-svg-func",
+    "gimp-dnd-get-svg-data",
+
+    "gimp-dnd-set-svg-func",
+    "gimp-dnd-set-svg-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_stream_data,
+    gimp_dnd_set_stream_data
+  },
+
+  {
+    GIMP_TARGET_SVG_XML,
+
+    "gimp-dnd-get-svg-xml-func",
+    "gimp-dnd-get-svg-xml-data",
+
+    "gimp-dnd-set-svg-xml-func",
+    "gimp-dnd-set-svg-xml-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_stream_data,
+    gimp_dnd_set_stream_data
+  },
+
+  {
+    GIMP_TARGET_PIXBUF,
+
+    "gimp-dnd-get-pixbuf-func",
+    "gimp-dnd-get-pixbuf-data",
+
+    "gimp-dnd-set-pixbuf-func",
+    "gimp-dnd-set-pixbuf-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_pixbuf_data,
+    gimp_dnd_set_pixbuf_data
+  },
+
+  {
+    GIMP_TARGET_IMAGE,
+
+    "gimp-dnd-get-image-func",
+    "gimp-dnd-get-image-data",
+
+    "gimp-dnd-set-image-func",
+    "gimp-dnd-set-image-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_image_data,
+    gimp_dnd_set_image_data,
+  },
+
+  {
+    GIMP_TARGET_COMPONENT,
+
+    "gimp-dnd-get-component-func",
+    "gimp-dnd-get-component-data",
+
+    "gimp-dnd-set-component-func",
+    "gimp-dnd-set-component-data",
+
+    gimp_dnd_get_component_icon,
+    gimp_dnd_get_component_data,
+    gimp_dnd_set_component_data,
+  },
+
+  {
+    GIMP_TARGET_LAYER,
+
+    "gimp-dnd-get-layer-func",
+    "gimp-dnd-get-layer-data",
+
+    "gimp-dnd-set-layer-func",
+    "gimp-dnd-set-layer-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_item_data,
+    gimp_dnd_set_item_data,
+  },
+
+  {
+    GIMP_TARGET_CHANNEL,
+
+    "gimp-dnd-get-channel-func",
+    "gimp-dnd-get-channel-data",
+
+    "gimp-dnd-set-channel-func",
+    "gimp-dnd-set-channel-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_item_data,
+    gimp_dnd_set_item_data,
+  },
+
+  {
+    GIMP_TARGET_LAYER_MASK,
+
+    "gimp-dnd-get-layer-mask-func",
+    "gimp-dnd-get-layer-mask-data",
+
+    "gimp-dnd-set-layer-mask-func",
+    "gimp-dnd-set-layer-mask-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_item_data,
+    gimp_dnd_set_item_data,
+  },
+
+  {
+    GIMP_TARGET_VECTORS,
+
+    "gimp-dnd-get-vectors-func",
+    "gimp-dnd-get-vectors-data",
+
+    "gimp-dnd-set-vectors-func",
+    "gimp-dnd-set-vectors-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_item_data,
+    gimp_dnd_set_item_data,
+  },
+
+  {
+    GIMP_TARGET_BRUSH,
+
+    "gimp-dnd-get-brush-func",
+    "gimp-dnd-get-brush-data",
+
+    "gimp-dnd-set-brush-func",
+    "gimp-dnd-set-brush-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_brush_data
+  },
+
+  {
+    GIMP_TARGET_PATTERN,
+
+    "gimp-dnd-get-pattern-func",
+    "gimp-dnd-get-pattern-data",
+
+    "gimp-dnd-set-pattern-func",
+    "gimp-dnd-set-pattern-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_pattern_data
+  },
+
+  {
+    GIMP_TARGET_GRADIENT,
+
+    "gimp-dnd-get-gradient-func",
+    "gimp-dnd-get-gradient-data",
+
+    "gimp-dnd-set-gradient-func",
+    "gimp-dnd-set-gradient-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_gradient_data
+  },
+
+  {
+    GIMP_TARGET_PALETTE,
+
+    "gimp-dnd-get-palette-func",
+    "gimp-dnd-get-palette-data",
+
+    "gimp-dnd-set-palette-func",
+    "gimp-dnd-set-palette-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_palette_data
+  },
+
+  {
+    GIMP_TARGET_FONT,
+
+    "gimp-dnd-get-font-func",
+    "gimp-dnd-get-font-data",
+
+    "gimp-dnd-set-font-func",
+    "gimp-dnd-set-font-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_font_data
+  },
+
+  {
+    GIMP_TARGET_BUFFER,
+
+    "gimp-dnd-get-buffer-func",
+    "gimp-dnd-get-buffer-data",
+
+    "gimp-dnd-set-buffer-func",
+    "gimp-dnd-set-buffer-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_buffer_data
+  },
+
+  {
+    GIMP_TARGET_IMAGEFILE,
+
+    "gimp-dnd-get-imagefile-func",
+    "gimp-dnd-get-imagefile-data",
+
+    "gimp-dnd-set-imagefile-func",
+    "gimp-dnd-set-imagefile-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_imagefile_data
+  },
+
+  {
+    GIMP_TARGET_TEMPLATE,
+
+    "gimp-dnd-get-template-func",
+    "gimp-dnd-get-template-data",
+
+    "gimp-dnd-set-template-func",
+    "gimp-dnd-set-template-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_template_data
+  },
+
+  {
+    GIMP_TARGET_TOOL_ITEM,
+
+    "gimp-dnd-get-tool-item-func",
+    "gimp-dnd-get-tool-item-data",
+
+    "gimp-dnd-set-tool-item-func",
+    "gimp-dnd-set-tool-item-data",
+
+    gimp_dnd_get_viewable_icon,
+    gimp_dnd_get_object_data,
+    gimp_dnd_set_tool_item_data
+  },
+
+  {
+    GIMP_TARGET_DIALOG,
+
+    NULL,
+    NULL,
+
+    NULL,
+    NULL,
+
+    NULL,
+    NULL,
+    NULL
+  }
+};
+
+
+static Gimp *the_dnd_gimp = NULL;
+
+
+void
+gimp_dnd_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (the_dnd_gimp == NULL);
+
+  the_dnd_gimp = gimp;
+}
+
+
+/**********************/
+/*  helper functions  */
+/**********************/
+
+static void
+gimp_dnd_target_list_add (GtkTargetList        *list,
+                          const GtkTargetEntry *entry)
+{
+  GdkAtom atom = gdk_atom_intern (entry->target, FALSE);
+  guint   info;
+
+  if (! gtk_target_list_find (list, atom, &info) || info != entry->info)
+    {
+      gtk_target_list_add (list, atom, entry->flags, entry->info);
+    }
+}
+
+
+/********************************/
+/*  general data dnd functions  */
+/********************************/
+
+static void
+gimp_dnd_data_drag_begin (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          gpointer        data)
+{
+  const GimpDndDataDef *dnd_data;
+  GimpDndType           data_type;
+  GCallback             get_data_func = NULL;
+  gpointer              get_data_data = NULL;
+  GtkWidget            *icon_widget;
+
+  data_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                  "gimp-dnd-get-data-type"));
+
+  GIMP_LOG (DND, "data type %d", data_type);
+
+  if (! data_type)
+    return;
+
+  dnd_data = dnd_data_defs + data_type;
+
+  if (dnd_data->get_data_func_name)
+    get_data_func = g_object_get_data (G_OBJECT (widget),
+                                       dnd_data->get_data_func_name);
+
+  if (dnd_data->get_data_data_name)
+    get_data_data = g_object_get_data (G_OBJECT (widget),
+                                       dnd_data->get_data_data_name);
+
+  if (! get_data_func)
+    return;
+
+  icon_widget = dnd_data->get_icon_func (widget,
+                                         context,
+                                         get_data_func,
+                                         get_data_data);
+
+  if (icon_widget)
+    {
+      GtkWidget *frame;
+      GtkWidget *window;
+
+      window = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (widget));
+
+      gtk_widget_realize (window);
+
+      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+      gtk_container_add (GTK_CONTAINER (window), frame);
+      gtk_widget_show (frame);
+
+      gtk_container_add (GTK_CONTAINER (frame), icon_widget);
+      gtk_widget_show (icon_widget);
+
+      g_object_set_data_full (G_OBJECT (widget), "gimp-dnd-data-widget",
+                              window, (GDestroyNotify) gtk_widget_destroy);
+
+      gtk_drag_set_icon_widget (context, window,
+                                DRAG_ICON_OFFSET, DRAG_ICON_OFFSET);
+
+      /*  remember for which drag context the widget was made  */
+      g_object_set_data (G_OBJECT (window), "gimp-gdk-drag-context", context);
+    }
+}
+
+static void
+gimp_dnd_data_drag_end (GtkWidget      *widget,
+                        GdkDragContext *context)
+{
+  GimpDndType  data_type;
+  GtkWidget   *icon_widget;
+
+  data_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                  "gimp-dnd-get-data-type"));
+
+  GIMP_LOG (DND, "data type %d", data_type);
+
+  icon_widget = g_object_get_data (G_OBJECT (widget), "gimp-dnd-data-widget");
+
+  if (icon_widget)
+    {
+      /*  destroy the icon_widget only if it was made for this drag
+       *  context. See bug #139337.
+       */
+      if (g_object_get_data (G_OBJECT (icon_widget),
+                             "gimp-gdk-drag-context") ==
+          (gpointer) context)
+        {
+          g_object_set_data (G_OBJECT (widget), "gimp-dnd-data-widget", NULL);
+        }
+    }
+}
+
+static void
+gimp_dnd_data_drag_handle (GtkWidget        *widget,
+                           GdkDragContext   *context,
+                           GtkSelectionData *selection_data,
+                           guint             info,
+                           guint             time,
+                           gpointer          data)
+{
+  GCallback    get_data_func = NULL;
+  gpointer     get_data_data = NULL;
+  GimpDndType  data_type;
+
+  GIMP_LOG (DND, "data type %d", info);
+
+  for (data_type = GIMP_DND_TYPE_NONE + 1;
+       data_type <= GIMP_DND_TYPE_LAST;
+       data_type++)
+    {
+      const GimpDndDataDef *dnd_data = dnd_data_defs + data_type;
+
+      if (dnd_data->target_entry.info == info)
+        {
+          GIMP_LOG (DND, "target %s", dnd_data->target_entry.target);
+
+          if (dnd_data->get_data_func_name)
+            get_data_func = g_object_get_data (G_OBJECT (widget),
+                                               dnd_data->get_data_func_name);
+
+          if (dnd_data->get_data_data_name)
+            get_data_data = g_object_get_data (G_OBJECT (widget),
+                                               dnd_data->get_data_data_name);
+
+          if (! get_data_func)
+            return;
+
+          dnd_data->get_data_func (widget,
+                                   context,
+                                   get_data_func,
+                                   get_data_data,
+                                   selection_data);
+
+          return;
+        }
+    }
+}
+
+static void
+gimp_dnd_data_drop_handle (GtkWidget        *widget,
+                           GdkDragContext   *context,
+                           gint              x,
+                           gint              y,
+                           GtkSelectionData *selection_data,
+                           guint             info,
+                           guint             time,
+                           gpointer          data)
+{
+  GimpDndType data_type;
+
+  GIMP_LOG (DND, "data type %d", info);
+
+  if (gtk_selection_data_get_length (selection_data) <= 0)
+    {
+      gtk_drag_finish (context, FALSE, FALSE, time);
+      return;
+    }
+
+  for (data_type = GIMP_DND_TYPE_NONE + 1;
+       data_type <= GIMP_DND_TYPE_LAST;
+       data_type++)
+    {
+      const GimpDndDataDef *dnd_data = dnd_data_defs + data_type;
+
+      if (dnd_data->target_entry.info == info)
+        {
+          GCallback set_data_func = NULL;
+          gpointer  set_data_data = NULL;
+
+          GIMP_LOG (DND, "target %s", dnd_data->target_entry.target);
+
+          if (dnd_data->set_data_func_name)
+            set_data_func = g_object_get_data (G_OBJECT (widget),
+                                               dnd_data->set_data_func_name);
+
+          if (dnd_data->set_data_data_name)
+            set_data_data = g_object_get_data (G_OBJECT (widget),
+                                               dnd_data->set_data_data_name);
+
+          if (set_data_func &&
+              dnd_data->set_data_func (widget, x, y,
+                                       set_data_func,
+                                       set_data_data,
+                                       selection_data))
+            {
+              gtk_drag_finish (context, TRUE, FALSE, time);
+              return;
+            }
+
+          gtk_drag_finish (context, FALSE, FALSE, time);
+          return;
+        }
+    }
+}
+
+static void
+gimp_dnd_data_source_add (GimpDndType  data_type,
+                          GtkWidget   *widget,
+                          GCallback    get_data_func,
+                          gpointer     get_data_data)
+{
+  const GimpDndDataDef *dnd_data;
+  gboolean              drag_connected;
+
+  dnd_data = dnd_data_defs + data_type;
+
+  /*  set a default drag source if not already done  */
+  if (! g_object_get_data (G_OBJECT (widget), "gtk-site-data"))
+    gtk_drag_source_set (widget, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                         NULL, 0,
+                         GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+  drag_connected =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                        "gimp-dnd-drag-connected"));
+
+  if (! drag_connected)
+    {
+      g_signal_connect (widget, "drag-begin",
+                        G_CALLBACK (gimp_dnd_data_drag_begin),
+                        NULL);
+      g_signal_connect (widget, "drag-end",
+                        G_CALLBACK (gimp_dnd_data_drag_end),
+                        NULL);
+      g_signal_connect (widget, "drag-data-get",
+                        G_CALLBACK (gimp_dnd_data_drag_handle),
+                        NULL);
+
+      g_object_set_data (G_OBJECT (widget), "gimp-dnd-drag-connected",
+                         GINT_TO_POINTER (TRUE));
+    }
+
+  g_object_set_data (G_OBJECT (widget), dnd_data->get_data_func_name,
+                     get_data_func);
+  g_object_set_data (G_OBJECT (widget), dnd_data->get_data_data_name,
+                     get_data_data);
+
+  /*  remember the first set source type for drag view creation  */
+  if (! g_object_get_data (G_OBJECT (widget), "gimp-dnd-get-data-type"))
+    g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-type",
+                       GINT_TO_POINTER (data_type));
+
+  if (dnd_data->target_entry.target)
+    {
+      GtkTargetList *target_list;
+
+      target_list = gtk_drag_source_get_target_list (widget);
+
+      if (target_list)
+        {
+          gimp_dnd_target_list_add (target_list, &dnd_data->target_entry);
+        }
+      else
+        {
+          target_list = gtk_target_list_new (&dnd_data->target_entry, 1);
+
+          gtk_drag_source_set_target_list (widget, target_list);
+          gtk_target_list_unref (target_list);
+        }
+    }
+}
+
+static gboolean
+gimp_dnd_data_source_remove (GimpDndType  data_type,
+                             GtkWidget   *widget)
+{
+  const GimpDndDataDef *dnd_data;
+  gboolean              drag_connected;
+  gboolean              list_changed = FALSE;
+
+  drag_connected =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                        "gimp-dnd-drag-connected"));
+
+  if (! drag_connected)
+    return FALSE;
+
+  dnd_data = dnd_data_defs + data_type;
+
+  g_object_set_data (G_OBJECT (widget), dnd_data->get_data_func_name, NULL);
+  g_object_set_data (G_OBJECT (widget), dnd_data->get_data_data_name, NULL);
+
+  /*  remove the dnd type remembered for the dnd icon  */
+  if (data_type ==
+      GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                          "gimp-dnd-get-data-type")))
+    g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-type", NULL);
+
+  if (dnd_data->target_entry.target)
+    {
+      /* Don't just remove the target from the existing list, create a
+       * new list without the target and replace the old list. The
+       * source's target list is part of a drag operation's state, but
+       * only by reference, it's not copied. So when we change the
+       * list, we would change the state of that ongoing drag, making
+       * it impossible to drop anything. See bug #676522.
+       */
+      GtkTargetList *target_list = gtk_drag_source_get_target_list (widget);
+
+      if (target_list)
+        {
+          GtkTargetList  *new_list;
+          GtkTargetEntry *targets;
+          gint            n_targets_old;
+          gint            n_targets_new;
+          gint            i;
+
+          targets = gtk_target_table_new_from_list (target_list, &n_targets_old);
+
+          new_list = gtk_target_list_new (NULL, 0);
+
+          for (i = 0; i < n_targets_old; i++)
+            {
+              if (targets[i].info != data_type)
+                {
+                  gtk_target_list_add (new_list,
+                                       gdk_atom_intern (targets[i].target, FALSE),
+                                       targets[i].flags,
+                                       targets[i].info);
+                }
+            }
+
+          gtk_target_table_free (targets, n_targets_old);
+
+          targets = gtk_target_table_new_from_list (new_list, &n_targets_new);
+          gtk_target_table_free (targets, n_targets_new);
+
+          if (n_targets_old != n_targets_new)
+            {
+              list_changed = TRUE;
+
+              if (n_targets_new > 0)
+                gtk_drag_source_set_target_list (widget, new_list);
+              else
+                gtk_drag_source_set_target_list (widget, NULL);
+            }
+
+          gtk_target_list_unref (new_list);
+        }
+    }
+
+  return list_changed;
+}
+
+static void
+gimp_dnd_data_dest_add (GimpDndType  data_type,
+                        GtkWidget   *widget,
+                        gpointer     set_data_func,
+                        gpointer     set_data_data)
+{
+  const GimpDndDataDef *dnd_data;
+  gboolean              drop_connected;
+
+  /*  set a default drag dest if not already done  */
+  if (! g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"))
+    gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY);
+
+  drop_connected =
+    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                        "gimp-dnd-drop-connected"));
+
+  if (set_data_func && ! drop_connected)
+    {
+      g_signal_connect (widget, "drag-data-received",
+                        G_CALLBACK (gimp_dnd_data_drop_handle),
+                        NULL);
+
+      g_object_set_data (G_OBJECT (widget), "gimp-dnd-drop-connected",
+                         GINT_TO_POINTER (TRUE));
+    }
+
+  dnd_data = dnd_data_defs + data_type;
+
+  if (set_data_func)
+    {
+      g_object_set_data (G_OBJECT (widget), dnd_data->set_data_func_name,
+                         set_data_func);
+      g_object_set_data (G_OBJECT (widget), dnd_data->set_data_data_name,
+                         set_data_data);
+    }
+
+  if (dnd_data->target_entry.target)
+    {
+      GtkTargetList *target_list;
+
+      target_list = gtk_drag_dest_get_target_list (widget);
+
+      if (target_list)
+        {
+          gimp_dnd_target_list_add (target_list, &dnd_data->target_entry);
+        }
+      else
+        {
+          target_list = gtk_target_list_new (&dnd_data->target_entry, 1);
+
+          gtk_drag_dest_set_target_list (widget, target_list);
+          gtk_target_list_unref (target_list);
+        }
+    }
+}
+
+static void
+gimp_dnd_data_dest_remove (GimpDndType  data_type,
+                           GtkWidget   *widget)
+{
+  const GimpDndDataDef *dnd_data;
+
+  dnd_data = dnd_data_defs + data_type;
+
+  g_object_set_data (G_OBJECT (widget), dnd_data->set_data_func_name, NULL);
+  g_object_set_data (G_OBJECT (widget), dnd_data->set_data_data_name, NULL);
+
+  if (dnd_data->target_entry.target)
+    {
+      GtkTargetList *target_list;
+
+      target_list = gtk_drag_dest_get_target_list (widget);
+
+      if (target_list)
+        {
+          GdkAtom atom = gdk_atom_intern (dnd_data->target_entry.target, TRUE);
+
+          if (atom != GDK_NONE)
+            gtk_target_list_remove (target_list, atom);
+        }
+    }
+}
+
+
+/****************************/
+/*  uri list dnd functions  */
+/****************************/
+
+static void
+gimp_dnd_get_uri_list_data (GtkWidget        *widget,
+                            GdkDragContext   *context,
+                            GCallback         get_uri_list_func,
+                            gpointer          get_uri_list_data,
+                            GtkSelectionData *selection)
+{
+  GList *uri_list;
+
+  uri_list = (* (GimpDndDragUriListFunc) get_uri_list_func) (widget,
+                                                             get_uri_list_data);
+
+  GIMP_LOG (DND, "uri_list %p", uri_list);
+
+  if (uri_list)
+    {
+      gimp_selection_data_set_uri_list (selection, uri_list);
+
+      g_list_free_full (uri_list, (GDestroyNotify) g_free);
+    }
+}
+
+static gboolean
+gimp_dnd_set_uri_list_data (GtkWidget        *widget,
+                            gint              x,
+                            gint              y,
+                            GCallback         set_uri_list_func,
+                            gpointer          set_uri_list_data,
+                            GtkSelectionData *selection)
+{
+  GList *uri_list = gimp_selection_data_get_uri_list (selection);
+
+  GIMP_LOG (DND, "uri_list %p", uri_list);
+
+  if (! uri_list)
+    return FALSE;
+
+  (* (GimpDndDropUriListFunc) set_uri_list_func) (widget, x, y, uri_list,
+                                                  set_uri_list_data);
+
+  g_list_free_full (uri_list, (GDestroyNotify) g_free);
+
+  return TRUE;
+}
+
+void
+gimp_dnd_uri_list_source_add (GtkWidget              *widget,
+                              GimpDndDragUriListFunc  get_uri_list_func,
+                              gpointer                data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_URI_LIST, widget,
+                            G_CALLBACK (get_uri_list_func),
+                            data);
+}
+
+void
+gimp_dnd_uri_list_source_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_URI_LIST, widget);
+}
+
+void
+gimp_dnd_uri_list_dest_add (GtkWidget              *widget,
+                            GimpDndDropUriListFunc  set_uri_list_func,
+                            gpointer                data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  /*  Set a default drag dest if not already done. Explicitly set
+   *  COPY and MOVE for file drag destinations. Some file managers
+   *  such as Konqueror only offer MOVE by default.
+   */
+  if (! g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"))
+    gtk_drag_dest_set (widget,
+                       GTK_DEST_DEFAULT_ALL, NULL, 0,
+                       GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_URI_LIST, widget,
+                          G_CALLBACK (set_uri_list_func),
+                          data);
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_TEXT_PLAIN, widget,
+                          G_CALLBACK (set_uri_list_func),
+                          data);
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_NETSCAPE_URL, widget,
+                          G_CALLBACK (set_uri_list_func),
+                          data);
+}
+
+void
+gimp_dnd_uri_list_dest_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_URI_LIST, widget);
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_TEXT_PLAIN, widget);
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_NETSCAPE_URL, widget);
+}
+
+
+/******************************/
+/* Direct Save Protocol (XDS) */
+/******************************/
+
+static void
+gimp_dnd_get_xds_data (GtkWidget        *widget,
+                       GdkDragContext   *context,
+                       GCallback         get_image_func,
+                       gpointer          get_image_data,
+                       GtkSelectionData *selection)
+{
+  GimpImage   *image;
+  GimpContext *gimp_context;
+
+  image = g_object_get_data (G_OBJECT (context), "gimp-dnd-viewable");
+
+  if (! image)
+    image = (GimpImage *)
+      (* (GimpDndDragViewableFunc) get_image_func) (widget, &gimp_context,
+                                                    get_image_data);
+
+  GIMP_LOG (DND, "image %p", image);
+
+  if (image)
+    gimp_dnd_xds_save_image (context, image, selection);
+}
+
+static void
+gimp_dnd_xds_drag_begin (GtkWidget      *widget,
+                         GdkDragContext *context)
+{
+  const GimpDndDataDef *dnd_data = dnd_data_defs + GIMP_DND_TYPE_XDS;
+  GCallback             get_data_func;
+  gpointer              get_data_data;
+
+  get_data_func = g_object_get_data (G_OBJECT (widget),
+                                     dnd_data->get_data_func_name);
+  get_data_data = g_object_get_data (G_OBJECT (widget),
+                                     dnd_data->get_data_data_name);
+
+  if (get_data_func)
+    {
+      GimpImage   *image;
+      GimpContext *gimp_context;
+
+      image = (GimpImage *)
+        (* (GimpDndDragViewableFunc) get_data_func) (widget, &gimp_context,
+                                                     get_data_data);
+
+      GIMP_LOG (DND, "image %p", image);
+
+      gimp_dnd_xds_source_set (context, image);
+    }
+}
+
+static void
+gimp_dnd_xds_drag_end (GtkWidget      *widget,
+                       GdkDragContext *context)
+{
+  gimp_dnd_xds_source_set (context, NULL);
+}
+
+void
+gimp_dnd_xds_source_add (GtkWidget               *widget,
+                         GimpDndDragViewableFunc  get_image_func,
+                         gpointer                 data)
+{
+  gulong handler;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_XDS, widget,
+                            G_CALLBACK (get_image_func),
+                            data);
+
+  handler = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget),
+                                                 "gimp-dnd-xds-drag-begin"));
+
+  if (! handler)
+    {
+      handler = g_signal_connect (widget, "drag-begin",
+                                  G_CALLBACK (gimp_dnd_xds_drag_begin),
+                                  NULL);
+      g_object_set_data (G_OBJECT (widget), "gimp-dnd-xds-drag-begin",
+                         GUINT_TO_POINTER (handler));
+    }
+
+  handler = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget),
+                                                 "gimp-dnd-xds-drag-end"));
+
+  if (! handler)
+    {
+      handler = g_signal_connect (widget, "drag-end",
+                                  G_CALLBACK (gimp_dnd_xds_drag_end),
+                                  NULL);
+      g_object_set_data (G_OBJECT (widget), "gimp-dnd-xds-drag-end",
+                         GUINT_TO_POINTER (handler));
+    }
+}
+
+void
+gimp_dnd_xds_source_remove (GtkWidget *widget)
+{
+  gulong handler;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  handler = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget),
+                                                 "gimp-dnd-xds-drag-begin"));
+  if (handler)
+    {
+      g_signal_handler_disconnect (widget, handler);
+      g_object_set_data (G_OBJECT (widget), "gimp-dnd-xds-drag-begin", NULL);
+    }
+
+  handler = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget),
+                                                 "gimp-dnd-xds-drag-end"));
+  if (handler)
+    {
+      g_signal_handler_disconnect (widget, handler);
+      g_object_set_data (G_OBJECT (widget), "gimp-dnd-xds-drag-end", NULL);
+    }
+
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_XDS, widget);
+}
+
+
+/*************************/
+/*  color dnd functions  */
+/*************************/
+
+static GtkWidget *
+gimp_dnd_get_color_icon (GtkWidget      *widget,
+                         GdkDragContext *context,
+                         GCallback       get_color_func,
+                         gpointer        get_color_data)
+{
+  GtkWidget *color_area;
+  GimpRGB    color;
+
+  (* (GimpDndDragColorFunc) get_color_func) (widget, &color, get_color_data);
+
+  GIMP_LOG (DND, "called");
+
+  g_object_set_data_full (G_OBJECT (context),
+                          "gimp-dnd-color", g_memdup (&color, sizeof (GimpRGB)),
+                          (GDestroyNotify) g_free);
+
+  color_area = gimp_color_area_new (&color, GIMP_COLOR_AREA_SMALL_CHECKS, 0);
+  gimp_color_area_set_color_config (GIMP_COLOR_AREA (color_area),
+                                    the_dnd_gimp->config->color_management);
+  gtk_widget_set_size_request (color_area,
+                               DRAG_PREVIEW_SIZE, DRAG_PREVIEW_SIZE);
+
+  return color_area;
+}
+
+static void
+gimp_dnd_get_color_data (GtkWidget        *widget,
+                         GdkDragContext   *context,
+                         GCallback         get_color_func,
+                         gpointer          get_color_data,
+                         GtkSelectionData *selection)
+{
+  GimpRGB *c;
+  GimpRGB  color;
+
+  c = g_object_get_data (G_OBJECT (context), "gimp-dnd-color");
+
+  if (c)
+    color = *c;
+  else
+    (* (GimpDndDragColorFunc) get_color_func) (widget, &color, get_color_data);
+
+  GIMP_LOG (DND, "called");
+
+  gimp_selection_data_set_color (selection, &color);
+}
+
+static gboolean
+gimp_dnd_set_color_data (GtkWidget        *widget,
+                         gint              x,
+                         gint              y,
+                         GCallback         set_color_func,
+                         gpointer          set_color_data,
+                         GtkSelectionData *selection)
+{
+  GimpRGB color;
+
+  GIMP_LOG (DND, "called");
+
+  if (! gimp_selection_data_get_color (selection, &color))
+    return FALSE;
+
+  (* (GimpDndDropColorFunc) set_color_func) (widget, x, y, &color,
+                                             set_color_data);
+
+  return TRUE;
+}
+
+void
+gimp_dnd_color_source_add (GtkWidget            *widget,
+                           GimpDndDragColorFunc  get_color_func,
+                           gpointer              data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_COLOR, widget,
+                            G_CALLBACK (get_color_func),
+                            data);
+}
+
+void
+gimp_dnd_color_source_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_COLOR, widget);
+}
+
+void
+gimp_dnd_color_dest_add (GtkWidget            *widget,
+                         GimpDndDropColorFunc  set_color_func,
+                         gpointer              data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_COLOR, widget,
+                          G_CALLBACK (set_color_func),
+                          data);
+}
+
+void
+gimp_dnd_color_dest_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_COLOR, widget);
+}
+
+
+/**************************/
+/*  stream dnd functions  */
+/**************************/
+
+static void
+gimp_dnd_get_stream_data (GtkWidget        *widget,
+                          GdkDragContext   *context,
+                          GCallback         get_stream_func,
+                          gpointer          get_stream_data,
+                          GtkSelectionData *selection)
+{
+  guchar *stream;
+  gsize   stream_length;
+
+  stream = (* (GimpDndDragStreamFunc) get_stream_func) (widget, &stream_length,
+                                                        get_stream_data);
+
+  GIMP_LOG (DND, "stream %p, length %" G_GSIZE_FORMAT, stream, stream_length);
+
+  if (stream)
+    {
+      gimp_selection_data_set_stream (selection, stream, stream_length);
+      g_free (stream);
+    }
+}
+
+static gboolean
+gimp_dnd_set_stream_data (GtkWidget        *widget,
+                          gint              x,
+                          gint              y,
+                          GCallback         set_stream_func,
+                          gpointer          set_stream_data,
+                          GtkSelectionData *selection)
+{
+  const guchar *stream;
+  gsize         stream_length;
+
+  stream = gimp_selection_data_get_stream (selection, &stream_length);
+
+  GIMP_LOG (DND, "stream %p, length %" G_GSIZE_FORMAT, stream, stream_length);
+
+  if (! stream)
+    return FALSE;
+
+  (* (GimpDndDropStreamFunc) set_stream_func) (widget, x, y,
+                                               stream, stream_length,
+                                               set_stream_data);
+
+  return TRUE;
+}
+
+void
+gimp_dnd_svg_source_add (GtkWidget             *widget,
+                         GimpDndDragStreamFunc  get_svg_func,
+                         gpointer               data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_SVG, widget,
+                            G_CALLBACK (get_svg_func),
+                            data);
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_SVG_XML, widget,
+                            G_CALLBACK (get_svg_func),
+                            data);
+}
+
+void
+gimp_dnd_svg_source_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_SVG, widget);
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_SVG_XML, widget);
+}
+
+void
+gimp_dnd_svg_dest_add (GtkWidget             *widget,
+                       GimpDndDropStreamFunc  set_svg_func,
+                       gpointer               data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_SVG, widget,
+                          G_CALLBACK (set_svg_func),
+                          data);
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_SVG_XML, widget,
+                          G_CALLBACK (set_svg_func),
+                          data);
+}
+
+void
+gimp_dnd_svg_dest_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_SVG, widget);
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_SVG_XML, widget);
+}
+
+
+/**************************/
+/*  pixbuf dnd functions  */
+/**************************/
+
+static void
+gimp_dnd_get_pixbuf_data (GtkWidget        *widget,
+                          GdkDragContext   *context,
+                          GCallback         get_pixbuf_func,
+                          gpointer          get_pixbuf_data,
+                          GtkSelectionData *selection)
+{
+  GdkPixbuf *pixbuf;
+
+  pixbuf = (* (GimpDndDragPixbufFunc) get_pixbuf_func) (widget,
+                                                        get_pixbuf_data);
+
+  GIMP_LOG (DND, "pixbuf %p", pixbuf);
+
+  if (pixbuf)
+    {
+      gimp_set_busy (the_dnd_gimp);
+
+      gtk_selection_data_set_pixbuf (selection, pixbuf);
+      g_object_unref (pixbuf);
+
+      gimp_unset_busy (the_dnd_gimp);
+    }
+}
+
+static gboolean
+gimp_dnd_set_pixbuf_data (GtkWidget        *widget,
+                          gint              x,
+                          gint              y,
+                          GCallback         set_pixbuf_func,
+                          gpointer          set_pixbuf_data,
+                          GtkSelectionData *selection)
+{
+  GdkPixbuf *pixbuf;
+
+  gimp_set_busy (the_dnd_gimp);
+
+  pixbuf = gtk_selection_data_get_pixbuf (selection);
+
+  gimp_unset_busy (the_dnd_gimp);
+
+  GIMP_LOG (DND, "pixbuf %p", pixbuf);
+
+  if (! pixbuf)
+    return FALSE;
+
+  (* (GimpDndDropPixbufFunc) set_pixbuf_func) (widget, x, y,
+                                               pixbuf,
+                                               set_pixbuf_data);
+
+  g_object_unref (pixbuf);
+
+  return TRUE;
+}
+
+void
+gimp_dnd_pixbuf_source_add (GtkWidget             *widget,
+                            GimpDndDragPixbufFunc  get_pixbuf_func,
+                            gpointer               data)
+{
+  GtkTargetList *target_list;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_PIXBUF, widget,
+                            G_CALLBACK (get_pixbuf_func),
+                            data);
+
+  target_list = gtk_drag_source_get_target_list (widget);
+
+  if (target_list)
+    gtk_target_list_ref (target_list);
+  else
+    target_list = gtk_target_list_new (NULL, 0);
+
+  gimp_pixbuf_targets_add (target_list, GIMP_DND_TYPE_PIXBUF, TRUE);
+
+  gtk_drag_source_set_target_list (widget, target_list);
+  gtk_target_list_unref (target_list);
+}
+
+void
+gimp_dnd_pixbuf_source_remove (GtkWidget *widget)
+{
+  GtkTargetList *target_list;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_PIXBUF, widget);
+
+  target_list = gtk_drag_source_get_target_list (widget);
+
+  if (target_list)
+    gimp_pixbuf_targets_remove (target_list);
+}
+
+void
+gimp_dnd_pixbuf_dest_add (GtkWidget              *widget,
+                          GimpDndDropPixbufFunc   set_pixbuf_func,
+                          gpointer                data)
+{
+  GtkTargetList *target_list;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_PIXBUF, widget,
+                          G_CALLBACK (set_pixbuf_func),
+                          data);
+
+  target_list = gtk_drag_dest_get_target_list (widget);
+
+  if (target_list)
+    gtk_target_list_ref (target_list);
+  else
+    target_list = gtk_target_list_new (NULL, 0);
+
+  gimp_pixbuf_targets_add (target_list, GIMP_DND_TYPE_PIXBUF, FALSE);
+
+  gtk_drag_dest_set_target_list (widget, target_list);
+  gtk_target_list_unref (target_list);
+}
+
+void
+gimp_dnd_pixbuf_dest_remove (GtkWidget *widget)
+{
+  GtkTargetList *target_list;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_PIXBUF, widget);
+
+  target_list = gtk_drag_dest_get_target_list (widget);
+
+  if (target_list)
+    gimp_pixbuf_targets_remove (target_list);
+}
+
+
+/*****************************/
+/*  component dnd functions  */
+/*****************************/
+
+static GtkWidget *
+gimp_dnd_get_component_icon (GtkWidget      *widget,
+                             GdkDragContext *context,
+                             GCallback       get_comp_func,
+                             gpointer        get_comp_data)
+{
+  GtkWidget       *view;
+  GimpImage       *image;
+  GimpContext     *gimp_context;
+  GimpChannelType  channel;
+
+  image = (* (GimpDndDragComponentFunc) get_comp_func) (widget, &gimp_context,
+                                                        &channel,
+                                                        get_comp_data);
+
+  GIMP_LOG (DND, "image %p, component %d", image, channel);
+
+  if (! image)
+    return NULL;
+
+  g_object_set_data_full (G_OBJECT (context),
+                          "gimp-dnd-viewable", g_object_ref (image),
+                          (GDestroyNotify) g_object_unref);
+  g_object_set_data (G_OBJECT (context),
+                     "gimp-dnd-component", GINT_TO_POINTER (channel));
+
+  view = gimp_view_new (gimp_context, GIMP_VIEWABLE (image),
+                        DRAG_PREVIEW_SIZE, 0, TRUE);
+
+  GIMP_VIEW_RENDERER_IMAGE (GIMP_VIEW (view)->renderer)->channel = channel;
+
+  return view;
+}
+
+static void
+gimp_dnd_get_component_data (GtkWidget        *widget,
+                             GdkDragContext   *context,
+                             GCallback         get_comp_func,
+                             gpointer          get_comp_data,
+                             GtkSelectionData *selection)
+{
+  GimpImage       *image;
+  GimpContext     *gimp_context;
+  GimpChannelType  channel = 0;
+
+  image = g_object_get_data (G_OBJECT (context), "gimp-dnd-viewable");
+  channel = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (context),
+                                                "gimp-dnd-component"));
+
+  if (! image)
+    image = (* (GimpDndDragComponentFunc) get_comp_func) (widget, &gimp_context,
+                                                          &channel,
+                                                          get_comp_data);
+
+  GIMP_LOG (DND, "image %p, component %d", image, channel);
+
+  if (image)
+    gimp_selection_data_set_component (selection, image, channel);
+}
+
+static gboolean
+gimp_dnd_set_component_data (GtkWidget        *widget,
+                             gint              x,
+                             gint              y,
+                             GCallback         set_comp_func,
+                             gpointer          set_comp_data,
+                             GtkSelectionData *selection)
+{
+  GimpImage       *image;
+  GimpChannelType  channel = 0;
+
+  image = gimp_selection_data_get_component (selection, the_dnd_gimp,
+                                             &channel);
+
+  GIMP_LOG (DND, "image %p, component %d", image, channel);
+
+  if (! image)
+    return FALSE;
+
+  (* (GimpDndDropComponentFunc) set_comp_func) (widget, x, y,
+                                                image, channel,
+                                                set_comp_data);
+
+  return TRUE;
+}
+
+void
+gimp_dnd_component_source_add (GtkWidget                *widget,
+                               GimpDndDragComponentFunc  get_comp_func,
+                               gpointer                  data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_add (GIMP_DND_TYPE_COMPONENT, widget,
+                            G_CALLBACK (get_comp_func),
+                            data);
+}
+
+void
+gimp_dnd_component_source_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_source_remove (GIMP_DND_TYPE_COMPONENT, widget);
+}
+
+void
+gimp_dnd_component_dest_add (GtkWidget                 *widget,
+                             GimpDndDropComponentFunc   set_comp_func,
+                             gpointer                   data)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_add (GIMP_DND_TYPE_COMPONENT, widget,
+                          G_CALLBACK (set_comp_func),
+                          data);
+}
+
+void
+gimp_dnd_component_dest_remove (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gimp_dnd_data_dest_remove (GIMP_DND_TYPE_COMPONENT, widget);
+}
+
+
+/*******************************************/
+/*  GimpViewable (by GType) dnd functions  */
+/*******************************************/
+
+static GtkWidget *
+gimp_dnd_get_viewable_icon (GtkWidget      *widget,
+                            GdkDragContext *context,
+                            GCallback       get_viewable_func,
+                            gpointer        get_viewable_data)
+{
+  GimpViewable *viewable;
+  GimpContext  *gimp_context;
+  GtkWidget    *view;
+  gchar        *desc;
+
+  viewable = (* (GimpDndDragViewableFunc) get_viewable_func) (widget,
+                                                              &gimp_context,
+                                                              get_viewable_data);
+
+  GIMP_LOG (DND, "viewable %p", viewable);
+
+  if (! viewable)
+    return NULL;
+
+  g_object_set_data_full (G_OBJECT (context),
+                          "gimp-dnd-viewable", g_object_ref (viewable),
+                          (GDestroyNotify) g_object_unref);
+
+  view = gimp_view_new (gimp_context, viewable,
+                        DRAG_PREVIEW_SIZE, 0, TRUE);
+
+  desc = gimp_viewable_get_description (viewable, NULL);
+
+  if (desc)
+    {
+      GtkWidget *hbox;
+      GtkWidget *label;
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 3);
+      gtk_box_pack_start (GTK_BOX (hbox), view, FALSE, FALSE, 0);
+      gtk_widget_show (view);
+
+      label = g_object_new (GTK_TYPE_LABEL,
+                            "label",           desc,
+                            "xpad",            3,
+                            "xalign",          0.0,
+                            "yalign",          0.5,
+                            "max-width-chars", 30,
+                            "ellipsize",       PANGO_ELLIPSIZE_END,
+                            NULL);
+
+      g_free (desc);
+
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+      gtk_widget_show (label);
+
+      return hbox;
+    }
+
+  return view;
+}
+
+static GimpDndType
+gimp_dnd_data_type_get_by_g_type (GType type)
+{
+  GimpDndType dnd_type = GIMP_DND_TYPE_NONE;
+
+  if (g_type_is_a (type, GIMP_TYPE_IMAGE))
+    {
+      dnd_type = GIMP_DND_TYPE_IMAGE;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_LAYER))
+    {
+      dnd_type = GIMP_DND_TYPE_LAYER;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_LAYER_MASK))
+    {
+      dnd_type = GIMP_DND_TYPE_LAYER_MASK;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_CHANNEL))
+    {
+      dnd_type = GIMP_DND_TYPE_CHANNEL;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_VECTORS))
+    {
+      dnd_type = GIMP_DND_TYPE_VECTORS;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_BRUSH))
+    {
+      dnd_type = GIMP_DND_TYPE_BRUSH;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_PATTERN))
+    {
+      dnd_type = GIMP_DND_TYPE_PATTERN;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_GRADIENT))
+    {
+      dnd_type = GIMP_DND_TYPE_GRADIENT;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_PALETTE))
+    {
+      dnd_type = GIMP_DND_TYPE_PALETTE;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_FONT))
+    {
+      dnd_type = GIMP_DND_TYPE_FONT;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_BUFFER))
+    {
+      dnd_type = GIMP_DND_TYPE_BUFFER;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_IMAGEFILE))
+    {
+      dnd_type = GIMP_DND_TYPE_IMAGEFILE;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_TEMPLATE))
+    {
+      dnd_type = GIMP_DND_TYPE_TEMPLATE;
+    }
+  else if (g_type_is_a (type, GIMP_TYPE_TOOL_ITEM))
+    {
+      dnd_type = GIMP_DND_TYPE_TOOL_ITEM;
+    }
+
+  return dnd_type;
+}
+
+gboolean
+gimp_dnd_drag_source_set_by_type (GtkWidget       *widget,
+                                  GdkModifierType  start_button_mask,
+                                  GType            type,
+                                  GdkDragAction    actions)
+{
+  GimpDndType dnd_type;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  dnd_type = gimp_dnd_data_type_get_by_g_type (type);
+
+  if (dnd_type == GIMP_DND_TYPE_NONE)
+    return FALSE;
+
+  gtk_drag_source_set (widget, start_button_mask,
+                       &dnd_data_defs[dnd_type].target_entry, 1,
+                       actions);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dnd_drag_dest_set_by_type (GtkWidget       *widget,
+                                GtkDestDefaults  flags,
+                                GType            type,
+                                GdkDragAction    actions)
+{
+  GimpDndType dnd_type;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  dnd_type = gimp_dnd_data_type_get_by_g_type (type);
+
+  if (dnd_type == GIMP_DND_TYPE_NONE)
+    return FALSE;
+
+  gtk_drag_dest_set (widget, flags,
+                     &dnd_data_defs[dnd_type].target_entry, 1,
+                     actions);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dnd_viewable_source_add (GtkWidget               *widget,
+                              GType                    type,
+                              GimpDndDragViewableFunc  get_viewable_func,
+                              gpointer                 data)
+{
+  GimpDndType dnd_type;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  g_return_val_if_fail (get_viewable_func != NULL, FALSE);
+
+  dnd_type = gimp_dnd_data_type_get_by_g_type (type);
+
+  if (dnd_type == GIMP_DND_TYPE_NONE)
+    return FALSE;
+
+  gimp_dnd_data_source_add (dnd_type, widget,
+                            G_CALLBACK (get_viewable_func),
+                            data);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dnd_viewable_source_remove (GtkWidget *widget,
+                                 GType      type)
+{
+  GimpDndType dnd_type;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  dnd_type = gimp_dnd_data_type_get_by_g_type (type);
+
+  if (dnd_type == GIMP_DND_TYPE_NONE)
+    return FALSE;
+
+  return gimp_dnd_data_source_remove (dnd_type, widget);
+}
+
+gboolean
+gimp_dnd_viewable_dest_add (GtkWidget               *widget,
+                            GType                    type,
+                            GimpDndDropViewableFunc  set_viewable_func,
+                            gpointer                 data)
+{
+  GimpDndType dnd_type;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  dnd_type = gimp_dnd_data_type_get_by_g_type (type);
+
+  if (dnd_type == GIMP_DND_TYPE_NONE)
+    return FALSE;
+
+  gimp_dnd_data_dest_add (dnd_type, widget,
+                          G_CALLBACK (set_viewable_func),
+                          data);
+
+  return TRUE;
+}
+
+gboolean
+gimp_dnd_viewable_dest_remove (GtkWidget *widget,
+                               GType      type)
+{
+  GimpDndType dnd_type;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  dnd_type = gimp_dnd_data_type_get_by_g_type (type);
+
+  if (dnd_type == GIMP_DND_TYPE_NONE)
+    return FALSE;
+
+  gimp_dnd_data_dest_remove (dnd_type, widget);
+
+  return TRUE;
+}
+
+GimpViewable *
+gimp_dnd_get_drag_data (GtkWidget *widget)
+{
+  const GimpDndDataDef    *dnd_data;
+  GimpDndType              data_type;
+  GimpDndDragViewableFunc  get_data_func = NULL;
+  gpointer                 get_data_data = NULL;
+  GimpContext             *context;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  data_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                  "gimp-dnd-get-data-type"));
+
+  if (! data_type)
+    return NULL;
+
+  dnd_data = dnd_data_defs + data_type;
+
+  if (dnd_data->get_data_func_name)
+    get_data_func = g_object_get_data (G_OBJECT (widget),
+                                       dnd_data->get_data_func_name);
+
+  if (dnd_data->get_data_data_name)
+    get_data_data = g_object_get_data (G_OBJECT (widget),
+                                       dnd_data->get_data_data_name);
+
+  if (! get_data_func)
+    return NULL;
+
+  return (GimpViewable *) (* get_data_func) (widget, &context, get_data_data);
+}
+
+
+/*****************************/
+/*  GimpImage dnd functions  */
+/*****************************/
+
+static void
+gimp_dnd_get_image_data (GtkWidget        *widget,
+                         GdkDragContext   *context,
+                         GCallback         get_image_func,
+                         gpointer          get_image_data,
+                         GtkSelectionData *selection)
+{
+  GimpImage   *image;
+  GimpContext *gimp_context;
+
+  image = g_object_get_data (G_OBJECT (context), "gimp-dnd-viewable");
+
+  if (! image)
+    image = (GimpImage *)
+      (* (GimpDndDragViewableFunc) get_image_func) (widget, &gimp_context,
+                                                    get_image_data);
+
+  GIMP_LOG (DND, "image %p", image);
+
+  if (image)
+    gimp_selection_data_set_image (selection, image);
+}
+
+static gboolean
+gimp_dnd_set_image_data (GtkWidget        *widget,
+                         gint              x,
+                         gint              y,
+                         GCallback         set_image_func,
+                         gpointer          set_image_data,
+                         GtkSelectionData *selection)
+{
+  GimpImage *image = gimp_selection_data_get_image (selection, the_dnd_gimp);
+
+  GIMP_LOG (DND, "image %p", image);
+
+  if (! image)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_image_func) (widget, x, y,
+                                                GIMP_VIEWABLE (image),
+                                                set_image_data);
+
+  return TRUE;
+}
+
+
+/****************************/
+/*  GimpItem dnd functions  */
+/****************************/
+
+static void
+gimp_dnd_get_item_data (GtkWidget        *widget,
+                        GdkDragContext   *context,
+                        GCallback         get_item_func,
+                        gpointer          get_item_data,
+                        GtkSelectionData *selection)
+{
+  GimpItem    *item;
+  GimpContext *gimp_context;
+
+  item = g_object_get_data (G_OBJECT (context), "gimp-dnd-viewable");
+
+  if (! item)
+    item = (GimpItem *)
+      (* (GimpDndDragViewableFunc) get_item_func) (widget, &gimp_context,
+                                                   get_item_data);
+
+  GIMP_LOG (DND, "item %p", item);
+
+  if (item)
+    gimp_selection_data_set_item (selection, item);
+}
+
+static gboolean
+gimp_dnd_set_item_data (GtkWidget        *widget,
+                        gint              x,
+                        gint              y,
+                        GCallback         set_item_func,
+                        gpointer          set_item_data,
+                        GtkSelectionData *selection)
+{
+  GimpItem *item = gimp_selection_data_get_item (selection, the_dnd_gimp);
+
+  GIMP_LOG (DND, "item %p", item);
+
+  if (! item)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_item_func) (widget, x, y,
+                                               GIMP_VIEWABLE (item),
+                                               set_item_data);
+
+  return TRUE;
+}
+
+
+/******************************/
+/*  GimpObject dnd functions  */
+/******************************/
+
+static void
+gimp_dnd_get_object_data (GtkWidget        *widget,
+                          GdkDragContext   *context,
+                          GCallback         get_object_func,
+                          gpointer          get_object_data,
+                          GtkSelectionData *selection)
+{
+  GimpObject  *object;
+  GimpContext *gimp_context;
+
+  object = g_object_get_data (G_OBJECT (context), "gimp-dnd-viewable");
+
+  if (! object)
+    object = (GimpObject *)
+      (* (GimpDndDragViewableFunc) get_object_func) (widget, &gimp_context,
+                                                     get_object_data);
+
+  GIMP_LOG (DND, "object %p", object);
+
+  if (GIMP_IS_OBJECT (object))
+    gimp_selection_data_set_object (selection, object);
+}
+
+
+/*****************************/
+/*  GimpBrush dnd functions  */
+/*****************************/
+
+static gboolean
+gimp_dnd_set_brush_data (GtkWidget        *widget,
+                         gint              x,
+                         gint              y,
+                         GCallback         set_brush_func,
+                         gpointer          set_brush_data,
+                         GtkSelectionData *selection)
+{
+  GimpBrush *brush = gimp_selection_data_get_brush (selection, the_dnd_gimp);
+
+  GIMP_LOG (DND, "brush %p", brush);
+
+  if (! brush)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_brush_func) (widget, x, y,
+                                                GIMP_VIEWABLE (brush),
+                                                set_brush_data);
+
+  return TRUE;
+}
+
+
+/*******************************/
+/*  GimpPattern dnd functions  */
+/*******************************/
+
+static gboolean
+gimp_dnd_set_pattern_data (GtkWidget        *widget,
+                           gint              x,
+                           gint              y,
+                           GCallback         set_pattern_func,
+                           gpointer          set_pattern_data,
+                           GtkSelectionData *selection)
+{
+  GimpPattern *pattern = gimp_selection_data_get_pattern (selection,
+                                                          the_dnd_gimp);
+
+  GIMP_LOG (DND, "pattern %p", pattern);
+
+  if (! pattern)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_pattern_func) (widget, x, y,
+                                                  GIMP_VIEWABLE (pattern),
+                                                  set_pattern_data);
+
+  return TRUE;
+}
+
+
+/********************************/
+/*  GimpGradient dnd functions  */
+/********************************/
+
+static gboolean
+gimp_dnd_set_gradient_data (GtkWidget        *widget,
+                            gint              x,
+                            gint              y,
+                            GCallback         set_gradient_func,
+                            gpointer          set_gradient_data,
+                            GtkSelectionData *selection)
+{
+  GimpGradient *gradient = gimp_selection_data_get_gradient (selection,
+                                                             the_dnd_gimp);
+
+  GIMP_LOG (DND, "gradient %p", gradient);
+
+  if (! gradient)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_gradient_func) (widget, x, y,
+                                                   GIMP_VIEWABLE (gradient),
+                                                   set_gradient_data);
+
+  return TRUE;
+}
+
+
+/*******************************/
+/*  GimpPalette dnd functions  */
+/*******************************/
+
+static gboolean
+gimp_dnd_set_palette_data (GtkWidget        *widget,
+                           gint              x,
+                           gint              y,
+                           GCallback         set_palette_func,
+                           gpointer          set_palette_data,
+                           GtkSelectionData *selection)
+{
+  GimpPalette *palette = gimp_selection_data_get_palette (selection,
+                                                          the_dnd_gimp);
+
+  GIMP_LOG (DND, "palette %p", palette);
+
+  if (! palette)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_palette_func) (widget, x, y,
+                                                  GIMP_VIEWABLE (palette),
+                                                  set_palette_data);
+
+  return TRUE;
+}
+
+
+/****************************/
+/*  GimpFont dnd functions  */
+/****************************/
+
+static gboolean
+gimp_dnd_set_font_data (GtkWidget        *widget,
+                        gint              x,
+                        gint              y,
+                        GCallback         set_font_func,
+                        gpointer          set_font_data,
+                        GtkSelectionData *selection)
+{
+  GimpFont *font = gimp_selection_data_get_font (selection, the_dnd_gimp);
+
+  GIMP_LOG (DND, "font %p", font);
+
+  if (! font)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_font_func) (widget, x, y,
+                                               GIMP_VIEWABLE (font),
+                                               set_font_data);
+
+  return TRUE;
+}
+
+
+/******************************/
+/*  GimpBuffer dnd functions  */
+/******************************/
+
+static gboolean
+gimp_dnd_set_buffer_data (GtkWidget        *widget,
+                          gint              x,
+                          gint              y,
+                          GCallback         set_buffer_func,
+                          gpointer          set_buffer_data,
+                          GtkSelectionData *selection)
+{
+  GimpBuffer *buffer = gimp_selection_data_get_buffer (selection, the_dnd_gimp);
+
+  GIMP_LOG (DND, "buffer %p", buffer);
+
+  if (! buffer)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_buffer_func) (widget, x, y,
+                                                 GIMP_VIEWABLE (buffer),
+                                                 set_buffer_data);
+
+  return TRUE;
+}
+
+
+/*********************************/
+/*  GimpImagefile dnd functions  */
+/*********************************/
+
+static gboolean
+gimp_dnd_set_imagefile_data (GtkWidget        *widget,
+                             gint              x,
+                             gint              y,
+                             GCallback         set_imagefile_func,
+                             gpointer          set_imagefile_data,
+                             GtkSelectionData *selection)
+{
+  GimpImagefile *imagefile = gimp_selection_data_get_imagefile (selection,
+                                                                the_dnd_gimp);
+
+  GIMP_LOG (DND, "imagefile %p", imagefile);
+
+  if (! imagefile)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_imagefile_func) (widget, x, y,
+                                                    GIMP_VIEWABLE (imagefile),
+                                                    set_imagefile_data);
+
+  return TRUE;
+}
+
+
+/********************************/
+/*  GimpTemplate dnd functions  */
+/********************************/
+
+static gboolean
+gimp_dnd_set_template_data (GtkWidget        *widget,
+                            gint              x,
+                            gint              y,
+                            GCallback         set_template_func,
+                            gpointer          set_template_data,
+                            GtkSelectionData *selection)
+{
+  GimpTemplate *template = gimp_selection_data_get_template (selection,
+                                                             the_dnd_gimp);
+
+  GIMP_LOG (DND, "template %p", template);
+
+  if (! template)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_template_func) (widget, x, y,
+                                                   GIMP_VIEWABLE (template),
+                                                   set_template_data);
+
+  return TRUE;
+}
+
+
+/*********************************/
+/*  GimpToolEntry dnd functions  */
+/*********************************/
+
+static gboolean
+gimp_dnd_set_tool_item_data (GtkWidget        *widget,
+                             gint              x,
+                             gint              y,
+                             GCallback         set_tool_item_func,
+                             gpointer          set_tool_item_data,
+                             GtkSelectionData *selection)
+{
+  GimpToolItem *tool_item = gimp_selection_data_get_tool_item (selection,
+                                                               the_dnd_gimp);
+
+  GIMP_LOG (DND, "tool_item %p", tool_item);
+
+  if (! tool_item)
+    return FALSE;
+
+  (* (GimpDndDropViewableFunc) set_tool_item_func) (widget, x, y,
+                                                    GIMP_VIEWABLE (tool_item),
+                                                    set_tool_item_data);
+
+  return TRUE;
+}
diff --git a/app/widgets/gimpdnd.h b/app/widgets/gimpdnd.h
new file mode 100644
index 0000000..dde5ebf
--- /dev/null
+++ b/app/widgets/gimpdnd.h
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DND_H__
+#define __GIMP_DND_H__
+
+
+#define GIMP_TARGET_URI_LIST \
+        { "text/uri-list", 0, GIMP_DND_TYPE_URI_LIST }
+
+#define GIMP_TARGET_TEXT_PLAIN \
+        { "text/plain", 0, GIMP_DND_TYPE_TEXT_PLAIN }
+
+#define GIMP_TARGET_NETSCAPE_URL \
+        { "_NETSCAPE_URL", 0, GIMP_DND_TYPE_NETSCAPE_URL }
+
+#define GIMP_TARGET_XDS \
+        { "XdndDirectSave0", 0, GIMP_DND_TYPE_XDS }
+
+#define GIMP_TARGET_COLOR \
+        { "application/x-color", 0, GIMP_DND_TYPE_COLOR }
+
+#define GIMP_TARGET_SVG \
+        { "image/svg", 0, GIMP_DND_TYPE_SVG }
+
+#define GIMP_TARGET_SVG_XML \
+        { "image/svg+xml", 0, GIMP_DND_TYPE_SVG_XML }
+
+/* just here for documentation purposes, the actual list of targets
+ * is created dynamically from available GdkPixbuf loaders
+ */
+#define GIMP_TARGET_PIXBUF \
+        { NULL, 0, GIMP_DND_TYPE_PIXBUF }
+
+#define GIMP_TARGET_IMAGE \
+        { "application/x-gimp-image-id", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_IMAGE }
+
+#define GIMP_TARGET_COMPONENT \
+        { "application/x-gimp-component", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_COMPONENT }
+
+#define GIMP_TARGET_LAYER \
+        { "application/x-gimp-layer-id", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_LAYER }
+
+#define GIMP_TARGET_CHANNEL \
+        { "application/x-gimp-channel-id", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_CHANNEL }
+
+#define GIMP_TARGET_LAYER_MASK \
+        { "application/x-gimp-layer-mask-id", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_LAYER_MASK }
+
+#define GIMP_TARGET_VECTORS \
+        { "application/x-gimp-vectors-id", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_VECTORS }
+
+#define GIMP_TARGET_BRUSH \
+        { "application/x-gimp-brush-name", 0, GIMP_DND_TYPE_BRUSH }
+
+#define GIMP_TARGET_PATTERN \
+        { "application/x-gimp-pattern-name", 0, GIMP_DND_TYPE_PATTERN }
+
+#define GIMP_TARGET_GRADIENT \
+        { "application/x-gimp-gradient-name", 0, GIMP_DND_TYPE_GRADIENT }
+
+#define GIMP_TARGET_PALETTE \
+        { "application/x-gimp-palette-name", 0, GIMP_DND_TYPE_PALETTE }
+
+#define GIMP_TARGET_FONT \
+        { "application/x-gimp-font-name", 0, GIMP_DND_TYPE_FONT }
+
+#define GIMP_TARGET_BUFFER \
+        { "application/x-gimp-buffer-name", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_BUFFER }
+
+#define GIMP_TARGET_IMAGEFILE \
+        { "application/x-gimp-imagefile-name", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_IMAGEFILE }
+
+#define GIMP_TARGET_TEMPLATE \
+        { "application/x-gimp-template-name", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_TEMPLATE }
+
+#define GIMP_TARGET_TOOL_ITEM \
+        { "application/x-gimp-tool-item-name", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_TOOL_ITEM }
+
+#define GIMP_TARGET_DIALOG \
+        { "application/x-gimp-dialog", GTK_TARGET_SAME_APP, GIMP_DND_TYPE_DIALOG }
+
+
+/*  dnd initialization  */
+
+void  gimp_dnd_init (Gimp *gimp);
+
+
+/*  uri list dnd functions  */
+
+typedef GList * (* GimpDndDragUriListFunc) (GtkWidget *widget,
+                                            gpointer   data);
+typedef void    (* GimpDndDropUriListFunc) (GtkWidget *widget,
+                                            gint       x,
+                                            gint       y,
+                                            GList     *uri_list,
+                                            gpointer   data);
+
+void  gimp_dnd_uri_list_source_add    (GtkWidget              *widget,
+                                       GimpDndDragUriListFunc  get_uri_list_func,
+                                       gpointer                data);
+void  gimp_dnd_uri_list_source_remove (GtkWidget              *widget);
+
+void  gimp_dnd_uri_list_dest_add      (GtkWidget              *widget,
+                                       GimpDndDropUriListFunc  set_uri_list_func,
+                                       gpointer                data);
+void  gimp_dnd_uri_list_dest_remove   (GtkWidget              *widget);
+
+
+/*  color dnd functions  */
+
+typedef void (* GimpDndDragColorFunc) (GtkWidget     *widget,
+                                       GimpRGB       *color,
+                                       gpointer       data);
+typedef void (* GimpDndDropColorFunc) (GtkWidget     *widget,
+                                       gint           x,
+                                       gint           y,
+                                       const GimpRGB *color,
+                                       gpointer       data);
+
+void  gimp_dnd_color_source_add    (GtkWidget            *widget,
+                                    GimpDndDragColorFunc  get_color_func,
+                                    gpointer              data);
+void  gimp_dnd_color_source_remove (GtkWidget            *widget);
+
+void  gimp_dnd_color_dest_add      (GtkWidget            *widget,
+                                    GimpDndDropColorFunc  set_color_func,
+                                    gpointer              data);
+void  gimp_dnd_color_dest_remove   (GtkWidget            *widget);
+
+
+/*  stream dnd functions  */
+
+typedef guchar * (* GimpDndDragStreamFunc) (GtkWidget    *widget,
+                                            gsize        *stream_len,
+                                            gpointer      data);
+typedef void     (* GimpDndDropStreamFunc) (GtkWidget    *widget,
+                                            gint          x,
+                                            gint          y,
+                                            const guchar *stream,
+                                            gsize         stream_len,
+                                            gpointer      data);
+
+void  gimp_dnd_svg_source_add    (GtkWidget              *widget,
+                                  GimpDndDragStreamFunc   get_svg_func,
+                                  gpointer                data);
+void  gimp_dnd_svg_source_remove (GtkWidget              *widget);
+
+void  gimp_dnd_svg_dest_add      (GtkWidget              *widget,
+                                  GimpDndDropStreamFunc   set_svg_func,
+                                  gpointer                data);
+void  gimp_dnd_svg_dest_remove   (GtkWidget              *widget);
+
+
+/*  pixbuf dnd functions  */
+
+typedef GdkPixbuf * (* GimpDndDragPixbufFunc) (GtkWidget    *widget,
+                                               gpointer      data);
+typedef void        (* GimpDndDropPixbufFunc) (GtkWidget    *widget,
+                                               gint          x,
+                                               gint          y,
+                                               GdkPixbuf    *pixbuf,
+                                               gpointer      data);
+
+void  gimp_dnd_pixbuf_source_add    (GtkWidget              *widget,
+                                     GimpDndDragPixbufFunc   get_pixbuf_func,
+                                     gpointer                data);
+void  gimp_dnd_pixbuf_source_remove (GtkWidget              *widget);
+
+void  gimp_dnd_pixbuf_dest_add      (GtkWidget              *widget,
+                                     GimpDndDropPixbufFunc   set_pixbuf_func,
+                                     gpointer                data);
+void  gimp_dnd_pixbuf_dest_remove   (GtkWidget              *widget);
+
+
+/*  component dnd functions  */
+
+typedef GimpImage * (* GimpDndDragComponentFunc) (GtkWidget       *widget,
+                                                  GimpContext    **context,
+                                                  GimpChannelType *channel,
+                                                  gpointer         data);
+typedef void        (* GimpDndDropComponentFunc) (GtkWidget       *widget,
+                                                  gint             x,
+                                                  gint             y,
+                                                  GimpImage       *image,
+                                                  GimpChannelType  channel,
+                                                  gpointer         data);
+
+void  gimp_dnd_component_source_add    (GtkWidget                 *widget,
+                                        GimpDndDragComponentFunc   get_comp_func,
+                                        gpointer                   data);
+void  gimp_dnd_component_source_remove (GtkWidget                 *widget);
+
+void  gimp_dnd_component_dest_add      (GtkWidget                 *widget,
+                                        GimpDndDropComponentFunc   set_comp_func,
+                                        gpointer                   data);
+void  gimp_dnd_component_dest_remove   (GtkWidget                 *widget);
+
+
+/*  GimpViewable (by GType) dnd functions  */
+
+typedef GimpViewable * (* GimpDndDragViewableFunc) (GtkWidget     *widget,
+                                                    GimpContext  **context,
+                                                    gpointer       data);
+typedef void           (* GimpDndDropViewableFunc) (GtkWidget     *widget,
+                                                    gint           x,
+                                                    gint           y,
+                                                    GimpViewable  *viewable,
+                                                    gpointer       data);
+
+
+gboolean gimp_dnd_drag_source_set_by_type (GtkWidget               *widget,
+                                           GdkModifierType          start_button_mask,
+                                           GType                    type,
+                                           GdkDragAction            actions);
+gboolean gimp_dnd_viewable_source_add     (GtkWidget               *widget,
+                                           GType                    type,
+                                           GimpDndDragViewableFunc  get_viewable_func,
+                                           gpointer                 data);
+gboolean gimp_dnd_viewable_source_remove  (GtkWidget               *widget,
+                                           GType                    type);
+
+gboolean gimp_dnd_drag_dest_set_by_type   (GtkWidget               *widget,
+                                           GtkDestDefaults          flags,
+                                           GType                    type,
+                                           GdkDragAction            actions);
+
+gboolean gimp_dnd_viewable_dest_add       (GtkWidget               *widget,
+                                           GType                    type,
+                                           GimpDndDropViewableFunc  set_viewable_func,
+                                           gpointer                 data);
+gboolean gimp_dnd_viewable_dest_remove    (GtkWidget               *widget,
+                                           GType                    type);
+
+GimpViewable * gimp_dnd_get_drag_data     (GtkWidget               *widget);
+
+
+/*  Direct Save Protocol (XDS)  */
+
+void  gimp_dnd_xds_source_add    (GtkWidget               *widget,
+                                  GimpDndDragViewableFunc  get_image_func,
+                                  gpointer                 data);
+void  gimp_dnd_xds_source_remove (GtkWidget               *widget);
+
+
+#endif /* __GIMP_DND_H__ */
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
new file mode 100644
index 0000000..c7bc81a
--- /dev/null
+++ b/app/widgets/gimpdock.c
@@ -0,0 +1,768 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdock.c
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockable.h"
+#include "gimpdockbook.h"
+#include "gimpdockcolumns.h"
+#include "gimpdockcontainer.h"
+#include "gimpdockwindow.h"
+#include "gimppanedbox.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_DOCK_FONT_SCALE  PANGO_SCALE_SMALL
+
+
+enum
+{
+  BOOK_ADDED,
+  BOOK_REMOVED,
+  DESCRIPTION_INVALIDATED,
+  GEOMETRY_INVALIDATED,
+  LAST_SIGNAL
+};
+
+
+struct _GimpDockPrivate
+{
+  GtkWidget         *temp_vbox;
+  GtkWidget         *main_vbox;
+  GtkWidget         *paned_vbox;
+
+  GList             *dockbooks;
+
+  gint               ID;
+};
+
+
+static void       gimp_dock_dispose                (GObject      *object);
+
+static void       gimp_dock_style_set              (GtkWidget    *widget,
+                                                    GtkStyle     *prev_style);
+static gchar    * gimp_dock_real_get_description   (GimpDock     *dock,
+                                                    gboolean      complete);
+static void       gimp_dock_real_book_added        (GimpDock     *dock,
+                                                    GimpDockbook *dockbook);
+static void       gimp_dock_real_book_removed      (GimpDock     *dock,
+                                                    GimpDockbook *dockbook);
+static void       gimp_dock_invalidate_description (GimpDock     *dock);
+static gboolean   gimp_dock_dropped_cb             (GtkWidget    *source,
+                                                    gint          insert_index,
+                                                    gpointer      data);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDock, gimp_dock, GTK_TYPE_BOX)
+
+#define parent_class gimp_dock_parent_class
+
+static guint dock_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_dock_class_init (GimpDockClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  dock_signals[BOOK_ADDED] =
+    g_signal_new ("book-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockClass, book_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCKBOOK);
+
+  dock_signals[BOOK_REMOVED] =
+    g_signal_new ("book-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockClass, book_removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCKBOOK);
+
+  dock_signals[DESCRIPTION_INVALIDATED] =
+    g_signal_new ("description-invalidated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockClass, description_invalidated),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  dock_signals[GEOMETRY_INVALIDATED] =
+    g_signal_new ("geometry-invalidated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockClass, geometry_invalidated),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose          = gimp_dock_dispose;
+
+  widget_class->style_set        = gimp_dock_style_set;
+
+  klass->get_description         = gimp_dock_real_get_description;
+  klass->set_host_geometry_hints = NULL;
+  klass->book_added              = gimp_dock_real_book_added;
+  klass->book_removed            = gimp_dock_real_book_removed;
+  klass->description_invalidated = NULL;
+  klass->geometry_invalidated    = NULL;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_double ("font-scale",
+                                                                NULL, NULL,
+                                                                0.0,
+                                                                G_MAXDOUBLE,
+                                                                DEFAULT_DOCK_FONT_SCALE,
+                                                                GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_dock_init (GimpDock *dock)
+{
+  static gint  dock_ID = 1;
+  gchar       *name    = NULL;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (dock),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  dock->p = gimp_dock_get_instance_private (dock);
+  dock->p->ID             = dock_ID++;
+
+  name = g_strdup_printf ("gimp-internal-dock-%d", dock->p->ID);
+  gtk_widget_set_name (GTK_WIDGET (dock), name);
+  g_free (name);
+
+  dock->p->temp_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (dock), dock->p->temp_vbox, FALSE, FALSE, 0);
+  /* Never show it */
+
+  dock->p->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (dock), dock->p->main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (dock->p->main_vbox);
+
+  dock->p->paned_vbox = gimp_paned_box_new (FALSE, 0, GTK_ORIENTATION_VERTICAL);
+  gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock->p->paned_vbox),
+                                 gimp_dock_dropped_cb,
+                                 dock);
+  gtk_box_pack_start (GTK_BOX (dock->p->main_vbox), dock->p->paned_vbox,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (dock->p->paned_vbox);
+}
+
+static void
+gimp_dock_dispose (GObject *object)
+{
+  GimpDock *dock = GIMP_DOCK (object);
+
+  while (dock->p->dockbooks)
+    {
+      GimpDockbook *dockbook = dock->p->dockbooks->data;
+
+      g_object_ref (dockbook);
+      gimp_dock_remove_book (dock, dockbook);
+      gtk_widget_destroy (GTK_WIDGET (dockbook));
+      g_object_unref (dockbook);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dock_style_set (GtkWidget *widget,
+                     GtkStyle  *prev_style)
+{
+  GimpDock *dock       = GIMP_DOCK (widget);
+  gdouble   font_scale = 1.0;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget,
+                        "font-scale", &font_scale,
+                        NULL);
+
+  if (font_scale != 1.0)
+    {
+      PangoContext         *context;
+      PangoFontDescription *font_desc;
+      gint                  font_size;
+      gchar                *font_str;
+      gchar                *rc_string;
+
+      context = gtk_widget_get_pango_context (widget);
+      font_desc = pango_context_get_font_description (context);
+      font_desc = pango_font_description_copy (font_desc);
+
+      font_size = pango_font_description_get_size (font_desc);
+      font_size = font_scale * font_size;
+      pango_font_description_set_size (font_desc, font_size);
+
+      font_str = pango_font_description_to_string (font_desc);
+      pango_font_description_free (font_desc);
+
+      rc_string =
+        g_strdup_printf ("style \"gimp-dock-style\""
+                         "{"
+                         "  font_name = \"%s\""
+                         "}"
+                         "widget \"*.gimp-internal-dock-%d.*\" style \"gimp-dock-style\"",
+                         font_str,
+                         dock->p->ID);
+      g_free (font_str);
+
+      gtk_rc_parse_string (rc_string);
+      g_free (rc_string);
+
+      gtk_widget_reset_rc_styles (widget);
+    }
+}
+
+static gchar *
+gimp_dock_real_get_description (GimpDock *dock,
+                                gboolean  complete)
+{
+  GString *desc;
+  GList   *list;
+
+  desc = g_string_new (NULL);
+
+  for (list = gimp_dock_get_dockbooks (dock);
+       list;
+       list = g_list_next (list))
+    {
+      GimpDockbook *dockbook = list->data;
+      GList        *children;
+      GList        *child;
+
+      if (complete)
+        {
+          /* Include all dockables */
+          children = gtk_container_get_children (GTK_CONTAINER (dockbook));
+        }
+      else
+        {
+          GtkWidget *dockable = NULL;
+          gint       page_num = 0;
+
+          page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+          dockable = gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
+
+          /* Only include active dockables */
+          children = g_list_append (NULL, dockable);
+        }
+
+      for (child = children; child; child = g_list_next (child))
+        {
+          GimpDockable *dockable = child->data;
+
+          g_string_append (desc, gimp_dockable_get_name (dockable));
+
+          if (g_list_next (child))
+            g_string_append (desc, GIMP_DOCK_DOCKABLE_SEPARATOR);
+        }
+
+      g_list_free (children);
+
+      if (g_list_next (list))
+        g_string_append (desc, GIMP_DOCK_BOOK_SEPARATOR);
+    }
+
+  return g_string_free (desc, FALSE);
+}
+
+static void
+gimp_dock_real_book_added (GimpDock     *dock,
+                           GimpDockbook *dockbook)
+{
+  g_signal_connect_object (dockbook, "switch-page",
+                           G_CALLBACK (gimp_dock_invalidate_description),
+                           dock, G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_dock_real_book_removed (GimpDock     *dock,
+                             GimpDockbook *dockbook)
+{
+  g_signal_handlers_disconnect_by_func (dockbook,
+                                        gimp_dock_invalidate_description,
+                                        dock);
+}
+
+static void
+gimp_dock_invalidate_description (GimpDock *dock)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  g_signal_emit (dock, dock_signals[DESCRIPTION_INVALIDATED], 0);
+}
+
+static gboolean
+gimp_dock_dropped_cb (GtkWidget *source,
+                      gint       insert_index,
+                      gpointer   data)
+{
+  GimpDock          *dock     = GIMP_DOCK (data);
+  GimpDockable      *dockable = gimp_dockbook_drag_source_to_dockable (source);
+  GimpDialogFactory *factory;
+  GtkWidget         *dockbook = NULL;
+
+  if (!dockable )
+    return FALSE;
+
+  /*  if dropping to the same dock, take care that we don't try
+   *  to reorder the *only* dockable in the dock
+   */
+  if (gimp_dockbook_get_dock (gimp_dockable_get_dockbook (dockable)) == dock)
+    {
+      GList *children;
+      gint   n_books;
+      gint   n_dockables;
+
+      n_books = g_list_length (gimp_dock_get_dockbooks (dock));
+
+      children = gtk_container_get_children (GTK_CONTAINER (gimp_dockable_get_dockbook (dockable)));
+      n_dockables = g_list_length (children);
+      g_list_free (children);
+
+      if (n_books == 1 && n_dockables == 1)
+        return TRUE; /* successfully do nothing */
+    }
+
+  /* Detach the dockable from the old dockbook */
+  g_object_ref (dockable);
+  gimp_dockbook_remove (gimp_dockable_get_dockbook (dockable), dockable);
+
+  /* Create a new dockbook */
+  factory = gimp_dock_get_dialog_factory (dock);
+  dockbook = gimp_dockbook_new (gimp_dialog_factory_get_menu_factory (factory));
+  gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), insert_index);
+
+  /* Add the dockable to new new dockbook */
+  gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, -1);
+  g_object_unref (dockable);
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_dock_get_description:
+ * @dock:
+ * @complete: If %TRUE, only includes the active dockables, i.e. not the
+ *            dockables in a non-active GtkNotebook tab
+ *
+ * Returns: A string describing the contents of the dock.
+ **/
+gchar *
+gimp_dock_get_description (GimpDock *dock,
+                           gboolean  complete)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  if (GIMP_DOCK_GET_CLASS (dock)->get_description)
+    return GIMP_DOCK_GET_CLASS (dock)->get_description (dock, complete);
+
+  return NULL;
+}
+
+/**
+ * gimp_dock_set_host_geometry_hints:
+ * @dock:   The dock
+ * @window: The #GtkWindow to adapt to hosting the dock
+ *
+ * Some docks have some specific needs on the #GtkWindow they are
+ * in. This function allows such docks to perform any such setup on
+ * the #GtkWindow they are in/will be put in.
+ **/
+void
+gimp_dock_set_host_geometry_hints (GimpDock  *dock,
+                                   GtkWindow *window)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  if (GIMP_DOCK_GET_CLASS (dock)->set_host_geometry_hints)
+    GIMP_DOCK_GET_CLASS (dock)->set_host_geometry_hints (dock, window);
+}
+
+/**
+ * gimp_dock_invalidate_geometry:
+ * @dock:
+ *
+ * Call when the dock needs to setup its host #GtkWindow with
+ * GtkDock::set_host_geometry_hints().
+ **/
+void
+gimp_dock_invalidate_geometry (GimpDock *dock)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  g_signal_emit (dock, dock_signals[GEOMETRY_INVALIDATED], 0);
+}
+
+/**
+ * gimp_dock_update_with_context:
+ * @dock:
+ * @context:
+ *
+ * Set the @context on all dockables in the @dock.
+ **/
+void
+gimp_dock_update_with_context (GimpDock    *dock,
+                               GimpContext *context)
+{
+  GList *iter = NULL;
+
+  for (iter = gimp_dock_get_dockbooks (dock);
+       iter;
+       iter = g_list_next (iter))
+    {
+      GimpDockbook *dockbook = GIMP_DOCKBOOK (iter->data);
+
+      gimp_dockbook_update_with_context (dockbook, context);
+    }
+}
+
+/**
+ * gimp_dock_get_context:
+ * @dock:
+ *
+ * Returns: The #GimpContext for the #GimpDockWindow the @dock is in.
+ **/
+GimpContext *
+gimp_dock_get_context (GimpDock *dock)
+{
+  GimpContext *context = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  /* First try GimpDockColumns */
+  if (! context)
+    {
+      GimpDockColumns *dock_columns;
+
+      dock_columns =
+        GIMP_DOCK_COLUMNS (gtk_widget_get_ancestor (GTK_WIDGET (dock),
+                                                    GIMP_TYPE_DOCK_COLUMNS));
+
+      if (dock_columns)
+        context = gimp_dock_columns_get_context (dock_columns);
+    }
+
+  /* Then GimpDockWindow */
+  if (! context)
+    {
+      GimpDockWindow *dock_window = gimp_dock_window_from_dock (dock);
+
+      if (dock_window)
+        context = gimp_dock_window_get_context (dock_window);
+    }
+
+  return context;
+}
+
+/**
+ * gimp_dock_get_dialog_factory:
+ * @dock:
+ *
+ * Returns: The #GimpDialogFactory for the #GimpDockWindow the @dock
+ *          is in.
+ **/
+GimpDialogFactory *
+gimp_dock_get_dialog_factory (GimpDock *dock)
+{
+  GimpDialogFactory *dialog_factory = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  /* First try GimpDockColumns */
+  if (! dialog_factory)
+    {
+      GimpDockColumns *dock_columns;
+
+      dock_columns =
+        GIMP_DOCK_COLUMNS (gtk_widget_get_ancestor (GTK_WIDGET (dock),
+                                                    GIMP_TYPE_DOCK_COLUMNS));
+
+      if (dock_columns)
+        dialog_factory = gimp_dock_columns_get_dialog_factory (dock_columns);
+    }
+
+  /* Then GimpDockWindow */
+  if (! dialog_factory)
+    {
+      GimpDockWindow *dock_window = gimp_dock_window_from_dock (dock);
+
+      if (dock_window)
+        dialog_factory = gimp_dock_container_get_dialog_factory (GIMP_DOCK_CONTAINER (dock_window));
+    }
+
+  return dialog_factory;
+}
+
+/**
+ * gimp_dock_get_ui_manager:
+ * @dock:
+ *
+ * Returns: The #GimpUIManager for the #GimpDockWindow the @dock is
+ *          in.
+ **/
+GimpUIManager *
+gimp_dock_get_ui_manager (GimpDock *dock)
+{
+  GimpUIManager *ui_manager = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  /* First try GimpDockColumns */
+  if (! ui_manager)
+    {
+      GimpDockColumns *dock_columns;
+
+      dock_columns =
+        GIMP_DOCK_COLUMNS (gtk_widget_get_ancestor (GTK_WIDGET (dock),
+                                                    GIMP_TYPE_DOCK_COLUMNS));
+
+      if (dock_columns)
+        ui_manager = gimp_dock_columns_get_ui_manager (dock_columns);
+    }
+
+  /* Then GimpDockContainer */
+  if (! ui_manager)
+    {
+      GimpDockWindow *dock_window = gimp_dock_window_from_dock (dock);
+
+      if (dock_window)
+        {
+          GimpDockContainer *dock_container = GIMP_DOCK_CONTAINER (dock_window);
+
+          ui_manager = gimp_dock_container_get_ui_manager (dock_container);
+        }
+    }
+
+  return ui_manager;
+}
+
+GList *
+gimp_dock_get_dockbooks (GimpDock *dock)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  return dock->p->dockbooks;
+}
+
+gint
+gimp_dock_get_n_dockables (GimpDock *dock)
+{
+  GList *list = NULL;
+  gint   n    = 0;
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), 0);
+
+  for (list = dock->p->dockbooks; list; list = list->next)
+    n += gtk_notebook_get_n_pages (GTK_NOTEBOOK (list->data));
+
+  return n;
+}
+
+GtkWidget *
+gimp_dock_get_main_vbox (GimpDock *dock)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  return dock->p->main_vbox;
+}
+
+GtkWidget *
+gimp_dock_get_vbox (GimpDock *dock)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  return dock->p->paned_vbox;
+}
+
+gint
+gimp_dock_get_id (GimpDock *dock)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), 0);
+
+  return dock->p->ID;
+}
+
+void
+gimp_dock_set_id (GimpDock *dock,
+                  gint      ID)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  dock->p->ID = ID;
+}
+
+void
+gimp_dock_add (GimpDock     *dock,
+               GimpDockable *dockable,
+               gint          section,
+               gint          position)
+{
+  GimpDockbook *dockbook;
+
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (gimp_dockable_get_dockbook (dockable) == NULL);
+
+  dockbook = GIMP_DOCKBOOK (dock->p->dockbooks->data);
+
+  gimp_dockbook_add (dockbook, dockable, position);
+}
+
+void
+gimp_dock_remove (GimpDock     *dock,
+                  GimpDockable *dockable)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (gimp_dockable_get_dockbook (dockable) != NULL);
+  g_return_if_fail (gimp_dockbook_get_dock (gimp_dockable_get_dockbook (dockable)) == dock);
+
+  gimp_dockbook_remove (gimp_dockable_get_dockbook (dockable), dockable);
+}
+
+void
+gimp_dock_add_book (GimpDock     *dock,
+                    GimpDockbook *dockbook,
+                    gint          index)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+  g_return_if_fail (gimp_dockbook_get_dock (dockbook) == NULL);
+
+  gimp_dockbook_set_dock (dockbook, dock);
+
+  g_signal_connect_object (dockbook, "dockable-added",
+                           G_CALLBACK (gimp_dock_invalidate_description),
+                           dock, G_CONNECT_SWAPPED);
+  g_signal_connect_object (dockbook, "dockable-removed",
+                           G_CALLBACK (gimp_dock_invalidate_description),
+                           dock, G_CONNECT_SWAPPED);
+  g_signal_connect_object (dockbook, "dockable-reordered",
+                           G_CALLBACK (gimp_dock_invalidate_description),
+                           dock, G_CONNECT_SWAPPED);
+
+  dock->p->dockbooks = g_list_insert (dock->p->dockbooks, dockbook, index);
+  gimp_paned_box_add_widget (GIMP_PANED_BOX (dock->p->paned_vbox),
+                             GTK_WIDGET (dockbook),
+                             index);
+  gtk_widget_show (GTK_WIDGET (dockbook));
+
+  gimp_dock_invalidate_description (dock);
+
+  g_signal_emit (dock, dock_signals[BOOK_ADDED], 0, dockbook);
+}
+
+void
+gimp_dock_remove_book (GimpDock     *dock,
+                       GimpDockbook *dockbook)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+  g_return_if_fail (gimp_dockbook_get_dock (dockbook) == dock);
+
+  gimp_dockbook_set_dock (dockbook, NULL);
+
+  g_signal_handlers_disconnect_by_func (dockbook,
+                                        gimp_dock_invalidate_description,
+                                        dock);
+
+  /* Ref the dockbook so we can emit the "book-removed" signal and
+   * pass it as a parameter before it's destroyed
+   */
+  g_object_ref (dockbook);
+
+  dock->p->dockbooks = g_list_remove (dock->p->dockbooks, dockbook);
+  gimp_paned_box_remove_widget (GIMP_PANED_BOX (dock->p->paned_vbox),
+                                GTK_WIDGET (dockbook));
+
+  gimp_dock_invalidate_description (dock);
+
+  g_signal_emit (dock, dock_signals[BOOK_REMOVED], 0, dockbook);
+
+  g_object_unref (dockbook);
+}
+
+/**
+ * gimp_dock_temp_add:
+ * @dock:
+ * @widget:
+ *
+ * Method to temporarily add a widget to the dock, for example to make
+ * font-scale style property to be applied temporarily to the
+ * child.
+ **/
+void
+gimp_dock_temp_add (GimpDock  *dock,
+                    GtkWidget *child)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+
+  gtk_box_pack_start (GTK_BOX (dock->p->temp_vbox), child, FALSE, FALSE, 0);
+}
+
+/**
+ * gimp_dock_temp_remove:
+ * @dock:
+ * @child:
+ *
+ * Removes a temporary child added with gimp_dock_temp_add().
+ **/
+void
+gimp_dock_temp_remove (GimpDock  *dock,
+                       GtkWidget *child)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+
+  gtk_container_remove (GTK_CONTAINER (dock->p->temp_vbox), child);
+}
diff --git a/app/widgets/gimpdock.h b/app/widgets/gimpdock.h
new file mode 100644
index 0000000..d6356cf
--- /dev/null
+++ b/app/widgets/gimpdock.h
@@ -0,0 +1,120 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdock.h
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCK_H__
+#define __GIMP_DOCK_H__
+
+
+#define GIMP_TYPE_DOCK            (gimp_dock_get_type ())
+#define GIMP_DOCK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK, GimpDock))
+#define GIMP_DOCK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCK, GimpDockClass))
+#define GIMP_IS_DOCK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCK))
+#define GIMP_IS_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCK))
+#define GIMP_DOCK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCK, GimpDockClass))
+
+
+/* String used to separate dockables, e.g. "Tool Options, Layers" */
+#define GIMP_DOCK_DOCKABLE_SEPARATOR C_("dock", ", ")
+
+/* String used to separate books (GtkNotebooks) within a dock,
+   e.g. "Tool Options, Layers - Brushes"
+ */
+#define GIMP_DOCK_BOOK_SEPARATOR C_("dock", " - ")
+
+/* String used to separate dock columns,
+   e.g. "Tool Options, Layers - Brushes | Gradients"
+ */
+#define GIMP_DOCK_COLUMN_SEPARATOR C_("dock", " | ")
+
+
+typedef struct _GimpDockClass    GimpDockClass;
+typedef struct _GimpDockPrivate  GimpDockPrivate;
+
+/**
+ * GimpDock:
+ *
+ * Contains a column of GimpDockbooks.
+ */
+struct _GimpDock
+{
+  GtkBox           parent_instance;
+
+  GimpDockPrivate *p;
+};
+
+struct _GimpDockClass
+{
+  GtkBoxClass  parent_class;
+
+  /*  virtual functions  */
+  gchar * (* get_description)         (GimpDock       *dock,
+                                       gboolean        complete);
+  void    (* set_host_geometry_hints) (GimpDock       *dock,
+                                       GtkWindow      *window);
+
+  /*  signals  */
+  void    (* book_added)              (GimpDock       *dock,
+                                       GimpDockbook   *dockbook);
+  void    (* book_removed)            (GimpDock       *dock,
+                                       GimpDockbook   *dockbook);
+  void    (* description_invalidated) (GimpDock       *dock);
+  void    (* geometry_invalidated)    (GimpDock       *dock);
+};
+
+
+GType               gimp_dock_get_type                (void) G_GNUC_CONST;
+
+gchar             * gimp_dock_get_description         (GimpDock       *dock,
+                                                       gboolean        complete);
+void                gimp_dock_set_host_geometry_hints (GimpDock       *dock,
+                                                       GtkWindow      *window);
+void                gimp_dock_invalidate_geometry     (GimpDock       *dock);
+void                gimp_dock_update_with_context     (GimpDock       *dock,
+                                                       GimpContext    *context);
+GimpContext       * gimp_dock_get_context             (GimpDock       *dock);
+GimpDialogFactory * gimp_dock_get_dialog_factory      (GimpDock       *dock);
+GimpUIManager     * gimp_dock_get_ui_manager          (GimpDock       *dock);
+GList             * gimp_dock_get_dockbooks           (GimpDock       *dock);
+gint                gimp_dock_get_n_dockables         (GimpDock       *dock);
+GtkWidget         * gimp_dock_get_main_vbox           (GimpDock       *dock);
+GtkWidget         * gimp_dock_get_vbox                (GimpDock       *dock);
+gint                gimp_dock_get_id                  (GimpDock       *dock);
+void                gimp_dock_set_id                  (GimpDock       *dock,
+                                                       gint            ID);
+
+void                gimp_dock_add                     (GimpDock       *dock,
+                                                       GimpDockable   *dockable,
+                                                       gint            book,
+                                                       gint            index);
+void                gimp_dock_remove                  (GimpDock       *dock,
+                                                       GimpDockable   *dockable);
+
+void                gimp_dock_add_book                (GimpDock       *dock,
+                                                       GimpDockbook   *dockbook,
+                                                       gint            index);
+void                gimp_dock_remove_book             (GimpDock       *dock,
+                                                       GimpDockbook   *dockbook);
+void                gimp_dock_temp_add                (GimpDock       *dock,
+                                                       GtkWidget      *widget);
+void                gimp_dock_temp_remove             (GimpDock       *dock,
+                                                       GtkWidget      *widget);
+
+
+#endif /* __GIMP_DOCK_H__ */
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
new file mode 100644
index 0000000..0bce472
--- /dev/null
+++ b/app/widgets/gimpdockable.c
@@ -0,0 +1,905 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockable.c
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdnd.h"
+#include "gimpdock.h"
+#include "gimpdockable.h"
+#include "gimpdockbook.h"
+#include "gimpdocked.h"
+#include "gimpdockwindow.h"
+#include "gimphelp-ids.h"
+#include "gimppanedbox.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpsessionmanaged.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LOCKED
+};
+
+
+struct _GimpDockablePrivate
+{
+  gchar        *name;
+  gchar        *blurb;
+  gchar        *icon_name;
+  gchar        *help_id;
+  GimpTabStyle  tab_style;
+  GimpTabStyle  actual_tab_style;
+  gboolean      locked;
+
+  GimpDockbook *dockbook;
+
+  GimpContext  *context;
+
+  GimpPanedBox *drag_handler;
+
+  /*  drag icon hotspot  */
+  gint          drag_x;
+  gint          drag_y;
+};
+
+
+static void       gimp_dockable_session_managed_iface_init
+                                                  (GimpSessionManagedInterface
+                                                                  *iface);
+static void       gimp_dockable_dispose           (GObject        *object);
+static void       gimp_dockable_set_property      (GObject        *object,
+                                                   guint           property_id,
+                                                   const GValue   *value,
+                                                   GParamSpec     *pspec);
+static void       gimp_dockable_get_property      (GObject        *object,
+                                                   guint           property_id,
+                                                   GValue         *value,
+                                                   GParamSpec     *pspec);
+
+static void       gimp_dockable_size_request      (GtkWidget      *widget,
+                                                   GtkRequisition *requisition);
+static void       gimp_dockable_size_allocate     (GtkWidget      *widget,
+                                                   GtkAllocation  *allocation);
+static void       gimp_dockable_drag_leave        (GtkWidget      *widget,
+                                                   GdkDragContext *context,
+                                                   guint           time);
+static gboolean   gimp_dockable_drag_motion       (GtkWidget      *widget,
+                                                   GdkDragContext *context,
+                                                   gint            x,
+                                                   gint            y,
+                                                   guint           time);
+static gboolean   gimp_dockable_drag_drop         (GtkWidget      *widget,
+                                                   GdkDragContext *context,
+                                                   gint            x,
+                                                   gint            y,
+                                                   guint           time);
+
+static void       gimp_dockable_style_set         (GtkWidget      *widget,
+                                                   GtkStyle       *prev_style);
+
+static void       gimp_dockable_add               (GtkContainer   *container,
+                                                   GtkWidget      *widget);
+static GType      gimp_dockable_child_type        (GtkContainer   *container);
+static GList    * gimp_dockable_get_aux_info      (GimpSessionManaged
+                                                                  *session_managed);
+static void       gimp_dockable_set_aux_info      (GimpSessionManaged
+                                                                  *session_managed,
+                                                   GList          *aux_info);
+
+static GimpTabStyle
+                  gimp_dockable_convert_tab_style (GimpDockable   *dockable,
+                                                   GimpTabStyle    tab_style);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDockable, gimp_dockable, GTK_TYPE_BIN,
+                         G_ADD_PRIVATE (GimpDockable)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_SESSION_MANAGED,
+                                                gimp_dockable_session_managed_iface_init))
+
+#define parent_class gimp_dockable_parent_class
+
+static const GtkTargetEntry dialog_target_table[] = { GIMP_TARGET_DIALOG };
+
+
+static void
+gimp_dockable_class_init (GimpDockableClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+
+  object_class->dispose       = gimp_dockable_dispose;
+  object_class->set_property  = gimp_dockable_set_property;
+  object_class->get_property  = gimp_dockable_get_property;
+
+  widget_class->size_request  = gimp_dockable_size_request;
+  widget_class->size_allocate = gimp_dockable_size_allocate;
+  widget_class->style_set     = gimp_dockable_style_set;
+  widget_class->drag_leave    = gimp_dockable_drag_leave;
+  widget_class->drag_motion   = gimp_dockable_drag_motion;
+  widget_class->drag_drop     = gimp_dockable_drag_drop;
+
+  container_class->add        = gimp_dockable_add;
+  container_class->child_type = gimp_dockable_child_type;
+
+  g_object_class_install_property (object_class, PROP_LOCKED,
+                                   g_param_spec_boolean ("locked", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("content-border",
+                                                             NULL, NULL,
+                                                             0,
+                                                             G_MAXINT,
+                                                             0,
+                                                             GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_dockable_init (GimpDockable *dockable)
+{
+  dockable->p = gimp_dockable_get_instance_private (dockable);
+  dockable->p->tab_style        = GIMP_TAB_STYLE_AUTOMATIC;
+  dockable->p->actual_tab_style = GIMP_TAB_STYLE_UNDEFINED;
+  dockable->p->drag_x           = GIMP_DOCKABLE_DRAG_OFFSET;
+  dockable->p->drag_y           = GIMP_DOCKABLE_DRAG_OFFSET;
+
+  gtk_drag_dest_set (GTK_WIDGET (dockable),
+                     0,
+                     dialog_target_table, G_N_ELEMENTS (dialog_target_table),
+                     GDK_ACTION_MOVE);
+}
+
+static void
+gimp_dockable_session_managed_iface_init (GimpSessionManagedInterface *iface)
+{
+  iface->get_aux_info = gimp_dockable_get_aux_info;
+  iface->set_aux_info = gimp_dockable_set_aux_info;
+}
+
+static void
+gimp_dockable_dispose (GObject *object)
+{
+  GimpDockable *dockable = GIMP_DOCKABLE (object);
+
+  if (dockable->p->context)
+    gimp_dockable_set_context (dockable, NULL);
+
+  g_clear_pointer (&dockable->p->blurb,     g_free);
+  g_clear_pointer (&dockable->p->name,      g_free);
+  g_clear_pointer (&dockable->p->icon_name, g_free);
+  g_clear_pointer (&dockable->p->help_id,   g_free);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dockable_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpDockable *dockable = GIMP_DOCKABLE (object);
+
+  switch (property_id)
+    {
+    case PROP_LOCKED:
+      gimp_dockable_set_locked (dockable, g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dockable_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpDockable *dockable = GIMP_DOCKABLE (object);
+
+  switch (property_id)
+    {
+    case PROP_LOCKED:
+      g_value_set_boolean (value, dockable->p->locked);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dockable_size_request (GtkWidget      *widget,
+                            GtkRequisition *requisition)
+{
+  GtkContainer   *container = GTK_CONTAINER (widget);
+  GtkWidget      *child     = gtk_bin_get_child (GTK_BIN (widget));
+  GtkRequisition  child_requisition;
+  gint            border_width;
+
+  border_width = gtk_container_get_border_width (container);
+
+  requisition->width  = border_width * 2;
+  requisition->height = border_width * 2;
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      gtk_widget_size_request (child, &child_requisition);
+
+      requisition->width  += child_requisition.width;
+      requisition->height += child_requisition.height;
+    }
+}
+
+static void
+gimp_dockable_size_allocate (GtkWidget     *widget,
+                             GtkAllocation *allocation)
+{
+  GtkContainer   *container = GTK_CONTAINER (widget);
+  GtkWidget      *child     = gtk_bin_get_child (GTK_BIN (widget));
+
+  GtkRequisition  button_requisition = { 0, };
+  GtkAllocation   child_allocation;
+  gint            border_width;
+
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  border_width = gtk_container_get_border_width (container);
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      child_allocation.x      = allocation->x + border_width;
+      child_allocation.y      = allocation->y + border_width;
+      child_allocation.width  = MAX (allocation->width  -
+                                     border_width * 2,
+                                     0);
+      child_allocation.height = MAX (allocation->height -
+                                     border_width * 2 -
+                                     button_requisition.height,
+                                     0);
+
+      child_allocation.y += button_requisition.height;
+
+      gtk_widget_size_allocate (child, &child_allocation);
+    }
+}
+
+static void
+gimp_dockable_drag_leave (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          guint           time)
+{
+  gimp_highlight_widget (widget, FALSE);
+}
+
+static gboolean
+gimp_dockable_drag_motion (GtkWidget      *widget,
+                           GdkDragContext *context,
+                           gint            x,
+                           gint            y,
+                           guint           time)
+{
+  GimpDockable *dockable = GIMP_DOCKABLE (widget);
+
+  if (gimp_paned_box_will_handle_drag (dockable->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      gdk_drag_status (context, 0, time);
+      gimp_highlight_widget (widget, FALSE);
+
+      return FALSE;
+    }
+
+  gdk_drag_status (context, GDK_ACTION_MOVE, time);
+  gimp_highlight_widget (widget, TRUE);
+
+  /* Return TRUE so drag_leave() is called */
+  return TRUE;
+}
+
+static gboolean
+gimp_dockable_drag_drop (GtkWidget      *widget,
+                         GdkDragContext *context,
+                         gint            x,
+                         gint            y,
+                         guint           time)
+{
+  GimpDockable *dockable = GIMP_DOCKABLE (widget);
+  gboolean      dropped;
+
+  if (gimp_paned_box_will_handle_drag (dockable->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      return FALSE;
+    }
+
+  dropped = gimp_dockbook_drop_dockable (GIMP_DOCKABLE (widget)->p->dockbook,
+                                         gtk_drag_get_source_widget (context));
+
+  gtk_drag_finish (context, dropped, TRUE, time);
+
+  return TRUE;
+}
+
+static void
+gimp_dockable_style_set (GtkWidget *widget,
+                         GtkStyle  *prev_style)
+{
+  gint content_border;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget,
+                        "content-border", &content_border,
+                        NULL);
+
+  gtk_container_set_border_width (GTK_CONTAINER (widget), content_border);
+}
+
+
+static void
+gimp_dockable_add (GtkContainer *container,
+                   GtkWidget    *widget)
+{
+  GimpDockable *dockable;
+
+  g_return_if_fail (gtk_bin_get_child (GTK_BIN (container)) == NULL);
+
+  GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+
+  /*  not all tab styles are supported by all children  */
+  dockable = GIMP_DOCKABLE (container);
+  gimp_dockable_set_tab_style (dockable, dockable->p->tab_style);
+}
+
+static GType
+gimp_dockable_child_type (GtkContainer *container)
+{
+  if (gtk_bin_get_child (GTK_BIN (container)))
+    return G_TYPE_NONE;
+
+  return GIMP_TYPE_DOCKED;
+}
+
+static GtkWidget *
+gimp_dockable_new_tab_widget_internal (GimpDockable *dockable,
+                                       GimpContext  *context,
+                                       GimpTabStyle  tab_style,
+                                       GtkIconSize   size,
+                                       gboolean      dnd)
+{
+  GtkWidget *tab_widget = NULL;
+  GtkWidget *label      = NULL;
+  GtkWidget *icon       = NULL;
+
+  switch (tab_style)
+    {
+    case GIMP_TAB_STYLE_NAME:
+    case GIMP_TAB_STYLE_ICON_NAME:
+    case GIMP_TAB_STYLE_PREVIEW_NAME:
+      label = gtk_label_new (dockable->p->name);
+      break;
+
+    case GIMP_TAB_STYLE_BLURB:
+    case GIMP_TAB_STYLE_ICON_BLURB:
+    case GIMP_TAB_STYLE_PREVIEW_BLURB:
+      label = gtk_label_new (dockable->p->blurb);
+      break;
+
+    default:
+      break;
+    }
+
+  switch (tab_style)
+    {
+    case GIMP_TAB_STYLE_ICON:
+    case GIMP_TAB_STYLE_ICON_NAME:
+    case GIMP_TAB_STYLE_ICON_BLURB:
+      icon = gimp_dockable_get_icon (dockable, size);
+      break;
+
+    case GIMP_TAB_STYLE_PREVIEW:
+    case GIMP_TAB_STYLE_PREVIEW_NAME:
+    case GIMP_TAB_STYLE_PREVIEW_BLURB:
+      {
+        GtkWidget *child = gtk_bin_get_child (GTK_BIN (dockable));
+
+        if (child)
+          icon = gimp_docked_get_preview (GIMP_DOCKED (child),
+                                          context, size);
+
+        if (! icon)
+          icon = gimp_dockable_get_icon (dockable, size);
+      }
+      break;
+
+    default:
+      break;
+    }
+
+  if (label && dnd)
+    gimp_label_set_attributes (GTK_LABEL (label),
+                               PANGO_ATTR_WEIGHT, PANGO_WEIGHT_SEMIBOLD,
+                               -1);
+
+  switch (tab_style)
+    {
+    case GIMP_TAB_STYLE_ICON:
+    case GIMP_TAB_STYLE_PREVIEW:
+      tab_widget = icon;
+      break;
+
+    case GIMP_TAB_STYLE_NAME:
+    case GIMP_TAB_STYLE_BLURB:
+      tab_widget = label;
+      break;
+
+    case GIMP_TAB_STYLE_ICON_NAME:
+    case GIMP_TAB_STYLE_ICON_BLURB:
+    case GIMP_TAB_STYLE_PREVIEW_NAME:
+    case GIMP_TAB_STYLE_PREVIEW_BLURB:
+      tab_widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, dnd ? 6 : 2);
+
+      gtk_box_pack_start (GTK_BOX (tab_widget), icon, FALSE, FALSE, 0);
+      gtk_widget_show (icon);
+
+      gtk_box_pack_start (GTK_BOX (tab_widget), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+      break;
+
+    case GIMP_TAB_STYLE_UNDEFINED:
+    case GIMP_TAB_STYLE_AUTOMATIC:
+      g_warning ("Tab style error, unexpected code path taken, fix!");
+      break;
+    }
+
+  return tab_widget;
+}
+
+/*  public functions  */
+
+GtkWidget *
+gimp_dockable_new (const gchar *name,
+                   const gchar *blurb,
+                   const gchar *icon_name,
+                   const gchar *help_id)
+{
+  GimpDockable *dockable;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+
+  dockable = g_object_new (GIMP_TYPE_DOCKABLE, NULL);
+
+  dockable->p->name      = g_strdup (name);
+  dockable->p->icon_name = g_strdup (icon_name);
+  dockable->p->help_id   = g_strdup (help_id);
+
+  if (blurb)
+    dockable->p->blurb  = g_strdup (blurb);
+  else
+    dockable->p->blurb  = g_strdup (dockable->p->name);
+
+  gimp_help_set_help_data (GTK_WIDGET (dockable), NULL, help_id);
+
+  return GTK_WIDGET (dockable);
+}
+
+void
+gimp_dockable_set_dockbook (GimpDockable *dockable,
+                            GimpDockbook *dockbook)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (dockbook == NULL ||
+                    GIMP_IS_DOCKBOOK (dockbook));
+
+  dockable->p->dockbook = dockbook;
+}
+
+GimpDockbook *
+gimp_dockable_get_dockbook (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return dockable->p->dockbook;
+}
+
+GimpTabStyle
+gimp_dockable_get_tab_style (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), -1);
+
+  return dockable->p->tab_style;
+}
+
+/**
+ * gimp_dockable_get_actual_tab_style:
+ * @dockable:
+ *
+ * Get actual tab style, i.e. never "automatic". This state should
+ * actually be hold on a per-dockbook basis, but at this point that
+ * feels like over-engineering...
+ **/
+GimpTabStyle
+gimp_dockable_get_actual_tab_style (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), -1);
+
+  return dockable->p->actual_tab_style;
+}
+
+const gchar *
+gimp_dockable_get_name (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return dockable->p->name;
+}
+
+const gchar *
+gimp_dockable_get_blurb (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return dockable->p->blurb;
+}
+
+const gchar *
+gimp_dockable_get_help_id (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return dockable->p->help_id;
+}
+
+const gchar *
+gimp_dockable_get_icon_name (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return dockable->p->icon_name;
+}
+
+GtkWidget *
+gimp_dockable_get_icon (GimpDockable *dockable,
+                        GtkIconSize   size)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return gtk_image_new_from_icon_name (dockable->p->icon_name, size);
+}
+
+gboolean
+gimp_dockable_get_locked (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), FALSE);
+
+  return dockable->p->locked;
+}
+
+void
+gimp_dockable_set_drag_pos (GimpDockable *dockable,
+                            gint          drag_x,
+                            gint          drag_y)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+
+  dockable->p->drag_x = drag_x;
+  dockable->p->drag_y = drag_y;
+}
+
+void
+gimp_dockable_get_drag_pos (GimpDockable *dockable,
+                            gint         *drag_x,
+                            gint         *drag_y)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+
+  if (drag_x != NULL)
+    *drag_x = dockable->p->drag_x;
+  if (drag_y != NULL)
+    *drag_y = dockable->p->drag_y;
+}
+
+GimpPanedBox *
+gimp_dockable_get_drag_handler (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  return dockable->p->drag_handler;
+}
+
+void
+gimp_dockable_set_locked (GimpDockable *dockable,
+                          gboolean      lock)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+
+  if (dockable->p->locked != lock)
+    {
+      dockable->p->locked = lock ? TRUE : FALSE;
+
+      g_object_notify (G_OBJECT (dockable), "locked");
+    }
+}
+
+gboolean
+gimp_dockable_is_locked (GimpDockable *dockable)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), FALSE);
+
+  return dockable->p->locked;
+}
+
+
+void
+gimp_dockable_set_tab_style (GimpDockable *dockable,
+                             GimpTabStyle  tab_style)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+
+  dockable->p->tab_style = gimp_dockable_convert_tab_style (dockable, tab_style);
+
+  if (tab_style == GIMP_TAB_STYLE_AUTOMATIC)
+    gimp_dockable_set_actual_tab_style (dockable, GIMP_TAB_STYLE_UNDEFINED);
+  else
+    gimp_dockable_set_actual_tab_style (dockable, tab_style);
+
+  if (dockable->p->dockbook)
+    gimp_dockbook_update_auto_tab_style (dockable->p->dockbook);
+}
+
+/**
+ * gimp_dockable_set_actual_tab_style:
+ * @dockable:
+ * @tab_style:
+ *
+ * Sets actual tab style, meant for those that decides what
+ * "automatic" tab style means.
+ *
+ * Returns: %TRUE if changed, %FALSE otherwise.
+ **/
+gboolean
+gimp_dockable_set_actual_tab_style (GimpDockable *dockable,
+                                    GimpTabStyle  tab_style)
+{
+  GimpTabStyle new_tab_style = gimp_dockable_convert_tab_style (dockable, tab_style);
+  GimpTabStyle old_tab_style = dockable->p->actual_tab_style;
+
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), FALSE);
+  g_return_val_if_fail (tab_style != GIMP_TAB_STYLE_AUTOMATIC, FALSE);
+
+  dockable->p->actual_tab_style = new_tab_style;
+
+  return new_tab_style != old_tab_style;
+}
+
+GtkWidget *
+gimp_dockable_create_tab_widget (GimpDockable *dockable,
+                                 GimpContext  *context,
+                                 GimpTabStyle  tab_style,
+                                 GtkIconSize   size)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return gimp_dockable_new_tab_widget_internal (dockable, context,
+                                                tab_style, size, FALSE);
+}
+
+GtkWidget *
+gimp_dockable_create_drag_widget (GimpDockable *dockable)
+{
+  GtkWidget *frame;
+  GtkWidget *widget;
+
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+
+  widget = gimp_dockable_new_tab_widget_internal (dockable,
+                                                  dockable->p->context,
+                                                  GIMP_TAB_STYLE_ICON_BLURB,
+                                                  GTK_ICON_SIZE_DND,
+                                                  TRUE);
+  gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
+  gtk_container_add (GTK_CONTAINER (frame), widget);
+  gtk_widget_show (widget);
+
+  return frame;
+}
+
+void
+gimp_dockable_set_context (GimpDockable *dockable,
+                           GimpContext  *context)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  if (context != dockable->p->context)
+    {
+      GtkWidget *child = gtk_bin_get_child (GTK_BIN (dockable));
+
+      if (child)
+        gimp_docked_set_context (GIMP_DOCKED (child), context);
+
+      dockable->p->context = context;
+    }
+}
+
+GimpUIManager *
+gimp_dockable_get_menu (GimpDockable  *dockable,
+                        const gchar  **ui_path,
+                        gpointer      *popup_data)
+{
+  GtkWidget *child;
+
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+  g_return_val_if_fail (ui_path != NULL, NULL);
+  g_return_val_if_fail (popup_data != NULL, NULL);
+
+  child = gtk_bin_get_child (GTK_BIN (dockable));
+
+  if (child)
+    return gimp_docked_get_menu (GIMP_DOCKED (child), ui_path, popup_data);
+
+  return NULL;
+}
+
+/**
+ * gimp_dockable_set_drag_handler:
+ * @dockable:
+ * @handler:
+ *
+ * Set a drag handler that will be asked if it will handle drag events
+ * before the dockable handles the event itself.
+ **/
+void
+gimp_dockable_set_drag_handler (GimpDockable *dockable,
+                                GimpPanedBox *handler)
+{
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+
+  dockable->p->drag_handler = handler;
+}
+
+void
+gimp_dockable_detach (GimpDockable *dockable)
+{
+  GimpDialogFactory *dialog_factory;
+  GimpMenuFactory   *menu_factory;
+  GimpDockWindow    *src_dock_window;
+  GimpDock          *src_dock;
+  GtkWidget         *dock;
+  GimpDockWindow    *dock_window;
+  GtkWidget         *dockbook;
+
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockable->p->dockbook));
+
+  src_dock        = gimp_dockbook_get_dock (dockable->p->dockbook);
+  src_dock_window = gimp_dock_window_from_dock (src_dock);
+
+  dialog_factory = gimp_dock_get_dialog_factory (src_dock);
+  menu_factory   = gimp_dialog_factory_get_menu_factory (dialog_factory);
+
+  dock = gimp_dock_with_window_new (dialog_factory,
+                                    gtk_widget_get_screen (GTK_WIDGET (dockable)),
+                                    gimp_widget_get_monitor (GTK_WIDGET (dockable)),
+                                    FALSE /*toolbox*/);
+  dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
+  gtk_window_set_position (GTK_WINDOW (dock_window), GTK_WIN_POS_MOUSE);
+  if (src_dock_window)
+    gimp_dock_window_setup (dock_window, src_dock_window);
+
+  dockbook = gimp_dockbook_new (menu_factory);
+
+  gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0);
+
+  g_object_ref (dockable);
+
+  gimp_dockbook_remove (dockable->p->dockbook, dockable);
+  gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, 0);
+
+  g_object_unref (dockable);
+
+  gtk_widget_show (GTK_WIDGET (dock_window));
+  gtk_widget_show (dock);
+}
+
+
+/*  private functions  */
+
+static GList *
+gimp_dockable_get_aux_info (GimpSessionManaged *session_managed)
+{
+  GimpDockable *dockable;
+  GtkWidget    *child;
+
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (session_managed), NULL);
+
+  dockable = GIMP_DOCKABLE (session_managed);
+
+  child = gtk_bin_get_child (GTK_BIN (dockable));
+
+  if (child)
+    return gimp_docked_get_aux_info (GIMP_DOCKED (child));
+
+  return NULL;
+}
+
+static void
+gimp_dockable_set_aux_info (GimpSessionManaged *session_managed,
+                            GList              *aux_info)
+{
+  GimpDockable *dockable;
+  GtkWidget    *child;
+
+  g_return_if_fail (GIMP_IS_DOCKABLE (session_managed));
+
+  dockable = GIMP_DOCKABLE (session_managed);
+
+  child = gtk_bin_get_child (GTK_BIN (dockable));
+
+  if (child)
+    gimp_docked_set_aux_info (GIMP_DOCKED (child), aux_info);
+}
+
+static GimpTabStyle
+gimp_dockable_convert_tab_style (GimpDockable   *dockable,
+                                 GimpTabStyle    tab_style)
+{
+  GtkWidget *child = gtk_bin_get_child (GTK_BIN (dockable));
+
+  if (child && ! GIMP_DOCKED_GET_INTERFACE (child)->get_preview)
+    tab_style = gimp_preview_tab_style_to_icon (tab_style);
+
+  return tab_style;
+}
diff --git a/app/widgets/gimpdockable.h b/app/widgets/gimpdockable.h
new file mode 100644
index 0000000..d0393ab
--- /dev/null
+++ b/app/widgets/gimpdockable.h
@@ -0,0 +1,110 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockable.h
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCKABLE_H__
+#define __GIMP_DOCKABLE_H__
+
+
+#define GIMP_DOCKABLE_DRAG_OFFSET (-6)
+
+
+#define GIMP_TYPE_DOCKABLE            (gimp_dockable_get_type ())
+#define GIMP_DOCKABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCKABLE, GimpDockable))
+#define GIMP_DOCKABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCKABLE, GimpDockableClass))
+#define GIMP_IS_DOCKABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCKABLE))
+#define GIMP_IS_DOCKABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCKABLE))
+#define GIMP_DOCKABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCKABLE, GimpDockableClass))
+
+
+typedef struct _GimpDockablePrivate GimpDockablePrivate;
+typedef struct _GimpDockableClass   GimpDockableClass;
+
+/**
+ * GimpDockable:
+ *
+ * A kind of adapter to make other widgets dockable. The widget to
+ * dock is put inside the GimpDockable, which is put in a
+ * GimpDockbook.
+ */
+struct _GimpDockable
+{
+  GtkBin               parent_instance;
+
+  GimpDockablePrivate *p;
+};
+
+struct _GimpDockableClass
+{
+  GtkBinClass  parent_class;
+};
+
+
+GType           gimp_dockable_get_type             (void) G_GNUC_CONST;
+
+GtkWidget     * gimp_dockable_new                  (const gchar    *name,
+                                                    const gchar    *blurb,
+                                                    const gchar    *icon_name,
+                                                    const gchar    *help_id);
+void            gimp_dockable_set_dockbook         (GimpDockable   *dockable,
+                                                    GimpDockbook   *dockbook);
+GimpDockbook  * gimp_dockable_get_dockbook         (GimpDockable   *dockable);
+GimpTabStyle    gimp_dockable_get_tab_style        (GimpDockable   *dockable);
+const gchar   * gimp_dockable_get_name             (GimpDockable   *dockable);
+const gchar   * gimp_dockable_get_blurb            (GimpDockable   *dockable);
+const gchar   * gimp_dockable_get_help_id          (GimpDockable   *dockable);
+const gchar   * gimp_dockable_get_icon_name        (GimpDockable   *dockable);
+GtkWidget     * gimp_dockable_get_icon             (GimpDockable   *dockable,
+                                                    GtkIconSize     size);
+
+gboolean        gimp_dockable_get_locked           (GimpDockable   *dockable);
+void            gimp_dockable_set_drag_pos         (GimpDockable   *dockable,
+                                                    gint            drag_x,
+                                                    gint            drag_y);
+void            gimp_dockable_get_drag_pos         (GimpDockable   *dockable,
+                                                    gint           *drag_x,
+                                                    gint           *drag_y);
+GimpPanedBox  * gimp_dockable_get_drag_handler     (GimpDockable   *dockable);
+
+void            gimp_dockable_set_locked           (GimpDockable   *dockable,
+                                                    gboolean        lock);
+gboolean        gimp_dockable_is_locked            (GimpDockable   *dockable);
+
+void            gimp_dockable_set_tab_style        (GimpDockable   *dockable,
+                                                    GimpTabStyle    tab_style);
+gboolean        gimp_dockable_set_actual_tab_style (GimpDockable   *dockable,
+                                                    GimpTabStyle    tab_style);
+GimpTabStyle    gimp_dockable_get_actual_tab_style (GimpDockable   *dockable);
+GtkWidget     * gimp_dockable_create_tab_widget    (GimpDockable   *dockable,
+                                                    GimpContext    *context,
+                                                    GimpTabStyle    tab_style,
+                                                    GtkIconSize     size);
+GtkWidget     * gimp_dockable_create_drag_widget   (GimpDockable   *dockable);
+void            gimp_dockable_set_context          (GimpDockable   *dockable,
+                                                    GimpContext    *context);
+GimpUIManager * gimp_dockable_get_menu             (GimpDockable   *dockable,
+                                                    const gchar   **ui_path,
+                                                    gpointer       *popup_data);
+void            gimp_dockable_set_drag_handler     (GimpDockable   *dockable,
+                                                    GimpPanedBox   *drag_handler);
+
+void            gimp_dockable_detach               (GimpDockable   *dockable);
+
+
+#endif /* __GIMP_DOCKABLE_H__ */
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
new file mode 100644
index 0000000..d4d5208
--- /dev/null
+++ b/app/widgets/gimpdockbook.c
@@ -0,0 +1,1846 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockbook.c
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpactiongroup.h"
+#include "gimpdialogfactory.h"
+#include "gimpdnd.h"
+#include "gimpdock.h"
+#include "gimpdockable.h"
+#include "gimpdockbook.h"
+#include "gimpdocked.h"
+#include "gimpdockcontainer.h"
+#include "gimpdockwindow.h"
+#include "gimphelp-ids.h"
+#include "gimpmenufactory.h"
+#include "gimppanedbox.h"
+#include "gimpstringaction.h"
+#include "gimpuimanager.h"
+#include "gimpview.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+#define DEFAULT_TAB_BORDER           0
+#define DEFAULT_TAB_ICON_SIZE        GTK_ICON_SIZE_BUTTON
+#define DND_WIDGET_ICON_SIZE         GTK_ICON_SIZE_BUTTON
+#define MENU_WIDGET_ICON_SIZE        GTK_ICON_SIZE_MENU
+#define MENU_WIDGET_SPACING          4
+#define TAB_HOVER_TIMEOUT            500
+#define GIMP_DOCKABLE_DETACH_REF_KEY "gimp-dockable-detach-ref"
+
+
+enum
+{
+  DOCKABLE_ADDED,
+  DOCKABLE_REMOVED,
+  DOCKABLE_REORDERED,
+  LAST_SIGNAL
+};
+
+/* List of candidates for the automatic style, starting with the
+ * biggest first
+ */
+static const GimpTabStyle gimp_tab_style_candidates[] =
+{
+  GIMP_TAB_STYLE_PREVIEW_BLURB,
+  GIMP_TAB_STYLE_PREVIEW_NAME,
+  GIMP_TAB_STYLE_PREVIEW
+};
+
+
+typedef struct
+{
+  GimpDockbookDragCallback callback;
+  gpointer                 data;
+} GimpDockbookDragCallbackData;
+
+struct _GimpDockbookPrivate
+{
+  GimpDock       *dock;
+  GimpUIManager  *ui_manager;
+
+  guint           tab_hover_timeout;
+  GimpDockable   *tab_hover_dockable;
+
+  GimpPanedBox   *drag_handler;
+
+  /* Cache for "what actual tab style for automatic styles can we use
+   * for a given dockbook width
+   */
+  gint            min_width_for_style[G_N_ELEMENTS (gimp_tab_style_candidates)];
+
+  /* We need a list separate from the GtkContainer children list,
+   * because we need to do calculations for all dockables before we
+   * can add a dockable as a child, namely automatic tab style
+   * calculations
+   */
+  GList          *dockables;
+
+  GtkWidget      *menu_button;
+};
+
+
+static void         gimp_dockbook_dispose                     (GObject        *object);
+static void         gimp_dockbook_finalize                    (GObject        *object);
+static void         gimp_dockbook_size_allocate               (GtkWidget      *widget,
+                                                               GtkAllocation  *allocation);
+static void         gimp_dockbook_style_set                   (GtkWidget      *widget,
+                                                               GtkStyle       *prev_style);
+static void         gimp_dockbook_drag_leave                  (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               guint           time);
+static gboolean     gimp_dockbook_drag_motion                 (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               gint            x,
+                                                               gint            y,
+                                                               guint           time);
+static gboolean     gimp_dockbook_drag_drop                   (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               gint            x,
+                                                               gint            y,
+                                                               guint           time);
+static gboolean     gimp_dockbook_popup_menu                  (GtkWidget      *widget);
+static gboolean     gimp_dockbook_menu_button_press           (GimpDockbook   *dockbook,
+                                                               GdkEventButton *bevent,
+                                                               GtkWidget      *button);
+static gboolean     gimp_dockbook_show_menu                   (GimpDockbook   *dockbook);
+static void         gimp_dockbook_menu_end                    (GimpDockable   *dockable);
+static void         gimp_dockbook_dockable_added              (GimpDockbook   *dockbook,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_dockable_removed            (GimpDockbook   *dockbook,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_recreate_tab_widgets        (GimpDockbook   *dockbook,
+                                                               gboolean        only_auto);
+static void         gimp_dockbook_tab_drag_source_setup       (GtkWidget      *widget,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_tab_drag_begin              (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_tab_drag_end                (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               GimpDockable   *dockable);
+static gboolean     gimp_dockbook_tab_drag_failed             (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               GtkDragResult   result,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_tab_drag_leave              (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               guint           time,
+                                                               GimpDockable   *dockable);
+static gboolean     gimp_dockbook_tab_drag_motion             (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               gint            x,
+                                                               gint            y,
+                                                               guint           time,
+                                                               GimpDockable   *dockable);
+static gboolean     gimp_dockbook_tab_drag_drop               (GtkWidget      *widget,
+                                                               GdkDragContext *context,
+                                                               gint            x,
+                                                               gint            y,
+                                                               guint           time);
+static GimpTabStyle gimp_dockbook_tab_style_to_preferred       (GimpTabStyle    tab_style,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_refresh_tab_layout_lut      (GimpDockbook   *dockbook);
+static void         gimp_dockbook_update_automatic_tab_style  (GimpDockbook   *dockbook);
+static GtkWidget *  gimp_dockable_create_event_box_tab_widget (GimpDockable   *dockable,
+                                                               GimpContext    *context,
+                                                               GimpTabStyle    tab_style,
+                                                               GtkIconSize     size);
+static GtkIconSize  gimp_dockbook_get_tab_icon_size           (GimpDockbook   *dockbook);
+static gint         gimp_dockbook_get_tab_border              (GimpDockbook   *dockbook);
+static void         gimp_dockbook_add_tab_timeout             (GimpDockbook   *dockbook,
+                                                               GimpDockable   *dockable);
+static void         gimp_dockbook_remove_tab_timeout          (GimpDockbook   *dockbook);
+static gboolean     gimp_dockbook_tab_timeout                 (GimpDockbook   *dockbook);
+static void         gimp_dockbook_tab_locked_notify           (GimpDockable   *dockable,
+                                                               GParamSpec     *pspec,
+                                                               GimpDockbook   *dockbook);
+static void         gimp_dockbook_help_func                   (const gchar    *help_id,
+                                                               gpointer        help_data);
+static const gchar *gimp_dockbook_get_tab_style_name          (GimpTabStyle    tab_style);
+
+static void         gimp_dockbook_config_size_changed         (GimpGuiConfig   *config,
+                                                               GimpDockbook    *dockbook);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDockbook, gimp_dockbook, GTK_TYPE_NOTEBOOK)
+
+#define parent_class gimp_dockbook_parent_class
+
+static guint dockbook_signals[LAST_SIGNAL] = { 0 };
+
+static const GtkTargetEntry dialog_target_table[] = { GIMP_TARGET_DIALOG };
+
+static GList *drag_callbacks = NULL;
+
+
+static void
+gimp_dockbook_class_init (GimpDockbookClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  dockbook_signals[DOCKABLE_ADDED] =
+    g_signal_new ("dockable-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockbookClass, dockable_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCKABLE);
+
+  dockbook_signals[DOCKABLE_REMOVED] =
+    g_signal_new ("dockable-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockbookClass, dockable_removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCKABLE);
+
+  dockbook_signals[DOCKABLE_REORDERED] =
+    g_signal_new ("dockable-reordered",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockbookClass, dockable_reordered),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCKABLE);
+
+  object_class->dispose     = gimp_dockbook_dispose;
+  object_class->finalize    = gimp_dockbook_finalize;
+
+  widget_class->size_allocate = gimp_dockbook_size_allocate;
+  widget_class->style_set     = gimp_dockbook_style_set;
+  widget_class->drag_leave    = gimp_dockbook_drag_leave;
+  widget_class->drag_motion   = gimp_dockbook_drag_motion;
+  widget_class->drag_drop     = gimp_dockbook_drag_drop;
+  widget_class->popup_menu    = gimp_dockbook_popup_menu;
+
+  klass->dockable_added     = gimp_dockbook_dockable_added;
+  klass->dockable_removed   = gimp_dockbook_dockable_removed;
+  klass->dockable_reordered = NULL;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("tab-border",
+                                                             NULL, NULL,
+                                                             0, G_MAXINT,
+                                                             DEFAULT_TAB_BORDER,
+                                                             GIMP_PARAM_READABLE));
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_enum ("tab-icon-size",
+                                                              NULL, NULL,
+                                                              GTK_TYPE_ICON_SIZE,
+                                                              DEFAULT_TAB_ICON_SIZE,
+                                                              GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_dockbook_init (GimpDockbook *dockbook)
+{
+  GtkNotebook *notebook = GTK_NOTEBOOK (dockbook);
+  GtkWidget   *image    = NULL;
+
+  dockbook->p = gimp_dockbook_get_instance_private (dockbook);
+
+  /* Various init */
+  gtk_notebook_popup_enable (notebook);
+  gtk_notebook_set_scrollable (notebook, TRUE);
+  gtk_notebook_set_show_border (notebook, FALSE);
+  gtk_notebook_set_show_tabs (notebook, TRUE);
+
+  gtk_drag_dest_set (GTK_WIDGET (dockbook),
+                     0,
+                     dialog_target_table, G_N_ELEMENTS (dialog_target_table),
+                     GDK_ACTION_MOVE);
+
+  /* Menu button */
+  dockbook->p->menu_button = gtk_button_new ();
+  gtk_widget_set_can_focus (dockbook->p->menu_button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (dockbook->p->menu_button),
+                         GTK_RELIEF_NONE);
+  gtk_notebook_set_action_widget (notebook,
+                                  dockbook->p->menu_button,
+                                  GTK_PACK_END);
+  gtk_widget_show (dockbook->p->menu_button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
+                                        GTK_ICON_SIZE_MENU);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
+  gtk_image_set_from_icon_name (GTK_IMAGE (image), GIMP_ICON_MENU_LEFT,
+                                GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (dockbook->p->menu_button), image);
+  gtk_widget_show (image);
+
+  gimp_help_set_help_data (dockbook->p->menu_button, _("Configure this tab"),
+                           GIMP_HELP_DOCK_TAB_MENU);
+
+  g_signal_connect_swapped (dockbook->p->menu_button, "button-press-event",
+                            G_CALLBACK (gimp_dockbook_menu_button_press),
+                            dockbook);
+}
+
+static void
+gimp_dockbook_dispose (GObject *object)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (object);
+
+  g_signal_handlers_disconnect_by_func (dockbook->p->ui_manager->gimp->config,
+                                        gimp_dockbook_config_size_changed,
+                                        dockbook);
+
+  gimp_dockbook_remove_tab_timeout (dockbook);
+
+  while (dockbook->p->dockables)
+    {
+      GimpDockable *dockable = dockbook->p->dockables->data;
+
+      g_object_ref (dockable);
+      gimp_dockbook_remove (dockbook, dockable);
+      gtk_widget_destroy (GTK_WIDGET (dockable));
+      g_object_unref (dockable);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dockbook_finalize (GObject *object)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (object);
+
+  g_clear_object (&dockbook->p->ui_manager);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dockbook_size_allocate (GtkWidget      *widget,
+                             GtkAllocation  *allocation)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  /* Update tab styles, also recreates if changed */
+  gimp_dockbook_update_automatic_tab_style (dockbook);
+}
+
+static void
+gimp_dockbook_style_set (GtkWidget *widget,
+                         GtkStyle  *prev_style)
+{
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  /* Don't attempt to construct widgets that require a GimpContext if
+   * we are detached from a top-level, we're either on our way to
+   * destruction, in which case we don't care, or we will be given a
+   * new parent, in which case the widget style will be reset again
+   * anyway, i.e. this function will be called again
+   */
+  if (! gtk_widget_is_toplevel (gtk_widget_get_toplevel (widget)))
+    return;
+
+  gimp_dockbook_recreate_tab_widgets (GIMP_DOCKBOOK (widget),
+                                      FALSE /*only_auto*/);
+}
+
+static void
+gimp_dockbook_drag_leave (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          guint           time)
+{
+  gimp_highlight_widget (widget, FALSE);
+}
+
+static gboolean
+gimp_dockbook_drag_motion (GtkWidget      *widget,
+                           GdkDragContext *context,
+                           gint            x,
+                           gint            y,
+                           guint           time)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (widget);
+
+  if (gimp_paned_box_will_handle_drag (dockbook->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      gdk_drag_status (context, 0, time);
+      gimp_highlight_widget (widget, FALSE);
+
+      return FALSE;
+    }
+
+  gdk_drag_status (context, GDK_ACTION_MOVE, time);
+  gimp_highlight_widget (widget, TRUE);
+
+  /* Return TRUE so drag_leave() is called */
+  return TRUE;
+}
+
+static gboolean
+gimp_dockbook_drag_drop (GtkWidget      *widget,
+                         GdkDragContext *context,
+                         gint            x,
+                         gint            y,
+                         guint           time)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (widget);
+  gboolean      dropped;
+
+  if (gimp_paned_box_will_handle_drag (dockbook->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      return FALSE;
+    }
+
+  dropped = gimp_dockbook_drop_dockable (dockbook,
+                                         gtk_drag_get_source_widget (context));
+
+  gtk_drag_finish (context, dropped, TRUE, time);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_dockbook_popup_menu (GtkWidget *widget)
+{
+  return gimp_dockbook_show_menu (GIMP_DOCKBOOK (widget));
+}
+
+static gboolean
+gimp_dockbook_menu_button_press (GimpDockbook   *dockbook,
+                                 GdkEventButton *bevent,
+                                 GtkWidget      *button)
+{
+  gboolean handled = FALSE;
+
+  if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS)
+    handled = gimp_dockbook_show_menu (dockbook);
+
+  return handled;
+}
+
+static void
+gimp_dockbook_menu_position (GtkMenu  *menu,
+                             gint     *x,
+                             gint     *y,
+                             gpointer  data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
+
+  gimp_button_menu_position (dockbook->p->menu_button, menu, GTK_POS_LEFT, x, y);
+}
+
+static gboolean
+gimp_dockbook_show_menu (GimpDockbook *dockbook)
+{
+  GimpUIManager *dockbook_ui_manager;
+  GimpUIManager *dialog_ui_manager;
+  const gchar   *dialog_ui_path;
+  gpointer       dialog_popup_data;
+  GtkWidget     *parent_menu_widget;
+  GimpAction    *parent_menu_action;
+  GimpDockable  *dockable;
+  gint           page_num;
+
+  dockbook_ui_manager = gimp_dockbook_get_ui_manager (dockbook);
+
+  if (! dockbook_ui_manager)
+    return FALSE;
+
+  parent_menu_widget =
+    gimp_ui_manager_get_widget (dockbook_ui_manager,
+                                "/dockable-popup/dockable-menu");
+  parent_menu_action =
+    gimp_ui_manager_get_action (dockbook_ui_manager,
+                                "/dockable-popup/dockable-menu");
+
+  if (! parent_menu_widget || ! parent_menu_action)
+    return FALSE;
+
+  page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+  dockable = GIMP_DOCKABLE (gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook),
+                                                       page_num));
+
+  if (! dockable)
+    return FALSE;
+
+  dialog_ui_manager = gimp_dockable_get_menu (dockable,
+                                              &dialog_ui_path,
+                                              &dialog_popup_data);
+
+  if (dialog_ui_manager && dialog_ui_path)
+    {
+      GtkWidget  *child_menu_widget;
+      GimpAction *child_menu_action;
+      gchar      *label;
+
+      child_menu_widget =
+        gimp_ui_manager_get_widget (dialog_ui_manager, dialog_ui_path);
+
+      if (! child_menu_widget)
+        {
+          g_warning ("%s: UI manager '%s' has no widget at path '%s'",
+                     G_STRFUNC, dialog_ui_manager->name, dialog_ui_path);
+          return FALSE;
+        }
+
+      child_menu_action =
+        gimp_ui_manager_get_action (dialog_ui_manager,
+                                    dialog_ui_path);
+
+      if (! child_menu_action)
+        {
+          g_warning ("%s: UI manager '%s' has no action at path '%s'",
+                     G_STRFUNC, dialog_ui_manager->name, dialog_ui_path);
+          return FALSE;
+        }
+
+      g_object_get (child_menu_action,
+                    "label", &label,
+                    NULL);
+
+      g_object_set (parent_menu_action,
+                    "label",     label,
+                    "icon-name", gimp_dockable_get_icon_name (dockable),
+                    "visible",   TRUE,
+                    NULL);
+
+      g_free (label);
+
+      if (! GTK_IS_MENU (child_menu_widget))
+        {
+          g_warning ("%s: child_menu_widget (%p) is not a GtkMenu",
+                     G_STRFUNC, child_menu_widget);
+          return FALSE;
+        }
+
+      {
+        GtkWidget *image = gimp_dockable_get_icon (dockable,
+                                                   GTK_ICON_SIZE_MENU);
+
+        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (parent_menu_widget),
+                                       image);
+        gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (parent_menu_widget),
+                                                   TRUE);
+        gtk_widget_show (image);
+      }
+
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (parent_menu_widget),
+                                 child_menu_widget);
+
+      gimp_ui_manager_update (dialog_ui_manager, dialog_popup_data);
+    }
+  else
+    {
+      g_object_set (parent_menu_action, "visible", FALSE, NULL);
+    }
+
+  /*  an action callback may destroy both dockable and dockbook, so
+   *  reference them for gimp_dockbook_menu_end()
+   */
+  g_object_ref (dockable);
+  g_object_set_data_full (G_OBJECT (dockable), GIMP_DOCKABLE_DETACH_REF_KEY,
+                          g_object_ref (dockbook),
+                          g_object_unref);
+
+  gimp_ui_manager_update (dockbook_ui_manager, dockable);
+  gimp_ui_manager_ui_popup (dockbook_ui_manager, "/dockable-popup",
+                            GTK_WIDGET (dockable),
+                            gimp_dockbook_menu_position, dockbook,
+                            (GDestroyNotify) gimp_dockbook_menu_end, dockable);
+
+  return TRUE;
+}
+
+static void
+gimp_dockbook_menu_end (GimpDockable *dockable)
+{
+  GimpUIManager *dialog_ui_manager;
+  const gchar   *dialog_ui_path;
+  gpointer       dialog_popup_data;
+
+  dialog_ui_manager = gimp_dockable_get_menu (dockable,
+                                              &dialog_ui_path,
+                                              &dialog_popup_data);
+
+  if (dialog_ui_manager && dialog_ui_path)
+    {
+      GtkWidget *child_menu_widget =
+        gimp_ui_manager_get_widget (dialog_ui_manager, dialog_ui_path);
+
+      if (child_menu_widget)
+        gtk_menu_detach (GTK_MENU (child_menu_widget));
+    }
+
+  /*  release gimp_dockbook_show_menu()'s references  */
+  g_object_set_data (G_OBJECT (dockable), GIMP_DOCKABLE_DETACH_REF_KEY, NULL);
+  g_object_unref (dockable);
+}
+
+static void
+gimp_dockbook_dockable_added (GimpDockbook *dockbook,
+                              GimpDockable *dockable)
+{
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (dockbook),
+                                 gtk_notebook_page_num (GTK_NOTEBOOK (dockbook),
+                                                        GTK_WIDGET (dockable)));
+}
+
+static void
+gimp_dockbook_dockable_removed (GimpDockbook *dockbook,
+                                GimpDockable *dockable)
+{
+}
+
+/**
+ * gimp_dockbook_get_dockable_tab_width:
+ * @dockable:
+ * @tab_style:
+ *
+ * Returns: Width of tab when the dockable is using the specified tab
+ *          style.
+ **/
+static gint
+gimp_dockbook_get_dockable_tab_width (GimpDockbook *dockbook,
+                                      GimpDockable *dockable,
+                                      GimpTabStyle  tab_style)
+{
+  GtkRequisition  dockable_request;
+  GtkWidget      *tab_widget;
+
+  tab_widget =
+    gimp_dockable_create_event_box_tab_widget (dockable,
+                                               gimp_dock_get_context (dockbook->p->dock),
+                                               tab_style,
+                                               gimp_dockbook_get_tab_icon_size (dockbook));
+
+  /* So font-scale is applied. We can't apply styles without having a
+   * GdkScreen :(
+   */
+  gimp_dock_temp_add (dockbook->p->dock, tab_widget);
+
+  gtk_widget_size_request (tab_widget, &dockable_request);
+
+  /* Also destroys the widget */
+  gimp_dock_temp_remove (dockbook->p->dock, tab_widget);
+
+  return dockable_request.width;
+}
+
+/**
+ * gimp_dockbook_tab_style_to_preferred:
+ * @tab_style:
+ * @dockable:
+ *
+ * The list of tab styles to try in automatic mode only consists of
+ * preview styles. For some dockables, like the tool options dockable,
+ * we rather want to use the icon tab styles for the automatic
+ * mode. This function is used to convert tab styles for such
+ * dockables.
+ *
+ * Returns: An icon tab style if the dockable prefers icon tab styles
+ *          in automatic mode.
+ **/
+static GimpTabStyle
+gimp_dockbook_tab_style_to_preferred (GimpTabStyle  tab_style,
+                                     GimpDockable *dockable)
+{
+  GimpDocked *docked = GIMP_DOCKED (gtk_bin_get_child (GTK_BIN (dockable)));
+
+  if (gimp_docked_get_prefer_icon (docked))
+    tab_style = gimp_preview_tab_style_to_icon (tab_style);
+
+  return tab_style;
+}
+
+/**
+ * gimp_dockbook_refresh_tab_layout_lut:
+ * @dockbook:
+ *
+ * For each given set of tab widgets, there is a fixed mapping between
+ * the width of the dockbook and the actual tab style to use for auto
+ * tab widgets. This function refreshes that look-up table.
+ **/
+static void
+gimp_dockbook_refresh_tab_layout_lut (GimpDockbook *dockbook)
+{
+  GList *auto_dockables        = NULL;
+  GList *iter                  = NULL;
+  gint   fixed_tab_style_space = 0;
+  int    i                     = 0;
+
+  /* Calculate space taken by dockables with fixed tab styles */
+  fixed_tab_style_space = 0;
+  for (iter = dockbook->p->dockables; iter; iter = g_list_next (iter))
+    {
+      GimpDockable *dockable  = GIMP_DOCKABLE (iter->data);
+      GimpTabStyle  tab_style = gimp_dockable_get_tab_style (dockable);
+
+      if (tab_style == GIMP_TAB_STYLE_AUTOMATIC)
+        auto_dockables = g_list_prepend (auto_dockables, dockable);
+      else
+        fixed_tab_style_space +=
+          gimp_dockbook_get_dockable_tab_width (dockbook,
+                                                dockable,
+                                                tab_style);
+    }
+
+  /* Calculate space taken with auto tab style for all candidates */
+  for (i = 0; i < G_N_ELEMENTS (gimp_tab_style_candidates); i++)
+    {
+      gint         size_with_candidate = 0;
+      GimpTabStyle candidate           = gimp_tab_style_candidates[i];
+
+      for (iter = auto_dockables; iter; iter = g_list_next (iter))
+        {
+          GimpDockable *dockable = GIMP_DOCKABLE (iter->data);
+          GimpTabStyle  style_to_use;
+
+          style_to_use = gimp_dockbook_tab_style_to_preferred (candidate,
+                                                              dockable);
+          size_with_candidate +=
+            gimp_dockbook_get_dockable_tab_width (dockbook,
+                                                  dockable,
+                                                  style_to_use);
+        }
+
+      dockbook->p->min_width_for_style[i] =
+        fixed_tab_style_space + size_with_candidate;
+
+      GIMP_LOG (AUTO_TAB_STYLE, "Total tab space taken for auto tab style %s = %d",
+                gimp_dockbook_get_tab_style_name (candidate),
+                dockbook->p->min_width_for_style[i]);
+    }
+
+  g_list_free (auto_dockables);
+}
+
+/**
+ * gimp_dockbook_update_automatic_tab_style:
+ * @dockbook:
+ *
+ * Based on widget allocation, sets actual tab style for dockables
+ * with automatic tab styles. Takes care of recreating tab widgets if
+ * necessary.
+ **/
+static void
+gimp_dockbook_update_automatic_tab_style (GimpDockbook *dockbook)
+{
+  GtkWidget    *widget              = GTK_WIDGET (dockbook);
+  gboolean      changed             = FALSE;
+  GList        *iter                = NULL;
+  GtkAllocation dockbook_allocation = { 0, };
+  GtkAllocation button_allocation   = { 0, };
+  GimpTabStyle  tab_style           = 0;
+  int           i                   = 0;
+  gint          available_space     = 0;
+  guint         tab_hborder         = 0;
+  gint          xthickness          = 0;
+  gint          tab_curvature       = 0;
+  gint          focus_width         = 0;
+  gint          tab_overlap         = 0;
+  gint          tab_padding         = 0;
+  gint          border_loss         = 0;
+  gint          action_widget_size  = 0;
+
+  xthickness = gtk_widget_get_style (widget)->xthickness;
+  g_object_get (widget,
+                "tab-hborder", &tab_hborder,
+                NULL);
+  gtk_widget_style_get (widget,
+                        "tab-curvature",    &tab_curvature,
+                        "focus-line-width", &focus_width,
+                        "tab-overlap",      &tab_overlap,
+                        NULL);
+  gtk_widget_get_allocation (dockbook->p->menu_button,
+                             &button_allocation);
+
+  /* Calculate available space. Based on code in GTK+ internal
+   * functions gtk_notebook_size_request() and
+   * gtk_notebook_pages_allocate()
+   */
+  gtk_widget_get_allocation (widget, &dockbook_allocation);
+
+  /* Border on both sides */
+  border_loss = gtk_container_get_border_width (GTK_CONTAINER (dockbook)) * 2;
+
+  /* Space taken by action widget */
+  action_widget_size = button_allocation.width + xthickness;
+
+  /* Space taken by the tabs but not the tab widgets themselves */
+  tab_padding = gtk_notebook_get_n_pages (GTK_NOTEBOOK (dockbook)) *
+                (2 * (xthickness + tab_curvature + focus_width + tab_hborder) -
+                 tab_overlap);
+
+  available_space = dockbook_allocation.width
+    - border_loss
+    - action_widget_size
+    - tab_padding
+    - tab_overlap;
+
+  GIMP_LOG (AUTO_TAB_STYLE, "\n"
+            "  available_space             = %d where\n"
+            "    dockbook_allocation.width = %d\n"
+            "    border_loss               = %d\n"
+            "    action_widget_size        = %d\n"
+            "    tab_padding               = %d\n"
+            "    tab_overlap               = %d\n",
+            available_space,
+            dockbook_allocation.width,
+            border_loss,
+            action_widget_size,
+            tab_padding,
+            tab_overlap);
+
+  /* Try all candidates, if we don't get any hit we still end up on
+   * the smallest style (which we always fall back to if we don't get
+   * a better match)
+   */
+  for (i = 0; i < G_N_ELEMENTS (gimp_tab_style_candidates); i++)
+    {
+      tab_style = gimp_tab_style_candidates[i];
+      if (available_space > dockbook->p->min_width_for_style[i])
+        {
+          GIMP_LOG (AUTO_TAB_STYLE, "Choosing tab style %s",
+                    gimp_dockbook_get_tab_style_name (tab_style));
+          break;
+        }
+    }
+
+  for (iter = dockbook->p->dockables; iter; iter = g_list_next (iter))
+    {
+      GimpDockable *dockable         = GIMP_DOCKABLE (iter->data);
+      GimpTabStyle  actual_tab_style = tab_style;
+
+      if (gimp_dockable_get_tab_style (dockable) != GIMP_TAB_STYLE_AUTOMATIC)
+        continue;
+
+      actual_tab_style = gimp_dockbook_tab_style_to_preferred (tab_style,
+                                                              dockable);
+
+      if (gimp_dockable_set_actual_tab_style (dockable, actual_tab_style))
+        changed = TRUE;
+    }
+
+  if (changed)
+    gimp_dockbook_recreate_tab_widgets (dockbook,
+                                        TRUE /*only_auto*/);
+}
+
+GtkWidget *
+gimp_dockbook_new (GimpMenuFactory *menu_factory)
+{
+  GimpDockbook *dockbook;
+
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  dockbook = g_object_new (GIMP_TYPE_DOCKBOOK, NULL);
+
+  dockbook->p->ui_manager = gimp_menu_factory_manager_new (menu_factory,
+                                                           "<Dockable>",
+                                                           dockbook,
+                                                           FALSE);
+
+  g_signal_connect (dockbook->p->ui_manager->gimp->config,
+                    "size-changed",
+                    G_CALLBACK (gimp_dockbook_config_size_changed),
+                    dockbook);
+
+  gimp_help_connect (GTK_WIDGET (dockbook), gimp_dockbook_help_func,
+                     GIMP_HELP_DOCK, dockbook);
+
+  return GTK_WIDGET (dockbook);
+}
+
+GimpDock *
+gimp_dockbook_get_dock (GimpDockbook *dockbook)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), NULL);
+
+  return dockbook->p->dock;
+}
+
+void
+gimp_dockbook_set_dock (GimpDockbook *dockbook,
+                        GimpDock     *dock)
+{
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+  g_return_if_fail (dock == NULL || GIMP_IS_DOCK (dock));
+
+  dockbook->p->dock = dock;
+}
+
+GimpUIManager *
+gimp_dockbook_get_ui_manager (GimpDockbook *dockbook)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), NULL);
+
+  return dockbook->p->ui_manager;
+}
+
+void
+gimp_dockbook_add (GimpDockbook *dockbook,
+                   GimpDockable *dockable,
+                   gint          position)
+{
+  GtkWidget *tab_widget;
+  GtkWidget *menu_widget;
+
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+  g_return_if_fail (dockbook->p->dock != NULL);
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (gimp_dockable_get_dockbook (dockable) == NULL);
+
+  GIMP_LOG (DND, "Adding GimpDockable %p to GimpDockbook %p", dockable, dockbook);
+
+  /* Add to internal list before doing automatic tab style
+   * calculations
+   */
+  dockbook->p->dockables = g_list_insert (dockbook->p->dockables,
+                                          dockable,
+                                          position);
+
+  gimp_dockbook_update_auto_tab_style (dockbook);
+
+  /* Create the new tab widget, it will get the correct tab style now */
+  tab_widget = gimp_dockbook_create_tab_widget (dockbook, dockable);
+
+  g_return_if_fail (GTK_IS_WIDGET (tab_widget));
+
+  gimp_dockable_set_drag_handler (dockable, dockbook->p->drag_handler);
+
+  /* For the notebook right-click menu, always use the icon style */
+  menu_widget =
+    gimp_dockable_create_tab_widget (dockable,
+                                     gimp_dock_get_context (dockbook->p->dock),
+                                     GIMP_TAB_STYLE_ICON_BLURB,
+                                     MENU_WIDGET_ICON_SIZE);
+
+  g_return_if_fail (GTK_IS_WIDGET (menu_widget));
+
+  if (position == -1)
+    {
+      gtk_notebook_append_page_menu (GTK_NOTEBOOK (dockbook),
+                                     GTK_WIDGET (dockable),
+                                     tab_widget,
+                                     menu_widget);
+    }
+  else
+    {
+      gtk_notebook_insert_page_menu (GTK_NOTEBOOK (dockbook),
+                                     GTK_WIDGET (dockable),
+                                     tab_widget,
+                                     menu_widget,
+                                     position);
+    }
+
+  gtk_widget_show (GTK_WIDGET (dockable));
+
+  gimp_dockable_set_dockbook (dockable, dockbook);
+
+  gimp_dockable_set_context (dockable, gimp_dock_get_context (dockbook->p->dock));
+
+  g_signal_connect (dockable, "notify::locked",
+                    G_CALLBACK (gimp_dockbook_tab_locked_notify),
+                    dockbook);
+
+  g_signal_emit (dockbook, dockbook_signals[DOCKABLE_ADDED], 0, dockable);
+}
+
+/**
+ * gimp_dockbook_add_from_dialog_factory:
+ * @dockbook:    The #DockBook
+ * @identifiers: The dockable identifier(s)
+ * @position:    The insert position
+ *
+ * Add a dockable from the dialog factory associated with the dockbook.
+ **/
+GtkWidget *
+gimp_dockbook_add_from_dialog_factory (GimpDockbook *dockbook,
+                                       const gchar  *identifiers,
+                                       gint          position)
+{
+  GtkWidget *dockable;
+  GimpDock  *dock;
+  gchar     *identifier;
+  gchar     *p;
+
+  g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), NULL);
+  g_return_val_if_fail (identifiers != NULL, NULL);
+
+  identifier = g_strdup (identifiers);
+
+  p = strchr (identifier, '|');
+
+  if (p)
+    *p = '\0';
+
+  dock     = gimp_dockbook_get_dock (dockbook);
+  dockable = gimp_dialog_factory_dockable_new (gimp_dock_get_dialog_factory (dock),
+                                               dock,
+                                               identifier, -1);
+
+  g_free (identifier);
+
+  /*  Maybe gimp_dialog_factory_dockable_new() returned an already
+   *  existing singleton dockable, so check if it already is
+   *  attached to a dockbook.
+   */
+  if (dockable && ! gimp_dockable_get_dockbook (GIMP_DOCKABLE (dockable)))
+    gimp_dockbook_add (dockbook, GIMP_DOCKABLE (dockable), position);
+
+  if (dockable)
+    gimp_dockable_set_drag_pos (GIMP_DOCKABLE (dockable),
+                                GIMP_DOCKABLE_DRAG_OFFSET,
+                                GIMP_DOCKABLE_DRAG_OFFSET);
+  return dockable;
+}
+
+void
+gimp_dockbook_remove (GimpDockbook *dockbook,
+                      GimpDockable *dockable)
+{
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+  g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
+  g_return_if_fail (gimp_dockable_get_dockbook (dockable) == dockbook);
+
+  GIMP_LOG (DND, "Removing GimpDockable %p from GimpDockbook %p", dockable, dockbook);
+
+  gimp_dockable_set_drag_handler (dockable, NULL);
+
+  g_object_ref (dockable);
+
+  g_signal_handlers_disconnect_by_func (dockable,
+                                        G_CALLBACK (gimp_dockbook_tab_locked_notify),
+                                        dockbook);
+
+  if (dockbook->p->tab_hover_dockable == dockable)
+    gimp_dockbook_remove_tab_timeout (dockbook);
+
+  gimp_dockable_set_dockbook (dockable, NULL);
+
+  gimp_dockable_set_context (dockable, NULL);
+
+  gtk_container_remove (GTK_CONTAINER (dockbook), GTK_WIDGET (dockable));
+  dockbook->p->dockables = g_list_remove (dockbook->p->dockables,
+                                          dockable);
+
+  g_signal_emit (dockbook, dockbook_signals[DOCKABLE_REMOVED], 0, dockable);
+
+  g_object_unref (dockable);
+
+  if (dockbook->p->dock)
+    {
+      GList *children = gtk_container_get_children (GTK_CONTAINER (dockbook));
+
+      if (children)
+        gimp_dockbook_update_auto_tab_style (dockbook);
+      else
+        gimp_dock_remove_book (dockbook->p->dock, dockbook);
+
+      g_list_free (children);
+    }
+}
+
+/**
+ * gimp_dockbook_update_with_context:
+ * @dockbook:
+ * @context:
+ *
+ * Set @context on all dockables in @dockbook.
+ **/
+void
+gimp_dockbook_update_with_context (GimpDockbook *dockbook,
+                                   GimpContext  *context)
+{
+  GList *children = gtk_container_get_children (GTK_CONTAINER (dockbook));
+  GList *iter     = NULL;
+
+  for (iter = children;
+       iter;
+       iter = g_list_next (iter))
+    {
+      GimpDockable *dockable = GIMP_DOCKABLE (iter->data);
+
+      gimp_dockable_set_context (dockable, context);
+    }
+
+  g_list_free (children);
+}
+
+GtkWidget *
+gimp_dockbook_create_tab_widget (GimpDockbook *dockbook,
+                                 GimpDockable *dockable)
+{
+  GtkWidget      *tab_widget;
+  GimpDockWindow *dock_window;
+  GimpAction     *action = NULL;
+
+  tab_widget =
+    gimp_dockable_create_event_box_tab_widget (dockable,
+                                               gimp_dock_get_context (dockbook->p->dock),
+                                               gimp_dockable_get_actual_tab_style (dockable),
+                                               gimp_dockbook_get_tab_icon_size (dockbook));
+
+  /* EEK */
+  dock_window = gimp_dock_window_from_dock (dockbook->p->dock);
+  if (dock_window &&
+      gimp_dock_container_get_ui_manager (GIMP_DOCK_CONTAINER (dock_window)))
+    {
+      const gchar *dialog_id;
+
+      dialog_id = g_object_get_data (G_OBJECT (dockable),
+                                     "gimp-dialog-identifier");
+
+      if (dialog_id)
+        {
+          GimpDockContainer *dock_container;
+          GimpActionGroup   *group;
+
+          dock_container = GIMP_DOCK_CONTAINER (dock_window);
+
+          group = gimp_ui_manager_get_action_group
+            (gimp_dock_container_get_ui_manager (dock_container), "dialogs");
+
+          if (group)
+            {
+              GList *actions;
+              GList *list;
+
+              actions = gimp_action_group_list_actions (group);
+
+              for (list = actions; list; list = g_list_next (list))
+                {
+                  if (GIMP_IS_STRING_ACTION (list->data) &&
+                      strstr (GIMP_STRING_ACTION (list->data)->value,
+                              dialog_id))
+                    {
+                      action = list->data;
+                      break;
+                    }
+                }
+
+              g_list_free (actions);
+            }
+        }
+    }
+
+  if (action)
+    gimp_widget_set_accel_help (tab_widget, action);
+  else
+    gimp_help_set_help_data (tab_widget,
+                             gimp_dockable_get_blurb (dockable),
+                             gimp_dockable_get_help_id (dockable));
+
+  g_object_set_data (G_OBJECT (tab_widget), "gimp-dockable", dockable);
+
+  gimp_dockbook_tab_drag_source_setup (tab_widget, dockable);
+
+  g_signal_connect_object (tab_widget, "drag-begin",
+                           G_CALLBACK (gimp_dockbook_tab_drag_begin),
+                           dockable, 0);
+  g_signal_connect_object (tab_widget, "drag-end",
+                           G_CALLBACK (gimp_dockbook_tab_drag_end),
+                           dockable, 0);
+  g_signal_connect_object (tab_widget, "drag-failed",
+                           G_CALLBACK (gimp_dockbook_tab_drag_failed),
+                           dockable, 0);
+
+  g_signal_connect_object (dockable, "drag-begin",
+                           G_CALLBACK (gimp_dockbook_tab_drag_begin),
+                           dockable, 0);
+  g_signal_connect_object (dockable, "drag-end",
+                           G_CALLBACK (gimp_dockbook_tab_drag_end),
+                           dockable, 0);
+  g_signal_connect_object (dockable, "drag-failed",
+                           G_CALLBACK (gimp_dockbook_tab_drag_failed),
+                           dockable, 0);
+
+  gtk_drag_dest_set (tab_widget,
+                     0,
+                     dialog_target_table, G_N_ELEMENTS (dialog_target_table),
+                     GDK_ACTION_MOVE);
+  g_signal_connect_object (tab_widget, "drag-leave",
+                           G_CALLBACK (gimp_dockbook_tab_drag_leave),
+                           dockable, 0);
+  g_signal_connect_object (tab_widget, "drag-motion",
+                           G_CALLBACK (gimp_dockbook_tab_drag_motion),
+                           dockable, 0);
+  g_signal_connect_object (tab_widget, "drag-drop",
+                           G_CALLBACK (gimp_dockbook_tab_drag_drop),
+                           dockbook, 0);
+
+  return tab_widget;
+}
+
+/**
+ * gimp_dockbook_update_auto_tab_style:
+ * @dockbook:
+ *
+ * Refresh the table that we use to map dockbook width to actual auto
+ * tab style, then update auto tabs (also recreate tab widgets if
+ * necessary).
+ **/
+void
+gimp_dockbook_update_auto_tab_style (GimpDockbook *dockbook)
+{
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+
+  gimp_dockbook_refresh_tab_layout_lut (dockbook);
+  gimp_dockbook_update_automatic_tab_style (dockbook);
+}
+
+gboolean
+gimp_dockbook_drop_dockable (GimpDockbook *dockbook,
+                             GtkWidget    *drag_source)
+{
+  g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), FALSE);
+
+  if (drag_source)
+    {
+      GimpDockable *dockable =
+        gimp_dockbook_drag_source_to_dockable (drag_source);
+
+      if (dockable)
+        {
+          if (gimp_dockable_get_dockbook (dockable) == dockbook)
+            {
+              gtk_notebook_reorder_child (GTK_NOTEBOOK (dockbook),
+                                          GTK_WIDGET (dockable), -1);
+            }
+          else
+            {
+              g_object_ref (dockable);
+
+              gimp_dockbook_remove (gimp_dockable_get_dockbook (dockable), dockable);
+              gimp_dockbook_add (dockbook, dockable, -1);
+
+              g_object_unref (dockable);
+            }
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_dockable_set_drag_handler:
+ * @dockable:
+ * @handler:
+ *
+ * Set a drag handler that will be asked if it will handle drag events
+ * before the dockbook handles the event itself.
+ **/
+void
+gimp_dockbook_set_drag_handler (GimpDockbook *dockbook,
+                                GimpPanedBox *drag_handler)
+{
+  g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
+
+  dockbook->p->drag_handler = drag_handler;
+}
+
+/**
+ * gimp_dockbook_drag_source_to_dockable:
+ * @drag_source: A drag-and-drop source widget
+ *
+ * Gets the dockable associated with a drag-and-drop source. If
+ * successful, the function will also cleanup the dockable.
+ *
+ * Returns: The dockable
+ **/
+GimpDockable *
+gimp_dockbook_drag_source_to_dockable (GtkWidget *drag_source)
+{
+  GimpDockable *dockable = NULL;
+
+  if (GIMP_IS_DOCKABLE (drag_source))
+    dockable = GIMP_DOCKABLE (drag_source);
+  else
+    dockable = g_object_get_data (G_OBJECT (drag_source),
+                                  "gimp-dockable");
+  if (dockable)
+    g_object_set_data (G_OBJECT (dockable),
+                       "gimp-dock-drag-widget", NULL);
+
+  return dockable;
+}
+
+void
+gimp_dockbook_add_drag_callback (GimpDockbookDragCallback callback,
+                                 gpointer                 data)
+{
+  GimpDockbookDragCallbackData *callback_data;
+
+  callback_data = g_slice_new (GimpDockbookDragCallbackData);
+
+  callback_data->callback = callback;
+  callback_data->data     = data;
+
+  drag_callbacks = g_list_prepend (drag_callbacks, callback_data);
+}
+
+void
+gimp_dockbook_remove_drag_callback (GimpDockbookDragCallback callback,
+                                    gpointer                 data)
+{
+  GList *iter;
+
+  iter = drag_callbacks;
+
+  while (iter)
+    {
+      GimpDockbookDragCallbackData *callback_data = iter->data;
+      GList                        *next          = g_list_next (iter);
+
+      if (callback_data->callback == callback &&
+          callback_data->data     == data)
+        {
+          g_slice_free (GimpDockbookDragCallbackData, callback_data);
+
+          drag_callbacks = g_list_delete_link (drag_callbacks, iter);
+        }
+
+      iter = next;
+    }
+}
+
+/*  tab DND source side  */
+
+static void
+gimp_dockbook_recreate_tab_widgets (GimpDockbook *dockbook,
+                                    gboolean      only_auto)
+{
+  GList *dockables = gtk_container_get_children (GTK_CONTAINER (dockbook));
+  GList *iter      = NULL;
+
+  g_object_set (dockbook,
+                "tab-border", gimp_dockbook_get_tab_border (dockbook),
+                NULL);
+
+  for (iter = dockables; iter; iter = g_list_next (iter))
+    {
+      GimpDockable *dockable = GIMP_DOCKABLE (iter->data);
+      GtkWidget *tab_widget;
+
+      if (only_auto &&
+          ! (gimp_dockable_get_tab_style (dockable) == GIMP_TAB_STYLE_AUTOMATIC))
+        continue;
+
+      tab_widget = gimp_dockbook_create_tab_widget (dockbook, dockable);
+
+      gtk_notebook_set_tab_label (GTK_NOTEBOOK (dockbook),
+                                  GTK_WIDGET (dockable),
+                                  tab_widget);
+    }
+
+  g_list_free (dockables);
+}
+
+static void
+gimp_dockbook_tab_drag_source_setup (GtkWidget    *widget,
+                                     GimpDockable *dockable)
+{
+  if (gimp_dockable_is_locked (dockable))
+    {
+      if (widget)
+        gtk_drag_source_unset (widget);
+
+      gtk_drag_source_unset (GTK_WIDGET (dockable));
+    }
+  else
+    {
+      if (widget)
+        gtk_drag_source_set (widget,
+                             GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                             dialog_target_table,
+                             G_N_ELEMENTS (dialog_target_table),
+                             GDK_ACTION_MOVE);
+
+      gtk_drag_source_set (GTK_WIDGET (dockable),
+                           GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                           dialog_target_table,
+                           G_N_ELEMENTS (dialog_target_table),
+                           GDK_ACTION_MOVE);
+    }
+}
+
+static void
+gimp_dockbook_tab_drag_begin (GtkWidget      *widget,
+                              GdkDragContext *context,
+                              GimpDockable   *dockable)
+{
+  GtkAllocation   allocation;
+  GtkWidget      *window;
+  GtkWidget      *view;
+  GList          *iter;
+  GtkRequisition  requisition;
+  gint            drag_x;
+  gint            drag_y;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  window = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
+  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (widget));
+
+  view = gimp_dockable_create_drag_widget (dockable);
+  gtk_container_add (GTK_CONTAINER (window), view);
+  gtk_widget_show (view);
+
+  gtk_widget_size_request (view, &requisition);
+
+  if (requisition.width < allocation.width)
+    gtk_widget_set_size_request (view, allocation.width, -1);
+
+  gtk_widget_show (window);
+
+  g_object_set_data_full (G_OBJECT (dockable), "gimp-dock-drag-widget",
+                          window,
+                          (GDestroyNotify) gtk_widget_destroy);
+
+  gimp_dockable_get_drag_pos (dockable, &drag_x, &drag_y);
+  gtk_drag_set_icon_widget (context, window, drag_x, drag_y);
+
+  iter = drag_callbacks;
+
+  while (iter)
+    {
+      GimpDockbookDragCallbackData *callback_data = iter->data;
+
+      iter = g_list_next (iter);
+
+      callback_data->callback (context, TRUE, callback_data->data);
+    }
+}
+
+static void
+gimp_dockbook_tab_drag_end (GtkWidget      *widget,
+                            GdkDragContext *context,
+                            GimpDockable   *dockable)
+{
+  GList *iter;
+
+  iter = drag_callbacks;
+
+  while (iter)
+    {
+      GimpDockbookDragCallbackData *callback_data = iter->data;
+
+      iter = g_list_next (iter);
+
+      callback_data->callback (context, FALSE, callback_data->data);
+    }
+}
+
+static gboolean
+gimp_dockbook_tab_drag_failed (GtkWidget      *widget,
+                               GdkDragContext *context,
+                               GtkDragResult   result,
+                               GimpDockable   *dockable)
+{
+  /* XXX The proper way is to handle "drag-end" signal instead.
+   * Unfortunately this signal seems to be broken in various cases on
+   * macOS/GTK+2 (see #1924). As a consequence, we made sure we don't
+   * have anything to clean unconditionally (for instance we used to set
+   * the dockable unsensitive, which anyway was only a visual clue and
+   * is not really useful). Only thing left to handle is the dockable
+   * detachment when dropping in a non-droppable area.
+   */
+  GtkWidget *drag_widget;
+  GtkWidget *window;
+
+  if (result == GTK_DRAG_RESULT_SUCCESS)
+    {
+      /* I don't think this should happen, considering we are in the
+       * "drag-failed" handler, but let's be complete as it is a
+       * possible GtkDragResult value. Just in case!
+       */
+      return FALSE;
+    }
+
+  drag_widget = g_object_get_data (G_OBJECT (dockable),
+                                   "gimp-dock-drag-widget");
+
+  /* The drag_widget should be present if the drop was not successful,
+   * in which case, we pop up a new dock and move the dockable there.
+   */
+  g_return_val_if_fail (drag_widget, FALSE);
+
+  g_object_set_data (G_OBJECT (dockable), "gimp-dock-drag-widget", NULL);
+  gimp_dockable_detach (dockable);
+
+  window = gtk_widget_get_toplevel (GTK_WIDGET (dockable));
+  gtk_window_present (GTK_WINDOW (window));
+
+  return TRUE;
+}
+
+
+/*  tab DND target side  */
+
+static void
+gimp_dockbook_tab_drag_leave (GtkWidget      *widget,
+                              GdkDragContext *context,
+                              guint           time,
+                              GimpDockable   *dockable)
+{
+  GimpDockbook *dockbook = gimp_dockable_get_dockbook (dockable);
+
+  gimp_dockbook_remove_tab_timeout (dockbook);
+
+  gimp_highlight_widget (widget, FALSE);
+}
+
+static gboolean
+gimp_dockbook_tab_drag_motion (GtkWidget      *widget,
+                               GdkDragContext *context,
+                               gint            x,
+                               gint            y,
+                               guint           time,
+                               GimpDockable   *dockable)
+{
+  GimpDockbook  *dockbook = gimp_dockable_get_dockbook (dockable);
+  GtkTargetList *target_list;
+  GdkAtom        target_atom;
+  gboolean       handle;
+
+  if (gimp_paned_box_will_handle_drag (dockbook->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      gdk_drag_status (context, 0, time);
+      gimp_highlight_widget (widget, FALSE);
+
+      return FALSE;
+    }
+
+  if (! dockbook->p->tab_hover_timeout ||
+      dockbook->p->tab_hover_dockable != dockable)
+    {
+      gint page_num;
+
+      gimp_dockbook_remove_tab_timeout (dockbook);
+
+      page_num = gtk_notebook_page_num (GTK_NOTEBOOK (dockbook),
+                                        GTK_WIDGET (dockable));
+
+      if (page_num != gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)))
+        gimp_dockbook_add_tab_timeout (dockbook, dockable);
+    }
+
+  target_list = gtk_drag_dest_get_target_list (widget);
+  target_atom = gtk_drag_dest_find_target (widget, context, target_list);
+
+  handle = gtk_target_list_find (target_list, target_atom, NULL);
+
+  gdk_drag_status (context, handle ? GDK_ACTION_MOVE : 0, time);
+  gimp_highlight_widget (widget, handle);
+
+  /* Return TRUE so drag_leave() is called */
+  return TRUE;
+}
+
+static gboolean
+gimp_dockbook_tab_drag_drop (GtkWidget      *widget,
+                             GdkDragContext *context,
+                             gint            x,
+                             gint            y,
+                             guint           time)
+{
+  GimpDockable *dest_dockable;
+  GtkWidget    *source;
+  gboolean      dropped = FALSE;
+
+  dest_dockable = g_object_get_data (G_OBJECT (widget), "gimp-dockable");
+
+  source = gtk_drag_get_source_widget (context);
+
+  if (gimp_paned_box_will_handle_drag (gimp_dockable_get_drag_handler (dest_dockable),
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      return FALSE;
+    }
+
+  if (dest_dockable && source)
+    {
+      GimpDockable *src_dockable =
+        gimp_dockbook_drag_source_to_dockable (source);
+
+      if (src_dockable)
+        {
+          gint dest_index;
+
+          dest_index =
+            gtk_notebook_page_num (GTK_NOTEBOOK (gimp_dockable_get_dockbook (dest_dockable)),
+                                   GTK_WIDGET (dest_dockable));
+
+          if (gimp_dockable_get_dockbook (src_dockable) !=
+              gimp_dockable_get_dockbook (dest_dockable))
+            {
+              g_object_ref (src_dockable);
+
+              gimp_dockbook_remove (gimp_dockable_get_dockbook (src_dockable), src_dockable);
+              gimp_dockbook_add (gimp_dockable_get_dockbook (dest_dockable), src_dockable,
+                                 dest_index);
+
+              g_object_unref (src_dockable);
+
+              dropped = TRUE;
+            }
+          else if (src_dockable != dest_dockable)
+            {
+              gtk_notebook_reorder_child (GTK_NOTEBOOK (gimp_dockable_get_dockbook (src_dockable)),
+                                          GTK_WIDGET (src_dockable),
+                                          dest_index);
+
+              g_signal_emit (gimp_dockable_get_dockbook (src_dockable),
+                             dockbook_signals[DOCKABLE_REORDERED], 0,
+                             src_dockable);
+
+              dropped = TRUE;
+            }
+        }
+    }
+
+  gtk_drag_finish (context, dropped, TRUE, time);
+
+  return TRUE;
+}
+
+static GtkWidget *
+gimp_dockable_create_event_box_tab_widget (GimpDockable *dockable,
+                                           GimpContext  *context,
+                                           GimpTabStyle  tab_style,
+                                           GtkIconSize   size)
+{
+  GtkWidget *tab_widget;
+
+  tab_widget =
+    gimp_dockable_create_tab_widget (dockable,
+                                     context,
+                                     tab_style,
+                                     size);
+
+  if (! GIMP_IS_VIEW (tab_widget))
+    {
+      GtkWidget *event_box;
+
+      event_box = gtk_event_box_new ();
+      gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
+      gtk_event_box_set_above_child (GTK_EVENT_BOX (event_box), TRUE);
+      gtk_container_add (GTK_CONTAINER (event_box), tab_widget);
+      gtk_widget_show (tab_widget);
+
+      tab_widget = event_box;
+    }
+
+  return tab_widget;
+}
+
+static GtkIconSize
+gimp_dockbook_get_tab_icon_size (GimpDockbook *dockbook)
+{
+  Gimp        *gimp     = dockbook->p->ui_manager->gimp;
+  GtkIconSize  tab_size = DEFAULT_TAB_ICON_SIZE;
+  GimpIconSize size;
+
+  size = gimp_gui_config_detect_icon_size (GIMP_GUI_CONFIG (gimp->config));
+  /* Match GimpIconSize with GtkIconSize. */
+  switch (size)
+    {
+    case GIMP_ICON_SIZE_SMALL:
+    case GIMP_ICON_SIZE_MEDIUM:
+      tab_size = GTK_ICON_SIZE_MENU;
+      break;
+    case GIMP_ICON_SIZE_LARGE:
+      tab_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
+      break;
+    case GIMP_ICON_SIZE_HUGE:
+      tab_size = GTK_ICON_SIZE_DND;
+      break;
+    default:
+      /* GIMP_ICON_SIZE_DEFAULT:
+       * let's use the size set by the theme. */
+      gtk_widget_style_get (GTK_WIDGET (dockbook),
+                            "tab-icon-size", &tab_size,
+                            NULL);
+      break;
+    }
+
+  return tab_size;
+}
+
+static gint
+gimp_dockbook_get_tab_border (GimpDockbook *dockbook)
+{
+  Gimp         *gimp       = dockbook->p->ui_manager->gimp;
+  gint          tab_border = DEFAULT_TAB_BORDER;
+  GimpIconSize  size;
+
+  gtk_widget_style_get (GTK_WIDGET (dockbook),
+                        "tab-border", &tab_border,
+                        NULL);
+
+  size = gimp_gui_config_detect_icon_size (GIMP_GUI_CONFIG (gimp->config));
+  /* Match GimpIconSize with GtkIconSize. */
+  switch (size)
+    {
+    case GIMP_ICON_SIZE_SMALL:
+      tab_border /= 2;
+      break;
+    case GIMP_ICON_SIZE_LARGE:
+      tab_border *= 2;
+      break;
+    case GIMP_ICON_SIZE_HUGE:
+      tab_border *= 3;
+      break;
+    default:
+      /* GIMP_ICON_SIZE_MEDIUM and GIMP_ICON_SIZE_DEFAULT:
+       * let's use the size set by the theme. */
+      break;
+    }
+
+  return tab_border;
+}
+
+static void
+gimp_dockbook_add_tab_timeout (GimpDockbook *dockbook,
+                               GimpDockable *dockable)
+{
+  dockbook->p->tab_hover_timeout =
+    g_timeout_add (TAB_HOVER_TIMEOUT,
+                   (GSourceFunc) gimp_dockbook_tab_timeout,
+                   dockbook);
+
+  dockbook->p->tab_hover_dockable = dockable;
+}
+
+static void
+gimp_dockbook_remove_tab_timeout (GimpDockbook *dockbook)
+{
+  if (dockbook->p->tab_hover_timeout)
+    {
+      g_source_remove (dockbook->p->tab_hover_timeout);
+      dockbook->p->tab_hover_timeout  = 0;
+      dockbook->p->tab_hover_dockable = NULL;
+    }
+}
+
+static gboolean
+gimp_dockbook_tab_timeout (GimpDockbook *dockbook)
+{
+  gint page_num;
+
+  GDK_THREADS_ENTER ();
+
+  page_num = gtk_notebook_page_num (GTK_NOTEBOOK (dockbook),
+                                    GTK_WIDGET (dockbook->p->tab_hover_dockable));
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (dockbook), page_num);
+
+  dockbook->p->tab_hover_timeout  = 0;
+  dockbook->p->tab_hover_dockable = NULL;
+
+  GDK_THREADS_LEAVE ();
+
+  return FALSE;
+}
+
+static void
+gimp_dockbook_tab_locked_notify (GimpDockable *dockable,
+                                 GParamSpec   *pspec,
+                                 GimpDockbook *dockbook)
+{
+  GtkWidget *tab_widget;
+
+  tab_widget = gtk_notebook_get_tab_label (GTK_NOTEBOOK (dockbook),
+                                           GTK_WIDGET (dockable));
+
+  gimp_dockbook_tab_drag_source_setup (tab_widget, dockable);
+}
+
+static void
+gimp_dockbook_help_func (const gchar *help_id,
+                         gpointer     help_data)
+{
+  GimpDockbook *dockbook = GIMP_DOCKBOOK (help_data);
+  GtkWidget    *dockable;
+  gint          page_num;
+
+  page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+
+  dockable = gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
+
+  if (GIMP_IS_DOCKABLE (dockable))
+    gimp_standard_help_func (gimp_dockable_get_help_id (GIMP_DOCKABLE (dockable)),
+                             NULL);
+  else
+    gimp_standard_help_func (GIMP_HELP_DOCK, NULL);
+}
+
+static const gchar *
+gimp_dockbook_get_tab_style_name (GimpTabStyle tab_style)
+{
+  return g_enum_get_value (g_type_class_peek (GIMP_TYPE_TAB_STYLE),
+                           tab_style)->value_name;
+}
+
+static void
+gimp_dockbook_config_size_changed (GimpGuiConfig *config,
+                                   GimpDockbook  *dockbook)
+{
+  gimp_dockbook_recreate_tab_widgets (dockbook, TRUE);
+}
diff --git a/app/widgets/gimpdockbook.h b/app/widgets/gimpdockbook.h
new file mode 100644
index 0000000..ab8693e
--- /dev/null
+++ b/app/widgets/gimpdockbook.h
@@ -0,0 +1,98 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockbook.h
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCKBOOK_H__
+#define __GIMP_DOCKBOOK_H__
+
+
+#define GIMP_TYPE_DOCKBOOK            (gimp_dockbook_get_type ())
+#define GIMP_DOCKBOOK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCKBOOK, GimpDockbook))
+#define GIMP_DOCKBOOK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCKBOOK, GimpDockbookClass))
+#define GIMP_IS_DOCKBOOK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCKBOOK))
+#define GIMP_IS_DOCKBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCKBOOK))
+#define GIMP_DOCKBOOK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCKBOOK, GimpDockbookClass))
+
+
+typedef void (* GimpDockbookDragCallback) (GdkDragContext *context,
+                                           gboolean        begin,
+                                           gpointer        data);
+
+
+typedef struct _GimpDockbookClass    GimpDockbookClass;
+typedef struct _GimpDockbookPrivate  GimpDockbookPrivate;
+
+/**
+ * GimpDockbook:
+ *
+ * Holds GimpDockables which are presented on different tabs using
+ * GtkNotebook.
+ */
+struct _GimpDockbook
+{
+  GtkNotebook parent_instance;
+
+  GimpDockbookPrivate *p;
+};
+
+struct _GimpDockbookClass
+{
+  GtkNotebookClass parent_class;
+
+  void (* dockable_added)     (GimpDockbook *dockbook,
+                               GimpDockable *dockable);
+  void (* dockable_removed)   (GimpDockbook *dockbook,
+                               GimpDockable *dockable);
+  void (* dockable_reordered) (GimpDockbook *dockbook,
+                               GimpDockable *dockable);
+};
+
+
+GType           gimp_dockbook_get_type                (void) G_GNUC_CONST;
+GtkWidget     * gimp_dockbook_new                     (GimpMenuFactory          *menu_factory);
+GimpDock      * gimp_dockbook_get_dock                (GimpDockbook             *dockbook);
+void            gimp_dockbook_set_dock                (GimpDockbook             *dockbook,
+                                                       GimpDock                 *dock);
+GimpUIManager * gimp_dockbook_get_ui_manager          (GimpDockbook             *dockbook);
+void            gimp_dockbook_add                     (GimpDockbook             *dockbook,
+                                                       GimpDockable             *dockable,
+                                                       gint                      position);
+GtkWidget     * gimp_dockbook_add_from_dialog_factory (GimpDockbook             *dockbook,
+                                                       const gchar              *identifiers,
+                                                       gint                      position);
+void            gimp_dockbook_remove                  (GimpDockbook             *dockbook,
+                                                       GimpDockable             *dockable);
+void            gimp_dockbook_update_with_context     (GimpDockbook             *dockbook,
+                                                       GimpContext              *context);
+GtkWidget    *  gimp_dockbook_create_tab_widget       (GimpDockbook             *dockbook,
+                                                       GimpDockable             *dockable);
+void            gimp_dockbook_update_auto_tab_style   (GimpDockbook             *dockbook);
+gboolean        gimp_dockbook_drop_dockable           (GimpDockbook             *dockbook,
+                                                       GtkWidget                *drag_source);
+void            gimp_dockbook_set_drag_handler        (GimpDockbook             *dockbook,
+                                                       GimpPanedBox             *drag_handler);
+GimpDockable *  gimp_dockbook_drag_source_to_dockable (GtkWidget                *drag_source);
+
+void            gimp_dockbook_add_drag_callback       (GimpDockbookDragCallback  callback,
+                                                       gpointer                  data);
+void            gimp_dockbook_remove_drag_callback    (GimpDockbookDragCallback  callback,
+                                                       gpointer                  data);
+
+
+#endif /* __GIMP_DOCKBOOK_H__ */
diff --git a/app/widgets/gimpdockcolumns.c b/app/widgets/gimpdockcolumns.c
new file mode 100644
index 0000000..c113c4b
--- /dev/null
+++ b/app/widgets/gimpdockcolumns.c
@@ -0,0 +1,490 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockcolumns.c
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockable.h"
+#include "gimpdockbook.h"
+#include "gimpdockcolumns.h"
+#include "gimpmenudock.h"
+#include "gimppanedbox.h"
+#include "gimptoolbox.h"
+#include "gimpuimanager.h"
+
+#include "gimp-log.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_DIALOG_FACTORY,
+  PROP_UI_MANAGER
+};
+
+enum
+{
+  DOCK_ADDED,
+  DOCK_REMOVED,
+  LAST_SIGNAL
+};
+
+
+struct _GimpDockColumnsPrivate
+{
+  GimpContext       *context;
+  GimpDialogFactory *dialog_factory;
+  GimpUIManager     *ui_manager;
+
+  GList             *docks;
+
+  GtkWidget         *paned_hbox;
+};
+
+
+static void      gimp_dock_columns_dispose           (GObject         *object);
+static void      gimp_dock_columns_set_property      (GObject         *object,
+                                                      guint            property_id,
+                                                      const GValue    *value,
+                                                      GParamSpec      *pspec);
+static void      gimp_dock_columns_get_property      (GObject         *object,
+                                                      guint            property_id,
+                                                      GValue          *value,
+                                                      GParamSpec      *pspec);
+static gboolean  gimp_dock_columns_dropped_cb        (GtkWidget       *source,
+                                                      gint             insert_index,
+                                                      gpointer         data);
+static void      gimp_dock_columns_real_dock_added   (GimpDockColumns *dock_columns,
+                                                      GimpDock        *dock);
+static void      gimp_dock_columns_real_dock_removed (GimpDockColumns *dock_columns,
+                                                      GimpDock        *dock);
+static void      gimp_dock_columns_dock_book_removed (GimpDockColumns *dock_columns,
+                                                      GimpDockbook    *dockbook,
+                                                      GimpDock        *dock);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDockColumns, gimp_dock_columns, GTK_TYPE_BOX)
+
+#define parent_class gimp_dock_columns_parent_class
+
+static guint dock_columns_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_dock_columns_class_init (GimpDockColumnsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_dock_columns_dispose;
+  object_class->set_property = gimp_dock_columns_set_property;
+  object_class->get_property = gimp_dock_columns_get_property;
+
+  klass->dock_added   = gimp_dock_columns_real_dock_added;
+  klass->dock_removed = gimp_dock_columns_real_dock_removed;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DIALOG_FACTORY,
+                                   g_param_spec_object ("dialog-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DIALOG_FACTORY,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_UI_MANAGER,
+                                   g_param_spec_object ("ui-manager",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_UI_MANAGER,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  dock_columns_signals[DOCK_ADDED] =
+    g_signal_new ("dock-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockColumnsClass, dock_added),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCK);
+
+  dock_columns_signals[DOCK_REMOVED] =
+    g_signal_new ("dock-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockColumnsClass, dock_removed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_DOCK);
+}
+
+static void
+gimp_dock_columns_init (GimpDockColumns *dock_columns)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (dock_columns),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
+  dock_columns->p = gimp_dock_columns_get_instance_private (dock_columns);
+
+  dock_columns->p->paned_hbox = gimp_paned_box_new (FALSE, 0,
+                                                    GTK_ORIENTATION_HORIZONTAL);
+  gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock_columns->p->paned_hbox),
+                                 gimp_dock_columns_dropped_cb,
+                                 dock_columns);
+  gtk_box_pack_start (GTK_BOX (dock_columns), dock_columns->p->paned_hbox,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (dock_columns->p->paned_hbox);
+}
+
+static void
+gimp_dock_columns_dispose (GObject *object)
+{
+  GimpDockColumns *dock_columns = GIMP_DOCK_COLUMNS (object);
+
+  while (dock_columns->p->docks)
+    {
+      GimpDock *dock = dock_columns->p->docks->data;
+
+      g_object_ref (dock);
+      gimp_dock_columns_remove_dock (dock_columns, dock);
+      gtk_widget_destroy (GTK_WIDGET (dock));
+      g_object_unref (dock);
+    }
+
+  if (dock_columns->p->context)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (dock_columns->p->context),
+                                    (gpointer) &dock_columns->p->context);
+      dock_columns->p->context = NULL;
+    }
+
+  if (dock_columns->p->dialog_factory)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (dock_columns->p->dialog_factory),
+                                    (gpointer) &dock_columns->p->dialog_factory);
+      dock_columns->p->dialog_factory = NULL;
+    }
+
+  if (dock_columns->p->ui_manager)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (dock_columns->p->ui_manager),
+                                    (gpointer)&dock_columns->p->ui_manager);
+      dock_columns->p->ui_manager = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dock_columns_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpDockColumns *dock_columns = GIMP_DOCK_COLUMNS (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      if (dock_columns->p->context)
+        g_object_remove_weak_pointer (G_OBJECT (dock_columns->p->context),
+                                      (gpointer) &dock_columns->p->context);
+      dock_columns->p->context = g_value_get_object (value);
+      if (dock_columns->p->context)
+        g_object_add_weak_pointer (G_OBJECT (dock_columns->p->context),
+                                   (gpointer) &dock_columns->p->context);
+      break;
+
+    case PROP_DIALOG_FACTORY:
+      if (dock_columns->p->dialog_factory)
+        g_object_remove_weak_pointer (G_OBJECT (dock_columns->p->dialog_factory),
+                                      (gpointer) &dock_columns->p->dialog_factory);
+      dock_columns->p->dialog_factory = g_value_get_object (value);
+      if (dock_columns->p->dialog_factory)
+        g_object_add_weak_pointer (G_OBJECT (dock_columns->p->dialog_factory),
+                                   (gpointer) &dock_columns->p->dialog_factory);
+      break;
+
+    case PROP_UI_MANAGER:
+      if (dock_columns->p->ui_manager)
+        g_object_remove_weak_pointer (G_OBJECT (dock_columns->p->ui_manager),
+                                      (gpointer) &dock_columns->p->ui_manager);
+      dock_columns->p->ui_manager = g_value_get_object (value);
+      if (dock_columns->p->ui_manager)
+        g_object_add_weak_pointer (G_OBJECT (dock_columns->p->ui_manager),
+                                   (gpointer) &dock_columns->p->ui_manager);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dock_columns_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpDockColumns *dock_columns = GIMP_DOCK_COLUMNS (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, dock_columns->p->context);
+      break;
+    case PROP_DIALOG_FACTORY:
+      g_value_set_object (value, dock_columns->p->dialog_factory);
+      break;
+    case PROP_UI_MANAGER:
+      g_value_set_object (value, dock_columns->p->ui_manager);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_dock_columns_dropped_cb (GtkWidget *source,
+                              gint       insert_index,
+                              gpointer   data)
+{
+  GimpDockColumns *dock_columns = GIMP_DOCK_COLUMNS (data);
+  GimpDockable    *dockable     = gimp_dockbook_drag_source_to_dockable (source);
+  GtkWidget       *dockbook     = NULL;
+
+  if (! dockable)
+    return FALSE;
+
+  /* Create a new dock (including a new dockbook) */
+  gimp_dock_columns_prepare_dockbook (dock_columns,
+                                      insert_index,
+                                      &dockbook);
+
+  /* Move the dockable to the new dockbook */
+  g_object_ref (dockbook);
+  g_object_ref (dockable);
+  gimp_dockbook_remove (gimp_dockable_get_dockbook (dockable), dockable);
+  gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, -1);
+  g_object_unref (dockable);
+  g_object_unref (dockbook);
+
+  return TRUE;
+}
+
+static void
+gimp_dock_columns_real_dock_added (GimpDockColumns *dock_columns,
+                                   GimpDock        *dock)
+{
+}
+
+static void
+gimp_dock_columns_real_dock_removed (GimpDockColumns *dock_columns,
+                                     GimpDock        *dock)
+{
+}
+
+static void
+gimp_dock_columns_dock_book_removed (GimpDockColumns *dock_columns,
+                                     GimpDockbook    *dockbook,
+                                     GimpDock        *dock)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  if (gimp_dock_get_dockbooks (dock) == NULL &&
+      ! GIMP_IS_TOOLBOX (dock) &&
+      gtk_widget_get_parent (GTK_WIDGET (dock)) != NULL)
+    gimp_dock_columns_remove_dock (dock_columns, dock);
+}
+
+
+/**
+ * gimp_dock_columns_new:
+ * @context:
+ *
+ * Returns: A new #GimpDockColumns.
+ **/
+GtkWidget *
+gimp_dock_columns_new (GimpContext       *context,
+                       GimpDialogFactory *dialog_factory,
+                       GimpUIManager     *ui_manager)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (ui_manager), NULL);
+
+  return g_object_new (GIMP_TYPE_DOCK_COLUMNS,
+                       "context",        context,
+                       "dialog-factory", dialog_factory,
+                       "ui-manager",     ui_manager,
+                       NULL);
+}
+
+/**
+ * gimp_dock_columns_add_dock:
+ * @dock_columns:
+ * @dock:
+ *
+ * Add a dock, added to a horizontal GimpPanedBox.
+ **/
+void
+gimp_dock_columns_add_dock (GimpDockColumns *dock_columns,
+                            GimpDock        *dock,
+                            gint             index)
+{
+  g_return_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns));
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  GIMP_LOG (DND, "Adding GimpDock %p to GimpDockColumns %p", dock, dock_columns);
+
+  dock_columns->p->docks = g_list_insert (dock_columns->p->docks, dock, index);
+
+  gimp_dock_update_with_context (dock, dock_columns->p->context);
+
+  gimp_paned_box_add_widget (GIMP_PANED_BOX (dock_columns->p->paned_hbox),
+                             GTK_WIDGET (dock),
+                             index);
+
+  g_signal_connect_object (dock, "book-removed",
+                           G_CALLBACK (gimp_dock_columns_dock_book_removed),
+                           dock_columns,
+                           G_CONNECT_SWAPPED);
+
+  g_signal_emit (dock_columns, dock_columns_signals[DOCK_ADDED], 0, dock);
+}
+
+/**
+ * gimp_dock_columns_prepare_dockbook:
+ * @dock_columns:
+ * @dock_index:
+ * @dockbook_p:
+ *
+ * Create a new dock and add it to the dock columns with the given
+ * dock_index insert index, then create and add a dockbook and put it
+ * in the dock.
+ **/
+void
+gimp_dock_columns_prepare_dockbook (GimpDockColumns  *dock_columns,
+                                    gint              dock_index,
+                                    GtkWidget       **dockbook_p)
+{
+  GimpMenuFactory *menu_factory;
+  GtkWidget       *dock;
+  GtkWidget       *dockbook;
+
+  dock = gimp_menu_dock_new ();
+  gimp_dock_columns_add_dock (dock_columns, GIMP_DOCK (dock), dock_index);
+
+  menu_factory = gimp_dialog_factory_get_menu_factory (dock_columns->p->dialog_factory);
+  dockbook = gimp_dockbook_new (menu_factory);
+  gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), -1);
+
+  gtk_widget_show (GTK_WIDGET (dock));
+
+  if (dockbook_p)
+    *dockbook_p = dockbook;
+}
+
+
+void
+gimp_dock_columns_remove_dock (GimpDockColumns *dock_columns,
+                               GimpDock        *dock)
+{
+  g_return_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns));
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  GIMP_LOG (DND, "Removing GimpDock %p from GimpDockColumns %p", dock, dock_columns);
+
+  dock_columns->p->docks = g_list_remove (dock_columns->p->docks, dock);
+
+  gimp_dock_update_with_context (dock, NULL);
+
+  g_signal_handlers_disconnect_by_func (dock,
+                                        gimp_dock_columns_dock_book_removed,
+                                        dock_columns);
+
+  g_object_ref (dock);
+  gimp_paned_box_remove_widget (GIMP_PANED_BOX (dock_columns->p->paned_hbox),
+                                GTK_WIDGET (dock));
+
+  g_signal_emit (dock_columns, dock_columns_signals[DOCK_REMOVED], 0, dock);
+  g_object_unref (dock);
+}
+
+GList *
+gimp_dock_columns_get_docks (GimpDockColumns *dock_columns)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns), NULL);
+
+  return dock_columns->p->docks;
+}
+
+GimpContext *
+gimp_dock_columns_get_context (GimpDockColumns *dock_columns)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns), NULL);
+
+  return dock_columns->p->context;
+}
+
+void
+gimp_dock_columns_set_context (GimpDockColumns *dock_columns,
+                               GimpContext     *context)
+{
+  g_return_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns));
+
+  dock_columns->p->context = context;
+}
+
+GimpDialogFactory *
+gimp_dock_columns_get_dialog_factory (GimpDockColumns *dock_columns)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns), NULL);
+
+  return dock_columns->p->dialog_factory;
+}
+
+GimpUIManager *
+gimp_dock_columns_get_ui_manager (GimpDockColumns *dock_columns)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_COLUMNS (dock_columns), NULL);
+
+  return dock_columns->p->ui_manager;
+}
diff --git a/app/widgets/gimpdockcolumns.h b/app/widgets/gimpdockcolumns.h
new file mode 100644
index 0000000..bd9f619
--- /dev/null
+++ b/app/widgets/gimpdockcolumns.h
@@ -0,0 +1,80 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockcolumns.h
+ * Copyright (C) 2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCK_COLUMNS_H__
+#define __GIMP_DOCK_COLUMNS_H__
+
+
+#define GIMP_TYPE_DOCK_COLUMNS            (gimp_dock_columns_get_type ())
+#define GIMP_DOCK_COLUMNS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK_COLUMNS, GimpDockColumns))
+#define GIMP_DOCK_COLUMNS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCK_COLUMNS, GimpDockColumnsClass))
+#define GIMP_IS_DOCK_COLUMNS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCK_COLUMNS))
+#define GIMP_IS_DOCK_COLUMNS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCK_COLUMNS))
+#define GIMP_DOCK_COLUMNS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCK_COLUMNS, GimpDockColumnsClass))
+
+
+typedef struct _GimpDockColumnsClass    GimpDockColumnsClass;
+typedef struct _GimpDockColumnsPrivate  GimpDockColumnsPrivate;
+
+/**
+ * GimpDockColumns:
+ *
+ * A widget containing GimpDocks so that dockables are arranged in
+ * columns.
+ */
+struct _GimpDockColumns
+{
+  GtkBox parent_instance;
+
+  GimpDockColumnsPrivate *p;
+};
+
+struct _GimpDockColumnsClass
+{
+  GtkBoxClass parent_class;
+
+  void (* dock_added)   (GimpDockColumns *dock_columns,
+                         GimpDock        *dock);
+  void (* dock_removed) (GimpDockColumns *dock_columns,
+                         GimpDock        *dock);
+};
+
+
+GType               gimp_dock_columns_get_type           (void) G_GNUC_CONST;
+GtkWidget         * gimp_dock_columns_new                (GimpContext       *context,
+                                                          GimpDialogFactory *dialog_factory,
+                                                          GimpUIManager     *ui_manager);
+void                gimp_dock_columns_add_dock           (GimpDockColumns   *dock_columns,
+                                                          GimpDock          *dock,
+                                                          gint               index);
+void                gimp_dock_columns_prepare_dockbook   (GimpDockColumns   *dock_columns,
+                                                          gint               dock_index,
+                                                          GtkWidget        **dockbook_p);
+void                gimp_dock_columns_remove_dock        (GimpDockColumns   *dock_columns,
+                                                          GimpDock          *dock);
+GList             * gimp_dock_columns_get_docks          (GimpDockColumns   *dock_columns);
+GimpContext       * gimp_dock_columns_get_context        (GimpDockColumns   *dock_columns);
+void                gimp_dock_columns_set_context        (GimpDockColumns   *dock_columns,
+                                                          GimpContext       *context);
+GimpDialogFactory * gimp_dock_columns_get_dialog_factory (GimpDockColumns   *dock_columns);
+GimpUIManager     * gimp_dock_columns_get_ui_manager     (GimpDockColumns   *dock_columns);
+
+
+#endif /* __GIMP_DOCK_COLUMNS_H__ */
diff --git a/app/widgets/gimpdockcontainer.c b/app/widgets/gimpdockcontainer.c
new file mode 100644
index 0000000..f412b62
--- /dev/null
+++ b/app/widgets/gimpdockcontainer.c
@@ -0,0 +1,157 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockcontainer.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpdockcontainer.h"
+
+
+G_DEFINE_INTERFACE (GimpDockContainer, gimp_dock_container, GTK_TYPE_WIDGET)
+
+
+/*  private functions  */
+
+
+static void
+gimp_dock_container_default_init (GimpDockContainerInterface *iface)
+{
+}
+
+
+/*  public functions  */
+
+
+/**
+ * gimp_dock_container_get_docks:
+ * @container: A #GimpDockContainer
+ *
+ * Returns: A list of #GimpDock:s in the dock container. Free with
+ *          g_list_free() when done.
+ **/
+GList *
+gimp_dock_container_get_docks (GimpDockContainer *container)
+{
+  GimpDockContainerInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), NULL);
+
+  iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+
+  if (iface->get_docks)
+    return iface->get_docks (container);
+
+  return NULL;
+}
+
+/**
+ * gimp_dock_container_get_dialog_factory:
+ * @container: A #GimpDockContainer
+ *
+ * Returns: The #GimpDialogFactory of the #GimpDockContainer
+ **/
+GimpDialogFactory *
+gimp_dock_container_get_dialog_factory (GimpDockContainer *container)
+{
+  GimpDockContainerInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), NULL);
+
+  iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+
+  if (iface->get_dialog_factory)
+    return iface->get_dialog_factory (container);
+
+  return NULL;
+}
+
+/**
+ * gimp_dock_container_get_ui_manager:
+ * @container: A #GimpDockContainer
+ *
+ * Returns: The #GimpUIManager of the #GimpDockContainer
+ **/
+GimpUIManager *
+gimp_dock_container_get_ui_manager (GimpDockContainer *container)
+{
+  GimpDockContainerInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), NULL);
+
+  iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+
+  if (iface->get_ui_manager)
+    return iface->get_ui_manager (container);
+
+  return NULL;
+}
+
+/**
+ * gimp_dock_container_add_dock:
+ * @container: A #GimpDockContainer
+ * @dock:      The newly created #GimpDock to add to the container.
+ * @dock_info: The #GimpSessionInfoDock the @dock was created from.
+ *
+ * Add @dock that was created from @dock_info to @container.
+ **/
+void
+gimp_dock_container_add_dock (GimpDockContainer   *container,
+                              GimpDock            *dock,
+                              GimpSessionInfoDock *dock_info)
+{
+  GimpDockContainerInterface *iface;
+
+  g_return_if_fail (GIMP_IS_DOCK_CONTAINER (container));
+
+  iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+
+  if (iface->add_dock)
+    iface->add_dock (container,
+                     dock,
+                     dock_info);
+}
+
+/**
+ * gimp_dock_container_get_dock_side:
+ * @container: A #GimpDockContainer
+ * @dock:      A #GimpDock
+ *
+ * Returns: What side @dock is in in @container, either
+ *          GIMP_ALIGN_LEFT or GIMP_ALIGN_RIGHT, or -1 if the side
+ *          concept is not applicable.
+ **/
+GimpAlignmentType
+gimp_dock_container_get_dock_side (GimpDockContainer   *container,
+                                   GimpDock            *dock)
+{
+  GimpDockContainerInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), -1);
+
+  iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+
+  if (iface->get_dock_side)
+    return iface->get_dock_side (container, dock);
+
+  return -1;
+}
diff --git a/app/widgets/gimpdockcontainer.h b/app/widgets/gimpdockcontainer.h
new file mode 100644
index 0000000..0fe9d0d
--- /dev/null
+++ b/app/widgets/gimpdockcontainer.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockcontainer.h
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCK_CONTAINER_H__
+#define __GIMP_DOCK_CONTAINER_H__
+
+
+#define GIMP_TYPE_DOCK_CONTAINER               (gimp_dock_container_get_type ())
+#define GIMP_DOCK_CONTAINER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK_CONTAINER, GimpDockContainer))
+#define GIMP_IS_DOCK_CONTAINER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCK_CONTAINER))
+#define GIMP_DOCK_CONTAINER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_DOCK_CONTAINER, GimpDockContainerInterface))
+
+
+typedef struct _GimpDockContainerInterface GimpDockContainerInterface;
+
+struct _GimpDockContainerInterface
+{
+  GTypeInterface base_iface;
+
+  /*  virtual functions  */
+  GList             * (* get_docks)          (GimpDockContainer   *container);
+  GimpDialogFactory * (* get_dialog_factory) (GimpDockContainer   *container);
+  GimpUIManager     * (* get_ui_manager)     (GimpDockContainer   *container);
+  void                (* add_dock)           (GimpDockContainer   *container,
+                                              GimpDock            *dock,
+                                              GimpSessionInfoDock *dock_info);
+  GimpAlignmentType   (* get_dock_side)      (GimpDockContainer   *container,
+                                              GimpDock            *dock);
+};
+
+
+GType               gimp_dock_container_get_type           (void) G_GNUC_CONST;
+
+GList             * gimp_dock_container_get_docks          (GimpDockContainer   *container);
+GimpDialogFactory * gimp_dock_container_get_dialog_factory (GimpDockContainer   *container);
+GimpUIManager     * gimp_dock_container_get_ui_manager     (GimpDockContainer   *container);
+void                gimp_dock_container_add_dock           (GimpDockContainer   *container,
+                                                            GimpDock            *dock,
+                                                            GimpSessionInfoDock *dock_info);
+GimpAlignmentType   gimp_dock_container_get_dock_side      (GimpDockContainer   *container,
+                                                            GimpDock            *dock);
+
+
+#endif  /*  __GIMP_DOCK_CONTAINER_H__  */
diff --git a/app/widgets/gimpdocked.c b/app/widgets/gimpdocked.c
new file mode 100644
index 0000000..cfcd6b2
--- /dev/null
+++ b/app/widgets/gimpdocked.c
@@ -0,0 +1,276 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdocked.c
+ * Copyright (C) 2003  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpdocked.h"
+#include "gimpsessioninfo-aux.h"
+
+
+enum
+{
+  TITLE_CHANGED,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void    gimp_docked_iface_set_aux_info (GimpDocked *docked,
+                                               GList      *aux_info);
+static GList * gimp_docked_iface_get_aux_info (GimpDocked *docked);
+
+
+G_DEFINE_INTERFACE (GimpDocked, gimp_docked, GTK_TYPE_WIDGET)
+
+
+static guint docked_signals[LAST_SIGNAL] = { 0 };
+
+
+/*  private functions  */
+
+
+static void
+gimp_docked_default_init (GimpDockedInterface *iface)
+{
+  docked_signals[TITLE_CHANGED] =
+    g_signal_new ("title-changed",
+                  GIMP_TYPE_DOCKED,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpDockedInterface, title_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  iface->get_aux_info = gimp_docked_iface_get_aux_info;
+  iface->set_aux_info = gimp_docked_iface_set_aux_info;
+}
+
+#define AUX_INFO_SHOW_BUTTON_BAR "show-button-bar"
+
+static void
+gimp_docked_iface_set_aux_info (GimpDocked *docked,
+                                GList      *aux_info)
+{
+  GList *list;
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (strcmp (aux->name, AUX_INFO_SHOW_BUTTON_BAR) == 0)
+        {
+          gboolean show = g_ascii_strcasecmp (aux->value, "false");
+
+          gimp_docked_set_show_button_bar (docked, show);
+        }
+    }
+}
+
+static GList *
+gimp_docked_iface_get_aux_info (GimpDocked *docked)
+{
+  if (gimp_docked_has_button_bar (docked))
+    {
+      gboolean show = gimp_docked_get_show_button_bar (docked);
+
+      return g_list_append (NULL,
+                            gimp_session_info_aux_new (AUX_INFO_SHOW_BUTTON_BAR,
+                                                       show ? "true" : "false"));
+    }
+
+  return NULL;
+}
+
+
+/*  public functions  */
+
+
+void
+gimp_docked_title_changed (GimpDocked *docked)
+{
+  g_return_if_fail (GIMP_IS_DOCKED (docked));
+
+  g_signal_emit (docked, docked_signals[TITLE_CHANGED], 0);
+}
+
+void
+gimp_docked_set_aux_info (GimpDocked *docked,
+                          GList      *aux_info)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_if_fail (GIMP_IS_DOCKED (docked));
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->set_aux_info)
+    docked_iface->set_aux_info (docked, aux_info);
+}
+
+GList *
+gimp_docked_get_aux_info (GimpDocked *docked)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->get_aux_info)
+    return docked_iface->get_aux_info (docked);
+
+  return NULL;
+}
+
+GtkWidget *
+gimp_docked_get_preview (GimpDocked  *docked,
+                         GimpContext *context,
+                         GtkIconSize  size)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->get_preview)
+    return docked_iface->get_preview (docked, context, size);
+
+  return NULL;
+}
+
+gboolean
+gimp_docked_get_prefer_icon (GimpDocked *docked)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), FALSE);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->get_prefer_icon)
+    return docked_iface->get_prefer_icon (docked);
+
+  return FALSE;
+}
+
+GimpUIManager *
+gimp_docked_get_menu (GimpDocked     *docked,
+                      const gchar   **ui_path,
+                      gpointer       *popup_data)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
+  g_return_val_if_fail (ui_path != NULL, NULL);
+  g_return_val_if_fail (popup_data != NULL, NULL);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->get_menu)
+    return docked_iface->get_menu (docked, ui_path, popup_data);
+
+  return NULL;
+}
+
+gchar *
+gimp_docked_get_title (GimpDocked *docked)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->get_title)
+    return docked_iface->get_title (docked);
+
+  return NULL;
+}
+
+void
+gimp_docked_set_context (GimpDocked  *docked,
+                         GimpContext *context)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_if_fail (GIMP_IS_DOCKED (docked));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->set_context)
+    docked_iface->set_context (docked, context);
+}
+
+gboolean
+gimp_docked_has_button_bar (GimpDocked *docked)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), FALSE);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->has_button_bar)
+    return docked_iface->has_button_bar (docked);
+
+  return FALSE;
+}
+
+void
+gimp_docked_set_show_button_bar (GimpDocked *docked,
+                                 gboolean    show)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_if_fail (GIMP_IS_DOCKED (docked));
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->set_show_button_bar)
+    docked_iface->set_show_button_bar (docked, show ? TRUE : FALSE);
+}
+
+gboolean
+gimp_docked_get_show_button_bar (GimpDocked *docked)
+{
+  GimpDockedInterface *docked_iface;
+
+  g_return_val_if_fail (GIMP_IS_DOCKED (docked), FALSE);
+
+  docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+
+  if (docked_iface->get_show_button_bar)
+    return docked_iface->get_show_button_bar (docked);
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpdocked.h b/app/widgets/gimpdocked.h
new file mode 100644
index 0000000..2a5fa22
--- /dev/null
+++ b/app/widgets/gimpdocked.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpdocked.h
+ * Copyright (C) 2003  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCKED_H__
+#define __GIMP_DOCKED_H__
+
+
+#define GIMP_TYPE_DOCKED               (gimp_docked_get_type ())
+#define GIMP_IS_DOCKED(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCKED))
+#define GIMP_DOCKED(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCKED, GimpDocked))
+#define GIMP_DOCKED_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_DOCKED, GimpDockedInterface))
+
+
+typedef struct _GimpDockedInterface GimpDockedInterface;
+
+/**
+ * GimpDockedInterface:
+ *
+ * Interface with common methods for stuff that is docked.
+ */
+struct _GimpDockedInterface
+{
+  GTypeInterface base_iface;
+
+  /*  signals  */
+  void            (* title_changed)       (GimpDocked   *docked);
+
+  /*  virtual functions  */
+  void            (* set_aux_info)        (GimpDocked   *docked,
+                                           GList        *aux_info);
+  GList         * (* get_aux_info)        (GimpDocked   *docked);
+
+  GtkWidget     * (* get_preview)         (GimpDocked   *docked,
+                                           GimpContext  *context,
+                                           GtkIconSize   size);
+  gboolean        (* get_prefer_icon)     (GimpDocked   *docked);
+  GimpUIManager * (* get_menu)            (GimpDocked   *docked,
+                                           const gchar **ui_path,
+                                           gpointer     *popup_data);
+  gchar         * (* get_title)           (GimpDocked   *docked);
+
+  void            (* set_context)         (GimpDocked   *docked,
+                                           GimpContext  *context);
+
+  gboolean        (* has_button_bar)      (GimpDocked   *docked);
+  void            (* set_show_button_bar) (GimpDocked   *docked,
+                                           gboolean      show);
+  gboolean        (* get_show_button_bar) (GimpDocked   *docked);
+};
+
+
+GType           gimp_docked_get_type            (void) G_GNUC_CONST;
+
+void            gimp_docked_title_changed       (GimpDocked   *docked);
+
+void            gimp_docked_set_aux_info        (GimpDocked   *docked,
+                                                 GList        *aux_info);
+GList         * gimp_docked_get_aux_info        (GimpDocked   *docked);
+
+GtkWidget     * gimp_docked_get_preview         (GimpDocked   *docked,
+                                                 GimpContext  *context,
+                                                 GtkIconSize   size);
+gboolean        gimp_docked_get_prefer_icon     (GimpDocked   *docked);
+GimpUIManager * gimp_docked_get_menu            (GimpDocked   *docked,
+                                                 const gchar **ui_path,
+                                                 gpointer     *popup_data);
+gchar         * gimp_docked_get_title           (GimpDocked   *docked);
+
+void            gimp_docked_set_context         (GimpDocked   *docked,
+                                                 GimpContext  *context);
+
+gboolean        gimp_docked_has_button_bar      (GimpDocked   *docked);
+void            gimp_docked_set_show_button_bar (GimpDocked   *docked,
+                                                 gboolean      show);
+gboolean        gimp_docked_get_show_button_bar (GimpDocked   *docked);
+
+
+#endif  /* __GIMP_DOCKED_H__ */
diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c
new file mode 100644
index 0000000..e8d9556
--- /dev/null
+++ b/app/widgets/gimpdockwindow.c
@@ -0,0 +1,1250 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockwindow.c
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ * Copyright (C)      2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "dialogs/dialogs.h" /* FIXME, we are in the widget layer */
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontainer.h"
+#include "core/gimplist.h"
+#include "core/gimpimage.h"
+
+#include "gimpcontainercombobox.h"
+#include "gimpcontainerview.h"
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockbook.h"
+#include "gimpdockcolumns.h"
+#include "gimpdockcontainer.h"
+#include "gimpdockwindow.h"
+#include "gimphelp-ids.h"
+#include "gimpmenufactory.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpsessioninfo.h"
+#include "gimpsessionmanaged.h"
+#include "gimptoolbox.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindow.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_DOCK_HEIGHT          300
+#define DEFAULT_MENU_VIEW_SIZE       GTK_ICON_SIZE_SMALL_TOOLBAR
+#define AUX_INFO_SHOW_IMAGE_MENU     "show-image-menu"
+#define AUX_INFO_FOLLOW_ACTIVE_IMAGE "follow-active-image"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_DIALOG_FACTORY,
+  PROP_UI_MANAGER_NAME,
+  PROP_IMAGE_CONTAINER,
+  PROP_DISPLAY_CONTAINER,
+  PROP_ALLOW_DOCKBOOK_ABSENCE
+};
+
+
+struct _GimpDockWindowPrivate
+{
+  GimpContext       *context;
+
+  GimpDialogFactory *dialog_factory;
+
+  gchar             *ui_manager_name;
+  GimpUIManager     *ui_manager;
+  GQuark             image_flush_handler_id;
+
+  GimpDockColumns   *dock_columns;
+
+  gboolean           allow_dockbook_absence;
+
+  guint              update_title_idle_id;
+
+  gint               ID;
+
+  GimpContainer     *image_container;
+  GimpContainer     *display_container;
+
+  gboolean           show_image_menu;
+  gboolean           auto_follow_active;
+
+  GtkWidget         *image_combo;
+  GtkWidget         *auto_button;
+};
+
+
+static void            gimp_dock_window_dock_container_iface_init (GimpDockContainerInterface *iface);
+static void            gimp_dock_window_session_managed_iface_init(GimpSessionManagedInterface*iface);
+static void            gimp_dock_window_constructed               (GObject                    *object);
+static void            gimp_dock_window_dispose                   (GObject                    *object);
+static void            gimp_dock_window_finalize                  (GObject                    *object);
+static void            gimp_dock_window_set_property              (GObject                    *object,
+                                                                   guint                       property_id,
+                                                                   const GValue               *value,
+                                                                   GParamSpec                 *pspec);
+static void            gimp_dock_window_get_property              (GObject                    *object,
+                                                                   guint                       property_id,
+                                                                   GValue                     *value,
+                                                                   GParamSpec                 *pspec);
+static void            gimp_dock_window_style_set                 (GtkWidget                  *widget,
+                                                                   GtkStyle                   *prev_style);
+static gboolean        gimp_dock_window_delete_event              (GtkWidget                  *widget,
+                                                                   GdkEventAny                *event);
+static GList         * gimp_dock_window_get_docks                 (GimpDockContainer          *dock_container);
+static GimpDialogFactory * gimp_dock_window_get_dialog_factory    (GimpDockContainer          *dock_container);
+static GimpUIManager * gimp_dock_window_get_ui_manager            (GimpDockContainer          *dock_container);
+static void            gimp_dock_window_add_dock_from_session     (GimpDockContainer          *dock_container,
+                                                                   GimpDock                   *dock,
+                                                                   GimpSessionInfoDock        *dock_info);
+static GList         * gimp_dock_window_get_aux_info              (GimpSessionManaged         *session_managed);
+static void            gimp_dock_window_set_aux_info              (GimpSessionManaged         *session_managed,
+                                                                   GList                      *aux_info);
+static GimpAlignmentType
+                       gimp_dock_window_get_dock_side             (GimpDockContainer          *dock_container,
+                                                                   GimpDock                   *dock);
+static gboolean        gimp_dock_window_should_add_to_recent      (GimpDockWindow             *dock_window);
+static void            gimp_dock_window_display_changed           (GimpDockWindow             *dock_window,
+                                                                   GimpObject                 *display,
+                                                                   GimpContext                *context);
+static void            gimp_dock_window_image_changed             (GimpDockWindow             *dock_window,
+                                                                   GimpImage                  *image,
+                                                                   GimpContext                *context);
+static void            gimp_dock_window_image_flush               (GimpImage                  *image,
+                                                                   gboolean                    invalidate_preview,
+                                                                   GimpDockWindow             *dock_window);
+static void            gimp_dock_window_update_title              (GimpDockWindow             *dock_window);
+static gboolean        gimp_dock_window_update_title_idle         (GimpDockWindow             *dock_window);
+static gchar         * gimp_dock_window_get_description           (GimpDockWindow             *dock_window,
+                                                                   gboolean                    complete);
+static void            gimp_dock_window_dock_removed              (GimpDockWindow             *dock_window,
+                                                                   GimpDock                   *dock,
+                                                                   GimpDockColumns            *dock_columns);
+static void            gimp_dock_window_factory_display_changed   (GimpContext                *context,
+                                                                   GimpObject                 *display,
+                                                                   GimpDock                   *dock);
+static void            gimp_dock_window_factory_image_changed     (GimpContext                *context,
+                                                                   GimpImage                  *image,
+                                                                   GimpDock                   *dock);
+static void            gimp_dock_window_auto_clicked              (GtkWidget                  *widget,
+                                                                   GimpDock                   *dock);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDockWindow, gimp_dock_window, GIMP_TYPE_WINDOW,
+                         G_ADD_PRIVATE (GimpDockWindow)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCK_CONTAINER,
+                                                gimp_dock_window_dock_container_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_SESSION_MANAGED,
+                                                gimp_dock_window_session_managed_iface_init))
+
+#define parent_class gimp_dock_window_parent_class
+
+static void
+gimp_dock_window_class_init (GimpDockWindowClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed  = gimp_dock_window_constructed;
+  object_class->dispose      = gimp_dock_window_dispose;
+  object_class->finalize     = gimp_dock_window_finalize;
+  object_class->set_property = gimp_dock_window_set_property;
+  object_class->get_property = gimp_dock_window_get_property;
+
+  widget_class->style_set    = gimp_dock_window_style_set;
+  widget_class->delete_event = gimp_dock_window_delete_event;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DIALOG_FACTORY,
+                                   g_param_spec_object ("dialog-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DIALOG_FACTORY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_UI_MANAGER_NAME,
+                                   g_param_spec_string ("ui-manager-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_IMAGE_CONTAINER,
+                                   g_param_spec_object ("image-container",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DISPLAY_CONTAINER,
+                                   g_param_spec_object ("display-container",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ALLOW_DOCKBOOK_ABSENCE,
+                                   g_param_spec_boolean ("allow-dockbook-absence",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("default-height",
+                                                             NULL, NULL,
+                                                             -1, G_MAXINT,
+                                                             DEFAULT_DOCK_HEIGHT,
+                                                             GIMP_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_enum ("menu-preview-size",
+                                                              NULL, NULL,
+                                                              GTK_TYPE_ICON_SIZE,
+                                                              DEFAULT_MENU_VIEW_SIZE,
+                                                              GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_dock_window_init (GimpDockWindow *dock_window)
+{
+  static gint  dock_window_ID = 1;
+  gchar       *name           = NULL;
+
+  dock_window->p = gimp_dock_window_get_instance_private (dock_window);
+  dock_window->p->ID                 = dock_window_ID++;
+  dock_window->p->auto_follow_active = TRUE;
+
+  name = g_strdup_printf ("gimp-dock-%d", dock_window->p->ID);
+  gtk_widget_set_name (GTK_WIDGET (dock_window), name);
+  g_free (name);
+
+  gtk_window_set_resizable (GTK_WINDOW (dock_window), TRUE);
+  gtk_window_set_focus_on_map (GTK_WINDOW (dock_window), FALSE);
+  gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dock_window), FALSE);
+}
+
+static void
+gimp_dock_window_dock_container_iface_init (GimpDockContainerInterface *iface)
+{
+  iface->get_docks          = gimp_dock_window_get_docks;
+  iface->get_dialog_factory = gimp_dock_window_get_dialog_factory;
+  iface->get_ui_manager     = gimp_dock_window_get_ui_manager;
+  iface->add_dock           = gimp_dock_window_add_dock_from_session;
+  iface->get_dock_side      = gimp_dock_window_get_dock_side;
+}
+
+static void
+gimp_dock_window_session_managed_iface_init (GimpSessionManagedInterface *iface)
+{
+  iface->get_aux_info = gimp_dock_window_get_aux_info;
+  iface->set_aux_info = gimp_dock_window_set_aux_info;
+}
+
+static void
+gimp_dock_window_constructed (GObject *object)
+{
+  GimpDockWindow  *dock_window = GIMP_DOCK_WINDOW (object);
+  GimpGuiConfig   *config;
+  GimpContext     *factory_context;
+  GimpMenuFactory *menu_factory;
+  GtkAccelGroup   *accel_group;
+  Gimp            *gimp;
+  GtkSettings     *settings;
+  gint             menu_view_width  = -1;
+  gint             menu_view_height = -1;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp   = GIMP (dock_window->p->context->gimp);
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  /* Create a separate context per dock so that docks can be bound to
+   * a specific image and does not necessarily have to follow the
+   * active image in the user context
+   */
+  g_object_unref (dock_window->p->context);
+  dock_window->p->context           = gimp_context_new (gimp, "Dock Context", NULL);
+  dock_window->p->image_container   = gimp->images;
+  dock_window->p->display_container = gimp->displays;
+
+  factory_context =
+    gimp_dialog_factory_get_context (dock_window->p->dialog_factory);
+
+  /* Setup hints */
+  gimp_window_set_hint (GTK_WINDOW (dock_window), config->dock_window_hint);
+
+  menu_factory =
+    gimp_dialog_factory_get_menu_factory (dock_window->p->dialog_factory);
+
+  /* Make image window related keyboard shortcuts work also when a
+   * dock window is the focused window
+   */
+  dock_window->p->ui_manager =
+    gimp_menu_factory_manager_new (menu_factory,
+                                   dock_window->p->ui_manager_name,
+                                   dock_window,
+                                   config->tearoff_menus);
+  accel_group = gimp_ui_manager_get_accel_group (dock_window->p->ui_manager);
+  gtk_window_add_accel_group (GTK_WINDOW (dock_window), accel_group);
+
+  g_signal_connect_object (dock_window->p->context, "display-changed",
+                           G_CALLBACK (gimp_dock_window_display_changed),
+                           dock_window,
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (dock_window->p->context, "image-changed",
+                           G_CALLBACK (gimp_dock_window_image_changed),
+                           dock_window,
+                           G_CONNECT_SWAPPED);
+
+  dock_window->p->image_flush_handler_id =
+    gimp_container_add_handler (gimp->images, "flush",
+                                G_CALLBACK (gimp_dock_window_image_flush),
+                                dock_window);
+
+  gimp_context_define_properties (dock_window->p->context,
+                                  GIMP_CONTEXT_PROP_MASK_ALL &
+                                  ~(GIMP_CONTEXT_PROP_MASK_IMAGE |
+                                    GIMP_CONTEXT_PROP_MASK_DISPLAY),
+                                  FALSE);
+  gimp_context_set_parent (dock_window->p->context,
+                           factory_context);
+
+  /* Setup widget hierarchy */
+  {
+    GtkWidget *vbox = NULL;
+
+    /* Top-level GtkVBox */
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    gtk_container_add (GTK_CONTAINER (dock_window), vbox);
+    gtk_widget_show (vbox);
+
+    /* Image selection menu */
+    {
+      GtkWidget *hbox = NULL;
+
+      /* GtkHBox */
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      if (dock_window->p->show_image_menu)
+        gtk_widget_show (hbox);
+
+      /* Image combo */
+      dock_window->p->image_combo = gimp_container_combo_box_new (NULL, NULL, 16, 1);
+      gtk_box_pack_start (GTK_BOX (hbox), dock_window->p->image_combo, TRUE, TRUE, 0);
+      g_signal_connect (dock_window->p->image_combo, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &dock_window->p->image_combo);
+      gimp_help_set_help_data (dock_window->p->image_combo,
+                               NULL, GIMP_HELP_DOCK_IMAGE_MENU);
+      gtk_widget_show (dock_window->p->image_combo);
+
+      /* Auto button */
+      dock_window->p->auto_button = gtk_toggle_button_new_with_label (_("Auto"));
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dock_window->p->auto_button),
+                                    dock_window->p->auto_follow_active);
+      gtk_box_pack_start (GTK_BOX (hbox), dock_window->p->auto_button, FALSE, FALSE, 0);
+      gtk_widget_show (dock_window->p->auto_button);
+
+      g_signal_connect (dock_window->p->auto_button, "clicked",
+                        G_CALLBACK (gimp_dock_window_auto_clicked),
+                        dock_window);
+
+      gimp_help_set_help_data (dock_window->p->auto_button,
+                               _("When enabled, the dialog automatically "
+                                 "follows the image you are working on."),
+                               GIMP_HELP_DOCK_AUTO_BUTTON);
+    }
+
+    /* GimpDockColumns */
+    /* Let the GimpDockColumns mirror the context so that a GimpDock can
+     * get it when inside a dock window. We do the same thing in the
+     * GimpImageWindow so docks can get the GimpContext there as well
+     */
+    dock_window->p->dock_columns =
+      GIMP_DOCK_COLUMNS (gimp_dock_columns_new (dock_window->p->context,
+                                                dock_window->p->dialog_factory,
+                                                dock_window->p->ui_manager));
+    gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (dock_window->p->dock_columns),
+                        TRUE, TRUE, 0);
+    gtk_widget_show (GTK_WIDGET (dock_window->p->dock_columns));
+    g_signal_connect_object (dock_window->p->dock_columns, "dock-removed",
+                             G_CALLBACK (gimp_dock_window_dock_removed),
+                             dock_window,
+                             G_CONNECT_SWAPPED);
+
+    g_signal_connect_object (dock_window->p->dock_columns, "dock-added",
+                             G_CALLBACK (gimp_dock_window_update_title),
+                             dock_window,
+                             G_CONNECT_SWAPPED);
+    g_signal_connect_object (dock_window->p->dock_columns, "dock-removed",
+                             G_CALLBACK (gimp_dock_window_update_title),
+                             dock_window,
+                             G_CONNECT_SWAPPED);
+  }
+
+  if (dock_window->p->auto_follow_active)
+    {
+      if (gimp_context_get_display (factory_context))
+        gimp_context_copy_property (factory_context,
+                                    dock_window->p->context,
+                                    GIMP_CONTEXT_PROP_DISPLAY);
+      else
+        gimp_context_copy_property (factory_context,
+                                    dock_window->p->context,
+                                    GIMP_CONTEXT_PROP_IMAGE);
+    }
+
+  g_signal_connect_object (factory_context, "display-changed",
+                           G_CALLBACK (gimp_dock_window_factory_display_changed),
+                           dock_window,
+                           0);
+  g_signal_connect_object (factory_context, "image-changed",
+                           G_CALLBACK (gimp_dock_window_factory_image_changed),
+                           dock_window,
+                           0);
+
+  settings = gtk_widget_get_settings (GTK_WIDGET (dock_window));
+  gtk_icon_size_lookup_for_settings (settings,
+                                     DEFAULT_MENU_VIEW_SIZE,
+                                     &menu_view_width,
+                                     &menu_view_height);
+
+  g_object_set (dock_window->p->image_combo,
+                "container", dock_window->p->image_container,
+                "context",   dock_window->p->context,
+                NULL);
+
+  gimp_help_connect (GTK_WIDGET (dock_window), gimp_standard_help_func,
+                     GIMP_HELP_DOCK, NULL);
+
+  if (dock_window->p->auto_follow_active)
+    {
+      if (gimp_context_get_display (factory_context))
+        gimp_context_copy_property (factory_context,
+                                    dock_window->p->context,
+                                    GIMP_CONTEXT_PROP_DISPLAY);
+      else
+        gimp_context_copy_property (factory_context,
+                                    dock_window->p->context,
+                                    GIMP_CONTEXT_PROP_IMAGE);
+    }
+}
+
+static void
+gimp_dock_window_dispose (GObject *object)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object);
+
+  if (dock_window->p->update_title_idle_id)
+    {
+      g_source_remove (dock_window->p->update_title_idle_id);
+      dock_window->p->update_title_idle_id = 0;
+    }
+
+  if (dock_window->p->image_flush_handler_id)
+    {
+      gimp_container_remove_handler (dock_window->p->context->gimp->images,
+                                     dock_window->p->image_flush_handler_id);
+      dock_window->p->image_flush_handler_id = 0;
+    }
+
+  g_clear_object (&dock_window->p->ui_manager);
+  g_clear_object (&dock_window->p->dialog_factory);
+  g_clear_object (&dock_window->p->context);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_dock_window_finalize (GObject *object)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object);
+
+  g_clear_pointer (&dock_window->p->ui_manager_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dock_window_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      dock_window->p->context = g_value_dup_object (value);
+      break;
+
+    case PROP_DIALOG_FACTORY:
+      dock_window->p->dialog_factory = g_value_dup_object (value);
+      break;
+
+    case PROP_UI_MANAGER_NAME:
+      g_free (dock_window->p->ui_manager_name);
+      dock_window->p->ui_manager_name = g_value_dup_string (value);
+      break;
+
+    case PROP_IMAGE_CONTAINER:
+      dock_window->p->image_container = g_value_dup_object (value);
+      break;
+
+    case PROP_DISPLAY_CONTAINER:
+      dock_window->p->display_container = g_value_dup_object (value);
+      break;
+
+    case PROP_ALLOW_DOCKBOOK_ABSENCE:
+      dock_window->p->allow_dockbook_absence = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dock_window_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, dock_window->p->context);
+      break;
+
+    case PROP_DIALOG_FACTORY:
+      g_value_set_object (value, dock_window->p->dialog_factory);
+      break;
+
+    case PROP_UI_MANAGER_NAME:
+      g_value_set_string (value, dock_window->p->ui_manager_name);
+      break;
+
+    case PROP_IMAGE_CONTAINER:
+      g_value_set_object (value, dock_window->p->image_container);
+      break;
+
+    case PROP_DISPLAY_CONTAINER:
+      g_value_set_object (value, dock_window->p->display_container);
+      break;
+
+    case PROP_ALLOW_DOCKBOOK_ABSENCE:
+      g_value_set_boolean (value, dock_window->p->allow_dockbook_absence);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dock_window_style_set (GtkWidget *widget,
+                            GtkStyle  *prev_style)
+{
+  GimpDockWindow *dock_window      = GIMP_DOCK_WINDOW (widget);
+  GtkStyle       *button_style;
+  GtkIconSize     menu_view_size;
+  GtkSettings    *settings;
+  gint            menu_view_width  = 18;
+  gint            menu_view_height = 18;
+  gint            focus_line_width;
+  gint            focus_padding;
+  gint            ythickness;
+
+  gint default_height = DEFAULT_DOCK_HEIGHT;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget,
+                        "default-height", &default_height,
+                        "menu-preview-size", &menu_view_size,
+                        NULL);
+
+  gtk_window_set_default_size (GTK_WINDOW (widget), -1, default_height);
+
+  settings = gtk_widget_get_settings (dock_window->p->image_combo);
+  gtk_icon_size_lookup_for_settings (settings,
+                                     menu_view_size,
+                                     &menu_view_width,
+                                     &menu_view_height);
+
+  gtk_widget_style_get (dock_window->p->auto_button,
+                        "focus-line-width", &focus_line_width,
+                        "focus-padding",    &focus_padding,
+                        NULL);
+
+  button_style = gtk_widget_get_style (widget);
+  ythickness = button_style->ythickness;
+
+  gimp_container_view_set_view_size (GIMP_CONTAINER_VIEW (dock_window->p->image_combo),
+                                     menu_view_height, 1);
+
+  gtk_widget_set_size_request (dock_window->p->auto_button, -1,
+                               menu_view_height +
+                               2 * (1 /* CHILD_SPACING */ +
+                                    ythickness            +
+                                    focus_padding         +
+                                    focus_line_width));
+}
+
+/**
+ * gimp_dock_window_delete_event:
+ * @widget:
+ * @event:
+ *
+ * Makes sure that when dock windows are closed they are added to the
+ * list of recently closed docks so that they are easy to bring back.
+ **/
+static gboolean
+gimp_dock_window_delete_event (GtkWidget   *widget,
+                               GdkEventAny *event)
+{
+  GimpDockWindow         *dock_window = GIMP_DOCK_WINDOW (widget);
+  GimpSessionInfo        *info        = NULL;
+  const gchar            *entry_name  = NULL;
+  GimpDialogFactoryEntry *entry       = NULL;
+  gchar                  *name        = NULL;
+
+  /* Don't add docks with just a single dockable to the list of
+   * recently closed dock since those can be brought back through the
+   * normal Windows->Dockable Dialogs menu
+   */
+  if (! gimp_dock_window_should_add_to_recent (dock_window))
+    return FALSE;
+
+  info = gimp_session_info_new ();
+
+  name = gimp_dock_window_get_description (dock_window, TRUE /*complete*/);
+  gimp_object_set_name (GIMP_OBJECT (info), name);
+  g_free (name);
+
+  gimp_session_info_get_info_with_widget (info, GTK_WIDGET (dock_window));
+
+  entry_name = (gimp_dock_window_has_toolbox (dock_window) ?
+                "gimp-toolbox-window" :
+                "gimp-dock-window");
+  entry = gimp_dialog_factory_find_entry (dock_window->p->dialog_factory,
+                                          entry_name);
+  gimp_session_info_set_factory_entry (info, entry);
+
+  gimp_container_add (global_recent_docks, GIMP_OBJECT (info));
+  g_object_unref (info);
+
+  return FALSE;
+}
+
+static GList *
+gimp_dock_window_get_docks (GimpDockContainer *dock_container)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock_container);
+
+  return g_list_copy (gimp_dock_columns_get_docks (dock_window->p->dock_columns));
+}
+
+static GimpDialogFactory *
+gimp_dock_window_get_dialog_factory (GimpDockContainer *dock_container)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock_container);
+
+  return dock_window->p->dialog_factory;
+}
+
+static GimpUIManager *
+gimp_dock_window_get_ui_manager (GimpDockContainer *dock_container)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock_container);
+
+  return dock_window->p->ui_manager;
+}
+
+static void
+gimp_dock_window_add_dock_from_session (GimpDockContainer   *dock_container,
+                                        GimpDock            *dock,
+                                        GimpSessionInfoDock *dock_info)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock_container);
+
+  gimp_dock_window_add_dock (dock_window,
+                             dock,
+                             -1 /*index*/);
+}
+
+static GList *
+gimp_dock_window_get_aux_info (GimpSessionManaged *session_managed)
+{
+  GimpDockWindow     *dock_window = GIMP_DOCK_WINDOW (session_managed);
+  GList              *aux_info    = NULL;
+  GimpSessionInfoAux *aux;
+
+  if (dock_window->p->allow_dockbook_absence)
+    {
+      /* Assume it is the toolbox; it does not have aux info */
+      return NULL;
+    }
+
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_window), NULL);
+
+  aux = gimp_session_info_aux_new (AUX_INFO_SHOW_IMAGE_MENU,
+                                   dock_window->p->show_image_menu ?
+                                   "true" : "false");
+  aux_info = g_list_append (aux_info, aux);
+
+  aux = gimp_session_info_aux_new (AUX_INFO_FOLLOW_ACTIVE_IMAGE,
+                                   dock_window->p->auto_follow_active ?
+                                   "true" : "false");
+  aux_info = g_list_append (aux_info, aux);
+
+  return aux_info;
+}
+
+static void
+gimp_dock_window_set_aux_info (GimpSessionManaged *session_managed,
+                               GList              *aux_info)
+{
+  GimpDockWindow *dock_window;
+  GList          *list;
+  gboolean        menu_shown;
+  gboolean        auto_follow;
+
+  g_return_if_fail (GIMP_IS_DOCK_WINDOW (session_managed));
+
+  dock_window = GIMP_DOCK_WINDOW (session_managed);
+  menu_shown  = dock_window->p->show_image_menu;
+  auto_follow = dock_window->p->auto_follow_active;
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (! strcmp (aux->name, AUX_INFO_SHOW_IMAGE_MENU))
+        {
+          menu_shown = ! g_ascii_strcasecmp (aux->value, "true");
+        }
+      else if (! strcmp (aux->name, AUX_INFO_FOLLOW_ACTIVE_IMAGE))
+        {
+          auto_follow = ! g_ascii_strcasecmp (aux->value, "true");
+        }
+    }
+
+  if (menu_shown != dock_window->p->show_image_menu)
+    gimp_dock_window_set_show_image_menu (dock_window, menu_shown);
+
+  if (auto_follow != dock_window->p->auto_follow_active)
+    gimp_dock_window_set_auto_follow_active (dock_window, auto_follow);
+}
+
+static GimpAlignmentType
+gimp_dock_window_get_dock_side (GimpDockContainer *dock_container,
+                                GimpDock          *dock)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_container), -1);
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), -1);
+
+  /* A GimpDockWindow don't have docks on different sides, it's just
+   * one set of columns
+   */
+  return -1;
+}
+
+/**
+ * gimp_dock_window_should_add_to_recent:
+ * @dock_window:
+ *
+ * Returns: %FALSE if the dock window can be recreated with one
+ *          Windows menu item such as Windows->Toolbox or
+ *          Windows->Dockable Dialogs->Layers, %TRUE if not. It should
+ *          then be added to the list of recently closed docks.
+ **/
+static gboolean
+gimp_dock_window_should_add_to_recent (GimpDockWindow *dock_window)
+{
+  GList    *docks;
+  gboolean  should_add = TRUE;
+
+  docks = gimp_dock_container_get_docks (GIMP_DOCK_CONTAINER (dock_window));
+
+  if (! docks)
+    {
+      should_add = FALSE;
+    }
+  else if (g_list_length (docks) == 1)
+    {
+      GimpDock *dock = GIMP_DOCK (g_list_nth_data (docks, 0));
+
+      if (GIMP_IS_TOOLBOX (dock) &&
+          gimp_dock_get_n_dockables (dock) == 0)
+        {
+          should_add = FALSE;
+        }
+      else if (! GIMP_IS_TOOLBOX (dock) &&
+               gimp_dock_get_n_dockables (dock) == 1)
+        {
+          should_add = FALSE;
+        }
+    }
+
+  g_list_free (docks);
+
+  return should_add;
+}
+
+static void
+gimp_dock_window_image_flush (GimpImage      *image,
+                              gboolean        invalidate_preview,
+                              GimpDockWindow *dock_window)
+{
+  if (image == gimp_context_get_image (dock_window->p->context))
+    {
+      GimpObject *display = gimp_context_get_display (dock_window->p->context);
+
+      if (display)
+        gimp_ui_manager_update (dock_window->p->ui_manager, display);
+    }
+}
+
+static void
+gimp_dock_window_update_title (GimpDockWindow *dock_window)
+{
+  if (dock_window->p->update_title_idle_id)
+    g_source_remove (dock_window->p->update_title_idle_id);
+
+  dock_window->p->update_title_idle_id =
+    g_idle_add ((GSourceFunc) gimp_dock_window_update_title_idle,
+                dock_window);
+}
+
+static gboolean
+gimp_dock_window_update_title_idle (GimpDockWindow *dock_window)
+{
+  gchar *desc = gimp_dock_window_get_description (dock_window,
+                                                  FALSE /*complete*/);
+  if (desc)
+    {
+      gtk_window_set_title (GTK_WINDOW (dock_window), desc);
+      g_free (desc);
+    }
+
+  dock_window->p->update_title_idle_id = 0;
+
+  return FALSE;
+}
+
+static gchar *
+gimp_dock_window_get_description (GimpDockWindow *dock_window,
+                                  gboolean        complete)
+{
+  GString *complete_desc = g_string_new (NULL);
+  GList   *docks         = NULL;
+  GList   *iter          = NULL;
+
+  docks = gimp_dock_container_get_docks (GIMP_DOCK_CONTAINER (dock_window));
+
+  for (iter = docks;
+       iter;
+       iter = g_list_next (iter))
+    {
+      gchar *desc = gimp_dock_get_description (GIMP_DOCK (iter->data), complete);
+      g_string_append (complete_desc, desc);
+      g_free (desc);
+
+      if (g_list_next (iter))
+        g_string_append (complete_desc, GIMP_DOCK_COLUMN_SEPARATOR);
+    }
+
+  g_list_free (docks);
+
+  return g_string_free (complete_desc, FALSE /*free_segment*/);
+}
+
+static void
+gimp_dock_window_dock_removed (GimpDockWindow  *dock_window,
+                               GimpDock        *dock,
+                               GimpDockColumns *dock_columns)
+{
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  if (gimp_dock_columns_get_docks (dock_columns) == NULL &&
+      ! dock_window->p->allow_dockbook_absence)
+    gtk_widget_destroy (GTK_WIDGET (dock_window));
+}
+
+static void
+gimp_dock_window_factory_display_changed (GimpContext *context,
+                                          GimpObject  *display,
+                                          GimpDock    *dock)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock);
+
+  if (display && dock_window->p->auto_follow_active)
+    gimp_context_set_display (dock_window->p->context, display);
+}
+
+static void
+gimp_dock_window_factory_image_changed (GimpContext *context,
+                                        GimpImage   *image,
+                                        GimpDock    *dock)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock);
+
+  /*  won't do anything if we already set the display above  */
+  if (image && dock_window->p->auto_follow_active)
+    gimp_context_set_image (dock_window->p->context, image);
+}
+
+static void
+gimp_dock_window_display_changed (GimpDockWindow *dock_window,
+                                  GimpObject     *display,
+                                  GimpContext    *context)
+{
+  /*  make sure auto-follow-active works both ways  */
+  if (display && dock_window->p->auto_follow_active)
+    {
+      GimpContext *factory_context =
+        gimp_dialog_factory_get_context (dock_window->p->dialog_factory);
+
+      gimp_context_set_display (factory_context, display);
+    }
+
+  gimp_ui_manager_update (dock_window->p->ui_manager,
+                          display);
+}
+
+static void
+gimp_dock_window_image_changed (GimpDockWindow *dock_window,
+                                GimpImage      *image,
+                                GimpContext    *context)
+{
+  GimpContainer *image_container   = dock_window->p->image_container;
+  GimpContainer *display_container = dock_window->p->display_container;
+
+  /*  make sure auto-follow-active works both ways  */
+  if (image && dock_window->p->auto_follow_active)
+    {
+      GimpContext *factory_context =
+        gimp_dialog_factory_get_context (dock_window->p->dialog_factory);
+
+      gimp_context_set_image (factory_context, image);
+    }
+
+  if (image == NULL && ! gimp_container_is_empty (image_container))
+    {
+      image = GIMP_IMAGE (gimp_container_get_first_child (image_container));
+
+      /*  this invokes this function recursively but we don't enter
+       *  the if() branch the second time
+       */
+      gimp_context_set_image (context, image);
+
+      /*  stop the emission of the original signal (the emission of
+       *  the recursive signal is finished)
+       */
+      g_signal_stop_emission_by_name (context, "image-changed");
+    }
+  else if (image != NULL && ! gimp_container_is_empty (display_container))
+    {
+      GimpObject *display;
+      GimpImage  *display_image;
+      gboolean    find_display = TRUE;
+
+      display = gimp_context_get_display (context);
+
+      if (display)
+        {
+          g_object_get (display, "image", &display_image, NULL);
+
+          if (display_image)
+            {
+              g_object_unref (display_image);
+
+              if (display_image == image)
+                find_display = FALSE;
+            }
+        }
+
+      if (find_display)
+        {
+          GList *list;
+
+          for (list = GIMP_LIST (display_container)->queue->head;
+               list;
+               list = g_list_next (list))
+            {
+              display = GIMP_OBJECT (list->data);
+
+              g_object_get (display, "image", &display_image, NULL);
+
+              if (display_image)
+                {
+                  g_object_unref (display_image);
+
+                  if (display_image == image)
+                    {
+                      /*  this invokes this function recursively but we
+                       *  don't enter the if(find_display) branch the
+                       *  second time
+                       */
+                      gimp_context_set_display (context, display);
+
+                      /*  don't stop signal emission here because the
+                       *  context's image was not changed by the
+                       *  recursive call
+                       */
+                      break;
+                    }
+                }
+            }
+        }
+    }
+
+  gimp_ui_manager_update (dock_window->p->ui_manager,
+                          gimp_context_get_display (context));
+}
+
+static void
+gimp_dock_window_auto_clicked (GtkWidget *widget,
+                               GimpDock  *dock)
+{
+  GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (dock);
+
+  gimp_toggle_button_update (widget, &dock_window->p->auto_follow_active);
+
+  if (dock_window->p->auto_follow_active)
+    {
+      GimpContext *context;
+
+      context = gimp_dialog_factory_get_context (dock_window->p->dialog_factory);
+
+      gimp_context_copy_properties (context,
+                                    dock_window->p->context,
+                                    GIMP_CONTEXT_PROP_MASK_DISPLAY |
+                                    GIMP_CONTEXT_PROP_MASK_IMAGE);
+    }
+}
+
+
+void
+gimp_dock_window_add_dock (GimpDockWindow *dock_window,
+                           GimpDock       *dock,
+                           gint            index)
+{
+  g_return_if_fail (GIMP_IS_DOCK_WINDOW (dock_window));
+  g_return_if_fail (GIMP_IS_DOCK (dock));
+
+  gimp_dock_columns_add_dock (dock_window->p->dock_columns,
+                              GIMP_DOCK (dock),
+                              index);
+
+  g_signal_connect_object (dock, "description-invalidated",
+                           G_CALLBACK (gimp_dock_window_update_title),
+                           dock_window,
+                           G_CONNECT_SWAPPED);
+
+  /* Some docks like the toolbox dock needs to maintain special hints
+   * on its container GtkWindow, allow those to do so
+   */
+  gimp_dock_set_host_geometry_hints (dock, GTK_WINDOW (dock_window));
+  g_signal_connect_object (dock, "geometry-invalidated",
+                           G_CALLBACK (gimp_dock_set_host_geometry_hints),
+                           dock_window, 0);
+}
+
+void
+gimp_dock_window_remove_dock (GimpDockWindow *dock_window,
+                              GimpDock       *dock)
+{
+  gimp_dock_columns_remove_dock (dock_window->p->dock_columns,
+                                 GIMP_DOCK (dock));
+
+  g_signal_handlers_disconnect_by_func (dock,
+                                        gimp_dock_window_update_title,
+                                        dock_window);
+  g_signal_handlers_disconnect_by_func (dock,
+                                        gimp_dock_set_host_geometry_hints,
+                                        dock_window);
+}
+
+GtkWidget *
+gimp_dock_window_new (const gchar       *role,
+                      const gchar       *ui_manager_name,
+                      gboolean           allow_dockbook_absence,
+                      GimpDialogFactory *dialog_factory,
+                      GimpContext       *context)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_DOCK_WINDOW,
+                       "role",                   role,
+                       "ui-manager-name",        ui_manager_name,
+                       "allow-dockbook-absence", allow_dockbook_absence,
+                       "dialog-factory",         dialog_factory,
+                       "context",                context,
+                       NULL);
+}
+
+gint
+gimp_dock_window_get_id (GimpDockWindow *dock_window)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_window), 0);
+
+  return dock_window->p->ID;
+}
+
+GimpContext *
+gimp_dock_window_get_context (GimpDockWindow *dock_window)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_window), NULL);
+
+  return dock_window->p->context;
+}
+
+gboolean
+gimp_dock_window_get_auto_follow_active (GimpDockWindow *dock_window)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_window), FALSE);
+
+  return dock_window->p->auto_follow_active;
+}
+
+void
+gimp_dock_window_set_auto_follow_active (GimpDockWindow *dock_window,
+                                         gboolean        auto_follow_active)
+{
+  g_return_if_fail (GIMP_IS_DOCK_WINDOW (dock_window));
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dock_window->p->auto_button),
+                                auto_follow_active ? TRUE : FALSE);
+}
+
+gboolean
+gimp_dock_window_get_show_image_menu (GimpDockWindow *dock_window)
+{
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_window), FALSE);
+
+  return dock_window->p->show_image_menu;
+}
+
+void
+gimp_dock_window_set_show_image_menu (GimpDockWindow *dock_window,
+                                      gboolean        show)
+{
+  GtkWidget *parent;
+
+  g_return_if_fail (GIMP_IS_DOCK_WINDOW (dock_window));
+
+  parent = gtk_widget_get_parent (dock_window->p->image_combo);
+
+  gtk_widget_set_visible (parent, show);
+
+  dock_window->p->show_image_menu = show ? TRUE : FALSE;
+}
+
+void
+gimp_dock_window_setup (GimpDockWindow *dock_window,
+                        GimpDockWindow *template)
+{
+  gimp_dock_window_set_auto_follow_active (GIMP_DOCK_WINDOW (dock_window),
+                                           template->p->auto_follow_active);
+  gimp_dock_window_set_show_image_menu (GIMP_DOCK_WINDOW (dock_window),
+                                        template->p->show_image_menu);
+}
+
+/**
+ * gimp_dock_window_has_toolbox:
+ * @dock_window:
+ *
+ * Returns: %TRUE if the dock window has a GimpToolbox dock, %FALSE
+ * otherwise.
+ **/
+gboolean
+gimp_dock_window_has_toolbox (GimpDockWindow *dock_window)
+{
+  GList *iter = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DOCK_WINDOW (dock_window), FALSE);
+
+  for (iter = gimp_dock_columns_get_docks (dock_window->p->dock_columns);
+       iter;
+       iter = g_list_next (iter))
+    {
+      if (GIMP_IS_TOOLBOX (iter->data))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/**
+ * gimp_dock_window_from_dock:
+ * @dock:
+ *
+ * For convenience.
+ *
+ * Returns: If the toplevel widget for the dock is a GimpDockWindow,
+ * return that. Otherwise return %NULL.
+ **/
+GimpDockWindow *
+gimp_dock_window_from_dock (GimpDock *dock)
+{
+  GtkWidget *toplevel = NULL;
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (dock));
+
+  if (GIMP_IS_DOCK_WINDOW (toplevel))
+    return GIMP_DOCK_WINDOW (toplevel);
+  else
+    return NULL;
+}
diff --git a/app/widgets/gimpdockwindow.h b/app/widgets/gimpdockwindow.h
new file mode 100644
index 0000000..d09bfc0
--- /dev/null
+++ b/app/widgets/gimpdockwindow.h
@@ -0,0 +1,85 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdockwindow.h
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ * Copyright (C)      2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCK_WINDOW_H__
+#define __GIMP_DOCK_WINDOW_H__
+
+
+#include "widgets/gimpwindow.h"
+
+
+#define GIMP_TYPE_DOCK_WINDOW            (gimp_dock_window_get_type ())
+#define GIMP_DOCK_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK_WINDOW, GimpDockWindow))
+#define GIMP_DOCK_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCK_WINDOW, GimpDockWindowClass))
+#define GIMP_IS_DOCK_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCK_WINDOW))
+#define GIMP_IS_DOCK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCK_WINDOW))
+#define GIMP_DOCK_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCK_WINDOW, GimpDockWindowClass))
+
+
+typedef struct _GimpDockWindowClass    GimpDockWindowClass;
+typedef struct _GimpDockWindowPrivate  GimpDockWindowPrivate;
+
+/**
+ * GimpDockWindow:
+ *
+ * A top-level window containing GimpDocks.
+ */
+struct _GimpDockWindow
+{
+  GimpWindow  parent_instance;
+
+  GimpDockWindowPrivate *p;
+};
+
+struct _GimpDockWindowClass
+{
+  GimpWindowClass  parent_class;
+};
+
+
+GType               gimp_dock_window_get_type               (void) G_GNUC_CONST;
+GtkWidget         * gimp_dock_window_new                    (const gchar       *role,
+                                                             const gchar       *ui_manager_name,
+                                                             gboolean           allow_dockbook_absence,
+                                                             GimpDialogFactory *factory,
+                                                             GimpContext       *context);
+gint                gimp_dock_window_get_id                 (GimpDockWindow    *dock_window);
+void                gimp_dock_window_add_dock               (GimpDockWindow    *dock_window,
+                                                             GimpDock          *dock,
+                                                             gint               index);
+void                gimp_dock_window_remove_dock            (GimpDockWindow    *dock_window,
+                                                             GimpDock          *dock);
+GimpContext       * gimp_dock_window_get_context            (GimpDockWindow    *dock);
+gboolean            gimp_dock_window_get_auto_follow_active (GimpDockWindow    *menu_dock);
+void                gimp_dock_window_set_auto_follow_active (GimpDockWindow    *menu_dock,
+                                                             gboolean           show);
+gboolean            gimp_dock_window_get_show_image_menu    (GimpDockWindow    *menu_dock);
+void                gimp_dock_window_set_show_image_menu    (GimpDockWindow    *menu_dock,
+                                                             gboolean           show);
+void                gimp_dock_window_setup                  (GimpDockWindow    *dock_window,
+                                                             GimpDockWindow    *template);
+gboolean            gimp_dock_window_has_toolbox            (GimpDockWindow    *dock_window);
+
+GimpDockWindow    * gimp_dock_window_from_dock              (GimpDock          *dock);
+
+
+
+#endif /* __GIMP_DOCK_WINDOW_H__ */
diff --git a/app/widgets/gimpdocumentview.c b/app/widgets/gimpdocumentview.c
new file mode 100644
index 0000000..0667cb8
--- /dev/null
+++ b/app/widgets/gimpdocumentview.c
@@ -0,0 +1,189 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdocumentview.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimagefile.h"
+
+#include "gimpcontainerview.h"
+#include "gimpdocumentview.h"
+#include "gimpdnd.h"
+#include "gimpeditor.h"
+#include "gimpmenufactory.h"
+#include "gimpuimanager.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void    gimp_document_view_activate_item (GimpContainerEditor *editor,
+                                                 GimpViewable        *viewable);
+static GList * gimp_document_view_drag_uri_list (GtkWidget           *widget,
+                                                 gpointer             data);
+
+
+G_DEFINE_TYPE (GimpDocumentView, gimp_document_view,
+               GIMP_TYPE_CONTAINER_EDITOR)
+
+#define parent_class gimp_document_view_parent_class
+
+
+static void
+gimp_document_view_class_init (GimpDocumentViewClass *klass)
+{
+  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
+
+  editor_class->activate_item = gimp_document_view_activate_item;
+}
+
+static void
+gimp_document_view_init (GimpDocumentView *view)
+{
+  view->open_button    = NULL;
+  view->remove_button  = NULL;
+  view->refresh_button = NULL;
+}
+
+GtkWidget *
+gimp_document_view_new (GimpViewType     view_type,
+                        GimpContainer   *container,
+                        GimpContext     *context,
+                        gint             view_size,
+                        gint             view_border_width,
+                        GimpMenuFactory *menu_factory)
+{
+  GimpDocumentView    *document_view;
+  GimpContainerEditor *editor;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, FALSE);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        FALSE);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  document_view = g_object_new (GIMP_TYPE_DOCUMENT_VIEW,
+                                "view-type",         view_type,
+                                "container",         container,
+                                "context",           context,
+                                "view-size",         view_size,
+                                "view-border-width", view_border_width,
+                                "menu-factory",      menu_factory,
+                                "menu-identifier",   "<Documents>",
+                                "ui-path",           "/documents-popup",
+                                NULL);
+
+  editor = GIMP_CONTAINER_EDITOR (document_view);
+
+  document_view->open_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "documents",
+                                   "documents-open",
+                                   "documents-raise-or-open",
+                                   GDK_SHIFT_MASK,
+                                   "documents-file-open-dialog",
+                                   gimp_get_toggle_behavior_mask (),
+                                   NULL);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (document_view->open_button),
+                                  GIMP_TYPE_IMAGEFILE);
+
+  document_view->remove_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "documents",
+                                   "documents-remove", NULL);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (document_view->remove_button),
+                                  GIMP_TYPE_IMAGEFILE);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "documents",
+                                 "documents-clear", NULL);
+
+  document_view->refresh_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "documents",
+                                   "documents-recreate-preview",
+                                   "documents-reload-previews",
+                                   GDK_SHIFT_MASK,
+                                   "documents-remove-dangling",
+                                   gimp_get_toggle_behavior_mask (),
+                                   NULL);
+
+  if (view_type == GIMP_VIEW_TYPE_LIST)
+    {
+      GtkWidget *dnd_widget;
+
+      dnd_widget = gimp_container_view_get_dnd_widget (editor->view);
+
+      gimp_dnd_uri_list_source_add (dnd_widget,
+                                    gimp_document_view_drag_uri_list,
+                                    editor);
+    }
+
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)),
+                          editor);
+
+  return GTK_WIDGET (document_view);
+}
+
+static void
+gimp_document_view_activate_item (GimpContainerEditor *editor,
+                                  GimpViewable        *viewable)
+{
+  GimpDocumentView *view = GIMP_DOCUMENT_VIEW (editor);
+  GimpContainer    *container;
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item (editor, viewable);
+
+  container = gimp_container_view_get_container (editor->view);
+
+  if (viewable && gimp_container_have (container, GIMP_OBJECT (viewable)))
+    {
+      gtk_button_clicked (GTK_BUTTON (view->open_button));
+    }
+}
+
+static GList *
+gimp_document_view_drag_uri_list (GtkWidget *widget,
+                                  gpointer   data)
+{
+  GimpViewable *viewable = gimp_dnd_get_drag_data (widget);
+
+  if (viewable)
+    {
+      const gchar *uri = gimp_object_get_name (viewable);
+
+      return g_list_append (NULL, g_strdup (uri));
+    }
+
+  return NULL;
+}
diff --git a/app/widgets/gimpdocumentview.h b/app/widgets/gimpdocumentview.h
new file mode 100644
index 0000000..947a38d
--- /dev/null
+++ b/app/widgets/gimpdocumentview.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdocumentview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DOCUMENT_VIEW_H__
+#define __GIMP_DOCUMENT_VIEW_H__
+
+
+#include "gimpcontainereditor.h"
+
+
+#define GIMP_TYPE_DOCUMENT_VIEW            (gimp_document_view_get_type ())
+#define GIMP_DOCUMENT_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCUMENT_VIEW, GimpDocumentView))
+#define GIMP_DOCUMENT_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCUMENT_VIEW, GimpDocumentViewClass))
+#define GIMP_IS_DOCUMENT_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCUMENT_VIEW))
+#define GIMP_IS_DOCUMENT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCUMENT_VIEW))
+#define GIMP_DOCUMENT_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCUMENT_VIEW, GimpDocumentViewClass))
+
+
+typedef struct _GimpDocumentViewClass  GimpDocumentViewClass;
+
+struct _GimpDocumentView
+{
+  GimpContainerEditor  parent_instance;
+
+  GtkWidget           *open_button;
+  GtkWidget           *remove_button;
+  GtkWidget           *refresh_button;
+};
+
+struct _GimpDocumentViewClass
+{
+  GimpContainerEditorClass  parent_class;
+};
+
+
+GType       gimp_document_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_document_view_new      (GimpViewType     view_type,
+                                         GimpContainer   *container,
+                                         GimpContext     *context,
+                                         gint             view_size,
+                                         gint             view_border_width,
+                                         GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_DOCUMENT_VIEW_H__  */
diff --git a/app/widgets/gimpdrawabletreeview.c b/app/widgets/gimpdrawabletreeview.c
new file mode 100644
index 0000000..5b17d79
--- /dev/null
+++ b/app/widgets/gimpdrawabletreeview.c
@@ -0,0 +1,393 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawabletreeview.c
+ * Copyright (C) 2001-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-edit.h"
+#include "core/gimpfilloptions.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimppattern.h"
+
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpdrawabletreeview.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_drawable_tree_view_view_iface_init (GimpContainerViewInterface *iface);
+
+static void     gimp_drawable_tree_view_constructed (GObject           *object);
+
+static gboolean gimp_drawable_tree_view_select_item (GimpContainerView *view,
+                                                     GimpViewable      *item,
+                                                     gpointer           insert_data);
+
+static gboolean gimp_drawable_tree_view_drop_possible(GimpContainerTreeView *view,
+                                                      GimpDndType          src_type,
+                                                      GimpViewable        *src_viewable,
+                                                      GimpViewable        *dest_viewable,
+                                                      GtkTreePath         *drop_path,
+                                                      GtkTreeViewDropPosition  drop_pos,
+                                                      GtkTreeViewDropPosition *return_drop_pos,
+                                                      GdkDragAction       *return_drag_action);
+static void   gimp_drawable_tree_view_drop_viewable (GimpContainerTreeView *view,
+                                                     GimpViewable     *src_viewable,
+                                                     GimpViewable     *dest_viewable,
+                                                     GtkTreeViewDropPosition  drop_pos);
+static void   gimp_drawable_tree_view_drop_color (GimpContainerTreeView *view,
+                                                  const GimpRGB       *color,
+                                                  GimpViewable        *dest_viewable,
+                                                  GtkTreeViewDropPosition  drop_pos);
+
+static void   gimp_drawable_tree_view_set_image  (GimpItemTreeView     *view,
+                                                  GimpImage            *image);
+
+static void   gimp_drawable_tree_view_floating_selection_changed
+                                                 (GimpImage            *image,
+                                                  GimpDrawableTreeView *view);
+
+static void   gimp_drawable_tree_view_new_pattern_dropped
+                                                 (GtkWidget            *widget,
+                                                  gint                  x,
+                                                  gint                  y,
+                                                  GimpViewable         *viewable,
+                                                  gpointer              data);
+static void   gimp_drawable_tree_view_new_color_dropped
+                                                 (GtkWidget            *widget,
+                                                  gint                  x,
+                                                  gint                  y,
+                                                  const GimpRGB        *color,
+                                                  gpointer              data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpDrawableTreeView, gimp_drawable_tree_view,
+                         GIMP_TYPE_ITEM_TREE_VIEW,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_drawable_tree_view_view_iface_init))
+
+#define parent_class gimp_drawable_tree_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_drawable_tree_view_class_init (GimpDrawableTreeViewClass *klass)
+{
+  GObjectClass               *object_class;
+  GimpContainerTreeViewClass *tree_view_class;
+  GimpItemTreeViewClass      *item_view_class;
+
+  object_class    = G_OBJECT_CLASS (klass);
+  tree_view_class = GIMP_CONTAINER_TREE_VIEW_CLASS (klass);
+  item_view_class = GIMP_ITEM_TREE_VIEW_CLASS (klass);
+
+  object_class->constructed      = gimp_drawable_tree_view_constructed;
+
+  tree_view_class->drop_possible = gimp_drawable_tree_view_drop_possible;
+  tree_view_class->drop_viewable = gimp_drawable_tree_view_drop_viewable;
+  tree_view_class->drop_color    = gimp_drawable_tree_view_drop_color;
+
+  item_view_class->set_image     = gimp_drawable_tree_view_set_image;
+
+  item_view_class->lock_content_icon_name  = GIMP_ICON_TOOL_PAINTBRUSH;
+  item_view_class->lock_content_tooltip    = _("Lock pixels");
+  item_view_class->lock_position_icon_name = GIMP_ICON_TOOL_MOVE;
+  item_view_class->lock_position_tooltip   = _("Lock position and size");
+}
+
+static void
+gimp_drawable_tree_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  iface->select_item = gimp_drawable_tree_view_select_item;
+}
+
+static void
+gimp_drawable_tree_view_init (GimpDrawableTreeView *view)
+{
+}
+
+static void
+gimp_drawable_tree_view_constructed (GObject *object)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (object);
+  GimpItemTreeView      *item_view = GIMP_ITEM_TREE_VIEW (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_dnd_viewable_dest_add (gimp_item_tree_view_get_new_button (item_view),
+                              GIMP_TYPE_PATTERN,
+                              gimp_drawable_tree_view_new_pattern_dropped,
+                              item_view);
+  gimp_dnd_color_dest_add (gimp_item_tree_view_get_new_button (item_view),
+                           gimp_drawable_tree_view_new_color_dropped,
+                           item_view);
+
+  gimp_dnd_color_dest_add    (GTK_WIDGET (tree_view->view),
+                              NULL, tree_view);
+  gimp_dnd_viewable_dest_add (GTK_WIDGET (tree_view->view), GIMP_TYPE_PATTERN,
+                              NULL, tree_view);
+}
+
+
+/*  GimpContainerView methods  */
+
+static gboolean
+gimp_drawable_tree_view_select_item (GimpContainerView *view,
+                                     GimpViewable      *item,
+                                     gpointer           insert_data)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpImage        *image     = gimp_item_tree_view_get_image (item_view);
+  gboolean          success   = TRUE;
+
+  if (image)
+    {
+      GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
+
+      success = (item         == NULL ||
+                 floating_sel == NULL ||
+                 item         == GIMP_VIEWABLE (floating_sel));
+
+      if (! success)
+        {
+          Gimp        *gimp    = image->gimp;
+          GimpContext *context = gimp_get_user_context (gimp);
+          GObject     *display = gimp_context_get_display (context);
+
+          gimp_message_literal (gimp, display, GIMP_MESSAGE_WARNING,
+                                _("Cannot select item while a floating "
+                                  "selection is active."));
+        }
+    }
+
+  if (success)
+    success = parent_view_iface->select_item (view, item, insert_data);
+
+  return success;
+}
+
+
+/*  GimpContainerTreeView methods  */
+
+static gboolean
+gimp_drawable_tree_view_drop_possible (GimpContainerTreeView   *tree_view,
+                                       GimpDndType              src_type,
+                                       GimpViewable            *src_viewable,
+                                       GimpViewable            *dest_viewable,
+                                       GtkTreePath             *drop_path,
+                                       GtkTreeViewDropPosition  drop_pos,
+                                       GtkTreeViewDropPosition *return_drop_pos,
+                                       GdkDragAction           *return_drag_action)
+{
+  if (GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_possible (tree_view,
+                                                                    src_type,
+                                                                    src_viewable,
+                                                                    dest_viewable,
+                                                                    drop_path,
+                                                                    drop_pos,
+                                                                    return_drop_pos,
+                                                                    return_drag_action))
+    {
+      if (src_type == GIMP_DND_TYPE_COLOR ||
+          src_type == GIMP_DND_TYPE_PATTERN)
+        {
+          if (! dest_viewable ||
+              gimp_item_is_content_locked (GIMP_ITEM (dest_viewable)) ||
+              gimp_viewable_get_children (GIMP_VIEWABLE (dest_viewable)))
+            return FALSE;
+
+          if (return_drop_pos)
+            {
+              *return_drop_pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
+            }
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_drawable_tree_view_drop_viewable (GimpContainerTreeView   *view,
+                                       GimpViewable            *src_viewable,
+                                       GimpViewable            *dest_viewable,
+                                       GtkTreeViewDropPosition  drop_pos)
+{
+  if (dest_viewable && GIMP_IS_PATTERN (src_viewable))
+    {
+      GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (dest_viewable));
+      GimpFillOptions *options = gimp_fill_options_new (image->gimp, NULL, FALSE);
+
+      gimp_fill_options_set_style (options, GIMP_FILL_STYLE_PATTERN);
+      gimp_context_set_pattern (GIMP_CONTEXT (options),
+                                GIMP_PATTERN (src_viewable));
+
+      gimp_drawable_edit_fill (GIMP_DRAWABLE (dest_viewable),
+                               options,
+                               C_("undo-type", "Drop pattern to layer"));
+
+      g_object_unref (options);
+
+      gimp_image_flush (image);
+      return;
+    }
+
+  GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_viewable (view,
+                                                                src_viewable,
+                                                                dest_viewable,
+                                                                drop_pos);
+}
+
+static void
+gimp_drawable_tree_view_drop_color (GimpContainerTreeView   *view,
+                                    const GimpRGB           *color,
+                                    GimpViewable            *dest_viewable,
+                                    GtkTreeViewDropPosition  drop_pos)
+{
+  if (dest_viewable)
+    {
+      GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (dest_viewable));
+      GimpFillOptions *options = gimp_fill_options_new (image->gimp, NULL, FALSE);
+
+      gimp_fill_options_set_style (options, GIMP_FILL_STYLE_SOLID);
+      gimp_context_set_foreground (GIMP_CONTEXT (options), color);
+
+      gimp_drawable_edit_fill (GIMP_DRAWABLE (dest_viewable),
+                               options,
+                               C_("undo-type", "Drop color to layer"));
+
+      g_object_unref (options);
+
+      gimp_image_flush (image);
+    }
+}
+
+
+/*  GimpItemTreeView methods  */
+
+static void
+gimp_drawable_tree_view_set_image (GimpItemTreeView *view,
+                                   GimpImage        *image)
+{
+  if (gimp_item_tree_view_get_image (view))
+    g_signal_handlers_disconnect_by_func (gimp_item_tree_view_get_image (view),
+                                          gimp_drawable_tree_view_floating_selection_changed,
+                                          view);
+
+  GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (view, image);
+
+  if (gimp_item_tree_view_get_image (view))
+    g_signal_connect (gimp_item_tree_view_get_image (view),
+                      "floating-selection-changed",
+                      G_CALLBACK (gimp_drawable_tree_view_floating_selection_changed),
+                      view);
+}
+
+
+/*  callbacks  */
+
+static void
+gimp_drawable_tree_view_floating_selection_changed (GimpImage            *image,
+                                                    GimpDrawableTreeView *view)
+{
+  GimpItem *item;
+
+  item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  /*  update button states  */
+  gimp_container_view_select_item (GIMP_CONTAINER_VIEW (view),
+                                   (GimpViewable *) item);
+}
+
+static void
+gimp_drawable_tree_view_new_dropped (GimpItemTreeView *view,
+                                     GimpFillOptions  *options,
+                                     const gchar      *undo_desc)
+{
+  GimpImage *image = gimp_item_tree_view_get_image (view);
+  GimpItem  *item;
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                               _("New Layer"));
+
+  item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->new_item (image);
+
+  if (item)
+    gimp_drawable_edit_fill (GIMP_DRAWABLE (item), options, undo_desc);
+
+  gimp_image_undo_group_end (image);
+
+  gimp_image_flush (image);
+}
+
+static void
+gimp_drawable_tree_view_new_pattern_dropped (GtkWidget    *widget,
+                                             gint          x,
+                                             gint          y,
+                                             GimpViewable *viewable,
+                                             gpointer      data)
+{
+  GimpItemTreeView *view    = GIMP_ITEM_TREE_VIEW (data);
+  GimpImage        *image   = gimp_item_tree_view_get_image (view);
+  GimpFillOptions  *options = gimp_fill_options_new (image->gimp, NULL, FALSE);
+
+  gimp_fill_options_set_style (options, GIMP_FILL_STYLE_PATTERN);
+  gimp_context_set_pattern (GIMP_CONTEXT (options), GIMP_PATTERN (viewable));
+
+  gimp_drawable_tree_view_new_dropped (view, options,
+                                       C_("undo-type", "Drop pattern to layer"));
+
+  g_object_unref (options);
+}
+
+static void
+gimp_drawable_tree_view_new_color_dropped (GtkWidget     *widget,
+                                           gint           x,
+                                           gint           y,
+                                           const GimpRGB *color,
+                                           gpointer       data)
+{
+  GimpItemTreeView *view    = GIMP_ITEM_TREE_VIEW (data);
+  GimpImage        *image   = gimp_item_tree_view_get_image (view);
+  GimpFillOptions  *options = gimp_fill_options_new (image->gimp, NULL, FALSE);
+
+  gimp_fill_options_set_style (options, GIMP_FILL_STYLE_SOLID);
+  gimp_context_set_foreground (GIMP_CONTEXT (options), color);
+
+  gimp_drawable_tree_view_new_dropped (view, options,
+                                       C_("undo-type", "Drop color to layer"));
+
+  g_object_unref (options);
+}
diff --git a/app/widgets/gimpdrawabletreeview.h b/app/widgets/gimpdrawabletreeview.h
new file mode 100644
index 0000000..0d37436
--- /dev/null
+++ b/app/widgets/gimpdrawabletreeview.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdrawabletreeview.h
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DRAWABLE_TREE_VIEW_H__
+#define __GIMP_DRAWABLE_TREE_VIEW_H__
+
+
+#include "gimpitemtreeview.h"
+
+
+#define GIMP_TYPE_DRAWABLE_TREE_VIEW            (gimp_drawable_tree_view_get_type ())
+#define GIMP_DRAWABLE_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAWABLE_TREE_VIEW, GimpDrawableTreeView))
+#define GIMP_DRAWABLE_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAWABLE_TREE_VIEW, GimpDrawableTreeViewClass))
+#define GIMP_IS_DRAWABLE_TREE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DRAWABLE_TREE_VIEW))
+#define GIMP_IS_DRAWABLE_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DRAWABLE_TREE_VIEW))
+#define GIMP_DRAWABLE_TREE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAWABLE_TREE_VIEW, GimpDrawableTreeViewClass))
+
+
+typedef struct _GimpDrawableTreeViewClass  GimpDrawableTreeViewClass;
+
+struct _GimpDrawableTreeView
+{
+  GimpItemTreeView  parent_instance;
+};
+
+struct _GimpDrawableTreeViewClass
+{
+  GimpItemTreeViewClass  parent_class;
+};
+
+
+GType   gimp_drawable_tree_view_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_DRAWABLE_TREE_VIEW_H__  */
diff --git a/app/widgets/gimpdynamicseditor.c b/app/widgets/gimpdynamicseditor.c
new file mode 100644
index 0000000..8a8a8a5
--- /dev/null
+++ b/app/widgets/gimpdynamicseditor.c
@@ -0,0 +1,453 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdynamics.h"
+
+#include "gimpdocked.h"
+#include "gimpdynamicseditor.h"
+#include "gimpdynamicsoutputeditor.h"
+#include "gimpmenufactory.h"
+#include "gimppropwidgets.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_dynamics_editor_constructed     (GObject            *object);
+static void   gimp_dynamics_editor_finalize        (GObject            *object);
+
+static void   gimp_dynamics_editor_set_data        (GimpDataEditor     *editor,
+                                                    GimpData           *data);
+
+static void   gimp_dynamics_editor_notify_model    (GimpDynamics       *options,
+                                                    const GParamSpec   *pspec,
+                                                    GimpDynamicsEditor *editor);
+static void   gimp_dynamics_editor_notify_data     (GimpDynamics       *options,
+                                                    const GParamSpec   *pspec,
+                                                    GimpDynamicsEditor *editor);
+
+static void   gimp_dynamics_editor_add_icon_editor (GimpDynamics       *dynamics,
+                                                    Gimp               *gimp,
+                                                    GtkWidget          *vbox);
+
+static void   gimp_dynamics_editor_add_output_row  (GObject     *config,
+                                                    const gchar *row_label,
+                                                    GtkTable    *table,
+                                                    gint         row);
+
+static void gimp_dynamics_editor_init_output_editors (GimpDynamics *dynamics,
+                                                      GtkWidget    *view_selector,
+                                                      GtkWidget    *notebook,
+                                                      GtkWidget    *check_grid);
+
+static GtkWidget * dynamics_check_button_new       (GObject     *config,
+                                                    const gchar *property_name,
+                                                    GtkTable    *table,
+                                                    gint         column,
+                                                    gint         row);
+
+static void      gimp_dynamics_editor_view_changed (GtkComboBox *combo,
+                                                    GtkWidget   *notebook);
+
+G_DEFINE_TYPE_WITH_CODE (GimpDynamicsEditor, gimp_dynamics_editor,
+                         GIMP_TYPE_DATA_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED, NULL))
+
+#define parent_class gimp_dynamics_editor_parent_class
+
+
+static void
+gimp_dynamics_editor_class_init (GimpDynamicsEditorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpDataEditorClass *editor_class = GIMP_DATA_EDITOR_CLASS (klass);
+
+  object_class->constructed = gimp_dynamics_editor_constructed;
+  object_class->finalize    = gimp_dynamics_editor_finalize;
+
+  editor_class->set_data    = gimp_dynamics_editor_set_data;
+  editor_class->title       = _("Paint Dynamics Editor");
+}
+
+static void
+gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  editor->dynamics_model = g_object_new (GIMP_TYPE_DYNAMICS, NULL);
+
+  g_signal_connect (editor->dynamics_model, "notify",
+                    G_CALLBACK (gimp_dynamics_editor_notify_model),
+                    editor);
+
+  editor->view_selector =
+    gimp_enum_combo_box_new (GIMP_TYPE_DYNAMICS_OUTPUT_TYPE);
+  gtk_box_pack_start (GTK_BOX (data_editor), editor->view_selector,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->view_selector);
+
+  editor->notebook = gtk_notebook_new ();
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (editor->notebook), FALSE);
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (editor->notebook), FALSE);
+  gtk_box_pack_start (GTK_BOX (editor), editor->notebook, TRUE, TRUE, 0);
+  gtk_widget_show (editor->notebook);
+}
+
+static void
+gimp_dynamics_editor_constructed (GObject *object)
+{
+  GimpDataEditor     *data_editor = GIMP_DATA_EDITOR (object);
+  GimpDynamicsEditor *editor      = GIMP_DYNAMICS_EDITOR (object);
+  GimpDynamics       *dynamics    = editor->dynamics_model;
+  GtkWidget          *input_labels[7];
+  GtkWidget          *vbox;
+  GtkWidget          *icon_box;
+  GtkWidget          *table;
+  gint                n_inputs    = G_N_ELEMENTS (input_labels);
+  gint                i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_notebook_append_page (GTK_NOTEBOOK (editor->notebook),
+                            vbox, NULL);
+  gtk_widget_show (vbox);
+
+  icon_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), icon_box, FALSE, FALSE, 0);
+  gtk_widget_show (icon_box);
+
+  gimp_dynamics_editor_add_icon_editor (dynamics,
+                                        data_editor->context->gimp,
+                                        vbox);
+
+  table = gtk_table_new (10, n_inputs + 2, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  gimp_dynamics_editor_init_output_editors (dynamics,
+                                            editor->view_selector,
+                                            editor->notebook,
+                                            table);
+
+  input_labels[0] = gtk_label_new (_("Pressure"));
+  input_labels[1] = gtk_label_new (_("Velocity"));
+  input_labels[2] = gtk_label_new (_("Direction"));
+  input_labels[3] = gtk_label_new (_("Tilt"));
+  input_labels[4] = gtk_label_new (_("Wheel/Rotation"));
+  input_labels[5] = gtk_label_new (_("Random"));
+  input_labels[6] = gtk_label_new (_("Fade"));
+
+  for (i = 0; i < n_inputs; i++)
+    {
+      gtk_label_set_angle (GTK_LABEL (input_labels[i]), 90);
+      gtk_label_set_yalign (GTK_LABEL (input_labels[i]), 1.0);
+
+      gtk_table_attach (GTK_TABLE (table), input_labels[i],
+                        i + 1, i + 2, 0, 1,
+                        GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+      gtk_widget_show (input_labels[i]);
+    }
+
+  gimp_int_combo_box_prepend (GIMP_INT_COMBO_BOX (editor->view_selector),
+                              GIMP_INT_STORE_VALUE,     -1,
+                              GIMP_INT_STORE_LABEL,     _("Mapping matrix"),
+                              GIMP_INT_STORE_USER_DATA, vbox,
+                              -1);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (editor->view_selector), -1);
+
+  gimp_docked_set_show_button_bar (GIMP_DOCKED (object), FALSE);
+}
+
+static void
+gimp_dynamics_editor_finalize (GObject *object)
+{
+  GimpDynamicsEditor *editor = GIMP_DYNAMICS_EDITOR (object);
+
+  g_clear_object (&editor->dynamics_model);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dynamics_editor_set_data (GimpDataEditor *editor,
+                               GimpData       *data)
+{
+  GimpDynamicsEditor *dynamics_editor = GIMP_DYNAMICS_EDITOR (editor);
+
+  if (editor->data)
+    g_signal_handlers_disconnect_by_func (editor->data,
+                                          gimp_dynamics_editor_notify_data,
+                                          editor);
+
+  GIMP_DATA_EDITOR_CLASS (parent_class)->set_data (editor, data);
+
+  if (editor->data)
+    {
+      g_signal_handlers_block_by_func (dynamics_editor->dynamics_model,
+                                       gimp_dynamics_editor_notify_model,
+                                       editor);
+
+      gimp_config_copy (GIMP_CONFIG (editor->data),
+                        GIMP_CONFIG (dynamics_editor->dynamics_model),
+                        GIMP_CONFIG_PARAM_SERIALIZE);
+
+      g_signal_handlers_unblock_by_func (dynamics_editor->dynamics_model,
+                                         gimp_dynamics_editor_notify_model,
+                                         editor);
+
+      g_signal_connect (editor->data, "notify",
+                        G_CALLBACK (gimp_dynamics_editor_notify_data),
+                        editor);
+    }
+
+  gtk_widget_set_sensitive (dynamics_editor->notebook, editor->data_editable);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_dynamics_editor_new (GimpContext     *context,
+                          GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_DYNAMICS_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<DynamicsEditor>",
+                       "ui-path",         "/dynamics-editor-popup",
+                       "data-factory",    context->gimp->dynamics_factory,
+                       "context",         context,
+                       "data",            gimp_context_get_dynamics (context),
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_dynamics_editor_notify_model (GimpDynamics       *options,
+                                   const GParamSpec   *pspec,
+                                   GimpDynamicsEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  if (data_editor->data)
+    {
+      g_signal_handlers_block_by_func (data_editor->data,
+                                       gimp_dynamics_editor_notify_data,
+                                       editor);
+
+      gimp_config_copy (GIMP_CONFIG (editor->dynamics_model),
+                        GIMP_CONFIG (data_editor->data),
+                        GIMP_CONFIG_PARAM_SERIALIZE);
+
+      g_signal_handlers_unblock_by_func (data_editor->data,
+                                         gimp_dynamics_editor_notify_data,
+                                         editor);
+    }
+}
+
+static void
+gimp_dynamics_editor_notify_data (GimpDynamics       *options,
+                                  const GParamSpec   *pspec,
+                                  GimpDynamicsEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  g_signal_handlers_block_by_func (editor->dynamics_model,
+                                   gimp_dynamics_editor_notify_model,
+                                   editor);
+
+  gimp_config_copy (GIMP_CONFIG (data_editor->data),
+                    GIMP_CONFIG (editor->dynamics_model),
+                    GIMP_CONFIG_PARAM_SERIALIZE);
+
+  g_signal_handlers_unblock_by_func (editor->dynamics_model,
+                                     gimp_dynamics_editor_notify_model,
+                                     editor);
+}
+
+static void
+gimp_dynamics_editor_add_icon_editor (GimpDynamics *dynamics,
+                                      Gimp         *gimp,
+                                      GtkWidget    *vbox)
+{
+  GtkWidget *hbox;
+  GtkWidget *label;
+  GtkWidget *button;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Icon:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  button = gimp_prop_icon_picker_new (GIMP_VIEWABLE (dynamics), gimp);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+}
+
+static void
+gimp_dynamics_editor_add_output_row (GObject     *config,
+                                     const gchar *row_label,
+                                     GtkTable    *table,
+                                     gint         row)
+{
+  GtkWidget *label;
+  gint       column = 1;
+
+  label = gtk_label_new (row_label);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  dynamics_check_button_new (config, "use-pressure",
+                             table, column, row);
+  column++;
+
+  dynamics_check_button_new (config, "use-velocity",
+                             table, column, row);
+  column++;
+
+  dynamics_check_button_new (config, "use-direction",
+                             table, column, row);
+  column++;
+
+  dynamics_check_button_new (config,  "use-tilt",
+                             table, column, row);
+  column++;
+
+  dynamics_check_button_new (config,  "use-wheel",
+                             table, column, row);
+  column++;
+
+  dynamics_check_button_new (config, "use-random",
+                             table, column, row);
+  column++;
+
+  dynamics_check_button_new (config, "use-fade",
+                             table, column, row);
+  column++;
+}
+
+static GtkWidget *
+dynamics_check_button_new (GObject     *config,
+                           const gchar *property_name,
+                           GtkTable    *table,
+                           gint         column,
+                           gint         row)
+{
+  GtkWidget *button;
+
+  button = gimp_prop_check_button_new (config, property_name, NULL);
+  gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (button)));
+  gtk_table_attach (table, button, column, column + 1, row, row + 1,
+                    GTK_SHRINK, GTK_SHRINK, 0, 0);
+  gtk_widget_show (button);
+
+  return button;
+}
+
+static void
+gimp_dynamics_editor_init_output_editors (GimpDynamics *dynamics,
+                                          GtkWidget    *view_selector,
+                                          GtkWidget    *notebook,
+                                          GtkWidget    *check_grid)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (view_selector));
+  GimpIntStore *list  = GIMP_INT_STORE (model);
+  GtkTreeIter   iter;
+  gboolean      iter_valid;
+  gint          i;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter), i = 1;
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter), i++)
+    {
+      gint                output_type;
+      gchar              *label;
+      GimpDynamicsOutput *output;
+      GtkWidget          *output_editor;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
+                          GIMP_INT_STORE_VALUE, &output_type,
+                          GIMP_INT_STORE_LABEL, &label,
+                          -1);
+
+      output = gimp_dynamics_get_output (dynamics, output_type);
+
+      output_editor = gimp_dynamics_output_editor_new (output);
+
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), output_editor, NULL);
+      gtk_widget_show (output_editor);
+
+      gtk_list_store_set (GTK_LIST_STORE (list), &iter,
+                          GIMP_INT_STORE_USER_DATA, output_editor,
+                          -1);
+
+      gimp_dynamics_editor_add_output_row (G_OBJECT (output),
+                                           label,
+                                           GTK_TABLE (check_grid),
+                                           i);
+
+      g_free (label);
+  }
+
+  g_signal_connect (G_OBJECT (view_selector), "changed",
+                    G_CALLBACK (gimp_dynamics_editor_view_changed),
+                    notebook);
+}
+
+static void
+gimp_dynamics_editor_view_changed (GtkComboBox *combo,
+                                   GtkWidget   *notebook)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (combo);
+  GtkTreeIter   iter;
+  gpointer      widget;
+  gint          page;
+
+  gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
+
+  gtk_tree_model_get (model, &iter,
+                      GIMP_INT_STORE_USER_DATA, &widget,
+                      -1);
+  page = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), widget);
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page);
+}
diff --git a/app/widgets/gimpdynamicseditor.h b/app/widgets/gimpdynamicseditor.h
new file mode 100644
index 0000000..d0eb23b
--- /dev/null
+++ b/app/widgets/gimpdynamicseditor.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_EDITOR_H__
+#define __GIMP_DYNAMICS_EDITOR_H__
+
+
+#include "gimpdataeditor.h"
+
+
+#define GIMP_TYPE_DYNAMICS_EDITOR            (gimp_dynamics_editor_get_type ())
+#define GIMP_DYNAMICS_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DYNAMICS_EDITOR, GimpDynamicsEditor))
+#define GIMP_DYNAMICS_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DYNAMICS_EDITOR, GimpDynamicsEditorClass))
+#define GIMP_IS_DYNAMICS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DYNAMICS_EDITOR))
+#define GIMP_IS_DYNAMICS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DYNAMICS_EDITOR))
+#define GIMP_DYNAMICS_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS_EDITOR, GimpDynamicsEditorClass))
+
+
+typedef struct _GimpDynamicsEditorClass GimpDynamicsEditorClass;
+
+struct _GimpDynamicsEditor
+{
+  GimpDataEditor  parent_instance;
+
+  GimpDynamics   *dynamics_model;
+
+  GtkWidget      *view_selector;
+  GtkWidget      *notebook;
+};
+
+struct _GimpDynamicsEditorClass
+{
+  GimpDataEditorClass  parent_class;
+};
+
+
+GType       gimp_dynamics_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_dynamics_editor_new      (GimpContext      *context,
+                                           GimpMenuFactory  *menu_factory);
+
+
+#endif /* __GIMP_DYNAMICS_EDITOR_H__ */
diff --git a/app/widgets/gimpdynamicsfactoryview.c b/app/widgets/gimpdynamicsfactoryview.c
new file mode 100644
index 0000000..c96760f
--- /dev/null
+++ b/app/widgets/gimpdynamicsfactoryview.c
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdynamicsfactoryview.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+
+#include "gimpdynamicsfactoryview.h"
+#include "gimpmenufactory.h"
+#include "gimpviewrenderer.h"
+
+
+G_DEFINE_TYPE (GimpDynamicsFactoryView, gimp_dynamics_factory_view,
+               GIMP_TYPE_DATA_FACTORY_VIEW)
+
+
+static void
+gimp_dynamics_factory_view_class_init (GimpDynamicsFactoryViewClass *klass)
+{
+}
+
+static void
+gimp_dynamics_factory_view_init (GimpDynamicsFactoryView *view)
+{
+}
+
+GtkWidget *
+gimp_dynamics_factory_view_new (GimpViewType      view_type,
+                                GimpDataFactory  *factory,
+                                GimpContext      *context,
+                                gint              view_size,
+                                gint              view_border_width,
+                                GimpMenuFactory  *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_DYNAMICS_FACTORY_VIEW,
+                       "view-type",         view_type,
+                       "data-factory",      factory,
+                       "context",           context,
+                       "view-size",         view_size,
+                       "view-border-width", view_border_width,
+                       "menu-factory",      menu_factory,
+                       "menu-identifier",   "<Dynamics>",
+                       "ui-path",           "/dynamics-popup",
+                       "action-group",      "dynamics",
+                       NULL);
+}
diff --git a/app/widgets/gimpdynamicsfactoryview.h b/app/widgets/gimpdynamicsfactoryview.h
new file mode 100644
index 0000000..d7a2101
--- /dev/null
+++ b/app/widgets/gimpdynamicsfactoryview.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdynamicsfactoryview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_FACTORY_VIEW_H__
+#define __GIMP_DYNAMICS_FACTORY_VIEW_H__
+
+#include "gimpdatafactoryview.h"
+
+
+#define GIMP_TYPE_DYNAMICS_FACTORY_VIEW            (gimp_dynamics_factory_view_get_type ())
+#define GIMP_DYNAMICS_FACTORY_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DYNAMICS_FACTORY_VIEW, GimpDynamicsFactoryView))
+#define GIMP_DYNAMICS_FACTORY_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DYNAMICS_FACTORY_VIEW, GimpDynamicsFactoryViewClass))
+#define GIMP_IS_DYNAMICS_FACTORY_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DYNAMICS_FACTORY_VIEW))
+#define GIMP_IS_DYNAMICS_FACTORY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DYNAMICS_FACTORY_VIEW))
+#define GIMP_DYNAMICS_FACTORY_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS_FACTORY_VIEW, GimpDynamicsFactoryViewClass))
+
+
+typedef struct _GimpDynamicsFactoryViewClass  GimpDynamicsFactoryViewClass;
+
+struct _GimpDynamicsFactoryView
+{
+  GimpDataFactoryView  parent_instance;
+};
+
+struct _GimpDynamicsFactoryViewClass
+{
+  GimpDataFactoryViewClass  parent_class;
+};
+
+
+GType       gimp_dynamics_factory_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_dynamics_factory_view_new     (GimpViewType     view_type,
+                                                GimpDataFactory *factory,
+                                                GimpContext     *context,
+                                                gint             view_size,
+                                                gint             view_border_width,
+                                                GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_DYNAMICS_FACTORY_VIEW_H__  */
diff --git a/app/widgets/gimpdynamicsoutputeditor.c b/app/widgets/gimpdynamicsoutputeditor.c
new file mode 100644
index 0000000..7dacf23
--- /dev/null
+++ b/app/widgets/gimpdynamicsoutputeditor.c
@@ -0,0 +1,496 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdynamicsoutputeditor.c
+ * Copyright (C) 2010 Alexia Death
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcurve.h"
+#include "core/gimpdynamicsoutput.h"
+
+#include "gimpcurveview.h"
+#include "gimpdynamicsoutputeditor.h"
+
+#include "gimp-intl.h"
+
+
+#define CURVE_SIZE   185
+#define CURVE_BORDER   4
+
+
+enum
+{
+  PROP_0,
+  PROP_OUTPUT
+};
+
+enum
+{
+  INPUT_COLUMN_INDEX,
+  INPUT_COLUMN_USE_INPUT,
+  INPUT_COLUMN_NAME,
+  INPUT_COLUMN_COLOR,
+  INPUT_N_COLUMNS
+};
+
+
+struct
+{
+  const gchar   *use_property;
+  const gchar   *curve_property;
+  const gchar   *label;
+  const GimpRGB  color;
+}
+inputs[] =
+{
+  { "use-pressure",  "pressure-curve",  N_("Pressure"),         { 1.0, 0.0, 0.0, 1.0 } },
+  { "use-velocity",  "velocity-curve",  N_("Velocity"),         { 0.0, 1.0, 0.0, 1.0 } },
+  { "use-direction", "direction-curve", N_("Direction"),        { 0.0, 0.0, 1.0, 1.0 } },
+  { "use-tilt",      "tilt-curve",      N_("Tilt"),             { 1.0, 0.5, 0.0, 1.0 } },
+  { "use-wheel",     "wheel-curve",     N_("Wheel / Rotation"), { 1.0, 0.0, 1.0, 1.0 } },
+  { "use-random",    "random-curve",    N_("Random"),           { 0.0, 1.0, 1.0, 1.0 } },
+  { "use-fade",      "fade-curve",      N_("Fade"),             { 0.5, 0.5, 0.5, 0.0 } }
+};
+
+#define INPUT_COLOR(i) (inputs[(i)].color.a ? &inputs[(i)].color : NULL)
+
+
+typedef struct _GimpDynamicsOutputEditorPrivate GimpDynamicsOutputEditorPrivate;
+
+struct _GimpDynamicsOutputEditorPrivate
+{
+  GimpDynamicsOutput *output;
+
+  GtkListStore       *input_list;
+  GtkTreeIter         input_iters[G_N_ELEMENTS (inputs)];
+
+  GtkWidget          *curve_view;
+  GtkWidget          *input_view;
+
+  GimpCurve          *active_curve;
+};
+
+#define GET_PRIVATE(editor) \
+        ((GimpDynamicsOutputEditorPrivate *) gimp_dynamics_output_editor_get_instance_private ((GimpDynamicsOutputEditor *) (editor)))
+
+
+static void   gimp_dynamics_output_editor_constructed    (GObject                  *object);
+static void   gimp_dynamics_output_editor_finalize       (GObject                  *object);
+static void   gimp_dynamics_output_editor_set_property   (GObject                  *object,
+                                                          guint                     property_id,
+                                                          const GValue             *value,
+                                                          GParamSpec               *pspec);
+static void   gimp_dynamics_output_editor_get_property   (GObject                  *object,
+                                                          guint                     property_id,
+                                                          GValue                   *value,
+                                                          GParamSpec               *pspec);
+
+static void   gimp_dynamics_output_editor_curve_reset    (GtkWidget                *button,
+                                                          GimpDynamicsOutputEditor *editor);
+
+static void   gimp_dynamics_output_editor_input_selected (GtkTreeSelection         *selection,
+                                                          GimpDynamicsOutputEditor *editor);
+
+static void   gimp_dynamics_output_editor_input_toggled  (GtkCellRenderer          *cell,
+                                                          gchar                    *path,
+                                                          GimpDynamicsOutputEditor *editor);
+
+static void   gimp_dynamics_output_editor_activate_input (GimpDynamicsOutputEditor *editor,
+                                                          gint                      input);
+
+static void   gimp_dynamics_output_editor_notify_output  (GimpDynamicsOutput       *output,
+                                                          const GParamSpec         *pspec,
+                                                          GimpDynamicsOutputEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpDynamicsOutputEditor,
+                            gimp_dynamics_output_editor, GTK_TYPE_BOX)
+
+#define parent_class gimp_dynamics_output_editor_parent_class
+
+
+static void
+gimp_dynamics_output_editor_class_init (GimpDynamicsOutputEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_dynamics_output_editor_constructed;
+  object_class->finalize     = gimp_dynamics_output_editor_finalize;
+  object_class->set_property = gimp_dynamics_output_editor_set_property;
+  object_class->get_property = gimp_dynamics_output_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_OUTPUT,
+                                   g_param_spec_object ("output",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_DYNAMICS_OUTPUT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 6);
+}
+
+static void
+gimp_dynamics_output_editor_constructed (GObject *object)
+{
+  GimpDynamicsOutputEditor        *editor;
+  GimpDynamicsOutputEditorPrivate *private;
+  GtkWidget                       *view;
+  GtkWidget                       *button;
+  GtkCellRenderer                 *cell;
+  GtkTreeSelection                *tree_sel;
+  gint                             i;
+  GimpDynamicsOutputType           output_type;
+  const gchar                     *type_desc;
+
+  editor  = GIMP_DYNAMICS_OUTPUT_EDITOR (object);
+  private = GET_PRIVATE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_DYNAMICS_OUTPUT (private->output));
+
+  private->curve_view = gimp_curve_view_new ();
+  g_object_set (private->curve_view,
+                "border-width", CURVE_BORDER,
+                NULL);
+
+  g_object_get (private->output,
+               "type", &output_type,
+               NULL);
+
+  if (gimp_enum_get_value (GIMP_TYPE_DYNAMICS_OUTPUT_TYPE, output_type,
+                           NULL, NULL, &type_desc, NULL))
+    g_object_set (private->curve_view,
+                  "y-axis-label", type_desc,
+                  NULL);
+
+  gtk_widget_set_size_request (private->curve_view,
+                               CURVE_SIZE + CURVE_BORDER * 2,
+                               CURVE_SIZE + CURVE_BORDER * 2);
+  gtk_box_pack_start (GTK_BOX (editor), private->curve_view, TRUE, TRUE, 0);
+  gtk_widget_show (private->curve_view);
+
+  gimp_dynamics_output_editor_activate_input (editor, 0);
+
+  button = gtk_button_new_with_mnemonic (_("_Reset Curve"));
+  gtk_box_pack_start (GTK_BOX (editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_dynamics_output_editor_curve_reset),
+                    editor);
+
+  private->input_list = gtk_list_store_new (INPUT_N_COLUMNS,
+                                            G_TYPE_INT,
+                                            G_TYPE_BOOLEAN,
+                                            G_TYPE_STRING,
+                                            GIMP_TYPE_RGB);
+
+  for (i = 0; i < G_N_ELEMENTS (inputs); i++)
+    {
+      gboolean use_input;
+
+      g_object_get (private->output,
+                    inputs[i].use_property, &use_input,
+                    NULL);
+
+      gtk_list_store_insert_with_values (private->input_list,
+                                         &private->input_iters[i], -1,
+                                         INPUT_COLUMN_INDEX,     i,
+                                         INPUT_COLUMN_USE_INPUT, use_input,
+                                         INPUT_COLUMN_NAME,      gettext (inputs[i].label),
+                                         INPUT_COLUMN_COLOR,     &inputs[i].color,
+                                         -1);
+    }
+
+  view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (private->input_list));
+  g_object_unref (private->input_list);
+
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE);
+
+  cell = gtk_cell_renderer_toggle_new ();
+
+  g_object_set (cell,
+                "mode",        GTK_CELL_RENDERER_MODE_ACTIVATABLE,
+                "activatable", TRUE,
+                NULL);
+
+  g_signal_connect (G_OBJECT (cell), "toggled",
+                    G_CALLBACK (gimp_dynamics_output_editor_input_toggled),
+                    editor);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+                                               -1, NULL,
+                                               gimp_cell_renderer_color_new (),
+                                               "color", INPUT_COLUMN_COLOR,
+                                               NULL);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+                                               -1, NULL,
+                                               cell,
+                                               "active", INPUT_COLUMN_USE_INPUT,
+                                               NULL);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+                                               -1, NULL,
+                                               gtk_cell_renderer_text_new (),
+                                               "text", INPUT_COLUMN_NAME,
+                                               NULL);
+
+  gtk_box_pack_start (GTK_BOX (editor), view, FALSE, FALSE, 0);
+  gtk_widget_show (view);
+
+  private->input_view = view;
+
+  tree_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+  gtk_tree_selection_set_mode (tree_sel, GTK_SELECTION_BROWSE);
+
+  gtk_tree_selection_select_iter (tree_sel, &private->input_iters[0]);
+
+  g_signal_connect (G_OBJECT (tree_sel), "changed",
+                    G_CALLBACK (gimp_dynamics_output_editor_input_selected),
+                    editor);
+
+  g_signal_connect (private->output, "notify",
+                    G_CALLBACK (gimp_dynamics_output_editor_notify_output),
+                    editor);
+}
+
+static void
+gimp_dynamics_output_editor_finalize (GObject *object)
+{
+  GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->output);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dynamics_output_editor_set_property (GObject      *object,
+                                          guint         property_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_OUTPUT:
+      private->output = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_dynamics_output_editor_get_property (GObject    *object,
+                                          guint       property_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_OUTPUT:
+      g_value_set_object (value, private->output);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+static void
+gimp_dynamics_output_editor_curve_reset (GtkWidget                *button,
+                                         GimpDynamicsOutputEditor *editor)
+{
+  GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
+
+  if (private->active_curve)
+    gimp_curve_reset (private->active_curve, TRUE);
+}
+
+static void
+gimp_dynamics_output_editor_input_selected (GtkTreeSelection         *selection,
+                                            GimpDynamicsOutputEditor *editor)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    {
+      gint input;
+
+      gtk_tree_model_get (model, &iter,
+                          INPUT_COLUMN_INDEX, &input,
+                          -1);
+
+      gimp_dynamics_output_editor_activate_input (editor, input);
+    }
+}
+
+static void
+gimp_dynamics_output_editor_input_toggled (GtkCellRenderer          *cell,
+                                           gchar                    *path,
+                                           GimpDynamicsOutputEditor *editor)
+{
+  GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
+  GtkTreeModel                    *model;
+  GtkTreeIter                      iter;
+
+  model = GTK_TREE_MODEL (private->input_list);
+
+  if (gtk_tree_model_get_iter_from_string (model, &iter, path))
+    {
+      gint     input;
+      gboolean use;
+
+      gtk_tree_model_get (model, &iter,
+                          INPUT_COLUMN_INDEX,     &input,
+                          INPUT_COLUMN_USE_INPUT, &use,
+                          -1);
+
+      g_object_set (private->output,
+                    inputs[input].use_property, ! use,
+                    NULL);
+    }
+}
+
+static void
+gimp_dynamics_output_editor_activate_input (GimpDynamicsOutputEditor *editor,
+                                            gint                      input)
+{
+  GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
+  gint                             i;
+
+  gimp_curve_view_set_curve (GIMP_CURVE_VIEW (private->curve_view), NULL, NULL);
+  gimp_curve_view_remove_all_backgrounds (GIMP_CURVE_VIEW (private->curve_view));
+
+  for (i = 0; i < G_N_ELEMENTS (inputs); i++)
+    {
+      gboolean   use_input;
+      GimpCurve *input_curve;
+
+      g_object_get (private->output,
+                    inputs[i].use_property,   &use_input,
+                    inputs[i].curve_property, &input_curve,
+                    NULL);
+
+      if (input == i)
+        {
+          gimp_curve_view_set_curve (GIMP_CURVE_VIEW (private->curve_view),
+                                     input_curve, INPUT_COLOR (i));
+          private->active_curve = input_curve;
+
+          gimp_curve_view_set_x_axis_label (GIMP_CURVE_VIEW (private->curve_view),
+                                            inputs[i].label);
+        }
+      else if (use_input)
+        {
+          gimp_curve_view_add_background (GIMP_CURVE_VIEW (private->curve_view),
+                                          input_curve, INPUT_COLOR (i));
+        }
+
+      g_object_unref (input_curve);
+    }
+}
+
+static void
+gimp_dynamics_output_editor_notify_output (GimpDynamicsOutput       *output,
+                                           const GParamSpec         *pspec,
+                                           GimpDynamicsOutputEditor *editor)
+{
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (inputs); i++)
+    {
+      if (! strcmp (pspec->name, inputs[i].use_property))
+        {
+          GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
+          GtkTreeSelection                *sel;
+          gboolean                         use_input;
+          GimpCurve                       *input_curve;
+
+          sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (private->input_view));
+
+          g_object_get (output,
+                        pspec->name,              &use_input,
+                        inputs[i].curve_property, &input_curve,
+                        NULL);
+
+          gtk_list_store_set (private->input_list, &private->input_iters[i],
+                              INPUT_COLUMN_USE_INPUT, use_input,
+                              -1);
+
+          if (! gtk_tree_selection_iter_is_selected (sel,
+                                                     &private->input_iters[i]))
+            {
+              if (use_input)
+                {
+                  gimp_curve_view_add_background (GIMP_CURVE_VIEW (private->curve_view),
+                                                  input_curve, INPUT_COLOR (i));
+                }
+              else
+                {
+                  gimp_curve_view_remove_background (GIMP_CURVE_VIEW (private->curve_view),
+                                                     input_curve);
+                }
+
+              g_object_unref (input_curve);
+            }
+
+          break;
+        }
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_dynamics_output_editor_new (GimpDynamicsOutput *output)
+{
+  g_return_val_if_fail (GIMP_IS_DYNAMICS_OUTPUT (output), NULL);
+
+  return g_object_new (GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR,
+                       "output", output,
+                       NULL);
+}
diff --git a/app/widgets/gimpdynamicsoutputeditor.h b/app/widgets/gimpdynamicsoutputeditor.h
new file mode 100644
index 0000000..b5f6e4f
--- /dev/null
+++ b/app/widgets/gimpdynamicsoutputeditor.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdynamicsoutputeditor.h
+ * Copyright (C) 2010 Alexia Death
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_DYNAMICS_OUTPUT_EDITOR_H__
+#define __GIMP_DYNAMICS_OUTPUT_EDITOR_H__
+
+
+#define GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR            (gimp_dynamics_output_editor_get_type ())
+#define GIMP_DYNAMICS_OUTPUT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, GimpDynamicsOutputEditor))
+#define GIMP_DYNAMICS_OUTPUT_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, GimpDynamicsOutputEditorClass))
+#define GIMP_IS_DYNAMICS_OUTPUT_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR))
+#define GIMP_IS_DYNAMICS_OUTPUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR))
+#define GIMP_DYNAMICS_OUTPUT_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, GimpDynamicsOutputEditorClass))
+
+
+typedef struct _GimpDynamicsOutputEditorClass GimpDynamicsOutputEditorClass;
+
+struct _GimpDynamicsOutputEditor
+{
+  GtkBox  parent_instance;
+};
+
+struct _GimpDynamicsOutputEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_dynamics_output_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_dynamics_output_editor_new      (GimpDynamicsOutput *output);
+
+
+#endif /* __GIMP_DYNAMICS_OUTPUT_EDITOR_H__ */
diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c
new file mode 100644
index 0000000..de130cc
--- /dev/null
+++ b/app/widgets/gimpeditor.c
@@ -0,0 +1,981 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpeditor.c
+ * Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "gimpaction.h"
+#include "gimpactiongroup.h"
+#include "gimpdocked.h"
+#include "gimpeditor.h"
+#include "gimpdnd.h"
+#include "gimphighlightablebutton.h"
+#include "gimpmenufactory.h"
+#include "gimptoggleaction.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_CONTENT_SPACING  2
+#define DEFAULT_BUTTON_SPACING   2
+#define DEFAULT_BUTTON_ICON_SIZE GTK_ICON_SIZE_MENU
+#define DEFAULT_BUTTON_RELIEF    GTK_RELIEF_NONE
+
+
+enum
+{
+  PROP_0,
+  PROP_MENU_FACTORY,
+  PROP_MENU_IDENTIFIER,
+  PROP_UI_PATH,
+  PROP_POPUP_DATA,
+  PROP_SHOW_NAME,
+  PROP_NAME
+};
+
+
+struct _GimpEditorPrivate
+{
+  GimpMenuFactory *menu_factory;
+  gchar           *menu_identifier;
+  GimpUIManager   *ui_manager;
+  gchar           *ui_path;
+  gpointer         popup_data;
+
+  gboolean         show_button_bar;
+  GtkWidget       *name_label;
+  GtkWidget       *button_box;
+};
+
+
+static void         gimp_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void            gimp_editor_constructed         (GObject        *object);
+static void            gimp_editor_dispose             (GObject        *object);
+static void            gimp_editor_set_property        (GObject        *object,
+                                                        guint           property_id,
+                                                        const GValue   *value,
+                                                        GParamSpec     *pspec);
+static void            gimp_editor_get_property        (GObject        *object,
+                                                        guint           property_id,
+                                                        GValue         *value,
+                                                        GParamSpec     *pspec);
+
+static void            gimp_editor_style_set           (GtkWidget      *widget,
+                                                        GtkStyle       *prev_style);
+
+static GimpUIManager * gimp_editor_get_menu            (GimpDocked     *docked,
+                                                        const gchar   **ui_path,
+                                                        gpointer       *popup_data);
+static gboolean        gimp_editor_has_button_bar      (GimpDocked     *docked);
+static void            gimp_editor_set_show_button_bar (GimpDocked     *docked,
+                                                        gboolean        show);
+static gboolean        gimp_editor_get_show_button_bar (GimpDocked     *docked);
+
+static GtkIconSize     gimp_editor_ensure_button_box   (GimpEditor     *editor,
+                                                        GtkReliefStyle *button_relief);
+
+static void            gimp_editor_get_styling         (GimpEditor     *editor,
+                                                        GimpGuiConfig  *config,
+                                                        gint           *content_spacing,
+                                                        GtkIconSize    *button_icon_size,
+                                                        gint           *button_spacing,
+                                                        GtkReliefStyle *button_relief);
+static void            gimp_editor_config_size_changed (GimpGuiConfig   *config,
+                                                        GimpEditor      *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpEditor, gimp_editor, GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (GimpEditor)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_editor_docked_iface_init))
+
+#define parent_class gimp_editor_parent_class
+
+
+static void
+gimp_editor_class_init (GimpEditorClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed  = gimp_editor_constructed;
+  object_class->dispose      = gimp_editor_dispose;
+  object_class->set_property = gimp_editor_set_property;
+  object_class->get_property = gimp_editor_get_property;
+
+  widget_class->style_set    = gimp_editor_style_set;
+
+  g_object_class_install_property (object_class, PROP_MENU_FACTORY,
+                                   g_param_spec_object ("menu-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_MENU_FACTORY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_MENU_IDENTIFIER,
+                                   g_param_spec_string ("menu-identifier",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_UI_PATH,
+                                   g_param_spec_string ("ui-path",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_POPUP_DATA,
+                                   g_param_spec_pointer ("popup-data",
+                                                         NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SHOW_NAME,
+                                   g_param_spec_boolean ("show-name",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_NAME,
+                                   g_param_spec_string ("name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("content-spacing",
+                                                             NULL, NULL,
+                                                             0,
+                                                             G_MAXINT,
+                                                             DEFAULT_CONTENT_SPACING,
+                                                             GIMP_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("button-spacing",
+                                                             NULL, NULL,
+                                                             0,
+                                                             G_MAXINT,
+                                                             DEFAULT_BUTTON_SPACING,
+                                                             GIMP_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_enum ("button-icon-size",
+                                                              NULL, NULL,
+                                                              GTK_TYPE_ICON_SIZE,
+                                                              DEFAULT_BUTTON_ICON_SIZE,
+                                                              GIMP_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_enum ("button-relief",
+                                                              NULL, NULL,
+                                                              GTK_TYPE_RELIEF_STYLE,
+                                                              DEFAULT_BUTTON_RELIEF,
+                                                              GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  iface->get_menu            = gimp_editor_get_menu;
+  iface->has_button_bar      = gimp_editor_has_button_bar;
+  iface->set_show_button_bar = gimp_editor_set_show_button_bar;
+  iface->get_show_button_bar = gimp_editor_get_show_button_bar;
+}
+
+static void
+gimp_editor_init (GimpEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  editor->priv            = gimp_editor_get_instance_private (editor);
+  editor->priv->popup_data      = editor;
+  editor->priv->show_button_bar = TRUE;
+
+  editor->priv->name_label = g_object_new (GTK_TYPE_LABEL,
+                                     "xalign",    0.0,
+                                     "yalign",    0.5,
+                                     "ellipsize", PANGO_ELLIPSIZE_END,
+                                     NULL);
+  gimp_label_set_attributes (GTK_LABEL (editor->priv->name_label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (editor), editor->priv->name_label,
+                      FALSE, FALSE, 0);
+}
+
+static void
+gimp_editor_constructed (GObject *object)
+{
+  GimpEditor *editor = GIMP_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  if (! editor->priv->popup_data)
+    editor->priv->popup_data = editor;
+
+  if (editor->priv->menu_factory && editor->priv->menu_identifier)
+    {
+      editor->priv->ui_manager =
+        gimp_menu_factory_manager_new (editor->priv->menu_factory,
+                                       editor->priv->menu_identifier,
+                                       editor->priv->popup_data,
+                                       FALSE);
+      g_signal_connect (editor->priv->ui_manager->gimp->config,
+                        "size-changed",
+                        G_CALLBACK (gimp_editor_config_size_changed),
+                        editor);
+    }
+}
+
+static void
+gimp_editor_dispose (GObject *object)
+{
+  GimpEditor *editor = GIMP_EDITOR (object);
+
+  g_clear_object (&editor->priv->menu_factory);
+
+  g_clear_pointer (&editor->priv->menu_identifier, g_free);
+
+  if (editor->priv->ui_manager)
+    {
+      g_signal_handlers_disconnect_by_func (editor->priv->ui_manager->gimp->config,
+                                            G_CALLBACK (gimp_editor_config_size_changed),
+                                            editor);
+      g_clear_object (&editor->priv->ui_manager);
+    }
+
+  g_clear_pointer (&editor->priv->ui_path, g_free);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_editor_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpEditor *editor = GIMP_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_MENU_FACTORY:
+      editor->priv->menu_factory = g_value_dup_object (value);
+      break;
+
+    case PROP_MENU_IDENTIFIER:
+      editor->priv->menu_identifier = g_value_dup_string (value);
+      break;
+
+    case PROP_UI_PATH:
+      editor->priv->ui_path = g_value_dup_string (value);
+      break;
+
+    case PROP_POPUP_DATA:
+      editor->priv->popup_data = g_value_get_pointer (value);
+      break;
+
+    case PROP_SHOW_NAME:
+      g_object_set_property (G_OBJECT (editor->priv->name_label),
+                             "visible", value);
+      break;
+
+    case PROP_NAME:
+      gimp_editor_set_name (editor, g_value_get_string (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_editor_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpEditor *editor = GIMP_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_MENU_FACTORY:
+      g_value_set_object (value, editor->priv->menu_factory);
+      break;
+
+    case PROP_MENU_IDENTIFIER:
+      g_value_set_string (value, editor->priv->menu_identifier);
+      break;
+
+    case PROP_UI_PATH:
+      g_value_set_string (value, editor->priv->ui_path);
+      break;
+
+    case PROP_POPUP_DATA:
+      g_value_set_pointer (value, editor->priv->popup_data);
+      break;
+
+    case PROP_SHOW_NAME:
+      g_object_get_property (G_OBJECT (editor->priv->name_label),
+                             "visible", value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_editor_style_set (GtkWidget *widget,
+                       GtkStyle  *prev_style)
+{
+  GimpEditor    *editor = GIMP_EDITOR (widget);
+  GimpGuiConfig *config = NULL;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  if (editor->priv->ui_manager)
+    config = GIMP_GUI_CONFIG (editor->priv->ui_manager->gimp->config);
+  gimp_editor_config_size_changed (config, editor);
+}
+
+static GimpUIManager *
+gimp_editor_get_menu (GimpDocked   *docked,
+                      const gchar **ui_path,
+                      gpointer     *popup_data)
+{
+  GimpEditor *editor = GIMP_EDITOR (docked);
+
+  *ui_path    = editor->priv->ui_path;
+  *popup_data = editor->priv->popup_data;
+
+  return editor->priv->ui_manager;
+}
+
+
+static gboolean
+gimp_editor_has_button_bar (GimpDocked *docked)
+{
+  GimpEditor *editor = GIMP_EDITOR (docked);
+
+  return editor->priv->button_box != NULL;
+}
+
+static void
+gimp_editor_set_show_button_bar (GimpDocked *docked,
+                                 gboolean    show)
+{
+  GimpEditor *editor = GIMP_EDITOR (docked);
+
+  if (show != editor->priv->show_button_bar)
+    {
+      editor->priv->show_button_bar = show;
+
+      if (editor->priv->button_box)
+        gtk_widget_set_visible (editor->priv->button_box, show);
+    }
+}
+
+static gboolean
+gimp_editor_get_show_button_bar (GimpDocked *docked)
+{
+  GimpEditor *editor = GIMP_EDITOR (docked);
+
+  return editor->priv->show_button_bar;
+}
+
+GtkWidget *
+gimp_editor_new (void)
+{
+  return g_object_new (GIMP_TYPE_EDITOR, NULL);
+}
+
+void
+gimp_editor_create_menu (GimpEditor      *editor,
+                         GimpMenuFactory *menu_factory,
+                         const gchar     *menu_identifier,
+                         const gchar     *ui_path,
+                         gpointer         popup_data)
+{
+  g_return_if_fail (GIMP_IS_EDITOR (editor));
+  g_return_if_fail (GIMP_IS_MENU_FACTORY (menu_factory));
+  g_return_if_fail (menu_identifier != NULL);
+  g_return_if_fail (ui_path != NULL);
+
+  if (editor->priv->menu_factory)
+    g_object_unref (editor->priv->menu_factory);
+
+  editor->priv->menu_factory = g_object_ref (menu_factory);
+
+  if (editor->priv->ui_manager)
+    {
+      g_signal_handlers_disconnect_by_func (editor->priv->ui_manager->gimp->config,
+                                            G_CALLBACK (gimp_editor_config_size_changed),
+                                            editor);
+      g_object_unref (editor->priv->ui_manager);
+    }
+
+  editor->priv->ui_manager = gimp_menu_factory_manager_new (menu_factory,
+                                                            menu_identifier,
+                                                            popup_data,
+                                                            FALSE);
+  g_signal_connect (editor->priv->ui_manager->gimp->config,
+                    "size-changed",
+                    G_CALLBACK (gimp_editor_config_size_changed),
+                    editor);
+
+  if (editor->priv->ui_path)
+    g_free (editor->priv->ui_path);
+
+  editor->priv->ui_path = g_strdup (ui_path);
+
+  editor->priv->popup_data = popup_data;
+}
+
+gboolean
+gimp_editor_popup_menu (GimpEditor           *editor,
+                        GimpMenuPositionFunc  position_func,
+                        gpointer              position_data)
+{
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), FALSE);
+
+  if (editor->priv->ui_manager && editor->priv->ui_path)
+    {
+      gimp_ui_manager_update (editor->priv->ui_manager, editor->priv->popup_data);
+      gimp_ui_manager_ui_popup (editor->priv->ui_manager, editor->priv->ui_path,
+                                GTK_WIDGET (editor),
+                                position_func, position_data,
+                                NULL, NULL);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_editor_add_button:
+ * @editor:
+ * @icon_name:
+ * @tooltip:
+ * @help_id:
+ * @callback:
+ * @extended_callback:
+ * @callback_data:
+ *
+ * Creates a new button, connect @callback to the "clicked" signal and
+ * @extended_callback to the "extended-clicked" signal.
+ * The @callback_data has to be a %GObject so that we keep a ref on it and avoid
+ * bad surprises.
+ */
+GtkWidget *
+gimp_editor_add_button (GimpEditor  *editor,
+                        const gchar *icon_name,
+                        const gchar *tooltip,
+                        const gchar *help_id,
+                        GCallback    callback,
+                        GCallback    extended_callback,
+                        GObject     *callback_data)
+{
+  GtkWidget      *button;
+  GtkWidget      *image;
+  GtkIconSize     button_icon_size;
+  GtkReliefStyle  button_relief;
+
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+
+  button_icon_size = gimp_editor_ensure_button_box (editor, &button_relief);
+
+  button = gimp_highlightable_button_new ();
+  gtk_button_set_relief (GTK_BUTTON (button), button_relief);
+  gtk_box_pack_start (GTK_BOX (editor->priv->button_box), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  if (tooltip || help_id)
+    gimp_help_set_help_data (button, tooltip, help_id);
+
+  if (callback)
+    g_signal_connect_object (button, "clicked",
+                             callback,
+                             callback_data, 0);
+
+  if (extended_callback)
+    g_signal_connect_object (button, "extended-clicked",
+                             extended_callback,
+                             callback_data, 0);
+
+  image = gtk_image_new_from_icon_name (icon_name, button_icon_size);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  return button;
+}
+
+GtkWidget *
+gimp_editor_add_icon_box (GimpEditor  *editor,
+                          GType        enum_type,
+                          const gchar *icon_prefix,
+                          GCallback    callback,
+                          gpointer     callback_data)
+{
+  GtkWidget      *hbox;
+  GtkWidget      *first_button;
+  GtkIconSize     button_icon_size;
+  GtkReliefStyle  button_relief;
+  GList          *children;
+  GList          *list;
+
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+  g_return_val_if_fail (g_type_is_a (enum_type, G_TYPE_ENUM), NULL);
+  g_return_val_if_fail (icon_prefix != NULL, NULL);
+
+  button_icon_size = gimp_editor_ensure_button_box (editor, &button_relief);
+
+  hbox = gimp_enum_icon_box_new (enum_type, icon_prefix, button_icon_size,
+                                 callback, callback_data,
+                                 &first_button);
+
+  children = gtk_container_get_children (GTK_CONTAINER (hbox));
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      GtkWidget *button = list->data;
+
+      g_object_ref (button);
+
+      gtk_button_set_relief (GTK_BUTTON (button), button_relief);
+
+      gtk_container_remove (GTK_CONTAINER (hbox), button);
+      gtk_box_pack_start (GTK_BOX (editor->priv->button_box), button,
+                          TRUE, TRUE, 0);
+
+      g_object_unref (button);
+    }
+
+  g_list_free (children);
+
+  g_object_ref_sink (hbox);
+  g_object_unref (hbox);
+
+  return first_button;
+}
+
+
+typedef struct
+{
+  GdkModifierType  mod_mask;
+  GimpAction      *action;
+} ExtendedAction;
+
+static void
+gimp_editor_button_extended_actions_free (GList *actions)
+{
+  GList *list;
+
+  for (list = actions; list; list = list->next)
+    g_slice_free (ExtendedAction, list->data);
+
+  g_list_free (actions);
+}
+
+static void
+gimp_editor_button_extended_clicked (GtkWidget       *button,
+                                     GdkModifierType  mask,
+                                     gpointer         data)
+{
+  GList *extended = g_object_get_data (G_OBJECT (button), "extended-actions");
+  GList *list;
+
+  for (list = extended; list; list = g_list_next (list))
+    {
+      ExtendedAction *ext = list->data;
+
+      if ((ext->mod_mask & mask) == ext->mod_mask &&
+          gimp_action_get_sensitive (ext->action))
+        {
+          gimp_action_activate (ext->action);
+          break;
+        }
+    }
+}
+
+GtkWidget *
+gimp_editor_add_action_button (GimpEditor  *editor,
+                               const gchar *group_name,
+                               const gchar *action_name,
+                               ...)
+{
+  GimpActionGroup *group;
+  GimpAction      *action;
+  GtkWidget       *button;
+  GtkWidget       *old_child;
+  GtkWidget       *image;
+  GtkIconSize      button_icon_size;
+  GtkReliefStyle   button_relief;
+  const gchar     *icon_name;
+  gchar           *tooltip;
+  const gchar     *help_id;
+  GList           *extended = NULL;
+  va_list          args;
+
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+  g_return_val_if_fail (action_name != NULL, NULL);
+  g_return_val_if_fail (editor->priv->ui_manager != NULL, NULL);
+
+  group = gimp_ui_manager_get_action_group (editor->priv->ui_manager,
+                                            group_name);
+
+  g_return_val_if_fail (group != NULL, NULL);
+
+  action = gimp_action_group_get_action (group, action_name);
+
+  g_return_val_if_fail (action != NULL, NULL);
+
+  button_icon_size = gimp_editor_ensure_button_box (editor, &button_relief);
+
+  if (GIMP_IS_TOGGLE_ACTION (action))
+    button = gtk_toggle_button_new ();
+  else
+    button = gimp_highlightable_button_new ();
+
+  gtk_button_set_relief (GTK_BUTTON (button), button_relief);
+
+  icon_name = gimp_action_get_icon_name (action);
+  tooltip   = g_strdup (gimp_action_get_tooltip (action));
+  help_id   = g_object_get_qdata (G_OBJECT (action), GIMP_HELP_ID);
+
+  old_child = gtk_bin_get_child (GTK_BIN (button));
+
+  if (old_child)
+    gtk_widget_destroy (old_child);
+
+  image = gtk_image_new_from_icon_name (icon_name, button_icon_size);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  gtk_activatable_set_related_action ((GtkActivatable *) button,
+                                      (GtkAction *) action);
+  gtk_box_pack_start (GTK_BOX (editor->priv->button_box), button,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  va_start (args, action_name);
+
+  action_name = va_arg (args, const gchar *);
+
+  while (action_name)
+    {
+      GdkModifierType mod_mask;
+
+      mod_mask = va_arg (args, GdkModifierType);
+
+      action = gimp_action_group_get_action (group, action_name);
+
+      if (action && mod_mask)
+        {
+          ExtendedAction *ext = g_slice_new (ExtendedAction);
+
+          ext->mod_mask = mod_mask;
+          ext->action   = action;
+
+          extended = g_list_prepend (extended, ext);
+
+          if (tooltip)
+            {
+              const gchar *ext_tooltip = gimp_action_get_tooltip (action);
+
+              if (ext_tooltip)
+                {
+                  gchar *tmp = g_strconcat (tooltip, "\n<b>",
+                                            gimp_get_mod_string (ext->mod_mask),
+                                            "</b>  ", ext_tooltip, NULL);
+                  g_free (tooltip);
+                  tooltip = tmp;
+                }
+            }
+        }
+
+      action_name = va_arg (args, const gchar *);
+    }
+
+  va_end (args);
+
+  if (extended)
+    {
+      g_object_set_data_full (G_OBJECT (button), "extended-actions", extended,
+                              (GDestroyNotify) gimp_editor_button_extended_actions_free);
+
+      g_signal_connect (button, "extended-clicked",
+                        G_CALLBACK (gimp_editor_button_extended_clicked),
+                        NULL);
+    }
+
+  if (tooltip || help_id)
+    gimp_help_set_help_data_with_markup (button, tooltip, help_id);
+
+  g_free (tooltip);
+
+  return button;
+}
+
+void
+gimp_editor_set_show_name (GimpEditor *editor,
+                           gboolean    show)
+{
+  g_return_if_fail (GIMP_IS_EDITOR (editor));
+
+  g_object_set (editor, "show-name", show, NULL);
+}
+
+void
+gimp_editor_set_name (GimpEditor  *editor,
+                      const gchar *name)
+{
+  g_return_if_fail (GIMP_IS_EDITOR (editor));
+
+  gtk_label_set_text (GTK_LABEL (editor->priv->name_label),
+                      name ? name : _("(None)"));
+}
+
+void
+gimp_editor_set_box_style (GimpEditor *editor,
+                           GtkBox     *box)
+{
+  GimpGuiConfig  *config = NULL;
+  GList          *children;
+  GList          *list;
+  gint            content_spacing;
+  GtkIconSize     button_icon_size;
+  gint            button_spacing;
+  GtkReliefStyle  button_relief;
+
+  g_return_if_fail (GIMP_IS_EDITOR (editor));
+  g_return_if_fail (GTK_IS_BOX (box));
+
+  if (editor->priv->ui_manager)
+    config = GIMP_GUI_CONFIG (editor->priv->ui_manager->gimp->config);
+
+  gimp_editor_get_styling (editor, config,
+                           &content_spacing,
+                           &button_icon_size,
+                           &button_spacing,
+                           &button_relief);
+
+  gtk_box_set_spacing (box, button_spacing);
+
+  children = gtk_container_get_children (GTK_CONTAINER (box));
+  for (list = children; list; list = g_list_next (list))
+    {
+      if (GTK_IS_BUTTON (list->data))
+        {
+          GtkWidget *child;
+
+          gtk_button_set_relief (GTK_BUTTON (list->data), button_relief);
+
+          child = gtk_bin_get_child (GTK_BIN (list->data));
+
+          if (GTK_IS_IMAGE (child))
+            {
+              GtkIconSize  old_size;
+              const gchar *icon_name;
+
+              gtk_image_get_icon_name (GTK_IMAGE (child), &icon_name, &old_size);
+
+              if (button_icon_size != old_size)
+                gtk_image_set_from_icon_name (GTK_IMAGE (child),
+                                              icon_name, button_icon_size);
+            }
+        }
+    }
+
+  g_list_free (children);
+}
+
+GimpUIManager *
+gimp_editor_get_ui_manager (GimpEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+
+  return editor->priv->ui_manager;
+}
+
+GtkBox *
+gimp_editor_get_button_box (GimpEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+
+  return GTK_BOX (editor->priv->button_box);
+}
+
+GimpMenuFactory *
+
+gimp_editor_get_menu_factory (GimpEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+
+  return editor->priv->menu_factory;
+}
+
+gpointer *
+gimp_editor_get_popup_data (GimpEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+
+  return editor->priv->popup_data;
+}
+
+gchar *
+gimp_editor_get_ui_path (GimpEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_EDITOR (editor), NULL);
+
+  return editor->priv->ui_path;
+}
+
+
+/*  private functions  */
+
+static GtkIconSize
+gimp_editor_ensure_button_box (GimpEditor     *editor,
+                               GtkReliefStyle *button_relief)
+{
+  GimpGuiConfig *config = NULL;
+  GtkIconSize    button_icon_size;
+  gint           button_spacing;
+  gint           content_spacing;
+
+  if (editor->priv->ui_manager)
+    {
+      Gimp *gimp;
+
+      gimp = editor->priv->ui_manager->gimp;
+      config = GIMP_GUI_CONFIG (gimp->config);
+    }
+  gimp_editor_get_styling (editor, config,
+                           &content_spacing,
+                           &button_icon_size,
+                           &button_spacing,
+                           button_relief);
+
+  if (! editor->priv->button_box)
+    {
+      editor->priv->button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                              button_spacing);
+      gtk_box_set_homogeneous (GTK_BOX (editor->priv->button_box), TRUE);
+      gtk_box_pack_end (GTK_BOX (editor), editor->priv->button_box, FALSE, FALSE, 0);
+      gtk_box_reorder_child (GTK_BOX (editor), editor->priv->button_box, 0);
+
+      if (editor->priv->show_button_bar)
+        gtk_widget_show (editor->priv->button_box);
+    }
+
+  return button_icon_size;
+}
+
+static void
+gimp_editor_get_styling (GimpEditor     *editor,
+                         GimpGuiConfig  *config,
+                         gint           *content_spacing,
+                         GtkIconSize    *button_icon_size,
+                         gint           *button_spacing,
+                         GtkReliefStyle *button_relief)
+{
+  GimpIconSize size;
+
+  /* Get the theme styling. */
+  gtk_widget_style_get (GTK_WIDGET (editor),
+                        "content-spacing",  content_spacing,
+                        "button-icon-size", button_icon_size,
+                        "button-spacing",   button_spacing,
+                        "button-relief",    button_relief,
+                        NULL);
+
+  /* Check if we should override theme styling. */
+  if (config)
+    {
+      size = gimp_gui_config_detect_icon_size (config);
+      switch (size)
+        {
+        case GIMP_ICON_SIZE_SMALL:
+          *button_spacing  = MIN (*button_spacing / 2, 1);
+          *content_spacing = MIN (*content_spacing / 2, 1);
+        case GIMP_ICON_SIZE_MEDIUM:
+          *button_icon_size = GTK_ICON_SIZE_MENU;
+          break;
+        case GIMP_ICON_SIZE_LARGE:
+          *button_icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
+          *button_spacing  *= 2;
+          *content_spacing *= 2;
+          break;
+        case GIMP_ICON_SIZE_HUGE:
+          *button_icon_size = GTK_ICON_SIZE_DND;
+          *button_spacing  *= 3;
+          *content_spacing *= 3;
+          break;
+        default:
+          /* GIMP_ICON_SIZE_DEFAULT:
+           * let's use the sizes set by the theme. */
+          break;
+        }
+    }
+}
+
+static void
+gimp_editor_config_size_changed (GimpGuiConfig *config,
+                                 GimpEditor    *editor)
+{
+  gint            content_spacing;
+  GtkIconSize     button_icon_size;
+  gint            button_spacing;
+  GtkReliefStyle  button_relief;
+
+  gimp_editor_get_styling (editor, config,
+                           &content_spacing,
+                           &button_icon_size,
+                           &button_spacing,
+                           &button_relief);
+
+  /* Editor styling. */
+  gtk_box_set_spacing (GTK_BOX (editor), content_spacing);
+
+  /* Button box styling. */
+  if (editor->priv->button_box)
+    gimp_editor_set_box_style (editor,
+                               GTK_BOX (editor->priv->button_box));
+}
diff --git a/app/widgets/gimpeditor.h b/app/widgets/gimpeditor.h
new file mode 100644
index 0000000..5ce6571
--- /dev/null
+++ b/app/widgets/gimpeditor.h
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpeditor.h
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_EDITOR_H__
+#define __GIMP_EDITOR_H__
+
+
+#define GIMP_TYPE_EDITOR            (gimp_editor_get_type ())
+#define GIMP_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EDITOR, GimpEditor))
+#define GIMP_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDITOR, GimpEditorClass))
+#define GIMP_IS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_EDITOR))
+#define GIMP_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EDITOR))
+#define GIMP_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_EDITOR, GimpEditorClass))
+
+
+typedef struct _GimpEditorClass    GimpEditorClass;
+typedef struct _GimpEditorPrivate  GimpEditorPrivate;
+
+struct _GimpEditor
+{
+  GtkBox            parent_instance;
+
+  GimpEditorPrivate *priv;
+};
+
+struct _GimpEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_editor_get_type          (void) G_GNUC_CONST;
+
+GtkWidget * gimp_editor_new               (void);
+
+void        gimp_editor_create_menu       (GimpEditor           *editor,
+                                           GimpMenuFactory      *menu_factory,
+                                           const gchar          *menu_identifier,
+                                           const gchar          *ui_path,
+                                           gpointer              popup_data);
+gboolean    gimp_editor_popup_menu        (GimpEditor           *editor,
+                                           GimpMenuPositionFunc  position_func,
+                                           gpointer              position_data);
+
+GtkWidget * gimp_editor_add_button        (GimpEditor           *editor,
+                                           const gchar          *icon_name,
+                                           const gchar          *tooltip,
+                                           const gchar          *help_id,
+                                           GCallback             callback,
+                                           GCallback             extended_callback,
+                                           GObject              *callback_data);
+GtkWidget * gimp_editor_add_icon_box      (GimpEditor           *editor,
+                                           GType                 enum_type,
+                                           const gchar          *icon_prefix,
+                                           GCallback             callback,
+                                           gpointer              callback_data);
+
+GtkWidget * gimp_editor_add_action_button (GimpEditor           *editor,
+                                           const gchar          *group_name,
+                                           const gchar          *action_name,
+                                           ...) G_GNUC_NULL_TERMINATED;
+
+void        gimp_editor_set_show_name       (GimpEditor         *editor,
+                                             gboolean            show);
+void        gimp_editor_set_name            (GimpEditor         *editor,
+                                             const gchar        *name);
+
+void        gimp_editor_set_box_style       (GimpEditor         *editor,
+                                             GtkBox             *box);
+GimpUIManager *
+            gimp_editor_get_ui_manager      (GimpEditor         *editor);
+GtkBox    * gimp_editor_get_button_box      (GimpEditor         *editor);
+GimpMenuFactory *
+            gimp_editor_get_menu_factory    (GimpEditor         *editor);
+gpointer *  gimp_editor_get_popup_data      (GimpEditor         *editor);
+gchar *     gimp_editor_get_ui_path         (GimpEditor         *editor);
+
+#endif  /*  __GIMP_EDITOR_H__  */
diff --git a/app/widgets/gimpenumaction.c b/app/widgets/gimpenumaction.c
new file mode 100644
index 0000000..a66933f
--- /dev/null
+++ b/app/widgets/gimpenumaction.c
@@ -0,0 +1,166 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpenumaction.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimpaction.h"
+#include "gimpaction-history.h"
+#include "gimpenumaction.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VALUE,
+  PROP_VALUE_VARIABLE
+};
+
+
+static void   gimp_enum_action_set_property (GObject      *object,
+                                             guint         prop_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void   gimp_enum_action_get_property (GObject      *object,
+                                             guint         prop_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+static void   gimp_enum_action_activate     (GtkAction    *action);
+
+
+G_DEFINE_TYPE (GimpEnumAction, gimp_enum_action, GIMP_TYPE_ACTION_IMPL)
+
+#define parent_class gimp_enum_action_parent_class
+
+
+static void
+gimp_enum_action_class_init (GimpEnumActionClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkActionClass *action_class = GTK_ACTION_CLASS (klass);
+
+  object_class->set_property = gimp_enum_action_set_property;
+  object_class->get_property = gimp_enum_action_get_property;
+
+  action_class->activate     = gimp_enum_action_activate;
+
+  g_object_class_install_property (object_class, PROP_VALUE,
+                                   g_param_spec_int ("value",
+                                                     NULL, NULL,
+                                                     G_MININT, G_MAXINT, 0,
+                                                     GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_VALUE_VARIABLE,
+                                   g_param_spec_boolean ("value-variable",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_enum_action_init (GimpEnumAction *action)
+{
+}
+
+static void
+gimp_enum_action_get_property (GObject    *object,
+                               guint       prop_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpEnumAction *action = GIMP_ENUM_ACTION (object);
+
+  switch (prop_id)
+    {
+    case PROP_VALUE:
+      g_value_set_int (value, action->value);
+      break;
+    case PROP_VALUE_VARIABLE:
+      g_value_set_boolean (value, action->value_variable);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_enum_action_set_property (GObject      *object,
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpEnumAction *action = GIMP_ENUM_ACTION (object);
+
+  switch (prop_id)
+    {
+    case PROP_VALUE:
+      action->value = g_value_get_int (value);
+      break;
+    case PROP_VALUE_VARIABLE:
+      action->value_variable = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+GimpEnumAction *
+gimp_enum_action_new (const gchar *name,
+                      const gchar *label,
+                      const gchar *tooltip,
+                      const gchar *icon_name,
+                      const gchar *help_id,
+                      gint         value,
+                      gboolean     value_variable)
+{
+  GimpEnumAction *action;
+
+  action = g_object_new (GIMP_TYPE_ENUM_ACTION,
+                         "name",           name,
+                         "label",          label,
+                         "tooltip",        tooltip,
+                         "icon-name",      icon_name,
+                         "value",          value,
+                         "value-variable", value_variable,
+                         NULL);
+
+  gimp_action_set_help_id (GIMP_ACTION (action), help_id);
+
+  return action;
+}
+
+static void
+gimp_enum_action_activate (GtkAction *action)
+{
+  GimpEnumAction *enum_action = GIMP_ENUM_ACTION (action);
+
+  gimp_action_emit_activate (GIMP_ACTION (enum_action),
+                             g_variant_new_int32 (enum_action->value));
+
+  gimp_action_history_action_activated (GIMP_ACTION (action));
+}
diff --git a/app/widgets/gimpenumaction.h b/app/widgets/gimpenumaction.h
new file mode 100644
index 0000000..0d0681a
--- /dev/null
+++ b/app/widgets/gimpenumaction.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpenumaction.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ENUM_ACTION_H__
+#define __GIMP_ENUM_ACTION_H__
+
+
+#include "gimpactionimpl.h"
+
+
+#define GIMP_TYPE_ENUM_ACTION            (gimp_enum_action_get_type ())
+#define GIMP_ENUM_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ENUM_ACTION, GimpEnumAction))
+#define GIMP_ENUM_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ENUM_ACTION, GimpEnumActionClass))
+#define GIMP_IS_ENUM_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ENUM_ACTION))
+#define GIMP_IS_ENUM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ENUM_ACTION))
+#define GIMP_ENUM_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_ENUM_ACTION, GimpEnumActionClass))
+
+
+typedef struct _GimpEnumActionClass GimpEnumActionClass;
+
+struct _GimpEnumAction
+{
+  GimpActionImpl parent_instance;
+
+  gint           value;
+  gboolean       value_variable;
+};
+
+struct _GimpEnumActionClass
+{
+  GimpActionImplClass parent_class;
+};
+
+
+GType            gimp_enum_action_get_type (void) G_GNUC_CONST;
+
+GimpEnumAction * gimp_enum_action_new      (const gchar *name,
+                                            const gchar *label,
+                                            const gchar *tooltip,
+                                            const gchar *icon_name,
+                                            const gchar *help_id,
+                                            gint         value,
+                                            gboolean     value_variable);
+
+
+#endif  /* __GIMP_ENUM_ACTION_H__ */
diff --git a/app/widgets/gimperrorconsole.c b/app/widgets/gimperrorconsole.c
new file mode 100644
index 0000000..14fe8a6
--- /dev/null
+++ b/app/widgets/gimperrorconsole.c
@@ -0,0 +1,326 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimperrorconsole.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * partly based on errorconsole.c
+ * Copyright (C) 1998 Nick Fetchak <nuke@bayside.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+
+#include "gimpdocked.h"
+#include "gimperrorconsole.h"
+#include "gimpmenufactory.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimptextbuffer.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static const gboolean default_highlight[] =
+{
+  [GIMP_MESSAGE_ERROR]   = TRUE,
+  [GIMP_MESSAGE_WARNING] = TRUE,
+  [GIMP_MESSAGE_INFO]    = FALSE
+};
+
+
+static void       gimp_error_console_docked_iface_init (GimpDockedInterface *iface);
+
+static void       gimp_error_console_constructed       (GObject          *object);
+static void       gimp_error_console_dispose           (GObject          *object);
+
+static void       gimp_error_console_unmap             (GtkWidget        *widget);
+
+static gboolean   gimp_error_console_button_press      (GtkWidget        *widget,
+                                                        GdkEventButton   *event,
+                                                        GimpErrorConsole *console);
+
+static void       gimp_error_console_set_aux_info      (GimpDocked       *docked,
+                                                        GList            *aux_info);
+static GList    * gimp_error_console_get_aux_info      (GimpDocked       *docked);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpErrorConsole, gimp_error_console, GIMP_TYPE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_error_console_docked_iface_init))
+
+#define parent_class gimp_error_console_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_error_console_class_init (GimpErrorConsoleClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->constructed = gimp_error_console_constructed;
+  object_class->dispose     = gimp_error_console_dispose;
+
+  widget_class->unmap       = gimp_error_console_unmap;
+}
+
+static void
+gimp_error_console_init (GimpErrorConsole *console)
+{
+  GtkWidget *scrolled_window;
+
+  console->text_buffer = GTK_TEXT_BUFFER (gimp_text_buffer_new ());
+
+  gtk_text_buffer_create_tag (console->text_buffer, "title",
+                              "scale",  PANGO_SCALE_LARGE,
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+  gtk_text_buffer_create_tag (console->text_buffer, "message",
+                              NULL);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (console), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  console->text_view = gtk_text_view_new_with_buffer (console->text_buffer);
+  g_object_unref (console->text_buffer);
+
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (console->text_view), FALSE);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (console->text_view),
+                               GTK_WRAP_WORD);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), console->text_view);
+  gtk_widget_show (console->text_view);
+
+  g_signal_connect (console->text_view, "button-press-event",
+                    G_CALLBACK (gimp_error_console_button_press),
+                    console);
+
+  console->file_dialog = NULL;
+
+  memcpy (console->highlight, default_highlight, sizeof (default_highlight));
+}
+
+static void
+gimp_error_console_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_aux_info = gimp_error_console_set_aux_info;
+  iface->get_aux_info = gimp_error_console_get_aux_info;
+}
+
+static void
+gimp_error_console_constructed (GObject *object)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  console->clear_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (console), "error-console",
+                                   "error-console-clear", NULL);
+
+  console->save_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (console), "error-console",
+                                   "error-console-save-all",
+                                   "error-console-save-selection",
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+}
+
+static void
+gimp_error_console_dispose (GObject *object)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (object);
+
+  if (console->file_dialog)
+    gtk_widget_destroy (console->file_dialog);
+
+  console->gimp->message_handler = GIMP_MESSAGE_BOX;
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_error_console_unmap (GtkWidget *widget)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (widget);
+
+  if (console->file_dialog)
+    gtk_widget_destroy (console->file_dialog);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+GtkWidget *
+gimp_error_console_new (Gimp            *gimp,
+                        GimpMenuFactory *menu_factory)
+{
+  GimpErrorConsole *console;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  console = g_object_new (GIMP_TYPE_ERROR_CONSOLE,
+                          "menu-factory",   menu_factory,
+                          "menu-identifier", "<ErrorConsole>",
+                          "ui-path",        "/error-console-popup",
+                          NULL);
+
+  console->gimp = gimp;
+
+  console->gimp->message_handler = GIMP_ERROR_CONSOLE;
+
+  return GTK_WIDGET (console);
+}
+
+void
+gimp_error_console_add (GimpErrorConsole    *console,
+                        GimpMessageSeverity  severity,
+                        const gchar         *domain,
+                        const gchar         *message)
+{
+  const gchar *desc;
+  GtkTextIter  end;
+  GtkTextMark *end_mark;
+  GdkPixbuf   *pixbuf;
+  gchar       *str;
+
+  g_return_if_fail (GIMP_IS_ERROR_CONSOLE (console));
+  g_return_if_fail (domain != NULL);
+  g_return_if_fail (message != NULL);
+
+  gimp_enum_get_value (GIMP_TYPE_MESSAGE_SEVERITY, severity,
+                       NULL, NULL, &desc, NULL);
+
+  gtk_text_buffer_get_end_iter (console->text_buffer, &end);
+
+  pixbuf = gimp_widget_load_icon (GTK_WIDGET (console),
+                                  gimp_get_message_icon_name (severity), 20);
+  gtk_text_buffer_insert_pixbuf (console->text_buffer, &end, pixbuf);
+  g_object_unref (pixbuf);
+
+  gtk_text_buffer_insert (console->text_buffer, &end, "  ", -1);
+
+  str = g_strdup_printf ("%s %s", domain, desc);
+  gtk_text_buffer_insert_with_tags_by_name (console->text_buffer, &end,
+                                            str, -1,
+                                            "title",
+                                            NULL);
+  g_free (str);
+
+  gtk_text_buffer_insert (console->text_buffer, &end, "\n", -1);
+
+  gtk_text_buffer_insert_with_tags_by_name (console->text_buffer, &end,
+                                            message, -1,
+                                            "message",
+                                            NULL);
+
+  gtk_text_buffer_insert (console->text_buffer, &end, "\n\n", -1);
+
+  end_mark = gtk_text_buffer_create_mark (console->text_buffer,
+                                          NULL, &end, TRUE);
+  gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (console->text_view), end_mark,
+                                FALSE, TRUE, 1.0, 0.0);
+  gtk_text_buffer_delete_mark (console->text_buffer, end_mark);
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_error_console_button_press (GtkWidget        *widget,
+                                 GdkEventButton   *bevent,
+                                 GimpErrorConsole *console)
+{
+  if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+    {
+      return gimp_editor_popup_menu (GIMP_EDITOR (console), NULL, NULL);
+    }
+
+  return FALSE;
+}
+
+static const gchar * const aux_info_highlight[] =
+{
+  [GIMP_MESSAGE_ERROR]   = "highlight-error",
+  [GIMP_MESSAGE_WARNING] = "highlight-warning",
+  [GIMP_MESSAGE_INFO]    = "highlight-info"
+};
+
+static void
+gimp_error_console_set_aux_info (GimpDocked *docked,
+                                 GList      *aux_info)
+{
+  GimpErrorConsole *console = GIMP_ERROR_CONSOLE (docked);
+  GList            *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+      gint                i;
+
+      for (i = 0; i < G_N_ELEMENTS (aux_info_highlight); i++)
+        {
+          if (! strcmp (aux->name, aux_info_highlight[i]))
+            {
+              console->highlight[i] = ! strcmp (aux->value, "yes");
+              break;
+            }
+        }
+    }
+}
+
+static GList *
+gimp_error_console_get_aux_info (GimpDocked *docked)
+{
+  GimpErrorConsole   *console = GIMP_ERROR_CONSOLE (docked);
+  GList              *aux_info;
+  gint                i;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  for (i = 0; i < G_N_ELEMENTS (aux_info_highlight); i++)
+    {
+      GimpSessionInfoAux *aux;
+
+      aux = gimp_session_info_aux_new (aux_info_highlight[i],
+                                       console->highlight[i] ? "yes" : "no");
+
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
diff --git a/app/widgets/gimperrorconsole.h b/app/widgets/gimperrorconsole.h
new file mode 100644
index 0000000..ac450c5
--- /dev/null
+++ b/app/widgets/gimperrorconsole.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimperrorconsole.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ERROR_CONSOLE_H__
+#define __GIMP_ERROR_CONSOLE_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_ERROR_CONSOLE            (gimp_error_console_get_type ())
+#define GIMP_ERROR_CONSOLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ERROR_CONSOLE, GimpErrorConsole))
+#define GIMP_ERROR_CONSOLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ERROR_CONSOLE, GimpErrorConsoleClass))
+#define GIMP_IS_ERROR_CONSOLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ERROR_CONSOLE))
+#define GIMP_IS_ERROR_CONSOLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ERROR_CONSOLE))
+#define GIMP_ERROR_CONSOLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERROR_CONSOLE, GimpErrorConsoleClass))
+
+
+typedef struct _GimpErrorConsoleClass GimpErrorConsoleClass;
+
+struct _GimpErrorConsole
+{
+  GimpEditor     parent_instance;
+
+  Gimp          *gimp;
+
+  GtkTextBuffer *text_buffer;
+  GtkWidget     *text_view;
+
+  GtkWidget     *clear_button;
+  GtkWidget     *save_button;
+
+  GtkWidget     *file_dialog;
+  gboolean       save_selection;
+
+  gboolean       highlight[GIMP_MESSAGE_ERROR + 1];
+};
+
+struct _GimpErrorConsoleClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType       gimp_error_console_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_error_console_new      (Gimp                *gimp,
+                                         GimpMenuFactory     *menu_factory);
+
+void        gimp_error_console_add      (GimpErrorConsole    *console,
+                                         GimpMessageSeverity  severity,
+                                         const gchar         *domain,
+                                         const gchar         *message);
+
+
+#endif  /*  __GIMP_ERROR_CONSOLE_H__  */
diff --git a/app/widgets/gimperrordialog.c b/app/widgets/gimperrordialog.c
new file mode 100644
index 0000000..ab600c1
--- /dev/null
+++ b/app/widgets/gimperrordialog.c
@@ -0,0 +1,204 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimperrordialog.c
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimperrordialog.h"
+#include "gimpmessagebox.h"
+
+#include "gimp-intl.h"
+
+#define GIMP_ERROR_DIALOG_MAX_MESSAGES 3
+
+
+typedef struct
+{
+  GtkWidget *box;
+  gchar     *domain;
+  gchar     *message;
+} GimpErrorDialogMessage;
+
+static void   gimp_error_dialog_finalize        (GObject   *object);
+static void   gimp_error_dialog_response        (GtkDialog *dialog,
+                                                 gint       response_id);
+
+static void   gimp_error_dialog_message_destroy (gpointer   data);
+
+G_DEFINE_TYPE (GimpErrorDialog, gimp_error_dialog, GIMP_TYPE_DIALOG)
+
+#define parent_class gimp_error_dialog_parent_class
+
+
+static void
+gimp_error_dialog_class_init (GimpErrorDialogClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+
+  object_class->finalize = gimp_error_dialog_finalize;
+
+  dialog_class->response = gimp_error_dialog_response;
+}
+
+static void
+gimp_error_dialog_init (GimpErrorDialog *dialog)
+{
+  gtk_window_set_role (GTK_WINDOW (dialog), "gimp-message");
+
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+
+                          _("_OK"), GTK_RESPONSE_CLOSE,
+
+                          NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  dialog->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      dialog->vbox, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->vbox);
+
+  dialog->messages = NULL;
+  dialog->overflow = FALSE;
+}
+
+static void
+gimp_error_dialog_finalize (GObject *object)
+{
+  GimpErrorDialog *dialog = GIMP_ERROR_DIALOG (object);
+
+  g_list_free_full (dialog->messages,
+                    gimp_error_dialog_message_destroy);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_error_dialog_response (GtkDialog *dialog,
+                            gint       response_id)
+{
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+gimp_error_dialog_message_destroy (gpointer data)
+{
+  GimpErrorDialogMessage *item = (GimpErrorDialogMessage *) data;
+
+  g_free (item->domain);
+  g_free (item->message);
+  g_free (item);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_error_dialog_new (const gchar *title)
+{
+  g_return_val_if_fail (title != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_ERROR_DIALOG,
+                       "title", title,
+                       NULL);
+}
+
+void
+gimp_error_dialog_add (GimpErrorDialog *dialog,
+                       const gchar     *icon_name,
+                       const gchar     *domain,
+                       const gchar     *message)
+{
+  GimpErrorDialogMessage *item;
+  gboolean                overflow = FALSE;
+
+  g_return_if_fail (GIMP_IS_ERROR_DIALOG (dialog));
+  g_return_if_fail (domain != NULL);
+  g_return_if_fail (message != NULL);
+
+  if (dialog->messages)
+    {
+      GList *iter = dialog->messages;
+
+      for (; iter; iter = iter->next)
+        {
+          item = iter->data;
+          if (strcmp (item->domain, domain)   == 0 &&
+              strcmp (item->message, message) == 0)
+            {
+              if (gimp_message_box_repeat (GIMP_MESSAGE_BOX (item->box)))
+                return;
+            }
+        }
+    }
+
+  if (g_list_length (dialog->messages) >= GIMP_ERROR_DIALOG_MAX_MESSAGES)
+    {
+      g_printerr ("%s: %s\n\n", domain, message);
+
+      overflow  = TRUE;
+      icon_name = GIMP_ICON_WILBER_EEK;
+      domain    = _("Too many error messages!");
+      message   = _("Messages are redirected to stderr.");
+
+      if (dialog->overflow)
+        {
+          /* We were already overflowing. */
+          return;
+        }
+      dialog->overflow = TRUE;
+    }
+
+  item = g_new0 (GimpErrorDialogMessage, 1);
+  item->box = g_object_new (GIMP_TYPE_MESSAGE_BOX,
+                            "icon-name", icon_name,
+                            NULL);
+  item->domain  = g_strdup (domain);
+  item->message = g_strdup (message);
+
+  if (overflow)
+    gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (item->box),
+                                       "%s", domain);
+  else
+    gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (item->box),
+                                       /* %s is a message domain,
+                                        * like "GIMP Message" or
+                                        * "PNG Message"
+                                        */
+                                       _("%s Message"), domain);
+
+  gimp_message_box_set_text (GIMP_MESSAGE_BOX (item->box), "%s", message);
+
+  gtk_box_pack_start (GTK_BOX (dialog->vbox), item->box, TRUE, TRUE, 0);
+  gtk_widget_show (item->box);
+
+  dialog->messages = g_list_prepend (dialog->messages, item);
+}
diff --git a/app/widgets/gimperrordialog.h b/app/widgets/gimperrordialog.h
new file mode 100644
index 0000000..5c8d1e5
--- /dev/null
+++ b/app/widgets/gimperrordialog.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimperrordialog.c
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ERROR_DIALOG_H__
+#define __GIMP_ERROR_DIALOG_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_ERROR_DIALOG            (gimp_error_dialog_get_type ())
+#define GIMP_ERROR_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ERROR_DIALOG, GimpErrorDialog))
+#define GIMP_ERROR_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ERROR_DIALOG, GimpErrorDialogClass))
+#define GIMP_IS_ERROR_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ERROR_DIALOG))
+#define GIMP_IS_ERROR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ERROR_DIALOG))
+#define GIMP_ERROR_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERROR_DIALOG, GimpErrorDialogClass))
+
+
+typedef struct _GimpErrorDialogClass  GimpErrorDialogClass;
+
+struct _GimpErrorDialog
+{
+  GimpDialog       parent_instance;
+
+  GtkWidget       *vbox;
+
+  GList           *messages;
+  gboolean         overflow;
+};
+
+struct _GimpErrorDialogClass
+{
+  GimpDialogClass  parent_class;
+};
+
+
+GType       gimp_error_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_error_dialog_new      (const gchar     *title);
+void        gimp_error_dialog_add      (GimpErrorDialog *dialog,
+                                        const gchar     *icon_name,
+                                        const gchar     *domain,
+                                        const gchar     *message);
+
+
+
+G_END_DECLS
+
+#endif /* __GIMP_ERROR_DIALOG_H__ */
diff --git a/app/widgets/gimpexportdialog.c b/app/widgets/gimpexportdialog.c
new file mode 100644
index 0000000..eebf98e
--- /dev/null
+++ b/app/widgets/gimpexportdialog.c
@@ -0,0 +1,221 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpexportdialog.c
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpimage.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "file/gimp-file.h"
+
+#include "gimpexportdialog.h"
+#include "gimphelp-ids.h"
+
+#include "gimp-intl.h"
+
+
+G_DEFINE_TYPE (GimpExportDialog, gimp_export_dialog,
+               GIMP_TYPE_FILE_DIALOG)
+
+#define parent_class gimp_export_dialog_parent_class
+
+
+static void
+gimp_export_dialog_class_init (GimpExportDialogClass *klass)
+{
+}
+
+static void
+gimp_export_dialog_init (GimpExportDialog *dialog)
+{
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_export_dialog_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_EXPORT_DIALOG,
+                       "gimp",                  gimp,
+                       "title",                 _("Export Image"),
+                       "role",                  "gimp-file-export",
+                       "help-id",               GIMP_HELP_FILE_EXPORT_AS,
+                       "ok-button-label",       _("_Export"),
+
+                       "automatic-label",       _("By Extension"),
+                       "automatic-help-id",     GIMP_HELP_FILE_SAVE_BY_EXTENSION,
+
+                       "action",                GTK_FILE_CHOOSER_ACTION_SAVE,
+                       "file-procs",            GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                       "file-procs-all-images", GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                       "file-filter-label",     _("All export images"),
+                       NULL);
+}
+
+void
+gimp_export_dialog_set_image (GimpExportDialog *dialog,
+                              GimpImage        *image)
+{
+  GimpFileDialog *file_dialog;
+  GFile          *dir_file  = NULL;
+  GFile          *name_file = NULL;
+  GFile          *ext_file  = NULL;
+  gchar          *basename;
+
+  g_return_if_fail (GIMP_IS_EXPORT_DIALOG (dialog));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  file_dialog = GIMP_FILE_DIALOG (dialog);
+
+  file_dialog->image = image;
+
+  gimp_file_dialog_set_file_proc (file_dialog, NULL);
+
+  /* Priority of default paths for Export:
+   *
+   *   1. Last Export path
+   *   2. Path of import source
+   *   3. Path of XCF source
+   *   4. Last path of any save to XCF
+   *   5. Last Export path of any document
+   *   6. The default path (usually the OS 'Documents' path)
+   */
+
+  dir_file = gimp_image_get_exported_file (image);
+
+  if (! dir_file)
+    dir_file = g_object_get_data (G_OBJECT (image),
+                                  "gimp-image-source-file");
+
+  if (! dir_file)
+    dir_file = gimp_image_get_imported_file (image);
+
+  if (! dir_file)
+    dir_file = gimp_image_get_file (image);
+
+  if (! dir_file)
+    dir_file = g_object_get_data (G_OBJECT (file_dialog->gimp),
+                                  GIMP_FILE_SAVE_LAST_FILE_KEY);
+
+  if (! dir_file)
+    dir_file = g_object_get_data (G_OBJECT (file_dialog->gimp),
+                                  GIMP_FILE_EXPORT_LAST_FILE_KEY);
+
+  if (! dir_file)
+    dir_file = gimp_file_dialog_get_default_folder (file_dialog);
+
+  /* Priority of default basenames for Export:
+   *
+   *   1. Last Export name
+   *   3. Save URI
+   *   2. Source file name
+   *   3. 'Untitled'
+   */
+
+  name_file = gimp_image_get_exported_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_imported_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_untitled_file (image);
+
+
+  /* Priority of default type/extension for Export:
+   *
+   *   1. Type of last Export
+   *   2. Type of the image Import
+   *   3. Type of latest Export of any document
+   *   4. Default file type set in Preferences
+   */
+
+  ext_file = gimp_image_get_exported_file (image);
+
+  if (! ext_file)
+    ext_file = gimp_image_get_imported_file (image);
+
+  if (! ext_file)
+    ext_file = g_object_get_data (G_OBJECT (file_dialog->gimp),
+                                  GIMP_FILE_EXPORT_LAST_FILE_KEY);
+
+  if (ext_file)
+    {
+      g_object_ref (ext_file);
+    }
+  else
+    {
+      const gchar *extension;
+      gchar       *uri;
+
+      gimp_enum_get_value (GIMP_TYPE_EXPORT_FILE_TYPE,
+                           image->gimp->config->export_file_type,
+                           NULL, &extension, NULL, NULL);
+
+      uri = g_strconcat ("file:///we/only/care/about/extension.",
+                         extension, NULL);
+      ext_file = g_file_new_for_uri (uri);
+      g_free (uri);
+    }
+
+  if (ext_file)
+    {
+      GFile *tmp_file = gimp_file_with_new_extension (name_file, ext_file);
+      basename = g_path_get_basename (gimp_file_get_utf8_name (tmp_file));
+      g_object_unref (tmp_file);
+      g_object_unref (ext_file);
+    }
+  else
+    {
+      basename = g_path_get_basename (gimp_file_get_utf8_name (name_file));
+    }
+
+  if (g_file_query_file_type (dir_file, G_FILE_QUERY_INFO_NONE, NULL) ==
+      G_FILE_TYPE_DIRECTORY)
+    {
+      gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                                dir_file, NULL);
+    }
+  else
+    {
+      GFile *parent_file = g_file_get_parent (dir_file);
+      gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                                parent_file, NULL);
+      g_object_unref (parent_file);
+    }
+
+  gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);
+}
diff --git a/app/widgets/gimpexportdialog.h b/app/widgets/gimpexportdialog.h
new file mode 100644
index 0000000..7e1c368
--- /dev/null
+++ b/app/widgets/gimpexportdialog.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpexportdialog.h
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_EXPORT_DIALOG_H__
+#define __GIMP_EXPORT_DIALOG_H__
+
+#include "gimpfiledialog.h"
+
+G_BEGIN_DECLS
+
+#define GIMP_TYPE_EXPORT_DIALOG            (gimp_export_dialog_get_type ())
+#define GIMP_EXPORT_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EXPORT_DIALOG, GimpExportDialog))
+#define GIMP_EXPORT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EXPORT_DIALOG, GimpExportDialogClass))
+#define GIMP_IS_EXPORT_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_EXPORT_DIALOG))
+#define GIMP_IS_EXPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EXPORT_DIALOG))
+#define GIMP_EXPORT_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_EXPORT_DIALOG, GimpExportDialogClass))
+
+
+typedef struct _GimpExportDialogClass GimpExportDialogClass;
+
+struct _GimpExportDialog
+{
+  GimpFileDialog       parent_instance;
+};
+
+struct _GimpExportDialogClass
+{
+  GimpFileDialogClass  parent_class;
+};
+
+
+GType       gimp_export_dialog_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_export_dialog_new       (Gimp             *gimp);
+
+void        gimp_export_dialog_set_image (GimpExportDialog *dialog,
+                                          GimpImage        *image);
+
+G_END_DECLS
+
+#endif /* __GIMP_EXPORT_DIALOG_H__ */
diff --git a/app/widgets/gimpfgbgeditor.c b/app/widgets/gimpfgbgeditor.c
new file mode 100644
index 0000000..96d2156
--- /dev/null
+++ b/app/widgets/gimpfgbgeditor.c
@@ -0,0 +1,824 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfgbgeditor.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+#include "core/gimpmarshal.h"
+#include "core/gimppalette.h"
+
+#include "gimpdnd.h"
+#include "gimpfgbgeditor.h"
+#include "gimpwidgets-utils.h"
+
+#define CHANNEL_EPSILON 1e-3
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_ACTIVE_COLOR
+};
+
+enum
+{
+  COLOR_CLICKED,
+  TOOLTIP,
+  LAST_SIGNAL
+};
+
+
+static void     gimp_fg_bg_editor_dispose           (GObject          *object);
+static void     gimp_fg_bg_editor_set_property      (GObject          *object,
+                                                     guint             property_id,
+                                                     const GValue     *value,
+                                                     GParamSpec       *pspec);
+static void     gimp_fg_bg_editor_get_property      (GObject          *object,
+                                                     guint             property_id,
+                                                     GValue           *value,
+                                                     GParamSpec       *pspec);
+
+static void     gimp_fg_bg_editor_style_set         (GtkWidget        *widget,
+                                                     GtkStyle         *prev_style);
+static gboolean gimp_fg_bg_editor_expose            (GtkWidget        *widget,
+                                                     GdkEventExpose   *eevent);
+static gboolean gimp_fg_bg_editor_button_press      (GtkWidget        *widget,
+                                                     GdkEventButton   *bevent);
+static gboolean gimp_fg_bg_editor_button_release    (GtkWidget        *widget,
+                                                     GdkEventButton   *bevent);
+static gboolean gimp_fg_bg_editor_drag_motion       (GtkWidget        *widget,
+                                                     GdkDragContext   *context,
+                                                     gint              x,
+                                                     gint              y,
+                                                     guint             time);
+static gboolean gimp_fg_bg_editor_query_tooltip     (GtkWidget        *widget,
+                                                     gint              x,
+                                                     gint              y,
+                                                     gboolean          keyboard_mode,
+                                                     GtkTooltip       *tooltip);
+
+static void     gimp_fg_bg_editor_drag_color        (GtkWidget        *widget,
+                                                     GimpRGB          *color,
+                                                     gpointer          data);
+static void     gimp_fg_bg_editor_drop_color        (GtkWidget        *widget,
+                                                     gint              x,
+                                                     gint              y,
+                                                     const GimpRGB    *color,
+                                                     gpointer          data);
+
+static void     gimp_fg_bg_editor_create_transform  (GimpFgBgEditor   *editor);
+static void     gimp_fg_bg_editor_destroy_transform (GimpFgBgEditor   *editor);
+
+static void     gimp_fg_bg_editor_image_changed     (GimpFgBgEditor   *editor,
+                                                     GimpImage        *image);
+
+static void     gimp_fg_bg_editor_draw_color_frame  (GimpFgBgEditor   *editor,
+                                                     cairo_t          *cr,
+                                                     const GimpRGB    *color,
+                                                     gint              x,
+                                                     gint              y,
+                                                     gint              width,
+                                                     gint              height,
+                                                     gint              corner_dx,
+                                                     gint              corner_dy);
+
+G_DEFINE_TYPE (GimpFgBgEditor, gimp_fg_bg_editor, GTK_TYPE_EVENT_BOX)
+
+#define parent_class gimp_fg_bg_editor_parent_class
+
+static guint  editor_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_fg_bg_editor_class_init (GimpFgBgEditorClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  editor_signals[COLOR_CLICKED] =
+    g_signal_new ("color-clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpFgBgEditorClass, color_clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_ACTIVE_COLOR);
+
+  editor_signals[TOOLTIP] =
+    g_signal_new ("tooltip",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpFgBgEditorClass, tooltip),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_OBJECT,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_INT,
+                  GTK_TYPE_TOOLTIP);
+
+  object_class->dispose              = gimp_fg_bg_editor_dispose;
+  object_class->set_property         = gimp_fg_bg_editor_set_property;
+  object_class->get_property         = gimp_fg_bg_editor_get_property;
+
+  widget_class->style_set            = gimp_fg_bg_editor_style_set;
+  widget_class->expose_event         = gimp_fg_bg_editor_expose;
+  widget_class->button_press_event   = gimp_fg_bg_editor_button_press;
+  widget_class->button_release_event = gimp_fg_bg_editor_button_release;
+  widget_class->drag_motion          = gimp_fg_bg_editor_drag_motion;
+  widget_class->query_tooltip        = gimp_fg_bg_editor_query_tooltip;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_ACTIVE_COLOR,
+                                   g_param_spec_enum ("active-color",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_ACTIVE_COLOR,
+                                                      GIMP_ACTIVE_COLOR_FOREGROUND,
+                                                      GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_fg_bg_editor_init (GimpFgBgEditor *editor)
+{
+  editor->active_color = GIMP_ACTIVE_COLOR_FOREGROUND;
+
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (editor), FALSE);
+
+  gtk_widget_add_events (GTK_WIDGET (editor),
+                         GDK_BUTTON_PRESS_MASK |
+                         GDK_BUTTON_RELEASE_MASK);
+
+  gimp_dnd_color_source_add (GTK_WIDGET (editor),
+                             gimp_fg_bg_editor_drag_color, NULL);
+  gimp_dnd_color_dest_add (GTK_WIDGET (editor),
+                           gimp_fg_bg_editor_drop_color, NULL);
+
+  gimp_widget_track_monitor (GTK_WIDGET (editor),
+                             G_CALLBACK (gimp_fg_bg_editor_destroy_transform),
+                             NULL);
+}
+
+static void
+gimp_fg_bg_editor_dispose (GObject *object)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (object);
+
+  if (editor->context)
+    gimp_fg_bg_editor_set_context (editor, NULL);
+
+  g_clear_object (&editor->default_icon);
+  g_clear_object (&editor->swap_icon);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_fg_bg_editor_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      gimp_fg_bg_editor_set_context (editor, g_value_get_object (value));
+      break;
+    case PROP_ACTIVE_COLOR:
+      gimp_fg_bg_editor_set_active (editor, g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_fg_bg_editor_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, editor->context);
+      break;
+    case PROP_ACTIVE_COLOR:
+      g_value_set_enum (value, editor->active_color);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_fg_bg_editor_style_set (GtkWidget *widget,
+                             GtkStyle  *prev_style)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  g_clear_object (&editor->default_icon);
+  g_clear_object (&editor->swap_icon);
+}
+
+static gboolean
+gimp_fg_bg_editor_expose (GtkWidget      *widget,
+                          GdkEventExpose *eevent)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+  cairo_t        *cr;
+  GtkAllocation   allocation;
+  gint            width, height;
+  gint            default_w, default_h;
+  gint            swap_w, swap_h;
+  gint            rect_w, rect_h;
+  GimpRGB         color;
+
+  if (! gtk_widget_is_drawable (widget))
+    return FALSE;
+
+  cr = gdk_cairo_create (eevent->window);
+  gdk_cairo_region (cr, eevent->region);
+  cairo_clip (cr);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  width  = allocation.width;
+  height = allocation.height;
+
+  cairo_translate (cr, allocation.x, allocation.y);
+
+  /*  draw the default colors pixbuf  */
+  if (! editor->default_icon)
+    editor->default_icon = gimp_widget_load_icon (widget,
+                                                  GIMP_ICON_COLORS_DEFAULT, 12);
+
+  default_w = gdk_pixbuf_get_width  (editor->default_icon);
+  default_h = gdk_pixbuf_get_height (editor->default_icon);
+
+  if (default_w < width / 2 && default_h < height / 2)
+    {
+      gdk_cairo_set_source_pixbuf (cr, editor->default_icon,
+                                   0, height - default_h);
+      cairo_paint (cr);
+    }
+  else
+    {
+      default_w = default_h = 0;
+    }
+
+  /*  draw the swap colors pixbuf  */
+  if (! editor->swap_icon)
+    editor->swap_icon = gimp_widget_load_icon (widget,
+                                               GIMP_ICON_COLORS_SWAP, 12);
+
+  swap_w = gdk_pixbuf_get_width  (editor->swap_icon);
+  swap_h = gdk_pixbuf_get_height (editor->swap_icon);
+
+  if (swap_w < width / 2 && swap_h < height / 2)
+    {
+      gdk_cairo_set_source_pixbuf (cr, editor->swap_icon,
+                                   width - swap_w, 0);
+      cairo_paint (cr);
+    }
+  else
+    {
+      swap_w = swap_h = 0;
+    }
+
+  rect_h = height - MAX (default_h, swap_h) - 2;
+  rect_w = width  - MAX (default_w, swap_w) - 4;
+
+  if (rect_h > (height * 3 / 4))
+    rect_w = MAX (rect_w - (rect_h - ((height * 3 / 4))),
+                  width * 2 / 3);
+
+  editor->rect_width  = rect_w;
+  editor->rect_height = rect_h;
+
+  if (! editor->transform)
+    gimp_fg_bg_editor_create_transform (editor);
+
+  if (editor->context)
+    {
+      /*  draw the background frame  */
+      gimp_context_get_background (editor->context, &color);
+      gimp_fg_bg_editor_draw_color_frame (editor, cr, &color,
+                                          width - rect_w, height - rect_h,
+                                          rect_w,         rect_h,
+                                          +1,             +1);
+
+
+      /*  draw the foreground frame  */
+      gimp_context_get_foreground (editor->context, &color);
+      gimp_fg_bg_editor_draw_color_frame (editor, cr, &color,
+                                          0,              0,
+                                          rect_w,         rect_h,
+                                          -1,             -1);
+    }
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+static GimpFgBgTarget
+gimp_fg_bg_editor_target (GimpFgBgEditor *editor,
+                          gint            x,
+                          gint            y)
+{
+  GtkAllocation allocation;
+  gint          width;
+  gint          height;
+  gint          rect_w = editor->rect_width;
+  gint          rect_h = editor->rect_height;
+
+  gtk_widget_get_allocation (GTK_WIDGET (editor), &allocation);
+
+  width  = allocation.width;
+  height = allocation.height;
+
+  if (x > 0 && x < rect_w && y > 0 && y < rect_h)
+    {
+      return GIMP_FG_BG_TARGET_FOREGROUND;
+    }
+  else if (x > (width - rect_w)  && x < width  &&
+           y > (height - rect_h) && y < height)
+    {
+      return GIMP_FG_BG_TARGET_BACKGROUND;
+    }
+  else if (x > 0      && x < (width - rect_w) &&
+           y > rect_h && y < height)
+    {
+      return GIMP_FG_BG_TARGET_DEFAULT;
+    }
+  else if (x > rect_w && x < width &&
+           y > 0      && y < (height - rect_h))
+    {
+      return GIMP_FG_BG_TARGET_SWAP;
+    }
+
+  return GIMP_FG_BG_TARGET_INVALID;
+}
+
+static gboolean
+gimp_fg_bg_editor_button_press (GtkWidget      *widget,
+                                GdkEventButton *bevent)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+
+  if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS)
+    {
+      GimpFgBgTarget target = gimp_fg_bg_editor_target (editor,
+                                                        bevent->x, bevent->y);
+
+      editor->click_target = GIMP_FG_BG_TARGET_INVALID;
+
+      switch (target)
+        {
+        case GIMP_FG_BG_TARGET_FOREGROUND:
+          if (editor->active_color != GIMP_ACTIVE_COLOR_FOREGROUND)
+            gimp_fg_bg_editor_set_active (editor,
+                                          GIMP_ACTIVE_COLOR_FOREGROUND);
+          editor->click_target = GIMP_FG_BG_TARGET_FOREGROUND;
+          break;
+
+        case GIMP_FG_BG_TARGET_BACKGROUND:
+          if (editor->active_color != GIMP_ACTIVE_COLOR_BACKGROUND)
+            gimp_fg_bg_editor_set_active (editor,
+                                          GIMP_ACTIVE_COLOR_BACKGROUND);
+          editor->click_target = GIMP_FG_BG_TARGET_BACKGROUND;
+          break;
+
+        case GIMP_FG_BG_TARGET_SWAP:
+          if (editor->context)
+            gimp_context_swap_colors (editor->context);
+          break;
+
+        case GIMP_FG_BG_TARGET_DEFAULT:
+          if (editor->context)
+            gimp_context_set_default_colors (editor->context);
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_fg_bg_editor_button_release (GtkWidget      *widget,
+                                  GdkEventButton *bevent)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+
+  if (bevent->button == 1)
+    {
+      GimpFgBgTarget target = gimp_fg_bg_editor_target (editor,
+                                                        bevent->x, bevent->y);
+
+      if (target == editor->click_target)
+        {
+          switch (target)
+            {
+            case GIMP_FG_BG_TARGET_FOREGROUND:
+              g_signal_emit (editor, editor_signals[COLOR_CLICKED], 0,
+                             GIMP_ACTIVE_COLOR_FOREGROUND);
+              break;
+
+            case GIMP_FG_BG_TARGET_BACKGROUND:
+              g_signal_emit (editor, editor_signals[COLOR_CLICKED], 0,
+                             GIMP_ACTIVE_COLOR_BACKGROUND);
+              break;
+
+            default:
+              break;
+            }
+        }
+
+      editor->click_target = GIMP_FG_BG_TARGET_INVALID;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_fg_bg_editor_drag_motion (GtkWidget      *widget,
+                               GdkDragContext *context,
+                               gint            x,
+                               gint            y,
+                               guint           time)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+  GimpFgBgTarget  target = gimp_fg_bg_editor_target (editor, x, y);
+
+  if (target == GIMP_FG_BG_TARGET_FOREGROUND ||
+      target == GIMP_FG_BG_TARGET_BACKGROUND)
+    {
+      gdk_drag_status (context, GDK_ACTION_COPY, time);
+
+      return TRUE;
+    }
+
+  gdk_drag_status (context, 0, time);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_fg_bg_editor_query_tooltip (GtkWidget  *widget,
+                                 gint        x,
+                                 gint        y,
+                                 gboolean    keyboard_mode,
+                                 GtkTooltip *tooltip)
+{
+  if (! keyboard_mode)
+    {
+      GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+      GimpFgBgTarget  target = gimp_fg_bg_editor_target (editor, x, y);
+
+      if (target != GIMP_FG_BG_TARGET_INVALID)
+        {
+          g_signal_emit (widget, editor_signals[TOOLTIP], 0,
+                         target, tooltip);
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_fg_bg_editor_new (GimpContext *context)
+{
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_FG_BG_EDITOR,
+                       "context", context,
+                       NULL);
+}
+
+void
+gimp_fg_bg_editor_set_context (GimpFgBgEditor *editor,
+                               GimpContext    *context)
+{
+  g_return_if_fail (GIMP_IS_FG_BG_EDITOR (editor));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  if (context != editor->context)
+    {
+      if (editor->context)
+        {
+          g_signal_handlers_disconnect_by_func (editor->context,
+                                                gtk_widget_queue_draw,
+                                                editor);
+          g_signal_handlers_disconnect_by_func (editor->context,
+                                                G_CALLBACK (gimp_fg_bg_editor_image_changed),
+                                                editor);
+          g_object_unref (editor->context);
+
+          g_signal_handlers_disconnect_by_func (editor->color_config,
+                                                gimp_fg_bg_editor_destroy_transform,
+                                                editor);
+          g_clear_object (&editor->color_config);
+        }
+
+      editor->context = context;
+
+      if (context)
+        {
+          g_object_ref (context);
+
+          g_signal_connect_swapped (context, "foreground-changed",
+                                    G_CALLBACK (gtk_widget_queue_draw),
+                                    editor);
+          g_signal_connect_swapped (context, "background-changed",
+                                    G_CALLBACK (gtk_widget_queue_draw),
+                                    editor);
+          g_signal_connect_swapped (context, "image-changed",
+                                    G_CALLBACK (gimp_fg_bg_editor_image_changed),
+                                    editor);
+
+          editor->color_config = g_object_ref (context->gimp->config->color_management);
+
+          g_signal_connect_swapped (editor->color_config, "notify",
+                                    G_CALLBACK (gimp_fg_bg_editor_destroy_transform),
+                                    editor);
+        }
+
+      gimp_fg_bg_editor_destroy_transform (editor);
+
+      g_object_notify (G_OBJECT (editor), "context");
+    }
+}
+
+void
+gimp_fg_bg_editor_set_active (GimpFgBgEditor  *editor,
+                              GimpActiveColor  active)
+{
+  g_return_if_fail (GIMP_IS_FG_BG_EDITOR (editor));
+
+  editor->active_color = active;
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+  g_object_notify (G_OBJECT (editor), "active-color");
+}
+
+
+/*  private functions  */
+
+static void
+gimp_fg_bg_editor_drag_color (GtkWidget *widget,
+                              GimpRGB   *color,
+                              gpointer   data)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+
+  if (editor->context)
+    {
+      switch (editor->active_color)
+        {
+        case GIMP_ACTIVE_COLOR_FOREGROUND:
+          gimp_context_get_foreground (editor->context, color);
+          break;
+
+        case GIMP_ACTIVE_COLOR_BACKGROUND:
+          gimp_context_get_background (editor->context, color);
+          break;
+        }
+    }
+}
+
+static void
+gimp_fg_bg_editor_drop_color (GtkWidget     *widget,
+                              gint           x,
+                              gint           y,
+                              const GimpRGB *color,
+                              gpointer       data)
+{
+  GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+
+  if (editor->context)
+    {
+      switch (gimp_fg_bg_editor_target (editor, x, y))
+        {
+        case GIMP_FG_BG_TARGET_FOREGROUND:
+          gimp_context_set_foreground (editor->context, color);
+          break;
+
+        case GIMP_FG_BG_TARGET_BACKGROUND:
+          gimp_context_set_background (editor->context, color);
+          break;
+
+        default:
+          break;
+        }
+    }
+}
+
+static void
+gimp_fg_bg_editor_create_transform (GimpFgBgEditor *editor)
+{
+  if (editor->color_config)
+    {
+      static GimpColorProfile *profile = NULL;
+
+      if (G_UNLIKELY (! profile))
+        profile = gimp_color_profile_new_rgb_srgb ();
+
+      editor->transform =
+        gimp_widget_get_color_transform (GTK_WIDGET (editor),
+                                         editor->color_config,
+                                         profile,
+                                         babl_format ("R'G'B'A double"),
+                                         babl_format ("R'G'B'A double"));
+    }
+}
+
+static void
+gimp_fg_bg_editor_destroy_transform (GimpFgBgEditor *editor)
+{
+  g_clear_object (&editor->transform);
+
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+}
+
+static void
+gimp_fg_bg_editor_image_changed (GimpFgBgEditor *editor,
+                                 GimpImage      *image)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+
+  if (editor->active_image)
+    {
+      g_signal_handlers_disconnect_by_func (editor->active_image,
+                                            G_CALLBACK (gtk_widget_queue_draw),
+                                            editor);
+      if (gimp_image_get_base_type (editor->active_image) == GIMP_INDEXED)
+        {
+          GimpPalette *palette;
+
+          palette = gimp_image_get_colormap_palette (editor->active_image);
+          g_signal_handlers_disconnect_by_func (palette,
+                                                G_CALLBACK (gtk_widget_queue_draw),
+                                                editor);
+        }
+    }
+  editor->active_image = image;
+  if (image)
+    {
+      g_signal_connect_swapped (image, "notify::base-type",
+                                G_CALLBACK (gtk_widget_queue_draw),
+                                editor);
+      g_signal_connect_swapped (image, "colormap-changed",
+                                G_CALLBACK (gtk_widget_queue_draw),
+                                editor);
+
+      if (gimp_image_get_base_type (image) == GIMP_INDEXED)
+        {
+          GimpPalette *palette;
+
+          palette = gimp_image_get_colormap_palette (editor->active_image);
+          g_signal_connect_swapped (palette, "dirty",
+                                    G_CALLBACK (gtk_widget_queue_draw),
+                                    editor);
+        }
+    }
+}
+
+static void
+gimp_fg_bg_editor_draw_color_frame (GimpFgBgEditor *editor,
+                                    cairo_t        *cr,
+                                    const GimpRGB  *color,
+                                    gint            x,
+                                    gint            y,
+                                    gint            width,
+                                    gint            height,
+                                    gint            corner_dx,
+                                    gint            corner_dy)
+{
+  GimpPalette       *colormap_palette = NULL;
+  GimpImageBaseType  base_type        = GIMP_RGB;
+  GimpRGB            transformed_color;
+
+  if (editor->active_image)
+    {
+      base_type = gimp_image_get_base_type (editor->active_image);
+
+      if (base_type == GIMP_INDEXED)
+        {
+          colormap_palette = gimp_image_get_colormap_palette (
+            editor->active_image);
+        }
+    }
+
+  if (editor->transform)
+    {
+      gimp_color_transform_process_pixels (editor->transform,
+                                           babl_format ("R'G'B'A double"),
+                                           color,
+                                           babl_format ("R'G'B'A double"),
+                                           &transformed_color,
+                                           1);
+    }
+  else
+    {
+      transformed_color = *color;
+    }
+
+  cairo_save (cr);
+
+  gimp_cairo_set_source_rgb (cr, &transformed_color);
+
+  cairo_rectangle (cr, x, y, width, height);
+  cairo_fill (cr);
+
+  if (editor->color_config &&
+      /* Common out-of-gamut case */
+      ((color->r < 0.0 || color->r > 1.0 ||
+        color->g < 0.0 || color->g > 1.0 ||
+        color->b < 0.0 || color->b > 1.0) ||
+       /* Indexed images */
+       (colormap_palette &&
+        ! gimp_palette_find_entry (colormap_palette, color, NULL)) ||
+       /* Grayscale images */
+       (base_type == GIMP_GRAY &&
+        (ABS (color->r - color->g) > CHANNEL_EPSILON ||
+         ABS (color->r - color->b) > CHANNEL_EPSILON ||
+         ABS (color->g - color->b) > CHANNEL_EPSILON))))
+    {
+      gint corner_x = x + 0.5 * (1.0 + corner_dx) * width;
+      gint corner_y = y + 0.5 * (1.0 + corner_dy) * height;
+      gint side     = MIN (width, height) * 2 / 3;
+
+      cairo_move_to (cr, corner_x, corner_y);
+      cairo_line_to (cr, corner_x + side * corner_dx, corner_y);
+      cairo_line_to (cr, corner_x, corner_y + side * corner_dy);
+      cairo_close_path (cr);
+
+      gimp_cairo_set_source_rgb (cr,
+                                 &editor->color_config->out_of_gamut_color);
+      cairo_fill (cr);
+    }
+
+  cairo_set_line_width (cr, 1.0);
+
+  cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+  cairo_rectangle (cr, x + 0.5, y + 0.5, width - 1.0, height - 1.0);
+  cairo_stroke (cr);
+
+  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+  cairo_rectangle (cr, x + 1.5, y + 1.5, width - 3.0, height - 3.0);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+}
diff --git a/app/widgets/gimpfgbgeditor.h b/app/widgets/gimpfgbgeditor.h
new file mode 100644
index 0000000..43113d5
--- /dev/null
+++ b/app/widgets/gimpfgbgeditor.h
@@ -0,0 +1,90 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfgbgeditor.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FG_BG_EDITOR_H__
+#define __GIMP_FG_BG_EDITOR_H__
+
+
+typedef enum
+{
+  GIMP_FG_BG_TARGET_INVALID,
+  GIMP_FG_BG_TARGET_FOREGROUND,
+  GIMP_FG_BG_TARGET_BACKGROUND,
+  GIMP_FG_BG_TARGET_SWAP,
+  GIMP_FG_BG_TARGET_DEFAULT
+} GimpFgBgTarget;
+
+
+#define GIMP_TYPE_FG_BG_EDITOR            (gimp_fg_bg_editor_get_type ())
+#define GIMP_FG_BG_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditor))
+#define GIMP_FG_BG_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditorClass))
+#define GIMP_IS_FG_BG_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FG_BG_EDITOR))
+#define GIMP_IS_FG_BG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FG_BG_EDITOR))
+#define GIMP_FG_BG_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditorClass))
+
+
+typedef struct _GimpFgBgEditorClass GimpFgBgEditorClass;
+
+struct _GimpFgBgEditor
+{
+  GtkEventBox         parent_instance;
+
+  GimpContext        *context;
+  GimpColorConfig    *color_config;
+  GimpColorTransform *transform;
+
+  GimpActiveColor     active_color;
+
+  GimpImage          *active_image;
+
+  GdkPixbuf          *default_icon;
+  GdkPixbuf          *swap_icon;
+
+  gint                rect_width;
+  gint                rect_height;
+  gint                click_target;
+};
+
+struct _GimpFgBgEditorClass
+{
+  GtkEventBoxClass    parent_class;
+
+  /*  signals  */
+
+  void (* color_clicked) (GimpFgBgEditor  *editor,
+                          GimpActiveColor  color);
+
+  void (* tooltip)       (GimpFgBgEditor *editor,
+                          GimpFgBgTarget  target,
+                          GtkTooltip      tooltip);
+};
+
+
+GType       gimp_fg_bg_editor_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_fg_bg_editor_new         (GimpContext     *context);
+
+void        gimp_fg_bg_editor_set_context (GimpFgBgEditor  *editor,
+                                           GimpContext     *context);
+void        gimp_fg_bg_editor_set_active  (GimpFgBgEditor  *editor,
+                                           GimpActiveColor  active);
+
+
+#endif  /*  __GIMP_FG_BG_EDITOR_H__  */
diff --git a/app/widgets/gimpfgbgview.c b/app/widgets/gimpfgbgview.c
new file mode 100644
index 0000000..2047d4d
--- /dev/null
+++ b/app/widgets/gimpfgbgview.c
@@ -0,0 +1,329 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfgbgview.c
+ * Copyright (C) 2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpdnd.h"
+#include "gimpfgbgview.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT
+};
+
+
+static void     gimp_fg_bg_view_dispose           (GObject        *object);
+static void     gimp_fg_bg_view_set_property      (GObject        *object,
+                                                   guint           property_id,
+                                                   const GValue   *value,
+                                                   GParamSpec     *pspec);
+static void     gimp_fg_bg_view_get_property      (GObject        *object,
+                                                   guint           property_id,
+                                                   GValue         *value,
+                                                   GParamSpec     *pspec);
+
+static gboolean gimp_fg_bg_view_expose            (GtkWidget      *widget,
+                                                   GdkEventExpose *eevent);
+
+static void     gimp_fg_bg_view_create_transform  (GimpFgBgView   *view);
+static void     gimp_fg_bg_view_destroy_transform (GimpFgBgView   *view);
+
+
+G_DEFINE_TYPE (GimpFgBgView, gimp_fg_bg_view, GTK_TYPE_WIDGET)
+
+#define parent_class gimp_fg_bg_view_parent_class
+
+
+static void
+gimp_fg_bg_view_class_init (GimpFgBgViewClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose      = gimp_fg_bg_view_dispose;
+  object_class->set_property = gimp_fg_bg_view_set_property;
+  object_class->get_property = gimp_fg_bg_view_get_property;
+
+  widget_class->expose_event = gimp_fg_bg_view_expose;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_fg_bg_view_init (GimpFgBgView *view)
+{
+  gtk_widget_set_has_window (GTK_WIDGET (view), FALSE);
+
+  gimp_widget_track_monitor (GTK_WIDGET (view),
+                             G_CALLBACK (gimp_fg_bg_view_destroy_transform),
+                             NULL);
+}
+
+static void
+gimp_fg_bg_view_dispose (GObject *object)
+{
+  GimpFgBgView *view = GIMP_FG_BG_VIEW (object);
+
+  if (view->context)
+    gimp_fg_bg_view_set_context (view, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_fg_bg_view_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpFgBgView *view = GIMP_FG_BG_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      gimp_fg_bg_view_set_context (view, g_value_get_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_fg_bg_view_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpFgBgView *view = GIMP_FG_BG_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, view->context);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_fg_bg_view_expose (GtkWidget      *widget,
+                        GdkEventExpose *eevent)
+{
+  GimpFgBgView *view   = GIMP_FG_BG_VIEW (widget);
+  GtkStyle     *style  = gtk_widget_get_style (widget);
+  GdkWindow    *window = gtk_widget_get_window (widget);
+  cairo_t      *cr;
+  GtkAllocation allocation;
+  gint          rect_w, rect_h;
+  GimpRGB       color;
+
+  if (! gtk_widget_is_drawable (widget))
+    return FALSE;
+
+  cr = gdk_cairo_create (eevent->window);
+
+  gdk_cairo_region (cr, eevent->region);
+  cairo_clip (cr);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  cairo_translate (cr, allocation.x, allocation.y);
+
+  rect_w = allocation.width  * 3 / 4;
+  rect_h = allocation.height * 3 / 4;
+
+  if (! view->transform)
+    gimp_fg_bg_view_create_transform (view);
+
+  /*  draw the background area  */
+
+  if (view->context)
+    {
+      gimp_context_get_background (view->context, &color);
+
+      if (view->transform)
+        gimp_color_transform_process_pixels (view->transform,
+                                             babl_format ("R'G'B'A double"),
+                                             &color,
+                                             babl_format ("R'G'B'A double"),
+                                             &color,
+                                             1);
+
+      gimp_cairo_set_source_rgb (cr, &color);
+
+      cairo_rectangle (cr,
+                       allocation.width  - rect_w + 1,
+                       allocation.height - rect_h + 1,
+                       rect_w - 2,
+                       rect_h - 2);
+      cairo_fill (cr);
+    }
+
+  gtk_paint_shadow (style, window, GTK_STATE_NORMAL,
+                    GTK_SHADOW_IN,
+                    NULL, widget, NULL,
+                    allocation.x + allocation.width  - rect_w,
+                    allocation.y + allocation.height - rect_h,
+                    rect_w, rect_h);
+
+  /*  draw the foreground area  */
+
+  if (view->context)
+    {
+      gimp_context_get_foreground (view->context, &color);
+
+      if (view->transform)
+        gimp_color_transform_process_pixels (view->transform,
+                                             babl_format ("R'G'B'A double"),
+                                             &color,
+                                             babl_format ("R'G'B'A double"),
+                                             &color,
+                                             1);
+
+      gimp_cairo_set_source_rgb (cr, &color);
+
+      cairo_rectangle (cr, 1, 1, rect_w - 2, rect_h - 2);
+      cairo_fill (cr);
+    }
+
+  gtk_paint_shadow (style, window, GTK_STATE_NORMAL,
+                    GTK_SHADOW_OUT,
+                    NULL, widget, NULL,
+                    allocation.x, allocation.y, rect_w, rect_h);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+static void
+gimp_fg_bg_view_create_transform (GimpFgBgView *view)
+{
+  if (view->color_config)
+    {
+      static GimpColorProfile *profile = NULL;
+
+      if (G_UNLIKELY (! profile))
+        profile = gimp_color_profile_new_rgb_srgb ();
+
+      view->transform =
+        gimp_widget_get_color_transform (GTK_WIDGET (view),
+                                         view->color_config,
+                                         profile,
+                                         babl_format ("R'G'B'A double"),
+                                         babl_format ("R'G'B'A double"));
+    }
+}
+
+static void
+gimp_fg_bg_view_destroy_transform (GimpFgBgView *view)
+{
+  g_clear_object (&view->transform);
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_fg_bg_view_new (GimpContext *context)
+{
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_FG_BG_VIEW,
+                       "context", context,
+                       NULL);
+}
+
+void
+gimp_fg_bg_view_set_context (GimpFgBgView *view,
+                             GimpContext  *context)
+{
+  g_return_if_fail (GIMP_IS_FG_BG_VIEW (view));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  if (context != view->context)
+    {
+      if (view->context)
+        {
+          g_signal_handlers_disconnect_by_func (view->context,
+                                                gtk_widget_queue_draw,
+                                                view);
+          g_clear_object (&view->context);
+
+          g_signal_handlers_disconnect_by_func (view->color_config,
+                                                gimp_fg_bg_view_destroy_transform,
+                                                view);
+          g_clear_object (&view->color_config);
+        }
+
+      view->context = context;
+
+      if (context)
+        {
+          g_object_ref (context);
+
+          g_signal_connect_swapped (context, "foreground-changed",
+                                    G_CALLBACK (gtk_widget_queue_draw),
+                                    view);
+          g_signal_connect_swapped (context, "background-changed",
+                                    G_CALLBACK (gtk_widget_queue_draw),
+                                    view);
+
+          view->color_config = g_object_ref (context->gimp->config->color_management);
+
+          g_signal_connect_swapped (view->color_config, "notify",
+                                    G_CALLBACK (gimp_fg_bg_view_destroy_transform),
+                                    view);
+        }
+
+      gimp_fg_bg_view_destroy_transform (view);
+
+      g_object_notify (G_OBJECT (view), "context");
+    }
+}
diff --git a/app/widgets/gimpfgbgview.h b/app/widgets/gimpfgbgview.h
new file mode 100644
index 0000000..19e97b1
--- /dev/null
+++ b/app/widgets/gimpfgbgview.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfgbgview.h
+ * Copyright (C) 2005  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FG_BG_VIEW_H__
+#define __GIMP_FG_BG_VIEW_H__
+
+
+#define GIMP_TYPE_FG_BG_VIEW            (gimp_fg_bg_view_get_type ())
+#define GIMP_FG_BG_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FG_BG_VIEW, GimpFgBgView))
+#define GIMP_FG_BG_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FG_BG_VIEW, GimpFgBgViewClass))
+#define GIMP_IS_FG_BG_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FG_BG_VIEW))
+#define GIMP_IS_FG_BG_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FG_BG_VIEW))
+#define GIMP_FG_BG_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FG_BG_VIEW, GimpFgBgViewClass))
+
+
+typedef struct _GimpFgBgViewClass GimpFgBgViewClass;
+
+struct _GimpFgBgView
+{
+  GtkWidget           parent_instance;
+
+  GimpContext        *context;
+  GimpColorConfig    *color_config;
+  GimpColorTransform *transform;
+};
+
+struct _GimpFgBgViewClass
+{
+  GtkWidgetClass  parent_class;
+};
+
+
+GType       gimp_fg_bg_view_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_fg_bg_view_new         (GimpContext  *context);
+
+void        gimp_fg_bg_view_set_context (GimpFgBgView *view,
+                                         GimpContext  *context);
+
+
+#endif  /*  __GIMP_FG_BG_VIEW_H__  */
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
new file mode 100644
index 0000000..0b22b37
--- /dev/null
+++ b/app/widgets/gimpfiledialog.c
@@ -0,0 +1,987 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfiledialog.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpprogress.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "gimpfiledialog.h"
+#include "gimpfileprocview.h"
+#include "gimpprogressbox.h"
+#include "gimpthumbbox.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_HELP_ID,
+  PROP_OK_BUTTON_LABEL,
+  PROP_AUTOMATIC_HELP_ID,
+  PROP_AUTOMATIC_LABEL,
+  PROP_FILE_FILTER_LABEL,
+  PROP_FILE_PROCS,
+  PROP_FILE_PROCS_ALL_IMAGES,
+  PROP_SHOW_ALL_FILES,
+};
+
+typedef struct _GimpFileDialogState GimpFileDialogState;
+
+struct _GimpFileDialogState
+{
+  gchar *filter_name;
+};
+
+
+static void     gimp_file_dialog_progress_iface_init     (GimpProgressInterface *iface);
+
+static void     gimp_file_dialog_set_property            (GObject             *object,
+                                                          guint                property_id,
+                                                          const GValue        *value,
+                                                          GParamSpec          *pspec);
+static void     gimp_file_dialog_get_property            (GObject             *object,
+                                                          guint                property_id,
+                                                          GValue              *value,
+                                                          GParamSpec          *pspec);
+static void     gimp_file_dialog_constructed             (GObject             *object);
+static void     gimp_file_dialog_dispose                 (GObject             *object);
+
+static gboolean gimp_file_dialog_delete_event            (GtkWidget           *widget,
+                                                          GdkEventAny         *event);
+static void     gimp_file_dialog_response                (GtkDialog           *dialog,
+                                                          gint                 response_id);
+static GFile  * gimp_file_dialog_real_get_default_folder (GimpFileDialog      *dialog);
+static void     gimp_file_dialog_real_save_state         (GimpFileDialog      *dialog,
+                                                          const gchar         *state_name);
+static void     gimp_file_dialog_real_load_state         (GimpFileDialog      *dialog,
+                                                          const gchar         *state_name);
+
+static GimpProgress *
+                gimp_file_dialog_progress_start          (GimpProgress        *progress,
+                                                          gboolean             cancellable,
+                                                          const gchar         *message);
+static void     gimp_file_dialog_progress_end            (GimpProgress        *progress);
+static gboolean gimp_file_dialog_progress_is_active      (GimpProgress        *progress);
+static void     gimp_file_dialog_progress_set_text       (GimpProgress        *progress,
+                                                          const gchar         *message);
+static void     gimp_file_dialog_progress_set_value      (GimpProgress        *progress,
+                                                          gdouble              percentage);
+static gdouble  gimp_file_dialog_progress_get_value      (GimpProgress        *progress);
+static void     gimp_file_dialog_progress_pulse          (GimpProgress        *progress);
+static guint32  gimp_file_dialog_progress_get_window_id  (GimpProgress        *progress);
+
+static void     gimp_file_dialog_add_user_dir            (GimpFileDialog      *dialog,
+                                                          GUserDirectory       directory);
+static void     gimp_file_dialog_add_preview             (GimpFileDialog      *dialog);
+static void     gimp_file_dialog_add_proc_selection      (GimpFileDialog      *dialog);
+
+static void     gimp_file_dialog_selection_changed       (GtkFileChooser      *chooser,
+                                                          GimpFileDialog      *dialog);
+static void     gimp_file_dialog_update_preview          (GtkFileChooser      *chooser,
+                                                          GimpFileDialog      *dialog);
+
+static void     gimp_file_dialog_proc_changed            (GimpFileProcView    *view,
+                                                          GimpFileDialog      *dialog);
+
+static void     gimp_file_dialog_help_func               (const gchar         *help_id,
+                                                          gpointer             help_data);
+static void     gimp_file_dialog_help_clicked            (GtkWidget           *widget,
+                                                          gpointer             dialog);
+
+static GimpFileDialogState
+              * gimp_file_dialog_get_state               (GimpFileDialog      *dialog);
+static void     gimp_file_dialog_set_state               (GimpFileDialog      *dialog,
+                                                          GimpFileDialogState *state);
+static void     gimp_file_dialog_state_destroy           (GimpFileDialogState *state);
+
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpFileDialog, gimp_file_dialog,
+                         GTK_TYPE_FILE_CHOOSER_DIALOG,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_file_dialog_progress_iface_init))
+
+#define parent_class gimp_file_dialog_parent_class
+
+
+static void
+gimp_file_dialog_class_init (GimpFileDialogClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+
+  object_class->set_property = gimp_file_dialog_set_property;
+  object_class->get_property = gimp_file_dialog_get_property;
+  object_class->constructed  = gimp_file_dialog_constructed;
+  object_class->dispose      = gimp_file_dialog_dispose;
+
+  widget_class->delete_event = gimp_file_dialog_delete_event;
+
+  dialog_class->response     = gimp_file_dialog_response;
+
+  klass->get_default_folder  = gimp_file_dialog_real_get_default_folder;
+  klass->save_state          = gimp_file_dialog_real_save_state;
+  klass->load_state          = gimp_file_dialog_real_load_state;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_HELP_ID,
+                                   g_param_spec_string ("help-id", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_OK_BUTTON_LABEL,
+                                   g_param_spec_string ("ok-button-label",
+                                                        NULL, NULL,
+                                                        _("_OK"),
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_AUTOMATIC_HELP_ID,
+                                   g_param_spec_string ("automatic-help-id",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_AUTOMATIC_LABEL,
+                                   g_param_spec_string ("automatic-label",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_FILE_FILTER_LABEL,
+                                   g_param_spec_string ("file-filter-label",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_FILE_PROCS,
+                                   g_param_spec_enum ("file-procs",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_FILE_PROCEDURE_GROUP,
+                                                      GIMP_FILE_PROCEDURE_GROUP_NONE,
+                                                      GIMP_PARAM_WRITABLE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_FILE_PROCS_ALL_IMAGES,
+                                   g_param_spec_enum ("file-procs-all-images",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_FILE_PROCEDURE_GROUP,
+                                                      GIMP_FILE_PROCEDURE_GROUP_NONE,
+                                                      GIMP_PARAM_WRITABLE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SHOW_ALL_FILES,
+                                   g_param_spec_boolean ("show-all-files",
+                                                         NULL, NULL, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_file_dialog_init (GimpFileDialog *dialog)
+{
+}
+
+static void
+gimp_file_dialog_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start         = gimp_file_dialog_progress_start;
+  iface->end           = gimp_file_dialog_progress_end;
+  iface->is_active     = gimp_file_dialog_progress_is_active;
+  iface->set_text      = gimp_file_dialog_progress_set_text;
+  iface->set_value     = gimp_file_dialog_progress_set_value;
+  iface->get_value     = gimp_file_dialog_progress_get_value;
+  iface->pulse         = gimp_file_dialog_progress_pulse;
+  iface->get_window_id = gimp_file_dialog_progress_get_window_id;
+}
+
+static void
+gimp_file_dialog_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      dialog->gimp = g_value_get_object (value);
+      break;
+    case PROP_HELP_ID:
+      dialog->help_id = g_value_dup_string (value);
+      break;
+    case PROP_OK_BUTTON_LABEL:
+      dialog->ok_button_label = g_value_dup_string (value);
+      break;
+    case PROP_AUTOMATIC_HELP_ID:
+      dialog->automatic_help_id = g_value_dup_string (value);
+      break;
+    case PROP_AUTOMATIC_LABEL:
+      dialog->automatic_label = g_value_dup_string (value);
+      break;
+    case PROP_FILE_FILTER_LABEL:
+      dialog->file_filter_label = g_value_dup_string (value);
+      break;
+    case PROP_FILE_PROCS:
+      dialog->file_procs =
+        gimp_plug_in_manager_get_file_procedures (dialog->gimp->plug_in_manager,
+                                                  g_value_get_enum (value));
+      break;
+    case PROP_FILE_PROCS_ALL_IMAGES:
+      dialog->file_procs_all_images =
+        gimp_plug_in_manager_get_file_procedures (dialog->gimp->plug_in_manager,
+                                                  g_value_get_enum (value));
+      break;
+    case PROP_SHOW_ALL_FILES:
+      dialog->show_all_files = g_value_get_boolean (value);
+      gimp_file_dialog_proc_changed (GIMP_FILE_PROC_VIEW (dialog->proc_view),
+                                     dialog);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_file_dialog_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, dialog->gimp);
+      break;
+    case PROP_HELP_ID:
+      g_value_set_string (value, dialog->help_id);
+      break;
+    case PROP_SHOW_ALL_FILES:
+      g_value_set_boolean (value, dialog->show_all_files);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_file_dialog_constructed (GObject *object)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                          _("_Cancel"),            GTK_RESPONSE_CANCEL,
+                          dialog->ok_button_label, GTK_RESPONSE_OK,
+                          NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (object), FALSE);
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (object),
+                                                  TRUE);
+
+  if (dialog->help_id)
+    {
+      gimp_help_connect (GTK_WIDGET (dialog),
+                         gimp_file_dialog_help_func, dialog->help_id, dialog);
+
+      if (GIMP_GUI_CONFIG (dialog->gimp->config)->show_help_button)
+        {
+          GtkWidget *action_area;
+          GtkWidget *button;
+
+          action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+
+          button = gtk_button_new_with_mnemonic (_("_Help"));
+          gtk_box_pack_end (GTK_BOX (action_area), button, FALSE, TRUE, 0);
+          gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
+                                              button, TRUE);
+          gtk_widget_show (button);
+
+          g_object_set_data_full (G_OBJECT (dialog), "gimp-dialog-help-id",
+                                  g_strdup (dialog->help_id),
+                                  (GDestroyNotify) g_free);
+
+          g_signal_connect (button, "clicked",
+                            G_CALLBACK (gimp_file_dialog_help_clicked),
+                            dialog);
+
+          g_object_set_data (G_OBJECT (dialog), "gimp-dialog-help-button", button);
+        }
+    }
+
+  /* All classes derivated from GimpFileDialog should show these. */
+  gimp_file_dialog_add_user_dir (dialog, G_USER_DIRECTORY_PICTURES);
+  gimp_file_dialog_add_user_dir (dialog, G_USER_DIRECTORY_DOCUMENTS);
+
+  gimp_file_dialog_add_preview (dialog);
+
+  dialog->extra_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog),
+                                     dialog->extra_vbox);
+  gtk_widget_show (dialog->extra_vbox);
+
+  gimp_file_dialog_add_proc_selection (dialog);
+
+  dialog->progress = gimp_progress_box_new ();
+  gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                    dialog->progress, FALSE, FALSE, 0);
+}
+
+static void
+gimp_file_dialog_dispose (GObject *object)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+
+  dialog->progress = NULL;
+
+  g_clear_pointer (&dialog->help_id,           g_free);
+  g_clear_pointer (&dialog->ok_button_label,   g_free);
+  g_clear_pointer (&dialog->automatic_help_id, g_free);
+  g_clear_pointer (&dialog->automatic_label,   g_free);
+  g_clear_pointer (&dialog->file_filter_label, g_free);
+}
+
+static gboolean
+gimp_file_dialog_delete_event (GtkWidget   *widget,
+                               GdkEventAny *event)
+{
+  return TRUE;
+}
+
+static void
+gimp_file_dialog_response (GtkDialog *dialog,
+                           gint       response_id)
+{
+  GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog);
+
+  if (response_id != GTK_RESPONSE_OK && file_dialog->busy)
+    {
+      file_dialog->canceled = TRUE;
+
+      if (file_dialog->progress                             &&
+          GIMP_PROGRESS_BOX (file_dialog->progress)->active &&
+          GIMP_PROGRESS_BOX (file_dialog->progress)->cancellable)
+        {
+          gimp_progress_cancel (GIMP_PROGRESS (dialog));
+        }
+    }
+}
+
+static GFile *
+gimp_file_dialog_real_get_default_folder (GimpFileDialog *dialog)
+{
+  GFile *file = NULL;
+
+  if (dialog->gimp->default_folder)
+    {
+      file = dialog->gimp->default_folder;
+    }
+  else
+    {
+      file = g_object_get_data (G_OBJECT (dialog->gimp),
+                                "gimp-default-folder");
+
+      if (! file)
+        {
+          gchar *path;
+
+          /* Make sure the paths end with G_DIR_SEPARATOR_S */
+
+#ifdef PLATFORM_OSX
+          /* See bug 753683, "Desktop" is expected on OS X */
+          path = g_build_path (G_DIR_SEPARATOR_S,
+                               g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP),
+                               G_DIR_SEPARATOR_S,
+                               NULL);
+#else
+          path = g_build_path (G_DIR_SEPARATOR_S,
+                               g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS),
+                               G_DIR_SEPARATOR_S,
+                               NULL);
+#endif
+
+          /* Paranoia fallback, see bug #722400 */
+          if (! path)
+            path = g_build_path (G_DIR_SEPARATOR_S,
+                                 g_get_home_dir (),
+                                 G_DIR_SEPARATOR_S,
+                                 NULL);
+
+          file = g_file_new_for_path (path);
+          g_free (path);
+
+          g_object_set_data_full (G_OBJECT (dialog->gimp),
+                                  "gimp-default-folder",
+                                  file, (GDestroyNotify) g_object_unref);
+        }
+    }
+
+  return file;
+}
+
+static void
+gimp_file_dialog_real_save_state (GimpFileDialog *dialog,
+                                  const gchar    *state_name)
+{
+  g_object_set_data_full (G_OBJECT (dialog->gimp), state_name,
+                          gimp_file_dialog_get_state (dialog),
+                          (GDestroyNotify) gimp_file_dialog_state_destroy);
+}
+
+static void
+gimp_file_dialog_real_load_state (GimpFileDialog *dialog,
+                                  const gchar    *state_name)
+{
+  GimpFileDialogState *state;
+
+  state = g_object_get_data (G_OBJECT (dialog->gimp), state_name);
+
+  if (state)
+    gimp_file_dialog_set_state (GIMP_FILE_DIALOG (dialog), state);
+}
+
+static GimpProgress *
+gimp_file_dialog_progress_start (GimpProgress *progress,
+                                 gboolean      cancellable,
+                                 const gchar  *message)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+  GimpProgress   *retval = NULL;
+
+  if (dialog->progress)
+    {
+      retval = gimp_progress_start (GIMP_PROGRESS (dialog->progress),
+                                    cancellable, "%s", message);
+      gtk_widget_show (dialog->progress);
+
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                         GTK_RESPONSE_CANCEL, cancellable);
+    }
+
+  return retval;
+}
+
+static void
+gimp_file_dialog_progress_end (GimpProgress *progress)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  if (dialog->progress)
+    {
+      gimp_progress_end (GIMP_PROGRESS (dialog->progress));
+      gtk_widget_hide (dialog->progress);
+    }
+}
+
+static gboolean
+gimp_file_dialog_progress_is_active (GimpProgress *progress)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  if (dialog->progress)
+    return gimp_progress_is_active (GIMP_PROGRESS (dialog->progress));
+
+  return FALSE;
+}
+
+static void
+gimp_file_dialog_progress_set_text (GimpProgress *progress,
+                                    const gchar  *message)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  if (dialog->progress)
+    gimp_progress_set_text_literal (GIMP_PROGRESS (dialog->progress), message);
+}
+
+static void
+gimp_file_dialog_progress_set_value (GimpProgress *progress,
+                                     gdouble       percentage)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  if (dialog->progress)
+    gimp_progress_set_value (GIMP_PROGRESS (dialog->progress), percentage);
+}
+
+static gdouble
+gimp_file_dialog_progress_get_value (GimpProgress *progress)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  if (dialog->progress)
+    return gimp_progress_get_value (GIMP_PROGRESS (dialog->progress));
+
+  return 0.0;
+}
+
+static void
+gimp_file_dialog_progress_pulse (GimpProgress *progress)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  if (dialog->progress)
+    gimp_progress_pulse (GIMP_PROGRESS (dialog->progress));
+}
+
+static guint32
+gimp_file_dialog_progress_get_window_id (GimpProgress *progress)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
+
+  return gimp_window_get_native_id (GTK_WINDOW (dialog));
+}
+
+
+/*  public functions  */
+
+void
+gimp_file_dialog_add_extra_widget (GimpFileDialog *dialog,
+                                   GtkWidget      *widget,
+                                   gboolean        expand,
+                                   gboolean        fill,
+                                   guint           padding)
+{
+  gtk_box_pack_start (GTK_BOX (dialog->extra_vbox),
+                      widget, expand, fill, padding);
+}
+
+void
+gimp_file_dialog_set_sensitive (GimpFileDialog *dialog,
+                                gboolean        sensitive)
+{
+  GtkWidget *content_area;
+  GList     *children;
+  GList     *list;
+
+  g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
+
+  /*  bail out if we are already destroyed  */
+  if (! dialog->progress)
+    return;
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  children = gtk_container_get_children (GTK_CONTAINER (content_area));
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      /*  skip the last item (the action area) */
+      if (! g_list_next (list))
+        break;
+
+      gtk_widget_set_sensitive (list->data, sensitive);
+    }
+
+  g_list_free (children);
+
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                     GTK_RESPONSE_CANCEL, sensitive);
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                     GTK_RESPONSE_OK, sensitive);
+
+  dialog->busy     = ! sensitive;
+  dialog->canceled = FALSE;
+}
+
+void
+gimp_file_dialog_set_file_proc (GimpFileDialog      *dialog,
+                                GimpPlugInProcedure *file_proc)
+{
+  g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
+
+  if (file_proc != dialog->file_proc)
+    gimp_file_proc_view_set_proc (GIMP_FILE_PROC_VIEW (dialog->proc_view),
+                                  file_proc);
+}
+
+GFile *
+gimp_file_dialog_get_default_folder (GimpFileDialog *dialog)
+{
+  g_return_val_if_fail (GIMP_IS_FILE_DIALOG (dialog), NULL);
+
+  return GIMP_FILE_DIALOG_GET_CLASS (dialog)->get_default_folder (dialog);
+}
+
+void
+gimp_file_dialog_save_state (GimpFileDialog *dialog,
+                             const gchar    *state_name)
+{
+  g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
+
+  GIMP_FILE_DIALOG_GET_CLASS (dialog)->save_state (dialog, state_name);
+}
+
+void
+gimp_file_dialog_load_state (GimpFileDialog *dialog,
+                             const gchar    *state_name)
+{
+  g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
+
+  GIMP_FILE_DIALOG_GET_CLASS (dialog)->load_state (dialog, state_name);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_file_dialog_add_user_dir (GimpFileDialog *dialog,
+                               GUserDirectory  directory)
+{
+  const gchar *user_dir = g_get_user_special_dir (directory);
+
+  if (user_dir)
+    gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog),
+                                          user_dir, NULL);
+}
+
+static void
+gimp_file_dialog_add_preview (GimpFileDialog *dialog)
+{
+  if (dialog->gimp->config->thumbnail_size <= 0)
+    return;
+
+  gtk_file_chooser_set_use_preview_label (GTK_FILE_CHOOSER (dialog), FALSE);
+
+  g_signal_connect (dialog, "selection-changed",
+                    G_CALLBACK (gimp_file_dialog_selection_changed),
+                    dialog);
+  g_signal_connect (dialog, "update-preview",
+                    G_CALLBACK (gimp_file_dialog_update_preview),
+                    dialog);
+
+  dialog->thumb_box = gimp_thumb_box_new (gimp_get_user_context (dialog->gimp));
+  gtk_widget_set_sensitive (GTK_WIDGET (dialog->thumb_box), FALSE);
+  gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (dialog),
+                                       dialog->thumb_box);
+  gtk_widget_show (dialog->thumb_box);
+
+#ifdef ENABLE_FILE_SYSTEM_ICONS
+  GIMP_VIEW_RENDERER_IMAGEFILE (GIMP_VIEW (GIMP_THUMB_BOX (dialog->thumb_box)->preview)->renderer)->file_system = _gtk_file_chooser_get_file_system (GTK_FILE_CHOOSER (dialog));
+#endif
+}
+
+static void
+gimp_file_dialog_add_proc_selection (GimpFileDialog *dialog)
+{
+  GtkWidget *box;
+  GtkWidget *scrolled_window;
+  GtkWidget *checkbox;
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+  gimp_file_dialog_add_extra_widget (dialog, box, TRUE, TRUE, 0);
+  gtk_widget_show (box);
+
+  dialog->proc_expander = gtk_expander_new_with_mnemonic (NULL);
+  gimp_file_dialog_add_extra_widget (dialog,
+                                     dialog->proc_expander,
+                                     TRUE, TRUE, 0);
+  gtk_widget_show (dialog->proc_expander);
+
+  /* The list of file formats. */
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_IN);
+  gtk_container_add (GTK_CONTAINER (dialog->proc_expander), scrolled_window);
+  gtk_widget_show (scrolled_window);
+
+  gtk_widget_set_size_request (scrolled_window, -1, 200);
+
+  dialog->proc_view = gimp_file_proc_view_new (dialog->gimp,
+                                               dialog->file_procs,
+                                               dialog->automatic_label,
+                                               dialog->automatic_help_id);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), dialog->proc_view);
+  gtk_widget_show (dialog->proc_view);
+
+  g_signal_connect (dialog->proc_view, "changed",
+                    G_CALLBACK (gimp_file_dialog_proc_changed),
+                    dialog);
+
+  gimp_file_proc_view_set_proc (GIMP_FILE_PROC_VIEW (dialog->proc_view), NULL);
+
+  /* Checkbox to show all files. */
+  checkbox = gimp_prop_check_button_new (G_OBJECT (dialog),
+                                         "show-all-files",
+                                         _("Show _All Files"));
+  gtk_box_pack_end (GTK_BOX (box), checkbox, FALSE, FALSE, 1);
+  gtk_widget_show (checkbox);
+}
+
+static void
+gimp_file_dialog_selection_changed (GtkFileChooser *chooser,
+                                    GimpFileDialog *dialog)
+{
+  gimp_thumb_box_take_files (GIMP_THUMB_BOX (dialog->thumb_box),
+                             gtk_file_chooser_get_files (chooser));
+}
+
+static void
+gimp_file_dialog_update_preview (GtkFileChooser *chooser,
+                                 GimpFileDialog *dialog)
+{
+  gimp_thumb_box_take_file (GIMP_THUMB_BOX (dialog->thumb_box),
+                            gtk_file_chooser_get_preview_file (chooser));
+}
+
+static void
+gimp_file_dialog_proc_changed (GimpFileProcView *view,
+                               GimpFileDialog   *dialog)
+{
+  GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+  GtkFileFilter  *filter;
+  gchar          *name;
+  gchar          *label;
+
+  dialog->file_proc = gimp_file_proc_view_get_proc (view, &name, &filter);
+
+  if (name)
+    label = g_strdup_printf (_("Select File _Type (%s)"), name);
+  else
+    label = g_strdup (_("Select File _Type"));
+
+  gtk_expander_set_label (GTK_EXPANDER (dialog->proc_expander), label);
+
+  g_free (label);
+  g_free (name);
+
+  if (dialog->show_all_files)
+    g_clear_object (&filter);
+
+  if (! filter)
+    {
+      filter = g_object_ref_sink (gtk_file_filter_new ());
+
+      gtk_file_filter_add_pattern (filter, "*");
+    }
+
+  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  g_object_unref (filter);
+
+  if (gtk_file_chooser_get_action (chooser) == GTK_FILE_CHOOSER_ACTION_SAVE)
+    {
+      GimpPlugInProcedure *proc = dialog->file_proc;
+
+      if (proc && proc->extensions_list)
+        {
+          gchar *uri = gtk_file_chooser_get_uri (chooser);
+
+          if (uri && strlen (uri))
+            {
+              const gchar *last_dot = strrchr (uri, '.');
+
+              /*  if the dot is before the last slash, ignore it  */
+              if (last_dot && strrchr (uri, '/') > last_dot)
+                last_dot = NULL;
+
+              /*  check if the uri has a "meta extension" (e.g. foo.bar.gz)
+               *  and try to truncate both extensions away.
+               */
+              if (last_dot && last_dot != uri)
+                {
+                  GList *list;
+
+                  for (list = view->meta_extensions;
+                       list;
+                       list = g_list_next (list))
+                    {
+                      const gchar *ext = list->data;
+
+                      if (! strcmp (ext, last_dot + 1))
+                        {
+                          const gchar *p = last_dot - 1;
+
+                          while (p > uri && *p != '.')
+                            p--;
+
+                          if (p != uri && *p == '.')
+                            {
+                              last_dot = p;
+                              break;
+                            }
+                        }
+                    }
+                }
+
+              if (last_dot != uri)
+                {
+                  GString *s = g_string_new (uri);
+                  GFile   *file;
+                  gchar   *basename;
+
+                  if (last_dot)
+                    g_string_truncate (s, last_dot - uri);
+
+                  g_string_append (s, ".");
+                  g_string_append (s, (gchar *) proc->extensions_list->data);
+
+                  file = g_file_new_for_uri (s->str);
+                  g_string_free (s, TRUE);
+
+                  gtk_file_chooser_set_file (chooser, file, NULL);
+
+                  basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+                  gtk_file_chooser_set_current_name (chooser, basename);
+                  g_free (basename);
+                }
+            }
+
+          g_free (uri);
+        }
+    }
+}
+
+static void
+gimp_file_dialog_help_func (const gchar *help_id,
+                            gpointer     help_data)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (help_data);
+  GtkWidget      *focus;
+
+  focus = gtk_window_get_focus (GTK_WINDOW (dialog));
+
+  if (focus == dialog->proc_view)
+    {
+      gchar *proc_help_id;
+
+      proc_help_id =
+        gimp_file_proc_view_get_help_id (GIMP_FILE_PROC_VIEW (dialog->proc_view));
+
+      gimp_standard_help_func (proc_help_id, NULL);
+
+      g_free (proc_help_id);
+    }
+  else
+    {
+      gimp_standard_help_func (help_id, NULL);
+    }
+}
+
+static void
+gimp_file_dialog_help_clicked (GtkWidget *widget,
+                               gpointer   dialog)
+{
+  gimp_standard_help_func (g_object_get_data (dialog, "gimp-dialog-help-id"),
+                           NULL);
+}
+
+static GimpFileDialogState *
+gimp_file_dialog_get_state (GimpFileDialog *dialog)
+{
+  GimpFileDialogState *state;
+  GtkFileFilter       *filter;
+
+  g_return_val_if_fail (GIMP_IS_FILE_DIALOG (dialog), NULL);
+
+  state = g_slice_new0 (GimpFileDialogState);
+
+  filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog));
+
+  if (filter)
+    state->filter_name = g_strdup (gtk_file_filter_get_name (filter));
+
+  return state;
+}
+
+static void
+gimp_file_dialog_set_state (GimpFileDialog      *dialog,
+                            GimpFileDialogState *state)
+{
+  g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
+  g_return_if_fail (state != NULL);
+
+  if (state->filter_name)
+    {
+      GSList *filters;
+      GSList *list;
+
+      filters = gtk_file_chooser_list_filters (GTK_FILE_CHOOSER (dialog));
+
+      for (list = filters; list; list = list->next)
+        {
+          GtkFileFilter *filter = GTK_FILE_FILTER (list->data);
+          const gchar   *name   = gtk_file_filter_get_name (filter);
+
+          if (name && strcmp (state->filter_name, name) == 0)
+            {
+              gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+              break;
+            }
+        }
+
+      g_slist_free (filters);
+    }
+}
+
+static void
+gimp_file_dialog_state_destroy (GimpFileDialogState *state)
+{
+  g_return_if_fail (state != NULL);
+
+  g_free (state->filter_name);
+  g_slice_free (GimpFileDialogState, state);
+}
diff --git a/app/widgets/gimpfiledialog.h b/app/widgets/gimpfiledialog.h
new file mode 100644
index 0000000..415c0fb
--- /dev/null
+++ b/app/widgets/gimpfiledialog.h
@@ -0,0 +1,104 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfiledialog.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILE_DIALOG_H__
+#define __GIMP_FILE_DIALOG_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_FILE_DIALOG            (gimp_file_dialog_get_type ())
+#define GIMP_FILE_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILE_DIALOG, GimpFileDialog))
+#define GIMP_FILE_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_DIALOG, GimpFileDialogClass))
+#define GIMP_IS_FILE_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILE_DIALOG))
+#define GIMP_IS_FILE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILE_DIALOG))
+#define GIMP_FILE_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILE_DIALOG, GimpFileDialogClass))
+
+
+typedef struct _GimpFileDialogClass  GimpFileDialogClass;
+
+struct _GimpFileDialog
+{
+  GtkFileChooserDialog  parent_instance;
+
+  Gimp                 *gimp;
+  GimpImage            *image;
+
+  GimpPlugInProcedure  *file_proc;
+
+  GtkWidget            *thumb_box;
+  GtkWidget            *extra_vbox;
+  GtkWidget            *proc_expander;
+  GtkWidget            *proc_view;
+  GtkWidget            *progress;
+
+  gboolean              busy;
+  gboolean              canceled;
+
+  gchar                *help_id;
+  gchar                *ok_button_label;
+  gchar                *automatic_help_id;
+  gchar                *automatic_label;
+  gchar                *file_filter_label;
+
+  GSList               *file_procs;
+  GSList               *file_procs_all_images;
+
+  gboolean              show_all_files;
+};
+
+struct _GimpFileDialogClass
+{
+  GtkFileChooserDialogClass  parent_class;
+
+  GFile * (* get_default_folder) (GimpFileDialog *dialog);
+
+  void    (* save_state)         (GimpFileDialog *dialog,
+                                  const gchar    *state_name);
+  void    (* load_state)         (GimpFileDialog *dialog,
+                                  const gchar    *state_name);
+};
+
+
+GType   gimp_file_dialog_get_type           (void) G_GNUC_CONST;
+
+void    gimp_file_dialog_add_extra_widget   (GimpFileDialog      *dialog,
+                                             GtkWidget           *widget,
+                                             gboolean             expand,
+                                             gboolean             fill,
+                                             guint                padding);
+
+void    gimp_file_dialog_set_sensitive      (GimpFileDialog      *dialog,
+                                             gboolean             sensitive);
+
+void    gimp_file_dialog_set_file_proc      (GimpFileDialog      *dialog,
+                                             GimpPlugInProcedure *file_proc);
+
+GFile * gimp_file_dialog_get_default_folder (GimpFileDialog      *dialog);
+
+void    gimp_file_dialog_save_state         (GimpFileDialog      *dialog,
+                                             const gchar         *state_name);
+void    gimp_file_dialog_load_state         (GimpFileDialog      *dialog,
+                                             const gchar         *state_name);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_FILE_DIALOG_H__ */
diff --git a/app/widgets/gimpfileprocview.c b/app/widgets/gimpfileprocview.c
new file mode 100644
index 0000000..ce50f84
--- /dev/null
+++ b/app/widgets/gimpfileprocview.c
@@ -0,0 +1,476 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfileprocview.c
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpmarshal.h"
+
+#include "plug-in/gimppluginprocedure.h"
+
+#include "gimpfileprocview.h"
+
+#include "gimp-intl.h"
+
+/*  an arbitrary limit to keep the file dialog from becoming too wide  */
+#define MAX_EXTENSIONS  4
+
+enum
+{
+  COLUMN_PROC,
+  COLUMN_LABEL,
+  COLUMN_EXTENSIONS,
+  COLUMN_HELP_ID,
+  COLUMN_FILTER,
+  N_COLUMNS
+};
+
+enum
+{
+  CHANGED,
+  LAST_SIGNAL
+};
+
+
+static void            gimp_file_proc_view_finalize               (GObject             *object);
+
+static void            gimp_file_proc_view_selection_changed      (GtkTreeSelection    *selection,
+                                                                   GimpFileProcView    *view);
+
+static GtkFileFilter * gimp_file_proc_view_process_procedure      (GimpPlugInProcedure *file_proc,
+                                                                   GtkFileFilter       *all);
+static gchar         * gimp_file_proc_view_pattern_from_extension (const gchar         *extension);
+
+
+G_DEFINE_TYPE (GimpFileProcView, gimp_file_proc_view, GTK_TYPE_TREE_VIEW)
+
+#define parent_class gimp_file_proc_view_parent_class
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_file_proc_view_class_init (GimpFileProcViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_file_proc_view_finalize;
+
+  klass->changed         = NULL;
+
+  view_signals[CHANGED] = g_signal_new ("changed",
+                                        G_TYPE_FROM_CLASS (klass),
+                                        G_SIGNAL_RUN_LAST,
+                                        G_STRUCT_OFFSET (GimpFileProcViewClass,
+                                                         changed),
+                                        NULL, NULL,
+                                        gimp_marshal_VOID__VOID,
+                                        G_TYPE_NONE, 0);
+}
+
+static void
+gimp_file_proc_view_init (GimpFileProcView *view)
+{
+}
+
+static void
+gimp_file_proc_view_finalize (GObject *object)
+{
+  GimpFileProcView *view = GIMP_FILE_PROC_VIEW (object);
+
+  if (view->meta_extensions)
+    {
+      g_list_free_full (view->meta_extensions, (GDestroyNotify) g_free);
+      view->meta_extensions = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GtkWidget *
+gimp_file_proc_view_new (Gimp        *gimp,
+                         GSList      *procedures,
+                         const gchar *automatic,
+                         const gchar *automatic_help_id)
+{
+  GtkFileFilter     *all_filter;
+  GtkTreeView       *view;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer   *cell;
+  GtkListStore      *store;
+  GSList            *list;
+  GtkTreeIter        iter;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  store = gtk_list_store_new (N_COLUMNS,
+                              GIMP_TYPE_PLUG_IN_PROCEDURE, /*  COLUMN_PROC       */
+                              G_TYPE_STRING,               /*  COLUMN_LABEL      */
+                              G_TYPE_STRING,               /*  COLUMN_EXTENSIONS */
+                              G_TYPE_STRING,               /*  COLUMN_HELP_ID    */
+                              GTK_TYPE_FILE_FILTER);       /*  COLUMN_FILTER     */
+
+  view = g_object_new (GIMP_TYPE_FILE_PROC_VIEW,
+                       "model",      store,
+                       "rules-hint", TRUE,
+                       NULL);
+
+  g_object_unref (store);
+
+  all_filter = gtk_file_filter_new ();
+
+  for (list = procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+
+      if (! proc->prefixes_list) /*  skip URL loaders  */
+        {
+          const gchar *label   = gimp_procedure_get_label (GIMP_PROCEDURE (proc));
+          const gchar *help_id = gimp_procedure_get_help_id (GIMP_PROCEDURE (proc));
+          GSList      *list2;
+
+          if (label)
+            {
+              GtkFileFilter *filter;
+
+              filter = gimp_file_proc_view_process_procedure (proc, all_filter);
+              gtk_list_store_append (store, &iter);
+              gtk_list_store_set (store, &iter,
+                                  COLUMN_PROC,       proc,
+                                  COLUMN_LABEL,      label,
+                                  COLUMN_EXTENSIONS, proc->extensions,
+                                  COLUMN_HELP_ID,    help_id,
+                                  COLUMN_FILTER,     filter,
+                                  -1);
+              g_object_unref (filter);
+            }
+
+          for (list2 = proc->extensions_list;
+               list2;
+               list2 = g_slist_next (list2))
+            {
+              GimpFileProcView *proc_view = GIMP_FILE_PROC_VIEW (view);
+              const gchar      *ext       = list2->data;
+              const gchar      *dot       = strchr (ext, '.');
+
+              if (dot && dot != ext)
+                proc_view->meta_extensions =
+                  g_list_append (proc_view->meta_extensions,
+                                 g_strdup (dot + 1));
+            }
+        }
+    }
+
+  if (automatic)
+    {
+      gtk_list_store_prepend (store, &iter);
+      gtk_list_store_set (store, &iter,
+                          COLUMN_PROC,    NULL,
+                          COLUMN_LABEL,   automatic,
+                          COLUMN_HELP_ID, automatic_help_id,
+                          COLUMN_FILTER,  all_filter,
+                          -1);
+    }
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("File Type"));
+  gtk_tree_view_column_set_expand (column, TRUE);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text", COLUMN_LABEL,
+                                       NULL);
+
+  gtk_tree_view_append_column (view, column);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Extensions"));
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text", COLUMN_EXTENSIONS,
+                                       NULL);
+
+  gtk_tree_view_append_column (view, column);
+
+  g_signal_connect (gtk_tree_view_get_selection (view), "changed",
+                    G_CALLBACK (gimp_file_proc_view_selection_changed),
+                    view);
+
+  return GTK_WIDGET (view);
+}
+
+GimpPlugInProcedure *
+gimp_file_proc_view_get_proc (GimpFileProcView  *view,
+                              gchar            **label,
+                              GtkFileFilter    **filter)
+{
+  GtkTreeModel        *model;
+  GtkTreeSelection    *selection;
+  GimpPlugInProcedure *proc;
+  GtkTreeIter          iter;
+  gboolean             has_selection;
+
+  g_return_val_if_fail (GIMP_IS_FILE_PROC_VIEW (view), NULL);
+
+  if (label)  *label  = NULL;
+  if (filter) *filter = NULL;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+  has_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
+
+  /* if there's no selected item, we return the "automatic" procedure, which,
+   * if exists, is the first item.
+   */
+  if (! has_selection)
+    {
+      model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+
+      if (! gtk_tree_model_get_iter_first (model, &iter))
+        return NULL;
+    }
+
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_PROC, &proc,
+                      -1);
+
+  if (proc)
+    {
+      g_object_unref (proc);
+
+      /* there's no selected item, and no "automatic" procedure.  return NULL.
+       */
+      if (! has_selection)
+        return NULL;
+    }
+
+  if (label)
+    {
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_LABEL, label,
+                          -1);
+    }
+
+  if (filter)
+    {
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_FILTER, filter,
+                          -1);
+    }
+
+  return proc;
+}
+
+gboolean
+gimp_file_proc_view_set_proc (GimpFileProcView    *view,
+                              GimpPlugInProcedure *proc)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gboolean      iter_valid;
+
+  g_return_val_if_fail (GIMP_IS_FILE_PROC_VIEW (view), FALSE);
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      GimpPlugInProcedure *this;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_PROC, &this,
+                          -1);
+
+      if (this)
+        g_object_unref (this);
+
+      if (this == proc)
+        break;
+    }
+
+  if (iter_valid)
+    {
+      GtkTreeSelection *selection;
+
+      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+      gtk_tree_selection_select_iter (selection, &iter);
+    }
+
+  return iter_valid;
+}
+
+gchar *
+gimp_file_proc_view_get_help_id (GimpFileProcView *view)
+{
+  GtkTreeModel     *model;
+  GtkTreeSelection *selection;
+  GtkTreeIter       iter;
+
+  g_return_val_if_fail (GIMP_IS_FILE_PROC_VIEW (view), NULL);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    {
+      gchar *help_id;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_HELP_ID, &help_id,
+                          -1);
+
+      return help_id;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_file_proc_view_selection_changed (GtkTreeSelection *selection,
+                                       GimpFileProcView *view)
+{
+  g_signal_emit (view, view_signals[CHANGED], 0);
+}
+
+/**
+ * gimp_file_proc_view_process_procedure:
+ * @file_proc:
+ * @all:
+ *
+ * Creates a #GtkFileFilter of @file_proc and adds the extensions to
+ * the @all filter.
+ * The returned #GtkFileFilter has a normal ref and must be unreffed
+ * when used.
+ **/
+static GtkFileFilter *
+gimp_file_proc_view_process_procedure (GimpPlugInProcedure *file_proc,
+                                       GtkFileFilter       *all)
+{
+  GtkFileFilter *filter;
+  GString       *str;
+  GSList        *list;
+  gint           i;
+
+  if (! file_proc->extensions_list)
+    return NULL;
+
+  filter = gtk_file_filter_new ();
+  str    = g_string_new (gimp_procedure_get_label (GIMP_PROCEDURE (file_proc)));
+
+  /* Take ownership directly so we don't have to mess with a floating
+   * ref
+   */
+  g_object_ref_sink (filter);
+
+  for (list = file_proc->mime_types_list; list; list = g_slist_next (list))
+    {
+      const gchar *mime_type = list->data;
+
+      gtk_file_filter_add_mime_type (filter, mime_type);
+      gtk_file_filter_add_mime_type (all, mime_type);
+    }
+
+  for (list = file_proc->extensions_list, i = 0;
+       list;
+       list = g_slist_next (list), i++)
+    {
+      const gchar *extension = list->data;
+      gchar       *pattern;
+
+      pattern = gimp_file_proc_view_pattern_from_extension (extension);
+      gtk_file_filter_add_pattern (filter, pattern);
+      gtk_file_filter_add_pattern (all, pattern);
+      g_free (pattern);
+
+      if (i == 0)
+        {
+          g_string_append (str, " (");
+        }
+      else if (i <= MAX_EXTENSIONS)
+        {
+          g_string_append (str, ", ");
+        }
+
+      if (i < MAX_EXTENSIONS)
+        {
+          g_string_append (str, "*.");
+          g_string_append (str, extension);
+        }
+      else if (i == MAX_EXTENSIONS)
+        {
+          g_string_append (str, "...");
+        }
+
+      if (! list->next)
+        {
+          g_string_append (str, ")");
+        }
+    }
+
+  gtk_file_filter_set_name (filter, str->str);
+  g_string_free (str, TRUE);
+
+  return filter;
+}
+
+static gchar *
+gimp_file_proc_view_pattern_from_extension (const gchar *extension)
+{
+  gchar *pattern;
+  gchar *p;
+  gint   len, i;
+
+  g_return_val_if_fail (extension != NULL, NULL);
+
+  /* This function assumes that file extensions are 7bit ASCII.  It
+   * could certainly be rewritten to handle UTF-8 if this assumption
+   * turns out to be incorrect.
+   */
+
+  len = strlen (extension);
+
+  pattern = g_new (gchar, 4 + 4 * len);
+
+  strcpy (pattern, "*.");
+
+  for (i = 0, p = pattern + 2; i < len; i++, p+= 4)
+    {
+      p[0] = '[';
+      p[1] = g_ascii_tolower (extension[i]);
+      p[2] = g_ascii_toupper (extension[i]);
+      p[3] = ']';
+    }
+
+  *p = '\0';
+
+  return pattern;
+}
diff --git a/app/widgets/gimpfileprocview.h b/app/widgets/gimpfileprocview.h
new file mode 100644
index 0000000..6facd34
--- /dev/null
+++ b/app/widgets/gimpfileprocview.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfileprocview.h
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILE_PROC_VIEW_H__
+#define __GIMP_FILE_PROC_VIEW_H__
+
+
+#define GIMP_TYPE_FILE_PROC_VIEW            (gimp_file_proc_view_get_type ())
+#define GIMP_FILE_PROC_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcView))
+#define GIMP_FILE_PROC_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcViewClass))
+#define GIMP_IS_FILE_PROC_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILE_PROC_VIEW))
+#define GIMP_IS_FILE_PROC_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILE_PROC_VIEW))
+#define GIMP_FILE_PROC_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcViewClass))
+
+
+typedef struct _GimpFileProcViewClass GimpFileProcViewClass;
+
+struct _GimpFileProcView
+{
+  GtkTreeView        parent_instance;
+
+  GList             *meta_extensions;
+};
+
+struct _GimpFileProcViewClass
+{
+  GtkTreeViewClass   parent_class;
+
+  void (* changed) (GimpFileProcView *view);
+};
+
+
+GType                 gimp_file_proc_view_get_type    (void) G_GNUC_CONST;
+
+GtkWidget           * gimp_file_proc_view_new         (Gimp                 *gimp,
+                                                       GSList               *procedures,
+                                                       const gchar          *automatic,
+                                                       const gchar          *automatic_help_id);
+
+GimpPlugInProcedure * gimp_file_proc_view_get_proc    (GimpFileProcView     *view,
+                                                       gchar               **label,
+                                                       GtkFileFilter       **filter);
+gboolean              gimp_file_proc_view_set_proc    (GimpFileProcView     *view,
+                                                       GimpPlugInProcedure  *proc);
+
+gchar               * gimp_file_proc_view_get_help_id (GimpFileProcView     *view);
+
+
+#endif  /*  __GIMP_FILE_PROC_VIEW_H__  */
diff --git a/app/widgets/gimpfilleditor.c b/app/widgets/gimpfilleditor.c
new file mode 100644
index 0000000..775f6e4
--- /dev/null
+++ b/app/widgets/gimpfilleditor.c
@@ -0,0 +1,218 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilleditor.c
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpfilloptions.h"
+
+#include "gimpcolorpanel.h"
+#include "gimpfilleditor.h"
+#include "gimppropwidgets.h"
+#include "gimpviewablebox.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OPTIONS,
+  PROP_EDIT_CONTEXT
+};
+
+
+static void   gimp_fill_editor_constructed  (GObject      *object);
+static void   gimp_fill_editor_finalize     (GObject      *object);
+static void   gimp_fill_editor_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void   gimp_fill_editor_get_property (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpFillEditor, gimp_fill_editor, GTK_TYPE_BOX)
+
+#define parent_class gimp_fill_editor_parent_class
+
+
+static void
+gimp_fill_editor_class_init (GimpFillEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_fill_editor_constructed;
+  object_class->finalize     = gimp_fill_editor_finalize;
+  object_class->set_property = gimp_fill_editor_set_property;
+  object_class->get_property = gimp_fill_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_OPTIONS,
+                                   g_param_spec_object ("options",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_FILL_OPTIONS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_EDIT_CONTEXT,
+                                   g_param_spec_boolean ("edit-context",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_fill_editor_init (GimpFillEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 6);
+}
+
+static void
+gimp_fill_editor_constructed (GObject *object)
+{
+  GimpFillEditor *editor = GIMP_FILL_EDITOR (object);
+  GtkWidget      *box;
+  GtkWidget      *button;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_FILL_OPTIONS (editor->options));
+
+  box = gimp_prop_enum_radio_box_new (G_OBJECT (editor->options), "style",
+                                      0, 0);
+  gtk_box_pack_start (GTK_BOX (editor), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  if (editor->edit_context)
+    {
+      GtkWidget *color_button;
+      GtkWidget *pattern_box;
+
+      color_button = gimp_prop_color_button_new (G_OBJECT (editor->options),
+                                                 "foreground",
+                                                 _("Fill Color"),
+                                                 -1, 24,
+                                                 GIMP_COLOR_AREA_SMALL_CHECKS);
+      gimp_color_panel_set_context (GIMP_COLOR_PANEL (color_button),
+                                    GIMP_CONTEXT (editor->options));
+      gimp_enum_radio_box_add (GTK_BOX (box), color_button,
+                               GIMP_FILL_STYLE_SOLID, FALSE);
+
+      pattern_box = gimp_prop_pattern_box_new (NULL,
+                                               GIMP_CONTEXT (editor->options),
+                                               NULL, 2,
+                                               "pattern-view-type",
+                                               "pattern-view-size");
+      gimp_enum_radio_box_add (GTK_BOX (box), pattern_box,
+                               GIMP_FILL_STYLE_PATTERN, FALSE);
+    }
+
+  button = gimp_prop_check_button_new (G_OBJECT (editor->options),
+                                       "antialias",
+                                       _("_Antialiasing"));
+  gtk_box_pack_start (GTK_BOX (editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+}
+
+static void
+gimp_fill_editor_finalize (GObject *object)
+{
+  GimpFillEditor *editor = GIMP_FILL_EDITOR (object);
+
+  g_clear_object (&editor->options);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_fill_editor_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpFillEditor *editor = GIMP_FILL_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_OPTIONS:
+      if (editor->options)
+        g_object_unref (editor->options);
+      editor->options = g_value_dup_object (value);
+      break;
+
+    case PROP_EDIT_CONTEXT:
+      editor->edit_context = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_fill_editor_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpFillEditor *editor = GIMP_FILL_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_OPTIONS:
+      g_value_set_object (value, editor->options);
+      break;
+
+    case PROP_EDIT_CONTEXT:
+      g_value_set_boolean (value, editor->edit_context);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_fill_editor_new (GimpFillOptions *options,
+                      gboolean         edit_context)
+{
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+
+  return g_object_new (GIMP_TYPE_FILL_EDITOR,
+                       "options",      options,
+                       "edit-context", edit_context ? TRUE : FALSE,
+                       NULL);
+}
diff --git a/app/widgets/gimpfilleditor.h b/app/widgets/gimpfilleditor.h
new file mode 100644
index 0000000..00c47c1
--- /dev/null
+++ b/app/widgets/gimpfilleditor.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfilleditor.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FILL_EDITOR_H__
+#define __GIMP_FILL_EDITOR_H__
+
+
+#define GIMP_TYPE_FILL_EDITOR            (gimp_fill_editor_get_type ())
+#define GIMP_FILL_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILL_EDITOR, GimpFillEditor))
+#define GIMP_FILL_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILL_EDITOR, GimpFillEditorClass))
+#define GIMP_IS_FILL_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FILL_EDITOR))
+#define GIMP_IS_FILL_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FILL_EDITOR))
+#define GIMP_FILL_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FILL_EDITOR, GimpFillEditorClass))
+
+
+typedef struct _GimpFillEditorClass GimpFillEditorClass;
+
+struct _GimpFillEditor
+{
+  GtkBox           parent_instance;
+
+  GimpFillOptions *options;
+  gboolean         edit_context;
+};
+
+struct _GimpFillEditorClass
+{
+  GtkBoxClass      parent_class;
+};
+
+
+GType       gimp_fill_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_fill_editor_new      (GimpFillOptions *options,
+                                       gboolean         edit_context);
+
+
+#endif /* __GIMP_FILL_EDITOR_H__ */
diff --git a/app/widgets/gimpfontfactoryview.c b/app/widgets/gimpfontfactoryview.c
new file mode 100644
index 0000000..1711696
--- /dev/null
+++ b/app/widgets/gimpfontfactoryview.c
@@ -0,0 +1,101 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfontfactoryview.c
+ * Copyright (C) 2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+
+#include "text/gimpfont.h"
+
+#include "gimpfontfactoryview.h"
+#include "gimpcontainerview.h"
+#include "gimpmenufactory.h"
+#include "gimpviewrenderer.h"
+
+#include "gimp-intl.h"
+
+
+G_DEFINE_TYPE (GimpFontFactoryView, gimp_font_factory_view,
+               GIMP_TYPE_DATA_FACTORY_VIEW)
+
+#define parent_class gimp_font_factory_view_parent_class
+
+
+static void
+gimp_font_factory_view_class_init (GimpFontFactoryViewClass *klass)
+{
+}
+
+static void
+gimp_font_factory_view_init (GimpFontFactoryView *view)
+{
+}
+
+GtkWidget *
+gimp_font_factory_view_new (GimpViewType     view_type,
+                            GimpDataFactory *factory,
+                            GimpContext     *context,
+                            gint             view_size,
+                            gint             view_border_width,
+                            GimpMenuFactory *menu_factory)
+{
+  GimpFontFactoryView *factory_view;
+  GimpContainerEditor *editor;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  factory_view = g_object_new (GIMP_TYPE_FONT_FACTORY_VIEW,
+                               "view-type",         view_type,
+                               "data-factory",      factory,
+                               "context",           context,
+                               "view-size",         view_size,
+                               "view-border-width", view_border_width,
+                               "menu-factory",      menu_factory,
+                               "menu-identifier",   "<Fonts>",
+                               "ui-path",           "/fonts-popup",
+                               "action-group",      "fonts",
+                               NULL);
+
+  editor = GIMP_CONTAINER_EDITOR (factory_view);
+
+  gimp_container_editor_bind_to_async_set (editor,
+                                           gimp_data_factory_get_async_set (factory),
+                                           _("Loading fonts (this may take "
+                                             "a while...)"));
+
+  return GTK_WIDGET (factory_view);
+}
diff --git a/app/widgets/gimpfontfactoryview.h b/app/widgets/gimpfontfactoryview.h
new file mode 100644
index 0000000..8c24e30
--- /dev/null
+++ b/app/widgets/gimpfontfactoryview.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfontfactoryview.h
+ * Copyright (C) 2018 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FONT_FACTORY_VIEW_H__
+#define __GIMP_FONT_FACTORY_VIEW_H__
+
+#include "gimpdatafactoryview.h"
+
+
+#define GIMP_TYPE_FONT_FACTORY_VIEW            (gimp_font_factory_view_get_type ())
+#define GIMP_FONT_FACTORY_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FONT_FACTORY_VIEW, GimpFontFactoryView))
+#define GIMP_FONT_FACTORY_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FONT_FACTORY_VIEW, GimpFontFactoryViewClass))
+#define GIMP_IS_FONT_FACTORY_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FONT_FACTORY_VIEW))
+#define GIMP_IS_FONT_FACTORY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FONT_FACTORY_VIEW))
+#define GIMP_FONT_FACTORY_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FONT_FACTORY_VIEW, GimpFontFactoryViewClass))
+
+
+typedef struct _GimpFontFactoryViewClass GimpFontFactoryViewClass;
+
+struct _GimpFontFactoryView
+{
+  GimpDataFactoryView  parent_instance;
+};
+
+struct _GimpFontFactoryViewClass
+{
+  GimpDataFactoryViewClass  parent_class;
+};
+
+
+GType       gimp_font_factory_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_font_factory_view_new      (GimpViewType     view_type,
+                                             GimpDataFactory *factory,
+                                             GimpContext     *context,
+                                             gint             view_size,
+                                             gint             view_border_width,
+                                             GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_FONT_FACTORY_VIEW_H__  */
diff --git a/app/widgets/gimpfontselect.c b/app/widgets/gimpfontselect.c
new file mode 100644
index 0000000..027e00e
--- /dev/null
+++ b/app/widgets/gimpfontselect.c
@@ -0,0 +1,112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfontselect.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpparamspecs.h"
+
+#include "text/gimpfont.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpcontainerbox.h"
+#include "gimpfontfactoryview.h"
+#include "gimpfontselect.h"
+
+
+static void             gimp_font_select_constructed  (GObject        *object);
+
+static GimpValueArray * gimp_font_select_run_callback (GimpPdbDialog  *dialog,
+                                                       GimpObject     *object,
+                                                       gboolean        closing,
+                                                       GError        **error);
+
+
+G_DEFINE_TYPE (GimpFontSelect, gimp_font_select, GIMP_TYPE_PDB_DIALOG)
+
+#define parent_class gimp_font_select_parent_class
+
+
+static void
+gimp_font_select_class_init (GimpFontSelectClass *klass)
+{
+  GObjectClass       *object_class = G_OBJECT_CLASS (klass);
+  GimpPdbDialogClass *pdb_class    = GIMP_PDB_DIALOG_CLASS (klass);
+
+  object_class->constructed = gimp_font_select_constructed;
+
+  pdb_class->run_callback   = gimp_font_select_run_callback;
+}
+
+static void
+gimp_font_select_init (GimpFontSelect *select)
+{
+}
+
+static void
+gimp_font_select_constructed (GObject *object)
+{
+  GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object);
+  GtkWidget     *content_area;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  dialog->view =
+    gimp_font_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                dialog->context->gimp->font_factory,
+                                dialog->context,
+                                GIMP_VIEW_SIZE_MEDIUM, 1,
+                                dialog->menu_factory);
+
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
+                                       6 * (GIMP_VIEW_SIZE_MEDIUM + 2),
+                                       6 * (GIMP_VIEW_SIZE_MEDIUM + 2));
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->view);
+}
+
+static GimpValueArray *
+gimp_font_select_run_callback (GimpPdbDialog  *dialog,
+                               GimpObject     *object,
+                               gboolean        closing,
+                               GError        **error)
+{
+  return gimp_pdb_execute_procedure_by_name (dialog->pdb,
+                                             dialog->caller_context,
+                                             NULL, error,
+                                             dialog->callback_name,
+                                             G_TYPE_STRING,   gimp_object_get_name (object),
+                                             GIMP_TYPE_INT32, closing,
+                                             G_TYPE_NONE);
+}
diff --git a/app/widgets/gimpfontselect.h b/app/widgets/gimpfontselect.h
new file mode 100644
index 0000000..e3c5a37
--- /dev/null
+++ b/app/widgets/gimpfontselect.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpfontselect.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_FONT_SELECT_H__
+#define __GIMP_FONT_SELECT_H__
+
+#include "gimppdbdialog.h"
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_FONT_SELECT            (gimp_font_select_get_type ())
+#define GIMP_FONT_SELECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FONT_SELECT, GimpFontSelect))
+#define GIMP_FONT_SELECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FONT_SELECT, GimpFontSelectClass))
+#define GIMP_IS_FONT_SELECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FONT_SELECT))
+#define GIMP_IS_FONT_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FONT_SELECT))
+#define GIMP_FONT_SELECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FONT_SELECT, GimpFontSelectClass))
+
+
+typedef struct _GimpFontSelectClass  GimpFontSelectClass;
+
+struct _GimpFontSelect
+{
+  GimpPdbDialog  parent_instance;
+};
+
+struct _GimpFontSelectClass
+{
+  GimpPdbDialogClass  parent_class;
+};
+
+
+GType  gimp_font_select_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_FONT_SELECT_H__ */
diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c
new file mode 100644
index 0000000..a8851c5
--- /dev/null
+++ b/app/widgets/gimpgradienteditor.c
@@ -0,0 +1,2234 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Gradient editor module copyight (C) 1996-1997 Federico Mena Quintero
+ * federico@nuclecu.unam.mx
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURIGHTE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* Special thanks to:
+ *
+ * Luis Albarran (luis4@mindspring.com) - Nice UI suggestions
+ *
+ * Miguel de Icaza (miguel@nuclecu.unam.mx) - Pop-up menu suggestion
+ *
+ * Marcelo Malheiros (malheiro@dca.fee.unicamp.br) - many, many
+ * suggestions, nice gradient files
+ *
+ * Adam Moss (adam@uunet.pipex.com) - idea for the hint bar
+ *
+ * Everyone on #gimp - many suggestions
+ */
+
+/* TODO:
+ *
+ * - Add all of Marcelo's neat suggestions:
+ *   - Hue rotate, saturation, brightness, contrast.
+ *
+ * - Better handling of bogus gradient files and inconsistent
+ *   segments.  Do not loop indefinitely in seg_get_segment_at() if
+ *   there is a missing segment between two others.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+
+#include "gimpcolordialog.h"
+#include "gimpdialogfactory.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpgradienteditor.h"
+#include "gimphelp-ids.h"
+#include "gimpuimanager.h"
+#include "gimpview.h"
+#include "gimpviewrenderergradient.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define EPSILON 1e-10
+
+#define GRAD_SCROLLBAR_STEP_SIZE 0.05
+#define GRAD_SCROLLBAR_PAGE_SIZE 0.75
+
+#define GRAD_VIEW_SIZE            96
+#define GRAD_CONTROL_HEIGHT       14
+#define GRAD_CURRENT_COLOR_WIDTH  16
+
+#define GRAD_MOVE_TIME 150 /* ms between mouse click and detection of movement in gradient control */
+
+
+#define GRAD_VIEW_EVENT_MASK (GDK_EXPOSURE_MASK            | \
+                              GDK_LEAVE_NOTIFY_MASK        | \
+                              GDK_POINTER_MOTION_MASK      | \
+                              GDK_POINTER_MOTION_HINT_MASK | \
+                              GDK_BUTTON_PRESS_MASK        | \
+                              GDK_BUTTON_RELEASE_MASK)
+
+#define GRAD_CONTROL_EVENT_MASK (GDK_EXPOSURE_MASK            | \
+                                 GDK_LEAVE_NOTIFY_MASK        | \
+                                 GDK_POINTER_MOTION_MASK      | \
+                                 GDK_POINTER_MOTION_HINT_MASK | \
+                                 GDK_BUTTON_PRESS_MASK        | \
+                                 GDK_BUTTON_RELEASE_MASK      | \
+                                 GDK_BUTTON1_MOTION_MASK)
+
+
+/*  local function prototypes  */
+
+static void  gimp_gradient_editor_docked_iface_init (GimpDockedInterface *face);
+
+static void   gimp_gradient_editor_constructed      (GObject            *object);
+static void   gimp_gradient_editor_dispose          (GObject            *object);
+
+static void   gimp_gradient_editor_unmap            (GtkWidget          *widget);
+static void   gimp_gradient_editor_set_data         (GimpDataEditor     *editor,
+                                                     GimpData           *data);
+
+static void   gimp_gradient_editor_set_context      (GimpDocked         *docked,
+                                                     GimpContext        *context);
+
+static void   gimp_gradient_editor_update          (GimpGradientEditor  *editor);
+static void   gimp_gradient_editor_gradient_dirty   (GimpGradientEditor *editor,
+                                                     GimpGradient       *gradient);
+static void   gradient_editor_drop_gradient         (GtkWidget          *widget,
+                                                     gint                x,
+                                                     gint                y,
+                                                     GimpViewable       *viewable,
+                                                     gpointer            data);
+static void   gradient_editor_drop_color            (GtkWidget          *widget,
+                                                     gint                x,
+                                                     gint                y,
+                                                     const GimpRGB      *color,
+                                                     gpointer            data);
+static void   gradient_editor_control_drop_color    (GtkWidget          *widget,
+                                                     gint                x,
+                                                     gint                y,
+                                                     const GimpRGB      *color,
+                                                     gpointer            data);
+static void   gradient_editor_scrollbar_update      (GtkAdjustment      *adj,
+                                                     GimpGradientEditor *editor);
+
+static void   gradient_editor_set_hint              (GimpGradientEditor *editor,
+                                                     const gchar        *str1,
+                                                     const gchar        *str2,
+                                                     const gchar        *str3,
+                                                     const gchar        *str4);
+
+static GimpGradientSegment *
+              gradient_editor_save_selection        (GimpGradientEditor *editor);
+static void   gradient_editor_replace_selection     (GimpGradientEditor *editor,
+                                                     GimpGradientSegment *replace_seg);
+
+static void   gradient_editor_left_color_update     (GimpColorDialog    *dialog,
+                                                     const GimpRGB      *color,
+                                                     GimpColorDialogState state,
+                                                     GimpGradientEditor *editor);
+static void   gradient_editor_right_color_update    (GimpColorDialog    *dialog,
+                                                     const GimpRGB      *color,
+                                                     GimpColorDialogState state,
+                                                     GimpGradientEditor *editor);
+
+
+/* Gradient view functions */
+
+static gboolean  view_events                      (GtkWidget          *widget,
+                                                   GdkEvent           *event,
+                                                   GimpGradientEditor *editor);
+static void      view_set_hint                    (GimpGradientEditor *editor,
+                                                   gint                x);
+
+static void      view_pick_color                  (GimpGradientEditor *editor,
+                                                   GimpColorPickTarget pick_target,
+                                                   GimpColorPickState  pick_state,
+                                                   gint                x);
+
+/* Gradient control functions */
+
+static gboolean  control_events                   (GtkWidget          *widget,
+                                                   GdkEvent           *event,
+                                                   GimpGradientEditor *editor);
+static gboolean  control_expose                   (GtkWidget          *widget,
+                                                   GdkEventExpose     *event,
+                                                   GimpGradientEditor *editor);
+static void      control_do_hint                  (GimpGradientEditor *editor,
+                                                   gint                x,
+                                                   gint                y);
+static void      control_button_press             (GimpGradientEditor *editor,
+                                                   gint                x,
+                                                   gint                y,
+                                                   guint               button,
+                                                   guint               state);
+static gboolean  control_point_in_handle          (GimpGradientEditor *editor,
+                                                   GimpGradient       *gradient,
+                                                   gint                x,
+                                                   gint                y,
+                                                   GimpGradientSegment *seg,
+                                                   GradientEditorDragMode handle);
+static void      control_select_single_segment    (GimpGradientEditor  *editor,
+                                                   GimpGradientSegment *seg);
+static void      control_extend_selection         (GimpGradientEditor  *editor,
+                                                   GimpGradientSegment *seg,
+                                                   gdouble              pos);
+static void      control_motion                   (GimpGradientEditor  *editor,
+                                                   GimpGradient        *gradient,
+                                                   gint                 x);
+
+static void      control_compress_left            (GimpGradient        *gradient,
+                                                   GimpGradientSegment *range_l,
+                                                   GimpGradientSegment *range_r,
+                                                   GimpGradientSegment *drag_seg,
+                                                   gdouble              pos);
+
+static double    control_move                     (GimpGradientEditor  *editor,
+                                                   GimpGradientSegment *range_l,
+                                                   GimpGradientSegment *range_r,
+                                                   gdouble              delta);
+
+/* Control update/redraw functions */
+
+static void      control_update                   (GimpGradientEditor *editor,
+                                                   GimpGradient       *gradient,
+                                                   gboolean            recalculate);
+static void      control_draw                     (GimpGradientEditor *editor,
+                                                   GimpGradient       *gradient,
+                                                   cairo_t            *cr,
+                                                   gint                width,
+                                                   gint                height,
+                                                   gdouble             left,
+                                                   gdouble             right);
+static void      control_draw_normal_handle       (GimpGradientEditor *editor,
+                                                   cairo_t            *cr,
+                                                   gdouble             pos,
+                                                   gint                height,
+                                                   gboolean            selected);
+static void      control_draw_middle_handle       (GimpGradientEditor *editor,
+                                                   cairo_t            *cr,
+                                                   gdouble             pos,
+                                                   gint                height,
+                                                   gboolean            selected);
+static void      control_draw_handle              (cairo_t            *cr,
+                                                   GdkColor           *border,
+                                                   GdkColor           *fill,
+                                                   gint                xpos,
+                                                   gint                height);
+
+static gint      control_calc_p_pos               (GimpGradientEditor *editor,
+                                                   gdouble             pos);
+static gdouble   control_calc_g_pos               (GimpGradientEditor *editor,
+                                                   gint                pos);
+
+/* Segment functions */
+
+static void      seg_get_closest_handle           (GimpGradient         *grad,
+                                                   gdouble               pos,
+                                                   GimpGradientSegment **seg,
+                                                   GradientEditorDragMode *handle);
+static gboolean  seg_in_selection                 (GimpGradient         *grad,
+                                                   GimpGradientSegment  *seg,
+                                                   GimpGradientSegment  *left,
+                                                   GimpGradientSegment  *right);
+
+static GtkWidget * gradient_hint_label_add        (GtkBox *box);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpGradientEditor, gimp_gradient_editor,
+                         GIMP_TYPE_DATA_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_gradient_editor_docked_iface_init))
+
+#define parent_class gimp_gradient_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_gradient_editor_class_init (GimpGradientEditorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass      *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpDataEditorClass *editor_class = GIMP_DATA_EDITOR_CLASS (klass);
+
+  object_class->constructed = gimp_gradient_editor_constructed;
+  object_class->dispose     = gimp_gradient_editor_dispose;
+
+  widget_class->unmap       = gimp_gradient_editor_unmap;
+
+  editor_class->set_data    = gimp_gradient_editor_set_data;
+  editor_class->title       = _("Gradient Editor");
+}
+
+static void
+gimp_gradient_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_gradient_editor_set_context;
+}
+
+static void
+gimp_gradient_editor_init (GimpGradientEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+  GtkWidget      *frame;
+  GtkWidget      *vbox;
+  GtkWidget      *hbox;
+  GtkWidget      *hint_vbox;
+  GimpRGB         transp;
+
+  gimp_rgba_set (&transp, 0.0, 0.0, 0.0, 0.0);
+
+  /* Frame for gradient view and gradient control */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  data_editor->view = gimp_view_new_full_by_types (NULL,
+                                                   GIMP_TYPE_VIEW,
+                                                   GIMP_TYPE_GRADIENT,
+                                                   GRAD_VIEW_SIZE,
+                                                   GRAD_VIEW_SIZE, 0,
+                                                   FALSE, FALSE, FALSE);
+  gtk_widget_set_size_request (data_editor->view, -1, GRAD_VIEW_SIZE);
+  gtk_widget_set_events (data_editor->view, GRAD_VIEW_EVENT_MASK);
+  gimp_view_set_expand (GIMP_VIEW (data_editor->view), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), data_editor->view, TRUE, TRUE, 0);
+  gtk_widget_show (data_editor->view);
+
+  g_signal_connect (data_editor->view, "event",
+                    G_CALLBACK (view_events),
+                    editor);
+
+  gimp_dnd_viewable_dest_add (GTK_WIDGET (data_editor->view),
+                              GIMP_TYPE_GRADIENT,
+                              gradient_editor_drop_gradient,
+                              editor);
+
+  gimp_dnd_color_dest_add (GTK_WIDGET (data_editor->view),
+                              gradient_editor_drop_color,
+                              editor);
+
+  /* Gradient control */
+  editor->control = gtk_drawing_area_new ();
+  gtk_widget_set_size_request (editor->control, -1, GRAD_CONTROL_HEIGHT);
+  gtk_widget_set_events (editor->control, GRAD_CONTROL_EVENT_MASK);
+  gtk_box_pack_start (GTK_BOX (vbox), editor->control, FALSE, FALSE, 0);
+  gtk_widget_show (editor->control);
+
+  g_signal_connect (editor->control, "event",
+                    G_CALLBACK (control_events),
+                    editor);
+
+  g_signal_connect (editor->control, "expose-event",
+                    G_CALLBACK (control_expose),
+                    editor);
+
+  gimp_dnd_color_dest_add (GTK_WIDGET (editor->control),
+                              gradient_editor_control_drop_color,
+                              editor);
+
+  /*  Scrollbar  */
+  editor->zoom_factor = 1;
+
+  editor->scroll_data = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0,
+                                                            GRAD_SCROLLBAR_STEP_SIZE,
+                                                            GRAD_SCROLLBAR_PAGE_SIZE,
+                                                            1.0));
+
+  g_signal_connect (editor->scroll_data, "value-changed",
+                    G_CALLBACK (gradient_editor_scrollbar_update),
+                    editor);
+  g_signal_connect (editor->scroll_data, "changed",
+                    G_CALLBACK (gradient_editor_scrollbar_update),
+                    editor);
+
+  editor->scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL,
+                                         editor->scroll_data);
+  gtk_box_pack_start (GTK_BOX (editor), editor->scrollbar, FALSE, FALSE, 0);
+  gtk_widget_show (editor->scrollbar);
+
+  /* Box for current color and the hint labels */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /* Frame showing current active color */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  editor->current_color = gimp_color_area_new (&transp,
+                                               GIMP_COLOR_AREA_SMALL_CHECKS,
+                                               GDK_BUTTON1_MASK |
+                                               GDK_BUTTON2_MASK);
+  gtk_container_add (GTK_CONTAINER (frame), editor->current_color);
+  gtk_widget_set_size_request (editor->current_color,
+                               GRAD_CURRENT_COLOR_WIDTH, -1);
+  gtk_widget_show (editor->current_color);
+
+  /* Hint box */
+  hint_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), hint_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (hint_vbox);
+
+  editor->hint_label1 = gradient_hint_label_add (GTK_BOX (hint_vbox));
+  editor->hint_label2 = gradient_hint_label_add (GTK_BOX (hint_vbox));
+  editor->hint_label3 = gradient_hint_label_add (GTK_BOX (hint_vbox));
+  editor->hint_label4 = gradient_hint_label_add (GTK_BOX (hint_vbox));
+
+  /* Black, 50% Gray, White, Clear */
+  gimp_rgba_set (&editor->saved_colors[0], 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[1], 0.5, 0.5, 0.5, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[2], 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[3], 0.0, 0.0, 0.0, GIMP_OPACITY_TRANSPARENT);
+
+  /* Red, Yellow, Green, Cyan, Blue, Magenta */
+  gimp_rgba_set (&editor->saved_colors[4], 1.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[5], 1.0, 1.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[6], 0.0, 1.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[7], 0.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[8], 0.0, 0.0, 1.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&editor->saved_colors[9], 1.0, 0.0, 1.0, GIMP_OPACITY_OPAQUE);
+}
+
+static void
+gimp_gradient_editor_constructed (GObject *object)
+{
+  GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "gradient-editor",
+                                 "gradient-editor-zoom-out", NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "gradient-editor",
+                                 "gradient-editor-zoom-in", NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "gradient-editor",
+                                 "gradient-editor-zoom-all", NULL);
+}
+
+static void
+gimp_gradient_editor_dispose (GObject *object)
+{
+  GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (object);
+
+  if (editor->color_dialog)
+    gtk_dialog_response (GTK_DIALOG (editor->color_dialog),
+                         GTK_RESPONSE_CANCEL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_gradient_editor_unmap (GtkWidget *widget)
+{
+  GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (widget);
+
+  if (editor->color_dialog)
+    gtk_dialog_response (GTK_DIALOG (editor->color_dialog),
+                         GTK_RESPONSE_CANCEL);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_gradient_editor_set_data (GimpDataEditor *editor,
+                               GimpData       *data)
+{
+  GimpGradientEditor *gradient_editor = GIMP_GRADIENT_EDITOR (editor);
+  GimpData           *old_data;
+
+  if (gradient_editor->color_dialog)
+    gtk_dialog_response (GTK_DIALOG (gradient_editor->color_dialog),
+                         GTK_RESPONSE_CANCEL);
+
+  old_data = gimp_data_editor_get_data (editor);
+
+  if (old_data)
+    g_signal_handlers_disconnect_by_func (old_data,
+                                          gimp_gradient_editor_gradient_dirty,
+                                          gradient_editor);
+
+  GIMP_DATA_EDITOR_CLASS (parent_class)->set_data (editor, data);
+
+  if (data)
+    g_signal_connect_swapped (data, "dirty",
+                              G_CALLBACK (gimp_gradient_editor_gradient_dirty),
+                              gradient_editor);
+
+  gimp_view_set_viewable (GIMP_VIEW (editor->view),
+                          GIMP_VIEWABLE (data));
+
+  control_update (gradient_editor, GIMP_GRADIENT (data), TRUE);
+}
+
+static void
+gimp_gradient_editor_set_context (GimpDocked  *docked,
+                                  GimpContext *context)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (docked);
+
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_view_renderer_set_context (GIMP_VIEW (data_editor->view)->renderer,
+                                  context);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_gradient_editor_new (GimpContext     *context,
+                          GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_GRADIENT_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<GradientEditor>",
+                       "ui-path",         "/gradient-editor-popup",
+                       "data-factory",    context->gimp->gradient_factory,
+                       "context",         context,
+                       "data",            gimp_context_get_gradient (context),
+                       NULL);
+}
+
+void
+gimp_gradient_editor_get_selection (GimpGradientEditor   *editor,
+                                    GimpGradient        **gradient,
+                                    GimpGradientSegment **left,
+                                    GimpGradientSegment **right)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT_EDITOR (editor));
+
+  if (gradient)
+    *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  if (left)
+    *left = editor->control_sel_l;
+
+  if (right)
+    *right = editor->control_sel_r;
+}
+
+void
+gimp_gradient_editor_set_selection (GimpGradientEditor  *editor,
+                                    GimpGradientSegment *left,
+                                    GimpGradientSegment *right)
+{
+  g_return_if_fail (GIMP_IS_GRADIENT_EDITOR (editor));
+  g_return_if_fail (left != NULL);
+  g_return_if_fail (right != NULL);
+
+  editor->control_sel_l = left;
+  editor->control_sel_r = right;
+}
+
+void
+gimp_gradient_editor_edit_left_color (GimpGradientEditor *editor)
+{
+  GimpGradient *gradient;
+
+  g_return_if_fail (GIMP_IS_GRADIENT_EDITOR (editor));
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  if (! gradient              ||
+      ! editor->control_sel_l ||
+      editor->control_sel_l->left_color_type != GIMP_GRADIENT_COLOR_FIXED)
+    return;
+
+  editor->saved_dirty    = gimp_data_is_dirty (GIMP_DATA (gradient));
+  editor->saved_segments = gradient_editor_save_selection (editor);
+
+  editor->color_dialog =
+    gimp_color_dialog_new (GIMP_VIEWABLE (gradient),
+                           GIMP_DATA_EDITOR (editor)->context,
+                           _("Left Endpoint Color"),
+                           GIMP_ICON_GRADIENT,
+                           _("Gradient Segment's Left Endpoint Color"),
+                           GTK_WIDGET (editor),
+                           gimp_dialog_factory_get_singleton (),
+                           "gimp-gradient-editor-color-dialog",
+                           &editor->control_sel_l->left_color,
+                           TRUE, TRUE);
+
+  g_signal_connect (editor->color_dialog, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &editor->color_dialog);
+
+  g_signal_connect (editor->color_dialog, "update",
+                    G_CALLBACK (gradient_editor_left_color_update),
+                    editor);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                          gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+
+  gtk_window_present (GTK_WINDOW (editor->color_dialog));
+}
+
+void
+gimp_gradient_editor_edit_right_color (GimpGradientEditor *editor)
+{
+  GimpGradient *gradient;
+
+  g_return_if_fail (GIMP_IS_GRADIENT_EDITOR (editor));
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  if (! gradient              ||
+      ! editor->control_sel_r ||
+      editor->control_sel_r->right_color_type != GIMP_GRADIENT_COLOR_FIXED)
+    return;
+
+  editor->saved_dirty    = gimp_data_is_dirty (GIMP_DATA (gradient));
+  editor->saved_segments = gradient_editor_save_selection (editor);
+
+  editor->color_dialog =
+    gimp_color_dialog_new (GIMP_VIEWABLE (gradient),
+                           GIMP_DATA_EDITOR (editor)->context,
+                           _("Right Endpoint Color"),
+                           GIMP_ICON_GRADIENT,
+                           _("Gradient Segment's Right Endpoint Color"),
+                           GTK_WIDGET (editor),
+                           gimp_dialog_factory_get_singleton (),
+                           "gimp-gradient-editor-color-dialog",
+                           &editor->control_sel_l->right_color,
+                           TRUE, TRUE);
+
+  g_signal_connect (editor->color_dialog, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &editor->color_dialog);
+
+  g_signal_connect (editor->color_dialog, "update",
+                    G_CALLBACK (gradient_editor_right_color_update),
+                    editor);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                          gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+
+  gtk_window_present (GTK_WINDOW (editor->color_dialog));
+}
+
+void
+gimp_gradient_editor_zoom (GimpGradientEditor *editor,
+                           GimpZoomType        zoom_type)
+{
+  GtkAdjustment *adjustment;
+  gdouble        old_value;
+  gdouble        old_page_size;
+  gdouble        value     = 0.0;
+  gdouble        page_size = 1.0;
+
+  g_return_if_fail (GIMP_IS_GRADIENT_EDITOR (editor));
+
+  adjustment = editor->scroll_data;
+
+  old_value     = gtk_adjustment_get_value (adjustment);
+  old_page_size = gtk_adjustment_get_page_size (adjustment);
+
+  switch (zoom_type)
+    {
+    case GIMP_ZOOM_IN_MAX:
+    case GIMP_ZOOM_IN_MORE:
+    case GIMP_ZOOM_IN:
+      editor->zoom_factor++;
+
+      page_size = 1.0 / editor->zoom_factor;
+      value     = old_value + (old_page_size - page_size) / 2.0;
+      break;
+
+    case GIMP_ZOOM_OUT_MORE:
+    case GIMP_ZOOM_OUT:
+      if (editor->zoom_factor <= 1)
+        return;
+
+      editor->zoom_factor--;
+
+      page_size = 1.0 / editor->zoom_factor;
+      value     = old_value - (page_size - old_page_size) / 2.0;
+
+      if (value < 0.0)
+        value = 0.0;
+      else if ((value + page_size) > 1.0)
+        value = 1.0 - page_size;
+      break;
+
+    case GIMP_ZOOM_OUT_MAX:
+    case GIMP_ZOOM_TO: /* abused as ZOOM_ALL */
+      editor->zoom_factor = 1;
+
+      value     = 0.0;
+      page_size = 1.0;
+      break;
+    }
+
+  gtk_adjustment_configure (adjustment,
+                            value,
+                            gtk_adjustment_get_lower (adjustment),
+                            gtk_adjustment_get_upper (adjustment),
+                            page_size * GRAD_SCROLLBAR_STEP_SIZE,
+                            page_size * GRAD_SCROLLBAR_PAGE_SIZE,
+                            page_size);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_gradient_editor_update (GimpGradientEditor *editor)
+{
+  GimpGradient *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  control_update (editor, gradient, FALSE);
+}
+
+static void
+gimp_gradient_editor_gradient_dirty (GimpGradientEditor *editor,
+                                     GimpGradient       *gradient)
+{
+  GimpGradientSegment *segment;
+  gboolean             left_seen  = FALSE;
+  gboolean             right_seen = FALSE;
+
+  for (segment = gradient->segments; segment; segment = segment->next)
+    {
+      if (segment == editor->control_sel_l)
+        left_seen = TRUE;
+
+      if (segment == editor->control_sel_r)
+        right_seen = TRUE;
+
+      if (right_seen && ! left_seen)
+        {
+          GimpGradientSegment *tmp;
+
+          tmp = editor->control_sel_l;
+          editor->control_sel_l = editor->control_sel_r;
+          editor->control_sel_r = tmp;
+
+          right_seen = FALSE;
+          left_seen  = TRUE;
+        }
+    }
+
+  control_update (editor, gradient, ! (left_seen && right_seen));
+}
+
+static void
+gradient_editor_drop_gradient (GtkWidget    *widget,
+                               gint          x,
+                               gint          y,
+                               GimpViewable *viewable,
+                               gpointer      data)
+{
+  gimp_data_editor_set_data (GIMP_DATA_EDITOR (data), GIMP_DATA (viewable));
+}
+
+static void
+gradient_editor_drop_color (GtkWidget     *widget,
+                            gint           x,
+                            gint           y,
+                            const GimpRGB *color,
+                            gpointer       data)
+{
+  GimpGradientEditor  *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient        *gradient;
+  gdouble              xpos;
+  GimpGradientSegment *seg, *lseg, *rseg;
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  xpos = control_calc_g_pos (editor, x);
+  seg = gimp_gradient_get_segment_at (gradient, xpos);
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  gimp_gradient_segment_split_midpoint (gradient,
+                                        GIMP_DATA_EDITOR (editor)->context,
+                                        seg,
+                                        editor->blend_color_space,
+                                        &lseg, &rseg);
+
+  if (lseg)
+    {
+      lseg->right = xpos;
+      lseg->middle = (lseg->left + lseg->right) / 2.0;
+      lseg->right_color = *color;
+    }
+
+  if (rseg)
+    {
+      rseg->left = xpos;
+      rseg->middle = (rseg->left + rseg->right) / 2.0;
+      rseg->left_color  = *color;
+    }
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+static void
+gradient_editor_control_drop_color (GtkWidget     *widget,
+                                    gint           x,
+                                    gint           y,
+                                    const GimpRGB *color,
+                                    gpointer       data)
+{
+  GimpGradientEditor    *editor = GIMP_GRADIENT_EDITOR (data);
+  GimpGradient          *gradient;
+  gdouble                xpos;
+  GimpGradientSegment   *seg, *lseg, *rseg;
+  GradientEditorDragMode handle;
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  xpos = control_calc_g_pos (editor, x);
+  seg_get_closest_handle (gradient, xpos, &seg, &handle);
+
+  if (seg)
+    {
+      if (handle == GRAD_DRAG_LEFT)
+        {
+          lseg = seg->prev;
+          rseg = seg;
+        }
+      else
+        return;
+    }
+  else
+    {
+      lseg = gimp_gradient_get_segment_at (gradient, xpos);
+      rseg = NULL;
+    }
+
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (lseg)
+    lseg->right_color = *color;
+
+  if (rseg)
+    rseg->left_color  = *color;
+
+  gimp_data_thaw (GIMP_DATA (gradient));
+}
+
+static void
+gradient_editor_scrollbar_update (GtkAdjustment      *adjustment,
+                                  GimpGradientEditor *editor)
+{
+  GimpDataEditor           *data_editor = GIMP_DATA_EDITOR (editor);
+  GimpViewRendererGradient *renderer;
+  gchar                    *str1;
+  gchar                    *str2;
+
+  str1 = g_strdup_printf (_("Zoom factor: %d:1"),
+                          editor->zoom_factor);
+
+  str2 = g_strdup_printf (_("Displaying [%0.4f, %0.4f]"),
+                          gtk_adjustment_get_value (adjustment),
+                          gtk_adjustment_get_value (adjustment) +
+                          gtk_adjustment_get_page_size (adjustment));
+
+  gradient_editor_set_hint (editor, str1, str2, NULL, NULL);
+
+  g_free (str1);
+  g_free (str2);
+
+  renderer = GIMP_VIEW_RENDERER_GRADIENT (GIMP_VIEW (data_editor->view)->renderer);
+
+  gimp_view_renderer_gradient_set_offsets (renderer,
+                                           gtk_adjustment_get_value (adjustment),
+                                           gtk_adjustment_get_value (adjustment) +
+                                           gtk_adjustment_get_page_size (adjustment));
+
+  gimp_view_renderer_update (GIMP_VIEW_RENDERER (renderer));
+  gimp_gradient_editor_update (editor);
+}
+
+static void
+gradient_editor_set_hint (GimpGradientEditor *editor,
+                          const gchar        *str1,
+                          const gchar        *str2,
+                          const gchar        *str3,
+                          const gchar        *str4)
+{
+  gtk_label_set_text (GTK_LABEL (editor->hint_label1), str1);
+  gtk_label_set_text (GTK_LABEL (editor->hint_label2), str2);
+  gtk_label_set_text (GTK_LABEL (editor->hint_label3), str3);
+  gtk_label_set_text (GTK_LABEL (editor->hint_label4), str4);
+}
+
+static GimpGradientSegment *
+gradient_editor_save_selection (GimpGradientEditor *editor)
+{
+  GimpGradientSegment *seg, *prev, *tmp;
+  GimpGradientSegment *oseg, *oaseg;
+
+  prev = NULL;
+  oseg = editor->control_sel_l;
+  tmp  = NULL;
+
+  do
+    {
+      seg = gimp_gradient_segment_new ();
+
+      *seg = *oseg; /* Copy everything */
+
+      if (prev == NULL)
+        tmp = seg; /* Remember first segment */
+      else
+        prev->next = seg;
+
+      seg->prev = prev;
+      seg->next = NULL;
+
+      prev  = seg;
+      oaseg = oseg;
+      oseg  = oseg->next;
+    }
+  while (oaseg != editor->control_sel_r);
+
+  return tmp;
+}
+
+static void
+gradient_editor_replace_selection (GimpGradientEditor  *editor,
+                                   GimpGradientSegment *replace_seg)
+{
+  GimpGradient        *gradient;
+  GimpGradientSegment *lseg, *rseg;
+  GimpGradientSegment *replace_last;
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  /* Remember left and right segments */
+
+  lseg = editor->control_sel_l->prev;
+  rseg = editor->control_sel_r->next;
+
+  replace_last = gimp_gradient_segment_get_last (replace_seg);
+
+  /* Free old selection */
+
+  editor->control_sel_r->next = NULL;
+
+  gimp_gradient_segments_free (editor->control_sel_l);
+
+  /* Link in new segments */
+
+  if (lseg)
+    lseg->next = replace_seg;
+  else
+    gradient->segments = replace_seg;
+
+  replace_seg->prev = lseg;
+
+  if (rseg)
+    rseg->prev = replace_last;
+
+  replace_last->next = rseg;
+
+  editor->control_sel_l = replace_seg;
+  editor->control_sel_r = replace_last;
+}
+
+static void
+gradient_editor_left_color_update (GimpColorDialog      *dialog,
+                                   const GimpRGB        *color,
+                                   GimpColorDialogState  state,
+                                   GimpGradientEditor   *editor)
+{
+  GimpGradient *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_UPDATE:
+      gimp_gradient_segment_range_blend (gradient,
+                                         editor->control_sel_l,
+                                         editor->control_sel_r,
+                                         color,
+                                         &editor->control_sel_r->right_color,
+                                         TRUE, TRUE);
+      break;
+
+    case GIMP_COLOR_DIALOG_OK:
+      gimp_gradient_segment_range_blend (gradient,
+                                         editor->control_sel_l,
+                                         editor->control_sel_r,
+                                         color,
+                                         &editor->control_sel_r->right_color,
+                                         TRUE, TRUE);
+      gimp_gradient_segments_free (editor->saved_segments);
+      gtk_widget_destroy (editor->color_dialog);
+      editor->color_dialog = NULL;
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+      gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                              gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+      break;
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      gradient_editor_replace_selection (editor, editor->saved_segments);
+      if (! editor->saved_dirty)
+        gimp_data_clean (GIMP_DATA (gradient));
+      gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gradient));
+      gtk_widget_destroy (editor->color_dialog);
+      editor->color_dialog = NULL;
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+      gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                              gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+      break;
+    }
+}
+
+static void
+gradient_editor_right_color_update (GimpColorDialog      *dialog,
+                                    const GimpRGB        *color,
+                                    GimpColorDialogState  state,
+                                    GimpGradientEditor   *editor)
+{
+  GimpGradient *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_UPDATE:
+      gimp_gradient_segment_range_blend (gradient,
+                                         editor->control_sel_l,
+                                         editor->control_sel_r,
+                                         &editor->control_sel_l->left_color,
+                                         color,
+                                         TRUE, TRUE);
+      break;
+
+    case GIMP_COLOR_DIALOG_OK:
+      gimp_gradient_segment_range_blend (gradient,
+                                         editor->control_sel_l,
+                                         editor->control_sel_r,
+                                         &editor->control_sel_l->left_color,
+                                         color,
+                                         TRUE, TRUE);
+      gimp_gradient_segments_free (editor->saved_segments);
+      gtk_widget_destroy (editor->color_dialog);
+      editor->color_dialog = NULL;
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+      gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                              gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+      break;
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      gradient_editor_replace_selection (editor, editor->saved_segments);
+      if (! editor->saved_dirty)
+        gimp_data_clean (GIMP_DATA (gradient));
+      gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gradient));
+      gtk_widget_destroy (editor->color_dialog);
+      editor->color_dialog = NULL;
+      gtk_widget_set_sensitive (GTK_WIDGET (editor), TRUE);
+      gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                              gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+      break;
+    }
+}
+
+
+/***** Gradient view functions *****/
+
+static gboolean
+view_events (GtkWidget          *widget,
+             GdkEvent           *event,
+             GimpGradientEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  if (! data_editor->data)
+    return TRUE;
+
+  switch (event->type)
+    {
+    case GDK_LEAVE_NOTIFY:
+      gradient_editor_set_hint (editor, NULL, NULL, NULL, NULL);
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      {
+        GdkEventMotion *mevent = (GdkEventMotion *) event;
+
+        if (mevent->x != editor->view_last_x)
+          {
+            editor->view_last_x = mevent->x;
+
+            if (editor->view_button_down)
+              {
+                view_pick_color (editor,
+                                 (mevent->state & gimp_get_toggle_behavior_mask ()) ?
+                                 GIMP_COLOR_PICK_TARGET_BACKGROUND :
+                                 GIMP_COLOR_PICK_TARGET_FOREGROUND,
+                                 GIMP_COLOR_PICK_STATE_UPDATE,
+                                 mevent->x);
+              }
+            else
+              {
+                view_set_hint (editor, mevent->x);
+              }
+          }
+
+        gdk_event_request_motions (mevent);
+      }
+      break;
+
+    case GDK_BUTTON_PRESS:
+      {
+        GdkEventButton *bevent = (GdkEventButton *) event;
+
+        if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+          {
+            gimp_editor_popup_menu (GIMP_EDITOR (editor), NULL, NULL);
+          }
+        else if (bevent->button == 1)
+          {
+            editor->view_last_x      = bevent->x;
+            editor->view_button_down = TRUE;
+
+            view_pick_color (editor,
+                             (bevent->state & gimp_get_toggle_behavior_mask ()) ?
+                             GIMP_COLOR_PICK_TARGET_BACKGROUND :
+                             GIMP_COLOR_PICK_TARGET_FOREGROUND,
+                             GIMP_COLOR_PICK_STATE_START,
+                             bevent->x);
+          }
+      }
+      break;
+
+    case GDK_SCROLL:
+      {
+        GdkEventScroll *sevent = (GdkEventScroll *) event;
+
+        if (sevent->state & gimp_get_toggle_behavior_mask ())
+          {
+            switch (sevent->direction)
+              {
+              case GDK_SCROLL_UP:
+                gimp_gradient_editor_zoom (editor, GIMP_ZOOM_IN);
+                break;
+
+              case GDK_SCROLL_DOWN:
+                gimp_gradient_editor_zoom (editor, GIMP_ZOOM_OUT);
+                break;
+
+              default:
+                break;
+              }
+          }
+        else
+          {
+            GtkAdjustment *adj   = editor->scroll_data;
+            gfloat         value = gtk_adjustment_get_value (adj);
+
+            switch (sevent->direction)
+              {
+              case GDK_SCROLL_UP:
+                value -= gtk_adjustment_get_page_increment (adj) / 2;
+                break;
+
+              case GDK_SCROLL_DOWN:
+                value += gtk_adjustment_get_page_increment (adj) / 2;
+                break;
+
+              default:
+                break;
+              }
+
+            value = CLAMP (value,
+                           gtk_adjustment_get_lower (adj),
+                           gtk_adjustment_get_upper (adj) -
+                           gtk_adjustment_get_page_size (adj));
+
+            gtk_adjustment_set_value (adj, value);
+          }
+      }
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      if (editor->view_button_down)
+        {
+          GdkEventButton *bevent = (GdkEventButton *) event;
+
+          editor->view_last_x      = bevent->x;
+          editor->view_button_down = FALSE;
+
+          view_pick_color (editor,
+                           (bevent->state & gimp_get_toggle_behavior_mask ()) ?
+                           GIMP_COLOR_PICK_TARGET_BACKGROUND :
+                           GIMP_COLOR_PICK_TARGET_FOREGROUND,
+                           GIMP_COLOR_PICK_STATE_END,
+                           bevent->x);
+          break;
+        }
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+view_set_hint (GimpGradientEditor *editor,
+               gint                x)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+  GimpRGB         rgb;
+  GimpHSV         hsv;
+  gdouble         xpos;
+  gchar          *str1;
+  gchar          *str2;
+  gchar          *str3;
+  gchar          *str4;
+
+  xpos = control_calc_g_pos (editor, x);
+
+  gimp_gradient_get_color_at (GIMP_GRADIENT (data_editor->data),
+                              data_editor->context, NULL,
+                              xpos, FALSE, FALSE, &rgb);
+
+  gimp_color_area_set_color (GIMP_COLOR_AREA (editor->current_color), &rgb);
+
+  gimp_rgb_to_hsv (&rgb, &hsv);
+
+  str1 = g_strdup_printf (_("Position: %0.4f"), xpos);
+  str2 = g_strdup_printf (_("RGB (%0.3f, %0.3f, %0.3f)"),
+                          rgb.r, rgb.g, rgb.b);
+  str3 = g_strdup_printf (_("HSV (%0.1f, %0.1f, %0.1f)"),
+                          hsv.h * 360.0, hsv.s * 100.0, hsv.v * 100.0);
+  str4 = g_strdup_printf (_("Luminance: %0.1f    Opacity: %0.1f"),
+                          GIMP_RGB_LUMINANCE (rgb.r, rgb.g, rgb.b) * 100.0,
+                          rgb.a * 100.0);
+
+  gradient_editor_set_hint (editor, str1, str2, str3, str4);
+
+  g_free (str1);
+  g_free (str2);
+  g_free (str3);
+  g_free (str4);
+}
+
+static void
+view_pick_color (GimpGradientEditor  *editor,
+                 GimpColorPickTarget  pick_target,
+                 GimpColorPickState   pick_state,
+                 gint                 x)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+  GimpRGB         color;
+  gdouble         xpos;
+  gchar          *str2;
+  gchar          *str3;
+
+  xpos = control_calc_g_pos (editor, x);
+
+  gimp_gradient_get_color_at (GIMP_GRADIENT (data_editor->data),
+                              data_editor->context, NULL,
+                              xpos, FALSE, FALSE, &color);
+
+  gimp_color_area_set_color (GIMP_COLOR_AREA (editor->current_color), &color);
+
+  str2 = g_strdup_printf (_("RGB (%d, %d, %d)"),
+                          (gint) (color.r * 255.0),
+                          (gint) (color.g * 255.0),
+                          (gint) (color.b * 255.0));
+
+  str3 = g_strdup_printf ("(%0.3f, %0.3f, %0.3f)", color.r, color.g, color.b);
+
+  if (pick_target == GIMP_COLOR_PICK_TARGET_FOREGROUND)
+    {
+      gimp_context_set_foreground (data_editor->context, &color);
+
+      gradient_editor_set_hint (editor, _("Foreground color set to:"),
+                                str2, str3, NULL);
+    }
+  else
+    {
+      gimp_context_set_background (data_editor->context, &color);
+
+      gradient_editor_set_hint (editor, _("Background color set to:"),
+                                str2, str3, NULL);
+    }
+
+  g_free (str2);
+  g_free (str3);
+}
+
+/***** Gradient control functions *****/
+
+static gboolean
+control_events (GtkWidget          *widget,
+                GdkEvent           *event,
+                GimpGradientEditor *editor)
+{
+  GimpGradient        *gradient;
+  GimpGradientSegment *seg;
+
+  if (! GIMP_DATA_EDITOR (editor)->data)
+    return TRUE;
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  switch (event->type)
+    {
+    case GDK_LEAVE_NOTIFY:
+      gradient_editor_set_hint (editor, NULL, NULL, NULL, NULL);
+      break;
+
+    case GDK_BUTTON_PRESS:
+      if (editor->control_drag_mode == GRAD_DRAG_NONE)
+        {
+          GdkEventButton *bevent = (GdkEventButton *) event;
+
+          editor->control_last_x     = bevent->x;
+          editor->control_click_time = bevent->time;
+
+          control_button_press (editor,
+                                bevent->x, bevent->y,
+                                bevent->button, bevent->state);
+
+          if (editor->control_drag_mode != GRAD_DRAG_NONE)
+            {
+              gtk_grab_add (widget);
+
+              if (GIMP_DATA_EDITOR (editor)->data_editable)
+                {
+                  g_signal_handlers_block_by_func (gradient,
+                                                   gimp_gradient_editor_gradient_dirty,
+                                                   editor);
+                }
+            }
+        }
+      break;
+
+    case GDK_SCROLL:
+      {
+        GdkEventScroll *sevent = (GdkEventScroll *) event;
+
+        if (sevent->state & gimp_get_toggle_behavior_mask ())
+          {
+            if (sevent->direction == GDK_SCROLL_UP)
+              gimp_gradient_editor_zoom (editor, GIMP_ZOOM_IN);
+            else
+              gimp_gradient_editor_zoom (editor, GIMP_ZOOM_OUT);
+          }
+        else
+          {
+            GtkAdjustment *adj = editor->scroll_data;
+
+            gfloat new_value;
+
+            new_value = (gtk_adjustment_get_value (adj) +
+                         ((sevent->direction == GDK_SCROLL_UP) ?
+                          - gtk_adjustment_get_page_increment (adj) / 2 :
+                          gtk_adjustment_get_page_increment (adj) / 2));
+
+            new_value = CLAMP (new_value,
+                               gtk_adjustment_get_lower (adj),
+                               gtk_adjustment_get_upper (adj) -
+                               gtk_adjustment_get_page_size (adj));
+
+            gtk_adjustment_set_value (adj, new_value);
+          }
+      }
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      {
+        GdkEventButton *bevent = (GdkEventButton *) event;
+
+        gradient_editor_set_hint (editor, NULL, NULL, NULL, NULL);
+
+        if (editor->control_drag_mode != GRAD_DRAG_NONE)
+          {
+            if (GIMP_DATA_EDITOR (editor)->data_editable)
+              {
+                g_signal_handlers_unblock_by_func (gradient,
+                                                   gimp_gradient_editor_gradient_dirty,
+                                                   editor);
+              }
+
+            gtk_grab_remove (widget);
+
+            if ((bevent->time - editor->control_click_time) >= GRAD_MOVE_TIME)
+              {
+                /* stuff was done in motion */
+              }
+            else if ((editor->control_drag_mode == GRAD_DRAG_MIDDLE) ||
+                     (editor->control_drag_mode == GRAD_DRAG_ALL))
+              {
+                seg = editor->control_drag_segment;
+
+                if ((editor->control_drag_mode == GRAD_DRAG_ALL) &&
+                    editor->control_compress)
+                  {
+                    control_extend_selection (editor, seg,
+                                              control_calc_g_pos (editor,
+                                                                  bevent->x));
+                  }
+                else
+                  {
+                    control_select_single_segment (editor, seg);
+                  }
+
+                gimp_gradient_editor_update (editor);
+              }
+
+            editor->control_drag_mode = GRAD_DRAG_NONE;
+            editor->control_compress  = FALSE;
+
+            control_do_hint (editor, bevent->x, bevent->y);
+          }
+      }
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      {
+        GdkEventMotion *mevent = (GdkEventMotion *) event;
+
+        if (mevent->x != editor->control_last_x)
+          {
+            editor->control_last_x = mevent->x;
+
+            if (GIMP_DATA_EDITOR (editor)->data_editable &&
+                editor->control_drag_mode != GRAD_DRAG_NONE)
+              {
+
+                if ((mevent->time - editor->control_click_time) >= GRAD_MOVE_TIME)
+                  control_motion (editor, gradient, mevent->x);
+              }
+            else
+              {
+                gimp_gradient_editor_update (editor);
+
+                control_do_hint (editor, mevent->x, mevent->y);
+              }
+          }
+
+        gdk_event_request_motions (mevent);
+      }
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+control_expose (GtkWidget          *widget,
+                GdkEventExpose     *event,
+                GimpGradientEditor *editor)
+{
+  GtkAdjustment *adj = editor->scroll_data;
+  cairo_t       *cr  = gdk_cairo_create (gtk_widget_get_window (widget));
+  GtkAllocation  allocation;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  control_draw (editor,
+                GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data),
+                cr,
+                allocation.width,
+                allocation.height,
+                gtk_adjustment_get_value (adj),
+                gtk_adjustment_get_value (adj) +
+                gtk_adjustment_get_page_size (adj));
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+static void
+control_do_hint (GimpGradientEditor *editor,
+                 gint                x,
+                 gint                y)
+{
+  GimpGradient           *gradient;
+  GimpGradientSegment    *seg;
+  GradientEditorDragMode  handle;
+  gboolean                in_handle;
+  gdouble                 pos;
+  gchar                  *str;
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  pos = control_calc_g_pos (editor, x);
+
+  if ((pos < 0.0) || (pos > 1.0))
+    return;
+
+  seg_get_closest_handle (gradient, pos, &seg, &handle);
+
+  in_handle = control_point_in_handle (editor, gradient,
+                                       x, y, seg, handle);
+
+  if (in_handle)
+    {
+      switch (handle)
+        {
+        case GRAD_DRAG_LEFT:
+          if (seg != NULL)
+            {
+              if (seg->prev != NULL)
+                {
+                  str = g_strdup_printf (_("%s-Drag: move & compress"),
+                                         gimp_get_mod_string (GDK_SHIFT_MASK));
+
+                  gradient_editor_set_hint (editor,
+                                            NULL,
+                                            _("Drag: move"),
+                                            str,
+                                            NULL);
+                  g_free (str);
+                }
+              else
+                {
+                  str = g_strdup_printf (_("%s-Click: extend selection"),
+                                         gimp_get_mod_string (GDK_SHIFT_MASK));
+
+                  gradient_editor_set_hint (editor,
+                                            NULL,
+                                            _("Click: select"),
+                                            str,
+                                            NULL);
+                  g_free (str);
+                }
+            }
+          else
+            {
+              str = g_strdup_printf (_("%s-Click: extend selection"),
+                                     gimp_get_mod_string (GDK_SHIFT_MASK));
+
+              gradient_editor_set_hint (editor,
+                                        NULL,
+                                        _("Click: select"),
+                                        str,
+                                        NULL);
+              g_free (str);
+            }
+          break;
+
+        case GRAD_DRAG_MIDDLE:
+          str = g_strdup_printf (_("%s-Click: extend selection"),
+                                 gimp_get_mod_string (GDK_SHIFT_MASK));
+
+          gradient_editor_set_hint (editor,
+                                    NULL,
+                                    _("Click: select    Drag: move"),
+                                    str,
+                                    NULL);
+          g_free (str);
+          break;
+
+        default:
+          g_warning ("%s: in_handle is true, but received handle type %d.",
+                     G_STRFUNC, in_handle);
+          break;
+        }
+    }
+  else
+    {
+      gchar *str2;
+
+      str  = g_strdup_printf (_("%s-Click: extend selection"),
+                              gimp_get_mod_string (GDK_SHIFT_MASK));
+      str2 = g_strdup_printf (_("%s-Drag: move & compress"),
+                              gimp_get_mod_string (GDK_SHIFT_MASK));
+
+      gradient_editor_set_hint (editor,
+                                _("Click: select    Drag: move"),
+                                str,
+                                str2,
+                                NULL);
+      g_free (str);
+      g_free (str2);
+    }
+}
+
+static void
+control_button_press (GimpGradientEditor *editor,
+                      gint                x,
+                      gint                y,
+                      guint               button,
+                      guint               state)
+{
+  GimpGradient           *gradient;
+  GimpGradientSegment    *seg;
+  GradientEditorDragMode  handle;
+  gdouble                 xpos;
+  gboolean                in_handle;
+
+  gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  if (button == 3)
+    {
+      gimp_editor_popup_menu (GIMP_EDITOR (editor), NULL, NULL);
+      return;
+    }
+
+  /* Find the closest handle */
+
+  xpos = control_calc_g_pos (editor, x);
+
+  seg_get_closest_handle (gradient, xpos, &seg, &handle);
+
+  in_handle = control_point_in_handle (editor, gradient, x, y, seg, handle);
+
+  /* Now see what we have */
+
+  if (in_handle)
+    {
+      switch (handle)
+        {
+        case GRAD_DRAG_LEFT:
+          if (seg != NULL)
+            {
+              /* Left handle of some segment */
+              if (state & GDK_SHIFT_MASK)
+                {
+                  if (seg->prev != NULL)
+                    {
+                      editor->control_drag_mode    = GRAD_DRAG_LEFT;
+                      editor->control_drag_segment = seg;
+                      editor->control_compress     = TRUE;
+                    }
+                  else
+                    {
+                      control_extend_selection (editor, seg, xpos);
+                      gimp_gradient_editor_update (editor);
+                    }
+                }
+              else if (seg->prev != NULL)
+                {
+                  editor->control_drag_mode    = GRAD_DRAG_LEFT;
+                  editor->control_drag_segment = seg;
+                }
+              else
+                {
+                  control_select_single_segment (editor, seg);
+                  gimp_gradient_editor_update (editor);
+                }
+            }
+          else  /* seg == NULL */
+            {
+              /* Right handle of last segment */
+              seg = gimp_gradient_segment_get_last (gradient->segments);
+
+              if (state & GDK_SHIFT_MASK)
+                {
+                  control_extend_selection (editor, seg, xpos);
+                  gimp_gradient_editor_update (editor);
+                }
+              else
+                {
+                  control_select_single_segment (editor, seg);
+                  gimp_gradient_editor_update (editor);
+                }
+            }
+
+          break;
+
+        case GRAD_DRAG_MIDDLE:
+          if (state & GDK_SHIFT_MASK)
+            {
+              control_extend_selection (editor, seg, xpos);
+              gimp_gradient_editor_update (editor);
+            }
+          else
+            {
+              editor->control_drag_mode    = GRAD_DRAG_MIDDLE;
+              editor->control_drag_segment = seg;
+            }
+
+          break;
+
+        default:
+          g_warning ("%s: in_handle is true, but received handle type %d.",
+                     G_STRFUNC, in_handle);
+        }
+    }
+  else  /* !in_handle */
+    {
+      seg = gimp_gradient_get_segment_at (gradient, xpos);
+
+      editor->control_drag_mode    = GRAD_DRAG_ALL;
+      editor->control_drag_segment = seg;
+      editor->control_last_gx      = xpos;
+      editor->control_orig_pos     = xpos;
+
+      if (state & GDK_SHIFT_MASK)
+        editor->control_compress = TRUE;
+    }
+}
+
+static gboolean
+control_point_in_handle (GimpGradientEditor     *editor,
+                         GimpGradient           *gradient,
+                         gint                    x,
+                         gint                    y,
+                         GimpGradientSegment    *seg,
+                         GradientEditorDragMode  handle)
+{
+  gint handle_pos;
+
+  switch (handle)
+    {
+    case GRAD_DRAG_LEFT:
+      if (seg)
+        {
+          handle_pos = control_calc_p_pos (editor, seg->left);
+        }
+      else
+        {
+          seg = gimp_gradient_segment_get_last (gradient->segments);
+
+          handle_pos = control_calc_p_pos (editor, seg->right);
+        }
+
+      break;
+
+    case GRAD_DRAG_MIDDLE:
+      handle_pos = control_calc_p_pos (editor, seg->middle);
+      break;
+
+    default:
+      g_warning ("%s: Cannot handle drag mode %d.", G_STRFUNC, handle);
+      return FALSE;
+    }
+
+  y /= 2;
+
+  if ((x >= (handle_pos - y)) && (x <= (handle_pos + y)))
+    return TRUE;
+  else
+    return FALSE;
+}
+
+/*****/
+
+static void
+control_select_single_segment (GimpGradientEditor  *editor,
+                               GimpGradientSegment *seg)
+{
+  editor->control_sel_l = seg;
+  editor->control_sel_r = seg;
+}
+
+static void
+control_extend_selection (GimpGradientEditor  *editor,
+                          GimpGradientSegment *seg,
+                          gdouble              pos)
+{
+  if (fabs (pos - editor->control_sel_l->left) <
+      fabs (pos - editor->control_sel_r->right))
+    editor->control_sel_l = seg;
+  else
+    editor->control_sel_r = seg;
+}
+
+/*****/
+
+static void
+control_motion (GimpGradientEditor *editor,
+                GimpGradient       *gradient,
+                gint                x)
+{
+  GimpGradientSegment *seg = editor->control_drag_segment;
+  gdouble              pos;
+  gdouble              delta;
+  gchar               *str = NULL;
+
+  switch (editor->control_drag_mode)
+    {
+    case GRAD_DRAG_LEFT:
+      pos = control_calc_g_pos (editor, x);
+
+      if (! editor->control_compress)
+        gimp_gradient_segment_set_left_pos (gradient, seg, pos);
+      else
+        control_compress_left (gradient,
+                               editor->control_sel_l,
+                               editor->control_sel_r,
+                               seg, pos);
+
+      str = g_strdup_printf (_("Handle position: %0.4f"), seg->left);
+      break;
+
+    case GRAD_DRAG_MIDDLE:
+      pos = control_calc_g_pos (editor, x);
+
+      gimp_gradient_segment_set_middle_pos (gradient, seg, pos);
+
+      str = g_strdup_printf (_("Handle position: %0.4f"), seg->middle);
+      break;
+
+    case GRAD_DRAG_ALL:
+      pos    = control_calc_g_pos (editor, x);
+      delta  = pos - editor->control_last_gx;
+
+      if ((seg->left >= editor->control_sel_l->left) &&
+          (seg->right <= editor->control_sel_r->right))
+        delta = control_move (editor,
+                              editor->control_sel_l,
+                              editor->control_sel_r, delta);
+      else
+        delta = control_move (editor, seg, seg, delta);
+
+      editor->control_last_gx += delta;
+
+      str = g_strdup_printf (_("Distance: %0.4f"),
+                             editor->control_last_gx -
+                             editor->control_orig_pos);
+      break;
+
+    default:
+      g_warning ("%s: Attempting to move bogus handle %d.",
+                 G_STRFUNC, editor->control_drag_mode);
+      break;
+    }
+
+  gradient_editor_set_hint (editor, str, NULL, NULL, NULL);
+  g_free (str);
+
+  gimp_gradient_editor_update (editor);
+}
+
+static void
+control_compress_left (GimpGradient        *gradient,
+                       GimpGradientSegment *range_l,
+                       GimpGradientSegment *range_r,
+                       GimpGradientSegment *drag_seg,
+                       gdouble              pos)
+{
+  GimpGradientSegment *seg;
+  gdouble              lbound, rbound;
+  gint                 k;
+
+  /* Check what we have to compress */
+
+  if (!((drag_seg->left >= range_l->left) &&
+        ((drag_seg->right <= range_r->right) || (drag_seg == range_r->next))))
+    {
+      /* We are compressing a segment outside the selection */
+
+      range_l = range_r = drag_seg;
+    }
+
+  /* Calculate left bound for dragged hadle */
+
+  if (drag_seg == range_l)
+    lbound = range_l->prev->left + 2.0 * EPSILON;
+  else
+    {
+      /* Count number of segments to the left of the dragged handle */
+
+      seg = drag_seg;
+      k   = 0;
+
+      while (seg != range_l)
+        {
+          k++;
+          seg = seg->prev;
+        }
+
+      /* 2*k handles have to fit */
+
+      lbound = range_l->left + 2.0 * k * EPSILON;
+    }
+
+  /* Calculate right bound for dragged handle */
+
+  if (drag_seg == range_r->next)
+    rbound = range_r->next->right - 2.0 * EPSILON;
+  else
+    {
+      /* Count number of segments to the right of the dragged handle */
+
+      seg = drag_seg;
+      k   = 1;
+
+      while (seg != range_r)
+        {
+          k++;
+          seg = seg->next;
+        }
+
+      /* 2*k handles have to fit */
+
+      rbound = range_r->right - 2.0 * k * EPSILON;
+    }
+
+  /* Calculate position */
+
+  pos = CLAMP (pos, lbound, rbound);
+
+  /* Compress segments to the left of the handle */
+
+  if (drag_seg == range_l)
+    gimp_gradient_segment_range_compress (gradient,
+                                          range_l->prev, range_l->prev,
+                                          range_l->prev->left, pos);
+  else
+    gimp_gradient_segment_range_compress (gradient,
+                                          range_l, drag_seg->prev,
+                                          range_l->left, pos);
+
+  /* Compress segments to the right of the handle */
+
+  if (drag_seg != range_r->next)
+    gimp_gradient_segment_range_compress (gradient,
+                                          drag_seg, range_r,
+                                          pos, range_r->right);
+  else
+    gimp_gradient_segment_range_compress (gradient,
+                                          drag_seg, drag_seg,
+                                          pos, drag_seg->right);
+}
+
+/*****/
+
+static gdouble
+control_move (GimpGradientEditor  *editor,
+              GimpGradientSegment *range_l,
+              GimpGradientSegment *range_r,
+              gdouble              delta)
+{
+  GimpGradient *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
+
+  return gimp_gradient_segment_range_move (gradient,
+                                           range_l,
+                                           range_r,
+                                           delta,
+                                           editor->control_compress);
+}
+
+/*****/
+
+static void
+control_update (GimpGradientEditor *editor,
+                GimpGradient       *gradient,
+                gboolean            reset_selection)
+{
+  if (! editor->control_sel_l || ! editor->control_sel_r)
+    reset_selection = TRUE;
+
+  if (reset_selection)
+    {
+      if (gradient)
+        control_select_single_segment (editor, gradient->segments);
+      else
+        control_select_single_segment (editor, NULL);
+    }
+
+  gtk_widget_queue_draw (editor->control);
+}
+
+static void
+control_draw (GimpGradientEditor *editor,
+              GimpGradient       *gradient,
+              cairo_t            *cr,
+              gint                width,
+              gint                height,
+              gdouble             left,
+              gdouble             right)
+{
+  GtkStyle               *control_style;
+  GimpGradientSegment    *seg;
+  GradientEditorDragMode  handle;
+  gint                    sel_l;
+  gint                    sel_r;
+  gdouble                 g_pos;
+  gboolean                selected;
+
+  if (! gradient)
+    return;
+
+  /* Draw selection */
+
+  control_style = gtk_widget_get_style (editor->control);
+
+  sel_l = control_calc_p_pos (editor, editor->control_sel_l->left);
+  sel_r = control_calc_p_pos (editor, editor->control_sel_r->right);
+
+  gdk_cairo_set_source_color (cr,
+                              &control_style->base[GTK_STATE_NORMAL]);
+  cairo_rectangle (cr, 0, 0, width, height);
+  cairo_fill (cr);
+
+  gdk_cairo_set_source_color (cr,
+                              &control_style->base[GTK_STATE_SELECTED]);
+  cairo_rectangle (cr, sel_l, 0, sel_r - sel_l + 1, height);
+  cairo_fill (cr);
+
+  /* Draw handles */
+
+  selected = FALSE;
+
+  for (seg = gradient->segments; seg; seg = seg->next)
+    {
+      if (seg == editor->control_sel_l)
+        selected = TRUE;
+
+      control_draw_normal_handle (editor, cr, seg->left,   height, selected);
+      control_draw_middle_handle (editor, cr, seg->middle, height, selected);
+
+      /* Draw right handle only if this is the last segment */
+      if (seg->next == NULL)
+        control_draw_normal_handle (editor, cr, seg->right, height, selected);
+
+      if (seg == editor->control_sel_r)
+        selected = FALSE;
+    }
+
+  /* Draw the handle which is closest to the mouse position */
+
+  g_pos = control_calc_g_pos (editor, editor->control_last_x);
+
+  seg_get_closest_handle (gradient, CLAMP (g_pos, 0.0, 1.0), &seg, &handle);
+
+  selected = (seg &&
+              seg_in_selection (gradient, seg,
+                                editor->control_sel_l, editor->control_sel_r));
+
+  switch (handle)
+    {
+    case GRAD_DRAG_LEFT:
+      if (seg)
+        {
+          control_draw_normal_handle (editor, cr, seg->left, height, selected);
+        }
+      else
+        {
+          seg = gimp_gradient_segment_get_last (gradient->segments);
+
+          selected = (seg == editor->control_sel_r);
+
+          control_draw_normal_handle (editor, cr, seg->right, height, selected);
+        }
+
+      break;
+
+    case GRAD_DRAG_MIDDLE:
+      control_draw_middle_handle (editor, cr, seg->middle, height, selected);
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+control_draw_normal_handle (GimpGradientEditor *editor,
+                            cairo_t            *cr,
+                            gdouble             pos,
+                            gint                height,
+                            gboolean            selected)
+{
+  GtkStyle     *style = gtk_widget_get_style (editor->control);
+  GtkStateType  state = selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL;
+
+  control_draw_handle (cr,
+                       &style->text_aa[state],
+                       &style->black,
+                       control_calc_p_pos (editor, pos), height);
+}
+
+static void
+control_draw_middle_handle (GimpGradientEditor *editor,
+                            cairo_t            *cr,
+                            gdouble             pos,
+                            gint                height,
+                            gboolean            selected)
+{
+  GtkStyle     *style = gtk_widget_get_style (editor->control);
+  GtkStateType  state = selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL;
+
+  control_draw_handle (cr,
+                       &style->text_aa[state],
+                       &style->white,
+                       control_calc_p_pos (editor, pos), height);
+}
+
+static void
+control_draw_handle (cairo_t  *cr,
+                     GdkColor *border,
+                     GdkColor *fill,
+                     gint      xpos,
+                     gint      height)
+{
+  cairo_move_to (cr, xpos, 0);
+  cairo_line_to (cr, xpos - height / 2.0, height);
+  cairo_line_to (cr, xpos + height / 2.0, height);
+  cairo_line_to (cr, xpos, 0);
+
+  gdk_cairo_set_source_color (cr, fill);
+  cairo_fill_preserve (cr);
+
+  gdk_cairo_set_source_color (cr, border);
+  cairo_set_line_width (cr, 1);
+  cairo_stroke (cr);
+}
+
+/*****/
+
+static gint
+control_calc_p_pos (GimpGradientEditor *editor,
+                    gdouble             pos)
+{
+  GtkAdjustment *adjustment = editor->scroll_data;
+  GtkAllocation  allocation;
+  gint           pwidth;
+
+  gtk_widget_get_allocation (editor->control, &allocation);
+
+  pwidth = allocation.width;
+
+  /* Calculate the position (in widget's coordinates) of the
+   * requested point from the gradient.  Rounding is done to
+   * minimize mismatches between the rendered gradient view
+   * and the gradient control's handles.
+   */
+
+  return RINT ((pwidth - 1) * (pos - gtk_adjustment_get_value (adjustment)) /
+               gtk_adjustment_get_page_size (adjustment));
+}
+
+static gdouble
+control_calc_g_pos (GimpGradientEditor *editor,
+                    gint                pos)
+{
+  GtkAdjustment *adjustment = editor->scroll_data;
+  GtkAllocation  allocation;
+  gint           pwidth;
+
+  gtk_widget_get_allocation (editor->control, &allocation);
+
+  pwidth = allocation.width;
+
+  /* Calculate the gradient position that corresponds to widget's coordinates */
+
+  return (gtk_adjustment_get_page_size (adjustment) * pos / (pwidth - 1) +
+          gtk_adjustment_get_value (adjustment));
+}
+
+/***** Segment functions *****/
+
+static void
+seg_get_closest_handle (GimpGradient            *grad,
+                        gdouble                  pos,
+                        GimpGradientSegment    **seg,
+                        GradientEditorDragMode  *handle)
+{
+  gdouble l_delta, m_delta, r_delta;
+
+  *seg = gimp_gradient_get_segment_at (grad, pos);
+
+  m_delta = fabs (pos - (*seg)->middle);
+
+  if (pos < (*seg)->middle)
+    {
+      l_delta = fabs (pos - (*seg)->left);
+
+      if (l_delta < m_delta)
+        *handle = GRAD_DRAG_LEFT;
+      else
+        *handle = GRAD_DRAG_MIDDLE;
+    }
+  else
+    {
+      r_delta = fabs (pos - (*seg)->right);
+
+      if (m_delta < r_delta)
+        {
+          *handle = GRAD_DRAG_MIDDLE;
+        }
+      else
+        {
+          *seg = (*seg)->next;
+          *handle = GRAD_DRAG_LEFT;
+        }
+    }
+}
+
+static gboolean
+seg_in_selection (GimpGradient         *grad,
+                  GimpGradientSegment  *seg,
+                  GimpGradientSegment  *left,
+                  GimpGradientSegment  *right)
+{
+  GimpGradientSegment *s;
+
+  for (s = left; s; s = s->next)
+    {
+      if (s == seg)
+        return TRUE;
+
+      if (s == right)
+        break;
+    }
+
+  return FALSE;
+}
+
+static GtkWidget *
+gradient_hint_label_add (GtkBox *box)
+{
+  GtkWidget *label = g_object_new (GTK_TYPE_LABEL,
+                                   "xalign",           0.0,
+                                   "yalign",           0.5,
+                                   "single-line-mode", TRUE,
+                                   NULL);
+  gtk_box_pack_start (box, label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  return label;
+}
diff --git a/app/widgets/gimpgradienteditor.h b/app/widgets/gimpgradienteditor.h
new file mode 100644
index 0000000..3698d72
--- /dev/null
+++ b/app/widgets/gimpgradienteditor.h
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * Gradient editor module copyight (C) 1996-1997 Federico Mena Quintero
+ * federico@nuclecu.unam.mx
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRADIENT_EDITOR_H__
+#define __GIMP_GRADIENT_EDITOR_H__
+
+
+#include "gimpdataeditor.h"
+
+
+#define GRAD_NUM_COLORS 10
+
+
+typedef enum
+{
+  GRAD_DRAG_NONE = 0,
+  GRAD_DRAG_LEFT,
+  GRAD_DRAG_MIDDLE,
+  GRAD_DRAG_ALL
+} GradientEditorDragMode;
+
+
+#define GIMP_TYPE_GRADIENT_EDITOR            (gimp_gradient_editor_get_type ())
+#define GIMP_GRADIENT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_EDITOR, GimpGradientEditor))
+#define GIMP_GRADIENT_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT_EDITOR, GimpGradientEditorClass))
+#define GIMP_IS_GRADIENT_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT_EDITOR))
+#define GIMP_IS_GRADIENT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT_EDITOR))
+#define GIMP_GRADIENT_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT_EDITOR, GimpGradientEditorClass))
+
+
+typedef struct _GimpGradientEditorClass GimpGradientEditorClass;
+
+struct _GimpGradientEditor
+{
+  GimpDataEditor          parent_instance;
+
+  GtkWidget              *current_color;
+  GtkWidget              *hint_label1;
+  GtkWidget              *hint_label2;
+  GtkWidget              *hint_label3;
+  GtkWidget              *hint_label4;
+  GtkWidget              *scrollbar;
+  GtkWidget              *control;
+
+  /*  Zoom and scrollbar  */
+  guint                   zoom_factor;
+  GtkAdjustment          *scroll_data;
+
+  /*  Gradient view  */
+  gint                    view_last_x;
+  gboolean                view_button_down;
+
+  /*  Gradient control  */
+  GimpGradientSegment    *control_drag_segment; /* Segment which is being dragged */
+  GimpGradientSegment    *control_sel_l;        /* Left segment of selection */
+  GimpGradientSegment    *control_sel_r;        /* Right segment of selection */
+  GradientEditorDragMode  control_drag_mode;    /* What is being dragged? */
+  guint32                 control_click_time;   /* Time when mouse was pressed */
+  gboolean                control_compress;     /* Compressing/expanding handles */
+  gint                    control_last_x;       /* Last mouse position when dragging */
+  gdouble                 control_last_gx;      /* Last position (wrt gradient) when dragging */
+  gdouble                 control_orig_pos;     /* Original click position when dragging */
+
+  GimpGradientBlendColorSpace  blend_color_space;
+
+  /*  Saved colors  */
+  GimpRGB                 saved_colors[GRAD_NUM_COLORS];
+
+  /*  Color dialog  */
+  GtkWidget              *color_dialog;
+  GimpGradientSegment    *saved_segments;
+  gboolean                saved_dirty;
+};
+
+struct _GimpGradientEditorClass
+{
+  GimpDataEditorClass  parent_class;
+};
+
+
+GType       gimp_gradient_editor_get_type         (void) G_GNUC_CONST;
+
+GtkWidget * gimp_gradient_editor_new              (GimpContext          *context,
+                                                   GimpMenuFactory      *menu_factory);
+
+void        gimp_gradient_editor_get_selection    (GimpGradientEditor   *editor,
+                                                   GimpGradient        **gradient,
+                                                   GimpGradientSegment **left,
+                                                   GimpGradientSegment **right);
+void        gimp_gradient_editor_set_selection    (GimpGradientEditor   *editor,
+                                                   GimpGradientSegment  *left,
+                                                   GimpGradientSegment  *right);
+
+void        gimp_gradient_editor_edit_left_color  (GimpGradientEditor   *editor);
+void        gimp_gradient_editor_edit_right_color (GimpGradientEditor   *editor);
+
+void        gimp_gradient_editor_zoom             (GimpGradientEditor   *editor,
+                                                   GimpZoomType          zoom_type);
+
+
+#endif  /* __GIMP_GRADIENT_EDITOR_H__ */
diff --git a/app/widgets/gimpgradientselect.c b/app/widgets/gimpgradientselect.c
new file mode 100644
index 0000000..9d2b285
--- /dev/null
+++ b/app/widgets/gimpgradientselect.c
@@ -0,0 +1,195 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpgradientselect.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpgradient.h"
+#include "core/gimpparamspecs.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpcontainerbox.h"
+#include "gimpdatafactoryview.h"
+#include "gimpgradientselect.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLE_SIZE
+};
+
+
+static void             gimp_gradient_select_constructed  (GObject        *object);
+static void             gimp_gradient_select_set_property (GObject        *object,
+                                                           guint           property_id,
+                                                           const GValue   *value,
+                                                           GParamSpec     *pspec);
+
+static GimpValueArray * gimp_gradient_select_run_callback (GimpPdbDialog  *dialog,
+                                                           GimpObject     *object,
+                                                           gboolean        closing,
+                                                           GError        **error);
+
+
+G_DEFINE_TYPE (GimpGradientSelect, gimp_gradient_select,
+               GIMP_TYPE_PDB_DIALOG)
+
+#define parent_class gimp_gradient_select_parent_class
+
+
+static void
+gimp_gradient_select_class_init (GimpGradientSelectClass *klass)
+{
+  GObjectClass       *object_class = G_OBJECT_CLASS (klass);
+  GimpPdbDialogClass *pdb_class    = GIMP_PDB_DIALOG_CLASS (klass);
+
+  object_class->constructed  = gimp_gradient_select_constructed;
+  object_class->set_property = gimp_gradient_select_set_property;
+
+  pdb_class->run_callback    = gimp_gradient_select_run_callback;
+
+  g_object_class_install_property (object_class, PROP_SAMPLE_SIZE,
+                                   g_param_spec_int ("sample-size", NULL, NULL,
+                                                     0, 10000, 84,
+                                                     GIMP_PARAM_WRITABLE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_gradient_select_init (GimpGradientSelect *select)
+{
+}
+
+static void
+gimp_gradient_select_constructed (GObject *object)
+{
+  GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object);
+  GtkWidget     *content_area;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  dialog->view =
+    gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                dialog->context->gimp->gradient_factory,
+                                dialog->context,
+                                GIMP_VIEW_SIZE_MEDIUM, 1,
+                                dialog->menu_factory, "<Gradients>",
+                                "/gradients-popup",
+                                "gradients");
+
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
+                                       6 * (GIMP_VIEW_SIZE_MEDIUM + 2),
+                                       6 * (GIMP_VIEW_SIZE_MEDIUM + 2));
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->view);
+}
+
+static void
+gimp_gradient_select_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpGradientSelect *select = GIMP_GRADIENT_SELECT (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_SIZE:
+      select->sample_size = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GimpValueArray *
+gimp_gradient_select_run_callback (GimpPdbDialog  *dialog,
+                                   GimpObject     *object,
+                                   gboolean        closing,
+                                   GError        **error)
+{
+  GimpGradient        *gradient = GIMP_GRADIENT (object);
+  GimpGradientSegment *seg      = NULL;
+  gdouble             *values, *pv;
+  gdouble              pos, delta;
+  GimpRGB              color;
+  gint                 i;
+  GimpArray           *array;
+  GimpValueArray      *return_vals;
+
+  i      = GIMP_GRADIENT_SELECT (dialog)->sample_size;
+  pos    = 0.0;
+  delta  = 1.0 / (i - 1);
+
+  values = g_new (gdouble, 4 * i);
+  pv     = values;
+
+  while (i--)
+    {
+      seg = gimp_gradient_get_color_at (gradient, dialog->caller_context,
+                                        seg, pos, FALSE,
+                                        GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
+                                        &color);
+
+      *pv++ = color.r;
+      *pv++ = color.g;
+      *pv++ = color.b;
+      *pv++ = color.a;
+
+      pos += delta;
+    }
+
+  array = gimp_array_new ((guint8 *) values,
+                          GIMP_GRADIENT_SELECT (dialog)->sample_size * 4 *
+                          sizeof (gdouble),
+                          TRUE);
+  array->static_data = FALSE;
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name (dialog->pdb,
+                                        dialog->caller_context,
+                                        NULL, error,
+                                        dialog->callback_name,
+                                        G_TYPE_STRING,         gimp_object_get_name (object),
+                                        GIMP_TYPE_INT32,       array->length / sizeof (gdouble),
+                                        GIMP_TYPE_FLOAT_ARRAY, array,
+                                        GIMP_TYPE_INT32,       closing,
+                                        G_TYPE_NONE);
+
+  gimp_array_free (array);
+
+  return return_vals;
+}
diff --git a/app/widgets/gimpgradientselect.h b/app/widgets/gimpgradientselect.h
new file mode 100644
index 0000000..ec2f9b0
--- /dev/null
+++ b/app/widgets/gimpgradientselect.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpgradientselect.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRADIENT_SELECT_H__
+#define __GIMP_GRADIENT_SELECT_H__
+
+#include "gimppdbdialog.h"
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_GRADIENT_SELECT            (gimp_gradient_select_get_type ())
+#define GIMP_GRADIENT_SELECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_SELECT, GimpGradientSelect))
+#define GIMP_GRADIENT_SELECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRADIENT_SELECT, GimpGradientSelectClass))
+#define GIMP_IS_GRADIENT_SELECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRADIENT_SELECT))
+#define GIMP_IS_GRADIENT_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRADIENT_SELECT))
+#define GIMP_GRADIENT_SELECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRADIENT_SELECT, GimpGradientSelectClass))
+
+
+typedef struct _GimpGradientSelectClass  GimpGradientSelectClass;
+
+struct _GimpGradientSelect
+{
+  GimpPdbDialog  parent_instance;
+
+  gint           sample_size;
+};
+
+struct _GimpGradientSelectClass
+{
+  GimpPdbDialogClass  parent_class;
+};
+
+
+GType  gimp_gradient_select_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_GRADIENT_SELECT_H__ */
diff --git a/app/widgets/gimpgrideditor.c b/app/widgets/gimpgrideditor.c
new file mode 100644
index 0000000..44232bd
--- /dev/null
+++ b/app/widgets/gimpgrideditor.c
@@ -0,0 +1,334 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGridEditor
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpgrid.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpcolorpanel.h"
+#include "gimpgrideditor.h"
+#include "gimppropwidgets.h"
+
+#include "gimp-intl.h"
+
+
+#define GRID_EDITOR_DEFAULT_RESOLUTION   72.0
+#define GRID_EDITOR_COLOR_BUTTON_WIDTH   60
+#define GRID_EDITOR_COLOR_BUTTON_HEIGHT  24
+
+
+enum
+{
+  PROP_0,
+  PROP_GRID,
+  PROP_CONTEXT,
+  PROP_XRESOLUTION,
+  PROP_YRESOLUTION
+};
+
+
+static void   gimp_grid_editor_constructed  (GObject      *object);
+static void   gimp_grid_editor_finalize     (GObject      *object);
+static void   gimp_grid_editor_set_property (GObject      *object,
+                                             guint         property_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec);
+static void   gimp_grid_editor_get_property (GObject      *object,
+                                             guint         property_id,
+                                             GValue       *value,
+                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpGridEditor, gimp_grid_editor, GTK_TYPE_BOX)
+
+#define parent_class gimp_grid_editor_parent_class
+
+
+static void
+gimp_grid_editor_class_init (GimpGridEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_grid_editor_constructed;
+  object_class->set_property = gimp_grid_editor_set_property;
+  object_class->get_property = gimp_grid_editor_get_property;
+  object_class->finalize     = gimp_grid_editor_finalize;
+
+  g_object_class_install_property (object_class, PROP_GRID,
+                                   g_param_spec_object ("grid", NULL, NULL,
+                                                        GIMP_TYPE_GRID,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_XRESOLUTION,
+                                   g_param_spec_double ("xresolution", NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        GRID_EDITOR_DEFAULT_RESOLUTION,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_YRESOLUTION,
+                                   g_param_spec_double ("yresolution", NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        GRID_EDITOR_DEFAULT_RESOLUTION,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_grid_editor_init (GimpGridEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
+}
+
+static void
+gimp_grid_editor_constructed (GObject *object)
+{
+  GimpGridEditor *editor = GIMP_GRID_EDITOR (object);
+  GtkWidget      *frame;
+  GtkWidget      *hbox;
+  GtkWidget      *table;
+  GtkWidget      *style;
+  GtkWidget      *color_button;
+  GtkWidget      *sizeentry;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (editor->grid != NULL);
+
+  frame = gimp_frame_new (_("Appearance"));
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (3, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+
+  style = gimp_prop_enum_combo_box_new (G_OBJECT (editor->grid), "style",
+                                        GIMP_GRID_DOTS,
+                                        GIMP_GRID_SOLID);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("Line _style:"), 0.0, 0.5,
+                             style, 1, FALSE);
+
+  color_button = gimp_prop_color_button_new (G_OBJECT (editor->grid), "fgcolor",
+                                             _("Change grid foreground color"),
+                                             GRID_EDITOR_COLOR_BUTTON_WIDTH,
+                                             GRID_EDITOR_COLOR_BUTTON_HEIGHT,
+                                             GIMP_COLOR_AREA_FLAT);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (color_button),
+                                editor->context);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                             _("_Foreground color:"), 0.0, 0.5,
+                             color_button, 1, TRUE);
+
+  color_button = gimp_prop_color_button_new (G_OBJECT (editor->grid), "bgcolor",
+                                             _("Change grid background color"),
+                                             GRID_EDITOR_COLOR_BUTTON_WIDTH,
+                                             GRID_EDITOR_COLOR_BUTTON_HEIGHT,
+                                             GIMP_COLOR_AREA_FLAT);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (color_button),
+                                editor->context);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
+                             _("_Background color:"), 0.0, 0.5,
+                             color_button, 1, TRUE);
+
+  gtk_widget_show (table);
+
+  frame = gimp_frame_new (_("Spacing"));
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+
+  sizeentry = gimp_prop_coordinates_new (G_OBJECT (editor->grid),
+                                         "xspacing",
+                                         "yspacing",
+                                         "spacing-unit",
+                                         "%a",
+                                         GIMP_SIZE_ENTRY_UPDATE_SIZE,
+                                         editor->xresolution,
+                                         editor->yresolution,
+                                         TRUE);
+
+  gtk_table_set_col_spacings (GTK_TABLE (sizeentry), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (sizeentry), 2);
+
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry),
+                                _("Horizontal"), 0, 1, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry),
+                                _("Vertical"), 0, 2, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry),
+                                _("Pixels"), 1, 4, 0.0);
+
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (sizeentry), 0, 2);
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (sizeentry), 1, 2);
+
+  gtk_box_pack_start (GTK_BOX (hbox), sizeentry, FALSE, FALSE, 0);
+  gtk_widget_show (sizeentry);
+
+  gtk_widget_show (hbox);
+
+  frame = gimp_frame_new (_("Offset"));
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+
+  sizeentry = gimp_prop_coordinates_new (G_OBJECT (editor->grid),
+                                         "xoffset",
+                                         "yoffset",
+                                         "offset-unit",
+                                         "%a",
+                                         GIMP_SIZE_ENTRY_UPDATE_SIZE,
+                                         editor->xresolution,
+                                         editor->yresolution,
+                                         TRUE);
+
+  gtk_table_set_col_spacings (GTK_TABLE (sizeentry), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (sizeentry), 2);
+
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry),
+                                _("Horizontal"), 0, 1, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry),
+                                _("Vertical"), 0, 2, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry),
+                                _("Pixels"), 1, 4, 0.0);
+
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (sizeentry), 0, 2);
+  gimp_size_entry_set_refval_digits (GIMP_SIZE_ENTRY (sizeentry), 1, 2);
+
+  gtk_box_pack_start (GTK_BOX (hbox), sizeentry, FALSE, FALSE, 0);
+  gtk_widget_show (sizeentry);
+
+  gtk_widget_show (hbox);
+}
+
+static void
+gimp_grid_editor_finalize (GObject *object)
+{
+  GimpGridEditor *editor = GIMP_GRID_EDITOR (object);
+
+  g_clear_object (&editor->grid);
+  g_clear_object (&editor->context);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_grid_editor_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpGridEditor *editor = GIMP_GRID_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GRID:
+      editor->grid = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTEXT:
+      editor->context = g_value_dup_object (value);
+      break;
+
+    case PROP_XRESOLUTION:
+      editor->xresolution = g_value_get_double (value);
+      break;
+
+    case PROP_YRESOLUTION:
+      editor->yresolution = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_grid_editor_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpGridEditor *editor = GIMP_GRID_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GRID:
+      g_value_set_object (value, editor->grid);
+      break;
+
+    case PROP_CONTEXT:
+      g_value_set_object (value, editor->context);
+      break;
+
+    case PROP_XRESOLUTION:
+      g_value_set_double (value, editor->xresolution);
+      break;
+
+    case PROP_YRESOLUTION:
+      g_value_set_double (value, editor->yresolution);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_grid_editor_new (GimpGrid    *grid,
+                      GimpContext *context,
+                      gdouble      xresolution,
+                      gdouble      yresolution)
+{
+  g_return_val_if_fail (GIMP_IS_GRID (grid), NULL);
+
+  return g_object_new (GIMP_TYPE_GRID_EDITOR,
+                       "grid",        grid,
+                       "context",     context,
+                       "xresolution", xresolution,
+                       "yresolution", yresolution,
+                       NULL);
+}
diff --git a/app/widgets/gimpgrideditor.h b/app/widgets/gimpgrideditor.h
new file mode 100644
index 0000000..659674b
--- /dev/null
+++ b/app/widgets/gimpgrideditor.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpGridEditor
+ * Copyright (C) 2003  Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_GRID_EDITOR_H__
+#define __GIMP_GRID_EDITOR_H__
+
+
+#define GIMP_TYPE_GRID_EDITOR            (gimp_grid_editor_get_type ())
+#define GIMP_GRID_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRID_EDITOR, GimpGridEditor))
+#define GIMP_GRID_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRID_EDITOR, GimpGridEditorClass))
+#define GIMP_IS_GRID_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GRID_EDITOR))
+#define GIMP_IS_GRID_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GRID_EDITOR))
+#define GIMP_GRID_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GRID_EDITOR, GimpGridEditorClass))
+
+
+typedef struct _GimpGridEditorClass GimpGridEditorClass;
+
+struct _GimpGridEditor
+{
+  GtkBox       parent_instance;
+
+  GimpGrid    *grid;
+  GimpContext *context;
+  gdouble      xresolution;
+  gdouble      yresolution;
+};
+
+struct _GimpGridEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_grid_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_grid_editor_new      (GimpGrid    *grid,
+                                       GimpContext *context,
+                                       gdouble      xresolution,
+                                       gdouble      yresolution);
+
+
+#endif /*  __GIMP_GRID_EDITOR_H__  */
diff --git a/app/widgets/gimphandlebar.c b/app/widgets/gimphandlebar.c
new file mode 100644
index 0000000..09b425b
--- /dev/null
+++ b/app/widgets/gimphandlebar.c
@@ -0,0 +1,441 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "gimphandlebar.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION
+};
+
+
+/*  local function prototypes  */
+
+static void      gimp_handle_bar_set_property       (GObject        *object,
+                                                     guint           property_id,
+                                                     const GValue   *value,
+                                                     GParamSpec     *pspec);
+static void      gimp_handle_bar_get_property       (GObject        *object,
+                                                     guint           property_id,
+                                                     GValue         *value,
+                                                     GParamSpec     *pspec);
+
+static gboolean  gimp_handle_bar_expose             (GtkWidget      *widget,
+                                                     GdkEventExpose *eevent);
+static gboolean  gimp_handle_bar_button_press       (GtkWidget      *widget,
+                                                     GdkEventButton *bevent);
+static gboolean  gimp_handle_bar_button_release     (GtkWidget      *widget,
+                                                     GdkEventButton *bevent);
+static gboolean  gimp_handle_bar_motion_notify      (GtkWidget      *widget,
+                                                     GdkEventMotion *mevent);
+
+static void      gimp_handle_bar_adjustment_changed (GtkAdjustment  *adjustment,
+                                                     GimpHandleBar  *bar);
+
+
+G_DEFINE_TYPE (GimpHandleBar, gimp_handle_bar, GTK_TYPE_EVENT_BOX)
+
+#define parent_class gimp_handle_bar_parent_class
+
+
+static void
+gimp_handle_bar_class_init (GimpHandleBarClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->set_property         = gimp_handle_bar_set_property;
+  object_class->get_property         = gimp_handle_bar_get_property;
+
+  widget_class->expose_event         = gimp_handle_bar_expose;
+  widget_class->button_press_event   = gimp_handle_bar_button_press;
+  widget_class->button_release_event = gimp_handle_bar_button_release;
+  widget_class->motion_notify_event  = gimp_handle_bar_motion_notify;
+
+  g_object_class_install_property (object_class, PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation",
+                                                      NULL, NULL,
+                                                      GTK_TYPE_ORIENTATION,
+                                                      GTK_ORIENTATION_HORIZONTAL,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_handle_bar_init (GimpHandleBar *bar)
+{
+  gtk_widget_add_events (GTK_WIDGET (bar),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_BUTTON_MOTION_MASK);
+
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (bar), FALSE);
+
+  bar->orientation = GTK_ORIENTATION_HORIZONTAL;
+
+  bar->limits_set  = FALSE;
+  bar->lower       = 0.0;
+  bar->upper       = 1.0;
+}
+
+static void
+gimp_handle_bar_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpHandleBar *bar = GIMP_HANDLE_BAR (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      bar->orientation = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_handle_bar_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpHandleBar *bar = GIMP_HANDLE_BAR (object);
+
+  switch (property_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, bar->orientation);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_handle_bar_expose (GtkWidget      *widget,
+                        GdkEventExpose *eevent)
+{
+  GimpHandleBar *bar = GIMP_HANDLE_BAR (widget);
+  GtkAllocation  allocation;
+  cairo_t       *cr;
+  gint           x, y;
+  gint           width, height;
+  gint           i;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  x = y = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+  width  = allocation.width  - 2 * x;
+  height = allocation.height - 2 * y;
+
+  if (! gtk_widget_get_has_window (widget))
+    {
+      x += allocation.x;
+      y += allocation.y;
+    }
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+  gdk_cairo_region (cr, eevent->region);
+  cairo_clip (cr);
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_translate (cr, 0.5, 0.5);
+
+  for (i = 0; i < 3; i++)
+    {
+      bar->slider_pos[i] = -1;
+
+      if (bar->slider_adj[i])
+        {
+          bar->slider_pos[i] = ROUND ((gdouble) (width - 1) *
+                                      (gtk_adjustment_get_value (bar->slider_adj[i]) - bar->lower) /
+                                      (bar->upper - bar->lower));
+
+          cairo_set_source_rgb (cr, 0.5 * i, 0.5 * i, 0.5 * i);
+
+          cairo_move_to (cr,
+                         x + bar->slider_pos[i],
+                         y);
+          cairo_line_to (cr,
+                         x + bar->slider_pos[i] - (height - 1) / 2,
+                         y + height - 1);
+          cairo_line_to (cr,
+                         x + bar->slider_pos[i] + (height - 1) / 2,
+                         y + height - 1);
+          cairo_line_to (cr,
+                         x + bar->slider_pos[i],
+                         y);
+
+          cairo_fill_preserve (cr);
+
+          /* Make all sliders well visible even on similar colored
+           * backgrounds.
+           */
+          if (i == 0)
+            cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
+          else
+            cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+
+          cairo_stroke (cr);
+        }
+    }
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_handle_bar_button_press (GtkWidget      *widget,
+                              GdkEventButton *bevent)
+{
+  GimpHandleBar *bar= GIMP_HANDLE_BAR (widget);
+  GtkAllocation  allocation;
+  gint           border;
+  gint           width;
+  gdouble        value;
+  gint           min_dist;
+  gint           i;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  border = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  width  = allocation.width - 2 * border;
+
+  if (width < 1)
+    return FALSE;
+
+  min_dist = G_MAXINT;
+  for (i = 0; i < 3; i++)
+    if (bar->slider_pos[i] != -1)
+      {
+        gdouble dist = bevent->x - bar->slider_pos[i] + border;
+
+        if (fabs (dist) < min_dist ||
+            (fabs (dist) == min_dist && dist > 0))
+          {
+            bar->active_slider = i;
+            min_dist = fabs (dist);
+          }
+      }
+
+  if (width == 1)
+    value = 0;
+  else
+    value = ((gdouble) (bevent->x - border) /
+             (gdouble) (width - 1) *
+             (bar->upper - bar->lower));
+
+  gtk_adjustment_set_value (bar->slider_adj[bar->active_slider], value);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_handle_bar_button_release (GtkWidget      *widget,
+                                GdkEventButton *bevent)
+{
+  return TRUE;
+}
+
+static gboolean
+gimp_handle_bar_motion_notify (GtkWidget      *widget,
+                               GdkEventMotion *mevent)
+{
+  GimpHandleBar *bar    = GIMP_HANDLE_BAR (widget);
+  GtkAllocation  allocation;
+  gint           border;
+  gint           width;
+  gdouble        value;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  border = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  width  = allocation.width - 2 * border;
+
+  if (width < 1)
+    return FALSE;
+
+  if (width == 1)
+    value = 0;
+  else
+    value = ((gdouble) (mevent->x - border) /
+             (gdouble) (width - 1) *
+             (bar->upper - bar->lower));
+
+  gtk_adjustment_set_value (bar->slider_adj[bar->active_slider], value);
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_handle_bar_new:
+ * @orientation: whether the bar should be oriented horizontally or
+ *               vertically
+ *
+ * Creates a new #GimpHandleBar widget.
+ *
+ * Return value: The new #GimpHandleBar widget.
+ **/
+GtkWidget *
+gimp_handle_bar_new (GtkOrientation  orientation)
+{
+  return g_object_new (GIMP_TYPE_HANDLE_BAR,
+                       "orientation", orientation,
+                       NULL);
+}
+
+void
+gimp_handle_bar_set_adjustment (GimpHandleBar  *bar,
+                                gint            handle_no,
+                                GtkAdjustment  *adjustment)
+{
+  g_return_if_fail (GIMP_IS_HANDLE_BAR (bar));
+  g_return_if_fail (handle_no >= 0 && handle_no <= 2);
+  g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment));
+
+  if (adjustment == bar->slider_adj[handle_no])
+    return;
+
+  if (bar->slider_adj[handle_no])
+    {
+      g_signal_handlers_disconnect_by_func (bar->slider_adj[handle_no],
+                                            gimp_handle_bar_adjustment_changed,
+                                            bar);
+
+      g_object_unref (bar->slider_adj[handle_no]);
+    }
+
+  bar->slider_adj[handle_no] = adjustment;
+
+  if (bar->slider_adj[handle_no])
+    {
+      g_object_ref (bar->slider_adj[handle_no]);
+
+      g_signal_connect (bar->slider_adj[handle_no], "value-changed",
+                        G_CALLBACK (gimp_handle_bar_adjustment_changed),
+                        bar);
+      g_signal_connect (bar->slider_adj[handle_no], "changed",
+                        G_CALLBACK (gimp_handle_bar_adjustment_changed),
+                        bar);
+    }
+
+  gimp_handle_bar_adjustment_changed (bar->slider_adj[handle_no], bar);
+}
+
+void
+gimp_handle_bar_set_limits (GimpHandleBar *bar,
+                            gdouble        lower,
+                            gdouble        upper)
+{
+  g_return_if_fail (GIMP_IS_HANDLE_BAR (bar));
+
+  bar->limits_set = TRUE;
+  bar->lower      = lower;
+  bar->upper      = upper;
+
+  gtk_widget_queue_draw (GTK_WIDGET (bar));
+}
+
+void
+gimp_handle_bar_unset_limits (GimpHandleBar *bar)
+{
+  g_return_if_fail (GIMP_IS_HANDLE_BAR (bar));
+
+  bar->limits_set = FALSE;
+  bar->lower      = 0.0;
+  bar->upper      = 1.0;
+
+  gimp_handle_bar_adjustment_changed (NULL, bar);
+}
+
+gboolean
+gimp_handle_bar_get_limits (GimpHandleBar *bar,
+                            gdouble       *lower,
+                            gdouble       *upper)
+{
+  g_return_val_if_fail (GIMP_IS_HANDLE_BAR (bar), FALSE);
+
+  if (lower) *lower = bar->lower;
+  if (upper) *upper = bar->upper;
+
+  return bar->limits_set;
+}
+
+void
+gimp_handle_bar_connect_events (GimpHandleBar *bar,
+                                GtkWidget     *event_source)
+{
+  GtkWidgetClass *widget_class;
+
+  g_return_if_fail (GIMP_IS_HANDLE_BAR (bar));
+  g_return_if_fail (GTK_IS_WIDGET (event_source));
+
+  widget_class = GTK_WIDGET_GET_CLASS (bar);
+
+  g_signal_connect_object (event_source, "button-press-event",
+                           G_CALLBACK (widget_class->button_press_event),
+                           bar, G_CONNECT_SWAPPED);
+
+  g_signal_connect_object (event_source, "button-release-event",
+                           G_CALLBACK (widget_class->button_release_event),
+                           bar, G_CONNECT_SWAPPED);
+
+  g_signal_connect_object (event_source, "motion-notify-event",
+                           G_CALLBACK (widget_class->motion_notify_event),
+                           bar, G_CONNECT_SWAPPED);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_handle_bar_adjustment_changed (GtkAdjustment *adjustment,
+                                    GimpHandleBar *bar)
+{
+  if (! bar->limits_set)
+    {
+      if (bar->slider_adj[0])
+        bar->lower = gtk_adjustment_get_lower (bar->slider_adj[0]);
+
+      if (bar->slider_adj[2])
+        bar->upper = gtk_adjustment_get_upper (bar->slider_adj[2]);
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (bar));
+}
diff --git a/app/widgets/gimphandlebar.h b/app/widgets/gimphandlebar.h
new file mode 100644
index 0000000..6007d50
--- /dev/null
+++ b/app/widgets/gimphandlebar.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HANDLE_BAR_H__
+#define __GIMP_HANDLE_BAR_H__
+
+
+#define GIMP_TYPE_HANDLE_BAR            (gimp_handle_bar_get_type ())
+#define GIMP_HANDLE_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HANDLE_BAR, GimpHandleBar))
+#define GIMP_HANDLE_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HANDLE_BAR, GimpHandleBarClass))
+#define GIMP_IS_HANDLE_BAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HANDLE_BAR))
+#define GIMP_IS_HANDLE_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HANDLE_BAR))
+#define GIMP_HANDLE_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HANDLE_BAR, GimpHandleBarClass))
+
+
+typedef struct _GimpHandleBarClass  GimpHandleBarClass;
+
+struct _GimpHandleBar
+{
+  GtkEventBox     parent_class;
+
+  GtkOrientation  orientation;
+
+  GtkAdjustment  *slider_adj[3];
+  gboolean        limits_set;
+  gdouble         lower;
+  gdouble         upper;
+
+  gint            slider_pos[3];
+  gint            active_slider;
+};
+
+struct _GimpHandleBarClass
+{
+  GtkEventBoxClass   parent_class;
+};
+
+
+GType       gimp_handle_bar_get_type       (void) G_GNUC_CONST;
+
+GtkWidget * gimp_handle_bar_new            (GtkOrientation  orientation);
+
+void        gimp_handle_bar_set_adjustment (GimpHandleBar  *bar,
+                                            gint            handle_no,
+                                            GtkAdjustment  *adjustment);
+
+void        gimp_handle_bar_set_limits     (GimpHandleBar  *bar,
+                                            gdouble         lower,
+                                            gdouble         upper);
+void        gimp_handle_bar_unset_limits   (GimpHandleBar  *bar);
+gboolean    gimp_handle_bar_get_limits     (GimpHandleBar  *bar,
+                                            gdouble        *lower,
+                                            gdouble        *upper);
+
+void        gimp_handle_bar_connect_events (GimpHandleBar  *bar,
+                                            GtkWidget      *event_source);
+
+
+#endif  /*  __GIMP_HANDLE_BAR_H__  */
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
new file mode 100644
index 0000000..41a848a
--- /dev/null
+++ b/app/widgets/gimphelp-ids.h
@@ -0,0 +1,760 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphelp-ids.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HELP_IDS_H__
+#define __GIMP_HELP_IDS_H__
+
+
+#define GIMP_HELP_MAIN                            "gimp-main"
+
+#define GIMP_HELP_FILE_NEW                        "gimp-file-new"
+#define GIMP_HELP_FILE_OPEN                       "gimp-file-open"
+#define GIMP_HELP_FILE_OPEN_AS_LAYER              "gimp-file-open-as-layer"
+#define GIMP_HELP_FILE_OPEN_LOCATION              "gimp-file-open-location"
+#define GIMP_HELP_FILE_OPEN_BY_EXTENSION          "gimp-file-open-by-extension"
+#define GIMP_HELP_FILE_OPEN_RECENT                "gimp-file-open-recent"
+#define GIMP_HELP_FILE_SAVE                       "gimp-file-save"
+#define GIMP_HELP_FILE_SAVE_AS                    "gimp-file-save-as"
+#define GIMP_HELP_FILE_SAVE_A_COPY                "gimp-file-save-a-copy"
+#define GIMP_HELP_FILE_SAVE_BY_EXTENSION          "gimp-file-save-by-extension"
+#define GIMP_HELP_FILE_EXPORT                     "gimp-file-export"
+#define GIMP_HELP_FILE_EXPORT_AS                  "gimp-file-export-as"
+#define GIMP_HELP_FILE_OVERWRITE                  "gimp-file-overwrite"
+#define GIMP_HELP_FILE_SAVE_AS_TEMPLATE           "gimp-file-save-as-template"
+#define GIMP_HELP_FILE_REVERT                     "gimp-file-revert"
+#define GIMP_HELP_FILE_CLOSE                      "gimp-file-close"
+#define GIMP_HELP_FILE_CLOSE_ALL                  "gimp-file-close-all"
+#define GIMP_HELP_FILE_COPY_LOCATION              "gimp-file-copy-location"
+#define GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER       "gimp-file-show-in-file-manager"
+#define GIMP_HELP_FILE_CREATE_TEMPLATE            "gimp-file-save-as-template" /* Update string along with gimp-help-2 */
+#define GIMP_HELP_FILE_QUIT                       "gimp-file-quit"
+
+#define GIMP_HELP_EDIT_UNDO                       "gimp-edit-undo"
+#define GIMP_HELP_EDIT_REDO                       "gimp-edit-redo"
+#define GIMP_HELP_EDIT_STRONG_UNDO                "gimp-edit-strong-undo"
+#define GIMP_HELP_EDIT_STRONG_REDO                "gimp-edit-strong-redo"
+#define GIMP_HELP_EDIT_UNDO_CLEAR                 "gimp-edit-undo-clear"
+#define GIMP_HELP_EDIT_CUT                        "gimp-edit-cut"
+#define GIMP_HELP_EDIT_COPY                       "gimp-edit-copy"
+#define GIMP_HELP_EDIT_COPY_VISIBLE               "gimp-edit-copy-visible"
+#define GIMP_HELP_EDIT_PASTE                      "gimp-edit-paste"
+#define GIMP_HELP_EDIT_PASTE_IN_PLACE             "gimp-edit-paste-in-place"
+#define GIMP_HELP_EDIT_PASTE_INTO                 "gimp-edit-paste-into"
+#define GIMP_HELP_EDIT_PASTE_INTO_IN_PLACE        "gimp-edit-paste-into-in-place"
+#define GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER         "gimp-edit-paste-as-new-layer"
+#define GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER_IN_PLACE "gimp-edit-paste-as-new-layer-in-place"
+#define GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE         "gimp-edit-paste-as-new-image"
+#define GIMP_HELP_EDIT_CLEAR                      "gimp-edit-clear"
+#define GIMP_HELP_EDIT_FILL_FG                    "gimp-edit-fill-fg"
+#define GIMP_HELP_EDIT_FILL_BG                    "gimp-edit-fill-bg"
+#define GIMP_HELP_EDIT_FILL_PATTERN               "gimp-edit-fill-pattern"
+
+#define GIMP_HELP_SELECTION_DIALOG                "gimp-selection-dialog"
+#define GIMP_HELP_SELECTION_ALL                   "gimp-selection-all"
+#define GIMP_HELP_SELECTION_NONE                  "gimp-selection-none"
+#define GIMP_HELP_SELECTION_INVERT                "gimp-selection-invert"
+#define GIMP_HELP_SELECTION_FLOAT                 "gimp-selection-float"
+#define GIMP_HELP_SELECTION_FEATHER               "gimp-selection-feather"
+#define GIMP_HELP_SELECTION_SHARPEN               "gimp-selection-sharpen"
+#define GIMP_HELP_SELECTION_SHRINK                "gimp-selection-shrink"
+#define GIMP_HELP_SELECTION_GROW                  "gimp-selection-grow"
+#define GIMP_HELP_SELECTION_BORDER                "gimp-selection-border"
+#define GIMP_HELP_SELECTION_FLOOD                 "gimp-selection-flood"
+#define GIMP_HELP_SELECTION_FILL                  "gimp-selection-fill"
+#define GIMP_HELP_SELECTION_STROKE                "gimp-selection-stroke"
+#define GIMP_HELP_SELECTION_TO_CHANNEL            "gimp-selection-to-channel"
+#define GIMP_HELP_SELECTION_TO_PATH               "gimp-selection-to-path"
+
+#define GIMP_HELP_VIEW_NEW                        "gimp-view-new"
+#define GIMP_HELP_VIEW_SHOW_ALL                   "gimp-view-show-all"
+#define GIMP_HELP_VIEW_DOT_FOR_DOT                "gimp-view-dot-for-dot"
+#define GIMP_HELP_VIEW_SCROLL_CENTER              "gimp-view-scroll-center"
+#define GIMP_HELP_VIEW_ZOOM_REVERT                "gimp-view-zoom-revert"
+#define GIMP_HELP_VIEW_ZOOM_OUT                   "gimp-view-zoom-out"
+#define GIMP_HELP_VIEW_ZOOM_IN                    "gimp-view-zoom-in"
+#define GIMP_HELP_VIEW_ZOOM_100                   "gimp-view-zoom-100"
+#define GIMP_HELP_VIEW_ZOOM_FIT_IN                "gimp-view-zoom-fit-in"
+#define GIMP_HELP_VIEW_ZOOM_FILL                  "gimp-view-zoom-fill"
+#define GIMP_HELP_VIEW_ZOOM_SELECTION             "gimp-view-zoom-selection"
+#define GIMP_HELP_VIEW_ZOOM_OTHER                 "gimp-view-zoom-other"
+#define GIMP_HELP_VIEW_FLIP                       "gimp-view-flip"
+#define GIMP_HELP_VIEW_ROTATE_RESET               "gimp-view-rotate-reset"
+#define GIMP_HELP_VIEW_ROTATE_15                  "gimp-view-rotate-15"
+#define GIMP_HELP_VIEW_ROTATE_90                  "gimp-view-rotate-90"
+#define GIMP_HELP_VIEW_ROTATE_180                 "gimp-view-rotate-180"
+#define GIMP_HELP_VIEW_ROTATE_270                 "gimp-view-rotate-270"
+#define GIMP_HELP_VIEW_ROTATE_345                 "gimp-view-rotate-345"
+#define GIMP_HELP_VIEW_ROTATE_OTHER               "gimp-view-rotate-other"
+#define GIMP_HELP_VIEW_COLOR_MANAGEMENT           "gimp-view-color-management"
+#define GIMP_HELP_VIEW_SHOW_SELECTION             "gimp-view-show-selection"
+#define GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY        "gimp-view-show-layer-boundary"
+#define GIMP_HELP_VIEW_SHOW_CANVAS_BOUNDARY       "gimp-view-show-canvas-boundary"
+#define GIMP_HELP_VIEW_SHOW_GUIDES                "gimp-view-show-guides"
+#define GIMP_HELP_VIEW_SHOW_GRID                  "gimp-view-show-grid"
+#define GIMP_HELP_VIEW_SHOW_SAMPLE_POINTS         "gimp-view-show-sample-points"
+#define GIMP_HELP_VIEW_SNAP_TO_GUIDES             "gimp-view-snap-to-guides"
+#define GIMP_HELP_VIEW_SNAP_TO_GRID               "gimp-view-snap-to-grid"
+#define GIMP_HELP_VIEW_SNAP_TO_CANVAS             "gimp-view-snap-to-canvas"
+#define GIMP_HELP_VIEW_SNAP_TO_VECTORS            "gimp-view-snap-to-vectors"
+#define GIMP_HELP_VIEW_SHOW_MENUBAR               "gimp-view-show-menubar"
+#define GIMP_HELP_VIEW_SHOW_RULERS                "gimp-view-show-rulers"
+#define GIMP_HELP_VIEW_SHOW_SCROLLBARS            "gimp-view-show-scrollbars"
+#define GIMP_HELP_VIEW_SHOW_STATUSBAR             "gimp-view-show-statusbar"
+#define GIMP_HELP_VIEW_PADDING_COLOR              "gimp-view-padding-color"
+#define GIMP_HELP_VIEW_SHRINK_WRAP                "gimp-view-shrink-wrap"
+#define GIMP_HELP_VIEW_FULLSCREEN                 "gimp-view-fullscreen"
+#define GIMP_HELP_VIEW_CHANGE_SCREEN              "gimp-view-change-screen"
+
+#define GIMP_HELP_IMAGE_WINDOW                    "gimp-image-window"
+#define GIMP_HELP_IMAGE_WINDOW_ORIGIN             "gimp-image-window-origin"
+#define GIMP_HELP_IMAGE_WINDOW_ZOOM_FOLLOW_BUTTON "gimp-image-window-zoom-follow-button"
+#define GIMP_HELP_IMAGE_WINDOW_QUICK_MASK_BUTTON  "gimp-image-window-quick-mask-button"
+#define GIMP_HELP_IMAGE_WINDOW_NAV_BUTTON         "gimp-image-window-nav-button"
+#define GIMP_HELP_IMAGE_WINDOW_RULER              "gimp-image-window-ruler"
+#define GIMP_HELP_IMAGE_WINDOW_STATUS_BAR         "gimp-image-window-status-bar"
+
+
+#define GIMP_HELP_IMAGE_DIALOG                    "gimp-image-dialog"
+#define GIMP_HELP_IMAGE_DUPLICATE                 "gimp-image-duplicate"
+#define GIMP_HELP_IMAGE_CONVERT_RGB               "gimp-image-convert-rgb"
+#define GIMP_HELP_IMAGE_CONVERT_GRAYSCALE         "gimp-image-convert-grayscale"
+#define GIMP_HELP_IMAGE_CONVERT_INDEXED           "gimp-image-convert-indexed"
+#define GIMP_HELP_IMAGE_CONVERT_U8                "gimp-image-convert-u8"
+#define GIMP_HELP_IMAGE_CONVERT_U16               "gimp-image-convert-u16"
+#define GIMP_HELP_IMAGE_CONVERT_U32               "gimp-image-convert-u32"
+#define GIMP_HELP_IMAGE_CONVERT_HALF              "gimp-image-convert-half"
+#define GIMP_HELP_IMAGE_CONVERT_FLOAT             "gimp-image-convert-float"
+#define GIMP_HELP_IMAGE_CONVERT_DOUBLE            "gimp-image-convert-double"
+#define GIMP_HELP_IMAGE_CONVERT_GAMMA             "gimp-image-convert-gamma"
+#define GIMP_HELP_IMAGE_CONVERT_PRECISION         "gimp-image-convert-precision"
+#define GIMP_HELP_IMAGE_FLIP_HORIZONTAL           "gimp-image-flip-horizontal"
+#define GIMP_HELP_IMAGE_FLIP_VERTICAL             "gimp-image-flip-vertical"
+#define GIMP_HELP_IMAGE_ROTATE_90                 "gimp-image-rotate-90"
+#define GIMP_HELP_IMAGE_ROTATE_180                "gimp-image-rotate-180"
+#define GIMP_HELP_IMAGE_ROTATE_270                "gimp-image-rotate-270"
+#define GIMP_HELP_IMAGE_RESIZE                    "gimp-image-resize"
+#define GIMP_HELP_IMAGE_RESIZE_TO_LAYERS          "gimp-image-resize-to-layers"
+#define GIMP_HELP_IMAGE_RESIZE_TO_SELECTION       "gimp-image-resize-to-selection"
+#define GIMP_HELP_IMAGE_PRINT_SIZE                "gimp-image-print-size"
+#define GIMP_HELP_IMAGE_SCALE                     "gimp-image-scale"
+#define GIMP_HELP_IMAGE_SCALE_WARNING             "gimp-image-scale-warning"
+#define GIMP_HELP_IMAGE_CROP                      "gimp-image-crop"
+#define GIMP_HELP_IMAGE_MERGE_LAYERS              "gimp-image-merge-layers"
+#define GIMP_HELP_IMAGE_FLATTEN                   "gimp-image-flatten"
+#define GIMP_HELP_IMAGE_COLOR_MANAGEMENT_ENABLED  "gimp-image-color-management-enabled"
+#define GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN      "gimp-image-color-profile-assign"
+#define GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT     "gimp-image-color-profile-convert"
+#define GIMP_HELP_IMAGE_COLOR_PROFILE_DISCARD     "gimp-image-color-profile-discard"
+#define GIMP_HELP_IMAGE_COLOR_PROFILE_SAVE        "gimp-image-color-profile-save"
+#define GIMP_HELP_IMAGE_COLOR_PROFILE_IMPORT      "gimp-image-color-profile-import"
+#define GIMP_HELP_IMAGE_GRID                      "gimp-image-grid"
+#define GIMP_HELP_IMAGE_PROPERTIES                "gimp-image-properties"
+
+#define GIMP_HELP_LAYER_DIALOG                    "gimp-layer-dialog"
+#define GIMP_HELP_LAYER_DIALOG_PAINT_MODE_MENU    "gimp-layer-dialog-paint-mode-menu"
+#define GIMP_HELP_LAYER_DIALOG_OPACITY_SCALE      "gimp-layer-dialog-opacity-scale"
+
+#define GIMP_HELP_LAYER_NEW                       "gimp-layer-new"
+#define GIMP_HELP_LAYER_NEW_FROM_VISIBLE          "gimp-layer-new-from-visible"
+#define GIMP_HELP_LAYER_DUPLICATE                 "gimp-layer-duplicate"
+#define GIMP_HELP_LAYER_ANCHOR                    "gimp-layer-anchor"
+#define GIMP_HELP_LAYER_MERGE_DOWN                "gimp-layer-merge-down"
+#define GIMP_HELP_LAYER_MERGE_GROUP               "gimp-layer-merge-group"
+#define GIMP_HELP_LAYER_DELETE                    "gimp-layer-delete"
+#define GIMP_HELP_LAYER_TEXT_DISCARD              "gimp-layer-text-discard"
+#define GIMP_HELP_LAYER_TEXT_TO_PATH              "gimp-layer-text-to-path"
+#define GIMP_HELP_LAYER_TEXT_ALONG_PATH           "gimp-layer-text-along-path"
+#define GIMP_HELP_LAYER_PREVIOUS                  "gimp-layer-previous"
+#define GIMP_HELP_LAYER_NEXT                      "gimp-layer-next"
+#define GIMP_HELP_LAYER_TOP                       "gimp-layer-top"
+#define GIMP_HELP_LAYER_BOTTOM                    "gimp-layer-bottom"
+#define GIMP_HELP_LAYER_RAISE                     "gimp-layer-raise"
+#define GIMP_HELP_LAYER_RAISE_TO_TOP              "gimp-layer-raise-to-top"
+#define GIMP_HELP_LAYER_LOWER                     "gimp-layer-lower"
+#define GIMP_HELP_LAYER_LOWER_TO_BOTTOM           "gimp-layer-lower-to-bottom"
+#define GIMP_HELP_LAYER_WHITE_BALANCE             "gimp-layer-white-balance"
+#define GIMP_HELP_LAYER_EQUALIZE                  "gimp-layer-equalize"
+#define GIMP_HELP_LAYER_VISIBLE                   "gimp-layer-visible"
+#define GIMP_HELP_LAYER_LINKED                    "gimp-layer-linked"
+#define GIMP_HELP_LAYER_COLOR_TAG                 "gimp-layer-color-tag"
+#define GIMP_HELP_LAYER_OPACITY                   "gimp-layer-opacity"
+#define GIMP_HELP_LAYER_MODE                      "gimp-layer-mode"
+#define GIMP_HELP_LAYER_LOCK_ALPHA                "gimp-layer-lock-alpha"
+#define GIMP_HELP_LAYER_LOCK_PIXELS               "gimp-layer-lock-pixels"
+#define GIMP_HELP_LAYER_LOCK_POSITION             "gimp-layer-lock-position"
+#define GIMP_HELP_LAYER_MASK_ADD                  "gimp-layer-mask-add"
+#define GIMP_HELP_LAYER_MASK_APPLY                "gimp-layer-mask-apply"
+#define GIMP_HELP_LAYER_MASK_DELETE               "gimp-layer-mask-delete"
+#define GIMP_HELP_LAYER_MASK_EDIT                 "gimp-layer-mask-edit"
+#define GIMP_HELP_LAYER_MASK_SHOW                 "gimp-layer-mask-show"
+#define GIMP_HELP_LAYER_MASK_DISABLE              "gimp-layer-mask-disable"
+#define GIMP_HELP_LAYER_MASK_SELECTION_REPLACE    "gimp-layer-mask-selection-replace"
+#define GIMP_HELP_LAYER_MASK_SELECTION_ADD        "gimp-layer-mask-selection-add"
+#define GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT   "gimp-layer-mask-selection-subtract"
+#define GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT  "gimp-layer-mask-selection-intersect"
+#define GIMP_HELP_LAYER_ALPHA_ADD                 "gimp-layer-alpha-add"
+#define GIMP_HELP_LAYER_ALPHA_REMOVE              "gimp-layer-alpha-remove"
+#define GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE   "gimp-layer-alpha-selection-replace"
+#define GIMP_HELP_LAYER_ALPHA_SELECTION_ADD       "gimp-layer-alpha-selection-add"
+#define GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT  "gimp-layer-alpha-selection-subtract"
+#define GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT "gimp-layer-alpha-selection-intersect"
+#define GIMP_HELP_LAYER_FLIP_HORIZONTAL           "gimp-layer-flip-horizontal"
+#define GIMP_HELP_LAYER_FLIP_VERTICAL             "gimp-layer-flip-vertical"
+#define GIMP_HELP_LAYER_ROTATE_90                 "gimp-layer-rotate-90"
+#define GIMP_HELP_LAYER_ROTATE_180                "gimp-layer-rotate-180"
+#define GIMP_HELP_LAYER_ROTATE_270                "gimp-layer-rotate-270"
+#define GIMP_HELP_LAYER_RESIZE                    "gimp-layer-resize"
+#define GIMP_HELP_LAYER_RESIZE_TO_IMAGE           "gimp-layer-resize-to-image"
+#define GIMP_HELP_LAYER_SCALE                     "gimp-layer-scale"
+#define GIMP_HELP_LAYER_CROP                      "gimp-layer-crop"
+#define GIMP_HELP_LAYER_EDIT                      "gimp-layer-edit"
+
+#define GIMP_HELP_CHANNEL_DIALOG                  "gimp-channel-dialog"
+#define GIMP_HELP_CHANNEL_NEW                     "gimp-channel-new"
+#define GIMP_HELP_CHANNEL_RAISE                   "gimp-channel-raise"
+#define GIMP_HELP_CHANNEL_RAISE_TO_TOP            "gimp-channel-raise-to-top"
+#define GIMP_HELP_CHANNEL_LOWER                   "gimp-channel-lower"
+#define GIMP_HELP_CHANNEL_LOWER_TO_BOTTOM         "gimp-channel-lower-to-bottom"
+#define GIMP_HELP_CHANNEL_DUPLICATE               "gimp-channel-duplicate"
+#define GIMP_HELP_CHANNEL_DELETE                  "gimp-channel-delete"
+#define GIMP_HELP_CHANNEL_PREVIOUS                "gimp-channel-previous"
+#define GIMP_HELP_CHANNEL_NEXT                    "gimp-channel-next"
+#define GIMP_HELP_CHANNEL_TOP                     "gimp-channel-top"
+#define GIMP_HELP_CHANNEL_BOTTOM                  "gimp-channel-bottom"
+#define GIMP_HELP_CHANNEL_VISIBLE                 "gimp-channel-visible"
+#define GIMP_HELP_CHANNEL_LINKED                  "gimp-channel-linked"
+#define GIMP_HELP_CHANNEL_COLOR_TAG               "gimp-channel-color-tag"
+#define GIMP_HELP_CHANNEL_LOCK_PIXELS             "gimp-channel-lock-pixels"
+#define GIMP_HELP_CHANNEL_LOCK_POSITION           "gimp-channel-lock-position"
+#define GIMP_HELP_CHANNEL_SELECTION_REPLACE       "gimp-channel-selection-replace"
+#define GIMP_HELP_CHANNEL_SELECTION_ADD           "gimp-channel-selection-add"
+#define GIMP_HELP_CHANNEL_SELECTION_SUBTRACT      "gimp-channel-selection-subtract"
+#define GIMP_HELP_CHANNEL_SELECTION_INTERSECT     "gimp-channel-selection-intersect"
+#define GIMP_HELP_CHANNEL_EDIT                    "gimp-channel-edit"
+
+#define GIMP_HELP_QUICK_MASK                      "gimp-quick-mask"
+#define GIMP_HELP_QUICK_MASK_TOGGLE               "gimp-quick-mask-toggle"
+#define GIMP_HELP_QUICK_MASK_INVERT               "gimp-quick-mask-invert"
+#define GIMP_HELP_QUICK_MASK_EDIT                 "gimp-quick-mask-edit"
+
+#define GIMP_HELP_PATH_DIALOG                     "gimp-path-dialog"
+#define GIMP_HELP_PATH_NEW                        "gimp-path-new"
+#define GIMP_HELP_PATH_PREVIOUS                   "gimp-path-previous"
+#define GIMP_HELP_PATH_NEXT                       "gimp-path-next"
+#define GIMP_HELP_PATH_TOP                        "gimp-path-top"
+#define GIMP_HELP_PATH_BOTTOM                     "gimp-path-bottom"
+#define GIMP_HELP_PATH_RAISE                      "gimp-path-raise"
+#define GIMP_HELP_PATH_RAISE_TO_TOP               "gimp-path-raise-to-top"
+#define GIMP_HELP_PATH_LOWER                      "gimp-path-lower"
+#define GIMP_HELP_PATH_LOWER_TO_BOTTOM            "gimp-path-lower-to-bottom"
+#define GIMP_HELP_PATH_DUPLICATE                  "gimp-path-duplicate"
+#define GIMP_HELP_PATH_DELETE                     "gimp-path-delete"
+#define GIMP_HELP_PATH_MERGE_VISIBLE              "gimp-path-merge-visible"
+#define GIMP_HELP_PATH_VISIBLE                    "gimp-path-visible"
+#define GIMP_HELP_PATH_LINKED                     "gimp-path-linked"
+#define GIMP_HELP_PATH_COLOR_TAG                  "gimp-path-color-tag"
+#define GIMP_HELP_PATH_LOCK_STROKES               "gimp-path-lock-strokes"
+#define GIMP_HELP_PATH_LOCK_POSITION              "gimp-path-lock-position"
+#define GIMP_HELP_PATH_SELECTION_REPLACE          "gimp-path-selection-replace"
+#define GIMP_HELP_PATH_SELECTION_ADD              "gimp-path-selection-add"
+#define GIMP_HELP_PATH_SELECTION_SUBTRACT         "gimp-path-selection-subtract"
+#define GIMP_HELP_PATH_SELECTION_INTERSECT        "gimp-path-selection-intersect"
+#define GIMP_HELP_PATH_FILL                       "gimp-path-fill"
+#define GIMP_HELP_PATH_STROKE                     "gimp-path-stroke"
+#define GIMP_HELP_PATH_COPY                       "gimp-path-copy"
+#define GIMP_HELP_PATH_PASTE                      "gimp-path-paste"
+#define GIMP_HELP_PATH_IMPORT                     "gimp-path-import"
+#define GIMP_HELP_PATH_EXPORT                     "gimp-path-export"
+#define GIMP_HELP_PATH_EDIT                       "gimp-path-edit"
+
+#define GIMP_HELP_TOOL_AIRBRUSH                   "gimp-tool-airbrush"
+#define GIMP_HELP_TOOL_ALIGN                      "gimp-tool-align"
+#define GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST        "gimp-tool-brightness-contrast"
+#define GIMP_HELP_TOOL_BUCKET_FILL                "gimp-tool-bucket-fill"
+#define GIMP_HELP_TOOL_BY_COLOR_SELECT            "gimp-tool-by-color-select"
+#define GIMP_HELP_TOOL_CAGE                       "gimp-tool-cage"
+#define GIMP_HELP_TOOL_CLONE                      "gimp-tool-clone"
+#define GIMP_HELP_TOOL_COLORIZE                   "gimp-tool-colorize"
+#define GIMP_HELP_TOOL_COLOR_BALANCE              "gimp-tool-color-balance"
+#define GIMP_HELP_TOOL_COLOR_PICKER               "gimp-tool-color-picker"
+#define GIMP_HELP_TOOL_CONVOLVE                   "gimp-tool-convolve"
+#define GIMP_HELP_TOOL_CROP                       "gimp-tool-crop"
+#define GIMP_HELP_TOOL_CURVES                     "gimp-tool-curves"
+#define GIMP_HELP_TOOL_DODGE_BURN                 "gimp-tool-dodge-burn"
+#define GIMP_HELP_TOOL_ELLIPSE_SELECT             "gimp-tool-ellipse-select"
+#define GIMP_HELP_TOOL_ERASER                     "gimp-tool-eraser"
+#define GIMP_HELP_TOOL_FLIP                       "gimp-tool-flip"
+#define GIMP_HELP_TOOL_FREE_SELECT                "gimp-tool-free-select"
+#define GIMP_HELP_TOOL_FOREGROUND_SELECT          "gimp-tool-foreground-select"
+#define GIMP_HELP_TOOL_FUZZY_SELECT               "gimp-tool-fuzzy-select"
+#define GIMP_HELP_TOOL_GEGL                       "gimp-tool-gegl"
+#define GIMP_HELP_TOOL_GRADIENT                   "gimp-tool-gradient"
+#define GIMP_HELP_TOOL_HANDLE_TRANSFORM           "gimp-tool-handle-transform"
+#define GIMP_HELP_TOOL_HEAL                       "gimp-tool-heal"
+#define GIMP_HELP_TOOL_HUE_SATURATION             "gimp-tool-hue-saturation"
+#define GIMP_HELP_TOOL_INK                        "gimp-tool-ink"
+#define GIMP_HELP_TOOL_ISCISSORS                  "gimp-tool-iscissors"
+#define GIMP_HELP_TOOL_LEVELS                     "gimp-tool-levels"
+#define GIMP_HELP_TOOL_MEASURE                    "gimp-tool-measure"
+#define GIMP_HELP_TOOL_MOVE                       "gimp-tool-move"
+#define GIMP_HELP_TOOL_MYPAINT_BRUSH              "gimp-tool-mypaint-brush"
+#define GIMP_HELP_TOOL_N_POINT_DEFORMATION        "gimp-tool-n-point-deformation"
+#define GIMP_HELP_TOOL_OFFSET                     "gimp-tool-offset"
+#define GIMP_HELP_TOOL_PATH                       "gimp-tool-path"
+#define GIMP_HELP_TOOL_PAINTBRUSH                 "gimp-tool-paintbrush"
+#define GIMP_HELP_TOOL_PENCIL                     "gimp-tool-pencil"
+#define GIMP_HELP_TOOL_PERSPECTIVE                "gimp-tool-perspective"
+#define GIMP_HELP_TOOL_PERSPECTIVE_CLONE          "gimp-tool-perspective-clone"
+#define GIMP_HELP_TOOL_RECT_SELECT                "gimp-tool-rect-select"
+#define GIMP_HELP_TOOL_ROTATE                     "gimp-tool-rotate"
+#define GIMP_HELP_TOOL_SCALE                      "gimp-tool-scale"
+#define GIMP_HELP_TOOL_SEAMLESS_CLONE             "gimp-tool-seamless-clone"
+#define GIMP_HELP_TOOL_SHEAR                      "gimp-tool-shear"
+#define GIMP_HELP_TOOL_SMUDGE                     "gimp-tool-smudge"
+#define GIMP_HELP_TOOL_TEXT                       "gimp-tool-text"
+#define GIMP_HELP_TOOL_THRESHOLD                  "gimp-tool-threshold"
+#define GIMP_HELP_TOOL_TRANSFORM_3D               "gimp-tool-transform-3d"
+#define GIMP_HELP_TOOL_UNIFIED_TRANSFORM          "gimp-tool-unified-transform"
+#define GIMP_HELP_TOOL_VECTORS                    "gimp-tool-vectors"
+#define GIMP_HELP_TOOL_WARP                       "gimp-tool-warp"
+#define GIMP_HELP_TOOL_ZOOM                       "gimp-tool-zoom"
+
+#define GIMP_HELP_FILTER_REPEAT                   "gimp-filter-repeat"
+#define GIMP_HELP_FILTER_RESHOW                   "gimp-filter-reshow"
+#define GIMP_HELP_FILTER_RESET_ALL                "gimp-filter-reset-all"
+
+#define GIMP_HELP_FILTER_ALIEN_MAP                "gimp-filter-alien-map"
+#define GIMP_HELP_FILTER_ANTIALIAS                "gimp-filter-antialias"
+#define GIMP_HELP_FILTER_APPLY_CANVAS             "gimp-filter-apply-canvas"
+#define GIMP_HELP_FILTER_APPLY_LENS               "gimp-filter-apply-lens"
+#define GIMP_HELP_FILTER_BAYER_MATRIX             "gimp-filter-bayer-matrix"
+#define GIMP_HELP_FILTER_BLOOM                    "gimp-filter-bloom"
+#define GIMP_HELP_FILTER_BUMP_MAP                 "gimp-filter-bump-map"
+#define GIMP_HELP_FILTER_C2G                      "gimp-filter-c2g"
+#define GIMP_HELP_FILTER_CARTOON                  "gimp-filter-cartoon"
+#define GIMP_HELP_FILTER_CHANNEL_MIXER            "gimp-filter-channel-mixer"
+#define GIMP_HELP_FILTER_CHECKERBOARD             "gimp-filter-checkerboard"
+#define GIMP_HELP_FILTER_COLOR_ENHANCE            "gimp-filter-color-enhance"
+#define GIMP_HELP_FILTER_COLOR_EXCHANGE           "gimp-filter-color-exchange"
+#define GIMP_HELP_FILTER_COLOR_ROTATE             "gimp-filter-color-rotate"
+#define GIMP_HELP_FILTER_COLOR_TEMPERATURE        "gimp-filter-color-temperature"
+#define GIMP_HELP_FILTER_COLOR_TO_ALPHA           "gimp-filter-color-to-alpha"
+#define GIMP_HELP_FILTER_COMPONENT_EXTRACT        "gimp-filter-component-extract"
+#define GIMP_HELP_FILTER_CONVOLUTION_MATRIX       "gimp-filter-convolution-matrix"
+#define GIMP_HELP_FILTER_CUBISM                   "gimp-filter-cubism"
+#define GIMP_HELP_FILTER_DEINTERLACE              "gimp-filter-deinterlace"
+#define GIMP_HELP_FILTER_DESATURATE               "gimp-filter-desaturate"
+#define GIMP_HELP_FILTER_DIFFERENCE_OF_GAUSSIANS  "gimp-filter-difference-of-gaussians"
+#define GIMP_HELP_FILTER_DIFFRACTION_PATTERNS     "gimp-filter-diffraction-patterns"
+#define GIMP_HELP_FILTER_DILATE                   "gimp-filter-dilate"
+#define GIMP_HELP_FILTER_DISPLACE                 "gimp-filter-displace"
+#define GIMP_HELP_FILTER_DISTANCE_MAP             "gimp-filter-distance-map"
+#define GIMP_HELP_FILTER_DITHER                   "gimp-filter-dither"
+#define GIMP_HELP_FILTER_DROPSHADOW               "gimp-filter-dropshadow"
+#define GIMP_HELP_FILTER_EDGE                     "gimp-filter-edge"
+#define GIMP_HELP_FILTER_EDGE_LAPLACE             "gimp-filter-edge-laplace"
+#define GIMP_HELP_FILTER_EDGE_NEON                "gimp-filter-edge-neon"
+#define GIMP_HELP_FILTER_EDGE_SOBEL               "gimp-filter-edge-sobel"
+#define GIMP_HELP_FILTER_EMBOSS                   "gimp-filter-emboss"
+#define GIMP_HELP_FILTER_ENGRAVE                  "gimp-filter-engrave"
+#define GIMP_HELP_FILTER_ERODE                    "gimp-filter-erode"
+#define GIMP_HELP_FILTER_EXPOSURE                 "gimp-filter-exposure"
+#define GIMP_HELP_FILTER_FATTAL_2002              "gimp-filter-fattal-2002"
+#define GIMP_HELP_FILTER_FOCUS_BLUR               "gimp-filter-focus-blur"
+#define GIMP_HELP_FILTER_FRACTAL_TRACE            "gimp-filter-fractal-trace"
+#define GIMP_HELP_FILTER_GAUSSIAN_BLUR            "gimp-filter-gaussian-blur"
+#define GIMP_HELP_FILTER_GAUSSIAN_BLUR_SELECTIVE  "gimp-filter-gaussian-blur-selective"
+#define GIMP_HELP_FILTER_GEGL_GRAPH               "gimp-filter-gegl"
+#define GIMP_HELP_FILTER_GRID                     "gimp-filter-grid"
+#define GIMP_HELP_FILTER_HIGH_PASS                "gimp-filter-high-pass"
+#define GIMP_HELP_FILTER_HUE_CHROMA               "gimp-filter-hue-chroma"
+#define GIMP_HELP_FILTER_ILLUSION                 "gimp-filter-illusion"
+#define GIMP_HELP_FILTER_INVERT_LINEAR            "gimp-filter-invert-linear"
+#define GIMP_HELP_FILTER_INVERT_PERCEPTUAL        "gimp-filter-invert-perceptual"
+#define GIMP_HELP_FILTER_INVERT_VALUE             "gimp-filter-invert-value"
+#define GIMP_HELP_FILTER_IMAGE_GRADIENT           "gimp-filter-image-gradient"
+#define GIMP_HELP_FILTER_KALEIDOSCOPE             "gimp-filter-kaleidoscope"
+#define GIMP_HELP_FILTER_LENS_BLUR                "gimp-filter-lens-blur"
+#define GIMP_HELP_FILTER_LENS_DISTORTION          "gimp-filter-lens-distortion"
+#define GIMP_HELP_FILTER_LENS_FLARE               "gimp-filter-lens-flare"
+#define GIMP_HELP_FILTER_LINEAR_SINUSOID          "gimp-filter-linear-sinusoid"
+#define GIMP_HELP_FILTER_LITTLE_PLANET            "gimp-filter-little-planet"
+#define GIMP_HELP_FILTER_LONG_SHADOW              "gimp-filter-long-shadow"
+#define GIMP_HELP_FILTER_MANTIUK_2006             "gimp-filter-mantiuk-2006"
+#define GIMP_HELP_FILTER_MAZE                     "gimp-filter-maze"
+#define GIMP_HELP_FILTER_MEAN_CURVATURE_BLUR      "gimp-filter-mean-curvature-blur"
+#define GIMP_HELP_FILTER_MEDIAN_BLUR              "gimp-filter-median-blur"
+#define GIMP_HELP_FILTER_MONO_MIXER               "gimp-filter-mono-mixer"
+#define GIMP_HELP_FILTER_MOSAIC                   "gimp-filter-mosaic"
+#define GIMP_HELP_FILTER_MOTION_BLUR_CIRCULAR     "gimp-filter-motion-blur-circular"
+#define GIMP_HELP_FILTER_MOTION_BLUR_LINEAR       "gimp-filter-motion-blur-linear"
+#define GIMP_HELP_FILTER_MOTION_BLUR_ZOOM         "gimp-filter-motion-blur-zoom"
+#define GIMP_HELP_FILTER_NEWSPRINT                "gimp-filter-newsprint"
+#define GIMP_HELP_FILTER_NOISE_CELL               "gimp-filter-noise-cell"
+#define GIMP_HELP_FILTER_NOISE_CIE_LCH            "gimp-filter-noise-cie-lch"
+#define GIMP_HELP_FILTER_NOISE_HSV                "gimp-filter-noise-hsv"
+#define GIMP_HELP_FILTER_NOISE_HURL               "gimp-filter-noise-hurl"
+#define GIMP_HELP_FILTER_NOISE_PERLIN             "gimp-filter-noise-perlin"
+#define GIMP_HELP_FILTER_NOISE_PICK               "gimp-filter-noise-pick"
+#define GIMP_HELP_FILTER_NOISE_RGB                "gimp-filter-noise-rgb"
+#define GIMP_HELP_FILTER_NOISE_REDUCTION          "gimp-filter-noise-reduction"
+#define GIMP_HELP_FILTER_NOISE_SIMPLEX            "gimp-filter-noise-simplex"
+#define GIMP_HELP_FILTER_NOISE_SLUR               "gimp-filter-noise-slur"
+#define GIMP_HELP_FILTER_NOISE_SOLID              "gimp-filter-noise-solid"
+#define GIMP_HELP_FILTER_NOISE_SPREAD             "gimp-filter-noise-spread"
+#define GIMP_HELP_FILTER_NORMAL_MAP               "gimp-filter-normal-map"
+#define GIMP_HELP_FILTER_OILIFY                   "gimp-filter-oilify"
+#define GIMP_HELP_FILTER_PANORAMA_PROJECTION      "gimp-filter-panorama-projection"
+#define GIMP_HELP_FILTER_PHOTOCOPY                "gimp-filter-photocopy"
+#define GIMP_HELP_FILTER_PIXELIZE                 "gimp-filter-pixelize"
+#define GIMP_HELP_FILTER_PLASMA                   "gimp-filter-plasma"
+#define GIMP_HELP_FILTER_POLAR_COORDINATES        "gimp-filter-polar-coordinates"
+#define GIMP_HELP_FILTER_POSTERIZE                "gimp-filter-posterize"
+#define GIMP_HELP_FILTER_RECURSIVE_TRANSFORM      "gimp-filter-recursive-transform"
+#define GIMP_HELP_FILTER_RED_EYE_REMOVAL          "gimp-filter-red-eye-removal"
+#define GIMP_HELP_FILTER_REINHARD_2005            "gimp-filter-reinhard-2005"
+#define GIMP_HELP_FILTER_RGB_CLIP                 "gimp-filter-rgb-clip"
+#define GIMP_HELP_FILTER_RIPPLE                   "gimp-filter-ripple"
+#define GIMP_HELP_FILTER_SATURATION               "gimp-filter-saturation"
+#define GIMP_HELP_FILTER_SEMI_FLATTEN             "gimp-filter-semi-flatten"
+#define GIMP_HELP_FILTER_SEPIA                    "gimp-filter-sepia"
+#define GIMP_HELP_FILTER_SHADOWS_HIGHLIGHTS       "gimp-filter-shadows-highlights"
+#define GIMP_HELP_FILTER_SHIFT                    "gimp-filter-shift"
+#define GIMP_HELP_FILTER_SINUS                    "gimp-filter-sinus"
+#define GIMP_HELP_FILTER_SLIC                     "gimp-filter-slic"
+#define GIMP_HELP_FILTER_SNN_MEAN                 "gimp-filter-snn-mean"
+#define GIMP_HELP_FILTER_SOFTGLOW                 "gimp-filter-softglow"
+#define GIMP_HELP_FILTER_SPHERIZE                 "gimp-filter-spherize"
+#define GIMP_HELP_FILTER_SPIRAL                   "gimp-filter-spiral"
+#define GIMP_HELP_FILTER_STRETCH_CONTRAST         "gimp-filter-stretch-contrast"
+#define GIMP_HELP_FILTER_STRETCH_CONTRAST_HSV     "gimp-filter-stretch-contrast-hsv"
+#define GIMP_HELP_FILTER_STRESS                   "gimp-filter-stress"
+#define GIMP_HELP_FILTER_SUPERNOVA                "gimp-filter-supernova"
+#define GIMP_HELP_FILTER_THRESHOLD_ALPHA          "gimp-filter-threshold-alpha"
+#define GIMP_HELP_FILTER_TILE_GLASS               "gimp-filter-tile-glass"
+#define GIMP_HELP_FILTER_TILE_PAPER               "gimp-filter-tile-paper"
+#define GIMP_HELP_FILTER_TILE_SEAMLESS            "gimp-filter-tile-seamless"
+#define GIMP_HELP_FILTER_UNSHARP_MASK             "gimp-filter-unsharp-mask"
+#define GIMP_HELP_FILTER_VALUE_PROPAGATE          "gimp-filter-value-propagate"
+#define GIMP_HELP_FILTER_VARIABLE_BLUR            "gimp-filter-variable-blur"
+#define GIMP_HELP_FILTER_VIDEO_DEGRADATION        "gimp-filter-video-degradation"
+#define GIMP_HELP_FILTER_VIGNETTE                 "gimp-filter-vignette"
+#define GIMP_HELP_FILTER_WATERPIXELS              "gimp-filter-waterpixels"
+#define GIMP_HELP_FILTER_WAVES                    "gimp-filter-waves"
+#define GIMP_HELP_FILTER_WHIRL_PINCH              "gimp-filter-whirl-pinch"
+#define GIMP_HELP_FILTER_WIND                     "gimp-filter-wind"
+
+#define GIMP_HELP_TOOLBOX                         "gimp-toolbox"
+#define GIMP_HELP_TOOLBOX_COLOR_AREA              "gimp-toolbox-color-area"
+#define GIMP_HELP_TOOLBOX_IMAGE_AREA              "gimp-toolbox-image-area"
+#define GIMP_HELP_TOOLBOX_INDICATOR_AREA          "gimp-toolbox-indicator-area"
+#define GIMP_HELP_TOOLBOX_DEFAULT_COLORS          "gimp-toolbox-default-colors"
+#define GIMP_HELP_TOOLBOX_SWAP_COLORS             "gimp-toolbox-swap-colors"
+
+#define GIMP_HELP_BRUSH_DIALOG                    "gimp-brush-dialog"
+#define GIMP_HELP_BRUSH_EDIT                      "gimp-brush-edit"
+#define GIMP_HELP_BRUSH_OPEN_AS_IMAGE             "gimp-brush-open-as-image"
+#define GIMP_HELP_BRUSH_NEW                       "gimp-brush-new"
+#define GIMP_HELP_BRUSH_DUPLICATE                 "gimp-brush-duplicate"
+#define GIMP_HELP_BRUSH_COPY_LOCATION             "gimp-brush-copy-location"
+#define GIMP_HELP_BRUSH_SHOW_IN_FILE_MANAGER      "gimp-brush-show-in-file-manager"
+#define GIMP_HELP_BRUSH_DELETE                    "gimp-brush-delete"
+#define GIMP_HELP_BRUSH_REFRESH                   "gimp-brush-refresh"
+
+#define GIMP_HELP_BRUSH_EDITOR_DIALOG             "gimp-brush-editor-dialog"
+#define GIMP_HELP_BRUSH_EDITOR_EDIT_ACTIVE        "gimp-brush-editor-edit-active"
+
+#define GIMP_HELP_DYNAMICS_EDITOR_DIALOG          "gimp-dynamics-editor-dialog"
+
+#define GIMP_HELP_TOOL_PRESET_EDITOR_DIALOG       "gimp-tool-preset-editor-dialog"
+#define GIMP_HELP_TOOL_PRESET_EDITOR_EDIT_ACTIVE  "gimp-tool-preset-editor-edit-active"
+
+#define GIMP_HELP_DYNAMICS_DIALOG                 "gimp-dynamics-dialog"
+#define GIMP_HELP_DYNAMICS_EDIT                   "gimp-dynamics-edit"
+#define GIMP_HELP_DYNAMICS_NEW                    "gimp-dynamics-new"
+#define GIMP_HELP_DYNAMICS_DUPLICATE              "gimp-dynamics-duplicate"
+#define GIMP_HELP_DYNAMICS_COPY_LOCATION          "gimp-dynamics-copy-location"
+#define GIMP_HELP_DYNAMICS_SHOW_IN_FILE_MANAGER   "gimp-dynamics-show-in-file-manager"
+#define GIMP_HELP_DYNAMICS_DELETE                 "gimp-dynamics-delete"
+#define GIMP_HELP_DYNAMICS_REFRESH                "gimp-dynamics-refresh"
+
+#define GIMP_HELP_MYPAINT_BRUSH_DIALOG            "gimp-mypaint-brush-dialog"
+#define GIMP_HELP_MYPAINT_BRUSH_EDIT              "gimp-mypaint-brush-edit"
+#define GIMP_HELP_MYPAINT_BRUSH_NEW               "gimp-mypaint-brush-new"
+#define GIMP_HELP_MYPAINT_BRUSH_DUPLICATE         "gimp-mypaint-brush-duplicate"
+#define GIMP_HELP_MYPAINT_BRUSH_COPY_LOCATION     "gimp-mypaint-brush-copy-location"
+#define GIMP_HELP_MYPAINT_BRUSH_SHOW_IN_FILE_MANAGER "gimp-mypaint-brush-show-in-file-manager"
+#define GIMP_HELP_MYPAINT_BRUSH_DELETE            "gimp-mypaint-brush-delete"
+#define GIMP_HELP_MYPAINT_BRUSH_REFRESH           "gimp-mypaint-brush-refresh"
+
+#define GIMP_HELP_PATTERN_DIALOG                  "gimp-pattern-dialog"
+#define GIMP_HELP_PATTERN_EDIT                    "gimp-pattern-edit"
+#define GIMP_HELP_PATTERN_OPEN_AS_IMAGE           "gimp-pattern-open-as-image"
+#define GIMP_HELP_PATTERN_NEW                     "gimp-pattern-new"
+#define GIMP_HELP_PATTERN_DUPLICATE               "gimp-pattern-duplicate"
+#define GIMP_HELP_PATTERN_COPY_LOCATION           "gimp-pattern-copy-location"
+#define GIMP_HELP_PATTERN_SHOW_IN_FILE_MANAGER    "gimp-pattern-show-in-file-manager"
+#define GIMP_HELP_PATTERN_DELETE                  "gimp-pattern-delete"
+#define GIMP_HELP_PATTERN_REFRESH                 "gimp-pattern-refresh"
+
+#define GIMP_HELP_GRADIENT_DIALOG                 "gimp-gradient-dialog"
+#define GIMP_HELP_GRADIENT_EDIT                   "gimp-gradient-edit"
+#define GIMP_HELP_GRADIENT_NEW                    "gimp-gradient-new"
+#define GIMP_HELP_GRADIENT_DUPLICATE              "gimp-gradient-duplicate"
+#define GIMP_HELP_GRADIENT_COPY_LOCATION          "gimp-gradient-copy-location"
+#define GIMP_HELP_GRADIENT_SHOW_IN_FILE_MANAGER   "gimp-gradient-show-in-file-manager"
+#define GIMP_HELP_GRADIENT_DELETE                 "gimp-gradient-delete"
+#define GIMP_HELP_GRADIENT_REFRESH                "gimp-gradient-refresh"
+#define GIMP_HELP_GRADIENT_SAVE_AS_POV            "gimp-gradient-save-as-pov"
+
+#define GIMP_HELP_GRADIENT_EDITOR_DIALOG          "gimp-gradient-editor-dialog"
+#define GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR      "gimp-gradient-editor-left-color"
+#define GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD       "gimp-gradient-editor-left-load"
+#define GIMP_HELP_GRADIENT_EDITOR_LEFT_SAVE       "gimp-gradient-editor-left-save"
+#define GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR     "gimp-gradient-editor-right-color"
+#define GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD      "gimp-gradient-editor-right-load"
+#define GIMP_HELP_GRADIENT_EDITOR_RIGHT_SAVE      "gimp-gradient-editor-right-save"
+#define GIMP_HELP_GRADIENT_EDITOR_BLENDING        "gimp-gradient-editor-blending"
+#define GIMP_HELP_GRADIENT_EDITOR_COLORING        "gimp-gradient-editor-coloring"
+#define GIMP_HELP_GRADIENT_EDITOR_FLIP            "gimp-gradient-editor-flip"
+#define GIMP_HELP_GRADIENT_EDITOR_REPLICATE       "gimp-gradient-editor-replicate"
+#define GIMP_HELP_GRADIENT_EDITOR_SPLIT_MIDPOINT  "gimp-gradient-editor-split-midpoint"
+#define GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM   "gimp-gradient-editor-split-uniform"
+#define GIMP_HELP_GRADIENT_EDITOR_DELETE          "gimp-gradient-editor-delete"
+#define GIMP_HELP_GRADIENT_EDITOR_RECENTER        "gimp-gradient-editor-recenter"
+#define GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE    "gimp-gradient-editor-redistribute"
+#define GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR     "gimp-gradient-editor-blend-color"
+#define GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY   "gimp-gradient-editor-blend-opacity"
+#define GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT        "gimp-gradient-editor-zoom-out"
+#define GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN         "gimp-gradient-editor-zoom-in"
+#define GIMP_HELP_GRADIENT_EDITOR_ZOOM_ALL        "gimp-gradient-editor-zoom-all"
+#define GIMP_HELP_GRADIENT_EDITOR_EDIT_ACTIVE     "gimp-gradient-editor-edit-active"
+
+#define GIMP_HELP_PALETTE_DIALOG                  "gimp-palette-dialog"
+#define GIMP_HELP_PALETTE_EDIT                    "gimp-palette-edit"
+#define GIMP_HELP_PALETTE_NEW                     "gimp-palette-new"
+#define GIMP_HELP_PALETTE_DUPLICATE               "gimp-palette-duplicate"
+#define GIMP_HELP_PALETTE_COPY_LOCATION           "gimp-palette-copy-location"
+#define GIMP_HELP_PALETTE_SHOW_IN_FILE_MANAGER    "gimp-palette-show-in-file-manager"
+#define GIMP_HELP_PALETTE_DELETE                  "gimp-palette-delete"
+#define GIMP_HELP_PALETTE_REFRESH                 "gimp-palette-refresh"
+#define GIMP_HELP_PALETTE_IMPORT                  "gimp-palette-import"
+#define GIMP_HELP_PALETTE_MERGE                   "gimp-palette-merge"
+
+#define GIMP_HELP_PALETTE_EDITOR_DIALOG           "gimp-palette-editor-dialog"
+#define GIMP_HELP_PALETTE_EDITOR_NEW              "gimp-palette-editor-new"
+#define GIMP_HELP_PALETTE_EDITOR_EDIT             "gimp-palette-editor-edit"
+#define GIMP_HELP_PALETTE_EDITOR_DELETE           "gimp-palette-editor-delete"
+#define GIMP_HELP_PALETTE_EDITOR_ZOOM_OUT         "gimp-palette-editor-zoom-out"
+#define GIMP_HELP_PALETTE_EDITOR_ZOOM_IN          "gimp-palette-editor-zoom-in"
+#define GIMP_HELP_PALETTE_EDITOR_ZOOM_ALL         "gimp-palette-editor-zoom-all"
+#define GIMP_HELP_PALETTE_EDITOR_EDIT_ACTIVE      "gimp-palette-editor-edit-active"
+
+#define GIMP_HELP_FONT_DIALOG                     "gimp-font-dialog"
+#define GIMP_HELP_FONT_REFRESH                    "gimp-font-refresh"
+
+#define GIMP_HELP_BUFFER_DIALOG                   "gimp-buffer-dialog"
+#define GIMP_HELP_BUFFER_CUT                      "gimp-buffer-cut"
+#define GIMP_HELP_BUFFER_COPY                     "gimp-buffer-copy"
+#define GIMP_HELP_BUFFER_PASTE                    "gimp-buffer-paste"
+#define GIMP_HELP_BUFFER_PASTE_IN_PLACE           "gimp-buffer-paste-in-place"
+#define GIMP_HELP_BUFFER_PASTE_INTO               "gimp-buffer-paste-into"
+#define GIMP_HELP_BUFFER_PASTE_INTO_IN_PLACE      "gimp-buffer-paste-into-in-place"
+#define GIMP_HELP_BUFFER_PASTE_AS_NEW_LAYER       "gimp-buffer-paste-as-new-layer"
+#define GIMP_HELP_BUFFER_PASTE_AS_NEW_LAYER_IN_PLACE "gimp-buffer-paste-as-new-layer-in-place"
+#define GIMP_HELP_BUFFER_PASTE_AS_NEW_IMAGE       "gimp-buffer-paste-as-new-image"
+#define GIMP_HELP_BUFFER_DELETE                   "gimp-buffer-delete"
+
+#define GIMP_HELP_TOOL_PRESET_DIALOG              "gimp-tool-preset-dialog"
+#define GIMP_HELP_TOOL_PRESET_EDIT                "gimp-tool-preset-edit"
+#define GIMP_HELP_TOOL_PRESET_NEW                 "gimp-tool-preset-new"
+#define GIMP_HELP_TOOL_PRESET_DUPLICATE           "gimp-tool-preset-duplicate"
+#define GIMP_HELP_TOOL_PRESET_COPY_LOCATION       "gimp-tool-preset-copy-location"
+#define GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER "gimp-tool-preset-show-in-file-manager"
+#define GIMP_HELP_TOOL_PRESET_SAVE                "gimp-tool-preset-save"
+#define GIMP_HELP_TOOL_PRESET_RESTORE             "gimp-tool-preset-restore"
+#define GIMP_HELP_TOOL_PRESET_DELETE              "gimp-tool-preset-delete"
+#define GIMP_HELP_TOOL_PRESET_REFRESH             "gimp-tool-preset-refresh"
+
+#define GIMP_HELP_DOCUMENT_CLEAR                  "gimp-document-clear"
+#define GIMP_HELP_DOCUMENT_COPY_LOCATION          "gimp-document-copy-location"
+#define GIMP_HELP_DOCUMENT_SHOW_IN_FILE_MANAGER   "gimp-document-show-in-file-manager"
+#define GIMP_HELP_DOCUMENT_DIALOG                 "gimp-document-dialog"
+#define GIMP_HELP_DOCUMENT_OPEN                   "gimp-document-open"
+#define GIMP_HELP_DOCUMENT_REMOVE                 "gimp-document-remove"
+#define GIMP_HELP_DOCUMENT_REFRESH                "gimp-document-refresh"
+
+#define GIMP_HELP_TEMPLATE_DIALOG                 "gimp-template-dialog"
+#define GIMP_HELP_TEMPLATE_NEW                    "gimp-template-new"
+#define GIMP_HELP_TEMPLATE_DUPLICATE              "gimp-template-duplicate"
+#define GIMP_HELP_TEMPLATE_EDIT                   "gimp-template-edit"
+#define GIMP_HELP_TEMPLATE_IMAGE_NEW              "gimp-template-image-new"
+#define GIMP_HELP_TEMPLATE_DELETE                 "gimp-template-delete"
+
+#define GIMP_HELP_TOOL_OPTIONS_DIALOG             "gimp-tool-options-dialog"
+#define GIMP_HELP_TOOL_OPTIONS_SAVE               "gimp-tool-options-save"
+#define GIMP_HELP_TOOL_OPTIONS_RESTORE            "gimp-tool-options-restore"
+#define GIMP_HELP_TOOL_OPTIONS_EDIT               "gimp-tool-options-edit"
+#define GIMP_HELP_TOOL_OPTIONS_DELETE             "gimp-tool-options-delete"
+#define GIMP_HELP_TOOL_OPTIONS_RESET              "gimp-tool-options-reset"
+
+#define GIMP_HELP_ERRORS_DIALOG                   "gimp-errors-dialog"
+#define GIMP_HELP_ERRORS_HIGHLIGHT                "gimp-errors-highlight"
+#define GIMP_HELP_ERRORS_CLEAR                    "gimp-errors-clear"
+#define GIMP_HELP_ERRORS_SAVE                     "gimp-errors-save"
+#define GIMP_HELP_ERRORS_SELECT_ALL               "gimp-errors-select-all"
+
+#define GIMP_HELP_PREFS_DIALOG                    "gimp-prefs-dialog"
+#define GIMP_HELP_PREFS_SYSTEM_RESOURCES          "gimp-prefs-system-resources"
+#define GIMP_HELP_PREFS_DEBUGGING                 "gimp-prefs-debugging"
+#define GIMP_HELP_PREFS_COLOR_MANAGEMENT          "gimp-prefs-color-management"
+#define GIMP_HELP_PREFS_IMPORT_EXPORT             "gimp-prefs-import-export"
+#define GIMP_HELP_PREFS_PLAYGROUND                "gimp-prefs-playground"
+#define GIMP_HELP_PREFS_TOOL_OPTIONS              "gimp-prefs-tool-options"
+#define GIMP_HELP_PREFS_NEW_IMAGE                 "gimp-prefs-new-image"
+#define GIMP_HELP_PREFS_DEFAULT_GRID              "gimp-prefs-default-grid"
+#define GIMP_HELP_PREFS_INTERFACE                 "gimp-prefs-interface"
+#define GIMP_HELP_PREFS_THEME                     "gimp-prefs-theme"
+#define GIMP_HELP_PREFS_ICON_THEME                "gimp-prefs-icon-theme"
+#define GIMP_HELP_PREFS_TOOLBOX                   "gimp-prefs-toolbox"
+#define GIMP_HELP_PREFS_DIALOG_DEFAULTS           "gimp-prefs-dialog-defaults"
+#define GIMP_HELP_PREFS_HELP                      "gimp-prefs-help"
+#define GIMP_HELP_PREFS_DISPLAY                   "gimp-prefs-display"
+#define GIMP_HELP_PREFS_WINDOW_MANAGEMENT         "gimp-prefs-window-management"
+#define GIMP_HELP_PREFS_IMAGE_WINDOW              "gimp-prefs-image-window"
+#define GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE   "gimp-prefs-image-window-appearance"
+#define GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE        "gimp-prefs-image-window-title"
+#define GIMP_HELP_PREFS_IMAGE_WINDOW_SNAPPING     "gimp-prefs-image-window-snapping"
+#define GIMP_HELP_PREFS_INPUT_DEVICES             "gimp-prefs-input-devices"
+#define GIMP_HELP_PREFS_INPUT_CONTROLLERS         "gimp-prefs-input-controllers"
+#define GIMP_HELP_PREFS_FOLDERS                   "gimp-prefs-folders"
+#define GIMP_HELP_PREFS_FOLDERS_BRUSHES           "gimp-prefs-folders-brushes"
+#define GIMP_HELP_PREFS_FOLDERS_DYNAMICS          "gimp-prefs-folders-dynamics"
+#define GIMP_HELP_PREFS_FOLDERS_PATTERNS          "gimp-prefs-folders-patterns"
+#define GIMP_HELP_PREFS_FOLDERS_PALETTES          "gimp-prefs-folders-palettes"
+#define GIMP_HELP_PREFS_FOLDERS_GRADIENTS         "gimp-prefs-folders-gradients"
+#define GIMP_HELP_PREFS_FOLDERS_FONTS             "gimp-prefs-folders-fonts"
+#define GIMP_HELP_PREFS_FOLDERS_TOOL_PRESETS      "gimp-prefs-folders-tool-presets"
+#define GIMP_HELP_PREFS_FOLDERS_MYPAINT_BRUSHES   "gimp-prefs-folders-mypaint-brushes"
+#define GIMP_HELP_PREFS_FOLDERS_PLUG_INS          "gimp-prefs-folders-plug-ins"
+#define GIMP_HELP_PREFS_FOLDERS_SCRIPTS           "gimp-prefs-folders-scripts"
+#define GIMP_HELP_PREFS_FOLDERS_MODULES           "gimp-prefs-folders-modules"
+#define GIMP_HELP_PREFS_FOLDERS_INTERPRETERS      "gimp-prefs-folders-interpreters"
+#define GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT       "gimp-prefs-folders-environment"
+#define GIMP_HELP_PREFS_FOLDERS_THEMES            "gimp-prefs-folders-themes"
+#define GIMP_HELP_PREFS_FOLDERS_ICON_THEMES       "gimp-prefs-folders-icon-themes"
+
+#define GIMP_HELP_INPUT_DEVICES                   "gimp-help-input-devices"
+#define GIMP_HELP_KEYBOARD_SHORTCUTS              "gimp-help-keyboard-shortcuts"
+
+#define GIMP_HELP_INDEXED_PALETTE_DIALOG          "gimp-indexed-palette-dialog"
+#define GIMP_HELP_INDEXED_PALETTE_EDIT            "gimp-indexed-palette-edit"
+#define GIMP_HELP_INDEXED_PALETTE_ADD             "gimp-indexed-palette-add"
+#define GIMP_HELP_INDEXED_PALETTE_SELECTION_REPLACE "gimp-indexed-palette-selection-replace"
+#define GIMP_HELP_INDEXED_PALETTE_SELECTION_ADD   "gimp-indexed-palette-selection-add"
+#define GIMP_HELP_INDEXED_PALETTE_SELECTION_SUBTRACT "gimp-indexed-palette-selection-subtract"
+#define GIMP_HELP_INDEXED_PALETTE_SELECTION_INTERSECT "gimp-indexed-palette-selection-intersect"
+
+#define GIMP_HELP_POINTER_INFO_DIALOG             "gimp-pointer-info-dialog"
+#define GIMP_HELP_POINTER_INFO_SAMPLE_MERGED      "gimp-pointer-info-sample-merged"
+
+#define GIMP_HELP_SAMPLE_POINT_DIALOG             "gimp-sample-point-dialog"
+#define GIMP_HELP_SAMPLE_POINT_SAMPLE_MERGED      "gimp-sample-point-sample-merged"
+
+#define GIMP_HELP_DASHBOARD_DIALOG                "gimp-dashboard-dialog"
+#define GIMP_HELP_DASHBOARD_GROUPS                "gimp-dashboard-groups"
+#define GIMP_HELP_DASHBOARD_UPDATE_INTERVAL       "gimp-dashboard-update-interval"
+#define GIMP_HELP_DASHBOARD_HISTORY_DURATION      "gimp-dashboard-history-duration"
+#define GIMP_HELP_DASHBOARD_LOG_RECORD            "gimp-dashboard-log-record"
+#define GIMP_HELP_DASHBOARD_LOG_ADD_MARKER        "gimp-dashboard-log-add-marker"
+#define GIMP_HELP_DASHBOARD_LOG_ADD_EMPTY_MARKER  "gimp-dashboard-log-add-empty-marker"
+#define GIMP_HELP_DASHBOARD_RESET                 "gimp-dashboard-reset"
+#define GIMP_HELP_DASHBOARD_LOW_SWAP_SPACE_WARNING "gimp-dashboard-low-swap-space-warning"
+
+#define GIMP_HELP_DOCK                            "gimp-dock"
+#define GIMP_HELP_DOCK_CLOSE                      "gimp-dock-close"
+#define GIMP_HELP_DOCK_IMAGE_MENU                 "gimp-dock-image-menu"
+#define GIMP_HELP_DOCK_AUTO_BUTTON                "gimp-dock-auto-button"
+#define GIMP_HELP_DOCK_CHANGE_SCREEN              "gimp-dock-change-screen"
+
+#define GIMP_HELP_DOCK_TAB_ADD                    "gimp-dock-tab-add"
+#define GIMP_HELP_DOCK_TAB_CLOSE                  "gimp-dock-tab-close"
+#define GIMP_HELP_DOCK_TAB_LOCK                   "gimp-dock-tab-lock"
+#define GIMP_HELP_DOCK_TAB_MENU                   "gimp-dock-tab-menu"
+#define GIMP_HELP_DOCK_TAB_DETACH                 "gimp-dock-tab-detach"
+#define GIMP_HELP_DOCK_PREVIEW_SIZE               "gimp-dock-preview-size"
+#define GIMP_HELP_DOCK_TAB_STYLE                  "gimp-dock-tab-style"
+#define GIMP_HELP_DOCK_VIEW_AS_LIST               "gimp-dock-view-as-list"
+#define GIMP_HELP_DOCK_VIEW_AS_GRID               "gimp-dock-view-as-grid"
+#define GIMP_HELP_DOCK_SHOW_BUTTON_BAR            "gimp-dock-show-button-bar"
+
+#define GIMP_HELP_ABOUT_DIALOG                    "gimp-about-dialog"
+#define GIMP_HELP_ACTION_SEARCH_DIALOG            "gimp-action-search-dialog"
+#define GIMP_HELP_COLOR_DIALOG                    "gimp-color-dialog"
+#define GIMP_HELP_DEVICE_STATUS_DIALOG            "gimp-device-status-dialog"
+#define GIMP_HELP_DISPLAY_FILTER_DIALOG           "gimp-display-filter-dialog"
+#define GIMP_HELP_HISTOGRAM_DIALOG                "gimp-histogram-dialog"
+#define GIMP_HELP_MODULE_DIALOG                   "gimp-module-dialog"
+#define GIMP_HELP_NAVIGATION_DIALOG               "gimp-navigation-dialog"
+#define GIMP_HELP_SYMMETRY_DIALOG                 "gimp-symmetry-dialog"
+#define GIMP_HELP_TEXT_EDITOR_DIALOG              "gimp-text-editor-dialog"
+#define GIMP_HELP_TIPS_DIALOG                     "gimp-tips-dialog"
+#define GIMP_HELP_UNDO_DIALOG                     "gimp-undo-dialog"
+
+#define GIMP_HELP_EXPORT_DIALOG                   "gimp-export-dialog"
+#define GIMP_HELP_EXPORT_CONFIRM_DIALOG           "gimp-export-confirm-dialog"
+#define GIMP_HELP_UNIT_DIALOG                     "gimp-unit-dialog"
+
+#define GIMP_HELP_WINDOWS_SHOW_DOCK               "gimp-windows-show-dock"
+#define GIMP_HELP_WINDOWS_HIDE_DOCKS              "gimp-windows-hide-docks"
+#define GIMP_HELP_WINDOWS_SHOW_TABS               "gimp-windows-show-tabs"
+#define GIMP_HELP_WINDOWS_TABS_POSITION           "gimp-windows-tabs-position"
+#define GIMP_HELP_WINDOWS_USE_SINGLE_WINDOW_MODE  "gimp-windows-use-single-window-mode"
+#define GIMP_HELP_WINDOWS_OPEN_RECENT_DOCK        "gimp-windows-open-recent-dock"
+
+#define GIMP_HELP_HELP                            "gimp-help"
+#define GIMP_HELP_HELP_CONTEXT                    "gimp-help-context"
+
+/* Most of the colordisplay, colorselector and controller id's below are not
+   used since they are needed in /libgimpwidgets/ or /modules/ where this can't
+   be used. Instead the strings are used there directly.
+   We define them here anyway, to make gimp-help aware of them.
+ */
+#define GIMP_HELP_COLORDISPLAY_CLIP               "gimp-colordisplay-clip"
+#define GIMP_HELP_COLORDISPLAY_COLORBLIND         "gimp-colordisplay-colorblind"
+#define GIMP_HELP_COLORDISPLAY_CONTRAST           "gimp-colordisplay-contrast"
+#define GIMP_HELP_COLORDISPLAY_GAMMA              "gimp-colordisplay-gamma"
+
+#define GIMP_HELP_COLORSELECTOR_CMYK              "gimp-colorselector-cmyk"
+#define GIMP_HELP_COLORSELECTOR_GIMP              "gimp-colorselector-gimp"
+#define GIMP_HELP_COLORSELECTOR_NOTEBOOK          "gimp-colorselector-notebook"
+#define GIMP_HELP_COLORSELECTOR_PALETTE           "gimp-colorselector-palette"
+#define GIMP_HELP_COLORSELECTOR_SCALES            "gimp-colorselector-scales"
+#define GIMP_HELP_COLORSELECTOR_TRIANGLE          "gimp-colorselector-triangle"
+#define GIMP_HELP_COLORSELECTOR_WATERCOLOR        "gimp-colorselector-watercolor"
+
+#define GIMP_HELP_CONTROLLER_KEYBOARD             "gimp-controller-keyboard"
+#define GIMP_HELP_CONTROLLER_DIRECTX_DIRECTINPUT  "gimp-controller-directx-directinput"
+#define GIMP_HELP_CONTROLLER_LINUX_INPUT          "gimp-controller-linux-input"
+#define GIMP_HELP_CONTROLLER_MIDI                 "gimp-controller-midi"
+#define GIMP_HELP_CONTROLLER_MOUSE                "gimp-controller-mouse"
+#define GIMP_HELP_CONTROLLER_WHEEL                "gimp-controller-wheel"
+
+#endif /* __GIMP_HELP_IDS_H__ */
diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c
new file mode 100644
index 0000000..242454d
--- /dev/null
+++ b/app/widgets/gimphelp.c
@@ -0,0 +1,897 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphelp.c
+ * Copyright (C) 1999-2004 Michael Natterer <mitch@gimp.org>
+ *                         Henrik Brix Andersen <brix@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+#include "core/gimp-utils.h"
+
+#include "pdb/gimppdb.h"
+#include "pdb/gimpprocedure.h"
+
+#include "plug-in/gimpplugin.h"
+#include "plug-in/gimppluginmanager-help-domain.h"
+#include "plug-in/gimptemporaryprocedure.h"
+
+#include "gimphelp.h"
+#include "gimphelp-ids.h"
+#include "gimplanguagecombobox.h"
+#include "gimplanguagestore-parser.h"
+#include "gimpmessagebox.h"
+#include "gimpmessagedialog.h"
+#include "gimpmessagedialog.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+typedef struct _GimpIdleHelp GimpIdleHelp;
+
+struct _GimpIdleHelp
+{
+  Gimp         *gimp;
+  GimpProgress *progress;
+  gchar        *help_domain;
+  gchar        *help_locales;
+  gchar        *help_id;
+
+  GtkDialog    *query_dialog;
+};
+
+
+/*  local function prototypes  */
+
+static gboolean   gimp_idle_help          (GimpIdleHelp  *idle_help);
+static void       gimp_idle_help_free     (GimpIdleHelp  *idle_help);
+
+static gboolean   gimp_help_browser       (Gimp          *gimp,
+                                           GimpProgress  *progress);
+static void       gimp_help_browser_error (Gimp          *gimp,
+                                           GimpProgress  *progress,
+                                           const gchar   *title,
+                                           const gchar   *primary,
+                                           const gchar   *text);
+
+static void       gimp_help_call          (Gimp          *gimp,
+                                           GimpProgress  *progress,
+                                           const gchar   *procedure_name,
+                                           const gchar   *help_domain,
+                                           const gchar   *help_locales,
+                                           const gchar   *help_id);
+
+static gint       gimp_help_get_help_domains         (Gimp    *gimp,
+                                                      gchar ***domain_names,
+                                                      gchar ***domain_uris);
+static gchar    * gimp_help_get_default_domain_uri   (Gimp    *gimp);
+static gchar    * gimp_help_get_locales              (Gimp    *gimp);
+
+static GFile    * gimp_help_get_user_manual_basedir  (void);
+
+static void       gimp_help_query_alt_user_manual    (GimpIdleHelp *idle_help);
+
+static void       gimp_help_language_combo_changed   (GtkComboBox  *combo,
+                                                      GimpIdleHelp *idle_help);
+
+/*  public functions  */
+
+void
+gimp_help_show (Gimp         *gimp,
+                GimpProgress *progress,
+                const gchar  *help_domain,
+                const gchar  *help_id)
+{
+  GimpGuiConfig *config;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+
+  config = GIMP_GUI_CONFIG (gimp->config);
+
+  if (config->use_help)
+    {
+      GimpIdleHelp *idle_help = g_slice_new0 (GimpIdleHelp);
+
+      idle_help->gimp     = gimp;
+      idle_help->progress = progress;
+
+      if (help_domain && strlen (help_domain))
+        idle_help->help_domain = g_strdup (help_domain);
+
+      idle_help->help_locales = gimp_help_get_locales (gimp);
+
+      if (help_id && strlen (help_id))
+        idle_help->help_id = g_strdup (help_id);
+
+      GIMP_LOG (HELP, "request for help-id '%s' from help-domain '%s'",
+                help_id     ? help_id      : "(null)",
+                help_domain ? help_domain  : "(null)");
+
+      g_idle_add ((GSourceFunc) gimp_idle_help, idle_help);
+    }
+}
+
+gboolean
+gimp_help_browser_is_installed (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  if (gimp_pdb_lookup_procedure (gimp->pdb, "extension-gimp-help-browser"))
+    return TRUE;
+
+  return FALSE;
+}
+
+gboolean
+gimp_help_user_manual_is_installed (Gimp *gimp)
+{
+  GFile    *basedir;
+  gboolean  found = FALSE;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+
+  /*  if GIMP2_HELP_URI is set, assume that the manual can be found there  */
+  if (g_getenv ("GIMP2_HELP_URI"))
+    return TRUE;
+
+  basedir = gimp_help_get_user_manual_basedir ();
+
+  if (g_file_query_file_type (basedir, G_FILE_QUERY_INFO_NONE, NULL) ==
+      G_FILE_TYPE_DIRECTORY)
+    {
+      gchar       *locales = gimp_help_get_locales (gimp);
+      const gchar *s       = locales;
+      const gchar *p;
+
+      for (p = strchr (s, ':'); p && !found; p = strchr (s, ':'))
+        {
+          gchar *locale = g_strndup (s, p - s);
+          GFile *file1  = g_file_get_child (basedir, locale);
+          GFile *file2  = g_file_get_child (file1, "gimp-help.xml");
+
+          found = (g_file_query_file_type (file2, G_FILE_QUERY_INFO_NONE,
+                                           NULL) == G_FILE_TYPE_REGULAR);
+
+          g_object_unref (file1);
+          g_object_unref (file2);
+          g_free (locale);
+
+          s = p + 1;
+        }
+
+      g_free (locales);
+
+      if (! found)
+        {
+          GFile *file1  = g_file_get_child (basedir, "en");
+          GFile *file2  = g_file_get_child (file1, "gimp-help.xml");
+
+          found = (g_file_query_file_type (file2, G_FILE_QUERY_INFO_NONE,
+                                           NULL) == G_FILE_TYPE_REGULAR);
+
+          g_object_unref (file1);
+          g_object_unref (file2);
+        }
+    }
+
+  g_object_unref (basedir);
+
+  return found;
+}
+
+void
+gimp_help_user_manual_changed (Gimp *gimp)
+{
+  GimpProcedure *procedure;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /*  Check if a help parser is running  */
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb, "extension-gimp-help-temp");
+
+  if (GIMP_IS_TEMPORARY_PROCEDURE (procedure))
+    {
+      gimp_plug_in_close (GIMP_TEMPORARY_PROCEDURE (procedure)->plug_in, TRUE);
+    }
+}
+
+GList *
+gimp_help_get_installed_languages (void)
+{
+  GList *manuals = NULL;
+  GFile *basedir;
+
+  /*  if GIMP2_HELP_URI is set, assume that the manual can be found there  */
+  if (g_getenv ("GIMP2_HELP_URI"))
+    basedir = g_file_new_for_uri (g_getenv ("GIMP2_HELP_URI"));
+  else
+    basedir = gimp_help_get_user_manual_basedir ();
+
+  if (g_file_query_file_type (basedir, G_FILE_QUERY_INFO_NONE, NULL) ==
+      G_FILE_TYPE_DIRECTORY)
+    {
+      GFileEnumerator *enumerator;
+
+      enumerator = g_file_enumerate_children (basedir,
+                                              G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                              G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                              G_FILE_QUERY_INFO_NONE,
+                                              NULL, NULL);
+
+      if (enumerator)
+        {
+          GFileInfo *info;
+
+          while ((info = g_file_enumerator_next_file (enumerator,
+                                                      NULL, NULL)))
+            {
+              if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
+                {
+                  GFile *locale_dir;
+                  GFile *file;
+
+                  locale_dir = g_file_enumerator_get_child (enumerator, info);
+                  file  = g_file_get_child (locale_dir, "gimp-help.xml");
+                  if (g_file_query_file_type (file, G_FILE_QUERY_INFO_NONE,
+                                              NULL) == G_FILE_TYPE_REGULAR)
+                    {
+                      manuals = g_list_prepend (manuals,
+                                                g_strdup (g_file_info_get_name (info)));
+                    }
+                  g_object_unref (locale_dir);
+                  g_object_unref (file);
+                }
+              g_object_unref (info);
+            }
+          g_object_unref (enumerator);
+        }
+    }
+  g_object_unref (basedir);
+
+  return manuals;
+}
+
+/*  private functions  */
+
+static gboolean
+gimp_idle_help (GimpIdleHelp *idle_help)
+{
+  GimpGuiConfig *config         = GIMP_GUI_CONFIG (idle_help->gimp->config);
+  const gchar   *procedure_name = NULL;
+
+  if (! idle_help->help_domain       &&
+      ! config->user_manual_online   &&
+      ! gimp_help_user_manual_is_installed (idle_help->gimp))
+    {
+      /*  The user manual is not installed locally, propose alternative
+       *  manuals (other installed languages or online version).
+       */
+      gimp_help_query_alt_user_manual (idle_help);
+
+      return FALSE;
+    }
+
+  if (config->help_browser == GIMP_HELP_BROWSER_GIMP)
+    {
+      if (gimp_help_browser (idle_help->gimp, idle_help->progress))
+        procedure_name = "extension-gimp-help-browser-temp";
+    }
+
+  if (config->help_browser == GIMP_HELP_BROWSER_WEB_BROWSER)
+    {
+      /*  FIXME: should check for procedure availability  */
+      procedure_name = "plug-in-web-browser";
+    }
+
+  if (procedure_name)
+    gimp_help_call (idle_help->gimp,
+                    idle_help->progress,
+                    procedure_name,
+                    idle_help->help_domain,
+                    idle_help->help_locales,
+                    idle_help->help_id);
+
+  gimp_idle_help_free (idle_help);
+
+  return FALSE;
+}
+
+static void
+gimp_idle_help_free (GimpIdleHelp *idle_help)
+{
+  g_free (idle_help->help_domain);
+  g_free (idle_help->help_locales);
+  g_free (idle_help->help_id);
+
+  g_slice_free (GimpIdleHelp, idle_help);
+}
+
+static gboolean
+gimp_help_browser (Gimp         *gimp,
+                   GimpProgress *progress)
+{
+  static gboolean  busy = FALSE;
+  GimpProcedure   *procedure;
+
+  if (busy)
+    return TRUE;
+
+  busy = TRUE;
+
+  /*  Check if a help browser is already running  */
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb,
+                                         "extension-gimp-help-browser-temp");
+
+  if (! procedure)
+    {
+      GimpValueArray *args         = NULL;
+      gint            n_domains    = 0;
+      gchar         **help_domains = NULL;
+      gchar         **help_uris    = NULL;
+      GError         *error        = NULL;
+
+      procedure = gimp_pdb_lookup_procedure (gimp->pdb,
+                                             "extension-gimp-help-browser");
+
+      if (! procedure)
+        {
+          gimp_help_browser_error (gimp, progress,
+                                   _("Help browser is missing"),
+                                   _("The GIMP help browser is not available."),
+                                   _("The GIMP help browser plug-in appears "
+                                     "to be missing from your installation. "
+                                     "You may instead use the web browser "
+                                     "for reading the help pages."));
+          busy = FALSE;
+
+          return FALSE;
+        }
+
+      n_domains = gimp_help_get_help_domains (gimp, &help_domains, &help_uris);
+
+      args = gimp_procedure_get_arguments (procedure);
+      gimp_value_array_truncate (args, 5);
+
+      g_value_set_int             (gimp_value_array_index (args, 0),
+                                   GIMP_RUN_INTERACTIVE);
+      g_value_set_int             (gimp_value_array_index (args, 1),
+                                   n_domains);
+      gimp_value_take_stringarray (gimp_value_array_index (args, 2),
+                                   help_domains, n_domains);
+      g_value_set_int             (gimp_value_array_index (args, 3),
+                                   n_domains);
+      gimp_value_take_stringarray (gimp_value_array_index (args, 4),
+                                   help_uris, n_domains);
+
+      gimp_procedure_execute_async (procedure, gimp,
+                                    gimp_get_user_context (gimp),
+                                    NULL, args, NULL, &error);
+
+      gimp_value_array_unref (args);
+
+      if (error)
+        {
+          gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                                error->message);
+          g_error_free (error);
+        }
+     }
+
+  /*  Check if the help browser started properly  */
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb,
+                                         "extension-gimp-help-browser-temp");
+
+  if (! procedure)
+    {
+      gimp_help_browser_error (gimp, progress,
+                               _("Help browser doesn't start"),
+                               _("Could not start the GIMP help browser "
+                                 "plug-in."),
+                               _("You may instead use the web browser "
+                                 "for reading the help pages."));
+      busy = FALSE;
+
+      return FALSE;
+    }
+
+  busy = FALSE;
+
+  return TRUE;
+}
+
+static void
+gimp_help_browser_error (Gimp         *gimp,
+                         GimpProgress *progress,
+                         const gchar  *title,
+                         const gchar  *primary,
+                         const gchar  *text)
+{
+  GtkWidget *dialog;
+
+  dialog = gimp_message_dialog_new (title, GIMP_ICON_HELP_USER_MANUAL,
+                                    NULL, 0,
+                                    NULL, NULL,
+
+                                    _("_Cancel"),          GTK_RESPONSE_CANCEL,
+                                    _("Use _Web Browser"), GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  if (progress)
+    {
+      guint32 window_id = gimp_progress_get_window_id (progress);
+
+      if (window_id)
+        gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
+    }
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     "%s", primary);
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", text);
+
+  if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      g_object_set (gimp->config,
+                    "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
+                    NULL);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+gimp_help_call (Gimp         *gimp,
+                GimpProgress *progress,
+                const gchar  *procedure_name,
+                const gchar  *help_domain,
+                const gchar  *help_locales,
+                const gchar  *help_id)
+{
+  GimpProcedure *procedure;
+
+  /*  Special case the help browser  */
+  if (! strcmp (procedure_name, "extension-gimp-help-browser-temp"))
+    {
+      GimpValueArray *return_vals;
+      GError         *error = NULL;
+
+      GIMP_LOG (HELP, "Calling help via %s: %s %s %s",
+                procedure_name,
+                help_domain  ? help_domain  : "(null)",
+                help_locales ? help_locales : "(null)",
+                help_id      ? help_id      : "(null)");
+
+      return_vals =
+        gimp_pdb_execute_procedure_by_name (gimp->pdb,
+                                            gimp_get_user_context (gimp),
+                                            progress, &error,
+                                            procedure_name,
+                                            G_TYPE_STRING, help_domain,
+                                            G_TYPE_STRING, help_locales,
+                                            G_TYPE_STRING, help_id,
+                                            G_TYPE_NONE);
+
+      gimp_value_array_unref (return_vals);
+
+      if (error)
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_error_free (error);
+        }
+
+      return;
+    }
+
+  /*  Check if a help parser is already running  */
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb, "extension-gimp-help-temp");
+
+  if (! procedure)
+    {
+      GimpValueArray  *args         = NULL;
+      gint             n_domains    = 0;
+      gchar          **help_domains = NULL;
+      gchar          **help_uris    = NULL;
+      GError          *error        = NULL;
+
+      procedure = gimp_pdb_lookup_procedure (gimp->pdb, "extension-gimp-help");
+
+      if (! procedure)
+        /*  FIXME: error msg  */
+        return;
+
+      n_domains = gimp_help_get_help_domains (gimp, &help_domains, &help_uris);
+
+      args = gimp_procedure_get_arguments (procedure);
+      gimp_value_array_truncate (args, 4);
+
+      g_value_set_int             (gimp_value_array_index (args, 0),
+                                   n_domains);
+      gimp_value_take_stringarray (gimp_value_array_index (args, 1),
+                                   help_domains, n_domains);
+      g_value_set_int             (gimp_value_array_index (args, 2),
+                                   n_domains);
+      gimp_value_take_stringarray (gimp_value_array_index (args, 3),
+                                   help_uris, n_domains);
+
+      gimp_procedure_execute_async (procedure, gimp,
+                                    gimp_get_user_context (gimp), progress,
+                                    args, NULL, &error);
+
+      gimp_value_array_unref (args);
+
+      if (error)
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_error_free (error);
+        }
+    }
+
+  /*  Check if the help parser started properly  */
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb, "extension-gimp-help-temp");
+
+  if (procedure)
+    {
+      GimpValueArray *return_vals;
+      GError         *error = NULL;
+
+      GIMP_LOG (HELP, "Calling help via %s: %s %s %s",
+                procedure_name,
+                help_domain  ? help_domain  : "(null)",
+                help_locales ? help_locales : "(null)",
+                help_id      ? help_id      : "(null)");
+
+      return_vals =
+        gimp_pdb_execute_procedure_by_name (gimp->pdb,
+                                            gimp_get_user_context (gimp),
+                                            progress, &error,
+                                            "extension-gimp-help-temp",
+                                            G_TYPE_STRING, procedure_name,
+                                            G_TYPE_STRING, help_domain,
+                                            G_TYPE_STRING, help_locales,
+                                            G_TYPE_STRING, help_id,
+                                            G_TYPE_NONE);
+
+      gimp_value_array_unref (return_vals);
+
+      if (error)
+        {
+          gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
+          g_error_free (error);
+        }
+    }
+}
+
+static gint
+gimp_help_get_help_domains (Gimp    *gimp,
+                            gchar ***domain_names,
+                            gchar ***domain_uris)
+{
+  gchar **plug_in_domains = NULL;
+  gchar **plug_in_uris    = NULL;
+  gint    i, n_domains;
+
+  n_domains = gimp_plug_in_manager_get_help_domains (gimp->plug_in_manager,
+                                                     &plug_in_domains,
+                                                     &plug_in_uris);
+
+  *domain_names = g_new0 (gchar *, n_domains + 1);
+  *domain_uris  = g_new0 (gchar *, n_domains + 1);
+
+  (*domain_names)[0] = g_strdup ("https://www.gimp.org/help");
+  (*domain_uris)[0]  = gimp_help_get_default_domain_uri (gimp);
+
+  for (i = 0; i < n_domains; i++)
+    {
+      (*domain_names)[i + 1] = plug_in_domains[i];
+      (*domain_uris)[i + 1]  = plug_in_uris[i];
+    }
+
+  g_free (plug_in_domains);
+  g_free (plug_in_uris);
+
+  return n_domains + 1;
+}
+
+static gchar *
+gimp_help_get_default_domain_uri (Gimp *gimp)
+{
+  GimpGuiConfig *config = GIMP_GUI_CONFIG (gimp->config);
+  GFile         *dir;
+  gchar         *uri;
+
+  if (g_getenv ("GIMP2_HELP_URI"))
+    return g_strdup (g_getenv ("GIMP2_HELP_URI"));
+
+  if (config->user_manual_online)
+    return g_strdup (config->user_manual_online_uri);
+
+  dir = gimp_help_get_user_manual_basedir ();
+  uri = g_file_get_uri (dir);
+  g_object_unref (dir);
+
+  return uri;
+}
+
+static gchar *
+gimp_help_get_locales (Gimp *gimp)
+{
+  GimpGuiConfig  *config = GIMP_GUI_CONFIG (gimp->config);
+  gchar         **names;
+  gchar          *locales      = NULL;
+  GList          *locales_list = NULL;
+  GList          *iter;
+  gint            i;
+
+  if (config->help_locales && strlen (config->help_locales))
+    return g_strdup (config->help_locales);
+
+  /* Process locales. */
+  names = (gchar **) g_get_language_names ();
+  for (i = 0; names[i]; i++)
+    {
+      gchar *locale = g_strdup (names[i]);
+      gchar *c;
+
+      /* We don't care about encoding in context of our help system. */
+      c = strchr (locale, '.');
+      if (c)
+        *c = '\0';
+
+      /* We don't care about variants either. */
+      c = strchr (locale, '@');
+      if (c)
+        *c = '\0';
+
+      /* Apparently some systems (i.e. Windows) would return a value as
+       * IETF language tag, which is a different format from POSIX
+       * locale; especially it would separate the lang and the region
+       * with an hyphen instead of an underscore.
+       * Actually the difference is much deeper, and IETF language tags
+       * can have extended language subtags, a script subtag, variants,
+       * moreover using different codes.
+       * We'd actually need to look into this in details (TODO).
+       * this dirty hack should do for easy translation at least (like
+       * "en-GB" -> "en_GB).
+       * Cf. bug 777754.
+       */
+      c = strchr (locale, '-');
+      if (c)
+        *c = '_';
+
+      if (locale && *locale &&
+          ! g_list_find_custom (locales_list, locale,
+                                (GCompareFunc) g_strcmp0))
+        {
+          gchar *base;
+
+          /* Adding this locale. */
+          locales_list = g_list_prepend (locales_list, locale);
+
+          /* Adding the base language as well. */
+          base = strdup (locale);
+          c = strchr (base, '_');
+          if (c)
+            *c = '\0';
+
+          if (base && *base &&
+              ! g_list_find_custom (locales_list, base,
+                                    (GCompareFunc) g_strcmp0))
+            {
+              locales_list = g_list_prepend (locales_list, base);
+            }
+          else
+            {
+              g_free (base);
+            }
+        }
+      else
+        {
+          g_free (locale);
+        }
+    }
+
+  locales_list = g_list_reverse (locales_list);
+
+  /* Finally generate the colon-separated value. */
+  if (locales_list)
+    {
+      locales = g_strdup (locales_list->data);
+      for (iter = locales_list->next; iter; iter = iter->next)
+        {
+          gchar *temp = locales;
+          locales = g_strconcat (temp, ":", iter->data, NULL);
+          g_free (temp);
+        }
+    }
+
+  g_list_free_full (locales_list, g_free);
+
+  return locales;
+}
+
+static GFile *
+gimp_help_get_user_manual_basedir (void)
+{
+  return gimp_data_directory_file ("help", NULL);
+}
+
+static void
+gimp_help_query_online_response (GtkWidget    *dialog,
+                                 gint          response,
+                                 GimpIdleHelp *idle_help)
+{
+  gtk_widget_destroy (dialog);
+
+  if (response == GTK_RESPONSE_ACCEPT)
+    {
+      g_object_set (idle_help->gimp->config,
+                    "user-manual-online", TRUE,
+                    NULL);
+    }
+  if (response != GTK_RESPONSE_YES)
+    {
+      g_object_set (idle_help->gimp->config,
+                    "help-locales", "",
+                    NULL);
+    }
+
+  if (response == GTK_RESPONSE_ACCEPT ||
+      response == GTK_RESPONSE_YES)
+    {
+      gimp_help_show (idle_help->gimp,
+                      idle_help->progress,
+                      idle_help->help_domain,
+                      idle_help->help_id);
+    }
+
+  gimp_idle_help_free (idle_help);
+}
+
+static void
+gimp_help_query_alt_user_manual (GimpIdleHelp *idle_help)
+{
+  GtkWidget *dialog;
+  GList     *manuals;
+
+  dialog = gimp_message_dialog_new (_("GIMP user manual is missing"),
+                                    GIMP_ICON_HELP_USER_MANUAL,
+                                    NULL, 0, NULL, NULL,
+                                    _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                    NULL);
+  idle_help->query_dialog = GTK_DIALOG (dialog);
+
+  if (idle_help->progress)
+    {
+      guint32 window_id = gimp_progress_get_window_id (idle_help->progress);
+
+      if (window_id)
+        gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
+    }
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("The GIMP user manual is not installed "
+                                       "in your language."));
+
+  /* Add a list of available manuals instead, if any. */
+  manuals = gimp_help_get_installed_languages ();
+  if (manuals != NULL)
+    {
+      GtkWidget *lang_combo;
+
+      /* Add an additional button. */
+      gtk_dialog_add_button (GTK_DIALOG (dialog),
+                             _("Read Selected _Language"),
+                             GTK_RESPONSE_YES);
+      /* And a dropdown list of available manuals. */
+      lang_combo = gimp_language_combo_box_new (TRUE,
+                                                _("Available manuals..."));
+      gtk_combo_box_set_active (GTK_COMBO_BOX (lang_combo), 0);
+      gtk_dialog_set_response_sensitive (idle_help->query_dialog,
+                                         GTK_RESPONSE_YES, FALSE);
+      g_signal_connect (lang_combo, "changed",
+                        G_CALLBACK (gimp_help_language_combo_changed),
+                        idle_help);
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                          lang_combo, TRUE, TRUE, 0);
+      gtk_widget_show (lang_combo);
+
+      gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                 _("You may either select a manual in another "
+                                   "language or read the online version."));
+    }
+  else
+    {
+      gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                 _("You may either install the additional help "
+                                   "package or change your preferences to use "
+                                   "the online version."));
+    }
+  gtk_dialog_add_button (GTK_DIALOG (dialog),
+                         _("Read _Online"), GTK_RESPONSE_ACCEPT);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  if (manuals != NULL)
+    {
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_ACCEPT,
+                                               GTK_RESPONSE_YES,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+      g_list_free_full (manuals, g_free);
+    }
+  else
+    {
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_ACCEPT,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+    }
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gimp_help_query_online_response),
+                    idle_help);
+  gtk_widget_show (dialog);
+}
+
+static void
+gimp_help_language_combo_changed (GtkComboBox  *combo,
+                                  GimpIdleHelp *idle_help)
+{
+  gchar *help_locales = NULL;
+  gchar *code;
+
+  code = gimp_language_combo_box_get_code (GIMP_LANGUAGE_COMBO_BOX (combo));
+  if (code && g_strcmp0 ("", code) != 0)
+    {
+      help_locales = g_strdup_printf ("%s:", code);
+      gtk_dialog_set_response_sensitive (idle_help->query_dialog,
+                                         GTK_RESPONSE_YES, TRUE);
+    }
+  else
+    {
+      gtk_dialog_set_response_sensitive (idle_help->query_dialog,
+                                         GTK_RESPONSE_YES, FALSE);
+    }
+  g_object_set (idle_help->gimp->config,
+                "help-locales", help_locales? help_locales : "",
+                NULL);
+
+  g_free (code);
+  if (help_locales)
+    g_free (help_locales);
+}
diff --git a/app/widgets/gimphelp.h b/app/widgets/gimphelp.h
new file mode 100644
index 0000000..d4508d2
--- /dev/null
+++ b/app/widgets/gimphelp.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphelp.h
+ * Copyright (C) 1999-2000 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HELP_H__
+#define __GIMP_HELP_H__
+
+
+/*  the main help function
+ *
+ *  there should be no need to use it directly
+ */
+void       gimp_help_show (Gimp         *gimp,
+                           GimpProgress *progress,
+                           const gchar  *help_domain,
+                           const gchar  *help_id);
+
+
+/*  checks if the help browser is available
+ */
+gboolean   gimp_help_browser_is_installed     (Gimp *gimp);
+
+/*  checks if the user manual is installed locally
+ */
+gboolean   gimp_help_user_manual_is_installed (Gimp *gimp);
+
+/*  the configuration changed with respect to the location
+ *  of the user manual, invalidate the cached information
+ */
+void       gimp_help_user_manual_changed      (Gimp *gimp);
+
+
+GList    * gimp_help_get_installed_languages  (void);
+
+#endif /* __GIMP_HELP_H__ */
diff --git a/app/widgets/gimphighlightablebutton.c b/app/widgets/gimphighlightablebutton.c
new file mode 100644
index 0000000..41c5a44
--- /dev/null
+++ b/app/widgets/gimphighlightablebutton.c
@@ -0,0 +1,369 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphighlightablebutton.c
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimphighlightablebutton.h"
+
+
+#define DEFAULT_HIGHLIGHT_COLOR {0.20, 0.70, 0.20, 0.65}
+
+#define PADDING       1
+#define BORDER_WIDTH  1
+#define CORNER_RADIUS 2
+
+#define REV (2.0 * G_PI)
+
+
+enum
+{
+  PROP_0,
+  PROP_HIGHLIGHT,
+  PROP_HIGHLIGHT_COLOR
+};
+
+
+struct _GimpHighlightableButtonPrivate
+{
+  gboolean highlight;
+  GimpRGB  highlight_color;
+};
+
+
+static void       gimp_highlightable_button_set_property (GObject        *object,
+                                                          guint           property_id,
+                                                          const GValue   *value,
+                                                          GParamSpec     *pspec);
+static void       gimp_highlightable_button_get_property (GObject        *object,
+                                                          guint           property_id,
+                                                          GValue         *value,
+                                                          GParamSpec     *pspec);
+
+static gboolean   gimp_highlightable_button_expose_event (GtkWidget      *widget,
+                                                          GdkEventExpose *event);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpHighlightableButton, gimp_highlightable_button,
+                            GIMP_TYPE_BUTTON)
+
+#define parent_class gimp_highlightable_button_parent_class
+
+
+static void
+gimp_highlightable_button_class_init (GimpHighlightableButtonClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->get_property = gimp_highlightable_button_get_property;
+  object_class->set_property = gimp_highlightable_button_set_property;
+
+  widget_class->expose_event = gimp_highlightable_button_expose_event;
+
+  g_object_class_install_property (object_class, PROP_HIGHLIGHT,
+                                   g_param_spec_boolean ("highlight",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HIGHLIGHT_COLOR,
+                                   gimp_param_spec_rgb ("highlight-color",
+                                                        NULL, NULL,
+                                                        TRUE,
+                                                        &(GimpRGB) DEFAULT_HIGHLIGHT_COLOR,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_highlightable_button_init (GimpHighlightableButton *button)
+{
+  button->priv = gimp_highlightable_button_get_instance_private (button);
+}
+
+static void
+gimp_highlightable_button_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpHighlightableButton *button = GIMP_HIGHLIGHTABLE_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_HIGHLIGHT:
+      gimp_highlightable_button_set_highlight (button,
+                                               g_value_get_boolean (value));
+      break;
+
+    case PROP_HIGHLIGHT_COLOR:
+      gimp_highlightable_button_set_highlight_color (button,
+                                                     g_value_get_boxed (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_highlightable_button_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpHighlightableButton *button = GIMP_HIGHLIGHTABLE_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_HIGHLIGHT:
+      g_value_set_boolean (value, button->priv->highlight);
+      break;
+
+    case PROP_HIGHLIGHT_COLOR:
+      g_value_set_boxed (value, &button->priv->highlight_color);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_highlightable_button_expose_event (GtkWidget      *widget,
+                                        GdkEventExpose *event)
+{
+  GimpHighlightableButton *button = GIMP_HIGHLIGHTABLE_BUTTON (widget);
+
+  if (button->priv->highlight)
+    {
+      if (gtk_widget_is_drawable (widget))
+        {
+          GtkStyle      *style = gtk_widget_get_style (widget);
+          GtkStateType   state = gtk_widget_get_state (widget);
+          GtkAllocation  allocation;
+          gboolean       border;
+          gdouble        lightness;
+          gdouble        opacity;
+          gdouble        x;
+          gdouble        y;
+          gdouble        width;
+          gdouble        height;
+          cairo_t       *cr;
+
+          gtk_widget_get_allocation (widget, &allocation);
+
+          border =
+            (state                                       == GTK_STATE_ACTIVE   ||
+             state                                       == GTK_STATE_PRELIGHT ||
+             gtk_button_get_relief (GTK_BUTTON (button)) == GTK_RELIEF_NORMAL);
+
+          lightness = 1.00;
+          opacity   = 1.00;
+
+          switch (state)
+            {
+            case GTK_STATE_ACTIVE:      lightness = 0.80; break;
+            case GTK_STATE_PRELIGHT:    lightness = 1.25; break;
+            case GTK_STATE_INSENSITIVE: opacity   = 0.50; break;
+            default:                                      break;
+            }
+
+          x      = allocation.x      +       PADDING;
+          y      = allocation.y      +       PADDING;
+          width  = allocation.width  - 2.0 * PADDING;
+          height = allocation.height - 2.0 * PADDING;
+
+          if (border)
+            {
+              x      += BORDER_WIDTH / 2.0;
+              y      += BORDER_WIDTH / 2.0;
+              width  -= BORDER_WIDTH;
+              height -= BORDER_WIDTH;
+            }
+
+          cr = gdk_cairo_create (event->window);
+          gdk_cairo_region (cr, event->region);
+          cairo_clip (cr);
+
+          cairo_set_source_rgba (cr,
+                                 button->priv->highlight_color.r * lightness,
+                                 button->priv->highlight_color.g * lightness,
+                                 button->priv->highlight_color.b * lightness,
+                                 button->priv->highlight_color.a * opacity);
+
+          gimp_cairo_rounded_rectangle (cr,
+                                        x, y, width, height, CORNER_RADIUS);
+
+          cairo_fill_preserve (cr);
+
+          if (border)
+            {
+              gdk_cairo_set_source_color (cr, &style->fg[state]);
+
+              cairo_set_line_width (cr, BORDER_WIDTH);
+
+              cairo_stroke (cr);
+            }
+
+          cairo_destroy (cr);
+
+          if (gtk_widget_has_focus (widget))
+            {
+              gboolean interior_focus;
+              gint     focus_width;
+              gint     focus_pad;
+              gint     child_displacement_x;
+              gint     child_displacement_y;
+              gboolean displace_focus;
+              gint     x;
+              gint     y;
+              gint     width;
+              gint     height;
+
+              gtk_widget_style_get (widget,
+                                    "interior-focus",       &interior_focus,
+                                    "focus-line-width",     &focus_width,
+                                    "focus-padding",        &focus_pad,
+                                    "child-displacement-y", &child_displacement_y,
+                                    "child-displacement-x", &child_displacement_x,
+                                    "displace-focus",       &displace_focus,
+                                    NULL);
+
+              x      = allocation.x      +     PADDING;
+              y      = allocation.y      +     PADDING;
+              width  = allocation.width  - 2 * PADDING;
+              height = allocation.height - 2 * PADDING;
+
+              if (interior_focus)
+                {
+                  x      += style->xthickness + focus_pad;
+                  y      += style->ythickness + focus_pad;
+                  width  -= 2 * (style->xthickness + focus_pad);
+                  height -= 2 * (style->ythickness + focus_pad);
+                }
+              else
+                {
+                  x      -= focus_width + focus_pad;
+                  y      -= focus_width + focus_pad;
+                  width  += 2 * (focus_width + focus_pad);
+                  height += 2 * (focus_width + focus_pad);
+                }
+
+              if (state == GTK_STATE_ACTIVE && displace_focus)
+                {
+                  x += child_displacement_x;
+                  y += child_displacement_y;
+                }
+
+              gtk_paint_focus (style, gtk_widget_get_window (widget), state,
+                               &event->area, widget, "button",
+                               x, y, width, height);
+            }
+
+          gtk_container_propagate_expose (GTK_CONTAINER (button),
+                                          gtk_bin_get_child (GTK_BIN (button)),
+                                          event);
+        }
+
+      return FALSE;
+    }
+  else
+    {
+      return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+    }
+}
+
+
+/*  public functions  */
+
+
+GtkWidget *
+gimp_highlightable_button_new (void)
+{
+  return g_object_new (GIMP_TYPE_HIGHLIGHTABLE_BUTTON, NULL);
+}
+
+void
+gimp_highlightable_button_set_highlight (GimpHighlightableButton *button,
+                                         gboolean                 highlight)
+{
+  g_return_if_fail (GIMP_IS_HIGHLIGHTABLE_BUTTON (button));
+
+  if (button->priv->highlight != highlight)
+    {
+      button->priv->highlight = highlight;
+
+      gtk_widget_queue_draw (GTK_WIDGET (button));
+
+      g_object_notify (G_OBJECT (button), "highlight");
+    }
+}
+
+gboolean
+gimp_highlightable_button_get_highlight (GimpHighlightableButton *button)
+{
+  g_return_val_if_fail (GIMP_IS_HIGHLIGHTABLE_BUTTON (button), FALSE);
+
+  return button->priv->highlight;
+}
+
+void
+gimp_highlightable_button_set_highlight_color (GimpHighlightableButton *button,
+                                               const GimpRGB           *color)
+{
+  g_return_if_fail (GIMP_IS_HIGHLIGHTABLE_BUTTON (button));
+  g_return_if_fail (color != NULL);
+
+  if (memcmp (&button->priv->highlight_color, color, sizeof (GimpRGB)))
+    {
+      button->priv->highlight_color = *color;
+
+      if (button->priv->highlight)
+        gtk_widget_queue_draw (GTK_WIDGET (button));
+
+      g_object_notify (G_OBJECT (button), "highlight-color");
+    }
+}
+
+void
+gimp_highlightable_button_get_highlight_color (GimpHighlightableButton *button,
+                                               GimpRGB                 *color)
+{
+  g_return_if_fail (GIMP_IS_HIGHLIGHTABLE_BUTTON (button));
+  g_return_if_fail (color != NULL);
+
+  *color = button->priv->highlight_color;
+}
diff --git a/app/widgets/gimphighlightablebutton.h b/app/widgets/gimphighlightablebutton.h
new file mode 100644
index 0000000..a9283ac
--- /dev/null
+++ b/app/widgets/gimphighlightablebutton.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimphighlightablebutton.h
+ * Copyright (C) 2018 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HIGHLIGHTABLE_BUTTON_H__
+#define __GIMP_HIGHLIGHTABLE_BUTTON_H__
+
+
+#define GIMP_TYPE_HIGHLIGHTABLE_BUTTON            (gimp_highlightable_button_get_type ())
+#define GIMP_HIGHLIGHTABLE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HIGHLIGHTABLE_BUTTON, GimpHighlightableButton))
+#define GIMP_HIGHLIGHTABLE_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HIGHLIGHTABLE_BUTTON, GimpHighlightableButtonClass))
+#define GIMP_IS_HIGHLIGHTABLE_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_HIGHLIGHTABLE_BUTTON))
+#define GIMP_IS_HIGHLIGHTABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HIGHLIGHTABLE_BUTTON))
+#define GIMP_HIGHLIGHTABLE_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HIGHLIGHTABLE_BUTTON, GimpHighlightableButtonClass))
+
+
+#define GIMP_HIGHLIGHTABLE_BUTTON_COLOR_AFFIRMATIVE (&(const GimpRGB) {0.20, 0.70, 0.20, 0.65})
+#define GIMP_HIGHLIGHTABLE_BUTTON_COLOR_NEGATIVE    (&(const GimpRGB) {0.80, 0.20, 0.20, 0.65})
+
+
+typedef struct _GimpHighlightableButtonPrivate GimpHighlightableButtonPrivate;
+typedef struct _GimpHighlightableButtonClass   GimpHighlightableButtonClass;
+
+struct _GimpHighlightableButton
+{
+  GimpButton                      parent_instance;
+
+  GimpHighlightableButtonPrivate *priv;
+};
+
+struct _GimpHighlightableButtonClass
+{
+  GimpButtonClass  parent_class;
+};
+
+
+GType       gimp_highlightable_button_get_type            (void) G_GNUC_CONST;
+
+GtkWidget * gimp_highlightable_button_new                 (void);
+
+void        gimp_highlightable_button_set_highlight       (GimpHighlightableButton *button,
+                                                           gboolean                 highlight);
+gboolean    gimp_highlightable_button_get_highlight       (GimpHighlightableButton *button);
+
+void        gimp_highlightable_button_set_highlight_color (GimpHighlightableButton *button,
+                                                           const GimpRGB           *color);
+void        gimp_highlightable_button_get_highlight_color (GimpHighlightableButton *button,
+                                                           GimpRGB                 *color);
+
+
+#endif /* __GIMP_HIGHLIGHTABLE_BUTTON_H__ */
diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c
new file mode 100644
index 0000000..f2d291b
--- /dev/null
+++ b/app/widgets/gimphistogrambox.c
@@ -0,0 +1,317 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimphistogram.h"
+
+#include "gimpcolorbar.h"
+#include "gimphandlebar.h"
+#include "gimphistogrambox.h"
+#include "gimphistogramview.h"
+
+#include "gimp-intl.h"
+
+
+/*  #define DEBUG_VIEW  */
+
+#define GRADIENT_HEIGHT  12
+#define CONTROL_HEIGHT   10
+
+
+/*  local function prototypes  */
+
+static void   gimp_histogram_box_low_adj_update  (GtkAdjustment     *adj,
+                                                  GimpHistogramBox  *box);
+static void   gimp_histogram_box_high_adj_update (GtkAdjustment     *adj,
+                                                  GimpHistogramBox  *box);
+static void   gimp_histogram_box_histogram_range (GimpHistogramView *view,
+                                                  gint               start,
+                                                  gint               end,
+                                                  GimpHistogramBox  *box);
+static void   gimp_histogram_box_channel_notify  (GimpHistogramView *view,
+                                                  GParamSpec        *pspec,
+                                                  GimpHistogramBox  *box);
+static void   gimp_histogram_box_border_notify   (GimpHistogramView *view,
+                                                  GParamSpec        *pspec,
+                                                  GimpHistogramBox  *box);
+
+
+G_DEFINE_TYPE (GimpHistogramBox, gimp_histogram_box, GTK_TYPE_BOX)
+
+
+static void
+gimp_histogram_box_class_init (GimpHistogramBoxClass *klass)
+{
+}
+
+static void
+gimp_histogram_box_init (GimpHistogramBox *box)
+{
+  GtkWidget *hbox;
+  GtkWidget *vbox;
+  GtkWidget *vbox2;
+  GtkWidget *frame;
+  GtkWidget *view;
+  GtkWidget *bar;
+
+  box->n_bins = 256;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (box), 2);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
+  /*  The histogram  */
+  view = gimp_histogram_view_new (TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), view, TRUE, TRUE, 0);
+  gtk_widget_show (view);
+
+  g_signal_connect (view, "range-changed",
+                    G_CALLBACK (gimp_histogram_box_histogram_range),
+                    box);
+
+  box->view = GIMP_HISTOGRAM_VIEW (view);
+
+  /*  The gradient below the histogram */
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox2),
+                                  GIMP_HISTOGRAM_VIEW (view)->border_width);
+  gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
+  gtk_widget_show (vbox2);
+
+  box->color_bar = bar = g_object_new (GIMP_TYPE_COLOR_BAR,
+                                       "histogram-channel", box->view->channel,
+                                       NULL);
+  gtk_widget_set_size_request (bar, -1, GRADIENT_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox2), bar, FALSE, FALSE, 0);
+  gtk_widget_show (bar);
+
+  g_signal_connect (view, "notify::histogram-channel",
+                    G_CALLBACK (gimp_histogram_box_channel_notify),
+                    box);
+  g_signal_connect (view, "notify::border-width",
+                    G_CALLBACK (gimp_histogram_box_border_notify),
+                    box);
+
+  box->slider_bar = bar = g_object_new (GIMP_TYPE_HANDLE_BAR, NULL);
+  gtk_widget_set_size_request (bar, -1, CONTROL_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox2), bar, FALSE, FALSE, 0);
+  gtk_widget_show (bar);
+
+  gimp_handle_bar_connect_events (GIMP_HANDLE_BAR (box->slider_bar),
+                                  box->color_bar);
+
+  /*  The range selection */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /*  low spinbutton  */
+  box->low_adj = (GtkAdjustment *)
+    gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 16.0, 0.0);
+  box->low_spinbutton = gimp_spin_button_new (box->low_adj, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (box->low_spinbutton), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), box->low_spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (box->low_spinbutton);
+
+  g_signal_connect (box->low_adj, "value-changed",
+                    G_CALLBACK (gimp_histogram_box_low_adj_update),
+                    box);
+
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 0,
+                                  GTK_ADJUSTMENT (box->low_adj));
+
+  /*  high spinbutton  */
+  box->high_adj = (GtkAdjustment *)
+    gtk_adjustment_new (255.0, 0.0, 255.0, 1.0, 16.0, 0.0);
+  box->high_spinbutton = gimp_spin_button_new (box->high_adj, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (box->high_spinbutton), TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox), box->high_spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (box->high_spinbutton);
+
+  g_signal_connect (box->high_adj, "value-changed",
+                    G_CALLBACK (gimp_histogram_box_high_adj_update),
+                    box);
+
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 2,
+                                  GTK_ADJUSTMENT (box->high_adj));
+
+#ifdef DEBUG_VIEW
+  spinbutton = gimp_prop_spin_button_new (G_OBJECT (box->view), "border-width",
+                                          1, 5, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  spinbutton = gimp_prop_spin_button_new (G_OBJECT (box->view), "subdivisions",
+                                          1, 5, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+#endif
+}
+
+static void
+gimp_histogram_box_low_adj_update (GtkAdjustment    *adjustment,
+                                   GimpHistogramBox *box)
+{
+  gdouble value = gtk_adjustment_get_value (adjustment);
+
+  gtk_adjustment_set_lower (box->high_adj, value);
+
+  if (box->n_bins != 256)
+    value *= box->n_bins - 1;
+
+  value = ROUND (value);
+
+  if (box->view->start != value)
+    gimp_histogram_view_set_range (box->view, value, box->view->end);
+}
+
+static void
+gimp_histogram_box_high_adj_update (GtkAdjustment    *adjustment,
+                                    GimpHistogramBox *box)
+{
+  gdouble value = gtk_adjustment_get_value (adjustment);
+
+  gtk_adjustment_set_upper (box->low_adj, value);
+
+  if (box->n_bins != 256)
+    value *= box->n_bins - 1;
+
+  value = ROUND (value);
+
+  if (box->view->end != value)
+    gimp_histogram_view_set_range (box->view, box->view->start, value);
+}
+
+static void
+gimp_histogram_box_histogram_range (GimpHistogramView *view,
+                                    gint               start,
+                                    gint               end,
+                                    GimpHistogramBox  *box)
+{
+  gdouble s = start;
+  gdouble e = end;
+
+  if (box->n_bins != view->n_bins)
+    {
+      gdouble upper;
+      gdouble page_increment;
+      gdouble step_increment;
+      guint   digits;
+
+      box->n_bins = view->n_bins;
+
+      if (box->n_bins == 256)
+        {
+          digits         = 0;
+          upper          = 255.0;
+          step_increment = 1.0;
+          page_increment = 16.0;
+        }
+      else
+        {
+          digits         = 3;
+          upper          = 1.0;
+          step_increment = 0.01;
+          page_increment = 0.1;
+        }
+
+      g_object_set (G_OBJECT (box->high_adj),
+                    "upper", upper,
+                    "step-increment", step_increment,
+                    "page-increment", page_increment,
+                    NULL);
+
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (box->high_spinbutton), digits);
+
+      g_object_set (G_OBJECT (box->low_adj),
+                    "step-increment", step_increment,
+                    "page-increment", page_increment,
+                    NULL);
+
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (box->low_spinbutton), digits);
+    }
+
+  if (box->n_bins != 256)
+    {
+      s /= box->n_bins - 1;
+      e /= box->n_bins - 1;
+    }
+
+  gtk_adjustment_set_lower (box->high_adj, s);
+  gtk_adjustment_set_upper (box->low_adj,  e);
+
+  gtk_adjustment_set_value (box->low_adj,  s);
+  gtk_adjustment_set_value (box->high_adj, e);
+}
+
+static void
+gimp_histogram_box_channel_notify (GimpHistogramView *view,
+                                   GParamSpec        *pspec,
+                                   GimpHistogramBox  *box)
+{
+  gimp_color_bar_set_channel (GIMP_COLOR_BAR (box->color_bar), view->channel);
+}
+
+static void
+gimp_histogram_box_border_notify (GimpHistogramView *view,
+                                  GParamSpec        *pspec,
+                                  GimpHistogramBox  *box)
+{
+  GtkWidget *vbox = gtk_widget_get_parent (box->color_bar);
+
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), view->border_width);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_histogram_box_new (void)
+{
+  return g_object_new (GIMP_TYPE_HISTOGRAM_BOX, NULL);
+}
+
+void
+gimp_histogram_box_set_channel (GimpHistogramBox     *box,
+                                GimpHistogramChannel  channel)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_BOX (box));
+
+  if (box->view)
+    gimp_histogram_view_set_channel (box->view, channel);
+}
diff --git a/app/widgets/gimphistogrambox.h b/app/widgets/gimphistogrambox.h
new file mode 100644
index 0000000..cff4a10
--- /dev/null
+++ b/app/widgets/gimphistogrambox.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HISTOGRAM_BOX_H__
+#define __GIMP_HISTOGRAM_BOX_H__
+
+
+#define GIMP_TYPE_HISTOGRAM_BOX            (gimp_histogram_box_get_type ())
+#define GIMP_HISTOGRAM_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM_BOX, GimpHistogramBox))
+#define GIMP_HISTOGRAM_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM_BOX, GimpHistogramBoxClass))
+#define GIMP_IS_HISTOGRAM_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HISTOGRAM_BOX))
+#define GIMP_IS_HISTOGRAM_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HISTOGRAM_BOX))
+#define GIMP_HISTOGRAM_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HISTOGRAM_BOX, GimpHistogramBoxClass))
+
+
+typedef struct _GimpHistogramBoxClass GimpHistogramBoxClass;
+
+struct _GimpHistogramBox
+{
+  GtkBox             parent_instance;
+
+  GimpHistogramView *view;
+  GtkWidget         *color_bar;
+  GtkWidget         *slider_bar;
+
+  gint               n_bins;
+
+  GtkAdjustment     *low_adj;
+  GtkAdjustment     *high_adj;
+
+  GtkWidget         *low_spinbutton;
+  GtkWidget         *high_spinbutton;
+};
+
+struct _GimpHistogramBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_histogram_box_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_histogram_box_new         (void);
+void        gimp_histogram_box_set_channel (GimpHistogramBox     *box,
+                                            GimpHistogramChannel  channel);
+
+
+#endif  /*  __GIMP_HISTOGRAM_BOX_H__  */
diff --git a/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c
new file mode 100644
index 0000000..ae21eec
--- /dev/null
+++ b/app/widgets/gimphistogrameditor.c
@@ -0,0 +1,757 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpasync.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-histogram.h"
+#include "core/gimphistogram.h"
+#include "core/gimpimage.h"
+
+#include "gimpdocked.h"
+#include "gimphelp-ids.h"
+#include "gimphistogrambox.h"
+#include "gimphistogrameditor.h"
+#include "gimphistogramview.h"
+#include "gimppropwidgets.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_LINEAR
+};
+
+
+static void     gimp_histogram_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void     gimp_histogram_editor_set_property  (GObject            *object,
+                                                     guint               property_id,
+                                                     const GValue       *value,
+                                                     GParamSpec         *pspec);
+static void     gimp_histogram_editor_get_property  (GObject            *object,
+                                                     guint               property_id,
+                                                     GValue             *value,
+                                                     GParamSpec         *pspec);
+
+static void     gimp_histogram_editor_set_aux_info  (GimpDocked          *docked,
+                                                     GList               *aux_info);
+static GList  * gimp_histogram_editor_get_aux_info  (GimpDocked          *docked);
+
+static void     gimp_histogram_editor_set_image     (GimpImageEditor     *editor,
+                                                     GimpImage           *image);
+static void     gimp_histogram_editor_layer_changed (GimpImage           *image,
+                                                     GimpHistogramEditor *editor);
+static void     gimp_histogram_editor_frozen_update (GimpHistogramEditor *editor,
+                                                     const GParamSpec    *pspec);
+static void     gimp_histogram_editor_buffer_update (GimpHistogramEditor *editor,
+                                                     const GParamSpec    *pspec);
+static void     gimp_histogram_editor_update        (GimpHistogramEditor *editor);
+
+static gboolean gimp_histogram_editor_idle_update   (GimpHistogramEditor *editor);
+static gboolean gimp_histogram_menu_sensitivity     (gint                 value,
+                                                     gpointer             data);
+static void     gimp_histogram_editor_menu_update   (GimpHistogramEditor *editor);
+static void     gimp_histogram_editor_name_update   (GimpHistogramEditor *editor);
+static void     gimp_histogram_editor_info_update   (GimpHistogramEditor *editor);
+
+static gboolean gimp_histogram_editor_view_expose   (GimpHistogramEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpHistogramEditor, gimp_histogram_editor,
+                         GIMP_TYPE_IMAGE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_histogram_editor_docked_iface_init))
+
+#define parent_class gimp_histogram_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_histogram_editor_class_init (GimpHistogramEditorClass *klass)
+{
+  GObjectClass         *object_class       = G_OBJECT_CLASS (klass);
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  object_class->set_property    = gimp_histogram_editor_set_property;
+  object_class->get_property    = gimp_histogram_editor_get_property;
+
+  image_editor_class->set_image = gimp_histogram_editor_set_image;
+
+  g_object_class_install_property (object_class, PROP_LINEAR,
+                                   g_param_spec_boolean ("linear",
+                                                         _("Linear"), NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_histogram_editor_init (GimpHistogramEditor *editor)
+{
+  GimpHistogramView *view;
+  GtkWidget         *hbox;
+  GtkWidget         *label;
+  GtkWidget         *menu;
+  GtkWidget         *table;
+  gint               i;
+
+  const gchar *gimp_histogram_editor_labels[] =
+    {
+      N_("Mean:"),
+      N_("Std dev:"),
+      N_("Median:"),
+      N_("Pixels:"),
+      N_("Count:"),
+      N_("Percentile:")
+    };
+
+  editor->box = gimp_histogram_box_new ();
+
+  gimp_editor_set_show_name (GIMP_EDITOR (editor), TRUE);
+
+  view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  editor->menu = menu = gimp_prop_enum_combo_box_new (G_OBJECT (view),
+                                                      "histogram-channel",
+                                                      0, 0);
+  gimp_enum_combo_box_set_icon_prefix (GIMP_ENUM_COMBO_BOX (menu),
+                                       "gimp-channel");
+  gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (editor->menu),
+                                      gimp_histogram_menu_sensitivity,
+                                      editor, NULL);
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (editor->menu),
+                                 view->channel);
+  gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
+  gtk_widget_show (menu);
+
+  gimp_help_set_help_data (editor->menu,
+                           _("Histogram channel"), NULL);
+
+  menu = gimp_prop_enum_icon_box_new (G_OBJECT (view),
+                                      "histogram-scale", "gimp-histogram",
+                                      0, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
+  gtk_widget_show (menu);
+
+  menu = gimp_prop_boolean_icon_box_new (G_OBJECT (editor), "linear",
+                                         GIMP_ICON_COLOR_SPACE_LINEAR,
+                                         GIMP_ICON_COLOR_SPACE_PERCEPTUAL,
+                                         _("Show values in linear space"),
+                                         _("Show values in perceptual space"));
+  gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
+  gtk_widget_show (menu);
+
+  gtk_box_pack_start (GTK_BOX (editor), editor->box, TRUE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (editor->box));
+
+  g_signal_connect_swapped (view, "range-changed",
+                            G_CALLBACK (gimp_histogram_editor_info_update),
+                            editor);
+  g_signal_connect_swapped (view, "notify::histogram-channel",
+                            G_CALLBACK (gimp_histogram_editor_info_update),
+                            editor);
+
+  g_signal_connect_swapped (view, "expose-event",
+                            G_CALLBACK (gimp_histogram_editor_view_expose),
+                            editor);
+
+  table = gtk_table_new (3, 4, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 1, 6);
+  gtk_box_pack_start (GTK_BOX (editor), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  for (i = 0; i < 6; i++)
+    {
+      gint x = (i / 3) * 2;
+      gint y = (i % 3);
+
+      label = gtk_label_new (gettext (gimp_histogram_editor_labels[i]));
+      gimp_label_set_attributes (GTK_LABEL (label),
+                                 PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                                 PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                                 -1);
+      gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+      gtk_table_attach (GTK_TABLE (table), label, x, x + 1, y, y + 1,
+                        GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
+      gtk_widget_show (label);
+
+      editor->labels[i] =
+        label = g_object_new (GTK_TYPE_LABEL,
+                              "xalign",      0.0,
+                              "yalign",      0.5,
+                              "width-chars", i > 2 ? 9 : 5,
+                              NULL);
+      gimp_label_set_attributes (GTK_LABEL (editor->labels[i]),
+                                 PANGO_ATTR_SCALE, PANGO_SCALE_SMALL,
+                                 -1);
+      gtk_table_attach (GTK_TABLE (table), label, x + 1, x + 2, y, y + 1,
+                        GTK_FILL, GTK_FILL, 2, 2);
+      gtk_widget_show (label);
+    }
+}
+
+static void
+gimp_histogram_editor_docked_iface_init (GimpDockedInterface *docked_iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (docked_iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  docked_iface->set_aux_info = gimp_histogram_editor_set_aux_info;
+  docked_iface->get_aux_info = gimp_histogram_editor_get_aux_info;
+}
+
+static void
+gimp_histogram_editor_set_property (GObject      *object,
+                                    guint         property_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpHistogramEditor *editor = GIMP_HISTOGRAM_EDITOR (object);
+  GimpHistogramView   *view   = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+  switch (property_id)
+    {
+    case PROP_LINEAR:
+      editor->linear = g_value_get_boolean (value);
+
+      if (editor->histogram)
+        {
+          g_clear_object (&editor->histogram);
+          gimp_histogram_view_set_histogram (view, NULL);
+        }
+
+      if (editor->bg_histogram)
+        {
+          g_clear_object (&editor->bg_histogram);
+          gimp_histogram_view_set_background (view, NULL);
+        }
+
+      gimp_histogram_editor_update (editor);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_histogram_editor_get_property (GObject    *object,
+                                    guint       property_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpHistogramEditor *editor = GIMP_HISTOGRAM_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_LINEAR:
+      g_value_set_boolean (value, editor->linear);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_histogram_editor_set_aux_info (GimpDocked *docked,
+                                    GList      *aux_info)
+{
+  GimpHistogramEditor *editor = GIMP_HISTOGRAM_EDITOR (docked);
+  GimpHistogramView   *view   = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  gimp_session_info_aux_set_props (G_OBJECT (view), aux_info,
+                                   "histogram-channel",
+                                   "histogram-scale",
+                                   NULL);
+}
+
+static GList *
+gimp_histogram_editor_get_aux_info (GimpDocked *docked)
+{
+  GimpHistogramEditor *editor = GIMP_HISTOGRAM_EDITOR (docked);
+  GimpHistogramView   *view   = GIMP_HISTOGRAM_BOX (editor->box)->view;
+  GList               *aux_info;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  return g_list_concat (aux_info,
+                        gimp_session_info_aux_new_from_props (G_OBJECT (view),
+                                                              "histogram-channel",
+                                                              "histogram-scale",
+                                                              NULL));
+}
+
+static void
+gimp_histogram_editor_set_image (GimpImageEditor *image_editor,
+                                 GimpImage       *image)
+{
+  GimpHistogramEditor *editor = GIMP_HISTOGRAM_EDITOR (image_editor);
+  GimpHistogramView   *view   = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+  if (image_editor->image)
+    {
+      if (editor->idle_id)
+        {
+          g_source_remove (editor->idle_id);
+          editor->idle_id = 0;
+        }
+
+      editor->update_pending = FALSE;
+
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_histogram_editor_update,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_histogram_editor_layer_changed,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_histogram_editor_menu_update,
+                                            editor);
+
+      if (editor->histogram)
+        {
+          g_clear_object (&editor->histogram);
+          gimp_histogram_view_set_histogram (view, NULL);
+        }
+
+      if (editor->bg_histogram)
+        {
+          g_clear_object (&editor->bg_histogram);
+          gimp_histogram_view_set_background (view, NULL);
+        }
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (image_editor, image);
+
+  if (image)
+    {
+      g_signal_connect_object (image, "mode-changed",
+                               G_CALLBACK (gimp_histogram_editor_menu_update),
+                               editor, G_CONNECT_SWAPPED);
+      g_signal_connect_object (image, "active-layer-changed",
+                               G_CALLBACK (gimp_histogram_editor_layer_changed),
+                               editor, 0);
+      g_signal_connect_object (image, "mask-changed",
+                               G_CALLBACK (gimp_histogram_editor_update),
+                               editor, G_CONNECT_SWAPPED);
+    }
+
+  gimp_histogram_editor_layer_changed (image, editor);
+}
+
+GtkWidget *
+gimp_histogram_editor_new (void)
+{
+  return g_object_new (GIMP_TYPE_HISTOGRAM_EDITOR, NULL);
+}
+
+static void
+gimp_histogram_editor_layer_changed (GimpImage           *image,
+                                     GimpHistogramEditor *editor)
+{
+  if (editor->drawable)
+    {
+      GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+      if (editor->histogram)
+        {
+          g_clear_object (&editor->histogram);
+          gimp_histogram_view_set_histogram (view, NULL);
+        }
+
+      if (editor->bg_histogram)
+        {
+          g_clear_object (&editor->bg_histogram);
+          gimp_histogram_view_set_background (view, NULL);
+        }
+
+      g_signal_handlers_disconnect_by_func (editor->drawable,
+                                            gimp_histogram_editor_name_update,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->drawable,
+                                            gimp_histogram_editor_menu_update,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->drawable,
+                                            gimp_histogram_editor_update,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->drawable,
+                                            gimp_histogram_editor_buffer_update,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (editor->drawable,
+                                            gimp_histogram_editor_frozen_update,
+                                            editor);
+      editor->drawable = NULL;
+    }
+
+  if (image)
+    editor->drawable = (GimpDrawable *) gimp_image_get_active_layer (image);
+
+  gimp_histogram_editor_menu_update (editor);
+
+  if (editor->drawable)
+    {
+      g_signal_connect_object (editor->drawable, "notify::frozen",
+                               G_CALLBACK (gimp_histogram_editor_frozen_update),
+                               editor, G_CONNECT_SWAPPED);
+      g_signal_connect_object (editor->drawable, "notify::buffer",
+                               G_CALLBACK (gimp_histogram_editor_buffer_update),
+                               editor, G_CONNECT_SWAPPED);
+      g_signal_connect_object (editor->drawable, "update",
+                               G_CALLBACK (gimp_histogram_editor_update),
+                               editor, G_CONNECT_SWAPPED);
+      g_signal_connect_object (editor->drawable, "alpha-changed",
+                               G_CALLBACK (gimp_histogram_editor_menu_update),
+                               editor, G_CONNECT_SWAPPED);
+      g_signal_connect_object (editor->drawable, "name-changed",
+                               G_CALLBACK (gimp_histogram_editor_name_update),
+                               editor, G_CONNECT_SWAPPED);
+
+      gimp_histogram_editor_buffer_update (editor, NULL);
+    }
+  else if (editor->histogram)
+    {
+      editor->recompute = TRUE;
+      gtk_widget_queue_draw (GTK_WIDGET (editor->box));
+    }
+
+  gimp_histogram_editor_info_update (editor);
+  gimp_histogram_editor_name_update (editor);
+}
+
+static void
+gimp_histogram_editor_calculate_async_callback (GimpAsync           *async,
+                                                GimpHistogramEditor *editor)
+{
+  editor->calculate_async = NULL;
+
+  if (gimp_async_is_finished (async) && editor->histogram)
+    {
+      if (editor->bg_pending)
+        {
+          GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+          editor->bg_histogram = gimp_histogram_duplicate (editor->histogram);
+
+          gimp_histogram_view_set_background (view, editor->bg_histogram);
+        }
+
+      gimp_histogram_editor_info_update (editor);
+    }
+
+  editor->bg_pending = FALSE;
+
+  if (editor->update_pending)
+    gimp_histogram_editor_update (editor);
+}
+
+static gboolean
+gimp_histogram_editor_validate (GimpHistogramEditor *editor)
+{
+  if (editor->recompute || ! editor->histogram)
+    {
+      if (editor->drawable &&
+          /* avoid calculating the histogram of a detached layer.  this can
+           * happen during gimp_image_remove_layer(), as a result of a pending
+           * "expose-event" signal (handled in
+           * gimp_histogram_editor_view_expose()) executed through
+           * gtk_tree_view_clamp_node_visible(), as a result of the
+           * GimpLayerTreeView in the Layers dialog receiving the image's
+           * "active-layer-changed" signal before us.  See bug #795716,
+           * comment 6.
+           */
+          gimp_item_is_attached (GIMP_ITEM (editor->drawable)))
+        {
+          GimpAsync *async;
+
+          if (! editor->histogram)
+            {
+              GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+              editor->histogram = gimp_histogram_new (editor->linear);
+
+              gimp_histogram_clear_values (
+                editor->histogram,
+                babl_format_get_n_components (
+                  gimp_drawable_get_format (editor->drawable)));
+
+              gimp_histogram_view_set_histogram (view, editor->histogram);
+            }
+
+          async = gimp_drawable_calculate_histogram_async (editor->drawable,
+                                                           editor->histogram,
+                                                           TRUE);
+
+          editor->calculate_async = async;
+
+          gimp_async_add_callback (
+            async,
+            (GimpAsyncCallback) gimp_histogram_editor_calculate_async_callback,
+            editor);
+
+          g_object_unref (async);
+        }
+      else if (editor->histogram)
+        {
+          gimp_histogram_clear_values (editor->histogram, 0);
+
+          gimp_histogram_editor_info_update (editor);
+        }
+
+      editor->recompute = FALSE;
+
+      if (editor->idle_id)
+        {
+          g_source_remove (editor->idle_id);
+          editor->idle_id = 0;
+        }
+    }
+
+  return (editor->histogram != NULL);
+}
+
+static void
+gimp_histogram_editor_frozen_update (GimpHistogramEditor *editor,
+                                     const GParamSpec    *pspec)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+  if (gimp_viewable_preview_is_frozen (GIMP_VIEWABLE (editor->drawable)))
+    {
+      /* Only do the background histogram if the histogram is visible.
+       * This is a workaround for the fact that recalculating the
+       * histogram is expensive and that it is only validated when it
+       * is shown. So don't slow down painting by doing something that
+       * is not even seen by the user.
+       */
+      if (! editor->bg_histogram &&
+          gtk_widget_is_drawable (GTK_WIDGET (editor)))
+        {
+          if (editor->idle_id)
+            {
+              g_source_remove (editor->idle_id);
+
+              gimp_histogram_editor_idle_update (editor);
+            }
+
+          if (gimp_histogram_editor_validate (editor))
+            {
+              if (editor->calculate_async)
+                {
+                  editor->bg_pending = TRUE;
+                }
+              else
+                {
+                  editor->bg_histogram = gimp_histogram_duplicate (
+                    editor->histogram);
+
+                  gimp_histogram_view_set_background (view,
+                                                      editor->bg_histogram);
+                }
+            }
+        }
+    }
+  else
+    {
+      if (editor->bg_histogram)
+        {
+          g_clear_object (&editor->bg_histogram);
+          gimp_histogram_view_set_background (view, NULL);
+        }
+
+      editor->bg_pending = FALSE;
+
+      if (editor->update_pending)
+        gimp_async_cancel_and_wait (editor->calculate_async);
+    }
+}
+
+static void
+gimp_histogram_editor_buffer_update (GimpHistogramEditor *editor,
+                                     const GParamSpec    *pspec)
+{
+  g_object_set (editor,
+                "linear", gimp_drawable_get_linear (editor->drawable),
+                NULL);
+}
+
+static void
+gimp_histogram_editor_update (GimpHistogramEditor *editor)
+{
+  if (editor->bg_pending)
+    {
+      editor->update_pending = TRUE;
+
+      return;
+    }
+
+  editor->update_pending = FALSE;
+
+  if (editor->calculate_async)
+    gimp_async_cancel_and_wait (editor->calculate_async);
+
+  if (editor->idle_id)
+    g_source_remove (editor->idle_id);
+
+  editor->idle_id =
+    g_timeout_add_full (G_PRIORITY_LOW,
+                        200,
+                        (GSourceFunc) gimp_histogram_editor_idle_update,
+                        editor,
+                        NULL);
+}
+
+static gboolean
+gimp_histogram_editor_idle_update (GimpHistogramEditor *editor)
+{
+  editor->idle_id = 0;
+
+  /* Mark the histogram for recomputation and queue a redraw.
+   * We will then recalculate the histogram when the view is exposed.
+   */
+  editor->recompute = TRUE;
+  gtk_widget_queue_draw (GTK_WIDGET (editor->box));
+
+  return FALSE;
+}
+
+static gboolean
+gimp_histogram_menu_sensitivity (gint      value,
+                                 gpointer  data)
+{
+  GimpHistogramEditor  *editor  = GIMP_HISTOGRAM_EDITOR (data);
+  GimpHistogramChannel  channel = value;
+
+  if (editor->histogram)
+    return gimp_histogram_has_channel (editor->histogram, channel);
+
+  return FALSE;
+}
+
+static void
+gimp_histogram_editor_menu_update (GimpHistogramEditor *editor)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+
+  gtk_widget_queue_draw (editor->menu);
+
+  if (editor->histogram &&
+      ! gimp_histogram_has_channel (editor->histogram, view->channel))
+    {
+      gimp_histogram_view_set_channel (view, GIMP_HISTOGRAM_VALUE);
+    }
+}
+
+static void
+gimp_histogram_editor_name_update (GimpHistogramEditor *editor)
+{
+  const gchar *name = NULL;
+
+  if (editor->drawable)
+    name = gimp_object_get_name (editor->drawable);
+
+  gimp_editor_set_name (GIMP_EDITOR (editor), name);
+}
+
+static void
+gimp_histogram_editor_info_update (GimpHistogramEditor *editor)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
+  GimpHistogram     *hist = editor->histogram;
+
+  if (hist)
+    {
+      gint    n_bins;
+      gdouble pixels;
+      gdouble count;
+      gchar   text[12];
+
+      n_bins = gimp_histogram_n_bins (hist);
+
+      pixels = gimp_histogram_get_count (hist, view->channel, 0, n_bins - 1);
+      count  = gimp_histogram_get_count (hist, view->channel,
+                                         view->start, view->end);
+
+      g_snprintf (text, sizeof (text), "%.3f",
+                  gimp_histogram_get_mean (hist, view->channel,
+                                           view->start, view->end));
+      gtk_label_set_text (GTK_LABEL (editor->labels[0]), text);
+
+      g_snprintf (text, sizeof (text), "%.3f",
+                  gimp_histogram_get_std_dev (hist, view->channel,
+                                              view->start, view->end));
+      gtk_label_set_text (GTK_LABEL (editor->labels[1]), text);
+
+      g_snprintf (text, sizeof (text), "%.3f",
+                  gimp_histogram_get_median  (hist, view->channel,
+                                              view->start,
+                                              view->end));
+      gtk_label_set_text (GTK_LABEL (editor->labels[2]), text);
+
+      g_snprintf (text, sizeof (text), "%d", (gint) pixels);
+      gtk_label_set_text (GTK_LABEL (editor->labels[3]), text);
+
+      g_snprintf (text, sizeof (text), "%d", (gint) count);
+      gtk_label_set_text (GTK_LABEL (editor->labels[4]), text);
+
+      g_snprintf (text, sizeof (text), "%.1f", (pixels > 0 ?
+                                                 (100.0 * count / pixels) :
+                                                 0.0));
+      gtk_label_set_text (GTK_LABEL (editor->labels[5]), text);
+    }
+  else
+    {
+      gint i;
+
+      for (i = 0; i < 6; i++)
+        gtk_label_set_text (GTK_LABEL (editor->labels[i]), NULL);
+    }
+}
+
+static gboolean
+gimp_histogram_editor_view_expose (GimpHistogramEditor *editor)
+{
+  gimp_histogram_editor_validate (editor);
+
+  return FALSE;
+}
diff --git a/app/widgets/gimphistogrameditor.h b/app/widgets/gimphistogrameditor.h
new file mode 100644
index 0000000..55c094d
--- /dev/null
+++ b/app/widgets/gimphistogrameditor.h
@@ -0,0 +1,68 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HISTOGRAM_EDITOR_H__
+#define __GIMP_HISTOGRAM_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_HISTOGRAM_EDITOR            (gimp_histogram_editor_get_type ())
+#define GIMP_HISTOGRAM_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM_EDITOR, GimpHistogramEditor))
+#define GIMP_HISTOGRAM_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM_EDITOR, GimpHistogramEditorClass))
+#define GIMP_IS_HISTOGRAM_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HISTOGRAM_EDITOR))
+#define GIMP_IS_HISTOGRAM_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HISTOGRAM_EDITOR))
+#define GIMP_HISTOGRAM_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HISTOGRAM_EDITOR, GimpHistogramEditorClass))
+
+
+typedef struct _GimpHistogramEditorClass GimpHistogramEditorClass;
+
+struct _GimpHistogramEditor
+{
+  GimpImageEditor       parent_instance;
+
+  gboolean              linear;
+
+  GimpDrawable         *drawable;
+  GimpHistogram        *histogram;
+  GimpHistogram        *bg_histogram;
+
+  guint                 idle_id;
+  gboolean              recompute;
+
+  GimpAsync            *calculate_async;
+  gboolean              bg_pending;
+  gboolean              update_pending;
+
+  GtkWidget            *menu;
+  GtkWidget            *box;
+  GtkWidget            *labels[6];
+};
+
+struct _GimpHistogramEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_histogram_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_histogram_editor_new      (void);
+
+
+#endif /* __GIMP_HISTOGRAM_EDITOR_H__ */
diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c
new file mode 100644
index 0000000..8eb31c2
--- /dev/null
+++ b/app/widgets/gimphistogramview.c
@@ -0,0 +1,826 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "core/gimphistogram.h"
+#include "core/gimpmarshal.h"
+
+#include "gimphistogramview.h"
+
+
+#define MIN_WIDTH  64
+#define MIN_HEIGHT 64
+
+enum
+{
+  RANGE_CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_CHANNEL,
+  PROP_SCALE,
+  PROP_BORDER_WIDTH,
+  PROP_SUBDIVISIONS
+};
+
+
+static void     gimp_histogram_view_dispose        (GObject        *object);
+static void     gimp_histogram_view_set_property   (GObject        *object,
+                                                    guint           property_id,
+                                                    const GValue   *value,
+                                                    GParamSpec     *pspec);
+static void     gimp_histogram_view_get_property   (GObject        *object,
+                                                    guint           property_id,
+                                                    GValue         *value,
+                                                    GParamSpec     *pspec);
+
+static void     gimp_histogram_view_size_request   (GtkWidget      *widget,
+                                                    GtkRequisition *requisition);
+static gboolean gimp_histogram_view_expose         (GtkWidget      *widget,
+                                                    GdkEventExpose *event);
+static gboolean gimp_histogram_view_button_press   (GtkWidget      *widget,
+                                                    GdkEventButton *bevent);
+static gboolean gimp_histogram_view_button_release (GtkWidget      *widget,
+                                                    GdkEventButton *bevent);
+static gboolean gimp_histogram_view_motion_notify  (GtkWidget      *widget,
+                                                    GdkEventMotion *bevent);
+
+static void     gimp_histogram_view_notify      (GimpHistogram        *histogram,
+                                                 const GParamSpec     *pspec,
+                                                 GimpHistogramView    *view);
+static void     gimp_histogram_view_update_bins (GimpHistogramView    *view);
+
+static void     gimp_histogram_view_draw_spike  (GimpHistogramView    *view,
+                                                 GimpHistogramChannel  channel,
+                                                 cairo_t              *cr,
+                                                 const GdkColor       *fg_color,
+                                                 cairo_operator_t      fg_operator,
+                                                 const GdkColor       *bg_color,
+                                                 gint                  x,
+                                                 gint                  i,
+                                                 gint                  j,
+                                                 gdouble               max,
+                                                 gdouble               bg_max,
+                                                 gint                  height,
+                                                 gint                  border);
+
+
+G_DEFINE_TYPE (GimpHistogramView, gimp_histogram_view,
+               GTK_TYPE_DRAWING_AREA)
+
+#define parent_class gimp_histogram_view_parent_class
+
+static guint histogram_view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_histogram_view_class_init (GimpHistogramViewClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  histogram_view_signals[RANGE_CHANGED] =
+    g_signal_new ("range-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpHistogramViewClass, range_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT_INT,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_INT,
+                  G_TYPE_INT);
+
+  object_class->dispose              = gimp_histogram_view_dispose;
+  object_class->get_property         = gimp_histogram_view_get_property;
+  object_class->set_property         = gimp_histogram_view_set_property;
+
+  widget_class->size_request         = gimp_histogram_view_size_request;
+  widget_class->expose_event         = gimp_histogram_view_expose;
+  widget_class->button_press_event   = gimp_histogram_view_button_press;
+  widget_class->button_release_event = gimp_histogram_view_button_release;
+  widget_class->motion_notify_event  = gimp_histogram_view_motion_notify;
+
+  klass->range_changed               = NULL;
+
+  g_object_class_install_property (object_class, PROP_CHANNEL,
+                                   g_param_spec_enum ("histogram-channel",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_HISTOGRAM_CHANNEL,
+                                                      GIMP_HISTOGRAM_VALUE,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SCALE,
+                                   g_param_spec_enum ("histogram-scale",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_HISTOGRAM_SCALE,
+                                                      GIMP_HISTOGRAM_SCALE_LINEAR,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BORDER_WIDTH,
+                                   g_param_spec_int ("border-width", NULL, NULL,
+                                                     0, 32, 1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_SUBDIVISIONS,
+                                   g_param_spec_int ("subdivisions",
+                                                     NULL, NULL,
+                                                     1, 64, 5,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_histogram_view_init (GimpHistogramView *view)
+{
+  view->histogram    = NULL;
+  view->bg_histogram = NULL;
+  view->n_bins       = 256;
+  view->start        = 0;
+  view->end          = 255;
+}
+
+static void
+gimp_histogram_view_dispose (GObject *object)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (object);
+
+  gimp_histogram_view_set_histogram (view, NULL);
+  gimp_histogram_view_set_background (view, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_histogram_view_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_CHANNEL:
+      view->channel = g_value_get_enum (value);
+      gtk_widget_queue_draw (GTK_WIDGET (view));
+      break;
+    case PROP_SCALE:
+      view->scale = g_value_get_enum (value);
+      gtk_widget_queue_draw (GTK_WIDGET (view));
+      break;
+    case PROP_BORDER_WIDTH:
+      view->border_width = g_value_get_int (value);
+      gtk_widget_queue_resize (GTK_WIDGET (view));
+      break;
+    case PROP_SUBDIVISIONS:
+      view->subdivisions = g_value_get_int (value);
+      gtk_widget_queue_draw (GTK_WIDGET (view));
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_histogram_view_get_property (GObject      *object,
+                                  guint         property_id,
+                                  GValue       *value,
+                                  GParamSpec   *pspec)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_CHANNEL:
+      g_value_set_enum (value, view->channel);
+      break;
+    case PROP_SCALE:
+      g_value_set_enum (value, view->scale);
+      break;
+    case PROP_BORDER_WIDTH:
+      g_value_set_int (value, view->border_width);
+      break;
+    case PROP_SUBDIVISIONS:
+      g_value_set_int (value, view->subdivisions);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_histogram_view_size_request (GtkWidget      *widget,
+                                  GtkRequisition *requisition)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (widget);
+
+  requisition->width  = MIN_WIDTH  + 2 * view->border_width;
+  requisition->height = MIN_HEIGHT + 2 * view->border_width;
+}
+
+static gdouble
+gimp_histogram_view_get_maximum (GimpHistogramView    *view,
+                                 GimpHistogram        *histogram,
+                                 GimpHistogramChannel  channel)
+{
+  gdouble max = gimp_histogram_get_maximum (histogram, channel);
+
+  switch (view->scale)
+    {
+    case GIMP_HISTOGRAM_SCALE_LINEAR:
+      break;
+
+    case GIMP_HISTOGRAM_SCALE_LOGARITHMIC:
+      if (max > 0.0)
+        max = log (max);
+      else
+        max = 1.0;
+      break;
+    }
+
+  return max;
+}
+
+static gboolean
+gimp_histogram_view_expose (GtkWidget      *widget,
+                            GdkEventExpose *event)
+{
+  GimpHistogramView *view  = GIMP_HISTOGRAM_VIEW (widget);
+  GtkStyle          *style = gtk_widget_get_style (widget);
+  GtkAllocation      allocation;
+  cairo_t           *cr;
+  gint               x;
+  gint               x1, x2;
+  gint               border;
+  gint               width, height;
+  gdouble            max    = 0.0;
+  gdouble            bg_max = 0.0;
+  gint               xstop;
+  GdkColor          *color_in;
+  GdkColor          *color_out;
+  GdkColor          *bg_color_in;
+  GdkColor          *bg_color_out;
+  GdkColor           rgb_color[3];
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  /*  Draw the background  */
+  gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
+  cairo_paint (cr);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  border = view->border_width;
+  width  = allocation.width  - 2 * border;
+  height = allocation.height - 2 * border;
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+  cairo_translate (cr, 0.5, 0.5);
+
+  /*  Draw the outer border  */
+  gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]);
+  cairo_rectangle (cr, border, border,
+                   width - 1, height - 1);
+  cairo_stroke (cr);
+
+  if (! view->histogram && ! view->bg_histogram)
+    {
+      cairo_destroy (cr);
+      return FALSE;
+    }
+
+  x1 = CLAMP (MIN (view->start, view->end), 0, view->n_bins - 1);
+  x2 = CLAMP (MAX (view->start, view->end), 0, view->n_bins - 1);
+
+  if (view->histogram)
+    max = gimp_histogram_view_get_maximum (view, view->histogram,
+                                           view->channel);
+
+  if (view->bg_histogram)
+    bg_max = gimp_histogram_view_get_maximum (view, view->bg_histogram,
+                                              view->channel);
+
+  color_in  = &style->text[GTK_STATE_SELECTED];
+  color_out = &style->text[GTK_STATE_NORMAL];
+
+  bg_color_in  = &style->mid[GTK_STATE_SELECTED];
+  bg_color_out = &style->mid[GTK_STATE_NORMAL];
+
+  if (view->channel == GIMP_HISTOGRAM_RGB)
+    {
+      for (x = 0; x < 3; x++)
+        {
+          rgb_color[x].red   = (x == 0 ? 0xFFFF : 0x0);
+          rgb_color[x].green = (x == 1 ? 0xFFFF : 0x0);
+          rgb_color[x].blue  = (x == 2 ? 0xFFFF : 0x0);
+        }
+    }
+
+  xstop = 1;
+  for (x = 0; x < width; x++)
+    {
+      gboolean  in_selection = FALSE;
+
+      gint  i = (x * view->n_bins) / width;
+      gint  j = ((x + 1) * view->n_bins) / width;
+
+      if (! (x1 == 0 && x2 == (view->n_bins - 1)))
+        {
+          gint k = i;
+
+          do
+            in_selection |= (x1 <= k && k <= x2);
+          while (++k < j);
+        }
+
+      if (view->subdivisions > 1 && x >= (xstop * width / view->subdivisions))
+        {
+          gdk_cairo_set_source_color (cr, &style->text_aa[GTK_STATE_NORMAL]);
+
+          cairo_move_to (cr, x + border, border);
+          cairo_line_to (cr, x + border, border + height - 1);
+          cairo_stroke (cr);
+
+          xstop++;
+        }
+      else if (in_selection)
+        {
+          gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_SELECTED]);
+
+          cairo_move_to (cr, x + border, border);
+          cairo_line_to (cr, x + border, border + height - 1);
+          cairo_stroke (cr);
+        }
+
+      if (view->channel == GIMP_HISTOGRAM_RGB)
+        {
+          gint c;
+
+          for (c = 0; c < 3; c++)
+            gimp_histogram_view_draw_spike (view, GIMP_HISTOGRAM_RED + c, cr,
+                                            &style->black,
+                                            CAIRO_OPERATOR_OVER,
+                                            NULL,
+                                            x, i, j, max, bg_max, height, border);
+
+          for (c = 0; c < 3; c++)
+            gimp_histogram_view_draw_spike (view, GIMP_HISTOGRAM_RED + c, cr,
+                                            &rgb_color[c],
+                                            CAIRO_OPERATOR_ADD,
+                                            NULL,
+                                            x, i, j, max, bg_max, height, border);
+
+          gimp_histogram_view_draw_spike (view, view->channel, cr,
+                                          in_selection ? color_in : color_out,
+                                          CAIRO_OPERATOR_OVER,
+                                          NULL,
+                                          x, i, j, max, bg_max, height, border);
+        }
+      else
+        {
+          gimp_histogram_view_draw_spike (view, view->channel, cr,
+                                          in_selection ? color_in : color_out,
+                                          CAIRO_OPERATOR_OVER,
+                                          in_selection ? bg_color_in : bg_color_out,
+                                          x, i, j, max, bg_max, height, border);
+        }
+    }
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static void
+gimp_histogram_view_draw_spike (GimpHistogramView    *view,
+                                GimpHistogramChannel  channel,
+                                cairo_t              *cr,
+                                const GdkColor       *fg_color,
+                                cairo_operator_t      fg_operator,
+                                const GdkColor       *bg_color,
+                                gint                  x,
+                                gint                  i,
+                                gint                  j,
+                                gdouble               max,
+                                gdouble               bg_max,
+                                gint                  height,
+                                gint                  border)
+{
+  gdouble value    = 0.0;
+  gdouble bg_value = 0.0;
+  gint    y;
+  gint    bg_y;
+
+  if (view->histogram)
+    {
+      gint ii = i;
+
+      do
+        {
+          gdouble v = gimp_histogram_get_value (view->histogram,
+                                                channel, ii++);
+
+          if (v > value)
+            value = v;
+        }
+      while (ii < j);
+    }
+
+  if (bg_color && view->bg_histogram)
+    {
+      gint ii = i;
+
+      do
+        {
+          gdouble v = gimp_histogram_get_value (view->bg_histogram,
+                                                channel, ii++);
+
+          if (v > bg_value)
+            bg_value = v;
+        }
+      while (ii < j);
+    }
+
+  if (value <= 0.0 && bg_value <= 0.0)
+    return;
+
+  switch (view->scale)
+    {
+    case GIMP_HISTOGRAM_SCALE_LINEAR:
+      y    = (gint) (((height - 2) * value)    / max);
+      bg_y = (gint) (((height - 2) * bg_value) / bg_max);
+      break;
+
+    case GIMP_HISTOGRAM_SCALE_LOGARITHMIC:
+      y    = (gint) (((height - 2) * log (value))    / max);
+      bg_y = (gint) (((height - 2) * log (bg_value)) / bg_max);
+      break;
+
+    default:
+      y    = 0;
+      bg_y = 0;
+      break;
+    }
+
+  y    = MAX (y,    0);
+  bg_y = MAX (bg_y, 0);
+
+  if (bg_color)
+    {
+      gdk_cairo_set_source_color (cr, bg_color);
+
+      cairo_move_to (cr, x + border, height + border - 1);
+      cairo_line_to (cr, x + border, height + border - bg_y - 1);
+
+      cairo_stroke (cr);
+    }
+
+  cairo_set_operator (cr, fg_operator);
+
+  gdk_cairo_set_source_color (cr, fg_color);
+
+  cairo_move_to (cr, x + border, height + border - 1);
+  cairo_line_to (cr, x + border, height + border - y - 1);
+
+  cairo_stroke (cr);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+}
+
+static gboolean
+gimp_histogram_view_button_press (GtkWidget      *widget,
+                                  GdkEventButton *bevent)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (widget);
+
+  if (bevent->type == GDK_BUTTON_PRESS && bevent->button == 1)
+    {
+      GtkAllocation allocation;
+      gint          width;
+
+      gtk_grab_add (widget);
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      width = allocation.width - 2 * view->border_width;
+
+      view->start = CLAMP (((bevent->x - view->border_width) * view->n_bins) / width,
+                           0, view->n_bins - 1);
+      view->end   = view->start;
+
+      gtk_widget_queue_draw (widget);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_histogram_view_button_release (GtkWidget      *widget,
+                                    GdkEventButton *bevent)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (widget);
+
+  if (bevent->button == 1)
+    {
+      gint start, end;
+
+      gtk_grab_remove (widget);
+
+      start = view->start;
+      end   = view->end;
+
+      view->start = MIN (start, end);
+      view->end   = MAX (start, end);
+
+      g_signal_emit (view, histogram_view_signals[RANGE_CHANGED], 0,
+                     view->start, view->end);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_histogram_view_motion_notify (GtkWidget      *widget,
+                                   GdkEventMotion *mevent)
+{
+  GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (widget);
+  GtkAllocation      allocation;
+  gint               width;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  width = allocation.width - 2 * view->border_width;
+
+  view->start = CLAMP (((mevent->x - view->border_width) * view->n_bins) / width,
+                       0, view->n_bins - 1);
+
+  gtk_widget_queue_draw (widget);
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_histogram_view_new (gboolean range)
+{
+  GtkWidget *view = g_object_new (GIMP_TYPE_HISTOGRAM_VIEW, NULL);
+
+  if (range)
+    gtk_widget_add_events (view,
+                           GDK_BUTTON_PRESS_MASK   |
+                           GDK_BUTTON_RELEASE_MASK |
+                           GDK_BUTTON1_MOTION_MASK);
+
+  return view;
+}
+
+void
+gimp_histogram_view_set_histogram (GimpHistogramView *view,
+                                   GimpHistogram     *histogram)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
+#if 0
+  g_return_if_fail (histogram == NULL ||
+                    view->bg_histogram == NULL ||
+                    gimp_histogram_n_components (view->bg_histogram) ==
+                    gimp_histogram_n_components (histogram));
+#endif
+
+  if (view->histogram != histogram)
+    {
+      if (view->histogram)
+        {
+          g_signal_handlers_disconnect_by_func (view->histogram,
+                                                gimp_histogram_view_notify,
+                                                view);
+          g_object_unref (view->histogram);
+        }
+
+      view->histogram = histogram;
+
+      if (histogram)
+        {
+          g_object_ref (histogram);
+
+          g_signal_connect (histogram, "notify",
+                            G_CALLBACK (gimp_histogram_view_notify),
+                            view);
+
+          if (! gimp_histogram_has_channel (histogram, view->channel))
+            gimp_histogram_view_set_channel (view, GIMP_HISTOGRAM_VALUE);
+        }
+
+      gimp_histogram_view_update_bins (view);
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+GimpHistogram *
+gimp_histogram_view_get_histogram (GimpHistogramView *view)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM_VIEW (view), NULL);
+
+  return view->histogram;
+}
+
+void
+gimp_histogram_view_set_background (GimpHistogramView *view,
+                                    GimpHistogram     *histogram)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
+#if 0
+  g_return_if_fail (histogram == NULL ||
+                    view->histogram == NULL ||
+                    gimp_histogram_n_components (view->histogram) ==
+                    gimp_histogram_n_components (histogram));
+#endif
+
+  if (view->bg_histogram != histogram)
+    {
+      if (view->bg_histogram)
+        {
+          g_signal_handlers_disconnect_by_func (view->bg_histogram,
+                                                gimp_histogram_view_notify,
+                                                view);
+          g_object_unref (view->bg_histogram);
+        }
+
+      view->bg_histogram = histogram;
+
+      if (histogram)
+        {
+          g_object_ref (histogram);
+
+          g_signal_connect (histogram, "notify",
+                            G_CALLBACK (gimp_histogram_view_notify),
+                            view);
+
+          if (! gimp_histogram_has_channel (histogram, view->channel))
+            gimp_histogram_view_set_channel (view, GIMP_HISTOGRAM_VALUE);
+        }
+
+      gimp_histogram_view_update_bins (view);
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+GimpHistogram *
+gimp_histogram_view_get_background (GimpHistogramView *view)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM_VIEW (view), NULL);
+
+  return view->bg_histogram;
+}
+
+void
+gimp_histogram_view_set_channel (GimpHistogramView    *view,
+                                 GimpHistogramChannel  channel)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
+
+  if (channel != view->channel)
+    g_object_set (view, "histogram-channel", channel, NULL);
+}
+
+GimpHistogramChannel
+gimp_histogram_view_get_channel (GimpHistogramView *view)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM_VIEW (view), 0);
+
+  return view->channel;
+}
+
+void
+gimp_histogram_view_set_scale (GimpHistogramView  *view,
+                               GimpHistogramScale  scale)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
+
+  if (scale != view->scale)
+    g_object_set (view, "histogram-scale", scale, NULL);
+}
+
+GimpHistogramScale
+gimp_histogram_view_get_scale (GimpHistogramView *view)
+{
+  g_return_val_if_fail (GIMP_IS_HISTOGRAM_VIEW (view), 0);
+
+  return view->scale;
+}
+
+void
+gimp_histogram_view_set_range (GimpHistogramView *view,
+                               gint               start,
+                               gint               end)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
+
+  if (view->start != MIN (start, end) ||
+      view->end   != MAX (start, end))
+    {
+      view->start = MIN (start, end);
+      view->end   = MAX (start, end);
+
+      gtk_widget_queue_draw (GTK_WIDGET (view));
+
+      g_signal_emit (view, histogram_view_signals[RANGE_CHANGED], 0,
+                     view->start, view->end);
+    }
+}
+
+void
+gimp_histogram_view_get_range (GimpHistogramView *view,
+                               gint              *start,
+                               gint              *end)
+{
+  g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
+
+  if (start) *start = view->start;
+  if (end)   *end   = view->end;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_histogram_view_notify (GimpHistogram     *histogram,
+                            const GParamSpec  *pspec,
+                            GimpHistogramView *view)
+{
+  if (! strcmp (pspec->name, "n-bins"))
+    {
+      gimp_histogram_view_update_bins (view);
+    }
+  else
+    {
+      gtk_widget_queue_draw (GTK_WIDGET (view));
+    }
+}
+
+static void
+gimp_histogram_view_update_bins (GimpHistogramView *view)
+{
+  gint new_bins = 0;
+
+  if (view->histogram)
+    new_bins = gimp_histogram_n_bins (view->histogram);
+  else if (view->bg_histogram)
+    new_bins = gimp_histogram_n_bins (view->bg_histogram);
+
+  if (new_bins > 0 && new_bins != view->n_bins)
+    {
+      view->start = MIN (ROUND ((gdouble) view->start *
+                                new_bins / view->n_bins),
+                         new_bins - 1);
+      view->end   = MAX (ROUND ((gdouble) (view->end + 1) *
+                                new_bins / view->n_bins) - 1,
+                         0);
+
+      view->n_bins = new_bins;
+
+      g_signal_emit (view, histogram_view_signals[RANGE_CHANGED], 0,
+                     view->start, view->end);
+    }
+}
diff --git a/app/widgets/gimphistogramview.h b/app/widgets/gimphistogramview.h
new file mode 100644
index 0000000..6be89df
--- /dev/null
+++ b/app/widgets/gimphistogramview.h
@@ -0,0 +1,88 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_HISTOGRAM_VIEW_H__
+#define __GIMP_HISTOGRAM_VIEW_H__
+
+
+#define GIMP_TYPE_HISTOGRAM_VIEW            (gimp_histogram_view_get_type ())
+#define GIMP_HISTOGRAM_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramView))
+#define GIMP_HISTOGRAM_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramViewClass))
+#define GIMP_IS_HISTOGRAM_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HISTOGRAM_VIEW))
+#define GIMP_IS_HISTOGRAM_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HISTOGRAM_VIEW))
+#define GIMP_HISTOGRAM_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramViewClass))
+
+
+typedef struct _GimpHistogramViewClass  GimpHistogramViewClass;
+
+struct _GimpHistogramView
+{
+  GtkDrawingArea         parent_instance;
+
+  GimpHistogram         *histogram;
+  GimpHistogram         *bg_histogram;
+  GimpHistogramChannel   channel;
+  GimpHistogramScale     scale;
+  gint                   n_bins;
+  gint                   start;
+  gint                   end;
+
+  gint                   border_width;
+  gint                   subdivisions;
+};
+
+struct _GimpHistogramViewClass
+{
+  GtkDrawingAreaClass  parent_class;
+
+  void (* range_changed) (GimpHistogramView *view,
+                          gint               start,
+                          gint               end);
+};
+
+
+GType           gimp_histogram_view_get_type       (void) G_GNUC_CONST;
+
+GtkWidget     * gimp_histogram_view_new            (gboolean             range);
+
+void            gimp_histogram_view_set_histogram  (GimpHistogramView   *view,
+                                                    GimpHistogram       *histogram);
+GimpHistogram * gimp_histogram_view_get_histogram  (GimpHistogramView   *view);
+
+void            gimp_histogram_view_set_background (GimpHistogramView   *view,
+                                                    GimpHistogram       *histogram);
+GimpHistogram * gimp_histogram_view_get_background (GimpHistogramView   *view);
+
+void            gimp_histogram_view_set_channel    (GimpHistogramView   *view,
+                                                    GimpHistogramChannel channel);
+GimpHistogramChannel
+                gimp_histogram_view_get_channel    (GimpHistogramView   *view);
+
+void            gimp_histogram_view_set_scale      (GimpHistogramView   *view,
+                                                    GimpHistogramScale   scale);
+GimpHistogramScale
+                gimp_histogram_view_get_scale      (GimpHistogramView   *view);
+
+void            gimp_histogram_view_set_range      (GimpHistogramView   *view,
+                                                    gint                 start,
+                                                    gint                 end);
+void            gimp_histogram_view_get_range      (GimpHistogramView   *view,
+                                                    gint                *start,
+                                                    gint                *end);
+
+
+#endif /* __GIMP_HISTOGRAM_VIEW_H__ */
diff --git a/app/widgets/gimpiconpicker.c b/app/widgets/gimpiconpicker.c
new file mode 100644
index 0000000..ac0099e
--- /dev/null
+++ b/app/widgets/gimpiconpicker.c
@@ -0,0 +1,616 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpiconpicker.c
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *               2012 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimplist.h"
+#include "core/gimpcontext.h"
+#include "core/gimptemplate.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainerpopup.h"
+#include "gimpiconpicker.h"
+#include "gimpview.h"
+#include "gimpviewablebutton.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_ICON_NAME,
+  PROP_ICON_PIXBUF
+};
+
+
+typedef struct _GimpIconPickerPrivate GimpIconPickerPrivate;
+
+struct _GimpIconPickerPrivate
+{
+  Gimp          *gimp;
+
+  gchar         *icon_name;
+  GdkPixbuf     *icon_pixbuf;
+
+  GimpViewable  *preview;
+
+  GimpContainer *icon_name_container;
+  GimpContext   *icon_name_context;
+  GimpObject    *null_template_object;
+
+  GtkWidget     *right_click_menu;
+  GtkWidget     *menu_item_file_icon;
+  GtkWidget     *menu_item_name_icon;
+  GtkWidget     *menu_item_copy;
+  GtkWidget     *menu_item_paste;
+};
+
+#define GET_PRIVATE(picker) \
+        ((GimpIconPickerPrivate *) gimp_icon_picker_get_instance_private ((GimpIconPicker *) (picker)))
+
+
+static void    gimp_icon_picker_constructed     (GObject        *object);
+static void    gimp_icon_picker_finalize        (GObject        *object);
+static void    gimp_icon_picker_set_property    (GObject        *object,
+                                                 guint           property_id,
+                                                 const GValue   *value,
+                                                 GParamSpec     *pspec);
+static void    gimp_icon_picker_get_property    (GObject        *object,
+                                                 guint           property_id,
+                                                 GValue         *value,
+                                                 GParamSpec     *pspec);
+
+static void    gimp_icon_picker_icon_changed    (GimpContext    *context,
+                                                 GimpTemplate   *template,
+                                                 GimpIconPicker *picker);
+static void    gimp_icon_picker_clicked         (GtkWidget      *widget,
+                                                 GdkEventButton *event,
+                                                 gpointer        data);
+
+static void    gimp_icon_picker_menu_from_file  (GtkWidget      *widget,
+                                                 GdkEventButton *event,
+                                                 gpointer        data);
+static void    gimp_icon_picker_menu_from_name  (GtkWidget      *widget,
+                                                 GdkEventButton *event,
+                                                 gpointer        data);
+static void    gimp_icon_picker_menu_paste      (GtkWidget      *widget,
+                                                 GdkEventButton *event,
+                                                 gpointer        data);
+static void    gimp_icon_picker_menu_copy       (GtkWidget      *widget,
+                                                 GdkEventButton *event,
+                                                 gpointer        data);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpIconPicker, gimp_icon_picker, GTK_TYPE_BOX)
+
+#define parent_class gimp_icon_picker_parent_class
+
+
+static void
+gimp_icon_picker_class_init (GimpIconPickerClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_icon_picker_constructed;
+  object_class->finalize     = gimp_icon_picker_finalize;
+  object_class->set_property = gimp_icon_picker_set_property;
+  object_class->get_property = gimp_icon_picker_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name", NULL, NULL,
+                                                        "gimp-toilet-paper",
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ICON_PIXBUF,
+                                   g_param_spec_object ("icon-pixbuf", NULL, NULL,
+                                                        GDK_TYPE_PIXBUF,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_icon_picker_init (GimpIconPicker *picker)
+{
+  GimpIconPickerPrivate *private = GET_PRIVATE (picker);
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (picker),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
+  private->preview = g_object_new (GIMP_TYPE_VIEWABLE,
+                                   "icon-name",   private->icon_name,
+                                   "icon-pixbuf", private->icon_pixbuf,
+                                   NULL);
+}
+
+static void
+gimp_icon_picker_constructed (GObject *object)
+{
+  GimpIconPicker         *picker  = GIMP_ICON_PICKER (object);
+  GimpIconPickerPrivate  *private = GET_PRIVATE (object);
+  GtkWidget              *button;
+  GtkWidget              *viewable_view;
+  GList                  *icon_list;
+  GList                  *list;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (private->gimp));
+
+  /* Set up the icon picker */
+  private->icon_name_container = gimp_list_new (GIMP_TYPE_TEMPLATE, FALSE);
+  private->icon_name_context = gimp_context_new (private->gimp, "foo", NULL);
+
+  g_signal_connect (private->icon_name_context, "template-changed",
+                    G_CALLBACK (gimp_icon_picker_icon_changed),
+                    picker);
+
+  icon_list = gtk_icon_theme_list_icons (gtk_icon_theme_get_default (), NULL);
+
+  icon_list = g_list_sort (icon_list, (GCompareFunc) g_strcmp0);
+  icon_list = g_list_reverse (icon_list);
+
+  for (list = icon_list; list; list = g_list_next (list))
+    {
+      GimpObject *object = g_object_new (GIMP_TYPE_TEMPLATE,
+                                         "name",      list->data,
+                                         "icon-name", list->data,
+                                         NULL);
+
+      gimp_container_add (private->icon_name_container, object);
+      g_object_unref (object);
+
+      if (private->icon_name && strcmp (list->data, private->icon_name) == 0)
+        gimp_context_set_template (private->icon_name_context,
+                                   GIMP_TEMPLATE (object));
+    }
+
+  /* An extra template object, use to make all icons clickable when a
+   * pixbuf icon is set.
+   */
+  private->null_template_object = g_object_new (GIMP_TYPE_TEMPLATE,
+                                                "name",      "",
+                                                "icon-name", "",
+                                                NULL);
+
+  if (private->icon_pixbuf)
+    {
+      gimp_context_set_template (private->icon_name_context,
+                                 GIMP_TEMPLATE (private->null_template_object));
+    }
+
+  g_list_free_full (icon_list, (GDestroyNotify) g_free);
+
+
+  /* Set up preview button */
+  button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (picker), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "button-press-event",
+                    G_CALLBACK (gimp_icon_picker_clicked),
+                    object);
+
+
+  viewable_view = gimp_view_new (private->icon_name_context,
+                                 private->preview,
+                                 GIMP_VIEW_SIZE_SMALL,
+                                 0,
+                                 FALSE);
+  gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (viewable_view));
+  gtk_widget_show (viewable_view);
+
+  /* Set up button menu */
+  private->right_click_menu = gtk_menu_new ();
+  gtk_menu_attach_to_widget (GTK_MENU (private->right_click_menu), button, NULL);
+
+  private->menu_item_file_icon =
+    gtk_menu_item_new_with_label (_("From File..."));
+  gtk_menu_shell_append (GTK_MENU_SHELL (private->right_click_menu),
+                         GTK_WIDGET (private->menu_item_file_icon));
+
+  g_signal_connect (private->menu_item_file_icon, "button-press-event",
+                    G_CALLBACK (gimp_icon_picker_menu_from_file),
+                    object);
+
+  private->menu_item_name_icon =
+    gtk_menu_item_new_with_label (_("From Named Icons..."));
+  gtk_menu_shell_append (GTK_MENU_SHELL (private->right_click_menu),
+                         GTK_WIDGET (private->menu_item_name_icon));
+
+  g_signal_connect (private->menu_item_name_icon, "button-press-event",
+                    G_CALLBACK (gimp_icon_picker_menu_from_name),
+                    object);
+
+  private->menu_item_copy =
+    gtk_menu_item_new_with_label (_("Copy Icon to Clipboard"));
+  gtk_menu_shell_append (GTK_MENU_SHELL (private->right_click_menu),
+                         GTK_WIDGET (private->menu_item_copy));
+
+  g_signal_connect (private->menu_item_copy, "button-press-event",
+                    G_CALLBACK (gimp_icon_picker_menu_copy),
+                    object);
+
+  private->menu_item_paste =
+    gtk_menu_item_new_with_label (_("Paste Icon from Clipboard"));
+  gtk_menu_shell_append (GTK_MENU_SHELL (private->right_click_menu),
+                         GTK_WIDGET (private->menu_item_paste));
+
+  g_signal_connect (private->menu_item_paste, "button-press-event",
+                    G_CALLBACK (gimp_icon_picker_menu_paste),
+                    object);
+
+  gtk_widget_show_all (GTK_WIDGET (private->right_click_menu));
+}
+
+static void
+gimp_icon_picker_finalize (GObject *object)
+{
+  GimpIconPickerPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->icon_name, g_free);
+
+  g_clear_object (&private->icon_name_container);
+  g_clear_object (&private->icon_name_context);
+  g_clear_object (&private->icon_pixbuf);
+  g_clear_object (&private->preview);
+  g_clear_object (&private->null_template_object);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_icon_picker_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpIconPickerPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    case PROP_ICON_NAME:
+      gimp_icon_picker_set_icon_name (GIMP_ICON_PICKER (object),
+                                      g_value_get_string (value));
+      break;
+
+    case PROP_ICON_PIXBUF:
+      gimp_icon_picker_set_icon_pixbuf (GIMP_ICON_PICKER (object),
+                                        g_value_get_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_icon_picker_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpIconPickerPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    case PROP_ICON_NAME:
+      g_value_set_string (value, private->icon_name);
+      break;
+
+    case PROP_ICON_PIXBUF:
+      g_value_set_object (value, private->icon_pixbuf);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_icon_picker_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_ICON_PICKER,
+                       "gimp", gimp,
+                       NULL);
+}
+
+const gchar *
+gimp_icon_picker_get_icon_name (GimpIconPicker *picker)
+{
+  g_return_val_if_fail (GIMP_IS_ICON_PICKER (picker), NULL);
+
+  return GET_PRIVATE (picker)->icon_name;
+}
+
+void
+gimp_icon_picker_set_icon_name (GimpIconPicker *picker,
+                                const gchar    *icon_name)
+{
+  GimpIconPickerPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ICON_PICKER (picker));
+  g_return_if_fail (icon_name != NULL);
+
+  private = GET_PRIVATE (picker);
+
+  g_free (private->icon_name);
+  private->icon_name = g_strdup (icon_name);
+
+  if (private->icon_name_container)
+    {
+      GimpObject *object;
+
+      object = gimp_container_get_child_by_name (private->icon_name_container,
+                                                 icon_name);
+
+      if (object)
+        gimp_context_set_template (private->icon_name_context,
+                                   GIMP_TEMPLATE (object));
+    }
+
+  g_object_set (private->preview,
+                "icon-name", private->icon_name,
+                NULL);
+
+  g_object_notify (G_OBJECT (picker), "icon-name");
+}
+
+GdkPixbuf  *
+gimp_icon_picker_get_icon_pixbuf (GimpIconPicker *picker)
+{
+  g_return_val_if_fail (GIMP_IS_ICON_PICKER (picker), NULL);
+
+  return GET_PRIVATE (picker)->icon_pixbuf;
+}
+
+void
+gimp_icon_picker_set_icon_pixbuf (GimpIconPicker *picker,
+                                  GdkPixbuf      *value)
+{
+  GimpIconPickerPrivate *private;
+
+  g_return_if_fail (GIMP_IS_ICON_PICKER (picker));
+  g_return_if_fail (value == NULL || GDK_IS_PIXBUF (value));
+
+  private = GET_PRIVATE (picker);
+
+  if (private->icon_pixbuf)
+    g_object_unref (private->icon_pixbuf);
+
+  private->icon_pixbuf = value;
+
+  if (private->icon_pixbuf)
+    {
+      g_object_ref (private->icon_pixbuf);
+
+      gimp_context_set_template (private->icon_name_context,
+                                 GIMP_TEMPLATE (private->null_template_object));
+    }
+  else
+    {
+      GimpObject *object;
+
+      object = gimp_container_get_child_by_name (private->icon_name_container,
+                                                 private->icon_name);
+
+      if (object)
+        gimp_context_set_template (private->icon_name_context,
+                                   GIMP_TEMPLATE (object));
+    }
+
+  g_object_set (private->preview,
+                "icon-pixbuf", private->icon_pixbuf,
+                NULL);
+
+  g_object_notify (G_OBJECT (picker), "icon-pixbuf");
+}
+
+
+/*  private functions  */
+
+static void
+gimp_icon_picker_icon_changed (GimpContext    *context,
+                               GimpTemplate   *template,
+                               GimpIconPicker *picker)
+{
+  GimpIconPickerPrivate *private = GET_PRIVATE (picker);
+
+  if (GIMP_OBJECT (template) != private->null_template_object)
+    {
+      gimp_icon_picker_set_icon_pixbuf (picker, NULL);
+      gimp_icon_picker_set_icon_name (picker, gimp_object_get_name (template));
+    }
+}
+
+static void
+gimp_icon_picker_menu_from_file (GtkWidget      *widget,
+                                 GdkEventButton *event,
+                                 gpointer        object)
+{
+  GimpIconPicker *picker = GIMP_ICON_PICKER (object);
+  GtkWidget      *dialog;
+  GtkFileFilter  *filter;
+
+  dialog = gtk_file_chooser_dialog_new (_("Load Icon Image"),
+                                        NULL,
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Open"),   GTK_RESPONSE_ACCEPT,
+
+                                        NULL);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_add_pixbuf_formats (filter);
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+    {
+      gchar     *filename;
+      GdkPixbuf *icon_pixbuf = NULL;
+
+      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+      icon_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+
+      if (icon_pixbuf)
+        {
+          gimp_icon_picker_set_icon_pixbuf (picker, icon_pixbuf);
+          g_object_unref (icon_pixbuf);
+        }
+
+      g_free (filename);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+gimp_icon_picker_menu_copy (GtkWidget      *widget,
+                            GdkEventButton *event,
+                            gpointer        object)
+{
+  GimpIconPicker        *picker    = GIMP_ICON_PICKER (object);
+  GimpIconPickerPrivate *private   = GET_PRIVATE (picker);
+  GtkClipboard          *clipboard = NULL;
+
+  clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (widget),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (private->icon_pixbuf)
+    {
+      gtk_clipboard_set_image (clipboard, private->icon_pixbuf);
+    }
+}
+
+static void
+gimp_icon_picker_menu_paste (GtkWidget      *widget,
+                             GdkEventButton *event,
+                             gpointer        object)
+{
+  GimpIconPicker *picker           = GIMP_ICON_PICKER (object);
+  GtkClipboard   *clipboard        = NULL;
+  GdkPixbuf      *clipboard_pixbuf = NULL;
+
+  clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (widget),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  clipboard_pixbuf = gtk_clipboard_wait_for_image (clipboard);
+
+  if (clipboard_pixbuf)
+    {
+      gimp_icon_picker_set_icon_pixbuf (picker, clipboard_pixbuf);
+      g_object_unref (clipboard_pixbuf);
+    }
+}
+
+static void
+gimp_icon_picker_menu_position (GtkMenu  *menu,
+                                gint     *x,
+                                gint     *y,
+                                gboolean *push_in,
+                                gpointer  user_data)
+{
+  gimp_button_menu_position (user_data, menu, GTK_POS_RIGHT, x, y);
+}
+
+static void
+gimp_icon_picker_clicked (GtkWidget      *widget,
+                          GdkEventButton *event,
+                          gpointer        object)
+{
+  GimpIconPicker        *picker    = GIMP_ICON_PICKER (object);
+  GimpIconPickerPrivate *private   = GET_PRIVATE (picker);
+  GtkClipboard          *clipboard = NULL;
+
+  clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (widget),
+                                             GDK_SELECTION_CLIPBOARD);
+
+  if (gtk_clipboard_wait_is_image_available (clipboard))
+    gtk_widget_set_sensitive (private->menu_item_paste, TRUE);
+  else
+    gtk_widget_set_sensitive (private->menu_item_paste, FALSE);
+
+  if (private->icon_pixbuf)
+    gtk_widget_set_sensitive (private->menu_item_copy, TRUE);
+  else
+    gtk_widget_set_sensitive (private->menu_item_copy, FALSE);
+
+  gtk_menu_popup (GTK_MENU (private->right_click_menu),
+                  NULL, NULL,
+                  gimp_icon_picker_menu_position, widget,
+                  event->button, event->time);
+}
+
+static void
+gimp_icon_picker_menu_from_name (GtkWidget      *widget,
+                                 GdkEventButton *event,
+                                 gpointer        object)
+{
+  GimpIconPicker        *picker  = GIMP_ICON_PICKER (object);
+  GimpIconPickerPrivate *private = GET_PRIVATE (picker);
+  GtkWidget             *popup;
+
+  /* FIXME: Right clicking on this popup can cause a crash */
+  popup = gimp_container_popup_new (private->icon_name_container,
+                                    private->icon_name_context,
+                                    GIMP_VIEW_TYPE_LIST,
+                                    GIMP_VIEW_SIZE_SMALL,
+                                    GIMP_VIEW_SIZE_SMALL,
+                                    0,
+                                    NULL,
+                                    NULL,
+                                    NULL,
+                                    NULL);
+
+  gimp_container_popup_set_view_type (GIMP_CONTAINER_POPUP (popup),
+                                      GIMP_VIEW_TYPE_GRID);
+
+  gimp_popup_show (GIMP_POPUP (popup), GTK_WIDGET (picker));
+}
diff --git a/app/widgets/gimpiconpicker.h b/app/widgets/gimpiconpicker.h
new file mode 100644
index 0000000..f144204
--- /dev/null
+++ b/app/widgets/gimpiconpicker.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpiconpicker.h
+ * Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
+ *               2012 Daniel Sabo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ICON_PICKER_H__
+#define __GIMP_ICON_PICKER_H__
+
+
+#define GIMP_TYPE_ICON_PICKER            (gimp_icon_picker_get_type ())
+#define GIMP_ICON_PICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ICON_PICKER, GimpIconPicker))
+#define GIMP_ICON_PICKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ICON_PICKER, GimpIconPickerClass))
+#define GIMP_IS_ICON_PICKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ICON_PICKER))
+#define GIMP_IS_ICON_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ICON_PICKER))
+#define GIMP_ICON_PICKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ICON_PICKER, GimpIconPickerClass))
+
+
+typedef struct _GimpIconPickerClass GimpIconPickerClass;
+
+struct _GimpIconPicker
+{
+  GtkBox  parent_instance;
+};
+
+struct _GimpIconPickerClass
+{
+  GtkBoxClass   parent_class;
+};
+
+
+GType          gimp_icon_picker_get_type       (void) G_GNUC_CONST;
+
+GtkWidget   * gimp_icon_picker_new             (Gimp           *gimp);
+
+const gchar * gimp_icon_picker_get_icon_name   (GimpIconPicker *picker);
+void          gimp_icon_picker_set_icon_name   (GimpIconPicker *picker,
+                                                const gchar    *icon_name);
+
+GdkPixbuf   * gimp_icon_picker_get_icon_pixbuf (GimpIconPicker *picker);
+void          gimp_icon_picker_set_icon_pixbuf (GimpIconPicker *picker,
+                                                GdkPixbuf      *value);
+
+
+#endif  /*  __GIMP_ICON_PICKER_H__  */
diff --git a/app/widgets/gimpiconsizescale.c b/app/widgets/gimpiconsizescale.c
new file mode 100644
index 0000000..2358adf
--- /dev/null
+++ b/app/widgets/gimpiconsizescale.c
@@ -0,0 +1,538 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpiconsizescale.c
+ * Copyright (C) 2016 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+
+#include "gimpiconsizescale.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP
+};
+
+typedef struct _GimpIconSizeScalePrivate GimpIconSizeScalePrivate;
+
+struct _GimpIconSizeScalePrivate
+{
+  Gimp      *gimp;
+
+  GtkWidget *scale;
+  GtkWidget *combo;
+};
+
+#define GET_PRIVATE(scale) \
+        ((GimpIconSizeScalePrivate *) gimp_icon_size_scale_get_instance_private ((GimpIconSizeScale *) (scale)))
+
+
+static void   gimp_icon_size_scale_constructed    (GObject           *object);
+static void   gimp_icon_size_scale_finalize       (GObject           *object);
+static void   gimp_icon_size_scale_set_property   (GObject           *object,
+                                                   guint              property_id,
+                                                   const GValue      *value,
+                                                   GParamSpec        *pspec);
+static void   gimp_icon_size_scale_get_property   (GObject           *object,
+                                                   guint              property_id,
+                                                   GValue            *value,
+                                                   GParamSpec        *pspec);
+
+/* Signals on GimpGuiConfig properties. */
+static void   gimp_icon_size_scale_icon_theme_notify (GimpGuiConfig   *config,
+                                                      GParamSpec      *pspec,
+                                                      GtkRange        *scale);
+static void   gimp_icon_size_scale_icon_size_notify  (GimpGuiConfig   *config,
+                                                      GParamSpec      *pspec,
+                                                      GtkWidget       *size_scale);
+
+/* Signals on the combo. */
+static void   gimp_icon_size_scale_combo_changed     (GtkComboBox     *combo,
+                                                      GimpGuiConfig   *config);
+/* Signals on the GtkScale. */
+static void   gimp_icon_size_scale_value_changed     (GtkRange        *range,
+                                                      GimpGuiConfig   *config);
+static gboolean gimp_icon_size_scale_change_value    (GtkRange        *range,
+                                                      GtkScrollType    scroll,
+                                                      gdouble          value,
+                                                      GimpGuiConfig   *config);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpIconSizeScale, gimp_icon_size_scale,
+                            GIMP_TYPE_FRAME)
+
+#define parent_class gimp_icon_size_scale_parent_class
+
+
+static void
+gimp_icon_size_scale_class_init (GimpIconSizeScaleClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_icon_size_scale_constructed;
+  object_class->finalize     = gimp_icon_size_scale_finalize;
+  object_class->set_property = gimp_icon_size_scale_set_property;
+  object_class->get_property = gimp_icon_size_scale_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_icon_size_scale_init (GimpIconSizeScale *object)
+{
+  GimpIconSizeScalePrivate *private = GET_PRIVATE (object);
+  GtkWidget                *box;
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_frame_set_label_widget (GTK_FRAME (object), box);
+  private->combo = gimp_int_combo_box_new (_("Guess icon size from resolution"), 0,
+                                           _("Use icon size from the theme"), 1,
+                                           _("Custom icon size"), 2, NULL);
+  gtk_box_pack_start (GTK_BOX (box), private->combo, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  private->scale = gtk_hscale_new_with_range (0.0, 3.0, 1.0);
+  /* 'draw_value' updates round_digits. So set it first. */
+  gtk_scale_set_draw_value (GTK_SCALE (private->scale), FALSE);
+  gtk_range_set_round_digits (GTK_RANGE (private->scale), 0.0);
+  gtk_widget_set_sensitive (GTK_WIDGET (private->scale), FALSE);
+  gtk_container_add (GTK_CONTAINER (object), private->scale);
+}
+
+static void
+gimp_icon_size_scale_constructed (GObject *object)
+{
+  GimpIconSizeScalePrivate *private = GET_PRIVATE (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  g_signal_connect (private->combo, "changed",
+                    G_CALLBACK (gimp_icon_size_scale_combo_changed),
+                    private->gimp->config);
+
+  g_signal_connect (private->gimp->config, "notify::icon-theme",
+                    G_CALLBACK (gimp_icon_size_scale_icon_theme_notify),
+                    private->scale);
+  gimp_icon_size_scale_icon_theme_notify (GIMP_GUI_CONFIG (private->gimp->config),
+                                          NULL, GTK_RANGE (private->scale));
+
+  g_signal_connect (private->scale, "change-value",
+                    G_CALLBACK (gimp_icon_size_scale_change_value),
+                    private->gimp->config);
+  g_signal_connect (private->scale, "value-changed",
+                    G_CALLBACK (gimp_icon_size_scale_value_changed),
+                    private->gimp->config);
+
+  g_signal_connect (private->gimp->config, "notify::icon-size",
+                    G_CALLBACK (gimp_icon_size_scale_icon_size_notify),
+                    private->scale);
+  gimp_icon_size_scale_icon_size_notify (GIMP_GUI_CONFIG (private->gimp->config),
+                                         NULL, private->scale);
+
+  gtk_widget_show (private->combo);
+  gtk_widget_show (private->scale);
+}
+
+static void
+gimp_icon_size_scale_finalize (GObject *object)
+{
+  GimpIconSizeScalePrivate *private = GET_PRIVATE (object);
+
+  g_signal_handlers_disconnect_by_func (private->gimp->config,
+                                        G_CALLBACK (gimp_icon_size_scale_icon_size_notify),
+                                        private->scale);
+  g_signal_handlers_disconnect_by_func (private->gimp->config,
+                                        G_CALLBACK (gimp_icon_size_scale_icon_theme_notify),
+                                        private->scale);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_icon_size_scale_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpIconSizeScalePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_icon_size_scale_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpIconSizeScalePrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_icon_size_scale_icon_theme_notify (GimpGuiConfig *config,
+                                        GParamSpec    *pspec,
+                                        GtkRange      *scale)
+{
+  GtkIconTheme *theme             = gtk_icon_theme_get_default();
+  gint         *icon_sizes;
+  gchar        *markup;
+  gdouble       value             = gtk_range_get_value (scale);
+  gboolean      update_value      = FALSE;
+  gboolean      has_small_toolbar = FALSE;
+  gboolean      has_large_toolbar = FALSE;
+  gboolean      has_dnd           = FALSE;
+  gboolean      has_dialog        = FALSE;
+  gint          i;
+
+  icon_sizes = gtk_icon_theme_get_icon_sizes (theme, "gimp-tool-move");
+  for (i = 0; icon_sizes[i]; i++)
+    {
+      if (icon_sizes[i] == -1)
+        {
+          has_small_toolbar = TRUE;
+          has_large_toolbar = TRUE;
+          has_dnd           = TRUE;
+          has_dialog        = TRUE;
+          break;
+        }
+      else if (icon_sizes[i] > 13 && icon_sizes[i] < 19)
+        {
+          has_small_toolbar = TRUE;
+        }
+      else if (icon_sizes[i] > 21 && icon_sizes[i] < 27)
+        {
+          has_large_toolbar = TRUE;
+        }
+      else if (icon_sizes[i] > 29 && icon_sizes[i] < 35)
+        {
+          has_dnd = TRUE;
+        }
+      else if (icon_sizes[i] > 45 && icon_sizes[i] < 51)
+        {
+          has_dialog = TRUE;
+        }
+    }
+  g_free (icon_sizes);
+
+  gtk_scale_clear_marks (GTK_SCALE (scale));
+  markup = (gchar *) C_("icon-size", "Small");
+  if (! has_small_toolbar)
+    {
+      markup = g_strdup_printf ("<span strikethrough=\"true\">%s</span>",
+                                markup);
+      if (value == 0.0)
+        update_value = TRUE;
+    }
+  gtk_scale_add_mark (GTK_SCALE (scale), 0.0, GTK_POS_BOTTOM,
+                      markup);
+  if (! has_small_toolbar)
+    g_free (markup);
+
+  markup = (gchar *) C_("icon-size", "Medium");
+  if (! has_large_toolbar)
+    {
+      markup = g_strdup_printf ("<span strikethrough=\"true\">%s</span>",
+                                markup);
+      if (value == 1.0)
+        update_value = TRUE;
+    }
+  gtk_scale_add_mark (GTK_SCALE (scale), 1.0, GTK_POS_BOTTOM,
+                      markup);
+  if (! has_large_toolbar)
+    g_free (markup);
+
+  markup = (gchar *) C_("icon-size", "Large");
+  if (! has_dnd)
+    {
+      markup = g_strdup_printf ("<span strikethrough=\"true\">%s</span>",
+                                markup);
+      if (value == 2.0)
+        update_value = TRUE;
+    }
+  gtk_scale_add_mark (GTK_SCALE (scale), 2.0, GTK_POS_BOTTOM,
+                      markup);
+  if (! has_dnd)
+    g_free (markup);
+
+  markup = (gchar *) C_("icon-size", "Huge");
+  if (! has_dialog)
+    {
+      markup = g_strdup_printf ("<span strikethrough=\"true\">%s</span>",
+                                markup);
+      if (value == 3.0)
+        update_value = TRUE;
+    }
+  gtk_scale_add_mark (GTK_SCALE (scale), 3.0, GTK_POS_BOTTOM,
+                      markup);
+  if (! has_dialog)
+    g_free (markup);
+
+  if (update_value)
+    {
+      GimpIconSize size;
+
+      g_object_get (config, "icon-size", &size, NULL);
+
+      if (size == GIMP_ICON_SIZE_THEME || size == GIMP_ICON_SIZE_AUTO)
+        {
+          g_signal_handlers_block_by_func (scale,
+                                           G_CALLBACK (gimp_icon_size_scale_value_changed),
+                                           config);
+        }
+      if (has_small_toolbar)
+        gtk_range_set_value (scale, 0.0);
+      else if (has_large_toolbar)
+        gtk_range_set_value (scale, 1.0);
+      else if (has_dnd)
+        gtk_range_set_value (scale, 2.0);
+      else
+        gtk_range_set_value (scale, 3.0);
+      if (size == GIMP_ICON_SIZE_THEME || size == GIMP_ICON_SIZE_AUTO)
+        {
+          g_signal_handlers_unblock_by_func (scale,
+                                             G_CALLBACK (gimp_icon_size_scale_value_changed),
+                                             config);
+        }
+    }
+}
+
+static void
+gimp_icon_size_scale_icon_size_notify (GimpGuiConfig *config,
+                                       GParamSpec    *pspec,
+                                       GtkWidget     *size_scale)
+{
+  GimpIconSizeScalePrivate *private;
+  GtkWidget                *frame = gtk_widget_get_parent (size_scale);
+  GtkWidget                *combo;
+  GimpIconSize              size;
+  gdouble                   value = 1.0;
+
+  private = GET_PRIVATE (frame);
+  combo   = private->combo;
+
+  g_object_get (config, "icon-size", &size, NULL);
+
+  switch (size)
+    {
+    case GIMP_ICON_SIZE_SMALL:
+      value = 0.0;
+      break;
+    case GIMP_ICON_SIZE_MEDIUM:
+      value = 1.0;
+      break;
+    case GIMP_ICON_SIZE_LARGE:
+      value = 2.0;
+      break;
+    case GIMP_ICON_SIZE_HUGE:
+      value = 3.0;
+      break;
+    default: /* GIMP_ICON_SIZE_THEME */
+      break;
+    }
+  g_signal_handlers_block_by_func (combo,
+                                   G_CALLBACK (gimp_icon_size_scale_combo_changed),
+                                   config);
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
+                                 (size == GIMP_ICON_SIZE_AUTO)? 0 :
+                                 (size == GIMP_ICON_SIZE_THEME)? 1 : 2);
+  g_signal_handlers_unblock_by_func (combo,
+                                     G_CALLBACK (gimp_icon_size_scale_combo_changed),
+                                     config);
+  gtk_widget_set_sensitive (GTK_WIDGET (size_scale),
+                            size != GIMP_ICON_SIZE_THEME &&
+                            size != GIMP_ICON_SIZE_AUTO);
+
+
+  if (size != GIMP_ICON_SIZE_THEME && size != GIMP_ICON_SIZE_AUTO)
+    {
+      g_signal_handlers_block_by_func (size_scale,
+                                       G_CALLBACK (gimp_icon_size_scale_value_changed),
+                                       config);
+      gtk_range_set_value (GTK_RANGE (size_scale), value);
+      g_signal_handlers_unblock_by_func (size_scale,
+                                         G_CALLBACK (gimp_icon_size_scale_value_changed),
+                                         config);
+    }
+}
+
+static void
+gimp_icon_size_scale_combo_changed (GtkComboBox   *combo,
+                                    GimpGuiConfig *config)
+{
+  GtkWidget    *frame;
+  GtkWidget    *scale;
+  GimpIconSize  size;
+
+  frame = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (combo)));
+  scale = gtk_bin_get_child (GTK_BIN (frame));
+
+  if (gtk_combo_box_get_active (combo) == 2)
+    {
+      gdouble value = gtk_range_get_value (GTK_RANGE (scale));
+
+      if (value < 0.5)
+        size = GIMP_ICON_SIZE_SMALL;
+      else if (value < 1.5)
+        size = GIMP_ICON_SIZE_MEDIUM;
+      else if (value < 2.5)
+        size = GIMP_ICON_SIZE_LARGE;
+      else
+        size = GIMP_ICON_SIZE_HUGE;
+    }
+  else
+    {
+      size = (gtk_combo_box_get_active (combo) == 0) ?
+        GIMP_ICON_SIZE_AUTO : GIMP_ICON_SIZE_THEME;
+    }
+  gtk_widget_set_sensitive (GTK_WIDGET (scale),
+                            gtk_combo_box_get_active (combo) == 2);
+
+  g_signal_handlers_block_by_func (config,
+                                   G_CALLBACK (gimp_icon_size_scale_icon_size_notify),
+                                   scale);
+  g_object_set (G_OBJECT (config),
+                "icon-size", size,
+                NULL);
+  g_signal_handlers_unblock_by_func (config,
+                                     G_CALLBACK (gimp_icon_size_scale_icon_size_notify),
+                                     scale);
+}
+
+static void
+gimp_icon_size_scale_value_changed (GtkRange      *range,
+                                    GimpGuiConfig *config)
+{
+  GimpIconSize size;
+  gdouble      value = gtk_range_get_value (range);
+
+  if (value < 0.5)
+    size = GIMP_ICON_SIZE_SMALL;
+  else if (value < 1.5)
+    size = GIMP_ICON_SIZE_MEDIUM;
+  else if (value < 2.5)
+    size = GIMP_ICON_SIZE_LARGE;
+  else
+    size = GIMP_ICON_SIZE_HUGE;
+
+  g_signal_handlers_block_by_func (config,
+                                   G_CALLBACK (gimp_icon_size_scale_icon_size_notify),
+                                   range);
+  g_object_set (G_OBJECT (config), "icon-size", size, NULL);
+  g_signal_handlers_unblock_by_func (config,
+                                     G_CALLBACK (gimp_icon_size_scale_icon_size_notify),
+                                     range);
+}
+
+static gboolean
+gimp_icon_size_scale_change_value (GtkRange      *range,
+                                   GtkScrollType  scroll,
+                                   gdouble        value,
+                                   GimpGuiConfig *config)
+{
+  GtkIconTheme *theme             = gtk_icon_theme_get_default();
+  gint         *icon_sizes;
+  gboolean      has_small_toolbar = FALSE;
+  gboolean      has_large_toolbar = FALSE;
+  gboolean      has_dnd           = FALSE;
+  gboolean      has_dialog        = FALSE;
+  gint          i;
+
+  /* We cannot check all icons. Use "gimp-tool-move" as template of
+   * available sizes. */
+  icon_sizes = gtk_icon_theme_get_icon_sizes (theme, "gimp-tool-move");
+  for (i = 0; icon_sizes[i]; i++)
+    {
+      if (icon_sizes[i] == -1)
+        {
+          has_small_toolbar = TRUE;
+          has_large_toolbar = TRUE;
+          has_dnd           = TRUE;
+          has_dialog        = TRUE;
+          break;
+        }
+      else if (icon_sizes[i] > 13 && icon_sizes[i] < 19)
+        has_small_toolbar = TRUE;
+      else if (icon_sizes[i] > 21 && icon_sizes[i] < 27)
+        has_large_toolbar = TRUE;
+      else if (icon_sizes[i] > 29 && icon_sizes[i] < 35)
+        has_dnd = TRUE;
+      else if (icon_sizes[i] > 45 && icon_sizes[i] < 51)
+        has_dialog = TRUE;
+    }
+  g_free (icon_sizes);
+
+  if ((value < 0.5 && ! has_small_toolbar)                 ||
+      (value >= 0.5 && value < 1.5 && ! has_large_toolbar) ||
+      (value >= 1.5 && value < 2.5 && ! has_dnd)           ||
+      (value >= 2.5 && ! has_dialog))
+    /* Refuse the update. */
+    return TRUE;
+  else
+    /* Accept the update. */
+    return FALSE;
+}
+
+GtkWidget *
+gimp_icon_size_scale_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_ICON_SIZE_SCALE,
+                       "gimp", gimp,
+                       NULL);
+}
diff --git a/app/widgets/gimpiconsizescale.h b/app/widgets/gimpiconsizescale.h
new file mode 100644
index 0000000..1ef5a1c
--- /dev/null
+++ b/app/widgets/gimpiconsizescale.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpiconsizescale.h
+ * Copyright (C) 2016 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ICON_SIZE_SCALE_H__
+#define __GIMP_ICON_SIZE_SCALE_H__
+
+
+#define GIMP_TYPE_ICON_SIZE_SCALE            (gimp_icon_size_scale_get_type ())
+#define GIMP_ICON_SIZE_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ICON_SIZE_SCALE, GimpIconSizeScale))
+#define GIMP_ICON_SIZE_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ICON_SIZE_SCALE, GimpIconSizeScaleClass))
+#define GIMP_IS_ICON_SIZE_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ICON_SIZE_SCALE))
+#define GIMP_IS_ICON_SIZE_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ICON_SIZE_SCALE))
+#define GIMP_ICON_SIZE_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_ICON_SIZE_SCALE, GimpIconSizeScaleClass))
+
+
+typedef struct _GimpIconSizeScaleClass GimpIconSizeScaleClass;
+
+struct _GimpIconSizeScale
+{
+  GimpFrame      parent_instance;
+};
+
+struct _GimpIconSizeScaleClass
+{
+  GimpFrameClass parent_class;
+};
+
+
+GType       gimp_icon_size_scale_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_icon_size_scale_new      (Gimp *gimp);
+
+
+#endif  /* __GIMP_ICON_SIZE_SCALE_H__ */
diff --git a/app/widgets/gimpimagecommenteditor.c b/app/widgets/gimpimagecommenteditor.c
new file mode 100644
index 0000000..490ba56
--- /dev/null
+++ b/app/widgets/gimpimagecommenteditor.c
@@ -0,0 +1,248 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImageCommentEditor
+ * Copyright (C) 2007  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimptemplate.h"
+
+#include "gimpimagecommenteditor.h"
+
+#include "gimp-intl.h"
+
+#define GIMP_IMAGE_COMMENT_PARASITE "gimp-comment"
+
+
+static void  gimp_image_comment_editor_update              (GimpImageParasiteView  *view);
+
+static void  gimp_image_comment_editor_buffer_changed      (GtkTextBuffer          *buffer,
+                                                            GimpImageCommentEditor *editor);
+static void  gimp_image_comment_editor_use_default_comment (GtkWidget              *button,
+                                                            GimpImageCommentEditor *editor);
+
+
+G_DEFINE_TYPE (GimpImageCommentEditor,
+               gimp_image_comment_editor, GIMP_TYPE_IMAGE_PARASITE_VIEW)
+
+static void
+gimp_image_comment_editor_class_init (GimpImageCommentEditorClass *klass)
+{
+  GimpImageParasiteViewClass *view_class;
+
+  view_class = GIMP_IMAGE_PARASITE_VIEW_CLASS (klass);
+
+  view_class->update = gimp_image_comment_editor_update;
+}
+
+static void
+gimp_image_comment_editor_init (GimpImageCommentEditor *editor)
+{
+  GtkWidget *vbox;
+  GtkWidget *scrolled_window;
+  GtkWidget *text_view;
+  GtkWidget *button;
+
+  /* Init */
+  editor->recoursing = FALSE;
+
+  /* Vbox */
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (editor), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  /* Scrolled winow */
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 2);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  /* Text view */
+  text_view = gtk_text_view_new ();
+
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), TRUE);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
+
+  gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view), 6);
+  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_view), 6);
+  gtk_text_view_set_right_margin (GTK_TEXT_VIEW (text_view), 6);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
+  gtk_widget_show (text_view);
+
+  /* Button */
+  button = gtk_button_new_with_mnemonic (_("Use _default comment"));
+  gimp_help_set_help_data (GTK_WIDGET (button),
+                           _("Replace the current image comment with the "
+                             "default comment set in "
+                             "Edit→Preferences→Default Image."),
+                           NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_image_comment_editor_use_default_comment),
+                    editor);
+
+  /* Buffer */
+  editor->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
+
+  g_signal_connect (editor->buffer, "changed",
+                    G_CALLBACK (gimp_image_comment_editor_buffer_changed),
+                    editor);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_image_comment_editor_new (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return g_object_new (GIMP_TYPE_IMAGE_COMMENT_EDITOR,
+                       "image",    image,
+                       "parasite", GIMP_IMAGE_COMMENT_PARASITE,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_comment_editor_update (GimpImageParasiteView *view)
+{
+  GimpImageCommentEditor *editor = GIMP_IMAGE_COMMENT_EDITOR (view);
+  const GimpParasite     *parasite;
+
+  if (editor->recoursing)
+    return;
+
+  g_signal_handlers_block_by_func (editor->buffer,
+                                   gimp_image_comment_editor_buffer_changed,
+                                   editor);
+
+  parasite = gimp_image_parasite_view_get_parasite (view);
+
+  if (parasite)
+    {
+      gchar *text = g_strndup (gimp_parasite_data (parasite),
+                               gimp_parasite_data_size (parasite));
+
+      if (! g_utf8_validate (text, -1, NULL))
+        {
+          gchar *tmp = gimp_any_to_utf8 (text, -1, NULL);
+
+          g_free (text);
+          text = tmp;
+        }
+
+      gtk_text_buffer_set_text (editor->buffer, text, -1);
+      g_free (text);
+    }
+  else
+    {
+      gtk_text_buffer_set_text (editor->buffer, "", 0);
+    }
+
+  g_signal_handlers_unblock_by_func (editor->buffer,
+                                     gimp_image_comment_editor_buffer_changed,
+                                     editor);
+}
+
+static void
+gimp_image_comment_editor_buffer_changed (GtkTextBuffer          *buffer,
+                                          GimpImageCommentEditor *editor)
+{
+  GimpImage   *image;
+  gchar       *text;
+  gint         len;
+  GtkTextIter  start;
+  GtkTextIter  end;
+
+  image =
+    gimp_image_parasite_view_get_image (GIMP_IMAGE_PARASITE_VIEW (editor));
+
+  gtk_text_buffer_get_bounds (buffer, &start, &end);
+
+  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+
+  len = text ? strlen (text) : 0;
+
+  editor->recoursing = TRUE;
+
+  if (len > 0)
+    {
+      GimpParasite *parasite;
+
+      parasite = gimp_parasite_new (GIMP_IMAGE_COMMENT_PARASITE,
+                                    GIMP_PARASITE_PERSISTENT,
+                                    len + 1, text);
+
+      gimp_image_parasite_attach (image, parasite, TRUE);
+      gimp_parasite_free (parasite);
+    }
+  else
+    {
+      gimp_image_parasite_detach (image, GIMP_IMAGE_COMMENT_PARASITE, TRUE);
+    }
+
+  editor->recoursing = FALSE;
+
+  g_free (text);
+}
+
+static void
+gimp_image_comment_editor_use_default_comment (GtkWidget              *button,
+                                               GimpImageCommentEditor *editor)
+{
+  GimpImage   *image;
+  const gchar *comment = NULL;
+
+  image = gimp_image_parasite_view_get_image (GIMP_IMAGE_PARASITE_VIEW (editor));
+
+  if (image)
+    {
+      GimpTemplate *template = image->gimp->config->default_image;
+
+      comment = gimp_template_get_comment (template);
+    }
+
+  if (comment)
+    gtk_text_buffer_set_text (editor->buffer, comment, -1);
+  else
+    gtk_text_buffer_set_text (editor->buffer, "", -1);
+}
diff --git a/app/widgets/gimpimagecommenteditor.h b/app/widgets/gimpimagecommenteditor.h
new file mode 100644
index 0000000..0bcd880
--- /dev/null
+++ b/app/widgets/gimpimagecommenteditor.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImageCommentEditor
+ * Copyright (C) 2007  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_COMMENT_EDITOR_H__
+#define __GIMP_IMAGE_COMMENT_EDITOR_H__
+
+
+#include "gimpimageparasiteview.h"
+
+
+#define GIMP_TYPE_IMAGE_COMMENT_EDITOR            (gimp_image_comment_editor_get_type ())
+#define GIMP_IMAGE_COMMENT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_COMMENT_EDITOR, GimpImageCommentEditor))
+#define GIMP_IMAGE_COMMENT_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_COMMENT_EDITOR, GimpImageCommentEditorClass))
+#define GIMP_IS_IMAGE_COMMENT_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_COMMENT_EDITOR))
+#define GIMP_IS_IMAGE_COMMENT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_COMMENT_EDITOR))
+#define GIMP_IMAGE_COMMENT_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_COMMENT_EDITOR, GimpImageCommentEditorClass))
+
+
+typedef struct _GimpImageCommentEditorClass GimpImageCommentEditorClass;
+
+struct _GimpImageCommentEditor
+{
+  GimpImageParasiteView  parent_instance;
+
+  GtkTextBuffer         *buffer;
+  gboolean               recoursing;
+};
+
+struct _GimpImageCommentEditorClass
+{
+  GimpImageParasiteViewClass  parent_class;
+};
+
+
+GType       gimp_image_comment_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_image_comment_editor_new      (GimpImage *image);
+
+
+#endif /*  __GIMP_IMAGE_COMMENT_EDITOR_H__  */
diff --git a/app/widgets/gimpimageeditor.c b/app/widgets/gimpimageeditor.c
new file mode 100644
index 0000000..fc567e5
--- /dev/null
+++ b/app/widgets/gimpimageeditor.c
@@ -0,0 +1,179 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "gimpdocked.h"
+#include "gimpimageeditor.h"
+#include "gimpuimanager.h"
+
+
+static void   gimp_image_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void   gimp_image_editor_set_context    (GimpDocked       *docked,
+                                                GimpContext      *context);
+
+static void   gimp_image_editor_dispose        (GObject          *object);
+
+static void   gimp_image_editor_real_set_image (GimpImageEditor  *editor,
+                                                GimpImage        *image);
+static void   gimp_image_editor_image_flush    (GimpImage        *image,
+                                                gboolean          invalidate_preview,
+                                                GimpImageEditor  *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpImageEditor, gimp_image_editor, GIMP_TYPE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_image_editor_docked_iface_init))
+
+#define parent_class gimp_image_editor_parent_class
+
+
+static void
+gimp_image_editor_class_init (GimpImageEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_image_editor_dispose;
+
+  klass->set_image      = gimp_image_editor_real_set_image;
+}
+
+static void
+gimp_image_editor_init (GimpImageEditor *editor)
+{
+  editor->image = NULL;
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+}
+
+static void
+gimp_image_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  iface->set_context = gimp_image_editor_set_context;
+}
+
+static void
+gimp_image_editor_set_context (GimpDocked  *docked,
+                               GimpContext *context)
+{
+  GimpImageEditor *editor = GIMP_IMAGE_EDITOR (docked);
+  GimpImage       *image  = NULL;
+
+  if (editor->context)
+    {
+      g_signal_handlers_disconnect_by_func (editor->context,
+                                            gimp_image_editor_set_image,
+                                            editor);
+
+      g_object_unref (editor->context);
+    }
+
+  editor->context = context;
+
+  if (context)
+    {
+      g_object_ref (editor->context);
+
+      g_signal_connect_swapped (context, "image-changed",
+                                G_CALLBACK (gimp_image_editor_set_image),
+                                editor);
+
+      image = gimp_context_get_image (context);
+    }
+
+  gimp_image_editor_set_image (editor, image);
+}
+
+static void
+gimp_image_editor_dispose (GObject *object)
+{
+  GimpImageEditor *editor = GIMP_IMAGE_EDITOR (object);
+
+  if (editor->image)
+    gimp_image_editor_set_image (editor, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_image_editor_real_set_image (GimpImageEditor *editor,
+                                  GimpImage       *image)
+{
+  if (editor->image)
+    g_signal_handlers_disconnect_by_func (editor->image,
+                                          gimp_image_editor_image_flush,
+                                          editor);
+
+  editor->image = image;
+
+  if (editor->image)
+    g_signal_connect (editor->image, "flush",
+                      G_CALLBACK (gimp_image_editor_image_flush),
+                      editor);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), image != NULL);
+}
+
+
+/*  public functions  */
+
+void
+gimp_image_editor_set_image (GimpImageEditor *editor,
+                             GimpImage       *image)
+{
+  g_return_if_fail (GIMP_IS_IMAGE_EDITOR (editor));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  if (image != editor->image)
+    {
+      GIMP_IMAGE_EDITOR_GET_CLASS (editor)->set_image (editor, image);
+
+      if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+        gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                                gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+    }
+}
+
+GimpImage *
+gimp_image_editor_get_image (GimpImageEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE_EDITOR (editor), NULL);
+
+  return editor->image;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_editor_image_flush (GimpImage       *image,
+                               gboolean         invalidate_preview,
+                               GimpImageEditor *editor)
+{
+  if (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)))
+    gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                            gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+}
diff --git a/app/widgets/gimpimageeditor.h b/app/widgets/gimpimageeditor.h
new file mode 100644
index 0000000..0e97eff
--- /dev/null
+++ b/app/widgets/gimpimageeditor.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_EDITOR_H__
+#define __GIMP_IMAGE_EDITOR_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_IMAGE_EDITOR            (gimp_image_editor_get_type ())
+#define GIMP_IMAGE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_EDITOR, GimpImageEditor))
+#define GIMP_IMAGE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_EDITOR, GimpImageEditorClass))
+#define GIMP_IS_IMAGE_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_EDITOR))
+#define GIMP_IS_IMAGE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_EDITOR))
+#define GIMP_IMAGE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_EDITOR, GimpImageEditorClass))
+
+
+typedef struct _GimpImageEditorClass GimpImageEditorClass;
+
+struct _GimpImageEditor
+{
+  GimpEditor   parent_instance;
+
+  GimpContext *context;
+  GimpImage   *image;
+};
+
+struct _GimpImageEditorClass
+{
+  GimpEditorClass  parent_class;
+
+  /*  virtual function  */
+  void (* set_image) (GimpImageEditor *editor,
+                      GimpImage       *image);
+};
+
+
+GType       gimp_image_editor_get_type  (void) G_GNUC_CONST;
+
+void        gimp_image_editor_set_image (GimpImageEditor *editor,
+                                         GimpImage       *image);
+GimpImage * gimp_image_editor_get_image (GimpImageEditor *editor);
+
+
+#endif /* __GIMP_IMAGE_EDITOR_H__ */
diff --git a/app/widgets/gimpimageparasiteview.c b/app/widgets/gimpimageparasiteview.c
new file mode 100644
index 0000000..76e060d
--- /dev/null
+++ b/app/widgets/gimpimageparasiteview.c
@@ -0,0 +1,240 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImageParasiteView
+ * Copyright (C) 2006  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpimageparasiteview.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE,
+  PROP_PARASITE
+};
+
+enum
+{
+  UPDATE,
+  LAST_SIGNAL
+};
+
+
+static void   gimp_image_parasite_view_constructed  (GObject     *object);
+static void   gimp_image_parasite_view_finalize     (GObject     *object);
+static void   gimp_image_parasite_view_set_property (GObject     *object,
+                                                     guint         property_id,
+                                                     const GValue *value,
+                                                     GParamSpec   *pspec);
+static void   gimp_image_parasite_view_get_property (GObject     *object,
+                                                     guint         property_id,
+                                                     GValue       *value,
+                                                     GParamSpec   *pspec);
+
+static void   gimp_image_parasite_view_parasite_changed (GimpImageParasiteView *view,
+                                                         const gchar          *name);
+static void   gimp_image_parasite_view_update           (GimpImageParasiteView *view);
+
+
+G_DEFINE_TYPE (GimpImageParasiteView, gimp_image_parasite_view, GTK_TYPE_BOX)
+
+#define parent_class gimp_image_parasite_view_parent_class
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_image_parasite_view_class_init (GimpImageParasiteViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  view_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpImageParasiteViewClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->constructed  = gimp_image_parasite_view_constructed;
+  object_class->finalize     = gimp_image_parasite_view_finalize;
+  object_class->set_property = gimp_image_parasite_view_set_property;
+  object_class->get_property = gimp_image_parasite_view_get_property;
+
+  klass->update              = NULL;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image", NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_PARASITE,
+                                   g_param_spec_string ("parasite", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_image_parasite_view_init (GimpImageParasiteView *view)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (view),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  view->parasite = NULL;
+}
+
+static void
+gimp_image_parasite_view_constructed (GObject *object)
+{
+  GimpImageParasiteView *view = GIMP_IMAGE_PARASITE_VIEW (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (view->parasite != NULL);
+  gimp_assert (view->image != NULL);
+
+  g_signal_connect_object (view->image, "parasite-attached",
+                           G_CALLBACK (gimp_image_parasite_view_parasite_changed),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (view->image, "parasite-detached",
+                           G_CALLBACK (gimp_image_parasite_view_parasite_changed),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+
+  gimp_image_parasite_view_update (view);
+}
+
+static void
+gimp_image_parasite_view_finalize (GObject *object)
+{
+  GimpImageParasiteView *view = GIMP_IMAGE_PARASITE_VIEW (object);
+
+  g_clear_pointer (&view->parasite, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_image_parasite_view_set_property (GObject      *object,
+                                      guint         property_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  GimpImageParasiteView *view = GIMP_IMAGE_PARASITE_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      view->image = g_value_get_object (value);
+      break;
+    case PROP_PARASITE:
+      view->parasite = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_parasite_view_get_property (GObject    *object,
+                                      guint       property_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  GimpImageParasiteView *view = GIMP_IMAGE_PARASITE_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, view->image);
+      break;
+    case PROP_PARASITE:
+      g_value_set_string (value, view->parasite);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_image_parasite_view_new (GimpImage   *image,
+                              const gchar *parasite)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (parasite != NULL, NULL);
+
+  return g_object_new (GIMP_TYPE_IMAGE_PARASITE_VIEW,
+                       "image",    image,
+                       "parasite", parasite,
+                       NULL);
+}
+
+
+GimpImage *
+gimp_image_parasite_view_get_image (GimpImageParasiteView *view)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE_PARASITE_VIEW (view), NULL);
+
+  return view->image;
+}
+
+const GimpParasite *
+gimp_image_parasite_view_get_parasite (GimpImageParasiteView *view)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE_PARASITE_VIEW (view), NULL);
+
+  return gimp_image_parasite_find (view->image, view->parasite);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_parasite_view_parasite_changed (GimpImageParasiteView *view,
+                                           const gchar           *name)
+{
+  if (name && view->parasite && strcmp (name, view->parasite) == 0)
+    gimp_image_parasite_view_update (view);
+}
+
+static void
+gimp_image_parasite_view_update (GimpImageParasiteView *view)
+{
+  g_signal_emit (view, view_signals[UPDATE], 0);
+}
diff --git a/app/widgets/gimpimageparasiteview.h b/app/widgets/gimpimageparasiteview.h
new file mode 100644
index 0000000..e8b25c2
--- /dev/null
+++ b/app/widgets/gimpimageparasiteview.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImageParasiteView
+ * Copyright (C) 2006  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PARASITE_VIEW_H__
+#define __GIMP_IMAGE_PARASITE_VIEW_H__
+
+
+#define GIMP_TYPE_IMAGE_PARASITE_VIEW            (gimp_image_parasite_view_get_type ())
+#define GIMP_IMAGE_PARASITE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteView))
+#define GIMP_IMAGE_PARASITE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteViewClass))
+#define GIMP_IS_IMAGE_PARASITE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_PARASITE_VIEW))
+#define GIMP_IS_IMAGE_PARASITE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_PARASITE_VIEW))
+#define GIMP_IMAGE_PARASITE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteViewClass))
+
+
+typedef struct _GimpImageParasiteViewClass GimpImageParasiteViewClass;
+
+struct _GimpImageParasiteView
+{
+  GtkBox     parent_instance;
+
+  GimpImage *image;
+  gchar     *parasite;
+};
+
+struct _GimpImageParasiteViewClass
+{
+  GtkBoxClass  parent_class;
+
+  /*  signals  */
+  void (* update) (GimpImageParasiteView *view);
+};
+
+
+GType                gimp_image_parasite_view_get_type     (void) G_GNUC_CONST;
+
+GtkWidget          * gimp_image_parasite_view_new          (GimpImage   *image,
+                                                            const gchar *parasite);
+GimpImage          * gimp_image_parasite_view_get_image    (GimpImageParasiteView *view);
+const GimpParasite * gimp_image_parasite_view_get_parasite (GimpImageParasiteView *view);
+
+
+#endif /*  __GIMP_IMAGE_PARASITE_VIEW_H__  */
diff --git a/app/widgets/gimpimageprofileview.c b/app/widgets/gimpimageprofileview.c
new file mode 100644
index 0000000..40dcb0a
--- /dev/null
+++ b/app/widgets/gimpimageprofileview.c
@@ -0,0 +1,114 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImageProfileView
+ * Copyright (C) 2006  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpimage-color-profile.h"
+
+#include "gimpimageprofileview.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_image_profile_view_update (GimpImageParasiteView *view);
+
+
+G_DEFINE_TYPE (GimpImageProfileView,
+               gimp_image_profile_view, GIMP_TYPE_IMAGE_PARASITE_VIEW)
+
+#define parent_class gimp_image_profile_view_parent_class
+
+
+static void
+gimp_image_profile_view_class_init (GimpImageProfileViewClass *klass)
+{
+  GimpImageParasiteViewClass *view_class;
+
+  view_class = GIMP_IMAGE_PARASITE_VIEW_CLASS (klass);
+
+  view_class->update = gimp_image_profile_view_update;
+}
+
+static void
+gimp_image_profile_view_init (GimpImageProfileView *view)
+{
+  GtkWidget *scrolled_window;
+  GtkWidget *profile_view;
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 2);
+  gtk_box_pack_start (GTK_BOX (view), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  profile_view = gimp_color_profile_view_new ();
+  gtk_container_add (GTK_CONTAINER (scrolled_window), profile_view);
+  gtk_widget_show (profile_view);
+
+  view->profile_view = GIMP_COLOR_PROFILE_VIEW (profile_view);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_image_profile_view_new (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return g_object_new (GIMP_TYPE_IMAGE_PROFILE_VIEW,
+                       "image",    image,
+                       "parasite", GIMP_ICC_PROFILE_PARASITE_NAME,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_image_profile_view_update (GimpImageParasiteView *view)
+{
+  GimpImageProfileView *profile_view = GIMP_IMAGE_PROFILE_VIEW (view);
+  GimpImage            *image;
+  GimpColorManaged     *managed;
+  GimpColorProfile     *profile;
+
+  image   = gimp_image_parasite_view_get_image (view);
+  managed = GIMP_COLOR_MANAGED (image);
+
+  profile = gimp_color_managed_get_color_profile (managed);
+
+  gimp_color_profile_view_set_profile (profile_view->profile_view, profile);
+}
diff --git a/app/widgets/gimpimageprofileview.h b/app/widgets/gimpimageprofileview.h
new file mode 100644
index 0000000..2c99883
--- /dev/null
+++ b/app/widgets/gimpimageprofileview.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImageProfileView
+ * Copyright (C) 2006  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PROFILE_VIEW_H__
+#define __GIMP_IMAGE_PROFILE_VIEW_H__
+
+
+#include "gimpimageparasiteview.h"
+
+
+#define GIMP_TYPE_IMAGE_PROFILE_VIEW            (gimp_image_profile_view_get_type ())
+#define GIMP_IMAGE_PROFILE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PROFILE_VIEW, GimpImageProfileView))
+#define GIMP_IMAGE_PROFILE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PROFILE_VIEW, GimpImageProfileViewClass))
+#define GIMP_IS_IMAGE_PROFILE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_PROFILE_VIEW))
+#define GIMP_IS_IMAGE_PROFILE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_PROFILE_VIEW))
+#define GIMP_IMAGE_PROFILE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_PROFILE_VIEW, GimpImageProfileViewClass))
+
+
+typedef struct _GimpImageProfileViewClass GimpImageProfileViewClass;
+
+struct _GimpImageProfileView
+{
+  GimpImageParasiteView  parent_instance;
+
+  GimpColorProfileView  *profile_view;
+};
+
+struct _GimpImageProfileViewClass
+{
+  GimpImageParasiteViewClass  parent_class;
+};
+
+
+GType       gimp_image_profile_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_image_profile_view_new      (GimpImage *image);
+
+
+#endif /*  __GIMP_IMAGE_PROFILE_VIEW_H__  */
diff --git a/app/widgets/gimpimagepropview.c b/app/widgets/gimpimagepropview.c
new file mode 100644
index 0000000..0fcc63e
--- /dev/null
+++ b/app/widgets/gimpimagepropview.c
@@ -0,0 +1,563 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImagePropView
+ * Copyright (C) 2005  Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2006  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpundostack.h"
+#include "core/gimp-utils.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "gimpimagepropview.h"
+#include "gimppropwidgets.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_IMAGE
+};
+
+
+static void        gimp_image_prop_view_constructed  (GObject           *object);
+static void        gimp_image_prop_view_set_property (GObject           *object,
+                                                      guint              property_id,
+                                                      const GValue      *value,
+                                                      GParamSpec        *pspec);
+static void        gimp_image_prop_view_get_property (GObject           *object,
+                                                      guint              property_id,
+                                                      GValue            *value,
+                                                      GParamSpec        *pspec);
+
+static GtkWidget * gimp_image_prop_view_add_label    (GtkTable          *table,
+                                                      gint               row,
+                                                      const gchar       *text);
+static void        gimp_image_prop_view_undo_event   (GimpImage         *image,
+                                                      GimpUndoEvent      event,
+                                                      GimpUndo          *undo,
+                                                      GimpImagePropView *view);
+static void        gimp_image_prop_view_update       (GimpImagePropView *view);
+static void        gimp_image_prop_view_file_update  (GimpImagePropView *view);
+static void        gimp_image_prop_view_realize      (GimpImagePropView *view,
+                                                      gpointer           user_data);
+
+
+G_DEFINE_TYPE (GimpImagePropView, gimp_image_prop_view, GTK_TYPE_TABLE)
+
+#define parent_class gimp_image_prop_view_parent_class
+
+
+static void
+gimp_image_prop_view_class_init (GimpImagePropViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_image_prop_view_constructed;
+  object_class->set_property = gimp_image_prop_view_set_property;
+  object_class->get_property = gimp_image_prop_view_get_property;
+
+  g_object_class_install_property (object_class, PROP_IMAGE,
+                                   g_param_spec_object ("image", NULL, NULL,
+                                                        GIMP_TYPE_IMAGE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_image_prop_view_init (GimpImagePropView *view)
+{
+  GtkTable *table = GTK_TABLE (view);
+  gint      row = 0;
+
+  gtk_table_resize (table, 15, 2);
+
+  gtk_table_set_col_spacings (table, 6);
+  gtk_table_set_row_spacings (table, 3);
+
+  view->pixel_size_label =
+    gimp_image_prop_view_add_label (table, row++, _("Size in pixels:"));
+
+  view->print_size_label =
+    gimp_image_prop_view_add_label (table, row++, _("Print size:"));
+
+  view->resolution_label =
+    gimp_image_prop_view_add_label (table, row++, _("Resolution:"));
+
+  view->colorspace_label =
+    gimp_image_prop_view_add_label (table, row++, _("Color space:"));
+
+  view->precision_label =
+    gimp_image_prop_view_add_label (table, row, _("Precision:"));
+
+  gtk_table_set_row_spacing (GTK_TABLE (view), row++, 12);
+
+  view->filename_label =
+    gimp_image_prop_view_add_label (table, row++, _("File Name:"));
+
+  gtk_label_set_ellipsize (GTK_LABEL (view->filename_label),
+                           PANGO_ELLIPSIZE_MIDDLE);
+  /* See gimp_image_prop_view_realize(). */
+  gtk_label_set_max_width_chars (GTK_LABEL (view->filename_label), 25);
+
+  view->filesize_label =
+    gimp_image_prop_view_add_label (table, row++, _("File Size:"));
+
+  view->filetype_label =
+    gimp_image_prop_view_add_label (table, row, _("File Type:"));
+
+  gtk_table_set_row_spacing (GTK_TABLE (view), row++, 12);
+
+  view->memsize_label =
+    gimp_image_prop_view_add_label (table, row++, _("Size in memory:"));
+
+  view->undo_label =
+    gimp_image_prop_view_add_label (table, row++, _("Undo steps:"));
+
+  view->redo_label =
+    gimp_image_prop_view_add_label (table, row, _("Redo steps:"));
+
+  gtk_table_set_row_spacing (GTK_TABLE (view), row++, 12);
+
+  view->pixels_label =
+    gimp_image_prop_view_add_label (table, row++, _("Number of pixels:"));
+
+  view->layers_label =
+    gimp_image_prop_view_add_label (table, row++, _("Number of layers:"));
+
+  view->channels_label =
+    gimp_image_prop_view_add_label (table, row++, _("Number of channels:"));
+
+  view->vectors_label =
+    gimp_image_prop_view_add_label (table, row++, _("Number of paths:"));
+
+  g_signal_connect (view, "realize",
+                    G_CALLBACK (gimp_image_prop_view_realize),
+                    NULL);
+}
+
+static void
+gimp_image_prop_view_constructed (GObject *object)
+{
+  GimpImagePropView *view = GIMP_IMAGE_PROP_VIEW (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (view->image != NULL);
+
+  g_signal_connect_object (view->image, "name-changed",
+                           G_CALLBACK (gimp_image_prop_view_file_update),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+
+  g_signal_connect_object (view->image, "size-changed",
+                           G_CALLBACK (gimp_image_prop_view_update),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (view->image, "resolution-changed",
+                           G_CALLBACK (gimp_image_prop_view_update),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (view->image, "unit-changed",
+                           G_CALLBACK (gimp_image_prop_view_update),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (view->image, "mode-changed",
+                           G_CALLBACK (gimp_image_prop_view_update),
+                           G_OBJECT (view),
+                           G_CONNECT_SWAPPED);
+  g_signal_connect_object (view->image, "undo-event",
+                           G_CALLBACK (gimp_image_prop_view_undo_event),
+                           G_OBJECT (view),
+                           0);
+
+  gimp_image_prop_view_update (view);
+  gimp_image_prop_view_file_update (view);
+}
+
+static void
+gimp_image_prop_view_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpImagePropView *view = GIMP_IMAGE_PROP_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      view->image = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_image_prop_view_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpImagePropView *view = GIMP_IMAGE_PROP_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_IMAGE:
+      g_value_set_object (value, view->image);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_image_prop_view_new (GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return g_object_new (GIMP_TYPE_IMAGE_PROP_VIEW,
+                       "image", image,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+gimp_image_prop_view_add_label (GtkTable    *table,
+                                gint         row,
+                                const gchar *text)
+{
+  GtkWidget *label;
+  GtkWidget *desc;
+
+  desc = g_object_new (GTK_TYPE_LABEL,
+                       "label",  text,
+                       "xalign", 1.0,
+                       "yalign", 0.5,
+                       NULL);
+  gimp_label_set_attributes (GTK_LABEL (desc),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_table_attach (table, desc,
+                    0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (desc);
+
+  label = g_object_new (GTK_TYPE_LABEL,
+                        "xalign",     0.0,
+                        "yalign",     0.5,
+                        "selectable", TRUE,
+                        NULL);
+
+  gtk_table_attach (table, label,
+                    1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+
+  gtk_widget_show (label);
+
+  return label;
+}
+
+static void
+gimp_image_prop_view_label_set_memsize (GtkWidget  *label,
+                                        GimpObject *object)
+{
+  gchar *str = g_format_size (gimp_object_get_memsize (object, NULL));
+  gtk_label_set_text (GTK_LABEL (label), str);
+  g_free (str);
+}
+
+static void
+gimp_image_prop_view_label_set_filename (GtkWidget *label,
+                                         GimpImage *image)
+{
+  GFile *file = gimp_image_get_any_file (image);
+
+  if (file)
+    {
+      gtk_label_set_text (GTK_LABEL (label),
+                          gimp_file_get_utf8_name (file));
+      /* In case the label is ellipsized. */
+      gtk_widget_set_tooltip_text (GTK_WIDGET (label),
+                                   gimp_file_get_utf8_name (file));
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (label), NULL);
+      gimp_help_set_help_data (gtk_widget_get_parent (label), NULL, NULL);
+    }
+}
+
+static void
+gimp_image_prop_view_label_set_filesize (GtkWidget *label,
+                                         GimpImage *image)
+{
+  GFile *file = gimp_image_get_any_file (image);
+
+  if (file)
+    {
+      GFileInfo *info = g_file_query_info (file,
+                                           G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                           G_FILE_QUERY_INFO_NONE,
+                                           NULL, NULL);
+
+      if (info)
+        {
+          goffset  size = g_file_info_get_size (info);
+          gchar   *str  = g_format_size (size);
+
+          gtk_label_set_text (GTK_LABEL (label), str);
+          g_free (str);
+
+          g_object_unref (info);
+        }
+      else
+        {
+          gtk_label_set_text (GTK_LABEL (label), NULL);
+        }
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (label), NULL);
+    }
+}
+
+static void
+gimp_image_prop_view_label_set_filetype (GtkWidget *label,
+                                         GimpImage *image)
+{
+  GimpPlugInProcedure *proc = gimp_image_get_save_proc (image);
+
+  if (! proc)
+    proc = gimp_image_get_load_proc (image);
+
+  if (! proc)
+    {
+      GimpPlugInManager *manager = image->gimp->plug_in_manager;
+      GFile             *file    = gimp_image_get_file (image);
+
+      if (file)
+        proc = gimp_plug_in_manager_file_procedure_find (manager,
+                                                         GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                         file, NULL);
+    }
+
+  gtk_label_set_text (GTK_LABEL (label),
+                      proc ?
+                      gimp_procedure_get_label (GIMP_PROCEDURE (proc)) : NULL);
+}
+
+static void
+gimp_image_prop_view_label_set_undo (GtkWidget     *label,
+                                     GimpUndoStack *stack)
+{
+  gint steps = gimp_undo_stack_get_depth (stack);
+
+  if (steps > 0)
+    {
+      GimpObject *object = GIMP_OBJECT (stack);
+      gchar      *str;
+      gchar       buf[256];
+
+      str = g_format_size (gimp_object_get_memsize (object, NULL));
+      g_snprintf (buf, sizeof (buf), "%d (%s)", steps, str);
+      g_free (str);
+
+      gtk_label_set_text (GTK_LABEL (label), buf);
+    }
+  else
+    {
+      /*  no undo (or redo) steps available  */
+      gtk_label_set_text (GTK_LABEL (label), _("None"));
+    }
+}
+
+static void
+gimp_image_prop_view_undo_event (GimpImage         *image,
+                                 GimpUndoEvent      event,
+                                 GimpUndo          *undo,
+                                 GimpImagePropView *view)
+{
+  gimp_image_prop_view_update (view);
+}
+
+static void
+gimp_image_prop_view_update (GimpImagePropView *view)
+{
+  GimpImage         *image = view->image;
+  GimpColorProfile  *profile;
+  GimpImageBaseType  type;
+  GimpPrecision      precision;
+  GimpUnit           unit;
+  gdouble            unit_factor;
+  const gchar       *desc;
+  gchar              format_buf[32];
+  gchar              buf[256];
+  gdouble            xres;
+  gdouble            yres;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  /*  pixel size  */
+  g_snprintf (buf, sizeof (buf), ngettext ("%d × %d pixel",
+                                           "%d × %d pixels",
+                                           gimp_image_get_height (image)),
+              gimp_image_get_width  (image),
+              gimp_image_get_height (image));
+  gtk_label_set_text (GTK_LABEL (view->pixel_size_label), buf);
+
+  /*  print size  */
+  unit = gimp_get_default_unit ();
+
+  g_snprintf (format_buf, sizeof (format_buf), "%%.%df × %%.%df %s",
+              gimp_unit_get_scaled_digits (unit, xres),
+              gimp_unit_get_scaled_digits (unit, yres),
+              gimp_unit_get_plural (unit));
+  g_snprintf (buf, sizeof (buf), format_buf,
+              gimp_pixels_to_units (gimp_image_get_width  (image), unit, xres),
+              gimp_pixels_to_units (gimp_image_get_height (image), unit, yres));
+  gtk_label_set_text (GTK_LABEL (view->print_size_label), buf);
+
+  /*  resolution  */
+  unit        = gimp_image_get_unit (image);
+  unit_factor = gimp_unit_get_factor (unit);
+
+  g_snprintf (format_buf, sizeof (format_buf), _("pixels/%s"),
+              gimp_unit_get_abbreviation (unit));
+  g_snprintf (buf, sizeof (buf), _("%g × %g %s"),
+              xres / unit_factor,
+              yres / unit_factor,
+              unit == GIMP_UNIT_INCH ? _("ppi") : format_buf);
+  gtk_label_set_text (GTK_LABEL (view->resolution_label), buf);
+
+  /*  color space  */
+  type = gimp_image_get_base_type (image);
+  gimp_enum_get_value (GIMP_TYPE_IMAGE_BASE_TYPE, type,
+                       NULL, NULL, &desc, NULL);
+
+  switch (type)
+    {
+    case GIMP_RGB:
+    case GIMP_GRAY:
+      profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
+      g_snprintf (buf, sizeof (buf), "%s: %s", desc,
+                  gimp_color_profile_get_label (profile));
+      break;
+    case GIMP_INDEXED:
+      g_snprintf (buf, sizeof (buf),
+                  "%s (%d %s)", desc, gimp_image_get_colormap_size (image),
+                  _("colors"));
+      break;
+    }
+
+  gtk_label_set_text (GTK_LABEL (view->colorspace_label), buf);
+  gtk_label_set_line_wrap (GTK_LABEL (view->colorspace_label), TRUE);
+
+  /*  precision  */
+  precision = gimp_image_get_precision (image);
+
+  gimp_enum_get_value (GIMP_TYPE_PRECISION, precision,
+                       NULL, NULL, &desc, NULL);
+
+  gtk_label_set_text (GTK_LABEL (view->precision_label), desc);
+
+  /*  size in memory  */
+  gimp_image_prop_view_label_set_memsize (view->memsize_label,
+                                          GIMP_OBJECT (image));
+
+  /*  undo / redo  */
+  gimp_image_prop_view_label_set_undo (view->undo_label,
+                                       gimp_image_get_undo_stack (image));
+  gimp_image_prop_view_label_set_undo (view->redo_label,
+                                       gimp_image_get_redo_stack (image));
+
+  /*  number of layers  */
+  g_snprintf (buf, sizeof (buf), "%d",
+              gimp_image_get_width  (image) *
+              gimp_image_get_height (image));
+  gtk_label_set_text (GTK_LABEL (view->pixels_label), buf);
+
+  /*  number of layers  */
+  g_snprintf (buf, sizeof (buf), "%d",
+              gimp_image_get_n_layers (image));
+  gtk_label_set_text (GTK_LABEL (view->layers_label), buf);
+
+  /*  number of channels  */
+  g_snprintf (buf, sizeof (buf), "%d",
+              gimp_image_get_n_channels (image));
+  gtk_label_set_text (GTK_LABEL (view->channels_label), buf);
+
+  /*  number of vectors  */
+  g_snprintf (buf, sizeof (buf), "%d",
+              gimp_image_get_n_vectors (image));
+  gtk_label_set_text (GTK_LABEL (view->vectors_label), buf);
+}
+
+static void
+gimp_image_prop_view_file_update (GimpImagePropView *view)
+{
+  GimpImage *image = view->image;
+
+  /*  filename  */
+  gimp_image_prop_view_label_set_filename (view->filename_label, image);
+
+  /*  filesize  */
+  gimp_image_prop_view_label_set_filesize (view->filesize_label, image);
+
+  /*  filetype  */
+  gimp_image_prop_view_label_set_filetype (view->filetype_label, image);
+}
+
+static void
+gimp_image_prop_view_realize (GimpImagePropView *view,
+                              gpointer           user_data)
+{
+  /* Ugly trick to avoid extra-wide dialog at construction because of
+   * overlong file path. Basically I give a reasonnable max size at
+   * construction (if the path is longer, it is just ellipsized per set
+   * rules), then once the widget is realized, I remove the max size,
+   * allowing the widget to grow wider if ever the dialog were
+   * manually resized (we don't want to keep the label short and
+   * ellipsized if the dialog is explicitly made to have enough place).
+   */
+  gtk_label_set_max_width_chars (GTK_LABEL (view->filename_label), -1);
+}
diff --git a/app/widgets/gimpimagepropview.h b/app/widgets/gimpimagepropview.h
new file mode 100644
index 0000000..753fcd9
--- /dev/null
+++ b/app/widgets/gimpimagepropview.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpImagePropView
+ * Copyright (C) 2005  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_PROP_VIEW_H__
+#define __GIMP_IMAGE_PROP_VIEW_H__
+
+
+#define GIMP_TYPE_IMAGE_PROP_VIEW            (gimp_image_prop_view_get_type ())
+#define GIMP_IMAGE_PROP_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropView))
+#define GIMP_IMAGE_PROP_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropViewClass))
+#define GIMP_IS_IMAGE_PROP_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_PROP_VIEW))
+#define GIMP_IS_IMAGE_PROP_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_PROP_VIEW))
+#define GIMP_IMAGE_PROP_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropViewClass))
+
+
+typedef struct _GimpImagePropViewClass GimpImagePropViewClass;
+
+struct _GimpImagePropView
+{
+  GtkTable   parent_instance;
+
+  GimpImage *image;
+
+  GtkWidget *pixel_size_label;
+  GtkWidget *print_size_label;
+  GtkWidget *resolution_label;
+  GtkWidget *colorspace_label;
+  GtkWidget *precision_label;
+  GtkWidget *filename_label;
+  GtkWidget *filesize_label;
+  GtkWidget *filetype_label;
+  GtkWidget *memsize_label;
+  GtkWidget *undo_label;
+  GtkWidget *redo_label;
+  GtkWidget *pixels_label;
+  GtkWidget *layers_label;
+  GtkWidget *channels_label;
+  GtkWidget *vectors_label;
+};
+
+struct _GimpImagePropViewClass
+{
+  GtkTableClass  parent_class;
+};
+
+
+GType       gimp_image_prop_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_image_prop_view_new      (GimpImage *image);
+
+
+#endif /*  __GIMP_IMAGE_PROP_VIEW_H__  */
diff --git a/app/widgets/gimpimageview.c b/app/widgets/gimpimageview.c
new file mode 100644
index 0000000..a4f309c
--- /dev/null
+++ b/app/widgets/gimpimageview.c
@@ -0,0 +1,159 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdocumentview.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "gimpcontainerview.h"
+#include "gimpeditor.h"
+#include "gimpimageview.h"
+#include "gimpdnd.h"
+#include "gimpmenufactory.h"
+#include "gimpuimanager.h"
+#include "gimpviewrenderer.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_image_view_activate_item (GimpContainerEditor *editor,
+                                             GimpViewable        *viewable);
+
+
+G_DEFINE_TYPE (GimpImageView, gimp_image_view, GIMP_TYPE_CONTAINER_EDITOR)
+
+#define parent_class gimp_image_view_parent_class
+
+
+static void
+gimp_image_view_class_init (GimpImageViewClass *klass)
+{
+  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
+
+  editor_class->activate_item = gimp_image_view_activate_item;
+}
+
+static void
+gimp_image_view_init (GimpImageView *view)
+{
+  view->raise_button  = NULL;
+  view->new_button    = NULL;
+  view->delete_button = NULL;
+}
+
+GtkWidget *
+gimp_image_view_new (GimpViewType     view_type,
+                     GimpContainer   *container,
+                     GimpContext     *context,
+                     gint             view_size,
+                     gint             view_border_width,
+                     GimpMenuFactory *menu_factory)
+{
+  GimpImageView       *image_view;
+  GimpContainerEditor *editor;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  image_view = g_object_new (GIMP_TYPE_IMAGE_VIEW,
+                             "view-type",         view_type,
+                             "container",         container,
+                             "context",           context,
+                             "view-size",         view_size,
+                             "view-border-width", view_border_width,
+                             "menu-factory",      menu_factory,
+                             "menu-identifier",   "<Images>",
+                             "ui-path",           "/images-popup",
+                             NULL);
+
+  editor = GIMP_CONTAINER_EDITOR (image_view);
+
+  image_view->raise_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "images",
+                                   "images-raise-views", NULL);
+
+  image_view->new_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "images",
+                                   "images-new-view", NULL);
+
+  image_view->delete_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "images",
+                                   "images-delete", NULL);
+
+  if (view_type == GIMP_VIEW_TYPE_LIST)
+    {
+      GtkWidget *dnd_widget;
+
+      dnd_widget = gimp_container_view_get_dnd_widget (editor->view);
+
+      gimp_dnd_xds_source_add (dnd_widget,
+                               (GimpDndDragViewableFunc) gimp_dnd_get_drag_data,
+                               NULL);
+    }
+
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (image_view->raise_button),
+                                  GIMP_TYPE_IMAGE);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (image_view->new_button),
+                                  GIMP_TYPE_IMAGE);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (image_view->delete_button),
+                                  GIMP_TYPE_IMAGE);
+
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)),
+                          editor);
+
+  return GTK_WIDGET (image_view);
+}
+
+static void
+gimp_image_view_activate_item (GimpContainerEditor *editor,
+                               GimpViewable        *viewable)
+{
+  GimpImageView *view = GIMP_IMAGE_VIEW (editor);
+  GimpContainer *container;
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item (editor, viewable);
+
+  container = gimp_container_view_get_container (editor->view);
+
+  if (viewable && gimp_container_have (container, GIMP_OBJECT (viewable)))
+    {
+      gtk_button_clicked (GTK_BUTTON (view->raise_button));
+    }
+}
diff --git a/app/widgets/gimpimageview.h b/app/widgets/gimpimageview.h
new file mode 100644
index 0000000..53e1c88
--- /dev/null
+++ b/app/widgets/gimpimageview.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpimageview.h
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_IMAGE_VIEW_H__
+#define __GIMP_IMAGE_VIEW_H__
+
+
+#include "gimpcontainereditor.h"
+
+
+#define GIMP_TYPE_IMAGE_VIEW            (gimp_image_view_get_type ())
+#define GIMP_IMAGE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_VIEW, GimpImageView))
+#define GIMP_IMAGE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_VIEW, GimpImageViewClass))
+#define GIMP_IS_IMAGE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE_VIEW))
+#define GIMP_IS_IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE_VIEW))
+#define GIMP_IMAGE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_VIEW, GimpImageViewClass))
+
+
+typedef struct _GimpImageViewClass GimpImageViewClass;
+
+struct _GimpImageView
+{
+  GimpContainerEditor  parent_instance;
+
+  GtkWidget           *raise_button;
+  GtkWidget           *new_button;
+  GtkWidget           *delete_button;
+};
+
+struct _GimpImageViewClass
+{
+  GimpContainerEditorClass  parent_class;
+};
+
+
+GType       gimp_image_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_image_view_new      (GimpViewType     view_type,
+                                      GimpContainer   *container,
+                                      GimpContext     *context,
+                                      gint             view_size,
+                                      gint             view_border_width,
+                                      GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_IMAGE_VIEW_H__  */
diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c
new file mode 100644
index 0000000..66bbb4b
--- /dev/null
+++ b/app/widgets/gimpitemtreeview.c
@@ -0,0 +1,1776 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemtreeview.c
+ * Copyright (C) 2001-2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage-undo-push.h"
+#include "core/gimpitem-exclusive.h"
+#include "core/gimpitemundo.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptreehandler.h"
+#include "core/gimpundostack.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimpaction.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpitemtreeview.h"
+#include "gimpmenufactory.h"
+#include "gimpviewrenderer.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  SET_IMAGE,
+  LAST_SIGNAL
+};
+
+
+struct _GimpItemTreeViewPrivate
+{
+  GimpImage       *image;
+
+  GtkWidget       *options_box;
+  GtkSizeGroup    *options_group;
+  GtkWidget       *lock_box;
+
+  GtkWidget       *lock_content_toggle;
+  GtkWidget       *lock_position_toggle;
+
+  GtkWidget       *new_button;
+  GtkWidget       *raise_button;
+  GtkWidget       *lower_button;
+  GtkWidget       *duplicate_button;
+  GtkWidget       *delete_button;
+
+  gint             model_column_visible;
+  gint             model_column_viewable;
+  gint             model_column_linked;
+  gint             model_column_color_tag;
+  GtkCellRenderer *eye_cell;
+  GtkCellRenderer *chain_cell;
+
+  GimpTreeHandler *visible_changed_handler;
+  GimpTreeHandler *linked_changed_handler;
+  GimpTreeHandler *color_tag_changed_handler;
+  GimpTreeHandler *lock_content_changed_handler;
+  GimpTreeHandler *lock_position_changed_handler;
+};
+
+
+static void   gimp_item_tree_view_view_iface_init   (GimpContainerViewInterface *view_iface);
+static void   gimp_item_tree_view_docked_iface_init (GimpDockedInterface *docked_iface);
+
+static void   gimp_item_tree_view_constructed       (GObject           *object);
+static void   gimp_item_tree_view_dispose           (GObject           *object);
+
+static void   gimp_item_tree_view_style_set         (GtkWidget         *widget,
+                                                     GtkStyle          *prev_style);
+
+static void   gimp_item_tree_view_real_set_image    (GimpItemTreeView  *view,
+                                                     GimpImage         *image);
+
+static void   gimp_item_tree_view_image_flush       (GimpImage         *image,
+                                                     gboolean           invalidate_preview,
+                                                     GimpItemTreeView  *view);
+
+static void   gimp_item_tree_view_set_container     (GimpContainerView *view,
+                                                     GimpContainer     *container);
+static void   gimp_item_tree_view_set_context       (GimpContainerView *view,
+                                                     GimpContext       *context);
+
+static gpointer gimp_item_tree_view_insert_item     (GimpContainerView *view,
+                                                     GimpViewable      *viewable,
+                                                     gpointer           parent_insert_data,
+                                                     gint               index);
+static void   gimp_item_tree_view_insert_item_after (GimpContainerView *view,
+                                                     GimpViewable      *viewable,
+                                                     gpointer           insert_data);
+static gboolean gimp_item_tree_view_select_item     (GimpContainerView *view,
+                                                     GimpViewable      *item,
+                                                     gpointer           insert_data);
+static void   gimp_item_tree_view_activate_item     (GimpContainerView *view,
+                                                     GimpViewable      *item,
+                                                     gpointer           insert_data);
+static void   gimp_item_tree_view_context_item      (GimpContainerView *view,
+                                                     GimpViewable      *item,
+                                                     gpointer           insert_data);
+
+static gboolean gimp_item_tree_view_drop_possible   (GimpContainerTreeView *view,
+                                                     GimpDndType        src_type,
+                                                     GimpViewable      *src_viewable,
+                                                     GimpViewable      *dest_viewable,
+                                                     GtkTreePath       *drop_path,
+                                                     GtkTreeViewDropPosition  drop_pos,
+                                                     GtkTreeViewDropPosition *return_drop_pos,
+                                                     GdkDragAction     *return_drag_action);
+static void     gimp_item_tree_view_drop_viewable   (GimpContainerTreeView *view,
+                                                     GimpViewable      *src_viewable,
+                                                     GimpViewable      *dest_viewable,
+                                                     GtkTreeViewDropPosition  drop_pos);
+
+static void   gimp_item_tree_view_new_dropped       (GtkWidget         *widget,
+                                                     gint               x,
+                                                     gint               y,
+                                                     GimpViewable      *viewable,
+                                                     gpointer           data);
+
+static void   gimp_item_tree_view_item_changed      (GimpImage         *image,
+                                                     GimpItemTreeView  *view);
+static void   gimp_item_tree_view_size_changed      (GimpImage         *image,
+                                                     GimpItemTreeView  *view);
+
+static void   gimp_item_tree_view_name_edited       (GtkCellRendererText *cell,
+                                                     const gchar       *path,
+                                                     const gchar       *new_name,
+                                                     GimpItemTreeView  *view);
+
+static void   gimp_item_tree_view_visible_changed      (GimpItem          *item,
+                                                        GimpItemTreeView  *view);
+static void   gimp_item_tree_view_linked_changed       (GimpItem          *item,
+                                                        GimpItemTreeView  *view);
+static void   gimp_item_tree_view_color_tag_changed    (GimpItem          *item,
+                                                        GimpItemTreeView  *view);
+static void   gimp_item_tree_view_lock_content_changed (GimpItem          *item,
+                                                        GimpItemTreeView  *view);
+static void   gimp_item_tree_view_lock_position_changed(GimpItem          *item,
+                                                        GimpItemTreeView  *view);
+
+static void   gimp_item_tree_view_eye_clicked       (GtkCellRendererToggle *toggle,
+                                                     gchar             *path,
+                                                     GdkModifierType    state,
+                                                     GimpItemTreeView  *view);
+static void   gimp_item_tree_view_chain_clicked     (GtkCellRendererToggle *toggle,
+                                                     gchar             *path,
+                                                     GdkModifierType    state,
+                                                     GimpItemTreeView  *view);
+static void   gimp_item_tree_view_lock_content_toggled
+                                                    (GtkWidget         *widget,
+                                                     GimpItemTreeView  *view);
+static void   gimp_item_tree_view_lock_position_toggled
+                                                    (GtkWidget         *widget,
+                                                     GimpItemTreeView  *view);
+static void   gimp_item_tree_view_update_options    (GimpItemTreeView  *view,
+                                                     GimpItem          *item);
+
+static gboolean gimp_item_tree_view_item_pre_clicked(GimpCellRendererViewable *cell,
+                                                     const gchar              *path_str,
+                                                     GdkModifierType           state,
+                                                     GimpItemTreeView         *item_view);
+
+/*  utility function to avoid code duplication  */
+static void   gimp_item_tree_view_toggle_clicked    (GtkCellRendererToggle *toggle,
+                                                     gchar             *path_str,
+                                                     GdkModifierType    state,
+                                                     GimpItemTreeView  *view,
+                                                     GimpUndoType       undo_type);
+
+static void   gimp_item_tree_view_row_expanded      (GtkTreeView       *tree_view,
+                                                     GtkTreeIter       *iter,
+                                                     GtkTreePath       *path,
+                                                     GimpItemTreeView  *item_view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpItemTreeView, gimp_item_tree_view,
+                         GIMP_TYPE_CONTAINER_TREE_VIEW,
+                         G_ADD_PRIVATE (GimpItemTreeView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_item_tree_view_view_iface_init)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_item_tree_view_docked_iface_init))
+
+#define parent_class gimp_item_tree_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_item_tree_view_class_init (GimpItemTreeViewClass *klass)
+{
+  GObjectClass               *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass             *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpContainerTreeViewClass *tree_view_class;
+
+  tree_view_class = GIMP_CONTAINER_TREE_VIEW_CLASS (klass);
+
+  view_signals[SET_IMAGE] =
+    g_signal_new ("set-image",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpItemTreeViewClass, set_image),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_OBJECT);
+
+  object_class->constructed      = gimp_item_tree_view_constructed;
+  object_class->dispose          = gimp_item_tree_view_dispose;
+
+  widget_class->style_set        = gimp_item_tree_view_style_set;
+
+  tree_view_class->drop_possible = gimp_item_tree_view_drop_possible;
+  tree_view_class->drop_viewable = gimp_item_tree_view_drop_viewable;
+
+  klass->set_image               = gimp_item_tree_view_real_set_image;
+
+  klass->item_type               = G_TYPE_NONE;
+  klass->signal_name             = NULL;
+
+  klass->get_container           = NULL;
+  klass->get_active_item         = NULL;
+  klass->set_active_item         = NULL;
+  klass->add_item                = NULL;
+  klass->remove_item             = NULL;
+  klass->new_item                = NULL;
+
+  klass->action_group            = NULL;
+  klass->new_action              = NULL;
+  klass->new_default_action      = NULL;
+  klass->raise_action            = NULL;
+  klass->raise_top_action        = NULL;
+  klass->lower_action            = NULL;
+  klass->lower_bottom_action     = NULL;
+  klass->duplicate_action        = NULL;
+  klass->delete_action           = NULL;
+
+  klass->lock_content_icon_name  = NULL;
+  klass->lock_content_tooltip    = NULL;
+  klass->lock_content_help_id    = NULL;
+
+  klass->lock_position_icon_name  = NULL;
+  klass->lock_position_tooltip    = NULL;
+  klass->lock_position_help_id    = NULL;
+}
+
+static void
+gimp_item_tree_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  iface->set_container     = gimp_item_tree_view_set_container;
+  iface->set_context       = gimp_item_tree_view_set_context;
+  iface->insert_item       = gimp_item_tree_view_insert_item;
+  iface->insert_item_after = gimp_item_tree_view_insert_item_after;
+  iface->select_item       = gimp_item_tree_view_select_item;
+  iface->activate_item     = gimp_item_tree_view_activate_item;
+  iface->context_item      = gimp_item_tree_view_context_item;
+}
+
+static void
+gimp_item_tree_view_docked_iface_init (GimpDockedInterface *iface)
+{
+  iface->get_preview = NULL;
+}
+
+static void
+gimp_item_tree_view_init (GimpItemTreeView *view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  view->priv = gimp_item_tree_view_get_instance_private (view);
+
+  view->priv->model_column_visible =
+    gimp_container_tree_store_columns_add (tree_view->model_columns,
+                                           &tree_view->n_model_columns,
+                                           G_TYPE_BOOLEAN);
+
+  view->priv->model_column_viewable =
+    gimp_container_tree_store_columns_add (tree_view->model_columns,
+                                           &tree_view->n_model_columns,
+                                           G_TYPE_BOOLEAN);
+
+  view->priv->model_column_linked =
+    gimp_container_tree_store_columns_add (tree_view->model_columns,
+                                           &tree_view->n_model_columns,
+                                           G_TYPE_BOOLEAN);
+
+  view->priv->model_column_color_tag =
+    gimp_container_tree_store_columns_add (tree_view->model_columns,
+                                           &tree_view->n_model_columns,
+                                           GDK_TYPE_COLOR);
+
+  gimp_container_tree_view_set_dnd_drop_to_empty (tree_view, TRUE);
+
+  view->priv->image  = NULL;
+}
+
+static void
+gimp_item_tree_view_constructed (GObject *object)
+{
+  GimpItemTreeViewClass *item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (object);
+  GimpEditor            *editor          = GIMP_EDITOR (object);
+  GimpContainerTreeView *tree_view       = GIMP_CONTAINER_TREE_VIEW (object);
+  GimpItemTreeView      *item_view       = GIMP_ITEM_TREE_VIEW (object);
+  GtkTreeViewColumn     *column;
+  GtkWidget             *hbox;
+  GtkWidget             *image;
+  GtkIconSize            icon_size;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gtk_tree_view_set_headers_visible (tree_view->view, TRUE);
+
+  gtk_widget_style_get (GTK_WIDGET (item_view),
+                        "button-icon-size", &icon_size,
+                        NULL);
+
+  gimp_container_tree_view_connect_name_edited (tree_view,
+                                                G_CALLBACK (gimp_item_tree_view_name_edited),
+                                                item_view);
+
+  g_signal_connect (tree_view->view, "row-expanded",
+                    G_CALLBACK (gimp_item_tree_view_row_expanded),
+                    tree_view);
+
+  g_signal_connect (tree_view->renderer_cell, "pre-clicked",
+                    G_CALLBACK (gimp_item_tree_view_item_pre_clicked),
+                    item_view);
+
+  column = gtk_tree_view_column_new ();
+  image = gtk_image_new_from_icon_name (GIMP_ICON_VISIBLE, icon_size);
+  gtk_tree_view_column_set_widget (column, image);
+  gtk_tree_view_column_set_alignment (column, 0.5);
+  gtk_widget_show (image);
+  gtk_tree_view_insert_column (tree_view->view, column, 0);
+
+  item_view->priv->eye_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_VISIBLE);
+  g_object_set (item_view->priv->eye_cell,
+                "xpad",                0,
+                "ypad",                0,
+                "override-background", TRUE,
+                NULL);
+  gtk_tree_view_column_pack_start (column, item_view->priv->eye_cell, FALSE);
+  gtk_tree_view_column_set_attributes (column, item_view->priv->eye_cell,
+                                       "active",
+                                       item_view->priv->model_column_visible,
+                                       "inconsistent",
+                                       item_view->priv->model_column_viewable,
+                                       "cell-background-gdk",
+                                       item_view->priv->model_column_color_tag,
+                                       NULL);
+
+  gimp_container_tree_view_add_toggle_cell (tree_view,
+                                            item_view->priv->eye_cell);
+
+  g_signal_connect (item_view->priv->eye_cell, "clicked",
+                    G_CALLBACK (gimp_item_tree_view_eye_clicked),
+                    item_view);
+
+  column = gtk_tree_view_column_new ();
+  image = gtk_image_new_from_icon_name (GIMP_ICON_LINKED, icon_size);
+  gtk_tree_view_column_set_widget (column, image);
+  gtk_tree_view_column_set_alignment (column, 0.5);
+  gtk_widget_show (image);
+  gtk_tree_view_insert_column (tree_view->view, column, 1);
+
+  item_view->priv->chain_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_LINKED);
+  g_object_set (item_view->priv->chain_cell,
+                "xpad", 0,
+                "ypad", 0,
+                NULL);
+  gtk_tree_view_column_pack_start (column, item_view->priv->chain_cell, FALSE);
+  gtk_tree_view_column_set_attributes (column, item_view->priv->chain_cell,
+                                       "active",
+                                       item_view->priv->model_column_linked,
+                                       NULL);
+
+  gimp_container_tree_view_add_toggle_cell (tree_view,
+                                            item_view->priv->chain_cell);
+
+  g_signal_connect (item_view->priv->chain_cell, "clicked",
+                    G_CALLBACK (gimp_item_tree_view_chain_clicked),
+                    item_view);
+
+  /*  disable the default GimpContainerView drop handler  */
+  gimp_container_view_set_dnd_widget (GIMP_CONTAINER_VIEW (item_view), NULL);
+
+  gimp_dnd_drag_dest_set_by_type (GTK_WIDGET (tree_view->view),
+                                  GTK_DEST_DEFAULT_HIGHLIGHT,
+                                  item_view_class->item_type,
+                                  GDK_ACTION_MOVE | GDK_ACTION_COPY);
+
+  item_view->priv->new_button =
+    gimp_editor_add_action_button (editor, item_view_class->action_group,
+                                   item_view_class->new_action,
+                                   item_view_class->new_default_action,
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+  /*  connect "drop to new" manually as it makes a difference whether
+   *  it was clicked or dropped
+   */
+  gimp_dnd_viewable_dest_add (item_view->priv->new_button,
+                              item_view_class->item_type,
+                              gimp_item_tree_view_new_dropped,
+                              item_view);
+
+  item_view->priv->raise_button =
+    gimp_editor_add_action_button (editor, item_view_class->action_group,
+                                   item_view_class->raise_action,
+                                   item_view_class->raise_top_action,
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+
+  item_view->priv->lower_button =
+    gimp_editor_add_action_button (editor, item_view_class->action_group,
+                                   item_view_class->lower_action,
+                                   item_view_class->lower_bottom_action,
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+
+  item_view->priv->duplicate_button =
+    gimp_editor_add_action_button (editor, item_view_class->action_group,
+                                   item_view_class->duplicate_action, NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (item_view),
+                                  GTK_BUTTON (item_view->priv->duplicate_button),
+                                  item_view_class->item_type);
+
+  item_view->priv->delete_button =
+    gimp_editor_add_action_button (editor, item_view_class->action_group,
+                                   item_view_class->delete_action, NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (item_view),
+                                  GTK_BUTTON (item_view->priv->delete_button),
+                                  item_view_class->item_type);
+
+  hbox = gimp_item_tree_view_get_lock_box (item_view);
+
+  /*  Lock content toggle  */
+  item_view->priv->lock_content_toggle = gtk_toggle_button_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), item_view->priv->lock_content_toggle,
+                      FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (hbox),
+                         item_view->priv->lock_content_toggle, 0);
+  gtk_widget_show (item_view->priv->lock_content_toggle);
+
+  g_signal_connect (item_view->priv->lock_content_toggle, "toggled",
+                    G_CALLBACK (gimp_item_tree_view_lock_content_toggled),
+                    item_view);
+
+  gimp_help_set_help_data (item_view->priv->lock_content_toggle,
+                           item_view_class->lock_content_tooltip,
+                           item_view_class->lock_content_help_id);
+
+  image = gtk_image_new_from_icon_name (item_view_class->lock_content_icon_name,
+                                        icon_size);
+  gtk_container_add (GTK_CONTAINER (item_view->priv->lock_content_toggle),
+                     image);
+  gtk_widget_show (image);
+
+  /*  Lock position toggle  */
+  item_view->priv->lock_position_toggle = gtk_toggle_button_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), item_view->priv->lock_position_toggle,
+                      FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (hbox),
+                         item_view->priv->lock_position_toggle, 1);
+  gtk_widget_show (item_view->priv->lock_position_toggle);
+
+  g_signal_connect (item_view->priv->lock_position_toggle, "toggled",
+                    G_CALLBACK (gimp_item_tree_view_lock_position_toggled),
+                    item_view);
+
+  gimp_help_set_help_data (item_view->priv->lock_position_toggle,
+                           item_view_class->lock_position_tooltip,
+                           item_view_class->lock_position_help_id);
+
+  image = gtk_image_new_from_icon_name (item_view_class->lock_position_icon_name,
+                                        icon_size);
+  gtk_container_add (GTK_CONTAINER (item_view->priv->lock_position_toggle),
+                     image);
+  gtk_widget_show (image);
+}
+
+static void
+gimp_item_tree_view_dispose (GObject *object)
+{
+  GimpItemTreeView *view = GIMP_ITEM_TREE_VIEW (object);
+
+  if (view->priv->image)
+    gimp_item_tree_view_set_image (view, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_item_tree_view_style_set (GtkWidget *widget,
+                               GtkStyle  *prev_style)
+{
+  GimpItemTreeView *view = GIMP_ITEM_TREE_VIEW (widget);
+  GList            *children;
+  GList            *list;
+  GtkReliefStyle    button_relief;
+  GtkIconSize       button_icon_size;
+  gint              content_spacing;
+  gint              button_spacing;
+
+  gtk_widget_style_get (widget,
+                        "button-relief",    &button_relief,
+                        "button-icon-size", &button_icon_size,
+                        "content-spacing",  &content_spacing,
+                        "button-spacing",   &button_spacing,
+                        NULL);
+
+  if (view->priv->options_box)
+    {
+      gtk_box_set_spacing (GTK_BOX (view->priv->options_box), content_spacing);
+
+      children =
+        gtk_container_get_children (GTK_CONTAINER (view->priv->options_box));
+
+      for (list = children; list; list = g_list_next (list))
+        {
+          GtkWidget *child = list->data;
+
+          if (GTK_IS_BOX (child))
+            gtk_box_set_spacing (GTK_BOX (child), button_spacing);
+        }
+
+      g_list_free (children);
+    }
+
+  if (view->priv->lock_box)
+    {
+      gtk_box_set_spacing (GTK_BOX (view->priv->lock_box), button_spacing);
+
+      children =
+        gtk_container_get_children (GTK_CONTAINER (view->priv->lock_box));
+
+      for (list = children; list; list = g_list_next (list))
+        {
+          GtkWidget *child = list->data;
+
+          if (GTK_IS_BUTTON (child))
+            {
+              GtkWidget *image;
+
+              gtk_button_set_relief (GTK_BUTTON (child), button_relief);
+
+              image = gtk_bin_get_child (GTK_BIN (child));
+
+              if (GTK_IS_IMAGE (image))
+                {
+                  GtkIconSize  old_size;
+                  const gchar *icon_name;
+
+                  gtk_image_get_icon_name (GTK_IMAGE (image),
+                                           &icon_name, &old_size);
+
+                  if (button_icon_size != old_size)
+                    gtk_image_set_from_icon_name (GTK_IMAGE (image),
+                                                  icon_name, button_icon_size);
+                }
+            }
+        }
+
+      g_list_free (children);
+    }
+
+  /* force the toggle cells to recreate their icon */
+  g_object_set (view->priv->eye_cell,
+                "icon-name", GIMP_ICON_VISIBLE,
+                NULL);
+  g_object_set (view->priv->chain_cell,
+                "icon-name", GIMP_ICON_LINKED,
+                NULL);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+}
+
+GtkWidget *
+gimp_item_tree_view_new (GType            view_type,
+                         gint             view_size,
+                         gint             view_border_width,
+                         GimpImage       *image,
+                         GimpMenuFactory *menu_factory,
+                         const gchar     *menu_identifier,
+                         const gchar     *ui_path)
+{
+  GimpItemTreeView *item_view;
+
+  g_return_val_if_fail (g_type_is_a (view_type, GIMP_TYPE_ITEM_TREE_VIEW), NULL);
+  g_return_val_if_fail (view_size >  0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (menu_identifier != NULL, NULL);
+  g_return_val_if_fail (ui_path != NULL, NULL);
+
+  item_view = g_object_new (view_type,
+                            "reorderable",     TRUE,
+                            "menu-factory",    menu_factory,
+                            "menu-identifier", menu_identifier,
+                            "ui-path",         ui_path,
+                            NULL);
+
+  gimp_container_view_set_view_size (GIMP_CONTAINER_VIEW (item_view),
+                                     view_size, view_border_width);
+
+  gimp_item_tree_view_set_image (item_view, image);
+
+  return GTK_WIDGET (item_view);
+}
+
+void
+gimp_item_tree_view_set_image (GimpItemTreeView *view,
+                               GimpImage        *image)
+{
+  g_return_if_fail (GIMP_IS_ITEM_TREE_VIEW (view));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  g_signal_emit (view, view_signals[SET_IMAGE], 0, image);
+
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (view)), view);
+}
+
+GimpImage *
+gimp_item_tree_view_get_image (GimpItemTreeView *view)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
+
+  return view->priv->image;
+}
+
+void
+gimp_item_tree_view_add_options (GimpItemTreeView *view,
+                                 const gchar      *label,
+                                 GtkWidget        *options)
+{
+  gint content_spacing;
+  gint button_spacing;
+
+  g_return_if_fail (GIMP_IS_ITEM_TREE_VIEW (view));
+  g_return_if_fail (GTK_IS_WIDGET (options));
+
+  gtk_widget_style_get (GTK_WIDGET (view),
+                        "content-spacing", &content_spacing,
+                        "button-spacing",  &button_spacing,
+                        NULL);
+
+  if (! view->priv->options_box)
+    {
+      GimpItemTreeViewClass *item_view_class;
+
+      item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (view);
+
+      view->priv->options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, content_spacing);
+      gtk_box_pack_start (GTK_BOX (view), view->priv->options_box,
+                          FALSE, FALSE, 0);
+      gtk_box_reorder_child (GTK_BOX (view), view->priv->options_box, 0);
+      gtk_widget_show (view->priv->options_box);
+
+      if (! view->priv->image ||
+          ! item_view_class->get_active_item (view->priv->image))
+        {
+          gtk_widget_set_sensitive (view->priv->options_box, FALSE);
+        }
+    }
+
+  if (label)
+    {
+      GtkWidget *hbox;
+      GtkWidget *label_widget;
+      gboolean   group_created = FALSE;
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, button_spacing);
+      gtk_box_pack_start (GTK_BOX (view->priv->options_box), hbox,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      if (! view->priv->options_group)
+        {
+          view->priv->options_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+          group_created = TRUE;
+        }
+
+      label_widget = gtk_label_new (label);
+      gtk_label_set_xalign (GTK_LABEL (label_widget), 0.0);
+      gtk_size_group_add_widget (view->priv->options_group, label_widget);
+      gtk_box_pack_start (GTK_BOX (hbox), label_widget, FALSE, FALSE, 0);
+      gtk_widget_show (label_widget);
+
+      if (group_created)
+        g_object_unref (view->priv->options_group);
+
+      gtk_box_pack_start (GTK_BOX (hbox), options, TRUE, TRUE, 0);
+      gtk_widget_show (options);
+    }
+  else
+    {
+      gtk_box_pack_start (GTK_BOX (view->priv->options_box), options,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (options);
+    }
+}
+
+GtkWidget *
+gimp_item_tree_view_get_lock_box (GimpItemTreeView *view)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
+
+  if (! view->priv->lock_box)
+    {
+      gint button_spacing;
+
+      gtk_widget_style_get (GTK_WIDGET (view),
+                            "button-spacing", &button_spacing,
+                            NULL);
+
+      view->priv->lock_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, button_spacing);
+
+      gimp_item_tree_view_add_options (view, _("Lock:"), view->priv->lock_box);
+
+      gtk_box_set_child_packing (GTK_BOX (view->priv->options_box),
+                                 gtk_widget_get_parent (view->priv->lock_box),
+                                 FALSE, FALSE, 0, GTK_PACK_END);
+    }
+
+  return view->priv->lock_box;
+}
+
+GtkWidget *
+gimp_item_tree_view_get_new_button (GimpItemTreeView *view)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
+
+  return view->priv->new_button;
+}
+
+GtkWidget *
+gimp_item_tree_view_get_delete_button (GimpItemTreeView *view)
+{
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
+
+  return view->priv->delete_button;
+}
+
+gint
+gimp_item_tree_view_get_drop_index (GimpItemTreeView         *view,
+                                    GimpViewable             *dest_viewable,
+                                    GtkTreeViewDropPosition   drop_pos,
+                                    GimpViewable            **parent)
+{
+  gint index = -1;
+
+  g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), -1);
+  g_return_val_if_fail (dest_viewable == NULL ||
+                        GIMP_IS_VIEWABLE (dest_viewable), -1);
+  g_return_val_if_fail (parent != NULL, -1);
+
+  *parent = NULL;
+
+  if (dest_viewable)
+    {
+      *parent = gimp_viewable_get_parent (dest_viewable);
+      index   = gimp_item_get_index (GIMP_ITEM (dest_viewable));
+
+      if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+        {
+          GimpContainer *children = gimp_viewable_get_children (dest_viewable);
+
+          if (children)
+            {
+              *parent = dest_viewable;
+              index   = 0;
+            }
+          else
+            {
+              index++;
+            }
+        }
+      else if (drop_pos == GTK_TREE_VIEW_DROP_AFTER)
+        {
+          index++;
+        }
+    }
+
+  return index;
+}
+
+static void
+gimp_item_tree_view_real_set_image (GimpItemTreeView *view,
+                                    GimpImage        *image)
+{
+  if (view->priv->image == image)
+    return;
+
+  if (view->priv->image)
+    {
+      g_signal_handlers_disconnect_by_func (view->priv->image,
+                                            gimp_item_tree_view_item_changed,
+                                            view);
+      g_signal_handlers_disconnect_by_func (view->priv->image,
+                                            gimp_item_tree_view_size_changed,
+                                            view);
+
+      gimp_container_view_set_container (GIMP_CONTAINER_VIEW (view), NULL);
+
+      g_signal_handlers_disconnect_by_func (view->priv->image,
+                                            gimp_item_tree_view_image_flush,
+                                            view);
+    }
+
+  view->priv->image = image;
+
+  if (view->priv->image)
+    {
+      GimpContainer *container;
+
+      container =
+        GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_container (view->priv->image);
+
+      gimp_container_view_set_container (GIMP_CONTAINER_VIEW (view), container);
+
+      g_signal_connect (view->priv->image,
+                        GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->signal_name,
+                        G_CALLBACK (gimp_item_tree_view_item_changed),
+                        view);
+      g_signal_connect (view->priv->image, "size-changed",
+                        G_CALLBACK (gimp_item_tree_view_size_changed),
+                        view);
+
+      g_signal_connect (view->priv->image, "flush",
+                        G_CALLBACK (gimp_item_tree_view_image_flush),
+                        view);
+
+      gimp_item_tree_view_item_changed (view->priv->image, view);
+    }
+}
+
+static void
+gimp_item_tree_view_image_flush (GimpImage        *image,
+                                 gboolean          invalidate_preview,
+                                 GimpItemTreeView *view)
+{
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (view)), view);
+}
+
+
+/*  GimpContainerView methods  */
+
+static void
+gimp_item_tree_view_set_container (GimpContainerView *view,
+                                   GimpContainer     *container)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpContainer    *old_container;
+
+  old_container = gimp_container_view_get_container (view);
+
+  if (old_container)
+    {
+      gimp_tree_handler_disconnect (item_view->priv->visible_changed_handler);
+      item_view->priv->visible_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (item_view->priv->linked_changed_handler);
+      item_view->priv->linked_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (item_view->priv->color_tag_changed_handler);
+      item_view->priv->color_tag_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (item_view->priv->lock_content_changed_handler);
+      item_view->priv->lock_content_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (item_view->priv->lock_position_changed_handler);
+      item_view->priv->lock_position_changed_handler = NULL;
+    }
+
+  parent_view_iface->set_container (view, container);
+
+  if (container)
+    {
+      item_view->priv->visible_changed_handler =
+        gimp_tree_handler_connect (container, "visibility-changed",
+                                   G_CALLBACK (gimp_item_tree_view_visible_changed),
+                                   view);
+
+      item_view->priv->linked_changed_handler =
+        gimp_tree_handler_connect (container, "linked-changed",
+                                   G_CALLBACK (gimp_item_tree_view_linked_changed),
+                                   view);
+
+      item_view->priv->color_tag_changed_handler =
+        gimp_tree_handler_connect (container, "color-tag-changed",
+                                   G_CALLBACK (gimp_item_tree_view_color_tag_changed),
+                                   view);
+
+      item_view->priv->lock_content_changed_handler =
+        gimp_tree_handler_connect (container, "lock-content-changed",
+                                   G_CALLBACK (gimp_item_tree_view_lock_content_changed),
+                                   view);
+
+      item_view->priv->lock_position_changed_handler =
+        gimp_tree_handler_connect (container, "lock-position-changed",
+                                   G_CALLBACK (gimp_item_tree_view_lock_position_changed),
+                                   view);
+    }
+}
+
+static void
+gimp_item_tree_view_set_context (GimpContainerView *view,
+                                 GimpContext       *context)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GimpItemTreeView      *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpImage             *image     = NULL;
+  GimpContext           *old_context;
+
+  old_context = gimp_container_view_get_context (view);
+
+  if (old_context)
+    {
+      g_signal_handlers_disconnect_by_func (old_context,
+                                            gimp_item_tree_view_set_image,
+                                            item_view);
+    }
+
+  parent_view_iface->set_context (view, context);
+
+  if (context)
+    {
+      if (! tree_view->dnd_gimp)
+        tree_view->dnd_gimp = context->gimp;
+
+      g_signal_connect_swapped (context, "image-changed",
+                                G_CALLBACK (gimp_item_tree_view_set_image),
+                                item_view);
+
+      image = gimp_context_get_image (context);
+    }
+
+  gimp_item_tree_view_set_image (item_view, image);
+}
+
+static gpointer
+gimp_item_tree_view_insert_item (GimpContainerView *view,
+                                 GimpViewable      *viewable,
+                                 gpointer           parent_insert_data,
+                                 gint               index)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GimpItemTreeView      *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpItem              *item      = GIMP_ITEM (viewable);
+  GtkTreeIter           *iter;
+  GimpRGB                color;
+  GdkColor               gdk_color;
+  gboolean               has_color;
+
+  iter = parent_view_iface->insert_item (view, viewable,
+                                         parent_insert_data, index);
+
+  has_color = gimp_get_color_tag_color (gimp_item_get_merged_color_tag (item),
+                                        &color,
+                                        gimp_item_get_color_tag (item) ==
+                                        GIMP_COLOR_TAG_NONE);
+  if (has_color)
+    gimp_rgb_get_gdk_color (&color, &gdk_color);
+
+  gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                      item_view->priv->model_column_visible,
+                      gimp_item_get_visible (item),
+                      item_view->priv->model_column_viewable,
+                      gimp_item_get_visible (item) &&
+                      ! gimp_item_is_visible (item),
+                      item_view->priv->model_column_linked,
+                      gimp_item_get_linked (item),
+                      item_view->priv->model_column_color_tag,
+                      has_color ? &gdk_color : NULL,
+                      -1);
+
+  return iter;
+}
+
+static void
+gimp_item_tree_view_insert_item_after (GimpContainerView *view,
+                                       GimpViewable      *viewable,
+                                       gpointer           insert_data)
+{
+  GimpItemTreeView      *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpItemTreeViewClass *item_view_class;
+  GimpItem              *active_item;
+
+  item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
+
+  active_item = item_view_class->get_active_item (item_view->priv->image);
+
+  if (active_item == (GimpItem *) viewable)
+    gimp_container_view_select_item (view, viewable);
+}
+
+static gboolean
+gimp_item_tree_view_select_item (GimpContainerView *view,
+                                 GimpViewable      *item,
+                                 gpointer           insert_data)
+{
+  GimpItemTreeView *tree_view         = GIMP_ITEM_TREE_VIEW (view);
+  gboolean          options_sensitive = FALSE;
+  gboolean          success;
+
+  success = parent_view_iface->select_item (view, item, insert_data);
+
+  if (item)
+    {
+      GimpItemTreeViewClass *item_view_class;
+      GimpItem              *active_item;
+
+      item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (tree_view);
+
+      active_item = item_view_class->get_active_item (tree_view->priv->image);
+
+      if (active_item != (GimpItem *) item)
+        {
+          item_view_class->set_active_item (tree_view->priv->image,
+                                            GIMP_ITEM (item));
+
+          gimp_image_flush (tree_view->priv->image);
+        }
+
+      options_sensitive = TRUE;
+
+      gimp_item_tree_view_update_options (tree_view, GIMP_ITEM (item));
+    }
+
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (tree_view)), tree_view);
+
+  if (tree_view->priv->options_box)
+    gtk_widget_set_sensitive (tree_view->priv->options_box, options_sensitive);
+
+  return success;
+}
+
+static void
+gimp_item_tree_view_activate_item (GimpContainerView *view,
+                                   GimpViewable      *item,
+                                   gpointer           insert_data)
+{
+  GimpItemTreeViewClass *item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (view);
+
+  if (parent_view_iface->activate_item)
+    parent_view_iface->activate_item (view, item, insert_data);
+
+  if (item_view_class->activate_action)
+    {
+      gimp_ui_manager_activate_action (gimp_editor_get_ui_manager (GIMP_EDITOR (view)),
+                                       item_view_class->action_group,
+                                       item_view_class->activate_action);
+    }
+}
+
+static void
+gimp_item_tree_view_context_item (GimpContainerView *view,
+                                  GimpViewable      *item,
+                                  gpointer           insert_data)
+{
+  if (parent_view_iface->context_item)
+    parent_view_iface->context_item (view, item, insert_data);
+
+  gimp_editor_popup_menu (GIMP_EDITOR (view), NULL, NULL);
+}
+
+static gboolean
+gimp_item_tree_view_drop_possible (GimpContainerTreeView   *tree_view,
+                                   GimpDndType              src_type,
+                                   GimpViewable            *src_viewable,
+                                   GimpViewable            *dest_viewable,
+                                   GtkTreePath             *drop_path,
+                                   GtkTreeViewDropPosition  drop_pos,
+                                   GtkTreeViewDropPosition *return_drop_pos,
+                                   GdkDragAction           *return_drag_action)
+{
+  if (GIMP_IS_ITEM (src_viewable) &&
+      (dest_viewable == NULL ||
+       gimp_item_get_image (GIMP_ITEM (src_viewable)) !=
+       gimp_item_get_image (GIMP_ITEM (dest_viewable))))
+    {
+      if (return_drop_pos)
+        *return_drop_pos = drop_pos;
+
+      if (return_drag_action)
+        *return_drag_action = GDK_ACTION_COPY;
+
+      return TRUE;
+    }
+
+  return GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_possible (tree_view,
+                                                                       src_type,
+                                                                       src_viewable,
+                                                                       dest_viewable,
+                                                                       drop_path,
+                                                                       drop_pos,
+                                                                       return_drop_pos,
+                                                                       return_drag_action);
+}
+
+static void
+gimp_item_tree_view_drop_viewable (GimpContainerTreeView   *tree_view,
+                                   GimpViewable            *src_viewable,
+                                   GimpViewable            *dest_viewable,
+                                   GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeViewClass *item_view_class;
+  GimpItemTreeView      *item_view  = GIMP_ITEM_TREE_VIEW (tree_view);
+  gint                   dest_index = -1;
+
+  item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
+
+  if (item_view->priv->image != gimp_item_get_image (GIMP_ITEM (src_viewable)) ||
+      ! g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable),
+                     item_view_class->item_type))
+    {
+      GType     item_type = item_view_class->item_type;
+      GimpItem *new_item;
+      GimpItem *parent;
+
+      if (g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable), item_type))
+        item_type = G_TYPE_FROM_INSTANCE (src_viewable);
+
+      dest_index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                                       drop_pos,
+                                                       (GimpViewable **) &parent);
+
+      new_item = gimp_item_convert (GIMP_ITEM (src_viewable),
+                                    item_view->priv->image, item_type);
+
+      gimp_item_set_linked (new_item, FALSE, FALSE);
+
+      item_view_class->add_item (item_view->priv->image, new_item,
+                                 parent, dest_index, TRUE);
+    }
+  else if (dest_viewable)
+    {
+      GimpItem *src_parent;
+      GimpItem *dest_parent;
+      gint      src_index;
+      gint      dest_index;
+
+      src_parent = GIMP_ITEM (gimp_viewable_get_parent (src_viewable));
+      src_index  = gimp_item_get_index (GIMP_ITEM (src_viewable));
+
+      dest_index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                                       drop_pos,
+                                                       (GimpViewable **) &dest_parent);
+
+      if (src_parent == dest_parent)
+        {
+          if (src_index < dest_index)
+            dest_index--;
+        }
+
+      gimp_image_reorder_item (item_view->priv->image,
+                               GIMP_ITEM (src_viewable),
+                               dest_parent,
+                               dest_index,
+                               TRUE, NULL);
+    }
+
+  gimp_image_flush (item_view->priv->image);
+}
+
+
+/*  "New" functions  */
+
+static void
+gimp_item_tree_view_new_dropped (GtkWidget    *widget,
+                                 gint          x,
+                                 gint          y,
+                                 GimpViewable *viewable,
+                                 gpointer      data)
+{
+  GimpItemTreeViewClass *item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (data);
+  GimpContainerView     *view            = GIMP_CONTAINER_VIEW (data);
+
+  if (item_view_class->new_default_action &&
+      viewable && gimp_container_view_lookup (view, viewable))
+    {
+      GimpAction *action;
+
+      action = gimp_ui_manager_find_action (gimp_editor_get_ui_manager (GIMP_EDITOR (view)),
+                                            item_view_class->action_group,
+                                            item_view_class->new_default_action);
+
+      if (action)
+        {
+          g_object_set (action, "viewable", viewable, NULL);
+          gimp_action_activate (action);
+          g_object_set (action, "viewable", NULL, NULL);
+        }
+    }
+}
+
+
+/*  GimpImage callbacks  */
+
+static void
+gimp_item_tree_view_item_changed (GimpImage        *image,
+                                  GimpItemTreeView *view)
+{
+  GimpItem *item;
+
+  item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (view->priv->image);
+
+  gimp_container_view_select_item (GIMP_CONTAINER_VIEW (view),
+                                   (GimpViewable *) item);
+}
+
+static void
+gimp_item_tree_view_size_changed (GimpImage        *image,
+                                  GimpItemTreeView *tree_view)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (tree_view);
+  gint               view_size;
+  gint               border_width;
+
+  view_size = gimp_container_view_get_view_size (view, &border_width);
+
+  gimp_container_view_set_view_size (view, view_size, border_width);
+}
+
+static void
+gimp_item_tree_view_name_edited (GtkCellRendererText *cell,
+                                 const gchar         *path_str,
+                                 const gchar         *new_name,
+                                 GimpItemTreeView    *view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreePath           *path;
+  GtkTreeIter            iter;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpItem         *item;
+      const gchar      *old_name;
+      GError           *error = NULL;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      item = GIMP_ITEM (renderer->viewable);
+
+      old_name = gimp_object_get_name (item);
+
+      if (! old_name) old_name = "";
+      if (! new_name) new_name = "";
+
+      if (strcmp (old_name, new_name) &&
+          gimp_item_rename (item, new_name, &error))
+        {
+          gimp_image_flush (gimp_item_get_image (item));
+        }
+      else
+        {
+          gchar *name = gimp_viewable_get_description (renderer->viewable, NULL);
+
+          gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, name,
+                              -1);
+          g_free (name);
+
+          if (error)
+            {
+              gimp_message_literal (view->priv->image->gimp, G_OBJECT (view),
+                                    GIMP_MESSAGE_WARNING,
+                                    error->message);
+              g_clear_error (&error);
+            }
+        }
+
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+
+/*  "Visible" callbacks  */
+
+static void
+gimp_item_tree_view_visible_changed (GimpItem         *item,
+                                     GimpItemTreeView *view)
+{
+  GimpContainerView     *container_view = GIMP_CONTAINER_VIEW (view);
+  GimpContainerTreeView *tree_view      = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter;
+
+  iter = gimp_container_view_lookup (container_view,
+                                     (GimpViewable *) item);
+
+  if (iter)
+    {
+      GimpContainer *children;
+
+      gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                          view->priv->model_column_visible,
+                          gimp_item_get_visible (item),
+                          view->priv->model_column_viewable,
+                          gimp_item_get_visible (item) &&
+                          ! gimp_item_is_visible (item),
+                          -1);
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+      if (children)
+        gimp_container_foreach (children,
+                                (GFunc) gimp_item_tree_view_visible_changed,
+                                view);
+    }
+}
+
+static void
+gimp_item_tree_view_eye_clicked (GtkCellRendererToggle *toggle,
+                                 gchar                 *path_str,
+                                 GdkModifierType        state,
+                                 GimpItemTreeView      *view)
+{
+  gimp_item_tree_view_toggle_clicked (toggle, path_str, state, view,
+                                      GIMP_UNDO_ITEM_VISIBILITY);
+}
+
+
+/*  "Linked" callbacks  */
+
+static void
+gimp_item_tree_view_linked_changed (GimpItem         *item,
+                                    GimpItemTreeView *view)
+{
+  GimpContainerView     *container_view = GIMP_CONTAINER_VIEW (view);
+  GimpContainerTreeView *tree_view      = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter;
+
+  iter = gimp_container_view_lookup (container_view,
+                                     (GimpViewable *) item);
+
+  if (iter)
+    gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                        view->priv->model_column_linked,
+                        gimp_item_get_linked (item),
+                        -1);
+}
+
+static void
+gimp_item_tree_view_chain_clicked (GtkCellRendererToggle *toggle,
+                                   gchar                 *path_str,
+                                   GdkModifierType        state,
+                                   GimpItemTreeView      *view)
+{
+  gimp_item_tree_view_toggle_clicked (toggle, path_str, state, view,
+                                      GIMP_UNDO_ITEM_LINKED);
+}
+
+
+/*  "Color Tag" callbacks  */
+
+static void
+gimp_item_tree_view_color_tag_changed (GimpItem         *item,
+                                       GimpItemTreeView *view)
+{
+  GimpContainerView     *container_view = GIMP_CONTAINER_VIEW (view);
+  GimpContainerTreeView *tree_view      = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreeIter           *iter;
+
+  iter = gimp_container_view_lookup (container_view,
+                                     (GimpViewable *) item);
+
+  if (iter)
+    {
+      GimpContainer *children;
+      GimpRGB        color;
+      GdkColor       gdk_color;
+      gboolean       has_color;
+
+      has_color = gimp_get_color_tag_color (gimp_item_get_merged_color_tag (item),
+                                            &color,
+                                            gimp_item_get_color_tag (item) ==
+                                            GIMP_COLOR_TAG_NONE);
+      if (has_color)
+        gimp_rgb_get_gdk_color (&color, &gdk_color);
+
+      gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                          view->priv->model_column_color_tag,
+                          has_color ? &gdk_color : NULL,
+                          -1);
+
+      children = gimp_viewable_get_children (GIMP_VIEWABLE (item));
+
+      if (children)
+        gimp_container_foreach (children,
+                                (GFunc) gimp_item_tree_view_color_tag_changed,
+                                view);
+    }
+}
+
+
+/*  "Lock Content" callbacks  */
+
+static void
+gimp_item_tree_view_lock_content_changed (GimpItem         *item,
+                                          GimpItemTreeView *view)
+{
+  GimpImage *image = view->priv->image;
+  GimpItem  *active_item;
+
+  active_item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (active_item == item)
+    gimp_item_tree_view_update_options (view, item);
+}
+
+static void
+gimp_item_tree_view_lock_content_toggled (GtkWidget         *widget,
+                                          GimpItemTreeView  *view)
+{
+  GimpImage *image = view->priv->image;
+  GimpItem  *item;
+
+  item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (item)
+    {
+      gboolean lock_content;
+
+      lock_content = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+      if (gimp_item_get_lock_content (item) != lock_content)
+        {
+#if 0
+          GimpUndo *undo;
+#endif
+          gboolean  push_undo = TRUE;
+
+#if 0
+          /*  compress lock content undos  */
+          undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                               GIMP_UNDO_ITEM_LOCK_CONTENT);
+
+          if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+            push_undo = FALSE;
+#endif
+
+          g_signal_handlers_block_by_func (item,
+                                           gimp_item_tree_view_lock_content_changed,
+                                           view);
+
+          gimp_item_set_lock_content (item, lock_content, push_undo);
+
+          g_signal_handlers_unblock_by_func (item,
+                                             gimp_item_tree_view_lock_content_changed,
+                                             view);
+
+          gimp_image_flush (image);
+        }
+    }
+}
+
+static void
+gimp_item_tree_view_lock_position_changed (GimpItem         *item,
+                                           GimpItemTreeView *view)
+{
+  GimpImage *image = view->priv->image;
+  GimpItem  *active_item;
+
+  active_item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (active_item == item)
+    gimp_item_tree_view_update_options (view, item);
+}
+
+static void
+gimp_item_tree_view_lock_position_toggled (GtkWidget         *widget,
+                                           GimpItemTreeView  *view)
+{
+  GimpImage *image = view->priv->image;
+  GimpItem  *item;
+
+  item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (item)
+    {
+      gboolean lock_position;
+
+      lock_position = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+      if (gimp_item_get_lock_position (item) != lock_position)
+        {
+          GimpUndo *undo;
+          gboolean  push_undo = TRUE;
+
+          /*  compress lock position undos  */
+          undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                               GIMP_UNDO_ITEM_LOCK_POSITION);
+
+          if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+            push_undo = FALSE;
+
+          g_signal_handlers_block_by_func (item,
+                                           gimp_item_tree_view_lock_position_changed,
+                                           view);
+
+          gimp_item_set_lock_position (item, lock_position, push_undo);
+
+          g_signal_handlers_unblock_by_func (item,
+                                             gimp_item_tree_view_lock_position_changed,
+                                             view);
+
+          gimp_image_flush (image);
+        }
+    }
+}
+
+static gboolean
+gimp_item_tree_view_item_pre_clicked (GimpCellRendererViewable *cell,
+                                      const gchar              *path_str,
+                                      GdkModifierType           state,
+                                      GimpItemTreeView         *item_view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (item_view);
+  GtkTreePath           *path;
+  GtkTreeIter            iter;
+  gboolean               handled = FALSE;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path) &&
+      (state & GDK_MOD1_MASK))
+    {
+      GimpImage        *image    = gimp_item_tree_view_get_image (item_view);
+      GimpViewRenderer *renderer = NULL;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      if (renderer)
+        {
+          GimpItem       *item = GIMP_ITEM (renderer->viewable);
+          GimpChannelOps  op   = gimp_modifiers_to_channel_op (state);
+
+          gimp_item_to_selection (item, op,
+                                  TRUE, FALSE, 0.0, 0.0);
+          gimp_image_flush (image);
+
+          g_object_unref (renderer);
+
+          /* Don't select the clicked layer */
+          handled = TRUE;
+        }
+    }
+
+  gtk_tree_path_free (path);
+
+  return handled;
+}
+
+static void
+gimp_item_tree_view_update_options (GimpItemTreeView *view,
+                                    GimpItem         *item)
+{
+  if (gimp_item_get_lock_content (item) !=
+      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->lock_content_toggle)))
+    {
+      g_signal_handlers_block_by_func (view->priv->lock_content_toggle,
+                                       gimp_item_tree_view_lock_content_toggled,
+                                       view);
+
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->lock_content_toggle),
+                                    gimp_item_get_lock_content (item));
+
+      g_signal_handlers_unblock_by_func (view->priv->lock_content_toggle,
+                                         gimp_item_tree_view_lock_content_toggled,
+                                         view);
+    }
+
+  if (gimp_item_get_lock_position (item) !=
+      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->lock_position_toggle)))
+    {
+      g_signal_handlers_block_by_func (view->priv->lock_position_toggle,
+                                       gimp_item_tree_view_lock_position_toggled,
+                                       view);
+
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->lock_position_toggle),
+                                    gimp_item_get_lock_position (item));
+
+      g_signal_handlers_unblock_by_func (view->priv->lock_position_toggle,
+                                         gimp_item_tree_view_lock_position_toggled,
+                                         view);
+    }
+
+  gtk_widget_set_sensitive (view->priv->lock_content_toggle,
+                            gimp_item_can_lock_content (item));
+
+  gtk_widget_set_sensitive (view->priv->lock_position_toggle,
+                            gimp_item_can_lock_position (item));
+}
+
+
+/*  Utility functions used from eye_clicked and chain_clicked.
+ *  Would make sense to do this in a generic fashion using
+ *  properties, but for now it's better than duplicating the code.
+ */
+static void
+gimp_item_tree_view_toggle_clicked (GtkCellRendererToggle *toggle,
+                                    gchar                 *path_str,
+                                    GdkModifierType        state,
+                                    GimpItemTreeView      *view,
+                                    GimpUndoType           undo_type)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkTreePath           *path;
+  GtkTreeIter            iter;
+
+  void (* setter)    (GimpItem    *item,
+                      gboolean     value,
+                      gboolean     push_undo);
+  void (* exclusive) (GimpItem    *item,
+                      GimpContext *context);
+
+  switch (undo_type)
+    {
+    case GIMP_UNDO_ITEM_VISIBILITY:
+      setter     = gimp_item_set_visible;
+      exclusive  = gimp_item_toggle_exclusive_visible;
+      break;
+
+    case GIMP_UNDO_ITEM_LINKED:
+      setter     = gimp_item_set_linked;
+      exclusive  = gimp_item_toggle_exclusive_linked;
+      break;
+
+    default:
+      return;
+    }
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpContext      *context;
+      GimpViewRenderer *renderer;
+      GimpItem         *item;
+      GimpImage        *image;
+      gboolean          active;
+
+      context = gimp_container_view_get_context (GIMP_CONTAINER_VIEW (view));
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+      g_object_get (toggle,
+                    "active", &active,
+                    NULL);
+
+      item = GIMP_ITEM (renderer->viewable);
+      g_object_unref (renderer);
+
+      image = gimp_item_get_image (item);
+
+      if ((state & GDK_SHIFT_MASK) && exclusive)
+        {
+          exclusive (item, context);
+        }
+      else
+        {
+          GimpUndo *undo;
+          gboolean  push_undo = TRUE;
+
+          undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                               undo_type);
+
+          if (undo && GIMP_ITEM_UNDO (undo)->item == item)
+            push_undo = FALSE;
+
+          setter (item, ! active, push_undo);
+
+          if (!push_undo)
+            gimp_undo_refresh_preview (undo, context);
+        }
+
+      gimp_image_flush (image);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+
+/*  GtkTreeView callbacks  */
+
+static void
+gimp_item_tree_view_row_expanded (GtkTreeView      *tree_view,
+                                  GtkTreeIter      *iter,
+                                  GtkTreePath      *path,
+                                  GimpItemTreeView *item_view)
+{
+  GimpItemTreeViewClass *item_view_class;
+  GimpItem              *active_item;
+
+  item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
+  active_item = item_view_class->get_active_item (item_view->priv->image);
+
+  /*  don't select the item while it is being inserted  */
+  if (active_item &&
+      gimp_container_view_lookup (GIMP_CONTAINER_VIEW (item_view),
+                                  GIMP_VIEWABLE (active_item)))
+    {
+      GimpViewRenderer *renderer;
+      GimpItem         *expanded_item;
+
+      gtk_tree_model_get (GIMP_CONTAINER_TREE_VIEW (item_view)->model, iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+      expanded_item = GIMP_ITEM (renderer->viewable);
+      g_object_unref (renderer);
+
+      /*  select the active item only if it was made visible by expanding
+       *  its immediate parent. See bug #666561.
+       */
+      if (gimp_item_get_parent (active_item) == expanded_item)
+        {
+          gimp_container_view_select_item (GIMP_CONTAINER_VIEW (item_view),
+                                           GIMP_VIEWABLE (active_item));
+        }
+    }
+}
diff --git a/app/widgets/gimpitemtreeview.h b/app/widgets/gimpitemtreeview.h
new file mode 100644
index 0000000..891eca9
--- /dev/null
+++ b/app/widgets/gimpitemtreeview.h
@@ -0,0 +1,133 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemtreeview.h
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_TREE_VIEW_H__
+#define __GIMP_ITEM_TREE_VIEW_H__
+
+
+#include "gimpcontainertreeview.h"
+
+
+typedef GimpContainer * (* GimpGetContainerFunc) (GimpImage *image);
+typedef GimpItem      * (* GimpGetItemFunc)      (GimpImage *image);
+typedef void            (* GimpSetItemFunc)      (GimpImage *image,
+                                                  GimpItem  *item);
+typedef void            (* GimpAddItemFunc)      (GimpImage *image,
+                                                  GimpItem  *item,
+                                                  GimpItem  *parent,
+                                                  gint       index,
+                                                  gboolean   push_undo);
+typedef void            (* GimpRemoveItemFunc)   (GimpImage *image,
+                                                  GimpItem  *item,
+                                                  gboolean   push_undo,
+                                                  GimpItem  *new_active);
+typedef GimpItem      * (* GimpNewItemFunc)      (GimpImage *image);
+
+
+#define GIMP_TYPE_ITEM_TREE_VIEW            (gimp_item_tree_view_get_type ())
+#define GIMP_ITEM_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM_TREE_VIEW, GimpItemTreeView))
+#define GIMP_ITEM_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM_TREE_VIEW, GimpItemTreeViewClass))
+#define GIMP_IS_ITEM_TREE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM_TREE_VIEW))
+#define GIMP_IS_ITEM_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM_TREE_VIEW))
+#define GIMP_ITEM_TREE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ITEM_TREE_VIEW, GimpItemTreeViewClass))
+
+
+typedef struct _GimpItemTreeViewClass   GimpItemTreeViewClass;
+typedef struct _GimpItemTreeViewPrivate GimpItemTreeViewPrivate;
+
+struct _GimpItemTreeView
+{
+  GimpContainerTreeView    parent_instance;
+
+  GimpItemTreeViewPrivate *priv;
+};
+
+struct _GimpItemTreeViewClass
+{
+  GimpContainerTreeViewClass  parent_class;
+
+  /*  signals  */
+  void (* set_image) (GimpItemTreeView *view,
+                      GimpImage        *image);
+
+  GType                 item_type;
+  const gchar          *signal_name;
+
+  /*  virtual functions for manipulating the image's item tree  */
+  GimpGetContainerFunc  get_container;
+  GimpGetItemFunc       get_active_item;
+  GimpSetItemFunc       set_active_item;
+  GimpAddItemFunc       add_item;
+  GimpRemoveItemFunc    remove_item;
+  GimpNewItemFunc       new_item;
+
+  /*  action names  */
+  const gchar          *action_group;
+  const gchar          *activate_action;
+  const gchar          *new_action;
+  const gchar          *new_default_action;
+  const gchar          *raise_action;
+  const gchar          *raise_top_action;
+  const gchar          *lower_action;
+  const gchar          *lower_bottom_action;
+  const gchar          *duplicate_action;
+  const gchar          *delete_action;
+
+  /*  lock content button appearance  */
+  const gchar          *lock_content_icon_name;
+  const gchar          *lock_content_tooltip;
+  const gchar          *lock_content_help_id;
+
+  /* lock position (translation and transformation) button appearance */
+  const gchar          *lock_position_icon_name;
+  const gchar          *lock_position_tooltip;
+  const gchar          *lock_position_help_id;
+};
+
+
+GType       gimp_item_tree_view_get_type          (void) G_GNUC_CONST;
+
+GtkWidget * gimp_item_tree_view_new               (GType             view_type,
+                                                   gint              view_size,
+                                                   gint              view_border_width,
+                                                   GimpImage        *image,
+                                                   GimpMenuFactory  *menu_facotry,
+                                                   const gchar      *menu_identifier,
+                                                   const gchar      *ui_identifier);
+
+void        gimp_item_tree_view_set_image         (GimpItemTreeView *view,
+                                                   GimpImage        *image);
+GimpImage * gimp_item_tree_view_get_image         (GimpItemTreeView *view);
+
+void        gimp_item_tree_view_add_options       (GimpItemTreeView *view,
+                                                   const gchar      *label,
+                                                   GtkWidget        *options);
+GtkWidget * gimp_item_tree_view_get_lock_box      (GimpItemTreeView *view);
+
+GtkWidget * gimp_item_tree_view_get_new_button    (GimpItemTreeView *view);
+GtkWidget * gimp_item_tree_view_get_delete_button (GimpItemTreeView *view);
+
+gint        gimp_item_tree_view_get_drop_index    (GimpItemTreeView *view,
+                                                   GimpViewable     *dest_viewable,
+                                                   GtkTreeViewDropPosition drop_pos,
+                                                   GimpViewable    **parent);
+
+
+#endif  /*  __GIMP_ITEM_TREE_VIEW_H__  */
diff --git a/app/widgets/gimplanguagecombobox.c b/app/widgets/gimplanguagecombobox.c
new file mode 100644
index 0000000..4282774
--- /dev/null
+++ b/app/widgets/gimplanguagecombobox.c
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguagecombobox.c
+ * Copyright (C) 2009  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* GimpLanguageComboBox is a combo-box widget to select the user
+ * interface language.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimplanguagecombobox.h"
+#include "gimptranslationstore.h"
+
+
+struct _GimpLanguageComboBox
+{
+  GtkComboBox parent_instance;
+};
+
+
+G_DEFINE_TYPE (GimpLanguageComboBox,
+               gimp_language_combo_box, GTK_TYPE_COMBO_BOX)
+
+#define parent_class gimp_language_combo_box_parent_class
+
+
+static void
+gimp_language_combo_box_class_init (GimpLanguageComboBoxClass *klass)
+{
+}
+
+static void
+gimp_language_combo_box_init (GimpLanguageComboBox *combo)
+{
+  GtkCellRenderer *renderer;
+
+  renderer = gtk_cell_renderer_text_new ();
+
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+                                  "text",  GIMP_LANGUAGE_STORE_LABEL,
+                                  NULL);
+}
+
+/**
+ * gimp_language_combo_box_new:
+ * @manual_l18n: get only the sublist of manual languages.
+ * @empty_label: the label for empty language code.
+ *
+ * Returns a combo box containing all GUI localization languages if
+ * @manual_l18n is #FALSE, or all manual localization languages
+ * otherwise. If @empty_label is not #NULL, an entry with this label
+ * will be created for the language code "", otherwise if @empty_label
+ * is #NULL and @manual_l18n is #FALSE, the entry will be "System
+ * Language" localized in itself (not in the GUI language).
+ */
+GtkWidget *
+gimp_language_combo_box_new (gboolean     manual_l18n,
+                             const gchar *empty_label)
+{
+  GtkWidget    *combo;
+  GtkListStore *store;
+
+  store = gimp_translation_store_new (manual_l18n, empty_label);
+  combo = g_object_new (GIMP_TYPE_LANGUAGE_COMBO_BOX,
+                        "model", store,
+                        NULL);
+
+  g_object_unref (store);
+
+  return combo;
+}
+
+gchar *
+gimp_language_combo_box_get_code (GimpLanguageComboBox *combo)
+{
+  GtkTreeIter  iter;
+  gchar       *code;
+
+  g_return_val_if_fail (GIMP_IS_LANGUAGE_COMBO_BOX (combo), NULL);
+
+  if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
+    return NULL;
+
+  gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (combo)), &iter,
+                      GIMP_LANGUAGE_STORE_CODE, &code,
+                      -1);
+
+  return code;
+}
+
+gboolean
+gimp_language_combo_box_set_code (GimpLanguageComboBox *combo,
+                                  const gchar          *code)
+{
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+
+  g_return_val_if_fail (GIMP_IS_LANGUAGE_COMBO_BOX (combo), FALSE);
+
+  if (! code || ! strlen (code))
+    {
+      gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+      return TRUE;
+    }
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+
+  if (gimp_language_store_lookup (GIMP_LANGUAGE_STORE (model), code, &iter))
+    {
+      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimplanguagecombobox.h b/app/widgets/gimplanguagecombobox.h
new file mode 100644
index 0000000..03610ec
--- /dev/null
+++ b/app/widgets/gimplanguagecombobox.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguagecombobox.h
+ * Copyright (C) 2009  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LANGUAGE_COMBO_BOX_H__
+#define __GIMP_LANGUAGE_COMBO_BOX_H__
+
+
+#define GIMP_TYPE_LANGUAGE_COMBO_BOX            (gimp_language_combo_box_get_type ())
+#define GIMP_LANGUAGE_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LANGUAGE_COMBO_BOX, GimpLanguageComboBox))
+#define GIMP_LANGUAGE_COMBO_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LANGUAGE_COMBO_BOX, GimpLanguageComboBoxClass))
+#define GIMP_IS_LANGUAGE_COMBO_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LANGUAGE_COMBO_BOX))
+#define GIMP_IS_LANGUAGE_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LANGUAGE_COMBO_BOX))
+#define GIMP_LANGUAGE_COMBO_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LANGUAGE_COMBO_BOX, GimpLanguageComboBoxClass))
+
+
+typedef struct _GimpLanguageComboBoxClass  GimpLanguageComboBoxClass;
+
+struct _GimpLanguageComboBoxClass
+{
+  GtkComboBoxClass  parent_class;
+};
+
+
+GType       gimp_language_combo_box_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_language_combo_box_new      (gboolean              manual_l18n,
+                                              const gchar          *empty_label);
+
+gchar     * gimp_language_combo_box_get_code (GimpLanguageComboBox *combo);
+gboolean    gimp_language_combo_box_set_code (GimpLanguageComboBox *combo,
+                                              const gchar          *code);
+
+
+#endif  /* __GIMP_LANGUAGE_COMBO_BOX_H__ */
diff --git a/app/widgets/gimplanguageentry.c b/app/widgets/gimplanguageentry.c
new file mode 100644
index 0000000..3896518
--- /dev/null
+++ b/app/widgets/gimplanguageentry.c
@@ -0,0 +1,255 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguageentry.c
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* GimpLanguageEntry is an entry widget that provides completion on
+ * translated language names. It is suited for specifying the language
+ * a text is written in.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimplanguageentry.h"
+#include "gimplanguagestore.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_MODEL
+};
+
+struct _GimpLanguageEntry
+{
+  GtkEntry       parent_instance;
+
+  GtkListStore  *store;
+  gchar         *code;  /*  ISO 639-1 language code  */
+};
+
+
+static void      gimp_language_entry_constructed  (GObject      *object);
+static void      gimp_language_entry_finalize     (GObject      *object);
+static void      gimp_language_entry_set_property (GObject      *object,
+                                                   guint         property_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void      gimp_language_entry_get_property (GObject      *object,
+                                                   guint         property_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+
+static gboolean  gimp_language_entry_language_selected (GtkEntryCompletion *completion,
+                                                        GtkTreeModel       *model,
+                                                        GtkTreeIter        *iter,
+                                                        GimpLanguageEntry  *entry);
+
+
+G_DEFINE_TYPE (GimpLanguageEntry, gimp_language_entry, GTK_TYPE_ENTRY)
+
+#define parent_class gimp_language_entry_parent_class
+
+
+static void
+gimp_language_entry_class_init (GimpLanguageEntryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_language_entry_constructed;
+  object_class->finalize     = gimp_language_entry_finalize;
+  object_class->set_property = gimp_language_entry_set_property;
+  object_class->get_property = gimp_language_entry_get_property;
+
+  g_object_class_install_property (object_class, PROP_MODEL,
+                                   g_param_spec_object ("model", NULL, NULL,
+                                                        GIMP_TYPE_LANGUAGE_STORE,
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_language_entry_init (GimpLanguageEntry *entry)
+{
+}
+
+static void
+gimp_language_entry_constructed (GObject *object)
+{
+  GimpLanguageEntry *entry = GIMP_LANGUAGE_ENTRY (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  if (entry->store)
+    {
+      GtkEntryCompletion *completion;
+
+      completion = g_object_new (GTK_TYPE_ENTRY_COMPLETION,
+                                 "model",             entry->store,
+                                 "inline-selection",  TRUE,
+                                 NULL);
+
+      /* Note that we must use this function to set the text column,
+       * otherwise we won't get a cell renderer for free.
+       */
+      gtk_entry_completion_set_text_column (completion,
+                                            GIMP_LANGUAGE_STORE_LABEL);
+
+      gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+      g_object_unref (completion);
+
+      g_signal_connect (completion, "match-selected",
+                        G_CALLBACK (gimp_language_entry_language_selected),
+                        entry);
+    }
+}
+
+static void
+gimp_language_entry_finalize (GObject *object)
+{
+  GimpLanguageEntry *entry = GIMP_LANGUAGE_ENTRY (object);
+
+  g_clear_object (&entry->store);
+
+  g_clear_pointer (&entry->code, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_language_entry_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpLanguageEntry *entry = GIMP_LANGUAGE_ENTRY (object);
+
+  switch (property_id)
+    {
+    case PROP_MODEL:
+      g_return_if_fail (entry->store == NULL);
+      entry->store = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_language_entry_get_property (GObject      *object,
+                                  guint         property_id,
+                                  GValue       *value,
+                                  GParamSpec   *pspec)
+{
+  GimpLanguageEntry *entry = GIMP_LANGUAGE_ENTRY (object);
+
+  switch (property_id)
+    {
+    case PROP_MODEL:
+      g_value_set_object (value, entry->store);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_language_entry_language_selected (GtkEntryCompletion *completion,
+                                       GtkTreeModel       *model,
+                                       GtkTreeIter        *iter,
+                                       GimpLanguageEntry  *entry)
+{
+  g_free (entry->code);
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_LANGUAGE_STORE_CODE, &entry->code,
+                      -1);
+
+  return FALSE;
+}
+
+GtkWidget *
+gimp_language_entry_new (void)
+{
+  GtkWidget    *entry;
+  GtkListStore *store;
+
+  store = gimp_language_store_new ();
+
+  entry = g_object_new (GIMP_TYPE_LANGUAGE_ENTRY,
+                        "model", store,
+                        NULL);
+
+  g_object_unref (store);
+
+  return entry;
+}
+
+const gchar *
+gimp_language_entry_get_code (GimpLanguageEntry *entry)
+{
+  g_return_val_if_fail (GIMP_IS_LANGUAGE_ENTRY (entry), NULL);
+
+  return entry->code;
+}
+
+gboolean
+gimp_language_entry_set_code (GimpLanguageEntry *entry,
+                              const gchar       *code)
+{
+  GtkTreeIter  iter;
+
+  g_return_val_if_fail (GIMP_IS_LANGUAGE_ENTRY (entry), FALSE);
+
+  g_clear_pointer (&entry->code, g_free);
+
+  if (! code || ! strlen (code))
+    {
+      gtk_entry_set_text (GTK_ENTRY (entry), "");
+
+      return TRUE;
+    }
+
+  if (gimp_language_store_lookup (GIMP_LANGUAGE_STORE (entry->store),
+                                  code, &iter))
+    {
+      gchar *label;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (entry->store), &iter,
+                          GIMP_LANGUAGE_STORE_LABEL, &label,
+                          GIMP_LANGUAGE_STORE_CODE,  &entry->code,
+                          -1);
+
+      gtk_entry_set_text (GTK_ENTRY (entry), label);
+      g_free (label);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimplanguageentry.h b/app/widgets/gimplanguageentry.h
new file mode 100644
index 0000000..d7ad2db
--- /dev/null
+++ b/app/widgets/gimplanguageentry.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguageentry.h
+ * Copyright (C) 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LANGUAGE_ENTRY_H__
+#define __GIMP_LANGUAGE_ENTRY_H__
+
+
+#define GIMP_TYPE_LANGUAGE_ENTRY            (gimp_language_entry_get_type ())
+#define GIMP_LANGUAGE_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LANGUAGE_ENTRY, GimpLanguageEntry))
+#define GIMP_LANGUAGE_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LANGUAGE_ENTRY, GimpLanguageEntryClass))
+#define GIMP_IS_LANGUAGE_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LANGUAGE_ENTRY))
+#define GIMP_IS_LANGUAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LANGUAGE_ENTRY))
+#define GIMP_LANGUAGE_ENTRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LANGUAGE_ENTRY, GimpLanguageEntryClass))
+
+
+typedef struct _GimpLanguageEntryClass  GimpLanguageEntryClass;
+
+struct _GimpLanguageEntryClass
+{
+  GtkEntryClass  parent_class;
+};
+
+
+GType         gimp_language_entry_get_type     (void) G_GNUC_CONST;
+
+GtkWidget   * gimp_language_entry_new      (void);
+
+const gchar * gimp_language_entry_get_code (GimpLanguageEntry *entry);
+gboolean      gimp_language_entry_set_code (GimpLanguageEntry *entry,
+                                            const gchar       *code);
+
+
+#endif  /* __GIMP_LANGUAGE_ENTRY_H__ */
diff --git a/app/widgets/gimplanguagestore-parser.c b/app/widgets/gimplanguagestore-parser.c
new file mode 100644
index 0000000..d667a7a
--- /dev/null
+++ b/app/widgets/gimplanguagestore-parser.c
@@ -0,0 +1,519 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguagestore-parser.c
+ * Copyright (C) 2008, 2009  Sven Neumann <sven@gimp.org>
+ * Copyright (C) 2013  Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <locale.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpxmlparser.h"
+
+#include "gimplanguagestore.h"
+#include "gimplanguagestore-parser.h"
+
+#include "gimp-intl.h"
+
+
+typedef enum
+{
+  ISO_CODES_START,
+  ISO_CODES_IN_ENTRIES,
+  ISO_CODES_IN_ENTRY,
+  ISO_CODES_IN_UNKNOWN
+} IsoCodesParserState;
+
+typedef struct
+{
+  IsoCodesParserState  state;
+  IsoCodesParserState  last_known_state;
+  gint                 unknown_depth;
+  GHashTable          *base_lang_list;
+} IsoCodesParser;
+
+
+static gboolean parse_iso_codes                 (GHashTable  *base_lang_list,
+                                                 GError     **error);
+
+#ifdef HAVE_ISO_CODES
+static void     iso_codes_parser_init           (void);
+static void     iso_codes_parser_start_element  (GMarkupParseContext  *context,
+                                                 const gchar          *element_name,
+                                                 const gchar         **attribute_names,
+                                                 const gchar         **attribute_values,
+                                                 gpointer              user_data,
+                                                 GError              **error);
+static void     iso_codes_parser_end_element    (GMarkupParseContext  *context,
+                                                 const gchar          *element_name,
+                                                 gpointer              user_data,
+                                                 GError              **error);
+
+static void     iso_codes_parser_start_unknown  (IsoCodesParser       *parser);
+static void     iso_codes_parser_end_unknown    (IsoCodesParser       *parser);
+#endif /* HAVE_ISO_CODES */
+
+/*
+ * Language lists that we want to generate only once at program startup:
+ * @l10n_lang_list: all available localizations self-localized;
+ * @all_lang_list: all known languages, in the user-selected language.
+ */
+static GHashTable *l10n_lang_list = NULL;
+static GHashTable *all_lang_list = NULL;
+
+/********************\
+ * Public Functions *
+\********************/
+
+/*
+ * Initialize and run the language listing parser. This call must be
+ * made only once, at program initialization, but after language_init().
+ */
+void
+gimp_language_store_parser_init (void)
+{
+  GHashTable     *base_lang_list;
+  gchar          *current_env;
+  GDir           *locales_dir;
+  GError         *error = NULL;
+  GHashTableIter  lang_iter;
+  gpointer        key;
+
+  if (l10n_lang_list != NULL)
+    {
+      g_warning ("gimp_language_store_parser_init() must be run only once.");
+      return;
+    }
+
+  current_env = g_strdup (g_getenv ("LANGUAGE"));
+
+  l10n_lang_list = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                          (GDestroyNotify) g_free,
+                                          (GDestroyNotify) g_free);
+  all_lang_list = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                         (GDestroyNotify) g_free,
+                                         (GDestroyNotify) g_free);
+  base_lang_list = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                          (GDestroyNotify) g_free,
+                                          (GDestroyNotify) g_free);
+
+  /* Check all locales we have translations for. */
+  locales_dir = g_dir_open (gimp_locale_directory (), 0, NULL);
+  if (locales_dir)
+    {
+      const gchar *locale;
+
+      while ((locale = g_dir_read_name (locales_dir)) != NULL)
+        {
+          gchar *filename = g_build_filename (gimp_locale_directory (),
+                                              locale,
+                                              "LC_MESSAGES",
+                                              GETTEXT_PACKAGE ".mo",
+                                              NULL);
+          if (g_file_test (filename, G_FILE_TEST_EXISTS))
+            {
+              gchar *delimiter = NULL;
+              gchar *base_code = NULL;
+
+              delimiter = strchr (locale, '_');
+
+              if (delimiter)
+                base_code = g_strndup (locale, delimiter - locale);
+              else
+                base_code = g_strdup (locale);
+
+              delimiter = strchr (base_code, '@');
+
+              if (delimiter)
+                {
+                  gchar *temp = base_code;
+                  base_code = g_strndup (base_code, delimiter - base_code);
+                  g_free (temp);
+                }
+
+              /* Save the full language code. */
+              g_hash_table_insert (l10n_lang_list, g_strdup (locale), NULL);
+              /* Save the base language code. */
+              g_hash_table_insert (base_lang_list, base_code, NULL);
+            }
+
+          g_free (filename);
+        }
+
+      g_dir_close (locales_dir);
+    }
+
+  /* Parse ISO-639 file to get full list of language and their names. */
+  parse_iso_codes (base_lang_list, &error);
+
+  /* Generate the localized language names. */
+  g_hash_table_iter_init (&lang_iter, l10n_lang_list);
+  while (g_hash_table_iter_next (&lang_iter, &key, NULL))
+    {
+      gchar *code           = (gchar*) key;
+      gchar *localized_name = NULL;
+      gchar *english_name   = NULL;
+      gchar *delimiter      = NULL;
+      gchar *base_code      = NULL;
+
+      delimiter = strchr (code, '_');
+
+      if (delimiter)
+        base_code = g_strndup (code, delimiter - code);
+      else
+        base_code = g_strdup (code);
+
+      delimiter = strchr (base_code, '@');
+
+      if (delimiter)
+        {
+          gchar *temp = base_code;
+          base_code = g_strndup (base_code, delimiter - base_code);
+          g_free (temp);
+        }
+
+      english_name = (gchar*) (g_hash_table_lookup (base_lang_list, base_code));
+
+      if (english_name)
+        {
+          gchar *semicolon;
+
+          /* If possible, we want to localize a language in itself.
+           * If it fails, gettext fallbacks to C (en_US) itself.
+           */
+          g_setenv ("LANGUAGE", code, TRUE);
+          setlocale (LC_ALL, "");
+
+          localized_name = g_strdup (dgettext ("iso_639", english_name));
+
+          /* If original and localized names are the same for other than English,
+           * maybe localization failed. Try now in the main dialect. */
+          if (g_strcmp0 (english_name, localized_name) == 0 &&
+              g_strcmp0 (base_code, "en") != 0 &&
+              g_strcmp0 (code, base_code) != 0)
+            {
+              g_free (localized_name);
+
+              g_setenv ("LANGUAGE", base_code, TRUE);
+              setlocale (LC_ALL, "");
+
+              localized_name = g_strdup (dgettext ("iso_639", english_name));
+            }
+
+          /*  there might be several language names; use the first one  */
+          semicolon = strchr (localized_name, ';');
+
+          if (semicolon)
+            {
+              gchar *temp = localized_name;
+              localized_name = g_strndup (localized_name, semicolon - localized_name);
+              g_free (temp);
+            }
+        }
+
+      g_hash_table_replace (l10n_lang_list, g_strdup(code),
+                            g_strdup_printf ("%s [%s]",
+                                             localized_name ?
+                                             localized_name : "???",
+                                             code));
+      g_free (localized_name);
+      g_free (base_code);
+    }
+
+  /*  Add special entries for system locale.
+   *  We want the system locale to be localized in itself. */
+  g_setenv ("LANGUAGE", setlocale (LC_ALL, NULL), TRUE);
+  setlocale (LC_ALL, "");
+
+  /* g_str_hash() does not accept NULL. I give an empty code instead.
+   * Other solution would to create a custom hash. */
+  g_hash_table_insert (l10n_lang_list, g_strdup(""),
+                       g_strdup (_("System Language")));
+
+  /* Go back to original localization. */
+  if (current_env)
+    {
+      g_setenv ("LANGUAGE", current_env, TRUE);
+      g_free (current_env);
+    }
+  else
+    g_unsetenv ("LANGUAGE");
+  setlocale (LC_ALL, "");
+
+  /* Add special entry for C (en_US). */
+  g_hash_table_insert (l10n_lang_list, g_strdup ("en_US"),
+                       g_strdup ("English [en_US]"));
+
+  g_hash_table_destroy (base_lang_list);
+}
+
+void
+gimp_language_store_parser_clean (void)
+{
+  g_hash_table_destroy (l10n_lang_list);
+  g_hash_table_destroy (all_lang_list);
+}
+
+/*
+ * Returns a Hash table of languages.
+ * Keys and values are respectively language codes and names from the
+ * ISO-639 standard code.
+ *
+ * If @localization_only is TRUE, it returns only the list of available
+ * GIMP localizations, and language names are translated in their own
+ * locale.
+ * If @localization_only is FALSE, the full list of ISO-639 languages
+ * is returned, and language names are in the user-set locale.
+ *
+ * Do not free the list or elements of the list.
+ */
+GHashTable *
+gimp_language_store_parser_get_languages (gboolean localization_only)
+{
+  if (localization_only)
+    return l10n_lang_list;
+  else
+    return all_lang_list;
+}
+
+/*****************************\
+ * Private Parsing Functions *
+\*****************************/
+
+/*
+ * Parse the ISO-639 code list if available on this system, and fill
+ * @base_lang_list with English names of all needed base codes.
+ *
+ * It will also fill the static @all_lang_list.
+ */
+static gboolean
+parse_iso_codes (GHashTable  *base_lang_list,
+                 GError     **error)
+{
+  gboolean success = TRUE;
+
+#ifdef HAVE_ISO_CODES
+  static const GMarkupParser markup_parser =
+    {
+      iso_codes_parser_start_element,
+      iso_codes_parser_end_element,
+      NULL,  /*  characters   */
+      NULL,  /*  passthrough  */
+      NULL   /*  error        */
+    };
+
+  GimpXmlParser  *xml_parser;
+  GFile          *file;
+  IsoCodesParser  parser = { 0, };
+
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  iso_codes_parser_init ();
+
+  parser.base_lang_list = g_hash_table_ref (base_lang_list);
+
+  xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
+
+#if ENABLE_RELOCATABLE_RESOURCES
+  file = gimp_installation_directory_file ("share", "xml", "iso-codes",
+                                           "iso_639.xml", NULL);
+#else
+  file = g_file_new_for_path (ISO_CODES_LOCATION G_DIR_SEPARATOR_S
+                              "iso_639.xml");
+#endif
+
+  success = gimp_xml_parser_parse_gfile (xml_parser, file, error);
+  if (error && *error)
+    {
+      g_warning ("%s: error parsing '%s': %s\n",
+                 G_STRFUNC, g_file_get_path (file),
+                 (*error)->message);
+      g_clear_error (error);
+    }
+
+  g_object_unref (file);
+
+  gimp_xml_parser_free (xml_parser);
+  g_hash_table_unref (parser.base_lang_list);
+
+#endif /* HAVE_ISO_CODES */
+
+  return success;
+}
+
+#ifdef HAVE_ISO_CODES
+static void
+iso_codes_parser_init (void)
+{
+  static gboolean initialized = FALSE;
+
+  if (initialized)
+    return;
+
+#ifdef G_OS_WIN32
+  /*  on Win32, assume iso-codes is installed in the same location as GIMP  */
+  bindtextdomain ("iso_639", gimp_locale_directory ());
+#else
+  bindtextdomain ("iso_639", ISO_CODES_LOCALEDIR);
+#endif
+
+  bind_textdomain_codeset ("iso_639", "UTF-8");
+
+  initialized = TRUE;
+}
+
+static void
+iso_codes_parser_entry (IsoCodesParser  *parser,
+                        const gchar    **names,
+                        const gchar    **values)
+{
+  const gchar *lang = NULL;
+  const gchar *code = NULL;
+
+  while (*names && *values)
+    {
+      if (strcmp (*names, "name") == 0)
+        lang = *values;
+      else if (strcmp (*names, "iso_639_2B_code") == 0 && code == NULL)
+        /* 2-letter ISO 639-1 codes have priority.
+         * But some languages have no 2-letter code. Ex: Asturian (ast).
+         */
+        code = *values;
+      else if (strcmp (*names, "iso_639_2T_code") == 0 && code == NULL)
+        code = *values;
+      else if (strcmp (*names, "iso_639_1_code") == 0)
+        code = *values;
+
+      names++;
+      values++;
+    }
+
+  if (lang && *lang && code && *code)
+    {
+      gchar *semicolon;
+      gchar *localized_name = g_strdup (dgettext ("iso_639", lang));
+
+      /* If the language is in our base table, we save its standard English name. */
+      if (g_hash_table_contains (parser->base_lang_list, code))
+        g_hash_table_replace (parser->base_lang_list, g_strdup (code), g_strdup (lang));
+
+      /*  there might be several language names; use the first one  */
+      semicolon = strchr (localized_name, ';');
+
+      if (semicolon)
+        {
+          gchar *temp = localized_name;
+          localized_name = g_strndup (localized_name, semicolon - localized_name);
+          g_free (temp);
+        }
+      /* In any case, we save the name in user-set language for all lang. */
+      g_hash_table_insert (all_lang_list, g_strdup (code), localized_name);
+    }
+}
+
+static void
+iso_codes_parser_start_element (GMarkupParseContext  *context,
+                                const gchar          *element_name,
+                                const gchar         **attribute_names,
+                                const gchar         **attribute_values,
+                                gpointer              user_data,
+                                GError              **error)
+{
+  IsoCodesParser *parser = user_data;
+
+  switch (parser->state)
+    {
+    case ISO_CODES_START:
+      if (strcmp (element_name, "iso_639_entries") == 0)
+        {
+          parser->state = ISO_CODES_IN_ENTRIES;
+          break;
+        }
+
+    case ISO_CODES_IN_ENTRIES:
+      if (strcmp (element_name, "iso_639_entry") == 0)
+        {
+          parser->state = ISO_CODES_IN_ENTRY;
+          iso_codes_parser_entry (parser, attribute_names, attribute_values);
+          break;
+        }
+
+    case ISO_CODES_IN_ENTRY:
+    case ISO_CODES_IN_UNKNOWN:
+      iso_codes_parser_start_unknown (parser);
+      break;
+    }
+}
+
+static void
+iso_codes_parser_end_element (GMarkupParseContext *context,
+                              const gchar         *element_name,
+                              gpointer             user_data,
+                              GError             **error)
+{
+  IsoCodesParser *parser = user_data;
+
+  switch (parser->state)
+    {
+    case ISO_CODES_START:
+      g_warning ("%s: shouldn't get here", G_STRLOC);
+      break;
+
+    case ISO_CODES_IN_ENTRIES:
+      parser->state = ISO_CODES_START;
+      break;
+
+    case ISO_CODES_IN_ENTRY:
+      parser->state = ISO_CODES_IN_ENTRIES;
+      break;
+
+    case ISO_CODES_IN_UNKNOWN:
+      iso_codes_parser_end_unknown (parser);
+      break;
+    }
+}
+
+static void
+iso_codes_parser_start_unknown (IsoCodesParser *parser)
+{
+  if (parser->unknown_depth == 0)
+    parser->last_known_state = parser->state;
+
+  parser->state = ISO_CODES_IN_UNKNOWN;
+  parser->unknown_depth++;
+}
+
+static void
+iso_codes_parser_end_unknown (IsoCodesParser *parser)
+{
+  gimp_assert (parser->unknown_depth > 0 &&
+               parser->state == ISO_CODES_IN_UNKNOWN);
+
+  parser->unknown_depth--;
+
+  if (parser->unknown_depth == 0)
+    parser->state = parser->last_known_state;
+}
+#endif /* HAVE_ISO_CODES */
diff --git a/app/widgets/gimplanguagestore-parser.h b/app/widgets/gimplanguagestore-parser.h
new file mode 100644
index 0000000..5f91bf8
--- /dev/null
+++ b/app/widgets/gimplanguagestore-parser.h
@@ -0,0 +1,32 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguagestore-parser.h
+ * Copyright (C) 2008, 2009  Sven Neumann <sven@gimp.org>
+ * Copyright (C) 2013  Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LANGUAGE_STORE_PARSER_H__
+#define __GIMP_LANGUAGE_STORE_PARSER_H__
+
+
+void        gimp_language_store_parser_init          (void);
+
+void        gimp_language_store_parser_clean         (void);
+
+GHashTable* gimp_language_store_parser_get_languages (gboolean localization_only);
+
+#endif  /* __GIMP_LANGUAGE_STORE_PARSER_H__ */
diff --git a/app/widgets/gimplanguagestore.c b/app/widgets/gimplanguagestore.c
new file mode 100644
index 0000000..60a74e5
--- /dev/null
+++ b/app/widgets/gimplanguagestore.c
@@ -0,0 +1,201 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguagestore.c
+ * Copyright (C) 2008, 2009  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimplanguagestore.h"
+#include "gimplanguagestore-parser.h"
+
+
+static void   gimp_language_store_constructed (GObject           *object);
+
+static void   gimp_language_store_real_add    (GimpLanguageStore *store,
+                                               const gchar       *label,
+                                               const gchar       *code);
+
+static gint   gimp_language_store_sort        (GtkTreeModel      *model,
+                                               GtkTreeIter       *a,
+                                               GtkTreeIter       *b,
+                                               gpointer           userdata);
+
+
+G_DEFINE_TYPE (GimpLanguageStore, gimp_language_store, GTK_TYPE_LIST_STORE)
+
+#define parent_class gimp_language_store_parent_class
+
+
+static void
+gimp_language_store_class_init (GimpLanguageStoreClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = gimp_language_store_constructed;
+
+  klass->add                = gimp_language_store_real_add;
+}
+
+static void
+gimp_language_store_init (GimpLanguageStore *store)
+{
+  GType column_types[2] = { G_TYPE_STRING, G_TYPE_STRING };
+
+  gtk_list_store_set_column_types (GTK_LIST_STORE (store),
+                                   G_N_ELEMENTS (column_types), column_types);
+
+  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
+                                   GIMP_LANGUAGE_STORE_LABEL,
+                                   gimp_language_store_sort, NULL, NULL);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+                                        GIMP_LANGUAGE_STORE_LABEL,
+                                        GTK_SORT_ASCENDING);
+}
+
+static void
+gimp_language_store_constructed (GObject *object)
+{
+  GHashTable     *lang_list;
+  GHashTableIter  lang_iter;
+  gpointer        code;
+  gpointer        name;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  lang_list = gimp_language_store_parser_get_languages (FALSE);
+  g_return_if_fail (lang_list != NULL);
+
+  g_hash_table_iter_init (&lang_iter, lang_list);
+
+  while (g_hash_table_iter_next (&lang_iter, &code, &name))
+    GIMP_LANGUAGE_STORE_GET_CLASS (object)->add (GIMP_LANGUAGE_STORE (object),
+                                                 name, code);
+}
+
+static void
+gimp_language_store_real_add (GimpLanguageStore *store,
+                              const gchar       *label,
+                              const gchar       *code)
+{
+  GtkTreeIter iter;
+
+  gtk_list_store_append (GTK_LIST_STORE (store), &iter);
+  gtk_list_store_set (GTK_LIST_STORE (store), &iter,
+                      GIMP_LANGUAGE_STORE_LABEL, label,
+                      GIMP_LANGUAGE_STORE_CODE,  code,
+                      -1);
+}
+
+static gint
+gimp_language_store_sort (GtkTreeModel *model,
+                          GtkTreeIter  *a,
+                          GtkTreeIter  *b,
+                          gpointer      userdata)
+{
+  GValue avalue = G_VALUE_INIT;
+  GValue bvalue = G_VALUE_INIT;
+  gint   cmp    = 0;
+
+  /*  keep system language at the top of the list  */
+  gtk_tree_model_get_value (model, a, GIMP_LANGUAGE_STORE_CODE, &avalue);
+  gtk_tree_model_get_value (model, b, GIMP_LANGUAGE_STORE_CODE, &bvalue);
+
+  if (g_strcmp0 ("", g_value_get_string (&avalue)) == 0)
+    cmp = -1;
+
+  if (g_strcmp0 ("", g_value_get_string (&bvalue)) == 0)
+    cmp = 1;
+
+  g_value_unset (&avalue);
+  g_value_unset (&bvalue);
+
+  if (cmp)
+    return cmp;
+
+  /*  sort labels alphabetically  */
+  gtk_tree_model_get_value (model, a, GIMP_LANGUAGE_STORE_LABEL, &avalue);
+  gtk_tree_model_get_value (model, b, GIMP_LANGUAGE_STORE_LABEL, &bvalue);
+
+  cmp = g_utf8_collate (g_value_get_string (&avalue),
+                        g_value_get_string (&bvalue));
+
+  g_value_unset (&avalue);
+  g_value_unset (&bvalue);
+
+  return cmp;
+}
+
+GtkListStore *
+gimp_language_store_new (void)
+{
+  return g_object_new (GIMP_TYPE_LANGUAGE_STORE, NULL);
+}
+
+gboolean
+gimp_language_store_lookup (GimpLanguageStore *store,
+                            const gchar       *code,
+                            GtkTreeIter       *iter)
+{
+  GtkTreeModel *model;
+  const gchar  *hyphen;
+  gint          len;
+  gboolean      iter_valid;
+
+  g_return_val_if_fail (GIMP_IS_LANGUAGE_STORE (store), FALSE);
+  g_return_val_if_fail (code != NULL, FALSE);
+  g_return_val_if_fail (iter != NULL, FALSE);
+
+  /*  We accept the code in RFC-3066 format here and only look at what's
+   *  before the first hyphen.
+   */
+  hyphen = strchr (code, '-');
+
+  if (hyphen)
+    len = hyphen - code;
+  else
+    len = strlen (code);
+
+  model = GTK_TREE_MODEL (store);
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, iter))
+    {
+      gchar *value;
+
+      gtk_tree_model_get (model, iter,
+                          GIMP_LANGUAGE_STORE_CODE, &value,
+                          -1);
+
+      if (value && strncmp (code, value, len) == 0)
+        {
+          g_free (value);
+          break;
+        }
+
+      g_free (value);
+    }
+
+  return iter_valid;
+}
diff --git a/app/widgets/gimplanguagestore.h b/app/widgets/gimplanguagestore.h
new file mode 100644
index 0000000..de6857c
--- /dev/null
+++ b/app/widgets/gimplanguagestore.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplanguagestore.h
+ * Copyright (C) 2008, 2009  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LANGUAGE_STORE_H__
+#define __GIMP_LANGUAGE_STORE_H__
+
+
+enum
+{
+  GIMP_LANGUAGE_STORE_LABEL,
+  GIMP_LANGUAGE_STORE_CODE
+};
+
+
+#define GIMP_TYPE_LANGUAGE_STORE            (gimp_language_store_get_type ())
+#define GIMP_LANGUAGE_STORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LANGUAGE_STORE, GimpLanguageStore))
+#define GIMP_LANGUAGE_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LANGUAGE_STORE, GimpLanguageStoreClass))
+#define GIMP_IS_LANGUAGE_STORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LANGUAGE_STORE))
+#define GIMP_IS_LANGUAGE_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LANGUAGE_STORE))
+#define GIMP_LANGUAGE_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LANGUAGE_STORE, GimpLanguageStoreClass))
+
+
+typedef struct _GimpLanguageStoreClass  GimpLanguageStoreClass;
+
+struct _GimpLanguageStoreClass
+{
+  GtkListStoreClass  parent_class;
+
+  void (* add) (GimpLanguageStore *store,
+                const gchar       *label,
+                const gchar       *code);
+};
+
+struct _GimpLanguageStore
+{
+  GtkListStore     parent_instance;
+};
+
+
+GType          gimp_language_store_get_type (void) G_GNUC_CONST;
+
+GtkListStore * gimp_language_store_new      (void);
+
+gboolean       gimp_language_store_lookup   (GimpLanguageStore *store,
+                                             const gchar       *code,
+                                             GtkTreeIter       *iter);
+
+#endif  /* __GIMP_LANGUAGE_STORE_H__ */
diff --git a/app/widgets/gimplayermodebox.c b/app/widgets/gimplayermodebox.c
new file mode 100644
index 0000000..aa35f8f
--- /dev/null
+++ b/app/widgets/gimplayermodebox.c
@@ -0,0 +1,303 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
+ *
+ * gimplayermodebox.c
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimplayermodebox.h"
+#include "gimplayermodecombobox.h"
+
+#include "gimp-intl.h"
+
+
+/**
+ * SECTION: gimplayermodebox
+ * @title: GimpLayerModeBox
+ * @short_description: A #GtkBox subclass for selecting a layer mode.
+ *
+ * A #GtkBox subclass for selecting a layer mode
+ **/
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_LAYER_MODE
+};
+
+
+struct _GimpLayerModeBoxPrivate
+{
+  GimpLayerModeContext  context;
+  GimpLayerMode         layer_mode;
+
+  GtkWidget            *mode_combo;
+  GtkWidget            *group_combo;
+};
+
+
+static void   gimp_layer_mode_box_constructed  (GObject      *object);
+static void   gimp_layer_mode_box_set_property (GObject      *object,
+                                                guint         prop_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec);
+static void   gimp_layer_mode_box_get_property (GObject      *object,
+                                                guint         prop_id,
+                                                GValue       *value,
+                                                GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpLayerModeBox, gimp_layer_mode_box, GTK_TYPE_BOX)
+
+#define parent_class gimp_layer_mode_box_parent_class
+
+
+static void
+gimp_layer_mode_box_class_init (GimpLayerModeBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_layer_mode_box_constructed;
+  object_class->set_property = gimp_layer_mode_box_set_property;
+  object_class->get_property = gimp_layer_mode_box_get_property;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_flags ("context",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_LAYER_MODE_CONTEXT,
+                                                       GIMP_LAYER_MODE_CONTEXT_ALL,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_LAYER_MODE,
+                                   g_param_spec_enum ("layer-mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_layer_mode_box_init (GimpLayerModeBox *box)
+{
+  box->priv = gimp_layer_mode_box_get_instance_private (box);
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_HORIZONTAL);
+  gtk_box_set_spacing (GTK_BOX (box), 4);
+}
+
+static void
+gimp_layer_mode_box_constructed (GObject *object)
+{
+  GimpLayerModeBox *box = GIMP_LAYER_MODE_BOX (object);
+  GtkWidget        *mode_combo;
+  GtkWidget        *group_combo;
+  GtkTreeModel     *group_model;
+  gint              i;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  box->priv->mode_combo = mode_combo =
+    gimp_layer_mode_combo_box_new (box->priv->context);
+  gtk_box_pack_start (GTK_BOX (box), mode_combo, TRUE, TRUE, 0);
+  gtk_widget_show (mode_combo);
+
+  g_object_bind_property (object,                "context",
+                          G_OBJECT (mode_combo), "context",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+
+  g_object_bind_property (object,                "layer-mode",
+                          G_OBJECT (mode_combo), "layer-mode",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+
+  box->priv->group_combo = group_combo =
+    gimp_prop_enum_combo_box_new (G_OBJECT (mode_combo),
+                                  "group", 0, 0);
+  gimp_int_combo_box_set_layout (GIMP_INT_COMBO_BOX (group_combo),
+                                 GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY);
+  gtk_box_pack_start (GTK_BOX (box), group_combo, FALSE, FALSE, 0);
+  gtk_widget_show (group_combo);
+
+  gimp_help_set_help_data (group_combo,
+                           _("Switch to another group of modes"),
+                           NULL);
+
+  group_model = gtk_combo_box_get_model (GTK_COMBO_BOX (group_combo));
+
+  for (i = 0; i < 2; i++)
+    {
+      static const gchar *icons[] =
+      {
+        "gimp-reset",
+        "gimp-wilber-eek"
+      };
+
+      GtkTreeIter iter;
+
+      if (gimp_int_store_lookup_by_value (group_model, i, &iter))
+        gtk_list_store_set (GTK_LIST_STORE (group_model), &iter,
+                            GIMP_INT_STORE_ICON_NAME, icons[i],
+                            -1);
+    }
+}
+
+static void
+gimp_layer_mode_box_set_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpLayerModeBox *box = GIMP_LAYER_MODE_BOX (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONTEXT:
+      gimp_layer_mode_box_set_context (box, g_value_get_flags (value));
+      break;
+
+    case PROP_LAYER_MODE:
+      gimp_layer_mode_box_set_mode (box, g_value_get_enum (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_mode_box_get_property (GObject    *object,
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpLayerModeBox *box = GIMP_LAYER_MODE_BOX (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_flags (value, box->priv->context);
+      break;
+
+    case PROP_LAYER_MODE:
+      g_value_set_enum (value, box->priv->layer_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+/**
+ * gimp_layer_mode_box_new:
+ * Foo.
+ *
+ * Return value: a new #GimpLayerModeBox.
+ **/
+GtkWidget *
+gimp_layer_mode_box_new (GimpLayerModeContext context)
+{
+  return g_object_new (GIMP_TYPE_LAYER_MODE_BOX,
+                       "context", context,
+                       NULL);
+}
+
+void
+gimp_layer_mode_box_set_context (GimpLayerModeBox     *box,
+                                 GimpLayerModeContext  context)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_BOX (box));
+
+  if (context != box->priv->context)
+    {
+      box->priv->context = context;
+
+      g_object_notify (G_OBJECT (box), "context");
+    }
+}
+
+GimpLayerModeContext
+gimp_layer_mode_box_get_context (GimpLayerModeBox *box)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER_MODE_BOX (box),
+                        GIMP_LAYER_MODE_CONTEXT_ALL);
+
+  return box->priv->context;
+}
+
+void
+gimp_layer_mode_box_set_mode (GimpLayerModeBox *box,
+                              GimpLayerMode     mode)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_BOX (box));
+
+  if (mode != box->priv->layer_mode)
+    {
+      box->priv->layer_mode = mode;
+
+      g_object_notify (G_OBJECT (box), "layer-mode");
+    }
+}
+
+GimpLayerMode
+gimp_layer_mode_box_get_mode (GimpLayerModeBox *box)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER_MODE_BOX (box),
+                        GIMP_LAYER_MODE_NORMAL);
+
+  return box->priv->layer_mode;
+}
+
+void
+gimp_layer_mode_box_set_label (GimpLayerModeBox *box,
+                               const gchar      *label)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_BOX (box));
+
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (box->priv->mode_combo),
+                                label);
+}
+
+void
+gimp_layer_mode_box_set_ellipsize (GimpLayerModeBox   *box,
+                                   PangoEllipsizeMode  mode)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_BOX (box));
+
+  g_object_set (box->priv->mode_combo,
+                "ellipsize", mode,
+                NULL);
+}
diff --git a/app/widgets/gimplayermodebox.h b/app/widgets/gimplayermodebox.h
new file mode 100644
index 0000000..5ebe577
--- /dev/null
+++ b/app/widgets/gimplayermodebox.h
@@ -0,0 +1,67 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
+ *
+ * gimplayermodebox.h
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_MODE_BOX_H__
+#define __GIMP_LAYER_MODE_BOX_H__
+
+
+#define GIMP_TYPE_LAYER_MODE_BOX            (gimp_layer_mode_box_get_type ())
+#define GIMP_LAYER_MODE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_MODE_BOX, GimpLayerModeBox))
+#define GIMP_LAYER_MODE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_MODE_BOX, GimpLayerModeBoxClass))
+#define GIMP_IS_LAYER_MODE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_MODE_BOX))
+#define GIMP_IS_LAYER_MODE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MODE_BOX))
+#define GIMP_LAYER_MODE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_MODE_BOX, GimpLayerModeBoxClass))
+
+
+typedef struct _GimpLayerModeBoxPrivate GimpLayerModeBoxPrivate;
+typedef struct _GimpLayerModeBoxClass   GimpLayerModeBoxClass;
+
+struct _GimpLayerModeBox
+{
+  GtkBox                   parent_instance;
+
+  GimpLayerModeBoxPrivate *priv;
+};
+
+struct _GimpLayerModeBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType                  gimp_layer_mode_box_get_type      (void) G_GNUC_CONST;
+
+GtkWidget            * gimp_layer_mode_box_new           (GimpLayerModeContext  context);
+
+void                   gimp_layer_mode_box_set_context   (GimpLayerModeBox     *box,
+                                                          GimpLayerModeContext  context);
+GimpLayerModeContext   gimp_layer_mode_box_get_context   (GimpLayerModeBox     *box);
+
+void                   gimp_layer_mode_box_set_mode      (GimpLayerModeBox     *box,
+                                                          GimpLayerMode         mode);
+GimpLayerMode          gimp_layer_mode_box_get_mode      (GimpLayerModeBox     *box);
+
+void                   gimp_layer_mode_box_set_label     (GimpLayerModeBox     *box,
+                                                          const gchar          *label);
+void                   gimp_layer_mode_box_set_ellipsize (GimpLayerModeBox     *box,
+                                                          PangoEllipsizeMode    mode);
+
+
+#endif  /* __GIMP_LAYER_MODE_BOX_H__ */
diff --git a/app/widgets/gimplayermodecombobox.c b/app/widgets/gimplayermodecombobox.c
new file mode 100644
index 0000000..0483c4d
--- /dev/null
+++ b/app/widgets/gimplayermodecombobox.c
@@ -0,0 +1,470 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
+ *
+ * gimplayermodecombobox.c
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimplayermodecombobox.h"
+
+
+/**
+ * SECTION: gimplayermodecombobox
+ * @title: GimpLayerModeComboBox
+ * @short_description: A #GimpEnumComboBox subclass for selecting a layer mode.
+ *
+ * A #GtkComboBox subclass for selecting a layer mode
+ **/
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_LAYER_MODE,
+  PROP_GROUP
+};
+
+
+struct _GimpLayerModeComboBoxPrivate
+{
+  GimpLayerModeContext context;
+  GimpLayerMode        layer_mode;
+  GimpLayerModeGroup   group;
+};
+
+
+static void     gimp_layer_mode_combo_box_constructed      (GObject               *object);
+static void     gimp_layer_mode_combo_box_set_property     (GObject               *object,
+                                                            guint                  prop_id,
+                                                            const GValue          *value,
+                                                            GParamSpec            *pspec);
+static void     gimp_layer_mode_combo_box_get_property     (GObject               *object,
+                                                            guint                  prop_id,
+                                                            GValue                *value,
+                                                            GParamSpec            *pspec);
+
+static void     gimp_layer_mode_combo_box_changed          (GtkComboBox           *gtk_combo);
+
+static void     gimp_layer_mode_combo_box_update_model     (GimpLayerModeComboBox *combo,
+                                                            gboolean               change_mode);
+static gboolean gimp_layer_mode_combo_box_separator_func   (GtkTreeModel          *model,
+                                                            GtkTreeIter           *iter,
+                                                            gpointer               data);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpLayerModeComboBox, gimp_layer_mode_combo_box,
+                            GIMP_TYPE_ENUM_COMBO_BOX)
+
+#define parent_class gimp_layer_mode_combo_box_parent_class
+
+
+static void
+gimp_layer_mode_combo_box_class_init (GimpLayerModeComboBoxClass *klass)
+{
+  GObjectClass     *object_class = G_OBJECT_CLASS (klass);
+  GtkComboBoxClass *combo_class  = GTK_COMBO_BOX_CLASS (klass);
+
+  object_class->constructed  = gimp_layer_mode_combo_box_constructed;
+  object_class->set_property = gimp_layer_mode_combo_box_set_property;
+  object_class->get_property = gimp_layer_mode_combo_box_get_property;
+
+  combo_class->changed       = gimp_layer_mode_combo_box_changed;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_flags ("context",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_LAYER_MODE_CONTEXT,
+                                                       GIMP_LAYER_MODE_CONTEXT_ALL,
+                                                       GIMP_PARAM_READWRITE |
+                                                       G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_LAYER_MODE,
+                                   g_param_spec_enum ("layer-mode",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_MODE,
+                                                      GIMP_LAYER_MODE_NORMAL,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_GROUP,
+                                   g_param_spec_enum ("group",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_LAYER_MODE_GROUP,
+                                                      GIMP_LAYER_MODE_GROUP_DEFAULT,
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_layer_mode_combo_box_init (GimpLayerModeComboBox *combo)
+{
+  combo->priv = gimp_layer_mode_combo_box_get_instance_private (combo);
+
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
+                                        gimp_layer_mode_combo_box_separator_func,
+                                        GINT_TO_POINTER (GIMP_LAYER_MODE_SEPARATOR),
+                                        NULL);
+}
+
+static void
+gimp_layer_mode_combo_box_constructed (GObject *object)
+{
+  GimpLayerModeComboBox *combo = GIMP_LAYER_MODE_COMBO_BOX (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_layer_mode_combo_box_update_model (combo, FALSE);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
+                                 combo->priv->layer_mode);
+}
+
+static void
+gimp_layer_mode_combo_box_set_property (GObject      *object,
+                                        guint         prop_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpLayerModeComboBox *combo = GIMP_LAYER_MODE_COMBO_BOX (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONTEXT:
+      gimp_layer_mode_combo_box_set_context (combo, g_value_get_flags (value));
+      break;
+
+    case PROP_LAYER_MODE:
+      gimp_layer_mode_combo_box_set_mode (combo, g_value_get_enum (value));
+      break;
+
+    case PROP_GROUP:
+      gimp_layer_mode_combo_box_set_group (combo, g_value_get_enum (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_mode_combo_box_get_property (GObject    *object,
+                                        guint       prop_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpLayerModeComboBox *combo = GIMP_LAYER_MODE_COMBO_BOX (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_flags (value, combo->priv->context);
+      break;
+
+    case PROP_LAYER_MODE:
+      g_value_set_enum (value, combo->priv->layer_mode);
+      break;
+
+    case PROP_GROUP:
+      g_value_set_enum (value, combo->priv->group);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_layer_mode_combo_box_changed (GtkComboBox *gtk_combo)
+{
+  GimpLayerModeComboBox *combo = GIMP_LAYER_MODE_COMBO_BOX (gtk_combo);
+  GimpLayerMode          mode;
+
+  if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo),
+                                     (gint *) &mode))
+    {
+      combo->priv->layer_mode = mode;
+
+      g_object_notify (G_OBJECT (combo), "layer-mode");
+    }
+}
+
+
+/**
+ * gimp_layer_mode_combo_box_new:
+ * Foo.
+ *
+ * Return value: a new #GimpLayerModeComboBox.
+ **/
+GtkWidget *
+gimp_layer_mode_combo_box_new (GimpLayerModeContext context)
+{
+  return g_object_new (GIMP_TYPE_LAYER_MODE_COMBO_BOX,
+                       "context", context,
+                       NULL);
+}
+
+void
+gimp_layer_mode_combo_box_set_context (GimpLayerModeComboBox *combo,
+                                       GimpLayerModeContext   context)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo));
+
+  if (context != combo->priv->context)
+    {
+      g_object_freeze_notify (G_OBJECT (combo));
+
+      combo->priv->context = context;
+      g_object_notify (G_OBJECT (combo), "context");
+
+      gimp_layer_mode_combo_box_update_model (combo, TRUE);
+
+      g_object_thaw_notify (G_OBJECT (combo));
+    }
+}
+
+GimpLayerModeContext
+gimp_layer_mode_combo_box_get_context (GimpLayerModeComboBox *combo)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo),
+                        GIMP_LAYER_MODE_CONTEXT_ALL);
+
+  return combo->priv->context;
+}
+
+void
+gimp_layer_mode_combo_box_set_mode (GimpLayerModeComboBox *combo,
+                                    GimpLayerMode          mode)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo));
+  g_return_if_fail (gimp_layer_mode_get_context (mode) & combo->priv->context);
+
+  if (mode != combo->priv->layer_mode)
+    {
+      GtkTreeModel *model;
+      GtkTreeIter   dummy;
+
+      model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+
+      g_object_freeze_notify (G_OBJECT (combo));
+
+      if (! gimp_int_store_lookup_by_value (model, mode, &dummy))
+        {
+          combo->priv->group = gimp_layer_mode_get_group (mode);
+          g_object_notify (G_OBJECT (combo), "group");
+
+          gimp_layer_mode_combo_box_update_model (combo, FALSE);
+        }
+
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), mode);
+
+      g_object_thaw_notify (G_OBJECT (combo));
+    }
+}
+
+GimpLayerMode
+gimp_layer_mode_combo_box_get_mode (GimpLayerModeComboBox *combo)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo),
+                        GIMP_LAYER_MODE_NORMAL);
+
+  return combo->priv->layer_mode;
+}
+
+void
+gimp_layer_mode_combo_box_set_group (GimpLayerModeComboBox *combo,
+                                     GimpLayerModeGroup     group)
+{
+  g_return_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo));
+
+  if (group != combo->priv->group)
+    {
+      g_object_freeze_notify (G_OBJECT (combo));
+
+      combo->priv->group = group;
+      g_object_notify (G_OBJECT (combo), "group");
+
+      gimp_layer_mode_combo_box_update_model (combo, TRUE);
+
+      g_object_thaw_notify (G_OBJECT (combo));
+    }
+}
+
+GimpLayerModeGroup
+gimp_layer_mode_combo_box_get_group (GimpLayerModeComboBox *combo)
+{
+  g_return_val_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo),
+                        GIMP_LAYER_MODE_GROUP_DEFAULT);
+
+  return combo->priv->group;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_enum_store_add_value (GtkListStore *store,
+                           GEnumValue   *value)
+{
+  GtkTreeIter  iter = { 0, };
+  const gchar *desc;
+  const gchar *abbrev;
+  gchar       *stripped;
+
+  desc   = gimp_enum_value_get_desc   (GIMP_ENUM_STORE (store)->enum_class, value);
+  abbrev = gimp_enum_value_get_abbrev (GIMP_ENUM_STORE (store)->enum_class, value);
+
+  /* no mnemonics in combo boxes */
+  stripped = gimp_strip_uline (desc);
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter,
+                      GIMP_INT_STORE_VALUE,  value->value,
+                      GIMP_INT_STORE_LABEL,  stripped,
+                      GIMP_INT_STORE_ABBREV, abbrev,
+                      -1);
+
+  g_free (stripped);
+}
+
+static void
+gimp_enum_store_add_separator (GtkListStore *store)
+{
+  GtkTreeIter  iter = { 0, };
+
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter,
+                      GIMP_INT_STORE_VALUE, GIMP_LAYER_MODE_SEPARATOR,
+                      -1);
+}
+
+static GtkListStore *
+gimp_enum_store_new_from_array (GType                 enum_type,
+                                gint                  n_values,
+                                const gint           *values,
+                                GimpLayerModeContext  context)
+{
+  GtkListStore *store;
+  GEnumValue   *value;
+  gboolean      first_item        = TRUE;
+  gboolean      prepend_separator = FALSE;
+  gint          i;
+
+  g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL);
+  g_return_val_if_fail (n_values > 1, NULL);
+  g_return_val_if_fail (values != NULL, NULL);
+
+  store = g_object_new (GIMP_TYPE_ENUM_STORE,
+                        "enum-type", enum_type,
+                        NULL);
+
+  for (i = 0; i < n_values; i++)
+    {
+      if (values[i] != GIMP_LAYER_MODE_SEPARATOR)
+        {
+          if (gimp_layer_mode_get_context (values[i]) & context)
+            {
+              value = g_enum_get_value (GIMP_ENUM_STORE (store)->enum_class,
+                                        values[i]);
+
+              if (value)
+                {
+                  if (prepend_separator)
+                    {
+                      gimp_enum_store_add_separator (store);
+
+                      prepend_separator = FALSE;
+                    }
+
+                  gimp_enum_store_add_value (store, value);
+
+                  first_item = FALSE;
+                }
+            }
+        }
+      else
+        {
+          if (! first_item)
+            prepend_separator = TRUE;
+        }
+    }
+
+  return store;
+}
+
+static void
+gimp_layer_mode_combo_box_update_model (GimpLayerModeComboBox *combo,
+                                        gboolean               change_mode)
+{
+  GtkListStore        *store;
+  const GimpLayerMode *modes;
+  gint                 n_modes;
+
+  modes = gimp_layer_mode_get_group_array (combo->priv->group, &n_modes);
+  store = gimp_enum_store_new_from_array (GIMP_TYPE_LAYER_MODE,
+                                          n_modes, (gint *) modes,
+                                          combo->priv->context);
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (store));
+  g_object_unref (store);
+
+  if (change_mode)
+    {
+      GimpLayerMode new_mode;
+
+      if (gimp_layer_mode_get_for_group (combo->priv->layer_mode,
+                                         combo->priv->group,
+                                         &new_mode) &&
+          (gimp_layer_mode_get_context (new_mode) & combo->priv->context))
+        {
+          gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), new_mode);
+        }
+      else
+        {
+          GtkTreeIter iter;
+
+          /*  switch to the first mode, which will be one of the "normal"  */
+          gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
+          gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
+        }
+    }
+}
+
+static gboolean
+gimp_layer_mode_combo_box_separator_func (GtkTreeModel *model,
+                                          GtkTreeIter  *iter,
+                                          gpointer      data)
+{
+  gint value;
+
+  gtk_tree_model_get (model, iter, GIMP_INT_STORE_VALUE, &value, -1);
+
+  return value == GPOINTER_TO_INT (data);
+}
diff --git a/app/widgets/gimplayermodecombobox.h b/app/widgets/gimplayermodecombobox.h
new file mode 100644
index 0000000..e37b263
--- /dev/null
+++ b/app/widgets/gimplayermodecombobox.h
@@ -0,0 +1,66 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
+ *
+ * gimplayermodecombobox.h
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_MODE_COMBO_BOX_H__
+#define __GIMP_LAYER_MODE_COMBO_BOX_H__
+
+
+#define GIMP_TYPE_LAYER_MODE_COMBO_BOX            (gimp_layer_mode_combo_box_get_type ())
+#define GIMP_LAYER_MODE_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_MODE_COMBO_BOX, GimpLayerModeComboBox))
+#define GIMP_LAYER_MODE_COMBO_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_MODE_COMBO_BOX, GimpLayerModeComboBoxClass))
+#define GIMP_IS_LAYER_MODE_COMBO_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_MODE_COMBO_BOX))
+#define GIMP_IS_LAYER_MODE_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_MODE_COMBO_BOX))
+#define GIMP_LAYER_MODE_COMBO_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_MODE_COMBO_BOX, GimpLayerModeComboBoxClass))
+
+
+typedef struct _GimpLayerModeComboBoxPrivate GimpLayerModeComboBoxPrivate;
+typedef struct _GimpLayerModeComboBoxClass   GimpLayerModeComboBoxClass;
+
+struct _GimpLayerModeComboBox
+{
+  GimpEnumComboBox              parent_instance;
+
+  GimpLayerModeComboBoxPrivate *priv;
+};
+
+struct _GimpLayerModeComboBoxClass
+{
+  GimpEnumComboBoxClass  parent_class;
+};
+
+
+GType                  gimp_layer_mode_combo_box_get_type    (void) G_GNUC_CONST;
+
+GtkWidget            * gimp_layer_mode_combo_box_new         (GimpLayerModeContext   context);
+
+void                   gimp_layer_mode_combo_box_set_context (GimpLayerModeComboBox *combo,
+                                                              GimpLayerModeContext   context);
+GimpLayerModeContext   gimp_layer_mode_combo_box_get_context (GimpLayerModeComboBox *combo);
+
+void                   gimp_layer_mode_combo_box_set_mode    (GimpLayerModeComboBox *combo,
+                                                              GimpLayerMode          mode);
+GimpLayerMode          gimp_layer_mode_combo_box_get_mode    (GimpLayerModeComboBox *combo);
+
+void                   gimp_layer_mode_combo_box_set_group   (GimpLayerModeComboBox *combo,
+                                                              GimpLayerModeGroup     group);
+GimpLayerModeGroup     gimp_layer_mode_combo_box_get_group   (GimpLayerModeComboBox *combo);
+
+
+#endif  /* __GIMP_LAYER_MODE_COMBO_BOX_H__ */
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
new file mode 100644
index 0000000..9b61504
--- /dev/null
+++ b/app/widgets/gimplayertreeview.c
@@ -0,0 +1,1555 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplayertreeview.c
+ * Copyright (C) 2001-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpimage.h"
+#include "core/gimpitemundo.h"
+#include "core/gimplayer.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimplayer-new.h"
+#include "core/gimplayermask.h"
+#include "core/gimptreehandler.h"
+
+#include "text/gimptextlayer.h"
+
+#include "file/file-open.h"
+
+#include "gimpactiongroup.h"
+#include "gimpcellrendererviewable.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimphelp-ids.h"
+#include "gimphighlightablebutton.h"
+#include "gimplayermodebox.h"
+#include "gimplayertreeview.h"
+#include "gimpspinscale.h"
+#include "gimpuimanager.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpLayerTreeViewPrivate
+{
+  GtkWidget       *layer_mode_box;
+  GtkAdjustment   *opacity_adjustment;
+  GtkWidget       *lock_alpha_toggle;
+  GtkWidget       *anchor_button;
+
+  gint             model_column_mask;
+  gint             model_column_mask_visible;
+
+  GtkCellRenderer *mask_cell;
+
+  PangoAttrList   *italic_attrs;
+  PangoAttrList   *bold_attrs;
+
+  GimpTreeHandler *mode_changed_handler;
+  GimpTreeHandler *opacity_changed_handler;
+  GimpTreeHandler *lock_alpha_changed_handler;
+  GimpTreeHandler *mask_changed_handler;
+  GimpTreeHandler *alpha_changed_handler;
+};
+
+
+static void       gimp_layer_tree_view_view_iface_init            (GimpContainerViewInterface *iface);
+
+static void       gimp_layer_tree_view_constructed                (GObject                    *object);
+static void       gimp_layer_tree_view_finalize                   (GObject                    *object);
+
+static void       gimp_layer_tree_view_set_container              (GimpContainerView          *view,
+                                                                   GimpContainer              *container);
+static void       gimp_layer_tree_view_set_context                (GimpContainerView          *view,
+                                                                   GimpContext                *context);
+static gpointer   gimp_layer_tree_view_insert_item                (GimpContainerView          *view,
+                                                                   GimpViewable               *viewable,
+                                                                   gpointer                    parent_insert_data,
+                                                                   gint                        index);
+static gboolean   gimp_layer_tree_view_select_item                (GimpContainerView          *view,
+                                                                   GimpViewable               *item,
+                                                                   gpointer                    insert_data);
+static void       gimp_layer_tree_view_set_view_size              (GimpContainerView          *view);
+static gboolean   gimp_layer_tree_view_drop_possible              (GimpContainerTreeView      *view,
+                                                                   GimpDndType                 src_type,
+                                                                   GimpViewable               *src_viewable,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreePath                *drop_path,
+                                                                   GtkTreeViewDropPosition     drop_pos,
+                                                                   GtkTreeViewDropPosition    *return_drop_pos,
+                                                                   GdkDragAction              *return_drag_action);
+static void       gimp_layer_tree_view_drop_color                 (GimpContainerTreeView      *view,
+                                                                   const GimpRGB              *color,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreeViewDropPosition     drop_pos);
+static void       gimp_layer_tree_view_drop_uri_list              (GimpContainerTreeView      *view,
+                                                                   GList                      *uri_list,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreeViewDropPosition     drop_pos);
+static void       gimp_layer_tree_view_drop_component             (GimpContainerTreeView      *tree_view,
+                                                                   GimpImage                  *image,
+                                                                   GimpChannelType             component,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreeViewDropPosition     drop_pos);
+static void       gimp_layer_tree_view_drop_pixbuf                (GimpContainerTreeView      *tree_view,
+                                                                   GdkPixbuf                  *pixbuf,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreeViewDropPosition     drop_pos);
+static void       gimp_layer_tree_view_set_image                  (GimpItemTreeView           *view,
+                                                                   GimpImage                  *image);
+static GimpItem * gimp_layer_tree_view_item_new                   (GimpImage                  *image);
+static void       gimp_layer_tree_view_floating_selection_changed (GimpImage                  *image,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_layer_mode_box_callback    (GtkWidget                  *widget,
+                                                                   const GParamSpec           *pspec,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_opacity_scale_changed      (GtkAdjustment              *adj,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_lock_alpha_button_toggled  (GtkWidget                  *widget,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_layer_signal_handler       (GimpLayer                  *layer,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_update_options             (GimpLayerTreeView          *view,
+                                                                   GimpLayer                  *layer);
+static void       gimp_layer_tree_view_update_menu                (GimpLayerTreeView          *view,
+                                                                   GimpLayer                  *layer);
+static void       gimp_layer_tree_view_update_highlight           (GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_mask_update                (GimpLayerTreeView          *view,
+                                                                   GtkTreeIter                *iter,
+                                                                   GimpLayer                  *layer);
+static void       gimp_layer_tree_view_mask_changed               (GimpLayer                  *layer,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_renderer_update            (GimpViewRenderer           *renderer,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_update_borders             (GimpLayerTreeView          *view,
+                                                                   GtkTreeIter                *iter);
+static void       gimp_layer_tree_view_mask_callback              (GimpLayer                  *mask,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_layer_clicked              (GimpCellRendererViewable   *cell,
+                                                                   const gchar                *path,
+                                                                   GdkModifierType             state,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_mask_clicked               (GimpCellRendererViewable   *cell,
+                                                                   const gchar                *path,
+                                                                   GdkModifierType             state,
+                                                                   GimpLayerTreeView          *view);
+static void       gimp_layer_tree_view_alpha_update               (GimpLayerTreeView          *view,
+                                                                   GtkTreeIter                *iter,
+                                                                   GimpLayer                  *layer);
+static void       gimp_layer_tree_view_alpha_changed              (GimpLayer                  *layer,
+                                                                   GimpLayerTreeView          *view);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpLayerTreeView, gimp_layer_tree_view,
+                         GIMP_TYPE_DRAWABLE_TREE_VIEW,
+                         G_ADD_PRIVATE (GimpLayerTreeView)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_layer_tree_view_view_iface_init))
+
+#define parent_class gimp_layer_tree_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_layer_tree_view_class_init (GimpLayerTreeViewClass *klass)
+{
+  GObjectClass               *object_class = G_OBJECT_CLASS (klass);
+  GimpContainerTreeViewClass *tree_view_class;
+  GimpItemTreeViewClass      *item_view_class;
+
+  tree_view_class = GIMP_CONTAINER_TREE_VIEW_CLASS (klass);
+  item_view_class = GIMP_ITEM_TREE_VIEW_CLASS (klass);
+
+  object_class->constructed = gimp_layer_tree_view_constructed;
+  object_class->finalize    = gimp_layer_tree_view_finalize;
+
+  tree_view_class->drop_possible   = gimp_layer_tree_view_drop_possible;
+  tree_view_class->drop_color      = gimp_layer_tree_view_drop_color;
+  tree_view_class->drop_uri_list   = gimp_layer_tree_view_drop_uri_list;
+  tree_view_class->drop_component  = gimp_layer_tree_view_drop_component;
+  tree_view_class->drop_pixbuf     = gimp_layer_tree_view_drop_pixbuf;
+
+  item_view_class->item_type       = GIMP_TYPE_LAYER;
+  item_view_class->signal_name     = "active-layer-changed";
+
+  item_view_class->set_image       = gimp_layer_tree_view_set_image;
+  item_view_class->get_container   = gimp_image_get_layers;
+  item_view_class->get_active_item = (GimpGetItemFunc) gimp_image_get_active_layer;
+  item_view_class->set_active_item = (GimpSetItemFunc) gimp_image_set_active_layer;
+  item_view_class->add_item        = (GimpAddItemFunc) gimp_image_add_layer;
+  item_view_class->remove_item     = (GimpRemoveItemFunc) gimp_image_remove_layer;
+  item_view_class->new_item        = gimp_layer_tree_view_item_new;
+
+  item_view_class->action_group          = "layers";
+  item_view_class->activate_action       = "layers-edit";
+  item_view_class->new_action            = "layers-new";
+  item_view_class->new_default_action    = "layers-new-last-values";
+  item_view_class->raise_action          = "layers-raise";
+  item_view_class->raise_top_action      = "layers-raise-to-top";
+  item_view_class->lower_action          = "layers-lower";
+  item_view_class->lower_bottom_action   = "layers-lower-to-bottom";
+  item_view_class->duplicate_action      = "layers-duplicate";
+  item_view_class->delete_action         = "layers-delete";
+  item_view_class->lock_content_help_id  = GIMP_HELP_LAYER_LOCK_PIXELS;
+  item_view_class->lock_position_help_id = GIMP_HELP_LAYER_LOCK_POSITION;
+}
+
+static void
+gimp_layer_tree_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  iface->set_container = gimp_layer_tree_view_set_container;
+  iface->set_context   = gimp_layer_tree_view_set_context;
+  iface->insert_item   = gimp_layer_tree_view_insert_item;
+  iface->select_item   = gimp_layer_tree_view_select_item;
+  iface->set_view_size = gimp_layer_tree_view_set_view_size;
+
+  iface->model_is_tree = TRUE;
+}
+
+static void
+gimp_layer_tree_view_init (GimpLayerTreeView *view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GtkWidget             *scale;
+  GtkWidget             *hbox;
+  GtkWidget             *image;
+  GtkIconSize            icon_size;
+  PangoAttribute        *attr;
+
+  view->priv = gimp_layer_tree_view_get_instance_private (view);
+
+  view->priv->model_column_mask =
+    gimp_container_tree_store_columns_add (tree_view->model_columns,
+                                           &tree_view->n_model_columns,
+                                           GIMP_TYPE_VIEW_RENDERER);
+
+  view->priv->model_column_mask_visible =
+    gimp_container_tree_store_columns_add (tree_view->model_columns,
+                                           &tree_view->n_model_columns,
+                                           G_TYPE_BOOLEAN);
+
+  /*  Paint mode menu  */
+
+  view->priv->layer_mode_box = gimp_layer_mode_box_new (GIMP_LAYER_MODE_CONTEXT_LAYER);
+  gimp_layer_mode_box_set_label (GIMP_LAYER_MODE_BOX (view->priv->layer_mode_box),
+                                 _("Mode"));
+  gimp_item_tree_view_add_options (GIMP_ITEM_TREE_VIEW (view), NULL,
+                                   view->priv->layer_mode_box);
+
+  g_signal_connect (view->priv->layer_mode_box, "notify::layer-mode",
+                    G_CALLBACK (gimp_layer_tree_view_layer_mode_box_callback),
+                    view);
+
+  gimp_help_set_help_data (view->priv->layer_mode_box, NULL,
+                           GIMP_HELP_LAYER_DIALOG_PAINT_MODE_MENU);
+
+  /*  Opacity scale  */
+
+  view->priv->opacity_adjustment =
+    GTK_ADJUSTMENT (gtk_adjustment_new (100.0, 0.0, 100.0,
+                                        1.0, 10.0, 0.0));
+  scale = gimp_spin_scale_new (view->priv->opacity_adjustment, _("Opacity"), 1);
+  gimp_help_set_help_data (scale, NULL,
+                           GIMP_HELP_LAYER_DIALOG_OPACITY_SCALE);
+  gimp_item_tree_view_add_options (GIMP_ITEM_TREE_VIEW (view),
+                                   NULL, scale);
+
+  g_signal_connect (view->priv->opacity_adjustment, "value-changed",
+                    G_CALLBACK (gimp_layer_tree_view_opacity_scale_changed),
+                    view);
+
+  /*  Lock alpha toggle  */
+
+  hbox = gimp_item_tree_view_get_lock_box (GIMP_ITEM_TREE_VIEW (view));
+
+  view->priv->lock_alpha_toggle = gtk_toggle_button_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), view->priv->lock_alpha_toggle,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (view->priv->lock_alpha_toggle);
+
+  g_signal_connect (view->priv->lock_alpha_toggle, "toggled",
+                    G_CALLBACK (gimp_layer_tree_view_lock_alpha_button_toggled),
+                    view);
+
+  gimp_help_set_help_data (view->priv->lock_alpha_toggle,
+                           _("Lock alpha channel"),
+                           GIMP_HELP_LAYER_LOCK_ALPHA);
+
+  gtk_widget_style_get (GTK_WIDGET (view),
+                        "button-icon-size", &icon_size,
+                        NULL);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_TRANSPARENCY, icon_size);
+  gtk_container_add (GTK_CONTAINER (view->priv->lock_alpha_toggle), image);
+  gtk_widget_show (image);
+
+  view->priv->italic_attrs = pango_attr_list_new ();
+  attr = pango_attr_style_new (PANGO_STYLE_ITALIC);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (view->priv->italic_attrs, attr);
+
+  view->priv->bold_attrs = pango_attr_list_new ();
+  attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (view->priv->bold_attrs, attr);
+}
+
+static void
+gimp_layer_tree_view_constructed (GObject *object)
+{
+  GimpContainerTreeView *tree_view  = GIMP_CONTAINER_TREE_VIEW (object);
+  GimpItemTreeView      *item_view  = GIMP_ITEM_TREE_VIEW (object);
+  GimpLayerTreeView     *layer_view = GIMP_LAYER_TREE_VIEW (object);
+  GtkWidget             *button;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_highlightable_button_set_highlight_color (
+    GIMP_HIGHLIGHTABLE_BUTTON (gimp_item_tree_view_get_new_button (item_view)),
+    GIMP_HIGHLIGHTABLE_BUTTON_COLOR_AFFIRMATIVE);
+  gimp_highlightable_button_set_highlight_color (
+    GIMP_HIGHLIGHTABLE_BUTTON (gimp_item_tree_view_get_delete_button (item_view)),
+    GIMP_HIGHLIGHTABLE_BUTTON_COLOR_NEGATIVE);
+
+  layer_view->priv->mask_cell = gimp_cell_renderer_viewable_new ();
+  gtk_tree_view_column_pack_start (tree_view->main_column,
+                                   layer_view->priv->mask_cell,
+                                   FALSE);
+  gtk_tree_view_column_set_attributes (tree_view->main_column,
+                                       layer_view->priv->mask_cell,
+                                       "renderer",
+                                       layer_view->priv->model_column_mask,
+                                       "visible",
+                                       layer_view->priv->model_column_mask_visible,
+                                       NULL);
+
+  gimp_container_tree_view_add_renderer_cell (tree_view,
+                                              layer_view->priv->mask_cell);
+
+  g_signal_connect (tree_view->renderer_cell, "clicked",
+                    G_CALLBACK (gimp_layer_tree_view_layer_clicked),
+                    layer_view);
+  g_signal_connect (layer_view->priv->mask_cell, "clicked",
+                    G_CALLBACK (gimp_layer_tree_view_mask_clicked),
+                    layer_view);
+
+  gimp_dnd_component_dest_add (GTK_WIDGET (tree_view->view),
+                               NULL, tree_view);
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (tree_view->view), GIMP_TYPE_CHANNEL,
+                               NULL, tree_view);
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER_MASK,
+                               NULL, tree_view);
+  gimp_dnd_uri_list_dest_add  (GTK_WIDGET (tree_view->view),
+                               NULL, tree_view);
+  gimp_dnd_pixbuf_dest_add    (GTK_WIDGET (tree_view->view),
+                               NULL, tree_view);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (layer_view), "layers",
+                                          "layers-new-group", NULL);
+  gtk_box_reorder_child (gimp_editor_get_button_box (GIMP_EDITOR (layer_view)),
+                         button, 1);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (layer_view), "layers",
+                                          "layers-anchor", NULL);
+  layer_view->priv->anchor_button = button;
+  gimp_highlightable_button_set_highlight_color (
+    GIMP_HIGHLIGHTABLE_BUTTON (button),
+    GIMP_HIGHLIGHTABLE_BUTTON_COLOR_AFFIRMATIVE);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (layer_view),
+                                  GTK_BUTTON (button),
+                                  GIMP_TYPE_LAYER);
+  gtk_box_reorder_child (gimp_editor_get_button_box (GIMP_EDITOR (layer_view)),
+                         button, 5);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (layer_view), "layers",
+                                          "layers-merge-down-button",
+                                          "layers-merge-group",
+                                          GDK_SHIFT_MASK,
+                                          "layers-merge-layers",
+                                          GDK_CONTROL_MASK,
+                                          "layers-merge-layers-last-values",
+                                          GDK_CONTROL_MASK |
+                                          GDK_SHIFT_MASK,
+                                          NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (layer_view),
+                                  GTK_BUTTON (button),
+                                  GIMP_TYPE_LAYER);
+  gtk_box_reorder_child (gimp_editor_get_button_box (GIMP_EDITOR (layer_view)),
+                         button, 6);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (layer_view), "layers",
+                                          "layers-mask-add-button",
+                                          "layers-mask-add-last-values",
+                                          gimp_get_extend_selection_mask (),
+                                          "layers-mask-delete",
+                                          gimp_get_modify_selection_mask (),
+                                          "layers-mask-apply",
+                                          gimp_get_extend_selection_mask () |
+                                          gimp_get_modify_selection_mask (),
+                                          NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (layer_view),
+                                  GTK_BUTTON (button),
+                                  GIMP_TYPE_LAYER);
+  gtk_box_reorder_child (gimp_editor_get_button_box (GIMP_EDITOR (layer_view)),
+                         button, 7);
+}
+
+static void
+gimp_layer_tree_view_finalize (GObject *object)
+{
+  GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (object);
+
+  if (layer_view->priv->italic_attrs)
+    {
+      pango_attr_list_unref (layer_view->priv->italic_attrs);
+      layer_view->priv->italic_attrs = NULL;
+    }
+
+  if (layer_view->priv->bold_attrs)
+    {
+      pango_attr_list_unref (layer_view->priv->bold_attrs);
+      layer_view->priv->bold_attrs = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+/*  GimpContainerView methods  */
+
+static void
+gimp_layer_tree_view_set_container (GimpContainerView *view,
+                                    GimpContainer     *container)
+{
+  GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (view);
+  GimpContainer     *old_container;
+
+  old_container = gimp_container_view_get_container (view);
+
+  if (old_container)
+    {
+      gimp_tree_handler_disconnect (layer_view->priv->mode_changed_handler);
+      layer_view->priv->mode_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (layer_view->priv->opacity_changed_handler);
+      layer_view->priv->opacity_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (layer_view->priv->lock_alpha_changed_handler);
+      layer_view->priv->lock_alpha_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (layer_view->priv->mask_changed_handler);
+      layer_view->priv->mask_changed_handler = NULL;
+
+      gimp_tree_handler_disconnect (layer_view->priv->alpha_changed_handler);
+      layer_view->priv->alpha_changed_handler = NULL;
+    }
+
+  parent_view_iface->set_container (view, container);
+
+  if (container)
+    {
+      layer_view->priv->mode_changed_handler =
+        gimp_tree_handler_connect (container, "mode-changed",
+                                   G_CALLBACK (gimp_layer_tree_view_layer_signal_handler),
+                                   view);
+
+      layer_view->priv->opacity_changed_handler =
+        gimp_tree_handler_connect (container, "opacity-changed",
+                                   G_CALLBACK (gimp_layer_tree_view_layer_signal_handler),
+                                   view);
+
+      layer_view->priv->lock_alpha_changed_handler =
+        gimp_tree_handler_connect (container, "lock-alpha-changed",
+                                   G_CALLBACK (gimp_layer_tree_view_layer_signal_handler),
+                                   view);
+
+      layer_view->priv->mask_changed_handler =
+        gimp_tree_handler_connect (container, "mask-changed",
+                                   G_CALLBACK (gimp_layer_tree_view_mask_changed),
+                                   view);
+
+      layer_view->priv->alpha_changed_handler =
+        gimp_tree_handler_connect (container, "alpha-changed",
+                                   G_CALLBACK (gimp_layer_tree_view_alpha_changed),
+                                   view);
+    }
+}
+
+typedef struct
+{
+  gint         mask_column;
+  GimpContext *context;
+} SetContextForeachData;
+
+static gboolean
+gimp_layer_tree_view_set_context_foreach (GtkTreeModel *model,
+                                          GtkTreePath  *path,
+                                          GtkTreeIter  *iter,
+                                          gpointer      data)
+{
+  SetContextForeachData *context_data = data;
+  GimpViewRenderer      *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      context_data->mask_column, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      gimp_view_renderer_set_context (renderer, context_data->context);
+
+      g_object_unref (renderer);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_layer_tree_view_set_context (GimpContainerView *view,
+                                  GimpContext       *context)
+{
+  GimpContainerTreeView *tree_view  = GIMP_CONTAINER_TREE_VIEW (view);
+  GimpLayerTreeView     *layer_view = GIMP_LAYER_TREE_VIEW (view);
+
+  parent_view_iface->set_context (view, context);
+
+  if (tree_view->model)
+    {
+      SetContextForeachData context_data = { layer_view->priv->model_column_mask,
+                                             context };
+
+      gtk_tree_model_foreach (tree_view->model,
+                              gimp_layer_tree_view_set_context_foreach,
+                              &context_data);
+    }
+}
+
+static gpointer
+gimp_layer_tree_view_insert_item (GimpContainerView *view,
+                                  GimpViewable      *viewable,
+                                  gpointer           parent_insert_data,
+                                  gint               index)
+{
+  GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (view);
+  GimpLayer         *layer;
+  GtkTreeIter       *iter;
+
+  iter = parent_view_iface->insert_item (view, viewable,
+                                         parent_insert_data, index);
+
+  layer = GIMP_LAYER (viewable);
+
+  if (! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
+    gimp_layer_tree_view_alpha_update (layer_view, iter, layer);
+
+  gimp_layer_tree_view_mask_update (layer_view, iter, layer);
+
+  return iter;
+}
+
+static gboolean
+gimp_layer_tree_view_select_item (GimpContainerView *view,
+                                  GimpViewable      *item,
+                                  gpointer           insert_data)
+{
+  GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (view);
+  gboolean           success;
+
+  success = parent_view_iface->select_item (view, item, insert_data);
+
+  if (item)
+    {
+      if (success)
+        {
+          gimp_layer_tree_view_update_borders (layer_view,
+                                               (GtkTreeIter *) insert_data);
+          gimp_layer_tree_view_update_options (layer_view, GIMP_LAYER (item));
+          gimp_layer_tree_view_update_menu (layer_view, GIMP_LAYER (item));
+        }
+    }
+
+  if (! success)
+    {
+      GimpEditor *editor = GIMP_EDITOR (view);
+
+      /* currently, select_item() only ever fails when there is a floating
+       * selection, which can be committed/canceled through the editor buttons.
+       */
+      gimp_widget_blink (GTK_WIDGET (gimp_editor_get_button_box (editor)));
+    }
+
+  return success;
+}
+
+typedef struct
+{
+  gint mask_column;
+  gint view_size;
+  gint border_width;
+} SetSizeForeachData;
+
+static gboolean
+gimp_layer_tree_view_set_view_size_foreach (GtkTreeModel *model,
+                                            GtkTreePath  *path,
+                                            GtkTreeIter  *iter,
+                                            gpointer      data)
+{
+  SetSizeForeachData *size_data = data;
+  GimpViewRenderer   *renderer;
+
+  gtk_tree_model_get (model, iter,
+                      size_data->mask_column, &renderer,
+                      -1);
+
+  if (renderer)
+    {
+      gimp_view_renderer_set_size (renderer,
+                                   size_data->view_size,
+                                   size_data->border_width);
+
+      g_object_unref (renderer);
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_layer_tree_view_set_view_size (GimpContainerView *view)
+{
+  GimpContainerTreeView *tree_view  = GIMP_CONTAINER_TREE_VIEW (view);
+
+  if (tree_view->model)
+    {
+      GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (view);
+      SetSizeForeachData size_data;
+
+      size_data.mask_column = layer_view->priv->model_column_mask;
+
+      size_data.view_size =
+        gimp_container_view_get_view_size (view, &size_data.border_width);
+
+      gtk_tree_model_foreach (tree_view->model,
+                              gimp_layer_tree_view_set_view_size_foreach,
+                              &size_data);
+    }
+
+  parent_view_iface->set_view_size (view);
+}
+
+
+/*  GimpContainerTreeView methods  */
+
+static gboolean
+gimp_layer_tree_view_drop_possible (GimpContainerTreeView   *tree_view,
+                                    GimpDndType              src_type,
+                                    GimpViewable            *src_viewable,
+                                    GimpViewable            *dest_viewable,
+                                    GtkTreePath             *drop_path,
+                                    GtkTreeViewDropPosition  drop_pos,
+                                    GtkTreeViewDropPosition *return_drop_pos,
+                                    GdkDragAction           *return_drag_action)
+{
+  /* If we are dropping a new layer, check if the destination image
+   * has a floating selection.
+   */
+  if  (src_type == GIMP_DND_TYPE_URI_LIST     ||
+       src_type == GIMP_DND_TYPE_TEXT_PLAIN   ||
+       src_type == GIMP_DND_TYPE_NETSCAPE_URL ||
+       src_type == GIMP_DND_TYPE_COMPONENT    ||
+       src_type == GIMP_DND_TYPE_PIXBUF       ||
+       GIMP_IS_DRAWABLE (src_viewable))
+    {
+      GimpImage *dest_image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (tree_view));
+
+      if (gimp_image_get_floating_selection (dest_image))
+        return FALSE;
+    }
+
+  return GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_possible (tree_view,
+                                                                       src_type,
+                                                                       src_viewable,
+                                                                       dest_viewable,
+                                                                       drop_path,
+                                                                       drop_pos,
+                                                                       return_drop_pos,
+                                                                       return_drag_action);
+}
+
+static void
+gimp_layer_tree_view_drop_color (GimpContainerTreeView   *view,
+                                 const GimpRGB           *color,
+                                 GimpViewable            *dest_viewable,
+                                 GtkTreeViewDropPosition  drop_pos)
+{
+  if (gimp_item_is_text_layer (GIMP_ITEM (dest_viewable)))
+    {
+      gimp_text_layer_set (GIMP_TEXT_LAYER (dest_viewable), NULL,
+                           "color", color,
+                           NULL);
+      gimp_image_flush (gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view)));
+      return;
+    }
+
+  GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_color (view, color,
+                                                             dest_viewable,
+                                                             drop_pos);
+}
+
+static void
+gimp_layer_tree_view_drop_uri_list (GimpContainerTreeView   *view,
+                                    GList                   *uri_list,
+                                    GimpViewable            *dest_viewable,
+                                    GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeView  *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpContainerView *cont_view = GIMP_CONTAINER_VIEW (view);
+  GimpImage         *image     = gimp_item_tree_view_get_image (item_view);
+  GimpLayer         *parent;
+  gint               index;
+  GList             *list;
+
+  index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                              drop_pos,
+                                              (GimpViewable **) &parent);
+
+  g_object_ref (image);
+
+  for (list = uri_list; list; list = g_list_next (list))
+    {
+      const gchar       *uri   = list->data;
+      GFile             *file  = g_file_new_for_uri (uri);
+      GList             *new_layers;
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+
+      new_layers = file_open_layers (image->gimp,
+                                     gimp_container_view_get_context (cont_view),
+                                     NULL,
+                                     image, FALSE,
+                                     file, GIMP_RUN_INTERACTIVE, NULL,
+                                     &status, &error);
+
+      if (new_layers)
+        {
+          gimp_image_add_layers (image, new_layers, parent, index,
+                                 0, 0,
+                                 gimp_image_get_width (image),
+                                 gimp_image_get_height (image),
+                                 _("Drop layers"));
+
+          index += g_list_length (new_layers);
+
+          g_list_free (new_layers);
+        }
+      else if (status != GIMP_PDB_CANCEL)
+        {
+          gimp_message (image->gimp, G_OBJECT (view), GIMP_MESSAGE_ERROR,
+                        _("Opening '%s' failed:\n\n%s"),
+                        gimp_file_get_utf8_name (file), error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (file);
+    }
+
+  gimp_image_flush (image);
+
+  g_object_unref (image);
+}
+
+static void
+gimp_layer_tree_view_drop_component (GimpContainerTreeView   *tree_view,
+                                     GimpImage               *src_image,
+                                     GimpChannelType          component,
+                                     GimpViewable            *dest_viewable,
+                                     GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (tree_view);
+  GimpImage        *image     = gimp_item_tree_view_get_image (item_view);
+  GimpChannel      *channel;
+  GimpItem         *new_item;
+  GimpLayer        *parent;
+  gint              index;
+  const gchar      *desc;
+
+  index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                              drop_pos,
+                                              (GimpViewable **) &parent);
+
+  channel = gimp_channel_new_from_component (src_image, component, NULL, NULL);
+
+  new_item = gimp_item_convert (GIMP_ITEM (channel), image,
+                                GIMP_TYPE_LAYER);
+
+  g_object_unref (channel);
+
+  gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
+                       NULL, NULL, &desc, NULL);
+  gimp_object_take_name (GIMP_OBJECT (new_item),
+                         g_strdup_printf (_("%s Channel Copy"), desc));
+
+  gimp_image_add_layer (image, GIMP_LAYER (new_item), parent, index, TRUE);
+
+  gimp_image_flush (image);
+}
+
+static void
+gimp_layer_tree_view_drop_pixbuf (GimpContainerTreeView   *tree_view,
+                                  GdkPixbuf               *pixbuf,
+                                  GimpViewable            *dest_viewable,
+                                  GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (tree_view);
+  GimpImage        *image     = gimp_item_tree_view_get_image (item_view);
+  GimpLayer        *new_layer;
+  GimpLayer        *parent;
+  gint              index;
+
+  index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                              drop_pos,
+                                              (GimpViewable **) &parent);
+
+  new_layer =
+    gimp_layer_new_from_pixbuf (pixbuf, image,
+                                gimp_image_get_layer_format (image, TRUE),
+                                _("Dropped Buffer"),
+                                GIMP_OPACITY_OPAQUE,
+                                gimp_image_get_default_new_layer_mode (image));
+
+  gimp_image_add_layer (image, new_layer, parent, index, TRUE);
+
+  gimp_image_flush (image);
+}
+
+
+/*  GimpItemTreeView methods  */
+
+static void
+gimp_layer_tree_view_set_image (GimpItemTreeView *view,
+                                GimpImage        *image)
+{
+  GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (view);
+
+  if (gimp_item_tree_view_get_image (view))
+    {
+      g_signal_handlers_disconnect_by_func (gimp_item_tree_view_get_image (view),
+                                            gimp_layer_tree_view_floating_selection_changed,
+                                            view);
+    }
+
+  GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (view, image);
+
+  if (gimp_item_tree_view_get_image (view))
+    {
+      g_signal_connect (gimp_item_tree_view_get_image (view),
+                        "floating-selection-changed",
+                        G_CALLBACK (gimp_layer_tree_view_floating_selection_changed),
+                        view);
+
+      /* call gimp_layer_tree_view_floating_selection_changed() now, to update
+       * the floating selection's row attributes.
+       */
+      gimp_layer_tree_view_floating_selection_changed (
+        gimp_item_tree_view_get_image (view),
+        layer_view);
+    }
+
+  gimp_layer_tree_view_update_highlight (layer_view);
+}
+
+static GimpItem *
+gimp_layer_tree_view_item_new (GimpImage *image)
+{
+  GimpLayer *new_layer;
+
+  gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
+                               _("New Layer"));
+
+  new_layer = gimp_layer_new (image,
+                              gimp_image_get_width (image),
+                              gimp_image_get_height (image),
+                              gimp_image_get_layer_format (image, TRUE),
+                              NULL,
+                              GIMP_OPACITY_OPAQUE,
+                              gimp_image_get_default_new_layer_mode (image));
+
+  gimp_image_add_layer (image, new_layer,
+                        GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+  gimp_image_undo_group_end (image);
+
+  return GIMP_ITEM (new_layer);
+}
+
+
+/*  callbacks  */
+
+static void
+gimp_layer_tree_view_floating_selection_changed (GimpImage         *image,
+                                                 GimpLayerTreeView *layer_view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (layer_view);
+  GimpContainerView     *view      = GIMP_CONTAINER_VIEW (layer_view);
+  GimpLayer             *floating_sel;
+  GtkTreeIter           *iter;
+
+  floating_sel = gimp_image_get_floating_selection (image);
+
+  if (floating_sel)
+    {
+      iter = gimp_container_view_lookup (view, (GimpViewable *) floating_sel);
+
+      if (iter)
+        gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                            GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_ATTRIBUTES,
+                            layer_view->priv->italic_attrs,
+                            -1);
+    }
+  else
+    {
+      GList *all_layers;
+      GList *list;
+
+      all_layers = gimp_image_get_layer_list (image);
+
+      for (list = all_layers; list; list = g_list_next (list))
+        {
+          GimpDrawable *drawable = list->data;
+
+          iter = gimp_container_view_lookup (view, (GimpViewable *) drawable);
+
+          if (iter)
+            gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                                GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_ATTRIBUTES,
+                                gimp_drawable_has_alpha (drawable) ?
+                                NULL : layer_view->priv->bold_attrs,
+                                -1);
+        }
+
+      g_list_free (all_layers);
+    }
+
+  gimp_layer_tree_view_update_highlight (layer_view);
+}
+
+
+/*  Paint Mode, Opacity and Lock alpha callbacks  */
+
+#define BLOCK() \
+        g_signal_handlers_block_by_func (layer, \
+        gimp_layer_tree_view_layer_signal_handler, view)
+
+#define UNBLOCK() \
+        g_signal_handlers_unblock_by_func (layer, \
+        gimp_layer_tree_view_layer_signal_handler, view)
+
+
+static void
+gimp_layer_tree_view_layer_mode_box_callback (GtkWidget         *widget,
+                                              const GParamSpec  *pspec,
+                                              GimpLayerTreeView *view)
+{
+  GimpImage *image;
+  GimpLayer *layer = NULL;
+
+  image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view));
+
+  if (image)
+    layer = (GimpLayer *)
+      GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (layer)
+    {
+      GimpLayerMode mode =
+        gimp_layer_mode_box_get_mode (GIMP_LAYER_MODE_BOX (widget));
+
+      if (gimp_layer_get_mode (layer) != mode)
+        {
+          GimpUndo *undo;
+          gboolean  push_undo = TRUE;
+
+          /*  compress layer mode undos  */
+          undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                               GIMP_UNDO_LAYER_MODE);
+
+          if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+            push_undo = FALSE;
+
+          BLOCK();
+          gimp_layer_set_mode (layer, (GimpLayerMode) mode, push_undo);
+          UNBLOCK();
+
+          gimp_image_flush (image);
+
+          if (! push_undo)
+            gimp_undo_refresh_preview (undo, gimp_container_view_get_context (GIMP_CONTAINER_VIEW (view)));
+        }
+    }
+}
+
+static void
+gimp_layer_tree_view_lock_alpha_button_toggled (GtkWidget         *widget,
+                                                GimpLayerTreeView *view)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+
+  image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view));
+
+  layer = (GimpLayer *)
+    GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (layer)
+    {
+      gboolean lock_alpha;
+
+      lock_alpha = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+      if (gimp_layer_get_lock_alpha (layer) != lock_alpha)
+        {
+          GimpUndo *undo;
+          gboolean  push_undo = TRUE;
+
+          /*  compress lock alpha undos  */
+          undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                               GIMP_UNDO_LAYER_LOCK_ALPHA);
+
+          if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+            push_undo = FALSE;
+
+          BLOCK();
+          gimp_layer_set_lock_alpha (layer, lock_alpha, push_undo);
+          UNBLOCK();
+
+          gimp_image_flush (image);
+        }
+    }
+}
+
+static void
+gimp_layer_tree_view_opacity_scale_changed (GtkAdjustment     *adjustment,
+                                            GimpLayerTreeView *view)
+{
+  GimpImage *image;
+  GimpLayer *layer;
+
+  image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view));
+
+  layer = (GimpLayer *)
+    GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  if (layer)
+    {
+      gdouble opacity = gtk_adjustment_get_value (adjustment) / 100.0;
+
+      if (gimp_layer_get_opacity (layer) != opacity)
+        {
+          GimpUndo *undo;
+          gboolean  push_undo = TRUE;
+
+          /*  compress opacity undos  */
+          undo = gimp_image_undo_can_compress (image, GIMP_TYPE_ITEM_UNDO,
+                                               GIMP_UNDO_LAYER_OPACITY);
+
+          if (undo && GIMP_ITEM_UNDO (undo)->item == GIMP_ITEM (layer))
+            push_undo = FALSE;
+
+          BLOCK();
+          gimp_layer_set_opacity (layer, opacity, push_undo);
+          UNBLOCK();
+
+          gimp_image_flush (image);
+
+          if (! push_undo)
+            gimp_undo_refresh_preview (undo, gimp_container_view_get_context (GIMP_CONTAINER_VIEW (view)));
+        }
+    }
+}
+
+#undef BLOCK
+#undef UNBLOCK
+
+
+static void
+gimp_layer_tree_view_layer_signal_handler (GimpLayer         *layer,
+                                           GimpLayerTreeView *view)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
+  GimpLayer        *active_layer;
+
+  active_layer = (GimpLayer *)
+    GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (gimp_item_tree_view_get_image (item_view));
+
+  if (active_layer == layer)
+    gimp_layer_tree_view_update_options (view, layer);
+}
+
+
+#define BLOCK(object,function) \
+        g_signal_handlers_block_by_func ((object), (function), view)
+
+#define UNBLOCK(object,function) \
+        g_signal_handlers_unblock_by_func ((object), (function), view)
+
+static void
+gimp_layer_tree_view_update_options (GimpLayerTreeView *view,
+                                     GimpLayer         *layer)
+{
+  BLOCK (view->priv->layer_mode_box,
+         gimp_layer_tree_view_layer_mode_box_callback);
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)) == NULL)
+    {
+      gimp_layer_mode_box_set_context (GIMP_LAYER_MODE_BOX (view->priv->layer_mode_box),
+                                       GIMP_LAYER_MODE_CONTEXT_LAYER);
+    }
+  else
+    {
+      gimp_layer_mode_box_set_context (GIMP_LAYER_MODE_BOX (view->priv->layer_mode_box),
+                                       GIMP_LAYER_MODE_CONTEXT_GROUP);
+    }
+
+  gimp_layer_mode_box_set_mode (GIMP_LAYER_MODE_BOX (view->priv->layer_mode_box),
+                                gimp_layer_get_mode (layer));
+
+  UNBLOCK (view->priv->layer_mode_box,
+           gimp_layer_tree_view_layer_mode_box_callback);
+
+  if (gimp_layer_get_lock_alpha (layer) !=
+      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->lock_alpha_toggle)))
+    {
+      BLOCK (view->priv->lock_alpha_toggle,
+             gimp_layer_tree_view_lock_alpha_button_toggled);
+
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->lock_alpha_toggle),
+                                    gimp_layer_get_lock_alpha (layer));
+
+      UNBLOCK (view->priv->lock_alpha_toggle,
+               gimp_layer_tree_view_lock_alpha_button_toggled);
+    }
+
+  gtk_widget_set_sensitive (view->priv->lock_alpha_toggle,
+                            gimp_layer_can_lock_alpha (layer));
+
+  if (gimp_layer_get_opacity (layer) * 100.0 !=
+      gtk_adjustment_get_value (view->priv->opacity_adjustment))
+    {
+      BLOCK (view->priv->opacity_adjustment,
+             gimp_layer_tree_view_opacity_scale_changed);
+
+      gtk_adjustment_set_value (view->priv->opacity_adjustment,
+                                gimp_layer_get_opacity (layer) * 100.0);
+
+      UNBLOCK (view->priv->opacity_adjustment,
+               gimp_layer_tree_view_opacity_scale_changed);
+    }
+}
+
+#undef BLOCK
+#undef UNBLOCK
+
+
+static void
+gimp_layer_tree_view_update_menu (GimpLayerTreeView *layer_view,
+                                  GimpLayer         *layer)
+{
+  GimpUIManager   *ui_manager = gimp_editor_get_ui_manager (GIMP_EDITOR (layer_view));
+  GimpActionGroup *group;
+  GimpLayerMask   *mask;
+
+  group = gimp_ui_manager_get_action_group (ui_manager, "layers");
+
+  mask = gimp_layer_get_mask (layer);
+
+  gimp_action_group_set_action_active (group, "layers-mask-show",
+                                       mask &&
+                                       gimp_layer_get_show_mask (layer));
+  gimp_action_group_set_action_active (group, "layers-mask-disable",
+                                       mask &&
+                                       ! gimp_layer_get_apply_mask (layer));
+  gimp_action_group_set_action_active (group, "layers-mask-edit",
+                                       mask &&
+                                       gimp_layer_get_edit_mask (layer));
+}
+
+static void
+gimp_layer_tree_view_update_highlight (GimpLayerTreeView *layer_view)
+{
+  GimpItemTreeView *item_view    = GIMP_ITEM_TREE_VIEW (layer_view);
+  GimpImage        *image        = gimp_item_tree_view_get_image (item_view);
+  GimpLayer        *floating_sel = NULL;
+
+  if (image)
+    floating_sel = gimp_image_get_floating_selection (image);
+
+  gimp_highlightable_button_set_highlight (
+    GIMP_HIGHLIGHTABLE_BUTTON (gimp_item_tree_view_get_new_button (item_view)),
+    floating_sel != NULL &&
+    ! GIMP_IS_CHANNEL (gimp_layer_get_floating_sel_drawable (floating_sel)));
+
+  gimp_highlightable_button_set_highlight (
+    GIMP_HIGHLIGHTABLE_BUTTON (gimp_item_tree_view_get_delete_button (item_view)),
+    floating_sel != NULL);
+
+  gimp_highlightable_button_set_highlight (
+    GIMP_HIGHLIGHTABLE_BUTTON (layer_view->priv->anchor_button),
+    floating_sel != NULL);
+}
+
+
+/*  Layer Mask callbacks  */
+
+static void
+gimp_layer_tree_view_mask_update (GimpLayerTreeView *layer_view,
+                                  GtkTreeIter       *iter,
+                                  GimpLayer         *layer)
+{
+  GimpContainerView     *view         = GIMP_CONTAINER_VIEW (layer_view);
+  GimpContainerTreeView *tree_view    = GIMP_CONTAINER_TREE_VIEW (layer_view);
+  GimpLayerMask         *mask;
+  GimpViewRenderer      *renderer     = NULL;
+  gboolean               mask_visible = FALSE;
+
+  mask = gimp_layer_get_mask (layer);
+
+  if (mask)
+    {
+      GClosure *closure;
+      gint      view_size;
+      gint      border_width;
+
+      view_size = gimp_container_view_get_view_size (view, &border_width);
+
+      mask_visible = TRUE;
+
+      renderer = gimp_view_renderer_new (gimp_container_view_get_context (view),
+                                         G_TYPE_FROM_INSTANCE (mask),
+                                         view_size, border_width,
+                                         FALSE);
+      gimp_view_renderer_set_viewable (renderer, GIMP_VIEWABLE (mask));
+
+      g_signal_connect (renderer, "update",
+                        G_CALLBACK (gimp_layer_tree_view_renderer_update),
+                        layer_view);
+
+      closure = g_cclosure_new (G_CALLBACK (gimp_layer_tree_view_mask_callback),
+                                layer_view, NULL);
+      g_object_watch_closure (G_OBJECT (renderer), closure);
+      g_signal_connect_closure (layer, "apply-mask-changed", closure, FALSE);
+      g_signal_connect_closure (layer, "edit-mask-changed",  closure, FALSE);
+      g_signal_connect_closure (layer, "show-mask-changed",  closure, FALSE);
+    }
+
+  gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                      layer_view->priv->model_column_mask,         renderer,
+                      layer_view->priv->model_column_mask_visible, mask_visible,
+                      -1);
+
+  gimp_layer_tree_view_update_borders (layer_view, iter);
+
+  if (renderer)
+    {
+      gimp_view_renderer_remove_idle (renderer);
+      g_object_unref (renderer);
+    }
+}
+
+static void
+gimp_layer_tree_view_mask_changed (GimpLayer         *layer,
+                                   GimpLayerTreeView *layer_view)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (layer_view);
+  GtkTreeIter       *iter;
+
+  iter = gimp_container_view_lookup (view, GIMP_VIEWABLE (layer));
+
+  if (iter)
+    gimp_layer_tree_view_mask_update (layer_view, iter, layer);
+}
+
+static void
+gimp_layer_tree_view_renderer_update (GimpViewRenderer  *renderer,
+                                      GimpLayerTreeView *layer_view)
+{
+  GimpContainerView     *view      = GIMP_CONTAINER_VIEW (layer_view);
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (layer_view);
+  GimpLayerMask         *mask;
+  GtkTreeIter           *iter;
+
+  mask = GIMP_LAYER_MASK (renderer->viewable);
+
+  iter = gimp_container_view_lookup (view, (GimpViewable *)
+                                     gimp_layer_mask_get_layer (mask));
+
+  if (iter)
+    {
+      GtkTreePath *path;
+
+      path = gtk_tree_model_get_path (tree_view->model, iter);
+
+      gtk_tree_model_row_changed (tree_view->model, path, iter);
+
+      gtk_tree_path_free (path);
+    }
+}
+
+static void
+gimp_layer_tree_view_update_borders (GimpLayerTreeView *layer_view,
+                                     GtkTreeIter       *iter)
+{
+  GimpContainerTreeView *tree_view  = GIMP_CONTAINER_TREE_VIEW (layer_view);
+  GimpViewRenderer      *layer_renderer;
+  GimpViewRenderer      *mask_renderer;
+  GimpLayer             *layer;
+  GimpLayerMask         *mask       = NULL;
+  GimpViewBorderType     layer_type = GIMP_VIEW_BORDER_BLACK;
+
+  gtk_tree_model_get (tree_view->model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &layer_renderer,
+                      layer_view->priv->model_column_mask,       &mask_renderer,
+                      -1);
+
+  layer = GIMP_LAYER (layer_renderer->viewable);
+
+  if (mask_renderer)
+    mask = GIMP_LAYER_MASK (mask_renderer->viewable);
+
+  if (! mask || (mask && ! gimp_layer_get_edit_mask (layer)))
+    layer_type = GIMP_VIEW_BORDER_WHITE;
+
+  gimp_view_renderer_set_border_type (layer_renderer, layer_type);
+
+  if (mask)
+    {
+      GimpViewBorderType mask_color = GIMP_VIEW_BORDER_BLACK;
+
+      if (gimp_layer_get_show_mask (layer))
+        {
+          mask_color = GIMP_VIEW_BORDER_GREEN;
+        }
+      else if (! gimp_layer_get_apply_mask (layer))
+        {
+          mask_color = GIMP_VIEW_BORDER_RED;
+        }
+      else if (gimp_layer_get_edit_mask (layer))
+        {
+          mask_color = GIMP_VIEW_BORDER_WHITE;
+        }
+
+      gimp_view_renderer_set_border_type (mask_renderer, mask_color);
+    }
+
+  if (layer_renderer)
+    g_object_unref (layer_renderer);
+
+  if (mask_renderer)
+    g_object_unref (mask_renderer);
+}
+
+static void
+gimp_layer_tree_view_mask_callback (GimpLayer         *layer,
+                                    GimpLayerTreeView *layer_view)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (layer_view);
+  GtkTreeIter       *iter;
+
+  iter = gimp_container_view_lookup (view, (GimpViewable *) layer);
+
+  gimp_layer_tree_view_update_borders (layer_view, iter);
+}
+
+static void
+gimp_layer_tree_view_layer_clicked (GimpCellRendererViewable *cell,
+                                    const gchar              *path_str,
+                                    GdkModifierType           state,
+                                    GimpLayerTreeView        *layer_view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (layer_view);
+  GtkTreePath           *path      = gtk_tree_path_new_from_string (path_str);
+  GtkTreeIter            iter;
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path) &&
+      ! (state & GDK_MOD1_MASK))
+    {
+      GimpUIManager    *ui_manager;
+      GimpActionGroup  *group;
+      GimpViewRenderer *renderer;
+
+      ui_manager = gimp_editor_get_ui_manager (GIMP_EDITOR (tree_view));
+      group      = gimp_ui_manager_get_action_group (ui_manager, "layers");
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      if (renderer)
+        {
+          GimpLayer     *layer = GIMP_LAYER (renderer->viewable);
+          GimpLayerMask *mask  = gimp_layer_get_mask (layer);
+
+          if (state & gimp_get_extend_selection_mask ())
+            {
+              if (state & gimp_get_modify_selection_mask ())
+                {
+                  /* Shift-Control-click apply a layer mask */
+
+                  if (mask)
+                    gimp_ui_manager_activate_action (ui_manager, "layers",
+                                                     "layers-mask-apply");
+                }
+              else
+                {
+                  /* Shift-click add a layer mask with last values */
+
+                  if (! mask)
+                    gimp_ui_manager_activate_action (ui_manager, "layers",
+                                                     "layers-mask-add-last-values");
+                }
+            }
+          else if (state & gimp_get_modify_selection_mask ())
+            {
+              /* Control-click remove a layer mask */
+
+              if (mask)
+                gimp_ui_manager_activate_action (ui_manager, "layers",
+                                                 "layers-mask-delete");
+            }
+          else if (mask && gimp_layer_get_edit_mask (layer))
+            {
+              /* other clicks activate the layer */
+
+              if (mask)
+                gimp_action_group_set_action_active (group,
+                                                     "layers-mask-edit", FALSE);
+            }
+
+          g_object_unref (renderer);
+        }
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static void
+gimp_layer_tree_view_mask_clicked (GimpCellRendererViewable *cell,
+                                   const gchar              *path_str,
+                                   GdkModifierType           state,
+                                   GimpLayerTreeView        *layer_view)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (layer_view);
+  GtkTreePath           *path;
+  GtkTreeIter            iter;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpUIManager    *ui_manager;
+      GimpActionGroup  *group;
+
+      ui_manager = gimp_editor_get_ui_manager (GIMP_EDITOR (tree_view));
+      group      = gimp_ui_manager_get_action_group (ui_manager, "layers");
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      if (renderer)
+        {
+          GimpLayer *layer = GIMP_LAYER (renderer->viewable);
+
+          if (state & GDK_MOD1_MASK)
+            gimp_action_group_set_action_active (group, "layers-mask-show",
+                                                 ! gimp_layer_get_show_mask (layer));
+          else if (state & gimp_get_toggle_behavior_mask ())
+            gimp_action_group_set_action_active (group, "layers-mask-disable",
+                                                 gimp_layer_get_apply_mask (layer));
+          else if (! gimp_layer_get_edit_mask (layer))
+            gimp_action_group_set_action_active (group,
+                                                 "layers-mask-edit", TRUE);
+
+          g_object_unref (renderer);
+        }
+    }
+
+  gtk_tree_path_free (path);
+}
+
+
+/*  GimpDrawable alpha callbacks  */
+
+static void
+gimp_layer_tree_view_alpha_update (GimpLayerTreeView *view,
+                                   GtkTreeIter       *iter,
+                                   GimpLayer         *layer)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+
+  gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_NAME_ATTRIBUTES,
+                      gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)) ?
+                      NULL : view->priv->bold_attrs,
+                      -1);
+}
+
+static void
+gimp_layer_tree_view_alpha_changed (GimpLayer         *layer,
+                                    GimpLayerTreeView *layer_view)
+{
+  GimpContainerView *view = GIMP_CONTAINER_VIEW (layer_view);
+  GtkTreeIter       *iter;
+
+  iter = gimp_container_view_lookup (view, (GimpViewable *) layer);
+
+  if (iter)
+    {
+      GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
+
+      gimp_layer_tree_view_alpha_update (layer_view, iter, layer);
+
+      /*  update button states  */
+      if (gimp_image_get_active_layer (gimp_item_tree_view_get_image (item_view)) == layer)
+        gimp_container_view_select_item (GIMP_CONTAINER_VIEW (view),
+                                         GIMP_VIEWABLE (layer));
+    }
+}
diff --git a/app/widgets/gimplayertreeview.h b/app/widgets/gimplayertreeview.h
new file mode 100644
index 0000000..1a89b2d
--- /dev/null
+++ b/app/widgets/gimplayertreeview.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimplayertreeview.h
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_LAYER_TREE_VIEW_H__
+#define __GIMP_LAYER_TREE_VIEW_H__
+
+
+#include "gimpdrawabletreeview.h"
+
+
+#define GIMP_TYPE_LAYER_TREE_VIEW            (gimp_layer_tree_view_get_type ())
+#define GIMP_LAYER_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LAYER_TREE_VIEW, GimpLayerTreeView))
+#define GIMP_LAYER_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LAYER_TREE_VIEW, GimpLayerTreeViewClass))
+#define GIMP_IS_LAYER_TREE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_LAYER_TREE_VIEW))
+#define GIMP_IS_LAYER_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_LAYER_TREE_VIEW))
+#define GIMP_LAYER_TREE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_TREE_VIEW, GimpLayerTreeViewClass))
+
+
+typedef struct _GimpLayerTreeViewClass   GimpLayerTreeViewClass;
+typedef struct _GimpLayerTreeViewPrivate GimpLayerTreeViewPrivate;
+
+struct _GimpLayerTreeView
+{
+  GimpDrawableTreeView      parent_instance;
+
+  GimpLayerTreeViewPrivate *priv;
+};
+
+struct _GimpLayerTreeViewClass
+{
+  GimpDrawableTreeViewClass  parent_class;
+};
+
+
+GType   gimp_layer_tree_view_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_LAYER_TREE_VIEW_H__  */
diff --git a/app/widgets/gimpmenudock.c b/app/widgets/gimpmenudock.c
new file mode 100644
index 0000000..fac3994
--- /dev/null
+++ b/app/widgets/gimpmenudock.c
@@ -0,0 +1,103 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmenudock.c
+ * Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplist.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdockable.h"
+#include "gimpdockbook.h"
+#include "gimpmenudock.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_MINIMAL_WIDTH  200
+
+struct _GimpMenuDockPrivate
+{
+  gint make_sizeof_greater_than_zero;
+};
+
+
+static void   gimp_menu_dock_style_set               (GtkWidget      *widget,
+                                                      GtkStyle       *prev_style);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpMenuDock, gimp_menu_dock, GIMP_TYPE_DOCK)
+
+#define parent_class gimp_menu_dock_parent_class
+
+
+static void
+gimp_menu_dock_class_init (GimpMenuDockClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  widget_class->style_set = gimp_menu_dock_style_set;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("minimal-width",
+                                                             NULL, NULL,
+                                                             0,
+                                                             G_MAXINT,
+                                                             DEFAULT_MINIMAL_WIDTH,
+                                                             GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_menu_dock_init (GimpMenuDock *dock)
+{
+}
+
+static void
+gimp_menu_dock_style_set (GtkWidget *widget,
+                          GtkStyle  *prev_style)
+{
+  gint minimal_width = -1;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget,
+                        "minimal-width", &minimal_width,
+                        NULL);
+
+  gtk_widget_set_size_request (widget, minimal_width, -1);
+}
+
+GtkWidget *
+gimp_menu_dock_new (void)
+{
+  return g_object_new (GIMP_TYPE_MENU_DOCK, NULL);
+}
diff --git a/app/widgets/gimpmenudock.h b/app/widgets/gimpmenudock.h
new file mode 100644
index 0000000..ab58ded
--- /dev/null
+++ b/app/widgets/gimpmenudock.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmenudock.h
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MENU_DOCK_H__
+#define __GIMP_MENU_DOCK_H__
+
+
+#include "gimpdock.h"
+
+
+#define GIMP_TYPE_MENU_DOCK            (gimp_menu_dock_get_type ())
+#define GIMP_MENU_DOCK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MENU_DOCK, GimpMenuDock))
+#define GIMP_MENU_DOCK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MENU_DOCK, GimpMenuDockClass))
+#define GIMP_IS_MENU_DOCK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MENU_DOCK))
+#define GIMP_IS_MENU_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MENU_DOCK))
+#define GIMP_MENU_DOCK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MENU_DOCK, GimpMenuDockClass))
+
+typedef struct _GimpMenuDockPrivate GimpMenuDockPrivate;
+typedef struct _GimpMenuDockClass   GimpMenuDockClass;
+
+struct _GimpMenuDock
+{
+  GimpDock             parent_instance;
+
+  GimpMenuDockPrivate *p;
+};
+
+struct _GimpMenuDockClass
+{
+  GimpDockClass  parent_class;
+};
+
+
+GType       gimp_menu_dock_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_menu_dock_new      (void);
+
+
+
+#endif /* __GIMP_MENU_DOCK_H__ */
diff --git a/app/widgets/gimpmenufactory.c b/app/widgets/gimpmenufactory.c
new file mode 100644
index 0000000..d7bfc47
--- /dev/null
+++ b/app/widgets/gimpmenufactory.c
@@ -0,0 +1,277 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmenufactory.c
+ * Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+
+#include "gimpaction.h"
+#include "gimpactionfactory.h"
+#include "gimpactiongroup.h"
+#include "gimpmenufactory.h"
+#include "gimpuimanager.h"
+
+
+struct _GimpMenuFactoryPrivate
+{
+  Gimp              *gimp;
+  GimpActionFactory *action_factory;
+  GList             *registered_menus;
+};
+
+
+static void   gimp_menu_factory_finalize (GObject *object);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpMenuFactory, gimp_menu_factory,
+                            GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_menu_factory_parent_class
+
+
+static void
+gimp_menu_factory_class_init (GimpMenuFactoryClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_menu_factory_finalize;
+}
+
+static void
+gimp_menu_factory_init (GimpMenuFactory *factory)
+{
+  factory->p = gimp_menu_factory_get_instance_private (factory);
+}
+
+static void
+gimp_menu_factory_finalize (GObject *object)
+{
+  GimpMenuFactory *factory = GIMP_MENU_FACTORY (object);
+  GList           *list;
+
+  for (list = factory->p->registered_menus; list; list = g_list_next (list))
+    {
+      GimpMenuFactoryEntry *entry = list->data;
+      GList                *uis;
+
+      g_free (entry->identifier);
+
+      g_list_free_full (entry->action_groups, (GDestroyNotify) g_free);
+
+      for (uis = entry->managed_uis; uis; uis = g_list_next (uis))
+        {
+          GimpUIManagerUIEntry *ui_entry = uis->data;
+
+          g_free (ui_entry->ui_path);
+          g_free (ui_entry->basename);
+
+          g_slice_free (GimpUIManagerUIEntry, ui_entry);
+        }
+
+      g_list_free (entry->managed_uis);
+
+      g_slice_free (GimpMenuFactoryEntry, entry);
+    }
+
+  g_list_free (factory->p->registered_menus);
+  factory->p->registered_menus = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GimpMenuFactory *
+gimp_menu_factory_new (Gimp              *gimp,
+                       GimpActionFactory *action_factory)
+{
+  GimpMenuFactory *factory;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_ACTION_FACTORY (action_factory), NULL);
+
+  factory = g_object_new (GIMP_TYPE_MENU_FACTORY, NULL);
+
+  factory->p->gimp           = gimp;
+  factory->p->action_factory = action_factory;
+
+  return factory;
+}
+
+void
+gimp_menu_factory_manager_register (GimpMenuFactory *factory,
+                                    const gchar     *identifier,
+                                    const gchar     *first_group,
+                                    ...)
+{
+  GimpMenuFactoryEntry *entry;
+  const gchar          *group;
+  const gchar          *ui_path;
+  va_list               args;
+
+  g_return_if_fail (GIMP_IS_MENU_FACTORY (factory));
+  g_return_if_fail (identifier != NULL);
+  g_return_if_fail (first_group != NULL);
+
+  entry = g_slice_new0 (GimpMenuFactoryEntry);
+
+  entry->identifier = g_strdup (identifier);
+
+  factory->p->registered_menus = g_list_prepend (factory->p->registered_menus, entry);
+
+  va_start (args, first_group);
+
+  for (group = first_group;
+       group;
+       group = va_arg (args, const gchar *))
+    {
+      entry->action_groups = g_list_prepend (entry->action_groups,
+                                             g_strdup (group));
+    }
+
+  entry->action_groups = g_list_reverse (entry->action_groups);
+
+  ui_path = va_arg (args, const gchar *);
+
+  while (ui_path)
+    {
+      const gchar            *ui_basename;
+      GimpUIManagerSetupFunc  setup_func;
+      GimpUIManagerUIEntry   *ui_entry;
+
+      ui_basename = va_arg (args, const gchar *);
+      setup_func  = va_arg (args, GimpUIManagerSetupFunc);
+
+      ui_entry = g_slice_new0 (GimpUIManagerUIEntry);
+
+      ui_entry->ui_path    = g_strdup (ui_path);
+      ui_entry->basename   = g_strdup (ui_basename);
+      ui_entry->setup_func = setup_func;
+
+      entry->managed_uis = g_list_prepend (entry->managed_uis, ui_entry);
+
+      ui_path = va_arg (args, const gchar *);
+    }
+
+  entry->managed_uis = g_list_reverse (entry->managed_uis);
+
+  va_end (args);
+}
+
+GList *
+gimp_menu_factory_get_registered_menus (GimpMenuFactory *factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (factory), NULL);
+
+  return factory->p->registered_menus;
+}
+
+static void
+gimp_menu_factory_manager_action_added (GimpActionGroup *group,
+                                        GimpAction      *action,
+                                        GtkAccelGroup   *accel_group)
+{
+  gimp_action_set_accel_group (action, accel_group);
+  gimp_action_connect_accelerator (action);
+}
+
+GimpUIManager *
+gimp_menu_factory_manager_new (GimpMenuFactory *factory,
+                               const gchar     *identifier,
+                               gpointer         callback_data,
+                               gboolean         create_tearoff)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (factory), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+
+  for (list = factory->p->registered_menus; list; list = g_list_next (list))
+    {
+      GimpMenuFactoryEntry *entry = list->data;
+
+      if (! strcmp (entry->identifier, identifier))
+        {
+          GimpUIManager *manager;
+          GtkAccelGroup *accel_group;
+          GList         *list;
+
+          manager = gimp_ui_manager_new (factory->p->gimp, entry->identifier);
+          gtk_ui_manager_set_add_tearoffs (GTK_UI_MANAGER (manager),
+                                           create_tearoff);
+
+          accel_group = gimp_ui_manager_get_accel_group (manager);
+
+          for (list = entry->action_groups; list; list = g_list_next (list))
+            {
+              GimpActionGroup *group;
+              GList           *actions;
+              GList           *list2;
+
+              group = gimp_action_factory_group_new (factory->p->action_factory,
+                                                     (const gchar *) list->data,
+                                                     callback_data);
+
+              actions = gimp_action_group_list_actions (group);
+
+              for (list2 = actions; list2; list2 = g_list_next (list2))
+                {
+                  GimpAction *action = list2->data;
+
+                  gimp_action_set_accel_group (action, accel_group);
+                  gimp_action_connect_accelerator (action);
+                }
+
+              g_list_free (actions);
+
+              g_signal_connect_object (group, "action-added",
+                                       G_CALLBACK (gimp_menu_factory_manager_action_added),
+                                       accel_group, 0);
+
+              gimp_ui_manager_insert_action_group (manager, group, -1);
+              g_object_unref (group);
+            }
+
+          for (list = entry->managed_uis; list; list = g_list_next (list))
+            {
+              GimpUIManagerUIEntry *ui_entry = list->data;
+
+              gimp_ui_manager_ui_register (manager,
+                                           ui_entry->ui_path,
+                                           ui_entry->basename,
+                                           ui_entry->setup_func);
+            }
+
+          return manager;
+        }
+    }
+
+  g_warning ("%s: no entry registered for \"%s\"",
+             G_STRFUNC, identifier);
+
+  return NULL;
+}
diff --git a/app/widgets/gimpmenufactory.h b/app/widgets/gimpmenufactory.h
new file mode 100644
index 0000000..801320e
--- /dev/null
+++ b/app/widgets/gimpmenufactory.h
@@ -0,0 +1,77 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmenufactory.h
+ * Copyright (C) 2003-2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MENU_FACTORY_H__
+#define __GIMP_MENU_FACTORY_H__
+
+
+#include "core/gimpobject.h"
+
+
+typedef struct _GimpMenuFactoryEntry GimpMenuFactoryEntry;
+
+struct _GimpMenuFactoryEntry
+{
+  gchar *identifier;
+  GList *action_groups;
+  GList *managed_uis;
+};
+
+
+#define GIMP_TYPE_MENU_FACTORY            (gimp_menu_factory_get_type ())
+#define GIMP_MENU_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MENU_FACTORY, GimpMenuFactory))
+#define GIMP_MENU_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MENU_FACTORY, GimpMenuFactoryClass))
+#define GIMP_IS_MENU_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MENU_FACTORY))
+#define GIMP_IS_MENU_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MENU_FACTORY))
+#define GIMP_MENU_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MENU_FACTORY, GimpMenuFactoryClass))
+
+
+typedef struct _GimpMenuFactoryPrivate  GimpMenuFactoryPrivate;
+typedef struct _GimpMenuFactoryClass    GimpMenuFactoryClass;
+
+struct _GimpMenuFactory
+{
+  GimpObject              parent_instance;
+
+  GimpMenuFactoryPrivate *p;
+};
+
+struct _GimpMenuFactoryClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType             gimp_menu_factory_get_type             (void) G_GNUC_CONST;
+GimpMenuFactory * gimp_menu_factory_new                  (Gimp              *gimp,
+                                                          GimpActionFactory *action_factory);
+void              gimp_menu_factory_manager_register     (GimpMenuFactory   *factory,
+                                                          const gchar       *identifier,
+                                                          const gchar       *first_group,
+                                                          ...)  G_GNUC_NULL_TERMINATED;
+GList           * gimp_menu_factory_get_registered_menus (GimpMenuFactory   *factory);
+GimpUIManager   * gimp_menu_factory_manager_new          (GimpMenuFactory   *factory,
+                                                          const gchar       *identifier,
+                                                          gpointer           callback_data,
+                                                          gboolean           create_tearoff);
+
+
+
+#endif  /*  __GIMP_MENU_FACTORY_H__  */
diff --git a/app/widgets/gimpmessagebox.c b/app/widgets/gimpmessagebox.c
new file mode 100644
index 0000000..a9fa864
--- /dev/null
+++ b/app/widgets/gimpmessagebox.c
@@ -0,0 +1,492 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmessagebox.c
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpmessagebox.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_MESSAGE_BOX_SPACING  12
+
+enum
+{
+  PROP_0,
+  PROP_ICON_NAME
+};
+
+
+static void   gimp_message_box_constructed      (GObject        *object);
+static void   gimp_message_box_dispose          (GObject        *object);
+static void   gimp_message_box_finalize         (GObject        *object);
+static void   gimp_message_box_set_property     (GObject        *object,
+                                                 guint           property_id,
+                                                 const GValue   *value,
+                                                 GParamSpec     *pspec);
+static void   gimp_message_box_get_property     (GObject        *object,
+                                                 guint           property_id,
+                                                 GValue         *value,
+                                                 GParamSpec     *pspec);
+
+static void   gimp_message_box_forall           (GtkContainer   *container,
+                                                 gboolean        include_internals,
+                                                 GtkCallback     callback,
+                                                 gpointer        callback_data);
+
+static void   gimp_message_box_size_request     (GtkWidget      *widget,
+                                                 GtkRequisition *requisition);
+static void   gimp_message_box_size_allocate    (GtkWidget      *widget,
+                                                 GtkAllocation  *allocation);
+
+static void   gimp_message_box_set_label_text   (GimpMessageBox *box,
+                                                 gint            n,
+                                                 const gchar    *format,
+                                                 va_list         args) G_GNUC_PRINTF (3, 0);
+static void   gimp_message_box_set_label_markup (GimpMessageBox *box,
+                                                 gint            n,
+                                                 const gchar    *format,
+                                                 va_list         args) G_GNUC_PRINTF (3, 0);
+
+static gboolean gimp_message_box_update         (gpointer        data);
+
+G_DEFINE_TYPE (GimpMessageBox, gimp_message_box, GTK_TYPE_BOX)
+
+#define parent_class gimp_message_box_parent_class
+
+
+static void
+gimp_message_box_class_init (GimpMessageBoxClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+
+  object_class->constructed   = gimp_message_box_constructed;
+  object_class->dispose       = gimp_message_box_dispose;
+  object_class->finalize      = gimp_message_box_finalize;
+  object_class->set_property  = gimp_message_box_set_property;
+  object_class->get_property  = gimp_message_box_get_property;
+
+
+  widget_class->size_request  = gimp_message_box_size_request;
+  widget_class->size_allocate = gimp_message_box_size_allocate;
+
+  container_class->forall     = gimp_message_box_forall;
+
+  g_object_class_install_property (object_class, PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_message_box_init (GimpMessageBox *box)
+{
+  gint i;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (box), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
+
+  /*  Unset the focus chain to keep the labels from being in the focus
+   *  chain.  Users of GimpMessageBox that add focusable widgets should
+   *  either unset the focus chain or (better) explicitly set one.
+   */
+  gtk_container_set_focus_chain (GTK_CONTAINER (box), NULL);
+
+  for (i = 0; i < 2; i++)
+    {
+      GtkWidget *label = g_object_new (GTK_TYPE_LABEL,
+                                       "wrap",       TRUE,
+                                       "selectable", TRUE,
+                                       "xalign",     0.0,
+                                       "yalign",     0.5,
+                                       NULL);
+
+      if (i == 0)
+        gimp_label_set_attributes (GTK_LABEL (label),
+                                   PANGO_ATTR_SCALE,  PANGO_SCALE_LARGE,
+                                   PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                                   -1);
+
+      gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+
+      box->label[i] = label;
+    }
+
+  box->repeat   = 0;
+  box->label[2] = NULL;
+  box->idle_id  = 0;
+}
+
+static void
+gimp_message_box_constructed (GObject *object)
+{
+  GimpMessageBox *box = GIMP_MESSAGE_BOX (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  if (box->icon_name)
+    {
+      gtk_widget_push_composite_child ();
+      box->image = gtk_image_new_from_icon_name (box->icon_name,
+                                                 GTK_ICON_SIZE_DIALOG);
+      gtk_widget_pop_composite_child ();
+
+      gtk_misc_set_alignment (GTK_MISC (box->image), 0.0, 0.0);
+      gtk_widget_set_parent (box->image, GTK_WIDGET (box));
+      gtk_widget_show (box->image);
+    }
+}
+
+static void
+gimp_message_box_dispose (GObject *object)
+{
+  GimpMessageBox *box = GIMP_MESSAGE_BOX (object);
+
+  if (box->image)
+    {
+      gtk_widget_unparent (box->image);
+      box->image = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_message_box_finalize (GObject *object)
+{
+  GimpMessageBox *box = GIMP_MESSAGE_BOX (object);
+
+  if (box->idle_id)
+    {
+      g_source_remove (box->idle_id);
+      box->idle_id = 0;
+    }
+
+  g_clear_pointer (&box->icon_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_message_box_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpMessageBox *box = GIMP_MESSAGE_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_ICON_NAME:
+      box->icon_name = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_message_box_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpMessageBox *box = GIMP_MESSAGE_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_ICON_NAME:
+      g_value_set_string (value, box->icon_name);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_message_box_size_request (GtkWidget      *widget,
+                               GtkRequisition *requisition)
+{
+  GimpMessageBox *box = GIMP_MESSAGE_BOX (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
+
+  if (box->image && gtk_widget_get_visible (box->image))
+    {
+      GtkRequisition  child_requisition;
+      gint            border_width;
+
+      gtk_widget_size_request (box->image, &child_requisition);
+
+      border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+      requisition->width  += child_requisition.width + GIMP_MESSAGE_BOX_SPACING;
+      requisition->height = MAX (requisition->height,
+                                 child_requisition.height +
+                                 2 * border_width);
+    }
+}
+
+static void
+gimp_message_box_size_allocate (GtkWidget     *widget,
+                                GtkAllocation *allocation)
+{
+  GimpMessageBox *box       = GIMP_MESSAGE_BOX (widget);
+  GtkContainer   *container = GTK_CONTAINER (widget);
+  gint            width     = 0;
+  gboolean        rtl;
+
+  rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+
+  if (box->image && gtk_widget_get_visible (box->image))
+    {
+      GtkRequisition  child_requisition;
+      GtkAllocation   child_allocation;
+      gint            border_width;
+      gint            height;
+
+      gtk_widget_size_request (box->image, &child_requisition);
+
+      border_width = gtk_container_get_border_width (container);
+
+      width  = MIN (allocation->width - 2 * border_width,
+                    child_requisition.width + GIMP_MESSAGE_BOX_SPACING);
+      width  = MAX (1, width);
+
+      height = allocation->height - 2 * border_width;
+      height = MAX (1, height);
+
+      if (rtl)
+        child_allocation.x  = (allocation->width -
+                               border_width      -
+                               child_requisition.width);
+      else
+        child_allocation.x  = allocation->x + border_width;
+
+      child_allocation.y      = allocation->y + border_width;
+      child_allocation.width  = width;
+      child_allocation.height = height;
+
+      gtk_widget_size_allocate (box->image, &child_allocation);
+    }
+
+  allocation->x     += rtl ? 0 : width;
+  allocation->width -= width;
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  allocation->x      -= rtl ? 0 : width;
+  allocation->width  += width;
+
+  gtk_widget_set_allocation (widget, allocation);
+}
+
+static void
+gimp_message_box_forall (GtkContainer *container,
+                         gboolean      include_internals,
+                         GtkCallback   callback,
+                         gpointer      callback_data)
+{
+  if (include_internals)
+    {
+      GimpMessageBox *box = GIMP_MESSAGE_BOX (container);
+
+      if (box->image)
+        (* callback) (box->image, callback_data);
+    }
+
+  GTK_CONTAINER_CLASS (parent_class)->forall (container, include_internals,
+                                              callback, callback_data);
+}
+
+static void
+gimp_message_box_set_label_text (GimpMessageBox *box,
+                                 gint            n,
+                                 const gchar    *format,
+                                 va_list         args)
+{
+  GtkWidget *label = box->label[n];
+
+  if (format)
+    {
+      gchar *text = g_strdup_vprintf (format, args);
+      gchar *utf8 = gimp_any_to_utf8 (text, -1, "Cannot convert text to utf8.");
+
+      gtk_label_set_text (GTK_LABEL (label), utf8);
+      gtk_widget_show (label);
+
+      g_free (utf8);
+      g_free (text);
+    }
+  else
+    {
+      gtk_widget_hide (label);
+      gtk_label_set_text (GTK_LABEL (label), NULL);
+    }
+}
+
+static void
+gimp_message_box_set_label_markup (GimpMessageBox *box,
+                                   gint            n,
+                                   const gchar    *format,
+                                   va_list         args)
+{
+  GtkWidget *label = box->label[n];
+
+  if (format)
+    {
+      gchar *text = g_markup_vprintf_escaped (format, args);
+
+      gtk_label_set_markup (GTK_LABEL (label), text);
+      gtk_widget_show (label);
+
+      g_free (text);
+    }
+  else
+    {
+      gtk_widget_hide (label);
+      gtk_label_set_text (GTK_LABEL (label), NULL);
+    }
+}
+
+static gboolean
+gimp_message_box_update (gpointer data)
+{
+  GimpMessageBox *box = data;
+  gchar          *message;
+
+  box->idle_id = 0;
+
+  message = g_strdup_printf (ngettext ("Message repeated once.",
+                                       "Message repeated %d times.",
+                                       box->repeat),
+                             box->repeat);
+
+  if (box->label[2])
+    {
+      gtk_label_set_text (GTK_LABEL (box->label[2]), message);
+    }
+  else
+    {
+      GtkWidget *label = box->label[2] = gtk_label_new (message);
+
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gimp_label_set_attributes (GTK_LABEL (label),
+                                 PANGO_ATTR_STYLE, PANGO_STYLE_OBLIQUE,
+                                 -1);
+      gtk_box_pack_end (GTK_BOX (box), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+    }
+
+  g_free (message);
+
+  return G_SOURCE_REMOVE;
+}
+
+/*  public functions  */
+
+GtkWidget *
+gimp_message_box_new (const gchar *icon_name)
+{
+  return g_object_new (GIMP_TYPE_MESSAGE_BOX,
+                       "icon-name", icon_name,
+                       NULL);
+}
+
+void
+gimp_message_box_set_primary_text (GimpMessageBox *box,
+                                   const gchar    *format,
+                                   ...)
+{
+  va_list args;
+
+  g_return_if_fail (GIMP_IS_MESSAGE_BOX (box));
+
+  va_start (args, format);
+  gimp_message_box_set_label_text (box, 0, format, args);
+  va_end (args);
+}
+
+void
+gimp_message_box_set_text (GimpMessageBox *box,
+                           const gchar    *format,
+                           ...)
+{
+  va_list args;
+
+  g_return_if_fail (GIMP_IS_MESSAGE_BOX (box));
+
+  va_start (args, format);
+  gimp_message_box_set_label_text (box, 1, format, args);
+  va_end (args);
+}
+
+void
+gimp_message_box_set_markup (GimpMessageBox *box,
+                             const gchar    *format,
+                             ...)
+{
+  va_list args;
+
+  g_return_if_fail (GIMP_IS_MESSAGE_BOX (box));
+
+  va_start (args, format);
+  gimp_message_box_set_label_markup (box, 1,format, args);
+  va_end (args);
+}
+
+gint
+gimp_message_box_repeat (GimpMessageBox *box)
+{
+  g_return_val_if_fail (GIMP_IS_MESSAGE_BOX (box), 0);
+
+  box->repeat++;
+
+  if (box->idle_id == 0)
+    {
+      /* When a same message is repeated dozens of thousands of times in
+       * a short span of time, updating the GUI at each increment is
+       * extremely slow (like really really slow, your GUI gets stuck
+       * for 10 minutes). So let's just delay GUI update as a low
+       * priority idle task.
+       */
+      box->idle_id = g_idle_add_full (G_PRIORITY_LOW,
+                                      gimp_message_box_update,
+                                      box, NULL);
+    }
+
+  return box->repeat;
+}
diff --git a/app/widgets/gimpmessagebox.h b/app/widgets/gimpmessagebox.h
new file mode 100644
index 0000000..d6d6447
--- /dev/null
+++ b/app/widgets/gimpmessagebox.h
@@ -0,0 +1,72 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmessagebox.h
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MESSAGE_BOX_H__
+#define __GIMP_MESSAGE_BOX_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_MESSAGE_BOX            (gimp_message_box_get_type ())
+#define GIMP_MESSAGE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MESSAGE_BOX, GimpMessageBox))
+#define GIMP_MESSAGE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MESSAGE_BOX, GimpMessageBoxClass))
+#define GIMP_IS_MESSAGE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MESSAGE_BOX))
+#define GIMP_IS_MESSAGE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MESSAGE_BOX))
+#define GIMP_MESSAGE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MESSAGE_BOX, GimpMessageBoxClass))
+
+
+typedef struct _GimpMessageBoxClass  GimpMessageBoxClass;
+
+struct _GimpMessageBox
+{
+  GtkBox     parent_instance;
+
+  gchar     *icon_name;
+  gint       repeat;
+  GtkWidget *label[3];
+  GtkWidget *image;
+
+  guint      idle_id;
+};
+
+struct _GimpMessageBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_message_box_get_type         (void) G_GNUC_CONST;
+
+GtkWidget * gimp_message_box_new              (const gchar    *icon_name);
+void        gimp_message_box_set_primary_text (GimpMessageBox *box,
+                                               const gchar    *format,
+                                               ...) G_GNUC_PRINTF (2, 3);
+void        gimp_message_box_set_text         (GimpMessageBox *box,
+                                               const gchar    *format,
+                                               ...) G_GNUC_PRINTF (2, 3);
+void        gimp_message_box_set_markup       (GimpMessageBox *box,
+                                               const gchar    *format,
+                                               ...) G_GNUC_PRINTF (2, 3);
+gint        gimp_message_box_repeat           (GimpMessageBox *box);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_MESSAGE_BOX_H__ */
diff --git a/app/widgets/gimpmessagedialog.c b/app/widgets/gimpmessagedialog.c
new file mode 100644
index 0000000..4fe6e30
--- /dev/null
+++ b/app/widgets/gimpmessagedialog.c
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmessagedialog.c
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpmessagebox.h"
+#include "gimpmessagedialog.h"
+
+
+G_DEFINE_TYPE (GimpMessageDialog, gimp_message_dialog, GIMP_TYPE_DIALOG)
+
+
+static void
+gimp_message_dialog_class_init (GimpMessageDialogClass *klass)
+{
+}
+
+static void
+gimp_message_dialog_init (GimpMessageDialog *dialog)
+{
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_message_dialog_new (const gchar    *title,
+                         const gchar    *icon_name,
+                         GtkWidget      *parent,
+                         GtkDialogFlags  flags,
+                         GimpHelpFunc    help_func,
+                         const gchar    *help_id,
+                         ...)
+{
+  GimpMessageDialog *dialog;
+  va_list            args;
+
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+
+  dialog = g_object_new (GIMP_TYPE_MESSAGE_DIALOG,
+                         "title",     title,
+                         "role",      "gimp-message-dialog",
+                         "modal",     (flags & GTK_DIALOG_MODAL),
+                         "help-func", help_func,
+                         "help-id",   help_id,
+                         NULL);
+
+  if (parent)
+    {
+      if (! GTK_IS_WINDOW (parent))
+        parent = gtk_widget_get_toplevel (parent);
+
+      if (GTK_IS_WINDOW (parent))
+        {
+          gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                        GTK_WINDOW (parent));
+
+          if (flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+            gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+        }
+      else
+        {
+          gtk_window_set_screen (GTK_WINDOW (dialog),
+                                 gtk_widget_get_screen (parent));
+        }
+    }
+
+  va_start (args, help_id);
+
+  gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args);
+
+  va_end (args);
+
+  dialog->box = g_object_new (GIMP_TYPE_MESSAGE_BOX,
+                              "icon-name", icon_name,
+                              NULL);
+
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      GTK_WIDGET (dialog->box), FALSE, FALSE, 0);
+  gtk_widget_show (GTK_WIDGET (dialog->box));
+
+  return GTK_WIDGET (dialog);
+}
diff --git a/app/widgets/gimpmessagedialog.h b/app/widgets/gimpmessagedialog.h
new file mode 100644
index 0000000..484de63
--- /dev/null
+++ b/app/widgets/gimpmessagedialog.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmessagedialog.h
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_MESSAGE_DIALOG_H__
+#define __GIMP_MESSAGE_DIALOG_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_MESSAGE_DIALOG            (gimp_message_dialog_get_type ())
+#define GIMP_MESSAGE_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MESSAGE_DIALOG, GimpMessageDialog))
+#define GIMP_MESSAGE_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MESSAGE_DIALOG, GimpMessageDialogClass))
+#define GIMP_IS_MESSAGE_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MESSAGE_DIALOG))
+#define GIMP_IS_MESSAGE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MESSAGE_DIALOG))
+#define GIMP_MESSAGE_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MESSAGE_DIALOG, GimpMessageDialogClass))
+
+
+typedef struct _GimpMessageDialogClass  GimpMessageDialogClass;
+
+struct _GimpMessageDialog
+{
+  GimpDialog       parent_instance;
+
+  GimpMessageBox  *box;
+};
+
+struct _GimpMessageDialogClass
+{
+  GimpDialogClass  parent_class;
+};
+
+
+GType       gimp_message_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_message_dialog_new      (const gchar       *title,
+                                          const gchar       *icon_name,
+                                          GtkWidget         *parent,
+                                          GtkDialogFlags     flags,
+                                          GimpHelpFunc       help_func,
+                                          const gchar       *help_id,
+                                          ...) G_GNUC_NULL_TERMINATED;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_MESSAGE_DIALOG_H__ */
diff --git a/app/widgets/gimpmeter.c b/app/widgets/gimpmeter.c
new file mode 100644
index 0000000..9a5ec92
--- /dev/null
+++ b/app/widgets/gimpmeter.c
@@ -0,0 +1,1328 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmeter.c
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpmeter.h"
+
+
+#define BORDER_WIDTH 1.0
+#define REV          (2.0 * G_PI)
+
+#define SAMPLE(i)    (meter->priv->samples + (i) * meter->priv->n_values)
+#define SAMPLE_SIZE  (meter->priv->n_values * sizeof (gdouble))
+#define VALUE(i, j)  ((SAFE_CLAMP (SAMPLE (i)[j],                              \
+                                   meter->priv->range_min,                     \
+                                   meter->priv->range_max) -                   \
+                        meter->priv->range_min) /                              \
+                       (meter->priv->range_max - meter->priv->range_min))
+
+
+enum
+{
+  PROP_0,
+  PROP_SIZE,
+  PROP_REFRESH_RATE,
+  PROP_RANGE_MIN,
+  PROP_RANGE_MAX,
+  PROP_N_VALUES,
+  PROP_HISTORY_VISIBLE,
+  PROP_HISTORY_DURATION,
+  PROP_HISTORY_RESOLUTION,
+  PROP_LED_ACTIVE,
+  PROP_LED_COLOR
+};
+
+
+typedef struct
+{
+  gboolean              active;
+  gboolean              show_in_gauge;
+  gboolean              show_in_history;
+  GimpRGB               color;
+  GimpInterpolationType interpolation;
+} Value;
+
+struct _GimpMeterPrivate
+{
+  GMutex   mutex;
+
+  gint      size;
+  gdouble   refresh_rate;
+  gdouble   range_min;
+  gdouble   range_max;
+  gint      n_values;
+  Value    *values;
+  gboolean  history_visible;
+  gdouble   history_duration;
+  gdouble   history_resolution;
+  gboolean  led_active;
+  GimpRGB   led_color;
+
+  gdouble  *samples;
+  gint      n_samples;
+  gint      sample_duration;
+  gint64    last_sample_time;
+  gint64    current_time;
+  gdouble  *uniform_sample;
+  gint      timeout_id;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_meter_dispose                (GObject        *object);
+static void       gimp_meter_finalize               (GObject        *object);
+static void       gimp_meter_set_property           (GObject        *object,
+                                                     guint           property_id,
+                                                     const GValue   *value,
+                                                     GParamSpec     *pspec);
+static void       gimp_meter_get_property           (GObject        *object,
+                                                     guint           property_id,
+                                                     GValue         *value,
+                                                     GParamSpec     *pspec);
+
+static void       gimp_meter_map                    (GtkWidget      *widget);
+static void       gimp_meter_unmap                  (GtkWidget      *widget);
+static void       gimp_meter_size_request           (GtkWidget      *widget,
+                                                     GtkRequisition *requisition);
+static gboolean   gimp_meter_expose_event           (GtkWidget      *widget,
+                                                     GdkEventExpose *event);
+
+static gboolean   gimp_meter_timeout                (GimpMeter      *meter);
+
+static void       gimp_meter_clear_history_unlocked (GimpMeter      *meter);
+static void       gimp_meter_update_samples         (GimpMeter      *meter);
+static void       gimp_meter_shift_samples          (GimpMeter      *meter);
+
+static void       gimp_meter_mask_sample            (GimpMeter      *meter,
+                                                     const gdouble  *sample,
+                                                     gdouble        *result);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpMeter, gimp_meter, GTK_TYPE_WIDGET)
+
+#define parent_class gimp_meter_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_meter_class_init (GimpMeterClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose      = gimp_meter_dispose;
+  object_class->finalize     = gimp_meter_finalize;
+  object_class->get_property = gimp_meter_get_property;
+  object_class->set_property = gimp_meter_set_property;
+
+  widget_class->map          = gimp_meter_map;
+  widget_class->unmap        = gimp_meter_unmap;
+  widget_class->size_request = gimp_meter_size_request;
+  widget_class->expose_event = gimp_meter_expose_event;
+
+  g_object_class_install_property (object_class, PROP_SIZE,
+                                   g_param_spec_int ("size",
+                                                     NULL, NULL,
+                                                     32, 1024, 48,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_REFRESH_RATE,
+                                   g_param_spec_double ("refresh-rate",
+                                                        NULL, NULL,
+                                                        0.001, 1000.0, 8.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RANGE_MIN,
+                                   g_param_spec_double ("range-min",
+                                                        NULL, NULL,
+                                                        0.0, G_MAXDOUBLE, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RANGE_MAX,
+                                   g_param_spec_double ("range-max",
+                                                        NULL, NULL,
+                                                        0.0, G_MAXDOUBLE, 1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_N_VALUES,
+                                   g_param_spec_int ("n-values",
+                                                     NULL, NULL,
+                                                     0, 32, 0,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HISTORY_VISIBLE,
+                                   g_param_spec_boolean ("history-visible",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HISTORY_DURATION,
+                                   g_param_spec_double ("history-duration",
+                                                        NULL, NULL,
+                                                        0.0, 3600.0, 60.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HISTORY_RESOLUTION,
+                                   g_param_spec_double ("history-resolution",
+                                                        NULL, NULL,
+                                                        0.1, 3600.0, 1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+
+  g_object_class_install_property (object_class, PROP_LED_ACTIVE,
+                                   g_param_spec_boolean ("led-active",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_LED_COLOR,
+                                   gimp_param_spec_rgb ("led-color",
+                                                        NULL, NULL,
+                                                        TRUE, &(GimpRGB) {},
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_meter_init (GimpMeter *meter)
+{
+  meter->priv = gimp_meter_get_instance_private (meter);
+
+  g_mutex_init (&meter->priv->mutex);
+
+  gtk_widget_set_has_window (GTK_WIDGET (meter), FALSE);
+
+  meter->priv->range_min          = 0.0;
+  meter->priv->range_max          = 1.0;
+  meter->priv->n_values           = 0;
+  meter->priv->history_duration   = 60.0;
+  meter->priv->history_resolution = 1.0;
+
+  gimp_meter_update_samples (meter);
+}
+
+static void
+gimp_meter_dispose (GObject *object)
+{
+  GimpMeter *meter = GIMP_METER (object);
+
+  g_clear_pointer (&meter->priv->values, g_free);
+  g_clear_pointer (&meter->priv->samples, g_free);
+  g_clear_pointer (&meter->priv->uniform_sample, g_free);
+
+  if (meter->priv->timeout_id)
+    {
+      g_source_remove (meter->priv->timeout_id);
+      meter->priv->timeout_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_meter_finalize (GObject *object)
+{
+  GimpMeter *meter = GIMP_METER (object);
+
+  g_mutex_clear (&meter->priv->mutex);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_meter_set_property (GObject      *object,
+                          guint         property_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  GimpMeter *meter = GIMP_METER (object);
+
+  switch (property_id)
+    {
+    case PROP_SIZE:
+      gimp_meter_set_size (meter, g_value_get_int (value));
+      break;
+
+    case PROP_REFRESH_RATE:
+      gimp_meter_set_refresh_rate (meter, g_value_get_double (value));
+      break;
+
+    case PROP_RANGE_MIN:
+      gimp_meter_set_range (meter,
+                            g_value_get_double (value),
+                            gimp_meter_get_range_max (meter));
+      break;
+
+    case PROP_RANGE_MAX:
+      gimp_meter_set_range (meter,
+                            gimp_meter_get_range_min (meter),
+                            g_value_get_double (value));
+      break;
+
+    case PROP_N_VALUES:
+      gimp_meter_set_n_values (meter, g_value_get_int (value));
+      break;
+
+    case PROP_HISTORY_VISIBLE:
+      gimp_meter_set_history_visible (meter, g_value_get_boolean (value));
+      break;
+
+    case PROP_HISTORY_DURATION:
+      gimp_meter_set_history_duration (meter, g_value_get_double (value));
+      break;
+
+    case PROP_HISTORY_RESOLUTION:
+      gimp_meter_set_history_resolution (meter, g_value_get_double (value));
+      break;
+
+    case PROP_LED_ACTIVE:
+      gimp_meter_set_led_active (meter, g_value_get_boolean (value));
+      break;
+
+    case PROP_LED_COLOR:
+      gimp_meter_set_led_color (meter, g_value_get_boxed (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_meter_get_property (GObject    *object,
+                          guint       property_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GimpMeter *meter = GIMP_METER (object);
+
+  switch (property_id)
+    {
+    case PROP_SIZE:
+      g_value_set_int (value, gimp_meter_get_size (meter));
+      break;
+
+    case PROP_REFRESH_RATE:
+      g_value_set_double (value, gimp_meter_get_refresh_rate (meter));
+      break;
+
+    case PROP_RANGE_MIN:
+      g_value_set_double (value, gimp_meter_get_range_min (meter));
+      break;
+
+    case PROP_RANGE_MAX:
+      g_value_set_double (value, gimp_meter_get_range_max (meter));
+      break;
+
+    case PROP_N_VALUES:
+      g_value_set_int (value, gimp_meter_get_n_values (meter));
+      break;
+
+    case PROP_HISTORY_VISIBLE:
+      g_value_set_boolean (value, gimp_meter_get_history_visible (meter));
+      break;
+
+    case PROP_HISTORY_DURATION:
+      g_value_set_int (value, gimp_meter_get_history_duration (meter));
+      break;
+
+    case PROP_HISTORY_RESOLUTION:
+      g_value_set_int (value, gimp_meter_get_history_resolution (meter));
+      break;
+
+    case PROP_LED_ACTIVE:
+      g_value_set_boolean (value, gimp_meter_get_led_active (meter));
+      break;
+
+    case PROP_LED_COLOR:
+      g_value_set_boxed (value, gimp_meter_get_led_color (meter));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_meter_map (GtkWidget *widget)
+{
+  GimpMeter *meter = GIMP_METER (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+  if (! meter->priv->timeout_id)
+    {
+      gint interval = ROUND (1000.0 / meter->priv->refresh_rate);
+
+      meter->priv->timeout_id = g_timeout_add (interval,
+                                               (GSourceFunc) gimp_meter_timeout,
+                                               meter);
+    }
+}
+
+static void
+gimp_meter_unmap (GtkWidget *widget)
+{
+  GimpMeter *meter = GIMP_METER (widget);
+
+  if (meter->priv->timeout_id)
+    {
+      g_source_remove (meter->priv->timeout_id);
+      meter->priv->timeout_id = 0;
+    }
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_meter_size_request (GtkWidget      *widget,
+                         GtkRequisition *requisition)
+{
+  gint hsize;
+  gint vsize;
+
+  GimpMeter *meter = GIMP_METER (widget);
+
+  hsize = meter->priv->size;
+  vsize = meter->priv->size;
+
+  if (meter->priv->history_visible)
+    hsize *= 3;
+
+  requisition->width  = ceil (            hsize + 2.0 * BORDER_WIDTH);
+  requisition->height = ceil (3.0 / 4.0 * vsize + 4.0 * BORDER_WIDTH);
+}
+
+static gboolean
+gimp_meter_expose_event (GtkWidget      *widget,
+                          GdkEventExpose *event)
+{
+  GimpMeter     *meter = GIMP_METER (widget);
+  GtkAllocation  allocation;
+  gint           size  = meter->priv->size;
+  GtkStyle      *style = gtk_widget_get_style (widget);
+  GtkStateType   state = gtk_widget_get_state (widget);
+  cairo_t       *cr;
+  gint           i;
+  gint           j;
+  gint           k;
+
+  if (! gtk_widget_is_drawable (widget))
+    return FALSE;
+
+  g_mutex_lock (&meter->priv->mutex);
+
+  cr = gdk_cairo_create (event->window);
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  /* translate to allocation top-left */
+  cairo_translate (cr, allocation.x, allocation.y);
+
+  cairo_save (cr);
+
+  /* translate to gauge center */
+  cairo_translate (cr,
+                   0.5 * BORDER_WIDTH +       0.5 * size,
+                   1.5 * BORDER_WIDTH + 2.0 / 3.0 * (allocation.height - 4.0 * BORDER_WIDTH));
+
+  cairo_save (cr);
+
+  /* paint led */
+  if (meter->priv->led_active)
+    {
+      cairo_arc (cr,
+                 0.0, 0.0,
+                 0.06 * size,
+                 0.0 * REV, 1.0 * REV);
+
+      gimp_cairo_set_source_rgba (cr, &meter->priv->led_color);
+      cairo_fill (cr);
+    }
+
+  /* clip to gauge interior */
+  cairo_arc          (cr,
+                      0.0, 0.0,
+                      0.5 * size,
+                      5.0 / 12.0 * REV, 1.0 / 12.0 * REV);
+  cairo_arc_negative (cr,
+                      0.0, 0.0,
+                      0.1 * size,
+                      1.0 / 12.0 * REV, 5.0 / 12.0 * REV);
+  cairo_close_path (cr);
+  cairo_clip (cr);
+
+  /* paint gauge background */
+  gdk_cairo_set_source_color (cr, &style->light[state]);
+  cairo_paint (cr);
+
+  /* paint values of last sample */
+  if (meter->priv->range_min < meter->priv->range_max)
+    {
+      for (i = 0; i < meter->priv->n_values; i++)
+        {
+          gdouble v = VALUE (0, i);
+
+          if (! meter->priv->values[i].active ||
+              ! meter->priv->values[i].show_in_gauge)
+            {
+              continue;
+            }
+
+          gimp_cairo_set_source_rgba (cr, &meter->priv->values[i].color);
+          cairo_move_to (cr, 0.0, 0.0);
+          cairo_arc (cr,
+                     0.0, 0.0,
+
+                     0.5 * size,
+                     5.0 / 12.0 * REV, (5.0 / 12.0 + 2.0 / 3.0 * v) * REV);
+          cairo_line_to (cr, 0.0, 0.0);
+          cairo_close_path (cr);
+          cairo_fill (cr);
+        }
+    }
+
+  cairo_restore (cr);
+
+  /* paint gauge border */
+  gdk_cairo_set_source_color (cr, &style->fg[state]);
+  cairo_set_line_width (cr, BORDER_WIDTH);
+  cairo_arc          (cr,
+                      0.0, 0.0,
+                      0.5 * size,
+                      5.0 / 12.0 * REV, 1.0 / 12.0 * REV);
+  cairo_arc_negative (cr,
+                      0.0, 0.0,
+                      0.1 * size,
+                      1.0 / 12.0 * REV, 5.0 / 12.0 * REV);
+  cairo_close_path (cr);
+  cairo_stroke (cr);
+
+  /* history */
+  if (meter->priv->history_visible)
+    {
+      gdouble a1, a2;
+      gdouble history_x1, history_y1;
+      gdouble history_x2, history_y2;
+
+      cairo_save (cr);
+
+      a1 = +asin (0.25 / 0.6);
+      a2 = -asin (0.50 / 0.6);
+
+      /* clip to history interior */
+      cairo_arc_negative (cr,
+                          0.0, 0.0,
+                          0.6 * size,
+                          a1, a2);
+      cairo_line_to (cr,
+                     allocation.width - BORDER_WIDTH - 0.5 * size,
+                     -0.50 * size);
+      cairo_line_to (cr,
+                     allocation.width - BORDER_WIDTH - 0.5 * size,
+                     0.25 * size);
+      cairo_close_path (cr);
+
+      cairo_path_extents (cr,
+                          &history_x1, &history_y1,
+                          &history_x2, &history_y2);
+
+      history_x1 = floor (history_x1);
+      history_y1 = floor (history_y1);
+      history_x2 = ceil  (history_x2);
+      history_y2 = ceil  (history_y2);
+
+      cairo_clip (cr);
+
+      /* paint history background */
+      gdk_cairo_set_source_color (cr, &style->light[state]);
+      cairo_paint (cr);
+
+      /* history graph */
+      if (meter->priv->range_min < meter->priv->range_max)
+        {
+          gdouble sample_width = (history_x2 - history_x1) /
+                                 (meter->priv->n_samples - 4);
+          gdouble dx           = 1.0 / sample_width;
+
+          cairo_save (cr);
+
+          /* translate to history bottom-right, and scale so that the
+           * x-axis points left, and has a length of one sample, and
+           * the y-axis points up, and has a length of the history
+           * window.
+           */
+          cairo_translate (cr, history_x2, history_y2);
+          cairo_scale (cr, -sample_width, -(history_y2 - history_y1));
+          cairo_translate (cr,
+                           (gdouble) (meter->priv->current_time     -
+                                      meter->priv->last_sample_time *
+                                      meter->priv->sample_duration) /
+                           meter->priv->sample_duration             -
+                           2.0,
+                           0.0);
+
+          /* paint history graph for each value */
+          for (i = 0; i < meter->priv->n_values; i++)
+            {
+              gdouble y;
+
+              if (! meter->priv->values[i].active ||
+                  ! meter->priv->values[i].show_in_history)
+                {
+                  continue;
+                }
+
+              gimp_cairo_set_source_rgba (cr, &meter->priv->values[i].color);
+              cairo_move_to (cr, 0.0, 0.0);
+
+              switch (meter->priv->values[i].interpolation)
+                {
+                case GIMP_INTERPOLATION_NONE:
+                  {
+                    for (j = 1; j < meter->priv->n_samples - 2; j++)
+                      {
+                        gdouble y0 = VALUE (j - 1, i);
+                        gdouble y1 = VALUE (j,     i);
+
+                        cairo_line_to (cr, j, y0);
+                        cairo_line_to (cr, j, y1);
+                      }
+                  }
+                  break;
+
+                case GIMP_INTERPOLATION_LINEAR:
+                  {
+                    for (j = 1; j < meter->priv->n_samples - 2; j++)
+                      {
+                        gdouble y = VALUE (j, i);
+
+                        cairo_line_to (cr, j, y);
+                      }
+                  }
+                  break;
+
+                case GIMP_INTERPOLATION_CUBIC:
+                default:
+                  {
+                    for (j = 1; j < meter->priv->n_samples - 2; j++)
+                      {
+                        gdouble y[4];
+                        gdouble t[2];
+                        gdouble c[4];
+                        gdouble x;
+
+                        for (k = 0; k < 4; k++)
+                          y[k] = VALUE (j + k - 1, i);
+
+                        for (k = 0; k < 2; k++)
+                          {
+                            t[k] = (y[k + 2] - y[k]) / 2.0;
+                            t[k] = CLAMP (t[k], y[k + 1] - 1.0, y[k + 1]);
+                            t[k] = CLAMP (t[k], -y[k + 1], 1.0 - y[k + 1]);
+                          }
+
+                        c[0] = y[1];
+                        c[1] = t[0];
+                        c[2] = 3 * (y[2] - y[1]) - 2 * t[0] - t[1];
+                        c[3] = t[0] + t[1] - 2 * (y[2] - y[1]);
+
+                        for (x = 0.0; x < 1.0; x += dx)
+                          {
+                            gdouble y = ((c[3] * x + c[2]) * x + c[1]) * x + c[0];
+
+                            cairo_line_to (cr, j + x, y);
+                          }
+                      }
+                  }
+                  break;
+                }
+
+              y = VALUE (j, i);
+
+              cairo_line_to (cr, meter->priv->n_samples - 2, y);
+              cairo_line_to (cr, meter->priv->n_samples - 2, 0.0);
+              cairo_close_path (cr);
+              cairo_fill (cr);
+            }
+
+          cairo_restore (cr);
+        }
+
+      /* paint history grid */
+      cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+      cairo_set_source_rgba (cr,
+                             (gdouble) style->fg[state].red   / 0xffff,
+                             (gdouble) style->fg[state].green / 0xffff,
+                             (gdouble) style->fg[state].blue  / 0xffff,
+                             0.3);
+
+      for (i = 1; i < 4; i++)
+        {
+          cairo_move_to (cr,
+                         history_x1,
+                         history_y1 + i / 4.0 * (history_y2 - history_y1));
+          cairo_rel_line_to (cr, history_x2 - history_x1, 0.0);
+          cairo_stroke (cr);
+        }
+
+      for (i = 1; i < 6; i++)
+        {
+          cairo_move_to (cr,
+                         history_x1 + i / 6.0 * (history_x2 - history_x1),
+                         history_y1);
+          cairo_rel_line_to (cr, 0.0, history_y2 - history_y1);
+          cairo_stroke (cr);
+        }
+
+      cairo_restore (cr);
+
+      /* paint history border */
+      cairo_arc_negative (cr,
+                          0.0, 0.0,
+                          0.6 * size,
+                          a1, a2);
+      cairo_line_to (cr,
+                     allocation.width - BORDER_WIDTH - 0.5 * size,
+                     -0.50 * size);
+      cairo_line_to (cr,
+                     allocation.width - BORDER_WIDTH - 0.5 * size,
+                     0.25 * size);
+      cairo_close_path (cr);
+      cairo_stroke (cr);
+    }
+
+  cairo_restore (cr);
+
+  cairo_destroy (cr);
+
+  g_mutex_unlock (&meter->priv->mutex);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_meter_timeout (GimpMeter *meter)
+{
+  gboolean uniform = TRUE;
+  gboolean redraw  = TRUE;
+  gdouble  sample0[meter->priv->n_values];
+  gint     i;
+
+  g_mutex_lock (&meter->priv->mutex);
+
+  gimp_meter_shift_samples (meter);
+
+  gimp_meter_mask_sample (meter, SAMPLE (0), sample0);
+
+  if (meter->priv->history_visible)
+    {
+      for (i = 1; uniform && i < meter->priv->n_samples; i++)
+        {
+          gdouble sample[meter->priv->n_values];
+
+          gimp_meter_mask_sample (meter, SAMPLE (i), sample);
+
+          uniform = ! memcmp (sample0, sample, SAMPLE_SIZE);
+        }
+    }
+
+  if (uniform && meter->priv->uniform_sample)
+    redraw = memcmp (sample0, meter->priv->uniform_sample, SAMPLE_SIZE);
+
+  if (uniform)
+    {
+      if (! meter->priv->uniform_sample)
+        meter->priv->uniform_sample = g_malloc (SAMPLE_SIZE);
+
+      memcpy (meter->priv->uniform_sample, sample0, SAMPLE_SIZE);
+    }
+  else
+    {
+      g_clear_pointer (&meter->priv->uniform_sample, g_free);
+    }
+
+  g_mutex_unlock (&meter->priv->mutex);
+
+  if (redraw)
+    gtk_widget_queue_draw (GTK_WIDGET (meter));
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+gimp_meter_clear_history_unlocked (GimpMeter *meter)
+{
+  meter->priv->current_time     = g_get_monotonic_time ();
+  meter->priv->last_sample_time = meter->priv->current_time /
+                                  meter->priv->sample_duration;
+
+  memset (meter->priv->samples, 0, meter->priv->n_samples * SAMPLE_SIZE);
+
+  g_clear_pointer (&meter->priv->uniform_sample, g_free);
+}
+
+static void
+gimp_meter_update_samples (GimpMeter *meter)
+{
+  meter->priv->n_samples = ceil (meter->priv->history_duration /
+                                 meter->priv->history_resolution) + 4;
+
+  meter->priv->samples = g_renew (gdouble, meter->priv->samples,
+                                  meter->priv->n_samples *
+                                  meter->priv->n_values);
+
+  meter->priv->sample_duration = ROUND (meter->priv->history_resolution *
+                                        G_TIME_SPAN_SECOND);
+
+  gimp_meter_clear_history_unlocked (meter);
+}
+
+static void
+gimp_meter_shift_samples (GimpMeter *meter)
+{
+  gint64 time;
+  gint   n_new_samples;
+
+  meter->priv->current_time = g_get_monotonic_time ();
+
+  time = meter->priv->current_time / meter->priv->sample_duration;
+
+  n_new_samples = MIN (time - meter->priv->last_sample_time,
+                       meter->priv->n_samples - 1);
+
+  memmove (SAMPLE (n_new_samples), SAMPLE (0),
+           (meter->priv->n_samples - n_new_samples) * SAMPLE_SIZE);
+  gegl_memset_pattern (SAMPLE (0), SAMPLE (n_new_samples), SAMPLE_SIZE,
+                       n_new_samples);
+
+  meter->priv->last_sample_time = time;
+}
+
+static void
+gimp_meter_mask_sample (GimpMeter     *meter,
+                        const gdouble *sample,
+                        gdouble       *result)
+{
+  gint i;
+
+  for (i = 0; i < meter->priv->n_values; i++)
+    {
+      if (meter->priv->values[i].active         &&
+          (meter->priv->values[i].show_in_gauge ||
+           meter->priv->values[i].show_in_history))
+        {
+          result[i] = sample[i];
+        }
+      else
+        {
+          result[i] = 0.0;
+        }
+    }
+}
+
+
+/*  public functions  */
+
+
+GtkWidget *
+gimp_meter_new (gint n_values)
+{
+  return g_object_new (GIMP_TYPE_METER,
+                       "n-values", n_values,
+                       NULL);
+}
+
+void
+gimp_meter_set_size (GimpMeter *meter,
+                     gint       size)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (size > 0);
+
+  if (size != meter->priv->size)
+    {
+      meter->priv->size = size;
+
+      gtk_widget_queue_resize (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "size");
+    }
+}
+
+gint
+gimp_meter_get_size (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0);
+
+  return meter->priv->size;
+}
+
+void
+gimp_meter_set_refresh_rate (GimpMeter *meter,
+                             gdouble    rate)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (rate > 0.0);
+
+  if (rate != meter->priv->refresh_rate)
+    {
+      meter->priv->refresh_rate = rate;
+
+      if (meter->priv->timeout_id)
+        {
+          gint interval = ROUND (1000.0 / meter->priv->refresh_rate);
+
+          g_source_remove (meter->priv->timeout_id);
+
+          meter->priv->timeout_id = g_timeout_add (interval,
+                                                   (GSourceFunc) gimp_meter_timeout,
+                                                   meter);
+        }
+
+      g_object_notify (G_OBJECT (meter), "refresh-rate");
+    }
+}
+
+gdouble
+gimp_meter_get_refresh_rate (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0);
+
+  return meter->priv->refresh_rate;
+}
+
+void
+gimp_meter_set_range (GimpMeter *meter,
+                      gdouble    min,
+                      gdouble    max)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (min <= max);
+
+  if (min != meter->priv->range_min)
+    {
+      g_mutex_lock (&meter->priv->mutex);
+
+      meter->priv->range_min = min;
+
+      g_mutex_unlock (&meter->priv->mutex);
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "range-min");
+    }
+
+  if (max != meter->priv->range_max)
+    {
+      g_mutex_lock (&meter->priv->mutex);
+
+      meter->priv->range_max = max;
+
+      g_mutex_unlock (&meter->priv->mutex);
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "range-max");
+    }
+}
+
+gdouble
+gimp_meter_get_range_min (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0.0);
+
+  return meter->priv->range_min;
+}
+
+gdouble
+gimp_meter_get_range_max (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0.0);
+
+  return meter->priv->range_max;
+}
+
+void
+gimp_meter_set_n_values (GimpMeter *meter,
+                         gint       n_values)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (n_values >= 0);
+
+  if (n_values != meter->priv->n_values)
+    {
+      g_mutex_lock (&meter->priv->mutex);
+
+      meter->priv->values = g_renew (Value, meter->priv->values, n_values);
+
+      if (n_values > meter->priv->n_values)
+        {
+          gegl_memset_pattern (meter->priv->values,
+                               &(Value) { .active          = TRUE,
+                                          .show_in_gauge   = TRUE,
+                                          .show_in_history = TRUE,
+                                          .interpolation   = GIMP_INTERPOLATION_CUBIC},
+                               sizeof (Value),
+                               n_values - meter->priv->n_values);
+        }
+
+      meter->priv->n_values = n_values;
+
+      gimp_meter_update_samples (meter);
+
+      g_mutex_unlock (&meter->priv->mutex);
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "n-values");
+    }
+}
+
+gint
+gimp_meter_get_n_values (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0);
+
+  return meter->priv->n_values;
+}
+
+void
+gimp_meter_set_value_active (GimpMeter *meter,
+                             gint       value,
+                             gboolean   active)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (value >= 0 && value < meter->priv->n_values);
+
+  if (active != meter->priv->values[value].active)
+    {
+      meter->priv->values[value].active = active;
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+    }
+}
+
+gboolean
+gimp_meter_get_value_active (GimpMeter *meter,
+                             gint       value)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), FALSE);
+  g_return_val_if_fail (value >= 0 && value < meter->priv->n_values, FALSE);
+
+  return meter->priv->values[value].active;
+}
+
+
+void
+gimp_meter_set_value_color (GimpMeter     *meter,
+                            gint           value,
+                            const GimpRGB *color)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (value >= 0 && value < meter->priv->n_values);
+  g_return_if_fail (color != NULL);
+
+  if (memcmp (color, &meter->priv->values[value].color, sizeof (GimpRGB)))
+    {
+      meter->priv->values[value].color = *color;
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+    }
+}
+
+const GimpRGB *
+gimp_meter_get_value_color (GimpMeter *meter,
+                            gint       value)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), NULL);
+  g_return_val_if_fail (value >= 0 && value < meter->priv->n_values, NULL);
+
+  return &meter->priv->values[value].color;
+}
+
+void
+gimp_meter_set_value_interpolation (GimpMeter             *meter,
+                                    gint                   value,
+                                    GimpInterpolationType  interpolation)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (value >= 0 && value < meter->priv->n_values);
+
+  if (meter->priv->values[value].interpolation != interpolation)
+    {
+      meter->priv->values[value].interpolation = interpolation;
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+    }
+}
+
+GimpInterpolationType
+gimp_meter_get_value_interpolation (GimpMeter *meter,
+                                    gint       value)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), GIMP_INTERPOLATION_NONE);
+  g_return_val_if_fail (value >= 0 && value < meter->priv->n_values,
+                        GIMP_INTERPOLATION_NONE);
+
+  return meter->priv->values[value].interpolation;
+}
+
+void
+gimp_meter_set_value_show_in_gauge (GimpMeter *meter,
+                                    gint       value,
+                                    gboolean   show)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (value >= 0 && value < meter->priv->n_values);
+
+  if (meter->priv->values[value].show_in_gauge != show)
+    {
+      meter->priv->values[value].show_in_gauge = show;
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+    }
+}
+
+gboolean
+gimp_meter_get_value_show_in_gauge (GimpMeter *meter,
+                                    gint       value)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), FALSE);
+  g_return_val_if_fail (value >= 0 && value < meter->priv->n_values, FALSE);
+
+  return meter->priv->values[value].show_in_gauge;
+}
+
+void
+gimp_meter_set_value_show_in_history (GimpMeter *meter,
+                                      gint       value,
+                                      gboolean   show)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (value >= 0 && value < meter->priv->n_values);
+
+  if (meter->priv->values[value].show_in_history != show)
+    {
+      meter->priv->values[value].show_in_history = show;
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+    }
+}
+
+gboolean
+gimp_meter_get_value_show_in_history (GimpMeter *meter,
+                                      gint       value)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), FALSE);
+  g_return_val_if_fail (value >= 0 && value < meter->priv->n_values, FALSE);
+
+  return meter->priv->values[value].show_in_history;
+}
+
+void
+gimp_meter_set_history_visible (GimpMeter *meter,
+                                gboolean   visible)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+
+  if (visible != meter->priv->history_visible)
+    {
+      meter->priv->history_visible = visible;
+
+      gtk_widget_queue_resize (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "history-visible");
+    }
+}
+
+gboolean
+gimp_meter_get_history_visible (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), FALSE);
+
+  return meter->priv->history_visible;
+}
+
+void
+gimp_meter_set_history_duration (GimpMeter *meter,
+                                 gdouble    duration)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (duration >= 0.0);
+
+  if (duration != meter->priv->history_duration)
+    {
+      g_mutex_lock (&meter->priv->mutex);
+
+      meter->priv->history_duration = duration;
+
+      gimp_meter_update_samples (meter);
+
+      g_mutex_unlock (&meter->priv->mutex);
+
+      g_object_notify (G_OBJECT (meter), "history-duration");
+    }
+}
+
+gdouble
+gimp_meter_get_history_duration (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0.0);
+
+  return meter->priv->history_duration;
+}
+
+void
+gimp_meter_set_history_resolution (GimpMeter *meter,
+                                   gdouble    resolution)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (resolution > 0.0);
+
+  if (resolution != meter->priv->history_resolution)
+    {
+      g_mutex_lock (&meter->priv->mutex);
+
+      meter->priv->history_resolution = resolution;
+
+      gimp_meter_update_samples (meter);
+
+      g_mutex_unlock (&meter->priv->mutex);
+
+      g_object_notify (G_OBJECT (meter), "history-resolution");
+    }
+}
+
+gdouble
+gimp_meter_get_history_resolution (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), 0.0);
+
+  return meter->priv->history_resolution;
+}
+
+void
+gimp_meter_clear_history (GimpMeter *meter)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+
+  g_mutex_lock (&meter->priv->mutex);
+
+  gimp_meter_clear_history_unlocked (meter);
+
+  g_mutex_unlock (&meter->priv->mutex);
+
+  gtk_widget_queue_draw (GTK_WIDGET (meter));
+}
+
+void
+gimp_meter_add_sample (GimpMeter     *meter,
+                       const gdouble *sample)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (sample != NULL || meter->priv->n_values == 0);
+
+  g_mutex_lock (&meter->priv->mutex);
+
+  gimp_meter_shift_samples (meter);
+
+  memcpy (SAMPLE (0), sample, SAMPLE_SIZE);
+
+  g_mutex_unlock (&meter->priv->mutex);
+}
+
+void
+gimp_meter_set_led_active (GimpMeter *meter,
+                           gboolean   active)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+
+  if (active != meter->priv->led_active)
+    {
+      meter->priv->led_active = active;
+
+      gtk_widget_queue_draw (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "led-active");
+    }
+}
+
+gboolean
+gimp_meter_get_led_active (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), FALSE);
+
+  return meter->priv->led_active;
+}
+
+void
+gimp_meter_set_led_color (GimpMeter     *meter,
+                          const GimpRGB *color)
+{
+  g_return_if_fail (GIMP_IS_METER (meter));
+  g_return_if_fail (color != NULL);
+
+  if (memcmp (color, &meter->priv->led_color, sizeof (GimpRGB)))
+    {
+      meter->priv->led_color = *color;
+
+      if (meter->priv->led_active)
+        gtk_widget_queue_draw (GTK_WIDGET (meter));
+
+      g_object_notify (G_OBJECT (meter), "led-color");
+    }
+}
+
+const GimpRGB *
+gimp_meter_get_led_color (GimpMeter *meter)
+{
+  g_return_val_if_fail (GIMP_IS_METER (meter), NULL);
+
+  return &meter->priv->led_color;
+}
diff --git a/app/widgets/gimpmeter.h b/app/widgets/gimpmeter.h
new file mode 100644
index 0000000..97fd0c6
--- /dev/null
+++ b/app/widgets/gimpmeter.h
@@ -0,0 +1,127 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpmeter.h
+ * Copyright (C) 2017 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_METER_H__
+#define __GIMP_METER_H__
+
+
+#define GIMP_TYPE_METER            (gimp_meter_get_type ())
+#define GIMP_METER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_METER, GimpMeter))
+#define GIMP_METER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_METER, GimpMeterClass))
+#define GIMP_IS_METER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_METER))
+#define GIMP_IS_METER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_METER))
+#define GIMP_METER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_METER, GimpMeterClass))
+
+
+typedef struct _GimpMeterPrivate GimpMeterPrivate;
+typedef struct _GimpMeterClass   GimpMeterClass;
+
+struct _GimpMeter
+{
+  GtkWidget         parent_instance;
+
+  GimpMeterPrivate *priv;
+};
+
+struct _GimpMeterClass
+{
+  GtkWidgetClass  parent_class;
+};
+
+
+GType                   gimp_meter_get_type                  (void) G_GNUC_CONST;
+
+GtkWidget             * gimp_meter_new                       (gint                   n_values);
+
+void                    gimp_meter_set_size                  (GimpMeter             *meter,
+                                                              gint                   size);
+gint                    gimp_meter_get_size                  (GimpMeter             *meter);
+
+void                    gimp_meter_set_refresh_rate          (GimpMeter             *meter,
+                                                              gdouble                rate);
+gdouble                 gimp_meter_get_refresh_rate          (GimpMeter             *meter);
+
+void                    gimp_meter_set_range                 (GimpMeter             *meter,
+                                                              gdouble                min,
+                                                              gdouble                max);
+gdouble                 gimp_meter_get_range_min             (GimpMeter             *meter);
+gdouble                 gimp_meter_get_range_max             (GimpMeter             *meter);
+
+void                    gimp_meter_set_n_values              (GimpMeter             *meter,
+                                                              gint                   n_values);
+gint                    gimp_meter_get_n_values              (GimpMeter             *meter);
+
+void                    gimp_meter_set_value_active          (GimpMeter             *meter,
+                                                              gint                   value,
+                                                              gboolean               active);
+gboolean                gimp_meter_get_value_active          (GimpMeter             *meter,
+                                                              gint                   value);
+
+void                    gimp_meter_set_value_show_in_gauge    (GimpMeter            *meter,
+                                                               gint                  value,
+                                                               gboolean              show);
+gboolean                gimp_meter_get_value_show_in_gauge    (GimpMeter            *meter,
+                                                               gint                  value);
+
+void                    gimp_meter_set_value_show_in_history (GimpMeter             *meter,
+                                                              gint                   value,
+                                                              gboolean               show);
+gboolean                gimp_meter_get_value_show_in_history (GimpMeter             *meter,
+                                                              gint                   value);
+
+void                    gimp_meter_set_value_color           (GimpMeter             *meter,
+                                                              gint                   value,
+                                                              const GimpRGB         *color);
+const GimpRGB         * gimp_meter_get_value_color           (GimpMeter             *meter,
+                                                              gint                   value);
+
+void                    gimp_meter_set_value_interpolation   (GimpMeter             *meter,
+                                                              gint                   value,
+                                                              GimpInterpolationType  interpolation);
+GimpInterpolationType   gimp_meter_get_value_interpolation   (GimpMeter             *meter,
+                                                              gint                   value);
+
+void                    gimp_meter_set_history_visible       (GimpMeter             *meter,
+                                                              gboolean               visible);
+gboolean                gimp_meter_get_history_visible       (GimpMeter             *meter);
+
+void                    gimp_meter_set_history_duration      (GimpMeter             *meter,
+                                                              gdouble                duration);
+gdouble                 gimp_meter_get_history_duration      (GimpMeter             *meter);
+
+void                    gimp_meter_set_history_resolution    (GimpMeter             *meter,
+                                                              gdouble                resolution);
+gdouble                 gimp_meter_get_history_resolution    (GimpMeter             *meter);
+
+void                    gimp_meter_clear_history             (GimpMeter             *meter);
+
+void                    gimp_meter_add_sample                (GimpMeter             *meter,
+                                                              const gdouble         *sample);
+
+void                    gimp_meter_set_led_active            (GimpMeter             *meter,
+                                                              gboolean               active);
+gboolean                gimp_meter_get_led_active            (GimpMeter             *meter);
+
+void                    gimp_meter_set_led_color             (GimpMeter             *meter,
+                                                              const GimpRGB         *color);
+const GimpRGB         * gimp_meter_get_led_color             (GimpMeter             *meter);
+
+
+#endif /* __GIMP_METER_H__ */
diff --git a/app/widgets/gimpnavigationview.c b/app/widgets/gimpnavigationview.c
new file mode 100644
index 0000000..d3edfd1
--- /dev/null
+++ b/app/widgets/gimpnavigationview.c
@@ -0,0 +1,697 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpNavigationView Widget
+ * Copyright (C) 2001-2002 Michael Natterer <mitch@gimp.org>
+ *
+ * partly based on app/nav_window
+ * Copyright (C) 1999 Andy Thomas <alt@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpmarshal.h"
+
+#include "display/gimpcanvas-style.h"
+
+#include "gimpnavigationview.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+
+#define BORDER_WIDTH 2
+
+
+enum
+{
+  MARKER_CHANGED,
+  ZOOM,
+  SCROLL,
+  LAST_SIGNAL
+};
+
+
+struct _GimpNavigationView
+{
+  GimpView     parent_instance;
+
+  /*  values in image coordinates  */
+  gdouble      center_x;
+  gdouble      center_y;
+  gdouble      width;
+  gdouble      height;
+  gboolean     flip_horizontally;
+  gboolean     flip_vertically;
+  gdouble      rotate_angle;
+
+  gboolean     canvas_visible;
+  gdouble      canvas_x;
+  gdouble      canvas_y;
+  gdouble      canvas_width;
+  gdouble      canvas_height;
+
+  /*  values in view coordinates  */
+  gint         p_center_x;
+  gint         p_center_y;
+  gint         p_width;
+  gint         p_height;
+
+  gint         p_canvas_x;
+  gint         p_canvas_y;
+  gint         p_canvas_width;
+  gint         p_canvas_height;
+
+  gint         motion_offset_x;
+  gint         motion_offset_y;
+  gboolean     has_grab;
+};
+
+
+static void     gimp_navigation_view_size_allocate   (GtkWidget      *widget,
+                                                      GtkAllocation  *allocation);
+static gboolean gimp_navigation_view_expose          (GtkWidget      *widget,
+                                                      GdkEventExpose *event);
+static gboolean gimp_navigation_view_button_press    (GtkWidget      *widget,
+                                                      GdkEventButton *bevent);
+static gboolean gimp_navigation_view_button_release  (GtkWidget      *widget,
+                                                      GdkEventButton *bevent);
+static gboolean gimp_navigation_view_scroll          (GtkWidget      *widget,
+                                                      GdkEventScroll *sevent);
+static gboolean gimp_navigation_view_motion_notify   (GtkWidget      *widget,
+                                                      GdkEventMotion *mevent);
+static gboolean gimp_navigation_view_key_press       (GtkWidget      *widget,
+                                                      GdkEventKey    *kevent);
+
+static void     gimp_navigation_view_transform       (GimpNavigationView *nav_view);
+static void     gimp_navigation_view_draw_marker     (GimpNavigationView *nav_view,
+                                                      cairo_t            *cr);
+static void     gimp_navigation_view_move_to         (GimpNavigationView *nav_view,
+                                                      gint                tx,
+                                                      gint                ty);
+static void     gimp_navigation_view_get_ratio       (GimpNavigationView *nav_view,
+                                                      gdouble            *ratiox,
+                                                      gdouble            *ratioy);
+static gboolean gimp_navigation_view_point_in_marker (GimpNavigationView *nav_view,
+                                                      gint                x,
+                                                      gint                y);
+
+
+G_DEFINE_TYPE (GimpNavigationView, gimp_navigation_view, GIMP_TYPE_VIEW)
+
+#define parent_class gimp_navigation_view_parent_class
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_navigation_view_class_init (GimpNavigationViewClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  view_signals[MARKER_CHANGED] =
+    g_signal_new ("marker-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpNavigationViewClass, marker_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE,
+                  G_TYPE_NONE, 4,
+                  G_TYPE_DOUBLE,
+                  G_TYPE_DOUBLE,
+                  G_TYPE_DOUBLE,
+                  G_TYPE_DOUBLE);
+
+  view_signals[ZOOM] =
+    g_signal_new ("zoom",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpNavigationViewClass, zoom),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_ZOOM_TYPE);
+
+  view_signals[SCROLL] =
+    g_signal_new ("scroll",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpNavigationViewClass, scroll),
+                  NULL, NULL,
+                  gimp_marshal_VOID__ENUM,
+                  G_TYPE_NONE, 1,
+                  GDK_TYPE_SCROLL_DIRECTION);
+
+  widget_class->size_allocate        = gimp_navigation_view_size_allocate;
+  widget_class->expose_event         = gimp_navigation_view_expose;
+  widget_class->button_press_event   = gimp_navigation_view_button_press;
+  widget_class->button_release_event = gimp_navigation_view_button_release;
+  widget_class->scroll_event         = gimp_navigation_view_scroll;
+  widget_class->motion_notify_event  = gimp_navigation_view_motion_notify;
+  widget_class->key_press_event      = gimp_navigation_view_key_press;
+}
+
+static void
+gimp_navigation_view_init (GimpNavigationView *view)
+{
+  gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE);
+  gtk_widget_add_events (GTK_WIDGET (view),
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_KEY_PRESS_MASK);
+
+  view->center_x          = 0.0;
+  view->center_y          = 0.0;
+  view->width             = 0.0;
+  view->height            = 0.0;
+  view->flip_horizontally = FALSE;
+  view->flip_vertically   = FALSE;
+  view->rotate_angle      = 0.0;
+
+  view->canvas_visible    = FALSE;
+  view->canvas_x          = 0.0;
+  view->canvas_y          = 0.0;
+  view->canvas_width      = 0.0;
+  view->canvas_height     = 0.0;
+
+  view->p_center_x      = 0;
+  view->p_center_y      = 0;
+  view->p_width         = 0;
+  view->p_height        = 0;
+
+  view->p_canvas_x      = 0;
+  view->p_canvas_y      = 0;
+  view->p_canvas_width  = 0;
+  view->p_canvas_height = 0;
+
+  view->motion_offset_x = 0;
+  view->motion_offset_y = 0;
+  view->has_grab        = FALSE;
+}
+
+static void
+gimp_navigation_view_size_allocate (GtkWidget     *widget,
+                                    GtkAllocation *allocation)
+{
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  if (GIMP_VIEW (widget)->renderer->viewable)
+    gimp_navigation_view_transform (GIMP_NAVIGATION_VIEW (widget));
+}
+
+static gboolean
+gimp_navigation_view_expose (GtkWidget      *widget,
+                             GdkEventExpose *event)
+{
+  if (gtk_widget_is_drawable (widget))
+    {
+      cairo_t *cr;
+
+      GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+      cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      gimp_navigation_view_draw_marker (GIMP_NAVIGATION_VIEW (widget), cr);
+
+      cairo_destroy (cr);
+    }
+
+  return TRUE;
+}
+
+void
+gimp_navigation_view_grab_pointer (GimpNavigationView *nav_view)
+{
+  GtkWidget  *widget = GTK_WIDGET (nav_view);
+  GdkDisplay *display;
+  GdkCursor  *cursor;
+  GdkWindow  *window;
+
+  nav_view->has_grab = TRUE;
+
+  gtk_grab_add (widget);
+
+  display = gtk_widget_get_display (widget);
+  cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
+
+  window = GIMP_VIEW (nav_view)->event_window;
+
+  gdk_pointer_grab (window, FALSE,
+                    GDK_BUTTON_RELEASE_MASK      |
+                    GDK_POINTER_MOTION_HINT_MASK |
+                    GDK_BUTTON_MOTION_MASK       |
+                    GDK_EXTENSION_EVENTS_ALL,
+                    NULL, cursor, GDK_CURRENT_TIME);
+
+  gdk_cursor_unref (cursor);
+}
+
+static gboolean
+gimp_navigation_view_button_press (GtkWidget      *widget,
+                                   GdkEventButton *bevent)
+{
+  GimpNavigationView *nav_view = GIMP_NAVIGATION_VIEW (widget);
+  gint                tx, ty;
+  GdkDisplay         *display;
+
+  tx = bevent->x;
+  ty = bevent->y;
+
+  if (bevent->type == GDK_BUTTON_PRESS && bevent->button == 1)
+    {
+      if (! gimp_navigation_view_point_in_marker (nav_view, tx, ty))
+        {
+          GdkCursor *cursor;
+
+          nav_view->motion_offset_x = 0;
+          nav_view->motion_offset_y = 0;
+
+          gimp_navigation_view_move_to (nav_view, tx, ty);
+
+          display = gtk_widget_get_display (widget);
+          cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
+          gdk_window_set_cursor (GIMP_VIEW (widget)->event_window, cursor);
+          gdk_cursor_unref (cursor);
+        }
+      else
+        {
+          nav_view->motion_offset_x = tx - nav_view->p_center_x;
+          nav_view->motion_offset_y = ty - nav_view->p_center_y;
+        }
+
+      gimp_navigation_view_grab_pointer (nav_view);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_navigation_view_button_release (GtkWidget      *widget,
+                                     GdkEventButton *bevent)
+{
+  GimpNavigationView *nav_view = GIMP_NAVIGATION_VIEW (widget);
+
+  if (bevent->button == 1 && nav_view->has_grab)
+    {
+      nav_view->has_grab = FALSE;
+
+      gtk_grab_remove (widget);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+                                  GDK_CURRENT_TIME);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_navigation_view_scroll (GtkWidget      *widget,
+                             GdkEventScroll *sevent)
+{
+  if (sevent->state & gimp_get_toggle_behavior_mask ())
+    {
+      switch (sevent->direction)
+        {
+        case GDK_SCROLL_UP:
+          g_signal_emit (widget, view_signals[ZOOM], 0, GIMP_ZOOM_IN);
+          break;
+
+        case GDK_SCROLL_DOWN:
+          g_signal_emit (widget, view_signals[ZOOM], 0, GIMP_ZOOM_OUT);
+          break;
+
+        default:
+          break;
+        }
+    }
+  else
+    {
+      GdkScrollDirection direction = sevent->direction;
+
+      if (sevent->state & GDK_SHIFT_MASK)
+        switch (direction)
+          {
+          case GDK_SCROLL_UP:    direction = GDK_SCROLL_LEFT;  break;
+          case GDK_SCROLL_DOWN:  direction = GDK_SCROLL_RIGHT; break;
+          case GDK_SCROLL_LEFT:  direction = GDK_SCROLL_UP;    break;
+          case GDK_SCROLL_RIGHT: direction = GDK_SCROLL_DOWN;  break;
+          }
+
+      g_signal_emit (widget, view_signals[SCROLL], 0, direction);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_navigation_view_motion_notify (GtkWidget      *widget,
+                                    GdkEventMotion *mevent)
+{
+  GimpNavigationView *nav_view = GIMP_NAVIGATION_VIEW (widget);
+  GimpView           *view     = GIMP_VIEW (widget);
+
+  if (! nav_view->has_grab)
+    {
+      GdkDisplay *display = gtk_widget_get_display (widget);
+      GdkCursor  *cursor;
+
+      if (nav_view->p_center_x == view->renderer->width  / 2 &&
+          nav_view->p_center_y == view->renderer->height / 2 &&
+          nav_view->p_width    == view->renderer->width      &&
+          nav_view->p_height   == view->renderer->height)
+        {
+          gdk_window_set_cursor (view->event_window, NULL);
+          return FALSE;
+        }
+      else if (gimp_navigation_view_point_in_marker (nav_view,
+                                                     mevent->x, mevent->y))
+        {
+          cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
+        }
+      else
+        {
+          cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
+        }
+
+      gdk_window_set_cursor (view->event_window, cursor);
+      gdk_cursor_unref (cursor);
+
+      return FALSE;
+    }
+
+  gimp_navigation_view_move_to (nav_view,
+                                mevent->x - nav_view->motion_offset_x,
+                                mevent->y - nav_view->motion_offset_y);
+
+  gdk_event_request_motions (mevent);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_navigation_view_key_press (GtkWidget   *widget,
+                                GdkEventKey *kevent)
+{
+  GimpNavigationView *nav_view = GIMP_NAVIGATION_VIEW (widget);
+  gint                scroll_x = 0;
+  gint                scroll_y = 0;
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Up:
+      scroll_y = -1;
+      break;
+
+    case GDK_KEY_Left:
+      scroll_x = -1;
+      break;
+
+    case GDK_KEY_Right:
+      scroll_x = 1;
+      break;
+
+    case GDK_KEY_Down:
+      scroll_y = 1;
+      break;
+
+    default:
+      break;
+    }
+
+  if (scroll_x || scroll_y)
+    {
+      gimp_navigation_view_move_to (nav_view,
+                                    nav_view->p_center_x + scroll_x,
+                                    nav_view->p_center_y + scroll_y);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*  public functions  */
+
+void
+gimp_navigation_view_set_marker (GimpNavigationView *nav_view,
+                                 gdouble             center_x,
+                                 gdouble             center_y,
+                                 gdouble             width,
+                                 gdouble             height,
+                                 gboolean            flip_horizontally,
+                                 gboolean            flip_vertically,
+                                 gdouble             rotate_angle)
+{
+  GimpView *view;
+
+  g_return_if_fail (GIMP_IS_NAVIGATION_VIEW (nav_view));
+
+  view = GIMP_VIEW (nav_view);
+
+  g_return_if_fail (view->renderer->viewable);
+
+  nav_view->center_x          = center_x;
+  nav_view->center_y          = center_y;
+  nav_view->width             = MAX (1.0, width);
+  nav_view->height            = MAX (1.0, height);
+  nav_view->flip_horizontally = flip_horizontally ? TRUE : FALSE;
+  nav_view->flip_vertically   = flip_vertically   ? TRUE : FALSE;
+  nav_view->rotate_angle      = rotate_angle;
+
+  gimp_navigation_view_transform (nav_view);
+
+  /* Marker changed, redraw */
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_navigation_view_set_canvas (GimpNavigationView *nav_view,
+                                 gboolean            visible,
+                                 gdouble             x,
+                                 gdouble             y,
+                                 gdouble             width,
+                                 gdouble             height)
+{
+  GimpView *view;
+
+  g_return_if_fail (GIMP_IS_NAVIGATION_VIEW (nav_view));
+
+  view = GIMP_VIEW (nav_view);
+
+  g_return_if_fail (view->renderer->viewable);
+
+  nav_view->canvas_visible = visible;
+  nav_view->canvas_x       = x;
+  nav_view->canvas_y       = y;
+  nav_view->canvas_width   = MAX (1.0, width);
+  nav_view->canvas_height  = MAX (1.0, height);
+
+  gimp_navigation_view_transform (nav_view);
+
+  /* Marker changed, redraw */
+  gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+gimp_navigation_view_set_motion_offset (GimpNavigationView *view,
+                                        gint                motion_offset_x,
+                                        gint                motion_offset_y)
+{
+  g_return_if_fail (GIMP_IS_NAVIGATION_VIEW (view));
+
+  view->motion_offset_x = motion_offset_x;
+  view->motion_offset_y = motion_offset_y;
+}
+
+void
+gimp_navigation_view_get_local_marker (GimpNavigationView *view,
+                                       gint               *center_x,
+                                       gint               *center_y,
+                                       gint               *width,
+                                       gint               *height)
+{
+  g_return_if_fail (GIMP_IS_NAVIGATION_VIEW (view));
+
+  if (center_x) *center_x = view->p_center_x;
+  if (center_y) *center_y = view->p_center_y;
+  if (width)    *width    = view->p_width;
+  if (height)   *height   = view->p_height;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_navigation_view_transform (GimpNavigationView *nav_view)
+{
+  gdouble ratiox, ratioy;
+
+  gimp_navigation_view_get_ratio (nav_view, &ratiox, &ratioy);
+
+  nav_view->p_center_x = RINT (nav_view->center_x * ratiox);
+  nav_view->p_center_y = RINT (nav_view->center_y * ratioy);
+
+  nav_view->p_width  = ceil (nav_view->width  * ratiox);
+  nav_view->p_height = ceil (nav_view->height * ratioy);
+
+  nav_view->p_canvas_x = RINT (nav_view->canvas_x * ratiox);
+  nav_view->p_canvas_y = RINT (nav_view->canvas_y * ratioy);
+
+  nav_view->p_canvas_width  = ceil (nav_view->canvas_width  * ratiox);
+  nav_view->p_canvas_height = ceil (nav_view->canvas_height * ratioy);
+}
+
+static void
+gimp_navigation_view_draw_marker (GimpNavigationView *nav_view,
+                                  cairo_t            *cr)
+{
+  GimpView *view = GIMP_VIEW (nav_view);
+
+  if (view->renderer->viewable && nav_view->width && nav_view->height)
+    {
+      GtkWidget      *widget = GTK_WIDGET (view);
+      GtkAllocation   allocation;
+      cairo_matrix_t  matrix;
+      gint            p_width_2;
+      gint            p_height_2;
+      gdouble         angle;
+
+      p_width_2  = nav_view->p_width  / 2;
+      p_height_2 = nav_view->p_height / 2;
+
+      angle = G_PI * nav_view->rotate_angle / 180.0;
+      if (nav_view->flip_horizontally != nav_view->flip_vertically)
+        angle = -angle;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      cairo_translate (cr, allocation.x, allocation.y);
+
+      cairo_get_matrix (cr, &matrix);
+
+      cairo_rectangle (cr,
+                       0, 0,
+                       allocation.width, allocation.height);
+      cairo_translate (cr, nav_view->p_center_x, nav_view->p_center_y);
+      cairo_rotate (cr, -angle);
+      cairo_rectangle (cr,
+                       -p_width_2, -p_height_2,
+                       nav_view->p_width, nav_view->p_height);
+
+      cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
+      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+      cairo_fill (cr);
+
+      if (nav_view->canvas_visible &&
+          nav_view->canvas_width && nav_view->canvas_height)
+        {
+          cairo_save (cr);
+
+          cairo_set_matrix (cr, &matrix);
+
+          cairo_rectangle (cr,
+                           nav_view->p_canvas_x      + 0.5,
+                           nav_view->p_canvas_y      + 0.5,
+                           nav_view->p_canvas_width  - 1.0,
+                           nav_view->p_canvas_height - 1.0);
+          gimp_canvas_set_canvas_style (GTK_WIDGET (nav_view), cr, 0, 0);
+          cairo_stroke (cr);
+
+          cairo_restore (cr);
+        }
+
+      cairo_rectangle (cr,
+                       -p_width_2, -p_height_2,
+                       nav_view->p_width, nav_view->p_height);
+
+      cairo_set_source_rgb (cr, 1, 1, 1);
+      cairo_set_line_width (cr, BORDER_WIDTH);
+      cairo_stroke (cr);
+    }
+}
+
+static void
+gimp_navigation_view_move_to (GimpNavigationView *nav_view,
+                              gint                tx,
+                              gint                ty)
+{
+  GimpView  *view = GIMP_VIEW (nav_view);
+  gdouble    ratiox, ratioy;
+  gdouble    x, y;
+
+  if (! view->renderer->viewable)
+    return;
+
+  gimp_navigation_view_get_ratio (nav_view, &ratiox, &ratioy);
+
+  x = tx / ratiox;
+  y = ty / ratioy;
+
+  g_signal_emit (view, view_signals[MARKER_CHANGED], 0,
+                 x, y, nav_view->width, nav_view->height);
+}
+
+static void
+gimp_navigation_view_get_ratio (GimpNavigationView *nav_view,
+                                gdouble            *ratiox,
+                                gdouble            *ratioy)
+{
+  GimpView  *view = GIMP_VIEW (nav_view);
+  gint       width;
+  gint       height;
+
+  gimp_viewable_get_size (view->renderer->viewable, &width, &height);
+
+  *ratiox = (gdouble) view->renderer->width  / (gdouble) width;
+  *ratioy = (gdouble) view->renderer->height / (gdouble) height;
+}
+
+static gboolean
+gimp_navigation_view_point_in_marker (GimpNavigationView *nav_view,
+                                      gint                x,
+                                      gint                y)
+{
+  gint    p_width_2, p_height_2;
+  gdouble angle;
+  gdouble tx, ty;
+
+  p_width_2  = nav_view->p_width  / 2;
+  p_height_2 = nav_view->p_height / 2;
+
+  angle = G_PI * nav_view->rotate_angle / 180.0;
+  if (nav_view->flip_horizontally != nav_view->flip_vertically)
+    angle = -angle;
+
+  x -= nav_view->p_center_x;
+  y -= nav_view->p_center_y;
+
+  tx = cos (angle) * x - sin (angle) * y;
+  ty = sin (angle) * x + cos (angle) * y;
+
+  return tx >= -p_width_2  && tx < p_width_2 &&
+         ty >= -p_height_2 && ty < p_height_2;
+}
diff --git a/app/widgets/gimpnavigationview.h b/app/widgets/gimpnavigationview.h
new file mode 100644
index 0000000..06c1318
--- /dev/null
+++ b/app/widgets/gimpnavigationview.h
@@ -0,0 +1,85 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpNavigationView Widget
+ * Copyright (C) 2001-2002 Michael Natterer <mitch@gimp.org>
+ *
+ * partly based on app/nav_window
+ * Copyright (C) 1999 Andy Thomas <alt@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_NAVIGATION_VIEW_H__
+#define __GIMP_NAVIGATION_VIEW_H__
+
+#include "gimpview.h"
+
+
+#define GIMP_TYPE_NAVIGATION_VIEW            (gimp_navigation_view_get_type ())
+#define GIMP_NAVIGATION_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationView))
+#define GIMP_NAVIGATION_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationViewClass))
+#define GIMP_IS_NAVIGATION_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_NAVIGATION_VIEW))
+#define GIMP_IS_NAVIGATION_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_NAVIGATION_VIEW))
+#define GIMP_NAVIGATION_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationViewClass))
+
+
+typedef struct _GimpNavigationViewClass  GimpNavigationViewClass;
+
+struct _GimpNavigationViewClass
+{
+  GimpViewClass  parent_class;
+
+  void (* marker_changed) (GimpNavigationView *view,
+                           gdouble             center_x,
+                           gdouble             center_y,
+                           gdouble             width,
+                           gdouble             height);
+  void (* zoom)           (GimpNavigationView *view,
+                           GimpZoomType        direction);
+  void (* scroll)         (GimpNavigationView *view,
+                           GdkScrollDirection  direction);
+};
+
+
+GType   gimp_navigation_view_get_type     (void) G_GNUC_CONST;
+
+void    gimp_navigation_view_set_marker   (GimpNavigationView *view,
+                                           gdouble             center_x,
+                                           gdouble             center_y,
+                                           gdouble             width,
+                                           gdouble             height,
+                                           gboolean            flip_horizontally,
+                                           gboolean            flip_vertically,
+                                           gdouble             rotate_angle);
+void    gimp_navigation_view_set_canvas   (GimpNavigationView *view,
+                                           gboolean            visible,
+                                           gdouble             x,
+                                           gdouble             y,
+                                           gdouble             width,
+                                           gdouble             height);
+void    gimp_navigation_view_set_motion_offset
+                                          (GimpNavigationView *view,
+                                           gint                motion_offset_x,
+                                           gint                motion_offset_y);
+void    gimp_navigation_view_get_local_marker
+                                          (GimpNavigationView *view,
+                                           gint               *center_x,
+                                           gint               *center_y,
+                                           gint               *width,
+                                           gint               *height);
+void    gimp_navigation_view_grab_pointer (GimpNavigationView *view);
+
+
+#endif /* __GIMP_NAVIGATION_VIEW_H__ */
diff --git a/app/widgets/gimpopendialog.c b/app/widgets/gimpopendialog.c
new file mode 100644
index 0000000..7525ab1
--- /dev/null
+++ b/app/widgets/gimpopendialog.c
@@ -0,0 +1,125 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpopendialog.c
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+
+#include "gimphelp-ids.h"
+#include "gimpopendialog.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_open_dialog_dispose (GObject *object);
+
+
+G_DEFINE_TYPE (GimpOpenDialog, gimp_open_dialog,
+               GIMP_TYPE_FILE_DIALOG)
+
+#define parent_class gimp_open_dialog_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_open_dialog_class_init (GimpOpenDialogClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_open_dialog_dispose;
+}
+
+static void
+gimp_open_dialog_init (GimpOpenDialog *dialog)
+{
+}
+
+static void
+gimp_open_dialog_dispose (GObject *object)
+{
+  gimp_open_dialog_set_image (GIMP_OPEN_DIALOG (object), NULL, FALSE);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_open_dialog_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_OPEN_DIALOG,
+                       "gimp",                  gimp,
+                       "title",                 _("Open Image"),
+                       "role",                  "gimp-file-open",
+                       "help-id",               GIMP_HELP_FILE_OPEN,
+                       "ok-button-label",       _("_Open"),
+
+                       "automatic-label",       _("Automatically Detected"),
+                       "automatic-help-id",     GIMP_HELP_FILE_OPEN_BY_EXTENSION,
+
+                       "action",                GTK_FILE_CHOOSER_ACTION_OPEN,
+                       "file-procs",            GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                       "file-procs-all-images", GIMP_FILE_PROCEDURE_GROUP_NONE,
+                       "file-filter-label",     NULL,
+                       NULL);
+}
+
+void
+gimp_open_dialog_set_image (GimpOpenDialog *dialog,
+                            GimpImage      *image,
+                            gboolean        open_as_layers)
+{
+  GimpFileDialog *file_dialog;
+
+  g_return_if_fail (GIMP_IS_OPEN_DIALOG (dialog));
+  g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
+
+  file_dialog = GIMP_FILE_DIALOG (dialog);
+
+  if (file_dialog->image)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (file_dialog->image),
+                                    (gpointer *) &file_dialog->image);
+    }
+
+  file_dialog->image     = image;
+  dialog->open_as_layers = open_as_layers;
+
+  if (file_dialog->image)
+    {
+      g_object_add_weak_pointer (G_OBJECT (file_dialog->image),
+                                 (gpointer *) &file_dialog->image);
+    }
+}
diff --git a/app/widgets/gimpopendialog.h b/app/widgets/gimpopendialog.h
new file mode 100644
index 0000000..9256f37
--- /dev/null
+++ b/app/widgets/gimpopendialog.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpopendialog.h
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPEN_DIALOG_H__
+#define __GIMP_OPEN_DIALOG_H__
+
+#include "gimpfiledialog.h"
+
+G_BEGIN_DECLS
+
+#define GIMP_TYPE_OPEN_DIALOG            (gimp_open_dialog_get_type ())
+#define GIMP_OPEN_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPEN_DIALOG, GimpOpenDialog))
+#define GIMP_OPEN_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPEN_DIALOG, GimpOpenDialogClass))
+#define GIMP_IS_OPEN_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPEN_DIALOG))
+#define GIMP_IS_OPEN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPEN_DIALOG))
+#define GIMP_OPEN_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPEN_DIALOG, GimpOpenDialogClass))
+
+
+typedef struct _GimpOpenDialogClass GimpOpenDialogClass;
+
+struct _GimpOpenDialog
+{
+  GimpFileDialog       parent_instance;
+
+  gboolean             open_as_layers;
+};
+
+struct _GimpOpenDialogClass
+{
+  GimpFileDialogClass  parent_class;
+};
+
+
+GType       gimp_open_dialog_get_type   (void) G_GNUC_CONST;
+
+GtkWidget * gimp_open_dialog_new        (Gimp           *gimp);
+
+void        gimp_open_dialog_set_image  (GimpOpenDialog *dialog,
+                                         GimpImage      *image,
+                                         gboolean        open_as_layers);
+
+G_END_DECLS
+
+#endif /* __GIMP_OPEN_DIALOG_H__ */
diff --git a/app/widgets/gimpoverlaybox.c b/app/widgets/gimpoverlaybox.c
new file mode 100644
index 0000000..a1bf47f
--- /dev/null
+++ b/app/widgets/gimpoverlaybox.c
@@ -0,0 +1,497 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpOverlayBox
+ * Copyright (C) 2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpoverlaybox.h"
+#include "gimpoverlaychild.h"
+
+
+/*  local function prototypes  */
+
+static void        gimp_overlay_box_set_property        (GObject        *object,
+                                                         guint           property_id,
+                                                         const GValue   *value,
+                                                         GParamSpec     *pspec);
+static void        gimp_overlay_box_get_property        (GObject        *object,
+                                                         guint           property_id,
+                                                         GValue         *value,
+                                                         GParamSpec     *pspec);
+
+static void        gimp_overlay_box_realize             (GtkWidget      *widget);
+static void        gimp_overlay_box_unrealize           (GtkWidget      *widget);
+static void        gimp_overlay_box_size_request        (GtkWidget      *widget,
+                                                         GtkRequisition *requisition);
+static void        gimp_overlay_box_size_allocate       (GtkWidget      *widget,
+                                                         GtkAllocation  *allocation);
+static gboolean    gimp_overlay_box_expose              (GtkWidget      *widget,
+                                                         GdkEventExpose *event);
+static gboolean    gimp_overlay_box_damage              (GtkWidget      *widget,
+                                                         GdkEventExpose *event);
+
+static void        gimp_overlay_box_add                 (GtkContainer   *container,
+                                                         GtkWidget      *widget);
+static void        gimp_overlay_box_remove              (GtkContainer   *container,
+                                                         GtkWidget      *widget);
+static void        gimp_overlay_box_forall              (GtkContainer   *container,
+                                                         gboolean        include_internals,
+                                                         GtkCallback     callback,
+                                                         gpointer        callback_data);
+static GType       gimp_overlay_box_child_type          (GtkContainer   *container);
+
+static GdkWindow * gimp_overlay_box_pick_embedded_child (GdkWindow      *window,
+                                                         gdouble         x,
+                                                         gdouble         y,
+                                                         GimpOverlayBox *box);
+
+
+G_DEFINE_TYPE (GimpOverlayBox, gimp_overlay_box, GTK_TYPE_CONTAINER)
+
+#define parent_class gimp_overlay_box_parent_class
+
+
+static void
+gimp_overlay_box_class_init (GimpOverlayBoxClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+
+  object_class->set_property  = gimp_overlay_box_set_property;
+  object_class->get_property  = gimp_overlay_box_get_property;
+
+  widget_class->realize       = gimp_overlay_box_realize;
+  widget_class->unrealize     = gimp_overlay_box_unrealize;
+  widget_class->size_request  = gimp_overlay_box_size_request;
+  widget_class->size_allocate = gimp_overlay_box_size_allocate;
+  widget_class->expose_event  = gimp_overlay_box_expose;
+
+  g_signal_override_class_handler ("damage-event",
+                                   GIMP_TYPE_OVERLAY_BOX,
+                                   G_CALLBACK (gimp_overlay_box_damage));
+
+  container_class->add        = gimp_overlay_box_add;
+  container_class->remove     = gimp_overlay_box_remove;
+  container_class->forall     = gimp_overlay_box_forall;
+  container_class->child_type = gimp_overlay_box_child_type;
+}
+
+static void
+gimp_overlay_box_init (GimpOverlayBox *box)
+{
+  gtk_widget_set_has_window (GTK_WIDGET (box), TRUE);
+}
+
+static void
+gimp_overlay_box_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_overlay_box_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_overlay_box_realize (GtkWidget *widget)
+{
+  GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
+  GtkAllocation   allocation;
+  GdkWindowAttr   attributes;
+  gint            attributes_mask;
+  GList          *list;
+
+  gtk_widget_set_realized (widget, TRUE);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  attributes.x           = allocation.x;
+  attributes.y           = allocation.y;
+  attributes.width       = allocation.width;
+  attributes.height      = allocation.height;
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.wclass      = GDK_INPUT_OUTPUT;
+  attributes.visual      = gtk_widget_get_visual (widget);
+  attributes.colormap    = gtk_widget_get_colormap (widget);
+  attributes.event_mask  = gtk_widget_get_events (widget);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+  gtk_widget_set_window (widget,
+                         gdk_window_new (gtk_widget_get_parent_window (widget),
+                                         &attributes, attributes_mask));
+  gdk_window_set_user_data (gtk_widget_get_window (widget), widget);
+
+  g_signal_connect (gtk_widget_get_window (widget), "pick-embedded-child",
+                    G_CALLBACK (gimp_overlay_box_pick_embedded_child),
+                    widget);
+
+  gtk_widget_style_attach (widget);
+  gtk_style_set_background (gtk_widget_get_style (widget),
+                            gtk_widget_get_window (widget),
+                            GTK_STATE_NORMAL);
+
+  for (list = box->children; list; list = g_list_next (list))
+    gimp_overlay_child_realize (box, list->data);
+}
+
+static void
+gimp_overlay_box_unrealize (GtkWidget *widget)
+{
+  GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
+  GList          *list;
+
+  for (list = box->children; list; list = g_list_next (list))
+    gimp_overlay_child_unrealize (box, list->data);
+
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+gimp_overlay_box_size_request (GtkWidget      *widget,
+                               GtkRequisition *requisition)
+{
+  GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
+  GList          *list;
+  gint            border_width;
+
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+  requisition->width  = 1 + 2 * border_width;
+  requisition->height = 1 + 2 * border_width;
+
+  for (list = box->children; list; list = g_list_next (list))
+    gimp_overlay_child_size_request (box, list->data);
+}
+
+static void
+gimp_overlay_box_size_allocate (GtkWidget     *widget,
+                                GtkAllocation *allocation)
+{
+  GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
+  GList          *list;
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  for (list = box->children; list; list = g_list_next (list))
+    gimp_overlay_child_size_allocate (box, list->data);
+}
+
+static gboolean
+gimp_overlay_box_expose (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  if (gtk_widget_is_drawable (widget))
+    {
+      GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
+      GList          *list;
+
+      for (list = box->children; list; list = g_list_next (list))
+        {
+          if (gimp_overlay_child_expose (box, list->data, event))
+            return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_overlay_box_damage (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
+  GList          *list;
+
+  for (list = box->children; list; list = g_list_next (list))
+    {
+      if (gimp_overlay_child_damage (box, list->data, event))
+        return FALSE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_overlay_box_add (GtkContainer *container,
+                      GtkWidget    *widget)
+{
+  gimp_overlay_box_add_child (GIMP_OVERLAY_BOX (container), widget, 0.5, 0.5);
+}
+
+static void
+gimp_overlay_box_remove (GtkContainer *container,
+                         GtkWidget    *widget)
+{
+  GimpOverlayBox   *box   = GIMP_OVERLAY_BOX (container);
+  GimpOverlayChild *child = gimp_overlay_child_find (box, widget);
+
+  if (child)
+    {
+      if (gtk_widget_get_visible (widget))
+        gimp_overlay_child_invalidate (box, child);
+
+      box->children = g_list_remove (box->children, child);
+
+      gimp_overlay_child_free (box, child);
+    }
+}
+
+static void
+gimp_overlay_box_forall (GtkContainer *container,
+                         gboolean      include_internals,
+                         GtkCallback   callback,
+                         gpointer      callback_data)
+{
+  GimpOverlayBox *box = GIMP_OVERLAY_BOX (container);
+  GList          *list;
+
+  list = box->children;
+  while (list)
+    {
+      GimpOverlayChild *child = list->data;
+
+      list = list->next;
+
+      (* callback) (child->widget, callback_data);
+    }
+}
+
+static GType
+gimp_overlay_box_child_type (GtkContainer *container)
+{
+  return GTK_TYPE_WIDGET;
+}
+
+static GdkWindow *
+gimp_overlay_box_pick_embedded_child (GdkWindow      *parent,
+                                      gdouble         parent_x,
+                                      gdouble         parent_y,
+                                      GimpOverlayBox *box)
+{
+  GList *list;
+
+  for (list = box->children; list; list = g_list_next (list))
+    {
+      GimpOverlayChild *child = list->data;
+
+      if (gimp_overlay_child_pick (box, child, parent_x, parent_y))
+        return child->window;
+    }
+
+  return NULL;
+}
+
+
+/*  public functions  */
+
+/**
+ * gimp_overlay_box_new:
+ *
+ * Creates a new #GimpOverlayBox widget.
+ *
+ * Return value: a new #GimpOverlayBox widget
+ **/
+GtkWidget *
+gimp_overlay_box_new (void)
+{
+  return g_object_new (GIMP_TYPE_OVERLAY_BOX, NULL);
+}
+
+void
+gimp_overlay_box_add_child (GimpOverlayBox *box,
+                            GtkWidget      *widget,
+                            gdouble         xalign,
+                            gdouble         yalign)
+{
+  GimpOverlayChild *child;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  child = gimp_overlay_child_new (box, widget, xalign, yalign, 0.0, 0.85);
+
+  box->children = g_list_append (box->children, child);
+}
+
+void
+gimp_overlay_box_set_child_alignment (GimpOverlayBox *box,
+                                      GtkWidget      *widget,
+                                      gdouble         xalign,
+                                      gdouble         yalign)
+{
+  GimpOverlayChild *child = gimp_overlay_child_find (box, widget);
+
+  if (child)
+    {
+      xalign = CLAMP (xalign, 0.0, 1.0);
+      yalign = CLAMP (yalign, 0.0, 1.0);
+
+      if (child->has_position     ||
+          child->xalign != xalign ||
+          child->yalign != yalign)
+        {
+          gimp_overlay_child_invalidate (box, child);
+
+          child->has_position = FALSE;
+          child->xalign       = xalign;
+          child->yalign       = yalign;
+
+          gtk_widget_queue_resize (widget);
+        }
+    }
+}
+
+void
+gimp_overlay_box_set_child_position (GimpOverlayBox *box,
+                                     GtkWidget      *widget,
+                                     gdouble         x,
+                                     gdouble         y)
+{
+  GimpOverlayChild *child = gimp_overlay_child_find (box, widget);
+
+  if (child)
+    {
+      if (! child->has_position ||
+          child->x != x         ||
+          child->y != y)
+        {
+          gimp_overlay_child_invalidate (box, child);
+
+          child->has_position = TRUE;
+          child->x            = x;
+          child->y            = y;
+
+          gtk_widget_queue_resize (widget);
+        }
+    }
+}
+
+void
+gimp_overlay_box_set_child_angle (GimpOverlayBox *box,
+                                  GtkWidget      *widget,
+                                  gdouble         angle)
+{
+  GimpOverlayChild *child = gimp_overlay_child_find (box, widget);
+
+  if (child)
+    {
+      if (child->angle != angle)
+        {
+          gimp_overlay_child_invalidate (box, child);
+
+          child->angle = angle;
+
+          gtk_widget_queue_draw (widget);
+        }
+    }
+}
+
+void
+gimp_overlay_box_set_child_opacity (GimpOverlayBox *box,
+                                    GtkWidget      *widget,
+                                    gdouble         opacity)
+{
+  GimpOverlayChild *child = gimp_overlay_child_find (box, widget);
+
+  if (child)
+    {
+      opacity = CLAMP (opacity, 0.0, 1.0);
+
+      if (child->opacity != opacity)
+        {
+          child->opacity = opacity;
+
+          gtk_widget_queue_draw (widget);
+        }
+    }
+}
+
+/**
+ * gimp_overlay_box_scroll:
+ * @box: the #GimpOverlayBox widget to scroll.
+ * @offset_x: the x scroll amount.
+ * @offset_y: the y scroll amount.
+ *
+ * Scrolls the box using gdk_window_scroll() and makes sure the result
+ * is displayed immediately by calling gdk_window_process_updates().
+ **/
+void
+gimp_overlay_box_scroll (GimpOverlayBox *box,
+                         gint            offset_x,
+                         gint            offset_y)
+{
+  GtkWidget *widget;
+  GdkWindow *window;
+  GList     *list;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+
+  widget = GTK_WIDGET (box);
+
+  /* bug 761118 */
+  if (! gtk_widget_get_realized (widget))
+    return;
+
+  window = gtk_widget_get_window (widget);
+
+  /*  Undraw all overlays  */
+  for (list = box->children; list; list = g_list_next (list))
+    {
+      GimpOverlayChild *child = list->data;
+
+      gimp_overlay_child_invalidate (box, child);
+    }
+
+  gdk_window_scroll (window, offset_x, offset_y);
+
+  /*  Re-draw all overlays  */
+  for (list = box->children; list; list = g_list_next (list))
+    {
+      GimpOverlayChild *child = list->data;
+
+      gimp_overlay_child_invalidate (box, child);
+    }
+
+  /*  Make sure expose events are processed before scrolling again  */
+  gdk_window_process_updates (window, FALSE);
+}
diff --git a/app/widgets/gimpoverlaybox.h b/app/widgets/gimpoverlaybox.h
new file mode 100644
index 0000000..780ff26
--- /dev/null
+++ b/app/widgets/gimpoverlaybox.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpOverlayBox
+ * Copyright (C) 2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OVERLAY_BOX_H__
+#define __GIMP_OVERLAY_BOX_H__
+
+
+#define GIMP_TYPE_OVERLAY_BOX            (gimp_overlay_box_get_type ())
+#define GIMP_OVERLAY_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OVERLAY_BOX, GimpOverlayBox))
+#define GIMP_OVERLAY_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OVERLAY_BOX, GimpOverlayBoxClass))
+#define GIMP_IS_OVERLAY_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OVERLAY_BOX))
+#define GIMP_IS_OVERLAY_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OVERLAY_BOX))
+#define GIMP_OVERLAY_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OVERLAY_BOX, GimpOverlayBoxClass))
+
+
+typedef struct _GimpOverlayBoxClass GimpOverlayBoxClass;
+
+struct _GimpOverlayBox
+{
+  GtkContainer  parent_instance;
+
+  GList        *children;
+};
+
+struct _GimpOverlayBoxClass
+{
+  GtkContainerClass  parent_class;
+};
+
+
+GType       gimp_overlay_box_get_type            (void) G_GNUC_CONST;
+
+GtkWidget * gimp_overlay_box_new                 (void);
+
+void        gimp_overlay_box_add_child           (GimpOverlayBox *box,
+                                                  GtkWidget      *child,
+                                                  gdouble         xalign,
+                                                  gdouble         yalign);
+void        gimp_overlay_box_set_child_alignment (GimpOverlayBox *box,
+                                                  GtkWidget      *child,
+                                                  gdouble         xalign,
+                                                  gdouble         yalign);
+void        gimp_overlay_box_set_child_position  (GimpOverlayBox *box,
+                                                  GtkWidget      *child,
+                                                  gdouble         x,
+                                                  gdouble         y);
+void        gimp_overlay_box_set_child_angle     (GimpOverlayBox *box,
+                                                  GtkWidget      *child,
+                                                  gdouble         angle);
+void        gimp_overlay_box_set_child_opacity   (GimpOverlayBox *box,
+                                                  GtkWidget      *child,
+                                                  gdouble         opacity);
+
+void        gimp_overlay_box_scroll              (GimpOverlayBox *box,
+                                                  gint            offset_x,
+                                                  gint            offset_y);
+
+
+#endif /*  __GIMP_OVERLAY_BOX_H__  */
diff --git a/app/widgets/gimpoverlaychild.c b/app/widgets/gimpoverlaychild.c
new file mode 100644
index 0000000..70a6989
--- /dev/null
+++ b/app/widgets/gimpoverlaychild.c
@@ -0,0 +1,569 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoverlaychild.c
+ * Copyright (C) 2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include <libgimpmath/gimpmath.h>
+
+#include "widgets-types.h"
+
+#include "core/gimp-utils.h"
+
+#include "gimpoverlaybox.h"
+#include "gimpoverlaychild.h"
+#include "gimpwidgets-utils.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_overlay_child_transform_bounds (GimpOverlayChild *child,
+                                                   GdkRectangle     *bounds_child,
+                                                   GdkRectangle     *bounds_box);
+static void   gimp_overlay_child_from_embedder    (GdkWindow        *child_window,
+                                                   gdouble           box_x,
+                                                   gdouble           box_y,
+                                                   gdouble          *child_x,
+                                                   gdouble          *child_y,
+                                                   GimpOverlayChild *child);
+static void   gimp_overlay_child_to_embedder      (GdkWindow        *child_window,
+                                                   gdouble           child_x,
+                                                   gdouble           child_y,
+                                                   gdouble          *box_x,
+                                                   gdouble          *box_y,
+                                                   GimpOverlayChild *child);
+
+
+/*  public functions  */
+
+GimpOverlayChild *
+gimp_overlay_child_new (GimpOverlayBox *box,
+                        GtkWidget      *widget,
+                        gdouble         xalign,
+                        gdouble         yalign,
+                        gdouble         angle,
+                        gdouble         opacity)
+{
+  GimpOverlayChild *child;
+
+  g_return_val_if_fail (GIMP_IS_OVERLAY_BOX (box), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  child = g_slice_new0 (GimpOverlayChild);
+
+  child->widget       = widget;
+  child->xalign       = CLAMP (xalign, 0.0, 1.0);
+  child->yalign       = CLAMP (yalign, 0.0, 1.0);
+  child->x            = 0.0;
+  child->y            = 0.0;
+  child->has_position = FALSE;
+  child->angle        = angle;
+  child->opacity      = CLAMP (opacity, 0.0, 1.0);
+
+  cairo_matrix_init_identity (&child->matrix);
+
+  if (gtk_widget_get_realized (GTK_WIDGET (box)))
+    gimp_overlay_child_realize (box, child);
+
+  gtk_widget_set_parent (widget, GTK_WIDGET (box));
+
+  return child;
+}
+
+void
+gimp_overlay_child_free (GimpOverlayBox   *box,
+                         GimpOverlayChild *child)
+{
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (child != NULL);
+
+  gtk_widget_unparent (child->widget);
+
+  if (gtk_widget_get_realized (GTK_WIDGET (box)))
+    gimp_overlay_child_unrealize (box, child);
+
+  g_slice_free (GimpOverlayChild, child);
+}
+
+GimpOverlayChild *
+gimp_overlay_child_find (GimpOverlayBox *box,
+                         GtkWidget      *widget)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_OVERLAY_BOX (box), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (box),
+                        NULL);
+
+  for (list = box->children; list; list = g_list_next (list))
+    {
+      GimpOverlayChild *child = list->data;
+
+      if (child->widget == widget)
+        return child;
+    }
+
+  return NULL;
+}
+
+void
+gimp_overlay_child_realize (GimpOverlayBox   *box,
+                            GimpOverlayChild *child)
+{
+  GtkWidget     *widget;
+  GdkDisplay    *display;
+  GdkScreen     *screen;
+  GdkColormap   *colormap;
+  GtkAllocation  child_allocation;
+  GdkWindowAttr  attributes;
+  gint           attributes_mask;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (child->window == NULL);
+
+  widget = GTK_WIDGET (box);
+
+  display = gtk_widget_get_display (widget);
+  screen  = gtk_widget_get_screen (widget);
+
+  colormap = gdk_screen_get_rgba_colormap (screen);
+  if (colormap)
+    gtk_widget_set_colormap (child->widget, colormap);
+
+  gtk_widget_get_allocation (child->widget, &child_allocation);
+
+  if (gtk_widget_get_visible (child->widget))
+    {
+      attributes.width  = child_allocation.width;
+      attributes.height = child_allocation.height;
+    }
+  else
+    {
+      attributes.width  = 1;
+      attributes.height = 1;
+    }
+
+  attributes.x           = child_allocation.x;
+  attributes.y           = child_allocation.y;
+  attributes.window_type = GDK_WINDOW_OFFSCREEN;
+  attributes.wclass      = GDK_INPUT_OUTPUT;
+  attributes.visual      = gtk_widget_get_visual (child->widget);
+  attributes.colormap    = gtk_widget_get_colormap (child->widget);
+  attributes.event_mask  = (gtk_widget_get_events (widget) |
+                            GDK_EXPOSURE_MASK);
+  attributes.cursor      = gdk_cursor_new_for_display (display, GDK_LEFT_PTR);
+
+  attributes_mask = (GDK_WA_X        |
+                     GDK_WA_Y        |
+                     GDK_WA_VISUAL   |
+                     GDK_WA_COLORMAP |
+                     GDK_WA_CURSOR);
+
+  child->window = gdk_window_new (gtk_widget_get_root_window (widget),
+                                  &attributes, attributes_mask);
+  gdk_window_set_user_data (child->window, widget);
+  gtk_widget_set_parent_window (child->widget, child->window);
+  gdk_offscreen_window_set_embedder (child->window,
+                                     gtk_widget_get_window (widget));
+
+  gdk_cursor_unref (attributes.cursor);
+
+  g_signal_connect (child->window, "from-embedder",
+                    G_CALLBACK (gimp_overlay_child_from_embedder),
+                    child);
+  g_signal_connect (child->window, "to-embedder",
+                    G_CALLBACK (gimp_overlay_child_to_embedder),
+                    child);
+
+  gtk_style_set_background (gtk_widget_get_style (widget),
+                            child->window, GTK_STATE_NORMAL);
+  gdk_window_show (child->window);
+}
+
+void
+gimp_overlay_child_unrealize (GimpOverlayBox   *box,
+                              GimpOverlayChild *child)
+{
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (child->window != NULL);
+
+  gdk_window_set_user_data (child->window, NULL);
+  gdk_window_destroy (child->window);
+  child->window = NULL;
+}
+
+void
+gimp_overlay_child_size_request (GimpOverlayBox   *box,
+                                 GimpOverlayChild *child)
+{
+  GtkRequisition child_requisition;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (child != NULL);
+
+  gtk_widget_size_request (child->widget, &child_requisition);
+}
+
+void
+gimp_overlay_child_size_allocate (GimpOverlayBox   *box,
+                                  GimpOverlayChild *child)
+{
+  GtkWidget      *widget;
+  GtkRequisition  child_requisition;
+  GtkAllocation   child_allocation;
+  gint            x;
+  gint            y;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (child != NULL);
+
+  widget = GTK_WIDGET (box);
+
+  gimp_overlay_child_invalidate (box, child);
+
+  gtk_widget_get_child_requisition (child->widget, &child_requisition);
+
+  child_allocation.x      = 0;
+  child_allocation.y      = 0;
+  child_allocation.width  = child_requisition.width;
+  child_allocation.height = child_requisition.height;
+
+  gtk_widget_size_allocate (child->widget, &child_allocation);
+
+  if (gtk_widget_get_realized (GTK_WIDGET (widget)))
+    gdk_window_move_resize (child->window,
+                            child_allocation.x,
+                            child_allocation.y,
+                            child_allocation.width,
+                            child_allocation.height);
+
+  cairo_matrix_init_identity (&child->matrix);
+
+  /* local transform */
+  cairo_matrix_rotate (&child->matrix, child->angle);
+
+  if (child->has_position)
+    {
+      x = child->x;
+      y = child->y;
+    }
+  else
+    {
+      GtkAllocation allocation;
+      GdkRectangle  bounds;
+      gint          border;
+      gint          available_width;
+      gint          available_height;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      gimp_overlay_child_transform_bounds (child, &child_allocation, &bounds);
+
+      border = gtk_container_get_border_width (GTK_CONTAINER (box));
+
+      available_width  = allocation.width  - 2 * border;
+      available_height = allocation.height - 2 * border;
+
+      x = border;
+      y = border;
+
+      if (available_width > bounds.width)
+        x += child->xalign * (available_width - bounds.width) - bounds.x;
+
+      if (available_height > bounds.height)
+        y += child->yalign * (available_height - bounds.height) - bounds.y;
+    }
+
+  cairo_matrix_init_translate (&child->matrix, x, y);
+
+  /* local transform */
+  cairo_matrix_rotate (&child->matrix, child->angle);
+
+  gimp_overlay_child_invalidate (box, child);
+}
+
+static void
+gimp_overlay_child_clip_fully_opaque (GimpOverlayChild *child,
+                                      GtkContainer     *container,
+                                      cairo_t          *cr)
+{
+  GList *children;
+  GList *list;
+
+  children = gtk_container_get_children (container);
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      GtkWidget *widget = list->data;
+
+      if (gimp_widget_get_fully_opaque (widget))
+        {
+          GtkAllocation allocation;
+          gint          x, y;
+
+          gtk_widget_get_allocation (widget, &allocation);
+          gtk_widget_translate_coordinates (widget, child->widget,
+                                            0, 0, &x, &y);
+
+          cairo_rectangle (cr, x, y, allocation.width, allocation.height);
+        }
+      else if (GTK_IS_CONTAINER (widget))
+        {
+          gimp_overlay_child_clip_fully_opaque (child,
+                                                GTK_CONTAINER (widget),
+                                                cr);
+        }
+    }
+
+  g_list_free (children);
+}
+
+gboolean
+gimp_overlay_child_expose (GimpOverlayBox   *box,
+                           GimpOverlayChild *child,
+                           GdkEventExpose   *event)
+{
+  GtkWidget *widget;
+
+  g_return_val_if_fail (GIMP_IS_OVERLAY_BOX (box), FALSE);
+  g_return_val_if_fail (child != NULL, FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  widget = GTK_WIDGET (box);
+
+  if (event->window == gtk_widget_get_window (widget))
+    {
+      GtkAllocation child_allocation;
+      GdkRectangle  bounds;
+
+      gtk_widget_get_allocation (child->widget, &child_allocation);
+
+      gimp_overlay_child_transform_bounds (child, &child_allocation, &bounds);
+
+      if (gtk_widget_get_visible (child->widget) &&
+          gdk_rectangle_intersect (&event->area, &bounds, NULL))
+        {
+          GdkPixmap *pixmap;
+          cairo_t   *cr;
+
+          gdk_window_process_updates (child->window, FALSE);
+
+          pixmap = gdk_offscreen_window_get_pixmap (child->window);
+          cr     = gdk_cairo_create (gtk_widget_get_window (widget));
+
+          gdk_cairo_region (cr, event->region);
+          cairo_clip (cr);
+
+          cairo_transform (cr, &child->matrix);
+          gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
+          cairo_paint_with_alpha (cr, child->opacity);
+
+          gimp_overlay_child_clip_fully_opaque (child,
+                                                GTK_CONTAINER (child->widget),
+                                                cr);
+          cairo_clip (cr);
+          cairo_paint (cr);
+
+          cairo_destroy (cr);
+        }
+    }
+  else if (event->window == child->window)
+    {
+      if (! gtk_widget_get_app_paintable (child->widget))
+        gtk_paint_flat_box (gtk_widget_get_style (child->widget),
+                            event->window,
+                            GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+                            &event->area, widget, NULL,
+                            0, 0, -1, -1);
+
+      gtk_container_propagate_expose (GTK_CONTAINER (widget),
+                                      child->widget,
+                                      event);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+gimp_overlay_child_damage (GimpOverlayBox   *box,
+                           GimpOverlayChild *child,
+                           GdkEventExpose   *event)
+{
+  GtkWidget *widget;
+
+  g_return_val_if_fail (GIMP_IS_OVERLAY_BOX (box), FALSE);
+  g_return_val_if_fail (child != NULL, FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  widget = GTK_WIDGET (box);
+
+  if (event->window == child->window)
+    {
+      GdkRectangle *rects;
+      gint          n_rects;
+      gint          i;
+
+      gdk_region_get_rectangles (event->region, &rects, &n_rects);
+
+      for (i = 0; i < n_rects; i++)
+        {
+          GdkRectangle bounds;
+
+          gimp_overlay_child_transform_bounds (child, &rects[i], &bounds);
+
+          gdk_window_invalidate_rect (gtk_widget_get_window (widget),
+                                      &bounds, FALSE);
+        }
+
+      g_free (rects);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_overlay_child_invalidate (GimpOverlayBox   *box,
+                               GimpOverlayChild *child)
+{
+  GdkWindow *window;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_BOX (box));
+  g_return_if_fail (child != NULL);
+
+  window = gtk_widget_get_window (GTK_WIDGET (box));
+
+  if (window && gtk_widget_get_visible (child->widget))
+    {
+      GtkAllocation child_allocation;
+      GdkRectangle  bounds;
+
+      gtk_widget_get_allocation (child->widget, &child_allocation);
+
+      gimp_overlay_child_transform_bounds (child, &child_allocation,
+                                           &bounds);
+
+      gdk_window_invalidate_rect (window, &bounds, FALSE);
+    }
+}
+
+gboolean
+gimp_overlay_child_pick (GimpOverlayBox   *box,
+                         GimpOverlayChild *child,
+                         gdouble           box_x,
+                         gdouble           box_y)
+{
+  GtkAllocation child_allocation;
+  gdouble       child_x;
+  gdouble       child_y;
+
+  g_return_val_if_fail (GIMP_IS_OVERLAY_BOX (box), FALSE);
+  g_return_val_if_fail (child != NULL, FALSE);
+
+  gimp_overlay_child_from_embedder (child->window,
+                                    box_x, box_y,
+                                    &child_x, &child_y,
+                                    child);
+
+  gtk_widget_get_allocation (child->widget, &child_allocation);
+
+  if (child_x >= 0                      &&
+      child_x <  child_allocation.width &&
+      child_y >= 0                      &&
+      child_y <  child_allocation.height)
+    {
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_overlay_child_transform_bounds (GimpOverlayChild *child,
+                                     GdkRectangle     *bounds_child,
+                                     GdkRectangle     *bounds_box)
+{
+  gdouble x1, x2, x3, x4;
+  gdouble y1, y2, y3, y4;
+
+  x1 = bounds_child->x;
+  y1 = bounds_child->y;
+
+  x2 = bounds_child->x + bounds_child->width;
+  y2 = bounds_child->y;
+
+  x3 = bounds_child->x;
+  y3 = bounds_child->y + bounds_child->height;
+
+  x4 = bounds_child->x + bounds_child->width;
+  y4 = bounds_child->y + bounds_child->height;
+
+  cairo_matrix_transform_point (&child->matrix, &x1, &y1);
+  cairo_matrix_transform_point (&child->matrix, &x2, &y2);
+  cairo_matrix_transform_point (&child->matrix, &x3, &y3);
+  cairo_matrix_transform_point (&child->matrix, &x4, &y4);
+
+  bounds_box->x      = (gint) floor (MIN4 (x1, x2, x3, x4));
+  bounds_box->y      = (gint) floor (MIN4 (y1, y2, y3, y4));
+  bounds_box->width  = (gint) ceil (MAX4 (x1, x2, x3, x4)) - bounds_box->x;
+  bounds_box->height = (gint) ceil (MAX4 (y1, y2, y3, y4)) - bounds_box->y;
+}
+
+static void
+gimp_overlay_child_from_embedder (GdkWindow        *child_window,
+                                  gdouble           box_x,
+                                  gdouble           box_y,
+                                  gdouble          *child_x,
+                                  gdouble          *child_y,
+                                  GimpOverlayChild *child)
+{
+  cairo_matrix_t inverse = child->matrix;
+
+  *child_x = box_x;
+  *child_y = box_y;
+
+  cairo_matrix_invert (&inverse);
+  cairo_matrix_transform_point (&inverse, child_x, child_y);
+}
+
+static void
+gimp_overlay_child_to_embedder (GdkWindow        *child_window,
+                                gdouble           child_x,
+                                gdouble           child_y,
+                                gdouble          *box_x,
+                                gdouble          *box_y,
+                                GimpOverlayChild *child)
+{
+  *box_x = child_x;
+  *box_y = child_y;
+
+  cairo_matrix_transform_point (&child->matrix, box_x, box_y);
+}
diff --git a/app/widgets/gimpoverlaychild.h b/app/widgets/gimpoverlaychild.h
new file mode 100644
index 0000000..a5c0987
--- /dev/null
+++ b/app/widgets/gimpoverlaychild.h
@@ -0,0 +1,81 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoverlaychild.h
+ * Copyright (C) 2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OVERLAY_CHILD_H__
+#define __GIMP_OVERLAY_CHILD_H__
+
+
+typedef struct _GimpOverlayChild GimpOverlayChild;
+
+struct _GimpOverlayChild
+{
+  GtkWidget      *widget;
+  GdkWindow      *window;
+
+  gboolean        has_position;
+  gdouble         xalign;
+  gdouble         yalign;
+  gdouble         x;
+  gdouble         y;
+
+  gdouble         angle;
+  gdouble         opacity;
+
+  /* updated in size_allocate */
+  cairo_matrix_t  matrix;
+};
+
+
+GimpOverlayChild * gimp_overlay_child_new           (GimpOverlayBox  *box,
+                                                     GtkWidget       *widget,
+                                                     gdouble          xalign,
+                                                     gdouble          yalign,
+                                                     gdouble          angle,
+                                                     gdouble          opacity);
+void               gimp_overlay_child_free          (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child);
+
+GimpOverlayChild * gimp_overlay_child_find          (GimpOverlayBox   *box,
+                                                     GtkWidget        *widget);
+
+void               gimp_overlay_child_realize       (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child);
+void               gimp_overlay_child_unrealize     (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child);
+void               gimp_overlay_child_size_request  (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child);
+void               gimp_overlay_child_size_allocate (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child);
+gboolean           gimp_overlay_child_expose        (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child,
+                                                     GdkEventExpose   *event);
+gboolean           gimp_overlay_child_damage        (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child,
+                                                     GdkEventExpose   *event);
+
+void               gimp_overlay_child_invalidate    (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child);
+gboolean           gimp_overlay_child_pick          (GimpOverlayBox   *box,
+                                                     GimpOverlayChild *child,
+                                                     gdouble           box_x,
+                                                     gdouble           box_y);
+
+
+#endif /* __GIMP_OVERLAY_CHILD_H__ */
diff --git a/app/widgets/gimpoverlaydialog.c b/app/widgets/gimpoverlaydialog.c
new file mode 100644
index 0000000..4195323
--- /dev/null
+++ b/app/widgets/gimpoverlaydialog.c
@@ -0,0 +1,643 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoverlaydialog.c
+ * Copyright (C) 2009-2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+#include "core/gimptoolinfo.h"
+
+#include "gimpoverlaydialog.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_TITLE,
+  PROP_ICON_NAME
+};
+
+enum
+{
+  RESPONSE,
+  DETACH,
+  CLOSE,
+  LAST_SIGNAL
+};
+
+
+typedef struct _ResponseData ResponseData;
+
+struct _ResponseData
+{
+  gint response_id;
+};
+
+
+static void       gimp_overlay_dialog_constructed   (GObject           *object);
+static void       gimp_overlay_dialog_dispose       (GObject           *object);
+static void       gimp_overlay_dialog_finalize      (GObject           *object);
+static void       gimp_overlay_dialog_set_property  (GObject           *object,
+                                                     guint              property_id,
+                                                     const GValue      *value,
+                                                     GParamSpec        *pspec);
+static void       gimp_overlay_dialog_get_property  (GObject           *object,
+                                                     guint              property_id,
+                                                     GValue            *value,
+                                                     GParamSpec        *pspec);
+
+static void       gimp_overlay_dialog_size_request  (GtkWidget         *widget,
+                                                     GtkRequisition    *requisition);
+static void       gimp_overlay_dialog_size_allocate (GtkWidget         *widget,
+                                                     GtkAllocation     *allocation);
+
+static void       gimp_overlay_dialog_forall        (GtkContainer      *container,
+                                                     gboolean           include_internals,
+                                                     GtkCallback        callback,
+                                                     gpointer           callback_data);
+
+static void       gimp_overlay_dialog_detach        (GimpOverlayDialog *dialog);
+static void       gimp_overlay_dialog_real_detach   (GimpOverlayDialog *dialog);
+
+static void       gimp_overlay_dialog_close         (GimpOverlayDialog *dialog);
+static void       gimp_overlay_dialog_real_close    (GimpOverlayDialog *dialog);
+
+static ResponseData * get_response_data             (GtkWidget         *widget,
+                                                     gboolean          create);
+
+
+G_DEFINE_TYPE (GimpOverlayDialog, gimp_overlay_dialog,
+               GIMP_TYPE_OVERLAY_FRAME)
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+#define parent_class gimp_overlay_dialog_parent_class
+
+
+static void
+gimp_overlay_dialog_class_init (GimpOverlayDialogClass *klass)
+{
+  GObjectClass      *object_class    = G_OBJECT_CLASS (klass);
+  GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+
+  object_class->constructed   = gimp_overlay_dialog_constructed;
+  object_class->dispose       = gimp_overlay_dialog_dispose;
+  object_class->finalize      = gimp_overlay_dialog_finalize;
+  object_class->get_property  = gimp_overlay_dialog_get_property;
+  object_class->set_property  = gimp_overlay_dialog_set_property;
+
+  widget_class->size_request  = gimp_overlay_dialog_size_request;
+  widget_class->size_allocate = gimp_overlay_dialog_size_allocate;
+
+  container_class->forall     = gimp_overlay_dialog_forall;
+
+  klass->detach               = gimp_overlay_dialog_real_detach;
+  klass->close                = gimp_overlay_dialog_real_close;
+
+  g_object_class_install_property (object_class, PROP_TITLE,
+                                   g_param_spec_string ("title",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  signals[RESPONSE] =
+    g_signal_new ("response",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpOverlayDialogClass, response),
+                  NULL, NULL,
+                  gimp_marshal_VOID__INT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_INT);
+
+  signals[DETACH] =
+    g_signal_new ("detach",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpOverlayDialogClass, detach),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  signals[CLOSE] =
+    g_signal_new ("close",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpOverlayDialogClass, close),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass),
+                                GDK_KEY_Escape, 0, "close", 0);
+}
+
+static void
+gimp_overlay_dialog_init (GimpOverlayDialog *dialog)
+{
+  dialog->header = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_widget_set_parent (dialog->header, GTK_WIDGET (dialog));
+  gtk_widget_show (dialog->header);
+
+  dialog->action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
+                             GTK_BUTTONBOX_END);
+  gtk_widget_set_parent (dialog->action_area, GTK_WIDGET (dialog));
+  gtk_widget_show (dialog->action_area);
+}
+
+static void
+gimp_overlay_dialog_constructed (GObject *object)
+{
+  GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (object);
+  GtkWidget         *label;
+  GtkWidget         *button;
+  GtkWidget         *image;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  dialog->icon_image = image = gtk_image_new_from_icon_name (dialog->icon_name,
+                                                             GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (dialog->header), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  dialog->title_label = label = gtk_label_new (dialog->title);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (dialog->header), label, TRUE, TRUE, 0);
+  gtk_widget_show (label);
+
+  dialog->close_button = button = gtk_button_new ();
+  gtk_widget_set_can_focus (button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_box_pack_end (GTK_BOX (dialog->header), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_CLOSE, GTK_ICON_SIZE_MENU);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  g_signal_connect_object (button, "clicked",
+                           G_CALLBACK (gimp_overlay_dialog_close),
+                           G_OBJECT (dialog),
+                           G_CONNECT_SWAPPED);
+
+  dialog->detach_button = button = gtk_button_new ();
+  gtk_widget_set_can_focus (button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_box_pack_end (GTK_BOX (dialog->header), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  gimp_help_set_help_data (dialog->detach_button,
+                           _("Detach dialog from canvas"), NULL);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_DETACH,
+                                        GTK_ICON_SIZE_MENU);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  g_signal_connect_object (button, "clicked",
+                           G_CALLBACK (gimp_overlay_dialog_detach),
+                           G_OBJECT (dialog),
+                           G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_overlay_dialog_dispose (GObject *object)
+{
+  GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (object);
+
+  if (dialog->header)
+    {
+      gtk_widget_unparent (dialog->header);
+      dialog->header = NULL;
+    }
+
+  if (dialog->action_area)
+    {
+      gtk_widget_unparent (dialog->action_area);
+      dialog->action_area = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_overlay_dialog_finalize (GObject *object)
+{
+  GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (object);
+
+  g_clear_pointer (&dialog->title,     g_free);
+  g_clear_pointer (&dialog->icon_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_overlay_dialog_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_TITLE:
+      g_free (dialog->title);
+      dialog->title = g_value_dup_string (value);
+      if (dialog->title_label)
+        gtk_label_set_text (GTK_LABEL (dialog->title_label), dialog->title);
+      break;
+
+    case PROP_ICON_NAME:
+      g_free (dialog->icon_name);
+      dialog->icon_name = g_value_dup_string (value);
+      if (dialog->icon_image)
+        gtk_image_set_from_icon_name (GTK_IMAGE (dialog->icon_image),
+                                      dialog->icon_name, GTK_ICON_SIZE_MENU);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_overlay_dialog_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_TITLE:
+      g_value_set_string (value, dialog->title);
+      break;
+
+    case PROP_ICON_NAME:
+      g_value_set_string (value, dialog->icon_name);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_overlay_dialog_size_request (GtkWidget      *widget,
+                                  GtkRequisition *requisition)
+{
+  GtkContainer      *container = GTK_CONTAINER (widget);
+  GimpOverlayDialog *dialog    = GIMP_OVERLAY_DIALOG (widget);
+  GtkWidget         *child     = gtk_bin_get_child (GTK_BIN (widget));
+  GtkRequisition     child_requisition;
+  GtkRequisition     header_requisition;
+  GtkRequisition     action_requisition;
+  gint               border_width;
+
+  border_width = gtk_container_get_border_width (container);
+
+  requisition->width  = border_width * 2;
+  requisition->height = border_width * 2;
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      gtk_widget_size_request (child, &child_requisition);
+    }
+  else
+    {
+      child_requisition.width  = 0;
+      child_requisition.height = 0;
+    }
+
+  gtk_widget_size_request (dialog->header,      &header_requisition);
+  gtk_widget_size_request (dialog->action_area, &action_requisition);
+
+  requisition->width  += MAX (MAX (child_requisition.width,
+                                   action_requisition.width),
+                              header_requisition.width);
+  requisition->height += (child_requisition.height +
+                          2 * border_width +
+                          header_requisition.height +
+                          action_requisition.height);
+}
+
+static void
+gimp_overlay_dialog_size_allocate (GtkWidget     *widget,
+                                   GtkAllocation *allocation)
+{
+  GtkContainer      *container = GTK_CONTAINER (widget);
+  GimpOverlayDialog *dialog    = GIMP_OVERLAY_DIALOG (widget);
+  GtkWidget         *child     = gtk_bin_get_child (GTK_BIN (widget));
+  GtkRequisition     header_requisition;
+  GtkRequisition     action_requisition;
+  GtkAllocation      child_allocation = { 0, };
+  GtkAllocation      header_allocation;
+  GtkAllocation      action_allocation;
+  gint               border_width;
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  border_width = gtk_container_get_border_width (container);
+
+  gtk_widget_size_request (dialog->header,      &header_requisition);
+  gtk_widget_size_request (dialog->action_area, &action_requisition);
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      child_allocation.x      = allocation->x + border_width;
+      child_allocation.y      = (allocation->y + 2 * border_width +
+                                 header_requisition.height);
+      child_allocation.width  = MAX (allocation->width  - 2 * border_width, 0);
+      child_allocation.height = MAX (allocation->height -
+                                     4 * border_width -
+                                     header_requisition.height -
+                                     action_requisition.height, 0);
+
+      gtk_widget_size_allocate (child, &child_allocation);
+    }
+
+  header_allocation.x = allocation->x + border_width;
+  header_allocation.y = allocation->y + border_width;
+  header_allocation.width  = MAX (allocation->width  - 2 * border_width, 0);
+  header_allocation.height = header_requisition.height;
+
+  gtk_widget_size_allocate (dialog->header, &header_allocation);
+
+  action_allocation.x = allocation->x + border_width;
+  action_allocation.y = (child_allocation.y + child_allocation.height +
+                         border_width);
+  action_allocation.width  = MAX (allocation->width  - 2 * border_width, 0);
+  action_allocation.height = action_requisition.height;
+
+  gtk_widget_size_allocate (dialog->action_area, &action_allocation);
+}
+
+static void
+gimp_overlay_dialog_forall (GtkContainer *container,
+                            gboolean      include_internals,
+                            GtkCallback   callback,
+                            gpointer      callback_data)
+{
+  GTK_CONTAINER_CLASS (parent_class)->forall (container, include_internals,
+                                              callback, callback_data);
+
+  if (include_internals)
+    {
+      GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (container);
+
+      if (dialog->header)
+        (* callback) (dialog->header, callback_data);
+
+      if (dialog->action_area)
+        (* callback) (dialog->action_area, callback_data);
+    }
+}
+
+static void
+gimp_overlay_dialog_detach (GimpOverlayDialog *dialog)
+{
+  g_signal_emit (dialog, signals[DETACH], 0);
+}
+
+static void
+gimp_overlay_dialog_real_detach (GimpOverlayDialog *dialog)
+{
+  gimp_overlay_dialog_response (dialog, GIMP_RESPONSE_DETACH);
+}
+
+static void
+gimp_overlay_dialog_close (GimpOverlayDialog *dialog)
+{
+  g_signal_emit (dialog, signals[CLOSE], 0);
+}
+
+static void
+gimp_overlay_dialog_real_close (GimpOverlayDialog *dialog)
+{
+  gimp_overlay_dialog_response (dialog, GTK_RESPONSE_DELETE_EVENT);
+}
+
+GtkWidget *
+gimp_overlay_dialog_new (GimpToolInfo *tool_info,
+                         const gchar  *desc,
+                         ...)
+{
+  GimpOverlayDialog *dialog;
+  const gchar       *icon_name;
+  va_list            args;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+
+  dialog = g_object_new (GIMP_TYPE_OVERLAY_DIALOG,
+                         "title",     tool_info->label,
+                         "icon-name", icon_name,
+                         NULL);
+
+  va_start (args, desc);
+  gimp_overlay_dialog_add_buttons_valist (dialog, args);
+  va_end (args);
+
+  return GTK_WIDGET (dialog);
+}
+
+void
+gimp_overlay_dialog_response (GimpOverlayDialog *dialog,
+                              gint               response_id)
+{
+  g_return_if_fail (GIMP_IS_OVERLAY_DIALOG (dialog));
+
+  g_signal_emit (dialog, signals[RESPONSE], 0,
+                 response_id);
+}
+
+void
+gimp_overlay_dialog_add_buttons_valist (GimpOverlayDialog *dialog,
+                                        va_list            args)
+{
+  const gchar *button_text;
+  gint         response_id;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_DIALOG (dialog));
+
+  while ((button_text = va_arg (args, const gchar *)))
+    {
+      response_id = va_arg (args, gint);
+
+      gimp_overlay_dialog_add_button (dialog, button_text, response_id);
+    }
+}
+
+static void
+action_widget_activated (GtkWidget         *widget,
+                         GimpOverlayDialog *dialog)
+{
+  ResponseData *ad = get_response_data (widget, FALSE);
+
+  gimp_overlay_dialog_response (dialog, ad->response_id);
+}
+
+GtkWidget *
+gimp_overlay_dialog_add_button (GimpOverlayDialog *dialog,
+                                const gchar       *button_text,
+                                gint               response_id)
+{
+  GtkWidget    *button;
+  ResponseData *ad;
+  guint         signal_id;
+  GClosure     *closure;
+
+  g_return_val_if_fail (GIMP_IS_OVERLAY_DIALOG (dialog), NULL);
+  g_return_val_if_fail (button_text != NULL, NULL);
+
+  if (response_id == GTK_RESPONSE_CANCEL ||
+      response_id == GTK_RESPONSE_CLOSE  ||
+      response_id == GIMP_RESPONSE_DETACH)
+    return NULL;
+
+  button = gtk_button_new_with_mnemonic (button_text);
+  gtk_widget_set_can_default (button, TRUE);
+  gtk_widget_show (button);
+
+  ad = get_response_data (button, TRUE);
+
+  ad->response_id = response_id;
+
+  signal_id = g_signal_lookup ("clicked", GTK_TYPE_BUTTON);
+
+  closure = g_cclosure_new_object (G_CALLBACK (action_widget_activated),
+                                   G_OBJECT (dialog));
+  g_signal_connect_closure_by_id (button, signal_id, 0,
+                                  closure, FALSE);
+
+  gtk_box_pack_end (GTK_BOX (dialog->action_area), button, FALSE, TRUE, 0);
+
+  if (response_id == GTK_RESPONSE_HELP)
+    gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (dialog->action_area),
+                                        button, TRUE);
+
+  return button;
+}
+
+void
+gimp_overlay_dialog_set_alternative_button_order (GimpOverlayDialog *overlay,
+                                                  gint               n_ids,
+                                                  gint              *ids)
+{
+  /* TODO */
+}
+
+void
+gimp_overlay_dialog_set_default_response (GimpOverlayDialog *overlay,
+                                          gint               response_id)
+{
+  /* TODO */
+}
+
+void
+gimp_overlay_dialog_set_response_sensitive (GimpOverlayDialog *overlay,
+                                            gint               response_id,
+                                            gboolean           sensitive)
+{
+  GList *children;
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_OVERLAY_DIALOG (overlay));
+
+  if (response_id == GTK_RESPONSE_CANCEL ||
+      response_id == GTK_RESPONSE_CLOSE)
+    {
+      gtk_widget_set_sensitive (overlay->close_button, sensitive);
+    }
+
+  if (response_id == GIMP_RESPONSE_DETACH)
+    {
+      gtk_widget_set_sensitive (overlay->detach_button, sensitive);
+    }
+
+  children = gtk_container_get_children (GTK_CONTAINER (overlay->action_area));
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      GtkWidget    *child = list->data;
+      ResponseData *ad    = get_response_data (child, FALSE);
+
+      if (ad && ad->response_id == response_id)
+        {
+          gtk_widget_set_sensitive (child, sensitive);
+          break;
+        }
+    }
+
+  g_list_free (children);
+}
+
+static void
+response_data_free (gpointer data)
+{
+  g_slice_free (ResponseData, data);
+}
+
+static ResponseData *
+get_response_data (GtkWidget *widget,
+                   gboolean   create)
+{
+  ResponseData *ad = g_object_get_data (G_OBJECT (widget),
+                                        "gimp-overlay-dialog-response-data");
+
+  if (! ad && create)
+    {
+      ad = g_slice_new (ResponseData);
+
+      g_object_set_data_full (G_OBJECT (widget),
+                              "gimp-overlay-dialog-response-data",
+                              ad, response_data_free);
+    }
+
+  return ad;
+}
diff --git a/app/widgets/gimpoverlaydialog.h b/app/widgets/gimpoverlaydialog.h
new file mode 100644
index 0000000..d8043b7
--- /dev/null
+++ b/app/widgets/gimpoverlaydialog.h
@@ -0,0 +1,93 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoverlaydialog.h
+ * Copyright (C) 2009-2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OVERLAY_DIALOG_H__
+#define __GIMP_OVERLAY_DIALOG_H__
+
+
+#include "gimpoverlayframe.h"
+
+
+#define GIMP_RESPONSE_DETACH 100
+
+
+#define GIMP_TYPE_OVERLAY_DIALOG            (gimp_overlay_dialog_get_type ())
+#define GIMP_OVERLAY_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OVERLAY_DIALOG, GimpOverlayDialog))
+#define GIMP_OVERLAY_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OVERLAY_DIALOG, GimpOverlayDialogClass))
+#define GIMP_IS_OVERLAY_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OVERLAY_DIALOG))
+#define GIMP_IS_OVERLAY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OVERLAY_DIALOG))
+#define GIMP_OVERLAY_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OVERLAY_DIALOG, GimpOverlayDialogClass))
+
+
+typedef struct _GimpOverlayDialog      GimpOverlayDialog;
+typedef struct _GimpOverlayDialogClass GimpOverlayDialogClass;
+
+struct _GimpOverlayDialog
+{
+  GimpOverlayFrame  parent_instance;
+
+  gchar            *title;
+  gchar            *icon_name;
+
+  GtkWidget        *header;
+  GtkWidget        *icon_image;
+  GtkWidget        *title_label;
+  GtkWidget        *detach_button;
+  GtkWidget        *close_button;
+  GtkWidget        *action_area;
+};
+
+struct _GimpOverlayDialogClass
+{
+  GimpOverlayFrameClass  parent_class;
+
+  void (* response) (GimpOverlayDialog *overlay,
+                     gint               response_id);
+
+  void (* detach)   (GimpOverlayDialog *overlay);
+  void (* close)    (GimpOverlayDialog *overlay);
+};
+
+
+GType       gimp_overlay_dialog_get_type               (void) G_GNUC_CONST;
+
+GtkWidget * gimp_overlay_dialog_new                    (GimpToolInfo      *tool_info,
+                                                        const gchar       *desc,
+                                                        ...) G_GNUC_NULL_TERMINATED;
+
+void        gimp_overlay_dialog_response               (GimpOverlayDialog *overlay,
+                                                        gint               response_id);
+void        gimp_overlay_dialog_add_buttons_valist     (GimpOverlayDialog *overlay,
+                                                        va_list            args);
+GtkWidget * gimp_overlay_dialog_add_button             (GimpOverlayDialog *overlay,
+                                                        const gchar       *button_text,
+                                                        gint               response_id);
+void        gimp_overlay_dialog_set_alternative_button_order
+                                                       (GimpOverlayDialog *overlay,
+                                                        gint               n_ids,
+                                                        gint              *ids);
+void        gimp_overlay_dialog_set_default_response   (GimpOverlayDialog *overlay,
+                                                        gint               response_id);
+void        gimp_overlay_dialog_set_response_sensitive (GimpOverlayDialog *overlay,
+                                                        gint               response_id,
+                                                        gboolean           sensitive);
+
+
+#endif /* __GIMP_OVERLAY_DIALOG_H__ */
diff --git a/app/widgets/gimpoverlayframe.c b/app/widgets/gimpoverlayframe.c
new file mode 100644
index 0000000..2a646e1
--- /dev/null
+++ b/app/widgets/gimpoverlayframe.c
@@ -0,0 +1,172 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoverlayframe.c
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimpoverlayframe.h"
+#include "gimpwidgets-utils.h"
+
+
+static void       gimp_overlay_frame_size_request  (GtkWidget      *widget,
+                                                    GtkRequisition *requisition);
+static void       gimp_overlay_frame_size_allocate (GtkWidget      *widget,
+                                                    GtkAllocation  *allocation);
+static gboolean   gimp_overlay_frame_expose        (GtkWidget      *widget,
+                                                    GdkEventExpose *eevent);
+
+
+G_DEFINE_TYPE (GimpOverlayFrame, gimp_overlay_frame, GTK_TYPE_BIN)
+
+#define parent_class gimp_overlay_frame_parent_class
+
+
+static void
+gimp_overlay_frame_class_init (GimpOverlayFrameClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  widget_class->size_request  = gimp_overlay_frame_size_request;
+  widget_class->size_allocate = gimp_overlay_frame_size_allocate;
+  widget_class->expose_event  = gimp_overlay_frame_expose;
+}
+
+static void
+gimp_overlay_frame_init (GimpOverlayFrame *frame)
+{
+  gtk_widget_set_app_paintable (GTK_WIDGET (frame), TRUE);
+}
+
+static void
+gimp_overlay_frame_size_request (GtkWidget      *widget,
+                                 GtkRequisition *requisition)
+{
+  GtkWidget      *child = gtk_bin_get_child (GTK_BIN (widget));
+  GtkRequisition  child_requisition;
+  gint            border_width;
+
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+  requisition->width  = border_width * 2;
+  requisition->height = border_width * 2;
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      gtk_widget_size_request (child, &child_requisition);
+    }
+  else
+    {
+      child_requisition.width  = 0;
+      child_requisition.height = 0;
+    }
+
+  requisition->width  += child_requisition.width;
+  requisition->height += child_requisition.height;
+}
+
+static void
+gimp_overlay_frame_size_allocate (GtkWidget     *widget,
+                                  GtkAllocation *allocation)
+{
+  GtkWidget     *child = gtk_bin_get_child (GTK_BIN (widget));
+  GtkAllocation  child_allocation;
+  gint           border_width;
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+  if (child && gtk_widget_get_visible (child))
+    {
+      child_allocation.x      = allocation->x + border_width;
+      child_allocation.y      = allocation->y + border_width;
+      child_allocation.width  = MAX (allocation->width  - 2 * border_width, 0);
+      child_allocation.height = MAX (allocation->height - 2 * border_width, 0);
+
+      gtk_widget_size_allocate (child, &child_allocation);
+    }
+}
+
+static gboolean
+gimp_overlay_frame_expose (GtkWidget      *widget,
+                           GdkEventExpose *eevent)
+{
+  cairo_t       *cr    = gdk_cairo_create (gtk_widget_get_window (widget));
+  GtkStyle      *style = gtk_widget_get_style (widget);
+  GtkAllocation  allocation;
+  gboolean       rgba;
+  gint           border_width;
+
+  rgba = gdk_screen_get_rgba_colormap (gtk_widget_get_screen (widget)) != NULL;
+
+  gdk_cairo_region (cr, eevent->region);
+  cairo_clip (cr);
+
+  if (rgba)
+    {
+      cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+      cairo_paint (cr);
+      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+    }
+
+  gtk_widget_get_allocation (widget, &allocation);
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+  if (rgba)
+    {
+      gimp_cairo_rounded_rectangle (cr,
+                                    0.0,              0.0,
+                                    allocation.width, allocation.height,
+                                    border_width);
+    }
+  else
+    {
+      cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
+    }
+
+  cairo_clip_preserve (cr);
+
+  gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+  cairo_paint (cr);
+
+  if (border_width > 0)
+    {
+      cairo_set_line_width (cr, 2.0);
+      gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
+      cairo_stroke (cr);
+    }
+
+  cairo_destroy (cr);
+
+  return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, eevent);
+}
+
+GtkWidget *
+gimp_overlay_frame_new (void)
+{
+  return g_object_new (GIMP_TYPE_OVERLAY_FRAME, NULL);
+}
diff --git a/app/widgets/gimpoverlayframe.h b/app/widgets/gimpoverlayframe.h
new file mode 100644
index 0000000..4bbf0f6
--- /dev/null
+++ b/app/widgets/gimpoverlayframe.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoverlayframe.h
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OVERLAY_FRAME_H__
+#define __GIMP_OVERLAY_FRAME_H__
+
+
+#define GIMP_TYPE_OVERLAY_FRAME            (gimp_overlay_frame_get_type ())
+#define GIMP_OVERLAY_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OVERLAY_FRAME, GimpOverlayFrame))
+#define GIMP_OVERLAY_FRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OVERLAY_FRAME, GimpOverlayFrameClass))
+#define GIMP_IS_OVERLAY_FRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OVERLAY_FRAME))
+#define GIMP_IS_OVERLAY_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OVERLAY_FRAME))
+#define GIMP_OVERLAY_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OVERLAY_FRAME, GimpOverlayFrameClass))
+
+
+typedef struct _GimpOverlayFrame      GimpOverlayFrame;
+typedef struct _GimpOverlayFrameClass GimpOverlayFrameClass;
+
+struct _GimpOverlayFrame
+{
+  GtkBin  parent_instance;
+};
+
+struct _GimpOverlayFrameClass
+{
+  GtkBinClass  parent_class;
+};
+
+
+GType       gimp_overlay_frame_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_overlay_frame_new      (void);
+
+
+#endif /* __GIMP_OVERLAY_FRAME_H__ */
diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c
new file mode 100644
index 0000000..b5f6285
--- /dev/null
+++ b/app/widgets/gimppaletteeditor.c
@@ -0,0 +1,967 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimppalette.h"
+
+#include "gimpcolordialog.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpdialogfactory.h"
+#include "gimphelp-ids.h"
+#include "gimppaletteeditor.h"
+#include "gimppaletteview.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpuimanager.h"
+#include "gimpviewrendererpalette.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define ENTRY_WIDTH  12
+#define ENTRY_HEIGHT 10
+#define SPACING       1
+#define COLUMNS      16
+#define ROWS         11
+
+#define PREVIEW_WIDTH  ((ENTRY_WIDTH  + SPACING) * COLUMNS + 1)
+#define PREVIEW_HEIGHT ((ENTRY_HEIGHT + SPACING) * ROWS    + 1)
+
+
+/*  local function prototypes  */
+
+static void   gimp_palette_editor_docked_iface_init (GimpDockedInterface *face);
+
+static void   gimp_palette_editor_constructed      (GObject           *object);
+static void   gimp_palette_editor_dispose          (GObject           *object);
+
+static void   gimp_palette_editor_unmap            (GtkWidget         *widget);
+
+static void   gimp_palette_editor_set_data         (GimpDataEditor    *editor,
+                                                    GimpData          *data);
+
+static void   gimp_palette_editor_set_context      (GimpDocked        *docked,
+                                                    GimpContext       *context);
+static void   gimp_palette_editor_set_aux_info     (GimpDocked        *docked,
+                                                    GList             *aux_info);
+static GList *gimp_palette_editor_get_aux_info     (GimpDocked        *docked);
+
+static void   palette_editor_invalidate_preview    (GimpPalette       *palette,
+                                                    GimpPaletteEditor *editor);
+
+static void   palette_editor_viewport_size_allocate(GtkWidget         *widget,
+                                                    GtkAllocation     *allocation,
+                                                    GimpPaletteEditor *editor);
+
+static void   palette_editor_drop_palette          (GtkWidget         *widget,
+                                                    gint               x,
+                                                    gint               y,
+                                                    GimpViewable      *viewable,
+                                                    gpointer           data);
+static void   palette_editor_drop_color            (GtkWidget         *widget,
+                                                    gint               x,
+                                                    gint               y,
+                                                    const GimpRGB     *color,
+                                                    gpointer           data);
+
+static void   palette_editor_entry_clicked         (GimpPaletteView   *view,
+                                                    GimpPaletteEntry  *entry,
+                                                    GdkModifierType    state,
+                                                    GimpPaletteEditor *editor);
+static void   palette_editor_entry_selected        (GimpPaletteView   *view,
+                                                    GimpPaletteEntry  *entry,
+                                                    GimpPaletteEditor *editor);
+static void   palette_editor_entry_activated       (GimpPaletteView   *view,
+                                                    GimpPaletteEntry  *entry,
+                                                    GimpPaletteEditor *editor);
+static void   palette_editor_entry_context         (GimpPaletteView   *view,
+                                                    GimpPaletteEntry  *entry,
+                                                    GimpPaletteEditor *editor);
+static void   palette_editor_color_dropped         (GimpPaletteView   *view,
+                                                    GimpPaletteEntry  *entry,
+                                                    const GimpRGB     *color,
+                                                    GimpPaletteEditor *editor);
+
+static void   palette_editor_color_name_changed    (GtkWidget         *widget,
+                                                    GimpPaletteEditor *editor);
+static void   palette_editor_columns_changed       (GtkAdjustment     *adj,
+                                                    GimpPaletteEditor *editor);
+
+static void   palette_editor_resize                (GimpPaletteEditor *editor,
+                                                    gint               width,
+                                                    gdouble            zoom_factor);
+static void   palette_editor_scroll_top_left       (GimpPaletteEditor *editor);
+static void   palette_editor_edit_color_update     (GimpColorDialog   *dialog,
+                                                    const GimpRGB     *color,
+                                                    GimpColorDialogState state,
+                                                    GimpPaletteEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpPaletteEditor, gimp_palette_editor,
+                         GIMP_TYPE_DATA_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_palette_editor_docked_iface_init))
+
+#define parent_class gimp_palette_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_palette_editor_class_init (GimpPaletteEditorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass      *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpDataEditorClass *editor_class = GIMP_DATA_EDITOR_CLASS (klass);
+
+  object_class->constructed = gimp_palette_editor_constructed;
+  object_class->dispose     = gimp_palette_editor_dispose;
+
+  widget_class->unmap       = gimp_palette_editor_unmap;
+
+  editor_class->set_data    = gimp_palette_editor_set_data;
+  editor_class->title       = _("Palette Editor");
+}
+
+static void
+gimp_palette_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context  = gimp_palette_editor_set_context;
+  iface->set_aux_info = gimp_palette_editor_set_aux_info;
+  iface->get_aux_info = gimp_palette_editor_get_aux_info;
+}
+
+static void
+gimp_palette_editor_init (GimpPaletteEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+  GtkWidget      *viewport;
+  GtkWidget      *hbox;
+  GtkWidget      *icon;
+  GtkWidget      *spinbutton;
+
+  editor->zoom_factor = 1.0;
+  editor->col_width   = 0;
+  editor->last_width  = 0;
+  editor->columns     = COLUMNS;
+
+  data_editor->view = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_size_request (data_editor->view, -1, PREVIEW_HEIGHT);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (data_editor->view),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (editor), data_editor->view, TRUE, TRUE, 0);
+  gtk_widget_show (data_editor->view);
+
+  viewport = gtk_viewport_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (data_editor->view), viewport);
+  gtk_widget_show (viewport);
+
+  editor->view = gimp_view_new_full_by_types (NULL,
+                                              GIMP_TYPE_PALETTE_VIEW,
+                                              GIMP_TYPE_PALETTE,
+                                              PREVIEW_WIDTH, PREVIEW_HEIGHT, 0,
+                                              FALSE, TRUE, FALSE);
+  gimp_view_renderer_palette_set_cell_size
+    (GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (editor->view)->renderer), -1);
+  gimp_view_renderer_palette_set_draw_grid
+    (GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (editor->view)->renderer), TRUE);
+  gtk_container_add (GTK_CONTAINER (viewport), editor->view);
+  gtk_widget_show (editor->view);
+
+  g_signal_connect (gtk_widget_get_parent (editor->view), "size-allocate",
+                    G_CALLBACK (palette_editor_viewport_size_allocate),
+                    editor);
+
+  g_signal_connect (editor->view, "entry-clicked",
+                    G_CALLBACK (palette_editor_entry_clicked),
+                    editor);
+  g_signal_connect (editor->view, "entry-selected",
+                    G_CALLBACK (palette_editor_entry_selected),
+                    editor);
+  g_signal_connect (editor->view, "entry-activated",
+                    G_CALLBACK (palette_editor_entry_activated),
+                    editor);
+  g_signal_connect (editor->view, "entry-context",
+                    G_CALLBACK (palette_editor_entry_context),
+                    editor);
+  g_signal_connect (editor->view, "color-dropped",
+                    G_CALLBACK (palette_editor_color_dropped),
+                    editor);
+
+  gimp_dnd_viewable_dest_add (editor->view,
+                              GIMP_TYPE_PALETTE,
+                              palette_editor_drop_palette,
+                              editor);
+  gimp_dnd_viewable_dest_add (gtk_widget_get_parent (editor->view),
+                              GIMP_TYPE_PALETTE,
+                              palette_editor_drop_palette,
+                              editor);
+
+  gimp_dnd_color_dest_add (gtk_widget_get_parent (editor->view),
+                           palette_editor_drop_color,
+                           editor);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  /*  The color index number  */
+  editor->index_label = gtk_label_new ("####");
+  gtk_box_pack_start (GTK_BOX (hbox), editor->index_label, FALSE, FALSE, 0);
+  gimp_label_set_attributes (GTK_LABEL (editor->index_label),
+                             PANGO_ATTR_FAMILY, "Monospace", -1);
+  gtk_widget_show (editor->index_label);
+
+  /*  The color name entry  */
+  editor->color_name = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), editor->color_name, TRUE, TRUE, 0);
+  gtk_entry_set_width_chars (GTK_ENTRY (editor->color_name), 1);
+  gtk_entry_set_text (GTK_ENTRY (editor->color_name), _("Undefined"));
+  gtk_editable_set_editable (GTK_EDITABLE (editor->color_name), FALSE);
+  gtk_widget_show (editor->color_name);
+
+  g_signal_connect (editor->color_name, "changed",
+                    G_CALLBACK (palette_editor_color_name_changed),
+                    editor);
+
+  icon = gtk_image_new_from_icon_name (GIMP_ICON_GRID, GTK_ICON_SIZE_MENU);
+  gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
+  gtk_widget_show (icon);
+
+  editor->columns_adj = (GtkAdjustment *)
+    gtk_adjustment_new (0, 0, 64, 1, 4, 0);
+  spinbutton = gimp_spin_button_new (editor->columns_adj, 1.0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
+  gimp_help_set_help_data (spinbutton, _("Set the number of columns"), NULL);
+
+  g_signal_connect (editor->columns_adj, "value-changed",
+                    G_CALLBACK (palette_editor_columns_changed),
+                    editor);
+}
+
+static void
+gimp_palette_editor_constructed (GObject *object)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
+                                 "palette-editor-edit-color", NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
+                                 "palette-editor-new-color-fg",
+                                 "palette-editor-new-color-bg",
+                                 gimp_get_toggle_behavior_mask (),
+                                 NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
+                                 "palette-editor-delete-color", NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
+                                 "palette-editor-zoom-out", NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
+                                 "palette-editor-zoom-in", NULL);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
+                                 "palette-editor-zoom-all", NULL);
+}
+
+static void
+gimp_palette_editor_dispose (GObject *object)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (object);
+
+  g_clear_pointer (&editor->color_dialog, gtk_widget_destroy);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_palette_editor_unmap (GtkWidget *widget)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (widget);
+
+  if (editor->color_dialog)
+    gtk_widget_hide (editor->color_dialog);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_palette_editor_set_data (GimpDataEditor *editor,
+                              GimpData       *data)
+{
+  GimpPaletteEditor *palette_editor = GIMP_PALETTE_EDITOR (editor);
+
+  g_signal_handlers_block_by_func (palette_editor->columns_adj,
+                                   palette_editor_columns_changed,
+                                   editor);
+
+  if (editor->data)
+    {
+      if (palette_editor->color_dialog)
+        {
+          gtk_widget_destroy (palette_editor->color_dialog);
+          palette_editor->color_dialog = NULL;
+        }
+
+      g_signal_handlers_disconnect_by_func (editor->data,
+                                            palette_editor_invalidate_preview,
+                                            editor);
+
+      gtk_adjustment_set_value (palette_editor->columns_adj, 0);
+    }
+
+  GIMP_DATA_EDITOR_CLASS (parent_class)->set_data (editor, data);
+
+  gimp_view_set_viewable (GIMP_VIEW (palette_editor->view),
+                          GIMP_VIEWABLE (data));
+
+  if (editor->data)
+    {
+      GimpPalette *palette = GIMP_PALETTE (editor->data);
+
+      g_signal_connect (editor->data, "invalidate-preview",
+                        G_CALLBACK (palette_editor_invalidate_preview),
+                        editor);
+
+      gtk_adjustment_set_value (palette_editor->columns_adj,
+                                gimp_palette_get_columns (palette));
+
+      palette_editor_scroll_top_left (palette_editor);
+
+      palette_editor_invalidate_preview (GIMP_PALETTE (editor->data),
+                                         palette_editor);
+    }
+
+  g_signal_handlers_unblock_by_func (palette_editor->columns_adj,
+                                     palette_editor_columns_changed,
+                                     editor);
+}
+
+static void
+gimp_palette_editor_set_context (GimpDocked  *docked,
+                                 GimpContext *context)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (docked);
+
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_view_renderer_set_context (GIMP_VIEW (editor->view)->renderer,
+                                  context);
+}
+
+#define AUX_INFO_ZOOM_FACTOR "zoom-factor"
+
+static void
+gimp_palette_editor_set_aux_info (GimpDocked *docked,
+                                  GList      *aux_info)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (docked);
+  GList             *list;
+
+  parent_docked_iface->set_aux_info (docked, aux_info);
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      if (! strcmp (aux->name, AUX_INFO_ZOOM_FACTOR))
+        {
+          gdouble zoom_factor;
+
+          zoom_factor = g_ascii_strtod (aux->value, NULL);
+
+          editor->zoom_factor = CLAMP (zoom_factor, 0.1, 4.0);
+        }
+    }
+}
+
+static GList *
+gimp_palette_editor_get_aux_info (GimpDocked *docked)
+{
+  GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (docked);
+  GList             *aux_info;
+
+  aux_info = parent_docked_iface->get_aux_info (docked);
+
+  if (editor->zoom_factor != 1.0)
+    {
+      GimpSessionInfoAux *aux;
+      gchar               value[G_ASCII_DTOSTR_BUF_SIZE];
+
+      g_ascii_formatd (value, sizeof (value), "%.2f", editor->zoom_factor);
+
+      aux = gimp_session_info_aux_new (AUX_INFO_ZOOM_FACTOR, value);
+      aux_info = g_list_append (aux_info, aux);
+    }
+
+  return aux_info;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_palette_editor_new (GimpContext     *context,
+                         GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_PALETTE_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<PaletteEditor>",
+                       "ui-path",         "/palette-editor-popup",
+                       "data-factory",    context->gimp->palette_factory,
+                       "context",         context,
+                       "data",            gimp_context_get_palette (context),
+                       NULL);
+}
+
+void
+gimp_palette_editor_edit_color (GimpPaletteEditor *editor)
+{
+  GimpDataEditor *data_editor;
+  GimpPalette    *palette;
+
+  g_return_if_fail (GIMP_IS_PALETTE_EDITOR (editor));
+
+  data_editor = GIMP_DATA_EDITOR (editor);
+
+  if (! (data_editor->data_editable && editor->color))
+    return;
+
+  palette = GIMP_PALETTE (gimp_data_editor_get_data (data_editor));
+
+  if (! editor->color_dialog)
+    {
+      editor->color_dialog =
+        gimp_color_dialog_new (GIMP_VIEWABLE (palette),
+                               data_editor->context,
+                               _("Edit Palette Color"),
+                               GIMP_ICON_PALETTE,
+                               _("Edit Color Palette Entry"),
+                               GTK_WIDGET (editor),
+                               gimp_dialog_factory_get_singleton (),
+                               "gimp-palette-editor-color-dialog",
+                               &editor->color->color,
+                               FALSE, FALSE);
+
+      g_signal_connect (editor->color_dialog, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &editor->color_dialog);
+
+      g_signal_connect (editor->color_dialog, "update",
+                        G_CALLBACK (palette_editor_edit_color_update),
+                        editor);
+    }
+  else
+    {
+      gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (editor->color_dialog),
+                                         GIMP_VIEWABLE (palette),
+                                         data_editor->context);
+      gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (editor->color_dialog),
+                                   &editor->color->color);
+
+      if (! gtk_widget_get_visible (editor->color_dialog))
+        gimp_dialog_factory_position_dialog (gimp_dialog_factory_get_singleton (),
+                                             "gimp-palette-editor-color-dialog",
+                                             editor->color_dialog,
+                                             gtk_widget_get_screen (GTK_WIDGET (editor)),
+                                             gimp_widget_get_monitor (GTK_WIDGET (editor)));
+    }
+
+  gtk_window_present (GTK_WINDOW (editor->color_dialog));
+}
+
+void
+gimp_palette_editor_pick_color (GimpPaletteEditor  *editor,
+                                const GimpRGB      *color,
+                                GimpColorPickState  pick_state)
+{
+  g_return_if_fail (GIMP_IS_PALETTE_EDITOR (editor));
+  g_return_if_fail (color != NULL);
+
+  if (GIMP_DATA_EDITOR (editor)->data_editable)
+    {
+      GimpPaletteEntry *entry;
+      GimpData         *data;
+      gint              index = -1;
+
+      data = gimp_data_editor_get_data (GIMP_DATA_EDITOR (editor));
+
+      switch (pick_state)
+        {
+        case GIMP_COLOR_PICK_STATE_START:
+          if (editor->color)
+            index = editor->color->position + 1;
+
+          entry = gimp_palette_add_entry (GIMP_PALETTE (data), index,
+                                          NULL, color);
+          gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view),
+                                          entry);
+          break;
+
+        case GIMP_COLOR_PICK_STATE_UPDATE:
+        case GIMP_COLOR_PICK_STATE_END:
+          gimp_palette_set_entry_color (GIMP_PALETTE (data),
+                                        editor->color->position,
+                                        color);
+          break;
+        }
+    }
+}
+
+void
+gimp_palette_editor_zoom (GimpPaletteEditor  *editor,
+                          GimpZoomType        zoom_type)
+{
+  GimpPalette *palette;
+  gdouble      zoom_factor;
+
+  g_return_if_fail (GIMP_IS_PALETTE_EDITOR (editor));
+
+  palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+  if (! palette)
+    return;
+
+  zoom_factor = editor->zoom_factor;
+
+  switch (zoom_type)
+    {
+    case GIMP_ZOOM_IN_MAX:
+    case GIMP_ZOOM_IN_MORE:
+    case GIMP_ZOOM_IN:
+      zoom_factor += 0.1;
+      break;
+
+    case GIMP_ZOOM_OUT_MORE:
+    case GIMP_ZOOM_OUT:
+      zoom_factor -= 0.1;
+      break;
+
+    case GIMP_ZOOM_OUT_MAX:
+    case GIMP_ZOOM_TO: /* abused as ZOOM_ALL */
+      {
+        GtkWidget     *scrolled_win = GIMP_DATA_EDITOR (editor)->view;
+        GtkWidget     *viewport     = gtk_bin_get_child (GTK_BIN (scrolled_win));
+        GtkAllocation  allocation;
+        gint           columns;
+        gint           rows;
+
+        gtk_widget_get_allocation (viewport, &allocation);
+
+        columns = gimp_palette_get_columns (palette);
+        if (columns == 0)
+          columns = COLUMNS;
+
+        rows = gimp_palette_get_n_colors (palette) / columns;
+        if (gimp_palette_get_n_colors (palette) % columns)
+          rows += 1;
+
+        rows = MAX (1, rows);
+
+        zoom_factor = (((gdouble) allocation.height - 2 * SPACING) /
+                       (gdouble) rows - SPACING) / ENTRY_HEIGHT;
+      }
+      break;
+    }
+
+  zoom_factor = CLAMP (zoom_factor, 0.1, 4.0);
+
+  editor->columns = gimp_palette_get_columns (palette);
+  if (editor->columns == 0)
+    editor->columns = COLUMNS;
+
+  palette_editor_resize (editor, editor->last_width, zoom_factor);
+
+  palette_editor_scroll_top_left (editor);
+}
+
+gint
+gimp_palette_editor_get_index (GimpPaletteEditor *editor,
+                               const GimpRGB     *search)
+{
+  GimpPalette *palette;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE_EDITOR (editor), -1);
+  g_return_val_if_fail (search != NULL, -1);
+
+  palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+  if (palette && gimp_palette_get_n_colors (palette) > 0)
+    {
+      GimpPaletteEntry *entry;
+
+      entry = gimp_palette_find_entry (palette, search, editor->color);
+
+      if (entry)
+        return entry->position;
+    }
+
+  return -1;
+}
+
+gboolean
+gimp_palette_editor_set_index (GimpPaletteEditor *editor,
+                               gint               index,
+                               GimpRGB           *color)
+{
+  GimpPalette *palette;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE_EDITOR (editor), FALSE);
+
+  palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+  if (palette && gimp_palette_get_n_colors (palette) > 0)
+    {
+      GimpPaletteEntry *entry;
+
+      index = CLAMP (index, 0, gimp_palette_get_n_colors (palette) - 1);
+
+      entry = gimp_palette_get_entry (palette, index);
+
+      gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view),
+                                      entry);
+
+      if (color)
+        *color = editor->color->color;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gint
+gimp_palette_editor_max_index (GimpPaletteEditor *editor)
+{
+  GimpPalette *palette;
+
+  g_return_val_if_fail (GIMP_IS_PALETTE_EDITOR (editor), -1);
+
+  palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+  if (palette && gimp_palette_get_n_colors (palette) > 0)
+    {
+      return gimp_palette_get_n_colors (palette) - 1;
+    }
+
+  return -1;
+}
+
+
+/*  private functions  */
+
+static void
+palette_editor_invalidate_preview (GimpPalette       *palette,
+                                   GimpPaletteEditor *editor)
+{
+  editor->columns = gimp_palette_get_columns (palette);
+  if (editor->columns == 0)
+    editor->columns = COLUMNS;
+
+  palette_editor_resize (editor, editor->last_width, editor->zoom_factor);
+}
+
+static void
+palette_editor_viewport_size_allocate (GtkWidget         *widget,
+                                       GtkAllocation     *allocation,
+                                       GimpPaletteEditor *editor)
+{
+  if (allocation->width != editor->last_width)
+    {
+      palette_editor_resize (editor, allocation->width,
+                             editor->zoom_factor);
+    }
+}
+
+static void
+palette_editor_drop_palette (GtkWidget    *widget,
+                             gint          x,
+                             gint          y,
+                             GimpViewable *viewable,
+                             gpointer      data)
+{
+  gimp_data_editor_set_data (GIMP_DATA_EDITOR (data), GIMP_DATA (viewable));
+}
+
+static void
+palette_editor_drop_color (GtkWidget     *widget,
+                           gint           x,
+                           gint           y,
+                           const GimpRGB *color,
+                           gpointer       data)
+{
+  GimpPaletteEditor *editor = data;
+
+  if (GIMP_DATA_EDITOR (editor)->data_editable)
+    {
+      GimpPalette      *palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+      GimpPaletteEntry *entry;
+
+      entry = gimp_palette_add_entry (palette, -1, NULL, color);
+      gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view), entry);
+    }
+}
+
+
+/*  palette view callbacks  */
+
+static void
+palette_editor_entry_clicked (GimpPaletteView   *view,
+                              GimpPaletteEntry  *entry,
+                              GdkModifierType    state,
+                              GimpPaletteEditor *editor)
+{
+  if (entry)
+    {
+      GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+      if (state & gimp_get_toggle_behavior_mask ())
+        gimp_context_set_background (data_editor->context, &entry->color);
+      else
+        gimp_context_set_foreground (data_editor->context, &entry->color);
+    }
+}
+
+static void
+palette_editor_entry_selected (GimpPaletteView   *view,
+                               GimpPaletteEntry  *entry,
+                               GimpPaletteEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  if (editor->color != entry)
+    {
+      gchar index[8];
+
+      editor->color = entry;
+
+      if (entry)
+        g_snprintf (index, sizeof (index), "%04i", entry->position);
+      else
+        g_snprintf (index, sizeof (index), "####");
+
+      gtk_label_set_text (GTK_LABEL (editor->index_label), index);
+
+      g_signal_handlers_block_by_func (editor->color_name,
+                                       palette_editor_color_name_changed,
+                                       editor);
+
+      gtk_entry_set_text (GTK_ENTRY (editor->color_name),
+                          entry ? entry->name : _("Undefined"));
+
+      g_signal_handlers_unblock_by_func (editor->color_name,
+                                         palette_editor_color_name_changed,
+                                         editor);
+
+      gtk_editable_set_editable (GTK_EDITABLE (editor->color_name),
+                                 entry && data_editor->data_editable);
+
+      gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                              gimp_editor_get_popup_data (GIMP_EDITOR (editor)));
+    }
+}
+
+static void
+palette_editor_entry_activated (GimpPaletteView   *view,
+                                GimpPaletteEntry  *entry,
+                                GimpPaletteEditor *editor)
+{
+  if (GIMP_DATA_EDITOR (editor)->data_editable && entry == editor->color)
+    {
+      gimp_ui_manager_activate_action (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                                       "palette-editor",
+                                       "palette-editor-edit-color");
+    }
+}
+
+static void
+palette_editor_entry_context (GimpPaletteView   *view,
+                              GimpPaletteEntry  *entry,
+                              GimpPaletteEditor *editor)
+{
+  gimp_editor_popup_menu (GIMP_EDITOR (editor), NULL, NULL);
+}
+
+static void
+palette_editor_color_dropped (GimpPaletteView   *view,
+                              GimpPaletteEntry  *entry,
+                              const GimpRGB     *color,
+                              GimpPaletteEditor *editor)
+{
+  if (GIMP_DATA_EDITOR (editor)->data_editable)
+    {
+      GimpPalette *palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+      gint         pos     = -1;
+
+      if (entry)
+        pos = entry->position;
+
+      entry = gimp_palette_add_entry (palette, pos, NULL, color);
+      gimp_palette_view_select_entry (GIMP_PALETTE_VIEW (editor->view), entry);
+    }
+}
+
+
+/*  color name and columns callbacks  */
+
+static void
+palette_editor_color_name_changed (GtkWidget         *widget,
+                                   GimpPaletteEditor *editor)
+{
+  if (GIMP_DATA_EDITOR (editor)->data)
+    {
+      GimpPalette *palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+      const gchar *name;
+
+      name = gtk_entry_get_text (GTK_ENTRY (editor->color_name));
+
+      gimp_palette_set_entry_name (palette, editor->color->position, name);
+    }
+}
+
+static void
+palette_editor_columns_changed (GtkAdjustment     *adj,
+                                GimpPaletteEditor *editor)
+{
+  if (GIMP_DATA_EDITOR (editor)->data)
+    {
+      GimpPalette *palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+      gimp_palette_set_columns (palette,
+                                ROUND (gtk_adjustment_get_value (adj)));
+    }
+}
+
+
+/*  misc utils  */
+
+static void
+palette_editor_resize (GimpPaletteEditor *editor,
+                       gint               width,
+                       gdouble            zoom_factor)
+{
+  GimpPalette *palette;
+  gint         rows;
+  gint         preview_width;
+  gint         preview_height;
+
+  palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+  if (! palette)
+    return;
+
+  editor->zoom_factor = zoom_factor;
+  editor->last_width  = width;
+  editor->col_width   = width / (editor->columns + 1) - SPACING;
+
+  if (editor->col_width < 0)
+    editor->col_width = 0;
+
+  rows = gimp_palette_get_n_colors (palette) / editor->columns;
+  if (gimp_palette_get_n_colors (palette) % editor->columns)
+    rows += 1;
+
+  preview_width  = (editor->col_width + SPACING) * editor->columns;
+  preview_height = (rows *
+                    (SPACING + (gint) (ENTRY_HEIGHT * editor->zoom_factor)));
+
+  if (preview_height > GIMP_VIEWABLE_MAX_PREVIEW_SIZE)
+    preview_height = ((GIMP_VIEWABLE_MAX_PREVIEW_SIZE - SPACING) / rows) * rows;
+
+  gimp_view_renderer_set_size_full (GIMP_VIEW (editor->view)->renderer,
+                                    preview_width  + SPACING,
+                                    preview_height + SPACING, 0);
+}
+
+static void
+palette_editor_scroll_top_left (GimpPaletteEditor *palette_editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (palette_editor);
+  GtkAdjustment  *hadj;
+  GtkAdjustment  *vadj;
+
+  if (! data_editor->view)
+    return;
+
+  hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (data_editor->view));
+  vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (data_editor->view));
+
+  if (hadj)
+    gtk_adjustment_set_value (hadj, 0.0);
+  if (vadj)
+    gtk_adjustment_set_value (vadj, 0.0);
+}
+
+static void
+palette_editor_edit_color_update (GimpColorDialog      *dialog,
+                                  const GimpRGB        *color,
+                                  GimpColorDialogState  state,
+                                  GimpPaletteEditor    *editor)
+{
+  GimpPalette *palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
+
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_UPDATE:
+      break;
+
+    case GIMP_COLOR_DIALOG_OK:
+      if (editor->color)
+        {
+          editor->color->color = *color;
+          gimp_data_dirty (GIMP_DATA (palette));
+        }
+      /* Fallthrough */
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      gtk_widget_hide (editor->color_dialog);
+      break;
+    }
+}
diff --git a/app/widgets/gimppaletteeditor.h b/app/widgets/gimppaletteeditor.h
new file mode 100644
index 0000000..4c5febc
--- /dev/null
+++ b/app/widgets/gimppaletteeditor.h
@@ -0,0 +1,82 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_EDITOR_H__
+#define __GIMP_PALETTE_EDITOR_H__
+
+
+#include "gimpdataeditor.h"
+
+
+#define GIMP_TYPE_PALETTE_EDITOR            (gimp_palette_editor_get_type ())
+#define GIMP_PALETTE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PALETTE_EDITOR, GimpPaletteEditor))
+#define GIMP_PALETTE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PALETTE_EDITOR, GimpPaletteEditorClass))
+#define GIMP_IS_PALETTE_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PALETTE_EDITOR))
+#define GIMP_IS_PALETTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PALETTE_EDITOR))
+#define GIMP_PALETTE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PALETTE_EDITOR, GimpPaletteEditorClass))
+
+
+typedef struct _GimpPaletteEditorClass GimpPaletteEditorClass;
+
+struct _GimpPaletteEditor
+{
+  GimpDataEditor    parent_instance;
+
+  GtkWidget        *view;
+
+  GtkWidget        *index_label;
+  GtkWidget        *color_name;
+  GtkAdjustment    *columns_adj;
+
+  GtkWidget        *color_dialog;
+
+  GimpPaletteEntry *color;
+
+  gdouble           zoom_factor;  /* range from 0.1 to 4.0 */
+  gint              col_width;
+  gint              last_width;
+  gint              columns;
+};
+
+struct _GimpPaletteEditorClass
+{
+  GimpDataEditorClass  parent_class;
+};
+
+
+GType       gimp_palette_editor_get_type   (void) G_GNUC_CONST;
+
+GtkWidget * gimp_palette_editor_new        (GimpContext        *context,
+                                            GimpMenuFactory    *menu_factory);
+
+void        gimp_palette_editor_edit_color (GimpPaletteEditor  *editor);
+void        gimp_palette_editor_pick_color (GimpPaletteEditor  *editor,
+                                            const GimpRGB      *color,
+                                            GimpColorPickState  pick_state);
+void        gimp_palette_editor_zoom       (GimpPaletteEditor  *editor,
+                                            GimpZoomType        zoom_type);
+
+gint        gimp_palette_editor_get_index  (GimpPaletteEditor *editor,
+                                            const GimpRGB     *search);
+gboolean    gimp_palette_editor_set_index  (GimpPaletteEditor *editor,
+                                            gint               index,
+                                            GimpRGB           *color);
+
+gint        gimp_palette_editor_max_index  (GimpPaletteEditor *editor);
+
+
+#endif /* __GIMP_PALETTE_EDITOR_H__ */
diff --git a/app/widgets/gimppaletteselect.c b/app/widgets/gimppaletteselect.c
new file mode 100644
index 0000000..5f0520c
--- /dev/null
+++ b/app/widgets/gimppaletteselect.c
@@ -0,0 +1,116 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppaletteselect.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimppalette.h"
+#include "core/gimpparamspecs.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpcontainerbox.h"
+#include "gimpdatafactoryview.h"
+#include "gimppaletteselect.h"
+
+
+static void             gimp_palette_select_constructed  (GObject        *object);
+
+static GimpValueArray * gimp_palette_select_run_callback (GimpPdbDialog  *dialog,
+                                                          GimpObject     *object,
+                                                          gboolean        closing,
+                                                          GError        **error);
+
+
+G_DEFINE_TYPE (GimpPaletteSelect, gimp_palette_select, GIMP_TYPE_PDB_DIALOG)
+
+#define parent_class gimp_palette_select_parent_class
+
+
+static void
+gimp_palette_select_class_init (GimpPaletteSelectClass *klass)
+{
+  GObjectClass       *object_class = G_OBJECT_CLASS (klass);
+  GimpPdbDialogClass *pdb_class    = GIMP_PDB_DIALOG_CLASS (klass);
+
+  object_class->constructed = gimp_palette_select_constructed;
+
+  pdb_class->run_callback   = gimp_palette_select_run_callback;
+}
+
+static void
+gimp_palette_select_init (GimpPaletteSelect *dialog)
+{
+}
+
+static void
+gimp_palette_select_constructed (GObject *object)
+{
+  GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object);
+  GtkWidget     *content_area;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  dialog->view =
+    gimp_data_factory_view_new (GIMP_VIEW_TYPE_LIST,
+                                dialog->context->gimp->palette_factory,
+                                dialog->context,
+                                GIMP_VIEW_SIZE_MEDIUM, 1,
+                                dialog->menu_factory, "<Palettes>",
+                                "/palettes-popup",
+                                "palettes");
+
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
+                                       5 * (GIMP_VIEW_SIZE_MEDIUM + 2),
+                                       8 * (GIMP_VIEW_SIZE_MEDIUM + 2));
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->view);
+}
+
+static GimpValueArray *
+gimp_palette_select_run_callback (GimpPdbDialog  *dialog,
+                                  GimpObject     *object,
+                                  gboolean        closing,
+                                  GError        **error)
+{
+  GimpPalette *palette = GIMP_PALETTE (object);
+
+  return gimp_pdb_execute_procedure_by_name (dialog->pdb,
+                                             dialog->caller_context,
+                                             NULL, error,
+                                             dialog->callback_name,
+                                             G_TYPE_STRING,   gimp_object_get_name (object),
+                                             GIMP_TYPE_INT32, gimp_palette_get_n_colors (palette),
+                                             GIMP_TYPE_INT32, closing,
+                                             G_TYPE_NONE);
+}
diff --git a/app/widgets/gimppaletteselect.h b/app/widgets/gimppaletteselect.h
new file mode 100644
index 0000000..135bee1
--- /dev/null
+++ b/app/widgets/gimppaletteselect.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppaletteselect.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_SELECT_H__
+#define __GIMP_PALETTE_SELECT_H__
+
+#include "gimppdbdialog.h"
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_PALETTE_SELECT            (gimp_palette_select_get_type ())
+#define GIMP_PALETTE_SELECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PALETTE_SELECT, GimpPaletteSelect))
+#define GIMP_PALETTE_SELECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PALETTE_SELECT, GimpPaletteSelectClass))
+#define GIMP_IS_PALETTE_SELECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PALETTE_SELECT))
+#define GIMP_IS_PALETTE_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PALETTE_SELECT))
+#define GIMP_PALETTE_SELECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PALETTE_SELECT, GimpPaletteSelectClass))
+
+
+typedef struct _GimpPaletteSelectClass  GimpPaletteSelectClass;
+
+struct _GimpPaletteSelect
+{
+  GimpPdbDialog  parent_instance;
+};
+
+struct _GimpPaletteSelectClass
+{
+  GimpPdbDialogClass  parent_class;
+};
+
+
+GType  gimp_palette_select_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_PALETTE_SELECT_H__ */
diff --git a/app/widgets/gimppaletteview.c b/app/widgets/gimppaletteview.c
new file mode 100644
index 0000000..8a6093e
--- /dev/null
+++ b/app/widgets/gimppaletteview.c
@@ -0,0 +1,515 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppaletteview.c
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimppalette.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpdnd.h"
+#include "gimppaletteview.h"
+#include "gimpviewrendererpalette.h"
+
+
+enum
+{
+  ENTRY_CLICKED,
+  ENTRY_SELECTED,
+  ENTRY_ACTIVATED,
+  ENTRY_CONTEXT,
+  COLOR_DROPPED,
+  LAST_SIGNAL
+};
+
+
+static gboolean gimp_palette_view_expose         (GtkWidget        *widget,
+                                                  GdkEventExpose   *eevent);
+static gboolean gimp_palette_view_button_press   (GtkWidget        *widget,
+                                                  GdkEventButton   *bevent);
+static gboolean gimp_palette_view_key_press      (GtkWidget        *widget,
+                                                  GdkEventKey      *kevent);
+static gboolean gimp_palette_view_focus          (GtkWidget        *widget,
+                                                  GtkDirectionType  direction);
+static void     gimp_palette_view_set_viewable   (GimpView         *view,
+                                                  GimpViewable     *old_viewable,
+                                                  GimpViewable     *new_viewable);
+static GimpPaletteEntry *
+                gimp_palette_view_find_entry     (GimpPaletteView *view,
+                                                  gint             x,
+                                                  gint             y);
+static void     gimp_palette_view_expose_entry   (GimpPaletteView  *view,
+                                                  GimpPaletteEntry *entry);
+static void     gimp_palette_view_invalidate     (GimpPalette      *palette,
+                                                  GimpPaletteView  *view);
+static void     gimp_palette_view_drag_color     (GtkWidget        *widget,
+                                                  GimpRGB          *color,
+                                                  gpointer          data);
+static void     gimp_palette_view_drop_color     (GtkWidget        *widget,
+                                                  gint              x,
+                                                  gint              y,
+                                                  const GimpRGB    *color,
+                                                  gpointer          data);
+
+
+G_DEFINE_TYPE (GimpPaletteView, gimp_palette_view, GIMP_TYPE_VIEW)
+
+#define parent_class gimp_palette_view_parent_class
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_palette_view_class_init (GimpPaletteViewClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpViewClass  *view_class   = GIMP_VIEW_CLASS (klass);
+
+  view_signals[ENTRY_CLICKED] =
+    g_signal_new ("entry-clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPaletteViewClass, entry_clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER_ENUM,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_POINTER,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  view_signals[ENTRY_SELECTED] =
+    g_signal_new ("entry-selected",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPaletteViewClass, entry_selected),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  view_signals[ENTRY_ACTIVATED] =
+    g_signal_new ("entry-activated",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPaletteViewClass, entry_activated),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  view_signals[ENTRY_CONTEXT] =
+    g_signal_new ("entry-context",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPaletteViewClass, entry_context),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  view_signals[COLOR_DROPPED] =
+    g_signal_new ("color-dropped",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPaletteViewClass, color_dropped),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER_BOXED,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_POINTER,
+                  GIMP_TYPE_RGB);
+
+  widget_class->expose_event       = gimp_palette_view_expose;
+  widget_class->button_press_event = gimp_palette_view_button_press;
+  widget_class->key_press_event    = gimp_palette_view_key_press;
+  widget_class->focus              = gimp_palette_view_focus;
+
+  view_class->set_viewable         = gimp_palette_view_set_viewable;
+}
+
+static void
+gimp_palette_view_init (GimpPaletteView *view)
+{
+  gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE);
+
+  view->selected  = NULL;
+  view->dnd_entry = NULL;
+}
+
+static gboolean
+gimp_palette_view_expose (GtkWidget      *widget,
+                          GdkEventExpose *eevent)
+{
+  GimpPaletteView *pal_view = GIMP_PALETTE_VIEW (widget);
+  GimpView        *view     = GIMP_VIEW (widget);
+
+  if (! gtk_widget_is_drawable (widget))
+    return FALSE;
+
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, eevent);
+
+  if (view->renderer->viewable && pal_view->selected)
+    {
+      GimpViewRendererPalette *renderer;
+      GtkAllocation            allocation;
+      cairo_t                 *cr;
+      gint                     row, col;
+
+      renderer = GIMP_VIEW_RENDERER_PALETTE (view->renderer);
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      row = pal_view->selected->position / renderer->columns;
+      col = pal_view->selected->position % renderer->columns;
+
+      cr = gdk_cairo_create (gtk_widget_get_window (widget));
+      gdk_cairo_region (cr, eevent->region);
+      cairo_clip (cr);
+
+      cairo_translate (cr, allocation.x, allocation.y);
+
+      cairo_rectangle (cr,
+                       col * renderer->cell_width  + 0.5,
+                       row * renderer->cell_height + 0.5,
+                       renderer->cell_width,
+                       renderer->cell_height);
+
+      cairo_set_line_width (cr, 1.0);
+      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0);
+      cairo_stroke_preserve (cr);
+
+      if (gimp_cairo_set_focus_line_pattern (cr, widget))
+        {
+          cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+          cairo_stroke (cr);
+        }
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_palette_view_button_press (GtkWidget      *widget,
+                                GdkEventButton *bevent)
+{
+  GimpPaletteView  *view = GIMP_PALETTE_VIEW (widget);
+  GimpPaletteEntry *entry;
+
+  if (gtk_widget_get_can_focus (widget) && ! gtk_widget_has_focus (widget))
+    gtk_widget_grab_focus (widget);
+
+  entry = gimp_palette_view_find_entry (view, bevent->x, bevent->y);
+
+  view->dnd_entry = entry;
+
+  if (! entry || bevent->button == 2)
+    return TRUE;
+
+  if (bevent->type == GDK_BUTTON_PRESS)
+    g_signal_emit (view, view_signals[ENTRY_CLICKED], 0,
+                   entry, bevent->state);
+
+  if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+    {
+      if (entry != view->selected)
+        gimp_palette_view_select_entry (view, entry);
+
+      g_signal_emit (view, view_signals[ENTRY_CONTEXT], 0, entry);
+    }
+  else if (bevent->button == 1)
+    {
+      if (bevent->type == GDK_BUTTON_PRESS)
+        {
+          gimp_palette_view_select_entry (view, entry);
+        }
+      else if (bevent->type == GDK_2BUTTON_PRESS && entry == view->selected)
+        {
+          g_signal_emit (view, view_signals[ENTRY_ACTIVATED], 0, entry);
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gimp_palette_view_key_press (GtkWidget   *widget,
+                             GdkEventKey *kevent)
+{
+  GimpPaletteView *view = GIMP_PALETTE_VIEW (widget);
+
+  if (view->selected &&
+      (kevent->keyval == GDK_KEY_space    ||
+       kevent->keyval == GDK_KEY_KP_Space ||
+       kevent->keyval == GDK_KEY_Return   ||
+       kevent->keyval == GDK_KEY_KP_Enter ||
+       kevent->keyval == GDK_KEY_ISO_Enter))
+    {
+      g_signal_emit (view, view_signals[ENTRY_CLICKED], 0,
+                     view->selected, kevent->state);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_palette_view_focus (GtkWidget        *widget,
+                         GtkDirectionType  direction)
+{
+  GimpPaletteView *view = GIMP_PALETTE_VIEW (widget);
+  GimpPalette     *palette;
+
+  palette = GIMP_PALETTE (GIMP_VIEW (view)->renderer->viewable);
+
+  if (gtk_widget_get_can_focus (widget) &&
+      ! gtk_widget_has_focus (widget))
+    {
+      gtk_widget_grab_focus (widget);
+
+      if (! view->selected &&
+          palette && gimp_palette_get_n_colors (palette) > 0)
+        {
+          GimpPaletteEntry *entry = gimp_palette_get_entry (palette, 0);
+
+          gimp_palette_view_select_entry (view, entry);
+        }
+
+      return TRUE;
+    }
+
+  if (view->selected)
+    {
+      GimpViewRendererPalette *renderer;
+      gint                     skip = 0;
+
+      renderer = GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (view)->renderer);
+
+      switch (direction)
+        {
+        case GTK_DIR_UP:
+          skip = -renderer->columns;
+          break;
+        case GTK_DIR_DOWN:
+          skip = renderer->columns;
+          break;
+        case GTK_DIR_LEFT:
+          skip = -1;
+          break;
+        case GTK_DIR_RIGHT:
+          skip = 1;
+          break;
+
+        case GTK_DIR_TAB_FORWARD:
+        case GTK_DIR_TAB_BACKWARD:
+          return FALSE;
+        }
+
+      if (skip != 0)
+        {
+          GimpPaletteEntry *entry;
+          gint              position;
+
+          position = view->selected->position + skip;
+
+          entry = gimp_palette_get_entry (palette, position);
+
+          if (entry)
+            gimp_palette_view_select_entry (view, entry);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_palette_view_set_viewable (GimpView     *view,
+                                GimpViewable *old_viewable,
+                                GimpViewable *new_viewable)
+{
+  GimpPaletteView *pal_view = GIMP_PALETTE_VIEW (view);
+
+  pal_view->dnd_entry = NULL;
+  gimp_palette_view_select_entry (pal_view, NULL);
+
+  if (old_viewable)
+    {
+      g_signal_handlers_disconnect_by_func (old_viewable,
+                                            gimp_palette_view_invalidate,
+                                            view);
+
+      if (! new_viewable)
+        {
+          gimp_dnd_color_source_remove (GTK_WIDGET (view));
+          gimp_dnd_color_dest_remove (GTK_WIDGET (view));
+        }
+    }
+
+  GIMP_VIEW_CLASS (parent_class)->set_viewable (view,
+                                                old_viewable, new_viewable);
+
+  if (new_viewable)
+    {
+      g_signal_connect (new_viewable, "invalidate-preview",
+                        G_CALLBACK (gimp_palette_view_invalidate),
+                        view);
+
+      /*  unset the palette drag handler set by GimpView  */
+      gimp_dnd_viewable_source_remove (GTK_WIDGET (view), GIMP_TYPE_PALETTE);
+
+      if (! old_viewable)
+        {
+          gimp_dnd_color_source_add (GTK_WIDGET (view),
+                                     gimp_palette_view_drag_color,
+                                     view);
+          gimp_dnd_color_dest_add (GTK_WIDGET (view),
+                                   gimp_palette_view_drop_color,
+                                   view);
+        }
+    }
+}
+
+
+/*  public functions  */
+
+void
+gimp_palette_view_select_entry (GimpPaletteView  *view,
+                                GimpPaletteEntry *entry)
+{
+  g_return_if_fail (GIMP_IS_PALETTE_VIEW (view));
+
+  if (entry == view->selected)
+    return;
+
+  if (view->selected)
+    gimp_palette_view_expose_entry (view, view->selected);
+
+  view->selected = entry;
+
+  if (view->selected)
+    gimp_palette_view_expose_entry (view, view->selected);
+
+  g_signal_emit (view, view_signals[ENTRY_SELECTED], 0, view->selected);
+}
+
+
+/*  private functions  */
+
+static GimpPaletteEntry *
+gimp_palette_view_find_entry (GimpPaletteView *view,
+                              gint             x,
+                              gint             y)
+{
+  GimpPalette             *palette;
+  GimpViewRendererPalette *renderer;
+  GimpPaletteEntry        *entry = NULL;
+  gint                     col, row;
+
+  palette  = GIMP_PALETTE (GIMP_VIEW (view)->renderer->viewable);
+  renderer = GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (view)->renderer);
+
+  if (! palette || ! gimp_palette_get_n_colors (palette))
+    return NULL;
+
+  col = x / renderer->cell_width;
+  row = y / renderer->cell_height;
+
+  if (col >= 0 && col < renderer->columns &&
+      row >= 0 && row < renderer->rows)
+    {
+      entry = gimp_palette_get_entry (palette,
+                                      row * renderer->columns + col);
+    }
+
+  return entry;
+}
+
+static void
+gimp_palette_view_expose_entry (GimpPaletteView  *view,
+                                GimpPaletteEntry *entry)
+{
+  GimpViewRendererPalette *renderer;
+  gint                     row, col;
+  GtkWidget               *widget = GTK_WIDGET (view);
+  GtkAllocation            allocation;
+
+  renderer = GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (view)->renderer);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  row = entry->position / renderer->columns;
+  col = entry->position % renderer->columns;
+
+  gtk_widget_queue_draw_area (GTK_WIDGET (view),
+                              allocation.x + col * renderer->cell_width,
+                              allocation.y + row * renderer->cell_height,
+                              renderer->cell_width  + 1,
+                              renderer->cell_height + 1);
+}
+
+static void
+gimp_palette_view_invalidate (GimpPalette     *palette,
+                              GimpPaletteView *view)
+{
+  view->dnd_entry = NULL;
+
+  if (view->selected &&
+      ! g_list_find (gimp_palette_get_colors (palette), view->selected))
+    {
+      gimp_palette_view_select_entry (view, NULL);
+    }
+}
+
+static void
+gimp_palette_view_drag_color (GtkWidget *widget,
+                              GimpRGB   *color,
+                              gpointer   data)
+{
+  GimpPaletteView *view = GIMP_PALETTE_VIEW (data);
+
+  if (view->dnd_entry)
+    *color = view->dnd_entry->color;
+  else
+    gimp_rgba_set (color, 0.0, 0.0, 0.0, 1.0);
+}
+
+static void
+gimp_palette_view_drop_color (GtkWidget     *widget,
+                              gint           x,
+                              gint           y,
+                              const GimpRGB *color,
+                              gpointer       data)
+{
+  GimpPaletteView  *view = GIMP_PALETTE_VIEW (data);
+  GimpPaletteEntry *entry;
+
+  entry = gimp_palette_view_find_entry (view, x, y);
+
+  g_signal_emit (view, view_signals[COLOR_DROPPED], 0,
+                 entry, color);
+}
diff --git a/app/widgets/gimppaletteview.h b/app/widgets/gimppaletteview.h
new file mode 100644
index 0000000..68de628
--- /dev/null
+++ b/app/widgets/gimppaletteview.h
@@ -0,0 +1,70 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppaletteview.h
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PALETTE_VIEW_H__
+#define __GIMP_PALETTE_VIEW_H__
+
+#include "gimpview.h"
+
+
+#define GIMP_TYPE_PALETTE_VIEW            (gimp_palette_view_get_type ())
+#define GIMP_PALETTE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PALETTE_VIEW, GimpPaletteView))
+#define GIMP_PALETTE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PALETTE_VIEW, GimpPaletteViewClass))
+#define GIMP_IS_PALETTE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_PALETTE_VIEW))
+#define GIMP_IS_PALETTE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PALETTE_VIEW))
+#define GIMP_PALETTE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PALETTE_VIEW, GimpPaletteViewClass))
+
+
+typedef struct _GimpPaletteViewClass  GimpPaletteViewClass;
+
+struct _GimpPaletteView
+{
+  GimpView          parent_instance;
+
+  GimpPaletteEntry *selected;
+  GimpPaletteEntry *dnd_entry;
+};
+
+struct _GimpPaletteViewClass
+{
+  GimpViewClass  parent_class;
+
+  void (* entry_clicked)   (GimpPaletteView  *view,
+                            GimpPaletteEntry *entry,
+                            GdkModifierType   state);
+  void (* entry_selected)  (GimpPaletteView  *view,
+                            GimpPaletteEntry *entry);
+  void (* entry_activated) (GimpPaletteView  *view,
+                            GimpPaletteEntry *entry);
+  void (* entry_context)   (GimpPaletteView  *view,
+                            GimpPaletteEntry *entry);
+  void (* color_dropped)   (GimpPaletteView  *view,
+                            GimpPaletteEntry *entry,
+                            const GimpRGB    *color);
+};
+
+
+GType   gimp_palette_view_get_type     (void) G_GNUC_CONST;
+
+void    gimp_palette_view_select_entry (GimpPaletteView  *view,
+                                        GimpPaletteEntry *entry);
+
+
+#endif /* __GIMP_PALETTE_VIEW_H__ */
diff --git a/app/widgets/gimppanedbox.c b/app/widgets/gimppanedbox.c
new file mode 100644
index 0000000..15e8b54
--- /dev/null
+++ b/app/widgets/gimppanedbox.c
@@ -0,0 +1,959 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppanedbox.c
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2009-2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#ifdef GDK_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#endif
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdnd.h"
+#include "gimpdockable.h"
+#include "gimpdockbook.h"
+#include "gimpmenudock.h"
+#include "gimppanedbox.h"
+#include "gimptoolbox.h"
+
+#include "gimp-log.h"
+
+
+/**
+ * Defines the size of the area that dockables can be dropped on in
+ * order to be inserted and get space on their own (rather than
+ * inserted among others and sharing space)
+ */
+#define DROP_AREA_SIZE                  6
+
+#define DROP_HIGHLIGHT_MIN_SIZE         32
+#define DROP_HIGHLIGHT_COLOR            "#215d9c"
+#define DROP_HIGHLIGHT_OPACITY_ACTIVE   1.0
+#define DROP_HIGHLIGHT_OPACITY_INACTIVE 0.5
+
+#define INSERT_INDEX_UNUSED             G_MININT
+
+
+struct _GimpPanedBoxPrivate
+{
+  /* Widgets that are separated by panes */
+  GList                  *widgets;
+
+  /* Windows used for drag-and-drop output */
+  GdkWindow              *dnd_windows[3];
+  GdkDragContext         *dnd_context;
+  gint                    dnd_paned_position;
+  gint                    dnd_idle_id;
+
+  /* The insert index to use on drop */
+  gint                    insert_index;
+
+  /* Callback on drop */
+  GimpPanedBoxDroppedFunc dropped_cb;
+  gpointer                dropped_cb_data;
+
+  /* A drag handler offered to handle drag events */
+  GimpPanedBox           *drag_handler;
+};
+
+
+static void      gimp_paned_box_dispose                 (GObject        *object);
+
+static void      gimp_paned_box_drag_leave              (GtkWidget      *widget,
+                                                         GdkDragContext *context,
+                                                         guint           time);
+static gboolean  gimp_paned_box_drag_motion             (GtkWidget      *widget,
+                                                         GdkDragContext *context,
+                                                         gint            x,
+                                                         gint            y,
+                                                         guint           time);
+static gboolean  gimp_paned_box_drag_drop               (GtkWidget      *widget,
+                                                         GdkDragContext *context,
+                                                         gint            x,
+                                                         gint            y,
+                                                         guint           time);
+static void      gimp_paned_box_realize                 (GtkWidget      *widget);
+static void      gimp_paned_box_unrealize               (GtkWidget      *widget);
+static void      gimp_paned_box_set_widget_drag_handler (GtkWidget      *widget,
+                                                         GimpPanedBox   *handler);
+static gint      gimp_paned_box_get_drop_area_size      (GimpPanedBox   *paned_box);
+
+static void      gimp_paned_box_drag_callback           (GdkDragContext *context,
+                                                         gboolean        begin,
+                                                         GimpPanedBox   *paned_box);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPanedBox, gimp_paned_box, GTK_TYPE_BOX)
+
+#define parent_class gimp_paned_box_parent_class
+
+static const GtkTargetEntry dialog_target_table[] = { GIMP_TARGET_DIALOG };
+
+
+static void
+gimp_paned_box_class_init (GimpPanedBoxClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose     = gimp_paned_box_dispose;
+
+  widget_class->drag_leave  = gimp_paned_box_drag_leave;
+  widget_class->drag_motion = gimp_paned_box_drag_motion;
+  widget_class->drag_drop   = gimp_paned_box_drag_drop;
+  widget_class->realize     = gimp_paned_box_realize;
+  widget_class->unrealize   = gimp_paned_box_unrealize;
+}
+
+static void
+gimp_paned_box_init (GimpPanedBox *paned_box)
+{
+  paned_box->p = gimp_paned_box_get_instance_private (paned_box);
+
+  /* Setup DND */
+  gtk_drag_dest_set (GTK_WIDGET (paned_box),
+                     0,
+                     dialog_target_table, G_N_ELEMENTS (dialog_target_table),
+                     GDK_ACTION_MOVE);
+
+  gimp_dockbook_add_drag_callback (
+    (GimpDockbookDragCallback) gimp_paned_box_drag_callback,
+    paned_box);
+}
+
+static void
+gimp_paned_box_dispose (GObject *object)
+{
+  GimpPanedBox *paned_box = GIMP_PANED_BOX (object);
+
+  if (paned_box->p->dnd_idle_id)
+    {
+      g_source_remove (paned_box->p->dnd_idle_id);
+
+      paned_box->p->dnd_idle_id = 0;
+    }
+
+  while (paned_box->p->widgets)
+    {
+      GtkWidget *widget = paned_box->p->widgets->data;
+
+      g_object_ref (widget);
+      gimp_paned_box_remove_widget (paned_box, widget);
+      gtk_widget_destroy (widget);
+      g_object_unref (widget);
+    }
+
+  gimp_dockbook_remove_drag_callback (
+    (GimpDockbookDragCallback) gimp_paned_box_drag_callback,
+    paned_box);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_paned_box_realize (GtkWidget *widget)
+{
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
+  /* We realize() dnd_window on demand in
+   * gimp_paned_box_show_separators()
+   */
+}
+
+static void
+gimp_paned_box_unrealize (GtkWidget *widget)
+{
+  GimpPanedBox *paned_box = GIMP_PANED_BOX (widget);
+  gint          i;
+
+  for (i = 0; i < G_N_ELEMENTS (paned_box->p->dnd_windows); i++)
+    {
+      GdkWindow *window = paned_box->p->dnd_windows[i];
+
+      if (window)
+        {
+          gdk_window_set_user_data (window, NULL);
+          gdk_window_destroy (window);
+
+          paned_box->p->dnd_windows[i] = NULL;
+        }
+    }
+
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+gimp_paned_box_set_widget_drag_handler (GtkWidget    *widget,
+                                        GimpPanedBox *drag_handler)
+{
+  /* Hook us in for drag events. We could abstract this properly and
+   * put gimp_paned_box_will_handle_drag() in an interface for
+   * example, but it doesn't feel worth it at this point
+   *
+   * Note that we don't have 'else if's because a widget can be both a
+   * dock and a toolbox for example, in which case we want to set a
+   * drag handler in two ways
+   *
+   * We so need to introduce some abstractions here...
+   */
+
+  if (GIMP_IS_DOCKBOOK (widget))
+    {
+      gimp_dockbook_set_drag_handler (GIMP_DOCKBOOK (widget),
+                                      drag_handler);
+    }
+
+  if (GIMP_IS_DOCK (widget))
+    {
+      GimpPanedBox *dock_paned_box = NULL;
+      dock_paned_box = GIMP_PANED_BOX (gimp_dock_get_vbox (GIMP_DOCK (widget)));
+      gimp_paned_box_set_drag_handler (dock_paned_box, drag_handler);
+    }
+
+  if (GIMP_IS_TOOLBOX (widget))
+    {
+      GimpToolbox *toolbox = GIMP_TOOLBOX (widget);
+      gimp_toolbox_set_drag_handler (toolbox, drag_handler);
+    }
+}
+
+static gint
+gimp_paned_box_get_drop_area_size (GimpPanedBox *paned_box)
+{
+  gint drop_area_size = 0;
+
+  if (! paned_box->p->widgets)
+    {
+      GtkAllocation  allocation;
+      GtkOrientation orientation;
+
+      gtk_widget_get_allocation (GTK_WIDGET (paned_box), &allocation);
+      orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (paned_box));
+
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        drop_area_size = allocation.width;
+      else if (orientation == GTK_ORIENTATION_VERTICAL)
+        drop_area_size = allocation.height;
+    }
+
+  drop_area_size = MAX (drop_area_size, DROP_AREA_SIZE);
+
+  return drop_area_size;
+}
+
+static gboolean
+gimp_paned_box_get_handle_drag (GimpPanedBox   *paned_box,
+                                GdkDragContext *context,
+                                gint            x,
+                                gint            y,
+                                guint           time,
+                                gint           *insert_index,
+                                GeglRectangle  *area)
+{
+  gint           index          = INSERT_INDEX_UNUSED;
+  GtkAllocation  allocation     = { 0, };
+  gint           area_x         = 0;
+  gint           area_y         = 0;
+  gint           area_w         = 0;
+  gint           area_h         = 0;
+  GtkOrientation orientation    = 0;
+  gint           drop_area_size = gimp_paned_box_get_drop_area_size (paned_box);
+
+  if (gimp_paned_box_will_handle_drag (paned_box->p->drag_handler,
+                                       GTK_WIDGET (paned_box),
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      return FALSE;
+    }
+
+  if (gtk_drag_dest_find_target (GTK_WIDGET (paned_box), context, NULL) ==
+      GDK_NONE)
+    {
+      return FALSE;
+    }
+
+  gtk_widget_get_allocation (GTK_WIDGET (paned_box), &allocation);
+
+  /* See if we're at the edge of the dock If there are no dockables,
+   * the entire paned box is a drop area
+   */
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (paned_box));
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      area_y = 0;
+      area_h = allocation.height;
+
+      /* If there are no widgets, the drop area is as big as the paned
+       * box
+       */
+      if (! paned_box->p->widgets)
+        area_w = allocation.width;
+      else
+        area_w = drop_area_size;
+
+      if (x < drop_area_size)
+        {
+          index = 0;
+          area_x = 0;
+        }
+      if (x > allocation.width - drop_area_size)
+        {
+          index = -1;
+          area_x = allocation.width - drop_area_size;
+        }
+    }
+  else /* if (orientation = GTK_ORIENTATION_VERTICAL) */
+    {
+      area_x = 0;
+      area_w = allocation.width;
+
+      /* If there are no widgets, the drop area is as big as the paned
+       * box
+       */
+      if (! paned_box->p->widgets)
+        area_h = allocation.height;
+      else
+        area_h = drop_area_size;
+
+      if (y < drop_area_size)
+        {
+          index = 0;
+          area_y = 0;
+        }
+      if (y > allocation.height - drop_area_size)
+        {
+          index = -1;
+          area_y = allocation.height - drop_area_size;
+        }
+    }
+
+  if (area)
+    {
+      area->x      = allocation.x + area_x;
+      area->y      = allocation.y + area_y;
+      area->width  = area_w;
+      area->height = area_h;
+    }
+
+  if (insert_index)
+    *insert_index = index;
+
+  return index != INSERT_INDEX_UNUSED;
+}
+
+static void
+gimp_paned_box_position_drop_indicator (GimpPanedBox *paned_box,
+                                        gint          index,
+                                        gint          x,
+                                        gint          y,
+                                        gint          width,
+                                        gint          height,
+                                        gdouble       opacity)
+{
+  GtkWidget    *widget = GTK_WIDGET (paned_box);
+  GdkWindow    *window = paned_box->p->dnd_windows[index];
+  GtkStyle     *style  = gtk_widget_get_style (widget);
+  GtkStateType  state  = gtk_widget_get_state (widget);
+  GimpRGB       bg;
+  GimpRGB       fg;
+  GdkColor      color;
+
+  if (! gtk_widget_is_drawable (widget))
+    return;
+
+  /* Create or move the GdkWindow in place */
+  if (! window)
+    {
+      GtkAllocation allocation;
+      GdkWindowAttr attributes;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      attributes.x           = x;
+      attributes.y           = y;
+      attributes.width       = width;
+      attributes.height      = height;
+      attributes.window_type = GDK_WINDOW_CHILD;
+      attributes.wclass      = GDK_INPUT_OUTPUT;
+      attributes.event_mask  = gtk_widget_get_events (widget);
+
+      window = gdk_window_new (gtk_widget_get_window (widget),
+                               &attributes,
+                               GDK_WA_X | GDK_WA_Y);
+      gdk_window_set_user_data (window, widget);
+
+      paned_box->p->dnd_windows[index] = window;
+    }
+  else
+    {
+      gdk_window_move_resize (window,
+                              x, y,
+                              width, height);
+    }
+
+  gimp_rgb_set_uchar (&bg,
+                      style->bg[state].red   >> 8,
+                      style->bg[state].green >> 8,
+                      style->bg[state].blue  >> 8);
+  bg.a = 1.0;
+
+  gimp_rgb_parse_hex (&fg, DROP_HIGHLIGHT_COLOR, -1);
+  fg.a = opacity;
+
+  gimp_rgb_composite (&bg, &fg, GIMP_RGB_COMPOSITE_NORMAL);
+
+  color.red   = bg.r * 0xffff;
+  color.green = bg.g * 0xffff;
+  color.blue  = bg.b * 0xffff;
+
+  gdk_rgb_find_color (gtk_widget_get_colormap (widget), &color);
+
+  gdk_window_set_background (window, &color);
+
+  gdk_window_show (window);
+}
+
+static void
+gimp_paned_box_hide_drop_indicator (GimpPanedBox *paned_box,
+                                    gint          index)
+{
+  if (! paned_box->p->dnd_windows[index])
+    return;
+
+  gdk_window_hide (paned_box->p->dnd_windows[index]);
+}
+
+static void
+gimp_paned_box_drag_leave (GtkWidget      *widget,
+                           GdkDragContext *context,
+                           guint           time)
+{
+  GimpPanedBox *paned_box = GIMP_PANED_BOX (widget);
+
+  gimp_paned_box_hide_drop_indicator (paned_box, 0);
+}
+
+static gboolean
+gimp_paned_box_drag_motion (GtkWidget      *widget,
+                            GdkDragContext *context,
+                            gint            x,
+                            gint            y,
+                            guint           time)
+{
+  GimpPanedBox  *paned_box = GIMP_PANED_BOX (widget);
+  gint           insert_index;
+  GeglRectangle  area;
+  gboolean       handle;
+
+  handle = gimp_paned_box_get_handle_drag (paned_box, context, x, y, time,
+                                           &insert_index, &area);
+
+  /* If we are at the edge, show a GdkWindow to communicate that a
+   * drop will create a new dock column
+   */
+  if (handle)
+    {
+      gimp_paned_box_position_drop_indicator (paned_box,
+                                              0,
+                                              area.x,
+                                              area.y,
+                                              area.width,
+                                              area.height,
+                                              DROP_HIGHLIGHT_OPACITY_ACTIVE);
+    }
+  else
+    {
+      gimp_paned_box_hide_drop_indicator (paned_box, 0);
+    }
+
+  /* Save the insert index for drag-drop */
+  paned_box->p->insert_index = insert_index;
+
+  gdk_drag_status (context, handle ? GDK_ACTION_MOVE : 0, time);
+
+  /* Return TRUE so drag_leave() is called */
+  return handle;
+}
+
+static gboolean
+gimp_paned_box_drag_drop (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          gint            x,
+                          gint            y,
+                          guint           time)
+{
+  GimpPanedBox *paned_box = GIMP_PANED_BOX (widget);
+  gboolean      dropped   = FALSE;
+
+  if (gimp_paned_box_will_handle_drag (paned_box->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      return FALSE;
+    }
+
+  if (paned_box->p->dropped_cb)
+    {
+      GtkWidget *source = gtk_drag_get_source_widget (context);
+
+      if (source)
+        dropped = paned_box->p->dropped_cb (source,
+                                            paned_box->p->insert_index,
+                                            paned_box->p->dropped_cb_data);
+    }
+
+  gtk_drag_finish (context, dropped, TRUE, time);
+
+  return TRUE;
+}
+
+static gboolean
+gimp_paned_box_drag_callback_idle (GimpPanedBox *paned_box)
+{
+  GtkAllocation  allocation;
+  GtkOrientation orientation;
+  GeglRectangle  area;
+
+  paned_box->p->dnd_idle_id = 0;
+
+  gtk_widget_get_allocation (GTK_WIDGET (paned_box), &allocation);
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (paned_box));
+
+  #define ADD_AREA(index, left, top)               \
+    if (gimp_paned_box_get_handle_drag (           \
+        paned_box,                                 \
+        paned_box->p->dnd_context,                 \
+        (left), (top),                             \
+        0,                                         \
+        NULL, &area))                              \
+      {                                            \
+        gimp_paned_box_position_drop_indicator (   \
+          paned_box,                               \
+          index,                                   \
+          area.x, area.y, area.width, area.height, \
+          DROP_HIGHLIGHT_OPACITY_INACTIVE);        \
+      }
+
+  if (! paned_box->p->widgets)
+    {
+      ADD_AREA (1, allocation.width / 2, allocation.height / 2)
+    }
+  else if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      ADD_AREA (1, 0,                    allocation.height / 2)
+      ADD_AREA (2, allocation.width - 1, allocation.height / 2)
+    }
+  else
+    {
+      ADD_AREA (1, allocation.width / 2, 0)
+      ADD_AREA (2, allocation.width / 2, allocation.height - 1)
+    }
+
+  #undef ADD_AREA
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_paned_box_drag_callback (GdkDragContext *context,
+                              gboolean        begin,
+                              GimpPanedBox   *paned_box)
+{
+  GtkWidget *paned;
+  gint       position;
+
+  if (! gtk_widget_get_sensitive (GTK_WIDGET (paned_box)))
+    return;
+
+  paned = gtk_widget_get_ancestor (GTK_WIDGET (paned_box),
+                                   GTK_TYPE_PANED);
+
+  /* apparently, we can be called multiple times when beginning a drag
+   * (possibly a gtk bug); make sure not to leak the idle.
+   *
+   * see issue #4895.
+   */
+  if (begin && ! paned_box->p->dnd_context)
+    {
+      paned_box->p->dnd_context = context;
+
+      if (paned)
+        {
+          GtkAllocation allocation;
+
+          gtk_widget_get_allocation (paned, &allocation);
+
+          position = gtk_paned_get_position (GTK_PANED (paned));
+
+          paned_box->p->dnd_paned_position = position;
+
+          if (position < 0)
+            {
+              position = 0;
+            }
+          else if (gtk_widget_is_ancestor (
+                     GTK_WIDGET (paned_box),
+                     gtk_paned_get_child2 (GTK_PANED (paned))))
+            {
+              position = allocation.width - position;
+            }
+
+          if (position < DROP_HIGHLIGHT_MIN_SIZE)
+            {
+              position = DROP_HIGHLIGHT_MIN_SIZE;
+
+              if (gtk_widget_is_ancestor (
+                    GTK_WIDGET (paned_box),
+                    gtk_paned_get_child2 (GTK_PANED (paned))))
+                {
+                  position = allocation.width - position;
+                }
+
+              gtk_paned_set_position (GTK_PANED (paned), position);
+            }
+        }
+
+      paned_box->p->dnd_idle_id = g_idle_add (
+        (GSourceFunc) gimp_paned_box_drag_callback_idle,
+        paned_box);
+    }
+  else if (! begin && paned_box->p->dnd_context)
+    {
+      if (paned_box->p->dnd_idle_id)
+        {
+          g_source_remove (paned_box->p->dnd_idle_id);
+
+          paned_box->p->dnd_idle_id = 0;
+        }
+
+      paned_box->p->dnd_context = NULL;
+
+      gimp_paned_box_hide_drop_indicator (paned_box, 1);
+      gimp_paned_box_hide_drop_indicator (paned_box, 2);
+
+      if (paned)
+        {
+          gtk_paned_set_position (GTK_PANED (paned),
+                                  paned_box->p->dnd_paned_position);
+        }
+    }
+}
+
+
+GtkWidget *
+gimp_paned_box_new (gboolean       homogeneous,
+                    gint           spacing,
+                    GtkOrientation orientation)
+{
+  return g_object_new (GIMP_TYPE_PANED_BOX,
+                       "homogeneous",  homogeneous,
+                       "spacing",      0,
+                       "orientation",  orientation,
+                       NULL);
+}
+
+void
+gimp_paned_box_set_dropped_cb (GimpPanedBox            *paned_box,
+                               GimpPanedBoxDroppedFunc  dropped_cb,
+                               gpointer                 dropped_cb_data)
+{
+  g_return_if_fail (GIMP_IS_PANED_BOX (paned_box));
+
+  paned_box->p->dropped_cb      = dropped_cb;
+  paned_box->p->dropped_cb_data = dropped_cb_data;
+}
+
+/**
+ * gimp_paned_box_add_widget:
+ * @paned_box: A #GimpPanedBox
+ * @widget:    The #GtkWidget to add
+ * @index:     Where to add the @widget
+ *
+ * Add a #GtkWidget to the #GimpPanedBox in a hierarchy of #GtkPaned:s
+ * so the space can be manually distributed between the widgets.
+ **/
+void
+gimp_paned_box_add_widget (GimpPanedBox *paned_box,
+                           GtkWidget    *widget,
+                           gint          index)
+{
+  gint old_length = 0;
+
+  g_return_if_fail (GIMP_IS_PANED_BOX (paned_box));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  GIMP_LOG (DND, "Adding GtkWidget %p to GimpPanedBox %p", widget, paned_box);
+
+  /* Calculate length */
+  old_length = g_list_length (paned_box->p->widgets);
+
+  /* If index is invalid append at the end */
+  if (index >= old_length || index < 0)
+    {
+      index = old_length;
+    }
+
+  /* Insert into the list */
+  paned_box->p->widgets = g_list_insert (paned_box->p->widgets, widget, index);
+
+  /* Hook us in for drag events. We could abstract this but it doesn't
+   * seem worth it at this point
+   */
+  gimp_paned_box_set_widget_drag_handler (widget, paned_box);
+
+  /* Insert into the GtkPaned hierarchy */
+  if (old_length == 0)
+    {
+      gtk_box_pack_start (GTK_BOX (paned_box), widget, TRUE, TRUE, 0);
+    }
+  else
+    {
+      GtkWidget      *old_widget;
+      GtkWidget      *parent;
+      GtkWidget      *paned;
+      GtkOrientation  orientation;
+
+      /* Figure out what widget to detach */
+      if (index == 0)
+        {
+          old_widget = g_list_nth_data (paned_box->p->widgets, index + 1);
+        }
+      else
+        {
+          old_widget = g_list_nth_data (paned_box->p->widgets, index - 1);
+        }
+
+      parent = gtk_widget_get_parent (old_widget);
+
+      if (old_length > 1 && index > 0)
+        {
+          GtkWidget *grandparent = gtk_widget_get_parent (parent);
+
+          old_widget = parent;
+          parent     = grandparent;
+        }
+
+      /* Detach the widget and build up a new hierarchy */
+      g_object_ref (old_widget);
+      gtk_container_remove (GTK_CONTAINER (parent), old_widget);
+
+      /* GtkPaned is abstract :( */
+      orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (paned_box));
+      paned = gtk_paned_new (orientation);
+
+      if (GTK_IS_PANED (parent))
+        {
+          gtk_paned_pack1 (GTK_PANED (parent), paned, TRUE, FALSE);
+        }
+      else
+        {
+          gtk_box_pack_start (GTK_BOX (parent), paned, TRUE, TRUE, 0);
+        }
+      gtk_widget_show (paned);
+
+      if (index == 0)
+        {
+          gtk_paned_pack1 (GTK_PANED (paned), widget,
+                           TRUE, FALSE);
+          gtk_paned_pack2 (GTK_PANED (paned), old_widget,
+                           TRUE, FALSE);
+        }
+      else
+        {
+          gtk_paned_pack1 (GTK_PANED (paned), old_widget,
+                           TRUE, FALSE);
+          gtk_paned_pack2 (GTK_PANED (paned), widget,
+                           TRUE, FALSE);
+        }
+
+      g_object_unref (old_widget);
+    }
+}
+
+/**
+ * gimp_paned_box_remove_widget:
+ * @paned_box: A #GimpPanedBox
+ * @widget:    The #GtkWidget to remove
+ *
+ * Remove a #GtkWidget from a #GimpPanedBox added with
+ * gimp_widgets_add_paned_widget().
+ **/
+void
+gimp_paned_box_remove_widget (GimpPanedBox *paned_box,
+                              GtkWidget    *widget)
+{
+  gint       old_length   = 0;
+  gint       index        = 0;
+  GtkWidget *other_widget = NULL;
+  GtkWidget *parent       = NULL;
+  GtkWidget *grandparent  = NULL;
+
+  g_return_if_fail (GIMP_IS_PANED_BOX (paned_box));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  GIMP_LOG (DND, "Removing GtkWidget %p from GimpPanedBox %p", widget, paned_box);
+
+  /* Calculate length and index */
+  old_length = g_list_length (paned_box->p->widgets);
+  index      = g_list_index (paned_box->p->widgets, widget);
+
+  /* Remove from list */
+  paned_box->p->widgets = g_list_remove (paned_box->p->widgets, widget);
+
+  /* Reset the drag events hook */
+  gimp_paned_box_set_widget_drag_handler (widget, NULL);
+
+  /* Remove from widget hierarchy */
+  if (old_length == 1)
+    {
+      /* The widget might already be parent-less if we are in
+       * destruction, .e.g when closing a dock window.
+       */
+      if (gtk_widget_get_parent (widget) != NULL)
+        gtk_container_remove (GTK_CONTAINER (paned_box), widget);
+    }
+  else
+    {
+      g_object_ref (widget);
+
+      parent      = gtk_widget_get_parent (GTK_WIDGET (widget));
+      grandparent = gtk_widget_get_parent (parent);
+
+      if (index == 0)
+        other_widget = gtk_paned_get_child2 (GTK_PANED (parent));
+      else
+        other_widget = gtk_paned_get_child1 (GTK_PANED (parent));
+
+      g_object_ref (other_widget);
+
+      gtk_container_remove (GTK_CONTAINER (parent), other_widget);
+      gtk_container_remove (GTK_CONTAINER (parent), GTK_WIDGET (widget));
+
+      gtk_container_remove (GTK_CONTAINER (grandparent), parent);
+
+      if (GTK_IS_PANED (grandparent))
+        gtk_paned_pack1 (GTK_PANED (grandparent), other_widget, TRUE, FALSE);
+      else
+        gtk_box_pack_start (GTK_BOX (paned_box), other_widget, TRUE, TRUE, 0);
+
+      g_object_unref (other_widget);
+
+      g_object_unref (widget);
+    }
+}
+
+/**
+ * gimp_paned_box_will_handle_drag:
+ * @paned_box: A #GimpPanedBox
+ * @widget:    The widget that got the drag event
+ * @context:   Context from drag event
+ * @x:         x from drag event
+ * @y:         y from drag event
+ * @time:      time from drag event
+ *
+ * Returns: %TRUE if the drag event on @widget will be handled by
+ *          @paned_box.
+ **/
+gboolean
+gimp_paned_box_will_handle_drag (GimpPanedBox   *paned_box,
+                                 GtkWidget      *widget,
+                                 GdkDragContext *context,
+                                 gint            x,
+                                 gint            y,
+                                 gint            time)
+{
+  gint           paned_box_x    = 0;
+  gint           paned_box_y    = 0;
+  GtkAllocation  allocation     = { 0, };
+  GtkOrientation orientation    = 0;
+  gboolean       will_handle    = FALSE;
+  gint           drop_area_size = 0;
+
+  g_return_val_if_fail (paned_box == NULL ||
+                        GIMP_IS_PANED_BOX (paned_box), FALSE);
+
+  /* Check for NULL to allow cleaner client code */
+  if (paned_box == NULL)
+    return FALSE;
+
+  /* Our handler might handle it */
+  if (gimp_paned_box_will_handle_drag (paned_box->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      /* Return TRUE so the client will pass on the drag event */
+      return TRUE;
+    }
+
+  /* If we don't have a common ancenstor we will not handle it */
+  if (! gtk_widget_translate_coordinates (widget,
+                                          GTK_WIDGET (paned_box),
+                                          x, y,
+                                          &paned_box_x, &paned_box_y))
+    {
+      /* Return FALSE so the client can take care of the drag event */
+      return FALSE;
+    }
+
+  /* We now have paned_box coordinates, see if the paned_box will
+   * handle the event
+   */
+  gtk_widget_get_allocation (GTK_WIDGET (paned_box), &allocation);
+  orientation    = gtk_orientable_get_orientation (GTK_ORIENTABLE (paned_box));
+  drop_area_size = gimp_paned_box_get_drop_area_size (paned_box);
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      will_handle = (paned_box_x < drop_area_size ||
+                     paned_box_x > allocation.width - drop_area_size);
+    }
+  else /*if (orientation = GTK_ORIENTATION_VERTICAL)*/
+    {
+      will_handle = (paned_box_y < drop_area_size ||
+                     paned_box_y > allocation.height - drop_area_size);
+    }
+
+  return will_handle;
+}
+
+void
+gimp_paned_box_set_drag_handler (GimpPanedBox *paned_box,
+                                 GimpPanedBox *drag_handler)
+{
+  g_return_if_fail (GIMP_IS_PANED_BOX (paned_box));
+
+  paned_box->p->drag_handler = drag_handler;
+}
diff --git a/app/widgets/gimppanedbox.h b/app/widgets/gimppanedbox.h
new file mode 100644
index 0000000..6a07a39
--- /dev/null
+++ b/app/widgets/gimppanedbox.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppanedbox.h
+ * Copyright (C) 2001-2005 Michael Natterer <mitch@gimp.org>
+ * Copyright (C)      2009 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PANED_BOX_H__
+#define __GIMP_PANED_BOX_H__
+
+
+#define GIMP_TYPE_PANED_BOX            (gimp_paned_box_get_type ())
+#define GIMP_PANED_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PANED_BOX, GimpPanedBox))
+#define GIMP_PANED_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PANED_BOX, GimpPanedBoxClass))
+#define GIMP_IS_PANED_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PANED_BOX))
+#define GIMP_IS_PANED_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PANED_BOX))
+#define GIMP_PANED_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PANED_BOX, GimpPanedBoxClass))
+
+
+typedef struct _GimpPanedBoxClass    GimpPanedBoxClass;
+typedef struct _GimpPanedBoxPrivate  GimpPanedBoxPrivate;
+
+/**
+ * GimpPanedBox:
+ *
+ * A #GtkBox with the children separated by #GtkPaned:s and basic
+ * docking mechanisms.
+ */
+struct _GimpPanedBox
+{
+  GtkBox parent_instance;
+
+  GimpPanedBoxPrivate *p;
+};
+
+struct _GimpPanedBoxClass
+{
+  GtkBoxClass parent_class;
+};
+
+
+GType               gimp_paned_box_get_type              (void) G_GNUC_CONST;
+GtkWidget         * gimp_paned_box_new                   (gboolean                 homogeneous,
+                                                          gint                     spacing,
+                                                          GtkOrientation           orientation);
+void                gimp_paned_box_set_dropped_cb        (GimpPanedBox            *paned_box,
+                                                          GimpPanedBoxDroppedFunc  dropped_cb,
+                                                          gpointer                 dropped_cb_data);
+void                gimp_paned_box_add_widget            (GimpPanedBox            *paned_box,
+                                                          GtkWidget               *widget,
+                                                          gint                     index);
+void                gimp_paned_box_remove_widget         (GimpPanedBox            *paned_box,
+                                                          GtkWidget               *widget);
+gboolean            gimp_paned_box_will_handle_drag      (GimpPanedBox            *paned_box,
+                                                          GtkWidget               *widget,
+                                                          GdkDragContext          *context,
+                                                          gint                     x,
+                                                          gint                     y,
+                                                          gint                     time);
+void                gimp_paned_box_set_drag_handler      (GimpPanedBox            *paned_box,
+                                                          GimpPanedBox            *drag_handler);
+
+
+#endif /* __GIMP_PANED_BOX_H__ */
diff --git a/app/widgets/gimppatternfactoryview.c b/app/widgets/gimppatternfactoryview.c
new file mode 100644
index 0000000..3f1a9e3
--- /dev/null
+++ b/app/widgets/gimppatternfactoryview.c
@@ -0,0 +1,96 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppatternfactoryview.c
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpviewable.h"
+
+#include "gimpeditor.h"
+#include "gimpmenufactory.h"
+#include "gimppatternfactoryview.h"
+#include "gimpviewrenderer.h"
+
+
+G_DEFINE_TYPE (GimpPatternFactoryView, gimp_pattern_factory_view,
+               GIMP_TYPE_DATA_FACTORY_VIEW)
+
+
+static void
+gimp_pattern_factory_view_class_init (GimpPatternFactoryViewClass *klass)
+{
+}
+
+static void
+gimp_pattern_factory_view_init (GimpPatternFactoryView *view)
+{
+}
+
+GtkWidget *
+gimp_pattern_factory_view_new (GimpViewType      view_type,
+                               GimpDataFactory  *factory,
+                               GimpContext      *context,
+                               gint              view_size,
+                               gint              view_border_width,
+                               GimpMenuFactory  *menu_factory)
+{
+  GimpPatternFactoryView *factory_view;
+  GimpContainerEditor    *editor;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  factory_view = g_object_new (GIMP_TYPE_PATTERN_FACTORY_VIEW,
+                               "view-type",         view_type,
+                               "data-factory",      factory,
+                               "context",           context,
+                               "view-size",         view_size,
+                               "view-border-width", view_border_width,
+                               "menu-factory",      menu_factory,
+                               "menu-identifier",   "<Patterns>",
+                               "ui-path",           "/patterns-popup",
+                               "action-group",      "patterns",
+                               NULL);
+
+  editor = GIMP_CONTAINER_EDITOR (factory_view);
+
+  gimp_editor_add_action_button (GIMP_EDITOR (editor->view),
+                                 "patterns", "patterns-open-as-image",
+                                 NULL);
+
+  gtk_widget_hide (gimp_data_factory_view_get_edit_button (GIMP_DATA_FACTORY_VIEW (factory_view)));
+
+  return GTK_WIDGET (factory_view);
+}
diff --git a/app/widgets/gimppatternfactoryview.h b/app/widgets/gimppatternfactoryview.h
new file mode 100644
index 0000000..d2805af
--- /dev/null
+++ b/app/widgets/gimppatternfactoryview.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppatternfactoryview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_FACTORY_VIEW_H__
+#define __GIMP_PATTERN_FACTORY_VIEW_H__
+
+#include "gimpdatafactoryview.h"
+
+
+#define GIMP_TYPE_PATTERN_FACTORY_VIEW            (gimp_pattern_factory_view_get_type ())
+#define GIMP_PATTERN_FACTORY_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATTERN_FACTORY_VIEW, GimpPatternFactoryView))
+#define GIMP_PATTERN_FACTORY_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATTERN_FACTORY_VIEW, GimpPatternFactoryViewClass))
+#define GIMP_IS_PATTERN_FACTORY_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PATTERN_FACTORY_VIEW))
+#define GIMP_IS_PATTERN_FACTORY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PATTERN_FACTORY_VIEW))
+#define GIMP_PATTERN_FACTORY_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PATTERN_FACTORY_VIEW, GimpPatternFactoryViewClass))
+
+
+typedef struct _GimpPatternFactoryViewClass  GimpPatternFactoryViewClass;
+
+struct _GimpPatternFactoryView
+{
+  GimpDataFactoryView  parent_instance;
+};
+
+struct _GimpPatternFactoryViewClass
+{
+  GimpDataFactoryViewClass  parent_class;
+};
+
+
+GType       gimp_pattern_factory_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_pattern_factory_view_new      (GimpViewType     view_type,
+                                                GimpDataFactory *factory,
+                                                GimpContext     *context,
+                                                gint             view_size,
+                                                gint             view_border_width,
+                                                GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_PATTERN_FACTORY_VIEW_H__  */
diff --git a/app/widgets/gimppatternselect.c b/app/widgets/gimppatternselect.c
new file mode 100644
index 0000000..6cd3b5a
--- /dev/null
+++ b/app/widgets/gimppatternselect.c
@@ -0,0 +1,142 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppatternselect.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gegl/gimp-babl-compat.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpcontainerbox.h"
+#include "gimppatternfactoryview.h"
+#include "gimppatternselect.h"
+
+
+static void             gimp_pattern_select_constructed  (GObject        *object);
+
+static GimpValueArray * gimp_pattern_select_run_callback (GimpPdbDialog  *dialog,
+                                                          GimpObject     *object,
+                                                          gboolean        closing,
+                                                          GError        **error);
+
+
+G_DEFINE_TYPE (GimpPatternSelect, gimp_pattern_select, GIMP_TYPE_PDB_DIALOG)
+
+#define parent_class gimp_pattern_select_parent_class
+
+
+static void
+gimp_pattern_select_class_init (GimpPatternSelectClass *klass)
+{
+  GObjectClass       *object_class = G_OBJECT_CLASS (klass);
+  GimpPdbDialogClass *pdb_class    = GIMP_PDB_DIALOG_CLASS (klass);
+
+  object_class->constructed = gimp_pattern_select_constructed;
+
+  pdb_class->run_callback   = gimp_pattern_select_run_callback;
+}
+
+static void
+gimp_pattern_select_init (GimpPatternSelect *select)
+{
+}
+
+static void
+gimp_pattern_select_constructed (GObject *object)
+{
+  GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object);
+  GtkWidget     *content_area;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  dialog->view =
+    gimp_pattern_factory_view_new (GIMP_VIEW_TYPE_GRID,
+                                   dialog->context->gimp->pattern_factory,
+                                   dialog->context,
+                                   GIMP_VIEW_SIZE_MEDIUM, 1,
+                                   dialog->menu_factory);
+
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
+                                       6 * (GIMP_VIEW_SIZE_MEDIUM + 2),
+                                       6 * (GIMP_VIEW_SIZE_MEDIUM + 2));
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  gtk_box_pack_start (GTK_BOX (content_area), dialog->view, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->view);
+}
+
+static GimpValueArray *
+gimp_pattern_select_run_callback (GimpPdbDialog  *dialog,
+                                  GimpObject     *object,
+                                  gboolean        closing,
+                                  GError        **error)
+{
+  GimpPattern    *pattern = GIMP_PATTERN (object);
+  const Babl     *format;
+  gpointer        data;
+  GimpArray      *array;
+  GimpValueArray *return_vals;
+
+  format = gimp_babl_compat_u8_format (
+    gimp_temp_buf_get_format (pattern->mask));
+  data   = gimp_temp_buf_lock (pattern->mask, format, GEGL_ACCESS_READ);
+
+  array = gimp_array_new (data,
+                          gimp_temp_buf_get_width         (pattern->mask) *
+                          gimp_temp_buf_get_height        (pattern->mask) *
+                          babl_format_get_bytes_per_pixel (format),
+                          TRUE);
+
+  return_vals =
+    gimp_pdb_execute_procedure_by_name (dialog->pdb,
+                                        dialog->caller_context,
+                                        NULL, error,
+                                        dialog->callback_name,
+                                        G_TYPE_STRING,        gimp_object_get_name (object),
+                                        GIMP_TYPE_INT32,      gimp_temp_buf_get_width  (pattern->mask),
+                                        GIMP_TYPE_INT32,      gimp_temp_buf_get_height (pattern->mask),
+                                        GIMP_TYPE_INT32,      babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (pattern->mask)),
+                                        GIMP_TYPE_INT32,      array->length,
+                                        GIMP_TYPE_INT8_ARRAY, array,
+                                        GIMP_TYPE_INT32,      closing,
+                                        G_TYPE_NONE);
+
+  gimp_array_free (array);
+
+  gimp_temp_buf_unlock (pattern->mask, data);
+
+  return return_vals;
+}
diff --git a/app/widgets/gimppatternselect.h b/app/widgets/gimppatternselect.h
new file mode 100644
index 0000000..d18fac4
--- /dev/null
+++ b/app/widgets/gimppatternselect.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppatternselect.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PATTERN_SELECT_H__
+#define __GIMP_PATTERN_SELECT_H__
+
+#include "gimppdbdialog.h"
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_PATTERN_SELECT            (gimp_pattern_select_get_type ())
+#define GIMP_PATTERN_SELECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATTERN_SELECT, GimpPatternSelect))
+#define GIMP_PATTERN_SELECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATTERN_SELECT, GimpPatternSelectClass))
+#define GIMP_IS_PATTERN_SELECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PATTERN_SELECT))
+#define GIMP_IS_PATTERN_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PATTERN_SELECT))
+#define GIMP_PATTERN_SELECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PATTERN_SELECT, GimpPatternSelectClass))
+
+
+typedef struct _GimpPatternSelectClass  GimpPatternSelectClass;
+
+struct _GimpPatternSelect
+{
+  GimpPdbDialog  parent_instance;
+};
+
+struct _GimpPatternSelectClass
+{
+  GimpPdbDialogClass  parent_class;
+};
+
+
+GType  gimp_pattern_select_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_PATTERN_SELECT_H__ */
diff --git a/app/widgets/gimppdbdialog.c b/app/widgets/gimppdbdialog.c
new file mode 100644
index 0000000..3e78162
--- /dev/null
+++ b/app/widgets/gimppdbdialog.c
@@ -0,0 +1,350 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppdbdialog.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "pdb/gimppdb.h"
+
+#include "gimpmenufactory.h"
+#include "gimppdbdialog.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PDB,
+  PROP_CONTEXT,
+  PROP_SELECT_TYPE,
+  PROP_INITIAL_OBJECT,
+  PROP_CALLBACK_NAME,
+  PROP_MENU_FACTORY
+};
+
+
+static void   gimp_pdb_dialog_constructed     (GObject            *object);
+static void   gimp_pdb_dialog_dispose         (GObject            *object);
+static void   gimp_pdb_dialog_set_property    (GObject            *object,
+                                               guint               property_id,
+                                               const GValue       *value,
+                                               GParamSpec         *pspec);
+
+static void   gimp_pdb_dialog_response        (GtkDialog          *dialog,
+                                               gint                response_id);
+
+static void   gimp_pdb_dialog_context_changed (GimpContext        *context,
+                                               GimpObject         *object,
+                                               GimpPdbDialog      *dialog);
+static void   gimp_pdb_dialog_plug_in_closed  (GimpPlugInManager  *manager,
+                                               GimpPlugIn         *plug_in,
+                                               GimpPdbDialog      *dialog);
+
+
+G_DEFINE_ABSTRACT_TYPE (GimpPdbDialog, gimp_pdb_dialog, GIMP_TYPE_DIALOG)
+
+#define parent_class gimp_pdb_dialog_parent_class
+
+
+static void
+gimp_pdb_dialog_class_init (GimpPdbDialogClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->constructed  = gimp_pdb_dialog_constructed;
+  object_class->dispose      = gimp_pdb_dialog_dispose;
+  object_class->set_property = gimp_pdb_dialog_set_property;
+
+  dialog_class->response     = gimp_pdb_dialog_response;
+
+  klass->run_callback        = NULL;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PDB,
+                                   g_param_spec_object ("pdb", NULL, NULL,
+                                                        GIMP_TYPE_PDB,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SELECT_TYPE,
+                                   g_param_spec_gtype ("select-type",
+                                                       NULL, NULL,
+                                                       GIMP_TYPE_OBJECT,
+                                                       GIMP_PARAM_WRITABLE |
+                                                       G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_INITIAL_OBJECT,
+                                   g_param_spec_object ("initial-object",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_OBJECT,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CALLBACK_NAME,
+                                   g_param_spec_string ("callback-name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_MENU_FACTORY,
+                                   g_param_spec_object ("menu-factory",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_MENU_FACTORY,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_pdb_dialog_init (GimpPdbDialog *dialog)
+{
+  gtk_dialog_add_button (GTK_DIALOG (dialog),
+                         _("_Close"), GTK_RESPONSE_CLOSE);
+}
+
+static void
+gimp_pdb_dialog_constructed (GObject *object)
+{
+  GimpPdbDialog      *dialog = GIMP_PDB_DIALOG (object);
+  GimpPdbDialogClass *klass  = GIMP_PDB_DIALOG_GET_CLASS (object);
+  const gchar        *signal_name;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  klass->dialogs = g_list_prepend (klass->dialogs, dialog);
+
+  gimp_assert (GIMP_IS_PDB (dialog->pdb));
+  gimp_assert (GIMP_IS_CONTEXT (dialog->caller_context));
+  gimp_assert (g_type_is_a (dialog->select_type, GIMP_TYPE_OBJECT));
+
+  dialog->context = gimp_context_new (dialog->caller_context->gimp,
+                                      G_OBJECT_TYPE_NAME (object),
+                                      NULL);
+
+  gimp_context_set_by_type (dialog->context, dialog->select_type,
+                            dialog->initial_object);
+
+  dialog->initial_object = NULL;
+
+  signal_name = gimp_context_type_to_signal_name (dialog->select_type);
+
+  g_signal_connect_object (dialog->context, signal_name,
+                           G_CALLBACK (gimp_pdb_dialog_context_changed),
+                           dialog, 0);
+  g_signal_connect_object (dialog->context->gimp->plug_in_manager,
+                           "plug-in-closed",
+                           G_CALLBACK (gimp_pdb_dialog_plug_in_closed),
+                           dialog, 0);
+}
+
+static void
+gimp_pdb_dialog_dispose (GObject *object)
+{
+  GimpPdbDialog      *dialog = GIMP_PDB_DIALOG (object);
+  GimpPdbDialogClass *klass  = GIMP_PDB_DIALOG_GET_CLASS (object);
+
+  klass->dialogs = g_list_remove (klass->dialogs, object);
+
+  g_clear_object (&dialog->pdb);
+  g_clear_object (&dialog->caller_context);
+  g_clear_object (&dialog->context);
+
+  g_clear_pointer (&dialog->callback_name, g_free);
+
+  g_clear_object (&dialog->menu_factory);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_pdb_dialog_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpPdbDialog *dialog = GIMP_PDB_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_PDB:
+      dialog->pdb = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTEXT:
+      dialog->caller_context = g_value_dup_object (value);
+      break;
+
+    case PROP_SELECT_TYPE:
+      dialog->select_type = g_value_get_gtype (value);
+      break;
+
+    case PROP_INITIAL_OBJECT:
+      /* don't ref, see constructor */
+      dialog->initial_object = g_value_get_object (value);
+      break;
+
+    case PROP_CALLBACK_NAME:
+      if (dialog->callback_name)
+        g_free (dialog->callback_name);
+      dialog->callback_name = g_value_dup_string (value);
+      break;
+
+    case PROP_MENU_FACTORY:
+      dialog->menu_factory = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pdb_dialog_response (GtkDialog *gtk_dialog,
+                          gint       response_id)
+{
+  GimpPdbDialog *dialog = GIMP_PDB_DIALOG (gtk_dialog);
+
+  gimp_pdb_dialog_run_callback (dialog, TRUE);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+void
+gimp_pdb_dialog_run_callback (GimpPdbDialog *dialog,
+                              gboolean       closing)
+{
+  GimpPdbDialogClass *klass = GIMP_PDB_DIALOG_GET_CLASS (dialog);
+  GimpObject         *object;
+
+  object = gimp_context_get_by_type (dialog->context, dialog->select_type);
+
+  if (object                &&
+      klass->run_callback   &&
+      dialog->callback_name &&
+      ! dialog->callback_busy)
+    {
+      dialog->callback_busy = TRUE;
+
+      if (gimp_pdb_lookup_procedure (dialog->pdb, dialog->callback_name))
+        {
+          GimpValueArray *return_vals;
+          GError         *error = NULL;
+
+          return_vals = klass->run_callback (dialog, object, closing, &error);
+
+          if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) !=
+              GIMP_PDB_SUCCESS)
+            {
+              const gchar *message;
+
+              if (error && error->message)
+                message = error->message;
+              else
+                message = _("The corresponding plug-in may have crashed.");
+
+              gimp_message (dialog->context->gimp, G_OBJECT (dialog),
+                            GIMP_MESSAGE_ERROR,
+                            _("Unable to run %s callback.\n%s"),
+                            g_type_name (G_TYPE_FROM_INSTANCE (dialog)),
+                            message);
+            }
+          else if (error)
+            {
+              gimp_message_literal (dialog->context->gimp, G_OBJECT (dialog),
+                                    GIMP_MESSAGE_ERROR,
+                                    error->message);
+              g_error_free (error);
+            }
+
+          gimp_value_array_unref (return_vals);
+        }
+
+      dialog->callback_busy = FALSE;
+    }
+}
+
+GimpPdbDialog *
+gimp_pdb_dialog_get_by_callback (GimpPdbDialogClass *klass,
+                                 const gchar        *callback_name)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_PDB_DIALOG_CLASS (klass), NULL);
+  g_return_val_if_fail (callback_name != NULL, NULL);
+
+  for (list = klass->dialogs; list; list = g_list_next (list))
+    {
+      GimpPdbDialog *dialog = list->data;
+
+      if (dialog->callback_name &&
+          ! strcmp (callback_name, dialog->callback_name))
+        return dialog;
+    }
+
+  return NULL;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_pdb_dialog_context_changed (GimpContext   *context,
+                                 GimpObject    *object,
+                                 GimpPdbDialog *dialog)
+{
+  if (object)
+    gimp_pdb_dialog_run_callback (dialog, FALSE);
+}
+
+static void
+gimp_pdb_dialog_plug_in_closed (GimpPlugInManager *manager,
+                                GimpPlugIn        *plug_in,
+                                GimpPdbDialog     *dialog)
+{
+  if (dialog->caller_context && dialog->callback_name)
+    {
+      if (! gimp_pdb_lookup_procedure (dialog->pdb, dialog->callback_name))
+        {
+          gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+        }
+    }
+}
diff --git a/app/widgets/gimppdbdialog.h b/app/widgets/gimppdbdialog.h
new file mode 100644
index 0000000..9b5b162
--- /dev/null
+++ b/app/widgets/gimppdbdialog.h
@@ -0,0 +1,86 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppdbdialog.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PDB_DIALOG_H__
+#define __GIMP_PDB_DIALOG_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_PDB_DIALOG            (gimp_pdb_dialog_get_type ())
+#define GIMP_PDB_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PDB_DIALOG, GimpPdbDialog))
+#define GIMP_PDB_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PDB_DIALOG, GimpPdbDialogClass))
+#define GIMP_IS_PDB_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PDB_DIALOG))
+#define GIMP_IS_PDB_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PDB_DIALOG))
+#define GIMP_PDB_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PDB_DIALOG, GimpPdbDialogClass))
+
+
+typedef struct _GimpPdbDialogClass  GimpPdbDialogClass;
+
+struct _GimpPdbDialog
+{
+  GimpDialog       parent_instance;
+
+  GimpPDB         *pdb;
+
+  /*  The context we were created with. This is the context the plug-in
+   *  exists in and must be used when calling the plug-in.
+   */
+  GimpContext     *caller_context;
+
+  /*  The dialog's private context, serves just as model for the
+   *  select widgets and must not be used when calling the plug-in.
+   */
+  GimpContext     *context;
+
+  GType            select_type;
+  GimpObject      *initial_object;
+  gchar           *callback_name;
+  gboolean         callback_busy;
+
+  GimpMenuFactory *menu_factory;
+  GtkWidget       *view;
+};
+
+struct _GimpPdbDialogClass
+{
+  GimpDialogClass  parent_class;
+
+  GList           *dialogs;
+
+  GimpValueArray * (* run_callback) (GimpPdbDialog  *dialog,
+                                     GimpObject     *object,
+                                     gboolean        closing,
+                                     GError        **error);
+};
+
+
+GType           gimp_pdb_dialog_get_type        (void) G_GNUC_CONST;
+
+void            gimp_pdb_dialog_run_callback    (GimpPdbDialog      *dialog,
+                                                 gboolean            closing);
+
+GimpPdbDialog * gimp_pdb_dialog_get_by_callback (GimpPdbDialogClass *klass,
+                                                 const gchar        *callback_name);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_PDB_DIALOG_H__ */
diff --git a/app/widgets/gimppickablebutton.c b/app/widgets/gimppickablebutton.c
new file mode 100644
index 0000000..e8454c2
--- /dev/null
+++ b/app/widgets/gimppickablebutton.c
@@ -0,0 +1,343 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppickablebutton.c
+ * Copyright (C) 2013 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimppickable.h"
+
+#include "gimpdnd.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+#include "gimppickablebutton.h"
+#include "gimppickablepopup.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_PICKABLE
+};
+
+struct _GimpPickableButtonPrivate
+{
+  gint          view_size;
+  gint          view_border_width;
+
+  GimpContext  *context;
+  GimpPickable *pickable;
+
+  GtkWidget    *view;
+};
+
+
+static void     gimp_pickable_button_constructed   (GObject            *object);
+static void     gimp_pickable_button_dispose       (GObject            *object);
+static void     gimp_pickable_button_finalize      (GObject            *object);
+static void     gimp_pickable_button_set_property  (GObject            *object,
+                                                    guint               property_id,
+                                                    const GValue       *value,
+                                                    GParamSpec         *pspec);
+static void     gimp_pickable_button_get_property  (GObject            *object,
+                                                    guint               property_id,
+                                                    GValue             *value,
+                                                    GParamSpec         *pspec);
+
+static void     gimp_pickable_button_clicked       (GtkButton          *button);
+
+static void     gimp_pickable_button_popup_confirm (GimpPickablePopup  *popup,
+                                                    GimpPickableButton *button);
+static void     gimp_pickable_button_drop_pickable (GtkWidget          *widget,
+                                                    gint                x,
+                                                    gint                y,
+                                                    GimpViewable       *viewable,
+                                                    gpointer            data);
+static void     gimp_pickable_button_notify_buffer (GimpPickable       *pickable,
+                                                    const GParamSpec   *pspec,
+                                                    GimpPickableButton *button);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPickableButton, gimp_pickable_button,
+                            GIMP_TYPE_BUTTON)
+
+#define parent_class gimp_pickable_button_parent_class
+
+
+static void
+gimp_pickable_button_class_init (GimpPickableButtonClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkButtonClass *button_class = GTK_BUTTON_CLASS (klass);
+
+  object_class->constructed  = gimp_pickable_button_constructed;
+  object_class->dispose      = gimp_pickable_button_dispose;
+  object_class->finalize     = gimp_pickable_button_finalize;
+  object_class->get_property = gimp_pickable_button_get_property;
+  object_class->set_property = gimp_pickable_button_set_property;
+
+  button_class->clicked      = gimp_pickable_button_clicked;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PICKABLE,
+                                   g_param_spec_object ("pickable",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_PICKABLE,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_pickable_button_init (GimpPickableButton *button)
+{
+  button->private = gimp_pickable_button_get_instance_private (button);
+
+  button->private->view_size         = GIMP_VIEW_SIZE_LARGE;
+  button->private->view_border_width = 1;
+
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (button), GIMP_TYPE_LAYER,
+                               gimp_pickable_button_drop_pickable,
+                               NULL);
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (button), GIMP_TYPE_LAYER_MASK,
+                               gimp_pickable_button_drop_pickable,
+                               NULL);
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (button), GIMP_TYPE_CHANNEL,
+                               gimp_pickable_button_drop_pickable,
+                               NULL);
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (button), GIMP_TYPE_IMAGE,
+                               gimp_pickable_button_drop_pickable,
+                               NULL);
+}
+
+static void
+gimp_pickable_button_constructed (GObject *object)
+{
+  GimpPickableButton *button = GIMP_PICKABLE_BUTTON (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CONTEXT (button->private->context));
+
+  button->private->view =
+    gimp_view_new_by_types (button->private->context,
+                            GIMP_TYPE_VIEW,
+                            GIMP_TYPE_VIEWABLE,
+                            button->private->view_size,
+                            button->private->view_border_width,
+                            FALSE);
+  gtk_container_add (GTK_CONTAINER (button), button->private->view);
+  gtk_widget_show (button->private->view);
+}
+
+static void
+gimp_pickable_button_dispose (GObject *object)
+{
+  GimpPickableButton *button = GIMP_PICKABLE_BUTTON (object);
+
+  gimp_pickable_button_set_pickable (button, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_pickable_button_finalize (GObject *object)
+{
+  GimpPickableButton *button = GIMP_PICKABLE_BUTTON (object);
+
+  g_clear_object (&button->private->context);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_pickable_button_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpPickableButton *button = GIMP_PICKABLE_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      if (button->private->context)
+        g_object_unref (button->private->context);
+      button->private->context = g_value_dup_object (value);
+      break;
+    case PROP_PICKABLE:
+      gimp_pickable_button_set_pickable (button, g_value_get_object (value));
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pickable_button_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpPickableButton *button = GIMP_PICKABLE_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, button->private->context);
+      break;
+    case PROP_PICKABLE:
+      g_value_set_object (value, button->private->pickable);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pickable_button_clicked (GtkButton *button)
+{
+  GimpPickableButton *pickable_button = GIMP_PICKABLE_BUTTON (button);
+  GtkWidget          *popup;
+
+  popup = gimp_pickable_popup_new (pickable_button->private->context,
+                                   pickable_button->private->view_size,
+                                   pickable_button->private->view_border_width);
+
+  g_signal_connect (popup, "confirm",
+                    G_CALLBACK (gimp_pickable_button_popup_confirm),
+                    button);
+
+  gimp_popup_show (GIMP_POPUP (popup), GTK_WIDGET (button));
+}
+
+static void
+gimp_pickable_button_popup_confirm (GimpPickablePopup  *popup,
+                                    GimpPickableButton *button)
+{
+  GimpPickable *pickable = gimp_pickable_popup_get_pickable (popup);
+
+  if (pickable)
+    gimp_pickable_button_set_pickable (button, pickable);
+}
+
+static void
+gimp_pickable_button_drop_pickable (GtkWidget    *widget,
+                                    gint          x,
+                                    gint          y,
+                                    GimpViewable *viewable,
+                                    gpointer      data)
+{
+  gimp_pickable_button_set_pickable (GIMP_PICKABLE_BUTTON (widget),
+                                     GIMP_PICKABLE (viewable));
+}
+
+static void
+gimp_pickable_button_notify_buffer (GimpPickable       *pickable,
+                                    const GParamSpec   *pspec,
+                                    GimpPickableButton *button)
+{
+  GeglBuffer *buffer = gimp_pickable_get_buffer (pickable);
+
+  if (buffer)
+    g_object_notify (G_OBJECT (button), "pickable");
+  else
+    gimp_pickable_button_set_pickable (button, NULL);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_pickable_button_new (GimpContext *context,
+                          gint         view_size,
+                          gint         view_border_width)
+{
+  GimpPickableButton *button;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size >  0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_BUTTON_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+
+  button = g_object_new (GIMP_TYPE_PICKABLE_BUTTON,
+                         "context", context,
+                         NULL);
+
+  button->private->view_size         = view_size;
+  button->private->view_border_width = view_border_width;
+
+  return GTK_WIDGET (button);
+}
+
+GimpPickable *
+gimp_pickable_button_get_pickable (GimpPickableButton *button)
+{
+  g_return_val_if_fail (GIMP_IS_PICKABLE_BUTTON (button), NULL);
+
+  return button->private->pickable;
+}
+
+void
+gimp_pickable_button_set_pickable (GimpPickableButton *button,
+                                   GimpPickable       *pickable)
+{
+  g_return_if_fail (GIMP_IS_PICKABLE_BUTTON (button));
+
+  if (pickable != button->private->pickable)
+    {
+      if (button->private->pickable)
+        g_signal_handlers_disconnect_by_func (button->private->pickable,
+                                              gimp_pickable_button_notify_buffer,
+                                              button);
+
+      g_set_object (&button->private->pickable, pickable);
+
+      if (button->private->pickable)
+        g_signal_connect (button->private->pickable, "notify::buffer",
+                          G_CALLBACK (gimp_pickable_button_notify_buffer),
+                          button);
+
+      gimp_view_set_viewable (GIMP_VIEW (button->private->view),
+                              GIMP_VIEWABLE (pickable));
+
+      g_object_notify (G_OBJECT (button), "pickable");
+    }
+}
diff --git a/app/widgets/gimppickablebutton.h b/app/widgets/gimppickablebutton.h
new file mode 100644
index 0000000..1cce09b
--- /dev/null
+++ b/app/widgets/gimppickablebutton.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppickablebutton.h
+ * Copyright (C) 2013 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PICKABLE_BUTTON_H__
+#define __GIMP_PICKABLE_BUTTON_H__
+
+
+#define GIMP_TYPE_PICKABLE_BUTTON            (gimp_pickable_button_get_type ())
+#define GIMP_PICKABLE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PICKABLE_BUTTON, GimpPickableButton))
+#define GIMP_PICKABLE_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PICKABLE_BUTTON, GimpPickableButtonClass))
+#define GIMP_IS_PICKABLE_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PICKABLE_BUTTON))
+#define GIMP_IS_PICKABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PICKABLE_BUTTON))
+#define GIMP_PICKABLE_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PICKABLE_BUTTON, GimpPickableButtonClass))
+
+
+typedef struct _GimpPickableButtonPrivate GimpPickableButtonPrivate;
+typedef struct _GimpPickableButtonClass   GimpPickableButtonClass;
+
+struct _GimpPickableButton
+{
+  GimpButton                 parent_instance;
+
+  GimpPickableButtonPrivate *private;
+};
+
+struct _GimpPickableButtonClass
+{
+  GimpButtonClass  parent_class;
+};
+
+
+GType          gimp_pickable_button_get_type     (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_pickable_button_new          (GimpContext        *context,
+                                                  gint                view_size,
+                                                  gint                view_border_width);
+
+GimpPickable * gimp_pickable_button_get_pickable (GimpPickableButton *button);
+void           gimp_pickable_button_set_pickable (GimpPickableButton *button,
+                                                  GimpPickable       *pickable);
+
+
+#endif /* __GIMP_PICKABLE_BUTTON_H__ */
diff --git a/app/widgets/gimppickablepopup.c b/app/widgets/gimppickablepopup.c
new file mode 100644
index 0000000..c0e0161
--- /dev/null
+++ b/app/widgets/gimppickablepopup.c
@@ -0,0 +1,436 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppickablepopup.c
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimppickable.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimppickablepopup.h"
+#include "gimpviewrenderer.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT,
+  PROP_PICKABLE,
+  PROP_VIEW_SIZE,
+  PROP_VIEW_BORDER_WIDTH
+};
+
+struct _GimpPickablePopupPrivate
+{
+  GimpPickable *pickable;
+  GimpContext  *context;
+
+  gint          view_size;
+  gint          view_border_width;
+
+  GtkWidget    *image_view;
+  GtkWidget    *layer_view;
+  GtkWidget    *channel_view;
+  GtkWidget    *layer_label;
+};
+
+
+static void   gimp_pickable_popup_constructed    (GObject           *object);
+static void   gimp_pickable_popup_finalize       (GObject           *object);
+static void   gimp_pickable_popup_set_property   (GObject           *object,
+                                                  guint              property_id,
+                                                  const GValue      *value,
+                                                  GParamSpec        *pspec);
+static void   gimp_pickable_popup_get_property   (GObject           *object,
+                                                  guint              property_id,
+                                                  GValue            *value,
+                                                  GParamSpec        *pspec);
+
+static void   gimp_pickable_popup_image_changed  (GimpContext       *context,
+                                                  GimpImage         *image,
+                                                  GimpPickablePopup *popup);
+static void   gimp_pickable_popup_item_activate  (GimpContainerView *view,
+                                                  GimpPickable      *pickable,
+                                                  gpointer           unused,
+                                                  GimpPickablePopup *popup);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPickablePopup, gimp_pickable_popup,
+                            GIMP_TYPE_POPUP)
+
+#define parent_class gimp_pickable_popup_parent_class
+
+
+static void
+gimp_pickable_popup_class_init (GimpPickablePopupClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_pickable_popup_constructed;
+  object_class->finalize     = gimp_pickable_popup_finalize;
+  object_class->get_property = gimp_pickable_popup_get_property;
+  object_class->set_property = gimp_pickable_popup_set_property;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PICKABLE,
+                                   g_param_spec_object ("pickable",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_PICKABLE,
+                                                        GIMP_PARAM_READABLE));
+
+  g_object_class_install_property (object_class, PROP_VIEW_SIZE,
+                                   g_param_spec_int ("view-size",
+                                                     NULL, NULL,
+                                                     1, GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
+                                                     GIMP_VIEW_SIZE_MEDIUM,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_VIEW_BORDER_WIDTH,
+                                   g_param_spec_int ("view-border-width",
+                                                     NULL, NULL,
+                                                     0,
+                                                     GIMP_VIEW_MAX_BORDER_WIDTH,
+                                                     1,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_pickable_popup_init (GimpPickablePopup *popup)
+{
+  popup->priv = gimp_pickable_popup_get_instance_private (popup);
+
+  popup->priv->view_size         = GIMP_VIEW_SIZE_SMALL;
+  popup->priv->view_border_width = 1;
+
+  gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
+}
+
+static void
+gimp_pickable_popup_constructed (GObject *object)
+{
+  GimpPickablePopup *popup = GIMP_PICKABLE_POPUP (object);
+  GtkWidget         *frame;
+  GtkWidget         *hbox;
+  GtkWidget         *vbox;
+  GtkWidget         *label;
+  GtkWidget         *notebook;
+  GimpImage         *image;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_CONTEXT (popup->priv->context));
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (popup), frame);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+  gtk_widget_show (hbox);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  label = gtk_label_new (_("Images"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  popup->priv->image_view =
+    gimp_container_tree_view_new (popup->priv->context->gimp->images,
+                                  popup->priv->context,
+                                  popup->priv->view_size,
+                                  popup->priv->view_border_width);
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (popup->priv->image_view),
+                                       4 * (popup->priv->view_size +
+                                            2 * popup->priv->view_border_width),
+                                       4 * (popup->priv->view_size +
+                                            2 * popup->priv->view_border_width));
+  gtk_box_pack_start (GTK_BOX (vbox), popup->priv->image_view, TRUE, TRUE, 0);
+  gtk_widget_show (popup->priv->image_view);
+
+  g_signal_connect_object (popup->priv->image_view, "activate-item",
+                           G_CALLBACK (gimp_pickable_popup_item_activate),
+                           G_OBJECT (popup), 0);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  popup->priv->layer_label = label =
+    gtk_label_new (_("Select an image in the left pane"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  notebook = gtk_notebook_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
+  gtk_widget_show (notebook);
+
+  popup->priv->layer_view =
+    gimp_container_tree_view_new (NULL,
+                                  popup->priv->context,
+                                  popup->priv->view_size,
+                                  popup->priv->view_border_width);
+  gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (GIMP_CONTAINER_TREE_VIEW (popup->priv->layer_view)->view),
+                                    TRUE);
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (popup->priv->layer_view),
+                                       4 * (popup->priv->view_size +
+                                            2 * popup->priv->view_border_width),
+                                       4 * (popup->priv->view_size +
+                                            2 * popup->priv->view_border_width));
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                            popup->priv->layer_view,
+                            gtk_label_new (_("Layers")));
+  gtk_widget_show (popup->priv->layer_view);
+
+  g_signal_connect_object (popup->priv->layer_view, "activate-item",
+                           G_CALLBACK (gimp_pickable_popup_item_activate),
+                           G_OBJECT (popup), 0);
+
+  popup->priv->channel_view =
+    gimp_container_tree_view_new (NULL,
+                                  popup->priv->context,
+                                  popup->priv->view_size,
+                                  popup->priv->view_border_width);
+  gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (popup->priv->channel_view),
+                                       4 * (popup->priv->view_size +
+                                            2 * popup->priv->view_border_width),
+                                       4 * (popup->priv->view_size +
+                                            2 * popup->priv->view_border_width));
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                            popup->priv->channel_view,
+                            gtk_label_new (_("Channels")));
+  gtk_widget_show (popup->priv->channel_view);
+
+  g_signal_connect_object (popup->priv->channel_view, "activate-item",
+                           G_CALLBACK (gimp_pickable_popup_item_activate),
+                           G_OBJECT (popup), 0);
+
+  g_signal_connect_object (popup->priv->context, "image-changed",
+                           G_CALLBACK (gimp_pickable_popup_image_changed),
+                           G_OBJECT (popup), 0);
+
+  image = gimp_context_get_image (popup->priv->context);
+  gimp_pickable_popup_image_changed (popup->priv->context, image, popup);
+}
+
+static void
+gimp_pickable_popup_finalize (GObject *object)
+{
+  GimpPickablePopup *popup = GIMP_PICKABLE_POPUP (object);
+
+  g_clear_object (&popup->priv->pickable);
+  g_clear_object (&popup->priv->context);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_pickable_popup_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpPickablePopup *popup = GIMP_PICKABLE_POPUP (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      if (popup->priv->context)
+        g_object_unref (popup->priv->context);
+      popup->priv->context = g_value_dup_object (value);
+      break;
+
+    case PROP_VIEW_SIZE:
+      popup->priv->view_size = g_value_get_int (value);
+      break;
+
+    case PROP_VIEW_BORDER_WIDTH:
+      popup->priv->view_border_width = g_value_get_int (value);
+      break;
+
+    case PROP_PICKABLE:
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pickable_popup_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  GimpPickablePopup *popup = GIMP_PICKABLE_POPUP (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, popup->priv->context);
+      break;
+
+    case PROP_PICKABLE:
+      g_value_set_object (value, popup->priv->pickable);
+      break;
+
+    case PROP_VIEW_SIZE:
+      g_value_set_int (value, popup->priv->view_size);
+      break;
+
+    case PROP_VIEW_BORDER_WIDTH:
+      g_value_set_int (value, popup->priv->view_border_width);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_pickable_popup_new (GimpContext *context,
+                         gint         view_size,
+                         gint         view_border_width)
+{
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size >  0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_POPUP_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+
+  return g_object_new (GIMP_TYPE_PICKABLE_POPUP,
+                       "type",              GTK_WINDOW_POPUP,
+                       "context",           context,
+                       "view-size",         view_size,
+                       "view-border-width", view_border_width,
+                       NULL);
+}
+
+GimpPickable *
+gimp_pickable_popup_get_pickable (GimpPickablePopup *popup)
+{
+  GtkWidget    *focus;
+  GimpPickable *pickable = NULL;
+
+  g_return_val_if_fail (GIMP_IS_PICKABLE_POPUP (popup), NULL);
+
+  focus = gtk_window_get_focus (GTK_WINDOW (popup));
+
+  if (focus && gtk_widget_is_ancestor (focus, popup->priv->image_view))
+    {
+      pickable = GIMP_PICKABLE (gimp_context_get_image (popup->priv->context));
+    }
+  else if (focus && gtk_widget_is_ancestor (focus, popup->priv->layer_view))
+    {
+      GList *selected;
+
+      if (gimp_container_view_get_selected (GIMP_CONTAINER_VIEW (popup->priv->layer_view),
+                                            &selected))
+        {
+          pickable = selected->data;
+          g_list_free (selected);
+        }
+    }
+  else if (focus && gtk_widget_is_ancestor (focus, popup->priv->channel_view))
+    {
+      GList *selected;
+
+      if (gimp_container_view_get_selected (GIMP_CONTAINER_VIEW (popup->priv->channel_view),
+                                            &selected))
+        {
+          pickable = selected->data;
+          g_list_free (selected);
+        }
+    }
+
+  return pickable;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_pickable_popup_image_changed (GimpContext       *context,
+                                   GimpImage         *image,
+                                   GimpPickablePopup *popup)
+{
+  GimpContainer *layers   = NULL;
+  GimpContainer *channels = NULL;
+
+  if (image)
+    {
+      gchar *desc;
+
+      layers   = gimp_image_get_layers (image);
+      channels = gimp_image_get_channels (image);
+
+      desc = gimp_viewable_get_description (GIMP_VIEWABLE (image), NULL);
+      gtk_label_set_text (GTK_LABEL (popup->priv->layer_label), desc);
+      g_free (desc);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (popup->priv->layer_label),
+                          _("Select an image in the left pane"));
+    }
+
+  gimp_container_view_set_container (GIMP_CONTAINER_VIEW (popup->priv->layer_view),
+                                     layers);
+  gimp_container_view_set_container (GIMP_CONTAINER_VIEW (popup->priv->channel_view),
+                                     channels);
+}
+
+static void
+gimp_pickable_popup_item_activate (GimpContainerView *view,
+                                   GimpPickable      *pickable,
+                                   gpointer           unused,
+                                   GimpPickablePopup *popup)
+{
+  g_signal_emit_by_name (popup, "confirm");
+}
diff --git a/app/widgets/gimppickablepopup.h b/app/widgets/gimppickablepopup.h
new file mode 100644
index 0000000..554f3fe
--- /dev/null
+++ b/app/widgets/gimppickablepopup.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppickablepopup.h
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PICKABLE_POPUP_H__
+#define __GIMP_PICKABLE_POPUP_H__
+
+
+#include "gimppopup.h"
+
+
+#define GIMP_TYPE_PICKABLE_POPUP            (gimp_pickable_popup_get_type ())
+#define GIMP_PICKABLE_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PICKABLE_POPUP, GimpPickablePopup))
+#define GIMP_PICKABLE_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PICKABLE_POPUP, GimpPickablePopupClass))
+#define GIMP_IS_PICKABLE_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PICKABLE_POPUP))
+#define GIMP_IS_PICKABLE_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PICKABLE_POPUP))
+#define GIMP_PICKABLE_POPUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PICKABLE_POPUP, GimpPickablePopupClass))
+
+
+typedef struct _GimpPickablePopupPrivate GimpPickablePopupPrivate;
+typedef struct _GimpPickablePopupClass   GimpPickablePopupClass;
+
+struct _GimpPickablePopup
+{
+  GimpPopup                 parent_instance;
+
+  GimpPickablePopupPrivate *priv;
+};
+
+struct _GimpPickablePopupClass
+{
+  GimpPopupClass  parent_instance;
+};
+
+
+GType          gimp_pickable_popup_get_type     (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_pickable_popup_new          (GimpContext       *context,
+                                                 gint               view_size,
+                                                 gint               view_border_width);
+
+GimpPickable * gimp_pickable_popup_get_pickable (GimpPickablePopup *popup);
+
+
+#endif  /*  __GIMP_PICKABLE_POPUP_H__  */
diff --git a/app/widgets/gimppivotselector.c b/app/widgets/gimppivotselector.c
new file mode 100644
index 0000000..598513a
--- /dev/null
+++ b/app/widgets/gimppivotselector.c
@@ -0,0 +1,547 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppivotselector.c
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimppivotselector.h"
+
+
+#define EPSILON 1e-6
+
+
+enum
+{
+  CHANGED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_LEFT,
+  PROP_TOP,
+  PROP_RIGHT,
+  PROP_BOTTOM,
+  PROP_X,
+  PROP_Y
+};
+
+
+struct _GimpPivotSelectorPrivate
+{
+  gdouble    left;
+  gdouble    top;
+  gdouble    right;
+  gdouble    bottom;
+
+  gdouble    x;
+  gdouble    y;
+
+  GtkWidget *buttons[9];
+  GtkWidget *active_button;
+};
+
+
+/*  local function prototypes  */
+
+static void        gimp_pivot_selector_set_property         (GObject           *object,
+                                                             guint              property_id,
+                                                             const GValue      *value,
+                                                             GParamSpec        *pspec);
+static void        gimp_pivot_selector_get_property         (GObject           *object,
+                                                             guint              property_id,
+                                                             GValue            *value,
+                                                             GParamSpec        *pspec);
+
+static void        gimp_pivot_selector_button_toggled       (GtkToggleButton   *button,
+                                                             GimpPivotSelector *selector);
+
+static GtkWidget * gimp_pivot_selector_position_to_button   (GimpPivotSelector *selector,
+                                                             gdouble            x,
+                                                             gdouble            y);
+static void        gimp_pivot_selector_button_to_position   (GimpPivotSelector *selector,
+                                                             GtkWidget         *button,
+                                                             gdouble           *x,
+                                                             gdouble           *y);
+
+static void        gimp_pivot_selector_update_active_button (GimpPivotSelector *selector);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPivotSelector, gimp_pivot_selector, GTK_TYPE_TABLE)
+
+#define parent_class gimp_pivot_selector_parent_class
+
+static guint pivot_selector_signals[LAST_SIGNAL];
+
+
+/*  private functions  */
+
+
+static void
+gimp_pivot_selector_class_init (GimpPivotSelectorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  pivot_selector_signals[CHANGED] =
+    g_signal_new ("changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpPivotSelectorClass, changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->get_property = gimp_pivot_selector_get_property;
+  object_class->set_property = gimp_pivot_selector_set_property;
+
+  g_object_class_install_property (object_class, PROP_LEFT,
+                                   g_param_spec_double ("left",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_TOP,
+                                   g_param_spec_double ("top",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RIGHT,
+                                   g_param_spec_double ("right",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_BOTTOM,
+                                   g_param_spec_double ("bottom",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_X,
+                                   g_param_spec_double ("x",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_Y,
+                                   g_param_spec_double ("y",
+                                                        NULL, NULL,
+                                                        -G_MAXDOUBLE,
+                                                        +G_MAXDOUBLE,
+                                                        0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_pivot_selector_init (GimpPivotSelector *selector)
+{
+  GtkTable *table = GTK_TABLE (selector);
+  gint      i;
+
+  selector->priv = gimp_pivot_selector_get_instance_private (selector);
+
+  gtk_table_resize (table, 3, 3);
+  gtk_table_set_homogeneous (table, TRUE);
+
+  for (i = 0; i < 9; i++)
+    {
+      static const gchar *icon_names[9] = {
+        GIMP_ICON_PIVOT_NORTH_WEST,
+        GIMP_ICON_PIVOT_NORTH,
+        GIMP_ICON_PIVOT_NORTH_EAST,
+
+        GIMP_ICON_PIVOT_WEST,
+        GIMP_ICON_PIVOT_CENTER,
+        GIMP_ICON_PIVOT_EAST,
+
+        GIMP_ICON_PIVOT_SOUTH_WEST,
+        GIMP_ICON_PIVOT_SOUTH,
+        GIMP_ICON_PIVOT_SOUTH_EAST
+      };
+
+      GtkWidget *button;
+      GtkWidget *image;
+      gint       x, y;
+
+      x = i % 3;
+      y = i / 3;
+
+      button = gtk_toggle_button_new ();
+      gtk_widget_set_can_focus (button, FALSE);
+      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_table_attach_defaults (table, button,
+                                 x, x + 1, y, y + 1);
+      gtk_widget_show (button);
+
+      selector->priv->buttons[i] = button;
+
+      g_signal_connect (button, "toggled",
+                        G_CALLBACK (gimp_pivot_selector_button_toggled),
+                        selector);
+
+      image = gtk_image_new_from_icon_name (icon_names[i], GTK_ICON_SIZE_MENU);
+      gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+    }
+}
+
+static void
+gimp_pivot_selector_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GimpPivotSelector *selector = GIMP_PIVOT_SELECTOR (object);
+
+  switch (property_id)
+    {
+    case PROP_LEFT:
+      gimp_pivot_selector_set_bounds (selector,
+                                      g_value_get_double (value),
+                                      selector->priv->top,
+                                      selector->priv->right,
+                                      selector->priv->bottom);
+      break;
+    case PROP_TOP:
+      gimp_pivot_selector_set_bounds (selector,
+                                      selector->priv->left,
+                                      g_value_get_double (value),
+                                      selector->priv->right,
+                                      selector->priv->bottom);
+      break;
+    case PROP_RIGHT:
+      gimp_pivot_selector_set_bounds (selector,
+                                      selector->priv->left,
+                                      selector->priv->top,
+                                      g_value_get_double (value),
+                                      selector->priv->bottom);
+      break;
+    case PROP_BOTTOM:
+      gimp_pivot_selector_set_bounds (selector,
+                                      selector->priv->left,
+                                      selector->priv->top,
+                                      selector->priv->right,
+                                      g_value_get_double (value));
+      break;
+
+    case PROP_X:
+      gimp_pivot_selector_set_position (selector,
+                                        g_value_get_double (value),
+                                        selector->priv->y);
+      break;
+    case PROP_Y:
+      gimp_pivot_selector_set_position (selector,
+                                        selector->priv->x,
+                                        g_value_get_double (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pivot_selector_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpPivotSelector *selector = GIMP_PIVOT_SELECTOR (object);
+
+  switch (property_id)
+    {
+    case PROP_LEFT:
+      g_value_set_double (value, selector->priv->left);
+      break;
+    case PROP_TOP:
+      g_value_set_double (value, selector->priv->top);
+      break;
+    case PROP_RIGHT:
+      g_value_set_double (value, selector->priv->right);
+      break;
+    case PROP_BOTTOM:
+      g_value_set_double (value, selector->priv->bottom);
+      break;
+
+    case PROP_X:
+      g_value_set_double (value, selector->priv->x);
+      break;
+    case PROP_Y:
+      g_value_set_double (value, selector->priv->y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_pivot_selector_button_toggled (GtkToggleButton   *button,
+                                    GimpPivotSelector *selector)
+{
+  if (GTK_WIDGET (button) == selector->priv->active_button)
+    {
+      gtk_toggle_button_set_active (button, TRUE);
+    }
+  else
+    {
+      gdouble x, y;
+
+      gimp_pivot_selector_button_to_position (selector, GTK_WIDGET (button),
+                                              &x, &y);
+
+      gimp_pivot_selector_set_position (selector, x, y);
+    }
+}
+
+static GtkWidget *
+gimp_pivot_selector_position_to_button (GimpPivotSelector *selector,
+                                        gdouble            x,
+                                        gdouble            y)
+{
+  gint ix;
+  gint iy;
+
+  if (selector->priv->left == selector->priv->right ||
+      selector->priv->top  == selector->priv->bottom)
+    {
+      return NULL;
+    }
+
+  x = 2.0 * (x                      - selector->priv->left) /
+            (selector->priv->right  - selector->priv->left);
+  y = 2.0 * (y                      - selector->priv->top)  /
+            (selector->priv->bottom - selector->priv->top);
+
+  ix = RINT (x);
+  iy = RINT (y);
+
+  if (fabs (x - ix) > EPSILON || fabs (y - iy) > EPSILON)
+    return NULL;
+
+  if (ix < 0 || ix > 2 || iy < 0 || iy > 2)
+    return NULL;
+
+  return selector->priv->buttons[3 * iy + ix];
+}
+
+static void
+gimp_pivot_selector_button_to_position (GimpPivotSelector *selector,
+                                        GtkWidget         *button,
+                                        gdouble           *x,
+                                        gdouble           *y)
+{
+  gint i;
+
+  for (i = 0; selector->priv->buttons[i] != button; i++);
+
+  *x = selector->priv->left +
+       (selector->priv->right  - selector->priv->left) * (i % 3) / 2.0;
+  *y = selector->priv->top +
+       (selector->priv->bottom - selector->priv->top)  * (i / 3) / 2.0;
+}
+
+static void
+gimp_pivot_selector_update_active_button (GimpPivotSelector *selector)
+{
+  GtkWidget *button;
+
+  button = gimp_pivot_selector_position_to_button (selector,
+                                                   selector->priv->x,
+                                                   selector->priv->y);
+
+  if (button != selector->priv->active_button)
+    {
+      if (selector->priv->active_button)
+        {
+          g_signal_handlers_block_by_func (
+            selector->priv->active_button,
+            gimp_pivot_selector_button_toggled,
+            selector);
+
+          gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON (selector->priv->active_button), FALSE);
+
+          g_signal_handlers_unblock_by_func (
+            selector->priv->active_button,
+            gimp_pivot_selector_button_toggled,
+            selector);
+        }
+
+      selector->priv->active_button = button;
+
+      if (selector->priv->active_button)
+        {
+          g_signal_handlers_block_by_func (
+            selector->priv->active_button,
+            gimp_pivot_selector_button_toggled,
+            selector);
+
+          gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON (selector->priv->active_button), TRUE);
+
+          g_signal_handlers_unblock_by_func (
+            selector->priv->active_button,
+            gimp_pivot_selector_button_toggled,
+            selector);
+        }
+    }
+}
+
+
+/*  public functions  */
+
+
+GtkWidget *
+gimp_pivot_selector_new (gdouble left,
+                         gdouble top,
+                         gdouble right,
+                         gdouble bottom)
+{
+  return g_object_new (GIMP_TYPE_PIVOT_SELECTOR,
+
+                       "left",   left,
+                       "top",    top,
+                       "right",  right,
+                       "bottom", bottom,
+
+                       "x",      (left + right)  / 2.0,
+                       "y",      (top  + bottom) / 2.0,
+
+                       NULL);
+}
+
+void
+gimp_pivot_selector_set_bounds (GimpPivotSelector *selector,
+                                gdouble            left,
+                                gdouble            top,
+                                gdouble            right,
+                                gdouble            bottom)
+{
+  g_return_if_fail (GIMP_IS_PIVOT_SELECTOR (selector));
+
+  if (left  != selector->priv->left  || top    != selector->priv->top ||
+      right != selector->priv->right || bottom != selector->priv->bottom)
+    {
+      g_object_freeze_notify (G_OBJECT (selector));
+
+      selector->priv->left   = left;
+      selector->priv->top    = top;
+      selector->priv->right  = right;
+      selector->priv->bottom = bottom;
+
+      gimp_pivot_selector_update_active_button (selector);
+
+      if (left != selector->priv->left)
+        g_object_notify (G_OBJECT (selector), "left");
+      if (top != selector->priv->top)
+        g_object_notify (G_OBJECT (selector), "top");
+      if (right != selector->priv->right)
+        g_object_notify (G_OBJECT (selector), "right");
+      if (left != selector->priv->bottom)
+        g_object_notify (G_OBJECT (selector), "bottom");
+
+      g_object_thaw_notify (G_OBJECT (selector));
+    }
+}
+
+void
+gimp_pivot_selector_get_bounds (GimpPivotSelector *selector,
+                                gdouble           *left,
+                                gdouble           *top,
+                                gdouble           *right,
+                                gdouble           *bottom)
+{
+  g_return_if_fail (GIMP_IS_PIVOT_SELECTOR (selector));
+
+  if (left)   *left   = selector->priv->left;
+  if (top)    *top    = selector->priv->top;
+  if (right)  *right  = selector->priv->right;
+  if (bottom) *bottom = selector->priv->bottom;
+}
+
+void
+gimp_pivot_selector_set_position (GimpPivotSelector *selector,
+                                  gdouble            x,
+                                  gdouble            y)
+{
+  g_return_if_fail (GIMP_IS_PIVOT_SELECTOR (selector));
+
+  if (x != selector->priv->x || y != selector->priv->y)
+    {
+      g_object_freeze_notify (G_OBJECT (selector));
+
+      selector->priv->x = x;
+      selector->priv->y = y;
+
+      gimp_pivot_selector_update_active_button (selector);
+
+      g_signal_emit (selector, pivot_selector_signals[CHANGED], 0);
+
+      if (x != selector->priv->x)
+        g_object_notify (G_OBJECT (selector), "x");
+      if (y != selector->priv->y)
+        g_object_notify (G_OBJECT (selector), "y");
+
+      g_object_thaw_notify (G_OBJECT (selector));
+    }
+}
+
+void
+gimp_pivot_selector_get_position (GimpPivotSelector *selector,
+                                  gdouble           *x,
+                                  gdouble           *y)
+{
+  g_return_if_fail (GIMP_IS_PIVOT_SELECTOR (selector));
+
+  if (x) *x = selector->priv->x;
+  if (y) *y = selector->priv->y;
+}
diff --git a/app/widgets/gimppivotselector.h b/app/widgets/gimppivotselector.h
new file mode 100644
index 0000000..72449eb
--- /dev/null
+++ b/app/widgets/gimppivotselector.h
@@ -0,0 +1,78 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppivotselector.h
+ * Copyright (C) 2019 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PIVOT_SELECTOR_H__
+#define __GIMP_PIVOT_SELECTOR_H__
+
+
+#define GIMP_TYPE_PIVOT_SELECTOR            (gimp_pivot_selector_get_type ())
+#define GIMP_PIVOT_SELECTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PIVOT_SELECTOR, GimpPivotSelector))
+#define GIMP_PIVOT_SELECTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PIVOT_SELECTOR, GimpPivotSelectorClass))
+#define GIMP_IS_PIVOT_SELECTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_PIVOT_SELECTOR))
+#define GIMP_IS_PIVOT_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PIVOT_SELECTOR))
+#define GIMP_PIVOT_SELECTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PIVOT_SELECTOR, GimpPivotSelectorClass))
+
+
+typedef struct _GimpPivotSelectorPrivate GimpPivotSelectorPrivate;
+typedef struct _GimpPivotSelectorClass   GimpPivotSelectorClass;
+
+struct _GimpPivotSelector
+{
+  GtkTable                parent_instance;
+
+  GimpPivotSelectorPrivate *priv;
+};
+
+struct _GimpPivotSelectorClass
+{
+  GtkTableClass  parent_class;
+
+  /*  signals  */
+  void (* changed) (GimpPivotSelector *selector);
+};
+
+
+GType       gimp_pivot_selector_get_type     (void) G_GNUC_CONST;
+
+GtkWidget * gimp_pivot_selector_new          (gdouble            left,
+                                              gdouble            top,
+                                              gdouble            right,
+                                              gdouble            bottom);
+
+void        gimp_pivot_selector_set_position (GimpPivotSelector *selector,
+                                              gdouble            x,
+                                              gdouble            y);
+void        gimp_pivot_selector_get_position (GimpPivotSelector *selector,
+                                              gdouble           *x,
+                                              gdouble           *y);
+
+void        gimp_pivot_selector_set_bounds   (GimpPivotSelector *selector,
+                                              gdouble            left,
+                                              gdouble            top,
+                                              gdouble            right,
+                                              gdouble            bottom);
+void        gimp_pivot_selector_get_bounds   (GimpPivotSelector *selector,
+                                              gdouble           *left,
+                                              gdouble           *top,
+                                              gdouble           *right,
+                                              gdouble           *bottom);
+
+
+#endif /* __GIMP_PIVOT_SELECTOR_H__ */
diff --git a/app/widgets/gimppixbuf.c b/app/widgets/gimppixbuf.c
new file mode 100644
index 0000000..0c3f88e
--- /dev/null
+++ b/app/widgets/gimppixbuf.c
@@ -0,0 +1,150 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppixbuf.c
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimppixbuf.h"
+
+
+/*  local function prototypes  */
+
+static gint   gimp_pixbuf_format_compare (GdkPixbufFormat *a,
+                                          GdkPixbufFormat *b);
+
+
+/*  public functions  */
+
+GSList *
+gimp_pixbuf_get_formats (void)
+{
+  return g_slist_sort (gdk_pixbuf_get_formats (),
+                       (GCompareFunc) gimp_pixbuf_format_compare);
+}
+
+void
+gimp_pixbuf_targets_add (GtkTargetList *target_list,
+                         guint          info,
+                         gboolean       writable)
+{
+  GSList *formats;
+  GSList *list;
+
+  g_return_if_fail (target_list != NULL);
+
+  formats = gimp_pixbuf_get_formats ();
+
+  for (list = formats; list; list = g_slist_next (list))
+    {
+      GdkPixbufFormat  *format = list->data;
+      gchar           **mime_types;
+      gchar           **type;
+
+      if (writable && ! gdk_pixbuf_format_is_writable (format))
+        continue;
+
+      mime_types = gdk_pixbuf_format_get_mime_types (format);
+
+      for (type = mime_types; *type; type++)
+        {
+          /*  skip Windows ICO as writable format  */
+          if (writable && strcmp (*type, "image/x-icon") == 0)
+            continue;
+
+          gtk_target_list_add (target_list,
+                               gdk_atom_intern (*type, FALSE), 0, info);
+
+        }
+
+      g_strfreev (mime_types);
+    }
+
+  g_slist_free (formats);
+}
+
+void
+gimp_pixbuf_targets_remove (GtkTargetList *target_list)
+{
+  GSList *formats;
+  GSList *list;
+
+  g_return_if_fail (target_list != NULL);
+
+  formats = gimp_pixbuf_get_formats ();
+
+  for (list = formats; list; list = g_slist_next (list))
+    {
+      GdkPixbufFormat  *format = list->data;
+      gchar           **mime_types;
+      gchar           **type;
+
+      mime_types = gdk_pixbuf_format_get_mime_types (format);
+
+      for (type = mime_types; *type; type++)
+        {
+          gtk_target_list_remove (target_list,
+                                  gdk_atom_intern (*type, FALSE));
+        }
+
+      g_strfreev (mime_types);
+    }
+
+  g_slist_free (formats);
+}
+
+
+/*  private functions  */
+
+static gint
+gimp_pixbuf_format_compare (GdkPixbufFormat *a,
+                            GdkPixbufFormat *b)
+{
+  gchar *a_name = gdk_pixbuf_format_get_name (a);
+  gchar *b_name = gdk_pixbuf_format_get_name (b);
+  gint   retval = 0;
+
+  /*  move PNG to the front of the list  */
+  if (strcmp (a_name, "png") == 0)
+    retval = -1;
+  else if (strcmp (b_name, "png") == 0)
+    retval = 1;
+
+  /*  move JPEG to the end of the list  */
+  else if (strcmp (a_name, "jpeg") == 0)
+    retval = 1;
+  else if (strcmp (b_name, "jpeg") == 0)
+    retval = -1;
+
+  /*  move GIF to the end of the list  */
+  else if (strcmp (a_name, "gif") == 0)
+    retval = 1;
+  else if (strcmp (b_name, "gif") == 0)
+    retval = -1;
+
+  g_free (a_name);
+  g_free (b_name);
+
+  return retval;
+}
diff --git a/app/widgets/gimppixbuf.h b/app/widgets/gimppixbuf.h
new file mode 100644
index 0000000..e42c4c1
--- /dev/null
+++ b/app/widgets/gimppixbuf.h
@@ -0,0 +1,33 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppixbuf.h
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_PIXBUF_H__
+#define __APP_GIMP_PIXBUF_H__
+
+
+GSList * gimp_pixbuf_get_formats (void);
+
+void     gimp_pixbuf_targets_add    (GtkTargetList *target_list,
+                                     guint          info,
+                                     gboolean       writable);
+void     gimp_pixbuf_targets_remove (GtkTargetList *target_list);
+
+
+#endif /* __APP_GIMP_PIXBUF_H__ */
diff --git a/app/widgets/gimppluginview.c b/app/widgets/gimppluginview.c
new file mode 100644
index 0000000..43058b3
--- /dev/null
+++ b/app/widgets/gimppluginview.c
@@ -0,0 +1,227 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginview.c
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "plug-in/gimppluginprocedure.h"
+
+#include "gimppluginview.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLUMN_FILE,
+  COLUMN_PATH,
+  N_COLUMNS
+};
+
+enum
+{
+  CHANGED,
+  LAST_SIGNAL
+};
+
+
+static void  gimp_plug_in_view_finalize          (GObject          *object);
+
+static void  gimp_plug_in_view_selection_changed (GtkTreeSelection *selection,
+                                                  GimpPlugInView   *view);
+
+
+G_DEFINE_TYPE (GimpPlugInView, gimp_plug_in_view, GTK_TYPE_TREE_VIEW)
+
+#define parent_class gimp_plug_in_view_parent_class
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_plug_in_view_class_init (GimpPlugInViewClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_plug_in_view_finalize;
+
+  klass->changed         = NULL;
+
+  view_signals[CHANGED] = g_signal_new ("changed",
+                                        G_TYPE_FROM_CLASS (klass),
+                                        G_SIGNAL_RUN_LAST,
+                                        G_STRUCT_OFFSET (GimpPlugInViewClass,
+                                                         changed),
+                                        NULL, NULL,
+                                        gimp_marshal_VOID__VOID,
+                                        G_TYPE_NONE, 0);
+}
+
+static void
+gimp_plug_in_view_init (GimpPlugInView *view)
+{
+  view->plug_in_hash = g_hash_table_new_full (g_file_hash,
+                                              (GEqualFunc) g_file_equal,
+                                              (GDestroyNotify) g_object_unref,
+                                              (GDestroyNotify) g_free);
+}
+
+static void
+gimp_plug_in_view_finalize (GObject *object)
+{
+  GimpPlugInView *view = GIMP_PLUG_IN_VIEW (object);
+
+  g_clear_pointer (&view->plug_in_hash, g_hash_table_unref);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GtkWidget *
+gimp_plug_in_view_new (GSList *procedures)
+{
+  GtkTreeView       *view;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer   *cell;
+  GtkListStore      *store;
+  GSList            *list;
+
+  store = gtk_list_store_new (N_COLUMNS,
+                              G_TYPE_FILE,    /* COLUMN_FILE */
+                              G_TYPE_STRING); /* COLUMN_PATH */
+
+  view = g_object_new (GIMP_TYPE_PLUG_IN_VIEW,
+                       "model", store,
+                       NULL);
+
+  g_object_unref (store);
+
+  for (list = procedures; list; list = g_slist_next (list))
+    {
+      GimpPlugInProcedure *proc = list->data;
+      GFile               *file = gimp_plug_in_procedure_get_file (proc);
+
+      if (! g_hash_table_lookup (GIMP_PLUG_IN_VIEW (view)->plug_in_hash, file))
+        {
+          GtkTreeIter  iter;
+          gchar       *path = gimp_file_get_config_path (file, NULL);
+
+          gtk_list_store_append (store, &iter);
+          gtk_list_store_set (store, &iter,
+                              COLUMN_FILE, file,
+                              COLUMN_PATH, path,
+                              -1);
+
+          g_free (path);
+
+          g_hash_table_insert (GIMP_PLUG_IN_VIEW (view)->plug_in_hash,
+                               g_object_ref (file),
+                               g_memdup (&iter, sizeof (GtkTreeIter)));
+        }
+    }
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_title (column, _("Plug-In"));
+  gtk_tree_view_column_set_expand (column, TRUE);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text", COLUMN_PATH,
+                                       NULL);
+
+  gtk_tree_view_append_column (view, column);
+
+  g_signal_connect (gtk_tree_view_get_selection (view), "changed",
+                    G_CALLBACK (gimp_plug_in_view_selection_changed),
+                    view);
+
+  return GTK_WIDGET (view);
+}
+
+gchar *
+gimp_plug_in_view_get_plug_in (GimpPlugInView *view)
+{
+  GtkTreeModel     *model;
+  GtkTreeSelection *selection;
+  GtkTreeIter       iter;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_VIEW (view), NULL);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    {
+      gchar *path;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_PATH,  &path,
+                          -1);
+
+      return path;
+    }
+
+  return NULL;
+}
+
+gboolean
+gimp_plug_in_view_set_plug_in (GimpPlugInView *view,
+                               const gchar    *path)
+{
+  GFile            *file;
+  GtkTreeIter      *iter;
+  GtkTreeSelection *selection;
+
+  g_return_val_if_fail (GIMP_IS_PLUG_IN_VIEW (view), FALSE);
+
+  file = gimp_file_new_for_config_path (path, NULL);
+
+  iter = g_hash_table_lookup (view->plug_in_hash, file);
+
+  g_object_unref (file);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+  if (iter)
+    {
+      gtk_tree_selection_select_iter (selection, iter);
+
+      return TRUE;
+    }
+
+  gtk_tree_selection_unselect_all (selection);
+
+  return FALSE;
+}
+
+static void
+gimp_plug_in_view_selection_changed (GtkTreeSelection *selection,
+                                     GimpPlugInView   *view)
+{
+  g_signal_emit (view, view_signals[CHANGED], 0);
+}
diff --git a/app/widgets/gimppluginview.h b/app/widgets/gimppluginview.h
new file mode 100644
index 0000000..887cdaf
--- /dev/null
+++ b/app/widgets/gimppluginview.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppluginview.h
+ * Copyright (C) 2017  Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2004  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PLUG_IN_VIEW_H__
+#define __GIMP_PLUG_IN_VIEW_H__
+
+
+#define GIMP_TYPE_PLUG_IN_VIEW            (gimp_plug_in_view_get_type ())
+#define GIMP_PLUG_IN_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PLUG_IN_VIEW, GimpPlugInView))
+#define GIMP_PLUG_IN_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PLUG_IN_VIEW, GimpPlugInViewClass))
+#define GIMP_IS_PLUG_IN_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PLUG_IN_VIEW))
+#define GIMP_IS_PLUG_IN_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PLUG_IN_VIEW))
+#define GIMP_PLUG_IN_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PLUG_IN_VIEW, GimpPlugInViewClass))
+
+
+typedef struct _GimpPlugInViewClass GimpPlugInViewClass;
+
+struct _GimpPlugInView
+{
+  GtkTreeView  parent_instance;
+
+  GHashTable  *plug_in_hash;
+};
+
+struct _GimpPlugInViewClass
+{
+  GtkTreeViewClass   parent_class;
+
+  void (* changed) (GimpPlugInView *view);
+};
+
+
+GType       gimp_plug_in_view_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_plug_in_view_new         (GSList         *procedures);
+
+gchar     * gimp_plug_in_view_get_plug_in (GimpPlugInView *view);
+gboolean    gimp_plug_in_view_set_plug_in (GimpPlugInView *view,
+                                           const gchar    *path);
+
+
+#endif  /*  __GIMP_PLUG_IN_VIEW_H__  */
diff --git a/app/widgets/gimppolar.c b/app/widgets/gimppolar.c
new file mode 100644
index 0000000..c621507
--- /dev/null
+++ b/app/widgets/gimppolar.c
@@ -0,0 +1,393 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppolar.c
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on code from the color-rotate plug-in
+ * Copyright (C) 1997-1999 Sven Anders (anderss@fmi.uni-passau.de)
+ *                         Based on code from Pavel Grinfeld (pavel@ml.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp-cairo.h"
+
+#include "gimppolar.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_ANGLE,
+  PROP_RADIUS
+};
+
+typedef enum
+{
+  POLAR_TARGET_NONE   = 0,
+  POLAR_TARGET_CIRCLE = 1 << 0
+} PolarTarget;
+
+
+struct _GimpPolarPrivate
+{
+  gdouble      angle;
+  gdouble      radius;
+
+  PolarTarget  target;
+};
+
+
+static void        gimp_polar_set_property         (GObject            *object,
+                                                    guint               property_id,
+                                                    const GValue       *value,
+                                                    GParamSpec         *pspec);
+static void        gimp_polar_get_property         (GObject            *object,
+                                                    guint               property_id,
+                                                    GValue             *value,
+                                                    GParamSpec         *pspec);
+
+static gboolean    gimp_polar_expose_event         (GtkWidget          *widget,
+                                                    GdkEventExpose     *event);
+static gboolean    gimp_polar_button_press_event   (GtkWidget          *widget,
+                                                    GdkEventButton     *bevent);
+static gboolean    gimp_polar_motion_notify_event  (GtkWidget          *widget,
+                                                    GdkEventMotion     *mevent);
+
+static void        gimp_polar_reset_target         (GimpCircle         *circle);
+
+static void        gimp_polar_set_target           (GimpPolar           *polar,
+                                                    PolarTarget          target);
+
+static void        gimp_polar_draw_circle          (cairo_t            *cr,
+                                                    gint                size,
+                                                    gdouble             angle,
+                                                    gdouble             radius,
+                                                    PolarTarget         highlight);
+
+static gdouble     gimp_polar_normalize_angle      (gdouble             angle);
+static gdouble     gimp_polar_get_angle_distance   (gdouble             alpha,
+                                                    gdouble             beta);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPolar, gimp_polar, GIMP_TYPE_CIRCLE)
+
+#define parent_class gimp_polar_parent_class
+
+
+static void
+gimp_polar_class_init (GimpPolarClass *klass)
+{
+  GObjectClass    *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass  *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpCircleClass *circle_class = GIMP_CIRCLE_CLASS (klass);
+
+  object_class->get_property         = gimp_polar_get_property;
+  object_class->set_property         = gimp_polar_set_property;
+
+  widget_class->expose_event         = gimp_polar_expose_event;
+  widget_class->button_press_event   = gimp_polar_button_press_event;
+  widget_class->motion_notify_event  = gimp_polar_motion_notify_event;
+
+  circle_class->reset_target         = gimp_polar_reset_target;
+
+  g_object_class_install_property (object_class, PROP_ANGLE,
+                                   g_param_spec_double ("angle",
+                                                        NULL, NULL,
+                                                        0.0, 2 * G_PI, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RADIUS,
+                                   g_param_spec_double ("radius",
+                                                        NULL, NULL,
+                                                        0.0, 1.0, 0.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_polar_init (GimpPolar *polar)
+{
+  polar->priv = gimp_polar_get_instance_private (polar);
+}
+
+static void
+gimp_polar_set_property (GObject      *object,
+                         guint         property_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GimpPolar *polar = GIMP_POLAR (object);
+
+  switch (property_id)
+    {
+    case PROP_ANGLE:
+      polar->priv->angle = g_value_get_double (value);
+      gtk_widget_queue_draw (GTK_WIDGET (polar));
+      break;
+
+    case PROP_RADIUS:
+      polar->priv->radius = g_value_get_double (value);
+      gtk_widget_queue_draw (GTK_WIDGET (polar));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_polar_get_property (GObject    *object,
+                         guint       property_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GimpPolar *polar = GIMP_POLAR (object);
+
+  switch (property_id)
+    {
+    case PROP_ANGLE:
+      g_value_set_double (value, polar->priv->angle);
+      break;
+
+    case PROP_RADIUS:
+      g_value_set_double (value, polar->priv->radius);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_polar_expose_event (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  GimpPolar *polar = GIMP_POLAR (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+  if (gtk_widget_is_drawable (widget))
+    {
+      GtkAllocation  allocation;
+      gint           size;
+      cairo_t       *cr;
+
+      g_object_get (widget,
+                    "size", &size,
+                    NULL);
+
+      cr = gdk_cairo_create (event->window);
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      cairo_translate (cr,
+                       (gdouble) allocation.x + (allocation.width  - size) / 2.0,
+                       (gdouble) allocation.y + (allocation.height - size) / 2.0);
+
+      gimp_polar_draw_circle (cr, size,
+                              polar->priv->angle, polar->priv->radius,
+                              polar->priv->target);
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_polar_button_press_event (GtkWidget      *widget,
+                               GdkEventButton *bevent)
+{
+  GimpPolar *polar = GIMP_POLAR (widget);
+
+  if (bevent->type == GDK_BUTTON_PRESS &&
+      bevent->button == 1              &&
+      polar->priv->target != POLAR_TARGET_NONE)
+    {
+      gdouble angle;
+      gdouble radius;
+
+      GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, bevent);
+
+      angle = _gimp_circle_get_angle_and_distance (GIMP_CIRCLE (polar),
+                                                   bevent->x, bevent->y,
+                                                   &radius);
+      radius = MIN (radius, 1.0);
+
+      g_object_set (polar,
+                    "angle",  angle,
+                    "radius", radius,
+                    NULL);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_polar_motion_notify_event (GtkWidget      *widget,
+                                GdkEventMotion *mevent)
+{
+  GimpPolar *polar = GIMP_POLAR (widget);
+  gdouble    angle;
+  gdouble    radius;
+
+  angle = _gimp_circle_get_angle_and_distance (GIMP_CIRCLE (polar),
+                                               mevent->x, mevent->y,
+                                               &radius);
+
+  if (_gimp_circle_has_grab (GIMP_CIRCLE (polar)))
+    {
+      radius = MIN (radius, 1.0);
+
+      g_object_set (polar,
+                    "angle",  angle,
+                    "radius", radius,
+                    NULL);
+    }
+  else
+    {
+      PolarTarget target;
+      gdouble     dist_angle;
+      gdouble     dist_radius;
+
+      dist_angle  = gimp_polar_get_angle_distance (polar->priv->angle, angle);
+      dist_radius = ABS (polar->priv->radius - radius);
+
+      if ((radius < 0.2 && polar->priv->radius < 0.2) ||
+          (dist_angle  < (G_PI / 12) && dist_radius < 0.2))
+        {
+          target = POLAR_TARGET_CIRCLE;
+        }
+      else
+        {
+          target = POLAR_TARGET_NONE;
+        }
+
+      gimp_polar_set_target (polar, target);
+    }
+
+  gdk_event_request_motions (mevent);
+
+  return FALSE;
+}
+
+static void
+gimp_polar_reset_target (GimpCircle *circle)
+{
+  gimp_polar_set_target (GIMP_POLAR (circle), POLAR_TARGET_NONE);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_polar_new (void)
+{
+  return g_object_new (GIMP_TYPE_POLAR, NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_polar_set_target (GimpPolar   *polar,
+                       PolarTarget  target)
+{
+  if (target != polar->priv->target)
+    {
+      polar->priv->target = target;
+      gtk_widget_queue_draw (GTK_WIDGET (polar));
+    }
+}
+
+static void
+gimp_polar_draw_circle (cairo_t     *cr,
+                        gint         size,
+                        gdouble      angle,
+                        gdouble      radius,
+                        PolarTarget  highlight)
+{
+  gdouble r = size / 2.0 - 2.0; /* half the broad line with and half a px */
+  gdouble x = r + r * radius * cos (angle);
+  gdouble y = r - r * radius * sin (angle);
+
+  cairo_save (cr);
+
+  cairo_translate (cr, 2.0, 2.0); /* half the broad line width and half a px*/
+
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+
+  cairo_arc (cr, x, y, 3, 0, 2 * G_PI);
+
+  if (highlight == POLAR_TARGET_NONE)
+    {
+      cairo_set_line_width (cr, 3.0);
+      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.6);
+      cairo_stroke_preserve (cr);
+
+      cairo_set_line_width (cr, 1.0);
+      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      cairo_set_line_width (cr, 3.0);
+      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.6);
+      cairo_stroke_preserve (cr);
+
+      cairo_set_line_width (cr, 1.0);
+      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.8);
+      cairo_stroke (cr);
+    }
+
+  cairo_restore (cr);
+}
+
+static gdouble
+gimp_polar_normalize_angle (gdouble angle)
+{
+  if (angle < 0)
+    return angle + 2 * G_PI;
+  else if (angle > 2 * G_PI)
+    return angle - 2 * G_PI;
+  else
+    return angle;
+}
+
+static gdouble
+gimp_polar_get_angle_distance (gdouble alpha,
+                               gdouble beta)
+{
+  return ABS (MIN (gimp_polar_normalize_angle (alpha - beta),
+                   2 * G_PI - gimp_polar_normalize_angle (alpha - beta)));
+}
diff --git a/app/widgets/gimppolar.h b/app/widgets/gimppolar.h
new file mode 100644
index 0000000..0111af0
--- /dev/null
+++ b/app/widgets/gimppolar.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppolar.h
+ * Copyright (C) 2014 Michael Natterer <mitch@gimp.org>
+ *
+ * Based on code from the color-rotate plug-in
+ * Copyright (C) 1997-1999 Sven Anders (anderss@fmi.uni-passau.de)
+ *                         Based on code from Pavel Grinfeld (pavel@ml.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_POLAR_H__
+#define __GIMP_POLAR_H__
+
+
+#include "gimpcircle.h"
+
+
+#define GIMP_TYPE_POLAR            (gimp_polar_get_type ())
+#define GIMP_POLAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_POLAR, GimpPolar))
+#define GIMP_POLAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_POLAR, GimpPolarClass))
+#define GIMP_IS_POLAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_POLAR))
+#define GIMP_IS_POLAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_POLAR))
+#define GIMP_POLAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_POLAR, GimpPolarClass))
+
+
+typedef struct _GimpPolarPrivate GimpPolarPrivate;
+typedef struct _GimpPolarClass   GimpPolarClass;
+
+struct _GimpPolar
+{
+  GimpCircle       parent_instance;
+
+  GimpPolarPrivate *priv;
+};
+
+struct _GimpPolarClass
+{
+  GimpCircleClass  parent_class;
+};
+
+
+GType       gimp_polar_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_polar_new      (void);
+
+
+#endif /* __GIMP_POLAR_H__ */
diff --git a/app/widgets/gimppopup.c b/app/widgets/gimppopup.c
new file mode 100644
index 0000000..e7dda8f
--- /dev/null
+++ b/app/widgets/gimppopup.c
@@ -0,0 +1,344 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppopup.c
+ * Copyright (C) 2003-2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimppopup.h"
+
+
+enum
+{
+  CANCEL,
+  CONFIRM,
+  LAST_SIGNAL
+};
+
+
+static gboolean gimp_popup_map_event    (GtkWidget      *widget,
+                                         GdkEventAny    *event);
+static gboolean gimp_popup_button_press (GtkWidget      *widget,
+                                         GdkEventButton *bevent);
+static gboolean gimp_popup_key_press    (GtkWidget      *widget,
+                                         GdkEventKey    *kevent);
+
+static void     gimp_popup_real_cancel  (GimpPopup      *popup);
+static void     gimp_popup_real_confirm (GimpPopup      *popup);
+
+
+G_DEFINE_TYPE (GimpPopup, gimp_popup, GTK_TYPE_WINDOW)
+
+#define parent_class gimp_popup_parent_class
+
+static guint popup_signals[LAST_SIGNAL];
+
+
+static void
+gimp_popup_class_init (GimpPopupClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkBindingSet  *binding_set;
+
+  popup_signals[CANCEL] =
+    g_signal_new ("cancel",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpPopupClass, cancel),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  popup_signals[CONFIRM] =
+    g_signal_new ("confirm",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpPopupClass, confirm),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  widget_class->map_event          = gimp_popup_map_event;
+  widget_class->button_press_event = gimp_popup_button_press;
+  widget_class->key_press_event    = gimp_popup_key_press;
+
+  klass->cancel                    = gimp_popup_real_cancel;
+  klass->confirm                   = gimp_popup_real_confirm;
+
+  binding_set = gtk_binding_set_by_class (klass);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
+                                "cancel", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
+                                "confirm", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
+                                "confirm", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
+                                "confirm", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
+                                "confirm", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
+                                "confirm", 0);
+}
+
+static void
+gimp_popup_init (GimpPopup *popup)
+{
+}
+
+static void
+gimp_popup_grab_notify (GtkWidget *widget,
+                        gboolean   was_grabbed)
+{
+  if (was_grabbed)
+    return;
+
+  /* ignore grabs on one of our children, like a scrollbar */
+  if (gtk_widget_is_ancestor (gtk_grab_get_current (), widget))
+    return;
+
+  g_signal_emit (widget, popup_signals[CANCEL], 0);
+}
+
+static gboolean
+gimp_popup_grab_broken_event (GtkWidget          *widget,
+                              GdkEventGrabBroken *event)
+{
+  gimp_popup_grab_notify (widget, FALSE);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_popup_map_event (GtkWidget                 *widget,
+                      G_GNUC_UNUSED GdkEventAny *event)
+{
+  GTK_WIDGET_CLASS (parent_class)->map_event (widget, event);
+
+  /*  grab with owner_events == TRUE so the popup's widgets can
+   *  receive events. we filter away events outside this toplevel
+   *  away in button_press()
+   */
+  if (gdk_pointer_grab (gtk_widget_get_window (widget), TRUE,
+                        GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                        GDK_POINTER_MOTION_MASK,
+                        NULL, NULL, GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
+    {
+      if (gdk_keyboard_grab (gtk_widget_get_window (widget), TRUE,
+                             GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
+        {
+          gtk_grab_add (widget);
+
+          g_signal_connect (widget, "grab-notify",
+                            G_CALLBACK (gimp_popup_grab_notify),
+                            widget);
+          g_signal_connect (widget, "grab-broken-event",
+                            G_CALLBACK (gimp_popup_grab_broken_event),
+                            widget);
+
+          return FALSE;
+        }
+      else
+        {
+          gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+                                      GDK_CURRENT_TIME);
+        }
+    }
+
+  /*  if we could not grab, destroy the popup instead of leaving it
+   *  around uncloseable.
+   */
+  g_signal_emit (widget, popup_signals[CANCEL], 0);
+  return FALSE;
+}
+
+static gboolean
+gimp_popup_button_press (GtkWidget      *widget,
+                         GdkEventButton *bevent)
+{
+  GtkWidget *event_widget;
+  gboolean   cancel = FALSE;
+
+  event_widget = gtk_get_event_widget ((GdkEvent *) bevent);
+
+  if (event_widget == widget)
+    {
+      GtkAllocation allocation;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      /*  the event was on the popup, which can either be really on the
+       *  popup or outside gimp (owner_events == TRUE, see map())
+       */
+      if (bevent->x < 0                ||
+          bevent->y < 0                ||
+          bevent->x > allocation.width ||
+          bevent->y > allocation.height)
+        {
+          /*  the event was outsde gimp  */
+
+          cancel = TRUE;
+        }
+    }
+  else if (gtk_widget_get_toplevel (event_widget) != widget)
+    {
+      /*  the event was on a gimp widget, but not inside the popup  */
+
+      cancel = TRUE;
+    }
+
+  if (cancel)
+    g_signal_emit (widget, popup_signals[CANCEL], 0);
+
+  return cancel;
+}
+
+static gboolean
+gimp_popup_key_press (GtkWidget   *widget,
+                      GdkEventKey *kevent)
+{
+  GtkWidget *focus            = gtk_window_get_focus (GTK_WINDOW (widget));
+  gboolean   activate_binding = TRUE;
+
+  if (focus &&
+      (GTK_IS_EDITABLE (focus) ||
+       GTK_IS_TEXT_VIEW (focus)) &&
+      (kevent->keyval == GDK_KEY_space ||
+       kevent->keyval == GDK_KEY_KP_Space))
+    {
+      /*  if a text widget has the focus, and the key was space,
+       *  don't manually activate the binding to allow entering the
+       *  space in the focus widget.
+       */
+      activate_binding = FALSE;
+    }
+
+  if (activate_binding)
+    {
+      GtkBindingSet *binding_set;
+
+      binding_set = gtk_binding_set_by_class (g_type_class_peek (GIMP_TYPE_POPUP));
+
+      /*  invoke the popup's binding entries manually, because
+       *  otherwise the focus widget (GtkTreeView e.g.) would consume
+       *  it
+       */
+      if (gtk_binding_set_activate (binding_set,
+                                    kevent->keyval,
+                                    kevent->state,
+                                    GTK_OBJECT (widget)))
+        {
+          return TRUE;
+        }
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, kevent);
+}
+
+static void
+gimp_popup_real_cancel (GimpPopup *popup)
+{
+  GtkWidget *widget = GTK_WIDGET (popup);
+
+  if (gtk_grab_get_current () == widget)
+    gtk_grab_remove (widget);
+
+  gtk_widget_destroy (widget);
+}
+
+static void
+gimp_popup_real_confirm (GimpPopup *popup)
+{
+  GtkWidget *widget = GTK_WIDGET (popup);
+
+  if (gtk_grab_get_current () == widget)
+    gtk_grab_remove (widget);
+
+  gtk_widget_destroy (widget);
+}
+
+void
+gimp_popup_show (GimpPopup *popup,
+                 GtkWidget *widget)
+{
+  GdkScreen      *screen;
+  GtkRequisition  requisition;
+  GtkAllocation   allocation;
+  GdkRectangle    rect;
+  gint            monitor;
+  gint            orig_x;
+  gint            orig_y;
+  gint            x;
+  gint            y;
+
+  g_return_if_fail (GIMP_IS_POPUP (popup));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gtk_widget_size_request (GTK_WIDGET (popup), &requisition);
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gdk_window_get_origin (gtk_widget_get_window (widget), &orig_x, &orig_y);
+
+  if (! gtk_widget_get_has_window (widget))
+    {
+      orig_x += allocation.x;
+      orig_y += allocation.y;
+    }
+
+  screen = gtk_widget_get_screen (widget);
+
+  monitor = gdk_screen_get_monitor_at_point (screen, orig_x, orig_y);
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    {
+      x = orig_x + allocation.width - requisition.width;
+
+      if (x < rect.x)
+        x -= allocation.width - requisition.width;
+    }
+  else
+    {
+      x = orig_x;
+
+      if (x + requisition.width > rect.x + rect.width)
+        x += allocation.width - requisition.width;
+    }
+
+  y = orig_y + allocation.height;
+
+  if (y + requisition.height > rect.y + rect.height)
+    y = orig_y - requisition.height;
+
+  gtk_window_set_screen (GTK_WINDOW (popup), screen);
+  gtk_window_set_transient_for (GTK_WINDOW (popup),
+                                GTK_WINDOW (gtk_widget_get_toplevel (widget)));
+
+  gtk_window_move (GTK_WINDOW (popup), x, y);
+  gtk_widget_show (GTK_WIDGET (popup));
+}
diff --git a/app/widgets/gimppopup.h b/app/widgets/gimppopup.h
new file mode 100644
index 0000000..b13f3f7
--- /dev/null
+++ b/app/widgets/gimppopup.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimppopup.h
+ * Copyright (C) 2003-2014 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_POPUP_H__
+#define __GIMP_POPUP_H__
+
+
+#define GIMP_TYPE_POPUP            (gimp_popup_get_type ())
+#define GIMP_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_POPUP, GimpPopup))
+#define GIMP_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_POPUP, GimpPopupClass))
+#define GIMP_IS_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_POPUP))
+#define GIMP_IS_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_POPUP))
+#define GIMP_POPUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_POPUP, GimpPopupClass))
+
+
+typedef struct _GimpPopupClass  GimpPopupClass;
+
+struct _GimpPopup
+{
+  GtkWindow  parent_instance;
+};
+
+struct _GimpPopupClass
+{
+  GtkWindowClass  parent_instance;
+
+  void (* cancel)  (GimpPopup *popup);
+  void (* confirm) (GimpPopup *popup);
+};
+
+
+GType   gimp_popup_get_type (void) G_GNUC_CONST;
+
+void    gimp_popup_show     (GimpPopup *popup,
+                             GtkWidget *widget);
+
+
+#endif  /*  __GIMP_POPUP_H__  */
diff --git a/app/widgets/gimpprefsbox.c b/app/widgets/gimpprefsbox.c
new file mode 100644
index 0000000..27136a1
--- /dev/null
+++ b/app/widgets/gimpprefsbox.c
@@ -0,0 +1,504 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprefsbox.c
+ * Copyright (C) 2013-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpprefsbox.h"
+#include "gimpwidgets-constructors.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLUMN_TREE_ICON_NAME,
+  COLUMN_TREE_ICON_SIZE,
+  COLUMN_TREE_LABEL,
+  COLUMN_PAGE_ICON_NAME,
+  COLUMN_PAGE_ICON_SIZE,
+  COLUMN_PAGE_TITLE,
+  COLUMN_PAGE_HELP_ID,
+  COLUMN_PAGE_INDEX
+};
+
+
+struct _GimpPrefsBoxPrivate
+{
+  GtkTreeStore *store;
+  GtkWidget    *tree_view;
+  GtkWidget    *notebook;
+  GtkWidget    *label;
+  GtkWidget    *image;
+
+  gint          tree_icon_size;
+  gint          page_icon_size;
+
+  gint          page_index;
+  gchar        *page_icon_name;
+  gchar        *page_help_id;
+};
+
+#define GET_PRIVATE(obj) (((GimpPrefsBox *) (obj))->priv)
+
+
+static void   gimp_prefs_box_finalize               (GObject          *object);
+
+static void   gimp_prefs_box_tree_select_callback   (GtkTreeSelection *sel,
+                                                     GimpPrefsBox     *box);
+static void   gimp_prefs_box_notebook_page_callback (GtkNotebook      *notebook,
+                                                     gpointer          page,
+                                                     guint             page_num,
+                                                     GimpPrefsBox     *box);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpPrefsBox, gimp_prefs_box, GTK_TYPE_BOX)
+
+#define parent_class gimp_prefs_box_parent_class
+
+
+static void
+gimp_prefs_box_class_init (GimpPrefsBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_prefs_box_finalize;
+}
+
+static void
+gimp_prefs_box_init (GimpPrefsBox *box)
+{
+  GimpPrefsBoxPrivate *private;
+  GtkTreeViewColumn   *column;
+  GtkCellRenderer     *cell;
+  GtkTreeSelection    *sel;
+  GtkWidget           *frame;
+  GtkWidget           *hbox;
+  GtkWidget           *ebox;
+  GtkWidget           *vbox;
+
+  box->priv = gimp_prefs_box_get_instance_private (box);
+
+  private = box->priv;
+
+  private->tree_icon_size = GTK_ICON_SIZE_BUTTON;
+  private->page_icon_size = GTK_ICON_SIZE_DIALOG;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_HORIZONTAL);
+  gtk_box_set_spacing (GTK_BOX (box), 12);
+
+
+  /*  the categories tree  */
+
+  frame = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (frame),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (frame),
+                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  private->store = gtk_tree_store_new (8,
+                                       G_TYPE_STRING,
+                                       G_TYPE_INT,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_INT,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_INT);
+  private->tree_view =
+    gtk_tree_view_new_with_model (GTK_TREE_MODEL (private->store));
+  g_object_unref (private->store);
+
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (private->tree_view), FALSE);
+
+  column = gtk_tree_view_column_new ();
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, cell, FALSE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "icon-name",  COLUMN_TREE_ICON_NAME,
+                                       "stock-size", COLUMN_TREE_ICON_SIZE,
+                                       NULL);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_set_attributes (column, cell,
+                                       "text", COLUMN_TREE_LABEL,
+                                       NULL);
+
+  gtk_tree_view_append_column (GTK_TREE_VIEW (private->tree_view), column);
+
+  gtk_container_add (GTK_CONTAINER (frame), private->tree_view);
+  gtk_widget_show (private->tree_view);
+
+
+  /*  the notebook  */
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_box_pack_start (GTK_BOX (box), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  ebox = gtk_event_box_new ();
+  gtk_widget_set_state (ebox, GTK_STATE_SELECTED);
+  gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, TRUE, 0);
+  gtk_widget_show (ebox);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+  gtk_container_add (GTK_CONTAINER (ebox), hbox);
+  gtk_widget_show (hbox);
+
+  private->label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (private->label), 0.0);
+  gimp_label_set_attributes (GTK_LABEL (private->label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_LARGE,
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (hbox), private->label, FALSE, FALSE, 0);
+  gtk_widget_show (private->label);
+
+  private->image = gtk_image_new ();
+  gtk_box_pack_end (GTK_BOX (hbox), private->image, FALSE, FALSE, 0);
+  gtk_widget_show (private->image);
+
+  /* The main preferences notebook */
+  private->notebook = gtk_notebook_new ();
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (private->notebook), FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), private->notebook, TRUE, TRUE, 0);
+  gtk_widget_show (private->notebook);
+
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (private->tree_view));
+  g_signal_connect (sel, "changed",
+                    G_CALLBACK (gimp_prefs_box_tree_select_callback),
+                    box);
+  g_signal_connect (private->notebook, "switch-page",
+                    G_CALLBACK (gimp_prefs_box_notebook_page_callback),
+                    box);
+}
+
+static void
+gimp_prefs_box_finalize (GObject *object)
+{
+  GimpPrefsBoxPrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->page_icon_name, g_free);
+  g_clear_pointer (&private->page_help_id,   g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_prefs_box_tree_select_callback (GtkTreeSelection *sel,
+                                     GimpPrefsBox     *box)
+{
+  GimpPrefsBoxPrivate *private = GET_PRIVATE (box);
+  GtkTreeModel        *model;
+  GtkTreeIter          iter;
+  gchar               *page_title;
+  gchar               *page_icon_name;
+  gint                 page_icon_size;
+  gint                 page_index;
+
+  if (! gtk_tree_selection_get_selected (sel, &model, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_PAGE_ICON_NAME, &page_icon_name,
+                      COLUMN_PAGE_ICON_SIZE, &page_icon_size,
+                      COLUMN_PAGE_TITLE,     &page_title,
+                      COLUMN_PAGE_INDEX,     &page_index,
+                      -1);
+
+  gtk_label_set_text (GTK_LABEL (private->label), page_title);
+  g_free (page_title);
+
+  gtk_image_set_from_icon_name (GTK_IMAGE (private->image),
+                                page_icon_name,
+                                page_icon_size);
+  g_free (page_icon_name);
+
+  g_signal_handlers_block_by_func (private->notebook,
+                                   gimp_prefs_box_notebook_page_callback,
+                                   sel);
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (private->notebook),
+                                 page_index);
+
+  g_signal_handlers_unblock_by_func (private->notebook,
+                                     gimp_prefs_box_notebook_page_callback,
+                                     sel);
+}
+
+static void
+gimp_prefs_box_notebook_page_callback (GtkNotebook  *notebook,
+                                       gpointer      page,
+                                       guint         page_num,
+                                       GimpPrefsBox *box)
+{
+  GimpPrefsBoxPrivate *private = GET_PRIVATE (box);
+  GtkTreeSelection    *sel;
+  GtkTreeModel        *model;
+  GtkTreeIter          iter;
+  gboolean             iter_valid;
+
+  sel   = gtk_tree_view_get_selection (GTK_TREE_VIEW (private->tree_view));
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (private->tree_view));
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      gint index;
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_PAGE_INDEX, &index,
+                          -1);
+
+      if (index == page_num)
+        {
+          gtk_tree_selection_select_iter (sel, &iter);
+          return;
+        }
+
+      if (gtk_tree_model_iter_has_child (model, &iter))
+        {
+          gint num_children;
+          gint i;
+
+          num_children = gtk_tree_model_iter_n_children (model, &iter);
+
+          for (i = 0; i < num_children; i++)
+            {
+              GtkTreeIter child_iter;
+
+              gtk_tree_model_iter_nth_child (model, &child_iter, &iter, i);
+              gtk_tree_model_get (model, &child_iter,
+                                  COLUMN_PAGE_INDEX, &index,
+                                  -1);
+
+              if (index == page_num)
+                {
+                  GtkTreePath *path;
+
+                  path = gtk_tree_model_get_path (model, &child_iter);
+                  gtk_tree_view_expand_to_path (GTK_TREE_VIEW (private->tree_view),
+                                                path);
+                  gtk_tree_selection_select_iter (sel, &child_iter);
+                  return;
+                }
+            }
+        }
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_prefs_box_new (void)
+{
+  return g_object_new (GIMP_TYPE_PREFS_BOX, NULL);
+}
+
+GtkWidget *
+gimp_prefs_box_add_page (GimpPrefsBox      *box,
+                         const gchar       *icon_name,
+                         const gchar       *page_title,
+                         const gchar       *tree_label,
+                         const gchar       *help_id,
+                         GtkTreeIter       *parent,
+                         GtkTreeIter       *iter)
+{
+  GimpPrefsBoxPrivate *private;
+  GtkWidget           *page_vbox;
+  GtkWidget           *scrolled_win;
+  GtkWidget           *viewport;
+  GtkWidget           *vbox;
+
+  g_return_val_if_fail (GIMP_IS_PREFS_BOX (box), NULL);
+
+  private = GET_PRIVATE (box);
+
+  page_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_notebook_append_page (GTK_NOTEBOOK (private->notebook), page_vbox, NULL);
+  gtk_widget_show (page_vbox);
+
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                  GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+  gtk_container_add (GTK_CONTAINER (page_vbox), scrolled_win);
+  gtk_widget_show (scrolled_win);
+
+  gimp_help_set_help_data (scrolled_win, NULL, help_id);
+
+  viewport = gtk_viewport_new (NULL, NULL);
+  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (scrolled_win), viewport);
+  gtk_widget_show (viewport);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_add (GTK_CONTAINER (viewport), vbox);
+  gtk_widget_show (vbox);
+
+  gtk_tree_store_append (private->store, iter, parent);
+  gtk_tree_store_set (private->store, iter,
+                      COLUMN_TREE_ICON_NAME, icon_name,
+                      COLUMN_TREE_ICON_SIZE, private->tree_icon_size,
+                      COLUMN_TREE_LABEL,     tree_label,
+                      COLUMN_PAGE_ICON_NAME, icon_name,
+                      COLUMN_PAGE_ICON_SIZE, private->page_icon_size,
+                      COLUMN_PAGE_TITLE ,    page_title,
+                      COLUMN_PAGE_HELP_ID,   help_id,
+                      COLUMN_PAGE_INDEX,     private->page_index++,
+                      -1);
+
+  return vbox;
+}
+
+const gchar *
+gimp_prefs_box_get_current_icon_name (GimpPrefsBox *box)
+{
+  GimpPrefsBoxPrivate *private = GET_PRIVATE (box);
+  GtkTreeSelection    *sel;
+  GtkTreeModel        *model;
+  GtkTreeIter          iter;
+
+  g_return_val_if_fail (GIMP_IS_PREFS_BOX (box), NULL);
+
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (private->tree_view));
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      g_clear_pointer (&private->page_icon_name, g_free);
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_PAGE_ICON_NAME, &private->page_icon_name,
+                          -1);
+
+      return private->page_icon_name;
+    }
+
+  return NULL;
+}
+
+const gchar *
+gimp_prefs_box_get_current_help_id (GimpPrefsBox *box)
+{
+  GimpPrefsBoxPrivate *private = GET_PRIVATE (box);
+  GtkTreeSelection    *sel;
+  GtkTreeModel        *model;
+  GtkTreeIter          iter;
+
+  g_return_val_if_fail (GIMP_IS_PREFS_BOX (box), NULL);
+
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (private->tree_view));
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      g_clear_pointer (&private->page_help_id, g_free);
+
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_PAGE_HELP_ID, &private->page_help_id,
+                          -1);
+
+      return private->page_help_id;
+    }
+
+  return NULL;
+}
+
+void
+gimp_prefs_box_set_page_scrollable (GimpPrefsBox *box,
+                                    GtkWidget    *page,
+                                    gboolean      scrollable)
+{
+  GimpPrefsBoxPrivate *private;
+  GtkWidget           *scrolled_win;
+  GtkWidget           *page_vbox;
+
+  g_return_if_fail (GIMP_IS_PREFS_BOX (box));
+  g_return_if_fail (GTK_IS_BOX (page));
+  g_return_if_fail (gtk_widget_is_ancestor (page, GTK_WIDGET (box)));
+
+  private = GET_PRIVATE (box);
+
+  scrolled_win = gtk_widget_get_ancestor (page, GTK_TYPE_SCROLLED_WINDOW);
+  page_vbox = gtk_widget_get_parent (scrolled_win);
+
+  g_return_if_fail (gtk_widget_get_parent (page_vbox) == private->notebook);
+
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                  GTK_POLICY_NEVER,
+                                  scrollable ?
+                                  GTK_POLICY_AUTOMATIC : GTK_POLICY_NEVER);
+}
+
+GtkWidget *
+gimp_prefs_box_set_page_resettable (GimpPrefsBox *box,
+                                    GtkWidget    *page,
+                                    const gchar  *label)
+{
+  GimpPrefsBoxPrivate *private;
+  GtkWidget           *scrolled_win;
+  GtkWidget           *page_vbox;
+  GtkWidget           *hbox;
+  GtkWidget           *button;
+
+  g_return_val_if_fail (GIMP_IS_PREFS_BOX (box), NULL);
+  g_return_val_if_fail (GTK_IS_BOX (page), NULL);
+  g_return_val_if_fail (gtk_widget_is_ancestor (page, GTK_WIDGET (box)), NULL);
+
+  private = GET_PRIVATE (box);
+
+  scrolled_win = gtk_widget_get_ancestor (page, GTK_TYPE_SCROLLED_WINDOW);
+  page_vbox = gtk_widget_get_parent (scrolled_win);
+
+  g_return_val_if_fail (gtk_widget_get_parent (page_vbox) == private->notebook,
+                        NULL);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (page_vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (page_vbox), hbox, 0);
+  gtk_widget_show (hbox);
+
+  button = gimp_icon_button_new (GIMP_ICON_RESET, label);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return button;
+}
+
+GtkWidget *
+gimp_prefs_box_get_tree_view (GimpPrefsBox *box)
+{
+  g_return_val_if_fail (GIMP_IS_PREFS_BOX (box), NULL);
+
+  return GET_PRIVATE (box)->tree_view;
+}
diff --git a/app/widgets/gimpprefsbox.h b/app/widgets/gimpprefsbox.h
new file mode 100644
index 0000000..f5357bf
--- /dev/null
+++ b/app/widgets/gimpprefsbox.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprefsbox.h
+ * Copyright (C) 2013-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PREFS_BOX_H__
+#define __GIMP_PREFS_BOX_H__
+
+
+#define GIMP_TYPE_PREFS_BOX            (gimp_prefs_box_get_type ())
+#define GIMP_PREFS_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREFS_BOX, GimpPrefsBox))
+#define GIMP_PREFS_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREFS_BOX, GimpPrefsBoxClass))
+#define GIMP_IS_PREFS_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PREFS_BOX))
+#define GIMP_IS_PREFS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREFS_BOX))
+#define GIMP_PREFS_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PREFS_BOX, GimpPrefsBoxClass))
+
+
+typedef struct _GimpPrefsBoxPrivate GimpPrefsBoxPrivate;
+typedef struct _GimpPrefsBoxClass   GimpPrefsBoxClass;
+
+struct _GimpPrefsBox
+{
+  GtkBox               parent_instance;
+
+  GimpPrefsBoxPrivate *priv;
+};
+
+struct _GimpPrefsBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType         gimp_prefs_box_get_type              (void) G_GNUC_CONST;
+
+GtkWidget   * gimp_prefs_box_new                   (void);
+
+GtkWidget   * gimp_prefs_box_add_page              (GimpPrefsBox *box,
+                                                    const gchar  *icon_name,
+                                                    const gchar  *page_title,
+                                                    const gchar  *tree_label,
+                                                    const gchar  *help_id,
+                                                    GtkTreeIter  *parent,
+                                                    GtkTreeIter  *iter);
+
+const gchar * gimp_prefs_box_get_current_icon_name (GimpPrefsBox *box);
+const gchar * gimp_prefs_box_get_current_help_id   (GimpPrefsBox *box);
+
+void          gimp_prefs_box_set_page_scrollable   (GimpPrefsBox *box,
+                                                    GtkWidget    *page,
+                                                    gboolean      scrollable);
+GtkWidget   * gimp_prefs_box_set_page_resettable   (GimpPrefsBox *box,
+                                                    GtkWidget    *page,
+                                                    const gchar  *label);
+
+GtkWidget   * gimp_prefs_box_get_tree_view         (GimpPrefsBox *box);
+
+
+#endif  /*  __GIMP_PREFS_BOX_H__  */
diff --git a/app/widgets/gimpprocedureaction.c b/app/widgets/gimpprocedureaction.c
new file mode 100644
index 0000000..596273c
--- /dev/null
+++ b/app/widgets/gimpprocedureaction.c
@@ -0,0 +1,228 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprocedureaction.c
+ * Copyright (C) 2004-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gegl.h>
+
+#include "widgets-types.h"
+
+#include "pdb/gimpprocedure.h"
+
+#include "gimpaction.h"
+#include "gimpaction-history.h"
+#include "gimpprocedureaction.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_PROCEDURE
+};
+
+
+static void   gimp_procedure_action_finalize      (GObject      *object);
+static void   gimp_procedure_action_set_property  (GObject      *object,
+                                                   guint         prop_id,
+                                                   const GValue *value,
+                                                   GParamSpec   *pspec);
+static void   gimp_procedure_action_get_property  (GObject      *object,
+                                                   guint         prop_id,
+                                                   GValue       *value,
+                                                   GParamSpec   *pspec);
+
+static void   gimp_procedure_action_activate      (GtkAction    *action);
+static void   gimp_procedure_action_connect_proxy (GtkAction    *action,
+                                                   GtkWidget    *proxy);
+
+
+G_DEFINE_TYPE (GimpProcedureAction, gimp_procedure_action,
+               GIMP_TYPE_ACTION_IMPL)
+
+#define parent_class gimp_procedure_action_parent_class
+
+
+static void
+gimp_procedure_action_class_init (GimpProcedureActionClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkActionClass *action_class = GTK_ACTION_CLASS (klass);
+
+  object_class->finalize      = gimp_procedure_action_finalize;
+  object_class->set_property  = gimp_procedure_action_set_property;
+  object_class->get_property  = gimp_procedure_action_get_property;
+
+  action_class->activate      = gimp_procedure_action_activate;
+  action_class->connect_proxy = gimp_procedure_action_connect_proxy;
+
+  g_object_class_install_property (object_class, PROP_PROCEDURE,
+                                   g_param_spec_object ("procedure",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_PROCEDURE,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_procedure_action_init (GimpProcedureAction *action)
+{
+}
+
+static void
+gimp_procedure_action_finalize (GObject *object)
+{
+  GimpProcedureAction *action = GIMP_PROCEDURE_ACTION (object);
+
+  g_clear_object (&action->procedure);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_procedure_action_get_property (GObject    *object,
+                                    guint       prop_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GimpProcedureAction *action = GIMP_PROCEDURE_ACTION (object);
+
+  switch (prop_id)
+    {
+    case PROP_PROCEDURE:
+      g_value_set_object (value, action->procedure);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_procedure_action_set_property (GObject      *object,
+                                    guint         prop_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GimpProcedureAction *action = GIMP_PROCEDURE_ACTION (object);
+
+  switch (prop_id)
+    {
+    case PROP_PROCEDURE:
+      if (action->procedure)
+        g_object_unref (action->procedure);
+      action->procedure = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_procedure_action_activate (GtkAction *action)
+{
+  GimpProcedureAction *procedure_action = GIMP_PROCEDURE_ACTION (action);
+
+  /* Not all actions have procedures associated with them, for example
+   * unused "filters-recent-[N]" actions, so check for NULL before we
+   * invoke the action
+   */
+  if (procedure_action->procedure)
+    {
+      gsize hack = GPOINTER_TO_SIZE (procedure_action->procedure);
+
+      gimp_action_emit_activate (GIMP_ACTION (action),
+                                 g_variant_new_uint64 (hack));
+
+      gimp_action_history_action_activated (GIMP_ACTION (action));
+    }
+}
+
+static void
+gimp_procedure_action_connect_proxy (GtkAction *action,
+                                     GtkWidget *proxy)
+{
+  GimpProcedureAction *procedure_action = GIMP_PROCEDURE_ACTION (action);
+
+  GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
+
+  if (GTK_IS_IMAGE_MENU_ITEM (proxy) && procedure_action->procedure)
+    {
+      GdkPixbuf *pixbuf;
+
+      g_object_get (procedure_action->procedure,
+                    "icon-pixbuf", &pixbuf,
+                    NULL);
+
+      if (pixbuf)
+        {
+          GtkSettings *settings = gtk_widget_get_settings (proxy);
+          gint         width;
+          gint         height;
+          GtkWidget   *image;
+
+          gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
+                                             &width, &height);
+
+          if (width  != gdk_pixbuf_get_width  (pixbuf) ||
+              height != gdk_pixbuf_get_height (pixbuf))
+            {
+              GdkPixbuf *copy;
+
+              copy = gdk_pixbuf_scale_simple (pixbuf, width, height,
+                                              GDK_INTERP_BILINEAR);
+              g_object_unref (pixbuf);
+              pixbuf = copy;
+            }
+
+          image = gtk_image_new_from_pixbuf (pixbuf);
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
+          g_object_unref (pixbuf);
+        }
+    }
+}
+
+
+/*  public functions  */
+
+GimpProcedureAction *
+gimp_procedure_action_new (const gchar   *name,
+                           const gchar   *label,
+                           const gchar   *tooltip,
+                           const gchar   *icon_name,
+                           const gchar   *help_id,
+                           GimpProcedure *procedure)
+{
+  GimpProcedureAction *action;
+
+  action = g_object_new (GIMP_TYPE_PROCEDURE_ACTION,
+                         "name",       name,
+                         "label",      label,
+                         "tooltip",    tooltip,
+                         "icon-name",  icon_name,
+                         "procedure",  procedure,
+                         NULL);
+
+  gimp_action_set_help_id (GIMP_ACTION (action), help_id);
+
+  return action;
+}
diff --git a/app/widgets/gimpprocedureaction.h b/app/widgets/gimpprocedureaction.h
new file mode 100644
index 0000000..9d8463b
--- /dev/null
+++ b/app/widgets/gimpprocedureaction.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprocedureaction.h
+ * Copyright (C) 2004-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROCEDURE_ACTION_H__
+#define __GIMP_PROCEDURE_ACTION_H__
+
+
+#include "gimpactionimpl.h"
+
+
+#define GIMP_TYPE_PROCEDURE_ACTION            (gimp_procedure_action_get_type ())
+#define GIMP_PROCEDURE_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROCEDURE_ACTION, GimpProcedureAction))
+#define GIMP_PROCEDURE_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PROCEDURE_ACTION, GimpProcedureActionClass))
+#define GIMP_IS_PROCEDURE_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROCEDURE_ACTION))
+#define GIMP_IS_PROCEDURE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_PROCEDURE_ACTION))
+#define GIMP_PROCEDURE_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_PROCEDURE_ACTION, GimpProcedureActionClass))
+
+
+typedef struct _GimpProcedureActionClass GimpProcedureActionClass;
+
+struct _GimpProcedureAction
+{
+  GimpActionImpl  parent_instance;
+
+  GimpProcedure  *procedure;
+};
+
+struct _GimpProcedureActionClass
+{
+  GimpActionImplClass parent_class;
+};
+
+
+GType                 gimp_procedure_action_get_type (void) G_GNUC_CONST;
+
+GimpProcedureAction * gimp_procedure_action_new      (const gchar   *name,
+                                                      const gchar   *label,
+                                                      const gchar   *tooltip,
+                                                      const gchar   *icon_name,
+                                                      const gchar   *help_id,
+                                                      GimpProcedure *procedure);
+
+
+#endif  /* __GIMP_PROCEDURE_ACTION_H__ */
diff --git a/app/widgets/gimpprogressbox.c b/app/widgets/gimpprogressbox.c
new file mode 100644
index 0000000..f99681f
--- /dev/null
+++ b/app/widgets/gimpprogressbox.c
@@ -0,0 +1,245 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprogressbox.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "gimpprogressbox.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void     gimp_progress_box_progress_iface_init (GimpProgressInterface *iface);
+
+static void     gimp_progress_box_dispose            (GObject      *object);
+
+static GimpProgress *
+                gimp_progress_box_progress_start     (GimpProgress *progress,
+                                                      gboolean      cancellable,
+                                                      const gchar  *message);
+static void     gimp_progress_box_progress_end       (GimpProgress *progress);
+static gboolean gimp_progress_box_progress_is_active (GimpProgress *progress);
+static void     gimp_progress_box_progress_set_text  (GimpProgress *progress,
+                                                      const gchar  *message);
+static void     gimp_progress_box_progress_set_value (GimpProgress *progress,
+                                                      gdouble       percentage);
+static gdouble  gimp_progress_box_progress_get_value (GimpProgress *progress);
+static void     gimp_progress_box_progress_pulse     (GimpProgress *progress);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpProgressBox, gimp_progress_box, GTK_TYPE_BOX,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_progress_box_progress_iface_init))
+
+#define parent_class gimp_progress_box_parent_class
+
+
+static void
+gimp_progress_box_class_init (GimpProgressBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_progress_box_dispose;
+}
+
+static void
+gimp_progress_box_init (GimpProgressBox *box)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (box), 6);
+
+  box->progress = gtk_progress_bar_new ();
+  gtk_widget_set_size_request (box->progress, 250, 20);
+  gtk_box_pack_start (GTK_BOX (box), box->progress, FALSE, FALSE, 0);
+  gtk_widget_show (box->progress);
+
+  box->label = gtk_label_new ("");
+  gtk_label_set_ellipsize (GTK_LABEL (box->label), PANGO_ELLIPSIZE_MIDDLE);
+  gtk_label_set_xalign (GTK_LABEL (box->label), 0.0);
+  gimp_label_set_attributes (GTK_LABEL (box->label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (box), box->label, FALSE, FALSE, 0);
+  gtk_widget_show (box->label);
+}
+
+static void
+gimp_progress_box_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start     = gimp_progress_box_progress_start;
+  iface->end       = gimp_progress_box_progress_end;
+  iface->is_active = gimp_progress_box_progress_is_active;
+  iface->set_text  = gimp_progress_box_progress_set_text;
+  iface->set_value = gimp_progress_box_progress_set_value;
+  iface->get_value = gimp_progress_box_progress_get_value;
+  iface->pulse     = gimp_progress_box_progress_pulse;
+}
+
+static void
+gimp_progress_box_dispose (GObject *object)
+{
+  GimpProgressBox *box = GIMP_PROGRESS_BOX (object);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+
+  box->progress = NULL;
+}
+
+static GimpProgress *
+gimp_progress_box_progress_start (GimpProgress *progress,
+                                  gboolean      cancellable,
+                                  const gchar  *message)
+{
+  GimpProgressBox *box = GIMP_PROGRESS_BOX (progress);
+
+  if (! box->progress)
+    return NULL;
+
+  if (! box->active)
+    {
+      GtkProgressBar *bar = GTK_PROGRESS_BAR (box->progress);
+
+      gtk_label_set_text (GTK_LABEL (box->label), message);
+      gtk_progress_bar_set_fraction (bar, 0.0);
+
+      box->active      = TRUE;
+      box->cancellable = cancellable;
+      box->value       = 0.0;
+
+      if (gtk_widget_is_drawable (box->progress))
+        gdk_window_process_updates (gtk_widget_get_window (box->progress),
+                                    TRUE);
+
+      return progress;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_progress_box_progress_end (GimpProgress *progress)
+{
+  if (gimp_progress_box_progress_is_active (progress))
+    {
+      GimpProgressBox *box = GIMP_PROGRESS_BOX (progress);
+      GtkProgressBar  *bar = GTK_PROGRESS_BAR (box->progress);
+
+      gtk_label_set_text (GTK_LABEL (box->label), "");
+      gtk_progress_bar_set_fraction (bar, 0.0);
+
+      box->active      = FALSE;
+      box->cancellable = FALSE;
+      box->value       = 0.0;
+    }
+}
+
+static gboolean
+gimp_progress_box_progress_is_active (GimpProgress *progress)
+{
+  GimpProgressBox *box = GIMP_PROGRESS_BOX (progress);
+
+  return (box->progress && box->active);
+}
+
+static void
+gimp_progress_box_progress_set_text (GimpProgress *progress,
+                                     const gchar  *message)
+{
+  if (gimp_progress_box_progress_is_active (progress))
+    {
+      GimpProgressBox *box = GIMP_PROGRESS_BOX (progress);
+
+      gtk_label_set_text (GTK_LABEL (box->label), message);
+
+      if (gtk_widget_is_drawable (box->progress))
+        gdk_window_process_updates (gtk_widget_get_window (box->progress),
+                                    TRUE);
+    }
+}
+
+static void
+gimp_progress_box_progress_set_value (GimpProgress *progress,
+                                      gdouble       percentage)
+{
+  if (gimp_progress_box_progress_is_active (progress))
+    {
+      GimpProgressBox *box = GIMP_PROGRESS_BOX (progress);
+      GtkProgressBar  *bar = GTK_PROGRESS_BAR (box->progress);
+      GtkAllocation    allocation;
+
+      gtk_widget_get_allocation (GTK_WIDGET (bar), &allocation);
+
+      box->value = percentage;
+
+      /* only update the progress bar if this causes a visible change */
+      if (fabs (allocation.width *
+                (percentage - gtk_progress_bar_get_fraction (bar))) > 1.0)
+        {
+          gtk_progress_bar_set_fraction (bar, box->value);
+
+          gimp_widget_flush_expose (box->progress);
+        }
+    }
+}
+
+static gdouble
+gimp_progress_box_progress_get_value (GimpProgress *progress)
+{
+  if (gimp_progress_box_progress_is_active (progress))
+    {
+      return GIMP_PROGRESS_BOX (progress)->value;
+    }
+
+  return 0.0;
+}
+
+static void
+gimp_progress_box_progress_pulse (GimpProgress *progress)
+{
+  if (gimp_progress_box_progress_is_active (progress))
+    {
+      GimpProgressBox *box = GIMP_PROGRESS_BOX (progress);
+      GtkProgressBar  *bar = GTK_PROGRESS_BAR (box->progress);
+
+      gtk_progress_bar_pulse (bar);
+
+      if (gtk_widget_is_drawable (box->progress))
+        gdk_window_process_updates (gtk_widget_get_window (box->progress),
+                                    TRUE);
+    }
+}
+
+GtkWidget *
+gimp_progress_box_new (void)
+{
+  return g_object_new (GIMP_TYPE_PROGRESS_BOX, NULL);
+}
diff --git a/app/widgets/gimpprogressbox.h b/app/widgets/gimpprogressbox.h
new file mode 100644
index 0000000..bc0ee8e
--- /dev/null
+++ b/app/widgets/gimpprogressbox.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprogressbox.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROGRESS_BOX_H__
+#define __GIMP_PROGRESS_BOX_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_PROGRESS_BOX            (gimp_progress_box_get_type ())
+#define GIMP_PROGRESS_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROGRESS_BOX, GimpProgressBox))
+#define GIMP_PROGRESS_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PROGRESS_BOX, GimpProgressBoxClass))
+#define GIMP_IS_PROGRESS_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROGRESS_BOX))
+#define GIMP_IS_PROGRESS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PROGRESS_BOX))
+#define GIMP_PROGRESS_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PROGRESS_BOX, GimpProgressBoxClass))
+
+
+typedef struct _GimpProgressBoxClass  GimpProgressBoxClass;
+
+struct _GimpProgressBox
+{
+  GtkBox     parent_instance;
+
+  gboolean   active;
+  gboolean   cancellable;
+  gdouble    value;
+
+  GtkWidget *label;
+  GtkWidget *progress;
+};
+
+struct _GimpProgressBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_progress_box_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_progress_box_new      (void);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_PROGRESS_BOX_H__ */
diff --git a/app/widgets/gimpprogressdialog.c b/app/widgets/gimpprogressdialog.c
new file mode 100644
index 0000000..f146805
--- /dev/null
+++ b/app/widgets/gimpprogressdialog.c
@@ -0,0 +1,231 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprogressdialog.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpprogress.h"
+
+#include "gimpprogressbox.h"
+#include "gimpprogressdialog.h"
+
+#include "gimp-intl.h"
+
+
+#define PROGRESS_DIALOG_WIDTH  400
+
+
+static void    gimp_progress_dialog_progress_iface_init (GimpProgressInterface *iface);
+
+static void     gimp_progress_dialog_response           (GtkDialog    *dialog,
+                                                         gint          response_id);
+
+static GimpProgress *
+                gimp_progress_dialog_progress_start     (GimpProgress *progress,
+                                                         gboolean      cancellable,
+                                                         const gchar  *message);
+static void     gimp_progress_dialog_progress_end       (GimpProgress *progress);
+static gboolean gimp_progress_dialog_progress_is_active (GimpProgress *progress);
+static void     gimp_progress_dialog_progress_set_text  (GimpProgress *progress,
+                                                         const gchar  *message);
+static void     gimp_progress_dialog_progress_set_value (GimpProgress *progress,
+                                                         gdouble       percentage);
+static gdouble  gimp_progress_dialog_progress_get_value (GimpProgress *progress);
+static void     gimp_progress_dialog_progress_pulse     (GimpProgress *progress);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpProgressDialog, gimp_progress_dialog,
+                         GIMP_TYPE_DIALOG,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_progress_dialog_progress_iface_init))
+
+#define parent_class gimp_progress_dialog_parent_class
+
+
+static void
+gimp_progress_dialog_class_init (GimpProgressDialogClass *klass)
+{
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+
+  dialog_class->response = gimp_progress_dialog_response;
+}
+
+static void
+gimp_progress_dialog_init (GimpProgressDialog *dialog)
+{
+  GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  dialog->box = gimp_progress_box_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (dialog->box), 12);
+  gtk_box_pack_start (GTK_BOX (content_area), dialog->box, TRUE, TRUE, 0);
+  gtk_widget_show (dialog->box);
+
+  g_signal_connect (dialog->box, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &dialog->box);
+
+  gtk_dialog_add_button (GTK_DIALOG (dialog),
+                         _("_Cancel"), GTK_RESPONSE_CANCEL);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
+
+  gtk_widget_set_size_request (GTK_WIDGET (dialog), PROGRESS_DIALOG_WIDTH, -1);
+}
+
+static void
+gimp_progress_dialog_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start     = gimp_progress_dialog_progress_start;
+  iface->end       = gimp_progress_dialog_progress_end;
+  iface->is_active = gimp_progress_dialog_progress_is_active;
+  iface->set_text  = gimp_progress_dialog_progress_set_text;
+  iface->set_value = gimp_progress_dialog_progress_set_value;
+  iface->get_value = gimp_progress_dialog_progress_get_value;
+  iface->pulse     = gimp_progress_dialog_progress_pulse;
+}
+
+static void
+gimp_progress_dialog_response (GtkDialog *dialog,
+                               gint       response_id)
+{
+  GimpProgressDialog *progress_dialog = GIMP_PROGRESS_DIALOG (dialog);
+
+  if (GIMP_PROGRESS_BOX (progress_dialog->box)->cancellable)
+    gimp_progress_cancel (GIMP_PROGRESS (dialog));
+}
+
+static GimpProgress *
+gimp_progress_dialog_progress_start (GimpProgress *progress,
+                                     gboolean      cancellable,
+                                     const gchar  *message)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return NULL;
+
+  if (gimp_progress_start (GIMP_PROGRESS (dialog->box), cancellable,
+                           "%s", message))
+    {
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                         GTK_RESPONSE_CANCEL, cancellable);
+
+      gtk_window_present (GTK_WINDOW (dialog));
+
+      return progress;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_progress_dialog_progress_end (GimpProgress *progress)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return;
+
+  if (GIMP_PROGRESS_BOX (dialog->box)->active)
+    {
+      gimp_progress_end (GIMP_PROGRESS (dialog->box));
+
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                         GTK_RESPONSE_CANCEL, FALSE);
+
+      gtk_widget_hide (GTK_WIDGET (dialog));
+    }
+}
+
+static gboolean
+gimp_progress_dialog_progress_is_active (GimpProgress *progress)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return FALSE;
+
+  return gimp_progress_is_active (GIMP_PROGRESS (dialog->box));
+}
+
+static void
+gimp_progress_dialog_progress_set_text (GimpProgress *progress,
+                                        const gchar  *message)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return;
+
+  gimp_progress_set_text_literal (GIMP_PROGRESS (dialog->box), message);
+}
+
+static void
+gimp_progress_dialog_progress_set_value (GimpProgress *progress,
+                                         gdouble       percentage)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return;
+
+  gimp_progress_set_value (GIMP_PROGRESS (dialog->box), percentage);
+}
+
+static gdouble
+gimp_progress_dialog_progress_get_value (GimpProgress *progress)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return 0.0;
+
+  return gimp_progress_get_value (GIMP_PROGRESS (dialog->box));
+}
+
+static void
+gimp_progress_dialog_progress_pulse (GimpProgress *progress)
+{
+  GimpProgressDialog *dialog = GIMP_PROGRESS_DIALOG (progress);
+
+  if (! dialog->box)
+    return;
+
+  gimp_progress_pulse (GIMP_PROGRESS (dialog->box));
+}
+
+GtkWidget *
+gimp_progress_dialog_new (void)
+{
+  return g_object_new (GIMP_TYPE_PROGRESS_DIALOG,
+                       "title",             _("Progress"),
+                       "role",              "progress",
+                       "skip-taskbar-hint", TRUE,
+                       "skip-pager-hint",   TRUE,
+                       "resizable",         FALSE,
+                       "focus-on-map",      FALSE,
+                       "window-position",   GTK_WIN_POS_CENTER,
+                       NULL);
+}
diff --git a/app/widgets/gimpprogressdialog.h b/app/widgets/gimpprogressdialog.h
new file mode 100644
index 0000000..659d1ac
--- /dev/null
+++ b/app/widgets/gimpprogressdialog.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpprogressdialog.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROGRESS_DIALOG_H__
+#define __GIMP_PROGRESS_DIALOG_H__
+
+
+#define GIMP_TYPE_PROGRESS_DIALOG            (gimp_progress_dialog_get_type ())
+#define GIMP_PROGRESS_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROGRESS_DIALOG, GimpProgressDialog))
+#define GIMP_PROGRESS_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PROGRESS_DIALOG, GimpProgressDialogClass))
+#define GIMP_IS_PROGRESS_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROGRESS_DIALOG))
+#define GIMP_IS_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PROGRESS_DIALOG))
+#define GIMP_PROGRESS_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PROGRESS_DIALOG, GimpProgressDialogClass))
+
+
+typedef struct _GimpProgressDialogClass  GimpProgressDialogClass;
+
+struct _GimpProgressDialog
+{
+  GimpDialog  parent_instance;
+
+  GtkWidget  *box;
+};
+
+struct _GimpProgressDialogClass
+{
+  GimpDialogClass  parent_class;
+};
+
+
+GType       gimp_progress_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_progress_dialog_new      (void);
+
+
+#endif /* __GIMP_PROGRESS_DIALOG_H__ */
diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c
new file mode 100644
index 0000000..22c0486
--- /dev/null
+++ b/app/widgets/gimppropwidgets.c
@@ -0,0 +1,2355 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropwidgets.c
+ * Copyright (C) 2002-2004  Michael Natterer <mitch@gimp.org>
+ *                          Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gegl-paramspecs.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcolorbar.h"
+#include "gimpcolorpanel.h"
+#include "gimpcompressioncombobox.h"
+#include "gimpdial.h"
+#include "gimpdnd.h"
+#include "gimphandlebar.h"
+#include "gimpiconpicker.h"
+#include "gimplanguagecombobox.h"
+#include "gimplanguageentry.h"
+#include "gimplayermodebox.h"
+#include "gimpscalebutton.h"
+#include "gimpspinscale.h"
+#include "gimpview.h"
+#include "gimppolar.h"
+#include "gimppropwidgets.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+/*  utility function prototypes  */
+
+static void         set_param_spec     (GObject     *object,
+                                        GtkWidget   *widget,
+                                        GParamSpec  *param_spec);
+static GParamSpec * get_param_spec     (GObject     *object);
+
+static GParamSpec * find_param_spec    (GObject     *object,
+                                        const gchar *property_name,
+                                        const gchar *strloc);
+static GParamSpec * check_param_spec   (GObject     *object,
+                                        const gchar *property_name,
+                                        GType        type,
+                                        const gchar *strloc);
+static GParamSpec * check_param_spec_w (GObject     *object,
+                                        const gchar *property_name,
+                                        GType        type,
+                                        const gchar *strloc);
+
+static void         connect_notify     (GObject     *config,
+                                        const gchar *property_name,
+                                        GCallback    callback,
+                                        gpointer     callback_data);
+
+
+/*********************/
+/*  expanding frame  */
+/*********************/
+
+/**
+ * gimp_prop_expanding_frame_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @property_name: Name of boolean property.
+ * @button_label:  Toggle widget title appearing as a frame title.
+ * @child:         Child #GtkWidget of the returned frame.
+ * @button:        Pointer to the #GtkCheckButton used as frame title
+ *                 if not #NULL.
+ *
+ * Creates a #GimpFrame containing @child, using a #GtkCheckButton as a
+ * title whose value is tied to the boolean @property_name.
+ * @child will be visible when @property_name is #TRUE, hidden otherwise.
+ * If @button_label is #NULL, the @property_name's nick will be used as
+ * label of the #GtkCheckButton title.
+ *
+ * Return value:  A new #GimpFrame widget.
+ *
+ * Since GIMP 2.4
+ */
+GtkWidget *
+gimp_prop_expanding_frame_new (GObject      *config,
+                               const gchar  *property_name,
+                               const gchar  *button_label,
+                               GtkWidget    *child,
+                               GtkWidget   **button)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *frame;
+  GtkWidget  *toggle;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  if (! button_label)
+    button_label = g_param_spec_get_nick (param_spec);
+
+  frame = gimp_frame_new (NULL);
+
+  toggle = gimp_prop_check_button_new (config, property_name, button_label);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), toggle);
+  gtk_widget_show (toggle);
+
+  gtk_container_add (GTK_CONTAINER (frame), child);
+
+  g_object_bind_property (G_OBJECT (config), property_name,
+                          G_OBJECT (child),  "visible",
+                          G_BINDING_SYNC_CREATE);
+
+  if (button)
+    *button = toggle;
+
+  return frame;
+}
+
+
+/**********************/
+/*  boolean icon box  */
+/**********************/
+
+static void  gimp_prop_radio_button_callback (GtkWidget  *widget,
+                                              GObject    *config);
+static void  gimp_prop_radio_button_notify   (GObject    *config,
+                                              GParamSpec *param_spec,
+                                              GtkWidget  *button);
+
+GtkWidget *
+gimp_prop_boolean_icon_box_new (GObject     *config,
+                                const gchar *property_name,
+                                const gchar *true_icon,
+                                const gchar *false_icon,
+                                const gchar *true_tooltip,
+                                const gchar *false_tooltip)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *box;
+  GtkWidget  *button;
+  GtkWidget  *first_button;
+  GtkWidget  *image;
+  GSList     *group = NULL;
+  gboolean    value;
+
+  g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+  g_return_val_if_fail (property_name != NULL, NULL);
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  g_object_get (config,
+                property_name, &value,
+                NULL);
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  button = first_button = gtk_radio_button_new (group);
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  image = gtk_image_new_from_icon_name (true_icon, GTK_ICON_SIZE_MENU);
+  if (image)
+    {
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+    }
+
+  gimp_help_set_help_data (button, true_tooltip, NULL);
+
+
+  g_object_set_data (G_OBJECT (button), "gimp-item-data",
+                     GINT_TO_POINTER (TRUE));
+
+  set_param_spec (G_OBJECT (button), NULL, param_spec);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_prop_radio_button_callback),
+                    config);
+
+  button = gtk_radio_button_new (group);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  image = gtk_image_new_from_icon_name (false_icon, GTK_ICON_SIZE_MENU);
+  if (image)
+    {
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+    }
+
+  gimp_help_set_help_data (button, false_tooltip, NULL);
+
+  g_object_set_data (G_OBJECT (button), "gimp-item-data",
+                     GINT_TO_POINTER (FALSE));
+
+  set_param_spec (G_OBJECT (button), NULL, param_spec);
+
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (gimp_prop_radio_button_callback),
+                    config);
+
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (first_button), value);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_radio_button_notify),
+                  button);
+
+  return box;
+}
+
+static void
+gimp_prop_radio_button_callback (GtkWidget *widget,
+                                 GObject   *config)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GParamSpec *param_spec;
+      gint        value;
+      gint        v;
+
+      param_spec = get_param_spec (G_OBJECT (widget));
+      if (! param_spec)
+        return;
+
+      value = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
+                                                  "gimp-item-data"));
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != value)
+        g_object_set (config, param_spec->name, value, NULL);
+    }
+}
+
+static void
+gimp_prop_radio_button_notify (GObject    *config,
+                               GParamSpec *param_spec,
+                               GtkWidget  *button)
+{
+  gint value;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (button), value);
+}
+
+
+/********************/
+/*  layer mode box  */
+/********************/
+
+/**
+ * gimp_prop_layer_mode_box_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @property_name: Name of Enum property.
+ * @context:       A context mask, determining the set of modes to
+ *                 include in the menu.
+ *
+ * Creates a #GimpLayerModeBox widget to display and set the specified
+ * Enum property, for which the enum must be #GimpLayerMode.
+ *
+ * Return value: The newly created #GimpLayerModeBox widget.
+ *
+ * Since GIMP 2.10
+ */
+GtkWidget *
+gimp_prop_layer_mode_box_new (GObject              *config,
+                              const gchar          *property_name,
+                              GimpLayerModeContext  context)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *box;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_ENUM, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  box = gimp_layer_mode_box_new (context);
+
+  g_object_bind_property (config,          property_name,
+                          G_OBJECT (box), "layer-mode",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+
+  return box;
+}
+
+
+/******************/
+/*  color button  */
+/******************/
+
+static void   gimp_prop_color_button_callback (GtkWidget  *widget,
+                                               GObject    *config);
+static void   gimp_prop_color_button_notify   (GObject    *config,
+                                               GParamSpec *param_spec,
+                                               GtkWidget  *button);
+
+/**
+ * gimp_prop_color_button_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @property_name: Name of #GimpRGB property.
+ * @title:         Title of the #GimpColorPanel that is to be created
+ * @width:         Width of color button.
+ * @height:        Height of color button.
+ * @type:          How transparency is represented.
+ *
+ * Creates a #GimpColorPanel to set and display the value of a #GimpRGB
+ * property.  Pressing the button brings up a color selector dialog.
+ * If @title is #NULL, the @property_name's nick will be used as label
+ * of the returned widget.
+ *
+ * Return value:  A new #GimpColorPanel widget.
+ *
+ * Since GIMP 2.4
+ */
+GtkWidget *
+gimp_prop_color_button_new (GObject           *config,
+                            const gchar       *property_name,
+                            const gchar       *title,
+                            gint               width,
+                            gint               height,
+                            GimpColorAreaType  type)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *button;
+  GimpRGB    *value;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   GIMP_TYPE_PARAM_RGB, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  if (! title)
+    title = g_param_spec_get_nick (param_spec);
+
+  g_object_get (config,
+                property_name, &value,
+                NULL);
+
+  button = gimp_color_panel_new (title, value, type, width, height);
+  g_free (value);
+
+  set_param_spec (G_OBJECT (button), button, param_spec);
+
+  g_signal_connect (button, "color-changed",
+                    G_CALLBACK (gimp_prop_color_button_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_color_button_notify),
+                  button);
+
+  return button;
+}
+
+static void
+gimp_prop_color_button_callback (GtkWidget *button,
+                                 GObject   *config)
+{
+  GParamSpec *param_spec;
+  GimpRGB     value;
+
+  param_spec = get_param_spec (G_OBJECT (button));
+  if (! param_spec)
+    return;
+
+  gimp_color_button_get_color (GIMP_COLOR_BUTTON (button), &value);
+
+  g_signal_handlers_block_by_func (config,
+                                   gimp_prop_color_button_notify,
+                                   button);
+
+  g_object_set (config,
+                param_spec->name, &value,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (config,
+                                     gimp_prop_color_button_notify,
+                                     button);
+}
+
+static void
+gimp_prop_color_button_notify (GObject    *config,
+                               GParamSpec *param_spec,
+                               GtkWidget  *button)
+{
+  GimpRGB *value;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  g_signal_handlers_block_by_func (button,
+                                   gimp_prop_color_button_callback,
+                                   config);
+
+  gimp_color_button_set_color (GIMP_COLOR_BUTTON (button), value);
+
+  g_free (value);
+
+  g_signal_handlers_unblock_by_func (button,
+                                     gimp_prop_color_button_callback,
+                                     config);
+}
+
+
+/******************/
+/*  scale button  */
+/******************/
+
+static void   gimp_prop_scale_button_callback (GtkWidget  *widget,
+                                               gdouble     value,
+                                               GObject    *config);
+static void   gimp_prop_scale_button_notify   (GObject    *config,
+                                               GParamSpec *param_spec,
+                                               GtkWidget  *button);
+
+/**
+ * gimp_prop_scale_button_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @property_name: Name of gdouble property
+ *
+ * Creates a #GimpScaleButton to set and display the value of a
+ * gdouble property in a very space-efficient way.
+ *
+ * Return value:  A new #GimpScaleButton widget.
+ *
+ * Since GIMP 2.6
+ */
+GtkWidget *
+gimp_prop_scale_button_new (GObject     *config,
+                            const gchar *property_name)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *button;
+  gdouble     value;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_DOUBLE, G_STRFUNC);
+
+  if (! param_spec)
+    return NULL;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  button = gimp_scale_button_new (value,
+                                  G_PARAM_SPEC_DOUBLE (param_spec)->minimum,
+                                  G_PARAM_SPEC_DOUBLE (param_spec)->maximum);
+
+  set_param_spec (G_OBJECT (button), button, param_spec);
+
+  g_signal_connect (button, "value-changed",
+                    G_CALLBACK (gimp_prop_scale_button_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_scale_button_notify),
+                  button);
+
+  return button;
+}
+
+static void
+gimp_prop_scale_button_callback (GtkWidget *button,
+                                 gdouble    value,
+                                 GObject   *config)
+{
+  GParamSpec *param_spec;
+  gdouble     v;
+
+  param_spec = get_param_spec (G_OBJECT (button));
+  if (! param_spec)
+    return;
+
+  g_object_get (config, param_spec->name, &v, NULL);
+
+  if (v != value)
+    {
+      g_signal_handlers_block_by_func (config,
+                                       gimp_prop_scale_button_notify,
+                                       button);
+
+      g_object_set (config, param_spec->name, value, NULL);
+
+      g_signal_handlers_unblock_by_func (config,
+                                         gimp_prop_scale_button_notify,
+                                         button);
+    }
+}
+
+static void
+gimp_prop_scale_button_notify (GObject    *config,
+                               GParamSpec *param_spec,
+                               GtkWidget  *button)
+{
+  gdouble value;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  g_signal_handlers_block_by_func (button,
+                                   gimp_prop_scale_button_callback,
+                                   config);
+
+  gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), value);
+
+  g_signal_handlers_unblock_by_func (button,
+                                     gimp_prop_scale_button_callback,
+                                     config);
+}
+
+
+/*****************/
+/*  adjustments  */
+/*****************/
+
+static void   gimp_prop_adjustment_callback (GtkAdjustment *adjustment,
+                                             GObject       *config);
+static void   gimp_prop_adjustment_notify   (GObject       *config,
+                                             GParamSpec    *param_spec,
+                                             GtkAdjustment *adjustment);
+
+/**
+ * gimp_prop_spin_scale_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @property_name: Name of gdouble property
+ * @label:         Label of the created #GimpSpinScale.
+ * @step_increment:
+ * @page_increment:
+ * @digits:
+ *
+ * Creates a #GimpSpinScale to set and display the value of a
+ * gdouble property in a very space-efficient way.
+ * If @label is #NULL, the @property_name's nick will be used as label
+ * of the returned widget.
+ * The property's lower and upper values will be used as min/max of the
+ * #GimpSpinScale.
+ *
+ * Return value:  A new #GimpSpinScale widget.
+ *
+ * Since GIMP 2.8
+ */
+GtkWidget *
+gimp_prop_spin_scale_new (GObject     *config,
+                          const gchar *property_name,
+                          const gchar *label,
+                          gdouble      step_increment,
+                          gdouble      page_increment,
+                          gint         digits)
+{
+  GParamSpec    *param_spec;
+  GtkAdjustment *adjustment;
+  GtkWidget     *scale;
+  gdouble        value;
+  gdouble        lower;
+  gdouble        upper;
+
+  param_spec = find_param_spec (config, property_name, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  /* The generic min and max for the property. */
+  if (! _gimp_prop_widgets_get_numeric_values (config, param_spec,
+                                               &value, &lower, &upper,
+                                               G_STRFUNC))
+    return NULL;
+
+  /* Get label. */
+  if (! label)
+    label = g_param_spec_get_nick (param_spec);
+
+  /* Also usable on int properties. */
+  if (! G_IS_PARAM_SPEC_DOUBLE (param_spec))
+    digits = 0;
+
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (value, lower, upper,
+                        step_increment, page_increment, 0.0);
+
+  scale = gimp_spin_scale_new (adjustment, label, digits);
+
+  set_param_spec (G_OBJECT (adjustment), scale, param_spec);
+
+  if (GEGL_IS_PARAM_SPEC_DOUBLE (param_spec))
+    {
+      GeglParamSpecDouble *gspec = GEGL_PARAM_SPEC_DOUBLE (param_spec);
+
+      gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale),
+                                        gspec->ui_minimum, gspec->ui_maximum);
+      gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), gspec->ui_gamma);
+    }
+  else if (GEGL_IS_PARAM_SPEC_INT (param_spec))
+    {
+      GeglParamSpecInt *gspec = GEGL_PARAM_SPEC_INT (param_spec);
+
+      gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale),
+                                        gspec->ui_minimum, gspec->ui_maximum);
+      gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), gspec->ui_gamma);
+    }
+
+  g_signal_connect (adjustment, "value-changed",
+                    G_CALLBACK (gimp_prop_adjustment_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_adjustment_notify),
+                  adjustment);
+
+  return scale;
+}
+
+void
+gimp_prop_widget_set_factor (GtkWidget *widget,
+                             gdouble    factor,
+                             gdouble    step_increment,
+                             gdouble    page_increment,
+                             gint       digits)
+{
+  GtkAdjustment *adjustment;
+  gdouble       *factor_store;
+  gdouble        old_factor = 1.0;
+  gdouble        f;
+
+  g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
+  g_return_if_fail (factor != 0.0);
+  g_return_if_fail (digits >= 0);
+
+  adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
+
+  g_return_if_fail (get_param_spec (G_OBJECT (adjustment)) != NULL);
+
+  factor_store = g_object_get_data (G_OBJECT (adjustment),
+                                    "gimp-prop-adjustment-factor");
+  if (factor_store)
+    {
+      old_factor = *factor_store;
+    }
+  else
+    {
+      factor_store = g_new (gdouble, 1);
+      g_object_set_data_full (G_OBJECT (adjustment),
+                              "gimp-prop-adjustment-factor",
+                              factor_store, (GDestroyNotify) g_free);
+    }
+
+  *factor_store = factor;
+
+  f = factor / old_factor;
+
+  if (step_increment <= 0)
+    step_increment = f * gtk_adjustment_get_step_increment (adjustment);
+
+  if (page_increment <= 0)
+    page_increment = f * gtk_adjustment_get_page_increment (adjustment);
+
+  gtk_adjustment_configure (adjustment,
+                            f * gtk_adjustment_get_value (adjustment),
+                            f * gtk_adjustment_get_lower (adjustment),
+                            f * gtk_adjustment_get_upper (adjustment),
+                            step_increment,
+                            page_increment,
+                            f * gtk_adjustment_get_page_size (adjustment));
+
+  gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), digits);
+}
+
+static void
+gimp_prop_adjustment_callback (GtkAdjustment *adjustment,
+                               GObject       *config)
+{
+  GParamSpec *param_spec;
+  gdouble     value;
+  gdouble    *factor;
+
+  param_spec = get_param_spec (G_OBJECT (adjustment));
+  if (! param_spec)
+    return;
+
+  value = gtk_adjustment_get_value (adjustment);
+
+  factor = g_object_get_data (G_OBJECT (adjustment),
+                              "gimp-prop-adjustment-factor");
+  if (factor)
+    value /= *factor;
+
+  if (G_IS_PARAM_SPEC_INT (param_spec))
+    {
+      gint v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != (gint) value)
+        g_object_set (config, param_spec->name, (gint) value, NULL);
+    }
+  else if (G_IS_PARAM_SPEC_UINT (param_spec))
+    {
+      guint v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != (guint) value)
+        g_object_set (config, param_spec->name, (guint) value, NULL);
+    }
+  else if (G_IS_PARAM_SPEC_LONG (param_spec))
+    {
+      glong v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != (glong) value)
+        g_object_set (config, param_spec->name, (glong) value, NULL);
+    }
+  else if (G_IS_PARAM_SPEC_ULONG (param_spec))
+    {
+      gulong v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != (gulong) value)
+        g_object_set (config, param_spec->name, (gulong) value, NULL);
+    }
+  else if (G_IS_PARAM_SPEC_INT64 (param_spec))
+    {
+      gint64 v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != (gint64) value)
+        g_object_set (config, param_spec->name, (gint64) value, NULL);
+    }
+  else if (G_IS_PARAM_SPEC_UINT64 (param_spec))
+    {
+      guint64 v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != (guint64) value)
+        g_object_set (config, param_spec->name, (guint64) value, NULL);
+    }
+  else if (G_IS_PARAM_SPEC_DOUBLE (param_spec))
+    {
+      gdouble v;
+
+      g_object_get (config, param_spec->name, &v, NULL);
+
+      if (v != value)
+        g_object_set (config, param_spec->name, value, NULL);
+    }
+}
+
+static void
+gimp_prop_adjustment_notify (GObject       *config,
+                             GParamSpec    *param_spec,
+                             GtkAdjustment *adjustment)
+{
+  gdouble  value;
+  gdouble *factor;
+
+  if (G_IS_PARAM_SPEC_INT (param_spec))
+    {
+      gint int_value;
+
+      g_object_get (config, param_spec->name, &int_value, NULL);
+
+      value = int_value;
+    }
+  else if (G_IS_PARAM_SPEC_UINT (param_spec))
+    {
+      guint uint_value;
+
+      g_object_get (config, param_spec->name, &uint_value, NULL);
+
+      value = uint_value;
+    }
+  else if (G_IS_PARAM_SPEC_LONG (param_spec))
+    {
+      glong long_value;
+
+      g_object_get (config, param_spec->name, &long_value, NULL);
+
+      value = long_value;
+    }
+  else if (G_IS_PARAM_SPEC_ULONG (param_spec))
+    {
+      gulong ulong_value;
+
+      g_object_get (config, param_spec->name, &ulong_value, NULL);
+
+      value = ulong_value;
+    }
+  else if (G_IS_PARAM_SPEC_INT64 (param_spec))
+    {
+      gint64 int64_value;
+
+      g_object_get (config, param_spec->name, &int64_value, NULL);
+
+      value = int64_value;
+    }
+  else if (G_IS_PARAM_SPEC_UINT64 (param_spec))
+    {
+      guint64 uint64_value;
+
+      g_object_get (config, param_spec->name, &uint64_value, NULL);
+
+#if defined _MSC_VER && (_MSC_VER < 1300)
+      value = (gint64) uint64_value;
+#else
+      value = uint64_value;
+#endif
+    }
+  else if (G_IS_PARAM_SPEC_DOUBLE (param_spec))
+    {
+      g_object_get (config, param_spec->name, &value, NULL);
+    }
+  else
+    {
+      g_warning ("%s: unhandled param spec of type %s",
+                 G_STRFUNC, G_PARAM_SPEC_TYPE_NAME (param_spec));
+      return;
+    }
+
+  factor = g_object_get_data (G_OBJECT (adjustment),
+                              "gimp-prop-adjustment-factor");
+  if (factor)
+    value *= *factor;
+
+  if (gtk_adjustment_get_value (adjustment) != value)
+    {
+      g_signal_handlers_block_by_func (adjustment,
+                                       gimp_prop_adjustment_callback,
+                                       config);
+
+      gtk_adjustment_set_value (adjustment, value);
+
+      g_signal_handlers_unblock_by_func (adjustment,
+                                         gimp_prop_adjustment_callback,
+                                         config);
+    }
+}
+
+
+/************/
+/*  angles  */
+/************/
+
+static gboolean
+deg_to_rad (GBinding     *binding,
+            const GValue *from_value,
+            GValue       *to_value,
+            gpointer      user_data)
+{
+  gdouble *lower = user_data;
+  gdouble  value = g_value_get_double (from_value);
+
+  if (lower && *lower != 0.0)
+    {
+      if (value < 0.0)
+        value += 360.0;
+    }
+
+  value *= G_PI / 180.0;
+
+  g_value_set_double (to_value, value);
+
+  return TRUE;
+}
+
+static gboolean
+rad_to_deg (GBinding     *binding,
+            const GValue *from_value,
+            GValue       *to_value,
+            gpointer      user_data)
+{
+  gdouble *lower = user_data;
+  gdouble  value = g_value_get_double (from_value);
+
+  value *= 180.0 / G_PI;
+
+  if (lower && *lower != 0.0)
+    {
+      if (value > (*lower + 360.0))
+        value -= 360.0;
+    }
+
+  g_value_set_double (to_value, value);
+
+  return TRUE;
+}
+
+/**
+ * gimp_prop_angle_dial_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @property_name: Name of gdouble property
+ *
+ * Creates a #GimpDial to set and display the value of a
+ * gdouble property that represents an angle.
+ *
+ * Return value:  A new #GimpDial widget.
+ *
+ * Since GIMP 2.10
+ */
+GtkWidget *
+gimp_prop_angle_dial_new (GObject     *config,
+                          const gchar *property_name)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *dial;
+  gdouble     value;
+  gdouble     lower;
+  gdouble     upper;
+
+  param_spec = find_param_spec (config, property_name, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  if (! _gimp_prop_widgets_get_numeric_values (config, param_spec,
+                                               &value, &lower, &upper,
+                                               G_STRFUNC))
+    return NULL;
+
+  dial = gimp_dial_new ();
+
+  g_object_set (dial,
+                "size",       32,
+                "background", GIMP_CIRCLE_BACKGROUND_PLAIN,
+                "draw-beta",  FALSE,
+                NULL);
+
+  set_param_spec (G_OBJECT (dial), dial, param_spec);
+
+  if (lower == 0.0 && upper == 2 * G_PI)
+    {
+      g_object_bind_property (config, property_name,
+                              dial,   "alpha",
+                              G_BINDING_BIDIRECTIONAL |
+                              G_BINDING_SYNC_CREATE);
+    }
+  else if ((upper - lower) == 360.0)
+    {
+      gdouble *l = g_new0 (gdouble, 1);
+
+      *l = lower;
+
+      g_object_bind_property_full (config, property_name,
+                                   dial,   "alpha",
+                                   G_BINDING_BIDIRECTIONAL |
+                                   G_BINDING_SYNC_CREATE,
+                                   deg_to_rad,
+                                   rad_to_deg,
+                                   l, (GDestroyNotify) g_free);
+    }
+
+  return dial;
+}
+
+GtkWidget *
+gimp_prop_angle_range_dial_new (GObject     *config,
+                                const gchar *alpha_property_name,
+                                const gchar *beta_property_name,
+                                const gchar *clockwise_property_name)
+{
+  GParamSpec *alpha_param_spec;
+  GParamSpec *beta_param_spec;
+  GParamSpec *clockwise_param_spec;
+  GtkWidget  *dial;
+
+  alpha_param_spec = find_param_spec (config, alpha_property_name, G_STRFUNC);
+  if (! alpha_param_spec)
+    return NULL;
+
+  beta_param_spec = find_param_spec (config, beta_property_name, G_STRFUNC);
+  if (! beta_param_spec)
+    return NULL;
+
+  clockwise_param_spec = find_param_spec (config, clockwise_property_name, G_STRFUNC);
+  if (! clockwise_param_spec)
+    return NULL;
+
+  dial = gimp_dial_new ();
+
+  g_object_set (dial,
+                "size",         96,
+                "border-width", 0,
+                "background",   GIMP_CIRCLE_BACKGROUND_HSV,
+                NULL);
+
+  g_object_bind_property_full (config, alpha_property_name,
+                               dial,   "alpha",
+                               G_BINDING_BIDIRECTIONAL |
+                               G_BINDING_SYNC_CREATE,
+                               deg_to_rad,
+                               rad_to_deg,
+                               NULL, NULL);
+
+  g_object_bind_property_full (config, beta_property_name,
+                               dial,   "beta",
+                               G_BINDING_BIDIRECTIONAL |
+                               G_BINDING_SYNC_CREATE,
+                               deg_to_rad,
+                               rad_to_deg,
+                               NULL, NULL);
+
+  g_object_bind_property (config, clockwise_property_name,
+                          dial,   "clockwise-delta",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+
+  return dial;
+}
+
+GtkWidget *
+gimp_prop_polar_new (GObject     *config,
+                     const gchar *angle_property_name,
+                     const gchar *radius_property_name)
+{
+  GParamSpec *angle_param_spec;
+  GParamSpec *radius_param_spec;
+  GtkWidget  *polar;
+
+  angle_param_spec = find_param_spec (config, angle_property_name, G_STRFUNC);
+  if (! angle_param_spec)
+    return NULL;
+
+  radius_param_spec = find_param_spec (config, radius_property_name, G_STRFUNC);
+  if (! radius_param_spec)
+    return NULL;
+
+  polar = gimp_polar_new ();
+
+  g_object_set (polar,
+                "size",         90,
+                "border-width", 3,
+                "background",   GIMP_CIRCLE_BACKGROUND_HSV,
+                NULL);
+
+  g_object_bind_property_full (config, angle_property_name,
+                               polar,  "angle",
+                               G_BINDING_BIDIRECTIONAL |
+                               G_BINDING_SYNC_CREATE,
+                               deg_to_rad,
+                               rad_to_deg,
+                               NULL, NULL);
+
+  g_object_bind_property (config, radius_property_name,
+                          polar, "radius",
+                          G_BINDING_BIDIRECTIONAL |
+                          G_BINDING_SYNC_CREATE);
+
+  return polar;
+}
+
+
+/************/
+/*  ranges  */
+/************/
+
+#define RANGE_GRADIENT_HEIGHT 12
+#define RANGE_CONTROL_HEIGHT  10
+
+GtkWidget *
+gimp_prop_range_new (GObject     *config,
+                     const gchar *lower_property_name,
+                     const gchar *upper_property_name,
+                     gdouble      step_increment,
+                     gdouble      page_increment,
+                     gint         digits,
+                     gboolean     sorted)
+{
+  GtkWidget     *vbox;
+  GtkWidget     *color_bar;
+  GtkWidget     *handle_bar;
+  GtkWidget     *hbox;
+  GtkWidget     *spin_button;
+  GtkAdjustment *adjustment1;
+  GtkAdjustment *adjustment2;
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+
+  color_bar = gimp_color_bar_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_widget_set_size_request (color_bar, -1, RANGE_GRADIENT_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox), color_bar, FALSE, FALSE, 0);
+  gtk_widget_show (color_bar);
+
+  handle_bar = gimp_handle_bar_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_widget_set_size_request (handle_bar, -1, RANGE_CONTROL_HEIGHT);
+  gtk_box_pack_start (GTK_BOX (vbox), handle_bar, FALSE, FALSE, 0);
+  gtk_widget_show (handle_bar);
+
+  gimp_handle_bar_connect_events (GIMP_HANDLE_BAR (handle_bar), color_bar);
+
+  g_object_set_data (G_OBJECT (vbox), "gimp-range-handle-bar", handle_bar);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  spin_button = gimp_prop_spin_button_new (config, lower_property_name,
+                                           step_increment, page_increment,
+                                           digits);
+  adjustment1 = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin_button));
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_button), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin_button, FALSE, FALSE, 0);
+  gtk_widget_show (spin_button);
+
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 0, adjustment1);
+
+  spin_button = gimp_prop_spin_button_new (config, upper_property_name,
+                                           step_increment, page_increment,
+                                           digits);
+  adjustment2 = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin_button));
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_button), TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox), spin_button, FALSE, FALSE, 0);
+  gtk_widget_show (spin_button);
+
+  gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (handle_bar), 2, adjustment2);
+
+  if (sorted)
+    gimp_gtk_adjustment_chain (adjustment1, adjustment2);
+
+  return vbox;
+}
+
+void
+gimp_prop_range_set_ui_limits (GtkWidget *widget,
+                               gdouble    lower,
+                               gdouble    upper)
+{
+  GimpHandleBar *handle_bar;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  handle_bar = g_object_get_data (G_OBJECT (widget), "gimp-range-handle-bar");
+
+  gimp_handle_bar_set_limits (handle_bar, lower, upper);
+}
+
+
+/**********/
+/*  view  */
+/**********/
+
+static void   gimp_prop_view_drop   (GtkWidget    *menu,
+                                     gint          x,
+                                     gint          y,
+                                     GimpViewable *viewable,
+                                     gpointer      data);
+static void   gimp_prop_view_notify (GObject      *config,
+                                     GParamSpec   *param_spec,
+                                     GtkWidget    *view);
+
+/**
+ * gimp_prop_view_new:
+ * @config:        #GimpConfig object to which property is attached.
+ * @context:       a #Gimpcontext.
+ * @property_name: Name of #GimpViewable property.
+ * @size:          Width and height of preview display.
+ *
+ * Creates a widget to display the value of a #GimpViewable property.
+ *
+ * Return value:  A new #GimpView widget.
+ *
+ * Since GIMP 2.4
+ */
+GtkWidget *
+gimp_prop_view_new (GObject     *config,
+                    const gchar *property_name,
+                    GimpContext *context,
+                    gint         size)
+{
+  GParamSpec   *param_spec;
+  GtkWidget    *view;
+  GimpViewable *viewable;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_OBJECT, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  if (! g_type_is_a (param_spec->value_type, GIMP_TYPE_VIEWABLE))
+    {
+      g_warning ("%s: property '%s' of %s is not a GimpViewable",
+                 G_STRFUNC, property_name,
+                 g_type_name (G_TYPE_FROM_INSTANCE (config)));
+      return NULL;
+    }
+
+  view = gimp_view_new_by_types (context,
+                                 GIMP_TYPE_VIEW,
+                                 param_spec->value_type,
+                                 size, 0, FALSE);
+
+  if (! view)
+    {
+      g_warning ("%s: cannot create view for type '%s'",
+                 G_STRFUNC, g_type_name (param_spec->value_type));
+      return NULL;
+    }
+
+  g_object_get (config,
+                property_name, &viewable,
+                NULL);
+
+  if (viewable)
+    {
+      gimp_view_set_viewable (GIMP_VIEW (view), viewable);
+      g_object_unref (viewable);
+    }
+
+  set_param_spec (G_OBJECT (view), view, param_spec);
+
+  gimp_dnd_viewable_dest_add (view, param_spec->value_type,
+                              gimp_prop_view_drop,
+                              config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_view_notify),
+                  view);
+
+  return view;
+}
+
+static void
+gimp_prop_view_drop (GtkWidget    *view,
+                     gint          x,
+                     gint          y,
+                     GimpViewable *viewable,
+                     gpointer      data)
+{
+  GObject    *config;
+  GParamSpec *param_spec;
+
+  param_spec = get_param_spec (G_OBJECT (view));
+  if (! param_spec)
+    return;
+
+  config = G_OBJECT (data);
+
+  g_object_set (config,
+                param_spec->name, viewable,
+                NULL);
+}
+
+static void
+gimp_prop_view_notify (GObject      *config,
+                       GParamSpec   *param_spec,
+                       GtkWidget    *view)
+{
+  GimpViewable *viewable;
+
+  g_object_get (config,
+                param_spec->name, &viewable,
+                NULL);
+
+  gimp_view_set_viewable (GIMP_VIEW (view), viewable);
+
+  if (viewable)
+    g_object_unref (viewable);
+}
+
+
+/***********************
+ *  number pair entry  *
+ ***********************/
+
+typedef struct
+{
+  GObject     *config;
+  const gchar *left_number_property;
+  const gchar *right_number_property;
+  const gchar *default_left_number_property;
+  const gchar *default_right_number_property;
+  const gchar *user_override_property;
+} GimpPropNumberPairEntryData;
+
+static void
+gimp_prop_number_pair_entry_data_free (GimpPropNumberPairEntryData *data)
+{
+  g_slice_free (GimpPropNumberPairEntryData, data);
+}
+
+
+static void  gimp_prop_number_pair_entry_config_notify   (GObject                     *config,
+                                                          GParamSpec                  *param_spec,
+                                                          GtkEntry                    *entry);
+static void  gimp_prop_number_pair_entry_number_pair_numbers_changed
+                                                         (GtkWidget                   *widget,
+                                                          GimpPropNumberPairEntryData *data);
+static void  gimp_prop_number_pair_entry_number_pair_user_override_notify
+                                                         (GtkWidget                   *entry,
+                                                          GParamSpec                  *param_spec,
+                                                          GimpPropNumberPairEntryData *data);
+
+
+/**
+ * gimp_prop_number_pair_entry_new:
+ * @config:                        Object to which properties are attached.
+ * @left_number_property:          Name of double property for left number.
+ * @right_number_property:         Name of double property for right number.
+ * @default_left_number_property:  Name of double property for default left number.
+ * @default_right_number_property: Name of double property for default right number.
+ * @user_override_property:        Name of boolean property for user override mode.
+ * @connect_numbers_changed:       %TRUE to connect to the widgets "numbers-changed"
+ *                                 signal, %FALSE to not connect.
+ * @connect_ratio_changed:         %TRUE to connect to the widgets "ratio-changed"
+ *                                 signal, %FALSE to not connect.
+ * @separators:
+ * @allow_simplification:
+ * @min_valid_value:
+ * @max_valid_value:         What to pass to gimp_number_pair_entry_new ().
+ *
+ * Return value: A #GimpNumberPairEntry widget.
+ */
+GtkWidget *
+gimp_prop_number_pair_entry_new (GObject     *config,
+                                 const gchar *left_number_property,
+                                 const gchar *right_number_property,
+                                 const gchar *default_left_number_property,
+                                 const gchar *default_right_number_property,
+                                 const gchar *user_override_property,
+                                 gboolean     connect_numbers_changed,
+                                 gboolean     connect_ratio_changed,
+                                 const gchar *separators,
+                                 gboolean     allow_simplification,
+                                 gdouble      min_valid_value,
+                                 gdouble      max_valid_value)
+{
+  GimpPropNumberPairEntryData *data;
+  GtkWidget                   *number_pair_entry;
+  gdouble                      left_number;
+  gdouble                      right_number;
+  gdouble                      default_left_number;
+  gdouble                      default_right_number;
+  gboolean                     user_override;
+
+
+  /* Setup config data */
+
+  data = g_slice_new (GimpPropNumberPairEntryData);
+
+  data->config                        = config;
+  data->left_number_property          = left_number_property;
+  data->right_number_property         = right_number_property;
+  data->default_left_number_property  = default_left_number_property;
+  data->default_right_number_property = default_right_number_property;
+  data->user_override_property        = user_override_property;
+
+
+  /* Read current values of config properties */
+
+  g_object_get (config,
+                left_number_property,          &left_number,
+                right_number_property,         &right_number,
+                default_left_number_property,  &default_left_number,
+                default_right_number_property, &default_right_number,
+                user_override_property,        &user_override,
+                NULL);
+
+
+  /* Create a GimpNumberPairEntry and setup with config property values */
+
+  number_pair_entry = gimp_number_pair_entry_new (separators,
+                                                  allow_simplification,
+                                                  min_valid_value,
+                                                  max_valid_value);
+
+  g_object_set_data_full (G_OBJECT (number_pair_entry),
+                          "gimp-prop-number-pair-entry-data", data,
+                          (GDestroyNotify) gimp_prop_number_pair_entry_data_free);
+
+  gtk_entry_set_width_chars (GTK_ENTRY (number_pair_entry), 7);
+
+  gimp_number_pair_entry_set_user_override  (GIMP_NUMBER_PAIR_ENTRY (number_pair_entry),
+                                             user_override);
+  gimp_number_pair_entry_set_values         (GIMP_NUMBER_PAIR_ENTRY (number_pair_entry),
+                                             left_number,
+                                             right_number);
+  gimp_number_pair_entry_set_default_values (GIMP_NUMBER_PAIR_ENTRY (number_pair_entry),
+                                             default_left_number,
+                                             default_right_number);
+
+
+  /* Connect to GimpNumberPairEntry signals */
+
+  if (connect_ratio_changed)
+    g_signal_connect (number_pair_entry, "ratio-changed",
+                      G_CALLBACK (gimp_prop_number_pair_entry_number_pair_numbers_changed),
+                      data);
+
+  if (connect_numbers_changed)
+    g_signal_connect (number_pair_entry, "numbers-changed",
+                      G_CALLBACK (gimp_prop_number_pair_entry_number_pair_numbers_changed),
+                      data);
+
+  g_signal_connect (number_pair_entry, "notify::user-override",
+                    G_CALLBACK (gimp_prop_number_pair_entry_number_pair_user_override_notify),
+                    data);
+
+
+  /* Connect to connfig object signals */
+
+  connect_notify (config, left_number_property,
+                  G_CALLBACK (gimp_prop_number_pair_entry_config_notify),
+                  number_pair_entry);
+  connect_notify (config, right_number_property,
+                  G_CALLBACK (gimp_prop_number_pair_entry_config_notify),
+                  number_pair_entry);
+  connect_notify (config, default_left_number_property,
+                  G_CALLBACK (gimp_prop_number_pair_entry_config_notify),
+                  number_pair_entry);
+  connect_notify (config, default_right_number_property,
+                  G_CALLBACK (gimp_prop_number_pair_entry_config_notify),
+                  number_pair_entry);
+  connect_notify (config, user_override_property,
+                  G_CALLBACK (gimp_prop_number_pair_entry_config_notify),
+                  number_pair_entry);
+
+
+  /* Done */
+
+  return number_pair_entry;
+}
+
+static void
+gimp_prop_number_pair_entry_config_notify (GObject    *config,
+                                           GParamSpec *param_spec,
+                                           GtkEntry   *number_pair_entry)
+{
+  GimpPropNumberPairEntryData *data =
+    g_object_get_data (G_OBJECT (number_pair_entry),
+                       "gimp-prop-number-pair-entry-data");
+
+  g_return_if_fail (data != NULL);
+
+  if (strcmp (param_spec->name, data->left_number_property)  == 0 ||
+      strcmp (param_spec->name, data->right_number_property) == 0)
+    {
+      gdouble left_number;
+      gdouble right_number;
+
+      g_object_get (config,
+                    data->left_number_property,  &left_number,
+                    data->right_number_property, &right_number,
+                    NULL);
+
+      gimp_number_pair_entry_set_values (GIMP_NUMBER_PAIR_ENTRY (number_pair_entry),
+                                         left_number,
+                                         right_number);
+    }
+  else if (strcmp (param_spec->name, data->default_left_number_property)  == 0 ||
+           strcmp (param_spec->name, data->default_right_number_property) == 0)
+    {
+      gdouble default_left_number;
+      gdouble default_right_number;
+
+      g_object_get (config,
+                    data->default_left_number_property,  &default_left_number,
+                    data->default_right_number_property, &default_right_number,
+                    NULL);
+
+      gimp_number_pair_entry_set_default_values (GIMP_NUMBER_PAIR_ENTRY (number_pair_entry),
+                                                 default_left_number,
+                                                 default_right_number);
+    }
+  else if (strcmp (param_spec->name, data->user_override_property)  == 0)
+    {
+      gboolean user_override;
+
+      g_object_get (config,
+                    data->user_override_property, &user_override,
+                    NULL);
+
+      gimp_number_pair_entry_set_user_override (GIMP_NUMBER_PAIR_ENTRY (number_pair_entry),
+                                                user_override);
+    }
+}
+
+static void
+gimp_prop_number_pair_entry_number_pair_numbers_changed (GtkWidget                   *widget,
+                                                         GimpPropNumberPairEntryData *data)
+{
+  gdouble left_number;
+  gdouble right_number;
+
+  gimp_number_pair_entry_get_values (GIMP_NUMBER_PAIR_ENTRY (widget),
+                                     &left_number,
+                                     &right_number);
+
+  g_object_set (data->config,
+                data->left_number_property,  left_number,
+                data->right_number_property, right_number,
+                NULL);
+}
+
+static void
+gimp_prop_number_pair_entry_number_pair_user_override_notify (GtkWidget                   *entry,
+                                                              GParamSpec                  *param_spec,
+                                                              GimpPropNumberPairEntryData *data)
+
+{
+  gboolean old_config_user_override;
+  gboolean new_config_user_override;
+
+  g_object_get (data->config,
+                data->user_override_property, &old_config_user_override,
+                NULL);
+
+  new_config_user_override =
+    gimp_number_pair_entry_get_user_override (GIMP_NUMBER_PAIR_ENTRY (entry));
+
+  /* Only set when property changed, to avoid deadlocks */
+  if (new_config_user_override != old_config_user_override)
+    g_object_set (data->config,
+                  data->user_override_property, new_config_user_override,
+                  NULL);
+}
+
+
+/************************/
+/*  language combo-box  */
+/************************/
+
+static void   gimp_prop_language_combo_box_callback (GtkWidget  *combo,
+                                                     GObject    *config);
+static void   gimp_prop_language_combo_box_notify   (GObject    *config,
+                                                     GParamSpec *param_spec,
+                                                     GtkWidget  *combo);
+
+GtkWidget *
+gimp_prop_language_combo_box_new (GObject     *config,
+                                  const gchar *property_name)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *combo;
+  gchar      *value;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_STRING, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  combo = gimp_language_combo_box_new (FALSE, NULL);
+
+  g_object_get (config,
+                property_name, &value,
+                NULL);
+
+  gimp_language_combo_box_set_code (GIMP_LANGUAGE_COMBO_BOX (combo), value);
+  g_free (value);
+
+  set_param_spec (G_OBJECT (combo), combo, param_spec);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_prop_language_combo_box_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_language_combo_box_notify),
+                  combo);
+
+  return combo;
+}
+
+static void
+gimp_prop_language_combo_box_callback (GtkWidget *combo,
+                                       GObject   *config)
+{
+  GParamSpec *param_spec;
+  gchar      *code;
+
+  param_spec = get_param_spec (G_OBJECT (combo));
+  if (! param_spec)
+    return;
+
+  code = gimp_language_combo_box_get_code (GIMP_LANGUAGE_COMBO_BOX (combo));
+
+  g_signal_handlers_block_by_func (config,
+                                   gimp_prop_language_combo_box_notify,
+                                   combo);
+
+  g_object_set (config,
+                param_spec->name, code,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (config,
+                                     gimp_prop_language_combo_box_notify,
+                                     combo);
+
+  g_free (code);
+}
+
+static void
+gimp_prop_language_combo_box_notify (GObject    *config,
+                                     GParamSpec *param_spec,
+                                     GtkWidget  *combo)
+{
+  gchar *value;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  g_signal_handlers_block_by_func (combo,
+                                   gimp_prop_language_combo_box_callback,
+                                   config);
+
+  gimp_language_combo_box_set_code (GIMP_LANGUAGE_COMBO_BOX (combo), value);
+
+  g_signal_handlers_unblock_by_func (combo,
+                                     gimp_prop_language_combo_box_callback,
+                                     config);
+
+  g_free (value);
+}
+
+
+/********************/
+/*  language entry  */
+/********************/
+
+static void   gimp_prop_language_entry_callback (GtkWidget  *entry,
+                                                 GObject    *config);
+static void   gimp_prop_language_entry_notify   (GObject    *config,
+                                                 GParamSpec *param_spec,
+                                                 GtkWidget  *entry);
+
+GtkWidget *
+gimp_prop_language_entry_new (GObject     *config,
+                              const gchar *property_name)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *entry;
+  gchar      *value;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_STRING, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  entry = gimp_language_entry_new ();
+
+  g_object_get (config,
+                property_name, &value,
+                NULL);
+
+  gimp_language_entry_set_code (GIMP_LANGUAGE_ENTRY (entry), value);
+  g_free (value);
+
+  set_param_spec (G_OBJECT (entry), entry, param_spec);
+
+  g_signal_connect (entry, "changed",
+                    G_CALLBACK (gimp_prop_language_entry_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_language_entry_notify),
+                  entry);
+
+  return entry;
+}
+
+static void
+gimp_prop_language_entry_callback (GtkWidget *entry,
+                                   GObject   *config)
+{
+  GParamSpec  *param_spec;
+  const gchar *code;
+
+  param_spec = get_param_spec (G_OBJECT (entry));
+  if (! param_spec)
+    return;
+
+  code = gimp_language_entry_get_code (GIMP_LANGUAGE_ENTRY (entry));
+
+  g_signal_handlers_block_by_func (config,
+                                   gimp_prop_language_entry_notify,
+                                   entry);
+
+  g_object_set (config,
+                param_spec->name, code,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (config,
+                                     gimp_prop_language_entry_notify,
+                                     entry);
+}
+
+static void
+gimp_prop_language_entry_notify (GObject    *config,
+                                 GParamSpec *param_spec,
+                                 GtkWidget  *entry)
+{
+  gchar *value;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  g_signal_handlers_block_by_func (entry,
+                                   gimp_prop_language_entry_callback,
+                                   config);
+
+  gimp_language_entry_set_code (GIMP_LANGUAGE_ENTRY (entry), value);
+
+  g_signal_handlers_unblock_by_func (entry,
+                                     gimp_prop_language_entry_callback,
+                                     config);
+
+  g_free (value);
+}
+
+
+/***********************/
+/*  profile combo box  */
+/***********************/
+
+static void   gimp_prop_profile_combo_callback (GimpColorProfileComboBox *combo,
+                                                GObject                  *config);
+static void   gimp_prop_profile_combo_notify   (GObject                  *config,
+                                                const GParamSpec         *param_spec,
+                                                GimpColorProfileComboBox *combo);
+
+GtkWidget *
+gimp_prop_profile_combo_box_new (GObject      *config,
+                                 const gchar  *property_name,
+                                 GtkListStore *profile_store,
+                                 const gchar  *dialog_title,
+                                 GObject      *profile_path_config,
+                                 const gchar  *profile_path_property_name)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *dialog;
+  GtkWidget  *combo;
+  GFile      *file = NULL;
+
+  param_spec = find_param_spec (config, property_name, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  if (G_IS_PARAM_SPEC_STRING (param_spec))
+    {
+      param_spec = check_param_spec_w (config, property_name,
+                                       G_TYPE_PARAM_STRING, G_STRFUNC);
+    }
+  else
+    {
+      param_spec = check_param_spec_w (config, property_name,
+                                       G_TYPE_PARAM_OBJECT, G_STRFUNC);
+    }
+
+  if (! param_spec)
+    return NULL;
+
+  dialog = gimp_color_profile_chooser_dialog_new (dialog_title, NULL,
+                                                  GTK_FILE_CHOOSER_ACTION_OPEN);
+
+  if (profile_path_config && profile_path_property_name)
+    gimp_color_profile_chooser_dialog_connect_path (dialog,
+                                                    profile_path_config,
+                                                    profile_path_property_name);
+
+  if (G_IS_PARAM_SPEC_STRING (param_spec))
+    {
+      gchar *path;
+
+      g_object_get (config,
+                    property_name, &path,
+                    NULL);
+
+      if (path)
+        {
+          file = gimp_file_new_for_config_path (path, NULL);
+          g_free (path);
+        }
+    }
+  else
+    {
+      g_object_get (config, property_name, &file, NULL);
+    }
+
+  if (profile_store)
+    {
+      combo = gimp_color_profile_combo_box_new_with_model (dialog,
+                                                           GTK_TREE_MODEL (profile_store));
+    }
+  else
+    {
+      gchar *filename;
+
+      filename = gimp_personal_rc_file ("profilerc");
+      combo = gimp_color_profile_combo_box_new (dialog, filename);
+      g_free (filename);
+    }
+
+  gimp_color_profile_combo_box_set_active_file (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
+                                                file, NULL);
+
+  if (file)
+    g_object_unref (file);
+
+  set_param_spec (G_OBJECT (combo), combo, param_spec);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_prop_profile_combo_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_profile_combo_notify),
+                  combo);
+
+  return combo;
+}
+
+static void
+gimp_prop_profile_combo_callback (GimpColorProfileComboBox *combo,
+                                  GObject                  *config)
+{
+  GParamSpec *param_spec;
+  GFile      *file;
+
+  param_spec = get_param_spec (G_OBJECT (combo));
+  if (! param_spec)
+    return;
+
+  file = gimp_color_profile_combo_box_get_active_file (combo);
+
+  if (! file)
+    g_signal_handlers_block_by_func (config,
+                                     gimp_prop_profile_combo_notify,
+                                     combo);
+
+  if (G_IS_PARAM_SPEC_STRING (param_spec))
+    {
+      gchar *path = NULL;
+
+      if (file)
+        path = gimp_file_get_config_path (file, NULL);
+
+      g_object_set (config,
+                    param_spec->name, path,
+                    NULL);
+
+      g_free (path);
+    }
+  else
+    {
+      g_object_set (config,
+                    param_spec->name, file,
+                    NULL);
+    }
+
+  if (! file)
+    g_signal_handlers_unblock_by_func (config,
+                                       gimp_prop_profile_combo_notify,
+                                       combo);
+
+  if (file)
+    g_object_unref (file);
+}
+
+static void
+gimp_prop_profile_combo_notify (GObject                  *config,
+                                const GParamSpec         *param_spec,
+                                GimpColorProfileComboBox *combo)
+{
+  GFile *file = NULL;
+
+  if (G_IS_PARAM_SPEC_STRING (param_spec))
+    {
+      gchar *path;
+
+      g_object_get (config,
+                    param_spec->name, &path,
+                    NULL);
+
+      if (path)
+        {
+          file = gimp_file_new_for_config_path (path, NULL);
+          g_free (path);
+        }
+    }
+  else
+    {
+      g_object_get (config,
+                    param_spec->name, &file,
+                    NULL);
+
+    }
+
+  g_signal_handlers_block_by_func (combo,
+                                   gimp_prop_profile_combo_callback,
+                                   config);
+
+  gimp_color_profile_combo_box_set_active_file (combo, file, NULL);
+
+  g_signal_handlers_unblock_by_func (combo,
+                                     gimp_prop_profile_combo_callback,
+                                     config);
+
+  if (file)
+    g_object_unref (file);
+}
+
+
+/***************************/
+/*  compression combo box  */
+/***************************/
+
+static void   gimp_prop_compression_combo_box_callback (GtkWidget  *combo,
+                                                        GObject    *config);
+static void   gimp_prop_compression_combo_box_notify   (GObject    *config,
+                                                        GParamSpec *param_spec,
+                                                        GtkWidget  *combo);
+
+GtkWidget *
+gimp_prop_compression_combo_box_new (GObject     *config,
+                                     const gchar *property_name)
+{
+  GParamSpec *param_spec;
+  GtkWidget  *combo;
+  gchar      *value;
+
+  param_spec = check_param_spec_w (config, property_name,
+                                   G_TYPE_PARAM_STRING, G_STRFUNC);
+  if (! param_spec)
+    return NULL;
+
+  combo = gimp_compression_combo_box_new ();
+
+  g_object_get (config,
+                property_name, &value,
+                NULL);
+
+  gimp_compression_combo_box_set_compression (
+    GIMP_COMPRESSION_COMBO_BOX (combo), value);
+  g_free (value);
+
+  set_param_spec (G_OBJECT (combo), combo, param_spec);
+
+  g_signal_connect (combo, "changed",
+                    G_CALLBACK (gimp_prop_compression_combo_box_callback),
+                    config);
+
+  connect_notify (config, property_name,
+                  G_CALLBACK (gimp_prop_compression_combo_box_notify),
+                  combo);
+
+  return combo;
+}
+
+static void
+gimp_prop_compression_combo_box_callback (GtkWidget *combo,
+                                          GObject   *config)
+{
+  GParamSpec *param_spec;
+  gchar      *compression;
+
+  param_spec = get_param_spec (G_OBJECT (combo));
+  if (! param_spec)
+    return;
+
+  compression = gimp_compression_combo_box_get_compression (
+    GIMP_COMPRESSION_COMBO_BOX (combo));
+
+  g_signal_handlers_block_by_func (config,
+                                   gimp_prop_compression_combo_box_notify,
+                                   combo);
+
+  g_object_set (config,
+                param_spec->name, compression,
+                NULL);
+
+  g_signal_handlers_unblock_by_func (config,
+                                     gimp_prop_compression_combo_box_notify,
+                                     combo);
+
+  g_free (compression);
+}
+
+static void
+gimp_prop_compression_combo_box_notify (GObject    *config,
+                                        GParamSpec *param_spec,
+                                        GtkWidget  *combo)
+{
+  gchar *value;
+
+  g_object_get (config,
+                param_spec->name, &value,
+                NULL);
+
+  g_signal_handlers_block_by_func (combo,
+                                   gimp_prop_compression_combo_box_callback,
+                                   config);
+
+  gimp_compression_combo_box_set_compression (
+    GIMP_COMPRESSION_COMBO_BOX (combo), value);
+
+  g_signal_handlers_unblock_by_func (combo,
+                                     gimp_prop_compression_combo_box_callback,
+                                     config);
+
+  g_free (value);
+}
+
+
+/*****************/
+/*  icon picker  */
+/*****************/
+
+static void   gimp_prop_icon_picker_callback (GtkWidget  *picker,
+                                              GParamSpec *param_spec,
+                                              GObject    *config);
+static void   gimp_prop_icon_picker_notify   (GObject    *config,
+                                              GParamSpec *param_spec,
+                                              GtkWidget  *picker);
+
+GtkWidget *
+gimp_prop_icon_picker_new (GimpViewable *viewable,
+                           Gimp         *gimp)
+{
+  GObject     *object          = G_OBJECT (viewable);
+  GtkWidget   *picker          = NULL;
+  GdkPixbuf   *pixbuf_value    = NULL;
+  gchar       *icon_name_value = NULL;
+
+  picker = gimp_icon_picker_new (gimp);
+
+  g_object_get (object,
+                "icon-name",   &icon_name_value,
+                "icon-pixbuf", &pixbuf_value,
+                NULL);
+
+  gimp_icon_picker_set_icon_name (GIMP_ICON_PICKER (picker), icon_name_value);
+  gimp_icon_picker_set_icon_pixbuf (GIMP_ICON_PICKER (picker), pixbuf_value);
+
+  g_signal_connect (picker, "notify::icon-pixbuf",
+                    G_CALLBACK (gimp_prop_icon_picker_callback),
+                    object);
+
+  g_signal_connect (picker, "notify::icon-name",
+                    G_CALLBACK (gimp_prop_icon_picker_callback),
+                    object);
+
+  connect_notify (object, "icon-name",
+                  G_CALLBACK (gimp_prop_icon_picker_notify),
+                  picker);
+
+  connect_notify (object, "icon-pixbuf",
+                  G_CALLBACK (gimp_prop_icon_picker_notify),
+                  picker);
+
+  if (icon_name_value)
+    g_free (icon_name_value);
+  if (pixbuf_value)
+    g_object_unref (pixbuf_value);
+
+  return picker;
+}
+
+static void
+gimp_prop_icon_picker_callback (GtkWidget  *picker,
+                                GParamSpec *param_spec,
+                                GObject    *config)
+{
+  g_signal_handlers_block_by_func (config,
+                                   gimp_prop_icon_picker_notify,
+                                   picker);
+
+  if (! strcmp (param_spec->name, "icon-name"))
+    {
+      const gchar *value = gimp_icon_picker_get_icon_name (GIMP_ICON_PICKER (picker));
+
+      g_object_set (config,
+                    "icon-name", value,
+                    NULL);
+
+    }
+  else if (! strcmp (param_spec->name, "icon-pixbuf"))
+    {
+      GdkPixbuf *value = gimp_icon_picker_get_icon_pixbuf (GIMP_ICON_PICKER (picker));
+
+      g_object_set (config,
+                    "icon-pixbuf", value,
+                    NULL);
+    }
+
+
+  g_signal_handlers_unblock_by_func (config,
+                                     gimp_prop_icon_picker_notify,
+                                     picker);
+}
+
+static void
+gimp_prop_icon_picker_notify (GObject    *config,
+                              GParamSpec *param_spec,
+                              GtkWidget  *picker)
+{
+  g_signal_handlers_block_by_func (picker,
+                                   gimp_prop_icon_picker_callback,
+                                   config);
+
+  if (!strcmp (param_spec->name, "icon-name"))
+    {
+      gchar *value = NULL;
+
+      g_object_get (config,
+                    "icon-name", &value,
+                    NULL);
+
+      gimp_icon_picker_set_icon_name (GIMP_ICON_PICKER (picker), value);
+
+      if (value)
+        g_free (value);
+    }
+  else if (!strcmp (param_spec->name, "icon-pixbuf"))
+    {
+      GdkPixbuf *value = NULL;
+
+      g_object_get (config,
+                    "icon-pixbuf", &value,
+                    NULL);
+
+      gimp_icon_picker_set_icon_pixbuf (GIMP_ICON_PICKER (picker), value);
+
+      if (value)
+        g_object_unref (value);
+    }
+
+  g_signal_handlers_unblock_by_func (picker,
+                                     gimp_prop_icon_picker_callback,
+                                     config);
+}
+
+
+/******************************/
+/*  public utility functions  */
+/******************************/
+
+gboolean
+_gimp_prop_widgets_get_numeric_values (GObject     *object,
+                                       GParamSpec  *param_spec,
+                                       gdouble     *value,
+                                       gdouble     *lower,
+                                       gdouble     *upper,
+                                       const gchar *strloc)
+{
+  if (G_IS_PARAM_SPEC_INT (param_spec))
+    {
+      GParamSpecInt *int_spec = G_PARAM_SPEC_INT (param_spec);
+      gint           int_value;
+
+      g_object_get (object, param_spec->name, &int_value, NULL);
+
+      *value = int_value;
+      *lower = int_spec->minimum;
+      *upper = int_spec->maximum;
+    }
+  else if (G_IS_PARAM_SPEC_UINT (param_spec))
+    {
+      GParamSpecUInt *uint_spec = G_PARAM_SPEC_UINT (param_spec);
+      guint           uint_value;
+
+      g_object_get (object, param_spec->name, &uint_value, NULL);
+
+      *value = uint_value;
+      *lower = uint_spec->minimum;
+      *upper = uint_spec->maximum;
+    }
+  else if (G_IS_PARAM_SPEC_DOUBLE (param_spec))
+    {
+      GParamSpecDouble *double_spec = G_PARAM_SPEC_DOUBLE (param_spec);
+
+      g_object_get (object, param_spec->name, value, NULL);
+
+      *lower = double_spec->minimum;
+      *upper = double_spec->maximum;
+    }
+  else
+    {
+      g_warning ("%s: property '%s' of %s is not numeric",
+                 strloc,
+                 param_spec->name,
+                 g_type_name (G_TYPE_FROM_INSTANCE (object)));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*******************************/
+/*  private utility functions  */
+/*******************************/
+
+static GQuark gimp_prop_widgets_param_spec_quark (void) G_GNUC_CONST;
+
+#define PARAM_SPEC_QUARK (gimp_prop_widgets_param_spec_quark ())
+
+static GQuark
+gimp_prop_widgets_param_spec_quark (void)
+{
+  static GQuark param_spec_quark = 0;
+
+  if (! param_spec_quark)
+    param_spec_quark = g_quark_from_static_string ("gimp-config-param-spec");
+
+  return param_spec_quark;
+}
+
+static void
+set_param_spec (GObject     *object,
+                GtkWidget   *widget,
+                GParamSpec  *param_spec)
+{
+  if (object)
+    {
+      g_object_set_qdata (object, PARAM_SPEC_QUARK, param_spec);
+    }
+
+  if (widget)
+    {
+      const gchar *blurb = g_param_spec_get_blurb (param_spec);
+
+      if (blurb)
+        gimp_help_set_help_data (widget, blurb, NULL);
+    }
+}
+
+static GParamSpec *
+get_param_spec (GObject *object)
+{
+  return g_object_get_qdata (object, PARAM_SPEC_QUARK);
+}
+
+static GParamSpec *
+find_param_spec (GObject     *object,
+                 const gchar *property_name,
+                 const gchar *strloc)
+{
+  GParamSpec *param_spec;
+
+  param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (object),
+                                             property_name);
+
+  if (! param_spec)
+    g_warning ("%s: %s has no property named '%s'",
+               strloc,
+               g_type_name (G_TYPE_FROM_INSTANCE (object)),
+               property_name);
+
+  return param_spec;
+}
+
+static GParamSpec *
+check_param_spec (GObject     *object,
+                  const gchar *property_name,
+                  GType        type,
+                  const gchar *strloc)
+{
+  GParamSpec *param_spec;
+
+  param_spec = find_param_spec (object, property_name, strloc);
+
+  if (param_spec && ! g_type_is_a (G_TYPE_FROM_INSTANCE (param_spec), type))
+    {
+      g_warning ("%s: property '%s' of %s is not a %s",
+                 strloc,
+                 param_spec->name,
+                 g_type_name (param_spec->owner_type),
+                 g_type_name (type));
+      return NULL;
+    }
+
+  return param_spec;
+}
+
+static GParamSpec *
+check_param_spec_w (GObject     *object,
+                    const gchar *property_name,
+                    GType        type,
+                    const gchar *strloc)
+{
+  GParamSpec *param_spec;
+
+  param_spec = check_param_spec (object, property_name, type, strloc);
+
+  if (param_spec &&
+      (param_spec->flags & G_PARAM_WRITABLE) == 0)
+    {
+      g_warning ("%s: property '%s' of %s is not writable",
+                 strloc,
+                 param_spec->name,
+                 g_type_name (param_spec->owner_type));
+      return NULL;
+    }
+
+  return param_spec;
+}
+
+static void
+connect_notify (GObject     *config,
+                const gchar *property_name,
+                GCallback    callback,
+                gpointer     callback_data)
+{
+  gchar *notify_name;
+
+  notify_name = g_strconcat ("notify::", property_name, NULL);
+
+  g_signal_connect_object (config, notify_name, callback, callback_data, 0);
+
+  g_free (notify_name);
+}
diff --git a/app/widgets/gimppropwidgets.h b/app/widgets/gimppropwidgets.h
new file mode 100644
index 0000000..ba19778
--- /dev/null
+++ b/app/widgets/gimppropwidgets.h
@@ -0,0 +1,153 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropwidgets.h
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_APP_PROP_WIDGETS_H__
+#define __GIMP_APP_PROP_WIDGETS_H__
+
+
+/*  GParamBoolean  */
+
+GtkWidget * gimp_prop_expanding_frame_new   (GObject       *config,
+                                             const gchar   *property_name,
+                                             const gchar   *button_label,
+                                             GtkWidget     *child,
+                                             GtkWidget    **button);
+
+GtkWidget * gimp_prop_boolean_icon_box_new  (GObject      *config,
+                                             const gchar  *property_name,
+                                             const gchar  *true_icon,
+                                             const gchar  *false_icon,
+                                             const gchar  *true_tooltip,
+                                             const gchar  *false_tooltip);
+
+
+/*  GParamEnum  */
+
+GtkWidget * gimp_prop_layer_mode_box_new    (GObject       *config,
+                                             const gchar   *property_name,
+                                             GimpLayerModeContext  context);
+
+
+/*  GimpParamColor  */
+
+GtkWidget * gimp_prop_color_button_new      (GObject       *config,
+                                             const gchar   *property_name,
+                                             const gchar   *title,
+                                             gint           width,
+                                             gint           height,
+                                             GimpColorAreaType  type);
+
+
+/*  GParamDouble  */
+
+GtkWidget * gimp_prop_scale_button_new      (GObject       *config,
+                                             const gchar   *property_name);
+GtkWidget * gimp_prop_spin_scale_new        (GObject       *config,
+                                             const gchar   *property_name,
+                                             const gchar   *label,
+                                             gdouble        step_increment,
+                                             gdouble        page_increment,
+                                             gint           digits);
+
+void        gimp_prop_widget_set_factor     (GtkWidget     *widget,
+                                             gdouble        factor,
+                                             gdouble        step_increment,
+                                             gdouble        page_increment,
+                                             gint           digits);
+
+GtkWidget * gimp_prop_angle_dial_new        (GObject       *config,
+                                             const gchar   *property_name);
+GtkWidget * gimp_prop_angle_range_dial_new  (GObject       *config,
+                                             const gchar   *alpha_property_name,
+                                             const gchar   *beta_property_name,
+                                             const gchar   *clockwise_property_name);
+
+GtkWidget * gimp_prop_polar_new             (GObject       *config,
+                                             const gchar   *angle_property_name,
+                                             const gchar   *radius_property_name);
+
+GtkWidget * gimp_prop_range_new             (GObject       *config,
+                                             const gchar   *lower_property_name,
+                                             const gchar   *upper_property_name,
+                                             gdouble        step_increment,
+                                             gdouble        page_increment,
+                                             gint           digits,
+                                             gboolean       sorted);
+void        gimp_prop_range_set_ui_limits   (GtkWidget     *widget,
+                                             gdouble        lower,
+                                             gdouble        upper);
+
+
+/*  GParamObject (GimpViewable)  */
+
+GtkWidget * gimp_prop_view_new              (GObject       *config,
+                                             const gchar   *property_name,
+                                             GimpContext   *context,
+                                             gint           size);
+
+
+/*  GParamDouble, GParamDouble, GParamDouble, GParamDouble, GParamBoolean  */
+
+GtkWidget * gimp_prop_number_pair_entry_new (GObject     *config,
+                                             const gchar *left_number_property,
+                                             const gchar *right_number_property,
+                                             const gchar *default_left_number_property,
+                                             const gchar *default_right_number_property,
+                                             const gchar *user_override_property,
+                                             gboolean     connect_numbers_changed,
+                                             gboolean     connect_ratio_changed,
+                                             const gchar *separators,
+                                             gboolean     allow_simplification,
+                                             gdouble      min_valid_value,
+                                             gdouble      max_valid_value);
+
+
+/*  GParamString  */
+
+GtkWidget * gimp_prop_language_combo_box_new    (GObject      *config,
+                                                 const gchar  *property_name);
+GtkWidget * gimp_prop_language_entry_new        (GObject      *config,
+                                                 const gchar  *property_name);
+
+GtkWidget * gimp_prop_profile_combo_box_new     (GObject      *config,
+                                                 const gchar  *property_name,
+                                                 GtkListStore *profile_store,
+                                                 const gchar  *dialog_title,
+                                                 GObject      *profile_path_config,
+                                                 const gchar  *profile_path_property_name);
+
+GtkWidget * gimp_prop_compression_combo_box_new (GObject     *config,
+                                                 const gchar *property_name);
+
+GtkWidget * gimp_prop_icon_picker_new           (GimpViewable *viewable,
+                                                 Gimp         *gimp);
+
+
+/*  Utility functions  */
+
+gboolean _gimp_prop_widgets_get_numeric_values (GObject     *object,
+                                                GParamSpec  *param_spec,
+                                                gdouble     *value,
+                                                gdouble     *lower,
+                                                gdouble     *upper,
+                                                const gchar *strloc);
+
+
+#endif /* __GIMP_APP_PROP_WIDGETS_H__ */
diff --git a/app/widgets/gimpradioaction.c b/app/widgets/gimpradioaction.c
new file mode 100644
index 0000000..3f18178
--- /dev/null
+++ b/app/widgets/gimpradioaction.c
@@ -0,0 +1,109 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpradioaction.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpaction.h"
+#include "gimpradioaction.h"
+
+
+static void   gimp_radio_action_connect_proxy (GtkAction      *action,
+                                               GtkWidget      *proxy);
+
+static void   gimp_radio_action_changed       (GtkRadioAction *action,
+                                               GtkRadioAction *current);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpRadioAction, gimp_radio_action,
+                         GTK_TYPE_RADIO_ACTION,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_ACTION, NULL))
+
+#define parent_class gimp_radio_action_parent_class
+
+
+static void
+gimp_radio_action_class_init (GimpRadioActionClass *klass)
+{
+  GtkActionClass      *action_class = GTK_ACTION_CLASS (klass);
+  GtkRadioActionClass *radio_class  = GTK_RADIO_ACTION_CLASS (klass);
+
+  action_class->connect_proxy = gimp_radio_action_connect_proxy;
+
+  radio_class->changed        = gimp_radio_action_changed;
+}
+
+static void
+gimp_radio_action_init (GimpRadioAction *action)
+{
+  gimp_action_init (GIMP_ACTION (action));
+}
+
+static void
+gimp_radio_action_connect_proxy (GtkAction *action,
+                                 GtkWidget *proxy)
+{
+  GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
+
+  gimp_action_set_proxy (GIMP_ACTION (action), proxy);
+}
+
+static void
+gimp_radio_action_changed (GtkRadioAction *action,
+                           GtkRadioAction *current)
+{
+  gint value = gtk_radio_action_get_current_value (action);
+
+  gimp_action_emit_change_state (GIMP_ACTION (action),
+                                 g_variant_new_int32 (value));
+}
+
+
+/*  public functions  */
+
+GtkRadioAction *
+gimp_radio_action_new (const gchar *name,
+                       const gchar *label,
+                       const gchar *tooltip,
+                       const gchar *icon_name,
+                       const gchar *help_id,
+                       gint         value)
+{
+  GtkRadioAction *action;
+
+  action = g_object_new (GIMP_TYPE_RADIO_ACTION,
+                         "name",      name,
+                         "label",     label,
+                         "tooltip",   tooltip,
+                         "icon-name", icon_name,
+                         "value",     value,
+                         NULL);
+
+  gimp_action_set_help_id (GIMP_ACTION (action), help_id);
+
+  return action;
+}
diff --git a/app/widgets/gimpradioaction.h b/app/widgets/gimpradioaction.h
new file mode 100644
index 0000000..7f50fb3
--- /dev/null
+++ b/app/widgets/gimpradioaction.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpradioaction.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RADIO_ACTION_H__
+#define __GIMP_RADIO_ACTION_H__
+
+
+#define GIMP_TYPE_RADIO_ACTION            (gimp_radio_action_get_type ())
+#define GIMP_RADIO_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioAction))
+#define GIMP_RADIO_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
+#define GIMP_IS_RADIO_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RADIO_ACTION))
+#define GIMP_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ACTION))
+#define GIMP_RADIO_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
+
+
+typedef struct _GimpRadioAction      GimpRadioAction;
+typedef struct _GimpRadioActionClass GimpRadioActionClass;
+
+struct _GimpRadioAction
+{
+  GtkRadioAction  parent_instance;
+};
+
+struct _GimpRadioActionClass
+{
+  GtkRadioActionClass  parent_class;
+};
+
+
+GType            gimp_radio_action_get_type (void) G_GNUC_CONST;
+
+GtkRadioAction * gimp_radio_action_new      (const gchar *name,
+                                             const gchar *label,
+                                             const gchar *tooltip,
+                                             const gchar *icon_name,
+                                             const gchar *help_id,
+                                             gint         value);
+
+
+#endif  /* __GIMP_RADIO_ACTION_H__ */
diff --git a/app/widgets/gimprender.c b/app/widgets/gimprender.c
new file mode 100644
index 0000000..549ed02
--- /dev/null
+++ b/app/widgets/gimprender.c
@@ -0,0 +1,95 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+
+#include "gimprender.h"
+
+
+static void   gimp_render_setup_notify (gpointer    config,
+                                        GParamSpec *param_spec,
+                                        Gimp       *gimp);
+
+
+static GimpRGB light;
+static GimpRGB dark;
+
+
+void
+gimp_render_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_signal_connect (gimp->config, "notify::transparency-type",
+                    G_CALLBACK (gimp_render_setup_notify),
+                    gimp);
+
+  gimp_render_setup_notify (gimp->config, NULL, gimp);
+}
+
+void
+gimp_render_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_signal_handlers_disconnect_by_func (gimp->config,
+                                        gimp_render_setup_notify,
+                                        gimp);
+}
+
+const GimpRGB *
+gimp_render_light_check_color (void)
+{
+  return &light;
+}
+
+const GimpRGB *
+gimp_render_dark_check_color (void)
+{
+  return &dark;
+}
+
+static void
+gimp_render_setup_notify (gpointer    config,
+                          GParamSpec *param_spec,
+                          Gimp       *gimp)
+{
+  GimpCheckType check_type;
+  guchar        dark_check;
+  guchar        light_check;
+
+  g_object_get (config,
+                "transparency-type", &check_type,
+                NULL);
+
+  gimp_checks_get_shades (check_type, &light_check, &dark_check);
+
+  gimp_rgba_set_uchar (&light, light_check, light_check, light_check, 255);
+  gimp_rgba_set_uchar (&dark,  dark_check,  dark_check,  dark_check,  255);
+}
diff --git a/app/widgets/gimprender.h b/app/widgets/gimprender.h
new file mode 100644
index 0000000..c1ecdb3
--- /dev/null
+++ b/app/widgets/gimprender.h
@@ -0,0 +1,29 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_RENDER_H__
+#define __GIMP_RENDER_H__
+
+
+void            gimp_render_init              (Gimp *gimp);
+void            gimp_render_exit              (Gimp *gimp);
+
+const GimpRGB * gimp_render_light_check_color (void);
+const GimpRGB * gimp_render_dark_check_color  (void);
+
+
+#endif /* __GIMP_RENDER_H__ */
diff --git a/app/widgets/gimpsamplepointeditor.c b/app/widgets/gimpsamplepointeditor.c
new file mode 100644
index 0000000..48d7f33
--- /dev/null
+++ b/app/widgets/gimpsamplepointeditor.c
@@ -0,0 +1,623 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsamplepointeditor.c
+ * Copyright (C) 2005-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-color.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpsamplepoint.h"
+
+#include "gimpcolorframe.h"
+#include "gimpmenufactory.h"
+#include "gimpsamplepointeditor.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLE_MERGED
+};
+
+
+static void   gimp_sample_point_editor_constructed    (GObject               *object);
+static void   gimp_sample_point_editor_dispose        (GObject               *object);
+static void   gimp_sample_point_editor_set_property   (GObject               *object,
+                                                       guint                  property_id,
+                                                       const GValue          *value,
+                                                       GParamSpec            *pspec);
+static void   gimp_sample_point_editor_get_property   (GObject               *object,
+                                                       guint                  property_id,
+                                                       GValue                *value,
+                                                       GParamSpec            *pspec);
+
+static void   gimp_sample_point_editor_style_set      (GtkWidget             *widget,
+                                                       GtkStyle              *prev_style);
+static void   gimp_sample_point_editor_set_image      (GimpImageEditor       *editor,
+                                                       GimpImage             *image);
+
+static void   gimp_sample_point_editor_point_added    (GimpImage             *image,
+                                                       GimpSamplePoint       *sample_point,
+                                                       GimpSamplePointEditor *editor);
+static void   gimp_sample_point_editor_point_removed  (GimpImage             *image,
+                                                       GimpSamplePoint       *sample_point,
+                                                       GimpSamplePointEditor *editor);
+static void   gimp_sample_point_editor_point_moved    (GimpImage             *image,
+                                                       GimpSamplePoint       *sample_point,
+                                                       GimpSamplePointEditor *editor);
+static void   gimp_sample_point_editor_proj_update    (GimpImage             *image,
+                                                       gboolean               now,
+                                                       gint                   x,
+                                                       gint                   y,
+                                                       gint                   width,
+                                                       gint                   height,
+                                                       GimpSamplePointEditor *editor);
+static void   gimp_sample_point_editor_points_changed (GimpSamplePointEditor *editor);
+static void   gimp_sample_point_editor_dirty          (GimpSamplePointEditor *editor,
+                                                       gint                   index);
+static gboolean gimp_sample_point_editor_update       (GimpSamplePointEditor *editor);
+static void     gimp_sample_point_editor_mode_notify  (GimpColorFrame        *frame,
+                                                       const GParamSpec      *pspec,
+                                                       GimpSamplePointEditor *editor);
+
+
+G_DEFINE_TYPE (GimpSamplePointEditor, gimp_sample_point_editor,
+               GIMP_TYPE_IMAGE_EDITOR)
+
+#define parent_class gimp_sample_point_editor_parent_class
+
+
+static void
+gimp_sample_point_editor_class_init (GimpSamplePointEditorClass *klass)
+{
+  GObjectClass         *object_class       = G_OBJECT_CLASS (klass);
+  GtkWidgetClass       *widget_class       = GTK_WIDGET_CLASS (klass);
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  object_class->constructed     = gimp_sample_point_editor_constructed;
+  object_class->dispose         = gimp_sample_point_editor_dispose;
+  object_class->get_property    = gimp_sample_point_editor_get_property;
+  object_class->set_property    = gimp_sample_point_editor_set_property;
+
+  widget_class->style_set       = gimp_sample_point_editor_style_set;
+
+  image_editor_class->set_image = gimp_sample_point_editor_set_image;
+
+  g_object_class_install_property (object_class, PROP_SAMPLE_MERGED,
+                                   g_param_spec_boolean ("sample-merged",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_sample_point_editor_init (GimpSamplePointEditor *editor)
+{
+  GtkWidget *scrolled_window;
+  GtkWidget *viewport;
+  GtkWidget *vbox;
+  gint       content_spacing;
+
+  editor->sample_merged = TRUE;
+
+  gtk_widget_style_get (GTK_WIDGET (editor),
+                        "content-spacing", &content_spacing,
+                        NULL);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_NONE);
+  gtk_box_pack_start (GTK_BOX (editor), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  viewport = gtk_viewport_new (NULL, NULL);
+  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
+  gtk_widget_show (viewport);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (viewport), vbox);
+  gtk_widget_show (vbox);
+
+  editor->empty_icon = gtk_image_new_from_icon_name (GIMP_ICON_SAMPLE_POINT,
+                                                     GTK_ICON_SIZE_BUTTON);
+  gtk_box_pack_start (GTK_BOX (vbox), editor->empty_icon, TRUE, TRUE, 0);
+  gtk_widget_show (editor->empty_icon);
+
+  editor->empty_label = gtk_label_new (_("This image\nhas no\nsample points"));
+  gtk_label_set_justify (GTK_LABEL (editor->empty_label), GTK_JUSTIFY_CENTER);
+  gimp_label_set_attributes (GTK_LABEL (editor->empty_label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), editor->empty_label, TRUE, TRUE, 0);
+
+  editor->table = gtk_table_new (1, 2, TRUE);
+  gtk_table_set_row_spacings (GTK_TABLE (editor->table), content_spacing);
+  gtk_table_set_col_spacings (GTK_TABLE (editor->table), content_spacing);
+  gtk_box_pack_start (GTK_BOX (vbox), editor->table, FALSE, FALSE, 0);
+  gtk_widget_show (editor->table);
+}
+
+static void
+gimp_sample_point_editor_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+static void
+gimp_sample_point_editor_dispose (GObject *object)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (object);
+
+  g_clear_pointer (&editor->color_frames, g_free);
+
+  if (editor->dirty_idle_id)
+    {
+      g_source_remove (editor->dirty_idle_id);
+      editor->dirty_idle_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_sample_point_editor_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_MERGED:
+      gimp_sample_point_editor_set_sample_merged (editor,
+                                                  g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_sample_point_editor_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, editor->sample_merged);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_sample_point_editor_style_set (GtkWidget *widget,
+                                    GtkStyle  *prev_style)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (widget);
+  gint                   content_spacing;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_style_get (widget,
+                        "content-spacing", &content_spacing,
+                        NULL);
+
+  gtk_table_set_row_spacings (GTK_TABLE (editor->table), content_spacing);
+  gtk_table_set_col_spacings (GTK_TABLE (editor->table), content_spacing);
+}
+
+static void
+gimp_sample_point_editor_set_image (GimpImageEditor *image_editor,
+                                    GimpImage       *image)
+{
+  GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (image_editor);
+
+  if (image_editor->image)
+    {
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_sample_point_editor_point_added,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_sample_point_editor_point_removed,
+                                            editor);
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_sample_point_editor_point_moved,
+                                            editor);
+
+      g_signal_handlers_disconnect_by_func (gimp_image_get_projection (image_editor->image),
+                                            gimp_sample_point_editor_proj_update,
+                                            editor);
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (image_editor, image);
+
+  if (image)
+    {
+      g_signal_connect (image, "sample-point-added",
+                        G_CALLBACK (gimp_sample_point_editor_point_added),
+                        editor);
+      g_signal_connect (image, "sample-point-removed",
+                        G_CALLBACK (gimp_sample_point_editor_point_removed),
+                        editor);
+      g_signal_connect (image, "sample-point-moved",
+                        G_CALLBACK (gimp_sample_point_editor_point_moved),
+                        editor);
+
+      g_signal_connect (gimp_image_get_projection (image), "update",
+                        G_CALLBACK (gimp_sample_point_editor_proj_update),
+                        editor);
+    }
+
+  gtk_widget_set_visible (editor->empty_icon,
+                          image_editor->image == NULL);
+
+  gimp_sample_point_editor_points_changed (editor);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_sample_point_editor_new (GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_SAMPLE_POINT_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<SamplePoints>",
+                       "ui-path",         "/sample-points-popup",
+                       NULL);
+}
+
+void
+gimp_sample_point_editor_set_sample_merged (GimpSamplePointEditor *editor,
+                                            gboolean               sample_merged)
+{
+  g_return_if_fail (GIMP_IS_SAMPLE_POINT_EDITOR (editor));
+
+  sample_merged = sample_merged ? TRUE : FALSE;
+
+  if (editor->sample_merged != sample_merged)
+    {
+      editor->sample_merged = sample_merged;
+
+      gimp_sample_point_editor_dirty (editor, -1);
+
+      g_object_notify (G_OBJECT (editor), "sample-merged");
+    }
+}
+
+gboolean
+gimp_sample_point_editor_get_sample_merged (GimpSamplePointEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_SAMPLE_POINT_EDITOR (editor), FALSE);
+
+  return editor->sample_merged;
+}
+
+/*  private functions  */
+
+static void
+gimp_sample_point_editor_point_added (GimpImage             *image,
+                                      GimpSamplePoint       *sample_point,
+                                      GimpSamplePointEditor *editor)
+{
+  gimp_sample_point_editor_points_changed (editor);
+}
+
+static void
+gimp_sample_point_editor_point_removed (GimpImage             *image,
+                                        GimpSamplePoint       *sample_point,
+                                        GimpSamplePointEditor *editor)
+{
+  gimp_sample_point_editor_points_changed (editor);
+}
+
+static void
+gimp_sample_point_editor_point_moved (GimpImage             *image,
+                                      GimpSamplePoint       *sample_point,
+                                      GimpSamplePointEditor *editor)
+{
+  gint i = g_list_index (gimp_image_get_sample_points (image), sample_point);
+
+  gimp_sample_point_editor_dirty (editor, i);
+}
+
+static void
+gimp_sample_point_editor_proj_update (GimpImage             *image,
+                                      gboolean               now,
+                                      gint                   x,
+                                      gint                   y,
+                                      gint                   width,
+                                      gint                   height,
+                                      GimpSamplePointEditor *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GList           *sample_points;
+  gint             n_points     = 0;
+  GList           *list;
+  gint             i;
+
+  sample_points = gimp_image_get_sample_points (image_editor->image);
+
+  n_points = MIN (editor->n_color_frames, g_list_length (sample_points));
+
+  for (i = 0, list = sample_points;
+       i < n_points;
+       i++, list = g_list_next (list))
+    {
+      GimpSamplePoint *sample_point = list->data;
+      gint             sp_x;
+      gint             sp_y;
+
+      gimp_sample_point_get_position (sample_point, &sp_x, &sp_y);
+
+      if (sp_x >= x && sp_x < (x + width) &&
+          sp_y >= y && sp_y < (y + height))
+        {
+          gimp_sample_point_editor_dirty (editor, i);
+        }
+    }
+}
+
+static void
+gimp_sample_point_editor_points_changed (GimpSamplePointEditor *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GList           *sample_points;
+  gint             n_points     = 0;
+  gint             i;
+
+  if (image_editor->image)
+    {
+      sample_points = gimp_image_get_sample_points (image_editor->image);
+      n_points = g_list_length (sample_points);
+    }
+
+  gtk_widget_set_visible (editor->empty_label,
+                          image_editor->image && n_points == 0);
+
+  /*  Keep that many color frames around so they remember their color
+   *  model. Let's hope nobody uses more and notices they get reset to
+   *  "pixel". See https://gitlab.gnome.org/GNOME/gimp/issues/1805
+   */
+#define RANDOM_MAGIC 16
+
+  if (n_points < editor->n_color_frames &&
+      n_points < RANDOM_MAGIC           &&
+      editor->n_color_frames > RANDOM_MAGIC)
+    {
+      for (i = RANDOM_MAGIC; i < editor->n_color_frames; i++)
+        {
+          gtk_widget_destroy (editor->color_frames[i]);
+        }
+
+      editor->color_frames = g_renew (GtkWidget *, editor->color_frames,
+                                      RANDOM_MAGIC);
+
+      editor->n_color_frames = RANDOM_MAGIC;
+    }
+  else if (n_points > editor->n_color_frames)
+    {
+      GimpColorConfig *config;
+
+      config = image_editor->image->gimp->config->color_management;
+
+      editor->color_frames = g_renew (GtkWidget *, editor->color_frames,
+                                      n_points);
+
+      for (i = editor->n_color_frames; i < n_points; i++)
+        {
+          gint row    = i / 2;
+          gint column = i % 2;
+
+          editor->color_frames[i] =
+            g_object_new (GIMP_TYPE_COLOR_FRAME,
+                          "mode",           GIMP_COLOR_PICK_MODE_PIXEL,
+                          "has-number",     TRUE,
+                          "number",         i + 1,
+                          "has-color-area", TRUE,
+                          "has-coords",     TRUE,
+                          NULL);
+
+          gimp_color_frame_set_color_config (GIMP_COLOR_FRAME (editor->color_frames[i]),
+                                             config);
+
+          gtk_table_attach (GTK_TABLE (editor->table), editor->color_frames[i],
+                            column, column + 1, row, row + 1,
+                            GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+          g_signal_connect_object (editor->color_frames[i], "notify::mode",
+                                   G_CALLBACK (gimp_sample_point_editor_mode_notify),
+                                   editor, 0);
+
+          g_object_set_data (G_OBJECT (editor->color_frames[i]),
+                             "dirty", GINT_TO_POINTER (TRUE));
+        }
+
+      editor->n_color_frames = n_points;
+    }
+
+  for (i = 0; i < editor->n_color_frames; i++)
+    {
+      gtk_widget_set_visible (editor->color_frames[i], i < n_points);
+    }
+
+  if (n_points > 0)
+    gimp_sample_point_editor_dirty (editor, -1);
+}
+
+static void
+gimp_sample_point_editor_dirty (GimpSamplePointEditor *editor,
+                                gint                   index)
+{
+  if (index >= 0)
+    {
+      g_object_set_data (G_OBJECT (editor->color_frames[index]),
+                         "dirty", GINT_TO_POINTER (TRUE));
+    }
+  else
+    {
+      gint i;
+
+      for (i = 0; i < editor->n_color_frames; i++)
+        g_object_set_data (G_OBJECT (editor->color_frames[i]),
+                           "dirty", GINT_TO_POINTER (TRUE));
+    }
+
+  if (editor->dirty_idle_id)
+    g_source_remove (editor->dirty_idle_id);
+
+  editor->dirty_idle_id =
+    g_idle_add ((GSourceFunc) gimp_sample_point_editor_update,
+                editor);
+}
+
+static gboolean
+gimp_sample_point_editor_update (GimpSamplePointEditor *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GList           *sample_points;
+  gint             n_points;
+  GList           *list;
+  gint             i;
+
+  editor->dirty_idle_id = 0;
+
+  if (! image_editor->image)
+    return FALSE;
+
+  sample_points = gimp_image_get_sample_points (image_editor->image);
+
+  n_points = MIN (editor->n_color_frames, g_list_length (sample_points));
+
+  for (i = 0, list = sample_points;
+       i < n_points;
+       i++, list = g_list_next (list))
+    {
+      GimpColorFrame *color_frame = GIMP_COLOR_FRAME (editor->color_frames[i]);
+
+      if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (color_frame),
+                                              "dirty")))
+        {
+          GimpSamplePoint   *sample_point = list->data;
+          const Babl        *format;
+          gdouble            pixel[4];
+          GimpRGB            color;
+          GimpColorPickMode  pick_mode;
+          gint               x;
+          gint               y;
+
+          g_object_set_data (G_OBJECT (color_frame),
+                             "dirty", GINT_TO_POINTER (FALSE));
+
+          gimp_sample_point_get_position (sample_point, &x, &y);
+
+          if (gimp_image_pick_color (image_editor->image, NULL,
+                                     x, y,
+                                     FALSE,
+                                     editor->sample_merged,
+                                     FALSE, 0.0,
+                                     &format,
+                                     pixel,
+                                     &color))
+            {
+              gimp_color_frame_set_color (color_frame, FALSE,
+                                          format, pixel, &color,
+                                          x, y);
+            }
+          else
+            {
+              gimp_color_frame_set_invalid (color_frame);
+            }
+
+          pick_mode = gimp_sample_point_get_pick_mode (sample_point);
+
+          gimp_color_frame_set_mode (color_frame, pick_mode);
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_sample_point_editor_mode_notify (GimpColorFrame        *frame,
+                                      const GParamSpec      *pspec,
+                                      GimpSamplePointEditor *editor)
+{
+  GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GList           *sample_points;
+  gint             n_points;
+  GList           *list;
+  gint             i;
+
+  sample_points = gimp_image_get_sample_points (image_editor->image);
+
+  n_points = MIN (editor->n_color_frames, g_list_length (sample_points));
+
+  for (i = 0, list = sample_points;
+       i < n_points;
+       i++, list = g_list_next (list))
+    {
+      if (GIMP_COLOR_FRAME (editor->color_frames[i]) == frame)
+        {
+          GimpSamplePoint   *sample_point = list->data;
+          GimpColorPickMode  pick_mode;
+
+          g_object_get (frame, "mode", &pick_mode, NULL);
+
+          if (pick_mode != gimp_sample_point_get_pick_mode (sample_point))
+            gimp_image_set_sample_point_pick_mode (image_editor->image,
+                                                   sample_point,
+                                                   pick_mode,
+                                                   TRUE);
+          break;
+        }
+    }
+}
diff --git a/app/widgets/gimpsamplepointeditor.h b/app/widgets/gimpsamplepointeditor.h
new file mode 100644
index 0000000..dfe3bf5
--- /dev/null
+++ b/app/widgets/gimpsamplepointeditor.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsamplepointeditor.h
+ * Copyright (C) 2005-2016 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SAMPLE_POINT_EDITOR_H__
+#define __GIMP_SAMPLE_POINT_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_SAMPLE_POINT_EDITOR            (gimp_sample_point_editor_get_type ())
+#define GIMP_SAMPLE_POINT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SAMPLE_POINT_EDITOR, GimpSamplePointEditor))
+#define GIMP_SAMPLE_POINT_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SAMPLE_POINT_EDITOR, GimpSamplePointEditorClass))
+#define GIMP_IS_SAMPLE_POINT_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SAMPLE_POINT_EDITOR))
+#define GIMP_IS_SAMPLE_POINT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SAMPLE_POINT_EDITOR))
+#define GIMP_SAMPLE_POINT_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SAMPLE_POINT_EDITOR, GimpSamplePointEditorClass))
+
+
+typedef struct _GimpSamplePointEditorClass GimpSamplePointEditorClass;
+
+struct _GimpSamplePointEditor
+{
+  GimpImageEditor  parent_instance;
+
+  GtkWidget       *empty_icon;
+  GtkWidget       *empty_label;
+
+  GtkWidget       *table;
+  GtkWidget      **color_frames;
+  gint             n_color_frames;
+
+  guint            dirty_idle_id;
+
+  gboolean         sample_merged;
+};
+
+struct _GimpSamplePointEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_sample_point_editor_get_type          (void) G_GNUC_CONST;
+
+GtkWidget * gimp_sample_point_editor_new               (GimpMenuFactory *menu_factory);
+
+void        gimp_sample_point_editor_set_sample_merged (GimpSamplePointEditor *editor,
+                                                        gboolean               sample_merged);
+gboolean    gimp_sample_point_editor_get_sample_merged (GimpSamplePointEditor *editor);
+
+
+#endif /* __GIMP_SAMPLE_POINT_EDITOR_H__ */
diff --git a/app/widgets/gimpsavedialog.c b/app/widgets/gimpsavedialog.c
new file mode 100644
index 0000000..4dc90a3
--- /dev/null
+++ b/app/widgets/gimpsavedialog.c
@@ -0,0 +1,477 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsavedialog.c
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-metadata.h"
+
+#include "file/gimp-file.h"
+
+#include "gimphelp-ids.h"
+#include "gimpsavedialog.h"
+
+#include "gimp-intl.h"
+
+
+typedef struct _GimpSaveDialogState GimpSaveDialogState;
+
+struct _GimpSaveDialogState
+{
+  gchar    *filter_name;
+  gboolean  compression;
+};
+
+
+static void     gimp_save_dialog_constructed       (GObject             *object);
+
+static void     gimp_save_dialog_save_state        (GimpFileDialog      *dialog,
+                                                    const gchar         *state_name);
+static void     gimp_save_dialog_load_state        (GimpFileDialog      *dialog,
+                                                    const gchar         *state_name);
+
+static void     gimp_save_dialog_add_extra_widgets (GimpSaveDialog      *dialog);
+static void     gimp_save_dialog_compression_toggled
+                                                   (GtkToggleButton     *button,
+                                                    GimpSaveDialog      *dialog);
+
+static GimpSaveDialogState
+              * gimp_save_dialog_get_state         (GimpSaveDialog      *dialog);
+static void     gimp_save_dialog_set_state         (GimpSaveDialog      *dialog,
+                                                    GimpSaveDialogState *state);
+static void     gimp_save_dialog_state_destroy     (GimpSaveDialogState *state);
+
+
+G_DEFINE_TYPE (GimpSaveDialog, gimp_save_dialog,
+               GIMP_TYPE_FILE_DIALOG)
+
+#define parent_class gimp_save_dialog_parent_class
+
+
+static void
+gimp_save_dialog_class_init (GimpSaveDialogClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpFileDialogClass *fd_class     = GIMP_FILE_DIALOG_CLASS (klass);
+
+  object_class->constructed = gimp_save_dialog_constructed;
+
+  fd_class->save_state      = gimp_save_dialog_save_state;
+  fd_class->load_state      = gimp_save_dialog_load_state;
+}
+
+static void
+gimp_save_dialog_init (GimpSaveDialog *dialog)
+{
+}
+
+static void
+gimp_save_dialog_constructed (GObject *object)
+{
+  GimpSaveDialog *dialog = GIMP_SAVE_DIALOG (object);
+
+  /* GimpFileDialog's constructed() is doing a few initialization
+   * common to all file dialogs.
+   */
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_save_dialog_add_extra_widgets (dialog);
+}
+
+static void
+gimp_save_dialog_save_state (GimpFileDialog *dialog,
+                             const gchar    *state_name)
+{
+  g_object_set_data_full (G_OBJECT (dialog->gimp), state_name,
+                          gimp_save_dialog_get_state (GIMP_SAVE_DIALOG (dialog)),
+                          (GDestroyNotify) gimp_save_dialog_state_destroy);
+}
+
+static void
+gimp_save_dialog_load_state (GimpFileDialog *dialog,
+                             const gchar    *state_name)
+{
+  GimpSaveDialogState *state;
+
+  state = g_object_get_data (G_OBJECT (dialog->gimp), state_name);
+
+  if (state)
+    gimp_save_dialog_set_state (GIMP_SAVE_DIALOG (dialog), state);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_save_dialog_new (Gimp *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  return g_object_new (GIMP_TYPE_SAVE_DIALOG,
+                       "gimp",                  gimp,
+                       "title",                 _("Save Image"),
+                       "role",                  "gimp-file-save",
+                       "help-id",               GIMP_HELP_FILE_SAVE,
+                       "ok-button-label",       _("_Save"),
+
+                       "automatic-label",       _("By Extension"),
+                       "automatic-help-id",     GIMP_HELP_FILE_SAVE_BY_EXTENSION,
+
+                       "action",                GTK_FILE_CHOOSER_ACTION_SAVE,
+                       "file-procs",            GIMP_FILE_PROCEDURE_GROUP_SAVE,
+                       "file-procs-all-images", GIMP_FILE_PROCEDURE_GROUP_EXPORT,
+                       "file-filter-label",     _("All XCF images"),
+                       NULL);
+}
+
+void
+gimp_save_dialog_set_image (GimpSaveDialog *dialog,
+                            GimpImage      *image,
+                            gboolean        save_a_copy,
+                            gboolean        close_after_saving,
+                            GimpObject     *display)
+{
+  GimpFileDialog *file_dialog;
+  GtkWidget      *compression_toggle;
+  GFile          *dir_file  = NULL;
+  GFile          *name_file = NULL;
+  GFile          *ext_file  = NULL;
+  gchar          *basename;
+  const gchar    *version_string;
+  gint            rle_version;
+  gint            zlib_version;
+
+  g_return_if_fail (GIMP_IS_SAVE_DIALOG (dialog));
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  file_dialog = GIMP_FILE_DIALOG (dialog);
+
+  file_dialog->image         = image;
+  dialog->save_a_copy        = save_a_copy;
+  dialog->close_after_saving = close_after_saving;
+  dialog->display_to_close   = display;
+
+  gimp_file_dialog_set_file_proc (file_dialog, NULL);
+
+  /*
+   * Priority of default paths for Save:
+   *
+   *   1. Last Save a copy-path (applies only to Save a copy)
+   *   2. Last Save path
+   *   3. Path of source XCF
+   *   4. Path of Import source
+   *   5. Last Save path of any GIMP document
+   *   6. The default path (usually the OS 'Documents' path)
+   */
+
+  if (save_a_copy)
+    dir_file = gimp_image_get_save_a_copy_file (image);
+
+  if (! dir_file)
+    dir_file = gimp_image_get_file (image);
+
+  if (! dir_file)
+    dir_file = g_object_get_data (G_OBJECT (image),
+                                  "gimp-image-source-file");
+
+  if (! dir_file)
+    dir_file = gimp_image_get_imported_file (image);
+
+  if (! dir_file)
+    dir_file = g_object_get_data (G_OBJECT (file_dialog->gimp),
+                                  GIMP_FILE_SAVE_LAST_FILE_KEY);
+
+  if (! dir_file)
+    dir_file = gimp_file_dialog_get_default_folder (file_dialog);
+
+
+  /* Priority of default basenames for Save:
+   *
+   *   1. Last Save a copy-name (applies only to Save a copy)
+   *   2. Last Save name
+   *   3. Last Export name
+   *   3. The source image path
+   *   3. 'Untitled'
+   */
+
+  if (save_a_copy)
+    name_file = gimp_image_get_save_a_copy_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_exported_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_imported_file (image);
+
+  if (! name_file)
+    name_file = gimp_image_get_untitled_file (image);
+
+
+  /* Priority of default type/extension for Save:
+   *
+   *   1. Type of last Save
+   *   2. .xcf (which we don't explicitly append)
+   */
+
+  ext_file = gimp_image_get_file (image);
+
+  if (ext_file)
+    g_object_ref (ext_file);
+  else
+    ext_file = g_file_new_for_uri ("file:///we/only/care/about/extension.xcf");
+
+  gimp_image_get_xcf_version (image, FALSE, &rle_version,
+                              &version_string, NULL);
+  gimp_image_get_xcf_version (image, TRUE,  &zlib_version,
+                              NULL, NULL);
+  if (rle_version != zlib_version)
+    {
+      GtkWidget *label;
+      gchar     *text;
+
+      text = g_strdup_printf (_("Keep compression disabled to make the XCF "
+                                "file readable by %s and later."),
+                              version_string);
+      label = gtk_label_new (text);
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gimp_label_set_attributes (GTK_LABEL (label),
+                                 PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                                 -1);
+      gtk_container_add (GTK_CONTAINER (dialog->compression_frame),
+                         label);
+      gtk_widget_show (label);
+      g_free (text);
+    }
+
+  compression_toggle = gtk_frame_get_label_widget (GTK_FRAME (dialog->compression_frame));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (compression_toggle),
+                                gimp_image_get_xcf_compression (image));
+  /* Force a "toggled" signal since gtk_toggle_button_set_active() won't
+   * send it if the button status doesn't change.
+   */
+  gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (compression_toggle));
+
+  if (ext_file)
+    {
+      GFile *tmp_file = gimp_file_with_new_extension (name_file, ext_file);
+      basename = g_path_get_basename (gimp_file_get_utf8_name (tmp_file));
+      g_object_unref (tmp_file);
+      g_object_unref (ext_file);
+    }
+  else
+    {
+      basename = g_path_get_basename (gimp_file_get_utf8_name (name_file));
+    }
+
+  if (g_file_query_file_type (dir_file, G_FILE_QUERY_INFO_NONE, NULL) ==
+      G_FILE_TYPE_DIRECTORY)
+    {
+      gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                                dir_file, NULL);
+    }
+  else
+    {
+      GFile *parent_file = g_file_get_parent (dir_file);
+      gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                                parent_file, NULL);
+      g_object_unref (parent_file);
+    }
+
+  gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);
+  g_free (basename);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_save_dialog_add_extra_widgets (GimpSaveDialog *dialog)
+{
+  GtkWidget *label;
+  GtkWidget *reasons;
+  GtkWidget *compression_toggle;
+
+  /* Compression toggle. */
+  compression_toggle =
+    gtk_check_button_new_with_mnemonic (_("Save this _XCF file with better but slower compression"));
+  gtk_widget_set_tooltip_text (compression_toggle,
+                               _("On edge cases, better compression algorithms might still "
+                                 "end up on bigger file size; manual check recommended"));
+
+  dialog->compression_frame = gimp_frame_new (NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (dialog->compression_frame), compression_toggle);
+  gtk_widget_show (compression_toggle);
+  gimp_file_dialog_add_extra_widget (GIMP_FILE_DIALOG (dialog), dialog->compression_frame,
+                                     FALSE, FALSE, 0);
+  gtk_widget_show (dialog->compression_frame);
+
+  /* Additional information explaining file compatibility things */
+  dialog->compat_info = gtk_expander_new (NULL);
+  label = gtk_label_new ("");
+  gtk_expander_set_label_widget (GTK_EXPANDER (dialog->compat_info), label);
+  gtk_widget_show (label);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+
+  reasons = gtk_text_view_new ();
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (reasons), FALSE);
+  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (reasons), FALSE);
+  gtk_container_add (GTK_CONTAINER (dialog->compat_info), reasons);
+  gtk_widget_show (reasons);
+
+  gimp_file_dialog_add_extra_widget (GIMP_FILE_DIALOG (dialog),
+                                     dialog->compat_info,
+                                     FALSE, FALSE, 0);
+  gtk_widget_show (dialog->compat_info);
+
+  g_signal_connect (compression_toggle, "toggled",
+                    G_CALLBACK (gimp_save_dialog_compression_toggled),
+                    dialog);
+}
+
+static void
+gimp_save_dialog_compression_toggled (GtkToggleButton *button,
+                                      GimpSaveDialog  *dialog)
+{
+  const gchar    *version_string = NULL;
+  GimpFileDialog *file_dialog    = GIMP_FILE_DIALOG (dialog);
+  gchar          *compat_hint    = NULL;
+  gchar          *reason         = NULL;
+  GtkWidget      *widget;
+  GtkTextBuffer  *text_buffer;
+  gint            version;
+
+  if (! file_dialog->image)
+    return;
+
+  dialog->compression = gtk_toggle_button_get_active (button);
+
+  if (dialog->compression)
+    gimp_image_get_xcf_version (file_dialog->image, TRUE,  &version,
+                                &version_string, &reason);
+  else
+    gimp_image_get_xcf_version (file_dialog->image, FALSE, &version,
+                                &version_string, &reason);
+
+  /* Only show compatibility information for GIMP over 2.6. The reason
+   * is mostly that we don't have details to make a compatibility list
+   * with this older version.
+   * It's anyway so prehistorical that we are not really caring about
+   * compatibility with older version.
+   */
+  if (version <= 206)
+    gtk_widget_hide (dialog->compat_info);
+  else
+    gtk_widget_show (dialog->compat_info);
+
+  /* Set the compatibility label. */
+  compat_hint =
+    g_strdup_printf (_("The image uses features from %s and "
+                       "won't be readable by older GIMP versions."),
+                     version_string);
+
+  if (gimp_image_get_metadata (file_dialog->image))
+    {
+      gchar *temp_hint;
+
+      temp_hint = g_strconcat (compat_hint, "\n",
+                               _("Metadata won't be visible in GIMP "
+                                 "older than version 2.10."), NULL);
+      g_free (compat_hint);
+      compat_hint = temp_hint;
+    }
+
+  widget = gtk_expander_get_label_widget (GTK_EXPANDER (dialog->compat_info));
+  gtk_label_set_text (GTK_LABEL (widget), compat_hint);
+  g_free (compat_hint);
+
+  /* Fill in the details (list of compatibility reasons). */
+  widget = gtk_bin_get_child (GTK_BIN (dialog->compat_info));
+  text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
+  gtk_text_buffer_set_text (text_buffer, reason ? reason : "", -1);
+  if (reason)
+    g_free (reason);
+}
+
+static GimpSaveDialogState *
+gimp_save_dialog_get_state (GimpSaveDialog *dialog)
+{
+  GimpSaveDialogState *state;
+  GtkFileFilter       *filter;
+
+  state = g_slice_new0 (GimpSaveDialogState);
+
+  filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog));
+
+  if (filter)
+    state->filter_name = g_strdup (gtk_file_filter_get_name (filter));
+
+  state->compression = dialog->compression;
+
+  return state;
+}
+
+static void
+gimp_save_dialog_set_state (GimpSaveDialog      *dialog,
+                            GimpSaveDialogState *state)
+{
+  if (state->filter_name)
+    {
+      GSList *filters;
+      GSList *list;
+
+      filters = gtk_file_chooser_list_filters (GTK_FILE_CHOOSER (dialog));
+
+      for (list = filters; list; list = list->next)
+        {
+          GtkFileFilter *filter = GTK_FILE_FILTER (list->data);
+          const gchar   *name   = gtk_file_filter_get_name (filter);
+
+          if (name && strcmp (state->filter_name, name) == 0)
+            {
+              gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+              break;
+            }
+        }
+
+      g_slist_free (filters);
+    }
+
+  dialog->compression = state->compression;
+}
+
+static void
+gimp_save_dialog_state_destroy (GimpSaveDialogState *state)
+{
+  g_free (state->filter_name);
+  g_slice_free (GimpSaveDialogState, state);
+}
diff --git a/app/widgets/gimpsavedialog.h b/app/widgets/gimpsavedialog.h
new file mode 100644
index 0000000..1966e8e
--- /dev/null
+++ b/app/widgets/gimpsavedialog.h
@@ -0,0 +1,69 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsavedialog.h
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SAVE_DIALOG_H__
+#define __GIMP_SAVE_DIALOG_H__
+
+#include "gimpfiledialog.h"
+
+G_BEGIN_DECLS
+
+#define GIMP_TYPE_SAVE_DIALOG            (gimp_save_dialog_get_type ())
+#define GIMP_SAVE_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SAVE_DIALOG, GimpSaveDialog))
+#define GIMP_SAVE_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SAVE_DIALOG, GimpSaveDialogClass))
+#define GIMP_IS_SAVE_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SAVE_DIALOG))
+#define GIMP_IS_SAVE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SAVE_DIALOG))
+#define GIMP_SAVE_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SAVE_DIALOG, GimpSaveDialogClass))
+
+
+typedef struct _GimpSaveDialogClass GimpSaveDialogClass;
+
+struct _GimpSaveDialog
+{
+  GimpFileDialog       parent_instance;
+
+  gboolean             save_a_copy;
+  gboolean             close_after_saving;
+  GimpObject          *display_to_close;
+
+  GtkWidget           *compression_frame;
+  GtkWidget           *compat_info;
+  gboolean             compression;
+};
+
+struct _GimpSaveDialogClass
+{
+  GimpFileDialogClass  parent_class;
+};
+
+
+GType       gimp_save_dialog_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_save_dialog_new       (Gimp           *gimp);
+
+void        gimp_save_dialog_set_image (GimpSaveDialog *dialog,
+                                        GimpImage      *image,
+                                        gboolean        save_a_copy,
+                                        gboolean        close_after_saving,
+                                        GimpObject     *display);
+
+G_END_DECLS
+
+#endif /* __GIMP_SAVE_DIALOG_H__ */
diff --git a/app/widgets/gimpscalebutton.c b/app/widgets/gimpscalebutton.c
new file mode 100644
index 0000000..7735316
--- /dev/null
+++ b/app/widgets/gimpscalebutton.c
@@ -0,0 +1,202 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpscalebutton.c
+ * Copyright (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpscalebutton.h"
+
+
+static void      gimp_scale_button_value_changed  (GtkScaleButton  *button,
+                                                   gdouble          value);
+static void      gimp_scale_button_update_tooltip (GimpScaleButton *button);
+static gboolean  gimp_scale_button_image_expose   (GtkWidget       *widget,
+                                                   GdkEventExpose  *event,
+                                                   GimpScaleButton *button);
+
+
+G_DEFINE_TYPE (GimpScaleButton, gimp_scale_button, GTK_TYPE_SCALE_BUTTON)
+
+#define parent_class gimp_scale_button_parent_class
+
+
+static void
+gimp_scale_button_class_init (GimpScaleButtonClass *klass)
+{
+  GtkScaleButtonClass *button_class = GTK_SCALE_BUTTON_CLASS (klass);
+
+  button_class->value_changed = gimp_scale_button_value_changed;
+}
+
+static void
+gimp_scale_button_init (GimpScaleButton *button)
+{
+  GtkWidget *image = gtk_bin_get_child (GTK_BIN (button));
+  GtkWidget *plusminus;
+
+  plusminus = gtk_scale_button_get_plus_button (GTK_SCALE_BUTTON (button));
+  gtk_widget_hide (plusminus);
+  gtk_widget_set_no_show_all (plusminus, TRUE);
+
+  plusminus = gtk_scale_button_get_minus_button (GTK_SCALE_BUTTON (button));
+  gtk_widget_hide (plusminus);
+  gtk_widget_set_no_show_all (plusminus, TRUE);
+
+  g_signal_connect (image, "expose-event",
+                    G_CALLBACK (gimp_scale_button_image_expose),
+                    button);
+
+  /* GtkScaleButton doesn't emit "value-changed" when the adjustment changes */
+  g_signal_connect (button, "notify::adjustment",
+                    G_CALLBACK (gimp_scale_button_update_tooltip),
+                    NULL);
+
+  gimp_scale_button_update_tooltip (button);
+}
+
+static void
+gimp_scale_button_value_changed (GtkScaleButton *button,
+                                 gdouble         value)
+{
+  if (GTK_SCALE_BUTTON_CLASS (parent_class)->value_changed)
+    GTK_SCALE_BUTTON_CLASS (parent_class)->value_changed (button, value);
+
+  gimp_scale_button_update_tooltip (GIMP_SCALE_BUTTON (button));
+}
+
+static void
+gimp_scale_button_update_tooltip (GimpScaleButton *button)
+{
+  GtkAdjustment *adj;
+  gchar         *text;
+  gdouble        value;
+  gdouble        lower;
+  gdouble        upper;
+
+  adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
+
+  value = gtk_adjustment_get_value (adj);
+  lower = gtk_adjustment_get_lower (adj);
+  upper = gtk_adjustment_get_upper (adj);
+
+  /*  use U+2009 THIN SPACE to separate the percent sign from the number */
+
+  text = g_strdup_printf ("%d\342\200\211%%",
+                          (gint) (0.5 + ((value - lower) * 100.0 /
+                                         (upper - lower))));
+
+  gtk_widget_set_tooltip_text (GTK_WIDGET (button), text);
+  g_free (text);
+}
+
+static gboolean
+gimp_scale_button_image_expose (GtkWidget       *widget,
+                                GdkEventExpose  *event,
+                                GimpScaleButton *button)
+{
+  GtkStyle      *style = gtk_widget_get_style (widget);
+  GtkAllocation  allocation;
+  GtkAdjustment *adj;
+  cairo_t       *cr;
+  gint           value;
+  gint           steps;
+  gint           i;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  steps = MIN (allocation.width, allocation.height) / 2;
+
+  adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
+
+  if (steps < 1)
+    return TRUE;
+
+  value = 0.5 + ((gtk_adjustment_get_value (adj) -
+                  gtk_adjustment_get_lower (adj)) * (gdouble) steps /
+                 (gtk_adjustment_get_upper (adj) -
+                  gtk_adjustment_get_lower (adj)));
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_clip (cr);
+
+  cairo_set_line_width (cr, 0.5);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    {
+      cairo_translate (cr,
+                       allocation.x + allocation.width - 0.5,
+                       allocation.y + allocation.height);
+      cairo_scale (cr, -2.0, -2.0);
+    }
+  else
+    {
+      cairo_translate (cr,
+                       allocation.x + 0.5,
+                       allocation.y + allocation.height);
+      cairo_scale (cr, 2.0, -2.0);
+    }
+
+  for (i = 0; i < value; i++)
+    {
+      cairo_move_to (cr, i, 0);
+      cairo_line_to (cr, i, i + 0.5);
+    }
+
+  gdk_cairo_set_source_color (cr, &style->fg[gtk_widget_get_state (widget)]);
+  cairo_stroke (cr);
+
+  for ( ; i < steps; i++)
+    {
+      cairo_move_to (cr, i, 0);
+      cairo_line_to (cr, i, i + 0.5);
+    }
+
+  gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_INSENSITIVE]);
+  cairo_stroke (cr);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+GtkWidget *
+gimp_scale_button_new (gdouble value,
+                       gdouble min,
+                       gdouble max)
+{
+  GtkObject *adj;
+  gdouble    step;
+
+  g_return_val_if_fail (value >= min && value <= max, NULL);
+
+  step = (max - min) / 10.0;
+  adj  = gtk_adjustment_new (value, min, max, step, step, 0);
+
+  return g_object_new (GIMP_TYPE_SCALE_BUTTON,
+                       "orientation", GTK_ORIENTATION_HORIZONTAL,
+                       "adjustment",  adj,
+                       "size",        GTK_ICON_SIZE_MENU,
+                       NULL);
+}
diff --git a/app/widgets/gimpscalebutton.h b/app/widgets/gimpscalebutton.h
new file mode 100644
index 0000000..a47c055
--- /dev/null
+++ b/app/widgets/gimpscalebutton.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpscalebutton.h
+ * Copyright (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SCALE_BUTTON_H__
+#define __GIMP_SCALE_BUTTON_H__
+
+
+#define GIMP_TYPE_SCALE_BUTTON            (gimp_scale_button_get_type ())
+#define GIMP_SCALE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButton))
+#define GIMP_SCALE_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass))
+#define GIMP_IS_SCALE_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SCALE_BUTTON))
+#define GIMP_IS_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_SCALE_BUTTON))
+#define GIMP_SCALE_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass))
+
+
+typedef struct _GimpScaleButtonClass GimpScaleButtonClass;
+
+struct _GimpScaleButton
+{
+  GtkScaleButton      parent_instance;
+};
+
+struct _GimpScaleButtonClass
+{
+  GtkScaleButtonClass parent_class;
+};
+
+
+GType       gimp_scale_button_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_scale_button_new      (gdouble value,
+                                        gdouble min,
+                                        gdouble max);
+
+
+#endif  /* __GIMP_SCALE_BUTTON_H__ */
diff --git a/app/widgets/gimpsearchpopup.c b/app/widgets/gimpsearchpopup.c
new file mode 100644
index 0000000..fb43477
--- /dev/null
+++ b/app/widgets/gimpsearchpopup.c
@@ -0,0 +1,773 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsearchpopup.c
+ * Copyright (C) 2015 Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+
+#include "gimpaction.h"
+#include "gimppopup.h"
+#include "gimpsearchpopup.h"
+#include "gimptoggleaction.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLUMN_ICON,
+  COLUMN_MARKUP,
+  COLUMN_TOOLTIP,
+  COLUMN_ACTION,
+  COLUMN_SENSITIVE,
+  COLUMN_SECTION,
+  N_COL
+};
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_CALLBACK,
+  PROP_CALLBACK_DATA
+};
+
+
+struct _GimpSearchPopupPrivate
+{
+  Gimp                    *gimp;
+  GtkWidget               *keyword_entry;
+  GtkWidget               *results_list;
+  GtkWidget               *list_view;
+
+  GimpSearchPopupCallback  build_results;
+  gpointer                 build_results_data;
+};
+
+
+static void       gimp_search_popup_constructed         (GObject            *object);
+static void       gimp_search_popup_set_property        (GObject            *object,
+                                                         guint               property_id,
+                                                         const GValue       *value,
+                                                         GParamSpec         *pspec);
+static void       gimp_search_popup_get_property        (GObject            *object,
+                                                         guint               property_id,
+                                                         GValue             *value,
+                                                         GParamSpec         *pspec);
+
+static void       gimp_search_popup_size_allocate        (GtkWidget         *widget,
+                                                          GtkAllocation     *allocation);
+
+static void       gimp_search_popup_confirm              (GimpPopup *popup);
+
+/* Signal handlers on the search entry */
+static gboolean   keyword_entry_key_press_event          (GtkWidget         *widget,
+                                                          GdkEventKey       *event,
+                                                          GimpSearchPopup   *popup);
+static gboolean   keyword_entry_key_release_event        (GtkWidget         *widget,
+                                                          GdkEventKey       *event,
+                                                          GimpSearchPopup   *popup);
+
+/* Signal handlers on the results list */
+static gboolean   results_list_key_press_event           (GtkWidget         *widget,
+                                                          GdkEventKey       *kevent,
+                                                          GimpSearchPopup   *popup);
+static void       results_list_row_activated             (GtkTreeView       *treeview,
+                                                          GtkTreePath       *path,
+                                                          GtkTreeViewColumn *col,
+                                                          GimpSearchPopup   *popup);
+
+/* Utils */
+static void       gimp_search_popup_run_selected         (GimpSearchPopup   *popup);
+static void       gimp_search_popup_setup_results        (GtkWidget        **results_list,
+                                                          GtkWidget        **list_view);
+
+static gchar    * gimp_search_popup_find_accel_label     (GimpAction        *action);
+static gboolean   gimp_search_popup_view_accel_find_func (GtkAccelKey       *key,
+                                                          GClosure          *closure,
+                                                          gpointer           data);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSearchPopup, gimp_search_popup, GIMP_TYPE_POPUP)
+
+#define parent_class gimp_search_popup_parent_class
+
+static gint window_height = 0;
+
+
+static void
+gimp_search_popup_class_init (GimpSearchPopupClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpPopupClass *popup_class  = GIMP_POPUP_CLASS (klass);
+
+  object_class->constructed   = gimp_search_popup_constructed;
+  object_class->set_property  = gimp_search_popup_set_property;
+  object_class->get_property  = gimp_search_popup_get_property;
+
+  widget_class->size_allocate = gimp_search_popup_size_allocate;
+
+  popup_class->confirm        = gimp_search_popup_confirm;
+
+  /**
+   * GimpSearchPopup:gimp:
+   *
+   * The #Gimp object.
+   */
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        G_TYPE_OBJECT,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  /**
+   * GimpSearchPopup:callback:
+   *
+   * The #GimpSearchPopupCallback used to fill in results.
+   */
+  g_object_class_install_property (object_class, PROP_CALLBACK,
+                                   g_param_spec_pointer ("callback", NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+  /**
+   * GimpSearchPopup:callback-data:
+   *
+   * The #GPointer fed as last parameter to the #GimpSearchPopupCallback.
+   */
+  g_object_class_install_property (object_class, PROP_CALLBACK_DATA,
+                                   g_param_spec_pointer ("callback-data", NULL, NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_search_popup_init (GimpSearchPopup *search_popup)
+{
+  search_popup->priv = gimp_search_popup_get_instance_private (search_popup);
+}
+
+/************ Public Functions ****************/
+
+/**
+ * gimp_search_popup_new:
+ * @gimp:          #Gimp object.
+ * @role:          the role to give to the #GtkWindow.
+ * @title:         the #GtkWindow title.
+ * @callback:      the #GimpSearchPopupCallback used to fill in results.
+ * @callback_data: data fed to @callback.
+ *
+ * Returns: a new #GimpSearchPopup.
+ */
+GtkWidget *
+gimp_search_popup_new (Gimp                    *gimp,
+                       const gchar             *role,
+                       const gchar             *title,
+                       GimpSearchPopupCallback  callback,
+                       gpointer                 callback_data)
+{
+  GtkWidget *widget;
+
+  widget = g_object_new (GIMP_TYPE_SEARCH_POPUP,
+                         "type",          GTK_WINDOW_TOPLEVEL,
+                         "type-hint",     GDK_WINDOW_TYPE_HINT_DIALOG,
+                         "decorated",     TRUE,
+                         "modal",         TRUE,
+                         "role",          role,
+                         "title",         title,
+
+                         "gimp",          gimp,
+                         "callback",      callback,
+                         "callback-data", callback_data,
+                         NULL);
+  gtk_window_set_modal (GTK_WINDOW (widget), FALSE);
+
+
+  return widget;
+}
+
+/**
+ * gimp_search_popup_add_result:
+ * @popup:   the #GimpSearchPopup.
+ * @action:  a #GimpAction to add in results list.
+ * @section: the section to add @action.
+ *
+ * Adds @action in the @popup's results at @section.
+ * The section only indicates relative order. If you want some items
+ * to appear before other, simply use lower @section.
+ */
+void
+gimp_search_popup_add_result (GimpSearchPopup *popup,
+                              GimpAction      *action,
+                              gint             section)
+{
+  GtkTreeIter   iter;
+  GtkTreeIter   next_section;
+  GtkListStore *store;
+  GtkTreeModel *model;
+  gchar        *markup;
+  gchar        *action_name;
+  gchar        *label;
+  gchar        *escaped_label = NULL;
+  const gchar  *icon_name;
+  gchar        *accel_string;
+  gchar        *escaped_accel = NULL;
+  gboolean      has_shortcut = FALSE;
+  const gchar  *tooltip;
+  gchar        *escaped_tooltip = NULL;
+  gboolean      has_tooltip  = FALSE;
+
+  label = g_strstrip (gimp_strip_uline (gimp_action_get_label (action)));
+
+  if (! label || strlen (label) == 0)
+    {
+      g_free (label);
+      return;
+    }
+
+  escaped_label = g_markup_escape_text (label, -1);
+
+  if (GIMP_IS_TOGGLE_ACTION (action))
+    {
+      if (gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action)))
+        icon_name = "gtk-ok";
+      else
+        icon_name = "gtk-no";
+    }
+  else
+    {
+      icon_name = gimp_action_get_icon_name (action);
+    }
+
+  accel_string = gimp_search_popup_find_accel_label (action);
+  if (accel_string)
+    {
+      escaped_accel = g_markup_escape_text (accel_string, -1);
+      has_shortcut = TRUE;
+    }
+
+  tooltip = gimp_action_get_tooltip (action);
+  if (tooltip != NULL)
+    {
+      escaped_tooltip = g_markup_escape_text (tooltip, -1);
+      has_tooltip = TRUE;
+    }
+
+  markup = g_strdup_printf ("%s<small>%s%s%s<span weight='light'>%s</span></small>",
+                            escaped_label,
+                            has_shortcut ? " | " : "",
+                            has_shortcut ? escaped_accel : "",
+                            has_tooltip ? "\n" : "",
+                            has_tooltip ? escaped_tooltip : "");
+
+  action_name = g_markup_escape_text (gimp_action_get_name (action), -1);
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (popup->priv->results_list));
+  store = GTK_LIST_STORE (model);
+  if (gtk_tree_model_get_iter_first (model, &next_section))
+    {
+      while (TRUE)
+        {
+          gint iter_section;
+
+          gtk_tree_model_get (model, &next_section,
+                              COLUMN_SECTION, &iter_section, -1);
+          if (iter_section > section)
+            {
+              gtk_list_store_insert_before (store, &iter, &next_section);
+              break;
+            }
+          else if (! gtk_tree_model_iter_next (model, &next_section))
+            {
+              gtk_list_store_append (store, &iter);
+              break;
+            }
+        }
+    }
+  else
+    {
+      gtk_list_store_append (store, &iter);
+    }
+
+  gtk_list_store_set (store, &iter,
+                      COLUMN_ICON,      icon_name,
+                      COLUMN_MARKUP,    markup,
+                      COLUMN_TOOLTIP,   action_name,
+                      COLUMN_ACTION,    action,
+                      COLUMN_SECTION,   section,
+                      COLUMN_SENSITIVE, gimp_action_is_sensitive (action),
+                      -1);
+
+  g_free (accel_string);
+  g_free (markup);
+  g_free (action_name);
+  g_free (label);
+  g_free (escaped_accel);
+  g_free (escaped_label);
+  g_free (escaped_tooltip);
+}
+
+/************ Private Functions ****************/
+
+static void
+gimp_search_popup_constructed (GObject *object)
+{
+  GimpSearchPopup *popup  = GIMP_SEARCH_POPUP (object);
+  GdkScreen       *screen = gdk_screen_get_default ();
+  GtkWidget       *main_vbox;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_add (GTK_CONTAINER (popup), main_vbox);
+  gtk_widget_show (main_vbox);
+
+  popup->priv->keyword_entry = gtk_entry_new ();
+  gtk_entry_set_icon_from_icon_name (GTK_ENTRY (popup->priv->keyword_entry),
+                                     GTK_ENTRY_ICON_PRIMARY, "edit-find");
+  gtk_entry_set_icon_activatable (GTK_ENTRY (popup->priv->keyword_entry),
+                                  GTK_ENTRY_ICON_PRIMARY, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox),
+                      popup->priv->keyword_entry,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (popup->priv->keyword_entry);
+
+  gimp_search_popup_setup_results (&popup->priv->results_list,
+                                   &popup->priv->list_view);
+  gtk_box_pack_start (GTK_BOX (main_vbox),
+                      popup->priv->list_view, TRUE, TRUE, 0);
+
+  gtk_widget_set_events (GTK_WIDGET (object),
+                         GDK_KEY_RELEASE_MASK  |
+                         GDK_KEY_PRESS_MASK    |
+                         GDK_BUTTON_PRESS_MASK |
+                         GDK_SCROLL_MASK);
+
+  g_signal_connect (popup->priv->keyword_entry, "key-press-event",
+                    G_CALLBACK (keyword_entry_key_press_event),
+                    popup);
+  g_signal_connect (popup->priv->keyword_entry, "key-release-event",
+                    G_CALLBACK (keyword_entry_key_release_event),
+                    popup);
+
+  g_signal_connect (popup->priv->results_list, "key-press-event",
+                    G_CALLBACK (results_list_key_press_event),
+                    popup);
+  g_signal_connect (popup->priv->results_list, "row-activated",
+                    G_CALLBACK (results_list_row_activated),
+                    popup);
+
+  /* Default size of the search popup showing the result list is half
+   * the screen. */
+  if (window_height == 0)
+    window_height = gdk_screen_get_height (screen) / 2;
+}
+
+static void
+gimp_search_popup_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpSearchPopup *search_popup = GIMP_SEARCH_POPUP (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      search_popup->priv->gimp = g_value_get_object (value);
+      break;
+    case PROP_CALLBACK:
+      search_popup->priv->build_results = g_value_get_pointer (value);
+      break;
+    case PROP_CALLBACK_DATA:
+      search_popup->priv->build_results_data = g_value_get_pointer (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_search_popup_get_property (GObject      *object,
+                                guint         property_id,
+                                GValue       *value,
+                                GParamSpec   *pspec)
+{
+  GimpSearchPopup *search_popup = GIMP_SEARCH_POPUP (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, search_popup->priv->gimp);
+      break;
+    case PROP_CALLBACK:
+      g_value_set_pointer (value, search_popup->priv->build_results);
+      break;
+    case PROP_CALLBACK_DATA:
+      g_value_set_pointer (value, search_popup->priv->build_results_data);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_search_popup_size_allocate (GtkWidget     *widget,
+                                 GtkAllocation *allocation)
+{
+  GimpSearchPopup *popup = GIMP_SEARCH_POPUP (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  if (gtk_widget_get_visible (widget) &&
+      gtk_widget_get_visible (popup->priv->list_view))
+    {
+      GdkScreen *screen = gdk_screen_get_default ();
+
+      /* Save the window height when results are shown so that resizes
+       * by the user are saved across searches.
+       */
+      window_height = MAX (gdk_screen_get_height (screen) / 4,
+                           allocation->height);
+    }
+}
+
+static void
+gimp_search_popup_confirm (GimpPopup *popup)
+{
+  GimpSearchPopup *search_popup = GIMP_SEARCH_POPUP (popup);
+
+  gimp_search_popup_run_selected (search_popup);
+}
+
+static gboolean
+keyword_entry_key_press_event (GtkWidget       *widget,
+                               GdkEventKey     *event,
+                               GimpSearchPopup *popup)
+{
+  gboolean event_processed = FALSE;
+
+  if (event->keyval == GDK_KEY_Down &&
+      gtk_widget_get_visible (popup->priv->list_view))
+    {
+      GtkTreeView *tree_view = GTK_TREE_VIEW (popup->priv->results_list);
+
+      /* When hitting the down key while editing, select directly the
+       * second item, since the first could have run directly with
+       * Enter. */
+      gtk_tree_selection_select_path (gtk_tree_view_get_selection (tree_view),
+                                      gtk_tree_path_new_from_string ("1"));
+      gtk_widget_grab_focus (GTK_WIDGET (popup->priv->results_list));
+      event_processed = TRUE;
+    }
+
+  return event_processed;
+}
+
+static gboolean
+keyword_entry_key_release_event (GtkWidget       *widget,
+                                 GdkEventKey     *event,
+                                 GimpSearchPopup *popup)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (popup->priv->results_list);
+  gchar       *entry_text;
+  gint         width;
+
+  /* These keys are already managed by key bindings. */
+  if (event->keyval == GDK_KEY_Escape   ||
+      event->keyval == GDK_KEY_Return   ||
+      event->keyval == GDK_KEY_KP_Enter ||
+      event->keyval == GDK_KEY_ISO_Enter)
+    {
+      return FALSE;
+    }
+
+  gtk_window_get_size (GTK_WINDOW (popup), &width, NULL);
+  entry_text = g_strstrip (gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1));
+
+  if (strcmp (entry_text, "") != 0)
+    {
+      gtk_window_resize (GTK_WINDOW (popup),
+                         width, window_height);
+      gtk_list_store_clear (GTK_LIST_STORE (gtk_tree_view_get_model (tree_view)));
+      gtk_widget_show_all (popup->priv->list_view);
+      popup->priv->build_results (popup, entry_text,
+                                  popup->priv->build_results_data);
+      gtk_tree_selection_select_path (gtk_tree_view_get_selection (tree_view),
+                                      gtk_tree_path_new_from_string ("0"));
+    }
+  else if (strcmp (entry_text, "") == 0 && (event->keyval == GDK_KEY_Down))
+    {
+      gtk_window_resize (GTK_WINDOW (popup),
+                         width, window_height);
+      gtk_list_store_clear (GTK_LIST_STORE (gtk_tree_view_get_model (tree_view)));
+      gtk_widget_show_all (popup->priv->list_view);
+      popup->priv->build_results (popup, NULL,
+                                  popup->priv->build_results_data);
+      gtk_tree_selection_select_path (gtk_tree_view_get_selection (tree_view),
+                                      gtk_tree_path_new_from_string ("0"));
+    }
+  else
+    {
+      GtkTreeSelection *selection;
+      GtkTreeModel     *model;
+      GtkTreeIter       iter;
+
+      selection = gtk_tree_view_get_selection (tree_view);
+      gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+
+      if (gtk_tree_selection_get_selected (selection, &model, &iter))
+        {
+          GtkTreePath *path;
+
+          path = gtk_tree_model_get_path (model, &iter);
+          gtk_tree_selection_unselect_path (selection, path);
+
+          gtk_tree_path_free (path);
+        }
+
+      gtk_widget_hide (popup->priv->list_view);
+      gtk_window_resize (GTK_WINDOW (popup), width, 1);
+    }
+
+  g_free (entry_text);
+
+  return TRUE;
+}
+
+static gboolean
+results_list_key_press_event (GtkWidget       *widget,
+                              GdkEventKey     *kevent,
+                              GimpSearchPopup *popup)
+{
+  /* These keys are already managed by key bindings. */
+  g_return_val_if_fail (kevent->keyval != GDK_KEY_Escape   &&
+                        kevent->keyval != GDK_KEY_Return   &&
+                        kevent->keyval != GDK_KEY_KP_Enter &&
+                        kevent->keyval != GDK_KEY_ISO_Enter,
+                        FALSE);
+
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_Up:
+      {
+        gboolean          event_processed = FALSE;
+        GtkTreeSelection *selection;
+        GtkTreeModel     *model;
+        GtkTreeIter       iter;
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (popup->priv->results_list));
+        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+
+        if (gtk_tree_selection_get_selected (selection, &model, &iter))
+          {
+            GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
+
+            if (strcmp (gtk_tree_path_to_string (path), "0") == 0)
+              {
+                gint start_pos;
+                gint end_pos;
+
+                gtk_editable_get_selection_bounds (GTK_EDITABLE (popup->priv->keyword_entry),
+                                                   &start_pos, &end_pos);
+                gtk_widget_grab_focus ((GTK_WIDGET (popup->priv->keyword_entry)));
+                gtk_editable_select_region (GTK_EDITABLE (popup->priv->keyword_entry),
+                                            start_pos, end_pos);
+
+                event_processed = TRUE;
+              }
+
+            gtk_tree_path_free (path);
+          }
+
+        return event_processed;
+      }
+    case GDK_KEY_Down:
+      {
+        return FALSE;
+      }
+    default:
+      {
+        gint start_pos;
+        gint end_pos;
+
+        gtk_editable_get_selection_bounds (GTK_EDITABLE (popup->priv->keyword_entry),
+                                           &start_pos, &end_pos);
+        gtk_widget_grab_focus ((GTK_WIDGET (popup->priv->keyword_entry)));
+        gtk_editable_select_region (GTK_EDITABLE (popup->priv->keyword_entry),
+                                    start_pos, end_pos);
+        gtk_widget_event (GTK_WIDGET (popup->priv->keyword_entry),
+                          (GdkEvent *) kevent);
+      }
+    }
+
+  return FALSE;
+}
+
+static void
+results_list_row_activated (GtkTreeView       *treeview,
+                            GtkTreePath       *path,
+                            GtkTreeViewColumn *col,
+                            GimpSearchPopup   *popup)
+{
+  gimp_search_popup_run_selected (popup);
+}
+
+static void
+gimp_search_popup_run_selected (GimpSearchPopup *popup)
+{
+  GtkTreeSelection *selection;
+  GtkTreeModel     *model;
+  GtkTreeIter       iter;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (popup->priv->results_list));
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    {
+      GimpAction *action;
+
+      gtk_tree_model_get (model, &iter, COLUMN_ACTION, &action, -1);
+
+      if (gimp_action_is_sensitive (action))
+        {
+          /* Close the search popup on activation. */
+          GIMP_POPUP_CLASS (parent_class)->cancel (GIMP_POPUP (popup));
+
+          gimp_action_activate (action);
+        }
+
+      g_object_unref (action);
+    }
+}
+
+static void
+gimp_search_popup_setup_results (GtkWidget **results_list,
+                                 GtkWidget **list_view)
+{
+  gint                wid1 = 100;
+  GtkListStore       *store;
+  GtkCellRenderer    *cell;
+  GtkTreeViewColumn  *column;
+
+  *list_view = gtk_scrolled_window_new (NULL, NULL);
+  store = gtk_list_store_new (N_COL,
+                              G_TYPE_STRING,
+                              G_TYPE_STRING,
+                              G_TYPE_STRING,
+                              GIMP_TYPE_ACTION,
+                              G_TYPE_BOOLEAN,
+                              G_TYPE_INT);
+  *results_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*results_list), FALSE);
+#ifdef GIMP_UNSTABLE
+  gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (*results_list),
+                                    COLUMN_TOOLTIP);
+#endif
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  column = gtk_tree_view_column_new_with_attributes (NULL, cell,
+                                                     "icon-name", COLUMN_ICON,
+                                                     "sensitive", COLUMN_SENSITIVE,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (*results_list), column);
+  gtk_tree_view_column_set_min_width (column, 22);
+
+  cell = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes (NULL, cell,
+                                                     "markup",    COLUMN_MARKUP,
+                                                     "sensitive", COLUMN_SENSITIVE,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (*results_list), column);
+  gtk_tree_view_column_set_max_width (column, wid1);
+
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (*list_view),
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+
+  gtk_container_add (GTK_CONTAINER (*list_view), *results_list);
+  g_object_unref (G_OBJECT (store));
+}
+
+static gchar *
+gimp_search_popup_find_accel_label (GimpAction *action)
+{
+  guint            accel_key     = 0;
+  GdkModifierType  accel_mask    = 0;
+  GClosure        *accel_closure = NULL;
+  gchar           *accel_string;
+  GtkAccelGroup   *accel_group;
+  GimpUIManager   *manager;
+
+  manager       = gimp_ui_managers_from_name ("<Image>")->data;
+  accel_group   = gimp_ui_manager_get_accel_group (manager);
+  accel_closure = gimp_action_get_accel_closure (action);
+
+  if (accel_closure)
+    {
+      GtkAccelKey *key;
+
+      key = gtk_accel_group_find (accel_group,
+                                  gimp_search_popup_view_accel_find_func,
+                                  accel_closure);
+      if (key            &&
+          key->accel_key &&
+          key->accel_flags & GTK_ACCEL_VISIBLE)
+        {
+          accel_key  = key->accel_key;
+          accel_mask = key->accel_mods;
+        }
+    }
+
+  accel_string = gtk_accelerator_get_label (accel_key, accel_mask);
+
+  if (strcmp (g_strstrip (accel_string), "") == 0)
+    {
+      /* The value returned by gtk_accelerator_get_label() must be
+       * freed after use.
+       */
+      g_clear_pointer (&accel_string, g_free);
+    }
+
+  return accel_string;
+}
+
+static gboolean
+gimp_search_popup_view_accel_find_func (GtkAccelKey *key,
+                                        GClosure    *closure,
+                                        gpointer     data)
+{
+  return (GClosure *) data == closure;
+}
diff --git a/app/widgets/gimpsearchpopup.h b/app/widgets/gimpsearchpopup.h
new file mode 100644
index 0000000..d995115
--- /dev/null
+++ b/app/widgets/gimpsearchpopup.h
@@ -0,0 +1,74 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsearchpopup.h
+ * Copyright (C) 2015 Jehan <jehan at girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SEARCH_POPUP_H__
+#define __GIMP_SEARCH_POPUP_H__
+
+#include "gimppopup.h"
+
+#define GIMP_TYPE_SEARCH_POPUP            (gimp_search_popup_get_type ())
+#define GIMP_SEARCH_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SEARCH_POPUP, GimpSearchPopup))
+#define GIMP_SEARCH_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SEARCH_POPUP, GimpSearchPopupClass))
+#define GIMP_IS_SEARCH_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SEARCH_POPUP))
+#define GIMP_IS_SEARCH_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SEARCH_POPUP))
+#define GIMP_SEARCH_POPUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SEARCH_POPUP, GimpSearchPopupClass))
+
+/**
+ * GimpSearchPopupCallback:
+ * @popup:  the #GimpSearchPopup to operate on.
+ * @search: the text searched.
+ *
+ * Callback used by @popup to fill in its result list.
+ * It should make use of gimp_search_popup_add_result() to fill in
+ * results.
+ */
+typedef struct _GimpSearchPopup           GimpSearchPopup;
+typedef struct _GimpSearchPopupClass      GimpSearchPopupClass;
+typedef struct _GimpSearchPopupPrivate    GimpSearchPopupPrivate;
+
+typedef void   (*GimpSearchPopupCallback) (GimpSearchPopup  *popup,
+                                           const gchar      *search,
+                                           gpointer          data);
+
+struct _GimpSearchPopup
+{
+  GimpPopup               parent_instance;
+
+  GimpSearchPopupPrivate *priv;
+};
+
+struct _GimpSearchPopupClass
+{
+  GimpPopupClass          parent_class;
+};
+
+GType       gimp_search_popup_get_type   (void);
+
+GtkWidget * gimp_search_popup_new        (Gimp                    *gimp,
+                                          const gchar             *role,
+                                          const gchar             *title,
+                                          GimpSearchPopupCallback  callback,
+                                          gpointer                 callback_data);
+
+void        gimp_search_popup_add_result (GimpSearchPopup *popup,
+                                          GimpAction      *action,
+                                          gint             section);
+
+#endif  /*  __GIMP_SEARCH_POPUP_H__  */
diff --git a/app/widgets/gimpselectiondata.c b/app/widgets/gimpselectiondata.c
new file mode 100644
index 0000000..b441cc5
--- /dev/null
+++ b/app/widgets/gimpselectiondata.c
@@ -0,0 +1,935 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-utils.h"
+#include "core/gimpbrush.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcurve.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+#include "core/gimpitem.h"
+#include "core/gimppalette.h"
+#include "core/gimppattern.h"
+#include "core/gimptoolinfo.h"
+
+#include "text/gimpfont.h"
+
+#include "xcf/xcf.h"
+
+#include "gimpselectiondata.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static const gchar * gimp_selection_data_get_name   (GtkSelectionData *selection,
+                                                     const gchar      *strfunc);
+static GimpObject  * gimp_selection_data_get_object (GtkSelectionData *selection,
+                                                     GimpContainer    *container,
+                                                     GimpObject       *additional);
+static gchar       * gimp_unescape_uri_string       (const char       *escaped,
+                                                     int               len,
+                                                     const char       *illegal_escaped_characters,
+                                                     gboolean          ascii_must_not_be_escaped);
+
+
+/*  public functions  */
+
+void
+gimp_selection_data_set_uri_list (GtkSelectionData *selection,
+                                  GList            *uri_list)
+{
+  GList *list;
+  gchar *vals = NULL;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (uri_list != NULL);
+
+  for (list = uri_list; list; list = g_list_next (list))
+    {
+      if (vals)
+        {
+          gchar *tmp = g_strconcat (vals,
+                                    list->data,
+                                    list->next ? "\n" : NULL,
+                                    NULL);
+          g_free (vals);
+          vals = tmp;
+        }
+      else
+        {
+          vals = g_strconcat (list->data,
+                              list->next ? "\n" : NULL,
+                              NULL);
+        }
+    }
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8, (guchar *) vals, strlen (vals));
+
+  g_free (vals);
+}
+
+GList *
+gimp_selection_data_get_uri_list (GtkSelectionData *selection)
+{
+  GList       *crap_list = NULL;
+  GList       *uri_list  = NULL;
+  GList       *list;
+  gint         length;
+  const gchar *data;
+  const gchar *buffer;
+
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  length = gtk_selection_data_get_length (selection);
+
+  if (gtk_selection_data_get_format (selection) != 8 || length < 1)
+    {
+      g_warning ("Received invalid file data!");
+      return NULL;
+    }
+
+  data = buffer = (const gchar *) gtk_selection_data_get_data (selection);
+
+  GIMP_LOG (DND, "raw buffer >>%s<<", buffer);
+
+  {
+    gchar name_buffer[1024];
+
+    while (*buffer && (buffer - data < length))
+      {
+        gchar *name = name_buffer;
+        gint   len  = 0;
+
+        while (len < sizeof (name_buffer) && *buffer && *buffer != '\n')
+          {
+            *name++ = *buffer++;
+            len++;
+          }
+        if (len == 0)
+          break;
+
+        if (*(name - 1) == 0xd)   /* gmc uses RETURN+NEWLINE as delimiter */
+          len--;
+
+        if (len > 2)
+          crap_list = g_list_prepend (crap_list, g_strndup (name_buffer, len));
+
+        if (*buffer)
+          buffer++;
+      }
+  }
+
+  if (! crap_list)
+    return NULL;
+
+  /*  do various checks because file drag sources send all kinds of
+   *  arbitrary crap...
+   */
+  for (list = crap_list; list; list = g_list_next (list))
+    {
+      const gchar *dnd_crap = list->data;
+      gchar       *filename;
+      gchar       *hostname;
+      gchar       *uri   = NULL;
+      GError      *error = NULL;
+
+      GIMP_LOG (DND, "trying to convert \"%s\" to an uri", dnd_crap);
+
+      filename = g_filename_from_uri (dnd_crap, &hostname, NULL);
+
+      if (filename)
+        {
+          /*  if we got a correctly encoded "file:" uri...
+           *
+           *  (for GLib < 2.4.4, this is escaped UTF-8,
+           *   for GLib > 2.4.4, this is escaped local filename encoding)
+           */
+
+          uri = g_filename_to_uri (filename, hostname, NULL);
+
+          g_free (hostname);
+          g_free (filename);
+        }
+      else if (g_file_test (dnd_crap, G_FILE_TEST_EXISTS))
+        {
+          /*  ...else if we got a valid local filename...  */
+
+          uri = g_filename_to_uri (dnd_crap, NULL, NULL);
+        }
+      else
+        {
+          /*  ...otherwise do evil things...  */
+
+          const gchar *start = dnd_crap;
+
+          if (g_str_has_prefix (dnd_crap, "file://"))
+            {
+              start += strlen ("file://");
+            }
+          else if (g_str_has_prefix (dnd_crap, "file:"))
+            {
+              start += strlen ("file:");
+            }
+
+          if (start != dnd_crap)
+            {
+              /*  try if we got a "file:" uri in the wrong encoding...
+               *
+               *  (for GLib < 2.4.4, this is escaped local filename encoding,
+               *   for GLib > 2.4.4, this is escaped UTF-8)
+               */
+              gchar *unescaped_filename;
+
+              if (strstr (dnd_crap, "%"))
+                {
+                  gchar *local_filename;
+
+                  unescaped_filename = gimp_unescape_uri_string (start, -1,
+                                                                 "/", FALSE);
+
+                  /*  check if we got a drop from an application that
+                   *  encodes file: URIs as UTF-8 (apps linked against
+                   *  GLib < 2.4.4)
+                   */
+                  local_filename = g_filename_from_utf8 (unescaped_filename,
+                                                         -1, NULL, NULL,
+                                                         NULL);
+
+                  if (local_filename)
+                    {
+                      g_free (unescaped_filename);
+                      unescaped_filename = local_filename;
+                    }
+                }
+              else
+                {
+                  unescaped_filename = g_strdup (start);
+                }
+
+              uri = g_filename_to_uri (unescaped_filename, NULL, &error);
+
+              if (! uri)
+                {
+                  gchar *escaped_filename = g_strescape (unescaped_filename,
+                                                         NULL);
+
+                  g_message (_("The filename '%s' couldn't be converted to a "
+                               "valid URI:\n\n%s"),
+                             escaped_filename,
+                             error->message ?
+                             error->message : _("Invalid UTF-8"));
+                  g_free (escaped_filename);
+                  g_clear_error (&error);
+
+                  g_free (unescaped_filename);
+                  continue;
+                }
+
+              g_free (unescaped_filename);
+            }
+          else
+            {
+              /*  otherwise try the crap passed anyway, in case it's
+               *  a "http:" or whatever uri a plug-in might handle
+               */
+              uri = g_strdup (dnd_crap);
+            }
+        }
+
+      uri_list = g_list_prepend (uri_list, uri);
+    }
+
+  g_list_free_full (crap_list, (GDestroyNotify) g_free);
+
+  return uri_list;
+}
+
+void
+gimp_selection_data_set_color (GtkSelectionData *selection,
+                               const GimpRGB    *color)
+{
+  guint16  vals[4];
+  guchar   r, g, b, a;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (color != NULL);
+
+  gimp_rgba_get_uchar (color, &r, &g, &b, &a);
+
+  vals[0] = r + (r << 8);
+  vals[1] = g + (g << 8);
+  vals[2] = b + (b << 8);
+  vals[3] = a + (a << 8);
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          16, (const guchar *) vals, 8);
+}
+
+gboolean
+gimp_selection_data_get_color (GtkSelectionData *selection,
+                               GimpRGB          *color)
+{
+  const guint16 *color_vals;
+
+  g_return_val_if_fail (selection != NULL, FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+
+  if (gtk_selection_data_get_format (selection) != 16 ||
+      gtk_selection_data_get_length (selection) != 8)
+    {
+      g_warning ("Received invalid color data!");
+      return FALSE;
+    }
+
+  color_vals = (const guint16 *) gtk_selection_data_get_data (selection);
+
+  gimp_rgba_set_uchar (color,
+                       (guchar) (color_vals[0] >> 8),
+                       (guchar) (color_vals[1] >> 8),
+                       (guchar) (color_vals[2] >> 8),
+                       (guchar) (color_vals[3] >> 8));
+
+  return TRUE;
+}
+
+void
+gimp_selection_data_set_xcf (GtkSelectionData *selection,
+                             GimpImage        *image)
+{
+  GMemoryOutputStream *output;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  output = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new_resizable ());
+
+  xcf_save_stream (image->gimp, image, G_OUTPUT_STREAM (output), NULL,
+                   NULL, NULL);
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8,
+                          g_memory_output_stream_get_data (output),
+                          g_memory_output_stream_get_data_size (output));
+
+  g_object_unref (output);
+}
+
+GimpImage *
+gimp_selection_data_get_xcf (GtkSelectionData *selection,
+                             Gimp             *gimp)
+{
+  GInputStream *input;
+  GimpImage    *image;
+  gsize         length;
+  const guchar *data;
+  GError       *error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  length = gtk_selection_data_get_length (selection);
+
+  if (gtk_selection_data_get_format (selection) != 8 || length < 1)
+    {
+      g_warning ("Received invalid data stream!");
+      return NULL;
+    }
+
+  data = gtk_selection_data_get_data (selection);
+
+  input = g_memory_input_stream_new_from_data (data, length, NULL);
+
+  image = xcf_load_stream (gimp, input, NULL, NULL, &error);
+
+  if (image)
+    {
+      /*  don't keep clipboard images in the image list  */
+      gimp_container_remove (gimp->images, GIMP_OBJECT (image));
+    }
+  else
+    {
+      g_warning ("Received invalid XCF data: %s", error->message);
+      g_clear_error (&error);
+    }
+
+  g_object_unref (input);
+
+  return image;
+}
+
+void
+gimp_selection_data_set_stream (GtkSelectionData *selection,
+                                const guchar     *stream,
+                                gsize             stream_length)
+{
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (stream != NULL);
+  g_return_if_fail (stream_length > 0);
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8, (guchar *) stream, stream_length);
+}
+
+const guchar *
+gimp_selection_data_get_stream (GtkSelectionData *selection,
+                                gsize            *stream_length)
+{
+  gint length;
+
+  g_return_val_if_fail (selection != NULL, NULL);
+  g_return_val_if_fail (stream_length != NULL, NULL);
+
+  length = gtk_selection_data_get_length (selection);
+
+  if (gtk_selection_data_get_format (selection) != 8 || length < 1)
+    {
+      g_warning ("Received invalid data stream!");
+      return NULL;
+    }
+
+  *stream_length = length;
+
+  return (const guchar *) gtk_selection_data_get_data (selection);
+}
+
+void
+gimp_selection_data_set_curve (GtkSelectionData *selection,
+                               GimpCurve        *curve)
+{
+  gchar *str;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (GIMP_IS_CURVE (curve));
+
+  str = gimp_config_serialize_to_string (GIMP_CONFIG (curve), NULL);
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8, (guchar *) str, strlen (str));
+
+  g_free (str);
+}
+
+GimpCurve *
+gimp_selection_data_get_curve (GtkSelectionData *selection)
+{
+  GimpCurve *curve;
+  gint       length;
+  GError    *error = NULL;
+
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  length = gtk_selection_data_get_length (selection);
+
+  if (gtk_selection_data_get_format (selection) != 8 || length < 1)
+    {
+      g_warning ("Received invalid curve data!");
+      return NULL;
+    }
+
+  curve = GIMP_CURVE (gimp_curve_new ("pasted curve"));
+
+  if (! gimp_config_deserialize_string (GIMP_CONFIG (curve),
+                                        (const gchar *)
+                                        gtk_selection_data_get_data (selection),
+                                        length,
+                                        NULL,
+                                        &error))
+    {
+      g_warning ("Received invalid curve data: %s", error->message);
+      g_clear_error (&error);
+      g_object_unref (curve);
+      return NULL;
+    }
+
+  return curve;
+}
+
+void
+gimp_selection_data_set_image (GtkSelectionData *selection,
+                               GimpImage        *image)
+{
+  gchar *str;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  str = g_strdup_printf ("%d:%d", gimp_get_pid (), gimp_image_get_ID (image));
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8, (guchar *) str, strlen (str));
+
+  g_free (str);
+}
+
+GimpImage *
+gimp_selection_data_get_image (GtkSelectionData *selection,
+                               Gimp             *gimp)
+{
+  const gchar *str;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  str = gimp_selection_data_get_name (selection, G_STRFUNC);
+
+  if (str)
+    {
+      gint pid;
+      gint ID;
+
+      if (sscanf (str, "%i:%i", &pid, &ID) == 2 &&
+          pid == gimp_get_pid ())
+        {
+          return gimp_image_get_by_ID (gimp, ID);
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_selection_data_set_component (GtkSelectionData *selection,
+                                   GimpImage        *image,
+                                   GimpChannelType   channel)
+{
+  gchar *str;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (GIMP_IS_IMAGE (image));
+
+  str = g_strdup_printf ("%d:%d:%d", gimp_get_pid (), gimp_image_get_ID (image),
+                         (gint) channel);
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8, (guchar *) str, strlen (str));
+
+  g_free (str);
+}
+
+GimpImage *
+gimp_selection_data_get_component (GtkSelectionData *selection,
+                                   Gimp             *gimp,
+                                   GimpChannelType  *channel)
+{
+  const gchar *str;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  if (channel)
+    *channel = 0;
+
+  str = gimp_selection_data_get_name (selection, G_STRFUNC);
+
+  if (str)
+    {
+      gint pid;
+      gint ID;
+      gint ch;
+
+      if (sscanf (str, "%i:%i:%i", &pid, &ID, &ch) == 3 &&
+          pid == gimp_get_pid ())
+        {
+          GimpImage *image = gimp_image_get_by_ID (gimp, ID);
+
+          if (image && channel)
+            *channel = ch;
+
+          return image;
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_selection_data_set_item (GtkSelectionData *selection,
+                              GimpItem         *item)
+{
+  gchar *str;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (GIMP_IS_ITEM (item));
+
+  str = g_strdup_printf ("%d:%d", gimp_get_pid (), gimp_item_get_ID (item));
+
+  gtk_selection_data_set (selection,
+                          gtk_selection_data_get_target (selection),
+                          8, (guchar *) str, strlen (str));
+
+  g_free (str);
+}
+
+GimpItem *
+gimp_selection_data_get_item (GtkSelectionData *selection,
+                              Gimp             *gimp)
+{
+  const gchar *str;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  str = gimp_selection_data_get_name (selection, G_STRFUNC);
+
+  if (str)
+    {
+      gint pid;
+      gint ID;
+
+      if (sscanf (str, "%i:%i", &pid, &ID) == 2 &&
+          pid == gimp_get_pid ())
+        {
+          return gimp_item_get_by_ID (gimp, ID);
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_selection_data_set_object (GtkSelectionData *selection,
+                                GimpObject       *object)
+{
+  const gchar *name;
+
+  g_return_if_fail (selection != NULL);
+  g_return_if_fail (GIMP_IS_OBJECT (object));
+
+  name = gimp_object_get_name (object);
+
+  if (name)
+    {
+      gchar *str;
+
+      str = g_strdup_printf ("%d:%p:%s", gimp_get_pid (), object, name);
+
+      gtk_selection_data_set (selection,
+                              gtk_selection_data_get_target (selection),
+                              8, (guchar *) str, strlen (str));
+
+      g_free (str);
+    }
+}
+
+GimpBrush *
+gimp_selection_data_get_brush (GtkSelectionData *selection,
+                               Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpBrush *)
+    gimp_selection_data_get_object (selection,
+                                    gimp_data_factory_get_container (gimp->brush_factory),
+                                    GIMP_OBJECT (gimp_brush_get_standard (gimp_get_user_context (gimp))));
+}
+
+GimpPattern *
+gimp_selection_data_get_pattern (GtkSelectionData *selection,
+                                 Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpPattern *)
+    gimp_selection_data_get_object (selection,
+                                    gimp_data_factory_get_container (gimp->pattern_factory),
+                                    GIMP_OBJECT (gimp_pattern_get_standard (gimp_get_user_context (gimp))));
+}
+
+GimpGradient *
+gimp_selection_data_get_gradient (GtkSelectionData *selection,
+                                  Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpGradient *)
+    gimp_selection_data_get_object (selection,
+                                    gimp_data_factory_get_container (gimp->gradient_factory),
+                                    GIMP_OBJECT (gimp_gradient_get_standard (gimp_get_user_context (gimp))));
+}
+
+GimpPalette *
+gimp_selection_data_get_palette (GtkSelectionData *selection,
+                                 Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpPalette *)
+    gimp_selection_data_get_object (selection,
+                                    gimp_data_factory_get_container (gimp->palette_factory),
+                                    GIMP_OBJECT (gimp_palette_get_standard (gimp_get_user_context (gimp))));
+}
+
+GimpFont *
+gimp_selection_data_get_font (GtkSelectionData *selection,
+                              Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpFont *)
+    gimp_selection_data_get_object (selection,
+                                    gimp_data_factory_get_container (gimp->font_factory),
+                                    GIMP_OBJECT (gimp_font_get_standard ()));
+}
+
+GimpBuffer *
+gimp_selection_data_get_buffer (GtkSelectionData *selection,
+                                Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpBuffer *)
+    gimp_selection_data_get_object (selection,
+                                    gimp->named_buffers,
+                                    GIMP_OBJECT (gimp_get_clipboard_buffer (gimp)));
+}
+
+GimpImagefile *
+gimp_selection_data_get_imagefile (GtkSelectionData *selection,
+                                   Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpImagefile *) gimp_selection_data_get_object (selection,
+                                                           gimp->documents,
+                                                           NULL);
+}
+
+GimpTemplate *
+gimp_selection_data_get_template (GtkSelectionData *selection,
+                                  Gimp             *gimp)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  return (GimpTemplate *) gimp_selection_data_get_object (selection,
+                                                          gimp->templates,
+                                                          NULL);
+}
+
+GimpToolItem *
+gimp_selection_data_get_tool_item (GtkSelectionData *selection,
+                                   Gimp             *gimp)
+{
+  GimpToolItem *tool_item;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (selection != NULL, NULL);
+
+  tool_item = (GimpToolItem *)
+    gimp_selection_data_get_object (selection,
+                                    gimp->tool_info_list,
+                                    GIMP_OBJECT (gimp_tool_info_get_standard (gimp)));
+
+  if (! tool_item)
+    {
+      tool_item = (GimpToolItem *)
+        gimp_selection_data_get_object (selection,
+                                        gimp->tool_item_list,
+                                        NULL);
+    }
+
+  return tool_item;
+}
+
+
+/*  private functions  */
+
+static const gchar *
+gimp_selection_data_get_name (GtkSelectionData *selection,
+                              const gchar      *strfunc)
+{
+  const gchar *name;
+
+  if (gtk_selection_data_get_format (selection) != 8 ||
+      gtk_selection_data_get_length (selection) < 1)
+    {
+      g_warning ("%s: received invalid selection data", strfunc);
+      return NULL;
+    }
+
+  name = (const gchar *) gtk_selection_data_get_data (selection);
+
+  if (! g_utf8_validate (name, -1, NULL))
+    {
+      g_warning ("%s: received invalid selection data "
+                 "(doesn't validate as UTF-8)", strfunc);
+      return NULL;
+    }
+
+  GIMP_LOG (DND, "name = '%s'", name);
+
+  return name;
+}
+
+static GimpObject *
+gimp_selection_data_get_object (GtkSelectionData *selection,
+                                GimpContainer    *container,
+                                GimpObject       *additional)
+{
+  const gchar *str;
+
+  str = gimp_selection_data_get_name (selection, G_STRFUNC);
+
+  if (str)
+    {
+      gint     pid;
+      gpointer object_addr;
+      gint     name_offset = 0;
+
+      if (sscanf (str, "%i:%p:%n", &pid, &object_addr, &name_offset) >= 2 &&
+          pid == gimp_get_pid () && name_offset > 0)
+        {
+          const gchar *name = str + name_offset;
+
+          GIMP_LOG (DND, "pid = %d, addr = %p, name = '%s'",
+                    pid, object_addr, name);
+
+          if (additional &&
+              strcmp (name, gimp_object_get_name (additional)) == 0 &&
+              object_addr == (gpointer) additional)
+            {
+              return additional;
+            }
+          else
+            {
+              GimpObject *object;
+
+              object = gimp_container_get_child_by_name (container, name);
+
+              if (object_addr == (gpointer) object)
+                return object;
+            }
+        }
+    }
+
+  return NULL;
+}
+
+/*  the next two functions are straight cut'n'paste from glib/glib/gconvert.c,
+ *  except that gimp_unescape_uri_string() does not try to UTF-8 validate
+ *  the unescaped result.
+ */
+static int
+unescape_character (const char *scanner)
+{
+  int first_digit;
+  int second_digit;
+
+  first_digit = g_ascii_xdigit_value (scanner[0]);
+  if (first_digit < 0)
+    return -1;
+
+  second_digit = g_ascii_xdigit_value (scanner[1]);
+  if (second_digit < 0)
+    return -1;
+
+  return (first_digit << 4) | second_digit;
+}
+
+static gchar *
+gimp_unescape_uri_string (const char *escaped,
+                          int         len,
+                          const char *illegal_escaped_characters,
+                          gboolean    ascii_must_not_be_escaped)
+{
+  const gchar *inp, *in_end;
+  gchar *out, *result;
+  int c;
+
+  if (escaped == NULL)
+    return NULL;
+
+  if (len < 0)
+    len = strlen (escaped);
+
+  result = g_malloc (len + 1);
+
+  out = result;
+  for (inp = escaped, in_end = escaped + len; inp < in_end; inp++)
+    {
+      c = *inp;
+
+      if (c == '%')
+        {
+          /* catch partial escape sequences past the end of the substring */
+          if (inp + 3 > in_end)
+            break;
+
+          c = unescape_character (inp + 1);
+
+          /* catch bad escape sequences and NUL characters */
+          if (c <= 0)
+            break;
+
+          /* catch escaped ASCII */
+          if (ascii_must_not_be_escaped && c <= 0x7F)
+            break;
+
+          /* catch other illegal escaped characters */
+          if (strchr (illegal_escaped_characters, c) != NULL)
+            break;
+
+          inp += 2;
+        }
+
+      *out++ = c;
+    }
+
+  gimp_assert (out - result <= len);
+  *out = '\0';
+
+  if (inp != in_end)
+    {
+      g_free (result);
+      return NULL;
+    }
+
+  return result;
+}
diff --git a/app/widgets/gimpselectiondata.h b/app/widgets/gimpselectiondata.h
new file mode 100644
index 0000000..c2e9865
--- /dev/null
+++ b/app/widgets/gimpselectiondata.h
@@ -0,0 +1,112 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SELECTION_DATA_H__
+#define __GIMP_SELECTION_DATA_H__
+
+
+/*  uri list  */
+
+void            gimp_selection_data_set_uri_list  (GtkSelectionData *selection,
+                                                   GList            *uris);
+GList         * gimp_selection_data_get_uri_list  (GtkSelectionData *selection);
+
+
+/*  color  */
+
+void            gimp_selection_data_set_color     (GtkSelectionData *selection,
+                                                   const GimpRGB    *color);
+gboolean        gimp_selection_data_get_color     (GtkSelectionData *selection,
+                                                   GimpRGB          *color);
+
+
+/*  image (xcf)  */
+
+void            gimp_selection_data_set_xcf       (GtkSelectionData *selection,
+                                                   GimpImage        *image);
+GimpImage     * gimp_selection_data_get_xcf       (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+
+
+/*  stream (svg/png)  */
+
+void            gimp_selection_data_set_stream    (GtkSelectionData *selection,
+                                                   const guchar     *stream,
+                                                   gsize             stream_length);
+const guchar  * gimp_selection_data_get_stream    (GtkSelectionData *selection,
+                                                   gsize            *stream_length);
+
+
+/*  curve  */
+
+void            gimp_selection_data_set_curve     (GtkSelectionData *selection,
+                                                   GimpCurve        *curve);
+GimpCurve     * gimp_selection_data_get_curve     (GtkSelectionData *selection);
+
+
+/*  image  */
+
+void            gimp_selection_data_set_image     (GtkSelectionData *selection,
+                                                   GimpImage        *image);
+GimpImage     * gimp_selection_data_get_image     (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+
+
+/*  component  */
+
+void            gimp_selection_data_set_component (GtkSelectionData *selection,
+                                                   GimpImage        *image,
+                                                   GimpChannelType   channel);
+GimpImage     * gimp_selection_data_get_component (GtkSelectionData *selection,
+                                                   Gimp             *gimp,
+                                                   GimpChannelType  *channel);
+
+
+/*  item  */
+
+void            gimp_selection_data_set_item      (GtkSelectionData *selection,
+                                                   GimpItem         *item);
+GimpItem      * gimp_selection_data_get_item      (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+
+
+/*  various data  */
+
+void            gimp_selection_data_set_object    (GtkSelectionData *selection,
+                                                   GimpObject       *object);
+
+GimpBrush     * gimp_selection_data_get_brush     (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpPattern   * gimp_selection_data_get_pattern   (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpGradient  * gimp_selection_data_get_gradient  (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpPalette   * gimp_selection_data_get_palette   (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpFont      * gimp_selection_data_get_font      (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpBuffer    * gimp_selection_data_get_buffer    (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpImagefile * gimp_selection_data_get_imagefile (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpTemplate  * gimp_selection_data_get_template  (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+GimpToolItem  * gimp_selection_data_get_tool_item (GtkSelectionData *selection,
+                                                   Gimp             *gimp);
+
+
+#endif /* __GIMP_SELECTION_DATA_H__ */
diff --git a/app/widgets/gimpselectioneditor.c b/app/widgets/gimpselectioneditor.c
new file mode 100644
index 0000000..7a9c55b
--- /dev/null
+++ b/app/widgets/gimpselectioneditor.c
@@ -0,0 +1,350 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpchannel-select.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-pick-color.h"
+#include "core/gimpselection.h"
+#include "core/gimptoolinfo.h"
+
+/* FIXME: #include "tools/tools-types.h" */
+#include "tools/tools-types.h"
+#include "tools/gimpregionselectoptions.h"
+
+#include "gimpselectioneditor.h"
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimpmenufactory.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void  gimp_selection_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void   gimp_selection_editor_constructed    (GObject             *object);
+
+static void   gimp_selection_editor_set_image      (GimpImageEditor     *editor,
+                                                    GimpImage           *image);
+
+static void   gimp_selection_editor_set_context    (GimpDocked          *docked,
+                                                    GimpContext         *context);
+
+static gboolean gimp_selection_view_button_press   (GtkWidget           *widget,
+                                                    GdkEventButton      *bevent,
+                                                    GimpSelectionEditor *editor);
+static void   gimp_selection_editor_drop_color     (GtkWidget           *widget,
+                                                    gint                 x,
+                                                    gint                 y,
+                                                    const GimpRGB       *color,
+                                                    gpointer             data);
+
+static void   gimp_selection_editor_mask_changed   (GimpImage           *image,
+                                                    GimpSelectionEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpSelectionEditor, gimp_selection_editor,
+                         GIMP_TYPE_IMAGE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_selection_editor_docked_iface_init))
+
+#define parent_class gimp_selection_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_selection_editor_class_init (GimpSelectionEditorClass *klass)
+{
+  GObjectClass         *object_class       = G_OBJECT_CLASS (klass);
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  object_class->constructed     = gimp_selection_editor_constructed;
+
+  image_editor_class->set_image = gimp_selection_editor_set_image;
+}
+
+static void
+gimp_selection_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_selection_editor_set_context;
+}
+
+static void
+gimp_selection_editor_init (GimpSelectionEditor *editor)
+{
+  GtkWidget *frame;
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  editor->view = gimp_view_new_by_types (NULL,
+                                         GIMP_TYPE_VIEW,
+                                         GIMP_TYPE_SELECTION,
+                                         GIMP_VIEW_SIZE_HUGE,
+                                         0, TRUE);
+  gimp_view_renderer_set_background (GIMP_VIEW (editor->view)->renderer,
+                                     GIMP_ICON_TEXTURE);
+  gtk_widget_set_size_request (editor->view,
+                               GIMP_VIEW_SIZE_HUGE, GIMP_VIEW_SIZE_HUGE);
+  gimp_view_set_expand (GIMP_VIEW (editor->view), TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), editor->view);
+  gtk_widget_show (editor->view);
+
+  g_signal_connect (editor->view, "button-press-event",
+                    G_CALLBACK (gimp_selection_view_button_press),
+                    editor);
+
+  gimp_dnd_color_dest_add (editor->view,
+                           gimp_selection_editor_drop_color,
+                           editor);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
+}
+
+static void
+gimp_selection_editor_constructed (GObject *object)
+{
+  GimpSelectionEditor *editor = GIMP_SELECTION_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  editor->all_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "select",
+                                   "select-all", NULL);
+
+  editor->none_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "select",
+                                   "select-none", NULL);
+
+  editor->invert_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "select",
+                                   "select-invert", NULL);
+
+  editor->save_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "select",
+                                   "select-save", NULL);
+
+  editor->path_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "vectors",
+                                   "vectors-selection-to-vectors",
+                                   "vectors-selection-to-vectors-advanced",
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+
+  editor->stroke_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "select",
+                                   "select-stroke",
+                                   "select-stroke-last-values",
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+}
+
+static void
+gimp_selection_editor_set_image (GimpImageEditor *image_editor,
+                                 GimpImage       *image)
+{
+  GimpSelectionEditor *editor = GIMP_SELECTION_EDITOR (image_editor);
+
+  if (image_editor->image)
+    {
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_selection_editor_mask_changed,
+                                            editor);
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (image_editor, image);
+
+  if (image)
+    {
+      g_signal_connect (image, "mask-changed",
+                        G_CALLBACK (gimp_selection_editor_mask_changed),
+                        editor);
+
+      gimp_view_set_viewable (GIMP_VIEW (editor->view),
+                              GIMP_VIEWABLE (gimp_image_get_mask (image)));
+    }
+  else
+    {
+      gimp_view_set_viewable (GIMP_VIEW (editor->view), NULL);
+    }
+}
+
+static void
+gimp_selection_editor_set_context (GimpDocked  *docked,
+                                   GimpContext *context)
+{
+  GimpSelectionEditor *editor = GIMP_SELECTION_EDITOR (docked);
+
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_view_renderer_set_context (GIMP_VIEW (editor->view)->renderer,
+                                  context);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_selection_editor_new (GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_SELECTION_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<Selection>",
+                       "ui-path",         "/selection-popup",
+                       NULL);
+}
+
+static gboolean
+gimp_selection_view_button_press (GtkWidget           *widget,
+                                  GdkEventButton      *bevent,
+                                  GimpSelectionEditor *editor)
+{
+  GimpImageEditor         *image_editor = GIMP_IMAGE_EDITOR (editor);
+  GimpViewRenderer        *renderer;
+  GimpToolInfo            *tool_info;
+  GimpSelectionOptions    *sel_options;
+  GimpRegionSelectOptions *options;
+  GimpDrawable            *drawable;
+  GimpChannelOps           operation;
+  gint                     x, y;
+  GimpRGB                  color;
+
+  if (! image_editor->image)
+    return TRUE;
+
+  renderer = GIMP_VIEW (editor->view)->renderer;
+
+  tool_info = gimp_get_tool_info (image_editor->image->gimp,
+                                  "gimp-by-color-select-tool");
+
+  if (! tool_info)
+    return TRUE;
+
+  sel_options = GIMP_SELECTION_OPTIONS (tool_info->tool_options);
+  options     = GIMP_REGION_SELECT_OPTIONS (tool_info->tool_options);
+
+  drawable = gimp_image_get_active_drawable (image_editor->image);
+
+  if (! drawable)
+    return TRUE;
+
+  operation = gimp_modifiers_to_channel_op (bevent->state);
+
+  x = gimp_image_get_width  (image_editor->image) * bevent->x / renderer->width;
+  y = gimp_image_get_height (image_editor->image) * bevent->y / renderer->height;
+
+  if (gimp_image_pick_color (image_editor->image, drawable, x, y,
+                             FALSE, options->sample_merged,
+                             FALSE, 0.0,
+                             NULL,
+                             NULL, &color))
+    {
+      gimp_channel_select_by_color (gimp_image_get_mask (image_editor->image),
+                                    drawable,
+                                    options->sample_merged,
+                                    &color,
+                                    options->threshold,
+                                    options->select_transparent,
+                                    options->select_criterion,
+                                    operation,
+                                    sel_options->antialias,
+                                    sel_options->feather,
+                                    sel_options->feather_radius,
+                                    sel_options->feather_radius);
+      gimp_image_flush (image_editor->image);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_selection_editor_drop_color (GtkWidget     *widget,
+                                  gint           x,
+                                  gint           y,
+                                  const GimpRGB *color,
+                                  gpointer       data)
+{
+  GimpImageEditor         *editor = GIMP_IMAGE_EDITOR (data);
+  GimpToolInfo            *tool_info;
+  GimpSelectionOptions    *sel_options;
+  GimpRegionSelectOptions *options;
+  GimpDrawable            *drawable;
+
+  if (! editor->image)
+    return;
+
+  tool_info = gimp_get_tool_info (editor->image->gimp,
+                                  "gimp-by-color-select-tool");
+  if (! tool_info)
+    return;
+
+  sel_options = GIMP_SELECTION_OPTIONS (tool_info->tool_options);
+  options     = GIMP_REGION_SELECT_OPTIONS (tool_info->tool_options);
+
+  drawable = gimp_image_get_active_drawable (editor->image);
+
+  if (! drawable)
+    return;
+
+  gimp_channel_select_by_color (gimp_image_get_mask (editor->image),
+                                drawable,
+                                options->sample_merged,
+                                color,
+                                options->threshold,
+                                options->select_transparent,
+                                options->select_criterion,
+                                sel_options->operation,
+                                sel_options->antialias,
+                                sel_options->feather,
+                                sel_options->feather_radius,
+                                sel_options->feather_radius);
+  gimp_image_flush (editor->image);
+}
+
+static void
+gimp_selection_editor_mask_changed (GimpImage           *image,
+                                    GimpSelectionEditor *editor)
+{
+  gimp_view_renderer_invalidate (GIMP_VIEW (editor->view)->renderer);
+}
diff --git a/app/widgets/gimpselectioneditor.h b/app/widgets/gimpselectioneditor.h
new file mode 100644
index 0000000..8d9d901
--- /dev/null
+++ b/app/widgets/gimpselectioneditor.h
@@ -0,0 +1,60 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SELECTION_EDITOR_H__
+#define __GIMP_SELECTION_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_SELECTION_EDITOR            (gimp_selection_editor_get_type ())
+#define GIMP_SELECTION_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SELECTION_EDITOR, GimpSelectionEditor))
+#define GIMP_SELECTION_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SELECTION_EDITOR, GimpSelectionEditorClass))
+#define GIMP_IS_SELECTION_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SELECTION_EDITOR))
+#define GIMP_IS_SELECTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SELECTION_EDITOR))
+#define GIMP_SELECTION_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SELECTION_EDITOR, GimpSelectionEditorClass))
+
+
+typedef struct _GimpSelectionEditorClass GimpSelectionEditorClass;
+
+struct _GimpSelectionEditor
+{
+  GimpImageEditor  parent_instance;
+
+  GtkWidget       *view;
+
+  GtkWidget       *all_button;
+  GtkWidget       *none_button;
+  GtkWidget       *invert_button;
+  GtkWidget       *save_button;
+  GtkWidget       *path_button;
+  GtkWidget       *stroke_button;
+};
+
+struct _GimpSelectionEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_selection_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_selection_editor_new      (GimpMenuFactory *menu_factory);
+
+
+#endif /* __GIMP_SELECTION_EDITOR_H__ */
diff --git a/app/widgets/gimpsessioninfo-aux.c b/app/widgets/gimpsessioninfo-aux.c
new file mode 100644
index 0000000..bfc3878
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-aux.c
@@ -0,0 +1,284 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-aux.c
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "gimpdock.h"
+#include "gimpdockable.h"
+#include "gimpdockwindow.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpsessionmanaged.h"
+
+
+/*  public functions  */
+
+GimpSessionInfoAux *
+gimp_session_info_aux_new (const gchar *name,
+                           const gchar *value)
+{
+  GimpSessionInfoAux *aux;
+
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (value != NULL, NULL);
+
+  aux = g_slice_new0 (GimpSessionInfoAux);
+
+  aux->name  = g_strdup (name);
+  aux->value = g_strdup (value);
+
+  return aux;
+}
+
+void
+gimp_session_info_aux_free (GimpSessionInfoAux *aux)
+{
+  g_return_if_fail (aux != NULL);
+
+  g_free (aux->name);
+  g_free (aux->value);
+
+  g_slice_free (GimpSessionInfoAux, aux);
+}
+
+GList *
+gimp_session_info_aux_new_from_props (GObject *object,
+                                      ...)
+{
+  GList       *list = NULL;
+  const gchar *prop_name;
+  va_list      args;
+
+  g_return_val_if_fail (G_IS_OBJECT (object), NULL);
+
+  va_start (args, object);
+
+  for (prop_name = va_arg (args, const gchar *);
+       prop_name;
+       prop_name = va_arg (args, const gchar *))
+    {
+      GObjectClass *class = G_OBJECT_GET_CLASS (object);
+      GParamSpec   *pspec = g_object_class_find_property (class, prop_name);
+
+      if (pspec)
+        {
+          GString *str   = g_string_new (NULL);
+          GValue   value = G_VALUE_INIT;
+
+          g_value_init (&value, pspec->value_type);
+          g_object_get_property (object, pspec->name, &value);
+
+          if (! g_param_value_defaults (pspec, &value) &&
+              gimp_config_serialize_value (&value, str, TRUE))
+            {
+              list = g_list_prepend (list,
+                                     gimp_session_info_aux_new (prop_name,
+                                                                str->str));
+            }
+
+          g_value_unset (&value);
+          g_string_free (str, TRUE);
+        }
+      else
+        {
+          g_warning ("%s: no property named '%s' for %s",
+                     G_STRFUNC,
+                     prop_name, G_OBJECT_CLASS_NAME (class));
+        }
+    }
+
+  va_end (args);
+
+  return g_list_reverse (list);
+}
+
+void
+gimp_session_info_aux_set_props (GObject *object,
+                                 GList   *auxs,
+                                 ...)
+{
+  const gchar *prop_name;
+  va_list      args;
+
+  g_return_if_fail (G_IS_OBJECT (object));
+
+  va_start (args, auxs);
+
+  for (prop_name = va_arg (args, const gchar *);
+       prop_name;
+       prop_name = va_arg (args, const gchar *))
+    {
+      GList *list;
+
+      for (list = auxs; list; list = g_list_next (list))
+        {
+          GimpSessionInfoAux *aux = list->data;
+
+          if (strcmp (aux->name, prop_name) == 0)
+            {
+              GObjectClass *class = G_OBJECT_GET_CLASS (object);
+              GParamSpec   *pspec = g_object_class_find_property (class,
+                                                                  prop_name);
+
+              if (pspec)
+                {
+                  GValue  value = G_VALUE_INIT;
+
+                  g_value_init (&value, pspec->value_type);
+
+                  if (G_VALUE_HOLDS_ENUM (&value))
+                    {
+                      GEnumClass *enum_class;
+                      GEnumValue *enum_value;
+
+                      enum_class = g_type_class_peek (pspec->value_type);
+                      enum_value = g_enum_get_value_by_nick (enum_class,
+                                                             aux->value);
+
+                      if (enum_value)
+                        {
+                          g_value_set_enum (&value, enum_value->value);
+                          g_object_set_property (object, pspec->name, &value);
+                        }
+                      else
+                        {
+                        g_warning ("%s: unknown enum value in '%s' for %s",
+                                   G_STRFUNC,
+                                   prop_name, G_OBJECT_CLASS_NAME (class));
+                        }
+                    }
+                  else
+                    {
+                      GValue  str_value = G_VALUE_INIT;
+
+                      g_value_init (&str_value, G_TYPE_STRING);
+                      g_value_set_static_string (&str_value, aux->value);
+
+                      if (g_value_transform (&str_value, &value))
+                        g_object_set_property (object, pspec->name, &value);
+                      else
+                        g_warning ("%s: cannot convert property '%s' for %s",
+                                   G_STRFUNC,
+                                   prop_name, G_OBJECT_CLASS_NAME (class));
+
+                      g_value_unset (&str_value);
+                    }
+
+                  g_value_unset (&value);
+                }
+              else
+                {
+                  g_warning ("%s: no property named '%s' for %s",
+                             G_STRFUNC,
+                             prop_name, G_OBJECT_CLASS_NAME (class));
+                }
+            }
+        }
+    }
+
+  va_end (args);
+}
+
+void
+gimp_session_info_aux_serialize (GimpConfigWriter *writer,
+                                 GList            *aux_info)
+{
+  GList *list;
+
+  g_return_if_fail (writer != NULL);
+  g_return_if_fail (aux_info != NULL);
+
+  gimp_config_writer_open (writer, "aux-info");
+
+  for (list = aux_info; list; list = g_list_next (list))
+    {
+      GimpSessionInfoAux *aux = list->data;
+
+      gimp_config_writer_open (writer, aux->name);
+      gimp_config_writer_string (writer, aux->value);
+      gimp_config_writer_close (writer);
+    }
+
+  gimp_config_writer_close (writer);
+}
+
+GTokenType
+gimp_session_info_aux_deserialize (GScanner  *scanner,
+                                   GList    **aux_list)
+{
+  GimpSessionInfoAux *aux_info = NULL;
+  GTokenType          token    = G_TOKEN_LEFT_PAREN;
+
+  g_return_val_if_fail (scanner != NULL, G_TOKEN_LEFT_PAREN);
+  g_return_val_if_fail (aux_list != NULL, G_TOKEN_LEFT_PAREN);
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_IDENTIFIER;
+          break;
+
+        case G_TOKEN_IDENTIFIER:
+          {
+            aux_info = g_slice_new0 (GimpSessionInfoAux);
+
+            aux_info->name = g_strdup (scanner->value.v_identifier);
+
+            token = G_TOKEN_STRING;
+            if (g_scanner_peek_next_token (scanner) != token)
+              goto error;
+
+            if (! gimp_scanner_parse_string (scanner, &aux_info->value))
+              goto error;
+
+            *aux_list = g_list_append (*aux_list, aux_info);
+            aux_info = NULL;
+          }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  return token;
+
+ error:
+  if (aux_info)
+    gimp_session_info_aux_free (aux_info);
+
+  return token;
+}
diff --git a/app/widgets/gimpsessioninfo-aux.h b/app/widgets/gimpsessioninfo-aux.h
new file mode 100644
index 0000000..d74c56e
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-aux.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-aux.h
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_INFO_AUX_H__
+#define __GIMP_SESSION_INFO_AUX_H__
+
+
+/**
+ * GimpSessionInfoAux:
+ *
+ * Contains arbitrary data in the session management system, used for
+ * example by dockables to manage dockable-specific data.
+ */
+struct _GimpSessionInfoAux
+{
+  gchar *name;
+  gchar *value;
+};
+
+
+GimpSessionInfoAux *
+             gimp_session_info_aux_new            (const gchar         *name,
+                                                   const gchar         *value);
+void         gimp_session_info_aux_free           (GimpSessionInfoAux  *aux);
+
+GList      * gimp_session_info_aux_new_from_props (GObject             *object,
+                                                   ...) G_GNUC_NULL_TERMINATED;
+void         gimp_session_info_aux_set_props      (GObject             *object,
+                                                   GList               *aux,
+                                                   ...) G_GNUC_NULL_TERMINATED;
+
+void         gimp_session_info_aux_serialize      (GimpConfigWriter    *writer,
+                                                   GList               *aux_info);
+GTokenType   gimp_session_info_aux_deserialize    (GScanner            *scanner,
+                                                   GList              **aux_list);
+
+
+#endif  /* __GIMP_SESSION_INFO_AUX_H__ */
diff --git a/app/widgets/gimpsessioninfo-book.c b/app/widgets/gimpsessioninfo-book.c
new file mode 100644
index 0000000..e103165
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-book.c
@@ -0,0 +1,292 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-book.c
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockbook.h"
+#include "gimpsessioninfo.h"
+#include "gimpsessioninfo-book.h"
+#include "gimpsessioninfo-dockable.h"
+
+
+enum
+{
+  SESSION_INFO_BOOK_POSITION,
+  SESSION_INFO_BOOK_CURRENT_PAGE,
+  SESSION_INFO_BOOK_DOCKABLE
+};
+
+
+/*  public functions  */
+
+GimpSessionInfoBook *
+gimp_session_info_book_new (void)
+{
+  return g_slice_new0 (GimpSessionInfoBook);
+}
+
+void
+gimp_session_info_book_free (GimpSessionInfoBook *info)
+{
+  g_return_if_fail (info != NULL);
+
+  if (info->dockables)
+    {
+      g_list_free_full (info->dockables,
+                        (GDestroyNotify) gimp_session_info_dockable_free);
+      info->dockables = NULL;
+    }
+
+  g_slice_free (GimpSessionInfoBook, info);
+}
+
+void
+gimp_session_info_book_serialize (GimpConfigWriter    *writer,
+                                  GimpSessionInfoBook *info)
+{
+  GList *pages;
+
+  g_return_if_fail (writer != NULL);
+  g_return_if_fail (info != NULL);
+
+  gimp_config_writer_open (writer, "book");
+
+  if (info->position != 0)
+    {
+      gint position;
+
+      position = gimp_session_info_apply_position_accuracy (info->position);
+
+      gimp_config_writer_open (writer, "position");
+      gimp_config_writer_printf (writer, "%d", position);
+      gimp_config_writer_close (writer);
+    }
+
+  gimp_config_writer_open (writer, "current-page");
+  gimp_config_writer_printf (writer, "%d", info->current_page);
+  gimp_config_writer_close (writer);
+
+  for (pages = info->dockables; pages; pages = g_list_next (pages))
+    gimp_session_info_dockable_serialize (writer, pages->data);
+
+  gimp_config_writer_close (writer);
+}
+
+GTokenType
+gimp_session_info_book_deserialize (GScanner             *scanner,
+                                    gint                  scope,
+                                    GimpSessionInfoBook **book)
+{
+  GimpSessionInfoBook *info;
+  GTokenType           token;
+
+  g_return_val_if_fail (scanner != NULL, G_TOKEN_LEFT_PAREN);
+  g_return_val_if_fail (book != NULL, G_TOKEN_LEFT_PAREN);
+
+  g_scanner_scope_add_symbol (scanner, scope, "position",
+                              GINT_TO_POINTER (SESSION_INFO_BOOK_POSITION));
+  g_scanner_scope_add_symbol (scanner, scope, "current-page",
+                              GINT_TO_POINTER (SESSION_INFO_BOOK_CURRENT_PAGE));
+  g_scanner_scope_add_symbol (scanner, scope, "dockable",
+                              GINT_TO_POINTER (SESSION_INFO_BOOK_DOCKABLE));
+
+  info = gimp_session_info_book_new ();
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+              GimpSessionInfoDockable *dockable;
+
+            case SESSION_INFO_BOOK_POSITION:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &info->position))
+                goto error;
+              break;
+
+            case SESSION_INFO_BOOK_CURRENT_PAGE:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &info->current_page))
+                goto error;
+              break;
+
+            case SESSION_INFO_BOOK_DOCKABLE:
+              g_scanner_set_scope (scanner, scope + 1);
+              token = gimp_session_info_dockable_deserialize (scanner,
+                                                              scope + 1,
+                                                              &dockable);
+
+              if (token == G_TOKEN_LEFT_PAREN)
+                {
+                  info->dockables = g_list_append (info->dockables, dockable);
+                  g_scanner_set_scope (scanner, scope);
+                }
+              else
+                goto error;
+
+              break;
+
+            default:
+              goto error;
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  *book = info;
+
+  g_scanner_scope_remove_symbol (scanner, scope, "position");
+  g_scanner_scope_remove_symbol (scanner, scope, "current-page");
+  g_scanner_scope_remove_symbol (scanner, scope, "dockable");
+
+  return token;
+
+ error:
+  *book = NULL;
+
+  gimp_session_info_book_free (info);
+
+  return token;
+}
+
+GimpSessionInfoBook *
+gimp_session_info_book_from_widget (GimpDockbook *dockbook)
+{
+  GimpSessionInfoBook *info;
+  GtkWidget           *parent;
+  GList               *children;
+  GList               *list;
+
+  g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), NULL);
+
+  info = gimp_session_info_book_new ();
+
+  parent = gtk_widget_get_parent (GTK_WIDGET (dockbook));
+
+  if (GTK_IS_PANED (parent))
+    {
+      GtkPaned *paned = GTK_PANED (parent);
+
+      if (GTK_WIDGET (dockbook) == gtk_paned_get_child2 (paned))
+        info->position = gtk_paned_get_position (paned);
+    }
+
+  info->current_page =
+    gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
+
+  children = gtk_container_get_children (GTK_CONTAINER (dockbook));
+
+  for (list = children; list; list = g_list_next (list))
+    {
+      GimpSessionInfoDockable *dockable;
+
+      dockable = gimp_session_info_dockable_from_widget (list->data);
+
+      info->dockables = g_list_prepend (info->dockables, dockable);
+    }
+
+  info->dockables = g_list_reverse (info->dockables);
+
+  g_list_free (children);
+
+  return info;
+}
+
+GimpDockbook *
+gimp_session_info_book_restore (GimpSessionInfoBook *info,
+                                GimpDock            *dock)
+{
+  GimpDialogFactory *dialog_factory;
+  GimpMenuFactory   *menu_factory;
+  GtkWidget         *dockbook;
+  GList             *pages;
+  gint               n_dockables = 0;
+
+  g_return_val_if_fail (info != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  dialog_factory = gimp_dock_get_dialog_factory (dock);
+  menu_factory   = gimp_dialog_factory_get_menu_factory (dialog_factory);
+
+  dockbook = gimp_dockbook_new (menu_factory);
+
+  gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), -1);
+
+  for (pages = info->dockables; pages; pages = g_list_next (pages))
+    {
+      GimpSessionInfoDockable *dockable_info = pages->data;
+      GimpDockable            *dockable;
+
+      dockable = gimp_session_info_dockable_restore (dockable_info, dock);
+
+      if (dockable)
+        {
+          gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, -1);
+          n_dockables++;
+        }
+    }
+
+  if (info->current_page <
+      gtk_notebook_get_n_pages (GTK_NOTEBOOK (dockbook)))
+    {
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (dockbook),
+                                     info->current_page);
+    }
+  else if (n_dockables > 1)
+    {
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (dockbook), 0);
+    }
+
+  /*  Return the dockbook even if no dockable could be restored
+   *  (n_dockables == 0) because otherwise we would have to remove it
+   *  from the dock right here, which could implicitly destroy the
+   *  dock and make catching restore errors much harder on higher
+   *  levels. Instead, we check for restored empty dockbooks in our
+   *  caller.
+   */
+  return GIMP_DOCKBOOK (dockbook);
+}
diff --git a/app/widgets/gimpsessioninfo-book.h b/app/widgets/gimpsessioninfo-book.h
new file mode 100644
index 0000000..c7b8388
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-book.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-book.h
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_INFO_BOOK_H__
+#define __GIMP_SESSION_INFO_BOOK_H__
+
+
+/**
+ * GimpSessionInfoBook:
+ *
+ * Contains information about a book (a GtkNotebook of dockables) in
+ * the interface.
+ */
+struct _GimpSessionInfoBook
+{
+  gint   position;
+  gint   current_page;
+
+  /*  list of GimpSessionInfoDockable  */
+  GList *dockables;
+};
+
+
+GimpSessionInfoBook *
+             gimp_session_info_book_new         (void);
+void         gimp_session_info_book_free        (GimpSessionInfoBook  *info);
+
+void         gimp_session_info_book_serialize   (GimpConfigWriter     *writer,
+                                                 GimpSessionInfoBook  *book);
+GTokenType   gimp_session_info_book_deserialize (GScanner             *scanner,
+                                                 gint                  scope,
+                                                 GimpSessionInfoBook **book);
+
+GimpSessionInfoBook *
+             gimp_session_info_book_from_widget (GimpDockbook         *dockbook);
+
+GimpDockbook * gimp_session_info_book_restore   (GimpSessionInfoBook  *info,
+                                                 GimpDock             *dock);
+
+
+#endif  /* __GIMP_SESSION_INFO_BOOK_H__ */
diff --git a/app/widgets/gimpsessioninfo-dock.c b/app/widgets/gimpsessioninfo-dock.c
new file mode 100644
index 0000000..9948074
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-dock.c
@@ -0,0 +1,376 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-dock.c
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockbook.h"
+#include "gimpdockcontainer.h"
+#include "gimpdockwindow.h"
+#include "gimpsessioninfo.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpsessioninfo-book.h"
+#include "gimpsessioninfo-dock.h"
+#include "gimpsessioninfo-private.h"
+#include "gimptoolbox.h"
+
+
+enum
+{
+  SESSION_INFO_SIDE,
+  SESSION_INFO_POSITION,
+  SESSION_INFO_BOOK
+};
+
+
+static GimpAlignmentType gimp_session_info_dock_get_side (GimpDock *dock);
+
+
+static GimpAlignmentType
+gimp_session_info_dock_get_side (GimpDock *dock)
+{
+  GimpAlignmentType result   = -1;
+  GtkWidget        *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (dock));
+
+  if (GIMP_IS_DOCK_CONTAINER (toplevel))
+    {
+      GimpDockContainer *container = GIMP_DOCK_CONTAINER (toplevel);
+
+      result = gimp_dock_container_get_dock_side (container, dock);
+    }
+
+  return result;
+}
+
+
+/*  public functions  */
+
+GimpSessionInfoDock *
+gimp_session_info_dock_new (const gchar *dock_type)
+{
+  GimpSessionInfoDock *dock_info = NULL;
+
+  dock_info = g_slice_new0 (GimpSessionInfoDock);
+  dock_info->dock_type = g_strdup (dock_type);
+  dock_info->side      = -1;
+
+  return dock_info;
+}
+
+void
+gimp_session_info_dock_free (GimpSessionInfoDock *dock_info)
+{
+  g_return_if_fail (dock_info != NULL);
+
+  g_clear_pointer (&dock_info->dock_type, g_free);
+
+  if (dock_info->books)
+    {
+      g_list_free_full (dock_info->books,
+                        (GDestroyNotify) gimp_session_info_book_free);
+      dock_info->books = NULL;
+    }
+
+  g_slice_free (GimpSessionInfoDock, dock_info);
+}
+
+void
+gimp_session_info_dock_serialize (GimpConfigWriter    *writer,
+                                  GimpSessionInfoDock *dock_info)
+{
+  GList *list;
+
+  g_return_if_fail (writer != NULL);
+  g_return_if_fail (dock_info != NULL);
+
+  gimp_config_writer_open (writer, dock_info->dock_type);
+
+  if (dock_info->side != -1)
+    {
+      const char *side_text =
+        dock_info->side == GIMP_ALIGN_LEFT ? "left" : "right";
+
+      gimp_config_writer_open (writer, "side");
+      gimp_config_writer_print (writer, side_text, strlen (side_text));
+      gimp_config_writer_close (writer);
+    }
+
+  if (dock_info->position != 0)
+    {
+      gint position;
+
+      position = gimp_session_info_apply_position_accuracy (dock_info->position);
+
+      gimp_config_writer_open (writer, "position");
+      gimp_config_writer_printf (writer, "%d", position);
+      gimp_config_writer_close (writer);
+    }
+
+  for (list = dock_info->books; list; list = g_list_next (list))
+    gimp_session_info_book_serialize (writer, list->data);
+
+  gimp_config_writer_close (writer);
+}
+
+GTokenType
+gimp_session_info_dock_deserialize (GScanner             *scanner,
+                                    gint                  scope,
+                                    GimpSessionInfoDock **dock_info,
+                                    const gchar          *dock_type)
+{
+  GTokenType token;
+
+  g_return_val_if_fail (scanner != NULL, G_TOKEN_LEFT_PAREN);
+  g_return_val_if_fail (dock_info != NULL, G_TOKEN_LEFT_PAREN);
+
+  g_scanner_scope_add_symbol (scanner, scope, "side",
+                              GINT_TO_POINTER (SESSION_INFO_SIDE));
+  g_scanner_scope_add_symbol (scanner, scope, "position",
+                              GINT_TO_POINTER (SESSION_INFO_POSITION));
+  g_scanner_scope_add_symbol (scanner, scope, "book",
+                              GINT_TO_POINTER (SESSION_INFO_BOOK));
+
+  *dock_info = gimp_session_info_dock_new (dock_type);
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+              GimpSessionInfoBook *book;
+
+            case SESSION_INFO_SIDE:
+              token = G_TOKEN_IDENTIFIER;
+              if (g_scanner_peek_next_token (scanner) != token)
+                break;
+
+              g_scanner_get_next_token (scanner);
+
+              if (strcmp ("left", scanner->value.v_identifier) == 0)
+                (*dock_info)->side = GIMP_ALIGN_LEFT;
+              else
+                (*dock_info)->side = GIMP_ALIGN_RIGHT;
+              break;
+
+            case SESSION_INFO_POSITION:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &((*dock_info)->position)))
+                (*dock_info)->position = 0;
+              break;
+
+            case SESSION_INFO_BOOK:
+              g_scanner_set_scope (scanner, scope + 1);
+              token = gimp_session_info_book_deserialize (scanner, scope + 1,
+                                                          &book);
+
+              if (token == G_TOKEN_LEFT_PAREN)
+                {
+                  (*dock_info)->books = g_list_append ((*dock_info)->books, book);
+                  g_scanner_set_scope (scanner, scope);
+                }
+              else
+                return token;
+
+              break;
+
+            default:
+              return token;
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  g_scanner_scope_remove_symbol (scanner, scope, "book");
+  g_scanner_scope_remove_symbol (scanner, scope, "position");
+  g_scanner_scope_remove_symbol (scanner, scope, "side");
+
+  return token;
+}
+
+GimpSessionInfoDock *
+gimp_session_info_dock_from_widget (GimpDock *dock)
+{
+  GimpSessionInfoDock *dock_info;
+  GList               *list;
+  GtkWidget           *parent;
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  dock_info = gimp_session_info_dock_new (GIMP_IS_TOOLBOX (dock) ?
+                                          "gimp-toolbox" :
+                                          "gimp-dock");
+
+  for (list = gimp_dock_get_dockbooks (dock); list; list = g_list_next (list))
+    {
+      GimpSessionInfoBook *book;
+
+      book = gimp_session_info_book_from_widget (list->data);
+
+      dock_info->books = g_list_prepend (dock_info->books, book);
+    }
+
+  dock_info->books = g_list_reverse (dock_info->books);
+  dock_info->side  = gimp_session_info_dock_get_side (dock);
+
+  parent = gtk_widget_get_parent (GTK_WIDGET (dock));
+
+  if (GTK_IS_PANED (parent))
+    {
+      GtkPaned *paned = GTK_PANED (parent);
+
+      if (GTK_WIDGET (dock) == gtk_paned_get_child2 (paned))
+        dock_info->position = gtk_paned_get_position (paned);
+    }
+
+  return dock_info;
+}
+
+GimpDock *
+gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info,
+                                GimpDialogFactory   *factory,
+                                GdkScreen           *screen,
+                                gint                 monitor,
+                                GimpDockContainer   *dock_container)
+{
+  gint           n_books = 0;
+  GtkWidget     *dock;
+  GList         *iter;
+  GimpUIManager *ui_manager;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  ui_manager = gimp_dock_container_get_ui_manager (dock_container);
+  dock       = gimp_dialog_factory_dialog_new (factory,
+                                               screen,
+                                               monitor,
+                                               ui_manager,
+                                               dock_info->dock_type,
+                                               -1 /*view_size*/,
+                                               FALSE /*present*/);
+
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  /* Add the dock to the dock window immediately so the stuff in the
+   * dock has access to e.g. a dialog factory
+   */
+  gimp_dock_container_add_dock (dock_container,
+                                GIMP_DOCK (dock),
+                                dock_info);
+
+  /* Note that if it is a toolbox, we will get here even though we
+   * don't have any books
+   */
+  for (iter = dock_info->books;
+       iter;
+       iter = g_list_next (iter))
+    {
+      GimpSessionInfoBook *book_info = iter->data;
+      GtkWidget           *dockbook;
+
+      dockbook = GTK_WIDGET (gimp_session_info_book_restore (book_info,
+                                                             GIMP_DOCK (dock)));
+
+      if (dockbook)
+        {
+          GtkWidget *parent = gtk_widget_get_parent (dockbook);
+
+          n_books++;
+
+          if (GTK_IS_PANED (parent))
+            {
+              GtkPaned *paned = GTK_PANED (parent);
+
+              if (dockbook == gtk_paned_get_child2 (paned))
+                gtk_paned_set_position (paned, book_info->position);
+            }
+        }
+    }
+
+  /* Now remove empty dockbooks from the list, check the comment in
+   * gimp_session_info_book_restore() which explains why the dock
+   * can contain empty dockbooks at all
+   */
+  if (dock_info->books)
+    {
+      GList *books;
+
+      books = g_list_copy (gimp_dock_get_dockbooks (GIMP_DOCK (dock)));
+
+      while (books)
+        {
+          GtkContainer *dockbook = books->data;
+          GList        *children = gtk_container_get_children (dockbook);
+
+          if (children)
+            {
+              g_list_free (children);
+            }
+          else
+            {
+              g_object_ref (dockbook);
+              gimp_dock_remove_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook));
+              gtk_widget_destroy (GTK_WIDGET (dockbook));
+              g_object_unref (dockbook);
+
+              n_books--;
+            }
+
+          books = g_list_remove (books, dockbook);
+        }
+    }
+
+  /*  if we removed all books again, the dock was destroyed, so bail out  */
+  if (dock_info->books && n_books == 0)
+    {
+      return NULL;
+    }
+
+  gtk_widget_show (dock);
+
+  return GIMP_DOCK (dock);
+}
diff --git a/app/widgets/gimpsessioninfo-dock.h b/app/widgets/gimpsessioninfo-dock.h
new file mode 100644
index 0000000..3d223de
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-dock.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-dock.h
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_INFO_DOCK_H__
+#define __GIMP_SESSION_INFO_DOCK_H__
+
+
+/**
+ * GimpSessionInfoDock:
+ *
+ * Contains information about a dock in the interface.
+ */
+struct _GimpSessionInfoDock
+{
+  /* Type of dock, written to/read from sessionrc. E.g. 'gimp-dock' or
+   * 'gimp-toolbox'
+   */
+  gchar             *dock_type;
+
+  /* What side this dock is in in single-window mode. Either
+   * GIMP_ARRANGE_LEFT, GIMP_ARRANGE_RIGHT or -1.
+   */
+  GimpAlignmentType  side;
+
+  /* GtkPaned position of this dock */
+  gint               position;
+
+  /*  list of GimpSessionInfoBook  */
+  GList             *books;
+};
+
+GimpSessionInfoDock * gimp_session_info_dock_new         (const gchar          *dock_type);
+void                  gimp_session_info_dock_free        (GimpSessionInfoDock  *dock_info);
+void                  gimp_session_info_dock_serialize   (GimpConfigWriter     *writer,
+                                                          GimpSessionInfoDock  *dock);
+GTokenType            gimp_session_info_dock_deserialize (GScanner             *scanner,
+                                                          gint                  scope,
+                                                          GimpSessionInfoDock **info,
+                                                          const gchar          *dock_type);
+GimpSessionInfoDock * gimp_session_info_dock_from_widget (GimpDock             *dock);
+GimpDock            * gimp_session_info_dock_restore     (GimpSessionInfoDock  *dock_info,
+                                                          GimpDialogFactory    *factory,
+                                                          GdkScreen            *screen,
+                                                          gint                  monitor,
+                                                          GimpDockContainer    *dock_container);
+
+
+#endif  /* __GIMP_SESSION_INFO_DOCK_H__ */
diff --git a/app/widgets/gimpsessioninfo-dockable.c b/app/widgets/gimpsessioninfo-dockable.c
new file mode 100644
index 0000000..5fa5438
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-dockable.c
@@ -0,0 +1,308 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-dockable.c
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+
+#include "widgets-types.h"
+
+#include "gimpcontainerview-utils.h"
+#include "gimpcontainerview.h"
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockable.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpsessioninfo-dockable.h"
+#include "gimpsessionmanaged.h"
+#include "gimptoolbox.h"
+
+
+enum
+{
+  SESSION_INFO_DOCKABLE_LOCKED,
+  SESSION_INFO_DOCKABLE_TAB_STYLE,
+  SESSION_INFO_DOCKABLE_VIEW_SIZE,
+  SESSION_INFO_DOCKABLE_AUX
+};
+
+
+/*  public functions  */
+
+GimpSessionInfoDockable *
+gimp_session_info_dockable_new (void)
+{
+  return g_slice_new0 (GimpSessionInfoDockable);
+}
+
+void
+gimp_session_info_dockable_free (GimpSessionInfoDockable *info)
+{
+  g_return_if_fail (info != NULL);
+
+  g_clear_pointer (&info->identifier, g_free);
+
+  if (info->aux_info)
+    {
+      g_list_free_full (info->aux_info,
+                        (GDestroyNotify) gimp_session_info_aux_free);
+      info->aux_info = NULL;
+    }
+
+  g_slice_free (GimpSessionInfoDockable, info);
+}
+
+void
+gimp_session_info_dockable_serialize (GimpConfigWriter        *writer,
+                                      GimpSessionInfoDockable *info)
+{
+  GEnumClass  *enum_class;
+  GEnumValue  *enum_value;
+  const gchar *tab_style = "icon";
+
+  g_return_if_fail (writer != NULL);
+  g_return_if_fail (info != NULL);
+
+  enum_class = g_type_class_ref (GIMP_TYPE_TAB_STYLE);
+
+  gimp_config_writer_open (writer, "dockable");
+  gimp_config_writer_string (writer, info->identifier);
+
+  if (info->locked)
+    {
+      gimp_config_writer_open (writer, "locked");
+      gimp_config_writer_close (writer);
+    }
+
+  enum_value = g_enum_get_value (enum_class, info->tab_style);
+
+  if (enum_value)
+    tab_style = enum_value->value_nick;
+
+  gimp_config_writer_open (writer, "tab-style");
+  gimp_config_writer_print (writer, tab_style, -1);
+  gimp_config_writer_close (writer);
+
+  if (info->view_size > 0)
+    {
+      gimp_config_writer_open (writer, "preview-size");
+      gimp_config_writer_printf (writer, "%d", info->view_size);
+      gimp_config_writer_close (writer);
+    }
+
+  if (info->aux_info)
+    gimp_session_info_aux_serialize (writer, info->aux_info);
+
+  gimp_config_writer_close (writer);
+
+  g_type_class_unref (enum_class);
+}
+
+GTokenType
+gimp_session_info_dockable_deserialize (GScanner                 *scanner,
+                                        gint                      scope,
+                                        GimpSessionInfoDockable **dockable)
+{
+  GimpSessionInfoDockable *info;
+  GEnumClass              *enum_class;
+  GEnumValue              *enum_value;
+  GTokenType               token;
+
+  g_return_val_if_fail (scanner != NULL, G_TOKEN_LEFT_PAREN);
+  g_return_val_if_fail (dockable != NULL, G_TOKEN_LEFT_PAREN);
+
+  g_scanner_scope_add_symbol (scanner, scope, "locked",
+                              GINT_TO_POINTER (SESSION_INFO_DOCKABLE_LOCKED));
+  g_scanner_scope_add_symbol (scanner, scope, "tab-style",
+                              GINT_TO_POINTER (SESSION_INFO_DOCKABLE_TAB_STYLE));
+  g_scanner_scope_add_symbol (scanner, scope, "preview-size",
+                              GINT_TO_POINTER (SESSION_INFO_DOCKABLE_VIEW_SIZE));
+  g_scanner_scope_add_symbol (scanner, scope, "aux-info",
+                              GINT_TO_POINTER (SESSION_INFO_DOCKABLE_AUX));
+
+  info = gimp_session_info_dockable_new ();
+
+  enum_class = g_type_class_ref (GIMP_TYPE_TAB_STYLE);
+
+  token = G_TOKEN_STRING;
+  if (! gimp_scanner_parse_string (scanner, &info->identifier))
+    goto error;
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+            case SESSION_INFO_DOCKABLE_LOCKED:
+              info->locked = TRUE;
+              break;
+
+            case SESSION_INFO_DOCKABLE_TAB_STYLE:
+              token = G_TOKEN_IDENTIFIER;
+              if (g_scanner_peek_next_token (scanner) != token)
+                goto error;
+
+              g_scanner_get_next_token (scanner);
+
+              enum_value = g_enum_get_value_by_nick (enum_class,
+                                                     scanner->value.v_identifier);
+
+              if (! enum_value)
+                enum_value = g_enum_get_value_by_name (enum_class,
+                                                       scanner->value.v_identifier);
+
+              if (enum_value)
+                info->tab_style = enum_value->value;
+              break;
+
+            case SESSION_INFO_DOCKABLE_VIEW_SIZE:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &info->view_size))
+                goto error;
+              break;
+
+            case SESSION_INFO_DOCKABLE_AUX:
+              token = gimp_session_info_aux_deserialize (scanner,
+                                                         &info->aux_info);
+              if (token != G_TOKEN_LEFT_PAREN)
+                goto error;
+              break;
+
+            default:
+              goto error;
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  *dockable = info;
+
+  g_type_class_unref (enum_class);
+
+  g_scanner_scope_remove_symbol (scanner, scope, "locked");
+  g_scanner_scope_remove_symbol (scanner, scope, "tab-style");
+  g_scanner_scope_remove_symbol (scanner, scope, "preview-size");
+  g_scanner_scope_remove_symbol (scanner, scope, "aux-info");
+
+  return token;
+
+ error:
+  *dockable = NULL;
+
+  gimp_session_info_dockable_free (info);
+  g_type_class_unref (enum_class);
+
+  return token;
+}
+
+GimpSessionInfoDockable *
+gimp_session_info_dockable_from_widget (GimpDockable *dockable)
+{
+  GimpSessionInfoDockable *info;
+  GimpDialogFactoryEntry  *entry;
+  GimpContainerView       *view;
+  gint                     view_size = -1;
+
+  g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
+
+  gimp_dialog_factory_from_widget (GTK_WIDGET (dockable), &entry);
+
+  g_return_val_if_fail (entry != NULL, NULL);
+
+  info = gimp_session_info_dockable_new ();
+
+  info->locked     = gimp_dockable_get_locked (dockable);
+  info->identifier = g_strdup (entry->identifier);
+  info->tab_style  = gimp_dockable_get_tab_style (dockable);
+  info->view_size  = -1;
+
+  view = gimp_container_view_get_by_dockable (dockable);
+
+  if (view)
+    view_size = gimp_container_view_get_view_size (view, NULL);
+
+  if (view_size > 0 && view_size != entry->view_size)
+    info->view_size = view_size;
+
+  if (GIMP_IS_SESSION_MANAGED (dockable))
+    info->aux_info =
+      gimp_session_managed_get_aux_info (GIMP_SESSION_MANAGED (dockable));
+
+  return info;
+}
+
+GimpDockable *
+gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
+                                    GimpDock                *dock)
+{
+  GtkWidget *dockable;
+
+  g_return_val_if_fail (info != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
+
+  if (info->view_size < GIMP_VIEW_SIZE_TINY ||
+      info->view_size > GIMP_VIEW_SIZE_GIGANTIC)
+    info->view_size = -1;
+
+  dockable =
+    gimp_dialog_factory_dockable_new (gimp_dock_get_dialog_factory (dock),
+                                      dock,
+                                      info->identifier,
+                                      info->view_size);
+
+  if (dockable)
+    {
+      /*  gimp_dialog_factory_dockable_new() might return an already
+       *  existing singleton dockable, return NULL so our caller won't
+       *  try to add it to another dockbook
+       */
+      if (gimp_dockable_get_dockbook (GIMP_DOCKABLE (dockable)))
+        return NULL;
+
+      gimp_dockable_set_locked    (GIMP_DOCKABLE (dockable), info->locked);
+      gimp_dockable_set_tab_style (GIMP_DOCKABLE (dockable), info->tab_style);
+
+      if (info->aux_info)
+        gimp_session_managed_set_aux_info (GIMP_SESSION_MANAGED (dockable),
+                                           info->aux_info);
+    }
+
+  return GIMP_DOCKABLE (dockable);
+}
diff --git a/app/widgets/gimpsessioninfo-dockable.h b/app/widgets/gimpsessioninfo-dockable.h
new file mode 100644
index 0000000..83df53a
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-dockable.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-dockable.h
+ * Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_INFO_DOCKABLE_H__
+#define __GIMP_SESSION_INFO_DOCKABLE_H__
+
+
+/**
+ * GimpSessionInfoDockable:
+ *
+ * Contains information about a dockable in the interface.
+ */
+struct _GimpSessionInfoDockable
+{
+  gchar        *identifier;
+  gboolean      locked;
+  GimpTabStyle  tab_style;
+  gint          view_size;
+
+  /*  dialog specific list of GimpSessionInfoAux  */
+  GList        *aux_info;
+};
+
+
+GimpSessionInfoDockable *
+               gimp_session_info_dockable_new         (void);
+void           gimp_session_info_dockable_free        (GimpSessionInfoDockable  *info);
+
+void           gimp_session_info_dockable_serialize   (GimpConfigWriter         *writer,
+                                                       GimpSessionInfoDockable  *dockable);
+GTokenType     gimp_session_info_dockable_deserialize (GScanner                 *scanner,
+                                                       gint                      scope,
+                                                       GimpSessionInfoDockable **dockable);
+
+GimpSessionInfoDockable *
+               gimp_session_info_dockable_from_widget (GimpDockable             *dockable);
+
+GimpDockable * gimp_session_info_dockable_restore     (GimpSessionInfoDockable  *info,
+                                                       GimpDock                 *dock);
+
+
+#endif  /* __GIMP_SESSION_INFO_DOCKABLE_H__ */
diff --git a/app/widgets/gimpsessioninfo-private.h b/app/widgets/gimpsessioninfo-private.h
new file mode 100644
index 0000000..97ba0a9
--- /dev/null
+++ b/app/widgets/gimpsessioninfo-private.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo-private.h
+ * Copyright (C) 2001-2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_INFO_PRIVATE_H__
+#define __GIMP_SESSION_INFO_PRIVATE_H__
+
+
+struct _GimpSessionInfoPrivate
+{
+  /*  the dialog factory entry for object we have session info for
+   *  note that pure "dock" entries don't have any factory entry
+   */
+  GimpDialogFactoryEntry *factory_entry;
+
+  gint                    x;
+  gint                    y;
+  gint                    width;
+  gint                    height;
+  gboolean                right_align;
+  gboolean                bottom_align;
+  gint                    monitor;
+
+  /*  only valid while restoring and saving the session  */
+  gboolean                open;
+  gint                    screen;
+
+  /*  dialog specific list of GimpSessionInfoAux  */
+  GList                  *aux_info;
+
+  GtkWidget              *widget;
+
+  /*  list of GimpSessionInfoDock  */
+  GList                  *docks;
+};
+
+
+#endif /* __GIMP_SESSION_INFO_PRIVATE_H__ */
diff --git a/app/widgets/gimpsessioninfo.c b/app/widgets/gimpsessioninfo.c
new file mode 100644
index 0000000..23fb579
--- /dev/null
+++ b/app/widgets/gimpsessioninfo.c
@@ -0,0 +1,1079 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo.c
+ * Copyright (C) 2001-2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "widgets/gimpdockcontainer.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockwindow.h"
+#include "gimpsessioninfo.h"
+#include "gimpsessioninfo-aux.h"
+#include "gimpsessioninfo-book.h"
+#include "gimpsessioninfo-dock.h"
+#include "gimpsessioninfo-private.h"
+#include "gimpsessionmanaged.h"
+
+#include "gimp-log.h"
+
+
+enum
+{
+  SESSION_INFO_FACTORY_ENTRY,
+  SESSION_INFO_POSITION,
+  SESSION_INFO_SIZE,
+  SESSION_INFO_MONITOR,
+  SESSION_INFO_OPEN,
+  SESSION_INFO_AUX,
+  SESSION_INFO_DOCK,
+  SESSION_INFO_GIMP_DOCK,
+  SESSION_INFO_GIMP_TOOLBOX
+};
+
+#define DEFAULT_SCREEN  -1
+#define DEFAULT_MONITOR -1
+
+
+typedef struct
+{
+  GimpSessionInfo   *info;
+  GimpDialogFactory *factory;
+  GdkScreen         *screen;
+  gint               monitor;
+  GtkWidget         *dialog;
+} GimpRestoreDocksData;
+
+
+static void      gimp_session_info_config_iface_init  (GimpConfigInterface  *iface);
+static void      gimp_session_info_finalize           (GObject              *object);
+static gint64    gimp_session_info_get_memsize        (GimpObject           *object,
+                                                       gint64               *gui_size);
+static gboolean  gimp_session_info_serialize          (GimpConfig           *config,
+                                                       GimpConfigWriter     *writer,
+                                                       gpointer              data);
+static gboolean  gimp_session_info_deserialize        (GimpConfig           *config,
+                                                       GScanner             *scanner,
+                                                       gint                  nest_level,
+                                                       gpointer              data);
+static gboolean  gimp_session_info_is_for_dock_window (GimpSessionInfo      *info);
+static void      gimp_session_info_dialog_show        (GtkWidget            *widget,
+                                                       GimpSessionInfo      *info);
+static gboolean  gimp_session_info_restore_docks      (GimpRestoreDocksData *data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpSessionInfo, gimp_session_info, GIMP_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GimpSessionInfo)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_session_info_config_iface_init))
+
+#define parent_class gimp_session_info_parent_class
+
+
+static void
+gimp_session_info_class_init (GimpSessionInfoClass *klass)
+{
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+  object_class->finalize         = gimp_session_info_finalize;
+
+  gimp_object_class->get_memsize = gimp_session_info_get_memsize;
+}
+
+static void
+gimp_session_info_init (GimpSessionInfo *info)
+{
+  info->p = gimp_session_info_get_instance_private (info);
+
+  info->p->monitor = DEFAULT_MONITOR;
+  info->p->screen  = DEFAULT_SCREEN;
+}
+
+static void
+gimp_session_info_config_iface_init (GimpConfigInterface *iface)
+{
+  iface->serialize   = gimp_session_info_serialize;
+  iface->deserialize = gimp_session_info_deserialize;
+}
+
+static void
+gimp_session_info_finalize (GObject *object)
+{
+  GimpSessionInfo *info = GIMP_SESSION_INFO (object);
+
+  gimp_session_info_clear_info (info);
+
+  gimp_session_info_set_widget (info, NULL);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gint64
+gimp_session_info_get_memsize (GimpObject *object,
+                               gint64     *gui_size)
+{
+#if 0
+  GimpSessionInfo *info    = GIMP_SESSION_INFO (object);
+#endif
+  gint64           memsize = 0;
+
+  return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+                                                                  gui_size);
+}
+
+static gboolean
+gimp_session_info_serialize (GimpConfig       *config,
+                             GimpConfigWriter *writer,
+                             gpointer          data)
+{
+  GimpSessionInfo *info = GIMP_SESSION_INFO (config);
+  GList           *iter = NULL;
+  gint             x;
+  gint             y;
+  gint             width;
+  gint             height;
+
+  if (info->p->factory_entry && info->p->factory_entry->identifier)
+    {
+      gimp_config_writer_open (writer, "factory-entry");
+      gimp_config_writer_string (writer, info->p->factory_entry->identifier);
+      gimp_config_writer_close (writer);
+    }
+
+  x      = gimp_session_info_apply_position_accuracy (info->p->x);
+  y      = gimp_session_info_apply_position_accuracy (info->p->y);
+  width  = gimp_session_info_apply_position_accuracy (info->p->width);
+  height = gimp_session_info_apply_position_accuracy (info->p->height);
+
+  gimp_config_writer_open (writer, "position");
+  gimp_config_writer_printf (writer, "%d %d", x, y);
+  gimp_config_writer_close (writer);
+
+  if (info->p->width > 0 && info->p->height > 0)
+    {
+      gimp_config_writer_open (writer, "size");
+      gimp_config_writer_printf (writer, "%d %d", width, height);
+      gimp_config_writer_close (writer);
+    }
+
+  if (info->p->monitor != DEFAULT_MONITOR)
+    {
+      gimp_config_writer_open (writer, "monitor");
+      gimp_config_writer_printf (writer, "%d", info->p->monitor);
+      gimp_config_writer_close (writer);
+    }
+
+  if (info->p->open)
+    {
+      gimp_config_writer_open (writer, "open-on-exit");
+
+      if (info->p->screen != DEFAULT_SCREEN)
+        gimp_config_writer_printf (writer, "%d", info->p->screen);
+
+      gimp_config_writer_close (writer);
+    }
+
+  if (info->p->aux_info)
+    gimp_session_info_aux_serialize (writer, info->p->aux_info);
+
+  for (iter = info->p->docks; iter; iter = g_list_next (iter))
+    gimp_session_info_dock_serialize (writer, iter->data);
+
+  return TRUE;
+}
+
+/*
+ * This function is just like gimp_scanner_parse_int(), but it is allows
+ * to detect the special value '-0'. This is used as in X geometry strings.
+ */
+static gboolean
+gimp_session_info_parse_offset (GScanner *scanner,
+                                gint     *dest,
+                                gboolean *negative)
+{
+  if (g_scanner_peek_next_token (scanner) == '-')
+    {
+      *negative = TRUE;
+      g_scanner_get_next_token (scanner);
+    }
+  else
+    {
+      *negative = FALSE;
+    }
+
+  if (g_scanner_peek_next_token (scanner) != G_TOKEN_INT)
+    return FALSE;
+
+  g_scanner_get_next_token (scanner);
+
+  if (*negative)
+    *dest = -scanner->value.v_int64;
+  else
+    *dest = scanner->value.v_int64;
+
+  return TRUE;
+}
+
+static gboolean
+gimp_session_info_deserialize (GimpConfig *config,
+                               GScanner   *scanner,
+                               gint        nest_level,
+                               gpointer    data)
+{
+  GimpSessionInfo *info = GIMP_SESSION_INFO (config);
+  GTokenType       token;
+  guint            scope_id;
+  guint            old_scope_id;
+
+  scope_id = g_type_qname (G_TYPE_FROM_INSTANCE (config));
+  old_scope_id = g_scanner_set_scope (scanner, scope_id);
+
+  g_scanner_scope_add_symbol (scanner, scope_id, "factory-entry",
+                              GINT_TO_POINTER (SESSION_INFO_FACTORY_ENTRY));
+  g_scanner_scope_add_symbol (scanner, scope_id, "position",
+                              GINT_TO_POINTER (SESSION_INFO_POSITION));
+  g_scanner_scope_add_symbol (scanner, scope_id, "size",
+                              GINT_TO_POINTER (SESSION_INFO_SIZE));
+  g_scanner_scope_add_symbol (scanner, scope_id, "monitor",
+                              GINT_TO_POINTER (SESSION_INFO_MONITOR));
+  g_scanner_scope_add_symbol (scanner, scope_id, "open-on-exit",
+                              GINT_TO_POINTER (SESSION_INFO_OPEN));
+  g_scanner_scope_add_symbol (scanner, scope_id, "aux-info",
+                              GINT_TO_POINTER (SESSION_INFO_AUX));
+  g_scanner_scope_add_symbol (scanner, scope_id, "gimp-dock",
+                              GINT_TO_POINTER (SESSION_INFO_GIMP_DOCK));
+  g_scanner_scope_add_symbol (scanner, scope_id, "gimp-toolbox",
+                              GINT_TO_POINTER (SESSION_INFO_GIMP_TOOLBOX));
+
+  /* For sessionrc files from version <= GIMP 2.6 */
+  g_scanner_scope_add_symbol (scanner, scope_id, "dock",
+                              GINT_TO_POINTER (SESSION_INFO_DOCK));
+
+  token = G_TOKEN_LEFT_PAREN;
+
+  while (g_scanner_peek_next_token (scanner) == token)
+    {
+      token = g_scanner_get_next_token (scanner);
+
+      switch (token)
+        {
+        case G_TOKEN_LEFT_PAREN:
+          token = G_TOKEN_SYMBOL;
+          break;
+
+        case G_TOKEN_SYMBOL:
+          switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+            {
+            case SESSION_INFO_FACTORY_ENTRY:
+              {
+                gchar                  *identifier = NULL;
+                GimpDialogFactoryEntry *entry      = NULL;
+
+                token = G_TOKEN_STRING;
+                if (! gimp_scanner_parse_string (scanner, &identifier))
+                  goto error;
+
+                entry = gimp_dialog_factory_find_entry (gimp_dialog_factory_get_singleton (),
+                                                        identifier);
+                if (! entry)
+                  goto error;
+
+                gimp_session_info_set_factory_entry (info, entry);
+
+                g_free (identifier);
+              }
+              break;
+
+            case SESSION_INFO_POSITION:
+              token = G_TOKEN_INT;
+              if (! gimp_session_info_parse_offset (scanner,
+                                                    &info->p->x,
+                                                    &info->p->right_align))
+                goto error;
+              if (! gimp_session_info_parse_offset (scanner,
+                                                    &info->p->y,
+                                                    &info->p->bottom_align))
+                goto error;
+              break;
+
+            case SESSION_INFO_SIZE:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &info->p->width))
+                goto error;
+              if (! gimp_scanner_parse_int (scanner, &info->p->height))
+                goto error;
+              break;
+
+            case SESSION_INFO_MONITOR:
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &info->p->monitor))
+                goto error;
+              break;
+
+            case SESSION_INFO_OPEN:
+              info->p->open = TRUE;
+
+              /*  the screen number is optional  */
+              if (g_scanner_peek_next_token (scanner) == G_TOKEN_RIGHT_PAREN)
+                break;
+
+              token = G_TOKEN_INT;
+              if (! gimp_scanner_parse_int (scanner, &info->p->screen))
+                goto error;
+              break;
+
+            case SESSION_INFO_AUX:
+              token = gimp_session_info_aux_deserialize (scanner,
+                                                         &info->p->aux_info);
+              if (token != G_TOKEN_LEFT_PAREN)
+                goto error;
+              break;
+
+            case SESSION_INFO_GIMP_TOOLBOX:
+            case SESSION_INFO_GIMP_DOCK:
+            case SESSION_INFO_DOCK:
+              {
+                GimpSessionInfoDock *dock_info  = NULL;
+                const gchar         *dock_type = NULL;
+
+                /* Handle old sessionrc:s from versions <= GIMP 2.6 */
+                if (GPOINTER_TO_INT (scanner->value.v_symbol) == SESSION_INFO_DOCK &&
+                    info->p->factory_entry &&
+                    info->p->factory_entry->identifier &&
+                    strcmp ("gimp-toolbox-window",
+                            info->p->factory_entry->identifier) == 0)
+                  {
+                    dock_type = "gimp-toolbox";
+                  }
+                else
+                  {
+                    dock_type = ((GPOINTER_TO_INT (scanner->value.v_symbol) ==
+                                  SESSION_INFO_GIMP_TOOLBOX) ?
+                                 "gimp-toolbox" :
+                                 "gimp-dock");
+                  }
+
+                g_scanner_set_scope (scanner, scope_id + 1);
+                token = gimp_session_info_dock_deserialize (scanner, scope_id + 1,
+                                                            &dock_info,
+                                                            dock_type);
+
+                if (token == G_TOKEN_LEFT_PAREN)
+                  {
+                    g_scanner_set_scope (scanner, scope_id);
+                    info->p->docks = g_list_append (info->p->docks, dock_info);
+                  }
+                else
+                  goto error;
+              }
+              break;
+
+            default:
+              break;
+            }
+          token = G_TOKEN_RIGHT_PAREN;
+          break;
+
+        case G_TOKEN_RIGHT_PAREN:
+          token = G_TOKEN_LEFT_PAREN;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+ error:
+
+  /* If we don't have docks, assume it is a toolbox dock window from a
+   * sessionrc file from GIMP <= 2.6 and add a toolbox dock manually
+   */
+  if (! info->p->docks &&
+      info->p->factory_entry &&
+      strcmp ("gimp-toolbox-window",
+              info->p->factory_entry->identifier) == 0)
+    {
+      info->p->docks =
+        g_list_append (info->p->docks,
+                       gimp_session_info_dock_new ("gimp-toolbox"));
+    }
+
+  g_scanner_scope_remove_symbol (scanner, scope_id, "factory-entry");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "position");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "size");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "open-on-exit");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "aux-info");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "gimp-dock");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "gimp-toolbox");
+  g_scanner_scope_remove_symbol (scanner, scope_id, "dock");
+
+  g_scanner_set_scope (scanner, old_scope_id);
+
+  return gimp_config_deserialize_return (scanner, token, nest_level);
+}
+
+/**
+ * gimp_session_info_is_for_dock_window:
+ * @info:
+ *
+ * Helper function to determine if the session info is for a dock. It
+ * uses the dialog factory entry state and the associated widget state
+ * if any to determine that.
+ *
+ * Returns: %TRUE if session info is for a dock, %FALSE otherwise.
+ **/
+static gboolean
+gimp_session_info_is_for_dock_window (GimpSessionInfo *info)
+{
+  gboolean entry_state_for_dock  =  info->p->factory_entry == NULL;
+  gboolean widget_state_for_dock = (info->p->widget == NULL ||
+                                    GIMP_IS_DOCK_WINDOW (info->p->widget));
+
+  return entry_state_for_dock && widget_state_for_dock;
+}
+
+static void
+gimp_session_info_dialog_show (GtkWidget       *widget,
+                               GimpSessionInfo *info)
+{
+  gtk_window_move (GTK_WINDOW (widget),
+                   info->p->x, info->p->y);
+}
+
+static gboolean
+gimp_session_info_restore_docks (GimpRestoreDocksData *data)
+{
+  GimpSessionInfo     *info    = data->info;
+  GimpDialogFactory   *factory = data->factory;
+  GdkScreen           *screen  = data->screen;
+  gint                 monitor = data->monitor;
+  GtkWidget           *dialog  = data->dialog;
+  GList               *iter;
+
+  if (GIMP_IS_DOCK_CONTAINER (dialog))
+    {
+      /* We expect expect there to always be docks. In sessionrc files
+       * from <= 2.6 not all dock window entries had dock entries, but we
+       * take care of that during sessionrc parsing
+       */
+      for (iter = info->p->docks; iter; iter = g_list_next (iter))
+        {
+          GimpSessionInfoDock *dock_info = (GimpSessionInfoDock *) iter->data;
+          GtkWidget           *dock;
+
+          dock =
+            GTK_WIDGET (gimp_session_info_dock_restore (dock_info,
+                                                        factory,
+                                                        screen,
+                                                        monitor,
+                                                        GIMP_DOCK_CONTAINER (dialog)));
+
+          if (dock && dock_info->position != 0)
+            {
+              GtkWidget *parent = gtk_widget_get_parent (dock);
+
+              if (GTK_IS_PANED (parent))
+                {
+                  GtkPaned *paned = GTK_PANED (parent);
+
+                  if (dock == gtk_paned_get_child2 (paned))
+                    gtk_paned_set_position (paned, dock_info->position);
+                }
+            }
+        }
+    }
+
+  gimp_session_info_clear_info (info);
+
+  g_object_unref (dialog);
+  g_object_unref (screen);
+  g_object_unref (factory);
+  g_object_unref (info);
+
+  g_slice_free (GimpRestoreDocksData, data);
+
+  return FALSE;
+}
+
+
+/*  public functions  */
+
+GimpSessionInfo *
+gimp_session_info_new (void)
+{
+  return g_object_new (GIMP_TYPE_SESSION_INFO, NULL);
+}
+
+void
+gimp_session_info_restore (GimpSessionInfo   *info,
+                           GimpDialogFactory *factory,
+                           GdkScreen         *screen,
+                           gint               monitor)
+{
+  GtkWidget            *dialog = NULL;
+  GimpRestoreDocksData *data;
+
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+  g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  g_object_ref (info);
+
+  if (info->p->screen != DEFAULT_SCREEN)
+    {
+      GdkDisplay *display;
+      GdkScreen  *info_screen;
+
+      display = gdk_display_get_default ();
+      info_screen = gdk_display_get_screen (display, info->p->screen);
+
+      if (info_screen)
+        screen = info_screen;
+    }
+
+  info->p->open   = FALSE;
+  info->p->screen = DEFAULT_SCREEN;
+
+  if (info->p->factory_entry &&
+      info->p->factory_entry->restore_func)
+    {
+      dialog = info->p->factory_entry->restore_func (factory,
+                                                     screen,
+                                                     monitor,
+                                                     info);
+    }
+  else
+    g_printerr ("EEEEK\n");
+
+  if (GIMP_IS_SESSION_MANAGED (dialog) && info->p->aux_info)
+    gimp_session_managed_set_aux_info (GIMP_SESSION_MANAGED (dialog),
+                                       info->p->aux_info);
+
+  /* In single-window mode, gimp_session_managed_set_aux_info()
+   * will set the size of the dock areas at the sides. If we don't
+   * wait for those areas to get their size-allocation, we can't
+   * properly restore the docks inside them, so do that in an idle
+   * callback.
+   */
+
+  /* Objects are unreffed again in the callback */
+  data = g_slice_new0 (GimpRestoreDocksData);
+  data->info    = g_object_ref (info);
+  data->factory = g_object_ref (factory);
+  data->screen  = g_object_ref (screen);
+  data->monitor = monitor;
+  data->dialog  = dialog ? g_object_ref (dialog) : NULL;
+
+  g_idle_add ((GSourceFunc) gimp_session_info_restore_docks, data);
+
+  g_object_unref (info);
+}
+
+/**
+ * gimp_session_info_apply_geometry:
+ * @info:
+ * @screen:
+ * @current_monitor:
+ *
+ * Apply the geometry stored in the session info object to the
+ * associated widget.
+ **/
+void
+gimp_session_info_apply_geometry (GimpSessionInfo *info,
+                                  GdkScreen       *screen,
+                                  gint             current_monitor,
+                                  gboolean         apply_stored_monitor)
+{
+  GdkRectangle rect;
+  GdkRectangle work_rect;
+  gchar        geom[32];
+  gint         monitor;
+  gint         width;
+  gint         height;
+
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+  g_return_if_fail (GTK_IS_WINDOW (info->p->widget));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  monitor = current_monitor;
+
+  if (apply_stored_monitor)
+    {
+      gint n_monitors;
+
+      n_monitors = gdk_screen_get_n_monitors (screen);
+
+      if (info->p->monitor != DEFAULT_MONITOR &&
+          info->p->monitor < n_monitors)
+        {
+          monitor = info->p->monitor;
+        }
+      else
+        {
+          monitor = gdk_screen_get_primary_monitor (screen);
+        }
+    }
+
+  gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+  gdk_screen_get_monitor_workarea (screen, monitor, &work_rect);
+
+  info->p->x += rect.x;
+  info->p->y += rect.y;
+
+  if (gimp_session_info_get_remember_size (info) &&
+      info->p->width  > 0 &&
+      info->p->height > 0)
+    {
+      width  = info->p->width;
+      height = info->p->height;
+    }
+  else
+    {
+      GtkRequisition requisition;
+
+      gtk_widget_size_request (info->p->widget, &requisition);
+
+      width  = requisition.width;
+      height = requisition.height;
+    }
+
+  info->p->x = CLAMP (info->p->x,
+                      work_rect.x,
+                      work_rect.x + work_rect.width  - width);
+  info->p->y = CLAMP (info->p->y,
+                      work_rect.y,
+                      work_rect.y + work_rect.height - height);
+
+  if (info->p->right_align && info->p->bottom_align)
+    {
+      g_strlcpy (geom, "-0-0", sizeof (geom));
+    }
+  else if (info->p->right_align)
+    {
+      g_snprintf (geom, sizeof (geom), "-0%+d", info->p->y);
+    }
+  else if (info->p->bottom_align)
+    {
+      g_snprintf (geom, sizeof (geom), "%+d-0", info->p->x);
+    }
+  else
+    {
+      g_snprintf (geom, sizeof (geom), "%+d%+d", info->p->x, info->p->y);
+    }
+
+  gtk_window_parse_geometry (GTK_WINDOW (info->p->widget), geom);
+
+  if (gimp_session_info_get_remember_size (info) &&
+      info->p->width  > 0 &&
+      info->p->height > 0)
+    {
+      gtk_window_set_default_size (GTK_WINDOW (info->p->widget),
+                                   info->p->width, info->p->height);
+    }
+
+  /*  Window managers and windowing systems suck. They have their own
+   *  ideas about WM standards and when it's appropriate to honor
+   *  user/application-set window positions and when not. Therefore,
+   *  use brute force and "manually" position dialogs whenever they
+   *  are shown. This is important especially for transient dialogs,
+   *  because window managers behave even "smarter" then...
+   */
+  if (GTK_IS_DIALOG (info->p->widget))
+    g_signal_connect (info->p->widget, "show",
+                      G_CALLBACK (gimp_session_info_dialog_show),
+                      info);
+}
+
+/**
+ * gimp_session_info_read_geometry:
+ * @info:  A #GimpSessionInfo
+ * @cevent A #GdkEventConfigure. If set, use the size from here
+ *         instead of from the window allocation.
+ *
+ * Read geometry related information from the associated widget.
+ **/
+void
+gimp_session_info_read_geometry (GimpSessionInfo   *info,
+                                 GdkEventConfigure *cevent)
+{
+  GdkWindow *window;
+  GdkScreen *screen;
+
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+  g_return_if_fail (GTK_IS_WINDOW (info->p->widget));
+
+  window = gtk_widget_get_window (info->p->widget);
+  screen = gtk_widget_get_screen (info->p->widget);
+
+  if (window)
+    {
+      gint         x, y;
+      gint         monitor;
+      GdkRectangle geometry;
+
+      gdk_window_get_root_origin (window, &x, &y);
+
+      /* Don't write negative values to the sessionrc, they are
+       * interpreted as relative to the right, respective bottom edge
+       * of the screen.
+       */
+      info->p->x = MAX (0, x);
+      info->p->y = MAX (0, y);
+
+      monitor = gdk_screen_get_monitor_at_point (screen,
+                                                 info->p->x, info->p->y);
+      gdk_screen_get_monitor_geometry (screen, monitor, &geometry);
+
+      /* Always store window coordinates relative to the monitor */
+      info->p->x -= geometry.x;
+      info->p->y -= geometry.y;
+
+      if (gimp_session_info_get_remember_size (info))
+        {
+          int width;
+          int height;
+
+          if (cevent)
+            {
+              width  = cevent->width;
+              height = cevent->height;
+            }
+          else
+            {
+              GtkAllocation allocation;
+
+              gtk_widget_get_allocation (info->p->widget, &allocation);
+
+              width  = allocation.width;
+              height = allocation.height;
+            }
+
+          info->p->width  = width;
+          info->p->height = height;
+        }
+      else
+        {
+          info->p->width  = 0;
+          info->p->height = 0;
+        }
+
+      info->p->monitor = DEFAULT_MONITOR;
+
+      if (monitor != gdk_screen_get_primary_monitor (screen))
+        info->p->monitor = monitor;
+    }
+
+  info->p->open = FALSE;
+
+  if (gimp_session_info_get_remember_if_open (info))
+    {
+      GimpDialogVisibilityState visibility;
+
+      visibility =
+        GPOINTER_TO_INT (g_object_get_data (G_OBJECT (info->p->widget),
+                                            GIMP_DIALOG_VISIBILITY_KEY));
+
+      switch (visibility)
+        {
+        case GIMP_DIALOG_VISIBILITY_UNKNOWN:
+          info->p->open = gtk_widget_get_visible (info->p->widget);
+          break;
+
+        case GIMP_DIALOG_VISIBILITY_INVISIBLE:
+          info->p->open = FALSE;
+          break;
+
+        case GIMP_DIALOG_VISIBILITY_HIDDEN:
+        case GIMP_DIALOG_VISIBILITY_VISIBLE:
+          /* Even if a dialog is hidden (with Windows->Hide docks) it
+           * is still considered open. It will be restored the next
+           * time GIMP starts
+           */
+          info->p->open = TRUE;
+          break;
+        }
+    }
+
+  info->p->screen = DEFAULT_SCREEN;
+
+  if (info->p->open)
+    {
+      GdkDisplay *display = gtk_widget_get_display (info->p->widget);
+
+      if (screen != gdk_display_get_default_screen (display))
+        info->p->screen = gdk_screen_get_number (screen);
+    }
+}
+
+void
+gimp_session_info_get_info (GimpSessionInfo *info)
+{
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+  g_return_if_fail (GTK_IS_WIDGET (info->p->widget));
+
+  gimp_session_info_read_geometry (info, NULL /*cevent*/);
+
+  if (GIMP_IS_SESSION_MANAGED (info->p->widget))
+    info->p->aux_info =
+      gimp_session_managed_get_aux_info (GIMP_SESSION_MANAGED (info->p->widget));
+
+  if (GIMP_IS_DOCK_CONTAINER (info->p->widget))
+    {
+      GimpDockContainer *dock_container = GIMP_DOCK_CONTAINER (info->p->widget);
+      GList             *iter           = NULL;
+      GList             *docks;
+
+      docks = gimp_dock_container_get_docks (dock_container);
+
+      for (iter = docks;
+           iter;
+           iter = g_list_next (iter))
+        {
+          GimpDock *dock = GIMP_DOCK (iter->data);
+
+          info->p->docks =
+            g_list_append (info->p->docks,
+                           gimp_session_info_dock_from_widget (dock));
+        }
+
+      g_list_free (docks);
+    }
+}
+
+/**
+ * gimp_session_info_get_info_with_widget:
+ * @info:
+ * @widget: #GtkWidget to use
+ *
+ * Temporarily sets @widget on @info and calls
+ * gimp_session_info_get_info(), then restores the old widget that was
+ * set.
+ **/
+void
+gimp_session_info_get_info_with_widget (GimpSessionInfo *info,
+                                        GtkWidget       *widget)
+{
+  GtkWidget *old_widget;
+
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  old_widget = gimp_session_info_get_widget (info);
+
+  gimp_session_info_set_widget (info, widget);
+  gimp_session_info_get_info (info);
+  gimp_session_info_set_widget (info, old_widget);
+}
+
+void
+gimp_session_info_clear_info (GimpSessionInfo *info)
+{
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+
+  if (info->p->aux_info)
+    {
+      g_list_free_full (info->p->aux_info,
+                        (GDestroyNotify) gimp_session_info_aux_free);
+      info->p->aux_info = NULL;
+    }
+
+  if (info->p->docks)
+    {
+      g_list_free_full (info->p->docks,
+                        (GDestroyNotify) gimp_session_info_dock_free);
+      info->p->docks = NULL;
+    }
+}
+
+gboolean
+gimp_session_info_is_singleton (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return (! gimp_session_info_is_for_dock_window (info) &&
+          info->p->factory_entry &&
+          info->p->factory_entry->singleton);
+}
+
+gboolean
+gimp_session_info_is_session_managed (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return (gimp_session_info_is_for_dock_window (info) ||
+          (info->p->factory_entry &&
+           info->p->factory_entry->session_managed));
+}
+
+
+gboolean
+gimp_session_info_get_remember_size (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return (gimp_session_info_is_for_dock_window (info) ||
+          (info->p->factory_entry &&
+           info->p->factory_entry->remember_size));
+}
+
+gboolean
+gimp_session_info_get_remember_if_open (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return (gimp_session_info_is_for_dock_window (info) ||
+          (info->p->factory_entry &&
+           info->p->factory_entry->remember_if_open));
+}
+
+GtkWidget *
+gimp_session_info_get_widget (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return info->p->widget;
+}
+
+void
+gimp_session_info_set_widget (GimpSessionInfo *info,
+                              GtkWidget       *widget)
+{
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+
+  if (GTK_IS_DIALOG (info->p->widget))
+    g_signal_handlers_disconnect_by_func (info->p->widget,
+                                          gimp_session_info_dialog_show,
+                                          info);
+
+  info->p->widget = widget;
+}
+
+GimpDialogFactoryEntry *
+gimp_session_info_get_factory_entry (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return info->p->factory_entry;
+}
+
+void
+gimp_session_info_set_factory_entry (GimpSessionInfo        *info,
+                                     GimpDialogFactoryEntry *entry)
+{
+  g_return_if_fail (GIMP_IS_SESSION_INFO (info));
+
+  info->p->factory_entry = entry;
+}
+
+gboolean
+gimp_session_info_get_open (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), FALSE);
+
+  return info->p->open;
+}
+
+gint
+gimp_session_info_get_x (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), 0);
+
+  return info->p->x;
+}
+
+gint
+gimp_session_info_get_y (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), 0);
+
+  return info->p->y;
+}
+
+gint
+gimp_session_info_get_width (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), 0);
+
+  return info->p->width;
+}
+
+gint
+gimp_session_info_get_height (GimpSessionInfo *info)
+{
+  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), 0);
+
+  return info->p->height;
+}
+
+static gint position_accuracy = 0;
+
+/**
+ * gimp_session_info_set_position_accuracy:
+ * @accuracy:
+ *
+ * When writing sessionrc, make positions and sizes a multiple of
+ * @accuracy. Meant to be used by test cases that does regression
+ * testing on session managed window positions and sizes, to allow for
+ * some deviations from the original setup, that the window manager
+ * might impose.
+ **/
+void
+gimp_session_info_set_position_accuracy (gint accuracy)
+{
+  position_accuracy = accuracy;
+}
+
+/**
+ * gimp_session_info_apply_position_accuracy:
+ * @position:
+ *
+ * Rounds @position to the nearest multiple of what was set with
+ * gimp_session_info_set_position_accuracy().
+ *
+ * Returns: Result.
+ **/
+gint
+gimp_session_info_apply_position_accuracy (gint position)
+{
+  if (position_accuracy > 0)
+    {
+      gint to_floor = position + position_accuracy / 2;
+
+      return to_floor - to_floor % position_accuracy;
+    }
+
+  return position;
+}
diff --git a/app/widgets/gimpsessioninfo.h b/app/widgets/gimpsessioninfo.h
new file mode 100644
index 0000000..10ce2a5
--- /dev/null
+++ b/app/widgets/gimpsessioninfo.h
@@ -0,0 +1,99 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessioninfo.h
+ * Copyright (C) 2001-2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_INFO_H__
+#define __GIMP_SESSION_INFO_H__
+
+
+#include "core/gimpobject.h"
+
+
+#define GIMP_TYPE_SESSION_INFO            (gimp_session_info_get_type ())
+#define GIMP_SESSION_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SESSION_INFO, GimpSessionInfo))
+#define GIMP_SESSION_INFO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SESSION_INFO, GimpSessionInfoClass))
+#define GIMP_IS_SESSION_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SESSION_INFO))
+#define GIMP_IS_SESSION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SESSION_INFO))
+#define GIMP_SESSION_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SESSION_INFO, GimpSessionInfoClass))
+
+
+typedef struct _GimpSessionInfoPrivate  GimpSessionInfoPrivate;
+typedef struct _GimpSessionInfoClass    GimpSessionInfoClass;
+
+/**
+ * GimpSessionInfo:
+ *
+ * Contains session info for one toplevel window in the interface such
+ * as a dock, the empty-image-window, or the open/save dialog.
+ */
+struct _GimpSessionInfo
+{
+  GimpObject  parent_instance;
+
+  GimpSessionInfoPrivate *p;
+};
+
+struct _GimpSessionInfoClass
+{
+  GimpObjectClass  parent_class;
+};
+
+
+GType             gimp_session_info_get_type                (void) G_GNUC_CONST;
+
+GimpSessionInfo * gimp_session_info_new                     (void);
+
+void              gimp_session_info_restore                 (GimpSessionInfo        *info,
+                                                             GimpDialogFactory      *factory,
+                                                             GdkScreen              *screen,
+                                                             gint                    monitor);
+void              gimp_session_info_apply_geometry          (GimpSessionInfo        *info,
+                                                             GdkScreen              *screen,
+                                                             gint                    current_monitor,
+                                                             gboolean                apply_stored_monitor);
+void              gimp_session_info_read_geometry           (GimpSessionInfo        *info,
+                                                             GdkEventConfigure      *cevent);
+void              gimp_session_info_get_info                (GimpSessionInfo        *info);
+void              gimp_session_info_get_info_with_widget    (GimpSessionInfo        *info,
+                                                             GtkWidget              *widget);
+void              gimp_session_info_clear_info              (GimpSessionInfo        *info);
+gboolean          gimp_session_info_is_singleton            (GimpSessionInfo        *info);
+gboolean          gimp_session_info_is_session_managed      (GimpSessionInfo        *info);
+gboolean          gimp_session_info_get_remember_size       (GimpSessionInfo        *info);
+gboolean          gimp_session_info_get_remember_if_open    (GimpSessionInfo        *info);
+GtkWidget       * gimp_session_info_get_widget              (GimpSessionInfo        *info);
+void              gimp_session_info_set_widget              (GimpSessionInfo        *info,
+                                                             GtkWidget              *widget);
+GimpDialogFactoryEntry *
+                  gimp_session_info_get_factory_entry       (GimpSessionInfo        *info);
+void              gimp_session_info_set_factory_entry       (GimpSessionInfo        *info,
+                                                             GimpDialogFactoryEntry *entry);
+gboolean          gimp_session_info_get_open                (GimpSessionInfo        *info);
+void              gimp_session_info_append_book             (GimpSessionInfo        *info,
+                                                             GimpSessionInfoBook    *book);
+gint              gimp_session_info_get_x                   (GimpSessionInfo        *info);
+gint              gimp_session_info_get_y                   (GimpSessionInfo        *info);
+gint              gimp_session_info_get_width               (GimpSessionInfo        *info);
+gint              gimp_session_info_get_height              (GimpSessionInfo        *info);
+
+void              gimp_session_info_set_position_accuracy   (gint                    accuracy);
+gint              gimp_session_info_apply_position_accuracy (gint                    position);
+
+
+#endif  /* __GIMP_SESSION_INFO_H__ */
diff --git a/app/widgets/gimpsessionmanaged.c b/app/widgets/gimpsessionmanaged.c
new file mode 100644
index 0000000..95e02ae
--- /dev/null
+++ b/app/widgets/gimpsessionmanaged.c
@@ -0,0 +1,87 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessionmanaged.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpsessionmanaged.h"
+
+
+G_DEFINE_INTERFACE (GimpSessionManaged, gimp_session_managed, GTK_TYPE_WIDGET)
+
+
+/*  private functions  */
+
+
+static void
+gimp_session_managed_default_init (GimpSessionManagedInterface *iface)
+{
+}
+
+
+/*  public functions  */
+
+
+/**
+ * gimp_session_managed_get_aux_info:
+ * @session_managed: A #GimpSessionManaged
+ *
+ * Returns: A list of #GimpSessionInfoAux created with
+ *          gimp_session_info_aux_new().
+ **/
+GList *
+gimp_session_managed_get_aux_info (GimpSessionManaged *session_managed)
+{
+  GimpSessionManagedInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_SESSION_MANAGED (session_managed), NULL);
+
+  iface = GIMP_SESSION_MANAGED_GET_INTERFACE (session_managed);
+
+  if (iface->get_aux_info)
+    return iface->get_aux_info (session_managed);
+
+  return NULL;
+}
+
+/**
+ * gimp_session_managed_get_ui_manager:
+ * @session_managed: A #GimpSessionManaged
+ * @aux_info         A list of #GimpSessionInfoAux
+ *
+ * Sets aux data previously returned from
+ * gimp_session_managed_get_aux_info().
+ **/
+void
+gimp_session_managed_set_aux_info (GimpSessionManaged *session_managed,
+                                   GList              *aux_info)
+{
+  GimpSessionManagedInterface *iface;
+
+  g_return_if_fail (GIMP_IS_SESSION_MANAGED (session_managed));
+
+  iface = GIMP_SESSION_MANAGED_GET_INTERFACE (session_managed);
+
+  if (iface->set_aux_info)
+    iface->set_aux_info (session_managed, aux_info);
+}
diff --git a/app/widgets/gimpsessionmanaged.h b/app/widgets/gimpsessionmanaged.h
new file mode 100644
index 0000000..dfe675d
--- /dev/null
+++ b/app/widgets/gimpsessionmanaged.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsessionmanaged.h
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SESSION_MANAGED_H__
+#define __GIMP_SESSION_MANAGED_H__
+
+
+#define GIMP_TYPE_SESSION_MANAGED               (gimp_session_managed_get_type ())
+#define GIMP_SESSION_MANAGED(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SESSION_MANAGED, GimpSessionManaged))
+#define GIMP_IS_SESSION_MANAGED(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SESSION_MANAGED))
+#define GIMP_SESSION_MANAGED_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_SESSION_MANAGED, GimpSessionManagedInterface))
+
+
+typedef struct _GimpSessionManagedInterface GimpSessionManagedInterface;
+
+struct _GimpSessionManagedInterface
+{
+  GTypeInterface base_iface;
+
+  /*  virtual functions  */
+  GList * (* get_aux_info) (GimpSessionManaged *session_managed);
+  void    (* set_aux_info) (GimpSessionManaged *session_managed,
+                            GList              *aux_info);
+};
+
+
+GType              gimp_session_managed_get_type     (void) G_GNUC_CONST;
+
+GList            * gimp_session_managed_get_aux_info (GimpSessionManaged *session_managed);
+void               gimp_session_managed_set_aux_info (GimpSessionManaged *session_managed,
+                                                      GList              *aux_info);
+
+
+#endif  /*  __GIMP_SESSION_MANAGED_H__  */
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
new file mode 100644
index 0000000..cf8e51d
--- /dev/null
+++ b/app/widgets/gimpsettingsbox.c
@@ -0,0 +1,991 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsettingsbox.c
+ * Copyright (C) 2008-2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "operations/gimp-operation-config.h"
+
+#include "core/gimp.h"
+#include "core/gimplist.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpcontainercombobox.h"
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpsettingsbox.h"
+#include "gimpsettingseditor.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  FILE_DIALOG_SETUP,
+  IMPORT,
+  EXPORT,
+  SELECTED,
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_CONFIG,
+  PROP_CONTAINER,
+  PROP_HELP_ID,
+  PROP_IMPORT_TITLE,
+  PROP_EXPORT_TITLE,
+  PROP_DEFAULT_FOLDER,
+  PROP_LAST_FILE
+};
+
+
+typedef struct _GimpSettingsBoxPrivate GimpSettingsBoxPrivate;
+
+struct _GimpSettingsBoxPrivate
+{
+  GtkWidget     *combo;
+  GtkWidget     *menu;
+  GtkWidget     *import_item;
+  GtkWidget     *export_item;
+  GtkWidget     *file_dialog;
+  GtkWidget     *editor_dialog;
+
+  Gimp          *gimp;
+  GObject       *config;
+  GimpContainer *container;
+
+  gchar         *help_id;
+  gchar         *import_title;
+  gchar         *export_title;
+  GFile         *default_folder;
+  GFile         *last_file;
+};
+
+#define GET_PRIVATE(item) ((GimpSettingsBoxPrivate *) gimp_settings_box_get_instance_private ((GimpSettingsBox *) (item)))
+
+
+static void      gimp_settings_box_constructed   (GObject           *object);
+static void      gimp_settings_box_finalize      (GObject           *object);
+static void      gimp_settings_box_set_property  (GObject           *object,
+                                                  guint              property_id,
+                                                  const GValue      *value,
+                                                  GParamSpec        *pspec);
+static void      gimp_settings_box_get_property  (GObject           *object,
+                                                  guint              property_id,
+                                                  GValue            *value,
+                                                  GParamSpec        *pspec);
+
+static GtkWidget *
+                 gimp_settings_box_menu_item_add (GimpSettingsBox   *box,
+                                                  const gchar       *icon_name,
+                                                  const gchar       *label,
+                                                  GCallback          callback);
+static gboolean
+            gimp_settings_box_row_separator_func (GtkTreeModel      *model,
+                                                  GtkTreeIter       *iter,
+                                                  gpointer           data);
+static void   gimp_settings_box_setting_selected (GimpContainerView *view,
+                                                  GimpViewable      *object,
+                                                  gpointer           insert_data,
+                                                  GimpSettingsBox   *box);
+static gboolean gimp_settings_box_menu_press     (GtkWidget         *widget,
+                                                  GdkEventButton    *bevent,
+                                                  GimpSettingsBox   *box);
+static void  gimp_settings_box_favorite_activate (GtkWidget         *widget,
+                                                  GimpSettingsBox   *box);
+static void  gimp_settings_box_import_activate   (GtkWidget         *widget,
+                                                  GimpSettingsBox   *box);
+static void  gimp_settings_box_export_activate   (GtkWidget         *widget,
+                                                  GimpSettingsBox   *box);
+static void  gimp_settings_box_manage_activate   (GtkWidget         *widget,
+                                                  GimpSettingsBox   *box);
+
+static void  gimp_settings_box_favorite_callback (GtkWidget         *query_box,
+                                                  const gchar       *string,
+                                                  gpointer           data);
+static void  gimp_settings_box_file_dialog       (GimpSettingsBox   *box,
+                                                  const gchar       *title,
+                                                  gboolean           save);
+static void  gimp_settings_box_file_response     (GtkWidget         *dialog,
+                                                  gint               response_id,
+                                                  GimpSettingsBox   *box);
+static void  gimp_settings_box_toplevel_unmap    (GtkWidget         *toplevel,
+                                                  GtkWidget         *dialog);
+static void  gimp_settings_box_truncate_list     (GimpSettingsBox   *box,
+                                                  gint               max_recent);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSettingsBox, gimp_settings_box, GTK_TYPE_BOX)
+
+#define parent_class gimp_settings_box_parent_class
+
+static guint settings_box_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_settings_box_class_init (GimpSettingsBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  settings_box_signals[FILE_DIALOG_SETUP] =
+    g_signal_new ("file-dialog-setup",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpSettingsBoxClass, file_dialog_setup),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_BOOLEAN,
+                  G_TYPE_NONE, 2,
+                  GTK_TYPE_FILE_CHOOSER_DIALOG,
+                  G_TYPE_BOOLEAN);
+
+  settings_box_signals[IMPORT] =
+    g_signal_new ("import",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpSettingsBoxClass, import),
+                  NULL, NULL,
+                  gimp_marshal_BOOLEAN__OBJECT,
+                  G_TYPE_BOOLEAN, 1,
+                  G_TYPE_FILE);
+
+  settings_box_signals[EXPORT] =
+    g_signal_new ("export",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpSettingsBoxClass, export),
+                  NULL, NULL,
+                  gimp_marshal_BOOLEAN__OBJECT,
+                  G_TYPE_BOOLEAN, 1,
+                  G_TYPE_FILE);
+
+  settings_box_signals[SELECTED] =
+    g_signal_new ("selected",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpSettingsBoxClass, selected),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_CONFIG);
+
+  object_class->constructed  = gimp_settings_box_constructed;
+  object_class->finalize     = gimp_settings_box_finalize;
+  object_class->set_property = gimp_settings_box_set_property;
+  object_class->get_property = gimp_settings_box_get_property;
+
+  klass->file_dialog_setup   = NULL;
+  klass->import              = NULL;
+  klass->export              = NULL;
+  klass->selected            = NULL;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONFIG,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_CONTAINER,
+                                   g_param_spec_object ("container",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_HELP_ID,
+                                   g_param_spec_string ("help-id",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_IMPORT_TITLE,
+                                   g_param_spec_string ("import-title",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_EXPORT_TITLE,
+                                   g_param_spec_string ("export-title",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DEFAULT_FOLDER,
+                                   g_param_spec_object ("default-folder",
+                                                        NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_LAST_FILE,
+                                   g_param_spec_object ("last-file",
+                                                        NULL, NULL,
+                                                        G_TYPE_FILE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_settings_box_init (GimpSettingsBox *box)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
+  gtk_box_set_spacing (GTK_BOX (box), 6);
+}
+
+static void
+gimp_settings_box_constructed (GObject *object)
+{
+  GimpSettingsBox        *box     = GIMP_SETTINGS_BOX (object);
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (object);
+  GtkWidget              *hbox2;
+  GtkWidget              *button;
+  GtkWidget              *image;
+  GtkWidget              *arrow;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (private->gimp));
+  gimp_assert (GIMP_IS_CONFIG (private->config));
+  gimp_assert (GIMP_IS_CONTAINER (private->container));
+
+  private->combo = gimp_container_combo_box_new (private->container,
+                                                 gimp_get_user_context (private->gimp),
+                                                 16, 0);
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (private->combo),
+                                        gimp_settings_box_row_separator_func,
+                                        NULL, NULL);
+  gtk_box_pack_start (GTK_BOX (box), private->combo, TRUE, TRUE, 0);
+  gtk_widget_show (private->combo);
+
+  gimp_help_set_help_data (private->combo, _("Pick a preset from the list"),
+                           NULL);
+
+  g_signal_connect_after (private->combo, "select-item",
+                          G_CALLBACK (gimp_settings_box_setting_selected),
+                          box);
+
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox2), TRUE);
+  gtk_box_pack_start (GTK_BOX (box), hbox2, FALSE, FALSE, 0);
+  gtk_widget_show (hbox2);
+
+  button = gtk_button_new ();
+  gtk_widget_set_can_focus (button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  image = gtk_image_new_from_icon_name (GIMP_ICON_LIST_ADD,
+                                        GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_widget_show (image);
+
+  gimp_help_set_help_data (button,
+                           _("Save the current settings as named preset"),
+                           NULL);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (gimp_settings_box_favorite_activate),
+                    box);
+
+  button = gtk_button_new ();
+  gtk_widget_set_can_focus (button, FALSE);
+  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  arrow = gtk_image_new_from_icon_name (GIMP_ICON_MENU_LEFT,
+                                        GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (button), arrow);
+  gtk_widget_show (arrow);
+
+  gimp_help_set_help_data (button, _("Manage presets"), NULL);
+
+  g_signal_connect (button, "button-press-event",
+                    G_CALLBACK (gimp_settings_box_menu_press),
+                    box);
+
+  /*  Favorites menu  */
+
+  private->menu = gtk_menu_new ();
+  gtk_menu_attach_to_widget (GTK_MENU (private->menu), button, NULL);
+
+  private->import_item =
+    gimp_settings_box_menu_item_add (box,
+                                     GIMP_ICON_DOCUMENT_OPEN,
+                                     _("_Import Current Settings from File..."),
+                                     G_CALLBACK (gimp_settings_box_import_activate));
+
+  private->export_item =
+    gimp_settings_box_menu_item_add (box,
+                                     GIMP_ICON_DOCUMENT_SAVE,
+                                     _("_Export Current Settings to File..."),
+                                     G_CALLBACK (gimp_settings_box_export_activate));
+
+  gimp_settings_box_menu_item_add (box, NULL, NULL, NULL);
+
+  gimp_settings_box_menu_item_add (box,
+                                   GIMP_ICON_EDIT,
+                                   _("_Manage Saved Presets..."),
+                                   G_CALLBACK (gimp_settings_box_manage_activate));
+}
+
+static void
+gimp_settings_box_finalize (GObject *object)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->config);
+  g_clear_object (&private->container);
+  g_clear_object (&private->last_file);
+  g_clear_object (&private->default_folder);
+
+  g_free (private->help_id);
+  g_free (private->import_title);
+  g_free (private->export_title);
+
+  if (private->editor_dialog)
+    gtk_widget_destroy (private->editor_dialog);
+
+  if (private->file_dialog)
+    gtk_widget_destroy (private->file_dialog);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_settings_box_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value); /* don't dup */
+      break;
+
+    case PROP_CONFIG:
+      if (private->config)
+        g_object_unref (private->config);
+      private->config = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTAINER:
+      if (private->editor_dialog)
+        gtk_dialog_response (GTK_DIALOG (private->editor_dialog),
+                             GTK_RESPONSE_DELETE_EVENT);
+      if (private->file_dialog)
+        gtk_dialog_response (GTK_DIALOG (private->file_dialog),
+                             GTK_RESPONSE_DELETE_EVENT);
+      if (private->container)
+        g_object_unref (private->container);
+      private->container = g_value_dup_object (value);
+      if (private->combo)
+        gimp_container_view_set_container (GIMP_CONTAINER_VIEW (private->combo),
+                                           private->container);
+      break;
+
+    case PROP_HELP_ID:
+      g_free (private->help_id);
+      private->help_id = g_value_dup_string (value);
+      break;
+
+    case PROP_IMPORT_TITLE:
+      g_free (private->import_title);
+      private->import_title = g_value_dup_string (value);
+      break;
+
+    case PROP_EXPORT_TITLE:
+      g_free (private->export_title);
+      private->export_title = g_value_dup_string (value);
+      break;
+
+    case PROP_DEFAULT_FOLDER:
+      if (private->default_folder)
+        g_object_unref (private->default_folder);
+      private->default_folder = g_value_dup_object (value);
+      break;
+
+    case PROP_LAST_FILE:
+      if (private->last_file)
+        g_object_unref (private->last_file);
+      private->last_file = g_value_dup_object (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_settings_box_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    case PROP_CONFIG:
+      g_value_set_object (value, private->config);
+      break;
+
+    case PROP_CONTAINER:
+      g_value_set_object (value, private->container);
+      break;
+
+    case PROP_HELP_ID:
+      g_value_set_string (value, private->help_id);
+      break;
+
+    case PROP_IMPORT_TITLE:
+      g_value_set_string (value, private->import_title);
+      break;
+
+    case PROP_EXPORT_TITLE:
+      g_value_set_string (value, private->export_title);
+      break;
+
+    case PROP_DEFAULT_FOLDER:
+      g_value_set_object (value, private->default_folder);
+      break;
+
+    case PROP_LAST_FILE:
+      g_value_set_object (value, private->last_file);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GtkWidget *
+gimp_settings_box_menu_item_add (GimpSettingsBox *box,
+                                 const gchar     *icon_name,
+                                 const gchar     *label,
+                                 GCallback        callback)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+  GtkWidget              *item;
+
+  if (label)
+    {
+      GtkWidget *image;
+
+      item = gtk_image_menu_item_new_with_mnemonic (label);
+      image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+
+      g_signal_connect (item, "activate",
+                        callback,
+                        box);
+    }
+  else
+    {
+      item = gtk_separator_menu_item_new ();
+    }
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (private->menu), item);
+  gtk_widget_show (item);
+
+  return item;
+}
+
+static gboolean
+gimp_settings_box_row_separator_func (GtkTreeModel *model,
+                                      GtkTreeIter  *iter,
+                                      gpointer      data)
+{
+  gchar *name = NULL;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, &name,
+                      -1);
+  g_free (name);
+
+  return name == NULL;
+}
+
+static void
+gimp_settings_box_setting_selected (GimpContainerView *view,
+                                    GimpViewable      *object,
+                                    gpointer           insert_data,
+                                    GimpSettingsBox   *box)
+{
+  if (object)
+    g_signal_emit (box, settings_box_signals[SELECTED], 0,
+                   object);
+}
+
+static void
+gimp_settings_box_menu_position (GtkMenu  *menu,
+                                 gint     *x,
+                                 gint     *y,
+                                 gboolean *push_in,
+                                 gpointer  user_data)
+{
+  gimp_button_menu_position (user_data, menu, GTK_POS_LEFT, x, y);
+}
+
+static gboolean
+gimp_settings_box_menu_press (GtkWidget       *widget,
+                              GdkEventButton  *bevent,
+                              GimpSettingsBox *box)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+
+  if (bevent->type == GDK_BUTTON_PRESS)
+    {
+      gtk_menu_popup (GTK_MENU (private->menu),
+                      NULL, NULL,
+                      gimp_settings_box_menu_position, widget,
+                      bevent->button, bevent->time);
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_settings_box_favorite_activate (GtkWidget       *widget,
+                                     GimpSettingsBox *box)
+{
+  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+  GtkWidget *dialog;
+
+  dialog = gimp_query_string_box (_("Save Settings as Named Preset"),
+                                  toplevel,
+                                  gimp_standard_help_func, NULL,
+                                  _("Enter a name for the preset"),
+                                  _("Saved Settings"),
+                                  G_OBJECT (toplevel), "hide",
+                                  gimp_settings_box_favorite_callback, box);
+  gtk_widget_show (dialog);
+}
+
+static void
+gimp_settings_box_import_activate (GtkWidget       *widget,
+                                   GimpSettingsBox *box)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+
+  gimp_settings_box_file_dialog (box, private->import_title, FALSE);
+}
+
+static void
+gimp_settings_box_export_activate (GtkWidget       *widget,
+                                   GimpSettingsBox *box)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+
+  gimp_settings_box_file_dialog (box, private->export_title, TRUE);
+}
+
+static void
+gimp_settings_box_manage_activate (GtkWidget       *widget,
+                                   GimpSettingsBox *box)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+  GtkWidget              *toplevel;
+  GtkWidget              *editor;
+  GtkWidget              *content_area;
+
+  if (private->editor_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (private->editor_dialog));
+      return;
+    }
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
+
+  private->editor_dialog = gimp_dialog_new (_("Manage Saved Presets"),
+                                            "gimp-settings-editor-dialog",
+                                            toplevel, 0,
+                                            NULL, NULL,
+
+                                            _("_Close"), GTK_RESPONSE_CLOSE,
+
+                                            NULL);
+
+  g_object_add_weak_pointer (G_OBJECT (private->editor_dialog),
+                             (gpointer) &private->editor_dialog);
+  g_signal_connect_object (toplevel, "unmap",
+                           G_CALLBACK (gimp_settings_box_toplevel_unmap),
+                           private->editor_dialog, 0);
+
+  g_signal_connect (private->editor_dialog, "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    box);
+
+  editor = gimp_settings_editor_new (private->gimp,
+                                     private->config,
+                                     private->container);
+  gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (private->editor_dialog));
+  gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+  gtk_widget_show (private->editor_dialog);
+}
+
+static void
+gimp_settings_box_favorite_callback (GtkWidget   *query_box,
+                                     const gchar *string,
+                                     gpointer     data)
+{
+  GimpSettingsBox        *box     = GIMP_SETTINGS_BOX (data);
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+  GimpConfig             *config;
+
+  config = gimp_config_duplicate (GIMP_CONFIG (private->config));
+  gimp_object_set_name (GIMP_OBJECT (config), string);
+  gimp_container_add (private->container, GIMP_OBJECT (config));
+  g_object_unref (config);
+
+  gimp_operation_config_serialize (private->gimp, private->container, NULL);
+}
+
+static void
+gimp_settings_box_file_dialog (GimpSettingsBox *box,
+                               const gchar     *title,
+                               gboolean         save)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+  GtkWidget              *toplevel;
+  GtkWidget              *dialog;
+
+  if (private->file_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (private->file_dialog));
+      return;
+    }
+
+  if (save)
+    gtk_widget_set_sensitive (private->import_item, FALSE);
+  else
+    gtk_widget_set_sensitive (private->export_item, FALSE);
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
+
+  private->file_dialog = dialog =
+    gtk_file_chooser_dialog_new (title, GTK_WINDOW (toplevel),
+                                 save ?
+                                 GTK_FILE_CHOOSER_ACTION_SAVE :
+                                 GTK_FILE_CHOOSER_ACTION_OPEN,
+
+                                 _("_Cancel"),            GTK_RESPONSE_CANCEL,
+                                 save ?
+                                 _("_Save") : _("_Open"), GTK_RESPONSE_OK,
+
+                                 NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_object_set_data (G_OBJECT (dialog), "save", GINT_TO_POINTER (save));
+
+  gtk_window_set_role (GTK_WINDOW (dialog), "gimp-import-export-settings");
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+
+  g_object_add_weak_pointer (G_OBJECT (dialog),
+                             (gpointer) &private->file_dialog);
+  g_signal_connect_object (toplevel, "unmap",
+                           G_CALLBACK (gimp_settings_box_toplevel_unmap),
+                           dialog, 0);
+
+  if (save)
+    gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
+                                                    TRUE);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gimp_settings_box_file_response),
+                    box);
+  g_signal_connect (dialog, "delete-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+
+  if (private->default_folder &&
+      g_file_query_file_type (private->default_folder,
+                              G_FILE_QUERY_INFO_NONE, NULL) ==
+      G_FILE_TYPE_DIRECTORY)
+    {
+      gchar *uri = g_file_get_uri (private->default_folder);
+      gtk_file_chooser_add_shortcut_folder_uri (GTK_FILE_CHOOSER (dialog),
+                                                uri, NULL);
+      g_free (uri);
+
+      if (! private->last_file)
+        gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+                                                  private->default_folder,
+                                                  NULL);
+    }
+  else if (! private->last_file)
+    {
+      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
+                                           g_get_home_dir ());
+    }
+
+  if (private->last_file)
+    gtk_file_chooser_set_file (GTK_FILE_CHOOSER (dialog),
+                               private->last_file, NULL);
+
+  gimp_help_connect (private->file_dialog, gimp_standard_help_func,
+                     private->help_id, NULL);
+
+  /*  allow callbacks to add widgets to the dialog  */
+  g_signal_emit (box, settings_box_signals[FILE_DIALOG_SETUP], 0,
+                 private->file_dialog, save);
+
+  gtk_widget_show (private->file_dialog);
+}
+
+static void
+gimp_settings_box_file_response (GtkWidget       *dialog,
+                                 gint             response_id,
+                                 GimpSettingsBox *box)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+  gboolean                save;
+
+  save = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "save"));
+
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      GFile    *file;
+      gboolean  success = FALSE;
+
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+
+      if (save)
+        g_signal_emit (box, settings_box_signals[EXPORT], 0, file,
+                       &success);
+      else
+        g_signal_emit (box, settings_box_signals[IMPORT], 0, file,
+                       &success);
+
+      if (success)
+        {
+          if (private->last_file)
+            g_object_unref (private->last_file);
+          private->last_file = file;
+
+          g_object_notify (G_OBJECT (box), "last-file");
+        }
+      else
+        {
+          g_object_unref (file);
+        }
+    }
+
+  if (save)
+    gtk_widget_set_sensitive (private->import_item, TRUE);
+  else
+    gtk_widget_set_sensitive (private->export_item, TRUE);
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+gimp_settings_box_toplevel_unmap (GtkWidget *toplevel,
+                                  GtkWidget *dialog)
+{
+  gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_DELETE_EVENT);
+}
+
+static void
+gimp_settings_box_truncate_list (GimpSettingsBox *box,
+                                 gint             max_recent)
+{
+  GimpSettingsBoxPrivate *private = GET_PRIVATE (box);
+  GList                  *list;
+  gint                    n_recent = 0;
+
+  list = GIMP_LIST (private->container)->queue->head;
+  while (list)
+    {
+      GimpConfig *config = list->data;
+      gint64      t;
+
+      list = g_list_next (list);
+
+      g_object_get (config,
+                    "time", &t,
+                    NULL);
+
+      if (t > 0)
+        {
+          n_recent++;
+
+          if (n_recent > max_recent)
+            gimp_container_remove (private->container, GIMP_OBJECT (config));
+        }
+      else
+        {
+          break;
+        }
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_settings_box_new (Gimp          *gimp,
+                       GObject       *config,
+                       GimpContainer *container,
+                       const gchar   *import_title,
+                       const gchar   *export_title,
+                       const gchar   *help_id,
+                       GFile         *default_folder,
+                       GFile         *last_file)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONFIG (config), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (default_folder == NULL || G_IS_FILE (default_folder),
+                        NULL);
+  g_return_val_if_fail (last_file == NULL || G_IS_FILE (last_file), NULL);
+
+  return g_object_new (GIMP_TYPE_SETTINGS_BOX,
+                       "gimp",           gimp,
+                       "config",         config,
+                       "container",      container,
+                       "help-id",        help_id,
+                       "import-title",   import_title,
+                       "export-title",   export_title,
+                       "default-folder", default_folder,
+                       "last-file",      last_file,
+                       NULL);
+}
+
+GtkWidget *
+gimp_settings_box_get_combo (GimpSettingsBox *box)
+{
+  g_return_val_if_fail (GIMP_IS_SETTINGS_BOX (box), NULL);
+
+  return GET_PRIVATE (box)->combo;
+}
+
+void
+gimp_settings_box_add_current (GimpSettingsBox *box,
+                               gint             max_recent)
+{
+  GimpSettingsBoxPrivate *private;
+  GimpConfig             *config = NULL;
+  GList                  *list;
+
+  g_return_if_fail (GIMP_IS_SETTINGS_BOX (box));
+
+  private = GET_PRIVATE (box);
+
+  for (list = GIMP_LIST (private->container)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      gint64 t;
+
+      config = list->data;
+
+      g_object_get (config,
+                    "time", &t,
+                    NULL);
+
+      if (t > 0 && gimp_config_is_equal_to (config,
+                                            GIMP_CONFIG (private->config)))
+        {
+          GDateTime *now = g_date_time_new_now_utc ();
+
+          g_object_set (config,
+                        "time", g_date_time_to_unix (now),
+                        NULL);
+          g_date_time_unref (now);
+
+          break;
+        }
+    }
+
+  if (! list)
+    {
+      GDateTime *now = g_date_time_new_now_utc ();
+
+      config = gimp_config_duplicate (GIMP_CONFIG (private->config));
+
+      g_object_set (config,
+                    "time", g_date_time_to_unix (now),
+                    NULL);
+      g_date_time_unref (now);
+
+      gimp_container_insert (private->container, GIMP_OBJECT (config), 0);
+      g_object_unref (config);
+    }
+
+  gimp_settings_box_truncate_list (box, max_recent);
+
+  gimp_operation_config_serialize (private->gimp, private->container, NULL);
+}
+
+void
+gimp_settings_box_unset (GimpSettingsBox *box)
+{
+  GimpSettingsBoxPrivate *private;
+
+  g_return_if_fail (GIMP_IS_SETTINGS_BOX (box));
+
+  private = GET_PRIVATE (box);
+
+  gimp_container_view_select_item (GIMP_CONTAINER_VIEW (private->combo), NULL);
+}
diff --git a/app/widgets/gimpsettingsbox.h b/app/widgets/gimpsettingsbox.h
new file mode 100644
index 0000000..7879083
--- /dev/null
+++ b/app/widgets/gimpsettingsbox.h
@@ -0,0 +1,76 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsettingsbox.h
+ * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SETTINGS_BOX_H__
+#define __GIMP_SETTINGS_BOX_H__
+
+
+#define GIMP_TYPE_SETTINGS_BOX            (gimp_settings_box_get_type ())
+#define GIMP_SETTINGS_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SETTINGS_BOX, GimpSettingsBox))
+#define GIMP_SETTINGS_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SETTINGS_BOX, GimpSettingsBoxClass))
+#define GIMP_IS_SETTINGS_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SETTINGS_BOX))
+#define GIMP_IS_SETTINGS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SETTINGS_BOX))
+#define GIMP_SETTINGS_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SETTINGS_BOX, GimpSettingsBoxClass))
+
+
+typedef struct _GimpSettingsBoxClass GimpSettingsBoxClass;
+
+struct _GimpSettingsBox
+{
+  GtkBox  parent_instance;
+};
+
+struct _GimpSettingsBoxClass
+{
+  GtkBoxClass  parent_class;
+
+  /*  signals  */
+  void (* file_dialog_setup) (GimpSettingsBox      *box,
+                              GtkFileChooserDialog *dialog,
+                              gboolean              export);
+  void (* import)            (GimpSettingsBox      *box,
+                              GFile                *file);
+  void (* export)            (GimpSettingsBox      *box,
+                              GFile                *file);
+  void (* selected)          (GimpSettingsBox      *box,
+                              GObject              *config);
+};
+
+
+GType       gimp_settings_box_get_type    (void) G_GNUC_CONST;
+
+GtkWidget * gimp_settings_box_new         (Gimp            *gimp,
+                                           GObject         *config,
+                                           GimpContainer   *container,
+                                           const gchar     *import_dialog_title,
+                                           const gchar     *export_dialog_title,
+                                           const gchar     *file_dialog_help_id,
+                                           GFile           *default_folder,
+                                           GFile           *last_file);
+
+GtkWidget * gimp_settings_box_get_combo   (GimpSettingsBox *box);
+
+void        gimp_settings_box_add_current (GimpSettingsBox *box,
+                                           gint             max_recent);
+
+void        gimp_settings_box_unset       (GimpSettingsBox *box);
+
+
+#endif  /*  __GIMP_SETTINGS_BOX_H__  */
diff --git a/app/widgets/gimpsettingseditor.c b/app/widgets/gimpsettingseditor.c
new file mode 100644
index 0000000..4372c34
--- /dev/null
+++ b/app/widgets/gimpsettingseditor.c
@@ -0,0 +1,446 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsettingseditor.c
+ * Copyright (C) 2008-2017 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "operations/gimp-operation-config.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainertreestore.h"
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpsettingseditor.h"
+#include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_CONFIG,
+  PROP_CONTAINER
+};
+
+
+typedef struct _GimpSettingsEditorPrivate GimpSettingsEditorPrivate;
+
+struct _GimpSettingsEditorPrivate
+{
+  Gimp          *gimp;
+  GObject       *config;
+  GimpContainer *container;
+  GObject       *selected_setting;
+
+  GtkWidget     *view;
+  GtkWidget     *import_button;
+  GtkWidget     *export_button;
+  GtkWidget     *delete_button;
+};
+
+#define GET_PRIVATE(item) ((GimpSettingsEditorPrivate *) gimp_settings_editor_get_instance_private ((GimpSettingsEditor *) (item)))
+
+
+static void   gimp_settings_editor_constructed    (GObject             *object);
+static void   gimp_settings_editor_finalize       (GObject             *object);
+static void   gimp_settings_editor_set_property   (GObject             *object,
+                                                   guint                property_id,
+                                                   const GValue        *value,
+                                                   GParamSpec          *pspec);
+static void   gimp_settings_editor_get_property   (GObject             *object,
+                                                   guint                property_id,
+                                                   GValue              *value,
+                                                   GParamSpec          *pspec);
+
+static gboolean
+          gimp_settings_editor_row_separator_func (GtkTreeModel        *model,
+                                                   GtkTreeIter         *iter,
+                                                   gpointer             data);
+static void   gimp_settings_editor_select_item    (GimpContainerView   *view,
+                                                   GimpViewable        *viewable,
+                                                   gpointer             insert_data,
+                                                   GimpSettingsEditor  *editor);
+static void   gimp_settings_editor_import_clicked (GtkWidget           *widget,
+                                                   GimpSettingsEditor  *editor);
+static void   gimp_settings_editor_export_clicked (GtkWidget           *widget,
+                                                   GimpSettingsEditor  *editor);
+static void   gimp_settings_editor_delete_clicked (GtkWidget           *widget,
+                                                   GimpSettingsEditor  *editor);
+static void   gimp_settings_editor_name_edited    (GtkCellRendererText *cell,
+                                                   const gchar         *path_str,
+                                                   const gchar         *new_name,
+                                                   GimpSettingsEditor  *editor);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSettingsEditor, gimp_settings_editor,
+                            GTK_TYPE_BOX)
+
+#define parent_class gimp_settings_editor_parent_class
+
+
+static void
+gimp_settings_editor_class_init (GimpSettingsEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_settings_editor_constructed;
+  object_class->finalize     = gimp_settings_editor_finalize;
+  object_class->set_property = gimp_settings_editor_set_property;
+  object_class->get_property = gimp_settings_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONFIG,
+                                   g_param_spec_object ("config",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONFIG,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CONTAINER,
+                                   g_param_spec_object ("container",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_settings_editor_init (GimpSettingsEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 6);
+}
+
+static void
+gimp_settings_editor_constructed (GObject *object)
+{
+  GimpSettingsEditor        *editor  = GIMP_SETTINGS_EDITOR (object);
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (object);
+  GimpContainerTreeView     *tree_view;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (private->gimp));
+  gimp_assert (GIMP_IS_CONFIG (private->config));
+  gimp_assert (GIMP_IS_CONTAINER (private->container));
+
+  private->view = gimp_container_tree_view_new (private->container,
+                                                gimp_get_user_context (private->gimp),
+                                               16, 0);
+  gtk_widget_set_size_request (private->view, 200, 200);
+  gtk_box_pack_start (GTK_BOX (editor), private->view, TRUE, TRUE, 0);
+  gtk_widget_show (private->view);
+
+  tree_view = GIMP_CONTAINER_TREE_VIEW (private->view);
+
+  gtk_tree_view_set_row_separator_func (tree_view->view,
+                                        gimp_settings_editor_row_separator_func,
+                                        private->view, NULL);
+
+  g_signal_connect (tree_view, "select-item",
+                    G_CALLBACK (gimp_settings_editor_select_item),
+                    editor);
+
+  gimp_container_tree_view_connect_name_edited (tree_view,
+                                                G_CALLBACK (gimp_settings_editor_name_edited),
+                                                editor);
+
+  private->import_button =
+    gimp_editor_add_button (GIMP_EDITOR (tree_view),
+                            GIMP_ICON_DOCUMENT_OPEN,
+                            _("Import presets from a file"),
+                            NULL,
+                            G_CALLBACK (gimp_settings_editor_import_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  private->export_button =
+    gimp_editor_add_button (GIMP_EDITOR (tree_view),
+                            GIMP_ICON_DOCUMENT_SAVE,
+                            _("Export the selected presets to a file"),
+                            NULL,
+                            G_CALLBACK (gimp_settings_editor_export_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  private->delete_button =
+    gimp_editor_add_button (GIMP_EDITOR (tree_view),
+                            GIMP_ICON_EDIT_DELETE,
+                            _("Delete the selected preset"),
+                            NULL,
+                            G_CALLBACK (gimp_settings_editor_delete_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  gtk_widget_set_sensitive (private->delete_button, FALSE);
+}
+
+static void
+gimp_settings_editor_finalize (GObject *object)
+{
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->config);
+  g_clear_object (&private->container);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_settings_editor_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value); /* don't dup */
+      break;
+
+    case PROP_CONFIG:
+      private->config = g_value_dup_object (value);
+      break;
+
+    case PROP_CONTAINER:
+      private->container = g_value_dup_object (value);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_settings_editor_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    case PROP_CONFIG:
+      g_value_set_object (value, private->config);
+      break;
+
+    case PROP_CONTAINER:
+      g_value_set_object (value, private->container);
+      break;
+
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_settings_editor_row_separator_func (GtkTreeModel *model,
+                                         GtkTreeIter  *iter,
+                                         gpointer      data)
+{
+  gchar *name = NULL;
+
+  gtk_tree_model_get (model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, &name,
+                      -1);
+  g_free (name);
+
+  return name == NULL;
+}
+
+static void
+gimp_settings_editor_select_item (GimpContainerView  *view,
+                                  GimpViewable       *viewable,
+                                  gpointer            insert_data,
+                                  GimpSettingsEditor *editor)
+{
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (editor);
+  gboolean                   sensitive;
+
+  private->selected_setting = G_OBJECT (viewable);
+
+  sensitive = (private->selected_setting != NULL &&
+               gimp_object_get_name (private->selected_setting));
+
+  gtk_widget_set_sensitive (private->export_button, sensitive);
+  gtk_widget_set_sensitive (private->delete_button, sensitive);
+}
+
+static void
+gimp_settings_editor_import_clicked (GtkWidget          *widget,
+                                     GimpSettingsEditor *editor)
+{
+}
+
+static void
+gimp_settings_editor_export_clicked (GtkWidget          *widget,
+                                     GimpSettingsEditor *editor)
+{
+}
+
+static void
+gimp_settings_editor_delete_clicked (GtkWidget          *widget,
+                                     GimpSettingsEditor *editor)
+{
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (editor);
+
+  if (private->selected_setting)
+    {
+      GimpObject *new;
+
+      new = gimp_container_get_neighbor_of (private->container,
+                                            GIMP_OBJECT (private->selected_setting));
+
+      /*  don't select the separator  */
+      if (new && ! gimp_object_get_name (new))
+        new = NULL;
+
+      gimp_container_remove (private->container,
+                             GIMP_OBJECT (private->selected_setting));
+
+      gimp_container_view_select_item (GIMP_CONTAINER_VIEW (private->view),
+                                       GIMP_VIEWABLE (new));
+
+      gimp_operation_config_serialize (private->gimp, private->container, NULL);
+    }
+}
+
+static void
+gimp_settings_editor_name_edited (GtkCellRendererText *cell,
+                                  const gchar         *path_str,
+                                  const gchar         *new_name,
+                                  GimpSettingsEditor  *editor)
+{
+  GimpSettingsEditorPrivate *private = GET_PRIVATE (editor);
+  GimpContainerTreeView     *tree_view;
+  GtkTreePath               *path;
+  GtkTreeIter                iter;
+
+  tree_view = GIMP_CONTAINER_TREE_VIEW (private->view);
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpObject       *object;
+      const gchar      *old_name;
+      gchar            *name;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      object = GIMP_OBJECT (renderer->viewable);
+
+      old_name = gimp_object_get_name (object);
+
+      if (! old_name) old_name = "";
+      if (! new_name) new_name = "";
+
+      name = g_strstrip (g_strdup (new_name));
+
+      if (strlen (name) && strcmp (old_name, name))
+        {
+          gint64 t;
+
+          g_object_get (object,
+                        "time", &t,
+                        NULL);
+
+          if (t > 0)
+            g_object_set (object,
+                          "time", (gint64) 0,
+                          NULL);
+
+          /*  set name after time so the object is reordered correctly  */
+          gimp_object_take_name (object, name);
+
+          gimp_operation_config_serialize (private->gimp, private->container,
+                                           NULL);
+        }
+      else
+        {
+          g_free (name);
+
+          name = gimp_viewable_get_description (renderer->viewable, NULL);
+          gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), &iter,
+                              GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, name,
+                              -1);
+          g_free (name);
+        }
+
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_settings_editor_new (Gimp          *gimp,
+                          GObject       *config,
+                          GimpContainer *container)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_CONFIG (config), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+
+  return g_object_new (GIMP_TYPE_SETTINGS_EDITOR,
+                       "gimp",      gimp,
+                       "config",    config,
+                       "container", container,
+                       NULL);
+}
diff --git a/app/widgets/gimpsettingseditor.h b/app/widgets/gimpsettingseditor.h
new file mode 100644
index 0000000..5e35f27
--- /dev/null
+++ b/app/widgets/gimpsettingseditor.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsettingseditor.h
+ * Copyright (C) 2008-2011 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SETTINGS_EDITOR_H__
+#define __GIMP_SETTINGS_EDITOR_H__
+
+
+#define GIMP_TYPE_SETTINGS_EDITOR            (gimp_settings_editor_get_type ())
+#define GIMP_SETTINGS_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SETTINGS_EDITOR, GimpSettingsEditor))
+#define GIMP_SETTINGS_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SETTINGS_EDITOR, GimpSettingsEditorClass))
+#define GIMP_IS_SETTINGS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SETTINGS_EDITOR))
+#define GIMP_IS_SETTINGS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SETTINGS_EDITOR))
+#define GIMP_SETTINGS_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SETTINGS_EDITOR, GimpSettingsEditorClass))
+
+
+typedef struct _GimpSettingsEditorClass GimpSettingsEditorClass;
+
+struct _GimpSettingsEditor
+{
+  GtkBox  parent_instance;
+};
+
+struct _GimpSettingsEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_settings_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_settings_editor_new      (Gimp          *gimp,
+                                           GObject       *config,
+                                           GimpContainer *container);
+
+
+#endif  /*  __GIMP_SETTINGS_EDITOR_H__  */
diff --git a/app/widgets/gimpsizebox.c b/app/widgets/gimpsizebox.c
new file mode 100644
index 0000000..6c8ad77
--- /dev/null
+++ b/app/widgets/gimpsizebox.c
@@ -0,0 +1,471 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsizebox.c
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpsizebox.h"
+
+#include "gimp-intl.h"
+
+
+#define SB_WIDTH 8
+
+enum
+{
+  PROP_0,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_UNIT,
+  PROP_XRESOLUTION,
+  PROP_YRESOLUTION,
+  PROP_RESOLUTION_UNIT,
+  PROP_KEEP_ASPECT,
+  PROP_EDIT_RESOLUTION
+};
+
+
+#define GIMP_SIZE_BOX_GET_PRIVATE(obj) ((GimpSizeBoxPrivate *) gimp_size_box_get_instance_private ((GimpSizeBox *) (obj)))
+
+typedef struct _GimpSizeBoxPrivate GimpSizeBoxPrivate;
+
+struct _GimpSizeBoxPrivate
+{
+  GimpSizeEntry   *size_entry;
+  GimpChainButton *size_chain;
+  GtkWidget       *pixel_label;
+  GtkWidget       *res_label;
+};
+
+
+static void   gimp_size_box_constructed       (GObject         *object);
+static void   gimp_size_box_dispose           (GObject         *object);
+static void   gimp_size_box_set_property      (GObject         *object,
+                                               guint            property_id,
+                                               const GValue    *value,
+                                               GParamSpec      *pspec);
+static void   gimp_size_box_get_property      (GObject         *object,
+                                               guint            property_id,
+                                               GValue          *value,
+                                               GParamSpec      *pspec);
+
+static void   gimp_size_box_update_size       (GimpSizeBox     *box);
+static void   gimp_size_box_update_resolution (GimpSizeBox     *box);
+static void   gimp_size_box_chain_toggled     (GimpChainButton *button,
+                                               GimpSizeBox     *box);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSizeBox, gimp_size_box, GTK_TYPE_BOX)
+
+#define parent_class gimp_size_box_parent_class
+
+
+static void
+gimp_size_box_class_init (GimpSizeBoxClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_size_box_constructed;
+  object_class->dispose      = gimp_size_box_dispose;
+  object_class->set_property = gimp_size_box_set_property;
+  object_class->get_property = gimp_size_box_get_property;
+
+  g_object_class_install_property (object_class, PROP_WIDTH,
+                                   g_param_spec_int ("width", NULL, NULL,
+                                                     GIMP_MIN_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE,
+                                                     256,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_HEIGHT,
+                                   g_param_spec_int ("height", NULL, NULL,
+                                                     GIMP_MIN_IMAGE_SIZE,
+                                                     GIMP_MAX_IMAGE_SIZE,
+                                                     256,
+                                                     GIMP_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_UNIT,
+                                   gimp_param_spec_unit ("unit", NULL, NULL,
+                                                         TRUE, TRUE,
+                                                         GIMP_UNIT_PIXEL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_XRESOLUTION,
+                                   g_param_spec_double ("xresolution",
+                                                        NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        72.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_YRESOLUTION,
+                                   g_param_spec_double ("yresolution",
+                                                        NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        72.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_RESOLUTION_UNIT,
+                                   gimp_param_spec_unit ("resolution-unit",
+                                                         NULL, NULL,
+                                                         FALSE, FALSE,
+                                                         GIMP_UNIT_INCH,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_KEEP_ASPECT,
+                                   g_param_spec_boolean ("keep-aspect",
+                                                         NULL, NULL,
+                                                         TRUE,
+                                                         GIMP_PARAM_READWRITE));
+  g_object_class_install_property (object_class, PROP_EDIT_RESOLUTION,
+                                   g_param_spec_boolean ("edit-resolution",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_size_box_init (GimpSizeBox *box)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (box), 6);
+
+  box->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+}
+
+static void
+gimp_size_box_constructed (GObject *object)
+{
+  GimpSizeBox        *box  = GIMP_SIZE_BOX (object);
+  GimpSizeBoxPrivate *priv = GIMP_SIZE_BOX_GET_PRIVATE (box);
+  GtkWidget          *vbox;
+  GtkWidget          *entry;
+  GtkWidget          *hbox;
+  GtkWidget          *label;
+  GList              *children;
+  GList              *list;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  entry = gimp_coordinates_new (box->unit, "%p",
+                                TRUE, TRUE, SB_WIDTH,
+                                GIMP_SIZE_ENTRY_UPDATE_SIZE,
+                                TRUE, TRUE,
+                                _("_Width:"),
+                                box->width, box->xresolution,
+                                GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
+                                0, box->width,
+                                _("H_eight:"),
+                                box->height, box->yresolution,
+                                GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
+                                0, box->height);
+
+  priv->size_entry = GIMP_SIZE_ENTRY (entry);
+  priv->size_chain = GIMP_COORDINATES_CHAINBUTTON (GIMP_SIZE_ENTRY (entry));
+
+  /*
+   * let gimp_prop_coordinates_callback know how to interpret the chainbutton
+   */
+  g_object_set_data (G_OBJECT (priv->size_chain),
+                     "constrains-ratio", GINT_TO_POINTER (TRUE));
+
+  gimp_prop_coordinates_connect (G_OBJECT (box),
+                                 "width", "height",
+                                 "unit",
+                                 entry, NULL,
+                                 box->xresolution,
+                                 box->yresolution);
+
+  g_signal_connect (priv->size_chain, "toggled",
+                    G_CALLBACK (gimp_size_box_chain_toggled),
+                    box);
+
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  children = gtk_container_get_children (GTK_CONTAINER (entry));
+  for (list = children; list; list = g_list_next (list))
+    if (GTK_IS_LABEL (list->data))
+      gtk_size_group_add_widget (box->size_group, list->data);
+  g_list_free (children);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_table_attach_defaults (GTK_TABLE (entry), vbox, 1, 3, 2, 3);
+  gtk_widget_show (vbox);
+
+  label = gtk_label_new (NULL);
+  gimp_label_set_attributes (GTK_LABEL (label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                             -1);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  priv->pixel_label = label;
+
+  if (box->edit_resolution)
+    {
+      gboolean chain_active;
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
+      gtk_widget_show (hbox);
+
+      chain_active = ABS (box->xresolution -
+                          box->yresolution) < GIMP_MIN_RESOLUTION;
+
+      entry = gimp_coordinates_new (box->resolution_unit, _("pixels/%a"),
+                                    FALSE, FALSE, SB_WIDTH,
+                                    GIMP_SIZE_ENTRY_UPDATE_RESOLUTION,
+                                    chain_active, FALSE,
+                                    _("_X resolution:"),
+                                    box->xresolution, 1.0,
+                                    1, 1, 1, 10,
+                                    _("_Y resolution:"),
+                                    box->yresolution, 1.0,
+                                    1, 1, 1, 10);
+
+
+      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+      gtk_widget_show (entry);
+
+      children = gtk_container_get_children (GTK_CONTAINER (entry));
+      for (list = children; list; list = g_list_next (list))
+        if (GTK_IS_LABEL (list->data))
+          gtk_size_group_add_widget (box->size_group, list->data);
+      g_list_free (children);
+
+      gimp_prop_coordinates_connect (G_OBJECT (box),
+                                     "xresolution", "yresolution",
+                                     "resolution-unit",
+                                     entry, NULL,
+                                     1.0, 1.0);
+    }
+  else
+    {
+      label = gtk_label_new (NULL);
+      gimp_label_set_attributes (GTK_LABEL (label),
+                                 PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                                 -1);
+      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+      gtk_widget_show (label);
+
+      priv->res_label = label;
+    }
+
+  gimp_size_box_update_size (box);
+  gimp_size_box_update_resolution (box);
+}
+
+static void
+gimp_size_box_dispose (GObject *object)
+{
+  GimpSizeBox *box = GIMP_SIZE_BOX (object);
+
+  if (box->size_group)
+    {
+      g_object_unref (box->size_group);
+      box->size_group = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_size_box_set_property (GObject      *object,
+                            guint         property_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
+{
+  GimpSizeBox        *box  = GIMP_SIZE_BOX (object);
+  GimpSizeBoxPrivate *priv = GIMP_SIZE_BOX_GET_PRIVATE (box);
+
+  switch (property_id)
+    {
+    case PROP_WIDTH:
+      box->width = g_value_get_int (value);
+      gimp_size_box_update_size (box);
+      break;
+
+    case PROP_HEIGHT:
+      box->height = g_value_get_int (value);
+      gimp_size_box_update_size (box);
+      break;
+
+    case PROP_UNIT:
+      box->unit = g_value_get_int (value);
+      break;
+
+    case PROP_XRESOLUTION:
+      box->xresolution = g_value_get_double (value);
+      if (priv->size_entry)
+        gimp_size_entry_set_resolution (priv->size_entry, 0,
+                                        box->xresolution, TRUE);
+      gimp_size_box_update_resolution (box);
+      break;
+
+    case PROP_YRESOLUTION:
+      box->yresolution = g_value_get_double (value);
+      if (priv->size_entry)
+        gimp_size_entry_set_resolution (priv->size_entry, 1,
+                                        box->yresolution, TRUE);
+      gimp_size_box_update_resolution (box);
+      break;
+
+    case PROP_RESOLUTION_UNIT:
+      box->resolution_unit = g_value_get_int (value);
+      break;
+
+    case PROP_KEEP_ASPECT:
+      if (priv->size_chain)
+        gimp_chain_button_set_active (priv->size_chain,
+                                      g_value_get_boolean (value));
+      break;
+
+    case PROP_EDIT_RESOLUTION:
+      box->edit_resolution = g_value_get_boolean (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_size_box_get_property (GObject    *object,
+                            guint       property_id,
+                            GValue     *value,
+                            GParamSpec *pspec)
+{
+  GimpSizeBox        *box  = GIMP_SIZE_BOX (object);
+  GimpSizeBoxPrivate *priv = GIMP_SIZE_BOX_GET_PRIVATE (box);
+
+  switch (property_id)
+    {
+    case PROP_WIDTH:
+      g_value_set_int (value, box->width);
+      break;
+
+    case PROP_HEIGHT:
+      g_value_set_int (value, box->height);
+      break;
+
+    case PROP_UNIT:
+      g_value_set_int (value, box->unit);
+      break;
+
+    case PROP_XRESOLUTION:
+      g_value_set_double (value, box->xresolution);
+      break;
+
+    case PROP_YRESOLUTION:
+      g_value_set_double (value, box->yresolution);
+      break;
+
+    case PROP_RESOLUTION_UNIT:
+      g_value_set_int (value, box->resolution_unit);
+      break;
+
+    case PROP_KEEP_ASPECT:
+      g_value_set_boolean (value,
+                           gimp_chain_button_get_active (priv->size_chain));
+      break;
+
+    case PROP_EDIT_RESOLUTION:
+      g_value_set_boolean (value, box->edit_resolution);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_size_box_update_size (GimpSizeBox *box)
+{
+  GimpSizeBoxPrivate *priv = GIMP_SIZE_BOX_GET_PRIVATE (box);
+
+  if (priv->pixel_label)
+    {
+      gchar *text = g_strdup_printf (ngettext ("%d × %d pixel",
+                                               "%d × %d pixels", box->height),
+                                     box->width, box->height);
+      gtk_label_set_text (GTK_LABEL (priv->pixel_label), text);
+      g_free (text);
+    }
+}
+
+static void
+gimp_size_box_update_resolution (GimpSizeBox *box)
+{
+  GimpSizeBoxPrivate *priv = GIMP_SIZE_BOX_GET_PRIVATE (box);
+
+  if (priv->size_entry)
+    {
+      gimp_size_entry_set_refval (priv->size_entry, 0, box->width);
+      gimp_size_entry_set_refval (priv->size_entry, 1, box->height);
+    }
+
+  if (priv->res_label)
+    {
+      gchar *text;
+      gint   xres = ROUND (box->xresolution);
+      gint   yres = ROUND (box->yresolution);
+
+      if (xres != yres)
+        text = g_strdup_printf (_("%d × %d ppi"), xres, yres);
+      else
+        text = g_strdup_printf (_("%d ppi"), yres);
+
+      gtk_label_set_text (GTK_LABEL (priv->res_label), text);
+      g_free (text);
+    }
+}
+
+static void
+gimp_size_box_chain_toggled (GimpChainButton *button,
+                             GimpSizeBox     *box)
+{
+  g_object_set (box,
+                "keep-aspect", gimp_chain_button_get_active (button),
+                NULL);
+}
diff --git a/app/widgets/gimpsizebox.h b/app/widgets/gimpsizebox.h
new file mode 100644
index 0000000..4c76e88
--- /dev/null
+++ b/app/widgets/gimpsizebox.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsizebox.h
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SIZE_BOX_H__
+#define __GIMP_SIZE_BOX_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_SIZE_BOX            (gimp_size_box_get_type ())
+#define GIMP_SIZE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SIZE_BOX, GimpSizeBox))
+#define GIMP_SIZE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SIZE_BOX, GimpSizeBoxClass))
+#define GIMP_IS_SIZE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SIZE_BOX))
+#define GIMP_IS_SIZE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SIZE_BOX))
+#define GIMP_SIZE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SIZE_BOX, GimpSizeBoxClass))
+
+
+typedef struct _GimpSizeBoxClass  GimpSizeBoxClass;
+
+struct _GimpSizeBox
+{
+  GtkBox        parent_instance;
+
+  GtkSizeGroup *size_group;
+
+  gint          width;
+  gint          height;
+  GimpUnit      unit;
+  gdouble       xresolution;
+  gdouble       yresolution;
+  GimpUnit      resolution_unit;
+
+  gboolean      edit_resolution;
+};
+
+struct _GimpSizeBoxClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_size_box_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif /* __GIMP_SIZE_BOX_H__ */
diff --git a/app/widgets/gimpspinscale.c b/app/widgets/gimpspinscale.c
new file mode 100644
index 0000000..343dc88
--- /dev/null
+++ b/app/widgets/gimpspinscale.c
@@ -0,0 +1,1546 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpspinscale.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *               2012 Øyvind Kolås    <pippin@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "gimpspinscale.h"
+
+#include "gimp-intl.h"
+
+
+#define RELATIVE_CHANGE_SPEED 0.1
+
+
+enum
+{
+  PROP_0,
+  PROP_LABEL
+};
+
+typedef enum
+{
+  TARGET_NONE,
+  TARGET_NUMBER,
+  TARGET_UPPER,
+  TARGET_LOWER
+} SpinScaleTarget;
+
+
+typedef struct _GimpSpinScalePrivate GimpSpinScalePrivate;
+
+struct _GimpSpinScalePrivate
+{
+  gboolean         compact;
+
+  gchar           *label;
+  gchar           *label_text;
+  gchar           *label_pattern;
+
+  GtkWindow       *mnemonic_window;
+  guint            mnemonic_keyval;
+  gboolean         mnemonics_visible;
+
+  gboolean         constrain_drag;
+
+  gboolean         scale_limits_set;
+  gdouble          scale_lower;
+  gdouble          scale_upper;
+  gdouble          gamma;
+
+  PangoLayout     *layout;
+  gboolean         changing_value;
+  gboolean         relative_change;
+  gdouble          start_x;
+  gdouble          start_value;
+  GdkScreen       *start_screen;
+  gint             start_pointer_x;
+  gint             start_pointer_y;
+  SpinScaleTarget  target;
+  gboolean         hover;
+  gboolean         pointer_warp;
+  gint             pointer_warp_x;
+  gint             pointer_warp_start_x;
+
+  gint             change_value_idle_id;
+  gdouble          change_value_idle_value;
+};
+
+#define GET_PRIVATE(obj) ((GimpSpinScalePrivate *) gimp_spin_scale_get_instance_private ((GimpSpinScale *) (obj)))
+
+
+static void       gimp_spin_scale_dispose           (GObject          *object);
+static void       gimp_spin_scale_finalize          (GObject          *object);
+static void       gimp_spin_scale_set_property      (GObject          *object,
+                                                     guint             property_id,
+                                                     const GValue     *value,
+                                                     GParamSpec       *pspec);
+static void       gimp_spin_scale_get_property      (GObject          *object,
+                                                     guint             property_id,
+                                                     GValue           *value,
+                                                     GParamSpec       *pspec);
+
+static void       gimp_spin_scale_map               (GtkWidget        *widget);
+static void       gimp_spin_scale_size_request      (GtkWidget        *widget,
+                                                     GtkRequisition   *requisition);
+static void       gimp_spin_scale_style_set         (GtkWidget        *widget,
+                                                     GtkStyle         *prev_style);
+static gboolean   gimp_spin_scale_expose            (GtkWidget        *widget,
+                                                     GdkEventExpose   *event);
+static gboolean   gimp_spin_scale_button_press      (GtkWidget        *widget,
+                                                     GdkEventButton   *event);
+static gboolean   gimp_spin_scale_button_release    (GtkWidget        *widget,
+                                                     GdkEventButton   *event);
+static gboolean   gimp_spin_scale_motion_notify     (GtkWidget        *widget,
+                                                     GdkEventMotion   *event);
+static gboolean   gimp_spin_scale_leave_notify      (GtkWidget        *widget,
+                                                     GdkEventCrossing *event);
+static void       gimp_spin_scale_hierarchy_changed (GtkWidget        *widget,
+                                                     GtkWidget        *old_toplevel);
+static void       gimp_spin_scale_screen_changed    (GtkWidget        *widget,
+                                                     GdkScreen        *old_screen);
+
+static void       gimp_spin_scale_value_changed     (GtkSpinButton    *spin_button);
+
+static void       gimp_spin_scale_settings_notify   (GtkSettings      *settings,
+                                                     const GParamSpec *pspec,
+                                                     GimpSpinScale    *scale);
+static void       gimp_spin_scale_mnemonics_notify  (GtkWindow        *window,
+                                                     const GParamSpec *pspec,
+                                                     GimpSpinScale    *scale);
+static void       gimp_spin_scale_setup_mnemonic    (GimpSpinScale    *scale,
+                                                     guint             previous_keyval);
+
+static gdouble    odd_pow                           (gdouble           x,
+                                                     gdouble           y);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSpinScale, gimp_spin_scale,
+                            GIMP_TYPE_SPIN_BUTTON)
+
+#define parent_class gimp_spin_scale_parent_class
+
+
+static void
+gimp_spin_scale_class_init (GimpSpinScaleClass *klass)
+{
+  GObjectClass       *object_class      = G_OBJECT_CLASS (klass);
+  GtkWidgetClass     *widget_class      = GTK_WIDGET_CLASS (klass);
+  GtkSpinButtonClass *spin_button_class = GTK_SPIN_BUTTON_CLASS (klass);
+
+  object_class->dispose              = gimp_spin_scale_dispose;
+  object_class->finalize             = gimp_spin_scale_finalize;
+  object_class->set_property         = gimp_spin_scale_set_property;
+  object_class->get_property         = gimp_spin_scale_get_property;
+
+  widget_class->map                  = gimp_spin_scale_map;
+  widget_class->size_request         = gimp_spin_scale_size_request;
+  widget_class->style_set            = gimp_spin_scale_style_set;
+  widget_class->expose_event         = gimp_spin_scale_expose;
+  widget_class->button_press_event   = gimp_spin_scale_button_press;
+  widget_class->button_release_event = gimp_spin_scale_button_release;
+  widget_class->motion_notify_event  = gimp_spin_scale_motion_notify;
+  widget_class->leave_notify_event   = gimp_spin_scale_leave_notify;
+  widget_class->hierarchy_changed    = gimp_spin_scale_hierarchy_changed;
+  widget_class->screen_changed       = gimp_spin_scale_screen_changed;
+
+  spin_button_class->value_changed   = gimp_spin_scale_value_changed;
+
+  g_object_class_install_property (object_class, PROP_LABEL,
+                                   g_param_spec_string ("label", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_boolean ("compact",
+                                                                 NULL, NULL,
+                                                                 FALSE,
+                                                                 GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_spin_scale_init (GimpSpinScale *scale)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
+
+  gtk_widget_add_events (GTK_WIDGET (scale),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_BUTTON1_MOTION_MASK |
+                         GDK_LEAVE_NOTIFY_MASK);
+
+  gtk_entry_set_alignment (GTK_ENTRY (scale), 1.0);
+  gtk_entry_set_has_frame (GTK_ENTRY (scale), FALSE);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (scale), TRUE);
+
+  private->mnemonic_keyval = GDK_KEY_VoidSymbol;
+  private->gamma           = 1.0;
+}
+
+static void
+gimp_spin_scale_dispose (GObject *object)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (object);
+  guint                 keyval;
+
+  keyval = private->mnemonic_keyval;
+  private->mnemonic_keyval = GDK_KEY_VoidSymbol;
+
+  gimp_spin_scale_setup_mnemonic (GIMP_SPIN_SCALE (object), keyval);
+
+  g_clear_object (&private->layout);
+
+  if (private->change_value_idle_id)
+    {
+      GtkAdjustment *adjustment;
+
+      adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (object));
+
+      g_source_remove (private->change_value_idle_id);
+
+      private->change_value_idle_id = 0;
+
+      gtk_adjustment_set_value (adjustment, private->change_value_idle_value);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_spin_scale_finalize (GObject *object)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->label,         g_free);
+  g_clear_pointer (&private->label_text,    g_free);
+  g_clear_pointer (&private->label_pattern, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_spin_scale_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpSpinScale *scale = GIMP_SPIN_SCALE (object);
+
+  switch (property_id)
+    {
+    case PROP_LABEL:
+      gimp_spin_scale_set_label (scale, g_value_get_string (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_spin_scale_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpSpinScale *scale = GIMP_SPIN_SCALE (object);
+
+  switch (property_id)
+    {
+    case PROP_LABEL:
+      g_value_set_string (value, gimp_spin_scale_get_label (scale));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_spin_scale_map (GtkWidget *widget)
+{
+  GdkWindow *window;
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+  window = gtk_entry_get_text_window (GTK_ENTRY (widget));
+
+  if (window)
+    {
+      /* as per 2020, motion hints seem to be broken, at least on X: calling
+       * gdk_event_request_motions() doesn't seem to generate further motion
+       * events, causing motion events to be discarded, especially if the spin-
+       * scale is tied to some costly operation, such as projection
+       * invalidation, which blocks the main thread.
+       *
+       * to fix this, we simply avoid motion hints for the widget, and use an
+       * idle for setting the spin-scale value in response to motion events, as
+       * a form of ad-hoc motion compression.
+       *
+       * note that this isn't necessary with gtk3, which does its own motion
+       * compression.
+       */
+      gdk_window_set_events (window,
+                             gdk_window_get_events (window) &
+                             ~GDK_POINTER_MOTION_HINT_MASK);
+    }
+}
+
+static void
+gimp_spin_scale_size_request (GtkWidget      *widget,
+                              GtkRequisition *requisition)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  GtkStyle             *style   = gtk_widget_get_style (widget);
+  PangoContext         *context = gtk_widget_get_pango_context (widget);
+  PangoFontMetrics     *metrics;
+
+  GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
+
+  metrics = pango_context_get_metrics (context, style->font_desc,
+                                       pango_context_get_language (context));
+
+  if (! private->compact)
+    {
+      gint height;
+
+      height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+                             pango_font_metrics_get_descent (metrics));
+
+      requisition->height += height;
+    }
+
+  if (private->label)
+    {
+      gint char_width;
+      gint digit_width;
+      gint char_pixels;
+
+      char_width = pango_font_metrics_get_approximate_char_width (metrics);
+      digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
+      char_pixels = PANGO_PIXELS (MAX (char_width, digit_width));
+
+      /* ~3 chars for the ellipses */
+      requisition->width += char_pixels * 3;
+    }
+
+  pango_font_metrics_unref (metrics);
+}
+
+static void
+gimp_spin_scale_style_set (GtkWidget *widget,
+                           GtkStyle  *prev_style)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  g_clear_object (&private->layout);
+
+  gtk_widget_style_get (widget,
+                        "compact", &private->compact,
+                        NULL);
+}
+
+static PangoAttrList *
+pattern_to_attrs (const gchar *text,
+                  const gchar *pattern)
+{
+  PangoAttrList *attrs = pango_attr_list_new ();
+  const char    *p     = text;
+  const char    *q     = pattern;
+  const char    *start;
+
+  while (TRUE)
+    {
+      while (*p && q && *q != '_')
+        {
+          p = g_utf8_next_char (p);
+          q++;
+        }
+      start = p;
+      while (*p && *q && *q == '_')
+        {
+          p = g_utf8_next_char (p);
+          q++;
+        }
+
+      if (p > start)
+        {
+          PangoAttribute *attr = pango_attr_underline_new (PANGO_UNDERLINE_LOW);
+
+          attr->start_index = start - text;
+          attr->end_index   = p - text;
+
+          pango_attr_list_insert (attrs, attr);
+        }
+      else
+        break;
+    }
+
+  return attrs;
+}
+
+static gboolean
+gimp_spin_scale_expose (GtkWidget      *widget,
+                        GdkEventExpose *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  GtkStyle             *style   = gtk_widget_get_style (widget);
+  cairo_t              *cr;
+  gboolean              rtl;
+  gint                  w, h;
+
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+  cr = gdk_cairo_create (event->window);
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+
+  w = gdk_window_get_width (event->window);
+  h = gdk_window_get_height (event->window);
+
+  /* upper/lower halves highlight */
+  if (! private->compact                                              &&
+      event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)) &&
+      gtk_widget_get_sensitive (widget)                               &&
+      (private->target == TARGET_UPPER || private->target == TARGET_LOWER))
+    {
+      gint            window_width;
+      gint            window_height;
+      const GdkColor *color;
+      gdouble         r, g, b, a;
+
+      window_width  = gdk_window_get_width  (event->window);
+      window_height = gdk_window_get_height (event->window);
+
+      color = &style->text[gtk_widget_get_state (widget)];
+
+      switch (private->target)
+        {
+        case TARGET_UPPER:
+          cairo_rectangle (cr, 0, 0, window_width, window_height / 2);
+          break;
+
+        case TARGET_LOWER:
+          cairo_rectangle (cr, 0, window_height / 2, window_width, (window_height + 1) / 2);
+          break;
+
+        default:
+          break;
+        }
+
+      r = (gdouble) color->red   / 0xffff;
+      g = (gdouble) color->green / 0xffff;
+      b = (gdouble) color->blue  / 0xffff;
+      a = 0.12 + 0.04 * MAX (r, MAX (g, b));
+
+      if (private->changing_value)
+        a *= 1.6;
+
+      cairo_set_source_rgba (cr, r, g, b, a);
+
+      cairo_fill (cr);
+    }
+
+  cairo_set_line_width (cr, 1.0);
+
+  if (event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    {
+      /* let spinbutton-side line of rectangle disappear */
+      if (rtl)
+        cairo_rectangle (cr, -0.5, 0.5, w, h - 1.0);
+      else
+        cairo_rectangle (cr, 0.5, 0.5, w, h - 1.0);
+
+      gdk_cairo_set_source_color (cr,
+                                  &style->text_aa[gtk_widget_get_state (widget)]);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      /* let text-box-side line of rectangle disappear */
+      if (rtl)
+        cairo_rectangle (cr, 0.5, 0.5, w, h - 1.0);
+      else
+        cairo_rectangle (cr, -0.5, 0.5, w, h - 1.0);
+
+      gdk_cairo_set_source_color (cr,
+                                  &style->text_aa[gtk_widget_get_state (widget)]);
+      cairo_stroke (cr);
+
+      if (rtl)
+        cairo_rectangle (cr, 1.5, 1.5, w - 2.0, h - 3.0);
+      else
+        cairo_rectangle (cr, 0.5, 1.5, w - 2.0, h - 3.0);
+
+      gdk_cairo_set_source_color (cr,
+                                  &style->base[gtk_widget_get_state (widget)]);
+      cairo_stroke (cr);
+    }
+
+  if (private->label &&
+      gtk_widget_is_drawable (widget) &&
+      event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    {
+      GtkRequisition requisition;
+      GtkAllocation  allocation;
+      PangoRectangle logical;
+      gint           layout_offset_x;
+      gint           layout_offset_y;
+      GtkStateType   state;
+      GdkColor       text_color;
+      GdkColor       bar_text_color;
+      gint           window_width;
+      gint           window_height;
+      gdouble        progress_fraction;
+      gint           progress_x;
+      gint           progress_y;
+      gint           progress_width;
+      gint           progress_height;
+
+      GTK_WIDGET_CLASS (parent_class)->size_request (widget, &requisition);
+      gtk_widget_get_allocation (widget, &allocation);
+
+      if (! private->layout)
+        {
+          private->layout = gtk_widget_create_pango_layout (widget,
+                                                            private->label_text);
+          pango_layout_set_ellipsize (private->layout, PANGO_ELLIPSIZE_END);
+
+          if (private->mnemonics_visible)
+            {
+              PangoAttrList *attrs;
+
+              attrs = pattern_to_attrs (private->label_text,
+                                        private->label_pattern);
+              if (attrs)
+                {
+                  pango_layout_set_attributes (private->layout, attrs);
+                  pango_attr_list_unref (attrs);
+                }
+            }
+        }
+
+      pango_layout_set_width (private->layout,
+                              PANGO_SCALE *
+                              (allocation.width - requisition.width));
+      pango_layout_get_pixel_extents (private->layout, NULL, &logical);
+
+      gtk_entry_get_layout_offsets (GTK_ENTRY (widget), NULL, &layout_offset_y);
+
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+        layout_offset_x = w - logical.width - 2;
+      else
+        layout_offset_x = 2;
+
+      layout_offset_x -= logical.x;
+
+      state = GTK_STATE_SELECTED;
+      if (! gtk_widget_get_sensitive (widget))
+        state = GTK_STATE_INSENSITIVE;
+      text_color     = style->text[gtk_widget_get_state (widget)];
+      bar_text_color = style->fg[state];
+
+      window_width  = gdk_window_get_width  (event->window);
+      window_height = gdk_window_get_height (event->window);
+
+      progress_fraction = gtk_entry_get_progress_fraction (GTK_ENTRY (widget));
+
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+        {
+          progress_fraction = 1.0 - progress_fraction;
+
+          progress_x      = window_width * progress_fraction;
+          progress_y      = 0;
+          progress_width  = window_width - progress_x;
+          progress_height = window_height;
+        }
+      else
+        {
+          progress_x      = 0;
+          progress_y      = 0;
+          progress_width  = window_width * progress_fraction;
+          progress_height = window_height;
+        }
+
+      cairo_save (cr);
+
+      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+      cairo_rectangle (cr, 0, 0, window_width, window_height);
+      cairo_rectangle (cr, progress_x, progress_y,
+                       progress_width, progress_height);
+      cairo_clip (cr);
+      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
+
+      cairo_move_to (cr, layout_offset_x, layout_offset_y);
+      gdk_cairo_set_source_color (cr, &text_color);
+      pango_cairo_show_layout (cr, private->layout);
+
+      cairo_restore (cr);
+
+      cairo_rectangle (cr, progress_x, progress_y,
+                       progress_width, progress_height);
+      cairo_clip (cr);
+
+      cairo_move_to (cr, layout_offset_x, layout_offset_y);
+      gdk_cairo_set_source_color (cr, &bar_text_color);
+      pango_cairo_show_layout (cr, private->layout);
+    }
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static SpinScaleTarget
+gimp_spin_scale_get_target (GtkWidget      *widget,
+                            gdouble         x,
+                            gdouble         y,
+                            GdkEventButton *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  GtkAllocation         allocation;
+  PangoRectangle        logical;
+  gint                  layout_x;
+  gint                  layout_y;
+
+  if (private->compact && ! event)
+    return TARGET_UPPER;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gtk_entry_get_layout_offsets (GTK_ENTRY (widget), &layout_x, &layout_y);
+  pango_layout_get_pixel_extents (gtk_entry_get_layout (GTK_ENTRY (widget)),
+                                  NULL, &logical);
+
+  if (x >= layout_x && x < layout_x + logical.width  &&
+      y >= layout_y && y < layout_y + logical.height &&
+      (! private->compact                            ||
+       (gtk_widget_has_focus (widget)                &&
+        gdk_event_triggers_context_menu ((GdkEvent *) event))))
+    {
+      return TARGET_NUMBER;
+    }
+
+  if (private->compact)
+    {
+      switch (event->button)
+        {
+        case 1:
+          if (event->state & GDK_SHIFT_MASK)
+            return TARGET_LOWER;
+          else
+            return TARGET_UPPER;
+
+        case 3:
+          return TARGET_LOWER;
+
+        default:
+          return TARGET_NUMBER;
+        }
+    }
+   else
+    {
+      if (y >= allocation.height / 2)
+        return TARGET_LOWER;
+      else
+        return TARGET_UPPER;
+    }
+}
+
+static void
+gimp_spin_scale_update_target (GtkWidget      *widget,
+                               GdkWindow      *window,
+                               gdouble         x,
+                               gdouble         y,
+                               GdkEventButton *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  SpinScaleTarget       target;
+
+  target = gimp_spin_scale_get_target (widget, x, y, event);
+
+  if (target != private->target)
+    {
+      GdkDisplay *display = gtk_widget_get_display (widget);
+      GdkCursor  *cursor  = NULL;
+
+      private->target = target;
+
+      switch (target)
+        {
+        case TARGET_NUMBER:
+          cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
+          break;
+
+        case TARGET_UPPER:
+          cursor = gdk_cursor_new_for_display (display, GDK_SB_UP_ARROW);
+          break;
+
+        case TARGET_LOWER:
+          cursor = gdk_cursor_new_for_display (display, GDK_SB_H_DOUBLE_ARROW);
+          break;
+
+        default:
+          break;
+        }
+
+      gdk_window_set_cursor (window, cursor);
+
+      gtk_widget_queue_draw (widget);
+
+      if (cursor)
+        gdk_cursor_unref (cursor);
+    }
+}
+
+static void
+gimp_spin_scale_clear_target (GtkWidget *widget,
+                              GdkWindow *window)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  if (private->target != TARGET_NONE)
+    {
+      private->target = TARGET_NONE;
+
+      gdk_window_set_cursor (window, NULL);
+
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+static void
+gimp_spin_scale_get_limits (GimpSpinScale *scale,
+                            gdouble       *lower,
+                            gdouble       *upper)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
+
+  if (private->scale_limits_set)
+    {
+      *lower = private->scale_lower;
+      *upper = private->scale_upper;
+    }
+  else
+    {
+      GtkSpinButton *spin_button = GTK_SPIN_BUTTON (scale);
+      GtkAdjustment *adjustment  = gtk_spin_button_get_adjustment (spin_button);
+
+      *lower = gtk_adjustment_get_lower (adjustment);
+      *upper = gtk_adjustment_get_upper (adjustment);
+    }
+}
+
+static gboolean
+gimp_spin_scale_change_value_idle (GimpSpinScale *scale)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
+  GtkAdjustment        *adjustment;
+
+  private->change_value_idle_id = 0;
+
+  adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (scale));
+
+  gtk_adjustment_set_value (adjustment, private->change_value_idle_value);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_spin_scale_change_value (GtkWidget *widget,
+                              gdouble    x,
+                              guint      state,
+                              gboolean   now)
+{
+  GimpSpinScalePrivate *private     = GET_PRIVATE (widget);
+  GtkSpinButton        *spin_button = GTK_SPIN_BUTTON (widget);
+  GtkAdjustment        *adjustment  = gtk_spin_button_get_adjustment (spin_button);
+  GdkWindow            *text_window = gtk_entry_get_text_window (GTK_ENTRY (widget));
+  gdouble               lower;
+  gdouble               upper;
+  gint                  width;
+  gdouble               value;
+  gint                  digits;
+  gint                  power = 1;
+
+  gimp_spin_scale_get_limits (GIMP_SPIN_SCALE (widget), &lower, &upper);
+
+  width = gdk_window_get_width (text_window);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    x = width - x;
+
+  if (private->relative_change)
+    {
+      gdouble step;
+
+      step = (upper - lower) / width * RELATIVE_CHANGE_SPEED;
+
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+        step *= x - (width - private->start_x);
+      else
+        step *= x - private->start_x;
+
+      if (state & GDK_CONTROL_MASK)
+        {
+          gdouble page_inc = gtk_adjustment_get_page_increment (adjustment);
+
+          step = RINT (step / page_inc) * page_inc;
+        }
+
+      value = private->start_value + step;
+    }
+  else
+    {
+      gdouble x0, x1;
+      gdouble fraction;
+
+      x0 = odd_pow (lower, 1.0 / private->gamma);
+      x1 = odd_pow (upper, 1.0 / private->gamma);
+
+      fraction = x / (gdouble) width;
+
+      value = fraction * (x1 - x0) + x0;
+      value = odd_pow (value, private->gamma);
+
+      if (state & GDK_CONTROL_MASK)
+        {
+          gdouble page_inc = gtk_adjustment_get_page_increment (adjustment);
+
+          value = RINT (value / page_inc) * page_inc;
+        }
+    }
+
+  digits = gtk_spin_button_get_digits (spin_button);
+  while (digits--)
+    power *= 10;
+
+  /*  round the value to the possible precision of the spinbutton, so
+   *  a focus-out will not change the value again, causing inadvertend
+   *  adjustment signals.
+   */
+  value *= power;
+  value = RINT (value);
+  value /= power;
+
+  if (private->constrain_drag)
+    value = rint (value);
+
+  if (now)
+    {
+      if (private->change_value_idle_id)
+        {
+          g_source_remove (private->change_value_idle_id);
+
+          private->change_value_idle_id = 0;
+        }
+
+      gtk_adjustment_set_value (adjustment, value);
+    }
+  else if (! private->change_value_idle_id)
+    {
+      private->change_value_idle_value = value;
+
+      private->change_value_idle_id = g_idle_add_full (
+        G_PRIORITY_DEFAULT + 1,
+        (GSourceFunc) gimp_spin_scale_change_value_idle,
+        widget, NULL);
+    }
+}
+
+static gboolean
+gimp_spin_scale_button_press (GtkWidget      *widget,
+                              GdkEventButton *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  private->changing_value  = FALSE;
+  private->relative_change = FALSE;
+  private->pointer_warp    = FALSE;
+
+  if (event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    {
+      gimp_spin_scale_update_target (widget, event->window,
+                                     event->x, event->y, event);
+
+      gtk_widget_queue_draw (widget);
+
+      switch (private->target)
+        {
+        case TARGET_UPPER:
+          private->changing_value = TRUE;
+
+          gtk_widget_grab_focus (widget);
+
+          gimp_spin_scale_change_value (widget, event->x, event->state, TRUE);
+
+          return TRUE;
+
+        case TARGET_LOWER:
+          private->changing_value = TRUE;
+
+          gtk_widget_grab_focus (widget);
+
+          private->relative_change = TRUE;
+          private->start_x = event->x;
+          private->start_value = gtk_adjustment_get_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)));
+
+          private->start_screen    = gdk_event_get_screen ((GdkEvent *) event);
+          private->start_pointer_x = floor (event->x_root);
+          private->start_pointer_y = floor (event->y_root);
+
+          return TRUE;
+
+        default:
+          break;
+        }
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
+}
+
+static gboolean
+gimp_spin_scale_button_release (GtkWidget      *widget,
+                                GdkEventButton *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  if (private->changing_value)
+    {
+      private->changing_value = FALSE;
+
+      /* don't change the value if we're in the middle of a pointer warp, since
+       * we didn't adjust start_x yet.  see the comment in
+       * gimp_spin_scale_motion_notify().
+       */
+      if (! private->pointer_warp)
+        gimp_spin_scale_change_value (widget, event->x, event->state, TRUE);
+
+      if (private->relative_change)
+        {
+          gdk_display_warp_pointer (gdk_screen_get_display (private->start_screen),
+                                    private->start_screen,
+                                    private->start_pointer_x,
+                                    private->start_pointer_y);
+        }
+
+      if (private->hover)
+        gimp_spin_scale_update_target (widget, event->window,
+                                       event->x, event->y, NULL);
+      else
+        gimp_spin_scale_clear_target (widget, event->window);
+
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
+}
+
+static gboolean
+gimp_spin_scale_motion_notify (GtkWidget      *widget,
+                               GdkEventMotion *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  gdk_event_request_motions (event);
+
+  if (event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    private->hover = TRUE;
+
+  if (private->changing_value)
+    {
+      GdkScreen    *screen;
+      GdkDisplay   *display;
+      gint          pointer_x;
+      gint          pointer_y;
+      gint          monitor;
+      GdkRectangle  monitor_geometry;
+
+      screen  = gdk_event_get_screen ((GdkEvent *) event);
+      display = gdk_screen_get_display (screen);
+
+      pointer_x = floor (event->x_root);
+      pointer_y = floor (event->y_root);
+
+      monitor = gdk_screen_get_monitor_at_point (screen, pointer_x, pointer_y);
+      gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+
+      /* when applying a relative change, we wrap the pointer around the left
+       * and right edges of the current monitor, so that the adjustment is not
+       * limited by the monitor geometry.  when the pointer reaches one of the
+       * monitor edges, we move it one pixel away from the opposite edge, so
+       * that it can be subsequently moved in the other direction, and adjust
+       * start_x accordingly.
+       *
+       * unfortunately, we can't rely on gdk_display_warp_pointer() to actually
+       * move the pointer (for example, it doesn't work on wayland), and
+       * there's no easy way to tell whether the pointer moved or not.  in
+       * particular, even when the pointer doesn't move, gdk still simulates a
+       * motion event, and reports the "new" pointer position until a real
+       * motion event occurs.
+       *
+       * in order not to erroneously adjust start_x when
+       * gdk_display_warp_pointer() fails, we remember that we *tried* to warp
+       * the pointer, and defer the actual adjustment of start_x until a future
+       * motion event, where the pointer's x coordinate is different from the
+       * one passed to gdk_display_warp_pointer().  when that happens, we
+       * "guess" whether the pointer got warped or not by comparing its x
+       * coordinate to the one passed to gdk_display_warp_pointer(): if their
+       * difference is less than half the monitor width, then we assume the
+       * pointer got warped (otherwise, the user must have very quickly moved
+       * the mouse across half the screen.)  yes, this is an ugly ugly hack :)
+       */
+
+      if (private->pointer_warp)
+        {
+          if (pointer_x == private->pointer_warp_x)
+            return TRUE;
+
+          private->pointer_warp = FALSE;
+
+          if (ABS (pointer_x - private->pointer_warp_x) < monitor_geometry.width / 2)
+            private->start_x = private->pointer_warp_start_x;
+        }
+
+      /* change the value in an idle, as a form of motion compression, since we
+       * don't use motion hints.  see the comment in gimp_spin_scale_map().
+       */
+      gimp_spin_scale_change_value (widget, event->x, event->state, FALSE);
+
+      if (private->relative_change)
+        {
+          GtkAdjustment *adjustment;
+          gdouble        value;
+          gdouble        lower;
+          gdouble        upper;
+
+          adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
+
+          value = gtk_adjustment_get_value (adjustment);
+          lower = gtk_adjustment_get_lower (adjustment);
+          upper = gtk_adjustment_get_upper (adjustment);
+
+          if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+            {
+              gdouble temp;
+
+              value = -value;
+
+              temp  = lower;
+              lower = -upper;
+              upper = -temp;
+            }
+
+          if (pointer_x <= monitor_geometry.x &&
+              value > lower)
+            {
+              private->pointer_warp         = TRUE;
+              private->pointer_warp_x       = (monitor_geometry.width - 1) + pointer_x - 1;
+              private->pointer_warp_start_x = private->start_x + (monitor_geometry.width - 2);
+            }
+          else if (pointer_x >= monitor_geometry.x + (monitor_geometry.width - 1) &&
+                   value < upper)
+            {
+              private->pointer_warp         = TRUE;
+              private->pointer_warp_x       = pointer_x - (monitor_geometry.width - 1) + 1;
+              private->pointer_warp_start_x = private->start_x - (monitor_geometry.width - 2);
+            }
+
+          if (private->pointer_warp)
+            {
+              gdk_display_warp_pointer (display,
+                                        screen,
+                                        private->pointer_warp_x,
+                                        pointer_y);
+            }
+        }
+
+      return TRUE;
+    }
+
+  GTK_WIDGET_CLASS (parent_class)->motion_notify_event (widget, event);
+
+  if (! (event->state &
+         (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) &&
+      private->hover)
+    {
+      gimp_spin_scale_update_target (widget, event->window,
+                                     event->x, event->y, NULL);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_spin_scale_leave_notify (GtkWidget        *widget,
+                              GdkEventCrossing *event)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  if (event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    {
+      private->hover = FALSE;
+
+      if (! (event->state &
+             (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
+        {
+          gimp_spin_scale_clear_target (widget, event->window);
+        }
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->leave_notify_event (widget, event);
+}
+
+static void
+gimp_spin_scale_hierarchy_changed (GtkWidget *widget,
+                                   GtkWidget *old_toplevel)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  gimp_spin_scale_setup_mnemonic (GIMP_SPIN_SCALE (widget),
+                                  private->mnemonic_keyval);
+}
+
+static void
+gimp_spin_scale_screen_changed (GtkWidget *widget,
+                                GdkScreen *old_screen)
+{
+  GimpSpinScale        *scale   = GIMP_SPIN_SCALE (widget);
+  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
+  GtkSettings          *settings;
+
+  g_clear_object (&private->layout);
+
+  if (old_screen)
+    {
+      settings = gtk_settings_get_for_screen (old_screen);
+
+      g_signal_handlers_disconnect_by_func (settings,
+                                            gimp_spin_scale_settings_notify,
+                                            scale);
+    }
+
+  if (! gtk_widget_has_screen (widget))
+    return;
+
+  settings = gtk_widget_get_settings (widget);
+
+  g_signal_connect (settings, "notify::gtk-enable-mnemonics",
+                    G_CALLBACK (gimp_spin_scale_settings_notify),
+                    scale);
+  g_signal_connect (settings, "notify::gtk-enable-accels",
+                    G_CALLBACK (gimp_spin_scale_settings_notify),
+                    scale);
+
+  gimp_spin_scale_settings_notify (settings, NULL, scale);
+}
+
+static void
+gimp_spin_scale_value_changed (GtkSpinButton *spin_button)
+{
+  GimpSpinScalePrivate *private    = GET_PRIVATE (spin_button);
+  GtkAdjustment        *adjustment = gtk_spin_button_get_adjustment (spin_button);
+  gdouble               lower;
+  gdouble               upper;
+  gdouble               value;
+  gdouble               x0, x1;
+  gdouble               x;
+
+  gimp_spin_scale_get_limits (GIMP_SPIN_SCALE (spin_button), &lower, &upper);
+
+  value = CLAMP (gtk_adjustment_get_value (adjustment), lower, upper);
+
+  x0 = odd_pow (lower, 1.0 / private->gamma);
+  x1 = odd_pow (upper, 1.0 / private->gamma);
+  x  = odd_pow (value, 1.0 / private->gamma);
+
+  gtk_entry_set_progress_fraction (GTK_ENTRY (spin_button),
+                                   (x - x0) / (x1 - x0));
+}
+
+static void
+gimp_spin_scale_settings_notify (GtkSettings      *settings,
+                                 const GParamSpec *pspec,
+                                 GimpSpinScale    *scale)
+{
+  GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (scale));
+
+  if (GTK_IS_WINDOW (toplevel))
+    gimp_spin_scale_mnemonics_notify (GTK_WINDOW (toplevel), NULL, scale);
+}
+
+static void
+gimp_spin_scale_mnemonics_notify (GtkWindow        *window,
+                                  const GParamSpec *pspec,
+                                  GimpSpinScale    *scale)
+{
+  GimpSpinScalePrivate *private           = GET_PRIVATE (scale);
+  gboolean              mnemonics_visible = FALSE;
+  gboolean              enable_mnemonics;
+  gboolean              auto_mnemonics;
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (scale)),
+                "gtk-enable-mnemonics", &enable_mnemonics,
+                "gtk-auto-mnemonics",   &auto_mnemonics,
+                NULL);
+
+  if (enable_mnemonics &&
+      (! auto_mnemonics ||
+       gtk_widget_is_sensitive (GTK_WIDGET (scale))))
+    {
+      g_object_get (window,
+                    "mnemonics-visible", &mnemonics_visible,
+                    NULL);
+    }
+
+  if (private->mnemonics_visible != mnemonics_visible)
+    {
+      private->mnemonics_visible = mnemonics_visible;
+
+      g_clear_object (&private->layout);
+
+      gtk_widget_queue_draw (GTK_WIDGET (scale));
+    }
+}
+
+static void
+gimp_spin_scale_setup_mnemonic (GimpSpinScale *scale,
+                                guint          previous_keyval)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (scale);
+  GtkWidget            *widget  = GTK_WIDGET (scale);
+  GtkWidget            *toplevel;
+
+  if (private->mnemonic_window)
+    {
+      g_signal_handlers_disconnect_by_func (private->mnemonic_window,
+                                            gimp_spin_scale_mnemonics_notify,
+                                            scale);
+
+      gtk_window_remove_mnemonic (private->mnemonic_window,
+                                  previous_keyval,
+                                  widget);
+      private->mnemonic_window = NULL;
+    }
+
+  toplevel = gtk_widget_get_toplevel (widget);
+
+  if (gtk_widget_is_toplevel (toplevel) &&
+      private->mnemonic_keyval != GDK_KEY_VoidSymbol)
+    {
+      gtk_window_add_mnemonic (GTK_WINDOW (toplevel),
+                               private->mnemonic_keyval,
+                               widget);
+      private->mnemonic_window = GTK_WINDOW (toplevel);
+
+      g_signal_connect (toplevel, "notify::mnemonics-visible",
+                        G_CALLBACK (gimp_spin_scale_mnemonics_notify),
+                        scale);
+     }
+}
+
+static gdouble
+odd_pow (gdouble x,
+         gdouble y)
+{
+  if (x >= 0.0)
+    return pow (x, y);
+  else
+    return -pow (-x, y);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_spin_scale_new (GtkAdjustment *adjustment,
+                     const gchar   *label,
+                     gint           digits)
+{
+  g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), NULL);
+
+  return g_object_new (GIMP_TYPE_SPIN_SCALE,
+                       "adjustment", adjustment,
+                       "label",      label,
+                       "digits",     digits,
+                       NULL);
+}
+
+static gboolean
+separate_uline_pattern (const gchar  *str,
+                        guint        *accel_key,
+                        gchar       **new_str,
+                        gchar       **pattern)
+{
+  gboolean underscore;
+  const gchar *src;
+  gchar *dest;
+  gchar *pattern_dest;
+
+  *accel_key = GDK_KEY_VoidSymbol;
+  *new_str = g_new (gchar, strlen (str) + 1);
+  *pattern = g_new (gchar, g_utf8_strlen (str, -1) + 1);
+
+  underscore = FALSE;
+
+  src = str;
+  dest = *new_str;
+  pattern_dest = *pattern;
+
+  while (*src)
+    {
+      gunichar c;
+      const gchar *next_src;
+
+      c = g_utf8_get_char (src);
+      if (c == (gunichar)-1)
+        {
+          g_warning ("Invalid input string");
+          g_free (*new_str);
+          g_free (*pattern);
+
+          return FALSE;
+        }
+      next_src = g_utf8_next_char (src);
+
+      if (underscore)
+        {
+          if (c == '_')
+            *pattern_dest++ = ' ';
+          else
+            {
+              *pattern_dest++ = '_';
+              if (*accel_key == GDK_KEY_VoidSymbol)
+                *accel_key = gdk_keyval_to_lower (gdk_unicode_to_keyval (c));
+            }
+
+          while (src < next_src)
+            *dest++ = *src++;
+
+          underscore = FALSE;
+        }
+      else
+        {
+          if (c == '_')
+            {
+              underscore = TRUE;
+              src = next_src;
+            }
+          else
+            {
+              while (src < next_src)
+                *dest++ = *src++;
+
+              *pattern_dest++ = ' ';
+            }
+        }
+    }
+
+  *dest = 0;
+  *pattern_dest = 0;
+
+  return TRUE;
+}
+
+void
+gimp_spin_scale_set_label (GimpSpinScale *scale,
+                           const gchar   *label)
+{
+  GimpSpinScalePrivate *private;
+  guint                 accel_key = GDK_KEY_VoidSymbol;
+  gchar                *text      = NULL;
+  gchar                *pattern   = NULL;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private = GET_PRIVATE (scale);
+
+  if (label == private->label)
+    return;
+
+  if (label && ! separate_uline_pattern (label, &accel_key, &text, &pattern))
+    return;
+
+  g_free (private->label);
+  private->label = g_strdup (label);
+
+  g_free (private->label_text);
+  private->label_text = text; /* don't dup */
+
+  g_free (private->label_pattern);
+  private->label_pattern = pattern; /* don't dup */
+
+  if (private->mnemonic_keyval != accel_key)
+    {
+      guint previous = private->mnemonic_keyval;
+
+      private->mnemonic_keyval = accel_key;
+
+      gimp_spin_scale_setup_mnemonic (scale, previous);
+    }
+
+  g_clear_object (&private->layout);
+
+  gtk_widget_queue_resize (GTK_WIDGET (scale));
+
+  g_object_notify (G_OBJECT (scale), "label");
+}
+
+const gchar *
+gimp_spin_scale_get_label (GimpSpinScale *scale)
+{
+  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), NULL);
+
+  return GET_PRIVATE (scale)->label;
+}
+
+void
+gimp_spin_scale_set_scale_limits (GimpSpinScale *scale,
+                                  gdouble        lower,
+                                  gdouble        upper)
+{
+  GimpSpinScalePrivate *private;
+  GtkSpinButton        *spin_button;
+  GtkAdjustment        *adjustment;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private     = GET_PRIVATE (scale);
+  spin_button = GTK_SPIN_BUTTON (scale);
+  adjustment  = gtk_spin_button_get_adjustment (spin_button);
+
+  g_return_if_fail (lower >= gtk_adjustment_get_lower (adjustment));
+  g_return_if_fail (upper <= gtk_adjustment_get_upper (adjustment));
+
+  private->scale_limits_set = TRUE;
+  private->scale_lower      = lower;
+  private->scale_upper      = upper;
+  private->gamma            = 1.0;
+
+  gimp_spin_scale_value_changed (spin_button);
+}
+
+void
+gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale)
+{
+  GimpSpinScalePrivate *private;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private = GET_PRIVATE (scale);
+
+  private->scale_limits_set = FALSE;
+  private->scale_lower      = 0.0;
+  private->scale_upper      = 0.0;
+
+  gimp_spin_scale_value_changed (GTK_SPIN_BUTTON (scale));
+}
+
+gboolean
+gimp_spin_scale_get_scale_limits (GimpSpinScale *scale,
+                                  gdouble       *lower,
+                                  gdouble       *upper)
+{
+  GimpSpinScalePrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), FALSE);
+
+  private = GET_PRIVATE (scale);
+
+  if (lower)
+    *lower = private->scale_lower;
+
+  if (upper)
+    *upper = private->scale_upper;
+
+  return private->scale_limits_set;
+}
+
+void
+gimp_spin_scale_set_gamma (GimpSpinScale *scale,
+                           gdouble        gamma)
+{
+  GimpSpinScalePrivate *private;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private = GET_PRIVATE (scale);
+
+  private->gamma = gamma;
+
+  gimp_spin_scale_value_changed (GTK_SPIN_BUTTON (scale));
+}
+
+gdouble
+gimp_spin_scale_get_gamma (GimpSpinScale *scale)
+{
+  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), 1.0);
+
+  return GET_PRIVATE (scale)->gamma;
+}
+
+/**
+ * gimp_spin_scale_set_constrain_drag:
+ * @scale: the #GimpSpinScale.
+ * @constrain: whether constraining to integer values when dragging with
+ *             pointer.
+ *
+ * If @constrain_drag is TRUE, dragging the scale with the pointer will
+ * only result into integer values. It will still possible to set the
+ * scale to fractional values (if the spin scale "digits" is above 0)
+ * for instance with keyboard edit.
+ */
+void
+gimp_spin_scale_set_constrain_drag (GimpSpinScale *scale,
+                                    gboolean       constrain)
+{
+  GimpSpinScalePrivate *private;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private = GET_PRIVATE (scale);
+
+  private->constrain_drag = constrain;
+}
+
+gboolean
+gimp_spin_scale_get_constrain_drag (GimpSpinScale *scale)
+{
+  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), 1.0);
+
+  return GET_PRIVATE (scale)->constrain_drag;
+}
diff --git a/app/widgets/gimpspinscale.h b/app/widgets/gimpspinscale.h
new file mode 100644
index 0000000..3b99da5
--- /dev/null
+++ b/app/widgets/gimpspinscale.h
@@ -0,0 +1,73 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpspinscale.h
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SPIN_SCALE_H__
+#define __GIMP_SPIN_SCALE_H__
+
+
+#define GIMP_TYPE_SPIN_SCALE            (gimp_spin_scale_get_type ())
+#define GIMP_SPIN_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SPIN_SCALE, GimpSpinScale))
+#define GIMP_SPIN_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SPIN_SCALE, GimpSpinScaleClass))
+#define GIMP_IS_SPIN_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SPIN_SCALE))
+#define GIMP_IS_SPIN_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SPIN_SCALE))
+#define GIMP_SPIN_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SPIN_SCALE, GimpSpinScaleClass))
+
+
+typedef struct _GimpSpinScale      GimpSpinScale;
+typedef struct _GimpSpinScaleClass GimpSpinScaleClass;
+
+struct _GimpSpinScale
+{
+  GimpSpinButton  parent_instance;
+};
+
+struct _GimpSpinScaleClass
+{
+  GimpSpinButtonClass  parent_class;
+};
+
+
+GType         gimp_spin_scale_get_type           (void) G_GNUC_CONST;
+
+GtkWidget   * gimp_spin_scale_new                (GtkAdjustment *adjustment,
+                                                  const gchar   *label,
+                                                  gint           digits);
+
+void          gimp_spin_scale_set_label          (GimpSpinScale *scale,
+                                                  const gchar   *label);
+const gchar * gimp_spin_scale_get_label          (GimpSpinScale *scale);
+
+void          gimp_spin_scale_set_scale_limits   (GimpSpinScale *scale,
+                                                  gdouble        lower,
+                                                  gdouble        upper);
+void          gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale);
+gboolean      gimp_spin_scale_get_scale_limits   (GimpSpinScale *scale,
+                                                  gdouble       *lower,
+                                                  gdouble       *upper);
+
+void          gimp_spin_scale_set_gamma          (GimpSpinScale *scale,
+                                                  gdouble        gamma);
+gdouble       gimp_spin_scale_get_gamma          (GimpSpinScale *scale);
+
+void          gimp_spin_scale_set_constrain_drag (GimpSpinScale *scale,
+                                                  gboolean       constrain);
+gboolean      gimp_spin_scale_get_constrain_drag (GimpSpinScale *scale);
+
+#endif  /*  __GIMP_SPIN_SCALE_H__  */
diff --git a/app/widgets/gimpstringaction.c b/app/widgets/gimpstringaction.c
new file mode 100644
index 0000000..a2db7ca
--- /dev/null
+++ b/app/widgets/gimpstringaction.c
@@ -0,0 +1,162 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstringaction.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpaction.h"
+#include "gimpaction-history.h"
+#include "gimpstringaction.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VALUE
+};
+
+
+static void   gimp_string_action_finalize     (GObject      *object);
+static void   gimp_string_action_set_property (GObject      *object,
+                                               guint         prop_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec);
+static void   gimp_string_action_get_property (GObject      *object,
+                                               guint         prop_id,
+                                               GValue       *value,
+                                               GParamSpec   *pspec);
+
+static void   gimp_string_action_activate     (GtkAction    *action);
+
+
+G_DEFINE_TYPE (GimpStringAction, gimp_string_action, GIMP_TYPE_ACTION_IMPL)
+
+#define parent_class gimp_string_action_parent_class
+
+
+static void
+gimp_string_action_class_init (GimpStringActionClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkActionClass *action_class = GTK_ACTION_CLASS (klass);
+
+  object_class->finalize     = gimp_string_action_finalize;
+  object_class->set_property = gimp_string_action_set_property;
+  object_class->get_property = gimp_string_action_get_property;
+
+  action_class->activate = gimp_string_action_activate;
+
+  g_object_class_install_property (object_class, PROP_VALUE,
+                                   g_param_spec_string ("value",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_string_action_init (GimpStringAction *action)
+{
+}
+
+static void
+gimp_string_action_finalize (GObject *object)
+{
+  GimpStringAction *action = GIMP_STRING_ACTION (object);
+
+  g_clear_pointer (&action->value, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_string_action_get_property (GObject    *object,
+                                 guint       prop_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpStringAction *action = GIMP_STRING_ACTION (object);
+
+  switch (prop_id)
+    {
+    case PROP_VALUE:
+      g_value_set_string (value, action->value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_string_action_set_property (GObject      *object,
+                                 guint         prop_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpStringAction *action = GIMP_STRING_ACTION (object);
+
+  switch (prop_id)
+    {
+    case PROP_VALUE:
+      g_free (action->value);
+      action->value = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+GimpStringAction *
+gimp_string_action_new (const gchar *name,
+                        const gchar *label,
+                        const gchar *tooltip,
+                        const gchar *icon_name,
+                        const gchar *help_id,
+                        const gchar *value)
+{
+  GimpStringAction *action;
+
+  action = g_object_new (GIMP_TYPE_STRING_ACTION,
+                         "name",      name,
+                         "label",     label,
+                         "tooltip",   tooltip,
+                         "icon-name", icon_name,
+                         "value",     value,
+                         NULL);
+
+  gimp_action_set_help_id (GIMP_ACTION (action), help_id);
+
+  return action;
+}
+
+static void
+gimp_string_action_activate (GtkAction *action)
+{
+  GimpStringAction *string_action = GIMP_STRING_ACTION (action);
+
+  gimp_action_emit_activate (GIMP_ACTION (action),
+                             g_variant_new_string (string_action->value));
+
+  gimp_action_history_action_activated (GIMP_ACTION (action));
+}
diff --git a/app/widgets/gimpstringaction.h b/app/widgets/gimpstringaction.h
new file mode 100644
index 0000000..aeee941
--- /dev/null
+++ b/app/widgets/gimpstringaction.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstringaction.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_STRING_ACTION_H__
+#define __GIMP_STRING_ACTION_H__
+
+
+#include "gimpactionimpl.h"
+
+
+#define GIMP_TYPE_STRING_ACTION            (gimp_string_action_get_type ())
+#define GIMP_STRING_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STRING_ACTION, GimpStringAction))
+#define GIMP_STRING_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STRING_ACTION, GimpStringActionClass))
+#define GIMP_IS_STRING_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_STRING_ACTION))
+#define GIMP_IS_STRING_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_STRING_ACTION))
+#define GIMP_STRING_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_STRING_ACTION, GimpStringActionClass))
+
+
+typedef struct _GimpStringActionClass GimpStringActionClass;
+
+struct _GimpStringAction
+{
+  GimpActionImpl  parent_instance;
+
+  gchar          *value;
+};
+
+struct _GimpStringActionClass
+{
+  GimpActionImplClass parent_class;
+};
+
+
+GType              gimp_string_action_get_type (void) G_GNUC_CONST;
+
+GimpStringAction * gimp_string_action_new      (const gchar *name,
+                                                const gchar *label,
+                                                const gchar *tooltip,
+                                                const gchar *icon_name,
+                                                const gchar *help_id,
+                                                const gchar *value);
+
+
+#endif  /* __GIMP_STRING_ACTION_H__ */
diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c
new file mode 100644
index 0000000..3d91500
--- /dev/null
+++ b/app/widgets/gimpstrokeeditor.c
@@ -0,0 +1,420 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpdashpattern.h"
+#include "core/gimpstrokeoptions.h"
+
+#include "gimpcellrendererdashes.h"
+#include "gimpdasheditor.h"
+#include "gimpstrokeeditor.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_OPTIONS,
+  PROP_RESOLUTION
+};
+
+
+static void      gimp_stroke_editor_constructed  (GObject           *object);
+static void      gimp_stroke_editor_set_property (GObject           *object,
+                                                  guint              property_id,
+                                                  const GValue      *value,
+                                                  GParamSpec        *pspec);
+static void      gimp_stroke_editor_get_property (GObject           *object,
+                                                  guint              property_id,
+                                                  GValue            *value,
+                                                  GParamSpec        *pspec);
+
+static gboolean  gimp_stroke_editor_paint_button (GtkWidget         *widget,
+                                                  GdkEventExpose    *event,
+                                                  gpointer           data);
+static void      gimp_stroke_editor_dash_preset  (GtkWidget         *widget,
+                                                  GimpStrokeOptions *options);
+
+static void      gimp_stroke_editor_combo_fill   (GimpStrokeOptions *options,
+                                                  GtkComboBox       *box);
+
+
+G_DEFINE_TYPE (GimpStrokeEditor, gimp_stroke_editor, GIMP_TYPE_FILL_EDITOR)
+
+#define parent_class gimp_stroke_editor_parent_class
+
+
+static void
+gimp_stroke_editor_class_init (GimpStrokeEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_stroke_editor_constructed;
+  object_class->set_property = gimp_stroke_editor_set_property;
+  object_class->get_property = gimp_stroke_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_OPTIONS,
+                                   g_param_spec_object ("options", NULL, NULL,
+                                                        GIMP_TYPE_STROKE_OPTIONS,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_RESOLUTION,
+                                   g_param_spec_double ("resolution", NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        72.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_stroke_editor_init (GimpStrokeEditor *editor)
+{
+}
+
+static void
+gimp_stroke_editor_constructed (GObject *object)
+{
+  GimpFillEditor    *fill_editor = GIMP_FILL_EDITOR (object);
+  GimpStrokeEditor  *editor      = GIMP_STROKE_EDITOR (object);
+  GimpStrokeOptions *options;
+  GimpEnumStore     *store;
+  GEnumValue        *value;
+  GtkWidget         *box;
+  GtkWidget         *size;
+  GtkWidget         *label;
+  GtkWidget         *frame;
+  GtkWidget         *table;
+  GtkWidget         *expander;
+  GtkWidget         *dash_editor;
+  GtkWidget         *button;
+  GtkCellRenderer   *cell;
+  gint               row = 0;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_STROKE_OPTIONS (fill_editor->options));
+
+  options = GIMP_STROKE_OPTIONS (fill_editor->options);
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (editor), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
+  label = gtk_label_new (_("Line width:"));
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  size = gimp_prop_size_entry_new (G_OBJECT (options),
+                                   "width", FALSE, "unit",
+                                   "%a", GIMP_SIZE_ENTRY_UPDATE_SIZE,
+                                   editor->resolution);
+  gimp_size_entry_set_pixel_digits (GIMP_SIZE_ENTRY (size), 1);
+  gtk_box_pack_start (GTK_BOX (box), size, FALSE, FALSE, 0);
+  gtk_widget_show (size);
+
+  expander = gtk_expander_new_with_mnemonic (_("_Line Style"));
+  gtk_box_pack_start (GTK_BOX (editor), expander, FALSE, FALSE, 0);
+  gtk_widget_show (expander);
+
+  frame = gimp_frame_new ("<expander>");
+  gtk_container_add (GTK_CONTAINER (expander), frame);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (5, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 2, 6);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 4, 6);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  box = gimp_prop_enum_icon_box_new (G_OBJECT (options), "cap-style",
+                                     "gimp-cap", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("_Cap style:"), 0.0, 0.5,
+                             box, 2, TRUE);
+
+  box = gimp_prop_enum_icon_box_new (G_OBJECT (options), "join-style",
+                                     "gimp-join", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("_Join style:"), 0.0, 0.5,
+                             box, 2, TRUE);
+
+  gimp_prop_scale_entry_new (G_OBJECT (options), "miter-limit",
+                             GTK_TABLE (table), 0, row++,
+                             _("_Miter limit:"),
+                             1.0, 1.0, 1,
+                             FALSE, 0.0, 0.0);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Dash pattern:"), 0.0, 0.5,
+                             frame, 2, FALSE);
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box);
+  gtk_widget_show (box);
+
+  dash_editor = gimp_dash_editor_new (options);
+
+  button = g_object_new (GTK_TYPE_BUTTON,
+                         "width-request", 14,
+                         NULL);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect_object (button, "clicked",
+                           G_CALLBACK (gimp_dash_editor_shift_left),
+                           dash_editor, G_CONNECT_SWAPPED);
+  g_signal_connect_after (button, "expose-event",
+                          G_CALLBACK (gimp_stroke_editor_paint_button),
+                          button);
+
+  gtk_box_pack_start (GTK_BOX (box), dash_editor, TRUE, TRUE, 0);
+  gtk_widget_show (dash_editor);
+
+  button = g_object_new (GTK_TYPE_BUTTON,
+                         "width-request", 14,
+                         NULL);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect_object (button, "clicked",
+                           G_CALLBACK (gimp_dash_editor_shift_right),
+                           dash_editor, G_CONNECT_SWAPPED);
+  g_signal_connect_after (button, "expose-event",
+                          G_CALLBACK (gimp_stroke_editor_paint_button),
+                          NULL);
+
+
+  store = g_object_new (GIMP_TYPE_ENUM_STORE,
+                        "enum-type",      GIMP_TYPE_DASH_PRESET,
+                        "user-data-type", GIMP_TYPE_DASH_PATTERN,
+                        NULL);
+
+  for (value = store->enum_class->values; value->value_name; value++)
+    {
+      GtkTreeIter  iter = { 0, };
+      const gchar *desc;
+
+      desc = gimp_enum_value_get_desc (store->enum_class, value);
+
+      gtk_list_store_append (GTK_LIST_STORE (store), &iter);
+      gtk_list_store_set (GTK_LIST_STORE (store), &iter,
+                          GIMP_INT_STORE_VALUE, value->value,
+                          GIMP_INT_STORE_LABEL, desc,
+                          -1);
+    }
+
+  box = gimp_enum_combo_box_new_with_model (store);
+  g_object_unref (store);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (box), GIMP_DASH_CUSTOM);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Dash _preset:"), 0.0, 0.5,
+                             box, 2, FALSE);
+
+  cell = g_object_new (GIMP_TYPE_CELL_RENDERER_DASHES,
+                       "xpad", 2,
+                       NULL);
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (box), cell, FALSE);
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (box), cell,
+                                 "pattern", GIMP_INT_STORE_USER_DATA);
+
+  gimp_stroke_editor_combo_fill (options, GTK_COMBO_BOX (box));
+
+  g_signal_connect (box, "changed",
+                    G_CALLBACK (gimp_stroke_editor_dash_preset),
+                    options);
+  g_signal_connect_object (options, "dash-info-changed",
+                           G_CALLBACK (gimp_int_combo_box_set_active),
+                           box, G_CONNECT_SWAPPED);
+}
+
+static void
+gimp_stroke_editor_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  GimpFillEditor   *fill_editor = GIMP_FILL_EDITOR (object);
+  GimpStrokeEditor *editor      = GIMP_STROKE_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_OPTIONS:
+      if (fill_editor->options)
+        g_object_unref (fill_editor->options);
+      fill_editor->options = g_value_dup_object (value);
+      break;
+
+    case PROP_RESOLUTION:
+      editor->resolution = g_value_get_double (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_stroke_editor_get_property (GObject    *object,
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  GimpFillEditor   *fill_editor = GIMP_FILL_EDITOR (object);
+  GimpStrokeEditor *editor      = GIMP_STROKE_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_OPTIONS:
+      g_value_set_object (value, fill_editor->options);
+      break;
+
+    case PROP_RESOLUTION:
+      g_value_set_double (value, editor->resolution);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_stroke_editor_new (GimpStrokeOptions *options,
+                        gdouble            resolution,
+                        gboolean           edit_context)
+{
+  g_return_val_if_fail (GIMP_IS_STROKE_OPTIONS (options), NULL);
+
+  return g_object_new (GIMP_TYPE_STROKE_EDITOR,
+                       "options",      options,
+                       "resolution",   resolution,
+                       "edit-context", edit_context ? TRUE : FALSE,
+                       NULL);
+}
+
+static gboolean
+gimp_stroke_editor_paint_button (GtkWidget       *widget,
+                                 GdkEventExpose  *event,
+                                 gpointer         data)
+{
+  GtkStyle      *style = gtk_widget_get_style (widget);
+  GtkAllocation  allocation;
+  gint           w;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  w = MIN (allocation.width, allocation.height) * 2 / 3;
+
+  gtk_paint_arrow (style,
+                   gtk_widget_get_window (widget),
+                   gtk_widget_get_state (widget),
+                   GTK_SHADOW_IN,
+                   &event->area, widget, NULL,
+                   data ? GTK_ARROW_LEFT : GTK_ARROW_RIGHT, TRUE,
+                   allocation.x + (allocation.width - w) / 2,
+                   allocation.y + (allocation.height - w) / 2,
+                   w, w);
+  return FALSE;
+}
+
+static void
+gimp_stroke_editor_dash_preset (GtkWidget         *widget,
+                                GimpStrokeOptions *options)
+{
+  gint value;
+
+  if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value) &&
+      value != GIMP_DASH_CUSTOM)
+    {
+      gimp_stroke_options_take_dash_pattern (options, value, NULL);
+    }
+}
+
+static void
+gimp_stroke_editor_combo_update (GtkTreeModel      *model,
+                                 GParamSpec        *pspec,
+                                 GimpStrokeOptions *options)
+{
+  GtkTreeIter iter;
+
+  if (gimp_int_store_lookup_by_value (model, GIMP_DASH_CUSTOM, &iter))
+    {
+      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                          GIMP_INT_STORE_USER_DATA,
+                          gimp_stroke_options_get_dash_info (options),
+                          -1);
+    }
+}
+
+static void
+gimp_stroke_editor_combo_fill (GimpStrokeOptions *options,
+                               GtkComboBox       *box)
+{
+  GtkTreeModel *model = gtk_combo_box_get_model (box);
+  GtkTreeIter   iter;
+  gboolean      iter_valid;
+
+  for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
+       iter_valid;
+       iter_valid = gtk_tree_model_iter_next (model, &iter))
+    {
+      gint value;
+
+      gtk_tree_model_get (model, &iter,
+                          GIMP_INT_STORE_VALUE, &value,
+                          -1);
+
+      if (value == GIMP_DASH_CUSTOM)
+        {
+          gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                              GIMP_INT_STORE_USER_DATA,
+                              gimp_stroke_options_get_dash_info (options),
+                              -1);
+
+          g_signal_connect_object (options, "notify::dash-info",
+                                   G_CALLBACK (gimp_stroke_editor_combo_update),
+                                   model, G_CONNECT_SWAPPED);
+        }
+      else
+        {
+          GArray *pattern = gimp_dash_pattern_new_from_preset (value);
+
+          gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                              GIMP_INT_STORE_USER_DATA, pattern,
+                              -1);
+          gimp_dash_pattern_free (pattern);
+        }
+    }
+}
diff --git a/app/widgets/gimpstrokeeditor.h b/app/widgets/gimpstrokeeditor.h
new file mode 100644
index 0000000..9435cec
--- /dev/null
+++ b/app/widgets/gimpstrokeeditor.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpstrokeeditor.h
+ * Copyright (C) 2003 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_STROKE_EDITOR_H__
+#define __GIMP_STROKE_EDITOR_H__
+
+
+#include "gimpfilleditor.h"
+
+
+#define GIMP_TYPE_STROKE_EDITOR            (gimp_stroke_editor_get_type ())
+#define GIMP_STROKE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditor))
+#define GIMP_STROKE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditorClass))
+#define GIMP_IS_STROKE_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_STROKE_EDITOR))
+#define GIMP_IS_STROKE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_STROKE_EDITOR))
+#define GIMP_STROKE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditorClass))
+
+
+typedef struct _GimpStrokeEditorClass GimpStrokeEditorClass;
+
+struct _GimpStrokeEditor
+{
+  GimpFillEditor  parent_instance;
+
+  gdouble         resolution;
+};
+
+struct _GimpStrokeEditorClass
+{
+  GimpFillEditorClass  parent_class;
+};
+
+
+GType       gimp_stroke_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_stroke_editor_new      (GimpStrokeOptions *options,
+                                         gdouble            resolution,
+                                         gboolean           edit_context);
+
+
+#endif /* __GIMP_STROKE_EDITOR_H__ */
diff --git a/app/widgets/gimpsymmetryeditor.c b/app/widgets/gimpsymmetryeditor.c
new file mode 100644
index 0000000..f0b7c63
--- /dev/null
+++ b/app/widgets/gimpsymmetryeditor.c
@@ -0,0 +1,282 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetryeditor.c
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui/propgui-types.h" /* ugly, but what the heck */
+
+#include "core/gimpimage.h"
+#include "core/gimpimage-symmetry.h"
+#include "core/gimpsymmetry.h"
+
+#include "propgui/gimppropgui.h"
+
+#include "gimpmenufactory.h"
+#include "gimpsymmetryeditor.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpSymmetryEditorPrivate
+{
+  GimpContext *context;
+
+  GtkWidget   *menu;
+  GtkWidget   *options_vbox;
+};
+
+
+static void   gimp_symmetry_editor_set_image        (GimpImageEditor    *editor,
+                                                     GimpImage          *image);
+
+/* Signal handlers on the contextual image. */
+static void   gimp_symmetry_editor_symmetry_notify  (GimpImage          *image,
+                                                     GParamSpec         *pspec,
+                                                     GimpSymmetryEditor *editor);
+
+/* Signal handlers on the symmetry. */
+static void   gimp_symmetry_editor_symmetry_updated (GimpSymmetry       *symmetry,
+                                                     GimpImage          *image,
+                                                     GimpSymmetryEditor *editor);
+
+/* Private functions. */
+static void   gimp_symmetry_editor_set_options      (GimpSymmetryEditor *editor,
+                                                     GimpSymmetry       *symmetry);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpSymmetryEditor, gimp_symmetry_editor,
+                            GIMP_TYPE_IMAGE_EDITOR)
+
+#define parent_class gimp_symmetry_editor_parent_class
+
+
+static void
+gimp_symmetry_editor_class_init (GimpSymmetryEditorClass *klass)
+{
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  image_editor_class->set_image = gimp_symmetry_editor_set_image;
+}
+
+static void
+gimp_symmetry_editor_init (GimpSymmetryEditor *editor)
+{
+  GtkWidget *scrolled_window;
+  GtkWidget *viewport;
+
+  editor->p = gimp_symmetry_editor_get_instance_private (editor);
+
+  gtk_widget_set_size_request (GTK_WIDGET (editor), -1, 200);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (editor), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  viewport = gtk_viewport_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
+  gtk_widget_show (viewport);
+
+  editor->p->options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_container_set_border_width (GTK_CONTAINER (editor->p->options_vbox), 2);
+  gtk_container_add (GTK_CONTAINER (viewport), editor->p->options_vbox);
+  gtk_widget_show (editor->p->options_vbox);
+
+  gimp_symmetry_editor_set_image (GIMP_IMAGE_EDITOR (editor), NULL);
+}
+
+static void
+gimp_symmetry_editor_set_image (GimpImageEditor *image_editor,
+                                GimpImage       *image)
+{
+  GtkListStore *store;
+  GtkTreeIter   iter;
+  GList        *syms;
+  GList        *sym_iter;
+  GimpSymmetry *symmetry;
+
+  GimpSymmetryEditor *editor = GIMP_SYMMETRY_EDITOR (image_editor);
+
+  if (image_editor->image)
+    {
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            G_CALLBACK (gimp_symmetry_editor_symmetry_notify),
+                                            editor);
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (image_editor, image);
+
+  /* Destroy the previous menu. */
+  if (editor->p->menu)
+    {
+      gtk_widget_destroy (editor->p->menu);
+      editor->p->menu = NULL;
+    }
+
+  store = gimp_int_store_new ();
+
+  /* The menu of available symmetries. */
+  syms = gimp_image_symmetry_list ();
+  for (sym_iter = syms; sym_iter; sym_iter = g_list_next (sym_iter))
+    {
+      GimpSymmetryClass *klass;
+      GType              type;
+
+      type = (GType) sym_iter->data;
+      klass = g_type_class_ref (type);
+
+      gtk_list_store_prepend (store, &iter);
+      gtk_list_store_set (store, &iter,
+                          GIMP_INT_STORE_LABEL,
+                          klass->label,
+                          GIMP_INT_STORE_USER_DATA,
+                          sym_iter->data,
+                          -1);
+      g_type_class_unref (klass);
+    }
+  g_list_free (syms);
+
+  gtk_list_store_prepend (store, &iter);
+  gtk_list_store_set (store, &iter,
+                      GIMP_INT_STORE_LABEL, _("None"),
+                      GIMP_INT_STORE_USER_DATA, GIMP_TYPE_SYMMETRY,
+                      -1);
+  if (image_editor->image)
+    editor->p->menu =
+      gimp_prop_pointer_combo_box_new (G_OBJECT (image_editor->image),
+                                       "symmetry",
+                                       GIMP_INT_STORE (store));
+  else
+    editor->p->menu =
+      gimp_int_combo_box_new (_("None"), 0,
+                              NULL);
+
+  g_object_unref (store);
+
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (editor->p->menu),
+                                _("Symmetry"));
+  g_object_set (editor->p->menu, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+
+  gtk_box_pack_start (GTK_BOX (editor), editor->p->menu,
+                      FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (editor), editor->p->menu, 0);
+
+  if (image_editor->image)
+    {
+      /* Connect to symmetry change. */
+      g_signal_connect (image_editor->image, "notify::symmetry",
+                        G_CALLBACK (gimp_symmetry_editor_symmetry_notify),
+                        editor);
+
+      /* Update the symmetry options. */
+      symmetry = gimp_image_get_active_symmetry (image_editor->image);
+      gimp_symmetry_editor_set_options (editor, symmetry);
+    }
+  else
+    {
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (editor->p->menu), 0);
+      gtk_widget_set_sensitive (editor->p->menu, FALSE);
+    }
+  gtk_widget_show (editor->p->menu);
+}
+
+static void
+gimp_symmetry_editor_symmetry_notify (GimpImage          *image,
+                                      GParamSpec         *pspec,
+                                      GimpSymmetryEditor *editor)
+{
+  GimpSymmetry *symmetry = NULL;
+
+  if (image)
+    {
+      symmetry = gimp_image_get_active_symmetry (image);
+
+      if (symmetry)
+        g_signal_connect (symmetry, "gui-param-changed",
+                          G_CALLBACK (gimp_symmetry_editor_symmetry_updated),
+                          editor);
+    }
+
+  gimp_symmetry_editor_set_options (editor, symmetry);
+}
+
+static void
+gimp_symmetry_editor_symmetry_updated (GimpSymmetry       *symmetry,
+                                       GimpImage          *image,
+                                       GimpSymmetryEditor *editor)
+{
+  if (image    != gimp_image_editor_get_image (GIMP_IMAGE_EDITOR (editor)) ||
+      symmetry != gimp_image_get_active_symmetry (image))
+    {
+      g_signal_handlers_disconnect_by_func (symmetry,
+                                            gimp_symmetry_editor_symmetry_updated,
+                                            editor);
+      return;
+    }
+
+  gimp_symmetry_editor_set_options (editor, symmetry);
+}
+
+static void
+gimp_symmetry_editor_set_options (GimpSymmetryEditor *editor,
+                                  GimpSymmetry       *symmetry)
+{
+  gtk_container_foreach (GTK_CONTAINER (editor->p->options_vbox),
+                         (GtkCallback) gtk_widget_destroy, NULL);
+
+  if (symmetry && G_TYPE_FROM_INSTANCE (symmetry) != GIMP_TYPE_SYMMETRY)
+    {
+      GimpImageEditor *image_editor = GIMP_IMAGE_EDITOR (editor);
+      GimpImage       *image        = image_editor->image;
+      GtkWidget       *gui;
+
+      gui = gimp_prop_gui_new (G_OBJECT (symmetry),
+                               GIMP_TYPE_SYMMETRY,
+                               GIMP_SYMMETRY_PARAM_GUI,
+                               GEGL_RECTANGLE (0, 0,
+                                               gimp_image_get_width  (image),
+                                               gimp_image_get_height (image)),
+                               GIMP_IMAGE_EDITOR (editor)->context,
+                               NULL, NULL, NULL);
+      gtk_box_pack_start (GTK_BOX (editor->p->options_vbox), gui,
+                          FALSE, FALSE, 0);
+      gtk_widget_show (gui);
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_symmetry_editor_new (GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_SYMMETRY_EDITOR,
+                       "menu-factory",    menu_factory,
+                       NULL);
+}
diff --git a/app/widgets/gimpsymmetryeditor.h b/app/widgets/gimpsymmetryeditor.h
new file mode 100644
index 0000000..f35122d
--- /dev/null
+++ b/app/widgets/gimpsymmetryeditor.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpsymmetryeditor.h
+ * Copyright (C) 2015 Jehan <jehan@girinstud.io>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_SYMMETRY_EDITOR_H__
+#define __GIMP_SYMMETRY_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_SYMMETRY_EDITOR            (gimp_symmetry_editor_get_type ())
+#define GIMP_SYMMETRY_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SYMMETRY_EDITOR, GimpSymmetryEditor))
+#define GIMP_SYMMETRY_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SYMMETRY_EDITOR, GimpSymmetryEditorClass))
+#define GIMP_IS_SYMMETRY_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SYMMETRY_EDITOR))
+#define GIMP_IS_SYMMETRY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_SYMMETRY_EDITOR))
+#define GIMP_SYMMETRY_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SYMMETRY_EDITOR, GimpSymmetryEditorClass))
+
+
+typedef struct _GimpSymmetryEditorPrivate  GimpSymmetryEditorPrivate;
+typedef struct _GimpSymmetryEditorClass    GimpSymmetryEditorClass;
+
+struct _GimpSymmetryEditor
+{
+  GimpImageEditor            parent_instance;
+
+  GimpSymmetryEditorPrivate *p;
+};
+
+struct _GimpSymmetryEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_symmetry_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_symmetry_editor_new      (GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_SYMMETRY_EDITOR_H__  */
diff --git a/app/widgets/gimptagentry.c b/app/widgets/gimptagentry.c
new file mode 100644
index 0000000..578899f
--- /dev/null
+++ b/app/widgets/gimptagentry.c
@@ -0,0 +1,2207 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagentry.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp-utils.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptag.h"
+#include "core/gimptagged.h"
+#include "core/gimptaggedcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimptagentry.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_TAG_ENTRY_QUERY_DESC       _("filter")
+#define GIMP_TAG_ENTRY_ASSIGN_DESC      _("enter tags")
+
+#define GIMP_TAG_ENTRY_MAX_RECENT_ITEMS 20
+
+
+typedef enum
+{
+  TAG_SEARCH_NONE,
+  TAG_SEARCH_LEFT,
+  TAG_SEARCH_RIGHT,
+} GimpTagSearchDir;
+
+enum
+{
+  PROP_0,
+  PROP_CONTAINER,
+  PROP_MODE
+};
+
+
+static void     gimp_tag_entry_dispose                   (GObject          *object);
+static void     gimp_tag_entry_set_property              (GObject          *object,
+                                                          guint             property_id,
+                                                          const GValue     *value,
+                                                          GParamSpec       *pspec);
+static void     gimp_tag_entry_get_property              (GObject          *object,
+                                                          guint             property_id,
+                                                          GValue           *value,
+                                                          GParamSpec       *pspec);
+static void     gimp_tag_entry_activate                  (GtkEntry         *entry);
+static void     gimp_tag_entry_changed                   (GtkEntry         *entry);
+static void     gimp_tag_entry_insert_text               (GtkEditable      *editable,
+                                                          gchar            *new_text,
+                                                          gint              text_length,
+                                                          gint             *position);
+static void     gimp_tag_entry_delete_text               (GtkEditable      *editable,
+                                                          gint              start_pos,
+                                                          gint              end_pos);
+static gboolean gimp_tag_entry_focus_in                  (GtkWidget        *widget,
+                                                          GdkEventFocus    *event);
+static gboolean gimp_tag_entry_focus_out                 (GtkWidget        *widget,
+                                                          GdkEventFocus    *event);
+static void     gimp_tag_entry_container_changed         (GimpContainer    *container,
+                                                          GimpObject       *object,
+                                                          GimpTagEntry     *entry);
+static gboolean gimp_tag_entry_button_release            (GtkWidget        *widget,
+                                                          GdkEventButton   *event);
+static gboolean gimp_tag_entry_key_press                 (GtkWidget        *widget,
+                                                          GdkEventKey      *event);
+static gboolean gimp_tag_entry_query_tag                 (GimpTagEntry     *entry);
+
+static void     gimp_tag_entry_assign_tags               (GimpTagEntry     *entry);
+static void     gimp_tag_entry_load_selection            (GimpTagEntry     *entry,
+                                                          gboolean          sort);
+static void     gimp_tag_entry_find_common_tags          (gpointer          key,
+                                                          gpointer          value,
+                                                          gpointer          user_data);
+
+static gchar *  gimp_tag_entry_get_completion_prefix     (GimpTagEntry     *entry);
+static GList *  gimp_tag_entry_get_completion_candidates (GimpTagEntry     *entry,
+                                                          gchar           **used_tags,
+                                                          gchar            *prefix);
+static gchar *  gimp_tag_entry_get_completion_string     (GimpTagEntry     *entry,
+                                                          GList            *candidates,
+                                                          gchar            *prefix);
+static gboolean gimp_tag_entry_auto_complete             (GimpTagEntry     *entry);
+
+static void     gimp_tag_entry_toggle_desc               (GimpTagEntry     *widget,
+                                                          gboolean          show);
+static gboolean gimp_tag_entry_expose                    (GtkWidget        *widget,
+                                                          GdkEventExpose   *event);
+static void     gimp_tag_entry_commit_region             (GString          *tags,
+                                                          GString          *mask);
+static void     gimp_tag_entry_commit_tags               (GimpTagEntry     *entry);
+static gboolean gimp_tag_entry_commit_source_func        (GimpTagEntry     *entry);
+static gboolean gimp_tag_entry_select_jellybean          (GimpTagEntry     *entry,
+                                                          gint              selection_start,
+                                                          gint              selection_end,
+                                                          GimpTagSearchDir  search_dir);
+static gboolean gimp_tag_entry_try_select_jellybean      (GimpTagEntry     *entry);
+
+static gboolean gimp_tag_entry_add_to_recent             (GimpTagEntry     *entry,
+                                                          const gchar      *tags_string,
+                                                          gboolean          to_front);
+
+static void     gimp_tag_entry_next_tag                  (GimpTagEntry     *entry,
+                                                          gboolean          select);
+static void     gimp_tag_entry_previous_tag              (GimpTagEntry     *entry,
+                                                          gboolean          select);
+
+static void     gimp_tag_entry_select_for_deletion       (GimpTagEntry     *entry,
+                                                          GimpTagSearchDir  search_dir);
+static gboolean gimp_tag_entry_strip_extra_whitespace    (GimpTagEntry     *entry);
+
+
+
+G_DEFINE_TYPE (GimpTagEntry, gimp_tag_entry, GTK_TYPE_ENTRY)
+
+#define parent_class gimp_tag_entry_parent_class
+
+
+static void
+gimp_tag_entry_class_init (GimpTagEntryClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose              = gimp_tag_entry_dispose;
+  object_class->get_property         = gimp_tag_entry_get_property;
+  object_class->set_property         = gimp_tag_entry_set_property;
+
+  widget_class->button_release_event = gimp_tag_entry_button_release;
+
+  g_object_class_install_property (object_class,
+                                   PROP_CONTAINER,
+                                   g_param_spec_object ("container",
+                                                        "Tagged container",
+                                                        "The Tagged container",
+                                                        GIMP_TYPE_TAGGED_CONTAINER,
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_MODE,
+                                   g_param_spec_enum ("mode",
+                                                      "Working mode",
+                                                      "Mode in which to work.",
+                                                      GIMP_TYPE_TAG_ENTRY_MODE,
+                                                      GIMP_TAG_ENTRY_MODE_QUERY,
+                                                      G_PARAM_CONSTRUCT_ONLY |
+                                                      G_PARAM_READWRITE));
+}
+
+static void
+gimp_tag_entry_init (GimpTagEntry *entry)
+{
+  entry->container            = NULL;
+  entry->selected_items       = NULL;
+  entry->common_tags          = NULL;
+  entry->tab_completion_index = -1;
+  entry->mode                 = GIMP_TAG_ENTRY_MODE_QUERY;
+  entry->description_shown    = FALSE;
+  entry->has_invalid_tags     = FALSE;
+  entry->mask                 = g_string_new ("");
+
+  g_signal_connect (entry, "activate",
+                    G_CALLBACK (gimp_tag_entry_activate),
+                    NULL);
+  g_signal_connect (entry, "changed",
+                    G_CALLBACK (gimp_tag_entry_changed),
+                    NULL);
+  g_signal_connect (entry, "insert-text",
+                    G_CALLBACK (gimp_tag_entry_insert_text),
+                    NULL);
+  g_signal_connect (entry, "delete-text",
+                    G_CALLBACK (gimp_tag_entry_delete_text),
+                    NULL);
+  g_signal_connect (entry, "key-press-event",
+                    G_CALLBACK (gimp_tag_entry_key_press),
+                    NULL);
+  g_signal_connect (entry, "focus-in-event",
+                    G_CALLBACK (gimp_tag_entry_focus_in),
+                    NULL);
+  g_signal_connect (entry, "focus-out-event",
+                    G_CALLBACK (gimp_tag_entry_focus_out),
+                    NULL);
+  g_signal_connect_after (entry, "expose-event",
+                          G_CALLBACK (gimp_tag_entry_expose),
+                          NULL);
+}
+
+static void
+gimp_tag_entry_dispose (GObject *object)
+{
+  GimpTagEntry *entry = GIMP_TAG_ENTRY (object);
+
+  g_clear_pointer (&entry->selected_items, g_list_free);
+
+  if (entry->common_tags)
+    {
+      g_list_free_full (entry->common_tags, (GDestroyNotify) g_object_unref);
+      entry->common_tags = NULL;
+    }
+
+  if (entry->recent_list)
+    {
+      g_list_free_full (entry->recent_list, (GDestroyNotify) g_free);
+      entry->recent_list = NULL;
+    }
+
+  if (entry->container)
+    {
+      g_signal_handlers_disconnect_by_func (entry->container,
+                                            gimp_tag_entry_container_changed,
+                                            entry);
+      g_clear_object (&entry->container);
+    }
+
+  if (entry->mask)
+    {
+      g_string_free (entry->mask, TRUE);
+      entry->mask = NULL;
+    }
+
+  if (entry->tag_query_idle_id)
+    {
+      g_source_remove (entry->tag_query_idle_id);
+      entry->tag_query_idle_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tag_entry_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpTagEntry *entry = GIMP_TAG_ENTRY (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTAINER:
+      entry->container = g_value_dup_object (value);
+      g_signal_connect (entry->container, "add",
+                        G_CALLBACK (gimp_tag_entry_container_changed),
+                        entry);
+      g_signal_connect (entry->container, "remove",
+                        G_CALLBACK (gimp_tag_entry_container_changed),
+                        entry);
+      break;
+
+    case PROP_MODE:
+      entry->mode = g_value_get_enum (value);
+      gimp_tag_entry_toggle_desc (entry, TRUE);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tag_entry_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpTagEntry *entry = GIMP_TAG_ENTRY (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTAINER:
+      g_value_set_object (value, entry->container);
+      break;
+
+    case PROP_MODE:
+      g_value_set_enum (value, entry->mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_tag_entry_new:
+ * @container: a #GimpTaggedContainer object
+ * @mode:      #GimpTagEntryMode to work in.
+ *
+ * #GimpTagEntry is a widget which can query and assign tags to tagged objects.
+ * When operating in query mode, @container is kept up to date with
+ * tags selected. When operating in assignment mode, tags are assigned to
+ * objects selected and visible in @container.
+ *
+ * Return value: a new GimpTagEntry widget.
+ **/
+GtkWidget *
+gimp_tag_entry_new (GimpTaggedContainer *container,
+                    GimpTagEntryMode     mode)
+{
+  g_return_val_if_fail (GIMP_IS_TAGGED_CONTAINER (container), NULL);
+
+  return g_object_new (GIMP_TYPE_TAG_ENTRY,
+                       "container", container,
+                       "mode",      mode,
+                       NULL);
+}
+
+static void
+gimp_tag_entry_activate (GtkEntry *entry)
+{
+  GimpTagEntry *tag_entry = GIMP_TAG_ENTRY (entry);
+  gint          selection_start;
+  gint          selection_end;
+  GList        *list;
+
+  gimp_tag_entry_toggle_desc (tag_entry, FALSE);
+
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                     &selection_start, &selection_end);
+  if (selection_start != selection_end)
+    {
+      gtk_editable_select_region (GTK_EDITABLE (entry),
+                                  selection_end, selection_end);
+    }
+
+  for (list = tag_entry->selected_items; list; list = g_list_next (list))
+    {
+      if (gimp_container_have (GIMP_CONTAINER (tag_entry->container),
+                               GIMP_OBJECT (list->data)))
+        {
+          break;
+        }
+    }
+
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN && list)
+    {
+      gimp_tag_entry_assign_tags (GIMP_TAG_ENTRY (entry));
+    }
+}
+
+/**
+ * gimp_tag_entry_set_tag_string:
+ * @entry:      a #GimpTagEntry object.
+ * @tag_string: string of tags, separated by any terminal punctuation
+ *              character.
+ *
+ * Sets tags from @tag_string to @tag_entry. Given tags do not need to
+ * be valid as they can be fixed or dropped automatically. Depending on
+ * selected #GimpTagEntryMode, appropriate action is performed.
+ **/
+void
+gimp_tag_entry_set_tag_string (GimpTagEntry *entry,
+                               const gchar  *tag_string)
+{
+  g_return_if_fail (GIMP_IS_TAG_ENTRY (entry));
+
+  entry->internal_operation++;
+  entry->suppress_tag_query++;
+
+  gtk_entry_set_text (GTK_ENTRY (entry), tag_string);
+  gtk_editable_set_position (GTK_EDITABLE (entry), -1);
+
+  entry->suppress_tag_query--;
+  entry->internal_operation--;
+
+  gimp_tag_entry_commit_tags (entry);
+
+  if (entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN)
+    {
+      gimp_tag_entry_assign_tags (entry);
+    }
+  else if (entry->mode == GIMP_TAG_ENTRY_MODE_QUERY)
+    {
+      gimp_tag_entry_query_tag (entry);
+    }
+}
+
+static void
+gimp_tag_entry_changed (GtkEntry *entry)
+{
+  GimpTagEntry *tag_entry = GIMP_TAG_ENTRY (entry);
+  gchar        *text;
+
+  text = g_strdup (gtk_entry_get_text (entry));
+  text = g_strstrip (text);
+
+  if (! gtk_widget_has_focus (GTK_WIDGET (entry)) &&
+      strlen (text) == 0)
+    {
+      gimp_tag_entry_toggle_desc (tag_entry, TRUE);
+    }
+  else
+    {
+      gimp_tag_entry_toggle_desc (tag_entry, FALSE);
+    }
+
+  g_free (text);
+
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_QUERY &&
+      ! tag_entry->suppress_tag_query              &&
+      ! tag_entry->tag_query_idle_id)
+    {
+      tag_entry->tag_query_idle_id =
+        g_idle_add ((GSourceFunc) gimp_tag_entry_query_tag, entry);
+    }
+}
+
+static void
+gimp_tag_entry_insert_text (GtkEditable *editable,
+                            gchar       *new_text,
+                            gint         text_length,
+                            gint        *position)
+{
+  GimpTagEntry *entry = GIMP_TAG_ENTRY (editable);
+  gboolean      is_tag[2];
+  gint          i;
+  gint          insert_pos = *position;
+  glong         num_chars;
+
+  num_chars = g_utf8_strlen (new_text, text_length);
+
+  if (! entry->internal_operation)
+    {
+      /* suppress tag queries until auto completion runs */
+      entry->suppress_tag_query++;
+    }
+
+  is_tag[0] = FALSE;
+  if (*position > 0)
+    {
+      is_tag[0] = (entry->mask->str[*position - 1] == 't' ||
+                   entry->mask->str[*position - 1] == 's');
+    }
+
+  is_tag[1] = (entry->mask->str[*position] == 't' ||
+               entry->mask->str[*position] == 's');
+
+  if (is_tag[0] && is_tag[1])
+    {
+      g_signal_stop_emission_by_name (editable, "insert-text");
+    }
+  else if (num_chars > 0)
+    {
+      gunichar  c = g_utf8_get_char (new_text);
+
+      if (! entry->internal_operation            &&
+          *position > 0                          &&
+          entry->mask->str[*position - 1] == 's' &&
+          ! g_unichar_isspace (c))
+        {
+          if (! entry->suppress_mask_update)
+            {
+              g_string_insert_c (entry->mask, *position, 'u');
+            }
+
+          g_signal_handlers_block_by_func (editable,
+                                           gimp_tag_entry_insert_text,
+                                           NULL);
+
+          gtk_editable_insert_text (editable, " ", 1, position);
+          gtk_editable_insert_text (editable, new_text, text_length, position);
+
+          g_signal_handlers_unblock_by_func (editable,
+                                             gimp_tag_entry_insert_text,
+                                             NULL);
+
+          g_signal_stop_emission_by_name (editable, "insert-text");
+        }
+      else if (! entry->internal_operation        &&
+               num_chars == 1                     &&
+               *position < entry->mask->len       &&
+               entry->mask->str[*position] == 't' &&
+               ! g_unichar_isspace (c))
+        {
+          if (! entry->suppress_mask_update)
+            {
+              g_string_insert_c (entry->mask, *position, 'u');
+            }
+
+          g_signal_handlers_block_by_func (editable,
+                                           gimp_tag_entry_insert_text,
+                                           NULL);
+
+          gtk_editable_insert_text (editable, new_text, text_length, position);
+          gtk_editable_insert_text (editable, " ", 1, position);
+          (*position)--;
+
+          g_signal_handlers_unblock_by_func (editable,
+                                             gimp_tag_entry_insert_text,
+                                             NULL);
+
+          g_signal_stop_emission_by_name (editable, "insert-text");
+        }
+
+      if (! entry->suppress_mask_update)
+        {
+          for (i = 0; i < num_chars; i++)
+            {
+              g_string_insert_c (entry->mask, insert_pos + i, 'u');
+            }
+        }
+    }
+
+  if (! entry->internal_operation)
+    {
+      entry->tab_completion_index = -1;
+      g_idle_add ((GSourceFunc) gimp_tag_entry_auto_complete, editable);
+    }
+}
+
+static void
+gimp_tag_entry_delete_text (GtkEditable *editable,
+                            gint         start_pos,
+                            gint         end_pos)
+{
+  GimpTagEntry *entry = GIMP_TAG_ENTRY (editable);
+
+  if (! entry->internal_operation)
+    {
+      g_signal_handlers_block_by_func (editable,
+                                       gimp_tag_entry_delete_text,
+                                       NULL);
+
+      if (end_pos > start_pos &&
+          (entry->mask->str[end_pos - 1] == 't' ||
+           entry->mask->str[end_pos - 1] == 's'))
+        {
+          while (end_pos <= entry->mask->len &&
+                 (entry->mask->str[end_pos] == 's'))
+            {
+              end_pos++;
+            }
+        }
+
+      gtk_editable_delete_text (editable, start_pos, end_pos);
+      if (! entry->suppress_mask_update)
+        {
+          g_string_erase (entry->mask, start_pos, end_pos - start_pos);
+        }
+
+      g_signal_handlers_unblock_by_func (editable,
+                                         gimp_tag_entry_delete_text,
+                                         NULL);
+
+      g_signal_stop_emission_by_name (editable, "delete-text");
+    }
+  else
+    {
+      if (! entry->suppress_mask_update)
+        {
+          g_string_erase (entry->mask, start_pos, end_pos - start_pos);
+        }
+    }
+}
+
+static gboolean
+gimp_tag_entry_query_tag (GimpTagEntry *entry)
+{
+  gchar    **parsed_tags;
+  gint       count;
+  gint       i;
+  GList     *query_list = NULL;
+  gboolean   has_invalid_tags;
+
+  entry->tag_query_idle_id = 0;
+
+  if (entry->suppress_tag_query)
+    return FALSE;
+
+  has_invalid_tags = FALSE;
+
+  parsed_tags = gimp_tag_entry_parse_tags (entry);
+  count = g_strv_length (parsed_tags);
+  for (i = 0; i < count; i++)
+    {
+      if (strlen (parsed_tags[i]) > 0)
+        {
+          GimpTag *tag = gimp_tag_try_new (parsed_tags[i]);
+
+          if (! tag)
+            has_invalid_tags = TRUE;
+
+          query_list = g_list_append (query_list, tag);
+        }
+    }
+  g_strfreev (parsed_tags);
+
+  gimp_tagged_container_set_filter (GIMP_TAGGED_CONTAINER (entry->container),
+                                    query_list);
+
+  g_list_free_full (query_list, (GDestroyNotify) gimp_tag_or_null_unref);
+
+  if (has_invalid_tags != entry->has_invalid_tags)
+    {
+      entry->has_invalid_tags = has_invalid_tags;
+      gtk_widget_queue_draw (GTK_WIDGET (entry));
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_entry_auto_complete (GimpTagEntry *tag_entry)
+{
+  GtkEntry  *entry = GTK_ENTRY (tag_entry);
+  gchar     *completion_prefix;
+  GList     *completion_candidates;
+  gint       candidate_count = 0;
+  gchar    **tags;
+  gchar     *completion;
+  gint       start_position;
+  gint       end_position;
+
+  tag_entry->suppress_tag_query--;
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_QUERY)
+    {
+      /* tag query was suppressed until we got to auto completion (here),
+       * now queue tag query
+       */
+      tag_entry->tag_query_idle_id =
+        g_idle_add ((GSourceFunc) gimp_tag_entry_query_tag, tag_entry);
+    }
+
+  if (tag_entry->tab_completion_index >= 0)
+    {
+      tag_entry->internal_operation++;
+      tag_entry->suppress_tag_query++;
+      gtk_editable_delete_selection (GTK_EDITABLE (tag_entry));
+      tag_entry->suppress_tag_query--;
+      tag_entry->internal_operation--;
+    }
+
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (tag_entry),
+                                     &start_position, &end_position);
+  if (start_position != end_position)
+    {
+      /* only autocomplete what user types,
+       * not was autocompleted in the previous step.
+       */
+      return FALSE;
+    }
+
+  completion_prefix =
+    gimp_tag_entry_get_completion_prefix (GIMP_TAG_ENTRY (entry));
+  tags = gimp_tag_entry_parse_tags (GIMP_TAG_ENTRY (entry));
+  completion_candidates =
+    gimp_tag_entry_get_completion_candidates (GIMP_TAG_ENTRY (entry),
+                                              tags,
+                                              completion_prefix);
+  completion_candidates = g_list_sort (completion_candidates,
+                                       gimp_tag_compare_func);
+
+  if (tag_entry->tab_completion_index >= 0 && completion_candidates)
+    {
+      GimpTag *the_chosen_one;
+
+      candidate_count = g_list_length (completion_candidates);
+      tag_entry->tab_completion_index %= candidate_count;
+      the_chosen_one = g_list_nth_data (completion_candidates,
+                                        tag_entry->tab_completion_index);
+      g_list_free (completion_candidates);
+      completion_candidates = NULL;
+      completion_candidates = g_list_append (completion_candidates,
+                                             the_chosen_one);
+    }
+
+  completion = gimp_tag_entry_get_completion_string (GIMP_TAG_ENTRY (entry),
+                                                     completion_candidates,
+                                                     completion_prefix);
+
+  if (completion && strlen (completion) > 0)
+    {
+      start_position = gtk_editable_get_position (GTK_EDITABLE (entry));
+      end_position = start_position;
+      tag_entry->internal_operation++;
+      gtk_editable_insert_text (GTK_EDITABLE (entry),
+                                completion, strlen (completion),
+                                &end_position);
+      tag_entry->internal_operation--;
+      if (tag_entry->tab_completion_index >= 0 &&
+          candidate_count == 1)
+        {
+          gtk_editable_set_position (GTK_EDITABLE (entry), end_position);
+        }
+      else
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      start_position, end_position);
+        }
+    }
+
+  g_free (completion);
+  g_strfreev (tags);
+  g_list_free (completion_candidates);
+  g_free (completion_prefix);
+
+  return FALSE;
+}
+
+static void
+gimp_tag_entry_assign_tags (GimpTagEntry *tag_entry)
+{
+  gchar **parsed_tags;
+  gint    count;
+  gint    i;
+  GList  *resource_iter;
+  GList  *tag_iter;
+  GList  *selected_items;
+  GList  *dont_remove_list = NULL;
+  GList  *remove_list      = NULL;
+  GList  *add_list         = NULL;
+  GList  *common_tags      = NULL;
+
+  parsed_tags = gimp_tag_entry_parse_tags (tag_entry);
+
+  count = g_strv_length (parsed_tags);
+  for (i = 0; i < count; i++)
+    {
+      GimpTag *tag = gimp_tag_new (parsed_tags[i]);
+
+      if (tag)
+        {
+          if (g_list_find_custom (tag_entry->common_tags, tag,
+                                  gimp_tag_compare_func))
+            {
+              dont_remove_list = g_list_prepend (dont_remove_list, tag);
+            }
+          else
+            {
+              add_list = g_list_prepend (add_list, g_object_ref (tag));
+            }
+
+          common_tags = g_list_prepend (common_tags, tag);
+        }
+    }
+
+  g_strfreev (parsed_tags);
+
+  /* find common tags which were removed. */
+  for (tag_iter = tag_entry->common_tags;
+       tag_iter;
+       tag_iter = g_list_next (tag_iter))
+    {
+      if (! g_list_find_custom (dont_remove_list, tag_iter->data,
+                                gimp_tag_compare_func))
+        {
+          remove_list = g_list_prepend (remove_list,
+                                        g_object_ref (tag_iter->data));
+        }
+    }
+
+  g_list_free (dont_remove_list);
+
+  /* duplicate tag_entry->selected_items for the add/remove loop
+   * because adding/removing can change tag_entry->selected_items.
+   * See Issue #2227.
+   */
+  selected_items = g_list_copy_deep (tag_entry->selected_items,
+                                     (GCopyFunc) g_object_ref, NULL);
+
+  for (resource_iter = selected_items;
+       resource_iter;
+       resource_iter = g_list_next (resource_iter))
+    {
+      GimpTagged *tagged = GIMP_TAGGED (resource_iter->data);
+
+      for (tag_iter = remove_list; tag_iter; tag_iter = g_list_next (tag_iter))
+        {
+          gimp_tagged_remove_tag (tagged, tag_iter->data);
+        }
+
+      for (tag_iter = add_list; tag_iter; tag_iter = g_list_next (tag_iter))
+        {
+          gimp_tagged_add_tag (tagged, tag_iter->data);
+        }
+    }
+
+  g_list_free_full (selected_items, (GDestroyNotify) g_object_unref);
+
+  g_list_free_full (add_list,    (GDestroyNotify) g_object_unref);
+  g_list_free_full (remove_list, (GDestroyNotify) g_object_unref);
+
+  /* common tags list with changes applied. */
+  g_list_free_full (tag_entry->common_tags, (GDestroyNotify) g_object_unref);
+  tag_entry->common_tags = common_tags;
+}
+
+/**
+ * gimp_tag_entry_parse_tags:
+ * @entry: a #GimpTagEntry widget.
+ *
+ * Parses currently entered tags from @entry. Tags do not need to be
+ * valid as they are fixed when necessary. Only valid tags are
+ * returned.
+ *
+ * Return value: a newly allocated NULL terminated list of strings. It
+ *               should be freed using g_strfreev().
+ **/
+gchar **
+gimp_tag_entry_parse_tags (GimpTagEntry *entry)
+{
+  gchar       **parsed_tags;
+  gint          length;
+  gint          i;
+  GString      *parsed_tag;
+  const gchar  *cursor;
+  GList        *tag_list = NULL;
+  GList        *iterator;
+  gunichar      c;
+
+  g_return_val_if_fail (GIMP_IS_TAG_ENTRY (entry), NULL);
+
+  parsed_tag = g_string_new ("");
+  cursor = gtk_entry_get_text (GTK_ENTRY (entry));
+  do
+    {
+      c = g_utf8_get_char (cursor);
+      cursor = g_utf8_next_char (cursor);
+
+      if (! c || gimp_tag_is_tag_separator (c))
+        {
+          if (parsed_tag->len > 0)
+            {
+              gchar *validated_tag = gimp_tag_string_make_valid (parsed_tag->str);
+
+              if (validated_tag)
+                {
+                  tag_list = g_list_append (tag_list, validated_tag);
+                }
+
+              g_string_set_size (parsed_tag, 0);
+            }
+        }
+      else
+        {
+          g_string_append_unichar (parsed_tag, c);
+        }
+    }
+  while (c);
+
+  g_string_free (parsed_tag, TRUE);
+
+  length = g_list_length (tag_list);
+  parsed_tags = g_malloc ((length + 1) * sizeof (gchar **));
+  iterator = tag_list;
+  for (i = 0; i < length; i++)
+    {
+      parsed_tags[i] = (gchar *) iterator->data;
+
+      iterator = g_list_next (iterator);
+    }
+  parsed_tags[length] = NULL;
+
+  g_list_free (tag_list);
+
+  return parsed_tags;
+}
+
+/**
+ * gimp_tag_entry_set_selected_items:
+ * @tag_entry:  a #GimpTagEntry widget.
+ * @items:      a list of #GimpTagged objects.
+ *
+ * Set list of currently selected #GimpTagged objects. Only selected and
+ * visible (not filtered out) #GimpTagged objects are assigned tags when
+ * operating in tag assignment mode.
+ **/
+void
+gimp_tag_entry_set_selected_items (GimpTagEntry *tag_entry,
+                                   GList        *items)
+{
+  g_return_if_fail (GIMP_IS_TAG_ENTRY (tag_entry));
+
+  if (tag_entry->selected_items)
+    {
+      g_list_free (tag_entry->selected_items);
+      tag_entry->selected_items = NULL;
+    }
+
+  if (tag_entry->common_tags)
+    {
+      g_list_free_full (tag_entry->common_tags, (GDestroyNotify) g_object_unref);
+      tag_entry->common_tags = NULL;
+    }
+
+  tag_entry->selected_items = g_list_copy (items);
+
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN)
+    {
+      gimp_tag_entry_load_selection (tag_entry, TRUE);
+    }
+}
+
+static void
+gimp_tag_entry_load_selection (GimpTagEntry *tag_entry,
+                               gboolean      sort)
+{
+  GList      *list;
+  gint        insert_pos;
+  GHashTable *refcounts;
+  GList      *resource;
+  GList      *tag;
+
+  tag_entry->internal_operation++;
+  gtk_editable_delete_text (GTK_EDITABLE (tag_entry), 0, -1);
+  tag_entry->internal_operation--;
+
+  if (! tag_entry->selected_items)
+    {
+      gimp_tag_entry_toggle_desc (tag_entry, FALSE);
+      return;
+    }
+
+  refcounts = g_hash_table_new ((GHashFunc) gimp_tag_get_hash,
+                                (GEqualFunc) gimp_tag_equals);
+
+  /* find set of tags common to all resources. */
+  for (resource = tag_entry->selected_items;
+       resource;
+       resource = g_list_next (resource))
+    {
+      for (tag = gimp_tagged_get_tags (GIMP_TAGGED (resource->data));
+           tag;
+           tag = g_list_next (tag))
+        {
+          /* count refcount for each tag */
+          guint refcount = GPOINTER_TO_UINT (g_hash_table_lookup (refcounts,
+                                                                  tag->data));
+
+          g_hash_table_insert (refcounts, tag->data,
+                               GUINT_TO_POINTER (refcount + 1));
+        }
+    }
+
+  g_hash_table_foreach (refcounts, gimp_tag_entry_find_common_tags, tag_entry);
+
+  g_hash_table_destroy (refcounts);
+
+  tag_entry->common_tags = g_list_sort (tag_entry->common_tags,
+                                        gimp_tag_compare_func);
+
+  insert_pos = gtk_editable_get_position (GTK_EDITABLE (tag_entry));
+
+  for (list = tag_entry->common_tags; list; list = g_list_next (list))
+    {
+      GimpTag *tag = list->data;
+      gchar   *text;
+
+      text = g_strdup_printf ("%s%s ",
+                              gimp_tag_get_name (tag),
+                              gimp_tag_entry_get_separator ());
+
+      tag_entry->internal_operation++;
+      gtk_editable_insert_text (GTK_EDITABLE (tag_entry), text, strlen (text),
+                                &insert_pos);
+      tag_entry->internal_operation--;
+
+      g_free (text);
+    }
+
+  gimp_tag_entry_commit_tags (tag_entry);
+}
+
+static void
+gimp_tag_entry_find_common_tags (gpointer key,
+                                 gpointer value,
+                                 gpointer user_data)
+{
+  guint         ref_count = GPOINTER_TO_UINT (value);
+  GimpTagEntry *tag_entry = GIMP_TAG_ENTRY (user_data);
+
+  /* FIXME: more efficient list length */
+  if (ref_count == g_list_length (tag_entry->selected_items))
+    {
+      tag_entry->common_tags = g_list_prepend (tag_entry->common_tags,
+                                               g_object_ref (key));
+    }
+}
+
+static gchar *
+gimp_tag_entry_get_completion_prefix (GimpTagEntry *entry)
+{
+  gchar *original_string;
+  gchar *prefix_start;
+  gchar *prefix;
+  gchar *cursor;
+  gint   position;
+  gint   i;
+
+  position = gtk_editable_get_position (GTK_EDITABLE (entry));
+  if (position < 1 ||
+      entry->mask->str[position - 1] != 'u')
+    {
+      return g_strdup ("");
+    }
+
+  original_string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+  cursor = original_string;
+  prefix_start = original_string;
+  for (i = 0; i < position; i++)
+    {
+      gunichar c;
+
+      c = g_utf8_get_char (cursor);
+      cursor = g_utf8_next_char (cursor);
+
+      if (gimp_tag_is_tag_separator (c))
+        prefix_start = cursor;
+    }
+  *cursor = '\0';
+
+  prefix = g_strdup (g_strchug (prefix_start));
+  g_free (original_string);
+
+  return prefix;
+}
+
+static GList *
+gimp_tag_entry_get_completion_candidates (GimpTagEntry  *tag_entry,
+                                          gchar        **used_tags,
+                                          gchar         *src_prefix)
+{
+  GList *candidates = NULL;
+  GList *all_tags;
+  GList *list;
+  gint   length;
+  gchar *prefix;
+
+  if (! src_prefix || strlen (src_prefix) < 1)
+    return NULL;
+
+  prefix = g_utf8_normalize (src_prefix, -1, G_NORMALIZE_ALL);
+  if (! prefix)
+    return NULL;
+
+  all_tags = g_hash_table_get_keys (tag_entry->container->tag_ref_counts);
+  length = g_strv_length (used_tags);
+
+  for (list = all_tags; list; list = g_list_next (list))
+    {
+      GimpTag *tag = list->data;
+
+      if (gimp_tag_has_prefix (tag, prefix))
+        {
+          gint i;
+
+          /* check if tag is not already entered */
+          for (i = 0; i < length; i++)
+            {
+              if (! gimp_tag_compare_with_string (tag, used_tags[i]))
+                break;
+            }
+
+          if (i == length)
+            candidates = g_list_append (candidates, list->data);
+        }
+    }
+
+  g_list_free (all_tags);
+
+  g_free (prefix);
+
+  return candidates;
+}
+
+static gchar *
+gimp_tag_entry_get_completion_string (GimpTagEntry *tag_entry,
+                                      GList        *candidates,
+                                      gchar        *prefix)
+{
+  const gchar **completions;
+  guint         length;
+  guint         i;
+  GList        *candidate_iterator;
+  const gchar  *candidate_string;
+  gint          prefix_length;
+  gunichar      c;
+  gint          num_chars_match;
+  gchar        *completion;
+  gchar        *completion_end;
+  gint          completion_length;
+  gchar        *normalized_prefix;
+
+  if (! candidates)
+    return NULL;
+
+  normalized_prefix = g_utf8_normalize (prefix, -1, G_NORMALIZE_ALL);
+  if (! normalized_prefix)
+    return NULL;
+
+  prefix_length = strlen (normalized_prefix);
+  g_free (normalized_prefix);
+
+  length = g_list_length (candidates);
+  if (length < 2)
+    {
+      candidate_string = gimp_tag_get_name (GIMP_TAG (candidates->data));
+      return g_strdup (candidate_string + prefix_length);
+    }
+
+  completions = g_malloc (length * sizeof (gchar*));
+  candidate_iterator = candidates;
+  for (i = 0; i < length; i++)
+    {
+      candidate_string = gimp_tag_get_name (GIMP_TAG (candidate_iterator->data));
+      completions[i] = candidate_string + prefix_length;
+      candidate_iterator = g_list_next (candidate_iterator);
+    }
+
+  num_chars_match = 0;
+  do
+    {
+      c = g_utf8_get_char (completions[0]);
+      if (! c)
+        break;
+
+      for (i = 1; i < length; i++)
+        {
+          gunichar d = g_utf8_get_char (completions[i]);
+
+          if (c != d)
+            {
+              candidate_string = gimp_tag_get_name (GIMP_TAG (candidates->data));
+              candidate_string += prefix_length;
+              completion_end = g_utf8_offset_to_pointer (candidate_string,
+                                                         num_chars_match);
+              completion_length = completion_end - candidate_string;
+              completion = g_malloc (completion_length + 1);
+              memcpy (completion, candidate_string, completion_length);
+              completion[completion_length] = '\0';
+
+              g_free (completions);
+
+              return completion;
+            }
+
+          completions[i] = g_utf8_next_char (completions[i]);
+        }
+
+      completions[0] = g_utf8_next_char (completions[0]);
+      num_chars_match++;
+    }
+  while (c);
+
+  g_free (completions);
+
+  candidate_string = gimp_tag_get_name (GIMP_TAG (candidates->data));
+
+  return g_strdup (candidate_string + prefix_length);
+}
+
+static gboolean
+gimp_tag_entry_focus_in (GtkWidget     *widget,
+                         GdkEventFocus *event)
+{
+  gimp_tag_entry_toggle_desc (GIMP_TAG_ENTRY (widget), FALSE);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_entry_focus_out (GtkWidget     *widget,
+                          GdkEventFocus *event)
+{
+  GimpTagEntry  *tag_entry = GIMP_TAG_ENTRY (widget);
+
+  gimp_tag_entry_commit_tags (tag_entry);
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN)
+    {
+      gimp_tag_entry_assign_tags (GIMP_TAG_ENTRY (widget));
+    }
+
+  gimp_tag_entry_add_to_recent (tag_entry,
+                                gtk_entry_get_text (GTK_ENTRY (widget)),
+                                TRUE);
+
+  gimp_tag_entry_toggle_desc (tag_entry, TRUE);
+
+  return FALSE;
+}
+
+static void
+gimp_tag_entry_container_changed (GimpContainer *container,
+                                  GimpObject    *object,
+                                  GimpTagEntry  *tag_entry)
+{
+  GList *list;
+
+  if (! gimp_container_have (GIMP_CONTAINER (tag_entry->container),
+                             object))
+    {
+      GList *selected_items = NULL;
+
+      for (list = tag_entry->selected_items; list; list = g_list_next (list))
+        {
+          if (list->data != object)
+            selected_items = g_list_prepend (selected_items, list->data);
+        }
+
+      selected_items = g_list_reverse (selected_items);
+      gimp_tag_entry_set_selected_items (tag_entry, selected_items);
+      g_list_free (selected_items);
+    }
+
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN)
+    {
+      for (list = tag_entry->selected_items; list; list = g_list_next (list))
+        {
+          if (gimp_tagged_get_tags (GIMP_TAGGED (list->data)) &&
+              gimp_container_have (GIMP_CONTAINER (tag_entry->container),
+                                   GIMP_OBJECT (list->data)))
+            {
+              break;
+            }
+        }
+
+      if (! list)
+        {
+          tag_entry->internal_operation++;
+          gtk_editable_delete_text (GTK_EDITABLE (tag_entry), 0, -1);
+          tag_entry->internal_operation--;
+        }
+    }
+}
+
+static void
+gimp_tag_entry_toggle_desc (GimpTagEntry *tag_entry,
+                            gboolean      show)
+{
+  GtkWidget *widget = GTK_WIDGET (tag_entry);
+
+  if (! (show ^ tag_entry->description_shown))
+    return;
+
+  if (show)
+    {
+      gchar  *current_text;
+      size_t  len;
+
+      current_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (tag_entry)));
+      current_text = g_strstrip (current_text);
+      len = strlen (current_text);
+      g_free (current_text);
+
+      if (len > 0)
+        {
+          return;
+        }
+
+      tag_entry->description_shown = TRUE;
+      gtk_widget_queue_draw (widget);
+    }
+  else
+    {
+      tag_entry->description_shown = FALSE;
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+static gboolean
+gimp_tag_entry_expose (GtkWidget      *widget,
+                       GdkEventExpose *event)
+{
+  GimpTagEntry   *tag_entry = GIMP_TAG_ENTRY (widget);
+  PangoLayout    *layout;
+  PangoAttrList  *attr_list;
+  PangoAttribute *attribute;
+  gint            layout_width;
+  gint            layout_height;
+  gint            window_width;
+  gint            window_height;
+  gint            offset;
+  const char     *display_text;
+
+  /* eeeeeek */
+  if (event->window != gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    return FALSE;
+
+  if (! GIMP_TAG_ENTRY (widget)->description_shown)
+    return FALSE;
+
+  if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_QUERY)
+    {
+      display_text = GIMP_TAG_ENTRY_QUERY_DESC;
+    }
+  else
+    {
+      display_text = GIMP_TAG_ENTRY_ASSIGN_DESC;
+    }
+
+  layout = gtk_widget_create_pango_layout (widget, display_text);
+
+  attr_list = pango_attr_list_new ();
+  attribute = pango_attr_style_new (PANGO_STYLE_ITALIC);
+  pango_attr_list_insert (attr_list, attribute);
+
+  pango_layout_set_attributes (layout, attr_list);
+  pango_attr_list_unref (attr_list);
+
+  window_width  = gdk_window_get_width (event->window);
+  window_height = gdk_window_get_height (event->window);
+  pango_layout_get_size (layout,
+                         &layout_width, &layout_height);
+  offset = (window_height - PANGO_PIXELS (layout_height)) / 2;
+
+  gtk_paint_layout (gtk_widget_get_style (widget),
+                    event->window,
+                    GTK_STATE_INSENSITIVE,
+                    TRUE,
+                    &event->area,
+                    widget,
+                    NULL,
+                    (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
+                    window_width - PANGO_PIXELS (layout_width) - offset :
+                    offset,
+                    offset,
+                    layout);
+
+  g_object_unref (layout);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_entry_key_press (GtkWidget   *widget,
+                          GdkEventKey *event)
+{
+  GimpTagEntry    *entry = GIMP_TAG_ENTRY (widget);
+  GdkModifierType  extend_mask;
+  guchar           c;
+
+  extend_mask =
+    gtk_widget_get_modifier_mask (widget,
+                                  GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+
+  c = gdk_keyval_to_unicode (event->keyval);
+  if (gimp_tag_is_tag_separator (c))
+    {
+      g_idle_add ((GSourceFunc) gimp_tag_entry_commit_source_func, entry);
+      return FALSE;
+    }
+
+  switch (event->keyval)
+    {
+    case GDK_KEY_Tab:
+    case GDK_KEY_KP_Tab:
+    case GDK_KEY_ISO_Left_Tab:
+      /*  allow to leave the widget with Ctrl+Tab  */
+      if (! (event->state & GDK_CONTROL_MASK))
+        {
+          entry->tab_completion_index++;
+          entry->suppress_tag_query++;
+          g_idle_add ((GSourceFunc) gimp_tag_entry_auto_complete, entry);
+        }
+      else
+        {
+          gimp_tag_entry_commit_tags (entry);
+          g_signal_emit_by_name (widget, "move-focus",
+                                 (event->state & GDK_SHIFT_MASK) ?
+                                 GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD);
+        }
+      return TRUE;
+
+    case GDK_KEY_Return:
+      gimp_tag_entry_commit_tags (entry);
+      break;
+
+    case GDK_KEY_Left:
+      gimp_tag_entry_previous_tag (entry,
+                                   (event->state & extend_mask) ? TRUE : FALSE);
+      return TRUE;
+
+    case GDK_KEY_Right:
+      gimp_tag_entry_next_tag (entry,
+                               (event->state & extend_mask) ? TRUE : FALSE);
+      return TRUE;
+
+    case GDK_KEY_BackSpace:
+      {
+        gint selection_start;
+        gint selection_end;
+
+        gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                           &selection_start, &selection_end);
+        if (gimp_tag_entry_select_jellybean (entry,
+                                             selection_start, selection_end,
+                                             TAG_SEARCH_LEFT))
+          {
+            return TRUE;
+          }
+        else
+          {
+            gimp_tag_entry_select_for_deletion (entry, TAG_SEARCH_LEFT);
+            /* FIXME: need to remove idle handler in dispose */
+            g_idle_add ((GSourceFunc) gimp_tag_entry_strip_extra_whitespace,
+                        entry);
+          }
+      }
+      break;
+
+    case GDK_KEY_Delete:
+      {
+        gint selection_start;
+        gint selection_end;
+
+        gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                           &selection_start, &selection_end);
+        if (gimp_tag_entry_select_jellybean (entry,
+                                             selection_start, selection_end,
+                                             TAG_SEARCH_RIGHT))
+          {
+            return TRUE;
+          }
+        else
+          {
+            gimp_tag_entry_select_for_deletion (entry, TAG_SEARCH_RIGHT);
+            /* FIXME: need to remove idle handler in dispose */
+            g_idle_add ((GSourceFunc) gimp_tag_entry_strip_extra_whitespace,
+                        entry);
+          }
+      }
+      break;
+
+    case GDK_KEY_Up:
+    case GDK_KEY_Down:
+      if (entry->recent_list != NULL)
+        {
+          gchar *recent_item;
+          gchar *very_recent_item;
+
+          very_recent_item = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+          gimp_tag_entry_add_to_recent (entry, very_recent_item, TRUE);
+          g_free (very_recent_item);
+
+          if (event->keyval == GDK_KEY_Up)
+            {
+              recent_item = (gchar *) g_list_first (entry->recent_list)->data;
+              entry->recent_list = g_list_remove (entry->recent_list, recent_item);
+              entry->recent_list = g_list_append (entry->recent_list, recent_item);
+            }
+          else
+            {
+              recent_item = (gchar *) g_list_last (entry->recent_list)->data;
+              entry->recent_list = g_list_remove (entry->recent_list, recent_item);
+              entry->recent_list = g_list_prepend (entry->recent_list, recent_item);
+            }
+
+          recent_item = (gchar *) g_list_first (entry->recent_list)->data;
+          entry->internal_operation++;
+          gtk_entry_set_text (GTK_ENTRY (entry), recent_item);
+          gtk_editable_set_position (GTK_EDITABLE (entry), -1);
+          entry->internal_operation--;
+        }
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_entry_button_release (GtkWidget      *widget,
+                               GdkEventButton *event)
+{
+  if (event->button == 1)
+    {
+      /* FIXME: need to remove idle handler in dispose */
+      g_idle_add ((GSourceFunc) gimp_tag_entry_try_select_jellybean,
+                  widget);
+    }
+
+  return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
+}
+
+static gboolean
+gimp_tag_entry_try_select_jellybean (GimpTagEntry *entry)
+{
+  gint selection_start;
+  gint selection_end;
+  gint selection_pos = gtk_editable_get_position (GTK_EDITABLE (entry));
+  gint char_count    = g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1);
+
+  if (selection_pos == char_count)
+    {
+      return FALSE;
+    }
+
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                     &selection_start, &selection_end);
+  gimp_tag_entry_select_jellybean (entry, selection_start, selection_end,
+                                   TAG_SEARCH_NONE);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_entry_select_jellybean (GimpTagEntry     *entry,
+                                 gint              selection_start,
+                                 gint              selection_end,
+                                 GimpTagSearchDir  search_dir)
+{
+  gint prev_selection_start;
+  gint prev_selection_end;
+
+  if (! entry->mask->len)
+    {
+      return FALSE;
+    }
+
+  if (selection_start >= entry->mask->len)
+    {
+      selection_start = entry->mask->len - 1;
+      selection_end   = selection_start;
+    }
+
+  if (entry->mask->str[selection_start] == 'u')
+    {
+      return FALSE;
+    }
+
+  switch (search_dir)
+    {
+    case TAG_SEARCH_NONE:
+      if (selection_start > 0 &&
+          entry->mask->str[selection_start] == 's')
+        {
+          selection_start--;
+        }
+
+      if (selection_start > 0                            &&
+          (entry->mask->str[selection_start - 1] == 'w') &&
+          (entry->mask->str[selection_start] == 't'))
+        {
+          /* between whitespace and tag,
+           * should allow to select tag.
+           */
+          selection_start--;
+        }
+      break;
+
+    case TAG_SEARCH_LEFT:
+      if (selection_start == selection_end)
+        {
+          if (selection_start > 0                      &&
+              entry->mask->str[selection_start] == 't' &&
+              entry->mask->str[selection_start - 1] == 'w')
+            {
+              selection_start--;
+            }
+
+          if ((entry->mask->str[selection_start] == 'w' ||
+               entry->mask->str[selection_start] == 's') &&
+              selection_start > 0)
+            {
+              while ((entry->mask->str[selection_start] == 'w' ||
+                      entry->mask->str[selection_start] == 's') &&
+                     selection_start > 0)
+                {
+                  selection_start--;
+                }
+
+              selection_end = selection_start + 1;
+            }
+        }
+      break;
+
+    case TAG_SEARCH_RIGHT:
+      if (selection_start == selection_end)
+        {
+          if ((entry->mask->str[selection_start] == 'w' ||
+               entry->mask->str[selection_start] == 's') &&
+              selection_start < entry->mask->len - 1)
+            {
+              while ((entry->mask->str[selection_start] == 'w' ||
+                      entry->mask->str[selection_start] == 's') &&
+                     selection_start < entry->mask->len - 1)
+                {
+                  selection_start++;
+                }
+
+              selection_end = selection_start + 1;
+            }
+        }
+      break;
+    }
+
+  if (selection_start < entry->mask->len &&
+      selection_start == selection_end)
+    {
+      selection_end = selection_start + 1;
+    }
+
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                     &prev_selection_start,
+                                     &prev_selection_end);
+
+  if (entry->mask->str[selection_start] == 't')
+    {
+      while (selection_start > 0 &&
+             (entry->mask->str[selection_start - 1] == 't'))
+        {
+          selection_start--;
+        }
+    }
+
+  if (selection_end > selection_start &&
+      (entry->mask->str[selection_end - 1] == 't'))
+    {
+      while (selection_end <= entry->mask->len &&
+             (entry->mask->str[selection_end] == 't'))
+        {
+          selection_end++;
+        }
+    }
+
+  if (search_dir == TAG_SEARCH_NONE        &&
+      selection_end - selection_start == 1 &&
+      entry->mask->str[selection_start] == 'w')
+    {
+      gtk_editable_set_position (GTK_EDITABLE (entry), selection_end);
+      return TRUE;
+    }
+
+  if ((selection_start != prev_selection_start ||
+       selection_end != prev_selection_end)      &&
+      (entry->mask->str[selection_start] == 't') &&
+      selection_start < selection_end)
+    {
+      if (search_dir == TAG_SEARCH_LEFT)
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      selection_end, selection_start);
+        }
+      else
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      selection_start, selection_end);
+        }
+
+      return TRUE;
+    }
+  else
+    {
+      return FALSE;
+    }
+}
+
+static gboolean
+gimp_tag_entry_add_to_recent (GimpTagEntry *entry,
+                              const gchar  *tags_string,
+                              gboolean      to_front)
+{
+  gchar *recent_item = NULL;
+  gchar *stripped_string;
+  gint   stripped_length;
+  GList *list;
+
+  if (entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN)
+    return FALSE;
+
+  stripped_string = g_strdup (tags_string);
+  stripped_string = g_strstrip (stripped_string);
+  stripped_length = strlen (stripped_string);
+  g_free (stripped_string);
+
+  if (stripped_length <= 0)
+    {
+      /* there is no content in the string,
+       * therefore don't add to recent list.
+       */
+      return FALSE;
+    }
+
+  if (g_list_length (entry->recent_list) >= GIMP_TAG_ENTRY_MAX_RECENT_ITEMS)
+    {
+      gchar *last_item = g_list_last (entry->recent_list)->data;
+      entry->recent_list = g_list_remove (entry->recent_list, last_item);
+      g_free (last_item);
+    }
+
+  for (list = entry->recent_list; list; list = g_list_next (list))
+    {
+      if (! strcmp (tags_string, list->data))
+        {
+          recent_item = list->data;
+          entry->recent_list = g_list_remove (entry->recent_list, recent_item);
+          break;
+        }
+    }
+
+  if (! recent_item)
+    {
+      recent_item = g_strdup (tags_string);
+    }
+
+  if (to_front)
+    {
+      entry->recent_list = g_list_prepend (entry->recent_list, recent_item);
+    }
+  else
+    {
+      entry->recent_list = g_list_append (entry->recent_list, recent_item);
+    }
+
+  return TRUE;
+}
+
+/**
+ * gimp_tag_entry_get_separator:
+ *
+ * Tag separator is a single Unicode terminal punctuation
+ * character.
+ *
+ * Return value: returns locale dependent tag separator.
+ **/
+const gchar *
+gimp_tag_entry_get_separator (void)
+{
+  /* Separator for tags
+   * IMPORTANT: use only one of Unicode terminal punctuation chars.
+   * http://unicode.org/review/pr-23.html
+   */
+  return _(",");
+}
+
+static void
+gimp_tag_entry_commit_region (GString *tags,
+                              GString *mask)
+{
+  gint      i = 0;
+  gint      j;
+  gint      stage = 0;
+  gunichar  c;
+  gchar    *cursor;
+  GString  *out_tags;
+  GString  *out_mask;
+  GString  *tag_buffer;
+
+  out_tags = g_string_new ("");
+  out_mask = g_string_new ("");
+  tag_buffer = g_string_new ("");
+
+  cursor = tags->str;
+  for (i = 0; i <= mask->len; i++)
+    {
+      c = g_utf8_get_char (cursor);
+      cursor = g_utf8_next_char (cursor);
+
+      if (stage == 0)
+        {
+          /* whitespace before tag */
+          if (g_unichar_isspace (c))
+            {
+              g_string_append_unichar (out_tags, c);
+              g_string_append_c (out_mask, 'w');
+            }
+          else
+            {
+              stage++;
+            }
+        }
+
+      if (stage == 1)
+        {
+          /* tag */
+          if (c && ! gimp_tag_is_tag_separator (c))
+            {
+              g_string_append_unichar (tag_buffer, c);
+            }
+          else
+            {
+              gchar *valid_tag = gimp_tag_string_make_valid (tag_buffer->str);
+              gsize  tag_length;
+
+              if (valid_tag)
+                {
+                  tag_length = g_utf8_strlen (valid_tag, -1);
+                  g_string_append (out_tags, valid_tag);
+                  for (j = 0; j < tag_length; j++)
+                    {
+                      g_string_append_c (out_mask, 't');
+                    }
+                  g_free (valid_tag);
+
+                  if (! c)
+                    {
+                      g_string_append (out_tags, gimp_tag_entry_get_separator ());
+                      g_string_append_c (out_mask, 's');
+                    }
+
+                  stage++;
+                }
+              else
+                {
+                  stage = 0;
+                }
+
+              g_string_set_size (tag_buffer, 0);
+
+            }
+        }
+
+      if (stage == 2)
+        {
+          if (gimp_tag_is_tag_separator (c))
+            {
+              g_string_append_unichar (out_tags, c);
+              g_string_append_c (out_mask, 's');
+            }
+          else
+            {
+              if (g_unichar_isspace (c))
+                {
+                  g_string_append_unichar (out_tags, c);
+                  g_string_append_c (out_mask, 'w');
+                }
+
+              stage = 0;
+            }
+        }
+    }
+
+  g_string_assign (tags, out_tags->str);
+  g_string_assign (mask, out_mask->str);
+
+  g_string_free (tag_buffer, TRUE);
+  g_string_free (out_tags, TRUE);
+  g_string_free (out_mask, TRUE);
+}
+
+static void
+gimp_tag_entry_commit_tags (GimpTagEntry *entry)
+{
+  gboolean found_region;
+  gint     cursor_position;
+
+  cursor_position = gtk_editable_get_position (GTK_EDITABLE (entry));
+
+  do
+    {
+      gint  region_start;
+      gint  region_end;
+      gint  position;
+      glong length_before;
+      gint  i;
+
+      found_region = FALSE;
+
+      for (i = 0; i < entry->mask->len; i++)
+        {
+          if (entry->mask->str[i] == 'u')
+            {
+              found_region = TRUE;
+              region_start = i;
+              region_end = i + 1;
+              for (i++; i < entry->mask->len; i++)
+                {
+                  if (entry->mask->str[i] == 'u')
+                    {
+                      region_end = i + 1;
+                    }
+                  else
+                    {
+                      break;
+                    }
+                }
+              break;
+            }
+        }
+
+      if (found_region)
+        {
+          gchar   *tags_string;
+          GString *tags;
+          GString *mask;
+
+          tags_string = gtk_editable_get_chars (GTK_EDITABLE (entry),
+                                                region_start, region_end);
+          tags = g_string_new (tags_string);
+          g_free (tags_string);
+          length_before = region_end - region_start;
+
+          mask = g_string_new_len (entry->mask->str + region_start, region_end - region_start);
+
+          gimp_tag_entry_commit_region (tags, mask);
+
+          /* prepend space before if needed */
+          if (region_start > 0
+              && entry->mask->str[region_start - 1] != 'w'
+              && mask->len > 0
+              && mask->str[0] != 'w')
+            {
+              g_string_prepend_c (tags, ' ');
+              g_string_prepend_c (mask, 'w');
+            }
+
+          /* append space after if needed */
+          if (region_end <= entry->mask->len
+              && entry->mask->str[region_end] != 'w'
+              && mask->len > 0
+              && mask->str[mask->len - 1] != 'w')
+            {
+              g_string_append_c (tags, ' ');
+              g_string_append_c (mask, 'w');
+            }
+
+          if (cursor_position >= region_start)
+            {
+              cursor_position += g_utf8_strlen (tags->str, tags->len) - length_before;
+            }
+
+          entry->internal_operation++;
+          entry->suppress_mask_update++;
+          entry->suppress_tag_query++;
+          gtk_editable_delete_text (GTK_EDITABLE (entry),
+                                    region_start, region_end);
+          position = region_start;
+          gtk_editable_insert_text (GTK_EDITABLE (entry),
+                                    tags->str, tags->len, &position);
+          entry->suppress_tag_query--;
+          entry->suppress_mask_update--;
+          entry->internal_operation--;
+
+          g_string_erase (entry->mask, region_start, region_end - region_start);
+          g_string_insert_len (entry->mask, region_start, mask->str, mask->len);
+
+          g_string_free (mask, TRUE);
+          g_string_free (tags, TRUE);
+        }
+    }
+  while (found_region);
+
+  gtk_editable_set_position (GTK_EDITABLE (entry), cursor_position);
+  gimp_tag_entry_strip_extra_whitespace (entry);
+}
+
+static gboolean
+gimp_tag_entry_commit_source_func (GimpTagEntry *entry)
+{
+  gimp_tag_entry_commit_tags (entry);
+
+  return FALSE;
+}
+
+static void
+gimp_tag_entry_next_tag (GimpTagEntry *entry,
+                         gboolean      select)
+{
+  gint position = gtk_editable_get_position (GTK_EDITABLE (entry));
+
+  if (entry->mask->str[position] != 'u')
+    {
+      while (position < entry->mask->len &&
+             (entry->mask->str[position] != 'w'))
+        {
+          position++;
+        }
+
+      if (entry->mask->str[position] == 'w')
+        {
+          position++;
+        }
+    }
+  else if (position < entry->mask->len)
+    {
+      position++;
+    }
+
+  if (select)
+    {
+      gint  current_position;
+      gint  selection_start;
+      gint  selection_end;
+
+      current_position = gtk_editable_get_position (GTK_EDITABLE (entry));
+      gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                         &selection_start, &selection_end);
+
+      if (current_position == selection_end)
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      selection_start, position);
+        }
+      else if (current_position == selection_start)
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      selection_end, position);
+        }
+    }
+  else
+    {
+      gtk_editable_set_position (GTK_EDITABLE (entry), position);
+    }
+}
+
+static void
+gimp_tag_entry_previous_tag (GimpTagEntry *entry,
+                             gboolean      select)
+{
+  gint  position = gtk_editable_get_position (GTK_EDITABLE (entry));
+
+  if (position >= 1 &&
+      entry->mask->str[position - 1] == 'w')
+    {
+      position--;
+    }
+  if (position < 1)
+    {
+      return;
+    }
+  if (entry->mask->str[position - 1] != 'u')
+    {
+      while (position > 0 &&
+             (entry->mask->str[position - 1] != 'w'))
+        {
+          if (entry->mask->str[position - 1] == 'u')
+            {
+              break;
+            }
+
+          position--;
+        }
+    }
+  else
+    {
+      position--;
+    }
+
+  if (select)
+    {
+      gint  current_position;
+      gint  selection_start;
+      gint  selection_end;
+
+      current_position = gtk_editable_get_position (GTK_EDITABLE (entry));
+      gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                         &selection_start, &selection_end);
+
+      if (current_position == selection_start)
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      selection_end, position);
+        }
+      else if (current_position == selection_end)
+        {
+          gtk_editable_select_region (GTK_EDITABLE (entry),
+                                      selection_start, position);
+        }
+    }
+  else
+    {
+      gtk_editable_set_position (GTK_EDITABLE (entry), position);
+    }
+}
+
+static void
+gimp_tag_entry_select_for_deletion (GimpTagEntry     *entry,
+                                    GimpTagSearchDir  search_dir)
+{
+  gint start_pos;
+  gint end_pos;
+
+  /* make sure the whole tag is selected,
+   * including a  separator
+   */
+  gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
+                                     &start_pos, &end_pos);
+  while (start_pos > 0 &&
+         (entry->mask->str[start_pos - 1] == 't'))
+    {
+      start_pos--;
+    }
+
+  if (end_pos > start_pos &&
+      (entry->mask->str[end_pos - 1] == 't' ||
+       entry->mask->str[end_pos - 1] == 's'))
+    {
+      while (end_pos <= entry->mask->len &&
+             (entry->mask->str[end_pos] == 's'))
+        {
+          end_pos++;
+        }
+    }
+
+  /* ensure there is no unnecessary whitespace selected */
+  while (start_pos < end_pos &&
+         entry->mask->str[start_pos] == 'w')
+    {
+      start_pos++;
+    }
+
+  while (start_pos < end_pos &&
+         entry->mask->str[end_pos - 1] == 'w')
+    {
+      end_pos--;
+    }
+
+  /* delete spaces in one side */
+  if (search_dir == TAG_SEARCH_LEFT)
+    {
+      gtk_editable_select_region (GTK_EDITABLE (entry), end_pos, start_pos);
+    }
+  else if (end_pos > start_pos            &&
+           search_dir == TAG_SEARCH_RIGHT &&
+           (entry->mask->str[end_pos - 1] == 't' ||
+            entry->mask->str[end_pos - 1] == 's'))
+    {
+      gtk_editable_select_region (GTK_EDITABLE (entry), start_pos, end_pos);
+    }
+}
+
+static gboolean
+gimp_tag_entry_strip_extra_whitespace (GimpTagEntry *entry)
+{
+  gint  i;
+  gint  position;
+
+  position = gtk_editable_get_position (GTK_EDITABLE (entry));
+
+  entry->internal_operation++;
+  entry->suppress_tag_query++;
+
+  /* strip whitespace in front */
+  while (entry->mask->len > 0 &&
+         entry->mask->str[0] == 'w')
+    {
+      gtk_editable_delete_text (GTK_EDITABLE (entry), 0, 1);
+    }
+
+  /* strip whitespace in back */
+  while (entry->mask->len > 1                          &&
+         entry->mask->str[entry->mask->len - 1] == 'w' &&
+         entry->mask->str[entry->mask->len - 2] == 'w')
+    {
+      gtk_editable_delete_text (GTK_EDITABLE (entry),
+                                entry->mask->len - 1, entry->mask->len);
+
+      if (position == entry->mask->len)
+        {
+          position--;
+        }
+    }
+
+  /* strip extra whitespace in the middle */
+  for (i = entry->mask->len - 1; i > 0; i--)
+    {
+      if (entry->mask->str[i] == 'w' &&
+          entry->mask->str[i - 1] == 'w')
+        {
+          gtk_editable_delete_text (GTK_EDITABLE (entry), i, i + 1);
+
+          if (position >= i)
+            {
+              position--;
+            }
+        }
+    }
+
+  /* special case when cursor is in the last position:
+   * it must be positioned after the last whitespace.
+   */
+  if (position == entry->mask->len - 1 &&
+      entry->mask->str[position] == 'w')
+    {
+      position++;
+    }
+
+  gtk_editable_set_position (GTK_EDITABLE (entry), position);
+
+  entry->suppress_tag_query--;
+  entry->internal_operation--;
+
+  return FALSE;
+}
diff --git a/app/widgets/gimptagentry.h b/app/widgets/gimptagentry.h
new file mode 100644
index 0000000..f3d6fa4
--- /dev/null
+++ b/app/widgets/gimptagentry.h
@@ -0,0 +1,86 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagentry.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAG_ENTRY_H__
+#define __GIMP_TAG_ENTRY_H__
+
+
+#define GIMP_TYPE_TAG_ENTRY            (gimp_tag_entry_get_type ())
+#define GIMP_TAG_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TAG_ENTRY, GimpTagEntry))
+#define GIMP_TAG_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TAG_ENTRY, GimpTagEntryClass))
+#define GIMP_IS_TAG_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TAG_ENTRY))
+#define GIMP_IS_TAG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TAG_ENTRY))
+#define GIMP_TAG_ENTRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TAG_ENTRY, GimpTagEntryClass))
+
+
+typedef struct _GimpTagEntryClass  GimpTagEntryClass;
+
+struct _GimpTagEntry
+{
+  GtkEntry             parent_instance;
+
+  GimpTaggedContainer *container;
+
+  /* mask describes the meaning of each char in GimpTagEntry.
+   * It is maintained automatically on insert-text and delete-text
+   * events. If manual mask modification is desired, then
+   * suppress_mask_update must be increased before calling any
+   * function changing entry contents.
+   * Meaning of mask chars:
+   * u - undefined / unknown (just typed unparsed text)
+   * t - tag
+   * s - separator
+   * w - whitespace.
+   */
+  GString             *mask;
+  GList               *selected_items;
+  GList               *common_tags;
+  GList               *recent_list;
+  gint                 tab_completion_index;
+  gint                 internal_operation;
+  gint                 suppress_mask_update;
+  gint                 suppress_tag_query;
+  GimpTagEntryMode     mode;
+  gboolean             description_shown;
+  gboolean             has_invalid_tags;
+  guint                tag_query_idle_id;
+};
+
+struct _GimpTagEntryClass
+{
+  GtkEntryClass   parent_class;
+};
+
+
+GType          gimp_tag_entry_get_type           (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_tag_entry_new                (GimpTaggedContainer *container,
+                                                  GimpTagEntryMode     mode);
+
+void           gimp_tag_entry_set_selected_items (GimpTagEntry        *entry,
+                                                  GList               *items);
+gchar       ** gimp_tag_entry_parse_tags         (GimpTagEntry        *entry);
+void           gimp_tag_entry_set_tag_string     (GimpTagEntry        *entry,
+                                                  const gchar         *tag_string);
+
+const gchar  * gimp_tag_entry_get_separator      (void);
+
+
+#endif  /*  __GIMP_TAG_ENTRY_H__  */
diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c
new file mode 100644
index 0000000..cc76670
--- /dev/null
+++ b/app/widgets/gimptagpopup.c
@@ -0,0 +1,1518 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagentry.c
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptag.h"
+#include "core/gimptagged.h"
+#include "core/gimptaggedcontainer.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcombotagentry.h"
+#include "gimptagentry.h"
+#include "gimptagpopup.h"
+
+#include "gimp-intl.h"
+
+
+#define MENU_SCROLL_STEP1            8
+#define MENU_SCROLL_STEP2           15
+#define MENU_SCROLL_FAST_ZONE        8
+#define MENU_SCROLL_TIMEOUT1        50
+#define MENU_SCROLL_TIMEOUT2        20
+
+#define GIMP_TAG_POPUP_MARGIN        5
+#define GIMP_TAG_POPUP_PADDING       2
+#define GIMP_TAG_POPUP_LINE_SPACING  2
+
+enum
+{
+  PROP_0,
+  PROP_OWNER
+};
+
+struct _PopupTagData
+{
+  GimpTag      *tag;
+  GdkRectangle  bounds;
+  GtkStateType  state;
+};
+
+
+static void     gimp_tag_popup_constructed             (GObject        *object);
+static void     gimp_tag_popup_dispose                 (GObject        *object);
+static void     gimp_tag_popup_set_property            (GObject        *object,
+                                                        guint           property_id,
+                                                        const GValue   *value,
+                                                        GParamSpec     *pspec);
+static void     gimp_tag_popup_get_property            (GObject        *object,
+                                                        guint           property_id,
+                                                        GValue         *value,
+                                                        GParamSpec     *pspec);
+
+static gboolean gimp_tag_popup_border_expose           (GtkWidget      *widget,
+                                                        GdkEventExpose *event,
+                                                        GimpTagPopup   *popup);
+static gboolean gimp_tag_popup_list_expose             (GtkWidget      *widget,
+                                                        GdkEventExpose *event,
+                                                        GimpTagPopup   *popup);
+static gboolean gimp_tag_popup_border_event            (GtkWidget      *widget,
+                                                        GdkEvent       *event);
+static gboolean gimp_tag_popup_list_event              (GtkWidget      *widget,
+                                                        GdkEvent       *event,
+                                                        GimpTagPopup   *popup);
+static gboolean gimp_tag_popup_is_in_tag               (PopupTagData   *tag_data,
+                                                        gint            x,
+                                                        gint            y);
+static void     gimp_tag_popup_queue_draw_tag          (GimpTagPopup   *widget,
+                                                        PopupTagData   *tag_data);
+static void     gimp_tag_popup_toggle_tag              (GimpTagPopup   *popup,
+                                                        PopupTagData   *tag_data);
+static void     gimp_tag_popup_check_can_toggle        (GimpTagged     *tagged,
+                                                        GimpTagPopup   *popup);
+static gint     gimp_tag_popup_layout_tags             (GimpTagPopup   *popup,
+                                                        gint            width);
+static gboolean gimp_tag_popup_scroll_timeout          (gpointer        data);
+static void     gimp_tag_popup_remove_scroll_timeout   (GimpTagPopup   *popup);
+static gboolean gimp_tag_popup_scroll_timeout_initial  (gpointer        data);
+static void     gimp_tag_popup_start_scrolling         (GimpTagPopup   *popup);
+static void     gimp_tag_popup_stop_scrolling          (GimpTagPopup   *popup);
+static void     gimp_tag_popup_scroll_by               (GimpTagPopup   *popup,
+                                                        gint            step);
+static void     gimp_tag_popup_handle_scrolling        (GimpTagPopup   *popup,
+                                                        gint            x,
+                                                        gint            y,
+                                                        gboolean        enter,
+                                                        gboolean        motion);
+
+static gboolean gimp_tag_popup_button_scroll           (GimpTagPopup   *popup,
+                                                        GdkEventButton *event);
+
+static void     get_arrows_visible_area                (GimpTagPopup   *combo_entry,
+                                                        GdkRectangle   *border,
+                                                        GdkRectangle   *upper,
+                                                        GdkRectangle   *lower,
+                                                        gint           *arrow_space);
+static void     get_arrows_sensitive_area              (GimpTagPopup   *popup,
+                                                        GdkRectangle   *upper,
+                                                        GdkRectangle   *lower);
+
+
+G_DEFINE_TYPE (GimpTagPopup, gimp_tag_popup, GTK_TYPE_WINDOW);
+
+#define parent_class gimp_tag_popup_parent_class
+
+
+static void
+gimp_tag_popup_class_init (GimpTagPopupClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_tag_popup_constructed;
+  object_class->dispose      = gimp_tag_popup_dispose;
+  object_class->set_property = gimp_tag_popup_set_property;
+  object_class->get_property = gimp_tag_popup_get_property;
+
+  g_object_class_install_property (object_class, PROP_OWNER,
+                                   g_param_spec_object ("owner", NULL, NULL,
+                                                        GIMP_TYPE_COMBO_TAG_ENTRY,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_tag_popup_init (GimpTagPopup *popup)
+{
+  GtkWidget *widget = GTK_WIDGET (popup);
+
+  popup->upper_arrow_state = GTK_STATE_NORMAL;
+  popup->lower_arrow_state = GTK_STATE_NORMAL;
+
+  gtk_widget_add_events (widget,
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_KEY_RELEASE_MASK    |
+                         GDK_SCROLL_MASK);
+
+  popup->frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (popup->frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (popup), popup->frame);
+  gtk_widget_show (popup->frame);
+
+  popup->alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+  gtk_container_add (GTK_CONTAINER (popup->frame), popup->alignment);
+  gtk_widget_show (popup->alignment);
+
+  popup->tag_area = gtk_drawing_area_new ();
+  gtk_widget_add_events (popup->tag_area,
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK);
+  gtk_container_add (GTK_CONTAINER (popup->alignment), popup->tag_area);
+  gtk_widget_show (popup->tag_area);
+
+  g_signal_connect (popup->alignment, "expose-event",
+                    G_CALLBACK (gimp_tag_popup_border_expose),
+                    popup);
+  g_signal_connect (popup, "event",
+                    G_CALLBACK (gimp_tag_popup_border_event),
+                    NULL);
+  g_signal_connect (popup->tag_area, "expose-event",
+                    G_CALLBACK (gimp_tag_popup_list_expose),
+                    popup);
+  g_signal_connect (popup->tag_area, "event",
+                    G_CALLBACK (gimp_tag_popup_list_event),
+                    popup);
+}
+
+static void
+gimp_tag_popup_constructed (GObject *object)
+{
+  GimpTagPopup        *popup = GIMP_TAG_POPUP (object);
+  GimpTaggedContainer *container;
+  GtkWidget           *entry;
+  GtkAllocation        entry_allocation;
+  GtkStyle            *frame_style;
+  gint                 x;
+  gint                 y;
+  gint                 width;
+  gint                 height;
+  gint                 popup_height;
+  GHashTable          *tag_hash;
+  GList               *tag_list;
+  GList               *tag_iterator;
+  gint                 i;
+  gint                 max_height;
+  gint                 screen_height;
+  gchar              **current_tags;
+  gint                 current_count;
+  GdkRectangle         popup_rects[2]; /* variants of popup placement */
+  GdkRectangle         popup_rect; /* best popup rect in screen coordinates */
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  entry = GTK_WIDGET (popup->combo_entry);
+
+  gtk_window_set_screen (GTK_WINDOW (popup), gtk_widget_get_screen (entry));
+
+  popup->context = gtk_widget_create_pango_context (GTK_WIDGET (popup));
+  popup->layout  = pango_layout_new (popup->context);
+
+  gtk_widget_get_allocation (entry, &entry_allocation);
+
+  gtk_widget_style_get (GTK_WIDGET (popup),
+                        "scroll-arrow-vlength", &popup->scroll_arrow_height,
+                        NULL);
+
+  pango_layout_set_attributes (popup->layout,
+                               popup->combo_entry->normal_item_attr);
+
+  current_tags  = gimp_tag_entry_parse_tags (GIMP_TAG_ENTRY (popup->combo_entry));
+  current_count = g_strv_length (current_tags);
+
+  container = GIMP_TAG_ENTRY (popup->combo_entry)->container;
+
+  tag_hash = container->tag_ref_counts;
+  tag_list = g_hash_table_get_keys (tag_hash);
+  tag_list = g_list_sort (tag_list, gimp_tag_compare_func);
+
+  popup->tag_count = g_list_length (tag_list);
+  popup->tag_data  = g_new0 (PopupTagData, popup->tag_count);
+
+  for (i = 0, tag_iterator = tag_list;
+       i < popup->tag_count;
+       i++, tag_iterator = g_list_next (tag_iterator))
+    {
+      PopupTagData *tag_data = &popup->tag_data[i];
+      gint          j;
+
+      tag_data->tag   = tag_iterator->data;
+      tag_data->state = GTK_STATE_NORMAL;
+
+      g_object_ref (tag_data->tag);
+
+      for (j = 0; j < current_count; j++)
+        {
+          if (! gimp_tag_compare_with_string (tag_data->tag, current_tags[j]))
+            {
+              tag_data->state = GTK_STATE_SELECTED;
+              break;
+            }
+        }
+    }
+
+  g_list_free (tag_list);
+  g_strfreev (current_tags);
+
+  if (GIMP_TAG_ENTRY (popup->combo_entry)->mode == GIMP_TAG_ENTRY_MODE_QUERY)
+    {
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          if (popup->tag_data[i].state != GTK_STATE_SELECTED)
+            {
+              popup->tag_data[i].state = GTK_STATE_INSENSITIVE;
+            }
+        }
+
+      gimp_container_foreach (GIMP_CONTAINER (container),
+                              (GFunc) gimp_tag_popup_check_can_toggle,
+                              popup);
+    }
+
+  frame_style = gtk_widget_get_style (popup->frame);
+
+  width  = (entry_allocation.width -
+            2 * frame_style->xthickness);
+  height = (gimp_tag_popup_layout_tags (popup, width) +
+            2 * frame_style->ythickness);
+
+  gdk_window_get_origin (gtk_widget_get_window (entry), &x, &y);
+
+  max_height = entry_allocation.height * 10;
+
+  screen_height = gdk_screen_get_height (gtk_widget_get_screen (entry));
+
+  popup_height = MIN (height, max_height);
+
+  popup_rects[0].x      = x;
+  popup_rects[0].y      = 0;
+  popup_rects[0].width  = entry_allocation.width;
+  popup_rects[0].height = y + entry_allocation.height;
+
+  popup_rects[1].x      = x;
+  popup_rects[1].y      = y;
+  popup_rects[1].width  = popup_rects[0].width;
+  popup_rects[1].height = screen_height - popup_rects[0].height;
+
+  if (popup_rects[0].height >= popup_height)
+    {
+      popup_rect = popup_rects[0];
+      popup_rect.y += popup_rects[0].height - popup_height;
+      popup_rect.height = popup_height;
+    }
+  else if (popup_rects[1].height >= popup_height)
+    {
+      popup_rect = popup_rects[1];
+      popup_rect.height = popup_height;
+    }
+  else
+    {
+      if (popup_rects[0].height >= popup_rects[1].height)
+        {
+          popup_rect = popup_rects[0];
+          popup_rect.y += popup->scroll_arrow_height + frame_style->ythickness;
+        }
+      else
+        {
+          popup_rect = popup_rects[1];
+          popup_rect.y -= popup->scroll_arrow_height + frame_style->ythickness;
+        }
+
+      popup_height = popup_rect.height;
+    }
+
+  if (popup_height < height)
+    {
+      popup->arrows_visible    = TRUE;
+      popup->upper_arrow_state = GTK_STATE_INSENSITIVE;
+
+      gtk_alignment_set_padding (GTK_ALIGNMENT (popup->alignment),
+                                 popup->scroll_arrow_height + 2,
+                                 popup->scroll_arrow_height + 2, 0, 0);
+
+      popup_height -= 2 * popup->scroll_arrow_height + 4;
+
+      popup->scroll_height = height - popup_height;
+      popup->scroll_y      = 0;
+      popup->scroll_step   = 0;
+    }
+
+  gtk_widget_set_size_request (popup->tag_area, width, popup_height);
+
+  gtk_window_move (GTK_WINDOW (popup), popup_rect.x, popup_rect.y);
+  gtk_window_resize (GTK_WINDOW (popup), popup_rect.width, popup_rect.height);
+}
+
+static void
+gimp_tag_popup_dispose (GObject *object)
+{
+  GimpTagPopup *popup = GIMP_TAG_POPUP (object);
+
+  gimp_tag_popup_remove_scroll_timeout (popup);
+
+  g_clear_object (&popup->combo_entry);
+  g_clear_object (&popup->layout);
+  g_clear_object (&popup->context);
+
+  if (popup->tag_data)
+    {
+      gint i;
+
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          g_object_unref (popup->tag_data[i].tag);
+        }
+
+      g_clear_pointer (&popup->tag_data, g_free);
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tag_popup_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GimpTagPopup *popup = GIMP_TAG_POPUP (object);
+
+  switch (property_id)
+    {
+    case PROP_OWNER:
+      popup->combo_entry = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tag_popup_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GimpTagPopup *popup = GIMP_TAG_POPUP (object);
+
+  switch (property_id)
+    {
+    case PROP_OWNER:
+      g_value_set_object (value, popup->combo_entry);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gimp_tag_popup_new:
+ * @combo_entry: #GimpComboTagEntry which is owner of the popup window.
+ *
+ * Tag popup widget is only useful for for #GimpComboTagEntry and
+ * should not be used elsewhere.
+ *
+ * Return value: a newly created #GimpTagPopup widget.
+ **/
+GtkWidget *
+gimp_tag_popup_new (GimpComboTagEntry *combo_entry)
+{
+  g_return_val_if_fail (GIMP_IS_COMBO_TAG_ENTRY (combo_entry), NULL);
+
+  return g_object_new (GIMP_TYPE_TAG_POPUP,
+                       "type",  GTK_WINDOW_POPUP,
+                       "owner", combo_entry,
+                       NULL);
+}
+
+/**
+ * gimp_tag_popup_show:
+ * @tag_popup:  an instance of #GimpTagPopup
+ *
+ * Show tag popup widget. If mouse grab cannot be obtained for widget,
+ * it is destroyed.
+ **/
+void
+gimp_tag_popup_show (GimpTagPopup *popup)
+{
+  GtkWidget *widget;
+
+  g_return_if_fail (GIMP_IS_TAG_POPUP (popup));
+
+  widget = GTK_WIDGET (popup);
+
+  gtk_widget_show (widget);
+
+  gtk_grab_add (widget);
+  gtk_widget_grab_focus (widget);
+
+  if (gdk_pointer_grab (gtk_widget_get_window (widget), TRUE,
+                        GDK_BUTTON_PRESS_MASK   |
+                        GDK_BUTTON_RELEASE_MASK |
+                        GDK_POINTER_MOTION_MASK,
+                        NULL, NULL,
+                        GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS)
+    {
+      /* pointer grab must be attained otherwise user would have
+       * problems closing the popup window.
+       */
+      gtk_grab_remove (widget);
+      gtk_widget_destroy (widget);
+    }
+}
+
+static gint
+gimp_tag_popup_layout_tags (GimpTagPopup *popup,
+                            gint          width)
+{
+  PangoFontMetrics *font_metrics;
+  gint              x;
+  gint              y;
+  gint              height = 0;
+  gint              i;
+  gint              line_height;
+  gint              space_width;
+
+  x = GIMP_TAG_POPUP_MARGIN;
+  y = GIMP_TAG_POPUP_MARGIN;
+
+  font_metrics = pango_context_get_metrics (popup->context,
+                                            pango_context_get_font_description (popup->context),
+                                            NULL);
+
+  line_height = PANGO_PIXELS ((pango_font_metrics_get_ascent (font_metrics) +
+                               pango_font_metrics_get_descent (font_metrics)));
+  space_width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (font_metrics));
+
+  pango_font_metrics_unref (font_metrics);
+
+  for (i = 0; i < popup->tag_count; i++)
+    {
+      PopupTagData *tag_data = &popup->tag_data[i];
+      gint          w, h;
+
+      pango_layout_set_text (popup->layout,
+                             gimp_tag_get_name (tag_data->tag), -1);
+      pango_layout_get_pixel_size (popup->layout, &w, &h);
+
+      tag_data->bounds.width  = w + 2 * GIMP_TAG_POPUP_PADDING;
+      tag_data->bounds.height = h + 2 * GIMP_TAG_POPUP_PADDING;
+
+      if (x + space_width + tag_data->bounds.width +
+          GIMP_TAG_POPUP_MARGIN - 1 > width)
+        {
+          x = GIMP_TAG_POPUP_MARGIN;
+          y += line_height + 2 * GIMP_TAG_POPUP_PADDING + GIMP_TAG_POPUP_LINE_SPACING;
+        }
+
+      tag_data->bounds.x = x;
+      tag_data->bounds.y = y;
+
+      x += tag_data->bounds.width + space_width;
+    }
+
+  if (gtk_widget_get_direction (GTK_WIDGET (popup)) == GTK_TEXT_DIR_RTL)
+    {
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          PopupTagData *tag_data = &popup->tag_data[i];
+
+          tag_data->bounds.x = (width -
+                                tag_data->bounds.x -
+                                tag_data->bounds.width);
+        }
+    }
+
+  height = y + line_height + GIMP_TAG_POPUP_MARGIN;
+
+  return height;
+}
+
+static gboolean
+gimp_tag_popup_border_expose (GtkWidget      *widget,
+                              GdkEventExpose *event,
+                              GimpTagPopup   *popup)
+{
+  GdkWindow    *window = gtk_widget_get_window (widget);
+  GtkStyle     *style  = gtk_widget_get_style (widget);
+  GdkRectangle  border;
+  GdkRectangle  upper;
+  GdkRectangle  lower;
+  gint          arrow_space;
+  gint          arrow_size;
+
+  if (event->window != gtk_widget_get_window (widget))
+    return FALSE;
+
+  get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space);
+
+  arrow_size = 0.7 * arrow_space;
+
+  gtk_paint_box (style, window,
+                 GTK_STATE_NORMAL,
+                 GTK_SHADOW_OUT,
+                 &event->area, widget, "menu",
+                 0, 0, -1, -1);
+
+  if (popup->arrows_visible)
+    {
+      /*  upper arrow  */
+
+      gtk_paint_box (style, window,
+                     popup->upper_arrow_state,
+                     GTK_SHADOW_OUT,
+                     &event->area, widget, "menu",
+                     upper.x,
+                     upper.y,
+                     upper.width,
+                     upper.height);
+
+      gtk_paint_arrow (style, window,
+                       popup->upper_arrow_state,
+                       GTK_SHADOW_OUT,
+                       &event->area, widget, "menu_scroll_arrow_up",
+                       GTK_ARROW_UP,
+                       TRUE,
+                       upper.x + (upper.width - arrow_size) / 2,
+                       upper.y + style->ythickness + (arrow_space - arrow_size) / 2,
+                       arrow_size, arrow_size);
+
+      /*  lower arrow  */
+
+      gtk_paint_box (style, window,
+                     popup->lower_arrow_state,
+                     GTK_SHADOW_OUT,
+                     &event->area, widget, "menu",
+                     lower.x,
+                     lower.y,
+                     lower.width,
+                     lower.height);
+
+      gtk_paint_arrow (style, window,
+                       popup->lower_arrow_state,
+                       GTK_SHADOW_OUT,
+                       &event->area, widget, "menu_scroll_arrow_down",
+                       GTK_ARROW_DOWN,
+                       TRUE,
+                       lower.x + (lower.width - arrow_size) / 2,
+                       lower.y + style->ythickness + (arrow_space - arrow_size) / 2,
+                       arrow_size, arrow_size);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_popup_border_event (GtkWidget *widget,
+                             GdkEvent  *event)
+{
+  GimpTagPopup *popup = GIMP_TAG_POPUP (widget);
+
+  if (event->type == GDK_BUTTON_PRESS)
+    {
+      GdkEventButton *button_event = (GdkEventButton *) event;
+      GtkAllocation   allocation;
+      gint            x;
+      gint            y;
+
+      if (button_event->window == gtk_widget_get_window (widget) &&
+          gimp_tag_popup_button_scroll (popup, button_event))
+        {
+          return TRUE;
+        }
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL);
+
+      if (button_event->window != gtk_widget_get_window (popup->tag_area) &&
+          (x < allocation.y                    ||
+           y < allocation.x                    ||
+           x > allocation.x + allocation.width ||
+           y > allocation.y + allocation.height))
+        {
+          /* user has clicked outside the popup area,
+           * which means it should be hidden.
+           */
+          gtk_grab_remove (widget);
+          gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+                                      GDK_CURRENT_TIME);
+          gtk_widget_destroy (widget);
+        }
+    }
+  else if (event->type == GDK_MOTION_NOTIFY)
+    {
+      GdkEventMotion *motion_event = (GdkEventMotion *) event;
+      gint            x, y;
+
+      gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL);
+
+      gimp_tag_popup_handle_scrolling (popup, x, y,
+                                       motion_event->window ==
+                                       gtk_widget_get_window (widget),
+                                       TRUE);
+    }
+  else if (event->type == GDK_BUTTON_RELEASE)
+    {
+      GdkEventButton *button_event = (GdkEventButton *) event;
+
+      popup->single_select_disabled = TRUE;
+
+      if (button_event->window == gtk_widget_get_window (widget) &&
+          gimp_tag_popup_button_scroll (popup, button_event))
+        {
+          return TRUE;
+        }
+    }
+  else if (event->type == GDK_GRAB_BROKEN)
+    {
+      gtk_grab_remove (widget);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+                                  GDK_CURRENT_TIME);
+      gtk_widget_destroy (widget);
+    }
+  else if (event->type == GDK_KEY_PRESS)
+    {
+      gtk_grab_remove (widget);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+                                  GDK_CURRENT_TIME);
+      gtk_widget_destroy (widget);
+    }
+  else if (event->type == GDK_SCROLL)
+    {
+      GdkEventScroll *scroll_event = (GdkEventScroll *) event;
+
+      switch (scroll_event->direction)
+        {
+        case GDK_SCROLL_RIGHT:
+        case GDK_SCROLL_DOWN:
+          gimp_tag_popup_scroll_by (popup, MENU_SCROLL_STEP2);
+          return TRUE;
+
+        case GDK_SCROLL_LEFT:
+        case GDK_SCROLL_UP:
+          gimp_tag_popup_scroll_by (popup, - MENU_SCROLL_STEP2);
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_popup_list_expose (GtkWidget      *widget,
+                            GdkEventExpose *event,
+                            GimpTagPopup   *popup)
+{
+  GdkWindow      *window = gtk_widget_get_window (widget);
+  GtkStyle       *style  = gtk_widget_get_style (widget);
+  cairo_t        *cr;
+  PangoAttribute *attribute;
+  PangoAttrList  *attributes;
+  gint            i;
+
+  cr = gdk_cairo_create (event->window);
+
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+
+  for (i = 0; i < popup->tag_count; i++)
+    {
+      PopupTagData *tag_data = &popup->tag_data[i];
+
+      pango_layout_set_text (popup->layout,
+                             gimp_tag_get_name (tag_data->tag), -1);
+
+      switch (tag_data->state)
+        {
+        case GTK_STATE_SELECTED:
+          attributes = pango_attr_list_copy (popup->combo_entry->selected_item_attr);
+          break;
+
+        case GTK_STATE_INSENSITIVE:
+          attributes = pango_attr_list_copy (popup->combo_entry->insensitive_item_attr);
+          break;
+
+        default:
+          attributes = pango_attr_list_copy (popup->combo_entry->normal_item_attr);
+          break;
+        }
+
+      if (tag_data == popup->prelight &&
+          tag_data->state != GTK_STATE_INSENSITIVE)
+        {
+          attribute = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE);
+          pango_attr_list_insert (attributes, attribute);
+        }
+
+      pango_layout_set_attributes (popup->layout, attributes);
+      pango_attr_list_unref (attributes);
+
+      if (tag_data->state == GTK_STATE_SELECTED)
+        {
+          gdk_cairo_set_source_color (cr,
+                                      &popup->combo_entry->selected_item_color);
+
+          cairo_rectangle (cr,
+                           tag_data->bounds.x - 1,
+                           tag_data->bounds.y - popup->scroll_y,
+                           tag_data->bounds.width + 2,
+                           tag_data->bounds.height);
+          cairo_fill (cr);
+
+          cairo_translate (cr, 0.5, 0.5);
+
+          cairo_move_to (cr,
+                         tag_data->bounds.x,
+                         tag_data->bounds.y - popup->scroll_y - 1);
+          cairo_line_to (cr,
+                         tag_data->bounds.x + tag_data->bounds.width - 1,
+                         tag_data->bounds.y - popup->scroll_y - 1);
+
+          cairo_move_to (cr,
+                         tag_data->bounds.x,
+                         tag_data->bounds.y - popup->scroll_y + tag_data->bounds.height);
+          cairo_line_to (cr,
+                         tag_data->bounds.x + tag_data->bounds.width - 1,
+                         tag_data->bounds.y - popup->scroll_y + tag_data->bounds.height);
+
+          cairo_stroke (cr);
+
+          cairo_translate (cr, -0.5, -0.5);
+        }
+
+      cairo_move_to (cr,
+                     (tag_data->bounds.x +
+                      GIMP_TAG_POPUP_PADDING),
+                     (tag_data->bounds.y -
+                      popup->scroll_y +
+                      GIMP_TAG_POPUP_PADDING));
+
+      pango_cairo_show_layout (cr, popup->layout);
+
+      if (tag_data == popup->prelight              &&
+          tag_data->state != GTK_STATE_INSENSITIVE &&
+          ! popup->single_select_disabled)
+        {
+          gtk_paint_focus (style, window,
+                           tag_data->state,
+                           &event->area, widget, NULL,
+                           tag_data->bounds.x,
+                           tag_data->bounds.y - popup->scroll_y,
+                           tag_data->bounds.width,
+                           tag_data->bounds.height);
+        }
+    }
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_popup_list_event (GtkWidget    *widget,
+                           GdkEvent     *event,
+                           GimpTagPopup *popup)
+{
+  if (event->type == GDK_BUTTON_PRESS)
+    {
+      GdkEventButton *button_event = (GdkEventButton *) event;
+      gint            x;
+      gint            y;
+      gint            i;
+
+      popup->single_select_disabled = TRUE;
+
+      x = button_event->x;
+      y = button_event->y + popup->scroll_y;
+
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          PopupTagData *tag_data = &popup->tag_data[i];
+
+          if (gimp_tag_popup_is_in_tag (tag_data, x, y))
+            {
+              gimp_tag_popup_toggle_tag (popup, tag_data);
+              gtk_widget_queue_draw (widget);
+              break;
+            }
+        }
+    }
+  else if (event->type == GDK_MOTION_NOTIFY)
+    {
+      GdkEventMotion *motion_event = (GdkEventMotion *) event;
+      PopupTagData   *prelight     = NULL;
+      gint            x;
+      gint            y;
+      gint            i;
+
+      x = motion_event->x;
+      y = motion_event->y + popup->scroll_y;
+
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          PopupTagData *tag_data = &popup->tag_data[i];
+
+          if (gimp_tag_popup_is_in_tag (tag_data, x, y))
+            {
+              prelight = tag_data;
+              break;
+            }
+        }
+
+      if (prelight != popup->prelight)
+        {
+          if (popup->prelight)
+            gimp_tag_popup_queue_draw_tag (popup, popup->prelight);
+
+          popup->prelight = prelight;
+
+          if (popup->prelight)
+            gimp_tag_popup_queue_draw_tag (popup, popup->prelight);
+        }
+    }
+  else if (event->type == GDK_BUTTON_RELEASE &&
+           ! popup->single_select_disabled)
+    {
+      GdkEventButton *button_event = (GdkEventButton *) event;
+      gint            x;
+      gint            y;
+      gint            i;
+
+      popup->single_select_disabled = TRUE;
+
+      x = button_event->x;
+      y = button_event->y + popup->scroll_y;
+
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          PopupTagData *tag_data = &popup->tag_data[i];
+
+          if (gimp_tag_popup_is_in_tag (tag_data, x, y))
+            {
+              gimp_tag_popup_toggle_tag (popup, tag_data);
+              gtk_widget_destroy (GTK_WIDGET (popup));
+              break;
+            }
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tag_popup_is_in_tag (PopupTagData *tag_data,
+                          gint          x,
+                          gint          y)
+{
+  if (x >= tag_data->bounds.x                          &&
+      y >= tag_data->bounds.y                          &&
+      x <  tag_data->bounds.x + tag_data->bounds.width &&
+      y <  tag_data->bounds.y + tag_data->bounds.height)
+    {
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tag_popup_queue_draw_tag (GimpTagPopup *popup,
+                               PopupTagData *tag_data)
+{
+  gtk_widget_queue_draw_area (popup->tag_area,
+                              tag_data->bounds.x,
+                              tag_data->bounds.y - popup->scroll_y,
+                              tag_data->bounds.width,
+                              tag_data->bounds.height);
+}
+
+static void
+gimp_tag_popup_toggle_tag (GimpTagPopup *popup,
+                           PopupTagData *tag_data)
+{
+  gchar    **current_tags;
+  GString   *tag_str;
+  gint       length;
+  gint       i;
+  gboolean   tag_toggled_off = FALSE;
+
+  if (tag_data->state == GTK_STATE_NORMAL)
+    {
+      tag_data->state = GTK_STATE_SELECTED;
+    }
+  else if (tag_data->state == GTK_STATE_SELECTED)
+    {
+      tag_data->state = GTK_STATE_NORMAL;
+    }
+  else
+    {
+      return;
+    }
+
+  current_tags = gimp_tag_entry_parse_tags (GIMP_TAG_ENTRY (popup->combo_entry));
+  tag_str = g_string_new ("");
+  length = g_strv_length (current_tags);
+  for (i = 0; i < length; i++)
+    {
+      if (! gimp_tag_compare_with_string (tag_data->tag, current_tags[i]))
+        {
+          tag_toggled_off = TRUE;
+        }
+      else
+        {
+          if (tag_str->len)
+            {
+              g_string_append (tag_str, gimp_tag_entry_get_separator ());
+              g_string_append_c (tag_str, ' ');
+            }
+
+          g_string_append (tag_str, current_tags[i]);
+        }
+    }
+
+  if (! tag_toggled_off)
+    {
+      /* this tag was not selected yet, so it needs to be toggled on */
+
+      if (tag_str->len)
+        {
+          g_string_append (tag_str, gimp_tag_entry_get_separator ());
+          g_string_append_c (tag_str, ' ');
+        }
+
+      g_string_append (tag_str, gimp_tag_get_name (tag_data->tag));
+    }
+
+  gimp_tag_entry_set_tag_string (GIMP_TAG_ENTRY (popup->combo_entry),
+                                 tag_str->str);
+
+  g_string_free (tag_str, TRUE);
+  g_strfreev (current_tags);
+
+  if (GIMP_TAG_ENTRY (popup->combo_entry)->mode == GIMP_TAG_ENTRY_MODE_QUERY)
+    {
+      GimpTaggedContainer *container;
+
+      container = GIMP_TAG_ENTRY (popup->combo_entry)->container;
+
+      for (i = 0; i < popup->tag_count; i++)
+        {
+          if (popup->tag_data[i].state != GTK_STATE_SELECTED)
+            {
+              popup->tag_data[i].state = GTK_STATE_INSENSITIVE;
+            }
+        }
+
+      gimp_container_foreach (GIMP_CONTAINER (container),
+                              (GFunc) gimp_tag_popup_check_can_toggle,
+                              popup);
+    }
+}
+
+static int
+gimp_tag_popup_data_compare (const void *a,
+                             const void *b)
+{
+  return gimp_tag_compare_func (((PopupTagData *) a)->tag,
+                                ((PopupTagData *) b)->tag);
+}
+
+static void
+gimp_tag_popup_check_can_toggle (GimpTagged   *tagged,
+                                 GimpTagPopup *popup)
+{
+  GList *iterator;
+
+  for (iterator = gimp_tagged_get_tags (tagged);
+       iterator;
+       iterator = g_list_next (iterator))
+    {
+      PopupTagData  search_key;
+      PopupTagData *search_result;
+
+      search_key.tag = iterator->data;
+
+      search_result =
+        (PopupTagData *) bsearch (&search_key,
+                                  popup->tag_data, popup->tag_count,
+                                  sizeof (PopupTagData),
+                                  gimp_tag_popup_data_compare);
+
+      if (search_result)
+        {
+          if (search_result->state == GTK_STATE_INSENSITIVE)
+            {
+              search_result->state = GTK_STATE_NORMAL;
+            }
+        }
+    }
+}
+
+static gboolean
+gimp_tag_popup_scroll_timeout (gpointer data)
+{
+  GimpTagPopup *popup = data;
+  gboolean      touchscreen_mode;
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)),
+                "gtk-touchscreen-mode", &touchscreen_mode,
+                NULL);
+
+  gimp_tag_popup_scroll_by (popup, popup->scroll_step);
+
+  return TRUE;
+}
+
+static void
+gimp_tag_popup_remove_scroll_timeout (GimpTagPopup *popup)
+{
+  if (popup->scroll_timeout_id)
+    {
+      g_source_remove (popup->scroll_timeout_id);
+      popup->scroll_timeout_id = 0;
+    }
+}
+
+static gboolean
+gimp_tag_popup_scroll_timeout_initial (gpointer data)
+{
+  GimpTagPopup *popup = data;
+  guint         timeout;
+  gboolean      touchscreen_mode;
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)),
+                "gtk-timeout-repeat",   &timeout,
+                "gtk-touchscreen-mode", &touchscreen_mode,
+                NULL);
+
+  gimp_tag_popup_scroll_by (popup, popup->scroll_step);
+
+  gimp_tag_popup_remove_scroll_timeout (popup);
+
+  popup->scroll_timeout_id =
+    gdk_threads_add_timeout (timeout,
+                             gimp_tag_popup_scroll_timeout,
+                             popup);
+
+  return FALSE;
+}
+
+static void
+gimp_tag_popup_start_scrolling (GimpTagPopup *popup)
+{
+  guint    timeout;
+  gboolean touchscreen_mode;
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)),
+                "gtk-timeout-repeat",   &timeout,
+                "gtk-touchscreen-mode", &touchscreen_mode,
+                NULL);
+
+  gimp_tag_popup_scroll_by (popup, popup->scroll_step);
+
+  popup->scroll_timeout_id =
+    gdk_threads_add_timeout (timeout,
+                             gimp_tag_popup_scroll_timeout_initial,
+                             popup);
+}
+
+static void
+gimp_tag_popup_stop_scrolling (GimpTagPopup *popup)
+{
+  gboolean touchscreen_mode;
+
+  gimp_tag_popup_remove_scroll_timeout (popup);
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)),
+                "gtk-touchscreen-mode", &touchscreen_mode,
+                NULL);
+
+  if (! touchscreen_mode)
+    {
+      popup->upper_arrow_prelight = FALSE;
+      popup->lower_arrow_prelight = FALSE;
+    }
+}
+
+static void
+gimp_tag_popup_scroll_by (GimpTagPopup *popup,
+                          gint          step)
+{
+  GtkStateType arrow_state;
+  gint         new_scroll_y = popup->scroll_y + step;
+
+  arrow_state = popup->upper_arrow_state;
+
+  if (new_scroll_y < 0)
+    {
+      new_scroll_y = 0;
+
+      if (arrow_state != GTK_STATE_INSENSITIVE)
+        gimp_tag_popup_stop_scrolling (popup);
+
+      arrow_state = GTK_STATE_INSENSITIVE;
+    }
+  else
+    {
+      arrow_state = (popup->upper_arrow_prelight ?
+                     GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
+    }
+
+  if (arrow_state != popup->upper_arrow_state)
+    {
+      popup->upper_arrow_state = arrow_state;
+      gtk_widget_queue_draw (GTK_WIDGET (popup));
+    }
+
+  arrow_state = popup->lower_arrow_state;
+
+  if (new_scroll_y >= popup->scroll_height)
+    {
+      new_scroll_y = popup->scroll_height - 1;
+
+      if (arrow_state != GTK_STATE_INSENSITIVE)
+        gimp_tag_popup_stop_scrolling (popup);
+
+      arrow_state = GTK_STATE_INSENSITIVE;
+    }
+  else
+    {
+      arrow_state = (popup->lower_arrow_prelight ?
+                     GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
+    }
+
+  if (arrow_state != popup->lower_arrow_state)
+    {
+      popup->lower_arrow_state = arrow_state;
+      gtk_widget_queue_draw (GTK_WIDGET (popup));
+    }
+
+  if (new_scroll_y != popup->scroll_y)
+    {
+      popup->scroll_y = new_scroll_y;
+
+      gdk_window_scroll (gtk_widget_get_window (popup->tag_area), 0, -step);
+    }
+}
+
+static void
+gimp_tag_popup_handle_scrolling (GimpTagPopup *popup,
+                                 gint          x,
+                                 gint          y,
+                                 gboolean      enter,
+                                 gboolean      motion)
+{
+  GdkRectangle rect;
+  gboolean     in_arrow;
+  gboolean     scroll_fast = FALSE;
+  gboolean     touchscreen_mode;
+
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)),
+                "gtk-touchscreen-mode", &touchscreen_mode,
+                NULL);
+
+  /*  upper arrow handling  */
+
+  get_arrows_sensitive_area (popup, &rect, NULL);
+
+  in_arrow = FALSE;
+  if (popup->arrows_visible    &&
+      x >= rect.x              &&
+      x <  rect.x + rect.width &&
+      y >= rect.y              &&
+      y <  rect.y + rect.height)
+    {
+      in_arrow = TRUE;
+    }
+
+  if (touchscreen_mode)
+    popup->upper_arrow_prelight = in_arrow;
+
+  if (popup->upper_arrow_state != GTK_STATE_INSENSITIVE)
+    {
+      gboolean arrow_pressed = FALSE;
+
+      if (popup->arrows_visible)
+        {
+          if (touchscreen_mode)
+            {
+              if (enter && popup->upper_arrow_prelight)
+                {
+                  if (popup->scroll_timeout_id == 0)
+                    {
+                      gimp_tag_popup_remove_scroll_timeout (popup);
+                      popup->scroll_step = -MENU_SCROLL_STEP2; /* always fast */
+
+                      if (! motion)
+                        {
+                          /* Only do stuff on click. */
+                          gimp_tag_popup_start_scrolling (popup);
+                          arrow_pressed = TRUE;
+                        }
+                    }
+                  else
+                    {
+                      arrow_pressed = TRUE;
+                    }
+                }
+              else if (! enter)
+                {
+                  gimp_tag_popup_stop_scrolling (popup);
+                }
+            }
+          else /* !touchscreen_mode */
+            {
+              scroll_fast = (y < rect.y + MENU_SCROLL_FAST_ZONE);
+
+              if (enter && in_arrow &&
+                  (! popup->upper_arrow_prelight ||
+                   popup->scroll_fast != scroll_fast))
+                {
+                  popup->upper_arrow_prelight = TRUE;
+                  popup->scroll_fast          = scroll_fast;
+
+                  gimp_tag_popup_remove_scroll_timeout (popup);
+                  popup->scroll_step = (scroll_fast ?
+                                        -MENU_SCROLL_STEP2 : -MENU_SCROLL_STEP1);
+
+                  popup->scroll_timeout_id =
+                    gdk_threads_add_timeout (scroll_fast ?
+                                             MENU_SCROLL_TIMEOUT2 :
+                                             MENU_SCROLL_TIMEOUT1,
+                                             gimp_tag_popup_scroll_timeout,
+                                             popup);
+                }
+              else if (! enter && ! in_arrow && popup->upper_arrow_prelight)
+                {
+                  gimp_tag_popup_stop_scrolling (popup);
+                }
+            }
+        }
+
+      /*  gimp_tag_popup_start_scrolling() might have hit the top of the
+       *  tag_popup, so check if the button isn't insensitive before
+       *  changing it to something else.
+       */
+      if (popup->upper_arrow_state != GTK_STATE_INSENSITIVE)
+        {
+          GtkStateType arrow_state = GTK_STATE_NORMAL;
+
+          if (arrow_pressed)
+            arrow_state = GTK_STATE_ACTIVE;
+          else if (popup->upper_arrow_prelight)
+            arrow_state = GTK_STATE_PRELIGHT;
+
+          if (arrow_state != popup->upper_arrow_state)
+            {
+              popup->upper_arrow_state = arrow_state;
+
+              gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (popup)),
+                                          &rect, FALSE);
+            }
+        }
+    }
+
+  /*  lower arrow handling  */
+
+  get_arrows_sensitive_area (popup, NULL, &rect);
+
+  in_arrow = FALSE;
+  if (popup->arrows_visible    &&
+      x >= rect.x              &&
+      x <  rect.x + rect.width &&
+      y >= rect.y              &&
+      y <  rect.y + rect.height)
+    {
+      in_arrow = TRUE;
+    }
+
+  if (touchscreen_mode)
+    popup->lower_arrow_prelight = in_arrow;
+
+  if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE)
+    {
+      gboolean arrow_pressed = FALSE;
+
+      if (popup->arrows_visible)
+        {
+          if (touchscreen_mode)
+            {
+              if (enter && popup->lower_arrow_prelight)
+                {
+                  if (popup->scroll_timeout_id == 0)
+                    {
+                      gimp_tag_popup_remove_scroll_timeout (popup);
+                      popup->scroll_step = MENU_SCROLL_STEP2; /* always fast */
+
+                      if (! motion)
+                        {
+                          /* Only do stuff on click. */
+                          gimp_tag_popup_start_scrolling (popup);
+                          arrow_pressed = TRUE;
+                        }
+                    }
+                  else
+                    {
+                      arrow_pressed = TRUE;
+                    }
+                }
+              else if (! enter)
+                {
+                  gimp_tag_popup_stop_scrolling (popup);
+                }
+            }
+          else /* !touchscreen_mode */
+            {
+              scroll_fast = (y > rect.y + rect.height - MENU_SCROLL_FAST_ZONE);
+
+              if (enter && in_arrow &&
+                  (! popup->lower_arrow_prelight ||
+                   popup->scroll_fast != scroll_fast))
+                {
+                  popup->lower_arrow_prelight = TRUE;
+                  popup->scroll_fast          = scroll_fast;
+
+                  gimp_tag_popup_remove_scroll_timeout (popup);
+                  popup->scroll_step = (scroll_fast ?
+                                        MENU_SCROLL_STEP2 : MENU_SCROLL_STEP1);
+
+                  popup->scroll_timeout_id =
+                    gdk_threads_add_timeout (scroll_fast ?
+                                             MENU_SCROLL_TIMEOUT2 :
+                                             MENU_SCROLL_TIMEOUT1,
+                                             gimp_tag_popup_scroll_timeout,
+                                             popup);
+                }
+              else if (! enter && ! in_arrow && popup->lower_arrow_prelight)
+                {
+                  gimp_tag_popup_stop_scrolling (popup);
+                }
+            }
+        }
+
+      /*  gimp_tag_popup_start_scrolling() might have hit the bottom of the
+       *  popup, so check if the button isn't insensitive before
+       *  changing it to something else.
+       */
+      if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE)
+        {
+          GtkStateType arrow_state = GTK_STATE_NORMAL;
+
+          if (arrow_pressed)
+            arrow_state = GTK_STATE_ACTIVE;
+          else if (popup->lower_arrow_prelight)
+            arrow_state = GTK_STATE_PRELIGHT;
+
+          if (arrow_state != popup->lower_arrow_state)
+            {
+              popup->lower_arrow_state = arrow_state;
+
+              gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (popup)),
+                                          &rect, FALSE);
+            }
+        }
+    }
+}
+
+static gboolean
+gimp_tag_popup_button_scroll (GimpTagPopup   *popup,
+                              GdkEventButton *event)
+{
+  if (popup->upper_arrow_prelight || popup->lower_arrow_prelight)
+    {
+      gboolean touchscreen_mode;
+
+      g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)),
+                    "gtk-touchscreen-mode", &touchscreen_mode,
+                    NULL);
+
+      if (touchscreen_mode)
+        gimp_tag_popup_handle_scrolling (popup,
+                                         event->x_root,
+                                         event->y_root,
+                                         event->type == GDK_BUTTON_PRESS,
+                                         FALSE);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+get_arrows_visible_area (GimpTagPopup *popup,
+                         GdkRectangle *border,
+                         GdkRectangle *upper,
+                         GdkRectangle *lower,
+                         gint         *arrow_space)
+{
+  GtkWidget *widget = GTK_WIDGET (popup->alignment);
+  guint      padding_top;
+  guint      padding_bottom;
+  guint      padding_left;
+  guint      padding_right;
+
+  gtk_alignment_get_padding (GTK_ALIGNMENT (popup->alignment),
+                             &padding_top, &padding_bottom,
+                             &padding_left, &padding_right);
+
+  gtk_widget_get_allocation (widget, border);
+
+  upper->x      = border->x + padding_left;
+  upper->y      = border->y;
+  upper->width  = border->width - padding_left - padding_right;
+  upper->height = padding_top;
+
+  lower->x      = border->x + padding_left;
+  lower->y      = border->y + border->height - padding_bottom;
+  lower->width  = border->width - padding_left - padding_right;
+  lower->height = padding_bottom;
+
+  *arrow_space = popup->scroll_arrow_height;
+}
+
+static void
+get_arrows_sensitive_area (GimpTagPopup *popup,
+                           GdkRectangle *upper,
+                           GdkRectangle *lower)
+{
+  GdkRectangle tmp_border;
+  GdkRectangle tmp_upper;
+  GdkRectangle tmp_lower;
+  gint         tmp_arrow_space;
+
+  get_arrows_visible_area (popup,
+                           &tmp_border, &tmp_upper, &tmp_lower, &tmp_arrow_space);
+
+  if (upper)
+    *upper = tmp_upper;
+
+  if (lower)
+    *lower = tmp_lower;
+}
diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h
new file mode 100644
index 0000000..126f4e3
--- /dev/null
+++ b/app/widgets/gimptagpopup.h
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptagpopup.h
+ * Copyright (C) 2008 Aurimas Juška <aurisj@svn.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TAG_POPUP_H__
+#define __GIMP_TAG_POPUP_H__
+
+
+#define GIMP_TYPE_TAG_POPUP            (gimp_tag_popup_get_type ())
+#define GIMP_TAG_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TAG_POPUP, GimpTagPopup))
+#define GIMP_TAG_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TAG_POPUP, GimpTagPopupClass))
+#define GIMP_IS_TAG_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TAG_POPUP))
+#define GIMP_IS_TAG_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TAG_POPUP))
+#define GIMP_TAG_POPUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TAG_POPUP, GimpTagPopupClass))
+
+
+typedef struct _GimpTagPopupClass  GimpTagPopupClass;
+
+typedef struct _PopupTagData PopupTagData;
+
+struct _GimpTagPopup
+{
+  GtkWindow          parent_instance;
+
+  GimpComboTagEntry *combo_entry;
+
+  GtkWidget         *frame;
+  GtkWidget         *alignment;
+  GtkWidget         *tag_area;
+
+  PangoContext      *context;
+  PangoLayout       *layout;
+
+  PopupTagData      *tag_data;
+  gint               tag_count;
+
+  PopupTagData      *prelight;
+
+  gboolean           single_select_disabled;
+
+  guint              scroll_timeout_id;
+  gint               scroll_height;
+  gint               scroll_y;
+  gint               scroll_step;
+  gint               scroll_arrow_height;
+  gboolean           scroll_fast;
+  gboolean           arrows_visible;
+  gboolean           upper_arrow_prelight;
+  gboolean           lower_arrow_prelight;
+  GtkStateType       upper_arrow_state;
+  GtkStateType       lower_arrow_state;
+};
+
+struct _GimpTagPopupClass
+{
+  GtkWindowClass  parent_class;
+};
+
+
+GType       gimp_tag_popup_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_tag_popup_new      (GimpComboTagEntry *entry);
+
+void        gimp_tag_popup_show     (GimpTagPopup      *popup);
+
+
+#endif  /*  __GIMP_TAG_POPUP_H__  */
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
new file mode 100644
index 0000000..118700f
--- /dev/null
+++ b/app/widgets/gimptemplateeditor.c
@@ -0,0 +1,873 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "core/gimp.h"
+#include "core/gimptemplate.h"
+
+#include "gimppropwidgets.h"
+#include "gimptemplateeditor.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define SB_WIDTH            8
+#define MAX_COMMENT_LENGTH  512  /* arbitrary */
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_TEMPLATE
+};
+
+
+typedef struct _GimpTemplateEditorPrivate GimpTemplateEditorPrivate;
+
+struct _GimpTemplateEditorPrivate
+{
+  Gimp          *gimp;
+
+  GimpTemplate  *template;
+
+  GtkWidget     *aspect_button;
+  gboolean       block_aspect;
+
+  GtkWidget     *expander;
+  GtkWidget     *size_se;
+  GtkWidget     *memsize_label;
+  GtkWidget     *pixel_label;
+  GtkWidget     *more_label;
+  GtkWidget     *resolution_se;
+  GtkWidget     *chain_button;
+  GtkWidget     *precision_combo;
+  GtkWidget     *profile_combo;
+};
+
+#define GET_PRIVATE(editor) \
+        ((GimpTemplateEditorPrivate *) gimp_template_editor_get_instance_private ((GimpTemplateEditor *) (editor)))
+
+
+static void    gimp_template_editor_constructed    (GObject            *object);
+static void    gimp_template_editor_finalize       (GObject            *object);
+static void    gimp_template_editor_set_property   (GObject            *object,
+                                                    guint               property_id,
+                                                    const GValue       *value,
+                                                    GParamSpec         *pspec);
+static void    gimp_template_editor_get_property   (GObject            *object,
+                                                    guint               property_id,
+                                                    GValue             *value,
+                                                    GParamSpec         *pspec);
+
+static void gimp_template_editor_precision_changed (GtkWidget          *widget,
+                                                    GimpTemplateEditor *editor);
+static void gimp_template_editor_aspect_callback   (GtkWidget          *widget,
+                                                    GimpTemplateEditor *editor);
+static void gimp_template_editor_template_notify   (GimpTemplate       *template,
+                                                    GParamSpec         *param_spec,
+                                                    GimpTemplateEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpTemplateEditor, gimp_template_editor,
+                            GTK_TYPE_BOX)
+
+#define parent_class gimp_template_editor_parent_class
+
+
+static void
+gimp_template_editor_class_init (GimpTemplateEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_template_editor_constructed;
+  object_class->finalize     = gimp_template_editor_finalize;
+  object_class->set_property = gimp_template_editor_set_property;
+  object_class->get_property = gimp_template_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp", NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_TEMPLATE,
+                                   g_param_spec_object ("template", NULL, NULL,
+                                                        GIMP_TYPE_TEMPLATE,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_template_editor_init (GimpTemplateEditor *editor)
+{
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
+}
+
+static void
+gimp_template_editor_constructed (GObject *object)
+{
+  GimpTemplateEditor        *editor  = GIMP_TEMPLATE_EDITOR (object);
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (object);
+  GimpTemplate              *template;
+  GtkWidget                 *aspect_box;
+  GtkWidget                 *frame;
+  GtkWidget                 *hbox;
+  GtkWidget                 *vbox;
+  GtkWidget                 *table;
+  GtkWidget                 *label;
+  GtkAdjustment             *adjustment;
+  GtkWidget                 *width;
+  GtkWidget                 *height;
+  GtkWidget                 *xres;
+  GtkWidget                 *yres;
+  GtkWidget                 *combo;
+  GtkWidget                 *toggle;
+  GtkWidget                 *scrolled_window;
+  GtkWidget                 *text_view;
+  GtkTextBuffer             *text_buffer;
+  GtkListStore              *store;
+  GList                     *focus_chain = NULL;
+  gchar                     *text;
+  gint                       row;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (private->gimp != NULL);
+  gimp_assert (private->template != NULL);
+
+  template = private->template;
+
+  /*  Image size frame  */
+  frame = gimp_frame_new (_("Image Size"));
+  gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (3, 2, FALSE);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  width = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (width), SB_WIDTH);
+
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  height = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH);
+
+  /*  the image size labels  */
+  label = gtk_label_new_with_mnemonic (_("_Width:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), width);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new_with_mnemonic (_("H_eight:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), height);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  /*  create the sizeentry which keeps it all together  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 0, 2);
+  gtk_widget_show (hbox);
+
+  private->size_se = gimp_size_entry_new (0,
+                                          gimp_template_get_unit (template),
+                                          _("%p"),
+                                          TRUE, FALSE, FALSE, SB_WIDTH,
+                                          GIMP_SIZE_ENTRY_UPDATE_SIZE);
+
+  gtk_table_set_row_spacing (GTK_TABLE (private->size_se), 0, 2);
+  gtk_table_set_col_spacing (GTK_TABLE (private->size_se), 1, 6);
+
+  gtk_box_pack_start (GTK_BOX (hbox), private->size_se, FALSE, FALSE, 0);
+  gtk_widget_show (private->size_se);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (private->size_se),
+                             GTK_SPIN_BUTTON (height), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (private->size_se), height, 0, 1, 1, 2);
+  gtk_widget_show (height);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (private->size_se),
+                             GTK_SPIN_BUTTON (width), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (private->size_se), width, 0, 1, 0, 1);
+  gtk_widget_show (width);
+
+  gimp_prop_coordinates_connect (G_OBJECT (template),
+                                 "width", "height", "unit",
+                                 private->size_se, NULL,
+                                 gimp_template_get_resolution_x (template),
+                                 gimp_template_get_resolution_y (template));
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 3, 2, 3);
+  gtk_widget_show (hbox);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  aspect_box = gimp_enum_icon_box_new (GIMP_TYPE_ASPECT_TYPE,
+                                       "gimp", GTK_ICON_SIZE_MENU,
+                                       G_CALLBACK (gimp_template_editor_aspect_callback),
+                                       editor,
+                                       &private->aspect_button);
+  gtk_widget_hide (private->aspect_button); /* hide "square" */
+
+  gtk_box_pack_start (GTK_BOX (vbox), aspect_box, FALSE, FALSE, 0);
+  gtk_widget_show (aspect_box);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  private->pixel_label = gtk_label_new (NULL);
+  gimp_label_set_attributes (GTK_LABEL (private->pixel_label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                             -1);
+  gtk_label_set_xalign (GTK_LABEL (private->pixel_label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), private->pixel_label, FALSE, FALSE, 0);
+  gtk_widget_show (private->pixel_label);
+
+  private->more_label = gtk_label_new (NULL);
+  gimp_label_set_attributes (GTK_LABEL (private->more_label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                             -1);
+  gtk_label_set_xalign (GTK_LABEL (private->more_label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), private->more_label, FALSE, FALSE, 0);
+  gtk_widget_show (private->more_label);
+
+#ifdef ENABLE_MEMSIZE_LABEL
+  private->memsize_label = gtk_label_new (NULL);
+  gimp_label_set_attributes (GTK_LABEL (private->memsize_label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_label_set_xalign (GTK_LABEL (private->memsize_label), 0.0);
+  gtk_box_pack_start (GTK_BOX (vbox), private->memsize_label, FALSE, FALSE, 0);
+  gtk_widget_show (private->memsize_label);
+#endif
+
+  text = g_strdup_printf ("<b>%s</b>", _("_Advanced Options"));
+  private->expander = g_object_new (GTK_TYPE_EXPANDER,
+                                    "label",         text,
+                                    "use-markup",    TRUE,
+                                    "use-underline", TRUE,
+                                    NULL);
+  g_free (text);
+
+  gtk_box_pack_start (GTK_BOX (editor), private->expander, TRUE, TRUE, 0);
+  gtk_widget_show (private->expander);
+
+  frame = gimp_frame_new ("<expander>");
+  gtk_container_add (GTK_CONTAINER (private->expander), frame);
+  gtk_widget_show (frame);
+
+  table = gtk_table_new (9, 2, FALSE);
+  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  xres = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (xres), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (xres), SB_WIDTH);
+
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  yres = gimp_spin_button_new (adjustment, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (yres), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (yres), SB_WIDTH);
+
+  /*  the resolution labels  */
+  label = gtk_label_new_with_mnemonic (_("_X resolution:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), xres);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  label = gtk_label_new_with_mnemonic (_("_Y resolution:"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), yres);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  /*  the resolution sizeentry  */
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 0, 2);
+  gtk_widget_show (hbox);
+
+  private->resolution_se =
+    gimp_size_entry_new (0,
+                         gimp_template_get_resolution_unit (template),
+                         _("pixels/%s"),
+                         FALSE, FALSE, FALSE, SB_WIDTH,
+                         GIMP_SIZE_ENTRY_UPDATE_RESOLUTION);
+
+  gtk_table_set_row_spacing (GTK_TABLE (private->resolution_se), 0, 2);
+  gtk_table_set_col_spacing (GTK_TABLE (private->resolution_se), 1, 2);
+  gtk_table_set_col_spacing (GTK_TABLE (private->resolution_se), 2, 2);
+
+  gtk_box_pack_start (GTK_BOX (hbox), private->resolution_se, FALSE, FALSE, 0);
+  gtk_widget_show (private->resolution_se);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (private->resolution_se),
+                             GTK_SPIN_BUTTON (yres), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (private->resolution_se), yres,
+                             0, 1, 1, 2);
+  gtk_widget_show (yres);
+
+  gimp_size_entry_add_field (GIMP_SIZE_ENTRY (private->resolution_se),
+                             GTK_SPIN_BUTTON (xres), NULL);
+  gtk_table_attach_defaults (GTK_TABLE (private->resolution_se), xres,
+                             0, 1, 0, 1);
+  gtk_widget_show (xres);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                  gimp_template_get_resolution_x (template),
+                                  FALSE);
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                  gimp_template_get_resolution_y (template),
+                                  FALSE);
+
+  /*  the resolution chainbutton  */
+  private->chain_button = gimp_chain_button_new (GIMP_CHAIN_RIGHT);
+  gtk_table_attach_defaults (GTK_TABLE (private->resolution_se),
+                             private->chain_button, 1, 2, 0, 2);
+  gtk_widget_show (private->chain_button);
+
+  gimp_prop_coordinates_connect (G_OBJECT (template),
+                                 "xresolution", "yresolution",
+                                 "resolution-unit",
+                                 private->resolution_se, private->chain_button,
+                                 1.0, 1.0);
+
+  focus_chain = g_list_prepend (focus_chain,
+                                GIMP_SIZE_ENTRY (private->resolution_se)->unitmenu);
+  focus_chain = g_list_prepend (focus_chain, private->chain_button);
+  focus_chain = g_list_prepend (focus_chain, yres);
+  focus_chain = g_list_prepend (focus_chain, xres);
+
+  gtk_container_set_focus_chain (GTK_CONTAINER (private->resolution_se),
+                                 focus_chain);
+  g_list_free (focus_chain);
+
+  row = 2;
+
+  combo = gimp_prop_enum_combo_box_new (G_OBJECT (template),
+                                        "image-type",
+                                        GIMP_RGB, GIMP_GRAY);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Color _space:"), 0.0, 0.5,
+                             combo, 1, FALSE);
+
+  /* construct the precision combo manually, instead of using
+   * gimp_prop_enum_combo_box_new(), so that we only reset the gamma combo when
+   * the precision is changed through the ui.  see issue #3025.
+   */
+  store = gimp_enum_store_new_with_range (GIMP_TYPE_COMPONENT_TYPE,
+                                          GIMP_COMPONENT_TYPE_U8,
+                                          GIMP_COMPONENT_TYPE_FLOAT);
+
+  private->precision_combo = g_object_new (GIMP_TYPE_ENUM_COMBO_BOX,
+                                           "model", store,
+                                           NULL);
+  g_object_unref (store);
+
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("_Precision:"), 0.0, 0.5,
+                             private->precision_combo, 1, FALSE);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->precision_combo),
+                                 gimp_babl_component_type (
+                                   gimp_template_get_precision (template)));
+
+  g_signal_connect (private->precision_combo, "changed",
+                    G_CALLBACK (gimp_template_editor_precision_changed),
+                    editor);
+
+  combo = gimp_prop_boolean_combo_box_new (G_OBJECT (template),
+                                           "linear",
+                                           _("Linear light"),
+                                           _("Perceptual gamma (sRGB)"));
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("_Gamma:"), 0.0, 0.5,
+                             combo, 1, FALSE);
+
+  toggle = gimp_prop_check_button_new (G_OBJECT (template),
+                                       "color-managed",
+                                       _("Color _manage this image"));
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             NULL, 0.0, 0.5,
+                             toggle, 1, FALSE);
+
+  private->profile_combo =
+    gimp_prop_profile_combo_box_new (G_OBJECT (template),
+                                     "color-profile",
+                                     NULL,
+                                     _("Choose A Color Profile"),
+                                     G_OBJECT (private->gimp->config),
+                                     "color-profile-path");
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Co_lor profile:"), 0.0, 0.5,
+                             private->profile_combo, 1, FALSE);
+
+  combo = gimp_prop_enum_combo_box_new (G_OBJECT (template),
+                                        "fill-type",
+                                        0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("_Fill with:"), 0.0, 0.5,
+                             combo, 1, FALSE);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  label = gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                                     _("Comme_nt:"), 0.0, 0.0,
+                                     scrolled_window, 1, FALSE);
+
+  text_buffer = gimp_prop_text_buffer_new (G_OBJECT (template),
+                                           "comment", MAX_COMMENT_LENGTH);
+
+  text_view = gtk_text_view_new_with_buffer (text_buffer);
+  g_object_unref (text_buffer);
+
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
+  gtk_widget_show (text_view);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), text_view);
+
+  g_signal_connect_object (template, "notify",
+                           G_CALLBACK (gimp_template_editor_template_notify),
+                           editor, 0);
+
+  /*  call the notify callback once to get the labels set initially  */
+  gimp_template_editor_template_notify (template, NULL, editor);
+}
+
+static void
+gimp_template_editor_finalize (GObject *object)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (object);
+
+  g_clear_object (&private->template);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_template_editor_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      private->gimp = g_value_get_object (value); /* don't ref */
+      break;
+
+    case PROP_TEMPLATE:
+      private->template = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_template_editor_get_property (GObject      *object,
+                                   guint         property_id,
+                                   GValue       *value,
+                                   GParamSpec   *pspec)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, private->gimp);
+      break;
+
+    case PROP_TEMPLATE:
+      g_value_set_object (value, private->template);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_template_editor_new (GimpTemplate *template,
+                          Gimp         *gimp,
+                          gboolean      edit_template)
+{
+  GimpTemplateEditor        *editor;
+  GimpTemplateEditorPrivate *private;
+
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  editor = g_object_new (GIMP_TYPE_TEMPLATE_EDITOR,
+                         "gimp",     gimp,
+                         "template", template,
+                         NULL);
+
+  private = GET_PRIVATE (editor);
+
+  if (edit_template)
+    {
+      GtkWidget   *table;
+      GtkWidget   *entry;
+      GtkWidget   *icon_picker;
+
+      table = gtk_table_new (2, 2, FALSE);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+      gtk_box_pack_start (GTK_BOX (editor), table, FALSE, FALSE, 0);
+      gtk_box_reorder_child (GTK_BOX (editor), table, 0);
+      gtk_widget_show (table);
+
+      entry = gimp_prop_entry_new (G_OBJECT (private->template), "name", 128);
+
+      gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                                 _("_Name:"), 1.0, 0.5,
+                                 entry, 1, FALSE);
+
+      icon_picker = gimp_prop_icon_picker_new (GIMP_VIEWABLE (private->template),
+                                               gimp);
+      gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
+                                 _("_Icon:"), 1.0, 0.5,
+                                 icon_picker, 1, TRUE);
+    }
+
+  return GTK_WIDGET (editor);
+}
+
+GimpTemplate *
+gimp_template_editor_get_template (GimpTemplateEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE_EDITOR (editor), NULL);
+
+  return GET_PRIVATE (editor)->template;
+}
+
+void
+gimp_template_editor_show_advanced (GimpTemplateEditor *editor,
+                                    gboolean            expanded)
+{
+  GimpTemplateEditorPrivate *private;
+
+  g_return_if_fail (GIMP_IS_TEMPLATE_EDITOR (editor));
+
+  private = GET_PRIVATE (editor);
+
+  gtk_expander_set_expanded (GTK_EXPANDER (private->expander), expanded);
+}
+
+GtkWidget *
+gimp_template_editor_get_size_se (GimpTemplateEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE_EDITOR (editor), NULL);
+
+  return GET_PRIVATE (editor)->size_se;
+}
+
+GtkWidget *
+gimp_template_editor_get_resolution_se (GimpTemplateEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE_EDITOR (editor), NULL);
+
+  return GET_PRIVATE (editor)->resolution_se;
+}
+
+GtkWidget *
+gimp_template_editor_get_resolution_chain (GimpTemplateEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TEMPLATE_EDITOR (editor), NULL);
+
+  return GET_PRIVATE (editor)->chain_button;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_template_editor_precision_changed (GtkWidget          *widget,
+                                        GimpTemplateEditor *editor)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (editor);
+  GimpComponentType          component_type;
+
+  gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget),
+                                 (gint *) &component_type);
+
+  g_object_set (private->template,
+                "component-type", component_type,
+                NULL);
+
+  /* when changing this logic, also change the same switch()
+   * in convert-precision-dialog.c
+   */
+  switch (component_type)
+    {
+    case GIMP_COMPONENT_TYPE_U8:
+      /* default to gamma for 8 bit */
+      g_object_set (private->template,
+                    "linear", FALSE,
+                    NULL);
+      break;
+
+    case GIMP_COMPONENT_TYPE_U16:
+    case GIMP_COMPONENT_TYPE_U32:
+    default:
+      /* leave gamma alone by default for 16/32 bit int */
+      break;
+
+    case GIMP_COMPONENT_TYPE_HALF:
+    case GIMP_COMPONENT_TYPE_FLOAT:
+    case GIMP_COMPONENT_TYPE_DOUBLE:
+      /* default to linear for floating point */
+      g_object_set (private->template,
+                    "linear", TRUE,
+                    NULL);
+      break;
+    }
+}
+
+static void
+gimp_template_editor_set_pixels (GimpTemplateEditor *editor,
+                                 GimpTemplate       *template)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (editor);
+  gchar                     *text;
+
+  text = g_strdup_printf (ngettext ("%d × %d pixel",
+                                    "%d × %d pixels",
+                                    gimp_template_get_height (template)),
+                          gimp_template_get_width (template),
+                          gimp_template_get_height (template));
+  gtk_label_set_text (GTK_LABEL (private->pixel_label), text);
+  g_free (text);
+}
+
+static void
+gimp_template_editor_aspect_callback (GtkWidget          *widget,
+                                      GimpTemplateEditor *editor)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (editor);
+
+  if (! private->block_aspect &&
+      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      GimpTemplate *template    = private->template;
+      gint          width       = gimp_template_get_width (template);
+      gint          height      = gimp_template_get_height (template);
+      gdouble       xresolution = gimp_template_get_resolution_x (template);
+      gdouble       yresolution = gimp_template_get_resolution_y (template);
+
+      if (width == height)
+        {
+          private->block_aspect = TRUE;
+          gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (private->aspect_button),
+                                           GIMP_ASPECT_SQUARE);
+          private->block_aspect = FALSE;
+          return;
+       }
+
+      g_signal_handlers_block_by_func (template,
+                                       gimp_template_editor_template_notify,
+                                       editor);
+
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                      yresolution, FALSE);
+      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                      xresolution, FALSE);
+
+      g_object_set (template,
+                    "width",       height,
+                    "height",      width,
+                    "xresolution", yresolution,
+                    "yresolution", xresolution,
+                    NULL);
+
+      g_signal_handlers_unblock_by_func (template,
+                                         gimp_template_editor_template_notify,
+                                         editor);
+
+      gimp_template_editor_set_pixels (editor, template);
+    }
+}
+
+static void
+gimp_template_editor_template_notify (GimpTemplate       *template,
+                                      GParamSpec         *param_spec,
+                                      GimpTemplateEditor *editor)
+{
+  GimpTemplateEditorPrivate *private = GET_PRIVATE (editor);
+  GimpAspectType             aspect;
+  const gchar               *desc;
+  gchar                     *text;
+  gint                       width;
+  gint                       height;
+  gint                       xres;
+  gint                       yres;
+
+  if (param_spec)
+    {
+      if (! strcmp (param_spec->name, "xresolution"))
+        {
+          gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0,
+                                          gimp_template_get_resolution_x (template),
+                                          FALSE);
+        }
+      else if (! strcmp (param_spec->name, "yresolution"))
+        {
+          gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 1,
+                                          gimp_template_get_resolution_y (template),
+                                          FALSE);
+        }
+      else if (! strcmp (param_spec->name, "component-type"))
+        {
+          g_signal_handlers_block_by_func (private->precision_combo,
+                                           gimp_template_editor_precision_changed,
+                                           editor);
+
+          gimp_int_combo_box_set_active (
+            GIMP_INT_COMBO_BOX (private->precision_combo),
+            gimp_babl_component_type (gimp_template_get_precision (template)));
+
+          g_signal_handlers_unblock_by_func (private->precision_combo,
+                                             gimp_template_editor_precision_changed,
+                                             editor);
+        }
+    }
+
+#ifdef ENABLE_MEMSIZE_LABEL
+  text = g_format_size (gimp_template_get_initial_size (template));
+  gtk_label_set_text (GTK_LABEL (private->memsize_label), text);
+  g_free (text);
+#endif
+
+  gimp_template_editor_set_pixels (editor, template);
+
+  width  = gimp_template_get_width (template);
+  height = gimp_template_get_height (template);
+
+  if (width > height)
+    aspect = GIMP_ASPECT_LANDSCAPE;
+  else if (height > width)
+    aspect = GIMP_ASPECT_PORTRAIT;
+  else
+    aspect = GIMP_ASPECT_SQUARE;
+
+  private->block_aspect = TRUE;
+  gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (private->aspect_button),
+                                   aspect);
+  private->block_aspect = FALSE;
+
+  gimp_enum_get_value (GIMP_TYPE_IMAGE_BASE_TYPE,
+                       gimp_template_get_base_type (template),
+                       NULL, NULL, &desc, NULL);
+
+  xres = ROUND (gimp_template_get_resolution_x (template));
+  yres = ROUND (gimp_template_get_resolution_y (template));
+
+  if (xres != yres)
+    text = g_strdup_printf (_("%d × %d ppi, %s"), xres, yres, desc);
+  else
+    text = g_strdup_printf (_("%d ppi, %s"), yres, desc);
+
+  gtk_label_set_text (GTK_LABEL (private->more_label), text);
+  g_free (text);
+
+  if (! param_spec                              ||
+      ! strcmp (param_spec->name, "image-type") ||
+      ! strcmp (param_spec->name, "precision"))
+    {
+      GtkListStore *profile_store;
+      GFile        *profile;
+      gchar        *filename;
+
+      filename = gimp_personal_rc_file ("profilerc");
+      profile_store = gimp_color_profile_store_new (filename);
+      g_free (filename);
+
+      gimp_color_profile_store_add_defaults (GIMP_COLOR_PROFILE_STORE (profile_store),
+                                             private->gimp->config->color_management,
+                                             gimp_template_get_base_type (template),
+                                             gimp_template_get_precision (template),
+                                             NULL);
+
+      gtk_combo_box_set_model (GTK_COMBO_BOX (private->profile_combo),
+                               GTK_TREE_MODEL (profile_store));
+      g_object_unref (profile_store);
+
+      g_object_get (template,
+                    "color-profile", &profile,
+                    NULL);
+
+      gimp_color_profile_combo_box_set_active_file (GIMP_COLOR_PROFILE_COMBO_BOX (private->profile_combo),
+                                                    profile, NULL);
+
+      if (profile)
+        g_object_unref (profile);
+    }
+}
diff --git a/app/widgets/gimptemplateeditor.h b/app/widgets/gimptemplateeditor.h
new file mode 100644
index 0000000..79adbda
--- /dev/null
+++ b/app/widgets/gimptemplateeditor.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptemplateeditor.h
+ * Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEMPLATE_EDITOR_H__
+#define __GIMP_TEMPLATE_EDITOR_H__
+
+
+#define GIMP_TYPE_TEMPLATE_EDITOR            (gimp_template_editor_get_type ())
+#define GIMP_TEMPLATE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditor))
+#define GIMP_TEMPLATE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditorClass))
+#define GIMP_IS_TEMPLATE_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEMPLATE_EDITOR))
+#define GIMP_IS_TEMPLATE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEMPLATE_EDITOR))
+#define GIMP_TEMPLATE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditorClass))
+
+
+typedef struct _GimpTemplateEditorClass GimpTemplateEditorClass;
+
+struct _GimpTemplateEditor
+{
+  GtkBox  parent_instance;
+};
+
+struct _GimpTemplateEditorClass
+{
+  GtkBoxClass   parent_class;
+};
+
+
+GType          gimp_template_editor_get_type      (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_template_editor_new           (GimpTemplate       *template,
+                                                   Gimp               *gimp,
+                                                   gboolean            edit_template);
+
+GimpTemplate * gimp_template_editor_get_template  (GimpTemplateEditor *editor);
+
+void           gimp_template_editor_show_advanced (GimpTemplateEditor *editor,
+                                                   gboolean            expanded);
+GtkWidget    * gimp_template_editor_get_size_se   (GimpTemplateEditor *editor);
+GtkWidget    * gimp_template_editor_get_resolution_se
+                                                  (GimpTemplateEditor *editor);
+GtkWidget    * gimp_template_editor_get_resolution_chain
+                                                  (GimpTemplateEditor *editor);
+
+
+#endif  /*  __GIMP_TEMPLATE_EDITOR_H__  */
diff --git a/app/widgets/gimptemplateview.c b/app/widgets/gimptemplateview.c
new file mode 100644
index 0000000..9b7a866
--- /dev/null
+++ b/app/widgets/gimptemplateview.c
@@ -0,0 +1,179 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptemplateview.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimptemplate.h"
+
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpmenufactory.h"
+#include "gimptemplateview.h"
+#include "gimpdnd.h"
+#include "gimphelp-ids.h"
+#include "gimpviewrenderer.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_template_view_activate_item (GimpContainerEditor *editor,
+                                                GimpViewable        *viewable);
+
+
+G_DEFINE_TYPE (GimpTemplateView, gimp_template_view,
+               GIMP_TYPE_CONTAINER_EDITOR);
+
+#define parent_class gimp_template_view_parent_class
+
+
+static void
+gimp_template_view_class_init (GimpTemplateViewClass *klass)
+{
+  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
+
+  editor_class->activate_item = gimp_template_view_activate_item;
+}
+
+static void
+gimp_template_view_init (GimpTemplateView *view)
+{
+  view->create_button    = NULL;
+  view->new_button       = NULL;
+  view->duplicate_button = NULL;
+  view->edit_button      = NULL;
+  view->delete_button    = NULL;
+}
+
+GtkWidget *
+gimp_template_view_new (GimpViewType     view_type,
+                        GimpContainer   *container,
+                        GimpContext     *context,
+                        gint             view_size,
+                        gint             view_border_width,
+                        GimpMenuFactory *menu_factory)
+{
+  GimpTemplateView    *template_view;
+  GimpContainerEditor *editor;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  template_view = g_object_new (GIMP_TYPE_TEMPLATE_VIEW,
+                                "view-type",         view_type,
+                                "container",         container,
+                                "context",           context,
+                                "view-size",         view_size,
+                                "view-border-width", view_border_width,
+                                "menu-factory",      menu_factory,
+                                "menu-identifier",   "<Templates>",
+                                "ui-path",           "/templates-popup",
+                                NULL);
+
+  editor = GIMP_CONTAINER_EDITOR (template_view);
+
+  if (GIMP_IS_CONTAINER_TREE_VIEW (editor->view))
+    {
+      GimpContainerTreeView *tree_view;
+
+      tree_view = GIMP_CONTAINER_TREE_VIEW (editor->view);
+
+      gimp_container_tree_view_connect_name_edited (tree_view,
+                                                    G_CALLBACK (gimp_container_tree_view_name_edited),
+                                                    tree_view);
+    }
+
+  template_view->create_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "templates",
+                                   "templates-create-image", NULL);
+
+  template_view->new_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "templates",
+                                   "templates-new", NULL);
+
+  template_view->duplicate_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "templates",
+                                   "templates-duplicate", NULL);
+
+  template_view->edit_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "templates",
+                                   "templates-edit", NULL);
+
+  template_view->delete_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor->view), "templates",
+                                   "templates-delete", NULL);
+
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (template_view->create_button),
+                                  GIMP_TYPE_TEMPLATE);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (template_view->duplicate_button),
+                                  GIMP_TYPE_TEMPLATE);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (template_view->edit_button),
+                                  GIMP_TYPE_TEMPLATE);
+  gimp_container_view_enable_dnd (editor->view,
+                                  GTK_BUTTON (template_view->delete_button),
+                                  GIMP_TYPE_TEMPLATE);
+
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)),
+                          editor);
+
+  return GTK_WIDGET (template_view);
+}
+
+static void
+gimp_template_view_activate_item (GimpContainerEditor *editor,
+                                  GimpViewable        *viewable)
+{
+  GimpTemplateView *view = GIMP_TEMPLATE_VIEW (editor);
+  GimpContainer    *container;
+
+  if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item)
+    GIMP_CONTAINER_EDITOR_CLASS (parent_class)->activate_item (editor, viewable);
+
+  container = gimp_container_view_get_container (editor->view);
+
+  if (viewable && gimp_container_have (container, GIMP_OBJECT (viewable)))
+    {
+      gtk_button_clicked (GTK_BUTTON (view->create_button));
+    }
+}
diff --git a/app/widgets/gimptemplateview.h b/app/widgets/gimptemplateview.h
new file mode 100644
index 0000000..403be1d
--- /dev/null
+++ b/app/widgets/gimptemplateview.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptemplateview.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEMPLATE_VIEW_H__
+#define __GIMP_TEMPLATE_VIEW_H__
+
+
+#include "gimpcontainereditor.h"
+
+
+#define GIMP_TYPE_TEMPLATE_VIEW            (gimp_template_view_get_type ())
+#define GIMP_TEMPLATE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPLATE_VIEW, GimpTemplateView))
+#define GIMP_TEMPLATE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPLATE_VIEW, GimpTemplateViewClass))
+#define GIMP_IS_TEMPLATE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEMPLATE_VIEW))
+#define GIMP_IS_TEMPLATE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEMPLATE_VIEW))
+#define GIMP_TEMPLATE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEMPLATE_VIEW, GimpTemplateViewClass))
+
+
+typedef struct _GimpTemplateViewClass  GimpTemplateViewClass;
+
+struct _GimpTemplateView
+{
+  GimpContainerEditor  parent_instance;
+
+  GtkWidget           *create_button;
+  GtkWidget           *new_button;
+  GtkWidget           *duplicate_button;
+  GtkWidget           *edit_button;
+  GtkWidget           *delete_button;
+};
+
+struct _GimpTemplateViewClass
+{
+  GimpContainerEditorClass  parent_class;
+};
+
+
+GType       gimp_template_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_template_view_new      (GimpViewType     view_type,
+                                         GimpContainer   *container,
+                                         GimpContext     *context,
+                                         gint             view_size,
+                                         gint             view_border_width,
+                                         GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_TEMPLATE_VIEW_H__  */
diff --git a/app/widgets/gimptextbuffer-serialize.c b/app/widgets/gimptextbuffer-serialize.c
new file mode 100644
index 0000000..61ca3fe
--- /dev/null
+++ b/app/widgets/gimptextbuffer-serialize.c
@@ -0,0 +1,662 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextBuffer-serialize
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * inspired by
+ * gtktextbufferserialize.c
+ * Copyright (C) 2004  Nokia Corporation.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimptextbuffer.h"
+#include "gimptextbuffer-serialize.h"
+
+#include "gimp-intl.h"
+
+
+/*  serialize  */
+
+static gboolean
+open_tag (GimpTextBuffer *buffer,
+          GString        *string,
+          GtkTextTag     *tag)
+{
+  const gchar *name;
+  const gchar *attribute;
+  gchar       *attribute_value;
+
+  name = gimp_text_buffer_tag_to_name (buffer, tag,
+                                       &attribute,
+                                       &attribute_value);
+
+  if (name)
+    {
+      if (attribute && attribute_value)
+        {
+          gchar *escaped = g_markup_escape_text (attribute_value, -1);
+
+          g_string_append_printf (string, "<%s %s=\"%s\">",
+                                  name, attribute, escaped);
+
+          g_free (escaped);
+          g_free (attribute_value);
+        }
+      else
+        {
+          g_string_append_printf (string, "<%s>", name);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+close_tag (GimpTextBuffer *buffer,
+           GString        *string,
+           GtkTextTag     *tag)
+{
+  const gchar *name = gimp_text_buffer_tag_to_name (buffer, tag, NULL, NULL);
+
+  if (name)
+    {
+      g_string_append_printf (string, "</%s>", name);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+guint8 *
+gimp_text_buffer_serialize (GtkTextBuffer     *register_buffer,
+                            GtkTextBuffer     *content_buffer,
+                            const GtkTextIter *start,
+                            const GtkTextIter *end,
+                            gsize             *length,
+                            gpointer           user_data)
+{
+  GString     *string;
+  GtkTextIter  iter, old_iter;
+  GSList      *tag_list;
+  GSList      *active_tags;
+
+  string = g_string_new ("<markup>");
+
+  iter        = *start;
+  tag_list    = NULL;
+  active_tags = NULL;
+
+  do
+    {
+      GSList *tmp;
+      gchar *tmp_text, *escaped_text;
+
+      active_tags = NULL;
+      tag_list = gtk_text_iter_get_tags (&iter);
+
+      /* Handle added tags */
+      for (tmp = tag_list; tmp; tmp = tmp->next)
+        {
+          GtkTextTag *tag = tmp->data;
+
+          open_tag (GIMP_TEXT_BUFFER (register_buffer), string, tag);
+
+          active_tags = g_slist_prepend (active_tags, tag);
+        }
+
+      g_slist_free (tag_list);
+      old_iter = iter;
+
+      /* Now try to go to either the next tag toggle, or if a pixbuf appears */
+      while (TRUE)
+        {
+          gunichar ch = gtk_text_iter_get_char (&iter);
+
+          if (ch == 0xFFFC)
+            {
+              /* pixbuf? can't happen! */
+            }
+          else if (ch == 0)
+            {
+              break;
+            }
+          else
+            {
+              gtk_text_iter_forward_char (&iter);
+            }
+
+          if (gtk_text_iter_toggles_tag (&iter, NULL))
+            break;
+        }
+
+      /* We might have moved too far */
+      if (gtk_text_iter_compare (&iter, end) > 0)
+        iter = *end;
+
+      /* Append the text */
+      tmp_text = gtk_text_iter_get_slice (&old_iter, &iter);
+      escaped_text = g_markup_escape_text (tmp_text, -1);
+      g_free (tmp_text);
+
+      g_string_append (string, escaped_text);
+      g_free (escaped_text);
+
+      /* Close any open tags */
+      for (tmp = active_tags; tmp; tmp = tmp->next)
+        close_tag (GIMP_TEXT_BUFFER (register_buffer), string, tmp->data);
+
+      g_slist_free (active_tags);
+    }
+  while (! gtk_text_iter_equal (&iter, end));
+
+  g_string_append (string, "</markup>");
+
+  *length = string->len;
+
+  return (guint8 *) g_string_free (string, FALSE);
+}
+
+
+/*  deserialize  */
+
+typedef enum
+{
+  STATE_START,
+  STATE_MARKUP,
+  STATE_TAG,
+  STATE_UNKNOWN
+} ParseState;
+
+typedef struct
+{
+  GSList        *states;
+  GtkTextBuffer *register_buffer;
+  GtkTextBuffer *content_buffer;
+  GSList        *tag_stack;
+  GList         *spans;
+} ParseInfo;
+
+typedef struct
+{
+  gchar  *text;
+  GSList *tags;
+} TextSpan;
+
+static void set_error (GError              **err,
+                       GMarkupParseContext  *context,
+                       int                   error_domain,
+                       int                   error_code,
+                       const char           *format,
+                       ...) G_GNUC_PRINTF (5, 6);
+
+static void
+set_error (GError              **err,
+           GMarkupParseContext  *context,
+           int                   error_domain,
+           int                   error_code,
+           const char           *format,
+           ...)
+{
+  gint     line, ch;
+  va_list  args;
+  gchar   *str;
+
+  g_markup_parse_context_get_position (context, &line, &ch);
+
+  va_start (args, format);
+  str = g_strdup_vprintf (format, args);
+  va_end (args);
+
+  g_set_error (err, error_domain, error_code,
+               ("Line %d character %d: %s"),
+               line, ch, str);
+
+  g_free (str);
+}
+
+static void
+push_state (ParseInfo  *info,
+            ParseState  state)
+{
+  info->states = g_slist_prepend (info->states, GINT_TO_POINTER (state));
+}
+
+static void
+pop_state (ParseInfo *info)
+{
+  g_return_if_fail (info->states != NULL);
+
+  info->states = g_slist_remove (info->states, info->states->data);
+}
+
+static ParseState
+peek_state (ParseInfo *info)
+{
+  g_return_val_if_fail (info->states != NULL, STATE_START);
+
+  return GPOINTER_TO_INT (info->states->data);
+}
+
+static gboolean
+check_no_attributes (GMarkupParseContext  *context,
+                     const char           *element_name,
+                     const char          **attribute_names,
+                     const char          **attribute_values,
+                     GError              **error)
+{
+  if (attribute_names[0] != NULL)
+    {
+      set_error (error, context,
+                 G_MARKUP_ERROR,
+                 G_MARKUP_ERROR_PARSE,
+                 _("Attribute \"%s\" is invalid on <%s> element in this context"),
+                 attribute_names[0], element_name);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+parse_tag_element (GMarkupParseContext  *context,
+                   const gchar          *element_name,
+                   const gchar         **attribute_names,
+                   const gchar         **attribute_values,
+                   ParseInfo            *info,
+                   GError              **error)
+{
+  GtkTextTag  *tag;
+  const gchar *attribute_name  = NULL;
+  const gchar *attribute_value = NULL;
+
+  gimp_assert (peek_state (info) == STATE_MARKUP ||
+               peek_state (info) == STATE_TAG    ||
+               peek_state (info) == STATE_UNKNOWN);
+
+  if (attribute_names)
+    attribute_name = attribute_names[0];
+
+  if (attribute_values)
+    attribute_value = attribute_values[0];
+
+  tag = gimp_text_buffer_name_to_tag (GIMP_TEXT_BUFFER (info->register_buffer),
+                                      element_name,
+                                      attribute_name, attribute_value);
+
+  if (tag)
+    {
+      info->tag_stack = g_slist_prepend (info->tag_stack, tag);
+
+      push_state (info, STATE_TAG);
+    }
+  else
+    {
+      push_state (info, STATE_UNKNOWN);
+    }
+}
+
+static void
+start_element_handler (GMarkupParseContext  *context,
+                       const gchar          *element_name,
+                       const gchar         **attribute_names,
+                       const gchar         **attribute_values,
+                       gpointer              user_data,
+                       GError              **error)
+{
+  ParseInfo *info = user_data;
+
+  switch (peek_state (info))
+    {
+    case STATE_START:
+      if (! strcmp (element_name, "markup"))
+        {
+          if (! check_no_attributes (context, element_name,
+                                     attribute_names, attribute_values,
+                                     error))
+            return;
+
+          push_state (info, STATE_MARKUP);
+          break;
+        }
+      else
+        {
+          set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
+                     _("Outermost element in text must be <markup> not <%s>"),
+                     element_name);
+        }
+      break;
+
+    case STATE_MARKUP:
+    case STATE_TAG:
+    case STATE_UNKNOWN:
+      parse_tag_element (context, element_name,
+                         attribute_names, attribute_values,
+                         info, error);
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+      break;
+    }
+}
+
+static void
+end_element_handler (GMarkupParseContext  *context,
+                     const gchar          *element_name,
+                     gpointer              user_data,
+                     GError              **error)
+{
+  ParseInfo *info = user_data;
+
+  switch (peek_state (info))
+    {
+    case STATE_UNKNOWN:
+      pop_state (info);
+      gimp_assert (peek_state (info) == STATE_UNKNOWN ||
+                   peek_state (info) == STATE_TAG     ||
+                   peek_state (info) == STATE_MARKUP);
+      break;
+
+    case STATE_TAG:
+      pop_state (info);
+      gimp_assert (peek_state (info) == STATE_UNKNOWN ||
+                   peek_state (info) == STATE_TAG     ||
+                   peek_state (info) == STATE_MARKUP);
+
+      /* Pop tag */
+      info->tag_stack = g_slist_delete_link (info->tag_stack,
+                                             info->tag_stack);
+      break;
+
+    case STATE_MARKUP:
+      pop_state (info);
+      gimp_assert (peek_state (info) == STATE_START);
+
+      info->spans = g_list_reverse (info->spans);
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+      break;
+    }
+}
+
+static gboolean
+all_whitespace (const char *text,
+                gint        text_len)
+{
+  const char *p   = text;
+  const char *end = text + text_len;
+
+  while (p != end)
+    {
+      if (! g_ascii_isspace (*p))
+        return FALSE;
+
+      p = g_utf8_next_char (p);
+    }
+
+  return TRUE;
+}
+
+static void
+text_handler (GMarkupParseContext  *context,
+              const gchar          *text,
+              gsize                 text_len,
+              gpointer              user_data,
+              GError              **error)
+{
+  ParseInfo *info = user_data;
+  TextSpan  *span;
+
+  if (all_whitespace (text, text_len)   &&
+      peek_state (info) != STATE_MARKUP &&
+      peek_state (info) != STATE_TAG    &&
+      peek_state (info) != STATE_UNKNOWN)
+    return;
+
+  switch (peek_state (info))
+    {
+    case STATE_START:
+      gimp_assert_not_reached (); /* gmarkup shouldn't do this */
+      break;
+
+    case STATE_MARKUP:
+    case STATE_TAG:
+    case STATE_UNKNOWN:
+      if (text_len == 0)
+        return;
+
+      span = g_new0 (TextSpan, 1);
+      span->text = g_strndup (text, text_len);
+      span->tags = g_slist_copy (info->tag_stack);
+
+      info->spans = g_list_prepend (info->spans, span);
+      break;
+
+    default:
+      gimp_assert_not_reached ();
+      break;
+    }
+}
+
+static void
+parse_info_init (ParseInfo     *info,
+                 GtkTextBuffer *register_buffer,
+                 GtkTextBuffer *content_buffer)
+{
+  info->states          = g_slist_prepend (NULL, GINT_TO_POINTER (STATE_START));
+  info->tag_stack       = NULL;
+  info->spans           = NULL;
+  info->register_buffer = register_buffer;
+  info->content_buffer  = content_buffer;
+}
+
+static void
+text_span_free (TextSpan *span)
+{
+  g_free (span->text);
+  g_slist_free (span->tags);
+  g_free (span);
+}
+
+static void
+parse_info_free (ParseInfo *info)
+{
+  g_slist_free (info->tag_stack);
+  g_slist_free (info->states);
+
+  g_list_free_full (info->spans, (GDestroyNotify) text_span_free);
+}
+
+static void
+insert_text (ParseInfo   *info,
+             GtkTextIter *iter)
+{
+  GtkTextIter  start_iter;
+  GtkTextMark *mark;
+  GList       *tmp;
+  GSList      *tags;
+
+  start_iter = *iter;
+
+  mark = gtk_text_buffer_create_mark (info->content_buffer,
+                                      "deserialize-insert-point",
+                                      &start_iter, TRUE);
+
+  for (tmp = info->spans; tmp; tmp = tmp->next)
+    {
+      TextSpan *span = tmp->data;
+
+      if (span->text)
+        gtk_text_buffer_insert (info->content_buffer, iter, span->text, -1);
+
+      gtk_text_buffer_get_iter_at_mark (info->content_buffer, &start_iter, mark);
+
+      /* Apply tags */
+      for (tags = span->tags; tags; tags = tags->next)
+        {
+          GtkTextTag *tag = tags->data;
+
+          gtk_text_buffer_apply_tag (info->content_buffer, tag,
+                                     &start_iter, iter);
+        }
+
+      gtk_text_buffer_move_mark (info->content_buffer, mark, iter);
+    }
+
+  gtk_text_buffer_delete_mark (info->content_buffer, mark);
+}
+
+gboolean
+gimp_text_buffer_deserialize (GtkTextBuffer *register_buffer,
+                              GtkTextBuffer *content_buffer,
+                              GtkTextIter   *iter,
+                              const guint8  *text,
+                              gsize          length,
+                              gboolean       create_tags,
+                              gpointer       user_data,
+                              GError       **error)
+{
+  GMarkupParseContext *context;
+  ParseInfo            info;
+  gboolean             retval = FALSE;
+
+  static const GMarkupParser markup_parser =
+  {
+    start_element_handler,
+    end_element_handler,
+    text_handler,
+    NULL,
+    NULL
+  };
+
+  parse_info_init (&info, register_buffer, content_buffer);
+
+  context = g_markup_parse_context_new (&markup_parser, 0, &info, NULL);
+
+  if (! g_markup_parse_context_parse (context,
+                                      (const gchar *) text,
+                                      length,
+                                      error))
+    goto out;
+
+  if (! g_markup_parse_context_end_parse (context, error))
+    goto out;
+
+  retval = TRUE;
+
+  insert_text (&info, iter);
+
+ out:
+  parse_info_free (&info);
+
+  g_markup_parse_context_free (context);
+
+  return retval;
+}
+
+void
+gimp_text_buffer_pre_serialize (GimpTextBuffer *buffer,
+                                GtkTextBuffer  *content)
+{
+  GtkTextIter iter;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (content));
+
+  gtk_text_buffer_get_start_iter (content, &iter);
+
+  do
+    {
+      GSList *tags = gtk_text_iter_get_tags (&iter);
+      GSList *list;
+
+      for (list = tags; list; list = g_slist_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          if (g_list_find (buffer->kerning_tags, tag))
+            {
+              GtkTextIter end;
+
+              gtk_text_buffer_insert_with_tags (content, &iter,
+                                                WORD_JOINER, -1,
+                                                tag, NULL);
+
+              end = iter;
+              gtk_text_iter_forward_char (&end);
+
+              gtk_text_buffer_remove_tag (content, tag, &iter, &end);
+              break;
+            }
+        }
+
+      g_slist_free (tags);
+    }
+  while (gtk_text_iter_forward_char (&iter));
+}
+
+void
+gimp_text_buffer_post_deserialize (GimpTextBuffer *buffer,
+                                   GtkTextBuffer  *content)
+{
+  GtkTextIter iter;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (content));
+
+  gtk_text_buffer_get_start_iter (content, &iter);
+
+  do
+    {
+      GSList *tags = gtk_text_iter_get_tags (&iter);
+      GSList *list;
+
+      for (list = tags; list; list = g_slist_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          if (g_list_find (buffer->kerning_tags, tag))
+            {
+              GtkTextIter end;
+
+              gtk_text_iter_forward_char (&iter);
+              gtk_text_buffer_backspace (content, &iter, FALSE, TRUE);
+
+              end = iter;
+              gtk_text_iter_forward_char (&end);
+
+              gtk_text_buffer_apply_tag (content, tag, &iter, &end);
+              break;
+            }
+        }
+
+      g_slist_free (tags);
+    }
+  while (gtk_text_iter_forward_char (&iter));
+}
diff --git a/app/widgets/gimptextbuffer-serialize.h b/app/widgets/gimptextbuffer-serialize.h
new file mode 100644
index 0000000..468e73c
--- /dev/null
+++ b/app/widgets/gimptextbuffer-serialize.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextBuffer-serialize
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * inspired by
+ * gtktextbufferserialize.h
+ * Copyright (C) 2004  Nokia Corporation.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_BUFFER_SERIALIZE_H__
+#define __GIMP_TEXT_BUFFER_SERIALIZE_H__
+
+
+#define WORD_JOINER        "\342\201\240"
+#define WORD_JOINER_LENGTH 3
+
+
+guint8   * gimp_text_buffer_serialize        (GtkTextBuffer     *register_buffer,
+                                              GtkTextBuffer     *content_buffer,
+                                              const GtkTextIter *start,
+                                              const GtkTextIter *end,
+                                              gsize             *length,
+                                              gpointer           user_data);
+gboolean   gimp_text_buffer_deserialize      (GtkTextBuffer     *register_buffer,
+                                              GtkTextBuffer     *content_buffer,
+                                              GtkTextIter       *iter,
+                                              const guint8      *data,
+                                              gsize              length,
+                                              gboolean           create_tags,
+                                              gpointer           user_data,
+                                              GError           **error);
+
+void       gimp_text_buffer_pre_serialize    (GimpTextBuffer    *buffer,
+                                              GtkTextBuffer     *content);
+void       gimp_text_buffer_post_deserialize (GimpTextBuffer    *buffer,
+                                              GtkTextBuffer     *content);
+
+
+
+#endif /* __GIMP_TEXT_BUFFER_SERIALIZE_H__ */
diff --git a/app/widgets/gimptextbuffer.c b/app/widgets/gimptextbuffer.c
new file mode 100644
index 0000000..cbb0a90
--- /dev/null
+++ b/app/widgets/gimptextbuffer.c
@@ -0,0 +1,1800 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextBuffer
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "widgets-types.h"
+
+#include "gimptextbuffer.h"
+#include "gimptextbuffer-serialize.h"
+#include "gimptexttag.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  COLOR_APPLIED,
+  LAST_SIGNAL
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_text_buffer_constructed (GObject           *object);
+static void   gimp_text_buffer_dispose     (GObject           *object);
+static void   gimp_text_buffer_finalize    (GObject           *object);
+
+static void   gimp_text_buffer_mark_set    (GtkTextBuffer     *buffer,
+                                            const GtkTextIter *location,
+                                            GtkTextMark       *mark);
+
+
+G_DEFINE_TYPE (GimpTextBuffer, gimp_text_buffer, GTK_TYPE_TEXT_BUFFER)
+
+#define parent_class gimp_text_buffer_parent_class
+
+static guint buffer_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_text_buffer_class_init (GimpTextBufferClass *klass)
+{
+  GObjectClass       *object_class = G_OBJECT_CLASS (klass);
+  GtkTextBufferClass *buffer_class = GTK_TEXT_BUFFER_CLASS (klass);
+
+  object_class->constructed = gimp_text_buffer_constructed;
+  object_class->dispose     = gimp_text_buffer_dispose;
+  object_class->finalize    = gimp_text_buffer_finalize;
+
+  buffer_class->mark_set    = gimp_text_buffer_mark_set;
+
+  buffer_signals[COLOR_APPLIED] =
+    g_signal_new ("color-applied",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpTextBufferClass, color_applied),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__BOXED,
+                  G_TYPE_NONE, 1,
+                  GIMP_TYPE_RGB);
+}
+
+static void
+gimp_text_buffer_init (GimpTextBuffer *buffer)
+{
+  buffer->markup_atom =
+    gtk_text_buffer_register_serialize_format (GTK_TEXT_BUFFER (buffer),
+                                               "application/x-gimp-pango-markup",
+                                               gimp_text_buffer_serialize,
+                                               NULL, NULL);
+
+  gtk_text_buffer_register_deserialize_format (GTK_TEXT_BUFFER (buffer),
+                                               "application/x-gimp-pango-markup",
+                                               gimp_text_buffer_deserialize,
+                                               NULL, NULL);
+}
+
+static void
+gimp_text_buffer_constructed (GObject *object)
+{
+  GimpTextBuffer *buffer = GIMP_TEXT_BUFFER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), "", -1);
+
+  buffer->bold_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                                 "bold",
+                                                 "weight", PANGO_WEIGHT_BOLD,
+                                                 NULL);
+
+  buffer->italic_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                                   "italic",
+                                                   "style", PANGO_STYLE_ITALIC,
+                                                   NULL);
+
+  buffer->underline_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                                      "underline",
+                                                      "underline", PANGO_UNDERLINE_SINGLE,
+                                                      NULL);
+
+  buffer->preedit_underline_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                                              "preedit-underline",
+                                                              "underline", PANGO_UNDERLINE_SINGLE,
+                                                              NULL);
+
+  buffer->strikethrough_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                                          "strikethrough",
+                                                          "strikethrough", TRUE,
+                                                          NULL);
+}
+
+static void
+gimp_text_buffer_dispose (GObject *object)
+{
+  /* GimpTextBuffer *buffer = GIMP_TEXT_BUFFER (object); */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_text_buffer_finalize (GObject *object)
+{
+  GimpTextBuffer *buffer = GIMP_TEXT_BUFFER (object);
+
+  if (buffer->size_tags)
+    {
+      g_list_free (buffer->size_tags);
+      buffer->size_tags = NULL;
+    }
+
+  if (buffer->baseline_tags)
+    {
+      g_list_free (buffer->baseline_tags);
+      buffer->baseline_tags = NULL;
+    }
+
+  if (buffer->kerning_tags)
+    {
+      g_list_free (buffer->kerning_tags);
+      buffer->kerning_tags = NULL;
+    }
+
+  if (buffer->font_tags)
+    {
+      g_list_free (buffer->font_tags);
+      buffer->font_tags = NULL;
+    }
+
+  if (buffer->color_tags)
+    {
+      g_list_free (buffer->color_tags);
+      buffer->color_tags = NULL;
+    }
+
+  if (buffer->preedit_color_tags)
+    {
+      g_list_free (buffer->preedit_color_tags);
+      buffer->preedit_color_tags = NULL;
+    }
+
+  if (buffer->preedit_bg_color_tags)
+    {
+      g_list_free (buffer->preedit_bg_color_tags);
+      buffer->preedit_bg_color_tags = NULL;
+    }
+
+  gimp_text_buffer_clear_insert_tags (buffer);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_buffer_mark_set (GtkTextBuffer     *buffer,
+                           const GtkTextIter *location,
+                           GtkTextMark       *mark)
+{
+  gimp_text_buffer_clear_insert_tags (GIMP_TEXT_BUFFER (buffer));
+
+  GTK_TEXT_BUFFER_CLASS (parent_class)->mark_set (buffer, location, mark);
+}
+
+
+/*  public functions  */
+
+GimpTextBuffer *
+gimp_text_buffer_new (void)
+{
+  return g_object_new (GIMP_TYPE_TEXT_BUFFER, NULL);
+}
+
+void
+gimp_text_buffer_set_text (GimpTextBuffer *buffer,
+                           const gchar    *text)
+{
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+
+  if (text == NULL)
+    text = "";
+
+  gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), text, -1);
+
+  gimp_text_buffer_clear_insert_tags (buffer);
+}
+
+gchar *
+gimp_text_buffer_get_text (GimpTextBuffer *buffer)
+{
+  GtkTextIter start, end;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), NULL);
+
+  gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer), &start, &end);
+
+  return gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer),
+                                   &start, &end, TRUE);
+}
+
+void
+gimp_text_buffer_set_markup (GimpTextBuffer *buffer,
+                             const gchar    *markup)
+{
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+
+  gimp_text_buffer_set_text (buffer, NULL);
+
+  if (markup)
+    {
+      GtkTextTagTable *tag_table;
+      GtkTextBuffer   *content;
+      GtkTextIter      insert;
+      GError          *error = NULL;
+
+      tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (buffer));
+      content = gtk_text_buffer_new (tag_table);
+
+      gtk_text_buffer_get_start_iter (content, &insert);
+
+      if (! gtk_text_buffer_deserialize (GTK_TEXT_BUFFER (buffer),
+                                         content,
+                                         buffer->markup_atom,
+                                         &insert,
+                                         (const guint8 *) markup, -1,
+                                         &error))
+        {
+          g_printerr ("EEK: %s\n", error->message);
+          g_clear_error (&error);
+        }
+      else
+        {
+          GtkTextIter start, end;
+
+          gimp_text_buffer_post_deserialize (buffer, content);
+
+          gtk_text_buffer_get_bounds (content, &start, &end);
+          gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &insert);
+
+          gtk_text_buffer_insert_range (GTK_TEXT_BUFFER (buffer),
+                                        &insert, &start, &end);
+        }
+
+      g_object_unref (content);
+    }
+
+  gimp_text_buffer_clear_insert_tags (buffer);
+}
+
+gchar *
+gimp_text_buffer_get_markup (GimpTextBuffer *buffer)
+{
+  GtkTextTagTable *tag_table;
+  GtkTextBuffer   *content;
+  GtkTextIter      insert;
+  GtkTextIter      start, end;
+  gchar           *markup;
+  gsize            length;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), NULL);
+
+  tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (buffer));
+  content = gtk_text_buffer_new (tag_table);
+
+  gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer), &start, &end);
+  gtk_text_buffer_get_start_iter (content, &insert);
+
+  gtk_text_buffer_insert_range (content, &insert, &start, &end);
+
+  gimp_text_buffer_pre_serialize (buffer, content);
+
+  gtk_text_buffer_get_bounds (content, &start, &end);
+
+  markup = (gchar *) gtk_text_buffer_serialize (GTK_TEXT_BUFFER (buffer),
+                                                content,
+                                                buffer->markup_atom,
+                                                &start, &end,
+                                                &length);
+
+  g_object_unref (content);
+
+  return markup;
+}
+
+gboolean
+gimp_text_buffer_has_markup (GimpTextBuffer *buffer)
+{
+  GtkTextIter iter;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), FALSE);
+
+  gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter);
+
+  do
+    {
+      GSList *tags = gtk_text_iter_get_tags (&iter);
+
+      if (tags)
+        {
+          g_slist_free (tags);
+          return TRUE;
+        }
+    }
+  while (gtk_text_iter_forward_char (&iter));
+
+  return FALSE;
+}
+
+GtkTextTag *
+gimp_text_buffer_get_iter_size (GimpTextBuffer    *buffer,
+                                const GtkTextIter *iter,
+                                gint              *size)
+{
+  GList *list;
+
+  for (list = buffer->size_tags; list; list = g_list_next (list))
+    {
+      GtkTextTag *tag = list->data;
+
+      if (gtk_text_iter_has_tag (iter, tag))
+        {
+          if (size)
+            *size = gimp_text_tag_get_size (tag);
+
+          return tag;
+        }
+    }
+
+  if (size)
+    *size = 0;
+
+  return NULL;
+}
+
+GtkTextTag *
+gimp_text_buffer_get_size_tag (GimpTextBuffer *buffer,
+                               gint            size)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[32];
+
+  for (list = buffer->size_tags; list; list = g_list_next (list))
+    {
+      tag = list->data;
+
+      if (size == gimp_text_tag_get_size (tag))
+        return tag;
+    }
+
+  g_snprintf (name, sizeof (name), "size-%d", size);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    GIMP_TEXT_PROP_NAME_SIZE, size,
+                                    NULL);
+
+  buffer->size_tags = g_list_prepend (buffer->size_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_size (GimpTextBuffer    *buffer,
+                           const GtkTextIter *start,
+                           const GtkTextIter *end,
+                           gint               size)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->size_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (size != 0)
+    {
+      GtkTextTag *tag;
+
+      tag = gimp_text_buffer_get_size_tag (buffer, size);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+void
+gimp_text_buffer_change_size (GimpTextBuffer    *buffer,
+                              const GtkTextIter *start,
+                              const GtkTextIter *end,
+                              gint               count)
+{
+  GtkTextIter  iter;
+  GtkTextIter  span_start;
+  GtkTextIter  span_end;
+  GtkTextTag  *span_tag;
+  gint         span_size;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  iter       = *start;
+  span_start = *start;
+  span_tag   = gimp_text_buffer_get_iter_size (buffer, &iter,
+                                               &span_size);
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  do
+    {
+      GtkTextTag *iter_tag;
+      gint        iter_size;
+
+      gtk_text_iter_forward_char (&iter);
+
+      iter_tag = gimp_text_buffer_get_iter_size (buffer, &iter,
+                                                 &iter_size);
+
+      span_end = iter;
+
+      if (iter_size != span_size ||
+          gtk_text_iter_compare (&iter, end) >= 0)
+        {
+          if (span_size != 0)
+            {
+              gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), span_tag,
+                                          &span_start, &span_end);
+            }
+
+          if ((span_size + count) > 0)
+            {
+              span_tag = gimp_text_buffer_get_size_tag (buffer,
+                                                        span_size + count);
+
+              gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), span_tag,
+                                         &span_start, &span_end);
+            }
+
+          span_start = iter;
+          span_size  = iter_size;
+          span_tag   = iter_tag;
+        }
+
+      /* We might have moved too far */
+      if (gtk_text_iter_compare (&iter, end) > 0)
+        iter = *end;
+    }
+  while (! gtk_text_iter_equal (&iter, end));
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+GtkTextTag *
+gimp_text_buffer_get_iter_baseline (GimpTextBuffer    *buffer,
+                                    const GtkTextIter *iter,
+                                    gint              *baseline)
+{
+  GList *list;
+
+  for (list = buffer->baseline_tags; list; list = g_list_next (list))
+    {
+      GtkTextTag *tag = list->data;
+
+      if (gtk_text_iter_has_tag (iter, tag))
+        {
+          if (baseline)
+            *baseline = gimp_text_tag_get_baseline (tag);
+
+          return tag;
+        }
+    }
+
+  if (baseline)
+    *baseline = 0;
+
+  return NULL;
+}
+
+static GtkTextTag *
+gimp_text_buffer_get_baseline_tag (GimpTextBuffer *buffer,
+                                   gint            baseline)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[32];
+
+  for (list = buffer->baseline_tags; list; list = g_list_next (list))
+    {
+      tag = list->data;
+
+      if (baseline == gimp_text_tag_get_baseline (tag))
+        return tag;
+    }
+
+  g_snprintf (name, sizeof (name), "baseline-%d", baseline);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    GIMP_TEXT_PROP_NAME_BASELINE, baseline,
+                                    NULL);
+
+  buffer->baseline_tags = g_list_prepend (buffer->baseline_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_baseline (GimpTextBuffer    *buffer,
+                               const GtkTextIter *start,
+                               const GtkTextIter *end,
+                               gint               baseline)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->baseline_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (baseline != 0)
+    {
+      GtkTextTag *tag;
+
+      tag = gimp_text_buffer_get_baseline_tag (buffer, baseline);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+void
+gimp_text_buffer_change_baseline (GimpTextBuffer    *buffer,
+                                  const GtkTextIter *start,
+                                  const GtkTextIter *end,
+                                  gint               count)
+{
+  GtkTextIter  iter;
+  GtkTextIter  span_start;
+  GtkTextIter  span_end;
+  GtkTextTag  *span_tag;
+  gint         span_baseline;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  iter       = *start;
+  span_start = *start;
+  span_tag   = gimp_text_buffer_get_iter_baseline (buffer, &iter,
+                                                   &span_baseline);
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  do
+    {
+      GtkTextTag *iter_tag;
+      gint        iter_baseline;
+
+      gtk_text_iter_forward_char (&iter);
+
+      iter_tag = gimp_text_buffer_get_iter_baseline (buffer, &iter,
+                                                     &iter_baseline);
+
+      span_end = iter;
+
+      if (iter_baseline != span_baseline ||
+          gtk_text_iter_compare (&iter, end) >= 0)
+        {
+          if (span_baseline != 0)
+            {
+              gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), span_tag,
+                                          &span_start, &span_end);
+            }
+
+          if (span_baseline + count != 0)
+            {
+              span_tag = gimp_text_buffer_get_baseline_tag (buffer,
+                                                            span_baseline + count);
+
+              gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), span_tag,
+                                         &span_start, &span_end);
+            }
+
+          span_start    = iter;
+          span_baseline = iter_baseline;
+          span_tag      = iter_tag;
+        }
+
+      /* We might have moved too far */
+      if (gtk_text_iter_compare (&iter, end) > 0)
+        iter = *end;
+    }
+  while (! gtk_text_iter_equal (&iter, end));
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+GtkTextTag *
+gimp_text_buffer_get_iter_kerning (GimpTextBuffer    *buffer,
+                                   const GtkTextIter *iter,
+                                   gint              *kerning)
+{
+  GList *list;
+
+  for (list = buffer->kerning_tags; list; list = g_list_next (list))
+    {
+      GtkTextTag *tag = list->data;
+
+      if (gtk_text_iter_has_tag (iter, tag))
+        {
+          if (kerning)
+            *kerning = gimp_text_tag_get_kerning (tag);
+
+          return tag;
+        }
+    }
+
+  if (kerning)
+    *kerning = 0;
+
+  return NULL;
+}
+
+static GtkTextTag *
+gimp_text_buffer_get_kerning_tag (GimpTextBuffer *buffer,
+                                  gint            kerning)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[32];
+
+  for (list = buffer->kerning_tags; list; list = g_list_next (list))
+    {
+      tag = list->data;
+
+      if (kerning == gimp_text_tag_get_kerning (tag))
+        return tag;
+    }
+
+  g_snprintf (name, sizeof (name), "kerning-%d", kerning);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    GIMP_TEXT_PROP_NAME_KERNING, kerning,
+                                    NULL);
+
+  buffer->kerning_tags = g_list_prepend (buffer->kerning_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_kerning (GimpTextBuffer    *buffer,
+                              const GtkTextIter *start,
+                              const GtkTextIter *end,
+                              gint               kerning)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->kerning_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (kerning != 0)
+    {
+      GtkTextTag *tag;
+
+      tag = gimp_text_buffer_get_kerning_tag (buffer, kerning);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+void
+gimp_text_buffer_change_kerning (GimpTextBuffer    *buffer,
+                                 const GtkTextIter *start,
+                                 const GtkTextIter *end,
+                                 gint               count)
+{
+  GtkTextIter  iter;
+  GtkTextIter  span_start;
+  GtkTextIter  span_end;
+  GtkTextTag  *span_tag;
+  gint         span_kerning;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  iter       = *start;
+  span_start = *start;
+  span_tag   = gimp_text_buffer_get_iter_kerning (buffer, &iter,
+                                                  &span_kerning);
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  do
+    {
+      GtkTextTag *iter_tag;
+      gint        iter_kerning;
+
+      gtk_text_iter_forward_char (&iter);
+
+      iter_tag = gimp_text_buffer_get_iter_kerning (buffer, &iter,
+                                                    &iter_kerning);
+
+      span_end = iter;
+
+      if (iter_kerning != span_kerning ||
+          gtk_text_iter_compare (&iter, end) >= 0)
+        {
+          if (span_kerning != 0)
+            {
+              gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), span_tag,
+                                          &span_start, &span_end);
+            }
+
+          if (span_kerning + count != 0)
+            {
+              span_tag = gimp_text_buffer_get_kerning_tag (buffer,
+                                                           span_kerning + count);
+
+              gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), span_tag,
+                                         &span_start, &span_end);
+            }
+
+          span_start   = iter;
+          span_kerning = iter_kerning;
+          span_tag     = iter_tag;
+        }
+
+      /* We might have moved too far */
+      if (gtk_text_iter_compare (&iter, end) > 0)
+        iter = *end;
+    }
+  while (! gtk_text_iter_equal (&iter, end));
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+GtkTextTag *
+gimp_text_buffer_get_iter_font (GimpTextBuffer     *buffer,
+                                const GtkTextIter  *iter,
+                                gchar             **font)
+{
+  GList *list;
+
+  for (list = buffer->font_tags; list; list = g_list_next (list))
+    {
+      GtkTextTag *tag = list->data;
+
+      if (gtk_text_iter_has_tag (iter, tag))
+        {
+          if (font)
+            *font = gimp_text_tag_get_font (tag);
+
+          return tag;
+        }
+    }
+
+  if (font)
+    *font = NULL;
+
+  return NULL;
+}
+
+GtkTextTag *
+gimp_text_buffer_get_font_tag (GimpTextBuffer *buffer,
+                               const gchar    *font)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[256];
+  PangoFontDescription *pfd = pango_font_description_from_string (font);
+  char *description = pango_font_description_to_string (pfd);
+
+  pango_font_description_free (pfd);
+
+  for (list = buffer->font_tags; list; list = g_list_next (list))
+    {
+      gchar *tag_font;
+
+      tag = list->data;
+
+      tag_font = gimp_text_tag_get_font (tag);
+
+      if (! strcmp (description, tag_font))
+        {
+          g_free (tag_font);
+          g_free (description);
+          return tag;
+        }
+
+      g_free (tag_font);
+    }
+
+  g_snprintf (name, sizeof (name), "font-%s", description);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    "font", description,
+                                    NULL);
+  gtk_text_tag_set_priority (tag, 0);
+  g_free (description);
+  buffer->font_tags = g_list_prepend (buffer->font_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_font (GimpTextBuffer    *buffer,
+                           const GtkTextIter *start,
+                           const GtkTextIter *end,
+                           const gchar       *font)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->font_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (font)
+    {
+      GtkTextTag *tag = gimp_text_buffer_get_font_tag (buffer, font);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+GtkTextTag *
+gimp_text_buffer_get_iter_color (GimpTextBuffer    *buffer,
+                                 const GtkTextIter *iter,
+                                 GimpRGB           *color)
+{
+  GList *list;
+
+  for (list = buffer->color_tags; list; list = g_list_next (list))
+    {
+      GtkTextTag *tag = list->data;
+
+      if (gtk_text_iter_has_tag (iter, tag))
+        {
+          if (color)
+            gimp_text_tag_get_fg_color (tag, color);
+
+          return tag;
+        }
+    }
+
+  return NULL;
+}
+
+GtkTextTag *
+gimp_text_buffer_get_color_tag (GimpTextBuffer *buffer,
+                                const GimpRGB  *color)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[256];
+  GdkColor    gdk_color;
+  guchar      r, g, b;
+
+  gimp_rgb_get_uchar (color, &r, &g, &b);
+
+  for (list = buffer->color_tags; list; list = g_list_next (list))
+    {
+      GimpRGB tag_color;
+      guchar  tag_r, tag_g, tag_b;
+
+      tag = list->data;
+
+      gimp_text_tag_get_fg_color (tag, &tag_color);
+
+      gimp_rgb_get_uchar (&tag_color, &tag_r, &tag_g, &tag_b);
+
+      /* Do not compare the alpha channel, since it's unused */
+      if (tag_r == r &&
+          tag_g == g &&
+          tag_b == b)
+        {
+          return tag;
+        }
+    }
+
+  g_snprintf (name, sizeof (name), "color-#%02x%02x%02x",
+              r, g, b);
+
+  gimp_rgb_get_gdk_color (color, &gdk_color);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    "foreground-gdk", &gdk_color,
+                                    "foreground-set", TRUE,
+                                    NULL);
+
+  buffer->color_tags = g_list_prepend (buffer->color_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_color (GimpTextBuffer    *buffer,
+                            const GtkTextIter *start,
+                            const GtkTextIter *end,
+                            const GimpRGB     *color)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->color_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (color)
+    {
+      GtkTextTag *tag = gimp_text_buffer_get_color_tag (buffer, color);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+
+      g_signal_emit (buffer, buffer_signals[COLOR_APPLIED], 0, color);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+GtkTextTag *
+gimp_text_buffer_get_preedit_color_tag (GimpTextBuffer *buffer,
+                                        const GimpRGB  *color)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[256];
+  GdkColor    gdk_color;
+  guchar      r, g, b;
+
+  gimp_rgb_get_uchar (color, &r, &g, &b);
+
+  for (list = buffer->preedit_color_tags; list; list = g_list_next (list))
+    {
+      GimpRGB tag_color;
+      guchar  tag_r, tag_g, tag_b;
+
+      tag = list->data;
+
+      gimp_text_tag_get_fg_color (tag, &tag_color);
+
+      gimp_rgb_get_uchar (&tag_color, &tag_r, &tag_g, &tag_b);
+
+      /* Do not compare the alpha channel, since it's unused */
+      if (tag_r == r &&
+          tag_g == g &&
+          tag_b == b)
+        {
+          return tag;
+        }
+    }
+
+  g_snprintf (name, sizeof (name), "preedit-color-#%02x%02x%02x",
+              r, g, b);
+
+  gimp_rgb_get_gdk_color (color, &gdk_color);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    "foreground-gdk", &gdk_color,
+                                    "foreground-set", TRUE,
+                                    NULL);
+
+  buffer->preedit_color_tags = g_list_prepend (buffer->preedit_color_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_preedit_color (GimpTextBuffer    *buffer,
+                                    const GtkTextIter *start,
+                                    const GtkTextIter *end,
+                                    const GimpRGB     *color)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->preedit_color_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (color)
+    {
+      GtkTextTag *tag = gimp_text_buffer_get_preedit_color_tag (buffer, color);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+GtkTextTag *
+gimp_text_buffer_get_preedit_bg_color_tag (GimpTextBuffer *buffer,
+                                           const GimpRGB  *color)
+{
+  GList      *list;
+  GtkTextTag *tag;
+  gchar       name[256];
+  GdkColor    gdk_color;
+  guchar      r, g, b;
+
+  gimp_rgb_get_uchar (color, &r, &g, &b);
+
+  for (list = buffer->preedit_bg_color_tags; list; list = g_list_next (list))
+    {
+      GimpRGB tag_color;
+      guchar  tag_r, tag_g, tag_b;
+
+      tag = list->data;
+
+      gimp_text_tag_get_bg_color (tag, &tag_color);
+
+      gimp_rgb_get_uchar (&tag_color, &tag_r, &tag_g, &tag_b);
+
+      /* Do not compare the alpha channel, since it's unused */
+      if (tag_r == r &&
+          tag_g == g &&
+          tag_b == b)
+        {
+          return tag;
+        }
+    }
+
+  g_snprintf (name, sizeof (name), "bg-color-#%02x%02x%02x",
+              r, g, b);
+
+  gimp_rgb_get_gdk_color (color, &gdk_color);
+
+  tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
+                                    name,
+                                    "background-gdk", &gdk_color,
+                                    "background-set", TRUE,
+                                    NULL);
+
+  buffer->preedit_bg_color_tags = g_list_prepend (buffer->preedit_bg_color_tags, tag);
+
+  return tag;
+}
+
+void
+gimp_text_buffer_set_preedit_bg_color (GimpTextBuffer    *buffer,
+                                       const GtkTextIter *start,
+                                       const GtkTextIter *end,
+                                       const GimpRGB     *color)
+{
+  GList *list;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+
+  if (gtk_text_iter_equal (start, end))
+    return;
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  for (list = buffer->preedit_bg_color_tags; list; list = g_list_next (list))
+    {
+      gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+                                  start, end);
+    }
+
+  if (color)
+    {
+      GtkTextTag *tag = gimp_text_buffer_get_preedit_bg_color_tag (buffer, color);
+
+      gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                 start, end);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+/*  Pango markup attribute names  */
+
+#define GIMP_TEXT_ATTR_NAME_SIZE      "size"
+#define GIMP_TEXT_ATTR_NAME_BASELINE  "rise"
+#define GIMP_TEXT_ATTR_NAME_KERNING   "letter_spacing"
+#define GIMP_TEXT_ATTR_NAME_FONT      "font"
+#define GIMP_TEXT_ATTR_NAME_STYLE     "style"
+#define GIMP_TEXT_ATTR_NAME_COLOR     "foreground"
+#define GIMP_TEXT_ATTR_NAME_FG_COLOR  "fgcolor"
+#define GIMP_TEXT_ATTR_NAME_BG_COLOR  "background"
+#define GIMP_TEXT_ATTR_NAME_UNDERLINE "underline"
+
+const gchar *
+gimp_text_buffer_tag_to_name (GimpTextBuffer  *buffer,
+                              GtkTextTag      *tag,
+                              const gchar    **attribute,
+                              gchar          **value)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), NULL);
+
+  if (attribute)
+    *attribute = NULL;
+
+  if (value)
+    *value = NULL;
+
+  if (tag == buffer->bold_tag)
+    {
+      return "b";
+    }
+  else if (tag == buffer->italic_tag)
+    {
+      return "i";
+    }
+  else if (tag == buffer->underline_tag)
+    {
+      return "u";
+    }
+  else if (tag == buffer->strikethrough_tag)
+    {
+      return "s";
+    }
+  else if (g_list_find (buffer->size_tags, tag))
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_SIZE;
+
+      if (value)
+        *value = g_strdup_printf ("%d", gimp_text_tag_get_size (tag));
+
+      return "span";
+    }
+  else if (g_list_find (buffer->baseline_tags, tag))
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_BASELINE;
+
+      if (value)
+        *value = g_strdup_printf ("%d", gimp_text_tag_get_baseline (tag));
+
+      return "span";
+    }
+  else if (g_list_find (buffer->kerning_tags, tag))
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_KERNING;
+
+      if (value)
+        *value = g_strdup_printf ("%d", gimp_text_tag_get_kerning (tag));
+
+      return "span";
+    }
+  else if (g_list_find (buffer->font_tags, tag))
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_FONT;
+
+      if (value)
+        *value = gimp_text_tag_get_font (tag);
+
+      return "span";
+    }
+  else if (g_list_find (buffer->color_tags, tag))
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_COLOR;
+
+      if (value)
+        {
+          GimpRGB color;
+          guchar  r, g, b;
+
+          gimp_text_tag_get_fg_color (tag, &color);
+          gimp_rgb_get_uchar (&color, &r, &g, &b);
+
+          *value = g_strdup_printf ("#%02x%02x%02x", r, g, b);
+        }
+
+      return "span";
+    }
+  else if (g_list_find (buffer->preedit_color_tags, tag))
+    {
+      /* "foreground" and "fgcolor" attributes are similar, but I use
+       * one or the other as a trick to differentiate the color chosen
+       * from the user and a display color for preedit. */
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_FG_COLOR;
+
+      if (value)
+        {
+          GimpRGB color;
+          guchar  r, g, b;
+
+          gimp_text_tag_get_fg_color (tag, &color);
+          gimp_rgb_get_uchar (&color, &r, &g, &b);
+
+          *value = g_strdup_printf ("#%02x%02x%02x", r, g, b);
+        }
+
+      return "span";
+    }
+  else if (g_list_find (buffer->preedit_bg_color_tags, tag))
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_BG_COLOR;
+
+      if (value)
+        {
+          GimpRGB color;
+          guchar  r, g, b;
+
+          gimp_text_tag_get_bg_color (tag, &color);
+          gimp_rgb_get_uchar (&color, &r, &g, &b);
+
+          *value = g_strdup_printf ("#%02x%02x%02x", r, g, b);
+        }
+
+      return "span";
+    }
+  else if (tag == buffer->preedit_underline_tag)
+    {
+      if (attribute)
+        *attribute = GIMP_TEXT_ATTR_NAME_UNDERLINE;
+
+      if (value)
+        *value = g_strdup ("single");
+
+      return "span";
+    }
+
+  return NULL;
+}
+
+GtkTextTag *
+gimp_text_buffer_name_to_tag (GimpTextBuffer *buffer,
+                              const gchar    *name,
+                              const gchar    *attribute,
+                              const gchar    *value)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  if (! strcmp (name, "b"))
+    {
+      return buffer->bold_tag;
+    }
+  else if (! strcmp (name, "i"))
+    {
+      return buffer->italic_tag;
+    }
+  else if (! strcmp (name, "u"))
+    {
+      return buffer->underline_tag;
+    }
+  else if (! strcmp (name, "s"))
+    {
+      return buffer->strikethrough_tag;
+    }
+  else if (! strcmp (name, "span") &&
+           attribute != NULL       &&
+           value     != NULL)
+    {
+      if (! strcmp (attribute, GIMP_TEXT_ATTR_NAME_SIZE))
+        {
+          return gimp_text_buffer_get_size_tag (buffer, atoi (value));
+        }
+      else if (! strcmp (attribute, GIMP_TEXT_ATTR_NAME_BASELINE))
+        {
+          return gimp_text_buffer_get_baseline_tag (buffer, atoi (value));
+        }
+      else if (! strcmp (attribute, GIMP_TEXT_ATTR_NAME_KERNING))
+        {
+          return gimp_text_buffer_get_kerning_tag (buffer, atoi (value));
+        }
+      else if (! strcmp (attribute, GIMP_TEXT_ATTR_NAME_FONT))
+        {
+          return gimp_text_buffer_get_font_tag (buffer, value);
+        }
+      else if (! strcmp (attribute, GIMP_TEXT_ATTR_NAME_COLOR))
+        {
+          GimpRGB color;
+          guint   r, g, b;
+
+          sscanf (value, "#%02x%02x%02x", &r, &g, &b);
+
+          gimp_rgb_set_uchar (&color, r, g, b);
+
+          return gimp_text_buffer_get_color_tag (buffer, &color);
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_text_buffer_set_insert_tags (GimpTextBuffer *buffer,
+                                  GList          *insert_tags,
+                                  GList          *remove_tags)
+{
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+
+  buffer->insert_tags_set = TRUE;
+
+  g_list_free (buffer->insert_tags);
+  g_list_free (buffer->remove_tags);
+  buffer->insert_tags = insert_tags;
+  buffer->remove_tags = remove_tags;
+}
+
+void
+gimp_text_buffer_clear_insert_tags (GimpTextBuffer *buffer)
+{
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+
+  buffer->insert_tags_set = FALSE;
+
+  g_list_free (buffer->insert_tags);
+  g_list_free (buffer->remove_tags);
+  buffer->insert_tags = NULL;
+  buffer->remove_tags = NULL;
+}
+
+void
+gimp_text_buffer_insert (GimpTextBuffer *buffer,
+                         const gchar    *text)
+{
+  GtkTextIter  iter, start;
+  gint         start_offset;
+  gboolean     insert_tags_set;
+  GList       *insert_tags;
+  GList       *remove_tags;
+  GSList      *tags_off = NULL;
+  GimpRGB      color;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+
+  gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (buffer), &iter,
+                                    gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (buffer)));
+
+  start_offset = gtk_text_iter_get_offset (&iter);
+
+  insert_tags_set = buffer->insert_tags_set;
+  insert_tags     = buffer->insert_tags;
+  remove_tags     = buffer->remove_tags;
+
+  buffer->insert_tags_set = FALSE;
+  buffer->insert_tags     = NULL;
+  buffer->remove_tags     = NULL;
+
+  tags_off = gtk_text_iter_get_toggled_tags (&iter, FALSE);
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  gtk_text_buffer_insert (GTK_TEXT_BUFFER (buffer), &iter, text, -1);
+
+  gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (buffer), &start,
+                                      start_offset);
+
+  if (insert_tags_set)
+    {
+      GList *list;
+
+      for (list = remove_tags; list; list = g_list_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                      &start, &iter);
+        }
+
+      for (list = insert_tags; list; list = g_list_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                     &start, &iter);
+        }
+    }
+
+  if (tags_off)
+    {
+      GSList *slist;
+
+      for (slist = tags_off; slist; slist = g_slist_next (slist))
+        {
+          GtkTextTag *tag = slist->data;
+
+          if (! g_list_find (remove_tags, tag) &&
+              ! g_list_find (buffer->kerning_tags, tag))
+            {
+              gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+                                         &start, &iter);
+            }
+        }
+
+      g_slist_free (tags_off);
+    }
+
+  g_list_free (remove_tags);
+  g_list_free (insert_tags);
+
+  if (gimp_text_buffer_get_iter_color (buffer, &start, &color))
+    {
+      g_signal_emit (buffer, buffer_signals[COLOR_APPLIED], 0, &color);
+    }
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+gint
+gimp_text_buffer_get_iter_index (GimpTextBuffer *buffer,
+                                 GtkTextIter    *iter,
+                                 gboolean        layout_index)
+{
+  GtkTextIter  start;
+  gchar       *string;
+  gint         index;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), 0);
+
+  gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start);
+
+  string = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer),
+                                     &start, iter, TRUE);
+  index = strlen (string);
+  g_free (string);
+
+  if (layout_index)
+    {
+      do
+        {
+          GSList *tags = gtk_text_iter_get_tags (&start);
+          GSList *list;
+
+          for (list = tags; list; list = g_slist_next (list))
+            {
+              GtkTextTag *tag = list->data;
+
+              if (g_list_find (buffer->kerning_tags, tag))
+                {
+                  index += WORD_JOINER_LENGTH;
+
+                  break;
+                }
+            }
+
+          g_slist_free (tags);
+
+          gtk_text_iter_forward_char (&start);
+
+          /* We might have moved too far */
+          if (gtk_text_iter_compare (&start, iter) > 0)
+            start = *iter;
+        }
+      while (! gtk_text_iter_equal (&start, iter));
+    }
+
+  return index;
+}
+
+void
+gimp_text_buffer_get_iter_at_index (GimpTextBuffer *buffer,
+                                    GtkTextIter    *iter,
+                                    gint            index,
+                                    gboolean        layout_index)
+{
+  GtkTextIter  start;
+  GtkTextIter  end;
+  gchar       *string;
+
+  g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+
+  gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer), &start, &end);
+
+  string = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer),
+                                     &start, &end, TRUE);
+
+  if (layout_index)
+    {
+      gchar *my_string = string;
+      gint   my_index  = 0;
+      gchar *tmp;
+
+      do
+        {
+          GSList *tags = gtk_text_iter_get_tags (&start);
+          GSList *list;
+
+          tmp = g_utf8_next_char (my_string);
+          my_index += (tmp - my_string);
+          my_string = tmp;
+
+          for (list = tags; list; list = g_slist_next (list))
+            {
+              GtkTextTag *tag = list->data;
+
+              if (g_list_find (buffer->kerning_tags, tag))
+                {
+                  index = MAX (0, index - WORD_JOINER_LENGTH);
+
+                  break;
+                }
+            }
+
+          g_slist_free (tags);
+
+          gtk_text_iter_forward_char (&start);
+
+          /* We might have moved too far */
+          if (gtk_text_iter_compare (&start, &end) > 0)
+            start = end;
+        }
+      while (my_index < index &&
+             ! gtk_text_iter_equal (&start, &end));
+    }
+
+  string[index] = '\0';
+
+  gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (buffer), iter,
+                                      g_utf8_strlen (string, -1));
+
+  g_free (string);
+}
+
+gboolean
+gimp_text_buffer_load (GimpTextBuffer *buffer,
+                       GFile          *file,
+                       GError        **error)
+{
+  GInputStream *input;
+  gchar         buf[2048];
+  gint          to_read;
+  gsize         bytes_read;
+  gsize         total_read = 0;
+  gint          remaining  = 0;
+  GtkTextIter   iter;
+  GError       *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+  if (! input)
+    {
+      g_set_error (error, my_error->domain, my_error->code,
+                   _("Could not open '%s' for reading: %s"),
+                   gimp_file_get_utf8_name (file), my_error->message);
+      g_clear_error (&my_error);
+      return FALSE;
+    }
+
+  gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+  gimp_text_buffer_set_text (buffer, NULL);
+  gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &iter);
+
+  do
+    {
+      gboolean    success;
+      const char *leftover;
+
+      to_read = sizeof (buf) - remaining - 1;
+
+      success = g_input_stream_read_all (input, buf + remaining, to_read,
+                                         &bytes_read, NULL, &my_error);
+
+      total_read += bytes_read;
+      buf[bytes_read + remaining] = '\0';
+
+      g_utf8_validate (buf, bytes_read + remaining, &leftover);
+
+      gtk_text_buffer_insert (GTK_TEXT_BUFFER (buffer), &iter,
+                              buf, leftover - buf);
+      gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &iter);
+
+      remaining = (buf + remaining + bytes_read) - leftover;
+      memmove (buf, leftover, remaining);
+
+      if (! success)
+        {
+          if (total_read > 0)
+            {
+              g_message (_("Input file '%s' appears truncated: %s"),
+                         gimp_file_get_utf8_name (file),
+                         my_error->message);
+              g_clear_error (&my_error);
+              break;
+            }
+
+          gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+          g_object_unref (input);
+
+          g_propagate_error (error, my_error);
+
+          return FALSE;
+        }
+    }
+  while (remaining <= 6 && bytes_read == to_read);
+
+  if (remaining)
+    g_message (_("Invalid UTF-8 data in file '%s'."),
+               gimp_file_get_utf8_name (file));
+
+  gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+  g_object_unref (input);
+
+  return TRUE;
+}
+
+gboolean
+gimp_text_buffer_save (GimpTextBuffer *buffer,
+                       GFile          *file,
+                       gboolean        selection_only,
+                       GError        **error)
+{
+  GOutputStream *output;
+  GtkTextIter    start_iter;
+  GtkTextIter    end_iter;
+  gchar         *text_contents;
+  GError        *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, error));
+  if (! output)
+    return FALSE;
+
+  if (selection_only)
+    gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (buffer),
+                                          &start_iter, &end_iter);
+  else
+    gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer),
+                                &start_iter, &end_iter);
+
+  text_contents = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer),
+                                            &start_iter, &end_iter, TRUE);
+
+  if (text_contents)
+    {
+      gint text_length = strlen (text_contents);
+
+      if (! g_output_stream_write_all (output, text_contents, text_length,
+                                       NULL, NULL, &my_error))
+        {
+          GCancellable *cancellable = g_cancellable_new ();
+
+          g_set_error (error, my_error->domain, my_error->code,
+                       _("Writing text file '%s' failed: %s"),
+                       gimp_file_get_utf8_name (file), my_error->message);
+          g_clear_error (&my_error);
+          g_free (text_contents);
+
+          /* Cancel the overwrite initiated by g_file_replace(). */
+          g_cancellable_cancel (cancellable);
+          g_output_stream_close (output, cancellable, NULL);
+          g_object_unref (cancellable);
+          g_object_unref (output);
+
+          return FALSE;
+        }
+
+      g_free (text_contents);
+    }
+
+  g_object_unref (output);
+
+  return TRUE;
+}
diff --git a/app/widgets/gimptextbuffer.h b/app/widgets/gimptextbuffer.h
new file mode 100644
index 0000000..63aa405
--- /dev/null
+++ b/app/widgets/gimptextbuffer.h
@@ -0,0 +1,187 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextBuffer
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_BUFFER_H__
+#define __GIMP_TEXT_BUFFER_H__
+
+
+#define GIMP_TYPE_TEXT_BUFFER            (gimp_text_buffer_get_type ())
+#define GIMP_TEXT_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_BUFFER, GimpTextBuffer))
+#define GIMP_IS_TEXT_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_BUFFER))
+#define GIMP_TEXT_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_BUFFER, GimpTextBufferClass))
+#define GIMP_IS_TEXT_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_BUFFER))
+
+
+typedef struct _GimpTextBufferClass  GimpTextBufferClass;
+
+struct _GimpTextBuffer
+{
+  GtkTextBuffer  parent_instance;
+
+  GtkTextTag    *bold_tag;
+  GtkTextTag    *italic_tag;
+  GtkTextTag    *underline_tag;
+  GtkTextTag    *strikethrough_tag;
+
+  GList         *size_tags;
+  GList         *baseline_tags;
+  GList         *kerning_tags;
+  GList         *font_tags;
+  GList         *color_tags;
+
+  GtkTextTag    *preedit_underline_tag;
+  GList         *preedit_color_tags;
+  GList         *preedit_bg_color_tags;
+
+  gboolean       insert_tags_set;
+  GList         *insert_tags;
+  GList         *remove_tags;
+
+  GdkAtom        markup_atom;
+};
+
+struct _GimpTextBufferClass
+{
+  GtkTextBufferClass  parent_class;
+
+  void (* color_applied) (GimpTextBuffer *buffer,
+                          const GimpRGB  *color);
+};
+
+
+GType            gimp_text_buffer_get_type          (void) G_GNUC_CONST;
+
+GimpTextBuffer * gimp_text_buffer_new               (void);
+
+void             gimp_text_buffer_set_text          (GimpTextBuffer    *buffer,
+                                                     const gchar       *text);
+gchar          * gimp_text_buffer_get_text          (GimpTextBuffer    *buffer);
+
+void             gimp_text_buffer_set_markup        (GimpTextBuffer    *buffer,
+                                                     const gchar       *markup);
+gchar          * gimp_text_buffer_get_markup        (GimpTextBuffer    *buffer);
+
+gboolean         gimp_text_buffer_has_markup        (GimpTextBuffer    *buffer);
+
+GtkTextTag     * gimp_text_buffer_get_iter_size     (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *iter,
+                                                     gint              *size);
+GtkTextTag     * gimp_text_buffer_get_size_tag      (GimpTextBuffer    *buffer,
+                                                     gint               size);
+void             gimp_text_buffer_set_size          (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     gint               size);
+void             gimp_text_buffer_change_size       (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     gint               amount);
+
+GtkTextTag     * gimp_text_buffer_get_iter_baseline (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *iter,
+                                                     gint              *baseline);
+void             gimp_text_buffer_set_baseline      (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     gint               count);
+void             gimp_text_buffer_change_baseline   (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     gint               count);
+
+GtkTextTag     * gimp_text_buffer_get_iter_kerning  (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *iter,
+                                                     gint              *kerning);
+void             gimp_text_buffer_set_kerning       (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     gint               count);
+void             gimp_text_buffer_change_kerning    (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     gint               count);
+
+GtkTextTag     * gimp_text_buffer_get_iter_font     (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *iter,
+                                                     gchar            **font);
+GtkTextTag     * gimp_text_buffer_get_font_tag      (GimpTextBuffer    *buffer,
+                                                     const gchar       *font);
+void             gimp_text_buffer_set_font          (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     const gchar       *font);
+
+GtkTextTag     * gimp_text_buffer_get_iter_color    (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *iter,
+                                                     GimpRGB           *color);
+GtkTextTag     * gimp_text_buffer_get_color_tag     (GimpTextBuffer    *buffer,
+                                                     const GimpRGB     *color);
+void             gimp_text_buffer_set_color         (GimpTextBuffer    *buffer,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
+                                                     const GimpRGB     *color);
+
+GtkTextTag * gimp_text_buffer_get_preedit_color_tag    (GimpTextBuffer    *buffer,
+                                                        const GimpRGB     *color);
+void         gimp_text_buffer_set_preedit_color        (GimpTextBuffer    *buffer,
+                                                        const GtkTextIter *start,
+                                                        const GtkTextIter *end,
+                                                        const GimpRGB     *color);
+GtkTextTag * gimp_text_buffer_get_preedit_bg_color_tag (GimpTextBuffer    *buffer,
+                                                        const GimpRGB     *color);
+void         gimp_text_buffer_set_preedit_bg_color     (GimpTextBuffer    *buffer,
+                                                        const GtkTextIter *start,
+                                                        const GtkTextIter *end,
+                                                        const GimpRGB     *color);
+
+const gchar    * gimp_text_buffer_tag_to_name       (GimpTextBuffer    *buffer,
+                                                     GtkTextTag        *tag,
+                                                     const gchar      **attribute,
+                                                     gchar            **value);
+GtkTextTag     * gimp_text_buffer_name_to_tag       (GimpTextBuffer    *buffer,
+                                                     const gchar       *name,
+                                                     const gchar       *attribute,
+                                                     const gchar       *value);
+
+void             gimp_text_buffer_set_insert_tags   (GimpTextBuffer    *buffer,
+                                                     GList             *insert_tags,
+                                                     GList             *remove_tags);
+void             gimp_text_buffer_clear_insert_tags (GimpTextBuffer    *buffer);
+void             gimp_text_buffer_insert            (GimpTextBuffer    *buffer,
+                                                     const gchar       *text);
+
+gint             gimp_text_buffer_get_iter_index    (GimpTextBuffer    *buffer,
+                                                     GtkTextIter       *iter,
+                                                     gboolean           layout_index);
+void             gimp_text_buffer_get_iter_at_index (GimpTextBuffer    *buffer,
+                                                     GtkTextIter       *iter,
+                                                     gint               index,
+                                                     gboolean           layout_index);
+
+gboolean         gimp_text_buffer_load              (GimpTextBuffer    *buffer,
+                                                     GFile             *file,
+                                                     GError           **error);
+gboolean         gimp_text_buffer_save              (GimpTextBuffer    *buffer,
+                                                     GFile             *file,
+                                                     gboolean           selection_only,
+                                                     GError           **error);
+
+
+#endif /* __GIMP_TEXT_BUFFER_H__ */
diff --git a/app/widgets/gimptexteditor.c b/app/widgets/gimptexteditor.c
new file mode 100644
index 0000000..d983b32
--- /dev/null
+++ b/app/widgets/gimptexteditor.c
@@ -0,0 +1,368 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextEditor
+ * Copyright (C) 2002-2003, 2008  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpmarshal.h"
+
+#include "text/gimptext.h"
+
+#include "gimphelp-ids.h"
+#include "gimpmenufactory.h"
+#include "gimptextbuffer.h"
+#include "gimptexteditor.h"
+#include "gimptextstyleeditor.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  TEXT_CHANGED,
+  DIR_CHANGED,
+  LAST_SIGNAL
+};
+
+
+static void   gimp_text_editor_finalize     (GObject         *object);
+
+static void   gimp_text_editor_text_changed (GtkTextBuffer   *buffer,
+                                             GimpTextEditor  *editor);
+static void   gimp_text_editor_font_toggled (GtkToggleButton *button,
+                                             GimpTextEditor  *editor);
+
+
+G_DEFINE_TYPE (GimpTextEditor, gimp_text_editor, GIMP_TYPE_DIALOG)
+
+#define parent_class gimp_text_editor_parent_class
+
+static guint text_editor_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_text_editor_class_init (GimpTextEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gimp_text_editor_finalize;
+
+  klass->text_changed    = NULL;
+  klass->dir_changed     = NULL;
+
+  text_editor_signals[TEXT_CHANGED] =
+    g_signal_new ("text-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpTextEditorClass, text_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  text_editor_signals[DIR_CHANGED] =
+    g_signal_new ("dir-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpTextEditorClass, dir_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+}
+
+static void
+gimp_text_editor_init (GimpTextEditor *editor)
+{
+  editor->view        = NULL;
+  editor->file_dialog = NULL;
+  editor->ui_manager  = NULL;
+
+  switch (gtk_widget_get_default_direction ())
+    {
+    case GTK_TEXT_DIR_NONE:
+    case GTK_TEXT_DIR_LTR:
+      editor->base_dir = GIMP_TEXT_DIRECTION_LTR;
+      break;
+    case GTK_TEXT_DIR_RTL:
+      editor->base_dir = GIMP_TEXT_DIRECTION_RTL;
+      break;
+    }
+}
+
+static void
+gimp_text_editor_finalize (GObject *object)
+{
+  GimpTextEditor *editor = GIMP_TEXT_EDITOR (object);
+
+  g_clear_pointer (&editor->font_name, g_free);
+  g_clear_object (&editor->ui_manager);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_text_editor_new (const gchar     *title,
+                      GtkWindow       *parent,
+                      Gimp            *gimp,
+                      GimpMenuFactory *menu_factory,
+                      GimpText        *text,
+                      GimpTextBuffer  *text_buffer,
+                      gdouble          xres,
+                      gdouble          yres)
+{
+  GimpTextEditor *editor;
+  GtkWidget      *content_area;
+  GtkWidget      *toolbar;
+  GtkWidget      *style_editor;
+  GtkWidget      *scrolled_window;
+
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (text_buffer), NULL);
+
+  editor = g_object_new (GIMP_TYPE_TEXT_EDITOR,
+                         "title",         title,
+                         "role",          "gimp-text-editor",
+                         "transient-for", parent,
+                         "help-func",     gimp_standard_help_func,
+                         "help-id",       GIMP_HELP_TEXT_EDITOR_DIALOG,
+                         NULL);
+
+  gtk_dialog_add_button (GTK_DIALOG (editor),
+                         _("_Close"), GTK_RESPONSE_CLOSE);
+
+  g_signal_connect (editor, "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+
+  g_signal_connect_object (text_buffer, "changed",
+                           G_CALLBACK (gimp_text_editor_text_changed),
+                           editor, 0);
+
+  editor->ui_manager = gimp_menu_factory_manager_new (menu_factory,
+                                                      "<TextEditor>",
+                                                      editor, FALSE);
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (editor));
+
+  toolbar = gimp_ui_manager_get_widget (editor->ui_manager,
+                                        "/text-editor-toolbar");
+
+  if (toolbar)
+    {
+      gtk_box_pack_start (GTK_BOX (content_area), toolbar, FALSE, FALSE, 0);
+      gtk_widget_show (toolbar);
+    }
+
+  style_editor = gimp_text_style_editor_new (gimp, text, text_buffer,
+                                             gimp_data_factory_get_container (gimp->font_factory),
+                                             xres, yres);
+  gtk_box_pack_start (GTK_BOX (content_area), style_editor, FALSE, FALSE, 0);
+  gtk_widget_show (style_editor);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 2);
+  gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE, 0);
+  gtk_widget_show (scrolled_window);
+
+  editor->view = gtk_text_view_new_with_buffer (GTK_TEXT_BUFFER (text_buffer));
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (editor->view),
+                               GTK_WRAP_WORD_CHAR);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), editor->view);
+  gtk_widget_show (editor->view);
+
+  switch (editor->base_dir)
+    {
+    case GIMP_TEXT_DIRECTION_LTR:
+    case GIMP_TEXT_DIRECTION_TTB_RTL:
+    case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+    case GIMP_TEXT_DIRECTION_TTB_LTR:
+    case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+      gtk_widget_set_direction (editor->view, GTK_TEXT_DIR_LTR);
+      break;
+    case GIMP_TEXT_DIRECTION_RTL:
+      gtk_widget_set_direction (editor->view, GTK_TEXT_DIR_RTL);
+      break;
+    }
+
+  gtk_widget_set_size_request (editor->view, 200, 64);
+
+  editor->font_toggle =
+    gtk_check_button_new_with_mnemonic (_("_Use selected font"));
+  gtk_box_pack_start (GTK_BOX (content_area), editor->font_toggle,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->font_toggle);
+
+  g_signal_connect (editor->font_toggle, "toggled",
+                    G_CALLBACK (gimp_text_editor_font_toggled),
+                    editor);
+
+  gtk_widget_grab_focus (editor->view);
+
+  gimp_ui_manager_update (editor->ui_manager, editor);
+
+  return GTK_WIDGET (editor);
+}
+
+void
+gimp_text_editor_set_text (GimpTextEditor *editor,
+                           const gchar    *text,
+                           gint            len)
+{
+  GtkTextBuffer *buffer;
+
+  g_return_if_fail (GIMP_IS_TEXT_EDITOR (editor));
+  g_return_if_fail (text != NULL || len == 0);
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor->view));
+
+  if (text)
+    gtk_text_buffer_set_text (buffer, text, len);
+  else
+    gtk_text_buffer_set_text (buffer, "", 0);
+}
+
+gchar *
+gimp_text_editor_get_text (GimpTextEditor *editor)
+{
+  GtkTextBuffer *buffer;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_EDITOR (editor), NULL);
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor->view));
+
+  return gimp_text_buffer_get_text (GIMP_TEXT_BUFFER (buffer));
+}
+
+void
+gimp_text_editor_set_direction (GimpTextEditor    *editor,
+                                GimpTextDirection  base_dir)
+{
+  g_return_if_fail (GIMP_IS_TEXT_EDITOR (editor));
+
+  if (editor->base_dir == base_dir)
+    return;
+
+  editor->base_dir = base_dir;
+
+  if (editor->view)
+    {
+      switch (editor->base_dir)
+        {
+        case GIMP_TEXT_DIRECTION_LTR:
+        case GIMP_TEXT_DIRECTION_TTB_RTL:
+        case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+        case GIMP_TEXT_DIRECTION_TTB_LTR:
+        case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+          gtk_widget_set_direction (editor->view, GTK_TEXT_DIR_LTR);
+          break;
+        case GIMP_TEXT_DIRECTION_RTL:
+          gtk_widget_set_direction (editor->view, GTK_TEXT_DIR_RTL);
+          break;
+        }
+    }
+
+  gimp_ui_manager_update (editor->ui_manager, editor);
+
+  g_signal_emit (editor, text_editor_signals[DIR_CHANGED], 0);
+}
+
+GimpTextDirection
+gimp_text_editor_get_direction (GimpTextEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_EDITOR (editor), GIMP_TEXT_DIRECTION_LTR);
+
+  return editor->base_dir;
+}
+
+void
+gimp_text_editor_set_font_name (GimpTextEditor *editor,
+                                const gchar    *font_name)
+{
+  g_return_if_fail (GIMP_IS_TEXT_EDITOR (editor));
+
+  if (editor->font_name)
+    g_free (editor->font_name);
+
+  editor->font_name = g_strdup (font_name);
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->font_toggle)))
+    {
+      PangoFontDescription *font_desc = NULL;
+
+      if (font_name)
+        font_desc = pango_font_description_from_string (font_name);
+
+      gtk_widget_modify_font (editor->view, font_desc);
+
+      if (font_desc)
+        pango_font_description_free (font_desc);
+    }
+}
+
+const gchar *
+gimp_text_editor_get_font_name (GimpTextEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TEXT_EDITOR (editor), NULL);
+
+  return editor->font_name;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_text_editor_text_changed (GtkTextBuffer  *buffer,
+                               GimpTextEditor *editor)
+{
+  g_signal_emit (editor, text_editor_signals[TEXT_CHANGED], 0);
+}
+
+static void
+gimp_text_editor_font_toggled (GtkToggleButton *button,
+                               GimpTextEditor  *editor)
+{
+  PangoFontDescription *font_desc = NULL;
+
+  if (gtk_toggle_button_get_active (button) && editor->font_name)
+    font_desc = pango_font_description_from_string (editor->font_name);
+
+  gtk_widget_modify_font (editor->view, font_desc);
+
+  if (font_desc)
+    pango_font_description_free (font_desc);
+}
diff --git a/app/widgets/gimptexteditor.h b/app/widgets/gimptexteditor.h
new file mode 100644
index 0000000..d51578b
--- /dev/null
+++ b/app/widgets/gimptexteditor.h
@@ -0,0 +1,79 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextEditor
+ * Copyright (C) 2002-2003  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_EDITOR_H__
+#define __GIMP_TEXT_EDITOR_H__
+
+
+#define GIMP_TYPE_TEXT_EDITOR    (gimp_text_editor_get_type ())
+#define GIMP_TEXT_EDITOR(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_EDITOR, GimpTextEditor))
+#define GIMP_IS_TEXT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_EDITOR))
+
+
+typedef struct _GimpTextEditorClass  GimpTextEditorClass;
+
+struct _GimpTextEditor
+{
+  GimpDialog         parent_instance;
+
+  /*<  private  >*/
+  GimpTextDirection  base_dir;
+  gchar             *font_name;
+
+  GtkWidget         *view;
+  GtkWidget         *font_toggle;
+  GtkWidget         *file_dialog;
+  GimpUIManager     *ui_manager;
+};
+
+struct _GimpTextEditorClass
+{
+  GimpDialogClass   parent_class;
+
+  void (* text_changed) (GimpTextEditor *editor);
+  void (* dir_changed)  (GimpTextEditor *editor);
+};
+
+
+GType               gimp_text_editor_get_type      (void) G_GNUC_CONST;
+GtkWidget         * gimp_text_editor_new           (const gchar       *title,
+                                                    GtkWindow         *parent,
+                                                    Gimp              *gimp,
+                                                    GimpMenuFactory   *menu_factory,
+                                                    GimpText          *text,
+                                                    GimpTextBuffer    *text_buffer,
+                                                    gdouble            xres,
+                                                    gdouble            yres);
+
+void                gimp_text_editor_set_text      (GimpTextEditor    *editor,
+                                                    const gchar       *text,
+                                                    gint               len);
+gchar             * gimp_text_editor_get_text      (GimpTextEditor    *editor);
+
+void                gimp_text_editor_set_direction (GimpTextEditor    *editor,
+                                                    GimpTextDirection  base_dir);
+GimpTextDirection   gimp_text_editor_get_direction (GimpTextEditor    *editor);
+
+void                gimp_text_editor_set_font_name (GimpTextEditor    *editor,
+                                                    const gchar       *font_name);
+const gchar       * gimp_text_editor_get_font_name (GimpTextEditor    *editor);
+
+
+#endif  /* __GIMP_TEXT_EDITOR_H__ */
diff --git a/app/widgets/gimptextproxy.c b/app/widgets/gimptextproxy.c
new file mode 100644
index 0000000..d2b57d1
--- /dev/null
+++ b/app/widgets/gimptextproxy.c
@@ -0,0 +1,199 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextProxy
+ * Copyright (C) 2009-2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "gimptextproxy.h"
+
+
+enum
+{
+  CHANGE_SIZE,
+  CHANGE_BASELINE,
+  CHANGE_KERNING,
+  LAST_SIGNAL
+};
+
+
+static void   gimp_text_proxy_move_cursor        (GtkTextView     *text_view,
+                                                  GtkMovementStep  step,
+                                                  gint             count,
+                                                  gboolean         extend_selection);
+static void   gimp_text_proxy_insert_at_cursor   (GtkTextView     *text_view,
+                                                  const gchar     *str);
+static void   gimp_text_proxy_delete_from_cursor (GtkTextView     *text_view,
+                                                  GtkDeleteType    type,
+                                                  gint             count);
+static void   gimp_text_proxy_backspace          (GtkTextView     *text_view);
+static void   gimp_text_proxy_cut_clipboard      (GtkTextView     *text_view);
+static void   gimp_text_proxy_copy_clipboard     (GtkTextView     *text_view);
+static void   gimp_text_proxy_paste_clipboard    (GtkTextView     *text_view);
+static void   gimp_text_proxy_toggle_overwrite   (GtkTextView     *text_view);
+
+
+G_DEFINE_TYPE (GimpTextProxy, gimp_text_proxy, GTK_TYPE_TEXT_VIEW)
+
+static guint proxy_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_text_proxy_class_init (GimpTextProxyClass *klass)
+{
+  GtkTextViewClass *tv_class = GTK_TEXT_VIEW_CLASS (klass);
+  GtkBindingSet    *binding_set;
+
+  tv_class->move_cursor        = gimp_text_proxy_move_cursor;
+  tv_class->insert_at_cursor   = gimp_text_proxy_insert_at_cursor;
+  tv_class->delete_from_cursor = gimp_text_proxy_delete_from_cursor;
+  tv_class->backspace          = gimp_text_proxy_backspace;
+  tv_class->cut_clipboard      = gimp_text_proxy_cut_clipboard;
+  tv_class->copy_clipboard     = gimp_text_proxy_copy_clipboard;
+  tv_class->paste_clipboard    = gimp_text_proxy_paste_clipboard;
+  tv_class->toggle_overwrite   = gimp_text_proxy_toggle_overwrite;
+
+  proxy_signals[CHANGE_SIZE] =
+    g_signal_new ("change-size",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpTextProxyClass, change_size),
+                  NULL, NULL,
+                  gimp_marshal_VOID__DOUBLE,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_DOUBLE);
+
+  proxy_signals[CHANGE_BASELINE] =
+    g_signal_new ("change-baseline",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpTextProxyClass, change_baseline),
+                  NULL, NULL,
+                  gimp_marshal_VOID__DOUBLE,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_DOUBLE);
+
+  proxy_signals[CHANGE_KERNING] =
+    g_signal_new ("change-kerning",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                  G_STRUCT_OFFSET (GimpTextProxyClass, change_kerning),
+                  NULL, NULL,
+                  gimp_marshal_VOID__DOUBLE,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_DOUBLE);
+
+  binding_set = gtk_binding_set_by_class (klass);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_plus, GDK_MOD1_MASK,
+                                "change-size", 1,
+                                G_TYPE_DOUBLE, 1.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_minus, GDK_MOD1_MASK,
+                                "change-size", 1,
+                                G_TYPE_DOUBLE, -1.0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_MOD1_MASK,
+                                "change-baseline", 1,
+                                G_TYPE_DOUBLE, 1.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, GDK_MOD1_MASK,
+                                "change-baseline", 1,
+                                G_TYPE_DOUBLE, -1.0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, GDK_MOD1_MASK,
+                                "change-kerning", 1,
+                                G_TYPE_DOUBLE, -1.0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_MOD1_MASK,
+                                "change-kerning", 1,
+                                G_TYPE_DOUBLE, 1.0);
+}
+
+static void
+gimp_text_proxy_init (GimpTextProxy *text_proxy)
+{
+}
+
+static void
+gimp_text_proxy_move_cursor (GtkTextView     *text_view,
+                             GtkMovementStep  step,
+                             gint             count,
+                             gboolean         extend_selection)
+{
+}
+
+static void
+gimp_text_proxy_insert_at_cursor (GtkTextView *text_view,
+                                  const gchar *str)
+{
+}
+
+static void
+gimp_text_proxy_delete_from_cursor (GtkTextView   *text_view,
+                                    GtkDeleteType  type,
+                                    gint           count)
+{
+}
+
+static void
+gimp_text_proxy_backspace (GtkTextView *text_view)
+{
+}
+
+static void
+gimp_text_proxy_cut_clipboard (GtkTextView *text_view)
+{
+}
+
+static void
+gimp_text_proxy_copy_clipboard (GtkTextView *text_view)
+{
+}
+
+static void
+gimp_text_proxy_paste_clipboard (GtkTextView *text_view)
+{
+}
+
+static void
+gimp_text_proxy_toggle_overwrite (GtkTextView *text_view)
+{
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_text_proxy_new (void)
+{
+  GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
+  GtkWidget     *proxy;
+
+  proxy = g_object_new (GIMP_TYPE_TEXT_PROXY,
+                        "buffer", buffer,
+                        NULL);
+
+  g_object_unref (buffer);
+
+  return proxy;
+}
diff --git a/app/widgets/gimptextproxy.h b/app/widgets/gimptextproxy.h
new file mode 100644
index 0000000..47dcecf
--- /dev/null
+++ b/app/widgets/gimptextproxy.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextProxy
+ * Copyright (C) 2009-2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_PROXY_H__
+#define __GIMP_TEXT_PROXY_H__
+
+
+#define GIMP_TYPE_TEXT_PROXY            (gimp_text_proxy_get_type ())
+#define GIMP_TEXT_PROXY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_PROXY, GimpTextProxy))
+#define GIMP_IS_TEXT_PROXY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_PROXY))
+#define GIMP_TEXT_PROXY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_PROXY, GimpTextProxyClass))
+#define GIMP_IS_TEXT_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_PROXY))
+
+
+typedef struct _GimpTextProxy       GimpTextProxy;
+typedef struct _GimpTextProxyClass  GimpTextProxyClass;
+
+struct _GimpTextProxy
+{
+  GtkTextView  parent_instance;
+};
+
+struct _GimpTextProxyClass
+{
+  GtkTextViewClass  parent_class;
+
+  void (* change_size)     (GimpTextProxy *proxy,
+                            gdouble        amount);
+  void (* change_baseline) (GimpTextProxy *proxy,
+                            gdouble        amount);
+  void (* change_kerning)  (GimpTextProxy *proxy,
+                            gdouble        amount);
+};
+
+
+GType       gimp_text_proxy_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_text_proxy_new      (void);
+
+
+#endif /* __GIMP_TEXT_PROXY_H__ */
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
new file mode 100644
index 0000000..3f942d4
--- /dev/null
+++ b/app/widgets/gimptextstyleeditor.c
@@ -0,0 +1,1302 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextStyleEditor
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+
+#include "text/gimptext.h"
+
+#include "gimpcolorpanel.h"
+#include "gimpcontainerentry.h"
+#include "gimpcontainerview.h"
+#include "gimptextbuffer.h"
+#include "gimptextstyleeditor.h"
+#include "gimptexttag.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+  PROP_TEXT,
+  PROP_BUFFER,
+  PROP_FONTS,
+  PROP_RESOLUTION_X,
+  PROP_RESOLUTION_Y
+};
+
+
+static void      gimp_text_style_editor_constructed       (GObject             *object);
+static void      gimp_text_style_editor_dispose           (GObject             *object);
+static void      gimp_text_style_editor_finalize          (GObject             *object);
+static void      gimp_text_style_editor_set_property      (GObject             *object,
+                                                           guint                property_id,
+                                                           const GValue        *value,
+                                                           GParamSpec          *pspec);
+static void      gimp_text_style_editor_get_property      (GObject             *object,
+                                                           guint                property_id,
+                                                           GValue              *value,
+                                                           GParamSpec          *pspec);
+
+static GtkWidget * gimp_text_style_editor_create_toggle   (GimpTextStyleEditor *editor,
+                                                           GtkTextTag          *tag,
+                                                           const gchar         *icon_name,
+                                                           const gchar         *tooltip);
+
+static void      gimp_text_style_editor_clear_tags        (GtkButton           *button,
+                                                           GimpTextStyleEditor *editor);
+
+static void      gimp_text_style_editor_font_changed      (GimpContext         *context,
+                                                           GimpFont            *font,
+                                                           GimpTextStyleEditor *editor);
+static void      gimp_text_style_editor_set_font          (GimpTextStyleEditor *editor,
+                                                           GtkTextTag          *font_tag);
+static void      gimp_text_style_editor_set_default_font  (GimpTextStyleEditor *editor);
+
+static void      gimp_text_style_editor_color_changed     (GimpColorButton     *button,
+                                                           GimpTextStyleEditor *editor);
+static void      gimp_text_style_editor_set_color         (GimpTextStyleEditor *editor,
+                                                           GtkTextTag          *color_tag);
+static void      gimp_text_style_editor_set_default_color (GimpTextStyleEditor *editor);
+
+static void      gimp_text_style_editor_tag_toggled       (GtkToggleButton     *toggle,
+                                                           GimpTextStyleEditor *editor);
+static void      gimp_text_style_editor_set_toggle        (GimpTextStyleEditor *editor,
+                                                           GtkToggleButton     *toggle,
+                                                           gboolean             active);
+
+static void      gimp_text_style_editor_size_changed      (GimpSizeEntry       *entry,
+                                                           GimpTextStyleEditor *editor);
+static void      gimp_text_style_editor_set_size          (GimpTextStyleEditor *editor,
+                                                           GtkTextTag          *size_tag);
+static void      gimp_text_style_editor_set_default_size  (GimpTextStyleEditor *editor);
+
+static void      gimp_text_style_editor_baseline_changed  (GtkAdjustment       *adjustment,
+                                                           GimpTextStyleEditor *editor);
+static void      gimp_text_style_editor_set_baseline      (GimpTextStyleEditor *editor,
+                                                           GtkTextTag          *baseline_tag);
+
+static void      gimp_text_style_editor_kerning_changed   (GtkAdjustment       *adjustment,
+                                                           GimpTextStyleEditor *editor);
+static void      gimp_text_style_editor_set_kerning       (GimpTextStyleEditor *editor,
+                                                           GtkTextTag          *kerning_tag);
+
+static void      gimp_text_style_editor_update            (GimpTextStyleEditor *editor);
+static gboolean  gimp_text_style_editor_update_idle       (GimpTextStyleEditor *editor);
+
+
+G_DEFINE_TYPE (GimpTextStyleEditor, gimp_text_style_editor,
+               GTK_TYPE_BOX)
+
+#define parent_class gimp_text_style_editor_parent_class
+
+
+static void
+gimp_text_style_editor_class_init (GimpTextStyleEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_text_style_editor_constructed;
+  object_class->dispose      = gimp_text_style_editor_dispose;
+  object_class->finalize     = gimp_text_style_editor_finalize;
+  object_class->set_property = gimp_text_style_editor_set_property;
+  object_class->get_property = gimp_text_style_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_TEXT,
+                                   g_param_spec_object ("text",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_BUFFER,
+                                   g_param_spec_object ("buffer",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TEXT_BUFFER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_FONTS,
+                                   g_param_spec_object ("fonts",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTAINER,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_RESOLUTION_X,
+                                   g_param_spec_double ("resolution-x",
+                                                        NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_RESOLUTION_Y,
+                                   g_param_spec_double ("resolution-y",
+                                                        NULL, NULL,
+                                                        GIMP_MIN_RESOLUTION,
+                                                        GIMP_MAX_RESOLUTION,
+                                                        1.0,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_text_style_editor_init (GimpTextStyleEditor *editor)
+{
+  GtkWidget *image;
+  GimpRGB    color;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+  gtk_box_set_spacing (GTK_BOX (editor), 2);
+
+  /*  upper row  */
+
+  editor->upper_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (editor), editor->upper_hbox, FALSE, FALSE, 0);
+  gtk_widget_show (editor->upper_hbox);
+
+  editor->font_entry = gimp_container_entry_new (NULL, NULL,
+                                                 GIMP_VIEW_SIZE_SMALL, 1);
+  gtk_box_pack_start (GTK_BOX (editor->upper_hbox), editor->font_entry,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->font_entry);
+
+  gimp_help_set_help_data (editor->font_entry,
+                           _("Change font of selected text"), NULL);
+
+  editor->size_entry =
+    gimp_size_entry_new (1, 0, "%a", TRUE, FALSE, FALSE, 10,
+                         GIMP_SIZE_ENTRY_UPDATE_SIZE);
+  gtk_table_set_col_spacing (GTK_TABLE (editor->size_entry), 1, 0);
+  gtk_box_pack_start (GTK_BOX (editor->upper_hbox), editor->size_entry,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->size_entry);
+
+  gimp_help_set_help_data (editor->size_entry,
+                           _("Change size of selected text"), NULL);
+
+  g_signal_connect (editor->size_entry, "value-changed",
+                    G_CALLBACK (gimp_text_style_editor_size_changed),
+                    editor);
+
+  /*  lower row  */
+
+  editor->lower_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (editor), editor->lower_hbox, FALSE, FALSE, 0);
+  gtk_widget_show (editor->lower_hbox);
+
+  editor->clear_button = gtk_button_new ();
+  gtk_widget_set_can_focus (editor->clear_button, FALSE);
+  gtk_box_pack_start (GTK_BOX (editor->lower_hbox), editor->clear_button,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->clear_button);
+
+  gimp_help_set_help_data (editor->clear_button,
+                           _("Clear style of selected text"), NULL);
+
+  g_signal_connect (editor->clear_button, "clicked",
+                    G_CALLBACK (gimp_text_style_editor_clear_tags),
+                    editor);
+
+  image = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (editor->clear_button), image);
+  gtk_widget_show (image);
+
+  gimp_rgba_set (&color, 0.0, 0.0, 0.0, 1.0);
+  editor->color_button = gimp_color_panel_new (_("Change color of selected text"),
+                                               &color,
+                                               GIMP_COLOR_AREA_FLAT, 20, 20);
+  gimp_widget_set_fully_opaque (editor->color_button, TRUE);
+
+  gtk_box_pack_end (GTK_BOX (editor->lower_hbox), editor->color_button,
+                    FALSE, FALSE, 0);
+  gtk_widget_show (editor->color_button);
+
+  gimp_help_set_help_data (editor->color_button,
+                           _("Change color of selected text"), NULL);
+
+  g_signal_connect (editor->color_button, "color-changed",
+                    G_CALLBACK (gimp_text_style_editor_color_changed),
+                    editor);
+
+  editor->kerning_adjustment =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -1000.0, 1000.0, 1.0, 10.0, 0.0));
+  editor->kerning_spinbutton =
+    gimp_spin_button_new (editor->kerning_adjustment, 1.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (editor->kerning_spinbutton), 5);
+  gtk_box_pack_end (GTK_BOX (editor->lower_hbox), editor->kerning_spinbutton,
+                    FALSE, FALSE, 0);
+  gtk_widget_show (editor->kerning_spinbutton);
+
+  gimp_help_set_help_data (editor->kerning_spinbutton,
+                           _("Change kerning of selected text"), NULL);
+
+  g_signal_connect (editor->kerning_adjustment, "value-changed",
+                    G_CALLBACK (gimp_text_style_editor_kerning_changed),
+                    editor);
+
+  editor->baseline_adjustment =
+    GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -1000.0, 1000.0, 1.0, 10.0, 0.0));
+  editor->baseline_spinbutton =
+    gimp_spin_button_new (editor->baseline_adjustment, 1.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (editor->baseline_spinbutton), 5);
+  gtk_box_pack_end (GTK_BOX (editor->lower_hbox), editor->baseline_spinbutton,
+                    FALSE, FALSE, 0);
+  gtk_widget_show (editor->baseline_spinbutton);
+
+  gimp_help_set_help_data (editor->baseline_spinbutton,
+                           _("Change baseline of selected text"), NULL);
+
+  g_signal_connect (editor->baseline_adjustment, "value-changed",
+                    G_CALLBACK (gimp_text_style_editor_baseline_changed),
+                    editor);
+}
+
+static void
+gimp_text_style_editor_constructed (GObject *object)
+{
+  GimpTextStyleEditor *editor = GIMP_TEXT_STYLE_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  gimp_assert (GIMP_IS_GIMP (editor->gimp));
+  gimp_assert (GIMP_IS_CONTAINER (editor->fonts));
+  gimp_assert (GIMP_IS_TEXT (editor->text));
+  gimp_assert (GIMP_IS_TEXT_BUFFER (editor->buffer));
+
+  editor->context = gimp_context_new (editor->gimp, "text style editor", NULL);
+
+  g_signal_connect (editor->context, "font-changed",
+                    G_CALLBACK (gimp_text_style_editor_font_changed),
+                    editor);
+
+  gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (editor->size_entry), 0,
+                                  editor->resolution_y, TRUE);
+
+  /* use the global user context so we get the global FG/BG colors */
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (editor->color_button),
+                                gimp_get_user_context (editor->gimp));
+
+  gimp_container_view_set_container (GIMP_CONTAINER_VIEW (editor->font_entry),
+                                     editor->fonts);
+  gimp_container_view_set_context (GIMP_CONTAINER_VIEW (editor->font_entry),
+                                   editor->context);
+
+  gimp_text_style_editor_create_toggle (editor, editor->buffer->bold_tag,
+                                        GIMP_ICON_FORMAT_TEXT_BOLD,
+                                        _("Bold"));
+  gimp_text_style_editor_create_toggle (editor, editor->buffer->italic_tag,
+                                        GIMP_ICON_FORMAT_TEXT_ITALIC,
+                                        _("Italic"));
+  gimp_text_style_editor_create_toggle (editor, editor->buffer->underline_tag,
+                                        GIMP_ICON_FORMAT_TEXT_UNDERLINE,
+                                        _("Underline"));
+  gimp_text_style_editor_create_toggle (editor, editor->buffer->strikethrough_tag,
+                                        GIMP_ICON_FORMAT_TEXT_STRIKETHROUGH,
+                                        _("Strikethrough"));
+
+  g_signal_connect_swapped (editor->text, "notify::font",
+                            G_CALLBACK (gimp_text_style_editor_update),
+                            editor);
+  g_signal_connect_swapped (editor->text, "notify::font-size",
+                            G_CALLBACK (gimp_text_style_editor_update),
+                            editor);
+  g_signal_connect_swapped (editor->text, "notify::font-size-unit",
+                            G_CALLBACK (gimp_text_style_editor_update),
+                            editor);
+  g_signal_connect_swapped (editor->text, "notify::color",
+                            G_CALLBACK (gimp_text_style_editor_update),
+                            editor);
+
+  g_signal_connect_data (editor->buffer, "changed",
+                         G_CALLBACK (gimp_text_style_editor_update),
+                         editor, 0,
+                         G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+  g_signal_connect_data (editor->buffer, "apply-tag",
+                         G_CALLBACK (gimp_text_style_editor_update),
+                         editor, 0,
+                         G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+  g_signal_connect_data (editor->buffer, "remove-tag",
+                         G_CALLBACK (gimp_text_style_editor_update),
+                         editor, 0,
+                         G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+  g_signal_connect_data (editor->buffer, "mark-set",
+                         G_CALLBACK (gimp_text_style_editor_update),
+                         editor, 0,
+                         G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+
+  gimp_text_style_editor_update (editor);
+}
+
+static void
+gimp_text_style_editor_dispose (GObject *object)
+{
+  GimpTextStyleEditor *editor = GIMP_TEXT_STYLE_EDITOR (object);
+
+  if (editor->text)
+    {
+      g_signal_handlers_disconnect_by_func (editor->text,
+                                            gimp_text_style_editor_update,
+                                            editor);
+    }
+
+  if (editor->buffer)
+    {
+      g_signal_handlers_disconnect_by_func (editor->buffer,
+                                            gimp_text_style_editor_update,
+                                            editor);
+    }
+
+  if (editor->update_idle_id)
+    {
+      g_source_remove (editor->update_idle_id);
+      editor->update_idle_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_text_style_editor_finalize (GObject *object)
+{
+  GimpTextStyleEditor *editor = GIMP_TEXT_STYLE_EDITOR (object);
+
+  g_clear_object (&editor->context);
+  g_clear_object (&editor->text);
+  g_clear_object (&editor->buffer);
+  g_clear_object (&editor->fonts);
+
+  if (editor->toggles)
+    {
+      g_list_free (editor->toggles);
+      editor->toggles = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_style_editor_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpTextStyleEditor *editor = GIMP_TEXT_STYLE_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      editor->gimp = g_value_get_object (value); /* don't ref */
+      break;
+    case PROP_TEXT:
+      editor->text = g_value_dup_object (value);
+      break;
+    case PROP_BUFFER:
+      editor->buffer = g_value_dup_object (value);
+      break;
+    case PROP_FONTS:
+      editor->fonts = g_value_dup_object (value);
+      break;
+    case PROP_RESOLUTION_X:
+      editor->resolution_x = g_value_get_double (value);
+      break;
+    case PROP_RESOLUTION_Y:
+      editor->resolution_y = g_value_get_double (value);
+      if (editor->size_entry)
+        gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (editor->size_entry), 0,
+                                        editor->resolution_y, TRUE);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_style_editor_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpTextStyleEditor *editor = GIMP_TEXT_STYLE_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, editor->gimp);
+      break;
+    case PROP_TEXT:
+      g_value_set_object (value, editor->text);
+      break;
+    case PROP_BUFFER:
+      g_value_set_object (value, editor->buffer);
+      break;
+    case PROP_FONTS:
+      g_value_set_object (value, editor->fonts);
+      break;
+    case PROP_RESOLUTION_X:
+      g_value_set_double (value, editor->resolution_x);
+      break;
+    case PROP_RESOLUTION_Y:
+      g_value_set_double (value, editor->resolution_y);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_text_style_editor_new (Gimp           *gimp,
+                            GimpText       *text,
+                            GimpTextBuffer *buffer,
+                            GimpContainer  *fonts,
+                            gdouble         resolution_x,
+                            gdouble         resolution_y)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (resolution_x > 0.0, NULL);
+  g_return_val_if_fail (resolution_y > 0.0, NULL);
+
+  return g_object_new (GIMP_TYPE_TEXT_STYLE_EDITOR,
+                       "gimp",         gimp,
+                       "text",         text,
+                       "buffer",       buffer,
+                       "fonts",        fonts,
+                       "resolution-x", resolution_x,
+                       "resolution-y", resolution_y,
+                       NULL);
+}
+
+GList *
+gimp_text_style_editor_list_tags (GimpTextStyleEditor  *editor,
+                                  GList               **remove_tags)
+{
+  GList *toggles;
+  GList *tags = NULL;
+
+  g_return_val_if_fail (GIMP_IS_TEXT_STYLE_EDITOR (editor), NULL);
+  g_return_val_if_fail (remove_tags != NULL, NULL);
+
+  *remove_tags = NULL;
+
+  for (toggles = editor->toggles; toggles; toggles = g_list_next (toggles))
+    {
+      GtkTextTag *tag = g_object_get_data (toggles->data, "tag");
+
+      if (gtk_toggle_button_get_active (toggles->data))
+        {
+          tags = g_list_prepend (tags, tag);
+        }
+      else
+        {
+          *remove_tags = g_list_prepend (*remove_tags, tag);
+        }
+    }
+
+  {
+    GList   *list;
+    gdouble  pixels;
+
+    for (list = editor->buffer->size_tags; list; list = g_list_next (list))
+      *remove_tags = g_list_prepend (*remove_tags, list->data);
+
+    pixels = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (editor->size_entry), 0);
+
+    if (pixels != 0.0)
+      {
+        GtkTextTag *tag;
+        gdouble     points;
+
+        points = gimp_units_to_points (pixels,
+                                       GIMP_UNIT_PIXEL,
+                                       editor->resolution_y);
+        tag = gimp_text_buffer_get_size_tag (editor->buffer,
+                                             PANGO_SCALE * points);
+        tags = g_list_prepend (tags, tag);
+      }
+  }
+
+  {
+    GList       *list;
+    const gchar *font_name;
+
+    for (list = editor->buffer->font_tags; list; list = g_list_next (list))
+      *remove_tags = g_list_prepend (*remove_tags, list->data);
+
+    font_name = gimp_context_get_font_name (editor->context);
+
+    if (font_name)
+      {
+        GtkTextTag  *tag;
+
+        tag = gimp_text_buffer_get_font_tag (editor->buffer, font_name);
+        tags = g_list_prepend (tags, tag);
+      }
+  }
+
+  {
+    GList   *list;
+    GimpRGB  color;
+
+    for (list = editor->buffer->color_tags; list; list = g_list_next (list))
+      *remove_tags = g_list_prepend (*remove_tags, list->data);
+
+    gimp_color_button_get_color (GIMP_COLOR_BUTTON (editor->color_button),
+                                 &color);
+
+    if (TRUE) /* FIXME should have "inconsistent" state as for font and size */
+      {
+        GtkTextTag *tag;
+
+        tag = gimp_text_buffer_get_color_tag (editor->buffer, &color);
+        tags = g_list_prepend (tags, tag);
+      }
+  }
+
+  *remove_tags = g_list_reverse (*remove_tags);
+
+  return g_list_reverse (tags);
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+gimp_text_style_editor_create_toggle (GimpTextStyleEditor *editor,
+                                      GtkTextTag          *tag,
+                                      const gchar         *icon_name,
+                                      const gchar         *tooltip)
+{
+  GtkWidget *toggle;
+  GtkWidget *image;
+
+  toggle = gtk_toggle_button_new ();
+  gtk_widget_set_can_focus (toggle, FALSE);
+  gtk_box_pack_start (GTK_BOX (editor->lower_hbox), toggle, FALSE, FALSE, 0);
+  gtk_widget_show (toggle);
+
+  gimp_help_set_help_data (toggle, tooltip, NULL);
+
+  editor->toggles = g_list_append (editor->toggles, toggle);
+  g_object_set_data (G_OBJECT (toggle), "tag", tag);
+
+  g_signal_connect (toggle, "toggled",
+                    G_CALLBACK (gimp_text_style_editor_tag_toggled),
+                    editor);
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (toggle), image);
+  gtk_widget_show (image);
+
+  return toggle;
+}
+
+static void
+gimp_text_style_editor_clear_tags (GtkButton           *button,
+                                   GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      GtkTextIter start, end;
+
+      gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+
+      gtk_text_buffer_begin_user_action (buffer);
+
+      gtk_text_buffer_remove_all_tags (buffer, &start, &end);
+
+      gtk_text_buffer_end_user_action (buffer);
+    }
+}
+
+static void
+gimp_text_style_editor_font_changed (GimpContext         *context,
+                                     GimpFont            *font,
+                                     GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+  GList         *insert_tags;
+  GList         *remove_tags;
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      GtkTextIter start, end;
+
+      gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+
+      gimp_text_buffer_set_font (editor->buffer, &start, &end,
+                                 gimp_context_get_font_name (context));
+    }
+
+  insert_tags = gimp_text_style_editor_list_tags (editor, &remove_tags);
+  gimp_text_buffer_set_insert_tags (editor->buffer, insert_tags, remove_tags);
+}
+
+static void
+gimp_text_style_editor_set_font (GimpTextStyleEditor *editor,
+                                 GtkTextTag          *font_tag)
+{
+  gchar *font = NULL;
+
+  if (font_tag)
+    font = gimp_text_tag_get_font (font_tag);
+
+  g_signal_handlers_block_by_func (editor->context,
+                                   gimp_text_style_editor_font_changed,
+                                   editor);
+
+  gimp_context_set_font_name (editor->context, font);
+
+  g_signal_handlers_unblock_by_func (editor->context,
+                                     gimp_text_style_editor_font_changed,
+                                     editor);
+
+  g_free (font);
+}
+
+static void
+gimp_text_style_editor_set_default_font (GimpTextStyleEditor *editor)
+{
+  g_signal_handlers_block_by_func (editor->context,
+                                   gimp_text_style_editor_font_changed,
+                                   editor);
+
+  gimp_context_set_font_name (editor->context, editor->text->font);
+
+  g_signal_handlers_unblock_by_func (editor->context,
+                                     gimp_text_style_editor_font_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_color_changed (GimpColorButton     *button,
+                                      GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+  GList         *insert_tags;
+  GList         *remove_tags;
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      GtkTextIter start, end;
+      GimpRGB     color;
+
+      gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+
+      gimp_color_button_get_color (button, &color);
+      gimp_text_buffer_set_color (editor->buffer, &start, &end, &color);
+    }
+
+  insert_tags = gimp_text_style_editor_list_tags (editor, &remove_tags);
+  gimp_text_buffer_set_insert_tags (editor->buffer, insert_tags, remove_tags);
+}
+
+static void
+gimp_text_style_editor_set_color (GimpTextStyleEditor *editor,
+                                  GtkTextTag          *color_tag)
+{
+  GimpRGB color;
+
+  gimp_rgba_set (&color, 0.0, 0.0, 0.0, 1.0);
+
+  if (color_tag)
+    gimp_text_tag_get_fg_color (color_tag, &color);
+
+  g_signal_handlers_block_by_func (editor->color_button,
+                                   gimp_text_style_editor_color_changed,
+                                   editor);
+
+  gimp_color_button_set_color (GIMP_COLOR_BUTTON (editor->color_button),
+                               &color);
+
+  /* FIXME should have "inconsistent" state as for font and size */
+
+  g_signal_handlers_unblock_by_func (editor->color_button,
+                                     gimp_text_style_editor_color_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_set_default_color (GimpTextStyleEditor *editor)
+{
+  g_signal_handlers_block_by_func (editor->color_button,
+                                   gimp_text_style_editor_color_changed,
+                                   editor);
+
+  gimp_color_button_set_color (GIMP_COLOR_BUTTON (editor->color_button),
+                               &editor->text->color);
+
+  g_signal_handlers_unblock_by_func (editor->color_button,
+                                     gimp_text_style_editor_color_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_tag_toggled (GtkToggleButton     *toggle,
+                                    GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+  GtkTextTag    *tag    = g_object_get_data (G_OBJECT (toggle), "tag");
+  GList         *insert_tags;
+  GList         *remove_tags;
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      GtkTextIter start, end;
+
+      gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+
+      gtk_text_buffer_begin_user_action (buffer);
+
+      if (gtk_toggle_button_get_active (toggle))
+        {
+          gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_remove_tag (buffer, tag, &start, &end);
+        }
+
+      gtk_text_buffer_end_user_action (buffer);
+    }
+
+  insert_tags = gimp_text_style_editor_list_tags (editor, &remove_tags);
+  gimp_text_buffer_set_insert_tags (editor->buffer, insert_tags, remove_tags);
+}
+
+static void
+gimp_text_style_editor_set_toggle (GimpTextStyleEditor *editor,
+                                   GtkToggleButton     *toggle,
+                                   gboolean             active)
+{
+  g_signal_handlers_block_by_func (toggle,
+                                   gimp_text_style_editor_tag_toggled,
+                                   editor);
+
+  gtk_toggle_button_set_active (toggle, active);
+
+  g_signal_handlers_unblock_by_func (toggle,
+                                     gimp_text_style_editor_tag_toggled,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_size_changed (GimpSizeEntry       *entry,
+                                     GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+  GList         *insert_tags;
+  GList         *remove_tags;
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      GtkTextIter start, end;
+      gdouble     points;
+
+      gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+
+      points = gimp_units_to_points (gimp_size_entry_get_refval (entry, 0),
+                                     GIMP_UNIT_PIXEL,
+                                     editor->resolution_y);
+
+      gimp_text_buffer_set_size (editor->buffer, &start, &end,
+                                 PANGO_SCALE * points);
+    }
+
+  insert_tags = gimp_text_style_editor_list_tags (editor, &remove_tags);
+  gimp_text_buffer_set_insert_tags (editor->buffer, insert_tags, remove_tags);
+}
+
+static void
+gimp_text_style_editor_set_size (GimpTextStyleEditor *editor,
+                                 GtkTextTag          *size_tag)
+{
+  gint    size = 0;
+  gdouble pixels;
+
+  if (size_tag)
+    size = gimp_text_tag_get_size (size_tag);
+
+  g_signal_handlers_block_by_func (editor->size_entry,
+                                   gimp_text_style_editor_size_changed,
+                                   editor);
+
+  pixels = gimp_units_to_pixels ((gdouble) size / PANGO_SCALE,
+                                 GIMP_UNIT_POINT,
+                                 editor->resolution_y);
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (editor->size_entry), 0, pixels);
+
+  if (size == 0)
+    {
+      GtkWidget *spinbutton;
+
+      spinbutton = gimp_size_entry_get_help_widget (GIMP_SIZE_ENTRY (editor->size_entry), 0);
+
+      gtk_entry_set_text (GTK_ENTRY (spinbutton), "");
+    }
+
+  g_signal_handlers_unblock_by_func (editor->size_entry,
+                                     gimp_text_style_editor_size_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_set_default_size (GimpTextStyleEditor *editor)
+{
+  gdouble pixels = gimp_units_to_pixels (editor->text->font_size,
+                                         editor->text->unit,
+                                         editor->resolution_y);
+
+  g_signal_handlers_block_by_func (editor->size_entry,
+                                   gimp_text_style_editor_size_changed,
+                                   editor);
+
+  gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (editor->size_entry), 0, pixels);
+
+  g_signal_handlers_unblock_by_func (editor->size_entry,
+                                     gimp_text_style_editor_size_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_baseline_changed (GtkAdjustment       *adjustment,
+                                         GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+  GtkTextIter    start, end;
+
+  if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+    {
+      gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                        gtk_text_buffer_get_insert (buffer));
+      gtk_text_buffer_get_end_iter (buffer, &end);
+    }
+
+  gimp_text_buffer_set_baseline (editor->buffer, &start, &end,
+                                 gtk_adjustment_get_value (adjustment) *
+                                 PANGO_SCALE);
+}
+
+static void
+gimp_text_style_editor_set_baseline (GimpTextStyleEditor *editor,
+                                     GtkTextTag          *baseline_tag)
+{
+  gint baseline = 0;
+
+  if (baseline_tag)
+    baseline = gimp_text_tag_get_baseline (baseline_tag);
+
+  g_signal_handlers_block_by_func (editor->baseline_adjustment,
+                                   gimp_text_style_editor_baseline_changed,
+                                   editor);
+
+  gtk_adjustment_set_value (editor->baseline_adjustment,
+                            (gdouble) baseline / PANGO_SCALE);
+  /* make sure the "" really gets replaced */
+  gtk_adjustment_value_changed (editor->baseline_adjustment);
+
+  g_signal_handlers_unblock_by_func (editor->baseline_adjustment,
+                                     gimp_text_style_editor_baseline_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_kerning_changed (GtkAdjustment       *adjustment,
+                                        GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+  GtkTextIter    start, end;
+
+  if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+    {
+      gtk_text_buffer_get_iter_at_mark (buffer, &start,
+                                        gtk_text_buffer_get_insert (buffer));
+      end = start;
+      gtk_text_iter_forward_char (&end);
+    }
+
+  gimp_text_buffer_set_kerning (editor->buffer, &start, &end,
+                                gtk_adjustment_get_value (adjustment) *
+                                PANGO_SCALE);
+}
+
+static void
+gimp_text_style_editor_set_kerning (GimpTextStyleEditor *editor,
+                                    GtkTextTag          *kerning_tag)
+{
+  gint kerning = 0;
+
+  if (kerning_tag)
+    kerning = gimp_text_tag_get_kerning (kerning_tag);
+
+  g_signal_handlers_block_by_func (editor->kerning_adjustment,
+                                   gimp_text_style_editor_kerning_changed,
+                                   editor);
+
+  gtk_adjustment_set_value (editor->kerning_adjustment,
+                            (gdouble) kerning / PANGO_SCALE);
+  /* make sure the "" really gets replaced */
+  gtk_adjustment_value_changed (editor->kerning_adjustment);
+
+  g_signal_handlers_unblock_by_func (editor->kerning_adjustment,
+                                     gimp_text_style_editor_kerning_changed,
+                                     editor);
+}
+
+static void
+gimp_text_style_editor_update (GimpTextStyleEditor *editor)
+{
+  if (editor->update_idle_id)
+    g_source_remove (editor->update_idle_id);
+
+  editor->update_idle_id =
+    gdk_threads_add_idle ((GSourceFunc) gimp_text_style_editor_update_idle,
+                          editor);
+}
+
+static gboolean
+gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+
+  if (editor->update_idle_id)
+    {
+      g_source_remove (editor->update_idle_id);
+      editor->update_idle_id = 0;
+    }
+
+  if (gtk_text_buffer_get_has_selection (buffer))
+    {
+      GtkTextIter  start, end;
+      GtkTextIter  iter;
+      GList       *list;
+      gboolean     any_toggle_active = TRUE;
+      gboolean     font_differs      = FALSE;
+      gboolean     color_differs     = FALSE;
+      gboolean     size_differs      = FALSE;
+      gboolean     baseline_differs  = FALSE;
+      gboolean     kerning_differs   = FALSE;
+      GtkTextTag  *font_tag          = NULL;
+      GtkTextTag  *color_tag         = NULL;
+      GtkTextTag  *size_tag          = NULL;
+      GtkTextTag  *baseline_tag      = NULL;
+      GtkTextTag  *kerning_tag       = NULL;
+
+      gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+      gtk_text_iter_order (&start, &end);
+
+      /*  first, switch all toggles on  */
+      for (list = editor->toggles; list; list = g_list_next (list))
+        {
+          GtkToggleButton *toggle = list->data;
+
+          gimp_text_style_editor_set_toggle (editor, toggle, TRUE);
+        }
+
+      /*  and get some initial values  */
+      font_tag     = gimp_text_buffer_get_iter_font (editor->buffer,
+                                                     &start, NULL);
+      color_tag    = gimp_text_buffer_get_iter_color (editor->buffer,
+                                                      &start, NULL);
+      size_tag     = gimp_text_buffer_get_iter_size (editor->buffer,
+                                                     &start, NULL);
+      baseline_tag = gimp_text_buffer_get_iter_baseline (editor->buffer,
+                                                         &start, NULL);
+      kerning_tag  = gimp_text_buffer_get_iter_kerning (editor->buffer,
+                                                        &start, NULL);
+
+      for (iter = start;
+           gtk_text_iter_in_range (&iter, &start, &end);
+           gtk_text_iter_forward_cursor_position (&iter))
+        {
+          if (any_toggle_active)
+            {
+              any_toggle_active = FALSE;
+
+              for (list = editor->toggles; list; list = g_list_next (list))
+                {
+                  GtkToggleButton *toggle = list->data;
+                  GtkTextTag      *tag    = g_object_get_data (G_OBJECT (toggle),
+                                                               "tag");
+
+                  if (! gtk_text_iter_has_tag (&iter, tag))
+                    {
+                      gimp_text_style_editor_set_toggle (editor, toggle, FALSE);
+                    }
+                  else
+                    {
+                      any_toggle_active = TRUE;
+                    }
+                }
+            }
+
+          if (! font_differs)
+            {
+              GtkTextTag *tag;
+
+              tag = gimp_text_buffer_get_iter_font (editor->buffer, &iter,
+                                                    NULL);
+
+              if (tag != font_tag)
+                font_differs = TRUE;
+            }
+
+          if (! color_differs)
+            {
+              GtkTextTag *tag;
+
+              tag = gimp_text_buffer_get_iter_color (editor->buffer, &iter,
+                                                     NULL);
+
+              if (tag != color_tag)
+                color_differs = TRUE;
+            }
+
+          if (! size_differs)
+            {
+              GtkTextTag *tag;
+
+              tag = gimp_text_buffer_get_iter_size (editor->buffer, &iter,
+                                                    NULL);
+
+              if (tag != size_tag)
+                size_differs = TRUE;
+            }
+
+          if (! baseline_differs)
+            {
+              GtkTextTag *tag;
+
+              tag = gimp_text_buffer_get_iter_baseline (editor->buffer, &iter,
+                                                        NULL);
+
+              if (tag != baseline_tag)
+                baseline_differs = TRUE;
+            }
+
+          if (! kerning_differs)
+            {
+              GtkTextTag *tag;
+
+              tag = gimp_text_buffer_get_iter_kerning (editor->buffer, &iter,
+                                                       NULL);
+
+              if (tag != kerning_tag)
+                kerning_differs = TRUE;
+            }
+
+          if (! any_toggle_active &&
+              color_differs       &&
+              font_differs        &&
+              size_differs        &&
+              baseline_differs    &&
+              kerning_differs)
+            break;
+       }
+
+      if (font_differs)
+        gimp_text_style_editor_set_font (editor, NULL);
+      else if (font_tag)
+        gimp_text_style_editor_set_font (editor, font_tag);
+      else
+        gimp_text_style_editor_set_default_font (editor);
+
+      if (color_differs)
+        gimp_text_style_editor_set_color (editor, NULL);
+      else if (color_tag)
+        gimp_text_style_editor_set_color (editor, color_tag);
+      else
+        gimp_text_style_editor_set_default_color (editor);
+
+      if (size_differs)
+        gimp_text_style_editor_set_size (editor, NULL);
+      else if (size_tag)
+        gimp_text_style_editor_set_size (editor, size_tag);
+      else
+        gimp_text_style_editor_set_default_size (editor);
+
+      if (baseline_differs)
+        gtk_entry_set_text (GTK_ENTRY (editor->baseline_spinbutton), "");
+      else
+        gimp_text_style_editor_set_baseline (editor, baseline_tag);
+
+      if (kerning_differs)
+        gtk_entry_set_text (GTK_ENTRY (editor->kerning_spinbutton), "");
+      else
+        gimp_text_style_editor_set_kerning (editor, kerning_tag);
+    }
+  else /* no selection */
+    {
+      GtkTextIter  cursor;
+      GSList      *tags;
+      GSList      *tags_on;
+      GSList      *tags_off;
+      GList       *list;
+
+      gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
+                                        gtk_text_buffer_get_insert (buffer));
+
+      tags     = gtk_text_iter_get_tags (&cursor);
+      tags_on  = gtk_text_iter_get_toggled_tags (&cursor, TRUE);
+      tags_off = gtk_text_iter_get_toggled_tags (&cursor, FALSE);
+
+      for (list = editor->buffer->font_tags; list; list = g_list_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          if ((g_slist_find (tags, tag) &&
+               ! g_slist_find (tags_on, tag)) ||
+              g_slist_find (tags_off, tag))
+            {
+              gimp_text_style_editor_set_font (editor, tag);
+              break;
+            }
+        }
+
+      if (! list)
+        gimp_text_style_editor_set_default_font (editor);
+
+      for (list = editor->buffer->color_tags; list; list = g_list_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          if ((g_slist_find (tags, tag) &&
+               ! g_slist_find (tags_on, tag)) ||
+              g_slist_find (tags_off, tag))
+            {
+              gimp_text_style_editor_set_color (editor, tag);
+              break;
+            }
+        }
+
+      if (! list)
+        gimp_text_style_editor_set_default_color (editor);
+
+      for (list = editor->buffer->size_tags; list; list = g_list_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          if ((g_slist_find (tags, tag) &&
+               ! g_slist_find (tags_on, tag)) ||
+              g_slist_find (tags_off, tag))
+            {
+              gimp_text_style_editor_set_size (editor, tag);
+              break;
+            }
+        }
+
+      if (! list)
+        gimp_text_style_editor_set_default_size (editor);
+
+      for (list = editor->buffer->baseline_tags; list; list = g_list_next (list))
+        {
+          GtkTextTag *tag = list->data;
+
+          if ((g_slist_find (tags, tag) &&
+               ! g_slist_find (tags_on, tag)) ||
+              g_slist_find (tags_off, tag))
+            {
+              gimp_text_style_editor_set_baseline (editor, tag);
+              break;
+            }
+        }
+
+      if (! list)
+        gimp_text_style_editor_set_baseline (editor, NULL);
+
+      for (list = editor->toggles; list; list = g_list_next (list))
+        {
+          GtkToggleButton *toggle = list->data;
+          GtkTextTag      *tag    = g_object_get_data (G_OBJECT (toggle),
+                                                       "tag");
+
+          gimp_text_style_editor_set_toggle (editor, toggle,
+                                             (g_slist_find (tags, tag) &&
+                                              ! g_slist_find (tags_on, tag)) ||
+                                             g_slist_find (tags_off, tag));
+        }
+
+      {
+        GtkTextTag *tag;
+
+        tag = gimp_text_buffer_get_iter_kerning (editor->buffer, &cursor, NULL);
+        gimp_text_style_editor_set_kerning (editor, tag);
+      }
+
+      g_slist_free (tags);
+      g_slist_free (tags_on);
+      g_slist_free (tags_off);
+    }
+
+  if (editor->context->font_name &&
+      g_strcmp0 (editor->context->font_name,
+                 gimp_object_get_name (gimp_context_get_font (editor->context))))
+    {
+      /* A font is set, but is unavailable; change the help text. */
+      gchar *help_text;
+
+      help_text = g_strdup_printf (_("Font \"%s\" unavailable on this system"),
+                                   editor->context->font_name);
+      gimp_help_set_help_data (editor->font_entry, help_text, NULL);
+      g_free (help_text);
+    }
+  else
+    {
+      gimp_help_set_help_data (editor->font_entry,
+                               _("Change font of selected text"), NULL);
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimptextstyleeditor.h b/app/widgets/gimptextstyleeditor.h
new file mode 100644
index 0000000..964f125
--- /dev/null
+++ b/app/widgets/gimptextstyleeditor.h
@@ -0,0 +1,89 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextStyleEditor
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_STYLE_EDITOR_H__
+#define __GIMP_TEXT_STYLE_EDITOR_H__
+
+
+#define GIMP_TYPE_TEXT_STYLE_EDITOR            (gimp_text_style_editor_get_type ())
+#define GIMP_TEXT_STYLE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEXT_STYLE_EDITOR, GimpTextStyleEditor))
+#define GIMP_TEXT_STYLE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEXT_STYLE_EDITOR, GimpTextStyleEditorClass))
+#define GIMP_IS_TEXT_STYLE_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TEXT_STYLE_EDITOR))
+#define GIMP_IS_TEXT_STYLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TEXT_STYLE_EDITOR))
+#define GIMP_TEXT_STYLE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEXT_STYLE_EDITOR, GimpTextStyleEditorClass))
+
+
+typedef struct _GimpTextStyleEditorClass GimpTextStyleEditorClass;
+
+struct _GimpTextStyleEditor
+{
+  GtkBox          parent_instance;
+
+  Gimp           *gimp;
+  GimpContext    *context;
+
+  GimpText       *text; /* read-only for default values */
+  GimpTextBuffer *buffer;
+
+  GimpContainer  *fonts;
+  gdouble         resolution_x;
+  gdouble         resolution_y;
+
+  GtkWidget      *upper_hbox;
+  GtkWidget      *lower_hbox;
+
+  GtkWidget      *font_entry;
+  GtkWidget      *size_entry;
+
+  GtkWidget      *color_button;
+
+  GtkWidget      *clear_button;
+
+  GtkWidget      *baseline_spinbutton;
+  GtkAdjustment  *baseline_adjustment;
+
+  GtkWidget      *kerning_spinbutton;
+  GtkAdjustment  *kerning_adjustment;
+
+  GList          *toggles;
+
+  guint           update_idle_id;
+};
+
+struct _GimpTextStyleEditorClass
+{
+  GtkBoxClass  parent_class;
+};
+
+
+GType       gimp_text_style_editor_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_text_style_editor_new       (Gimp                 *gimp,
+                                              GimpText             *text,
+                                              GimpTextBuffer       *buffer,
+                                              GimpContainer        *fonts,
+                                              gdouble               resolution_x,
+                                              gdouble               resolution_y);
+
+GList     * gimp_text_style_editor_list_tags (GimpTextStyleEditor  *editor,
+                                              GList               **remove_tags);
+
+
+#endif /*  __GIMP_TEXT_STYLE_EDITOR_H__  */
diff --git a/app/widgets/gimptexttag.c b/app/widgets/gimptexttag.c
new file mode 100644
index 0000000..632d710
--- /dev/null
+++ b/app/widgets/gimptexttag.c
@@ -0,0 +1,122 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextTag
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+
+#include "widgets-types.h"
+
+#include "gimptexttag.h"
+#include "gimpwidgets-utils.h"
+
+
+gint
+gimp_text_tag_get_size (GtkTextTag *tag)
+{
+  gint size;
+
+  g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), 0);
+
+  g_object_get (tag,
+                GIMP_TEXT_PROP_NAME_SIZE, &size,
+                NULL);
+
+  return size;
+}
+
+gint
+gimp_text_tag_get_baseline (GtkTextTag *tag)
+{
+  gint baseline;
+
+  g_object_get (tag,
+                GIMP_TEXT_PROP_NAME_BASELINE, &baseline,
+                NULL);
+
+  return baseline;
+}
+
+gint
+gimp_text_tag_get_kerning (GtkTextTag *tag)
+{
+  gint kerning;
+
+  g_object_get (tag,
+                GIMP_TEXT_PROP_NAME_KERNING, &kerning,
+                NULL);
+
+  return kerning;
+}
+
+gchar *
+gimp_text_tag_get_font (GtkTextTag *tag)
+{
+  gchar *font;
+
+  g_object_get (tag,
+                GIMP_TEXT_PROP_NAME_FONT, &font,
+                NULL);
+
+  return font;
+}
+
+gboolean
+gimp_text_tag_get_fg_color (GtkTextTag *tag,
+                            GimpRGB    *color)
+{
+  GdkColor *gdk_color;
+  gboolean  set;
+
+  g_object_get (tag,
+                "foreground-set",             &set,
+                GIMP_TEXT_PROP_NAME_FG_COLOR, &gdk_color,
+                NULL);
+
+  if (set)
+    gimp_rgb_set_gdk_color (color, gdk_color);
+
+  gdk_color_free (gdk_color);
+
+  return set;
+}
+
+gboolean
+gimp_text_tag_get_bg_color (GtkTextTag *tag,
+                            GimpRGB    *color)
+{
+  GdkColor *gdk_color;
+  gboolean  set;
+
+  g_object_get (tag,
+                "background-set",             &set,
+                GIMP_TEXT_PROP_NAME_BG_COLOR, &gdk_color,
+                NULL);
+
+  if (set)
+    gimp_rgb_set_gdk_color (color, gdk_color);
+
+  gdk_color_free (gdk_color);
+
+  return set;
+}
diff --git a/app/widgets/gimptexttag.h b/app/widgets/gimptexttag.h
new file mode 100644
index 0000000..da76d60
--- /dev/null
+++ b/app/widgets/gimptexttag.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * GimpTextTag
+ * Copyright (C) 2010  Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TEXT_TAG_H__
+#define __GIMP_TEXT_TAG_H__
+
+
+/*  GtkTextTag property names  */
+
+#define GIMP_TEXT_PROP_NAME_SIZE     "size"
+#define GIMP_TEXT_PROP_NAME_BASELINE "rise"
+#define GIMP_TEXT_PROP_NAME_KERNING  "rise" /* FIXME */
+#define GIMP_TEXT_PROP_NAME_FONT     "font"
+#define GIMP_TEXT_PROP_NAME_FG_COLOR "foreground-gdk"
+#define GIMP_TEXT_PROP_NAME_BG_COLOR "background-gdk"
+
+
+gint       gimp_text_tag_get_size     (GtkTextTag *tag);
+gint       gimp_text_tag_get_baseline (GtkTextTag *tag);
+gint       gimp_text_tag_get_kerning  (GtkTextTag *tag);
+gchar    * gimp_text_tag_get_font     (GtkTextTag *tag);
+gboolean   gimp_text_tag_get_fg_color (GtkTextTag *tag,
+                                       GimpRGB    *color);
+gboolean   gimp_text_tag_get_bg_color (GtkTextTag *tag,
+                                       GimpRGB    *color);
+
+
+#endif /* __GIMP_TEXT_TAG_H__ */
diff --git a/app/widgets/gimpthumbbox.c b/app/widgets/gimpthumbbox.c
new file mode 100644
index 0000000..8b0ee44
--- /dev/null
+++ b/app/widgets/gimpthumbbox.c
@@ -0,0 +1,759 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpthumb/gimpthumb.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimagefile.h"
+#include "core/gimpprogress.h"
+#include "core/gimpsubprogress.h"
+
+#include "plug-in/gimppluginmanager-file.h"
+
+#include "gimpfiledialog.h" /* eek */
+#include "gimpthumbbox.h"
+#include "gimpview.h"
+#include "gimpviewrenderer-frame.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void     gimp_thumb_box_progress_iface_init (GimpProgressInterface *iface);
+
+static void     gimp_thumb_box_dispose            (GObject           *object);
+static void     gimp_thumb_box_finalize           (GObject           *object);
+
+static void     gimp_thumb_box_style_set          (GtkWidget         *widget,
+                                                   GtkStyle          *prev_style);
+
+static GimpProgress *
+                gimp_thumb_box_progress_start     (GimpProgress      *progress,
+                                                   gboolean           cancellable,
+                                                   const gchar       *message);
+static void     gimp_thumb_box_progress_end       (GimpProgress      *progress);
+static gboolean gimp_thumb_box_progress_is_active (GimpProgress      *progress);
+static void     gimp_thumb_box_progress_set_value (GimpProgress      *progress,
+                                                   gdouble            percentage);
+static gdouble  gimp_thumb_box_progress_get_value (GimpProgress      *progress);
+static void     gimp_thumb_box_progress_pulse     (GimpProgress      *progress);
+
+static gboolean gimp_thumb_box_progress_message   (GimpProgress      *progress,
+                                                   Gimp              *gimp,
+                                                   GimpMessageSeverity  severity,
+                                                   const gchar       *domain,
+                                                   const gchar       *message);
+
+static gboolean gimp_thumb_box_ebox_button_press  (GtkWidget         *widget,
+                                                   GdkEventButton    *bevent,
+                                                   GimpThumbBox      *box);
+static void gimp_thumb_box_thumbnail_clicked      (GtkWidget         *widget,
+                                                   GdkModifierType    state,
+                                                   GimpThumbBox      *box);
+static void gimp_thumb_box_imagefile_info_changed (GimpImagefile     *imagefile,
+                                                   GimpThumbBox      *box);
+static void gimp_thumb_box_thumb_state_notify     (GimpThumbnail     *thumb,
+                                                   GParamSpec        *pspec,
+                                                   GimpThumbBox      *box);
+static void gimp_thumb_box_create_thumbnails      (GimpThumbBox      *box,
+                                                   gboolean           force);
+static void gimp_thumb_box_create_thumbnail       (GimpThumbBox      *box,
+                                                   GFile             *file,
+                                                   GimpThumbnailSize  size,
+                                                   gboolean           force,
+                                                   GimpProgress      *progress);
+static gboolean gimp_thumb_box_auto_thumbnail     (GimpThumbBox      *box);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpThumbBox, gimp_thumb_box, GTK_TYPE_FRAME,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
+                                                gimp_thumb_box_progress_iface_init))
+
+#define parent_class gimp_thumb_box_parent_class
+
+
+static void
+gimp_thumb_box_class_init (GimpThumbBoxClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose     = gimp_thumb_box_dispose;
+  object_class->finalize    = gimp_thumb_box_finalize;
+
+  widget_class->style_set   = gimp_thumb_box_style_set;
+}
+
+static void
+gimp_thumb_box_init (GimpThumbBox *box)
+{
+  gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
+
+  box->idle_id = 0;
+}
+
+static void
+gimp_thumb_box_progress_iface_init (GimpProgressInterface *iface)
+{
+  iface->start     = gimp_thumb_box_progress_start;
+  iface->end       = gimp_thumb_box_progress_end;
+  iface->is_active = gimp_thumb_box_progress_is_active;
+  iface->set_value = gimp_thumb_box_progress_set_value;
+  iface->get_value = gimp_thumb_box_progress_get_value;
+  iface->pulse     = gimp_thumb_box_progress_pulse;
+  iface->message   = gimp_thumb_box_progress_message;
+}
+
+static void
+gimp_thumb_box_dispose (GObject *object)
+{
+  GimpThumbBox *box = GIMP_THUMB_BOX (object);
+
+  if (box->idle_id)
+    {
+      g_source_remove (box->idle_id);
+      box->idle_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+
+  box->progress = NULL;
+}
+
+static void
+gimp_thumb_box_finalize (GObject *object)
+{
+  GimpThumbBox *box = GIMP_THUMB_BOX (object);
+
+  gimp_thumb_box_take_files (box, NULL);
+
+  g_clear_object (&box->imagefile);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_thumb_box_style_set (GtkWidget *widget,
+                          GtkStyle  *prev_style)
+{
+  GimpThumbBox *box   = GIMP_THUMB_BOX (widget);
+  GtkStyle     *style = gtk_widget_get_style (widget);
+  GtkWidget    *ebox;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gtk_widget_modify_bg (box->preview, GTK_STATE_NORMAL,
+                        &style->base[GTK_STATE_NORMAL]);
+  gtk_widget_modify_bg (box->preview, GTK_STATE_INSENSITIVE,
+                        &style->base[GTK_STATE_NORMAL]);
+
+  ebox = gtk_bin_get_child (GTK_BIN (widget));
+
+  gtk_widget_modify_bg (ebox, GTK_STATE_NORMAL,
+                        &style->base[GTK_STATE_NORMAL]);
+  gtk_widget_modify_bg (ebox, GTK_STATE_INSENSITIVE,
+                        &style->base[GTK_STATE_NORMAL]);
+}
+
+static GimpProgress *
+gimp_thumb_box_progress_start (GimpProgress *progress,
+                               gboolean      cancellable,
+                               const gchar  *message)
+{
+  GimpThumbBox *box = GIMP_THUMB_BOX (progress);
+
+  if (! box->progress)
+    return NULL;
+
+  if (! box->progress_active)
+    {
+      GtkProgressBar *bar = GTK_PROGRESS_BAR (box->progress);
+      GtkWidget      *toplevel;
+
+      gtk_progress_bar_set_fraction (bar, 0.0);
+
+      box->progress_active = TRUE;
+
+      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
+
+      if (GIMP_IS_FILE_DIALOG (toplevel))
+        gtk_dialog_set_response_sensitive (GTK_DIALOG (toplevel),
+                                           GTK_RESPONSE_CANCEL, cancellable);
+
+      return progress;
+    }
+
+  return NULL;
+}
+
+static void
+gimp_thumb_box_progress_end (GimpProgress *progress)
+{
+  if (gimp_thumb_box_progress_is_active (progress))
+    {
+      GimpThumbBox   *box = GIMP_THUMB_BOX (progress);
+      GtkProgressBar *bar = GTK_PROGRESS_BAR (box->progress);
+
+      gtk_progress_bar_set_fraction (bar, 0.0);
+
+      box->progress_active = FALSE;
+    }
+}
+
+static gboolean
+gimp_thumb_box_progress_is_active (GimpProgress *progress)
+{
+  GimpThumbBox *box = GIMP_THUMB_BOX (progress);
+
+  return (box->progress && box->progress_active);
+}
+
+static void
+gimp_thumb_box_progress_set_value (GimpProgress *progress,
+                                   gdouble       percentage)
+{
+  if (gimp_thumb_box_progress_is_active (progress))
+    {
+      GimpThumbBox   *box = GIMP_THUMB_BOX (progress);
+      GtkProgressBar *bar = GTK_PROGRESS_BAR (box->progress);
+
+      gtk_progress_bar_set_fraction (bar, percentage);
+    }
+}
+
+static gdouble
+gimp_thumb_box_progress_get_value (GimpProgress *progress)
+{
+  if (gimp_thumb_box_progress_is_active (progress))
+    {
+      GimpThumbBox   *box = GIMP_THUMB_BOX (progress);
+      GtkProgressBar *bar = GTK_PROGRESS_BAR (box->progress);
+
+      return gtk_progress_bar_get_fraction (bar);
+    }
+
+  return 0.0;
+}
+
+static void
+gimp_thumb_box_progress_pulse (GimpProgress *progress)
+{
+  if (gimp_thumb_box_progress_is_active (progress))
+    {
+      GimpThumbBox   *box = GIMP_THUMB_BOX (progress);
+      GtkProgressBar *bar = GTK_PROGRESS_BAR (box->progress);
+
+      gtk_progress_bar_pulse (bar);
+    }
+}
+
+static gboolean
+gimp_thumb_box_progress_message (GimpProgress        *progress,
+                                 Gimp                *gimp,
+                                 GimpMessageSeverity  severity,
+                                 const gchar         *domain,
+                                 const gchar         *message)
+{
+  /*  GimpThumbBox never shows any messages  */
+
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_thumb_box_new (GimpContext *context)
+{
+  GimpThumbBox   *box;
+  GtkWidget      *vbox;
+  GtkWidget      *vbox2;
+  GtkWidget      *ebox;
+  GtkWidget      *hbox;
+  GtkWidget      *button;
+  GtkWidget      *label;
+  gchar          *str;
+  gint            h, v;
+  GtkRequisition  info_requisition;
+  GtkRequisition  progress_requisition;
+
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  box = g_object_new (GIMP_TYPE_THUMB_BOX, NULL);
+
+  box->context = context;
+
+  ebox = gtk_event_box_new ();
+  gtk_container_add (GTK_CONTAINER (box), ebox);
+  gtk_widget_show (ebox);
+
+  g_signal_connect (ebox, "button-press-event",
+                    G_CALLBACK (gimp_thumb_box_ebox_button_press),
+                    box);
+
+  str = g_strdup_printf (_("Click to update preview\n"
+                           "%s-Click to force update even "
+                           "if preview is up-to-date"),
+                         gimp_get_mod_string (gimp_get_toggle_behavior_mask ()));
+
+  gimp_help_set_help_data (ebox, str, NULL);
+
+  g_free (str);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (ebox), vbox);
+  gtk_widget_show (vbox);
+
+  button = gtk_button_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  label = gtk_label_new_with_mnemonic (_("Pr_eview"));
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_container_add (GTK_CONTAINER (button), label);
+  gtk_widget_show (label);
+
+  g_signal_connect (button, "button-press-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+  g_signal_connect (button, "button-release-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+  g_signal_connect (button, "enter-notify-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+  g_signal_connect (button, "leave-notify-event",
+                    G_CALLBACK (gtk_true),
+                    NULL);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2);
+  gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0);
+  gtk_widget_show (vbox2);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  box->imagefile = gimp_imagefile_new (context->gimp, NULL);
+
+  g_signal_connect (box->imagefile, "info-changed",
+                    G_CALLBACK (gimp_thumb_box_imagefile_info_changed),
+                    box);
+
+  g_signal_connect (gimp_imagefile_get_thumbnail (box->imagefile),
+                    "notify::thumb-state",
+                    G_CALLBACK (gimp_thumb_box_thumb_state_notify),
+                    box);
+
+  gimp_view_renderer_get_frame_size (&h, &v);
+
+  box->preview = gimp_view_new (context,
+                                GIMP_VIEWABLE (box->imagefile),
+                                /* add padding for the shadow frame */
+                                context->gimp->config->thumbnail_size +
+                                MAX (h, v),
+                                0, FALSE);
+
+  gtk_box_pack_start (GTK_BOX (hbox), box->preview, TRUE, FALSE, 2);
+  gtk_widget_show (box->preview);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), box->preview);
+
+  g_signal_connect (box->preview, "clicked",
+                    G_CALLBACK (gimp_thumb_box_thumbnail_clicked),
+                    box);
+
+  box->filename = gtk_label_new (_("No selection"));
+  gtk_label_set_ellipsize (GTK_LABEL (box->filename), PANGO_ELLIPSIZE_MIDDLE);
+  gtk_label_set_justify (GTK_LABEL (box->filename), GTK_JUSTIFY_CENTER);
+  gimp_label_set_attributes (GTK_LABEL (box->filename),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_OBLIQUE,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox2), box->filename, FALSE, FALSE, 0);
+  gtk_widget_show (box->filename);
+
+  box->info = gtk_label_new (" \n \n \n ");
+  gtk_label_set_justify (GTK_LABEL (box->info), GTK_JUSTIFY_CENTER);
+  gtk_label_set_line_wrap (GTK_LABEL (box->info), TRUE);
+  gimp_label_set_attributes (GTK_LABEL (box->info),
+                             PANGO_ATTR_SCALE, PANGO_SCALE_SMALL,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox2), box->info, FALSE, FALSE, 0);
+  gtk_widget_show (box->info);
+
+  box->progress = gtk_progress_bar_new ();
+  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (box->progress), "Fog");
+  gtk_box_pack_end (GTK_BOX (vbox2), box->progress, FALSE, FALSE, 0);
+  gtk_widget_set_no_show_all (box->progress, TRUE);
+  /* don't gtk_widget_show (box->progress); */
+
+  /* eek */
+  gtk_widget_size_request (box->info,     &info_requisition);
+  gtk_widget_size_request (box->progress, &progress_requisition);
+
+  gtk_widget_set_size_request (box->info,
+                               -1, info_requisition.height);
+  gtk_widget_set_size_request (box->filename,
+                               progress_requisition.width, -1);
+
+  gtk_widget_set_size_request (box->progress,
+                               -1, progress_requisition.height);
+  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (box->progress), "");
+
+  return GTK_WIDGET (box);
+}
+
+void
+gimp_thumb_box_take_file (GimpThumbBox *box,
+                          GFile        *file)
+{
+  g_return_if_fail (GIMP_IS_THUMB_BOX (box));
+  g_return_if_fail (file == NULL || G_IS_FILE (file));
+
+  if (box->idle_id)
+    {
+      g_source_remove (box->idle_id);
+      box->idle_id = 0;
+    }
+
+  gimp_imagefile_set_file (box->imagefile, file);
+
+  if (file)
+    {
+      gchar *basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+      gtk_label_set_text (GTK_LABEL (box->filename), basename);
+      g_free (basename);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (box->filename), _("No selection"));
+    }
+
+  gtk_widget_set_sensitive (GTK_WIDGET (box), file != NULL);
+  gimp_imagefile_update (box->imagefile);
+}
+
+void
+gimp_thumb_box_take_files (GimpThumbBox *box,
+                           GSList       *files)
+{
+  g_return_if_fail (GIMP_IS_THUMB_BOX (box));
+
+  if (box->files)
+    {
+      g_slist_free_full (box->files, (GDestroyNotify) g_object_unref);
+      box->files = NULL;
+    }
+
+  box->files = files;
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_thumb_box_ebox_button_press (GtkWidget      *widget,
+                                  GdkEventButton *bevent,
+                                  GimpThumbBox   *box)
+{
+  gimp_thumb_box_thumbnail_clicked (widget, bevent->state, box);
+
+  return TRUE;
+}
+
+static void
+gimp_thumb_box_thumbnail_clicked (GtkWidget       *widget,
+                                  GdkModifierType  state,
+                                  GimpThumbBox    *box)
+{
+  gimp_thumb_box_create_thumbnails (box,
+                                    (state & gimp_get_toggle_behavior_mask ()) ?
+                                    TRUE : FALSE);
+}
+
+static void
+this_is_ugly (GtkWidget     *widget,
+              GtkAllocation *allocation,
+              gpointer       data)
+{
+  gtk_widget_queue_resize (widget);
+
+  g_signal_handlers_disconnect_by_func (widget,
+                                        this_is_ugly,
+                                        data);
+}
+
+static void
+gimp_thumb_box_imagefile_info_changed (GimpImagefile *imagefile,
+                                       GimpThumbBox  *box)
+{
+  gtk_label_set_text (GTK_LABEL (box->info),
+                      gimp_imagefile_get_desc_string (imagefile));
+
+  g_signal_connect_after (box->info, "size-allocate",
+                          G_CALLBACK (this_is_ugly),
+                          "this too");
+}
+
+static void
+gimp_thumb_box_thumb_state_notify (GimpThumbnail *thumb,
+                                   GParamSpec    *pspec,
+                                   GimpThumbBox  *box)
+{
+  if (box->idle_id)
+    return;
+
+  if (thumb->image_state == GIMP_THUMB_STATE_REMOTE)
+    return;
+
+  switch (thumb->thumb_state)
+    {
+    case GIMP_THUMB_STATE_NOT_FOUND:
+    case GIMP_THUMB_STATE_OLD:
+      box->idle_id =
+        g_idle_add_full (G_PRIORITY_LOW,
+                         (GSourceFunc) gimp_thumb_box_auto_thumbnail,
+                         box, NULL);
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gimp_thumb_box_create_thumbnails (GimpThumbBox *box,
+                                  gboolean      force)
+{
+  Gimp           *gimp     = box->context->gimp;
+  GimpProgress   *progress = GIMP_PROGRESS (box);
+  GimpFileDialog *dialog   = NULL;
+  GtkWidget      *toplevel;
+  GSList         *list;
+  gint            n_files;
+  gint            i;
+
+  if (gimp->config->thumbnail_size == GIMP_THUMBNAIL_SIZE_NONE)
+    return;
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
+
+  if (GIMP_IS_FILE_DIALOG (toplevel))
+    dialog = GIMP_FILE_DIALOG (toplevel);
+
+  gimp_set_busy (gimp);
+
+  if (dialog)
+    gimp_file_dialog_set_sensitive (dialog, FALSE);
+  else
+    gtk_widget_set_sensitive (toplevel, FALSE);
+
+  if (box->files)
+    {
+      gtk_widget_hide (box->info);
+      gtk_widget_show (box->progress);
+    }
+
+  n_files = g_slist_length (box->files);
+
+  if (n_files > 1)
+    {
+      gchar *str;
+
+      gimp_progress_start (GIMP_PROGRESS (box), TRUE, "%s", "");
+
+      progress = gimp_sub_progress_new (GIMP_PROGRESS (box));
+
+      gimp_sub_progress_set_step (GIMP_SUB_PROGRESS (progress), 0, n_files);
+
+      for (list = box->files->next, i = 1;
+           list;
+           list = g_slist_next (list), i++)
+        {
+          str = g_strdup_printf (_("Thumbnail %d of %d"), i, n_files);
+          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (box->progress), str);
+          g_free (str);
+
+          gimp_progress_set_value (progress, 0.0);
+
+          while (gtk_events_pending ())
+            gtk_main_iteration ();
+
+          gimp_thumb_box_create_thumbnail (box,
+                                           list->data,
+                                           gimp->config->thumbnail_size,
+                                           force,
+                                           progress);
+
+          if (dialog && dialog->canceled)
+            goto canceled;
+
+          gimp_sub_progress_set_step (GIMP_SUB_PROGRESS (progress), i, n_files);
+        }
+
+      str = g_strdup_printf (_("Thumbnail %d of %d"), n_files, n_files);
+      gtk_progress_bar_set_text (GTK_PROGRESS_BAR (box->progress), str);
+      g_free (str);
+
+      gimp_progress_set_value (progress, 0.0);
+
+      while (gtk_events_pending ())
+        gtk_main_iteration ();
+    }
+
+  if (box->files)
+    {
+      gimp_thumb_box_create_thumbnail (box,
+                                       box->files->data,
+                                       gimp->config->thumbnail_size,
+                                       force,
+                                       progress);
+
+      gimp_progress_set_value (progress, 1.0);
+    }
+
+ canceled:
+
+  if (n_files > 1)
+    {
+      g_object_unref (progress);
+
+      gimp_progress_end (GIMP_PROGRESS (box));
+      gtk_progress_bar_set_text (GTK_PROGRESS_BAR (box->progress), "");
+    }
+
+  if (box->files)
+    {
+      gtk_widget_hide (box->progress);
+      gtk_widget_show (box->info);
+    }
+
+  if (dialog)
+    gimp_file_dialog_set_sensitive (dialog, TRUE);
+  else
+    gtk_widget_set_sensitive (toplevel, TRUE);
+
+  gimp_unset_busy (gimp);
+}
+
+static void
+gimp_thumb_box_create_thumbnail (GimpThumbBox      *box,
+                                 GFile             *file,
+                                 GimpThumbnailSize  size,
+                                 gboolean           force,
+                                 GimpProgress      *progress)
+{
+  GimpThumbnail *thumb = gimp_imagefile_get_thumbnail (box->imagefile);
+  gchar         *basename;
+
+  basename = g_path_get_basename (gimp_file_get_utf8_name (file));
+  gtk_label_set_text (GTK_LABEL (box->filename), basename);
+  g_free (basename);
+
+  gimp_imagefile_set_file (box->imagefile, file);
+
+  if (force ||
+      (gimp_thumbnail_peek_thumb (thumb, (GimpThumbSize) size) < GIMP_THUMB_STATE_FAILED &&
+       ! gimp_thumbnail_has_failed (thumb)))
+    {
+      GError *error = NULL;
+
+      if (! gimp_imagefile_create_thumbnail (box->imagefile, box->context,
+                                             progress,
+                                             size, ! force, &error))
+        {
+          gimp_message_literal (box->context->gimp,
+                                G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+                                error->message);
+          g_clear_error (&error);
+        }
+    }
+}
+
+static gboolean
+gimp_thumb_box_auto_thumbnail (GimpThumbBox *box)
+{
+  Gimp          *gimp  = box->context->gimp;
+  GimpThumbnail *thumb = gimp_imagefile_get_thumbnail (box->imagefile);
+  GFile         *file  = gimp_imagefile_get_file (box->imagefile);
+
+  box->idle_id = 0;
+
+  if (thumb->image_state == GIMP_THUMB_STATE_NOT_FOUND)
+    return FALSE;
+
+  switch (thumb->thumb_state)
+    {
+    case GIMP_THUMB_STATE_NOT_FOUND:
+    case GIMP_THUMB_STATE_OLD:
+      if (thumb->image_filesize < gimp->config->thumbnail_filesize_limit &&
+          ! gimp_thumbnail_has_failed (thumb)                            &&
+          gimp_plug_in_manager_file_procedure_find_by_extension (gimp->plug_in_manager,
+                                                                 GIMP_FILE_PROCEDURE_GROUP_OPEN,
+                                                                 file))
+        {
+          if (thumb->image_filesize > 0)
+            {
+              gchar *size;
+              gchar *text;
+
+              size = g_format_size (thumb->image_filesize);
+              text = g_strdup_printf ("%s\n%s",
+                                      size, _("Creating preview..."));
+
+              gtk_label_set_text (GTK_LABEL (box->info), text);
+
+              g_free (text);
+              g_free (size);
+            }
+          else
+            {
+              gtk_label_set_text (GTK_LABEL (box->info),
+                                  _("Creating preview..."));
+            }
+
+          gimp_imagefile_create_thumbnail_weak (box->imagefile, box->context,
+                                                GIMP_PROGRESS (box),
+                                                gimp->config->thumbnail_size,
+                                                TRUE);
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpthumbbox.h b/app/widgets/gimpthumbbox.h
new file mode 100644
index 0000000..ad29db6
--- /dev/null
+++ b/app/widgets/gimpthumbbox.h
@@ -0,0 +1,66 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_THUMB_BOX_H__
+#define __GIMP_THUMB_BOX_H__
+
+
+#define GIMP_TYPE_THUMB_BOX            (gimp_thumb_box_get_type ())
+#define GIMP_THUMB_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_THUMB_BOX, GimpThumbBox))
+#define GIMP_THUMB_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_THUMB_BOX, GimpThumbBoxClass))
+#define GIMP_IS_THUMB_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_THUMB_BOX))
+#define GIMP_IS_THUMB_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_THUMB_BOX))
+#define GIMP_THUMB_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_THUMB_BOX, GimpThumbBoxClass))
+
+
+typedef struct _GimpThumbBoxClass GimpThumbBoxClass;
+
+struct _GimpThumbBox
+{
+  GtkFrame       parent_instance;
+
+  GimpContext   *context;
+  GimpImagefile *imagefile;
+  GSList        *files;
+
+  GtkWidget     *preview;
+  GtkWidget     *filename;
+  GtkWidget     *info;
+
+  gboolean       progress_active;
+  GtkWidget     *progress;
+
+  guint          idle_id;
+};
+
+struct _GimpThumbBoxClass
+{
+  GtkFrameClass  parent_class;
+};
+
+
+GType       gimp_thumb_box_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_thumb_box_new        (GimpContext  *context);
+
+void        gimp_thumb_box_take_file  (GimpThumbBox *box,
+                                       GFile        *file);
+void        gimp_thumb_box_take_files (GimpThumbBox *box,
+                                       GSList       *files);
+
+
+#endif  /*  __GIMP_THUMB_BOX_H__  */
diff --git a/app/widgets/gimptoggleaction.c b/app/widgets/gimptoggleaction.c
new file mode 100644
index 0000000..b1112e5
--- /dev/null
+++ b/app/widgets/gimptoggleaction.c
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoggleaction.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpaction.h"
+#include "gimptoggleaction.h"
+
+
+static void   gimp_toggle_action_connect_proxy (GtkAction       *action,
+                                                GtkWidget       *proxy);
+
+static void   gimp_toggle_action_toggled       (GtkToggleAction *action);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpToggleAction, gimp_toggle_action,
+                         GTK_TYPE_TOGGLE_ACTION,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_ACTION, NULL))
+
+#define parent_class gimp_toggle_action_parent_class
+
+
+static void
+gimp_toggle_action_class_init (GimpToggleActionClass *klass)
+{
+  GtkActionClass       *action_class = GTK_ACTION_CLASS (klass);
+  GtkToggleActionClass *toggle_class = GTK_TOGGLE_ACTION_CLASS (klass);
+
+  action_class->connect_proxy = gimp_toggle_action_connect_proxy;
+
+  toggle_class->toggled       = gimp_toggle_action_toggled;
+}
+
+static void
+gimp_toggle_action_init (GimpToggleAction *action)
+{
+  gimp_action_init (GIMP_ACTION (action));
+}
+
+static void
+gimp_toggle_action_connect_proxy (GtkAction *action,
+                                  GtkWidget *proxy)
+{
+  GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
+
+  gimp_action_set_proxy (GIMP_ACTION (action), proxy);
+}
+
+static void
+gimp_toggle_action_toggled (GtkToggleAction *action)
+{
+  gboolean value = gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action));
+
+  gimp_action_emit_change_state (GIMP_ACTION (action),
+                                 g_variant_new_boolean (value));
+}
+
+
+/*  public functions  */
+
+GtkToggleAction *
+gimp_toggle_action_new (const gchar *name,
+                        const gchar *label,
+                        const gchar *tooltip,
+                        const gchar *icon_name,
+                        const gchar *help_id)
+{
+  GtkToggleAction *action;
+
+  action = g_object_new (GIMP_TYPE_TOGGLE_ACTION,
+                         "name",      name,
+                         "label",     label,
+                         "tooltip",   tooltip,
+                         "icon-name", icon_name,
+                         NULL);
+
+  gimp_action_set_help_id (GIMP_ACTION (action), help_id);
+
+  return action;
+}
+
+void
+gimp_toggle_action_set_active (GimpToggleAction *action,
+                               gboolean          active)
+{
+  return gtk_toggle_action_set_active ((GtkToggleAction *) action, active);
+}
+
+gboolean
+gimp_toggle_action_get_active (GimpToggleAction *action)
+{
+  return gtk_toggle_action_get_active ((GtkToggleAction *) action);
+}
diff --git a/app/widgets/gimptoggleaction.h b/app/widgets/gimptoggleaction.h
new file mode 100644
index 0000000..1406e7e
--- /dev/null
+++ b/app/widgets/gimptoggleaction.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoggleaction.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2008 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOGGLE_ACTION_H__
+#define __GIMP_TOGGLE_ACTION_H__
+
+
+#define GIMP_TYPE_TOGGLE_ACTION            (gimp_toggle_action_get_type ())
+#define GIMP_TOGGLE_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleAction))
+#define GIMP_TOGGLE_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
+#define GIMP_IS_TOGGLE_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOGGLE_ACTION))
+#define GIMP_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ACTION))
+#define GIMP_TOGGLE_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
+
+
+typedef struct _GimpToggleAction      GimpToggleAction;
+typedef struct _GimpToggleActionClass GimpToggleActionClass;
+
+struct _GimpToggleAction
+{
+  GtkToggleAction  parent_instance;
+};
+
+struct _GimpToggleActionClass
+{
+  GtkToggleActionClass  parent_class;
+};
+
+
+GType             gimp_toggle_action_get_type  (void) G_GNUC_CONST;
+
+GtkToggleAction * gimp_toggle_action_new       (const gchar *name,
+                                                const gchar *label,
+                                                const gchar *tooltip,
+                                                const gchar *icon_name,
+                                                const gchar *help_id);
+
+void              gimp_toggle_action_set_active (GimpToggleAction *action,
+                                                 gboolean          active);
+gboolean          gimp_toggle_action_get_active (GimpToggleAction *action);
+
+
+#endif  /* __GIMP_TOGGLE_ACTION_H__ */
diff --git a/app/widgets/gimptoolbox-color-area.c b/app/widgets/gimptoolbox-color-area.c
new file mode 100644
index 0000000..92db0fd
--- /dev/null
+++ b/app/widgets/gimptoolbox-color-area.c
@@ -0,0 +1,355 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "gimpaction.h"
+#include "gimpcolordialog.h"
+#include "gimpdialogfactory.h"
+#include "gimpfgbgeditor.h"
+#include "gimpsessioninfo.h"
+#include "gimptoolbox.h"
+#include "gimptoolbox-color-area.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   color_area_foreground_changed (GimpContext          *context,
+                                             const GimpRGB        *color,
+                                             GimpColorDialog      *dialog);
+static void   color_area_background_changed (GimpContext          *context,
+                                             const GimpRGB        *color,
+                                             GimpColorDialog      *dialog);
+
+static void   color_area_dialog_update      (GimpColorDialog      *dialog,
+                                             const GimpRGB        *color,
+                                             GimpColorDialogState  state,
+                                             GimpContext          *context);
+
+static void   color_area_color_clicked      (GimpFgBgEditor       *editor,
+                                             GimpActiveColor       active_color,
+                                             GimpContext          *context);
+static void   color_area_tooltip            (GimpFgBgEditor       *editor,
+                                             GimpFgBgTarget        target,
+                                             GtkTooltip           *tooltip,
+                                             GimpToolbox          *toolbox);
+
+
+/*  local variables  */
+
+static GtkWidget       *color_area          = NULL;
+static GtkWidget       *color_dialog        = NULL;
+static gboolean         color_dialog_active = FALSE;
+static GimpActiveColor  edit_color          = GIMP_ACTIVE_COLOR_FOREGROUND;
+static GimpRGB          revert_fg;
+static GimpRGB          revert_bg;
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_toolbox_color_area_create (GimpToolbox *toolbox,
+                                gint         width,
+                                gint         height)
+{
+  GimpContext *context;
+
+  g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
+
+  context = gimp_toolbox_get_context (toolbox);
+
+  color_area = gimp_fg_bg_editor_new (context);
+  gtk_widget_set_size_request (color_area, width, height);
+  gtk_widget_add_events (color_area,
+                         GDK_ENTER_NOTIFY_MASK |
+                         GDK_LEAVE_NOTIFY_MASK);
+
+  g_object_set (color_area, "has-tooltip", TRUE, NULL);
+
+  g_signal_connect (color_area, "color-clicked",
+                    G_CALLBACK (color_area_color_clicked),
+                    context);
+
+  g_signal_connect (color_area, "tooltip",
+                    G_CALLBACK (color_area_tooltip),
+                    toolbox);
+
+  return color_area;
+}
+
+
+/*  private functions  */
+
+static void
+color_area_foreground_changed (GimpContext     *context,
+                               const GimpRGB   *color,
+                               GimpColorDialog *dialog)
+{
+  if (edit_color == GIMP_ACTIVE_COLOR_FOREGROUND)
+    {
+      g_signal_handlers_block_by_func (dialog,
+                                       color_area_dialog_update,
+                                       context);
+
+      /* FIXME this should use GimpColorDialog API */
+      gimp_color_selection_set_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                      color);
+
+      g_signal_handlers_unblock_by_func (dialog,
+                                         color_area_dialog_update,
+                                         context);
+    }
+}
+
+static void
+color_area_background_changed (GimpContext     *context,
+                               const GimpRGB   *color,
+                               GimpColorDialog *dialog)
+{
+  if (edit_color == GIMP_ACTIVE_COLOR_BACKGROUND)
+    {
+      g_signal_handlers_block_by_func (dialog,
+                                       color_area_dialog_update,
+                                       context);
+
+      /* FIXME this should use GimpColorDialog API */
+      gimp_color_selection_set_color (GIMP_COLOR_SELECTION (dialog->selection),
+                                      color);
+
+      g_signal_handlers_unblock_by_func (dialog,
+                                         color_area_dialog_update,
+                                         context);
+    }
+}
+
+static void
+color_area_dialog_update (GimpColorDialog      *dialog,
+                          const GimpRGB        *color,
+                          GimpColorDialogState  state,
+                          GimpContext          *context)
+{
+  switch (state)
+    {
+    case GIMP_COLOR_DIALOG_OK:
+      gtk_widget_hide (color_dialog);
+      color_dialog_active = FALSE;
+      /* Fallthrough */
+
+    case GIMP_COLOR_DIALOG_UPDATE:
+      if (edit_color == GIMP_ACTIVE_COLOR_FOREGROUND)
+        {
+          g_signal_handlers_block_by_func (context,
+                                           color_area_foreground_changed,
+                                           dialog);
+
+          gimp_context_set_foreground (context, color);
+
+          g_signal_handlers_unblock_by_func (context,
+                                             color_area_foreground_changed,
+                                             dialog);
+        }
+      else
+        {
+          g_signal_handlers_block_by_func (context,
+                                           color_area_background_changed,
+                                           dialog);
+
+          gimp_context_set_background (context, color);
+
+          g_signal_handlers_unblock_by_func (context,
+                                             color_area_background_changed,
+                                             dialog);
+        }
+      break;
+
+    case GIMP_COLOR_DIALOG_CANCEL:
+      gtk_widget_hide (color_dialog);
+      color_dialog_active = FALSE;
+      gimp_context_set_foreground (context, &revert_fg);
+      gimp_context_set_background (context, &revert_bg);
+      break;
+    }
+}
+
+static void
+color_area_color_clicked (GimpFgBgEditor  *editor,
+                          GimpActiveColor  active_color,
+                          GimpContext     *context)
+{
+  GimpRGB      color;
+  const gchar *title;
+
+  if (! color_dialog_active)
+    {
+      gimp_context_get_foreground (context, &revert_fg);
+      gimp_context_get_background (context, &revert_bg);
+    }
+
+  if (active_color == GIMP_ACTIVE_COLOR_FOREGROUND)
+    {
+      gimp_context_get_foreground (context, &color);
+      title = _("Change Foreground Color");
+    }
+  else
+    {
+      gimp_context_get_background (context, &color);
+      title = _("Change Background Color");
+    }
+
+  edit_color = active_color;
+
+  if (! color_dialog)
+    {
+      color_dialog = gimp_color_dialog_new (NULL, context,
+                                            NULL, NULL, NULL,
+                                            GTK_WIDGET (editor),
+                                            gimp_dialog_factory_get_singleton (),
+                                            "gimp-toolbox-color-dialog",
+                                            &color,
+                                            TRUE, FALSE);
+
+      g_signal_connect_object (color_dialog, "update",
+                               G_CALLBACK (color_area_dialog_update),
+                               G_OBJECT (context), 0);
+
+      g_signal_connect_object (context, "foreground-changed",
+                               G_CALLBACK (color_area_foreground_changed),
+                               G_OBJECT (color_dialog), 0);
+      g_signal_connect_object (context, "background-changed",
+                               G_CALLBACK (color_area_background_changed),
+                               G_OBJECT (color_dialog), 0);
+    }
+  else if (! gtk_widget_get_visible (color_dialog))
+    {
+      gimp_dialog_factory_position_dialog (gimp_dialog_factory_get_singleton (),
+                                           "gimp-toolbox-color-dialog",
+                                           color_dialog,
+                                           gtk_widget_get_screen (GTK_WIDGET (editor)),
+                                           gimp_widget_get_monitor (GTK_WIDGET (editor)));
+    }
+
+  gtk_window_set_title (GTK_WINDOW (color_dialog), title);
+  gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (color_dialog), &color);
+
+  gtk_window_present (GTK_WINDOW (color_dialog));
+  color_dialog_active = TRUE;
+}
+
+static gboolean
+accel_find_func (GtkAccelKey *key,
+                 GClosure    *closure,
+                 gpointer     data)
+{
+  return (GClosure *) data == closure;
+}
+
+static void
+color_area_tooltip (GimpFgBgEditor *editor,
+                    GimpFgBgTarget  target,
+                    GtkTooltip     *tooltip,
+                    GimpToolbox    *toolbox)
+{
+  GimpUIManager *manager = gimp_dock_get_ui_manager (GIMP_DOCK (toolbox));
+  GimpAction    *action  = NULL;
+  const gchar   *text    = NULL;
+
+  switch (target)
+    {
+    case GIMP_FG_BG_TARGET_FOREGROUND:
+      text = _("The active foreground color.\n"
+               "Click to open the color selection dialog.");
+      break;
+
+    case GIMP_FG_BG_TARGET_BACKGROUND:
+      text = _("The active background color.\n"
+               "Click to open the color selection dialog.");
+      break;
+
+    case GIMP_FG_BG_TARGET_SWAP:
+      action = gimp_ui_manager_find_action (manager, "context",
+                                            "context-colors-swap");
+      text = gimp_action_get_tooltip (action);
+      break;
+
+    case GIMP_FG_BG_TARGET_DEFAULT:
+      action = gimp_ui_manager_find_action (manager, "context",
+                                            "context-colors-default");
+      text = gimp_action_get_tooltip (action);
+      break;
+
+    default:
+      break;
+    }
+
+  if (text)
+    {
+      gchar *markup = NULL;
+
+      if (action)
+        {
+          GtkAccelGroup *accel_group;
+          GClosure      *accel_closure;
+          GtkAccelKey   *accel_key;
+
+          accel_closure = gimp_action_get_accel_closure (action);
+          accel_group   = gtk_accel_group_from_accel_closure (accel_closure);
+
+          accel_key = gtk_accel_group_find (accel_group,
+                                            accel_find_func,
+                                            accel_closure);
+
+          if (accel_key            &&
+              accel_key->accel_key &&
+              (accel_key->accel_flags & GTK_ACCEL_VISIBLE))
+            {
+              gchar *escaped = g_markup_escape_text (text, -1);
+              gchar *accel   = gtk_accelerator_get_label (accel_key->accel_key,
+                                                          accel_key->accel_mods);
+
+              markup = g_strdup_printf ("%s  <b>%s</b>", escaped, accel);
+
+              g_free (accel);
+              g_free (escaped);
+            }
+        }
+
+      if (markup)
+        {
+          gtk_tooltip_set_markup (tooltip, markup);
+          g_free (markup);
+        }
+      else
+        {
+          gtk_tooltip_set_text (tooltip, text);
+        }
+    }
+}
diff --git a/app/widgets/gimptoolbox-color-area.h b/app/widgets/gimptoolbox-color-area.h
new file mode 100644
index 0000000..50f6427
--- /dev/null
+++ b/app/widgets/gimptoolbox-color-area.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLBOX_COLOR_AREA_H__
+#define __GIMP_TOOLBOX_COLOR_AREA_H__
+
+
+GtkWidget * gimp_toolbox_color_area_create (GimpToolbox *toolbox,
+                                            gint         width,
+                                            gint         height);
+
+
+#endif  /*  __GIMP_TOOLBOX_COLOR_AREA_H__  */
diff --git a/app/widgets/gimptoolbox-dnd.c b/app/widgets/gimptoolbox-dnd.c
new file mode 100644
index 0000000..9c68610
--- /dev/null
+++ b/app/widgets/gimptoolbox-dnd.c
@@ -0,0 +1,277 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-new.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimptoolinfo.h"
+
+#include "file/file-open.h"
+
+#include "gimpdnd.h"
+#include "gimptoolbox.h"
+#include "gimptoolbox-dnd.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static void   gimp_toolbox_drop_uri_list  (GtkWidget       *widget,
+                                           gint             x,
+                                           gint             y,
+                                           GList           *uri_list,
+                                           gpointer         data);
+static void   gimp_toolbox_drop_drawable  (GtkWidget       *widget,
+                                           gint             x,
+                                           gint             y,
+                                           GimpViewable    *viewable,
+                                           gpointer         data);
+static void   gimp_toolbox_drop_tool      (GtkWidget       *widget,
+                                           gint             x,
+                                           gint             y,
+                                           GimpViewable    *viewable,
+                                           gpointer         data);
+static void   gimp_toolbox_drop_buffer    (GtkWidget       *widget,
+                                           gint             x,
+                                           gint             y,
+                                           GimpViewable    *viewable,
+                                           gpointer         data);
+static void   gimp_toolbox_drop_component (GtkWidget       *widget,
+                                           gint             x,
+                                           gint             y,
+                                           GimpImage       *image,
+                                           GimpChannelType  component,
+                                           gpointer         data);
+static void   gimp_toolbox_drop_pixbuf    (GtkWidget       *widget,
+                                           gint             x,
+                                           gint             y,
+                                           GdkPixbuf       *pixbuf,
+                                           gpointer         data);
+
+
+/*  public functions  */
+
+void
+gimp_toolbox_dnd_init (GimpToolbox *toolbox,
+                       GtkWidget   *vbox)
+{
+  GimpContext *context = NULL;
+
+  g_return_if_fail (GIMP_IS_TOOLBOX (toolbox));
+  g_return_if_fail (GTK_IS_BOX (vbox));
+
+  context = gimp_toolbox_get_context (toolbox);
+
+  /* Before caling any dnd helper functions, setup the drag
+   * destination manually since we want to handle all drag events
+   * manually, otherwise we would not be able to give the drag handler
+   * a chance to handle drag events
+   */
+  gtk_drag_dest_set (vbox,
+                     0, NULL, 0,
+                     GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_LAYER,
+                               gimp_toolbox_drop_drawable,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_LAYER_MASK,
+                               gimp_toolbox_drop_drawable,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_CHANNEL,
+                               gimp_toolbox_drop_drawable,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_TOOL_INFO,
+                               gimp_toolbox_drop_tool,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_BUFFER,
+                               gimp_toolbox_drop_buffer,
+                               context);
+  gimp_dnd_component_dest_add (vbox,
+                               gimp_toolbox_drop_component,
+                               context);
+  gimp_dnd_uri_list_dest_add  (vbox,
+                               gimp_toolbox_drop_uri_list,
+                               context);
+  gimp_dnd_pixbuf_dest_add    (vbox,
+                               gimp_toolbox_drop_pixbuf,
+                               context);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_toolbox_drop_uri_list (GtkWidget *widget,
+                            gint       x,
+                            gint       y,
+                            GList     *uri_list,
+                            gpointer   data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+  GList       *list;
+
+  if (context->gimp->busy)
+    return;
+
+  for (list = uri_list; list; list = g_list_next (list))
+    {
+      GFile             *file = g_file_new_for_uri (list->data);
+      GimpImage         *image;
+      GimpPDBStatusType  status;
+      GError            *error = NULL;
+
+      image = file_open_with_display (context->gimp, context, NULL,
+                                      file, FALSE,
+                                      G_OBJECT (gtk_widget_get_screen (widget)),
+                                      gimp_widget_get_monitor (widget),
+                                      &status, &error);
+
+      if (! image && status != GIMP_PDB_CANCEL)
+        {
+          gimp_message (context->gimp, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
+                        _("Opening '%s' failed:\n\n%s"),
+                        gimp_file_get_utf8_name (file), error->message);
+          g_clear_error (&error);
+        }
+
+      g_object_unref (file);
+    }
+}
+
+static void
+gimp_toolbox_drop_drawable (GtkWidget    *widget,
+                            gint          x,
+                            gint          y,
+                            GimpViewable *viewable,
+                            gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+  GimpImage   *new_image;
+
+  if (context->gimp->busy)
+    return;
+
+  new_image = gimp_image_new_from_drawable (context->gimp,
+                                            GIMP_DRAWABLE (viewable));
+  gimp_create_display (context->gimp, new_image, GIMP_UNIT_PIXEL, 1.0,
+                       G_OBJECT (gtk_widget_get_screen (widget)),
+                       gimp_widget_get_monitor (widget));
+  g_object_unref (new_image);
+}
+
+static void
+gimp_toolbox_drop_tool (GtkWidget    *widget,
+                        gint          x,
+                        gint          y,
+                        GimpViewable *viewable,
+                        gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+
+  if (context->gimp->busy)
+    return;
+
+  gimp_context_set_tool (context, GIMP_TOOL_INFO (viewable));
+}
+
+static void
+gimp_toolbox_drop_buffer (GtkWidget    *widget,
+                          gint          x,
+                          gint          y,
+                          GimpViewable *viewable,
+                          gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+  GimpImage   *image;
+
+  if (context->gimp->busy)
+    return;
+
+  image = gimp_image_new_from_buffer (context->gimp,
+                                      GIMP_BUFFER (viewable));
+  gimp_create_display (image->gimp, image, GIMP_UNIT_PIXEL, 1.0,
+                       G_OBJECT (gtk_widget_get_screen (widget)),
+                       gimp_widget_get_monitor (widget));
+  g_object_unref (image);
+}
+
+static void
+gimp_toolbox_drop_component (GtkWidget       *widget,
+                             gint             x,
+                             gint             y,
+                             GimpImage       *image,
+                             GimpChannelType  component,
+                             gpointer         data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+  GimpImage   *new_image;
+
+  if (context->gimp->busy)
+    return;
+
+  new_image = gimp_image_new_from_component (context->gimp,
+                                             image, component);
+  gimp_create_display (new_image->gimp, new_image, GIMP_UNIT_PIXEL, 1.0,
+                       G_OBJECT (gtk_widget_get_screen (widget)),
+                       gimp_widget_get_monitor (widget));
+  g_object_unref (new_image);
+}
+
+static void
+gimp_toolbox_drop_pixbuf (GtkWidget *widget,
+                          gint       x,
+                          gint       y,
+                          GdkPixbuf *pixbuf,
+                          gpointer   data)
+{
+  GimpContext   *context = GIMP_CONTEXT (data);
+  GimpImage     *new_image;
+
+  if (context->gimp->busy)
+    return;
+
+  new_image = gimp_image_new_from_pixbuf (context->gimp, pixbuf,
+                                          _("Dropped Buffer"));
+  gimp_create_display (new_image->gimp, new_image, GIMP_UNIT_PIXEL, 1.0,
+                       G_OBJECT (gtk_widget_get_screen (widget)),
+                       gimp_widget_get_monitor (widget));
+  g_object_unref (new_image);
+}
diff --git a/app/widgets/gimptoolbox-dnd.h b/app/widgets/gimptoolbox-dnd.h
new file mode 100644
index 0000000..dd94ca8
--- /dev/null
+++ b/app/widgets/gimptoolbox-dnd.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLBOX_DND_H__
+#define __GIMP_TOOLBOX_DND_H__
+
+
+void   gimp_toolbox_dnd_init (GimpToolbox *toolbox,
+                              GtkWidget   *vbox);
+
+
+#endif /* __GIMP_TOOLBOX_DND_H__ */
diff --git a/app/widgets/gimptoolbox-image-area.c b/app/widgets/gimptoolbox-image-area.c
new file mode 100644
index 0000000..c60ecdb
--- /dev/null
+++ b/app/widgets/gimptoolbox-image-area.c
@@ -0,0 +1,145 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "gimpdnd.h"
+#include "gimpview.h"
+#include "gimptoolbox.h"
+#include "gimptoolbox-image-area.h"
+#include "gimpwindowstrategy.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void
+image_preview_clicked (GtkWidget       *widget,
+                       GdkModifierType  state,
+                       GimpToolbox     *toolbox)
+{
+  GimpContext *context = gimp_toolbox_get_context (toolbox);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
+                                             context->gimp,
+                                             gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             "gimp-image-list|gimp-image-grid");
+}
+
+static void
+image_preview_drop_image (GtkWidget    *widget,
+                          gint          x,
+                          gint          y,
+                          GimpViewable *viewable,
+                          gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+
+  gimp_context_set_image (context, GIMP_IMAGE (viewable));
+}
+
+static void
+image_preview_set_viewable (GimpView     *view,
+                            GimpViewable *old_viewable,
+                            GimpViewable *new_viewable)
+{
+  if (! old_viewable && new_viewable)
+    {
+      gimp_dnd_xds_source_add (GTK_WIDGET (view),
+                               (GimpDndDragViewableFunc) gimp_view_get_viewable,
+                               NULL);
+    }
+  else if (old_viewable && ! new_viewable)
+    {
+      gimp_dnd_xds_source_remove (GTK_WIDGET (view));
+    }
+}
+
+/*  public functions  */
+
+GtkWidget *
+gimp_toolbox_image_area_create (GimpToolbox *toolbox,
+                                gint         width,
+                                gint         height)
+{
+  GimpContext *context;
+  GtkWidget   *image_view;
+  gchar       *tooltip;
+
+  g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
+
+  context = gimp_toolbox_get_context (toolbox);
+
+  image_view = gimp_view_new_full_by_types (context,
+                                            GIMP_TYPE_VIEW, GIMP_TYPE_IMAGE,
+                                            width, height, 0,
+                                            FALSE, TRUE, TRUE);
+
+  g_signal_connect (image_view, "set-viewable",
+                    G_CALLBACK (image_preview_set_viewable),
+                    NULL);
+
+  gimp_view_set_viewable (GIMP_VIEW (image_view),
+                          GIMP_VIEWABLE (gimp_context_get_image (context)));
+
+  gtk_widget_show (image_view);
+
+#ifdef GDK_WINDOWING_X11
+  tooltip = g_strdup_printf ("%s\n%s",
+                             _("The active image.\n"
+                               "Click to open the Image Dialog."),
+                             _("Drag to an XDS enabled file-manager to "
+                               "save the image."));
+#else
+  tooltip = g_strdup (_("The active image.\n"
+                        "Click to open the Image Dialog."));
+#endif
+
+  gimp_help_set_help_data (image_view, tooltip, NULL);
+  g_free (tooltip);
+
+  g_signal_connect_object (context, "image-changed",
+                           G_CALLBACK (gimp_view_set_viewable),
+                           image_view, G_CONNECT_SWAPPED);
+
+  g_signal_connect (image_view, "clicked",
+                    G_CALLBACK (image_preview_clicked),
+                    toolbox);
+
+  gimp_dnd_viewable_dest_add (image_view,
+                              GIMP_TYPE_IMAGE,
+                              image_preview_drop_image,
+                              context);
+
+  return image_view;
+}
diff --git a/app/widgets/gimptoolbox-image-area.h b/app/widgets/gimptoolbox-image-area.h
new file mode 100644
index 0000000..77f0b15
--- /dev/null
+++ b/app/widgets/gimptoolbox-image-area.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLBOX_IMAGE_AREA_H__
+#define __GIMP_TOOLBOX_IMAGE_AREA_H__
+
+
+GtkWidget * gimp_toolbox_image_area_create (GimpToolbox *toolbox,
+                                            gint         width,
+                                            gint         height);
+
+
+#endif  /*  __GIMP_TOOLBOX_IMAGE_AREA_H__  */
diff --git a/app/widgets/gimptoolbox-indicator-area.c b/app/widgets/gimptoolbox-indicator-area.c
new file mode 100644
index 0000000..884cb97
--- /dev/null
+++ b/app/widgets/gimptoolbox-indicator-area.c
@@ -0,0 +1,251 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpbrush.h"
+#include "core/gimpcontext.h"
+#include "core/gimpgradient.h"
+#include "core/gimppattern.h"
+
+#include "gimpdnd.h"
+#include "gimpview.h"
+#include "gimptoolbox.h"
+#include "gimptoolbox-indicator-area.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+
+
+#define CELL_SIZE        24  /*  The size of the previews                  */
+#define GRAD_CELL_WIDTH  52  /*  The width of the gradient preview         */
+#define GRAD_CELL_HEIGHT 12  /*  The height of the gradient preview        */
+#define CELL_SPACING      2  /*  How much between brush and pattern cells  */
+
+
+static void
+brush_preview_clicked (GtkWidget       *widget,
+                       GdkModifierType  state,
+                       GimpToolbox     *toolbox)
+{
+  GimpContext *context = gimp_toolbox_get_context (toolbox);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
+                                             context->gimp,
+                                             gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             "gimp-brush-grid|gimp-brush-list");
+}
+
+static void
+brush_preview_drop_brush (GtkWidget    *widget,
+                          gint          x,
+                          gint          y,
+                          GimpViewable *viewable,
+                          gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+
+  gimp_context_set_brush (context, GIMP_BRUSH (viewable));
+}
+
+static void
+pattern_preview_clicked (GtkWidget       *widget,
+                         GdkModifierType  state,
+                         GimpToolbox     *toolbox)
+{
+  GimpContext *context = gimp_toolbox_get_context (toolbox);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
+                                             context->gimp,
+                                             gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             "gimp-pattern-grid|gimp-pattern-list");
+}
+
+static void
+pattern_preview_drop_pattern (GtkWidget    *widget,
+                              gint          x,
+                              gint          y,
+                              GimpViewable *viewable,
+                              gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+
+  gimp_context_set_pattern (context, GIMP_PATTERN (viewable));
+}
+
+static void
+gradient_preview_clicked (GtkWidget       *widget,
+                          GdkModifierType  state,
+                          GimpToolbox     *toolbox)
+{
+  GimpContext *context = gimp_toolbox_get_context (toolbox);
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
+                                             context->gimp,
+                                             gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             "gimp-gradient-list|gimp-gradient-grid");
+}
+
+static void
+gradient_preview_drop_gradient (GtkWidget    *widget,
+                                gint          x,
+                                gint          y,
+                                GimpViewable *viewable,
+                                gpointer      data)
+{
+  GimpContext *context = GIMP_CONTEXT (data);
+
+  gimp_context_set_gradient (context, GIMP_GRADIENT (viewable));
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_toolbox_indicator_area_create (GimpToolbox *toolbox)
+{
+  GimpContext *context;
+  GtkWidget   *indicator_table;
+  GtkWidget   *brush_view;
+  GtkWidget   *pattern_view;
+  GtkWidget   *gradient_view;
+
+  g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
+
+  context = gimp_toolbox_get_context (toolbox);
+
+  indicator_table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (indicator_table), CELL_SPACING);
+  gtk_table_set_col_spacings (GTK_TABLE (indicator_table), CELL_SPACING);
+
+  /*  brush view  */
+
+  brush_view =
+    gimp_view_new_full_by_types (context,
+                                 GIMP_TYPE_VIEW, GIMP_TYPE_BRUSH,
+                                 CELL_SIZE, CELL_SIZE, 1,
+                                 FALSE, TRUE, TRUE);
+  gimp_view_set_viewable (GIMP_VIEW (brush_view),
+                          GIMP_VIEWABLE (gimp_context_get_brush (context)));
+  gtk_table_attach_defaults (GTK_TABLE (indicator_table), brush_view,
+                             0, 1, 0, 1);
+  gtk_widget_show (brush_view);
+
+  gimp_help_set_help_data (brush_view,
+                           _("The active brush.\n"
+                             "Click to open the Brush Dialog."), NULL);
+
+  g_signal_connect_object (context, "brush-changed",
+                           G_CALLBACK (gimp_view_set_viewable),
+                           brush_view,
+                           G_CONNECT_SWAPPED);
+
+  g_signal_connect (brush_view, "clicked",
+                    G_CALLBACK (brush_preview_clicked),
+                    toolbox);
+
+  gimp_dnd_viewable_dest_add (brush_view,
+                              GIMP_TYPE_BRUSH,
+                              brush_preview_drop_brush,
+                              context);
+
+  /*  pattern view  */
+
+  pattern_view =
+    gimp_view_new_full_by_types (context,
+                                 GIMP_TYPE_VIEW, GIMP_TYPE_PATTERN,
+                                 CELL_SIZE, CELL_SIZE, 1,
+                                 FALSE, TRUE, TRUE);
+  gimp_view_set_viewable (GIMP_VIEW (pattern_view),
+                          GIMP_VIEWABLE (gimp_context_get_pattern (context)));
+
+  gtk_table_attach_defaults (GTK_TABLE (indicator_table), pattern_view,
+                             1, 2, 0, 1);
+  gtk_widget_show (pattern_view);
+
+  gimp_help_set_help_data (pattern_view,
+                           _("The active pattern.\n"
+                             "Click to open the Pattern Dialog."), NULL);
+
+  g_signal_connect_object (context, "pattern-changed",
+                           G_CALLBACK (gimp_view_set_viewable),
+                           pattern_view,
+                           G_CONNECT_SWAPPED);
+
+  g_signal_connect (pattern_view, "clicked",
+                    G_CALLBACK (pattern_preview_clicked),
+                    toolbox);
+
+  gimp_dnd_viewable_dest_add (pattern_view,
+                              GIMP_TYPE_PATTERN,
+                              pattern_preview_drop_pattern,
+                              context);
+
+  /*  gradient view  */
+
+  gradient_view =
+    gimp_view_new_full_by_types (context,
+                                 GIMP_TYPE_VIEW, GIMP_TYPE_GRADIENT,
+                                 GRAD_CELL_WIDTH, GRAD_CELL_HEIGHT, 1,
+                                 FALSE, TRUE, TRUE);
+  gimp_view_set_viewable (GIMP_VIEW (gradient_view),
+                          GIMP_VIEWABLE (gimp_context_get_gradient (context)));
+
+  gtk_table_attach_defaults (GTK_TABLE (indicator_table), gradient_view,
+                             0, 2, 1, 2);
+  gtk_widget_show (gradient_view);
+
+  gimp_help_set_help_data (gradient_view,
+                           _("The active gradient.\n"
+                             "Click to open the Gradient Dialog."), NULL);
+
+  g_signal_connect_object (context, "gradient-changed",
+                           G_CALLBACK (gimp_view_set_viewable),
+                           gradient_view,
+                           G_CONNECT_SWAPPED);
+
+  g_signal_connect (gradient_view, "clicked",
+                    G_CALLBACK (gradient_preview_clicked),
+                    toolbox);
+
+  gimp_dnd_viewable_dest_add (gradient_view,
+                              GIMP_TYPE_GRADIENT,
+                              gradient_preview_drop_gradient,
+                              context);
+
+  gtk_widget_show (indicator_table);
+
+  return indicator_table;
+}
diff --git a/app/widgets/gimptoolbox-indicator-area.h b/app/widgets/gimptoolbox-indicator-area.h
new file mode 100644
index 0000000..05c9c7c
--- /dev/null
+++ b/app/widgets/gimptoolbox-indicator-area.h
@@ -0,0 +1,25 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLBOX_INDICATOR_AREA_H__
+#define __GIMP_TOOLBOX_INDICATOR_AREA_H__
+
+
+GtkWidget * gimp_toolbox_indicator_area_create (GimpToolbox *toolbox);
+
+
+#endif  /*  __GIMP_TOOLBOX_INDICATOR_AREA_H__  */
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
new file mode 100644
index 0000000..0db8485
--- /dev/null
+++ b/app/widgets/gimptoolbox.c
@@ -0,0 +1,811 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#undef GSEAL_ENABLE
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+
+#include "file/file-open.h"
+
+#include "gimpcairo-wilber.h"
+#include "gimpdevices.h"
+#include "gimpdialogfactory.h"
+#include "gimpdockwindow.h"
+#include "gimphelp-ids.h"
+#include "gimppanedbox.h"
+#include "gimptoolbox.h"
+#include "gimptoolbox-color-area.h"
+#include "gimptoolbox-dnd.h"
+#include "gimptoolbox-image-area.h"
+#include "gimptoolbox-indicator-area.h"
+#include "gimptoolpalette.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+#include "gtkhwrapbox.h"
+
+#include "about.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_CONTEXT
+};
+
+
+struct _GimpToolboxPrivate
+{
+  GimpContext       *context;
+
+  GtkWidget         *vbox;
+
+  GtkWidget         *header;
+  GtkWidget         *tool_palette;
+  GtkWidget         *area_wbox;
+  GtkWidget         *color_area;
+  GtkWidget         *foo_area;
+  GtkWidget         *image_area;
+
+  gint               area_rows;
+  gint               area_columns;
+
+  GimpPanedBox      *drag_handler;
+
+  gboolean           in_destruction;
+};
+
+
+static void        gimp_toolbox_constructed             (GObject        *object);
+static void        gimp_toolbox_dispose                 (GObject        *object);
+static void        gimp_toolbox_set_property            (GObject        *object,
+                                                         guint           property_id,
+                                                         const GValue   *value,
+                                                         GParamSpec     *pspec);
+static void        gimp_toolbox_get_property            (GObject        *object,
+                                                         guint           property_id,
+                                                         GValue         *value,
+                                                         GParamSpec     *pspec);
+static void        gimp_toolbox_size_allocate           (GtkWidget      *widget,
+                                                         GtkAllocation  *allocation);
+static gboolean    gimp_toolbox_button_press_event      (GtkWidget      *widget,
+                                                         GdkEventButton *event);
+static void        gimp_toolbox_drag_leave              (GtkWidget      *widget,
+                                                         GdkDragContext *context,
+                                                         guint           time,
+                                                         GimpToolbox    *toolbox);
+static gboolean    gimp_toolbox_drag_motion             (GtkWidget      *widget,
+                                                         GdkDragContext *context,
+                                                         gint            x,
+                                                         gint            y,
+                                                         guint           time,
+                                                         GimpToolbox    *toolbox);
+static gboolean    gimp_toolbox_drag_drop               (GtkWidget      *widget,
+                                                         GdkDragContext *context,
+                                                         gint            x,
+                                                         gint            y,
+                                                         guint           time,
+                                                         GimpToolbox    *toolbox);
+static gchar     * gimp_toolbox_get_description         (GimpDock       *dock,
+                                                         gboolean        complete);
+static void        gimp_toolbox_set_host_geometry_hints (GimpDock       *dock,
+                                                         GtkWindow      *window);
+static void        gimp_toolbox_book_added              (GimpDock       *dock,
+                                                         GimpDockbook   *dockbook);
+static void        gimp_toolbox_book_removed            (GimpDock       *dock,
+                                                         GimpDockbook   *dockbook);
+static void        gimp_toolbox_size_request_wilber     (GtkWidget      *widget,
+                                                         GtkRequisition *requisition,
+                                                         GimpToolbox    *toolbox);
+static gboolean    gimp_toolbox_expose_wilber           (GtkWidget      *widget,
+                                                         GdkEventExpose *event);
+static GtkWidget * toolbox_create_color_area            (GimpToolbox    *toolbox,
+                                                         GimpContext    *context);
+static GtkWidget * toolbox_create_foo_area              (GimpToolbox    *toolbox,
+                                                         GimpContext    *context);
+static GtkWidget * toolbox_create_image_area            (GimpToolbox    *toolbox,
+                                                         GimpContext    *context);
+static void        toolbox_area_notify                  (GimpGuiConfig  *config,
+                                                         GParamSpec     *pspec,
+                                                         GtkWidget      *area);
+static void        toolbox_paste_received               (GtkClipboard   *clipboard,
+                                                         const gchar    *text,
+                                                         gpointer        data);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolbox, gimp_toolbox, GIMP_TYPE_DOCK)
+
+#define parent_class gimp_toolbox_parent_class
+
+
+static void
+gimp_toolbox_class_init (GimpToolboxClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GimpDockClass  *dock_class   = GIMP_DOCK_CLASS (klass);
+
+  object_class->constructed           = gimp_toolbox_constructed;
+  object_class->dispose               = gimp_toolbox_dispose;
+  object_class->set_property          = gimp_toolbox_set_property;
+  object_class->get_property          = gimp_toolbox_get_property;
+
+  widget_class->size_allocate         = gimp_toolbox_size_allocate;
+  widget_class->button_press_event    = gimp_toolbox_button_press_event;
+
+  dock_class->get_description         = gimp_toolbox_get_description;
+  dock_class->set_host_geometry_hints = gimp_toolbox_set_host_geometry_hints;
+  dock_class->book_added              = gimp_toolbox_book_added;
+  dock_class->book_removed            = gimp_toolbox_book_removed;
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_toolbox_init (GimpToolbox *toolbox)
+{
+  toolbox->p = gimp_toolbox_get_instance_private (toolbox);
+
+  gimp_help_connect (GTK_WIDGET (toolbox), gimp_standard_help_func,
+                     GIMP_HELP_TOOLBOX, NULL);
+}
+
+static void
+gimp_toolbox_constructed (GObject *object)
+{
+  GimpToolbox   *toolbox = GIMP_TOOLBOX (object);
+  GimpGuiConfig *config;
+  GtkWidget     *main_vbox;
+  GdkDisplay    *display;
+  GList         *list;
+
+  gimp_assert (GIMP_IS_CONTEXT (toolbox->p->context));
+
+  config = GIMP_GUI_CONFIG (toolbox->p->context->gimp->config);
+
+  main_vbox = gimp_dock_get_main_vbox (GIMP_DOCK (toolbox));
+
+  toolbox->p->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (main_vbox), toolbox->p->vbox, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (main_vbox), toolbox->p->vbox, 0);
+  gtk_widget_show (toolbox->p->vbox);
+
+  /* Use g_signal_connect() also for the toolbox itself so we can pass
+   * data and reuse the same function for the vbox
+   */
+  g_signal_connect (toolbox, "drag-leave",
+                    G_CALLBACK (gimp_toolbox_drag_leave),
+                    toolbox);
+  g_signal_connect (toolbox, "drag-motion",
+                    G_CALLBACK (gimp_toolbox_drag_motion),
+                    toolbox);
+  g_signal_connect (toolbox, "drag-drop",
+                    G_CALLBACK (gimp_toolbox_drag_drop),
+                    toolbox);
+  g_signal_connect (toolbox->p->vbox, "drag-leave",
+                    G_CALLBACK (gimp_toolbox_drag_leave),
+                    toolbox);
+  g_signal_connect (toolbox->p->vbox, "drag-motion",
+                    G_CALLBACK (gimp_toolbox_drag_motion),
+                    toolbox);
+  g_signal_connect (toolbox->p->vbox, "drag-drop",
+                    G_CALLBACK (gimp_toolbox_drag_drop),
+                    toolbox);
+
+  toolbox->p->header = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (toolbox->p->header), GTK_SHADOW_NONE);
+  gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->header,
+                      FALSE, FALSE, 0);
+
+  g_object_bind_property (config,             "toolbox-wilber",
+                          toolbox->p->header, "visible",
+                          G_BINDING_SYNC_CREATE);
+
+  g_signal_connect (toolbox->p->header, "size-request",
+                    G_CALLBACK (gimp_toolbox_size_request_wilber),
+                    toolbox);
+  g_signal_connect (toolbox->p->header, "expose-event",
+                    G_CALLBACK (gimp_toolbox_expose_wilber),
+                    toolbox);
+
+  gimp_help_set_help_data (toolbox->p->header,
+                           _("Drop image files here to open them"), NULL);
+
+  toolbox->p->tool_palette = gimp_tool_palette_new ();
+  gimp_tool_palette_set_toolbox (GIMP_TOOL_PALETTE (toolbox->p->tool_palette),
+                                 toolbox);
+  gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->tool_palette,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (toolbox->p->tool_palette);
+
+  toolbox->p->area_wbox = gtk_hwrap_box_new (FALSE);
+  gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->p->area_wbox), GTK_JUSTIFY_TOP);
+  gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (toolbox->p->area_wbox),
+                                 GTK_JUSTIFY_LEFT);
+  gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (toolbox->p->area_wbox),
+                                 2.0 / 15.0);
+
+  gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->area_wbox,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (toolbox->p->area_wbox);
+
+  /* We need to know when the current device changes, so we can update
+   * the correct tool - to do this we connect to motion events.
+   * We can't just use EXTENSION_EVENTS_CURSOR though, since that
+   * would get us extension events for the mouse pointer, and our
+   * device would change to that and not change back. So we check
+   * manually that all devices have a cursor, before establishing the check.
+   */
+  display = gtk_widget_get_display (GTK_WIDGET (toolbox));
+  for (list = gdk_display_list_devices (display); list; list = list->next)
+    if (! ((GdkDevice *) (list->data))->has_cursor)
+      break;
+
+  if (! list)  /* all devices have cursor */
+    {
+      gtk_widget_add_events (GTK_WIDGET (toolbox), GDK_POINTER_MOTION_MASK);
+      gimp_devices_add_widget (toolbox->p->context->gimp, GTK_WIDGET (toolbox));
+    }
+
+  toolbox->p->color_area = toolbox_create_color_area (toolbox,
+                                                      toolbox->p->context);
+  gtk_wrap_box_pack_wrapped (GTK_WRAP_BOX (toolbox->p->area_wbox),
+                             toolbox->p->color_area,
+                             TRUE, TRUE, FALSE, TRUE, TRUE);
+  if (config->toolbox_color_area)
+    gtk_widget_show (toolbox->p->color_area);
+
+  g_signal_connect_object (config, "notify::toolbox-color-area",
+                           G_CALLBACK (toolbox_area_notify),
+                           toolbox->p->color_area, 0);
+
+  toolbox->p->foo_area = toolbox_create_foo_area (toolbox, toolbox->p->context);
+  gtk_wrap_box_pack (GTK_WRAP_BOX (toolbox->p->area_wbox), toolbox->p->foo_area,
+                     TRUE, TRUE, FALSE, TRUE);
+  if (config->toolbox_foo_area)
+    gtk_widget_show (toolbox->p->foo_area);
+
+  g_signal_connect_object (config, "notify::toolbox-foo-area",
+                           G_CALLBACK (toolbox_area_notify),
+                           toolbox->p->foo_area, 0);
+
+  toolbox->p->image_area = toolbox_create_image_area (toolbox,
+                                                      toolbox->p->context);
+  gtk_wrap_box_pack (GTK_WRAP_BOX (toolbox->p->area_wbox), toolbox->p->image_area,
+                     TRUE, TRUE, FALSE, TRUE);
+  if (config->toolbox_image_area)
+    gtk_widget_show (toolbox->p->image_area);
+
+  g_signal_connect_object (config, "notify::toolbox-image-area",
+                           G_CALLBACK (toolbox_area_notify),
+                           toolbox->p->image_area, 0);
+
+  gimp_toolbox_dnd_init (GIMP_TOOLBOX (toolbox), toolbox->p->vbox);
+}
+
+static void
+gimp_toolbox_dispose (GObject *object)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (object);
+
+  toolbox->p->in_destruction = TRUE;
+
+  g_clear_object (&toolbox->p->context);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+
+  toolbox->p->in_destruction = FALSE;
+}
+
+static void
+gimp_toolbox_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      toolbox->p->context = g_value_dup_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_toolbox_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTEXT:
+      g_value_set_object (value, toolbox->p->context);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_toolbox_size_allocate (GtkWidget     *widget,
+                            GtkAllocation *allocation)
+{
+  GimpToolbox    *toolbox = GIMP_TOOLBOX (widget);
+  GimpGuiConfig  *config;
+  GtkRequisition  color_requisition;
+  GtkRequisition  foo_requisition;
+  GtkRequisition  image_requisition;
+  gint            width;
+  gint            height;
+  gint            n_areas;
+  gint            area_rows;
+  gint            area_columns;
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  config = GIMP_GUI_CONFIG (toolbox->p->context->gimp->config);
+
+  gtk_widget_size_request (toolbox->p->color_area, &color_requisition);
+  gtk_widget_size_request (toolbox->p->foo_area,   &foo_requisition);
+  gtk_widget_size_request (toolbox->p->image_area, &image_requisition);
+
+  width  = MAX (color_requisition.width,
+                MAX (foo_requisition.width,
+                     image_requisition.width));
+  height = MAX (color_requisition.height,
+                MAX (foo_requisition.height,
+                     image_requisition.height));
+
+  n_areas = (config->toolbox_color_area +
+             config->toolbox_foo_area   +
+             config->toolbox_image_area);
+
+  area_columns = MAX (1, (allocation->width / width));
+  area_rows    = n_areas / area_columns;
+
+  if (n_areas % area_columns)
+    area_rows++;
+
+  if (toolbox->p->area_rows    != area_rows  ||
+      toolbox->p->area_columns != area_columns)
+    {
+      toolbox->p->area_rows    = area_rows;
+      toolbox->p->area_columns = area_columns;
+
+      gtk_widget_set_size_request (toolbox->p->area_wbox, -1,
+                                   area_rows * height);
+    }
+}
+
+static gboolean
+gimp_toolbox_button_press_event (GtkWidget      *widget,
+                                 GdkEventButton *event)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (widget);
+
+  if (event->type == GDK_BUTTON_PRESS && event->button == 2)
+    {
+      GtkClipboard *clipboard;
+
+      clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY);
+      gtk_clipboard_request_text (clipboard,
+                                  toolbox_paste_received,
+                                  g_object_ref (toolbox));
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_toolbox_drag_leave (GtkWidget      *widget,
+                         GdkDragContext *context,
+                         guint           time,
+                         GimpToolbox    *toolbox)
+{
+  gimp_highlight_widget (widget, FALSE);
+}
+
+static gboolean
+gimp_toolbox_drag_motion (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          gint            x,
+                          gint            y,
+                          guint           time,
+                          GimpToolbox    *toolbox)
+{
+  gboolean handle;
+
+  if (gimp_paned_box_will_handle_drag (toolbox->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      gdk_drag_status (context, 0, time);
+      gimp_highlight_widget (widget, FALSE);
+
+      return FALSE;
+    }
+
+  handle = (gtk_drag_dest_find_target (widget, context, NULL) != GDK_NONE);
+
+  gdk_drag_status (context, handle ? GDK_ACTION_MOVE : 0, time);
+  gimp_highlight_widget (widget, handle);
+
+  /* Return TRUE so drag_leave() is called */
+  return TRUE;
+}
+
+static gboolean
+gimp_toolbox_drag_drop (GtkWidget      *widget,
+                        GdkDragContext *context,
+                        gint            x,
+                        gint            y,
+                        guint           time,
+                        GimpToolbox    *toolbox)
+{
+  GdkAtom  target;
+  gboolean dropped = FALSE;
+
+  if (gimp_paned_box_will_handle_drag (toolbox->p->drag_handler,
+                                       widget,
+                                       context,
+                                       x, y,
+                                       time))
+    {
+      return FALSE;
+    }
+
+  target = gtk_drag_dest_find_target (widget, context, NULL);
+
+  if (target != GDK_NONE)
+    {
+      /* The URI handlers etc will handle this */
+      gtk_drag_get_data (widget, context, target, time);
+      dropped = TRUE;
+    }
+
+  gtk_drag_finish (context, dropped, (context->action == GDK_ACTION_MOVE), time);
+
+  return TRUE;
+}
+
+static gchar *
+gimp_toolbox_get_description (GimpDock *dock,
+                              gboolean  complete)
+{
+  GString *desc      = g_string_new (_("Toolbox"));
+  gchar   *dock_desc = GIMP_DOCK_CLASS (parent_class)->get_description (dock,
+                                                                        complete);
+
+  if (dock_desc && strlen (dock_desc) > 0)
+    {
+      g_string_append (desc, GIMP_DOCK_BOOK_SEPARATOR);
+      g_string_append (desc, dock_desc);
+    }
+
+  g_free (dock_desc);
+
+  return g_string_free (desc, FALSE /*free_segment*/);
+}
+
+static void
+gimp_toolbox_book_added (GimpDock     *dock,
+                         GimpDockbook *dockbook)
+{
+  if (GIMP_DOCK_CLASS (parent_class)->book_added)
+    GIMP_DOCK_CLASS (parent_class)->book_added (dock, dockbook);
+
+  if (g_list_length (gimp_dock_get_dockbooks (dock)) == 1)
+    {
+      gimp_dock_invalidate_geometry (dock);
+    }
+}
+
+static void
+gimp_toolbox_book_removed (GimpDock     *dock,
+                           GimpDockbook *dockbook)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (dock);
+
+  if (GIMP_DOCK_CLASS (parent_class)->book_removed)
+    GIMP_DOCK_CLASS (parent_class)->book_removed (dock, dockbook);
+
+  if (! gimp_dock_get_dockbooks (dock) &&
+      ! toolbox->p->in_destruction)
+    {
+      gimp_dock_invalidate_geometry (dock);
+    }
+}
+
+static void
+gimp_toolbox_set_host_geometry_hints (GimpDock  *dock,
+                                      GtkWindow *window)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (dock);
+  gint         button_width;
+  gint         button_height;
+
+  if (gimp_tool_palette_get_button_size (GIMP_TOOL_PALETTE (toolbox->p->tool_palette),
+                                         &button_width, &button_height))
+    {
+      GdkGeometry geometry;
+
+      geometry.min_width   = 2 * button_width;
+      geometry.min_height  = -1;
+      geometry.base_width  = button_width;
+      geometry.base_height = 0;
+      geometry.width_inc   = button_width;
+      geometry.height_inc  = 1;
+
+      gtk_window_set_geometry_hints (window,
+                                     NULL,
+                                     &geometry,
+                                     GDK_HINT_MIN_SIZE   |
+                                     GDK_HINT_BASE_SIZE  |
+                                     GDK_HINT_RESIZE_INC |
+                                     GDK_HINT_USER_POS);
+
+      gimp_dialog_factory_set_has_min_size (window, TRUE);
+    }
+}
+
+GtkWidget *
+gimp_toolbox_new (GimpDialogFactory *factory,
+                  GimpContext       *context,
+                  GimpUIManager     *ui_manager)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (ui_manager), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOLBOX,
+                       "context", context,
+                       NULL);
+}
+
+GimpContext *
+gimp_toolbox_get_context (GimpToolbox *toolbox)
+{
+  g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
+
+  return toolbox->p->context;
+}
+
+void
+gimp_toolbox_set_drag_handler (GimpToolbox  *toolbox,
+                               GimpPanedBox *drag_handler)
+{
+  g_return_if_fail (GIMP_IS_TOOLBOX (toolbox));
+
+  toolbox->p->drag_handler = drag_handler;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_toolbox_size_request_wilber (GtkWidget      *widget,
+                                  GtkRequisition *requisition,
+                                  GimpToolbox    *toolbox)
+{
+  gint button_width;
+  gint button_height;
+
+  if (gimp_tool_palette_get_button_size (GIMP_TOOL_PALETTE (toolbox->p->tool_palette),
+                                         &button_width, &button_height))
+    {
+      requisition->width  = button_width  * PANGO_SCALE_SMALL;
+      requisition->height = button_height * PANGO_SCALE_SMALL;
+    }
+  else
+    {
+      requisition->width  = 16;
+      requisition->height = 16;
+    }
+}
+
+static gboolean
+gimp_toolbox_expose_wilber (GtkWidget      *widget,
+                            GdkEventExpose *event)
+{
+  cairo_t *cr;
+
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  gimp_cairo_draw_toolbox_wilber (widget, cr);
+
+  cairo_destroy (cr);
+
+  return FALSE;
+}
+
+static GtkWidget *
+toolbox_create_color_area (GimpToolbox *toolbox,
+                           GimpContext *context)
+{
+  GtkWidget *alignment;
+  GtkWidget *col_area;
+
+  alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_set_border_width (GTK_CONTAINER (alignment), 2);
+
+  gimp_help_set_help_data (alignment, NULL, GIMP_HELP_TOOLBOX_COLOR_AREA);
+
+  col_area = gimp_toolbox_color_area_create (toolbox, 40, 38);
+  gtk_container_add (GTK_CONTAINER (alignment), col_area);
+  gtk_widget_show (col_area);
+
+  return alignment;
+}
+
+static GtkWidget *
+toolbox_create_foo_area (GimpToolbox *toolbox,
+                         GimpContext *context)
+{
+  GtkWidget *alignment;
+  GtkWidget *foo_area;
+
+  alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_set_border_width (GTK_CONTAINER (alignment), 2);
+
+  gimp_help_set_help_data (alignment, NULL, GIMP_HELP_TOOLBOX_INDICATOR_AREA);
+
+  foo_area = gimp_toolbox_indicator_area_create (toolbox);
+  gtk_container_add (GTK_CONTAINER (alignment), foo_area);
+  gtk_widget_show (foo_area);
+
+  return alignment;
+}
+
+static GtkWidget *
+toolbox_create_image_area (GimpToolbox *toolbox,
+                           GimpContext *context)
+{
+  GtkWidget *alignment;
+  GtkWidget *image_area;
+
+  alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_set_border_width (GTK_CONTAINER (alignment), 2);
+
+  gimp_help_set_help_data (alignment, NULL, GIMP_HELP_TOOLBOX_IMAGE_AREA);
+
+  image_area = gimp_toolbox_image_area_create (toolbox, 52, 42);
+  gtk_container_add (GTK_CONTAINER (alignment), image_area);
+  gtk_widget_show (image_area);
+
+  return alignment;
+}
+
+static void
+toolbox_area_notify (GimpGuiConfig *config,
+                     GParamSpec    *pspec,
+                     GtkWidget     *area)
+{
+  GtkWidget *parent = gtk_widget_get_parent (area);
+  gboolean   visible;
+
+  if (config->toolbox_color_area ||
+      config->toolbox_foo_area   ||
+      config->toolbox_image_area)
+    {
+      GtkRequisition req;
+
+      gtk_widget_show (parent);
+
+      gtk_widget_size_request (area, &req);
+      gtk_widget_set_size_request (parent, req.width, req.height);
+    }
+  else
+    {
+      gtk_widget_hide (parent);
+      gtk_widget_set_size_request (parent, -1, -1);
+    }
+
+  g_object_get (config, pspec->name, &visible, NULL);
+  g_object_set (area, "visible", visible, NULL);
+}
+
+static void
+toolbox_paste_received (GtkClipboard *clipboard,
+                        const gchar  *text,
+                        gpointer      data)
+{
+  GimpToolbox *toolbox = GIMP_TOOLBOX (data);
+  GimpContext *context = toolbox->p->context;
+
+  if (text)
+    {
+      const gchar *newline = strchr (text, '\n');
+      gchar       *copy;
+      GFile       *file = NULL;
+
+      if (newline)
+        copy = g_strndup (text, newline - text);
+      else
+        copy = g_strdup (text);
+
+      g_strstrip (copy);
+
+      if (strlen (copy))
+        file = g_file_new_for_commandline_arg (copy);
+
+      g_free (copy);
+
+      if (file)
+        {
+          GtkWidget         *widget = GTK_WIDGET (toolbox);
+          GimpImage         *image;
+          GimpPDBStatusType  status;
+          GError            *error = NULL;
+
+          image = file_open_with_display (context->gimp, context, NULL,
+                                          file, FALSE,
+                                          G_OBJECT (gtk_widget_get_screen (widget)),
+                                          gimp_widget_get_monitor (widget),
+                                          &status, &error);
+
+          if (! image && status != GIMP_PDB_CANCEL)
+            {
+              gimp_message (context->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            _("Opening '%s' failed:\n\n%s"),
+                            gimp_file_get_utf8_name (file), error->message);
+              g_clear_error (&error);
+            }
+
+          g_object_unref (file);
+        }
+    }
+
+  g_object_unref (context);
+}
diff --git a/app/widgets/gimptoolbox.h b/app/widgets/gimptoolbox.h
new file mode 100644
index 0000000..b62f758
--- /dev/null
+++ b/app/widgets/gimptoolbox.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOLBOX_H__
+#define __GIMP_TOOLBOX_H__
+
+
+#include "gimpdock.h"
+
+
+#define GIMP_TYPE_TOOLBOX            (gimp_toolbox_get_type ())
+#define GIMP_TOOLBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOLBOX, GimpToolbox))
+#define GIMP_TOOLBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOLBOX, GimpToolboxClass))
+#define GIMP_IS_TOOLBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOLBOX))
+#define GIMP_IS_TOOLBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOLBOX))
+#define GIMP_TOOLBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOLBOX, GimpToolboxClass))
+
+
+typedef struct _GimpToolboxClass   GimpToolboxClass;
+typedef struct _GimpToolboxPrivate GimpToolboxPrivate;
+
+struct _GimpToolbox
+{
+  GimpDock parent_instance;
+
+  GimpToolboxPrivate *p;
+};
+
+struct _GimpToolboxClass
+{
+  GimpDockClass parent_class;
+};
+
+
+GType               gimp_toolbox_get_type           (void) G_GNUC_CONST;
+GtkWidget         * gimp_toolbox_new                (GimpDialogFactory *factory,
+                                                     GimpContext       *context,
+                                                     GimpUIManager     *ui_manager);
+GimpContext       * gimp_toolbox_get_context        (GimpToolbox       *toolbox);
+void                gimp_toolbox_set_drag_handler   (GimpToolbox       *toolbox,
+                                                     GimpPanedBox      *drag_handler);
+
+
+
+#endif /* __GIMP_TOOLBOX_H__ */
diff --git a/app/widgets/gimptoolbutton.c b/app/widgets/gimptoolbutton.c
new file mode 100644
index 0000000..d5d8587
--- /dev/null
+++ b/app/widgets/gimptoolbutton.c
@@ -0,0 +1,1477 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolbutton.c
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimp-gui.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolgroup.h"
+#include "core/gimptoolinfo.h"
+
+#include "actions/tools-commands.h"
+
+#include "gimpaccellabel.h"
+#include "gimpaction.h"
+#include "gimpdock.h"
+#include "gimptoolbox.h"
+#include "gimptoolbutton.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+
+
+#define ARROW_SIZE   0.125 /* * 100%       */
+#define ARROW_BORDER 3     /* px           */
+
+#define MENU_TIMEOUT 250   /* milliseconds */
+
+
+enum
+{
+  PROP_0,
+  PROP_TOOLBOX,
+  PROP_TOOL_ITEM,
+  PROP_SHOW_MENU_ON_HOVER
+};
+
+
+struct _GimpToolButtonPrivate
+{
+  GimpToolbox  *toolbox;
+  GimpToolItem *tool_item;
+  gboolean      show_menu_on_hover;
+
+  GtkWidget    *palette;
+
+  GtkWidget    *tooltip_widget;
+
+  GtkWidget    *menu;
+  GHashTable   *menu_items;
+  gint          menu_idle_id;
+  gint          menu_timeout_id;
+  gint          menu_timeout_button;
+  guint32       menu_timeout_time;
+  gint          menu_select_idle_id;
+};
+
+
+/*  local function prototypes  */
+
+static void         gimp_tool_button_constructed         (GObject             *object);
+static void         gimp_tool_button_dispose             (GObject             *object);
+static void         gimp_tool_button_set_property        (GObject             *object,
+                                                          guint                property_id,
+                                                          const GValue        *value,
+                                                          GParamSpec          *pspec);
+static void         gimp_tool_button_get_property        (GObject             *object,
+                                                          guint                property_id,
+                                                          GValue              *value,
+                                                          GParamSpec          *pspec);
+
+static void         gimp_tool_button_hierarchy_changed   (GtkWidget           *widget,
+                                                          GtkWidget           *previous_toplevel);
+static gboolean     gimp_tool_button_expose              (GtkWidget           *widget,
+                                                          GdkEventExpose      *event);
+static gboolean     gimp_tool_button_query_tooltip       (GtkWidget           *widget,
+                                                          gint                 x,
+                                                          gint                 y,
+                                                          gboolean             keyboard_mode,
+                                                          GtkTooltip          *tooltip);
+
+static void         gimp_tool_button_toggled             (GtkToggleToolButton *toggle_tool_button);
+
+static gboolean     gimp_tool_button_enter_notify        (GtkWidget           *widget,
+                                                          GdkEventCrossing    *event,
+                                                          GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_leave_notify        (GtkWidget           *widget,
+                                                          GdkEventCrossing    *event,
+                                                          GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_button_press        (GtkWidget           *widget,
+                                                          GdkEventButton      *event,
+                                                          GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_button_release      (GtkWidget           *widget,
+                                                          GdkEventButton      *event,
+                                                          GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_scroll              (GtkWidget           *widget,
+                                                          GdkEventScroll      *event,
+                                                          GimpToolButton      *tool_button);
+
+static void         gimp_tool_button_tool_changed        (GimpContext         *context,
+                                                          GimpToolInfo        *tool_info,
+                                                          GimpToolButton      *tool_button);
+
+static void         gimp_tool_button_active_tool_changed (GimpToolGroup       *tool_group,
+                                                          GimpToolButton      *tool_button);
+
+static void         gimp_tool_button_tool_add            (GimpContainer       *container,
+                                                          GimpToolInfo        *tool_info,
+                                                          GimpToolButton      *tool_button);
+static void         gimp_tool_button_tool_remove         (GimpContainer       *container,
+                                                          GimpToolInfo        *tool_info,
+                                                          GimpToolButton      *tool_button);
+static void         gimp_tool_button_tool_reorder        (GimpContainer       *container,
+                                                          GimpToolInfo        *tool_info,
+                                                          gint                 new_index,
+                                                          GimpToolButton      *tool_button);
+
+static void         gimp_tool_button_icon_size_notify    (GtkToolPalette      *palette,
+                                                          const GParamSpec    *pspec,
+                                                          GimpToolButton      *tool_button);
+
+static gboolean     gimp_tool_button_menu_enter_notify   (GtkMenu             *menu,
+                                                          GdkEventCrossing    *event,
+                                                          GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_menu_leave_notify   (GtkMenu             *menu,
+                                                          GdkEventCrossing    *event,
+                                                          GimpToolButton      *tool_button);
+static void         gimp_tool_button_menu_deactivate     (GtkMenu             *menu,
+                                                          GimpToolButton      *tool_button);
+
+static gboolean     gimp_tool_button_menu_idle           (GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_menu_timeout        (GimpToolButton      *tool_button);
+
+static void         gimp_tool_button_update              (GimpToolButton      *tool_button);
+static void         gimp_tool_button_update_toggled      (GimpToolButton      *tool_button);
+static void         gimp_tool_button_update_menu         (GimpToolButton      *tool_button);
+
+static void         gimp_tool_button_add_menu_item       (GimpToolButton      *tool_button,
+                                                          GimpToolInfo        *tool_info,
+                                                          gint                 index);
+static void         gimp_tool_button_remove_menu_item    (GimpToolButton      *tool_button,
+                                                          GimpToolInfo        *tool_info);
+
+static void         gimp_tool_button_reconstruct_menu    (GimpToolButton      *tool_button);
+static void         gimp_tool_button_destroy_menu        (GimpToolButton      *tool_button);
+static gboolean     gimp_tool_button_show_menu           (GimpToolButton      *tool_button,
+                                                          gint                 button,
+                                                          guint32              activate_time);
+
+static GimpAction * gimp_tool_button_get_action          (GimpToolButton      *tool_button,
+                                                          GimpToolInfo        *tool_info);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolButton, gimp_tool_button,
+                            GTK_TYPE_TOGGLE_TOOL_BUTTON)
+
+#define parent_class gimp_tool_button_parent_class
+
+
+/*  private functions  */
+
+static void
+gimp_tool_button_class_init (GimpToolButtonClass *klass)
+{
+  GObjectClass             *object_class             = G_OBJECT_CLASS (klass);
+  GtkWidgetClass           *widget_class             = GTK_WIDGET_CLASS (klass);
+  GtkToggleToolButtonClass *toggle_tool_button_class = GTK_TOGGLE_TOOL_BUTTON_CLASS (klass);
+
+  object_class->constructed         = gimp_tool_button_constructed;
+  object_class->dispose             = gimp_tool_button_dispose;
+  object_class->get_property        = gimp_tool_button_get_property;
+  object_class->set_property        = gimp_tool_button_set_property;
+
+  widget_class->hierarchy_changed   = gimp_tool_button_hierarchy_changed;
+  widget_class->expose_event        = gimp_tool_button_expose;
+  widget_class->query_tooltip       = gimp_tool_button_query_tooltip;
+
+  toggle_tool_button_class->toggled = gimp_tool_button_toggled;
+
+  g_object_class_install_property (object_class, PROP_TOOLBOX,
+                                   g_param_spec_object ("toolbox",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TOOLBOX,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_TOOL_ITEM,
+                                   g_param_spec_object ("tool-item",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_TOOL_ITEM,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_SHOW_MENU_ON_HOVER,
+                                   g_param_spec_boolean ("show-menu-on-hover",
+                                                         NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_tool_button_init (GimpToolButton *tool_button)
+{
+  tool_button->priv = gimp_tool_button_get_instance_private (tool_button);
+}
+
+static void
+gimp_tool_button_constructed (GObject *object)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (object);
+  GimpContext    *context;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  context = gimp_toolbox_get_context (tool_button->priv->toolbox);
+
+  /* Make sure the toolbox buttons won't grab focus, which has
+   * nearly no practical use, and prevents various actions until
+   * you click back in canvas.
+   */
+  gtk_widget_set_can_focus (gtk_bin_get_child (GTK_BIN (tool_button)), FALSE);
+
+  gtk_widget_add_events (gtk_bin_get_child (GTK_BIN (tool_button)),
+                         GDK_SCROLL_MASK);
+
+  g_signal_connect (gtk_bin_get_child (GTK_BIN (tool_button)),
+                    "enter-notify-event",
+                    G_CALLBACK (gimp_tool_button_enter_notify),
+                    tool_button);
+  g_signal_connect (gtk_bin_get_child (GTK_BIN (tool_button)),
+                    "leave-notify-event",
+                    G_CALLBACK (gimp_tool_button_leave_notify),
+                    tool_button);
+  g_signal_connect (gtk_bin_get_child (GTK_BIN (tool_button)),
+                    "button-press-event",
+                    G_CALLBACK (gimp_tool_button_button_press),
+                    tool_button);
+  g_signal_connect (gtk_bin_get_child (GTK_BIN (tool_button)),
+                    "button-release-event",
+                    G_CALLBACK (gimp_tool_button_button_release),
+                    tool_button);
+  g_signal_connect (gtk_bin_get_child (GTK_BIN (tool_button)),
+                    "scroll-event",
+                    G_CALLBACK (gimp_tool_button_scroll),
+                    tool_button);
+
+  g_signal_connect_object (context, "tool-changed",
+                           G_CALLBACK (gimp_tool_button_tool_changed),
+                           tool_button,
+                           0);
+
+  gimp_tool_button_update (tool_button);
+}
+
+static void
+gimp_tool_button_dispose (GObject *object)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (object);
+
+  gimp_tool_button_set_tool_item (tool_button, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tool_button_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_TOOLBOX:
+      tool_button->priv->toolbox = g_value_get_object (value);
+      break;
+
+    case PROP_TOOL_ITEM:
+      gimp_tool_button_set_tool_item (tool_button, g_value_get_object (value));
+      break;
+
+    case PROP_SHOW_MENU_ON_HOVER:
+      gimp_tool_button_set_show_menu_on_hover (tool_button,
+                                               g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_button_get_property (GObject    *object,
+                               guint       property_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_TOOLBOX:
+      g_value_set_object (value, tool_button->priv->toolbox);
+      break;
+
+    case PROP_TOOL_ITEM:
+      g_value_set_object (value, tool_button->priv->tool_item);
+      break;
+
+    case PROP_SHOW_MENU_ON_HOVER:
+      g_value_set_boolean (value, tool_button->priv->show_menu_on_hover);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_button_hierarchy_changed (GtkWidget *widget,
+                                    GtkWidget *previous_toplevel)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (widget);
+  GtkWidget      *palette;
+
+  if (GTK_WIDGET_CLASS (parent_class)->hierarchy_changed)
+    {
+      GTK_WIDGET_CLASS (parent_class)->hierarchy_changed (widget,
+                                                          previous_toplevel);
+    }
+
+  palette = gtk_widget_get_ancestor (GTK_WIDGET (tool_button),
+                                     GTK_TYPE_TOOL_PALETTE);
+
+  if (palette != tool_button->priv->palette)
+    {
+      if (tool_button->priv->palette)
+        {
+          g_signal_handlers_disconnect_by_func (
+            tool_button->priv->palette,
+            gimp_tool_button_icon_size_notify,
+            tool_button);
+        }
+
+      tool_button->priv->palette = palette;
+
+      if (tool_button->priv->palette)
+        {
+          g_signal_connect (
+            tool_button->priv->palette, "notify::icon-size",
+            G_CALLBACK (gimp_tool_button_icon_size_notify),
+            tool_button);
+        }
+    }
+
+  gimp_tool_button_update (tool_button);
+
+  gimp_tool_button_reconstruct_menu (tool_button);
+}
+
+static gboolean
+gimp_tool_button_expose (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (widget);
+
+  if (GTK_WIDGET_CLASS (parent_class)->expose_event)
+    GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+  if (! gtk_widget_is_drawable (widget))
+    return FALSE;
+
+  if (GIMP_IS_TOOL_GROUP (tool_button->priv->tool_item))
+    {
+      cairo_t       *cr;
+      GtkStyle      *style = gtk_widget_get_style (widget);
+      GtkStateType   state = gtk_widget_get_state (widget);
+      GtkAllocation  allocation;
+      gint           size;
+      gint           x1, y1;
+      gint           x2, y2;
+
+      cr = gdk_cairo_create (event->window);
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      size = MIN (allocation.width, allocation.height);
+
+      x1 = SIGNED_ROUND (allocation.x + allocation.width -
+                         (ARROW_BORDER + size * ARROW_SIZE));
+      y1 = SIGNED_ROUND (allocation.y + allocation.height -
+                         (ARROW_BORDER + size * ARROW_SIZE));
+
+      x2 = SIGNED_ROUND (allocation.x + allocation.width -
+                         ARROW_BORDER);
+      y2 = SIGNED_ROUND (allocation.y + allocation.height -
+                         ARROW_BORDER);
+
+      cairo_move_to (cr, x2, y1);
+      cairo_line_to (cr, x2, y2);
+      cairo_line_to (cr, x1, y2);
+      cairo_close_path (cr);
+
+      gdk_cairo_set_source_color (cr, &style->fg[state]);
+      cairo_fill (cr);
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+static GtkWidget *
+gimp_tool_button_query_tooltip_add_tool (GimpToolButton *tool_button,
+                                         GtkTable       *table,
+                                         gint            row,
+                                         GimpToolInfo   *tool_info,
+                                         const gchar    *label_str,
+                                         GtkIconSize     icon_size)
+{
+  GimpUIManager *ui_manager;
+  GimpAction    *action = NULL;
+  GtkWidget     *label;
+  GtkWidget     *image;
+
+  ui_manager = gimp_dock_get_ui_manager (
+    GIMP_DOCK (tool_button->priv->toolbox));
+
+  if (ui_manager)
+    {
+      gchar *name;
+
+      name = gimp_tool_info_get_action_name (tool_info);
+
+      action = gimp_ui_manager_find_action (ui_manager, "tools", name);
+
+      g_free (name);
+    }
+
+  image = gtk_image_new_from_icon_name (
+    gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info)),
+    icon_size);
+  gtk_table_attach (table,
+                    image,
+                    0, 1,
+                    row, row + 1,
+                    GTK_FILL, 0,
+                    0, 0);
+  gtk_widget_show (image);
+
+  label = gtk_label_new (label_str);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_table_attach (table,
+                    label,
+                    1, 2,
+                    row, row + 1,
+                    GTK_EXPAND | GTK_FILL, 0,
+                    0, 0);
+  gtk_widget_show (label);
+
+  if (action)
+    {
+      GtkWidget *accel_label;
+
+      accel_label = gimp_accel_label_new (action);
+      gtk_label_set_xalign (GTK_LABEL (accel_label), 1.0);
+      gtk_table_attach (table,
+                        accel_label,
+                        2, 3,
+                        row, row + 1,
+                        GTK_FILL, 0,
+                        0, 0);
+      gtk_widget_show (accel_label);
+    }
+
+  return label;
+}
+
+static gboolean
+gimp_tool_button_query_tooltip (GtkWidget  *widget,
+                                gint        x,
+                                gint        y,
+                                gboolean    keyboard_mode,
+                                GtkTooltip *tooltip)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (widget);
+
+  if (! tool_button->priv->tooltip_widget)
+    {
+      GimpToolInfo  *tool_info;
+      GtkWidget     *table;
+      GtkWidget     *label;
+      gchar        **tooltip_labels;
+      GtkIconSize    icon_size = GTK_ICON_SIZE_MENU;
+      gint           row       = 0;
+
+      tool_info = gimp_tool_button_get_tool_info (tool_button);
+
+      if (! tool_info)
+        return FALSE;
+
+      if (tool_button->priv->palette)
+        {
+          icon_size = gtk_tool_palette_get_icon_size (
+            GTK_TOOL_PALETTE (tool_button->priv->palette));
+        }
+
+      table = gtk_table_new (2, 3, FALSE);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+      gtk_table_set_col_spacing  (GTK_TABLE (table), 1, 32);
+      gtk_widget_show (table);
+
+      tool_button->priv->tooltip_widget = g_object_ref_sink (table);
+
+      tooltip_labels = g_strsplit (tool_info->tooltip, ": ", 2);
+
+      label = gimp_tool_button_query_tooltip_add_tool (tool_button,
+                                                       GTK_TABLE (table),
+                                                       row++,
+                                                       tool_info,
+                                                       tooltip_labels[0],
+                                                       icon_size);
+      gimp_label_set_attributes (GTK_LABEL (label),
+                                 PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                                 -1);
+
+      if (tooltip_labels[0])
+        {
+          gtk_table_set_row_spacing (GTK_TABLE (table), 0, 0);
+
+          label = gtk_label_new (tooltip_labels[1]);
+          gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+          gtk_table_attach (GTK_TABLE (table),
+                            label,
+                            1, 2,
+                            row, row + 1,
+                            GTK_FILL | GTK_EXPAND, 0,
+                            0, 0);
+          gtk_widget_show (label);
+
+          row++;
+        }
+
+      g_strfreev (tooltip_labels);
+
+      if (GIMP_IS_TOOL_GROUP (tool_button->priv->tool_item))
+        {
+          GimpContainer *children;
+          gint           n_children;
+
+          children = gimp_viewable_get_children (
+            GIMP_VIEWABLE (tool_button->priv->tool_item));
+
+          n_children = gimp_container_get_n_children (children);
+
+          if (n_children > 1)
+            {
+              GtkWidget *label;
+              gint       i;
+
+              gtk_table_resize (GTK_TABLE (table), row + n_children, 3);
+
+              gtk_table_set_row_spacing (GTK_TABLE (table), 1, 12);
+
+              label = gtk_label_new (_("Also in group:"));
+              gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+              gimp_label_set_attributes (GTK_LABEL (label),
+                                         PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                                         -1);
+              gtk_table_attach (GTK_TABLE (table),
+                                label,
+                                0, 3,
+                                row, row + 1,
+                                GTK_FILL | GTK_EXPAND, 0,
+                                0, 0);
+              gtk_widget_show (label);
+
+              row++;
+
+              for (i = 0; i < n_children; i++)
+                {
+                  GimpToolInfo *other_tool_info;
+
+                  other_tool_info = GIMP_TOOL_INFO (
+                    gimp_container_get_child_by_index (children, i));
+
+                  if (other_tool_info != tool_info)
+                    {
+                      gimp_tool_button_query_tooltip_add_tool (
+                        tool_button,
+                        GTK_TABLE (table),
+                        row++,
+                        other_tool_info,
+                        other_tool_info->label,
+                        icon_size);
+                    }
+                }
+            }
+        }
+    }
+
+  gtk_tooltip_set_custom (tooltip, tool_button->priv->tooltip_widget);
+
+  return TRUE;
+}
+
+static void
+gimp_tool_button_toggled (GtkToggleToolButton *toggle_tool_button)
+{
+  GimpToolButton *tool_button = GIMP_TOOL_BUTTON (toggle_tool_button);
+  GimpContext    *context;
+  GimpToolInfo   *tool_info;
+
+  if (GTK_TOGGLE_TOOL_BUTTON_CLASS (parent_class)->toggled)
+    GTK_TOGGLE_TOOL_BUTTON_CLASS (parent_class)->toggled (toggle_tool_button);
+
+  context   = gimp_toolbox_get_context (tool_button->priv->toolbox);
+  tool_info = gimp_tool_button_get_tool_info (tool_button);
+
+  if (tool_info)
+    {
+      if (gtk_toggle_tool_button_get_active (toggle_tool_button))
+        gimp_context_set_tool (context, tool_info);
+      else if (tool_info == gimp_context_get_tool (context))
+        gtk_toggle_tool_button_set_active (toggle_tool_button, TRUE);
+    }
+  else
+    {
+      gtk_toggle_tool_button_set_active (toggle_tool_button, FALSE);
+    }
+}
+
+static gboolean
+gimp_tool_button_enter_notify (GtkWidget        *widget,
+                               GdkEventCrossing *event,
+                               GimpToolButton   *tool_button)
+{
+  guint button_state;
+
+  button_state = event->state & (GDK_BUTTON1_MASK |
+                                 GDK_BUTTON2_MASK |
+                                 GDK_BUTTON3_MASK |
+                                 GDK_BUTTON4_MASK |
+                                 GDK_BUTTON5_MASK);
+
+  if (tool_button->priv->menu                            &&
+      tool_button->priv->show_menu_on_hover              &&
+      ! gtk_widget_get_visible (tool_button->priv->menu) &&
+      event->mode == GDK_CROSSING_NORMAL                 &&
+      button_state == 0)
+    {
+      if (tool_button->priv->menu_idle_id)
+        {
+          g_source_remove (tool_button->priv->menu_idle_id);
+
+          tool_button->priv->menu_idle_id = 0;
+        }
+
+      gimp_tool_button_show_menu (tool_button, 0, event->time);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_button_leave_notify (GtkWidget        *widget,
+                               GdkEventCrossing *event,
+                               GimpToolButton   *tool_button)
+{
+  if (tool_button->priv->menu               &&
+      tool_button->priv->show_menu_on_hover &&
+      gtk_widget_get_visible (tool_button->priv->menu))
+    {
+      if (event->mode == GDK_CROSSING_NORMAL)
+        {
+          if (! tool_button->priv->menu_idle_id)
+            {
+              tool_button->priv->menu_idle_id = g_idle_add_full (
+                G_PRIORITY_DEFAULT + 1,
+                (GSourceFunc) gimp_tool_button_menu_idle,
+                tool_button, NULL);
+            }
+        }
+      else
+        {
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_button_button_press (GtkWidget      *widget,
+                               GdkEventButton *event,
+                               GimpToolButton *tool_button)
+{
+  if (tool_button->priv->menu)
+    {
+      if (gtk_widget_get_visible (tool_button->priv->menu))
+        {
+          gtk_menu_shell_deactivate (GTK_MENU_SHELL (tool_button->priv->menu));
+        }
+      else if (gdk_event_triggers_context_menu ((GdkEvent *) event) ||
+               tool_button->priv->show_menu_on_hover)
+        {
+          return gimp_tool_button_show_menu (tool_button,
+                                             event->button, event->time);
+        }
+      else if (event->type == GDK_BUTTON_PRESS && event->button == 1 &&
+               ! tool_button->priv->menu_timeout_id)
+        {
+          tool_button->priv->menu_timeout_button = event->button;
+          tool_button->priv->menu_timeout_time   = event->time + MENU_TIMEOUT;
+
+          tool_button->priv->menu_timeout_id = g_timeout_add (
+            MENU_TIMEOUT,
+            (GSourceFunc) gimp_tool_button_menu_timeout,
+            tool_button);
+        }
+    }
+
+  if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
+    {
+      GimpContext *context;
+      GimpDock    *dock;
+
+      context = gimp_toolbox_get_context (tool_button->priv->toolbox);
+      dock    = GIMP_DOCK (tool_button->priv->toolbox);
+
+      gimp_window_strategy_show_dockable_dialog (
+        GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
+        context->gimp,
+        gimp_dock_get_dialog_factory (dock),
+        gtk_widget_get_screen (widget),
+        gimp_widget_get_monitor (widget),
+        "gimp-tool-options");
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_button_button_release (GtkWidget      *widget,
+                                 GdkEventButton *event,
+                                 GimpToolButton *tool_button)
+{
+  if (event->button == 1 && tool_button->priv->menu_timeout_id)
+    {
+      g_source_remove (tool_button->priv->menu_timeout_id);
+
+      tool_button->priv->menu_timeout_id = 0;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_button_scroll (GtkWidget      *widget,
+                         GdkEventScroll *event,
+                         GimpToolButton *tool_button)
+{
+  GimpToolInfo *tool_info;
+  gint          delta;
+
+  tool_info = gimp_tool_button_get_tool_info (tool_button);
+
+  switch (event->direction)
+    {
+    case GDK_SCROLL_UP:
+      delta = -1;
+      break;
+
+    case GDK_SCROLL_DOWN:
+      delta = +1;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  if (tool_info && GIMP_IS_TOOL_GROUP (tool_button->priv->tool_item))
+    {
+      GimpContainer *children;
+      gint           n_children;
+      gint           index;
+      gint           i;
+
+      children = gimp_viewable_get_children (
+        GIMP_VIEWABLE (tool_button->priv->tool_item));
+
+      n_children = gimp_container_get_n_children (children);
+
+      index = gimp_container_get_child_index (children,
+                                              GIMP_OBJECT (tool_info));
+
+      for (i = 1; i < n_children; i++)
+        {
+          GimpToolInfo *new_tool_info;
+          gint          new_index;
+
+          new_index = (index + i * delta) % n_children;
+          if (new_index < 0) new_index += n_children;
+
+          new_tool_info = GIMP_TOOL_INFO (
+            gimp_container_get_child_by_index (children, new_index));
+
+          if (gimp_tool_item_get_visible (GIMP_TOOL_ITEM (new_tool_info)))
+            {
+              gimp_tool_group_set_active_tool_info (
+                GIMP_TOOL_GROUP (tool_button->priv->tool_item), new_tool_info);
+
+              break;
+            }
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_button_tool_changed (GimpContext    *context,
+                               GimpToolInfo   *tool_info,
+                               GimpToolButton *tool_button)
+{
+  gimp_tool_button_update_toggled (tool_button);
+}
+
+static void
+gimp_tool_button_active_tool_changed (GimpToolGroup  *tool_group,
+                                      GimpToolButton *tool_button)
+{
+  gimp_tool_button_update (tool_button);
+}
+
+static void
+gimp_tool_button_tool_add (GimpContainer  *container,
+                           GimpToolInfo   *tool_info,
+                           GimpToolButton *tool_button)
+{
+  gint index;
+
+  index = gimp_container_get_child_index (container, GIMP_OBJECT (tool_info));
+
+  gimp_tool_button_add_menu_item (tool_button, tool_info, index);
+
+  gimp_tool_button_update (tool_button);
+}
+
+static void
+gimp_tool_button_tool_remove (GimpContainer  *container,
+                              GimpToolInfo   *tool_info,
+                              GimpToolButton *tool_button)
+{
+  gimp_tool_button_remove_menu_item (tool_button, tool_info);
+
+  gimp_tool_button_update (tool_button);
+}
+
+static void
+gimp_tool_button_tool_reorder (GimpContainer  *container,
+                               GimpToolInfo   *tool_info,
+                               gint            new_index,
+                               GimpToolButton *tool_button)
+{
+  gimp_tool_button_remove_menu_item (tool_button, tool_info);
+  gimp_tool_button_add_menu_item    (tool_button, tool_info, new_index);
+
+  gimp_tool_button_update (tool_button);
+}
+
+static void
+gimp_tool_button_icon_size_notify (GtkToolPalette   *palette,
+                                   const GParamSpec *pspec,
+                                   GimpToolButton   *tool_button)
+{
+  gimp_tool_button_reconstruct_menu (tool_button);
+
+  gimp_tool_button_update (tool_button);
+}
+
+static gboolean
+gimp_tool_button_menu_enter_notify (GtkMenu          *menu,
+                                    GdkEventCrossing *event,
+                                    GimpToolButton   *tool_button)
+{
+  if (tool_button->priv->show_menu_on_hover &&
+      event->mode == GDK_CROSSING_NORMAL)
+    {
+      if (tool_button->priv->menu_idle_id)
+        {
+          g_source_remove (tool_button->priv->menu_idle_id);
+
+          tool_button->priv->menu_idle_id = 0;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_button_menu_leave_notify (GtkMenu          *menu,
+                                    GdkEventCrossing *event,
+                                    GimpToolButton   *tool_button)
+{
+  if (event->mode == GDK_CROSSING_NORMAL &&
+      gtk_widget_get_visible (tool_button->priv->menu))
+    {
+      gimp_tool_button_update_menu (tool_button);
+
+      if (tool_button->priv->show_menu_on_hover &&
+          ! tool_button->priv->menu_idle_id)
+        {
+          tool_button->priv->menu_idle_id = g_idle_add_full (
+            G_PRIORITY_DEFAULT + 1,
+            (GSourceFunc) gimp_tool_button_menu_idle,
+            tool_button, NULL);
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_tool_button_menu_deactivate_idle (gpointer data)
+{
+  tools_select_cmd_unblock_initialize ();
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_tool_button_menu_deactivate (GtkMenu        *menu,
+                                  GimpToolButton *tool_button)
+{
+  if (tool_button->priv->menu_select_idle_id)
+    {
+      g_source_remove (tool_button->priv->menu_select_idle_id);
+
+      tool_button->priv->menu_select_idle_id = 0;
+    }
+
+  g_idle_add (gimp_tool_button_menu_deactivate_idle, NULL);
+}
+
+static gboolean
+gimp_tool_button_menu_idle (GimpToolButton *tool_button)
+{
+  tool_button->priv->menu_idle_id = 0;
+
+  gtk_menu_shell_deactivate (GTK_MENU_SHELL (tool_button->priv->menu));
+
+  return G_SOURCE_REMOVE;
+}
+
+static gboolean
+gimp_tool_button_menu_timeout (GimpToolButton *tool_button)
+{
+  tool_button->priv->menu_timeout_id = 0;
+
+  gimp_tool_button_show_menu (tool_button,
+                              tool_button->priv->menu_timeout_button,
+                              tool_button->priv->menu_timeout_time);
+
+  /* work around gtk not properly redrawing the button in the toggled state */
+  if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (tool_button)))
+    {
+      gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tool_button),
+                                         FALSE);
+    }
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gimp_tool_button_update (GimpToolButton *tool_button)
+{
+  GimpToolInfo *tool_info;
+
+  tool_info = gimp_tool_button_get_tool_info (tool_button);
+
+  gtk_tool_button_set_icon_name (
+    GTK_TOOL_BUTTON (tool_button),
+    tool_info ? gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info)) :
+                NULL);
+
+  g_clear_object (&tool_button->priv->tooltip_widget);
+
+  if (! tool_button->priv->menu || ! tool_button->priv->show_menu_on_hover)
+    {
+      if (tool_info)
+        {
+          gimp_help_set_help_data (GTK_WIDGET (tool_button),
+                                   tool_info->tooltip, tool_info->help_id);
+        }
+      else
+        {
+          gimp_help_set_help_data (GTK_WIDGET (tool_button), NULL, NULL);
+        }
+    }
+  else
+    {
+      gimp_help_set_help_data (GTK_WIDGET (tool_button), NULL, NULL);
+    }
+
+  gimp_tool_button_update_toggled (tool_button);
+  gimp_tool_button_update_menu    (tool_button);
+}
+
+static void
+gimp_tool_button_update_toggled (GimpToolButton *tool_button)
+{
+  GimpContext  *context;
+  GimpToolInfo *tool_info;
+
+  context = gimp_toolbox_get_context (tool_button->priv->toolbox);
+
+  tool_info = gimp_tool_button_get_tool_info (tool_button);
+
+  gtk_toggle_tool_button_set_active (
+    GTK_TOGGLE_TOOL_BUTTON (tool_button),
+    tool_info && tool_info == gimp_context_get_tool (context));
+}
+
+static void
+gimp_tool_button_update_menu (GimpToolButton *tool_button)
+{
+  if (tool_button->priv->menu &&
+      gtk_widget_get_visible (tool_button->priv->menu))
+    {
+      GimpToolInfo *tool_info = gimp_tool_button_get_tool_info (tool_button);
+
+      if (tool_info)
+        {
+          gtk_menu_shell_select_item (
+            GTK_MENU_SHELL (tool_button->priv->menu),
+            g_hash_table_lookup (tool_button->priv->menu_items, tool_info));
+        }
+    }
+}
+
+static void
+gimp_tool_button_add_menu_item (GimpToolButton *tool_button,
+                                GimpToolInfo   *tool_info,
+                                gint            index)
+{
+  GimpUIManager *ui_manager;
+  GimpAction    *action;
+  GtkWidget     *item;
+  GtkWidget     *hbox;
+  GtkWidget     *image;
+  GtkWidget     *label;
+  GtkIconSize    icon_size = GTK_ICON_SIZE_MENU;
+
+  ui_manager = gimp_dock_get_ui_manager (
+    GIMP_DOCK (tool_button->priv->toolbox));
+
+  action = gimp_tool_button_get_action (tool_button, tool_info);
+
+  if (tool_button->priv->palette)
+    {
+      icon_size = gtk_tool_palette_get_icon_size (
+        GTK_TOOL_PALETTE (tool_button->priv->palette));
+    }
+
+  item = gtk_menu_item_new ();
+  gtk_menu_shell_insert (GTK_MENU_SHELL (tool_button->priv->menu), item, index);
+  gtk_activatable_set_related_action (GTK_ACTIVATABLE (item),
+                                      GTK_ACTION (action));
+  gimp_help_set_help_data (item, tool_info->tooltip, tool_info->help_id);
+
+  g_object_bind_property (tool_info, "visible",
+                          item,      "visible",
+                          G_BINDING_SYNC_CREATE);
+
+  g_object_set_data (G_OBJECT (item), "gimp-tool-info", tool_info);
+
+  gimp_gtk_container_clear (GTK_CONTAINER (item));
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_container_add (GTK_CONTAINER (item), hbox);
+  gtk_widget_show (hbox);
+
+  image = gtk_image_new_from_icon_name (
+    gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info)),
+    icon_size);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+  gtk_widget_show (image);
+
+  label = gtk_accel_label_new (tool_info->label);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+  gtk_widget_show (label);
+
+  if (action)
+    {
+      gtk_accel_label_set_accel_closure (GTK_ACCEL_LABEL (label),
+                                         gimp_action_get_accel_closure (
+                                           action));
+
+      if (ui_manager)
+        {
+          g_signal_emit_by_name (ui_manager, "connect-proxy",
+                                 action, item);
+        }
+    }
+
+  g_hash_table_insert (tool_button->priv->menu_items, tool_info, item);
+}
+
+static void
+gimp_tool_button_remove_menu_item (GimpToolButton *tool_button,
+                                   GimpToolInfo   *tool_info)
+{
+  GtkWidget *item;
+
+  item = g_hash_table_lookup (tool_button->priv->menu_items, tool_info);
+
+  gtk_container_remove (GTK_CONTAINER (tool_button->priv->menu), item);
+
+  g_hash_table_remove (tool_button->priv->menu_items, tool_info);
+}
+
+static void
+gimp_tool_button_reconstruct_menu_add_menu_item (GimpToolInfo   *tool_info,
+                                                 GimpToolButton *tool_button)
+{
+  gimp_tool_button_add_menu_item (tool_button, tool_info, -1);
+}
+
+static void
+gimp_tool_button_reconstruct_menu (GimpToolButton *tool_button)
+{
+  gimp_tool_button_destroy_menu (tool_button);
+
+  if (GIMP_IS_TOOL_GROUP (tool_button->priv->tool_item))
+    {
+      GimpUIManager *ui_manager;
+      GimpContainer *children;
+
+      ui_manager = gimp_dock_get_ui_manager (
+        GIMP_DOCK (tool_button->priv->toolbox));
+
+      children = gimp_viewable_get_children (
+        GIMP_VIEWABLE (tool_button->priv->tool_item));
+
+      tool_button->priv->menu = gtk_menu_new ();
+      gtk_menu_attach_to_widget (GTK_MENU (tool_button->priv->menu),
+                                 GTK_WIDGET (tool_button), NULL);
+
+      g_signal_connect (tool_button->priv->menu, "enter-notify-event",
+                        G_CALLBACK (gimp_tool_button_menu_enter_notify),
+                        tool_button);
+      g_signal_connect (tool_button->priv->menu, "leave-notify-event",
+                        G_CALLBACK (gimp_tool_button_menu_leave_notify),
+                        tool_button);
+      g_signal_connect (tool_button->priv->menu, "deactivate",
+                        G_CALLBACK (gimp_tool_button_menu_deactivate),
+                        tool_button);
+
+      if (ui_manager)
+        {
+          gtk_menu_set_accel_group (
+            GTK_MENU (tool_button->priv->menu),
+            gimp_ui_manager_get_accel_group (ui_manager));
+        }
+
+      tool_button->priv->menu_items = g_hash_table_new (g_direct_hash,
+                                                        g_direct_equal);
+
+      gimp_container_foreach (
+        children,
+        (GFunc) gimp_tool_button_reconstruct_menu_add_menu_item,
+        tool_button);
+    }
+}
+
+static void
+gimp_tool_button_destroy_menu (GimpToolButton *tool_button)
+{
+  if (tool_button->priv->menu)
+    {
+      gtk_menu_detach (GTK_MENU (tool_button->priv->menu));
+      tool_button->priv->menu = NULL;
+
+      g_clear_pointer (&tool_button->priv->menu_items, g_hash_table_unref);
+
+      if (tool_button->priv->menu_idle_id)
+        {
+          g_source_remove (tool_button->priv->menu_idle_id);
+
+          tool_button->priv->menu_idle_id = 0;
+        }
+
+      if (tool_button->priv->menu_timeout_id)
+        {
+          g_source_remove (tool_button->priv->menu_timeout_id);
+
+          tool_button->priv->menu_timeout_id = 0;
+        }
+
+      if (tool_button->priv->menu_select_idle_id)
+        {
+          g_source_remove (tool_button->priv->menu_select_idle_id);
+
+          tool_button->priv->menu_select_idle_id = 0;
+        }
+    }
+}
+
+static void
+gimp_tool_button_show_menu_position_func (GtkMenu        *menu,
+                                          gint           *x,
+                                          gint           *y,
+                                          gboolean       *push_in,
+                                          GimpToolButton *tool_button)
+{
+  gimp_button_menu_position (GTK_WIDGET (tool_button),
+                             menu, GTK_POS_RIGHT, x, y);
+}
+
+static gboolean
+gimp_tool_button_show_menu_select_idle (GimpToolButton *tool_button)
+{
+  tool_button->priv->menu_select_idle_id = 0;
+
+  gimp_tool_button_update_menu (tool_button);
+
+  return G_SOURCE_REMOVE;
+}
+
+static gboolean
+gimp_tool_button_show_menu (GimpToolButton *tool_button,
+                            gint            button,
+                            guint32         activate_time)
+{
+  if (! tool_button->priv->menu)
+    return FALSE;
+
+  /* avoid initializing the selected tool */
+  tools_select_cmd_block_initialize ();
+
+  gtk_menu_shell_set_take_focus (GTK_MENU_SHELL (tool_button->priv->menu),
+                                 ! tool_button->priv->show_menu_on_hover);
+
+  gtk_menu_popup (
+    GTK_MENU (tool_button->priv->menu),
+    NULL, NULL,
+    (GtkMenuPositionFunc) gimp_tool_button_show_menu_position_func,
+    tool_button,
+    button, activate_time);
+
+  if (tool_button->priv->show_menu_on_hover)
+    gtk_grab_remove (tool_button->priv->menu);
+
+  if (! tool_button->priv->menu_select_idle_id)
+    {
+      tool_button->priv->menu_select_idle_id = g_idle_add (
+        (GSourceFunc) gimp_tool_button_show_menu_select_idle,
+        tool_button);
+    }
+
+  return TRUE;
+}
+
+static GimpAction *
+gimp_tool_button_get_action (GimpToolButton *tool_button,
+                             GimpToolInfo   *tool_info)
+{
+  GimpUIManager *ui_manager;
+  GimpAction    *action = NULL;
+
+  ui_manager = gimp_dock_get_ui_manager (
+    GIMP_DOCK (tool_button->priv->toolbox));
+
+  if (ui_manager && tool_info)
+    {
+      gchar *name;
+
+      name = gimp_tool_info_get_action_name (tool_info);
+
+      action = gimp_ui_manager_find_action (ui_manager, "tools", name);
+
+      g_free (name);
+    }
+
+  return action;
+}
+
+
+/*  public functions  */
+
+GtkToolItem *
+gimp_tool_button_new (GimpToolbox  *toolbox,
+                      GimpToolItem *tool_item)
+{
+  g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
+  g_return_val_if_fail (tool_item == NULL ||
+                        GIMP_IS_TOOL_ITEM (tool_item), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_BUTTON,
+                       "toolbox",   toolbox,
+                       "tool-item", tool_item,
+                       NULL);
+}
+
+GimpToolbox *
+gimp_tool_button_get_toolbox (GimpToolButton *tool_button)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_BUTTON (tool_button), NULL);
+
+  return tool_button->priv->toolbox;
+}
+
+void
+gimp_tool_button_set_tool_item (GimpToolButton *tool_button,
+                                GimpToolItem   *tool_item)
+{
+  g_return_if_fail (GIMP_IS_TOOL_BUTTON (tool_button));
+  g_return_if_fail (tool_item == NULL || GIMP_IS_TOOL_ITEM (tool_item));
+
+  if (tool_item != tool_button->priv->tool_item)
+    {
+      if (GIMP_IS_TOOL_GROUP (tool_button->priv->tool_item))
+        {
+          GimpContainer *children;
+
+          children = gimp_viewable_get_children (
+            GIMP_VIEWABLE (tool_button->priv->tool_item));
+
+          g_signal_handlers_disconnect_by_func (
+            tool_button->priv->tool_item,
+            gimp_tool_button_active_tool_changed,
+            tool_button);
+
+          g_signal_handlers_disconnect_by_func (
+            children,
+            gimp_tool_button_tool_add,
+            tool_button);
+          g_signal_handlers_disconnect_by_func (
+            children,
+            gimp_tool_button_tool_remove,
+            tool_button);
+          g_signal_handlers_disconnect_by_func (
+            children,
+            gimp_tool_button_tool_reorder,
+            tool_button);
+
+          gimp_tool_button_destroy_menu (tool_button);
+        }
+
+      g_set_object (&tool_button->priv->tool_item, tool_item);
+
+      if (GIMP_IS_TOOL_GROUP (tool_button->priv->tool_item))
+        {
+          GimpContainer *children;
+
+          children = gimp_viewable_get_children (
+            GIMP_VIEWABLE (tool_button->priv->tool_item));
+
+          g_signal_connect (
+            tool_button->priv->tool_item, "active-tool-changed",
+            G_CALLBACK (gimp_tool_button_active_tool_changed),
+            tool_button);
+
+          g_signal_connect (
+            children, "add",
+            G_CALLBACK (gimp_tool_button_tool_add),
+            tool_button);
+          g_signal_connect (
+            children, "remove",
+            G_CALLBACK (gimp_tool_button_tool_remove),
+            tool_button);
+          g_signal_connect (
+            children, "reorder",
+            G_CALLBACK (gimp_tool_button_tool_reorder),
+            tool_button);
+
+          gimp_tool_button_reconstruct_menu (tool_button);
+        }
+
+      gimp_tool_button_update (tool_button);
+
+      g_object_notify (G_OBJECT (tool_button), "tool-item");
+    }
+}
+
+GimpToolItem *
+gimp_tool_button_get_tool_item (GimpToolButton *tool_button)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_BUTTON (tool_button), NULL);
+
+  return tool_button->priv->tool_item;
+}
+
+GimpToolInfo *
+gimp_tool_button_get_tool_info (GimpToolButton *tool_button)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_BUTTON (tool_button), NULL);
+
+  if (tool_button->priv->tool_item)
+    {
+      if (GIMP_IS_TOOL_INFO (tool_button->priv->tool_item))
+        {
+          return GIMP_TOOL_INFO (tool_button->priv->tool_item);
+        }
+      else
+        {
+          return gimp_tool_group_get_active_tool_info (
+            GIMP_TOOL_GROUP (tool_button->priv->tool_item));
+        }
+    }
+
+  return NULL;
+}
+
+void
+gimp_tool_button_set_show_menu_on_hover (GimpToolButton *tool_button,
+                                         gboolean        show_menu_on_hover)
+{
+  g_return_if_fail (GIMP_IS_TOOL_BUTTON (tool_button));
+
+  if (show_menu_on_hover != tool_button->priv->show_menu_on_hover)
+    {
+      tool_button->priv->show_menu_on_hover = show_menu_on_hover;
+
+      gimp_tool_button_update (tool_button);
+
+      g_object_notify (G_OBJECT (tool_button), "show-menu-on-hover");
+    }
+}
+
+gboolean
+gimp_tool_button_get_show_menu_on_hover (GimpToolButton *tool_button)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_BUTTON (tool_button), FALSE);
+
+  return tool_button->priv->show_menu_on_hover;
+}
diff --git a/app/widgets/gimptoolbutton.h b/app/widgets/gimptoolbutton.h
new file mode 100644
index 0000000..ae010e8
--- /dev/null
+++ b/app/widgets/gimptoolbutton.h
@@ -0,0 +1,67 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolbutton.h
+ * Copyright (C) 2020 Ell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_BUTTON_H__
+#define __GIMP_TOOL_BUTTON_H__
+
+
+#define GIMP_TYPE_TOOL_BUTTON            (gimp_tool_button_get_type ())
+#define GIMP_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_BUTTON, GimpToolButton))
+#define GIMP_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_BUTTON, GimpToolButtonClass))
+#define GIMP_IS_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_TOOL_BUTTON))
+#define GIMP_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_BUTTON))
+#define GIMP_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_BUTTON, GimpToolButtonClass))
+
+
+typedef struct _GimpToolButtonPrivate GimpToolButtonPrivate;
+typedef struct _GimpToolButtonClass   GimpToolButtonClass;
+
+struct _GimpToolButton
+{
+  GtkToggleToolButton    parent_instance;
+
+  GimpToolButtonPrivate *priv;
+};
+
+struct _GimpToolButtonClass
+{
+  GtkToggleToolButtonClass  parent_class;
+};
+
+
+GType          gimp_tool_button_get_type               (void) G_GNUC_CONST;
+
+GtkToolItem  * gimp_tool_button_new                    (GimpToolbox    *toolbox,
+                                                        GimpToolItem   *tool_item);
+
+GimpToolbox  * gimp_tool_button_get_toolbox            (GimpToolButton *tool_button);
+
+void           gimp_tool_button_set_tool_item          (GimpToolButton *tool_button,
+                                                        GimpToolItem   *tool_item);
+GimpToolItem * gimp_tool_button_get_tool_item          (GimpToolButton *tool_button);
+
+GimpToolInfo * gimp_tool_button_get_tool_info          (GimpToolButton *tool_button);
+
+void           gimp_tool_button_set_show_menu_on_hover (GimpToolButton *tool_button,
+                                                        gboolean        show_menu_on_hover);
+gboolean       gimp_tool_button_get_show_menu_on_hover (GimpToolButton *tool_button);
+
+
+#endif /* __GIMP_TOOL_BUTTON_H__ */
diff --git a/app/widgets/gimptooleditor.c b/app/widgets/gimptooleditor.c
new file mode 100644
index 0000000..eecc676
--- /dev/null
+++ b/app/widgets/gimptooleditor.c
@@ -0,0 +1,844 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooleditor.c
+ * Copyright (C) 2001-2009 Michael Natterer <mitch@gimp.org>
+ *                         Stephen Griffiths <scgmk5@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimptoolgroup.h"
+#include "core/gimptreehandler.h"
+
+#include "tools/gimp-tools.h"
+
+#include "gimpcontainertreestore.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimpviewrenderer.h"
+#include "gimptooleditor.h"
+#include "gimphelp-ids.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpToolEditorPrivate
+{
+  GimpContainer   *container;
+  GimpContext     *context;
+
+  GtkWidget       *scrolled;
+
+  GtkWidget       *new_group_button;
+  GtkWidget       *raise_button;
+  GtkWidget       *lower_button;
+  GtkWidget       *delete_button;
+  GtkWidget       *reset_button;
+
+  GimpTreeHandler *tool_item_notify_handler;
+
+  /* State of tools at creation of the editor, stored to support
+   * reverting changes
+   */
+  gchar           *initial_tool_state;
+};
+
+
+/*  local function prototypes  */
+
+static void            gimp_tool_editor_view_iface_init           (GimpContainerViewInterface *iface);
+
+static void            gimp_tool_editor_constructed               (GObject                    *object);
+
+static gboolean        gimp_tool_editor_select_item               (GimpContainerView          *view,
+                                                                   GimpViewable               *viewable,
+                                                                   gpointer                    insert_data);
+static void            gimp_tool_editor_set_container             (GimpContainerView          *container_view,
+                                                                   GimpContainer              *container);
+static void            gimp_tool_editor_set_context               (GimpContainerView          *container_view,
+                                                                   GimpContext                *context);
+
+static gboolean        gimp_tool_editor_drop_possible             (GimpContainerTreeView      *tree_view,
+                                                                   GimpDndType                 src_type,
+                                                                   GimpViewable               *src_viewable,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreePath                *drop_path,
+                                                                   GtkTreeViewDropPosition     drop_pos,
+                                                                   GtkTreeViewDropPosition    *return_drop_pos,
+                                                                   GdkDragAction              *return_drag_action);
+static void            gimp_tool_editor_drop_viewable             (GimpContainerTreeView      *tree_view,
+                                                                   GimpViewable               *src_viewable,
+                                                                   GimpViewable               *dest_viewable,
+                                                                   GtkTreeViewDropPosition     drop_pos);
+
+static void            gimp_tool_editor_tool_item_notify         (GimpToolItem                *tool_item,
+                                                                  GParamSpec                  *pspec,
+                                                                  GimpToolEditor              *tool_editor);
+
+static void            gimp_tool_editor_eye_data_func            (GtkTreeViewColumn           *tree_column,
+                                                                  GtkCellRenderer             *cell,
+                                                                  GtkTreeModel                *tree_model,
+                                                                  GtkTreeIter                 *iter,
+                                                                  gpointer                     data);
+static void            gimp_tool_editor_eye_clicked              (GtkCellRendererToggle       *toggle,
+                                                                  gchar                       *path_str,
+                                                                  GdkModifierType              state,
+                                                                  GimpToolEditor              *tool_editor);
+
+static void            gimp_tool_editor_new_group_clicked        (GtkButton                   *button,
+                                                                  GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_raise_clicked            (GtkButton                   *button,
+                                                                  GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_raise_extend_clicked     (GtkButton                   *button,
+                                                                  GdkModifierType              mask,
+                                                                  GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_lower_clicked            (GtkButton                   *button,
+                                                                  GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_lower_extend_clicked     (GtkButton                   *button,
+                                                                  GdkModifierType              mask,
+                                                                  GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_delete_clicked           (GtkButton                   *button,
+                                                                  GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_reset_clicked            (GtkButton                   *button,
+                                                                  GimpToolEditor              *tool_editor);
+
+static GimpToolItem  * gimp_tool_editor_get_selected_tool_item   (GimpToolEditor              *tool_editor);
+static GimpContainer * gimp_tool_editor_get_tool_item_container  (GimpToolEditor              *tool_editor,
+                                                                  GimpToolItem                *tool_item);
+
+static void            gimp_tool_editor_update_container         (GimpToolEditor              *tool_editor);
+static void            gimp_tool_editor_update_sensitivity       (GimpToolEditor              *tool_editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpToolEditor, gimp_tool_editor,
+                         GIMP_TYPE_CONTAINER_TREE_VIEW,
+                         G_ADD_PRIVATE (GimpToolEditor)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_tool_editor_view_iface_init))
+
+#define parent_class gimp_tool_editor_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+/*  private functions  */
+
+static void
+gimp_tool_editor_class_init (GimpToolEditorClass *klass)
+{
+  GObjectClass               *object_class    = G_OBJECT_CLASS (klass);
+  GimpContainerTreeViewClass *tree_view_class = GIMP_CONTAINER_TREE_VIEW_CLASS (klass);
+
+  object_class->constructed      = gimp_tool_editor_constructed;
+
+  tree_view_class->drop_possible = gimp_tool_editor_drop_possible;
+  tree_view_class->drop_viewable = gimp_tool_editor_drop_viewable;
+}
+
+static void
+gimp_tool_editor_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_view_iface)
+    parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
+
+  iface->select_item   = gimp_tool_editor_select_item;
+  iface->set_container = gimp_tool_editor_set_container;
+  iface->set_context   = gimp_tool_editor_set_context;
+}
+
+static void
+gimp_tool_editor_init (GimpToolEditor *tool_editor)
+{
+  tool_editor->priv = gimp_tool_editor_get_instance_private (tool_editor);
+}
+
+static void
+gimp_tool_editor_constructed (GObject *object)
+{
+  GimpToolEditor        *tool_editor    = GIMP_TOOL_EDITOR (object);
+  GimpContainerTreeView *tree_view      = GIMP_CONTAINER_TREE_VIEW (object);
+  GimpContainerView     *container_view = GIMP_CONTAINER_VIEW (object);
+  gint                   view_size;
+  gint                   border_width;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  view_size = gimp_container_view_get_view_size (container_view,
+                                                 &border_width);
+
+  gimp_editor_set_show_name (GIMP_EDITOR (tool_editor), FALSE);
+
+  gtk_tree_view_set_level_indentation (tree_view->view,
+                                       0.8 * (view_size + 2 * border_width));
+
+  gimp_dnd_viewable_dest_add (GTK_WIDGET (tree_view->view),
+                              GIMP_TYPE_TOOL_ITEM,
+                              NULL, NULL);
+
+  /* construct tree view */
+  {
+    GtkTreeViewColumn *column;
+    GtkCellRenderer   *eye_cell;
+    GtkStyle          *tree_style;
+    GtkIconSize        icon_size;
+
+    tree_style = gtk_widget_get_style (GTK_WIDGET (tool_editor));
+
+    icon_size = gimp_get_icon_size (GTK_WIDGET (tool_editor),
+                                    GIMP_ICON_VISIBLE,
+                                    GTK_ICON_SIZE_BUTTON,
+                                    view_size -
+                                    2 * tree_style->xthickness,
+                                    view_size -
+                                    2 * tree_style->ythickness);
+
+    column = gtk_tree_view_column_new ();
+    gtk_tree_view_insert_column (tree_view->view, column, 0);
+
+    eye_cell = gimp_cell_renderer_toggle_new (GIMP_ICON_VISIBLE);
+    g_object_set (eye_cell, "stock-size", icon_size, NULL);
+    gtk_tree_view_column_pack_start (column, eye_cell, FALSE);
+    gtk_tree_view_column_set_cell_data_func  (column, eye_cell,
+                                              gimp_tool_editor_eye_data_func,
+                                              tree_view, NULL);
+
+    gimp_container_tree_view_add_toggle_cell (tree_view, eye_cell);
+
+    g_signal_connect (eye_cell, "clicked",
+                      G_CALLBACK (gimp_tool_editor_eye_clicked),
+                      tool_editor);
+  }
+
+  /* buttons */
+  tool_editor->priv->new_group_button =
+    gimp_editor_add_button (GIMP_EDITOR (tool_editor), GIMP_ICON_FOLDER_NEW,
+                            _("Create a new tool group"), NULL,
+                            G_CALLBACK (gimp_tool_editor_new_group_clicked),
+                            NULL,
+                            G_OBJECT (tool_editor));
+
+  tool_editor->priv->raise_button =
+    gimp_editor_add_button (GIMP_EDITOR (tool_editor), GIMP_ICON_GO_UP,
+                            _("Raise this item"),
+                            _("Raise this item to the top"),
+                            G_CALLBACK (gimp_tool_editor_raise_clicked),
+                            G_CALLBACK (gimp_tool_editor_raise_extend_clicked),
+                            G_OBJECT (tool_editor));
+
+  tool_editor->priv->lower_button =
+    gimp_editor_add_button (GIMP_EDITOR (tool_editor), GIMP_ICON_GO_DOWN,
+                            _("Lower this item"),
+                            _("Lower this item to the bottom"),
+                            G_CALLBACK (gimp_tool_editor_lower_clicked),
+                            G_CALLBACK (gimp_tool_editor_lower_extend_clicked),
+                            G_OBJECT (tool_editor));
+
+  tool_editor->priv->delete_button =
+    gimp_editor_add_button (GIMP_EDITOR (tool_editor), GIMP_ICON_EDIT_DELETE,
+                            _("Delete this tool group"), NULL,
+                            G_CALLBACK (gimp_tool_editor_delete_clicked),
+                            NULL,
+                            G_OBJECT (tool_editor));
+
+  tool_editor->priv->reset_button =
+    gimp_editor_add_button (GIMP_EDITOR (tool_editor), GIMP_ICON_RESET,
+                            _("Reset tool order and visibility"), NULL,
+                            G_CALLBACK (gimp_tool_editor_reset_clicked),
+                            NULL,
+                            G_OBJECT (tool_editor));
+
+  gimp_tool_editor_update_sensitivity (tool_editor);
+}
+
+static gboolean
+gimp_tool_editor_select_item (GimpContainerView *container_view,
+                              GimpViewable      *viewable,
+                              gpointer           insert_data)
+{
+  GimpToolEditor *tool_editor = GIMP_TOOL_EDITOR (container_view);
+  gboolean        result;
+
+  result = parent_view_iface->select_item (container_view,
+                                           viewable, insert_data);
+
+  gimp_tool_editor_update_sensitivity (tool_editor);
+
+  return result;
+}
+
+static void
+gimp_tool_editor_set_container (GimpContainerView *container_view,
+                                GimpContainer     *container)
+{
+  GimpToolEditor *tool_editor = GIMP_TOOL_EDITOR (container_view);
+
+  parent_view_iface->set_container (container_view, container);
+
+  gimp_tool_editor_update_container (tool_editor);
+}
+
+static void
+gimp_tool_editor_set_context (GimpContainerView *container_view,
+                              GimpContext       *context)
+{
+  GimpToolEditor *tool_editor = GIMP_TOOL_EDITOR (container_view);
+
+  parent_view_iface->set_context (container_view, context);
+
+  gimp_tool_editor_update_container (tool_editor);
+}
+
+static gboolean
+gimp_tool_editor_drop_possible (GimpContainerTreeView   *tree_view,
+                                GimpDndType              src_type,
+                                GimpViewable            *src_viewable,
+                                GimpViewable            *dest_viewable,
+                                GtkTreePath             *drop_path,
+                                GtkTreeViewDropPosition  drop_pos,
+                                GtkTreeViewDropPosition *return_drop_pos,
+                                GdkDragAction           *return_drag_action)
+{
+  if (GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_possible (
+        tree_view,
+        src_type, src_viewable, dest_viewable, drop_path, drop_pos,
+        return_drop_pos, return_drag_action))
+    {
+      if (gimp_viewable_get_parent (dest_viewable)       ||
+          (gimp_viewable_get_children (dest_viewable)    &&
+           (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
+            drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)))
+        {
+          return ! gimp_viewable_get_children (src_viewable);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_editor_drop_viewable (GimpContainerTreeView   *tree_view,
+                                GimpViewable            *src_viewable,
+                                GimpViewable            *dest_viewable,
+                                GtkTreeViewDropPosition  drop_pos)
+{
+  GimpContainerView *container_view = GIMP_CONTAINER_VIEW (tree_view);
+
+  GIMP_CONTAINER_TREE_VIEW_CLASS (parent_class)->drop_viewable (tree_view,
+                                                                src_viewable,
+                                                                dest_viewable,
+                                                                drop_pos);
+
+  gimp_container_view_select_item (container_view, src_viewable);
+}
+
+static void
+gimp_tool_editor_new_group_clicked (GtkButton      *button,
+                                    GimpToolEditor *tool_editor)
+{
+  GimpContainerView *container_view = GIMP_CONTAINER_VIEW (tool_editor);
+  GimpContainer     *container;
+  GimpToolItem      *tool_item;
+  GimpToolGroup     *group;
+  gint               index = 0;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item)
+    {
+      if (gimp_viewable_get_parent (GIMP_VIEWABLE (tool_item)) != NULL)
+        return;
+
+      container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                            tool_item);
+
+      index = gimp_container_get_child_index (container,
+                                              GIMP_OBJECT (tool_item));
+    }
+  else
+    {
+      container = tool_editor->priv->container;
+    }
+
+  if (container)
+    {
+      group = gimp_tool_group_new ();
+
+      gimp_container_insert (container, GIMP_OBJECT (group), index);
+
+      g_object_unref (group);
+
+      gimp_container_view_select_item (container_view, GIMP_VIEWABLE (group));
+    }
+}
+
+static void
+gimp_tool_editor_raise_clicked (GtkButton      *button,
+                                GimpToolEditor *tool_editor)
+{
+  GimpToolItem *tool_item;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item)
+    {
+      GimpContainer *container;
+      gint           index;
+
+      container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                            tool_item);
+
+      index = gimp_container_get_child_index (container,
+                                              GIMP_OBJECT (tool_item));
+
+      if (index > 0)
+        {
+          gimp_container_reorder (container,
+                                  GIMP_OBJECT (tool_item), index - 1);
+        }
+    }
+}
+
+static void
+gimp_tool_editor_raise_extend_clicked (GtkButton       *button,
+                                       GdkModifierType  mask,
+                                       GimpToolEditor  *tool_editor)
+{
+  GimpToolItem *tool_item;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item && (mask & GDK_SHIFT_MASK))
+    {
+      GimpContainer *container;
+      gint           index;
+
+      container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                            tool_item);
+
+      index = gimp_container_get_child_index (container,
+                                              GIMP_OBJECT (tool_item));
+
+      if (index > 0)
+        {
+          gimp_container_reorder (container,
+                                  GIMP_OBJECT (tool_item), 0);
+        }
+    }
+}
+
+static void
+gimp_tool_editor_lower_clicked (GtkButton      *button,
+                                GimpToolEditor *tool_editor)
+{
+  GimpToolItem *tool_item;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item)
+    {
+      GimpContainer *container;
+      gint           index;
+
+      container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                            tool_item);
+
+      index = gimp_container_get_child_index (container,
+                                              GIMP_OBJECT (tool_item));
+
+      if (index + 1 < gimp_container_get_n_children (container))
+        {
+          gimp_container_reorder (container,
+                                  GIMP_OBJECT (tool_item), index + 1);
+        }
+    }
+}
+
+static void
+gimp_tool_editor_lower_extend_clicked (GtkButton       *button,
+                                       GdkModifierType  mask,
+                                       GimpToolEditor  *tool_editor)
+{
+  GimpToolItem *tool_item;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item && (mask & GDK_SHIFT_MASK))
+    {
+      GimpContainer *container;
+      gint           index;
+
+      container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                            tool_item);
+
+      index = gimp_container_get_n_children (container) - 1;
+      index = MAX (index, 0);
+
+      gimp_container_reorder (container,
+                              GIMP_OBJECT (tool_item), index);
+    }
+}
+
+static void
+gimp_tool_editor_delete_clicked (GtkButton      *button,
+                                 GimpToolEditor *tool_editor)
+{
+  GimpContainerView *container_view = GIMP_CONTAINER_VIEW (tool_editor);
+  GimpToolItem     *tool_item;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item)
+    {
+      GimpContainer *src_container;
+      GimpContainer *dest_container;
+      gint           index;
+      gint           dest_index;
+
+      src_container  = gimp_viewable_get_children (GIMP_VIEWABLE (tool_item));
+      dest_container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                                 tool_item);
+
+      if (! src_container)
+        return;
+
+      index      = gimp_container_get_child_index (dest_container,
+                                                   GIMP_OBJECT (tool_item));
+      dest_index = index;
+
+      g_object_ref (tool_item);
+
+      gimp_container_freeze (src_container);
+      gimp_container_freeze (dest_container);
+
+      gimp_container_remove (dest_container, GIMP_OBJECT (tool_item));
+
+      while (! gimp_container_is_empty (src_container))
+        {
+          GimpObject *object = gimp_container_get_first_child (src_container);
+
+          g_object_ref (object);
+
+          gimp_container_remove (src_container,  object);
+          gimp_container_insert (dest_container, object, dest_index++);
+
+          g_object_unref (object);
+        }
+
+      gimp_container_thaw (dest_container);
+      gimp_container_thaw (src_container);
+
+      gimp_container_view_select_item (
+        container_view,
+        GIMP_VIEWABLE (gimp_container_get_child_by_index (dest_container,
+                                                          index)));
+
+      g_object_unref (tool_item);
+    }
+}
+
+static void
+gimp_tool_editor_reset_clicked (GtkButton      *button,
+                                GimpToolEditor *tool_editor)
+{
+  gimp_tools_reset (tool_editor->priv->context->gimp,
+                    tool_editor->priv->container,
+                    FALSE);
+}
+
+static void
+gimp_tool_editor_tool_item_notify (GimpToolItem   *tool_item,
+                                   GParamSpec     *pspec,
+                                   GimpToolEditor *tool_editor)
+{
+  GimpContainerTreeView *tree_view      = GIMP_CONTAINER_TREE_VIEW (tool_editor);
+  GimpContainerView     *container_view = GIMP_CONTAINER_VIEW (tool_editor);
+  GtkTreeIter           *iter;
+
+  iter = gimp_container_view_lookup (container_view,
+                                     GIMP_VIEWABLE (tool_item));
+
+  if (iter)
+    {
+      GtkTreePath *path;
+
+      path = gtk_tree_model_get_path (tree_view->model, iter);
+
+      gtk_tree_model_row_changed (tree_view->model, path, iter);
+
+      gtk_tree_path_free (path);
+    }
+}
+
+static void
+gimp_tool_editor_eye_data_func (GtkTreeViewColumn *tree_column,
+                                GtkCellRenderer   *cell,
+                                GtkTreeModel      *tree_model,
+                                GtkTreeIter       *iter,
+                                gpointer           data)
+{
+  GimpViewRenderer *renderer;
+  GimpToolItem     *tool_item;
+
+  gtk_tree_model_get (tree_model, iter,
+                      GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                      -1);
+
+  tool_item = GIMP_TOOL_ITEM (renderer->viewable);
+
+  g_object_set (cell,
+                "active",       gimp_tool_item_get_visible (tool_item),
+                "inconsistent", gimp_tool_item_get_visible (tool_item) &&
+                                ! gimp_tool_item_get_shown (tool_item),
+                NULL);
+
+  g_object_unref (renderer);
+}
+
+static void
+gimp_tool_editor_eye_clicked (GtkCellRendererToggle *toggle,
+                              gchar                 *path_str,
+                              GdkModifierType        state,
+                              GimpToolEditor        *tool_editor)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (tool_editor);
+  GtkTreePath           *path;
+  GtkTreeIter            iter;
+
+  path = gtk_tree_path_new_from_string (path_str);
+
+  if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
+    {
+      GimpViewRenderer *renderer;
+      GimpToolItem     *tool_item;
+      gboolean          active;
+
+      gtk_tree_model_get (tree_view->model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      tool_item = GIMP_TOOL_ITEM (renderer->viewable);
+
+      g_object_get (toggle,
+                    "active", &active,
+                    NULL);
+
+      gimp_tool_item_set_visible (tool_item, ! active);
+
+      g_object_unref (renderer);
+    }
+
+  gtk_tree_path_free (path);
+}
+
+static GimpToolItem *
+gimp_tool_editor_get_selected_tool_item (GimpToolEditor *tool_editor)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (tool_editor);
+
+  if (tool_editor->priv->container)
+    {
+      GimpViewRenderer *renderer;
+      GimpToolItem     *tool_item;
+      GtkTreeSelection *selection;
+      GtkTreeModel     *model;
+      GtkTreeIter       iter;
+
+      selection = gtk_tree_view_get_selection (tree_view->view);
+
+      if (! gtk_tree_selection_get_selected (selection, &model, &iter))
+        return NULL;
+
+      gtk_tree_model_get (model, &iter,
+                          GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
+                          -1);
+
+      tool_item = GIMP_TOOL_ITEM (renderer->viewable);
+
+      g_object_unref (renderer);
+
+      return tool_item;
+    }
+
+  return NULL;
+}
+
+static GimpContainer *
+gimp_tool_editor_get_tool_item_container (GimpToolEditor *tool_editor,
+                                          GimpToolItem   *tool_item)
+{
+  GimpViewable *parent;
+
+  parent = gimp_viewable_get_parent (GIMP_VIEWABLE (tool_item));
+
+  if (parent)
+    {
+      return gimp_viewable_get_children (parent);
+    }
+  else
+    {
+      return tool_editor->priv->container;
+    }
+}
+
+static void
+gimp_tool_editor_update_container (GimpToolEditor *tool_editor)
+{
+  GimpContainerView *container_view = GIMP_CONTAINER_VIEW (tool_editor);
+  GimpContainer     *container;
+  GimpContext       *context;
+
+  g_clear_pointer (&tool_editor->priv->tool_item_notify_handler,
+                   gimp_tree_handler_disconnect);
+
+  g_clear_pointer (&tool_editor->priv->initial_tool_state, g_free);
+
+  container = gimp_container_view_get_container (container_view);
+  context   = gimp_container_view_get_context   (container_view);
+
+  if (container && context)
+    {
+      GString          *string;
+      GimpConfigWriter *writer;
+
+      tool_editor->priv->container = container;
+      tool_editor->priv->context   = context;
+
+      tool_editor->priv->tool_item_notify_handler = gimp_tree_handler_connect (
+        container, "notify",
+        G_CALLBACK (gimp_tool_editor_tool_item_notify),
+        tool_editor);
+
+      /* save initial tool order */
+      string = g_string_new (NULL);
+
+      writer = gimp_config_writer_new_string (string);
+
+      gimp_tools_serialize (context->gimp, container, writer);
+
+      gimp_config_writer_finish (writer, NULL, NULL);
+
+      tool_editor->priv->initial_tool_state = g_string_free (string, FALSE);
+    }
+}
+
+static void
+gimp_tool_editor_update_sensitivity (GimpToolEditor *tool_editor)
+{
+  GimpToolItem *tool_item;
+
+  tool_item = gimp_tool_editor_get_selected_tool_item (tool_editor);
+
+  if (tool_item)
+    {
+      GimpContainer *container;
+      gint           index;
+
+      container = gimp_tool_editor_get_tool_item_container (tool_editor,
+                                                            tool_item);
+
+      index = gimp_container_get_child_index (container,
+                                              GIMP_OBJECT (tool_item));
+
+      gtk_widget_set_sensitive (
+        tool_editor->priv->new_group_button,
+        gimp_viewable_get_parent (GIMP_VIEWABLE (tool_item)) == NULL);
+
+      gtk_widget_set_sensitive (
+        tool_editor->priv->raise_button,
+        index > 0);
+
+      gtk_widget_set_sensitive (
+        tool_editor->priv->lower_button,
+        index < gimp_container_get_n_children (container) - 1);
+
+      gtk_widget_set_sensitive (
+        tool_editor->priv->delete_button,
+        gimp_viewable_get_children (GIMP_VIEWABLE (tool_item)) != NULL);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (tool_editor->priv->new_group_button, TRUE);
+      gtk_widget_set_sensitive (tool_editor->priv->raise_button,     FALSE);
+      gtk_widget_set_sensitive (tool_editor->priv->lower_button,     FALSE);
+      gtk_widget_set_sensitive (tool_editor->priv->delete_button,    FALSE);
+    }
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_tool_editor_new (GimpContainer *container,
+                      GimpContext   *context,
+                      gint           view_size,
+                      gint           view_border_width)
+{
+  GimpContainerView *container_view;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  container_view = g_object_new (GIMP_TYPE_TOOL_EDITOR,
+                                 "view-size",         view_size,
+                                 "view-border-width", view_border_width,
+                                 NULL);
+
+  gimp_container_view_set_context     (container_view, context);
+  gimp_container_view_set_container   (container_view, container);
+  gimp_container_view_set_reorderable (container_view, TRUE);
+
+  return GTK_WIDGET (container_view);
+}
+
+/**
+ * gimp_tool_editor_revert_changes:
+ * @tool_editor:
+ *
+ * Reverts the tool order and visibility to the state at creation.
+ **/
+void
+gimp_tool_editor_revert_changes (GimpToolEditor *tool_editor)
+{
+  GScanner *scanner;
+
+  g_return_if_fail (GIMP_IS_TOOL_EDITOR (tool_editor));
+
+  scanner = gimp_scanner_new_string (tool_editor->priv->initial_tool_state, -1,
+                                     NULL);
+
+  gimp_tools_deserialize (tool_editor->priv->context->gimp,
+                          tool_editor->priv->container,
+                          scanner);
+
+  gimp_scanner_destroy (scanner);
+}
diff --git a/app/widgets/gimptooleditor.h b/app/widgets/gimptooleditor.h
new file mode 100644
index 0000000..ac34b92
--- /dev/null
+++ b/app/widgets/gimptooleditor.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooleditor.h
+ * Copyright (C) 2001-2009 Michael Natterer <mitch@gimp.org>
+ *                         Stephen Griffiths <scgmk5@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_EDITOR_H__
+#define __GIMP_TOOL_EDITOR_H__
+
+
+#include "gimpcontainertreeview.h"
+
+
+#define GIMP_TYPE_TOOL_EDITOR            (gimp_tool_editor_get_type ())
+#define GIMP_TOOL_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_EDITOR, GimpToolEditor))
+#define GIMP_TOOL_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_EDITOR, GimpToolEditorClass))
+#define GIMP_IS_TOOL_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_EDITOR))
+#define GIMP_IS_TOOL_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_EDITOR))
+#define GIMP_TOOL_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_EDITOR, GimpToolEditorClass))
+
+
+typedef struct _GimpToolEditorPrivate GimpToolEditorPrivate;
+typedef struct _GimpToolEditorClass   GimpToolEditorClass;
+
+struct _GimpToolEditor
+{
+  GimpContainerTreeView  parent_instance;
+
+  GimpToolEditorPrivate *priv;
+};
+
+struct _GimpToolEditorClass
+{
+  GimpContainerTreeViewClass  parent_class;
+};
+
+
+GType       gimp_tool_editor_get_type       (void) G_GNUC_CONST;
+
+GtkWidget * gimp_tool_editor_new            (GimpContainer  *container,
+                                             GimpContext    *context,
+                                             gint            view_size,
+                                             gint            view_border_width);
+
+void        gimp_tool_editor_revert_changes (GimpToolEditor *tool_editor);
+
+
+#endif  /*  __GIMP_TOOL_EDITOR_H__  */
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
new file mode 100644
index 0000000..c65ed22
--- /dev/null
+++ b/app/widgets/gimptooloptionseditor.c
@@ -0,0 +1,553 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooloptionseditor.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimplist.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+
+#include "gimpdnd.h"
+#include "gimpdocked.h"
+#include "gimphelp-ids.h"
+#include "gimpmenufactory.h"
+#include "gimppropwidgets.h"
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+#include "gimptooloptionseditor.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  PROP_0,
+  PROP_GIMP,
+};
+
+struct _GimpToolOptionsEditorPrivate
+{
+  Gimp            *gimp;
+
+  GtkWidget       *scrolled_window;
+  GtkWidget       *options_vbox;
+  GtkWidget       *title_label;
+
+  GtkWidget       *save_button;
+  GtkWidget       *restore_button;
+  GtkWidget       *delete_button;
+  GtkWidget       *reset_button;
+
+  GimpToolOptions *visible_tool_options;
+};
+
+
+static void        gimp_tool_options_editor_docked_iface_init (GimpDockedInterface   *iface);
+static void        gimp_tool_options_editor_constructed       (GObject               *object);
+static void        gimp_tool_options_editor_dispose           (GObject               *object);
+static void        gimp_tool_options_editor_set_property      (GObject               *object,
+                                                               guint                  property_id,
+                                                               const GValue          *value,
+                                                               GParamSpec            *pspec);
+static void        gimp_tool_options_editor_get_property      (GObject               *object,
+                                                               guint                  property_id,
+                                                               GValue                *value,
+                                                               GParamSpec            *pspec);
+
+static GtkWidget * gimp_tool_options_editor_get_preview       (GimpDocked            *docked,
+                                                               GimpContext           *context,
+                                                               GtkIconSize            size);
+static gchar     * gimp_tool_options_editor_get_title         (GimpDocked            *docked);
+static gboolean    gimp_tool_options_editor_get_prefer_icon   (GimpDocked            *docked);
+static void        gimp_tool_options_editor_save_clicked      (GtkWidget             *widget,
+                                                               GimpToolOptionsEditor *editor);
+static void        gimp_tool_options_editor_restore_clicked   (GtkWidget             *widget,
+                                                               GimpToolOptionsEditor *editor);
+static void        gimp_tool_options_editor_delete_clicked    (GtkWidget             *widget,
+                                                               GimpToolOptionsEditor *editor);
+static void        gimp_tool_options_editor_drop_tool         (GtkWidget             *widget,
+                                                               gint                   x,
+                                                               gint                   y,
+                                                               GimpViewable          *viewable,
+                                                               gpointer               data);
+static void        gimp_tool_options_editor_tool_changed      (GimpContext           *context,
+                                                               GimpToolInfo          *tool_info,
+                                                               GimpToolOptionsEditor *editor);
+static void        gimp_tool_options_editor_presets_update    (GimpToolOptionsEditor *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpToolOptionsEditor, gimp_tool_options_editor,
+                         GIMP_TYPE_EDITOR,
+                         G_ADD_PRIVATE (GimpToolOptionsEditor)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_tool_options_editor_docked_iface_init))
+
+#define parent_class gimp_tool_options_editor_parent_class
+
+
+static void
+gimp_tool_options_editor_class_init (GimpToolOptionsEditorClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_tool_options_editor_constructed;
+  object_class->dispose      = gimp_tool_options_editor_dispose;
+  object_class->set_property = gimp_tool_options_editor_set_property;
+  object_class->get_property = gimp_tool_options_editor_get_property;
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_tool_options_editor_docked_iface_init (GimpDockedInterface *docked_iface)
+{
+  docked_iface->get_preview     = gimp_tool_options_editor_get_preview;
+  docked_iface->get_title       = gimp_tool_options_editor_get_title;
+  docked_iface->get_prefer_icon = gimp_tool_options_editor_get_prefer_icon;
+}
+
+static void
+gimp_tool_options_editor_init (GimpToolOptionsEditor *editor)
+{
+  GtkScrolledWindow *scrolled_window;
+  GtkWidget         *viewport;
+
+  editor->p = gimp_tool_options_editor_get_instance_private (editor);
+
+  gtk_widget_set_size_request (GTK_WIDGET (editor), -1, 200);
+
+  gimp_dnd_viewable_dest_add (GTK_WIDGET (editor),
+                              GIMP_TYPE_TOOL_INFO,
+                              gimp_tool_options_editor_drop_tool,
+                              editor);
+
+  /*  The label containing the tool options title */
+  editor->p->title_label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (editor->p->title_label), 0.0);
+  gimp_label_set_attributes (GTK_LABEL (editor->p->title_label),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (editor), editor->p->title_label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->p->title_label);
+
+  editor->p->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = GTK_SCROLLED_WINDOW (editor->p->scrolled_window);
+
+  gtk_scrolled_window_set_policy (scrolled_window,
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+
+  gtk_box_pack_start (GTK_BOX (editor), editor->p->scrolled_window,
+                      TRUE, TRUE, 0);
+  gtk_widget_show (editor->p->scrolled_window);
+
+  viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment (scrolled_window),
+                               gtk_scrolled_window_get_vadjustment (scrolled_window));
+  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
+  gtk_widget_show (viewport);
+
+  /*  The vbox containing the tool options  */
+  editor->p->options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (viewport), editor->p->options_vbox);
+  gtk_widget_show (editor->p->options_vbox);
+}
+
+static void
+gimp_tool_options_editor_constructed (GObject *object)
+{
+  GimpToolOptionsEditor *editor = GIMP_TOOL_OPTIONS_EDITOR (object);
+  GimpContext           *user_context;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  editor->p->save_button =
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_DOCUMENT_SAVE,
+                            _("Save Tool Preset..."),
+                            GIMP_HELP_TOOL_OPTIONS_SAVE,
+                            G_CALLBACK (gimp_tool_options_editor_save_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  editor->p->restore_button =
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_DOCUMENT_REVERT,
+                            _("Restore Tool Preset..."),
+                            GIMP_HELP_TOOL_OPTIONS_RESTORE,
+                            G_CALLBACK (gimp_tool_options_editor_restore_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  editor->p->delete_button =
+    gimp_editor_add_button (GIMP_EDITOR (editor),
+                            GIMP_ICON_EDIT_DELETE,
+                            _("Delete Tool Preset..."),
+                            GIMP_HELP_TOOL_OPTIONS_DELETE,
+                            G_CALLBACK (gimp_tool_options_editor_delete_clicked),
+                            NULL,
+                            G_OBJECT (editor));
+
+  editor->p->reset_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (editor), "tool-options",
+                                   "tool-options-reset",
+                                   "tool-options-reset-all",
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+
+  user_context = gimp_get_user_context (editor->p->gimp);
+
+  g_signal_connect_object (user_context, "tool-changed",
+                           G_CALLBACK (gimp_tool_options_editor_tool_changed),
+                           editor,
+                           0);
+
+  gimp_tool_options_editor_tool_changed (user_context,
+                                         gimp_context_get_tool (user_context),
+                                         editor);
+}
+
+static void
+gimp_tool_options_editor_dispose (GObject *object)
+{
+  GimpToolOptionsEditor *editor = GIMP_TOOL_OPTIONS_EDITOR (object);
+
+  if (editor->p->options_vbox)
+    {
+      GList *options;
+      GList *list;
+
+      options =
+        gtk_container_get_children (GTK_CONTAINER (editor->p->options_vbox));
+
+      for (list = options; list; list = g_list_next (list))
+        {
+          gtk_container_remove (GTK_CONTAINER (editor->p->options_vbox),
+                                GTK_WIDGET (list->data));
+        }
+
+      g_list_free (options);
+      editor->p->options_vbox = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_tool_options_editor_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpToolOptionsEditor *editor = GIMP_TOOL_OPTIONS_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      editor->p->gimp = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_tool_options_editor_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpToolOptionsEditor *editor = GIMP_TOOL_OPTIONS_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_GIMP:
+      g_value_set_object (value, editor->p->gimp);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static GtkWidget *
+gimp_tool_options_editor_get_preview (GimpDocked   *docked,
+                                      GimpContext  *context,
+                                      GtkIconSize   size)
+{
+  GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (docked));
+  GtkWidget   *view;
+  gint         width;
+  gint         height;
+
+  gtk_icon_size_lookup_for_settings (settings, size, &width, &height);
+
+  view = gimp_prop_view_new (G_OBJECT (context), "tool", context, height);
+  GIMP_VIEW (view)->renderer->size = -1;
+  gimp_view_renderer_set_size_full (GIMP_VIEW (view)->renderer,
+                                    width, height, 0);
+
+  return view;
+}
+
+static gchar *
+gimp_tool_options_editor_get_title (GimpDocked *docked)
+{
+  GimpToolOptionsEditor *editor = GIMP_TOOL_OPTIONS_EDITOR (docked);
+  GimpContext           *context;
+  GimpToolInfo          *tool_info;
+
+  context = gimp_get_user_context (editor->p->gimp);
+
+  tool_info = gimp_context_get_tool (context);
+
+  return tool_info ? g_strdup (tool_info->label) : NULL;
+}
+
+static gboolean
+gimp_tool_options_editor_get_prefer_icon (GimpDocked *docked)
+{
+  /* We support get_preview() for tab tyles, but we prefer to show our
+   * icon
+   */
+  return TRUE;
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_tool_options_editor_new (Gimp            *gimp,
+                              GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_OPTIONS_EDITOR,
+                       "gimp",            gimp,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<ToolOptions>",
+                       "ui-path",         "/tool-options-popup",
+                       NULL);
+}
+
+GimpToolOptions *
+gimp_tool_options_editor_get_tool_options (GimpToolOptionsEditor *editor)
+{
+  g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS_EDITOR (editor), NULL);
+
+  return editor->p->visible_tool_options;
+}
+
+/*  private functions  */
+
+static void
+gimp_tool_options_editor_menu_pos (GtkMenu  *menu,
+                                   gint     *x,
+                                   gint     *y,
+                                   gpointer  data)
+{
+  gimp_button_menu_position (GTK_WIDGET (data), menu, GTK_POS_RIGHT, x, y);
+}
+
+static void
+gimp_tool_options_editor_menu_popup (GimpToolOptionsEditor *editor,
+                                     GtkWidget             *button,
+                                     const gchar           *path)
+{
+  GimpEditor *gimp_editor = GIMP_EDITOR (editor);
+
+  gimp_ui_manager_get_widget (gimp_editor_get_ui_manager (gimp_editor),
+                              gimp_editor_get_ui_path (gimp_editor));
+  gimp_ui_manager_update (gimp_editor_get_ui_manager (gimp_editor),
+                          gimp_editor_get_popup_data (gimp_editor));
+
+  gimp_ui_manager_ui_popup (gimp_editor_get_ui_manager (gimp_editor), path,
+                            button,
+                            gimp_tool_options_editor_menu_pos, button,
+                            NULL, NULL);
+}
+
+static void
+gimp_tool_options_editor_save_clicked (GtkWidget             *widget,
+                                       GimpToolOptionsEditor *editor)
+{
+  if (gtk_widget_get_sensitive (editor->p->restore_button) /* evil but correct */)
+    {
+      gimp_tool_options_editor_menu_popup (editor, widget,
+                                           "/tool-options-popup/Save");
+    }
+  else
+    {
+      gimp_ui_manager_activate_action (gimp_editor_get_ui_manager (GIMP_EDITOR (editor)),
+                                       "tool-options",
+                                       "tool-options-save-new-preset");
+    }
+}
+
+static void
+gimp_tool_options_editor_restore_clicked (GtkWidget             *widget,
+                                          GimpToolOptionsEditor *editor)
+{
+  gimp_tool_options_editor_menu_popup (editor, widget,
+                                       "/tool-options-popup/Restore");
+}
+
+static void
+gimp_tool_options_editor_delete_clicked (GtkWidget             *widget,
+                                         GimpToolOptionsEditor *editor)
+{
+  gimp_tool_options_editor_menu_popup (editor, widget,
+                                       "/tool-options-popup/Delete");
+}
+
+static void
+gimp_tool_options_editor_drop_tool (GtkWidget    *widget,
+                                    gint          x,
+                                    gint          y,
+                                    GimpViewable *viewable,
+                                    gpointer      data)
+{
+  GimpToolOptionsEditor *editor = GIMP_TOOL_OPTIONS_EDITOR (data);
+  GimpContext           *context;
+
+  context = gimp_get_user_context (editor->p->gimp);
+
+  gimp_context_set_tool (context, GIMP_TOOL_INFO (viewable));
+}
+
+static void
+gimp_tool_options_editor_tool_changed (GimpContext           *context,
+                                       GimpToolInfo          *tool_info,
+                                       GimpToolOptionsEditor *editor)
+{
+  GimpContainer *presets;
+  GtkWidget     *options_gui;
+
+  if (tool_info && tool_info->tool_options == editor->p->visible_tool_options)
+    return;
+
+  if (editor->p->visible_tool_options)
+    {
+      presets = editor->p->visible_tool_options->tool_info->presets;
+
+      if (presets)
+        g_signal_handlers_disconnect_by_func (presets,
+                                              gimp_tool_options_editor_presets_update,
+                                              editor);
+
+      options_gui = gimp_tools_get_tool_options_gui (editor->p->visible_tool_options);
+
+      if (options_gui)
+        gtk_widget_hide (options_gui);
+
+      editor->p->visible_tool_options = NULL;
+    }
+
+  if (tool_info && tool_info->tool_options)
+    {
+      presets = tool_info->presets;
+
+      if (presets)
+        {
+          g_signal_connect_object (presets, "add",
+                                   G_CALLBACK (gimp_tool_options_editor_presets_update),
+                                   G_OBJECT (editor), G_CONNECT_SWAPPED);
+          g_signal_connect_object (presets, "remove",
+                                   G_CALLBACK (gimp_tool_options_editor_presets_update),
+                                   G_OBJECT (editor), G_CONNECT_SWAPPED);
+          g_signal_connect_object (presets, "thaw",
+                                   G_CALLBACK (gimp_tool_options_editor_presets_update),
+                                   G_OBJECT (editor), G_CONNECT_SWAPPED);
+        }
+
+      options_gui = gimp_tools_get_tool_options_gui (tool_info->tool_options);
+
+      if (! gtk_widget_get_parent (options_gui))
+        gtk_box_pack_start (GTK_BOX (editor->p->options_vbox), options_gui,
+                            FALSE, FALSE, 0);
+
+      gtk_widget_show (options_gui);
+
+      editor->p->visible_tool_options = tool_info->tool_options;
+
+      gimp_help_set_help_data (editor->p->scrolled_window, NULL,
+                               tool_info->help_id);
+
+      gimp_tool_options_editor_presets_update (editor);
+    }
+
+  if (editor->p->title_label != NULL)
+    {
+      gchar *title;
+
+      title = gimp_docked_get_title (GIMP_DOCKED (editor));
+      gtk_label_set_text (GTK_LABEL (editor->p->title_label), title);
+      g_free (title);
+    }
+
+  gimp_docked_title_changed (GIMP_DOCKED (editor));
+}
+
+static void
+gimp_tool_options_editor_presets_update (GimpToolOptionsEditor *editor)
+{
+  GimpToolInfo *tool_info         = editor->p->visible_tool_options->tool_info;
+  gboolean      save_sensitive    = FALSE;
+  gboolean      restore_sensitive = FALSE;
+  gboolean      delete_sensitive  = FALSE;
+  gboolean      reset_sensitive   = FALSE;
+
+  if (tool_info->presets)
+    {
+      save_sensitive  = TRUE;
+      reset_sensitive = TRUE;
+
+      if (! gimp_container_is_empty (tool_info->presets))
+        {
+          restore_sensitive = TRUE;
+          delete_sensitive  = TRUE;
+        }
+    }
+
+  gtk_widget_set_sensitive (editor->p->save_button,    save_sensitive);
+  gtk_widget_set_sensitive (editor->p->restore_button, restore_sensitive);
+  gtk_widget_set_sensitive (editor->p->delete_button,  delete_sensitive);
+  gtk_widget_set_sensitive (editor->p->reset_button,   reset_sensitive);
+}
diff --git a/app/widgets/gimptooloptionseditor.h b/app/widgets/gimptooloptionseditor.h
new file mode 100644
index 0000000..fe02d94
--- /dev/null
+++ b/app/widgets/gimptooloptionseditor.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooloptionseditor.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_OPTIONS_EDITOR_H__
+#define __GIMP_TOOL_OPTIONS_EDITOR_H__
+
+
+#include "gimpeditor.h"
+
+
+#define GIMP_TYPE_TOOL_OPTIONS_EDITOR            (gimp_tool_options_editor_get_type ())
+#define GIMP_TOOL_OPTIONS_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_OPTIONS_EDITOR, GimpToolOptionsEditor))
+#define GIMP_TOOL_OPTIONS_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_OPTIONS_EDITOR, GimpToolOptionsEditorClass))
+#define GIMP_IS_TOOL_OPTIONS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_OPTIONS_EDITOR))
+#define GIMP_IS_TOOL_OPTIONS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_OPTIONS_EDITOR))
+#define GIMP_TOOL_OPTIONS_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_OPTIONS_EDITOR, GimpToolOptionsEditorClass))
+
+
+typedef struct _GimpToolOptionsEditorPrivate  GimpToolOptionsEditorPrivate;
+typedef struct _GimpToolOptionsEditorClass    GimpToolOptionsEditorClass;
+
+struct _GimpToolOptionsEditor
+{
+  GimpEditor                    parent_instance;
+
+  GimpToolOptionsEditorPrivate *p;
+};
+
+struct _GimpToolOptionsEditorClass
+{
+  GimpEditorClass  parent_class;
+};
+
+
+GType             gimp_tool_options_editor_get_type         (void) G_GNUC_CONST;
+GtkWidget       * gimp_tool_options_editor_new              (Gimp                  *gimp,
+                                                             GimpMenuFactory       *menu_factory);
+GimpToolOptions * gimp_tool_options_editor_get_tool_options (GimpToolOptionsEditor *editor);
+
+
+#endif  /*  __GIMP_TOOL_OPTIONS_EDITOR_H__  */
diff --git a/app/widgets/gimptoolpalette.c b/app/widgets/gimptoolpalette.c
new file mode 100644
index 0000000..b5a27a6
--- /dev/null
+++ b/app/widgets/gimptoolpalette.c
@@ -0,0 +1,542 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpalette.c
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpguiconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpcontainer.h"
+#include "core/gimptoolitem.h"
+
+#include "gimptoolbox.h"
+#include "gimptoolbutton.h"
+#include "gimptoolpalette.h"
+#include "gimpuimanager.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+
+
+#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON
+#define DEFAULT_BUTTON_RELIEF  GTK_RELIEF_NONE
+
+
+typedef struct _GimpToolPalettePrivate GimpToolPalettePrivate;
+
+struct _GimpToolPalettePrivate
+{
+  GimpToolbox *toolbox;
+
+  GtkWidget   *group;
+  GHashTable  *buttons;
+
+  gint         tool_rows;
+  gint         tool_columns;
+};
+
+#define GET_PRIVATE(p) ((GimpToolPalettePrivate *) gimp_tool_palette_get_instance_private ((GimpToolPalette *) (p)))
+
+
+static void       gimp_tool_palette_finalize                  (GObject          *object);
+
+static void       gimp_tool_palette_size_allocate             (GtkWidget        *widget,
+                                                               GtkAllocation    *allocation);
+static void       gimp_tool_palette_style_set                 (GtkWidget        *widget,
+                                                               GtkStyle         *previous_style);
+
+static void       gimp_tool_palette_tool_add                  (GimpContainer    *container,
+                                                               GimpToolItem     *tool_item,
+                                                               GimpToolPalette  *palette);
+static void       gimp_tool_palette_tool_remove               (GimpContainer    *container,
+                                                               GimpToolItem     *tool_item,
+                                                               GimpToolPalette  *palette);
+static void       gimp_tool_palette_tool_reorder              (GimpContainer    *container,
+                                                               GimpToolItem     *tool_item,
+                                                               gint              index,
+                                                               GimpToolPalette  *palette);
+
+static void       gimp_tool_palette_config_menu_mode_notify   (GimpGuiConfig    *config,
+                                                               const GParamSpec *pspec,
+                                                               GimpToolPalette  *palette);
+static void       gimp_tool_palette_config_size_changed       (GimpGuiConfig    *config,
+                                                               GimpToolPalette  *palette);
+
+static void       gimp_tool_palette_add_button                (GimpToolPalette *palette,
+                                                               GimpToolItem    *tool_item,
+                                                               gint             index);
+
+static gboolean   gimp_tool_palette_get_show_menu_on_hover    (GimpToolPalette *palette);
+static void       gimp_tool_palette_update_show_menu_on_hover (GimpToolPalette *palette);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolPalette, gimp_tool_palette,
+                            GTK_TYPE_TOOL_PALETTE)
+
+#define parent_class gimp_tool_palette_parent_class
+
+
+static void
+gimp_tool_palette_class_init (GimpToolPaletteClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->finalize      = gimp_tool_palette_finalize;
+
+  widget_class->size_allocate = gimp_tool_palette_size_allocate;
+  widget_class->style_set     = gimp_tool_palette_style_set;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_enum ("tool-icon-size",
+                                                              NULL, NULL,
+                                                              GTK_TYPE_ICON_SIZE,
+                                                              DEFAULT_TOOL_ICON_SIZE,
+                                                              GIMP_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_enum ("button-relief",
+                                                              NULL, NULL,
+                                                              GTK_TYPE_RELIEF_STYLE,
+                                                              DEFAULT_BUTTON_RELIEF,
+                                                              GIMP_PARAM_READABLE));
+}
+
+static void
+gimp_tool_palette_init (GimpToolPalette *palette)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+
+  private->buttons = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+  gtk_tool_palette_set_style (GTK_TOOL_PALETTE (palette), GTK_TOOLBAR_ICONS);
+}
+
+static void
+gimp_tool_palette_finalize (GObject *object)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (object);
+
+  g_clear_pointer (&private->buttons, g_hash_table_unref);
+
+  if (private->toolbox)
+    {
+      GimpContext *context = gimp_toolbox_get_context (private->toolbox);
+
+      if (context)
+        {
+          g_signal_handlers_disconnect_by_func (
+            context->gimp->config,
+            G_CALLBACK (gimp_tool_palette_config_menu_mode_notify),
+            object);
+          g_signal_handlers_disconnect_by_func (
+            context->gimp->config,
+            G_CALLBACK (gimp_tool_palette_config_size_changed),
+            object);
+        }
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_palette_size_allocate (GtkWidget     *widget,
+                                 GtkAllocation *allocation)
+{
+  GimpToolPalette        *palette = GIMP_TOOL_PALETTE (widget);
+  GimpToolPalettePrivate *private = GET_PRIVATE (widget);
+  gint                    button_width;
+  gint                    button_height;
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  if (gimp_tool_palette_get_button_size (palette,
+                                         &button_width, &button_height))
+    {
+      GimpToolItem   *tool_item;
+      GHashTableIter  iter;
+      gint            n_tools;
+      gint            tool_rows;
+      gint            tool_columns;
+
+      n_tools = 0;
+
+      g_hash_table_iter_init (&iter, private->buttons);
+
+      while (g_hash_table_iter_next (&iter, (gpointer *) &tool_item, NULL))
+        {
+          if (gimp_tool_item_get_visible (tool_item))
+            n_tools++;
+        }
+
+      tool_columns = MAX (1, (allocation->width / button_width));
+      tool_rows    = n_tools / tool_columns;
+
+      if (n_tools % tool_columns)
+        tool_rows++;
+
+      if (private->tool_rows    != tool_rows  ||
+          private->tool_columns != tool_columns)
+        {
+          private->tool_rows    = tool_rows;
+          private->tool_columns = tool_columns;
+
+          gtk_widget_set_size_request (widget, -1,
+                                       tool_rows * button_height);
+
+          gimp_tool_palette_update_show_menu_on_hover (palette);
+        }
+    }
+}
+
+static void
+gimp_tool_palette_style_set (GtkWidget *widget,
+                             GtkStyle  *previous_style)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (widget);
+  Gimp                   *gimp;
+  GtkWidget              *tool_button;
+  GHashTableIter          iter;
+  GtkReliefStyle          relief;
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
+
+  if (! gimp_toolbox_get_context (private->toolbox))
+    return;
+
+  gimp = gimp_toolbox_get_context (private->toolbox)->gimp;
+
+  gtk_widget_style_get (widget,
+                        "button-relief", &relief,
+                        NULL);
+
+  gimp_tool_palette_config_size_changed (GIMP_GUI_CONFIG (gimp->config),
+                                         GIMP_TOOL_PALETTE (widget));
+
+  g_hash_table_iter_init (&iter, private->buttons);
+
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &tool_button))
+    {
+      GtkWidget *button = gtk_bin_get_child (GTK_BIN (tool_button));
+
+      gtk_button_set_relief (GTK_BUTTON (button), relief);
+    }
+
+  gimp_dock_invalidate_geometry (GIMP_DOCK (private->toolbox));
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_tool_palette_new (void)
+{
+  return g_object_new (GIMP_TYPE_TOOL_PALETTE, NULL);
+}
+
+void
+gimp_tool_palette_set_toolbox (GimpToolPalette *palette,
+                               GimpToolbox     *toolbox)
+{
+  GimpToolPalettePrivate *private;
+  GimpContext            *context;
+  GList                  *list;
+
+  g_return_if_fail (GIMP_IS_TOOL_PALETTE (palette));
+  g_return_if_fail (GIMP_IS_TOOLBOX (toolbox));
+
+  private = GET_PRIVATE (palette);
+
+  if (private->toolbox)
+    {
+      context = gimp_toolbox_get_context (private->toolbox);
+
+      g_signal_handlers_disconnect_by_func (
+        GIMP_GUI_CONFIG (context->gimp->config),
+        G_CALLBACK (gimp_tool_palette_config_menu_mode_notify),
+        palette);
+      g_signal_handlers_disconnect_by_func (
+        GIMP_GUI_CONFIG (context->gimp->config),
+        G_CALLBACK (gimp_tool_palette_config_size_changed),
+        palette);
+    }
+
+  private->toolbox = toolbox;
+
+  context = gimp_toolbox_get_context (toolbox);
+
+  private->group = gtk_tool_item_group_new (_("Tools"));
+  gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (private->group),
+                                        NULL);
+  gtk_container_add (GTK_CONTAINER (palette), private->group);
+  gtk_widget_show (private->group);
+
+  for (list = gimp_get_tool_item_ui_iter (context->gimp);
+       list;
+       list = g_list_next (list))
+    {
+      GimpToolItem *tool_item = list->data;
+
+      gimp_tool_palette_add_button (palette, tool_item, -1);
+    }
+
+  g_signal_connect_object (context->gimp->tool_item_ui_list, "add",
+                           G_CALLBACK (gimp_tool_palette_tool_add),
+                           palette, 0);
+  g_signal_connect_object (context->gimp->tool_item_ui_list, "remove",
+                           G_CALLBACK (gimp_tool_palette_tool_remove),
+                           palette, 0);
+  g_signal_connect_object (context->gimp->tool_item_ui_list, "reorder",
+                           G_CALLBACK (gimp_tool_palette_tool_reorder),
+                           palette, 0);
+
+  g_signal_connect (GIMP_GUI_CONFIG (context->gimp->config),
+                    "notify::toolbox-group-menu-mode",
+                    G_CALLBACK (gimp_tool_palette_config_menu_mode_notify),
+                    palette);
+  gimp_tool_palette_update_show_menu_on_hover (palette);
+
+  /* Update the toolbox icon size on config change. */
+  g_signal_connect (GIMP_GUI_CONFIG (context->gimp->config),
+                    "size-changed",
+                    G_CALLBACK (gimp_tool_palette_config_size_changed),
+                    palette);
+  gimp_tool_palette_config_size_changed (GIMP_GUI_CONFIG (context->gimp->config),
+                                         palette);
+}
+
+gboolean
+gimp_tool_palette_get_button_size (GimpToolPalette *palette,
+                                   gint            *width,
+                                   gint            *height)
+{
+  GimpToolPalettePrivate *private;
+  GHashTableIter          iter;
+  GtkWidget              *tool_button;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_PALETTE (palette), FALSE);
+  g_return_val_if_fail (width != NULL, FALSE);
+  g_return_val_if_fail (height != NULL, FALSE);
+
+  private = GET_PRIVATE (palette);
+
+  g_hash_table_iter_init (&iter, private->buttons);
+
+  if (g_hash_table_iter_next (&iter, NULL, (gpointer *) &tool_button))
+    {
+      GtkRequisition button_requisition;
+
+      gtk_widget_size_request (tool_button, &button_requisition);
+
+      *width  = button_requisition.width;
+      *height = button_requisition.height;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tool_palette_tool_add (GimpContainer   *container,
+                            GimpToolItem    *tool_item,
+                            GimpToolPalette *palette)
+{
+  gimp_tool_palette_add_button (
+    palette,
+    tool_item,
+    gimp_container_get_child_index (container, GIMP_OBJECT (tool_item)));
+}
+
+static void
+gimp_tool_palette_tool_remove (GimpContainer   *container,
+                               GimpToolItem    *tool_item,
+                               GimpToolPalette *palette)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+  GtkWidget              *tool_button;
+
+  tool_button = g_hash_table_lookup (private->buttons, tool_item);
+
+  if (tool_button)
+    {
+      g_hash_table_remove (private->buttons, tool_item);
+
+      gtk_container_remove (GTK_CONTAINER (private->group), tool_button);
+    }
+}
+
+static void
+gimp_tool_palette_tool_reorder (GimpContainer   *container,
+                                GimpToolItem    *tool_item,
+                                gint             index,
+                                GimpToolPalette *palette)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+  GtkWidget              *tool_button;
+
+  tool_button = g_hash_table_lookup (private->buttons, tool_item);
+
+  if (tool_button)
+    {
+      gtk_tool_item_group_set_item_position (
+        GTK_TOOL_ITEM_GROUP (private->group),
+        GTK_TOOL_ITEM (tool_button), index);
+    }
+}
+
+static void
+gimp_tool_palette_config_menu_mode_notify (GimpGuiConfig    *config,
+                                           const GParamSpec *pspec,
+                                           GimpToolPalette  *palette)
+{
+  gimp_tool_palette_update_show_menu_on_hover (palette);
+}
+
+static void
+gimp_tool_palette_config_size_changed (GimpGuiConfig   *config,
+                                       GimpToolPalette *palette)
+{
+  GimpIconSize size;
+  GtkIconSize  tool_icon_size;
+
+  size = gimp_gui_config_detect_icon_size (config);
+  /* Match GimpIconSize with GtkIconSize for the toolbox icons. */
+  switch (size)
+    {
+    case GIMP_ICON_SIZE_SMALL:
+      tool_icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
+      break;
+    case GIMP_ICON_SIZE_MEDIUM:
+      tool_icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
+      break;
+    case GIMP_ICON_SIZE_LARGE:
+      tool_icon_size = GTK_ICON_SIZE_DND;
+      break;
+    case GIMP_ICON_SIZE_HUGE:
+      tool_icon_size = GTK_ICON_SIZE_DIALOG;
+      break;
+    default:
+      /* GIMP_ICON_SIZE_DEFAULT:
+       * let's use the size set by the theme. */
+      gtk_widget_style_get (GTK_WIDGET (palette),
+                            "tool-icon-size", &tool_icon_size,
+                            NULL);
+      break;
+    }
+
+  gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (palette), tool_icon_size);
+}
+
+static void
+gimp_tool_palette_add_button (GimpToolPalette *palette,
+                              GimpToolItem    *tool_item,
+                              gint             index)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+  GtkToolItem            *tool_button;
+  GtkWidget              *button;
+  GtkReliefStyle          relief;
+
+  tool_button = gimp_tool_button_new (private->toolbox, tool_item);
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (private->group),
+                              tool_button, index);
+  gimp_tool_button_set_show_menu_on_hover (
+    GIMP_TOOL_BUTTON (tool_button),
+    gimp_tool_palette_get_show_menu_on_hover (palette));
+  gtk_widget_show (GTK_WIDGET (tool_button));
+
+  g_object_bind_property (tool_item,   "shown",
+                          tool_button, "visible-horizontal",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (tool_item,   "shown",
+                          tool_button, "visible-vertical",
+                          G_BINDING_SYNC_CREATE);
+
+  button = gtk_bin_get_child (GTK_BIN (tool_button));
+
+  gtk_widget_style_get (GTK_WIDGET (palette),
+                        "button-relief", &relief,
+                        NULL);
+
+  gtk_button_set_relief (GTK_BUTTON (button), relief);
+
+  g_hash_table_insert (private->buttons, tool_item, tool_button);
+}
+
+static gboolean
+gimp_tool_palette_get_show_menu_on_hover (GimpToolPalette *palette)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+
+  if (private->toolbox)
+    {
+      GimpContext *context = gimp_toolbox_get_context (private->toolbox);
+
+      if (context)
+        {
+          GimpGuiConfig *config = GIMP_GUI_CONFIG (context->gimp->config);
+
+          switch (config->toolbox_group_menu_mode)
+            {
+            case GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_CLICK:
+              return FALSE;
+
+            case GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER:
+              return TRUE;
+
+            case GIMP_TOOL_GROUP_MENU_MODE_SHOW_ON_HOVER_SINGLE_COLUMN:
+              return private->tool_columns == 1;
+            }
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_tool_palette_update_show_menu_on_hover (GimpToolPalette *palette)
+{
+  GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+  GHashTableIter          iter;
+  GimpToolButton         *tool_button;
+  gboolean                show_menu_on_hover;
+
+  show_menu_on_hover = gimp_tool_palette_get_show_menu_on_hover (palette);
+
+  g_hash_table_iter_init (&iter, private->buttons);
+
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &tool_button))
+    {
+      gimp_tool_button_set_show_menu_on_hover (tool_button, show_menu_on_hover);
+    }
+}
diff --git a/app/widgets/gimptoolpalette.h b/app/widgets/gimptoolpalette.h
new file mode 100644
index 0000000..d451a36
--- /dev/null
+++ b/app/widgets/gimptoolpalette.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpalette.h
+ * Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PALETTE_H__
+#define __GIMP_TOOL_PALETTE_H__
+
+
+#define GIMP_TYPE_TOOL_PALETTE            (gimp_tool_palette_get_type ())
+#define GIMP_TOOL_PALETTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_PALETTE, GimpToolPalette))
+#define GIMP_TOOL_PALETTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_PALETTE, GimpToolPaletteClass))
+#define GIMP_IS_TOOL_PALETTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_PALETTE))
+#define GIMP_IS_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_PALETTE))
+#define GIMP_TOOL_PALETTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_PALETTE, GimpToolPaletteClass))
+
+
+typedef struct _GimpToolPaletteClass GimpToolPaletteClass;
+
+struct _GimpToolPalette
+{
+  GtkToolPalette  parent_instance;
+};
+
+struct _GimpToolPaletteClass
+{
+  GtkToolPaletteClass  parent_class;
+};
+
+
+GType       gimp_tool_palette_get_type        (void) G_GNUC_CONST;
+
+GtkWidget * gimp_tool_palette_new             (void);
+void        gimp_tool_palette_set_toolbox     (GimpToolPalette   *palette,
+                                               GimpToolbox       *toolbox);
+gboolean    gimp_tool_palette_get_button_size (GimpToolPalette   *palette,
+                                               gint              *width,
+                                               gint              *height);
+
+
+#endif /* __GIMP_TOOL_PALETTE_H__ */
diff --git a/app/widgets/gimptoolpreseteditor.c b/app/widgets/gimptoolpreseteditor.c
new file mode 100644
index 0000000..e0d0d0b
--- /dev/null
+++ b/app/widgets/gimptoolpreseteditor.c
@@ -0,0 +1,385 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
+#include "core/gimptoolpreset.h"
+
+#include "gimpdocked.h"
+#include "gimptoolpreseteditor.h"
+#include "gimpmenufactory.h"
+#include "gimppropwidgets.h"
+
+#include "gimp-intl.h"
+
+
+struct _GimpToolPresetEditorPrivate
+{
+  GimpToolPreset *tool_preset_model;
+
+  GtkWidget      *tool_icon;
+  GtkWidget      *tool_label;
+
+  GtkWidget      *fg_bg_toggle;
+  GtkWidget      *opacity_paint_mode_toggle;
+  GtkWidget      *brush_toggle;
+  GtkWidget      *dynamics_toggle;
+  GtkWidget      *mybrush_toggle;
+  GtkWidget      *gradient_toggle;
+  GtkWidget      *pattern_toggle;
+  GtkWidget      *palette_toggle;
+  GtkWidget      *font_toggle;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_tool_preset_editor_constructed  (GObject              *object);
+static void   gimp_tool_preset_editor_finalize     (GObject              *object);
+
+static void   gimp_tool_preset_editor_set_data     (GimpDataEditor       *editor,
+                                                    GimpData             *data);
+
+static void   gimp_tool_preset_editor_sync_data    (GimpToolPresetEditor *editor);
+static void   gimp_tool_preset_editor_notify_model (GimpToolPreset       *options,
+                                                    const GParamSpec     *pspec,
+                                                    GimpToolPresetEditor *editor);
+static void   gimp_tool_preset_editor_notify_data  (GimpToolPreset       *options,
+                                                    const GParamSpec     *pspec,
+                                                    GimpToolPresetEditor *editor);
+
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpToolPresetEditor, gimp_tool_preset_editor,
+                         GIMP_TYPE_DATA_EDITOR,
+                         G_ADD_PRIVATE (GimpToolPresetEditor)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED, NULL))
+
+#define parent_class gimp_tool_preset_editor_parent_class
+
+
+static void
+gimp_tool_preset_editor_class_init (GimpToolPresetEditorClass *klass)
+{
+  GObjectClass        *object_class = G_OBJECT_CLASS (klass);
+  GimpDataEditorClass *editor_class = GIMP_DATA_EDITOR_CLASS (klass);
+
+  object_class->constructed = gimp_tool_preset_editor_constructed;
+  object_class->finalize    = gimp_tool_preset_editor_finalize;
+
+  editor_class->set_data    = gimp_tool_preset_editor_set_data;
+  editor_class->title       = _("Tool Preset Editor");
+}
+
+static void
+gimp_tool_preset_editor_init (GimpToolPresetEditor *editor)
+{
+  editor->priv = gimp_tool_preset_editor_get_instance_private (editor);
+}
+
+static void
+gimp_tool_preset_editor_constructed (GObject *object)
+{
+  GimpToolPresetEditor *editor      = GIMP_TOOL_PRESET_EDITOR (object);
+  GimpDataEditor       *data_editor = GIMP_DATA_EDITOR (editor);
+  GimpToolPreset       *preset;
+  GtkWidget            *hbox;
+  GtkWidget            *label;
+  GtkWidget            *button;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  preset = editor->priv->tool_preset_model =
+    g_object_new (GIMP_TYPE_TOOL_PRESET,
+                  "gimp", data_editor->context->gimp,
+                  NULL);
+
+  g_signal_connect (preset, "notify",
+                    G_CALLBACK (gimp_tool_preset_editor_notify_model),
+                    editor);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (data_editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  editor->priv->tool_icon = gtk_image_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), editor->priv->tool_icon,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->priv->tool_icon);
+
+  editor->priv->tool_label = gtk_label_new ("");
+  gimp_label_set_attributes (GTK_LABEL (editor->priv->tool_label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (hbox), editor->priv->tool_label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (editor->priv->tool_label);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+  gtk_box_pack_start (GTK_BOX (data_editor), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Icon:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  button = gimp_prop_icon_picker_new (GIMP_VIEWABLE (preset),
+                                      data_editor->context->gimp);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->fg_bg_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-fg-bg", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->opacity_paint_mode_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-opacity-paint-mode", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+
+  button = editor->priv->brush_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-brush", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->dynamics_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-dynamics", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->mybrush_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-mypaint-brush", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->gradient_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-gradient", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->pattern_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-pattern", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->palette_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-palette", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = editor->priv->font_toggle =
+    gimp_prop_check_button_new (G_OBJECT (preset), "use-font", NULL);
+  gtk_box_pack_start (GTK_BOX (data_editor), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (editor),
+                                          "tool-preset-editor",
+                                          "tool-preset-editor-save", NULL);
+
+  button = gimp_editor_add_action_button (GIMP_EDITOR (editor),
+                                          "tool-preset-editor",
+                                          "tool-preset-editor-restore", NULL);
+
+  if (data_editor->data)
+    gimp_tool_preset_editor_sync_data (editor);
+}
+
+static void
+gimp_tool_preset_editor_finalize (GObject *object)
+{
+  GimpToolPresetEditor *editor = GIMP_TOOL_PRESET_EDITOR (object);
+
+  g_clear_object (&editor->priv->tool_preset_model);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_tool_preset_editor_set_data (GimpDataEditor *editor,
+                                  GimpData       *data)
+{
+  GimpToolPresetEditor *preset_editor = GIMP_TOOL_PRESET_EDITOR (editor);
+
+  if (editor->data)
+    g_signal_handlers_disconnect_by_func (editor->data,
+                                          gimp_tool_preset_editor_notify_data,
+                                          editor);
+
+  GIMP_DATA_EDITOR_CLASS (parent_class)->set_data (editor, data);
+
+  if (editor->data)
+    {
+      g_signal_connect (editor->data, "notify",
+                        G_CALLBACK (gimp_tool_preset_editor_notify_data),
+                        editor);
+
+      if (preset_editor->priv->tool_preset_model)
+        gimp_tool_preset_editor_sync_data (preset_editor);
+    }
+
+  gtk_widget_set_sensitive (GTK_WIDGET (editor), editor->data_editable);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_tool_preset_editor_new (GimpContext     *context,
+                             GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_TOOL_PRESET_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<ToolPresetEditor>",
+                       "ui-path",         "/tool-preset-editor-popup",
+                       "data-factory",    context->gimp->tool_preset_factory,
+                       "context",         context,
+                       "data",            gimp_context_get_tool_preset (context),
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tool_preset_editor_sync_data (GimpToolPresetEditor *editor)
+{
+  GimpToolPresetEditorPrivate *priv        = editor->priv;
+  GimpDataEditor              *data_editor = GIMP_DATA_EDITOR (editor);
+  GimpToolPreset              *preset;
+  GimpToolInfo                *tool_info;
+  GimpContextPropMask          serialize_props;
+  const gchar                 *icon_name;
+  gchar                       *label;
+
+  g_signal_handlers_block_by_func (priv->tool_preset_model,
+                                   gimp_tool_preset_editor_notify_model,
+                                   editor);
+
+  gimp_config_sync (G_OBJECT (data_editor->data),
+                    G_OBJECT (priv->tool_preset_model),
+                    GIMP_CONFIG_PARAM_SERIALIZE);
+
+  g_signal_handlers_unblock_by_func (priv->tool_preset_model,
+                                     gimp_tool_preset_editor_notify_model,
+                                     editor);
+
+  if (! priv->tool_preset_model->tool_options)
+    return;
+
+  tool_info = priv->tool_preset_model->tool_options->tool_info;
+
+  icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+  label     = g_strdup_printf (_("%s Preset"), tool_info->label);
+
+  gtk_image_set_from_icon_name (GTK_IMAGE (priv->tool_icon),
+                                icon_name, GTK_ICON_SIZE_MENU);
+  gtk_label_set_text (GTK_LABEL (priv->tool_label), label);
+
+  g_free (label);
+
+  preset = GIMP_TOOL_PRESET (data_editor->data);
+
+  serialize_props =
+    gimp_context_get_serialize_properties (GIMP_CONTEXT (preset->tool_options));
+
+  gtk_widget_set_sensitive (priv->fg_bg_toggle,
+                            (serialize_props &
+                             (GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+                              GIMP_CONTEXT_PROP_MASK_BACKGROUND)) != 0);
+  gtk_widget_set_sensitive (priv->opacity_paint_mode_toggle,
+                            (serialize_props &
+                             (GIMP_CONTEXT_PROP_MASK_OPACITY |
+                              GIMP_CONTEXT_PROP_MASK_PAINT_MODE)) != 0);
+  gtk_widget_set_sensitive (priv->brush_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_BRUSH) != 0);
+  gtk_widget_set_sensitive (priv->dynamics_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_DYNAMICS) != 0);
+  gtk_widget_set_sensitive (priv->mybrush_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_MYBRUSH) != 0);
+  gtk_widget_set_sensitive (priv->gradient_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_GRADIENT) != 0);
+  gtk_widget_set_sensitive (priv->pattern_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_PATTERN) != 0);
+  gtk_widget_set_sensitive (priv->palette_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_PALETTE) != 0);
+  gtk_widget_set_sensitive (priv->font_toggle,
+                            (serialize_props &
+                             GIMP_CONTEXT_PROP_MASK_FONT) != 0);
+ }
+
+static void
+gimp_tool_preset_editor_notify_model (GimpToolPreset       *options,
+                                      const GParamSpec     *pspec,
+                                      GimpToolPresetEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  if (data_editor->data)
+    {
+      g_signal_handlers_block_by_func (data_editor->data,
+                                       gimp_tool_preset_editor_notify_data,
+                                       editor);
+
+      gimp_config_sync (G_OBJECT (editor->priv->tool_preset_model),
+                        G_OBJECT (data_editor->data),
+                        GIMP_CONFIG_PARAM_SERIALIZE);
+
+      g_signal_handlers_unblock_by_func (data_editor->data,
+                                         gimp_tool_preset_editor_notify_data,
+                                         editor);
+    }
+}
+
+static void
+gimp_tool_preset_editor_notify_data (GimpToolPreset       *options,
+                                     const GParamSpec     *pspec,
+                                     GimpToolPresetEditor *editor)
+{
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
+
+  g_signal_handlers_block_by_func (editor->priv->tool_preset_model,
+                                   gimp_tool_preset_editor_notify_model,
+                                   editor);
+
+  gimp_config_sync (G_OBJECT (data_editor->data),
+                    G_OBJECT (editor->priv->tool_preset_model),
+                    GIMP_CONFIG_PARAM_SERIALIZE);
+
+  g_signal_handlers_unblock_by_func (editor->priv->tool_preset_model,
+                                     gimp_tool_preset_editor_notify_model,
+                                     editor);
+}
diff --git a/app/widgets/gimptoolpreseteditor.h b/app/widgets/gimptoolpreseteditor.h
new file mode 100644
index 0000000..af08108
--- /dev/null
+++ b/app/widgets/gimptoolpreseteditor.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PRESET_EDITOR_H__
+#define __GIMP_TOOL_PRESET_EDITOR_H__
+
+
+#include "gimpdataeditor.h"
+
+
+#define GIMP_TYPE_TOOL_PRESET_EDITOR            (gimp_tool_preset_editor_get_type ())
+#define GIMP_TOOL_PRESET_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_PRESET_EDITOR, GimpToolPresetEditor))
+#define GIMP_TOOL_PRESET_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_PRESET_EDITOR, GimpToolPresetEditorClass))
+#define GIMP_IS_TOOL_PRESET_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_PRESET_EDITOR))
+#define GIMP_IS_TOOL_PRESET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_PRESET_EDITOR))
+#define GIMP_TOOL_PRESET_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_PRESET_EDITOR, GimpToolPresetEditorClass))
+
+
+typedef struct _GimpToolPresetEditorPrivate GimpToolPresetEditorPrivate;
+typedef struct _GimpToolPresetEditorClass   GimpToolPresetEditorClass;
+
+struct _GimpToolPresetEditor
+{
+  GimpDataEditor               parent_instance;
+
+  GimpToolPresetEditorPrivate *priv;
+};
+
+struct _GimpToolPresetEditorClass
+{
+  GimpDataEditorClass  parent_class;
+};
+
+
+GType       gimp_tool_preset_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_tool_preset_editor_new      (GimpContext     *context,
+                                              GimpMenuFactory *menu_factory);
+
+
+#endif /* __GIMP_TOOL_PRESET_EDITOR_H__ */
diff --git a/app/widgets/gimptoolpresetfactoryview.c b/app/widgets/gimptoolpresetfactoryview.c
new file mode 100644
index 0000000..916ab59
--- /dev/null
+++ b/app/widgets/gimptoolpresetfactoryview.c
@@ -0,0 +1,103 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptoolpresetfactoryview.c
+ * Copyright (C) 2010 Alexia Death
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimpviewable.h"
+
+#include "gimpeditor.h"
+#include "gimpmenufactory.h"
+#include "gimptoolpresetfactoryview.h"
+#include "gimpviewrenderer.h"
+
+
+G_DEFINE_TYPE (GimpToolPresetFactoryView, gimp_tool_preset_factory_view,
+               GIMP_TYPE_DATA_FACTORY_VIEW)
+
+
+static void
+gimp_tool_preset_factory_view_class_init (GimpToolPresetFactoryViewClass *klass)
+{
+}
+
+static void
+gimp_tool_preset_factory_view_init (GimpToolPresetFactoryView *view)
+{
+}
+
+GtkWidget *
+gimp_tool_preset_factory_view_new (GimpViewType      view_type,
+                                   GimpDataFactory  *factory,
+                                   GimpContext      *context,
+                                   gint              view_size,
+                                   gint              view_border_width,
+                                   GimpMenuFactory  *menu_factory)
+{
+  GimpToolPresetFactoryView *factory_view;
+  GimpEditor                *editor;
+  GtkWidget                 *button;
+
+  g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size > 0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (menu_factory == NULL ||
+                        GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  factory_view = g_object_new (GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW,
+                               "view-type",         view_type,
+                               "data-factory",      factory,
+                               "context",           context,
+                               "view-size",         view_size,
+                               "view-border-width", view_border_width,
+                               "menu-factory",      menu_factory,
+                               "menu-identifier",   "<ToolPresets>",
+                               "ui-path",           "/tool-presets-popup",
+                               "action-group",      "tool-presets",
+                               NULL);
+
+  gtk_widget_hide (gimp_data_factory_view_get_duplicate_button (GIMP_DATA_FACTORY_VIEW (factory_view)));
+
+  editor = GIMP_EDITOR (GIMP_CONTAINER_EDITOR (factory_view)->view);
+
+  button = gimp_editor_add_action_button (editor, "tool-presets",
+                                          "tool-presets-save", NULL);
+  gtk_box_reorder_child (gimp_editor_get_button_box (editor),
+                         button, 2);
+
+  button = gimp_editor_add_action_button (editor, "tool-presets",
+                                          "tool-presets-restore", NULL);
+  gtk_box_reorder_child (gimp_editor_get_button_box (editor),
+                         button, 3);
+
+  return GTK_WIDGET (factory_view);
+}
diff --git a/app/widgets/gimptoolpresetfactoryview.h b/app/widgets/gimptoolpresetfactoryview.h
new file mode 100644
index 0000000..9c05871
--- /dev/null
+++ b/app/widgets/gimptoolpresetfactoryview.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptool_presetfactoryview.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TOOL_PRESET_FACTORY_VIEW_H__
+#define __GIMP_TOOL_PRESET_FACTORY_VIEW_H__
+
+#include "gimpdatafactoryview.h"
+
+
+#define GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW            (gimp_tool_preset_factory_view_get_type ())
+#define GIMP_TOOL_PRESET_FACTORY_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW, GimpToolPresetFactoryView))
+#define GIMP_TOOL_PRESET_FACTORY_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW, GimpToolPresetFactoryViewClass))
+#define GIMP_IS_TOOL_PRESET_FACTORY_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW))
+#define GIMP_IS_TOOL_PRESET_FACTORY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW))
+#define GIMP_TOOL_PRESET_FACTORY_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW, GimpToolPresetFactoryViewClass))
+
+
+typedef struct _GimpToolPresetFactoryViewClass  GimpToolPresetFactoryViewClass;
+
+struct _GimpToolPresetFactoryView
+{
+  GimpDataFactoryView  parent_instance;
+};
+
+struct _GimpToolPresetFactoryViewClass
+{
+  GimpDataFactoryViewClass  parent_class;
+};
+
+
+GType       gimp_tool_preset_factory_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_tool_preset_factory_view_new     (GimpViewType     view_type,
+                                                   GimpDataFactory *factory,
+                                                   GimpContext     *context,
+                                                   gint             view_size,
+                                                   gint             view_border_width,
+                                                   GimpMenuFactory *menu_factory);
+
+
+#endif  /*  __GIMP_TOOL_PRESET_FACTORY_VIEW_H__  */
diff --git a/app/widgets/gimptranslationstore.c b/app/widgets/gimptranslationstore.c
new file mode 100644
index 0000000..6526bbc
--- /dev/null
+++ b/app/widgets/gimptranslationstore.c
@@ -0,0 +1,192 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptranslationstore.c
+ * Copyright (C) 2008, 2009  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <locale.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "widgets-types.h"
+
+#include "gimphelp.h"
+#include "gimplanguagestore-parser.h"
+#include "gimptranslationstore.h"
+
+#include "gimp-intl.h"
+
+enum
+{
+  PROP_0,
+  PROP_MANUAL_L18N,
+  PROP_EMPTY_LABEL
+};
+
+struct _GimpTranslationStoreClass
+{
+  GimpLanguageStoreClass  parent_class;
+};
+
+struct _GimpTranslationStore
+{
+  GimpLanguageStore  parent_instance;
+
+  gboolean           manual_l18n;
+  gchar             *empty_label;
+};
+
+
+static void   gimp_translation_store_constructed  (GObject           *object);
+static void   gimp_translation_store_set_property (GObject           *object,
+                                                   guint              property_id,
+                                                   const GValue      *value,
+                                                   GParamSpec        *pspec);
+static void   gimp_translation_store_get_property (GObject           *object,
+                                                   guint              property_id,
+                                                   GValue            *value,
+                                                   GParamSpec        *pspec);
+
+
+G_DEFINE_TYPE (GimpTranslationStore, gimp_translation_store,
+               GIMP_TYPE_LANGUAGE_STORE)
+
+#define parent_class gimp_translation_store_parent_class
+
+
+static void
+gimp_translation_store_class_init (GimpTranslationStoreClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed  = gimp_translation_store_constructed;
+  object_class->set_property = gimp_translation_store_set_property;
+  object_class->get_property = gimp_translation_store_get_property;
+
+  g_object_class_install_property (object_class, PROP_MANUAL_L18N,
+                                   g_param_spec_boolean ("manual-l18n", NULL, NULL,
+                                                         FALSE,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class, PROP_EMPTY_LABEL,
+                                   g_param_spec_string ("empty-label", NULL, NULL,
+                                                         NULL,
+                                                         GIMP_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_translation_store_init (GimpTranslationStore *store)
+{
+}
+
+static void
+gimp_translation_store_constructed (GObject *object)
+{
+  GHashTable     *lang_list;
+  GHashTableIter  lang_iter;
+  gpointer        code;
+  gpointer        name;
+  GList          *sublist = NULL;
+
+  lang_list = gimp_language_store_parser_get_languages (TRUE);
+  g_return_if_fail (lang_list != NULL);
+
+  if (GIMP_TRANSLATION_STORE (object)->manual_l18n)
+    sublist = gimp_help_get_installed_languages ();
+
+  g_hash_table_iter_init (&lang_iter, lang_list);
+
+  if (GIMP_TRANSLATION_STORE (object)->manual_l18n &&
+      GIMP_TRANSLATION_STORE (object)->empty_label)
+    {
+      GIMP_LANGUAGE_STORE_GET_CLASS (object)->add (GIMP_LANGUAGE_STORE (object),
+                                                   GIMP_TRANSLATION_STORE (object)->empty_label,
+                                                   "");
+    }
+  while (g_hash_table_iter_next (&lang_iter, &code, &name))
+    {
+      if (! GIMP_TRANSLATION_STORE (object)->manual_l18n ||
+          g_list_find_custom (sublist, code, (GCompareFunc) g_strcmp0))
+        {
+          GIMP_LANGUAGE_STORE_GET_CLASS (object)->add (GIMP_LANGUAGE_STORE (object),
+                                                       name, code);
+        }
+    }
+  g_list_free_full (sublist, g_free);
+}
+
+static void
+gimp_translation_store_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GimpTranslationStore *store = GIMP_TRANSLATION_STORE (object);
+
+  switch (property_id)
+    {
+    case PROP_MANUAL_L18N:
+      store->manual_l18n = g_value_get_boolean (value);
+      break;
+    case PROP_EMPTY_LABEL:
+      store->empty_label = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_translation_store_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GimpTranslationStore *store = GIMP_TRANSLATION_STORE (object);
+
+  switch (property_id)
+    {
+    case PROP_MANUAL_L18N:
+      g_value_set_boolean (value, store->manual_l18n);
+      break;
+    case PROP_EMPTY_LABEL:
+      g_value_set_string (value, store->empty_label);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkListStore *
+gimp_translation_store_new (gboolean     manual_l18n,
+                            const gchar *empty_label)
+{
+  return g_object_new (GIMP_TYPE_TRANSLATION_STORE,
+                       "manual-l18n", manual_l18n,
+                       "empty-label", empty_label,
+                       NULL);
+}
diff --git a/app/widgets/gimptranslationstore.h b/app/widgets/gimptranslationstore.h
new file mode 100644
index 0000000..55da9d3
--- /dev/null
+++ b/app/widgets/gimptranslationstore.h
@@ -0,0 +1,45 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptranslationstore.h
+ * Copyright (C) 2009  Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_TRANSLATION_STORE_H__
+#define __GIMP_TRANSLATION_STORE_H__
+
+
+#include "gimplanguagestore.h"
+
+
+#define GIMP_TYPE_TRANSLATION_STORE            (gimp_translation_store_get_type ())
+#define GIMP_TRANSLATION_STORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TRANSLATION_STORE, GimpTranslationStore))
+#define GIMP_TRANSLATION_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TRANSLATION_STORE, GimpTranslationStoreClass))
+#define GIMP_IS_TRANSLATION_STORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TRANSLATION_STORE))
+#define GIMP_IS_TRANSLATION_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TRANSLATION_STORE))
+#define GIMP_TRANSLATION_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TRANSLATION_STORE, GimpTranslationStoreClass))
+
+
+typedef struct _GimpTranslationStoreClass  GimpTranslationStoreClass;
+
+
+GType          gimp_translation_store_get_type (void) G_GNUC_CONST;
+
+GtkListStore * gimp_translation_store_new      (gboolean     manual_l18n,
+                                                const gchar *empty_label);
+
+
+#endif  /* __GIMP_TRANSLATION_STORE_H__ */
diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c
new file mode 100644
index 0000000..59c795c
--- /dev/null
+++ b/app/widgets/gimpuimanager.c
@@ -0,0 +1,1369 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpuimanager.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#undef GSEAL_ENABLE
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpmarshal.h"
+
+#include "gimpaction.h"
+#include "gimpactiongroup.h"
+#include "gimphelp.h"
+#include "gimphelp-ids.h"
+#include "gimptoggleaction.h"
+#include "gimpuimanager.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_NAME,
+  PROP_GIMP
+};
+
+enum
+{
+  UPDATE,
+  SHOW_TOOLTIP,
+  HIDE_TOOLTIP,
+  LAST_SIGNAL
+};
+
+
+static void       gimp_ui_manager_constructed         (GObject        *object);
+static void       gimp_ui_manager_dispose             (GObject        *object);
+static void       gimp_ui_manager_finalize            (GObject        *object);
+static void       gimp_ui_manager_set_property        (GObject        *object,
+                                                       guint           prop_id,
+                                                       const GValue   *value,
+                                                       GParamSpec     *pspec);
+static void       gimp_ui_manager_get_property        (GObject        *object,
+                                                       guint           prop_id,
+                                                       GValue         *value,
+                                                       GParamSpec     *pspec);
+static void       gimp_ui_manager_connect_proxy       (GtkUIManager   *manager,
+                                                       GtkAction      *action,
+                                                       GtkWidget      *proxy);
+static GtkWidget *gimp_ui_manager_get_widget_impl     (GtkUIManager   *manager,
+                                                       const gchar    *path);
+static GtkAction *gimp_ui_manager_get_action_impl     (GtkUIManager   *manager,
+                                                       const gchar    *path);
+static void       gimp_ui_manager_real_update         (GimpUIManager  *manager,
+                                                       gpointer        update_data);
+static GimpUIManagerUIEntry *
+                  gimp_ui_manager_entry_get           (GimpUIManager  *manager,
+                                                       const gchar    *ui_path);
+static gboolean   gimp_ui_manager_entry_load          (GimpUIManager  *manager,
+                                                       GimpUIManagerUIEntry *entry,
+                                                       GError        **error);
+static GimpUIManagerUIEntry *
+                  gimp_ui_manager_entry_ensure        (GimpUIManager  *manager,
+                                                       const gchar    *path);
+static void       gimp_ui_manager_menu_position       (GtkMenu        *menu,
+                                                       gint           *x,
+                                                       gint           *y,
+                                                       gpointer        data);
+static void       gimp_ui_manager_menu_pos            (GtkMenu        *menu,
+                                                       gint           *x,
+                                                       gint           *y,
+                                                       gboolean       *push_in,
+                                                       gpointer        data);
+static void       gimp_ui_manager_delete_popdown_data (GtkWidget      *widget,
+                                                       GimpUIManager  *manager);
+static void       gimp_ui_manager_item_realize        (GtkWidget      *widget,
+                                                       GimpUIManager  *manager);
+static void       gimp_ui_manager_menu_item_select    (GtkWidget      *widget,
+                                                       GimpUIManager  *manager);
+static void       gimp_ui_manager_menu_item_deselect  (GtkWidget      *widget,
+                                                       GimpUIManager  *manager);
+static gboolean   gimp_ui_manager_item_key_press      (GtkWidget      *widget,
+                                                       GdkEventKey    *kevent,
+                                                       GimpUIManager  *manager);
+static GtkWidget *find_widget_under_pointer           (GdkWindow      *window,
+                                                       gint           *x,
+                                                       gint           *y);
+
+
+G_DEFINE_TYPE (GimpUIManager, gimp_ui_manager, GTK_TYPE_UI_MANAGER)
+
+#define parent_class gimp_ui_manager_parent_class
+
+static guint manager_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_ui_manager_class_init (GimpUIManagerClass *klass)
+{
+  GObjectClass      *object_class  = G_OBJECT_CLASS (klass);
+  GtkUIManagerClass *manager_class = GTK_UI_MANAGER_CLASS (klass);
+
+  object_class->constructed    = gimp_ui_manager_constructed;
+  object_class->dispose        = gimp_ui_manager_dispose;
+  object_class->finalize       = gimp_ui_manager_finalize;
+  object_class->set_property   = gimp_ui_manager_set_property;
+  object_class->get_property   = gimp_ui_manager_get_property;
+
+  manager_class->connect_proxy = gimp_ui_manager_connect_proxy;
+  manager_class->get_widget    = gimp_ui_manager_get_widget_impl;
+  manager_class->get_action    = gimp_ui_manager_get_action_impl;
+
+  klass->update                = gimp_ui_manager_real_update;
+
+  manager_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpUIManagerClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__POINTER,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_POINTER);
+
+  manager_signals[SHOW_TOOLTIP] =
+    g_signal_new ("show-tooltip",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpUIManagerClass, show_tooltip),
+                  NULL, NULL,
+                  gimp_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
+  manager_signals[HIDE_TOOLTIP] =
+    g_signal_new ("hide-tooltip",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GimpUIManagerClass, hide_tooltip),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0,
+                  G_TYPE_NONE);
+
+  g_object_class_install_property (object_class, PROP_NAME,
+                                   g_param_spec_string ("name",
+                                                        NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_GIMP,
+                                   g_param_spec_object ("gimp",
+                                                        NULL, NULL,
+                                                        GIMP_TYPE_GIMP,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  klass->managers = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                           g_free, NULL);
+}
+
+static void
+gimp_ui_manager_init (GimpUIManager *manager)
+{
+  manager->name = NULL;
+  manager->gimp = NULL;
+}
+
+static void
+gimp_ui_manager_constructed (GObject *object)
+{
+  GimpUIManager *manager = GIMP_UI_MANAGER (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  if (manager->name)
+    {
+      GimpUIManagerClass *manager_class;
+      GList              *list;
+
+      manager_class = GIMP_UI_MANAGER_GET_CLASS (object);
+
+      list = g_hash_table_lookup (manager_class->managers, manager->name);
+
+      list = g_list_append (list, manager);
+
+      g_hash_table_replace (manager_class->managers,
+                            g_strdup (manager->name), list);
+    }
+}
+
+static void
+gimp_ui_manager_dispose (GObject *object)
+{
+  GimpUIManager *manager = GIMP_UI_MANAGER (object);
+
+  if (manager->name)
+    {
+      GimpUIManagerClass *manager_class;
+      GList              *list;
+
+      manager_class = GIMP_UI_MANAGER_GET_CLASS (object);
+
+      list = g_hash_table_lookup (manager_class->managers, manager->name);
+
+      if (list)
+        {
+          list = g_list_remove (list, manager);
+
+          if (list)
+            g_hash_table_replace (manager_class->managers,
+                                  g_strdup (manager->name), list);
+          else
+            g_hash_table_remove (manager_class->managers, manager->name);
+        }
+    }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_ui_manager_finalize (GObject *object)
+{
+  GimpUIManager *manager = GIMP_UI_MANAGER (object);
+  GList         *list;
+
+  for (list = manager->registered_uis; list; list = g_list_next (list))
+    {
+      GimpUIManagerUIEntry *entry = list->data;
+
+      g_free (entry->ui_path);
+      g_free (entry->basename);
+
+      if (entry->widget)
+        g_object_unref (entry->widget);
+
+      g_slice_free (GimpUIManagerUIEntry, entry);
+    }
+
+  g_clear_pointer (&manager->registered_uis, g_list_free);
+  g_clear_pointer (&manager->name,           g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_ui_manager_set_property (GObject      *object,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GimpUIManager *manager = GIMP_UI_MANAGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_NAME:
+      g_free (manager->name);
+      manager->name = g_value_dup_string (value);
+      break;
+
+    case PROP_GIMP:
+      manager->gimp = g_value_get_object (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_ui_manager_get_property (GObject    *object,
+                              guint       prop_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GimpUIManager *manager = GIMP_UI_MANAGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_NAME:
+      g_value_set_string (value, manager->name);
+      break;
+
+    case PROP_GIMP:
+      g_value_set_object (value, manager->gimp);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_ui_manager_connect_proxy (GtkUIManager *manager,
+                               GtkAction    *action,
+                               GtkWidget    *proxy)
+{
+  g_object_set_qdata (G_OBJECT (proxy), GIMP_HELP_ID,
+                      g_object_get_qdata (G_OBJECT (action), GIMP_HELP_ID));
+
+  if (GTK_IS_MENU_ITEM (proxy))
+    {
+      g_signal_connect (proxy, "select",
+                        G_CALLBACK (gimp_ui_manager_menu_item_select),
+                        manager);
+      g_signal_connect (proxy, "deselect",
+                        G_CALLBACK (gimp_ui_manager_menu_item_deselect),
+                        manager);
+
+      g_signal_connect_after (proxy, "realize",
+                              G_CALLBACK (gimp_ui_manager_item_realize),
+                              manager);
+    }
+}
+
+static GtkWidget *
+gimp_ui_manager_get_widget_impl (GtkUIManager *manager,
+                                 const gchar  *path)
+{
+  GimpUIManagerUIEntry *entry;
+
+  entry = gimp_ui_manager_entry_ensure (GIMP_UI_MANAGER (manager), path);
+
+  if (entry)
+    {
+      if (! strcmp (entry->ui_path, path))
+        return entry->widget;
+
+      return GTK_UI_MANAGER_CLASS (parent_class)->get_widget (manager, path);
+    }
+
+  return NULL;
+}
+
+static GtkAction *
+gimp_ui_manager_get_action_impl (GtkUIManager *manager,
+                                 const gchar  *path)
+{
+  if (gimp_ui_manager_entry_ensure (GIMP_UI_MANAGER (manager), path))
+    return GTK_UI_MANAGER_CLASS (parent_class)->get_action (manager, path);
+
+  return NULL;
+}
+
+static void
+gimp_ui_manager_real_update (GimpUIManager *manager,
+                             gpointer       update_data)
+{
+  GList *list;
+
+  for (list = gimp_ui_manager_get_action_groups (manager);
+       list;
+       list = g_list_next (list))
+    {
+      gimp_action_group_update (list->data, update_data);
+    }
+}
+
+/**
+ * gimp_ui_manager_new:
+ * @gimp: the @Gimp instance this ui manager belongs to
+ * @name: the UI manager's name.
+ *
+ * Creates a new #GimpUIManager object.
+ *
+ * Returns: the new #GimpUIManager
+ */
+GimpUIManager *
+gimp_ui_manager_new (Gimp        *gimp,
+                     const gchar *name)
+{
+  GimpUIManager *manager;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+
+  manager = g_object_new (GIMP_TYPE_UI_MANAGER,
+                          "name", name,
+                          "gimp", gimp,
+                          NULL);
+
+  return manager;
+}
+
+GList *
+gimp_ui_managers_from_name (const gchar *name)
+{
+  GimpUIManagerClass *manager_class;
+  GList              *list;
+
+  g_return_val_if_fail (name != NULL, NULL);
+
+  manager_class = g_type_class_ref (GIMP_TYPE_UI_MANAGER);
+
+  list = g_hash_table_lookup (manager_class->managers, name);
+
+  g_type_class_unref (manager_class);
+
+  return list;
+}
+
+void
+gimp_ui_manager_update (GimpUIManager *manager,
+                        gpointer       update_data)
+{
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+
+  g_signal_emit (manager, manager_signals[UPDATE], 0, update_data);
+}
+
+void
+gimp_ui_manager_insert_action_group (GimpUIManager   *manager,
+                                     GimpActionGroup *group,
+                                     gint             pos)
+{
+  gtk_ui_manager_insert_action_group ((GtkUIManager *) manager,
+                                      (GtkActionGroup *) group,
+                                      pos);
+}
+
+GimpActionGroup *
+gimp_ui_manager_get_action_group (GimpUIManager *manager,
+                                  const gchar   *name)
+{
+  GList *list;
+
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  for (list = gimp_ui_manager_get_action_groups (manager);
+       list;
+       list = g_list_next (list))
+    {
+      GimpActionGroup *group = list->data;
+
+      if (! strcmp (name, gimp_action_group_get_name (group)))
+        return group;
+    }
+
+  return NULL;
+}
+
+GList *
+gimp_ui_manager_get_action_groups (GimpUIManager *manager)
+{
+  return gtk_ui_manager_get_action_groups ((GtkUIManager *) manager);
+}
+
+GtkAccelGroup *
+gimp_ui_manager_get_accel_group (GimpUIManager *manager)
+{
+  return gtk_ui_manager_get_accel_group ((GtkUIManager *) manager);
+}
+
+GtkWidget *
+gimp_ui_manager_get_widget (GimpUIManager *manager,
+                            const gchar   *path)
+{
+  return gtk_ui_manager_get_widget ((GtkUIManager *) manager, path);
+}
+
+gchar *
+gimp_ui_manager_get_ui (GimpUIManager *manager)
+{
+  return gtk_ui_manager_get_ui ((GtkUIManager *) manager);
+}
+
+guint
+gimp_ui_manager_new_merge_id (GimpUIManager *manager)
+{
+  return gtk_ui_manager_new_merge_id ((GtkUIManager *) manager);
+}
+
+void
+gimp_ui_manager_add_ui (GimpUIManager        *manager,
+                        guint                 merge_id,
+                        const gchar          *path,
+                        const gchar          *name,
+                        const gchar          *action,
+                        GtkUIManagerItemType  type,
+                        gboolean              top)
+{
+  gtk_ui_manager_add_ui ((GtkUIManager *) manager, merge_id,
+                         path, name, action, type, top);
+}
+
+void
+gimp_ui_manager_remove_ui (GimpUIManager *manager,
+                           guint          merge_id)
+{
+  gtk_ui_manager_remove_ui ((GtkUIManager *) manager, merge_id);
+}
+
+void
+gimp_ui_manager_ensure_update (GimpUIManager *manager)
+{
+  gtk_ui_manager_ensure_update ((GtkUIManager *) manager);
+}
+
+GimpAction *
+gimp_ui_manager_get_action (GimpUIManager *manager,
+                            const gchar   *path)
+{
+  return (GimpAction *) gtk_ui_manager_get_action ((GtkUIManager *) manager,
+                                                   path);
+}
+
+GimpAction *
+gimp_ui_manager_find_action (GimpUIManager *manager,
+                             const gchar   *group_name,
+                             const gchar   *action_name)
+{
+  GimpActionGroup *group;
+  GimpAction      *action = NULL;
+
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), NULL);
+  g_return_val_if_fail (action_name != NULL, NULL);
+
+  if (group_name)
+    {
+      group = gimp_ui_manager_get_action_group (manager, group_name);
+
+      if (group)
+        action = gimp_action_group_get_action (group, action_name);
+    }
+  else
+    {
+      GList *list;
+
+      for (list = gimp_ui_manager_get_action_groups (manager);
+           list;
+           list = g_list_next (list))
+        {
+          group = list->data;
+
+          action = gimp_action_group_get_action (group, action_name);
+
+          if (action)
+            break;
+        }
+    }
+
+  return action;
+}
+
+gboolean
+gimp_ui_manager_activate_action (GimpUIManager *manager,
+                                 const gchar   *group_name,
+                                 const gchar   *action_name)
+{
+  GimpAction *action;
+
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), FALSE);
+  g_return_val_if_fail (action_name != NULL, FALSE);
+
+  action = gimp_ui_manager_find_action (manager, group_name, action_name);
+
+  if (action)
+    gimp_action_activate (action);
+
+  return (action != NULL);
+}
+
+gboolean
+gimp_ui_manager_toggle_action (GimpUIManager *manager,
+                               const gchar   *group_name,
+                               const gchar   *action_name,
+                               gboolean       active)
+{
+  GimpAction *action;
+
+  g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), FALSE);
+  g_return_val_if_fail (action_name != NULL, FALSE);
+
+  action = gimp_ui_manager_find_action (manager, group_name, action_name);
+
+  if (GIMP_IS_TOGGLE_ACTION (action))
+    gimp_toggle_action_set_active (GIMP_TOGGLE_ACTION (action),
+                                   active ? TRUE : FALSE);
+
+  return GIMP_IS_TOGGLE_ACTION (action);
+}
+
+void
+gimp_ui_manager_ui_register (GimpUIManager          *manager,
+                             const gchar            *ui_path,
+                             const gchar            *basename,
+                             GimpUIManagerSetupFunc  setup_func)
+{
+  GimpUIManagerUIEntry *entry;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+  g_return_if_fail (basename != NULL);
+  g_return_if_fail (gimp_ui_manager_entry_get (manager, ui_path) == NULL);
+
+  entry = g_slice_new0 (GimpUIManagerUIEntry);
+
+  entry->ui_path    = g_strdup (ui_path);
+  entry->basename   = g_strdup (basename);
+  entry->setup_func = setup_func;
+  entry->merge_id   = 0;
+  entry->widget     = NULL;
+
+  manager->registered_uis = g_list_prepend (manager->registered_uis, entry);
+}
+
+
+typedef struct
+{
+  guint x;
+  guint y;
+} MenuPos;
+
+static void
+menu_pos_free (MenuPos *pos)
+{
+  g_slice_free (MenuPos, pos);
+}
+
+void
+gimp_ui_manager_ui_popup (GimpUIManager        *manager,
+                          const gchar          *ui_path,
+                          GtkWidget            *parent,
+                          GimpMenuPositionFunc  position_func,
+                          gpointer              position_data,
+                          GDestroyNotify        popdown_func,
+                          gpointer              popdown_data)
+{
+  GtkWidget *widget;
+  GdkEvent  *current_event;
+  gint       x, y;
+  guint      button;
+  guint32    activate_time;
+  MenuPos   *menu_pos;
+
+  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
+  g_return_if_fail (ui_path != NULL);
+  g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
+
+  widget = gimp_ui_manager_get_widget (manager, ui_path);
+
+  if (GTK_IS_MENU_ITEM (widget))
+    widget = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget));
+
+  if (! widget)
+    return;
+
+  g_return_if_fail (GTK_IS_MENU (widget));
+
+  if (! position_func)
+    {
+      position_func = gimp_ui_manager_menu_position;
+      position_data = parent;
+    }
+
+  (* position_func) (GTK_MENU (widget), &x, &y, position_data);
+
+  current_event = gtk_get_current_event ();
+
+  if (current_event && current_event->type == GDK_BUTTON_PRESS)
+    {
+      GdkEventButton *bevent = (GdkEventButton *) current_event;
+
+      button        = bevent->button;
+      activate_time = bevent->time;
+    }
+  else
+    {
+      button        = 0;
+      activate_time = 0;
+    }
+
+  if (current_event)
+    gdk_event_free (current_event);
+
+  menu_pos = g_object_get_data (G_OBJECT (widget), "menu-pos");
+
+  if (! menu_pos)
+    {
+      menu_pos = g_slice_new0 (MenuPos);
+      g_object_set_data_full (G_OBJECT (widget), "menu-pos", menu_pos,
+                              (GDestroyNotify) menu_pos_free);
+    }
+
+  menu_pos->x = x;
+  menu_pos->y = y;
+
+  if (popdown_func && popdown_data)
+    {
+      g_object_set_data_full (G_OBJECT (manager), "popdown-data",
+                              popdown_data, popdown_func);
+      g_signal_connect (widget, "selection-done",
+                        G_CALLBACK (gimp_ui_manager_delete_popdown_data),
+                        manager);
+    }
+
+  gtk_menu_popup (GTK_MENU (widget),
+                  NULL, NULL,
+                  gimp_ui_manager_menu_pos, menu_pos,
+                  button, activate_time);
+}
+
+
+/*  private functions  */
+
+static GimpUIManagerUIEntry *
+gimp_ui_manager_entry_get (GimpUIManager *manager,
+                           const gchar   *ui_path)
+{
+  GList *list;
+  gchar *path;
+
+  path = g_strdup (ui_path);
+
+  if (strlen (path) > 1)
+    {
+      gchar *p = strchr (path + 1, '/');
+
+      if (p)
+        *p = '\0';
+    }
+
+  for (list = manager->registered_uis; list; list = g_list_next (list))
+    {
+      GimpUIManagerUIEntry *entry = list->data;
+
+      if (! strcmp (entry->ui_path, path))
+        {
+          g_free (path);
+
+          return entry;
+        }
+    }
+
+  g_free (path);
+
+  return NULL;
+}
+
+static gboolean
+gimp_ui_manager_entry_load (GimpUIManager         *manager,
+                            GimpUIManagerUIEntry  *entry,
+                            GError               **error)
+{
+  gchar       *filename            = NULL;
+  const gchar *menus_path_override = g_getenv ("GIMP_TESTING_MENUS_PATH");
+
+  /* In order for test cases to be able to run without GIMP being
+   * installed yet, allow them to override the menus directory to the
+   * menus dir in the source root
+   */
+  if (menus_path_override)
+    {
+      GList *path = gimp_path_parse (menus_path_override, 2, FALSE, NULL);
+      GList *list;
+
+      for (list = path; list; list = g_list_next (list))
+        {
+          filename = g_build_filename (list->data, entry->basename, NULL);
+
+          if (! list->next ||
+              g_file_test (filename, G_FILE_TEST_EXISTS))
+            break;
+
+          g_free (filename);
+        }
+
+      g_list_free_full (path, g_free);
+    }
+  else
+    {
+      filename = g_build_filename (gimp_data_directory (), "menus",
+                                   entry->basename, NULL);
+    }
+
+  if (manager->gimp->be_verbose)
+    g_print ("loading menu '%s' for %s\n",
+             gimp_filename_to_utf8 (filename), entry->ui_path);
+
+  entry->merge_id = gtk_ui_manager_add_ui_from_file (GTK_UI_MANAGER (manager),
+                                                     filename, error);
+
+  g_free (filename);
+
+  if (! entry->merge_id)
+    return FALSE;
+
+  return TRUE;
+}
+
+static GimpUIManagerUIEntry *
+gimp_ui_manager_entry_ensure (GimpUIManager *manager,
+                              const gchar   *path)
+{
+  GimpUIManagerUIEntry *entry;
+
+  entry = gimp_ui_manager_entry_get (manager, path);
+
+  if (! entry)
+    {
+      g_warning ("%s: no entry registered for \"%s\"", G_STRFUNC, path);
+      return NULL;
+    }
+
+  if (! entry->merge_id)
+    {
+      GError *error = NULL;
+
+      if (! gimp_ui_manager_entry_load (manager, entry, &error))
+        {
+          if (error->domain == G_FILE_ERROR &&
+              error->code == G_FILE_ERROR_EXIST)
+            {
+              gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            "%s\n\n%s\n\n%s",
+                            _("Your GIMP installation is incomplete:"),
+                            error->message,
+                            _("Please make sure the menu XML files are "
+                              "correctly installed."));
+            }
+          else
+            {
+              gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                            _("There was an error parsing the menu definition "
+                              "from %s: %s"),
+                            gimp_filename_to_utf8 (entry->basename),
+                            error->message);
+            }
+
+          g_clear_error (&error);
+          return NULL;
+        }
+    }
+
+  if (! entry->widget)
+    {
+      GtkUIManager *gtk_manager = GTK_UI_MANAGER (manager);
+
+      entry->widget =
+        GTK_UI_MANAGER_CLASS (parent_class)->get_widget (gtk_manager,
+                                                         entry->ui_path);
+
+      if (entry->widget)
+        {
+          g_object_ref (entry->widget);
+
+          /*  take ownership of popup menus  */
+          if (GTK_IS_MENU (entry->widget))
+            {
+              g_object_ref_sink (entry->widget);
+              g_object_unref (entry->widget);
+            }
+
+          if (entry->setup_func)
+            entry->setup_func (manager, entry->ui_path);
+        }
+      else
+        {
+          g_warning ("%s: \"%s\" does not contain registered toplevel "
+                     "widget \"%s\"",
+                     G_STRFUNC, entry->basename, entry->ui_path);
+          return NULL;
+        }
+    }
+
+  return entry;
+}
+
+static void
+gimp_ui_manager_menu_position (GtkMenu  *menu,
+                               gint     *x,
+                               gint     *y,
+                               gpointer  data)
+{
+  GdkScreen      *screen;
+  GtkRequisition  requisition;
+  GdkRectangle    rect;
+  gint            monitor;
+  gint            pointer_x;
+  gint            pointer_y;
+
+  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_if_fail (x != NULL);
+  g_return_if_fail (y != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (data));
+
+  gdk_display_get_pointer (gtk_widget_get_display (GTK_WIDGET (data)),
+                           &screen, &pointer_x, &pointer_y, NULL);
+
+  monitor = gdk_screen_get_monitor_at_point (screen, pointer_x, pointer_y);
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  gtk_menu_set_screen (menu, screen);
+
+  gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
+
+  if (gtk_widget_get_direction (GTK_WIDGET (menu)) == GTK_TEXT_DIR_RTL)
+    {
+      *x = pointer_x - 2 - requisition.width;
+
+      if (*x < rect.x)
+        *x = pointer_x + 2;
+    }
+  else
+    {
+      *x = pointer_x + 2;
+
+      if (*x + requisition.width > rect.x + rect.width)
+        *x = pointer_x - 2 - requisition.width;
+    }
+
+  *y = pointer_y + 2;
+
+  if (*y + requisition.height > rect.y + rect.height)
+    *y = pointer_y - 2 - requisition.height;
+
+  if (*x < rect.x) *x = rect.x;
+  if (*y < rect.y) *y = rect.y;
+}
+
+static void
+gimp_ui_manager_menu_pos (GtkMenu  *menu,
+                          gint     *x,
+                          gint     *y,
+                          gboolean *push_in,
+                          gpointer  data)
+{
+  MenuPos *menu_pos = data;
+
+  *x = menu_pos->x;
+  *y = menu_pos->y;
+}
+
+static void
+gimp_ui_manager_delete_popdown_data (GtkWidget     *widget,
+                                     GimpUIManager *manager)
+{
+  g_signal_handlers_disconnect_by_func (widget,
+                                        gimp_ui_manager_delete_popdown_data,
+                                        manager);
+  g_object_set_data (G_OBJECT (manager), "popdown-data", NULL);
+}
+
+static void
+gimp_ui_manager_item_realize (GtkWidget     *widget,
+                              GimpUIManager *manager)
+{
+  GtkWidget *menu;
+  GtkWidget *submenu;
+
+  g_signal_handlers_disconnect_by_func (widget,
+                                        gimp_ui_manager_item_realize,
+                                        manager);
+
+  menu = gtk_widget_get_parent (widget);
+
+  if (GTK_IS_MENU_SHELL (menu))
+    {
+      static GQuark quark_key_press_connected = 0;
+
+      if (! quark_key_press_connected)
+        quark_key_press_connected =
+          g_quark_from_static_string ("gimp-menu-item-key-press-connected");
+
+      if (! GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (menu),
+                                                 quark_key_press_connected)))
+        {
+          g_signal_connect (menu, "key-press-event",
+                            G_CALLBACK (gimp_ui_manager_item_key_press),
+                            manager);
+
+          g_object_set_qdata (G_OBJECT (menu),
+                              quark_key_press_connected,
+                              GINT_TO_POINTER (TRUE));
+        }
+    }
+
+  submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget));
+
+  if (submenu)
+    g_object_set_qdata (G_OBJECT (submenu), GIMP_HELP_ID,
+                        g_object_get_qdata (G_OBJECT (widget),
+                                            GIMP_HELP_ID));
+}
+
+static void
+gimp_ui_manager_menu_item_select (GtkWidget     *widget,
+                                  GimpUIManager *manager)
+{
+  GtkAction *action =
+    gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
+
+  if (action)
+    {
+      const gchar *tooltip = gimp_action_get_tooltip (GIMP_ACTION (action));
+
+      if (tooltip)
+        g_signal_emit (manager, manager_signals[SHOW_TOOLTIP], 0, tooltip);
+    }
+}
+
+static void
+gimp_ui_manager_menu_item_deselect (GtkWidget     *widget,
+                                    GimpUIManager *manager)
+{
+  g_signal_emit (manager, manager_signals[HIDE_TOOLTIP], 0);
+}
+
+static gboolean
+gimp_ui_manager_item_key_press (GtkWidget     *widget,
+                                GdkEventKey   *kevent,
+                                GimpUIManager *manager)
+{
+  gchar *help_id = NULL;
+
+  while (! help_id && GTK_IS_MENU_SHELL (widget))
+    {
+      GtkWidget *menu_item = GTK_MENU_SHELL (widget)->active_menu_item;
+
+      if (! menu_item && GTK_IS_MENU (widget))
+        {
+          GtkWidget *parent = gtk_widget_get_parent (widget);
+          GdkWindow *window = gtk_widget_get_window (parent);
+
+          if (window)
+            {
+              gint x, y;
+
+              gdk_window_get_pointer (window, &x, &y, NULL);
+              menu_item = find_widget_under_pointer (window, &x, &y);
+
+              if (menu_item && ! GTK_IS_MENU_ITEM (menu_item))
+                {
+                  menu_item = gtk_widget_get_ancestor (menu_item,
+                                                       GTK_TYPE_MENU_ITEM);
+
+                  if (! GTK_IS_MENU_ITEM (menu_item))
+                    menu_item = NULL;
+                }
+            }
+        }
+
+      /*  first, get the help page from the item...
+       */
+      if (menu_item)
+        {
+          help_id = g_object_get_qdata (G_OBJECT (menu_item), GIMP_HELP_ID);
+
+          if (help_id && ! strlen (help_id))
+            help_id = NULL;
+        }
+
+      /*  ...then try the parent menu...
+       */
+      if (! help_id)
+        {
+          help_id = g_object_get_qdata (G_OBJECT (widget), GIMP_HELP_ID);
+
+          if (help_id && ! strlen (help_id))
+            help_id = NULL;
+        }
+
+      /*  ...finally try the menu's parent (if any)
+       */
+      if (! help_id)
+        {
+          menu_item = NULL;
+
+          if (GTK_IS_MENU (widget))
+            menu_item = gtk_menu_get_attach_widget (GTK_MENU (widget));
+
+          if (! menu_item)
+            break;
+
+          widget = gtk_widget_get_parent (menu_item);
+
+          if (! widget)
+            break;
+        }
+    }
+
+  /*  For any valid accelerator key except F1, continue with the
+   *  standard GtkMenuShell callback and assign a new shortcut, but
+   *  don't assign a shortcut to the help menu entries ...
+   */
+  if (kevent->keyval != GDK_KEY_F1)
+    {
+      if (help_id                                   &&
+          gtk_accelerator_valid (kevent->keyval, 0) &&
+          (strcmp (help_id, GIMP_HELP_HELP)         == 0 ||
+           strcmp (help_id, GIMP_HELP_HELP_CONTEXT) == 0))
+        {
+          return TRUE;
+        }
+
+      return FALSE;
+    }
+
+  /*  ...finally, if F1 was pressed over any menu, show its help page...  */
+
+  if (help_id)
+    {
+      gchar *help_domain = NULL;
+      gchar *help_string = NULL;
+      gchar *domain_separator;
+
+      help_id = g_strdup (help_id);
+
+      domain_separator = strchr (help_id, '?');
+
+      if (domain_separator)
+        {
+          *domain_separator = '\0';
+
+          help_domain = g_strdup (help_id);
+          help_string = g_strdup (domain_separator + 1);
+        }
+      else
+        {
+          help_string = g_strdup (help_id);
+        }
+
+      gimp_help (manager->gimp, NULL, help_domain, help_string);
+
+      g_free (help_domain);
+      g_free (help_string);
+      g_free (help_id);
+    }
+
+  return TRUE;
+}
+
+
+/* Stuff below taken from gtktooltip.c
+ */
+
+/* FIXME: remove this crack as soon as a GTK+ widget_under_pointer() is available */
+
+struct ChildLocation
+{
+  GtkWidget *child;
+  GtkWidget *container;
+
+  gint x;
+  gint y;
+};
+
+static void
+child_location_foreach (GtkWidget *child,
+                        gpointer   data)
+{
+  gint x, y;
+  struct ChildLocation *child_loc = data;
+
+  /* Ignore invisible widgets */
+  if (! gtk_widget_is_drawable (child))
+    return;
+
+  /* (child_loc->x, child_loc->y) are relative to
+   * child_loc->container's allocation.
+   */
+
+  if (! child_loc->child &&
+      gtk_widget_translate_coordinates (child_loc->container, child,
+                                        child_loc->x, child_loc->y,
+                                        &x, &y))
+    {
+      GtkAllocation child_allocation;
+
+      gtk_widget_get_allocation (child, &child_allocation);
+
+#ifdef DEBUG_TOOLTIP
+      g_print ("candidate: %s  alloc=[(%d,%d)  %dx%d]     (%d, %d)->(%d, %d)\n",
+               gtk_widget_get_name (child),
+               child_allocation.x,
+               child_allocation.y,
+               child_allocation.width,
+               child_allocation.height,
+               child_loc->x, child_loc->y,
+               x, y);
+#endif /* DEBUG_TOOLTIP */
+
+      /* (x, y) relative to child's allocation. */
+      if (x >= 0 && x < child_allocation.width
+          && y >= 0 && y < child_allocation.height)
+        {
+          if (GTK_IS_CONTAINER (child))
+            {
+              struct ChildLocation tmp = { NULL, NULL, 0, 0 };
+
+              /* Take (x, y) relative the child's allocation and
+               * recurse.
+               */
+              tmp.x = x;
+              tmp.y = y;
+              tmp.container = child;
+
+              gtk_container_forall (GTK_CONTAINER (child),
+                                    child_location_foreach, &tmp);
+
+              if (tmp.child)
+                child_loc->child = tmp.child;
+              else
+                child_loc->child = child;
+            }
+          else
+            {
+              child_loc->child = child;
+            }
+        }
+    }
+}
+
+/* Translates coordinates from dest_widget->window relative (src_x, src_y),
+ * to allocation relative (dest_x, dest_y) of dest_widget.
+ */
+static void
+window_to_alloc (GtkWidget *dest_widget,
+                 gint       src_x,
+                 gint       src_y,
+                 gint      *dest_x,
+                 gint      *dest_y)
+{
+  GtkAllocation dest_allocation;
+
+  gtk_widget_get_allocation (dest_widget, &dest_allocation);
+
+  /* Translate from window relative to allocation relative */
+  if (gtk_widget_get_has_window (dest_widget) &&
+      gtk_widget_get_parent (dest_widget))
+    {
+      gint wx, wy;
+
+      gdk_window_get_position (gtk_widget_get_window (dest_widget), &wx, &wy);
+
+      /* Offset coordinates if widget->window is smaller than
+       * widget->allocation.
+       */
+      src_x += wx - dest_allocation.x;
+      src_y += wy - dest_allocation.y;
+    }
+  else
+    {
+      src_x -= dest_allocation.x;
+      src_y -= dest_allocation.y;
+    }
+
+  if (dest_x)
+    *dest_x = src_x;
+  if (dest_y)
+    *dest_y = src_y;
+}
+
+static GtkWidget *
+find_widget_under_pointer (GdkWindow *window,
+                           gint      *x,
+                           gint      *y)
+{
+  GtkWidget *event_widget;
+  struct ChildLocation child_loc = { NULL, NULL, 0, 0 };
+
+  gdk_window_get_user_data (window, (void **)&event_widget);
+
+  if (! event_widget)
+    return NULL;
+
+#ifdef DEBUG_TOOLTIP
+  g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
+           window, event_widget, gtk_widget_get_name (event_widget),
+           *x, *y);
+#endif
+
+  /* Coordinates are relative to event window */
+  child_loc.x = *x;
+  child_loc.y = *y;
+
+  /* We go down the window hierarchy to the widget->window,
+   * coordinates stay relative to the current window.
+   * We end up with window == widget->window, coordinates relative to that.
+   */
+  while (window && window != gtk_widget_get_window (event_widget))
+    {
+      gint px, py;
+
+      gdk_window_get_position (window, &px, &py);
+      child_loc.x += px;
+      child_loc.y += py;
+
+      window = gdk_window_get_parent (window);
+    }
+
+  /* Failing to find widget->window can happen for e.g. a detached handle box;
+   * chaining ::query-tooltip up to its parent probably makes little sense,
+   * and users better implement tooltips on handle_box->child.
+   * so we simply ignore the event for tooltips here.
+   */
+  if (!window)
+    return NULL;
+
+  /* Convert the window relative coordinates to allocation
+   * relative coordinates.
+   */
+  window_to_alloc (event_widget,
+                   child_loc.x, child_loc.y,
+                   &child_loc.x, &child_loc.y);
+
+  if (GTK_IS_CONTAINER (event_widget))
+    {
+      GtkWidget *container = event_widget;
+
+      child_loc.container = event_widget;
+      child_loc.child = NULL;
+
+      gtk_container_forall (GTK_CONTAINER (event_widget),
+                            child_location_foreach, &child_loc);
+
+      /* Here we have a widget, with coordinates relative to
+       * child_loc.container's allocation.
+       */
+
+      if (child_loc.child)
+        event_widget = child_loc.child;
+      else if (child_loc.container)
+        event_widget = child_loc.container;
+
+      /* Translate to event_widget's allocation */
+      gtk_widget_translate_coordinates (container, event_widget,
+                                        child_loc.x, child_loc.y,
+                                        &child_loc.x, &child_loc.y);
+
+    }
+
+  /* We return (x, y) relative to the allocation of event_widget. */
+  *x = child_loc.x;
+  *y = child_loc.y;
+
+  return event_widget;
+}
diff --git a/app/widgets/gimpuimanager.h b/app/widgets/gimpuimanager.h
new file mode 100644
index 0000000..a0cb2f0
--- /dev/null
+++ b/app/widgets/gimpuimanager.h
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpuimanager.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UI_MANAGER_H__
+#define __GIMP_UI_MANAGER_H__
+
+
+typedef struct _GimpUIManagerUIEntry GimpUIManagerUIEntry;
+
+struct _GimpUIManagerUIEntry
+{
+  gchar                  *ui_path;
+  gchar                  *basename;
+  GimpUIManagerSetupFunc  setup_func;
+  guint                   merge_id;
+  GtkWidget              *widget;
+};
+
+
+#define GIMP_TYPE_UI_MANAGER              (gimp_ui_manager_get_type ())
+#define GIMP_UI_MANAGER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UI_MANAGER, GimpUIManager))
+#define GIMP_UI_MANAGER_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GIMP_TYPE_UI_MANAGER, GimpUIManagerClass))
+#define GIMP_IS_UI_MANAGER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UI_MANAGER))
+#define GIMP_IS_UI_MANAGER_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GIMP_TYPE_UI_MANAGER))
+#define GIMP_UI_MANAGER_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((inst), GIMP_TYPE_UI_MANAGER, GimpUIManagerClass))
+
+
+typedef struct _GimpUIManagerClass GimpUIManagerClass;
+
+/**
+ * Among other things, is responsible for updating menu bars. A more
+ * appropriate name would perhaps be GimpMenubarManager.
+ */
+struct _GimpUIManager
+{
+  GtkUIManager  parent_instance;
+
+  gchar        *name;
+  Gimp         *gimp;
+  GList        *registered_uis;
+};
+
+struct _GimpUIManagerClass
+{
+  GtkUIManagerClass  parent_class;
+
+  GHashTable        *managers;
+
+  void (* update)       (GimpUIManager *manager,
+                         gpointer       update_data);
+  void (* show_tooltip) (GimpUIManager *manager,
+                         const gchar   *tooltip);
+  void (* hide_tooltip) (GimpUIManager *manager);
+};
+
+
+GType           gimp_ui_manager_get_type    (void) G_GNUC_CONST;
+
+GimpUIManager * gimp_ui_manager_new         (Gimp                   *gimp,
+                                             const gchar            *name);
+
+GList         * gimp_ui_managers_from_name  (const gchar            *name);
+
+void            gimp_ui_manager_update      (GimpUIManager          *manager,
+                                             gpointer                update_data);
+
+void            gimp_ui_manager_insert_action_group (GimpUIManager   *manager,
+                                                     GimpActionGroup *group,
+                                                     gint             pos);
+GimpActionGroup * gimp_ui_manager_get_action_group  (GimpUIManager   *manager,
+                                                     const gchar     *name);
+GList         * gimp_ui_manager_get_action_groups   (GimpUIManager   *manager);
+
+GtkAccelGroup * gimp_ui_manager_get_accel_group (GimpUIManager      *manager);
+
+GtkWidget     * gimp_ui_manager_get_widget      (GimpUIManager      *manager,
+                                                 const gchar        *path);
+
+gchar          * gimp_ui_manager_get_ui         (GimpUIManager      *manager);
+
+guint            gimp_ui_manager_new_merge_id   (GimpUIManager      *manager);
+void             gimp_ui_manager_add_ui         (GimpUIManager      *manager,
+                                                 guint               merge_id,
+                                                 const gchar        *path,
+                                                 const gchar        *name,
+                                                 const gchar        *action,
+                                                 GtkUIManagerItemType type,
+                                                 gboolean            top);
+void            gimp_ui_manager_remove_ui       (GimpUIManager      *manager,
+                                                 guint               merge_id);
+
+void            gimp_ui_manager_ensure_update   (GimpUIManager      *manager);
+
+GimpAction    * gimp_ui_manager_get_action      (GimpUIManager      *manager,
+                                                 const gchar        *path);
+GimpAction    * gimp_ui_manager_find_action     (GimpUIManager      *manager,
+                                                 const gchar        *group_name,
+                                                 const gchar        *action_name);
+gboolean        gimp_ui_manager_activate_action (GimpUIManager      *manager,
+                                                 const gchar        *group_name,
+                                                 const gchar        *action_name);
+gboolean        gimp_ui_manager_toggle_action   (GimpUIManager      *manager,
+                                                 const gchar        *group_name,
+                                                 const gchar        *action_name,
+                                                 gboolean            active);
+
+void            gimp_ui_manager_ui_register (GimpUIManager          *manager,
+                                             const gchar            *ui_path,
+                                             const gchar            *basename,
+                                             GimpUIManagerSetupFunc  setup_func);
+
+void            gimp_ui_manager_ui_popup    (GimpUIManager          *manager,
+                                             const gchar            *ui_path,
+                                             GtkWidget              *parent,
+                                             GimpMenuPositionFunc    position_func,
+                                             gpointer                position_data,
+                                             GDestroyNotify          popdown_func,
+                                             gpointer                popdown_data);
+
+
+#endif  /* __GIMP_UI_MANAGER_H__ */
diff --git a/app/widgets/gimpundoeditor.c b/app/widgets/gimpundoeditor.c
new file mode 100644
index 0000000..62bee16
--- /dev/null
+++ b/app/widgets/gimpundoeditor.c
@@ -0,0 +1,462 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimplist.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpundostack.h"
+
+#include "gimpcontainertreeview.h"
+#include "gimpcontainerview.h"
+#include "gimpdocked.h"
+#include "gimphelp-ids.h"
+#include "gimpmenufactory.h"
+#include "gimpundoeditor.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VIEW_SIZE
+};
+
+
+static void   gimp_undo_editor_docked_iface_init (GimpDockedInterface *iface);
+
+static void   gimp_undo_editor_constructed    (GObject           *object);
+static void   gimp_undo_editor_set_property   (GObject           *object,
+                                               guint              property_id,
+                                               const GValue      *value,
+                                               GParamSpec        *pspec);
+
+static void   gimp_undo_editor_set_image      (GimpImageEditor   *editor,
+                                               GimpImage         *image);
+
+static void   gimp_undo_editor_set_context    (GimpDocked        *docked,
+                                               GimpContext       *context);
+
+static void   gimp_undo_editor_fill           (GimpUndoEditor    *editor);
+static void   gimp_undo_editor_clear          (GimpUndoEditor    *editor);
+
+static void   gimp_undo_editor_undo_event     (GimpImage         *image,
+                                               GimpUndoEvent      event,
+                                               GimpUndo          *undo,
+                                               GimpUndoEditor    *editor);
+
+static void   gimp_undo_editor_select_item    (GimpContainerView *view,
+                                               GimpUndo          *undo,
+                                               gpointer           insert_data,
+                                               GimpUndoEditor    *editor);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpUndoEditor, gimp_undo_editor,
+                         GIMP_TYPE_IMAGE_EDITOR,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
+                                                gimp_undo_editor_docked_iface_init))
+
+#define parent_class gimp_undo_editor_parent_class
+
+static GimpDockedInterface *parent_docked_iface = NULL;
+
+
+static void
+gimp_undo_editor_class_init (GimpUndoEditorClass *klass)
+{
+  GObjectClass         *object_class       = G_OBJECT_CLASS (klass);
+  GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
+
+  object_class->constructed     = gimp_undo_editor_constructed;
+  object_class->set_property    = gimp_undo_editor_set_property;
+
+  image_editor_class->set_image = gimp_undo_editor_set_image;
+
+  g_object_class_install_property (object_class, PROP_VIEW_SIZE,
+                                   g_param_spec_enum ("view-size",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_VIEW_SIZE,
+                                                      GIMP_VIEW_SIZE_LARGE,
+                                                      GIMP_PARAM_WRITABLE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gimp_undo_editor_docked_iface_init (GimpDockedInterface *iface)
+{
+  parent_docked_iface = g_type_interface_peek_parent (iface);
+
+  if (! parent_docked_iface)
+    parent_docked_iface = g_type_default_interface_peek (GIMP_TYPE_DOCKED);
+
+  iface->set_context = gimp_undo_editor_set_context;
+}
+
+static void
+gimp_undo_editor_init (GimpUndoEditor *undo_editor)
+{
+}
+
+static void
+gimp_undo_editor_constructed (GObject *object)
+{
+  GimpUndoEditor *undo_editor = GIMP_UNDO_EDITOR (object);
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  undo_editor->view = gimp_container_tree_view_new (NULL, NULL,
+                                                    undo_editor->view_size,
+                                                    1);
+
+  gtk_box_pack_start (GTK_BOX (undo_editor), undo_editor->view, TRUE, TRUE, 0);
+  gtk_widget_show (undo_editor->view);
+
+  g_signal_connect (undo_editor->view, "select-item",
+                    G_CALLBACK (gimp_undo_editor_select_item),
+                    undo_editor);
+
+  undo_editor->undo_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (undo_editor), "edit",
+                                   "edit-undo", NULL);
+
+  undo_editor->redo_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (undo_editor), "edit",
+                                   "edit-redo", NULL);
+
+  undo_editor->clear_button =
+    gimp_editor_add_action_button (GIMP_EDITOR (undo_editor), "edit",
+                                   "edit-undo-clear", NULL);
+}
+
+static void
+gimp_undo_editor_set_property (GObject      *object,
+                               guint         property_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  GimpUndoEditor *undo_editor = GIMP_UNDO_EDITOR (object);
+
+  switch (property_id)
+    {
+    case PROP_VIEW_SIZE:
+      undo_editor->view_size = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_undo_editor_set_image (GimpImageEditor *image_editor,
+                            GimpImage       *image)
+{
+  GimpUndoEditor *editor = GIMP_UNDO_EDITOR (image_editor);
+
+  if (image_editor->image)
+    {
+      gimp_undo_editor_clear (editor);
+
+      g_signal_handlers_disconnect_by_func (image_editor->image,
+                                            gimp_undo_editor_undo_event,
+                                            editor);
+    }
+
+  GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (image_editor, image);
+
+  if (image_editor->image)
+    {
+      if (gimp_image_undo_is_enabled (image_editor->image))
+        gimp_undo_editor_fill (editor);
+
+      g_signal_connect (image_editor->image, "undo-event",
+                        G_CALLBACK (gimp_undo_editor_undo_event),
+                        editor);
+    }
+}
+
+static void
+gimp_undo_editor_set_context (GimpDocked  *docked,
+                              GimpContext *context)
+{
+  GimpUndoEditor *editor = GIMP_UNDO_EDITOR (docked);
+
+  if (editor->context)
+    g_object_unref (editor->context);
+
+  editor->context = context;
+
+  if (editor->context)
+    g_object_ref (editor->context);
+
+  /* This calls gimp_undo_editor_set_image(), so make sure that it
+   * isn't called before editor->context has been initialized.
+   */
+  parent_docked_iface->set_context (docked, context);
+
+  gimp_container_view_set_context (GIMP_CONTAINER_VIEW (editor->view),
+                                   context);
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_undo_editor_new (GimpCoreConfig  *config,
+                      GimpMenuFactory *menu_factory)
+{
+  g_return_val_if_fail (GIMP_IS_CORE_CONFIG (config), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+
+  return g_object_new (GIMP_TYPE_UNDO_EDITOR,
+                       "menu-factory",    menu_factory,
+                       "menu-identifier", "<Undo>",
+                       "ui-path",         "/undo-popup",
+                       "view-size",       config->undo_preview_size,
+                       NULL);
+}
+
+
+/*  private functions  */
+
+static void
+gimp_undo_editor_fill (GimpUndoEditor *editor)
+{
+  GimpImage     *image      = GIMP_IMAGE_EDITOR (editor)->image;
+  GimpUndoStack *undo_stack = gimp_image_get_undo_stack (image);
+  GimpUndoStack *redo_stack = gimp_image_get_redo_stack (image);
+  GimpUndo      *top_undo_item;
+  GList         *list;
+
+  /*  create a container as model for the undo history list  */
+  editor->container = gimp_list_new (GIMP_TYPE_UNDO, FALSE);
+  editor->base_item = g_object_new (GIMP_TYPE_UNDO,
+                                    "image", image,
+                                    "name",  _("[ Base Image ]"),
+                                    NULL);
+
+  /*  the list prepends its items, so first add the redo items in
+   *  reverse (ascending) order...
+   */
+  for (list = GIMP_LIST (redo_stack->undos)->queue->tail;
+       list;
+       list = g_list_previous (list))
+    {
+      gimp_container_add (editor->container, GIMP_OBJECT (list->data));
+    }
+
+  /*  ...then add the undo items in descending order...  */
+  for (list = GIMP_LIST (undo_stack->undos)->queue->head;
+       list;
+       list = g_list_next (list))
+    {
+      /*  Don't add the topmost item if it is an open undo group,
+       *  it will be added upon closing of the group.
+       */
+      if (list->prev || ! GIMP_IS_UNDO_STACK (list->data) ||
+          gimp_image_get_undo_group_count (image) == 0)
+        {
+          gimp_container_add (editor->container, GIMP_OBJECT (list->data));
+        }
+    }
+
+  /*  ...finally, the first item is the special "base_item" which stands
+   *  for the image with no more undos available to pop
+   */
+  gimp_container_add (editor->container, GIMP_OBJECT (editor->base_item));
+
+  /*  display the container  */
+  gimp_container_view_set_container (GIMP_CONTAINER_VIEW (editor->view),
+                                     editor->container);
+
+  top_undo_item = gimp_undo_stack_peek (undo_stack);
+
+  g_signal_handlers_block_by_func (editor->view,
+                                   gimp_undo_editor_select_item,
+                                   editor);
+
+  /*  select the current state of the image  */
+  if (top_undo_item)
+    {
+      gimp_container_view_select_item (GIMP_CONTAINER_VIEW (editor->view),
+                                       GIMP_VIEWABLE (top_undo_item));
+      gimp_undo_create_preview (top_undo_item, editor->context, FALSE);
+    }
+  else
+    {
+      gimp_container_view_select_item (GIMP_CONTAINER_VIEW (editor->view),
+                                       GIMP_VIEWABLE (editor->base_item));
+      gimp_undo_create_preview (editor->base_item, editor->context, TRUE);
+    }
+
+  g_signal_handlers_unblock_by_func (editor->view,
+                                     gimp_undo_editor_select_item,
+                                     editor);
+}
+
+static void
+gimp_undo_editor_clear (GimpUndoEditor *editor)
+{
+  if (editor->container)
+    {
+      gimp_container_view_set_container (GIMP_CONTAINER_VIEW (editor->view),
+                                         NULL);
+      g_clear_object (&editor->container);
+    }
+
+  g_clear_object (&editor->base_item);
+}
+
+static void
+gimp_undo_editor_undo_event (GimpImage      *image,
+                             GimpUndoEvent   event,
+                             GimpUndo       *undo,
+                             GimpUndoEditor *editor)
+{
+  GimpUndoStack *undo_stack    = gimp_image_get_undo_stack (image);
+  GimpUndo      *top_undo_item = gimp_undo_stack_peek (undo_stack);
+
+  switch (event)
+    {
+    case GIMP_UNDO_EVENT_UNDO_PUSHED:
+      g_signal_handlers_block_by_func (editor->view,
+                                       gimp_undo_editor_select_item,
+                                       editor);
+
+      gimp_container_insert (editor->container, GIMP_OBJECT (undo), -1);
+      gimp_container_view_select_item (GIMP_CONTAINER_VIEW (editor->view),
+                                       GIMP_VIEWABLE (undo));
+      gimp_undo_create_preview (undo, editor->context, FALSE);
+
+      g_signal_handlers_unblock_by_func (editor->view,
+                                         gimp_undo_editor_select_item,
+                                         editor);
+      break;
+
+    case GIMP_UNDO_EVENT_UNDO_EXPIRED:
+    case GIMP_UNDO_EVENT_REDO_EXPIRED:
+      gimp_container_remove (editor->container, GIMP_OBJECT (undo));
+      break;
+
+    case GIMP_UNDO_EVENT_UNDO:
+    case GIMP_UNDO_EVENT_REDO:
+      g_signal_handlers_block_by_func (editor->view,
+                                       gimp_undo_editor_select_item,
+                                       editor);
+
+      if (top_undo_item)
+        {
+          gimp_container_view_select_item (GIMP_CONTAINER_VIEW (editor->view),
+                                           GIMP_VIEWABLE (top_undo_item));
+          gimp_undo_create_preview (top_undo_item, editor->context, FALSE);
+        }
+      else
+        {
+          gimp_container_view_select_item (GIMP_CONTAINER_VIEW (editor->view),
+                                           GIMP_VIEWABLE (editor->base_item));
+          gimp_undo_create_preview (editor->base_item, editor->context, TRUE);
+        }
+
+      g_signal_handlers_unblock_by_func (editor->view,
+                                         gimp_undo_editor_select_item,
+                                         editor);
+      break;
+
+    case GIMP_UNDO_EVENT_UNDO_FREE:
+      if (gimp_image_undo_is_enabled (image))
+        gimp_undo_editor_clear (editor);
+      break;
+
+    case GIMP_UNDO_EVENT_UNDO_FREEZE:
+      gimp_undo_editor_clear (editor);
+      break;
+
+    case GIMP_UNDO_EVENT_UNDO_THAW:
+      gimp_undo_editor_fill (editor);
+      break;
+    }
+}
+
+static void
+gimp_undo_editor_select_item (GimpContainerView *view,
+                              GimpUndo          *undo,
+                              gpointer           insert_data,
+                              GimpUndoEditor    *editor)
+{
+  GimpImage     *image      = GIMP_IMAGE_EDITOR (editor)->image;
+  GimpUndoStack *undo_stack = gimp_image_get_undo_stack (image);
+  GimpUndoStack *redo_stack = gimp_image_get_redo_stack (image);
+  GimpUndo      *top_undo_item;
+
+  if (! undo)
+    return;
+
+  top_undo_item = gimp_undo_stack_peek (undo_stack);
+
+  if (undo == editor->base_item)
+    {
+      /*  the base_item was selected, pop all available undo items
+       */
+      while (top_undo_item != NULL)
+        {
+          if (! gimp_image_undo (image))
+            break;
+
+          top_undo_item = gimp_undo_stack_peek (undo_stack);
+        }
+    }
+  else if (gimp_container_have (undo_stack->undos, GIMP_OBJECT (undo)))
+    {
+      /*  the selected item is on the undo stack, pop undos until it
+       *  is on top of the undo stack
+       */
+      while (top_undo_item != undo)
+        {
+          if(! gimp_image_undo (image))
+            break;
+
+          top_undo_item = gimp_undo_stack_peek (undo_stack);
+        }
+    }
+  else if (gimp_container_have (redo_stack->undos, GIMP_OBJECT (undo)))
+    {
+      /*  the selected item is on the redo stack, pop redos until it
+       *  is on top of the undo stack
+       */
+      while (top_undo_item != undo)
+        {
+          if (! gimp_image_redo (image))
+            break;
+
+          top_undo_item = gimp_undo_stack_peek (undo_stack);
+        }
+    }
+
+  gimp_image_flush (image);
+}
diff --git a/app/widgets/gimpundoeditor.h b/app/widgets/gimpundoeditor.h
new file mode 100644
index 0000000..bb76214
--- /dev/null
+++ b/app/widgets/gimpundoeditor.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_UNDO_EDITOR_H__
+#define __GIMP_UNDO_EDITOR_H__
+
+
+#include "gimpimageeditor.h"
+
+
+#define GIMP_TYPE_UNDO_EDITOR            (gimp_undo_editor_get_type ())
+#define GIMP_UNDO_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNDO_EDITOR, GimpUndoEditor))
+#define GIMP_UNDO_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNDO_EDITOR, GimpUndoEditorClass))
+#define GIMP_IS_UNDO_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UNDO_EDITOR))
+#define GIMP_IS_UNDO_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNDO_EDITOR))
+#define GIMP_UNDO_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNDO_EDITOR, GimpUndoEditorClass))
+
+
+typedef struct _GimpUndoEditorClass GimpUndoEditorClass;
+
+struct _GimpUndoEditor
+{
+  GimpImageEditor  parent_instance;
+
+  GimpContext     *context;
+  GimpContainer   *container;
+  GtkWidget       *view;
+  GimpViewSize     view_size;
+
+  GimpUndo        *base_item;
+
+  GtkWidget       *undo_button;
+  GtkWidget       *redo_button;
+  GtkWidget       *clear_button;
+};
+
+struct _GimpUndoEditorClass
+{
+  GimpImageEditorClass  parent_class;
+};
+
+
+GType       gimp_undo_editor_get_type  (void) G_GNUC_CONST;
+
+GtkWidget * gimp_undo_editor_new       (GimpCoreConfig  *config,
+                                        GimpMenuFactory *menu_factory);
+
+
+#endif /* __GIMP_UNDO_EDITOR_H__ */
diff --git a/app/widgets/gimpvectorstreeview.c b/app/widgets/gimpvectorstreeview.c
new file mode 100644
index 0000000..5278da8
--- /dev/null
+++ b/app/widgets/gimpvectorstreeview.c
@@ -0,0 +1,281 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectorstreeview.c
+ * Copyright (C) 2001-2009 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-export.h"
+#include "vectors/gimpvectors-import.h"
+
+#include "gimpactiongroup.h"
+#include "gimpcontainerview.h"
+#include "gimpdnd.h"
+#include "gimphelp-ids.h"
+#include "gimpuimanager.h"
+#include "gimpvectorstreeview.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+static void    gimp_vectors_tree_view_view_iface_init (GimpContainerViewInterface *iface);
+
+static void      gimp_vectors_tree_view_constructed   (GObject                  *object);
+
+static void      gimp_vectors_tree_view_set_container (GimpContainerView        *view,
+                                                       GimpContainer            *container);
+static void      gimp_vectors_tree_view_drop_svg      (GimpContainerTreeView    *tree_view,
+                                                       const gchar              *svg_data,
+                                                       gsize                     svg_data_len,
+                                                       GimpViewable             *dest_viewable,
+                                                       GtkTreeViewDropPosition   drop_pos);
+static GimpItem * gimp_vectors_tree_view_item_new     (GimpImage                *image);
+static guchar   * gimp_vectors_tree_view_drag_svg     (GtkWidget                *widget,
+                                                       gsize                    *svg_data_len,
+                                                       gpointer                  data);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpVectorsTreeView, gimp_vectors_tree_view,
+                         GIMP_TYPE_ITEM_TREE_VIEW,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
+                                                gimp_vectors_tree_view_view_iface_init))
+
+#define parent_class gimp_vectors_tree_view_parent_class
+
+static GimpContainerViewInterface *parent_view_iface = NULL;
+
+
+static void
+gimp_vectors_tree_view_class_init (GimpVectorsTreeViewClass *klass)
+{
+  GObjectClass               *object_class = G_OBJECT_CLASS (klass);
+  GimpContainerTreeViewClass *view_class   = GIMP_CONTAINER_TREE_VIEW_CLASS (klass);
+  GimpItemTreeViewClass      *iv_class     = GIMP_ITEM_TREE_VIEW_CLASS (klass);
+
+  object_class->constructed = gimp_vectors_tree_view_constructed;
+
+  view_class->drop_svg      = gimp_vectors_tree_view_drop_svg;
+
+  iv_class->item_type       = GIMP_TYPE_VECTORS;
+  iv_class->signal_name     = "active-vectors-changed";
+
+  iv_class->get_container   = gimp_image_get_vectors;
+  iv_class->get_active_item = (GimpGetItemFunc) gimp_image_get_active_vectors;
+  iv_class->set_active_item = (GimpSetItemFunc) gimp_image_set_active_vectors;
+  iv_class->add_item        = (GimpAddItemFunc) gimp_image_add_vectors;
+  iv_class->remove_item     = (GimpRemoveItemFunc) gimp_image_remove_vectors;
+  iv_class->new_item        = gimp_vectors_tree_view_item_new;
+
+  iv_class->action_group            = "vectors";
+  iv_class->activate_action         = "vectors-edit";
+  iv_class->new_action              = "vectors-new";
+  iv_class->new_default_action      = "vectors-new-last-values";
+  iv_class->raise_action            = "vectors-raise";
+  iv_class->raise_top_action        = "vectors-raise-to-top";
+  iv_class->lower_action            = "vectors-lower";
+  iv_class->lower_bottom_action     = "vectors-lower-to-bottom";
+  iv_class->duplicate_action        = "vectors-duplicate";
+  iv_class->delete_action           = "vectors-delete";
+  iv_class->lock_content_icon_name  = GIMP_ICON_TOOL_PATH;
+  iv_class->lock_content_tooltip    = _("Lock path");
+  iv_class->lock_content_help_id    = GIMP_HELP_PATH_LOCK_STROKES;
+  iv_class->lock_position_icon_name = GIMP_ICON_TOOL_MOVE;
+  iv_class->lock_position_tooltip   = _("Lock path position");
+  iv_class->lock_position_help_id   = GIMP_HELP_PATH_LOCK_POSITION;
+}
+
+static void
+gimp_vectors_tree_view_view_iface_init (GimpContainerViewInterface *iface)
+{
+  parent_view_iface = g_type_interface_peek_parent (iface);
+
+  iface->set_container = gimp_vectors_tree_view_set_container;
+}
+
+static void
+gimp_vectors_tree_view_init (GimpVectorsTreeView *view)
+{
+}
+
+static void
+gimp_vectors_tree_view_constructed (GObject *object)
+{
+  GimpEditor            *editor    = GIMP_EDITOR (object);
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (object);
+  GimpVectorsTreeView   *view      = GIMP_VECTORS_TREE_VIEW (object);
+  GdkModifierType        extend_mask;
+  GdkModifierType        modify_mask;
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+
+  extend_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (object),
+                                              GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+  modify_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (object),
+                                              GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+  view->toselection_button =
+    gimp_editor_add_action_button (editor, "vectors",
+                                   "vectors-selection-replace",
+                                   "vectors-selection-add",
+                                   extend_mask,
+                                   "vectors-selection-subtract",
+                                   modify_mask,
+                                   "vectors-selection-intersect",
+                                   extend_mask | modify_mask,
+                                   NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (editor),
+                                  GTK_BUTTON (view->toselection_button),
+                                  GIMP_TYPE_VECTORS);
+  gtk_box_reorder_child (gimp_editor_get_button_box (editor),
+                         view->toselection_button, 4);
+
+  view->tovectors_button =
+    gimp_editor_add_action_button (editor, "vectors",
+                                   "vectors-selection-to-vectors",
+                                   "vectors-selection-to-vectors-advanced",
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+  gtk_box_reorder_child (gimp_editor_get_button_box (editor),
+                         view->tovectors_button, 5);
+
+  view->stroke_button =
+    gimp_editor_add_action_button (editor, "vectors",
+                                   "vectors-stroke",
+                                   "vectors-stroke-last-values",
+                                   GDK_SHIFT_MASK,
+                                   NULL);
+  gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (editor),
+                                  GTK_BUTTON (view->stroke_button),
+                                  GIMP_TYPE_VECTORS);
+  gtk_box_reorder_child (gimp_editor_get_button_box (editor),
+                         view->stroke_button, 6);
+
+  gimp_dnd_svg_dest_add (GTK_WIDGET (tree_view->view), NULL, view);
+}
+
+static void
+gimp_vectors_tree_view_set_container (GimpContainerView *view,
+                                      GimpContainer     *container)
+{
+  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+  GimpContainer         *old_container;
+
+  old_container = gimp_container_view_get_container (GIMP_CONTAINER_VIEW (view));
+
+  if (old_container && ! container)
+    {
+      gimp_dnd_svg_source_remove (GTK_WIDGET (tree_view->view));
+    }
+
+  parent_view_iface->set_container (view, container);
+
+  if (! old_container && container)
+    {
+      gimp_dnd_svg_source_add (GTK_WIDGET (tree_view->view),
+                               gimp_vectors_tree_view_drag_svg,
+                               tree_view);
+    }
+}
+
+static void
+gimp_vectors_tree_view_drop_svg (GimpContainerTreeView   *tree_view,
+                                 const gchar             *svg_data,
+                                 gsize                    svg_data_len,
+                                 GimpViewable            *dest_viewable,
+                                 GtkTreeViewDropPosition  drop_pos)
+{
+  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (tree_view);
+  GimpImage        *image     = gimp_item_tree_view_get_image (item_view);
+  GimpVectors      *parent;
+  gint              index;
+  GError           *error = NULL;
+
+  if (image->gimp->be_verbose)
+    g_print ("%s: SVG dropped (len = %d)\n", G_STRFUNC, (gint) svg_data_len);
+
+  index = gimp_item_tree_view_get_drop_index (item_view, dest_viewable,
+                                              drop_pos,
+                                              (GimpViewable **) &parent);
+
+  if (! gimp_vectors_import_buffer (image, svg_data, svg_data_len,
+                                    TRUE, FALSE, parent, index, NULL, &error))
+    {
+      gimp_message_literal (image->gimp,
+                            G_OBJECT (tree_view), GIMP_MESSAGE_ERROR,
+                            error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      gimp_image_flush (image);
+    }
+}
+
+static GimpItem *
+gimp_vectors_tree_view_item_new (GimpImage *image)
+{
+  GimpVectors *new_vectors;
+
+  new_vectors = gimp_vectors_new (image, _("Path"));
+
+  gimp_image_add_vectors (image, new_vectors,
+                          GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
+  return GIMP_ITEM (new_vectors);
+}
+
+static guchar *
+gimp_vectors_tree_view_drag_svg (GtkWidget *widget,
+                                 gsize     *svg_data_len,
+                                 gpointer   data)
+{
+  GimpItemTreeView *view  = GIMP_ITEM_TREE_VIEW (data);
+  GimpImage        *image = gimp_item_tree_view_get_image (view);
+  GimpItem         *item;
+  gchar            *svg_data = NULL;
+
+  item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
+
+  *svg_data_len = 0;
+
+  if (item)
+    {
+      svg_data = gimp_vectors_export_string (image, GIMP_VECTORS (item));
+
+      if (svg_data)
+        *svg_data_len = strlen (svg_data);
+    }
+
+  return (guchar *) svg_data;
+}
diff --git a/app/widgets/gimpvectorstreeview.h b/app/widgets/gimpvectorstreeview.h
new file mode 100644
index 0000000..1eb5cb9
--- /dev/null
+++ b/app/widgets/gimpvectorstreeview.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpvectorstreeview.h
+ * Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VECTORS_TREE_VIEW_H__
+#define __GIMP_VECTORS_TREE_VIEW_H__
+
+
+#include "gimpitemtreeview.h"
+
+
+#define GIMP_TYPE_VECTORS_TREE_VIEW            (gimp_vectors_tree_view_get_type ())
+#define GIMP_VECTORS_TREE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VECTORS_TREE_VIEW, GimpVectorsTreeView))
+#define GIMP_VECTORS_TREE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VECTORS_TREE_VIEW, GimpVectorsTreeViewClass))
+#define GIMP_IS_VECTORS_TREE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VECTORS_TREE_VIEW))
+#define GIMP_IS_VECTORS_TREE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VECTORS_TREE_VIEW))
+#define GIMP_VECTORS_TREE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_TREE_VIEW, GimpVectorsTreeViewClass))
+
+
+typedef struct _GimpVectorsTreeViewClass  GimpVectorsTreeViewClass;
+
+struct _GimpVectorsTreeView
+{
+  GimpItemTreeView  parent_instance;
+
+  GtkWidget        *toselection_button;
+  GtkWidget        *tovectors_button;
+  GtkWidget        *stroke_button;
+};
+
+struct _GimpVectorsTreeViewClass
+{
+  GimpItemTreeViewClass  parent_class;
+};
+
+
+GType   gimp_vectors_tree_view_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_VECTORS_TREE_VIEW_H__  */
diff --git a/app/widgets/gimpview-popup.c b/app/widgets/gimpview-popup.c
new file mode 100644
index 0000000..4a52355
--- /dev/null
+++ b/app/widgets/gimpview-popup.c
@@ -0,0 +1,243 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpview-popup.c
+ * Copyright (C) 2003-2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpviewable.h"
+
+#include "gimpview.h"
+#include "gimpviewrenderer.h"
+#include "gimpview-popup.h"
+
+
+#define VIEW_POPUP_DELAY 150
+
+
+typedef struct _GimpViewPopup GimpViewPopup;
+
+struct _GimpViewPopup
+{
+  GtkWidget    *widget;
+  GimpContext  *context;
+  GimpViewable *viewable;
+
+  gint          popup_width;
+  gint          popup_height;
+  gboolean      dot_for_dot;
+  gint          button;
+  gint          button_x;
+  gint          button_y;
+
+  guint         timeout_id;
+  GtkWidget    *popup;
+};
+
+
+/*  local function prototypes  */
+
+static void       gimp_view_popup_hide           (GimpViewPopup  *popup);
+static gboolean   gimp_view_popup_button_release (GtkWidget      *widget,
+                                                  GdkEventButton *bevent,
+                                                  GimpViewPopup  *popup);
+static void       gimp_view_popup_unmap          (GtkWidget      *widget,
+                                                  GimpViewPopup  *popup);
+static void       gimp_view_popup_drag_begin     (GtkWidget      *widget,
+                                                  GdkDragContext *context,
+                                                  GimpViewPopup  *popup);
+static gboolean   gimp_view_popup_timeout        (GimpViewPopup  *popup);
+
+
+/*  public functions  */
+
+gboolean
+gimp_view_popup_show (GtkWidget      *widget,
+                      GdkEventButton *bevent,
+                      GimpContext    *context,
+                      GimpViewable   *viewable,
+                      gint            view_width,
+                      gint            view_height,
+                      gboolean        dot_for_dot)
+{
+  GimpViewPopup *popup;
+  gint           popup_width;
+  gint           popup_height;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  g_return_val_if_fail (bevent != NULL, FALSE);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), FALSE);
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), FALSE);
+
+  if (! gimp_viewable_get_popup_size (viewable,
+                                      view_width,
+                                      view_height,
+                                      dot_for_dot,
+                                      &popup_width,
+                                      &popup_height))
+    return FALSE;
+
+  popup = g_slice_new0 (GimpViewPopup);
+
+  popup->widget       = widget;
+  popup->context      = context;
+  popup->viewable     = viewable;
+  popup->popup_width  = popup_width;
+  popup->popup_height = popup_height;
+  popup->dot_for_dot  = dot_for_dot;
+  popup->button       = bevent->button;
+  popup->button_x     = bevent->x_root;
+  popup->button_y     = bevent->y_root;
+
+  g_signal_connect (widget, "button-release-event",
+                    G_CALLBACK (gimp_view_popup_button_release),
+                    popup);
+  g_signal_connect (widget, "unmap",
+                    G_CALLBACK (gimp_view_popup_unmap),
+                    popup);
+  g_signal_connect (widget, "drag-begin",
+                    G_CALLBACK (gimp_view_popup_drag_begin),
+                    popup);
+
+  popup->timeout_id = g_timeout_add (VIEW_POPUP_DELAY,
+                                     (GSourceFunc) gimp_view_popup_timeout,
+                                     popup);
+
+  g_object_set_data_full (G_OBJECT (widget), "gimp-view-popup", popup,
+                          (GDestroyNotify) gimp_view_popup_hide);
+
+  gtk_grab_add (widget);
+
+  return TRUE;
+}
+
+
+/*  private functions  */
+
+static void
+gimp_view_popup_hide (GimpViewPopup *popup)
+{
+  if (popup->timeout_id)
+    g_source_remove (popup->timeout_id);
+
+  if (popup->popup)
+    gtk_widget_destroy (popup->popup);
+
+  g_signal_handlers_disconnect_by_func (popup->widget,
+                                        gimp_view_popup_button_release,
+                                        popup);
+  g_signal_handlers_disconnect_by_func (popup->widget,
+                                        gimp_view_popup_unmap,
+                                        popup);
+  g_signal_handlers_disconnect_by_func (popup->widget,
+                                        gimp_view_popup_drag_begin,
+                                        popup);
+
+  gtk_grab_remove (popup->widget);
+
+  g_slice_free (GimpViewPopup, popup);
+}
+
+static gboolean
+gimp_view_popup_button_release (GtkWidget      *widget,
+                                GdkEventButton *bevent,
+                                GimpViewPopup  *popup)
+{
+  if (bevent->button == popup->button)
+    g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
+
+  return FALSE;
+}
+
+static void
+gimp_view_popup_unmap (GtkWidget     *widget,
+                       GimpViewPopup *popup)
+{
+  g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
+}
+
+static void
+gimp_view_popup_drag_begin (GtkWidget      *widget,
+                            GdkDragContext *context,
+                            GimpViewPopup  *popup)
+{
+  g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
+}
+
+static gboolean
+gimp_view_popup_timeout (GimpViewPopup *popup)
+{
+  GtkWidget    *window;
+  GtkWidget    *frame;
+  GtkWidget    *view;
+  GdkScreen    *screen;
+  GdkRectangle  rect;
+  gint          monitor;
+  gint          x;
+  gint          y;
+
+  popup->timeout_id = 0;
+
+  screen = gtk_widget_get_screen (popup->widget);
+
+  window = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+  gtk_window_set_screen (GTK_WINDOW (window), screen);
+  gtk_window_set_transient_for (GTK_WINDOW (window),
+                                GTK_WINDOW (gtk_widget_get_toplevel (popup->widget)));
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (window), frame);
+  gtk_widget_show (frame);
+
+  view = gimp_view_new_full (popup->context,
+                             popup->viewable,
+                             popup->popup_width,
+                             popup->popup_height,
+                             0, TRUE, FALSE, FALSE);
+  gimp_view_renderer_set_dot_for_dot (GIMP_VIEW (view)->renderer,
+                                      popup->dot_for_dot);
+  gtk_container_add (GTK_CONTAINER (frame), view);
+  gtk_widget_show (view);
+
+  x = popup->button_x - (popup->popup_width  / 2);
+  y = popup->button_y - (popup->popup_height / 2);
+
+  monitor = gdk_screen_get_monitor_at_point (screen, x, y);
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  x = CLAMP (x, rect.x, rect.x + rect.width  - popup->popup_width);
+  y = CLAMP (y, rect.y, rect.y + rect.height - popup->popup_height);
+
+  gtk_window_move (GTK_WINDOW (window), x, y);
+  gtk_widget_show (window);
+
+  popup->popup = window;
+
+  return FALSE;
+}
diff --git a/app/widgets/gimpview-popup.h b/app/widgets/gimpview-popup.h
new file mode 100644
index 0000000..4cfdaa9
--- /dev/null
+++ b/app/widgets/gimpview-popup.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpview-popup.h
+ * Copyright (C) 2003-2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_POPUP_H__
+#define __GIMP_VIEW_POPUP_H__
+
+
+gboolean   gimp_view_popup_show (GtkWidget      *widget,
+                                 GdkEventButton *bevent,
+                                 GimpContext    *context,
+                                 GimpViewable   *viewable,
+                                 gint            view_width,
+                                 gint            view_height,
+                                 gboolean        dot_for_dot);
+
+
+#endif /* __GIMP_VIEW_POPUP_H__ */
diff --git a/app/widgets/gimpview.c b/app/widgets/gimpview.c
new file mode 100644
index 0000000..04397c9
--- /dev/null
+++ b/app/widgets/gimpview.c
@@ -0,0 +1,856 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpview.c
+ * Copyright (C) 2001-2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpmarshal.h"
+#include "core/gimpviewable.h"
+
+#include "gimpdnd.h"
+#include "gimpview.h"
+#include "gimpview-popup.h"
+#include "gimpviewrenderer.h"
+#include "gimpviewrenderer-utils.h"
+
+
+enum
+{
+  SET_VIEWABLE,
+  CLICKED,
+  DOUBLE_CLICKED,
+  CONTEXT,
+  LAST_SIGNAL
+};
+
+
+static void        gimp_view_dispose              (GObject          *object);
+
+static void        gimp_view_realize              (GtkWidget        *widget);
+static void        gimp_view_unrealize            (GtkWidget        *widget);
+static void        gimp_view_map                  (GtkWidget        *widget);
+static void        gimp_view_unmap                (GtkWidget        *widget);
+static void        gimp_view_size_request         (GtkWidget        *widget,
+                                                   GtkRequisition   *requisition);
+static void        gimp_view_size_allocate        (GtkWidget        *widget,
+                                                   GtkAllocation    *allocation);
+static void        gimp_view_style_set            (GtkWidget        *widget,
+                                                   GtkStyle         *prev_style);
+static gboolean    gimp_view_expose_event         (GtkWidget        *widget,
+                                                   GdkEventExpose   *event);
+static gboolean    gimp_view_button_press_event   (GtkWidget        *widget,
+                                                   GdkEventButton   *bevent);
+static gboolean    gimp_view_button_release_event (GtkWidget        *widget,
+                                                   GdkEventButton   *bevent);
+static gboolean    gimp_view_enter_notify_event   (GtkWidget        *widget,
+                                                   GdkEventCrossing *event);
+static gboolean    gimp_view_leave_notify_event   (GtkWidget        *widget,
+                                                   GdkEventCrossing *event);
+
+static void        gimp_view_real_set_viewable    (GimpView         *view,
+                                                   GimpViewable     *old,
+                                                   GimpViewable     *viewable);
+
+static void        gimp_view_update_callback      (GimpViewRenderer *renderer,
+                                                   GimpView         *view);
+
+static void        gimp_view_monitor_changed      (GimpView         *view);
+
+static GimpViewable * gimp_view_drag_viewable     (GtkWidget        *widget,
+                                                   GimpContext     **context,
+                                                   gpointer          data);
+static GdkPixbuf    * gimp_view_drag_pixbuf       (GtkWidget        *widget,
+                                                   gpointer          data);
+
+
+G_DEFINE_TYPE (GimpView, gimp_view, GTK_TYPE_WIDGET)
+
+#define parent_class gimp_view_parent_class
+
+static guint view_signals[LAST_SIGNAL] = { 0 };
+
+
+static void
+gimp_view_class_init (GimpViewClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  view_signals[SET_VIEWABLE] =
+    g_signal_new ("set-viewable",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewClass, set_viewable),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_OBJECT,
+                  G_TYPE_NONE, 2,
+                  GIMP_TYPE_VIEWABLE, GIMP_TYPE_VIEWABLE);
+
+  view_signals[CLICKED] =
+    g_signal_new ("clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewClass, clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__FLAGS,
+                  G_TYPE_NONE, 1,
+                  GDK_TYPE_MODIFIER_TYPE);
+
+  view_signals[DOUBLE_CLICKED] =
+    g_signal_new ("double-clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewClass, double_clicked),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  view_signals[CONTEXT] =
+    g_signal_new ("context",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewClass, context),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose              = gimp_view_dispose;
+
+  widget_class->activate_signal      = view_signals[CLICKED];
+  widget_class->realize              = gimp_view_realize;
+  widget_class->unrealize            = gimp_view_unrealize;
+  widget_class->map                  = gimp_view_map;
+  widget_class->unmap                = gimp_view_unmap;
+  widget_class->size_request         = gimp_view_size_request;
+  widget_class->size_allocate        = gimp_view_size_allocate;
+  widget_class->style_set            = gimp_view_style_set;
+  widget_class->expose_event         = gimp_view_expose_event;
+  widget_class->button_press_event   = gimp_view_button_press_event;
+  widget_class->button_release_event = gimp_view_button_release_event;
+  widget_class->enter_notify_event   = gimp_view_enter_notify_event;
+  widget_class->leave_notify_event   = gimp_view_leave_notify_event;
+
+  klass->set_viewable                = gimp_view_real_set_viewable;
+  klass->clicked                     = NULL;
+  klass->double_clicked              = NULL;
+  klass->context                     = NULL;
+}
+
+static void
+gimp_view_init (GimpView *view)
+{
+  gtk_widget_set_has_window (GTK_WIDGET (view), FALSE);
+  gtk_widget_add_events (GTK_WIDGET (view),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_ENTER_NOTIFY_MASK   |
+                         GDK_LEAVE_NOTIFY_MASK);
+
+  view->clickable         = FALSE;
+  view->eat_button_events = TRUE;
+  view->show_popup        = FALSE;
+  view->expand            = FALSE;
+
+  view->in_button         = FALSE;
+  view->has_grab          = FALSE;
+  view->press_state       = 0;
+
+  gimp_widget_track_monitor (GTK_WIDGET (view),
+                             G_CALLBACK (gimp_view_monitor_changed),
+                             NULL);
+}
+
+static void
+gimp_view_dispose (GObject *object)
+{
+  GimpView *view = GIMP_VIEW (object);
+
+  if (view->viewable)
+    gimp_view_set_viewable (view, NULL);
+
+  g_clear_object (&view->renderer);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_view_realize (GtkWidget *widget)
+{
+  GimpView      *view = GIMP_VIEW (widget);
+  GtkAllocation  allocation;
+  GdkWindowAttr  attributes;
+  gint           attributes_mask;
+
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x           = allocation.x;
+  attributes.y           = allocation.y;
+  attributes.width       = allocation.width;
+  attributes.height      = allocation.height;
+  attributes.wclass      = GDK_INPUT_ONLY;
+  attributes.event_mask  = gtk_widget_get_events (widget);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  view->event_window = gdk_window_new (gtk_widget_get_window (widget),
+                                       &attributes, attributes_mask);
+  gdk_window_set_user_data (view->event_window, view);
+}
+
+static void
+gimp_view_unrealize (GtkWidget *widget)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+  if (view->event_window)
+    {
+      gdk_window_set_user_data (view->event_window, NULL);
+      gdk_window_destroy (view->event_window);
+      view->event_window = NULL;
+    }
+
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+}
+
+static void
+gimp_view_map (GtkWidget *widget)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+  if (view->event_window)
+    gdk_window_show (view->event_window);
+}
+
+static void
+gimp_view_unmap (GtkWidget *widget)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+  if (view->has_grab)
+    {
+      gtk_grab_remove (widget);
+      view->has_grab = FALSE;
+    }
+
+  if (view->event_window)
+    gdk_window_hide (view->event_window);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+gimp_view_size_request (GtkWidget      *widget,
+                        GtkRequisition *requisition)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+  if (view->expand)
+    {
+      requisition->width  = 2 * view->renderer->border_width + 1;
+      requisition->height = 2 * view->renderer->border_width + 1;
+    }
+  else
+    {
+      requisition->width  = (view->renderer->width +
+                             2 * view->renderer->border_width);
+      requisition->height = (view->renderer->height +
+                             2 * view->renderer->border_width);
+    }
+}
+
+static void
+gimp_view_size_allocate (GtkWidget     *widget,
+                         GtkAllocation *allocation)
+{
+  GimpView *view = GIMP_VIEW (widget);
+  gint      width;
+  gint      height;
+
+  if (view->expand)
+    {
+      width  = MIN (GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
+                    allocation->width - 2 * view->renderer->border_width);
+      height = MIN (GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
+                    allocation->height - 2 * view->renderer->border_width);
+
+      if (view->renderer->width  != width ||
+          view->renderer->height != height)
+        {
+          gint border_width = view->renderer->border_width;
+
+          if (view->renderer->size != -1 && view->renderer->viewable)
+            {
+              gint view_width;
+              gint view_height;
+              gint scaled_width;
+              gint scaled_height;
+
+              gimp_viewable_get_preview_size (view->renderer->viewable,
+                                              GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
+                                              view->renderer->is_popup,
+                                              view->renderer->dot_for_dot,
+                                              &view_width,
+                                              &view_height);
+
+              gimp_viewable_calc_preview_size (view_width, view_height,
+                                               width, height,
+                                               TRUE, 1.0, 1.0,
+                                               &scaled_width, &scaled_height,
+                                               NULL);
+
+              if (scaled_width > width)
+                {
+                  scaled_height = scaled_height * width / scaled_width;
+                  scaled_width  = scaled_width  * width / scaled_width;
+                }
+              else if (scaled_height > height)
+                {
+                  scaled_width  = scaled_width  * height / scaled_height;
+                  scaled_height = scaled_height * height / scaled_height;
+                }
+
+              gimp_view_renderer_set_size (view->renderer,
+                                           MAX (scaled_width, scaled_height),
+                                           border_width);
+            }
+          else
+            {
+              gimp_view_renderer_set_size_full (view->renderer,
+                                                width, height,
+                                                border_width);
+            }
+
+          gimp_view_renderer_remove_idle (view->renderer);
+        }
+    }
+
+  width  = (view->renderer->width +
+            2 * view->renderer->border_width);
+  height = (view->renderer->height +
+            2 * view->renderer->border_width);
+
+  if (allocation->width > width)
+    allocation->x += (allocation->width - width) / 2;
+
+  if (allocation->height > height)
+    allocation->y += (allocation->height - height) / 2;
+
+  allocation->width  = width;
+  allocation->height = height;
+
+  GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    gdk_window_move_resize (view->event_window,
+                            allocation->x,
+                            allocation->y,
+                            allocation->width,
+                            allocation->height);
+}
+
+static void
+gimp_view_style_set (GtkWidget *widget,
+                     GtkStyle  *prev_style)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
+
+  gimp_view_renderer_invalidate (view->renderer);
+}
+
+static gboolean
+gimp_view_expose_event (GtkWidget      *widget,
+                        GdkEventExpose *event)
+{
+  if (gtk_widget_is_drawable (widget))
+    {
+      GtkAllocation  allocation;
+      cairo_t       *cr;
+
+      gtk_widget_get_allocation (widget, &allocation);
+
+      cr = gdk_cairo_create (event->window);
+      gdk_cairo_region (cr, event->region);
+      cairo_clip (cr);
+
+      cairo_translate (cr, allocation.x, allocation.y);
+
+      gimp_view_renderer_draw (GIMP_VIEW (widget)->renderer,
+                               widget, cr,
+                               allocation.width,
+                               allocation.height);
+
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+
+#define DEBUG_MEMSIZE 1
+
+#ifdef DEBUG_MEMSIZE
+extern gboolean gimp_debug_memsize;
+#endif
+
+static gboolean
+gimp_view_button_press_event (GtkWidget      *widget,
+                              GdkEventButton *bevent)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+#ifdef DEBUG_MEMSIZE
+  if (bevent->type == GDK_BUTTON_PRESS && bevent->button == 2)
+    {
+      gimp_debug_memsize = TRUE;
+
+      gimp_object_get_memsize (GIMP_OBJECT (view->viewable), NULL);
+
+      gimp_debug_memsize = FALSE;
+    }
+#endif /* DEBUG_MEMSIZE */
+
+  if (! view->clickable &&
+      ! view->show_popup)
+    return FALSE;
+
+  if (! gtk_widget_get_realized (widget))
+    return FALSE;
+
+  if (bevent->type == GDK_BUTTON_PRESS)
+    {
+      if (gdk_event_triggers_context_menu ((GdkEvent *) bevent))
+        {
+          view->press_state = 0;
+
+          g_signal_emit (widget, view_signals[CONTEXT], 0);
+        }
+      else if (bevent->button == 1)
+        {
+          gtk_grab_add (widget);
+
+          view->has_grab    = TRUE;
+          view->press_state = bevent->state;
+
+          if (view->show_popup && view->viewable)
+            {
+              gimp_view_popup_show (widget, bevent,
+                                    view->renderer->context,
+                                    view->viewable,
+                                    view->renderer->width,
+                                    view->renderer->height,
+                                    view->renderer->dot_for_dot);
+            }
+        }
+      else
+        {
+          view->press_state = 0;
+
+          if (bevent->button == 2)
+            gimp_view_popup_show (widget, bevent,
+                                  view->renderer->context,
+                                  view->viewable,
+                                  view->renderer->width,
+                                  view->renderer->height,
+                                  view->renderer->dot_for_dot);
+
+          return FALSE;
+        }
+    }
+  else if (bevent->type == GDK_2BUTTON_PRESS)
+    {
+      if (bevent->button == 1)
+        g_signal_emit (widget, view_signals[DOUBLE_CLICKED], 0);
+    }
+
+  return view->eat_button_events ? TRUE : FALSE;
+}
+
+static gboolean
+gimp_view_button_release_event (GtkWidget      *widget,
+                                GdkEventButton *bevent)
+{
+  GimpView *view = GIMP_VIEW (widget);
+
+  if (! view->clickable &&
+      ! view->show_popup)
+    return FALSE;
+
+  if (bevent->button == 1)
+    {
+      gtk_grab_remove (widget);
+      view->has_grab = FALSE;
+
+      if (view->clickable && view->in_button)
+        {
+          g_signal_emit (widget, view_signals[CLICKED], 0, view->press_state);
+        }
+    }
+  else
+    {
+      return FALSE;
+    }
+
+  return view->eat_button_events ? TRUE : FALSE;
+}
+
+static gboolean
+gimp_view_enter_notify_event (GtkWidget        *widget,
+                              GdkEventCrossing *event)
+{
+  GimpView  *view         = GIMP_VIEW (widget);
+  GtkWidget *event_widget = gtk_get_event_widget ((GdkEvent *) event);
+
+  if ((event_widget == widget) &&
+      (event->detail != GDK_NOTIFY_INFERIOR))
+    {
+      view->in_button = TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gimp_view_leave_notify_event (GtkWidget        *widget,
+                              GdkEventCrossing *event)
+{
+  GimpView  *view         = GIMP_VIEW (widget);
+  GtkWidget *event_widget = gtk_get_event_widget ((GdkEvent *) event);
+
+  if ((event_widget == widget) &&
+      (event->detail != GDK_NOTIFY_INFERIOR))
+    {
+      view->in_button = FALSE;
+    }
+
+  return FALSE;
+}
+
+static void
+gimp_view_real_set_viewable (GimpView     *view,
+                             GimpViewable *old,
+                             GimpViewable *viewable)
+{
+  GType viewable_type = G_TYPE_NONE;
+
+  if (viewable == view->viewable)
+    return;
+
+  if (viewable)
+    {
+      viewable_type = G_TYPE_FROM_INSTANCE (viewable);
+
+      g_return_if_fail (g_type_is_a (viewable_type,
+                                     view->renderer->viewable_type));
+    }
+
+  if (view->viewable)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (view->viewable),
+                                    (gpointer) &view->viewable);
+
+      if (! viewable && ! view->renderer->is_popup)
+        {
+          if (gimp_dnd_viewable_source_remove (GTK_WIDGET (view),
+                                               G_TYPE_FROM_INSTANCE (view->viewable)))
+            {
+              if (gimp_viewable_get_size (view->viewable, NULL, NULL))
+                gimp_dnd_pixbuf_source_remove (GTK_WIDGET (view));
+
+              gtk_drag_source_unset (GTK_WIDGET (view));
+            }
+        }
+    }
+  else if (viewable && ! view->renderer->is_popup)
+    {
+      if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (view),
+                                            GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                                            viewable_type,
+                                            GDK_ACTION_COPY))
+        {
+          gimp_dnd_viewable_source_add (GTK_WIDGET (view),
+                                        viewable_type,
+                                        gimp_view_drag_viewable,
+                                        NULL);
+
+          if (gimp_viewable_get_size (viewable, NULL, NULL))
+            gimp_dnd_pixbuf_source_add (GTK_WIDGET (view),
+                                        gimp_view_drag_pixbuf,
+                                        NULL);
+        }
+    }
+
+  gimp_view_renderer_set_viewable (view->renderer, viewable);
+  view->viewable = viewable;
+
+  if (view->viewable)
+    {
+      g_object_add_weak_pointer (G_OBJECT (view->viewable),
+                                 (gpointer) &view->viewable);
+    }
+}
+
+/*  public functions  */
+
+GtkWidget *
+gimp_view_new (GimpContext  *context,
+               GimpViewable *viewable,
+               gint          size,
+               gint          border_width,
+               gboolean      is_popup)
+{
+  GtkWidget *view;
+
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+
+  view = gimp_view_new_by_types (context,
+                                 GIMP_TYPE_VIEW,
+                                 G_TYPE_FROM_INSTANCE (viewable),
+                                 size, border_width, is_popup);
+
+  if (view)
+    gimp_view_set_viewable (GIMP_VIEW (view), viewable);
+
+  gimp_view_renderer_remove_idle (GIMP_VIEW (view)->renderer);
+
+  return view;
+}
+
+GtkWidget *
+gimp_view_new_full (GimpContext  *context,
+                    GimpViewable *viewable,
+                    gint          width,
+                    gint          height,
+                    gint          border_width,
+                    gboolean      is_popup,
+                    gboolean      clickable,
+                    gboolean      show_popup)
+{
+  GtkWidget *view;
+
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
+
+  view = gimp_view_new_full_by_types (context,
+                                      GIMP_TYPE_VIEW,
+                                      G_TYPE_FROM_INSTANCE (viewable),
+                                      width, height, border_width,
+                                      is_popup, clickable, show_popup);
+
+  if (view)
+    gimp_view_set_viewable (GIMP_VIEW (view), viewable);
+
+  gimp_view_renderer_remove_idle (GIMP_VIEW (view)->renderer);
+
+  return view;
+}
+
+GtkWidget *
+gimp_view_new_by_types (GimpContext *context,
+                        GType        view_type,
+                        GType        viewable_type,
+                        gint         size,
+                        gint         border_width,
+                        gboolean     is_popup)
+{
+  GimpViewRenderer *renderer;
+  GimpView         *view;
+
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (g_type_is_a (view_type, GIMP_TYPE_VIEW), NULL);
+  g_return_val_if_fail (g_type_is_a (viewable_type, GIMP_TYPE_VIEWABLE), NULL);
+  g_return_val_if_fail (size >  0 &&
+                        size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (border_width >= 0 &&
+                        border_width <= GIMP_VIEW_MAX_BORDER_WIDTH, NULL);
+
+  renderer = gimp_view_renderer_new (context, viewable_type, size,
+                                     border_width, is_popup);
+
+  g_return_val_if_fail (renderer != NULL, NULL);
+
+  view = g_object_new (view_type, NULL);
+
+  g_signal_connect (renderer, "update",
+                    G_CALLBACK (gimp_view_update_callback),
+                    view);
+
+  view->renderer = renderer;
+
+  return GTK_WIDGET (view);
+}
+
+GtkWidget *
+gimp_view_new_full_by_types (GimpContext *context,
+                             GType        view_type,
+                             GType        viewable_type,
+                             gint         width,
+                             gint         height,
+                             gint         border_width,
+                             gboolean     is_popup,
+                             gboolean     clickable,
+                             gboolean     show_popup)
+{
+  GimpViewRenderer *renderer;
+  GimpView         *view;
+
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (g_type_is_a (view_type, GIMP_TYPE_VIEW), NULL);
+  g_return_val_if_fail (g_type_is_a (viewable_type, GIMP_TYPE_VIEWABLE), NULL);
+  g_return_val_if_fail (width >  0 &&
+                        width <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (height >  0 &&
+                        height <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (border_width >= 0 &&
+                        border_width <= GIMP_VIEW_MAX_BORDER_WIDTH, NULL);
+
+  renderer = gimp_view_renderer_new_full (context, viewable_type,
+                                          width, height, border_width,
+                                          is_popup);
+
+  g_return_val_if_fail (renderer != NULL, NULL);
+
+  view = g_object_new (view_type, NULL);
+
+  g_signal_connect (renderer, "update",
+                    G_CALLBACK (gimp_view_update_callback),
+                    view);
+
+  view->renderer   = renderer;
+  view->clickable  = clickable  ? TRUE : FALSE;
+  view->show_popup = show_popup ? TRUE : FALSE;
+
+  return GTK_WIDGET (view);
+}
+
+GimpViewable *
+gimp_view_get_viewable (GimpView *view)
+{
+  g_return_val_if_fail (GIMP_IS_VIEW (view), NULL);
+
+  return view->viewable;
+}
+
+void
+gimp_view_set_viewable (GimpView     *view,
+                        GimpViewable *viewable)
+{
+  g_return_if_fail (GIMP_IS_VIEW (view));
+  g_return_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable));
+
+  if (viewable == view->viewable)
+    return;
+
+  g_signal_emit (view, view_signals[SET_VIEWABLE], 0, view->viewable, viewable);
+}
+
+void
+gimp_view_set_expand (GimpView *view,
+                      gboolean  expand)
+{
+  g_return_if_fail (GIMP_IS_VIEW (view));
+
+  if (view->expand != expand)
+    {
+      view->expand = expand ? TRUE : FALSE;
+      gtk_widget_queue_resize (GTK_WIDGET (view));
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_view_update_callback (GimpViewRenderer *renderer,
+                           GimpView         *view)
+{
+  GtkWidget      *widget = GTK_WIDGET (view);
+  GtkRequisition  requisition;
+  gint            width;
+  gint            height;
+
+  gtk_widget_get_requisition (widget, &requisition);
+
+  width  = renderer->width  + 2 * renderer->border_width;
+  height = renderer->height + 2 * renderer->border_width;
+
+  if (width  != requisition.width ||
+      height != requisition.height)
+    {
+      gtk_widget_queue_resize (widget);
+    }
+  else
+    {
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+static void
+gimp_view_monitor_changed (GimpView *view)
+{
+  if (view->renderer)
+    gimp_view_renderer_free_color_transform (view->renderer);
+}
+
+static GimpViewable *
+gimp_view_drag_viewable (GtkWidget    *widget,
+                         GimpContext **context,
+                         gpointer      data)
+{
+  if (context)
+    *context = GIMP_VIEW (widget)->renderer->context;
+
+  return GIMP_VIEW (widget)->viewable;
+}
+
+static GdkPixbuf *
+gimp_view_drag_pixbuf (GtkWidget *widget,
+                       gpointer   data)
+{
+  GimpView     *view     = GIMP_VIEW (widget);
+  GimpViewable *viewable = view->viewable;
+  gint          width;
+  gint          height;
+
+  if (viewable && gimp_viewable_get_size (viewable, &width, &height))
+    return gimp_viewable_get_new_pixbuf (viewable, view->renderer->context,
+                                         width, height);
+
+  return NULL;
+}
diff --git a/app/widgets/gimpview.h b/app/widgets/gimpview.h
new file mode 100644
index 0000000..328aa5c
--- /dev/null
+++ b/app/widgets/gimpview.h
@@ -0,0 +1,108 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpview.h
+ * Copyright (C) 2001-2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_H__
+#define __GIMP_VIEW_H__
+
+
+#define GIMP_TYPE_VIEW            (gimp_view_get_type ())
+#define GIMP_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW, GimpView))
+#define GIMP_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW, GimpViewClass))
+#define GIMP_IS_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW))
+#define GIMP_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW))
+#define GIMP_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW, GimpViewClass))
+
+
+typedef struct _GimpViewClass  GimpViewClass;
+
+struct _GimpView
+{
+  GtkWidget         parent_instance;
+
+  GdkWindow        *event_window;
+
+  GimpViewable     *viewable;
+  GimpViewRenderer *renderer;
+
+  guint             clickable : 1;
+  guint             eat_button_events : 1;
+  guint             show_popup : 1;
+  guint             expand : 1;
+
+  /*< private >*/
+  guint             in_button : 1;
+  guint             has_grab : 1;
+  GdkModifierType   press_state;
+};
+
+struct _GimpViewClass
+{
+  GtkWidgetClass  parent_class;
+
+  /*  signals  */
+  void        (* set_viewable)   (GimpView        *view,
+                                  GimpViewable    *old_viewable,
+                                  GimpViewable    *new_viewable);
+  void        (* clicked)        (GimpView        *view,
+                                  GdkModifierType  modifier_state);
+  void        (* double_clicked) (GimpView        *view);
+  void        (* context)        (GimpView        *view);
+};
+
+
+GType          gimp_view_get_type          (void) G_GNUC_CONST;
+
+GtkWidget    * gimp_view_new               (GimpContext   *context,
+                                            GimpViewable  *viewable,
+                                            gint           size,
+                                            gint           border_width,
+                                            gboolean       is_popup);
+GtkWidget    * gimp_view_new_full          (GimpContext   *context,
+                                            GimpViewable  *viewable,
+                                            gint           width,
+                                            gint           height,
+                                            gint           border_width,
+                                            gboolean       is_popup,
+                                            gboolean       clickable,
+                                            gboolean       show_popup);
+GtkWidget    * gimp_view_new_by_types      (GimpContext   *context,
+                                            GType          view_type,
+                                            GType          viewable_type,
+                                            gint           size,
+                                            gint           border_width,
+                                            gboolean       is_popup);
+GtkWidget    * gimp_view_new_full_by_types (GimpContext   *context,
+                                            GType          view_type,
+                                            GType          viewable_type,
+                                            gint           width,
+                                            gint           height,
+                                            gint           border_width,
+                                            gboolean       is_popup,
+                                            gboolean       clickable,
+                                            gboolean       show_popup);
+
+GimpViewable * gimp_view_get_viewable      (GimpView      *view);
+void           gimp_view_set_viewable      (GimpView      *view,
+                                            GimpViewable  *viewable);
+void           gimp_view_set_expand        (GimpView      *view,
+                                            gboolean       expand);
+
+
+#endif /* __GIMP_VIEW_H__ */
diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c
new file mode 100644
index 0000000..f2c8a53
--- /dev/null
+++ b/app/widgets/gimpviewablebox.c
@@ -0,0 +1,769 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpconfig-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpdatafactory.h"
+
+#include "gimpcontainerentry.h"
+#include "gimpdialogfactory.h"
+#include "gimppropwidgets.h"
+#include "gimpview.h"
+#include "gimpviewablebutton.h"
+#include "gimpviewablebox.h"
+#include "gimpviewrenderergradient.h"
+#include "gimpwidgets-utils.h"
+#include "gimpwindowstrategy.h"
+
+#include "gimp-intl.h"
+
+
+/*  local function prototypes  */
+
+static GtkWidget * gimp_viewable_box_new       (GimpContainer *container,
+                                                GimpContext   *context,
+                                                const gchar   *label,
+                                                gint           spacing,
+                                                GimpViewType   view_type,
+                                                GimpViewSize   button_view_size,
+                                                GimpViewSize   view_size,
+                                                const gchar   *dialog_identifier,
+                                                const gchar   *dialog_icon_name,
+                                                const gchar   *dialog_tooltip,
+                                                const gchar   *editor_id,
+                                                const gchar   *editor_tooltip);
+static GtkWidget * view_props_connect          (GtkWidget     *box,
+                                                GimpContext   *context,
+                                                const gchar   *view_type_prop,
+                                                const gchar   *view_size_prop);
+static void   gimp_viewable_box_edit_clicked   (GtkWidget          *widget,
+                                                GimpViewableButton *button);
+static void   gimp_gradient_box_reverse_notify (GObject       *object,
+                                                GParamSpec    *pspec,
+                                                GimpView      *view);
+static void   gimp_gradient_box_blend_notify   (GObject       *object,
+                                                GParamSpec    *pspec,
+                                                GimpView      *view);
+
+
+/*  brush boxes  */
+
+static GtkWidget *
+brush_box_new (GimpContainer *container,
+               GimpContext   *context,
+               const gchar   *label,
+               gint           spacing,
+               GimpViewType   view_type,
+               GimpViewSize   view_size,
+               const gchar   *editor_id,
+               const gchar   *editor_tooltip)
+{
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->brush_factory);
+
+  return gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_SMALL, view_size,
+                                "gimp-brush-grid|gimp-brush-list",
+                                GIMP_ICON_BRUSH,
+                                _("Open the brush selection dialog"),
+                                editor_id, editor_tooltip);
+}
+
+GtkWidget *
+gimp_brush_box_new (GimpContainer *container,
+                    GimpContext   *context,
+                    const gchar   *label,
+                    gint           spacing)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return brush_box_new (container, context, label, spacing,
+                        GIMP_VIEW_TYPE_GRID, GIMP_VIEW_SIZE_SMALL,
+                        NULL, NULL);
+}
+
+GtkWidget *
+gimp_prop_brush_box_new (GimpContainer *container,
+                         GimpContext   *context,
+                         const gchar   *label,
+                         gint           spacing,
+                         const gchar   *view_type_prop,
+                         const gchar   *view_size_prop,
+                         const gchar   *editor_id,
+                         const gchar   *editor_tooltip)
+{
+  GimpViewType view_type;
+  GimpViewSize view_size;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  g_object_get (context,
+                view_type_prop, &view_type,
+                view_size_prop, &view_size,
+                NULL);
+
+  return view_props_connect (brush_box_new (container, context, label, spacing,
+                                            view_type, view_size,
+                                            editor_id, editor_tooltip),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  dynamics boxes  */
+
+static GtkWidget *
+dynamics_box_new (GimpContainer *container,
+                  GimpContext   *context,
+                  const gchar   *label,
+                  gint           spacing,
+                  GimpViewType   view_type,
+                  GimpViewSize   view_size,
+                  const gchar   *editor_id,
+                  const gchar   *editor_tooltip)
+{
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->dynamics_factory);
+
+  return gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_SMALL, view_size,
+                                "gimp-dynamics-list|gimp-dynamics-grid",
+                                GIMP_ICON_DYNAMICS,
+                                _("Open the dynamics selection dialog"),
+                                editor_id, editor_tooltip);
+}
+
+GtkWidget *
+gimp_dynamics_box_new (GimpContainer *container,
+                       GimpContext   *context,
+                       const gchar   *label,
+                       gint           spacing)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return dynamics_box_new (container, context, label, spacing,
+                           GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_SMALL,
+                           NULL, NULL);
+}
+
+GtkWidget *
+gimp_prop_dynamics_box_new (GimpContainer *container,
+                            GimpContext   *context,
+                            const gchar   *label,
+                            gint           spacing,
+                            const gchar   *view_type_prop,
+                            const gchar   *view_size_prop,
+                            const gchar   *editor_id,
+                            const gchar   *editor_tooltip)
+{
+  GimpViewType view_type;
+  GimpViewSize view_size;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  g_object_get (context,
+                view_type_prop, &view_type,
+                view_size_prop, &view_size,
+                NULL);
+
+  return view_props_connect (dynamics_box_new (container, context, label,
+                                               spacing,
+                                               view_type, view_size,
+                                               editor_id, editor_tooltip),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  brush boxes  */
+
+static GtkWidget *
+mybrush_box_new (GimpContainer *container,
+                 GimpContext   *context,
+                 const gchar   *label,
+                 gint           spacing,
+                 GimpViewType   view_type,
+                 GimpViewSize   view_size)
+{
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->mybrush_factory);
+
+  return gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_LARGE, view_size,
+                                "gimp-mypaint-brush-grid|gimp-mypaint-brush-list",
+                                GIMP_ICON_BRUSH,
+                                _("Open the MyPaint brush selection dialog"),
+                                NULL, NULL);
+}
+
+GtkWidget *
+gimp_mybrush_box_new (GimpContainer *container,
+                      GimpContext   *context,
+                      const gchar   *label,
+                      gint           spacing)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return mybrush_box_new (container, context, label, spacing,
+                          GIMP_VIEW_TYPE_GRID, GIMP_VIEW_SIZE_LARGE);
+}
+
+GtkWidget *
+gimp_prop_mybrush_box_new (GimpContainer *container,
+                           GimpContext   *context,
+                           const gchar   *label,
+                           gint           spacing,
+                           const gchar   *view_type_prop,
+                           const gchar   *view_size_prop)
+{
+  GimpViewType view_type = GIMP_VIEW_TYPE_GRID;
+  GimpViewSize view_size = GIMP_VIEW_SIZE_LARGE;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  if (view_type_prop && view_size_prop)
+    g_object_get (context,
+                  view_type_prop, &view_type,
+                  view_size_prop, &view_size,
+                  NULL);
+
+  return view_props_connect (mybrush_box_new (container, context, label, spacing,
+                                              view_type, view_size),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  pattern boxes  */
+
+static GtkWidget *
+pattern_box_new (GimpContainer *container,
+                 GimpContext   *context,
+                 const gchar   *label,
+                 gint           spacing,
+                 GimpViewType   view_type,
+                 GimpViewSize   view_size)
+{
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->pattern_factory);
+
+  return gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_SMALL, view_size,
+                                "gimp-pattern-grid|gimp-pattern-list",
+                                GIMP_ICON_PATTERN,
+                                _("Open the pattern selection dialog"),
+                                NULL, NULL);
+}
+
+GtkWidget *
+gimp_pattern_box_new (GimpContainer *container,
+                      GimpContext   *context,
+                      const gchar   *label,
+                      gint           spacing)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return pattern_box_new (container, context, label, spacing,
+                          GIMP_VIEW_TYPE_GRID, GIMP_VIEW_SIZE_SMALL);
+}
+
+GtkWidget *
+gimp_prop_pattern_box_new (GimpContainer *container,
+                           GimpContext   *context,
+                           const gchar   *label,
+                           gint           spacing,
+                           const gchar   *view_type_prop,
+                           const gchar   *view_size_prop)
+{
+  GimpViewType view_type;
+  GimpViewSize view_size;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  g_object_get (context,
+                view_type_prop, &view_type,
+                view_size_prop, &view_size,
+                NULL);
+
+  return view_props_connect (pattern_box_new (container, context, label, spacing,
+                                              view_type, view_size),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  gradient boxes  */
+
+static GtkWidget *
+gradient_box_new (GimpContainer *container,
+                  GimpContext   *context,
+                  const gchar   *label,
+                  gint           spacing,
+                  GimpViewType   view_type,
+                  GimpViewSize   view_size,
+                  const gchar   *reverse_prop,
+                  const gchar   *blend_color_space_prop,
+                  const gchar   *editor_id,
+                  const gchar   *editor_tooltip)
+{
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GList     *children;
+
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->gradient_factory);
+
+  hbox = gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_SMALL, view_size,
+                                "gimp-gradient-list|gimp-gradient-grid",
+                                GIMP_ICON_GRADIENT,
+                                _("Open the gradient selection dialog"),
+                                editor_id, editor_tooltip);
+
+  children = gtk_container_get_children (GTK_CONTAINER (hbox));
+  button = children->data;
+  g_list_free (children);
+
+  GIMP_VIEWABLE_BUTTON (button)->button_view_size = GIMP_VIEW_SIZE_SMALL;
+
+  if (reverse_prop)
+    {
+      GtkWidget *toggle;
+      GtkWidget *view;
+      GtkWidget *image;
+      gchar     *signal_name;
+
+      toggle = gimp_prop_check_button_new (G_OBJECT (context), reverse_prop,
+                                           NULL);
+      gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (toggle), FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
+      gtk_box_reorder_child (GTK_BOX (hbox), toggle, 1);
+      gtk_widget_show (toggle);
+
+      gimp_help_set_help_data (toggle, _("Reverse"), NULL);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
+                                            GTK_ICON_SIZE_MENU);
+      /* gimp_prop_check_button_new() adds the property nick as label of
+       * the button by default. */
+      gtk_container_remove (GTK_CONTAINER (toggle),
+                            gtk_bin_get_child (GTK_BIN (toggle)));
+      gtk_container_add (GTK_CONTAINER (toggle), image);
+      gtk_widget_show (image);
+
+      view = gtk_bin_get_child (GTK_BIN (button));
+
+      signal_name = g_strconcat ("notify::", reverse_prop, NULL);
+      g_signal_connect_object (context, signal_name,
+                               G_CALLBACK (gimp_gradient_box_reverse_notify),
+                               G_OBJECT (view), 0);
+      g_free (signal_name);
+
+      gimp_gradient_box_reverse_notify (G_OBJECT (context),
+                                        NULL,
+                                        GIMP_VIEW (view));
+    }
+
+  if (blend_color_space_prop)
+    {
+      GtkWidget *view;
+      gchar     *signal_name;
+
+      view = gtk_bin_get_child (GTK_BIN (button));
+
+      signal_name = g_strconcat ("notify::", blend_color_space_prop, NULL);
+      g_signal_connect_object (context, signal_name,
+                               G_CALLBACK (gimp_gradient_box_blend_notify),
+                               G_OBJECT (view), 0);
+      g_free (signal_name);
+
+      gimp_gradient_box_blend_notify (G_OBJECT (context),
+                                      NULL,
+                                      GIMP_VIEW (view));
+    }
+
+  return hbox;
+}
+
+GtkWidget *
+gimp_gradient_box_new (GimpContainer *container,
+                       GimpContext   *context,
+                       const gchar   *label,
+                       gint           spacing,
+                       const gchar   *reverse_prop,
+                       const gchar   *blend_color_space_prop)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return gradient_box_new (container, context, label, spacing,
+                           GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_LARGE,
+                           reverse_prop, blend_color_space_prop,
+                           NULL, NULL);
+}
+
+GtkWidget *
+gimp_prop_gradient_box_new (GimpContainer *container,
+                            GimpContext   *context,
+                            const gchar   *label,
+                            gint           spacing,
+                            const gchar   *view_type_prop,
+                            const gchar   *view_size_prop,
+                            const gchar   *reverse_prop,
+                            const gchar   *blend_color_space_prop,
+                            const gchar   *editor_id,
+                            const gchar   *editor_tooltip)
+{
+  GimpViewType view_type;
+  GimpViewSize view_size;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  g_object_get (context,
+                view_type_prop, &view_type,
+                view_size_prop, &view_size,
+                NULL);
+
+  return view_props_connect (gradient_box_new (container, context, label, spacing,
+                                               view_type, view_size,
+                                               reverse_prop,
+                                               blend_color_space_prop,
+                                               editor_id, editor_tooltip),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  palette boxes  */
+
+static GtkWidget *
+palette_box_new (GimpContainer *container,
+                 GimpContext   *context,
+                 const gchar   *label,
+                 gint           spacing,
+                 GimpViewType   view_type,
+                 GimpViewSize   view_size,
+                 const gchar   *editor_id,
+                 const gchar   *editor_tooltip)
+{
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->palette_factory);
+
+  return gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_MEDIUM, view_size,
+                                "gimp-palette-list|gimp-palette-grid",
+                                GIMP_ICON_PALETTE,
+                                _("Open the palette selection dialog"),
+                                editor_id, editor_tooltip);
+}
+
+GtkWidget *
+gimp_palette_box_new (GimpContainer *container,
+                      GimpContext   *context,
+                      const gchar   *label,
+                      gint           spacing)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return palette_box_new (container, context, label, spacing,
+                          GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_MEDIUM,
+                          NULL, NULL);
+}
+
+GtkWidget *
+gimp_prop_palette_box_new (GimpContainer *container,
+                           GimpContext   *context,
+                           const gchar   *label,
+                           gint           spacing,
+                           const gchar   *view_type_prop,
+                           const gchar   *view_size_prop,
+                           const gchar   *editor_id,
+                           const gchar   *editor_tooltip)
+{
+  GimpViewType view_type;
+  GimpViewSize view_size;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  g_object_get (context,
+                view_type_prop, &view_type,
+                view_size_prop, &view_size,
+                NULL);
+
+  return view_props_connect (palette_box_new (container, context, label, spacing,
+                                              view_type, view_size,
+                                              editor_id, editor_tooltip),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  font boxes  */
+
+static GtkWidget *
+font_box_new (GimpContainer *container,
+              GimpContext   *context,
+              const gchar   *label,
+              gint           spacing,
+              GimpViewType   view_type,
+              GimpViewSize   view_size)
+{
+  if (! container)
+    container = gimp_data_factory_get_container (context->gimp->font_factory);
+
+  return gimp_viewable_box_new (container, context, label, spacing,
+                                view_type, GIMP_VIEW_SIZE_SMALL, view_size,
+                                "gimp-font-list|gimp-font-grid",
+                                GIMP_ICON_FONT,
+                                _("Open the font selection dialog"),
+                                NULL, NULL);
+}
+
+GtkWidget *
+gimp_font_box_new (GimpContainer *container,
+                   GimpContext   *context,
+                   const gchar   *label,
+                   gint           spacing)
+{
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return font_box_new (container, context, label, spacing,
+                       GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_SMALL);
+}
+
+GtkWidget *
+gimp_prop_font_box_new (GimpContainer *container,
+                        GimpContext   *context,
+                        const gchar   *label,
+                        gint           spacing,
+                        const gchar   *view_type_prop,
+                        const gchar   *view_size_prop)
+{
+  GimpViewType view_type;
+  GimpViewSize view_size;
+
+  g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
+                        NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  g_object_get (context,
+                view_type_prop, &view_type,
+                view_size_prop, &view_size,
+                NULL);
+
+  return view_props_connect (font_box_new (container, context, label, spacing,
+                                           view_type, view_size),
+                             context,
+                             view_type_prop, view_size_prop);
+}
+
+
+/*  private functions  */
+
+static GtkWidget *
+gimp_viewable_box_new (GimpContainer *container,
+                       GimpContext   *context,
+                       const gchar   *label,
+                       gint           spacing,
+                       GimpViewType   view_type,
+                       GimpViewSize   button_view_size,
+                       GimpViewSize   view_size,
+                       const gchar   *dialog_identifier,
+                       const gchar   *dialog_icon_name,
+                       const gchar   *dialog_tooltip,
+                       const gchar   *editor_id,
+                       const gchar   *editor_tooltip)
+{
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkWidget *vbox;
+  GtkWidget *l;
+  GtkWidget *entry;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing);
+
+  button = gimp_viewable_button_new (container, context,
+                                     view_type, button_view_size, view_size, 1,
+                                     gimp_dialog_factory_get_singleton (),
+                                     dialog_identifier,
+                                     dialog_icon_name,
+                                     dialog_tooltip);
+
+  gimp_view_renderer_set_size_full (GIMP_VIEW (GIMP_VIEWABLE_BUTTON (button)->view)->renderer,
+                                    button_view_size, button_view_size, 1);
+
+  g_object_set_data (G_OBJECT (hbox), "viewable-button", button);
+
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  if (label)
+    {
+      l = gtk_label_new_with_mnemonic (label);
+      gtk_label_set_xalign (GTK_LABEL (l), 0.0);
+      gtk_box_pack_start (GTK_BOX (vbox), l, FALSE, FALSE, 0);
+      gtk_widget_show (l);
+    }
+
+  entry = gimp_container_entry_new (container, context, view_size, 1);
+
+  /*  set a silly smally size request on the entry to disable
+   *  GtkEntry's minimal width of 150 pixels.
+   */
+  gtk_entry_set_width_chars (GTK_ENTRY (entry), 4);
+  gtk_box_pack_end (GTK_BOX (vbox), entry, label ? FALSE : TRUE, FALSE, 0);
+  gtk_widget_show (entry);
+
+  if (editor_id)
+    {
+      GtkWidget *edit_button;
+      GtkWidget *image;
+
+      edit_button = gtk_button_new ();
+      gtk_button_set_relief (GTK_BUTTON (edit_button), GTK_RELIEF_NONE);
+      gtk_box_pack_end (GTK_BOX (hbox), edit_button, FALSE, FALSE, 0);
+      gtk_widget_show (edit_button);
+
+      if (editor_tooltip)
+        gimp_help_set_help_data (edit_button, editor_tooltip, NULL);
+
+      image = gtk_image_new_from_icon_name (GIMP_ICON_EDIT,
+                                            GTK_ICON_SIZE_BUTTON);
+      gtk_misc_set_alignment (GTK_MISC (image), 0.5, 1.0);
+      gtk_container_add (GTK_CONTAINER (edit_button), image);
+      gtk_widget_show (image);
+
+      g_object_set_data_full (G_OBJECT (button),
+                              "gimp-viewable-box-editor",
+                              g_strdup (editor_id),
+                              (GDestroyNotify) g_free);
+
+      g_signal_connect (edit_button, "clicked",
+                        G_CALLBACK (gimp_viewable_box_edit_clicked),
+                        button);
+    }
+
+  return hbox;
+}
+
+static GtkWidget *
+view_props_connect (GtkWidget   *box,
+                    GimpContext *context,
+                    const gchar *view_type_prop,
+                    const gchar *view_size_prop)
+{
+  GtkWidget *button = g_object_get_data (G_OBJECT (box), "viewable-button");
+
+  if (view_type_prop)
+    gimp_config_connect_full (G_OBJECT (context), G_OBJECT (button),
+                              view_type_prop, "popup-view-type");
+
+  if (view_size_prop)
+    gimp_config_connect_full (G_OBJECT (context), G_OBJECT (button),
+                              view_size_prop, "popup-view-size");
+
+  return box;
+}
+
+static void
+gimp_viewable_box_edit_clicked (GtkWidget          *widget,
+                                GimpViewableButton *button)
+{
+  const gchar *editor_id = g_object_get_data (G_OBJECT (button),
+                                              "gimp-viewable-box-editor");
+
+  gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (button->context->gimp)),
+                                             button->context->gimp,
+                                             gimp_dialog_factory_get_singleton (),
+                                             gtk_widget_get_screen (widget),
+                                             gimp_widget_get_monitor (widget),
+                                             editor_id);
+}
+
+static void
+gimp_gradient_box_reverse_notify (GObject    *object,
+                                  GParamSpec *pspec,
+                                  GimpView   *view)
+{
+  GimpViewRendererGradient *rendergrad;
+  gboolean                  reverse;
+
+  rendergrad = GIMP_VIEW_RENDERER_GRADIENT (view->renderer);
+
+  g_object_get (object, "gradient-reverse", &reverse, NULL);
+
+  gimp_view_renderer_gradient_set_reverse (rendergrad, reverse);
+}
+
+static void
+gimp_gradient_box_blend_notify (GObject    *object,
+                                GParamSpec *pspec,
+                                GimpView   *view)
+{
+  GimpViewRendererGradient    *rendergrad;
+  GimpGradientBlendColorSpace  blend_color_space;
+
+  rendergrad = GIMP_VIEW_RENDERER_GRADIENT (view->renderer);
+
+  g_object_get (object,
+                "gradient-blend-color-space", &blend_color_space,
+                NULL);
+
+  gimp_view_renderer_gradient_set_blend_color_space (rendergrad,
+                                                     blend_color_space);
+}
diff --git a/app/widgets/gimpviewablebox.h b/app/widgets/gimpviewablebox.h
new file mode 100644
index 0000000..0555245
--- /dev/null
+++ b/app/widgets/gimpviewablebox.h
@@ -0,0 +1,111 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEWABLE_BOX_H__
+#define __GIMP_VIEWABLE_BOX_H__
+
+
+GtkWidget * gimp_brush_box_new         (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing);
+GtkWidget * gimp_prop_brush_box_new    (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop,
+                                        const gchar   *editor_id,
+                                        const gchar   *editor_tooltip);
+GtkWidget * gimp_dynamics_box_new      (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing);
+GtkWidget * gimp_prop_dynamics_box_new (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop,
+                                        const gchar   *editor_id,
+                                        const gchar   *editor_tooltip);
+
+GtkWidget * gimp_mybrush_box_new       (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing);
+GtkWidget * gimp_prop_mybrush_box_new  (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop);
+
+GtkWidget * gimp_pattern_box_new       (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing);
+GtkWidget * gimp_prop_pattern_box_new  (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop);
+
+GtkWidget * gimp_gradient_box_new      (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           scacing,
+                                        const gchar   *reverse_prop,
+                                        const gchar   *blend_color_space_prop);
+GtkWidget * gimp_prop_gradient_box_new (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           scacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop,
+                                        const gchar   *reverse_prop,
+                                        const gchar   *blend_color_space_prop,
+                                        const gchar   *editor_id,
+                                        const gchar   *editor_tooltip);
+
+GtkWidget * gimp_palette_box_new       (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing);
+GtkWidget * gimp_prop_palette_box_new  (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop,
+                                        const gchar   *editor_id,
+                                        const gchar   *editor_tooltip);
+
+GtkWidget * gimp_font_box_new          (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing);
+GtkWidget * gimp_prop_font_box_new     (GimpContainer *container,
+                                        GimpContext   *context,
+                                        const gchar   *label,
+                                        gint           spacing,
+                                        const gchar   *view_type_prop,
+                                        const gchar   *view_size_prop);
+
+
+#endif /* __GIMP_VIEWABLE_BOX_H__ */
diff --git a/app/widgets/gimpviewablebutton.c b/app/widgets/gimpviewablebutton.c
new file mode 100644
index 0000000..db4e4ad
--- /dev/null
+++ b/app/widgets/gimpviewablebutton.c
@@ -0,0 +1,362 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewablebutton.c
+ * Copyright (C) 2003-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontainer.h"
+#include "core/gimpcontext.h"
+#include "core/gimpviewable.h"
+
+#include "gimpcontainerpopup.h"
+#include "gimpdialogfactory.h"
+#include "gimppropwidgets.h"
+#include "gimpviewrenderer.h"
+#include "gimpviewablebutton.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_POPUP_VIEW_TYPE,
+  PROP_POPUP_VIEW_SIZE
+};
+
+
+static void     gimp_viewable_button_finalize     (GObject            *object);
+static void     gimp_viewable_button_set_property (GObject            *object,
+                                                   guint               property_id,
+                                                   const GValue       *value,
+                                                   GParamSpec         *pspec);
+static void     gimp_viewable_button_get_property (GObject            *object,
+                                                   guint               property_id,
+                                                   GValue             *value,
+                                                   GParamSpec         *pspec);
+static gboolean gimp_viewable_button_scroll_event (GtkWidget          *widget,
+                                                   GdkEventScroll     *sevent);
+static void     gimp_viewable_button_clicked      (GtkButton          *button);
+
+static void     gimp_viewable_button_popup_closed (GimpContainerPopup *popup,
+                                                   GimpViewableButton *button);
+
+
+G_DEFINE_TYPE (GimpViewableButton, gimp_viewable_button, GIMP_TYPE_BUTTON)
+
+#define parent_class gimp_viewable_button_parent_class
+
+
+static void
+gimp_viewable_button_class_init (GimpViewableButtonClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkButtonClass *button_class = GTK_BUTTON_CLASS (klass);
+
+  object_class->finalize     = gimp_viewable_button_finalize;
+  object_class->get_property = gimp_viewable_button_get_property;
+  object_class->set_property = gimp_viewable_button_set_property;
+
+  widget_class->scroll_event = gimp_viewable_button_scroll_event;
+
+  button_class->clicked      = gimp_viewable_button_clicked;
+
+  g_object_class_install_property (object_class, PROP_POPUP_VIEW_TYPE,
+                                   g_param_spec_enum ("popup-view-type",
+                                                      NULL, NULL,
+                                                      GIMP_TYPE_VIEW_TYPE,
+                                                      GIMP_VIEW_TYPE_LIST,
+                                                      GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_POPUP_VIEW_SIZE,
+                                   g_param_spec_int ("popup-view-size",
+                                                     NULL, NULL,
+                                                     GIMP_VIEW_SIZE_TINY,
+                                                     GIMP_VIEW_SIZE_GIGANTIC,
+                                                     GIMP_VIEW_SIZE_SMALL,
+                                                     GIMP_PARAM_READWRITE));
+}
+
+static void
+gimp_viewable_button_init (GimpViewableButton *button)
+{
+  button->popup_view_type   = GIMP_VIEW_TYPE_LIST;
+  button->popup_view_size   = GIMP_VIEW_SIZE_SMALL;
+
+  button->button_view_size  = GIMP_VIEW_SIZE_SMALL;
+  button->view_border_width = 1;
+}
+
+static void
+gimp_viewable_button_finalize (GObject *object)
+{
+  GimpViewableButton *button = GIMP_VIEWABLE_BUTTON (object);
+
+  g_clear_pointer (&button->dialog_identifier, g_free);
+  g_clear_pointer (&button->dialog_icon_name,  g_free);
+  g_clear_pointer (&button->dialog_tooltip,    g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_viewable_button_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpViewableButton *button = GIMP_VIEWABLE_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_POPUP_VIEW_TYPE:
+      gimp_viewable_button_set_view_type (button, g_value_get_enum (value));
+      break;
+    case PROP_POPUP_VIEW_SIZE:
+      gimp_viewable_button_set_view_size (button, g_value_get_int (value));
+      break;
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_viewable_button_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpViewableButton *button = GIMP_VIEWABLE_BUTTON (object);
+
+  switch (property_id)
+    {
+    case PROP_POPUP_VIEW_TYPE:
+      g_value_set_enum (value, button->popup_view_type);
+      break;
+    case PROP_POPUP_VIEW_SIZE:
+      g_value_set_int (value, button->popup_view_size);
+      break;
+   default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gimp_viewable_button_scroll_event (GtkWidget      *widget,
+                                   GdkEventScroll *sevent)
+{
+  GimpViewableButton *button = GIMP_VIEWABLE_BUTTON (widget);
+  GimpObject         *object;
+  gint                index;
+
+  object = gimp_context_get_by_type (button->context,
+                                     gimp_container_get_children_type (button->container));
+
+  index = gimp_container_get_child_index (button->container, object);
+
+  if (index != -1)
+    {
+      gint n_children;
+      gint new_index = index;
+
+      n_children = gimp_container_get_n_children (button->container);
+
+      if (sevent->direction == GDK_SCROLL_UP)
+        {
+          if (index > 0)
+            new_index--;
+          else
+            new_index = n_children - 1;
+        }
+      else if (sevent->direction == GDK_SCROLL_DOWN)
+        {
+          if (index == (n_children - 1))
+            new_index = 0;
+          else
+            new_index++;
+        }
+
+      if (new_index != index)
+        {
+          object = gimp_container_get_child_by_index (button->container,
+                                                      new_index);
+
+          if (object)
+            gimp_context_set_by_type (button->context,
+                                      gimp_container_get_children_type (button->container),
+                                      object);
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+gimp_viewable_button_clicked (GtkButton *button)
+{
+  GimpViewableButton *viewable_button = GIMP_VIEWABLE_BUTTON (button);
+  GtkWidget          *popup;
+
+  popup = gimp_container_popup_new (viewable_button->container,
+                                    viewable_button->context,
+                                    viewable_button->popup_view_type,
+                                    viewable_button->button_view_size,
+                                    viewable_button->popup_view_size,
+                                    viewable_button->view_border_width,
+                                    viewable_button->dialog_factory,
+                                    viewable_button->dialog_identifier,
+                                    viewable_button->dialog_icon_name,
+                                    viewable_button->dialog_tooltip);
+
+  g_signal_connect (popup, "cancel",
+                    G_CALLBACK (gimp_viewable_button_popup_closed),
+                    button);
+  g_signal_connect (popup, "confirm",
+                    G_CALLBACK (gimp_viewable_button_popup_closed),
+                    button);
+
+  gimp_popup_show (GIMP_POPUP (popup), GTK_WIDGET (button));
+}
+
+static void
+gimp_viewable_button_popup_closed (GimpContainerPopup *popup,
+                                   GimpViewableButton *button)
+{
+  gimp_viewable_button_set_view_type (button,
+                                      gimp_container_popup_get_view_type (popup));
+  gimp_viewable_button_set_view_size (button,
+                                      gimp_container_popup_get_view_size (popup));
+}
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_viewable_button_new (GimpContainer     *container,
+                          GimpContext       *context,
+                          GimpViewType       view_type,
+                          gint               button_view_size,
+                          gint               view_size,
+                          gint               view_border_width,
+                          GimpDialogFactory *dialog_factory,
+                          const gchar       *dialog_identifier,
+                          const gchar       *dialog_icon_name,
+                          const gchar       *dialog_tooltip)
+{
+  GimpViewableButton *button;
+  const gchar        *prop_name;
+
+  g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (view_size >  0 &&
+                        view_size <= GIMP_VIEWABLE_MAX_BUTTON_SIZE, NULL);
+  g_return_val_if_fail (view_border_width >= 0 &&
+                        view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
+                        NULL);
+  g_return_val_if_fail (dialog_factory == NULL ||
+                        GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
+  if (dialog_factory)
+    {
+      g_return_val_if_fail (dialog_identifier != NULL, NULL);
+      g_return_val_if_fail (dialog_icon_name != NULL, NULL);
+      g_return_val_if_fail (dialog_tooltip != NULL, NULL);
+    }
+
+  button = g_object_new (GIMP_TYPE_VIEWABLE_BUTTON,
+                         "popup-view-type", view_type,
+                         "popup-view-size", view_size,
+                         NULL);
+
+  button->container = container;
+  button->context   = context;
+
+  button->button_view_size  = button_view_size;
+  button->view_border_width = view_border_width;
+
+  if (dialog_factory)
+    {
+      button->dialog_factory    = dialog_factory;
+      button->dialog_identifier = g_strdup (dialog_identifier);
+      button->dialog_icon_name  = g_strdup (dialog_icon_name);
+      button->dialog_tooltip    = g_strdup (dialog_tooltip);
+    }
+
+  prop_name = gimp_context_type_to_prop_name (gimp_container_get_children_type (container));
+
+  button->view = gimp_prop_view_new (G_OBJECT (context), prop_name,
+                                     context, button->button_view_size);
+  gtk_container_add (GTK_CONTAINER (button), button->view);
+  gtk_widget_show (button->view);
+
+  return GTK_WIDGET (button);
+}
+
+GimpViewType
+gimp_viewable_button_get_view_type (GimpViewableButton *button)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_BUTTON (button), GIMP_VIEW_TYPE_LIST);
+
+  return button->popup_view_type;
+}
+
+void
+gimp_viewable_button_set_view_type (GimpViewableButton *button,
+                                    GimpViewType        view_type)
+{
+  g_return_if_fail (GIMP_IS_VIEWABLE_BUTTON (button));
+
+  if (view_type != button->popup_view_type)
+    {
+      button->popup_view_type = view_type;
+
+      g_object_notify (G_OBJECT (button), "popup-view-type");
+    }
+}
+
+gint
+gimp_viewable_button_get_view_size (GimpViewableButton *button)
+{
+  g_return_val_if_fail (GIMP_IS_VIEWABLE_BUTTON (button), GIMP_VIEW_SIZE_SMALL);
+
+  return button->popup_view_size;
+}
+
+void
+gimp_viewable_button_set_view_size (GimpViewableButton *button,
+                                    gint                view_size)
+{
+  g_return_if_fail (GIMP_IS_VIEWABLE_BUTTON (button));
+
+  if (view_size != button->popup_view_size)
+    {
+      button->popup_view_size = view_size;
+
+      g_object_notify (G_OBJECT (button), "popup-view-size");
+    }
+}
diff --git a/app/widgets/gimpviewablebutton.h b/app/widgets/gimpviewablebutton.h
new file mode 100644
index 0000000..fd1cfa8
--- /dev/null
+++ b/app/widgets/gimpviewablebutton.h
@@ -0,0 +1,84 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewablebutton.h
+ * Copyright (C) 2003-2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEWABLE_BUTTON_H__
+#define __GIMP_VIEWABLE_BUTTON_H__
+
+
+#define GIMP_TYPE_VIEWABLE_BUTTON            (gimp_viewable_button_get_type ())
+#define GIMP_VIEWABLE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEWABLE_BUTTON, GimpViewableButton))
+#define GIMP_VIEWABLE_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEWABLE_BUTTON, GimpViewableButtonClass))
+#define GIMP_IS_VIEWABLE_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VIEWABLE_BUTTON))
+#define GIMP_IS_VIEWABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEWABLE_BUTTON))
+#define GIMP_VIEWABLE_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEWABLE_BUTTON, GimpViewableButtonClass))
+
+
+typedef struct _GimpViewableButtonClass GimpViewableButtonClass;
+
+struct _GimpViewableButton
+{
+  GimpButton         parent_instance;
+
+  GimpContainer     *container;
+  GimpContext       *context;
+
+  GimpViewType       popup_view_type;
+  gint               popup_view_size;
+
+  gint               button_view_size;
+  gint               view_border_width;
+
+  GimpDialogFactory *dialog_factory;
+  gchar             *dialog_identifier;
+  gchar             *dialog_icon_name;
+  gchar             *dialog_tooltip;
+
+  GtkWidget         *view;
+};
+
+struct _GimpViewableButtonClass
+{
+  GimpButtonClass  parent_class;
+};
+
+
+GType       gimp_viewable_button_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_viewable_button_new      (GimpContainer      *container,
+                                           GimpContext        *context,
+                                           GimpViewType        view_type,
+                                           gint                button_view_size,
+                                           gint                view_size,
+                                           gint                view_border_width,
+                                           GimpDialogFactory  *dialog_factory,
+                                           const gchar        *dialog_identifier,
+                                           const gchar        *dialog_icon_name,
+                                           const gchar        *dialog_tooltip);
+
+GimpViewType gimp_viewable_button_get_view_type (GimpViewableButton *button);
+void         gimp_viewable_button_set_view_type (GimpViewableButton *button,
+                                                 GimpViewType        view_type);
+
+gint         gimp_viewable_button_get_view_size (GimpViewableButton *button);
+void         gimp_viewable_button_set_view_size (GimpViewableButton *button,
+                                                 gint                view_size);
+
+
+#endif /* __GIMP_VIEWABLE_BUTTON_H__ */
diff --git a/app/widgets/gimpviewabledialog.c b/app/widgets/gimpviewabledialog.c
new file mode 100644
index 0000000..3500562
--- /dev/null
+++ b/app/widgets/gimpviewabledialog.c
@@ -0,0 +1,377 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewabledialog.c
+ * Copyright (C) 2000 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+
+#include "gimpview.h"
+#include "gimpviewabledialog.h"
+#include "gimpviewrenderer.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_VIEWABLE,
+  PROP_CONTEXT,
+  PROP_ICON_NAME,
+  PROP_DESC
+};
+
+
+static void   gimp_viewable_dialog_dispose      (GObject            *object);
+static void   gimp_viewable_dialog_set_property (GObject            *object,
+                                                 guint               property_id,
+                                                 const GValue       *value,
+                                                 GParamSpec         *pspec);
+static void   gimp_viewable_dialog_get_property (GObject            *object,
+                                                 guint               property_id,
+                                                 GValue             *value,
+                                                 GParamSpec         *pspec);
+
+static void   gimp_viewable_dialog_name_changed (GimpObject         *object,
+                                                 GimpViewableDialog *dialog);
+static void   gimp_viewable_dialog_close        (GimpViewableDialog *dialog);
+
+
+G_DEFINE_TYPE (GimpViewableDialog, gimp_viewable_dialog, GIMP_TYPE_DIALOG)
+
+#define parent_class gimp_viewable_dialog_parent_class
+
+
+static void
+gimp_viewable_dialog_class_init (GimpViewableDialogClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose      = gimp_viewable_dialog_dispose;
+  object_class->get_property = gimp_viewable_dialog_get_property;
+  object_class->set_property = gimp_viewable_dialog_set_property;
+
+  g_object_class_install_property (object_class, PROP_VIEWABLE,
+                                   g_param_spec_object ("viewable", NULL, NULL,
+                                                        GIMP_TYPE_VIEWABLE,
+                                                        GIMP_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_CONTEXT,
+                                   g_param_spec_object ("context", NULL, NULL,
+                                                        GIMP_TYPE_CONTEXT,
+                                                        GIMP_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, PROP_DESC,
+                                   g_param_spec_string ("description", NULL, NULL,
+                                                        NULL,
+                                                        GIMP_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT));
+}
+
+static void
+gimp_viewable_dialog_init (GimpViewableDialog *dialog)
+{
+  GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  GtkWidget *frame;
+  GtkWidget *hbox;
+  GtkWidget *vbox;
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+  gtk_box_pack_start (GTK_BOX (content_area), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
+  gtk_container_add (GTK_CONTAINER (frame), hbox);
+  gtk_widget_show (hbox);
+
+  dialog->icon = gtk_image_new ();
+  gtk_misc_set_alignment (GTK_MISC (dialog->icon), 0.5, 0.0);
+  gtk_box_pack_start (GTK_BOX (hbox), dialog->icon, FALSE, FALSE, 0);
+  gtk_widget_show (dialog->icon);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  dialog->desc_label = gtk_label_new (NULL);
+  gtk_label_set_xalign (GTK_LABEL (dialog->desc_label), 0.0);
+  gimp_label_set_attributes (GTK_LABEL (dialog->desc_label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_LARGE,
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), dialog->desc_label, FALSE, FALSE, 0);
+  gtk_widget_show (dialog->desc_label);
+
+  dialog->viewable_label = g_object_new (GTK_TYPE_LABEL,
+                                         "xalign",    0.0,
+                                         "yalign",    0.5,
+                                         "ellipsize", PANGO_ELLIPSIZE_END,
+                                         NULL);
+  gimp_label_set_attributes (GTK_LABEL (dialog->viewable_label),
+                             PANGO_ATTR_SCALE,  PANGO_SCALE_SMALL,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (vbox), dialog->viewable_label, FALSE, FALSE, 0);
+  gtk_widget_show (dialog->viewable_label);
+}
+
+static void
+gimp_viewable_dialog_dispose (GObject *object)
+{
+  GimpViewableDialog *dialog = GIMP_VIEWABLE_DIALOG (object);
+
+  if (dialog->view)
+    gimp_viewable_dialog_set_viewable (dialog, NULL, NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_viewable_dialog_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  GimpViewableDialog *dialog = GIMP_VIEWABLE_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_VIEWABLE:
+      gimp_viewable_dialog_set_viewable (dialog,
+                                         g_value_get_object (value),
+                                         dialog->context);
+      break;
+
+    case PROP_CONTEXT:
+      gimp_viewable_dialog_set_viewable (dialog,
+                                         dialog->view ?
+                                         GIMP_VIEW (dialog->view)->viewable :
+                                         NULL,
+                                         g_value_get_object (value));
+      break;
+
+    case PROP_ICON_NAME:
+      gtk_image_set_from_icon_name (GTK_IMAGE (dialog->icon),
+                                    g_value_get_string (value),
+                                    GTK_ICON_SIZE_LARGE_TOOLBAR);
+      break;
+
+    case PROP_DESC:
+      gtk_label_set_text (GTK_LABEL (dialog->desc_label),
+                          g_value_get_string (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_viewable_dialog_get_property (GObject    *object,
+                                   guint       property_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  GimpViewableDialog *dialog = GIMP_VIEWABLE_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_VIEWABLE:
+      g_value_set_object (value,
+                          dialog->view ?
+                          GIMP_VIEW (dialog->view)->viewable : NULL);
+      break;
+
+    case PROP_CONTEXT:
+      g_value_set_object (value, dialog->context);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_viewable_dialog_new (GimpViewable *viewable,
+                          GimpContext  *context,
+                          const gchar  *title,
+                          const gchar  *role,
+                          const gchar  *icon_name,
+                          const gchar  *desc,
+                          GtkWidget    *parent,
+                          GimpHelpFunc  help_func,
+                          const gchar  *help_id,
+                          ...)
+{
+  GimpViewableDialog *dialog;
+  va_list             args;
+
+  g_return_val_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable), NULL);
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (role != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+
+  if (! viewable)
+    g_warning ("Use of GimpViewableDialog with a NULL viewable is deprecated!");
+
+  dialog = g_object_new (GIMP_TYPE_VIEWABLE_DIALOG,
+                         "viewable",    viewable,
+                         "context",     context,
+                         "title",       title,
+                         "role",        role,
+                         "help-func",   help_func,
+                         "help-id",     help_id,
+                         "icon-name",   icon_name,
+                         "description", desc,
+                         "parent",      parent,
+                         NULL);
+
+  va_start (args, help_id);
+  gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args);
+  va_end (args);
+
+  return GTK_WIDGET (dialog);
+}
+
+void
+gimp_viewable_dialog_set_viewable (GimpViewableDialog *dialog,
+                                   GimpViewable       *viewable,
+                                   GimpContext        *context)
+{
+  g_return_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog));
+  g_return_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  dialog->context = context;
+
+  if (dialog->view)
+    {
+      GimpViewable *old_viewable = GIMP_VIEW (dialog->view)->viewable;
+
+      if (viewable == old_viewable)
+        {
+          gimp_view_renderer_set_context (GIMP_VIEW (dialog->view)->renderer,
+                                          context);
+          return;
+        }
+
+      gtk_widget_destroy (dialog->view);
+
+      if (old_viewable)
+        {
+          g_signal_handlers_disconnect_by_func (old_viewable,
+                                                gimp_viewable_dialog_name_changed,
+                                                dialog);
+
+          g_signal_handlers_disconnect_by_func (old_viewable,
+                                                gimp_viewable_dialog_close,
+                                                dialog);
+        }
+    }
+
+  if (viewable)
+    {
+      GtkWidget *box;
+
+      g_signal_connect_object (viewable,
+                               GIMP_VIEWABLE_GET_CLASS (viewable)->name_changed_signal,
+                               G_CALLBACK (gimp_viewable_dialog_name_changed),
+                               dialog,
+                               0);
+
+      box = gtk_widget_get_parent (dialog->icon);
+
+      dialog->view = gimp_view_new (context, viewable, 32, 1, TRUE);
+      gtk_box_pack_end (GTK_BOX (box), dialog->view, FALSE, FALSE, 2);
+      gtk_widget_show (dialog->view);
+
+      g_object_add_weak_pointer (G_OBJECT (dialog->view),
+                                 (gpointer) &dialog->view);
+
+      gimp_viewable_dialog_name_changed (GIMP_OBJECT (viewable), dialog);
+
+      if (GIMP_IS_ITEM (viewable))
+        {
+          g_signal_connect_object (viewable, "removed",
+                                   G_CALLBACK (gimp_viewable_dialog_close),
+                                   dialog,
+                                   G_CONNECT_SWAPPED);
+        }
+      else
+        {
+          g_signal_connect_object (viewable, "disconnect",
+                                   G_CALLBACK (gimp_viewable_dialog_close),
+                                   dialog,
+                                   G_CONNECT_SWAPPED);
+        }
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_viewable_dialog_name_changed (GimpObject         *object,
+                                   GimpViewableDialog *dialog)
+{
+  gchar *name;
+
+  name = gimp_viewable_get_description (GIMP_VIEWABLE (object), NULL);
+
+  if (GIMP_IS_ITEM (object))
+    {
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (object));
+      gchar     *tmp;
+
+      tmp = name;
+      name = g_strdup_printf ("%s-%d (%s)",
+                              tmp,
+                              gimp_item_get_ID (GIMP_ITEM (object)),
+                              gimp_image_get_display_name (image));
+      g_free (tmp);
+    }
+
+  gtk_label_set_text (GTK_LABEL (dialog->viewable_label), name);
+  g_free (name);
+}
+
+static void
+gimp_viewable_dialog_close (GimpViewableDialog *dialog)
+{
+  g_signal_emit_by_name (dialog, "close");
+}
diff --git a/app/widgets/gimpviewabledialog.h b/app/widgets/gimpviewabledialog.h
new file mode 100644
index 0000000..f7b3dae
--- /dev/null
+++ b/app/widgets/gimpviewabledialog.h
@@ -0,0 +1,75 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewabledialog.h
+ * Copyright (C) 2000 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEWABLE_DIALOG_H__
+#define __GIMP_VIEWABLE_DIALOG_H__
+
+G_BEGIN_DECLS
+
+
+#define GIMP_TYPE_VIEWABLE_DIALOG            (gimp_viewable_dialog_get_type ())
+#define GIMP_VIEWABLE_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEWABLE_DIALOG, GimpViewableDialog))
+#define GIMP_VIEWABLE_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEWABLE_DIALOG, GimpViewableDialogClass))
+#define GIMP_IS_VIEWABLE_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_VIEWABLE_DIALOG))
+#define GIMP_IS_VIEWABLE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEWABLE_DIALOG))
+#define GIMP_VIEWABLE_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEWABLE_DIALOG, GimpViewableDialogClass))
+
+
+typedef struct _GimpViewableDialogClass  GimpViewableDialogClass;
+
+struct _GimpViewableDialog
+{
+  GimpDialog   parent_instance;
+
+  GimpContext *context;
+
+  GtkWidget   *icon;
+  GtkWidget   *view;
+  GtkWidget   *desc_label;
+  GtkWidget   *viewable_label;
+};
+
+struct _GimpViewableDialogClass
+{
+  GimpDialogClass  parent_class;
+};
+
+
+GType       gimp_viewable_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_viewable_dialog_new      (GimpViewable       *viewable,
+                                           GimpContext        *context,
+                                           const gchar        *title,
+                                           const gchar        *role,
+                                           const gchar        *icon_name,
+                                           const gchar        *desc,
+                                           GtkWidget          *parent,
+                                           GimpHelpFunc        help_func,
+                                           const gchar        *help_id,
+                                           ...) G_GNUC_NULL_TERMINATED;
+
+void    gimp_viewable_dialog_set_viewable (GimpViewableDialog *dialog,
+                                           GimpViewable       *viewable,
+                                           GimpContext        *context);
+
+
+G_END_DECLS
+
+#endif /* __GIMP_VIEWABLE_DIALOG_H__ */
diff --git a/app/widgets/gimpviewrenderer-frame.c b/app/widgets/gimpviewrenderer-frame.c
new file mode 100644
index 0000000..3abd199
--- /dev/null
+++ b/app/widgets/gimpviewrenderer-frame.c
@@ -0,0 +1,293 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderer-frame.c
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * Contains code taken from eel, the Eazel Extensions Library.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpviewable.h"
+
+#include "gimpviewrenderer.h"
+#include "gimpviewrenderer-frame.h"
+#include "gimpwidgets-utils.h"
+
+
+/* utility to stretch a frame to the desired size */
+
+static void
+draw_frame_row (GdkPixbuf *frame_image,
+                gint       target_width,
+                gint       source_width,
+                gint       source_v_position,
+                gint       dest_v_position,
+                GdkPixbuf *result_pixbuf,
+                gint       left_offset,
+                gint       height)
+{
+  gint remaining_width = target_width;
+  gint h_offset        = 0;
+
+  while (remaining_width > 0)
+    {
+      gint slab_width = (remaining_width > source_width ?
+                         source_width : remaining_width);
+      gdk_pixbuf_copy_area (frame_image,
+                            left_offset, source_v_position,
+                            slab_width, height,
+                            result_pixbuf,
+                            left_offset + h_offset, dest_v_position);
+
+      remaining_width -= slab_width;
+      h_offset += slab_width;
+    }
+}
+
+/* utility to draw the middle section of the frame in a loop */
+static void
+draw_frame_column (GdkPixbuf *frame_image,
+                   gint       target_height,
+                   gint       source_height,
+                   gint       source_h_position,
+                   gint       dest_h_position,
+                   GdkPixbuf *result_pixbuf,
+                   gint       top_offset, int width)
+{
+  gint remaining_height = target_height;
+  gint v_offset         = 0;
+
+  while (remaining_height > 0)
+    {
+      gint slab_height = (remaining_height > source_height ?
+                          source_height : remaining_height);
+
+      gdk_pixbuf_copy_area (frame_image,
+                            source_h_position, top_offset,
+                            width, slab_height,
+                            result_pixbuf,
+                            dest_h_position, top_offset + v_offset);
+
+      remaining_height -= slab_height;
+      v_offset += slab_height;
+    }
+}
+
+static GdkPixbuf *
+stretch_frame_image (GdkPixbuf *frame_image,
+                     gint       left_offset,
+                     gint       top_offset,
+                     gint       right_offset,
+                     gint       bottom_offset,
+                     gint       dest_width,
+                     gint       dest_height)
+{
+  GdkPixbuf *pixbuf;
+  gint       frame_width, frame_height;
+  gint       target_width,  target_frame_width;
+  gint       target_height, target_frame_height;
+
+  frame_width  = gdk_pixbuf_get_width  (frame_image);
+  frame_height = gdk_pixbuf_get_height (frame_image );
+
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                           dest_width, dest_height);
+  gdk_pixbuf_fill (pixbuf, 0);
+
+  target_width  = dest_width - left_offset - right_offset;
+  target_height = dest_height - top_offset - bottom_offset;
+
+  target_frame_width  = frame_width - left_offset - right_offset;
+  target_frame_height = frame_height - top_offset - bottom_offset;
+
+  left_offset   += MIN (target_width / 4, target_frame_width / 4);
+  right_offset  += MIN (target_width / 4, target_frame_width / 4);
+  top_offset    += MIN (target_height / 4, target_frame_height / 4);
+  bottom_offset += MIN (target_height / 4, target_frame_height / 4);
+
+  target_width  = dest_width - left_offset - right_offset;
+  target_height = dest_height - top_offset - bottom_offset;
+
+  target_frame_width  = frame_width - left_offset - right_offset;
+  target_frame_height = frame_height - top_offset - bottom_offset;
+
+  /* draw the left top corner  and top row */
+  gdk_pixbuf_copy_area (frame_image,
+                        0, 0, left_offset, top_offset,
+                        pixbuf, 0,  0);
+  draw_frame_row (frame_image, target_width, target_frame_width,
+                  0, 0,
+                  pixbuf,
+                  left_offset, top_offset);
+
+  /* draw the right top corner and left column */
+  gdk_pixbuf_copy_area (frame_image,
+                        frame_width - right_offset, 0,
+                        right_offset, top_offset,
+
+                        pixbuf,
+                        dest_width - right_offset,  0);
+  draw_frame_column (frame_image, target_height, target_frame_height, 0, 0,
+                     pixbuf, top_offset, left_offset);
+
+  /* draw the bottom right corner and bottom row */
+  gdk_pixbuf_copy_area (frame_image,
+                        frame_width - right_offset, frame_height - bottom_offset,
+                        right_offset, bottom_offset,
+                        pixbuf,
+                        dest_width - right_offset, dest_height - bottom_offset);
+  draw_frame_row (frame_image, target_width, target_frame_width,
+                  frame_height - bottom_offset, dest_height - bottom_offset,
+                  pixbuf, left_offset, bottom_offset);
+
+  /* draw the bottom left corner and the right column */
+  gdk_pixbuf_copy_area (frame_image,
+                        0, frame_height - bottom_offset,
+                        left_offset, bottom_offset,
+                        pixbuf,
+                        0,  dest_height - bottom_offset);
+  draw_frame_column (frame_image, target_height, target_frame_height,
+                     frame_width - right_offset, dest_width - right_offset,
+                     pixbuf, top_offset, right_offset);
+
+  return pixbuf;
+}
+
+static GdkPixbuf *
+gimp_view_renderer_get_frame (GimpViewRenderer *renderer,
+                              gint              width,
+                              gint              height)
+{
+  GimpViewRendererClass *class = GIMP_VIEW_RENDERER_GET_CLASS (renderer);
+
+  return stretch_frame_image (class->frame,
+                              class->frame_left,
+                              class->frame_top,
+                              class->frame_right,
+                              class->frame_bottom,
+                              width, height);
+}
+
+static void
+gimp_view_renderer_ensure_frame (GimpViewRenderer *renderer,
+                                 GtkWidget        *widget)
+{
+  GimpViewRendererClass *class = GIMP_VIEW_RENDERER_GET_CLASS (renderer);
+
+  if (! class->frame)
+    {
+      class->frame = gimp_widget_load_icon (widget, GIMP_ICON_FRAME, 48);
+
+      /*  FIXME: shouldn't be hardcoded  */
+      class->frame_left   = 2;
+      class->frame_top    = 2;
+      class->frame_right  = 4;
+      class->frame_bottom = 4;
+    }
+}
+
+GdkPixbuf *
+gimp_view_renderer_get_frame_pixbuf (GimpViewRenderer *renderer,
+                                     GtkWidget        *widget,
+                                     gint              width,
+                                     gint              height)
+{
+  GimpViewRendererClass *class;
+  GdkPixbuf             *frame;
+  GdkPixbuf             *pixbuf;
+  gint                   w, h;
+  gint                   x, y;
+
+  g_return_val_if_fail (GIMP_IS_VIEW_RENDERER (renderer), NULL);
+  g_return_val_if_fail (GIMP_IS_VIEWABLE (renderer->viewable), NULL);
+
+  gimp_view_renderer_ensure_frame (renderer, widget);
+
+  class = GIMP_VIEW_RENDERER_GET_CLASS (renderer);
+
+  w = width  - class->frame_left - class->frame_right;
+  h = height - class->frame_top  - class->frame_bottom;
+
+  if (w > 12 && h > 12)
+    {
+      pixbuf = gimp_viewable_get_pixbuf (renderer->viewable,
+                                         renderer->context,
+                                         w, h);
+      if (!pixbuf)
+        return NULL;
+
+      x = class->frame_left;
+      y = class->frame_top;
+      w = gdk_pixbuf_get_width (pixbuf);
+      h = gdk_pixbuf_get_height (pixbuf);
+
+      frame  = gimp_view_renderer_get_frame (renderer,
+                                             w + x + class->frame_right,
+                                             h + y + class->frame_bottom);
+    }
+  else
+    {
+      pixbuf = gimp_viewable_get_pixbuf (renderer->viewable,
+                                         renderer->context,
+                                         width - 2, height - 2);
+      if (!pixbuf)
+        return NULL;
+
+      /*  as fallback, render the preview with a 1 pixel wide black border  */
+
+      x = 1;
+      y = 1;
+      w = gdk_pixbuf_get_width (pixbuf);
+      h = gdk_pixbuf_get_height (pixbuf);
+
+      frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, w + 2, h + 2);
+      gdk_pixbuf_fill (frame, 0);
+     }
+
+  gdk_pixbuf_copy_area (pixbuf, 0, 0, w, h, frame, x, y);
+
+  return frame;
+}
+
+
+/* This API is somewhat weird but GimpThumbBox needs these values so
+ * it can request the GimpImageFile view in the proper size.
+ */
+void
+gimp_view_renderer_get_frame_size (gint *horizontal,
+                                   gint *vertical)
+{
+  GimpViewRendererClass *class;
+
+  class = g_type_class_ref (GIMP_TYPE_VIEW_RENDERER);
+
+  if (horizontal)
+    *horizontal = class->frame_left + class->frame_right;
+
+  if (vertical)
+    *vertical = class->frame_top + class->frame_bottom;
+
+  g_type_class_unref (class);
+}
diff --git a/app/widgets/gimpviewrenderer-frame.h b/app/widgets/gimpviewrenderer-frame.h
new file mode 100644
index 0000000..e8cbd4a
--- /dev/null
+++ b/app/widgets/gimpviewrenderer-frame.h
@@ -0,0 +1,34 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderer-frame.h
+ * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_FRAME_H__
+#define __GIMP_VIEW_RENDERER_FRAME_H__
+
+
+GdkPixbuf * gimp_view_renderer_get_frame_pixbuf (GimpViewRenderer *renderer,
+                                                 GtkWidget        *widget,
+                                                 gint              width,
+                                                 gint              height);
+
+void        gimp_view_renderer_get_frame_size   (gint             *width,
+                                                 gint             *height);
+
+
+#endif /* __GIMP_VIEW_RENDERER_FRAME_H__ */
diff --git a/app/widgets/gimpviewrenderer-utils.c b/app/widgets/gimpviewrenderer-utils.c
new file mode 100644
index 0000000..ed642d4
--- /dev/null
+++ b/app/widgets/gimpviewrenderer-utils.c
@@ -0,0 +1,98 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderer-utils.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpbrush.h"
+#include "core/gimpbuffer.h"
+#include "core/gimpgradient.h"
+#include "core/gimpimage.h"
+#include "core/gimpimagefile.h"
+
+#include "core/gimpimageproxy.h"
+#include "core/gimplayer.h"
+#include "core/gimppalette.h"
+
+#include "vectors/gimpvectors.h"
+
+#include "gimpviewrenderer-utils.h"
+#include "gimpviewrendererbrush.h"
+#include "gimpviewrendererbuffer.h"
+#include "gimpviewrendererlayer.h"
+#include "gimpviewrenderergradient.h"
+#include "gimpviewrendererimage.h"
+#include "gimpviewrendererimagefile.h"
+#include "gimpviewrendererpalette.h"
+#include "gimpviewrenderervectors.h"
+
+
+GType
+gimp_view_renderer_type_from_viewable_type (GType viewable_type)
+{
+  GType type = GIMP_TYPE_VIEW_RENDERER;
+
+  g_return_val_if_fail (g_type_is_a (viewable_type, GIMP_TYPE_VIEWABLE),
+                        G_TYPE_NONE);
+
+  if (g_type_is_a (viewable_type, GIMP_TYPE_BRUSH))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_BRUSH;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_BUFFER))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_BUFFER;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_IMAGE) ||
+           g_type_is_a (viewable_type, GIMP_TYPE_IMAGE_PROXY))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_IMAGE;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_LAYER))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_LAYER;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_DRAWABLE))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_DRAWABLE;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_GRADIENT))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_GRADIENT;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_VECTORS))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_VECTORS;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_IMAGEFILE))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_IMAGEFILE;
+    }
+  else if (g_type_is_a (viewable_type, GIMP_TYPE_PALETTE))
+    {
+      type = GIMP_TYPE_VIEW_RENDERER_PALETTE;
+    }
+
+  return type;
+}
diff --git a/app/widgets/gimpviewrenderer-utils.h b/app/widgets/gimpviewrenderer-utils.h
new file mode 100644
index 0000000..3cf60d0
--- /dev/null
+++ b/app/widgets/gimpviewrenderer-utils.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderer-utils.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_UTILS_H__
+#define __GIMP_VIEW_RENDERER_UTILS_H__
+
+
+GType   gimp_view_renderer_type_from_viewable_type (GType viewable_type);
+
+
+#endif /* __GIMP_VIEW_RENDERER_UTILS_H__ */
diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c
new file mode 100644
index 0000000..d67ea05
--- /dev/null
+++ b/app/widgets/gimpviewrenderer.c
@@ -0,0 +1,1336 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderer.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ * Copyright (C) 2007 Sven Neumann <sven@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-gegl-loops.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontext.h"
+#include "core/gimpimage.h"
+#include "core/gimpmarshal.h"
+#include "core/gimptempbuf.h"
+#include "core/gimpviewable.h"
+
+#include "gimprender.h"
+#include "gimpviewrenderer.h"
+#include "gimpviewrenderer-utils.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-priorities.h"
+
+
+#define RGB_EPSILON 1e-6
+
+enum
+{
+  UPDATE,
+  LAST_SIGNAL
+};
+
+
+struct _GimpViewRendererPrivate
+{
+  cairo_pattern_t    *pattern;
+  GdkPixbuf          *pixbuf;
+  gchar              *bg_icon_name;
+
+  GimpColorConfig    *color_config;
+  GimpColorTransform *profile_transform;
+
+  gboolean            needs_render;
+  guint               idle_id;
+};
+
+
+static void      gimp_view_renderer_dispose           (GObject            *object);
+static void      gimp_view_renderer_finalize          (GObject            *object);
+
+static gboolean  gimp_view_renderer_idle_update       (GimpViewRenderer   *renderer);
+static void      gimp_view_renderer_real_set_context  (GimpViewRenderer   *renderer,
+                                                       GimpContext        *context);
+static void      gimp_view_renderer_real_invalidate   (GimpViewRenderer   *renderer);
+static void      gimp_view_renderer_real_draw         (GimpViewRenderer   *renderer,
+                                                       GtkWidget          *widget,
+                                                       cairo_t            *cr,
+                                                       gint                available_width,
+                                                       gint                available_height);
+static void      gimp_view_renderer_real_render       (GimpViewRenderer   *renderer,
+                                                       GtkWidget          *widget);
+
+static void      gimp_view_renderer_size_changed      (GimpViewRenderer   *renderer,
+                                                       GimpViewable       *viewable);
+static void      gimp_view_renderer_profile_changed   (GimpViewRenderer   *renderer,
+                                                       GimpViewable       *viewable);
+static void      gimp_view_renderer_config_notify     (GObject            *config,
+                                                       const GParamSpec   *pspec,
+                                                       GimpViewRenderer   *renderer);
+
+static void      gimp_view_render_temp_buf_to_surface (GimpViewRenderer   *renderer,
+                                                       GtkWidget          *widget,
+                                                       GimpTempBuf        *temp_buf,
+                                                       gint                temp_buf_x,
+                                                       gint                temp_buf_y,
+                                                       gint                channel,
+                                                       GimpViewBG          inside_bg,
+                                                       GimpViewBG          outside_bg,
+                                                       cairo_surface_t    *surface,
+                                                       gint                dest_width,
+                                                       gint                dest_height);
+
+static cairo_pattern_t *
+                 gimp_view_renderer_create_background (GimpViewRenderer   *renderer,
+                                                       GtkWidget          *widget);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpViewRenderer, gimp_view_renderer, G_TYPE_OBJECT)
+
+#define parent_class gimp_view_renderer_parent_class
+
+static guint renderer_signals[LAST_SIGNAL] = { 0 };
+
+static GimpRGB  black_color;
+static GimpRGB  white_color;
+static GimpRGB  green_color;
+static GimpRGB  red_color;
+
+
+static void
+gimp_view_renderer_class_init (GimpViewRendererClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  renderer_signals[UPDATE] =
+    g_signal_new ("update",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpViewRendererClass, update),
+                  NULL, NULL,
+                  gimp_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  object_class->dispose  = gimp_view_renderer_dispose;
+  object_class->finalize = gimp_view_renderer_finalize;
+
+  klass->update          = NULL;
+  klass->set_context     = gimp_view_renderer_real_set_context;
+  klass->invalidate      = gimp_view_renderer_real_invalidate;
+  klass->draw            = gimp_view_renderer_real_draw;
+  klass->render          = gimp_view_renderer_real_render;
+
+  klass->frame           = NULL;
+  klass->frame_left      = 0;
+  klass->frame_right     = 0;
+  klass->frame_top       = 0;
+  klass->frame_bottom    = 0;
+
+  gimp_rgba_set (&black_color, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&white_color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&green_color, 0.0, 0.94, 0.0, GIMP_OPACITY_OPAQUE);
+  gimp_rgba_set (&red_color,   1.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
+}
+
+static void
+gimp_view_renderer_init (GimpViewRenderer *renderer)
+{
+  renderer->priv = gimp_view_renderer_get_instance_private (renderer);
+
+  renderer->viewable = NULL;
+
+  renderer->dot_for_dot  = TRUE;
+
+  renderer->border_type  = GIMP_VIEW_BORDER_BLACK;
+  renderer->border_color = black_color;
+
+  renderer->size         = -1;
+
+  renderer->priv->needs_render = TRUE;
+}
+
+static void
+gimp_view_renderer_dispose (GObject *object)
+{
+  GimpViewRenderer *renderer = GIMP_VIEW_RENDERER (object);
+
+  if (renderer->viewable)
+    gimp_view_renderer_set_viewable (renderer, NULL);
+
+  if (renderer->context)
+    gimp_view_renderer_set_context (renderer, NULL);
+
+  if (renderer->priv->color_config)
+    gimp_view_renderer_set_color_config (renderer, NULL);
+
+  gimp_view_renderer_remove_idle (renderer);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_view_renderer_finalize (GObject *object)
+{
+  GimpViewRenderer *renderer = GIMP_VIEW_RENDERER (object);
+
+  g_clear_pointer (&renderer->priv->pattern, cairo_pattern_destroy);
+  g_clear_pointer (&renderer->surface, cairo_surface_destroy);
+  g_clear_object (&renderer->priv->pixbuf);
+  g_clear_pointer (&renderer->priv->bg_icon_name, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static GimpViewRenderer *
+gimp_view_renderer_new_internal (GimpContext *context,
+                                 GType        viewable_type,
+                                 gboolean     is_popup)
+{
+  GimpViewRenderer *renderer;
+
+  renderer = g_object_new (gimp_view_renderer_type_from_viewable_type (viewable_type),
+                           NULL);
+
+  renderer->viewable_type = viewable_type;
+  renderer->is_popup      = is_popup ? TRUE : FALSE;
+
+  if (context)
+    gimp_view_renderer_set_context (renderer, context);
+
+  return renderer;
+}
+
+
+/*  public functions  */
+
+GimpViewRenderer *
+gimp_view_renderer_new (GimpContext *context,
+                        GType        viewable_type,
+                        gint         size,
+                        gint         border_width,
+                        gboolean     is_popup)
+{
+  GimpViewRenderer *renderer;
+
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (g_type_is_a (viewable_type, GIMP_TYPE_VIEWABLE), NULL);
+  g_return_val_if_fail (size >  0 &&
+                        size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (border_width >= 0 &&
+                        border_width <= GIMP_VIEW_MAX_BORDER_WIDTH, NULL);
+
+  renderer = gimp_view_renderer_new_internal (context, viewable_type,
+                                              is_popup);
+
+  gimp_view_renderer_set_size (renderer, size, border_width);
+  gimp_view_renderer_remove_idle (renderer);
+
+  return renderer;
+}
+
+GimpViewRenderer *
+gimp_view_renderer_new_full (GimpContext *context,
+                             GType        viewable_type,
+                             gint         width,
+                             gint         height,
+                             gint         border_width,
+                             gboolean     is_popup)
+{
+  GimpViewRenderer *renderer;
+
+  g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (g_type_is_a (viewable_type, GIMP_TYPE_VIEWABLE), NULL);
+  g_return_val_if_fail (width >  0 &&
+                        width <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (height > 0 &&
+                        height <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
+  g_return_val_if_fail (border_width >= 0 &&
+                        border_width <= GIMP_VIEW_MAX_BORDER_WIDTH, NULL);
+
+  renderer = gimp_view_renderer_new_internal (context, viewable_type,
+                                              is_popup);
+
+  gimp_view_renderer_set_size_full (renderer, width, height, border_width);
+  gimp_view_renderer_remove_idle (renderer);
+
+  return renderer;
+}
+
+void
+gimp_view_renderer_set_context (GimpViewRenderer *renderer,
+                                GimpContext      *context)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
+
+  if (context != renderer->context)
+    {
+      GIMP_VIEW_RENDERER_GET_CLASS (renderer)->set_context (renderer,
+                                                            context);
+
+      if (renderer->viewable)
+        gimp_view_renderer_invalidate (renderer);
+    }
+}
+
+static void
+gimp_view_renderer_weak_notify (GimpViewRenderer *renderer,
+                                GimpViewable     *viewable)
+{
+  renderer->viewable = NULL;
+
+  gimp_view_renderer_update_idle (renderer);
+}
+
+void
+gimp_view_renderer_set_viewable (GimpViewRenderer *renderer,
+                                 GimpViewable     *viewable)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable));
+
+  if (viewable)
+    g_return_if_fail (g_type_is_a (G_TYPE_FROM_INSTANCE (viewable),
+                                   renderer->viewable_type));
+
+  if (viewable == renderer->viewable)
+    return;
+
+  g_clear_pointer (&renderer->surface, cairo_surface_destroy);
+  g_clear_object (&renderer->priv->pixbuf);
+
+  gimp_view_renderer_free_color_transform (renderer);
+
+  if (renderer->viewable)
+    {
+      g_object_weak_unref (G_OBJECT (renderer->viewable),
+                           (GWeakNotify) gimp_view_renderer_weak_notify,
+                           renderer);
+
+      g_signal_handlers_disconnect_by_func (renderer->viewable,
+                                            G_CALLBACK (gimp_view_renderer_invalidate),
+                                            renderer);
+
+      g_signal_handlers_disconnect_by_func (renderer->viewable,
+                                            G_CALLBACK (gimp_view_renderer_size_changed),
+                                            renderer);
+
+      if (GIMP_IS_COLOR_MANAGED (renderer->viewable))
+        g_signal_handlers_disconnect_by_func (renderer->viewable,
+                                              G_CALLBACK (gimp_view_renderer_profile_changed),
+                                              renderer);
+    }
+
+  renderer->viewable = viewable;
+
+  if (renderer->viewable)
+    {
+      g_object_weak_ref (G_OBJECT (renderer->viewable),
+                         (GWeakNotify) gimp_view_renderer_weak_notify,
+                         renderer);
+
+      g_signal_connect_swapped (renderer->viewable,
+                                "invalidate-preview",
+                                G_CALLBACK (gimp_view_renderer_invalidate),
+                                renderer);
+
+      g_signal_connect_swapped (renderer->viewable,
+                                "size-changed",
+                                G_CALLBACK (gimp_view_renderer_size_changed),
+                                renderer);
+
+      if (GIMP_IS_COLOR_MANAGED (renderer->viewable))
+        g_signal_connect_swapped (renderer->viewable,
+                                  "profile-changed",
+                                  G_CALLBACK (gimp_view_renderer_profile_changed),
+                                  renderer);
+
+      if (renderer->size != -1)
+        gimp_view_renderer_set_size (renderer, renderer->size,
+                                     renderer->border_width);
+
+      gimp_view_renderer_invalidate (renderer);
+    }
+  else
+    {
+      gimp_view_renderer_update_idle (renderer);
+    }
+}
+
+void
+gimp_view_renderer_set_size (GimpViewRenderer *renderer,
+                             gint              view_size,
+                             gint              border_width)
+{
+  gint width;
+  gint height;
+
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (view_size >  0 &&
+                    view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+  g_return_if_fail (border_width >= 0 &&
+                    border_width <= GIMP_VIEW_MAX_BORDER_WIDTH);
+
+  renderer->size = view_size;
+
+  if (renderer->viewable)
+    {
+      gimp_viewable_get_preview_size (renderer->viewable,
+                                      view_size,
+                                      renderer->is_popup,
+                                      renderer->dot_for_dot,
+                                      &width, &height);
+    }
+  else
+    {
+      width  = view_size;
+      height = view_size;
+    }
+
+  gimp_view_renderer_set_size_full (renderer, width, height, border_width);
+}
+
+void
+gimp_view_renderer_set_size_full (GimpViewRenderer *renderer,
+                                  gint              width,
+                                  gint              height,
+                                  gint              border_width)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (width >  0 &&
+                    width <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+  g_return_if_fail (height > 0 &&
+                    height <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE);
+  g_return_if_fail (border_width >= 0 &&
+                    border_width <= GIMP_VIEW_MAX_BORDER_WIDTH);
+
+  if (width        != renderer->width  ||
+      height       != renderer->height ||
+      border_width != renderer->border_width)
+    {
+      renderer->width        = width;
+      renderer->height       = height;
+      renderer->border_width = border_width;
+
+      g_clear_pointer (&renderer->surface, cairo_surface_destroy);
+
+      if (renderer->viewable)
+        gimp_view_renderer_invalidate (renderer);
+    }
+}
+
+void
+gimp_view_renderer_set_dot_for_dot (GimpViewRenderer *renderer,
+                                    gboolean             dot_for_dot)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  if (dot_for_dot != renderer->dot_for_dot)
+    {
+      renderer->dot_for_dot = dot_for_dot ? TRUE: FALSE;
+
+      if (renderer->size != -1)
+        gimp_view_renderer_set_size (renderer, renderer->size,
+                                     renderer->border_width);
+
+      gimp_view_renderer_invalidate (renderer);
+    }
+}
+
+void
+gimp_view_renderer_set_border_type (GimpViewRenderer   *renderer,
+                                    GimpViewBorderType  border_type)
+{
+  GimpRGB *border_color = &black_color;
+
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  renderer->border_type = border_type;
+
+  switch (border_type)
+    {
+    case GIMP_VIEW_BORDER_BLACK:
+      border_color = &black_color;
+      break;
+    case GIMP_VIEW_BORDER_WHITE:
+      border_color = &white_color;
+      break;
+    case GIMP_VIEW_BORDER_GREEN:
+      border_color = &green_color;
+      break;
+    case GIMP_VIEW_BORDER_RED:
+      border_color = &red_color;
+      break;
+    }
+
+  gimp_view_renderer_set_border_color (renderer, border_color);
+}
+
+void
+gimp_view_renderer_set_border_color (GimpViewRenderer *renderer,
+                                     const GimpRGB    *color)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (color != NULL);
+
+  if (gimp_rgb_distance (&renderer->border_color, color) > RGB_EPSILON)
+    {
+      renderer->border_color = *color;
+
+      gimp_view_renderer_update_idle (renderer);
+    }
+}
+
+void
+gimp_view_renderer_set_background (GimpViewRenderer *renderer,
+                                   const gchar      *icon_name)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  if (renderer->priv->bg_icon_name)
+    g_free (renderer->priv->bg_icon_name);
+
+  renderer->priv->bg_icon_name = g_strdup (icon_name);
+
+  g_clear_object (&renderer->priv->pattern);
+}
+
+void
+gimp_view_renderer_set_color_config (GimpViewRenderer *renderer,
+                                     GimpColorConfig  *color_config)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (color_config == NULL || GIMP_IS_COLOR_CONFIG (color_config));
+
+  if (color_config != renderer->priv->color_config)
+    {
+      if (renderer->priv->color_config)
+        g_signal_handlers_disconnect_by_func (renderer->priv->color_config,
+                                              gimp_view_renderer_config_notify,
+                                              renderer);
+
+      g_set_object (&renderer->priv->color_config, color_config);
+
+      if (renderer->priv->color_config)
+        g_signal_connect (renderer->priv->color_config, "notify",
+                          G_CALLBACK (gimp_view_renderer_config_notify),
+                          renderer);
+
+      gimp_view_renderer_config_notify (G_OBJECT (renderer->priv->color_config),
+                                        NULL, renderer);
+    }
+}
+
+void
+gimp_view_renderer_invalidate (GimpViewRenderer *renderer)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  if (renderer->priv->idle_id)
+    {
+      g_source_remove (renderer->priv->idle_id);
+      renderer->priv->idle_id = 0;
+    }
+
+  GIMP_VIEW_RENDERER_GET_CLASS (renderer)->invalidate (renderer);
+
+  renderer->priv->idle_id =
+    g_idle_add_full (GIMP_PRIORITY_VIEWABLE_IDLE,
+                     (GSourceFunc) gimp_view_renderer_idle_update,
+                     renderer, NULL);
+}
+
+void
+gimp_view_renderer_update (GimpViewRenderer *renderer)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  if (renderer->priv->idle_id)
+    {
+      g_source_remove (renderer->priv->idle_id);
+      renderer->priv->idle_id = 0;
+    }
+
+  g_signal_emit (renderer, renderer_signals[UPDATE], 0);
+}
+
+void
+gimp_view_renderer_update_idle (GimpViewRenderer *renderer)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  if (renderer->priv->idle_id)
+    g_source_remove (renderer->priv->idle_id);
+
+  renderer->priv->idle_id =
+    g_idle_add_full (GIMP_PRIORITY_VIEWABLE_IDLE,
+                     (GSourceFunc) gimp_view_renderer_idle_update,
+                     renderer, NULL);
+}
+
+void
+gimp_view_renderer_remove_idle (GimpViewRenderer *renderer)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  if (renderer->priv->idle_id)
+    {
+      g_source_remove (renderer->priv->idle_id);
+      renderer->priv->idle_id = 0;
+    }
+}
+
+void
+gimp_view_renderer_draw (GimpViewRenderer *renderer,
+                         GtkWidget        *widget,
+                         cairo_t          *cr,
+                         gint              available_width,
+                         gint              available_height)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (cr != NULL);
+
+  if (G_UNLIKELY (renderer->context == NULL))
+    g_warning ("%s: renderer->context is NULL", G_STRFUNC);
+
+  if (! gtk_widget_is_drawable (widget))
+    return;
+
+  if (renderer->viewable)
+    {
+      cairo_save (cr);
+
+      GIMP_VIEW_RENDERER_GET_CLASS (renderer)->draw (renderer, widget, cr,
+                                                     available_width,
+                                                     available_height);
+
+      cairo_restore (cr);
+    }
+  else
+    {
+      GimpViewableClass *viewable_class;
+
+      viewable_class = g_type_class_ref (renderer->viewable_type);
+
+      gimp_view_renderer_render_icon (renderer,
+                                      widget,
+                                      viewable_class->default_icon_name);
+      renderer->priv->needs_render = FALSE;
+
+      g_type_class_unref (viewable_class);
+
+      gimp_view_renderer_real_draw (renderer, widget, cr,
+                                    available_width,
+                                    available_height);
+    }
+
+  if (renderer->border_width > 0)
+    {
+      gint    width  = renderer->width  + renderer->border_width;
+      gint    height = renderer->height + renderer->border_width;
+      gdouble x, y;
+
+      cairo_set_line_width (cr, renderer->border_width);
+      cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+      gimp_cairo_set_source_rgb (cr, &renderer->border_color);
+
+      x = (available_width  - width)  / 2.0;
+      y = (available_height - height) / 2.0;
+
+      cairo_rectangle (cr, x, y, width, height);
+      cairo_stroke (cr);
+    }
+}
+
+
+/*  private functions  */
+
+static gboolean
+gimp_view_renderer_idle_update (GimpViewRenderer *renderer)
+{
+  renderer->priv->idle_id = 0;
+
+  gimp_view_renderer_update (renderer);
+
+  return FALSE;
+}
+
+static void
+gimp_view_renderer_real_set_context (GimpViewRenderer *renderer,
+                                     GimpContext      *context)
+{
+  if (renderer->context &&
+      renderer->priv->color_config ==
+      renderer->context->gimp->config->color_management)
+    {
+      gimp_view_renderer_set_color_config (renderer, NULL);
+    }
+
+  g_set_object (&renderer->context, context);
+
+  if (renderer->context &&
+      renderer->priv->color_config == NULL)
+    {
+      gimp_view_renderer_set_color_config (renderer,
+                                           renderer->context->gimp->config->color_management);
+    }
+}
+
+static void
+gimp_view_renderer_real_invalidate (GimpViewRenderer *renderer)
+{
+  renderer->priv->needs_render = TRUE;
+}
+
+static void
+gimp_view_renderer_real_draw (GimpViewRenderer *renderer,
+                              GtkWidget        *widget,
+                              cairo_t          *cr,
+                              gint              available_width,
+                              gint              available_height)
+{
+  if (renderer->priv->needs_render)
+    {
+      GIMP_VIEW_RENDERER_GET_CLASS (renderer)->render (renderer, widget);
+
+      renderer->priv->needs_render = FALSE;
+    }
+
+  if (renderer->priv->pixbuf)
+    {
+      gint  width  = gdk_pixbuf_get_width  (renderer->priv->pixbuf);
+      gint  height = gdk_pixbuf_get_height (renderer->priv->pixbuf);
+      gint  x, y;
+
+      if (renderer->priv->bg_icon_name)
+        {
+          if (! renderer->priv->pattern)
+            {
+              renderer->priv->pattern =
+                gimp_view_renderer_create_background (renderer, widget);
+            }
+
+          cairo_set_source (cr, renderer->priv->pattern);
+          cairo_paint (cr);
+        }
+
+      x = (available_width  - width)  / 2;
+      y = (available_height - height) / 2;
+
+      gdk_cairo_set_source_pixbuf (cr, renderer->priv->pixbuf, x, y);
+      cairo_rectangle (cr, x, y, width, height);
+      cairo_fill (cr);
+    }
+  else if (renderer->surface)
+    {
+      cairo_content_t content  = cairo_surface_get_content (renderer->surface);
+      gint            width    = renderer->width;
+      gint            height   = renderer->height;
+      gint            offset_x = (available_width  - width)  / 2;
+      gint            offset_y = (available_height - height) / 2;
+
+      cairo_translate (cr, offset_x, offset_y);
+
+      cairo_rectangle (cr, 0, 0, width, height);
+
+      if (content == CAIRO_CONTENT_COLOR_ALPHA)
+        {
+          if (! renderer->priv->pattern)
+            renderer->priv->pattern =
+              gimp_cairo_checkerboard_create (cr, GIMP_CHECK_SIZE_SM,
+                                              gimp_render_light_check_color (),
+                                              gimp_render_dark_check_color ());
+
+          cairo_set_source (cr, renderer->priv->pattern);
+          cairo_fill_preserve (cr);
+        }
+
+      cairo_set_source_surface (cr, renderer->surface, 0, 0);
+      cairo_fill (cr);
+
+      cairo_translate (cr, - offset_x, - offset_y);
+    }
+}
+
+static void
+gimp_view_renderer_real_render (GimpViewRenderer *renderer,
+                                GtkWidget        *widget)
+{
+  GdkPixbuf   *pixbuf;
+  GimpTempBuf *temp_buf;
+  const gchar *icon_name;
+
+  pixbuf = gimp_viewable_get_pixbuf (renderer->viewable,
+                                     renderer->context,
+                                     renderer->width,
+                                     renderer->height);
+  if (pixbuf)
+    {
+      gimp_view_renderer_render_pixbuf (renderer, widget, pixbuf);
+      return;
+    }
+
+  temp_buf = gimp_viewable_get_preview (renderer->viewable,
+                                        renderer->context,
+                                        renderer->width,
+                                        renderer->height);
+  if (temp_buf)
+    {
+      gimp_view_renderer_render_temp_buf_simple (renderer, widget, temp_buf);
+      return;
+    }
+
+  icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+  gimp_view_renderer_render_icon (renderer, widget, icon_name);
+}
+
+static void
+gimp_view_renderer_size_changed (GimpViewRenderer *renderer,
+                                 GimpViewable     *viewable)
+{
+  if (renderer->size != -1)
+    gimp_view_renderer_set_size (renderer, renderer->size,
+                                 renderer->border_width);
+
+  gimp_view_renderer_invalidate (renderer);
+}
+
+static void
+gimp_view_renderer_profile_changed (GimpViewRenderer *renderer,
+                                    GimpViewable     *viewable)
+{
+  gimp_view_renderer_free_color_transform (renderer);
+}
+
+static void
+gimp_view_renderer_config_notify (GObject          *config,
+                                  const GParamSpec *pspec,
+                                  GimpViewRenderer *renderer)
+{
+  gimp_view_renderer_free_color_transform (renderer);
+}
+
+
+/*  protected functions  */
+
+void
+gimp_view_renderer_render_temp_buf_simple (GimpViewRenderer *renderer,
+                                           GtkWidget        *widget,
+                                           GimpTempBuf      *temp_buf)
+{
+  gint temp_buf_x = 0;
+  gint temp_buf_y = 0;
+  gint temp_buf_width;
+  gint temp_buf_height;
+
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (temp_buf != NULL);
+
+  temp_buf_width  = gimp_temp_buf_get_width  (temp_buf);
+  temp_buf_height = gimp_temp_buf_get_height (temp_buf);
+
+  if (temp_buf_width < renderer->width)
+    temp_buf_x = (renderer->width - temp_buf_width)  / 2;
+
+  if (temp_buf_height < renderer->height)
+    temp_buf_y = (renderer->height - temp_buf_height) / 2;
+
+  gimp_view_renderer_render_temp_buf (renderer, widget, temp_buf,
+                                      temp_buf_x, temp_buf_y,
+                                      -1,
+                                      GIMP_VIEW_BG_CHECKS,
+                                      GIMP_VIEW_BG_WHITE);
+}
+
+void
+gimp_view_renderer_render_temp_buf (GimpViewRenderer *renderer,
+                                    GtkWidget        *widget,
+                                    GimpTempBuf      *temp_buf,
+                                    gint              temp_buf_x,
+                                    gint              temp_buf_y,
+                                    gint              channel,
+                                    GimpViewBG        inside_bg,
+                                    GimpViewBG        outside_bg)
+{
+  g_clear_object (&renderer->priv->pixbuf);
+
+  if (! renderer->surface)
+    renderer->surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+                                                    renderer->width,
+                                                    renderer->height);
+
+  gimp_view_render_temp_buf_to_surface (renderer,
+                                        widget,
+                                        temp_buf,
+                                        temp_buf_x,
+                                        temp_buf_y,
+                                        channel,
+                                        inside_bg,
+                                        outside_bg,
+                                        renderer->surface,
+                                        renderer->width,
+                                        renderer->height);
+}
+
+
+void
+gimp_view_renderer_render_pixbuf (GimpViewRenderer *renderer,
+                                  GtkWidget        *widget,
+                                  GdkPixbuf        *pixbuf)
+{
+  GimpColorTransform *transform;
+  const Babl         *format;
+
+  g_clear_pointer (&renderer->surface, cairo_surface_destroy);
+
+  format = gimp_pixbuf_get_format (pixbuf);
+
+  transform = gimp_view_renderer_get_color_transform (renderer, widget,
+                                                      format, format);
+
+  if (transform)
+    {
+      GdkPixbuf *new;
+      gint       width       = gdk_pixbuf_get_width  (pixbuf);
+      gint       height      = gdk_pixbuf_get_height (pixbuf);
+      gsize      src_stride  = gdk_pixbuf_get_rowstride (pixbuf);
+      guchar    *src         = gdk_pixbuf_get_pixels (pixbuf);
+      gsize      dest_stride;
+      guchar    *dest;
+      gint       i;
+
+      new = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+                            gdk_pixbuf_get_has_alpha (pixbuf),
+                            8, width, height);
+
+      dest_stride = gdk_pixbuf_get_rowstride (new);
+      dest        = gdk_pixbuf_get_pixels (new);
+
+      for (i = 0; i < height; i++)
+        {
+          gimp_color_transform_process_pixels (transform,
+                                               format, src,
+                                               format, dest,
+                                               width);
+
+          src  += src_stride;
+          dest += dest_stride;
+        }
+
+      g_clear_object (&renderer->priv->pixbuf);
+      renderer->priv->pixbuf = new;
+    }
+  else
+    {
+      g_set_object (&renderer->priv->pixbuf, pixbuf);
+    }
+}
+
+void
+gimp_view_renderer_render_icon (GimpViewRenderer *renderer,
+                                GtkWidget        *widget,
+                                const gchar      *icon_name)
+{
+  GdkPixbuf *pixbuf;
+  gint       width;
+  gint       height;
+
+
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (icon_name != NULL);
+
+  g_clear_object (&renderer->priv->pixbuf);
+  g_clear_pointer (&renderer->surface, cairo_surface_destroy);
+
+  pixbuf = gimp_widget_load_icon (widget, icon_name,
+                                  MIN (renderer->width, renderer->height));
+  width  = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+
+  if (width > renderer->width || height > renderer->height)
+    {
+      GdkPixbuf *scaled_pixbuf;
+
+      gimp_viewable_calc_preview_size (width, height,
+                                       renderer->width, renderer->height,
+                                       TRUE, 1.0, 1.0,
+                                       &width, &height,
+                                       NULL);
+
+      scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
+                                               width, height,
+                                               GDK_INTERP_BILINEAR);
+
+      g_object_unref (pixbuf);
+      pixbuf = scaled_pixbuf;
+    }
+
+  renderer->priv->pixbuf = pixbuf;
+}
+
+GimpColorTransform *
+gimp_view_renderer_get_color_transform (GimpViewRenderer *renderer,
+                                        GtkWidget        *widget,
+                                        const Babl       *src_format,
+                                        const Babl       *dest_format)
+{
+  GimpColorProfile *profile;
+
+  g_return_val_if_fail (GIMP_IS_VIEW_RENDERER (renderer), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (src_format != NULL, NULL);
+  g_return_val_if_fail (dest_format != NULL, NULL);
+
+  if (renderer->priv->profile_transform)
+    return renderer->priv->profile_transform;
+
+  if (! renderer->priv->color_config)
+    {
+      g_printerr ("EEK\n");
+      return NULL;
+    }
+
+  if (GIMP_IS_COLOR_MANAGED (renderer->viewable))
+    {
+      GimpColorManaged *managed = GIMP_COLOR_MANAGED (renderer->viewable);
+
+      profile = gimp_color_managed_get_color_profile (managed);
+    }
+  else
+    {
+      static GimpColorProfile *srgb_profile = NULL;
+
+      if (G_UNLIKELY (! srgb_profile))
+        srgb_profile = gimp_color_profile_new_rgb_srgb ();
+
+      profile = srgb_profile;
+    }
+
+  renderer->priv->profile_transform =
+    gimp_widget_get_color_transform (widget,
+                                     renderer->priv->color_config,
+                                     profile,
+                                     src_format,
+                                     dest_format);
+
+  return renderer->priv->profile_transform;
+}
+
+void
+gimp_view_renderer_free_color_transform (GimpViewRenderer *renderer)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER (renderer));
+
+  g_clear_object (&renderer->priv->profile_transform);
+
+  gimp_view_renderer_invalidate (renderer);
+}
+
+/*  private functions  */
+
+static void
+gimp_view_render_temp_buf_to_surface (GimpViewRenderer *renderer,
+                                      GtkWidget        *widget,
+                                      GimpTempBuf      *temp_buf,
+                                      gint              temp_buf_x,
+                                      gint              temp_buf_y,
+                                      gint              channel,
+                                      GimpViewBG        inside_bg,
+                                      GimpViewBG        outside_bg,
+                                      cairo_surface_t  *surface,
+                                      gint              surface_width,
+                                      gint              surface_height)
+{
+  cairo_t    *cr;
+  gint        x, y;
+  gint        width, height;
+  const Babl *temp_buf_format;
+  gint        temp_buf_width;
+  gint        temp_buf_height;
+
+  g_return_if_fail (temp_buf != NULL);
+  g_return_if_fail (surface != NULL);
+
+  temp_buf_format = gimp_temp_buf_get_format (temp_buf);
+  temp_buf_width  = gimp_temp_buf_get_width  (temp_buf);
+  temp_buf_height = gimp_temp_buf_get_height (temp_buf);
+
+  /*  Here are the different cases this functions handles correctly:
+   *  1)  Offset temp_buf which does not necessarily cover full image area
+   *  2)  Color conversion of temp_buf if it is gray and image is color
+   *  3)  Background check buffer for transparent temp_bufs
+   *  4)  Using the optional "channel" argument, one channel can be extracted
+   *      from a multi-channel temp_buf and composited as a grayscale
+   *  Prereqs:
+   *  1)  Grayscale temp_bufs have bytes == {1, 2}
+   *  2)  Color temp_bufs have bytes == {3, 4}
+   *  3)  If image is gray, then temp_buf should have bytes == {1, 2}
+   */
+
+  cr = cairo_create (surface);
+
+  if (outside_bg == GIMP_VIEW_BG_CHECKS ||
+      inside_bg  == GIMP_VIEW_BG_CHECKS)
+    {
+      if (! renderer->priv->pattern)
+        renderer->priv->pattern =
+          gimp_cairo_checkerboard_create (cr, GIMP_CHECK_SIZE_SM,
+                                          gimp_render_light_check_color (),
+                                          gimp_render_dark_check_color ());
+    }
+
+  switch (outside_bg)
+    {
+    case GIMP_VIEW_BG_CHECKS:
+      cairo_set_source (cr, renderer->priv->pattern);
+      break;
+
+    case GIMP_VIEW_BG_WHITE:
+      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+      break;
+    }
+
+  cairo_paint (cr);
+
+  if (! gimp_rectangle_intersect (0, 0,
+                                  surface_width, surface_height,
+                                  temp_buf_x, temp_buf_y,
+                                  temp_buf_width, temp_buf_height,
+                                  &x, &y,
+                                  &width, &height))
+    {
+      cairo_destroy (cr);
+      return;
+    }
+
+  if (inside_bg != outside_bg &&
+      babl_format_has_alpha (temp_buf_format) && channel == -1)
+    {
+      cairo_rectangle (cr, x, y, width, height);
+
+      switch (inside_bg)
+        {
+        case GIMP_VIEW_BG_CHECKS:
+          cairo_set_source (cr, renderer->priv->pattern);
+          break;
+
+        case GIMP_VIEW_BG_WHITE:
+          cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+          break;
+        }
+
+      cairo_fill (cr);
+    }
+
+  if (babl_format_has_alpha (temp_buf_format) && channel == -1)
+    {
+      GimpColorTransform *transform;
+      GeglBuffer         *src_buffer;
+      GeglBuffer         *dest_buffer;
+      cairo_surface_t    *alpha_surface;
+
+      alpha_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                                  width, height);
+
+      src_buffer  = gimp_temp_buf_create_buffer (temp_buf);
+      dest_buffer = gimp_cairo_surface_create_buffer (alpha_surface);
+
+      transform =
+        gimp_view_renderer_get_color_transform (renderer, widget,
+                                                gegl_buffer_get_format (src_buffer),
+                                                gegl_buffer_get_format (dest_buffer));
+
+      if (transform)
+        {
+          gimp_color_transform_process_buffer (transform,
+                                               src_buffer,
+                                               GEGL_RECTANGLE (x - temp_buf_x,
+                                                               y - temp_buf_y,
+                                                               width, height),
+                                               dest_buffer,
+                                               GEGL_RECTANGLE (0, 0, 0, 0));
+        }
+      else
+        {
+          gimp_gegl_buffer_copy (src_buffer,
+                                 GEGL_RECTANGLE (x - temp_buf_x,
+                                                 y - temp_buf_y,
+                                                 width, height),
+                                 GEGL_ABYSS_NONE,
+                                 dest_buffer,
+                                 GEGL_RECTANGLE (0, 0, 0, 0));
+        }
+
+      g_object_unref (src_buffer);
+      g_object_unref (dest_buffer);
+
+      cairo_surface_mark_dirty (alpha_surface);
+
+      cairo_translate (cr, x, y);
+      cairo_rectangle (cr, 0, 0, width, height);
+      cairo_set_source_surface (cr, alpha_surface, 0, 0);
+      cairo_fill (cr);
+
+      cairo_surface_destroy (alpha_surface);
+    }
+  else if (channel == -1)
+    {
+      GimpColorTransform *transform;
+      GeglBuffer         *src_buffer;
+      GeglBuffer         *dest_buffer;
+
+      cairo_surface_flush (surface);
+
+      src_buffer  = gimp_temp_buf_create_buffer (temp_buf);
+      dest_buffer = gimp_cairo_surface_create_buffer (surface);
+
+      transform =
+        gimp_view_renderer_get_color_transform (renderer, widget,
+                                                gegl_buffer_get_format (src_buffer),
+                                                gegl_buffer_get_format (dest_buffer));
+
+      if (transform)
+        {
+          gimp_color_transform_process_buffer (transform,
+                                               src_buffer,
+                                               GEGL_RECTANGLE (x - temp_buf_x,
+                                                               y - temp_buf_y,
+                                                               width, height),
+                                               dest_buffer,
+                                               GEGL_RECTANGLE (x, y, 0, 0));
+        }
+      else
+        {
+          gimp_gegl_buffer_copy (src_buffer,
+                                 GEGL_RECTANGLE (x - temp_buf_x,
+                                                 y - temp_buf_y,
+                                                 width, height),
+                                 GEGL_ABYSS_NONE,
+                                 dest_buffer,
+                                 GEGL_RECTANGLE (x, y, 0, 0));
+        }
+
+      g_object_unref (src_buffer);
+      g_object_unref (dest_buffer);
+
+      cairo_surface_mark_dirty (surface);
+    }
+  else
+    {
+      const Babl   *fish;
+      const guchar *src;
+      guchar       *dest;
+      gint          dest_stride;
+      gint          bytes;
+      gint          rowstride;
+      gint          i;
+
+      cairo_surface_flush (surface);
+
+      bytes     = babl_format_get_bytes_per_pixel (temp_buf_format);
+      rowstride = temp_buf_width * bytes;
+
+      src = gimp_temp_buf_get_data (temp_buf) + ((y - temp_buf_y) * rowstride +
+                                                 (x - temp_buf_x) * bytes);
+
+      dest        = cairo_image_surface_get_data (surface);
+      dest_stride = cairo_image_surface_get_stride (surface);
+
+      dest += y * dest_stride + x * 4;
+
+      fish = babl_fish (temp_buf_format,
+                        babl_format ("cairo-RGB24"));
+
+      for (i = y; i < (y + height); i++)
+        {
+          const guchar *s = src;
+          guchar       *d = dest;
+          gint          j;
+
+          for (j = x; j < (x + width); j++, d += 4, s += bytes)
+            {
+              if (bytes > 2)
+                {
+                  guchar pixel[4] = { s[channel], s[channel], s[channel], 255 };
+
+                  babl_process (fish, pixel, d, 1);
+                }
+              else
+                {
+                  guchar pixel[2] = { s[channel], 255 };
+
+                  babl_process (fish, pixel, d, 1);
+                }
+            }
+
+          src += rowstride;
+          dest += dest_stride;
+        }
+
+      cairo_surface_mark_dirty (surface);
+    }
+
+  cairo_destroy (cr);
+}
+
+/* This function creates a background pattern from a named icon
+ * if renderer->priv->bg_icon_name is set.
+ */
+static cairo_pattern_t *
+gimp_view_renderer_create_background (GimpViewRenderer *renderer,
+                                      GtkWidget        *widget)
+{
+  cairo_pattern_t *pattern = NULL;
+
+  if (renderer->priv->bg_icon_name)
+    {
+      cairo_surface_t *surface;
+      GdkPixbuf       *pixbuf;
+
+      pixbuf = gimp_widget_load_icon (widget,
+                                      renderer->priv->bg_icon_name,
+                                      64);
+      surface = gimp_cairo_surface_create_from_pixbuf (pixbuf);
+      g_object_unref (pixbuf);
+
+      pattern = cairo_pattern_create_for_surface (surface);
+      cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+
+      cairo_surface_destroy (surface);
+    }
+
+  return pattern;
+}
diff --git a/app/widgets/gimpviewrenderer.h b/app/widgets/gimpviewrenderer.h
new file mode 100644
index 0000000..6d14533
--- /dev/null
+++ b/app/widgets/gimpviewrenderer.h
@@ -0,0 +1,167 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderer.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_H__
+#define __GIMP_VIEW_RENDERER_H__
+
+
+#define GIMP_VIEW_MAX_BORDER_WIDTH 16
+
+
+#define GIMP_TYPE_VIEW_RENDERER            (gimp_view_renderer_get_type ())
+#define GIMP_VIEW_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER, GimpViewRenderer))
+#define GIMP_VIEW_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER, GimpViewRendererClass))
+#define GIMP_IS_VIEW_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER))
+#define GIMP_IS_VIEW_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER))
+#define GIMP_VIEW_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER, GimpViewRendererClass))
+
+
+typedef struct _GimpViewRendererPrivate GimpViewRendererPrivate;
+typedef struct _GimpViewRendererClass   GimpViewRendererClass;
+
+struct _GimpViewRenderer
+{
+  GObject             parent_instance;
+
+  GimpContext        *context;
+
+  GType               viewable_type;
+  GimpViewable       *viewable;
+
+  gint                width;
+  gint                height;
+  gint                border_width;
+  guint               dot_for_dot : 1;
+  guint               is_popup    : 1;
+
+  GimpViewBorderType  border_type;
+  GimpRGB             border_color;
+
+  /*< protected >*/
+  cairo_surface_t    *surface;
+
+  gint                size;
+
+  /*< private >*/
+  GimpViewRendererPrivate *priv;
+};
+
+struct _GimpViewRendererClass
+{
+  GObjectClass   parent_class;
+
+  GdkPixbuf     *frame;
+  gint           frame_left;
+  gint           frame_right;
+  gint           frame_bottom;
+  gint           frame_top;
+
+  /*  signals  */
+  void (* update)      (GimpViewRenderer *renderer);
+
+  /*  virtual functions  */
+  void (* set_context) (GimpViewRenderer *renderer,
+                        GimpContext      *context);
+  void (* invalidate)  (GimpViewRenderer *renderer);
+  void (* draw)        (GimpViewRenderer *renderer,
+                        GtkWidget        *widget,
+                        cairo_t          *cr,
+                        gint              available_width,
+                        gint              available_height);
+  void (* render)      (GimpViewRenderer *renderer,
+                        GtkWidget        *widget);
+};
+
+
+GType              gimp_view_renderer_get_type (void) G_GNUC_CONST;
+
+GimpViewRenderer * gimp_view_renderer_new      (GimpContext *context,
+                                                GType        viewable_type,
+                                                gint         size,
+                                                gint         border_width,
+                                                gboolean     is_popup);
+GimpViewRenderer * gimp_view_renderer_new_full (GimpContext *context,
+                                                GType        viewable_type,
+                                                gint         width,
+                                                gint         height,
+                                                gint         border_width,
+                                                gboolean     is_popup);
+
+void   gimp_view_renderer_set_context      (GimpViewRenderer   *renderer,
+                                            GimpContext        *context);
+void   gimp_view_renderer_set_viewable     (GimpViewRenderer   *renderer,
+                                            GimpViewable       *viewable);
+void   gimp_view_renderer_set_size         (GimpViewRenderer   *renderer,
+                                            gint                size,
+                                            gint                border_width);
+void   gimp_view_renderer_set_size_full    (GimpViewRenderer   *renderer,
+                                            gint                width,
+                                            gint                height,
+                                            gint                border_width);
+void   gimp_view_renderer_set_dot_for_dot  (GimpViewRenderer   *renderer,
+                                            gboolean            dot_for_dot);
+void   gimp_view_renderer_set_border_type  (GimpViewRenderer   *renderer,
+                                            GimpViewBorderType  border_type);
+void   gimp_view_renderer_set_border_color (GimpViewRenderer   *renderer,
+                                            const GimpRGB      *border_color);
+void   gimp_view_renderer_set_background   (GimpViewRenderer   *renderer,
+                                            const gchar        *icon_name);
+void   gimp_view_renderer_set_color_config (GimpViewRenderer   *renderer,
+                                            GimpColorConfig    *color_config);
+
+void   gimp_view_renderer_invalidate       (GimpViewRenderer   *renderer);
+void   gimp_view_renderer_update           (GimpViewRenderer   *renderer);
+void   gimp_view_renderer_update_idle      (GimpViewRenderer   *renderer);
+void   gimp_view_renderer_remove_idle      (GimpViewRenderer   *renderer);
+
+void   gimp_view_renderer_draw             (GimpViewRenderer   *renderer,
+                                            GtkWidget          *widget,
+                                            cairo_t            *cr,
+                                            gint                available_width,
+                                            gint                available_height);
+
+/*  protected  */
+
+void   gimp_view_renderer_render_temp_buf_simple (GimpViewRenderer *renderer,
+                                                  GtkWidget        *widget,
+                                                  GimpTempBuf      *temp_buf);
+void   gimp_view_renderer_render_temp_buf        (GimpViewRenderer *renderer,
+                                                  GtkWidget        *widget,
+                                                  GimpTempBuf      *temp_buf,
+                                                  gint              temp_buf_x,
+                                                  gint              temp_buf_y,
+                                                  gint              channel,
+                                                  GimpViewBG        inside_bg,
+                                                  GimpViewBG        outside_bg);
+void   gimp_view_renderer_render_pixbuf          (GimpViewRenderer *renderer,
+                                                  GtkWidget        *widget,
+                                                  GdkPixbuf        *pixbuf);
+void   gimp_view_renderer_render_icon            (GimpViewRenderer *renderer,
+                                                  GtkWidget        *widget,
+                                                  const gchar      *icon_name);
+GimpColorTransform *
+       gimp_view_renderer_get_color_transform    (GimpViewRenderer *renderer,
+                                                  GtkWidget        *widget,
+                                                  const Babl       *src_format,
+                                                  const Babl       *dest_format);
+void   gimp_view_renderer_free_color_transform   (GimpViewRenderer *renderer);
+
+
+#endif /* __GIMP_VIEW_RENDERER_H__ */
diff --git a/app/widgets/gimpviewrendererbrush.c b/app/widgets/gimpviewrendererbrush.c
new file mode 100644
index 0000000..0bf0116
--- /dev/null
+++ b/app/widgets/gimpviewrendererbrush.c
@@ -0,0 +1,265 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererbrush.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "core/gimpbrushpipe.h"
+#include "core/gimpbrushgenerated.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpviewrendererbrush.h"
+
+
+static void   gimp_view_renderer_brush_finalize (GObject          *object);
+static void   gimp_view_renderer_brush_render   (GimpViewRenderer *renderer,
+                                                 GtkWidget        *widget);
+static void   gimp_view_renderer_brush_draw     (GimpViewRenderer *renderer,
+                                                 GtkWidget        *widget,
+                                                 cairo_t          *cr,
+                                                 gint              available_width,
+                                                 gint              available_height);
+
+static gboolean gimp_view_renderer_brush_render_timeout (gpointer    data);
+
+
+G_DEFINE_TYPE (GimpViewRendererBrush, gimp_view_renderer_brush,
+               GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_brush_parent_class
+
+
+static void
+gimp_view_renderer_brush_class_init (GimpViewRendererBrushClass *klass)
+{
+  GObjectClass          *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  object_class->finalize = gimp_view_renderer_brush_finalize;
+
+  renderer_class->render = gimp_view_renderer_brush_render;
+  renderer_class->draw   = gimp_view_renderer_brush_draw;
+}
+
+static void
+gimp_view_renderer_brush_init (GimpViewRendererBrush *renderer)
+{
+  renderer->pipe_timeout_id      = 0;
+  renderer->pipe_animation_index = 0;
+}
+
+static void
+gimp_view_renderer_brush_finalize (GObject *object)
+{
+  GimpViewRendererBrush *renderer = GIMP_VIEW_RENDERER_BRUSH (object);
+
+  if (renderer->pipe_timeout_id)
+    {
+      g_source_remove (renderer->pipe_timeout_id);
+      renderer->pipe_timeout_id = 0;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_view_renderer_brush_render (GimpViewRenderer *renderer,
+                                 GtkWidget        *widget)
+{
+  GimpViewRendererBrush *renderbrush = GIMP_VIEW_RENDERER_BRUSH (renderer);
+  GimpTempBuf           *temp_buf;
+  gint                   temp_buf_x = 0;
+  gint                   temp_buf_y = 0;
+  gint                   temp_buf_width;
+  gint                   temp_buf_height;
+
+  if (renderbrush->pipe_timeout_id)
+    {
+      g_source_remove (renderbrush->pipe_timeout_id);
+      renderbrush->pipe_timeout_id = 0;
+    }
+
+  temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
+                                            renderer->context,
+                                            renderer->width,
+                                            renderer->height);
+
+  temp_buf_width  = gimp_temp_buf_get_width  (temp_buf);
+  temp_buf_height = gimp_temp_buf_get_height (temp_buf);
+
+  if (temp_buf_width < renderer->width)
+    temp_buf_x = (renderer->width - temp_buf_width) / 2;
+
+  if (temp_buf_height < renderer->height)
+    temp_buf_y = (renderer->height - temp_buf_height) / 2;
+
+  if (renderer->is_popup)
+    {
+      gimp_view_renderer_render_temp_buf (renderer, widget, temp_buf,
+                                          temp_buf_x, temp_buf_y,
+                                          -1,
+                                          GIMP_VIEW_BG_WHITE,
+                                          GIMP_VIEW_BG_WHITE);
+
+      gimp_temp_buf_unref (temp_buf);
+
+      if (GIMP_IS_BRUSH_PIPE (renderer->viewable))
+        {
+          renderbrush->widget = widget;
+          renderbrush->pipe_animation_index = 0;
+          renderbrush->pipe_timeout_id =
+            g_timeout_add (300, gimp_view_renderer_brush_render_timeout,
+                           renderbrush);
+        }
+
+      return;
+    }
+
+  gimp_view_renderer_render_temp_buf (renderer, widget, temp_buf,
+                                      temp_buf_x, temp_buf_y,
+                                      -1,
+                                      GIMP_VIEW_BG_WHITE,
+                                      GIMP_VIEW_BG_WHITE);
+
+  gimp_temp_buf_unref (temp_buf);
+}
+
+static gboolean
+gimp_view_renderer_brush_render_timeout (gpointer data)
+{
+  GimpViewRendererBrush *renderbrush = GIMP_VIEW_RENDERER_BRUSH (data);
+  GimpViewRenderer      *renderer    = GIMP_VIEW_RENDERER (data);
+  GimpBrushPipe         *brush_pipe;
+  GimpBrush             *brush;
+  GimpTempBuf           *temp_buf;
+  gint                   temp_buf_x = 0;
+  gint                   temp_buf_y = 0;
+  gint                   temp_buf_width;
+  gint                   temp_buf_height;
+
+  if (! renderer->viewable)
+    {
+      renderbrush->pipe_timeout_id      = 0;
+      renderbrush->pipe_animation_index = 0;
+
+      return FALSE;
+    }
+
+  brush_pipe = GIMP_BRUSH_PIPE (renderer->viewable);
+
+  renderbrush->pipe_animation_index++;
+
+  if (renderbrush->pipe_animation_index >= brush_pipe->n_brushes)
+    renderbrush->pipe_animation_index = 0;
+
+  brush =
+    GIMP_BRUSH (brush_pipe->brushes[renderbrush->pipe_animation_index]);
+
+  temp_buf = gimp_viewable_get_new_preview (GIMP_VIEWABLE (brush),
+                                            renderer->context,
+                                            renderer->width,
+                                            renderer->height);
+
+  temp_buf_width  = gimp_temp_buf_get_width  (temp_buf);
+  temp_buf_height = gimp_temp_buf_get_height (temp_buf);
+
+  if (temp_buf_width < renderer->width)
+    temp_buf_x = (renderer->width - temp_buf_width) / 2;
+
+  if (temp_buf_height < renderer->height)
+    temp_buf_y = (renderer->height - temp_buf_height) / 2;
+
+  gimp_view_renderer_render_temp_buf (renderer, renderbrush->widget, temp_buf,
+                                      temp_buf_x, temp_buf_y,
+                                      -1,
+                                      GIMP_VIEW_BG_WHITE,
+                                      GIMP_VIEW_BG_WHITE);
+
+  gimp_temp_buf_unref (temp_buf);
+
+  gimp_view_renderer_update (renderer);
+
+  return TRUE;
+}
+
+static void
+gimp_view_renderer_brush_draw (GimpViewRenderer *renderer,
+                               GtkWidget        *widget,
+                               cairo_t          *cr,
+                               gint              available_width,
+                               gint              available_height)
+{
+  GIMP_VIEW_RENDERER_CLASS (parent_class)->draw (renderer, widget, cr,
+                                                 available_width,
+                                                 available_height);
+
+#define INDICATOR_WIDTH  7
+#define INDICATOR_HEIGHT 7
+
+  if (renderer->width  > 2 * INDICATOR_WIDTH &&
+      renderer->height > 2 * INDICATOR_HEIGHT)
+    {
+      gboolean  pipe      = GIMP_IS_BRUSH_PIPE (renderer->viewable);
+      gboolean  generated = GIMP_IS_BRUSH_GENERATED (renderer->viewable);
+      gint      brush_width;
+      gint      brush_height;
+
+      if (generated || pipe)
+        {
+          cairo_move_to (cr, available_width, available_height);
+          cairo_rel_line_to (cr, - INDICATOR_WIDTH, 0);
+          cairo_rel_line_to (cr, INDICATOR_WIDTH, - INDICATOR_HEIGHT);
+          cairo_rel_line_to (cr, 0, INDICATOR_HEIGHT);
+
+          if (pipe)
+            cairo_set_source_rgb (cr, 1.0, 0.5, 0.5);
+          else
+            cairo_set_source_rgb (cr, 0.5, 0.6, 1.0);
+
+          cairo_fill (cr);
+        }
+
+      gimp_viewable_get_size (renderer->viewable, &brush_width, &brush_height);
+
+      if (renderer->width < brush_width || renderer->height < brush_height)
+        {
+          cairo_move_to (cr,
+                         available_width  - INDICATOR_WIDTH + 1,
+                         available_height - INDICATOR_HEIGHT / 2.0);
+          cairo_rel_line_to (cr, INDICATOR_WIDTH - 2, 0);
+
+          cairo_move_to (cr,
+                         available_width  - INDICATOR_WIDTH / 2.0,
+                         available_height - INDICATOR_HEIGHT + 1);
+          cairo_rel_line_to (cr, 0, INDICATOR_WIDTH - 2);
+
+          cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+          cairo_set_line_width (cr, 1);
+          cairo_stroke (cr);
+        }
+    }
+
+#undef INDICATOR_WIDTH
+#undef INDICATOR_HEIGHT
+}
diff --git a/app/widgets/gimpviewrendererbrush.h b/app/widgets/gimpviewrendererbrush.h
new file mode 100644
index 0000000..b9a5399
--- /dev/null
+++ b/app/widgets/gimpviewrendererbrush.h
@@ -0,0 +1,56 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererbrush.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_BRUSH_H__
+#define __GIMP_VIEW_RENDERER_BRUSH_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_BRUSH            (gimp_view_renderer_brush_get_type ())
+#define GIMP_VIEW_RENDERER_BRUSH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_BRUSH, GimpViewRendererBrush))
+#define GIMP_VIEW_RENDERER_BRUSH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_BRUSH, GimpViewRendererBrushClass))
+#define GIMP_IS_VIEW_RENDERER_BRUSH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_BRUSH))
+#define GIMP_IS_VIEW_RENDERER_BRUSH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_BRUSH))
+#define GIMP_VIEW_RENDERER_BRUSH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_BRUSH, GimpViewRendererBrushClass))
+
+
+typedef struct _GimpViewRendererBrushClass  GimpViewRendererBrushClass;
+
+struct _GimpViewRendererBrush
+{
+  GimpViewRenderer parent_instance;
+
+  guint            pipe_timeout_id;
+  gint             pipe_animation_index;
+
+  /* for the pipe render animation timeout */
+  GtkWidget       *widget;
+};
+
+struct _GimpViewRendererBrushClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_brush_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_BRUSH_H__ */
diff --git a/app/widgets/gimpviewrendererbuffer.c b/app/widgets/gimpviewrendererbuffer.c
new file mode 100644
index 0000000..7f9d01e
--- /dev/null
+++ b/app/widgets/gimpviewrendererbuffer.c
@@ -0,0 +1,117 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererbuffer.c
+ * Copyright (C) 2004-2006 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimptempbuf.h"
+#include "core/gimpviewable.h"
+
+#include "gimpviewrendererbuffer.h"
+
+
+static void   gimp_view_renderer_buffer_render (GimpViewRenderer *renderer,
+                                                GtkWidget        *widget);
+
+
+G_DEFINE_TYPE (GimpViewRendererBuffer, gimp_view_renderer_buffer,
+               GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_buffer_class_init
+
+
+static void
+gimp_view_renderer_buffer_class_init (GimpViewRendererBufferClass *klass)
+{
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  renderer_class->render = gimp_view_renderer_buffer_render;
+}
+
+static void
+gimp_view_renderer_buffer_init (GimpViewRendererBuffer *renderer)
+{
+}
+
+static void
+gimp_view_renderer_buffer_render (GimpViewRenderer *renderer,
+                                  GtkWidget        *widget)
+{
+  gint         buffer_width;
+  gint         buffer_height;
+  gint         view_width;
+  gint         view_height;
+  gboolean     scaling_up;
+  GimpTempBuf *render_buf = NULL;
+
+  gimp_viewable_get_size (renderer->viewable, &buffer_width, &buffer_height);
+
+  gimp_viewable_calc_preview_size (buffer_width,
+                                   buffer_height,
+                                   renderer->width,
+                                   renderer->height,
+                                   TRUE, 1.0, 1.0,
+                                   &view_width,
+                                   &view_height,
+                                   &scaling_up);
+
+  if (scaling_up)
+    {
+      GimpTempBuf *temp_buf;
+
+      temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
+                                                renderer->context,
+                                                buffer_width, buffer_height);
+
+      if (temp_buf)
+        {
+          render_buf = gimp_temp_buf_scale (temp_buf, view_width, view_height);
+
+          gimp_temp_buf_unref (temp_buf);
+        }
+    }
+  else
+    {
+      render_buf = gimp_viewable_get_new_preview (renderer->viewable,
+                                                  renderer->context,
+                                                  view_width, view_height);
+    }
+
+  if (render_buf)
+    {
+      gimp_view_renderer_render_temp_buf_simple (renderer, widget, render_buf);
+
+      gimp_temp_buf_unref (render_buf);
+    }
+  else /* no preview available */
+    {
+      const gchar *icon_name;
+
+      icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+
+      gimp_view_renderer_render_icon (renderer, widget, icon_name);
+    }
+}
diff --git a/app/widgets/gimpviewrendererbuffer.h b/app/widgets/gimpviewrendererbuffer.h
new file mode 100644
index 0000000..df74896
--- /dev/null
+++ b/app/widgets/gimpviewrendererbuffer.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererbuffer.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_BUFFER_H__
+#define __GIMP_VIEW_RENDERER_BUFFER_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_BUFFER            (gimp_view_renderer_buffer_get_type ())
+#define GIMP_VIEW_RENDERER_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_BUFFER, GimpViewRendererBuffer))
+#define GIMP_VIEW_RENDERER_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_BUFFER, GimpViewRendererBufferClass))
+#define GIMP_IS_VIEW_RENDERER_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_BUFFER))
+#define GIMP_IS_VIEW_RENDERER_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_BUFFER))
+#define GIMP_VIEW_RENDERER_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_BUFFER, GimpViewRendererBufferClass))
+
+
+typedef struct _GimpViewRendererBufferClass  GimpViewRendererBufferClass;
+
+struct _GimpViewRendererBuffer
+{
+  GimpViewRenderer  parent_instance;
+};
+
+struct _GimpViewRendererBufferClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_buffer_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_BUFFER_H__ */
diff --git a/app/widgets/gimpviewrendererdrawable.c b/app/widgets/gimpviewrendererdrawable.c
new file mode 100644
index 0000000..2045c9b
--- /dev/null
+++ b/app/widgets/gimpviewrendererdrawable.c
@@ -0,0 +1,366 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererdrawable.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpasync.h"
+#include "core/gimpcancelable.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-preview.h"
+#include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpviewrendererdrawable.h"
+
+
+struct _GimpViewRendererDrawablePrivate
+{
+  GimpAsync *render_async;
+  GtkWidget *render_widget;
+  gint       render_buf_x;
+  gint       render_buf_y;
+  gboolean   render_update;
+
+  gint       prev_width;
+  gint       prev_height;
+};
+
+
+/*  local function prototypes  */
+
+static void   gimp_view_renderer_drawable_dispose       (GObject                  *object);
+
+static void   gimp_view_renderer_drawable_invalidate    (GimpViewRenderer         *renderer);
+static void   gimp_view_renderer_drawable_render        (GimpViewRenderer         *renderer,
+                                                         GtkWidget                *widget);
+
+static void   gimp_view_renderer_drawable_cancel_render (GimpViewRendererDrawable *renderdrawable);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpViewRendererDrawable,
+                            gimp_view_renderer_drawable,
+                            GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_drawable_parent_class
+
+
+/*  private functions  */
+
+
+static void
+gimp_view_renderer_drawable_class_init (GimpViewRendererDrawableClass *klass)
+{
+  GObjectClass          *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  object_class->dispose      = gimp_view_renderer_drawable_dispose;
+
+  renderer_class->invalidate = gimp_view_renderer_drawable_invalidate;
+  renderer_class->render     = gimp_view_renderer_drawable_render;
+}
+
+static void
+gimp_view_renderer_drawable_init (GimpViewRendererDrawable *renderdrawable)
+{
+  renderdrawable->priv =
+    gimp_view_renderer_drawable_get_instance_private (renderdrawable);
+}
+
+static void
+gimp_view_renderer_drawable_dispose (GObject *object)
+{
+  GimpViewRendererDrawable *renderdrawable = GIMP_VIEW_RENDERER_DRAWABLE (object);
+
+  gimp_view_renderer_drawable_cancel_render (renderdrawable);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_view_renderer_drawable_invalidate (GimpViewRenderer *renderer)
+{
+  GimpViewRendererDrawable *renderdrawable = GIMP_VIEW_RENDERER_DRAWABLE (renderer);
+
+  gimp_view_renderer_drawable_cancel_render (renderdrawable);
+
+  GIMP_VIEW_RENDERER_CLASS (parent_class)->invalidate (renderer);
+}
+
+static void
+gimp_view_renderer_drawable_render_async_callback (GimpAsync                *async,
+                                                   GimpViewRendererDrawable *renderdrawable)
+{
+  GtkWidget *widget;
+
+  /* rendering was canceled, and the view renderer is potentially dead (see
+   * gimp_view_renderer_drawable_cancel_render()).  bail.
+   */
+  if (gimp_async_is_canceled (async))
+    return;
+
+  widget = renderdrawable->priv->render_widget;
+
+  renderdrawable->priv->render_async  = NULL;
+  renderdrawable->priv->render_widget = NULL;
+
+  if (gimp_async_is_finished (async))
+    {
+      GimpViewRenderer *renderer   = GIMP_VIEW_RENDERER (renderdrawable);
+      GimpTempBuf      *render_buf = gimp_async_get_result (async);
+
+      gimp_view_renderer_render_temp_buf (
+        renderer,
+        widget,
+        render_buf,
+        renderdrawable->priv->render_buf_x,
+        renderdrawable->priv->render_buf_y,
+        -1,
+        GIMP_VIEW_BG_CHECKS,
+        GIMP_VIEW_BG_CHECKS);
+
+      if (renderdrawable->priv->render_update)
+        gimp_view_renderer_update (renderer);
+    }
+
+  g_object_unref (widget);
+}
+
+static void
+gimp_view_renderer_drawable_render (GimpViewRenderer *renderer,
+                                    GtkWidget        *widget)
+{
+  GimpViewRendererDrawable *renderdrawable = GIMP_VIEW_RENDERER_DRAWABLE (renderer);
+  GimpDrawable             *drawable;
+  GimpItem                 *item;
+  GimpImage                *image;
+  const gchar              *icon_name;
+  GimpAsync                *async;
+  gint                      image_width;
+  gint                      image_height;
+  gint                      view_width;
+  gint                      view_height;
+  gint                      src_x;
+  gint                      src_y;
+  gint                      src_width;
+  gint                      src_height;
+  gint                      dst_x;
+  gint                      dst_y;
+  gint                      dst_width;
+  gint                      dst_height;
+  gdouble                   xres  = 1.0;
+  gdouble                   yres  = 1.0;
+  gboolean                  empty = FALSE;
+
+  /* render is already in progress */
+  if (renderdrawable->priv->render_async)
+    return;
+
+  drawable  = GIMP_DRAWABLE (renderer->viewable);
+  item      = GIMP_ITEM (drawable);
+  image     = gimp_item_get_image (item);
+  icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+
+  if (image && ! image->gimp->config->layer_previews)
+    {
+      renderdrawable->priv->prev_width  = 0;
+      renderdrawable->priv->prev_height = 0;
+
+      gimp_view_renderer_render_icon (renderer, widget, icon_name);
+
+      return;
+    }
+
+  if (image)
+    gimp_image_get_resolution (image, &xres, &yres);
+
+  if (renderer->is_popup)
+    image = NULL;
+
+  if (image)
+    {
+      image_width  = gimp_image_get_width  (image);
+      image_height = gimp_image_get_height (image);
+    }
+  else
+    {
+      image_width  = gimp_item_get_width  (item);
+      image_height = gimp_item_get_height (item);
+    }
+
+  gimp_viewable_calc_preview_size (image_width,
+                                   image_height,
+                                   renderer->width,
+                                   renderer->height,
+                                   renderer->dot_for_dot,
+                                   xres,
+                                   yres,
+                                   &view_width,
+                                   &view_height,
+                                   NULL);
+
+  src_x      = 0;
+  src_y      = 0;
+  src_width  = gimp_item_get_width  (item);
+  src_height = gimp_item_get_height (item);
+
+  if (image)
+    {
+      gint offset_x;
+      gint offset_y;
+
+      gimp_item_get_offset (item, &offset_x, &offset_y);
+
+      if (gimp_rectangle_intersect (src_x, src_y,
+                                    src_width, src_height,
+                                    -offset_x, -offset_y,
+                                    image_width, image_height,
+                                    &src_x, &src_y,
+                                    &src_width, &src_height))
+        {
+          offset_x += src_x;
+          offset_y += src_y;
+
+          dst_x      = ROUND (((gdouble) view_width  / image_width)  *
+                              offset_x);
+          dst_y      = ROUND (((gdouble) view_height / image_height) *
+                              offset_y);
+          dst_width  = ROUND (((gdouble) view_width  / image_width)  *
+                              src_width);
+          dst_height = ROUND (((gdouble) view_height / image_height) *
+                              src_height);
+        }
+      else
+        {
+          dst_x      = 0;
+          dst_y      = 0;
+          dst_width  = 1;
+          dst_height = 1;
+
+          empty = TRUE;
+        }
+    }
+  else
+    {
+      dst_x      = (renderer->width  - view_width)  / 2;
+      dst_y      = (renderer->height - view_height) / 2;
+      dst_width  = view_width;
+      dst_height = view_height;
+    }
+
+  dst_width  = MAX (dst_width,  1);
+  dst_height = MAX (dst_height, 1);
+
+  if (! empty)
+    {
+      async = gimp_drawable_get_sub_preview_async (drawable,
+                                                   src_x, src_y,
+                                                   src_width, src_height,
+                                                   dst_width, dst_height);
+    }
+  else
+    {
+      const Babl  *format = gimp_drawable_get_preview_format (drawable);
+      GimpTempBuf *render_buf;
+
+      async = gimp_async_new ();
+
+      render_buf = gimp_temp_buf_new (dst_width, dst_height, format);
+      gimp_temp_buf_data_clear (render_buf);
+
+      gimp_async_finish_full (async,
+                              render_buf,
+                              (GDestroyNotify) gimp_temp_buf_unref);
+    }
+
+  if (async)
+    {
+      renderdrawable->priv->render_async  = async;
+      renderdrawable->priv->render_widget = g_object_ref (widget);
+      renderdrawable->priv->render_buf_x  = dst_x;
+      renderdrawable->priv->render_buf_y  = dst_y;
+      renderdrawable->priv->render_update = FALSE;
+
+      gimp_async_add_callback_for_object (
+        async,
+        (GimpAsyncCallback) gimp_view_renderer_drawable_render_async_callback,
+        renderdrawable,
+        renderdrawable);
+
+      /* if rendering isn't done yet, update the render-view once it is, and
+       * either keep the old drawable preview for now, or, if size changed (or
+       * there's no old preview,) render an icon in the meantime.
+       */
+      if (renderdrawable->priv->render_async)
+        {
+          renderdrawable->priv->render_update = TRUE;
+
+          if (renderer->width  != renderdrawable->priv->prev_width ||
+              renderer->height != renderdrawable->priv->prev_height)
+            {
+              gimp_view_renderer_render_icon (renderer, widget, icon_name);
+            }
+        }
+
+      renderdrawable->priv->prev_width  = renderer->width;
+      renderdrawable->priv->prev_height = renderer->height;
+
+      g_object_unref (async);
+    }
+  else
+    {
+      renderdrawable->priv->prev_width  = 0;
+      renderdrawable->priv->prev_height = 0;
+
+      gimp_view_renderer_render_icon (renderer, widget, icon_name);
+    }
+}
+
+static void
+gimp_view_renderer_drawable_cancel_render (GimpViewRendererDrawable *renderdrawable)
+{
+  /* cancel the async render operation (if one is ongoing) without actually
+   * waiting for it.  if the actual rendering hasn't started yet, it will be
+   * immediately aborted; otherwise, it can't really be interrupted, so we just
+   * let it go on without blocking the main thread.
+   * gimp_drawable_get_sub_preview_async() can continue rendering safely even
+   * after the drawable had died, and our completion callback is prepared to
+   * handle cancellation.
+   */
+  if (renderdrawable->priv->render_async)
+    {
+      gimp_cancelable_cancel (
+        GIMP_CANCELABLE (renderdrawable->priv->render_async));
+
+      renderdrawable->priv->render_async = NULL;
+    }
+
+  g_clear_object (&renderdrawable->priv->render_widget);
+}
diff --git a/app/widgets/gimpviewrendererdrawable.h b/app/widgets/gimpviewrendererdrawable.h
new file mode 100644
index 0000000..a063458
--- /dev/null
+++ b/app/widgets/gimpviewrendererdrawable.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererdrawable.h
+ * Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_DRAWABLE_H__
+#define __GIMP_VIEW_RENDERER_DRAWABLE_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_DRAWABLE            (gimp_view_renderer_drawable_get_type ())
+#define GIMP_VIEW_RENDERER_DRAWABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_DRAWABLE, GimpViewRendererDrawable))
+#define GIMP_VIEW_RENDERER_DRAWABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_DRAWABLE, GimpViewRendererDrawableClass))
+#define GIMP_IS_VIEW_RENDERER_DRAWABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_DRAWABLE))
+#define GIMP_IS_VIEW_RENDERER_DRAWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_DRAWABLE))
+#define GIMP_VIEW_RENDERER_DRAWABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_DRAWABLE, GimpViewRendererDrawableClass))
+
+
+typedef struct _GimpViewRendererDrawablePrivate GimpViewRendererDrawablePrivate;
+typedef struct _GimpViewRendererDrawableClass   GimpViewRendererDrawableClass;
+
+struct _GimpViewRendererDrawable
+{
+  GimpViewRenderer                 parent_instance;
+
+  GimpViewRendererDrawablePrivate *priv;
+};
+
+struct _GimpViewRendererDrawableClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_drawable_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_DRAWABLE_H__ */
diff --git a/app/widgets/gimpviewrenderergradient.c b/app/widgets/gimpviewrenderergradient.c
new file mode 100644
index 0000000..a2820fc
--- /dev/null
+++ b/app/widgets/gimpviewrenderergradient.c
@@ -0,0 +1,265 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderergradient.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpgradient.h"
+
+#include "gimpviewrenderergradient.h"
+
+
+static void   gimp_view_renderer_gradient_set_context (GimpViewRenderer *renderer,
+                                                       GimpContext      *context);
+static void   gimp_view_renderer_gradient_invalidate  (GimpViewRenderer *renderer);
+static void   gimp_view_renderer_gradient_render      (GimpViewRenderer *renderer,
+                                                       GtkWidget        *widget);
+
+
+G_DEFINE_TYPE (GimpViewRendererGradient, gimp_view_renderer_gradient,
+               GIMP_TYPE_VIEW_RENDERER);
+
+#define parent_class gimp_view_renderer_gradient_parent_class
+
+
+static void
+gimp_view_renderer_gradient_class_init (GimpViewRendererGradientClass *klass)
+{
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  renderer_class->set_context = gimp_view_renderer_gradient_set_context;
+  renderer_class->invalidate  = gimp_view_renderer_gradient_invalidate;
+  renderer_class->render      = gimp_view_renderer_gradient_render;
+}
+
+static void
+gimp_view_renderer_gradient_init (GimpViewRendererGradient *renderer)
+{
+  renderer->left  = 0.0;
+  renderer->right = 1.0;
+}
+
+static void
+gimp_view_renderer_gradient_fg_bg_changed (GimpContext      *context,
+                                           const GimpRGB    *color,
+                                           GimpViewRenderer *renderer)
+{
+#if 0
+  g_printerr ("%s: invalidating %s\n", G_STRFUNC,
+              gimp_object_get_name (renderer->viewable));
+#endif
+
+  gimp_view_renderer_invalidate (renderer);
+}
+
+static void
+gimp_view_renderer_gradient_set_context (GimpViewRenderer *renderer,
+                                         GimpContext      *context)
+{
+  GimpViewRendererGradient *rendergrad;
+
+  rendergrad = GIMP_VIEW_RENDERER_GRADIENT (renderer);
+
+  if (renderer->context && rendergrad->has_fg_bg_segments)
+    {
+      g_signal_handlers_disconnect_by_func (renderer->context,
+                                            gimp_view_renderer_gradient_fg_bg_changed,
+                                            renderer);
+    }
+
+  GIMP_VIEW_RENDERER_CLASS (parent_class)->set_context (renderer, context);
+
+  if (renderer->context && rendergrad->has_fg_bg_segments)
+    {
+      g_signal_connect (renderer->context, "foreground-changed",
+                        G_CALLBACK (gimp_view_renderer_gradient_fg_bg_changed),
+                        renderer);
+      g_signal_connect (renderer->context, "background-changed",
+                        G_CALLBACK (gimp_view_renderer_gradient_fg_bg_changed),
+                        renderer);
+
+      gimp_view_renderer_gradient_fg_bg_changed (renderer->context,
+                                                 NULL,
+                                                 renderer);
+    }
+}
+
+static void
+gimp_view_renderer_gradient_invalidate (GimpViewRenderer *renderer)
+{
+  GimpViewRendererGradient *rendergrad;
+  gboolean                  has_fg_bg_segments = FALSE;
+
+  rendergrad = GIMP_VIEW_RENDERER_GRADIENT (renderer);
+
+  if (renderer->viewable)
+    has_fg_bg_segments =
+      gimp_gradient_has_fg_bg_segments (GIMP_GRADIENT (renderer->viewable));
+
+  if (rendergrad->has_fg_bg_segments != has_fg_bg_segments)
+    {
+      if (renderer->context)
+        {
+          if (rendergrad->has_fg_bg_segments)
+            {
+              g_signal_handlers_disconnect_by_func (renderer->context,
+                                                    gimp_view_renderer_gradient_fg_bg_changed,
+                                                    renderer);
+            }
+          else
+            {
+              g_signal_connect (renderer->context, "foreground-changed",
+                                G_CALLBACK (gimp_view_renderer_gradient_fg_bg_changed),
+                                renderer);
+              g_signal_connect (renderer->context, "background-changed",
+                                G_CALLBACK (gimp_view_renderer_gradient_fg_bg_changed),
+                                renderer);
+            }
+        }
+
+      rendergrad->has_fg_bg_segments = has_fg_bg_segments;
+    }
+
+  GIMP_VIEW_RENDERER_CLASS (parent_class)->invalidate (renderer);
+}
+
+static void
+gimp_view_renderer_gradient_render (GimpViewRenderer *renderer,
+                                    GtkWidget        *widget)
+{
+  GimpViewRendererGradient *rendergrad = GIMP_VIEW_RENDERER_GRADIENT (renderer);
+  GimpGradient             *gradient   = GIMP_GRADIENT (renderer->viewable);
+  GimpGradientSegment      *seg        = NULL;
+  GimpColorTransform       *transform;
+  guchar                   *buf;
+  guchar                   *dest;
+  gint                      dest_stride;
+  gint                      x;
+  gint                      y;
+  gdouble                   dx, cur_x;
+  GimpRGB                   color;
+
+  buf   = g_alloca (4 * renderer->width);
+  dx    = (rendergrad->right - rendergrad->left) / (renderer->width - 1);
+  cur_x = rendergrad->left;
+
+  for (x = 0, dest = buf; x < renderer->width; x++, dest += 4)
+    {
+      guchar r, g, b, a;
+
+      seg = gimp_gradient_get_color_at (gradient, renderer->context, seg,
+                                        cur_x,
+                                        rendergrad->reverse,
+                                        rendergrad->blend_color_space,
+                                        &color);
+      cur_x += dx;
+
+      gimp_rgba_get_uchar (&color, &r, &g, &b, &a);
+
+      GIMP_CAIRO_ARGB32_SET_PIXEL (dest, r, g, b, a);
+    }
+
+  if (! renderer->surface)
+    renderer->surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                                    renderer->width,
+                                                    renderer->height);
+
+  cairo_surface_flush (renderer->surface);
+
+  dest        = cairo_image_surface_get_data (renderer->surface);
+  dest_stride = cairo_image_surface_get_stride (renderer->surface);
+
+  transform = gimp_view_renderer_get_color_transform (renderer, widget,
+                                                      babl_format ("cairo-ARGB32"),
+                                                      babl_format ("cairo-ARGB32"));
+
+  if (transform)
+    gimp_color_transform_process_pixels (transform,
+                                         babl_format ("cairo-ARGB32"), buf,
+                                         babl_format ("cairo-ARGB32"), buf,
+                                         renderer->width);
+
+  for (y = 0; y < renderer->height; y++, dest += dest_stride)
+    {
+      memcpy (dest, buf, renderer->width * 4);
+    }
+
+  cairo_surface_mark_dirty (renderer->surface);
+}
+
+void
+gimp_view_renderer_gradient_set_offsets (GimpViewRendererGradient *renderer,
+                                         gdouble                   left,
+                                         gdouble                   right)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER_GRADIENT (renderer));
+
+  left  = CLAMP (left, 0.0, 1.0);
+  right = CLAMP (right, left, 1.0);
+
+  if (left != renderer->left || right != renderer->right)
+    {
+      renderer->left  = left;
+      renderer->right = right;
+
+      gimp_view_renderer_invalidate (GIMP_VIEW_RENDERER (renderer));
+    }
+}
+
+void
+gimp_view_renderer_gradient_set_reverse (GimpViewRendererGradient *renderer,
+                                         gboolean                  reverse)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER_GRADIENT (renderer));
+
+  if (reverse != renderer->reverse)
+    {
+      renderer->reverse = reverse ? TRUE : FALSE;
+
+      gimp_view_renderer_invalidate (GIMP_VIEW_RENDERER (renderer));
+      gimp_view_renderer_update (GIMP_VIEW_RENDERER (renderer));
+    }
+}
+
+void
+gimp_view_renderer_gradient_set_blend_color_space (GimpViewRendererGradient    *renderer,
+                                                   GimpGradientBlendColorSpace  blend_color_space)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER_GRADIENT (renderer));
+
+  if (blend_color_space != renderer->blend_color_space)
+    {
+      renderer->blend_color_space = blend_color_space;
+
+      gimp_view_renderer_invalidate (GIMP_VIEW_RENDERER (renderer));
+      gimp_view_renderer_update (GIMP_VIEW_RENDERER (renderer));
+    }
+}
diff --git a/app/widgets/gimpviewrenderergradient.h b/app/widgets/gimpviewrenderergradient.h
new file mode 100644
index 0000000..ce8816f
--- /dev/null
+++ b/app/widgets/gimpviewrenderergradient.h
@@ -0,0 +1,65 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderergradient.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_GRADIENT_H__
+#define __GIMP_VIEW_RENDERER_GRADIENT_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_GRADIENT            (gimp_view_renderer_gradient_get_type ())
+#define GIMP_VIEW_RENDERER_GRADIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_GRADIENT, GimpViewRendererGradient))
+#define GIMP_VIEW_RENDERER_GRADIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_GRADIENT, GimpViewRendererGradientClass))
+#define GIMP_IS_VIEW_RENDERER_GRADIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_GRADIENT))
+#define GIMP_IS_VIEW_RENDERER_GRADIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_GRADIENT))
+#define GIMP_VIEW_RENDERER_GRADIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_GRADIENT, GimpViewRendererGradientClass))
+
+
+typedef struct _GimpViewRendererGradientClass  GimpViewRendererGradientClass;
+
+struct _GimpViewRendererGradient
+{
+  GimpViewRenderer            parent_instance;
+
+  gdouble                     left;
+  gdouble                     right;
+  gboolean                    reverse;
+  GimpGradientBlendColorSpace blend_color_space;
+  gboolean                    has_fg_bg_segments;
+};
+
+struct _GimpViewRendererGradientClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_gradient_get_type    (void) G_GNUC_CONST;
+
+void    gimp_view_renderer_gradient_set_offsets (GimpViewRendererGradient    *renderer,
+                                                 gdouble                      left,
+                                                 gdouble                      right);
+void    gimp_view_renderer_gradient_set_reverse (GimpViewRendererGradient    *renderer,
+                                                 gboolean                     reverse);
+void    gimp_view_renderer_gradient_set_blend_color_space
+                                                (GimpViewRendererGradient    *renderer,
+                                                 GimpGradientBlendColorSpace  blend_color_space);
+
+
+#endif /* __GIMP_VIEW_RENDERER_GRADIENT_H__ */
diff --git a/app/widgets/gimpviewrendererimage.c b/app/widgets/gimpviewrendererimage.c
new file mode 100644
index 0000000..fe4930a
--- /dev/null
+++ b/app/widgets/gimpviewrendererimage.c
@@ -0,0 +1,191 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererimage.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpimageproxy.h"
+#include "core/gimptempbuf.h"
+
+#include "gimpviewrendererimage.h"
+
+
+static void   gimp_view_renderer_image_render (GimpViewRenderer *renderer,
+                                               GtkWidget        *widget);
+
+
+G_DEFINE_TYPE (GimpViewRendererImage, gimp_view_renderer_image,
+               GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_image_parent_class
+
+
+static void
+gimp_view_renderer_image_class_init (GimpViewRendererImageClass *klass)
+{
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  renderer_class->render = gimp_view_renderer_image_render;
+}
+
+static void
+gimp_view_renderer_image_init (GimpViewRendererImage *renderer)
+{
+  renderer->channel = -1;
+}
+
+static void
+gimp_view_renderer_image_render (GimpViewRenderer *renderer,
+                                 GtkWidget        *widget)
+{
+  GimpViewRendererImage *rendererimage = GIMP_VIEW_RENDERER_IMAGE (renderer);
+  GimpImage             *image;
+  const gchar           *icon_name;
+  gint                   width;
+  gint                   height;
+
+  if (GIMP_IS_IMAGE (renderer->viewable))
+    {
+      image = GIMP_IMAGE (renderer->viewable);
+    }
+  else if (GIMP_IS_IMAGE_PROXY (renderer->viewable))
+    {
+      image = gimp_image_proxy_get_image (
+        GIMP_IMAGE_PROXY (renderer->viewable));
+    }
+  else
+    {
+      g_return_if_reached ();
+    }
+
+  gimp_viewable_get_size (renderer->viewable, &width, &height);
+
+  /* The conditions checked here are mostly a hack to hide the fact that
+   * we are creating the channel preview from the image preview and turning
+   * off visibility of a channel has the side-effect of painting the channel
+   * preview all black. See bug #459518 for details.
+   */
+  if (rendererimage->channel == -1 ||
+      (gimp_image_get_component_visible (image, rendererimage->channel)))
+    {
+      gint         view_width;
+      gint         view_height;
+      gdouble      xres;
+      gdouble      yres;
+      gboolean     scaling_up;
+      GimpTempBuf *render_buf = NULL;
+
+      gimp_image_get_resolution (image, &xres, &yres);
+
+      gimp_viewable_calc_preview_size (width,
+                                       height,
+                                       renderer->width,
+                                       renderer->height,
+                                       renderer->dot_for_dot,
+                                       xres,
+                                       yres,
+                                       &view_width,
+                                       &view_height,
+                                       &scaling_up);
+
+      if (scaling_up)
+        {
+          GimpTempBuf *temp_buf;
+
+          temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
+                                                    renderer->context,
+                                                    width, height);
+
+          if (temp_buf)
+            {
+              render_buf = gimp_temp_buf_scale (temp_buf,
+                                                view_width, view_height);
+              gimp_temp_buf_unref (temp_buf);
+            }
+        }
+      else
+        {
+          render_buf = gimp_viewable_get_new_preview (renderer->viewable,
+                                                      renderer->context,
+                                                      view_width,
+                                                      view_height);
+        }
+
+      if (render_buf)
+        {
+          gint render_buf_x    = 0;
+          gint render_buf_y    = 0;
+          gint component_index = -1;
+
+          /*  xresolution != yresolution */
+          if (view_width > renderer->width || view_height > renderer->height)
+            {
+              GimpTempBuf *temp_buf;
+
+              temp_buf = gimp_temp_buf_scale (render_buf,
+                                              renderer->width, renderer->height);
+              gimp_temp_buf_unref (render_buf);
+              render_buf = temp_buf;
+            }
+
+          if (view_width  < renderer->width)
+            render_buf_x = (renderer->width  - view_width)  / 2;
+
+          if (view_height < renderer->height)
+            render_buf_y = (renderer->height - view_height) / 2;
+
+          if (rendererimage->channel != -1)
+            component_index =
+              gimp_image_get_component_index (image, rendererimage->channel);
+
+          gimp_view_renderer_render_temp_buf (renderer, widget, render_buf,
+                                              render_buf_x, render_buf_y,
+                                              component_index,
+                                              GIMP_VIEW_BG_CHECKS,
+                                              GIMP_VIEW_BG_WHITE);
+          gimp_temp_buf_unref (render_buf);
+
+          return;
+        }
+    }
+
+  switch (rendererimage->channel)
+    {
+    case GIMP_CHANNEL_RED:     icon_name = GIMP_ICON_CHANNEL_RED;     break;
+    case GIMP_CHANNEL_GREEN:   icon_name = GIMP_ICON_CHANNEL_GREEN;   break;
+    case GIMP_CHANNEL_BLUE:    icon_name = GIMP_ICON_CHANNEL_BLUE;    break;
+    case GIMP_CHANNEL_GRAY:    icon_name = GIMP_ICON_CHANNEL_GRAY;    break;
+    case GIMP_CHANNEL_INDEXED: icon_name = GIMP_ICON_CHANNEL_INDEXED; break;
+    case GIMP_CHANNEL_ALPHA:   icon_name = GIMP_ICON_CHANNEL_ALPHA;   break;
+
+    default:
+      icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+      break;
+    }
+
+  gimp_view_renderer_render_icon (renderer, widget, icon_name);
+}
diff --git a/app/widgets/gimpviewrendererimage.h b/app/widgets/gimpviewrendererimage.h
new file mode 100644
index 0000000..e73bc47
--- /dev/null
+++ b/app/widgets/gimpviewrendererimage.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererimage.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_IMAGE_H__
+#define __GIMP_VIEW_RENDERER_IMAGE_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_IMAGE            (gimp_view_renderer_image_get_type ())
+#define GIMP_VIEW_RENDERER_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_IMAGE, GimpViewRendererImage))
+#define GIMP_VIEW_RENDERER_IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_IMAGE, GimpViewRendererImageClass))
+#define GIMP_IS_VIEW_RENDERER_IMAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_IMAGE))
+#define GIMP_IS_VIEW_RENDERER_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_IMAGE))
+#define GIMP_VIEW_RENDERER_IMAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_IMAGE, GimpViewRendererImageClass))
+
+
+typedef struct _GimpViewRendererImageClass  GimpViewRendererImageClass;
+
+struct _GimpViewRendererImage
+{
+  GimpViewRenderer parent_instance;
+
+  GimpChannelType     channel;
+};
+
+struct _GimpViewRendererImageClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_image_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_IMAGE_H__ */
diff --git a/app/widgets/gimpviewrendererimagefile.c b/app/widgets/gimpviewrendererimagefile.c
new file mode 100644
index 0000000..e1652f0
--- /dev/null
+++ b/app/widgets/gimpviewrendererimagefile.c
@@ -0,0 +1,201 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererimagefile.c
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpthumb/gimpthumb.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpimagefile.h"
+
+#include "gimpviewrendererimagefile.h"
+#include "gimpviewrenderer-frame.h"
+#include "gimpwidgets-utils.h"
+
+
+static void        gimp_view_renderer_imagefile_render   (GimpViewRenderer *renderer,
+                                                          GtkWidget        *widget);
+
+static GdkPixbuf * gimp_view_renderer_imagefile_get_icon (GimpImagefile    *imagefile,
+                                                          GtkWidget        *widget,
+                                                          gint              size);
+
+
+G_DEFINE_TYPE (GimpViewRendererImagefile, gimp_view_renderer_imagefile,
+               GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_imagefile_parent_class
+
+
+static void
+gimp_view_renderer_imagefile_class_init (GimpViewRendererImagefileClass *klass)
+{
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  renderer_class->render = gimp_view_renderer_imagefile_render;
+}
+
+static void
+gimp_view_renderer_imagefile_init (GimpViewRendererImagefile *renderer)
+{
+}
+
+static void
+gimp_view_renderer_imagefile_render (GimpViewRenderer *renderer,
+                                     GtkWidget        *widget)
+{
+  GdkPixbuf *pixbuf = gimp_view_renderer_get_frame_pixbuf (renderer, widget,
+                                                           renderer->width,
+                                                           renderer->height);
+
+  if (! pixbuf)
+    {
+      GimpImagefile *imagefile = GIMP_IMAGEFILE (renderer->viewable);
+
+      pixbuf = gimp_view_renderer_imagefile_get_icon (imagefile,
+                                                      widget,
+                                                      MIN (renderer->width,
+                                                           renderer->height));
+    }
+
+  if (pixbuf)
+    {
+      gimp_view_renderer_render_pixbuf (renderer, widget, pixbuf);
+      g_object_unref (pixbuf);
+    }
+  else
+    {
+      const gchar *icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+
+      gimp_view_renderer_render_icon (renderer, widget, icon_name);
+    }
+}
+
+
+/* The code to get an icon for a mime-type is lifted from GtkRecentManager. */
+
+static GdkPixbuf *
+get_icon_for_mime_type (const gchar *mime_type,
+                        gint         pixel_size)
+{
+  GtkIconTheme *icon_theme;
+  const gchar  *separator;
+  GString      *icon_name;
+  GdkPixbuf    *pixbuf;
+
+  separator = strchr (mime_type, '/');
+  if (! separator)
+    return NULL;
+
+  icon_theme = gtk_icon_theme_get_default ();
+
+  /* try with the three icon name variants for MIME types */
+
+  /* canonicalize MIME type: foo/x-bar -> foo-x-bar */
+  icon_name = g_string_new (NULL);
+  g_string_append_len (icon_name, mime_type, separator - mime_type);
+  g_string_append_c (icon_name, '-');
+  g_string_append (icon_name, separator + 1);
+  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name->str,
+                                     pixel_size, 0, NULL);
+  g_string_free (icon_name, TRUE);
+  if (pixbuf)
+    return pixbuf;
+
+  /* canonicalize MIME type, and prepend "gnome-mime-" */
+  icon_name = g_string_new ("gnome-mime-");
+  g_string_append_len (icon_name, mime_type, separator - mime_type);
+  g_string_append_c (icon_name, '-');
+  g_string_append (icon_name, separator + 1);
+  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name->str,
+                                     pixel_size, 0, NULL);
+  g_string_free (icon_name, TRUE);
+  if (pixbuf)
+    return pixbuf;
+
+  /* try the MIME family icon */
+  icon_name = g_string_new ("gnome-mime-");
+  g_string_append_len (icon_name, mime_type, separator - mime_type);
+  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name->str,
+                                     pixel_size, 0, NULL);
+  g_string_free (icon_name, TRUE);
+
+  return pixbuf;
+}
+
+static GdkPixbuf *
+gimp_view_renderer_imagefile_get_icon (GimpImagefile *imagefile,
+                                       GtkWidget     *widget,
+                                       gint           size)
+{
+  GdkScreen     *screen     = gtk_widget_get_screen (widget);
+  GtkIconTheme  *icon_theme = gtk_icon_theme_get_for_screen (screen);
+  GimpThumbnail *thumbnail  = gimp_imagefile_get_thumbnail (imagefile);
+  GdkPixbuf     *pixbuf     = NULL;
+
+  if (! gimp_object_get_name (imagefile))
+    return NULL;
+
+  if (! pixbuf)
+    {
+      GIcon *icon = gimp_imagefile_get_gicon (imagefile);
+
+      if (icon)
+        {
+          GtkIconInfo *info;
+
+          info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, 0);
+
+          if (info)
+            {
+              pixbuf = gtk_icon_info_load_icon (info, NULL);
+
+              gtk_icon_info_free (info);
+            }
+        }
+    }
+
+  if (! pixbuf && thumbnail->image_mimetype)
+    {
+      pixbuf = get_icon_for_mime_type (thumbnail->image_mimetype, size);
+    }
+
+  if (! pixbuf)
+    {
+      const gchar *icon_name = "text-x-generic";
+
+      if (thumbnail->image_state == GIMP_THUMB_STATE_FOLDER)
+        icon_name = "folder";
+
+      pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                         icon_name, size,
+                                         GTK_ICON_LOOKUP_USE_BUILTIN,
+                                         NULL);
+    }
+
+  return pixbuf;
+}
diff --git a/app/widgets/gimpviewrendererimagefile.h b/app/widgets/gimpviewrendererimagefile.h
new file mode 100644
index 0000000..223afd9
--- /dev/null
+++ b/app/widgets/gimpviewrendererimagefile.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererimagefile.h
+ * Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_IMAGEFILE_H__
+#define __GIMP_VIEW_RENDERER_IMAGEFILE_H__
+
+
+#include "gimpviewrenderer.h"
+
+
+#define GIMP_TYPE_VIEW_RENDERER_IMAGEFILE            (gimp_view_renderer_imagefile_get_type ())
+#define GIMP_VIEW_RENDERER_IMAGEFILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_IMAGEFILE, GimpViewRendererImagefile))
+#define GIMP_VIEW_RENDERER_IMAGEFILE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_IMAGEFILE, GimpViewRendererImagefileClass))
+#define GIMP_IS_VIEW_RENDERER_IMAGEFILE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_IMAGEFILE))
+#define GIMP_IS_VIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_IMAGEFILE))
+#define GIMP_VIEW_RENDERER_IMAGEFILE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_IMAGEFILE, GimpViewRendererImagefileClass))
+
+
+typedef struct _GimpViewRendererImagefileClass  GimpViewRendererImagefileClass;
+
+struct _GimpViewRendererImagefile
+{
+  GimpViewRenderer parent_instance;
+};
+
+struct _GimpViewRendererImagefileClass
+{
+  GimpViewRendererClass parent_class;
+};
+
+
+GType   gimp_view_renderer_imagefile_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_IMAGEFILE_H__ */
diff --git a/app/widgets/gimpviewrendererlayer.c b/app/widgets/gimpviewrendererlayer.c
new file mode 100644
index 0000000..6c4c6cb
--- /dev/null
+++ b/app/widgets/gimpviewrendererlayer.c
@@ -0,0 +1,98 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererlayer.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpimage.h"
+
+#include "text/gimptextlayer.h"
+
+#include "gimpviewrendererlayer.h"
+
+
+static void   gimp_view_renderer_layer_render (GimpViewRenderer *renderer,
+                                               GtkWidget        *widget);
+
+
+G_DEFINE_TYPE (GimpViewRendererLayer, gimp_view_renderer_layer,
+               GIMP_TYPE_VIEW_RENDERER_DRAWABLE)
+
+#define parent_class gimp_view_renderer_layer_parent_class
+
+
+static void
+gimp_view_renderer_layer_class_init (GimpViewRendererLayerClass *klass)
+{
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  renderer_class->render = gimp_view_renderer_layer_render;
+}
+
+static void
+gimp_view_renderer_layer_init (GimpViewRendererLayer *renderer)
+{
+}
+
+static void
+gimp_view_renderer_layer_render (GimpViewRenderer *renderer,
+                                 GtkWidget        *widget)
+{
+  const gchar *icon_name = NULL;
+
+  if (gimp_layer_is_floating_sel (GIMP_LAYER (renderer->viewable)))
+    {
+      icon_name = GIMP_ICON_LAYER_FLOATING_SELECTION;
+    }
+  else if (gimp_item_is_text_layer (GIMP_ITEM (renderer->viewable)))
+    {
+      icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+    }
+  else
+    {
+      GimpContainer *children = gimp_viewable_get_children (renderer->viewable);
+
+      if (children)
+        {
+          GimpItem  *item  = GIMP_ITEM (renderer->viewable);
+          GimpImage *image = gimp_item_get_image (item);
+
+          if (gimp_container_get_n_children (children) == 0)
+            icon_name = "folder";
+          else if (image && ! image->gimp->config->group_layer_previews)
+            icon_name = gimp_viewable_get_icon_name (renderer->viewable);
+        }
+    }
+
+  if (icon_name)
+    gimp_view_renderer_render_icon (renderer, widget, icon_name);
+  else
+    GIMP_VIEW_RENDERER_CLASS (parent_class)->render (renderer, widget);
+}
diff --git a/app/widgets/gimpviewrendererlayer.h b/app/widgets/gimpviewrendererlayer.h
new file mode 100644
index 0000000..e770ec2
--- /dev/null
+++ b/app/widgets/gimpviewrendererlayer.h
@@ -0,0 +1,50 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererlayer.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_LAYER_H__
+#define __GIMP_VIEW_RENDERER_LAYER_H__
+
+#include "gimpviewrendererdrawable.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_LAYER            (gimp_view_renderer_layer_get_type ())
+#define GIMP_VIEW_RENDERER_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_LAYER, GimpViewRendererLayer))
+#define GIMP_VIEW_RENDERER_LAYER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_LAYER, GimpViewRendererLayerClass))
+#define GIMP_IS_VIEW_RENDERER_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_LAYER))
+#define GIMP_IS_VIEW_RENDERER_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_LAYER))
+#define GIMP_VIEW_RENDERER_LAYER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_LAYER, GimpViewRendererLayerClass))
+
+
+typedef struct _GimpViewRendererLayerClass  GimpViewRendererLayerClass;
+
+struct _GimpViewRendererLayer
+{
+  GimpViewRendererDrawable  parent_instance;
+};
+
+struct _GimpViewRendererLayerClass
+{
+  GimpViewRendererDrawableClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_layer_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_LAYER_H__ */
diff --git a/app/widgets/gimpviewrendererpalette.c b/app/widgets/gimpviewrendererpalette.c
new file mode 100644
index 0000000..6c99c60
--- /dev/null
+++ b/app/widgets/gimpviewrendererpalette.c
@@ -0,0 +1,260 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererpalette.c
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimppalette.h"
+
+#include "gimpviewrendererpalette.h"
+
+
+#define COLUMNS 16
+
+
+static void   gimp_view_renderer_palette_finalize (GObject          *object);
+
+static void   gimp_view_renderer_palette_render   (GimpViewRenderer *renderer,
+                                                   GtkWidget        *widget);
+
+
+G_DEFINE_TYPE (GimpViewRendererPalette, gimp_view_renderer_palette,
+               GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_palette_parent_class
+
+
+static void
+gimp_view_renderer_palette_class_init (GimpViewRendererPaletteClass *klass)
+{
+  GObjectClass          *object_class   = G_OBJECT_CLASS (klass);
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  object_class->finalize = gimp_view_renderer_palette_finalize;
+
+  renderer_class->render = gimp_view_renderer_palette_render;
+}
+
+static void
+gimp_view_renderer_palette_init (GimpViewRendererPalette *renderer)
+{
+  renderer->cell_size = 4;
+  renderer->draw_grid = FALSE;
+  renderer->columns   = COLUMNS;
+}
+
+static void
+gimp_view_renderer_palette_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_view_renderer_palette_render (GimpViewRenderer *renderer,
+                                   GtkWidget        *widget)
+{
+  GimpViewRendererPalette *renderpal = GIMP_VIEW_RENDERER_PALETTE (renderer);
+  GimpPalette             *palette;
+  GimpColorTransform      *transform;
+  guchar                  *row;
+  guchar                  *dest;
+  GList                   *list;
+  gdouble                  cell_width;
+  gint                     grid_width;
+  gint                     dest_stride;
+  gint                     y;
+
+  palette = GIMP_PALETTE (renderer->viewable);
+
+  if (gimp_palette_get_n_colors (palette) == 0)
+    return;
+
+  grid_width = renderpal->draw_grid ? 1 : 0;
+
+  if (renderpal->cell_size > 0)
+    {
+      gint n_columns = gimp_palette_get_columns (palette);
+
+      if (n_columns > 0)
+        cell_width = MAX ((gdouble) renderpal->cell_size,
+                          (gdouble) (renderer->width - grid_width) /
+                          (gdouble) n_columns);
+      else
+        cell_width = renderpal->cell_size;
+    }
+  else
+    {
+      gint n_columns = gimp_palette_get_columns (palette);
+
+      if (n_columns > 0)
+        cell_width = ((gdouble) (renderer->width - grid_width) /
+                      (gdouble) n_columns);
+      else
+        cell_width = (gdouble) (renderer->width - grid_width) / 16.0;
+    }
+
+  cell_width = MAX (4.0, cell_width);
+
+  renderpal->cell_width = cell_width;
+
+  renderpal->columns = (gdouble) (renderer->width - grid_width) / cell_width;
+
+  renderpal->rows = gimp_palette_get_n_colors (palette) / renderpal->columns;
+  if (gimp_palette_get_n_colors (palette) % renderpal->columns)
+    renderpal->rows += 1;
+
+  renderpal->cell_height = MAX (4, ((renderer->height - grid_width) /
+                                    renderpal->rows));
+
+  if (! renderpal->draw_grid)
+    renderpal->cell_height = MIN (renderpal->cell_height,
+                                  renderpal->cell_width);
+
+  list = gimp_palette_get_colors (palette);
+
+  if (! renderer->surface)
+    renderer->surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+                                                    renderer->width,
+                                                    renderer->height);
+
+  cairo_surface_flush (renderer->surface);
+
+  row = g_new (guchar, renderer->width * 4);
+
+  dest        = cairo_image_surface_get_data (renderer->surface);
+  dest_stride = cairo_image_surface_get_stride (renderer->surface);
+
+  transform = gimp_view_renderer_get_color_transform (renderer, widget,
+                                                      babl_format ("cairo-RGB24"),
+                                                      babl_format ("cairo-RGB24"));
+
+  for (y = 0; y < renderer->height; y++)
+    {
+      if ((y % renderpal->cell_height) == 0)
+        {
+          guchar  r, g, b;
+          gint    x;
+          gint    n = 0;
+          guchar *d = row;
+
+          memset (row, renderpal->draw_grid ? 0 : 255, renderer->width * 4);
+
+          r = g = b = (renderpal->draw_grid ? 0 : 255);
+
+          for (x = 0; x < renderer->width; x++, d += 4)
+            {
+              if ((x % renderpal->cell_width) == 0)
+                {
+                  if (list && n < renderpal->columns &&
+                      renderer->width - x >= renderpal->cell_width)
+                    {
+                      GimpPaletteEntry *entry = list->data;
+
+                      list = g_list_next (list);
+                      n++;
+
+                      gimp_rgb_get_uchar (&entry->color, &r, &g, &b);
+                    }
+                  else
+                    {
+                      r = g = b = (renderpal->draw_grid ? 0 : 255);
+                    }
+                }
+
+              if (renderpal->draw_grid && (x % renderpal->cell_width) == 0)
+                {
+                  GIMP_CAIRO_RGB24_SET_PIXEL (d, 0, 0, 0);
+                }
+              else
+                {
+                  GIMP_CAIRO_RGB24_SET_PIXEL (d, r, g, b);
+                }
+            }
+        }
+
+      if (renderpal->draw_grid && (y % renderpal->cell_height) == 0)
+        {
+          memset (dest, 0, renderer->width * 4);
+        }
+      else
+        {
+          if (transform)
+            {
+              gimp_color_transform_process_pixels (transform,
+                                                   babl_format ("cairo-RGB24"),
+                                                   row,
+                                                   babl_format ("cairo-RGB24"),
+                                                   dest,
+                                                   renderer->width);
+            }
+          else
+            {
+              memcpy (dest, row, renderer->width * 4);
+            }
+        }
+
+      dest += dest_stride;
+    }
+
+  g_free (row);
+
+  cairo_surface_mark_dirty (renderer->surface);
+}
+
+
+/*  public functions  */
+
+void
+gimp_view_renderer_palette_set_cell_size (GimpViewRendererPalette *renderer,
+                                          gint                     cell_size)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER_PALETTE (renderer));
+
+  if (cell_size != renderer->cell_size)
+    {
+      renderer->cell_size = cell_size;
+
+      gimp_view_renderer_invalidate (GIMP_VIEW_RENDERER (renderer));
+    }
+}
+
+void
+gimp_view_renderer_palette_set_draw_grid (GimpViewRendererPalette *renderer,
+                                          gboolean                 draw_grid)
+{
+  g_return_if_fail (GIMP_IS_VIEW_RENDERER_PALETTE (renderer));
+
+  if (draw_grid != renderer->draw_grid)
+    {
+      renderer->draw_grid = draw_grid ? TRUE : FALSE;
+
+      gimp_view_renderer_invalidate (GIMP_VIEW_RENDERER (renderer));
+    }
+}
diff --git a/app/widgets/gimpviewrendererpalette.h b/app/widgets/gimpviewrendererpalette.h
new file mode 100644
index 0000000..53b3736
--- /dev/null
+++ b/app/widgets/gimpviewrendererpalette.h
@@ -0,0 +1,63 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrendererpalette.h
+ * Copyright (C) 2005 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_PALETTE_H__
+#define __GIMP_VIEW_RENDERER_PALETTE_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_PALETTE            (gimp_view_renderer_palette_get_type ())
+#define GIMP_VIEW_RENDERER_PALETTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_PALETTE, GimpViewRendererPalette))
+#define GIMP_VIEW_RENDERER_PALETTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_PALETTE, GimpViewRendererPaletteClass))
+#define GIMP_IS_VIEW_RENDERER_PALETTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_PALETTE))
+#define GIMP_IS_VIEW_RENDERER_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_PALETTE))
+#define GIMP_VIEW_RENDERER_PALETTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_PALETTE, GimpViewRendererPaletteClass))
+
+
+typedef struct _GimpViewRendererPaletteClass  GimpViewRendererPaletteClass;
+
+struct _GimpViewRendererPalette
+{
+  GimpViewRenderer  parent_instance;
+
+  gint              cell_size;
+  gboolean          draw_grid;
+
+  gint              cell_width;
+  gint              cell_height;
+  gint              columns;
+  gint              rows;
+};
+
+struct _GimpViewRendererPaletteClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_palette_get_type    (void) G_GNUC_CONST;
+
+void    gimp_view_renderer_palette_set_cell_size (GimpViewRendererPalette *renderer,
+                                                  gint                     cell_size);
+void    gimp_view_renderer_palette_set_draw_grid (GimpViewRendererPalette *renderer,
+                                                  gboolean                 draw_grid);
+
+
+#endif /* __GIMP_VIEW_RENDERER_PALETTE_H__ */
diff --git a/app/widgets/gimpviewrenderervectors.c b/app/widgets/gimpviewrenderervectors.c
new file mode 100644
index 0000000..abdc722
--- /dev/null
+++ b/app/widgets/gimpviewrenderervectors.c
@@ -0,0 +1,111 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderervectors.c
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *                    Simon Budig <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpimage.h"
+#include "core/gimpitem.h"
+
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpvectors.h"
+
+#include "gimpviewrenderervectors.h"
+
+
+static void   gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer,
+                                               GtkWidget        *widget,
+                                               cairo_t          *cr,
+                                               gint              available_width,
+                                               gint              available_height);
+
+
+G_DEFINE_TYPE (GimpViewRendererVectors, gimp_view_renderer_vectors,
+               GIMP_TYPE_VIEW_RENDERER)
+
+#define parent_class gimp_view_renderer_vectors_parent_class
+
+
+static void
+gimp_view_renderer_vectors_class_init (GimpViewRendererVectorsClass *klass)
+{
+  GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass);
+
+  renderer_class->draw = gimp_view_renderer_vectors_draw;
+}
+
+static void
+gimp_view_renderer_vectors_init (GimpViewRendererVectors *renderer)
+{
+}
+
+static void
+gimp_view_renderer_vectors_draw (GimpViewRenderer *renderer,
+                                 GtkWidget        *widget,
+                                 cairo_t          *cr,
+                                 gint              available_width,
+                                 gint              available_height)
+{
+  GtkStyle             *style   = gtk_widget_get_style (widget);
+  GimpVectors          *vectors = GIMP_VECTORS (renderer->viewable);
+  const GimpBezierDesc *desc;
+
+  gdk_cairo_set_source_color (cr, &style->white);
+
+  cairo_translate (cr,
+                   (available_width  - renderer->width)  / 2,
+                   (available_height - renderer->height) / 2);
+  cairo_rectangle (cr, 0, 0, renderer->width, renderer->height);
+  cairo_clip_preserve (cr);
+  cairo_fill (cr);
+
+  desc = gimp_vectors_get_bezier (vectors);
+
+  if (desc)
+    {
+      gdouble xscale;
+      gdouble yscale;
+
+      xscale = ((gdouble) renderer->width /
+                (gdouble) gimp_item_get_width  (GIMP_ITEM (vectors)));
+      yscale = ((gdouble) renderer->height /
+                (gdouble) gimp_item_get_height (GIMP_ITEM (vectors)));
+
+      cairo_scale (cr, xscale, yscale);
+
+      /* determine line width */
+      xscale = yscale = 0.5;
+      cairo_device_to_user_distance (cr, &xscale, &yscale);
+
+      cairo_set_line_width (cr, MAX (xscale, yscale));
+      gdk_cairo_set_source_color (cr, &style->black);
+
+      cairo_append_path (cr, (cairo_path_t *) desc);
+      cairo_stroke (cr);
+    }
+}
diff --git a/app/widgets/gimpviewrenderervectors.h b/app/widgets/gimpviewrenderervectors.h
new file mode 100644
index 0000000..f6c981f
--- /dev/null
+++ b/app/widgets/gimpviewrenderervectors.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpviewrenderervectors.h
+ * Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
+ *                    Simon Budig <simon@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_VIEW_RENDERER_VECTORS_H__
+#define __GIMP_VIEW_RENDERER_VECTORS_H__
+
+#include "gimpviewrenderer.h"
+
+#define GIMP_TYPE_VIEW_RENDERER_VECTORS            (gimp_view_renderer_vectors_get_type ())
+#define GIMP_VIEW_RENDERER_VECTORS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_VECTORS, GimpViewRendererVectors))
+#define GIMP_VIEW_RENDERER_VECTORS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_VECTORS, GimpViewRendererVectorsClass))
+#define GIMP_IS_VIEW_RENDERER_VECTORS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_VIEW_RENDERER_VECTORS))
+#define GIMP_IS_VIEW_RENDERER_VECTORS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_VIEW_RENDERER_VECTORS))
+#define GIMP_VIEW_RENDERER_VECTORS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VIEW_RENDERER_VECTORS, GimpViewRendererVectorsClass))
+
+
+typedef struct _GimpViewRendererVectorsClass  GimpViewRendererVectorsClass;
+
+struct _GimpViewRendererVectors
+{
+  GimpViewRenderer  parent_instance;
+};
+
+struct _GimpViewRendererVectorsClass
+{
+  GimpViewRendererClass  parent_class;
+};
+
+
+GType   gimp_view_renderer_vectors_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_VIEW_RENDERER_VECTORS_H__ */
diff --git a/app/widgets/gimpwidgets-constructors.c b/app/widgets/gimpwidgets-constructors.c
new file mode 100644
index 0000000..cde4a81
--- /dev/null
+++ b/app/widgets/gimpwidgets-constructors.c
@@ -0,0 +1,103 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gimpwidgets-constructors.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+GtkWidget *
+gimp_icon_button_new (const gchar *icon_name,
+                      const gchar *label)
+{
+  GtkWidget *button;
+  GtkWidget *image;
+
+  button = gtk_button_new ();
+
+  if (label)
+    {
+      GtkWidget *hbox;
+      GtkWidget *lab;
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_container_add (GTK_CONTAINER (button), hbox);
+      gtk_widget_show (hbox);
+
+      image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+      gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+      gtk_widget_show (image);
+
+      lab = gtk_label_new_with_mnemonic (label);
+      gtk_label_set_mnemonic_widget (GTK_LABEL (lab), button);
+      gtk_box_pack_start (GTK_BOX (hbox), lab, TRUE, TRUE, 0);
+      gtk_widget_show (lab);
+    }
+  else
+    {
+      image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_widget_show (image);
+    }
+
+  return button;
+}
+
+GtkWidget *
+gimp_color_profile_label_new (GimpColorProfile *profile)
+{
+  GtkWidget   *expander;
+  GtkWidget   *view;
+  const gchar *label;
+
+  g_return_val_if_fail (profile == NULL ||
+                        GIMP_IS_COLOR_PROFILE (profile), NULL);
+
+  if (profile)
+    label = gimp_color_profile_get_label (profile);
+  else
+    label = C_("profile", "None");
+
+  expander = gtk_expander_new (label);
+
+  view = gimp_color_profile_view_new ();
+
+  if (profile)
+    gimp_color_profile_view_set_profile (GIMP_COLOR_PROFILE_VIEW (view),
+                                         profile);
+  else
+    gimp_color_profile_view_set_error (GIMP_COLOR_PROFILE_VIEW (view),
+                                       C_("profile", "None"));
+
+  gtk_container_add (GTK_CONTAINER (expander), view);
+  gtk_widget_show (view);
+
+  return expander;
+}
diff --git a/app/widgets/gimpwidgets-constructors.h b/app/widgets/gimpwidgets-constructors.h
new file mode 100644
index 0000000..909f4ca
--- /dev/null
+++ b/app/widgets/gimpwidgets-constructors.h
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_WIDGETS_CONSTRUCTORS_H__
+#define __GIMP_WIDGETS_CONSTRUCTORS_H__
+
+
+GtkWidget * gimp_icon_button_new         (const gchar      *icon_name,
+                                          const gchar      *label);
+
+GtkWidget * gimp_color_profile_label_new (GimpColorProfile *profile);
+
+
+#endif  /*  __GIMP_WIDGETS_CONSTRUCTORS_H__  */
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
new file mode 100644
index 0000000..b6750bf
--- /dev/null
+++ b/app/widgets/gimpwidgets-utils.c
@@ -0,0 +1,1964 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwidgets-utils.c
+ * Copyright (C) 1999-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#ifdef PLATFORM_OSX
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmath/gimpmath.h"
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "gegl/gimp-babl.h"
+
+#include "gimpaction.h"
+#include "gimpdialogfactory.h"
+#include "gimpdock.h"
+#include "gimpdockcontainer.h"
+#include "gimpdockwindow.h"
+#include "gimperrordialog.h"
+#include "gimpsessioninfo.h"
+#include "gimpwidgets-utils.h"
+
+#include "gimp-intl.h"
+
+
+#define GIMP_TOOL_OPTIONS_GUI_KEY      "gimp-tool-options-gui"
+#define GIMP_TOOL_OPTIONS_GUI_FUNC_KEY "gimp-tool-options-gui-func"
+
+
+/**
+ * gimp_menu_position:
+ * @menu: a #GtkMenu widget
+ * @x: pointer to horizontal position
+ * @y: pointer to vertical position
+ *
+ * Positions a #GtkMenu so that it pops up on screen.  This function
+ * takes care of the preferred popup direction (taken from the widget
+ * render direction) and it handles multiple monitors representing a
+ * single #GdkScreen (Xinerama).
+ *
+ * You should call this function with @x and @y initialized to the
+ * origin of the menu. This is typically the center of the widget the
+ * menu is popped up from. gimp_menu_position() will then decide if
+ * and how these initial values need to be changed.
+ **/
+void
+gimp_menu_position (GtkMenu *menu,
+                    gint    *x,
+                    gint    *y)
+{
+  GtkWidget      *widget;
+  GdkScreen      *screen;
+  GtkRequisition  requisition;
+  GdkRectangle    rect;
+  gint            monitor;
+
+  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_if_fail (x != NULL);
+  g_return_if_fail (y != NULL);
+
+  widget = GTK_WIDGET (menu);
+
+  screen = gtk_widget_get_screen (widget);
+
+  monitor = gdk_screen_get_monitor_at_point (screen, *x, *y);
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  gtk_menu_set_screen (menu, screen);
+
+  gtk_widget_size_request (widget, &requisition);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    {
+      *x -= requisition.width;
+      if (*x < rect.x)
+        *x += requisition.width;
+    }
+  else
+    {
+      if (*x + requisition.width > rect.x + rect.width)
+        *x -= requisition.width;
+    }
+
+  if (*x < rect.x)
+    *x = rect.x;
+
+  if (*y + requisition.height > rect.y + rect.height)
+    *y -= requisition.height;
+
+  if (*y < rect.y)
+    *y = rect.y;
+}
+
+/**
+ * gimp_button_menu_position:
+ * @button: a button widget to popup the menu from
+ * @menu: the menu to position
+ * @position: the preferred popup direction for the menu (left or right)
+ * @x: return location for x coordinate
+ * @y: return location for y coordinate
+ *
+ * Utility function to position a menu that pops up from a button.
+ **/
+void
+gimp_button_menu_position (GtkWidget       *button,
+                           GtkMenu         *menu,
+                           GtkPositionType  position,
+                           gint            *x,
+                           gint            *y)
+{
+  GdkScreen      *screen;
+  GtkAllocation   button_allocation;
+  GtkRequisition  menu_requisition;
+  GdkRectangle    rect;
+  gint            monitor;
+
+  g_return_if_fail (GTK_IS_WIDGET (button));
+  g_return_if_fail (gtk_widget_get_realized (button));
+  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_if_fail (x != NULL);
+  g_return_if_fail (y != NULL);
+
+  gtk_widget_get_allocation (button, &button_allocation);
+
+  if (gtk_widget_get_direction (button) == GTK_TEXT_DIR_RTL)
+    {
+      switch (position)
+        {
+        case GTK_POS_LEFT:   position = GTK_POS_RIGHT;  break;
+        case GTK_POS_RIGHT:  position = GTK_POS_LEFT;   break;
+        default:
+          break;
+        }
+    }
+
+  *x = 0;
+  *y = 0;
+
+  if (! gtk_widget_get_has_window (button))
+    {
+      *x += button_allocation.x;
+      *y += button_allocation.y;
+    }
+
+  gdk_window_get_root_coords (gtk_widget_get_window (button), *x, *y, x, y);
+
+  gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition);
+
+  screen = gtk_widget_get_screen (button);
+
+  monitor = gdk_screen_get_monitor_at_point (screen, *x, *y);
+  gdk_screen_get_monitor_workarea (screen, monitor, &rect);
+
+  gtk_menu_set_screen (menu, screen);
+
+  switch (position)
+    {
+    case GTK_POS_LEFT:
+      *x -= menu_requisition.width;
+      if (*x < rect.x)
+        *x += menu_requisition.width + button_allocation.width;
+      break;
+
+    case GTK_POS_RIGHT:
+      *x += button_allocation.width;
+      if (*x + menu_requisition.width > rect.x + rect.width)
+        *x -= button_allocation.width + menu_requisition.width;
+      break;
+
+    default:
+      g_warning ("%s: unhandled position (%d)", G_STRFUNC, position);
+      break;
+    }
+
+  if (*y + menu_requisition.height > rect.y + rect.height)
+    *y -= menu_requisition.height - button_allocation.height;
+
+  if (*y < rect.y)
+    *y = rect.y;
+}
+
+void
+gimp_table_attach_icon (GtkTable    *table,
+                        gint         row,
+                        const gchar *icon_name,
+                        GtkWidget   *widget,
+                        gint         colspan,
+                        gboolean     left_align)
+{
+  GtkWidget *image;
+
+  g_return_if_fail (GTK_IS_TABLE (table));
+  g_return_if_fail (icon_name != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+  gtk_misc_set_alignment (GTK_MISC (image), 1.0, 0.5);
+  gtk_table_attach (table, image, 0, 1, row, row + 1,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (image);
+
+  if (left_align)
+    {
+      GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+      gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+      gtk_widget_show (widget);
+
+      widget = hbox;
+    }
+
+  gtk_table_attach (table, widget, 1, 1 + colspan, row, row + 1,
+                    GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+  gtk_widget_show (widget);
+}
+
+void
+gimp_enum_radio_box_add (GtkBox    *box,
+                         GtkWidget *widget,
+                         gint       enum_value,
+                         gboolean   below)
+{
+  GList *children;
+  GList *list;
+  gint   pos;
+
+  g_return_if_fail (GTK_IS_BOX (box));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  children = gtk_container_get_children (GTK_CONTAINER (box));
+
+  for (list = children, pos = 1;
+       list;
+       list = g_list_next (list), pos++)
+    {
+      if (GTK_IS_RADIO_BUTTON (list->data) &&
+          GPOINTER_TO_INT (g_object_get_data (list->data, "gimp-item-data")) ==
+          enum_value)
+        {
+          GtkWidget *radio = list->data;
+          GtkWidget *hbox;
+
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+          gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
+          gtk_box_reorder_child (GTK_BOX (box), hbox, pos);
+
+          if (below)
+            {
+              GtkWidget *spacer;
+              gint       indicator_size;
+              gint       indicator_spacing;
+              gint       focus_width;
+              gint       focus_padding;
+              gint       border_width;
+
+              gtk_widget_style_get (radio,
+                                    "indicator-size",    &indicator_size,
+                                    "indicator-spacing", &indicator_spacing,
+                                    "focus-line-width",  &focus_width,
+                                    "focus-padding",     &focus_padding,
+                                    NULL);
+
+              border_width = gtk_container_get_border_width (GTK_CONTAINER (radio));
+
+              spacer = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+              gtk_widget_set_size_request (spacer,
+                                           indicator_size +
+                                           3 * indicator_spacing +
+                                           focus_width +
+                                           focus_padding +
+                                           border_width,
+                                           -1);
+              gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
+              gtk_widget_show (spacer);
+            }
+          else
+            {
+              GtkSizeGroup *size_group;
+
+              size_group = g_object_get_data (G_OBJECT (box), "size-group");
+
+              if (! size_group)
+                {
+                  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+                  g_object_set_data (G_OBJECT (box), "size-group", size_group);
+
+                  gtk_size_group_add_widget (size_group, radio);
+                  g_object_unref (size_group);
+                }
+              else
+                {
+                  gtk_size_group_add_widget (size_group, radio);
+                }
+
+              gtk_box_set_spacing (GTK_BOX (hbox), 4);
+
+              g_object_ref (radio);
+              gtk_container_remove (GTK_CONTAINER (box), radio);
+              gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0);
+              g_object_unref (radio);
+            }
+
+          gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+          gtk_widget_show (widget);
+
+          g_object_bind_property (radio,  "active",
+                                  widget, "sensitive",
+                                  G_BINDING_SYNC_CREATE);
+
+          gtk_widget_show (hbox);
+
+          break;
+        }
+    }
+
+  g_list_free (children);
+}
+
+void
+gimp_enum_radio_frame_add (GtkFrame  *frame,
+                           GtkWidget *widget,
+                           gint       enum_value,
+                           gboolean   below)
+{
+  GtkWidget *box;
+
+  g_return_if_fail (GTK_IS_FRAME (frame));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  box = gtk_bin_get_child (GTK_BIN (frame));
+
+  g_return_if_fail (GTK_IS_BOX (box));
+
+  gimp_enum_radio_box_add (GTK_BOX (box), widget, enum_value, below);
+}
+
+/**
+ * gimp_widget_load_icon:
+ * @widget:                  parent widget (to determine icon theme and
+ *                           style)
+ * @icon_name:               icon name
+ * @size:                    requested pixel size
+ *
+ * Loads an icon into a pixbuf with size as close as possible to @size.
+ * If icon does not exist or fail to load, the function will fallback to
+ * "gimp-wilber-eek" instead to prevent NULL pixbuf. As a last resort,
+ * if even the fallback failed to load, a magenta @size square will be
+ * returned, so this function is guaranteed to always return a
+ * #GdkPixbuf.
+ *
+ * Return value: a newly allocated #GdkPixbuf containing @icon_name at
+ * size @size or a fallback icon/size.
+ **/
+GdkPixbuf *
+gimp_widget_load_icon (GtkWidget   *widget,
+                       const gchar *icon_name,
+                       gint         size)
+{
+  GdkPixbuf    *pixbuf;
+  GtkIconTheme *icon_theme;
+  gint         *icon_sizes;
+  gint          closest_size = -1;
+  gint          min_diff     = G_MAXINT;
+  gint          i;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
+
+  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
+    {
+      g_printerr ("WARNING: icon theme has no icon '%s'.\n",
+                  icon_name);
+
+      return gtk_icon_theme_load_icon (icon_theme, GIMP_ICON_WILBER_EEK,
+                                       size, 0, NULL);
+    }
+
+  icon_sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_name);
+
+  for (i = 0; icon_sizes[i]; i++)
+    {
+      if (icon_sizes[i] > 0 &&
+          icon_sizes[i] <= size)
+        {
+          if (size - icon_sizes[i] < min_diff)
+            {
+              min_diff     = size - icon_sizes[i];
+              closest_size = icon_sizes[i];
+            }
+        }
+    }
+
+  g_free (icon_sizes);
+
+  if (closest_size != -1)
+    size = closest_size;
+
+  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size,
+                                     GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+  if (! pixbuf)
+    {
+      /* The icon was seemingly present in the current icon theme, yet
+       * it failed to load. Maybe the file is broken?
+       * As last resort, try to load "gimp-wilber-eek" as fallback.
+       * Note that we are not making more checks, so if the fallback
+       * icon fails to load as well, the function may still return NULL.
+       */
+      g_printerr ("WARNING: icon '%s' failed to load. Check the files "
+                  "in your icon theme.\n", icon_name);
+
+      pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                         GIMP_ICON_WILBER_EEK,
+                                         size, 0, NULL);
+      if (! pixbuf)
+        {
+          /* As last resort, just draw an ugly magenta square. */
+          guchar *data;
+          gint    rowstride = 3 * size;
+          gint    i, j;
+
+          g_printerr ("WARNING: icon '%s' failed to load. Check the files "
+                      "in your icon theme.\n", GIMP_ICON_WILBER_EEK);
+
+          data = g_new (guchar, rowstride * size);
+          for (i = 0; i < size; i++)
+            {
+              for (j = 0; j < size; j++)
+                {
+                  data[i * rowstride + j * 3] = 255;
+                  data[i * rowstride + j * 3 + 1] = 0;
+                  data[i * rowstride + j * 3 + 2] = 255;
+                }
+            }
+          pixbuf = gdk_pixbuf_new_from_data (data, GDK_COLORSPACE_RGB, FALSE,
+                                             8, size, size, rowstride,
+                                             (GdkPixbufDestroyNotify) g_free,
+                                             NULL);
+        }
+    }
+
+  return pixbuf;
+}
+
+GtkIconSize
+gimp_get_icon_size (GtkWidget   *widget,
+                    const gchar *icon_name,
+                    GtkIconSize  max_size,
+                    gint         width,
+                    gint         height)
+{
+  GtkIconSet   *icon_set;
+  GtkIconSize  *sizes;
+  gint          n_sizes;
+  gint          i;
+  gint          width_diff  = 1024;
+  gint          height_diff = 1024;
+  gint          max_width;
+  gint          max_height;
+  GtkIconSize   icon_size = GTK_ICON_SIZE_MENU;
+  GtkSettings  *settings;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), icon_size);
+  g_return_val_if_fail (icon_name != NULL, icon_size);
+  g_return_val_if_fail (width > 0, icon_size);
+  g_return_val_if_fail (height > 0, icon_size);
+
+  icon_set = gtk_style_lookup_icon_set (gtk_widget_get_style (widget),
+                                        icon_name);
+
+  if (! icon_set)
+    return GTK_ICON_SIZE_INVALID;
+
+  settings = gtk_widget_get_settings (widget);
+
+  if (! gtk_icon_size_lookup_for_settings (settings, max_size,
+                                           &max_width, &max_height))
+    {
+      max_width  = 1024;
+      max_height = 1024;
+    }
+
+  gtk_icon_set_get_sizes (icon_set, &sizes, &n_sizes);
+
+  for (i = 0; i < n_sizes; i++)
+    {
+      gint icon_width;
+      gint icon_height;
+
+      if (gtk_icon_size_lookup_for_settings (settings, sizes[i],
+                                             &icon_width, &icon_height))
+        {
+          if (icon_width  <= width      &&
+              icon_height <= height     &&
+              icon_width  <= max_width  &&
+              icon_height <= max_height &&
+              ((width  - icon_width)  < width_diff ||
+               (height - icon_height) < height_diff))
+            {
+              width_diff  = width  - icon_width;
+              height_diff = height - icon_height;
+
+              icon_size = sizes[i];
+            }
+        }
+    }
+
+  g_free (sizes);
+
+  return icon_size;
+}
+
+GimpTabStyle
+gimp_preview_tab_style_to_icon (GimpTabStyle tab_style)
+{
+  switch (tab_style)
+    {
+    case GIMP_TAB_STYLE_PREVIEW:
+      tab_style = GIMP_TAB_STYLE_ICON;
+      break;
+
+    case GIMP_TAB_STYLE_PREVIEW_NAME:
+      tab_style = GIMP_TAB_STYLE_ICON_NAME;
+      break;
+
+    case GIMP_TAB_STYLE_PREVIEW_BLURB:
+      tab_style = GIMP_TAB_STYLE_ICON_BLURB;
+      break;
+
+    default:
+      break;
+    }
+
+  return tab_style;
+}
+
+const gchar *
+gimp_get_mod_string (GdkModifierType modifiers)
+{
+  static GHashTable *mod_labels;
+  gchar             *label;
+
+  if (! modifiers)
+    return NULL;
+
+  if (G_UNLIKELY (! mod_labels))
+    mod_labels = g_hash_table_new (g_int_hash, g_int_equal);
+
+  modifiers = gimp_replace_virtual_modifiers (modifiers);
+
+  label = g_hash_table_lookup (mod_labels, &modifiers);
+
+  if (! label)
+    {
+      GtkAccelLabelClass *accel_label_class;
+
+      label = gtk_accelerator_get_label (0, modifiers);
+
+      accel_label_class = g_type_class_ref (GTK_TYPE_ACCEL_LABEL);
+
+      if (accel_label_class->mod_separator &&
+          *accel_label_class->mod_separator)
+        {
+          gchar *sep = g_strrstr (label, accel_label_class->mod_separator);
+
+          if (sep - label ==
+              strlen (label) - strlen (accel_label_class->mod_separator))
+            *sep = '\0';
+        }
+
+      g_type_class_unref (accel_label_class);
+
+      g_hash_table_insert (mod_labels,
+                           g_memdup (&modifiers, sizeof (GdkModifierType)),
+                           label);
+    }
+
+  return label;
+}
+
+#define BUF_SIZE 100
+/**
+ * gimp_suggest_modifiers:
+ * @message:                 initial text for the message
+ * @modifiers:               bit mask of modifiers that should be suggested
+ * @extend_selection_format: optional format string for the
+ *                           "Extend selection" modifier
+ * @toggle_behavior_format:  optional format string for the
+ *                           "Toggle behavior" modifier
+ * @alt_format:              optional format string for the Alt modifier
+ *
+ * Utility function to build a message suggesting to use some
+ * modifiers for performing different actions (only Shift, Ctrl and
+ * Alt are currently supported).  If some of these modifiers are
+ * already active, they will not be suggested.  The optional format
+ * strings #extend_selection_format, #toggle_behavior_format and
+ * #alt_format may be used to describe what the modifier will do.
+ * They must contain a single '%%s' which will be replaced by the name
+ * of the modifier.  They can also be %NULL if the modifier name
+ * should be left alone.
+ *
+ * Return value: a newly allocated string containing the message.
+ **/
+gchar *
+gimp_suggest_modifiers (const gchar     *message,
+                        GdkModifierType  modifiers,
+                        const gchar     *extend_selection_format,
+                        const gchar     *toggle_behavior_format,
+                        const gchar     *alt_format)
+{
+  GdkModifierType  extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType  toggle_mask = gimp_get_toggle_behavior_mask ();
+  gchar            msg_buf[3][BUF_SIZE];
+  gint             num_msgs = 0;
+  gboolean         try      = FALSE;
+
+  if (modifiers & extend_mask)
+    {
+      if (extend_selection_format && *extend_selection_format)
+        {
+          g_snprintf (msg_buf[num_msgs], BUF_SIZE, extend_selection_format,
+                      gimp_get_mod_string (extend_mask));
+        }
+      else
+        {
+          g_strlcpy (msg_buf[num_msgs],
+                     gimp_get_mod_string (extend_mask), BUF_SIZE);
+          try = TRUE;
+        }
+
+      num_msgs++;
+    }
+
+  if (modifiers & toggle_mask)
+    {
+      if (toggle_behavior_format && *toggle_behavior_format)
+        {
+          g_snprintf (msg_buf[num_msgs], BUF_SIZE, toggle_behavior_format,
+                      gimp_get_mod_string (toggle_mask));
+        }
+      else
+        {
+          g_strlcpy (msg_buf[num_msgs],
+                     gimp_get_mod_string (toggle_mask), BUF_SIZE);
+          try = TRUE;
+        }
+
+      num_msgs++;
+    }
+
+  if (modifiers & GDK_MOD1_MASK)
+    {
+      if (alt_format && *alt_format)
+        {
+          g_snprintf (msg_buf[num_msgs], BUF_SIZE, alt_format,
+                      gimp_get_mod_string (GDK_MOD1_MASK));
+        }
+      else
+        {
+          g_strlcpy (msg_buf[num_msgs],
+                     gimp_get_mod_string (GDK_MOD1_MASK), BUF_SIZE);
+          try = TRUE;
+        }
+
+      num_msgs++;
+    }
+
+  /* This convoluted way to build the message using multiple format strings
+   * tries to make the messages easier to translate to other languages.
+   */
+
+  switch (num_msgs)
+    {
+    case 1:
+      return g_strdup_printf (try ? _("%s (try %s)") : _("%s (%s)"),
+                              message, msg_buf[0]);
+
+    case 2:
+      return g_strdup_printf (_("%s (try %s, %s)"),
+                              message, msg_buf[0], msg_buf[1]);
+
+    case 3:
+      return g_strdup_printf (_("%s (try %s, %s, %s)"),
+                              message, msg_buf[0], msg_buf[1], msg_buf[2]);
+    }
+
+  return g_strdup (message);
+}
+#undef BUF_SIZE
+
+GimpChannelOps
+gimp_modifiers_to_channel_op (GdkModifierType  modifiers)
+{
+  GdkModifierType extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType modify_mask = gimp_get_modify_selection_mask ();
+
+  if (modifiers & extend_mask)
+    {
+      if (modifiers & modify_mask)
+        {
+          return GIMP_CHANNEL_OP_INTERSECT;
+        }
+      else
+        {
+          return GIMP_CHANNEL_OP_ADD;
+        }
+    }
+  else if (modifiers & modify_mask)
+    {
+      return GIMP_CHANNEL_OP_SUBTRACT;
+    }
+
+  return GIMP_CHANNEL_OP_REPLACE;
+}
+
+GdkModifierType
+gimp_replace_virtual_modifiers (GdkModifierType modifiers)
+{
+  GdkDisplay      *display = gdk_display_get_default ();
+  GdkModifierType  result  = 0;
+  gint             i;
+
+  for (i = 0; i < 8; i++)
+    {
+      GdkModifierType real = 1 << i;
+
+      if (modifiers & real)
+        {
+          GdkModifierType virtual = real;
+
+          gdk_keymap_add_virtual_modifiers (gdk_keymap_get_for_display (display),
+                                            &virtual);
+
+          if (virtual == real)
+            result |= virtual;
+          else
+            result |= virtual & ~real;
+        }
+    }
+
+  return result;
+}
+
+GdkModifierType
+gimp_get_primary_accelerator_mask (void)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  return gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                       GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR);
+}
+
+GdkModifierType
+gimp_get_extend_selection_mask (void)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  return gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                       GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+}
+
+GdkModifierType
+gimp_get_modify_selection_mask (void)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  return gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                       GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+}
+
+GdkModifierType
+gimp_get_toggle_behavior_mask (void)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  /* use the modify selection modifier */
+  return gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                       GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+}
+
+GdkModifierType
+gimp_get_constrain_behavior_mask (void)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  /* use the modify selection modifier */
+  return gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                       GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+}
+
+GdkModifierType
+gimp_get_all_modifiers_mask (void)
+{
+  GdkDisplay *display = gdk_display_get_default ();
+
+  return (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK |
+          gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                        GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR) |
+          gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                        GDK_MODIFIER_INTENT_EXTEND_SELECTION) |
+          gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+                                        GDK_MODIFIER_INTENT_MODIFY_SELECTION));
+}
+
+/**
+ * gimp_get_monitor_resolution:
+ * @screen: a #GdkScreen
+ * @monitor: a monitor number
+ * @xres: returns the horizontal monitor resolution (in dpi)
+ * @yres: returns the vertical monitor resolution (in dpi)
+ *
+ * Retrieves the monitor's resolution from GDK.
+ **/
+void
+gimp_get_monitor_resolution (GdkScreen *screen,
+                             gint       monitor,
+                             gdouble   *xres,
+                             gdouble   *yres)
+{
+  GdkRectangle size_pixels;
+  gint         width_mm, height_mm;
+  gdouble      x = 0.0;
+  gdouble      y = 0.0;
+#ifdef PLATFORM_OSX
+  CGSize       size;
+#endif
+
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+  g_return_if_fail (xres != NULL);
+  g_return_if_fail (yres != NULL);
+
+#ifndef PLATFORM_OSX
+  gdk_screen_get_monitor_geometry (screen, monitor, &size_pixels);
+
+  width_mm  = gdk_screen_get_monitor_width_mm  (screen, monitor);
+  height_mm = gdk_screen_get_monitor_height_mm (screen, monitor);
+#else
+  width_mm  = 0;
+  height_mm = 0;
+  size = CGDisplayScreenSize (kCGDirectMainDisplay);
+  if (!CGSizeEqualToSize (size, CGSizeZero))
+    {
+      width_mm  = size.width;
+      height_mm = size.height;
+    }
+  size_pixels.width  = CGDisplayPixelsWide (kCGDirectMainDisplay);
+  size_pixels.height = CGDisplayPixelsHigh (kCGDirectMainDisplay);
+#endif
+  /*
+   * From xdpyinfo.c:
+   *
+   * there are 2.54 centimeters to an inch; so there are 25.4 millimeters.
+   *
+   *     dpi = N pixels / (M millimeters / (25.4 millimeters / 1 inch))
+   *         = N pixels / (M inch / 25.4)
+   *         = N * 25.4 pixels / M inch
+   */
+
+  if (width_mm > 0 && height_mm > 0)
+    {
+      x = (size_pixels.width  * 25.4) / (gdouble) width_mm;
+      y = (size_pixels.height * 25.4) / (gdouble) height_mm;
+    }
+
+  if (x < GIMP_MIN_RESOLUTION || x > GIMP_MAX_RESOLUTION ||
+      y < GIMP_MIN_RESOLUTION || y > GIMP_MAX_RESOLUTION)
+    {
+      g_printerr ("gimp_get_monitor_resolution(): GDK returned bogus "
+                  "values for the monitor resolution, using 96 dpi instead.\n");
+
+      x = 96.0;
+      y = 96.0;
+    }
+
+  /*  round the value to full integers to give more pleasant results  */
+  *xres = ROUND (x);
+  *yres = ROUND (y);
+}
+
+
+/**
+ * gimp_rgb_get_gdk_color:
+ * @rgb: the source color as #GimpRGB
+ * @gdk_color: pointer to a #GdkColor
+ *
+ * Initializes @gdk_color from a #GimpRGB. This function does not
+ * allocate the color for you. Depending on how you want to use it,
+ * you may have to call gdk_colormap_alloc_color().
+ **/
+void
+gimp_rgb_get_gdk_color (const GimpRGB *rgb,
+                        GdkColor      *gdk_color)
+{
+  guchar r, g, b;
+
+  g_return_if_fail (rgb != NULL);
+  g_return_if_fail (gdk_color != NULL);
+
+  gimp_rgb_get_uchar (rgb, &r, &g, &b);
+
+  gdk_color->red   = (r << 8) | r;
+  gdk_color->green = (g << 8) | g;
+  gdk_color->blue  = (b << 8) | b;
+}
+
+/**
+ * gimp_rgb_set_gdk_color:
+ * @rgb: a #GimpRGB that is to be set
+ * @gdk_color: pointer to the source #GdkColor
+ *
+ * Initializes @rgb from a #GdkColor. This function does not touch
+ * the alpha value of @rgb.
+ **/
+void
+gimp_rgb_set_gdk_color (GimpRGB        *rgb,
+                        const GdkColor *gdk_color)
+{
+  guchar r, g, b;
+
+  g_return_if_fail (rgb != NULL);
+  g_return_if_fail (gdk_color != NULL);
+
+  r = gdk_color->red   >> 8;
+  g = gdk_color->green >> 8;
+  b = gdk_color->blue  >> 8;
+
+  gimp_rgb_set_uchar (rgb, r, g, b);
+}
+
+void
+gimp_window_set_hint (GtkWindow      *window,
+                      GimpWindowHint  hint)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  switch (hint)
+    {
+    case GIMP_WINDOW_HINT_NORMAL:
+      gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_NORMAL);
+      break;
+
+    case GIMP_WINDOW_HINT_UTILITY:
+      gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_UTILITY);
+      break;
+
+    case GIMP_WINDOW_HINT_KEEP_ABOVE:
+      gtk_window_set_keep_above (window, TRUE);
+      break;
+    }
+}
+
+/**
+ * gimp_window_get_native_id:
+ * @window: a #GtkWindow
+ *
+ * This function is used to pass a window handle to plug-ins so that
+ * they can set their dialog windows transient to the parent window.
+ *
+ * Return value: a native window ID of the window's #GdkWindow or 0
+ *               if the window isn't realized yet
+ */
+guint32
+gimp_window_get_native_id (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), 0);
+
+#ifdef GDK_NATIVE_WINDOW_POINTER
+#ifdef __GNUC__
+#warning gimp_window_get_native() unimplementable for the target windowing system
+#endif
+  return 0;
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+  if (window && gtk_widget_get_realized (GTK_WIDGET (window)))
+    return GDK_WINDOW_HWND (gtk_widget_get_window (GTK_WIDGET (window)));
+#endif
+
+#ifdef GDK_WINDOWING_X11
+  if (window && gtk_widget_get_realized (GTK_WIDGET (window)))
+    return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)));
+#endif
+
+  return 0;
+}
+
+static void
+gimp_window_transient_realized (GtkWidget *window,
+                                GdkWindow *parent)
+{
+  if (gtk_widget_get_realized (window))
+    gdk_window_set_transient_for (gtk_widget_get_window (window), parent);
+}
+
+/* similar to what we have in libgimp/gimpui.c */
+static GdkWindow *
+gimp_get_foreign_window (guint32 window)
+{
+#ifdef GDK_WINDOWING_X11
+  return gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
+                                                 window);
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+  return gdk_win32_window_foreign_new_for_display (gdk_display_get_default (),
+                                                   window);
+#endif
+
+  return NULL;
+}
+
+void
+gimp_window_set_transient_for (GtkWindow *window,
+                               guint32    parent_ID)
+{
+  /* Cross-process transient-for is broken in gdk/win32 <= 2.10.6. It
+   * causes hangs, at least when used as by the gimp and script-fu
+   * processes. In some newer GTK+ version it will be fixed to be a
+   * no-op. If it eventually is fixed to actually work, change this to
+   * a run-time check of GTK+ version. Remember to change also the
+   * function with the same name in libgimp/gimpui.c
+   */
+#ifndef GDK_WINDOWING_WIN32
+  GdkWindow *parent;
+
+  parent = gimp_get_foreign_window (parent_ID);
+  if (! parent)
+    return;
+
+  if (gtk_widget_get_realized (GTK_WIDGET (window)))
+    gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (window)),
+                                  parent);
+
+  g_signal_connect_object (window, "realize",
+                           G_CALLBACK (gimp_window_transient_realized),
+                           parent, 0);
+
+  g_object_unref (parent);
+#endif
+}
+
+static gboolean
+gimp_widget_accel_find_func (GtkAccelKey *key,
+                             GClosure    *closure,
+                             gpointer     data)
+{
+  return (GClosure *) data == closure;
+}
+
+static void
+gimp_widget_accel_changed (GtkAccelGroup   *accel_group,
+                           guint            unused1,
+                           GdkModifierType  unused2,
+                           GClosure        *accel_closure,
+                           GtkWidget       *widget)
+{
+  GClosure *widget_closure;
+
+  widget_closure = g_object_get_data (G_OBJECT (widget), "gimp-accel-closure");
+
+  if (accel_closure == widget_closure)
+    {
+      GimpAction  *action;
+      GtkAccelKey *accel_key;
+      const gchar *tooltip;
+      const gchar *help_id;
+
+      action = g_object_get_data (G_OBJECT (widget), "gimp-accel-action");
+
+      tooltip = gimp_action_get_tooltip (action);
+      help_id = gimp_action_get_help_id (action);
+
+      accel_key = gtk_accel_group_find (accel_group,
+                                        gimp_widget_accel_find_func,
+                                        accel_closure);
+
+      if (accel_key            &&
+          accel_key->accel_key &&
+          (accel_key->accel_flags & GTK_ACCEL_VISIBLE))
+        {
+          gchar *escaped = g_markup_escape_text (tooltip, -1);
+          gchar *accel   = gtk_accelerator_get_label (accel_key->accel_key,
+                                                      accel_key->accel_mods);
+          gchar *tmp     = g_strdup_printf ("%s  <b>%s</b>", escaped, accel);
+
+          g_free (accel);
+          g_free (escaped);
+
+          gimp_help_set_help_data_with_markup (widget, tmp, help_id);
+          g_free (tmp);
+        }
+      else
+        {
+          gimp_help_set_help_data (widget, tooltip, help_id);
+        }
+    }
+}
+
+static void   gimp_accel_help_widget_weak_notify (gpointer  accel_group,
+                                                  GObject  *where_widget_was);
+
+static void
+gimp_accel_help_accel_group_weak_notify (gpointer  widget,
+                                         GObject  *where_accel_group_was)
+{
+  g_object_weak_unref (widget,
+                       gimp_accel_help_widget_weak_notify,
+                       where_accel_group_was);
+
+  g_object_set_data (widget, "gimp-accel-group", NULL);
+}
+
+static void
+gimp_accel_help_widget_weak_notify (gpointer  accel_group,
+                                    GObject  *where_widget_was)
+{
+  g_object_weak_unref (accel_group,
+                       gimp_accel_help_accel_group_weak_notify,
+                       where_widget_was);
+}
+
+void
+gimp_widget_set_accel_help (GtkWidget  *widget,
+                            GimpAction *action)
+{
+  GtkAccelGroup *accel_group;
+  GClosure      *accel_closure;
+
+  accel_group = g_object_get_data (G_OBJECT (widget), "gimp-accel-group");
+
+  if (accel_group)
+    {
+      g_signal_handlers_disconnect_by_func (accel_group,
+                                            gimp_widget_accel_changed,
+                                            widget);
+      g_object_weak_unref (G_OBJECT (accel_group),
+                           gimp_accel_help_accel_group_weak_notify,
+                           widget);
+      g_object_weak_unref (G_OBJECT (widget),
+                           gimp_accel_help_widget_weak_notify,
+                           accel_group);
+      g_object_set_data (G_OBJECT (widget), "gimp-accel-group", NULL);
+    }
+
+  accel_closure = gimp_action_get_accel_closure (action);
+
+  if (accel_closure)
+    {
+      accel_group = gtk_accel_group_from_accel_closure (accel_closure);
+
+      g_object_set_data (G_OBJECT (widget), "gimp-accel-group",
+                         accel_group);
+      g_object_weak_ref (G_OBJECT (accel_group),
+                         gimp_accel_help_accel_group_weak_notify,
+                         widget);
+      g_object_weak_ref (G_OBJECT (widget),
+                         gimp_accel_help_widget_weak_notify,
+                         accel_group);
+
+      g_object_set_data (G_OBJECT (widget), "gimp-accel-closure",
+                         accel_closure);
+      g_object_set_data (G_OBJECT (widget), "gimp-accel-action",
+                         action);
+
+      g_signal_connect_object (accel_group, "accel-changed",
+                               G_CALLBACK (gimp_widget_accel_changed),
+                               widget, 0);
+
+      gimp_widget_accel_changed (accel_group,
+                                 0, 0,
+                                 accel_closure,
+                                 widget);
+    }
+  else
+    {
+      gimp_help_set_help_data (widget,
+                               gimp_action_get_tooltip (action),
+                               gimp_action_get_help_id (action));
+
+    }
+}
+
+const gchar *
+gimp_get_message_icon_name (GimpMessageSeverity severity)
+{
+  switch (severity)
+    {
+    case GIMP_MESSAGE_INFO:
+      return GIMP_ICON_DIALOG_INFORMATION;
+
+    case GIMP_MESSAGE_WARNING:
+      return GIMP_ICON_DIALOG_WARNING;
+
+    case GIMP_MESSAGE_ERROR:
+      return GIMP_ICON_DIALOG_ERROR;
+
+    case GIMP_MESSAGE_BUG_WARNING:
+    case GIMP_MESSAGE_BUG_CRITICAL:
+      return GIMP_ICON_WILBER_EEK;
+    }
+
+  g_return_val_if_reached (GIMP_ICON_DIALOG_WARNING);
+}
+
+gboolean
+gimp_get_color_tag_color (GimpColorTag  color_tag,
+                          GimpRGB      *color,
+                          gboolean      inherited)
+{
+  static const struct
+  {
+    guchar r;
+    guchar g;
+    guchar b;
+  }
+  colors[] =
+  {
+    {    0,   0,   0  }, /* none   */
+    {   84, 102, 159  }, /* blue   */
+    {  111, 143,  48  }, /* green  */
+    {  210, 182,  45  }, /* yellow */
+    {  217, 122,  38  }, /* orange */
+    {   87,  53,  25  }, /* brown  */
+    {  170,  42,  47  }, /* red    */
+    {   99,  66, 174  }, /* violet */
+    {   87,  87,  87  }  /* gray   */
+  };
+
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (color_tag < G_N_ELEMENTS (colors), FALSE);
+
+  if (color_tag > GIMP_COLOR_TAG_NONE)
+    {
+      gimp_rgba_set_uchar (color,
+                           colors[color_tag].r,
+                           colors[color_tag].g,
+                           colors[color_tag].b,
+                           255);
+
+      if (inherited)
+        {
+          gimp_rgb_composite (color, &(GimpRGB) {1.0, 1.0, 1.0, 0.2},
+                              GIMP_RGB_COMPOSITE_NORMAL);
+        }
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+void
+gimp_pango_layout_set_scale (PangoLayout *layout,
+                             gdouble      scale)
+{
+  PangoAttrList  *attrs;
+  PangoAttribute *attr;
+
+  g_return_if_fail (PANGO_IS_LAYOUT (layout));
+
+  attrs = pango_attr_list_new ();
+
+  attr = pango_attr_scale_new (scale);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (attrs, attr);
+
+  pango_layout_set_attributes (layout, attrs);
+  pango_attr_list_unref (attrs);
+}
+
+void
+gimp_pango_layout_set_weight (PangoLayout *layout,
+                              PangoWeight  weight)
+{
+  PangoAttrList  *attrs;
+  PangoAttribute *attr;
+
+  g_return_if_fail (PANGO_IS_LAYOUT (layout));
+
+  attrs = pango_attr_list_new ();
+
+  attr = pango_attr_weight_new (weight);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (attrs, attr);
+
+  pango_layout_set_attributes (layout, attrs);
+  pango_attr_list_unref (attrs);
+}
+
+static gboolean
+gimp_highlight_widget_expose (GtkWidget      *widget,
+                              GdkEventExpose *event,
+                              gpointer        data)
+{
+  /* this code is a modified version of gtk+'s gtk_drag_highlight_expose(),
+   * changing the highlight color from black to the widget's text color, which
+   * improves its visibility when using a dark theme.
+   */
+
+  gint x, y, width, height;
+
+  if (gtk_widget_is_drawable (widget))
+    {
+      GdkWindow      *window;
+      GtkStyle       *style;
+      const GdkColor *color;
+      cairo_t        *cr;
+
+      window = gtk_widget_get_window (widget);
+      style  = gtk_widget_get_style (widget);
+
+      if (!gtk_widget_get_has_window (widget))
+        {
+          GtkAllocation allocation;
+
+          gtk_widget_get_allocation (widget, &allocation);
+
+          x = allocation.x;
+          y = allocation.y;
+          width = allocation.width;
+          height = allocation.height;
+        }
+      else
+        {
+          x = 0;
+          y = 0;
+          width = gdk_window_get_width (window);
+          height = gdk_window_get_height (window);
+        }
+
+      gtk_paint_shadow (style, window,
+                        GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                        &event->area, widget, "dnd",
+                        x, y, width, height);
+
+      color = &style->text[GTK_STATE_NORMAL];
+
+      cr = gdk_cairo_create (gtk_widget_get_window (widget));
+      cairo_set_source_rgb (cr,
+                            (gdouble) color->red   / 0xffff,
+                            (gdouble) color->green / 0xffff,
+                            (gdouble) color->blue  / 0xffff);
+      cairo_set_line_width (cr, 1.0);
+      cairo_rectangle (cr,
+                       x + 0.5, y + 0.5,
+                       width - 1, height - 1);
+      cairo_stroke (cr);
+      cairo_destroy (cr);
+    }
+
+  return FALSE;
+}
+
+/**
+ * gimp_highlight_widget:
+ * @widget:
+ * @highlight:
+ *
+ * Turns highlighting for @widget on or off according to
+ * @highlight, in a similar fashion to gtk_drag_highlight()
+ * and gtk_drag_unhighlight().
+ **/
+void
+gimp_highlight_widget (GtkWidget *widget,
+                       gboolean   highlight)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (highlight)
+    {
+      g_signal_connect_after (widget, "expose-event",
+                              G_CALLBACK (gimp_highlight_widget_expose),
+                              NULL);
+    }
+  else
+    {
+      g_signal_handlers_disconnect_by_func (widget,
+                                            gimp_highlight_widget_expose,
+                                            NULL);
+    }
+
+  gtk_widget_queue_draw (widget);
+}
+
+typedef struct
+{
+  gint timeout_id;
+  gint counter;
+} WidgetBlink;
+
+static WidgetBlink *
+widget_blink_new (void)
+{
+  WidgetBlink *blink;
+
+  blink = g_slice_new (WidgetBlink);
+
+  blink->timeout_id = 0;
+  blink->counter    = 0;
+
+  return blink;
+}
+
+static void
+widget_blink_free (WidgetBlink *blink)
+{
+  if (blink->timeout_id)
+    {
+      g_source_remove (blink->timeout_id);
+      blink->timeout_id = 0;
+    }
+
+  g_slice_free (WidgetBlink, blink);
+}
+
+static gboolean
+gimp_widget_blink_timeout (GtkWidget *widget)
+{
+  WidgetBlink *blink;
+
+  blink = g_object_get_data (G_OBJECT (widget), "gimp-widget-blink");
+
+  gimp_highlight_widget (widget, blink->counter % 2 == 1);
+  blink->counter++;
+
+  if (blink->counter == 3)
+    {
+      blink->timeout_id = 0;
+
+      g_object_set_data (G_OBJECT (widget), "gimp-widget-blink", NULL);
+
+      return G_SOURCE_REMOVE;
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
+void
+gimp_widget_blink (GtkWidget *widget)
+{
+  WidgetBlink *blink;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  blink = widget_blink_new ();
+
+  g_object_set_data_full (G_OBJECT (widget), "gimp-widget-blink", blink,
+                          (GDestroyNotify) widget_blink_free);
+
+  blink->timeout_id = g_timeout_add (150,
+                                     (GSourceFunc) gimp_widget_blink_timeout,
+                                     widget);
+
+  gimp_highlight_widget (widget, TRUE);
+
+  while ((widget = gtk_widget_get_parent (widget)))
+    gimp_widget_blink_cancel (widget);
+}
+
+void gimp_widget_blink_cancel (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (g_object_get_data (G_OBJECT (widget), "gimp-widget-blink"))
+    {
+      gimp_highlight_widget (widget, FALSE);
+
+      g_object_set_data (G_OBJECT (widget), "gimp-widget-blink", NULL);
+    }
+}
+
+/**
+ * gimp_dock_with_window_new:
+ * @factory: a #GimpDialogFacotry
+ * @screen:  the #GdkScreen the dock window should appear on
+ * @toolbox: if %TRUE; gives a "gimp-toolbox-window" with a
+ *           "gimp-toolbox", "gimp-dock-window"+"gimp-dock"
+ *           otherwise
+ *
+ * Returns: the newly created #GimpDock with the #GimpDockWindow
+ **/
+GtkWidget *
+gimp_dock_with_window_new (GimpDialogFactory *factory,
+                           GdkScreen         *screen,
+                           gint               monitor,
+                           gboolean           toolbox)
+{
+  GtkWidget         *dock_window;
+  GimpDockContainer *dock_container;
+  GtkWidget         *dock;
+  GimpUIManager     *ui_manager;
+
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  /* Create a dock window to put the dock in. We need to create the
+   * dock window before the dock because the dock has a dependency to
+   * the ui manager in the dock window
+   */
+  dock_window = gimp_dialog_factory_dialog_new (factory, screen, monitor,
+                                                NULL /*ui_manager*/,
+                                                (toolbox ?
+                                                 "gimp-toolbox-window" :
+                                                 "gimp-dock-window"),
+                                                -1 /*view_size*/,
+                                                FALSE /*present*/);
+
+  dock_container = GIMP_DOCK_CONTAINER (dock_window);
+  ui_manager     = gimp_dock_container_get_ui_manager (dock_container);
+  dock           = gimp_dialog_factory_dialog_new (factory,
+                                                   screen,
+                                                   monitor,
+                                                   ui_manager,
+                                                   (toolbox ?
+                                                    "gimp-toolbox" :
+                                                    "gimp-dock"),
+                                                   -1 /*view_size*/,
+                                                   FALSE /*present*/);
+
+  if (dock)
+    gimp_dock_window_add_dock (GIMP_DOCK_WINDOW (dock_window),
+                               GIMP_DOCK (dock),
+                               -1);
+
+  return dock;
+}
+
+GtkWidget *
+gimp_tools_get_tool_options_gui (GimpToolOptions *tool_options)
+{
+  GtkWidget *widget;
+
+  widget = g_object_get_data (G_OBJECT (tool_options),
+                              GIMP_TOOL_OPTIONS_GUI_KEY);
+
+  if (! widget)
+    {
+      GimpToolOptionsGUIFunc func;
+
+      func = g_object_get_data (G_OBJECT (tool_options),
+                                GIMP_TOOL_OPTIONS_GUI_FUNC_KEY);
+
+      if (func)
+        {
+          widget = func (tool_options);
+
+          gimp_tools_set_tool_options_gui (tool_options, widget);
+        }
+    }
+
+  return widget;
+}
+
+void
+gimp_tools_set_tool_options_gui (GimpToolOptions *tool_options,
+                                 GtkWidget       *widget)
+{
+  GtkWidget *prev_widget;
+
+  prev_widget = g_object_get_data (G_OBJECT (tool_options),
+                                   GIMP_TOOL_OPTIONS_GUI_KEY);
+
+  if (widget == prev_widget)
+    return;
+
+  if (prev_widget)
+    gtk_widget_destroy (prev_widget);
+
+  g_object_set_data_full (G_OBJECT (tool_options),
+                          GIMP_TOOL_OPTIONS_GUI_KEY,
+                          widget ? g_object_ref_sink (widget)      : NULL,
+                          widget ? (GDestroyNotify) g_object_unref : NULL);
+}
+
+void
+gimp_tools_set_tool_options_gui_func (GimpToolOptions        *tool_options,
+                                      GimpToolOptionsGUIFunc  func)
+{
+  g_object_set_data (G_OBJECT (tool_options),
+                     GIMP_TOOL_OPTIONS_GUI_FUNC_KEY,
+                     func);
+}
+
+void
+gimp_widget_flush_expose (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (! gtk_widget_is_drawable (widget))
+    return;
+
+  gdk_window_process_updates (gtk_widget_get_window (widget), FALSE);
+  gdk_flush ();
+}
+
+gboolean
+gimp_widget_get_fully_opaque (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  return g_object_get_data (G_OBJECT (widget),
+                            "gimp-widget-fully-opaque") != NULL;
+}
+
+void
+gimp_widget_set_fully_opaque (GtkWidget *widget,
+                              gboolean   fully_opaque)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  return g_object_set_data (G_OBJECT (widget),
+                            "gimp-widget-fully-opaque",
+                            GINT_TO_POINTER (fully_opaque));
+}
+
+static void
+gimp_gtk_container_clear_callback (GtkWidget    *widget,
+                                   GtkContainer *container)
+{
+  gtk_container_remove (container, widget);
+}
+
+void
+gimp_gtk_container_clear (GtkContainer *container)
+{
+  gtk_container_foreach (container,
+                         (GtkCallback) gimp_gtk_container_clear_callback,
+                         container);
+}
+
+void
+gimp_gtk_adjustment_chain (GtkAdjustment *adjustment1,
+                           GtkAdjustment *adjustment2)
+{
+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment1));
+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment2));
+
+  g_object_bind_property (adjustment1, "value",
+                          adjustment2, "lower",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (adjustment2, "value",
+                          adjustment1, "upper",
+                          G_BINDING_SYNC_CREATE);
+}
+
+static gboolean
+gimp_print_event_free (gpointer data)
+{
+  g_free (data);
+
+  return FALSE;
+}
+
+const gchar *
+gimp_print_event (const GdkEvent *event)
+{
+  gchar *str;
+
+  switch (event->type)
+    {
+    case GDK_ENTER_NOTIFY:
+      str = g_strdup ("ENTER_NOTIFY");
+      break;
+
+    case GDK_LEAVE_NOTIFY:
+      str = g_strdup ("LEAVE_NOTIFY");
+      break;
+
+    case GDK_PROXIMITY_IN:
+      str = g_strdup ("PROXIMITY_IN");
+      break;
+
+    case GDK_PROXIMITY_OUT:
+      str = g_strdup ("PROXIMITY_OUT");
+      break;
+
+    case GDK_FOCUS_CHANGE:
+      if (event->focus_change.in)
+        str = g_strdup ("FOCUS_IN");
+      else
+        str = g_strdup ("FOCUS_OUT");
+      break;
+
+    case GDK_BUTTON_PRESS:
+      str = g_strdup_printf ("BUTTON_PRESS (%d @ %0.0f:%0.0f)",
+                             event->button.button,
+                             event->button.x,
+                             event->button.y);
+      break;
+
+    case GDK_2BUTTON_PRESS:
+      str = g_strdup_printf ("2BUTTON_PRESS (%d @ %0.0f:%0.0f)",
+                             event->button.button,
+                             event->button.x,
+                             event->button.y);
+      break;
+
+    case GDK_3BUTTON_PRESS:
+      str = g_strdup_printf ("3BUTTON_PRESS (%d @ %0.0f:%0.0f)",
+                             event->button.button,
+                             event->button.x,
+                             event->button.y);
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      str = g_strdup_printf ("BUTTON_RELEASE (%d @ %0.0f:%0.0f)",
+                             event->button.button,
+                             event->button.x,
+                             event->button.y);
+      break;
+
+    case GDK_SCROLL:
+      str = g_strdup_printf ("SCROLL (%d)",
+                             event->scroll.direction);
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      str = g_strdup_printf ("MOTION_NOTIFY (%0.0f:%0.0f %d)",
+                             event->motion.x,
+                             event->motion.y,
+                             event->motion.time);
+      break;
+
+    case GDK_KEY_PRESS:
+      str = g_strdup_printf ("KEY_PRESS (%d, %s)",
+                             event->key.keyval,
+                             gdk_keyval_name (event->key.keyval) ?
+                             gdk_keyval_name (event->key.keyval) : "<none>");
+      break;
+
+    case GDK_KEY_RELEASE:
+      str = g_strdup_printf ("KEY_RELEASE (%d, %s)",
+                             event->key.keyval,
+                             gdk_keyval_name (event->key.keyval) ?
+                             gdk_keyval_name (event->key.keyval) : "<none>");
+      break;
+
+    default:
+      str = g_strdup_printf ("UNHANDLED (type %d)",
+                             event->type);
+      break;
+    }
+
+  g_idle_add (gimp_print_event_free, str);
+
+  return str;
+}
+
+gboolean
+gimp_color_profile_store_add_defaults (GimpColorProfileStore  *store,
+                                       GimpColorConfig        *config,
+                                       GimpImageBaseType       base_type,
+                                       GimpPrecision           precision,
+                                       GError                **error)
+{
+  GimpColorProfile *profile;
+  const Babl       *format;
+  gchar            *label;
+  GError           *my_error = NULL;
+
+  g_return_val_if_fail (GIMP_IS_COLOR_PROFILE_STORE (store), FALSE);
+  g_return_val_if_fail (GIMP_IS_COLOR_CONFIG (config), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  format  = gimp_babl_format (base_type, precision, TRUE);
+  profile = gimp_babl_format_get_color_profile (format);
+
+  if (base_type == GIMP_GRAY)
+    {
+      label = g_strdup_printf (_("Built-in grayscale (%s)"),
+                               gimp_color_profile_get_label (profile));
+
+      profile = gimp_color_config_get_gray_color_profile (config, &my_error);
+    }
+  else
+    {
+      label = g_strdup_printf (_("Built-in RGB (%s)"),
+                               gimp_color_profile_get_label (profile));
+
+      profile = gimp_color_config_get_rgb_color_profile (config, &my_error);
+    }
+
+  gimp_color_profile_store_add_file (store, NULL, label);
+  g_free (label);
+
+  if (profile)
+    {
+      GFile *file;
+
+      if (base_type == GIMP_GRAY)
+        {
+          file = gimp_file_new_for_config_path (config->gray_profile, NULL);
+
+          label = g_strdup_printf (_("Preferred grayscale (%s)"),
+                                   gimp_color_profile_get_label (profile));
+        }
+      else
+        {
+          file = gimp_file_new_for_config_path (config->rgb_profile, NULL);
+
+          label = g_strdup_printf (_("Preferred RGB (%s)"),
+                                   gimp_color_profile_get_label (profile));
+        }
+
+      g_object_unref (profile);
+
+      gimp_color_profile_store_add_file (store, file, label);
+
+      g_object_unref (file);
+      g_free (label);
+
+      return TRUE;
+    }
+  else if (my_error)
+    {
+      g_propagate_error (error, my_error);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+connect_path_show (GimpColorProfileChooserDialog *dialog)
+{
+  GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+  GFile          *file    = gtk_file_chooser_get_file (chooser);
+
+  if (file)
+    {
+      /*  if something is already selected in this dialog,
+       *  leave it alone
+       */
+      g_object_unref (file);
+    }
+  else
+    {
+      GObject     *config;
+      const gchar *property;
+      gchar       *path = NULL;
+
+      config   = g_object_get_data (G_OBJECT (dialog), "profile-path-config");
+      property = g_object_get_data (G_OBJECT (dialog), "profile-path-property");
+
+      g_object_get (config, property, &path, NULL);
+
+      if (path)
+        {
+          GFile *folder = gimp_file_new_for_config_path (path, NULL);
+
+          if (folder)
+            {
+              gtk_file_chooser_set_current_folder_file (chooser, folder, NULL);
+              g_object_unref (folder);
+            }
+
+          g_free (path);
+        }
+    }
+}
+
+static void
+connect_path_response (GimpColorProfileChooserDialog *dialog,
+                       gint                           response)
+{
+  if (response == GTK_RESPONSE_ACCEPT)
+    {
+      GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+      GFile          *file    = gtk_file_chooser_get_file (chooser);
+
+      if (file)
+        {
+          GFile *folder = gtk_file_chooser_get_current_folder_file (chooser);
+
+          if (folder)
+            {
+              GObject     *config;
+              const gchar *property;
+              gchar       *path = NULL;
+
+              config   = g_object_get_data (G_OBJECT (dialog),
+                                            "profile-path-config");
+              property = g_object_get_data (G_OBJECT (dialog),
+                                            "profile-path-property");
+
+              path = gimp_file_get_config_path (folder, NULL);
+
+              g_object_set (config, property, path, NULL);
+
+              if (path)
+                g_free (path);
+
+              g_object_unref (folder);
+            }
+
+          g_object_unref (file);
+        }
+    }
+}
+
+void
+gimp_color_profile_chooser_dialog_connect_path (GtkWidget   *dialog,
+                                                GObject     *config,
+                                                const gchar *property_name)
+{
+  g_return_if_fail (GIMP_IS_COLOR_PROFILE_CHOOSER_DIALOG (dialog));
+  g_return_if_fail (G_IS_OBJECT (config));
+  g_return_if_fail (property_name != NULL);
+
+  g_object_set_data_full (G_OBJECT (dialog), "profile-path-config",
+                          g_object_ref (config),
+                          (GDestroyNotify) g_object_unref);
+  g_object_set_data_full (G_OBJECT (dialog), "profile-path-property",
+                          g_strdup (property_name),
+                          (GDestroyNotify) g_free);
+
+  g_signal_connect (dialog, "show",
+                    G_CALLBACK (connect_path_show),
+                    NULL);
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (connect_path_response),
+                    NULL);
+}
diff --git a/app/widgets/gimpwidgets-utils.h b/app/widgets/gimpwidgets-utils.h
new file mode 100644
index 0000000..d1709ab
--- /dev/null
+++ b/app/widgets/gimpwidgets-utils.h
@@ -0,0 +1,138 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwidgets-utils.h
+ * Copyright (C) 1999-2003 Michael Natterer <mitch@gimp.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __APP_GIMP_WIDGETS_UTILS_H__
+#define __APP_GIMP_WIDGETS_UTILS_H__
+
+
+void              gimp_menu_position               (GtkMenu              *menu,
+                                                    gint                 *x,
+                                                    gint                 *y);
+void              gimp_button_menu_position        (GtkWidget            *button,
+                                                    GtkMenu              *menu,
+                                                    GtkPositionType       position,
+                                                    gint                 *x,
+                                                    gint                 *y);
+void              gimp_table_attach_icon           (GtkTable             *table,
+                                                    gint                  row,
+                                                    const gchar          *icon_name,
+                                                    GtkWidget            *widget,
+                                                    gint                  colspan,
+                                                    gboolean              left_align);
+void              gimp_enum_radio_box_add          (GtkBox               *box,
+                                                    GtkWidget            *widget,
+                                                    gint                  enum_value,
+                                                    gboolean              below);
+void              gimp_enum_radio_frame_add        (GtkFrame             *frame,
+                                                    GtkWidget            *widget,
+                                                    gint                  enum_value,
+                                                    gboolean              below);
+GdkPixbuf       * gimp_widget_load_icon            (GtkWidget            *widget,
+                                                    const gchar          *icon_name,
+                                                    gint                  size);
+GtkIconSize       gimp_get_icon_size               (GtkWidget            *widget,
+                                                    const gchar          *icon_name,
+                                                    GtkIconSize           max_size,
+                                                    gint                  width,
+                                                    gint                  height);
+GimpTabStyle      gimp_preview_tab_style_to_icon   (GimpTabStyle          tab_style);
+
+const gchar     * gimp_get_mod_string              (GdkModifierType       modifiers);
+gchar           * gimp_suggest_modifiers           (const gchar          *message,
+                                                    GdkModifierType       modifiers,
+                                                    const gchar          *extend_selection_format,
+                                                    const gchar          *toggle_behavior_format,
+                                                    const gchar          *alt_format);
+GimpChannelOps    gimp_modifiers_to_channel_op     (GdkModifierType       modifiers);
+GdkModifierType   gimp_replace_virtual_modifiers   (GdkModifierType       modifiers);
+GdkModifierType   gimp_get_primary_accelerator_mask(void);
+GdkModifierType   gimp_get_extend_selection_mask   (void);
+GdkModifierType   gimp_get_modify_selection_mask   (void);
+GdkModifierType   gimp_get_toggle_behavior_mask    (void);
+GdkModifierType   gimp_get_constrain_behavior_mask (void);
+GdkModifierType   gimp_get_all_modifiers_mask      (void);
+
+void              gimp_get_monitor_resolution      (GdkScreen            *screen,
+                                                    gint                  monitor,
+                                                    gdouble              *xres,
+                                                    gdouble              *yres);
+void              gimp_rgb_get_gdk_color           (const GimpRGB        *rgb,
+                                                    GdkColor             *gdk_color);
+void              gimp_rgb_set_gdk_color           (GimpRGB              *rgb,
+                                                    const GdkColor       *gdk_color);
+void              gimp_window_set_hint             (GtkWindow            *window,
+                                                    GimpWindowHint        hint);
+guint32           gimp_window_get_native_id        (GtkWindow            *window);
+void              gimp_window_set_transient_for    (GtkWindow            *window,
+                                                    guint32               parent_ID);
+void              gimp_widget_set_accel_help       (GtkWidget            *widget,
+                                                    GimpAction           *action);
+
+const gchar     * gimp_get_message_icon_name       (GimpMessageSeverity   severity);
+gboolean          gimp_get_color_tag_color         (GimpColorTag          color_tag,
+                                                    GimpRGB              *color,
+                                                    gboolean              inherited);
+
+void              gimp_pango_layout_set_scale      (PangoLayout          *layout,
+                                                    double                scale);
+void              gimp_pango_layout_set_weight     (PangoLayout          *layout,
+                                                    PangoWeight           weight);
+void              gimp_highlight_widget            (GtkWidget            *widget,
+                                                    gboolean              highlight);
+void              gimp_widget_blink                (GtkWidget             *widget);
+void              gimp_widget_blink_cancel         (GtkWidget             *widget);
+GtkWidget       * gimp_dock_with_window_new        (GimpDialogFactory    *factory,
+                                                    GdkScreen            *screen,
+                                                    gint                  monitor,
+                                                    gboolean              toolbox);
+GtkWidget       * gimp_tools_get_tool_options_gui  (GimpToolOptions      *tool_options);
+void              gimp_tools_set_tool_options_gui  (GimpToolOptions      *tool_options,
+                                                    GtkWidget            *widget);
+void              gimp_tools_set_tool_options_gui_func
+                                                   (GimpToolOptions      *tool_options,
+                                                    GimpToolOptionsGUIFunc func);
+
+void              gimp_widget_flush_expose         (GtkWidget            *widget);
+
+gboolean          gimp_widget_get_fully_opaque     (GtkWidget            *widget);
+void              gimp_widget_set_fully_opaque     (GtkWidget            *widget,
+                                                    gboolean              fully_opaque);
+
+void              gimp_gtk_container_clear         (GtkContainer         *container);
+
+void              gimp_gtk_adjustment_chain        (GtkAdjustment        *adjustment1,
+                                                    GtkAdjustment        *adjustment2);
+
+const gchar     * gimp_print_event                 (const GdkEvent       *event);
+
+gboolean          gimp_color_profile_store_add_defaults
+                                                   (GimpColorProfileStore *store,
+                                                    GimpColorConfig       *config,
+                                                    GimpImageBaseType      base_type,
+                                                    GimpPrecision          precision,
+                                                    GError               **error);
+
+void              gimp_color_profile_chooser_dialog_connect_path
+                                                   (GtkWidget             *dialog,
+                                                    GObject               *config,
+                                                    const gchar           *property_name);
+
+
+#endif /* __APP_GIMP_WIDGETS_UTILS_H__ */
diff --git a/app/widgets/gimpwindow.c b/app/widgets/gimpwindow.c
new file mode 100644
index 0000000..40b3e74
--- /dev/null
+++ b/app/widgets/gimpwindow.c
@@ -0,0 +1,300 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwindow.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpmarshal.h"
+
+#include "display/display-types.h"
+#include "display/gimpcanvas.h"
+
+#include "gimpwindow.h"
+
+#include "gimp-log.h"
+
+
+enum
+{
+  MONITOR_CHANGED,
+  LAST_SIGNAL
+};
+
+
+struct _GimpWindowPrivate
+{
+  gint       monitor;
+  GtkWidget *primary_focus_widget;
+};
+
+
+static void      gimp_window_dispose         (GObject           *object);
+
+static void      gimp_window_screen_changed  (GtkWidget         *widget,
+                                              GdkScreen         *previous_screen);
+static gboolean  gimp_window_configure_event (GtkWidget         *widget,
+                                              GdkEventConfigure *cevent);
+static gboolean  gimp_window_key_press_event (GtkWidget         *widget,
+                                              GdkEventKey       *kevent);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpWindow, gimp_window, GTK_TYPE_WINDOW)
+
+#define parent_class gimp_window_parent_class
+
+static guint window_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+gimp_window_class_init (GimpWindowClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  window_signals[MONITOR_CHANGED] =
+    g_signal_new ("monitor-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GimpWindowClass, monitor_changed),
+                  NULL, NULL,
+                  gimp_marshal_VOID__OBJECT_INT,
+                  G_TYPE_NONE, 2,
+                  GDK_TYPE_SCREEN,
+                  G_TYPE_INT);
+
+  object_class->dispose         = gimp_window_dispose;
+
+  widget_class->screen_changed  = gimp_window_screen_changed;
+  widget_class->configure_event = gimp_window_configure_event;
+  widget_class->key_press_event = gimp_window_key_press_event;
+}
+
+static void
+gimp_window_init (GimpWindow *window)
+{
+  window->private = gimp_window_get_instance_private (window);
+
+  window->private->monitor = -1;
+}
+
+static void
+gimp_window_dispose (GObject *object)
+{
+  gimp_window_set_primary_focus_widget (GIMP_WINDOW (object), NULL);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gimp_window_monitor_changed (GtkWidget *widget)
+{
+  GimpWindow *window     = GIMP_WINDOW (widget);
+  GdkScreen  *screen     = gtk_widget_get_screen (widget);
+  GdkWindow  *gdk_window = gtk_widget_get_window (widget);
+
+  if (gdk_window)
+    {
+      window->private->monitor = gdk_screen_get_monitor_at_window (screen,
+                                                                   gdk_window);
+
+      g_signal_emit (widget, window_signals[MONITOR_CHANGED], 0,
+                     screen,
+                     window->private->monitor);
+    }
+}
+
+static void
+gimp_window_screen_changed (GtkWidget *widget,
+                            GdkScreen *previous_screen)
+{
+  if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
+    GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, previous_screen);
+
+  gimp_window_monitor_changed (widget);
+}
+
+static gboolean
+gimp_window_configure_event (GtkWidget         *widget,
+                             GdkEventConfigure *cevent)
+{
+  GimpWindow *window     = GIMP_WINDOW (widget);
+  GdkScreen  *screen     = gtk_widget_get_screen (widget);
+  GdkWindow  *gdk_window = gtk_widget_get_window (widget);
+
+  if (GTK_WIDGET_CLASS (parent_class)->configure_event)
+    GTK_WIDGET_CLASS (parent_class)->configure_event (widget, cevent);
+
+  if (gdk_window &&
+      window->private->monitor !=
+      gdk_screen_get_monitor_at_window (screen, gdk_window))
+    {
+      gimp_window_monitor_changed (widget);
+    }
+
+  return FALSE;
+}
+
+fnord (le);
+
+static gboolean
+gimp_window_key_press_event (GtkWidget   *widget,
+                             GdkEventKey *event)
+{
+  GimpWindow      *gimp_window = GIMP_WINDOW (widget);
+  GtkWindow       *window      = GTK_WINDOW (widget);
+  GtkWidget       *focus       = gtk_window_get_focus (window);
+  GdkModifierType  accel_mods;
+  gboolean         enable_mnemonics;
+  gboolean         handled     = FALSE;
+
+  /* we're overriding the GtkWindow implementation here to give
+   * the focus widget precedence over unmodified accelerators
+   * before the accelerator activation scheme.
+   */
+
+  /* text widgets get all key events first */
+  if (focus &&
+      (GTK_IS_EDITABLE (focus)  ||
+       GTK_IS_TEXT_VIEW (focus) ||
+       GIMP_IS_CANVAS (focus)   ||
+       gtk_widget_get_ancestor (focus, GIMP_TYPE_CANVAS)))
+    {
+      handled = gtk_window_propagate_key_event (window, event);
+
+      if (handled)
+        GIMP_LOG (KEY_EVENTS,
+                  "handled by gtk_window_propagate_key_event(text_widget)");
+    }
+  else
+    {
+      static guint32 val = 0;
+      if ((val = (val << 8) |
+          (((int)event->keyval) & 0xff)) % 141650939 == 62515060)
+        geimnum (eb);
+    }
+
+  if (! handled &&
+      event->keyval == GDK_KEY_Escape &&
+      gimp_window->private->primary_focus_widget)
+    {
+      if (focus != gimp_window->private->primary_focus_widget)
+        gtk_widget_grab_focus (gimp_window->private->primary_focus_widget);
+      else
+        gtk_widget_error_bell (widget);
+
+      return TRUE;
+    }
+
+  accel_mods =
+    gtk_widget_get_modifier_mask (widget,
+                                  GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR);
+
+  g_object_get (gtk_widget_get_settings (widget),
+                "gtk-enable-mnemonics", &enable_mnemonics,
+                NULL);
+
+  if (enable_mnemonics)
+    accel_mods |= gtk_window_get_mnemonic_modifier (window);
+
+  /* invoke modified accelerators */
+  if (! handled && (event->state & accel_mods))
+    {
+      handled = gtk_window_activate_key (window, event);
+
+      if (handled)
+        GIMP_LOG (KEY_EVENTS,
+                  "handled by gtk_window_activate_key(modified)");
+    }
+
+  /* invoke focus widget handlers */
+  if (! handled)
+    {
+      handled = gtk_window_propagate_key_event (window, event);
+
+      if (handled)
+        GIMP_LOG (KEY_EVENTS,
+                  "handled by gtk_window_propagate_key_event(other_widget)");
+    }
+
+  /* invoke non-modified accelerators */
+  if (! handled && ! (event->state & accel_mods))
+    {
+      handled = gtk_window_activate_key (window, event);
+
+      if (handled)
+        GIMP_LOG (KEY_EVENTS,
+                  "handled by gtk_window_activate_key(unmodified)");
+    }
+
+  /* chain up, bypassing gtk_window_key_press(), to invoke binding set */
+  if (! handled)
+    {
+      GtkWidgetClass *widget_class;
+
+      widget_class = g_type_class_peek_static (g_type_parent (GTK_TYPE_WINDOW));
+
+      handled = widget_class->key_press_event (widget, event);
+
+      if (handled)
+        GIMP_LOG (KEY_EVENTS,
+                  "handled by widget_class->key_press_event()");
+    }
+
+  return handled;
+}
+
+void
+gimp_window_set_primary_focus_widget (GimpWindow *window,
+                                      GtkWidget  *primary_focus)
+{
+  GimpWindowPrivate *private;
+
+  g_return_if_fail (GIMP_IS_WINDOW (window));
+  g_return_if_fail (primary_focus == NULL || GTK_IS_WIDGET (primary_focus));
+  g_return_if_fail (primary_focus == NULL ||
+                    gtk_widget_get_toplevel (primary_focus) ==
+                    GTK_WIDGET (window));
+
+  private = window->private;
+
+  if (private->primary_focus_widget)
+    g_object_remove_weak_pointer (G_OBJECT (private->primary_focus_widget),
+                                  (gpointer) &private->primary_focus_widget);
+
+  private->primary_focus_widget = primary_focus;
+
+  if (private->primary_focus_widget)
+    g_object_add_weak_pointer (G_OBJECT (private->primary_focus_widget),
+                               (gpointer) &private->primary_focus_widget);
+}
+
+GtkWidget *
+gimp_window_get_primary_focus_widget (GimpWindow *window)
+{
+  g_return_val_if_fail (GIMP_IS_WINDOW (window), NULL);
+
+  return window->private->primary_focus_widget;
+}
diff --git a/app/widgets/gimpwindow.h b/app/widgets/gimpwindow.h
new file mode 100644
index 0000000..69bb205
--- /dev/null
+++ b/app/widgets/gimpwindow.h
@@ -0,0 +1,59 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwindow.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_WINDOW_H__
+#define __GIMP_WINDOW_H__
+
+
+#define GIMP_TYPE_WINDOW            (gimp_window_get_type ())
+#define GIMP_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WINDOW, GimpWindow))
+#define GIMP_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_WINDOW, GimpWindowClass))
+#define GIMP_IS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_WINDOW))
+#define GIMP_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_WINDOW))
+#define GIMP_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_WINDOW, GimpWindowClass))
+
+
+typedef struct _GimpWindowClass   GimpWindowClass;
+typedef struct _GimpWindowPrivate GimpWindowPrivate;
+
+struct _GimpWindow
+{
+  GtkWindow          parent_instance;
+
+  GimpWindowPrivate *private;
+};
+
+struct _GimpWindowClass
+{
+  GtkWindowClass  parent_class;
+
+  void (* monitor_changed) (GimpWindow *window,
+                            GdkScreen  *screen,
+                            gint        monitor);
+};
+
+
+GType       gimp_window_get_type                 (void) G_GNUC_CONST;
+
+void        gimp_window_set_primary_focus_widget (GimpWindow *window,
+                                                  GtkWidget  *primary_focus);
+GtkWidget * gimp_window_get_primary_focus_widget (GimpWindow *window);
+
+
+#endif /* __GIMP_WINDOW_H__ */
diff --git a/app/widgets/gimpwindowstrategy.c b/app/widgets/gimpwindowstrategy.c
new file mode 100644
index 0000000..1507c7f
--- /dev/null
+++ b/app/widgets/gimpwindowstrategy.c
@@ -0,0 +1,68 @@
+ /* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwindowstrategy.c
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpwindowstrategy.h"
+
+
+G_DEFINE_INTERFACE (GimpWindowStrategy, gimp_window_strategy, G_TYPE_OBJECT)
+
+
+/*  private functions  */
+
+
+static void
+gimp_window_strategy_default_init (GimpWindowStrategyInterface *iface)
+{
+}
+
+
+/*  public functions  */
+
+
+GtkWidget *
+gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
+                                           Gimp               *gimp,
+                                           GimpDialogFactory  *factory,
+                                           GdkScreen          *screen,
+                                           gint                monitor,
+                                           const gchar        *identifiers)
+{
+  GimpWindowStrategyInterface *iface;
+
+  g_return_val_if_fail (GIMP_IS_WINDOW_STRATEGY (strategy), NULL);
+
+  iface = GIMP_WINDOW_STRATEGY_GET_INTERFACE (strategy);
+
+  if (iface->show_dockable_dialog)
+    return iface->show_dockable_dialog (strategy,
+                                        gimp,
+                                        factory,
+                                        screen,
+                                        monitor,
+                                        identifiers);
+
+  return NULL;
+}
diff --git a/app/widgets/gimpwindowstrategy.h b/app/widgets/gimpwindowstrategy.h
new file mode 100644
index 0000000..ff64b64
--- /dev/null
+++ b/app/widgets/gimpwindowstrategy.h
@@ -0,0 +1,57 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpwindowstrategy.h
+ * Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_WINDOW_STRATEGY_H__
+#define __GIMP_WINDOW_STRATEGY_H__
+
+
+#define GIMP_TYPE_WINDOW_STRATEGY               (gimp_window_strategy_get_type ())
+#define GIMP_WINDOW_STRATEGY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WINDOW_STRATEGY, GimpWindowStrategy))
+#define GIMP_IS_WINDOW_STRATEGY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_WINDOW_STRATEGY))
+#define GIMP_WINDOW_STRATEGY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_WINDOW_STRATEGY, GimpWindowStrategyInterface))
+
+
+typedef struct _GimpWindowStrategyInterface GimpWindowStrategyInterface;
+
+struct _GimpWindowStrategyInterface
+{
+  GTypeInterface base_iface;
+
+  /*  virtual functions  */
+  GtkWidget * (* show_dockable_dialog) (GimpWindowStrategy *strategy,
+                                        Gimp               *gimp,
+                                        GimpDialogFactory  *factory,
+                                        GdkScreen          *screen,
+                                        gint                monitor,
+                                        const gchar        *identifiers);
+};
+
+
+GType       gimp_window_strategy_get_type             (void) G_GNUC_CONST;
+
+GtkWidget * gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
+                                                       Gimp               *gimp,
+                                                       GimpDialogFactory  *factory,
+                                                       GdkScreen          *screen,
+                                                       gint                monitor,
+                                                       const gchar        *identifiers);
+
+
+#endif  /*  __GIMP_WINDOW_STRATEGY_H__  */
diff --git a/app/widgets/gtkhwrapbox.c b/app/widgets/gtkhwrapbox.c
new file mode 100644
index 0000000..18b2ff4
--- /dev/null
+++ b/app/widgets/gtkhwrapbox.c
@@ -0,0 +1,607 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * GtkHWrapBox: Horizontal wrapping box widget
+ * Copyright (C) 1999 Tim Janik
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library.  If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#undef GSEAL_ENABLE
+#undef GTK_DISABLE_DEPRECATED
+
+#include "gtkhwrapbox.h"
+
+#include "libgimpmath/gimpmath.h"
+
+
+/* --- prototypes --- */
+static void    gtk_hwrap_box_class_init    (GtkHWrapBoxClass   *klass);
+static void    gtk_hwrap_box_init          (GtkHWrapBox        *hwbox);
+static void    gtk_hwrap_box_size_request  (GtkWidget          *widget,
+                                            GtkRequisition     *requisition);
+static void    gtk_hwrap_box_size_allocate (GtkWidget          *widget,
+                                            GtkAllocation      *allocation);
+static GSList* reverse_list_row_children   (GtkWrapBox         *wbox,
+                                            GtkWrapBoxChild   **child_p,
+                                            GtkAllocation      *area,
+                                            guint              *max_height,
+                                            gboolean           *can_vexpand);
+
+
+/* --- variables --- */
+static gpointer parent_class = NULL;
+
+
+/* --- functions --- */
+GType
+gtk_hwrap_box_get_type (void)
+{
+  static GType hwrap_box_type = 0;
+
+  if (! hwrap_box_type)
+    {
+      const GTypeInfo hwrap_box_info =
+      {
+        sizeof (GtkHWrapBoxClass),
+        NULL,                /* base_init */
+        NULL,                /* base_finalize */
+        (GClassInitFunc) gtk_hwrap_box_class_init,
+        NULL,                /* class_finalize */
+        NULL,                /* class_data */
+        sizeof (GtkHWrapBox),
+        0,                /* n_preallocs */
+        (GInstanceInitFunc) gtk_hwrap_box_init,
+      };
+
+      hwrap_box_type = g_type_register_static (GTK_TYPE_WRAP_BOX, "GtkHWrapBox",
+                                               &hwrap_box_info, 0);
+    }
+
+  return hwrap_box_type;
+}
+
+static void
+gtk_hwrap_box_class_init (GtkHWrapBoxClass *class)
+{
+  GtkWidgetClass *widget_class;
+  GtkWrapBoxClass *wrap_box_class;
+
+  widget_class = GTK_WIDGET_CLASS (class);
+  wrap_box_class = GTK_WRAP_BOX_CLASS (class);
+
+  parent_class = g_type_class_peek_parent (class);
+
+  widget_class->size_request = gtk_hwrap_box_size_request;
+  widget_class->size_allocate = gtk_hwrap_box_size_allocate;
+
+  wrap_box_class->rlist_line_children = reverse_list_row_children;
+}
+
+static void
+gtk_hwrap_box_init (GtkHWrapBox *hwbox)
+{
+  hwbox->max_child_width = 0;
+  hwbox->max_child_height = 0;
+}
+
+GtkWidget*
+gtk_hwrap_box_new (gboolean homogeneous)
+{
+  return g_object_new (GTK_TYPE_HWRAP_BOX, "homogeneous", homogeneous, NULL);
+}
+
+static inline void
+get_child_requisition (GtkWrapBox     *wbox,
+                       GtkWidget      *child,
+                       GtkRequisition *child_requisition)
+{
+  if (wbox->homogeneous)
+    {
+      GtkHWrapBox *hwbox = GTK_HWRAP_BOX (wbox);
+
+      child_requisition->width = hwbox->max_child_width;
+      child_requisition->height = hwbox->max_child_height;
+    }
+  else
+    gtk_widget_get_child_requisition (child, child_requisition);
+}
+
+static gfloat
+get_layout_size (GtkHWrapBox *this,
+                 guint        max_width,
+                 guint       *width_inc)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (this);
+  GtkWrapBoxChild *child;
+  guint n_rows, left_over = 0, total_height = 0;
+  gboolean last_row_filled = TRUE;
+
+  *width_inc = this->max_child_width + 1;
+
+  n_rows = 0;
+  for (child = wbox->children; child; child = child->next)
+    {
+      GtkWrapBoxChild *row_child;
+      GtkRequisition child_requisition;
+      guint row_width, row_height, n = 1;
+
+      if (!GTK_WIDGET_VISIBLE (child->widget))
+        continue;
+
+      get_child_requisition (wbox, child->widget, &child_requisition);
+      if (!last_row_filled)
+        *width_inc = MIN (*width_inc, child_requisition.width - left_over);
+      row_width = child_requisition.width;
+      row_height = child_requisition.height;
+      for (row_child = child->next; row_child && n < wbox->child_limit; row_child = row_child->next)
+        {
+          if (GTK_WIDGET_VISIBLE (row_child->widget))
+            {
+              get_child_requisition (wbox, row_child->widget, &child_requisition);
+              if (row_width + wbox->hspacing + child_requisition.width > max_width)
+                break;
+              row_width += wbox->hspacing + child_requisition.width;
+              row_height = MAX (row_height, child_requisition.height);
+              n++;
+            }
+          child = row_child;
+        }
+      last_row_filled = n >= wbox->child_limit;
+      left_over = last_row_filled ? 0 : max_width - (row_width + wbox->hspacing);
+      total_height += (n_rows ? wbox->vspacing : 0) + row_height;
+      n_rows++;
+    }
+
+  if (*width_inc > this->max_child_width)
+    *width_inc = 0;
+
+  return MAX (total_height, 1);
+}
+
+static void
+gtk_hwrap_box_size_request (GtkWidget      *widget,
+                            GtkRequisition *requisition)
+{
+  GtkHWrapBox *this = GTK_HWRAP_BOX (widget);
+  GtkWrapBox *wbox = GTK_WRAP_BOX (widget);
+  GtkWrapBoxChild *child;
+  gfloat ratio_dist, layout_width = 0;
+  guint row_inc = 0;
+
+  g_return_if_fail (requisition != NULL);
+
+  requisition->width = 0;
+  requisition->height = 0;
+  this->max_child_width = 0;
+  this->max_child_height = 0;
+
+  /* size_request all children */
+  for (child = wbox->children; child; child = child->next)
+    if (GTK_WIDGET_VISIBLE (child->widget))
+      {
+        GtkRequisition child_requisition;
+
+        gtk_widget_size_request (child->widget, &child_requisition);
+
+        this->max_child_width = MAX (this->max_child_width, child_requisition.width);
+        this->max_child_height = MAX (this->max_child_height, child_requisition.height);
+      }
+
+  /* figure all possible layouts */
+  ratio_dist = 32768;
+  layout_width = this->max_child_width;
+  do
+    {
+      gfloat layout_height;
+      gfloat ratio, dist;
+
+      layout_width += row_inc;
+      layout_height = get_layout_size (this, layout_width, &row_inc);
+      ratio = layout_width / layout_height;                /*<h2v-skip>*/
+      dist = MAX (ratio, wbox->aspect_ratio) - MIN (ratio, wbox->aspect_ratio);
+      if (dist < ratio_dist)
+        {
+          ratio_dist = dist;
+          requisition->width = layout_width;
+          requisition->height = layout_height;
+        }
+
+      /* g_print ("ratio for width %d height %d = %f\n",
+         (gint) layout_width,
+         (gint) layout_height,
+         ratio);
+      */
+    }
+  while (row_inc);
+
+  requisition->width += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/
+  requisition->height += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/
+  /* g_print ("chosen: width %d, height %d\n",
+     requisition->width,
+     requisition->height);
+  */
+}
+
+static GSList*
+reverse_list_row_children (GtkWrapBox       *wbox,
+                           GtkWrapBoxChild **child_p,
+                           GtkAllocation    *area,
+                           guint            *max_child_size,
+                           gboolean         *expand_line)
+{
+  GSList *slist = NULL;
+  guint width = 0, row_width = area->width;
+  GtkWrapBoxChild *child = *child_p;
+
+  *max_child_size = 0;
+  *expand_line = FALSE;
+
+  while (child && !GTK_WIDGET_VISIBLE (child->widget))
+    {
+      *child_p = child->next;
+      child = *child_p;
+    }
+
+  if (child)
+    {
+      GtkRequisition child_requisition;
+      guint n = 1;
+
+      get_child_requisition (wbox, child->widget, &child_requisition);
+      width += child_requisition.width;
+      *max_child_size = MAX (*max_child_size, child_requisition.height);
+      *expand_line |= child->vexpand;
+      slist = g_slist_prepend (slist, child);
+      *child_p = child->next;
+      child = *child_p;
+
+      while (child && n < wbox->child_limit)
+        {
+          if (GTK_WIDGET_VISIBLE (child->widget))
+            {
+              get_child_requisition (wbox, child->widget, &child_requisition);
+              if (width + wbox->hspacing + child_requisition.width > row_width ||
+                  child->wrapped)
+                break;
+              width += wbox->hspacing + child_requisition.width;
+              *max_child_size = MAX (*max_child_size, child_requisition.height);
+              *expand_line |= child->vexpand;
+              slist = g_slist_prepend (slist, child);
+              n++;
+            }
+          *child_p = child->next;
+          child = *child_p;
+        }
+    }
+
+  return slist;
+}
+
+static void
+layout_row (GtkWrapBox    *wbox,
+            GtkAllocation *area,
+            GSList        *children,
+            guint          children_per_line,
+            gboolean       vexpand)
+{
+  GSList *slist;
+  guint n_children = 0, n_expand_children = 0, have_expand_children = 0;
+  gint total_width = 0;
+  gfloat x, width, extra;
+  GtkAllocation child_allocation;
+
+  for (slist = children; slist; slist = slist->next)
+    {
+      GtkWrapBoxChild *child = slist->data;
+      GtkRequisition child_requisition;
+
+      n_children++;
+      if (child->hexpand)
+        n_expand_children++;
+
+      get_child_requisition (wbox, child->widget, &child_requisition);
+      total_width += child_requisition.width;
+    }
+
+  width = MAX (1, area->width - (n_children - 1) * wbox->hspacing);
+  if (width > total_width)
+    extra = width - total_width;
+  else
+    extra = 0;
+  have_expand_children = n_expand_children && extra;
+
+  x = area->x;
+  if (wbox->homogeneous)
+    {
+      width = MAX (1, area->width - (children_per_line - 1) * wbox->hspacing);
+      width /= ((gdouble) children_per_line);
+      extra = 0;
+    }
+  else if (have_expand_children && wbox->justify != GTK_JUSTIFY_FILL)
+    {
+      width = extra;
+      extra /= ((gdouble) n_expand_children);
+    }
+  else
+    {
+      if (wbox->justify == GTK_JUSTIFY_FILL)
+        {
+          width = extra;
+          have_expand_children = TRUE;
+          n_expand_children = n_children;
+          extra /= ((gdouble) n_expand_children);
+        }
+      else if (wbox->justify == GTK_JUSTIFY_CENTER)
+        {
+          x += extra / 2;
+          width = 0;
+          extra = 0;
+        }
+      else if (wbox->justify == GTK_JUSTIFY_LEFT)
+        {
+          width = 0;
+          extra = 0;
+        }
+      else if (wbox->justify == GTK_JUSTIFY_RIGHT)
+        {
+          x += extra;
+          width = 0;
+          extra = 0;
+        }
+    }
+
+  n_children = 0;
+  for (slist = children; slist; slist = slist->next)
+    {
+      GtkWrapBoxChild *child = slist->data;
+
+      child_allocation.x = x;
+      child_allocation.y = area->y;
+      if (wbox->homogeneous)
+        {
+          child_allocation.height = area->height;
+          child_allocation.width = width;
+          x += child_allocation.width + wbox->hspacing;
+        }
+      else
+        {
+          GtkRequisition child_requisition;
+
+          get_child_requisition (wbox, child->widget, &child_requisition);
+
+          if (child_requisition.height >= area->height)
+            child_allocation.height = area->height;
+          else
+            {
+              child_allocation.height = child_requisition.height;
+              if (wbox->line_justify == GTK_JUSTIFY_FILL || child->vfill)
+                child_allocation.height = area->height;
+              else if (child->vexpand || wbox->line_justify == GTK_JUSTIFY_CENTER)
+                child_allocation.y += (area->height - child_requisition.height) / 2;
+              else if (wbox->line_justify == GTK_JUSTIFY_BOTTOM)
+                child_allocation.y += area->height - child_requisition.height;
+            }
+
+          if (have_expand_children)
+            {
+              child_allocation.width = child_requisition.width;
+              if (child->hexpand || wbox->justify == GTK_JUSTIFY_FILL)
+                {
+                  guint space;
+
+                  n_expand_children--;
+                  space = extra * n_expand_children;
+                  space = width - space;
+                  width -= space;
+                  if (child->hfill)
+                    child_allocation.width += space;
+                  else
+                    {
+                      child_allocation.x += space / 2;
+                      x += space;
+                    }
+                }
+            }
+          else
+            {
+              /* g_print ("child_allocation.x %d += %d * %f ",
+                       child_allocation.x, n_children, extra); */
+              child_allocation.x += n_children * extra;
+              /* g_print ("= %d\n",
+                       child_allocation.x); */
+              child_allocation.width = MIN (child_requisition.width,
+                                            area->width - child_allocation.x + area->x);
+            }
+        }
+
+      x += child_allocation.width + wbox->hspacing;
+      gtk_widget_size_allocate (child->widget, &child_allocation);
+      n_children++;
+    }
+}
+
+typedef struct _Line Line;
+struct _Line
+{
+  GSList  *children;
+  guint16  min_size;
+  guint    expand : 1;
+  Line    *next;
+};
+
+static void
+layout_rows (GtkWrapBox    *wbox,
+             GtkAllocation *area)
+{
+  GtkWrapBoxChild *next_child;
+  guint min_height;
+  gboolean vexpand;
+  GSList *slist;
+  Line *line_list = NULL;
+  guint total_height = 0, n_expand_lines = 0, n_lines = 0;
+  gfloat shrink_height;
+  guint children_per_line;
+
+  next_child = wbox->children;
+  slist = GTK_WRAP_BOX_GET_CLASS (wbox)->rlist_line_children (wbox,
+                                                              &next_child,
+                                                              area,
+                                                              &min_height,
+                                                              &vexpand);
+  slist = g_slist_reverse (slist);
+
+  children_per_line = g_slist_length (slist);
+  while (slist)
+    {
+      Line *line = g_slice_new (Line);
+
+      line->children = slist;
+      line->min_size = min_height;
+      total_height += min_height;
+      line->expand = vexpand;
+      if (vexpand)
+        n_expand_lines++;
+      line->next = line_list;
+      line_list = line;
+      n_lines++;
+
+      slist = GTK_WRAP_BOX_GET_CLASS (wbox)->rlist_line_children (wbox,
+                                                                  &next_child,
+                                                                  area,
+                                                                  &min_height,
+                                                                  &vexpand);
+      slist = g_slist_reverse (slist);
+    }
+
+  if (total_height > area->height)
+    shrink_height = total_height - area->height;
+  else
+    shrink_height = 0;
+
+  if (1) /* reverse lines and shrink */
+    {
+      Line *prev = NULL, *last = NULL;
+      gfloat n_shrink_lines = n_lines;
+
+      while (line_list)
+        {
+          Line *tmp = line_list->next;
+
+          if (shrink_height)
+            {
+              Line *line = line_list;
+              guint shrink_fract = shrink_height / n_shrink_lines + 0.5;
+
+              if (line->min_size > shrink_fract)
+                {
+                  shrink_height -= shrink_fract;
+                  line->min_size -= shrink_fract;
+                }
+              else
+                {
+                  shrink_height -= line->min_size - 1;
+                  line->min_size = 1;
+                }
+            }
+          n_shrink_lines--;
+
+          last = line_list;
+          line_list->next = prev;
+          prev = line_list;
+          line_list = tmp;
+        }
+      line_list = last;
+    }
+
+  if (n_lines)
+    {
+      Line *line;
+      gfloat y, height, extra = 0;
+
+      height = area->height;
+      height = MAX (n_lines, height - (n_lines - 1) * wbox->vspacing);
+
+      if (wbox->homogeneous)
+        height /= ((gdouble) n_lines);
+      else if (n_expand_lines)
+        {
+          height = MAX (0, height - total_height);
+          extra = height / ((gdouble) n_expand_lines);
+        }
+      else
+        height = 0;
+
+      y = area->y;
+      line = line_list;
+      while (line)
+        {
+          GtkAllocation row_allocation;
+          Line *next_line = line->next;
+
+          row_allocation.x = area->x;
+          row_allocation.width = area->width;
+          if (wbox->homogeneous)
+            row_allocation.height = height;
+          else
+            {
+              row_allocation.height = line->min_size;
+
+              if (line->expand)
+                row_allocation.height += extra;
+            }
+
+          row_allocation.y = y;
+
+          y += row_allocation.height + wbox->vspacing;
+          layout_row (wbox,
+                      &row_allocation,
+                      line->children,
+                      children_per_line,
+                      line->expand);
+
+          g_slist_free (line->children);
+          line = next_line;
+        }
+
+      g_slice_free_chain (Line, line_list, next);
+    }
+}
+
+static void
+gtk_hwrap_box_size_allocate (GtkWidget     *widget,
+                             GtkAllocation *allocation)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (widget);
+  GtkAllocation area;
+  gint border = GTK_CONTAINER (wbox)->border_width; /*<h2v-skip>*/
+
+  widget->allocation = *allocation;
+  area.x = allocation->x + border;
+  area.y = allocation->y + border;
+  area.width = MAX (1, (gint) allocation->width - border * 2);
+  area.height = MAX (1, (gint) allocation->height - border * 2);
+
+  /*<h2v-off>*/
+  /* g_print ("got: width %d, height %d\n",
+     allocation->width,
+     allocation->height);
+  */
+  /*<h2v-on>*/
+
+  layout_rows (wbox, &area);
+}
diff --git a/app/widgets/gtkhwrapbox.h b/app/widgets/gtkhwrapbox.h
new file mode 100644
index 0000000..3023d1c
--- /dev/null
+++ b/app/widgets/gtkhwrapbox.h
@@ -0,0 +1,69 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * GtkHWrapBox: Horizontal wrapping box widget
+ * Copyright (C) 1999 Tim Janik
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library.  If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_HWRAP_BOX_H__
+#define __GTK_HWRAP_BOX_H__
+
+
+#include "gtkwrapbox.h"
+
+G_BEGIN_DECLS
+
+
+/* --- type macros --- */
+#define GTK_TYPE_HWRAP_BOX              (gtk_hwrap_box_get_type ())
+#define GTK_HWRAP_BOX(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HWRAP_BOX, GtkHWrapBox))
+#define GTK_HWRAP_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HWRAP_BOX, GtkHWrapBoxClass))
+#define GTK_IS_HWRAP_BOX(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HWRAP_BOX))
+#define GTK_IS_HWRAP_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HWRAP_BOX))
+#define GTK_HWRAP_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HWRAP_BOX, GtkHWrapBoxClass))
+
+
+/* --- typedefs --- */
+typedef struct _GtkHWrapBox      GtkHWrapBox;
+typedef struct _GtkHWrapBoxClass GtkHWrapBoxClass;
+
+
+/* --- GtkHWrapBox --- */
+struct _GtkHWrapBox
+{
+  GtkWrapBox parent_widget;
+
+  /*<h2v-off>*/
+  guint      max_child_width;
+  guint      max_child_height;
+  /*<h2v-on>*/
+};
+
+struct _GtkHWrapBoxClass
+{
+  GtkWrapBoxClass parent_class;
+};
+
+
+/* --- prototypes --- */
+GType            gtk_hwrap_box_get_type  (void) G_GNUC_CONST;
+GtkWidget * gtk_hwrap_box_new       (gboolean homogeneous);
+
+
+G_END_DECLS
+
+#endif /* __GTK_HWRAP_BOX_H__ */
diff --git a/app/widgets/gtkwrapbox.c b/app/widgets/gtkwrapbox.c
new file mode 100644
index 0000000..43c01e3
--- /dev/null
+++ b/app/widgets/gtkwrapbox.c
@@ -0,0 +1,898 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * GtkWrapBox: Wrapping box widget
+ * Copyright (C) 1999 Tim Janik
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library.  If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#undef GSEAL_ENABLE
+#undef GTK_DISABLE_DEPRECATED
+
+#include "gtkwrapbox.h"
+
+
+/* --- properties --- */
+enum {
+  PROP_0,
+  PROP_HOMOGENEOUS,
+  PROP_JUSTIFY,
+  PROP_HSPACING,
+  PROP_VSPACING,
+  PROP_LINE_JUSTIFY,
+  PROP_ASPECT_RATIO,
+  PROP_CURRENT_RATIO,
+  PROP_CHILD_LIMIT
+};
+
+enum {
+  CHILD_PROP_0,
+  CHILD_PROP_POSITION,
+  CHILD_PROP_HEXPAND,
+  CHILD_PROP_HFILL,
+  CHILD_PROP_VEXPAND,
+  CHILD_PROP_VFILL,
+  CHILD_PROP_WRAPPED
+};
+
+
+/* --- prototypes --- */
+static void gtk_wrap_box_class_init    (GtkWrapBoxClass    *klass);
+static void gtk_wrap_box_init          (GtkWrapBox         *wbox);
+static void gtk_wrap_box_set_property  (GObject            *object,
+                                        guint               property_id,
+                                        const GValue       *value,
+                                        GParamSpec         *pspec);
+static void gtk_wrap_box_get_property  (GObject            *object,
+                                        guint               property_id,
+                                        GValue             *value,
+                                        GParamSpec         *pspec);
+static void gtk_wrap_box_set_child_property (GtkContainer    *container,
+                                             GtkWidget       *child,
+                                             guint            property_id,
+                                             const GValue    *value,
+                                             GParamSpec      *pspec);
+static void gtk_wrap_box_get_child_property (GtkContainer    *container,
+                                             GtkWidget       *child,
+                                             guint            property_id,
+                                             GValue          *value,
+                                             GParamSpec      *pspec);
+static void gtk_wrap_box_map           (GtkWidget          *widget);
+static void gtk_wrap_box_unmap         (GtkWidget          *widget);
+static gint gtk_wrap_box_expose        (GtkWidget          *widget,
+                                        GdkEventExpose     *event);
+static void gtk_wrap_box_add           (GtkContainer       *container,
+                                        GtkWidget          *widget);
+static void gtk_wrap_box_remove        (GtkContainer       *container,
+                                        GtkWidget          *widget);
+static void gtk_wrap_box_forall        (GtkContainer       *container,
+                                        gboolean            include_internals,
+                                        GtkCallback         callback,
+                                        gpointer            callback_data);
+static GType gtk_wrap_box_child_type   (GtkContainer       *container);
+
+
+/* --- variables --- */
+static gpointer parent_class = NULL;
+
+
+/* --- functions --- */
+GType
+gtk_wrap_box_get_type (void)
+{
+  static GType wrap_box_type = 0;
+
+  if (! wrap_box_type)
+    {
+      const GTypeInfo wrap_box_info =
+      {
+        sizeof (GtkWrapBoxClass),
+        NULL,                /* base_init */
+        NULL,                /* base_finalize */
+        (GClassInitFunc) gtk_wrap_box_class_init,
+        NULL,                /* class_finalize */
+        NULL,                /* class_data */
+        sizeof (GtkWrapBox),
+        0,                /* n_preallocs */
+        (GInstanceInitFunc) gtk_wrap_box_init,
+      };
+
+      wrap_box_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkWrapBox",
+                                              &wrap_box_info, 0);
+    }
+
+  return wrap_box_type;
+}
+
+static void
+gtk_wrap_box_class_init (GtkWrapBoxClass *class)
+{
+  GObjectClass *object_class;
+  GtkWidgetClass *widget_class;
+  GtkContainerClass *container_class;
+
+  object_class = G_OBJECT_CLASS (class);
+  widget_class = GTK_WIDGET_CLASS (class);
+  container_class = GTK_CONTAINER_CLASS (class);
+
+  parent_class = g_type_class_peek_parent (class);
+
+  object_class->set_property = gtk_wrap_box_set_property;
+  object_class->get_property = gtk_wrap_box_get_property;
+
+  widget_class->map = gtk_wrap_box_map;
+  widget_class->unmap = gtk_wrap_box_unmap;
+  widget_class->expose_event = gtk_wrap_box_expose;
+
+  container_class->add = gtk_wrap_box_add;
+  container_class->remove = gtk_wrap_box_remove;
+  container_class->forall = gtk_wrap_box_forall;
+  container_class->child_type = gtk_wrap_box_child_type;
+  container_class->set_child_property = gtk_wrap_box_set_child_property;
+  container_class->get_child_property = gtk_wrap_box_get_child_property;
+
+  class->rlist_line_children = NULL;
+
+  g_object_class_install_property (object_class,
+                                   PROP_HOMOGENEOUS,
+                                   g_param_spec_boolean ("homogeneous",
+                                                         NULL,
+                                                         NULL,
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+  g_object_class_install_property (object_class,
+                                   PROP_JUSTIFY,
+                                   g_param_spec_enum ("justify",
+                                                      NULL,
+                                                      NULL,
+                                                      GTK_TYPE_JUSTIFICATION,
+                                                      GTK_JUSTIFY_LEFT,
+                                                      G_PARAM_READWRITE));
+  g_object_class_install_property (object_class,
+                                   PROP_HSPACING,
+                                   g_param_spec_uint ("hspacing",
+                                                      NULL,
+                                                      NULL,
+                                                      0,
+                                                      G_MAXINT,
+                                                      0,
+                                                      G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_VSPACING,
+                                   g_param_spec_uint ("vspacing",
+                                                      NULL,
+                                                      NULL,
+                                                      0,
+                                                      G_MAXINT,
+                                                      0,
+                                                      G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_LINE_JUSTIFY,
+                                   g_param_spec_enum ("line-justify",
+                                                      NULL,
+                                                      NULL,
+                                                      GTK_TYPE_JUSTIFICATION,
+                                                      GTK_JUSTIFY_BOTTOM,
+                                                      G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_ASPECT_RATIO,
+                                   g_param_spec_float ("aspect-ratio",
+                                                       NULL,
+                                                       NULL,
+                                                       0.0,
+                                                       G_MAXFLOAT,
+                                                       1.0,
+                                                       G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_CURRENT_RATIO,
+                                   g_param_spec_float ("current-ratio",
+                                                       NULL,
+                                                       NULL,
+                                                       0.0,
+                                                       G_MAXFLOAT,
+                                                       1.0,
+                                                       G_PARAM_READABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_CHILD_LIMIT,
+                                   g_param_spec_uint ("max-children-per-line",
+                                                      NULL,
+                                                      NULL,
+                                                      1,
+                                                      32767,
+                                                      32767,
+                                                      G_PARAM_READWRITE));
+
+  gtk_container_class_install_child_property (container_class,
+                                              CHILD_PROP_POSITION,
+                                              g_param_spec_int ("position",
+                                                                NULL,
+                                                                NULL,
+                                                                -1, G_MAXINT, 0,
+                                                                G_PARAM_READWRITE));
+  gtk_container_class_install_child_property (container_class,
+                                              CHILD_PROP_HEXPAND,
+                                              g_param_spec_boolean ("hexpand",
+                                                                    NULL,
+                                                                    NULL,
+                                                                    FALSE,
+                                                                    G_PARAM_READWRITE));
+  gtk_container_class_install_child_property (container_class,
+                                              CHILD_PROP_HFILL,
+                                              g_param_spec_boolean ("hfill",
+                                                                    NULL,
+                                                                    NULL,
+                                                                    FALSE,
+                                                                    G_PARAM_READWRITE));
+  gtk_container_class_install_child_property (container_class,
+                                              CHILD_PROP_VEXPAND,
+                                              g_param_spec_boolean ("vexpand",
+                                                                    NULL,
+                                                                    NULL,
+                                                                    FALSE,
+                                                                    G_PARAM_READWRITE));
+  gtk_container_class_install_child_property (container_class,
+                                              CHILD_PROP_VFILL,
+                                              g_param_spec_boolean ("vfill",
+                                                                    NULL,
+                                                                    NULL,
+                                                                    FALSE,
+                                                                    G_PARAM_READWRITE));
+  gtk_container_class_install_child_property (container_class,
+                                              CHILD_PROP_WRAPPED,
+                                              g_param_spec_boolean ("wrapped",
+                                                                    NULL,
+                                                                    NULL,
+                                                                    FALSE,
+                                                                    G_PARAM_READWRITE));
+}
+
+static void
+gtk_wrap_box_init (GtkWrapBox *wbox)
+{
+  GTK_WIDGET_SET_FLAGS (wbox, GTK_NO_WINDOW);
+
+  wbox->homogeneous = FALSE;
+  wbox->hspacing = 0;
+  wbox->vspacing = 0;
+  wbox->justify = GTK_JUSTIFY_LEFT;
+  wbox->line_justify = GTK_JUSTIFY_BOTTOM;
+  wbox->n_children = 0;
+  wbox->children = NULL;
+  wbox->aspect_ratio = 1.0;
+  wbox->child_limit = 32767;
+}
+
+static void
+gtk_wrap_box_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (object);
+
+  switch (property_id)
+    {
+    case PROP_HOMOGENEOUS:
+      gtk_wrap_box_set_homogeneous (wbox, g_value_get_boolean (value));
+      break;
+    case PROP_JUSTIFY:
+      gtk_wrap_box_set_justify (wbox, g_value_get_enum (value));
+      break;
+    case PROP_LINE_JUSTIFY:
+      gtk_wrap_box_set_line_justify (wbox, g_value_get_enum (value));
+      break;
+    case PROP_HSPACING:
+      gtk_wrap_box_set_hspacing (wbox, g_value_get_uint (value));
+      break;
+    case PROP_VSPACING:
+      gtk_wrap_box_set_vspacing (wbox, g_value_get_uint (value));
+      break;
+    case PROP_ASPECT_RATIO:
+      gtk_wrap_box_set_aspect_ratio (wbox, g_value_get_float (value));
+      break;
+    case PROP_CHILD_LIMIT:
+      if (wbox->child_limit != g_value_get_uint (value))
+        gtk_widget_queue_resize (GTK_WIDGET (wbox));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_wrap_box_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (object);
+  GtkWidget *widget = GTK_WIDGET (object);
+
+  switch (property_id)
+    {
+    case PROP_HOMOGENEOUS:
+      g_value_set_boolean (value, wbox->homogeneous);
+      break;
+    case PROP_JUSTIFY:
+      g_value_set_enum (value, wbox->justify);
+      break;
+    case PROP_LINE_JUSTIFY:
+      g_value_set_enum (value, wbox->line_justify);
+      break;
+    case PROP_HSPACING:
+      g_value_set_uint (value, wbox->hspacing);
+      break;
+    case PROP_VSPACING:
+      g_value_set_uint (value, wbox->vspacing);
+      break;
+    case PROP_ASPECT_RATIO:
+      g_value_set_float (value, wbox->aspect_ratio);
+      break;
+    case PROP_CURRENT_RATIO:
+      g_value_set_float (value, (((gfloat) widget->allocation.width) /
+                                 ((gfloat) widget->allocation.height)));
+      break;
+    case PROP_CHILD_LIMIT:
+      g_value_set_uint (value, wbox->child_limit);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_wrap_box_set_child_property (GtkContainer    *container,
+                                 GtkWidget       *child,
+                                 guint            property_id,
+                                 const GValue    *value,
+                                 GParamSpec      *pspec)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (container);
+  gboolean hexpand = FALSE, hfill = FALSE;
+  gboolean vexpand = FALSE, vfill = FALSE;
+  gboolean wrapped = FALSE;
+
+  if (property_id != CHILD_PROP_POSITION)
+    gtk_wrap_box_query_child_packing (wbox, child,
+                                      &hexpand, &hfill,
+                                      &vexpand, &vfill,
+                                      &wrapped);
+
+  switch (property_id)
+    {
+    case CHILD_PROP_POSITION:
+      gtk_wrap_box_reorder_child (wbox, child, g_value_get_int (value));
+      break;
+    case CHILD_PROP_HEXPAND:
+      gtk_wrap_box_set_child_packing (wbox, child,
+                                      g_value_get_boolean (value), hfill,
+                                      vexpand, vfill,
+                                      wrapped);
+      break;
+    case CHILD_PROP_HFILL:
+      gtk_wrap_box_set_child_packing (wbox, child,
+                                      hexpand, g_value_get_boolean (value),
+                                      vexpand, vfill,
+                                      wrapped);
+      break;
+    case CHILD_PROP_VEXPAND:
+      gtk_wrap_box_set_child_packing (wbox, child,
+                                      hexpand, hfill,
+                                      g_value_get_boolean (value), vfill,
+                                      wrapped);
+      break;
+    case CHILD_PROP_VFILL:
+      gtk_wrap_box_set_child_packing (wbox, child,
+                                      hexpand, hfill,
+                                      vexpand, g_value_get_boolean (value),
+                                      wrapped);
+      break;
+    case CHILD_PROP_WRAPPED:
+      gtk_wrap_box_set_child_packing (wbox, child,
+                                      hexpand, hfill,
+                                      vexpand, vfill,
+                                      g_value_get_boolean (value));
+      break;
+    default:
+      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_wrap_box_get_child_property (GtkContainer    *container,
+                                 GtkWidget       *child,
+                                 guint            property_id,
+                                 GValue          *value,
+                                 GParamSpec      *pspec)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (container);
+  gboolean hexpand = FALSE, hfill = FALSE;
+  gboolean vexpand = FALSE, vfill = FALSE;
+  gboolean wrapped = FALSE;
+
+  if (property_id != CHILD_PROP_POSITION)
+    gtk_wrap_box_query_child_packing (wbox, child,
+                                      &hexpand, &hfill,
+                                      &vexpand, &vfill,
+                                      &wrapped);
+
+  switch (property_id)
+    {
+      GtkWrapBoxChild *child_info;
+      guint i;
+    case CHILD_PROP_POSITION:
+      i = 0;
+      for (child_info = wbox->children; child_info; child_info = child_info->next)
+        {
+          if (child_info->widget == child)
+            break;
+          i += 1;
+        }
+      g_value_set_int (value, child_info ? i : -1);
+      break;
+    case CHILD_PROP_HEXPAND:
+      g_value_set_boolean (value, hexpand);
+      break;
+    case CHILD_PROP_HFILL:
+      g_value_set_boolean (value, hfill);
+      break;
+    case CHILD_PROP_VEXPAND:
+      g_value_set_boolean (value, vexpand);
+      break;
+    case CHILD_PROP_VFILL:
+      g_value_set_boolean (value, vfill);
+      break;
+    case CHILD_PROP_WRAPPED:
+      g_value_set_boolean (value, wrapped);
+      break;
+    default:
+      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+      break;
+    }
+}
+
+static GType
+gtk_wrap_box_child_type        (GtkContainer *container)
+{
+  return GTK_TYPE_WIDGET;
+}
+
+void
+gtk_wrap_box_set_homogeneous (GtkWrapBox *wbox,
+                              gboolean    homogeneous)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+
+  homogeneous = homogeneous != FALSE;
+  if (wbox->homogeneous != homogeneous)
+    {
+      wbox->homogeneous = homogeneous;
+      gtk_widget_queue_resize (GTK_WIDGET (wbox));
+    }
+}
+
+void
+gtk_wrap_box_set_hspacing (GtkWrapBox *wbox,
+                           guint       hspacing)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+
+  if (wbox->hspacing != hspacing)
+    {
+      wbox->hspacing = hspacing;
+      gtk_widget_queue_resize (GTK_WIDGET (wbox));
+    }
+}
+
+void
+gtk_wrap_box_set_vspacing (GtkWrapBox *wbox,
+                           guint       vspacing)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+
+  if (wbox->vspacing != vspacing)
+    {
+      wbox->vspacing = vspacing;
+      gtk_widget_queue_resize (GTK_WIDGET (wbox));
+    }
+}
+
+void
+gtk_wrap_box_set_justify (GtkWrapBox      *wbox,
+                          GtkJustification justify)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (justify <= GTK_JUSTIFY_FILL);
+
+  if (wbox->justify != justify)
+    {
+      wbox->justify = justify;
+      gtk_widget_queue_resize (GTK_WIDGET (wbox));
+    }
+}
+
+void
+gtk_wrap_box_set_line_justify (GtkWrapBox      *wbox,
+                               GtkJustification line_justify)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (line_justify <= GTK_JUSTIFY_FILL);
+
+  if (wbox->line_justify != line_justify)
+    {
+      wbox->line_justify = line_justify;
+      gtk_widget_queue_resize (GTK_WIDGET (wbox));
+    }
+}
+
+void
+gtk_wrap_box_set_aspect_ratio (GtkWrapBox *wbox,
+                               gfloat      aspect_ratio)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+
+  aspect_ratio = CLAMP (aspect_ratio, 1.0 / 256.0, 256.0);
+
+  if (wbox->aspect_ratio != aspect_ratio)
+    {
+      wbox->aspect_ratio = aspect_ratio;
+      gtk_widget_queue_resize (GTK_WIDGET (wbox));
+    }
+}
+
+void
+gtk_wrap_box_pack (GtkWrapBox *wbox,
+                   GtkWidget  *child,
+                   gboolean    hexpand,
+                   gboolean    hfill,
+                   gboolean    vexpand,
+                   gboolean    vfill)
+{
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == NULL);
+
+  gtk_wrap_box_pack_wrapped (wbox, child, hexpand, hfill, vexpand, vfill, FALSE);
+}
+
+void
+gtk_wrap_box_pack_wrapped (GtkWrapBox *wbox,
+                           GtkWidget  *child,
+                           gboolean    hexpand,
+                           gboolean    hfill,
+                           gboolean    vexpand,
+                           gboolean    vfill,
+                           gboolean    wrapped)
+{
+  GtkWrapBoxChild *child_info;
+
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == NULL);
+
+  child_info = g_slice_new (GtkWrapBoxChild);
+
+  child_info->widget = child;
+  child_info->hexpand = hexpand ? TRUE : FALSE;
+  child_info->hfill = hfill ? TRUE : FALSE;
+  child_info->vexpand = vexpand ? TRUE : FALSE;
+  child_info->vfill = vfill ? TRUE : FALSE;
+  child_info->wrapped = wrapped ? TRUE : FALSE;
+  child_info->next = NULL;
+  if (wbox->children)
+    {
+      GtkWrapBoxChild *last = wbox->children;
+
+      while (last->next)
+        last = last->next;
+      last->next = child_info;
+    }
+  else
+    wbox->children = child_info;
+  wbox->n_children++;
+
+  gtk_widget_set_parent (child, GTK_WIDGET (wbox));
+
+  if (GTK_WIDGET_REALIZED (wbox))
+    gtk_widget_realize (child);
+
+  if (GTK_WIDGET_VISIBLE (wbox) && GTK_WIDGET_VISIBLE (child))
+    {
+      if (GTK_WIDGET_MAPPED (wbox))
+        gtk_widget_map (child);
+
+      gtk_widget_queue_resize (child);
+    }
+}
+
+void
+gtk_wrap_box_reorder_child (GtkWrapBox *wbox,
+                            GtkWidget  *child,
+                            gint        position)
+{
+  GtkWrapBoxChild *child_info, *last = NULL;
+
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+
+  for (child_info = wbox->children; child_info; last = child_info, child_info = last->next)
+    if (child_info->widget == child)
+      break;
+
+  if (child_info && wbox->children->next)
+    {
+      GtkWrapBoxChild *tmp;
+
+      if (last)
+        last->next = child_info->next;
+      else
+        wbox->children = child_info->next;
+
+      last = NULL;
+      tmp = wbox->children;
+      while (position && tmp->next)
+        {
+          position--;
+          last = tmp;
+          tmp = last->next;
+        }
+
+      if (position)
+        {
+          tmp->next = child_info;
+          child_info->next = NULL;
+        }
+      else
+        {
+          child_info->next = tmp;
+          if (last)
+            last->next = child_info;
+          else
+            wbox->children = child_info;
+        }
+
+      if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (wbox))
+        gtk_widget_queue_resize (child);
+    }
+}
+
+void
+gtk_wrap_box_query_child_packing (GtkWrapBox *wbox,
+                                  GtkWidget  *child,
+                                  gboolean   *hexpand,
+                                  gboolean   *hfill,
+                                  gboolean   *vexpand,
+                                  gboolean   *vfill,
+                                  gboolean   *wrapped)
+{
+  GtkWrapBoxChild *child_info;
+
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+
+  for (child_info = wbox->children; child_info; child_info = child_info->next)
+    if (child_info->widget == child)
+      break;
+
+  if (child_info)
+    {
+      if (hexpand)
+        *hexpand = child_info->hexpand;
+      if (hfill)
+        *hfill = child_info->hfill;
+      if (vexpand)
+        *vexpand = child_info->vexpand;
+      if (vfill)
+        *vfill = child_info->vfill;
+      if (wrapped)
+        *wrapped = child_info->wrapped;
+    }
+}
+
+void
+gtk_wrap_box_set_child_packing (GtkWrapBox *wbox,
+                                GtkWidget  *child,
+                                gboolean    hexpand,
+                                gboolean    hfill,
+                                gboolean    vexpand,
+                                gboolean    vfill,
+                                gboolean    wrapped)
+{
+  GtkWrapBoxChild *child_info;
+
+  g_return_if_fail (GTK_IS_WRAP_BOX (wbox));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+
+  hexpand = hexpand != FALSE;
+  hfill = hfill != FALSE;
+  vexpand = vexpand != FALSE;
+  vfill = vfill != FALSE;
+  wrapped = wrapped != FALSE;
+
+  for (child_info = wbox->children; child_info; child_info = child_info->next)
+    if (child_info->widget == child)
+      break;
+
+  if (child_info &&
+      (child_info->hexpand != hexpand || child_info->vexpand != vexpand ||
+       child_info->hfill != hfill || child_info->vfill != vfill ||
+       child_info->wrapped != wrapped))
+    {
+      child_info->hexpand = hexpand;
+      child_info->hfill = hfill;
+      child_info->vexpand = vexpand;
+      child_info->vfill = vfill;
+      child_info->wrapped = wrapped;
+
+      if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (wbox))
+        gtk_widget_queue_resize (child);
+    }
+}
+
+guint*
+gtk_wrap_box_query_line_lengths (GtkWrapBox *wbox,
+                                 guint      *_n_lines)
+{
+  GtkWrapBoxChild *next_child = NULL;
+  GtkAllocation area, *allocation;
+  gboolean expand_line;
+  GSList *slist;
+  guint max_child_size, border, n_lines = 0, *lines = NULL;
+
+  if (_n_lines)
+    *_n_lines = 0;
+  g_return_val_if_fail (GTK_IS_WRAP_BOX (wbox), NULL);
+
+  allocation = &GTK_WIDGET (wbox)->allocation;
+  border = GTK_CONTAINER (wbox)->border_width;
+  area.x = allocation->x + border;
+  area.y = allocation->y + border;
+  area.width = MAX (1, (gint) allocation->width - border * 2);
+  area.height = MAX (1, (gint) allocation->height - border * 2);
+
+  next_child = wbox->children;
+  slist = GTK_WRAP_BOX_GET_CLASS (wbox)->rlist_line_children (wbox,
+                                                              &next_child,
+                                                              &area,
+                                                              &max_child_size,
+                                                              &expand_line);
+  while (slist)
+    {
+      guint l = n_lines++;
+
+      lines = g_renew (guint, lines, n_lines);
+      lines[l] = g_slist_length (slist);
+      g_slist_free (slist);
+
+      slist = GTK_WRAP_BOX_GET_CLASS (wbox)->rlist_line_children (wbox,
+                                                                  &next_child,
+                                                                  &area,
+                                                                  &max_child_size,
+                                                                  &expand_line);
+    }
+
+  if (_n_lines)
+    *_n_lines = n_lines;
+
+  return lines;
+}
+
+static void
+gtk_wrap_box_map (GtkWidget *widget)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (widget);
+  GtkWrapBoxChild *child;
+
+  GTK_WIDGET_SET_FLAGS (wbox, GTK_MAPPED);
+
+  for (child = wbox->children; child; child = child->next)
+    if (GTK_WIDGET_VISIBLE (child->widget) &&
+        !GTK_WIDGET_MAPPED (child->widget))
+      gtk_widget_map (child->widget);
+}
+
+static void
+gtk_wrap_box_unmap (GtkWidget *widget)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (widget);
+  GtkWrapBoxChild *child;
+
+  GTK_WIDGET_UNSET_FLAGS (wbox, GTK_MAPPED);
+
+  for (child = wbox->children; child; child = child->next)
+    if (GTK_WIDGET_VISIBLE (child->widget) &&
+        GTK_WIDGET_MAPPED (child->widget))
+      gtk_widget_unmap (child->widget);
+}
+
+static gint
+gtk_wrap_box_expose (GtkWidget      *widget,
+                     GdkEventExpose *event)
+{
+  return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+}
+
+static void
+gtk_wrap_box_add (GtkContainer *container,
+                  GtkWidget    *widget)
+{
+  gtk_wrap_box_pack (GTK_WRAP_BOX (container), widget, FALSE, TRUE, FALSE, TRUE);
+}
+
+static void
+gtk_wrap_box_remove (GtkContainer *container,
+                     GtkWidget    *widget)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (container);
+  GtkWrapBoxChild *child, *last = NULL;
+
+  child = wbox->children;
+  while (child)
+    {
+      if (child->widget == widget)
+        {
+          gboolean was_visible;
+
+          was_visible = GTK_WIDGET_VISIBLE (widget);
+          gtk_widget_unparent (widget);
+
+          if (last)
+            last->next = child->next;
+          else
+            wbox->children = child->next;
+          g_slice_free (GtkWrapBoxChild, child);
+          wbox->n_children--;
+
+          if (was_visible)
+            gtk_widget_queue_resize (GTK_WIDGET (container));
+
+          break;
+        }
+
+      last = child;
+      child = last->next;
+    }
+}
+
+static void
+gtk_wrap_box_forall (GtkContainer *container,
+                     gboolean      include_internals,
+                     GtkCallback   callback,
+                     gpointer      callback_data)
+{
+  GtkWrapBox *wbox = GTK_WRAP_BOX (container);
+  GtkWrapBoxChild *child;
+
+  child = wbox->children;
+  while (child)
+    {
+      GtkWidget *widget = child->widget;
+
+      child = child->next;
+
+      callback (widget, callback_data);
+    }
+}
diff --git a/app/widgets/gtkwrapbox.h b/app/widgets/gtkwrapbox.h
new file mode 100644
index 0000000..0f0da83
--- /dev/null
+++ b/app/widgets/gtkwrapbox.h
@@ -0,0 +1,134 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * GtkWrapBox: Wrapping box widget
+ * Copyright (C) 1999 Tim Janik
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library.  If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_WRAP_BOX_H__
+#define __GTK_WRAP_BOX_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+
+/* --- type macros --- */
+#define GTK_TYPE_WRAP_BOX             (gtk_wrap_box_get_type ())
+#define GTK_WRAP_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WRAP_BOX, GtkWrapBox))
+#define GTK_WRAP_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass))
+#define GTK_IS_WRAP_BOX(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WRAP_BOX))
+#define GTK_IS_WRAP_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WRAP_BOX))
+#define GTK_WRAP_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass))
+
+
+/* --- typedefs --- */
+typedef struct _GtkWrapBox      GtkWrapBox;
+typedef struct _GtkWrapBoxClass GtkWrapBoxClass;
+typedef struct _GtkWrapBoxChild GtkWrapBoxChild;
+
+/* --- GtkWrapBox --- */
+struct _GtkWrapBox
+{
+  GtkContainer     container;
+
+  guint            homogeneous : 1;
+  guint            justify : 4;
+  guint            line_justify : 4;
+  guint8           hspacing;
+  guint8           vspacing;
+  guint16          n_children;
+  GtkWrapBoxChild *children;
+  gfloat           aspect_ratio; /* 1/256..256 */
+  guint            child_limit;
+};
+struct _GtkWrapBoxClass
+{
+  GtkContainerClass parent_class;
+
+  GSList* (*rlist_line_children) (GtkWrapBox       *wbox,
+                                  GtkWrapBoxChild **child_p,
+                                  GtkAllocation    *area,
+                                  guint            *max_child_size,
+                                  gboolean         *expand_line);
+};
+struct _GtkWrapBoxChild
+{
+  GtkWidget *widget;
+  guint      hexpand : 1;
+  guint      hfill : 1;
+  guint      vexpand : 1;
+  guint      vfill : 1;
+  guint      wrapped : 1;
+
+  GtkWrapBoxChild *next;
+};
+#define GTK_JUSTIFY_TOP    GTK_JUSTIFY_LEFT
+#define GTK_JUSTIFY_BOTTOM GTK_JUSTIFY_RIGHT
+
+
+/* --- prototypes --- */
+GType           gtk_wrap_box_get_type            (void) G_GNUC_CONST;
+void           gtk_wrap_box_set_homogeneous     (GtkWrapBox      *wbox,
+                                             gboolean         homogeneous);
+void           gtk_wrap_box_set_hspacing        (GtkWrapBox      *wbox,
+                                             guint            hspacing);
+void           gtk_wrap_box_set_vspacing        (GtkWrapBox      *wbox,
+                                             guint            vspacing);
+void           gtk_wrap_box_set_justify         (GtkWrapBox      *wbox,
+                                             GtkJustification justify);
+void           gtk_wrap_box_set_line_justify    (GtkWrapBox      *wbox,
+                                             GtkJustification line_justify);
+void           gtk_wrap_box_set_aspect_ratio    (GtkWrapBox      *wbox,
+                                             gfloat           aspect_ratio);
+void           gtk_wrap_box_pack                    (GtkWrapBox      *wbox,
+                                             GtkWidget       *child,
+                                             gboolean         hexpand,
+                                             gboolean         hfill,
+                                             gboolean         vexpand,
+                                             gboolean         vfill);
+void           gtk_wrap_box_pack_wrapped        (GtkWrapBox      *wbox,
+                                             GtkWidget       *child,
+                                             gboolean         hexpand,
+                                             gboolean         hfill,
+                                             gboolean         vexpand,
+                                             gboolean         vfill,
+                                             gboolean         wrapped);
+void       gtk_wrap_box_reorder_child       (GtkWrapBox      *wbox,
+                                             GtkWidget       *child,
+                                             gint             position);
+void       gtk_wrap_box_query_child_packing (GtkWrapBox      *wbox,
+                                             GtkWidget       *child,
+                                             gboolean        *hexpand,
+                                             gboolean        *hfill,
+                                             gboolean        *vexpand,
+                                             gboolean        *vfill,
+                                             gboolean        *wrapped);
+void       gtk_wrap_box_set_child_packing   (GtkWrapBox      *wbox,
+                                             GtkWidget       *child,
+                                             gboolean         hexpand,
+                                             gboolean         hfill,
+                                             gboolean         vexpand,
+                                             gboolean         vfill,
+                                             gboolean         wrapped);
+guint*           gtk_wrap_box_query_line_lengths  (GtkWrapBox             *wbox,
+                                             guint           *n_lines);
+
+
+G_END_DECLS
+
+#endif /* __GTK_WRAP_BOX_H__ */
diff --git a/app/widgets/widgets-enums.c b/app/widgets/widgets-enums.c
new file mode 100644
index 0000000..22295d4
--- /dev/null
+++ b/app/widgets/widgets-enums.c
@@ -0,0 +1,269 @@
+
+/* Generated data (by gimp-mkenums) */
+
+#include "config.h"
+#include <gtk/gtk.h>
+#include "libgimpbase/gimpbase.h"
+#include "widgets-enums.h"
+#include "gimp-intl.h"
+
+/* enumerations from "widgets-enums.h" */
+GType
+gimp_active_color_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_ACTIVE_COLOR_FOREGROUND, "GIMP_ACTIVE_COLOR_FOREGROUND", "foreground" },
+    { GIMP_ACTIVE_COLOR_BACKGROUND, "GIMP_ACTIVE_COLOR_BACKGROUND", "background" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_ACTIVE_COLOR_FOREGROUND, NC_("active-color", "Foreground"), NULL },
+    { GIMP_ACTIVE_COLOR_BACKGROUND, NC_("active-color", "Background"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpActiveColor", values);
+      gimp_type_set_translation_context (type, "active-color");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_circle_background_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_CIRCLE_BACKGROUND_PLAIN, "GIMP_CIRCLE_BACKGROUND_PLAIN", "plain" },
+    { GIMP_CIRCLE_BACKGROUND_HSV, "GIMP_CIRCLE_BACKGROUND_HSV", "hsv" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_CIRCLE_BACKGROUND_PLAIN, NC_("circle-background", "Plain"), NULL },
+    { GIMP_CIRCLE_BACKGROUND_HSV, NC_("circle-background", "HSV"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpCircleBackground", values);
+      gimp_type_set_translation_context (type, "circle-background");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_color_dialog_state_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_COLOR_DIALOG_OK, "GIMP_COLOR_DIALOG_OK", "ok" },
+    { GIMP_COLOR_DIALOG_CANCEL, "GIMP_COLOR_DIALOG_CANCEL", "cancel" },
+    { GIMP_COLOR_DIALOG_UPDATE, "GIMP_COLOR_DIALOG_UPDATE", "update" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_COLOR_DIALOG_OK, "GIMP_COLOR_DIALOG_OK", NULL },
+    { GIMP_COLOR_DIALOG_CANCEL, "GIMP_COLOR_DIALOG_CANCEL", NULL },
+    { GIMP_COLOR_DIALOG_UPDATE, "GIMP_COLOR_DIALOG_UPDATE", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpColorDialogState", values);
+      gimp_type_set_translation_context (type, "color-dialog-state");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_color_pick_target_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_COLOR_PICK_TARGET_NONE, "GIMP_COLOR_PICK_TARGET_NONE", "none" },
+    { GIMP_COLOR_PICK_TARGET_FOREGROUND, "GIMP_COLOR_PICK_TARGET_FOREGROUND", "foreground" },
+    { GIMP_COLOR_PICK_TARGET_BACKGROUND, "GIMP_COLOR_PICK_TARGET_BACKGROUND", "background" },
+    { GIMP_COLOR_PICK_TARGET_PALETTE, "GIMP_COLOR_PICK_TARGET_PALETTE", "palette" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_COLOR_PICK_TARGET_NONE, NC_("color-pick-target", "Pick only"), NULL },
+    { GIMP_COLOR_PICK_TARGET_FOREGROUND, NC_("color-pick-target", "Set foreground color"), NULL },
+    { GIMP_COLOR_PICK_TARGET_BACKGROUND, NC_("color-pick-target", "Set background color"), NULL },
+    { GIMP_COLOR_PICK_TARGET_PALETTE, NC_("color-pick-target", "Add to palette"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpColorPickTarget", values);
+      gimp_type_set_translation_context (type, "color-pick-target");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_color_pick_state_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_COLOR_PICK_STATE_START, "GIMP_COLOR_PICK_STATE_START", "start" },
+    { GIMP_COLOR_PICK_STATE_UPDATE, "GIMP_COLOR_PICK_STATE_UPDATE", "update" },
+    { GIMP_COLOR_PICK_STATE_END, "GIMP_COLOR_PICK_STATE_END", "end" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_COLOR_PICK_STATE_START, "GIMP_COLOR_PICK_STATE_START", NULL },
+    { GIMP_COLOR_PICK_STATE_UPDATE, "GIMP_COLOR_PICK_STATE_UPDATE", NULL },
+    { GIMP_COLOR_PICK_STATE_END, "GIMP_COLOR_PICK_STATE_END", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpColorPickState", values);
+      gimp_type_set_translation_context (type, "color-pick-state");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_histogram_scale_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_HISTOGRAM_SCALE_LINEAR, "GIMP_HISTOGRAM_SCALE_LINEAR", "linear" },
+    { GIMP_HISTOGRAM_SCALE_LOGARITHMIC, "GIMP_HISTOGRAM_SCALE_LOGARITHMIC", "logarithmic" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_HISTOGRAM_SCALE_LINEAR, NC_("histogram-scale", "Linear histogram"), NULL },
+    { GIMP_HISTOGRAM_SCALE_LOGARITHMIC, NC_("histogram-scale", "Logarithmic histogram"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpHistogramScale", values);
+      gimp_type_set_translation_context (type, "histogram-scale");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_tab_style_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TAB_STYLE_ICON, "GIMP_TAB_STYLE_ICON", "icon" },
+    { GIMP_TAB_STYLE_PREVIEW, "GIMP_TAB_STYLE_PREVIEW", "preview" },
+    { GIMP_TAB_STYLE_NAME, "GIMP_TAB_STYLE_NAME", "name" },
+    { GIMP_TAB_STYLE_BLURB, "GIMP_TAB_STYLE_BLURB", "blurb" },
+    { GIMP_TAB_STYLE_ICON_NAME, "GIMP_TAB_STYLE_ICON_NAME", "icon-name" },
+    { GIMP_TAB_STYLE_ICON_BLURB, "GIMP_TAB_STYLE_ICON_BLURB", "icon-blurb" },
+    { GIMP_TAB_STYLE_PREVIEW_NAME, "GIMP_TAB_STYLE_PREVIEW_NAME", "preview-name" },
+    { GIMP_TAB_STYLE_PREVIEW_BLURB, "GIMP_TAB_STYLE_PREVIEW_BLURB", "preview-blurb" },
+    { GIMP_TAB_STYLE_UNDEFINED, "GIMP_TAB_STYLE_UNDEFINED", "undefined" },
+    { GIMP_TAB_STYLE_AUTOMATIC, "GIMP_TAB_STYLE_AUTOMATIC", "automatic" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TAB_STYLE_ICON, NC_("tab-style", "Icon"), NULL },
+    { GIMP_TAB_STYLE_PREVIEW, NC_("tab-style", "Current status"), NULL },
+    { GIMP_TAB_STYLE_NAME, NC_("tab-style", "Text"), NULL },
+    { GIMP_TAB_STYLE_BLURB, NC_("tab-style", "Description"), NULL },
+    { GIMP_TAB_STYLE_ICON_NAME, NC_("tab-style", "Icon & text"), NULL },
+    { GIMP_TAB_STYLE_ICON_BLURB, NC_("tab-style", "Icon & desc"), NULL },
+    { GIMP_TAB_STYLE_PREVIEW_NAME, NC_("tab-style", "Status & text"), NULL },
+    { GIMP_TAB_STYLE_PREVIEW_BLURB, NC_("tab-style", "Status & desc"), NULL },
+    { GIMP_TAB_STYLE_UNDEFINED, NC_("tab-style", "Undefined"), NULL },
+    { GIMP_TAB_STYLE_AUTOMATIC, NC_("tab-style", "Automatic"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTabStyle", values);
+      gimp_type_set_translation_context (type, "tab-style");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_tag_entry_mode_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TAG_ENTRY_MODE_QUERY, "GIMP_TAG_ENTRY_MODE_QUERY", "query" },
+    { GIMP_TAG_ENTRY_MODE_ASSIGN, "GIMP_TAG_ENTRY_MODE_ASSIGN", "assign" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TAG_ENTRY_MODE_QUERY, "GIMP_TAG_ENTRY_MODE_QUERY", NULL },
+    { GIMP_TAG_ENTRY_MODE_ASSIGN, "GIMP_TAG_ENTRY_MODE_ASSIGN", NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (G_UNLIKELY (! type))
+    {
+      type = g_enum_register_static ("GimpTagEntryMode", values);
+      gimp_type_set_translation_context (type, "tag-entry-mode");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+
+/* Generated data ends here */
+
diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h
new file mode 100644
index 0000000..9a09222
--- /dev/null
+++ b/app/widgets/widgets-enums.h
@@ -0,0 +1,315 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WIDGETS_ENUMS_H__
+#define __WIDGETS_ENUMS_H__
+
+
+/*
+ * enums that are registered with the type system
+ */
+
+#define GIMP_TYPE_ACTIVE_COLOR (gimp_active_color_get_type ())
+
+GType gimp_active_color_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_ACTIVE_COLOR_FOREGROUND, /*< desc="Foreground" >*/
+  GIMP_ACTIVE_COLOR_BACKGROUND  /*< desc="Background" >*/
+} GimpActiveColor;
+
+
+#define GIMP_TYPE_CIRCLE_BACKGROUND (gimp_circle_background_get_type ())
+
+GType gimp_circle_background_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_CIRCLE_BACKGROUND_PLAIN, /*< desc="Plain" >*/
+  GIMP_CIRCLE_BACKGROUND_HSV    /*< desc="HSV"   >*/
+} GimpCircleBackground;
+
+
+#define GIMP_TYPE_COLOR_DIALOG_STATE (gimp_color_dialog_state_get_type ())
+
+GType gimp_color_dialog_state_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_COLOR_DIALOG_OK,
+  GIMP_COLOR_DIALOG_CANCEL,
+  GIMP_COLOR_DIALOG_UPDATE
+} GimpColorDialogState;
+
+
+#define GIMP_TYPE_COLOR_PICK_TARGET (gimp_color_pick_target_get_type ())
+
+GType gimp_color_pick_target_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_COLOR_PICK_TARGET_NONE,       /*< desc="Pick only"            >*/
+  GIMP_COLOR_PICK_TARGET_FOREGROUND, /*< desc="Set foreground color" >*/
+  GIMP_COLOR_PICK_TARGET_BACKGROUND, /*< desc="Set background color" >*/
+  GIMP_COLOR_PICK_TARGET_PALETTE     /*< desc="Add to palette"       >*/
+} GimpColorPickTarget;
+
+
+#define GIMP_TYPE_COLOR_PICK_STATE (gimp_color_pick_state_get_type ())
+
+GType gimp_color_pick_state_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_COLOR_PICK_STATE_START,
+  GIMP_COLOR_PICK_STATE_UPDATE,
+  GIMP_COLOR_PICK_STATE_END
+} GimpColorPickState;
+
+
+#define GIMP_TYPE_HISTOGRAM_SCALE (gimp_histogram_scale_get_type ())
+
+GType gimp_histogram_scale_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_HISTOGRAM_SCALE_LINEAR,       /*< desc="Linear histogram"      >*/
+  GIMP_HISTOGRAM_SCALE_LOGARITHMIC   /*< desc="Logarithmic histogram" >*/
+} GimpHistogramScale;
+
+
+#define GIMP_TYPE_TAB_STYLE (gimp_tab_style_get_type ())
+
+GType gimp_tab_style_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TAB_STYLE_ICON,          /*< desc="Icon"           >*/
+  GIMP_TAB_STYLE_PREVIEW,       /*< desc="Current status" >*/
+  GIMP_TAB_STYLE_NAME,          /*< desc="Text"           >*/
+  GIMP_TAB_STYLE_BLURB,         /*< desc="Description"    >*/
+  GIMP_TAB_STYLE_ICON_NAME,     /*< desc="Icon & text"    >*/
+  GIMP_TAB_STYLE_ICON_BLURB,    /*< desc="Icon & desc"    >*/
+  GIMP_TAB_STYLE_PREVIEW_NAME,  /*< desc="Status & text"  >*/
+  GIMP_TAB_STYLE_PREVIEW_BLURB, /*< desc="Status & desc"  >*/
+  GIMP_TAB_STYLE_UNDEFINED,     /*< desc="Undefined"      >*/
+  GIMP_TAB_STYLE_AUTOMATIC      /*< desc="Automatic"      >*/
+} GimpTabStyle;
+
+
+#define GIMP_TYPE_TAG_ENTRY_MODE       (gimp_tag_entry_mode_get_type ())
+
+GType gimp_tag_entry_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TAG_ENTRY_MODE_QUERY,
+  GIMP_TAG_ENTRY_MODE_ASSIGN,
+} GimpTagEntryMode;
+
+
+/*
+ * non-registered enums; register them if needed
+ */
+
+typedef enum  /*< skip >*/
+{
+  GIMP_VIEW_BG_CHECKS,
+  GIMP_VIEW_BG_WHITE
+} GimpViewBG;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_VIEW_BORDER_BLACK,
+  GIMP_VIEW_BORDER_WHITE,
+  GIMP_VIEW_BORDER_RED,
+  GIMP_VIEW_BORDER_GREEN
+} GimpViewBorderType;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_DND_TYPE_NONE         = 0,
+  GIMP_DND_TYPE_URI_LIST     = 1,
+  GIMP_DND_TYPE_TEXT_PLAIN   = 2,
+  GIMP_DND_TYPE_NETSCAPE_URL = 3,
+  GIMP_DND_TYPE_XDS          = 4,
+  GIMP_DND_TYPE_COLOR        = 5,
+  GIMP_DND_TYPE_SVG          = 6,
+  GIMP_DND_TYPE_SVG_XML      = 7,
+  GIMP_DND_TYPE_PIXBUF       = 8,
+  GIMP_DND_TYPE_IMAGE        = 9,
+  GIMP_DND_TYPE_COMPONENT    = 10,
+  GIMP_DND_TYPE_LAYER        = 11,
+  GIMP_DND_TYPE_CHANNEL      = 12,
+  GIMP_DND_TYPE_LAYER_MASK   = 13,
+  GIMP_DND_TYPE_VECTORS      = 14,
+  GIMP_DND_TYPE_BRUSH        = 15,
+  GIMP_DND_TYPE_PATTERN      = 16,
+  GIMP_DND_TYPE_GRADIENT     = 17,
+  GIMP_DND_TYPE_PALETTE      = 18,
+  GIMP_DND_TYPE_FONT         = 19,
+  GIMP_DND_TYPE_BUFFER       = 20,
+  GIMP_DND_TYPE_IMAGEFILE    = 21,
+  GIMP_DND_TYPE_TEMPLATE     = 22,
+  GIMP_DND_TYPE_TOOL_ITEM    = 23,
+  GIMP_DND_TYPE_DIALOG       = 24,
+
+  GIMP_DND_TYPE_LAST         = GIMP_DND_TYPE_DIALOG
+} GimpDndType;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_DROP_NONE,
+  GIMP_DROP_ABOVE,
+  GIMP_DROP_BELOW
+} GimpDropType;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_CURSOR_NONE = 1024,  /* (GDK_LAST_CURSOR + 2) yes, this is insane */
+  GIMP_CURSOR_MOUSE,
+  GIMP_CURSOR_CROSSHAIR,
+  GIMP_CURSOR_CROSSHAIR_SMALL,
+  GIMP_CURSOR_BAD,
+  GIMP_CURSOR_MOVE,
+  GIMP_CURSOR_ZOOM,
+  GIMP_CURSOR_COLOR_PICKER,
+  GIMP_CURSOR_CORNER_TOP,
+  GIMP_CURSOR_CORNER_TOP_RIGHT,
+  GIMP_CURSOR_CORNER_RIGHT,
+  GIMP_CURSOR_CORNER_BOTTOM_RIGHT,
+  GIMP_CURSOR_CORNER_BOTTOM,
+  GIMP_CURSOR_CORNER_BOTTOM_LEFT,
+  GIMP_CURSOR_CORNER_LEFT,
+  GIMP_CURSOR_CORNER_TOP_LEFT,
+  GIMP_CURSOR_SIDE_TOP,
+  GIMP_CURSOR_SIDE_TOP_RIGHT,
+  GIMP_CURSOR_SIDE_RIGHT,
+  GIMP_CURSOR_SIDE_BOTTOM_RIGHT,
+  GIMP_CURSOR_SIDE_BOTTOM,
+  GIMP_CURSOR_SIDE_BOTTOM_LEFT,
+  GIMP_CURSOR_SIDE_LEFT,
+  GIMP_CURSOR_SIDE_TOP_LEFT,
+  GIMP_CURSOR_LAST
+} GimpCursorType;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_TOOL_CURSOR_NONE,
+  GIMP_TOOL_CURSOR_RECT_SELECT,
+  GIMP_TOOL_CURSOR_ELLIPSE_SELECT,
+  GIMP_TOOL_CURSOR_FREE_SELECT,
+  GIMP_TOOL_CURSOR_POLYGON_SELECT,
+  GIMP_TOOL_CURSOR_FUZZY_SELECT,
+  GIMP_TOOL_CURSOR_PATHS,
+  GIMP_TOOL_CURSOR_PATHS_ANCHOR,
+  GIMP_TOOL_CURSOR_PATHS_CONTROL,
+  GIMP_TOOL_CURSOR_PATHS_SEGMENT,
+  GIMP_TOOL_CURSOR_ISCISSORS,
+  GIMP_TOOL_CURSOR_MOVE,
+  GIMP_TOOL_CURSOR_ZOOM,
+  GIMP_TOOL_CURSOR_CROP,
+  GIMP_TOOL_CURSOR_RESIZE,
+  GIMP_TOOL_CURSOR_ROTATE,
+  GIMP_TOOL_CURSOR_SHEAR,
+  GIMP_TOOL_CURSOR_PERSPECTIVE,
+  GIMP_TOOL_CURSOR_TRANSFORM_3D_CAMERA,
+  GIMP_TOOL_CURSOR_FLIP_HORIZONTAL,
+  GIMP_TOOL_CURSOR_FLIP_VERTICAL,
+  GIMP_TOOL_CURSOR_TEXT,
+  GIMP_TOOL_CURSOR_COLOR_PICKER,
+  GIMP_TOOL_CURSOR_BUCKET_FILL,
+  GIMP_TOOL_CURSOR_GRADIENT,
+  GIMP_TOOL_CURSOR_PENCIL,
+  GIMP_TOOL_CURSOR_PAINTBRUSH,
+  GIMP_TOOL_CURSOR_AIRBRUSH,
+  GIMP_TOOL_CURSOR_INK,
+  GIMP_TOOL_CURSOR_CLONE,
+  GIMP_TOOL_CURSOR_HEAL,
+  GIMP_TOOL_CURSOR_ERASER,
+  GIMP_TOOL_CURSOR_SMUDGE,
+  GIMP_TOOL_CURSOR_BLUR,
+  GIMP_TOOL_CURSOR_DODGE,
+  GIMP_TOOL_CURSOR_BURN,
+  GIMP_TOOL_CURSOR_MEASURE,
+  GIMP_TOOL_CURSOR_WARP,
+  GIMP_TOOL_CURSOR_HAND,
+  GIMP_TOOL_CURSOR_LAST
+} GimpToolCursorType;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_CURSOR_MODIFIER_NONE,
+  GIMP_CURSOR_MODIFIER_BAD,
+  GIMP_CURSOR_MODIFIER_PLUS,
+  GIMP_CURSOR_MODIFIER_MINUS,
+  GIMP_CURSOR_MODIFIER_INTERSECT,
+  GIMP_CURSOR_MODIFIER_MOVE,
+  GIMP_CURSOR_MODIFIER_RESIZE,
+  GIMP_CURSOR_MODIFIER_ROTATE,
+  GIMP_CURSOR_MODIFIER_ZOOM,
+  GIMP_CURSOR_MODIFIER_CONTROL,
+  GIMP_CURSOR_MODIFIER_ANCHOR,
+  GIMP_CURSOR_MODIFIER_FOREGROUND,
+  GIMP_CURSOR_MODIFIER_BACKGROUND,
+  GIMP_CURSOR_MODIFIER_PATTERN,
+  GIMP_CURSOR_MODIFIER_JOIN,
+  GIMP_CURSOR_MODIFIER_SELECT,
+  GIMP_CURSOR_MODIFIER_LAST
+} GimpCursorModifier;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_DEVICE_VALUE_MODE       = 1 << 0,
+  GIMP_DEVICE_VALUE_AXES       = 1 << 1,
+  GIMP_DEVICE_VALUE_KEYS       = 1 << 2,
+  GIMP_DEVICE_VALUE_TOOL       = 1 << 3,
+  GIMP_DEVICE_VALUE_FOREGROUND = 1 << 4,
+  GIMP_DEVICE_VALUE_BACKGROUND = 1 << 5,
+  GIMP_DEVICE_VALUE_BRUSH      = 1 << 6,
+  GIMP_DEVICE_VALUE_PATTERN    = 1 << 7,
+  GIMP_DEVICE_VALUE_GRADIENT   = 1 << 8
+} GimpDeviceValues;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_DIALOGS_SHOWN,
+  GIMP_DIALOGS_HIDDEN_EXPLICITLY,  /* user used the Tab key to hide dialogs */
+  GIMP_DIALOGS_HIDDEN_WITH_DISPLAY /* dialogs are hidden with the display   */
+} GimpDialogsState;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC =    250,
+  GIMP_DASHBOARD_UPDATE_INTERVAL_0_5_SEC  =    500,
+  GIMP_DASHBOARD_UPDATE_INTERVAL_1_SEC    =   1000,
+  GIMP_DASHBOARD_UPDATE_INTERVAL_2_SEC    =   2000,
+  GIMP_DASHBOARD_UPDATE_INTERVAL_4_SEC    =   4000
+} GimpDashboardUpdateInteval;
+
+typedef enum  /*< skip >*/
+{
+  GIMP_DASHBOARD_HISTORY_DURATION_15_SEC  =  15000,
+  GIMP_DASHBOARD_HISTORY_DURATION_30_SEC  =  30000,
+  GIMP_DASHBOARD_HISTORY_DURATION_60_SEC  =  60000,
+  GIMP_DASHBOARD_HISTORY_DURATION_120_SEC = 120000,
+  GIMP_DASHBOARD_HISTORY_DURATION_240_SEC = 240000
+} GimpDashboardHistoryDuration;
+
+
+#endif /* __WIDGETS_ENUMS_H__ */
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
new file mode 100644
index 0000000..8f9334b
--- /dev/null
+++ b/app/widgets/widgets-types.h
@@ -0,0 +1,321 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WIDGETS_TYPES_H__
+#define __WIDGETS_TYPES_H__
+
+
+#include "libgimpwidgets/gimpwidgetstypes.h"
+
+#include "core/core-types.h"
+
+#include "widgets/widgets-enums.h"
+
+
+/*  input devices & controllers  */
+
+typedef struct _GimpControllerInfo           GimpControllerInfo;
+typedef struct _GimpControllerKeyboard       GimpControllerKeyboard;
+typedef struct _GimpControllerMouse          GimpControllerMouse;
+typedef struct _GimpControllerWheel          GimpControllerWheel;
+typedef struct _GimpDeviceInfo               GimpDeviceInfo;
+typedef struct _GimpDeviceManager            GimpDeviceManager;
+
+
+/*  docks  */
+
+typedef struct _GimpDock                     GimpDock;
+typedef struct _GimpDockColumns              GimpDockColumns;
+typedef struct _GimpDockContainer            GimpDockContainer; /* dummy typedef */
+typedef struct _GimpDockWindow               GimpDockWindow;
+typedef struct _GimpDockable                 GimpDockable;
+typedef struct _GimpDockbook                 GimpDockbook;
+typedef struct _GimpDocked                   GimpDocked; /* dummy typedef */
+typedef struct _GimpMenuDock                 GimpMenuDock;
+typedef struct _GimpPanedBox                 GimpPanedBox;
+typedef struct _GimpToolbox                  GimpToolbox;
+
+
+/*  GimpEditor widgets  */
+
+typedef struct _GimpColorEditor              GimpColorEditor;
+typedef struct _GimpDeviceStatus             GimpDeviceStatus;
+typedef struct _GimpEditor                   GimpEditor;
+typedef struct _GimpErrorConsole             GimpErrorConsole;
+typedef struct _GimpToolOptionsEditor        GimpToolOptionsEditor;
+typedef struct _GimpDashboard                GimpDashboard;
+
+
+/*  GimpDataEditor widgets  */
+
+typedef struct _GimpBrushEditor              GimpBrushEditor;
+typedef struct _GimpDataEditor               GimpDataEditor;
+typedef struct _GimpDynamicsEditor           GimpDynamicsEditor;
+typedef struct _GimpGradientEditor           GimpGradientEditor;
+typedef struct _GimpPaletteEditor            GimpPaletteEditor;
+typedef struct _GimpToolPresetEditor         GimpToolPresetEditor;
+
+
+/*  GimpImageEditor widgets  */
+
+typedef struct _GimpColormapEditor           GimpColormapEditor;
+typedef struct _GimpComponentEditor          GimpComponentEditor;
+typedef struct _GimpHistogramEditor          GimpHistogramEditor;
+typedef struct _GimpImageEditor              GimpImageEditor;
+typedef struct _GimpSamplePointEditor        GimpSamplePointEditor;
+typedef struct _GimpSelectionEditor          GimpSelectionEditor;
+typedef struct _GimpSymmetryEditor           GimpSymmetryEditor;
+typedef struct _GimpUndoEditor               GimpUndoEditor;
+
+
+/*  GimpContainerView and its implementors  */
+
+typedef struct _GimpChannelTreeView          GimpChannelTreeView;
+typedef struct _GimpContainerBox             GimpContainerBox;
+typedef struct _GimpContainerComboBox        GimpContainerComboBox;
+typedef struct _GimpContainerEntry           GimpContainerEntry;
+typedef struct _GimpContainerGridView        GimpContainerGridView;
+typedef struct _GimpContainerIconView        GimpContainerIconView;
+typedef struct _GimpContainerTreeStore       GimpContainerTreeStore;
+typedef struct _GimpContainerTreeView        GimpContainerTreeView;
+typedef struct _GimpContainerView            GimpContainerView; /* dummy typedef */
+typedef struct _GimpDrawableTreeView         GimpDrawableTreeView;
+typedef struct _GimpItemTreeView             GimpItemTreeView;
+typedef struct _GimpLayerTreeView            GimpLayerTreeView;
+typedef struct _GimpVectorsTreeView          GimpVectorsTreeView;
+
+typedef struct _GimpContainerPopup           GimpContainerPopup;
+typedef struct _GimpViewableButton           GimpViewableButton;
+
+
+/*  GimpContainerEditor widgets  */
+
+typedef struct _GimpContainerEditor          GimpContainerEditor;
+typedef struct _GimpBufferView               GimpBufferView;
+typedef struct _GimpDocumentView             GimpDocumentView;
+typedef struct _GimpFontView                 GimpFontView;
+typedef struct _GimpImageView                GimpImageView;
+typedef struct _GimpTemplateView             GimpTemplateView;
+typedef struct _GimpToolEditor               GimpToolEditor;
+
+
+/*  GimpDataFactoryView widgets  */
+
+typedef struct _GimpBrushFactoryView         GimpBrushFactoryView;
+typedef struct _GimpDataFactoryView          GimpDataFactoryView;
+typedef struct _GimpDynamicsFactoryView      GimpDynamicsFactoryView;
+typedef struct _GimpFontFactoryView          GimpFontFactoryView;
+typedef struct _GimpPatternFactoryView       GimpPatternFactoryView;
+typedef struct _GimpToolPresetFactoryView    GimpToolPresetFactoryView;
+
+
+/*  menus  */
+
+typedef struct _GimpAction                   GimpAction;
+typedef struct _GimpActionFactory            GimpActionFactory;
+typedef struct _GimpActionGroup              GimpActionGroup;
+typedef struct _GimpEnumAction               GimpEnumAction;
+typedef struct _GimpMenuFactory              GimpMenuFactory;
+typedef struct _GimpProcedureAction          GimpProcedureAction;
+typedef struct _GimpStringAction             GimpStringAction;
+typedef struct _GimpUIManager                GimpUIManager;
+
+
+/*  file dialogs  */
+
+typedef struct _GimpExportDialog             GimpExportDialog;
+typedef struct _GimpFileDialog               GimpFileDialog;
+typedef struct _GimpOpenDialog               GimpOpenDialog;
+typedef struct _GimpSaveDialog               GimpSaveDialog;
+
+
+/*  misc dialogs  */
+
+typedef struct _GimpColorDialog              GimpColorDialog;
+typedef struct _GimpCriticalDialog           GimpCriticalDialog;
+typedef struct _GimpErrorDialog              GimpErrorDialog;
+typedef struct _GimpMessageDialog            GimpMessageDialog;
+typedef struct _GimpProgressDialog           GimpProgressDialog;
+typedef struct _GimpTextEditor               GimpTextEditor;
+typedef struct _GimpViewableDialog           GimpViewableDialog;
+
+
+/*  GimpPdbDialog widgets  */
+
+typedef struct _GimpBrushSelect              GimpBrushSelect;
+typedef struct _GimpFontSelect               GimpFontSelect;
+typedef struct _GimpGradientSelect           GimpGradientSelect;
+typedef struct _GimpPaletteSelect            GimpPaletteSelect;
+typedef struct _GimpPatternSelect            GimpPatternSelect;
+typedef struct _GimpPdbDialog                GimpPdbDialog;
+
+
+/*  misc widgets  */
+
+typedef struct _GimpAccelLabel               GimpAccelLabel;
+typedef struct _GimpActionEditor             GimpActionEditor;
+typedef struct _GimpActionView               GimpActionView;
+typedef struct _GimpBlobEditor               GimpBlobEditor;
+typedef struct _GimpBufferSourceBox          GimpBufferSourceBox;
+typedef struct _GimpCircle                   GimpCircle;
+typedef struct _GimpColorBar                 GimpColorBar;
+typedef struct _GimpColorDisplayEditor       GimpColorDisplayEditor;
+typedef struct _GimpColorFrame               GimpColorFrame;
+typedef struct _GimpColorHistory             GimpColorHistory;
+typedef struct _GimpColorPanel               GimpColorPanel;
+typedef struct _GimpComboTagEntry            GimpComboTagEntry;
+typedef struct _GimpCompressionComboBox      GimpCompressionComboBox;
+typedef struct _GimpControllerEditor         GimpControllerEditor;
+typedef struct _GimpControllerList           GimpControllerList;
+typedef struct _GimpCurveView                GimpCurveView;
+typedef struct _GimpDashEditor               GimpDashEditor;
+typedef struct _GimpDeviceEditor             GimpDeviceEditor;
+typedef struct _GimpDeviceInfoEditor         GimpDeviceInfoEditor;
+typedef struct _GimpDial                     GimpDial;
+typedef struct _GimpDynamicsOutputEditor     GimpDynamicsOutputEditor;
+typedef struct _GimpFgBgEditor               GimpFgBgEditor;
+typedef struct _GimpFgBgView                 GimpFgBgView;
+typedef struct _GimpFileProcView             GimpFileProcView;
+typedef struct _GimpFillEditor               GimpFillEditor;
+typedef struct _GimpGridEditor               GimpGridEditor;
+typedef struct _GimpHandleBar                GimpHandleBar;
+typedef struct _GimpHighlightableButton      GimpHighlightableButton;
+typedef struct _GimpHistogramBox             GimpHistogramBox;
+typedef struct _GimpHistogramView            GimpHistogramView;
+typedef struct _GimpIconPicker               GimpIconPicker;
+typedef struct _GimpIconSizeScale            GimpIconSizeScale;
+typedef struct _GimpImageCommentEditor       GimpImageCommentEditor;
+typedef struct _GimpImageParasiteView        GimpImageParasiteView;
+typedef struct _GimpImageProfileView         GimpImageProfileView;
+typedef struct _GimpImagePropView            GimpImagePropView;
+typedef struct _GimpLanguageComboBox         GimpLanguageComboBox;
+typedef struct _GimpLanguageEntry            GimpLanguageEntry;
+typedef struct _GimpLanguageStore            GimpLanguageStore;
+typedef struct _GimpLayerModeBox             GimpLayerModeBox;
+typedef struct _GimpLayerModeComboBox        GimpLayerModeComboBox;
+typedef struct _GimpMessageBox               GimpMessageBox;
+typedef struct _GimpMeter                    GimpMeter;
+typedef struct _GimpOverlayBox               GimpOverlayBox;
+typedef struct _GimpPickableButton           GimpPickableButton;
+typedef struct _GimpPickablePopup            GimpPickablePopup;
+typedef struct _GimpPivotSelector            GimpPivotSelector;
+typedef struct _GimpPlugInView               GimpPlugInView;
+typedef struct _GimpPolar                    GimpPolar;
+typedef struct _GimpPopup                    GimpPopup;
+typedef struct _GimpPrefsBox                 GimpPrefsBox;
+typedef struct _GimpProgressBox              GimpProgressBox;
+typedef struct _GimpScaleButton              GimpScaleButton;
+typedef struct _GimpSettingsBox              GimpSettingsBox;
+typedef struct _GimpSettingsEditor           GimpSettingsEditor;
+typedef struct _GimpSizeBox                  GimpSizeBox;
+typedef struct _GimpStrokeEditor             GimpStrokeEditor;
+typedef struct _GimpTagEntry                 GimpTagEntry;
+typedef struct _GimpTagPopup                 GimpTagPopup;
+typedef struct _GimpTemplateEditor           GimpTemplateEditor;
+typedef struct _GimpTextStyleEditor          GimpTextStyleEditor;
+typedef struct _GimpThumbBox                 GimpThumbBox;
+typedef struct _GimpToolButton               GimpToolButton;
+typedef struct _GimpToolPalette              GimpToolPalette;
+typedef struct _GimpTranslationStore         GimpTranslationStore;
+typedef struct _GimpWindow                   GimpWindow;
+
+
+/*  views  */
+
+typedef struct _GimpNavigationView           GimpNavigationView;
+typedef struct _GimpPaletteView              GimpPaletteView;
+typedef struct _GimpView                     GimpView;
+
+
+/*  view renderers  */
+
+typedef struct _GimpViewRenderer             GimpViewRenderer;
+typedef struct _GimpViewRendererBrush        GimpViewRendererBrush;
+typedef struct _GimpViewRendererBuffer       GimpViewRendererBuffer;
+typedef struct _GimpViewRendererDrawable     GimpViewRendererDrawable;
+typedef struct _GimpViewRendererGradient     GimpViewRendererGradient;
+typedef struct _GimpViewRendererImage        GimpViewRendererImage;
+typedef struct _GimpViewRendererImagefile    GimpViewRendererImagefile;
+typedef struct _GimpViewRendererLayer        GimpViewRendererLayer;
+typedef struct _GimpViewRendererPalette      GimpViewRendererPalette;
+typedef struct _GimpViewRendererVectors      GimpViewRendererVectors;
+
+
+/*  cell renderers  */
+
+typedef struct _GimpCellRendererButton       GimpCellRendererButton;
+typedef struct _GimpCellRendererDashes       GimpCellRendererDashes;
+typedef struct _GimpCellRendererViewable     GimpCellRendererViewable;
+
+
+/*  misc objects  */
+
+typedef struct _GimpDialogFactory            GimpDialogFactory;
+typedef struct _GimpTextBuffer               GimpTextBuffer;
+typedef struct _GimpUIConfigurer             GimpUIConfigurer;
+typedef struct _GimpWindowStrategy           GimpWindowStrategy;
+
+
+/*  session management objects and structs  */
+
+typedef struct _GimpSessionInfo              GimpSessionInfo;
+typedef struct _GimpSessionInfoAux           GimpSessionInfoAux;
+typedef struct _GimpSessionInfoBook          GimpSessionInfoBook;
+typedef struct _GimpSessionInfoDock          GimpSessionInfoDock;
+typedef struct _GimpSessionInfoDockable      GimpSessionInfoDockable;
+typedef struct _GimpSessionManaged           GimpSessionManaged;
+
+
+/*  structs  */
+
+typedef struct _GimpActionEntry              GimpActionEntry;
+typedef struct _GimpEnumActionEntry          GimpEnumActionEntry;
+typedef struct _GimpProcedureActionEntry     GimpProcedureActionEntry;
+typedef struct _GimpRadioActionEntry         GimpRadioActionEntry;
+typedef struct _GimpStringActionEntry        GimpStringActionEntry;
+typedef struct _GimpToggleActionEntry        GimpToggleActionEntry;
+
+typedef struct _GimpDialogFactoryEntry       GimpDialogFactoryEntry;
+
+typedef struct _GimpDashboardLogParams       GimpDashboardLogParams;
+
+
+/*  function types  */
+
+typedef GtkWidget * (* GimpDialogRestoreFunc)        (GimpDialogFactory *factory,
+                                                      GdkScreen         *screen,
+                                                      gint               monitor,
+                                                      GimpSessionInfo   *info);
+typedef void        (* GimpActionGroupSetupFunc)     (GimpActionGroup   *group);
+typedef void        (* GimpActionGroupUpdateFunc)    (GimpActionGroup   *group,
+                                                      gpointer           data);
+
+typedef void        (* GimpUIManagerSetupFunc)       (GimpUIManager     *manager,
+                                                      const gchar       *ui_path);
+
+typedef void        (* GimpMenuPositionFunc)         (GtkMenu           *menu,
+                                                      gint              *x,
+                                                      gint              *y,
+                                                      gpointer           data);
+typedef gboolean    (* GimpPanedBoxDroppedFunc)      (GtkWidget         *source,
+                                                      gint               insert_index,
+                                                      gpointer           data);
+
+typedef GtkWidget * (* GimpToolOptionsGUIFunc)       (GimpToolOptions   *tool_options);
+
+
+#endif /* __WIDGETS_TYPES_H__ */
diff --git a/app/xcf/Makefile.am b/app/xcf/Makefile.am
new file mode 100644
index 0000000..a95a87c
--- /dev/null
+++ b/app/xcf/Makefile.am
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-XCF\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappxcf.a
+
+libappxcf_a_SOURCES = \
+	xcf.c		\
+	xcf.h		\
+	xcf-load.c	\
+	xcf-load.h	\
+	xcf-read.c	\
+	xcf-read.h	\
+	xcf-private.h	\
+	xcf-save.c	\
+	xcf-save.h	\
+	xcf-seek.c	\
+	xcf-seek.h	\
+	xcf-utils.c	\
+	xcf-utils.h	\
+	xcf-write.c	\
+	xcf-write.h
diff --git a/app/xcf/Makefile.in b/app/xcf/Makefile.in
new file mode 100644
index 0000000..25b195f
--- /dev/null
+++ b/app/xcf/Makefile.in
@@ -0,0 +1,951 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = app/xcf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
+	$(top_srcdir)/m4macros/ax_compare_version.m4 \
+	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
+	$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
+	$(top_srcdir)/m4macros/detectcflags.m4 \
+	$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libappxcf_a_AR = $(AR) $(ARFLAGS)
+libappxcf_a_LIBADD =
+am_libappxcf_a_OBJECTS = xcf.$(OBJEXT) xcf-load.$(OBJEXT) \
+	xcf-read.$(OBJEXT) xcf-save.$(OBJEXT) xcf-seek.$(OBJEXT) \
+	xcf-utils.$(OBJEXT) xcf-write.$(OBJEXT)
+libappxcf_a_OBJECTS = $(am_libappxcf_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/xcf-load.Po ./$(DEPDIR)/xcf-read.Po \
+	./$(DEPDIR)/xcf-save.Po ./$(DEPDIR)/xcf-seek.Po \
+	./$(DEPDIR)/xcf-utils.Po ./$(DEPDIR)/xcf-write.Po \
+	./$(DEPDIR)/xcf.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libappxcf_a_SOURCES)
+DIST_SOURCES = $(libappxcf_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+AA_LIBS = @AA_LIBS@
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AS = @AS@
+ATK_CFLAGS = @ATK_CFLAGS@
+ATK_LIBS = @ATK_LIBS@
+ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABL_CFLAGS = @BABL_CFLAGS@
+BABL_LIBS = @BABL_LIBS@
+BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
+BUG_REPORT_URL = @BUG_REPORT_URL@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+BZIP2_LIBS = @BZIP2_LIBS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
+CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
+CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
+CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DESKTOP_DATADIR = @DESKTOP_DATADIR@
+DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
+DLLTOOL = @DLLTOOL@
+DOC_SHOOTER = @DOC_SHOOTER@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_AA = @FILE_AA@
+FILE_EXR = @FILE_EXR@
+FILE_HEIF = @FILE_HEIF@
+FILE_JP2_LOAD = @FILE_JP2_LOAD@
+FILE_JPEGXL = @FILE_JPEGXL@
+FILE_MNG = @FILE_MNG@
+FILE_PDF_SAVE = @FILE_PDF_SAVE@
+FILE_PS = @FILE_PS@
+FILE_WMF = @FILE_WMF@
+FILE_XMC = @FILE_XMC@
+FILE_XPM = @FILE_XPM@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
+FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GDBUS_CODEGEN = @GDBUS_CODEGEN@
+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
+GEGL = @GEGL@
+GEGL_CFLAGS = @GEGL_CFLAGS@
+GEGL_LIBS = @GEGL_LIBS@
+GEGL_MAJOR_MINOR_VERSION = @GEGL_MAJOR_MINOR_VERSION@
+GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
+GEXIV2_LIBS = @GEXIV2_LIBS@
+GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
+GIMP_API_VERSION = @GIMP_API_VERSION@
+GIMP_APP_VERSION = @GIMP_APP_VERSION@
+GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
+GIMP_COMMAND = @GIMP_COMMAND@
+GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
+GIMP_FULL_NAME = @GIMP_FULL_NAME@
+GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
+GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@
+GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@
+GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@
+GIMP_MKENUMS = @GIMP_MKENUMS@
+GIMP_MODULES = @GIMP_MODULES@
+GIMP_PACKAGE_REVISION = @GIMP_PACKAGE_REVISION@
+GIMP_PKGCONFIG_VERSION = @GIMP_PKGCONFIG_VERSION@
+GIMP_PLUGINS = @GIMP_PLUGINS@
+GIMP_PLUGIN_VERSION = @GIMP_PLUGIN_VERSION@
+GIMP_REAL_VERSION = @GIMP_REAL_VERSION@
+GIMP_RELEASE = @GIMP_RELEASE@
+GIMP_SYSCONF_VERSION = @GIMP_SYSCONF_VERSION@
+GIMP_TOOL_VERSION = @GIMP_TOOL_VERSION@
+GIMP_UNSTABLE = @GIMP_UNSTABLE@
+GIMP_USER_VERSION = @GIMP_USER_VERSION@
+GIMP_VERSION = @GIMP_VERSION@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
+GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
+GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GS_LIBS = @GS_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
+GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+GUDEV_CFLAGS = @GUDEV_CFLAGS@
+GUDEV_LIBS = @GUDEV_LIBS@
+HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
+HAVE_CXX14 = @HAVE_CXX14@
+HAVE_FINITE = @HAVE_FINITE@
+HAVE_ISFINITE = @HAVE_ISFINITE@
+HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
+ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
+JPEG_LIBS = @JPEG_LIBS@
+JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+JXL_CFLAGS = @JXL_CFLAGS@
+JXL_LIBS = @JXL_LIBS@
+JXL_THREADS_CFLAGS = @JXL_THREADS_CFLAGS@
+JXL_THREADS_LIBS = @JXL_THREADS_LIBS@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBACKTRACE_LIBS = @LIBBACKTRACE_LIBS@
+LIBHEIF_CFLAGS = @LIBHEIF_CFLAGS@
+LIBHEIF_LIBS = @LIBHEIF_LIBS@
+LIBHEIF_REQUIRED_VERSION = @LIBHEIF_REQUIRED_VERSION@
+LIBJXL_REQUIRED_VERSION = @LIBJXL_REQUIRED_VERSION@
+LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
+LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
+LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
+LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBUNWIND_REQUIRED_VERSION = @LIBUNWIND_REQUIRED_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+LZMA_CFLAGS = @LZMA_CFLAGS@
+LZMA_LIBS = @LZMA_LIBS@
+MAIL = @MAIL@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
+MIME_INFO_LIBS = @MIME_INFO_LIBS@
+MIME_TYPES = @MIME_TYPES@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@
+MNG_CFLAGS = @MNG_CFLAGS@
+MNG_LIBS = @MNG_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
+MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
+NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
+NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
+OPENEXR_LIBS = @OPENEXR_LIBS@
+OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
+OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
+PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
+PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
+PATHSEP = @PATHSEP@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
+PERL_VERSION = @PERL_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POFILES = @POFILES@
+POPPLER_CFLAGS = @POPPLER_CFLAGS@
+POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
+POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
+POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
+POPPLER_LIBS = @POPPLER_LIBS@
+POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYBIN_PATH = @PYBIN_PATH@
+PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
+PYCAIRO_LIBS = @PYCAIRO_LIBS@
+PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
+PYGTK_CFLAGS = @PYGTK_CFLAGS@
+PYGTK_CODEGEN = @PYGTK_CODEGEN@
+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
+PYGTK_LIBS = @PYGTK_LIBS@
+PYLINK_LIBS = @PYLINK_LIBS@
+PYTHON = @PYTHON@
+PYTHON2_REQUIRED_VERSION = @PYTHON2_REQUIRED_VERSION@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
+RT_LIBS = @RT_LIBS@
+SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
+SED = @SED@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
+SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
+SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
+STRIP = @STRIP@
+SVG_CFLAGS = @SVG_CFLAGS@
+SVG_LIBS = @SVG_LIBS@
+SYMPREFIX = @SYMPREFIX@
+TIFF_LIBS = @TIFF_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
+WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
+WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
+WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
+WEBPMUX_LIBS = @WEBPMUX_LIBS@
+WEBP_CFLAGS = @WEBP_CFLAGS@
+WEBP_LIBS = @WEBP_LIBS@
+WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
+WEB_PAGE = @WEB_PAGE@
+WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
+WINDRES = @WINDRES@
+WMF_CFLAGS = @WMF_CFLAGS@
+WMF_CONFIG = @WMF_CONFIG@
+WMF_LIBS = @WMF_LIBS@
+WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
+XDG_EMAIL = @XDG_EMAIL@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
+XMC_CFLAGS = @XMC_CFLAGS@
+XMC_LIBS = @XMC_LIBS@
+XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
+XMU_LIBS = @XMU_LIBS@
+XPM_LIBS = @XPM_LIBS@
+XSLTPROC = @XSLTPROC@
+XVFB_RUN = @XVFB_RUN@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+Z_LIBS = @Z_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimpdatadir = @gimpdatadir@
+gimpdir = @gimpdir@
+gimplocaledir = @gimplocaledir@
+gimpplugindir = @gimpplugindir@
+gimpsysconfdir = @gimpsysconfdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+manpage_gimpdir = @manpage_gimpdir@
+mkdir_p = @mkdir_p@
+ms_librarian = @ms_librarian@
+mypaint_brushes_dir = @mypaint_brushes_dir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-XCF\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappxcf.a
+libappxcf_a_SOURCES = \
+	xcf.c		\
+	xcf.h		\
+	xcf-load.c	\
+	xcf-load.h	\
+	xcf-read.c	\
+	xcf-read.h	\
+	xcf-private.h	\
+	xcf-save.c	\
+	xcf-save.h	\
+	xcf-seek.c	\
+	xcf-seek.h	\
+	xcf-utils.c	\
+	xcf-utils.h	\
+	xcf-write.c	\
+	xcf-write.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/xcf/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu app/xcf/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libappxcf.a: $(libappxcf_a_OBJECTS) $(libappxcf_a_DEPENDENCIES) $(EXTRA_libappxcf_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libappxcf.a
+	$(AM_V_AR)$(libappxcf_a_AR) libappxcf.a $(libappxcf_a_OBJECTS) $(libappxcf_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libappxcf.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf-load.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf-read.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf-save.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf-seek.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf-write.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcf.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/xcf-load.Po
+	-rm -f ./$(DEPDIR)/xcf-read.Po
+	-rm -f ./$(DEPDIR)/xcf-save.Po
+	-rm -f ./$(DEPDIR)/xcf-seek.Po
+	-rm -f ./$(DEPDIR)/xcf-utils.Po
+	-rm -f ./$(DEPDIR)/xcf-write.Po
+	-rm -f ./$(DEPDIR)/xcf.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/xcf-load.Po
+	-rm -f ./$(DEPDIR)/xcf-read.Po
+	-rm -f ./$(DEPDIR)/xcf-save.Po
+	-rm -f ./$(DEPDIR)/xcf-seek.Po
+	-rm -f ./$(DEPDIR)/xcf-utils.Po
+	-rm -f ./$(DEPDIR)/xcf-write.Po
+	-rm -f ./$(DEPDIR)/xcf.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
new file mode 100644
index 0000000..da196bc
--- /dev/null
+++ b/app/xcf/xcf-load.c
@@ -0,0 +1,3246 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <zlib.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core/core-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "gegl/gimp-babl.h"
+#include "gegl/gimp-gegl-tile-compat.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpdrawable-private.h" /* eek */
+#include "core/gimpgrid.h"
+#include "core/gimpgrouplayer.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-metadata.h"
+#include "core/gimpimage-private.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpimage-symmetry.h"
+#include "core/gimpimage-undo.h"
+#include "core/gimpitemstack.h"
+#include "core/gimplayer-floating-selection.h"
+#include "core/gimplayer-new.h"
+#include "core/gimplayermask.h"
+#include "core/gimpparasitelist.h"
+#include "core/gimpprogress.h"
+#include "core/gimpselection.h"
+#include "core/gimpsymmetry.h"
+#include "core/gimptemplate.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "text/gimptextlayer.h"
+#include "text/gimptextlayer-xcf.h"
+
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-compat.h"
+
+#include "xcf-private.h"
+#include "xcf-load.h"
+#include "xcf-read.h"
+#include "xcf-seek.h"
+#include "xcf-utils.h"
+
+#include "gimp-log.h"
+#include "gimp-intl.h"
+
+
+#define MAX_XCF_PARASITE_DATA_LEN (256L * 1024 * 1024)
+
+/* #define GIMP_XCF_PATH_DEBUG */
+
+
+static void            xcf_load_add_masks     (GimpImage     *image);
+static gboolean        xcf_load_image_props   (XcfInfo       *info,
+                                               GimpImage     *image);
+static gboolean        xcf_load_layer_props   (XcfInfo       *info,
+                                               GimpImage     *image,
+                                               GimpLayer    **layer,
+                                               GList        **item_path,
+                                               gboolean      *apply_mask,
+                                               gboolean      *edit_mask,
+                                               gboolean      *show_mask,
+                                               guint32       *text_layer_flags,
+                                               guint32       *group_layer_flags);
+static gboolean        xcf_check_layer_props  (XcfInfo       *info,
+                                               GList        **item_path,
+                                               gboolean      *is_group_layer,
+                                               gboolean      *is_text_layer);
+static gboolean        xcf_load_channel_props (XcfInfo       *info,
+                                               GimpImage     *image,
+                                               GimpChannel  **channel);
+static gboolean        xcf_load_prop          (XcfInfo       *info,
+                                               PropType      *prop_type,
+                                               guint32       *prop_size);
+static GimpLayer     * xcf_load_layer         (XcfInfo       *info,
+                                               GimpImage     *image,
+                                               GList        **item_path);
+static GimpChannel   * xcf_load_channel       (XcfInfo       *info,
+                                               GimpImage     *image);
+static GimpLayerMask * xcf_load_layer_mask    (XcfInfo       *info,
+                                               GimpImage     *image);
+static gboolean        xcf_load_buffer        (XcfInfo       *info,
+                                               GeglBuffer    *buffer);
+static gboolean        xcf_load_level         (XcfInfo       *info,
+                                               GeglBuffer    *buffer);
+static gboolean        xcf_load_tile          (XcfInfo       *info,
+                                               GeglBuffer    *buffer,
+                                               GeglRectangle *tile_rect,
+                                               const Babl    *format);
+static gboolean        xcf_load_tile_rle      (XcfInfo       *info,
+                                               GeglBuffer    *buffer,
+                                               GeglRectangle *tile_rect,
+                                               const Babl    *format,
+                                               gint           data_length);
+static gboolean        xcf_load_tile_zlib     (XcfInfo       *info,
+                                               GeglBuffer    *buffer,
+                                               GeglRectangle *tile_rect,
+                                               const Babl    *format,
+                                               gint           data_length);
+static GimpParasite  * xcf_load_parasite      (XcfInfo       *info);
+static gboolean        xcf_load_old_paths     (XcfInfo       *info,
+                                               GimpImage     *image);
+static gboolean        xcf_load_old_path      (XcfInfo       *info,
+                                               GimpImage     *image);
+static gboolean        xcf_load_vectors       (XcfInfo       *info,
+                                               GimpImage     *image);
+static gboolean        xcf_load_vector        (XcfInfo       *info,
+                                               GimpImage     *image);
+
+static gboolean        xcf_skip_unknown_prop  (XcfInfo       *info,
+                                               gsize          size);
+
+static gboolean        xcf_item_path_is_parent (GList        *path,
+                                                GList        *parent_path);
+static void            xcf_fix_item_path       (GimpLayer    *layer,
+                                                GList       **path,
+                                                GList        *broken_paths);
+
+#define xcf_progress_update(info) G_STMT_START  \
+  {                                             \
+    if (info->progress)                         \
+      gimp_progress_pulse (info->progress);     \
+  } G_STMT_END
+
+
+GimpImage *
+xcf_load_image (Gimp     *gimp,
+                XcfInfo  *info,
+                GError  **error)
+{
+  GimpImage          *image = NULL;
+  const GimpParasite *parasite;
+  gboolean            has_metadata = FALSE;
+  goffset             saved_pos;
+  goffset             offset;
+  gint                width;
+  gint                height;
+  gint                image_type;
+  GimpPrecision       precision = GIMP_PRECISION_U8_GAMMA;
+  gint                num_successful_elements = 0;
+  gint                n_broken_layers         = 0;
+  gint                n_broken_channels       = 0;
+  GList              *broken_paths            = NULL;
+  GList              *group_layers            = NULL;
+  GList              *syms;
+  GList              *iter;
+
+  /* read in the image width, height and type */
+  xcf_read_int32 (info, (guint32 *) &width, 1);
+  xcf_read_int32 (info, (guint32 *) &height, 1);
+  xcf_read_int32 (info, (guint32 *) &image_type, 1);
+  if (image_type < GIMP_RGB || image_type > GIMP_INDEXED)
+    goto hard_error;
+
+  /* Be lenient with corrupt image dimensions.
+   * Hopefully layer dimensions will be valid. */
+  if (width <= 0 || height <= 0 ||
+      width > GIMP_MAX_IMAGE_SIZE || height > GIMP_MAX_IMAGE_SIZE)
+    {
+      GIMP_LOG (XCF, "Invalid image size %d x %d, setting to 1x1.", width, height);
+      width  = 1;
+      height = 1;
+    }
+
+  if (info->file_version >= 4)
+    {
+      gint p;
+
+      xcf_read_int32 (info, (guint32 *) &p, 1);
+
+      if (info->file_version == 4)
+        {
+          switch (p)
+            {
+            case 0: precision = GIMP_PRECISION_U8_GAMMA;     break;
+            case 1: precision = GIMP_PRECISION_U16_GAMMA;    break;
+            case 2: precision = GIMP_PRECISION_U32_LINEAR;   break;
+            case 3: precision = GIMP_PRECISION_HALF_LINEAR;  break;
+            case 4: precision = GIMP_PRECISION_FLOAT_LINEAR; break;
+            default:
+              goto hard_error;
+            }
+        }
+      else if (info->file_version == 5 ||
+               info->file_version == 6)
+        {
+          switch (p)
+            {
+            case 100: precision = GIMP_PRECISION_U8_LINEAR; break;
+            case 150: precision = GIMP_PRECISION_U8_GAMMA; break;
+            case 200: precision = GIMP_PRECISION_U16_LINEAR; break;
+            case 250: precision = GIMP_PRECISION_U16_GAMMA; break;
+            case 300: precision = GIMP_PRECISION_U32_LINEAR; break;
+            case 350: precision = GIMP_PRECISION_U32_GAMMA; break;
+            case 400: precision = GIMP_PRECISION_HALF_LINEAR; break;
+            case 450: precision = GIMP_PRECISION_HALF_GAMMA; break;
+            case 500: precision = GIMP_PRECISION_FLOAT_LINEAR; break;
+            case 550: precision = GIMP_PRECISION_FLOAT_GAMMA; break;
+            default:
+              goto hard_error;
+            }
+        }
+      else
+        {
+          precision = p;
+        }
+    }
+
+  GIMP_LOG (XCF, "version=%d, width=%d, height=%d, image_type=%d, precision=%d",
+            info->file_version, width, height, image_type, precision);
+
+  if (! gimp_babl_is_valid (image_type, precision))
+    {
+      gimp_message_literal (gimp, G_OBJECT (info->progress),
+                            GIMP_MESSAGE_ERROR,
+                            _("Invalid image mode and precision combination."));
+      goto hard_error;
+    }
+
+  image = gimp_create_image (gimp, width, height, image_type, precision,
+                             FALSE);
+
+  gimp_image_undo_disable (image);
+
+  xcf_progress_update (info);
+
+  /* read the image properties */
+  if (! xcf_load_image_props (info, image))
+    goto hard_error;
+
+  GIMP_LOG (XCF, "image props loaded");
+
+  /* check for a GimpGrid parasite */
+  parasite = gimp_image_parasite_find (GIMP_IMAGE (image),
+                                       gimp_grid_parasite_name ());
+  if (parasite)
+    {
+      GimpGrid *grid = gimp_grid_from_parasite (parasite);
+
+      if (grid)
+        {
+          GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+          gimp_parasite_list_remove (private->parasites,
+                                     gimp_parasite_name (parasite));
+
+          gimp_image_set_grid (GIMP_IMAGE (image), grid, FALSE);
+          g_object_unref (grid);
+        }
+    }
+
+  /* check for a metadata parasite */
+  parasite = gimp_image_parasite_find (GIMP_IMAGE (image),
+                                       "gimp-image-metadata");
+  if (parasite)
+    {
+      GimpImagePrivate *private  = GIMP_IMAGE_GET_PRIVATE (image);
+      GimpMetadata     *metadata = NULL;
+      const gchar      *meta_string;
+
+      meta_string = (gchar *) gimp_parasite_data (parasite);
+
+      if (meta_string)
+        metadata = gimp_metadata_deserialize (meta_string);
+
+      if (metadata)
+        {
+          has_metadata = TRUE;
+
+          gimp_image_set_metadata (image, metadata, FALSE);
+          g_object_unref (metadata);
+        }
+
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (parasite));
+    }
+
+  /* check for symmetry parasites */
+  syms = gimp_image_symmetry_list ();
+  for (iter = syms; iter; iter = g_list_next (iter))
+    {
+      GType  type = (GType) iter->data;
+      gchar *parasite_name = gimp_symmetry_parasite_name (type);
+
+      parasite = gimp_image_parasite_find (image,
+                                           parasite_name);
+      g_free (parasite_name);
+      if (parasite)
+        {
+          GimpSymmetry *sym = gimp_symmetry_from_parasite (parasite,
+                                                           image,
+                                                           type);
+
+          if (sym)
+            {
+              GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+              gimp_parasite_list_remove (private->parasites,
+                                         gimp_parasite_name (parasite));
+
+              gimp_image_symmetry_add (image, sym);
+
+              g_signal_emit_by_name (sym, "active-changed", NULL);
+              if (sym->active)
+                gimp_image_set_active_symmetry (image, type);
+            }
+        }
+    }
+  g_list_free (syms);
+
+  /* migrate the old "exif-data" parasite */
+  parasite = gimp_image_parasite_find (GIMP_IMAGE (image),
+                                       "exif-data");
+  if (parasite)
+    {
+      GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+      if (has_metadata)
+        {
+          g_printerr ("xcf-load: inconsistent metadata discovered: XCF file "
+                      "has both 'gimp-image-metadata' and 'exif-data' "
+                      "parasites, dropping old 'exif-data'\n");
+        }
+      else
+        {
+          GimpMetadata *metadata = gimp_image_get_metadata (image);
+          GError       *my_error = NULL;
+
+          if (metadata)
+            g_object_ref (metadata);
+          else
+            metadata = gimp_metadata_new ();
+
+          if (! gimp_metadata_set_from_exif (metadata,
+                                             gimp_parasite_data (parasite),
+                                             gimp_parasite_data_size (parasite),
+                                             &my_error))
+            {
+              gimp_message (gimp, G_OBJECT (info->progress),
+                            GIMP_MESSAGE_WARNING,
+                            _("Corrupt 'exif-data' parasite discovered.\n"
+                              "Exif data could not be migrated: %s"),
+                            my_error->message);
+              g_clear_error (&my_error);
+            }
+          else
+            {
+              gimp_image_set_metadata (image, metadata, FALSE);
+            }
+
+          g_object_unref (metadata);
+        }
+
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (parasite));
+    }
+
+  /* migrate the old "gimp-metadata" parasite */
+  parasite = gimp_image_parasite_find (GIMP_IMAGE (image),
+                                       "gimp-metadata");
+  if (parasite)
+    {
+      GimpImagePrivate *private    = GIMP_IMAGE_GET_PRIVATE (image);
+      const gchar      *xmp_data   = gimp_parasite_data (parasite);
+      gint              xmp_length = gimp_parasite_data_size (parasite);
+
+      if (has_metadata)
+        {
+          g_printerr ("xcf-load: inconsistent metadata discovered: XCF file "
+                      "has both 'gimp-image-metadata' and 'gimp-metadata' "
+                      "parasites, dropping old 'gimp-metadata'\n");
+        }
+      else if (xmp_length < 14 ||
+               strncmp (xmp_data, "GIMP_XMP_1", 10) != 0)
+        {
+          gimp_message (gimp, G_OBJECT (info->progress),
+                        GIMP_MESSAGE_WARNING,
+                        _("Corrupt 'gimp-metadata' parasite discovered.\n"
+                          "XMP data could not be migrated."));
+        }
+      else
+        {
+          GimpMetadata *metadata = gimp_image_get_metadata (image);
+          GError       *my_error = NULL;
+
+          if (metadata)
+            g_object_ref (metadata);
+          else
+            metadata = gimp_metadata_new ();
+
+          if (! gimp_metadata_set_from_xmp (metadata,
+                                            (const guint8 *) xmp_data + 10,
+                                            xmp_length - 10,
+                                            &my_error))
+            {
+              /* XMP metadata from 2.8.x or earlier can be really messed up.
+               * Let's make the message more user friendly so they will
+               * understand that we can't do anything about it.
+               * See issue #987. */
+              gimp_message (gimp, G_OBJECT (info->progress),
+                            GIMP_MESSAGE_WARNING,
+                            _("Corrupt XMP metadata saved by an older version of "
+                              "GIMP could not be converted and will be ignored.\n"
+                              "If you don't know what XMP is, you most likely don't "
+                              "need it. Reported error: %s."),
+                            my_error->message);
+              g_clear_error (&my_error);
+            }
+          else
+            {
+              gimp_image_set_metadata (image, metadata, FALSE);
+            }
+
+          g_object_unref (metadata);
+        }
+
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (parasite));
+    }
+
+  /* check for a gimp-xcf-compatibility-mode parasite */
+  parasite = gimp_image_parasite_find (GIMP_IMAGE (image),
+                                       "gimp-xcf-compatibility-mode");
+  if (parasite)
+    {
+      GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+
+      /* just ditch it, it's unused but shouldn't be re-saved */
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (parasite));
+    }
+
+  xcf_progress_update (info);
+
+  while (TRUE)
+    {
+      GimpLayer *layer;
+      GList     *item_path = NULL;
+
+      /* read in the offset of the next layer */
+      xcf_read_offset (info, &offset, 1);
+
+      /* if the offset is 0 then we are at the end
+       *  of the layer list.
+       */
+      if (offset == 0)
+        break;
+
+      /* save the current position as it is where the
+       *  next layer offset is stored.
+       */
+      saved_pos = info->cp;
+
+      if (offset < saved_pos)
+        {
+          GIMP_LOG (XCF, "Invalid layer offset: %" G_GOFFSET_FORMAT
+                    " at offset: %" G_GOFFSET_FORMAT, offset, saved_pos);
+          goto error;
+        }
+
+      /* seek to the layer offset */
+      if (! xcf_seek_pos (info, offset, NULL))
+        goto error;
+
+      /* read in the layer */
+      layer = xcf_load_layer (info, image, &item_path);
+      if (! layer)
+        {
+          n_broken_layers++;
+
+          if (! xcf_seek_pos (info, saved_pos, NULL))
+            {
+              if (item_path)
+                g_list_free (item_path);
+
+              goto error;
+            }
+
+          /* Don't just stop at the first broken layer. Load as much as
+           * possible.
+           */
+          if (! item_path)
+            {
+              GimpContainer *layers = gimp_image_get_layers (image);
+
+              item_path = g_list_prepend (NULL,
+                                          GUINT_TO_POINTER (gimp_container_get_n_children (layers)));
+
+              broken_paths = g_list_prepend (broken_paths, item_path);
+            }
+
+          continue;
+        }
+
+      if (broken_paths && item_path)
+        {
+          /* Item paths may be a problem when layers are missing. */
+          xcf_fix_item_path (layer, &item_path, broken_paths);
+        }
+
+      num_successful_elements++;
+
+      xcf_progress_update (info);
+
+      /* suspend layer-group size updates */
+      if (GIMP_IS_GROUP_LAYER (layer))
+        {
+          GimpGroupLayer *group = GIMP_GROUP_LAYER (layer);
+
+          group_layers = g_list_prepend (group_layers, group);
+
+          gimp_group_layer_suspend_resize (group, FALSE);
+        }
+
+      /* add the layer to the image if its not the floating selection */
+      if (layer != info->floating_sel)
+        {
+          GimpContainer *layers = gimp_image_get_layers (image);
+          GimpContainer *container;
+          GimpLayer     *parent;
+
+          if (item_path)
+            {
+              if (info->floating_sel)
+                {
+                  /* there is a floating selection, but it will get
+                   * added after all layers are loaded, so toplevel
+                   * layer indices are off-by-one. Adjust item paths
+                   * accordingly:
+                   */
+                  gint toplevel_index;
+
+                  toplevel_index = GPOINTER_TO_UINT (item_path->data);
+
+                  toplevel_index--;
+
+                  item_path->data = GUINT_TO_POINTER (toplevel_index);
+                }
+
+              parent = GIMP_LAYER
+                (gimp_item_stack_get_parent_by_path (GIMP_ITEM_STACK (layers),
+                                                     item_path,
+                                                     NULL));
+
+              container = gimp_viewable_get_children (GIMP_VIEWABLE (parent));
+
+              g_list_free (item_path);
+            }
+          else
+            {
+              parent    = NULL;
+              container = layers;
+            }
+
+          gimp_image_add_layer (image, layer,
+                                parent,
+                                gimp_container_get_n_children (container),
+                                FALSE);
+        }
+
+      /* restore the saved position so we'll be ready to
+       *  read the next offset.
+       */
+      if (! xcf_seek_pos (info, saved_pos, NULL))
+        goto error;
+    }
+
+  /* resume layer-group size updates, in reverse order */
+  for (iter = group_layers; iter; iter = g_list_next (iter))
+    {
+      GimpGroupLayer *group = iter->data;
+
+      gimp_group_layer_resume_resize (group, FALSE);
+    }
+  g_clear_pointer (&group_layers, g_list_free);
+
+  if (broken_paths)
+    {
+      g_list_free_full (broken_paths, (GDestroyNotify) g_list_free);
+      broken_paths = NULL;
+    }
+
+  while (TRUE)
+    {
+      GimpChannel *channel;
+
+      /* read in the offset of the next channel */
+      xcf_read_offset (info, &offset, 1);
+
+      /* if the offset is 0 then we are at the end
+       *  of the channel list.
+       */
+      if (offset == 0)
+        break;
+
+      /* save the current position as it is where the
+       *  next channel offset is stored.
+       */
+      saved_pos = info->cp;
+
+      if (offset < saved_pos)
+        {
+          GIMP_LOG (XCF, "Invalid channel offset: %" G_GOFFSET_FORMAT
+                    " at offset: % "G_GOFFSET_FORMAT, offset, saved_pos);
+          goto error;
+        }
+
+      /* seek to the channel offset */
+      if (! xcf_seek_pos (info, offset, NULL))
+        goto error;
+
+      /* read in the channel */
+      channel = xcf_load_channel (info, image);
+      if (!channel)
+        {
+          n_broken_channels++;
+          GIMP_LOG (XCF, "Failed to load channel.");
+
+          if (! xcf_seek_pos (info, saved_pos, NULL))
+            goto error;
+
+          continue;
+        }
+
+      num_successful_elements++;
+
+      xcf_progress_update (info);
+
+      /* add the channel to the image if its not the selection */
+      if (channel != gimp_image_get_mask (image))
+        gimp_image_add_channel (image, channel,
+                                NULL, /* FIXME tree */
+                                gimp_container_get_n_children (gimp_image_get_channels (image)),
+                                FALSE);
+
+      /* restore the saved position so we'll be ready to
+       *  read the next offset.
+       */
+      if (! xcf_seek_pos (info, saved_pos, NULL))
+        goto error;
+    }
+
+  if (n_broken_layers == 0 && n_broken_channels == 0)
+    xcf_load_add_masks (image);
+
+  if (info->floating_sel && info->floating_sel_drawable)
+    floating_sel_attach (info->floating_sel, info->floating_sel_drawable);
+
+  if (info->active_layer)
+    gimp_image_set_active_layer (image, info->active_layer);
+
+  if (info->active_channel)
+    gimp_image_set_active_channel (image, info->active_channel);
+
+  if (info->file)
+    gimp_image_set_file (image, info->file);
+
+  if (info->tattoo_state > 0)
+    gimp_image_set_tattoo_state (image, info->tattoo_state);
+
+  if (n_broken_layers > 0 || n_broken_channels > 0)
+    goto error;
+
+  gimp_image_undo_enable (image);
+
+  return image;
+
+ error:
+  if (num_successful_elements == 0)
+    goto hard_error;
+
+  g_clear_pointer (&group_layers, g_list_free);
+
+  if (broken_paths)
+    {
+      g_list_free_full (broken_paths, (GDestroyNotify) g_list_free);
+      broken_paths = NULL;
+    }
+
+  gimp_message_literal (gimp, G_OBJECT (info->progress), GIMP_MESSAGE_WARNING,
+                        _("This XCF file is corrupt!  I have loaded as much "
+                          "of it as I can, but it is incomplete."));
+
+  xcf_load_add_masks (image);
+
+  gimp_image_undo_enable (image);
+
+  return image;
+
+ hard_error:
+  g_clear_pointer (&group_layers, g_list_free);
+
+  if (broken_paths)
+    {
+      g_list_free_full (broken_paths, (GDestroyNotify) g_list_free);
+      broken_paths = NULL;
+    }
+
+  g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                       _("This XCF file is corrupt!  I could not even "
+                         "salvage any partial image data from it."));
+
+  g_clear_object (&image);
+
+  return NULL;
+}
+
+static void
+xcf_load_add_masks (GimpImage *image)
+{
+  GList *layers;
+  GList *list;
+
+  layers = gimp_image_get_layer_list (image);
+
+  for (list = layers; list; list = g_list_next (list))
+    {
+      GimpLayer     *layer = list->data;
+      GimpLayerMask *mask;
+
+      mask = g_object_get_data (G_OBJECT (layer), "gimp-layer-mask");
+
+      if (mask)
+        {
+          gboolean apply_mask;
+          gboolean edit_mask;
+          gboolean show_mask;
+
+          apply_mask = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (layer),
+                                                           "gimp-layer-mask-apply"));
+          edit_mask = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (layer),
+                                                          "gimp-layer-mask-edit"));
+          show_mask = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (layer),
+                                                          "gimp-layer-mask-show"));
+
+          gimp_layer_add_mask (layer, mask, FALSE, NULL);
+
+          gimp_layer_set_apply_mask (layer, apply_mask, FALSE);
+          gimp_layer_set_edit_mask  (layer, edit_mask);
+          gimp_layer_set_show_mask  (layer, show_mask, FALSE);
+
+          g_object_set_data (G_OBJECT (layer), "gimp-layer-mask",       NULL);
+          g_object_set_data (G_OBJECT (layer), "gimp-layer-mask-apply", NULL);
+          g_object_set_data (G_OBJECT (layer), "gimp-layer-mask-edit",  NULL);
+          g_object_set_data (G_OBJECT (layer), "gimp-layer-mask-show",  NULL);
+        }
+    }
+
+  g_list_free (layers);
+}
+
+static gboolean
+xcf_load_image_props (XcfInfo   *info,
+                      GimpImage *image)
+{
+  PropType prop_type;
+  guint32  prop_size;
+
+  while (TRUE)
+    {
+      if (! xcf_load_prop (info, &prop_type, &prop_size))
+        return FALSE;
+
+      switch (prop_type)
+        {
+        case PROP_END:
+          return TRUE;
+
+        case PROP_COLORMAP:
+          {
+            guint32 n_colors;
+            guchar  cmap[GIMP_IMAGE_COLORMAP_SIZE];
+
+            xcf_read_int32 (info, &n_colors, 1);
+
+            if (n_colors > (GIMP_IMAGE_COLORMAP_SIZE / 3))
+              {
+                gimp_message (info->gimp, G_OBJECT (info->progress),
+                              GIMP_MESSAGE_ERROR,
+                              "Maximum colormap size (%d) exceeded",
+                              GIMP_IMAGE_COLORMAP_SIZE);
+                return FALSE;
+              }
+
+            if (info->file_version == 0)
+              {
+                gint i;
+
+                gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                      GIMP_MESSAGE_WARNING,
+                                      _("XCF warning: version 0 of XCF file format\n"
+                                        "did not save indexed colormaps correctly.\n"
+                                        "Substituting grayscale map."));
+
+                if (! xcf_seek_pos (info, info->cp + n_colors, NULL))
+                  return FALSE;
+
+                for (i = 0; i < n_colors; i++)
+                  {
+                    cmap[i * 3 + 0] = i;
+                    cmap[i * 3 + 1] = i;
+                    cmap[i * 3 + 2] = i;
+                  }
+              }
+            else
+              {
+                xcf_read_int8 (info, cmap, n_colors * 3);
+              }
+
+            /* only set color map if image is indexed, this is just
+             * sanity checking to make sure gimp doesn't end up with
+             * an image state that is impossible.
+             */
+            if (gimp_image_get_base_type (image) == GIMP_INDEXED)
+              gimp_image_set_colormap (image, cmap, n_colors, FALSE);
+
+            GIMP_LOG (XCF, "prop colormap n_colors=%d", n_colors);
+          }
+          break;
+
+        case PROP_COMPRESSION:
+          {
+            guint8 compression;
+
+            xcf_read_int8 (info, (guint8 *) &compression, 1);
+
+            if ((compression != COMPRESS_NONE) &&
+                (compression != COMPRESS_RLE) &&
+                (compression != COMPRESS_ZLIB) &&
+                (compression != COMPRESS_FRACTAL))
+              {
+                gimp_message (info->gimp, G_OBJECT (info->progress),
+                              GIMP_MESSAGE_ERROR,
+                              "Unknown compression type: %d",
+                              (gint) compression);
+                return FALSE;
+              }
+
+            info->compression = compression;
+
+            gimp_image_set_xcf_compression (image,
+                                            compression >= COMPRESS_ZLIB);
+
+            GIMP_LOG (XCF, "prop compression=%d", compression);
+          }
+          break;
+
+        case PROP_GUIDES:
+          {
+            GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+            gint32            position;
+            gint8             orientation;
+            gint              i, nguides;
+
+            nguides = prop_size / (4 + 1);
+            for (i = 0; i < nguides; i++)
+              {
+                xcf_read_int32 (info, (guint32 *) &position,    1);
+                xcf_read_int8  (info, (guint8 *)  &orientation, 1);
+
+                /*  skip -1 guides from old XCFs  */
+                if (position < 0)
+                  continue;
+
+                GIMP_LOG (XCF, "prop guide orientation=%d position=%d",
+                          orientation, position);
+
+                switch (orientation)
+                  {
+                  case XCF_ORIENTATION_HORIZONTAL:
+                    gimp_image_add_hguide (image, position, FALSE);
+                    break;
+
+                  case XCF_ORIENTATION_VERTICAL:
+                    gimp_image_add_vguide (image, position, FALSE);
+                    break;
+
+                  default:
+                    gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                          GIMP_MESSAGE_WARNING,
+                                          "Guide orientation out of range in XCF file");
+                    continue;
+                  }
+              }
+
+            /*  this is silly as the order of guides doesn't really matter,
+             *  but it restores the list to its original order, which
+             *  cannot be wrong  --Mitch
+             */
+            private->guides = g_list_reverse (private->guides);
+          }
+          break;
+
+        case PROP_SAMPLE_POINTS:
+          {
+            gint n_sample_points, i;
+
+            n_sample_points = prop_size / (5 * 4);
+            for (i = 0; i < n_sample_points; i++)
+              {
+                GimpSamplePoint   *sample_point;
+                gint32             x, y;
+                GimpColorPickMode  pick_mode;
+                guint32            padding[2] = { 0, };
+
+                xcf_read_int32 (info, (guint32 *) &x,         1);
+                xcf_read_int32 (info, (guint32 *) &y,         1);
+                xcf_read_int32 (info, (guint32 *) &pick_mode, 1);
+                xcf_read_int32 (info, (guint32 *) padding,    2);
+
+                GIMP_LOG (XCF, "prop sample point x=%d y=%d mode=%d",
+                          x, y, pick_mode);
+
+                if (pick_mode > GIMP_COLOR_PICK_MODE_LAST)
+                  pick_mode = GIMP_COLOR_PICK_MODE_PIXEL;
+
+                sample_point = gimp_image_add_sample_point_at_pos (image,
+                                                                   x, y, FALSE);
+                gimp_image_set_sample_point_pick_mode (image, sample_point,
+                                                       pick_mode, FALSE);
+              }
+          }
+          break;
+
+        case PROP_OLD_SAMPLE_POINTS:
+          {
+            gint32 x, y;
+            gint   i, n_sample_points;
+
+            /* if there are already sample points, we loaded the new
+             * prop before
+             */
+            if (gimp_image_get_sample_points (image))
+              {
+                if (! xcf_skip_unknown_prop (info, prop_size))
+                  return FALSE;
+
+                break;
+              }
+
+            n_sample_points = prop_size / (4 + 4);
+            for (i = 0; i < n_sample_points; i++)
+              {
+                xcf_read_int32 (info, (guint32 *) &x, 1);
+                xcf_read_int32 (info, (guint32 *) &y, 1);
+
+                GIMP_LOG (XCF, "prop old sample point x=%d y=%d", x, y);
+
+                gimp_image_add_sample_point_at_pos (image, x, y, FALSE);
+              }
+          }
+          break;
+
+        case PROP_RESOLUTION:
+          {
+            gfloat xres, yres;
+
+            xcf_read_float (info, &xres, 1);
+            xcf_read_float (info, &yres, 1);
+
+            GIMP_LOG (XCF, "prop resolution x=%f y=%f", xres, yres);
+
+            if (xres < GIMP_MIN_RESOLUTION || xres > GIMP_MAX_RESOLUTION ||
+                yres < GIMP_MIN_RESOLUTION || yres > GIMP_MAX_RESOLUTION)
+              {
+                GimpTemplate *template = image->gimp->config->default_image;
+
+                gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                      GIMP_MESSAGE_WARNING,
+                                      "Warning, resolution out of range in XCF file");
+                xres = gimp_template_get_resolution_x (template);
+                yres = gimp_template_get_resolution_y (template);
+              }
+
+            gimp_image_set_resolution (image, xres, yres);
+          }
+          break;
+
+        case PROP_TATTOO:
+          {
+            xcf_read_int32 (info, &info->tattoo_state, 1);
+
+            GIMP_LOG (XCF, "prop tattoo state=%d", info->tattoo_state);
+          }
+          break;
+
+        case PROP_PARASITES:
+          {
+            goffset base = info->cp;
+
+            while (info->cp - base < prop_size)
+              {
+                GimpParasite *p     = xcf_load_parasite (info);
+                GError       *error = NULL;
+
+                if (! p)
+                  {
+                    gimp_message (info->gimp, G_OBJECT (info->progress),
+                                  GIMP_MESSAGE_WARNING,
+                                  "Invalid image parasite found. "
+                                  "Possibly corrupt XCF file.");
+
+                    xcf_seek_pos (info, base + prop_size, NULL);
+                    continue;
+                  }
+
+                if (! gimp_image_parasite_validate (image, p, &error))
+                  {
+                    gimp_message (info->gimp, G_OBJECT (info->progress),
+                                  GIMP_MESSAGE_WARNING,
+                                  "Warning, invalid image parasite in XCF file: %s",
+                                  error->message);
+                    g_clear_error (&error);
+                  }
+                else
+                  {
+                    gimp_image_parasite_attach (image, p, FALSE);
+                  }
+
+                gimp_parasite_free (p);
+              }
+
+            if (info->cp - base != prop_size)
+              gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                    GIMP_MESSAGE_WARNING,
+                                    "Error while loading an image's parasites");
+          }
+          break;
+
+        case PROP_UNIT:
+          {
+            guint32 unit;
+
+            xcf_read_int32 (info, &unit, 1);
+
+            GIMP_LOG (XCF, "prop unit=%d", unit);
+
+            if ((unit <= GIMP_UNIT_PIXEL) ||
+                (unit >= gimp_unit_get_number_of_built_in_units ()))
+              {
+                gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                      GIMP_MESSAGE_WARNING,
+                                      "Warning, unit out of range in XCF file, "
+                                      "falling back to inches");
+                unit = GIMP_UNIT_INCH;
+              }
+
+            gimp_image_set_unit (image, unit);
+          }
+          break;
+
+        case PROP_PATHS:
+          {
+            goffset base = info->cp;
+
+            if (! xcf_load_old_paths (info, image))
+              xcf_seek_pos (info, base + prop_size, NULL);
+          }
+          break;
+
+        case PROP_USER_UNIT:
+          {
+            gchar    *unit_strings[5];
+            float     factor;
+            guint32   digits;
+            GimpUnit  unit;
+            gint      num_units;
+            gint      i;
+
+            xcf_read_float  (info, &factor,      1);
+            xcf_read_int32  (info, &digits,      1);
+            xcf_read_string (info, unit_strings, 5);
+
+            for (i = 0; i < 5; i++)
+              if (unit_strings[i] == NULL)
+                unit_strings[i] = g_strdup ("");
+
+            num_units = gimp_unit_get_number_of_units ();
+
+            for (unit = gimp_unit_get_number_of_built_in_units ();
+                 unit < num_units; unit++)
+              {
+                /* if the factor and the identifier match some unit
+                 * in unitrc, use the unitrc unit
+                 */
+                if ((ABS (gimp_unit_get_factor (unit) - factor) < 1e-5) &&
+                    (strcmp (unit_strings[0],
+                             gimp_unit_get_identifier (unit)) == 0))
+                  {
+                    break;
+                  }
+              }
+
+            /* no match */
+            if (unit == num_units)
+              unit = gimp_unit_new (unit_strings[0],
+                                    factor,
+                                    digits,
+                                    unit_strings[1],
+                                    unit_strings[2],
+                                    unit_strings[3],
+                                    unit_strings[4]);
+
+            gimp_image_set_unit (image, unit);
+
+            for (i = 0; i < 5; i++)
+              g_free (unit_strings[i]);
+          }
+         break;
+
+        case PROP_VECTORS:
+          {
+            goffset base = info->cp;
+
+            if (xcf_load_vectors (info, image))
+              {
+                if (base + prop_size != info->cp)
+                  {
+                    g_printerr ("Mismatch in PROP_VECTORS size: "
+                                "skipping %" G_GOFFSET_FORMAT " bytes.\n",
+                                base + prop_size - info->cp);
+                    xcf_seek_pos (info, base + prop_size, NULL);
+                  }
+              }
+            else
+              {
+                /* skip silently since we don't understand the format and
+                 * xcf_load_vectors already explained what was wrong
+                 */
+                xcf_seek_pos (info, base + prop_size, NULL);
+              }
+          }
+          break;
+
+        default:
+#ifdef GIMP_UNSTABLE
+          g_printerr ("unexpected/unknown image property: %d (skipping)\n",
+                      prop_type);
+#endif
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+xcf_load_layer_props (XcfInfo    *info,
+                      GimpImage  *image,
+                      GimpLayer **layer,
+                      GList     **item_path,
+                      gboolean   *apply_mask,
+                      gboolean   *edit_mask,
+                      gboolean   *show_mask,
+                      guint32    *text_layer_flags,
+                      guint32    *group_layer_flags)
+{
+  PropType prop_type;
+  guint32  prop_size;
+
+  while (TRUE)
+    {
+      if (! xcf_load_prop (info, &prop_type, &prop_size))
+        return FALSE;
+
+      switch (prop_type)
+        {
+        case PROP_END:
+          return TRUE;
+
+        case PROP_ACTIVE_LAYER:
+          info->active_layer = *layer;
+          break;
+
+        case PROP_FLOATING_SELECTION:
+          info->floating_sel = *layer;
+          xcf_read_offset (info, &info->floating_sel_offset, 1);
+          break;
+
+        case PROP_OPACITY:
+          {
+            guint32 opacity;
+
+            xcf_read_int32 (info, &opacity, 1);
+
+            gimp_layer_set_opacity (*layer, (gdouble) opacity / 255.0, FALSE);
+          }
+          break;
+
+        case PROP_FLOAT_OPACITY:
+          {
+            gfloat opacity;
+
+            xcf_read_float (info, &opacity, 1);
+
+            gimp_layer_set_opacity (*layer, opacity, FALSE);
+          }
+          break;
+
+        case PROP_VISIBLE:
+          {
+            gboolean visible;
+
+            xcf_read_int32 (info, (guint32 *) &visible, 1);
+
+            gimp_item_set_visible (GIMP_ITEM (*layer), visible, FALSE);
+          }
+          break;
+
+        case PROP_LINKED:
+          {
+            gboolean linked;
+
+            xcf_read_int32 (info, (guint32 *) &linked, 1);
+
+            gimp_item_set_linked (GIMP_ITEM (*layer), linked, FALSE);
+          }
+          break;
+
+        case PROP_COLOR_TAG:
+          {
+            GimpColorTag color_tag;
+
+            xcf_read_int32 (info, (guint32 *) &color_tag, 1);
+
+            gimp_item_set_color_tag (GIMP_ITEM (*layer), color_tag, FALSE);
+          }
+          break;
+
+        case PROP_LOCK_CONTENT:
+          {
+            gboolean lock_content;
+
+            xcf_read_int32 (info, (guint32 *) &lock_content, 1);
+
+            if (gimp_item_can_lock_content (GIMP_ITEM (*layer)))
+              gimp_item_set_lock_content (GIMP_ITEM (*layer),
+                                          lock_content, FALSE);
+          }
+          break;
+
+        case PROP_LOCK_ALPHA:
+          {
+            gboolean lock_alpha;
+
+            xcf_read_int32 (info, (guint32 *) &lock_alpha, 1);
+
+            if (gimp_layer_can_lock_alpha (*layer))
+              gimp_layer_set_lock_alpha (*layer, lock_alpha, FALSE);
+          }
+          break;
+
+        case PROP_LOCK_POSITION:
+          {
+            gboolean lock_position;
+
+            xcf_read_int32 (info, (guint32 *) &lock_position, 1);
+
+            if (gimp_item_can_lock_position (GIMP_ITEM (*layer)))
+              gimp_item_set_lock_position (GIMP_ITEM (*layer),
+                                           lock_position, FALSE);
+          }
+          break;
+
+        case PROP_APPLY_MASK:
+          xcf_read_int32 (info, (guint32 *) apply_mask, 1);
+          break;
+
+        case PROP_EDIT_MASK:
+          xcf_read_int32 (info, (guint32 *) edit_mask, 1);
+          break;
+
+        case PROP_SHOW_MASK:
+          xcf_read_int32 (info, (guint32 *) show_mask, 1);
+          break;
+
+        case PROP_OFFSETS:
+          {
+            gint32 offset_x;
+            gint32 offset_y;
+
+            xcf_read_int32 (info, (guint32 *) &offset_x, 1);
+            xcf_read_int32 (info, (guint32 *) &offset_y, 1);
+
+            if (offset_x < -GIMP_MAX_IMAGE_SIZE ||
+                offset_x > GIMP_MAX_IMAGE_SIZE)
+              {
+                g_printerr ("unexpected item offset_x (%d) in XCF, "
+                            "setting to 0\n", offset_x);
+                offset_x = 0;
+              }
+
+            if (offset_y < -GIMP_MAX_IMAGE_SIZE ||
+                offset_y > GIMP_MAX_IMAGE_SIZE)
+              {
+                g_printerr ("unexpected item offset_y (%d) in XCF, "
+                            "setting to 0\n", offset_y);
+                offset_y = 0;
+              }
+
+            gimp_item_set_offset (GIMP_ITEM (*layer), offset_x, offset_y);
+          }
+          break;
+
+        case PROP_MODE:
+          {
+            GimpLayerMode mode;
+
+            xcf_read_int32 (info, (guint32 *) &mode, 1);
+
+            if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+              mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+            gimp_layer_set_mode (*layer, mode, FALSE);
+          }
+          break;
+
+        case PROP_BLEND_SPACE:
+          {
+            gint32 blend_space;
+
+            xcf_read_int32 (info, (guint32 *) &blend_space, 1);
+
+            /* if blend_space < 0 it was originally AUTO, and its negative is
+             * the actual value AUTO used to map to at the time the file was
+             * saved.  if AUTO still maps to the same value, keep using AUTO
+             * for the property; otherwise, use the concrete value.
+             */
+            if (blend_space < 0)
+              {
+                GimpLayerMode mode = gimp_layer_get_mode (*layer);
+
+                blend_space = -blend_space;
+
+                if (blend_space == gimp_layer_mode_get_blend_space (mode))
+                  blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+                else
+                  GIMP_LOG (XCF, "BLEND_SPACE: AUTO => %d", blend_space);
+              }
+
+            gimp_layer_set_blend_space (*layer, blend_space, FALSE);
+          }
+          break;
+
+        case PROP_COMPOSITE_SPACE:
+          {
+            gint32 composite_space;
+
+            xcf_read_int32 (info, (guint32 *) &composite_space, 1);
+
+            /* if composite_space < 0 it was originally AUTO, and its negative
+             * is the actual value AUTO used to map to at the time the file was
+             * saved.  if AUTO still maps to the same value, keep using AUTO
+             * for the property; otherwise, use the concrete value.
+             */
+            if (composite_space < 0)
+              {
+                GimpLayerMode mode = gimp_layer_get_mode (*layer);
+
+                composite_space = -composite_space;
+
+                if (composite_space == gimp_layer_mode_get_composite_space (mode))
+                  composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
+                else
+                  GIMP_LOG (XCF, "COMPOSITE_SPACE: AUTO => %d", composite_space);
+              }
+
+            gimp_layer_set_composite_space (*layer, composite_space, FALSE);
+          }
+          break;
+
+        case PROP_COMPOSITE_MODE:
+          {
+            gint32 composite_mode;
+
+            xcf_read_int32 (info, (guint32 *) &composite_mode, 1);
+
+            /* if composite_mode < 0 it was originally AUTO, and its negative
+             * is the actual value AUTO used to map to at the time the file was
+             * saved.  if AUTO still maps to the same value, keep using AUTO
+             * for the property; otherwise, use the concrete value.
+             */
+            if (composite_mode < 0)
+              {
+                GimpLayerMode mode = gimp_layer_get_mode (*layer);
+
+                composite_mode = -composite_mode;
+
+                if (composite_mode == gimp_layer_mode_get_composite_mode (mode))
+                  composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
+                else
+                  GIMP_LOG (XCF, "COMPOSITE_MODE: AUTO => %d", composite_mode);
+              }
+
+            gimp_layer_set_composite_mode (*layer, composite_mode, FALSE);
+          }
+          break;
+
+        case PROP_TATTOO:
+          {
+            GimpTattoo tattoo;
+
+            xcf_read_int32 (info, (guint32 *) &tattoo, 1);
+
+            gimp_item_set_tattoo (GIMP_ITEM (*layer), tattoo);
+          }
+          break;
+
+        case PROP_PARASITES:
+          {
+            goffset base = info->cp;
+
+            while (info->cp - base < prop_size)
+              {
+                GimpParasite *p     = xcf_load_parasite (info);
+                GError       *error = NULL;
+
+                if (! p)
+                  return FALSE;
+
+                if (! gimp_item_parasite_validate (GIMP_ITEM (*layer), p, &error))
+                  {
+                    gimp_message (info->gimp, G_OBJECT (info->progress),
+                                  GIMP_MESSAGE_WARNING,
+                                  "Warning, invalid layer parasite in XCF file: %s",
+                                  error->message);
+                    g_clear_error (&error);
+                  }
+                else
+                  {
+                    gimp_item_parasite_attach (GIMP_ITEM (*layer), p, FALSE);
+                  }
+
+                gimp_parasite_free (p);
+              }
+
+            if (info->cp - base != prop_size)
+              gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                    GIMP_MESSAGE_WARNING,
+                                    "Error while loading a layer's parasites");
+          }
+          break;
+
+        case PROP_TEXT_LAYER_FLAGS:
+          xcf_read_int32 (info, text_layer_flags, 1);
+          break;
+
+        case PROP_GROUP_ITEM:
+          {
+            GimpLayer *group;
+            gboolean   is_active_layer;
+
+            /* We're going to delete *layer, Don't leave its pointers
+             * in @info.  After that, we'll restore them back with the
+             * new pointer. See bug #767873.
+             */
+            is_active_layer = (*layer == info->active_layer);
+            if (is_active_layer)
+              info->active_layer = NULL;
+
+            if (*layer == info->floating_sel)
+              info->floating_sel = NULL;
+
+            group = gimp_group_layer_new (image);
+
+            gimp_object_set_name (GIMP_OBJECT (group),
+                                  gimp_object_get_name (*layer));
+
+            g_object_ref_sink (*layer);
+            g_object_unref (*layer);
+            *layer = group;
+
+            if (is_active_layer)
+              info->active_layer = *layer;
+
+            /* Don't restore info->floating_sel because group layers
+             * can't be floating selections
+             */
+          }
+          break;
+
+        case PROP_ITEM_PATH:
+          {
+            goffset  base = info->cp;
+            GList   *path = NULL;
+
+            while (info->cp - base < prop_size)
+              {
+                guint32 index;
+
+                if (xcf_read_int32 (info, &index, 1) != 4)
+                  {
+                    g_list_free (path);
+                    return FALSE;
+                  }
+
+                path = g_list_append (path, GUINT_TO_POINTER (index));
+              }
+
+            *item_path = path;
+          }
+          break;
+
+        case PROP_GROUP_ITEM_FLAGS:
+          xcf_read_int32 (info, group_layer_flags, 1);
+          break;
+
+        default:
+#ifdef GIMP_UNSTABLE
+          g_printerr ("unexpected/unknown layer property: %d (skipping)\n",
+                      prop_type);
+#endif
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+xcf_check_layer_props (XcfInfo    *info,
+                       GList     **item_path,
+                       gboolean   *is_group_layer,
+                       gboolean   *is_text_layer)
+{
+  PropType prop_type;
+  guint32  prop_size;
+
+  g_return_val_if_fail (*is_group_layer == FALSE, FALSE);
+  g_return_val_if_fail (*is_text_layer  == FALSE, FALSE);
+
+  while (TRUE)
+    {
+      if (! xcf_load_prop (info, &prop_type, &prop_size))
+        return FALSE;
+
+      switch (prop_type)
+        {
+        case PROP_END:
+          return TRUE;
+
+        case PROP_TEXT_LAYER_FLAGS:
+          *is_text_layer = TRUE;
+
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          break;
+
+        case PROP_GROUP_ITEM:
+        case PROP_GROUP_ITEM_FLAGS:
+          *is_group_layer = TRUE;
+
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          break;
+
+        case PROP_ITEM_PATH:
+          {
+            goffset  base = info->cp;
+            GList   *path = NULL;
+
+            while (info->cp - base < prop_size)
+              {
+                guint32 index;
+
+                if (xcf_read_int32 (info, &index, 1) != 4)
+                  {
+                    g_list_free (path);
+                    return FALSE;
+                  }
+
+                path = g_list_append (path, GUINT_TO_POINTER (index));
+              }
+
+            *item_path = path;
+          }
+          break;
+
+        case PROP_ACTIVE_LAYER:
+        case PROP_FLOATING_SELECTION:
+        case PROP_OPACITY:
+        case PROP_FLOAT_OPACITY:
+        case PROP_VISIBLE:
+        case PROP_LINKED:
+        case PROP_COLOR_TAG:
+        case PROP_LOCK_CONTENT:
+        case PROP_LOCK_ALPHA:
+        case PROP_LOCK_POSITION:
+        case PROP_APPLY_MASK:
+        case PROP_EDIT_MASK:
+        case PROP_SHOW_MASK:
+        case PROP_OFFSETS:
+        case PROP_MODE:
+        case PROP_BLEND_SPACE:
+        case PROP_COMPOSITE_SPACE:
+        case PROP_COMPOSITE_MODE:
+        case PROP_TATTOO:
+        case PROP_PARASITES:
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          /* Just ignore for now. */
+          break;
+
+        default:
+#ifdef GIMP_UNSTABLE
+          g_printerr ("unexpected/unknown layer property: %d (skipping)\n",
+                      prop_type);
+#endif
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+xcf_load_channel_props (XcfInfo      *info,
+                        GimpImage    *image,
+                        GimpChannel **channel)
+{
+  PropType prop_type;
+  guint32  prop_size;
+
+  while (TRUE)
+    {
+      if (! xcf_load_prop (info, &prop_type, &prop_size))
+        return FALSE;
+
+      switch (prop_type)
+        {
+        case PROP_END:
+          return TRUE;
+
+        case PROP_ACTIVE_CHANNEL:
+          info->active_channel = *channel;
+          break;
+
+        case PROP_SELECTION:
+          {
+            GimpChannel *mask;
+
+            /* We're going to delete *channel, Don't leave its pointer
+             * in @info. See bug #767873.
+             */
+            if (*channel == info->active_channel)
+              info->active_channel = NULL;
+
+            mask =
+              gimp_selection_new (image,
+                                  gimp_item_get_width  (GIMP_ITEM (*channel)),
+                                  gimp_item_get_height (GIMP_ITEM (*channel)));
+            gimp_image_take_mask (image, mask);
+
+            gimp_drawable_steal_buffer (GIMP_DRAWABLE (mask),
+                                        GIMP_DRAWABLE (*channel));
+            g_object_unref (*channel);
+            *channel = mask;
+
+            /* Don't restore info->active_channel because the
+             * selection can't be the active channel
+             */
+          }
+          break;
+
+        case PROP_OPACITY:
+          {
+            guint32 opacity;
+
+            xcf_read_int32 (info, &opacity, 1);
+
+            gimp_channel_set_opacity (*channel, opacity / 255.0, FALSE);
+          }
+          break;
+
+        case PROP_FLOAT_OPACITY:
+          {
+            gfloat opacity;
+
+            xcf_read_float (info, &opacity, 1);
+
+            gimp_channel_set_opacity (*channel, opacity, FALSE);
+          }
+          break;
+
+        case PROP_VISIBLE:
+          {
+            gboolean visible;
+
+            xcf_read_int32 (info, (guint32 *) &visible, 1);
+
+            gimp_item_set_visible (GIMP_ITEM (*channel), visible, FALSE);
+          }
+          break;
+
+        case PROP_COLOR_TAG:
+          {
+            GimpColorTag color_tag;
+
+            xcf_read_int32 (info, (guint32 *) &color_tag, 1);
+
+            gimp_item_set_color_tag (GIMP_ITEM (*channel), color_tag, FALSE);
+          }
+          break;
+
+        case PROP_LINKED:
+          {
+            gboolean linked;
+
+            xcf_read_int32 (info, (guint32 *) &linked, 1);
+
+            gimp_item_set_linked (GIMP_ITEM (*channel), linked, FALSE);
+          }
+          break;
+
+        case PROP_LOCK_CONTENT:
+          {
+            gboolean lock_content;
+
+            xcf_read_int32 (info, (guint32 *) &lock_content, 1);
+
+            if (gimp_item_can_lock_content (GIMP_ITEM (*channel)))
+              gimp_item_set_lock_content (GIMP_ITEM (*channel),
+                                          lock_content, FALSE);
+          }
+          break;
+
+        case PROP_LOCK_POSITION:
+          {
+            gboolean lock_position;
+
+            xcf_read_int32 (info, (guint32 *) &lock_position, 1);
+
+            if (gimp_item_can_lock_position (GIMP_ITEM (*channel)))
+              gimp_item_set_lock_position (GIMP_ITEM (*channel),
+                                           lock_position, FALSE);
+          }
+          break;
+
+        case PROP_SHOW_MASKED:
+          {
+            gboolean show_masked;
+
+            xcf_read_int32 (info, (guint32 *) &show_masked, 1);
+
+            gimp_channel_set_show_masked (*channel, show_masked);
+          }
+          break;
+
+        case PROP_COLOR:
+          {
+            guchar col[3];
+
+            xcf_read_int8 (info, (guint8 *) col, 3);
+
+            gimp_rgb_set_uchar (&(*channel)->color, col[0], col[1], col[2]);
+          }
+          break;
+
+        case PROP_FLOAT_COLOR:
+          {
+            gfloat col[3];
+
+            xcf_read_float (info, col, 3);
+
+            gimp_rgb_set (&(*channel)->color, col[0], col[1], col[2]);
+          }
+          break;
+
+        case PROP_TATTOO:
+          {
+            GimpTattoo tattoo;
+
+            xcf_read_int32 (info, (guint32 *) &tattoo, 1);
+
+            gimp_item_set_tattoo (GIMP_ITEM (*channel), tattoo);
+          }
+          break;
+
+        case PROP_PARASITES:
+          {
+            goffset base = info->cp;
+
+            while ((info->cp - base) < prop_size)
+              {
+                GimpParasite *p     = xcf_load_parasite (info);
+                GError       *error = NULL;
+
+                if (! p)
+                  return FALSE;
+
+                if (! gimp_item_parasite_validate (GIMP_ITEM (*channel), p,
+                                                    &error))
+                  {
+                    gimp_message (info->gimp, G_OBJECT (info->progress),
+                                  GIMP_MESSAGE_WARNING,
+                                  "Warning, invalid channel parasite in XCF file: %s",
+                                  error->message);
+                    g_clear_error (&error);
+                  }
+                else
+                  {
+                    gimp_item_parasite_attach (GIMP_ITEM (*channel), p, FALSE);
+                  }
+
+                gimp_parasite_free (p);
+              }
+
+            if (info->cp - base != prop_size)
+              gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                    GIMP_MESSAGE_WARNING,
+                                    "Error while loading a channel's parasites");
+          }
+          break;
+
+        default:
+#ifdef GIMP_UNSTABLE
+          g_printerr ("unexpected/unknown channel property: %d (skipping)\n",
+                      prop_type);
+#endif
+          if (! xcf_skip_unknown_prop (info, prop_size))
+            return FALSE;
+          break;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+xcf_load_prop (XcfInfo  *info,
+               PropType *prop_type,
+               guint32  *prop_size)
+{
+  if (G_UNLIKELY (xcf_read_int32 (info, (guint32 *) prop_type, 1) != 4))
+    return FALSE;
+
+  if (G_UNLIKELY (xcf_read_int32 (info, (guint32 *) prop_size, 1) != 4))
+    return FALSE;
+
+  GIMP_LOG (XCF, "prop type=%d size=%u", *prop_type, *prop_size);
+
+  return TRUE;
+}
+
+static GimpLayer *
+xcf_load_layer (XcfInfo    *info,
+                GimpImage  *image,
+                GList     **item_path)
+{
+  GimpLayer         *layer;
+  GimpLayerMask     *layer_mask;
+  goffset            hierarchy_offset;
+  goffset            layer_mask_offset;
+  gboolean           apply_mask = TRUE;
+  gboolean           edit_mask  = FALSE;
+  gboolean           show_mask  = FALSE;
+  gboolean           active;
+  gboolean           floating;
+  guint32            group_layer_flags = 0;
+  guint32            text_layer_flags = 0;
+  gint               width;
+  gint               height;
+  gint               type;
+  GimpImageBaseType  base_type;
+  gboolean           has_alpha;
+  const Babl        *format;
+  gboolean           is_fs_drawable;
+  gchar             *name;
+  goffset            cur_offset;
+
+  /* check and see if this is the drawable the floating selection
+   *  is attached to. if it is then we'll do the attachment in our caller.
+   */
+  is_fs_drawable = (info->cp == info->floating_sel_offset);
+
+  /* read in the layer width, height, type and name */
+  xcf_read_int32  (info, (guint32 *) &width,  1);
+  xcf_read_int32  (info, (guint32 *) &height, 1);
+  xcf_read_int32  (info, (guint32 *) &type,   1);
+  xcf_read_string (info,             &name,   1);
+
+  GIMP_LOG (XCF, "width=%d, height=%d, type=%d, name='%s'",
+            width, height, type, name);
+
+  switch (type)
+    {
+    case GIMP_RGB_IMAGE:
+      base_type = GIMP_RGB;
+      has_alpha = FALSE;
+      break;
+
+    case GIMP_RGBA_IMAGE:
+      base_type = GIMP_RGB;
+      has_alpha = TRUE;
+      break;
+
+    case GIMP_GRAY_IMAGE:
+      base_type = GIMP_GRAY;
+      has_alpha = FALSE;
+      break;
+
+    case GIMP_GRAYA_IMAGE:
+      base_type = GIMP_GRAY;
+      has_alpha = TRUE;
+      break;
+
+    case GIMP_INDEXED_IMAGE:
+      base_type = GIMP_INDEXED;
+      has_alpha = FALSE;
+      break;
+
+    case GIMP_INDEXEDA_IMAGE:
+      base_type = GIMP_INDEXED;
+      has_alpha = TRUE;
+      break;
+
+    default:
+      return NULL;
+    }
+
+  if (width <= 0 || height <= 0 ||
+      width > GIMP_MAX_IMAGE_SIZE || height > GIMP_MAX_IMAGE_SIZE)
+    {
+      gboolean is_group_layer = FALSE;
+      gboolean is_text_layer  = FALSE;
+      goffset  saved_pos;
+
+      saved_pos = info->cp;
+      /* Load item path and check if this is a group or text layer. */
+      xcf_check_layer_props (info, item_path, &is_group_layer, &is_text_layer);
+      if ((is_text_layer || is_group_layer) &&
+          xcf_seek_pos (info, saved_pos, NULL))
+        {
+          /* Something is wrong, but leave a chance to the layer because
+           * anyway group and text layer depends on their contents.
+           */
+          width = height = 1;
+          g_clear_pointer (item_path, g_list_free);
+        }
+      else
+        {
+          return NULL;
+        }
+    }
+
+  /* do not use gimp_image_get_layer_format() because it might
+   * be the floating selection of a channel or mask
+   */
+  format = gimp_image_get_format (image, base_type,
+                                  gimp_image_get_precision (image),
+                                  has_alpha);
+
+  /* create a new layer */
+  layer = gimp_layer_new (image, width, height,
+                          format, name,
+                          GIMP_OPACITY_OPAQUE, GIMP_LAYER_MODE_NORMAL);
+  g_free (name);
+  if (! layer)
+    return NULL;
+
+  /* read in the layer properties */
+  if (! xcf_load_layer_props (info, image, &layer, item_path,
+                              &apply_mask, &edit_mask, &show_mask,
+                              &text_layer_flags, &group_layer_flags))
+    goto error;
+
+  GIMP_LOG (XCF, "layer props loaded");
+
+  xcf_progress_update (info);
+
+  /* call the evil text layer hack that might change our layer pointer */
+  active   = (info->active_layer == layer);
+  floating = (info->floating_sel == layer);
+
+  if (gimp_text_layer_xcf_load_hack (&layer))
+    {
+      gimp_text_layer_set_xcf_flags (GIMP_TEXT_LAYER (layer),
+                                     text_layer_flags);
+
+      if (active)
+        info->active_layer = layer;
+      if (floating)
+        info->floating_sel = layer;
+    }
+
+  /* read the hierarchy and layer mask offsets */
+  cur_offset = info->cp;
+  xcf_read_offset (info, &hierarchy_offset,  1);
+  xcf_read_offset (info, &layer_mask_offset, 1);
+
+  /* read in the hierarchy (ignore it for group layers, both as an
+   * optimization and because the hierarchy's extents don't match
+   * the group layer's tiles)
+   */
+  if (! gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+    {
+      if (hierarchy_offset < cur_offset)
+        {
+          GIMP_LOG (XCF, "Invalid layer hierarchy offset!");
+          goto error;
+        }
+      if (! xcf_seek_pos (info, hierarchy_offset, NULL))
+        goto error;
+
+      GIMP_LOG (XCF, "loading buffer");
+
+      if (! xcf_load_buffer (info,
+                             gimp_drawable_get_buffer (GIMP_DRAWABLE (layer))))
+        goto error;
+
+      GIMP_LOG (XCF, "buffer loaded");
+
+      xcf_progress_update (info);
+    }
+  else
+    {
+      gboolean expanded = group_layer_flags & XCF_GROUP_ITEM_EXPANDED;
+
+      gimp_viewable_set_expanded (GIMP_VIEWABLE (layer), expanded);
+    }
+
+  /* read in the layer mask */
+  if (layer_mask_offset != 0)
+    {
+      if (layer_mask_offset < cur_offset)
+        {
+          GIMP_LOG (XCF, "Invalid layer mask offset!");
+          goto error;
+        }
+      if (! xcf_seek_pos (info, layer_mask_offset, NULL))
+        goto error;
+
+      layer_mask = xcf_load_layer_mask (info, image);
+      if (! layer_mask)
+        goto error;
+
+      xcf_progress_update (info);
+
+      /* don't add the layer mask yet, that won't work for group
+       * layers which update their size automatically; instead
+       * attach it so it can be added when all layers are loaded
+       */
+      g_object_set_data_full (G_OBJECT (layer), "gimp-layer-mask",
+                              g_object_ref_sink (layer_mask),
+                              (GDestroyNotify) g_object_unref);
+      g_object_set_data (G_OBJECT (layer), "gimp-layer-mask-apply",
+                         GINT_TO_POINTER (apply_mask));
+      g_object_set_data (G_OBJECT (layer), "gimp-layer-mask-edit",
+                         GINT_TO_POINTER (edit_mask));
+      g_object_set_data (G_OBJECT (layer), "gimp-layer-mask-show",
+                         GINT_TO_POINTER (show_mask));
+    }
+
+  /* attach the floating selection... */
+  if (is_fs_drawable)
+    info->floating_sel_drawable = GIMP_DRAWABLE (layer);
+
+  return layer;
+
+ error:
+  if (info->active_layer == layer)
+    info->active_layer = NULL;
+
+  if (info->floating_sel == layer)
+    info->floating_sel = NULL;
+
+  if (info->floating_sel_drawable == GIMP_DRAWABLE (layer))
+    info->floating_sel_drawable = NULL;
+
+  g_object_unref (layer);
+
+  return NULL;
+}
+
+static GimpChannel *
+xcf_load_channel (XcfInfo   *info,
+                  GimpImage *image)
+{
+  GimpChannel *channel;
+  goffset      hierarchy_offset;
+  gint         width;
+  gint         height;
+  gboolean     is_fs_drawable;
+  gchar       *name;
+  GimpRGB      color = { 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE };
+  goffset      cur_offset;
+
+  /* check and see if this is the drawable the floating selection
+   *  is attached to. if it is then we'll do the attachment in our caller.
+   */
+  is_fs_drawable = (info->cp == info->floating_sel_offset);
+
+  /* read in the layer width, height and name */
+  xcf_read_int32 (info, (guint32 *) &width,  1);
+  xcf_read_int32 (info, (guint32 *) &height, 1);
+  if (width <= 0 || height <= 0 ||
+      width > GIMP_MAX_IMAGE_SIZE || height > GIMP_MAX_IMAGE_SIZE)
+    {
+      GIMP_LOG (XCF, "Invalid channel size %d x %d.", width, height);
+      return NULL;
+    }
+
+  xcf_read_string (info, &name, 1);
+  GIMP_LOG (XCF, "Channel width=%d, height=%d, name='%s'",
+            width, height, name);
+
+  /* create a new channel */
+  channel = gimp_channel_new (image, width, height, name, &color);
+  g_free (name);
+  if (!channel)
+    return NULL;
+
+  /* read in the channel properties */
+  if (! xcf_load_channel_props (info, image, &channel))
+    goto error;
+
+  xcf_progress_update (info);
+
+  /* read the hierarchy offset */
+  cur_offset = info->cp;
+  xcf_read_offset (info, &hierarchy_offset, 1);
+
+  if (hierarchy_offset < cur_offset)
+    {
+      GIMP_LOG (XCF, "Invalid hierarchy offset!");
+      goto error;
+    }
+
+  /* read in the hierarchy */
+  if (! xcf_seek_pos (info, hierarchy_offset, NULL))
+    goto error;
+
+  if (! xcf_load_buffer (info,
+                         gimp_drawable_get_buffer (GIMP_DRAWABLE (channel))))
+    goto error;
+
+  xcf_progress_update (info);
+
+  if (is_fs_drawable)
+    info->floating_sel_drawable = GIMP_DRAWABLE (channel);
+
+  return channel;
+
+ error:
+  /* don't unref the selection of a partially loaded XCF */
+  if (channel != gimp_image_get_mask (image))
+    {
+      if (info->active_channel == channel)
+        info->active_channel = NULL;
+
+      if (info->floating_sel_drawable == GIMP_DRAWABLE (channel))
+        info->floating_sel_drawable = NULL;
+
+      g_object_unref (channel);
+    }
+
+  return NULL;
+}
+
+static GimpLayerMask *
+xcf_load_layer_mask (XcfInfo   *info,
+                     GimpImage *image)
+{
+  GimpLayerMask *layer_mask;
+  GimpChannel   *channel;
+  goffset        hierarchy_offset;
+  gint           width;
+  gint           height;
+  gboolean       is_fs_drawable;
+  gchar         *name;
+  GimpRGB        color = { 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE };
+  goffset        cur_offset;
+
+  /* check and see if this is the drawable the floating selection
+   *  is attached to. if it is then we'll do the attachment in our caller.
+   */
+  is_fs_drawable = (info->cp == info->floating_sel_offset);
+
+  /* read in the layer width, height and name */
+  xcf_read_int32 (info, (guint32 *) &width,  1);
+  xcf_read_int32 (info, (guint32 *) &height, 1);
+  if (width <= 0 || height <= 0 ||
+      width > GIMP_MAX_IMAGE_SIZE || height > GIMP_MAX_IMAGE_SIZE)
+    {
+      GIMP_LOG (XCF, "Invalid layer mask size %d x %d.", width, height);
+      return NULL;
+    }
+
+  xcf_read_string (info, &name, 1);
+  GIMP_LOG (XCF, "Layer mask width=%d, height=%d, name='%s'",
+            width, height, name);
+
+  /* create a new layer mask */
+  layer_mask = gimp_layer_mask_new (image, width, height, name, &color);
+  g_free (name);
+  if (! layer_mask)
+    return NULL;
+
+  /* read in the layer_mask properties */
+  channel = GIMP_CHANNEL (layer_mask);
+  if (! xcf_load_channel_props (info, image, &channel))
+    goto error;
+
+  xcf_progress_update (info);
+
+  /* read the hierarchy offset */
+  cur_offset = info->cp;
+  xcf_read_offset (info, &hierarchy_offset, 1);
+
+  if (hierarchy_offset < cur_offset)
+    {
+      GIMP_LOG (XCF, "Invalid hierarchy offset!");
+      goto error;
+    }
+
+  /* read in the hierarchy */
+  if (! xcf_seek_pos (info, hierarchy_offset, NULL))
+    goto error;
+
+  if (! xcf_load_buffer (info,
+                         gimp_drawable_get_buffer (GIMP_DRAWABLE (layer_mask))))
+    goto error;
+
+  xcf_progress_update (info);
+
+  /* attach the floating selection... */
+  if (is_fs_drawable)
+    info->floating_sel_drawable = GIMP_DRAWABLE (layer_mask);
+
+  return layer_mask;
+
+ error:
+  if (info->active_channel == GIMP_CHANNEL (layer_mask))
+    info->active_channel = NULL;
+
+  if (info->floating_sel_drawable == GIMP_DRAWABLE (layer_mask))
+    info->floating_sel_drawable = NULL;
+
+  g_object_unref (layer_mask);
+
+  return NULL;
+}
+
+static gboolean
+xcf_load_buffer (XcfInfo    *info,
+                 GeglBuffer *buffer)
+{
+  const Babl *format;
+  goffset     offset;
+  gint        width;
+  gint        height;
+  gint        bpp;
+  goffset     cur_offset;
+
+  format = gegl_buffer_get_format (buffer);
+
+  xcf_read_int32 (info, (guint32 *) &width,  1);
+  xcf_read_int32 (info, (guint32 *) &height, 1);
+  xcf_read_int32 (info, (guint32 *) &bpp,    1);
+
+  /* make sure the values in the file correspond to the values
+   *  calculated when the GeglBuffer was created.
+   */
+  if (width  != gegl_buffer_get_width (buffer)  ||
+      height != gegl_buffer_get_height (buffer) ||
+      bpp    != babl_format_get_bytes_per_pixel (format))
+    return FALSE;
+
+  cur_offset = info->cp;
+  xcf_read_offset (info, &offset, 1); /* top level */
+
+  if (offset < cur_offset)
+    {
+      GIMP_LOG (XCF, "Invalid buffer offset!");
+      return FALSE;
+    }
+
+  /* seek to the level offset */
+  if (! xcf_seek_pos (info, offset, NULL))
+    return FALSE;
+
+  /* read in the level */
+  if (! xcf_load_level (info, buffer))
+    return FALSE;
+
+  /* discard levels below first.
+   */
+
+  return TRUE;
+}
+
+
+static gboolean
+xcf_load_level (XcfInfo    *info,
+                GeglBuffer *buffer)
+{
+  const Babl *format;
+  gint        bpp;
+  goffset     saved_pos;
+  goffset     offset;
+  goffset     offset2;
+  goffset     max_data_length;
+  gint        n_tile_rows;
+  gint        n_tile_cols;
+  guint       ntiles;
+  gint        width;
+  gint        height;
+  gint        i;
+  gint        fail;
+
+  format = gegl_buffer_get_format (buffer);
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  xcf_read_int32 (info, (guint32 *) &width,  1);
+  xcf_read_int32 (info, (guint32 *) &height, 1);
+
+  if (width  != gegl_buffer_get_width (buffer) ||
+      height != gegl_buffer_get_height (buffer))
+    return FALSE;
+
+  /* maximal allowable size of on-disk tile data.  make it somewhat bigger than
+   * the uncompressed tile size, to allow for the possibility of negative
+   * compression.
+   */
+  max_data_length = XCF_TILE_WIDTH * XCF_TILE_HEIGHT * bpp *
+                    XCF_TILE_MAX_DATA_LENGTH_FACTOR /* = 1.5, currently */;
+
+  /* read in the first tile offset.
+   *  if it is '0', then this tile level is empty
+   *  and we can simply return.
+   */
+  xcf_read_offset (info, &offset, 1);
+  if (offset == 0)
+    return TRUE;
+
+  n_tile_rows = gimp_gegl_buffer_get_n_tile_rows (buffer, XCF_TILE_HEIGHT);
+  n_tile_cols = gimp_gegl_buffer_get_n_tile_cols (buffer, XCF_TILE_WIDTH);
+
+  ntiles = n_tile_rows * n_tile_cols;
+  for (i = 0; i < ntiles; i++)
+    {
+      GeglRectangle rect;
+
+      fail = FALSE;
+
+      if (offset == 0)
+        {
+          gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+                                GIMP_MESSAGE_ERROR,
+                                "not enough tiles found in level");
+          return FALSE;
+        }
+
+      /* save the current position as it is where the
+       *  next tile offset is stored.
+       */
+      saved_pos = info->cp;
+
+      /* read in the offset of the next tile so we can calculate the amount
+       * of data needed for this tile
+       */
+      xcf_read_offset (info, &offset2, 1);
+
+      /* if the offset is 0 then we need to read in the maximum possible
+       * allowing for negative compression
+       */
+      if (offset2 == 0)
+        offset2 = offset + max_data_length;
+
+      /* seek to the tile offset */
+      if (! xcf_seek_pos (info, offset, NULL))
+        return FALSE;
+
+      if (offset2 < offset || offset2 - offset > max_data_length)
+        {
+          gimp_message (info->gimp, G_OBJECT (info->progress),
+                        GIMP_MESSAGE_ERROR,
+                        "invalid tile data length: %" G_GOFFSET_FORMAT,
+                        offset2 - offset);
+          return FALSE;
+        }
+
+      /* get buffer rectangle to write to */
+      gimp_gegl_buffer_get_tile_rect (buffer,
+                                      XCF_TILE_WIDTH, XCF_TILE_HEIGHT,
+                                      i, &rect);
+
+      GIMP_LOG (XCF, "loading tile %d/%d", i + 1, ntiles);
+
+      /* read in the tile */
+      switch (info->compression)
+        {
+        case COMPRESS_NONE:
+          if (! xcf_load_tile (info, buffer, &rect, format))
+            fail = TRUE;
+          break;
+        case COMPRESS_RLE:
+          if (! xcf_load_tile_rle (info, buffer, &rect, format,
+                                   offset2 - offset))
+            fail = TRUE;
+          break;
+        case COMPRESS_ZLIB:
+          if (! xcf_load_tile_zlib (info, buffer, &rect, format,
+                                    offset2 - offset))
+            fail = TRUE;
+          break;
+        case COMPRESS_FRACTAL:
+          g_printerr ("xcf: fractal compression unimplemented. "
+                      "Possibly corrupt XCF file.");
+          fail = TRUE;
+          break;
+        default:
+          g_printerr ("xcf: unknown compression. "
+                      "Possibly corrupt XCF file.");
+          fail = TRUE;
+          break;
+        }
+
+      if (fail)
+        return FALSE;
+
+      GIMP_LOG (XCF, "loaded tile %d/%d", i + 1, ntiles);
+
+      /* restore the saved position so we'll be ready to
+       *  read the next offset.
+       */
+      if (!xcf_seek_pos (info, saved_pos, NULL))
+        return FALSE;
+
+      /* read in the offset of the next tile */
+      xcf_read_offset (info, &offset, 1);
+    }
+
+  if (offset != 0)
+    {
+      gimp_message (info->gimp, G_OBJECT (info->progress), GIMP_MESSAGE_ERROR,
+                    "encountered garbage after reading level: %" G_GOFFSET_FORMAT,
+                    offset);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_load_tile (XcfInfo       *info,
+               GeglBuffer    *buffer,
+               GeglRectangle *tile_rect,
+               const Babl    *format)
+{
+  gint    bpp       = babl_format_get_bytes_per_pixel (format);
+  gint    tile_size = bpp * tile_rect->width * tile_rect->height;
+  guchar *tile_data = g_alloca (tile_size);
+
+  if (info->file_version <= 11)
+    {
+      xcf_read_int8 (info, tile_data, tile_size);
+    }
+  else
+    {
+      gint n_components = babl_format_get_n_components (format);
+
+      xcf_read_component (info, bpp / n_components, tile_data,
+                          tile_size / bpp * n_components);
+    }
+
+  if (! xcf_data_is_zero (tile_data, tile_size))
+    {
+      gegl_buffer_set (buffer, tile_rect, 0, format, tile_data,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_load_tile_rle (XcfInfo       *info,
+                   GeglBuffer    *buffer,
+                   GeglRectangle *tile_rect,
+                   const Babl    *format,
+                   gint           data_length)
+{
+  gint    bpp       = babl_format_get_bytes_per_pixel (format);
+  gint    tile_size = bpp * tile_rect->width * tile_rect->height;
+  guchar *tile_data = g_alloca (tile_size);
+  guchar  nonzero   = FALSE;
+  gsize   bytes_read;
+  gint    i;
+  guchar *xcfdata;
+  guchar *xcfodata;
+  guchar *xcfdatalimit;
+
+  /* Workaround for bug #357809: avoid crashing on g_malloc() and skip
+   * this tile (return TRUE without storing data) as if it did not
+   * contain any data.  It is better than returning FALSE, which would
+   * skip the whole hierarchy while there may still be some valid
+   * tiles in the file.
+   */
+  if (data_length <= 0)
+    return TRUE;
+
+  xcfdata = xcfodata = g_alloca (data_length);
+
+  /* we have to read directly instead of xcf_read_* because we may be
+   * reading past the end of the file here
+   */
+  g_input_stream_read_all (info->input, xcfdata, data_length,
+                           &bytes_read, NULL, NULL);
+  info->cp += bytes_read;
+
+  if (bytes_read == 0)
+    return TRUE;
+
+  xcfdatalimit = &xcfodata[bytes_read - 1];
+
+  for (i = 0; i < bpp; i++)
+    {
+      guchar *data  = tile_data + i;
+      gint    size  = tile_rect->width * tile_rect->height;
+      gint    count = 0;
+      guchar  val;
+      gint    length;
+      gint    j;
+
+      while (size > 0)
+        {
+          if (xcfdata > xcfdatalimit)
+            {
+              goto bogus_rle;
+            }
+
+          val = *xcfdata++;
+
+          length = val;
+          if (length >= 128)
+            {
+              length = 255 - (length - 1);
+              if (length == 128)
+                {
+                  if (xcfdata >= xcfdatalimit)
+                    {
+                      goto bogus_rle;
+                    }
+
+                  length = (*xcfdata << 8) + xcfdata[1];
+                  xcfdata += 2;
+                }
+
+              count += length;
+              size -= length;
+
+              if (size < 0)
+                {
+                  goto bogus_rle;
+                }
+
+              if (&xcfdata[length-1] > xcfdatalimit)
+                {
+                  goto bogus_rle;
+                }
+
+              while (length-- > 0)
+                {
+                  *data = *xcfdata++;
+                  nonzero |= *data;
+                  data += bpp;
+                }
+            }
+          else
+            {
+              length += 1;
+              if (length == 128)
+                {
+                  if (xcfdata >= xcfdatalimit)
+                    {
+                      goto bogus_rle;
+                    }
+
+                  length = (*xcfdata << 8) + xcfdata[1];
+                  xcfdata += 2;
+                }
+
+              count += length;
+              size -= length;
+
+              if (size < 0)
+                {
+                  goto bogus_rle;
+                }
+
+              if (xcfdata > xcfdatalimit)
+                {
+                  goto bogus_rle;
+                }
+
+              val = *xcfdata++;
+              nonzero |= val;
+
+              for (j = 0; j < length; j++)
+                {
+                  *data = val;
+                  data += bpp;
+                }
+            }
+        }
+    }
+
+  if (nonzero)
+    {
+      if (info->file_version >= 12)
+        {
+          gint n_components = babl_format_get_n_components (format);
+
+          xcf_read_from_be (bpp / n_components, tile_data,
+                            tile_size / bpp * n_components);
+        }
+
+      gegl_buffer_set (buffer, tile_rect, 0, format, tile_data,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  return TRUE;
+
+ bogus_rle:
+  return FALSE;
+}
+
+static gboolean
+xcf_load_tile_zlib (XcfInfo       *info,
+                    GeglBuffer    *buffer,
+                    GeglRectangle *tile_rect,
+                    const Babl    *format,
+                    gint           data_length)
+{
+  z_stream  strm;
+  int       action;
+  int       status;
+  gint      bpp       = babl_format_get_bytes_per_pixel (format);
+  gint      tile_size = bpp * tile_rect->width * tile_rect->height;
+  guchar   *tile_data = g_alloca (tile_size);
+  gsize     bytes_read;
+  guchar   *xcfdata;
+
+  /* Workaround for bug #357809: avoid crashing on g_malloc() and skip
+   * this tile (return TRUE without storing data) as if it did not
+   * contain any data.  It is better than returning FALSE, which would
+   * skip the whole hierarchy while there may still be some valid
+   * tiles in the file.
+   */
+  if (data_length <= 0)
+    return TRUE;
+
+  xcfdata = g_alloca (data_length);
+
+  /* we have to read directly instead of xcf_read_* because we may be
+   * reading past the end of the file here
+   */
+  g_input_stream_read_all (info->input, xcfdata, data_length,
+                           &bytes_read, NULL, NULL);
+  info->cp += bytes_read;
+
+  if (bytes_read == 0)
+    return TRUE;
+
+  strm.next_out  = tile_data;
+  strm.avail_out = tile_size;
+
+  strm.zalloc    = Z_NULL;
+  strm.zfree     = Z_NULL;
+  strm.opaque    = Z_NULL;
+  strm.next_in   = xcfdata;
+  strm.avail_in  = bytes_read;
+
+  /* Initialize the stream decompression. */
+  status = inflateInit (&strm);
+  if (status != Z_OK)
+    return FALSE;
+
+  action = Z_NO_FLUSH;
+
+  while (status == Z_OK)
+    {
+      if (strm.avail_in == 0)
+        {
+          action = Z_FINISH;
+        }
+
+      status = inflate (&strm, action);
+
+      if (status == Z_STREAM_END)
+        {
+          /* All the data was successfully decoded. */
+          break;
+        }
+      else if (status == Z_BUF_ERROR)
+        {
+          g_printerr ("xcf: decompressed tile bigger than the expected size.");
+          inflateEnd (&strm);
+          return FALSE;
+        }
+      else if (status != Z_OK)
+        {
+          g_printerr ("xcf: tile decompression failed: %s", zError (status));
+          inflateEnd (&strm);
+          return FALSE;
+        }
+    }
+
+  if (! xcf_data_is_zero (tile_data, tile_size))
+    {
+      if (info->file_version >= 12)
+        {
+          gint n_components = babl_format_get_n_components (format);
+
+          xcf_read_from_be (bpp / n_components, tile_data,
+                            tile_size / bpp * n_components);
+        }
+
+      gegl_buffer_set (buffer, tile_rect, 0, format, tile_data,
+                       GEGL_AUTO_ROWSTRIDE);
+    }
+
+  inflateEnd (&strm);
+
+  return TRUE;
+}
+
+static GimpParasite *
+xcf_load_parasite (XcfInfo *info)
+{
+  GimpParasite *parasite = NULL;
+  gchar        *name;
+  guint32       flags;
+  guint32       size, size_read;
+  gpointer      data;
+
+  xcf_read_string (info, &name,  1);
+  xcf_read_int32  (info, &flags, 1);
+  xcf_read_int32  (info, &size,  1);
+
+  GIMP_LOG (XCF, "Parasite name: %s, flags: %d, size: %d", name, flags, size);
+
+  if (size > MAX_XCF_PARASITE_DATA_LEN)
+    {
+      g_printerr ("Maximum parasite data length (%ld bytes) exceeded. "
+                  "Possibly corrupt XCF file.", MAX_XCF_PARASITE_DATA_LEN);
+      g_free (name);
+      return NULL;
+    }
+
+  if (!name)
+    {
+      g_printerr ("Parasite has no name! Possibly corrupt XCF file.\n");
+      return NULL;
+    }
+
+  data = g_new (gchar, size);
+  size_read = xcf_read_int8 (info, data, size);
+
+  if (size_read != size)
+    {
+      g_printerr ("Incorrect parasite data size: read %u bytes instead of %u. "
+                  "Possibly corrupt XCF file.\n",
+                  size_read, size);
+    }
+  else
+    {
+      parasite = gimp_parasite_new (name, flags, size, data);
+    }
+
+  g_free (name);
+  g_free (data);
+
+  return parasite;
+}
+
+static gboolean
+xcf_load_old_paths (XcfInfo   *info,
+                    GimpImage *image)
+{
+  guint32      num_paths;
+  guint32      last_selected_row;
+  GimpVectors *active_vectors;
+
+  xcf_read_int32 (info, &last_selected_row, 1);
+  xcf_read_int32 (info, &num_paths,         1);
+
+  GIMP_LOG (XCF, "Number of old paths: %u", num_paths);
+
+  while (num_paths-- > 0)
+    if (! xcf_load_old_path (info, image))
+      return FALSE;
+
+  active_vectors =
+    GIMP_VECTORS (gimp_container_get_child_by_index (gimp_image_get_vectors (image),
+                                                     last_selected_row));
+
+  if (active_vectors)
+    gimp_image_set_active_vectors (image, active_vectors);
+
+  return TRUE;
+}
+
+static gboolean
+xcf_load_old_path (XcfInfo   *info,
+                   GimpImage *image)
+{
+  gchar                  *name;
+  guint32                 locked;
+  guint8                  state;
+  guint32                 closed;
+  guint32                 num_points;
+  guint32                 version; /* changed from num_paths */
+  GimpTattoo              tattoo = 0;
+  GimpVectors            *vectors;
+  GimpVectorsCompatPoint *points;
+  gint                    i;
+
+  xcf_read_string (info, &name,       1);
+  xcf_read_int32  (info, &locked,     1);
+  xcf_read_int8   (info, &state,      1);
+  xcf_read_int32  (info, &closed,     1);
+  xcf_read_int32  (info, &num_points, 1);
+  xcf_read_int32  (info, &version,    1);
+
+  if (version == 2)
+    {
+      guint32 dummy;
+
+      /* Had extra type field and points are stored as doubles */
+      xcf_read_int32 (info, (guint32 *) &dummy, 1);
+    }
+  else if (version == 3)
+    {
+      guint32 dummy;
+
+      /* Has extra tattoo field */
+      xcf_read_int32 (info, (guint32 *) &dummy,  1);
+      xcf_read_int32 (info, (guint32 *) &tattoo, 1);
+    }
+  else if (version != 1)
+    {
+      g_printerr ("Unknown path type (version: %u). Possibly corrupt XCF file.\n", version);
+
+      return FALSE;
+    }
+
+  /* skip empty compatibility paths */
+  if (num_points == 0)
+    {
+      g_free (name);
+      return FALSE;
+    }
+
+  points = g_new0 (GimpVectorsCompatPoint, num_points);
+
+  for (i = 0; i < num_points; i++)
+    {
+      if (version == 1)
+        {
+          gint32 x;
+          gint32 y;
+
+          xcf_read_int32 (info, &points[i].type, 1);
+          xcf_read_int32 (info, (guint32 *) &x,  1);
+          xcf_read_int32 (info, (guint32 *) &y,  1);
+
+          points[i].x = x;
+          points[i].y = y;
+        }
+      else
+        {
+          gfloat x;
+          gfloat y;
+
+          xcf_read_int32 (info, &points[i].type, 1);
+          xcf_read_float (info, &x,              1);
+          xcf_read_float (info, &y,              1);
+
+          points[i].x = x;
+          points[i].y = y;
+        }
+    }
+
+  vectors = gimp_vectors_compat_new (image, name, points, num_points, closed);
+
+  g_free (name);
+  g_free (points);
+
+  gimp_item_set_linked (GIMP_ITEM (vectors), locked, FALSE);
+
+  if (tattoo)
+    gimp_item_set_tattoo (GIMP_ITEM (vectors), tattoo);
+
+  gimp_image_add_vectors (image, vectors,
+                          NULL, /* can't be a tree */
+                          gimp_container_get_n_children (gimp_image_get_vectors (image)),
+                          FALSE);
+
+  return TRUE;
+}
+
+static gboolean
+xcf_load_vectors (XcfInfo   *info,
+                  GimpImage *image)
+{
+  guint32      version;
+  guint32      active_index;
+  guint32      num_paths;
+  GimpVectors *active_vectors;
+
+#ifdef GIMP_XCF_PATH_DEBUG
+  g_printerr ("xcf_load_vectors\n");
+#endif
+
+  xcf_read_int32 (info, &version, 1);
+
+  if (version != 1)
+    {
+      gimp_message (info->gimp, G_OBJECT (info->progress),
+                    GIMP_MESSAGE_WARNING,
+                    "Unknown vectors version: %d (skipping)", version);
+      return FALSE;
+    }
+
+  xcf_read_int32 (info, &active_index, 1);
+  xcf_read_int32 (info, &num_paths,    1);
+
+#ifdef GIMP_XCF_PATH_DEBUG
+  g_printerr ("%d paths (active: %d)\n", num_paths, active_index);
+#endif
+
+  while (num_paths-- > 0)
+    if (! xcf_load_vector (info, image))
+      return FALSE;
+
+  /* FIXME tree */
+  active_vectors =
+    GIMP_VECTORS (gimp_container_get_child_by_index (gimp_image_get_vectors (image),
+                                                     active_index));
+
+  if (active_vectors)
+    gimp_image_set_active_vectors (image, active_vectors);
+
+#ifdef GIMP_XCF_PATH_DEBUG
+  g_printerr ("xcf_load_vectors: loaded %d bytes\n", info->cp - base);
+#endif
+  return TRUE;
+}
+
+static gboolean
+xcf_load_vector (XcfInfo   *info,
+                 GimpImage *image)
+{
+  gchar       *name;
+  GimpTattoo   tattoo = 0;
+  guint32      visible;
+  guint32      linked;
+  guint32      num_parasites;
+  guint32      num_strokes;
+  GimpVectors *vectors;
+  gint         i;
+
+#ifdef GIMP_XCF_PATH_DEBUG
+  g_printerr ("xcf_load_vector\n");
+#endif
+
+  xcf_read_string (info, &name,          1);
+  xcf_read_int32  (info, &tattoo,        1);
+  xcf_read_int32  (info, &visible,       1);
+  xcf_read_int32  (info, &linked,        1);
+  xcf_read_int32  (info, &num_parasites, 1);
+  xcf_read_int32  (info, &num_strokes,   1);
+
+#ifdef GIMP_XCF_PATH_DEBUG
+  g_printerr ("name: %s, tattoo: %d, visible: %d, linked: %d, "
+              "num_parasites %d, num_strokes %d\n",
+              name, tattoo, visible, linked, num_parasites, num_strokes);
+#endif
+
+  vectors = gimp_vectors_new (image, name);
+  g_free (name);
+
+  gimp_item_set_visible (GIMP_ITEM (vectors), visible, FALSE);
+  gimp_item_set_linked (GIMP_ITEM (vectors), linked, FALSE);
+
+  if (tattoo)
+    gimp_item_set_tattoo (GIMP_ITEM (vectors), tattoo);
+
+  for (i = 0; i < num_parasites; i++)
+    {
+      GimpParasite *parasite = xcf_load_parasite (info);
+      GError       *error    = NULL;
+
+      if (! parasite)
+        return FALSE;
+
+      if (! gimp_item_parasite_validate (GIMP_ITEM (vectors), parasite, &error))
+        {
+          gimp_message (info->gimp, G_OBJECT (info->progress),
+                        GIMP_MESSAGE_WARNING,
+                        "Warning, invalid vectors parasite in XCF file: %s",
+                        error->message);
+          g_clear_error (&error);
+        }
+      else
+        {
+          gimp_item_parasite_attach (GIMP_ITEM (vectors), parasite, FALSE);
+        }
+
+      gimp_parasite_free (parasite);
+    }
+
+  for (i = 0; i < num_strokes; i++)
+    {
+      guint32      stroke_type_id;
+      guint32      closed;
+      guint32      num_axes;
+      guint32      num_control_points;
+      guint32      type;
+      gfloat       coords[10] = GIMP_COORDS_DEFAULT_VALUES;
+      GimpStroke  *stroke;
+      gint         j;
+
+      GimpValueArray *control_points;
+      GValue          value  = G_VALUE_INIT;
+      GimpAnchor      anchor = { { 0, } };
+      GType           stroke_type;
+
+      g_value_init (&value, GIMP_TYPE_ANCHOR);
+
+      xcf_read_int32 (info, &stroke_type_id,     1);
+      xcf_read_int32 (info, &closed,             1);
+      xcf_read_int32 (info, &num_axes,           1);
+      xcf_read_int32 (info, &num_control_points, 1);
+
+#ifdef GIMP_XCF_PATH_DEBUG
+      g_printerr ("stroke_type: %d, closed: %d, num_axes %d, len %d\n",
+                  stroke_type_id, closed, num_axes, num_control_points);
+#endif
+
+      switch (stroke_type_id)
+        {
+        case XCF_STROKETYPE_BEZIER_STROKE:
+          stroke_type = GIMP_TYPE_BEZIER_STROKE;
+          break;
+
+        default:
+          g_printerr ("skipping unknown stroke type\n");
+          xcf_seek_pos (info,
+                        info->cp + 4 * num_axes * num_control_points,
+                        NULL);
+          continue;
+        }
+
+      if (num_axes < 2 || num_axes > 6)
+        {
+          g_printerr ("bad number of axes in stroke description\n");
+          return FALSE;
+        }
+
+      control_points = gimp_value_array_new (num_control_points);
+
+      anchor.selected = FALSE;
+
+      for (j = 0; j < num_control_points; j++)
+        {
+          xcf_read_int32 (info, &type,  1);
+          xcf_read_float (info, coords, num_axes);
+
+          anchor.type              = type;
+          anchor.position.x        = coords[0];
+          anchor.position.y        = coords[1];
+          anchor.position.pressure = coords[2];
+          anchor.position.xtilt    = coords[3];
+          anchor.position.ytilt    = coords[4];
+          anchor.position.wheel    = coords[5];
+
+          g_value_set_boxed (&value, &anchor);
+          gimp_value_array_append (control_points, &value);
+
+#ifdef GIMP_XCF_PATH_DEBUG
+          g_printerr ("Anchor: %d, (%f, %f, %f, %f, %f, %f)\n", type,
+                      coords[0], coords[1], coords[2], coords[3],
+                      coords[4], coords[5]);
+#endif
+        }
+
+      g_value_unset (&value);
+
+      stroke = g_object_new (stroke_type,
+                             "closed",         closed,
+                             "control-points", control_points,
+                             NULL);
+
+      gimp_vectors_stroke_add (vectors, stroke);
+
+      g_object_unref (stroke);
+      gimp_value_array_unref (control_points);
+    }
+
+  gimp_image_add_vectors (image, vectors,
+                          NULL, /* FIXME tree */
+                          gimp_container_get_n_children (gimp_image_get_vectors (image)),
+                          FALSE);
+
+  return TRUE;
+}
+
+static gboolean
+xcf_skip_unknown_prop (XcfInfo *info,
+                       gsize   size)
+{
+  guint8 buf[16];
+  guint  amount;
+
+  while (size > 0)
+    {
+      if (g_input_stream_is_closed (info->input))
+        return FALSE;
+
+      amount = MIN (16, size);
+      amount = xcf_read_int8 (info, buf, amount);
+      if (amount == 0)
+        return FALSE;
+
+      size -= amount;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_item_path_is_parent (GList *path,
+                         GList *parent_path)
+{
+  GList *iter        = path;
+  GList *parent_iter = parent_path;
+
+  if (g_list_length (parent_path) >= g_list_length (path))
+    return FALSE;
+
+  while (iter && parent_iter)
+    {
+      if (iter->data != parent_iter->data)
+        return FALSE;
+
+      iter = iter->next;
+      parent_iter = parent_iter->next;
+    }
+
+  return TRUE;
+}
+
+static void
+xcf_fix_item_path (GimpLayer  *layer,
+                   GList     **path,
+                   GList      *broken_paths)
+{
+  GList *iter;
+
+  for (iter = broken_paths; iter; iter = iter->next)
+    {
+      if (xcf_item_path_is_parent (*path, iter->data))
+        {
+          /* Not much to do when the absent path is a parent. */
+          g_printerr ("%s: layer '%s' moved to layer tree root because of missing parent.",
+                      G_STRFUNC, gimp_object_get_name (layer));
+          g_clear_pointer (path, g_list_free);
+          return;
+        }
+    }
+
+  /* Check if a parent of path, or path itself is on the same
+   * tree level as any broken path; and if so, and if the broken path is
+   * in a lower position in the item group, decrement it.
+   */
+  for (iter = broken_paths; iter; iter = iter->next)
+    {
+      GList *broken_path = iter->data;
+      GList *iter1       = *path;
+      GList *iter2       = broken_path;
+
+      if (g_list_length (broken_path) > g_list_length (*path))
+        continue;
+
+      while (iter1 && iter2)
+        {
+          if (iter2->next && iter1->data != iter2->data)
+            /* Paths diverged before reaching iter2 leaf. */
+            break;
+
+          if (iter2->next)
+            {
+              iter1 = iter1->next;
+              iter2 = iter2->next;
+              continue;
+            }
+
+          if (GPOINTER_TO_UINT (iter2->data) < GPOINTER_TO_UINT (iter1->data))
+            iter1->data = GUINT_TO_POINTER (GPOINTER_TO_UINT (iter1->data) - 1);
+
+          break;
+        }
+    }
+}
diff --git a/app/xcf/xcf-load.h b/app/xcf/xcf-load.h
new file mode 100644
index 0000000..94881d0
--- /dev/null
+++ b/app/xcf/xcf-load.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_LOAD_H__
+#define __XCF_LOAD_H__
+
+
+GimpImage * xcf_load_image (Gimp     *gimp,
+                            XcfInfo  *info,
+                            GError  **error);
+
+
+#endif  /* __XCF_LOAD_H__ */
diff --git a/app/xcf/xcf-private.h b/app/xcf/xcf-private.h
new file mode 100644
index 0000000..b7490d8
--- /dev/null
+++ b/app/xcf/xcf-private.h
@@ -0,0 +1,118 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_PRIVATE_H__
+#define __XCF_PRIVATE_H__
+
+
+#define XCF_TILE_WIDTH                  64
+#define XCF_TILE_HEIGHT                 64
+#define XCF_TILE_MAX_DATA_LENGTH_FACTOR 1.5
+
+typedef enum
+{
+  PROP_END                =  0,
+  PROP_COLORMAP           =  1,
+  PROP_ACTIVE_LAYER       =  2,
+  PROP_ACTIVE_CHANNEL     =  3,
+  PROP_SELECTION          =  4,
+  PROP_FLOATING_SELECTION =  5,
+  PROP_OPACITY            =  6,
+  PROP_MODE               =  7,
+  PROP_VISIBLE            =  8,
+  PROP_LINKED             =  9,
+  PROP_LOCK_ALPHA         = 10,
+  PROP_APPLY_MASK         = 11,
+  PROP_EDIT_MASK          = 12,
+  PROP_SHOW_MASK          = 13,
+  PROP_SHOW_MASKED        = 14,
+  PROP_OFFSETS            = 15,
+  PROP_COLOR              = 16,
+  PROP_COMPRESSION        = 17,
+  PROP_GUIDES             = 18,
+  PROP_RESOLUTION         = 19,
+  PROP_TATTOO             = 20,
+  PROP_PARASITES          = 21,
+  PROP_UNIT               = 22,
+  PROP_PATHS              = 23,
+  PROP_USER_UNIT          = 24,
+  PROP_VECTORS            = 25,
+  PROP_TEXT_LAYER_FLAGS   = 26,
+  PROP_OLD_SAMPLE_POINTS  = 27,
+  PROP_LOCK_CONTENT       = 28,
+  PROP_GROUP_ITEM         = 29,
+  PROP_ITEM_PATH          = 30,
+  PROP_GROUP_ITEM_FLAGS   = 31,
+  PROP_LOCK_POSITION      = 32,
+  PROP_FLOAT_OPACITY      = 33,
+  PROP_COLOR_TAG          = 34,
+  PROP_COMPOSITE_MODE     = 35,
+  PROP_COMPOSITE_SPACE    = 36,
+  PROP_BLEND_SPACE        = 37,
+  PROP_FLOAT_COLOR        = 38,
+  PROP_SAMPLE_POINTS      = 39,
+} PropType;
+
+typedef enum
+{
+  COMPRESS_NONE              =  0,
+  COMPRESS_RLE               =  1,
+  COMPRESS_ZLIB              =  2,  /* unused */
+  COMPRESS_FRACTAL           =  3   /* unused */
+} XcfCompressionType;
+
+typedef enum
+{
+  XCF_ORIENTATION_HORIZONTAL = 1,
+  XCF_ORIENTATION_VERTICAL   = 2
+} XcfOrientationType;
+
+typedef enum
+{
+  XCF_STROKETYPE_STROKE        = 0,
+  XCF_STROKETYPE_BEZIER_STROKE = 1
+} XcfStrokeType;
+
+typedef enum
+{
+  XCF_GROUP_ITEM_EXPANDED      = 1
+} XcfGroupItemFlagsType;
+
+typedef struct _XcfInfo  XcfInfo;
+
+struct _XcfInfo
+{
+  Gimp               *gimp;
+  GimpProgress       *progress;
+  GInputStream       *input;
+  GOutputStream      *output;
+  GSeekable          *seekable;
+  goffset             cp;
+  gint                bytes_per_offset;
+  GFile              *file;
+  GimpTattoo          tattoo_state;
+  GimpLayer          *active_layer;
+  GimpChannel        *active_channel;
+  GimpDrawable       *floating_sel_drawable;
+  GimpLayer          *floating_sel;
+  goffset             floating_sel_offset;
+  XcfCompressionType  compression;
+  gint                file_version;
+};
+
+
+#endif /* __XCF_PRIVATE_H__ */
diff --git a/app/xcf/xcf-read.c b/app/xcf/xcf-read.c
new file mode 100644
index 0000000..1c53436
--- /dev/null
+++ b/app/xcf/xcf-read.c
@@ -0,0 +1,274 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "xcf-private.h"
+#include "xcf-read.h"
+
+#include "gimp-intl.h"
+
+
+#define MAX_XCF_STRING_LEN (16L * 1024 * 1024)
+
+
+guint
+xcf_read_int8 (XcfInfo *info,
+               guint8  *data,
+               gint     count)
+{
+  gsize bytes_read = 0;
+
+  /* we allow for 'data == NULL && count == 0', which g_input_stream_read_all()
+   * rejects.
+   */
+  if (count > 0)
+    {
+      g_input_stream_read_all (info->input, data, count,
+                               &bytes_read, NULL, NULL);
+
+      info->cp += bytes_read;
+    }
+
+  return bytes_read;
+}
+
+guint
+xcf_read_int16 (XcfInfo *info,
+                guint16 *data,
+                gint     count)
+{
+  guint total = 0;
+
+  if (count > 0)
+    {
+      total += xcf_read_int8 (info, (guint8 *) data, count * 2);
+
+      while (count--)
+        {
+          *data = g_ntohs (*data);
+          data++;
+        }
+    }
+
+  return total;
+}
+
+guint
+xcf_read_int32 (XcfInfo *info,
+                guint32 *data,
+                gint     count)
+{
+  guint total = 0;
+
+  if (count > 0)
+    {
+      total += xcf_read_int8 (info, (guint8 *) data, count * 4);
+
+      while (count--)
+        {
+          *data = g_ntohl (*data);
+          data++;
+        }
+    }
+
+  return total;
+}
+
+guint
+xcf_read_int64 (XcfInfo *info,
+                guint64 *data,
+                gint     count)
+{
+  guint total = 0;
+
+  if (count > 0)
+    {
+      total += xcf_read_int8 (info, (guint8 *) data, count * 8);
+
+      while (count--)
+        {
+          *data = GINT64_FROM_BE (*data);
+          data++;
+        }
+    }
+
+  return total;
+}
+
+guint
+xcf_read_offset (XcfInfo *info,
+                 goffset *data,
+                 gint     count)
+{
+  guint total = 0;
+
+  if (count > 0)
+    {
+      if (info->bytes_per_offset == 4)
+        {
+          gint32 *int_offsets = g_alloca (count * sizeof (gint32));
+
+          total += xcf_read_int8 (info, (guint8 *) int_offsets, count * 4);
+
+          while (count--)
+            {
+              *data = g_ntohl (*int_offsets);
+              int_offsets++;
+              data++;
+            }
+        }
+      else
+        {
+          total += xcf_read_int8 (info, (guint8 *) data, count * 8);
+
+          while (count--)
+            {
+              *data = GINT64_FROM_BE (*data);
+              data++;
+            }
+        }
+    }
+
+  return total;
+}
+
+guint
+xcf_read_float (XcfInfo *info,
+                gfloat  *data,
+                gint     count)
+{
+  return xcf_read_int32 (info, (guint32 *) ((void *) data), count);
+}
+
+guint
+xcf_read_string (XcfInfo  *info,
+                 gchar   **data,
+                 gint      count)
+{
+  guint total = 0;
+  gint  i;
+
+  for (i = 0; i < count; i++)
+    {
+      guint32 tmp;
+
+      total += xcf_read_int32 (info, &tmp, 1);
+
+      if (tmp > MAX_XCF_STRING_LEN)
+        {
+          g_warning ("Maximum string length (%ld bytes) exceeded. "
+                     "Possibly corrupt XCF file.", MAX_XCF_STRING_LEN);
+          data[i] = NULL;
+        }
+      else if (tmp > 0)
+        {
+          gchar *str;
+
+          str = g_new (gchar, tmp);
+          total += xcf_read_int8 (info, (guint8*) str, tmp);
+
+          if (str[tmp - 1] != '\0')
+            str[tmp - 1] = '\0';
+
+          data[i] = gimp_any_to_utf8 (str, -1,
+                                      _("Invalid UTF-8 string in XCF file"));
+
+          g_free (str);
+        }
+      else
+        {
+          data[i] = NULL;
+        }
+    }
+
+  return total;
+}
+
+guint
+xcf_read_component (XcfInfo *info,
+                    gint     bpc,
+                    guint8  *data,
+                    gint     count)
+{
+  switch (bpc)
+    {
+    case 1:
+      return xcf_read_int8 (info, data, count);
+
+    case 2:
+      return xcf_read_int16 (info, (guint16 *) data, count);
+
+    case 4:
+      return xcf_read_int32 (info, (guint32 *) data, count);
+
+    case 8:
+      return xcf_read_int64 (info, (guint64 *) data, count);
+
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+void
+xcf_read_from_be (gint    bpc,
+                  guint8 *data,
+                  gint    count)
+{
+  gint i;
+
+  switch (bpc)
+    {
+    case 1:
+      break;
+
+    case 2:
+      {
+        guint16 *d = (guint16 *) data;
+
+        for (i = 0; i < count; i++)
+          d[i] = g_ntohs (d[i]);
+      }
+      break;
+
+    case 4:
+      {
+        guint32 *d = (guint32 *) data;
+
+        for (i = 0; i < count; i++)
+          d[i] = g_ntohl (d[i]);
+      }
+      break;
+
+    case 8:
+      {
+        guint64 *d = (guint64 *) data;
+
+        for (i = 0; i < count; i++)
+          d[i] = GINT64_FROM_BE (d[i]);
+      }
+      break;
+    }
+}
diff --git a/app/xcf/xcf-read.h b/app/xcf/xcf-read.h
new file mode 100644
index 0000000..2a75a76
--- /dev/null
+++ b/app/xcf/xcf-read.h
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_READ_H__
+#define __XCF_READ_H__
+
+
+guint   xcf_read_int8      (XcfInfo  *info,
+                            guint8   *data,
+                            gint      count);
+guint   xcf_read_int16     (XcfInfo  *info,
+                            guint16  *data,
+                            gint      count);
+guint   xcf_read_int32     (XcfInfo  *info,
+                            guint32  *data,
+                            gint      count);
+guint   xcf_read_int64     (XcfInfo  *info,
+                            guint64  *data,
+                            gint      count);
+guint   xcf_read_offset    (XcfInfo  *info,
+                            goffset  *data,
+                            gint      count);
+guint   xcf_read_float     (XcfInfo  *info,
+                            gfloat   *data,
+                            gint      count);
+guint   xcf_read_string    (XcfInfo  *info,
+                            gchar   **data,
+                            gint      count);
+guint   xcf_read_component (XcfInfo  *info,
+                            gint      bpc,
+                            guint8   *data,
+                            gint      count);
+
+void    xcf_read_from_be   (gint      bpc,
+                            guint8   *data,
+                            gint      count);
+
+
+#endif  /* __XCF_READ_H__ */
diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c
new file mode 100644
index 0000000..a1c4f71
--- /dev/null
+++ b/app/xcf/xcf-save.c
@@ -0,0 +1,2271 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <zlib.h>
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core/core-types.h"
+
+#include "gegl/gimp-babl-compat.h"
+#include "gegl/gimp-gegl-tile-compat.h"
+
+#include "core/gimp.h"
+#include "core/gimpcontainer.h"
+#include "core/gimpchannel.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpgrid.h"
+#include "core/gimpguide.h"
+#include "core/gimpimage.h"
+#include "core/gimpimage-colormap.h"
+#include "core/gimpimage-grid.h"
+#include "core/gimpimage-guides.h"
+#include "core/gimpimage-metadata.h"
+#include "core/gimpimage-private.h"
+#include "core/gimpimage-sample-points.h"
+#include "core/gimpimage-symmetry.h"
+#include "core/gimplayer.h"
+#include "core/gimplayermask.h"
+#include "core/gimpparasitelist.h"
+#include "core/gimpprogress.h"
+#include "core/gimpsamplepoint.h"
+#include "core/gimpsymmetry.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "text/gimptextlayer.h"
+#include "text/gimptextlayer-xcf.h"
+
+#include "vectors/gimpanchor.h"
+#include "vectors/gimpstroke.h"
+#include "vectors/gimpbezierstroke.h"
+#include "vectors/gimpvectors.h"
+#include "vectors/gimpvectors-compat.h"
+
+#include "xcf-private.h"
+#include "xcf-read.h"
+#include "xcf-save.h"
+#include "xcf-seek.h"
+#include "xcf-write.h"
+
+#include "gimp-intl.h"
+
+
+static gboolean xcf_save_image_props   (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GError           **error);
+static gboolean xcf_save_layer_props   (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GimpLayer         *layer,
+                                        GError           **error);
+static gboolean xcf_save_channel_props (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GimpChannel       *channel,
+                                        GError           **error);
+static gboolean xcf_save_prop          (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        PropType           prop_type,
+                                        GError           **error,
+                                        ...);
+static gboolean xcf_save_layer         (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GimpLayer         *layer,
+                                        GError           **error);
+static gboolean xcf_save_channel       (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GimpChannel       *channel,
+                                        GError           **error);
+static gboolean xcf_save_buffer        (XcfInfo           *info,
+                                        GeglBuffer        *buffer,
+                                        GError           **error);
+static gboolean xcf_save_level         (XcfInfo           *info,
+                                        GeglBuffer        *buffer,
+                                        GError           **error);
+static gboolean xcf_save_tile          (XcfInfo           *info,
+                                        GeglBuffer        *buffer,
+                                        GeglRectangle     *tile_rect,
+                                        const Babl        *format,
+                                        GError           **error);
+static gboolean xcf_save_tile_rle      (XcfInfo           *info,
+                                        GeglBuffer        *buffer,
+                                        GeglRectangle     *tile_rect,
+                                        const Babl        *format,
+                                        guchar            *rlebuf,
+                                        GError           **error);
+static gboolean xcf_save_tile_zlib     (XcfInfo           *info,
+                                        GeglBuffer        *buffer,
+                                        GeglRectangle     *tile_rect,
+                                        const Babl        *format,
+                                        GError           **error);
+static gboolean xcf_save_parasite      (XcfInfo           *info,
+                                        GimpParasite      *parasite,
+                                        GError           **error);
+static gboolean xcf_save_parasite_list (XcfInfo           *info,
+                                        GimpParasiteList  *parasite,
+                                        GError           **error);
+static gboolean xcf_save_old_paths     (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GError           **error);
+static gboolean xcf_save_vectors       (XcfInfo           *info,
+                                        GimpImage         *image,
+                                        GError           **error);
+
+
+/* private convenience macros */
+#define xcf_write_int32_check_error(info, data, count) G_STMT_START { \
+  xcf_write_int32 (info, data, count, &tmp_error);                    \
+  if (tmp_error)                                                      \
+    {                                                                 \
+      g_propagate_error (error, tmp_error);                           \
+      return FALSE;                                                   \
+    }                                                                 \
+  } G_STMT_END
+
+#define xcf_write_offset_check_error(info, data, count) G_STMT_START { \
+  xcf_write_offset (info, data, count, &tmp_error);                    \
+  if (tmp_error)                                                       \
+    {                                                                  \
+      g_propagate_error (error, tmp_error);                            \
+      return FALSE;                                                    \
+    }                                                                  \
+  } G_STMT_END
+
+#define xcf_write_zero_offset_check_error(info, count) G_STMT_START { \
+  xcf_write_zero_offset (info, count, &tmp_error);                    \
+  if (tmp_error)                                                      \
+    {                                                                 \
+      g_propagate_error (error, tmp_error);                           \
+      return FALSE;                                                   \
+    }                                                                 \
+  } G_STMT_END
+
+#define xcf_write_int8_check_error(info, data, count) G_STMT_START { \
+  xcf_write_int8 (info, data, count, &tmp_error);                    \
+  if (tmp_error)                                                     \
+    {                                                                \
+      g_propagate_error (error, tmp_error);                          \
+      return FALSE;                                                  \
+    }                                                                \
+  } G_STMT_END
+
+#define xcf_write_float_check_error(info, data, count) G_STMT_START { \
+  xcf_write_float (info, data, count, &tmp_error);                    \
+  if (tmp_error)                                                      \
+    {                                                                 \
+      g_propagate_error (error, tmp_error);                           \
+      return FALSE;                                                   \
+    }                                                                 \
+  } G_STMT_END
+
+#define xcf_write_string_check_error(info, data, count) G_STMT_START { \
+  xcf_write_string (info, data, count, &tmp_error);                    \
+  if (tmp_error)                                                       \
+    {                                                                  \
+      g_propagate_error (error, tmp_error);                            \
+      return FALSE;                                                    \
+    }                                                                  \
+  } G_STMT_END
+
+#define xcf_write_component_check_error(info, bpc, data, count) G_STMT_START { \
+  xcf_write_component (info, bpc, data, count, &tmp_error);          \
+  if (tmp_error)                                                     \
+    {                                                                \
+      g_propagate_error (error, tmp_error);                          \
+      return FALSE;                                                  \
+    }                                                                \
+  } G_STMT_END
+
+#define xcf_write_prop_type_check_error(info, prop_type) G_STMT_START { \
+  guint32 _prop_int32 = prop_type;                                      \
+  xcf_write_int32_check_error (info, &_prop_int32, 1);                  \
+  } G_STMT_END
+
+#define xcf_check_error(x) G_STMT_START { \
+  if (! (x))                              \
+    return FALSE;                         \
+  } G_STMT_END
+
+#define xcf_progress_update(info) G_STMT_START  \
+  {                                             \
+    progress++;                                 \
+    if (info->progress)                         \
+      gimp_progress_set_value (info->progress,  \
+                               (gdouble) progress / (gdouble) max_progress); \
+  } G_STMT_END
+
+
+gboolean
+xcf_save_image (XcfInfo    *info,
+                GimpImage  *image,
+                GError    **error)
+{
+  GList   *all_layers;
+  GList   *all_channels;
+  GList   *list;
+  goffset  saved_pos;
+  goffset  offset;
+  guint32  value;
+  guint    n_layers;
+  guint    n_channels;
+  guint    progress = 0;
+  guint    max_progress;
+  gchar    version_tag[16];
+  GError  *tmp_error = NULL;
+
+  /* write out the tag information for the image */
+  if (info->file_version > 0)
+    {
+      g_snprintf (version_tag, sizeof (version_tag),
+                  "gimp xcf v%03d", info->file_version);
+    }
+  else
+    {
+      strcpy (version_tag, "gimp xcf file");
+    }
+
+  xcf_write_int8_check_error (info, (guint8 *) version_tag, 14);
+
+  /* write out the width, height and image type information for the image */
+  value = gimp_image_get_width (image);
+  xcf_write_int32_check_error (info, (guint32 *) &value, 1);
+
+  value = gimp_image_get_height (image);
+  xcf_write_int32_check_error (info, (guint32 *) &value, 1);
+
+  value = gimp_image_get_base_type (image);
+  xcf_write_int32_check_error (info, &value, 1);
+
+  if (info->file_version >= 4)
+    {
+      value = gimp_image_get_precision (image);
+      xcf_write_int32_check_error (info, &value, 1);
+    }
+
+  /* determine the number of layers and channels in the image */
+  all_layers   = gimp_image_get_layer_list (image);
+  all_channels = gimp_image_get_channel_list (image);
+
+  /* check and see if we have to save out the selection */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      all_channels = g_list_append (all_channels, gimp_image_get_mask (image));
+    }
+
+  n_layers   = (guint) g_list_length (all_layers);
+  n_channels = (guint) g_list_length (all_channels);
+
+  max_progress = 1 + n_layers + n_channels;
+
+  /* write the property information for the image */
+  xcf_check_error (xcf_save_image_props (info, image, error));
+
+  xcf_progress_update (info);
+
+  /* 'saved_pos' is the next slot in the offset table */
+  saved_pos = info->cp;
+
+  /* write an empty offset table */
+  xcf_write_zero_offset_check_error (info, n_layers + n_channels + 2);
+
+  /* 'offset' is where we will write the next layer or channel */
+  offset = info->cp;
+
+  for (list = all_layers; list; list = g_list_next (list))
+    {
+      GimpLayer *layer = list->data;
+
+      /* seek back to the next slot in the offset table and write the
+       * offset of the layer
+       */
+      xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+      xcf_write_offset_check_error (info, &offset, 1);
+
+      /* remember the next slot in the offset table */
+      saved_pos = info->cp;
+
+      /* seek to the layer offset and save the layer */
+      xcf_check_error (xcf_seek_pos (info, offset, error));
+      xcf_check_error (xcf_save_layer (info, image, layer, error));
+
+      /* the next layer's offset is after the layer we just wrote */
+      offset = info->cp;
+
+      xcf_progress_update (info);
+    }
+
+  /* skip a '0' in the offset table to indicate the end of the layer
+   * offsets
+   */
+  saved_pos += info->bytes_per_offset;
+
+  for (list = all_channels; list; list = g_list_next (list))
+    {
+      GimpChannel *channel = list->data;
+
+      /* seek back to the next slot in the offset table and write the
+       * offset of the channel
+       */
+      xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+      xcf_write_offset_check_error (info, &offset, 1);
+
+      /* remember the next slot in the offset table */
+      saved_pos = info->cp;
+
+      /* seek to the channel offset and save the channel */
+      xcf_check_error (xcf_seek_pos (info, offset, error));
+      xcf_check_error (xcf_save_channel (info, image, channel, error));
+
+      /* the next channels's offset is after the channel we just wrote */
+      offset = info->cp;
+
+      xcf_progress_update (info);
+    }
+
+  /* there is already a '0' at the end of the offset table to indicate
+   * the end of the channel offsets
+   */
+
+  g_list_free (all_layers);
+  g_list_free (all_channels);
+
+  return ! g_output_stream_is_closed (info->output);
+}
+
+static gboolean
+xcf_save_image_props (XcfInfo    *info,
+                      GimpImage  *image,
+                      GError    **error)
+{
+  GimpImagePrivate *private       = GIMP_IMAGE_GET_PRIVATE (image);
+  GimpParasite     *grid_parasite = NULL;
+  GimpParasite     *meta_parasite = NULL;
+  GList            *symmetry_parasites = NULL;
+  GList            *iter;
+  GimpUnit          unit          = gimp_image_get_unit (image);
+  gdouble           xres;
+  gdouble           yres;
+
+  gimp_image_get_resolution (image, &xres, &yres);
+
+  /* check and see if we should save the colormap property */
+  if (gimp_image_get_colormap (image))
+    xcf_check_error (xcf_save_prop (info, image, PROP_COLORMAP, error,
+                                    gimp_image_get_colormap_size (image),
+                                    gimp_image_get_colormap (image)));
+
+  if (info->compression != COMPRESS_NONE)
+    xcf_check_error (xcf_save_prop (info, image, PROP_COMPRESSION, error,
+                                    info->compression));
+
+  if (gimp_image_get_guides (image))
+    xcf_check_error (xcf_save_prop (info, image, PROP_GUIDES, error,
+                                    gimp_image_get_guides (image)));
+
+  if (gimp_image_get_sample_points (image))
+    {
+      /* save the new property before the old one, so loading can skip
+       * the latter
+       */
+      xcf_check_error (xcf_save_prop (info, image, PROP_SAMPLE_POINTS, error,
+                                      gimp_image_get_sample_points (image)));
+      xcf_check_error (xcf_save_prop (info, image, PROP_OLD_SAMPLE_POINTS, error,
+                                      gimp_image_get_sample_points (image)));
+    }
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_RESOLUTION, error,
+                                  xres, yres));
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_TATTOO, error,
+                                  gimp_image_get_tattoo_state (image)));
+
+  if (unit < gimp_unit_get_number_of_built_in_units ())
+    xcf_check_error (xcf_save_prop (info, image, PROP_UNIT, error, unit));
+
+  if (gimp_container_get_n_children (gimp_image_get_vectors (image)) > 0)
+    {
+      if (gimp_vectors_compat_is_compatible (image))
+        xcf_check_error (xcf_save_prop (info, image, PROP_PATHS, error));
+      else
+        xcf_check_error (xcf_save_prop (info, image, PROP_VECTORS, error));
+    }
+
+  if (unit >= gimp_unit_get_number_of_built_in_units ())
+    xcf_check_error (xcf_save_prop (info, image, PROP_USER_UNIT, error, unit));
+
+  if (gimp_image_get_grid (image))
+    {
+      GimpGrid *grid = gimp_image_get_grid (image);
+
+      grid_parasite = gimp_grid_to_parasite (grid);
+      gimp_parasite_list_add (private->parasites, grid_parasite);
+    }
+
+  if (gimp_image_get_metadata (image))
+    {
+      GimpMetadata *metadata = gimp_image_get_metadata (image);
+      gchar        *meta_string;
+
+      meta_string = gimp_metadata_serialize (metadata);
+
+      if (meta_string)
+        {
+          meta_parasite = gimp_parasite_new ("gimp-image-metadata",
+                                             GIMP_PARASITE_PERSISTENT,
+                                             strlen (meta_string) + 1,
+                                             meta_string);
+          gimp_parasite_list_add (private->parasites, meta_parasite);
+          g_free (meta_string);
+        }
+    }
+
+  if (g_list_length (gimp_image_symmetry_get (image)))
+    {
+      GimpParasite *parasite  = NULL;
+      GimpSymmetry *symmetry;
+
+      for (iter = gimp_image_symmetry_get (image); iter; iter = g_list_next (iter))
+        {
+          symmetry = GIMP_SYMMETRY (iter->data);
+          if (G_TYPE_FROM_INSTANCE (symmetry) == GIMP_TYPE_SYMMETRY)
+            /* Do not save the identity symmetry. */
+            continue;
+          parasite = gimp_symmetry_to_parasite (GIMP_SYMMETRY (iter->data));
+          gimp_parasite_list_add (private->parasites, parasite);
+          symmetry_parasites = g_list_prepend (symmetry_parasites, parasite);
+        }
+    }
+
+  if (gimp_parasite_list_length (private->parasites) > 0)
+    {
+      xcf_check_error (xcf_save_prop (info, image, PROP_PARASITES, error,
+                                      private->parasites));
+    }
+
+  if (grid_parasite)
+    {
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (grid_parasite));
+      gimp_parasite_free (grid_parasite);
+    }
+
+  if (meta_parasite)
+    {
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (meta_parasite));
+      gimp_parasite_free (meta_parasite);
+    }
+
+  for (iter = symmetry_parasites; iter; iter = g_list_next (iter))
+    {
+      GimpParasite *parasite = iter->data;
+
+      gimp_parasite_list_remove (private->parasites,
+                                 gimp_parasite_name (parasite));
+    }
+  g_list_free_full (symmetry_parasites,
+                    (GDestroyNotify) gimp_parasite_free);
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_END, error));
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_layer_props (XcfInfo    *info,
+                      GimpImage  *image,
+                      GimpLayer  *layer,
+                      GError    **error)
+{
+  GimpParasiteList *parasites;
+  gint              offset_x;
+  gint              offset_y;
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+    xcf_check_error (xcf_save_prop (info, image, PROP_GROUP_ITEM, error));
+
+  if (gimp_viewable_get_parent (GIMP_VIEWABLE (layer)))
+    {
+      GList *path;
+
+      path = gimp_item_get_path (GIMP_ITEM (layer));
+      xcf_check_error (xcf_save_prop (info, image, PROP_ITEM_PATH, error,
+                                      path));
+      g_list_free (path);
+    }
+
+  if (layer == gimp_image_get_active_layer (image))
+    xcf_check_error (xcf_save_prop (info, image, PROP_ACTIVE_LAYER, error));
+
+  if (layer == gimp_image_get_floating_selection (image))
+    {
+      info->floating_sel_drawable = gimp_layer_get_floating_sel_drawable (layer);
+      xcf_check_error (xcf_save_prop (info, image, PROP_FLOATING_SELECTION,
+                                      error));
+    }
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_OPACITY, error,
+                                  gimp_layer_get_opacity (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_FLOAT_OPACITY, error,
+                                  gimp_layer_get_opacity (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_VISIBLE, error,
+                                  gimp_item_get_visible (GIMP_ITEM (layer))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LINKED, error,
+                                  gimp_item_get_linked (GIMP_ITEM (layer))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_COLOR_TAG, error,
+                                  gimp_item_get_color_tag (GIMP_ITEM (layer))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LOCK_CONTENT, error,
+                                  gimp_item_get_lock_content (GIMP_ITEM (layer))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LOCK_ALPHA, error,
+                                  gimp_layer_get_lock_alpha (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LOCK_POSITION, error,
+                                  gimp_item_get_lock_position (GIMP_ITEM (layer))));
+
+  if (gimp_layer_get_mask (layer))
+    {
+      xcf_check_error (xcf_save_prop (info, image, PROP_APPLY_MASK, error,
+                                      gimp_layer_get_apply_mask (layer)));
+      xcf_check_error (xcf_save_prop (info, image, PROP_EDIT_MASK, error,
+                                      gimp_layer_get_edit_mask (layer)));
+      xcf_check_error (xcf_save_prop (info, image, PROP_SHOW_MASK, error,
+                                      gimp_layer_get_show_mask (layer)));
+    }
+  else
+    {
+      xcf_check_error (xcf_save_prop (info, image, PROP_APPLY_MASK, error,
+                                      FALSE));
+      xcf_check_error (xcf_save_prop (info, image, PROP_EDIT_MASK, error,
+                                      FALSE));
+      xcf_check_error (xcf_save_prop (info, image, PROP_SHOW_MASK, error,
+                                      FALSE));
+    }
+
+  gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_OFFSETS, error,
+                                  offset_x, offset_y));
+  xcf_check_error (xcf_save_prop (info, image, PROP_MODE, error,
+                                  gimp_layer_get_mode (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_BLEND_SPACE, error,
+                                  gimp_layer_get_mode (layer),
+                                  gimp_layer_get_blend_space (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_COMPOSITE_SPACE, error,
+                                  gimp_layer_get_mode (layer),
+                                  gimp_layer_get_composite_space (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_COMPOSITE_MODE, error,
+                                  gimp_layer_get_mode (layer),
+                                  gimp_layer_get_composite_mode (layer)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_TATTOO, error,
+                                  gimp_item_get_tattoo (GIMP_ITEM (layer))));
+
+  if (GIMP_IS_TEXT_LAYER (layer) && GIMP_TEXT_LAYER (layer)->text)
+    {
+      GimpTextLayer *text_layer = GIMP_TEXT_LAYER (layer);
+      guint32        flags      = gimp_text_layer_get_xcf_flags (text_layer);
+
+      gimp_text_layer_xcf_save_prepare (text_layer);
+
+      if (flags)
+        xcf_check_error (xcf_save_prop (info,
+                                        image, PROP_TEXT_LAYER_FLAGS, error,
+                                        flags));
+    }
+
+  if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
+    {
+      gint32 flags = 0;
+
+      if (gimp_viewable_get_expanded (GIMP_VIEWABLE (layer)))
+        flags |= XCF_GROUP_ITEM_EXPANDED;
+
+      xcf_check_error (xcf_save_prop (info,
+                                      image, PROP_GROUP_ITEM_FLAGS, error,
+                                      flags));
+    }
+
+  parasites = gimp_item_get_parasites (GIMP_ITEM (layer));
+
+  if (gimp_parasite_list_length (parasites) > 0)
+    {
+      xcf_check_error (xcf_save_prop (info, image, PROP_PARASITES, error,
+                                      parasites));
+    }
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_END, error));
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_channel_props (XcfInfo      *info,
+                        GimpImage    *image,
+                        GimpChannel  *channel,
+                        GError      **error)
+{
+  GimpParasiteList *parasites;
+
+  if (channel == gimp_image_get_active_channel (image))
+    xcf_check_error (xcf_save_prop (info, image, PROP_ACTIVE_CHANNEL, error));
+
+  if (channel == gimp_image_get_mask (image))
+    xcf_check_error (xcf_save_prop (info, image, PROP_SELECTION, error));
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_OPACITY, error,
+                                  gimp_channel_get_opacity (channel)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_FLOAT_OPACITY, error,
+                                  gimp_channel_get_opacity (channel)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_VISIBLE, error,
+                                  gimp_item_get_visible (GIMP_ITEM (channel))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LINKED, error,
+                                  gimp_item_get_linked (GIMP_ITEM (channel))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_COLOR_TAG, error,
+                                  gimp_item_get_color_tag (GIMP_ITEM (channel))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LOCK_CONTENT, error,
+                                  gimp_item_get_lock_content (GIMP_ITEM (channel))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_LOCK_POSITION, error,
+                                  gimp_item_get_lock_position (GIMP_ITEM (channel))));
+  xcf_check_error (xcf_save_prop (info, image, PROP_SHOW_MASKED, error,
+                                  gimp_channel_get_show_masked (channel)));
+  xcf_check_error (xcf_save_prop (info, image, PROP_COLOR, error,
+                                  &channel->color));
+  xcf_check_error (xcf_save_prop (info, image, PROP_FLOAT_COLOR, error,
+                                  &channel->color));
+  xcf_check_error (xcf_save_prop (info, image, PROP_TATTOO, error,
+                                  gimp_item_get_tattoo (GIMP_ITEM (channel))));
+
+  parasites = gimp_item_get_parasites (GIMP_ITEM (channel));
+
+  if (gimp_parasite_list_length (parasites) > 0)
+    {
+      xcf_check_error (xcf_save_prop (info, image, PROP_PARASITES, error,
+                                      parasites));
+    }
+
+  xcf_check_error (xcf_save_prop (info, image, PROP_END, error));
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_prop (XcfInfo    *info,
+               GimpImage  *image,
+               PropType    prop_type,
+               GError    **error,
+               ...)
+{
+  guint32  size;
+  va_list  args;
+  GError  *tmp_error = NULL;
+
+  va_start (args, error);
+
+  switch (prop_type)
+    {
+    case PROP_END:
+      size = 0;
+
+      xcf_write_prop_type_check_error (info, prop_type);
+      xcf_write_int32_check_error (info, &size, 1);
+      break;
+
+    case PROP_COLORMAP:
+      {
+        guint32  n_colors = va_arg (args, guint32);
+        guchar  *colors   = va_arg (args, guchar *);
+
+        size = 4 + n_colors * 3;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &n_colors, 1);
+        xcf_write_int8_check_error  (info, colors,    n_colors * 3);
+      }
+      break;
+
+    case PROP_ACTIVE_LAYER:
+    case PROP_ACTIVE_CHANNEL:
+    case PROP_SELECTION:
+    case PROP_GROUP_ITEM:
+      size = 0;
+
+      xcf_write_prop_type_check_error (info, prop_type);
+      xcf_write_int32_check_error (info, &size, 1);
+      break;
+
+    case PROP_FLOATING_SELECTION:
+      size = info->bytes_per_offset;
+
+      xcf_write_prop_type_check_error (info, prop_type);
+      xcf_write_int32_check_error (info, &size, 1);
+
+      info->floating_sel_offset = info->cp;
+      xcf_write_zero_offset_check_error (info, 1);
+      break;
+
+    case PROP_OPACITY:
+      {
+        gdouble opacity      = va_arg (args, gdouble);
+        guint32 uint_opacity = opacity * 255.999;
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &uint_opacity, 1);
+      }
+      break;
+
+    case PROP_FLOAT_OPACITY:
+      {
+        gfloat opacity = va_arg (args, gdouble);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_float_check_error (info, &opacity, 1);
+      }
+      break;
+
+    case PROP_MODE:
+      {
+        gint32 mode = va_arg (args, gint32);
+
+        size = 4;
+
+        if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
+          mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, (guint32 *) &mode, 1);
+      }
+      break;
+
+    case PROP_BLEND_SPACE:
+      {
+        GimpLayerMode mode        = va_arg (args, GimpLayerMode);
+        gint32        blend_space = va_arg (args, gint32);
+
+        G_STATIC_ASSERT (GIMP_LAYER_COLOR_SPACE_AUTO == 0);
+
+        /* if blend_space is AUTO, save the negative of the actual value AUTO
+         * maps to for the given mode, so that we can correctly load it even if
+         * the mapping changes in the future.
+         */
+        if (blend_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+          blend_space = -gimp_layer_mode_get_blend_space (mode);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, (guint32 *) &blend_space, 1);
+      }
+      break;
+
+    case PROP_COMPOSITE_SPACE:
+      {
+        GimpLayerMode mode            = va_arg (args, GimpLayerMode);
+        gint32        composite_space = va_arg (args, gint32);
+
+        G_STATIC_ASSERT (GIMP_LAYER_COLOR_SPACE_AUTO == 0);
+
+        /* if composite_space is AUTO, save the negative of the actual value
+         * AUTO maps to for the given mode, so that we can correctly load it
+         * even if the mapping changes in the future.
+         */
+        if (composite_space == GIMP_LAYER_COLOR_SPACE_AUTO)
+          composite_space = -gimp_layer_mode_get_composite_space (mode);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, (guint32 *) &composite_space, 1);
+      }
+      break;
+
+    case PROP_COMPOSITE_MODE:
+      {
+        GimpLayerMode mode           = va_arg (args, GimpLayerMode);
+        gint32        composite_mode = va_arg (args, gint32);
+
+        G_STATIC_ASSERT (GIMP_LAYER_COMPOSITE_AUTO == 0);
+
+        /* if composite_mode is AUTO, save the negative of the actual value
+         * AUTO maps to for the given mode, so that we can correctly load it
+         * even if the mapping changes in the future.
+         */
+        if (composite_mode == GIMP_LAYER_COMPOSITE_AUTO)
+          composite_mode = -gimp_layer_mode_get_composite_mode (mode);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, (guint32 *) &composite_mode, 1);
+      }
+      break;
+
+    case PROP_VISIBLE:
+      {
+        guint32 visible = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &visible, 1);
+      }
+      break;
+
+    case PROP_LINKED:
+      {
+        guint32 linked = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &linked, 1);
+      }
+      break;
+
+    case PROP_COLOR_TAG:
+      {
+        guint32 color_tag = va_arg (args, gint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &color_tag, 1);
+      }
+      break;
+
+    case PROP_LOCK_CONTENT:
+      {
+        guint32 lock_content = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &lock_content, 1);
+      }
+      break;
+
+    case PROP_LOCK_ALPHA:
+      {
+        guint32 lock_alpha = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &lock_alpha, 1);
+      }
+      break;
+
+    case PROP_LOCK_POSITION:
+      {
+        guint32 lock_position = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &lock_position, 1);
+      }
+      break;
+
+    case PROP_APPLY_MASK:
+      {
+        guint32 apply_mask = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &apply_mask, 1);
+      }
+      break;
+
+    case PROP_EDIT_MASK:
+      {
+        guint32 edit_mask = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &edit_mask, 1);
+      }
+      break;
+
+    case PROP_SHOW_MASK:
+      {
+        guint32 show_mask = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &show_mask, 1);
+      }
+      break;
+
+    case PROP_SHOW_MASKED:
+      {
+        guint32 show_masked = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &show_masked, 1);
+      }
+      break;
+
+    case PROP_OFFSETS:
+      {
+        gint32 offsets[2];
+
+        offsets[0] = va_arg (args, gint32);
+        offsets[1] = va_arg (args, gint32);
+
+        size = 8;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, (guint32 *) offsets, 2);
+      }
+      break;
+
+    case PROP_COLOR:
+      {
+        GimpRGB *color = va_arg (args, GimpRGB *);
+        guchar   col[3];
+
+        gimp_rgb_get_uchar (color, &col[0], &col[1], &col[2]);
+
+        size = 3;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int8_check_error (info, col, 3);
+      }
+      break;
+
+    case PROP_FLOAT_COLOR:
+      {
+        GimpRGB *color = va_arg (args, GimpRGB *);
+        gfloat   col[3];
+
+        col[0] = color->r;
+        col[1] = color->g;
+        col[2] = color->b;
+
+        size = 3 * 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_float_check_error (info, col, 3);
+      }
+      break;
+
+    case PROP_COMPRESSION:
+      {
+        guint8 compression = (guint8) va_arg (args, guint32);
+
+        size = 1;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int8_check_error (info, &compression, 1);
+      }
+      break;
+
+    case PROP_GUIDES:
+      {
+        GList *guides   = va_arg (args, GList *);
+        gint   n_guides = g_list_length (guides);
+        GList *iter;
+
+        for (iter = guides; iter; iter = g_list_next (iter))
+          {
+            /* Do not save custom guides. */
+            if (gimp_guide_is_custom (GIMP_GUIDE (iter->data)))
+              n_guides--;
+          }
+
+        if (n_guides > 0)
+          {
+            size = n_guides * (4 + 1);
+
+            xcf_write_prop_type_check_error (info, prop_type);
+            xcf_write_int32_check_error (info, &size, 1);
+
+            for (; guides; guides = g_list_next (guides))
+              {
+                GimpGuide *guide    = guides->data;
+                gint32     position = gimp_guide_get_position (guide);
+                gint8      orientation;
+
+                if (gimp_guide_is_custom (guide))
+                  continue;
+
+                switch (gimp_guide_get_orientation (guide))
+                  {
+                  case GIMP_ORIENTATION_HORIZONTAL:
+                    orientation = XCF_ORIENTATION_HORIZONTAL;
+                    break;
+
+                  case GIMP_ORIENTATION_VERTICAL:
+                    orientation = XCF_ORIENTATION_VERTICAL;
+                    break;
+
+                  default:
+                    g_warning ("%s: skipping guide with bad orientation",
+                               G_STRFUNC);
+                    continue;
+                  }
+
+                xcf_write_int32_check_error (info, (guint32 *) &position,    1);
+                xcf_write_int8_check_error  (info, (guint8 *)  &orientation, 1);
+              }
+          }
+      }
+      break;
+
+    case PROP_SAMPLE_POINTS:
+      {
+        GList *sample_points   = va_arg (args, GList *);
+        gint   n_sample_points = g_list_length (sample_points);
+
+        size = n_sample_points * (5 * 4);
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        for (; sample_points; sample_points = g_list_next (sample_points))
+          {
+            GimpSamplePoint   *sample_point = sample_points->data;
+            gint32             x, y;
+            GimpColorPickMode  pick_mode;
+            guint32            padding[2] = { 0, };
+
+            gimp_sample_point_get_position (sample_point, &x, &y);
+            pick_mode = gimp_sample_point_get_pick_mode (sample_point);
+
+            xcf_write_int32_check_error (info, (guint32 *) &x,         1);
+            xcf_write_int32_check_error (info, (guint32 *) &y,         1);
+            xcf_write_int32_check_error (info, (guint32 *) &pick_mode, 1);
+            xcf_write_int32_check_error (info, (guint32 *) padding,    2);
+          }
+      }
+      break;
+
+    case PROP_OLD_SAMPLE_POINTS:
+      {
+        GList *sample_points   = va_arg (args, GList *);
+        gint   n_sample_points = g_list_length (sample_points);
+
+        size = n_sample_points * (4 + 4);
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        for (; sample_points; sample_points = g_list_next (sample_points))
+          {
+            GimpSamplePoint *sample_point = sample_points->data;
+            gint32           x, y;
+
+            gimp_sample_point_get_position (sample_point, &x, &y);
+
+            xcf_write_int32_check_error (info, (guint32 *) &x, 1);
+            xcf_write_int32_check_error (info, (guint32 *) &y, 1);
+          }
+      }
+      break;
+
+    case PROP_RESOLUTION:
+      {
+        gfloat resolution[2];
+
+        resolution[0] = va_arg (args, double);
+        resolution[1] = va_arg (args, double);
+
+        size = 2 * 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_float_check_error (info, resolution, 2);
+      }
+      break;
+
+    case PROP_TATTOO:
+      {
+        guint32 tattoo = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &tattoo, 1);
+      }
+      break;
+
+    case PROP_PARASITES:
+      {
+        GimpParasiteList *list = va_arg (args, GimpParasiteList *);
+
+        if (gimp_parasite_list_persistent_length (list) > 0)
+          {
+            goffset base;
+            goffset pos;
+
+            size = 0;
+
+            xcf_write_prop_type_check_error (info, prop_type);
+
+            /* because we don't know how much room the parasite list
+             * will take we save the file position and write the
+             * length later
+             */
+            pos = info->cp;
+            xcf_write_int32_check_error (info, &size, 1);
+
+            base = info->cp;
+
+            xcf_check_error (xcf_save_parasite_list (info, list, error));
+
+            size = info->cp - base;
+
+            /* go back to the saved position and write the length */
+            xcf_check_error (xcf_seek_pos (info, pos, error));
+            xcf_write_int32_check_error (info, &size, 1);
+
+            xcf_check_error (xcf_seek_pos (info, base + size, error));
+          }
+      }
+      break;
+
+    case PROP_UNIT:
+      {
+        guint32 unit = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &unit, 1);
+      }
+      break;
+
+    case PROP_PATHS:
+      {
+        goffset base;
+        goffset pos;
+
+        size = 0;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+
+        /* because we don't know how much room the paths list will
+         * take we save the file position and write the length later
+         */
+        pos = info->cp;
+        xcf_write_int32_check_error (info, &size, 1);
+
+        base = info->cp;
+
+        xcf_check_error (xcf_save_old_paths (info, image, error));
+
+        size = info->cp - base;
+
+        /* go back to the saved position and write the length */
+        xcf_check_error (xcf_seek_pos (info, pos, error));
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_check_error (xcf_seek_pos (info, base + size, error));
+      }
+      break;
+
+    case PROP_USER_UNIT:
+      {
+        GimpUnit     unit = va_arg (args, guint32);
+        const gchar *unit_strings[5];
+        gfloat       factor;
+        guint32      digits;
+
+        /* write the entire unit definition */
+        unit_strings[0] = gimp_unit_get_identifier (unit);
+        factor          = gimp_unit_get_factor (unit);
+        digits          = gimp_unit_get_digits (unit);
+        unit_strings[1] = gimp_unit_get_symbol (unit);
+        unit_strings[2] = gimp_unit_get_abbreviation (unit);
+        unit_strings[3] = gimp_unit_get_singular (unit);
+        unit_strings[4] = gimp_unit_get_plural (unit);
+
+        size =
+          2 * 4 +
+          strlen (unit_strings[0]) ? strlen (unit_strings[0]) + 5 : 4 +
+          strlen (unit_strings[1]) ? strlen (unit_strings[1]) + 5 : 4 +
+          strlen (unit_strings[2]) ? strlen (unit_strings[2]) + 5 : 4 +
+          strlen (unit_strings[3]) ? strlen (unit_strings[3]) + 5 : 4 +
+          strlen (unit_strings[4]) ? strlen (unit_strings[4]) + 5 : 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_float_check_error  (info, &factor,                 1);
+        xcf_write_int32_check_error  (info, &digits,                 1);
+        xcf_write_string_check_error (info, (gchar **) unit_strings, 5);
+      }
+      break;
+
+    case PROP_VECTORS:
+      {
+        goffset base;
+        goffset pos;
+
+        size = 0;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+
+        /* because we don't know how much room the paths list will
+         * take we save the file position and write the length later
+         */
+        pos = info->cp;
+        xcf_write_int32_check_error (info, &size, 1);
+
+        base = info->cp;
+
+        xcf_check_error (xcf_save_vectors (info, image, error));
+
+        size = info->cp - base;
+
+        /* go back to the saved position and write the length */
+        xcf_check_error (xcf_seek_pos (info, pos, error));
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_check_error (xcf_seek_pos (info, base + size, error));
+      }
+      break;
+
+    case PROP_TEXT_LAYER_FLAGS:
+      {
+        guint32 flags = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        xcf_write_int32_check_error (info, &flags, 1);
+      }
+      break;
+
+    case PROP_ITEM_PATH:
+      {
+        GList *path = va_arg (args, GList *);
+
+        size = 4 * g_list_length (path);
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+
+        while (path)
+          {
+            guint32 index = GPOINTER_TO_UINT (path->data);
+
+            xcf_write_int32_check_error (info, &index, 1);
+
+            path = g_list_next (path);
+          }
+      }
+      break;
+
+    case PROP_GROUP_ITEM_FLAGS:
+      {
+        guint32 flags = va_arg (args, guint32);
+
+        size = 4;
+
+        xcf_write_prop_type_check_error (info, prop_type);
+        xcf_write_int32_check_error (info, &size, 1);
+        xcf_write_int32_check_error (info, &flags, 1);
+      }
+      break;
+    }
+
+  va_end (args);
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_layer (XcfInfo    *info,
+                GimpImage  *image,
+                GimpLayer  *layer,
+                GError    **error)
+{
+  goffset      saved_pos;
+  goffset      offset;
+  guint32      value;
+  const gchar *string;
+  GError      *tmp_error = NULL;
+
+  /* check and see if this is the drawable that the floating
+   *  selection is attached to.
+   */
+  if (GIMP_DRAWABLE (layer) == info->floating_sel_drawable)
+    {
+      saved_pos = info->cp;
+      xcf_check_error (xcf_seek_pos (info, info->floating_sel_offset, error));
+      xcf_write_offset_check_error (info, &saved_pos, 1);
+      xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+    }
+
+  /* write out the width, height and image type information for the layer */
+  value = gimp_item_get_width (GIMP_ITEM (layer));
+  xcf_write_int32_check_error (info, &value, 1);
+
+  value = gimp_item_get_height (GIMP_ITEM (layer));
+  xcf_write_int32_check_error (info, &value, 1);
+
+  value = gimp_babl_format_get_image_type (gimp_drawable_get_format (GIMP_DRAWABLE (layer)));
+  xcf_write_int32_check_error (info, &value, 1);
+
+  /* write out the layers name */
+  string = gimp_object_get_name (layer);
+  xcf_write_string_check_error (info, (gchar **) &string, 1);
+
+  /* write out the layer properties */
+  xcf_save_layer_props (info, image, layer, error);
+
+  /* write out the layer tile hierarchy */
+  offset = info->cp + 2 * info->bytes_per_offset;
+  xcf_write_offset_check_error (info, &offset, 1);
+
+  saved_pos = info->cp;
+
+  /* write a zero layer mask offset */
+  xcf_write_zero_offset_check_error (info, 1);
+
+  xcf_check_error (xcf_save_buffer (info,
+                                    gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
+                                    error));
+
+  offset = info->cp;
+
+  /* write out the layer mask */
+  if (gimp_layer_get_mask (layer))
+    {
+      GimpLayerMask *mask = gimp_layer_get_mask (layer);
+
+      xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+      xcf_write_offset_check_error (info, &offset, 1);
+
+      xcf_check_error (xcf_seek_pos (info, offset, error));
+      xcf_check_error (xcf_save_channel (info, image, GIMP_CHANNEL (mask),
+                                         error));
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_channel (XcfInfo      *info,
+                  GimpImage    *image,
+                  GimpChannel  *channel,
+                  GError      **error)
+{
+  goffset      saved_pos;
+  goffset      offset;
+  guint32      value;
+  const gchar *string;
+  GError      *tmp_error = NULL;
+
+  /* check and see if this is the drawable that the floating
+   *  selection is attached to.
+   */
+  if (GIMP_DRAWABLE (channel) == info->floating_sel_drawable)
+    {
+      saved_pos = info->cp;
+      xcf_check_error (xcf_seek_pos (info, info->floating_sel_offset, error));
+      xcf_write_offset_check_error (info, &saved_pos, 1);
+      xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+    }
+
+  /* write out the width and height information for the channel */
+  value = gimp_item_get_width (GIMP_ITEM (channel));
+  xcf_write_int32_check_error (info, &value, 1);
+
+  value = gimp_item_get_height (GIMP_ITEM (channel));
+  xcf_write_int32_check_error (info, &value, 1);
+
+  /* write out the channels name */
+  string = gimp_object_get_name (channel);
+  xcf_write_string_check_error (info, (gchar **) &string, 1);
+
+  /* write out the channel properties */
+  xcf_save_channel_props (info, image, channel, error);
+
+  /* write out the channel tile hierarchy */
+  offset = info->cp + info->bytes_per_offset;
+  xcf_write_offset_check_error (info, &offset, 1);
+
+  xcf_check_error (xcf_save_buffer (info,
+                                    gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
+                                    error));
+
+  return TRUE;
+}
+
+static gint
+xcf_calc_levels (gint size,
+                 gint tile_size)
+{
+  gint levels;
+
+  levels = 1;
+  while (size > tile_size)
+    {
+      size /= 2;
+      levels += 1;
+    }
+
+  return levels;
+}
+
+
+static gboolean
+xcf_save_buffer (XcfInfo     *info,
+                 GeglBuffer  *buffer,
+                 GError     **error)
+{
+  const Babl *format;
+  goffset     saved_pos;
+  goffset     offset;
+  guint32     width;
+  guint32     height;
+  guint32     bpp;
+  gint        i;
+  gint        nlevels;
+  gint        tmp1, tmp2;
+  GError     *tmp_error = NULL;
+
+  format = gegl_buffer_get_format (buffer);
+
+  width  = gegl_buffer_get_width (buffer);
+  height = gegl_buffer_get_height (buffer);
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  xcf_write_int32_check_error (info, (guint32 *) &width,  1);
+  xcf_write_int32_check_error (info, (guint32 *) &height, 1);
+  xcf_write_int32_check_error (info, (guint32 *) &bpp,    1);
+
+  tmp1 = xcf_calc_levels (width,  XCF_TILE_WIDTH);
+  tmp2 = xcf_calc_levels (height, XCF_TILE_HEIGHT);
+  nlevels = MAX (tmp1, tmp2);
+
+  /* 'saved_pos' is the next slot in the offset table */
+  saved_pos = info->cp;
+
+  /* write an empty offset table */
+  xcf_write_zero_offset_check_error (info, nlevels + 1);
+
+  /* 'offset' is where we will write the next level */
+  offset = info->cp;
+
+  for (i = 0; i < nlevels; i++)
+    {
+      /* seek back to the next slot in the offset table and write the
+       * offset of the level
+       */
+      xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+      xcf_write_offset_check_error (info, &offset, 1);
+
+      /* remember the next slot in the offset table */
+      saved_pos = info->cp;
+
+      /* seek to the level offset and save the level */
+      xcf_check_error (xcf_seek_pos (info, offset, error));
+
+      if (i == 0)
+        {
+          /* write out the level. */
+          xcf_check_error (xcf_save_level (info, buffer, error));
+        }
+      else
+        {
+          /* fake an empty level */
+          tmp1 = 0;
+          width  /= 2;
+          height /= 2;
+          xcf_write_int32_check_error (info, (guint32 *) &width,  1);
+          xcf_write_int32_check_error (info, (guint32 *) &height, 1);
+
+          /* NOTE:  this should be an offset, not an int32!  however...
+           * since there are already 64-bit-offsets XCFs out there in
+           * which this field is 32-bit, and since it's not actually
+           * being used, we're going to keep this field 32-bit for the
+           * dummy levels, to remain consistent.  if we ever make use
+           * of levels above the first, we should turn this field into
+           * an offset, and bump the xcf version.
+           */
+          xcf_write_int32_check_error (info, (guint32 *) &tmp1,   1);
+        }
+
+      /* the next level's offset if after the level we just wrote */
+      offset = info->cp;
+    }
+
+  /* there is already a '0' at the end of the offset table to indicate
+   * the end of the level offsets
+   */
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_level (XcfInfo     *info,
+                GeglBuffer  *buffer,
+                GError     **error)
+{
+  const Babl *format;
+  goffset    *offset_table;
+  goffset    *next_offset;
+  goffset     saved_pos;
+  goffset     offset;
+  goffset     max_data_length;
+  guint32     width;
+  guint32     height;
+  gint        bpp;
+  gint        n_tile_rows;
+  gint        n_tile_cols;
+  guint       ntiles;
+  gint        i;
+  guchar     *rlebuf    = NULL;
+  GError     *tmp_error = NULL;
+
+  format = gegl_buffer_get_format (buffer);
+
+  width  = gegl_buffer_get_width (buffer);
+  height = gegl_buffer_get_height (buffer);
+  bpp    = babl_format_get_bytes_per_pixel (format);
+
+  xcf_write_int32_check_error (info, (guint32 *) &width,  1);
+  xcf_write_int32_check_error (info, (guint32 *) &height, 1);
+
+  saved_pos = info->cp;
+
+  /* maximal allowable size of on-disk tile data.  make it somewhat bigger than
+   * the uncompressed tile size, to allow for the possibility of negative
+   * compression.  xcf_load_level() enforces this limit.
+   */
+  max_data_length = XCF_TILE_WIDTH * XCF_TILE_HEIGHT * bpp *
+                    XCF_TILE_MAX_DATA_LENGTH_FACTOR /* = 1.5, currently */;
+
+  /* allocate a temporary buffer to store the rle data before it is
+   * written to disk
+   */
+  if (info->compression == COMPRESS_RLE)
+    rlebuf = g_alloca (max_data_length);
+
+  n_tile_rows = gimp_gegl_buffer_get_n_tile_rows (buffer, XCF_TILE_HEIGHT);
+  n_tile_cols = gimp_gegl_buffer_get_n_tile_cols (buffer, XCF_TILE_WIDTH);
+
+  ntiles = n_tile_rows * n_tile_cols;
+
+  /* allocate an offset table so we don't have to seek back after each
+   * tile, see bug #686862. allocate ntiles + 1 slots because a zero
+   * offset indicates the offset table's end.
+   * Do not use g_alloca since it may cause Stack Overflow on
+   * large images, see issue #6138.
+   */
+  offset_table = g_malloc0 ((ntiles + 1) * sizeof (goffset));
+  next_offset = offset_table;
+
+  /* 'saved_pos' is the offset of the tile offset table  */
+  saved_pos = info->cp;
+
+  /* write an empty offset table */
+  xcf_write_zero_offset_check_error (info, ntiles + 1);
+
+  /* 'offset' is where we will write the next tile */
+  offset = info->cp;
+
+  for (i = 0; i < ntiles; i++)
+    {
+      GeglRectangle rect;
+
+      /* store the offset in the table and increment the next pointer */
+      *next_offset++ = offset;
+
+      gimp_gegl_buffer_get_tile_rect (buffer,
+                                      XCF_TILE_WIDTH, XCF_TILE_HEIGHT,
+                                      i, &rect);
+
+      /* write out the tile. */
+      switch (info->compression)
+        {
+        case COMPRESS_NONE:
+          xcf_check_error (xcf_save_tile (info, buffer, &rect, format,
+                                          error));
+          break;
+        case COMPRESS_RLE:
+          xcf_check_error (xcf_save_tile_rle (info, buffer, &rect, format,
+                                              rlebuf, error));
+          break;
+        case COMPRESS_ZLIB:
+          xcf_check_error (xcf_save_tile_zlib (info, buffer, &rect, format,
+                                               error));
+          break;
+        case COMPRESS_FRACTAL:
+          g_warning ("xcf: fractal compression unimplemented");
+          g_free (offset_table);
+          return FALSE;
+        }
+
+      /* make sure the on-disk tile data didn't end up being too big.
+       * xcf_load_level() would refuse to load the file if it did.
+       */
+      if (info->cp < offset || info->cp - offset > max_data_length)
+        {
+          g_message ("xcf: invalid tile data length: %" G_GOFFSET_FORMAT,
+                     info->cp - offset);
+          g_free (offset_table);
+          return FALSE;
+        }
+
+      /* the next tile's offset is after the tile we just wrote */
+      offset = info->cp;
+    }
+
+  /* seek back to the offset table and write it  */
+  xcf_check_error (xcf_seek_pos (info, saved_pos, error));
+  xcf_write_offset_check_error (info, offset_table, ntiles + 1);
+
+  /* seek to the end of the file */
+  xcf_check_error (xcf_seek_pos (info, offset, error));
+
+  g_free (offset_table);
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_tile (XcfInfo        *info,
+               GeglBuffer     *buffer,
+               GeglRectangle  *tile_rect,
+               const Babl     *format,
+               GError        **error)
+{
+  gint    bpp       = babl_format_get_bytes_per_pixel (format);
+  gint    tile_size = bpp * tile_rect->width * tile_rect->height;
+  guchar *tile_data = g_alloca (tile_size);
+  GError *tmp_error = NULL;
+
+  gegl_buffer_get (buffer, tile_rect, 1.0, format, tile_data,
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  if (info->file_version <= 11)
+    {
+      xcf_write_int8_check_error (info, tile_data, tile_size);
+    }
+  else
+    {
+      gint n_components = babl_format_get_n_components (format);
+
+      xcf_write_component_check_error (info, bpp / n_components, tile_data,
+                                       tile_size / bpp * n_components);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_tile_rle (XcfInfo        *info,
+                   GeglBuffer     *buffer,
+                   GeglRectangle  *tile_rect,
+                   const Babl     *format,
+                   guchar         *rlebuf,
+                   GError        **error)
+{
+  gint    bpp       = babl_format_get_bytes_per_pixel (format);
+  gint    tile_size = bpp * tile_rect->width * tile_rect->height;
+  guchar *tile_data = g_alloca (tile_size);
+  gint    len       = 0;
+  gint    i, j;
+  GError *tmp_error  = NULL;
+
+  gegl_buffer_get (buffer, tile_rect, 1.0, format, tile_data,
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  if (info->file_version >= 12)
+    {
+      gint n_components = babl_format_get_n_components (format);
+
+      xcf_write_to_be (bpp / n_components, tile_data,
+                       tile_size / bpp * n_components);
+    }
+
+  for (i = 0; i < bpp; i++)
+    {
+      const guchar *data   = tile_data + i;
+      gint          state  = 0;
+      gint          length = 0;
+      gint          count  = 0;
+      gint          size   = tile_rect->width * tile_rect->height;
+      guint         last   = -1;
+
+      while (size > 0)
+        {
+          switch (state)
+            {
+            case 0:
+              /* in state 0 we try to find a long sequence of
+               *  matching values.
+               */
+              if ((length == 32768) ||
+                  ((size - length) <= 0) ||
+                  ((length > 1) && (last != *data)))
+                {
+                  count += length;
+
+                  if (length >= 128)
+                    {
+                      rlebuf[len++] = 127;
+                      rlebuf[len++] = (length >> 8);
+                      rlebuf[len++] = length & 0x00FF;
+                      rlebuf[len++] = last;
+                    }
+                  else
+                    {
+                      rlebuf[len++] = length - 1;
+                      rlebuf[len++] = last;
+                    }
+
+                  size -= length;
+                  length = 0;
+                }
+              else if ((length == 1) && (last != *data))
+                {
+                  state = 1;
+                }
+              break;
+
+            case 1:
+              /* in state 1 we try and find a long sequence of
+               *  non-matching values.
+               */
+              if ((length == 32768) ||
+                  ((size - length) == 0) ||
+                  ((length > 0) && (last == *data) &&
+                   ((size - length) == 1 || last == data[bpp])))
+                {
+                  const guchar *t;
+
+                  /* if we came here because of a new run, backup one */
+                  if (!((length == 32768) || ((size - length) == 0)))
+                    {
+                      length--;
+                      data -= bpp;
+                    }
+
+                  count += length;
+                  state = 0;
+
+                  if (length >= 128)
+                    {
+                      rlebuf[len++] = 255 - 127;
+                      rlebuf[len++] = (length >> 8);
+                      rlebuf[len++] = length & 0x00FF;
+                    }
+                  else
+                    {
+                      rlebuf[len++] = 255 - (length - 1);
+                    }
+
+                  t = data - length * bpp;
+
+                  for (j = 0; j < length; j++)
+                    {
+                      rlebuf[len++] = *t;
+                      t += bpp;
+                    }
+
+                  size -= length;
+                  length = 0;
+                }
+              break;
+            }
+
+          if (size > 0)
+            {
+              length += 1;
+              last = *data;
+              data += bpp;
+            }
+        }
+
+      if (count != (tile_rect->width * tile_rect->height))
+        g_message ("xcf: uh oh! xcf rle tile saving error: %d", count);
+    }
+
+  xcf_write_int8_check_error (info, rlebuf, len);
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_tile_zlib (XcfInfo        *info,
+                    GeglBuffer     *buffer,
+                    GeglRectangle  *tile_rect,
+                    const Babl     *format,
+                    GError        **error)
+{
+  gint      bpp       = babl_format_get_bytes_per_pixel (format);
+  gint      tile_size = bpp * tile_rect->width * tile_rect->height;
+  guchar   *tile_data = g_alloca (tile_size);
+  /* The buffer for compressed data. */
+  guchar   *buf       = g_alloca (tile_size);
+  GError   *tmp_error = NULL;
+  z_stream  strm;
+  int       action;
+  int       status;
+
+  gegl_buffer_get (buffer, tile_rect, 1.0, format, tile_data,
+                   GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
+
+  if (info->file_version >= 12)
+    {
+      gint n_components = babl_format_get_n_components (format);
+
+      xcf_write_to_be (bpp / n_components, tile_data,
+                       tile_size / bpp * n_components);
+    }
+
+  /* allocate deflate state */
+  strm.zalloc = Z_NULL;
+  strm.zfree  = Z_NULL;
+  strm.opaque = Z_NULL;
+
+  status = deflateInit (&strm, Z_DEFAULT_COMPRESSION);
+  if (status != Z_OK)
+    return FALSE;
+
+  strm.next_in   = tile_data;
+  strm.avail_in  = tile_size;
+  strm.next_out  = buf;
+  strm.avail_out = tile_size;
+
+  action = Z_NO_FLUSH;
+
+  while (status == Z_OK || status == Z_BUF_ERROR)
+    {
+      if (strm.avail_in == 0)
+        {
+          /* Finish the encoding. */
+          action = Z_FINISH;
+        }
+
+      status = deflate (&strm, action);
+
+      if (status == Z_STREAM_END || status == Z_BUF_ERROR)
+        {
+          size_t write_size = tile_size - strm.avail_out;
+
+          xcf_write_int8_check_error (info, buf, write_size);
+
+          /* Reset next_out and avail_out. */
+          strm.next_out  = buf;
+          strm.avail_out = tile_size;
+        }
+      else if (status != Z_OK)
+        {
+          g_printerr ("xcf: tile compression failed: %s", zError (status));
+          deflateEnd (&strm);
+          return FALSE;
+        }
+    }
+
+  deflateEnd (&strm);
+  return TRUE;
+}
+
+static gboolean
+xcf_save_parasite (XcfInfo       *info,
+                   GimpParasite  *parasite,
+                   GError       **error)
+{
+  if (gimp_parasite_is_persistent (parasite))
+    {
+      guint32      value;
+      const gchar *string;
+      GError      *tmp_error = NULL;
+
+      string = gimp_parasite_name (parasite);
+      xcf_write_string_check_error (info, (gchar **) &string, 1);
+
+      value = gimp_parasite_flags (parasite);
+      xcf_write_int32_check_error (info, &value, 1);
+
+      value = gimp_parasite_data_size (parasite);
+      xcf_write_int32_check_error (info, &value, 1);
+
+      xcf_write_int8_check_error (info,
+                                  gimp_parasite_data (parasite),
+                                  gimp_parasite_data_size (parasite));
+    }
+
+  return TRUE;
+}
+
+typedef struct
+{
+  XcfInfo *info;
+  GError  *error;
+} XcfParasiteData;
+
+static void
+xcf_save_parasite_func (gchar           *key,
+                        GimpParasite    *parasite,
+                        XcfParasiteData *data)
+{
+  if (! data->error)
+    xcf_save_parasite (data->info, parasite, &data->error);
+}
+
+static gboolean
+xcf_save_parasite_list (XcfInfo           *info,
+                        GimpParasiteList  *list,
+                        GError           **error)
+{
+  XcfParasiteData data;
+
+  data.info  = info;
+  data.error = NULL;
+
+  gimp_parasite_list_foreach (list, (GHFunc) xcf_save_parasite_func, &data);
+
+  if (data.error)
+    {
+      g_propagate_error (error, data.error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_old_paths (XcfInfo    *info,
+                    GimpImage  *image,
+                    GError    **error)
+{
+  GimpVectors *active_vectors;
+  guint32      num_paths;
+  guint32      active_index = 0;
+  GList       *list;
+  GError      *tmp_error = NULL;
+
+  /* Write out the following:-
+   *
+   * last_selected_row (gint)
+   * number_of_paths (gint)
+   *
+   * then each path:-
+   */
+
+  num_paths = gimp_container_get_n_children (gimp_image_get_vectors (image));
+
+  active_vectors = gimp_image_get_active_vectors (image);
+
+  if (active_vectors)
+    active_index = gimp_container_get_child_index (gimp_image_get_vectors (image),
+                                                   GIMP_OBJECT (active_vectors));
+
+  xcf_write_int32_check_error (info, &active_index, 1);
+  xcf_write_int32_check_error (info, &num_paths,    1);
+
+  for (list = gimp_image_get_vectors_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpVectors            *vectors = list->data;
+      gchar                  *name;
+      guint32                 locked;
+      guint8                  state;
+      guint32                 version;
+      guint32                 pathtype;
+      guint32                 tattoo;
+      GimpVectorsCompatPoint *points;
+      guint32                 num_points;
+      guint32                 closed;
+      gint                    i;
+
+      /*
+       * name (string)
+       * locked (gint)
+       * state (gchar)
+       * closed (gint)
+       * number points (gint)
+       * version (gint)
+       * pathtype (gint)
+       * tattoo (gint)
+       * then each point.
+       */
+
+      points = gimp_vectors_compat_get_points (vectors,
+                                               (gint32 *) &num_points,
+                                               (gint32 *) &closed);
+
+      /* if no points are generated because of a faulty path we should
+       * skip saving the path - this is unfortunately impossible, because
+       * we already saved the number of paths and I won't start seeking
+       * around to fix that cruft  */
+
+      name     = (gchar *) gimp_object_get_name (vectors);
+      locked   = gimp_item_get_linked (GIMP_ITEM (vectors));
+      state    = closed ? 4 : 2;  /* EDIT : ADD  (editing state, 1.2 compat) */
+      version  = 3;
+      pathtype = 1;  /* BEZIER  (1.2 compat) */
+      tattoo   = gimp_item_get_tattoo (GIMP_ITEM (vectors));
+
+      xcf_write_string_check_error (info, &name,       1);
+      xcf_write_int32_check_error  (info, &locked,     1);
+      xcf_write_int8_check_error   (info, &state,      1);
+      xcf_write_int32_check_error  (info, &closed,     1);
+      xcf_write_int32_check_error  (info, &num_points, 1);
+      xcf_write_int32_check_error  (info, &version,    1);
+      xcf_write_int32_check_error  (info, &pathtype,   1);
+      xcf_write_int32_check_error  (info, &tattoo,     1);
+
+      for (i = 0; i < num_points; i++)
+        {
+          gfloat x;
+          gfloat y;
+
+          x = points[i].x;
+          y = points[i].y;
+
+          /*
+           * type (gint)
+           * x (gfloat)
+           * y (gfloat)
+           */
+
+          xcf_write_int32_check_error (info, &points[i].type, 1);
+          xcf_write_float_check_error (info, &x,              1);
+          xcf_write_float_check_error (info, &y,              1);
+        }
+
+      g_free (points);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+xcf_save_vectors (XcfInfo    *info,
+                  GimpImage  *image,
+                  GError    **error)
+{
+  GimpVectors *active_vectors;
+  guint32      version      = 1;
+  guint32      active_index = 0;
+  guint32      num_paths;
+  GList       *list;
+  GList       *stroke_list;
+  GError      *tmp_error = NULL;
+
+  /* Write out the following:-
+   *
+   * version (gint)
+   * active_index (gint)
+   * num_paths (gint)
+   *
+   * then each path:-
+   */
+
+  active_vectors = gimp_image_get_active_vectors (image);
+
+  if (active_vectors)
+    active_index = gimp_container_get_child_index (gimp_image_get_vectors (image),
+                                                   GIMP_OBJECT (active_vectors));
+
+  num_paths = gimp_container_get_n_children (gimp_image_get_vectors (image));
+
+  xcf_write_int32_check_error (info, &version,      1);
+  xcf_write_int32_check_error (info, &active_index, 1);
+  xcf_write_int32_check_error (info, &num_paths,    1);
+
+  for (list = gimp_image_get_vectors_iter (image);
+       list;
+       list = g_list_next (list))
+    {
+      GimpVectors      *vectors = list->data;
+      GimpParasiteList *parasites;
+      const gchar      *name;
+      guint32           tattoo;
+      guint32           visible;
+      guint32           linked;
+      guint32           num_parasites;
+      guint32           num_strokes;
+
+      /*
+       * name (string)
+       * tattoo (gint)
+       * visible (gint)
+       * linked (gint)
+       * num_parasites (gint)
+       * num_strokes (gint)
+       *
+       * then each parasite
+       * then each stroke
+       */
+
+      name          = gimp_object_get_name (vectors);
+      visible       = gimp_item_get_visible (GIMP_ITEM (vectors));
+      linked        = gimp_item_get_linked (GIMP_ITEM (vectors));
+      tattoo        = gimp_item_get_tattoo (GIMP_ITEM (vectors));
+      parasites     = gimp_item_get_parasites (GIMP_ITEM (vectors));
+      num_parasites = gimp_parasite_list_persistent_length (parasites);
+      num_strokes   = g_queue_get_length (vectors->strokes);
+
+      xcf_write_string_check_error (info, (gchar **) &name, 1);
+      xcf_write_int32_check_error  (info, &tattoo,          1);
+      xcf_write_int32_check_error  (info, &visible,         1);
+      xcf_write_int32_check_error  (info, &linked,          1);
+      xcf_write_int32_check_error  (info, &num_parasites,   1);
+      xcf_write_int32_check_error  (info, &num_strokes,     1);
+
+      xcf_check_error (xcf_save_parasite_list (info, parasites, error));
+
+      for (stroke_list = g_list_first (vectors->strokes->head);
+           stroke_list;
+           stroke_list = g_list_next (stroke_list))
+        {
+          GimpStroke *stroke = stroke_list->data;
+          guint32     stroke_type;
+          guint32     closed;
+          guint32     num_axes;
+          GArray     *control_points;
+          gint        i;
+
+          guint32     type;
+          gfloat      coords[6];
+
+          /*
+           * stroke_type (gint)
+           * closed (gint)
+           * num_axes (gint)
+           * num_control_points (gint)
+           *
+           * then each control point.
+           */
+
+          if (GIMP_IS_BEZIER_STROKE (stroke))
+            {
+              stroke_type = XCF_STROKETYPE_BEZIER_STROKE;
+              num_axes = 2;   /* hardcoded, might be increased later */
+            }
+          else
+            {
+              g_printerr ("Skipping unknown stroke type!\n");
+              continue;
+            }
+
+          control_points = gimp_stroke_control_points_get (stroke,
+                                                           (gint32 *) &closed);
+
+          xcf_write_int32_check_error (info, &stroke_type,         1);
+          xcf_write_int32_check_error (info, &closed,              1);
+          xcf_write_int32_check_error (info, &num_axes,            1);
+          xcf_write_int32_check_error (info, &control_points->len, 1);
+
+          for (i = 0; i < control_points->len; i++)
+            {
+              GimpAnchor *anchor;
+
+              anchor = & (g_array_index (control_points, GimpAnchor, i));
+
+              type      = anchor->type;
+              coords[0] = anchor->position.x;
+              coords[1] = anchor->position.y;
+              coords[2] = anchor->position.pressure;
+              coords[3] = anchor->position.xtilt;
+              coords[4] = anchor->position.ytilt;
+              coords[5] = anchor->position.wheel;
+
+              /*
+               * type (gint)
+               *
+               * the first num_axis elements of:
+               * [0] x (gfloat)
+               * [1] y (gfloat)
+               * [2] pressure (gfloat)
+               * [3] xtilt (gfloat)
+               * [4] ytilt (gfloat)
+               * [5] wheel (gfloat)
+               */
+
+              xcf_write_int32_check_error (info, &type,  1);
+              xcf_write_float_check_error (info, coords, num_axes);
+            }
+
+          g_array_free (control_points, TRUE);
+        }
+    }
+
+  return TRUE;
+}
diff --git a/app/xcf/xcf-save.h b/app/xcf/xcf-save.h
new file mode 100644
index 0000000..d3af169
--- /dev/null
+++ b/app/xcf/xcf-save.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_SAVE_H__
+#define __XCF_SAVE_H__
+
+
+gboolean   xcf_save_image (XcfInfo    *info,
+                           GimpImage  *image,
+                           GError    **error);
+
+
+#endif  /* __XCF_SAVE_H__ */
diff --git a/app/xcf/xcf-seek.c b/app/xcf/xcf-seek.c
new file mode 100644
index 0000000..26fcc27
--- /dev/null
+++ b/app/xcf/xcf-seek.c
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "core/core-types.h"
+
+#include "xcf-private.h"
+#include "xcf-seek.h"
+
+#include "gimp-intl.h"
+
+
+gboolean
+xcf_seek_pos (XcfInfo  *info,
+              goffset   pos,
+              GError  **error)
+{
+  if (info->cp != pos)
+    {
+      GError *my_error = NULL;
+
+      info->cp = pos;
+
+      if (! g_seekable_seek (info->seekable, info->cp, G_SEEK_SET,
+                             NULL, &my_error))
+        {
+          g_propagate_prefixed_error (error, my_error,
+                                      _("Could not seek in XCF file: "));
+          return FALSE;
+        }
+
+      gimp_assert (info->cp == g_seekable_tell (info->seekable));
+    }
+
+  return TRUE;
+}
diff --git a/app/xcf/xcf-seek.h b/app/xcf/xcf-seek.h
new file mode 100644
index 0000000..02d629f
--- /dev/null
+++ b/app/xcf/xcf-seek.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_SEEK_H__
+#define __XCF_SEEK_H__
+
+
+gboolean   xcf_seek_pos (XcfInfo  *info,
+                         goffset   pos,
+                         GError  **error);
+
+
+#endif  /* __XCF_SEEK_H__ */
diff --git a/app/xcf/xcf-utils.c b/app/xcf/xcf-utils.c
new file mode 100644
index 0000000..726cad2
--- /dev/null
+++ b/app/xcf/xcf-utils.c
@@ -0,0 +1,53 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "xcf-utils.h"
+
+
+gboolean
+xcf_data_is_zero (const void *data,
+                  gint        size)
+{
+  const guint8  *data8;
+  const guint64 *data64;
+
+  for (data8 = data; size > 0 && (guintptr) data8 % 8 != 0; data8++, size--)
+    {
+      if (*data8)
+        return FALSE;
+    }
+
+  for (data64 = (gpointer) data8; size >= 8; data64++, size -= 8)
+    {
+      if (*data64)
+        return FALSE;
+    }
+
+  for (data8 = (gpointer) data64; size > 0; data8++, size--)
+    {
+      if (*data8)
+        return FALSE;
+    }
+
+  return TRUE;
+}
diff --git a/app/xcf/xcf-utils.h b/app/xcf/xcf-utils.h
new file mode 100644
index 0000000..5f4673f
--- /dev/null
+++ b/app/xcf/xcf-utils.h
@@ -0,0 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_UTILS_H__
+#define __XCF_UTILS_H__
+
+
+gboolean   xcf_data_is_zero (const void *data,
+                             gint        size);
+
+
+#endif  /* __XCF_UTILS_H__ */
diff --git a/app/xcf/xcf-write.c b/app/xcf/xcf-write.c
new file mode 100644
index 0000000..a154bf5
--- /dev/null
+++ b/app/xcf/xcf-write.c
@@ -0,0 +1,339 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#include "core/core-types.h"
+
+#include "xcf-private.h"
+#include "xcf-write.h"
+
+#include "gimp-intl.h"
+
+
+guint
+xcf_write_int8 (XcfInfo       *info,
+                const guint8  *data,
+                gint           count,
+                GError       **error)
+{
+  GError *my_error      = NULL;
+  gsize   bytes_written = 0;
+
+  /* we allow for 'data == NULL && count == 0', which
+   * g_output_stream_write_all() rejects.
+   */
+  if (count > 0)
+    {
+      if (! g_output_stream_write_all (info->output, data, count,
+                                       &bytes_written, NULL, &my_error))
+        {
+          g_propagate_prefixed_error (error, my_error,
+                                      _("Error writing XCF: "));
+        }
+
+      info->cp += bytes_written;
+    }
+
+  return bytes_written;
+}
+
+guint
+xcf_write_int16 (XcfInfo        *info,
+                 const guint16  *data,
+                 gint            count,
+                 GError        **error)
+{
+  GError *tmp_error = NULL;
+  gint    i;
+
+  if (count > 0)
+    {
+      for (i = 0; i < count; i++)
+        {
+          guint16 tmp = g_htons (data[i]);
+
+          xcf_write_int8 (info, (const guint8 *) &tmp, 2, &tmp_error);
+
+          if (tmp_error)
+            {
+              g_propagate_error (error, tmp_error);
+
+              return i * 2;
+            }
+        }
+    }
+
+  return count * 2;
+}
+
+guint
+xcf_write_int32 (XcfInfo        *info,
+                 const guint32  *data,
+                 gint            count,
+                 GError        **error)
+{
+  GError  *tmp_error = NULL;
+  gint     i;
+
+  if (count > 0)
+    {
+      for (i = 0; i < count; i++)
+        {
+          guint32  tmp = g_htonl (data[i]);
+
+          xcf_write_int8 (info, (const guint8 *) &tmp, 4, &tmp_error);
+
+          if (tmp_error)
+            {
+              g_propagate_error (error, tmp_error);
+
+              return i * 4;
+            }
+        }
+    }
+
+  return count * 4;
+}
+
+guint
+xcf_write_int64 (XcfInfo        *info,
+                 const guint64  *data,
+                 gint            count,
+                 GError        **error)
+{
+  GError *tmp_error = NULL;
+  gint    i;
+
+  if (count > 0)
+    {
+      for (i = 0; i < count; i++)
+        {
+          guint64 tmp = GINT64_TO_BE (data[i]);
+
+          xcf_write_int8 (info, (const guint8 *) &tmp, 8, &tmp_error);
+
+          if (tmp_error)
+            {
+              g_propagate_error (error, tmp_error);
+
+              return i * 8;
+            }
+        }
+    }
+
+  return count * 8;
+}
+
+guint
+xcf_write_offset (XcfInfo        *info,
+                  const goffset  *data,
+                  gint            count,
+                  GError        **error)
+{
+  if (count > 0)
+    {
+      gint i;
+
+      for (i = 0; i < count; i++)
+        {
+          GError *tmp_error = NULL;
+
+          if (info->bytes_per_offset == 4)
+            {
+              guint32 tmp = g_htonl (data[i]);
+
+              xcf_write_int8 (info, (const guint8 *) &tmp, 4, &tmp_error);
+            }
+          else
+            {
+              gint64 tmp = GINT64_TO_BE (data[i]);
+
+              xcf_write_int8 (info, (const guint8 *) &tmp, 8, &tmp_error);
+            }
+
+          if (tmp_error)
+            {
+              g_propagate_error (error, tmp_error);
+
+              return i * info->bytes_per_offset;
+            }
+        }
+    }
+
+  return count * info->bytes_per_offset;
+}
+
+guint
+xcf_write_zero_offset (XcfInfo  *info,
+                       gint      count,
+                       GError  **error)
+{
+  if (count > 0)
+    {
+      guint8 *tmp;
+      guint   bytes_written = 0;
+
+      tmp = g_try_malloc (count * info->bytes_per_offset);
+      if (! tmp)
+        {
+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                       _("Error writing XCF: failed to allocate %d bytes of memory."),
+                       count * info->bytes_per_offset);
+        }
+      else
+        {
+          memset (tmp, 0, count * info->bytes_per_offset);
+
+          bytes_written = xcf_write_int8 (info, (const guint8 *) tmp,
+                                          count * info->bytes_per_offset, error);
+          g_free (tmp);
+        }
+
+      return bytes_written;
+    }
+
+  return 0;
+}
+
+guint
+xcf_write_float (XcfInfo       *info,
+                 const gfloat  *data,
+                 gint           count,
+                 GError       **error)
+{
+  return xcf_write_int32 (info,
+                          (const guint32 *)((gconstpointer) data), count,
+                          error);
+}
+
+guint
+xcf_write_string (XcfInfo  *info,
+                  gchar   **data,
+                  gint      count,
+                  GError  **error)
+{
+  GError *tmp_error = NULL;
+  guint   total     = 0;
+  gint    i;
+
+  for (i = 0; i < count; i++)
+    {
+      guint32 tmp;
+
+      if (data[i])
+        tmp = strlen (data[i]) + 1;
+      else
+        tmp = 0;
+
+      xcf_write_int32 (info, &tmp, 1, &tmp_error);
+
+      if (tmp_error)
+        {
+          g_propagate_error (error, tmp_error);
+          return total;
+        }
+
+      if (tmp > 0)
+        xcf_write_int8 (info, (const guint8 *) data[i], tmp, &tmp_error);
+
+      if (tmp_error)
+        {
+          g_propagate_error (error, tmp_error);
+          return total;
+        }
+
+      total += 4 + tmp;
+    }
+
+  return total;
+}
+
+guint
+xcf_write_component (XcfInfo       *info,
+                     gint           bpc,
+                     const guint8  *data,
+                     gint           count,
+                     GError       **error)
+{
+  switch (bpc)
+    {
+    case 1:
+      return xcf_write_int8 (info, data, count, error);
+
+    case 2:
+      return xcf_write_int16 (info, (const guint16 *) data, count, error);
+
+    case 4:
+      return xcf_write_int32 (info, (const guint32 *) data, count, error);
+
+    case 8:
+      return xcf_write_int64 (info, (const guint64 *) data, count, error);
+
+    default:
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("Error writing XCF: unsupported BPC when writing pixel: %d"),
+                   bpc);
+    }
+
+  return 0;
+}
+
+void
+xcf_write_to_be (gint    bpc,
+                 guint8 *data,
+                 gint    count)
+{
+  gint i;
+
+  switch (bpc)
+    {
+    case 1:
+      break;
+
+    case 2:
+      {
+        guint16 *d = (guint16 *) data;
+
+        for (i = 0; i < count; i++)
+          d[i] = g_htons (d[i]);
+      }
+      break;
+
+    case 4:
+      {
+        guint32 *d = (guint32 *) data;
+
+        for (i = 0; i < count; i++)
+          d[i] = g_htonl (d[i]);
+      }
+      break;
+
+    case 8:
+      {
+        guint64 *d = (guint64 *) data;
+
+        for (i = 0; i < count; i++)
+          d[i] = GINT64_TO_BE (d[i]);
+      }
+      break;
+    }
+}
diff --git a/app/xcf/xcf-write.h b/app/xcf/xcf-write.h
new file mode 100644
index 0000000..63ec15d
--- /dev/null
+++ b/app/xcf/xcf-write.h
@@ -0,0 +1,64 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_WRITE_H__
+#define __XCF_WRITE_H__
+
+
+guint   xcf_write_int8        (XcfInfo        *info,
+                               const guint8   *data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_int16       (XcfInfo        *info,
+                               const guint16  *data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_int32       (XcfInfo        *info,
+                               const guint32  *data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_int64       (XcfInfo        *info,
+                               const guint64  *data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_offset      (XcfInfo        *info,
+                               const goffset  *data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_zero_offset (XcfInfo        *info,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_float       (XcfInfo        *info,
+                               const gfloat   *data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_string      (XcfInfo        *info,
+                               gchar         **data,
+                               gint            count,
+                               GError        **error);
+guint   xcf_write_component   (XcfInfo        *info,
+                               gint            bpc,
+                               const guint8   *data,
+                               gint            count,
+                               GError        **error);
+
+void    xcf_write_to_be       (gint            bpc,
+                               guint8         *data,
+                               gint            count);
+
+
+#endif  /* __XCF_WRITE_H__ */
diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c
new file mode 100644
index 0000000..254da08
--- /dev/null
+++ b/app/xcf/xcf.c
@@ -0,0 +1,516 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <glib/gstdio.h>
+#include <gegl.h>
+
+#include "libgimpbase/gimpbase.h"
+
+#include "core/core-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+
+#include "plug-in/gimppluginmanager.h"
+#include "plug-in/gimppluginprocedure.h"
+
+#include "xcf.h"
+#include "xcf-private.h"
+#include "xcf-load.h"
+#include "xcf-read.h"
+#include "xcf-save.h"
+
+#include "gimp-intl.h"
+
+
+typedef GimpImage * GimpXcfLoaderFunc (Gimp     *gimp,
+                                       XcfInfo  *info,
+                                       GError  **error);
+
+
+static GimpValueArray * xcf_load_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error);
+static GimpValueArray * xcf_save_invoker (GimpProcedure         *procedure,
+                                          Gimp                  *gimp,
+                                          GimpContext           *context,
+                                          GimpProgress          *progress,
+                                          const GimpValueArray  *args,
+                                          GError               **error);
+
+
+static GimpXcfLoaderFunc * const xcf_loaders[] =
+{
+  xcf_load_image,   /* version  0 */
+  xcf_load_image,   /* version  1 */
+  xcf_load_image,   /* version  2 */
+  xcf_load_image,   /* version  3 */
+  xcf_load_image,   /* version  4 */
+  xcf_load_image,   /* version  5 */
+  xcf_load_image,   /* version  6 */
+  xcf_load_image,   /* version  7 */
+  xcf_load_image,   /* version  8 */
+  xcf_load_image,   /* version  9 */
+  xcf_load_image,   /* version 10 */
+  xcf_load_image,   /* version 11 */
+  xcf_load_image,   /* version 12 */
+  xcf_load_image    /* version 13 */
+};
+
+
+void
+xcf_init (Gimp *gimp)
+{
+  GimpPlugInProcedure *proc;
+  GFile               *file;
+  GimpProcedure       *procedure;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  /* So this is sort of a hack, but its better than it was before.  To
+   * do this right there would be a file load-save handler type and
+   * the whole interface would change but there isn't, and currently
+   * the plug-in structure contains all the load-save info, so it
+   * makes sense to use that for the XCF load/save handlers, even
+   * though they are internal.  The only thing it requires is using a
+   * PlugInProcDef struct.  -josh
+   */
+
+  /*  gimp-xcf-save  */
+  file = g_file_new_for_path ("gimp-xcf-save");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = xcf_save_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP XCF image"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-wilber",
+                                   strlen ("gimp-wilber") + 1);
+  gimp_plug_in_procedure_set_image_types (proc, "RGB*, GRAY*, INDEXED*");
+  gimp_plug_in_procedure_set_file_proc (proc, "xcf", "", NULL);
+  gimp_plug_in_procedure_set_mime_types (proc, "image/x-xcf");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-xcf-save");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-xcf-save",
+                                     "Saves file in the .xcf file format",
+                                     "The XCF file format has been designed "
+                                     "specifically for loading and saving "
+                                     "tiled and layered images in GIMP. "
+                                     "This procedure will save the specified "
+                                     "image in the xcf file format.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_image_id ("image",
+                                                         "Image",
+                                                         "Input image",
+                                                         gimp, FALSE,
+                                                         GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_drawable_id ("drawable",
+                                                            "Drawable",
+                                                            "Active drawable of input image",
+                                                            gimp, TRUE,
+                                                            GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "Filename",
+                                                       "The name of the file "
+                                                       "to save the image in, "
+                                                       "in URI format and "
+                                                       "UTF-8 encoding",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-filename",
+                                                       "Raw filename",
+                                                       "The basename of the "
+                                                       "file, in UTF-8",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+
+  /*  gimp-xcf-load  */
+  file = g_file_new_for_path ("gimp-xcf-load");
+  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  g_object_unref (file);
+
+  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->marshal_func = xcf_load_invoker;
+
+  proc = GIMP_PLUG_IN_PROCEDURE (procedure);
+  proc->menu_label = g_strdup (N_("GIMP XCF image"));
+  gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
+                                   (const guint8 *) "gimp-wilber",
+                                   strlen ("gimp-wilber") + 1);
+  gimp_plug_in_procedure_set_image_types (proc, NULL);
+  gimp_plug_in_procedure_set_file_proc (proc, "xcf", "",
+                                        "0,string,gimp\\040xcf\\040");
+  gimp_plug_in_procedure_set_mime_types (proc, "image/x-xcf");
+  gimp_plug_in_procedure_set_handles_uri (proc);
+
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-xcf-load");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-xcf-load",
+                                     "Loads file saved in the .xcf file format",
+                                     "The XCF file format has been designed "
+                                     "specifically for loading and saving "
+                                     "tiled and layered images in GIMP. "
+                                     "This procedure will load the specified "
+                                     "file.",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "Spencer Kimball & Peter Mattis",
+                                     "1995-1996",
+                                     NULL);
+
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("dummy-param",
+                                                      "Dummy Param",
+                                                      "Dummy parameter",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("filename",
+                                                       "Filename",
+                                                       "The name of the file "
+                                                       "to load, in the "
+                                                       "on-disk character "
+                                                       "set and encoding",
+                                                       TRUE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_string ("raw-filename",
+                                                       "Raw filename",
+                                                       "The basename of the "
+                                                       "file, in UTF-8",
+                                                       FALSE, FALSE, TRUE,
+                                                       NULL,
+                                                       GIMP_PARAM_READWRITE));
+
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_image_id ("image",
+                                                             "Image",
+                                                             "Output image",
+                                                             gimp, FALSE,
+                                                             GIMP_PARAM_READWRITE));
+  gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
+  g_object_unref (procedure);
+}
+
+void
+xcf_exit (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+}
+
+GimpImage *
+xcf_load_stream (Gimp          *gimp,
+                 GInputStream  *input,
+                 GFile         *input_file,
+                 GimpProgress  *progress,
+                 GError       **error)
+{
+  XcfInfo      info  = { 0, };
+  const gchar *filename;
+  GimpImage   *image = NULL;
+  gchar        id[14];
+  gboolean     success;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
+  g_return_val_if_fail (input_file == NULL || G_IS_FILE (input_file), NULL);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (input_file)
+    filename = gimp_file_get_utf8_name (input_file);
+  else
+    filename = _("Memory Stream");
+
+  info.gimp             = gimp;
+  info.input            = input;
+  info.seekable         = G_SEEKABLE (input);
+  info.bytes_per_offset = 4;
+  info.progress         = progress;
+  info.file             = input_file;
+  info.compression      = COMPRESS_NONE;
+
+  if (progress)
+    gimp_progress_start (progress, FALSE, _("Opening '%s'"), filename);
+
+  success = TRUE;
+
+  xcf_read_int8 (&info, (guint8 *) id, 14);
+
+  if (! g_str_has_prefix (id, "gimp xcf "))
+    {
+      success = FALSE;
+    }
+  else if (strcmp (id + 9, "file") == 0)
+    {
+      info.file_version = 0;
+    }
+  else if (id[9]  == 'v' &&
+           id[13] == '\0')
+    {
+      info.file_version = atoi (id + 10);
+    }
+  else
+    {
+      success = FALSE;
+    }
+
+  if (info.file_version >= 11)
+    info.bytes_per_offset = 8;
+
+  if (success)
+    {
+      if (info.file_version >= 0 &&
+          info.file_version < G_N_ELEMENTS (xcf_loaders))
+        {
+          image = (*(xcf_loaders[info.file_version])) (gimp, &info, error);
+
+          if (! image)
+            success = FALSE;
+
+          g_input_stream_close (info.input, NULL, NULL);
+        }
+      else
+        {
+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                       _("XCF error: unsupported XCF file version %d "
+                         "encountered"), info.file_version);
+          success = FALSE;
+        }
+    }
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  return image;
+}
+
+gboolean
+xcf_save_stream (Gimp           *gimp,
+                 GimpImage      *image,
+                 GOutputStream  *output,
+                 GFile          *output_file,
+                 GimpProgress   *progress,
+                 GError        **error)
+{
+  XcfInfo       info     = { 0, };
+  const gchar  *filename;
+  gboolean      success  = FALSE;
+  GError       *my_error = NULL;
+  GCancellable *cancellable;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
+  g_return_val_if_fail (G_IS_OUTPUT_STREAM (output), FALSE);
+  g_return_val_if_fail (output_file == NULL || G_IS_FILE (output_file), FALSE);
+  g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  if (output_file)
+    filename = gimp_file_get_utf8_name (output_file);
+  else
+    filename = _("Memory Stream");
+
+  info.gimp             = gimp;
+  info.output           = output;
+  info.seekable         = G_SEEKABLE (output);
+  info.bytes_per_offset = 4;
+  info.progress         = progress;
+  info.file             = output_file;
+
+  if (gimp_image_get_xcf_compression (image))
+    info.compression = COMPRESS_ZLIB;
+  else
+    info.compression = COMPRESS_RLE;
+
+  info.file_version = gimp_image_get_xcf_version (image,
+                                                  info.compression ==
+                                                  COMPRESS_ZLIB,
+                                                  NULL, NULL, NULL);
+
+  if (info.file_version >= 11)
+    info.bytes_per_offset = 8;
+
+  if (progress)
+    gimp_progress_start (progress, FALSE, _("Saving '%s'"), filename);
+
+  success = xcf_save_image (&info, image, &my_error);
+
+  cancellable = g_cancellable_new ();
+  if (success)
+    {
+      if (progress)
+        gimp_progress_set_text (progress, _("Closing '%s'"), filename);
+    }
+  else
+    {
+      /* When closing the stream, the image will be actually saved,
+       * unless we properly cancel it with a GCancellable.
+       * Not closing the stream is not an option either, as this will
+       * happen anyway when finalizing the output.
+       * So let's make sure now that we don't overwrite the XCF file
+       * when an error occurred.
+       */
+      g_cancellable_cancel (cancellable);
+    }
+  success = g_output_stream_close (info.output, cancellable, &my_error);
+  g_object_unref (cancellable);
+
+  if (! success && my_error)
+    g_propagate_prefixed_error (error, my_error,
+                                _("Error writing '%s': "), filename);
+
+  if (progress)
+    gimp_progress_end (progress);
+
+  return success;
+}
+
+
+/*  private functions  */
+
+static GimpValueArray *
+xcf_load_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image = NULL;
+  const gchar    *uri;
+  GFile          *file;
+  GInputStream   *input;
+  GError         *my_error = NULL;
+
+  gimp_set_busy (gimp);
+
+  uri  = g_value_get_string (gimp_value_array_index (args, 1));
+  file = g_file_new_for_uri (uri);
+
+  input = G_INPUT_STREAM (g_file_read (file, NULL, &my_error));
+
+  if (input)
+    {
+      image = xcf_load_stream (gimp, input, file, progress, error);
+
+      g_object_unref (input);
+    }
+  else
+    {
+      g_propagate_prefixed_error (error, my_error,
+                                  _("Could not open '%s' for reading: "),
+                                  gimp_file_get_utf8_name (file));
+    }
+
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, image != NULL,
+                                                  error ? *error : NULL);
+
+  if (image)
+    gimp_value_set_image (gimp_value_array_index (return_vals, 1), image);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
+
+static GimpValueArray *
+xcf_save_invoker (GimpProcedure         *procedure,
+                  Gimp                  *gimp,
+                  GimpContext           *context,
+                  GimpProgress          *progress,
+                  const GimpValueArray  *args,
+                  GError               **error)
+{
+  GimpValueArray *return_vals;
+  GimpImage      *image;
+  const gchar    *uri;
+  GFile          *file;
+  GOutputStream  *output;
+  gboolean        success  = FALSE;
+  GError         *my_error = NULL;
+
+  gimp_set_busy (gimp);
+
+  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
+  uri   = g_value_get_string (gimp_value_array_index (args, 3));
+  file  = g_file_new_for_uri (uri);
+
+  output = G_OUTPUT_STREAM (g_file_replace (file,
+                                            NULL, FALSE, G_FILE_CREATE_NONE,
+                                            NULL, &my_error));
+
+  if (output)
+    {
+      success = xcf_save_stream (gimp, image, output, file, progress, error);
+
+      g_object_unref (output);
+    }
+  else
+    {
+      g_propagate_prefixed_error (error, my_error,
+                                  _("Error creating '%s': "),
+                                  gimp_file_get_utf8_name (file));
+    }
+
+  g_object_unref (file);
+
+  return_vals = gimp_procedure_get_return_values (procedure, success,
+                                                  error ? *error : NULL);
+
+  gimp_unset_busy (gimp);
+
+  return return_vals;
+}
diff --git a/app/xcf/xcf.h b/app/xcf/xcf.h
new file mode 100644
index 0000000..b3c5e41
--- /dev/null
+++ b/app/xcf/xcf.h
@@ -0,0 +1,38 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XCF_H__
+#define __XCF_H__
+
+
+void        xcf_init        (Gimp           *gimp);
+void        xcf_exit        (Gimp           *gimp);
+
+GimpImage * xcf_load_stream (Gimp           *gimp,
+                             GInputStream   *input,
+                             GFile          *input_file,
+                             GimpProgress   *progress,
+                             GError        **error);
+
+gboolean    xcf_save_stream (Gimp           *gimp,
+                             GimpImage      *image,
+                             GOutputStream  *output,
+                             GFile          *output_file,
+                             GimpProgress   *progress,
+                             GError        **error);
+
+#endif /* __XCF_H__ */